diff --git a/.gitattributes b/.gitattributes
index bcc7d57b904..efb059f169a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,4 @@
 contrib/* linguist-vendored
 *.h linguist-language=C++
+# to avoid frequent conflicts
+tests/queries/0_stateless/arcadia_skip_list.txt text merge=union
diff --git a/.gitmodules b/.gitmodules
index 7a2c5600e65..f7dcf5f4ac1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -93,7 +93,7 @@
 	url = https://github.com/ClickHouse-Extras/libunwind.git
 [submodule "contrib/simdjson"]
 	path = contrib/simdjson
-	url = https://github.com/ClickHouse-Extras/simdjson.git
+	url = https://github.com/simdjson/simdjson.git
 [submodule "contrib/rapidjson"]
 	path = contrib/rapidjson
 	url = https://github.com/ClickHouse-Extras/rapidjson
@@ -133,7 +133,7 @@
 	url = https://github.com/unicode-org/icu.git
 [submodule "contrib/flatbuffers"]
 	path = contrib/flatbuffers
-	url = https://github.com/google/flatbuffers.git
+	url = https://github.com/ClickHouse-Extras/flatbuffers.git
 [submodule "contrib/libc-headers"]
 	path = contrib/libc-headers
 	url = https://github.com/ClickHouse-Extras/libc-headers.git
@@ -221,3 +221,9 @@
 [submodule "contrib/NuRaft"]
 	path = contrib/NuRaft
 	url = https://github.com/ClickHouse-Extras/NuRaft.git
+[submodule "contrib/nanodbc"]
+	path = contrib/nanodbc
+	url = https://github.com/ClickHouse-Extras/nanodbc.git
+[submodule "contrib/datasketches-cpp"]
+	path = contrib/datasketches-cpp
+	url = https://github.com/ClickHouse-Extras/datasketches-cpp.git
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e2c777b3bcf..cc1ec835a7b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,312 @@
+## ClickHouse release 21.4
+
+### ClickHouse release 21.4.1 2021-04-12
+
+#### Backward Incompatible Change
+
+* The `toStartOfIntervalFunction` will align hour intervals to the midnight (in previous versions they were aligned to the start of unix epoch). For example, `toStartOfInterval(x, INTERVAL 11 HOUR)` will split every day into three intervals: `00:00:00..10:59:59`, `11:00:00..21:59:59` and `22:00:00..23:59:59`. This behaviour is more suited for practical needs. This closes [#9510](https://github.com/ClickHouse/ClickHouse/issues/9510). [#22060](https://github.com/ClickHouse/ClickHouse/pull/22060) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* `Age` and `Precision` in graphite rollup configs should increase from retention to retention. Now it's checked and the wrong config raises an exception. [#21496](https://github.com/ClickHouse/ClickHouse/pull/21496) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Fix `cutToFirstSignificantSubdomainCustom()`/`firstSignificantSubdomainCustom()` returning wrong result for 3+ level domains present in custom top-level domain list. For input domains matching these custom top-level domains, the third-level domain was considered to be the first significant one. This is now fixed. This change may introduce incompatibility if the function is used in e.g. the sharding key. [#21946](https://github.com/ClickHouse/ClickHouse/pull/21946) ([Azat Khuzhin](https://github.com/azat)).
+* Column `keys` in table `system.dictionaries` was replaced to columns `key.names` and `key.types`. Columns `key.names`, `key.types`, `attribute.names`, `attribute.types` from `system.dictionaries` table does not require dictionary to be loaded. [#21884](https://github.com/ClickHouse/ClickHouse/pull/21884) ([Maksim Kita](https://github.com/kitaisreal)).
+* Now replicas that are processing the `ALTER TABLE ATTACH PART[ITION]` command search in their `detached/` folders before fetching the data from other replicas. As an implementation detail, a new command `ATTACH_PART` is introduced in the replicated log. Parts are searched and compared by their checksums. [#18978](https://github.com/ClickHouse/ClickHouse/pull/18978) ([Mike Kot](https://github.com/myrrc)). **Note**:
+  * `ATTACH PART[ITION]` queries may not work during cluster upgrade.
+  * It's not possible to rollback to older ClickHouse version after executing `ALTER ... ATTACH` query in new version as the old servers would fail to pass the `ATTACH_PART` entry in the replicated log.
+* In this version, empty `<remote_url_allow_hosts></remote_url_allow_hosts>` will block all access to remote hosts while in previous versions it did nothing. If you want to keep old behaviour and you have empty `remote_url_allow_hosts` element in configuration file, remove it. [#20058](https://github.com/ClickHouse/ClickHouse/pull/20058) ([Vladimir Chebotarev](https://github.com/excitoon)).
+
+
+#### New Feature
+
+* Extended range of `DateTime64` to support dates from year 1925 to 2283. Improved support of `DateTime` around zero date (`1970-01-01`). [#9404](https://github.com/ClickHouse/ClickHouse/pull/9404) ([alexey-milovidov](https://github.com/alexey-milovidov), [Vasily Nemkov](https://github.com/Enmk)). Not every time and date functions are working for extended range of dates.
+* Added support of Kerberos authentication for preconfigured users and HTTP requests (GSS-SPNEGO). [#14995](https://github.com/ClickHouse/ClickHouse/pull/14995) ([Denis Glazachev](https://github.com/traceon)).
+* Add `prefer_column_name_to_alias` setting to use original column names instead of aliases. it is needed to be more compatible with common databases' aliasing rules. This is for [#9715](https://github.com/ClickHouse/ClickHouse/issues/9715) and [#9887](https://github.com/ClickHouse/ClickHouse/issues/9887). [#22044](https://github.com/ClickHouse/ClickHouse/pull/22044) ([Amos Bird](https://github.com/amosbird)).
+* Added functions `dictGetChildren(dictionary, key)`, `dictGetDescendants(dictionary, key, level)`. Function `dictGetChildren` return all children as an array if indexes. It is a inverse transformation for `dictGetHierarchy`. Function `dictGetDescendants` return all descendants as if `dictGetChildren` was applied `level` times recursively. Zero `level` value is equivalent to infinity. Closes [#14656](https://github.com/ClickHouse/ClickHouse/issues/14656). [#22096](https://github.com/ClickHouse/ClickHouse/pull/22096) ([Maksim Kita](https://github.com/kitaisreal)).
+* Added `executable_pool` dictionary source. Close [#14528](https://github.com/ClickHouse/ClickHouse/issues/14528). [#21321](https://github.com/ClickHouse/ClickHouse/pull/21321) ([Maksim Kita](https://github.com/kitaisreal)).
+* Added table function `dictionary`. It works the same way as `Dictionary` engine. Closes [#21560](https://github.com/ClickHouse/ClickHouse/issues/21560). [#21910](https://github.com/ClickHouse/ClickHouse/pull/21910) ([Maksim Kita](https://github.com/kitaisreal)).
+* Support `Nullable` type for `PolygonDictionary` attribute. [#21890](https://github.com/ClickHouse/ClickHouse/pull/21890) ([Maksim Kita](https://github.com/kitaisreal)).
+* Functions `dictGet`, `dictHas` use current database name if it is not specified for dictionaries created with DDL. Closes [#21632](https://github.com/ClickHouse/ClickHouse/issues/21632). [#21859](https://github.com/ClickHouse/ClickHouse/pull/21859) ([Maksim Kita](https://github.com/kitaisreal)).
+* Added function `dictGetOrNull`. It works like `dictGet`, but return `Null` in case key was not found in dictionary. Closes [#22375](https://github.com/ClickHouse/ClickHouse/issues/22375). [#22413](https://github.com/ClickHouse/ClickHouse/pull/22413) ([Maksim Kita](https://github.com/kitaisreal)).
+* Added async update in `ComplexKeyCache`, `SSDCache`, `SSDComplexKeyCache` dictionaries. Added support for `Nullable` type in `Cache`, `ComplexKeyCache`, `SSDCache`, `SSDComplexKeyCache` dictionaries. Added support for multiple attributes fetch with `dictGet`, `dictGetOrDefault` functions. Fixes [#21517](https://github.com/ClickHouse/ClickHouse/issues/21517). [#20595](https://github.com/ClickHouse/ClickHouse/pull/20595) ([Maksim Kita](https://github.com/kitaisreal)).
+* Support `dictHas` function for `RangeHashedDictionary`. Fixes [#6680](https://github.com/ClickHouse/ClickHouse/issues/6680). [#19816](https://github.com/ClickHouse/ClickHouse/pull/19816) ([Maksim Kita](https://github.com/kitaisreal)).
+* Add function `timezoneOf` that returns the timezone name of `DateTime` or `DateTime64` data types. This does not close [#9959](https://github.com/ClickHouse/ClickHouse/issues/9959). Fix inconsistencies in function names: add aliases `timezone` and `timeZone` as well as `toTimezone` and `toTimeZone` and `timezoneOf` and `timeZoneOf`. [#22001](https://github.com/ClickHouse/ClickHouse/pull/22001) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Add new optional clause `GRANTEES` for `CREATE/ALTER USER` commands. It specifies users or roles which are allowed to receive grants from this user on condition this user has also all required access granted with grant option. By default `GRANTEES ANY` is used which means a user with grant option can grant to anyone. Syntax: `CREATE USER ... GRANTEES {user | role | ANY | NONE} [,...] [EXCEPT {user | role} [,...]]`. [#21641](https://github.com/ClickHouse/ClickHouse/pull/21641) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Add new column `slowdowns_count` to `system.clusters`. When using hedged requests, it shows how many times we switched to another replica because this replica was responding slowly. Also show actual value of `errors_count` in `system.clusters`. [#21480](https://github.com/ClickHouse/ClickHouse/pull/21480) ([Kruglov Pavel](https://github.com/Avogar)).
+* Add `_partition_id` virtual column for `MergeTree*` engines. Allow to prune partitions by `_partition_id`. Add `partitionID()` function to calculate partition id string. [#21401](https://github.com/ClickHouse/ClickHouse/pull/21401) ([Amos Bird](https://github.com/amosbird)).
+* Add function `isIPAddressInRange` to test if an IPv4 or IPv6 address is contained in a given CIDR network prefix. [#21329](https://github.com/ClickHouse/ClickHouse/pull/21329) ([PHO](https://github.com/depressed-pho)).
+* Added new SQL command `ALTER TABLE 'table_name' UNFREEZE [PARTITION 'part_expr'] WITH NAME 'backup_name'`. This command is needed to properly remove 'freezed' partitions from all disks. [#21142](https://github.com/ClickHouse/ClickHouse/pull/21142) ([Pavel Kovalenko](https://github.com/Jokser)).
+* Supports implicit key type conversion for JOIN. [#19885](https://github.com/ClickHouse/ClickHouse/pull/19885) ([Vladimir](https://github.com/vdimir)).
+
+#### Experimental Feature
+
+* Support `RANGE OFFSET` frame (for window functions) for floating point types. Implement `lagInFrame`/`leadInFrame` window functions, which are analogous to `lag`/`lead`, but respect the window frame. They are identical when the frame is `between unbounded preceding and unbounded following`. This closes [#5485](https://github.com/ClickHouse/ClickHouse/issues/5485). [#21895](https://github.com/ClickHouse/ClickHouse/pull/21895) ([Alexander Kuzmenkov](https://github.com/akuzm)).
+* Zero-copy replication for `ReplicatedMergeTree` over S3 storage. [#16240](https://github.com/ClickHouse/ClickHouse/pull/16240) ([ianton-ru](https://github.com/ianton-ru)).
+* Added possibility to migrate existing S3 disk to the schema with backup-restore capabilities. [#22070](https://github.com/ClickHouse/ClickHouse/pull/22070) ([Pavel Kovalenko](https://github.com/Jokser)).
+
+#### Performance Improvement
+
+* Supported parallel formatting in `clickhouse-local` and everywhere else. [#21630](https://github.com/ClickHouse/ClickHouse/pull/21630) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Support parallel parsing for `CSVWithNames` and `TSVWithNames` formats. This closes [#21085](https://github.com/ClickHouse/ClickHouse/issues/21085). [#21149](https://github.com/ClickHouse/ClickHouse/pull/21149) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Enable read with mmap IO for file ranges from 64 MiB (the settings `min_bytes_to_use_mmap_io`). It may lead to moderate performance improvement. [#22326](https://github.com/ClickHouse/ClickHouse/pull/22326) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Add cache for files read with `min_bytes_to_use_mmap_io` setting. It makes significant (2x and more) performance improvement when the value of the setting is small by avoiding frequent mmap/munmap calls and the consequent page faults. Note that mmap IO has major drawbacks that makes it less reliable in production (e.g. hung or SIGBUS on faulty disks; less controllable memory usage). Nevertheless it is good in benchmarks. [#22206](https://github.com/ClickHouse/ClickHouse/pull/22206) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Avoid unnecessary data copy when using codec `NONE`. Please note that codec `NONE` is mostly useless - it's recommended to always use compression (`LZ4` is by default). Despite the common belief, disabling compression may not improve performance (the opposite effect is possible). The `NONE` codec is useful in some cases: - when data is uncompressable; - for synthetic benchmarks. [#22145](https://github.com/ClickHouse/ClickHouse/pull/22145) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Faster `GROUP BY` with small `max_rows_to_group_by` and `group_by_overflow_mode='any'`. [#21856](https://github.com/ClickHouse/ClickHouse/pull/21856) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Optimize performance of queries like `SELECT ... FINAL ... WHERE`. Now in queries with `FINAL` it's allowed to move to `PREWHERE` columns, which are in sorting key. [#21830](https://github.com/ClickHouse/ClickHouse/pull/21830) ([foolchi](https://github.com/foolchi)).
+* Improved performance by replacing `memcpy` to another implementation. This closes [#18583](https://github.com/ClickHouse/ClickHouse/issues/18583). [#21520](https://github.com/ClickHouse/ClickHouse/pull/21520) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Improve performance of aggregation in order of sorting key (with enabled setting `optimize_aggregation_in_order`). [#19401](https://github.com/ClickHouse/ClickHouse/pull/19401) ([Anton Popov](https://github.com/CurtizJ)).
+
+#### Improvement
+
+* Add connection pool for PostgreSQL table/database engine and dictionary source. Should fix [#21444](https://github.com/ClickHouse/ClickHouse/issues/21444). [#21839](https://github.com/ClickHouse/ClickHouse/pull/21839) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Support non-default table schema for postgres storage/table-function. Closes [#21701](https://github.com/ClickHouse/ClickHouse/issues/21701). [#21711](https://github.com/ClickHouse/ClickHouse/pull/21711) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Support replicas priority for postgres dictionary source. [#21710](https://github.com/ClickHouse/ClickHouse/pull/21710) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Introduce a new merge tree setting `min_bytes_to_rebalance_partition_over_jbod` which allows assigning new parts to different disks of a JBOD volume in a balanced way. [#16481](https://github.com/ClickHouse/ClickHouse/pull/16481) ([Amos Bird](https://github.com/amosbird)).
+* Added `Grant`, `Revoke` and `System` values of `query_kind` column for corresponding queries in `system.query_log`. [#21102](https://github.com/ClickHouse/ClickHouse/pull/21102) ([Vasily Nemkov](https://github.com/Enmk)).
+* Allow customizing timeouts for HTTP connections used for replication independently from other HTTP timeouts. [#20088](https://github.com/ClickHouse/ClickHouse/pull/20088) ([nvartolomei](https://github.com/nvartolomei)).
+* Better exception message in client in case of exception while server is writing blocks. In previous versions client may get misleading message like `Data compressed with different methods`. [#22427](https://github.com/ClickHouse/ClickHouse/pull/22427) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix error `Directory tmp_fetch_XXX already exists` which could happen after failed fetch part. Delete temporary fetch directory if it already exists. Fixes [#14197](https://github.com/ClickHouse/ClickHouse/issues/14197). [#22411](https://github.com/ClickHouse/ClickHouse/pull/22411) ([nvartolomei](https://github.com/nvartolomei)).
+* Fix MSan report for function `range` with `UInt256` argument (support for large integers is experimental). This closes [#22157](https://github.com/ClickHouse/ClickHouse/issues/22157). [#22387](https://github.com/ClickHouse/ClickHouse/pull/22387) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Add `current_database` column to `system.processes` table. It contains the current database of the query. [#22365](https://github.com/ClickHouse/ClickHouse/pull/22365) ([Alexander Kuzmenkov](https://github.com/akuzm)).
+* Add case-insensitive history search/navigation and subword movement features to `clickhouse-client`. [#22105](https://github.com/ClickHouse/ClickHouse/pull/22105) ([Amos Bird](https://github.com/amosbird)).
+* If tuple of NULLs, e.g. `(NULL, NULL)` is on the left hand side of `IN` operator with tuples of non-NULLs on the right hand side, e.g. `SELECT (NULL, NULL) IN ((0, 0), (3, 1))` return 0 instead of throwing an exception about incompatible types. The expression may also appear due to optimization of something like `SELECT (NULL, NULL) = (8, 0) OR (NULL, NULL) = (3, 2) OR (NULL, NULL) = (0, 0) OR (NULL, NULL) = (3, 1)`. This closes [#22017](https://github.com/ClickHouse/ClickHouse/issues/22017). [#22063](https://github.com/ClickHouse/ClickHouse/pull/22063) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Update used version of simdjson to 0.9.1. This fixes [#21984](https://github.com/ClickHouse/ClickHouse/issues/21984). [#22057](https://github.com/ClickHouse/ClickHouse/pull/22057) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Added case insensitive aliases for `CONNECTION_ID()` and `VERSION()` functions. This fixes [#22028](https://github.com/ClickHouse/ClickHouse/issues/22028). [#22042](https://github.com/ClickHouse/ClickHouse/pull/22042) ([Eugene Klimov](https://github.com/Slach)).
+* Add option `strict_increase` to `windowFunnel` function to calculate each event once (resolve [#21835](https://github.com/ClickHouse/ClickHouse/issues/21835)). [#22025](https://github.com/ClickHouse/ClickHouse/pull/22025) ([Vladimir](https://github.com/vdimir)).
+* If partition key of a `MergeTree` table does not include `Date` or `DateTime` columns but includes exactly one `DateTime64` column, expose its values in the `min_time` and `max_time` columns in `system.parts` and `system.parts_columns` tables. Add `min_time` and `max_time` columns to `system.parts_columns` table (these was inconsistency to the `system.parts` table). This closes [#18244](https://github.com/ClickHouse/ClickHouse/issues/18244). [#22011](https://github.com/ClickHouse/ClickHouse/pull/22011) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Supported `replication_alter_partitions_sync=1` setting in `clickhouse-copier` for moving partitions from helping table to destination. Decreased default timeouts. Fixes [#21911](https://github.com/ClickHouse/ClickHouse/issues/21911). [#21912](https://github.com/ClickHouse/ClickHouse/pull/21912) ([turbo jason](https://github.com/songenjie)).
+* Show path to data directory of `EmbeddedRocksDB` tables in system tables. [#21903](https://github.com/ClickHouse/ClickHouse/pull/21903) ([tavplubix](https://github.com/tavplubix)).
+* Add profile event `HedgedRequestsChangeReplica`, change read data timeout from sec to ms. [#21886](https://github.com/ClickHouse/ClickHouse/pull/21886) ([Kruglov Pavel](https://github.com/Avogar)).
+* DiskS3 (experimental feature under development). Fixed bug with the impossibility to move directory if the destination is not empty and cache disk is used. [#21837](https://github.com/ClickHouse/ClickHouse/pull/21837) ([Pavel Kovalenko](https://github.com/Jokser)).
+* Better formatting for `Array` and `Map` data types in Web UI. [#21798](https://github.com/ClickHouse/ClickHouse/pull/21798) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Update clusters only if their configurations were updated. [#21685](https://github.com/ClickHouse/ClickHouse/pull/21685) ([Kruglov Pavel](https://github.com/Avogar)).
+* Propagate query and session settings for distributed DDL queries. Set `distributed_ddl_entry_format_version` to 2 to enable this. Added `distributed_ddl_output_mode` setting. Supported modes: `none`, `throw` (default), `null_status_on_timeout` and `never_throw`. Miscellaneous fixes and improvements for `Replicated` database engine. [#21535](https://github.com/ClickHouse/ClickHouse/pull/21535) ([tavplubix](https://github.com/tavplubix)).
+* If `PODArray` was instantiated with element size that is neither a fraction or a multiple of 16, buffer overflow was possible. No bugs in current releases exist. [#21533](https://github.com/ClickHouse/ClickHouse/pull/21533) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Add `last_error_time`/`last_error_message`/`last_error_stacktrace`/`remote` columns for `system.errors`. [#21529](https://github.com/ClickHouse/ClickHouse/pull/21529) ([Azat Khuzhin](https://github.com/azat)).
+* Add aliases `simpleJSONExtract/simpleJSONHas` to `visitParam/visitParamExtract{UInt, Int, Bool, Float, Raw, String}`. Fixes #21383. [#21519](https://github.com/ClickHouse/ClickHouse/pull/21519) ([fastio](https://github.com/fastio)).
+* Add setting `optimize_skip_unused_shards_limit` to limit the number of sharding key values for `optimize_skip_unused_shards`. [#21512](https://github.com/ClickHouse/ClickHouse/pull/21512) ([Azat Khuzhin](https://github.com/azat)).
+* Improve `clickhouse-format` to not throw exception when there are extra spaces or comment after the last query, and throw exception early with readable message when format `ASTInsertQuery` with data . [#21311](https://github.com/ClickHouse/ClickHouse/pull/21311) ([flynn](https://github.com/ucasFL)).
+* Improve support of integer keys in data type `Map`. [#21157](https://github.com/ClickHouse/ClickHouse/pull/21157) ([Anton Popov](https://github.com/CurtizJ)).
+* MaterializeMySQL: attempt to reconnect to MySQL if the connection is lost. [#20961](https://github.com/ClickHouse/ClickHouse/pull/20961) ([Håvard Kvålen](https://github.com/havardk)).
+* Support more cases to rewrite `CROSS JOIN` to `INNER JOIN`. [#20392](https://github.com/ClickHouse/ClickHouse/pull/20392) ([Vladimir](https://github.com/vdimir)).
+* Do not create empty parts on INSERT when `optimize_on_insert` setting enabled. Fixes [#20304](https://github.com/ClickHouse/ClickHouse/issues/20304). [#20387](https://github.com/ClickHouse/ClickHouse/pull/20387) ([Kruglov Pavel](https://github.com/Avogar)).
+* `MaterializeMySQL`: add minmax skipping index for `_version` column. [#20382](https://github.com/ClickHouse/ClickHouse/pull/20382) ([Stig Bakken](https://github.com/stigsb)).
+* Add option `--backslash` for `clickhouse-format`, which can add a backslash at the end of each line of the formatted query. [#21494](https://github.com/ClickHouse/ClickHouse/pull/21494) ([flynn](https://github.com/ucasFL)).
+* Now clickhouse will not throw `LOGICAL_ERROR` exception when we try to mutate the already covered part. Fixes [#22013](https://github.com/ClickHouse/ClickHouse/issues/22013). [#22291](https://github.com/ClickHouse/ClickHouse/pull/22291) ([alesapin](https://github.com/alesapin)).
+
+#### Bug Fix
+
+* Remove socket from epoll before cancelling packet receiver in `HedgedConnections` to prevent possible race. Fixes [#22161](https://github.com/ClickHouse/ClickHouse/issues/22161). [#22443](https://github.com/ClickHouse/ClickHouse/pull/22443) ([Kruglov Pavel](https://github.com/Avogar)).
+* Add (missing) memory accounting in parallel parsing routines. In previous versions OOM was possible when the resultset contains very large blocks of data. This closes [#22008](https://github.com/ClickHouse/ClickHouse/issues/22008). [#22425](https://github.com/ClickHouse/ClickHouse/pull/22425) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix exception which may happen when `SELECT` has constant `WHERE` condition and source table has columns which names are digits. [#22270](https://github.com/ClickHouse/ClickHouse/pull/22270) ([LiuNeng](https://github.com/liuneng1994)).
+* Fix query cancellation with `use_hedged_requests=0` and `async_socket_for_remote=1`. [#22183](https://github.com/ClickHouse/ClickHouse/pull/22183) ([Azat Khuzhin](https://github.com/azat)).
+* Fix uncaught exception in `InterserverIOHTTPHandler`. [#22146](https://github.com/ClickHouse/ClickHouse/pull/22146) ([Azat Khuzhin](https://github.com/azat)).
+* Fix docker entrypoint in case `http_port` is not in the config. [#22132](https://github.com/ClickHouse/ClickHouse/pull/22132) ([Ewout](https://github.com/devwout)).
+* Fix error `Invalid number of rows in Chunk` in `JOIN` with `TOTALS` and `arrayJoin`. Closes [#19303](https://github.com/ClickHouse/ClickHouse/issues/19303). [#22129](https://github.com/ClickHouse/ClickHouse/pull/22129) ([Vladimir](https://github.com/vdimir)).
+* Fix the background thread pool name which used to poll message from Kafka. The Kafka engine with the broken thread pool will not consume the message from message queue. [#22122](https://github.com/ClickHouse/ClickHouse/pull/22122) ([fastio](https://github.com/fastio)).
+* Fix waiting for `OPTIMIZE` and `ALTER` queries for `ReplicatedMergeTree` table engines. Now the query will not hang when the table was detached or restarted. [#22118](https://github.com/ClickHouse/ClickHouse/pull/22118) ([alesapin](https://github.com/alesapin)).
+* Disable `async_socket_for_remote`/`use_hedged_requests` for buggy Linux kernels. [#22109](https://github.com/ClickHouse/ClickHouse/pull/22109) ([Azat Khuzhin](https://github.com/azat)).
+* Docker entrypoint: avoid chown of `.` in case when `LOG_PATH` is empty. Closes [#22100](https://github.com/ClickHouse/ClickHouse/issues/22100). [#22102](https://github.com/ClickHouse/ClickHouse/pull/22102) ([filimonov](https://github.com/filimonov)).
+* The function `decrypt` was lacking a check for the minimal size of data encrypted in `AEAD` mode. This closes [#21897](https://github.com/ClickHouse/ClickHouse/issues/21897). [#22064](https://github.com/ClickHouse/ClickHouse/pull/22064) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* In rare case, merge for `CollapsingMergeTree` may create granule with `index_granularity + 1` rows. Because of this, internal check, added in [#18928](https://github.com/ClickHouse/ClickHouse/issues/18928) (affects 21.2 and 21.3), may fail with error `Incomplete granules are not allowed while blocks are granules size`. This error did not allow parts to merge. [#21976](https://github.com/ClickHouse/ClickHouse/pull/21976) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Reverted [#15454](https://github.com/ClickHouse/ClickHouse/issues/15454) that may cause significant increase in memory usage while loading external dictionaries of hashed type. This closes [#21935](https://github.com/ClickHouse/ClickHouse/issues/21935). [#21948](https://github.com/ClickHouse/ClickHouse/pull/21948) ([Maksim Kita](https://github.com/kitaisreal)).
+* Prevent hedged connections overlaps (`Unknown packet 9 from server` error). [#21941](https://github.com/ClickHouse/ClickHouse/pull/21941) ([Azat Khuzhin](https://github.com/azat)).
+* Fix reading the HTTP POST request with "multipart/form-data" content type in some cases. [#21936](https://github.com/ClickHouse/ClickHouse/pull/21936) ([Ivan](https://github.com/abyss7)).
+* Fix wrong `ORDER BY` results when a query contains window functions, and optimization for reading in primary key order is applied. Fixes [#21828](https://github.com/ClickHouse/ClickHouse/issues/21828). [#21915](https://github.com/ClickHouse/ClickHouse/pull/21915) ([Alexander Kuzmenkov](https://github.com/akuzm)).
+* Fix deadlock in first catboost model execution. Closes [#13832](https://github.com/ClickHouse/ClickHouse/issues/13832). [#21844](https://github.com/ClickHouse/ClickHouse/pull/21844) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix incorrect query result (and possible crash) which could happen when `WHERE` or `HAVING` condition is pushed before `GROUP BY`. Fixes [#21773](https://github.com/ClickHouse/ClickHouse/issues/21773). [#21841](https://github.com/ClickHouse/ClickHouse/pull/21841) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Better error handling and logging in `WriteBufferFromS3`. [#21836](https://github.com/ClickHouse/ClickHouse/pull/21836) ([Pavel Kovalenko](https://github.com/Jokser)).
+* Fix possible crashes in aggregate functions with combinator `Distinct`, while using two-level aggregation. This is a follow-up fix of [#18365](https://github.com/ClickHouse/ClickHouse/pull/18365) . Can only reproduced in production env. [#21818](https://github.com/ClickHouse/ClickHouse/pull/21818) ([Amos Bird](https://github.com/amosbird)).
+* Fix scalar subquery index analysis. This fixes [#21717](https://github.com/ClickHouse/ClickHouse/issues/21717) , which was introduced in [#18896](https://github.com/ClickHouse/ClickHouse/pull/18896). [#21766](https://github.com/ClickHouse/ClickHouse/pull/21766) ([Amos Bird](https://github.com/amosbird)).
+* Fix bug for `ReplicatedMerge` table engines when `ALTER MODIFY COLUMN` query doesn't change the type of `Decimal` column if its size (32 bit or 64 bit) doesn't change. [#21728](https://github.com/ClickHouse/ClickHouse/pull/21728) ([alesapin](https://github.com/alesapin)).
+* Fix possible infinite waiting when concurrent `OPTIMIZE` and `DROP` are run for `ReplicatedMergeTree`. [#21716](https://github.com/ClickHouse/ClickHouse/pull/21716) ([Azat Khuzhin](https://github.com/azat)).
+* Fix function `arrayElement` with type `Map` for constant integer arguments. [#21699](https://github.com/ClickHouse/ClickHouse/pull/21699) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix SIGSEGV on not existing attributes from `ip_trie` with `access_to_key_from_attributes`. [#21692](https://github.com/ClickHouse/ClickHouse/pull/21692) ([Azat Khuzhin](https://github.com/azat)).
+* Server now start accepting connections only after `DDLWorker` and dictionaries initialization. [#21676](https://github.com/ClickHouse/ClickHouse/pull/21676) ([Azat Khuzhin](https://github.com/azat)).
+* Add type conversion for keys of tables of type `Join` (previously led to SIGSEGV). [#21646](https://github.com/ClickHouse/ClickHouse/pull/21646) ([Azat Khuzhin](https://github.com/azat)).
+* Fix distributed requests cancellation (for example simple select from multiple shards with limit, i.e. `select * from remote('127.{2,3}', system.numbers) limit 100`) with `async_socket_for_remote=1`. [#21643](https://github.com/ClickHouse/ClickHouse/pull/21643) ([Azat Khuzhin](https://github.com/azat)).
+* Fix `fsync_part_directory` for horizontal merge. [#21642](https://github.com/ClickHouse/ClickHouse/pull/21642) ([Azat Khuzhin](https://github.com/azat)).
+* Remove unknown columns from joined table in `WHERE` for queries to external database engines (MySQL, PostgreSQL). close [#14614](https://github.com/ClickHouse/ClickHouse/issues/14614), close [#19288](https://github.com/ClickHouse/ClickHouse/issues/19288) (dup), close [#19645](https://github.com/ClickHouse/ClickHouse/issues/19645) (dup). [#21640](https://github.com/ClickHouse/ClickHouse/pull/21640) ([Vladimir](https://github.com/vdimir)).
+* `std::terminate` was called if there is an error writing data into s3. [#21624](https://github.com/ClickHouse/ClickHouse/pull/21624) ([Vladimir](https://github.com/vdimir)).
+* Fix possible error `Cannot find column` when `optimize_skip_unused_shards` is enabled and zero shards are used. [#21579](https://github.com/ClickHouse/ClickHouse/pull/21579) ([Azat Khuzhin](https://github.com/azat)).
+* In case if query has constant `WHERE` condition, and setting `optimize_skip_unused_shards` enabled, all shards may be skipped and query could return incorrect empty result. [#21550](https://github.com/ClickHouse/ClickHouse/pull/21550) ([Amos Bird](https://github.com/amosbird)).
+* Fix table function `clusterAllReplicas` returns wrong `_shard_num`. close [#21481](https://github.com/ClickHouse/ClickHouse/issues/21481). [#21498](https://github.com/ClickHouse/ClickHouse/pull/21498) ([flynn](https://github.com/ucasFL)).
+* Fix that S3 table holds old credentials after config update. [#21457](https://github.com/ClickHouse/ClickHouse/pull/21457) ([Grigory Pervakov](https://github.com/GrigoryPervakov)).
+* Fixed race on SSL object inside `SecureSocket` in Poco. [#21456](https://github.com/ClickHouse/ClickHouse/pull/21456) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Fix `Avro` format parsing for `Kafka`. Fixes [#21437](https://github.com/ClickHouse/ClickHouse/issues/21437). [#21438](https://github.com/ClickHouse/ClickHouse/pull/21438) ([Ilya Golshtein](https://github.com/ilejn)).
+* Fix receive and send timeouts and non-blocking read in secure socket. [#21429](https://github.com/ClickHouse/ClickHouse/pull/21429) ([Kruglov Pavel](https://github.com/Avogar)).
+* `force_drop_table` flag didn't work for `MATERIALIZED VIEW`, it's fixed. Fixes [#18943](https://github.com/ClickHouse/ClickHouse/issues/18943). [#20626](https://github.com/ClickHouse/ClickHouse/pull/20626) ([tavplubix](https://github.com/tavplubix)).
+* Fix name clashes in `PredicateRewriteVisitor`. It caused incorrect `WHERE` filtration after full join. Close [#20497](https://github.com/ClickHouse/ClickHouse/issues/20497). [#20622](https://github.com/ClickHouse/ClickHouse/pull/20622) ([Vladimir](https://github.com/vdimir)).
+
+#### Build/Testing/Packaging Improvement
+
+* Add [Jepsen](https://github.com/jepsen-io/jepsen) tests for ClickHouse Keeper. [#21677](https://github.com/ClickHouse/ClickHouse/pull/21677) ([alesapin](https://github.com/alesapin)).
+* Run stateless tests in parallel in CI. Depends on [#22181](https://github.com/ClickHouse/ClickHouse/issues/22181). [#22300](https://github.com/ClickHouse/ClickHouse/pull/22300) ([alesapin](https://github.com/alesapin)).
+* Enable status check for [SQLancer](https://github.com/sqlancer/sqlancer) CI run. [#22015](https://github.com/ClickHouse/ClickHouse/pull/22015) ([Ilya Yatsishin](https://github.com/qoega)).
+* Multiple preparations for PowerPC builds: Enable the bundled openldap on `ppc64le`. [#22487](https://github.com/ClickHouse/ClickHouse/pull/22487) ([Kfir Itzhak](https://github.com/mastertheknife)).  Enable compiling on `ppc64le` with Clang. [#22476](https://github.com/ClickHouse/ClickHouse/pull/22476) ([Kfir Itzhak](https://github.com/mastertheknife)). Fix compiling boost on `ppc64le`. [#22474](https://github.com/ClickHouse/ClickHouse/pull/22474) ([Kfir Itzhak](https://github.com/mastertheknife)). Fix CMake error about internal CMake variable `CMAKE_ASM_COMPILE_OBJECT` not set on `ppc64le`. [#22469](https://github.com/ClickHouse/ClickHouse/pull/22469) ([Kfir Itzhak](https://github.com/mastertheknife)). Fix Fedora/RHEL/CentOS not finding `libclang_rt.builtins` on `ppc64le`. [#22458](https://github.com/ClickHouse/ClickHouse/pull/22458) ([Kfir Itzhak](https://github.com/mastertheknife)).  Enable building with `jemalloc` on `ppc64le`. [#22447](https://github.com/ClickHouse/ClickHouse/pull/22447) ([Kfir Itzhak](https://github.com/mastertheknife)). Fix ClickHouse's config embedding and cctz's timezone embedding on `ppc64le`. [#22445](https://github.com/ClickHouse/ClickHouse/pull/22445) ([Kfir Itzhak](https://github.com/mastertheknife)). Fixed compiling on `ppc64le` and use the correct instruction pointer register on `ppc64le`. [#22430](https://github.com/ClickHouse/ClickHouse/pull/22430) ([Kfir Itzhak](https://github.com/mastertheknife)).
+* Re-enable the S3 (AWS) library on `aarch64`. [#22484](https://github.com/ClickHouse/ClickHouse/pull/22484) ([Kfir Itzhak](https://github.com/mastertheknife)).
+* Add `tzdata` to Docker containers because reading `ORC` formats requires it. This closes [#14156](https://github.com/ClickHouse/ClickHouse/issues/14156). [#22000](https://github.com/ClickHouse/ClickHouse/pull/22000) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Introduce 2 arguments for `clickhouse-server` image Dockerfile: `deb_location` & `single_binary_location`. [#21977](https://github.com/ClickHouse/ClickHouse/pull/21977) ([filimonov](https://github.com/filimonov)).
+* Allow to use clang-tidy with release builds by enabling assertions if it is used. [#21914](https://github.com/ClickHouse/ClickHouse/pull/21914) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Add llvm-12 binaries name to search in cmake scripts. Implicit constants conversions to mute clang warnings. Updated submodules to build with CMake 3.19. Mute recursion in macro expansion in `readpassphrase` library. Deprecated `-fuse-ld` changed to `--ld-path` for clang. [#21597](https://github.com/ClickHouse/ClickHouse/pull/21597) ([Ilya Yatsishin](https://github.com/qoega)).
+* Updating `docker/test/testflows/runner/dockerd-entrypoint.sh` to use Yandex dockerhub-proxy, because Docker Hub has enabled very restrictive rate limits [#21551](https://github.com/ClickHouse/ClickHouse/pull/21551) ([vzakaznikov](https://github.com/vzakaznikov)).
+* Fix macOS shared lib build. [#20184](https://github.com/ClickHouse/ClickHouse/pull/20184) ([nvartolomei](https://github.com/nvartolomei)).
+* Add `ctime` option to `zookeeper-dump-tree`. It allows to dump node creation time. [#21842](https://github.com/ClickHouse/ClickHouse/pull/21842) ([Ilya](https://github.com/HumanUser)).
+
+
+## ClickHouse release 21.3 (LTS)
+
+### ClickHouse release v21.3, 2021-03-12
+
+#### Backward Incompatible Change
+
+* Now it's not allowed to create MergeTree tables in old syntax with table TTL because it's just ignored. Attach of old tables is still possible. [#20282](https://github.com/ClickHouse/ClickHouse/pull/20282) ([alesapin](https://github.com/alesapin)).
+* Now all case-insensitive function names will be rewritten to their canonical representations. This is needed for projection query routing (the upcoming feature). [#20174](https://github.com/ClickHouse/ClickHouse/pull/20174) ([Amos Bird](https://github.com/amosbird)).
+* Fix creation of `TTL` in cases, when its expression is a function and it is the same as `ORDER BY` key. Now it's allowed to set custom aggregation to primary key columns in `TTL` with `GROUP BY`. Backward incompatible: For primary key columns, which are not in `GROUP BY` and aren't set explicitly now is applied function `any` instead of `max`, when TTL is expired. Also if you use TTL with `WHERE` or `GROUP BY` you can see exceptions at merges, while making rolling update. [#15450](https://github.com/ClickHouse/ClickHouse/pull/15450) ([Anton Popov](https://github.com/CurtizJ)).
+
+#### New Feature
+
+* Add file engine settings: `engine_file_empty_if_not_exists` and `engine_file_truncate_on_insert`. [#20620](https://github.com/ClickHouse/ClickHouse/pull/20620) ([M0r64n](https://github.com/M0r64n)).
+* Add aggregate function `deltaSum` for summing the differences between consecutive rows. [#20057](https://github.com/ClickHouse/ClickHouse/pull/20057) ([Russ Frank](https://github.com/rf)).
+* New `event_time_microseconds` column in `system.part_log` table. [#20027](https://github.com/ClickHouse/ClickHouse/pull/20027) ([Bharat Nallan](https://github.com/bharatnc)).
+* Added `timezoneOffset(datetime)` function which will give the offset from UTC in seconds. This close [#issue:19850](https://github.com/ClickHouse/ClickHouse/issues/19850). [#19962](https://github.com/ClickHouse/ClickHouse/pull/19962) ([keenwolf](https://github.com/keen-wolf)).
+* Add setting `insert_shard_id` to support insert data into specific shard from distributed table. [#19961](https://github.com/ClickHouse/ClickHouse/pull/19961) ([flynn](https://github.com/ucasFL)).
+* Function `reinterpretAs` updated to support big integers. Fixes [#19691](https://github.com/ClickHouse/ClickHouse/issues/19691). [#19858](https://github.com/ClickHouse/ClickHouse/pull/19858) ([Maksim Kita](https://github.com/kitaisreal)).
+* Added Server Side Encryption Customer Keys (the `x-amz-server-side-encryption-customer-(key/md5)` header) support in S3 client. See [the link](https://docs.aws.amazon.com/AmazonS3/latest/dev/ServerSideEncryptionCustomerKeys.html). Closes [#19428](https://github.com/ClickHouse/ClickHouse/issues/19428). [#19748](https://github.com/ClickHouse/ClickHouse/pull/19748) ([Vladimir Chebotarev](https://github.com/excitoon)).
+* Added `implicit_key` option for `executable` dictionary source. It allows to avoid printing key for every record if records comes in the same order as the input keys. Implements [#14527](https://github.com/ClickHouse/ClickHouse/issues/14527). [#19677](https://github.com/ClickHouse/ClickHouse/pull/19677) ([Maksim Kita](https://github.com/kitaisreal)).
+* Add quota type `query_selects` and `query_inserts`. [#19603](https://github.com/ClickHouse/ClickHouse/pull/19603) ([JackyWoo](https://github.com/JackyWoo)).
+* Add function `extractTextFromHTML` [#19600](https://github.com/ClickHouse/ClickHouse/pull/19600) ([zlx19950903](https://github.com/zlx19950903)), ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Tables with `MergeTree*` engine now have two new table-level settings for query concurrency control. Setting `max_concurrent_queries` limits the number of concurrently executed queries which are related to this table. Setting `min_marks_to_honor_max_concurrent_queries` tells to apply previous setting only if query reads at least this number of marks. [#19544](https://github.com/ClickHouse/ClickHouse/pull/19544) ([Amos Bird](https://github.com/amosbird)).
+* Added `file` function to read file from user_files directory as a String. This is different from the `file` table function. This implements [#issue:18851](https://github.com/ClickHouse/ClickHouse/issues/18851). [#19204](https://github.com/ClickHouse/ClickHouse/pull/19204) ([keenwolf](https://github.com/keen-wolf)).
+
+#### Experimental feature
+
+* Add experimental `Replicated` database engine. It replicates DDL queries across multiple hosts. [#16193](https://github.com/ClickHouse/ClickHouse/pull/16193) ([tavplubix](https://github.com/tavplubix)).
+* Introduce experimental support for window functions, enabled with `allow_experimental_window_functions = 1`. This is a preliminary, alpha-quality implementation that is not suitable for production use and will change in backward-incompatible ways in future releases. Please see [the documentation](https://github.com/ClickHouse/ClickHouse/blob/master/docs/en/sql-reference/window-functions/index.md#experimental-window-functions) for the list of supported features. [#20337](https://github.com/ClickHouse/ClickHouse/pull/20337) ([Alexander Kuzmenkov](https://github.com/akuzm)).
+* Add the ability to backup/restore metadata files for DiskS3. [#18377](https://github.com/ClickHouse/ClickHouse/pull/18377) ([Pavel Kovalenko](https://github.com/Jokser)).
+
+#### Performance Improvement
+
+* Hedged requests for remote queries. When setting `use_hedged_requests` enabled (off by default), allow to establish many connections with different replicas for query. New connection is enabled in case existent connection(s) with replica(s) were not established within `hedged_connection_timeout` or no data was received within `receive_data_timeout`. Query uses the first connection which send non empty progress packet (or data packet, if `allow_changing_replica_until_first_data_packet`); other connections are cancelled. Queries with `max_parallel_replicas > 1` are supported. [#19291](https://github.com/ClickHouse/ClickHouse/pull/19291) ([Kruglov Pavel](https://github.com/Avogar)). This allows to significantly reduce tail latencies on very large clusters.
+* Added support for `PREWHERE` (and enable the corresponding optimization) when tables have row-level security expressions specified. [#19576](https://github.com/ClickHouse/ClickHouse/pull/19576) ([Denis Glazachev](https://github.com/traceon)).
+* The setting `distributed_aggregation_memory_efficient` is enabled by default. It will lower memory usage and improve performance of distributed queries. [#20599](https://github.com/ClickHouse/ClickHouse/pull/20599) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Improve performance of GROUP BY multiple fixed size keys. [#20472](https://github.com/ClickHouse/ClickHouse/pull/20472) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Improve performance of aggregate functions by more strict aliasing. [#19946](https://github.com/ClickHouse/ClickHouse/pull/19946) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Speed up reading from `Memory` tables in extreme cases (when reading speed is in order of 50 GB/sec) by simplification of pipeline and (consequently) less lock contention in pipeline scheduling. [#20468](https://github.com/ClickHouse/ClickHouse/pull/20468) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Partially reimplement HTTP server to make it making less copies of incoming and outgoing data. It gives up to 1.5 performance improvement on inserting long records over HTTP. [#19516](https://github.com/ClickHouse/ClickHouse/pull/19516) ([Ivan](https://github.com/abyss7)).
+* Add `compress` setting for `Memory` tables. If it's enabled the table will use less RAM. On some machines and datasets it can also work faster on SELECT, but it is not always the case. This closes [#20093](https://github.com/ClickHouse/ClickHouse/issues/20093). Note: there are reasons why Memory tables can work slower than MergeTree: (1) lack of compression (2) static size of blocks (3) lack of indices and prewhere... [#20168](https://github.com/ClickHouse/ClickHouse/pull/20168) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Slightly better code in aggregation. [#20978](https://github.com/ClickHouse/ClickHouse/pull/20978) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Add back `intDiv`/`modulo` specializations for better performance. This fixes [#21293](https://github.com/ClickHouse/ClickHouse/issues/21293) . The regression was introduced in https://github.com/ClickHouse/ClickHouse/pull/18145 . [#21307](https://github.com/ClickHouse/ClickHouse/pull/21307) ([Amos Bird](https://github.com/amosbird)).
+* Do not squash blocks too much on INSERT SELECT if inserting into Memory table. In previous versions inefficient data representation was created in Memory table after INSERT SELECT. This closes [#13052](https://github.com/ClickHouse/ClickHouse/issues/13052). [#20169](https://github.com/ClickHouse/ClickHouse/pull/20169) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix at least one case when DataType parser may have exponential complexity (found by fuzzer). This closes [#20096](https://github.com/ClickHouse/ClickHouse/issues/20096). [#20132](https://github.com/ClickHouse/ClickHouse/pull/20132) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Parallelize SELECT with FINAL for single part with level > 0 when `do_not_merge_across_partitions_select_final` setting is 1. [#19375](https://github.com/ClickHouse/ClickHouse/pull/19375) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fill only requested columns when querying `system.parts` and `system.parts_columns`. Closes [#19570](https://github.com/ClickHouse/ClickHouse/issues/19570). [#21035](https://github.com/ClickHouse/ClickHouse/pull/21035) ([Anmol Arora](https://github.com/anmolarora)).
+* Perform algebraic optimizations of arithmetic expressions inside `avg` aggregate function. close [#20092](https://github.com/ClickHouse/ClickHouse/issues/20092). [#20183](https://github.com/ClickHouse/ClickHouse/pull/20183) ([flynn](https://github.com/ucasFL)).
+
+#### Improvement
+
+* Case-insensitive compression methods for table functions. Also fixed LZMA compression method which was checked in upper case. [#21416](https://github.com/ClickHouse/ClickHouse/pull/21416) ([Vladimir Chebotarev](https://github.com/excitoon)).
+* Add two settings to delay or throw error during insertion when there are too many inactive parts. This is useful when server fails to clean up parts quickly enough. [#20178](https://github.com/ClickHouse/ClickHouse/pull/20178) ([Amos Bird](https://github.com/amosbird)).
+* Provide better compatibility for mysql clients. 1. mysql jdbc 2. mycli. [#21367](https://github.com/ClickHouse/ClickHouse/pull/21367) ([Amos Bird](https://github.com/amosbird)).
+* Forbid to drop a column if it's referenced by materialized view. Closes [#21164](https://github.com/ClickHouse/ClickHouse/issues/21164). [#21303](https://github.com/ClickHouse/ClickHouse/pull/21303) ([flynn](https://github.com/ucasFL)).
+* MySQL dictionary source will now retry unexpected connection failures (Lost connection to MySQL server during query) which sometimes happen on SSL/TLS connections. [#21237](https://github.com/ClickHouse/ClickHouse/pull/21237) ([Alexander Kazakov](https://github.com/Akazz)).
+* Usability improvement: more consistent `DateTime64` parsing: recognize the case when unix timestamp with subsecond resolution is specified as scaled integer (like `1111111111222` instead of `1111111111.222`). This closes [#13194](https://github.com/ClickHouse/ClickHouse/issues/13194). [#21053](https://github.com/ClickHouse/ClickHouse/pull/21053) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Do only merging of sorted blocks on initiator with distributed_group_by_no_merge. [#20882](https://github.com/ClickHouse/ClickHouse/pull/20882) ([Azat Khuzhin](https://github.com/azat)).
+* When loading config for mysql source ClickHouse will now randomize the list of replicas with the same priority to ensure the round-robin logics of picking mysql endpoint. This closes [#20629](https://github.com/ClickHouse/ClickHouse/issues/20629). [#20632](https://github.com/ClickHouse/ClickHouse/pull/20632) ([Alexander Kazakov](https://github.com/Akazz)).
+* Function 'reinterpretAs(x, Type)' renamed into 'reinterpret(x, Type)'. [#20611](https://github.com/ClickHouse/ClickHouse/pull/20611) ([Maksim Kita](https://github.com/kitaisreal)).
+* Support vhost for RabbitMQ engine [#20576](https://github.com/ClickHouse/ClickHouse/issues/20576). [#20596](https://github.com/ClickHouse/ClickHouse/pull/20596) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Improved serialization for data types combined of Arrays and Tuples. Improved matching enum data types to protobuf enum type. Fixed serialization of the `Map` data type. Omitted values are now set by default. [#20506](https://github.com/ClickHouse/ClickHouse/pull/20506) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fixed race between execution of distributed DDL tasks and cleanup of DDL queue. Now DDL task cannot be removed from ZooKeeper if there are active workers. Fixes [#20016](https://github.com/ClickHouse/ClickHouse/issues/20016). [#20448](https://github.com/ClickHouse/ClickHouse/pull/20448) ([tavplubix](https://github.com/tavplubix)).
+* Make FQDN and other DNS related functions work correctly in alpine images. [#20336](https://github.com/ClickHouse/ClickHouse/pull/20336) ([filimonov](https://github.com/filimonov)).
+* Do not allow early constant folding of explicitly forbidden functions. [#20303](https://github.com/ClickHouse/ClickHouse/pull/20303) ([Azat Khuzhin](https://github.com/azat)).
+* Implicit conversion from integer to Decimal type might succeeded if integer value doe not fit into Decimal type. Now it throws `ARGUMENT_OUT_OF_BOUND`. [#20232](https://github.com/ClickHouse/ClickHouse/pull/20232) ([tavplubix](https://github.com/tavplubix)).
+* Lockless `SYSTEM FLUSH DISTRIBUTED`. [#20215](https://github.com/ClickHouse/ClickHouse/pull/20215) ([Azat Khuzhin](https://github.com/azat)).
+* Normalize count(constant), sum(1) to count(). This is needed for projection query routing. [#20175](https://github.com/ClickHouse/ClickHouse/pull/20175) ([Amos Bird](https://github.com/amosbird)).
+* Support all native integer types in bitmap functions. [#20171](https://github.com/ClickHouse/ClickHouse/pull/20171) ([Amos Bird](https://github.com/amosbird)).
+* Updated `CacheDictionary`, `ComplexCacheDictionary`, `SSDCacheDictionary`, `SSDComplexKeyDictionary` to use LRUHashMap as underlying index. [#20164](https://github.com/ClickHouse/ClickHouse/pull/20164) ([Maksim Kita](https://github.com/kitaisreal)).
+* The setting `access_management` is now configurable on startup by providing `CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT`, defaults to disabled (`0`) which was the prior value. [#20139](https://github.com/ClickHouse/ClickHouse/pull/20139) ([Marquitos](https://github.com/sonirico)).
+* Fix toDateTime64(toDate()/toDateTime()) for DateTime64 - Implement DateTime64 clamping to match DateTime behaviour. [#20131](https://github.com/ClickHouse/ClickHouse/pull/20131) ([Azat Khuzhin](https://github.com/azat)).
+* Quota improvements: SHOW TABLES is now considered as one query in the quota calculations, not two queries. SYSTEM queries now consume quota. Fix calculation of interval's end in quota consumption. [#20106](https://github.com/ClickHouse/ClickHouse/pull/20106) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Supports `path IN (set)` expressions for `system.zookeeper` table. [#20105](https://github.com/ClickHouse/ClickHouse/pull/20105) ([小路](https://github.com/nicelulu)).
+* Show full details of `MaterializeMySQL` tables in `system.tables`. [#20051](https://github.com/ClickHouse/ClickHouse/pull/20051) ([Stig Bakken](https://github.com/stigsb)).
+* Fix data race in executable dictionary that was possible only on misuse (when the script returns data ignoring its input). [#20045](https://github.com/ClickHouse/ClickHouse/pull/20045) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* The value of MYSQL_OPT_RECONNECT option can now be controlled by "opt_reconnect" parameter in the config section of mysql replica. [#19998](https://github.com/ClickHouse/ClickHouse/pull/19998) ([Alexander Kazakov](https://github.com/Akazz)).
+* If user calls `JSONExtract` function with `Float32` type requested, allow inaccurate conversion to the result type. For example the number `0.1` in JSON is double precision and is not representable in Float32, but the user still wants to get it. Previous versions return 0 for non-Nullable type and NULL for Nullable type to indicate that conversion is imprecise. The logic was 100% correct but it was surprising to users and leading to questions. This closes [#13962](https://github.com/ClickHouse/ClickHouse/issues/13962). [#19960](https://github.com/ClickHouse/ClickHouse/pull/19960) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Add conversion of block structure for INSERT into Distributed tables if it does not match. [#19947](https://github.com/ClickHouse/ClickHouse/pull/19947) ([Azat Khuzhin](https://github.com/azat)).
+* Improvement for the `system.distributed_ddl_queue` table. Initialize MaxDDLEntryID to the last value after restarting. Before this PR, MaxDDLEntryID will remain zero until a new DDLTask is processed. [#19924](https://github.com/ClickHouse/ClickHouse/pull/19924) ([Amos Bird](https://github.com/amosbird)).
+* Show `MaterializeMySQL` tables in `system.parts`. [#19770](https://github.com/ClickHouse/ClickHouse/pull/19770) ([Stig Bakken](https://github.com/stigsb)).
+* Add separate config directive for `Buffer` profile. [#19721](https://github.com/ClickHouse/ClickHouse/pull/19721) ([Azat Khuzhin](https://github.com/azat)).
+* Move conditions that are not related to JOIN to WHERE clause. [#18720](https://github.com/ClickHouse/ClickHouse/issues/18720). [#19685](https://github.com/ClickHouse/ClickHouse/pull/19685) ([hexiaoting](https://github.com/hexiaoting)).
+* Add ability to throttle INSERT into Distributed based on amount of pending bytes for async send (`bytes_to_delay_insert`/`max_delay_to_insert` and `bytes_to_throw_insert` settings for `Distributed` engine has been added). [#19673](https://github.com/ClickHouse/ClickHouse/pull/19673) ([Azat Khuzhin](https://github.com/azat)).
+* Fix some rare cases when write errors can be ignored in destructors. [#19451](https://github.com/ClickHouse/ClickHouse/pull/19451) ([Azat Khuzhin](https://github.com/azat)).
+* Print inline frames in stack traces for fatal errors. [#19317](https://github.com/ClickHouse/ClickHouse/pull/19317) ([Ivan](https://github.com/abyss7)).
+
+#### Bug Fix
+
+* Fix redundant reconnects to ZooKeeper and the possibility of two active sessions for a single clickhouse server. Both problems introduced in #14678. [#21264](https://github.com/ClickHouse/ClickHouse/pull/21264) ([alesapin](https://github.com/alesapin)).
+* Fix error `Bad cast from type ... to DB::ColumnLowCardinality` while inserting into table with `LowCardinality` column from `Values` format. Fixes #21140 [#21357](https://github.com/ClickHouse/ClickHouse/pull/21357) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix a deadlock in `ALTER DELETE` mutations for non replicated MergeTree table engines when the predicate contains the table itself. Fixes [#20558](https://github.com/ClickHouse/ClickHouse/issues/20558). [#21477](https://github.com/ClickHouse/ClickHouse/pull/21477) ([alesapin](https://github.com/alesapin)).
+* Fix SIGSEGV for distributed queries on failures. [#21434](https://github.com/ClickHouse/ClickHouse/pull/21434) ([Azat Khuzhin](https://github.com/azat)).
+* Now `ALTER MODIFY COLUMN` queries will correctly affect changes in partition key, skip indices, TTLs, and so on. Fixes [#13675](https://github.com/ClickHouse/ClickHouse/issues/13675). [#21334](https://github.com/ClickHouse/ClickHouse/pull/21334) ([alesapin](https://github.com/alesapin)).
+* Fix bug with `join_use_nulls` and joining `TOTALS` from subqueries. This closes [#19362](https://github.com/ClickHouse/ClickHouse/issues/19362) and [#21137](https://github.com/ClickHouse/ClickHouse/issues/21137). [#21248](https://github.com/ClickHouse/ClickHouse/pull/21248) ([vdimir](https://github.com/vdimir)).
+* Fix crash in `EXPLAIN` for query with `UNION`. Fixes [#20876](https://github.com/ClickHouse/ClickHouse/issues/20876), [#21170](https://github.com/ClickHouse/ClickHouse/issues/21170). [#21246](https://github.com/ClickHouse/ClickHouse/pull/21246) ([flynn](https://github.com/ucasFL)).
+* Now mutations allowed only for table engines that support them (MergeTree family, Memory, MaterializedView). Other engines will report a more clear error. Fixes [#21168](https://github.com/ClickHouse/ClickHouse/issues/21168). [#21183](https://github.com/ClickHouse/ClickHouse/pull/21183) ([alesapin](https://github.com/alesapin)).
+* Fixes [#21112](https://github.com/ClickHouse/ClickHouse/issues/21112). Fixed bug that could cause duplicates with insert query (if one of the callbacks came a little too late). [#21138](https://github.com/ClickHouse/ClickHouse/pull/21138) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix `input_format_null_as_default` take effective when types are nullable. This fixes [#21116](https://github.com/ClickHouse/ClickHouse/issues/21116) . [#21121](https://github.com/ClickHouse/ClickHouse/pull/21121) ([Amos Bird](https://github.com/amosbird)).
+* fix bug related to cast Tuple to Map. Closes [#21029](https://github.com/ClickHouse/ClickHouse/issues/21029). [#21120](https://github.com/ClickHouse/ClickHouse/pull/21120) ([hexiaoting](https://github.com/hexiaoting)).
+* Fix the metadata leak when the Replicated*MergeTree with custom (non default) ZooKeeper cluster is dropped. [#21119](https://github.com/ClickHouse/ClickHouse/pull/21119) ([fastio](https://github.com/fastio)).
+* Fix type mismatch issue when using LowCardinality keys in joinGet. This fixes [#21114](https://github.com/ClickHouse/ClickHouse/issues/21114). [#21117](https://github.com/ClickHouse/ClickHouse/pull/21117) ([Amos Bird](https://github.com/amosbird)).
+* fix default_replica_path and default_replica_name values are useless on Replicated(*)MergeTree engine when the engine needs specify other parameters. [#21060](https://github.com/ClickHouse/ClickHouse/pull/21060) ([mxzlxy](https://github.com/mxzlxy)).
+* Out of bound memory access was possible when formatting specifically crafted out of range value of type `DateTime64`. This closes [#20494](https://github.com/ClickHouse/ClickHouse/issues/20494). This closes [#20543](https://github.com/ClickHouse/ClickHouse/issues/20543). [#21023](https://github.com/ClickHouse/ClickHouse/pull/21023) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Block parallel insertions into storage join. [#21009](https://github.com/ClickHouse/ClickHouse/pull/21009) ([vdimir](https://github.com/vdimir)).
+* Fixed behaviour, when `ALTER MODIFY COLUMN` created mutation, that will knowingly fail. [#21007](https://github.com/ClickHouse/ClickHouse/pull/21007) ([Anton Popov](https://github.com/CurtizJ)).
+* Closes [#9969](https://github.com/ClickHouse/ClickHouse/issues/9969). Fixed Brotli http compression error, which reproduced for large data sizes, slightly complicated structure and with json output format. Update Brotli to the latest version to include the "fix rare access to uninitialized data in ring-buffer". [#20991](https://github.com/ClickHouse/ClickHouse/pull/20991) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix 'Empty task was returned from async task queue' on query cancellation. [#20881](https://github.com/ClickHouse/ClickHouse/pull/20881) ([Azat Khuzhin](https://github.com/azat)).
+* `USE database;` query did not work when using MySQL 5.7 client to connect to ClickHouse server, it's fixed. Fixes [#18926](https://github.com/ClickHouse/ClickHouse/issues/18926). [#20878](https://github.com/ClickHouse/ClickHouse/pull/20878) ([tavplubix](https://github.com/tavplubix)).
+* Fix usage of `-Distinct` combinator with `-State` combinator in aggregate functions. [#20866](https://github.com/ClickHouse/ClickHouse/pull/20866) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix subquery with union distinct and limit clause. close [#20597](https://github.com/ClickHouse/ClickHouse/issues/20597). [#20610](https://github.com/ClickHouse/ClickHouse/pull/20610) ([flynn](https://github.com/ucasFL)).
+* Fixed inconsistent behavior of dictionary in case of queries where we look for absent keys in dictionary. [#20578](https://github.com/ClickHouse/ClickHouse/pull/20578) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Fix the number of threads for scalar subqueries and subqueries for index (after [#19007](https://github.com/ClickHouse/ClickHouse/issues/19007) single thread was always used). Fixes [#20457](https://github.com/ClickHouse/ClickHouse/issues/20457), [#20512](https://github.com/ClickHouse/ClickHouse/issues/20512). [#20550](https://github.com/ClickHouse/ClickHouse/pull/20550) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix crash which could happen if unknown packet was received from remove query (was introduced in [#17868](https://github.com/ClickHouse/ClickHouse/issues/17868)). [#20547](https://github.com/ClickHouse/ClickHouse/pull/20547) ([Azat Khuzhin](https://github.com/azat)).
+* Add proper checks while parsing directory names for async INSERT (fixes SIGSEGV). [#20498](https://github.com/ClickHouse/ClickHouse/pull/20498) ([Azat Khuzhin](https://github.com/azat)).
+* Fix function `transform` does not work properly for floating point keys. Closes [#20460](https://github.com/ClickHouse/ClickHouse/issues/20460). [#20479](https://github.com/ClickHouse/ClickHouse/pull/20479) ([flynn](https://github.com/ucasFL)).
+* Fix infinite loop when propagating WITH aliases to subqueries. This fixes [#20388](https://github.com/ClickHouse/ClickHouse/issues/20388). [#20476](https://github.com/ClickHouse/ClickHouse/pull/20476) ([Amos Bird](https://github.com/amosbird)).
+* Fix abnormal server termination when http client goes away. [#20464](https://github.com/ClickHouse/ClickHouse/pull/20464) ([Azat Khuzhin](https://github.com/azat)).
+* Fix `LOGICAL_ERROR` for `join_use_nulls=1` when JOIN contains const from SELECT. [#20461](https://github.com/ClickHouse/ClickHouse/pull/20461) ([Azat Khuzhin](https://github.com/azat)).
+* Check if table function `view` is used in expression list and throw an error. This fixes [#20342](https://github.com/ClickHouse/ClickHouse/issues/20342). [#20350](https://github.com/ClickHouse/ClickHouse/pull/20350) ([Amos Bird](https://github.com/amosbird)).
+* Avoid invalid dereference in RANGE_HASHED() dictionary. [#20345](https://github.com/ClickHouse/ClickHouse/pull/20345) ([Azat Khuzhin](https://github.com/azat)).
+* Fix null dereference with `join_use_nulls=1`. [#20344](https://github.com/ClickHouse/ClickHouse/pull/20344) ([Azat Khuzhin](https://github.com/azat)).
+* Fix incorrect result of binary operations between two constant decimals of different scale. Fixes [#20283](https://github.com/ClickHouse/ClickHouse/issues/20283). [#20339](https://github.com/ClickHouse/ClickHouse/pull/20339) ([Maksim Kita](https://github.com/kitaisreal)).
+* Fix too often retries of failed background tasks for `ReplicatedMergeTree` table engines family. This could lead to too verbose logging and increased CPU load. Fixes [#20203](https://github.com/ClickHouse/ClickHouse/issues/20203). [#20335](https://github.com/ClickHouse/ClickHouse/pull/20335) ([alesapin](https://github.com/alesapin)).
+* Restrict to `DROP` or `RENAME` version column of `*CollapsingMergeTree` and `ReplacingMergeTree` table engines. [#20300](https://github.com/ClickHouse/ClickHouse/pull/20300) ([alesapin](https://github.com/alesapin)).
+* Fixed the behavior when in case of broken JSON we tried to read the whole file into memory which leads to exception from the allocator. Fixes [#19719](https://github.com/ClickHouse/ClickHouse/issues/19719). [#20286](https://github.com/ClickHouse/ClickHouse/pull/20286) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Fix exception during vertical merge for `MergeTree` table engines family which don't allow to perform vertical merges. Fixes [#20259](https://github.com/ClickHouse/ClickHouse/issues/20259). [#20279](https://github.com/ClickHouse/ClickHouse/pull/20279) ([alesapin](https://github.com/alesapin)).
+* Fix rare server crash on config reload during the shutdown. Fixes [#19689](https://github.com/ClickHouse/ClickHouse/issues/19689). [#20224](https://github.com/ClickHouse/ClickHouse/pull/20224) ([alesapin](https://github.com/alesapin)).
+* Fix CTE when using in INSERT SELECT. This fixes [#20187](https://github.com/ClickHouse/ClickHouse/issues/20187), fixes [#20195](https://github.com/ClickHouse/ClickHouse/issues/20195). [#20211](https://github.com/ClickHouse/ClickHouse/pull/20211) ([Amos Bird](https://github.com/amosbird)).
+* Fixes [#19314](https://github.com/ClickHouse/ClickHouse/issues/19314). [#20156](https://github.com/ClickHouse/ClickHouse/pull/20156) ([Ivan](https://github.com/abyss7)).
+* fix toMinute function to handle special timezone correctly. [#20149](https://github.com/ClickHouse/ClickHouse/pull/20149) ([keenwolf](https://github.com/keen-wolf)).
+* Fix server crash after query with `if` function with `Tuple` type of then/else branches result. `Tuple` type must contain `Array` or another complex type. Fixes [#18356](https://github.com/ClickHouse/ClickHouse/issues/18356). [#20133](https://github.com/ClickHouse/ClickHouse/pull/20133) ([alesapin](https://github.com/alesapin)).
+* The `MongoDB` table engine now establishes connection only when it's going to read data. `ATTACH TABLE` won't try to connect anymore. [#20110](https://github.com/ClickHouse/ClickHouse/pull/20110) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Bugfix in StorageJoin. [#20079](https://github.com/ClickHouse/ClickHouse/pull/20079) ([vdimir](https://github.com/vdimir)).
+* Fix the case when calculating modulo of division of negative number by small divisor, the resulting data type was not large enough to accomodate the negative result. This closes [#20052](https://github.com/ClickHouse/ClickHouse/issues/20052). [#20067](https://github.com/ClickHouse/ClickHouse/pull/20067) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* MaterializeMySQL: Fix replication for statements that update several tables. [#20066](https://github.com/ClickHouse/ClickHouse/pull/20066) ([Håvard Kvålen](https://github.com/havardk)).
+* Prevent "Connection refused" in docker during initialization script execution. [#20012](https://github.com/ClickHouse/ClickHouse/pull/20012) ([filimonov](https://github.com/filimonov)).
+* `EmbeddedRocksDB` is an experimental storage. Fix the issue with lack of proper type checking. Simplified code. This closes [#19967](https://github.com/ClickHouse/ClickHouse/issues/19967). [#19972](https://github.com/ClickHouse/ClickHouse/pull/19972) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix a segfault in function `fromModifiedJulianDay` when the argument type is `Nullable(T)` for any integral types other than Int32. [#19959](https://github.com/ClickHouse/ClickHouse/pull/19959) ([PHO](https://github.com/depressed-pho)).
+* BloomFilter index crash fix. Fixes [#19757](https://github.com/ClickHouse/ClickHouse/issues/19757). [#19884](https://github.com/ClickHouse/ClickHouse/pull/19884) ([Maksim Kita](https://github.com/kitaisreal)).
+* Deadlock was possible if system.text_log is enabled. This fixes [#19874](https://github.com/ClickHouse/ClickHouse/issues/19874). [#19875](https://github.com/ClickHouse/ClickHouse/pull/19875) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix starting the server with tables having default expressions containing dictGet(). Allow getting return type of dictGet() without loading dictionary. [#19805](https://github.com/ClickHouse/ClickHouse/pull/19805) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fix clickhouse-client abort exception while executing only `select`. [#19790](https://github.com/ClickHouse/ClickHouse/pull/19790) ([taiyang-li](https://github.com/taiyang-li)).
+* Fix a bug that moving pieces to destination table may failed in case of launching multiple clickhouse-copiers. [#19743](https://github.com/ClickHouse/ClickHouse/pull/19743) ([madianjun](https://github.com/mdianjun)).
+* Background thread which executes `ON CLUSTER` queries might hang waiting for dropped replicated table to do something. It's fixed. [#19684](https://github.com/ClickHouse/ClickHouse/pull/19684) ([yiguolei](https://github.com/yiguolei)).
+
+#### Build/Testing/Packaging Improvement
+
+* Allow to build ClickHouse with AVX-2 enabled globally. It gives slight performance benefits on modern CPUs. Not recommended for production and will not be supported as official build for now. [#20180](https://github.com/ClickHouse/ClickHouse/pull/20180) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix some of the issues found by Coverity. See [#19964](https://github.com/ClickHouse/ClickHouse/issues/19964). [#20010](https://github.com/ClickHouse/ClickHouse/pull/20010) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Allow to start up with modified binary under gdb. In previous version if you set up breakpoint in gdb before start, server will refuse to start up due to failed integrity check. [#21258](https://github.com/ClickHouse/ClickHouse/pull/21258) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Add a test for different compression methods in Kafka. [#21111](https://github.com/ClickHouse/ClickHouse/pull/21111) ([filimonov](https://github.com/filimonov)).
+* Fixed port clash from test_storage_kerberized_hdfs test. [#19974](https://github.com/ClickHouse/ClickHouse/pull/19974) ([Ilya Yatsishin](https://github.com/qoega)).
+* Print `stdout` and `stderr` to log when failed to start docker in integration tests. Before this PR there was a very short error message in this case which didn't help to investigate the problems. [#20631](https://github.com/ClickHouse/ClickHouse/pull/20631) ([Vitaly Baranov](https://github.com/vitlibar)).
+
+
 ## ClickHouse release 21.2
 
 ### ClickHouse release v21.2.2.8-stable, 2021-02-07
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9002f1df140..1423f3a0bc2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,6 +39,8 @@ else()
     set(RECONFIGURE_MESSAGE_LEVEL STATUS)
 endif()
 
+enable_language(C CXX ASM)
+
 include (cmake/arch.cmake)
 include (cmake/target.cmake)
 include (cmake/tools.cmake)
@@ -66,17 +68,30 @@ endif ()
 
 include (cmake/find/ccache.cmake)
 
-option(ENABLE_CHECK_HEAVY_BUILDS "Don't allow C++ translation units to compile too long or to take too much memory while compiling" OFF)
+# Take care to add prlimit in command line before ccache, or else ccache thinks that
+# prlimit is compiler, and clang++ is its input file, and refuses to work  with
+# multiple inputs, e.g in ccache log:
+# [2021-03-31T18:06:32.655327 36900] Command line: /usr/bin/ccache prlimit --as=10000000000 --data=5000000000 --cpu=600 /usr/bin/clang++-11 - ...... std=gnu++2a -MD -MT src/CMakeFiles/dbms.dir/Storages/MergeTree/IMergeTreeDataPart.cpp.o -MF src/CMakeFiles/dbms.dir/Storages/MergeTree/IMergeTreeDataPart.cpp.o.d -o src/CMakeFiles/dbms.dir/Storages/MergeTree/IMergeTreeDataPart.cpp.o -c ../src/Storages/MergeTree/IMergeTreeDataPart.cpp
+#
+# [2021-03-31T18:06:32.656704 36900] Multiple input files: /usr/bin/clang++-11 and ../src/Storages/MergeTree/IMergeTreeDataPart.cpp
+#
+# Another way would be to use --ccache-skip option before clang++-11 to make
+# ccache ignore it.
+option(ENABLE_CHECK_HEAVY_BUILDS "Don't allow C++ translation units to compile too long or to take too much memory while compiling." OFF)
 if (ENABLE_CHECK_HEAVY_BUILDS)
     # set DATA (since RSS does not work since 2.6.x+) to 2G
     set (RLIMIT_DATA 5000000000)
     # set VIRT (RLIMIT_AS) to 10G (DATA*10)
     set (RLIMIT_AS 10000000000)
+    # set CPU time limit to 600 seconds
+    set (RLIMIT_CPU 600)
+
     # gcc10/gcc10/clang -fsanitize=memory is too heavy
     if (SANITIZE STREQUAL "memory" OR COMPILER_GCC)
        set (RLIMIT_DATA 10000000000)
     endif()
-    set (CMAKE_CXX_COMPILER_LAUNCHER prlimit --as=${RLIMIT_AS} --data=${RLIMIT_DATA} --cpu=600)
+
+    set (CMAKE_CXX_COMPILER_LAUNCHER prlimit --as=${RLIMIT_AS} --data=${RLIMIT_DATA} --cpu=${RLIMIT_CPU} ${CMAKE_CXX_COMPILER_LAUNCHER})
 endif ()
 
 if (NOT CMAKE_BUILD_TYPE OR CMAKE_BUILD_TYPE STREQUAL "None")
@@ -155,7 +170,6 @@ option(ENABLE_TESTS "Provide unit_test_dbms target with Google.Test unit tests"
 
 if (OS_LINUX AND NOT UNBUNDLED AND MAKE_STATIC_LIBRARIES AND NOT SPLIT_SHARED_LIBRARIES AND CMAKE_VERSION VERSION_GREATER "3.9.0")
     # Only for Linux, x86_64.
-    # Implies ${ENABLE_FASTMEMCPY}
     option(GLIBC_COMPATIBILITY "Enable compatibility with older glibc libraries." ON)
 elseif(GLIBC_COMPATIBILITY)
     message (${RECONFIGURE_MESSAGE_LEVEL} "Glibc compatibility cannot be enabled in current configuration")
@@ -169,7 +183,7 @@ endif ()
 set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -rdynamic")
 
 if (OS_LINUX)
-    find_program (OBJCOPY_PATH NAMES "llvm-objcopy" "llvm-objcopy-11" "llvm-objcopy-10" "llvm-objcopy-9" "llvm-objcopy-8" "objcopy")
+    find_program (OBJCOPY_PATH NAMES "llvm-objcopy" "llvm-objcopy-12" "llvm-objcopy-11" "llvm-objcopy-10" "llvm-objcopy-9" "llvm-objcopy-8" "objcopy")
     if (OBJCOPY_PATH)
         message(STATUS "Using objcopy: ${OBJCOPY_PATH}.")
 
@@ -241,9 +255,7 @@ else()
     message(STATUS "Disabling compiler -pipe option (have only ${AVAILABLE_PHYSICAL_MEMORY} mb of memory)")
 endif()
 
-if(NOT DISABLE_CPU_OPTIMIZE)
-    include(cmake/cpu_features.cmake)
-endif()
+include(cmake/cpu_features.cmake)
 
 option(ARCH_NATIVE "Add -march=native compiler flag")
 
@@ -251,25 +263,39 @@ if (ARCH_NATIVE)
     set (COMPILER_FLAGS "${COMPILER_FLAGS} -march=native")
 endif ()
 
-if (COMPILER_GCC OR COMPILER_CLANG)
-    # to make numeric_limits<__int128> works with GCC
-    set (_CXX_STANDARD "gnu++2a")
-else()
-    set (_CXX_STANDARD "c++2a")
-endif()
+if (${CMAKE_VERSION} VERSION_LESS "3.12.4")
+    # CMake < 3.12 doesn't support setting 20 as a C++ standard version.
+    # We will add C++ standard controlling flag in CMAKE_CXX_FLAGS manually for now.
 
-# cmake < 3.12 doesn't support 20. We'll set CMAKE_CXX_FLAGS for now
-# set (CMAKE_CXX_STANDARD 20)
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=${_CXX_STANDARD}")
+    if (COMPILER_GCC OR COMPILER_CLANG)
+        # to make numeric_limits<__int128> works with GCC
+        set (_CXX_STANDARD "gnu++2a")
+    else ()
+        set (_CXX_STANDARD "c++2a")
+    endif ()
 
-set (CMAKE_CXX_EXTENSIONS 0) # https://cmake.org/cmake/help/latest/prop_tgt/CXX_EXTENSIONS.html#prop_tgt:CXX_EXTENSIONS
-set (CMAKE_CXX_STANDARD_REQUIRED ON)
+    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=${_CXX_STANDARD}")
+else ()
+    set (CMAKE_CXX_STANDARD 20)
+    set (CMAKE_CXX_EXTENSIONS ON) # Same as gnu++2a (ON) vs c++2a (OFF): https://cmake.org/cmake/help/latest/prop_tgt/CXX_EXTENSIONS.html
+    set (CMAKE_CXX_STANDARD_REQUIRED ON)
+endif ()
+
+set (CMAKE_C_STANDARD 11)
+set (CMAKE_C_EXTENSIONS ON)
+set (CMAKE_C_STANDARD_REQUIRED ON)
 
 if (COMPILER_GCC OR COMPILER_CLANG)
     # Enable C++14 sized global deallocation functions. It should be enabled by setting -std=c++14 but I'm not sure.
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsized-deallocation")
 endif ()
 
+# falign-functions=32 prevents from random performance regressions with the code change. Thus, providing more stable
+# benchmarks.
+if (COMPILER_GCC OR COMPILER_CLANG)
+    set(COMPILER_FLAGS "${COMPILER_FLAGS} -falign-functions=32")
+endif ()
+
 # Compiler-specific coverage flags e.g. -fcoverage-mapping for gcc
 option(WITH_COVERAGE "Profile the resulting binary/binaries" OFF)
 
@@ -331,7 +357,7 @@ if (COMPILER_CLANG)
     endif ()
 
     # Always prefer llvm tools when using clang. For instance, we cannot use GNU ar when llvm LTO is enabled
-    find_program (LLVM_AR_PATH NAMES "llvm-ar" "llvm-ar-11" "llvm-ar-10" "llvm-ar-9" "llvm-ar-8")
+    find_program (LLVM_AR_PATH NAMES "llvm-ar" "llvm-ar-12" "llvm-ar-11" "llvm-ar-10" "llvm-ar-9" "llvm-ar-8")
 
     if (LLVM_AR_PATH)
         message(STATUS "Using llvm-ar: ${LLVM_AR_PATH}.")
@@ -340,7 +366,7 @@ if (COMPILER_CLANG)
         message(WARNING "Cannot find llvm-ar. System ar will be used instead. It does not work with ThinLTO.")
     endif ()
 
-    find_program (LLVM_RANLIB_PATH NAMES "llvm-ranlib" "llvm-ranlib-11" "llvm-ranlib-10" "llvm-ranlib-9" "llvm-ranlib-8")
+    find_program (LLVM_RANLIB_PATH NAMES "llvm-ranlib" "llvm-ranlib-12" "llvm-ranlib-11" "llvm-ranlib-10" "llvm-ranlib-9" "llvm-ranlib-8")
 
     if (LLVM_RANLIB_PATH)
         message(STATUS "Using llvm-ranlib: ${LLVM_RANLIB_PATH}.")
@@ -457,6 +483,7 @@ find_contrib_lib(double-conversion) # Must be before parquet
 include (cmake/find/ssl.cmake)
 include (cmake/find/ldap.cmake) # after ssl
 include (cmake/find/icu.cmake)
+include (cmake/find/xz.cmake)
 include (cmake/find/zlib.cmake)
 include (cmake/find/zstd.cmake)
 include (cmake/find/ltdl.cmake) # for odbc
@@ -489,6 +516,7 @@ include (cmake/find/fast_float.cmake)
 include (cmake/find/rapidjson.cmake)
 include (cmake/find/fastops.cmake)
 include (cmake/find/odbc.cmake)
+include (cmake/find/nanodbc.cmake)
 include (cmake/find/rocksdb.cmake)
 include (cmake/find/libpqxx.cmake)
 include (cmake/find/nuraft.cmake)
@@ -504,6 +532,7 @@ include (cmake/find/msgpack.cmake)
 include (cmake/find/cassandra.cmake)
 include (cmake/find/sentry.cmake)
 include (cmake/find/stats.cmake)
+include (cmake/find/datasketches.cmake)
 
 set (USE_INTERNAL_CITYHASH_LIBRARY ON CACHE INTERNAL "")
 find_contrib_lib(cityhash)
@@ -536,7 +565,7 @@ macro (add_executable target)
     # explicitly acquire and interpose malloc symbols by clickhouse_malloc
     # if GLIBC_COMPATIBILITY is ON and ENABLE_THINLTO is on than provide memcpy symbol explicitly to neutrialize thinlto's libcall generation.
     if (GLIBC_COMPATIBILITY AND ENABLE_THINLTO)
-        _add_executable (${ARGV} $<TARGET_OBJECTS:clickhouse_malloc> $<TARGET_OBJECTS:clickhouse_memcpy>)
+        _add_executable (${ARGV} $<TARGET_OBJECTS:clickhouse_malloc> $<TARGET_OBJECTS:memcpy>)
     else ()
         _add_executable (${ARGV} $<TARGET_OBJECTS:clickhouse_malloc>)
     endif ()
diff --git a/README.md b/README.md
index 3329a98877f..ea9f365a3c6 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ ClickHouse® is an open-source column-oriented database management system that a
 * [Tutorial](https://clickhouse.tech/docs/en/getting_started/tutorial/) shows how to set up and query small ClickHouse cluster.
 * [Documentation](https://clickhouse.tech/docs/en/) provides more in-depth information.
 * [YouTube channel](https://www.youtube.com/c/ClickHouseDB) has a lot of content about ClickHouse in video format.
-* [Slack](https://join.slack.com/t/clickhousedb/shared_invite/zt-ly9m4w1x-6j7x5Ts_pQZqrctAbRZ3cg) and [Telegram](https://telegram.me/clickhouse_en) allow to chat with ClickHouse users in real-time.
+* [Slack](https://join.slack.com/t/clickhousedb/shared_invite/zt-nwwakmk4-xOJ6cdy0sJC3It8j348~IA) and [Telegram](https://telegram.me/clickhouse_en) allow to chat with ClickHouse users in real-time.
 * [Blog](https://clickhouse.yandex/blog/en/) contains various ClickHouse-related articles, as well as announcements and reports about events.
 * [Code Browser](https://clickhouse.tech/codebrowser/html_report/ClickHouse/index.html) with syntax highlight and navigation.
 * [Contacts](https://clickhouse.tech/#contacts) can help to get your questions answered if there are any.
diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt
index 46bd57eda12..023dcaaccae 100644
--- a/base/CMakeLists.txt
+++ b/base/CMakeLists.txt
@@ -8,6 +8,7 @@ add_subdirectory (loggers)
 add_subdirectory (pcg-random)
 add_subdirectory (widechar_width)
 add_subdirectory (readpassphrase)
+add_subdirectory (bridge)
 
 if (USE_MYSQL)
     add_subdirectory (mysqlxx)
diff --git a/base/bridge/CMakeLists.txt b/base/bridge/CMakeLists.txt
new file mode 100644
index 00000000000..20b0b651677
--- /dev/null
+++ b/base/bridge/CMakeLists.txt
@@ -0,0 +1,7 @@
+add_library (bridge
+    IBridge.cpp
+)
+
+target_include_directories (daemon PUBLIC ..)
+target_link_libraries (bridge PRIVATE daemon dbms Poco::Data Poco::Data::ODBC)
+
diff --git a/base/bridge/IBridge.cpp b/base/bridge/IBridge.cpp
new file mode 100644
index 00000000000..b1f71315fef
--- /dev/null
+++ b/base/bridge/IBridge.cpp
@@ -0,0 +1,238 @@
+#include "IBridge.h"
+
+#include <IO/ReadHelpers.h>
+#include <boost/program_options.hpp>
+#include <Poco/Net/NetException.h>
+#include <Poco/Util/HelpFormatter.h>
+#include <Common/StringUtils/StringUtils.h>
+#include <Formats/registerFormats.h>
+#include <common/logger_useful.h>
+#include <Common/SensitiveDataMasker.h>
+#include <Server/HTTP/HTTPServer.h>
+
+#if USE_ODBC
+#    include <Poco/Data/ODBC/Connector.h>
+#endif
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int ARGUMENT_OUT_OF_BOUND;
+}
+
+namespace
+{
+    Poco::Net::SocketAddress makeSocketAddress(const std::string & host, UInt16 port, Poco::Logger * log)
+    {
+        Poco::Net::SocketAddress socket_address;
+        try
+        {
+            socket_address = Poco::Net::SocketAddress(host, port);
+        }
+        catch (const Poco::Net::DNSException & e)
+        {
+            const auto code = e.code();
+            if (code == EAI_FAMILY
+#if defined(EAI_ADDRFAMILY)
+                || code == EAI_ADDRFAMILY
+#endif
+            )
+            {
+                LOG_ERROR(log, "Cannot resolve listen_host ({}), error {}: {}. If it is an IPv6 address and your host has disabled IPv6, then consider to specify IPv4 address to listen in <listen_host> element of configuration file. Example: <listen_host>0.0.0.0</listen_host>", host, e.code(), e.message());
+            }
+
+            throw;
+        }
+        return socket_address;
+    }
+
+    Poco::Net::SocketAddress socketBindListen(Poco::Net::ServerSocket & socket, const std::string & host, UInt16 port, Poco::Logger * log)
+    {
+        auto address = makeSocketAddress(host, port, log);
+#if POCO_VERSION < 0x01080000
+        socket.bind(address, /* reuseAddress = */ true);
+#else
+        socket.bind(address, /* reuseAddress = */ true, /* reusePort = */ false);
+#endif
+
+        socket.listen(/* backlog = */ 64);
+
+        return address;
+    }
+}
+
+
+void IBridge::handleHelp(const std::string &, const std::string &)
+{
+    Poco::Util::HelpFormatter help_formatter(options());
+    help_formatter.setCommand(commandName());
+    help_formatter.setHeader("HTTP-proxy for odbc requests");
+    help_formatter.setUsage("--http-port <port>");
+    help_formatter.format(std::cerr);
+
+    stopOptionsProcessing();
+}
+
+
+void IBridge::defineOptions(Poco::Util::OptionSet & options)
+{
+    options.addOption(
+        Poco::Util::Option("http-port", "", "port to listen").argument("http-port", true) .binding("http-port"));
+
+    options.addOption(
+        Poco::Util::Option("listen-host", "", "hostname or address to listen, default 127.0.0.1").argument("listen-host").binding("listen-host"));
+
+    options.addOption(
+        Poco::Util::Option("http-timeout", "", "http timeout for socket, default 1800").argument("http-timeout").binding("http-timeout"));
+
+    options.addOption(
+        Poco::Util::Option("max-server-connections", "", "max connections to server, default 1024").argument("max-server-connections").binding("max-server-connections"));
+
+    options.addOption(
+        Poco::Util::Option("keep-alive-timeout", "", "keepalive timeout, default 10").argument("keep-alive-timeout").binding("keep-alive-timeout"));
+
+    options.addOption(
+        Poco::Util::Option("log-level", "", "sets log level, default info") .argument("log-level").binding("logger.level"));
+
+    options.addOption(
+        Poco::Util::Option("log-path", "", "log path for all logs, default console").argument("log-path").binding("logger.log"));
+
+    options.addOption(
+        Poco::Util::Option("err-log-path", "", "err log path for all logs, default no").argument("err-log-path").binding("logger.errorlog"));
+
+    options.addOption(
+        Poco::Util::Option("stdout-path", "", "stdout log path, default console").argument("stdout-path").binding("logger.stdout"));
+
+    options.addOption(
+        Poco::Util::Option("stderr-path", "", "stderr log path, default console").argument("stderr-path").binding("logger.stderr"));
+
+    using Me = std::decay_t<decltype(*this)>;
+
+    options.addOption(
+        Poco::Util::Option("help", "", "produce this help message").binding("help").callback(Poco::Util::OptionCallback<Me>(this, &Me::handleHelp)));
+
+    ServerApplication::defineOptions(options); // NOLINT Don't need complex BaseDaemon's .xml config
+}
+
+
+void IBridge::initialize(Application & self)
+{
+    BaseDaemon::closeFDs();
+    is_help = config().has("help");
+
+    if (is_help)
+        return;
+
+    config().setString("logger", bridgeName());
+
+    /// Redirect stdout, stderr to specified files.
+    /// Some libraries and sanitizers write to stderr in case of errors.
+    const auto stdout_path = config().getString("logger.stdout", "");
+    if (!stdout_path.empty())
+    {
+        if (!freopen(stdout_path.c_str(), "a+", stdout))
+            throw Poco::OpenFileException("Cannot attach stdout to " + stdout_path);
+
+        /// Disable buffering for stdout.
+        setbuf(stdout, nullptr);
+    }
+    const auto stderr_path = config().getString("logger.stderr", "");
+    if (!stderr_path.empty())
+    {
+        if (!freopen(stderr_path.c_str(), "a+", stderr))
+            throw Poco::OpenFileException("Cannot attach stderr to " + stderr_path);
+
+        /// Disable buffering for stderr.
+        setbuf(stderr, nullptr);
+    }
+
+    buildLoggers(config(), logger(), self.commandName());
+
+    BaseDaemon::logRevision();
+
+    log = &logger();
+    hostname = config().getString("listen-host", "127.0.0.1");
+    port = config().getUInt("http-port");
+    if (port > 0xFFFF)
+        throw Exception("Out of range 'http-port': " + std::to_string(port), ErrorCodes::ARGUMENT_OUT_OF_BOUND);
+
+    http_timeout = config().getUInt("http-timeout", DEFAULT_HTTP_READ_BUFFER_TIMEOUT);
+    max_server_connections = config().getUInt("max-server-connections", 1024);
+    keep_alive_timeout = config().getUInt("keep-alive-timeout", 10);
+
+    initializeTerminationAndSignalProcessing();
+
+#if USE_ODBC
+    if (bridgeName() == "ODBCBridge")
+        Poco::Data::ODBC::Connector::registerConnector();
+#endif
+
+    ServerApplication::initialize(self); // NOLINT
+}
+
+
+void IBridge::uninitialize()
+{
+    BaseDaemon::uninitialize();
+}
+
+
+int IBridge::main(const std::vector<std::string> & /*args*/)
+{
+    if (is_help)
+        return Application::EXIT_OK;
+
+    registerFormats();
+    LOG_INFO(log, "Starting up {} on host: {}, port: {}", bridgeName(), hostname, port);
+
+    Poco::Net::ServerSocket socket;
+    auto address = socketBindListen(socket, hostname, port, log);
+    socket.setReceiveTimeout(http_timeout);
+    socket.setSendTimeout(http_timeout);
+
+    Poco::ThreadPool server_pool(3, max_server_connections);
+
+    Poco::Net::HTTPServerParams::Ptr http_params = new Poco::Net::HTTPServerParams;
+    http_params->setTimeout(http_timeout);
+    http_params->setKeepAliveTimeout(keep_alive_timeout);
+
+    auto shared_context = Context::createShared();
+    auto context = Context::createGlobal(shared_context.get());
+    context->makeGlobalContext();
+
+    if (config().has("query_masking_rules"))
+        SensitiveDataMasker::setInstance(std::make_unique<SensitiveDataMasker>(config(), "query_masking_rules"));
+
+    auto server = HTTPServer(
+        context,
+        getHandlerFactoryPtr(context),
+        server_pool,
+        socket,
+        http_params);
+
+    SCOPE_EXIT({
+        LOG_DEBUG(log, "Received termination signal.");
+        LOG_DEBUG(log, "Waiting for current connections to close.");
+
+        server.stop();
+
+        for (size_t count : ext::range(1, 6))
+        {
+            if (server.currentConnections() == 0)
+                break;
+            LOG_DEBUG(log, "Waiting for {} connections, try {}", server.currentConnections(), count);
+            std::this_thread::sleep_for(std::chrono::milliseconds(1000));
+        }
+    });
+
+    server.start();
+    LOG_INFO(log, "Listening http://{}", address.toString());
+
+    waitForTerminationRequest();
+    return Application::EXIT_OK;
+}
+
+}
diff --git a/base/bridge/IBridge.h b/base/bridge/IBridge.h
new file mode 100644
index 00000000000..c64003d9959
--- /dev/null
+++ b/base/bridge/IBridge.h
@@ -0,0 +1,51 @@
+#pragma once
+
+#include <Interpreters/Context.h>
+#include <Server/HTTP/HTTPRequestHandlerFactory.h>
+#include <daemon/BaseDaemon.h>
+
+#include <Poco/Logger.h>
+#include <Poco/Util/ServerApplication.h>
+
+
+namespace DB
+{
+
+/// Class represents base for clickhouse-odbc-bridge and clickhouse-library-bridge servers.
+/// Listens to incoming HTTP POST and GET requests on specified port and host.
+/// Has two handlers '/' for all incoming POST requests and /ping for GET request about service status.
+class IBridge : public BaseDaemon
+{
+
+public:
+    /// Define command line arguments
+    void defineOptions(Poco::Util::OptionSet & options) override;
+
+protected:
+    using HandlerFactoryPtr = std::shared_ptr<HTTPRequestHandlerFactory>;
+
+    void initialize(Application & self) override;
+
+    void uninitialize() override;
+
+    int main(const std::vector<std::string> & args) override;
+
+    virtual std::string bridgeName() const = 0;
+
+    virtual HandlerFactoryPtr getHandlerFactoryPtr(ContextPtr context) const = 0;
+
+    size_t keep_alive_timeout;
+
+private:
+    void handleHelp(const std::string &, const std::string &);
+
+    bool is_help;
+    std::string hostname;
+    size_t port;
+    std::string log_level;
+    size_t max_server_connections;
+    size_t http_timeout;
+
+    Poco::Logger * log;
+};
+}
diff --git a/base/common/BorrowedObjectPool.h b/base/common/BorrowedObjectPool.h
new file mode 100644
index 00000000000..6a90a7e7122
--- /dev/null
+++ b/base/common/BorrowedObjectPool.h
@@ -0,0 +1,156 @@
+#pragma once
+
+#include <cstdint>
+#include <vector>
+#include <chrono>
+#include <mutex>
+#include <condition_variable>
+
+#include <common/defines.h>
+#include <common/MoveOrCopyIfThrow.h>
+
+/** Pool for limited size objects that cannot be used from different threads simultaneously.
+  * The main use case is to have fixed size of objects that can be reused in difference threads during their lifetime
+  * and have to be initialized on demand.
+  * Two main properties of pool are allocated objects size and borrowed objects size.
+  * Allocated objects size is size of objects that are currently allocated by the pool.
+  * Borrowed objects size is size of objects that are borrowed by clients.
+  * If max_size == 0 then pool has unlimited size and objects will be allocated without limit.
+  *
+  * Pool provides following strategy for borrowing object:
+  * If max_size == 0 then pool has unlimited size and objects will be allocated without limit.
+  * 1. If pool has objects that can be borrowed increase borrowed objects size and return it.
+  * 2. If pool allocatedObjectsSize is lower than max objects size or pool has unlimited size
+  * allocate new object, increase borrowed objects size and return it.
+  * 3. If pool is full wait on condition variable with or without timeout until some object
+  * will be returned to the pool.
+  */
+template <typename T>
+class BorrowedObjectPool final
+{
+public:
+    explicit BorrowedObjectPool(size_t max_size_) : max_size(max_size_) {}
+
+    /// Borrow object from pool. If pull is full and all objects were borrowed
+    /// then calling thread will wait until some object will be returned into pool.
+    template <typename FactoryFunc>
+    void borrowObject(T & dest, FactoryFunc && func)
+    {
+        std::unique_lock<std::mutex> lock(objects_mutex);
+
+        if (!objects.empty())
+        {
+            dest = borrowFromObjects(lock);
+            return;
+        }
+
+        bool has_unlimited_size = (max_size == 0);
+
+        if (unlikely(has_unlimited_size) || allocated_objects_size < max_size)
+        {
+            dest = allocateObjectForBorrowing(lock, std::forward<FactoryFunc>(func));
+            return;
+        }
+
+        condition_variable.wait(lock, [this] { return !objects.empty(); });
+        dest = borrowFromObjects(lock);
+    }
+
+    /// Same as borrowObject function, but wait with timeout.
+    /// Returns true if object was borrowed during timeout.
+    template <typename FactoryFunc>
+    bool tryBorrowObject(T & dest, FactoryFunc && func, size_t timeout_in_milliseconds = 0)
+    {
+        std::unique_lock<std::mutex> lock(objects_mutex);
+
+        if (!objects.empty())
+        {
+            dest = borrowFromObjects(lock);
+            return true;
+        }
+
+        bool has_unlimited_size = (max_size == 0);
+
+        if (unlikely(has_unlimited_size) || allocated_objects_size < max_size)
+        {
+            dest = allocateObjectForBorrowing(lock, std::forward<FactoryFunc>(func));
+            return true;
+        }
+
+        bool wait_result = condition_variable.wait_for(lock, std::chrono::milliseconds(timeout_in_milliseconds), [this] { return !objects.empty(); });
+
+        if (wait_result)
+            dest = borrowFromObjects(lock);
+
+        return wait_result;
+    }
+
+    /// Return object into pool. Client must return same object that was borrowed.
+    inline void returnObject(T && object_to_return)
+    {
+        std::unique_lock<std::mutex> lck(objects_mutex);
+
+        objects.emplace_back(std::move(object_to_return));
+        --borrowed_objects_size;
+
+        condition_variable.notify_one();
+    }
+
+    /// Max pool size
+    inline size_t maxSize() const
+    {
+        return max_size;
+    }
+
+    /// Allocated objects size by the pool. If allocatedObjectsSize == maxSize then pool is full.
+    inline size_t allocatedObjectsSize() const
+    {
+        std::unique_lock<std::mutex> lock(objects_mutex);
+        return allocated_objects_size;
+    }
+
+    /// Returns allocatedObjectsSize == maxSize
+    inline bool isFull() const
+    {
+        std::unique_lock<std::mutex> lock(objects_mutex);
+        return allocated_objects_size == max_size;
+    }
+
+    /// Borrowed objects size. If borrowedObjectsSize == allocatedObjectsSize and pool is full.
+    /// Then client will wait during borrowObject function call.
+    inline size_t borrowedObjectsSize() const
+    {
+        std::unique_lock<std::mutex> lock(objects_mutex);
+        return borrowed_objects_size;
+    }
+
+private:
+
+    template <typename FactoryFunc>
+    inline T allocateObjectForBorrowing(const std::unique_lock<std::mutex> &, FactoryFunc && func)
+    {
+        ++allocated_objects_size;
+        ++borrowed_objects_size;
+
+        return std::forward<FactoryFunc>(func)();
+    }
+
+    inline T borrowFromObjects(const std::unique_lock<std::mutex> &)
+    {
+        T dst;
+        detail::moveOrCopyIfThrow(std::move(objects.back()), dst);
+        objects.pop_back();
+
+        ++borrowed_objects_size;
+
+        return dst;
+    }
+
+    size_t max_size;
+
+    mutable std::mutex objects_mutex;
+    std::condition_variable condition_variable;
+    size_t allocated_objects_size = 0;
+    size_t borrowed_objects_size = 0;
+    std::vector<T> objects;
+};
diff --git a/base/common/CMakeLists.txt b/base/common/CMakeLists.txt
index cea52b443dd..7dfb9bc10c0 100644
--- a/base/common/CMakeLists.txt
+++ b/base/common/CMakeLists.txt
@@ -47,6 +47,10 @@ endif()
 
 target_include_directories(common PUBLIC .. ${CMAKE_CURRENT_BINARY_DIR}/..)
 
+if (OS_DARWIN AND NOT MAKE_STATIC_LIBRARIES)
+    target_link_libraries(common PUBLIC -Wl,-U,_inside_main)
+endif()
+
 # Allow explicit fallback to readline
 if (NOT ENABLE_REPLXX AND ENABLE_READLINE)
     message (STATUS "Attempt to fallback to readline explicitly")
@@ -74,7 +78,6 @@ target_link_libraries (common
         ${CITYHASH_LIBRARIES}
         boost::headers_only
         boost::system
-        FastMemcpy
         Poco::Net
         Poco::Net::SSL
         Poco::Util
diff --git a/base/common/DateLUT.cpp b/base/common/DateLUT.cpp
index 6ff0884701c..d14b63cd70a 100644
--- a/base/common/DateLUT.cpp
+++ b/base/common/DateLUT.cpp
@@ -152,7 +152,7 @@ const DateLUTImpl & DateLUT::getImplementation(const std::string & time_zone) co
 
     auto it = impls.emplace(time_zone, nullptr).first;
     if (!it->second)
-        it->second = std::make_unique<DateLUTImpl>(time_zone);
+        it->second = std::unique_ptr<DateLUTImpl>(new DateLUTImpl(time_zone));
 
     return *it->second;
 }
diff --git a/base/common/DateLUT.h b/base/common/DateLUT.h
index 93c6cb403e2..378b4360f3b 100644
--- a/base/common/DateLUT.h
+++ b/base/common/DateLUT.h
@@ -32,7 +32,6 @@ public:
 
         return date_lut.getImplementation(time_zone);
     }
-
     static void setDefaultTimezone(const std::string & time_zone)
     {
         auto & date_lut = getInstance();
diff --git a/base/common/DateLUTImpl.cpp b/base/common/DateLUTImpl.cpp
index 50620e21b8f..e7faeb63760 100644
--- a/base/common/DateLUTImpl.cpp
+++ b/base/common/DateLUTImpl.cpp
@@ -46,24 +46,41 @@ DateLUTImpl::DateLUTImpl(const std::string & time_zone_)
     if (&inside_main)
         assert(inside_main);
 
-    size_t i = 0;
-    time_t start_of_day = 0;
-
     cctz::time_zone cctz_time_zone;
     if (!cctz::load_time_zone(time_zone, &cctz_time_zone))
         throw Poco::Exception("Cannot load time zone " + time_zone_);
 
-    cctz::time_zone::absolute_lookup start_of_epoch_lookup = cctz_time_zone.lookup(std::chrono::system_clock::from_time_t(start_of_day));
-    offset_at_start_of_epoch = start_of_epoch_lookup.offset;
-    offset_is_whole_number_of_hours_everytime = true;
+    constexpr cctz::civil_day epoch{1970, 1, 1};
+    constexpr cctz::civil_day lut_start{DATE_LUT_MIN_YEAR, 1, 1};
+    time_t start_of_day;
 
-    cctz::civil_day date{1970, 1, 1};
+    /// Note: it's validated against all timezones in the system.
+    static_assert((epoch - lut_start) == daynum_offset_epoch);
 
+    offset_at_start_of_epoch = cctz_time_zone.lookup(cctz_time_zone.lookup(epoch).pre).offset;
+    offset_at_start_of_lut = cctz_time_zone.lookup(cctz_time_zone.lookup(lut_start).pre).offset;
+    offset_is_whole_number_of_hours_during_epoch = true;
+
+    cctz::civil_day date = lut_start;
+
+    UInt32 i = 0;
     do
     {
         cctz::time_zone::civil_lookup lookup = cctz_time_zone.lookup(date);
 
-        start_of_day = std::chrono::system_clock::to_time_t(lookup.pre);    /// Ambiguity is possible.
+        /// Ambiguity is possible if time was changed backwards at the midnight
+        /// or after midnight time has been changed back to midnight, for example one hour backwards at 01:00
+        /// or after midnight time has been changed to the previous day, for example two hours backwards at 01:00
+        /// Then midnight appears twice. Usually time change happens exactly at 00:00 or 01:00.
+
+        /// If transition did not involve previous day, we should use the first midnight as the start of the day,
+        /// otherwise it's better to use the second midnight.
+
+        std::chrono::time_point start_of_day_time_point = lookup.trans < lookup.post
+            ? lookup.post /* Second midnight appears after transition, so there was a piece of previous day after transition */
+            : lookup.pre;
+
+        start_of_day = std::chrono::system_clock::to_time_t(start_of_day_time_point);
 
         Values & values = lut[i];
         values.year = date.year();
@@ -72,7 +89,7 @@ DateLUTImpl::DateLUTImpl(const std::string & time_zone_)
         values.day_of_week = getDayOfWeek(date);
         values.date = start_of_day;
 
-        assert(values.year >= DATE_LUT_MIN_YEAR && values.year <= DATE_LUT_MAX_YEAR);
+        assert(values.year >= DATE_LUT_MIN_YEAR && values.year <= DATE_LUT_MAX_YEAR + 1);
         assert(values.month >= 1 && values.month <= 12);
         assert(values.day_of_month >= 1 && values.day_of_month <= 31);
         assert(values.day_of_week >= 1 && values.day_of_week <= 7);
@@ -85,50 +102,42 @@ DateLUTImpl::DateLUTImpl(const std::string & time_zone_)
         else
             values.days_in_month = i != 0 ? lut[i - 1].days_in_month : 31;
 
-        values.time_at_offset_change = 0;
-        values.amount_of_offset_change = 0;
+        values.time_at_offset_change_value = 0;
+        values.amount_of_offset_change_value = 0;
 
-        if (start_of_day % 3600)
-            offset_is_whole_number_of_hours_everytime = false;
+        if (offset_is_whole_number_of_hours_during_epoch && start_of_day > 0 && start_of_day % 3600)
+            offset_is_whole_number_of_hours_during_epoch = false;
 
-        /// If UTC offset was changed in previous day.
-        if (i != 0)
+        /// If UTC offset was changed this day.
+        /// Change in time zone without transition is possible, e.g. Moscow 1991 Sun, 31 Mar, 02:00 MSK to EEST
+        cctz::time_zone::civil_transition transition{};
+        if (cctz_time_zone.next_transition(start_of_day_time_point - std::chrono::seconds(1), &transition)
+            && (cctz::civil_day(transition.from) == date || cctz::civil_day(transition.to) == date)
+            && transition.from != transition.to)
         {
-            auto amount_of_offset_change_at_prev_day = 86400 - (lut[i].date - lut[i - 1].date);
-            if (amount_of_offset_change_at_prev_day)
-            {
-                lut[i - 1].amount_of_offset_change = amount_of_offset_change_at_prev_day;
+            values.time_at_offset_change_value = (transition.from - cctz::civil_second(date)) / Values::OffsetChangeFactor;
+            values.amount_of_offset_change_value = (transition.to - transition.from) / Values::OffsetChangeFactor;
 
-                const auto utc_offset_at_beginning_of_day = cctz_time_zone.lookup(std::chrono::system_clock::from_time_t(lut[i - 1].date)).offset;
+//            std::cerr << time_zone << ", " << date << ": change from " << transition.from << " to " << transition.to << "\n";
+//            std::cerr << time_zone << ", " << date << ": change at " << values.time_at_offset_change() << " with " << values.amount_of_offset_change() << "\n";
 
-                /// Find a time (timestamp offset from beginning of day),
-                ///  when UTC offset was changed. Search is performed with 15-minute granularity, assuming it is enough.
+            /// We don't support too large changes.
+            if (values.amount_of_offset_change_value > 24 * 4)
+                values.amount_of_offset_change_value = 24 * 4;
+            else if (values.amount_of_offset_change_value < -24 * 4)
+                values.amount_of_offset_change_value = -24 * 4;
 
-                time_t time_at_offset_change = 900;
-                while (time_at_offset_change < 86400)
-                {
-                    auto utc_offset_at_current_time = cctz_time_zone.lookup(std::chrono::system_clock::from_time_t(
-                        lut[i - 1].date + time_at_offset_change)).offset;
-
-                    if (utc_offset_at_current_time != utc_offset_at_beginning_of_day)
-                        break;
-
-                    time_at_offset_change += 900;
-                }
-
-                lut[i - 1].time_at_offset_change = time_at_offset_change;
-
-                /// We doesn't support cases when time change results in switching to previous day.
-                if (static_cast<int>(lut[i - 1].time_at_offset_change) + static_cast<int>(lut[i - 1].amount_of_offset_change) < 0)
-                    lut[i - 1].time_at_offset_change = -lut[i - 1].amount_of_offset_change;
-            }
+            /// We don't support cases when time change results in switching to previous day.
+            /// Shift the point of time change later.
+            if (values.time_at_offset_change_value + values.amount_of_offset_change_value < 0)
+                values.time_at_offset_change_value = -values.amount_of_offset_change_value;
         }
 
         /// Going to next day.
         ++date;
         ++i;
     }
-    while (start_of_day <= DATE_LUT_MAX && i <= DATE_LUT_MAX_DAY_NUM);
+    while (i < DATE_LUT_SIZE && lut[i - 1].year <= DATE_LUT_MAX_YEAR);
 
     /// Fill excessive part of lookup table. This is needed only to simplify handling of overflow cases.
     while (i < DATE_LUT_SIZE)
diff --git a/base/common/DateLUTImpl.h b/base/common/DateLUTImpl.h
index 064787fb64e..9e60181e802 100644
--- a/base/common/DateLUTImpl.h
+++ b/base/common/DateLUTImpl.h
@@ -5,23 +5,32 @@
 #include "types.h"
 
 #include <ctime>
+#include <cassert>
 #include <string>
+#include <type_traits>
 
 
-#define DATE_LUT_MAX (0xFFFFFFFFU - 86400)
-#define DATE_LUT_MAX_DAY_NUM (0xFFFFFFFFU / 86400)
-/// Table size is bigger than DATE_LUT_MAX_DAY_NUM to fill all indices within UInt16 range: this allows to remove extra check.
-#define DATE_LUT_SIZE 0x10000
-#define DATE_LUT_MIN_YEAR 1970
-#define DATE_LUT_MAX_YEAR 2106 /// Last supported year (incomplete)
+#define DATE_LUT_MIN_YEAR 1925 /// 1925 since wast majority of timezones changed to 15-minute aligned offsets somewhere in 1924 or earlier.
+#define DATE_LUT_MAX_YEAR 2283 /// Last supported year (complete)
 #define DATE_LUT_YEARS (1 + DATE_LUT_MAX_YEAR - DATE_LUT_MIN_YEAR) /// Number of years in lookup table
 
+#define DATE_LUT_SIZE 0x20000
+
+#define DATE_LUT_MAX (0xFFFFFFFFU - 86400)
+#define DATE_LUT_MAX_DAY_NUM 0xFFFF
+
+/// A constant to add to time_t so every supported time point becomes non-negative and still has the same remainder of division by 3600.
+/// If we treat "remainder of division" operation in the sense of modular arithmetic (not like in C++).
+#define DATE_LUT_ADD ((1970 - DATE_LUT_MIN_YEAR) * 366 * 86400)
+
+
 #if defined(__PPC__)
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
 #endif
 #endif
 
+
 /// Flags for toYearWeek() function.
 enum class WeekModeFlag : UInt8
 {
@@ -37,7 +46,8 @@ using YearWeek = std::pair<UInt16, UInt8>;
   */
 class DateLUTImpl
 {
-public:
+private:
+    friend class DateLUT;
     explicit DateLUTImpl(const std::string & time_zone);
 
     DateLUTImpl(const DateLUTImpl &) = delete;
@@ -45,14 +55,75 @@ public:
     DateLUTImpl(const DateLUTImpl &&) = delete;
     DateLUTImpl & operator=(const DateLUTImpl &&) = delete;
 
+    // Normalized and bound-checked index of element in lut,
+    // has to be a separate type to support overloading
+    // TODO: make sure that any arithmetic on LUTIndex actually results in valid LUTIndex.
+    STRONG_TYPEDEF(UInt32, LUTIndex)
+
+    template <typename T>
+    friend inline LUTIndex operator+(const LUTIndex & index, const T v)
+    {
+        return LUTIndex{(index.toUnderType() + UInt32(v)) & date_lut_mask};
+    }
+
+    template <typename T>
+    friend inline LUTIndex operator+(const T v, const LUTIndex & index)
+    {
+        return LUTIndex{(v + index.toUnderType()) & date_lut_mask};
+    }
+
+    friend inline LUTIndex operator+(const LUTIndex & index, const LUTIndex & v)
+    {
+        return LUTIndex{(index.toUnderType() + v.toUnderType()) & date_lut_mask};
+    }
+
+    template <typename T>
+    friend inline LUTIndex operator-(const LUTIndex & index, const T v)
+    {
+        return LUTIndex{(index.toUnderType() - UInt32(v)) & date_lut_mask};
+    }
+
+    template <typename T>
+    friend inline LUTIndex operator-(const T v, const LUTIndex & index)
+    {
+        return LUTIndex{(v - index.toUnderType()) & date_lut_mask};
+    }
+
+    friend inline LUTIndex operator-(const LUTIndex & index, const LUTIndex & v)
+    {
+        return LUTIndex{(index.toUnderType() - v.toUnderType()) & date_lut_mask};
+    }
+
+    template <typename T>
+    friend inline LUTIndex operator*(const LUTIndex & index, const T v)
+    {
+        return LUTIndex{(index.toUnderType() * UInt32(v)) & date_lut_mask};
+    }
+
+    template <typename T>
+    friend inline LUTIndex operator*(const T v, const LUTIndex & index)
+    {
+        return LUTIndex{(v * index.toUnderType()) & date_lut_mask};
+    }
+
+    template <typename T>
+    friend inline LUTIndex operator/(const LUTIndex & index, const T v)
+    {
+        return LUTIndex{(index.toUnderType() / UInt32(v)) & date_lut_mask};
+    }
+
+    template <typename T>
+    friend inline LUTIndex operator/(const T v, const LUTIndex & index)
+    {
+        return LUTIndex{(UInt32(v) / index.toUnderType()) & date_lut_mask};
+    }
+
 public:
     /// The order of fields matters for alignment and sizeof.
     struct Values
     {
-        /// Least significat 32 bits from time_t at beginning of the day.
-        /// If the unix timestamp of beginning of the day is negative (example: 1970-01-01 MSK, where time_t == -10800), then value will overflow.
-        /// Change to time_t; change constants above; and recompile the sources if you need to support time after 2105 year.
-        UInt32 date;
+        /// time_t at beginning of the day.
+        Int64 date;
 
         /// Properties of the day.
         UInt16 year;
@@ -65,107 +136,189 @@ public:
         UInt8 days_in_month;
 
         /// For days, when offset from UTC was changed due to daylight saving time or permanent change, following values could be non zero.
-        Int16 amount_of_offset_change; /// Usually -3600 or 3600, but look at Lord Howe Island.
-        UInt32 time_at_offset_change; /// In seconds from beginning of the day.
+        /// All in OffsetChangeFactor (15 minute) intervals.
+        Int8 amount_of_offset_change_value; /// Usually -4 or 4, but look at Lord Howe Island. Multiply by OffsetChangeFactor
+        UInt8 time_at_offset_change_value; /// In seconds from beginning of the day. Multiply by OffsetChangeFactor
+
+        inline Int32 amount_of_offset_change() const
+        {
+            return static_cast<Int32>(amount_of_offset_change_value) * OffsetChangeFactor;
+        }
+
+        inline UInt32 time_at_offset_change() const
+        {
+            return static_cast<UInt32>(time_at_offset_change_value) * OffsetChangeFactor;
+        }
+
+        /// Since most of the modern timezones have a DST change aligned to 15 minutes, to save as much space as possible inside Value,
+        /// we are dividing any offset change related value by this factor before setting it to Value,
+        /// hence it has to be explicitly multiplied back by this factor before being used.
+        static constexpr UInt16 OffsetChangeFactor = 900;
     };
 
     static_assert(sizeof(Values) == 16);
 
 private:
-    /// Lookup table is indexed by DayNum.
+
+    /// Mask is all-ones to allow efficient protection against overflow.
+    static constexpr UInt32 date_lut_mask = 0x1ffff;
+    static_assert(date_lut_mask == DATE_LUT_SIZE - 1);
+
+    /// Offset to epoch in days (ExtendedDayNum) of the first day in LUT.
+    /// "epoch" is the Unix Epoch (starts at unix timestamp zero)
+    static constexpr UInt32 daynum_offset_epoch = 16436;
+    static_assert(daynum_offset_epoch == (1970 - DATE_LUT_MIN_YEAR) * 365 + (1970 - DATE_LUT_MIN_YEAR / 4 * 4) / 4);
+
+    /// Lookup table is indexed by LUTIndex.
     /// Day nums are the same in all time zones. 1970-01-01 is 0 and so on.
     /// Table is relatively large, so better not to place the object on stack.
     /// In comparison to std::vector, plain array is cheaper by one indirection.
-    Values lut[DATE_LUT_SIZE];
+    Values lut[DATE_LUT_SIZE + 1];
 
-    /// Year number after DATE_LUT_MIN_YEAR -> day num for start of year.
-    DayNum years_lut[DATE_LUT_YEARS];
+    /// Year number after DATE_LUT_MIN_YEAR -> LUTIndex in lut for start of year.
+    LUTIndex years_lut[DATE_LUT_YEARS];
 
     /// Year number after DATE_LUT_MIN_YEAR * month number starting at zero -> day num for first day of month
-    DayNum years_months_lut[DATE_LUT_YEARS * 12];
+    LUTIndex years_months_lut[DATE_LUT_YEARS * 12];
 
     /// UTC offset at beginning of the Unix epoch. The same as unix timestamp of 1970-01-01 00:00:00 local time.
     time_t offset_at_start_of_epoch;
-    bool offset_is_whole_number_of_hours_everytime;
+    /// UTC offset at the beginning of the first supported year.
+    time_t offset_at_start_of_lut;
+    bool offset_is_whole_number_of_hours_during_epoch;
 
     /// Time zone name.
     std::string time_zone;
 
-
-    /// We can correctly process only timestamps that less DATE_LUT_MAX (i.e. up to 2105 year inclusively)
-    /// We don't care about overflow.
-    inline DayNum findIndex(time_t t) const
+    inline LUTIndex findIndex(time_t t) const
     {
         /// First guess.
-        DayNum guess(t / 86400);
+        Int64 guess = (t / 86400) + daynum_offset_epoch;
+
+        /// For negative time_t the integer division was rounded up, so the guess is offset by one.
+        if (unlikely(t < 0))
+            --guess;
+
+        if (guess < 0)
+            return LUTIndex(0);
+        if (guess >= DATE_LUT_SIZE)
+            return LUTIndex(DATE_LUT_SIZE - 1);
 
         /// UTC offset is from -12 to +14 in all known time zones. This requires checking only three indices.
 
-        if ((guess == 0 || t >= lut[guess].date) && t < lut[DayNum(guess + 1)].date)
-            return guess;
+        if (t >= lut[guess].date)
+        {
+            if (guess + 1 >= DATE_LUT_SIZE || t < lut[guess + 1].date)
+                return LUTIndex(guess);
 
-        /// Time zones that have offset 0 from UTC do daylight saving time change (if any) towards increasing UTC offset (example: British Standard Time).
-        if (t >= lut[DayNum(guess + 1)].date)
-            return DayNum(guess + 1);
+            return LUTIndex(guess + 1);
+        }
 
-        return DayNum(guess - 1);
+        return LUTIndex(guess ? guess - 1 : 0);
     }
 
-    inline const Values & find(time_t t) const
+    inline LUTIndex toLUTIndex(DayNum d) const
     {
-        return lut[findIndex(t)];
+        return LUTIndex{(d + daynum_offset_epoch) & date_lut_mask};
+    }
+
+    inline LUTIndex toLUTIndex(ExtendedDayNum d) const
+    {
+        return LUTIndex{static_cast<UInt32>(d + daynum_offset_epoch) & date_lut_mask};
+    }
+
+    inline LUTIndex toLUTIndex(time_t t) const
+    {
+        return findIndex(t);
+    }
+
+    inline LUTIndex toLUTIndex(LUTIndex i) const
+    {
+        return i;
+    }
+
+    template <typename DateOrTime>
+    inline const Values & find(DateOrTime v) const
+    {
+        return lut[toLUTIndex(v)];
+    }
+
+    template <typename T, typename Divisor>
+    static inline T roundDown(T x, Divisor divisor)
+    {
+        static_assert(std::is_integral_v<T> && std::is_integral_v<Divisor>);
+        assert(divisor > 0);
+
+        if (likely(x >= 0))
+            return x / divisor * divisor;
+
+        /// Integer division for negative numbers rounds them towards zero (up).
+        /// We will shift the number so it will be rounded towards -inf (down).
+
+        return (x + 1 - divisor) / divisor * divisor;
     }
 
 public:
     const std::string & getTimeZone() const { return time_zone; }
 
+    // Methods only for unit-testing, it makes very little sense to use it from user code.
+    auto getOffsetAtStartOfEpoch() const { return offset_at_start_of_epoch; }
+    auto getTimeOffsetAtStartOfLUT() const { return offset_at_start_of_lut; }
+
     /// All functions below are thread-safe; arguments are not checked.
 
-    inline time_t toDate(time_t t) const { return find(t).date; }
-    inline unsigned toMonth(time_t t) const { return find(t).month; }
-    inline unsigned toQuarter(time_t t) const { return (find(t).month - 1) / 3 + 1; }
-    inline unsigned toYear(time_t t) const { return find(t).year; }
-    inline unsigned toDayOfWeek(time_t t) const { return find(t).day_of_week; }
-    inline unsigned toDayOfMonth(time_t t) const { return find(t).day_of_month; }
+    inline ExtendedDayNum toDayNum(ExtendedDayNum d) const
+    {
+        return d;
+    }
+
+    template <typename DateOrTime>
+    inline ExtendedDayNum toDayNum(DateOrTime v) const
+    {
+        return ExtendedDayNum{static_cast<ExtendedDayNum::UnderlyingType>(toLUTIndex(v).toUnderType() - daynum_offset_epoch)};
+    }
 
     /// Round down to start of monday.
-    inline time_t toFirstDayOfWeek(time_t t) const
+    template <typename DateOrTime>
+    inline time_t toFirstDayOfWeek(DateOrTime v) const
     {
-        DayNum index = findIndex(t);
-        return lut[DayNum(index - (lut[index].day_of_week - 1))].date;
+        const LUTIndex i = toLUTIndex(v);
+        return lut[i - (lut[i].day_of_week - 1)].date;
     }
 
-    inline DayNum toFirstDayNumOfWeek(DayNum d) const
+    template <typename DateOrTime>
+    inline ExtendedDayNum toFirstDayNumOfWeek(DateOrTime v) const
     {
-        return DayNum(d - (lut[d].day_of_week - 1));
-    }
-
-    inline DayNum toFirstDayNumOfWeek(time_t t) const
-    {
-        return toFirstDayNumOfWeek(toDayNum(t));
+        const LUTIndex i = toLUTIndex(v);
+        return toDayNum(i - (lut[i].day_of_week - 1));
     }
 
     /// Round down to start of month.
-    inline time_t toFirstDayOfMonth(time_t t) const
+    template <typename DateOrTime>
+    inline time_t toFirstDayOfMonth(DateOrTime v) const
     {
-        DayNum index = findIndex(t);
-        return lut[index - (lut[index].day_of_month - 1)].date;
+        const LUTIndex i = toLUTIndex(v);
+        return lut[i - (lut[i].day_of_month - 1)].date;
     }
 
-    inline DayNum toFirstDayNumOfMonth(DayNum d) const
+    template <typename DateOrTime>
+    inline ExtendedDayNum toFirstDayNumOfMonth(DateOrTime v) const
     {
-        return DayNum(d - (lut[d].day_of_month - 1));
-    }
-
-    inline DayNum toFirstDayNumOfMonth(time_t t) const
-    {
-        return toFirstDayNumOfMonth(toDayNum(t));
+        const LUTIndex i = toLUTIndex(v);
+        return toDayNum(i - (lut[i].day_of_month - 1));
     }
 
     /// Round down to start of quarter.
-    inline DayNum toFirstDayNumOfQuarter(DayNum d) const
+    template <typename DateOrTime>
+    inline ExtendedDayNum toFirstDayNumOfQuarter(DateOrTime v) const
     {
-        DayNum index = d;
+        return toDayNum(toFirstDayOfQuarterIndex(v));
+    }
+
+    template <typename DateOrTime>
+    inline LUTIndex toFirstDayOfQuarterIndex(DateOrTime v) const
+    {
+        LUTIndex index = toLUTIndex(v);
         size_t month_inside_quarter = (lut[index].month - 1) % 3;
 
         index -= lut[index].day_of_month;
@@ -175,17 +328,13 @@ public:
             --month_inside_quarter;
         }
 
-        return DayNum(index + 1);
+        return index + 1;
     }
 
-    inline DayNum toFirstDayNumOfQuarter(time_t t) const
+    template <typename DateOrTime>
+    inline time_t toFirstDayOfQuarter(DateOrTime v) const
     {
-        return toFirstDayNumOfQuarter(toDayNum(t));
-    }
-
-    inline time_t toFirstDayOfQuarter(time_t t) const
-    {
-        return fromDayNum(toFirstDayNumOfQuarter(t));
+        return toDate(toFirstDayOfQuarterIndex(v));
     }
 
     /// Round down to start of year.
@@ -194,48 +343,47 @@ public:
         return lut[years_lut[lut[findIndex(t)].year - DATE_LUT_MIN_YEAR]].date;
     }
 
-    inline DayNum toFirstDayNumOfYear(DayNum d) const
+    template <typename DateOrTime>
+    inline LUTIndex toFirstDayNumOfYearIndex(DateOrTime v) const
     {
-        return years_lut[lut[d].year - DATE_LUT_MIN_YEAR];
+        return years_lut[lut[toLUTIndex(v)].year - DATE_LUT_MIN_YEAR];
     }
 
-    inline DayNum toFirstDayNumOfYear(time_t t) const
+    template <typename DateOrTime>
+    inline ExtendedDayNum toFirstDayNumOfYear(DateOrTime v) const
     {
-        return toFirstDayNumOfYear(toDayNum(t));
+        return toDayNum(toFirstDayNumOfYearIndex(v));
     }
 
     inline time_t toFirstDayOfNextMonth(time_t t) const
     {
-        DayNum index = findIndex(t);
+        LUTIndex index = findIndex(t);
         index += 32 - lut[index].day_of_month;
         return lut[index - (lut[index].day_of_month - 1)].date;
     }
 
     inline time_t toFirstDayOfPrevMonth(time_t t) const
     {
-        DayNum index = findIndex(t);
+        LUTIndex index = findIndex(t);
         index -= lut[index].day_of_month;
         return lut[index - (lut[index].day_of_month - 1)].date;
     }
 
-    inline UInt8 daysInMonth(DayNum d) const
+    template <typename DateOrTime>
+    inline UInt8 daysInMonth(DateOrTime value) const
     {
-        return lut[d].days_in_month;
+        const LUTIndex i = toLUTIndex(value);
+        return lut[i].days_in_month;
     }
 
-    inline UInt8 daysInMonth(time_t t) const
-    {
-        return find(t).days_in_month;
-    }
-
-    inline UInt8 daysInMonth(UInt16 year, UInt8 month) const
+    inline UInt8 daysInMonth(Int16 year, UInt8 month) const
     {
         UInt16 idx = year - DATE_LUT_MIN_YEAR;
         if (unlikely(idx >= DATE_LUT_YEARS))
             return 31;  /// Implementation specific behaviour on overflow.
 
         /// 32 makes arithmetic more simple.
-        DayNum any_day_of_month = DayNum(years_lut[idx] + 32 * (month - 1));
+        const auto any_day_of_month = years_lut[year - DATE_LUT_MIN_YEAR] + 32 * (month - 1);
         return lut[any_day_of_month].days_in_month;
     }
 
@@ -243,101 +391,111 @@ public:
       */
     inline time_t toDateAndShift(time_t t, Int32 days) const
     {
-        return lut[DayNum(findIndex(t) + days)].date;
+        return lut[findIndex(t) + days].date;
     }
 
     inline time_t toTime(time_t t) const
     {
-        DayNum index = findIndex(t);
-
-        if (unlikely(index == 0 || index > DATE_LUT_MAX_DAY_NUM))
-            return t + offset_at_start_of_epoch;
+        const LUTIndex index = findIndex(t);
 
         time_t res = t - lut[index].date;
 
-        if (res >= lut[index].time_at_offset_change)
-            res += lut[index].amount_of_offset_change;
+        if (res >= lut[index].time_at_offset_change())
+            res += lut[index].amount_of_offset_change();
 
         return res - offset_at_start_of_epoch; /// Starting at 1970-01-01 00:00:00 local time.
     }
 
     inline unsigned toHour(time_t t) const
     {
-        DayNum index = findIndex(t);
-
-        /// If it is overflow case,
-        ///  then limit number of hours to avoid insane results like 1970-01-01 89:28:15
-        if (unlikely(index == 0 || index > DATE_LUT_MAX_DAY_NUM))
-            return static_cast<unsigned>((t + offset_at_start_of_epoch) / 3600) % 24;
+        const LUTIndex index = findIndex(t);
 
         time_t time = t - lut[index].date;
 
-        if (time >= lut[index].time_at_offset_change)
-            time += lut[index].amount_of_offset_change;
+        if (time >= lut[index].time_at_offset_change())
+            time += lut[index].amount_of_offset_change();
 
         unsigned res = time / 3600;
-        return res <= 23 ? res : 0;
+
+        /// In case time was changed backwards at the start of next day, we will repeat the hour 23.
+        return res <= 23 ? res : 23;
     }
 
     /** Calculating offset from UTC in seconds.
-     * which means Using the same literal time of "t" to get the corresponding timestamp in UTC,
-     * then subtract the former from the latter to get the offset result.
-     * The boundaries when meets DST(daylight saving time) change should be handled very carefully.
-     */
+      * which means Using the same literal time of "t" to get the corresponding timestamp in UTC,
+      * then subtract the former from the latter to get the offset result.
+      * The boundaries when meets DST(daylight saving time) change should be handled very carefully.
+      */
     inline time_t timezoneOffset(time_t t) const
     {
-        DayNum index = findIndex(t);
+        const LUTIndex index = findIndex(t);
 
         /// Calculate daylight saving offset first.
         /// Because the "amount_of_offset_change" in LUT entry only exists in the change day, it's costly to scan it from the very begin.
         /// but we can figure out all the accumulated offsets from 1970-01-01 to that day just by get the whole difference between lut[].date,
         /// and then, we can directly subtract multiple 86400s to get the real DST offsets for the leap seconds is not considered now.
-        time_t res = (lut[index].date - lut[0].date) % 86400;
+        time_t res = (lut[index].date - lut[daynum_offset_epoch].date) % 86400;
+
         /// As so far to know, the maximal DST offset couldn't be more than 2 hours, so after the modulo operation the remainder
         /// will sits between [-offset --> 0 --> offset] which respectively corresponds to moving clock forward or backward.
         res = res > 43200 ? (86400 - res) : (0 - res);
 
         /// Check if has a offset change during this day. Add the change when cross the line
-        if (lut[index].amount_of_offset_change != 0 && t >= lut[index].date + lut[index].time_at_offset_change)
-            res += lut[index].amount_of_offset_change;
+        if (lut[index].amount_of_offset_change() != 0 && t >= lut[index].date + lut[index].time_at_offset_change())
+            res += lut[index].amount_of_offset_change();
 
         return res + offset_at_start_of_epoch;
     }
 
-    /** Only for time zones with/when offset from UTC is multiple of five minutes.
-      * This is true for all time zones: right now, all time zones have an offset that is multiple of 15 minutes.
-      *
-      * "By 1929, most major countries had adopted hourly time zones. Nepal was the last
-      *  country to adopt a standard offset, shifting slightly to UTC+5:45 in 1986."
-      * - https://en.wikipedia.org/wiki/Time_zone#Offsets_from_UTC
-      *
-      * Also please note, that unix timestamp doesn't count "leap seconds":
-      *  each minute, with added or subtracted leap second, spans exactly 60 unix timestamps.
-      */
 
-    inline unsigned toSecond(time_t t) const { return UInt32(t) % 60; }
+    inline unsigned toSecond(time_t t) const
+    {
+        auto res = t % 60;
+        if (likely(res >= 0))
+            return res;
+        return res + 60;
+    }
 
     inline unsigned toMinute(time_t t) const
     {
-        if (offset_is_whole_number_of_hours_everytime)
-            return (UInt32(t) / 60) % 60;
+        if (t >= 0 && offset_is_whole_number_of_hours_during_epoch)
+            return (t / 60) % 60;
 
-        UInt32 date = find(t).date;
-        return (UInt32(t) - date) / 60 % 60;
+        /// To consider the DST changing situation within this day
+        /// also make the special timezones with no whole hour offset such as 'Australia/Lord_Howe' been taken into account.
+
+        LUTIndex index = findIndex(t);
+        UInt32 time = t - lut[index].date;
+
+        if (time >= lut[index].time_at_offset_change())
+            time += lut[index].amount_of_offset_change();
+
+        return time / 60 % 60;
     }
 
-    inline time_t toStartOfMinute(time_t t) const { return t / 60 * 60; }
-    inline time_t toStartOfFiveMinute(time_t t) const { return t / 300 * 300; }
-    inline time_t toStartOfFifteenMinutes(time_t t) const { return t / 900 * 900; }
-    inline time_t toStartOfTenMinutes(time_t t) const { return t / 600 * 600; }
+    /// NOTE: Assuming timezone offset is a multiple of 15 minutes.
+    inline time_t toStartOfMinute(time_t t) const { return roundDown(t, 60); }
+    inline time_t toStartOfFiveMinute(time_t t) const { return roundDown(t, 300); }
+    inline time_t toStartOfFifteenMinutes(time_t t) const { return roundDown(t, 900); }
 
+    inline time_t toStartOfTenMinutes(time_t t) const
+    {
+        if (t >= 0 && offset_is_whole_number_of_hours_during_epoch)
+            return t / 600 * 600;
+
+        /// More complex logic is for Nepal - it has offset 05:45. Australia/Eucla is also unfortunate.
+        Int64 date = find(t).date;
+        return date + (t - date) / 600 * 600;
+    }
+
+    /// NOTE: Assuming timezone transitions are multiple of hours. Lord Howe Island in Australia is a notable exception.
     inline time_t toStartOfHour(time_t t) const
     {
-        if (offset_is_whole_number_of_hours_everytime)
+        if (t >= 0 && offset_is_whole_number_of_hours_during_epoch)
             return t / 3600 * 3600;
 
-        UInt32 date = find(t).date;
-        return date + (UInt32(t) - date) / 3600 * 3600;
+        Int64 date = find(t).date;
+        return date + (t - date) / 3600 * 3600;
     }
 
     /** Number of calendar day since the beginning of UNIX epoch (1970-01-01 is zero)
@@ -348,80 +506,89 @@ public:
       *  because the same calendar day starts/ends at different timestamps in different time zones)
       */
 
-    inline DayNum toDayNum(time_t t) const { return findIndex(t); }
-    inline time_t fromDayNum(DayNum d) const { return lut[d].date; }
+    inline time_t fromDayNum(DayNum d) const { return lut[toLUTIndex(d)].date; }
+    inline time_t fromDayNum(ExtendedDayNum d) const { return lut[toLUTIndex(d)].date; }
 
-    inline time_t toDate(DayNum d) const { return lut[d].date; }
-    inline unsigned toMonth(DayNum d) const { return lut[d].month; }
-    inline unsigned toQuarter(DayNum d) const { return (lut[d].month - 1) / 3 + 1; }
-    inline unsigned toYear(DayNum d) const { return lut[d].year; }
-    inline unsigned toDayOfWeek(DayNum d) const { return lut[d].day_of_week; }
-    inline unsigned toDayOfMonth(DayNum d) const { return lut[d].day_of_month; }
-    inline unsigned toDayOfYear(DayNum d) const { return d + 1 - toFirstDayNumOfYear(d); }
+    template <typename DateOrTime>
+    inline time_t toDate(DateOrTime v) const { return lut[toLUTIndex(v)].date; }
 
-    inline unsigned toDayOfYear(time_t t) const { return toDayOfYear(toDayNum(t)); }
+    template <typename DateOrTime>
+    inline unsigned toMonth(DateOrTime v) const { return lut[toLUTIndex(v)].month; }
+
+    template <typename DateOrTime>
+    inline unsigned toQuarter(DateOrTime v) const { return (lut[toLUTIndex(v)].month - 1) / 3 + 1; }
+
+    template <typename DateOrTime>
+    inline Int16 toYear(DateOrTime v) const { return lut[toLUTIndex(v)].year; }
+
+    template <typename DateOrTime>
+    inline unsigned toDayOfWeek(DateOrTime v) const { return lut[toLUTIndex(v)].day_of_week; }
+
+    template <typename DateOrTime>
+    inline unsigned toDayOfMonth(DateOrTime v) const { return lut[toLUTIndex(v)].day_of_month; }
+
+    template <typename DateOrTime>
+    inline unsigned toDayOfYear(DateOrTime v) const
+    {
+        // TODO: different overload for ExtendedDayNum
+        const LUTIndex i = toLUTIndex(v);
+        return i + 1 - toFirstDayNumOfYearIndex(i);
+    }
 
     /// Number of week from some fixed moment in the past. Week begins at monday.
     /// (round down to monday and divide DayNum by 7; we made an assumption,
     ///  that in domain of the function there was no weeks with any other number of days than 7)
-    inline unsigned toRelativeWeekNum(DayNum d) const
+    template <typename DateOrTime>
+    inline unsigned toRelativeWeekNum(DateOrTime v) const
     {
+        const LUTIndex i = toLUTIndex(v);
         /// We add 8 to avoid underflow at beginning of unix epoch.
-        return (d + 8 - toDayOfWeek(d)) / 7;
-    }
-
-    inline unsigned toRelativeWeekNum(time_t t) const
-    {
-        return toRelativeWeekNum(toDayNum(t));
+        return toDayNum(i + 8 - toDayOfWeek(i)) / 7;
     }
 
     /// Get year that contains most of the current week. Week begins at monday.
-    inline unsigned toISOYear(DayNum d) const
+    template <typename DateOrTime>
+    inline unsigned toISOYear(DateOrTime v) const
     {
+        const LUTIndex i = toLUTIndex(v);
         /// That's effectively the year of thursday of current week.
-        return toYear(DayNum(d + 4 - toDayOfWeek(d)));
-    }
-
-    inline unsigned toISOYear(time_t t) const
-    {
-        return toISOYear(toDayNum(t));
+        return toYear(toLUTIndex(i + 4 - toDayOfWeek(i)));
     }
 
     /// ISO year begins with a monday of the week that is contained more than by half in the corresponding calendar year.
     /// Example: ISO year 2019 begins at 2018-12-31. And ISO year 2017 begins at 2017-01-02.
     /// https://en.wikipedia.org/wiki/ISO_week_date
-    inline DayNum toFirstDayNumOfISOYear(DayNum d) const
+    template <typename DateOrTime>
+    inline LUTIndex toFirstDayNumOfISOYearIndex(DateOrTime v) const
     {
-        auto iso_year = toISOYear(d);
+        const LUTIndex i = toLUTIndex(v);
+        auto iso_year = toISOYear(i);
 
-        DayNum first_day_of_year = years_lut[iso_year - DATE_LUT_MIN_YEAR];
+        const auto first_day_of_year = years_lut[iso_year - DATE_LUT_MIN_YEAR];
         auto first_day_of_week_of_year = lut[first_day_of_year].day_of_week;
 
-        return DayNum(first_day_of_week_of_year <= 4
+        return LUTIndex{first_day_of_week_of_year <= 4
             ? first_day_of_year + 1 - first_day_of_week_of_year
-            : first_day_of_year + 8 - first_day_of_week_of_year);
+            : first_day_of_year + 8 - first_day_of_week_of_year};
     }
 
-    inline DayNum toFirstDayNumOfISOYear(time_t t) const
+    template <typename DateOrTime>
+    inline ExtendedDayNum toFirstDayNumOfISOYear(DateOrTime v) const
     {
-        return toFirstDayNumOfISOYear(toDayNum(t));
+        return toDayNum(toFirstDayNumOfISOYearIndex(v));
     }
 
     inline time_t toFirstDayOfISOYear(time_t t) const
     {
-        return fromDayNum(toFirstDayNumOfISOYear(t));
+        return lut[toFirstDayNumOfISOYearIndex(t)].date;
     }
 
     /// ISO 8601 week number. Week begins at monday.
     /// The week number 1 is the first week in year that contains 4 or more days (that's more than half).
-    inline unsigned toISOWeek(DayNum d) const
+    template <typename DateOrTime>
+    inline unsigned toISOWeek(DateOrTime v) const
     {
-        return 1 + DayNum(toFirstDayNumOfWeek(d) - toFirstDayNumOfISOYear(d)) / 7;
-    }
-
-    inline unsigned toISOWeek(time_t t) const
-    {
-        return toISOWeek(toDayNum(t));
+        return 1 + (toFirstDayNumOfWeek(v) - toFirstDayNumOfISOYear(v)) / 7;
     }
 
     /*
@@ -457,30 +624,33 @@ public:
         Otherwise it is the last week of the previous year, and the
         next week is week 1.
     */
-    inline YearWeek toYearWeek(DayNum d, UInt8 week_mode) const
+    template <typename DateOrTime>
+    inline YearWeek toYearWeek(DateOrTime v, UInt8 week_mode) const
     {
-        bool newyear_day_mode = week_mode & static_cast<UInt8>(WeekModeFlag::NEWYEAR_DAY);
+        const bool newyear_day_mode = week_mode & static_cast<UInt8>(WeekModeFlag::NEWYEAR_DAY);
         week_mode = check_week_mode(week_mode);
-        bool monday_first_mode = week_mode & static_cast<UInt8>(WeekModeFlag::MONDAY_FIRST);
+        const bool monday_first_mode = week_mode & static_cast<UInt8>(WeekModeFlag::MONDAY_FIRST);
         bool week_year_mode = week_mode & static_cast<UInt8>(WeekModeFlag::YEAR);
-        bool first_weekday_mode = week_mode & static_cast<UInt8>(WeekModeFlag::FIRST_WEEKDAY);
+        const bool first_weekday_mode = week_mode & static_cast<UInt8>(WeekModeFlag::FIRST_WEEKDAY);
+
+        const LUTIndex i = toLUTIndex(v);
 
         // Calculate week number of WeekModeFlag::NEWYEAR_DAY mode
         if (newyear_day_mode)
         {
-            return toYearWeekOfNewyearMode(d, monday_first_mode);
+            return toYearWeekOfNewyearMode(i, monday_first_mode);
         }
 
-        YearWeek yw(toYear(d), 0);
+        YearWeek yw(toYear(i), 0);
         UInt16 days = 0;
-        UInt16 daynr = makeDayNum(yw.first, toMonth(d), toDayOfMonth(d));
-        UInt16 first_daynr = makeDayNum(yw.first, 1, 1);
+        const auto daynr = makeDayNum(yw.first, toMonth(i), toDayOfMonth(i));
+        auto first_daynr = makeDayNum(yw.first, 1, 1);
 
         // 0 for monday, 1 for tuesday ...
         // get weekday from first day in year.
-        UInt16 weekday = calc_weekday(DayNum(first_daynr), !monday_first_mode);
+        UInt16 weekday = calc_weekday(first_daynr, !monday_first_mode);
 
-        if (toMonth(d) == 1 && toDayOfMonth(d) <= static_cast<UInt32>(7 - weekday))
+        if (toMonth(i) == 1 && toDayOfMonth(i) <= static_cast<UInt32>(7 - weekday))
         {
             if (!week_year_mode && ((first_weekday_mode && weekday != 0) || (!first_weekday_mode && weekday >= 4)))
                 return yw;
@@ -511,48 +681,51 @@ public:
 
     /// Calculate week number of WeekModeFlag::NEWYEAR_DAY mode
     /// The week number 1 is the first week in year that contains January 1,
-    inline YearWeek toYearWeekOfNewyearMode(DayNum d, bool monday_first_mode) const
+    template <typename DateOrTime>
+    inline YearWeek toYearWeekOfNewyearMode(DateOrTime v, bool monday_first_mode) const
     {
         YearWeek yw(0, 0);
         UInt16 offset_day = monday_first_mode ? 0U : 1U;
 
+        const LUTIndex i = LUTIndex(v);
+
         // Checking the week across the year
-        yw.first = toYear(DayNum(d + 7 - toDayOfWeek(DayNum(d + offset_day))));
+        yw.first = toYear(i + 7 - toDayOfWeek(i + offset_day));
 
-        DayNum first_day = makeDayNum(yw.first, 1, 1);
-        DayNum this_day = d;
+        auto first_day = makeLUTIndex(yw.first, 1, 1);
+        auto this_day = i;
 
+        // TODO: do not perform calculations in terms of DayNum, since that would under/overflow for extended range.
         if (monday_first_mode)
         {
             // Rounds down a date to the nearest Monday.
             first_day = toFirstDayNumOfWeek(first_day);
-            this_day = toFirstDayNumOfWeek(d);
+            this_day = toFirstDayNumOfWeek(i);
         }
         else
         {
             // Rounds down a date to the nearest Sunday.
             if (toDayOfWeek(first_day) != 7)
-                first_day = DayNum(first_day - toDayOfWeek(first_day));
-            if (toDayOfWeek(d) != 7)
-                this_day = DayNum(d - toDayOfWeek(d));
+                first_day = ExtendedDayNum(first_day - toDayOfWeek(first_day));
+            if (toDayOfWeek(i) != 7)
+                this_day = ExtendedDayNum(i - toDayOfWeek(i));
         }
         yw.second = (this_day - first_day) / 7 + 1;
         return yw;
     }
 
-    /**
-     * get first day of week with week_mode, return Sunday or Monday
-     */
-    inline DayNum toFirstDayNumOfWeek(DayNum d, UInt8 week_mode) const
+    /// Get first day of week with week_mode, return Sunday or Monday
+    template <typename DateOrTime>
+    inline ExtendedDayNum toFirstDayNumOfWeek(DateOrTime v, UInt8 week_mode) const
     {
         bool monday_first_mode = week_mode & static_cast<UInt8>(WeekModeFlag::MONDAY_FIRST);
         if (monday_first_mode)
         {
-            return toFirstDayNumOfWeek(d);
+            return toFirstDayNumOfWeek(v);
         }
         else
         {
-            return (toDayOfWeek(d) != 7) ? DayNum(d - toDayOfWeek(d)) : d;
+            return (toDayOfWeek(v) != 7) ? ExtendedDayNum(v - toDayOfWeek(v)) : toDayNum(v);
         }
     }
 
@@ -568,192 +741,231 @@ public:
     /** Calculate weekday from d.
       * Returns 0 for monday, 1 for tuesday...
       */
-    inline unsigned calc_weekday(DayNum d, bool sunday_first_day_of_week) const
+    template <typename DateOrTime>
+    inline unsigned calc_weekday(DateOrTime v, bool sunday_first_day_of_week) const
     {
+        const LUTIndex i = toLUTIndex(v);
         if (!sunday_first_day_of_week)
-            return toDayOfWeek(d) - 1;
+            return toDayOfWeek(i) - 1;
         else
-            return toDayOfWeek(DayNum(d + 1)) - 1;
+            return toDayOfWeek(i + 1) - 1;
     }
 
     /// Calculate days in one year.
-    inline unsigned calc_days_in_year(UInt16 year) const
+    inline unsigned calc_days_in_year(Int32 year) const
     {
         return ((year & 3) == 0 && (year % 100 || (year % 400 == 0 && year)) ? 366 : 365);
     }
 
     /// Number of month from some fixed moment in the past (year * 12 + month)
-    inline unsigned toRelativeMonthNum(DayNum d) const
+    template <typename DateOrTime>
+    inline unsigned toRelativeMonthNum(DateOrTime v) const
     {
-        return lut[d].year * 12 + lut[d].month;
+        const LUTIndex i = toLUTIndex(v);
+        return lut[i].year * 12 + lut[i].month;
     }
 
-    inline unsigned toRelativeMonthNum(time_t t) const
+    template <typename DateOrTime>
+    inline unsigned toRelativeQuarterNum(DateOrTime v) const
     {
-        return toRelativeMonthNum(toDayNum(t));
-    }
-
-    inline unsigned toRelativeQuarterNum(DayNum d) const
-    {
-        return lut[d].year * 4 + (lut[d].month - 1) / 3;
-    }
-
-    inline unsigned toRelativeQuarterNum(time_t t) const
-    {
-        return toRelativeQuarterNum(toDayNum(t));
+        const LUTIndex i = toLUTIndex(v);
+        return lut[i].year * 4 + (lut[i].month - 1) / 3;
     }
 
     /// We count all hour-length intervals, unrelated to offset changes.
     inline time_t toRelativeHourNum(time_t t) const
     {
-        if (offset_is_whole_number_of_hours_everytime)
+        if (t >= 0 && offset_is_whole_number_of_hours_during_epoch)
             return t / 3600;
 
         /// Assume that if offset was fractional, then the fraction is the same as at the beginning of epoch.
         /// NOTE This assumption is false for "Pacific/Pitcairn" and "Pacific/Kiritimati" time zones.
-        return (t + 86400 - offset_at_start_of_epoch) / 3600;
+        return (t + DATE_LUT_ADD + 86400 - offset_at_start_of_epoch) / 3600 - (DATE_LUT_ADD / 3600);
     }
 
-    inline time_t toRelativeHourNum(DayNum d) const
+    template <typename DateOrTime>
+    inline time_t toRelativeHourNum(DateOrTime v) const
     {
-        return toRelativeHourNum(lut[d].date);
+        return toRelativeHourNum(lut[toLUTIndex(v)].date);
     }
 
     inline time_t toRelativeMinuteNum(time_t t) const
     {
-        return t / 60;
+        return (t + DATE_LUT_ADD) / 60 - (DATE_LUT_ADD / 60);
     }
 
-    inline time_t toRelativeMinuteNum(DayNum d) const
+    template <typename DateOrTime>
+    inline time_t toRelativeMinuteNum(DateOrTime v) const
     {
-        return toRelativeMinuteNum(lut[d].date);
+        return toRelativeMinuteNum(lut[toLUTIndex(v)].date);
     }
 
-    inline DayNum toStartOfYearInterval(DayNum d, UInt64 years) const
+    template <typename DateOrTime>
+    inline ExtendedDayNum toStartOfYearInterval(DateOrTime v, UInt64 years) const
     {
         if (years == 1)
-            return toFirstDayNumOfYear(d);
-        return years_lut[(lut[d].year - DATE_LUT_MIN_YEAR) / years * years];
+            return toFirstDayNumOfYear(v);
+
+        const LUTIndex i = toLUTIndex(v);
+
+        UInt16 year = lut[i].year / years * years;
+
+        /// For example, rounding down 1925 to 100 years will be 1900, but it's less than min supported year.
+        if (unlikely(year < DATE_LUT_MIN_YEAR))
+            year = DATE_LUT_MIN_YEAR;
+
+        return toDayNum(years_lut[year - DATE_LUT_MIN_YEAR]);
     }
 
-    inline DayNum toStartOfQuarterInterval(DayNum d, UInt64 quarters) const
+    inline ExtendedDayNum toStartOfQuarterInterval(ExtendedDayNum d, UInt64 quarters) const
     {
         if (quarters == 1)
             return toFirstDayNumOfQuarter(d);
         return toStartOfMonthInterval(d, quarters * 3);
     }
 
-    inline DayNum toStartOfMonthInterval(DayNum d, UInt64 months) const
+    inline ExtendedDayNum toStartOfMonthInterval(ExtendedDayNum d, UInt64 months) const
     {
         if (months == 1)
             return toFirstDayNumOfMonth(d);
-        const auto & date = lut[d];
-        UInt32 month_total_index = (date.year - DATE_LUT_MIN_YEAR) * 12 + date.month - 1;
-        return years_months_lut[month_total_index / months * months];
+        const Values & values = lut[toLUTIndex(d)];
+        UInt32 month_total_index = (values.year - DATE_LUT_MIN_YEAR) * 12 + values.month - 1;
+        return toDayNum(years_months_lut[month_total_index / months * months]);
     }
 
-    inline DayNum toStartOfWeekInterval(DayNum d, UInt64 weeks) const
+    inline ExtendedDayNum toStartOfWeekInterval(ExtendedDayNum d, UInt64 weeks) const
     {
         if (weeks == 1)
             return toFirstDayNumOfWeek(d);
         UInt64 days = weeks * 7;
         // January 1st 1970 was Thursday so we need this 4-days offset to make weeks start on Monday.
-        return DayNum(4 + (d - 4) / days * days);
+        return ExtendedDayNum(4 + (d - 4) / days * days);
     }
 
-    inline time_t toStartOfDayInterval(DayNum d, UInt64 days) const
+    inline time_t toStartOfDayInterval(ExtendedDayNum d, UInt64 days) const
     {
         if (days == 1)
             return toDate(d);
-        return lut[d / days * days].date;
+        return lut[toLUTIndex(ExtendedDayNum(d / days * days))].date;
     }
 
     inline time_t toStartOfHourInterval(time_t t, UInt64 hours) const
     {
         if (hours == 1)
             return toStartOfHour(t);
+
+        /** We will round the hour number since the midnight.
+          * It may split the day into non-equal intervals.
+          * For example, if we will round to 11-hour interval,
+          * the day will be split to the intervals 00:00:00..10:59:59, 11:00:00..21:59:59, 22:00:00..23:59:59.
+          * In case of daylight saving time or other transitions,
+          * the intervals can be shortened or prolonged to the amount of transition.
+          */
+
         UInt64 seconds = hours * 3600;
-        t = t / seconds * seconds;
-        if (offset_is_whole_number_of_hours_everytime)
-            return t;
-        return toStartOfHour(t);
+
+        const LUTIndex index = findIndex(t);
+        const Values & values = lut[index];
+
+        time_t time = t - values.date;
+        if (time >= values.time_at_offset_change())
+        {
+            /// Align to new hour numbers before rounding.
+            time += values.amount_of_offset_change();
+            time = time / seconds * seconds;
+
+            /// Should subtract the shift back but only if rounded time is not before shift.
+            if (time >= values.time_at_offset_change())
+            {
+                time -= values.amount_of_offset_change();
+
+                /// With cutoff at the time of the shift. Otherwise we may end up with something like 23:00 previous day.
+                if (time < values.time_at_offset_change())
+                    time = values.time_at_offset_change();
+            }
+        }
+        else
+        {
+            time = time / seconds * seconds;
+        }
+
+        return values.date + time;
     }
 
     inline time_t toStartOfMinuteInterval(time_t t, UInt64 minutes) const
     {
         if (minutes == 1)
             return toStartOfMinute(t);
+
+        /** In contrast to "toStartOfHourInterval" function above,
+          * the minute intervals are not aligned to the midnight.
+          * You will get unexpected results if for example, you round down to 60 minute interval
+          * and there was a time shift to 30 minutes.
+          *
+          * But this is not specified in docs and can be changed in future.
+          */
+
         UInt64 seconds = 60 * minutes;
-        return t / seconds * seconds;
+        return roundDown(t, seconds);
     }
 
     inline time_t toStartOfSecondInterval(time_t t, UInt64 seconds) const
     {
         if (seconds == 1)
             return t;
-        return t / seconds * seconds;
+
+        return roundDown(t, seconds);
+    }
+
+    inline LUTIndex makeLUTIndex(Int16 year, UInt8 month, UInt8 day_of_month) const
+    {
+        if (unlikely(year < DATE_LUT_MIN_YEAR || year > DATE_LUT_MAX_YEAR || month < 1 || month > 12 || day_of_month < 1 || day_of_month > 31))
+            return LUTIndex(0);
+
+        return LUTIndex{years_months_lut[(year - DATE_LUT_MIN_YEAR) * 12 + month - 1] + day_of_month - 1};
     }
 
     /// Create DayNum from year, month, day of month.
-    inline DayNum makeDayNum(UInt16 year, UInt8 month, UInt8 day_of_month) const
+    inline ExtendedDayNum makeDayNum(Int16 year, UInt8 month, UInt8 day_of_month) const
     {
         if (unlikely(year < DATE_LUT_MIN_YEAR || year > DATE_LUT_MAX_YEAR || month < 1 || month > 12 || day_of_month < 1 || day_of_month > 31))
-            return DayNum(0); // TODO (nemkov, DateTime64 phase 2): implement creating real date for year outside of LUT range.
+            return ExtendedDayNum(0);
 
-        // The day after 2106-02-07 will not stored fully as struct Values, so just overflow it as 0
-        if (unlikely(year == DATE_LUT_MAX_YEAR && (month > 2 || (month == 2 && day_of_month > 7))))
-            return DayNum(0);
-
-        return DayNum(years_months_lut[(year - DATE_LUT_MIN_YEAR) * 12 + month - 1] + day_of_month - 1);
+        return toDayNum(makeLUTIndex(year, month, day_of_month));
     }
 
-    inline time_t makeDate(UInt16 year, UInt8 month, UInt8 day_of_month) const
+    inline time_t makeDate(Int16 year, UInt8 month, UInt8 day_of_month) const
     {
-        return lut[makeDayNum(year, month, day_of_month)].date;
+        return lut[makeLUTIndex(year, month, day_of_month)].date;
     }
 
     /** Does not accept daylight saving time as argument: in case of ambiguity, it choose greater timestamp.
       */
-    inline time_t makeDateTime(UInt16 year, UInt8 month, UInt8 day_of_month, UInt8 hour, UInt8 minute, UInt8 second) const
+    inline time_t makeDateTime(Int16 year, UInt8 month, UInt8 day_of_month, UInt8 hour, UInt8 minute, UInt8 second) const
     {
-        size_t index = makeDayNum(year, month, day_of_month);
+        size_t index = makeLUTIndex(year, month, day_of_month);
         UInt32 time_offset = hour * 3600 + minute * 60 + second;
 
-        if (time_offset >= lut[index].time_at_offset_change)
-            time_offset -= lut[index].amount_of_offset_change;
+        if (time_offset >= lut[index].time_at_offset_change())
+            time_offset -= lut[index].amount_of_offset_change();
 
-        UInt32 res = lut[index].date + time_offset;
-
-        if (unlikely(res > DATE_LUT_MAX))
-            return 0;
-
-        return res;
+        return lut[index].date + time_offset;
     }
 
-    inline const Values & getValues(DayNum d) const { return lut[d]; }
-    inline const Values & getValues(time_t t) const { return lut[findIndex(t)]; }
+    template <typename DateOrTime>
+    inline const Values & getValues(DateOrTime v) const { return lut[toLUTIndex(v)]; }
 
-    inline UInt32 toNumYYYYMM(time_t t) const
+    template <typename DateOrTime>
+    inline UInt32 toNumYYYYMM(DateOrTime v) const
     {
-        const Values & values = find(t);
+        const Values & values = getValues(v);
         return values.year * 100 + values.month;
     }
 
-    inline UInt32 toNumYYYYMM(DayNum d) const
+    template <typename DateOrTime>
+    inline UInt32 toNumYYYYMMDD(DateOrTime v) const
     {
-        const Values & values = lut[d];
-        return values.year * 100 + values.month;
-    }
-
-    inline UInt32 toNumYYYYMMDD(time_t t) const
-    {
-        const Values & values = find(t);
-        return values.year * 10000 + values.month * 100 + values.day_of_month;
-    }
-
-    inline UInt32 toNumYYYYMMDD(DayNum d) const
-    {
-        const Values & values = lut[d];
+        const Values & values = getValues(v);
         return values.year * 10000 + values.month * 100 + values.day_of_month;
     }
 
@@ -762,22 +974,85 @@ public:
         return makeDate(num / 10000, num / 100 % 100, num % 100);
     }
 
-    inline DayNum YYYYMMDDToDayNum(UInt32 num) const
+    inline ExtendedDayNum YYYYMMDDToDayNum(UInt32 num) const
     {
         return makeDayNum(num / 10000, num / 100 % 100, num % 100);
     }
 
 
+    struct DateComponents
+    {
+        uint16_t year;
+        uint8_t month;
+        uint8_t day;
+    };
+
+    struct TimeComponents
+    {
+        uint8_t hour;
+        uint8_t minute;
+        uint8_t second;
+    };
+
+    struct DateTimeComponents
+    {
+        DateComponents date;
+        TimeComponents time;
+    };
+
+    inline DateComponents toDateComponents(time_t t) const
+    {
+        const Values & values = getValues(t);
+        return { values.year, values.month, values.day_of_month };
+    }
+
+    inline DateTimeComponents toDateTimeComponents(time_t t) const
+    {
+        const LUTIndex index = findIndex(t);
+        const Values & values = lut[index];
+
+        DateTimeComponents res;
+
+        res.date.year = values.year;
+        res.date.month = values.month;
+        res.date.day = values.day_of_month;
+
+        time_t time = t - values.date;
+        if (time >= values.time_at_offset_change())
+            time += values.amount_of_offset_change();
+
+        if (unlikely(time < 0))
+        {
+            res.time.second = 0;
+            res.time.minute = 0;
+            res.time.hour = 0;
+        }
+        else
+        {
+            res.time.second = time % 60;
+            res.time.minute = time / 60 % 60;
+            res.time.hour = time / 3600;
+        }
+
+        /// In case time was changed backwards at the start of next day, we will repeat the hour 23.
+        if (unlikely(res.time.hour > 23))
+            res.time.hour = 23;
+
+        return res;
+    }
+
+
     inline UInt64 toNumYYYYMMDDhhmmss(time_t t) const
     {
-        const Values & values = find(t);
+        DateTimeComponents components = toDateTimeComponents(t);
+
         return
-              toSecond(t)
-            + toMinute(t) * 100
-            + toHour(t) * 10000
-            + UInt64(values.day_of_month) * 1000000
-            + UInt64(values.month) * 100000000
-            + UInt64(values.year) * 10000000000;
+              components.time.second
+            + components.time.minute * 100
+            + components.time.hour * 10000
+            + UInt64(components.date.day) * 1000000
+            + UInt64(components.date.month) * 100000000
+            + UInt64(components.date.year) * 10000000000;
     }
 
     inline time_t YYYYMMDDhhmmssToTime(UInt64 num) const
@@ -796,15 +1071,19 @@ public:
 
     inline NO_SANITIZE_UNDEFINED time_t addDays(time_t t, Int64 delta) const
     {
-        DayNum index = findIndex(t);
-        time_t time_offset = toHour(t) * 3600 + toMinute(t) * 60 + toSecond(t);
+        const LUTIndex index = findIndex(t);
+        const Values & values = lut[index];
 
-        index += delta;
+        time_t time = t - values.date;
+        if (time >= values.time_at_offset_change())
+            time += values.amount_of_offset_change();
 
-        if (time_offset >= lut[index].time_at_offset_change)
-            time_offset -= lut[index].amount_of_offset_change;
+        const LUTIndex new_index = index + delta;
 
-        return lut[index].date + time_offset;
+        if (time >= lut[new_index].time_at_offset_change())
+            time -= lut[new_index].amount_of_offset_change();
+
+        return lut[new_index].date + time;
     }
 
     inline NO_SANITIZE_UNDEFINED time_t addWeeks(time_t t, Int64 delta) const
@@ -812,7 +1091,7 @@ public:
         return addDays(t, delta * 7);
     }
 
-    inline UInt8 saturateDayOfMonth(UInt16 year, UInt8 month, UInt8 day_of_month) const
+    inline UInt8 saturateDayOfMonth(Int16 year, UInt8 month, UInt8 day_of_month) const
     {
         if (likely(day_of_month <= 28))
             return day_of_month;
@@ -825,25 +1104,12 @@ public:
         return day_of_month;
     }
 
-    /// If resulting month has less deys than source month, then saturation can happen.
-    /// Example: 31 Aug + 1 month = 30 Sep.
-    inline time_t addMonths(time_t t, Int64 delta) const
+    template <typename DateOrTime>
+    inline LUTIndex NO_SANITIZE_UNDEFINED addMonthsIndex(DateOrTime v, Int64 delta) const
     {
-        DayNum result_day = addMonths(toDayNum(t), delta);
+        const Values & values = lut[toLUTIndex(v)];
 
-        time_t time_offset = toHour(t) * 3600 + toMinute(t) * 60 + toSecond(t);
-
-        if (time_offset >= lut[result_day].time_at_offset_change)
-            time_offset -= lut[result_day].amount_of_offset_change;
-
-        return lut[result_day].date + time_offset;
-    }
-
-    inline NO_SANITIZE_UNDEFINED DayNum addMonths(DayNum d, Int64 delta) const
-    {
-        const Values & values = lut[d];
-
-        Int64 month = static_cast<Int64>(values.month) + delta;
+        Int64 month = values.month + delta;
 
         if (month > 0)
         {
@@ -851,7 +1117,7 @@ public:
             month = ((month - 1) % 12) + 1;
             auto day_of_month = saturateDayOfMonth(year, month, values.day_of_month);
 
-            return makeDayNum(year, month, day_of_month);
+            return makeLUTIndex(year, month, day_of_month);
         }
         else
         {
@@ -859,36 +1125,48 @@ public:
             month = 12 - (-month % 12);
             auto day_of_month = saturateDayOfMonth(year, month, values.day_of_month);
 
-            return makeDayNum(year, month, day_of_month);
+            return makeLUTIndex(year, month, day_of_month);
         }
     }
 
-    inline NO_SANITIZE_UNDEFINED time_t addQuarters(time_t t, Int64 delta) const
+    /// If resulting month has less deys than source month, then saturation can happen.
+    /// Example: 31 Aug + 1 month = 30 Sep.
+    inline time_t NO_SANITIZE_UNDEFINED addMonths(time_t t, Int64 delta) const
+    {
+        const auto result_day = addMonthsIndex(t, delta);
+
+        const LUTIndex index = findIndex(t);
+        const Values & values = lut[index];
+
+        time_t time = t - values.date;
+        if (time >= values.time_at_offset_change())
+            time += values.amount_of_offset_change();
+
+        if (time >= lut[result_day].time_at_offset_change())
+            time -= lut[result_day].amount_of_offset_change();
+
+        return lut[result_day].date + time;
+    }
+
+    inline ExtendedDayNum NO_SANITIZE_UNDEFINED addMonths(ExtendedDayNum d, Int64 delta) const
+    {
+        return toDayNum(addMonthsIndex(d, delta));
+    }
+
+    inline time_t NO_SANITIZE_UNDEFINED addQuarters(time_t t, Int64 delta) const
     {
         return addMonths(t, delta * 3);
     }
 
-    inline NO_SANITIZE_UNDEFINED DayNum addQuarters(DayNum d, Int64 delta) const
+    inline ExtendedDayNum addQuarters(ExtendedDayNum d, Int64 delta) const
     {
         return addMonths(d, delta * 3);
     }
 
-    /// Saturation can occur if 29 Feb is mapped to non-leap year.
-    inline NO_SANITIZE_UNDEFINED time_t addYears(time_t t, Int64 delta) const
+    template <typename DateOrTime>
+    inline LUTIndex NO_SANITIZE_UNDEFINED addYearsIndex(DateOrTime v, Int64 delta) const
     {
-        DayNum result_day = addYears(toDayNum(t), delta);
-
-        time_t time_offset = toHour(t) * 3600 + toMinute(t) * 60 + toSecond(t);
-
-        if (time_offset >= lut[result_day].time_at_offset_change)
-            time_offset -= lut[result_day].amount_of_offset_change;
-
-        return lut[result_day].date + time_offset;
-    }
-
-    inline NO_SANITIZE_UNDEFINED DayNum addYears(DayNum d, Int64 delta) const
-    {
-        const Values & values = lut[d];
+        const Values & values = lut[toLUTIndex(v)];
 
         auto year = values.year + delta;
         auto month = values.month;
@@ -898,42 +1176,61 @@ public:
         if (unlikely(day_of_month == 29 && month == 2))
             day_of_month = saturateDayOfMonth(year, month, day_of_month);
 
-        return makeDayNum(year, month, day_of_month);
+        return makeLUTIndex(year, month, day_of_month);
+    }
+
+    /// Saturation can occur if 29 Feb is mapped to non-leap year.
+    inline time_t addYears(time_t t, Int64 delta) const
+    {
+        auto result_day = addYearsIndex(t, delta);
+
+        const LUTIndex index = findIndex(t);
+        const Values & values = lut[index];
+
+        time_t time = t - values.date;
+        if (time >= values.time_at_offset_change())
+            time += values.amount_of_offset_change();
+
+        if (time >= lut[result_day].time_at_offset_change())
+            time -= lut[result_day].amount_of_offset_change();
+
+        return lut[result_day].date + time;
+    }
+
+    inline ExtendedDayNum addYears(ExtendedDayNum d, Int64 delta) const
+    {
+        return toDayNum(addYearsIndex(d, delta));
     }
 
 
     inline std::string timeToString(time_t t) const
     {
-        const Values & values = find(t);
+        DateTimeComponents components = toDateTimeComponents(t);
 
         std::string s {"0000-00-00 00:00:00"};
 
-        s[0] += values.year / 1000;
-        s[1] += (values.year / 100) % 10;
-        s[2] += (values.year / 10) % 10;
-        s[3] += values.year % 10;
-        s[5] += values.month / 10;
-        s[6] += values.month % 10;
-        s[8] += values.day_of_month / 10;
-        s[9] += values.day_of_month % 10;
+        s[0] += components.date.year / 1000;
+        s[1] += (components.date.year / 100) % 10;
+        s[2] += (components.date.year / 10) % 10;
+        s[3] += components.date.year % 10;
+        s[5] += components.date.month / 10;
+        s[6] += components.date.month % 10;
+        s[8] += components.date.day / 10;
+        s[9] += components.date.day % 10;
 
-        auto hour = toHour(t);
-        auto minute = toMinute(t);
-        auto second = toSecond(t);
-
-        s[11] += hour / 10;
-        s[12] += hour % 10;
-        s[14] += minute / 10;
-        s[15] += minute % 10;
-        s[17] += second / 10;
-        s[18] += second % 10;
+        s[11] += components.time.hour / 10;
+        s[12] += components.time.hour % 10;
+        s[14] += components.time.minute / 10;
+        s[15] += components.time.minute % 10;
+        s[17] += components.time.second / 10;
+        s[18] += components.time.second % 10;
 
         return s;
     }
 
     inline std::string dateToString(time_t t) const
     {
-        const Values & values = find(t);
+        const Values & values = getValues(t);
 
         std::string s {"0000-00-00"};
 
@@ -949,9 +1246,9 @@ public:
         return s;
     }
 
-    inline std::string dateToString(DayNum d) const
+    inline std::string dateToString(ExtendedDayNum d) const
     {
-        const Values & values = lut[d];
+        const Values & values = getValues(d);
 
         std::string s {"0000-00-00"};
 
@@ -969,7 +1266,7 @@ public:
 };
 
 #if defined(__PPC__)
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic pop
 #endif
 #endif
diff --git a/base/common/DayNum.h b/base/common/DayNum.h
index a4ef0c43b69..5cf4d4635c8 100644
--- a/base/common/DayNum.h
+++ b/base/common/DayNum.h
@@ -7,3 +7,8 @@
   * See DateLUTImpl for usage examples.
   */
 STRONG_TYPEDEF(UInt16, DayNum)
+
+/** Represent number of days since 1970-01-01 but in extended range,
+ * for dates before 1970-01-01 and after 2105
+ */
+STRONG_TYPEDEF(Int32, ExtendedDayNum)
diff --git a/base/common/LocalDate.h b/base/common/LocalDate.h
index e5ebe877bc5..b1e6eeb907c 100644
--- a/base/common/LocalDate.h
+++ b/base/common/LocalDate.h
@@ -92,20 +92,10 @@ public:
     LocalDate(const LocalDate &) noexcept = default;
     LocalDate & operator= (const LocalDate &) noexcept = default;
 
-    LocalDate & operator= (time_t time)
-    {
-        init(time);
-        return *this;
-    }
-
-    operator time_t() const
-    {
-        return DateLUT::instance().makeDate(m_year, m_month, m_day);
-    }
-
     DayNum getDayNum() const
     {
-        return DateLUT::instance().makeDayNum(m_year, m_month, m_day);
+        const auto & lut = DateLUT::instance();
+        return DayNum(lut.makeDayNum(m_year, m_month, m_day).toUnderType());
     }
 
     operator DayNum() const
@@ -166,12 +156,3 @@ public:
 };
 
 static_assert(sizeof(LocalDate) == 4);
-
-
-namespace std
-{
-inline string to_string(const LocalDate & date)
-{
-    return date.toString();
-}
-}
diff --git a/base/common/LocalDateTime.h b/base/common/LocalDateTime.h
index 0e237789bd1..dde283e5ebb 100644
--- a/base/common/LocalDateTime.h
+++ b/base/common/LocalDateTime.h
@@ -29,29 +29,16 @@ private:
     /// NOTE We may use attribute packed instead, but it is less portable.
     unsigned char pad = 0;
 
-    void init(time_t time)
+    void init(time_t time, const DateLUTImpl & time_zone)
     {
-        if (unlikely(time > DATE_LUT_MAX || time == 0))
-        {
-            m_year = 0;
-            m_month = 0;
-            m_day = 0;
-            m_hour = 0;
-            m_minute = 0;
-            m_second = 0;
+        DateLUTImpl::DateTimeComponents components = time_zone.toDateTimeComponents(time);
 
-            return;
-        }
-
-        const auto & date_lut = DateLUT::instance();
-        const auto & values = date_lut.getValues(time);
-
-        m_year = values.year;
-        m_month = values.month;
-        m_day = values.day_of_month;
-        m_hour = date_lut.toHour(time);
-        m_minute = date_lut.toMinute(time);
-        m_second = date_lut.toSecond(time);
+        m_year = components.date.year;
+        m_month = components.date.month;
+        m_day = components.date.day;
+        m_hour = components.time.hour;
+        m_minute = components.time.minute;
+        m_second = components.time.second;
 
         (void)pad;  /// Suppress unused private field warning.
     }
@@ -73,9 +60,9 @@ private:
     }
 
 public:
-    explicit LocalDateTime(time_t time)
+    explicit LocalDateTime(time_t time, const DateLUTImpl & time_zone = DateLUT::instance())
     {
-        init(time);
+        init(time, time_zone);
     }
 
     LocalDateTime(unsigned short year_, unsigned char month_, unsigned char day_,
@@ -104,19 +91,6 @@ public:
     LocalDateTime(const LocalDateTime &) noexcept = default;
     LocalDateTime & operator= (const LocalDateTime &) noexcept = default;
 
-    LocalDateTime & operator= (time_t time)
-    {
-        init(time);
-        return *this;
-    }
-
-    operator time_t() const
-    {
-        return m_year == 0
-            ? 0
-            : DateLUT::instance().makeDateTime(m_year, m_month, m_day, m_hour, m_minute, m_second);
-    }
-
     unsigned short year() const { return m_year; }
     unsigned char month() const { return m_month; }
     unsigned char day() const { return m_day; }
@@ -132,8 +106,30 @@ public:
     void second(unsigned char x) { m_second = x; }
 
     LocalDate toDate() const { return LocalDate(m_year, m_month, m_day); }
+    LocalDateTime toStartOfDate() const { return LocalDateTime(m_year, m_month, m_day, 0, 0, 0); }
 
-    LocalDateTime toStartOfDate() { return LocalDateTime(m_year, m_month, m_day, 0, 0, 0); }
+    std::string toString() const
+    {
+        std::string s{"0000-00-00 00:00:00"};
+
+        s[0] += m_year / 1000;
+        s[1] += (m_year / 100) % 10;
+        s[2] += (m_year / 10) % 10;
+        s[3] += m_year % 10;
+        s[5] += m_month / 10;
+        s[6] += m_month % 10;
+        s[8] += m_day / 10;
+        s[9] += m_day % 10;
+
+        s[11] += m_hour / 10;
+        s[12] += m_hour % 10;
+        s[14] += m_minute / 10;
+        s[15] += m_minute % 10;
+        s[17] += m_second / 10;
+        s[18] += m_second % 10;
+
+        return s;
+    }
 
     bool operator< (const LocalDateTime & other) const
     {
@@ -167,14 +163,3 @@ public:
 };
 
 static_assert(sizeof(LocalDateTime) == 8);
-
-
-namespace std
-{
-inline string to_string(const LocalDateTime & datetime)
-{
-    stringstream str;
-    str << datetime;
-    return str.str();
-}
-}
diff --git a/base/common/MoveOrCopyIfThrow.h b/base/common/MoveOrCopyIfThrow.h
new file mode 100644
index 00000000000..caa1b51e2bc
--- /dev/null
+++ b/base/common/MoveOrCopyIfThrow.h
@@ -0,0 +1,33 @@
+#pragma once
+
+#include <common/types.h>
+
+namespace detail
+{
+    template <typename T, bool is_nothrow_move_assignable = std::is_nothrow_move_assignable_v<T>>
+    struct MoveOrCopyIfThrow;
+
+    template <typename T>
+    struct MoveOrCopyIfThrow<T, true>
+    {
+        void operator()(T && src, T & dst) const
+        {
+            dst = std::forward<T>(src);
+        }
+    };
+
+    template <typename T>
+    struct MoveOrCopyIfThrow<T, false>
+    {
+        void operator()(T && src, T & dst) const
+        {
+            dst = src;
+        }
+    };
+
+    template <typename T>
+    void moveOrCopyIfThrow(T && src, T & dst)
+    {
+        MoveOrCopyIfThrow<T>()(std::forward<T>(src), dst);
+    }
+}
diff --git a/base/common/arithmeticOverflow.h b/base/common/arithmeticOverflow.h
index a92fe56b9cb..c170d214636 100644
--- a/base/common/arithmeticOverflow.h
+++ b/base/common/arithmeticOverflow.h
@@ -25,6 +25,12 @@ namespace common
         return x - y;
     }
 
+    template <typename T>
+    inline auto NO_SANITIZE_UNDEFINED negateIgnoreOverflow(T x)
+    {
+        return -x;
+    }
+
     template <typename T>
     inline bool addOverflow(T x, T y, T & res)
     {
diff --git a/base/common/defines.h b/base/common/defines.h
index 845a53179ef..ada8245f494 100644
--- a/base/common/defines.h
+++ b/base/common/defines.h
@@ -1,5 +1,20 @@
 #pragma once
 
+/// __has_feature supported only by clang.
+///
+/// But libcxx/libcxxabi overrides it to 0,
+/// thus the checks for __has_feature will be wrong.
+///
+/// NOTE:
+/// - __has_feature cannot be simply undefined,
+///   since this will be broken if some C++ header will be included after
+///   including <common/defines.h>
+/// - it should not have fallback to 0,
+///   since this may create false-positive detection (common problem)
+#if defined(__clang__) && defined(__has_feature)
+#    define ch_has_feature __has_feature
+#endif
+
 #if defined(_MSC_VER)
 #   if !defined(likely)
 #      define likely(x)   (x)
@@ -32,8 +47,8 @@
 
 /// Check for presence of address sanitizer
 #if !defined(ADDRESS_SANITIZER)
-#    if defined(__has_feature)
-#        if __has_feature(address_sanitizer)
+#    if defined(ch_has_feature)
+#        if ch_has_feature(address_sanitizer)
 #            define ADDRESS_SANITIZER 1
 #        endif
 #    elif defined(__SANITIZE_ADDRESS__)
@@ -42,8 +57,8 @@
 #endif
 
 #if !defined(THREAD_SANITIZER)
-#    if defined(__has_feature)
-#        if __has_feature(thread_sanitizer)
+#    if defined(ch_has_feature)
+#        if ch_has_feature(thread_sanitizer)
 #            define THREAD_SANITIZER 1
 #        endif
 #    elif defined(__SANITIZE_THREAD__)
@@ -52,8 +67,8 @@
 #endif
 
 #if !defined(MEMORY_SANITIZER)
-#    if defined(__has_feature)
-#        if __has_feature(memory_sanitizer)
+#    if defined(ch_has_feature)
+#        if ch_has_feature(memory_sanitizer)
 #            define MEMORY_SANITIZER 1
 #        endif
 #    elif defined(__MEMORY_SANITIZER__)
@@ -61,6 +76,16 @@
 #    endif
 #endif
 
+#if !defined(UNDEFINED_BEHAVIOR_SANITIZER)
+#    if defined(__has_feature)
+#        if __has_feature(undefined_behavior_sanitizer)
+#            define UNDEFINED_BEHAVIOR_SANITIZER 1
+#        endif
+#    elif defined(__UNDEFINED_BEHAVIOR_SANITIZER__)
+#        define UNDEFINED_BEHAVIOR_SANITIZER 1
+#    endif
+#endif
+
 #if defined(ADDRESS_SANITIZER)
 #    define BOOST_USE_ASAN 1
 #    define BOOST_USE_UCONTEXT 1
diff --git a/base/common/phdr_cache.cpp b/base/common/phdr_cache.cpp
index 4f6a066adab..49d566dac19 100644
--- a/base/common/phdr_cache.cpp
+++ b/base/common/phdr_cache.cpp
@@ -15,11 +15,11 @@
 #endif
 
 #define __msan_unpoison(X, Y) // NOLINT
-#if defined(__has_feature)
-#   if __has_feature(memory_sanitizer)
-#       undef __msan_unpoison
-#       include <sanitizer/msan_interface.h>
-#   endif
+#if defined(ch_has_feature)
+#    if ch_has_feature(memory_sanitizer)
+#        undef __msan_unpoison
+#        include <sanitizer/msan_interface.h>
+#    endif
 #endif
 
 #include <link.h>
diff --git a/base/common/setTerminalEcho.cpp b/base/common/setTerminalEcho.cpp
index 658f27705ba..66db216a235 100644
--- a/base/common/setTerminalEcho.cpp
+++ b/base/common/setTerminalEcho.cpp
@@ -1,45 +1,28 @@
-// https://stackoverflow.com/questions/1413445/reading-a-password-from-stdcin
-
 #include <common/setTerminalEcho.h>
 #include <common/errnoToString.h>
 #include <stdexcept>
 #include <cstring>
 #include <string>
-
-#ifdef WIN32
-#include <windows.h>
-#else
 #include <termios.h>
 #include <unistd.h>
-#include <errno.h>
-#endif
+
 
 void setTerminalEcho(bool enable)
 {
-#ifdef WIN32
-    auto handle = GetStdHandle(STD_INPUT_HANDLE);
-    DWORD mode;
-    if (!GetConsoleMode(handle, &mode))
-        throw std::runtime_error(std::string("setTerminalEcho failed get: ") + std::to_string(GetLastError()));
+    /// Obtain terminal attributes,
+    /// toggle the ECHO flag
+    /// and set them back.
 
-    if (!enable)
-        mode &= ~ENABLE_ECHO_INPUT;
-    else
-        mode |= ENABLE_ECHO_INPUT;
+    struct termios tty{};
 
-    if (!SetConsoleMode(handle, mode))
-        throw std::runtime_error(std::string("setTerminalEcho failed set: ") + std::to_string(GetLastError()));
-#else
-    struct termios tty;
-    if (tcgetattr(STDIN_FILENO, &tty))
+    if (0 != tcgetattr(STDIN_FILENO, &tty))
         throw std::runtime_error(std::string("setTerminalEcho failed get: ") + errnoToString(errno));
-    if (!enable)
-        tty.c_lflag &= ~ECHO;
-    else
-        tty.c_lflag |= ECHO;
 
-    auto ret = tcsetattr(STDIN_FILENO, TCSANOW, &tty);
-    if (ret)
+    if (enable)
+        tty.c_lflag |= ECHO;
+    else
+        tty.c_lflag &= ~ECHO;
+
+    if (0 != tcsetattr(STDIN_FILENO, TCSANOW, &tty))
         throw std::runtime_error(std::string("setTerminalEcho failed set: ") + errnoToString(errno));
-#endif
 }
diff --git a/base/common/strong_typedef.h b/base/common/strong_typedef.h
index d9850a25c37..77b83bfa6e5 100644
--- a/base/common/strong_typedef.h
+++ b/base/common/strong_typedef.h
@@ -12,6 +12,7 @@ private:
     T t;
 
 public:
+    using UnderlyingType = T;
     template <class Enable = typename std::is_copy_constructible<T>::type>
     explicit StrongTypedef(const T & t_) : t(t_) {}
     template <class Enable = typename std::is_move_constructible<T>::type>
diff --git a/base/common/tests/CMakeLists.txt b/base/common/tests/CMakeLists.txt
index b7082ee9900..2a07a94055f 100644
--- a/base/common/tests/CMakeLists.txt
+++ b/base/common/tests/CMakeLists.txt
@@ -1,25 +1,2 @@
-include (${ClickHouse_SOURCE_DIR}/cmake/add_check.cmake)
-
-add_executable (date_lut2 date_lut2.cpp)
-add_executable (date_lut3 date_lut3.cpp)
-add_executable (date_lut_default_timezone date_lut_default_timezone.cpp)
-add_executable (local_date_time_comparison local_date_time_comparison.cpp)
-add_executable (realloc-perf allocator.cpp)
-
-set(PLATFORM_LIBS ${CMAKE_DL_LIBS})
-
-target_link_libraries (date_lut2 PRIVATE common ${PLATFORM_LIBS})
-target_link_libraries (date_lut3 PRIVATE common ${PLATFORM_LIBS})
-target_link_libraries (date_lut_default_timezone PRIVATE common ${PLATFORM_LIBS})
-target_link_libraries (local_date_time_comparison PRIVATE common)
-target_link_libraries (realloc-perf PRIVATE common)
-add_check(local_date_time_comparison)
-
-if(USE_GTEST)
-    add_executable(unit_tests_libcommon gtest_json_test.cpp gtest_strong_typedef.cpp gtest_find_symbols.cpp)
-    target_link_libraries(unit_tests_libcommon PRIVATE common ${GTEST_MAIN_LIBRARIES} ${GTEST_LIBRARIES})
-    add_check(unit_tests_libcommon)
-endif()
-
 add_executable (dump_variable dump_variable.cpp)
 target_link_libraries (dump_variable PRIVATE clickhouse_common_io)
diff --git a/base/common/tests/allocator.cpp b/base/common/tests/allocator.cpp
deleted file mode 100644
index 03f6228e0f5..00000000000
--- a/base/common/tests/allocator.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-#include <cstdlib>
-#include <cstring>
-#include <vector>
-#include <thread>
-
-
-void thread_func()
-{
-    for (size_t i = 0; i < 100; ++i)
-    {
-        size_t size = 4096;
-
-        void * buf = malloc(size);
-        if (!buf)
-            abort();
-        memset(buf, 0, size);
-
-        while (size < 1048576)
-        {
-            size_t next_size = size * 4;
-
-            void * new_buf = realloc(buf, next_size);
-            if (!new_buf)
-                abort();
-            buf = new_buf;
-
-            memset(reinterpret_cast<char*>(buf) + size, 0, next_size - size);
-            size = next_size;
-        }
-
-        free(buf);
-    }
-}
-
-
-int main(int, char **)
-{
-    std::vector<std::thread> threads(16);
-    for (size_t i = 0; i < 1000; ++i)
-    {
-        for (auto & thread : threads)
-            thread = std::thread(thread_func);
-        for (auto & thread : threads)
-            thread.join();
-    }
-    return 0;
-}
diff --git a/base/common/tests/date_lut2.cpp b/base/common/tests/date_lut2.cpp
deleted file mode 100644
index 6dcf5e8adf2..00000000000
--- a/base/common/tests/date_lut2.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-#include <iostream>
-#include <cstring>
-
-#include <common/DateLUT.h>
-
-
-static std::string toString(time_t Value)
-{
-    struct tm tm;
-    char buf[96];
-
-    localtime_r(&Value, &tm);
-    snprintf(buf, sizeof(buf), "%04d-%02d-%02d %02d:%02d:%02d",
-             tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec);
-
-    return buf;
-}
-
-static time_t orderedIdentifierToDate(unsigned value)
-{
-    struct tm tm;
-
-    memset(&tm, 0, sizeof(tm));
-
-    tm.tm_year = value / 10000 - 1900;
-    tm.tm_mon = (value % 10000) / 100 - 1;
-    tm.tm_mday = value % 100;
-    tm.tm_isdst = -1;
-
-    return mktime(&tm);
-}
-
-
-void loop(time_t begin, time_t end, int step)
-{
-    const auto & date_lut = DateLUT::instance();
-
-    for (time_t t = begin; t < end; t += step)
-        std::cout << toString(t)
-            << ", " << toString(date_lut.toTime(t))
-            << ", " << date_lut.toHour(t)
-            << std::endl;
-}
-
-
-int main(int, char **)
-{
-    loop(orderedIdentifierToDate(20101031), orderedIdentifierToDate(20101101), 15 * 60);
-    loop(orderedIdentifierToDate(20100328), orderedIdentifierToDate(20100330), 15 * 60);
-    loop(orderedIdentifierToDate(20141020), orderedIdentifierToDate(20141106), 15 * 60);
-
-    return 0;
-}
diff --git a/base/common/tests/date_lut3.cpp b/base/common/tests/date_lut3.cpp
deleted file mode 100644
index 411765d2b2a..00000000000
--- a/base/common/tests/date_lut3.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-#include <iostream>
-#include <cstring>
-
-#include <Poco/Exception.h>
-
-#include <common/DateLUT.h>
-
-
-static std::string toString(time_t Value)
-{
-    struct tm tm;
-    char buf[96];
-
-    localtime_r(&Value, &tm);
-    snprintf(buf, sizeof(buf), "%04d-%02d-%02d %02d:%02d:%02d",
-             tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec);
-
-    return buf;
-}
-
-static time_t orderedIdentifierToDate(unsigned value)
-{
-    struct tm tm;
-
-    memset(&tm, 0, sizeof(tm));
-
-    tm.tm_year = value / 10000 - 1900;
-    tm.tm_mon = (value % 10000) / 100 - 1;
-    tm.tm_mday = value % 100;
-    tm.tm_isdst = -1;
-
-    return mktime(&tm);
-}
-
-
-void loop(time_t begin, time_t end, int step)
-{
-    const auto & date_lut = DateLUT::instance();
-
-    for (time_t t = begin; t < end; t += step)
-    {
-        time_t t2 = date_lut.makeDateTime(date_lut.toYear(t), date_lut.toMonth(t), date_lut.toDayOfMonth(t),
-            date_lut.toHour(t), date_lut.toMinute(t), date_lut.toSecond(t));
-
-        std::string s1 = toString(t);
-        std::string s2 = toString(t2);
-
-        std::cerr << s1 << ", " << s2 << std::endl;
-
-        if (s1 != s2)
-            throw Poco::Exception("Test failed.");
-    }
-}
-
-
-int main(int, char **)
-{
-    loop(orderedIdentifierToDate(20101031), orderedIdentifierToDate(20101101), 15 * 60);
-    loop(orderedIdentifierToDate(20100328), orderedIdentifierToDate(20100330), 15 * 60);
-
-    return 0;
-}
diff --git a/base/common/tests/date_lut_default_timezone.cpp b/base/common/tests/date_lut_default_timezone.cpp
deleted file mode 100644
index b8e5aa08931..00000000000
--- a/base/common/tests/date_lut_default_timezone.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <iostream>
-#include <common/DateLUT.h>
-#include <Poco/Exception.h>
-
-int main(int, char **)
-{
-    try
-    {
-        const auto & date_lut = DateLUT::instance();
-        std::cout << "Detected default timezone: `" << date_lut.getTimeZone() << "'" << std::endl;
-        time_t now = time(nullptr);
-        std::cout << "Current time: " << date_lut.timeToString(now)
-                  << ", UTC: " << DateLUT::instance("UTC").timeToString(now) << std::endl;
-    }
-    catch (const Poco::Exception & e)
-    {
-        std::cerr << e.displayText() << std::endl;
-        return 1;
-    }
-    catch (std::exception & e)
-    {
-        std::cerr << "std::exception: " << e.what() << std::endl;
-        return 2;
-    }
-    catch (...)
-    {
-        std::cerr << "Some exception" << std::endl;
-        return 3;
-    }
-    return 0;
-}
diff --git a/base/common/tests/gtest_json_test.cpp b/base/common/tests/gtest_json_test.cpp
deleted file mode 100644
index 189a1a03d99..00000000000
--- a/base/common/tests/gtest_json_test.cpp
+++ /dev/null
@@ -1,656 +0,0 @@
-#include <vector>
-#include <string>
-#include <exception>
-#include <common/JSON.h>
-
-#include <boost/range/irange.hpp>
-
-using namespace std::literals::string_literals;
-
-#include <gtest/gtest.h>
-
-enum class ResultType
-{
-    Return,
-    Throw
-};
-
-struct GetStringTestRecord
-{
-    const char * input;
-    ResultType result_type;
-    const char * result;
-};
-
-TEST(JSONSuite, SimpleTest)
-{
-    std::vector<GetStringTestRecord> test_data =
-    {
-        { R"("name")", ResultType::Return, "name" },
-        { R"("Вафельница Vitek WX-1102 FL")", ResultType::Return, "Вафельница Vitek WX-1102 FL" },
-        { R"("brand")", ResultType::Return, "brand" },
-        { R"("184509")", ResultType::Return, "184509" },
-        { R"("category")", ResultType::Return, "category" },
-        { R"("Все для детей/Детская техника/Vitek")", ResultType::Return, "Все для детей/Детская техника/Vitek" },
-        { R"("variant")", ResultType::Return, "variant" },
-        { R"("В наличии")", ResultType::Return, "В наличии" },
-        { R"("price")", ResultType::Return, "price" },
-        { R"("2390.00")", ResultType::Return, "2390.00" },
-        { R"("list")", ResultType::Return, "list" },
-        { R"("Карточка")", ResultType::Return, "Карточка" },
-        { R"("position")", ResultType::Return, "position" },
-        { R"("detail")", ResultType::Return, "detail" },
-        { R"("actionField")", ResultType::Return, "actionField" },
-        { R"("list")", ResultType::Return, "list" },
-        { R"("http://www.techport.ru/q/?t=вафельница&sort=price&sdim=asc")", ResultType::Return, "http://www.techport.ru/q/?t=вафельница&sort=price&sdim=asc" },
-        { R"("action")", ResultType::Return, "action" },
-        { R"("detail")", ResultType::Return, "detail" },
-        { R"("products")", ResultType::Return, "products" },
-        { R"("name")", ResultType::Return, "name" },
-        { R"("Вафельница Vitek WX-1102 FL")", ResultType::Return, "Вафельница Vitek WX-1102 FL" },
-        { R"("id")", ResultType::Return, "id" },
-        { R"("184509")", ResultType::Return, "184509" },
-        { R"("price")", ResultType::Return, "price" },
-        { R"("2390.00")", ResultType::Return, "2390.00" },
-        { R"("brand")", ResultType::Return, "brand" },
-        { R"("Vitek")", ResultType::Return, "Vitek" },
-        { R"("category")", ResultType::Return, "category" },
-        { R"("Все для детей/Детская техника/Vitek")", ResultType::Return, "Все для детей/Детская техника/Vitek" },
-        { R"("variant")", ResultType::Return, "variant" },
-        { R"("В наличии")", ResultType::Return, "В наличии" },
-        { R"("ru")", ResultType::Return, "ru" },
-        { R"("experiments")", ResultType::Return, "experiments" },
-        { R"("lang")", ResultType::Return, "lang" },
-        { R"("ru")", ResultType::Return, "ru" },
-        { R"("los_portal")", ResultType::Return, "los_portal" },
-        { R"("los_level")", ResultType::Return, "los_level" },
-        { R"("none")", ResultType::Return, "none" },
-        { R"("isAuthorized")", ResultType::Return, "isAuthorized" },
-        { R"("isSubscriber")", ResultType::Return, "isSubscriber" },
-        { R"("postType")", ResultType::Return, "postType" },
-        { R"("Новости")", ResultType::Return, "Новости" },
-        { R"("experiments")", ResultType::Return, "experiments" },
-        { R"("lang")", ResultType::Return, "lang" },
-        { R"("ru")", ResultType::Return, "ru" },
-        { R"("los_portal")", ResultType::Return, "los_portal" },
-        { R"("los_level")", ResultType::Return, "los_level" },
-        { R"("none")", ResultType::Return, "none" },
-        { R"("lang")", ResultType::Return, "lang" },
-        { R"("ru")", ResultType::Return, "ru" },
-        { R"("Электроплита GEFEST Брест ЭПНД 5140-01 0001")", ResultType::Return, "Электроплита GEFEST Брест ЭПНД 5140-01 0001" },
-        { R"("price")", ResultType::Return, "price" },
-        { R"("currencyCode")", ResultType::Return, "currencyCode" },
-        { R"("RUB")", ResultType::Return, "RUB" },
-        { R"("lang")", ResultType::Return, "lang" },
-        { R"("ru")", ResultType::Return, "ru" },
-        { R"("experiments")", ResultType::Return, "experiments" },
-        { R"("lang")", ResultType::Return, "lang" },
-        { R"("ru")", ResultType::Return, "ru" },
-        { R"("los_portal")", ResultType::Return, "los_portal" },
-        { R"("los_level")", ResultType::Return, "los_level" },
-        { R"("none")", ResultType::Return, "none" },
-        { R"("trash_login")", ResultType::Return, "trash_login" },
-        { R"("novikoff")", ResultType::Return, "novikoff" },
-        { R"("trash_cat_link")", ResultType::Return, "trash_cat_link" },
-        { R"("progs")", ResultType::Return, "progs" },
-        { R"("trash_parent_link")", ResultType::Return, "trash_parent_link" },
-        { R"("content")", ResultType::Return, "content" },
-        { R"("trash_posted_parent")", ResultType::Return, "trash_posted_parent" },
-        { R"("content.01.2016")", ResultType::Return, "content.01.2016" },
-        { R"("trash_posted_cat")", ResultType::Return, "trash_posted_cat" },
-        { R"("progs.01.2016")", ResultType::Return, "progs.01.2016" },
-        { R"("trash_virus_count")", ResultType::Return, "trash_virus_count" },
-        { R"("trash_is_android")", ResultType::Return, "trash_is_android" },
-        { R"("trash_is_wp8")", ResultType::Return, "trash_is_wp8" },
-        { R"("trash_is_ios")", ResultType::Return, "trash_is_ios" },
-        { R"("trash_posted")", ResultType::Return, "trash_posted" },
-        { R"("01.2016")", ResultType::Return, "01.2016" },
-        { R"("experiments")", ResultType::Return, "experiments" },
-        { R"("lang")", ResultType::Return, "lang" },
-        { R"("ru")", ResultType::Return, "ru" },
-        { R"("los_portal")", ResultType::Return, "los_portal" },
-        { R"("los_level")", ResultType::Return, "los_level" },
-        { R"("none")", ResultType::Return, "none" },
-        { R"("merchantId")", ResultType::Return, "merchantId" },
-        { R"("13694_49246")", ResultType::Return, "13694_49246" },
-        { R"("cps-source")", ResultType::Return, "cps-source" },
-        { R"("wargaming")", ResultType::Return, "wargaming" },
-        { R"("cps_provider")", ResultType::Return, "cps_provider" },
-        { R"("default")", ResultType::Return, "default" },
-        { R"("errorReason")", ResultType::Return, "errorReason" },
-        { R"("no errors")", ResultType::Return, "no errors" },
-        { R"("scid")", ResultType::Return, "scid" },
-        { R"("isAuthPayment")", ResultType::Return, "isAuthPayment" },
-        { R"("lang")", ResultType::Return, "lang" },
-        { R"("ru")", ResultType::Return, "ru" },
-        { R"("rubric")", ResultType::Return, "rubric" },
-        { R"("")", ResultType::Return, "" },
-        { R"("rubric")", ResultType::Return, "rubric" },
-        { R"("Мир")", ResultType::Return, "Мир" },
-        { R"("lang")", ResultType::Return, "lang" },
-        { R"("ru")", ResultType::Return, "ru" },
-        { R"("experiments")", ResultType::Return, "experiments" },
-        { R"("lang")", ResultType::Return, "lang" },
-        { R"("ru")", ResultType::Return, "ru" },
-        { R"("los_portal")", ResultType::Return, "los_portal" },
-        { R"("los_level")", ResultType::Return, "los_level" },
-        { R"("none")", ResultType::Return, "none" },
-        { R"("lang")", ResultType::Return, "lang" },
-        { R"("ru")", ResultType::Return, "ru" },
-        { R"("__ym")", ResultType::Return, "__ym" },
-        { R"("ecommerce")", ResultType::Return, "ecommerce" },
-        { R"("impressions")", ResultType::Return, "impressions" },
-        { R"("id")", ResultType::Return, "id" },
-        { R"("863813")", ResultType::Return, "863813" },
-        { R"("name")", ResultType::Return, "name" },
-        { R"("Футболка детская 3D Happy, возраст 1-2 года, трикотаж")", ResultType::Return, "Футболка детская 3D Happy, возраст 1-2 года, трикотаж" },
-        { R"("category")", ResultType::Return, "category" },
-        { R"("/Летние товары/Летний текстиль/")", ResultType::Return, "/Летние товары/Летний текстиль/" },
-        { R"("variant")", ResultType::Return, "variant" },
-        { R"("")", ResultType::Return, "" },
-        { R"("price")", ResultType::Return, "price" },
-        { R"("390.00")", ResultType::Return, "390.00" },
-        { R"("list")", ResultType::Return, "list" },
-        { R"("/retailrocket/")", ResultType::Return, "/retailrocket/" },
-        { R"("position")", ResultType::Return, "position" },
-        { R"("brand")", ResultType::Return, "brand" },
-        { R"("/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/")", ResultType::Return, "/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/" },
-        { R"("id")", ResultType::Return, "id" },
-        { R"("863839")", ResultType::Return, "863839" },
-        { R"("name")", ResultType::Return, "name" },
-        { R"("Футболка детская 3D Pretty kitten, возраст 1-2 года, трикотаж")", ResultType::Return, "Футболка детская 3D Pretty kitten, возраст 1-2 года, трикотаж" },
-        { R"("category")", ResultType::Return, "category" },
-        { R"("/Летние товары/Летний текстиль/")", ResultType::Return, "/Летние товары/Летний текстиль/" },
-        { R"("variant")", ResultType::Return, "variant" },
-        { R"("")", ResultType::Return, "" },
-        { R"("price")", ResultType::Return, "price" },
-        { R"("390.00")", ResultType::Return, "390.00" },
-        { R"("list")", ResultType::Return, "list" },
-        { R"("/retailrocket/")", ResultType::Return, "/retailrocket/" },
-        { R"("position")", ResultType::Return, "position" },
-        { R"("brand")", ResultType::Return, "brand" },
-        { R"("/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/")", ResultType::Return, "/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/" },
-        { R"("id")", ResultType::Return, "id" },
-        { R"("863847")", ResultType::Return, "863847" },
-        { R"("name")", ResultType::Return, "name" },
-        { R"("Футболка детская 3D Little tiger, возраст 1-2 года, трикотаж")", ResultType::Return, "Футболка детская 3D Little tiger, возраст 1-2 года, трикотаж" },
-        { R"("category")", ResultType::Return, "category" },
-        { R"("/Летние товары/Летний текстиль/")", ResultType::Return, "/Летние товары/Летний текстиль/" },
-        { R"("variant")", ResultType::Return, "variant" },
-        { R"("")", ResultType::Return, "" },
-        { R"("price")", ResultType::Return, "price" },
-        { R"("390.00")", ResultType::Return, "390.00" },
-        { R"("list")", ResultType::Return, "list" },
-        { R"("/retailrocket/")", ResultType::Return, "/retailrocket/" },
-        { R"("position")", ResultType::Return, "position" },
-        { R"("brand")", ResultType::Return, "brand" },
-        { R"("/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/")", ResultType::Return, "/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/" },
-        { R"("id")", ResultType::Return, "id" },
-        { R"("911480")", ResultType::Return, "911480" },
-        { R"("name")", ResultType::Return, "name" },
-        { R"("Футболка детская 3D Puppy, возраст 1-2 года, трикотаж")", ResultType::Return, "Футболка детская 3D Puppy, возраст 1-2 года, трикотаж" },
-        { R"("category")", ResultType::Return, "category" },
-        { R"("/Летние товары/Летний текстиль/")", ResultType::Return, "/Летние товары/Летний текстиль/" },
-        { R"("variant")", ResultType::Return, "variant" },
-        { R"("")", ResultType::Return, "" },
-        { R"("price")", ResultType::Return, "price" },
-        { R"("390.00")", ResultType::Return, "390.00" },
-        { R"("list")", ResultType::Return, "list" },
-        { R"("/retailrocket/")", ResultType::Return, "/retailrocket/" },
-        { R"("position")", ResultType::Return, "position" },
-        { R"("brand")", ResultType::Return, "brand" },
-        { R"("/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/")", ResultType::Return, "/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/" },
-        { R"("id")", ResultType::Return, "id" },
-        { R"("911484")", ResultType::Return, "911484" },
-        { R"("name")", ResultType::Return, "name" },
-        { R"("Футболка детская 3D Little bears, возраст 1-2 года, трикотаж")", ResultType::Return, "Футболка детская 3D Little bears, возраст 1-2 года, трикотаж" },
-        { R"("category")", ResultType::Return, "category" },
-        { R"("/Летние товары/Летний текстиль/")", ResultType::Return, "/Летние товары/Летний текстиль/" },
-        { R"("variant")", ResultType::Return, "variant" },
-        { R"("")", ResultType::Return, "" },
-        { R"("price")", ResultType::Return, "price" },
-        { R"("390.00")", ResultType::Return, "390.00" },
-        { R"("list")", ResultType::Return, "list" },
-        { R"("/retailrocket/")", ResultType::Return, "/retailrocket/" },
-        { R"("position")", ResultType::Return, "position" },
-        { R"("brand")", ResultType::Return, "brand" },
-        { R"("/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/")", ResultType::Return, "/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/" },
-        { R"("id")", ResultType::Return, "id" },
-        { R"("911489")", ResultType::Return, "911489" },
-        { R"("name")", ResultType::Return, "name" },
-        { R"("Футболка детская 3D Dolphin, возраст 2-4 года, трикотаж")", ResultType::Return, "Футболка детская 3D Dolphin, возраст 2-4 года, трикотаж" },
-        { R"("category")", ResultType::Return, "category" },
-        { R"("/Летние товары/Летний текстиль/")", ResultType::Return, "/Летние товары/Летний текстиль/" },
-        { R"("variant")", ResultType::Return, "variant" },
-        { R"("")", ResultType::Return, "" },
-        { R"("price")", ResultType::Return, "price" },
-        { R"("390.00")", ResultType::Return, "390.00" },
-        { R"("list")", ResultType::Return, "list" },
-        { R"("/retailrocket/")", ResultType::Return, "/retailrocket/" },
-        { R"("position")", ResultType::Return, "position" },
-        { R"("brand")", ResultType::Return, "brand" },
-        { R"("/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/")", ResultType::Return, "/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/" },
-        { R"("id")", ResultType::Return, "id" },
-        { R"("911496")", ResultType::Return, "911496" },
-        { R"("name")", ResultType::Return, "name" },
-        { R"("Футболка детская 3D Pretty, возраст 1-2 года, трикотаж")", ResultType::Return, "Футболка детская 3D Pretty, возраст 1-2 года, трикотаж" },
-        { R"("category")", ResultType::Return, "category" },
-        { R"("/Летние товары/Летний текстиль/")", ResultType::Return, "/Летние товары/Летний текстиль/" },
-        { R"("variant")", ResultType::Return, "variant" },
-        { R"("")", ResultType::Return, "" },
-        { R"("price")", ResultType::Return, "price" },
-        { R"("390.00")", ResultType::Return, "390.00" },
-        { R"("list")", ResultType::Return, "list" },
-        { R"("/retailrocket/")", ResultType::Return, "/retailrocket/" },
-        { R"("position")", ResultType::Return, "position" },
-        { R"("brand")", ResultType::Return, "brand" },
-        { R"("/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/")", ResultType::Return, "/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/" },
-        { R"("id")", ResultType::Return, "id" },
-        { R"("911504")", ResultType::Return, "911504" },
-        { R"("name")", ResultType::Return, "name" },
-        { R"("Футболка детская 3D Fairytale, возраст 1-2 года, трикотаж")", ResultType::Return, "Футболка детская 3D Fairytale, возраст 1-2 года, трикотаж" },
-        { R"("category")", ResultType::Return, "category" },
-        { R"("/Летние товары/Летний текстиль/")", ResultType::Return, "/Летние товары/Летний текстиль/" },
-        { R"("variant")", ResultType::Return, "variant" },
-        { R"("")", ResultType::Return, "" },
-        { R"("price")", ResultType::Return, "price" },
-        { R"("390.00")", ResultType::Return, "390.00" },
-        { R"("list")", ResultType::Return, "list" },
-        { R"("/retailrocket/")", ResultType::Return, "/retailrocket/" },
-        { R"("position")", ResultType::Return, "position" },
-        { R"("brand")", ResultType::Return, "brand" },
-        { R"("/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/")", ResultType::Return, "/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/" },
-        { R"("id")", ResultType::Return, "id" },
-        { R"("911508")", ResultType::Return, "911508" },
-        { R"("name")", ResultType::Return, "name" },
-        { R"("Футболка детская 3D Kittens, возраст 1-2 года, трикотаж")", ResultType::Return, "Футболка детская 3D Kittens, возраст 1-2 года, трикотаж" },
-        { R"("category")", ResultType::Return, "category" },
-        { R"("/Летние товары/Летний текстиль/")", ResultType::Return, "/Летние товары/Летний текстиль/" },
-        { R"("variant")", ResultType::Return, "variant" },
-        { R"("")", ResultType::Return, "" },
-        { R"("price")", ResultType::Return, "price" },
-        { R"("390.00")", ResultType::Return, "390.00" },
-        { R"("list")", ResultType::Return, "list" },
-        { R"("/retailrocket/")", ResultType::Return, "/retailrocket/" },
-        { R"("position")", ResultType::Return, "position" },
-        { R"("brand")", ResultType::Return, "brand" },
-        { R"("/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/")", ResultType::Return, "/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/" },
-        { R"("id")", ResultType::Return, "id" },
-        { R"("911512")", ResultType::Return, "911512" },
-        { R"("name")", ResultType::Return, "name" },
-        { R"("Футболка детская 3D Sunshine, возраст 1-2 года, трикотаж")", ResultType::Return, "Футболка детская 3D Sunshine, возраст 1-2 года, трикотаж" },
-        { R"("category")", ResultType::Return, "category" },
-        { R"("/Летние товары/Летний текстиль/")", ResultType::Return, "/Летние товары/Летний текстиль/" },
-        { R"("variant")", ResultType::Return, "variant" },
-        { R"("")", ResultType::Return, "" },
-        { R"("price")", ResultType::Return, "price" },
-        { R"("390.00")", ResultType::Return, "390.00" },
-        { R"("list")", ResultType::Return, "list" },
-        { R"("/retailrocket/")", ResultType::Return, "/retailrocket/" },
-        { R"("position")", ResultType::Return, "position" },
-        { R"("brand")", ResultType::Return, "brand" },
-        { R"("/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/")", ResultType::Return, "/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/" },
-        { R"("id")", ResultType::Return, "id" },
-        { R"("911516")", ResultType::Return, "911516" },
-        { R"("name")", ResultType::Return, "name" },
-        { R"("Футболка детская 3D Dog in bag, возраст 1-2 года, трикотаж")", ResultType::Return, "Футболка детская 3D Dog in bag, возраст 1-2 года, трикотаж" },
-        { R"("category")", ResultType::Return, "category" },
-        { R"("/Летние товары/Летний текстиль/")", ResultType::Return, "/Летние товары/Летний текстиль/" },
-        { R"("variant")", ResultType::Return, "variant" },
-        { R"("")", ResultType::Return, "" },
-        { R"("price")", ResultType::Return, "price" },
-        { R"("390.00")", ResultType::Return, "390.00" },
-        { R"("list")", ResultType::Return, "list" },
-        { R"("/retailrocket/")", ResultType::Return, "/retailrocket/" },
-        { R"("position")", ResultType::Return, "position" },
-        { R"("brand")", ResultType::Return, "brand" },
-        { R"("/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/")", ResultType::Return, "/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/" },
-        { R"("id")", ResultType::Return, "id" },
-        { R"("911520")", ResultType::Return, "911520" },
-        { R"("name")", ResultType::Return, "name" },
-        { R"("Футболка детская 3D Cute puppy, возраст 1-2 года, трикотаж")", ResultType::Return, "Футболка детская 3D Cute puppy, возраст 1-2 года, трикотаж" },
-        { R"("category")", ResultType::Return, "category" },
-        { R"("/Летние товары/Летний текстиль/")", ResultType::Return, "/Летние товары/Летний текстиль/" },
-        { R"("variant")", ResultType::Return, "variant" },
-        { R"("")", ResultType::Return, "" },
-        { R"("price")", ResultType::Return, "price" },
-        { R"("390.00")", ResultType::Return, "390.00" },
-        { R"("list")", ResultType::Return, "list" },
-        { R"("/retailrocket/")", ResultType::Return, "/retailrocket/" },
-        { R"("position")", ResultType::Return, "position" },
-        { R"("brand")", ResultType::Return, "brand" },
-        { R"("/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/")", ResultType::Return, "/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/" },
-        { R"("id")", ResultType::Return, "id" },
-        { R"("911524")", ResultType::Return, "911524" },
-        { R"("name")", ResultType::Return, "name" },
-        { R"("Футболка детская 3D Rabbit, возраст 1-2 года, трикотаж")", ResultType::Return, "Футболка детская 3D Rabbit, возраст 1-2 года, трикотаж" },
-        { R"("category")", ResultType::Return, "category" },
-        { R"("/Летние товары/Летний текстиль/")", ResultType::Return, "/Летние товары/Летний текстиль/" },
-        { R"("variant")", ResultType::Return, "variant" },
-        { R"("")", ResultType::Return, "" },
-        { R"("price")", ResultType::Return, "price" },
-        { R"("390.00")", ResultType::Return, "390.00" },
-        { R"("list")", ResultType::Return, "list" },
-        { R"("/retailrocket/")", ResultType::Return, "/retailrocket/" },
-        { R"("position")", ResultType::Return, "position" },
-        { R"("brand")", ResultType::Return, "brand" },
-        { R"("/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/")", ResultType::Return, "/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/" },
-        { R"("id")", ResultType::Return, "id" },
-        { R"("911528")", ResultType::Return, "911528" },
-        { R"("name")", ResultType::Return, "name" },
-        { R"("Футболка детская 3D Turtle, возраст 1-2 года, трикотаж")", ResultType::Return, "Футболка детская 3D Turtle, возраст 1-2 года, трикотаж" },
-        { R"("category")", ResultType::Return, "category" },
-        { R"("/Летние товары/Летний текстиль/")", ResultType::Return, "/Летние товары/Летний текстиль/" },
-        { R"("variant")", ResultType::Return, "variant" },
-        { R"("")", ResultType::Return, "" },
-        { R"("price")", ResultType::Return, "price" },
-        { R"("390.00")", ResultType::Return, "390.00" },
-        { R"("list")", ResultType::Return, "list" },
-        { R"("/retailrocket/")", ResultType::Return, "/retailrocket/" },
-        { R"("position")", ResultType::Return, "position" },
-        { R"("brand")", ResultType::Return, "brand" },
-        { R"("/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/")", ResultType::Return, "/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/" },
-        { R"("id")", ResultType::Return, "id" },
-        { R"("888616")", ResultType::Return, "888616" },
-        { R"("name")", ResultType::Return, "name" },
-        { "\"3Д Футболка мужская \\\"Collorista\\\" Светлое завтра р-р XL(52-54), 100% хлопок, трикотаж\"", ResultType::Return, "3Д Футболка мужская \"Collorista\" Светлое завтра р-р XL(52-54), 100% хлопок, трикотаж" },
-        { R"("category")", ResultType::Return, "category" },
-        { R"("/Одежда и обувь/Мужская одежда/Футболки/")", ResultType::Return, "/Одежда и обувь/Мужская одежда/Футболки/" },
-        { R"("variant")", ResultType::Return, "variant" },
-        { R"("")", ResultType::Return, "" },
-        { R"("price")", ResultType::Return, "price" },
-        { R"("406.60")", ResultType::Return, "406.60" },
-        { R"("list")", ResultType::Return, "list" },
-        { R"("/retailrocket/")", ResultType::Return, "/retailrocket/" },
-        { R"("position")", ResultType::Return, "position" },
-        { R"("brand")", ResultType::Return, "brand" },
-        { R"("/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/")", ResultType::Return, "/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/" },
-        { R"("id")", ResultType::Return, "id" },
-        { R"("913361")", ResultType::Return, "913361" },
-        { R"("name")", ResultType::Return, "name" },
-        { R"("3Д Футболка детская World р-р 8-10, 100% хлопок, трикотаж")", ResultType::Return, "3Д Футболка детская World р-р 8-10, 100% хлопок, трикотаж" },
-        { R"("category")", ResultType::Return, "category" },
-        { R"("/Летние товары/Летний текстиль/")", ResultType::Return, "/Летние товары/Летний текстиль/" },
-        { R"("variant")", ResultType::Return, "variant" },
-        { R"("")", ResultType::Return, "" },
-        { R"("price")", ResultType::Return, "price" },
-        { R"("470.00")", ResultType::Return, "470.00" },
-        { R"("list")", ResultType::Return, "list" },
-        { R"("/retailrocket/")", ResultType::Return, "/retailrocket/" },
-        { R"("position")", ResultType::Return, "position" },
-        { R"("brand")", ResultType::Return, "brand" },
-        { R"("/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/")", ResultType::Return, "/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/" },
-        { R"("id")", ResultType::Return, "id" },
-        { R"("913364")", ResultType::Return, "913364" },
-        { R"("name")", ResultType::Return, "name" },
-        { R"("3Д Футболка детская Force р-р 8-10, 100% хлопок, трикотаж")", ResultType::Return, "3Д Футболка детская Force р-р 8-10, 100% хлопок, трикотаж" },
-        { R"("category")", ResultType::Return, "category" },
-        { R"("/Летние товары/Летний текстиль/")", ResultType::Return, "/Летние товары/Летний текстиль/" },
-        { R"("variant")", ResultType::Return, "variant" },
-        { R"("")", ResultType::Return, "" },
-        { R"("price")", ResultType::Return, "price" },
-        { R"("470.00")", ResultType::Return, "470.00" },
-        { R"("list")", ResultType::Return, "list" },
-        { R"("/retailrocket/")", ResultType::Return, "/retailrocket/" },
-        { R"("position")", ResultType::Return, "position" },
-        { R"("brand")", ResultType::Return, "brand" },
-        { R"("/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/")", ResultType::Return, "/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/" },
-        { R"("id")", ResultType::Return, "id" },
-        { R"("913367")", ResultType::Return, "913367" },
-        { R"("name")", ResultType::Return, "name" },
-        { R"("3Д Футболка детская Winter tale р-р 8-10, 100% хлопок, трикотаж")", ResultType::Return, "3Д Футболка детская Winter tale р-р 8-10, 100% хлопок, трикотаж" },
-        { R"("category")", ResultType::Return, "category" },
-        { R"("/Летние товары/Летний текстиль/")", ResultType::Return, "/Летние товары/Летний текстиль/" },
-        { R"("variant")", ResultType::Return, "variant" },
-        { R"("")", ResultType::Return, "" },
-        { R"("price")", ResultType::Return, "price" },
-        { R"("470.00")", ResultType::Return, "470.00" },
-        { R"("list")", ResultType::Return, "list" },
-        { R"("/retailrocket/")", ResultType::Return, "/retailrocket/" },
-        { R"("position")", ResultType::Return, "position" },
-        { R"("brand")", ResultType::Return, "brand" },
-        { R"("/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/")", ResultType::Return, "/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/" },
-        { R"("id")", ResultType::Return, "id" },
-        { R"("913385")", ResultType::Return, "913385" },
-        { R"("name")", ResultType::Return, "name" },
-        { R"("3Д Футболка детская Moonshine р-р 8-10, 100% хлопок, трикотаж")", ResultType::Return, "3Д Футболка детская Moonshine р-р 8-10, 100% хлопок, трикотаж" },
-        { R"("category")", ResultType::Return, "category" },
-        { R"("/Летние товары/Летний текстиль/")", ResultType::Return, "/Летние товары/Летний текстиль/" },
-        { R"("variant")", ResultType::Return, "variant" },
-        { R"("")", ResultType::Return, "" },
-        { R"("price")", ResultType::Return, "price" },
-        { R"("470.00")", ResultType::Return, "470.00" },
-        { R"("list")", ResultType::Return, "list" },
-        { R"("/retailrocket/")", ResultType::Return, "/retailrocket/" },
-        { R"("position")", ResultType::Return, "position" },
-        { R"("brand")", ResultType::Return, "brand" },
-        { R"("/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/")", ResultType::Return, "/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/" },
-        { R"("id")", ResultType::Return, "id" },
-        { R"("913391")", ResultType::Return, "913391" },
-        { R"("name")", ResultType::Return, "name" },
-        { R"("3Д Футболка детская Shaman р-р 8-10, 100% хлопок, трикотаж")", ResultType::Return, "3Д Футболка детская Shaman р-р 8-10, 100% хлопок, трикотаж" },
-        { R"("category")", ResultType::Return, "category" },
-        { R"("/Летние товары/Летний текстиль/")", ResultType::Return, "/Летние товары/Летний текстиль/" },
-        { R"("variant")", ResultType::Return, "variant" },
-        { R"("")", ResultType::Return, "" },
-        { R"("price")", ResultType::Return, "price" },
-        { R"("470.00")", ResultType::Return, "470.00" },
-        { R"("list")", ResultType::Return, "list" },
-        { R"("/retailrocket/")", ResultType::Return, "/retailrocket/" },
-        { R"("position")", ResultType::Return, "position" },
-        { R"("brand")", ResultType::Return, "brand" },
-        { R"("/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/")", ResultType::Return, "/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/" },
-        { R"("usertype")", ResultType::Return, "usertype" },
-        { R"("visitor")", ResultType::Return, "visitor" },
-        { R"("lang")", ResultType::Return, "lang" },
-        { R"("ru")", ResultType::Return, "ru" },
-        { R"("__ym")", ResultType::Return, "__ym" },
-        { R"("ecommerce")", ResultType::Return, "ecommerce" },
-        { R"("impressions")", ResultType::Return, "impressions" },
-        { R"("experiments")", ResultType::Return, "experiments" },
-        { R"("lang")", ResultType::Return, "lang" },
-        { R"("ru")", ResultType::Return, "ru" },
-        { R"("los_portal")", ResultType::Return, "los_portal" },
-        { R"("los_level")", ResultType::Return, "los_level" },
-        { R"("none")", ResultType::Return, "none" },
-        { R"("experiments")", ResultType::Return, "experiments" },
-        { R"("lang")", ResultType::Return, "lang" },
-        { R"("ru")", ResultType::Return, "ru" },
-        { R"("los_portal")", ResultType::Return, "los_portal" },
-        { R"("los_level")", ResultType::Return, "los_level" },
-        { R"("none")", ResultType::Return, "none" },
-        { R"("experiments")", ResultType::Return, "experiments" },
-        { R"("lang")", ResultType::Return, "lang" },
-        { R"("ru")", ResultType::Return, "ru" },
-        { R"("los_portal")", ResultType::Return, "los_portal" },
-        { R"("los_level")", ResultType::Return, "los_level" },
-        { R"("none")", ResultType::Return, "none" },
-        { R"("experiments")", ResultType::Return, "experiments" },
-        { R"("lang")", ResultType::Return, "lang" },
-        { R"("ru")", ResultType::Return, "ru" },
-        { R"("los_portal")", ResultType::Return, "los_portal" },
-        { R"("los_level")", ResultType::Return, "los_level" },
-        { R"("none")", ResultType::Return, "none" },
-        { R"("experiments")", ResultType::Return, "experiments" },
-        { R"("lang")", ResultType::Return, "lang" },
-        { R"("ru")", ResultType::Return, "ru" },
-        { R"("los_portal")", ResultType::Return, "los_portal" },
-        { R"("los_level")", ResultType::Return, "los_level" },
-        { R"("none")", ResultType::Return, "none" },
-        { R"("__ym")", ResultType::Return, "__ym" },
-        { R"("ecommerce")", ResultType::Return, "ecommerce" },
-        { R"("currencyCode")", ResultType::Return, "currencyCode" },
-        { R"("RUR")", ResultType::Return, "RUR" },
-        { R"("impressions")", ResultType::Return, "impressions" },
-        { R"("name")", ResultType::Return, "name" },
-        { R"("Чайник электрический Mystery MEK-1627, белый")", ResultType::Return, "Чайник электрический Mystery MEK-1627, белый" },
-        { R"("brand")", ResultType::Return, "brand" },
-        { R"("Mystery")", ResultType::Return, "Mystery" },
-        { R"("id")", ResultType::Return, "id" },
-        { R"("187180")", ResultType::Return, "187180" },
-        { R"("category")", ResultType::Return, "category" },
-        { R"("Мелкая бытовая техника/Мелкие кухонные приборы/Чайники электрические/Mystery")", ResultType::Return, "Мелкая бытовая техника/Мелкие кухонные приборы/Чайники электрические/Mystery" },
-        { R"("variant")", ResultType::Return, "variant" },
-        { R"("В наличии")", ResultType::Return, "В наличии" },
-        { R"("price")", ResultType::Return, "price" },
-        { R"("1630.00")", ResultType::Return, "1630.00" },
-        { R"("list")", ResultType::Return, "list" },
-        { R"("Карточка")", ResultType::Return, "Карточка" },
-        { R"("position")", ResultType::Return, "position" },
-        { R"("detail")", ResultType::Return, "detail" },
-        { R"("actionField")", ResultType::Return, "actionField" },
-        { R"("list")", ResultType::Return, "list" },
-        { "\0\"", ResultType::Throw, "JSON: expected \", got \0" },
-        { "\"/igrushki/konstruktory\0", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"/1290414/komplekt-zhenskiy-dzhemper-plusbryuki-m-254-09-malina-plustemno-siniy-\0a", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"/Творчество/Рисование/Инструменты и кра\0a", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"Строительство и ремонт/Силовая техника/Зарядные устройства для автомобильных аккумуляторов/Пуско-зарядные устр\xD0\0a", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"Строительство и ремонт/Силовая техника/Зарядные устройств\xD0\0t", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"Строительство и ремонт/Силовая техника/Зарядные устройства для автомобиль\0k", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\0t", ResultType::Throw, "JSON: expected \", got \0" },
-        { "\"/Хозтовары/Хранение вещей и организа\xD1\0t", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"/Хозтовары/Товары для стир\0a", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"li\0a", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"/734859/samolet-radioupravlyaemyy-istrebitel-rabotaet-o\0k", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"/kosmetika-i-parfyum/parfyumeriya/mu\0t", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"/ko\0\x04", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "", ResultType::Throw, "JSON: begin >= end." },
-        { "\"/stroitelstvo-i-remont/stroit\0t", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"/stroitelstvo-i-remont/stroitelnyy-instrument/av\0k", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"/s\0a", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"/Строительство и ремонт/Строительный инструмент/Изм\0e", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"/avto/soputstvuy\0l", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"/str\0\xD0", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"Отвертка 2 в 1 \\\"TUNDRA basic\\\" 5х75 мм (+,-) \0\xFF", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"/stroitelstvo-i-remont/stroitelnyy-instrument/avtoinstrumen\0\0", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"Мелкая бытовая техника/Мелки\xD0\0\0", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"Пряжа \\\"Бамбук стрейч\\0\0\0", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"Карандаш чёрнографитны\xD0\0\xD0", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"/Творчество/Рукоделие, аппликации/Пряжа и шерсть для \xD0\0l", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"/1071547/karandash-chernografitnyy-volshebstvo-nv-kruglyy-d-7-2mm-dl-176mm-plast-tuba/\0e", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"ca\0e", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"ca\0e", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"/1165424/chipbord-vyrubnoy-dlya-skrapbukinga-malyshi-mikki-maus-disney-bebi\0t", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"/posuda/kuhonnye-prinadlezhnosti-i-i\0d", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"/Канцтовары/Ежедневники и блокн\xD0\0\0", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"/kanctovary/ezhednevniki-i-blok\0a", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"Стакан \xD0\0a", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"Набор бумаги для скрапбукинга \\\"Мои первый годик\\\": Микки Маус, Дисней бэби, 12 листов 29.5 х 29.5 см, 160\0\x80", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"c\0\0", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"Органайзер для хранения аксессуаров, \0\0", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"quantity\00", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"Сменный блок для тетрадей на кольцах А5, 160 листов клетка, офсет \xE2\x84\0=", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"/Сувениры/Ф\xD0\0 ", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"\0\"", ResultType::Return, "\0" },
-        { "\"\0\x04", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"va\0\0", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"ca\0\0", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"В \0\x04", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"/letnie-tovary/z\0\x04", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"Посудомоечная машина Ha\0=", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"Крупная бытов\0\0", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"Полочная акустическая система Magnat Needl\0\0", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"brand\00", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"\0d", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"pos\0 ", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"c\0o", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"var\0\0", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"Телевизоры и видеотехника/Всё для домашних кинотеатр\0=", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"Флеш-диск Transcend JetFlash 620 8GB (TS8GJF62\0\0", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"Табурет Мег\0\xD0", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"variant\0\x04", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"Катал\xD0\0\"", ResultType::Return, "Катал\xD0\0" },
-        { "\"К\0\0", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"Полочная акустическая система Magnat Needl\0\0", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"brand\00", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"\0d", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"pos\0 ", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"c\0o", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"17\0o", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"/igrushki/razvivayusc\0 ", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"Ключница \\\"\0 ", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"/Игр\xD1\0 ", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"/Игрушки/Игрушки для девочек/Игровые модули дл\xD1\0o", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"Крупная бытовая техника/Стиральные машины/С фронт\xD0\0o", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\0 ", ResultType::Throw, "JSON: expected \", got \0" },
-        { "\"Светодиодная лента SMD3528, 5 м. IP33, 60LED, зеленый, 4,8W/мет\xD1\0 ", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"Сантехника/Мебель для ванных комнат/Стол\0o", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\0o", ResultType::Throw, "JSON: expected \", got \0" },
-        { "\"/igrushki/konstruktory\0 ", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"/posuda/kuhonnye-prinadlezhnosti-i-instrumenty/kuhonnye-pr\0 ", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"/1290414/komplekt-zhenskiy-dzhemper-plusbryuki-m-254-09-malina-plustemno-siniy-\0o", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"/Творчество/Рисование/Инструменты и кра\0o", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"Строительство и ремонт/Силовая техника/Зарядные устройства для автомобильных аккумуляторов/Пуско-зарядные устр\xD0\0o", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"Строительство и ремонт/Силовая техника/Зарядные устройств\xD0\0 ", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"Строительство и ремонт/Силовая техника/Зарядные устройства для автомобиль\0d", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\0 ", ResultType::Throw, "JSON: expected \", got \0" },
-        { "\"/Хозтовары/Хранение вещей и организа\xD1\0 ", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"/Хозтовары/Товары для стир\0o", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"li\0o", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"/igrushki/igrus\0d", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"/734859/samolet-radioupravlyaemyy-istrebitel-rabotaet-o\0 ", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"/kosmetika-i-parfyum/parfyumeriya/mu\00", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"/ko\0\0", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"/avto/avtomobilnyy\0\0", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"/stroitelstvo-i-remont/stroit\00", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"/stroitelstvo-i-remont/stroitelnyy-instrument/av\0 ", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"/s\0d", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"/Строительство и ремонт/Строительный инструмент/Изм\0o", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"/avto/soputstvuy\0\"", ResultType::Return, "/avto/soputstvuy\0" },
-        { "\"/str\0k", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"Отвертка 2 в 1 \\\"TUNDRA basic\\\" 5х75 мм (+,-) \0\xD0", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"/stroitelstvo-i-remont/stroitelnyy-instrument/avtoinstrumen\0=", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"Чайник электрический Vitesse\0=", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"Мелкая бытовая техника/Мелки\xD0\0\xD0", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"Пряжа \\\"Бамбук стрейч\\0о", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"Карандаш чёрнографитны\xD0\0k", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"/Творчество/Рукоделие, аппликации/Пряжа и шерсть для \xD0\0\"", ResultType::Return, "/Творчество/Рукоделие, аппликации/Пряжа и шерсть для \xD0\0" },
-        { "\"/1071547/karandash-chernografitnyy-volshebstvo-nv-kruglyy-d-7-2mm-dl-176mm-plast-tuba/\0o", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"ca\0o", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"/Подаро\0o", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"Средство для прочис\xD1\0o", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"i\0o", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"/p\0\"", ResultType::Return, "/p\0" },
-        { "\"/Сувениры/Магниты, н\xD0\0k", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"Дерев\xD0\0=", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"/prazdniki/svadba/svadebnaya-c\0\xD0", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"/Канцт\0d", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"/Праздники/То\xD0\0 ", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"v\0 ", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"/Косметика \xD0\0d", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"/Спорт и отдых/Настольные игры/Покер, руле\xD1\0\xD0", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"categ\0=", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"/retailr\0k", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"/retailrocket\0k", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"Ежедневник недат А5 140л кл,ляссе,обл пв\0=", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"/432809/ezhednevnik-organayzer-sredniy-s-remeshkom-na-knopke-v-oblozhke-kalkulyator-kalendar-do-\0\xD0", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"/1165424/chipbord-vyrubnoy-dlya-skrapbukinga-malyshi-mikki-maus-disney-bebi\0d", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"/posuda/kuhonnye-prinadlezhnosti-i-i\0 ", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"/Канцтовары/Ежедневники и блокн\xD0\0o", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"/kanctovary/ezhednevniki-i-blok\00", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"Стакан \xD0\0\0", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"Набор бумаги для скрапбукинга \\\"Мои первый годик\\\": Микки Маус, Дисней бэби, 12 листов 29.5 х 29.5 см, 160\0\0", ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)." },
-        { "\"c\0\"", ResultType::Return, "c\0" },
-    };
-
-    for (auto i : boost::irange(0, 1/*00000*/))
-    {
-        static_cast<void>(i);
-
-        for (auto & r : test_data)
-        {
-            try
-            {
-                JSON j(r.input, r.input + strlen(r.input));
-
-                ASSERT_EQ(j.getString(), r.result);
-                ASSERT_TRUE(r.result_type == ResultType::Return);
-            }
-            catch (JSONException & e)
-            {
-                ASSERT_TRUE(r.result_type == ResultType::Throw);
-                ASSERT_EQ(e.message(), r.result);
-            }
-        }
-    }
-}
diff --git a/base/common/wide_integer_impl.h b/base/common/wide_integer_impl.h
index a34e757eaa5..456c10a22e4 100644
--- a/base/common/wide_integer_impl.h
+++ b/base/common/wide_integer_impl.h
@@ -249,15 +249,15 @@ struct integer<Bits, Signed>::_impl
             return;
         }
 
-        const T alpha = t / max_int;
+        const T alpha = t / static_cast<T>(max_int);
 
-        if (alpha <= max_int)
+        if (alpha <= static_cast<T>(max_int))
             self = static_cast<uint64_t>(alpha);
         else // max(double) / 2^64 will surely contain less than 52 precision bits, so speed up computations.
             set_multiplier<double>(self, alpha);
 
         self *= max_int;
-        self += static_cast<uint64_t>(t - alpha * max_int); // += b_i
+        self += static_cast<uint64_t>(t - alpha * static_cast<T>(max_int)); // += b_i
     }
 
     constexpr static void wide_integer_from_bultin(integer<Bits, Signed>& self, double rhs) noexcept {
@@ -271,11 +271,15 @@ struct integer<Bits, Signed>::_impl
         /// As to_Integral does a static_cast to int64_t, it may result in UB.
         /// The necessary check here is that long double has enough significant (mantissa) bits to store the
         /// int64_t max value precisely.
+
+        //TODO Be compatible with Apple aarch64
+#if not (defined(__APPLE__) && defined(__aarch64__))
         static_assert(LDBL_MANT_DIG >= 64,
             "On your system long double has less than 64 precision bits,"
             "which may result in UB when initializing double from int64_t");
+#endif
 
-        if ((rhs > 0 && rhs < max_int) || (rhs < 0 && rhs > min_int))
+        if ((rhs > 0 && rhs < static_cast<long double>(max_int)) || (rhs < 0 && rhs > static_cast<long double>(min_int)))
         {
             self = static_cast<int64_t>(rhs);
             return;
diff --git a/base/daemon/CMakeLists.txt b/base/daemon/CMakeLists.txt
index 26d59a57e7f..6ef87db6a61 100644
--- a/base/daemon/CMakeLists.txt
+++ b/base/daemon/CMakeLists.txt
@@ -5,6 +5,11 @@ add_library (daemon
 )
 
 target_include_directories (daemon PUBLIC ..)
+
+if (OS_DARWIN AND NOT MAKE_STATIC_LIBRARIES)
+    target_link_libraries (daemon PUBLIC -Wl,-undefined,dynamic_lookup)
+endif()
+
 target_link_libraries (daemon PUBLIC loggers PRIVATE clickhouse_common_io clickhouse_common_config common ${EXECINFO_LIBRARIES})
 
 if (USE_SENTRY)
diff --git a/base/daemon/SentryWriter.cpp b/base/daemon/SentryWriter.cpp
index 29430b65983..1b7d0064b99 100644
--- a/base/daemon/SentryWriter.cpp
+++ b/base/daemon/SentryWriter.cpp
@@ -9,6 +9,7 @@
 #include <common/getMemoryAmount.h>
 #include <common/logger_useful.h>
 
+#include <Common/formatReadable.h>
 #include <Common/SymbolIndex.h>
 #include <Common/StackTrace.h>
 #include <Common/getNumberOfPhysicalCPUCores.h>
diff --git a/base/ext/scope_guard_safe.h b/base/ext/scope_guard_safe.h
new file mode 100644
index 00000000000..55140213572
--- /dev/null
+++ b/base/ext/scope_guard_safe.h
@@ -0,0 +1,68 @@
+#pragma once
+
+#include <ext/scope_guard.h>
+#include <common/logger_useful.h>
+#include <Common/MemoryTracker.h>
+
+/// Same as SCOPE_EXIT() but block the MEMORY_LIMIT_EXCEEDED errors.
+///
+/// Typical example of SCOPE_EXIT_MEMORY() usage is when code under it may do
+/// some tiny allocations, that may fail under high memory pressure or/and low
+/// max_memory_usage (and related limits).
+///
+/// NOTE: it should be used with caution.
+#define SCOPE_EXIT_MEMORY(...) SCOPE_EXIT(                    \
+    MemoryTracker::LockExceptionInThread                      \
+                lock_memory_tracker(VariableContext::Global); \
+    __VA_ARGS__;                                              \
+)
+
+/// Same as SCOPE_EXIT() but try/catch/tryLogCurrentException any exceptions.
+///
+/// SCOPE_EXIT_SAFE() should be used in case the exception during the code
+/// under SCOPE_EXIT() is not "that fatal" and error message in log is enough.
+///
+/// Good example is calling CurrentThread::detachQueryIfNotDetached().
+///
+/// Anti-pattern is calling WriteBuffer::finalize() under SCOPE_EXIT_SAFE()
+/// (since finalize() can do final write and it is better to fail abnormally
+/// instead of ignoring write error).
+///
+/// NOTE: it should be used with double caution.
+#define SCOPE_EXIT_SAFE(...) SCOPE_EXIT(             \
+    try                                              \
+    {                                                \
+        __VA_ARGS__;                                 \
+    }                                                \
+    catch (...)                                      \
+    {                                                \
+        tryLogCurrentException(__PRETTY_FUNCTION__); \
+    }                                                \
+)
+
+/// Same as SCOPE_EXIT() but:
+/// - block the MEMORY_LIMIT_EXCEEDED errors,
+/// - try/catch/tryLogCurrentException any exceptions.
+///
+/// SCOPE_EXIT_MEMORY_SAFE() can be used when the error can be ignored, and in
+/// addition to SCOPE_EXIT_SAFE() it will also lock MEMORY_LIMIT_EXCEEDED to
+/// avoid such exceptions.
+///
+/// It does exists as a separate helper, since you do not need to lock
+/// MEMORY_LIMIT_EXCEEDED always (there are cases when code under SCOPE_EXIT does
+/// not do any allocations, while LockExceptionInThread increment atomic
+/// variable).
+///
+/// NOTE: it should be used with triple caution.
+#define SCOPE_EXIT_MEMORY_SAFE(...) SCOPE_EXIT(                   \
+    try                                                           \
+    {                                                             \
+        MemoryTracker::LockExceptionInThread                      \
+                    lock_memory_tracker(VariableContext::Global); \
+        __VA_ARGS__;                                              \
+    }                                                             \
+    catch (...)                                                   \
+    {                                                             \
+        tryLogCurrentException(__PRETTY_FUNCTION__);              \
+    }                                                             \
+)
diff --git a/base/glibc-compatibility/CMakeLists.txt b/base/glibc-compatibility/CMakeLists.txt
index 684c6162941..e785e2ab2ce 100644
--- a/base/glibc-compatibility/CMakeLists.txt
+++ b/base/glibc-compatibility/CMakeLists.txt
@@ -1,5 +1,8 @@
 if (GLIBC_COMPATIBILITY)
-    set (ENABLE_FASTMEMCPY ON)
+    add_subdirectory(memcpy)
+    if(TARGET memcpy)
+        set(MEMCPY_LIBRARY memcpy)
+    endif()
 
     enable_language(ASM)
     include(CheckIncludeFile)
@@ -27,13 +30,6 @@ if (GLIBC_COMPATIBILITY)
         list(APPEND glibc_compatibility_sources musl/getentropy.c)
     endif()
 
-    if (NOT ARCH_ARM)
-        # clickhouse_memcpy don't support ARCH_ARM, see https://github.com/ClickHouse/ClickHouse/issues/18951
-        add_library (clickhouse_memcpy OBJECT
-            ${ClickHouse_SOURCE_DIR}/contrib/FastMemcpy/memcpy_wrapper.c
-        )
-    endif()
-
     # Need to omit frame pointers to match the performance of glibc
     set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fomit-frame-pointer")
 
@@ -51,15 +47,16 @@ if (GLIBC_COMPATIBILITY)
         target_compile_options(glibc-compatibility PRIVATE -fPIC)
     endif ()
 
-    target_link_libraries(global-libs INTERFACE glibc-compatibility)
+    target_link_libraries(global-libs INTERFACE glibc-compatibility ${MEMCPY_LIBRARY})
 
     install(
-        TARGETS glibc-compatibility
+        TARGETS glibc-compatibility ${MEMCPY_LIBRARY}
         EXPORT global
         ARCHIVE DESTINATION lib
     )
 
     message (STATUS "Some symbols from glibc will be replaced for compatibility")
+
 elseif (YANDEX_OFFICIAL_BUILD)
     message (WARNING "Option GLIBC_COMPATIBILITY must be turned on for production builds.")
 endif ()
diff --git a/base/glibc-compatibility/memcpy/CMakeLists.txt b/base/glibc-compatibility/memcpy/CMakeLists.txt
new file mode 100644
index 00000000000..133995d9b96
--- /dev/null
+++ b/base/glibc-compatibility/memcpy/CMakeLists.txt
@@ -0,0 +1,8 @@
+if (ARCH_AMD64)
+    add_library(memcpy STATIC memcpy.cpp)
+
+    # We allow to include memcpy.h from user code for better inlining.
+    target_include_directories(memcpy PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
+
+    target_compile_options(memcpy PRIVATE -fno-builtin-memcpy)
+endif ()
diff --git a/base/glibc-compatibility/memcpy/memcpy.cpp b/base/glibc-compatibility/memcpy/memcpy.cpp
new file mode 100644
index 00000000000..ec43a2c3649
--- /dev/null
+++ b/base/glibc-compatibility/memcpy/memcpy.cpp
@@ -0,0 +1,6 @@
+#include "memcpy.h"
+
+extern "C" void * memcpy(void * __restrict dst, const void * __restrict src, size_t size)
+{
+    return inline_memcpy(dst, src, size);
+}
diff --git a/base/glibc-compatibility/memcpy/memcpy.h b/base/glibc-compatibility/memcpy/memcpy.h
new file mode 100644
index 00000000000..211d144cecb
--- /dev/null
+++ b/base/glibc-compatibility/memcpy/memcpy.h
@@ -0,0 +1,217 @@
+#include <cstddef>
+
+#include <emmintrin.h>
+
+
+/** Custom memcpy implementation for ClickHouse.
+  * It has the following benefits over using glibc's implementation:
+  * 1. Avoiding dependency on specific version of glibc's symbol, like memcpy@@GLIBC_2.14 for portability.
+  * 2. Avoiding indirect call via PLT due to shared linking, that can be less efficient.
+  * 3. It's possible to include this header and call inline_memcpy directly for better inlining or interprocedural analysis.
+  * 4. Better results on our performance tests on current CPUs: up to 25% on some queries and up to 0.7%..1% in average across all queries.
+  *
+  * Writing our own memcpy is extremely difficult for the following reasons:
+  * 1. The optimal variant depends on the specific CPU model.
+  * 2. The optimal variant depends on the distribution of size arguments.
+  * 3. It depends on the number of threads copying data concurrently.
+  * 4. It also depends on how the calling code is using the copied data and how the different memcpy calls are related to each other.
+  * Due to vast range of scenarios it makes proper testing especially difficult.
+  * When writing our own memcpy there is a risk to overoptimize it
+  * on non-representative microbenchmarks while making real-world use cases actually worse.
+  *
+  * Most of the benchmarks for memcpy on the internet are wrong.
+  *
+  * Let's look at the details:
+  *
+  * For small size, the order of branches in code is important.
+  * There are variants with specific order of branches (like here or in glibc)
+  * or with jump table (in asm code see example from Cosmopolitan libc:
+  * https://github.com/jart/cosmopolitan/blob/de09bec215675e9b0beb722df89c6f794da74f3f/libc/nexgen32e/memcpy.S#L61)
+  * or with Duff device in C (see https://github.com/skywind3000/FastMemcpy/)
+  *
+  * It's also important how to copy uneven sizes.
+  * Almost every implementation, including this, is using two overlapping movs.
+  *
+  * It is important to disable -ftree-loop-distribute-patterns when compiling memcpy implementation,
+  * otherwise the compiler can replace internal loops to a call to memcpy that will lead to infinite recursion.
+  *
+  * For larger sizes it's important to choose the instructions used:
+  * - SSE or AVX or AVX-512;
+  * - rep movsb;
+  * Performance will depend on the size threshold, on the CPU model, on the "erms" flag
+  * ("Enhansed Rep MovS" - it indicates that performance of "rep movsb" is decent for large sizes)
+  * https://stackoverflow.com/questions/43343231/enhanced-rep-movsb-for-memcpy
+  *
+  * Using AVX-512 can be bad due to throttling.
+  * Using AVX can be bad if most code is using SSE due to switching penalty
+  * (it also depends on the usage of "vzeroupper" instruction).
+  * But in some cases AVX gives a win.
+  *
+  * It also depends on how many times the loop will be unrolled.
+  * We are unrolling the loop 8 times (by the number of available registers), but it not always the best.
+  *
+  * It also depends on the usage of aligned or unaligned loads/stores.
+  * We are using unaligned loads and aligned stores.
+  *
+  * It also depends on the usage of prefetch instructions. It makes sense on some Intel CPUs but can slow down performance on AMD.
+  * Setting up correct offset for prefetching is non-obvious.
+  *
+  * Non-temporary (cache bypassing) stores can be used for very large sizes (more than a half of L3 cache).
+  * But the exact threshold is unclear - when doing memcpy from multiple threads the optimal threshold can be lower,
+  * because L3 cache is shared (and L2 cache is partially shared).
+  *
+  * Very large size of memcpy typically indicates suboptimal (not cache friendly) algorithms in code or unrealistic scenarios,
+  * so we don't pay attention to using non-temporary stores.
+  *
+  * On recent Intel CPUs, the presence of "erms" makes "rep movsb" the most benefitial,
+  * even comparing to non-temporary aligned unrolled stores even with the most wide registers.
+  *
+  * memcpy can be written in asm, C or C++. The latter can also use inline asm.
+  * The asm implementation can be better to make sure that compiler won't make the code worse,
+  * to ensure the order of branches, the code layout, the usage of all required registers.
+  * But if it is located in separate translation unit, inlining will not be possible
+  * (inline asm can be used to overcome this limitation).
+  * Sometimes C or C++ code can be further optimized by compiler.
+  * For example, clang is capable replacing SSE intrinsics to AVX code if -mavx is used.
+  *
+  * Please note that compiler can replace plain code to memcpy and vice versa.
+  * - memcpy with compile-time known small size is replaced to simple instructions without a call to memcpy;
+  *   it is controlled by -fbuiltin-memcpy and can be manually ensured by calling __builtin_memcpy.
+  *   This is often used to implement unaligned load/store without undefined behaviour in C++.
+  * - a loop with copying bytes can be recognized and replaced by a call to memcpy;
+  *   it is controlled by -ftree-loop-distribute-patterns.
+  * - also note that a loop with copying bytes can be unrolled, peeled and vectorized that will give you
+  *   inline code somewhat similar to a decent implementation of memcpy.
+  *
+  * This description is up to date as of Mar 2021.
+  *
+  * How to test the memcpy implementation for performance:
+  * 1. Test on real production workload.
+  * 2. For synthetic test, see utils/memcpy-bench, but make sure you will do the best to exhaust the wide range of scenarios.
+  *
+  * TODO: Add self-tuning memcpy with bayesian bandits algorithm for large sizes.
+  * See https://habr.com/en/company/yandex/blog/457612/
+  */
+
+
+static inline void * inline_memcpy(void * __restrict dst_, const void * __restrict src_, size_t size)
+{
+    /// We will use pointer arithmetic, so char pointer will be used.
+    /// Note that __restrict makes sense (otherwise compiler will reload data from memory
+    /// instead of using the value of registers due to possible aliasing).
+    char * __restrict dst = reinterpret_cast<char * __restrict>(dst_);
+    const char * __restrict src = reinterpret_cast<const char * __restrict>(src_);
+
+    /// Standard memcpy returns the original value of dst. It is rarely used but we have to do it.
+    /// If you use memcpy with small but non-constant sizes, you can call inline_memcpy directly
+    /// for inlining and removing this single instruction.
+    void * ret = dst;
+
+tail:
+    /// Small sizes and tails after the loop for large sizes.
+    /// The order of branches is important but in fact the optimal order depends on the distribution of sizes in your application.
+    /// This order of branches is from the disassembly of glibc's code.
+    /// We copy chunks of possibly uneven size with two overlapping movs.
+    /// Example: to copy 5 bytes [0, 1, 2, 3, 4] we will copy tail [1, 2, 3, 4] first and then head [0, 1, 2, 3].
+    if (size <= 16)
+    {
+        if (size >= 8)
+        {
+            /// Chunks of 8..16 bytes.
+            __builtin_memcpy(dst + size - 8, src + size - 8, 8);
+            __builtin_memcpy(dst, src, 8);
+        }
+        else if (size >= 4)
+        {
+            /// Chunks of 4..7 bytes.
+            __builtin_memcpy(dst + size - 4, src + size - 4, 4);
+            __builtin_memcpy(dst, src, 4);
+        }
+        else if (size >= 2)
+        {
+            /// Chunks of 2..3 bytes.
+            __builtin_memcpy(dst + size - 2, src + size - 2, 2);
+            __builtin_memcpy(dst, src, 2);
+        }
+        else if (size >= 1)
+        {
+            /// A single byte.
+            *dst = *src;
+        }
+        /// No bytes remaining.
+    }
+    else
+    {
+        /// Medium and large sizes.
+        if (size <= 128)
+        {
+            /// Medium size, not enough for full loop unrolling.
+
+            /// We will copy the last 16 bytes.
+            _mm_storeu_si128(reinterpret_cast<__m128i *>(dst + size - 16), _mm_loadu_si128(reinterpret_cast<const __m128i *>(src + size - 16)));
+
+            /// Then we will copy every 16 bytes from the beginning in a loop.
+            /// The last loop iteration will possibly overwrite some part of already copied last 16 bytes.
+            /// This is Ok, similar to the code for small sizes above.
+            while (size > 16)
+            {
+                _mm_storeu_si128(reinterpret_cast<__m128i *>(dst), _mm_loadu_si128(reinterpret_cast<const __m128i *>(src)));
+                dst += 16;
+                src += 16;
+                size -= 16;
+            }
+        }
+        else
+        {
+            /// Large size with fully unrolled loop.
+
+            /// Align destination to 16 bytes boundary.
+            size_t padding = (16 - (reinterpret_cast<size_t>(dst) & 15)) & 15;
+
+            /// If not aligned - we will copy first 16 bytes with unaligned stores.
+            if (padding > 0)
+            {
+                __m128i head = _mm_loadu_si128(reinterpret_cast<const __m128i*>(src));
+                _mm_storeu_si128(reinterpret_cast<__m128i*>(dst), head);
+                dst += padding;
+                src += padding;
+                size -= padding;
+            }
+
+            /// Aligned unrolled copy. We will use half of available SSE registers.
+            /// It's not possible to have both src and dst aligned.
+            /// So, we will use aligned stores and unaligned loads.
+            __m128i c0, c1, c2, c3, c4, c5, c6, c7;
+
+            while (size >= 128)
+            {
+                c0 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(src) + 0);
+                c1 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(src) + 1);
+                c2 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(src) + 2);
+                c3 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(src) + 3);
+                c4 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(src) + 4);
+                c5 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(src) + 5);
+                c6 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(src) + 6);
+                c7 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(src) + 7);
+                src += 128;
+                _mm_store_si128((reinterpret_cast<__m128i*>(dst) + 0), c0);
+                _mm_store_si128((reinterpret_cast<__m128i*>(dst) + 1), c1);
+                _mm_store_si128((reinterpret_cast<__m128i*>(dst) + 2), c2);
+                _mm_store_si128((reinterpret_cast<__m128i*>(dst) + 3), c3);
+                _mm_store_si128((reinterpret_cast<__m128i*>(dst) + 4), c4);
+                _mm_store_si128((reinterpret_cast<__m128i*>(dst) + 5), c5);
+                _mm_store_si128((reinterpret_cast<__m128i*>(dst) + 6), c6);
+                _mm_store_si128((reinterpret_cast<__m128i*>(dst) + 7), c7);
+                dst += 128;
+
+                size -= 128;
+            }
+
+            /// The latest remaining 0..127 bytes will be processed as usual.
+            goto tail;
+        }
+    }
+
+    return ret;
+}
+
diff --git a/base/mysqlxx/Connection.cpp b/base/mysqlxx/Connection.cpp
index 8a15115cb06..2dbbc0c73f3 100644
--- a/base/mysqlxx/Connection.cpp
+++ b/base/mysqlxx/Connection.cpp
@@ -51,10 +51,11 @@ Connection::Connection(
     const char* ssl_key,
     unsigned timeout,
     unsigned rw_timeout,
-    bool enable_local_infile)
+    bool enable_local_infile,
+    bool opt_reconnect)
     : Connection()
 {
-    connect(db, server, user, password, port, socket, ssl_ca, ssl_cert, ssl_key, timeout, rw_timeout, enable_local_infile);
+    connect(db, server, user, password, port, socket, ssl_ca, ssl_cert, ssl_key, timeout, rw_timeout, enable_local_infile, opt_reconnect);
 }
 
 Connection::Connection(const std::string & config_name)
@@ -80,7 +81,8 @@ void Connection::connect(const char* db,
     const char * ssl_key,
     unsigned timeout,
     unsigned rw_timeout,
-    bool enable_local_infile)
+    bool enable_local_infile,
+    bool opt_reconnect)
 {
     if (is_connected)
         disconnect();
@@ -104,9 +106,8 @@ void Connection::connect(const char* db,
     if (mysql_options(driver.get(), MYSQL_OPT_LOCAL_INFILE, &enable_local_infile_arg))
         throw ConnectionFailed(errorMessage(driver.get()), mysql_errno(driver.get()));
 
-    /// Enables auto-reconnect.
-    bool reconnect = true;
-    if (mysql_options(driver.get(), MYSQL_OPT_RECONNECT, reinterpret_cast<const char *>(&reconnect)))
+    /// See C API Developer Guide: Automatic Reconnection Control
+    if (mysql_options(driver.get(), MYSQL_OPT_RECONNECT, reinterpret_cast<const char *>(&opt_reconnect)))
         throw ConnectionFailed(errorMessage(driver.get()), mysql_errno(driver.get()));
 
     /// Specifies particular ssl key and certificate if it needs
diff --git a/base/mysqlxx/Connection.h b/base/mysqlxx/Connection.h
index ca67db0e0c6..65955136eb1 100644
--- a/base/mysqlxx/Connection.h
+++ b/base/mysqlxx/Connection.h
@@ -14,6 +14,8 @@
 
 /// Disable LOAD DATA LOCAL INFILE because it is insecure
 #define MYSQLXX_DEFAULT_ENABLE_LOCAL_INFILE false
+/// See https://dev.mysql.com/doc/c-api/5.7/en/c-api-auto-reconnect.html
+#define MYSQLXX_DEFAULT_MYSQL_OPT_RECONNECT true
 
 
 namespace mysqlxx
@@ -76,7 +78,8 @@ public:
         const char * ssl_key = "",
         unsigned timeout = MYSQLXX_DEFAULT_TIMEOUT,
         unsigned rw_timeout = MYSQLXX_DEFAULT_RW_TIMEOUT,
-        bool enable_local_infile = MYSQLXX_DEFAULT_ENABLE_LOCAL_INFILE);
+        bool enable_local_infile = MYSQLXX_DEFAULT_ENABLE_LOCAL_INFILE,
+        bool opt_reconnect = MYSQLXX_DEFAULT_MYSQL_OPT_RECONNECT);
 
     /// Creates connection. Can be used if Poco::Util::Application is using.
     /// All settings will be got from config_name section of configuration.
@@ -96,7 +99,8 @@ public:
         const char* ssl_key,
         unsigned timeout = MYSQLXX_DEFAULT_TIMEOUT,
         unsigned rw_timeout = MYSQLXX_DEFAULT_RW_TIMEOUT,
-        bool enable_local_infile = MYSQLXX_DEFAULT_ENABLE_LOCAL_INFILE);
+        bool enable_local_infile = MYSQLXX_DEFAULT_ENABLE_LOCAL_INFILE,
+        bool opt_reconnect = MYSQLXX_DEFAULT_MYSQL_OPT_RECONNECT);
 
     void connect(const std::string & config_name)
     {
@@ -112,6 +116,7 @@ public:
         std::string ssl_cert = cfg.getString(config_name + ".ssl_cert", "");
         std::string ssl_key = cfg.getString(config_name + ".ssl_key", "");
         bool enable_local_infile = cfg.getBool(config_name + ".enable_local_infile", MYSQLXX_DEFAULT_ENABLE_LOCAL_INFILE);
+        bool opt_reconnect = cfg.getBool(config_name + ".opt_reconnect", MYSQLXX_DEFAULT_MYSQL_OPT_RECONNECT);
 
         unsigned timeout =
             cfg.getInt(config_name + ".connect_timeout",
@@ -135,7 +140,8 @@ public:
                 ssl_key.c_str(),
                 timeout,
                 rw_timeout,
-                enable_local_infile);
+                enable_local_infile,
+                opt_reconnect);
     }
 
     /// If MySQL connection was established.
diff --git a/base/mysqlxx/Exception.h b/base/mysqlxx/Exception.h
index eaeb3565af1..48cd0997b94 100644
--- a/base/mysqlxx/Exception.h
+++ b/base/mysqlxx/Exception.h
@@ -26,6 +26,15 @@ struct ConnectionFailed : public Exception
 };
 
 
+/// Connection to MySQL server was lost
+struct ConnectionLost : public Exception
+{
+    ConnectionLost(const std::string & msg, int code = 0) : Exception(msg, code) {}
+    const char * name() const throw() override { return "mysqlxx::ConnectionLost"; }
+    const char * className() const throw() override { return "mysqlxx::ConnectionLost"; }
+};
+
+
 /// Erroneous query.
 struct BadQuery : public Exception
 {
diff --git a/base/mysqlxx/Pool.cpp b/base/mysqlxx/Pool.cpp
index 2cb3e62db84..386b4544b78 100644
--- a/base/mysqlxx/Pool.cpp
+++ b/base/mysqlxx/Pool.cpp
@@ -10,7 +10,6 @@
 
 #include <common/sleep.h>
 
-#include <Poco/Util/Application.h>
 #include <Poco/Util/LayeredConfiguration.h>
 
 
@@ -41,7 +40,9 @@ void Pool::Entry::decrementRefCount()
 Pool::Pool(const Poco::Util::AbstractConfiguration & cfg, const std::string & config_name,
      unsigned default_connections_, unsigned max_connections_,
      const char * parent_config_name_)
-    : default_connections(default_connections_), max_connections(max_connections_)
+    : logger(Poco::Logger::get("mysqlxx::Pool"))
+    , default_connections(default_connections_)
+    , max_connections(max_connections_)
 {
     server = cfg.getString(config_name + ".host");
 
@@ -78,6 +79,9 @@ Pool::Pool(const Poco::Util::AbstractConfiguration & cfg, const std::string & co
 
         enable_local_infile = cfg.getBool(config_name + ".enable_local_infile",
             cfg.getBool(parent_config_name + ".enable_local_infile", MYSQLXX_DEFAULT_ENABLE_LOCAL_INFILE));
+
+        opt_reconnect = cfg.getBool(config_name + ".opt_reconnect",
+            cfg.getBool(parent_config_name + ".opt_reconnect", MYSQLXX_DEFAULT_MYSQL_OPT_RECONNECT));
     }
     else
     {
@@ -96,6 +100,8 @@ Pool::Pool(const Poco::Util::AbstractConfiguration & cfg, const std::string & co
 
         enable_local_infile = cfg.getBool(
             config_name + ".enable_local_infile", MYSQLXX_DEFAULT_ENABLE_LOCAL_INFILE);
+
+        opt_reconnect = cfg.getBool(config_name + ".opt_reconnect", MYSQLXX_DEFAULT_MYSQL_OPT_RECONNECT);
     }
 
     connect_timeout = cfg.getInt(config_name + ".connect_timeout",
@@ -125,20 +131,30 @@ Pool::Entry Pool::get()
     initialize();
     for (;;)
     {
+        logger.trace("(%s): Iterating through existing MySQL connections", getDescription());
+
         for (auto & connection : connections)
         {
             if (connection->ref_count == 0)
                 return Entry(connection, this);
         }
 
+        logger.trace("(%s): Trying to allocate a new connection.", getDescription());
         if (connections.size() < static_cast<size_t>(max_connections))
         {
             Connection * conn = allocConnection();
             if (conn)
                 return Entry(conn, this);
+
+            logger.trace("(%s): Unable to create a new connection: Allocation failed.", getDescription());
+        }
+        else
+        {
+            logger.trace("(%s): Unable to create a new connection: Max number of connections has been reached.", getDescription());
         }
 
         lock.unlock();
+        logger.trace("(%s): Sleeping for %d seconds.", getDescription(), MYSQLXX_POOL_SLEEP_ON_CONNECT_FAIL);
         sleepForSeconds(MYSQLXX_POOL_SLEEP_ON_CONNECT_FAIL);
         lock.lock();
     }
@@ -158,12 +174,13 @@ Pool::Entry Pool::tryGet()
         /// Fixme: There is a race condition here b/c we do not synchronize with Pool::Entry's copy-assignment operator
         if (connection_ptr->ref_count == 0)
         {
-            Entry res(connection_ptr, this);
-            if (res.tryForceConnected())  /// Tries to reestablish connection as well
-                return res;
+            {
+                Entry res(connection_ptr, this);
+                if (res.tryForceConnected())  /// Tries to reestablish connection as well
+                    return res;
+            }
 
-            auto & logger = Poco::Util::Application::instance().logger();
-            logger.information("Idle connection to mysql server cannot be recovered, dropping it.");
+            logger.debug("(%s): Idle connection to MySQL server cannot be recovered, dropping it.", getDescription());
 
             /// This one is disconnected, cannot be reestablished and so needs to be disposed of.
             connection_it = connections.erase(connection_it);
@@ -186,6 +203,8 @@ Pool::Entry Pool::tryGet()
 
 void Pool::removeConnection(Connection* connection)
 {
+    logger.trace("(%s): Removing connection.", getDescription());
+
     std::lock_guard<std::mutex> lock(mutex);
     if (connection)
     {
@@ -210,8 +229,6 @@ void Pool::Entry::forceConnected() const
     if (data == nullptr)
         throw Poco::RuntimeException("Tried to access NULL database connection.");
 
-    Poco::Util::Application & app = Poco::Util::Application::instance();
-
     bool first = true;
     while (!tryForceConnected())
     {
@@ -220,7 +237,7 @@ void Pool::Entry::forceConnected() const
         else
             sleepForSeconds(MYSQLXX_POOL_SLEEP_ON_CONNECT_FAIL);
 
-        app.logger().information("MYSQL: Reconnecting to " + pool->description);
+        pool->logger.debug("Entry: Reconnecting to MySQL server %s", pool->description);
         data->conn.connect(
             pool->db.c_str(),
             pool->server.c_str(),
@@ -233,7 +250,8 @@ void Pool::Entry::forceConnected() const
             pool->ssl_key.c_str(),
             pool->connect_timeout,
             pool->rw_timeout,
-            pool->enable_local_infile);
+            pool->enable_local_infile,
+            pool->opt_reconnect);
     }
 }
 
@@ -242,18 +260,22 @@ bool Pool::Entry::tryForceConnected() const
 {
     auto * const mysql_driver = data->conn.getDriver();
     const auto prev_connection_id = mysql_thread_id(mysql_driver);
+
+    pool->logger.trace("Entry(connection %lu): sending PING to check if it is alive.", prev_connection_id);
     if (data->conn.ping())  /// Attempts to reestablish lost connection
     {
         const auto current_connection_id = mysql_thread_id(mysql_driver);
         if (prev_connection_id != current_connection_id)
         {
-            auto & logger = Poco::Util::Application::instance().logger();
-            logger.information("Connection to mysql server has been reestablished. Connection id changed: %lu -> %lu",
-                                prev_connection_id, current_connection_id);
+            pool->logger.debug("Entry(connection %lu): Reconnected to MySQL server. Connection id changed: %lu -> %lu",
+                                current_connection_id, prev_connection_id, current_connection_id);
         }
+
+        pool->logger.trace("Entry(connection %lu): PING ok.", current_connection_id);
         return true;
     }
 
+    pool->logger.trace("Entry(connection %lu): PING failed.", prev_connection_id);
     return false;
 }
 
@@ -274,15 +296,13 @@ void Pool::initialize()
 
 Pool::Connection * Pool::allocConnection(bool dont_throw_if_failed_first_time)
 {
-    Poco::Util::Application & app = Poco::Util::Application::instance();
-
-    std::unique_ptr<Connection> conn(new Connection);
+    std::unique_ptr<Connection> conn_ptr{new Connection};
 
     try
     {
-        app.logger().information("MYSQL: Connecting to " + description);
+        logger.debug("Connecting to %s", description);
 
-        conn->conn.connect(
+        conn_ptr->conn.connect(
             db.c_str(),
             server.c_str(),
             user.c_str(),
@@ -294,29 +314,29 @@ Pool::Connection * Pool::allocConnection(bool dont_throw_if_failed_first_time)
             ssl_key.c_str(),
             connect_timeout,
             rw_timeout,
-            enable_local_infile);
+            enable_local_infile,
+            opt_reconnect);
     }
     catch (mysqlxx::ConnectionFailed & e)
     {
+        logger.error(e.what());
+
         if ((!was_successful && !dont_throw_if_failed_first_time)
             || e.errnum() == ER_ACCESS_DENIED_ERROR
             || e.errnum() == ER_DBACCESS_DENIED_ERROR
             || e.errnum() == ER_BAD_DB_ERROR)
         {
-            app.logger().error(e.what());
             throw;
         }
         else
         {
-            app.logger().error(e.what());
             return nullptr;
         }
     }
 
+    connections.push_back(conn_ptr.get());
     was_successful = true;
-    auto * connection = conn.release();
-    connections.push_back(connection);
-    return connection;
+    return conn_ptr.release();
 }
 
 }
diff --git a/base/mysqlxx/Pool.h b/base/mysqlxx/Pool.h
index 83b00e0081a..530e2c78cf2 100644
--- a/base/mysqlxx/Pool.h
+++ b/base/mysqlxx/Pool.h
@@ -6,6 +6,8 @@
 #include <atomic>
 
 #include <Poco/Exception.h>
+#include <Poco/Logger.h>
+
 #include <mysqlxx/Connection.h>
 
 
@@ -157,27 +159,29 @@ public:
       */
     Pool(const std::string & db_,
          const std::string & server_,
-         const std::string & user_ = "",
-         const std::string & password_ = "",
-         unsigned port_ = 0,
+         const std::string & user_,
+         const std::string & password_,
+         unsigned port_,
          const std::string & socket_ = "",
          unsigned connect_timeout_ = MYSQLXX_DEFAULT_TIMEOUT,
          unsigned rw_timeout_ = MYSQLXX_DEFAULT_RW_TIMEOUT,
          unsigned default_connections_ = MYSQLXX_POOL_DEFAULT_START_CONNECTIONS,
          unsigned max_connections_ = MYSQLXX_POOL_DEFAULT_MAX_CONNECTIONS,
-         unsigned enable_local_infile_ = MYSQLXX_DEFAULT_ENABLE_LOCAL_INFILE)
-    : default_connections(default_connections_), max_connections(max_connections_),
-    db(db_), server(server_), user(user_), password(password_), port(port_), socket(socket_),
-    connect_timeout(connect_timeout_), rw_timeout(rw_timeout_), enable_local_infile(enable_local_infile_) {}
+         unsigned enable_local_infile_ = MYSQLXX_DEFAULT_ENABLE_LOCAL_INFILE,
+         bool opt_reconnect_ = MYSQLXX_DEFAULT_MYSQL_OPT_RECONNECT)
+    : logger(Poco::Logger::get("mysqlxx::Pool")), default_connections(default_connections_),
+    max_connections(max_connections_), db(db_), server(server_), user(user_), password(password_), port(port_), socket(socket_),
+    connect_timeout(connect_timeout_), rw_timeout(rw_timeout_), enable_local_infile(enable_local_infile_),
+    opt_reconnect(opt_reconnect_) {}
 
     Pool(const Pool & other)
-        : default_connections{other.default_connections},
+        : logger(other.logger), default_connections{other.default_connections},
           max_connections{other.max_connections},
           db{other.db}, server{other.server},
           user{other.user}, password{other.password},
           port{other.port}, socket{other.socket},
           connect_timeout{other.connect_timeout}, rw_timeout{other.rw_timeout},
-          enable_local_infile{other.enable_local_infile}
+          enable_local_infile{other.enable_local_infile}, opt_reconnect(other.opt_reconnect)
     {}
 
     Pool & operator=(const Pool &) = delete;
@@ -201,6 +205,8 @@ public:
     void removeConnection(Connection * connection);
 
 protected:
+    Poco::Logger & logger;
+
     /// Number of MySQL connections which are created at launch.
     unsigned default_connections;
     /// Maximum possible number of connections
@@ -231,6 +237,7 @@ private:
     std::string ssl_cert;
     std::string ssl_key;
     bool enable_local_infile;
+    bool opt_reconnect;
 
     /// True if connection was established at least once.
     bool was_successful{false};
diff --git a/base/mysqlxx/PoolWithFailover.cpp b/base/mysqlxx/PoolWithFailover.cpp
index 5bee75aab1b..ea2d060e596 100644
--- a/base/mysqlxx/PoolWithFailover.cpp
+++ b/base/mysqlxx/PoolWithFailover.cpp
@@ -1,3 +1,7 @@
+#include <algorithm>
+#include <ctime>
+#include <random>
+#include <thread>
 #include <mysqlxx/PoolWithFailover.h>
 
 
@@ -10,9 +14,12 @@ static bool startsWith(const std::string & s, const char * prefix)
 
 using namespace mysqlxx;
 
-PoolWithFailover::PoolWithFailover(const Poco::Util::AbstractConfiguration & config_,
-                                   const std::string & config_name_, const unsigned default_connections_,
-                                   const unsigned max_connections_, const size_t max_tries_)
+PoolWithFailover::PoolWithFailover(
+        const Poco::Util::AbstractConfiguration & config_,
+        const std::string & config_name_,
+        const unsigned default_connections_,
+        const unsigned max_connections_,
+        const size_t max_tries_)
     : max_tries(max_tries_)
 {
     shareable = config_.getBool(config_name_ + ".share_connection", false);
@@ -33,6 +40,19 @@ PoolWithFailover::PoolWithFailover(const Poco::Util::AbstractConfiguration & con
                     std::make_shared<Pool>(config_, replica_name, default_connections_, max_connections_, config_name_.c_str()));
             }
         }
+
+        /// PoolWithFailover objects are stored in a cache inside PoolFactory.
+        /// This cache is reset by ExternalDictionariesLoader after every SYSTEM RELOAD DICTIONAR{Y|IES}
+        /// which triggers massive re-constructing of connection pools.
+        /// The state of PRNGs like std::mt19937 is considered to be quite heavy
+        /// thus here we attempt to optimize its construction.
+        static thread_local std::mt19937 rnd_generator(
+                std::hash<std::thread::id>{}(std::this_thread::get_id()) + std::clock());
+        for (auto & [_, replicas] : replicas_by_priority)
+        {
+            if (replicas.size() > 1)
+                std::shuffle(replicas.begin(), replicas.end(), rnd_generator);
+        }
     }
     else
     {
@@ -41,16 +61,38 @@ PoolWithFailover::PoolWithFailover(const Poco::Util::AbstractConfiguration & con
     }
 }
 
-PoolWithFailover::PoolWithFailover(const std::string & config_name_, const unsigned default_connections_,
-    const unsigned max_connections_, const size_t max_tries_)
-    : PoolWithFailover{
-        Poco::Util::Application::instance().config(), config_name_,
-        default_connections_, max_connections_, max_tries_}
+
+PoolWithFailover::PoolWithFailover(
+        const std::string & config_name_,
+        const unsigned default_connections_,
+        const unsigned max_connections_,
+        const size_t max_tries_)
+    : PoolWithFailover{Poco::Util::Application::instance().config(),
+            config_name_, default_connections_, max_connections_, max_tries_}
 {
 }
 
+
+PoolWithFailover::PoolWithFailover(
+        const std::string & database,
+        const RemoteDescription & addresses,
+        const std::string & user,
+        const std::string & password,
+        size_t max_tries_)
+    : max_tries(max_tries_)
+    , shareable(false)
+{
+    /// Replicas have the same priority, but traversed replicas are moved to the end of the queue.
+    for (const auto & [host, port] : addresses)
+    {
+        replicas_by_priority[0].emplace_back(std::make_shared<Pool>(database, host, user, password, port));
+    }
+}
+
+
 PoolWithFailover::PoolWithFailover(const PoolWithFailover & other)
-    : max_tries{other.max_tries}, shareable{other.shareable}
+    : max_tries{other.max_tries}
+    , shareable{other.shareable}
 {
     if (shareable)
     {
diff --git a/base/mysqlxx/PoolWithFailover.h b/base/mysqlxx/PoolWithFailover.h
index 029fc3ebad3..5154fc3e253 100644
--- a/base/mysqlxx/PoolWithFailover.h
+++ b/base/mysqlxx/PoolWithFailover.h
@@ -11,6 +11,8 @@
 namespace mysqlxx
 {
     /** MySQL connection pool with support of failover.
+      *
+      * For dictionary source:
       * Have information about replicas and their priorities.
       * Tries to connect to replica in an order of priority. When equal priority, choose replica with maximum time without connections.
       *
@@ -68,42 +70,58 @@ namespace mysqlxx
         using PoolPtr = std::shared_ptr<Pool>;
         using Replicas = std::vector<PoolPtr>;
 
-        /// [priority][index] -> replica.
+        /// [priority][index] -> replica. Highest priority is 0.
         using ReplicasByPriority = std::map<int, Replicas>;
-
         ReplicasByPriority replicas_by_priority;
 
         /// Number of connection tries.
         size_t max_tries;
         /// Mutex for set of replicas.
         std::mutex mutex;
-
         /// Can the Pool be shared
         bool shareable;
 
     public:
         using Entry = Pool::Entry;
+        using RemoteDescription = std::vector<std::pair<std::string, uint16_t>>;
 
         /**
-         * config_name           Name of parameter in configuration file.
+         * * Mysql dictionary sourse related params:
+         * config_name           Name of parameter in configuration file for dictionary source.
+         *
+         * * Mysql storage related parameters:
+         * replicas_description
+         *
+         * * Mutual parameters:
          * default_connections   Number of connection in pool to each replica at start.
          * max_connections       Maximum number of connections in pool to each replica.
          * max_tries_            Max number of connection tries.
          */
-        PoolWithFailover(const std::string & config_name_,
+        PoolWithFailover(
+            const std::string & config_name_,
             unsigned default_connections_ = MYSQLXX_POOL_WITH_FAILOVER_DEFAULT_START_CONNECTIONS,
             unsigned max_connections_ = MYSQLXX_POOL_WITH_FAILOVER_DEFAULT_MAX_CONNECTIONS,
             size_t max_tries_ = MYSQLXX_POOL_WITH_FAILOVER_DEFAULT_MAX_TRIES);
 
-        PoolWithFailover(const Poco::Util::AbstractConfiguration & config_,
+        PoolWithFailover(
+            const Poco::Util::AbstractConfiguration & config_,
             const std::string & config_name_,
             unsigned default_connections_ = MYSQLXX_POOL_WITH_FAILOVER_DEFAULT_START_CONNECTIONS,
             unsigned max_connections_ = MYSQLXX_POOL_WITH_FAILOVER_DEFAULT_MAX_CONNECTIONS,
             size_t max_tries_ = MYSQLXX_POOL_WITH_FAILOVER_DEFAULT_MAX_TRIES);
 
+        PoolWithFailover(
+            const std::string & database,
+            const RemoteDescription & addresses,
+            const std::string & user,
+            const std::string & password,
+            size_t max_tries_ = MYSQLXX_POOL_WITH_FAILOVER_DEFAULT_MAX_TRIES);
+
         PoolWithFailover(const PoolWithFailover & other);
 
         /** Allocates a connection to use. */
         Entry get();
     };
+
+    using PoolWithFailoverPtr = std::shared_ptr<PoolWithFailover>;
 }
diff --git a/base/mysqlxx/Query.cpp b/base/mysqlxx/Query.cpp
index f3485c54edc..d4514c3e988 100644
--- a/base/mysqlxx/Query.cpp
+++ b/base/mysqlxx/Query.cpp
@@ -1,11 +1,16 @@
 #if __has_include(<mysql.h>)
+#include <errmsg.h>
 #include <mysql.h>
 #else
+#include <mysql/errmsg.h>
 #include <mysql/mysql.h>
 #endif
 
+#include <Poco/Logger.h>
+
 #include <mysqlxx/Connection.h>
 #include <mysqlxx/Query.h>
+#include <mysqlxx/Types.h>
 
 
 namespace mysqlxx
@@ -57,8 +62,24 @@ void Query::reset()
 void Query::executeImpl()
 {
     std::string query_string = query_buf.str();
-    if (mysql_real_query(conn->getDriver(), query_string.data(), query_string.size()))
-        throw BadQuery(errorMessage(conn->getDriver()), mysql_errno(conn->getDriver()));
+
+    MYSQL* mysql_driver = conn->getDriver();
+
+    auto & logger = Poco::Logger::get("mysqlxx::Query");
+    logger.trace("Running MySQL query using connection %lu", mysql_thread_id(mysql_driver));
+    if (mysql_real_query(mysql_driver, query_string.data(), query_string.size()))
+    {
+        const auto err_no = mysql_errno(mysql_driver);
+        switch (err_no)
+        {
+        case CR_SERVER_GONE_ERROR:
+            [[fallthrough]];
+        case CR_SERVER_LOST:
+            throw ConnectionLost(errorMessage(mysql_driver), err_no);
+        default:
+            throw BadQuery(errorMessage(mysql_driver), err_no);
+        }
+    }
 }
 
 UseQueryResult Query::use()
diff --git a/base/mysqlxx/tests/CMakeLists.txt b/base/mysqlxx/tests/CMakeLists.txt
index 2cf19d78418..6473a927308 100644
--- a/base/mysqlxx/tests/CMakeLists.txt
+++ b/base/mysqlxx/tests/CMakeLists.txt
@@ -1,5 +1,2 @@
-add_executable (mysqlxx_test mysqlxx_test.cpp)
-target_link_libraries (mysqlxx_test PRIVATE mysqlxx)
-
 add_executable (mysqlxx_pool_test mysqlxx_pool_test.cpp)
 target_link_libraries (mysqlxx_pool_test PRIVATE mysqlxx)
diff --git a/base/mysqlxx/tests/failover.xml b/base/mysqlxx/tests/failover.xml
deleted file mode 100644
index 73702eabb29..00000000000
--- a/base/mysqlxx/tests/failover.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version = '1.0' encoding = 'utf-8'?>
-<yandex>
-    <mysql_goals>
-        <port>3306</port>
-        <user>root</user>
-        <db>Metrica</db>
-        <password>qwerty</password>
-        <replica>
-            <host>example02t</host>
-            <priority>0</priority>
-        </replica>
-        <replica>
-            <host>example02t</host>
-            <port>3306</port>
-            <user>root</user>
-            <password>qwerty</password>
-            <db>Metrica</db>
-            <priority>1</priority>
-        </replica>
-    </mysql_goals>
-</yandex>
diff --git a/base/mysqlxx/tests/mysqlxx_test.cpp b/base/mysqlxx/tests/mysqlxx_test.cpp
deleted file mode 100644
index c505d34a58d..00000000000
--- a/base/mysqlxx/tests/mysqlxx_test.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-#include <iostream>
-#include <mysqlxx/mysqlxx.h>
-
-
-int main(int, char **)
-{
-    try
-    {
-        mysqlxx::Connection connection("test", "127.0.0.1", "root", "qwerty", 3306);
-        std::cerr << "Connected." << std::endl;
-
-        {
-            mysqlxx::Query query = connection.query();
-            query << "SELECT 1 x, '2010-01-01 01:01:01' d";
-            mysqlxx::UseQueryResult result = query.use();
-            std::cerr << "use() called." << std::endl;
-
-            while (mysqlxx::Row row = result.fetch())
-            {
-                std::cerr << "Fetched row." << std::endl;
-                std::cerr << row[0] << ", " << row["x"] << std::endl;
-                std::cerr << row[1] << ", " << row["d"]
-                    << ", " << row[1].getDate()
-                    << ", " << row[1].getDateTime()
-                    << ", " << row[1].getDate()
-                    << ", " << row[1].getDateTime()
-                    << std::endl
-                    << row[1].getDate() << ", " << row[1].getDateTime() << std::endl
-                    << row[1].getDate() << ", " << row[1].getDateTime() << std::endl
-                    << row[1].getDate() << ", " << row[1].getDateTime() << std::endl
-                    << row[1].getDate() << ", " << row[1].getDateTime() << std::endl
-                    ;
-
-                time_t t1 = row[0];
-                time_t t2 = row[1];
-                std::cerr << t1 << ", " << LocalDateTime(t1) << std::endl;
-                std::cerr << t2 << ", " << LocalDateTime(t2) << std::endl;
-            }
-        }
-
-        {
-            mysqlxx::UseQueryResult result = connection.query("SELECT 'abc\\\\def' x").use();
-            mysqlxx::Row row = result.fetch();
-            std::cerr << row << std::endl;
-            std::cerr << row << std::endl;
-        }
-
-        {
-            /// Копирование Query
-            mysqlxx::Query query1 = connection.query("SELECT");
-            mysqlxx::Query query2 = query1;
-            query2 << " 1";
-
-            std::cerr << query1.str() << ", " << query2.str() << std::endl;
-        }
-
-        {
-            /// NULL
-            mysqlxx::Null<int> x = mysqlxx::null;
-            std::cerr << (x == mysqlxx::null ? "Ok" : "Fail") << std::endl;
-            std::cerr << (x == 0 ? "Fail" : "Ok") << std::endl;
-            std::cerr << (x.isNull() ? "Ok" : "Fail") << std::endl;
-            x = 1;
-            std::cerr << (x == mysqlxx::null ? "Fail" : "Ok") << std::endl;
-            std::cerr << (x == 0 ? "Fail" : "Ok") << std::endl;
-            std::cerr << (x == 1 ? "Ok" : "Fail") << std::endl;
-            std::cerr << (x.isNull() ? "Fail" : "Ok") << std::endl;
-        }
-    }
-    catch (const mysqlxx::Exception & e)
-    {
-        std::cerr << e.code() << ", " << e.message() << std::endl;
-        throw;
-    }
-
-    return 0;
-}
diff --git a/base/readpassphrase/CMakeLists.txt b/base/readpassphrase/CMakeLists.txt
index 574130ce6e3..51b12106eca 100644
--- a/base/readpassphrase/CMakeLists.txt
+++ b/base/readpassphrase/CMakeLists.txt
@@ -4,5 +4,5 @@
 add_library(readpassphrase readpassphrase.c)
 
 set_target_properties(readpassphrase PROPERTIES LINKER_LANGUAGE C)
-target_compile_options(readpassphrase PRIVATE -Wno-unused-result -Wno-reserved-id-macro)
+target_compile_options(readpassphrase PRIVATE -Wno-unused-result -Wno-reserved-id-macro -Wno-disabled-macro-expansion)
 target_include_directories(readpassphrase PUBLIC .)
diff --git a/base/readpassphrase/readpassphrase.c b/base/readpassphrase/readpassphrase.c
index 9e8097643bb..8a7d3153915 100644
--- a/base/readpassphrase/readpassphrase.c
+++ b/base/readpassphrase/readpassphrase.c
@@ -94,7 +94,7 @@ restart:
     if (input != STDIN_FILENO && tcgetattr(input, &oterm) == 0) {
         memcpy(&term, &oterm, sizeof(term));
         if (!(flags & RPP_ECHO_ON))
-            term.c_lflag &= ~(ECHO | ECHONL);
+            term.c_lflag &= ~((unsigned int) (ECHO | ECHONL));
 #ifdef VSTATUS
         if (term.c_cc[VSTATUS] != _POSIX_VDISABLE)
             term.c_cc[VSTATUS] = _POSIX_VDISABLE;
diff --git a/cmake/analysis.cmake b/cmake/analysis.cmake
index 369be295746..267bb34248b 100644
--- a/cmake/analysis.cmake
+++ b/cmake/analysis.cmake
@@ -16,6 +16,10 @@ if (ENABLE_CLANG_TIDY)
 
         set (USE_CLANG_TIDY ON)
 
+        # clang-tidy requires assertions to guide the analysis
+        # Note that NDEBUG is set implicitly by CMake for non-debug builds
+        set(COMPILER_FLAGS "${COMPILER_FLAGS} -UNDEBUG")
+
         # The variable CMAKE_CXX_CLANG_TIDY will be set inside src and base directories with non third-party code.
         # set (CMAKE_CXX_CLANG_TIDY "${CLANG_TIDY_PATH}")
     elseif (FAIL_ON_UNSUPPORTED_OPTIONS_COMBINATION)
diff --git a/cmake/arch.cmake b/cmake/arch.cmake
index 9604ef62b31..60e0346dbbf 100644
--- a/cmake/arch.cmake
+++ b/cmake/arch.cmake
@@ -1,7 +1,7 @@
 if (CMAKE_SYSTEM_PROCESSOR MATCHES "amd64|x86_64")
     set (ARCH_AMD64 1)
 endif ()
-if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*)")
+if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*|arm64.*|ARM64.*)")
     set (ARCH_AARCH64 1)
 endif ()
 if (ARCH_AARCH64 OR CMAKE_SYSTEM_PROCESSOR MATCHES "arm")
diff --git a/cmake/autogenerated_versions.txt b/cmake/autogenerated_versions.txt
index ce92ae203ea..51f4b974161 100644
--- a/cmake/autogenerated_versions.txt
+++ b/cmake/autogenerated_versions.txt
@@ -1,9 +1,9 @@
 # This strings autochanged from release_lib.sh:
-SET(VERSION_REVISION 54448)
+SET(VERSION_REVISION 54451)
 SET(VERSION_MAJOR 21)
-SET(VERSION_MINOR 3)
+SET(VERSION_MINOR 6)
 SET(VERSION_PATCH 1)
-SET(VERSION_GITHASH ef72ba7349f230321750c13ee63b49a11a7c0adc)
-SET(VERSION_DESCRIBE v21.3.1.1-prestable)
-SET(VERSION_STRING 21.3.1.1)
+SET(VERSION_GITHASH 96fced4c3cf432fb0b401d2ab01f0c56e5f74a96)
+SET(VERSION_DESCRIBE v21.6.1.1-prestable)
+SET(VERSION_STRING 21.6.1.1)
 # end of autochange
diff --git a/cmake/darwin/default_libs.cmake b/cmake/darwin/default_libs.cmake
index 79ac675f234..a6ee800d59b 100644
--- a/cmake/darwin/default_libs.cmake
+++ b/cmake/darwin/default_libs.cmake
@@ -1,11 +1,14 @@
 set (DEFAULT_LIBS "-nodefaultlibs")
 
-if (NOT COMPILER_CLANG)
-    message (FATAL_ERROR "Darwin build is supported only for Clang")
-endif ()
-
 set (DEFAULT_LIBS "${DEFAULT_LIBS} ${COVERAGE_OPTION} -lc -lm -lpthread -ldl")
 
+if (COMPILER_GCC)
+    set (DEFAULT_LIBS "${DEFAULT_LIBS} -lgcc_eh")
+    if (ARCH_AARCH64)
+        set (DEFAULT_LIBS "${DEFAULT_LIBS} -lgcc")
+    endif ()
+endif ()
+
 message(STATUS "Default libraries: ${DEFAULT_LIBS}")
 
 set(CMAKE_CXX_STANDARD_LIBRARIES ${DEFAULT_LIBS})
diff --git a/cmake/darwin/toolchain-aarch64.cmake b/cmake/darwin/toolchain-aarch64.cmake
new file mode 100644
index 00000000000..81398111495
--- /dev/null
+++ b/cmake/darwin/toolchain-aarch64.cmake
@@ -0,0 +1,14 @@
+set (CMAKE_SYSTEM_NAME "Darwin")
+set (CMAKE_SYSTEM_PROCESSOR "aarch64")
+set (CMAKE_C_COMPILER_TARGET "aarch64-apple-darwin")
+set (CMAKE_CXX_COMPILER_TARGET "aarch64-apple-darwin")
+set (CMAKE_ASM_COMPILER_TARGET "aarch64-apple-darwin")
+set (CMAKE_OSX_SYSROOT "${CMAKE_CURRENT_LIST_DIR}/../toolchain/darwin-aarch64")
+
+set (CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)  # disable linkage check - it doesn't work in CMake
+
+set (HAS_PRE_1970_EXITCODE "0" CACHE STRING "Result from TRY_RUN" FORCE)
+set (HAS_PRE_1970_EXITCODE__TRYRUN_OUTPUT "" CACHE STRING "Output from TRY_RUN" FORCE)
+
+set (HAS_POST_2038_EXITCODE "0" CACHE STRING "Result from TRY_RUN" FORCE)
+set (HAS_POST_2038_EXITCODE__TRYRUN_OUTPUT "" CACHE STRING "Output from TRY_RUN" FORCE)
diff --git a/cmake/find/amqpcpp.cmake b/cmake/find/amqpcpp.cmake
index 4191dce26bb..e3eaaf33ddb 100644
--- a/cmake/find/amqpcpp.cmake
+++ b/cmake/find/amqpcpp.cmake
@@ -1,3 +1,8 @@
+if (OS_DARWIN AND COMPILER_GCC)
+    # AMQP-CPP requires libuv which cannot be built with GCC in macOS due to a bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=93082
+    set (ENABLE_AMQPCPP OFF CACHE INTERNAL "")
+endif()
+
 option(ENABLE_AMQPCPP "Enalbe AMQP-CPP" ${ENABLE_LIBRARIES})
 
 if (NOT ENABLE_AMQPCPP)
diff --git a/cmake/find/base64.cmake b/cmake/find/base64.cmake
index 7427baf9cad..acade11eb2f 100644
--- a/cmake/find/base64.cmake
+++ b/cmake/find/base64.cmake
@@ -1,4 +1,8 @@
-option (ENABLE_BASE64 "Enable base64" ${ENABLE_LIBRARIES})
+if(ARCH_AMD64 OR ARCH_ARM)
+    option (ENABLE_BASE64 "Enable base64" ${ENABLE_LIBRARIES})
+elseif(ENABLE_BASE64)
+    message (${RECONFIGURE_MESSAGE_LEVEL} "base64 library is only supported on x86_64 and aarch64")
+endif()
 
 if (NOT ENABLE_BASE64)
     return()
diff --git a/cmake/find/cassandra.cmake b/cmake/find/cassandra.cmake
index 037d6c3f131..ded25a5bf41 100644
--- a/cmake/find/cassandra.cmake
+++ b/cmake/find/cassandra.cmake
@@ -1,3 +1,8 @@
+if (OS_DARWIN AND COMPILER_GCC)
+    # Cassandra requires libuv which cannot be built with GCC in macOS due to a bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=93082
+    set (ENABLE_CASSANDRA OFF CACHE INTERNAL "")
+endif()
+
 option(ENABLE_CASSANDRA "Enable Cassandra" ${ENABLE_LIBRARIES})
 
 if (NOT ENABLE_CASSANDRA)
diff --git a/cmake/find/ccache.cmake b/cmake/find/ccache.cmake
index d9ccd1a9ac6..986c9cb5fe2 100644
--- a/cmake/find/ccache.cmake
+++ b/cmake/find/ccache.cmake
@@ -32,7 +32,12 @@ if (CCACHE_FOUND AND NOT COMPILER_MATCHES_CCACHE)
    if (CCACHE_VERSION VERSION_GREATER "3.2.0" OR NOT CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
       message(STATUS "Using ${CCACHE_FOUND} ${CCACHE_VERSION}")
 
-      # debian (debhlpers) set SOURCE_DATE_EPOCH environment variable, that is
+      set (CMAKE_CXX_COMPILER_LAUNCHER ${CCACHE_FOUND} ${CMAKE_CXX_COMPILER_LAUNCHER})
+      set (CMAKE_C_COMPILER_LAUNCHER ${CCACHE_FOUND} ${CMAKE_C_COMPILER_LAUNCHER})
+
+      set_property (GLOBAL PROPERTY RULE_LAUNCH_LINK ${CCACHE_FOUND})
+
+      # debian (debhelpers) set SOURCE_DATE_EPOCH environment variable, that is
       # filled from the debian/changelog or current time.
       #
       # - 4.0+ ccache always includes this environment variable into the hash
@@ -48,9 +53,6 @@ if (CCACHE_FOUND AND NOT COMPILER_MATCHES_CCACHE)
          message(STATUS "Ignore SOURCE_DATE_EPOCH for ccache")
          set_property (GLOBAL PROPERTY RULE_LAUNCH_COMPILE "env -u SOURCE_DATE_EPOCH ${CCACHE_FOUND}")
          set_property (GLOBAL PROPERTY RULE_LAUNCH_LINK "env -u SOURCE_DATE_EPOCH ${CCACHE_FOUND}")
-      else()
-         set_property (GLOBAL PROPERTY RULE_LAUNCH_COMPILE ${CCACHE_FOUND})
-         set_property (GLOBAL PROPERTY RULE_LAUNCH_LINK ${CCACHE_FOUND})
       endif()
    else ()
       message(${RECONFIGURE_MESSAGE_LEVEL} "Not using ${CCACHE_FOUND} ${CCACHE_VERSION} bug: https://bugzilla.samba.org/show_bug.cgi?id=8118")
diff --git a/cmake/find/datasketches.cmake b/cmake/find/datasketches.cmake
new file mode 100644
index 00000000000..44ef324a9f2
--- /dev/null
+++ b/cmake/find/datasketches.cmake
@@ -0,0 +1,29 @@
+option (ENABLE_DATASKETCHES "Enable DataSketches" ${ENABLE_LIBRARIES})
+
+if (ENABLE_DATASKETCHES)
+
+option (USE_INTERNAL_DATASKETCHES_LIBRARY "Set to FALSE to use system DataSketches library instead of bundled" ${NOT_UNBUNDLED})
+
+if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/datasketches-cpp/theta/CMakeLists.txt")
+    if (USE_INTERNAL_DATASKETCHES_LIBRARY)
+       message(WARNING "submodule contrib/datasketches-cpp is missing. to fix try run: \n git submodule update --init --recursive")
+    endif()
+    set(MISSING_INTERNAL_DATASKETCHES_LIBRARY 1)
+    set(USE_INTERNAL_DATASKETCHES_LIBRARY 0)
+endif()
+
+if (USE_INTERNAL_DATASKETCHES_LIBRARY)
+    set(DATASKETCHES_LIBRARY theta)
+    set(DATASKETCHES_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/datasketches-cpp/common/include" "${ClickHouse_SOURCE_DIR}/contrib/datasketches-cpp/theta/include")
+elseif (NOT MISSING_INTERNAL_DATASKETCHES_LIBRARY)
+    find_library(DATASKETCHES_LIBRARY theta)
+    find_path(DATASKETCHES_INCLUDE_DIR NAMES theta_sketch.hpp PATHS ${DATASKETCHES_INCLUDE_PATHS})
+endif()
+
+if (DATASKETCHES_LIBRARY AND DATASKETCHES_INCLUDE_DIR)
+    set(USE_DATASKETCHES 1)
+endif()
+
+endif()
+
+message (STATUS "Using datasketches=${USE_DATASKETCHES}: ${DATASKETCHES_INCLUDE_DIR} : ${DATASKETCHES_LIBRARY}")
diff --git a/cmake/find/fastops.cmake b/cmake/find/fastops.cmake
index 5ab320bdb7a..1675646654e 100644
--- a/cmake/find/fastops.cmake
+++ b/cmake/find/fastops.cmake
@@ -1,7 +1,7 @@
-if(NOT ARCH_ARM AND NOT OS_FREEBSD AND NOT OS_DARWIN)
+if(ARCH_AMD64 AND NOT OS_FREEBSD AND NOT OS_DARWIN)
     option(ENABLE_FASTOPS "Enable fast vectorized mathematical functions library by Mikhail Parakhin" ${ENABLE_LIBRARIES})
 elseif(ENABLE_FASTOPS)
-    message (${RECONFIGURE_MESSAGE_LEVEL} "Fastops library is not supported on ARM, FreeBSD and Darwin")
+    message (${RECONFIGURE_MESSAGE_LEVEL} "Fastops library is supported on x86_64 only, and not FreeBSD or Darwin")
 endif()
 
 if(NOT ENABLE_FASTOPS)
diff --git a/cmake/find/hdfs3.cmake b/cmake/find/hdfs3.cmake
index 7b385f24e1e..3aab2b612ef 100644
--- a/cmake/find/hdfs3.cmake
+++ b/cmake/find/hdfs3.cmake
@@ -1,4 +1,4 @@
-if(NOT ARCH_ARM AND NOT OS_FREEBSD AND NOT APPLE AND USE_PROTOBUF)
+if(NOT ARCH_ARM AND NOT OS_FREEBSD AND NOT APPLE AND USE_PROTOBUF AND NOT ARCH_PPC64LE)
     option(ENABLE_HDFS "Enable HDFS" ${ENABLE_LIBRARIES})
 elseif(ENABLE_HDFS OR USE_INTERNAL_HDFS3_LIBRARY)
     message (${RECONFIGURE_MESSAGE_LEVEL} "Cannot use HDFS3 with current configuration")
diff --git a/cmake/find/krb5.cmake b/cmake/find/krb5.cmake
index bd9c8e239cd..49b7462b710 100644
--- a/cmake/find/krb5.cmake
+++ b/cmake/find/krb5.cmake
@@ -5,8 +5,8 @@ if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/krb5/README")
     set (ENABLE_KRB5 0)
 endif ()
 
-if (NOT CMAKE_SYSTEM_NAME MATCHES "Linux")
-    message (WARNING "krb5 disabled in non-Linux environments")
+if (NOT CMAKE_SYSTEM_NAME MATCHES "Linux" AND NOT (CMAKE_SYSTEM_NAME MATCHES "Darwin" AND NOT CMAKE_CROSSCOMPILING))
+    message (WARNING "krb5 disabled in non-Linux and non-native-Darwin environments")
     set (ENABLE_KRB5 0)
 endif ()
 
diff --git a/cmake/find/ldap.cmake b/cmake/find/ldap.cmake
index 369c1e42e8d..d8baea89429 100644
--- a/cmake/find/ldap.cmake
+++ b/cmake/find/ldap.cmake
@@ -62,8 +62,10 @@ if (NOT OPENLDAP_FOUND AND NOT MISSING_INTERNAL_LDAP_LIBRARY)
     if (
         ( "${_system_name}" STREQUAL "linux"   AND "${_system_processor}" STREQUAL "x86_64"  ) OR
         ( "${_system_name}" STREQUAL "linux"   AND "${_system_processor}" STREQUAL "aarch64" ) OR
+        ( "${_system_name}" STREQUAL "linux"   AND "${_system_processor}" STREQUAL "ppc64le" ) OR
         ( "${_system_name}" STREQUAL "freebsd" AND "${_system_processor}" STREQUAL "x86_64"  ) OR
-        ( "${_system_name}" STREQUAL "darwin"  AND "${_system_processor}" STREQUAL "x86_64"  )
+        ( "${_system_name}" STREQUAL "darwin"  AND "${_system_processor}" STREQUAL "x86_64"  ) OR
+        ( "${_system_name}" STREQUAL "darwin"  AND "${_system_processor}" STREQUAL "aarch64"   )
     )
         set (_ldap_supported_platform TRUE)
     endif ()
diff --git a/cmake/find/nanodbc.cmake b/cmake/find/nanodbc.cmake
new file mode 100644
index 00000000000..894a2a60bad
--- /dev/null
+++ b/cmake/find/nanodbc.cmake
@@ -0,0 +1,16 @@
+if (NOT ENABLE_ODBC)
+    return ()
+endif ()
+
+if (NOT USE_INTERNAL_NANODBC_LIBRARY)
+    message (FATAL_ERROR "Only the bundled nanodbc library can be used")
+endif ()
+
+if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/nanodbc/CMakeLists.txt")
+    message (FATAL_ERROR "submodule contrib/nanodbc is missing. to fix try run: \n git submodule update --init --recursive")
+endif()
+
+set (NANODBC_LIBRARY nanodbc)
+set (NANODBC_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/nanodbc/nanodbc")
+
+message (STATUS "Using nanodbc: ${NANODBC_INCLUDE_DIR} : ${NANODBC_LIBRARY}")
diff --git a/cmake/find/nuraft.cmake b/cmake/find/nuraft.cmake
index 7fa5251946e..4e5258e132f 100644
--- a/cmake/find/nuraft.cmake
+++ b/cmake/find/nuraft.cmake
@@ -11,7 +11,7 @@ if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/NuRaft/CMakeLists.txt")
     return()
 endif ()
 
-if (NOT OS_FREEBSD AND NOT OS_DARWIN)
+if (NOT OS_FREEBSD)
     set (USE_NURAFT 1)
     set (NURAFT_LIBRARY nuraft)
 
diff --git a/cmake/find/odbc.cmake b/cmake/find/odbc.cmake
index a23f0c831e9..c475e600c0d 100644
--- a/cmake/find/odbc.cmake
+++ b/cmake/find/odbc.cmake
@@ -50,4 +50,6 @@ if (NOT EXTERNAL_ODBC_LIBRARY_FOUND)
     set (USE_INTERNAL_ODBC_LIBRARY 1)
 endif ()
 
+set (USE_INTERNAL_NANODBC_LIBRARY 1)
+
 message (STATUS "Using unixodbc")
diff --git a/cmake/find/rocksdb.cmake b/cmake/find/rocksdb.cmake
index 968cdb52407..94278a603d7 100644
--- a/cmake/find/rocksdb.cmake
+++ b/cmake/find/rocksdb.cmake
@@ -1,3 +1,7 @@
+if (OS_DARWIN AND ARCH_AARCH64)
+    set (ENABLE_ROCKSDB OFF CACHE INTERNAL "")
+endif()
+
 option(ENABLE_ROCKSDB "Enable ROCKSDB" ${ENABLE_LIBRARIES})
 
 if (NOT ENABLE_ROCKSDB)
diff --git a/cmake/find/s3.cmake b/cmake/find/s3.cmake
index 1bbf48fd6b0..1b0c652a31a 100644
--- a/cmake/find/s3.cmake
+++ b/cmake/find/s3.cmake
@@ -1,7 +1,7 @@
-if(NOT OS_FREEBSD AND NOT APPLE AND NOT ARCH_ARM)
+if(NOT OS_FREEBSD AND NOT APPLE)
     option(ENABLE_S3 "Enable S3" ${ENABLE_LIBRARIES})
 elseif(ENABLE_S3 OR USE_INTERNAL_AWS_S3_LIBRARY)
-    message (${RECONFIGURE_MESSAGE_LEVEL} "Can't use S3 on ARM, Apple or FreeBSD")
+    message (${RECONFIGURE_MESSAGE_LEVEL} "Can't use S3 on Apple or FreeBSD")
 endif()
 
 if(NOT ENABLE_S3)
diff --git a/cmake/find/xz.cmake b/cmake/find/xz.cmake
new file mode 100644
index 00000000000..0d19859c6b1
--- /dev/null
+++ b/cmake/find/xz.cmake
@@ -0,0 +1,27 @@
+option (USE_INTERNAL_XZ_LIBRARY "Set to OFF to use system xz (lzma) library instead of bundled" ${NOT_UNBUNDLED})
+
+if(NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/xz/src/liblzma/api/lzma.h")
+    if(USE_INTERNAL_XZ_LIBRARY)
+        message(WARNING "submodule contrib/xz is missing. to fix try run: \n git submodule update --init --recursive")
+        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal xz (lzma) library")
+        set(USE_INTERNAL_XZ_LIBRARY 0)
+    endif()
+    set(MISSING_INTERNAL_XZ_LIBRARY 1)
+endif()
+
+if (NOT USE_INTERNAL_XZ_LIBRARY)
+    find_library (XZ_LIBRARY lzma)
+    find_path (XZ_INCLUDE_DIR NAMES lzma.h PATHS ${XZ_INCLUDE_PATHS})
+    if (NOT XZ_LIBRARY OR NOT XZ_INCLUDE_DIR)
+        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find system xz (lzma) library")
+    endif ()
+endif ()
+
+if (XZ_LIBRARY AND XZ_INCLUDE_DIR)
+elseif (NOT MISSING_INTERNAL_XZ_LIBRARY)
+    set (USE_INTERNAL_XZ_LIBRARY 1)
+    set (XZ_LIBRARY liblzma)
+    set (XZ_INCLUDE_DIR ${ClickHouse_SOURCE_DIR}/contrib/xz/src/liblzma/api)
+endif ()
+
+message (STATUS "Using xz (lzma): ${XZ_INCLUDE_DIR} : ${XZ_LIBRARY}")
diff --git a/cmake/linux/default_libs.cmake b/cmake/linux/default_libs.cmake
index d3a727e9cb8..c1e4d450389 100644
--- a/cmake/linux/default_libs.cmake
+++ b/cmake/linux/default_libs.cmake
@@ -6,7 +6,7 @@ set (DEFAULT_LIBS "-nodefaultlibs")
 # We need builtins from Clang's RT even without libcxx - for ubsan+int128.
 # See https://bugs.llvm.org/show_bug.cgi?id=16404
 if (COMPILER_CLANG AND NOT (CMAKE_CROSSCOMPILING AND ARCH_AARCH64))
-    execute_process (COMMAND ${CMAKE_CXX_COMPILER} --print-file-name=libclang_rt.builtins-${CMAKE_SYSTEM_PROCESSOR}.a OUTPUT_VARIABLE BUILTINS_LIBRARY OUTPUT_STRIP_TRAILING_WHITESPACE)
+    execute_process (COMMAND ${CMAKE_CXX_COMPILER} --print-libgcc-file-name --rtlib=compiler-rt OUTPUT_VARIABLE BUILTINS_LIBRARY OUTPUT_STRIP_TRAILING_WHITESPACE)
 else ()
     set (BUILTINS_LIBRARY "-lgcc")
 endif ()
diff --git a/cmake/tools.cmake b/cmake/tools.cmake
index cc4046d2469..44fc3b3e530 100644
--- a/cmake/tools.cmake
+++ b/cmake/tools.cmake
@@ -75,14 +75,14 @@ if (OS_LINUX AND NOT LINKER_NAME)
 endif ()
 
 if (LINKER_NAME)
-    set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=${LINKER_NAME}")
-    set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fuse-ld=${LINKER_NAME}")
+    if (COMPILER_CLANG AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 12.0.0 OR CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 12.0.0))
+        set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --ld-path=${LINKER_NAME}")
+        set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} --ld-path=${LINKER_NAME}")
+    else ()
+        set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=${LINKER_NAME}")
+        set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fuse-ld=${LINKER_NAME}")
+    endif ()
 
     message(STATUS "Using custom linker by name: ${LINKER_NAME}")
 endif ()
 
-if (ARCH_PPC64LE)
-    if (COMPILER_CLANG OR (COMPILER_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 8))
-        message(FATAL_ERROR "Only gcc-8 or higher is supported for powerpc architecture")
-    endif ()
-endif ()
diff --git a/cmake/warnings.cmake b/cmake/warnings.cmake
index 8122e9ef31e..a85fe8963c7 100644
--- a/cmake/warnings.cmake
+++ b/cmake/warnings.cmake
@@ -11,11 +11,6 @@ if (NOT MSVC)
     set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra")
 endif ()
 
-if (USE_DEBUG_HELPERS)
-    set (INCLUDE_DEBUG_HELPERS "-I${ClickHouse_SOURCE_DIR}/base -include ${ClickHouse_SOURCE_DIR}/src/Core/iostream_debug_helpers.h")
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${INCLUDE_DEBUG_HELPERS}")
-endif ()
-
 # Add some warnings that are not available even with -Wall -Wextra -Wpedantic.
 # Intended for exploration of new compiler warnings that may be found useful.
 # Applies to clang only
@@ -176,6 +171,7 @@ elseif (COMPILER_GCC)
     add_cxx_compile_options(-Wtrampolines)
     # Obvious
     add_cxx_compile_options(-Wunused)
+    add_cxx_compile_options(-Wundef)
     # Warn if vector operation is not implemented via SIMD capabilities of the architecture
     add_cxx_compile_options(-Wvector-operation-performance)
     # XXX: libstdc++ has some of these for 3way compare
diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
index 20b4fad0437..087212ad3b0 100644
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@@ -32,12 +32,12 @@ endif()
 
 set_property(DIRECTORY PROPERTY EXCLUDE_FROM_ALL 1)
 
+add_subdirectory (abseil-cpp-cmake)
 add_subdirectory (antlr4-runtime-cmake)
 add_subdirectory (boost-cmake)
 add_subdirectory (cctz-cmake)
 add_subdirectory (consistent-hashing)
 add_subdirectory (dragonbox-cmake)
-add_subdirectory (FastMemcpy)
 add_subdirectory (hyperscan-cmake)
 add_subdirectory (jemalloc-cmake)
 add_subdirectory (libcpuid-cmake)
@@ -47,7 +47,11 @@ add_subdirectory (lz4-cmake)
 add_subdirectory (murmurhash)
 add_subdirectory (replxx-cmake)
 add_subdirectory (unixodbc-cmake)
-add_subdirectory (xz)
+add_subdirectory (nanodbc-cmake)
+
+if (USE_INTERNAL_XZ_LIBRARY)
+    add_subdirectory (xz)
+endif()
 
 add_subdirectory (poco-cmake)
 add_subdirectory (croaring-cmake)
@@ -93,14 +97,8 @@ if (USE_INTERNAL_ZLIB_LIBRARY)
     add_subdirectory (${INTERNAL_ZLIB_NAME})
     # We should use same defines when including zlib.h as used when zlib compiled
     target_compile_definitions (zlib PUBLIC ZLIB_COMPAT WITH_GZFILEOP)
-    if (TARGET zlibstatic)
-        target_compile_definitions (zlibstatic PUBLIC ZLIB_COMPAT WITH_GZFILEOP)
-    endif ()
     if (ARCH_AMD64 OR ARCH_AARCH64)
         target_compile_definitions (zlib PUBLIC X86_64 UNALIGNED_OK)
-        if (TARGET zlibstatic)
-            target_compile_definitions (zlibstatic PUBLIC X86_64 UNALIGNED_OK)
-        endif ()
     endif ()
 endif ()
 
@@ -215,15 +213,17 @@ if (USE_EMBEDDED_COMPILER AND USE_INTERNAL_LLVM_LIBRARY)
     set (LLVM_ENABLE_RTTI 1 CACHE INTERNAL "")
     set (LLVM_ENABLE_PIC 0 CACHE INTERNAL "")
     set (LLVM_TARGETS_TO_BUILD "X86;AArch64" CACHE STRING "")
-    # Yes it is set globally, but this is not enough, since llvm will add -std=c++11 after default
-    # And c++2a cannot be used, due to ambiguous operator !=
-    if (COMPILER_GCC OR COMPILER_CLANG)
-        set (_CXX_STANDARD "gnu++17")
-    else()
-        set (_CXX_STANDARD "c++17")
-    endif()
-    set (LLVM_CXX_STD ${_CXX_STANDARD} CACHE STRING "" FORCE)
+
+    # Need to use C++17 since the compilation is not possible with C++20 currently, due to ambiguous operator != etc.
+    # LLVM project will set its default value for the -std=... but our global setting from CMake will override it.
+    set (CMAKE_CXX_STANDARD_bak ${CMAKE_CXX_STANDARD})
+    set (CMAKE_CXX_STANDARD 17)
+
     add_subdirectory (llvm/llvm)
+
+    set (CMAKE_CXX_STANDARD ${CMAKE_CXX_STANDARD_bak})
+    unset (CMAKE_CXX_STANDARD_bak)
+
     target_include_directories(LLVMSupport SYSTEM BEFORE PRIVATE ${ZLIB_INCLUDE_DIR})
 endif ()
 
@@ -280,7 +280,14 @@ if (USE_AMQPCPP)
     add_subdirectory (amqpcpp-cmake)
 endif()
 if (USE_CASSANDRA)
+    # Need to use C++17 since the compilation is not possible with C++20 currently.
+    set (CMAKE_CXX_STANDARD_bak ${CMAKE_CXX_STANDARD})
+    set (CMAKE_CXX_STANDARD 17)
+
     add_subdirectory (cassandra)
+
+    set (CMAKE_CXX_STANDARD ${CMAKE_CXX_STANDARD_bak})
+    unset (CMAKE_CXX_STANDARD_bak)
 endif()
 
 # Should go before:
diff --git a/contrib/FastMemcpy/CMakeLists.txt b/contrib/FastMemcpy/CMakeLists.txt
deleted file mode 100644
index 8efe6d45dff..00000000000
--- a/contrib/FastMemcpy/CMakeLists.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-option (ENABLE_FASTMEMCPY "Enable FastMemcpy library (only internal)" ${ENABLE_LIBRARIES})
-
-if (NOT OS_LINUX OR ARCH_AARCH64)
-    set (ENABLE_FASTMEMCPY OFF)
-endif ()
-
-if (ENABLE_FASTMEMCPY)
-    set (LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/FastMemcpy)
-
-    set (SRCS
-        ${LIBRARY_DIR}/FastMemcpy.c
-
-        memcpy_wrapper.c
-    )
-
-    add_library (FastMemcpy ${SRCS})
-    target_include_directories (FastMemcpy PUBLIC ${LIBRARY_DIR})
-
-    target_compile_definitions(FastMemcpy PUBLIC USE_FASTMEMCPY=1)
-
-    message (STATUS "Using FastMemcpy")
-else ()
-    add_library (FastMemcpy INTERFACE)
-
-    target_compile_definitions(FastMemcpy INTERFACE USE_FASTMEMCPY=0)
-
-    message (STATUS "Not using FastMemcpy")
-endif ()
diff --git a/contrib/FastMemcpy/FastMemcpy.c b/contrib/FastMemcpy/FastMemcpy.c
deleted file mode 100644
index 5021bcc7d16..00000000000
--- a/contrib/FastMemcpy/FastMemcpy.c
+++ /dev/null
@@ -1,220 +0,0 @@
-//=====================================================================
-//
-// FastMemcpy.c - skywind3000@163.com, 2015
-//
-// feature:
-// 50% speed up in avg. vs standard memcpy (tested in vc2012/gcc4.9)
-//
-//=====================================================================
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-
-#if (defined(_WIN32) || defined(WIN32))
-#include <windows.h>
-#include <mmsystem.h>
-#ifdef _MSC_VER
-#pragma comment(lib, "winmm.lib")
-#endif
-#elif defined(__unix)
-#include <sys/time.h>
-#include <unistd.h>
-#else
-#error it can only be compiled under windows or unix
-#endif
-
-#include "FastMemcpy.h"
-
-unsigned int gettime()
-{
-	#if (defined(_WIN32) || defined(WIN32))
-	return timeGetTime();
-	#else
-	static struct timezone tz={ 0,0 };
-	struct timeval time;
-	gettimeofday(&time,&tz);
-	return (time.tv_sec * 1000 + time.tv_usec / 1000);
-	#endif
-}
-
-void sleepms(unsigned int millisec)
-{
-#if defined(_WIN32) || defined(WIN32)
-	Sleep(millisec);
-#else
-	usleep(millisec * 1000);
-#endif
-}
-
-
-void benchmark(int dstalign, int srcalign, size_t size, int times)
-{
-	char *DATA1 = (char*)malloc(size + 64);
-	char *DATA2 = (char*)malloc(size + 64);
-	size_t LINEAR1 = ((size_t)DATA1);
-	size_t LINEAR2 = ((size_t)DATA2);
-	char *ALIGN1 = (char*)(((64 - (LINEAR1 & 63)) & 63) + LINEAR1);
-	char *ALIGN2 = (char*)(((64 - (LINEAR2 & 63)) & 63) + LINEAR2);
-	char *dst = (dstalign)? ALIGN1 : (ALIGN1 + 1);
-	char *src = (srcalign)? ALIGN2 : (ALIGN2 + 3);
-	unsigned int t1, t2;
-	int k;
-	
-	sleepms(100);
-	t1 = gettime();
-	for (k = times; k > 0; k--) {
-		memcpy(dst, src, size);
-	}
-	t1 = gettime() - t1;
-	sleepms(100);
-	t2 = gettime();
-	for (k = times; k > 0; k--) {
-		memcpy_fast(dst, src, size);
-	}
-	t2 = gettime() - t2;
-
-	free(DATA1);
-	free(DATA2);
-
-	printf("result(dst %s, src %s): memcpy_fast=%dms memcpy=%d ms\n",  
-		dstalign? "aligned" : "unalign", 
-		srcalign? "aligned" : "unalign", (int)t2, (int)t1);
-}
-
-
-void bench(int copysize, int times)
-{
-	printf("benchmark(size=%d bytes, times=%d):\n", copysize, times);
-	benchmark(1, 1, copysize, times);
-	benchmark(1, 0, copysize, times);
-	benchmark(0, 1, copysize, times);
-	benchmark(0, 0, copysize, times);
-	printf("\n");
-}
-
-
-void random_bench(int maxsize, int times)
-{
-	static char A[11 * 1024 * 1024 + 2];
-	static char B[11 * 1024 * 1024 + 2];
-	static int random_offsets[0x10000];
-	static int random_sizes[0x8000];
-	unsigned int i, p1, p2;
-	unsigned int t1, t2;
-	for (i = 0; i < 0x10000; i++) {	// generate random offsets
-		random_offsets[i] = rand() % (10 * 1024 * 1024 + 1);
-	}
-	for (i = 0; i < 0x8000; i++) {	// generate random sizes
-		random_sizes[i] = 1 + rand() % maxsize;
-	}
-	sleepms(100);
-	t1 = gettime();
-	for (p1 = 0, p2 = 0, i = 0; i < times; i++) {
-		int offset1 = random_offsets[(p1++) & 0xffff];
-		int offset2 = random_offsets[(p1++) & 0xffff];
-		int size = random_sizes[(p2++) & 0x7fff];
-		memcpy(A + offset1, B + offset2, size);
-	}
-	t1 = gettime() - t1;
-	sleepms(100);
-	t2 = gettime();
-	for (p1 = 0, p2 = 0, i = 0; i < times; i++) {
-		int offset1 = random_offsets[(p1++) & 0xffff];
-		int offset2 = random_offsets[(p1++) & 0xffff];
-		int size = random_sizes[(p2++) & 0x7fff];
-		memcpy_fast(A + offset1, B + offset2, size);
-	}
-	t2 = gettime() - t2;
-	printf("benchmark random access:\n");
-	printf("memcpy_fast=%dms memcpy=%dms\n\n", (int)t2, (int)t1);
-}
-
-
-#ifdef _MSC_VER
-#pragma comment(lib, "winmm.lib")
-#endif
-
-int main(void)
-{
-	bench(32, 0x1000000);
-	bench(64, 0x1000000);
-	bench(512, 0x800000);
-	bench(1024, 0x400000);
-	bench(4096, 0x80000);
-	bench(8192, 0x40000);
-	bench(1024 * 1024 * 1, 0x800);
-	bench(1024 * 1024 * 4, 0x200);
-	bench(1024 * 1024 * 8, 0x100);
-	
-	random_bench(2048, 8000000);
-
-	return 0;
-}
-
-
-
-
-/*
-benchmark(size=32 bytes, times=16777216):
-result(dst aligned, src aligned): memcpy_fast=78ms memcpy=260 ms
-result(dst aligned, src unalign): memcpy_fast=78ms memcpy=250 ms
-result(dst unalign, src aligned): memcpy_fast=78ms memcpy=266 ms
-result(dst unalign, src unalign): memcpy_fast=78ms memcpy=234 ms
-
-benchmark(size=64 bytes, times=16777216):
-result(dst aligned, src aligned): memcpy_fast=109ms memcpy=281 ms
-result(dst aligned, src unalign): memcpy_fast=109ms memcpy=328 ms
-result(dst unalign, src aligned): memcpy_fast=109ms memcpy=343 ms
-result(dst unalign, src unalign): memcpy_fast=93ms memcpy=344 ms
-
-benchmark(size=512 bytes, times=8388608):
-result(dst aligned, src aligned): memcpy_fast=125ms memcpy=218 ms
-result(dst aligned, src unalign): memcpy_fast=156ms memcpy=484 ms
-result(dst unalign, src aligned): memcpy_fast=172ms memcpy=546 ms
-result(dst unalign, src unalign): memcpy_fast=172ms memcpy=515 ms
-
-benchmark(size=1024 bytes, times=4194304):
-result(dst aligned, src aligned): memcpy_fast=109ms memcpy=172 ms
-result(dst aligned, src unalign): memcpy_fast=187ms memcpy=453 ms
-result(dst unalign, src aligned): memcpy_fast=172ms memcpy=437 ms
-result(dst unalign, src unalign): memcpy_fast=156ms memcpy=452 ms
-
-benchmark(size=4096 bytes, times=524288):
-result(dst aligned, src aligned): memcpy_fast=62ms memcpy=78 ms
-result(dst aligned, src unalign): memcpy_fast=109ms memcpy=202 ms
-result(dst unalign, src aligned): memcpy_fast=94ms memcpy=203 ms
-result(dst unalign, src unalign): memcpy_fast=110ms memcpy=218 ms
-
-benchmark(size=8192 bytes, times=262144):
-result(dst aligned, src aligned): memcpy_fast=62ms memcpy=78 ms
-result(dst aligned, src unalign): memcpy_fast=78ms memcpy=202 ms
-result(dst unalign, src aligned): memcpy_fast=78ms memcpy=203 ms
-result(dst unalign, src unalign): memcpy_fast=94ms memcpy=203 ms
-
-benchmark(size=1048576 bytes, times=2048):
-result(dst aligned, src aligned): memcpy_fast=203ms memcpy=191 ms
-result(dst aligned, src unalign): memcpy_fast=219ms memcpy=281 ms
-result(dst unalign, src aligned): memcpy_fast=218ms memcpy=328 ms
-result(dst unalign, src unalign): memcpy_fast=218ms memcpy=312 ms
-
-benchmark(size=4194304 bytes, times=512):
-result(dst aligned, src aligned): memcpy_fast=312ms memcpy=406 ms
-result(dst aligned, src unalign): memcpy_fast=296ms memcpy=421 ms
-result(dst unalign, src aligned): memcpy_fast=312ms memcpy=468 ms
-result(dst unalign, src unalign): memcpy_fast=297ms memcpy=452 ms
-
-benchmark(size=8388608 bytes, times=256):
-result(dst aligned, src aligned): memcpy_fast=281ms memcpy=452 ms
-result(dst aligned, src unalign): memcpy_fast=280ms memcpy=468 ms
-result(dst unalign, src aligned): memcpy_fast=298ms memcpy=514 ms
-result(dst unalign, src unalign): memcpy_fast=344ms memcpy=472 ms
-
-benchmark random access:
-memcpy_fast=515ms memcpy=1014ms
-
-*/
-
-
-
-
diff --git a/contrib/FastMemcpy/FastMemcpy.h b/contrib/FastMemcpy/FastMemcpy.h
deleted file mode 100644
index 5dcbfcf1656..00000000000
--- a/contrib/FastMemcpy/FastMemcpy.h
+++ /dev/null
@@ -1,694 +0,0 @@
-//=====================================================================
-//
-// FastMemcpy.c - skywind3000@163.com, 2015
-//
-// feature:
-// 50% speed up in avg. vs standard memcpy (tested in vc2012/gcc5.1)
-//
-//=====================================================================
-#ifndef __FAST_MEMCPY_H__
-#define __FAST_MEMCPY_H__
-
-#include <stddef.h>
-#include <stdint.h>
-#include <emmintrin.h>
-
-
-//---------------------------------------------------------------------
-// force inline for compilers
-//---------------------------------------------------------------------
-#ifndef INLINE
-#ifdef __GNUC__
-#if (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1))
-    #define INLINE         __inline__ __attribute__((always_inline))
-#else
-    #define INLINE         __inline__
-#endif
-#elif defined(_MSC_VER)
-	#define INLINE __forceinline
-#elif (defined(__BORLANDC__) || defined(__WATCOMC__))
-    #define INLINE __inline
-#else
-    #define INLINE
-#endif
-#endif
-
-typedef __attribute__((__aligned__(1))) uint16_t uint16_unaligned_t;
-typedef __attribute__((__aligned__(1))) uint32_t uint32_unaligned_t;
-typedef __attribute__((__aligned__(1))) uint64_t uint64_unaligned_t;
-
-//---------------------------------------------------------------------
-// fast copy for different sizes
-//---------------------------------------------------------------------
-static INLINE void memcpy_sse2_16(void *dst, const void *src) {
-	__m128i m0 = _mm_loadu_si128(((const __m128i*)src) + 0);
-	_mm_storeu_si128(((__m128i*)dst) + 0, m0);
-}
-
-static INLINE void memcpy_sse2_32(void *dst, const void *src) {
-	__m128i m0 = _mm_loadu_si128(((const __m128i*)src) + 0);
-	__m128i m1 = _mm_loadu_si128(((const __m128i*)src) + 1);
-	_mm_storeu_si128(((__m128i*)dst) + 0, m0);
-	_mm_storeu_si128(((__m128i*)dst) + 1, m1);
-}
-
-static INLINE void memcpy_sse2_64(void *dst, const void *src) {
-	__m128i m0 = _mm_loadu_si128(((const __m128i*)src) + 0);
-	__m128i m1 = _mm_loadu_si128(((const __m128i*)src) + 1);
-	__m128i m2 = _mm_loadu_si128(((const __m128i*)src) + 2);
-	__m128i m3 = _mm_loadu_si128(((const __m128i*)src) + 3);
-	_mm_storeu_si128(((__m128i*)dst) + 0, m0);
-	_mm_storeu_si128(((__m128i*)dst) + 1, m1);
-	_mm_storeu_si128(((__m128i*)dst) + 2, m2);
-	_mm_storeu_si128(((__m128i*)dst) + 3, m3);
-}
-
-static INLINE void memcpy_sse2_128(void *dst, const void *src) {
-	__m128i m0 = _mm_loadu_si128(((const __m128i*)src) + 0);
-	__m128i m1 = _mm_loadu_si128(((const __m128i*)src) + 1);
-	__m128i m2 = _mm_loadu_si128(((const __m128i*)src) + 2);
-	__m128i m3 = _mm_loadu_si128(((const __m128i*)src) + 3);
-	__m128i m4 = _mm_loadu_si128(((const __m128i*)src) + 4);
-	__m128i m5 = _mm_loadu_si128(((const __m128i*)src) + 5);
-	__m128i m6 = _mm_loadu_si128(((const __m128i*)src) + 6);
-	__m128i m7 = _mm_loadu_si128(((const __m128i*)src) + 7);
-	_mm_storeu_si128(((__m128i*)dst) + 0, m0);
-	_mm_storeu_si128(((__m128i*)dst) + 1, m1);
-	_mm_storeu_si128(((__m128i*)dst) + 2, m2);
-	_mm_storeu_si128(((__m128i*)dst) + 3, m3);
-	_mm_storeu_si128(((__m128i*)dst) + 4, m4);
-	_mm_storeu_si128(((__m128i*)dst) + 5, m5);
-	_mm_storeu_si128(((__m128i*)dst) + 6, m6);
-	_mm_storeu_si128(((__m128i*)dst) + 7, m7);
-}
-
-
-//---------------------------------------------------------------------
-// tiny memory copy with jump table optimized
-//---------------------------------------------------------------------
-/// Attribute is used to avoid an error with undefined behaviour sanitizer
-/// ../contrib/FastMemcpy/FastMemcpy.h:91:56: runtime error: applying zero offset to null pointer
-/// Found by 01307_orc_output_format.sh, cause - ORCBlockInputFormat and external ORC library.
-__attribute__((__no_sanitize__("undefined"))) static INLINE void *memcpy_tiny(void *dst, const void *src, size_t size) {
-	unsigned char *dd = ((unsigned char*)dst) + size;
-	const unsigned char *ss = ((const unsigned char*)src) + size;
-
-	switch (size) {
-	case 64:
-		memcpy_sse2_64(dd - 64, ss - 64);
-	case 0:
-		break;
-
-	case 65:
-		memcpy_sse2_64(dd - 65, ss - 65);
-	case 1:
-		dd[-1] = ss[-1];
-		break;
-
-	case 66:
-		memcpy_sse2_64(dd - 66, ss - 66);
-	case 2:
-		*((uint16_unaligned_t*)(dd - 2)) = *((uint16_unaligned_t*)(ss - 2));
-		break;
-
-	case 67:
-		memcpy_sse2_64(dd - 67, ss - 67);
-	case 3:
-		*((uint16_unaligned_t*)(dd - 3)) = *((uint16_unaligned_t*)(ss - 3));
-		dd[-1] = ss[-1];
-		break;
-
-	case 68:
-		memcpy_sse2_64(dd - 68, ss - 68);
-	case 4:
-		*((uint32_unaligned_t*)(dd - 4)) = *((uint32_unaligned_t*)(ss - 4));
-		break;
-
-	case 69:
-		memcpy_sse2_64(dd - 69, ss - 69);
-	case 5:
-		*((uint32_unaligned_t*)(dd - 5)) = *((uint32_unaligned_t*)(ss - 5));
-		dd[-1] = ss[-1];
-		break;
-
-	case 70:
-		memcpy_sse2_64(dd - 70, ss - 70);
-	case 6:
-		*((uint32_unaligned_t*)(dd - 6)) = *((uint32_unaligned_t*)(ss - 6));
-		*((uint16_unaligned_t*)(dd - 2)) = *((uint16_unaligned_t*)(ss - 2));
-		break;
-
-	case 71:
-		memcpy_sse2_64(dd - 71, ss - 71);
-	case 7:
-		*((uint32_unaligned_t*)(dd - 7)) = *((uint32_unaligned_t*)(ss - 7));
-		*((uint32_unaligned_t*)(dd - 4)) = *((uint32_unaligned_t*)(ss - 4));
-		break;
-
-	case 72:
-		memcpy_sse2_64(dd - 72, ss - 72);
-	case 8:
-		*((uint64_unaligned_t*)(dd - 8)) = *((uint64_unaligned_t*)(ss - 8));
-		break;
-
-	case 73:
-		memcpy_sse2_64(dd - 73, ss - 73);
-	case 9:
-		*((uint64_unaligned_t*)(dd - 9)) = *((uint64_unaligned_t*)(ss - 9));
-		dd[-1] = ss[-1];
-		break;
-
-	case 74:
-		memcpy_sse2_64(dd - 74, ss - 74);
-	case 10:
-		*((uint64_unaligned_t*)(dd - 10)) = *((uint64_unaligned_t*)(ss - 10));
-		*((uint16_unaligned_t*)(dd - 2)) = *((uint16_unaligned_t*)(ss - 2));
-		break;
-
-	case 75:
-		memcpy_sse2_64(dd - 75, ss - 75);
-	case 11:
-		*((uint64_unaligned_t*)(dd - 11)) = *((uint64_unaligned_t*)(ss - 11));
-		*((uint32_unaligned_t*)(dd - 4)) = *((uint32_unaligned_t*)(ss - 4));
-		break;
-
-	case 76:
-		memcpy_sse2_64(dd - 76, ss - 76);
-	case 12:
-		*((uint64_unaligned_t*)(dd - 12)) = *((uint64_unaligned_t*)(ss - 12));
-		*((uint32_unaligned_t*)(dd - 4)) = *((uint32_unaligned_t*)(ss - 4));
-		break;
-
-	case 77:
-		memcpy_sse2_64(dd - 77, ss - 77);
-	case 13:
-		*((uint64_unaligned_t*)(dd - 13)) = *((uint64_unaligned_t*)(ss - 13));
-		*((uint32_unaligned_t*)(dd - 5)) = *((uint32_unaligned_t*)(ss - 5));
-		dd[-1] = ss[-1];
-		break;
-
-	case 78:
-		memcpy_sse2_64(dd - 78, ss - 78);
-	case 14:
-		*((uint64_unaligned_t*)(dd - 14)) = *((uint64_unaligned_t*)(ss - 14));
-		*((uint64_unaligned_t*)(dd - 8)) = *((uint64_unaligned_t*)(ss - 8));
-		break;
-
-	case 79:
-		memcpy_sse2_64(dd - 79, ss - 79);
-	case 15:
-		*((uint64_unaligned_t*)(dd - 15)) = *((uint64_unaligned_t*)(ss - 15));
-		*((uint64_unaligned_t*)(dd - 8)) = *((uint64_unaligned_t*)(ss - 8));
-		break;
-
-	case 80:
-		memcpy_sse2_64(dd - 80, ss - 80);
-	case 16:
-		memcpy_sse2_16(dd - 16, ss - 16);
-		break;
-
-	case 81:
-		memcpy_sse2_64(dd - 81, ss - 81);
-	case 17:
-		memcpy_sse2_16(dd - 17, ss - 17);
-		dd[-1] = ss[-1];
-		break;
-
-	case 82:
-		memcpy_sse2_64(dd - 82, ss - 82);
-	case 18:
-		memcpy_sse2_16(dd - 18, ss - 18);
-		*((uint16_unaligned_t*)(dd - 2)) = *((uint16_unaligned_t*)(ss - 2));
-		break;
-
-	case 83:
-		memcpy_sse2_64(dd - 83, ss - 83);
-	case 19:
-		memcpy_sse2_16(dd - 19, ss - 19);
-		*((uint16_unaligned_t*)(dd - 3)) = *((uint16_unaligned_t*)(ss - 3));
-		dd[-1] = ss[-1];
-		break;
-
-	case 84:
-		memcpy_sse2_64(dd - 84, ss - 84);
-	case 20:
-		memcpy_sse2_16(dd - 20, ss - 20);
-		*((uint32_unaligned_t*)(dd - 4)) = *((uint32_unaligned_t*)(ss - 4));
-		break;
-
-	case 85:
-		memcpy_sse2_64(dd - 85, ss - 85);
-	case 21:
-		memcpy_sse2_16(dd - 21, ss - 21);
-		*((uint32_unaligned_t*)(dd - 5)) = *((uint32_unaligned_t*)(ss - 5));
-		dd[-1] = ss[-1];
-		break;
-
-	case 86:
-		memcpy_sse2_64(dd - 86, ss - 86);
-	case 22:
-		memcpy_sse2_16(dd - 22, ss - 22);
-		*((uint32_unaligned_t*)(dd - 6)) = *((uint32_unaligned_t*)(ss - 6));
-		*((uint16_unaligned_t*)(dd - 2)) = *((uint16_unaligned_t*)(ss - 2));
-		break;
-
-	case 87:
-		memcpy_sse2_64(dd - 87, ss - 87);
-	case 23:
-		memcpy_sse2_16(dd - 23, ss - 23);
-		*((uint32_unaligned_t*)(dd - 7)) = *((uint32_unaligned_t*)(ss - 7));
-		*((uint32_unaligned_t*)(dd - 4)) = *((uint32_unaligned_t*)(ss - 4));
-		break;
-
-	case 88:
-		memcpy_sse2_64(dd - 88, ss - 88);
-	case 24:
-		memcpy_sse2_16(dd - 24, ss - 24);
-		memcpy_sse2_16(dd - 16, ss - 16);
-		break;
-
-	case 89:
-		memcpy_sse2_64(dd - 89, ss - 89);
-	case 25:
-		memcpy_sse2_16(dd - 25, ss - 25);
-		memcpy_sse2_16(dd - 16, ss - 16);
-		break;
-
-	case 90:
-		memcpy_sse2_64(dd - 90, ss - 90);
-	case 26:
-		memcpy_sse2_16(dd - 26, ss - 26);
-		memcpy_sse2_16(dd - 16, ss - 16);
-		break;
-
-	case 91:
-		memcpy_sse2_64(dd - 91, ss - 91);
-	case 27:
-		memcpy_sse2_16(dd - 27, ss - 27);
-		memcpy_sse2_16(dd - 16, ss - 16);
-		break;
-
-	case 92:
-		memcpy_sse2_64(dd - 92, ss - 92);
-	case 28:
-		memcpy_sse2_16(dd - 28, ss - 28);
-		memcpy_sse2_16(dd - 16, ss - 16);
-		break;
-
-	case 93:
-		memcpy_sse2_64(dd - 93, ss - 93);
-	case 29:
-		memcpy_sse2_16(dd - 29, ss - 29);
-		memcpy_sse2_16(dd - 16, ss - 16);
-		break;
-
-	case 94:
-		memcpy_sse2_64(dd - 94, ss - 94);
-	case 30:
-		memcpy_sse2_16(dd - 30, ss - 30);
-		memcpy_sse2_16(dd - 16, ss - 16);
-		break;
-
-	case 95:
-		memcpy_sse2_64(dd - 95, ss - 95);
-	case 31:
-		memcpy_sse2_16(dd - 31, ss - 31);
-		memcpy_sse2_16(dd - 16, ss - 16);
-		break;
-
-	case 96:
-		memcpy_sse2_64(dd - 96, ss - 96);
-	case 32:
-		memcpy_sse2_32(dd - 32, ss - 32);
-		break;
-
-	case 97:
-		memcpy_sse2_64(dd - 97, ss - 97);
-	case 33:
-		memcpy_sse2_32(dd - 33, ss - 33);
-		dd[-1] = ss[-1];
-		break;
-
-	case 98:
-		memcpy_sse2_64(dd - 98, ss - 98);
-	case 34:
-		memcpy_sse2_32(dd - 34, ss - 34);
-		*((uint16_unaligned_t*)(dd - 2)) = *((uint16_unaligned_t*)(ss - 2));
-		break;
-
-	case 99:
-		memcpy_sse2_64(dd - 99, ss - 99);
-	case 35:
-		memcpy_sse2_32(dd - 35, ss - 35);
-		*((uint16_unaligned_t*)(dd - 3)) = *((uint16_unaligned_t*)(ss - 3));
-		dd[-1] = ss[-1];
-		break;
-
-	case 100:
-		memcpy_sse2_64(dd - 100, ss - 100);
-	case 36:
-		memcpy_sse2_32(dd - 36, ss - 36);
-		*((uint32_unaligned_t*)(dd - 4)) = *((uint32_unaligned_t*)(ss - 4));
-		break;
-
-	case 101:
-		memcpy_sse2_64(dd - 101, ss - 101);
-	case 37:
-		memcpy_sse2_32(dd - 37, ss - 37);
-		*((uint32_unaligned_t*)(dd - 5)) = *((uint32_unaligned_t*)(ss - 5));
-		dd[-1] = ss[-1];
-		break;
-
-	case 102:
-		memcpy_sse2_64(dd - 102, ss - 102);
-	case 38:
-		memcpy_sse2_32(dd - 38, ss - 38);
-		*((uint32_unaligned_t*)(dd - 6)) = *((uint32_unaligned_t*)(ss - 6));
-		*((uint16_unaligned_t*)(dd - 2)) = *((uint16_unaligned_t*)(ss - 2));
-		break;
-
-	case 103:
-		memcpy_sse2_64(dd - 103, ss - 103);
-	case 39:
-		memcpy_sse2_32(dd - 39, ss - 39);
-		*((uint32_unaligned_t*)(dd - 7)) = *((uint32_unaligned_t*)(ss - 7));
-		*((uint32_unaligned_t*)(dd - 4)) = *((uint32_unaligned_t*)(ss - 4));
-		break;
-
-	case 104:
-		memcpy_sse2_64(dd - 104, ss - 104);
-	case 40:
-		memcpy_sse2_32(dd - 40, ss - 40);
-		*((uint64_unaligned_t*)(dd - 8)) = *((uint64_unaligned_t*)(ss - 8));
-		break;
-
-	case 105:
-		memcpy_sse2_64(dd - 105, ss - 105);
-	case 41:
-		memcpy_sse2_32(dd - 41, ss - 41);
-		*((uint64_unaligned_t*)(dd - 9)) = *((uint64_unaligned_t*)(ss - 9));
-		dd[-1] = ss[-1];
-		break;
-
-	case 106:
-		memcpy_sse2_64(dd - 106, ss - 106);
-	case 42:
-		memcpy_sse2_32(dd - 42, ss - 42);
-		*((uint64_unaligned_t*)(dd - 10)) = *((uint64_unaligned_t*)(ss - 10));
-		*((uint16_unaligned_t*)(dd - 2)) = *((uint16_unaligned_t*)(ss - 2));
-		break;
-
-	case 107:
-		memcpy_sse2_64(dd - 107, ss - 107);
-	case 43:
-		memcpy_sse2_32(dd - 43, ss - 43);
-		*((uint64_unaligned_t*)(dd - 11)) = *((uint64_unaligned_t*)(ss - 11));
-		*((uint32_unaligned_t*)(dd - 4)) = *((uint32_unaligned_t*)(ss - 4));
-		break;
-
-	case 108:
-		memcpy_sse2_64(dd - 108, ss - 108);
-	case 44:
-		memcpy_sse2_32(dd - 44, ss - 44);
-		*((uint64_unaligned_t*)(dd - 12)) = *((uint64_unaligned_t*)(ss - 12));
-		*((uint32_unaligned_t*)(dd - 4)) = *((uint32_unaligned_t*)(ss - 4));
-		break;
-
-	case 109:
-		memcpy_sse2_64(dd - 109, ss - 109);
-	case 45:
-		memcpy_sse2_32(dd - 45, ss - 45);
-		*((uint64_unaligned_t*)(dd - 13)) = *((uint64_unaligned_t*)(ss - 13));
-		*((uint32_unaligned_t*)(dd - 5)) = *((uint32_unaligned_t*)(ss - 5));
-		dd[-1] = ss[-1];
-		break;
-
-	case 110:
-		memcpy_sse2_64(dd - 110, ss - 110);
-	case 46:
-		memcpy_sse2_32(dd - 46, ss - 46);
-		*((uint64_unaligned_t*)(dd - 14)) = *((uint64_unaligned_t*)(ss - 14));
-		*((uint64_unaligned_t*)(dd - 8)) = *((uint64_unaligned_t*)(ss - 8));
-		break;
-
-	case 111:
-		memcpy_sse2_64(dd - 111, ss - 111);
-	case 47:
-		memcpy_sse2_32(dd - 47, ss - 47);
-		*((uint64_unaligned_t*)(dd - 15)) = *((uint64_unaligned_t*)(ss - 15));
-		*((uint64_unaligned_t*)(dd - 8)) = *((uint64_unaligned_t*)(ss - 8));
-		break;
-
-	case 112:
-		memcpy_sse2_64(dd - 112, ss - 112);
-	case 48:
-		memcpy_sse2_32(dd - 48, ss - 48);
-		memcpy_sse2_16(dd - 16, ss - 16);
-		break;
-
-	case 113:
-		memcpy_sse2_64(dd - 113, ss - 113);
-	case 49:
-		memcpy_sse2_32(dd - 49, ss - 49);
-		memcpy_sse2_16(dd - 17, ss - 17);
-		dd[-1] = ss[-1];
-		break;
-
-	case 114:
-		memcpy_sse2_64(dd - 114, ss - 114);
-	case 50:
-		memcpy_sse2_32(dd - 50, ss - 50);
-		memcpy_sse2_16(dd - 18, ss - 18);
-		*((uint16_unaligned_t*)(dd - 2)) = *((uint16_unaligned_t*)(ss - 2));
-		break;
-
-	case 115:
-		memcpy_sse2_64(dd - 115, ss - 115);
-	case 51:
-		memcpy_sse2_32(dd - 51, ss - 51);
-		memcpy_sse2_16(dd - 19, ss - 19);
-		*((uint16_unaligned_t*)(dd - 3)) = *((uint16_unaligned_t*)(ss - 3));
-		dd[-1] = ss[-1];
-		break;
-
-	case 116:
-		memcpy_sse2_64(dd - 116, ss - 116);
-	case 52:
-		memcpy_sse2_32(dd - 52, ss - 52);
-		memcpy_sse2_16(dd - 20, ss - 20);
-		*((uint32_unaligned_t*)(dd - 4)) = *((uint32_unaligned_t*)(ss - 4));
-		break;
-
-	case 117:
-		memcpy_sse2_64(dd - 117, ss - 117);
-	case 53:
-		memcpy_sse2_32(dd - 53, ss - 53);
-		memcpy_sse2_16(dd - 21, ss - 21);
-		*((uint32_unaligned_t*)(dd - 5)) = *((uint32_unaligned_t*)(ss - 5));
-		dd[-1] = ss[-1];
-		break;
-
-	case 118:
-		memcpy_sse2_64(dd - 118, ss - 118);
-	case 54:
-		memcpy_sse2_32(dd - 54, ss - 54);
-		memcpy_sse2_16(dd - 22, ss - 22);
-		*((uint32_unaligned_t*)(dd - 6)) = *((uint32_unaligned_t*)(ss - 6));
-		*((uint16_unaligned_t*)(dd - 2)) = *((uint16_unaligned_t*)(ss - 2));
-		break;
-
-	case 119:
-		memcpy_sse2_64(dd - 119, ss - 119);
-	case 55:
-		memcpy_sse2_32(dd - 55, ss - 55);
-		memcpy_sse2_16(dd - 23, ss - 23);
-		*((uint32_unaligned_t*)(dd - 7)) = *((uint32_unaligned_t*)(ss - 7));
-		*((uint32_unaligned_t*)(dd - 4)) = *((uint32_unaligned_t*)(ss - 4));
-		break;
-
-	case 120:
-		memcpy_sse2_64(dd - 120, ss - 120);
-	case 56:
-		memcpy_sse2_32(dd - 56, ss - 56);
-		memcpy_sse2_16(dd - 24, ss - 24);
-		memcpy_sse2_16(dd - 16, ss - 16);
-		break;
-
-	case 121:
-		memcpy_sse2_64(dd - 121, ss - 121);
-	case 57:
-		memcpy_sse2_32(dd - 57, ss - 57);
-		memcpy_sse2_16(dd - 25, ss - 25);
-		memcpy_sse2_16(dd - 16, ss - 16);
-		break;
-
-	case 122:
-		memcpy_sse2_64(dd - 122, ss - 122);
-	case 58:
-		memcpy_sse2_32(dd - 58, ss - 58);
-		memcpy_sse2_16(dd - 26, ss - 26);
-		memcpy_sse2_16(dd - 16, ss - 16);
-		break;
-
-	case 123:
-		memcpy_sse2_64(dd - 123, ss - 123);
-	case 59:
-		memcpy_sse2_32(dd - 59, ss - 59);
-		memcpy_sse2_16(dd - 27, ss - 27);
-		memcpy_sse2_16(dd - 16, ss - 16);
-		break;
-
-	case 124:
-		memcpy_sse2_64(dd - 124, ss - 124);
-	case 60:
-		memcpy_sse2_32(dd - 60, ss - 60);
-		memcpy_sse2_16(dd - 28, ss - 28);
-		memcpy_sse2_16(dd - 16, ss - 16);
-		break;
-
-	case 125:
-		memcpy_sse2_64(dd - 125, ss - 125);
-	case 61:
-		memcpy_sse2_32(dd - 61, ss - 61);
-		memcpy_sse2_16(dd - 29, ss - 29);
-		memcpy_sse2_16(dd - 16, ss - 16);
-		break;
-
-	case 126:
-		memcpy_sse2_64(dd - 126, ss - 126);
-	case 62:
-		memcpy_sse2_32(dd - 62, ss - 62);
-		memcpy_sse2_16(dd - 30, ss - 30);
-		memcpy_sse2_16(dd - 16, ss - 16);
-		break;
-
-	case 127:
-		memcpy_sse2_64(dd - 127, ss - 127);
-	case 63:
-		memcpy_sse2_32(dd - 63, ss - 63);
-		memcpy_sse2_16(dd - 31, ss - 31);
-		memcpy_sse2_16(dd - 16, ss - 16);
-		break;
-
-	case 128:
-		memcpy_sse2_128(dd - 128, ss - 128);
-		break;
-	}
-
-	return dst;
-}
-
-
-//---------------------------------------------------------------------
-// main routine
-//---------------------------------------------------------------------
-static void* memcpy_fast(void *destination, const void *source, size_t size)
-{
-	unsigned char *dst = (unsigned char*)destination;
-	const unsigned char *src = (const unsigned char*)source;
-	static size_t cachesize = 0x200000; // L2-cache size
-	size_t padding;
-
-	// small memory copy
-	if (size <= 128) {
-		return memcpy_tiny(dst, src, size);
-	}
-
-	// align destination to 16 bytes boundary
-	padding = (16 - (((size_t)dst) & 15)) & 15;
-
-	if (padding > 0) {
-		__m128i head = _mm_loadu_si128((const __m128i*)src);
-		_mm_storeu_si128((__m128i*)dst, head);
-		dst += padding;
-		src += padding;
-		size -= padding;
-	}
-
-	// medium size copy
-	if (size <= cachesize) {
-		__m128i c0, c1, c2, c3, c4, c5, c6, c7;
-
-		for (; size >= 128; size -= 128) {
-			c0 = _mm_loadu_si128(((const __m128i*)src) + 0);
-			c1 = _mm_loadu_si128(((const __m128i*)src) + 1);
-			c2 = _mm_loadu_si128(((const __m128i*)src) + 2);
-			c3 = _mm_loadu_si128(((const __m128i*)src) + 3);
-			c4 = _mm_loadu_si128(((const __m128i*)src) + 4);
-			c5 = _mm_loadu_si128(((const __m128i*)src) + 5);
-			c6 = _mm_loadu_si128(((const __m128i*)src) + 6);
-			c7 = _mm_loadu_si128(((const __m128i*)src) + 7);
-			_mm_prefetch((const char*)(src + 256), _MM_HINT_NTA);
-			src += 128;
-			_mm_store_si128((((__m128i*)dst) + 0), c0);
-			_mm_store_si128((((__m128i*)dst) + 1), c1);
-			_mm_store_si128((((__m128i*)dst) + 2), c2);
-			_mm_store_si128((((__m128i*)dst) + 3), c3);
-			_mm_store_si128((((__m128i*)dst) + 4), c4);
-			_mm_store_si128((((__m128i*)dst) + 5), c5);
-			_mm_store_si128((((__m128i*)dst) + 6), c6);
-			_mm_store_si128((((__m128i*)dst) + 7), c7);
-			dst += 128;
-		}
-	}
-	else {		// big memory copy
-		__m128i c0, c1, c2, c3, c4, c5, c6, c7;
-
-		_mm_prefetch((const char*)(src), _MM_HINT_NTA);
-
-		if ((((size_t)src) & 15) == 0) {	// source aligned
-			for (; size >= 128; size -= 128) {
-				c0 = _mm_load_si128(((const __m128i*)src) + 0);
-				c1 = _mm_load_si128(((const __m128i*)src) + 1);
-				c2 = _mm_load_si128(((const __m128i*)src) + 2);
-				c3 = _mm_load_si128(((const __m128i*)src) + 3);
-				c4 = _mm_load_si128(((const __m128i*)src) + 4);
-				c5 = _mm_load_si128(((const __m128i*)src) + 5);
-				c6 = _mm_load_si128(((const __m128i*)src) + 6);
-				c7 = _mm_load_si128(((const __m128i*)src) + 7);
-				_mm_prefetch((const char*)(src + 256), _MM_HINT_NTA);
-				src += 128;
-				_mm_stream_si128((((__m128i*)dst) + 0), c0);
-				_mm_stream_si128((((__m128i*)dst) + 1), c1);
-				_mm_stream_si128((((__m128i*)dst) + 2), c2);
-				_mm_stream_si128((((__m128i*)dst) + 3), c3);
-				_mm_stream_si128((((__m128i*)dst) + 4), c4);
-				_mm_stream_si128((((__m128i*)dst) + 5), c5);
-				_mm_stream_si128((((__m128i*)dst) + 6), c6);
-				_mm_stream_si128((((__m128i*)dst) + 7), c7);
-				dst += 128;
-			}
-		}
-		else {							// source unaligned
-			for (; size >= 128; size -= 128) {
-				c0 = _mm_loadu_si128(((const __m128i*)src) + 0);
-				c1 = _mm_loadu_si128(((const __m128i*)src) + 1);
-				c2 = _mm_loadu_si128(((const __m128i*)src) + 2);
-				c3 = _mm_loadu_si128(((const __m128i*)src) + 3);
-				c4 = _mm_loadu_si128(((const __m128i*)src) + 4);
-				c5 = _mm_loadu_si128(((const __m128i*)src) + 5);
-				c6 = _mm_loadu_si128(((const __m128i*)src) + 6);
-				c7 = _mm_loadu_si128(((const __m128i*)src) + 7);
-				_mm_prefetch((const char*)(src + 256), _MM_HINT_NTA);
-				src += 128;
-				_mm_stream_si128((((__m128i*)dst) + 0), c0);
-				_mm_stream_si128((((__m128i*)dst) + 1), c1);
-				_mm_stream_si128((((__m128i*)dst) + 2), c2);
-				_mm_stream_si128((((__m128i*)dst) + 3), c3);
-				_mm_stream_si128((((__m128i*)dst) + 4), c4);
-				_mm_stream_si128((((__m128i*)dst) + 5), c5);
-				_mm_stream_si128((((__m128i*)dst) + 6), c6);
-				_mm_stream_si128((((__m128i*)dst) + 7), c7);
-				dst += 128;
-			}
-		}
-		_mm_sfence();
-	}
-
-	memcpy_tiny(dst, src, size);
-
-	return destination;
-}
-
-
-#endif
diff --git a/contrib/FastMemcpy/FastMemcpy_Avx.c b/contrib/FastMemcpy/FastMemcpy_Avx.c
deleted file mode 100644
index 6538c6b2126..00000000000
--- a/contrib/FastMemcpy/FastMemcpy_Avx.c
+++ /dev/null
@@ -1,171 +0,0 @@
-//=====================================================================
-//
-// FastMemcpy.c - skywind3000@163.com, 2015
-//
-// feature:
-// 50% speed up in avg. vs standard memcpy (tested in vc2012/gcc4.9)
-//
-//=====================================================================
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <assert.h>
-
-#if (defined(_WIN32) || defined(WIN32))
-#include <windows.h>
-#include <mmsystem.h>
-#ifdef _MSC_VER
-#pragma comment(lib, "winmm.lib")
-#endif
-#elif defined(__unix)
-#include <sys/time.h>
-#include <unistd.h>
-#else
-#error it can only be compiled under windows or unix
-#endif
-
-#include "FastMemcpy_Avx.h"
-
-
-unsigned int gettime()
-{
-	#if (defined(_WIN32) || defined(WIN32))
-	return timeGetTime();
-	#else
-	static struct timezone tz={ 0,0 };
-	struct timeval time;
-	gettimeofday(&time,&tz);
-	return (time.tv_sec * 1000 + time.tv_usec / 1000);
-	#endif
-}
-
-void sleepms(unsigned int millisec)
-{
-#if defined(_WIN32) || defined(WIN32)
-	Sleep(millisec);
-#else
-	usleep(millisec * 1000);
-#endif
-}
-
-
-
-void benchmark(int dstalign, int srcalign, size_t size, int times)
-{
-	char *DATA1 = (char*)malloc(size + 64);
-	char *DATA2 = (char*)malloc(size + 64);
-	size_t LINEAR1 = ((size_t)DATA1);
-	size_t LINEAR2 = ((size_t)DATA2);
-	char *ALIGN1 = (char*)(((64 - (LINEAR1 & 63)) & 63) + LINEAR1);
-	char *ALIGN2 = (char*)(((64 - (LINEAR2 & 63)) & 63) + LINEAR2);
-	char *dst = (dstalign)? ALIGN1 : (ALIGN1 + 1);
-	char *src = (srcalign)? ALIGN2 : (ALIGN2 + 3);
-	unsigned int t1, t2;
-	int k;
-	
-	sleepms(100);
-	t1 = gettime();
-	for (k = times; k > 0; k--) {
-		memcpy(dst, src, size);
-	}
-	t1 = gettime() - t1;
-	sleepms(100);
-	t2 = gettime();
-	for (k = times; k > 0; k--) {
-		memcpy_fast(dst, src, size);
-	}
-	t2 = gettime() - t2;
-
-	free(DATA1);
-	free(DATA2);
-
-	printf("result(dst %s, src %s): memcpy_fast=%dms memcpy=%d ms\n",  
-		dstalign? "aligned" : "unalign", 
-		srcalign? "aligned" : "unalign", (int)t2, (int)t1);
-}
-
-
-void bench(int copysize, int times)
-{
-	printf("benchmark(size=%d bytes, times=%d):\n", copysize, times);
-	benchmark(1, 1, copysize, times);
-	benchmark(1, 0, copysize, times);
-	benchmark(0, 1, copysize, times);
-	benchmark(0, 0, copysize, times);
-	printf("\n");
-}
-
-
-void random_bench(int maxsize, int times)
-{
-	static char A[11 * 1024 * 1024 + 2];
-	static char B[11 * 1024 * 1024 + 2];
-	static int random_offsets[0x10000];
-	static int random_sizes[0x8000];
-	unsigned int i, p1, p2;
-	unsigned int t1, t2;
-	for (i = 0; i < 0x10000; i++) {	// generate random offsets
-		random_offsets[i] = rand() % (10 * 1024 * 1024 + 1);
-	}
-	for (i = 0; i < 0x8000; i++) {	// generate random sizes
-		random_sizes[i] = 1 + rand() % maxsize;
-	}
-	sleepms(100);
-	t1 = gettime();
-	for (p1 = 0, p2 = 0, i = 0; i < times; i++) {
-		int offset1 = random_offsets[(p1++) & 0xffff];
-		int offset2 = random_offsets[(p1++) & 0xffff];
-		int size = random_sizes[(p2++) & 0x7fff];
-		memcpy(A + offset1, B + offset2, size);
-	}
-	t1 = gettime() - t1;
-	sleepms(100);
-	t2 = gettime();
-	for (p1 = 0, p2 = 0, i = 0; i < times; i++) {
-		int offset1 = random_offsets[(p1++) & 0xffff];
-		int offset2 = random_offsets[(p1++) & 0xffff];
-		int size = random_sizes[(p2++) & 0x7fff];
-		memcpy_fast(A + offset1, B + offset2, size);
-	}
-	t2 = gettime() - t2;
-	printf("benchmark random access:\n");
-	printf("memcpy_fast=%dms memcpy=%dms\n\n", (int)t2, (int)t1);
-}
-
-
-#ifdef _MSC_VER
-#pragma comment(lib, "winmm.lib")
-#endif
-
-int main(void)
-{
-#if 1
-	bench(32, 0x1000000);
-	bench(64, 0x1000000);
-	bench(512, 0x800000);
-	bench(1024, 0x400000);
-#endif
-	bench(4096, 0x80000);
-	bench(8192, 0x40000);
-#if 1
-	bench(1024 * 1024 * 1, 0x800);
-	bench(1024 * 1024 * 4, 0x200);
-#endif
-	bench(1024 * 1024 * 8, 0x100);
-	
-	random_bench(2048, 8000000);
-
-	return 0;
-}
-
-
-
-
-/*
-
-*/
-
-
-
-
diff --git a/contrib/FastMemcpy/FastMemcpy_Avx.h b/contrib/FastMemcpy/FastMemcpy_Avx.h
deleted file mode 100644
index 8ba064b0350..00000000000
--- a/contrib/FastMemcpy/FastMemcpy_Avx.h
+++ /dev/null
@@ -1,492 +0,0 @@
-//=====================================================================
-//
-// FastMemcpy.c - skywind3000@163.com, 2015
-//
-// feature:
-// 50% speed up in avg. vs standard memcpy (tested in vc2012/gcc5.1)
-//
-//=====================================================================
-#ifndef __FAST_MEMCPY_H__
-#define __FAST_MEMCPY_H__
-
-#include <stddef.h>
-#include <stdint.h>
-#include <immintrin.h>
-
-
-//---------------------------------------------------------------------
-// force inline for compilers
-//---------------------------------------------------------------------
-#ifndef INLINE
-#ifdef __GNUC__
-#if (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1))
-    #define INLINE         __inline__ __attribute__((always_inline))
-#else
-    #define INLINE         __inline__
-#endif
-#elif defined(_MSC_VER)
-	#define INLINE __forceinline
-#elif (defined(__BORLANDC__) || defined(__WATCOMC__))
-    #define INLINE __inline
-#else
-    #define INLINE 
-#endif
-#endif
-
-
-
-//---------------------------------------------------------------------
-// fast copy for different sizes
-//---------------------------------------------------------------------
-static INLINE void memcpy_avx_16(void *dst, const void *src) {
-#if 1
-	__m128i m0 = _mm_loadu_si128(((const __m128i*)src) + 0);
-	_mm_storeu_si128(((__m128i*)dst) + 0, m0);
-#else
-	*((uint64_t*)((char*)dst + 0)) = *((uint64_t*)((const char*)src + 0));
-	*((uint64_t*)((char*)dst + 8)) = *((uint64_t*)((const char*)src + 8));
-#endif
-}
-
-static INLINE void memcpy_avx_32(void *dst, const void *src) {
-	__m256i m0 = _mm256_loadu_si256(((const __m256i*)src) + 0);
-	_mm256_storeu_si256(((__m256i*)dst) + 0, m0);
-}
-
-static INLINE void memcpy_avx_64(void *dst, const void *src) {
-	__m256i m0 = _mm256_loadu_si256(((const __m256i*)src) + 0);
-	__m256i m1 = _mm256_loadu_si256(((const __m256i*)src) + 1);
-	_mm256_storeu_si256(((__m256i*)dst) + 0, m0);
-	_mm256_storeu_si256(((__m256i*)dst) + 1, m1);
-}
-
-static INLINE void memcpy_avx_128(void *dst, const void *src) {
-	__m256i m0 = _mm256_loadu_si256(((const __m256i*)src) + 0);
-	__m256i m1 = _mm256_loadu_si256(((const __m256i*)src) + 1);
-	__m256i m2 = _mm256_loadu_si256(((const __m256i*)src) + 2);
-	__m256i m3 = _mm256_loadu_si256(((const __m256i*)src) + 3);
-	_mm256_storeu_si256(((__m256i*)dst) + 0, m0);
-	_mm256_storeu_si256(((__m256i*)dst) + 1, m1);
-	_mm256_storeu_si256(((__m256i*)dst) + 2, m2);
-	_mm256_storeu_si256(((__m256i*)dst) + 3, m3);
-}
-
-static INLINE void memcpy_avx_256(void *dst, const void *src) {
-	__m256i m0 = _mm256_loadu_si256(((const __m256i*)src) + 0);
-	__m256i m1 = _mm256_loadu_si256(((const __m256i*)src) + 1);
-	__m256i m2 = _mm256_loadu_si256(((const __m256i*)src) + 2);
-	__m256i m3 = _mm256_loadu_si256(((const __m256i*)src) + 3);
-	__m256i m4 = _mm256_loadu_si256(((const __m256i*)src) + 4);
-	__m256i m5 = _mm256_loadu_si256(((const __m256i*)src) + 5);
-	__m256i m6 = _mm256_loadu_si256(((const __m256i*)src) + 6);
-	__m256i m7 = _mm256_loadu_si256(((const __m256i*)src) + 7);
-	_mm256_storeu_si256(((__m256i*)dst) + 0, m0);
-	_mm256_storeu_si256(((__m256i*)dst) + 1, m1);
-	_mm256_storeu_si256(((__m256i*)dst) + 2, m2);
-	_mm256_storeu_si256(((__m256i*)dst) + 3, m3);
-	_mm256_storeu_si256(((__m256i*)dst) + 4, m4);
-	_mm256_storeu_si256(((__m256i*)dst) + 5, m5);
-	_mm256_storeu_si256(((__m256i*)dst) + 6, m6);
-	_mm256_storeu_si256(((__m256i*)dst) + 7, m7);
-}
-
-
-//---------------------------------------------------------------------
-// tiny memory copy with jump table optimized
-//---------------------------------------------------------------------
-static INLINE void *memcpy_tiny(void *dst, const void *src, size_t size) {
-	unsigned char *dd = ((unsigned char*)dst) + size;
-	const unsigned char *ss = ((const unsigned char*)src) + size;
-
-	switch (size) { 
-	case 128: memcpy_avx_128(dd - 128, ss - 128);
-	case 0:  break;
-	case 129: memcpy_avx_128(dd - 129, ss - 129);
-	case 1: dd[-1] = ss[-1]; break;
-	case 130: memcpy_avx_128(dd - 130, ss - 130);
-	case 2: *((uint16_t*)(dd - 2)) = *((uint16_t*)(ss - 2)); break;
-	case 131: memcpy_avx_128(dd - 131, ss - 131);
-	case 3: *((uint16_t*)(dd - 3)) = *((uint16_t*)(ss - 3)); dd[-1] = ss[-1]; break;
-	case 132: memcpy_avx_128(dd - 132, ss - 132);
-	case 4: *((uint32_t*)(dd - 4)) = *((uint32_t*)(ss - 4)); break;
-	case 133: memcpy_avx_128(dd - 133, ss - 133);
-	case 5: *((uint32_t*)(dd - 5)) = *((uint32_t*)(ss - 5)); dd[-1] = ss[-1]; break;
-	case 134: memcpy_avx_128(dd - 134, ss - 134);
-	case 6: *((uint32_t*)(dd - 6)) = *((uint32_t*)(ss - 6)); *((uint16_t*)(dd - 2)) = *((uint16_t*)(ss - 2)); break;
-	case 135: memcpy_avx_128(dd - 135, ss - 135);
-	case 7: *((uint32_t*)(dd - 7)) = *((uint32_t*)(ss - 7)); *((uint32_t*)(dd - 4)) = *((uint32_t*)(ss - 4)); break;
-	case 136: memcpy_avx_128(dd - 136, ss - 136);
-	case 8: *((uint64_t*)(dd - 8)) = *((uint64_t*)(ss - 8)); break;
-	case 137: memcpy_avx_128(dd - 137, ss - 137);
-	case 9: *((uint64_t*)(dd - 9)) = *((uint64_t*)(ss - 9)); dd[-1] = ss[-1]; break;
-	case 138: memcpy_avx_128(dd - 138, ss - 138);
-	case 10: *((uint64_t*)(dd - 10)) = *((uint64_t*)(ss - 10)); *((uint16_t*)(dd - 2)) = *((uint16_t*)(ss - 2)); break;
-	case 139: memcpy_avx_128(dd - 139, ss - 139);
-	case 11: *((uint64_t*)(dd - 11)) = *((uint64_t*)(ss - 11)); *((uint32_t*)(dd - 4)) = *((uint32_t*)(ss - 4)); break;
-	case 140: memcpy_avx_128(dd - 140, ss - 140);
-	case 12: *((uint64_t*)(dd - 12)) = *((uint64_t*)(ss - 12)); *((uint32_t*)(dd - 4)) = *((uint32_t*)(ss - 4)); break;
-	case 141: memcpy_avx_128(dd - 141, ss - 141);
-	case 13: *((uint64_t*)(dd - 13)) = *((uint64_t*)(ss - 13)); *((uint64_t*)(dd - 8)) = *((uint64_t*)(ss - 8)); break;
-	case 142: memcpy_avx_128(dd - 142, ss - 142);
-	case 14: *((uint64_t*)(dd - 14)) = *((uint64_t*)(ss - 14)); *((uint64_t*)(dd - 8)) = *((uint64_t*)(ss - 8)); break;
-	case 143: memcpy_avx_128(dd - 143, ss - 143);
-	case 15: *((uint64_t*)(dd - 15)) = *((uint64_t*)(ss - 15)); *((uint64_t*)(dd - 8)) = *((uint64_t*)(ss - 8)); break;
-	case 144: memcpy_avx_128(dd - 144, ss - 144);
-	case 16: memcpy_avx_16(dd - 16, ss - 16); break;
-	case 145: memcpy_avx_128(dd - 145, ss - 145);
-	case 17: memcpy_avx_16(dd - 17, ss - 17); dd[-1] = ss[-1]; break;
-	case 146: memcpy_avx_128(dd - 146, ss - 146);
-	case 18: memcpy_avx_16(dd - 18, ss - 18); *((uint16_t*)(dd - 2)) = *((uint16_t*)(ss - 2)); break;
-	case 147: memcpy_avx_128(dd - 147, ss - 147);
-	case 19: memcpy_avx_16(dd - 19, ss - 19); *((uint32_t*)(dd - 4)) = *((uint32_t*)(ss - 4)); break;
-	case 148: memcpy_avx_128(dd - 148, ss - 148);
-	case 20: memcpy_avx_16(dd - 20, ss - 20); *((uint32_t*)(dd - 4)) = *((uint32_t*)(ss - 4)); break;
-	case 149: memcpy_avx_128(dd - 149, ss - 149);
-	case 21: memcpy_avx_16(dd - 21, ss - 21); *((uint64_t*)(dd - 8)) = *((uint64_t*)(ss - 8)); break;
-	case 150: memcpy_avx_128(dd - 150, ss - 150);
-	case 22: memcpy_avx_16(dd - 22, ss - 22); *((uint64_t*)(dd - 8)) = *((uint64_t*)(ss - 8)); break;
-	case 151: memcpy_avx_128(dd - 151, ss - 151);
-	case 23: memcpy_avx_16(dd - 23, ss - 23); *((uint64_t*)(dd - 8)) = *((uint64_t*)(ss - 8)); break;
-	case 152: memcpy_avx_128(dd - 152, ss - 152);
-	case 24: memcpy_avx_16(dd - 24, ss - 24); *((uint64_t*)(dd - 8)) = *((uint64_t*)(ss - 8)); break;
-	case 153: memcpy_avx_128(dd - 153, ss - 153);
-	case 25: memcpy_avx_16(dd - 25, ss - 25); memcpy_avx_16(dd - 16, ss - 16); break;
-	case 154: memcpy_avx_128(dd - 154, ss - 154);
-	case 26: memcpy_avx_16(dd - 26, ss - 26); memcpy_avx_16(dd - 16, ss - 16); break;
-	case 155: memcpy_avx_128(dd - 155, ss - 155);
-	case 27: memcpy_avx_16(dd - 27, ss - 27); memcpy_avx_16(dd - 16, ss - 16); break;
-	case 156: memcpy_avx_128(dd - 156, ss - 156);
-	case 28: memcpy_avx_16(dd - 28, ss - 28); memcpy_avx_16(dd - 16, ss - 16); break;
-	case 157: memcpy_avx_128(dd - 157, ss - 157);
-	case 29: memcpy_avx_16(dd - 29, ss - 29); memcpy_avx_16(dd - 16, ss - 16); break;
-	case 158: memcpy_avx_128(dd - 158, ss - 158);
-	case 30: memcpy_avx_16(dd - 30, ss - 30); memcpy_avx_16(dd - 16, ss - 16); break;
-	case 159: memcpy_avx_128(dd - 159, ss - 159);
-	case 31: memcpy_avx_16(dd - 31, ss - 31); memcpy_avx_16(dd - 16, ss - 16); break;
-	case 160: memcpy_avx_128(dd - 160, ss - 160);
-	case 32: memcpy_avx_32(dd - 32, ss - 32); break;
-	case 161: memcpy_avx_128(dd - 161, ss - 161);
-	case 33: memcpy_avx_32(dd - 33, ss - 33); dd[-1] = ss[-1]; break;
-	case 162: memcpy_avx_128(dd - 162, ss - 162);
-	case 34: memcpy_avx_32(dd - 34, ss - 34); *((uint16_t*)(dd - 2)) = *((uint16_t*)(ss - 2)); break;
-	case 163: memcpy_avx_128(dd - 163, ss - 163);
-	case 35: memcpy_avx_32(dd - 35, ss - 35); *((uint32_t*)(dd - 4)) = *((uint32_t*)(ss - 4)); break;
-	case 164: memcpy_avx_128(dd - 164, ss - 164);
-	case 36: memcpy_avx_32(dd - 36, ss - 36); *((uint32_t*)(dd - 4)) = *((uint32_t*)(ss - 4)); break;
-	case 165: memcpy_avx_128(dd - 165, ss - 165);
-	case 37: memcpy_avx_32(dd - 37, ss - 37); *((uint64_t*)(dd - 8)) = *((uint64_t*)(ss - 8)); break;
-	case 166: memcpy_avx_128(dd - 166, ss - 166);
-	case 38: memcpy_avx_32(dd - 38, ss - 38); *((uint64_t*)(dd - 8)) = *((uint64_t*)(ss - 8)); break;
-	case 167: memcpy_avx_128(dd - 167, ss - 167);
-	case 39: memcpy_avx_32(dd - 39, ss - 39); *((uint64_t*)(dd - 8)) = *((uint64_t*)(ss - 8)); break;
-	case 168: memcpy_avx_128(dd - 168, ss - 168);
-	case 40: memcpy_avx_32(dd - 40, ss - 40); *((uint64_t*)(dd - 8)) = *((uint64_t*)(ss - 8)); break;
-	case 169: memcpy_avx_128(dd - 169, ss - 169);
-	case 41: memcpy_avx_32(dd - 41, ss - 41); memcpy_avx_16(dd - 16, ss - 16); break;
-	case 170: memcpy_avx_128(dd - 170, ss - 170);
-	case 42: memcpy_avx_32(dd - 42, ss - 42); memcpy_avx_16(dd - 16, ss - 16); break;
-	case 171: memcpy_avx_128(dd - 171, ss - 171);
-	case 43: memcpy_avx_32(dd - 43, ss - 43); memcpy_avx_16(dd - 16, ss - 16); break;
-	case 172: memcpy_avx_128(dd - 172, ss - 172);
-	case 44: memcpy_avx_32(dd - 44, ss - 44); memcpy_avx_16(dd - 16, ss - 16); break;
-	case 173: memcpy_avx_128(dd - 173, ss - 173);
-	case 45: memcpy_avx_32(dd - 45, ss - 45); memcpy_avx_16(dd - 16, ss - 16); break;
-	case 174: memcpy_avx_128(dd - 174, ss - 174);
-	case 46: memcpy_avx_32(dd - 46, ss - 46); memcpy_avx_16(dd - 16, ss - 16); break;
-	case 175: memcpy_avx_128(dd - 175, ss - 175);
-	case 47: memcpy_avx_32(dd - 47, ss - 47); memcpy_avx_16(dd - 16, ss - 16); break;
-	case 176: memcpy_avx_128(dd - 176, ss - 176);
-	case 48: memcpy_avx_32(dd - 48, ss - 48); memcpy_avx_16(dd - 16, ss - 16); break;
-	case 177: memcpy_avx_128(dd - 177, ss - 177);
-	case 49: memcpy_avx_32(dd - 49, ss - 49); memcpy_avx_32(dd - 32, ss - 32); break;
-	case 178: memcpy_avx_128(dd - 178, ss - 178);
-	case 50: memcpy_avx_32(dd - 50, ss - 50); memcpy_avx_32(dd - 32, ss - 32); break;
-	case 179: memcpy_avx_128(dd - 179, ss - 179);
-	case 51: memcpy_avx_32(dd - 51, ss - 51); memcpy_avx_32(dd - 32, ss - 32); break;
-	case 180: memcpy_avx_128(dd - 180, ss - 180);
-	case 52: memcpy_avx_32(dd - 52, ss - 52); memcpy_avx_32(dd - 32, ss - 32); break;
-	case 181: memcpy_avx_128(dd - 181, ss - 181);
-	case 53: memcpy_avx_32(dd - 53, ss - 53); memcpy_avx_32(dd - 32, ss - 32); break;
-	case 182: memcpy_avx_128(dd - 182, ss - 182);
-	case 54: memcpy_avx_32(dd - 54, ss - 54); memcpy_avx_32(dd - 32, ss - 32); break;
-	case 183: memcpy_avx_128(dd - 183, ss - 183);
-	case 55: memcpy_avx_32(dd - 55, ss - 55); memcpy_avx_32(dd - 32, ss - 32); break;
-	case 184: memcpy_avx_128(dd - 184, ss - 184);
-	case 56: memcpy_avx_32(dd - 56, ss - 56); memcpy_avx_32(dd - 32, ss - 32); break;
-	case 185: memcpy_avx_128(dd - 185, ss - 185);
-	case 57: memcpy_avx_32(dd - 57, ss - 57); memcpy_avx_32(dd - 32, ss - 32); break;
-	case 186: memcpy_avx_128(dd - 186, ss - 186);
-	case 58: memcpy_avx_32(dd - 58, ss - 58); memcpy_avx_32(dd - 32, ss - 32); break;
-	case 187: memcpy_avx_128(dd - 187, ss - 187);
-	case 59: memcpy_avx_32(dd - 59, ss - 59); memcpy_avx_32(dd - 32, ss - 32); break;
-	case 188: memcpy_avx_128(dd - 188, ss - 188);
-	case 60: memcpy_avx_32(dd - 60, ss - 60); memcpy_avx_32(dd - 32, ss - 32); break;
-	case 189: memcpy_avx_128(dd - 189, ss - 189);
-	case 61: memcpy_avx_32(dd - 61, ss - 61); memcpy_avx_32(dd - 32, ss - 32); break;
-	case 190: memcpy_avx_128(dd - 190, ss - 190);
-	case 62: memcpy_avx_32(dd - 62, ss - 62); memcpy_avx_32(dd - 32, ss - 32); break;
-	case 191: memcpy_avx_128(dd - 191, ss - 191);
-	case 63: memcpy_avx_32(dd - 63, ss - 63); memcpy_avx_32(dd - 32, ss - 32); break;
-	case 192: memcpy_avx_128(dd - 192, ss - 192);
-	case 64: memcpy_avx_64(dd - 64, ss - 64); break;
-	case 193: memcpy_avx_128(dd - 193, ss - 193);
-	case 65: memcpy_avx_64(dd - 65, ss - 65); dd[-1] = ss[-1]; break;
-	case 194: memcpy_avx_128(dd - 194, ss - 194);
-	case 66: memcpy_avx_64(dd - 66, ss - 66); *((uint16_t*)(dd - 2)) = *((uint16_t*)(ss - 2)); break;
-	case 195: memcpy_avx_128(dd - 195, ss - 195);
-	case 67: memcpy_avx_64(dd - 67, ss - 67); *((uint32_t*)(dd - 4)) = *((uint32_t*)(ss - 4)); break;
-	case 196: memcpy_avx_128(dd - 196, ss - 196);
-	case 68: memcpy_avx_64(dd - 68, ss - 68); *((uint32_t*)(dd - 4)) = *((uint32_t*)(ss - 4)); break;
-	case 197: memcpy_avx_128(dd - 197, ss - 197);
-	case 69: memcpy_avx_64(dd - 69, ss - 69); *((uint64_t*)(dd - 8)) = *((uint64_t*)(ss - 8)); break;
-	case 198: memcpy_avx_128(dd - 198, ss - 198);
-	case 70: memcpy_avx_64(dd - 70, ss - 70); *((uint64_t*)(dd - 8)) = *((uint64_t*)(ss - 8)); break;
-	case 199: memcpy_avx_128(dd - 199, ss - 199);
-	case 71: memcpy_avx_64(dd - 71, ss - 71); *((uint64_t*)(dd - 8)) = *((uint64_t*)(ss - 8)); break;
-	case 200: memcpy_avx_128(dd - 200, ss - 200);
-	case 72: memcpy_avx_64(dd - 72, ss - 72); *((uint64_t*)(dd - 8)) = *((uint64_t*)(ss - 8)); break;
-	case 201: memcpy_avx_128(dd - 201, ss - 201);
-	case 73: memcpy_avx_64(dd - 73, ss - 73); memcpy_avx_16(dd - 16, ss - 16); break;
-	case 202: memcpy_avx_128(dd - 202, ss - 202);
-	case 74: memcpy_avx_64(dd - 74, ss - 74); memcpy_avx_16(dd - 16, ss - 16); break;
-	case 203: memcpy_avx_128(dd - 203, ss - 203);
-	case 75: memcpy_avx_64(dd - 75, ss - 75); memcpy_avx_16(dd - 16, ss - 16); break;
-	case 204: memcpy_avx_128(dd - 204, ss - 204);
-	case 76: memcpy_avx_64(dd - 76, ss - 76); memcpy_avx_16(dd - 16, ss - 16); break;
-	case 205: memcpy_avx_128(dd - 205, ss - 205);
-	case 77: memcpy_avx_64(dd - 77, ss - 77); memcpy_avx_16(dd - 16, ss - 16); break;
-	case 206: memcpy_avx_128(dd - 206, ss - 206);
-	case 78: memcpy_avx_64(dd - 78, ss - 78); memcpy_avx_16(dd - 16, ss - 16); break;
-	case 207: memcpy_avx_128(dd - 207, ss - 207);
-	case 79: memcpy_avx_64(dd - 79, ss - 79); memcpy_avx_16(dd - 16, ss - 16); break;
-	case 208: memcpy_avx_128(dd - 208, ss - 208);
-	case 80: memcpy_avx_64(dd - 80, ss - 80); memcpy_avx_16(dd - 16, ss - 16); break;
-	case 209: memcpy_avx_128(dd - 209, ss - 209);
-	case 81: memcpy_avx_64(dd - 81, ss - 81); memcpy_avx_32(dd - 32, ss - 32); break;
-	case 210: memcpy_avx_128(dd - 210, ss - 210);
-	case 82: memcpy_avx_64(dd - 82, ss - 82); memcpy_avx_32(dd - 32, ss - 32); break;
-	case 211: memcpy_avx_128(dd - 211, ss - 211);
-	case 83: memcpy_avx_64(dd - 83, ss - 83); memcpy_avx_32(dd - 32, ss - 32); break;
-	case 212: memcpy_avx_128(dd - 212, ss - 212);
-	case 84: memcpy_avx_64(dd - 84, ss - 84); memcpy_avx_32(dd - 32, ss - 32); break;
-	case 213: memcpy_avx_128(dd - 213, ss - 213);
-	case 85: memcpy_avx_64(dd - 85, ss - 85); memcpy_avx_32(dd - 32, ss - 32); break;
-	case 214: memcpy_avx_128(dd - 214, ss - 214);
-	case 86: memcpy_avx_64(dd - 86, ss - 86); memcpy_avx_32(dd - 32, ss - 32); break;
-	case 215: memcpy_avx_128(dd - 215, ss - 215);
-	case 87: memcpy_avx_64(dd - 87, ss - 87); memcpy_avx_32(dd - 32, ss - 32); break;
-	case 216: memcpy_avx_128(dd - 216, ss - 216);
-	case 88: memcpy_avx_64(dd - 88, ss - 88); memcpy_avx_32(dd - 32, ss - 32); break;
-	case 217: memcpy_avx_128(dd - 217, ss - 217);
-	case 89: memcpy_avx_64(dd - 89, ss - 89); memcpy_avx_32(dd - 32, ss - 32); break;
-	case 218: memcpy_avx_128(dd - 218, ss - 218);
-	case 90: memcpy_avx_64(dd - 90, ss - 90); memcpy_avx_32(dd - 32, ss - 32); break;
-	case 219: memcpy_avx_128(dd - 219, ss - 219);
-	case 91: memcpy_avx_64(dd - 91, ss - 91); memcpy_avx_32(dd - 32, ss - 32); break;
-	case 220: memcpy_avx_128(dd - 220, ss - 220);
-	case 92: memcpy_avx_64(dd - 92, ss - 92); memcpy_avx_32(dd - 32, ss - 32); break;
-	case 221: memcpy_avx_128(dd - 221, ss - 221);
-	case 93: memcpy_avx_64(dd - 93, ss - 93); memcpy_avx_32(dd - 32, ss - 32); break;
-	case 222: memcpy_avx_128(dd - 222, ss - 222);
-	case 94: memcpy_avx_64(dd - 94, ss - 94); memcpy_avx_32(dd - 32, ss - 32); break;
-	case 223: memcpy_avx_128(dd - 223, ss - 223);
-	case 95: memcpy_avx_64(dd - 95, ss - 95); memcpy_avx_32(dd - 32, ss - 32); break;
-	case 224: memcpy_avx_128(dd - 224, ss - 224);
-	case 96: memcpy_avx_64(dd - 96, ss - 96); memcpy_avx_32(dd - 32, ss - 32); break;
-	case 225: memcpy_avx_128(dd - 225, ss - 225);
-	case 97: memcpy_avx_64(dd - 97, ss - 97); memcpy_avx_64(dd - 64, ss - 64); break;
-	case 226: memcpy_avx_128(dd - 226, ss - 226);
-	case 98: memcpy_avx_64(dd - 98, ss - 98); memcpy_avx_64(dd - 64, ss - 64); break;
-	case 227: memcpy_avx_128(dd - 227, ss - 227);
-	case 99: memcpy_avx_64(dd - 99, ss - 99); memcpy_avx_64(dd - 64, ss - 64); break;
-	case 228: memcpy_avx_128(dd - 228, ss - 228);
-	case 100: memcpy_avx_64(dd - 100, ss - 100); memcpy_avx_64(dd - 64, ss - 64); break;
-	case 229: memcpy_avx_128(dd - 229, ss - 229);
-	case 101: memcpy_avx_64(dd - 101, ss - 101); memcpy_avx_64(dd - 64, ss - 64); break;
-	case 230: memcpy_avx_128(dd - 230, ss - 230);
-	case 102: memcpy_avx_64(dd - 102, ss - 102); memcpy_avx_64(dd - 64, ss - 64); break;
-	case 231: memcpy_avx_128(dd - 231, ss - 231);
-	case 103: memcpy_avx_64(dd - 103, ss - 103); memcpy_avx_64(dd - 64, ss - 64); break;
-	case 232: memcpy_avx_128(dd - 232, ss - 232);
-	case 104: memcpy_avx_64(dd - 104, ss - 104); memcpy_avx_64(dd - 64, ss - 64); break;
-	case 233: memcpy_avx_128(dd - 233, ss - 233);
-	case 105: memcpy_avx_64(dd - 105, ss - 105); memcpy_avx_64(dd - 64, ss - 64); break;
-	case 234: memcpy_avx_128(dd - 234, ss - 234);
-	case 106: memcpy_avx_64(dd - 106, ss - 106); memcpy_avx_64(dd - 64, ss - 64); break;
-	case 235: memcpy_avx_128(dd - 235, ss - 235);
-	case 107: memcpy_avx_64(dd - 107, ss - 107); memcpy_avx_64(dd - 64, ss - 64); break;
-	case 236: memcpy_avx_128(dd - 236, ss - 236);
-	case 108: memcpy_avx_64(dd - 108, ss - 108); memcpy_avx_64(dd - 64, ss - 64); break;
-	case 237: memcpy_avx_128(dd - 237, ss - 237);
-	case 109: memcpy_avx_64(dd - 109, ss - 109); memcpy_avx_64(dd - 64, ss - 64); break;
-	case 238: memcpy_avx_128(dd - 238, ss - 238);
-	case 110: memcpy_avx_64(dd - 110, ss - 110); memcpy_avx_64(dd - 64, ss - 64); break;
-	case 239: memcpy_avx_128(dd - 239, ss - 239);
-	case 111: memcpy_avx_64(dd - 111, ss - 111); memcpy_avx_64(dd - 64, ss - 64); break;
-	case 240: memcpy_avx_128(dd - 240, ss - 240);
-	case 112: memcpy_avx_64(dd - 112, ss - 112); memcpy_avx_64(dd - 64, ss - 64); break;
-	case 241: memcpy_avx_128(dd - 241, ss - 241);
-	case 113: memcpy_avx_64(dd - 113, ss - 113); memcpy_avx_64(dd - 64, ss - 64); break;
-	case 242: memcpy_avx_128(dd - 242, ss - 242);
-	case 114: memcpy_avx_64(dd - 114, ss - 114); memcpy_avx_64(dd - 64, ss - 64); break;
-	case 243: memcpy_avx_128(dd - 243, ss - 243);
-	case 115: memcpy_avx_64(dd - 115, ss - 115); memcpy_avx_64(dd - 64, ss - 64); break;
-	case 244: memcpy_avx_128(dd - 244, ss - 244);
-	case 116: memcpy_avx_64(dd - 116, ss - 116); memcpy_avx_64(dd - 64, ss - 64); break;
-	case 245: memcpy_avx_128(dd - 245, ss - 245);
-	case 117: memcpy_avx_64(dd - 117, ss - 117); memcpy_avx_64(dd - 64, ss - 64); break;
-	case 246: memcpy_avx_128(dd - 246, ss - 246);
-	case 118: memcpy_avx_64(dd - 118, ss - 118); memcpy_avx_64(dd - 64, ss - 64); break;
-	case 247: memcpy_avx_128(dd - 247, ss - 247);
-	case 119: memcpy_avx_64(dd - 119, ss - 119); memcpy_avx_64(dd - 64, ss - 64); break;
-	case 248: memcpy_avx_128(dd - 248, ss - 248);
-	case 120: memcpy_avx_64(dd - 120, ss - 120); memcpy_avx_64(dd - 64, ss - 64); break;
-	case 249: memcpy_avx_128(dd - 249, ss - 249);
-	case 121: memcpy_avx_64(dd - 121, ss - 121); memcpy_avx_64(dd - 64, ss - 64); break;
-	case 250: memcpy_avx_128(dd - 250, ss - 250);
-	case 122: memcpy_avx_64(dd - 122, ss - 122); memcpy_avx_64(dd - 64, ss - 64); break;
-	case 251: memcpy_avx_128(dd - 251, ss - 251);
-	case 123: memcpy_avx_64(dd - 123, ss - 123); memcpy_avx_64(dd - 64, ss - 64); break;
-	case 252: memcpy_avx_128(dd - 252, ss - 252);
-	case 124: memcpy_avx_64(dd - 124, ss - 124); memcpy_avx_64(dd - 64, ss - 64); break;
-	case 253: memcpy_avx_128(dd - 253, ss - 253);
-	case 125: memcpy_avx_64(dd - 125, ss - 125); memcpy_avx_64(dd - 64, ss - 64); break;
-	case 254: memcpy_avx_128(dd - 254, ss - 254);
-	case 126: memcpy_avx_64(dd - 126, ss - 126); memcpy_avx_64(dd - 64, ss - 64); break;
-	case 255: memcpy_avx_128(dd - 255, ss - 255);
-	case 127: memcpy_avx_64(dd - 127, ss - 127); memcpy_avx_64(dd - 64, ss - 64); break;
-	case 256: memcpy_avx_256(dd - 256, ss - 256); break;
-	}
-
-	return dst;
-}
-
-
-//---------------------------------------------------------------------
-// main routine
-//---------------------------------------------------------------------
-static void* memcpy_fast(void *destination, const void *source, size_t size)
-{
-	unsigned char *dst = (unsigned char*)destination;
-	const unsigned char *src = (const unsigned char*)source;
-	static size_t cachesize = 0x200000; // L3-cache size
-	size_t padding;
-
-	// small memory copy
-	if (size <= 256) {
-		memcpy_tiny(dst, src, size);
-		_mm256_zeroupper();
-		return destination;
-	}
-
-	// align destination to 16 bytes boundary
-	padding = (32 - (((size_t)dst) & 31)) & 31;
-
-#if 0
-	if (padding > 0) {
-		__m256i head = _mm256_loadu_si256((const __m256i*)src);
-		_mm256_storeu_si256((__m256i*)dst, head);
-		dst += padding;
-		src += padding;
-		size -= padding;
-	}
-#else
-	__m256i head = _mm256_loadu_si256((const __m256i*)src);
-	_mm256_storeu_si256((__m256i*)dst, head);
-	dst += padding;
-	src += padding;
-	size -= padding;
-#endif
-
-	// medium size copy
-	if (size <= cachesize) {
-		__m256i c0, c1, c2, c3, c4, c5, c6, c7;
-
-		for (; size >= 256; size -= 256) {
-			c0 = _mm256_loadu_si256(((const __m256i*)src) + 0);
-			c1 = _mm256_loadu_si256(((const __m256i*)src) + 1);
-			c2 = _mm256_loadu_si256(((const __m256i*)src) + 2);
-			c3 = _mm256_loadu_si256(((const __m256i*)src) + 3);
-			c4 = _mm256_loadu_si256(((const __m256i*)src) + 4);
-			c5 = _mm256_loadu_si256(((const __m256i*)src) + 5);
-			c6 = _mm256_loadu_si256(((const __m256i*)src) + 6);
-			c7 = _mm256_loadu_si256(((const __m256i*)src) + 7);
-			_mm_prefetch((const char*)(src + 512), _MM_HINT_NTA);
-			src += 256;
-			_mm256_storeu_si256((((__m256i*)dst) + 0), c0);
-			_mm256_storeu_si256((((__m256i*)dst) + 1), c1);
-			_mm256_storeu_si256((((__m256i*)dst) + 2), c2);
-			_mm256_storeu_si256((((__m256i*)dst) + 3), c3);
-			_mm256_storeu_si256((((__m256i*)dst) + 4), c4);
-			_mm256_storeu_si256((((__m256i*)dst) + 5), c5);
-			_mm256_storeu_si256((((__m256i*)dst) + 6), c6);
-			_mm256_storeu_si256((((__m256i*)dst) + 7), c7);
-			dst += 256;
-		}
-	}
-	else {		// big memory copy
-		__m256i c0, c1, c2, c3, c4, c5, c6, c7;
-		/* __m256i c0, c1, c2, c3, c4, c5, c6, c7; */
-
-		_mm_prefetch((const char*)(src), _MM_HINT_NTA);
-
-		if ((((size_t)src) & 31) == 0) {	// source aligned
-			for (; size >= 256; size -= 256) {
-				c0 = _mm256_load_si256(((const __m256i*)src) + 0);
-				c1 = _mm256_load_si256(((const __m256i*)src) + 1);
-				c2 = _mm256_load_si256(((const __m256i*)src) + 2);
-				c3 = _mm256_load_si256(((const __m256i*)src) + 3);
-				c4 = _mm256_load_si256(((const __m256i*)src) + 4);
-				c5 = _mm256_load_si256(((const __m256i*)src) + 5);
-				c6 = _mm256_load_si256(((const __m256i*)src) + 6);
-				c7 = _mm256_load_si256(((const __m256i*)src) + 7);
-				_mm_prefetch((const char*)(src + 512), _MM_HINT_NTA);
-				src += 256;
-				_mm256_stream_si256((((__m256i*)dst) + 0), c0);
-				_mm256_stream_si256((((__m256i*)dst) + 1), c1);
-				_mm256_stream_si256((((__m256i*)dst) + 2), c2);
-				_mm256_stream_si256((((__m256i*)dst) + 3), c3);
-				_mm256_stream_si256((((__m256i*)dst) + 4), c4);
-				_mm256_stream_si256((((__m256i*)dst) + 5), c5);
-				_mm256_stream_si256((((__m256i*)dst) + 6), c6);
-				_mm256_stream_si256((((__m256i*)dst) + 7), c7);
-				dst += 256;
-			}
-		}
-		else {							// source unaligned
-			for (; size >= 256; size -= 256) {
-				c0 = _mm256_loadu_si256(((const __m256i*)src) + 0);
-				c1 = _mm256_loadu_si256(((const __m256i*)src) + 1);
-				c2 = _mm256_loadu_si256(((const __m256i*)src) + 2);
-				c3 = _mm256_loadu_si256(((const __m256i*)src) + 3);
-				c4 = _mm256_loadu_si256(((const __m256i*)src) + 4);
-				c5 = _mm256_loadu_si256(((const __m256i*)src) + 5);
-				c6 = _mm256_loadu_si256(((const __m256i*)src) + 6);
-				c7 = _mm256_loadu_si256(((const __m256i*)src) + 7);
-				_mm_prefetch((const char*)(src + 512), _MM_HINT_NTA);
-				src += 256;
-				_mm256_stream_si256((((__m256i*)dst) + 0), c0);
-				_mm256_stream_si256((((__m256i*)dst) + 1), c1);
-				_mm256_stream_si256((((__m256i*)dst) + 2), c2);
-				_mm256_stream_si256((((__m256i*)dst) + 3), c3);
-				_mm256_stream_si256((((__m256i*)dst) + 4), c4);
-				_mm256_stream_si256((((__m256i*)dst) + 5), c5);
-				_mm256_stream_si256((((__m256i*)dst) + 6), c6);
-				_mm256_stream_si256((((__m256i*)dst) + 7), c7);
-				dst += 256;
-			}
-		}
-		_mm_sfence();
-	}
-
-	memcpy_tiny(dst, src, size);
-	_mm256_zeroupper();
-
-	return destination;
-}
-
-
-#endif
-
-
-
diff --git a/contrib/FastMemcpy/LICENSE b/contrib/FastMemcpy/LICENSE
deleted file mode 100644
index c449da6aa8a..00000000000
--- a/contrib/FastMemcpy/LICENSE
+++ /dev/null
@@ -1,22 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2015 Linwei
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
diff --git a/contrib/FastMemcpy/README.md b/contrib/FastMemcpy/README.md
deleted file mode 100644
index e253f6bf5dd..00000000000
--- a/contrib/FastMemcpy/README.md
+++ /dev/null
@@ -1,20 +0,0 @@
-Internal implementation of `memcpy` function.
-
-It has the following advantages over `libc`-supplied implementation:
-- it is linked statically, so the function is called directly, not through a `PLT` (procedure lookup table of shared library);
-- it is linked statically, so the function can have position-dependent code;
-- your binaries will not depend on `glibc`'s memcpy, that forces dependency on specific symbol version like `memcpy@@GLIBC_2.14` and consequently on specific version of `glibc` library;
-- you can include `memcpy.h` directly and the function has the chance to be inlined, which is beneficial for small but unknown at compile time sizes of memory regions;
-- this version of `memcpy` pretend to be faster (in our benchmarks, the difference is within few percents).
-
-Currently it uses the implementation from **Linwei** (skywind3000@163.com).
-Look at https://www.zhihu.com/question/35172305 for discussion.
-
-Drawbacks:
-- only use SSE 2, doesn't use wider (AVX, AVX 512) vector registers when available;
-- no CPU dispatching; doesn't take into account actual cache size.
-
-Also worth to look at:
-- simple implementation from Facebook: https://github.com/facebook/folly/blob/master/folly/memcpy.S
-- implementation from Agner Fog: http://www.agner.org/optimize/
-- glibc source code.
diff --git a/contrib/FastMemcpy/memcpy_wrapper.c b/contrib/FastMemcpy/memcpy_wrapper.c
deleted file mode 100644
index 1f57345980a..00000000000
--- a/contrib/FastMemcpy/memcpy_wrapper.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "FastMemcpy.h"
-
-void * memcpy(void * __restrict destination, const void * __restrict source, size_t size)
-{
-    return memcpy_fast(destination, source, size);
-}
diff --git a/contrib/NuRaft b/contrib/NuRaft
index 7adf7ae33e7..377f8e77491 160000
--- a/contrib/NuRaft
+++ b/contrib/NuRaft
@@ -1 +1 @@
-Subproject commit 7adf7ae33e7d5c307342431b577c8ab1025ee793
+Subproject commit 377f8e77491d9f66ce8e32e88aae19dffe8dc4d7
diff --git a/contrib/abseil-cpp-cmake/CMakeLists.txt b/contrib/abseil-cpp-cmake/CMakeLists.txt
new file mode 100644
index 00000000000..c8cb512066a
--- /dev/null
+++ b/contrib/abseil-cpp-cmake/CMakeLists.txt
@@ -0,0 +1,18 @@
+set(ABSL_ROOT_DIR "${ClickHouse_SOURCE_DIR}/contrib/abseil-cpp")
+if(NOT EXISTS "${ABSL_ROOT_DIR}/CMakeLists.txt")
+  message(FATAL_ERROR " submodule third_party/abseil-cpp is missing. To fix try run: \n git submodule update --init --recursive")
+endif()
+add_subdirectory("${ABSL_ROOT_DIR}" "${ClickHouse_BINARY_DIR}/contrib/abseil-cpp")
+
+add_library(abseil_swiss_tables INTERFACE)
+
+target_link_libraries(abseil_swiss_tables INTERFACE
+  absl::flat_hash_map
+  absl::flat_hash_set
+)
+
+get_target_property(FLAT_HASH_MAP_INCLUDE_DIR absl::flat_hash_map INTERFACE_INCLUDE_DIRECTORIES)
+target_include_directories (abseil_swiss_tables SYSTEM BEFORE INTERFACE ${FLAT_HASH_MAP_INCLUDE_DIR})
+
+get_target_property(FLAT_HASH_SET_INCLUDE_DIR absl::flat_hash_set INTERFACE_INCLUDE_DIRECTORIES)
+target_include_directories (abseil_swiss_tables SYSTEM BEFORE INTERFACE ${FLAT_HASH_SET_INCLUDE_DIR})
diff --git a/contrib/antlr4-runtime b/contrib/antlr4-runtime
index a2fa7b76e2e..672643e9a42 160000
--- a/contrib/antlr4-runtime
+++ b/contrib/antlr4-runtime
@@ -1 +1 @@
-Subproject commit a2fa7b76e2ee16d2ad955e9214a90bbf79da66fc
+Subproject commit 672643e9a427ef803abf13bc8cb4989606553d64
diff --git a/contrib/arrow b/contrib/arrow
index 744bdfe188f..616b3dc76a0 160000
--- a/contrib/arrow
+++ b/contrib/arrow
@@ -1 +1 @@
-Subproject commit 744bdfe188f018e5e05f5deebd4e9ee0a7706cf4
+Subproject commit 616b3dc76a0c8450b4027ded8a78e9619d7c845f
diff --git a/contrib/boost b/contrib/boost
index 48f40ebb539..a8d43d3142c 160000
--- a/contrib/boost
+++ b/contrib/boost
@@ -1 +1 @@
-Subproject commit 48f40ebb539220d328958f8823b094c0b07a4e79
+Subproject commit a8d43d3142cc6b26fc55bec33f7f6edb1156ab7a
diff --git a/contrib/boost-cmake/CMakeLists.txt b/contrib/boost-cmake/CMakeLists.txt
index b9298f59f2b..0759935a7db 100644
--- a/contrib/boost-cmake/CMakeLists.txt
+++ b/contrib/boost-cmake/CMakeLists.txt
@@ -160,6 +160,12 @@ if (NOT EXTERNAL_BOOST_FOUND)
     enable_language(ASM)
     SET(ASM_OPTIONS "-x assembler-with-cpp")
 
+    set (SRCS_CONTEXT
+        ${LIBRARY_DIR}/libs/context/src/dummy.cpp
+        ${LIBRARY_DIR}/libs/context/src/execution_context.cpp
+        ${LIBRARY_DIR}/libs/context/src/posix/stack_traits.cpp
+    )
+
     if (SANITIZE AND (SANITIZE STREQUAL "address" OR SANITIZE STREQUAL "thread"))
         add_compile_definitions(BOOST_USE_UCONTEXT)
 
@@ -169,39 +175,34 @@ if (NOT EXTERNAL_BOOST_FOUND)
             add_compile_definitions(BOOST_USE_TSAN)
         endif()
 
-        set (SRCS_CONTEXT
+        set (SRCS_CONTEXT ${SRCS_CONTEXT}
                 ${LIBRARY_DIR}/libs/context/src/fiber.cpp
                 ${LIBRARY_DIR}/libs/context/src/continuation.cpp
-                ${LIBRARY_DIR}/libs/context/src/dummy.cpp
-                ${LIBRARY_DIR}/libs/context/src/execution_context.cpp
-                ${LIBRARY_DIR}/libs/context/src/posix/stack_traits.cpp
         )
-    elseif (ARCH_ARM)
-        set (SRCS_CONTEXT
+    endif()
+    if (ARCH_ARM)
+        set (SRCS_CONTEXT ${SRCS_CONTEXT}
             ${LIBRARY_DIR}/libs/context/src/asm/jump_arm64_aapcs_elf_gas.S
             ${LIBRARY_DIR}/libs/context/src/asm/make_arm64_aapcs_elf_gas.S
             ${LIBRARY_DIR}/libs/context/src/asm/ontop_arm64_aapcs_elf_gas.S
-            ${LIBRARY_DIR}/libs/context/src/dummy.cpp
-            ${LIBRARY_DIR}/libs/context/src/execution_context.cpp
-            ${LIBRARY_DIR}/libs/context/src/posix/stack_traits.cpp
+        )
+    elseif (ARCH_PPC64LE)
+        set (SRCS_CONTEXT ${SRCS_CONTEXT}
+            ${LIBRARY_DIR}/libs/context/src/asm/jump_ppc64_sysv_elf_gas.S
+            ${LIBRARY_DIR}/libs/context/src/asm/make_ppc64_sysv_elf_gas.S
+            ${LIBRARY_DIR}/libs/context/src/asm/ontop_ppc64_sysv_elf_gas.S
         )
     elseif(OS_DARWIN)
-        set (SRCS_CONTEXT
+        set (SRCS_CONTEXT ${SRCS_CONTEXT}
             ${LIBRARY_DIR}/libs/context/src/asm/jump_x86_64_sysv_macho_gas.S
             ${LIBRARY_DIR}/libs/context/src/asm/make_x86_64_sysv_macho_gas.S
             ${LIBRARY_DIR}/libs/context/src/asm/ontop_x86_64_sysv_macho_gas.S
-            ${LIBRARY_DIR}/libs/context/src/dummy.cpp
-            ${LIBRARY_DIR}/libs/context/src/execution_context.cpp
-            ${LIBRARY_DIR}/libs/context/src/posix/stack_traits.cpp
         )
     else()
-        set (SRCS_CONTEXT
+        set (SRCS_CONTEXT ${SRCS_CONTEXT}
             ${LIBRARY_DIR}/libs/context/src/asm/jump_x86_64_sysv_elf_gas.S
             ${LIBRARY_DIR}/libs/context/src/asm/make_x86_64_sysv_elf_gas.S
             ${LIBRARY_DIR}/libs/context/src/asm/ontop_x86_64_sysv_elf_gas.S
-            ${LIBRARY_DIR}/libs/context/src/dummy.cpp
-            ${LIBRARY_DIR}/libs/context/src/execution_context.cpp
-            ${LIBRARY_DIR}/libs/context/src/posix/stack_traits.cpp
         )
     endif()
 
diff --git a/contrib/boringssl b/contrib/boringssl
index 8b2bf912ba0..83c1cda8a02 160000
--- a/contrib/boringssl
+++ b/contrib/boringssl
@@ -1 +1 @@
-Subproject commit 8b2bf912ba04823cfe9e7e8f5bb60cb7f6252449
+Subproject commit 83c1cda8a0224dc817cbad2966c7ed4acc35f02a
diff --git a/contrib/boringssl-cmake/CMakeLists.txt b/contrib/boringssl-cmake/CMakeLists.txt
index 017a8a64c0e..adfee82dda4 100644
--- a/contrib/boringssl-cmake/CMakeLists.txt
+++ b/contrib/boringssl-cmake/CMakeLists.txt
@@ -16,7 +16,7 @@ endif()
 
 if(CMAKE_COMPILER_IS_GNUCXX OR CLANG)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fvisibility=hidden -fno-common -fno-exceptions -fno-rtti")
-  if(APPLE)
+  if(APPLE AND CLANG)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
   endif()
 
diff --git a/contrib/brotli b/contrib/brotli
index 5805f99a533..63be8a99401 160000
--- a/contrib/brotli
+++ b/contrib/brotli
@@ -1 +1 @@
-Subproject commit 5805f99a533a8f8118699c0100d8c102f3605f65
+Subproject commit 63be8a99401992075c23e99f7c84de1c653e39e2
diff --git a/contrib/brotli-cmake/CMakeLists.txt b/contrib/brotli-cmake/CMakeLists.txt
index e22f4593c02..4c5f584de9d 100644
--- a/contrib/brotli-cmake/CMakeLists.txt
+++ b/contrib/brotli-cmake/CMakeLists.txt
@@ -2,6 +2,8 @@ set(BROTLI_SOURCE_DIR ${ClickHouse_SOURCE_DIR}/contrib/brotli/c)
 set(BROTLI_BINARY_DIR ${ClickHouse_BINARY_DIR}/contrib/brotli/c)
 
 set(SRCS
+    ${BROTLI_SOURCE_DIR}/enc/command.c
+    ${BROTLI_SOURCE_DIR}/enc/fast_log.c
     ${BROTLI_SOURCE_DIR}/dec/bit_reader.c
     ${BROTLI_SOURCE_DIR}/dec/state.c
     ${BROTLI_SOURCE_DIR}/dec/huffman.c
@@ -26,6 +28,9 @@ set(SRCS
     ${BROTLI_SOURCE_DIR}/enc/memory.c
     ${BROTLI_SOURCE_DIR}/common/dictionary.c
     ${BROTLI_SOURCE_DIR}/common/transform.c
+    ${BROTLI_SOURCE_DIR}/common/platform.c
+    ${BROTLI_SOURCE_DIR}/common/context.c
+    ${BROTLI_SOURCE_DIR}/common/constants.c
 )
 
 add_library(brotli ${SRCS})
diff --git a/contrib/cassandra b/contrib/cassandra
index b446d7eb68e..c097fb5c7e6 160000
--- a/contrib/cassandra
+++ b/contrib/cassandra
@@ -1 +1 @@
-Subproject commit b446d7eb68e6962f431e2b3771313bfe9a2bbd93
+Subproject commit c097fb5c7e63cc430016d9a8b240d8e63fbefa52
diff --git a/contrib/cctz-cmake/CMakeLists.txt b/contrib/cctz-cmake/CMakeLists.txt
index 90e33dc9f62..a3869478347 100644
--- a/contrib/cctz-cmake/CMakeLists.txt
+++ b/contrib/cctz-cmake/CMakeLists.txt
@@ -97,12 +97,19 @@ if (NOT EXTERNAL_CCTZ_LIBRARY_FOUND OR NOT EXTERNAL_CCTZ_LIBRARY_WORKS)
             set(TZ_OBJS ${TZ_OBJS} ${TZ_OBJ})
 
             # https://stackoverflow.com/questions/14776463/compile-and-add-an-object-file-from-a-binary-with-cmake
-            add_custom_command(OUTPUT ${TZ_OBJ}
-                COMMAND cp ${TZDIR}/${TIMEZONE} ${CMAKE_CURRENT_BINARY_DIR}/${TIMEZONE_ID}
-                COMMAND cd ${CMAKE_CURRENT_BINARY_DIR} && ${OBJCOPY_PATH} -I binary ${OBJCOPY_ARCH_OPTIONS}
+            # PPC64LE fails to do this with objcopy, use ld or lld instead
+            if (ARCH_PPC64LE)
+                add_custom_command(OUTPUT ${TZ_OBJ}
+                    COMMAND cp ${TZDIR}/${TIMEZONE} ${CMAKE_CURRENT_BINARY_DIR}/${TIMEZONE_ID}
+                    COMMAND cd ${CMAKE_CURRENT_BINARY_DIR} && ${CMAKE_LINKER} -m elf64lppc -r -b binary -o ${TZ_OBJ} ${TIMEZONE_ID}
+                    COMMAND rm ${CMAKE_CURRENT_BINARY_DIR}/${TIMEZONE_ID})
+            else()
+                add_custom_command(OUTPUT ${TZ_OBJ}
+                    COMMAND cp ${TZDIR}/${TIMEZONE} ${CMAKE_CURRENT_BINARY_DIR}/${TIMEZONE_ID}
+                    COMMAND cd ${CMAKE_CURRENT_BINARY_DIR} && ${OBJCOPY_PATH} -I binary ${OBJCOPY_ARCH_OPTIONS}
                             --rename-section .data=.rodata,alloc,load,readonly,data,contents ${TIMEZONE_ID} ${TZ_OBJ}
-                COMMAND rm ${CMAKE_CURRENT_BINARY_DIR}/${TIMEZONE_ID})
-
+                    COMMAND rm ${CMAKE_CURRENT_BINARY_DIR}/${TIMEZONE_ID})
+            endif()
             set_source_files_properties(${TZ_OBJ} PROPERTIES EXTERNAL_OBJECT true GENERATED true)
         endforeach(TIMEZONE)
 
diff --git a/contrib/datasketches-cpp b/contrib/datasketches-cpp
new file mode 160000
index 00000000000..f915d35b2de
--- /dev/null
+++ b/contrib/datasketches-cpp
@@ -0,0 +1 @@
+Subproject commit f915d35b2de676683493c86c585141a1e1c83334
diff --git a/contrib/flatbuffers b/contrib/flatbuffers
index 6df40a24717..22e3ffc66d2 160000
--- a/contrib/flatbuffers
+++ b/contrib/flatbuffers
@@ -1 +1 @@
-Subproject commit 6df40a2471737b27271bdd9b900ab5f3aec746c7
+Subproject commit 22e3ffc66d2d7d72d1414390aa0f04ffd114a5a1
diff --git a/contrib/googletest b/contrib/googletest
index 356f2d264a4..e7e591764ba 160000
--- a/contrib/googletest
+++ b/contrib/googletest
@@ -1 +1 @@
-Subproject commit 356f2d264a485db2fcc50ec1c672e0d37b6cb39b
+Subproject commit e7e591764baba0a0c3c9ad0014430e7a27331d16
diff --git a/contrib/grpc b/contrib/grpc
index 7436366ceb3..8d558f03fe3 160000
--- a/contrib/grpc
+++ b/contrib/grpc
@@ -1 +1 @@
-Subproject commit 7436366ceb341ba5c00ea29f1645e02a2b70bf93
+Subproject commit 8d558f03fe370240081424fafa76cdc9301ea14b
diff --git a/contrib/grpc-cmake/CMakeLists.txt b/contrib/grpc-cmake/CMakeLists.txt
index 97ca3fab4db..b93968f62f9 100644
--- a/contrib/grpc-cmake/CMakeLists.txt
+++ b/contrib/grpc-cmake/CMakeLists.txt
@@ -39,11 +39,6 @@ set(_gRPC_SSL_LIBRARIES ${OPENSSL_LIBRARIES})
 
 # Use abseil-cpp from ClickHouse contrib, not from gRPC third_party.
 set(gRPC_ABSL_PROVIDER "clickhouse" CACHE STRING "" FORCE)
-set(ABSL_ROOT_DIR "${ClickHouse_SOURCE_DIR}/contrib/abseil-cpp")
-if(NOT EXISTS "${ABSL_ROOT_DIR}/CMakeLists.txt")
-  message(FATAL_ERROR " grpc: submodule third_party/abseil-cpp is missing. To fix try run: \n git submodule update --init --recursive")
-endif()
-add_subdirectory("${ABSL_ROOT_DIR}" "${ClickHouse_BINARY_DIR}/contrib/abseil-cpp")
 
 # Choose to build static or shared library for c-ares.
 if (MAKE_STATIC_LIBRARIES)
diff --git a/contrib/jemalloc-cmake/CMakeLists.txt b/contrib/jemalloc-cmake/CMakeLists.txt
index b8a6474413a..f8cab3e548c 100644
--- a/contrib/jemalloc-cmake/CMakeLists.txt
+++ b/contrib/jemalloc-cmake/CMakeLists.txt
@@ -1,10 +1,13 @@
-if (SANITIZE OR NOT (ARCH_AMD64 OR ARCH_ARM) OR NOT (OS_LINUX OR OS_FREEBSD OR OS_DARWIN))
+if (SANITIZE OR NOT (
+    ((OS_LINUX OR OS_FREEBSD) AND (ARCH_AMD64 OR ARCH_ARM OR ARCH_PPC64LE)) OR
+    (OS_DARWIN AND CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
+))
     if (ENABLE_JEMALLOC)
         message (${RECONFIGURE_MESSAGE_LEVEL}
-                 "jemalloc is disabled implicitly: it doesn't work with sanitizers and can only be used with x86_64 or aarch64 on linux or freebsd.")
-    endif()
+                 "jemalloc is disabled implicitly: it doesn't work with sanitizers and can only be used with x86_64, aarch64, or ppc64le Linux or FreeBSD builds and RelWithDebInfo macOS builds.")
+    endif ()
     set (ENABLE_JEMALLOC OFF)
-else()
+else ()
     option (ENABLE_JEMALLOC "Enable jemalloc allocator" ${ENABLE_LIBRARIES})
 endif ()
 
@@ -34,9 +37,9 @@ if (OS_LINUX)
     # avoid spurious latencies and additional work associated with
     # MADV_DONTNEED. See
     # https://github.com/ClickHouse/ClickHouse/issues/11121 for motivation.
-    set (JEMALLOC_CONFIG_MALLOC_CONF "percpu_arena:percpu,oversize_threshold:0,muzzy_decay_ms:10000")
+    set (JEMALLOC_CONFIG_MALLOC_CONF "percpu_arena:percpu,oversize_threshold:0,muzzy_decay_ms:5000,dirty_decay_ms:5000")
 else()
-    set (JEMALLOC_CONFIG_MALLOC_CONF "oversize_threshold:0,muzzy_decay_ms:10000")
+    set (JEMALLOC_CONFIG_MALLOC_CONF "oversize_threshold:0,muzzy_decay_ms:5000,dirty_decay_ms:5000")
 endif()
 # CACHE variable is empty, to allow changing defaults without necessity
 # to purge cache
@@ -107,6 +110,8 @@ if (ARCH_AMD64)
     set(JEMALLOC_INCLUDE_PREFIX "${JEMALLOC_INCLUDE_PREFIX}_x86_64")
 elseif (ARCH_ARM)
     set(JEMALLOC_INCLUDE_PREFIX "${JEMALLOC_INCLUDE_PREFIX}_aarch64")
+elseif (ARCH_PPC64LE)
+    set(JEMALLOC_INCLUDE_PREFIX "${JEMALLOC_INCLUDE_PREFIX}_ppc64le")
 else ()
     message (FATAL_ERROR "internal jemalloc: This arch is not supported")
 endif ()
@@ -119,12 +124,14 @@ target_include_directories(jemalloc SYSTEM PRIVATE
 target_compile_definitions(jemalloc PRIVATE -DJEMALLOC_NO_PRIVATE_NAMESPACE)
 
 if (CMAKE_BUILD_TYPE_UC STREQUAL "DEBUG")
-    target_compile_definitions(jemalloc PRIVATE -DJEMALLOC_DEBUG=1 -DJEMALLOC_PROF=1)
+    target_compile_definitions(jemalloc PRIVATE -DJEMALLOC_DEBUG=1)
+endif ()
 
-    if (USE_UNWIND)
-        target_compile_definitions (jemalloc PRIVATE -DJEMALLOC_PROF_LIBUNWIND=1)
-        target_link_libraries (jemalloc PRIVATE unwind)
-    endif ()
+target_compile_definitions(jemalloc PRIVATE -DJEMALLOC_PROF=1)
+
+if (USE_UNWIND)
+    target_compile_definitions (jemalloc PRIVATE -DJEMALLOC_PROF_LIBUNWIND=1)
+    target_link_libraries (jemalloc PRIVATE unwind)
 endif ()
 
 target_compile_options(jemalloc PRIVATE -Wno-redundant-decls)
diff --git a/contrib/jemalloc-cmake/include_darwin_aarch64/jemalloc/internal/jemalloc_internal_defs.h.in b/contrib/jemalloc-cmake/include_darwin_aarch64/jemalloc/internal/jemalloc_internal_defs.h.in
index c7c884d0eaa..5c0407db24a 100644
--- a/contrib/jemalloc-cmake/include_darwin_aarch64/jemalloc/internal/jemalloc_internal_defs.h.in
+++ b/contrib/jemalloc-cmake/include_darwin_aarch64/jemalloc/internal/jemalloc_internal_defs.h.in
@@ -42,7 +42,7 @@
  * total number of bits in a pointer, e.g. on x64, for which the uppermost 16
  * bits are the same as bit 47.
  */
-#define LG_VADDR 48
+#define LG_VADDR 64
 
 /* Defined if C11 atomics are available. */
 #define JEMALLOC_C11_ATOMICS 1
@@ -101,11 +101,6 @@
  */
 #define JEMALLOC_HAVE_MACH_ABSOLUTE_TIME 1
 
-/*
- * Defined if clock_gettime(CLOCK_REALTIME, ...) is available.
- */
-#define JEMALLOC_HAVE_CLOCK_REALTIME 1
-
 /*
  * Defined if _malloc_thread_cleanup() exists.  At least in the case of
  * FreeBSD, pthread_key_create() allocates, which if used during malloc
@@ -181,14 +176,14 @@
 /* #undef LG_QUANTUM */
 
 /* One page is 2^LG_PAGE bytes. */
-#define LG_PAGE 16
+#define LG_PAGE 14
 
 /*
  * One huge page is 2^LG_HUGEPAGE bytes.  Note that this is defined even if the
  * system does not explicitly support huge pages; system calls that require
  * explicit huge page support are separately configured.
  */
-#define LG_HUGEPAGE 29
+#define LG_HUGEPAGE 21
 
 /*
  * If defined, adjacent virtual memory mappings with identical attributes
@@ -356,7 +351,7 @@
 /* #undef JEMALLOC_EXPORT */
 
 /* config.malloc_conf options string. */
-#define JEMALLOC_CONFIG_MALLOC_CONF "@JEMALLOC_CONFIG_MALLOC_CONF@"
+#define JEMALLOC_CONFIG_MALLOC_CONF ""
 
 /* If defined, jemalloc takes the malloc/free/etc. symbol names. */
 /* #undef JEMALLOC_IS_MALLOC */
diff --git a/contrib/jemalloc-cmake/include_linux_ppc64le/jemalloc/internal/jemalloc_internal_defs.h.in b/contrib/jemalloc-cmake/include_linux_ppc64le/jemalloc/internal/jemalloc_internal_defs.h.in
new file mode 100644
index 00000000000..8068861041f
--- /dev/null
+++ b/contrib/jemalloc-cmake/include_linux_ppc64le/jemalloc/internal/jemalloc_internal_defs.h.in
@@ -0,0 +1,367 @@
+/* include/jemalloc/internal/jemalloc_internal_defs.h.  Generated from jemalloc_internal_defs.h.in by configure.  */
+#ifndef JEMALLOC_INTERNAL_DEFS_H_
+#define JEMALLOC_INTERNAL_DEFS_H_
+/*
+ * If JEMALLOC_PREFIX is defined via --with-jemalloc-prefix, it will cause all
+ * public APIs to be prefixed.  This makes it possible, with some care, to use
+ * multiple allocators simultaneously.
+ */
+/* #undef JEMALLOC_PREFIX */
+/* #undef JEMALLOC_CPREFIX */
+
+/*
+ * Define overrides for non-standard allocator-related functions if they are
+ * present on the system.
+ */
+#define JEMALLOC_OVERRIDE___LIBC_CALLOC
+#define JEMALLOC_OVERRIDE___LIBC_FREE
+#define JEMALLOC_OVERRIDE___LIBC_MALLOC
+#define JEMALLOC_OVERRIDE___LIBC_MEMALIGN
+#define JEMALLOC_OVERRIDE___LIBC_REALLOC
+#define JEMALLOC_OVERRIDE___LIBC_VALLOC
+/* #undef JEMALLOC_OVERRIDE___POSIX_MEMALIGN */
+
+/*
+ * JEMALLOC_PRIVATE_NAMESPACE is used as a prefix for all library-private APIs.
+ * For shared libraries, symbol visibility mechanisms prevent these symbols
+ * from being exported, but for static libraries, naming collisions are a real
+ * possibility.
+ */
+#define JEMALLOC_PRIVATE_NAMESPACE je_
+
+/*
+ * Hyper-threaded CPUs may need a special instruction inside spin loops in
+ * order to yield to another virtual CPU.
+ */
+#define CPU_SPINWAIT
+/* 1 if CPU_SPINWAIT is defined, 0 otherwise. */
+#define HAVE_CPU_SPINWAIT 0
+
+/*
+ * Number of significant bits in virtual addresses.  This may be less than the
+ * total number of bits in a pointer, e.g. on x64, for which the uppermost 16
+ * bits are the same as bit 47.
+ */
+#define LG_VADDR 64
+
+/* Defined if C11 atomics are available. */
+#define JEMALLOC_C11_ATOMICS 1
+
+/* Defined if GCC __atomic atomics are available. */
+#define JEMALLOC_GCC_ATOMIC_ATOMICS 1
+/* and the 8-bit variant support. */
+#define JEMALLOC_GCC_U8_ATOMIC_ATOMICS 1
+
+/* Defined if GCC __sync atomics are available. */
+#define JEMALLOC_GCC_SYNC_ATOMICS 1
+/* and the 8-bit variant support. */
+#define JEMALLOC_GCC_U8_SYNC_ATOMICS 1
+
+/*
+ * Defined if __builtin_clz() and __builtin_clzl() are available.
+ */
+#define JEMALLOC_HAVE_BUILTIN_CLZ
+
+/*
+ * Defined if os_unfair_lock_*() functions are available, as provided by Darwin.
+ */
+/* #undef JEMALLOC_OS_UNFAIR_LOCK */
+
+/* Defined if syscall(2) is usable. */
+#define JEMALLOC_USE_SYSCALL
+
+/*
+ * Defined if secure_getenv(3) is available.
+ */
+// #define JEMALLOC_HAVE_SECURE_GETENV
+
+/*
+ * Defined if issetugid(2) is available.
+ */
+/* #undef JEMALLOC_HAVE_ISSETUGID */
+
+/* Defined if pthread_atfork(3) is available. */
+#define JEMALLOC_HAVE_PTHREAD_ATFORK
+
+/* Defined if pthread_setname_np(3) is available. */
+#define JEMALLOC_HAVE_PTHREAD_SETNAME_NP
+
+/*
+ * Defined if clock_gettime(CLOCK_MONOTONIC_COARSE, ...) is available.
+ */
+#define JEMALLOC_HAVE_CLOCK_MONOTONIC_COARSE 1
+
+/*
+ * Defined if clock_gettime(CLOCK_MONOTONIC, ...) is available.
+ */
+#define JEMALLOC_HAVE_CLOCK_MONOTONIC 1
+
+/*
+ * Defined if mach_absolute_time() is available.
+ */
+/* #undef JEMALLOC_HAVE_MACH_ABSOLUTE_TIME */
+
+/*
+ * Defined if _malloc_thread_cleanup() exists.  At least in the case of
+ * FreeBSD, pthread_key_create() allocates, which if used during malloc
+ * bootstrapping will cause recursion into the pthreads library.  Therefore, if
+ * _malloc_thread_cleanup() exists, use it as the basis for thread cleanup in
+ * malloc_tsd.
+ */
+/* #undef JEMALLOC_MALLOC_THREAD_CLEANUP */
+
+/*
+ * Defined if threaded initialization is known to be safe on this platform.
+ * Among other things, it must be possible to initialize a mutex without
+ * triggering allocation in order for threaded allocation to be safe.
+ */
+#define JEMALLOC_THREADED_INIT
+
+/*
+ * Defined if the pthreads implementation defines
+ * _pthread_mutex_init_calloc_cb(), in which case the function is used in order
+ * to avoid recursive allocation during mutex initialization.
+ */
+/* #undef JEMALLOC_MUTEX_INIT_CB */
+
+/* Non-empty if the tls_model attribute is supported. */
+#define JEMALLOC_TLS_MODEL __attribute__((tls_model("initial-exec")))
+
+/*
+ * JEMALLOC_DEBUG enables assertions and other sanity checks, and disables
+ * inline functions.
+ */
+/* #undef JEMALLOC_DEBUG */
+
+/* JEMALLOC_STATS enables statistics calculation. */
+#define JEMALLOC_STATS
+
+/* JEMALLOC_EXPERIMENTAL_SMALLOCX_API enables experimental smallocx API. */
+/* #undef JEMALLOC_EXPERIMENTAL_SMALLOCX_API */
+
+/* JEMALLOC_PROF enables allocation profiling. */
+/* #undef JEMALLOC_PROF */
+
+/* Use libunwind for profile backtracing if defined. */
+/* #undef JEMALLOC_PROF_LIBUNWIND */
+
+/* Use libgcc for profile backtracing if defined. */
+/* #undef JEMALLOC_PROF_LIBGCC */
+
+/* Use gcc intrinsics for profile backtracing if defined. */
+/* #undef JEMALLOC_PROF_GCC */
+
+/*
+ * JEMALLOC_DSS enables use of sbrk(2) to allocate extents from the data storage
+ * segment (DSS).
+ */
+#define JEMALLOC_DSS
+
+/* Support memory filling (junk/zero). */
+#define JEMALLOC_FILL
+
+/* Support utrace(2)-based tracing. */
+/* #undef JEMALLOC_UTRACE */
+
+/* Support optional abort() on OOM. */
+/* #undef JEMALLOC_XMALLOC */
+
+/* Support lazy locking (avoid locking unless a second thread is launched). */
+/* #undef JEMALLOC_LAZY_LOCK */
+
+/*
+ * Minimum allocation alignment is 2^LG_QUANTUM bytes (ignoring tiny size
+ * classes).
+ */
+/* #undef LG_QUANTUM */
+
+/* One page is 2^LG_PAGE bytes. */
+#define LG_PAGE 16
+
+/*
+ * One huge page is 2^LG_HUGEPAGE bytes.  Note that this is defined even if the
+ * system does not explicitly support huge pages; system calls that require
+ * explicit huge page support are separately configured.
+ */
+#define LG_HUGEPAGE 21
+
+/*
+ * If defined, adjacent virtual memory mappings with identical attributes
+ * automatically coalesce, and they fragment when changes are made to subranges.
+ * This is the normal order of things for mmap()/munmap(), but on Windows
+ * VirtualAlloc()/VirtualFree() operations must be precisely matched, i.e.
+ * mappings do *not* coalesce/fragment.
+ */
+#define JEMALLOC_MAPS_COALESCE
+
+/*
+ * If defined, retain memory for later reuse by default rather than using e.g.
+ * munmap() to unmap freed extents.  This is enabled on 64-bit Linux because
+ * common sequences of mmap()/munmap() calls will cause virtual memory map
+ * holes.
+ */
+#define JEMALLOC_RETAIN
+
+/* TLS is used to map arenas and magazine caches to threads. */
+#define JEMALLOC_TLS
+
+/*
+ * Used to mark unreachable code to quiet "end of non-void" compiler warnings.
+ * Don't use this directly; instead use unreachable() from util.h
+ */
+#define JEMALLOC_INTERNAL_UNREACHABLE __builtin_unreachable
+
+/*
+ * ffs*() functions to use for bitmapping.  Don't use these directly; instead,
+ * use ffs_*() from util.h.
+ */
+#define JEMALLOC_INTERNAL_FFSLL __builtin_ffsll
+#define JEMALLOC_INTERNAL_FFSL __builtin_ffsl
+#define JEMALLOC_INTERNAL_FFS __builtin_ffs
+
+/*
+ * popcount*() functions to use for bitmapping.
+ */
+#define JEMALLOC_INTERNAL_POPCOUNTL __builtin_popcountl
+#define JEMALLOC_INTERNAL_POPCOUNT __builtin_popcount
+
+/*
+ * If defined, explicitly attempt to more uniformly distribute large allocation
+ * pointer alignments across all cache indices.
+ */
+#define JEMALLOC_CACHE_OBLIVIOUS
+
+/*
+ * If defined, enable logging facilities.  We make this a configure option to
+ * avoid taking extra branches everywhere.
+ */
+/* #undef JEMALLOC_LOG */
+
+/*
+ * If defined, use readlinkat() (instead of readlink()) to follow
+ * /etc/malloc_conf.
+ */
+/* #undef JEMALLOC_READLINKAT */
+
+/*
+ * Darwin (OS X) uses zones to work around Mach-O symbol override shortcomings.
+ */
+/* #undef JEMALLOC_ZONE */
+
+/*
+ * Methods for determining whether the OS overcommits.
+ * JEMALLOC_PROC_SYS_VM_OVERCOMMIT_MEMORY: Linux's
+ *                                         /proc/sys/vm.overcommit_memory file.
+ * JEMALLOC_SYSCTL_VM_OVERCOMMIT: FreeBSD's vm.overcommit sysctl.
+ */
+/* #undef JEMALLOC_SYSCTL_VM_OVERCOMMIT */
+#define JEMALLOC_PROC_SYS_VM_OVERCOMMIT_MEMORY
+
+/* Defined if madvise(2) is available. */
+#define JEMALLOC_HAVE_MADVISE
+
+/*
+ * Defined if transparent huge pages are supported via the MADV_[NO]HUGEPAGE
+ * arguments to madvise(2).
+ */
+#define JEMALLOC_HAVE_MADVISE_HUGE
+
+/*
+ * Methods for purging unused pages differ between operating systems.
+ *
+ *   madvise(..., MADV_FREE) : This marks pages as being unused, such that they
+ *                             will be discarded rather than swapped out.
+ *   madvise(..., MADV_DONTNEED) : If JEMALLOC_PURGE_MADVISE_DONTNEED_ZEROS is
+ *                                 defined, this immediately discards pages,
+ *                                 such that new pages will be demand-zeroed if
+ *                                 the address region is later touched;
+ *                                 otherwise this behaves similarly to
+ *                                 MADV_FREE, though typically with higher
+ *                                 system overhead.
+ */
+#define JEMALLOC_PURGE_MADVISE_FREE
+#define JEMALLOC_PURGE_MADVISE_DONTNEED
+#define JEMALLOC_PURGE_MADVISE_DONTNEED_ZEROS
+
+/* Defined if madvise(2) is available but MADV_FREE is not (x86 Linux only). */
+/* #undef JEMALLOC_DEFINE_MADVISE_FREE */
+
+/*
+ * Defined if MADV_DO[NT]DUMP is supported as an argument to madvise.
+ */
+#define JEMALLOC_MADVISE_DONTDUMP
+
+/*
+ * Defined if transparent huge pages (THPs) are supported via the
+ * MADV_[NO]HUGEPAGE arguments to madvise(2), and THP support is enabled.
+ */
+/* #undef JEMALLOC_THP */
+
+/* Define if operating system has alloca.h header. */
+#define JEMALLOC_HAS_ALLOCA_H 1
+
+/* C99 restrict keyword supported. */
+#define JEMALLOC_HAS_RESTRICT 1
+
+/* For use by hash code. */
+/* #undef JEMALLOC_BIG_ENDIAN */
+
+/* sizeof(int) == 2^LG_SIZEOF_INT. */
+#define LG_SIZEOF_INT 2
+
+/* sizeof(long) == 2^LG_SIZEOF_LONG. */
+#define LG_SIZEOF_LONG 3
+
+/* sizeof(long long) == 2^LG_SIZEOF_LONG_LONG. */
+#define LG_SIZEOF_LONG_LONG 3
+
+/* sizeof(intmax_t) == 2^LG_SIZEOF_INTMAX_T. */
+#define LG_SIZEOF_INTMAX_T 3
+
+/* glibc malloc hooks (__malloc_hook, __realloc_hook, __free_hook). */
+#define JEMALLOC_GLIBC_MALLOC_HOOK
+
+/* glibc memalign hook. */
+#define JEMALLOC_GLIBC_MEMALIGN_HOOK
+
+/* pthread support */
+#define JEMALLOC_HAVE_PTHREAD
+
+/* dlsym() support */
+#define JEMALLOC_HAVE_DLSYM
+
+/* Adaptive mutex support in pthreads. */
+#define JEMALLOC_HAVE_PTHREAD_MUTEX_ADAPTIVE_NP
+
+/* GNU specific sched_getcpu support */
+#define JEMALLOC_HAVE_SCHED_GETCPU
+
+/* GNU specific sched_setaffinity support */
+#define JEMALLOC_HAVE_SCHED_SETAFFINITY
+
+/*
+ * If defined, all the features necessary for background threads are present.
+ */
+#define JEMALLOC_BACKGROUND_THREAD 1
+
+/*
+ * If defined, jemalloc symbols are not exported (doesn't work when
+ * JEMALLOC_PREFIX is not defined).
+ */
+/* #undef JEMALLOC_EXPORT */
+
+/* config.malloc_conf options string. */
+#define JEMALLOC_CONFIG_MALLOC_CONF "@JEMALLOC_CONFIG_MALLOC_CONF@"
+
+/* If defined, jemalloc takes the malloc/free/etc. symbol names. */
+#define JEMALLOC_IS_MALLOC 1
+
+/*
+ * Defined if strerror_r returns char * if _GNU_SOURCE is defined.
+ */
+#define JEMALLOC_STRERROR_R_RETURNS_CHAR_WITH_GNU_SOURCE
+
+/* Performs additional safety checks when defined. */
+/* #undef JEMALLOC_OPT_SAFETY_CHECKS */
+
+#endif /* JEMALLOC_INTERNAL_DEFS_H_ */
diff --git a/contrib/krb5-cmake/CMakeLists.txt b/contrib/krb5-cmake/CMakeLists.txt
index f88402df1fa..fce7fbc582a 100644
--- a/contrib/krb5-cmake/CMakeLists.txt
+++ b/contrib/krb5-cmake/CMakeLists.txt
@@ -474,13 +474,6 @@ add_custom_command(
     WORKING_DIRECTORY "${KRB5_SOURCE_DIR}/util/et"
 )
 
-add_custom_target(
-    CREATE_COMPILE_ET ALL
-    DEPENDS ${KRB5_SOURCE_DIR}/util/et/compile_et
-    COMMENT "creating compile_et"
-    VERBATIM
-)
-
 file(GLOB_RECURSE ET_FILES
     "${KRB5_SOURCE_DIR}/*.et"
 )
@@ -531,7 +524,7 @@ add_custom_command(
 
 
 add_custom_target(
-    ERROR_MAP_H ALL
+    ERROR_MAP_H
     DEPENDS ${KRB5_SOURCE_DIR}/lib/gssapi/krb5/error_map.h
     COMMENT "generating error_map.h"
     VERBATIM
@@ -544,14 +537,14 @@ add_custom_command(
 )
 
 add_custom_target(
-    ERRMAP_H ALL
+    ERRMAP_H
     DEPENDS ${KRB5_SOURCE_DIR}/lib/gssapi/generic/errmap.h
     COMMENT "generating errmap.h"
     VERBATIM
 )
 
 add_custom_target(
-    KRB_5_H ALL
+    KRB_5_H
     DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/include/krb5/krb5.h
     COMMENT "generating krb5.h"
     VERBATIM
@@ -564,15 +557,19 @@ add_dependencies(
     ERRMAP_H
     ERROR_MAP_H
     KRB_5_H
-    )
+)
 
 preprocess_et(processed_et_files ${ET_FILES})
 
-add_custom_command(
-    OUTPUT ${KRB5_SOURCE_DIR}/lib/gssapi/generic/errmap.h
-    COMMAND perl -w -I../../../util  ../../../util/gen.pl bimap errmap.h NAME=mecherrmap LEFT=OM_uint32 RIGHT=struct\ mecherror LEFTPRINT=print_OM_uint32 RIGHTPRINT=mecherror_print LEFTCMP=cmp_OM_uint32 RIGHTCMP=mecherror_cmp
-    WORKING_DIRECTORY "${KRB5_SOURCE_DIR}/lib/gssapi/generic"
-)
+if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
+    add_custom_command(
+        OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/include_private/kcmrpc.h ${CMAKE_CURRENT_BINARY_DIR}/include_private/kcmrpc.c
+        COMMAND mig -header kcmrpc.h -user kcmrpc.c -sheader /dev/null -server /dev/null -I${KRB5_SOURCE_DIR}/lib/krb5/ccache ${KRB5_SOURCE_DIR}/lib/krb5/ccache/kcmrpc.defs
+        WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/include_private"
+    )
+
+    list(APPEND ALL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/include_private/kcmrpc.c)
+endif()
 
 target_sources(${KRB5_LIBRARY} PRIVATE
     ${ALL_SRCS}
@@ -604,6 +601,25 @@ file(COPY ${KRB5_SOURCE_DIR}/util/et/com_err.h
     DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/include/
 )
 
+file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/osconf.h
+    DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/include_private/
+)
+
+file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/profile.h
+    DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/include_private/
+)
+
+string(TOLOWER "${CMAKE_SYSTEM_NAME}" _system_name)
+
+file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/autoconf_${_system_name}.h
+    DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/include_private/
+)
+
+file(RENAME
+    ${CMAKE_CURRENT_BINARY_DIR}/include_private/autoconf_${_system_name}.h
+    ${CMAKE_CURRENT_BINARY_DIR}/include_private/autoconf.h
+)
+
 file(MAKE_DIRECTORY
     ${CMAKE_CURRENT_BINARY_DIR}/include/krb5
 )
@@ -633,7 +649,7 @@ target_include_directories(${KRB5_LIBRARY} PUBLIC
 )
 
 target_include_directories(${KRB5_LIBRARY} PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}  #for autoconf.h
+    ${CMAKE_CURRENT_BINARY_DIR}/include_private # For autoconf.h and other generated headers.
     ${KRB5_SOURCE_DIR}
     ${KRB5_SOURCE_DIR}/include
     ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue
diff --git a/contrib/krb5-cmake/autoconf_darwin.h b/contrib/krb5-cmake/autoconf_darwin.h
new file mode 100644
index 00000000000..965e2f02997
--- /dev/null
+++ b/contrib/krb5-cmake/autoconf_darwin.h
@@ -0,0 +1,764 @@
+/* include/autoconf.h.  Generated from autoconf.h.in by configure.  */
+/* include/autoconf.h.in.  Generated from configure.in by autoheader.  */
+
+
+#ifndef KRB5_AUTOCONF_H
+#define KRB5_AUTOCONF_H
+
+
+/* Define if AES-NI support is enabled */
+/* #undef AESNI */
+
+/* Define if socket can't be bound to 0.0.0.0 */
+/* #undef BROKEN_STREAMS_SOCKETS */
+
+/* Define if va_list objects can be simply copied by assignment. */
+/* #undef CAN_COPY_VA_LIST */
+
+/* Define to reduce code size even if it means more cpu usage */
+/* #undef CONFIG_SMALL */
+
+/* Define if __attribute__((constructor)) works */
+#define CONSTRUCTOR_ATTR_WORKS 1
+
+/* Define to default ccache name */
+#define DEFCCNAME "FILE:/tmp/krb5cc_%{uid}"
+
+/* Define to default client keytab name */
+#define DEFCKTNAME "FILE:/etc/krb5/user/%{euid}/client.keytab"
+
+/* Define to default keytab name */
+#define DEFKTNAME "FILE:/etc/krb5.keytab"
+
+/* Define if library initialization should be delayed until first use */
+#define DELAY_INITIALIZER 1
+
+/* Define if __attribute__((destructor)) works */
+#define DESTRUCTOR_ATTR_WORKS 1
+
+/* Define to disable PKINIT plugin support */
+#define DISABLE_PKINIT 1
+
+/* Define if LDAP KDB support within the Kerberos library (mainly ASN.1 code)
+   should be enabled. */
+/* #undef ENABLE_LDAP */
+
+/* Define if translation functions should be used. */
+/* #undef ENABLE_NLS */
+
+/* Define if thread support enabled */
+#define ENABLE_THREADS 1
+
+/* Define as return type of endrpcent */
+#define ENDRPCENT_TYPE void
+
+/* Define if Fortuna PRNG is selected */
+#define FORTUNA 1
+
+/* Define to the type of elements in the array set by `getgroups'. Usually
+   this is either `int' or `gid_t'. */
+#define GETGROUPS_T gid_t
+
+/* Define if gethostbyname_r returns int rather than struct hostent * */
+/* #undef GETHOSTBYNAME_R_RETURNS_INT */
+
+/* Type of getpeername second argument. */
+#define GETPEERNAME_ARG3_TYPE GETSOCKNAME_ARG3_TYPE
+
+/* Define if getpwnam_r exists but takes only 4 arguments (e.g., POSIX draft 6
+   implementations like some Solaris releases). */
+/* #undef GETPWNAM_R_4_ARGS */
+
+/* Define if getpwnam_r returns an int */
+#define GETPWNAM_R_RETURNS_INT 1
+
+/* Define if getpwuid_r exists but takes only 4 arguments (e.g., POSIX draft 6
+   implementations like some Solaris releases). */
+/* #undef GETPWUID_R_4_ARGS */
+
+/* Define if getservbyname_r returns int rather than struct servent * */
+/* #undef GETSERVBYNAME_R_RETURNS_INT */
+
+/* Type of pointer target for argument 3 to getsockname */
+#define GETSOCKNAME_ARG3_TYPE socklen_t
+
+/* Define if gmtime_r returns int instead of struct tm pointer, as on old
+   HP-UX systems. */
+/* #undef GMTIME_R_RETURNS_INT */
+
+/* Define if va_copy macro or function is available. */
+#define HAS_VA_COPY 1
+
+/* Define to 1 if you have the `access' function. */
+#define HAVE_ACCESS 1
+
+/* Define to 1 if you have the <alloca.h> header file. */
+#define HAVE_ALLOCA_H 1
+
+/* Define to 1 if you have the <arpa/inet.h> header file. */
+#define HAVE_ARPA_INET_H 1
+
+/* Define to 1 if you have the `bswap16' function. */
+/* #undef HAVE_BSWAP16 */
+
+/* Define to 1 if you have the `bswap64' function. */
+/* #undef HAVE_BSWAP64 */
+
+/* Define to 1 if bswap_16 is available via byteswap.h */
+/* #undef HAVE_BSWAP_16 */
+
+/* Define to 1 if bswap_64 is available via byteswap.h */
+/* #undef HAVE_BSWAP_64 */
+
+/* Define if bt_rseq is available, for recursive btree traversal. */
+#define HAVE_BT_RSEQ 1
+
+/* Define to 1 if you have the <byteswap.h> header file. */
+/* #undef HAVE_BYTESWAP_H */
+
+/* Define to 1 if you have the `chmod' function. */
+#define HAVE_CHMOD 1
+
+/* Define if cmocka library is available. */
+/* #undef HAVE_CMOCKA */
+
+/* Define to 1 if you have the `compile' function. */
+/* #undef HAVE_COMPILE */
+
+/* Define if com_err has compatible gettext support */
+#define HAVE_COM_ERR_INTL 1
+
+/* Define to 1 if you have the <cpuid.h> header file. */
+/* #undef HAVE_CPUID_H */
+
+/* Define to 1 if you have the `daemon' function. */
+#define HAVE_DAEMON 1
+
+/* Define to 1 if you have the declaration of `strerror_r', and to 0 if you
+   don't. */
+#define HAVE_DECL_STRERROR_R 1
+
+/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
+   */
+#define HAVE_DIRENT_H 1
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define to 1 if you have the `dn_skipname' function. */
+#define HAVE_DN_SKIPNAME 1
+
+/* Define to 1 if you have the <endian.h> header file. */
+/* #undef HAVE_ENDIAN_H */
+
+/* Define to 1 if you have the <errno.h> header file. */
+#define HAVE_ERRNO_H 1
+
+/* Define to 1 if you have the `fchmod' function. */
+#define HAVE_FCHMOD 1
+
+/* Define to 1 if you have the <fcntl.h> header file. */
+#define HAVE_FCNTL_H 1
+
+/* Define to 1 if you have the `flock' function. */
+#define HAVE_FLOCK 1
+
+/* Define to 1 if you have the `fnmatch' function. */
+#define HAVE_FNMATCH 1
+
+/* Define to 1 if you have the <fnmatch.h> header file. */
+#define HAVE_FNMATCH_H 1
+
+/* Define if you have the getaddrinfo function */
+#define HAVE_GETADDRINFO 1
+
+/* Define to 1 if you have the `getcwd' function. */
+#define HAVE_GETCWD 1
+
+/* Define to 1 if you have the `getenv' function. */
+#define HAVE_GETENV 1
+
+/* Define to 1 if you have the `geteuid' function. */
+#define HAVE_GETEUID 1
+
+/* Define if gethostbyname_r exists and its return type is known */
+/* #undef HAVE_GETHOSTBYNAME_R */
+
+/* Define to 1 if you have the `getnameinfo' function. */
+#define HAVE_GETNAMEINFO 1
+
+/* Define if system getopt should be used. */
+#define HAVE_GETOPT 1
+
+/* Define if system getopt_long should be used. */
+#define HAVE_GETOPT_LONG 1
+
+/* Define if getpwnam_r is available and useful. */
+#define HAVE_GETPWNAM_R 1
+
+/* Define if getpwuid_r is available and useful. */
+#define HAVE_GETPWUID_R 1
+
+/* Define if getservbyname_r exists and its return type is known */
+/* #undef HAVE_GETSERVBYNAME_R */
+
+/* Have the gettimeofday function */
+#define HAVE_GETTIMEOFDAY 1
+
+/* Define to 1 if you have the `getusershell' function. */
+#define HAVE_GETUSERSHELL 1
+
+/* Define to 1 if you have the `gmtime_r' function. */
+#define HAVE_GMTIME_R 1
+
+/* Define to 1 if you have the <ifaddrs.h> header file. */
+#define HAVE_IFADDRS_H 1
+
+/* Define to 1 if you have the `inet_ntop' function. */
+#define HAVE_INET_NTOP 1
+
+/* Define to 1 if you have the `inet_pton' function. */
+#define HAVE_INET_PTON 1
+
+/* Define to 1 if the system has the type `int16_t'. */
+#define HAVE_INT16_T 1
+
+/* Define to 1 if the system has the type `int32_t'. */
+#define HAVE_INT32_T 1
+
+/* Define to 1 if the system has the type `int8_t'. */
+#define HAVE_INT8_T 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the <keyutils.h> header file. */
+/* #undef HAVE_KEYUTILS_H */
+
+/* Define to 1 if you have the <lber.h> header file. */
+/* #undef HAVE_LBER_H */
+
+/* Define to 1 if you have the <ldap.h> header file. */
+/* #undef HAVE_LDAP_H */
+
+/* Define to 1 if you have the `crypto' library (-lcrypto). */
+#define HAVE_LIBCRYPTO 1
+
+/* Define if building with libedit. */
+/* #undef HAVE_LIBEDIT */
+
+/* Define to 1 if you have the `nsl' library (-lnsl). */
+/* #undef HAVE_LIBNSL */
+
+/* Define to 1 if you have the `resolv' library (-lresolv). */
+#define HAVE_LIBRESOLV 1
+
+/* Define to 1 if you have the `socket' library (-lsocket). */
+/* #undef HAVE_LIBSOCKET */
+
+/* Define if the util library is available */
+#define HAVE_LIBUTIL 1
+
+/* Define to 1 if you have the <limits.h> header file. */
+#define HAVE_LIMITS_H 1
+
+/* Define to 1 if you have the `localtime_r' function. */
+#define HAVE_LOCALTIME_R 1
+
+/* Define to 1 if you have the <machine/byte_order.h> header file. */
+#define HAVE_MACHINE_BYTE_ORDER_H 1
+
+/* Define to 1 if you have the <machine/endian.h> header file. */
+#define HAVE_MACHINE_ENDIAN_H 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the `mkstemp' function. */
+#define HAVE_MKSTEMP 1
+
+/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
+/* #undef HAVE_NDIR_H */
+
+/* Define to 1 if you have the <netdb.h> header file. */
+#define HAVE_NETDB_H 1
+
+/* Define if netdb.h declares h_errno */
+#define HAVE_NETDB_H_H_ERRNO 1
+
+/* Define to 1 if you have the <netinet/in.h> header file. */
+#define HAVE_NETINET_IN_H 1
+
+/* Define to 1 if you have the `ns_initparse' function. */
+#define HAVE_NS_INITPARSE 1
+
+/* Define to 1 if you have the `ns_name_uncompress' function. */
+#define HAVE_NS_NAME_UNCOMPRESS 1
+
+/* Define if OpenSSL supports cms. */
+#define HAVE_OPENSSL_CMS 1
+
+/* Define to 1 if you have the <paths.h> header file. */
+#define HAVE_PATHS_H 1
+
+/* Define if persistent keyrings are supported */
+/* #undef HAVE_PERSISTENT_KEYRING */
+
+/* Define to 1 if you have the <poll.h> header file. */
+#define HAVE_POLL_H 1
+
+/* Define if #pragma weak references work */
+/* #undef HAVE_PRAGMA_WEAK_REF */
+
+/* Define if you have POSIX threads libraries and header files. */
+#define HAVE_PTHREAD 1
+
+/* Define to 1 if you have the `pthread_once' function. */
+#define HAVE_PTHREAD_ONCE 1
+
+/* Have PTHREAD_PRIO_INHERIT. */
+#define HAVE_PTHREAD_PRIO_INHERIT 1
+
+/* Define to 1 if you have the `pthread_rwlock_init' function. */
+#define HAVE_PTHREAD_RWLOCK_INIT 1
+
+/* Define if pthread_rwlock_init is provided in the thread library. */
+#define HAVE_PTHREAD_RWLOCK_INIT_IN_THREAD_LIB 1
+
+/* Define to 1 if you have the <pwd.h> header file. */
+#define HAVE_PWD_H 1
+
+/* Define if building with GNU Readline. */
+/* #undef HAVE_READLINE */
+
+/* Define if regcomp exists and functions */
+#define HAVE_REGCOMP 1
+
+/* Define to 1 if you have the `regexec' function. */
+#define HAVE_REGEXEC 1
+
+/* Define to 1 if you have the <regexpr.h> header file. */
+/* #undef HAVE_REGEXPR_H */
+
+/* Define to 1 if you have the <regex.h> header file. */
+#define HAVE_REGEX_H 1
+
+/* Define to 1 if you have the `res_nclose' function. */
+#define HAVE_RES_NCLOSE 1
+
+/* Define to 1 if you have the `res_ndestroy' function. */
+#define HAVE_RES_NDESTROY 1
+
+/* Define to 1 if you have the `res_ninit' function. */
+#define HAVE_RES_NINIT 1
+
+/* Define to 1 if you have the `res_nsearch' function. */
+#define HAVE_RES_NSEARCH 1
+
+/* Define to 1 if you have the `res_search' function */
+#define HAVE_RES_SEARCH 1
+
+/* Define to 1 if you have the `re_comp' function. */
+/* #undef HAVE_RE_COMP */
+
+/* Define to 1 if you have the `re_exec' function. */
+/* #undef HAVE_RE_EXEC */
+
+/* Define to 1 if you have the <sasl/sasl.h> header file. */
+/* #undef HAVE_SASL_SASL_H */
+
+/* Define if struct sockaddr contains sa_len */
+#define HAVE_SA_LEN 1
+
+/* Define to 1 if you have the `setegid' function. */
+#define HAVE_SETEGID 1
+
+/* Define to 1 if you have the `setenv' function. */
+#define HAVE_SETENV 1
+
+/* Define to 1 if you have the `seteuid' function. */
+#define HAVE_SETEUID 1
+
+/* Define if setluid provided in OSF/1 security library */
+/* #undef HAVE_SETLUID */
+
+/* Define to 1 if you have the `setregid' function. */
+#define HAVE_SETREGID 1
+
+/* Define to 1 if you have the `setresgid' function. */
+/* #undef HAVE_SETRESGID */
+
+/* Define to 1 if you have the `setresuid' function. */
+/* #undef HAVE_SETRESUID */
+
+/* Define to 1 if you have the `setreuid' function. */
+#define HAVE_SETREUID 1
+
+/* Define to 1 if you have the `setsid' function. */
+#define HAVE_SETSID 1
+
+/* Define to 1 if you have the `setvbuf' function. */
+#define HAVE_SETVBUF 1
+
+/* Define if there is a socklen_t type. If not, probably use size_t */
+#define HAVE_SOCKLEN_T 1
+
+/* Define to 1 if you have the `srand' function. */
+#define HAVE_SRAND 1
+
+/* Define to 1 if you have the `srand48' function. */
+#define HAVE_SRAND48 1
+
+/* Define to 1 if you have the `srandom' function. */
+#define HAVE_SRANDOM 1
+
+/* Define to 1 if the system has the type `ssize_t'. */
+#define HAVE_SSIZE_T 1
+
+/* Define to 1 if you have the `stat' function. */
+#define HAVE_STAT 1
+
+/* Define to 1 if you have the <stddef.h> header file. */
+#define HAVE_STDDEF_H 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the `step' function. */
+/* #undef HAVE_STEP */
+
+/* Define to 1 if you have the `strchr' function. */
+#define HAVE_STRCHR 1
+
+/* Define to 1 if you have the `strdup' function. */
+#define HAVE_STRDUP 1
+
+/* Define to 1 if you have the `strerror' function. */
+#define HAVE_STRERROR 1
+
+/* Define to 1 if you have the `strerror_r' function. */
+#define HAVE_STRERROR_R 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the `strlcpy' function. */
+#define HAVE_STRLCPY 1
+
+/* Define to 1 if you have the `strptime' function. */
+#define HAVE_STRPTIME 1
+
+/* Define to 1 if the system has the type `struct cmsghdr'. */
+#define HAVE_STRUCT_CMSGHDR 1
+
+/* Define if there is a struct if_laddrconf. */
+/* #undef HAVE_STRUCT_IF_LADDRCONF */
+
+/* Define to 1 if the system has the type `struct in6_pktinfo'. */
+#define HAVE_STRUCT_IN6_PKTINFO 1
+
+/* Define to 1 if the system has the type `struct in_pktinfo'. */
+#define HAVE_STRUCT_IN_PKTINFO 1
+
+/* Define if there is a struct lifconf. */
+/* #undef HAVE_STRUCT_LIFCONF */
+
+/* Define to 1 if the system has the type `struct rt_msghdr'. */
+#define HAVE_STRUCT_RT_MSGHDR 1
+
+/* Define to 1 if the system has the type `struct sockaddr_storage'. */
+#define HAVE_STRUCT_SOCKADDR_STORAGE 1
+
+/* Define to 1 if `st_mtimensec' is a member of `struct stat'. */
+/* #undef HAVE_STRUCT_STAT_ST_MTIMENSEC */
+
+/* Define to 1 if `st_mtimespec.tv_nsec' is a member of `struct stat'. */
+#define HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC 1
+
+/* Define to 1 if `st_mtim.tv_nsec' is a member of `struct stat'. */
+/* #undef HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC */
+
+/* Define to 1 if you have the <sys/bswap.h> header file. */
+/* #undef HAVE_SYS_BSWAP_H */
+
+/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
+   */
+/* #undef HAVE_SYS_DIR_H */
+
+/* Define if sys_errlist in libc */
+#define HAVE_SYS_ERRLIST 1
+
+/* Define to 1 if you have the <sys/file.h> header file. */
+#define HAVE_SYS_FILE_H 1
+
+/* Define to 1 if you have the <sys/filio.h> header file. */
+#define HAVE_SYS_FILIO_H 1
+
+/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
+   */
+/* #undef HAVE_SYS_NDIR_H */
+
+/* Define to 1 if you have the <sys/param.h> header file. */
+#define HAVE_SYS_PARAM_H 1
+
+/* Define to 1 if you have the <sys/select.h> header file. */
+#define HAVE_SYS_SELECT_H 1
+
+/* Define to 1 if you have the <sys/socket.h> header file. */
+#define HAVE_SYS_SOCKET_H 1
+
+/* Define to 1 if you have the <sys/sockio.h> header file. */
+#define HAVE_SYS_SOCKIO_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#define HAVE_SYS_TIME_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <sys/uio.h> header file. */
+#define HAVE_SYS_UIO_H 1
+
+/* Define if tcl.h found */
+/* #undef HAVE_TCL_H */
+
+/* Define if tcl/tcl.h found */
+/* #undef HAVE_TCL_TCL_H */
+
+/* Define to 1 if you have the `timegm' function. */
+#define HAVE_TIMEGM 1
+
+/* Define to 1 if you have the <time.h> header file. */
+#define HAVE_TIME_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to 1 if you have the `unsetenv' function. */
+#define HAVE_UNSETENV 1
+
+/* Define to 1 if the system has the type `u_char'. */
+#define HAVE_U_CHAR 1
+
+/* Define to 1 if the system has the type `u_int'. */
+#define HAVE_U_INT 1
+
+/* Define to 1 if the system has the type `u_int16_t'. */
+#define HAVE_U_INT16_T 1
+
+/* Define to 1 if the system has the type `u_int32_t'. */
+#define HAVE_U_INT32_T 1
+
+/* Define to 1 if the system has the type `u_int8_t'. */
+#define HAVE_U_INT8_T 1
+
+/* Define to 1 if the system has the type `u_long'. */
+#define HAVE_U_LONG 1
+
+/* Define to 1 if you have the `vasprintf' function. */
+#define HAVE_VASPRINTF 1
+
+/* Define to 1 if you have the `vsnprintf' function. */
+#define HAVE_VSNPRINTF 1
+
+/* Define to 1 if you have the `vsprintf' function. */
+#define HAVE_VSPRINTF 1
+
+/* Define to 1 if the system has the type `__int128_t'. */
+#define HAVE___INT128_T 1
+
+/* Define to 1 if the system has the type `__uint128_t'. */
+#define HAVE___UINT128_T 1
+
+/* Define if errno.h declares perror */
+/* #undef HDR_HAS_PERROR */
+
+/* May need to be defined to enable IPv6 support, for example on IRIX */
+/* #undef INET6 */
+
+/* Define if MIT Project Athena default configuration should be used */
+/* #undef KRB5_ATHENA_COMPAT */
+
+/* Define for DNS support of locating realms and KDCs */
+#undef KRB5_DNS_LOOKUP
+
+/* Define to enable DNS lookups of Kerberos realm names */
+/* #undef KRB5_DNS_LOOKUP_REALM */
+
+/* Define if the KDC should return only vague error codes to clients */
+/* #undef KRBCONF_VAGUE_ERRORS */
+
+/* define if the system header files are missing prototype for daemon() */
+#define NEED_DAEMON_PROTO 1
+
+/* Define if in6addr_any is not defined in libc */
+#define NEED_INSIXADDR_ANY 1
+
+/* define if the system header files are missing prototype for
+   ss_execute_command() */
+/* #undef NEED_SS_EXECUTE_COMMAND_PROTO */
+
+/* define if the system header files are missing prototype for strptime() */
+/* #undef NEED_STRPTIME_PROTO */
+
+/* define if the system header files are missing prototype for swab() */
+/* #undef NEED_SWAB_PROTO */
+
+/* Define if need to declare sys_errlist */
+/* #undef NEED_SYS_ERRLIST */
+
+/* define if the system header files are missing prototype for vasprintf() */
+/* #undef NEED_VASPRINTF_PROTO */
+
+/* Define if the KDC should use no lookaside cache */
+/* #undef NOCACHE */
+
+/* Define if references to pthread routines should be non-weak. */
+/* #undef NO_WEAK_PTHREADS */
+
+/* Define if lex produes code with yylineno */
+/* #undef NO_YYLINENO */
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "krb5-bugs@mit.edu"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "Kerberos 5"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "Kerberos 5 1.17.1"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "krb5"
+
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "1.17.1"
+
+/* Define if setjmp indicates POSIX interface */
+#define POSIX_SETJMP 1
+
+/* Define if POSIX signal handling is used */
+#define POSIX_SIGNALS 1
+
+/* Define if POSIX signal handlers are used */
+#define POSIX_SIGTYPE 1
+
+/* Define if termios.h exists and tcsetattr exists */
+#define POSIX_TERMIOS 1
+
+/* Define to necessary symbol if this constant uses a non-standard name on
+   your system. */
+/* #undef PTHREAD_CREATE_JOINABLE */
+
+/* Define as the return type of signal handlers (`int' or `void'). */
+#define RETSIGTYPE void
+
+/* Define as return type of setrpcent */
+#define SETRPCENT_TYPE void
+
+/* The size of `size_t', as computed by sizeof. */
+#define SIZEOF_SIZE_T 8
+
+/* The size of `time_t', as computed by sizeof. */
+#define SIZEOF_TIME_T 8
+
+/* Define to use OpenSSL for SPAKE preauth */
+#define SPAKE_OPENSSL 1
+
+/* Define for static plugin linkage */
+/* #undef STATIC_PLUGINS */
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Define to 1 if strerror_r returns char *. */
+/* #undef STRERROR_R_CHAR_P */
+
+/* Define if sys_errlist is defined in errno.h */
+#define SYS_ERRLIST_DECLARED 1
+
+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+#define TIME_WITH_SYS_TIME 1
+
+/* Define if no TLS implementation is selected */
+/* #undef TLS_IMPL_NONE */
+
+/* Define if TLS implementation is OpenSSL */
+#define TLS_IMPL_OPENSSL 1
+
+/* Define if you have dirent.h functionality */
+#define USE_DIRENT_H 1
+
+/* Define if dlopen should be used */
+#define USE_DLOPEN 1
+
+/* Define if the keyring ccache should be enabled */
+/* #undef USE_KEYRING_CCACHE */
+
+/* Define if link-time options for library finalization will be used */
+/* #undef USE_LINKER_FINI_OPTION */
+
+/* Define if link-time options for library initialization will be used */
+/* #undef USE_LINKER_INIT_OPTION */
+
+/* Define if sigprocmask should be used */
+#define USE_SIGPROCMASK 1
+
+/* Define if wait takes int as a argument */
+#define WAIT_USES_INT 1
+
+/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
+   `char[]'. */
+#define YYTEXT_POINTER 1
+
+/* Define to enable extensions in glibc */
+#define _GNU_SOURCE 1
+
+/* Define to enable C11 extensions */
+#define __STDC_WANT_LIB_EXT1__ 1
+
+/* Define to empty if `const' does not conform to ANSI C. */
+/* #undef const */
+
+/* Define to `int' if <sys/types.h> doesn't define. */
+/* #undef gid_t */
+
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
+/* #undef inline */
+#endif
+
+/* Define krb5_sigtype to type of signal handler */
+#define krb5_sigtype void
+
+/* Define to `int' if <sys/types.h> does not define. */
+/* #undef mode_t */
+
+/* Define to `long int' if <sys/types.h> does not define. */
+/* #undef off_t */
+
+/* Define to `long' if <sys/types.h> does not define. */
+/* #undef time_t */
+
+/* Define to `int' if <sys/types.h> doesn't define. */
+/* #undef uid_t */
+
+
+#if defined(__GNUC__) && !defined(inline)
+/* Silence gcc pedantic warnings about ANSI C.  */
+# define inline __inline__
+#endif
+#endif /* KRB5_AUTOCONF_H */
diff --git a/contrib/krb5-cmake/autoconf.h b/contrib/krb5-cmake/autoconf_linux.h
similarity index 100%
rename from contrib/krb5-cmake/autoconf.h
rename to contrib/krb5-cmake/autoconf_linux.h
diff --git a/contrib/libcpuid-cmake/CMakeLists.txt b/contrib/libcpuid-cmake/CMakeLists.txt
index 8c1be50b4e6..9baebb3ba1b 100644
--- a/contrib/libcpuid-cmake/CMakeLists.txt
+++ b/contrib/libcpuid-cmake/CMakeLists.txt
@@ -1,11 +1,9 @@
-if (NOT ARCH_ARM)
+if(ARCH_AMD64)
     option (ENABLE_CPUID "Enable libcpuid library (only internal)" ${ENABLE_LIBRARIES})
-endif()
-
-if (ARCH_ARM AND ENABLE_CPUID)
-    message (${RECONFIGURE_MESSAGE_LEVEL} "cpuid is not supported on ARM")
+elseif(ENABLE_CPUID)
+    message (${RECONFIGURE_MESSAGE_LEVEL} "libcpuid is only supported on x86_64")
     set (ENABLE_CPUID 0)
-endif ()
+endif()
 
 if (NOT ENABLE_CPUID)
     add_library (cpuid INTERFACE)
diff --git a/contrib/libcxx b/contrib/libcxx
index 8b80a151d12..2fa892f69ac 160000
--- a/contrib/libcxx
+++ b/contrib/libcxx
@@ -1 +1 @@
-Subproject commit 8b80a151d12b98ffe2d0c22f7cec12c3b9ff88d7
+Subproject commit 2fa892f69acbaa40f8a18c6484854a6183a34482
diff --git a/contrib/libcxx-cmake/CMakeLists.txt b/contrib/libcxx-cmake/CMakeLists.txt
index 3b5d53cd1c0..59d23b2cd9e 100644
--- a/contrib/libcxx-cmake/CMakeLists.txt
+++ b/contrib/libcxx-cmake/CMakeLists.txt
@@ -56,6 +56,11 @@ if (USE_UNWIND)
     target_compile_definitions(cxx PUBLIC -DSTD_EXCEPTION_HAS_STACK_TRACE=1)
 endif ()
 
+# Override the deduced attribute support that causes error.
+if (OS_DARWIN AND COMPILER_GCC)
+    add_compile_definitions(_LIBCPP_INIT_PRIORITY_MAX)
+endif ()
+
 target_compile_options(cxx PUBLIC $<$<COMPILE_LANGUAGE:CXX>:-nostdinc++>)
 
 # Third party library may have substandard code.
diff --git a/contrib/libdivide/libdivide.h b/contrib/libdivide/libdivide.h
index 81057b7b43d..33d210310a1 100644
--- a/contrib/libdivide/libdivide.h
+++ b/contrib/libdivide/libdivide.h
@@ -18,78 +18,79 @@
 #include <stdint.h>
 
 #if defined(__cplusplus)
-    #include <cstdlib>
-    #include <cstdio>
-    #include <type_traits>
+#include <cstdio>
+#include <cstdlib>
+#include <type_traits>
 #else
-    #include <stdlib.h>
-    #include <stdio.h>
+#include <stdio.h>
+#include <stdlib.h>
 #endif
 
-#if defined(LIBDIVIDE_AVX512)
-    #include <immintrin.h>
-#elif defined(LIBDIVIDE_AVX2)
-    #include <immintrin.h>
-#elif defined(LIBDIVIDE_SSE2)
-    #include <emmintrin.h>
+#if defined(LIBDIVIDE_SSE2)
+#include <emmintrin.h>
+#endif
+#if defined(LIBDIVIDE_AVX2) || defined(LIBDIVIDE_AVX512)
+#include <immintrin.h>
+#endif
+#if defined(LIBDIVIDE_NEON)
+#include <arm_neon.h>
 #endif
 
 #if defined(_MSC_VER)
-    #include <intrin.h>
-    // disable warning C4146: unary minus operator applied
-    // to unsigned type, result still unsigned
-    #pragma warning(disable: 4146)
-    #define LIBDIVIDE_VC
+#include <intrin.h>
+// disable warning C4146: unary minus operator applied
+// to unsigned type, result still unsigned
+#pragma warning(disable : 4146)
+#define LIBDIVIDE_VC
 #endif
 
 #if !defined(__has_builtin)
-    #define __has_builtin(x) 0
+#define __has_builtin(x) 0
 #endif
 
 #if defined(__SIZEOF_INT128__)
-    #define HAS_INT128_T
-    // clang-cl on Windows does not yet support 128-bit division
-    #if !(defined(__clang__) && defined(LIBDIVIDE_VC))
-        #define HAS_INT128_DIV
-    #endif
+#define HAS_INT128_T
+// clang-cl on Windows does not yet support 128-bit division
+#if !(defined(__clang__) && defined(LIBDIVIDE_VC))
+#define HAS_INT128_DIV
+#endif
 #endif
 
 #if defined(__x86_64__) || defined(_M_X64)
-    #define LIBDIVIDE_X86_64
+#define LIBDIVIDE_X86_64
 #endif
 
 #if defined(__i386__)
-    #define LIBDIVIDE_i386
+#define LIBDIVIDE_i386
 #endif
 
 #if defined(__GNUC__) || defined(__clang__)
-    #define LIBDIVIDE_GCC_STYLE_ASM
+#define LIBDIVIDE_GCC_STYLE_ASM
 #endif
 
 #if defined(__cplusplus) || defined(LIBDIVIDE_VC)
-    #define LIBDIVIDE_FUNCTION __FUNCTION__
+#define LIBDIVIDE_FUNCTION __FUNCTION__
 #else
-    #define LIBDIVIDE_FUNCTION __func__
+#define LIBDIVIDE_FUNCTION __func__
 #endif
 
-#define LIBDIVIDE_ERROR(msg) \
-    do { \
-        fprintf(stderr, "libdivide.h:%d: %s(): Error: %s\n", \
-            __LINE__, LIBDIVIDE_FUNCTION, msg); \
-        abort(); \
+#define LIBDIVIDE_ERROR(msg)                                                                     \
+    do {                                                                                         \
+        fprintf(stderr, "libdivide.h:%d: %s(): Error: %s\n", __LINE__, LIBDIVIDE_FUNCTION, msg); \
+        abort();                                                                                 \
     } while (0)
 
 #if defined(LIBDIVIDE_ASSERTIONS_ON)
-    #define LIBDIVIDE_ASSERT(x) \
-        do { \
-            if (!(x)) { \
-                fprintf(stderr, "libdivide.h:%d: %s(): Assertion failed: %s\n", \
-                    __LINE__, LIBDIVIDE_FUNCTION, #x); \
-                abort(); \
-            } \
-        } while (0)
+#define LIBDIVIDE_ASSERT(x)                                                           \
+    do {                                                                              \
+        if (!(x)) {                                                                   \
+            fprintf(stderr, "libdivide.h:%d: %s(): Assertion failed: %s\n", __LINE__, \
+                LIBDIVIDE_FUNCTION, #x);                                              \
+            abort();                                                                  \
+        }                                                                             \
+    } while (0)
 #else
-    #define LIBDIVIDE_ASSERT(x)
+#define LIBDIVIDE_ASSERT(x)
 #endif
 
 #ifdef __cplusplus
@@ -193,25 +194,33 @@ static inline struct libdivide_u32_branchfree_t libdivide_u32_branchfree_gen(uin
 static inline struct libdivide_s64_branchfree_t libdivide_s64_branchfree_gen(int64_t d);
 static inline struct libdivide_u64_branchfree_t libdivide_u64_branchfree_gen(uint64_t d);
 
-static inline int32_t  libdivide_s32_do(int32_t numer, const struct libdivide_s32_t *denom);
+static inline int32_t libdivide_s32_do(int32_t numer, const struct libdivide_s32_t *denom);
 static inline uint32_t libdivide_u32_do(uint32_t numer, const struct libdivide_u32_t *denom);
-static inline int64_t  libdivide_s64_do(int64_t numer, const struct libdivide_s64_t *denom);
+static inline int64_t libdivide_s64_do(int64_t numer, const struct libdivide_s64_t *denom);
 static inline uint64_t libdivide_u64_do(uint64_t numer, const struct libdivide_u64_t *denom);
 
-static inline int32_t  libdivide_s32_branchfree_do(int32_t numer, const struct libdivide_s32_branchfree_t *denom);
-static inline uint32_t libdivide_u32_branchfree_do(uint32_t numer, const struct libdivide_u32_branchfree_t *denom);
-static inline int64_t  libdivide_s64_branchfree_do(int64_t numer, const struct libdivide_s64_branchfree_t *denom);
-static inline uint64_t libdivide_u64_branchfree_do(uint64_t numer, const struct libdivide_u64_branchfree_t *denom);
+static inline int32_t libdivide_s32_branchfree_do(
+    int32_t numer, const struct libdivide_s32_branchfree_t *denom);
+static inline uint32_t libdivide_u32_branchfree_do(
+    uint32_t numer, const struct libdivide_u32_branchfree_t *denom);
+static inline int64_t libdivide_s64_branchfree_do(
+    int64_t numer, const struct libdivide_s64_branchfree_t *denom);
+static inline uint64_t libdivide_u64_branchfree_do(
+    uint64_t numer, const struct libdivide_u64_branchfree_t *denom);
 
-static inline int32_t  libdivide_s32_recover(const struct libdivide_s32_t *denom);
+static inline int32_t libdivide_s32_recover(const struct libdivide_s32_t *denom);
 static inline uint32_t libdivide_u32_recover(const struct libdivide_u32_t *denom);
-static inline int64_t  libdivide_s64_recover(const struct libdivide_s64_t *denom);
+static inline int64_t libdivide_s64_recover(const struct libdivide_s64_t *denom);
 static inline uint64_t libdivide_u64_recover(const struct libdivide_u64_t *denom);
 
-static inline int32_t  libdivide_s32_branchfree_recover(const struct libdivide_s32_branchfree_t *denom);
-static inline uint32_t libdivide_u32_branchfree_recover(const struct libdivide_u32_branchfree_t *denom);
-static inline int64_t  libdivide_s64_branchfree_recover(const struct libdivide_s64_branchfree_t *denom);
-static inline uint64_t libdivide_u64_branchfree_recover(const struct libdivide_u64_branchfree_t *denom);
+static inline int32_t libdivide_s32_branchfree_recover(
+    const struct libdivide_s32_branchfree_t *denom);
+static inline uint32_t libdivide_u32_branchfree_recover(
+    const struct libdivide_u32_branchfree_t *denom);
+static inline int64_t libdivide_s64_branchfree_recover(
+    const struct libdivide_s64_branchfree_t *denom);
+static inline uint64_t libdivide_u64_branchfree_recover(
+    const struct libdivide_u64_branchfree_t *denom);
 
 //////// Internal Utility Functions
 
@@ -229,8 +238,7 @@ static inline int32_t libdivide_mullhi_s32(int32_t x, int32_t y) {
 }
 
 static inline uint64_t libdivide_mullhi_u64(uint64_t x, uint64_t y) {
-#if defined(LIBDIVIDE_VC) && \
-    defined(LIBDIVIDE_X86_64)
+#if defined(LIBDIVIDE_VC) && defined(LIBDIVIDE_X86_64)
     return __umulh(x, y);
 #elif defined(HAS_INT128_T)
     __uint128_t xl = x, yl = y;
@@ -256,8 +264,7 @@ static inline uint64_t libdivide_mullhi_u64(uint64_t x, uint64_t y) {
 }
 
 static inline int64_t libdivide_mullhi_s64(int64_t x, int64_t y) {
-#if defined(LIBDIVIDE_VC) && \
-    defined(LIBDIVIDE_X86_64)
+#if defined(LIBDIVIDE_VC) && defined(LIBDIVIDE_X86_64)
     return __mulh(x, y);
 #elif defined(HAS_INT128_T)
     __int128_t xl = x, yl = y;
@@ -279,8 +286,7 @@ static inline int64_t libdivide_mullhi_s64(int64_t x, int64_t y) {
 }
 
 static inline int32_t libdivide_count_leading_zeros32(uint32_t val) {
-#if defined(__GNUC__) || \
-    __has_builtin(__builtin_clz)
+#if defined(__GNUC__) || __has_builtin(__builtin_clz)
     // Fast way to count leading zeros
     return __builtin_clz(val);
 #elif defined(LIBDIVIDE_VC)
@@ -290,8 +296,7 @@ static inline int32_t libdivide_count_leading_zeros32(uint32_t val) {
     }
     return 0;
 #else
-    if (val == 0)
-        return 32;
+    if (val == 0) return 32;
     int32_t result = 8;
     uint32_t hi = 0xFFU << 24;
     while ((val & hi) == 0) {
@@ -307,8 +312,7 @@ static inline int32_t libdivide_count_leading_zeros32(uint32_t val) {
 }
 
 static inline int32_t libdivide_count_leading_zeros64(uint64_t val) {
-#if defined(__GNUC__) || \
-    __has_builtin(__builtin_clzll)
+#if defined(__GNUC__) || __has_builtin(__builtin_clzll)
     // Fast way to count leading zeros
     return __builtin_clzll(val);
 #elif defined(LIBDIVIDE_VC) && defined(_WIN64)
@@ -328,14 +332,11 @@ static inline int32_t libdivide_count_leading_zeros64(uint64_t val) {
 // libdivide_64_div_32_to_32: divides a 64-bit uint {u1, u0} by a 32-bit
 // uint {v}. The result must fit in 32 bits.
 // Returns the quotient directly and the remainder in *r
-static inline uint32_t libdivide_64_div_32_to_32(uint32_t u1, uint32_t u0, uint32_t v, uint32_t *r) {
-#if (defined(LIBDIVIDE_i386) || defined(LIBDIVIDE_X86_64)) && \
-     defined(LIBDIVIDE_GCC_STYLE_ASM)
+static inline uint32_t libdivide_64_div_32_to_32(
+    uint32_t u1, uint32_t u0, uint32_t v, uint32_t *r) {
+#if (defined(LIBDIVIDE_i386) || defined(LIBDIVIDE_X86_64)) && defined(LIBDIVIDE_GCC_STYLE_ASM)
     uint32_t result;
-    __asm__("divl %[v]"
-            : "=a"(result), "=d"(*r)
-            : [v] "r"(v), "a"(u0), "d"(u1)
-            );
+    __asm__("divl %[v]" : "=a"(result), "=d"(*r) : [v] "r"(v), "a"(u0), "d"(u1));
     return result;
 #else
     uint64_t n = ((uint64_t)u1 << 32) | u0;
@@ -349,19 +350,13 @@ static inline uint32_t libdivide_64_div_32_to_32(uint32_t u1, uint32_t u0, uint3
 // uint {v}. The result must fit in 64 bits.
 // Returns the quotient directly and the remainder in *r
 static uint64_t libdivide_128_div_64_to_64(uint64_t u1, uint64_t u0, uint64_t v, uint64_t *r) {
-#if defined(LIBDIVIDE_X86_64) && \
-    defined(LIBDIVIDE_GCC_STYLE_ASM)
+    // N.B. resist the temptation to use __uint128_t here.
+    // In LLVM compiler-rt, it performs a 128/128 -> 128 division which is many times slower than
+    // necessary. In gcc it's better but still slower than the divlu implementation, perhaps because
+    // it's not inlined.
+#if defined(LIBDIVIDE_X86_64) && defined(LIBDIVIDE_GCC_STYLE_ASM)
     uint64_t result;
-    __asm__("divq %[v]"
-            : "=a"(result), "=d"(*r)
-            : [v] "r"(v), "a"(u0), "d"(u1)
-            );
-    return result;
-#elif defined(HAS_INT128_T) && \
-      defined(HAS_INT128_DIV)
-    __uint128_t n = ((__uint128_t)u1 << 64) | u0;
-    uint64_t result = (uint64_t)(n / v);
-    *r = (uint64_t)(n - result * (__uint128_t)v);
+    __asm__("divq %[v]" : "=a"(result), "=d"(*r) : [v] "r"(v), "a"(u0), "d"(u1));
     return result;
 #else
     // Code taken from Hacker's Delight:
@@ -369,19 +364,19 @@ static uint64_t libdivide_128_div_64_to_64(uint64_t u1, uint64_t u0, uint64_t v,
     // License permits inclusion here per:
     // http://www.hackersdelight.org/permissions.htm
 
-    const uint64_t b = (1ULL << 32); // Number base (32 bits)
-    uint64_t un1, un0; // Norm. dividend LSD's
-    uint64_t vn1, vn0; // Norm. divisor digits
-    uint64_t q1, q0; // Quotient digits
-    uint64_t un64, un21, un10; // Dividend digit pairs
-    uint64_t rhat; // A remainder
-    int32_t s; // Shift amount for norm
+    const uint64_t b = (1ULL << 32);  // Number base (32 bits)
+    uint64_t un1, un0;                // Norm. dividend LSD's
+    uint64_t vn1, vn0;                // Norm. divisor digits
+    uint64_t q1, q0;                  // Quotient digits
+    uint64_t un64, un21, un10;        // Dividend digit pairs
+    uint64_t rhat;                    // A remainder
+    int32_t s;                        // Shift amount for norm
 
     // If overflow, set rem. to an impossible value,
     // and return the largest possible quotient
     if (u1 >= v) {
-        *r = (uint64_t) -1;
-        return (uint64_t) -1;
+        *r = (uint64_t)-1;
+        return (uint64_t)-1;
     }
 
     // count leading zeros
@@ -390,7 +385,7 @@ static uint64_t libdivide_128_div_64_to_64(uint64_t u1, uint64_t u0, uint64_t v,
         // Normalize divisor
         v = v << s;
         un64 = (u1 << s) | (u0 >> (64 - s));
-        un10 = u0 << s; // Shift dividend left
+        un10 = u0 << s;  // Shift dividend left
     } else {
         // Avoid undefined behavior of (u0 >> 64).
         // The behavior is undefined if the right operand is
@@ -415,11 +410,10 @@ static uint64_t libdivide_128_div_64_to_64(uint64_t u1, uint64_t u0, uint64_t v,
     while (q1 >= b || q1 * vn0 > b * rhat + un1) {
         q1 = q1 - 1;
         rhat = rhat + vn1;
-        if (rhat >= b)
-            break;
+        if (rhat >= b) break;
     }
 
-     // Multiply and subtract
+    // Multiply and subtract
     un21 = un64 * b + un1 - q1 * v;
 
     // Compute the second quotient digit
@@ -429,8 +423,7 @@ static uint64_t libdivide_128_div_64_to_64(uint64_t u1, uint64_t u0, uint64_t v,
     while (q0 >= b || q0 * vn0 > b * rhat + un0) {
         q0 = q0 - 1;
         rhat = rhat + vn1;
-        if (rhat >= b)
-            break;
+        if (rhat >= b) break;
     }
 
     *r = (un21 * b + un0 - q0 * v) >> s;
@@ -445,8 +438,7 @@ static inline void libdivide_u128_shift(uint64_t *u1, uint64_t *u0, int32_t sign
         *u1 <<= shift;
         *u1 |= *u0 >> (64 - shift);
         *u0 <<= shift;
-    }
-    else if (signed_shift < 0) {
+    } else if (signed_shift < 0) {
         uint32_t shift = -signed_shift;
         *u0 >>= shift;
         *u0 |= *u1 << (64 - shift);
@@ -455,9 +447,9 @@ static inline void libdivide_u128_shift(uint64_t *u1, uint64_t *u0, int32_t sign
 }
 
 // Computes a 128 / 128 -> 64 bit division, with a 128 bit remainder.
-static uint64_t libdivide_128_div_128_to_64(uint64_t u_hi, uint64_t u_lo, uint64_t v_hi, uint64_t v_lo, uint64_t *r_hi, uint64_t *r_lo) {
-#if defined(HAS_INT128_T) && \
-    defined(HAS_INT128_DIV)
+static uint64_t libdivide_128_div_128_to_64(
+    uint64_t u_hi, uint64_t u_lo, uint64_t v_hi, uint64_t v_lo, uint64_t *r_hi, uint64_t *r_lo) {
+#if defined(HAS_INT128_T) && defined(HAS_INT128_DIV)
     __uint128_t ufull = u_hi;
     __uint128_t vfull = v_hi;
     ufull = (ufull << 64) | u_lo;
@@ -470,7 +462,10 @@ static uint64_t libdivide_128_div_128_to_64(uint64_t u_hi, uint64_t u_lo, uint64
 #else
     // Adapted from "Unsigned Doubleword Division" in Hacker's Delight
     // We want to compute u / v
-    typedef struct { uint64_t hi; uint64_t lo; } u128_t;
+    typedef struct {
+        uint64_t hi;
+        uint64_t lo;
+    } u128_t;
     u128_t u = {u_hi, u_lo};
     u128_t v = {v_hi, v_lo};
 
@@ -490,7 +485,7 @@ static uint64_t libdivide_128_div_128_to_64(uint64_t u_hi, uint64_t u_lo, uint64
     // Normalize the divisor so its MSB is 1
     u128_t v1t = v;
     libdivide_u128_shift(&v1t.hi, &v1t.lo, n);
-    uint64_t v1 = v1t.hi; // i.e. v1 = v1t >> 64
+    uint64_t v1 = v1t.hi;  // i.e. v1 = v1t >> 64
 
     // To ensure no overflow
     u128_t u1 = u;
@@ -508,7 +503,7 @@ static uint64_t libdivide_128_div_128_to_64(uint64_t u_hi, uint64_t u_lo, uint64
     // Make q0 correct or too small by 1
     // Equivalent to `if (q0 != 0) q0 = q0 - 1;`
     if (q0.hi != 0 || q0.lo != 0) {
-        q0.hi -= (q0.lo == 0); // borrow
+        q0.hi -= (q0.lo == 0);  // borrow
         q0.lo -= 1;
     }
 
@@ -520,22 +515,21 @@ static uint64_t libdivide_128_div_128_to_64(uint64_t u_hi, uint64_t u_lo, uint64
     // Each term is 128 bit
     // High half of full product (upper 128 bits!) are dropped
     u128_t q0v = {0, 0};
-    q0v.hi = q0.hi*v.lo + q0.lo*v.hi + libdivide_mullhi_u64(q0.lo, v.lo);
-    q0v.lo = q0.lo*v.lo;
+    q0v.hi = q0.hi * v.lo + q0.lo * v.hi + libdivide_mullhi_u64(q0.lo, v.lo);
+    q0v.lo = q0.lo * v.lo;
 
     // Compute u - q0v as u_q0v
     // This is the remainder
     u128_t u_q0v = u;
-    u_q0v.hi -= q0v.hi + (u.lo < q0v.lo); // second term is borrow
+    u_q0v.hi -= q0v.hi + (u.lo < q0v.lo);  // second term is borrow
     u_q0v.lo -= q0v.lo;
 
     // Check if u_q0v >= v
     // This checks if our remainder is larger than the divisor
-    if ((u_q0v.hi > v.hi) ||
-        (u_q0v.hi == v.hi && u_q0v.lo >= v.lo)) {
+    if ((u_q0v.hi > v.hi) || (u_q0v.hi == v.hi && u_q0v.lo >= v.lo)) {
         // Increment q0
         q0.lo += 1;
-        q0.hi += (q0.lo == 0); // carry
+        q0.hi += (q0.lo == 0);  // carry
 
         // Subtract v from remainder
         u_q0v.hi -= v.hi + (u_q0v.lo < v.lo);
@@ -611,7 +605,8 @@ struct libdivide_u32_branchfree_t libdivide_u32_branchfree_gen(uint32_t d) {
         LIBDIVIDE_ERROR("branchfree divider must be != 1");
     }
     struct libdivide_u32_t tmp = libdivide_internal_u32_gen(d, 1);
-    struct libdivide_u32_branchfree_t ret = {tmp.magic, (uint8_t)(tmp.more & LIBDIVIDE_32_SHIFT_MASK)};
+    struct libdivide_u32_branchfree_t ret = {
+        tmp.magic, (uint8_t)(tmp.more & LIBDIVIDE_32_SHIFT_MASK)};
     return ret;
 }
 
@@ -619,14 +614,12 @@ uint32_t libdivide_u32_do(uint32_t numer, const struct libdivide_u32_t *denom) {
     uint8_t more = denom->more;
     if (!denom->magic) {
         return numer >> more;
-    }
-    else {
+    } else {
         uint32_t q = libdivide_mullhi_u32(denom->magic, numer);
         if (more & LIBDIVIDE_ADD_MARKER) {
             uint32_t t = ((numer - q) >> 1) + q;
             return t >> (more & LIBDIVIDE_32_SHIFT_MASK);
-        }
-        else {
+        } else {
             // All upper bits are 0,
             // don't need to mask them off.
             return q >> more;
@@ -634,7 +627,8 @@ uint32_t libdivide_u32_do(uint32_t numer, const struct libdivide_u32_t *denom) {
     }
 }
 
-uint32_t libdivide_u32_branchfree_do(uint32_t numer, const struct libdivide_u32_branchfree_t *denom) {
+uint32_t libdivide_u32_branchfree_do(
+    uint32_t numer, const struct libdivide_u32_branchfree_t *denom) {
     uint32_t q = libdivide_mullhi_u32(denom->magic, numer);
     uint32_t t = ((numer - q) >> 1) + q;
     return t >> denom->more;
@@ -671,7 +665,7 @@ uint32_t libdivide_u32_recover(const struct libdivide_u32_t *denom) {
         // Need to double it, and then add 1 to the quotient if doubling th
         // remainder would increase the quotient.
         // Note that rem<<1 cannot overflow, since rem < d and d is 33 bits
-        uint32_t full_q = half_q + half_q + ((rem<<1) >= d);
+        uint32_t full_q = half_q + half_q + ((rem << 1) >= d);
 
         // We rounded down in gen (hence +1)
         return full_q + 1;
@@ -700,7 +694,7 @@ uint32_t libdivide_u32_branchfree_recover(const struct libdivide_u32_branchfree_
         // Need to double it, and then add 1 to the quotient if doubling th
         // remainder would increase the quotient.
         // Note that rem<<1 cannot overflow, since rem < d and d is 33 bits
-        uint32_t full_q = half_q + half_q + ((rem<<1) >= d);
+        uint32_t full_q = half_q + half_q + ((rem << 1) >= d);
 
         // We rounded down in gen (hence +1)
         return full_q + 1;
@@ -747,7 +741,7 @@ static inline struct libdivide_u64_t libdivide_internal_u64_gen(uint64_t d, int
             proposed_m += proposed_m;
             const uint64_t twice_rem = rem + rem;
             if (twice_rem >= d || twice_rem < rem) proposed_m += 1;
-                more = floor_log_2_d | LIBDIVIDE_ADD_MARKER;
+            more = floor_log_2_d | LIBDIVIDE_ADD_MARKER;
         }
         result.magic = 1 + proposed_m;
         result.more = more;
@@ -770,7 +764,8 @@ struct libdivide_u64_branchfree_t libdivide_u64_branchfree_gen(uint64_t d) {
         LIBDIVIDE_ERROR("branchfree divider must be != 1");
     }
     struct libdivide_u64_t tmp = libdivide_internal_u64_gen(d, 1);
-    struct libdivide_u64_branchfree_t ret = {tmp.magic, (uint8_t)(tmp.more & LIBDIVIDE_64_SHIFT_MASK)};
+    struct libdivide_u64_branchfree_t ret = {
+        tmp.magic, (uint8_t)(tmp.more & LIBDIVIDE_64_SHIFT_MASK)};
     return ret;
 }
 
@@ -778,22 +773,21 @@ uint64_t libdivide_u64_do(uint64_t numer, const struct libdivide_u64_t *denom) {
     uint8_t more = denom->more;
     if (!denom->magic) {
         return numer >> more;
-    }
-    else {
+    } else {
         uint64_t q = libdivide_mullhi_u64(denom->magic, numer);
         if (more & LIBDIVIDE_ADD_MARKER) {
             uint64_t t = ((numer - q) >> 1) + q;
             return t >> (more & LIBDIVIDE_64_SHIFT_MASK);
-        }
-        else {
-             // All upper bits are 0,
-             // don't need to mask them off.
+        } else {
+            // All upper bits are 0,
+            // don't need to mask them off.
             return q >> more;
         }
     }
 }
 
-uint64_t libdivide_u64_branchfree_do(uint64_t numer, const struct libdivide_u64_branchfree_t *denom) {
+uint64_t libdivide_u64_branchfree_do(
+    uint64_t numer, const struct libdivide_u64_branchfree_t *denom) {
     uint64_t q = libdivide_mullhi_u64(denom->magic, numer);
     uint64_t t = ((numer - q) >> 1) + q;
     return t >> denom->more;
@@ -829,13 +823,14 @@ uint64_t libdivide_u64_recover(const struct libdivide_u64_t *denom) {
         // Note that the quotient is guaranteed <= 64 bits,
         // but the remainder may need 65!
         uint64_t r_hi, r_lo;
-        uint64_t half_q = libdivide_128_div_128_to_64(half_n_hi, half_n_lo, d_hi, d_lo, &r_hi, &r_lo);
+        uint64_t half_q =
+            libdivide_128_div_128_to_64(half_n_hi, half_n_lo, d_hi, d_lo, &r_hi, &r_lo);
         // We computed 2^(64+shift)/(m+2^64)
         // Double the remainder ('dr') and check if that is larger than d
         // Note that d is a 65 bit value, so r1 is small and so r1 + r1
         // cannot overflow
         uint64_t dr_lo = r_lo + r_lo;
-        uint64_t dr_hi = r_hi + r_hi + (dr_lo < r_lo); // last term is carry
+        uint64_t dr_hi = r_hi + r_hi + (dr_lo < r_lo);  // last term is carry
         int dr_exceeds_d = (dr_hi > d_hi) || (dr_hi == d_hi && dr_lo >= d_lo);
         uint64_t full_q = half_q + half_q + (dr_exceeds_d ? 1 : 0);
         return full_q + 1;
@@ -863,13 +858,14 @@ uint64_t libdivide_u64_branchfree_recover(const struct libdivide_u64_branchfree_
         // Note that the quotient is guaranteed <= 64 bits,
         // but the remainder may need 65!
         uint64_t r_hi, r_lo;
-        uint64_t half_q = libdivide_128_div_128_to_64(half_n_hi, half_n_lo, d_hi, d_lo, &r_hi, &r_lo);
+        uint64_t half_q =
+            libdivide_128_div_128_to_64(half_n_hi, half_n_lo, d_hi, d_lo, &r_hi, &r_lo);
         // We computed 2^(64+shift)/(m+2^64)
         // Double the remainder ('dr') and check if that is larger than d
         // Note that d is a 65 bit value, so r1 is small and so r1 + r1
         // cannot overflow
         uint64_t dr_lo = r_lo + r_lo;
-        uint64_t dr_hi = r_hi + r_hi + (dr_lo < r_lo); // last term is carry
+        uint64_t dr_hi = r_hi + r_hi + (dr_lo < r_lo);  // last term is carry
         int dr_exceeds_d = (dr_hi > d_hi) || (dr_hi == d_hi && dr_lo >= d_lo);
         uint64_t full_q = half_q + half_q + (dr_exceeds_d ? 1 : 0);
         return full_q + 1;
@@ -1023,8 +1019,7 @@ int32_t libdivide_s32_recover(const struct libdivide_s32_t *denom) {
         // the magic number's sign is opposite that of the divisor.
         // We want to compute the positive magic number.
         int negative_divisor = (more & LIBDIVIDE_NEGATIVE_DIVISOR);
-        int magic_was_negated = (more & LIBDIVIDE_ADD_MARKER)
-            ? denom->magic > 0 : denom->magic < 0;
+        int magic_was_negated = (more & LIBDIVIDE_ADD_MARKER) ? denom->magic > 0 : denom->magic < 0;
 
         // Handle the power of 2 case (including branchfree)
         if (denom->magic == 0) {
@@ -1033,7 +1028,7 @@ int32_t libdivide_s32_recover(const struct libdivide_s32_t *denom) {
         }
 
         uint32_t d = (uint32_t)(magic_was_negated ? -denom->magic : denom->magic);
-        uint64_t n = 1ULL << (32 + shift); // this shift cannot exceed 30
+        uint64_t n = 1ULL << (32 + shift);  // this shift cannot exceed 30
         uint32_t q = (uint32_t)(n / d);
         int32_t result = (int32_t)q;
         result += 1;
@@ -1126,7 +1121,7 @@ int64_t libdivide_s64_do(int64_t numer, const struct libdivide_s64_t *denom) {
     uint8_t more = denom->more;
     uint8_t shift = more & LIBDIVIDE_64_SHIFT_MASK;
 
-    if (!denom->magic) { // shift path
+    if (!denom->magic) {  // shift path
         uint64_t mask = (1ULL << shift) - 1;
         uint64_t uq = numer + ((numer >> 63) & mask);
         int64_t q = (int64_t)uq;
@@ -1178,7 +1173,7 @@ int64_t libdivide_s64_branchfree_do(int64_t numer, const struct libdivide_s64_br
 int64_t libdivide_s64_recover(const struct libdivide_s64_t *denom) {
     uint8_t more = denom->more;
     uint8_t shift = more & LIBDIVIDE_64_SHIFT_MASK;
-    if (denom->magic == 0) { // shift path
+    if (denom->magic == 0) {  // shift path
         uint64_t absD = 1ULL << shift;
         if (more & LIBDIVIDE_NEGATIVE_DIVISOR) {
             absD = -absD;
@@ -1187,8 +1182,7 @@ int64_t libdivide_s64_recover(const struct libdivide_s64_t *denom) {
     } else {
         // Unsigned math is much easier
         int negative_divisor = (more & LIBDIVIDE_NEGATIVE_DIVISOR);
-        int magic_was_negated = (more & LIBDIVIDE_ADD_MARKER)
-            ? denom->magic > 0 : denom->magic < 0;
+        int magic_was_negated = (more & LIBDIVIDE_ADD_MARKER) ? denom->magic > 0 : denom->magic < 0;
 
         uint64_t d = (uint64_t)(magic_was_negated ? -denom->magic : denom->magic);
         uint64_t n_hi = 1ULL << shift, n_lo = 0;
@@ -1206,30 +1200,305 @@ int64_t libdivide_s64_branchfree_recover(const struct libdivide_s64_branchfree_t
     return libdivide_s64_recover((const struct libdivide_s64_t *)denom);
 }
 
-#if defined(LIBDIVIDE_AVX512)
+#if defined(LIBDIVIDE_NEON)
 
-static inline __m512i libdivide_u32_do_vector(__m512i numers, const struct libdivide_u32_t *denom);
-static inline __m512i libdivide_s32_do_vector(__m512i numers, const struct libdivide_s32_t *denom);
-static inline __m512i libdivide_u64_do_vector(__m512i numers, const struct libdivide_u64_t *denom);
-static inline __m512i libdivide_s64_do_vector(__m512i numers, const struct libdivide_s64_t *denom);
+static inline uint32x4_t libdivide_u32_do_vec128(
+    uint32x4_t numers, const struct libdivide_u32_t *denom);
+static inline int32x4_t libdivide_s32_do_vec128(
+    int32x4_t numers, const struct libdivide_s32_t *denom);
+static inline uint64x2_t libdivide_u64_do_vec128(
+    uint64x2_t numers, const struct libdivide_u64_t *denom);
+static inline int64x2_t libdivide_s64_do_vec128(
+    int64x2_t numers, const struct libdivide_s64_t *denom);
 
-static inline __m512i libdivide_u32_branchfree_do_vector(__m512i numers, const struct libdivide_u32_branchfree_t *denom);
-static inline __m512i libdivide_s32_branchfree_do_vector(__m512i numers, const struct libdivide_s32_branchfree_t *denom);
-static inline __m512i libdivide_u64_branchfree_do_vector(__m512i numers, const struct libdivide_u64_branchfree_t *denom);
-static inline __m512i libdivide_s64_branchfree_do_vector(__m512i numers, const struct libdivide_s64_branchfree_t *denom);
+static inline uint32x4_t libdivide_u32_branchfree_do_vec128(
+    uint32x4_t numers, const struct libdivide_u32_branchfree_t *denom);
+static inline int32x4_t libdivide_s32_branchfree_do_vec128(
+    int32x4_t numers, const struct libdivide_s32_branchfree_t *denom);
+static inline uint64x2_t libdivide_u64_branchfree_do_vec128(
+    uint64x2_t numers, const struct libdivide_u64_branchfree_t *denom);
+static inline int64x2_t libdivide_s64_branchfree_do_vec128(
+    int64x2_t numers, const struct libdivide_s64_branchfree_t *denom);
 
 //////// Internal Utility Functions
 
-static inline __m512i libdivide_s64_signbits(__m512i v) {;
+// Logical right shift by runtime value.
+// NEON implements right shift as left shits by negative values.
+static inline uint32x4_t libdivide_u32_neon_srl(uint32x4_t v, uint8_t amt) {
+    int32_t wamt = static_cast<int32_t>(amt);
+    return vshlq_u32(v, vdupq_n_s32(-wamt));
+}
+
+static inline uint64x2_t libdivide_u64_neon_srl(uint64x2_t v, uint8_t amt) {
+    int64_t wamt = static_cast<int64_t>(amt);
+    return vshlq_u64(v, vdupq_n_s64(-wamt));
+}
+
+// Arithmetic right shift by runtime value.
+static inline int32x4_t libdivide_s32_neon_sra(int32x4_t v, uint8_t amt) {
+    int32_t wamt = static_cast<int32_t>(amt);
+    return vshlq_s32(v, vdupq_n_s32(-wamt));
+}
+
+static inline int64x2_t libdivide_s64_neon_sra(int64x2_t v, uint8_t amt) {
+    int64_t wamt = static_cast<int64_t>(amt);
+    return vshlq_s64(v, vdupq_n_s64(-wamt));
+}
+
+static inline int64x2_t libdivide_s64_signbits(int64x2_t v) { return vshrq_n_s64(v, 63); }
+
+static inline uint32x4_t libdivide_mullhi_u32_vec128(uint32x4_t a, uint32_t b) {
+    // Desire is [x0, x1, x2, x3]
+    uint32x4_t w1 = vreinterpretq_u32_u64(vmull_n_u32(vget_low_u32(a), b));  // [_, x0, _, x1]
+    uint32x4_t w2 = vreinterpretq_u32_u64(vmull_high_n_u32(a, b));           //[_, x2, _, x3]
+    return vuzp2q_u32(w1, w2);                                               // [x0, x1, x2, x3]
+}
+
+static inline int32x4_t libdivide_mullhi_s32_vec128(int32x4_t a, int32_t b) {
+    int32x4_t w1 = vreinterpretq_s32_s64(vmull_n_s32(vget_low_s32(a), b));  // [_, x0, _, x1]
+    int32x4_t w2 = vreinterpretq_s32_s64(vmull_high_n_s32(a, b));           //[_, x2, _, x3]
+    return vuzp2q_s32(w1, w2);                                              // [x0, x1, x2, x3]
+}
+
+static inline uint64x2_t libdivide_mullhi_u64_vec128(uint64x2_t x, uint64_t sy) {
+    // full 128 bits product is:
+    // x0*y0 + (x0*y1 << 32) + (x1*y0 << 32) + (x1*y1 << 64)
+    // Note x0,y0,x1,y1 are all conceptually uint32, products are 32x32->64.
+
+    // Get low and high words. x0 contains low 32 bits, x1 is high 32 bits.
+    uint64x2_t y = vdupq_n_u64(sy);
+    uint32x2_t x0 = vmovn_u64(x);
+    uint32x2_t y0 = vmovn_u64(y);
+    uint32x2_t x1 = vshrn_n_u64(x, 32);
+    uint32x2_t y1 = vshrn_n_u64(y, 32);
+
+    // Compute x0*y0.
+    uint64x2_t x0y0 = vmull_u32(x0, y0);
+    uint64x2_t x0y0_hi = vshrq_n_u64(x0y0, 32);
+
+    // Compute other intermediate products.
+    uint64x2_t temp = vmlal_u32(x0y0_hi, x1, y0);  // temp = x0y0_hi + x1*y0;
+    // We want to split temp into its low 32 bits and high 32 bits, both
+    // in the low half of 64 bit registers.
+    // Use shifts to avoid needing a reg for the mask.
+    uint64x2_t temp_lo = vshrq_n_u64(vshlq_n_u64(temp, 32), 32);  // temp_lo = temp & 0xFFFFFFFF;
+    uint64x2_t temp_hi = vshrq_n_u64(temp, 32);                   // temp_hi = temp >> 32;
+
+    temp_lo = vmlal_u32(temp_lo, x0, y1);  // temp_lo += x0*y0
+    temp_lo = vshrq_n_u64(temp_lo, 32);    // temp_lo >>= 32
+    temp_hi = vmlal_u32(temp_hi, x1, y1);  // temp_hi += x1*y1
+    uint64x2_t result = vaddq_u64(temp_hi, temp_lo);
+    return result;
+}
+
+static inline int64x2_t libdivide_mullhi_s64_vec128(int64x2_t x, int64_t sy) {
+    int64x2_t p = vreinterpretq_s64_u64(
+        libdivide_mullhi_u64_vec128(vreinterpretq_u64_s64(x), static_cast<uint64_t>(sy)));
+    int64x2_t y = vdupq_n_s64(sy);
+    int64x2_t t1 = vandq_s64(libdivide_s64_signbits(x), y);
+    int64x2_t t2 = vandq_s64(libdivide_s64_signbits(y), x);
+    p = vsubq_s64(p, t1);
+    p = vsubq_s64(p, t2);
+    return p;
+}
+
+////////// UINT32
+
+uint32x4_t libdivide_u32_do_vec128(uint32x4_t numers, const struct libdivide_u32_t *denom) {
+    uint8_t more = denom->more;
+    if (!denom->magic) {
+        return libdivide_u32_neon_srl(numers, more);
+    } else {
+        uint32x4_t q = libdivide_mullhi_u32_vec128(numers, denom->magic);
+        if (more & LIBDIVIDE_ADD_MARKER) {
+            // uint32_t t = ((numer - q) >> 1) + q;
+            // return t >> denom->shift;
+            // Note we can use halving-subtract to avoid the shift.
+            uint8_t shift = more & LIBDIVIDE_32_SHIFT_MASK;
+            uint32x4_t t = vaddq_u32(vhsubq_u32(numers, q), q);
+            return libdivide_u32_neon_srl(t, shift);
+        } else {
+            return libdivide_u32_neon_srl(q, more);
+        }
+    }
+}
+
+uint32x4_t libdivide_u32_branchfree_do_vec128(
+    uint32x4_t numers, const struct libdivide_u32_branchfree_t *denom) {
+    uint32x4_t q = libdivide_mullhi_u32_vec128(numers, denom->magic);
+    uint32x4_t t = vaddq_u32(vhsubq_u32(numers, q), q);
+    return libdivide_u32_neon_srl(t, denom->more);
+}
+
+////////// UINT64
+
+uint64x2_t libdivide_u64_do_vec128(uint64x2_t numers, const struct libdivide_u64_t *denom) {
+    uint8_t more = denom->more;
+    if (!denom->magic) {
+        return libdivide_u64_neon_srl(numers, more);
+    } else {
+        uint64x2_t q = libdivide_mullhi_u64_vec128(numers, denom->magic);
+        if (more & LIBDIVIDE_ADD_MARKER) {
+            // uint32_t t = ((numer - q) >> 1) + q;
+            // return t >> denom->shift;
+            // No 64-bit halving subtracts in NEON :(
+            uint8_t shift = more & LIBDIVIDE_64_SHIFT_MASK;
+            uint64x2_t t = vaddq_u64(vshrq_n_u64(vsubq_u64(numers, q), 1), q);
+            return libdivide_u64_neon_srl(t, shift);
+        } else {
+            return libdivide_u64_neon_srl(q, more);
+        }
+    }
+}
+
+uint64x2_t libdivide_u64_branchfree_do_vec128(
+    uint64x2_t numers, const struct libdivide_u64_branchfree_t *denom) {
+    uint64x2_t q = libdivide_mullhi_u64_vec128(numers, denom->magic);
+    uint64x2_t t = vaddq_u64(vshrq_n_u64(vsubq_u64(numers, q), 1), q);
+    return libdivide_u64_neon_srl(t, denom->more);
+}
+
+////////// SINT32
+
+int32x4_t libdivide_s32_do_vec128(int32x4_t numers, const struct libdivide_s32_t *denom) {
+    uint8_t more = denom->more;
+    if (!denom->magic) {
+        uint8_t shift = more & LIBDIVIDE_32_SHIFT_MASK;
+        uint32_t mask = (1U << shift) - 1;
+        int32x4_t roundToZeroTweak = vdupq_n_s32((int)mask);
+        // q = numer + ((numer >> 31) & roundToZeroTweak);
+        int32x4_t q = vaddq_s32(numers, vandq_s32(vshrq_n_s32(numers, 31), roundToZeroTweak));
+        q = libdivide_s32_neon_sra(q, shift);
+        int32x4_t sign = vdupq_n_s32((int8_t)more >> 7);
+        // q = (q ^ sign) - sign;
+        q = vsubq_s32(veorq_s32(q, sign), sign);
+        return q;
+    } else {
+        int32x4_t q = libdivide_mullhi_s32_vec128(numers, denom->magic);
+        if (more & LIBDIVIDE_ADD_MARKER) {
+            // must be arithmetic shift
+            int32x4_t sign = vdupq_n_s32((int8_t)more >> 7);
+            // q += ((numer ^ sign) - sign);
+            q = vaddq_s32(q, vsubq_s32(veorq_s32(numers, sign), sign));
+        }
+        // q >>= shift
+        q = libdivide_s32_neon_sra(q, more & LIBDIVIDE_32_SHIFT_MASK);
+        q = vaddq_s32(
+            q, vreinterpretq_s32_u32(vshrq_n_u32(vreinterpretq_u32_s32(q), 31)));  // q += (q < 0)
+        return q;
+    }
+}
+
+int32x4_t libdivide_s32_branchfree_do_vec128(
+    int32x4_t numers, const struct libdivide_s32_branchfree_t *denom) {
+    int32_t magic = denom->magic;
+    uint8_t more = denom->more;
+    uint8_t shift = more & LIBDIVIDE_32_SHIFT_MASK;
+    // must be arithmetic shift
+    int32x4_t sign = vdupq_n_s32((int8_t)more >> 7);
+    int32x4_t q = libdivide_mullhi_s32_vec128(numers, magic);
+    q = vaddq_s32(q, numers);  // q += numers
+
+    // If q is non-negative, we have nothing to do
+    // If q is negative, we want to add either (2**shift)-1 if d is
+    // a power of 2, or (2**shift) if it is not a power of 2
+    uint32_t is_power_of_2 = (magic == 0);
+    int32x4_t q_sign = vshrq_n_s32(q, 31);  // q_sign = q >> 31
+    int32x4_t mask = vdupq_n_s32((1U << shift) - is_power_of_2);
+    q = vaddq_s32(q, vandq_s32(q_sign, mask));  // q = q + (q_sign & mask)
+    q = libdivide_s32_neon_sra(q, shift);       // q >>= shift
+    q = vsubq_s32(veorq_s32(q, sign), sign);    // q = (q ^ sign) - sign
+    return q;
+}
+
+////////// SINT64
+
+int64x2_t libdivide_s64_do_vec128(int64x2_t numers, const struct libdivide_s64_t *denom) {
+    uint8_t more = denom->more;
+    int64_t magic = denom->magic;
+    if (magic == 0) {  // shift path
+        uint8_t shift = more & LIBDIVIDE_64_SHIFT_MASK;
+        uint64_t mask = (1ULL << shift) - 1;
+        int64x2_t roundToZeroTweak = vdupq_n_s64(mask);  // TODO: no need to sign extend
+        // q = numer + ((numer >> 63) & roundToZeroTweak);
+        int64x2_t q =
+            vaddq_s64(numers, vandq_s64(libdivide_s64_signbits(numers), roundToZeroTweak));
+        q = libdivide_s64_neon_sra(q, shift);
+        // q = (q ^ sign) - sign;
+        int64x2_t sign = vreinterpretq_s64_s8(vdupq_n_s8((int8_t)more >> 7));
+        q = vsubq_s64(veorq_s64(q, sign), sign);
+        return q;
+    } else {
+        int64x2_t q = libdivide_mullhi_s64_vec128(numers, magic);
+        if (more & LIBDIVIDE_ADD_MARKER) {
+            // must be arithmetic shift
+            int64x2_t sign = vdupq_n_s64((int8_t)more >> 7);  // TODO: no need to widen
+            // q += ((numer ^ sign) - sign);
+            q = vaddq_s64(q, vsubq_s64(veorq_s64(numers, sign), sign));
+        }
+        // q >>= denom->mult_path.shift
+        q = libdivide_s64_neon_sra(q, more & LIBDIVIDE_64_SHIFT_MASK);
+        q = vaddq_s64(
+            q, vreinterpretq_s64_u64(vshrq_n_u64(vreinterpretq_u64_s64(q), 63)));  // q += (q < 0)
+        return q;
+    }
+}
+
+int64x2_t libdivide_s64_branchfree_do_vec128(
+    int64x2_t numers, const struct libdivide_s64_branchfree_t *denom) {
+    int64_t magic = denom->magic;
+    uint8_t more = denom->more;
+    uint8_t shift = more & LIBDIVIDE_64_SHIFT_MASK;
+    // must be arithmetic shift
+    int64x2_t sign = vdupq_n_s64((int8_t)more >> 7);  // TODO: avoid sign extend
+
+    // libdivide_mullhi_s64(numers, magic);
+    int64x2_t q = libdivide_mullhi_s64_vec128(numers, magic);
+    q = vaddq_s64(q, numers);  // q += numers
+
+    // If q is non-negative, we have nothing to do.
+    // If q is negative, we want to add either (2**shift)-1 if d is
+    // a power of 2, or (2**shift) if it is not a power of 2.
+    uint32_t is_power_of_2 = (magic == 0);
+    int64x2_t q_sign = libdivide_s64_signbits(q);  // q_sign = q >> 63
+    int64x2_t mask = vdupq_n_s64((1ULL << shift) - is_power_of_2);
+    q = vaddq_s64(q, vandq_s64(q_sign, mask));  // q = q + (q_sign & mask)
+    q = libdivide_s64_neon_sra(q, shift);       // q >>= shift
+    q = vsubq_s64(veorq_s64(q, sign), sign);    // q = (q ^ sign) - sign
+    return q;
+}
+
+#endif
+
+#if defined(LIBDIVIDE_AVX512)
+
+static inline __m512i libdivide_u32_do_vec512(__m512i numers, const struct libdivide_u32_t *denom);
+static inline __m512i libdivide_s32_do_vec512(__m512i numers, const struct libdivide_s32_t *denom);
+static inline __m512i libdivide_u64_do_vec512(__m512i numers, const struct libdivide_u64_t *denom);
+static inline __m512i libdivide_s64_do_vec512(__m512i numers, const struct libdivide_s64_t *denom);
+
+static inline __m512i libdivide_u32_branchfree_do_vec512(
+    __m512i numers, const struct libdivide_u32_branchfree_t *denom);
+static inline __m512i libdivide_s32_branchfree_do_vec512(
+    __m512i numers, const struct libdivide_s32_branchfree_t *denom);
+static inline __m512i libdivide_u64_branchfree_do_vec512(
+    __m512i numers, const struct libdivide_u64_branchfree_t *denom);
+static inline __m512i libdivide_s64_branchfree_do_vec512(
+    __m512i numers, const struct libdivide_s64_branchfree_t *denom);
+
+//////// Internal Utility Functions
+
+static inline __m512i libdivide_s64_signbits(__m512i v) {
+    ;
     return _mm512_srai_epi64(v, 63);
 }
 
-static inline __m512i libdivide_s64_shift_right_vector(__m512i v, int amt) {
+static inline __m512i libdivide_s64_shift_right_vec512(__m512i v, int amt) {
     return _mm512_srai_epi64(v, amt);
 }
 
 // Here, b is assumed to contain one 32-bit value repeated.
-static inline __m512i libdivide_mullhi_u32_vector(__m512i a, __m512i b) {
+static inline __m512i libdivide_mullhi_u32_vec512(__m512i a, __m512i b) {
     __m512i hi_product_0Z2Z = _mm512_srli_epi64(_mm512_mul_epu32(a, b), 32);
     __m512i a1X3X = _mm512_srli_epi64(a, 32);
     __m512i mask = _mm512_set_epi32(-1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0);
@@ -1238,7 +1507,7 @@ static inline __m512i libdivide_mullhi_u32_vector(__m512i a, __m512i b) {
 }
 
 // b is one 32-bit value repeated.
-static inline __m512i libdivide_mullhi_s32_vector(__m512i a, __m512i b) {
+static inline __m512i libdivide_mullhi_s32_vec512(__m512i a, __m512i b) {
     __m512i hi_product_0Z2Z = _mm512_srli_epi64(_mm512_mul_epi32(a, b), 32);
     __m512i a1X3X = _mm512_srli_epi64(a, 32);
     __m512i mask = _mm512_set_epi32(-1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0);
@@ -1247,30 +1516,31 @@ static inline __m512i libdivide_mullhi_s32_vector(__m512i a, __m512i b) {
 }
 
 // Here, y is assumed to contain one 64-bit value repeated.
-// https://stackoverflow.com/a/28827013
-static inline __m512i libdivide_mullhi_u64_vector(__m512i x, __m512i y) {
-    __m512i lomask = _mm512_set1_epi64(0xffffffff);
-    __m512i xh = _mm512_shuffle_epi32(x, (_MM_PERM_ENUM) 0xB1);
-    __m512i yh = _mm512_shuffle_epi32(y, (_MM_PERM_ENUM) 0xB1);
-    __m512i w0 = _mm512_mul_epu32(x, y);
-    __m512i w1 = _mm512_mul_epu32(x, yh);
-    __m512i w2 = _mm512_mul_epu32(xh, y);
-    __m512i w3 = _mm512_mul_epu32(xh, yh);
-    __m512i w0h = _mm512_srli_epi64(w0, 32);
-    __m512i s1 = _mm512_add_epi64(w1, w0h);
-    __m512i s1l = _mm512_and_si512(s1, lomask);
-    __m512i s1h = _mm512_srli_epi64(s1, 32);
-    __m512i s2 = _mm512_add_epi64(w2, s1l);
-    __m512i s2h = _mm512_srli_epi64(s2, 32);
-    __m512i hi = _mm512_add_epi64(w3, s1h);
-            hi = _mm512_add_epi64(hi, s2h);
+static inline __m512i libdivide_mullhi_u64_vec512(__m512i x, __m512i y) {
+    // see m128i variant for comments.
+    __m512i x0y0 = _mm512_mul_epu32(x, y);
+    __m512i x0y0_hi = _mm512_srli_epi64(x0y0, 32);
 
-    return hi;
+    __m512i x1 = _mm512_shuffle_epi32(x, (_MM_PERM_ENUM)_MM_SHUFFLE(3, 3, 1, 1));
+    __m512i y1 = _mm512_shuffle_epi32(y, (_MM_PERM_ENUM)_MM_SHUFFLE(3, 3, 1, 1));
+
+    __m512i x0y1 = _mm512_mul_epu32(x, y1);
+    __m512i x1y0 = _mm512_mul_epu32(x1, y);
+    __m512i x1y1 = _mm512_mul_epu32(x1, y1);
+
+    __m512i mask = _mm512_set1_epi64(0xFFFFFFFF);
+    __m512i temp = _mm512_add_epi64(x1y0, x0y0_hi);
+    __m512i temp_lo = _mm512_and_si512(temp, mask);
+    __m512i temp_hi = _mm512_srli_epi64(temp, 32);
+
+    temp_lo = _mm512_srli_epi64(_mm512_add_epi64(temp_lo, x0y1), 32);
+    temp_hi = _mm512_add_epi64(x1y1, temp_hi);
+    return _mm512_add_epi64(temp_lo, temp_hi);
 }
 
 // y is one 64-bit value repeated.
-static inline __m512i libdivide_mullhi_s64_vector(__m512i x, __m512i y) {
-    __m512i p = libdivide_mullhi_u64_vector(x, y);
+static inline __m512i libdivide_mullhi_s64_vec512(__m512i x, __m512i y) {
+    __m512i p = libdivide_mullhi_u64_vec512(x, y);
     __m512i t1 = _mm512_and_si512(libdivide_s64_signbits(x), y);
     __m512i t2 = _mm512_and_si512(libdivide_s64_signbits(y), x);
     p = _mm512_sub_epi64(p, t1);
@@ -1280,131 +1550,130 @@ static inline __m512i libdivide_mullhi_s64_vector(__m512i x, __m512i y) {
 
 ////////// UINT32
 
-__m512i libdivide_u32_do_vector(__m512i numers, const struct libdivide_u32_t *denom) {
+__m512i libdivide_u32_do_vec512(__m512i numers, const struct libdivide_u32_t *denom) {
     uint8_t more = denom->more;
     if (!denom->magic) {
         return _mm512_srli_epi32(numers, more);
-    }
-    else {
-        __m512i q = libdivide_mullhi_u32_vector(numers, _mm512_set1_epi32(denom->magic));
+    } else {
+        __m512i q = libdivide_mullhi_u32_vec512(numers, _mm512_set1_epi32(denom->magic));
         if (more & LIBDIVIDE_ADD_MARKER) {
             // uint32_t t = ((numer - q) >> 1) + q;
             // return t >> denom->shift;
             uint32_t shift = more & LIBDIVIDE_32_SHIFT_MASK;
             __m512i t = _mm512_add_epi32(_mm512_srli_epi32(_mm512_sub_epi32(numers, q), 1), q);
             return _mm512_srli_epi32(t, shift);
-        }
-        else {
+        } else {
             return _mm512_srli_epi32(q, more);
         }
     }
 }
 
-__m512i libdivide_u32_branchfree_do_vector(__m512i numers, const struct libdivide_u32_branchfree_t *denom) {
-    __m512i q = libdivide_mullhi_u32_vector(numers, _mm512_set1_epi32(denom->magic));
+__m512i libdivide_u32_branchfree_do_vec512(
+    __m512i numers, const struct libdivide_u32_branchfree_t *denom) {
+    __m512i q = libdivide_mullhi_u32_vec512(numers, _mm512_set1_epi32(denom->magic));
     __m512i t = _mm512_add_epi32(_mm512_srli_epi32(_mm512_sub_epi32(numers, q), 1), q);
     return _mm512_srli_epi32(t, denom->more);
 }
 
 ////////// UINT64
 
-__m512i libdivide_u64_do_vector(__m512i numers, const struct libdivide_u64_t *denom) {
+__m512i libdivide_u64_do_vec512(__m512i numers, const struct libdivide_u64_t *denom) {
     uint8_t more = denom->more;
     if (!denom->magic) {
         return _mm512_srli_epi64(numers, more);
-    }
-    else {
-        __m512i q = libdivide_mullhi_u64_vector(numers, _mm512_set1_epi64(denom->magic));
+    } else {
+        __m512i q = libdivide_mullhi_u64_vec512(numers, _mm512_set1_epi64(denom->magic));
         if (more & LIBDIVIDE_ADD_MARKER) {
             // uint32_t t = ((numer - q) >> 1) + q;
             // return t >> denom->shift;
             uint32_t shift = more & LIBDIVIDE_64_SHIFT_MASK;
             __m512i t = _mm512_add_epi64(_mm512_srli_epi64(_mm512_sub_epi64(numers, q), 1), q);
             return _mm512_srli_epi64(t, shift);
-        }
-        else {
+        } else {
             return _mm512_srli_epi64(q, more);
         }
     }
 }
 
-__m512i libdivide_u64_branchfree_do_vector(__m512i numers, const struct libdivide_u64_branchfree_t *denom) {
-    __m512i q = libdivide_mullhi_u64_vector(numers, _mm512_set1_epi64(denom->magic));
+__m512i libdivide_u64_branchfree_do_vec512(
+    __m512i numers, const struct libdivide_u64_branchfree_t *denom) {
+    __m512i q = libdivide_mullhi_u64_vec512(numers, _mm512_set1_epi64(denom->magic));
     __m512i t = _mm512_add_epi64(_mm512_srli_epi64(_mm512_sub_epi64(numers, q), 1), q);
     return _mm512_srli_epi64(t, denom->more);
 }
 
 ////////// SINT32
 
-__m512i libdivide_s32_do_vector(__m512i numers, const struct libdivide_s32_t *denom) {
+__m512i libdivide_s32_do_vec512(__m512i numers, const struct libdivide_s32_t *denom) {
     uint8_t more = denom->more;
     if (!denom->magic) {
         uint32_t shift = more & LIBDIVIDE_32_SHIFT_MASK;
         uint32_t mask = (1U << shift) - 1;
         __m512i roundToZeroTweak = _mm512_set1_epi32(mask);
         // q = numer + ((numer >> 31) & roundToZeroTweak);
-        __m512i q = _mm512_add_epi32(numers, _mm512_and_si512(_mm512_srai_epi32(numers, 31), roundToZeroTweak));
+        __m512i q = _mm512_add_epi32(
+            numers, _mm512_and_si512(_mm512_srai_epi32(numers, 31), roundToZeroTweak));
         q = _mm512_srai_epi32(q, shift);
         __m512i sign = _mm512_set1_epi32((int8_t)more >> 7);
         // q = (q ^ sign) - sign;
         q = _mm512_sub_epi32(_mm512_xor_si512(q, sign), sign);
         return q;
-    }
-    else {
-        __m512i q = libdivide_mullhi_s32_vector(numers, _mm512_set1_epi32(denom->magic));
+    } else {
+        __m512i q = libdivide_mullhi_s32_vec512(numers, _mm512_set1_epi32(denom->magic));
         if (more & LIBDIVIDE_ADD_MARKER) {
-             // must be arithmetic shift
+            // must be arithmetic shift
             __m512i sign = _mm512_set1_epi32((int8_t)more >> 7);
-             // q += ((numer ^ sign) - sign);
+            // q += ((numer ^ sign) - sign);
             q = _mm512_add_epi32(q, _mm512_sub_epi32(_mm512_xor_si512(numers, sign), sign));
         }
         // q >>= shift
         q = _mm512_srai_epi32(q, more & LIBDIVIDE_32_SHIFT_MASK);
-        q = _mm512_add_epi32(q, _mm512_srli_epi32(q, 31)); // q += (q < 0)
+        q = _mm512_add_epi32(q, _mm512_srli_epi32(q, 31));  // q += (q < 0)
         return q;
     }
 }
 
-__m512i libdivide_s32_branchfree_do_vector(__m512i numers, const struct libdivide_s32_branchfree_t *denom) {
+__m512i libdivide_s32_branchfree_do_vec512(
+    __m512i numers, const struct libdivide_s32_branchfree_t *denom) {
     int32_t magic = denom->magic;
     uint8_t more = denom->more;
     uint8_t shift = more & LIBDIVIDE_32_SHIFT_MASK;
-     // must be arithmetic shift
+    // must be arithmetic shift
     __m512i sign = _mm512_set1_epi32((int8_t)more >> 7);
-    __m512i q = libdivide_mullhi_s32_vector(numers, _mm512_set1_epi32(magic));
-    q = _mm512_add_epi32(q, numers); // q += numers
+    __m512i q = libdivide_mullhi_s32_vec512(numers, _mm512_set1_epi32(magic));
+    q = _mm512_add_epi32(q, numers);  // q += numers
 
     // If q is non-negative, we have nothing to do
     // If q is negative, we want to add either (2**shift)-1 if d is
     // a power of 2, or (2**shift) if it is not a power of 2
     uint32_t is_power_of_2 = (magic == 0);
-    __m512i q_sign = _mm512_srai_epi32(q, 31); // q_sign = q >> 31
+    __m512i q_sign = _mm512_srai_epi32(q, 31);  // q_sign = q >> 31
     __m512i mask = _mm512_set1_epi32((1U << shift) - is_power_of_2);
-    q = _mm512_add_epi32(q, _mm512_and_si512(q_sign, mask)); // q = q + (q_sign & mask)
-    q = _mm512_srai_epi32(q, shift); // q >>= shift
-    q = _mm512_sub_epi32(_mm512_xor_si512(q, sign), sign); // q = (q ^ sign) - sign
+    q = _mm512_add_epi32(q, _mm512_and_si512(q_sign, mask));  // q = q + (q_sign & mask)
+    q = _mm512_srai_epi32(q, shift);                          // q >>= shift
+    q = _mm512_sub_epi32(_mm512_xor_si512(q, sign), sign);    // q = (q ^ sign) - sign
     return q;
 }
 
 ////////// SINT64
 
-__m512i libdivide_s64_do_vector(__m512i numers, const struct libdivide_s64_t *denom) {
+__m512i libdivide_s64_do_vec512(__m512i numers, const struct libdivide_s64_t *denom) {
     uint8_t more = denom->more;
     int64_t magic = denom->magic;
-    if (magic == 0) { // shift path
+    if (magic == 0) {  // shift path
         uint32_t shift = more & LIBDIVIDE_64_SHIFT_MASK;
         uint64_t mask = (1ULL << shift) - 1;
         __m512i roundToZeroTweak = _mm512_set1_epi64(mask);
         // q = numer + ((numer >> 63) & roundToZeroTweak);
-        __m512i q = _mm512_add_epi64(numers, _mm512_and_si512(libdivide_s64_signbits(numers), roundToZeroTweak));
-        q = libdivide_s64_shift_right_vector(q, shift);
+        __m512i q = _mm512_add_epi64(
+            numers, _mm512_and_si512(libdivide_s64_signbits(numers), roundToZeroTweak));
+        q = libdivide_s64_shift_right_vec512(q, shift);
         __m512i sign = _mm512_set1_epi32((int8_t)more >> 7);
-         // q = (q ^ sign) - sign;
+        // q = (q ^ sign) - sign;
         q = _mm512_sub_epi64(_mm512_xor_si512(q, sign), sign);
         return q;
-    }
-    else {
-        __m512i q = libdivide_mullhi_s64_vector(numers, _mm512_set1_epi64(magic));
+    } else {
+        __m512i q = libdivide_mullhi_s64_vec512(numers, _mm512_set1_epi64(magic));
         if (more & LIBDIVIDE_ADD_MARKER) {
             // must be arithmetic shift
             __m512i sign = _mm512_set1_epi32((int8_t)more >> 7);
@@ -1412,46 +1681,53 @@ __m512i libdivide_s64_do_vector(__m512i numers, const struct libdivide_s64_t *de
             q = _mm512_add_epi64(q, _mm512_sub_epi64(_mm512_xor_si512(numers, sign), sign));
         }
         // q >>= denom->mult_path.shift
-        q = libdivide_s64_shift_right_vector(q, more & LIBDIVIDE_64_SHIFT_MASK);
-        q = _mm512_add_epi64(q, _mm512_srli_epi64(q, 63)); // q += (q < 0)
+        q = libdivide_s64_shift_right_vec512(q, more & LIBDIVIDE_64_SHIFT_MASK);
+        q = _mm512_add_epi64(q, _mm512_srli_epi64(q, 63));  // q += (q < 0)
         return q;
     }
 }
 
-__m512i libdivide_s64_branchfree_do_vector(__m512i numers, const struct libdivide_s64_branchfree_t *denom) {
+__m512i libdivide_s64_branchfree_do_vec512(
+    __m512i numers, const struct libdivide_s64_branchfree_t *denom) {
     int64_t magic = denom->magic;
     uint8_t more = denom->more;
     uint8_t shift = more & LIBDIVIDE_64_SHIFT_MASK;
     // must be arithmetic shift
     __m512i sign = _mm512_set1_epi32((int8_t)more >> 7);
 
-     // libdivide_mullhi_s64(numers, magic);
-    __m512i q = libdivide_mullhi_s64_vector(numers, _mm512_set1_epi64(magic));
-    q = _mm512_add_epi64(q, numers); // q += numers
+    // libdivide_mullhi_s64(numers, magic);
+    __m512i q = libdivide_mullhi_s64_vec512(numers, _mm512_set1_epi64(magic));
+    q = _mm512_add_epi64(q, numers);  // q += numers
 
     // If q is non-negative, we have nothing to do.
     // If q is negative, we want to add either (2**shift)-1 if d is
     // a power of 2, or (2**shift) if it is not a power of 2.
     uint32_t is_power_of_2 = (magic == 0);
-    __m512i q_sign = libdivide_s64_signbits(q); // q_sign = q >> 63
+    __m512i q_sign = libdivide_s64_signbits(q);  // q_sign = q >> 63
     __m512i mask = _mm512_set1_epi64((1ULL << shift) - is_power_of_2);
-    q = _mm512_add_epi64(q, _mm512_and_si512(q_sign, mask)); // q = q + (q_sign & mask)
-    q = libdivide_s64_shift_right_vector(q, shift); // q >>= shift
-    q = _mm512_sub_epi64(_mm512_xor_si512(q, sign), sign); // q = (q ^ sign) - sign
+    q = _mm512_add_epi64(q, _mm512_and_si512(q_sign, mask));  // q = q + (q_sign & mask)
+    q = libdivide_s64_shift_right_vec512(q, shift);           // q >>= shift
+    q = _mm512_sub_epi64(_mm512_xor_si512(q, sign), sign);    // q = (q ^ sign) - sign
     return q;
 }
 
-#elif defined(LIBDIVIDE_AVX2)
+#endif
 
-static inline __m256i libdivide_u32_do_vector(__m256i numers, const struct libdivide_u32_t *denom);
-static inline __m256i libdivide_s32_do_vector(__m256i numers, const struct libdivide_s32_t *denom);
-static inline __m256i libdivide_u64_do_vector(__m256i numers, const struct libdivide_u64_t *denom);
-static inline __m256i libdivide_s64_do_vector(__m256i numers, const struct libdivide_s64_t *denom);
+#if defined(LIBDIVIDE_AVX2)
 
-static inline __m256i libdivide_u32_branchfree_do_vector(__m256i numers, const struct libdivide_u32_branchfree_t *denom);
-static inline __m256i libdivide_s32_branchfree_do_vector(__m256i numers, const struct libdivide_s32_branchfree_t *denom);
-static inline __m256i libdivide_u64_branchfree_do_vector(__m256i numers, const struct libdivide_u64_branchfree_t *denom);
-static inline __m256i libdivide_s64_branchfree_do_vector(__m256i numers, const struct libdivide_s64_branchfree_t *denom);
+static inline __m256i libdivide_u32_do_vec256(__m256i numers, const struct libdivide_u32_t *denom);
+static inline __m256i libdivide_s32_do_vec256(__m256i numers, const struct libdivide_s32_t *denom);
+static inline __m256i libdivide_u64_do_vec256(__m256i numers, const struct libdivide_u64_t *denom);
+static inline __m256i libdivide_s64_do_vec256(__m256i numers, const struct libdivide_s64_t *denom);
+
+static inline __m256i libdivide_u32_branchfree_do_vec256(
+    __m256i numers, const struct libdivide_u32_branchfree_t *denom);
+static inline __m256i libdivide_s32_branchfree_do_vec256(
+    __m256i numers, const struct libdivide_s32_branchfree_t *denom);
+static inline __m256i libdivide_u64_branchfree_do_vec256(
+    __m256i numers, const struct libdivide_u64_branchfree_t *denom);
+static inline __m256i libdivide_s64_branchfree_do_vec256(
+    __m256i numers, const struct libdivide_s64_branchfree_t *denom);
 
 //////// Internal Utility Functions
 
@@ -1463,7 +1739,7 @@ static inline __m256i libdivide_s64_signbits(__m256i v) {
 }
 
 // Implementation of _mm256_srai_epi64 (from AVX512).
-static inline __m256i libdivide_s64_shift_right_vector(__m256i v, int amt) {
+static inline __m256i libdivide_s64_shift_right_vec256(__m256i v, int amt) {
     const int b = 64 - amt;
     __m256i m = _mm256_set1_epi64x(1ULL << (b - 1));
     __m256i x = _mm256_srli_epi64(v, amt);
@@ -1472,7 +1748,7 @@ static inline __m256i libdivide_s64_shift_right_vector(__m256i v, int amt) {
 }
 
 // Here, b is assumed to contain one 32-bit value repeated.
-static inline __m256i libdivide_mullhi_u32_vector(__m256i a, __m256i b) {
+static inline __m256i libdivide_mullhi_u32_vec256(__m256i a, __m256i b) {
     __m256i hi_product_0Z2Z = _mm256_srli_epi64(_mm256_mul_epu32(a, b), 32);
     __m256i a1X3X = _mm256_srli_epi64(a, 32);
     __m256i mask = _mm256_set_epi32(-1, 0, -1, 0, -1, 0, -1, 0);
@@ -1481,7 +1757,7 @@ static inline __m256i libdivide_mullhi_u32_vector(__m256i a, __m256i b) {
 }
 
 // b is one 32-bit value repeated.
-static inline __m256i libdivide_mullhi_s32_vector(__m256i a, __m256i b) {
+static inline __m256i libdivide_mullhi_s32_vec256(__m256i a, __m256i b) {
     __m256i hi_product_0Z2Z = _mm256_srli_epi64(_mm256_mul_epi32(a, b), 32);
     __m256i a1X3X = _mm256_srli_epi64(a, 32);
     __m256i mask = _mm256_set_epi32(-1, 0, -1, 0, -1, 0, -1, 0);
@@ -1490,30 +1766,31 @@ static inline __m256i libdivide_mullhi_s32_vector(__m256i a, __m256i b) {
 }
 
 // Here, y is assumed to contain one 64-bit value repeated.
-// https://stackoverflow.com/a/28827013
-static inline __m256i libdivide_mullhi_u64_vector(__m256i x, __m256i y) {
-    __m256i lomask = _mm256_set1_epi64x(0xffffffff);
-    __m256i xh = _mm256_shuffle_epi32(x, 0xB1);        // x0l, x0h, x1l, x1h
-    __m256i yh = _mm256_shuffle_epi32(y, 0xB1);        // y0l, y0h, y1l, y1h
-    __m256i w0 = _mm256_mul_epu32(x, y);               // x0l*y0l, x1l*y1l
-    __m256i w1 = _mm256_mul_epu32(x, yh);              // x0l*y0h, x1l*y1h
-    __m256i w2 = _mm256_mul_epu32(xh, y);              // x0h*y0l, x1h*y0l
-    __m256i w3 = _mm256_mul_epu32(xh, yh);             // x0h*y0h, x1h*y1h
-    __m256i w0h = _mm256_srli_epi64(w0, 32);
-    __m256i s1 = _mm256_add_epi64(w1, w0h);
-    __m256i s1l = _mm256_and_si256(s1, lomask);
-    __m256i s1h = _mm256_srli_epi64(s1, 32);
-    __m256i s2 = _mm256_add_epi64(w2, s1l);
-    __m256i s2h = _mm256_srli_epi64(s2, 32);
-    __m256i hi = _mm256_add_epi64(w3, s1h);
-            hi = _mm256_add_epi64(hi, s2h);
+static inline __m256i libdivide_mullhi_u64_vec256(__m256i x, __m256i y) {
+    // see m128i variant for comments.
+    __m256i x0y0 = _mm256_mul_epu32(x, y);
+    __m256i x0y0_hi = _mm256_srli_epi64(x0y0, 32);
 
-    return hi;
+    __m256i x1 = _mm256_shuffle_epi32(x, _MM_SHUFFLE(3, 3, 1, 1));
+    __m256i y1 = _mm256_shuffle_epi32(y, _MM_SHUFFLE(3, 3, 1, 1));
+
+    __m256i x0y1 = _mm256_mul_epu32(x, y1);
+    __m256i x1y0 = _mm256_mul_epu32(x1, y);
+    __m256i x1y1 = _mm256_mul_epu32(x1, y1);
+
+    __m256i mask = _mm256_set1_epi64x(0xFFFFFFFF);
+    __m256i temp = _mm256_add_epi64(x1y0, x0y0_hi);
+    __m256i temp_lo = _mm256_and_si256(temp, mask);
+    __m256i temp_hi = _mm256_srli_epi64(temp, 32);
+
+    temp_lo = _mm256_srli_epi64(_mm256_add_epi64(temp_lo, x0y1), 32);
+    temp_hi = _mm256_add_epi64(x1y1, temp_hi);
+    return _mm256_add_epi64(temp_lo, temp_hi);
 }
 
 // y is one 64-bit value repeated.
-static inline __m256i libdivide_mullhi_s64_vector(__m256i x, __m256i y) {
-    __m256i p = libdivide_mullhi_u64_vector(x, y);
+static inline __m256i libdivide_mullhi_s64_vec256(__m256i x, __m256i y) {
+    __m256i p = libdivide_mullhi_u64_vec256(x, y);
     __m256i t1 = _mm256_and_si256(libdivide_s64_signbits(x), y);
     __m256i t2 = _mm256_and_si256(libdivide_s64_signbits(y), x);
     p = _mm256_sub_epi64(p, t1);
@@ -1523,131 +1800,130 @@ static inline __m256i libdivide_mullhi_s64_vector(__m256i x, __m256i y) {
 
 ////////// UINT32
 
-__m256i libdivide_u32_do_vector(__m256i numers, const struct libdivide_u32_t *denom) {
+__m256i libdivide_u32_do_vec256(__m256i numers, const struct libdivide_u32_t *denom) {
     uint8_t more = denom->more;
     if (!denom->magic) {
         return _mm256_srli_epi32(numers, more);
-    }
-    else {
-        __m256i q = libdivide_mullhi_u32_vector(numers, _mm256_set1_epi32(denom->magic));
+    } else {
+        __m256i q = libdivide_mullhi_u32_vec256(numers, _mm256_set1_epi32(denom->magic));
         if (more & LIBDIVIDE_ADD_MARKER) {
             // uint32_t t = ((numer - q) >> 1) + q;
             // return t >> denom->shift;
             uint32_t shift = more & LIBDIVIDE_32_SHIFT_MASK;
             __m256i t = _mm256_add_epi32(_mm256_srli_epi32(_mm256_sub_epi32(numers, q), 1), q);
             return _mm256_srli_epi32(t, shift);
-        }
-        else {
+        } else {
             return _mm256_srli_epi32(q, more);
         }
     }
 }
 
-__m256i libdivide_u32_branchfree_do_vector(__m256i numers, const struct libdivide_u32_branchfree_t *denom) {
-    __m256i q = libdivide_mullhi_u32_vector(numers, _mm256_set1_epi32(denom->magic));
+__m256i libdivide_u32_branchfree_do_vec256(
+    __m256i numers, const struct libdivide_u32_branchfree_t *denom) {
+    __m256i q = libdivide_mullhi_u32_vec256(numers, _mm256_set1_epi32(denom->magic));
     __m256i t = _mm256_add_epi32(_mm256_srli_epi32(_mm256_sub_epi32(numers, q), 1), q);
     return _mm256_srli_epi32(t, denom->more);
 }
 
 ////////// UINT64
 
-__m256i libdivide_u64_do_vector(__m256i numers, const struct libdivide_u64_t *denom) {
+__m256i libdivide_u64_do_vec256(__m256i numers, const struct libdivide_u64_t *denom) {
     uint8_t more = denom->more;
     if (!denom->magic) {
         return _mm256_srli_epi64(numers, more);
-    }
-    else {
-        __m256i q = libdivide_mullhi_u64_vector(numers, _mm256_set1_epi64x(denom->magic));
+    } else {
+        __m256i q = libdivide_mullhi_u64_vec256(numers, _mm256_set1_epi64x(denom->magic));
         if (more & LIBDIVIDE_ADD_MARKER) {
             // uint32_t t = ((numer - q) >> 1) + q;
             // return t >> denom->shift;
             uint32_t shift = more & LIBDIVIDE_64_SHIFT_MASK;
             __m256i t = _mm256_add_epi64(_mm256_srli_epi64(_mm256_sub_epi64(numers, q), 1), q);
             return _mm256_srli_epi64(t, shift);
-        }
-        else {
+        } else {
             return _mm256_srli_epi64(q, more);
         }
     }
 }
 
-__m256i libdivide_u64_branchfree_do_vector(__m256i numers, const struct libdivide_u64_branchfree_t *denom) {
-    __m256i q = libdivide_mullhi_u64_vector(numers, _mm256_set1_epi64x(denom->magic));
+__m256i libdivide_u64_branchfree_do_vec256(
+    __m256i numers, const struct libdivide_u64_branchfree_t *denom) {
+    __m256i q = libdivide_mullhi_u64_vec256(numers, _mm256_set1_epi64x(denom->magic));
     __m256i t = _mm256_add_epi64(_mm256_srli_epi64(_mm256_sub_epi64(numers, q), 1), q);
     return _mm256_srli_epi64(t, denom->more);
 }
 
 ////////// SINT32
 
-__m256i libdivide_s32_do_vector(__m256i numers, const struct libdivide_s32_t *denom) {
+__m256i libdivide_s32_do_vec256(__m256i numers, const struct libdivide_s32_t *denom) {
     uint8_t more = denom->more;
     if (!denom->magic) {
         uint32_t shift = more & LIBDIVIDE_32_SHIFT_MASK;
         uint32_t mask = (1U << shift) - 1;
         __m256i roundToZeroTweak = _mm256_set1_epi32(mask);
         // q = numer + ((numer >> 31) & roundToZeroTweak);
-        __m256i q = _mm256_add_epi32(numers, _mm256_and_si256(_mm256_srai_epi32(numers, 31), roundToZeroTweak));
+        __m256i q = _mm256_add_epi32(
+            numers, _mm256_and_si256(_mm256_srai_epi32(numers, 31), roundToZeroTweak));
         q = _mm256_srai_epi32(q, shift);
         __m256i sign = _mm256_set1_epi32((int8_t)more >> 7);
         // q = (q ^ sign) - sign;
         q = _mm256_sub_epi32(_mm256_xor_si256(q, sign), sign);
         return q;
-    }
-    else {
-        __m256i q = libdivide_mullhi_s32_vector(numers, _mm256_set1_epi32(denom->magic));
+    } else {
+        __m256i q = libdivide_mullhi_s32_vec256(numers, _mm256_set1_epi32(denom->magic));
         if (more & LIBDIVIDE_ADD_MARKER) {
-             // must be arithmetic shift
+            // must be arithmetic shift
             __m256i sign = _mm256_set1_epi32((int8_t)more >> 7);
-             // q += ((numer ^ sign) - sign);
+            // q += ((numer ^ sign) - sign);
             q = _mm256_add_epi32(q, _mm256_sub_epi32(_mm256_xor_si256(numers, sign), sign));
         }
         // q >>= shift
         q = _mm256_srai_epi32(q, more & LIBDIVIDE_32_SHIFT_MASK);
-        q = _mm256_add_epi32(q, _mm256_srli_epi32(q, 31)); // q += (q < 0)
+        q = _mm256_add_epi32(q, _mm256_srli_epi32(q, 31));  // q += (q < 0)
         return q;
     }
 }
 
-__m256i libdivide_s32_branchfree_do_vector(__m256i numers, const struct libdivide_s32_branchfree_t *denom) {
+__m256i libdivide_s32_branchfree_do_vec256(
+    __m256i numers, const struct libdivide_s32_branchfree_t *denom) {
     int32_t magic = denom->magic;
     uint8_t more = denom->more;
     uint8_t shift = more & LIBDIVIDE_32_SHIFT_MASK;
-     // must be arithmetic shift
+    // must be arithmetic shift
     __m256i sign = _mm256_set1_epi32((int8_t)more >> 7);
-    __m256i q = libdivide_mullhi_s32_vector(numers, _mm256_set1_epi32(magic));
-    q = _mm256_add_epi32(q, numers); // q += numers
+    __m256i q = libdivide_mullhi_s32_vec256(numers, _mm256_set1_epi32(magic));
+    q = _mm256_add_epi32(q, numers);  // q += numers
 
     // If q is non-negative, we have nothing to do
     // If q is negative, we want to add either (2**shift)-1 if d is
     // a power of 2, or (2**shift) if it is not a power of 2
     uint32_t is_power_of_2 = (magic == 0);
-    __m256i q_sign = _mm256_srai_epi32(q, 31); // q_sign = q >> 31
+    __m256i q_sign = _mm256_srai_epi32(q, 31);  // q_sign = q >> 31
     __m256i mask = _mm256_set1_epi32((1U << shift) - is_power_of_2);
-    q = _mm256_add_epi32(q, _mm256_and_si256(q_sign, mask)); // q = q + (q_sign & mask)
-    q = _mm256_srai_epi32(q, shift); // q >>= shift
-    q = _mm256_sub_epi32(_mm256_xor_si256(q, sign), sign); // q = (q ^ sign) - sign
+    q = _mm256_add_epi32(q, _mm256_and_si256(q_sign, mask));  // q = q + (q_sign & mask)
+    q = _mm256_srai_epi32(q, shift);                          // q >>= shift
+    q = _mm256_sub_epi32(_mm256_xor_si256(q, sign), sign);    // q = (q ^ sign) - sign
     return q;
 }
 
 ////////// SINT64
 
-__m256i libdivide_s64_do_vector(__m256i numers, const struct libdivide_s64_t *denom) {
+__m256i libdivide_s64_do_vec256(__m256i numers, const struct libdivide_s64_t *denom) {
     uint8_t more = denom->more;
     int64_t magic = denom->magic;
-    if (magic == 0) { // shift path
+    if (magic == 0) {  // shift path
         uint32_t shift = more & LIBDIVIDE_64_SHIFT_MASK;
         uint64_t mask = (1ULL << shift) - 1;
         __m256i roundToZeroTweak = _mm256_set1_epi64x(mask);
         // q = numer + ((numer >> 63) & roundToZeroTweak);
-        __m256i q = _mm256_add_epi64(numers, _mm256_and_si256(libdivide_s64_signbits(numers), roundToZeroTweak));
-        q = libdivide_s64_shift_right_vector(q, shift);
+        __m256i q = _mm256_add_epi64(
+            numers, _mm256_and_si256(libdivide_s64_signbits(numers), roundToZeroTweak));
+        q = libdivide_s64_shift_right_vec256(q, shift);
         __m256i sign = _mm256_set1_epi32((int8_t)more >> 7);
-         // q = (q ^ sign) - sign;
+        // q = (q ^ sign) - sign;
         q = _mm256_sub_epi64(_mm256_xor_si256(q, sign), sign);
         return q;
-    }
-    else {
-        __m256i q = libdivide_mullhi_s64_vector(numers, _mm256_set1_epi64x(magic));
+    } else {
+        __m256i q = libdivide_mullhi_s64_vec256(numers, _mm256_set1_epi64x(magic));
         if (more & LIBDIVIDE_ADD_MARKER) {
             // must be arithmetic shift
             __m256i sign = _mm256_set1_epi32((int8_t)more >> 7);
@@ -1655,46 +1931,53 @@ __m256i libdivide_s64_do_vector(__m256i numers, const struct libdivide_s64_t *de
             q = _mm256_add_epi64(q, _mm256_sub_epi64(_mm256_xor_si256(numers, sign), sign));
         }
         // q >>= denom->mult_path.shift
-        q = libdivide_s64_shift_right_vector(q, more & LIBDIVIDE_64_SHIFT_MASK);
-        q = _mm256_add_epi64(q, _mm256_srli_epi64(q, 63)); // q += (q < 0)
+        q = libdivide_s64_shift_right_vec256(q, more & LIBDIVIDE_64_SHIFT_MASK);
+        q = _mm256_add_epi64(q, _mm256_srli_epi64(q, 63));  // q += (q < 0)
         return q;
     }
 }
 
-__m256i libdivide_s64_branchfree_do_vector(__m256i numers, const struct libdivide_s64_branchfree_t *denom) {
+__m256i libdivide_s64_branchfree_do_vec256(
+    __m256i numers, const struct libdivide_s64_branchfree_t *denom) {
     int64_t magic = denom->magic;
     uint8_t more = denom->more;
     uint8_t shift = more & LIBDIVIDE_64_SHIFT_MASK;
     // must be arithmetic shift
     __m256i sign = _mm256_set1_epi32((int8_t)more >> 7);
 
-     // libdivide_mullhi_s64(numers, magic);
-    __m256i q = libdivide_mullhi_s64_vector(numers, _mm256_set1_epi64x(magic));
-    q = _mm256_add_epi64(q, numers); // q += numers
+    // libdivide_mullhi_s64(numers, magic);
+    __m256i q = libdivide_mullhi_s64_vec256(numers, _mm256_set1_epi64x(magic));
+    q = _mm256_add_epi64(q, numers);  // q += numers
 
     // If q is non-negative, we have nothing to do.
     // If q is negative, we want to add either (2**shift)-1 if d is
     // a power of 2, or (2**shift) if it is not a power of 2.
     uint32_t is_power_of_2 = (magic == 0);
-    __m256i q_sign = libdivide_s64_signbits(q); // q_sign = q >> 63
+    __m256i q_sign = libdivide_s64_signbits(q);  // q_sign = q >> 63
     __m256i mask = _mm256_set1_epi64x((1ULL << shift) - is_power_of_2);
-    q = _mm256_add_epi64(q, _mm256_and_si256(q_sign, mask)); // q = q + (q_sign & mask)
-    q = libdivide_s64_shift_right_vector(q, shift); // q >>= shift
-    q = _mm256_sub_epi64(_mm256_xor_si256(q, sign), sign); // q = (q ^ sign) - sign
+    q = _mm256_add_epi64(q, _mm256_and_si256(q_sign, mask));  // q = q + (q_sign & mask)
+    q = libdivide_s64_shift_right_vec256(q, shift);           // q >>= shift
+    q = _mm256_sub_epi64(_mm256_xor_si256(q, sign), sign);    // q = (q ^ sign) - sign
     return q;
 }
 
-#elif defined(LIBDIVIDE_SSE2)
+#endif
 
-static inline __m128i libdivide_u32_do_vector(__m128i numers, const struct libdivide_u32_t *denom);
-static inline __m128i libdivide_s32_do_vector(__m128i numers, const struct libdivide_s32_t *denom);
-static inline __m128i libdivide_u64_do_vector(__m128i numers, const struct libdivide_u64_t *denom);
-static inline __m128i libdivide_s64_do_vector(__m128i numers, const struct libdivide_s64_t *denom);
+#if defined(LIBDIVIDE_SSE2)
 
-static inline __m128i libdivide_u32_branchfree_do_vector(__m128i numers, const struct libdivide_u32_branchfree_t *denom);
-static inline __m128i libdivide_s32_branchfree_do_vector(__m128i numers, const struct libdivide_s32_branchfree_t *denom);
-static inline __m128i libdivide_u64_branchfree_do_vector(__m128i numers, const struct libdivide_u64_branchfree_t *denom);
-static inline __m128i libdivide_s64_branchfree_do_vector(__m128i numers, const struct libdivide_s64_branchfree_t *denom);
+static inline __m128i libdivide_u32_do_vec128(__m128i numers, const struct libdivide_u32_t *denom);
+static inline __m128i libdivide_s32_do_vec128(__m128i numers, const struct libdivide_s32_t *denom);
+static inline __m128i libdivide_u64_do_vec128(__m128i numers, const struct libdivide_u64_t *denom);
+static inline __m128i libdivide_s64_do_vec128(__m128i numers, const struct libdivide_s64_t *denom);
+
+static inline __m128i libdivide_u32_branchfree_do_vec128(
+    __m128i numers, const struct libdivide_u32_branchfree_t *denom);
+static inline __m128i libdivide_s32_branchfree_do_vec128(
+    __m128i numers, const struct libdivide_s32_branchfree_t *denom);
+static inline __m128i libdivide_u64_branchfree_do_vec128(
+    __m128i numers, const struct libdivide_u64_branchfree_t *denom);
+static inline __m128i libdivide_s64_branchfree_do_vec128(
+    __m128i numers, const struct libdivide_s64_branchfree_t *denom);
 
 //////// Internal Utility Functions
 
@@ -1706,7 +1989,7 @@ static inline __m128i libdivide_s64_signbits(__m128i v) {
 }
 
 // Implementation of _mm_srai_epi64 (from AVX512).
-static inline __m128i libdivide_s64_shift_right_vector(__m128i v, int amt) {
+static inline __m128i libdivide_s64_shift_right_vec128(__m128i v, int amt) {
     const int b = 64 - amt;
     __m128i m = _mm_set1_epi64x(1ULL << (b - 1));
     __m128i x = _mm_srli_epi64(v, amt);
@@ -1715,7 +1998,7 @@ static inline __m128i libdivide_s64_shift_right_vector(__m128i v, int amt) {
 }
 
 // Here, b is assumed to contain one 32-bit value repeated.
-static inline __m128i libdivide_mullhi_u32_vector(__m128i a, __m128i b) {
+static inline __m128i libdivide_mullhi_u32_vec128(__m128i a, __m128i b) {
     __m128i hi_product_0Z2Z = _mm_srli_epi64(_mm_mul_epu32(a, b), 32);
     __m128i a1X3X = _mm_srli_epi64(a, 32);
     __m128i mask = _mm_set_epi32(-1, 0, -1, 0);
@@ -1726,8 +2009,8 @@ static inline __m128i libdivide_mullhi_u32_vector(__m128i a, __m128i b) {
 // SSE2 does not have a signed multiplication instruction, but we can convert
 // unsigned to signed pretty efficiently. Again, b is just a 32 bit value
 // repeated four times.
-static inline __m128i libdivide_mullhi_s32_vector(__m128i a, __m128i b) {
-    __m128i p = libdivide_mullhi_u32_vector(a, b);
+static inline __m128i libdivide_mullhi_s32_vec128(__m128i a, __m128i b) {
+    __m128i p = libdivide_mullhi_u32_vec128(a, b);
     // t1 = (a >> 31) & y, arithmetic shift
     __m128i t1 = _mm_and_si128(_mm_srai_epi32(a, 31), b);
     __m128i t2 = _mm_and_si128(_mm_srai_epi32(b, 31), a);
@@ -1737,30 +2020,41 @@ static inline __m128i libdivide_mullhi_s32_vector(__m128i a, __m128i b) {
 }
 
 // Here, y is assumed to contain one 64-bit value repeated.
-// https://stackoverflow.com/a/28827013
-static inline __m128i libdivide_mullhi_u64_vector(__m128i x, __m128i y) {
-    __m128i lomask = _mm_set1_epi64x(0xffffffff);
-    __m128i xh = _mm_shuffle_epi32(x, 0xB1);        // x0l, x0h, x1l, x1h
-    __m128i yh = _mm_shuffle_epi32(y, 0xB1);        // y0l, y0h, y1l, y1h
-    __m128i w0 = _mm_mul_epu32(x, y);               // x0l*y0l, x1l*y1l
-    __m128i w1 = _mm_mul_epu32(x, yh);              // x0l*y0h, x1l*y1h
-    __m128i w2 = _mm_mul_epu32(xh, y);              // x0h*y0l, x1h*y0l
-    __m128i w3 = _mm_mul_epu32(xh, yh);             // x0h*y0h, x1h*y1h
-    __m128i w0h = _mm_srli_epi64(w0, 32);
-    __m128i s1 = _mm_add_epi64(w1, w0h);
-    __m128i s1l = _mm_and_si128(s1, lomask);
-    __m128i s1h = _mm_srli_epi64(s1, 32);
-    __m128i s2 = _mm_add_epi64(w2, s1l);
-    __m128i s2h = _mm_srli_epi64(s2, 32);
-    __m128i hi = _mm_add_epi64(w3, s1h);
-            hi = _mm_add_epi64(hi, s2h);
+static inline __m128i libdivide_mullhi_u64_vec128(__m128i x, __m128i y) {
+    // full 128 bits product is:
+    // x0*y0 + (x0*y1 << 32) + (x1*y0 << 32) + (x1*y1 << 64)
+    // Note x0,y0,x1,y1 are all conceptually uint32, products are 32x32->64.
 
-    return hi;
+    // Compute x0*y0.
+    // Note x1, y1 are ignored by mul_epu32.
+    __m128i x0y0 = _mm_mul_epu32(x, y);
+    __m128i x0y0_hi = _mm_srli_epi64(x0y0, 32);
+
+    // Get x1, y1 in the low bits.
+    // We could shuffle or right shift. Shuffles are preferred as they preserve
+    // the source register for the next computation.
+    __m128i x1 = _mm_shuffle_epi32(x, _MM_SHUFFLE(3, 3, 1, 1));
+    __m128i y1 = _mm_shuffle_epi32(y, _MM_SHUFFLE(3, 3, 1, 1));
+
+    // No need to mask off top 32 bits for mul_epu32.
+    __m128i x0y1 = _mm_mul_epu32(x, y1);
+    __m128i x1y0 = _mm_mul_epu32(x1, y);
+    __m128i x1y1 = _mm_mul_epu32(x1, y1);
+
+    // Mask here selects low bits only.
+    __m128i mask = _mm_set1_epi64x(0xFFFFFFFF);
+    __m128i temp = _mm_add_epi64(x1y0, x0y0_hi);
+    __m128i temp_lo = _mm_and_si128(temp, mask);
+    __m128i temp_hi = _mm_srli_epi64(temp, 32);
+
+    temp_lo = _mm_srli_epi64(_mm_add_epi64(temp_lo, x0y1), 32);
+    temp_hi = _mm_add_epi64(x1y1, temp_hi);
+    return _mm_add_epi64(temp_lo, temp_hi);
 }
 
 // y is one 64-bit value repeated.
-static inline __m128i libdivide_mullhi_s64_vector(__m128i x, __m128i y) {
-    __m128i p = libdivide_mullhi_u64_vector(x, y);
+static inline __m128i libdivide_mullhi_s64_vec128(__m128i x, __m128i y) {
+    __m128i p = libdivide_mullhi_u64_vec128(x, y);
     __m128i t1 = _mm_and_si128(libdivide_s64_signbits(x), y);
     __m128i t2 = _mm_and_si128(libdivide_s64_signbits(y), x);
     p = _mm_sub_epi64(p, t1);
@@ -1770,131 +2064,130 @@ static inline __m128i libdivide_mullhi_s64_vector(__m128i x, __m128i y) {
 
 ////////// UINT32
 
-__m128i libdivide_u32_do_vector(__m128i numers, const struct libdivide_u32_t *denom) {
+__m128i libdivide_u32_do_vec128(__m128i numers, const struct libdivide_u32_t *denom) {
     uint8_t more = denom->more;
     if (!denom->magic) {
         return _mm_srli_epi32(numers, more);
-    }
-    else {
-        __m128i q = libdivide_mullhi_u32_vector(numers, _mm_set1_epi32(denom->magic));
+    } else {
+        __m128i q = libdivide_mullhi_u32_vec128(numers, _mm_set1_epi32(denom->magic));
         if (more & LIBDIVIDE_ADD_MARKER) {
             // uint32_t t = ((numer - q) >> 1) + q;
             // return t >> denom->shift;
             uint32_t shift = more & LIBDIVIDE_32_SHIFT_MASK;
             __m128i t = _mm_add_epi32(_mm_srli_epi32(_mm_sub_epi32(numers, q), 1), q);
             return _mm_srli_epi32(t, shift);
-        }
-        else {
+        } else {
             return _mm_srli_epi32(q, more);
         }
     }
 }
 
-__m128i libdivide_u32_branchfree_do_vector(__m128i numers, const struct libdivide_u32_branchfree_t *denom) {
-    __m128i q = libdivide_mullhi_u32_vector(numers, _mm_set1_epi32(denom->magic));
+__m128i libdivide_u32_branchfree_do_vec128(
+    __m128i numers, const struct libdivide_u32_branchfree_t *denom) {
+    __m128i q = libdivide_mullhi_u32_vec128(numers, _mm_set1_epi32(denom->magic));
     __m128i t = _mm_add_epi32(_mm_srli_epi32(_mm_sub_epi32(numers, q), 1), q);
     return _mm_srli_epi32(t, denom->more);
 }
 
 ////////// UINT64
 
-__m128i libdivide_u64_do_vector(__m128i numers, const struct libdivide_u64_t *denom) {
+__m128i libdivide_u64_do_vec128(__m128i numers, const struct libdivide_u64_t *denom) {
     uint8_t more = denom->more;
     if (!denom->magic) {
         return _mm_srli_epi64(numers, more);
-    }
-    else {
-        __m128i q = libdivide_mullhi_u64_vector(numers, _mm_set1_epi64x(denom->magic));
+    } else {
+        __m128i q = libdivide_mullhi_u64_vec128(numers, _mm_set1_epi64x(denom->magic));
         if (more & LIBDIVIDE_ADD_MARKER) {
             // uint32_t t = ((numer - q) >> 1) + q;
             // return t >> denom->shift;
             uint32_t shift = more & LIBDIVIDE_64_SHIFT_MASK;
             __m128i t = _mm_add_epi64(_mm_srli_epi64(_mm_sub_epi64(numers, q), 1), q);
             return _mm_srli_epi64(t, shift);
-        }
-        else {
+        } else {
             return _mm_srli_epi64(q, more);
         }
     }
 }
 
-__m128i libdivide_u64_branchfree_do_vector(__m128i numers, const struct libdivide_u64_branchfree_t *denom) {
-    __m128i q = libdivide_mullhi_u64_vector(numers, _mm_set1_epi64x(denom->magic));
+__m128i libdivide_u64_branchfree_do_vec128(
+    __m128i numers, const struct libdivide_u64_branchfree_t *denom) {
+    __m128i q = libdivide_mullhi_u64_vec128(numers, _mm_set1_epi64x(denom->magic));
     __m128i t = _mm_add_epi64(_mm_srli_epi64(_mm_sub_epi64(numers, q), 1), q);
     return _mm_srli_epi64(t, denom->more);
 }
 
 ////////// SINT32
 
-__m128i libdivide_s32_do_vector(__m128i numers, const struct libdivide_s32_t *denom) {
+__m128i libdivide_s32_do_vec128(__m128i numers, const struct libdivide_s32_t *denom) {
     uint8_t more = denom->more;
     if (!denom->magic) {
         uint32_t shift = more & LIBDIVIDE_32_SHIFT_MASK;
         uint32_t mask = (1U << shift) - 1;
         __m128i roundToZeroTweak = _mm_set1_epi32(mask);
         // q = numer + ((numer >> 31) & roundToZeroTweak);
-        __m128i q = _mm_add_epi32(numers, _mm_and_si128(_mm_srai_epi32(numers, 31), roundToZeroTweak));
+        __m128i q =
+            _mm_add_epi32(numers, _mm_and_si128(_mm_srai_epi32(numers, 31), roundToZeroTweak));
         q = _mm_srai_epi32(q, shift);
         __m128i sign = _mm_set1_epi32((int8_t)more >> 7);
         // q = (q ^ sign) - sign;
         q = _mm_sub_epi32(_mm_xor_si128(q, sign), sign);
         return q;
-    }
-    else {
-        __m128i q = libdivide_mullhi_s32_vector(numers, _mm_set1_epi32(denom->magic));
+    } else {
+        __m128i q = libdivide_mullhi_s32_vec128(numers, _mm_set1_epi32(denom->magic));
         if (more & LIBDIVIDE_ADD_MARKER) {
-             // must be arithmetic shift
+            // must be arithmetic shift
             __m128i sign = _mm_set1_epi32((int8_t)more >> 7);
-             // q += ((numer ^ sign) - sign);
+            // q += ((numer ^ sign) - sign);
             q = _mm_add_epi32(q, _mm_sub_epi32(_mm_xor_si128(numers, sign), sign));
         }
         // q >>= shift
         q = _mm_srai_epi32(q, more & LIBDIVIDE_32_SHIFT_MASK);
-        q = _mm_add_epi32(q, _mm_srli_epi32(q, 31)); // q += (q < 0)
+        q = _mm_add_epi32(q, _mm_srli_epi32(q, 31));  // q += (q < 0)
         return q;
     }
 }
 
-__m128i libdivide_s32_branchfree_do_vector(__m128i numers, const struct libdivide_s32_branchfree_t *denom) {
+__m128i libdivide_s32_branchfree_do_vec128(
+    __m128i numers, const struct libdivide_s32_branchfree_t *denom) {
     int32_t magic = denom->magic;
     uint8_t more = denom->more;
     uint8_t shift = more & LIBDIVIDE_32_SHIFT_MASK;
-     // must be arithmetic shift
+    // must be arithmetic shift
     __m128i sign = _mm_set1_epi32((int8_t)more >> 7);
-    __m128i q = libdivide_mullhi_s32_vector(numers, _mm_set1_epi32(magic));
-    q = _mm_add_epi32(q, numers); // q += numers
+    __m128i q = libdivide_mullhi_s32_vec128(numers, _mm_set1_epi32(magic));
+    q = _mm_add_epi32(q, numers);  // q += numers
 
     // If q is non-negative, we have nothing to do
     // If q is negative, we want to add either (2**shift)-1 if d is
     // a power of 2, or (2**shift) if it is not a power of 2
     uint32_t is_power_of_2 = (magic == 0);
-    __m128i q_sign = _mm_srai_epi32(q, 31); // q_sign = q >> 31
+    __m128i q_sign = _mm_srai_epi32(q, 31);  // q_sign = q >> 31
     __m128i mask = _mm_set1_epi32((1U << shift) - is_power_of_2);
-    q = _mm_add_epi32(q, _mm_and_si128(q_sign, mask)); // q = q + (q_sign & mask)
-    q = _mm_srai_epi32(q, shift); // q >>= shift
-    q = _mm_sub_epi32(_mm_xor_si128(q, sign), sign); // q = (q ^ sign) - sign
+    q = _mm_add_epi32(q, _mm_and_si128(q_sign, mask));  // q = q + (q_sign & mask)
+    q = _mm_srai_epi32(q, shift);                       // q >>= shift
+    q = _mm_sub_epi32(_mm_xor_si128(q, sign), sign);    // q = (q ^ sign) - sign
     return q;
 }
 
 ////////// SINT64
 
-__m128i libdivide_s64_do_vector(__m128i numers, const struct libdivide_s64_t *denom) {
+__m128i libdivide_s64_do_vec128(__m128i numers, const struct libdivide_s64_t *denom) {
     uint8_t more = denom->more;
     int64_t magic = denom->magic;
-    if (magic == 0) { // shift path
+    if (magic == 0) {  // shift path
         uint32_t shift = more & LIBDIVIDE_64_SHIFT_MASK;
         uint64_t mask = (1ULL << shift) - 1;
         __m128i roundToZeroTweak = _mm_set1_epi64x(mask);
         // q = numer + ((numer >> 63) & roundToZeroTweak);
-        __m128i q = _mm_add_epi64(numers, _mm_and_si128(libdivide_s64_signbits(numers), roundToZeroTweak));
-        q = libdivide_s64_shift_right_vector(q, shift);
+        __m128i q =
+            _mm_add_epi64(numers, _mm_and_si128(libdivide_s64_signbits(numers), roundToZeroTweak));
+        q = libdivide_s64_shift_right_vec128(q, shift);
         __m128i sign = _mm_set1_epi32((int8_t)more >> 7);
-         // q = (q ^ sign) - sign;
+        // q = (q ^ sign) - sign;
         q = _mm_sub_epi64(_mm_xor_si128(q, sign), sign);
         return q;
-    }
-    else {
-        __m128i q = libdivide_mullhi_s64_vector(numers, _mm_set1_epi64x(magic));
+    } else {
+        __m128i q = libdivide_mullhi_s64_vec128(numers, _mm_set1_epi64x(magic));
         if (more & LIBDIVIDE_ADD_MARKER) {
             // must be arithmetic shift
             __m128i sign = _mm_set1_epi32((int8_t)more >> 7);
@@ -1902,32 +2195,33 @@ __m128i libdivide_s64_do_vector(__m128i numers, const struct libdivide_s64_t *de
             q = _mm_add_epi64(q, _mm_sub_epi64(_mm_xor_si128(numers, sign), sign));
         }
         // q >>= denom->mult_path.shift
-        q = libdivide_s64_shift_right_vector(q, more & LIBDIVIDE_64_SHIFT_MASK);
-        q = _mm_add_epi64(q, _mm_srli_epi64(q, 63)); // q += (q < 0)
+        q = libdivide_s64_shift_right_vec128(q, more & LIBDIVIDE_64_SHIFT_MASK);
+        q = _mm_add_epi64(q, _mm_srli_epi64(q, 63));  // q += (q < 0)
         return q;
     }
 }
 
-__m128i libdivide_s64_branchfree_do_vector(__m128i numers, const struct libdivide_s64_branchfree_t *denom) {
+__m128i libdivide_s64_branchfree_do_vec128(
+    __m128i numers, const struct libdivide_s64_branchfree_t *denom) {
     int64_t magic = denom->magic;
     uint8_t more = denom->more;
     uint8_t shift = more & LIBDIVIDE_64_SHIFT_MASK;
     // must be arithmetic shift
     __m128i sign = _mm_set1_epi32((int8_t)more >> 7);
 
-     // libdivide_mullhi_s64(numers, magic);
-    __m128i q = libdivide_mullhi_s64_vector(numers, _mm_set1_epi64x(magic));
-    q = _mm_add_epi64(q, numers); // q += numers
+    // libdivide_mullhi_s64(numers, magic);
+    __m128i q = libdivide_mullhi_s64_vec128(numers, _mm_set1_epi64x(magic));
+    q = _mm_add_epi64(q, numers);  // q += numers
 
     // If q is non-negative, we have nothing to do.
     // If q is negative, we want to add either (2**shift)-1 if d is
     // a power of 2, or (2**shift) if it is not a power of 2.
     uint32_t is_power_of_2 = (magic == 0);
-    __m128i q_sign = libdivide_s64_signbits(q); // q_sign = q >> 63
+    __m128i q_sign = libdivide_s64_signbits(q);  // q_sign = q >> 63
     __m128i mask = _mm_set1_epi64x((1ULL << shift) - is_power_of_2);
-    q = _mm_add_epi64(q, _mm_and_si128(q_sign, mask)); // q = q + (q_sign & mask)
-    q = libdivide_s64_shift_right_vector(q, shift); // q >>= shift
-    q = _mm_sub_epi64(_mm_xor_si128(q, sign), sign); // q = (q ^ sign) - sign
+    q = _mm_add_epi64(q, _mm_and_si128(q_sign, mask));  // q = q + (q_sign & mask)
+    q = libdivide_s64_shift_right_vec128(q, shift);     // q >>= shift
+    q = _mm_sub_epi64(_mm_xor_si128(q, sign), sign);    // q = (q ^ sign) - sign
     return q;
 }
 
@@ -1937,143 +2231,273 @@ __m128i libdivide_s64_branchfree_do_vector(__m128i numers, const struct libdivid
 
 #ifdef __cplusplus
 
-// The C++ divider class is templated on both an integer type
-// (like uint64_t) and an algorithm type.
-// * BRANCHFULL is the default algorithm type.
-// * BRANCHFREE is the branchfree algorithm type.
-enum {
-    BRANCHFULL,
-    BRANCHFREE
+enum Branching {
+    BRANCHFULL,  // use branching algorithms
+    BRANCHFREE   // use branchfree algorithms
 };
 
-#if defined(LIBDIVIDE_AVX512)
-    #define LIBDIVIDE_VECTOR_TYPE __m512i
-#elif defined(LIBDIVIDE_AVX2)
-    #define LIBDIVIDE_VECTOR_TYPE __m256i
-#elif defined(LIBDIVIDE_SSE2)
-    #define LIBDIVIDE_VECTOR_TYPE __m128i
+#if defined(LIBDIVIDE_NEON)
+// Helper to deduce NEON vector type for integral type.
+template <typename T>
+struct NeonVecFor {};
+
+template <>
+struct NeonVecFor<uint32_t> {
+    typedef uint32x4_t type;
+};
+
+template <>
+struct NeonVecFor<int32_t> {
+    typedef int32x4_t type;
+};
+
+template <>
+struct NeonVecFor<uint64_t> {
+    typedef uint64x2_t type;
+};
+
+template <>
+struct NeonVecFor<int64_t> {
+    typedef int64x2_t type;
+};
 #endif
 
-#if !defined(LIBDIVIDE_VECTOR_TYPE)
-    #define LIBDIVIDE_DIVIDE_VECTOR(ALGO)
+// Versions of our algorithms for SIMD.
+#if defined(LIBDIVIDE_NEON)
+#define LIBDIVIDE_DIVIDE_NEON(ALGO, INT_TYPE)                                                 \
+    typename NeonVecFor<INT_TYPE>::type divide(typename NeonVecFor<INT_TYPE>::type n) const { \
+        return libdivide_##ALGO##_do_vec128(n, &denom);                                       \
+    }
 #else
-    #define LIBDIVIDE_DIVIDE_VECTOR(ALGO) \
-        LIBDIVIDE_VECTOR_TYPE divide(LIBDIVIDE_VECTOR_TYPE n) const { \
-            return libdivide_##ALGO##_do_vector(n, &denom); \
-        }
+#define LIBDIVIDE_DIVIDE_NEON(ALGO, INT_TYPE)
+#endif
+#if defined(LIBDIVIDE_SSE2)
+#define LIBDIVIDE_DIVIDE_SSE2(ALGO) \
+    __m128i divide(__m128i n) const { return libdivide_##ALGO##_do_vec128(n, &denom); }
+#else
+#define LIBDIVIDE_DIVIDE_SSE2(ALGO)
+#endif
+
+#if defined(LIBDIVIDE_AVX2)
+#define LIBDIVIDE_DIVIDE_AVX2(ALGO) \
+    __m256i divide(__m256i n) const { return libdivide_##ALGO##_do_vec256(n, &denom); }
+#else
+#define LIBDIVIDE_DIVIDE_AVX2(ALGO)
+#endif
+
+#if defined(LIBDIVIDE_AVX512)
+#define LIBDIVIDE_DIVIDE_AVX512(ALGO) \
+    __m512i divide(__m512i n) const { return libdivide_##ALGO##_do_vec512(n, &denom); }
+#else
+#define LIBDIVIDE_DIVIDE_AVX512(ALGO)
 #endif
 
 // The DISPATCHER_GEN() macro generates C++ methods (for the given integer
 // and algorithm types) that redirect to libdivide's C API.
-#define DISPATCHER_GEN(T, ALGO) \
-    libdivide_##ALGO##_t denom; \
-    dispatcher() { } \
-    dispatcher(T d) \
-        : denom(libdivide_##ALGO##_gen(d)) \
-    { } \
-    T divide(T n) const { \
-        return libdivide_##ALGO##_do(n, &denom); \
-    } \
-    LIBDIVIDE_DIVIDE_VECTOR(ALGO) \
-    T recover() const { \
-        return libdivide_##ALGO##_recover(&denom); \
-    }
+#define DISPATCHER_GEN(T, ALGO)                                      \
+    libdivide_##ALGO##_t denom;                                      \
+    dispatcher() {}                                                  \
+    dispatcher(T d) : denom(libdivide_##ALGO##_gen(d)) {}            \
+    T divide(T n) const { return libdivide_##ALGO##_do(n, &denom); } \
+    T recover() const { return libdivide_##ALGO##_recover(&denom); } \
+    LIBDIVIDE_DIVIDE_NEON(ALGO, T)                                   \
+    LIBDIVIDE_DIVIDE_SSE2(ALGO)                                      \
+    LIBDIVIDE_DIVIDE_AVX2(ALGO)                                      \
+    LIBDIVIDE_DIVIDE_AVX512(ALGO)
 
 // The dispatcher selects a specific division algorithm for a given
 // type and ALGO using partial template specialization.
-template<bool IS_INTEGRAL, bool IS_SIGNED, int SIZEOF, int ALGO> struct dispatcher { };
+template <bool IS_INTEGRAL, bool IS_SIGNED, int SIZEOF, Branching ALGO>
+struct dispatcher {};
 
-template<> struct dispatcher<true, true, sizeof(int32_t), BRANCHFULL> { DISPATCHER_GEN(int32_t, s32) };
-template<> struct dispatcher<true, true, sizeof(int32_t), BRANCHFREE> { DISPATCHER_GEN(int32_t, s32_branchfree) };
-template<> struct dispatcher<true, false, sizeof(uint32_t), BRANCHFULL> { DISPATCHER_GEN(uint32_t, u32) };
-template<> struct dispatcher<true, false, sizeof(uint32_t), BRANCHFREE> { DISPATCHER_GEN(uint32_t, u32_branchfree) };
-template<> struct dispatcher<true, true, sizeof(int64_t), BRANCHFULL> { DISPATCHER_GEN(int64_t, s64) };
-template<> struct dispatcher<true, true, sizeof(int64_t), BRANCHFREE> { DISPATCHER_GEN(int64_t, s64_branchfree) };
-template<> struct dispatcher<true, false, sizeof(uint64_t), BRANCHFULL> { DISPATCHER_GEN(uint64_t, u64) };
-template<> struct dispatcher<true, false, sizeof(uint64_t), BRANCHFREE> { DISPATCHER_GEN(uint64_t, u64_branchfree) };
+template <>
+struct dispatcher<true, true, sizeof(int32_t), BRANCHFULL> {
+    DISPATCHER_GEN(int32_t, s32)
+};
+template <>
+struct dispatcher<true, true, sizeof(int32_t), BRANCHFREE> {
+    DISPATCHER_GEN(int32_t, s32_branchfree)
+};
+template <>
+struct dispatcher<true, false, sizeof(uint32_t), BRANCHFULL> {
+    DISPATCHER_GEN(uint32_t, u32)
+};
+template <>
+struct dispatcher<true, false, sizeof(uint32_t), BRANCHFREE> {
+    DISPATCHER_GEN(uint32_t, u32_branchfree)
+};
+template <>
+struct dispatcher<true, true, sizeof(int64_t), BRANCHFULL> {
+    DISPATCHER_GEN(int64_t, s64)
+};
+template <>
+struct dispatcher<true, true, sizeof(int64_t), BRANCHFREE> {
+    DISPATCHER_GEN(int64_t, s64_branchfree)
+};
+template <>
+struct dispatcher<true, false, sizeof(uint64_t), BRANCHFULL> {
+    DISPATCHER_GEN(uint64_t, u64)
+};
+template <>
+struct dispatcher<true, false, sizeof(uint64_t), BRANCHFREE> {
+    DISPATCHER_GEN(uint64_t, u64_branchfree)
+};
 
 // This is the main divider class for use by the user (C++ API).
 // The actual division algorithm is selected using the dispatcher struct
 // based on the integer and algorithm template parameters.
-template<typename T, int ALGO = BRANCHFULL>
+template <typename T, Branching ALGO = BRANCHFULL>
 class divider {
-public:
+   public:
     // We leave the default constructor empty so that creating
     // an array of dividers and then initializing them
     // later doesn't slow us down.
-    divider() { }
+    divider() {}
 
     // Constructor that takes the divisor as a parameter
-    divider(T d) : div(d) { }
+    divider(T d) : div(d) {}
 
     // Divides n by the divisor
-    T divide(T n) const {
-        return div.divide(n);
-    }
+    T divide(T n) const { return div.divide(n); }
 
     // Recovers the divisor, returns the value that was
     // used to initialize this divider object.
-    T recover() const {
-        return div.recover();
+    T recover() const { return div.recover(); }
+
+    bool operator==(const divider<T, ALGO> &other) const {
+        return div.denom.magic == other.denom.magic && div.denom.more == other.denom.more;
     }
 
-    bool operator==(const divider<T, ALGO>& other) const {
-        return div.denom.magic == other.denom.magic &&
-               div.denom.more == other.denom.more;
-    }
+    bool operator!=(const divider<T, ALGO> &other) const { return !(*this == other); }
 
-    bool operator!=(const divider<T, ALGO>& other) const {
-        return !(*this == other);
-    }
-
-#if defined(LIBDIVIDE_VECTOR_TYPE)
-    // Treats the vector as packed integer values with the same type as
-    // the divider (e.g. s32, u32, s64, u64) and divides each of
-    // them by the divider, returning the packed quotients.
-    LIBDIVIDE_VECTOR_TYPE divide(LIBDIVIDE_VECTOR_TYPE n) const {
+    // Vector variants treat the input as packed integer values with the same type as the divider
+    // (e.g. s32, u32, s64, u64) and divides each of them by the divider, returning the packed
+    // quotients.
+#if defined(LIBDIVIDE_SSE2)
+    __m128i divide(__m128i n) const { return div.divide(n); }
+#endif
+#if defined(LIBDIVIDE_AVX2)
+    __m256i divide(__m256i n) const { return div.divide(n); }
+#endif
+#if defined(LIBDIVIDE_AVX512)
+    __m512i divide(__m512i n) const { return div.divide(n); }
+#endif
+#if defined(LIBDIVIDE_NEON)
+    typename NeonVecFor<T>::type divide(typename NeonVecFor<T>::type n) const {
         return div.divide(n);
     }
 #endif
 
-private:
+   private:
     // Storage for the actual divisor
-    dispatcher<std::is_integral<T>::value,
-               std::is_signed<T>::value, sizeof(T), ALGO> div;
+    dispatcher<std::is_integral<T>::value, std::is_signed<T>::value, sizeof(T), ALGO> div;
 };
 
 // Overload of operator / for scalar division
-template<typename T, int ALGO>
-T operator/(T n, const divider<T, ALGO>& div) {
+template <typename T, Branching ALGO>
+T operator/(T n, const divider<T, ALGO> &div) {
     return div.divide(n);
 }
 
 // Overload of operator /= for scalar division
-template<typename T, int ALGO>
-T& operator/=(T& n, const divider<T, ALGO>& div) {
+template <typename T, Branching ALGO>
+T &operator/=(T &n, const divider<T, ALGO> &div) {
     n = div.divide(n);
     return n;
 }
 
-#if defined(LIBDIVIDE_VECTOR_TYPE)
-    // Overload of operator / for vector division
-    template<typename T, int ALGO>
-    LIBDIVIDE_VECTOR_TYPE operator/(LIBDIVIDE_VECTOR_TYPE n, const divider<T, ALGO>& div) {
-        return div.divide(n);
-    }
-    // Overload of operator /= for vector division
-    template<typename T, int ALGO>
-    LIBDIVIDE_VECTOR_TYPE& operator/=(LIBDIVIDE_VECTOR_TYPE& n, const divider<T, ALGO>& div) {
-        n = div.divide(n);
-        return n;
-    }
+// Overloads for vector types.
+#if defined(LIBDIVIDE_SSE2)
+template <typename T, Branching ALGO>
+__m128i operator/(__m128i n, const divider<T, ALGO> &div) {
+    return div.divide(n);
+}
+
+template <typename T, Branching ALGO>
+__m128i operator/=(__m128i &n, const divider<T, ALGO> &div) {
+    n = div.divide(n);
+    return n;
+}
+#endif
+#if defined(LIBDIVIDE_AVX2)
+template <typename T, Branching ALGO>
+__m256i operator/(__m256i n, const divider<T, ALGO> &div) {
+    return div.divide(n);
+}
+
+template <typename T, Branching ALGO>
+__m256i operator/=(__m256i &n, const divider<T, ALGO> &div) {
+    n = div.divide(n);
+    return n;
+}
+#endif
+#if defined(LIBDIVIDE_AVX512)
+template <typename T, Branching ALGO>
+__m512i operator/(__m512i n, const divider<T, ALGO> &div) {
+    return div.divide(n);
+}
+
+template <typename T, Branching ALGO>
+__m512i operator/=(__m512i &n, const divider<T, ALGO> &div) {
+    n = div.divide(n);
+    return n;
+}
 #endif
 
-// libdivdie::branchfree_divider<T>
+#if defined(LIBDIVIDE_NEON)
+template <Branching ALGO>
+uint32x4_t operator/(uint32x4_t n, const divider<uint32_t, ALGO> &div) {
+    return div.divide(n);
+}
+
+template <Branching ALGO>
+int32x4_t operator/(int32x4_t n, const divider<int32_t, ALGO> &div) {
+    return div.divide(n);
+}
+
+template <Branching ALGO>
+uint64x2_t operator/(uint64x2_t n, const divider<uint64_t, ALGO> &div) {
+    return div.divide(n);
+}
+
+template <Branching ALGO>
+int64x2_t operator/(int64x2_t n, const divider<int64_t, ALGO> &div) {
+    return div.divide(n);
+}
+
+template <Branching ALGO>
+uint32x4_t operator/=(uint32x4_t &n, const divider<uint32_t, ALGO> &div) {
+    n = div.divide(n);
+    return n;
+}
+
+template <Branching ALGO>
+int32x4_t operator/=(int32x4_t &n, const divider<int32_t, ALGO> &div) {
+    n = div.divide(n);
+    return n;
+}
+
+template <Branching ALGO>
+uint64x2_t operator/=(uint64x2_t &n, const divider<uint64_t, ALGO> &div) {
+    n = div.divide(n);
+    return n;
+}
+
+template <Branching ALGO>
+int64x2_t operator/=(int64x2_t &n, const divider<int64_t, ALGO> &div) {
+    n = div.divide(n);
+    return n;
+}
+#endif
+
+#if __cplusplus >= 201103L || (defined(_MSC_VER) && _MSC_VER >= 1900)
+// libdivide::branchfree_divider<T>
 template <typename T>
 using branchfree_divider = divider<T, BRANCHFREE>;
+#endif
 
-} // namespace libdivide
+}  // namespace libdivide
 
-#endif // __cplusplus
+#endif  // __cplusplus
 
-#endif // LIBDIVIDE_H
+#endif  // LIBDIVIDE_H
diff --git a/contrib/libpq b/contrib/libpq
index 1f9c286dba6..c7624588ddd 160000
--- a/contrib/libpq
+++ b/contrib/libpq
@@ -1 +1 @@
-Subproject commit 1f9c286dba60809edb64e384d6727d80d269b6cf
+Subproject commit c7624588ddd84f153dd5990e81b886e4568bddde
diff --git a/contrib/librdkafka-cmake/config.h.in b/contrib/librdkafka-cmake/config.h.in
index 80b6ea61b6e..9fecb45e42d 100644
--- a/contrib/librdkafka-cmake/config.h.in
+++ b/contrib/librdkafka-cmake/config.h.in
@@ -66,7 +66,7 @@
 #cmakedefine WITH_SASL_OAUTHBEARER 1
 #cmakedefine WITH_SASL_CYRUS 1
 // crc32chw
-#if !defined(__PPC__) && (!defined(__aarch64__) || defined(__ARM_FEATURE_CRC32))
+#if !defined(__PPC__) && (!defined(__aarch64__) || defined(__ARM_FEATURE_CRC32)) && !(defined(__aarch64__) && defined(__APPLE__))
 #define WITH_CRC32C_HW 1
 #endif
 // regex
@@ -75,6 +75,8 @@
 #define HAVE_STRNDUP 1
 // strerror_r
 #define HAVE_STRERROR_R 1
+// rand_r
+#define HAVE_RAND_R 1
 
 #ifdef __APPLE__
 // pthread_setname_np
diff --git a/contrib/mariadb-connector-c b/contrib/mariadb-connector-c
index 21f451d4d31..5f4034a3a63 160000
--- a/contrib/mariadb-connector-c
+++ b/contrib/mariadb-connector-c
@@ -1 +1 @@
-Subproject commit 21f451d4d3157ffed31ec60a8b76c407190e66bd
+Subproject commit 5f4034a3a6376416504f17186c55fe401c6d8e5e
diff --git a/contrib/nanodbc b/contrib/nanodbc
new file mode 160000
index 00000000000..9fc45967551
--- /dev/null
+++ b/contrib/nanodbc
@@ -0,0 +1 @@
+Subproject commit 9fc459675515d491401727ec67fca38db721f28c
diff --git a/contrib/nanodbc-cmake/CMakeLists.txt b/contrib/nanodbc-cmake/CMakeLists.txt
new file mode 100644
index 00000000000..1673b311c49
--- /dev/null
+++ b/contrib/nanodbc-cmake/CMakeLists.txt
@@ -0,0 +1,18 @@
+if (NOT USE_INTERNAL_NANODBC_LIBRARY)
+    return ()
+endif ()
+
+set (LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/nanodbc)
+
+if (NOT TARGET unixodbc)
+    message(FATAL_ERROR "Configuration error: unixodbc is not a target")
+endif()
+
+set (SRCS
+    ${LIBRARY_DIR}/nanodbc/nanodbc.cpp
+)
+
+add_library(nanodbc ${SRCS})
+
+target_link_libraries (nanodbc PUBLIC unixodbc)
+target_include_directories (nanodbc SYSTEM PUBLIC ${LIBRARY_DIR}/)
diff --git a/contrib/openldap-cmake/darwin_aarch64/include/lber_types.h b/contrib/openldap-cmake/darwin_aarch64/include/lber_types.h
new file mode 100644
index 00000000000..dbd59430527
--- /dev/null
+++ b/contrib/openldap-cmake/darwin_aarch64/include/lber_types.h
@@ -0,0 +1,63 @@
+/* include/lber_types.h. Generated from lber_types.hin by configure. */
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2020 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+
+/*
+ * LBER types
+ */
+
+#ifndef _LBER_TYPES_H
+#define _LBER_TYPES_H
+
+#include <ldap_cdefs.h>
+
+LDAP_BEGIN_DECL
+
+/* LBER boolean, enum, integers (32 bits or larger) */
+#define LBER_INT_T int
+
+/* LBER tags (32 bits or larger) */
+#define LBER_TAG_T long
+
+/* LBER socket descriptor */
+#define LBER_SOCKET_T int
+
+/* LBER lengths (32 bits or larger) */
+#define LBER_LEN_T long
+
+/* ------------------------------------------------------------ */
+
+/* booleans, enumerations, and integers */
+typedef LBER_INT_T ber_int_t;
+
+/* signed and unsigned versions */
+typedef signed LBER_INT_T ber_sint_t;
+typedef unsigned LBER_INT_T ber_uint_t;
+
+/* tags */
+typedef unsigned LBER_TAG_T ber_tag_t;
+
+/* "socket" descriptors */
+typedef LBER_SOCKET_T ber_socket_t;
+
+/* lengths */
+typedef unsigned LBER_LEN_T ber_len_t;
+
+/* signed lengths */
+typedef signed LBER_LEN_T ber_slen_t;
+
+LDAP_END_DECL
+
+#endif /* _LBER_TYPES_H */
diff --git a/contrib/openldap-cmake/darwin_aarch64/include/ldap_config.h b/contrib/openldap-cmake/darwin_aarch64/include/ldap_config.h
new file mode 100644
index 00000000000..89f7b40b884
--- /dev/null
+++ b/contrib/openldap-cmake/darwin_aarch64/include/ldap_config.h
@@ -0,0 +1,74 @@
+/* include/ldap_config.h. Generated from ldap_config.hin by configure. */
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2020 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+
+/*
+ * This file works in conjunction with OpenLDAP configure system.
+ * If you do no like the values below, adjust your configure options.
+ */
+
+#ifndef _LDAP_CONFIG_H
+#define _LDAP_CONFIG_H
+
+/* directory separator */
+#ifndef LDAP_DIRSEP
+#ifndef _WIN32
+#define LDAP_DIRSEP "/"
+#else
+#define LDAP_DIRSEP "\\"
+#endif
+#endif
+
+/* directory for temporary files */
+#if defined(_WIN32)
+# define LDAP_TMPDIR "C:\\." /* we don't have much of a choice */
+#elif defined( _P_tmpdir )
+# define LDAP_TMPDIR _P_tmpdir
+#elif defined( P_tmpdir )
+# define LDAP_TMPDIR P_tmpdir
+#elif defined( _PATH_TMPDIR )
+# define LDAP_TMPDIR _PATH_TMPDIR
+#else
+# define LDAP_TMPDIR LDAP_DIRSEP "tmp"
+#endif
+
+/* directories */
+#ifndef LDAP_BINDIR
+#define LDAP_BINDIR        "/tmp/ldap-prefix/bin"
+#endif
+#ifndef LDAP_SBINDIR
+#define LDAP_SBINDIR       "/tmp/ldap-prefix/sbin"
+#endif
+#ifndef LDAP_DATADIR
+#define LDAP_DATADIR       "/tmp/ldap-prefix/share/openldap"
+#endif
+#ifndef LDAP_SYSCONFDIR
+#define LDAP_SYSCONFDIR    "/tmp/ldap-prefix/etc/openldap"
+#endif
+#ifndef LDAP_LIBEXECDIR
+#define LDAP_LIBEXECDIR    "/tmp/ldap-prefix/libexec"
+#endif
+#ifndef LDAP_MODULEDIR
+#define LDAP_MODULEDIR     "/tmp/ldap-prefix/libexec/openldap"
+#endif
+#ifndef LDAP_RUNDIR
+#define LDAP_RUNDIR        "/tmp/ldap-prefix/var"
+#endif
+#ifndef LDAP_LOCALEDIR
+#define LDAP_LOCALEDIR     ""
+#endif
+
+
+#endif /* _LDAP_CONFIG_H */
diff --git a/contrib/openldap-cmake/darwin_aarch64/include/ldap_features.h b/contrib/openldap-cmake/darwin_aarch64/include/ldap_features.h
new file mode 100644
index 00000000000..f0cc7c3626f
--- /dev/null
+++ b/contrib/openldap-cmake/darwin_aarch64/include/ldap_features.h
@@ -0,0 +1,61 @@
+/* include/ldap_features.h. Generated from ldap_features.hin by configure. */
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2020 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+
+/*
+ * LDAP Features
+ */
+
+#ifndef _LDAP_FEATURES_H
+#define _LDAP_FEATURES_H 1
+
+/* OpenLDAP API version macros */
+#define LDAP_VENDOR_VERSION 20501
+#define LDAP_VENDOR_VERSION_MAJOR 2
+#define LDAP_VENDOR_VERSION_MINOR 5
+#define LDAP_VENDOR_VERSION_PATCH X
+
+/*
+** WORK IN PROGRESS!
+**
+** OpenLDAP reentrancy/thread-safeness should be dynamically
+** checked using ldap_get_option().
+**
+** The -lldap implementation is not thread-safe.
+**
+** The -lldap_r implementation is:
+**     LDAP_API_FEATURE_THREAD_SAFE (basic thread safety)
+** but also be:
+**     LDAP_API_FEATURE_SESSION_THREAD_SAFE
+**     LDAP_API_FEATURE_OPERATION_THREAD_SAFE
+**
+** The preprocessor flag LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE
+** can be used to determine if -lldap_r is available at compile
+** time.  You must define LDAP_THREAD_SAFE if and only if you
+** link with -lldap_r.
+**
+** If you fail to define LDAP_THREAD_SAFE when linking with
+** -lldap_r or define LDAP_THREAD_SAFE when linking with -lldap,
+** provided header definitions and declarations may be incorrect.
+**
+*/
+
+/* is -lldap_r available or not */
+#define LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE 1
+
+/* LDAP v2 Referrals */
+/* #undef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */
+
+#endif /* LDAP_FEATURES */
diff --git a/contrib/openldap-cmake/darwin_aarch64/include/portable.h b/contrib/openldap-cmake/darwin_aarch64/include/portable.h
new file mode 100644
index 00000000000..fdf4e89017e
--- /dev/null
+++ b/contrib/openldap-cmake/darwin_aarch64/include/portable.h
@@ -0,0 +1,1169 @@
+/* include/portable.h. Generated from portable.hin by configure. */
+/* include/portable.hin. Generated from configure.in by autoheader. */
+
+
+/* begin of portable.h.pre */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2020 The OpenLDAP Foundation
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+
+#ifndef _LDAP_PORTABLE_H
+#define _LDAP_PORTABLE_H
+
+/* define this if needed to get reentrant functions */
+#ifndef REENTRANT
+#define REENTRANT 1
+#endif
+#ifndef _REENTRANT
+#define _REENTRANT 1
+#endif
+
+/* define this if needed to get threadsafe functions */
+#ifndef THREADSAFE
+#define THREADSAFE 1
+#endif
+#ifndef _THREADSAFE
+#define _THREADSAFE 1
+#endif
+#ifndef THREAD_SAFE
+#define THREAD_SAFE 1
+#endif
+#ifndef _THREAD_SAFE
+#define _THREAD_SAFE 1
+#endif
+
+#ifndef _SGI_MP_SOURCE
+#define _SGI_MP_SOURCE 1
+#endif
+
+/* end of portable.h.pre */
+
+
+/* Define if building universal (internal helper macro) */
+/* #undef AC_APPLE_UNIVERSAL_BUILD */
+
+/* define to use both <string.h> and <strings.h> */
+/* #undef BOTH_STRINGS_H */
+
+/* define if cross compiling */
+/* #undef CROSS_COMPILING */
+
+/* set to the number of arguments ctime_r() expects */
+#define CTIME_R_NARGS 2
+
+/* define if toupper() requires islower() */
+/* #undef C_UPPER_LOWER */
+
+/* define if sys_errlist is not declared in stdio.h or errno.h */
+/* #undef DECL_SYS_ERRLIST */
+
+/* define to enable slapi library */
+/* #undef ENABLE_SLAPI */
+
+/* defined to be the EXE extension */
+#define EXEEXT ""
+
+/* set to the number of arguments gethostbyaddr_r() expects */
+/* #undef GETHOSTBYADDR_R_NARGS */
+
+/* set to the number of arguments gethostbyname_r() expects */
+/* #undef GETHOSTBYNAME_R_NARGS */
+
+/* Define to 1 if `TIOCGWINSZ' requires <sys/ioctl.h>. */
+/* #undef GWINSZ_IN_SYS_IOCTL */
+
+/* define if you have AIX security lib */
+/* #undef HAVE_AIX_SECURITY */
+
+/* Define to 1 if you have the <arpa/inet.h> header file. */
+#define HAVE_ARPA_INET_H 1
+
+/* Define to 1 if you have the <arpa/nameser.h> header file. */
+#define HAVE_ARPA_NAMESER_H 1
+
+/* Define to 1 if you have the <assert.h> header file. */
+#define HAVE_ASSERT_H 1
+
+/* Define to 1 if you have the `bcopy' function. */
+#define HAVE_BCOPY 1
+
+/* Define to 1 if you have the <bits/types.h> header file. */
+/* #undef HAVE_BITS_TYPES_H */
+
+/* Define to 1 if you have the `chroot' function. */
+#define HAVE_CHROOT 1
+
+/* Define to 1 if you have the `closesocket' function. */
+/* #undef HAVE_CLOSESOCKET */
+
+/* Define to 1 if you have the <conio.h> header file. */
+/* #undef HAVE_CONIO_H */
+
+/* define if crypt(3) is available */
+/* #undef HAVE_CRYPT */
+
+/* Define to 1 if you have the <crypt.h> header file. */
+/* #undef HAVE_CRYPT_H */
+
+/* define if crypt_r() is also available */
+/* #undef HAVE_CRYPT_R */
+
+/* Define to 1 if you have the `ctime_r' function. */
+#define HAVE_CTIME_R 1
+
+/* define if you have Cyrus SASL */
+/* #undef HAVE_CYRUS_SASL */
+
+/* define if your system supports /dev/poll */
+/* #undef HAVE_DEVPOLL */
+
+/* Define to 1 if you have the <direct.h> header file. */
+/* #undef HAVE_DIRECT_H */
+
+/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
+   */
+#define HAVE_DIRENT_H 1
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
+/* #undef HAVE_DOPRNT */
+
+/* define if system uses EBCDIC instead of ASCII */
+/* #undef HAVE_EBCDIC */
+
+/* Define to 1 if you have the `endgrent' function. */
+#define HAVE_ENDGRENT 1
+
+/* Define to 1 if you have the `endpwent' function. */
+#define HAVE_ENDPWENT 1
+
+/* define if your system supports epoll */
+/* #undef HAVE_EPOLL */
+
+/* Define to 1 if you have the <errno.h> header file. */
+#define HAVE_ERRNO_H 1
+
+/* Define to 1 if you have the `fcntl' function. */
+#define HAVE_FCNTL 1
+
+/* Define to 1 if you have the <fcntl.h> header file. */
+#define HAVE_FCNTL_H 1
+
+/* define if you actually have FreeBSD fetch(3) */
+/* #undef HAVE_FETCH */
+
+/* Define to 1 if you have the <filio.h> header file. */
+/* #undef HAVE_FILIO_H */
+
+/* Define to 1 if you have the `flock' function. */
+#define HAVE_FLOCK 1
+
+/* Define to 1 if you have the `fstat' function. */
+#define HAVE_FSTAT 1
+
+/* Define to 1 if you have the `gai_strerror' function. */
+#define HAVE_GAI_STRERROR 1
+
+/* Define to 1 if you have the `getaddrinfo' function. */
+#define HAVE_GETADDRINFO 1
+
+/* Define to 1 if you have the `getdtablesize' function. */
+#define HAVE_GETDTABLESIZE 1
+
+/* Define to 1 if you have the `geteuid' function. */
+#define HAVE_GETEUID 1
+
+/* Define to 1 if you have the `getgrgid' function. */
+#define HAVE_GETGRGID 1
+
+/* Define to 1 if you have the `gethostbyaddr_r' function. */
+/* #undef HAVE_GETHOSTBYADDR_R */
+
+/* Define to 1 if you have the `gethostbyname_r' function. */
+/* #undef HAVE_GETHOSTBYNAME_R */
+
+/* Define to 1 if you have the `gethostname' function. */
+#define HAVE_GETHOSTNAME 1
+
+/* Define to 1 if you have the `getnameinfo' function. */
+#define HAVE_GETNAMEINFO 1
+
+/* Define to 1 if you have the `getopt' function. */
+#define HAVE_GETOPT 1
+
+/* Define to 1 if you have the <getopt.h> header file. */
+#define HAVE_GETOPT_H 1
+
+/* Define to 1 if you have the `getpassphrase' function. */
+/* #undef HAVE_GETPASSPHRASE */
+
+/* Define to 1 if you have the `getpeereid' function. */
+#define HAVE_GETPEEREID 1
+
+/* Define to 1 if you have the `getpeerucred' function. */
+/* #undef HAVE_GETPEERUCRED */
+
+/* Define to 1 if you have the `getpwnam' function. */
+#define HAVE_GETPWNAM 1
+
+/* Define to 1 if you have the `getpwuid' function. */
+#define HAVE_GETPWUID 1
+
+/* Define to 1 if you have the `getspnam' function. */
+/* #undef HAVE_GETSPNAM */
+
+/* Define to 1 if you have the `gettimeofday' function. */
+#define HAVE_GETTIMEOFDAY 1
+
+/* Define to 1 if you have the <gmp.h> header file. */
+/* #undef HAVE_GMP_H */
+
+/* Define to 1 if you have the `gmtime_r' function. */
+#define HAVE_GMTIME_R 1
+
+/* define if you have GNUtls */
+/* #undef HAVE_GNUTLS */
+
+/* Define to 1 if you have the <gnutls/gnutls.h> header file. */
+/* #undef HAVE_GNUTLS_GNUTLS_H */
+
+/* if you have GNU Pth */
+/* #undef HAVE_GNU_PTH */
+
+/* Define to 1 if you have the <grp.h> header file. */
+#define HAVE_GRP_H 1
+
+/* Define to 1 if you have the `hstrerror' function. */
+#define HAVE_HSTRERROR 1
+
+/* define to you inet_aton(3) is available */
+#define HAVE_INET_ATON 1
+
+/* Define to 1 if you have the `inet_ntoa_b' function. */
+/* #undef HAVE_INET_NTOA_B */
+
+/* Define to 1 if you have the `inet_ntop' function. */
+#define HAVE_INET_NTOP 1
+
+/* Define to 1 if you have the `initgroups' function. */
+#define HAVE_INITGROUPS 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the `ioctl' function. */
+#define HAVE_IOCTL 1
+
+/* Define to 1 if you have the <io.h> header file. */
+/* #undef HAVE_IO_H */
+
+/* define if your system supports kqueue */
+#define HAVE_KQUEUE 1
+
+/* Define to 1 if you have the `gen' library (-lgen). */
+/* #undef HAVE_LIBGEN */
+
+/* Define to 1 if you have the `gmp' library (-lgmp). */
+/* #undef HAVE_LIBGMP */
+
+/* Define to 1 if you have the `inet' library (-linet). */
+/* #undef HAVE_LIBINET */
+
+/* define if you have libtool -ltdl */
+/* #undef HAVE_LIBLTDL */
+
+/* Define to 1 if you have the `net' library (-lnet). */
+/* #undef HAVE_LIBNET */
+
+/* Define to 1 if you have the `nsl' library (-lnsl). */
+/* #undef HAVE_LIBNSL */
+
+/* Define to 1 if you have the `nsl_s' library (-lnsl_s). */
+/* #undef HAVE_LIBNSL_S */
+
+/* Define to 1 if you have the `socket' library (-lsocket). */
+/* #undef HAVE_LIBSOCKET */
+
+/* Define to 1 if you have the <libutil.h> header file. */
+/* #undef HAVE_LIBUTIL_H */
+
+/* Define to 1 if you have the `V3' library (-lV3). */
+/* #undef HAVE_LIBV3 */
+
+/* Define to 1 if you have the <limits.h> header file. */
+#define HAVE_LIMITS_H 1
+
+/* if you have LinuxThreads */
+/* #undef HAVE_LINUX_THREADS */
+
+/* Define to 1 if you have the <locale.h> header file. */
+#define HAVE_LOCALE_H 1
+
+/* Define to 1 if you have the `localtime_r' function. */
+#define HAVE_LOCALTIME_R 1
+
+/* Define to 1 if you have the `lockf' function. */
+#define HAVE_LOCKF 1
+
+/* Define to 1 if the system has the type `long long'. */
+#define HAVE_LONG_LONG 1
+
+/* Define to 1 if you have the <ltdl.h> header file. */
+/* #undef HAVE_LTDL_H */
+
+/* Define to 1 if you have the <malloc.h> header file. */
+/* #undef HAVE_MALLOC_H */
+
+/* Define to 1 if you have the `memcpy' function. */
+#define HAVE_MEMCPY 1
+
+/* Define to 1 if you have the `memmove' function. */
+#define HAVE_MEMMOVE 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the `memrchr' function. */
+/* #undef HAVE_MEMRCHR */
+
+/* Define to 1 if you have the `mkstemp' function. */
+#define HAVE_MKSTEMP 1
+
+/* Define to 1 if you have the `mktemp' function. */
+#define HAVE_MKTEMP 1
+
+/* define this if you have mkversion */
+#define HAVE_MKVERSION 1
+
+/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
+/* #undef HAVE_NDIR_H */
+
+/* Define to 1 if you have the <netinet/tcp.h> header file. */
+#define HAVE_NETINET_TCP_H 1
+
+/* define if strerror_r returns char* instead of int */
+/* #undef HAVE_NONPOSIX_STRERROR_R */
+
+/* if you have NT Event Log */
+/* #undef HAVE_NT_EVENT_LOG */
+
+/* if you have NT Service Manager */
+/* #undef HAVE_NT_SERVICE_MANAGER */
+
+/* if you have NT Threads */
+/* #undef HAVE_NT_THREADS */
+
+/* define if you have OpenSSL */
+#define HAVE_OPENSSL 1
+
+/* Define to 1 if you have the <openssl/bn.h> header file. */
+#define HAVE_OPENSSL_BN_H 1
+
+/* define if you have OpenSSL with CRL checking capability */
+#define HAVE_OPENSSL_CRL 1
+
+/* Define to 1 if you have the <openssl/crypto.h> header file. */
+#define HAVE_OPENSSL_CRYPTO_H 1
+
+/* Define to 1 if you have the <openssl/ssl.h> header file. */
+#define HAVE_OPENSSL_SSL_H 1
+
+/* Define to 1 if you have the `pipe' function. */
+#define HAVE_PIPE 1
+
+/* Define to 1 if you have the `poll' function. */
+#define HAVE_POLL 1
+
+/* Define to 1 if you have the <poll.h> header file. */
+#define HAVE_POLL_H 1
+
+/* Define to 1 if you have the <process.h> header file. */
+/* #undef HAVE_PROCESS_H */
+
+/* Define to 1 if you have the <psap.h> header file. */
+/* #undef HAVE_PSAP_H */
+
+/* define to pthreads API spec revision */
+#define HAVE_PTHREADS 10
+
+/* define if you have pthread_detach function */
+#define HAVE_PTHREAD_DETACH 1
+
+/* Define to 1 if you have the `pthread_getconcurrency' function. */
+#define HAVE_PTHREAD_GETCONCURRENCY 1
+
+/* Define to 1 if you have the <pthread.h> header file. */
+#define HAVE_PTHREAD_H 1
+
+/* Define to 1 if you have the `pthread_kill' function. */
+#define HAVE_PTHREAD_KILL 1
+
+/* Define to 1 if you have the `pthread_kill_other_threads_np' function. */
+/* #undef HAVE_PTHREAD_KILL_OTHER_THREADS_NP */
+
+/* define if you have pthread_rwlock_destroy function */
+#define HAVE_PTHREAD_RWLOCK_DESTROY 1
+
+/* Define to 1 if you have the `pthread_setconcurrency' function. */
+#define HAVE_PTHREAD_SETCONCURRENCY 1
+
+/* Define to 1 if you have the `pthread_yield' function. */
+/* #undef HAVE_PTHREAD_YIELD */
+
+/* Define to 1 if you have the <pth.h> header file. */
+/* #undef HAVE_PTH_H */
+
+/* Define to 1 if the system has the type `ptrdiff_t'. */
+#define HAVE_PTRDIFF_T 1
+
+/* Define to 1 if you have the <pwd.h> header file. */
+#define HAVE_PWD_H 1
+
+/* Define to 1 if you have the `read' function. */
+#define HAVE_READ 1
+
+/* Define to 1 if you have the `recv' function. */
+#define HAVE_RECV 1
+
+/* Define to 1 if you have the `recvfrom' function. */
+#define HAVE_RECVFROM 1
+
+/* Define to 1 if you have the <regex.h> header file. */
+#define HAVE_REGEX_H 1
+
+/* Define to 1 if you have the <resolv.h> header file. */
+/* #undef HAVE_RESOLV_H */
+
+/* define if you have res_query() */
+/* #undef HAVE_RES_QUERY */
+
+/* define if OpenSSL needs RSAref */
+/* #undef HAVE_RSAREF */
+
+/* Define to 1 if you have the <sasl.h> header file. */
+/* #undef HAVE_SASL_H */
+
+/* Define to 1 if you have the <sasl/sasl.h> header file. */
+/* #undef HAVE_SASL_SASL_H */
+
+/* define if your SASL library has sasl_version() */
+/* #undef HAVE_SASL_VERSION */
+
+/* Define to 1 if you have the <sched.h> header file. */
+#define HAVE_SCHED_H 1
+
+/* Define to 1 if you have the `sched_yield' function. */
+#define HAVE_SCHED_YIELD 1
+
+/* Define to 1 if you have the `send' function. */
+#define HAVE_SEND 1
+
+/* Define to 1 if you have the `sendmsg' function. */
+#define HAVE_SENDMSG 1
+
+/* Define to 1 if you have the `sendto' function. */
+#define HAVE_SENDTO 1
+
+/* Define to 1 if you have the `setegid' function. */
+#define HAVE_SETEGID 1
+
+/* Define to 1 if you have the `seteuid' function. */
+#define HAVE_SETEUID 1
+
+/* Define to 1 if you have the `setgid' function. */
+#define HAVE_SETGID 1
+
+/* Define to 1 if you have the `setpwfile' function. */
+/* #undef HAVE_SETPWFILE */
+
+/* Define to 1 if you have the `setsid' function. */
+#define HAVE_SETSID 1
+
+/* Define to 1 if you have the `setuid' function. */
+#define HAVE_SETUID 1
+
+/* Define to 1 if you have the <sgtty.h> header file. */
+#define HAVE_SGTTY_H 1
+
+/* Define to 1 if you have the <shadow.h> header file. */
+/* #undef HAVE_SHADOW_H */
+
+/* Define to 1 if you have the `sigaction' function. */
+#define HAVE_SIGACTION 1
+
+/* Define to 1 if you have the `signal' function. */
+#define HAVE_SIGNAL 1
+
+/* Define to 1 if you have the `sigset' function. */
+#define HAVE_SIGSET 1
+
+/* define if you have -lslp */
+/* #undef HAVE_SLP */
+
+/* Define to 1 if you have the <slp.h> header file. */
+/* #undef HAVE_SLP_H */
+
+/* Define to 1 if you have the `snprintf' function. */
+#define HAVE_SNPRINTF 1
+
+/* if you have spawnlp() */
+/* #undef HAVE_SPAWNLP */
+
+/* Define to 1 if you have the <sqlext.h> header file. */
+/* #undef HAVE_SQLEXT_H */
+
+/* Define to 1 if you have the <sql.h> header file. */
+/* #undef HAVE_SQL_H */
+
+/* Define to 1 if you have the <stddef.h> header file. */
+#define HAVE_STDDEF_H 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the `strdup' function. */
+#define HAVE_STRDUP 1
+
+/* Define to 1 if you have the `strerror' function. */
+#define HAVE_STRERROR 1
+
+/* Define to 1 if you have the `strerror_r' function. */
+#define HAVE_STRERROR_R 1
+
+/* Define to 1 if you have the `strftime' function. */
+#define HAVE_STRFTIME 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the `strpbrk' function. */
+#define HAVE_STRPBRK 1
+
+/* Define to 1 if you have the `strrchr' function. */
+#define HAVE_STRRCHR 1
+
+/* Define to 1 if you have the `strsep' function. */
+#define HAVE_STRSEP 1
+
+/* Define to 1 if you have the `strspn' function. */
+#define HAVE_STRSPN 1
+
+/* Define to 1 if you have the `strstr' function. */
+#define HAVE_STRSTR 1
+
+/* Define to 1 if you have the `strtol' function. */
+#define HAVE_STRTOL 1
+
+/* Define to 1 if you have the `strtoll' function. */
+#define HAVE_STRTOLL 1
+
+/* Define to 1 if you have the `strtoq' function. */
+#define HAVE_STRTOQ 1
+
+/* Define to 1 if you have the `strtoul' function. */
+#define HAVE_STRTOUL 1
+
+/* Define to 1 if you have the `strtoull' function. */
+#define HAVE_STRTOULL 1
+
+/* Define to 1 if you have the `strtouq' function. */
+#define HAVE_STRTOUQ 1
+
+/* Define to 1 if `msg_accrightslen' is a member of `struct msghdr'. */
+/* #undef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTSLEN */
+
+/* Define to 1 if `msg_control' is a member of `struct msghdr'. */
+/* #undef HAVE_STRUCT_MSGHDR_MSG_CONTROL */
+
+/* Define to 1 if `pw_gecos' is a member of `struct passwd'. */
+#define HAVE_STRUCT_PASSWD_PW_GECOS 1
+
+/* Define to 1 if `pw_passwd' is a member of `struct passwd'. */
+#define HAVE_STRUCT_PASSWD_PW_PASSWD 1
+
+/* Define to 1 if `st_blksize' is a member of `struct stat'. */
+#define HAVE_STRUCT_STAT_ST_BLKSIZE 1
+
+/* Define to 1 if `st_fstype' is a member of `struct stat'. */
+/* #undef HAVE_STRUCT_STAT_ST_FSTYPE */
+
+/* define to 1 if st_fstype is char * */
+/* #undef HAVE_STRUCT_STAT_ST_FSTYPE_CHAR */
+
+/* define to 1 if st_fstype is int */
+/* #undef HAVE_STRUCT_STAT_ST_FSTYPE_INT */
+
+/* Define to 1 if `st_vfstype' is a member of `struct stat'. */
+/* #undef HAVE_STRUCT_STAT_ST_VFSTYPE */
+
+/* Define to 1 if you have the <synch.h> header file. */
+/* #undef HAVE_SYNCH_H */
+
+/* Define to 1 if you have the `sysconf' function. */
+#define HAVE_SYSCONF 1
+
+/* Define to 1 if you have the <sysexits.h> header file. */
+#define HAVE_SYSEXITS_H 1
+
+/* Define to 1 if you have the <syslog.h> header file. */
+#define HAVE_SYSLOG_H 1
+
+/* Define to 1 if you have the <sys/devpoll.h> header file. */
+/* #undef HAVE_SYS_DEVPOLL_H */
+
+/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
+   */
+/* #undef HAVE_SYS_DIR_H */
+
+/* Define to 1 if you have the <sys/epoll.h> header file. */
+/* #undef HAVE_SYS_EPOLL_H */
+
+/* define if you actually have sys_errlist in your libs */
+#define HAVE_SYS_ERRLIST 1
+
+/* Define to 1 if you have the <sys/errno.h> header file. */
+#define HAVE_SYS_ERRNO_H 1
+
+/* Define to 1 if you have the <sys/event.h> header file. */
+#define HAVE_SYS_EVENT_H 1
+
+/* Define to 1 if you have the <sys/file.h> header file. */
+#define HAVE_SYS_FILE_H 1
+
+/* Define to 1 if you have the <sys/filio.h> header file. */
+#define HAVE_SYS_FILIO_H 1
+
+/* Define to 1 if you have the <sys/fstyp.h> header file. */
+/* #undef HAVE_SYS_FSTYP_H */
+
+/* Define to 1 if you have the <sys/ioctl.h> header file. */
+#define HAVE_SYS_IOCTL_H 1
+
+/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
+   */
+/* #undef HAVE_SYS_NDIR_H */
+
+/* Define to 1 if you have the <sys/param.h> header file. */
+#define HAVE_SYS_PARAM_H 1
+
+/* Define to 1 if you have the <sys/poll.h> header file. */
+#define HAVE_SYS_POLL_H 1
+
+/* Define to 1 if you have the <sys/privgrp.h> header file. */
+/* #undef HAVE_SYS_PRIVGRP_H */
+
+/* Define to 1 if you have the <sys/resource.h> header file. */
+#define HAVE_SYS_RESOURCE_H 1
+
+/* Define to 1 if you have the <sys/select.h> header file. */
+#define HAVE_SYS_SELECT_H 1
+
+/* Define to 1 if you have the <sys/socket.h> header file. */
+#define HAVE_SYS_SOCKET_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/syslog.h> header file. */
+#define HAVE_SYS_SYSLOG_H 1
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#define HAVE_SYS_TIME_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <sys/ucred.h> header file. */
+#define HAVE_SYS_UCRED_H 1
+
+/* Define to 1 if you have the <sys/uio.h> header file. */
+#define HAVE_SYS_UIO_H 1
+
+/* Define to 1 if you have the <sys/un.h> header file. */
+#define HAVE_SYS_UN_H 1
+
+/* Define to 1 if you have the <sys/uuid.h> header file. */
+/* #undef HAVE_SYS_UUID_H */
+
+/* Define to 1 if you have the <sys/vmount.h> header file. */
+/* #undef HAVE_SYS_VMOUNT_H */
+
+/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
+#define HAVE_SYS_WAIT_H 1
+
+/* define if you have -lwrap */
+/* #undef HAVE_TCPD */
+
+/* Define to 1 if you have the <tcpd.h> header file. */
+/* #undef HAVE_TCPD_H */
+
+/* Define to 1 if you have the <termios.h> header file. */
+#define HAVE_TERMIOS_H 1
+
+/* if you have Solaris LWP (thr) package */
+/* #undef HAVE_THR */
+
+/* Define to 1 if you have the <thread.h> header file. */
+/* #undef HAVE_THREAD_H */
+
+/* Define to 1 if you have the `thr_getconcurrency' function. */
+/* #undef HAVE_THR_GETCONCURRENCY */
+
+/* Define to 1 if you have the `thr_setconcurrency' function. */
+/* #undef HAVE_THR_SETCONCURRENCY */
+
+/* Define to 1 if you have the `thr_yield' function. */
+/* #undef HAVE_THR_YIELD */
+
+/* define if you have TLS */
+#define HAVE_TLS 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to 1 if you have the <utime.h> header file. */
+#define HAVE_UTIME_H 1
+
+/* define if you have uuid_generate() */
+/* #undef HAVE_UUID_GENERATE */
+
+/* define if you have uuid_to_str() */
+/* #undef HAVE_UUID_TO_STR */
+
+/* Define to 1 if you have the <uuid/uuid.h> header file. */
+/* #undef HAVE_UUID_UUID_H */
+
+/* Define to 1 if you have the `vprintf' function. */
+#define HAVE_VPRINTF 1
+
+/* Define to 1 if you have the `vsnprintf' function. */
+#define HAVE_VSNPRINTF 1
+
+/* Define to 1 if you have the `wait4' function. */
+#define HAVE_WAIT4 1
+
+/* Define to 1 if you have the `waitpid' function. */
+#define HAVE_WAITPID 1
+
+/* define if you have winsock */
+/* #undef HAVE_WINSOCK */
+
+/* define if you have winsock2 */
+/* #undef HAVE_WINSOCK2 */
+
+/* Define to 1 if you have the <winsock2.h> header file. */
+/* #undef HAVE_WINSOCK2_H */
+
+/* Define to 1 if you have the <winsock.h> header file. */
+/* #undef HAVE_WINSOCK_H */
+
+/* Define to 1 if you have the <wiredtiger.h> header file. */
+/* #undef HAVE_WIREDTIGER_H */
+
+/* Define to 1 if you have the `write' function. */
+#define HAVE_WRITE 1
+
+/* define if select implicitly yields */
+#define HAVE_YIELDING_SELECT 1
+
+/* Define to 1 if you have the `_vsnprintf' function. */
+/* #undef HAVE__VSNPRINTF */
+
+/* define to 32-bit or greater integer type */
+#define LBER_INT_T int
+
+/* define to large integer type */
+#define LBER_LEN_T long
+
+/* define to socket descriptor type */
+#define LBER_SOCKET_T int
+
+/* define to large integer type */
+#define LBER_TAG_T long
+
+/* define to 1 if library is thread safe */
+#define LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE 1
+
+/* define to LDAP VENDOR VERSION */
+/* #undef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */
+
+/* define this to add debugging code */
+/* #undef LDAP_DEBUG */
+
+/* define if LDAP libs are dynamic */
+/* #undef LDAP_LIBS_DYNAMIC */
+
+/* define to support PF_INET6 */
+#define LDAP_PF_INET6 1
+
+/* define to support PF_LOCAL */
+#define LDAP_PF_LOCAL 1
+
+/* define this to add SLAPI code */
+/* #undef LDAP_SLAPI */
+
+/* define this to add syslog code */
+/* #undef LDAP_SYSLOG */
+
+/* Version */
+#define LDAP_VENDOR_VERSION 20501
+
+/* Major */
+#define LDAP_VENDOR_VERSION_MAJOR 2
+
+/* Minor */
+#define LDAP_VENDOR_VERSION_MINOR 5
+
+/* Patch */
+#define LDAP_VENDOR_VERSION_PATCH X
+
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
+#define LT_OBJDIR ".libs/"
+
+/* define if memcmp is not 8-bit clean or is otherwise broken */
+/* #undef NEED_MEMCMP_REPLACEMENT */
+
+/* define if you have (or want) no threads */
+/* #undef NO_THREADS */
+
+/* define to use the original debug style */
+/* #undef OLD_DEBUG */
+
+/* Package */
+#define OPENLDAP_PACKAGE "OpenLDAP"
+
+/* Version */
+#define OPENLDAP_VERSION "2.5.X"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT ""
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME ""
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING ""
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME ""
+
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION ""
+
+/* define if sched_yield yields the entire process */
+/* #undef REPLACE_BROKEN_YIELD */
+
+/* Define as the return type of signal handlers (`int' or `void'). */
+#define RETSIGTYPE void
+
+/* Define to the type of arg 1 for `select'. */
+#define SELECT_TYPE_ARG1 int
+
+/* Define to the type of args 2, 3 and 4 for `select'. */
+#define SELECT_TYPE_ARG234 (fd_set *)
+
+/* Define to the type of arg 5 for `select'. */
+#define SELECT_TYPE_ARG5 (struct timeval *)
+
+/* The size of `int', as computed by sizeof. */
+#define SIZEOF_INT 4
+
+/* The size of `long', as computed by sizeof. */
+#define SIZEOF_LONG 8
+
+/* The size of `long long', as computed by sizeof. */
+#define SIZEOF_LONG_LONG 8
+
+/* The size of `short', as computed by sizeof. */
+#define SIZEOF_SHORT 2
+
+/* The size of `wchar_t', as computed by sizeof. */
+#define SIZEOF_WCHAR_T 4
+
+/* define to support per-object ACIs */
+/* #undef SLAPD_ACI_ENABLED */
+
+/* define to support LDAP Async Metadirectory backend */
+/* #undef SLAPD_ASYNCMETA */
+
+/* define to support cleartext passwords */
+/* #undef SLAPD_CLEARTEXT */
+
+/* define to support crypt(3) passwords */
+/* #undef SLAPD_CRYPT */
+
+/* define to support DNS SRV backend */
+/* #undef SLAPD_DNSSRV */
+
+/* define to support LDAP backend */
+/* #undef SLAPD_LDAP */
+
+/* define to support MDB backend */
+/* #undef SLAPD_MDB */
+
+/* define to support LDAP Metadirectory backend */
+/* #undef SLAPD_META */
+
+/* define to support modules */
+/* #undef SLAPD_MODULES */
+
+/* dynamically linked module */
+#define SLAPD_MOD_DYNAMIC 2
+
+/* statically linked module */
+#define SLAPD_MOD_STATIC 1
+
+/* define to support cn=Monitor backend */
+/* #undef SLAPD_MONITOR */
+
+/* define to support NDB backend */
+/* #undef SLAPD_NDB */
+
+/* define to support NULL backend */
+/* #undef SLAPD_NULL */
+
+/* define for In-Directory Access Logging overlay */
+/* #undef SLAPD_OVER_ACCESSLOG */
+
+/* define for Audit Logging overlay */
+/* #undef SLAPD_OVER_AUDITLOG */
+
+/* define for Automatic Certificate Authority overlay */
+/* #undef SLAPD_OVER_AUTOCA */
+
+/* define for Collect overlay */
+/* #undef SLAPD_OVER_COLLECT */
+
+/* define for Attribute Constraint overlay */
+/* #undef SLAPD_OVER_CONSTRAINT */
+
+/* define for Dynamic Directory Services overlay */
+/* #undef SLAPD_OVER_DDS */
+
+/* define for Dynamic Directory Services overlay */
+/* #undef SLAPD_OVER_DEREF */
+
+/* define for Dynamic Group overlay */
+/* #undef SLAPD_OVER_DYNGROUP */
+
+/* define for Dynamic List overlay */
+/* #undef SLAPD_OVER_DYNLIST */
+
+/* define for Reverse Group Membership overlay */
+/* #undef SLAPD_OVER_MEMBEROF */
+
+/* define for Password Policy overlay */
+/* #undef SLAPD_OVER_PPOLICY */
+
+/* define for Proxy Cache overlay */
+/* #undef SLAPD_OVER_PROXYCACHE */
+
+/* define for Referential Integrity overlay */
+/* #undef SLAPD_OVER_REFINT */
+
+/* define for Return Code overlay */
+/* #undef SLAPD_OVER_RETCODE */
+
+/* define for Rewrite/Remap overlay */
+/* #undef SLAPD_OVER_RWM */
+
+/* define for Sequential Modify overlay */
+/* #undef SLAPD_OVER_SEQMOD */
+
+/* define for ServerSideSort/VLV overlay */
+/* #undef SLAPD_OVER_SSSVLV */
+
+/* define for Syncrepl Provider overlay */
+/* #undef SLAPD_OVER_SYNCPROV */
+
+/* define for Translucent Proxy overlay */
+/* #undef SLAPD_OVER_TRANSLUCENT */
+
+/* define for Attribute Uniqueness overlay */
+/* #undef SLAPD_OVER_UNIQUE */
+
+/* define for Value Sorting overlay */
+/* #undef SLAPD_OVER_VALSORT */
+
+/* define to support PASSWD backend */
+/* #undef SLAPD_PASSWD */
+
+/* define to support PERL backend */
+/* #undef SLAPD_PERL */
+
+/* define to support relay backend */
+/* #undef SLAPD_RELAY */
+
+/* define to support reverse lookups */
+/* #undef SLAPD_RLOOKUPS */
+
+/* define to support SHELL backend */
+/* #undef SLAPD_SHELL */
+
+/* define to support SOCK backend */
+/* #undef SLAPD_SOCK */
+
+/* define to support SASL passwords */
+/* #undef SLAPD_SPASSWD */
+
+/* define to support SQL backend */
+/* #undef SLAPD_SQL */
+
+/* define to support WiredTiger backend */
+/* #undef SLAPD_WT */
+
+/* define to support run-time loadable ACL */
+/* #undef SLAP_DYNACL */
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+#define TIME_WITH_SYS_TIME 1
+
+/* Define to 1 if your <sys/time.h> declares `struct tm'. */
+/* #undef TM_IN_SYS_TIME */
+
+/* set to urandom device */
+#define URANDOM_DEVICE "/dev/urandom"
+
+/* define to use OpenSSL BIGNUM for MP */
+/* #undef USE_MP_BIGNUM */
+
+/* define to use GMP for MP */
+/* #undef USE_MP_GMP */
+
+/* define to use 'long' for MP */
+/* #undef USE_MP_LONG */
+
+/* define to use 'long long' for MP */
+/* #undef USE_MP_LONG_LONG */
+
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+/* #  undef WORDS_BIGENDIAN */
+# endif
+#endif
+
+/* Define to the type of arg 3 for `accept'. */
+#define ber_socklen_t socklen_t
+
+/* Define to `char *' if <sys/types.h> does not define. */
+/* #undef caddr_t */
+
+/* Define to empty if `const' does not conform to ANSI C. */
+/* #undef const */
+
+/* Define to `int' if <sys/types.h> doesn't define. */
+/* #undef gid_t */
+
+/* Define to `int' if <sys/types.h> does not define. */
+/* #undef mode_t */
+
+/* Define to `long' if <sys/types.h> does not define. */
+/* #undef off_t */
+
+/* Define to `int' if <sys/types.h> does not define. */
+/* #undef pid_t */
+
+/* Define to `int' if <signal.h> does not define. */
+/* #undef sig_atomic_t */
+
+/* Define to `unsigned' if <sys/types.h> does not define. */
+/* #undef size_t */
+
+/* define to snprintf routine */
+/* #undef snprintf */
+
+/* Define like ber_socklen_t if <sys/socket.h> does not define. */
+/* #undef socklen_t */
+
+/* Define to `signed int' if <sys/types.h> does not define. */
+/* #undef ssize_t */
+
+/* Define to `int' if <sys/types.h> doesn't define. */
+/* #undef uid_t */
+
+/* define as empty if volatile is not supported */
+/* #undef volatile */
+
+/* define to snprintf routine */
+/* #undef vsnprintf */
+
+
+/* begin of portable.h.post */
+
+#ifdef _WIN32
+/* don't suck in all of the win32 api */
+# define WIN32_LEAN_AND_MEAN 1
+#endif
+
+#ifndef LDAP_NEEDS_PROTOTYPES
+/* force LDAP_P to always include prototypes */
+#define LDAP_NEEDS_PROTOTYPES 1
+#endif
+
+#ifndef LDAP_REL_ENG
+#if (LDAP_VENDOR_VERSION == 000000) && !defined(LDAP_DEVEL)
+#define LDAP_DEVEL
+#endif
+#if defined(LDAP_DEVEL) && !defined(LDAP_TEST)
+#define LDAP_TEST
+#endif
+#endif
+
+#ifdef HAVE_STDDEF_H
+# include <stddef.h>
+#endif
+
+#ifdef HAVE_EBCDIC
+/* ASCII/EBCDIC converting replacements for stdio funcs
+ * vsnprintf and snprintf are used too, but they are already
+ * checked by the configure script
+ */
+#define fputs ber_pvt_fputs
+#define fgets ber_pvt_fgets
+#define printf ber_pvt_printf
+#define fprintf ber_pvt_fprintf
+#define vfprintf ber_pvt_vfprintf
+#define vsprintf ber_pvt_vsprintf
+#endif
+
+#include "ac/fdset.h"
+
+#include "ldap_cdefs.h"
+#include "ldap_features.h"
+
+#include "ac/assert.h"
+#include "ac/localize.h"
+
+#endif /* _LDAP_PORTABLE_H */
+/* end of portable.h.post */
+
diff --git a/contrib/openldap-cmake/linux_ppc64le/include/lber_types.h b/contrib/openldap-cmake/linux_ppc64le/include/lber_types.h
new file mode 100644
index 00000000000..dbd59430527
--- /dev/null
+++ b/contrib/openldap-cmake/linux_ppc64le/include/lber_types.h
@@ -0,0 +1,63 @@
+/* include/lber_types.h. Generated from lber_types.hin by configure. */
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2020 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+
+/*
+ * LBER types
+ */
+
+#ifndef _LBER_TYPES_H
+#define _LBER_TYPES_H
+
+#include <ldap_cdefs.h>
+
+LDAP_BEGIN_DECL
+
+/* LBER boolean, enum, integers (32 bits or larger) */
+#define LBER_INT_T int
+
+/* LBER tags (32 bits or larger) */
+#define LBER_TAG_T long
+
+/* LBER socket descriptor */
+#define LBER_SOCKET_T int
+
+/* LBER lengths (32 bits or larger) */
+#define LBER_LEN_T long
+
+/* ------------------------------------------------------------ */
+
+/* booleans, enumerations, and integers */
+typedef LBER_INT_T ber_int_t;
+
+/* signed and unsigned versions */
+typedef signed LBER_INT_T ber_sint_t;
+typedef unsigned LBER_INT_T ber_uint_t;
+
+/* tags */
+typedef unsigned LBER_TAG_T ber_tag_t;
+
+/* "socket" descriptors */
+typedef LBER_SOCKET_T ber_socket_t;
+
+/* lengths */
+typedef unsigned LBER_LEN_T ber_len_t;
+
+/* signed lengths */
+typedef signed LBER_LEN_T ber_slen_t;
+
+LDAP_END_DECL
+
+#endif /* _LBER_TYPES_H */
diff --git a/contrib/openldap-cmake/linux_ppc64le/include/ldap_config.h b/contrib/openldap-cmake/linux_ppc64le/include/ldap_config.h
new file mode 100644
index 00000000000..89f7b40b884
--- /dev/null
+++ b/contrib/openldap-cmake/linux_ppc64le/include/ldap_config.h
@@ -0,0 +1,74 @@
+/* include/ldap_config.h. Generated from ldap_config.hin by configure. */
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2020 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+
+/*
+ * This file works in conjunction with OpenLDAP configure system.
+ * If you do no like the values below, adjust your configure options.
+ */
+
+#ifndef _LDAP_CONFIG_H
+#define _LDAP_CONFIG_H
+
+/* directory separator */
+#ifndef LDAP_DIRSEP
+#ifndef _WIN32
+#define LDAP_DIRSEP "/"
+#else
+#define LDAP_DIRSEP "\\"
+#endif
+#endif
+
+/* directory for temporary files */
+#if defined(_WIN32)
+# define LDAP_TMPDIR "C:\\." /* we don't have much of a choice */
+#elif defined( _P_tmpdir )
+# define LDAP_TMPDIR _P_tmpdir
+#elif defined( P_tmpdir )
+# define LDAP_TMPDIR P_tmpdir
+#elif defined( _PATH_TMPDIR )
+# define LDAP_TMPDIR _PATH_TMPDIR
+#else
+# define LDAP_TMPDIR LDAP_DIRSEP "tmp"
+#endif
+
+/* directories */
+#ifndef LDAP_BINDIR
+#define LDAP_BINDIR        "/tmp/ldap-prefix/bin"
+#endif
+#ifndef LDAP_SBINDIR
+#define LDAP_SBINDIR       "/tmp/ldap-prefix/sbin"
+#endif
+#ifndef LDAP_DATADIR
+#define LDAP_DATADIR       "/tmp/ldap-prefix/share/openldap"
+#endif
+#ifndef LDAP_SYSCONFDIR
+#define LDAP_SYSCONFDIR    "/tmp/ldap-prefix/etc/openldap"
+#endif
+#ifndef LDAP_LIBEXECDIR
+#define LDAP_LIBEXECDIR    "/tmp/ldap-prefix/libexec"
+#endif
+#ifndef LDAP_MODULEDIR
+#define LDAP_MODULEDIR     "/tmp/ldap-prefix/libexec/openldap"
+#endif
+#ifndef LDAP_RUNDIR
+#define LDAP_RUNDIR        "/tmp/ldap-prefix/var"
+#endif
+#ifndef LDAP_LOCALEDIR
+#define LDAP_LOCALEDIR     ""
+#endif
+
+
+#endif /* _LDAP_CONFIG_H */
diff --git a/contrib/openldap-cmake/linux_ppc64le/include/ldap_features.h b/contrib/openldap-cmake/linux_ppc64le/include/ldap_features.h
new file mode 100644
index 00000000000..f0cc7c3626f
--- /dev/null
+++ b/contrib/openldap-cmake/linux_ppc64le/include/ldap_features.h
@@ -0,0 +1,61 @@
+/* include/ldap_features.h. Generated from ldap_features.hin by configure. */
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2020 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+
+/*
+ * LDAP Features
+ */
+
+#ifndef _LDAP_FEATURES_H
+#define _LDAP_FEATURES_H 1
+
+/* OpenLDAP API version macros */
+#define LDAP_VENDOR_VERSION 20501
+#define LDAP_VENDOR_VERSION_MAJOR 2
+#define LDAP_VENDOR_VERSION_MINOR 5
+#define LDAP_VENDOR_VERSION_PATCH X
+
+/*
+** WORK IN PROGRESS!
+**
+** OpenLDAP reentrancy/thread-safeness should be dynamically
+** checked using ldap_get_option().
+**
+** The -lldap implementation is not thread-safe.
+**
+** The -lldap_r implementation is:
+**     LDAP_API_FEATURE_THREAD_SAFE (basic thread safety)
+** but also be:
+**     LDAP_API_FEATURE_SESSION_THREAD_SAFE
+**     LDAP_API_FEATURE_OPERATION_THREAD_SAFE
+**
+** The preprocessor flag LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE
+** can be used to determine if -lldap_r is available at compile
+** time.  You must define LDAP_THREAD_SAFE if and only if you
+** link with -lldap_r.
+**
+** If you fail to define LDAP_THREAD_SAFE when linking with
+** -lldap_r or define LDAP_THREAD_SAFE when linking with -lldap,
+** provided header definitions and declarations may be incorrect.
+**
+*/
+
+/* is -lldap_r available or not */
+#define LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE 1
+
+/* LDAP v2 Referrals */
+/* #undef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */
+
+#endif /* LDAP_FEATURES */
diff --git a/contrib/openldap-cmake/linux_ppc64le/include/portable.h b/contrib/openldap-cmake/linux_ppc64le/include/portable.h
new file mode 100644
index 00000000000..2924b6713a4
--- /dev/null
+++ b/contrib/openldap-cmake/linux_ppc64le/include/portable.h
@@ -0,0 +1,1169 @@
+/* include/portable.h. Generated from portable.hin by configure. */
+/* include/portable.hin. Generated from configure.in by autoheader. */
+
+
+/* begin of portable.h.pre */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2020 The OpenLDAP Foundation
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+
+#ifndef _LDAP_PORTABLE_H
+#define _LDAP_PORTABLE_H
+
+/* define this if needed to get reentrant functions */
+#ifndef REENTRANT
+#define REENTRANT 1
+#endif
+#ifndef _REENTRANT
+#define _REENTRANT 1
+#endif
+
+/* define this if needed to get threadsafe functions */
+#ifndef THREADSAFE
+#define THREADSAFE 1
+#endif
+#ifndef _THREADSAFE
+#define _THREADSAFE 1
+#endif
+#ifndef THREAD_SAFE
+#define THREAD_SAFE 1
+#endif
+#ifndef _THREAD_SAFE
+#define _THREAD_SAFE 1
+#endif
+
+#ifndef _SGI_MP_SOURCE
+#define _SGI_MP_SOURCE 1
+#endif
+
+/* end of portable.h.pre */
+
+
+/* Define if building universal (internal helper macro) */
+/* #undef AC_APPLE_UNIVERSAL_BUILD */
+
+/* define to use both <string.h> and <strings.h> */
+/* #undef BOTH_STRINGS_H */
+
+/* define if cross compiling */
+/* #undef CROSS_COMPILING */
+
+/* set to the number of arguments ctime_r() expects */
+#define CTIME_R_NARGS 2
+
+/* define if toupper() requires islower() */
+/* #undef C_UPPER_LOWER */
+
+/* define if sys_errlist is not declared in stdio.h or errno.h */
+/* #undef DECL_SYS_ERRLIST */
+
+/* define to enable slapi library */
+/* #undef ENABLE_SLAPI */
+
+/* defined to be the EXE extension */
+#define EXEEXT ""
+
+/* set to the number of arguments gethostbyaddr_r() expects */
+#define GETHOSTBYADDR_R_NARGS 8
+
+/* set to the number of arguments gethostbyname_r() expects */
+#define GETHOSTBYNAME_R_NARGS 6
+
+/* Define to 1 if `TIOCGWINSZ' requires <sys/ioctl.h>. */
+#define GWINSZ_IN_SYS_IOCTL 1
+
+/* define if you have AIX security lib */
+/* #undef HAVE_AIX_SECURITY */
+
+/* Define to 1 if you have the <arpa/inet.h> header file. */
+#define HAVE_ARPA_INET_H 1
+
+/* Define to 1 if you have the <arpa/nameser.h> header file. */
+#define HAVE_ARPA_NAMESER_H 1
+
+/* Define to 1 if you have the <assert.h> header file. */
+#define HAVE_ASSERT_H 1
+
+/* Define to 1 if you have the `bcopy' function. */
+#define HAVE_BCOPY 1
+
+/* Define to 1 if you have the <bits/types.h> header file. */
+#define HAVE_BITS_TYPES_H 1
+
+/* Define to 1 if you have the `chroot' function. */
+#define HAVE_CHROOT 1
+
+/* Define to 1 if you have the `closesocket' function. */
+/* #undef HAVE_CLOSESOCKET */
+
+/* Define to 1 if you have the <conio.h> header file. */
+/* #undef HAVE_CONIO_H */
+
+/* define if crypt(3) is available */
+/* #undef HAVE_CRYPT */
+
+/* Define to 1 if you have the <crypt.h> header file. */
+/* #undef HAVE_CRYPT_H */
+
+/* define if crypt_r() is also available */
+/* #undef HAVE_CRYPT_R */
+
+/* Define to 1 if you have the `ctime_r' function. */
+#define HAVE_CTIME_R 1
+
+/* define if you have Cyrus SASL */
+/* #undef HAVE_CYRUS_SASL */
+
+/* define if your system supports /dev/poll */
+/* #undef HAVE_DEVPOLL */
+
+/* Define to 1 if you have the <direct.h> header file. */
+/* #undef HAVE_DIRECT_H */
+
+/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
+   */
+#define HAVE_DIRENT_H 1
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
+/* #undef HAVE_DOPRNT */
+
+/* define if system uses EBCDIC instead of ASCII */
+/* #undef HAVE_EBCDIC */
+
+/* Define to 1 if you have the `endgrent' function. */
+#define HAVE_ENDGRENT 1
+
+/* Define to 1 if you have the `endpwent' function. */
+#define HAVE_ENDPWENT 1
+
+/* define if your system supports epoll */
+#define HAVE_EPOLL 1
+
+/* Define to 1 if you have the <errno.h> header file. */
+#define HAVE_ERRNO_H 1
+
+/* Define to 1 if you have the `fcntl' function. */
+#define HAVE_FCNTL 1
+
+/* Define to 1 if you have the <fcntl.h> header file. */
+#define HAVE_FCNTL_H 1
+
+/* define if you actually have FreeBSD fetch(3) */
+/* #undef HAVE_FETCH */
+
+/* Define to 1 if you have the <filio.h> header file. */
+/* #undef HAVE_FILIO_H */
+
+/* Define to 1 if you have the `flock' function. */
+#define HAVE_FLOCK 1
+
+/* Define to 1 if you have the `fstat' function. */
+#define HAVE_FSTAT 1
+
+/* Define to 1 if you have the `gai_strerror' function. */
+#define HAVE_GAI_STRERROR 1
+
+/* Define to 1 if you have the `getaddrinfo' function. */
+#define HAVE_GETADDRINFO 1
+
+/* Define to 1 if you have the `getdtablesize' function. */
+#define HAVE_GETDTABLESIZE 1
+
+/* Define to 1 if you have the `geteuid' function. */
+#define HAVE_GETEUID 1
+
+/* Define to 1 if you have the `getgrgid' function. */
+#define HAVE_GETGRGID 1
+
+/* Define to 1 if you have the `gethostbyaddr_r' function. */
+#define HAVE_GETHOSTBYADDR_R 1
+
+/* Define to 1 if you have the `gethostbyname_r' function. */
+#define HAVE_GETHOSTBYNAME_R 1
+
+/* Define to 1 if you have the `gethostname' function. */
+#define HAVE_GETHOSTNAME 1
+
+/* Define to 1 if you have the `getnameinfo' function. */
+#define HAVE_GETNAMEINFO 1
+
+/* Define to 1 if you have the `getopt' function. */
+#define HAVE_GETOPT 1
+
+/* Define to 1 if you have the <getopt.h> header file. */
+#define HAVE_GETOPT_H 1
+
+/* Define to 1 if you have the `getpassphrase' function. */
+/* #undef HAVE_GETPASSPHRASE */
+
+/* Define to 1 if you have the `getpeereid' function. */
+/* #undef HAVE_GETPEEREID */
+
+/* Define to 1 if you have the `getpeerucred' function. */
+/* #undef HAVE_GETPEERUCRED */
+
+/* Define to 1 if you have the `getpwnam' function. */
+#define HAVE_GETPWNAM 1
+
+/* Define to 1 if you have the `getpwuid' function. */
+#define HAVE_GETPWUID 1
+
+/* Define to 1 if you have the `getspnam' function. */
+#define HAVE_GETSPNAM 1
+
+/* Define to 1 if you have the `gettimeofday' function. */
+#define HAVE_GETTIMEOFDAY 1
+
+/* Define to 1 if you have the <gmp.h> header file. */
+/* #undef HAVE_GMP_H */
+
+/* Define to 1 if you have the `gmtime_r' function. */
+#define HAVE_GMTIME_R 1
+
+/* define if you have GNUtls */
+/* #undef HAVE_GNUTLS */
+
+/* Define to 1 if you have the <gnutls/gnutls.h> header file. */
+/* #undef HAVE_GNUTLS_GNUTLS_H */
+
+/* if you have GNU Pth */
+/* #undef HAVE_GNU_PTH */
+
+/* Define to 1 if you have the <grp.h> header file. */
+#define HAVE_GRP_H 1
+
+/* Define to 1 if you have the `hstrerror' function. */
+#define HAVE_HSTRERROR 1
+
+/* define to you inet_aton(3) is available */
+#define HAVE_INET_ATON 1
+
+/* Define to 1 if you have the `inet_ntoa_b' function. */
+/* #undef HAVE_INET_NTOA_B */
+
+/* Define to 1 if you have the `inet_ntop' function. */
+#define HAVE_INET_NTOP 1
+
+/* Define to 1 if you have the `initgroups' function. */
+#define HAVE_INITGROUPS 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the `ioctl' function. */
+#define HAVE_IOCTL 1
+
+/* Define to 1 if you have the <io.h> header file. */
+/* #undef HAVE_IO_H */
+
+/* define if your system supports kqueue */
+/* #undef HAVE_KQUEUE */
+
+/* Define to 1 if you have the `gen' library (-lgen). */
+/* #undef HAVE_LIBGEN */
+
+/* Define to 1 if you have the `gmp' library (-lgmp). */
+/* #undef HAVE_LIBGMP */
+
+/* Define to 1 if you have the `inet' library (-linet). */
+/* #undef HAVE_LIBINET */
+
+/* define if you have libtool -ltdl */
+/* #undef HAVE_LIBLTDL */
+
+/* Define to 1 if you have the `net' library (-lnet). */
+/* #undef HAVE_LIBNET */
+
+/* Define to 1 if you have the `nsl' library (-lnsl). */
+/* #undef HAVE_LIBNSL */
+
+/* Define to 1 if you have the `nsl_s' library (-lnsl_s). */
+/* #undef HAVE_LIBNSL_S */
+
+/* Define to 1 if you have the `socket' library (-lsocket). */
+/* #undef HAVE_LIBSOCKET */
+
+/* Define to 1 if you have the <libutil.h> header file. */
+/* #undef HAVE_LIBUTIL_H */
+
+/* Define to 1 if you have the `V3' library (-lV3). */
+/* #undef HAVE_LIBV3 */
+
+/* Define to 1 if you have the <limits.h> header file. */
+#define HAVE_LIMITS_H 1
+
+/* if you have LinuxThreads */
+/* #undef HAVE_LINUX_THREADS */
+
+/* Define to 1 if you have the <locale.h> header file. */
+#define HAVE_LOCALE_H 1
+
+/* Define to 1 if you have the `localtime_r' function. */
+#define HAVE_LOCALTIME_R 1
+
+/* Define to 1 if you have the `lockf' function. */
+#define HAVE_LOCKF 1
+
+/* Define to 1 if the system has the type `long long'. */
+#define HAVE_LONG_LONG 1
+
+/* Define to 1 if you have the <ltdl.h> header file. */
+/* #undef HAVE_LTDL_H */
+
+/* Define to 1 if you have the <malloc.h> header file. */
+#define HAVE_MALLOC_H 1
+
+/* Define to 1 if you have the `memcpy' function. */
+#define HAVE_MEMCPY 1
+
+/* Define to 1 if you have the `memmove' function. */
+#define HAVE_MEMMOVE 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the `memrchr' function. */
+#define HAVE_MEMRCHR 1
+
+/* Define to 1 if you have the `mkstemp' function. */
+#define HAVE_MKSTEMP 1
+
+/* Define to 1 if you have the `mktemp' function. */
+#define HAVE_MKTEMP 1
+
+/* define this if you have mkversion */
+#define HAVE_MKVERSION 1
+
+/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
+/* #undef HAVE_NDIR_H */
+
+/* Define to 1 if you have the <netinet/tcp.h> header file. */
+#define HAVE_NETINET_TCP_H 1
+
+/* define if strerror_r returns char* instead of int */
+/* #undef HAVE_NONPOSIX_STRERROR_R */
+
+/* if you have NT Event Log */
+/* #undef HAVE_NT_EVENT_LOG */
+
+/* if you have NT Service Manager */
+/* #undef HAVE_NT_SERVICE_MANAGER */
+
+/* if you have NT Threads */
+/* #undef HAVE_NT_THREADS */
+
+/* define if you have OpenSSL */
+#define HAVE_OPENSSL 1
+
+/* Define to 1 if you have the <openssl/bn.h> header file. */
+#define HAVE_OPENSSL_BN_H 1
+
+/* define if you have OpenSSL with CRL checking capability */
+#define HAVE_OPENSSL_CRL 1
+
+/* Define to 1 if you have the <openssl/crypto.h> header file. */
+#define HAVE_OPENSSL_CRYPTO_H 1
+
+/* Define to 1 if you have the <openssl/ssl.h> header file. */
+#define HAVE_OPENSSL_SSL_H 1
+
+/* Define to 1 if you have the `pipe' function. */
+#define HAVE_PIPE 1
+
+/* Define to 1 if you have the `poll' function. */
+#define HAVE_POLL 1
+
+/* Define to 1 if you have the <poll.h> header file. */
+#define HAVE_POLL_H 1
+
+/* Define to 1 if you have the <process.h> header file. */
+/* #undef HAVE_PROCESS_H */
+
+/* Define to 1 if you have the <psap.h> header file. */
+/* #undef HAVE_PSAP_H */
+
+/* define to pthreads API spec revision */
+#define HAVE_PTHREADS 10
+
+/* define if you have pthread_detach function */
+#define HAVE_PTHREAD_DETACH 1
+
+/* Define to 1 if you have the `pthread_getconcurrency' function. */
+#define HAVE_PTHREAD_GETCONCURRENCY 1
+
+/* Define to 1 if you have the <pthread.h> header file. */
+#define HAVE_PTHREAD_H 1
+
+/* Define to 1 if you have the `pthread_kill' function. */
+#define HAVE_PTHREAD_KILL 1
+
+/* Define to 1 if you have the `pthread_kill_other_threads_np' function. */
+/* #undef HAVE_PTHREAD_KILL_OTHER_THREADS_NP */
+
+/* define if you have pthread_rwlock_destroy function */
+#define HAVE_PTHREAD_RWLOCK_DESTROY 1
+
+/* Define to 1 if you have the `pthread_setconcurrency' function. */
+#define HAVE_PTHREAD_SETCONCURRENCY 1
+
+/* Define to 1 if you have the `pthread_yield' function. */
+#define HAVE_PTHREAD_YIELD 1
+
+/* Define to 1 if you have the <pth.h> header file. */
+/* #undef HAVE_PTH_H */
+
+/* Define to 1 if the system has the type `ptrdiff_t'. */
+#define HAVE_PTRDIFF_T 1
+
+/* Define to 1 if you have the <pwd.h> header file. */
+#define HAVE_PWD_H 1
+
+/* Define to 1 if you have the `read' function. */
+#define HAVE_READ 1
+
+/* Define to 1 if you have the `recv' function. */
+#define HAVE_RECV 1
+
+/* Define to 1 if you have the `recvfrom' function. */
+#define HAVE_RECVFROM 1
+
+/* Define to 1 if you have the <regex.h> header file. */
+#define HAVE_REGEX_H 1
+
+/* Define to 1 if you have the <resolv.h> header file. */
+/* #undef HAVE_RESOLV_H */
+
+/* define if you have res_query() */
+/* #undef HAVE_RES_QUERY */
+
+/* define if OpenSSL needs RSAref */
+/* #undef HAVE_RSAREF */
+
+/* Define to 1 if you have the <sasl.h> header file. */
+/* #undef HAVE_SASL_H */
+
+/* Define to 1 if you have the <sasl/sasl.h> header file. */
+/* #undef HAVE_SASL_SASL_H */
+
+/* define if your SASL library has sasl_version() */
+/* #undef HAVE_SASL_VERSION */
+
+/* Define to 1 if you have the <sched.h> header file. */
+#define HAVE_SCHED_H 1
+
+/* Define to 1 if you have the `sched_yield' function. */
+#define HAVE_SCHED_YIELD 1
+
+/* Define to 1 if you have the `send' function. */
+#define HAVE_SEND 1
+
+/* Define to 1 if you have the `sendmsg' function. */
+#define HAVE_SENDMSG 1
+
+/* Define to 1 if you have the `sendto' function. */
+#define HAVE_SENDTO 1
+
+/* Define to 1 if you have the `setegid' function. */
+#define HAVE_SETEGID 1
+
+/* Define to 1 if you have the `seteuid' function. */
+#define HAVE_SETEUID 1
+
+/* Define to 1 if you have the `setgid' function. */
+#define HAVE_SETGID 1
+
+/* Define to 1 if you have the `setpwfile' function. */
+/* #undef HAVE_SETPWFILE */
+
+/* Define to 1 if you have the `setsid' function. */
+#define HAVE_SETSID 1
+
+/* Define to 1 if you have the `setuid' function. */
+#define HAVE_SETUID 1
+
+/* Define to 1 if you have the <sgtty.h> header file. */
+#define HAVE_SGTTY_H 1
+
+/* Define to 1 if you have the <shadow.h> header file. */
+/* #undef HAVE_SHADOW_H */
+
+/* Define to 1 if you have the `sigaction' function. */
+#define HAVE_SIGACTION 1
+
+/* Define to 1 if you have the `signal' function. */
+#define HAVE_SIGNAL 1
+
+/* Define to 1 if you have the `sigset' function. */
+#define HAVE_SIGSET 1
+
+/* define if you have -lslp */
+/* #undef HAVE_SLP */
+
+/* Define to 1 if you have the <slp.h> header file. */
+/* #undef HAVE_SLP_H */
+
+/* Define to 1 if you have the `snprintf' function. */
+#define HAVE_SNPRINTF 1
+
+/* if you have spawnlp() */
+/* #undef HAVE_SPAWNLP */
+
+/* Define to 1 if you have the <sqlext.h> header file. */
+/* #undef HAVE_SQLEXT_H */
+
+/* Define to 1 if you have the <sql.h> header file. */
+/* #undef HAVE_SQL_H */
+
+/* Define to 1 if you have the <stddef.h> header file. */
+#define HAVE_STDDEF_H 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the `strdup' function. */
+#define HAVE_STRDUP 1
+
+/* Define to 1 if you have the `strerror' function. */
+#define HAVE_STRERROR 1
+
+/* Define to 1 if you have the `strerror_r' function. */
+#define HAVE_STRERROR_R 1
+
+/* Define to 1 if you have the `strftime' function. */
+#define HAVE_STRFTIME 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the `strpbrk' function. */
+#define HAVE_STRPBRK 1
+
+/* Define to 1 if you have the `strrchr' function. */
+#define HAVE_STRRCHR 1
+
+/* Define to 1 if you have the `strsep' function. */
+#define HAVE_STRSEP 1
+
+/* Define to 1 if you have the `strspn' function. */
+#define HAVE_STRSPN 1
+
+/* Define to 1 if you have the `strstr' function. */
+#define HAVE_STRSTR 1
+
+/* Define to 1 if you have the `strtol' function. */
+#define HAVE_STRTOL 1
+
+/* Define to 1 if you have the `strtoll' function. */
+#define HAVE_STRTOLL 1
+
+/* Define to 1 if you have the `strtoq' function. */
+#define HAVE_STRTOQ 1
+
+/* Define to 1 if you have the `strtoul' function. */
+#define HAVE_STRTOUL 1
+
+/* Define to 1 if you have the `strtoull' function. */
+#define HAVE_STRTOULL 1
+
+/* Define to 1 if you have the `strtouq' function. */
+#define HAVE_STRTOUQ 1
+
+/* Define to 1 if `msg_accrightslen' is a member of `struct msghdr'. */
+/* #undef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTSLEN */
+
+/* Define to 1 if `msg_control' is a member of `struct msghdr'. */
+#define HAVE_STRUCT_MSGHDR_MSG_CONTROL 1
+
+/* Define to 1 if `pw_gecos' is a member of `struct passwd'. */
+#define HAVE_STRUCT_PASSWD_PW_GECOS 1
+
+/* Define to 1 if `pw_passwd' is a member of `struct passwd'. */
+#define HAVE_STRUCT_PASSWD_PW_PASSWD 1
+
+/* Define to 1 if `st_blksize' is a member of `struct stat'. */
+#define HAVE_STRUCT_STAT_ST_BLKSIZE 1
+
+/* Define to 1 if `st_fstype' is a member of `struct stat'. */
+/* #undef HAVE_STRUCT_STAT_ST_FSTYPE */
+
+/* define to 1 if st_fstype is char * */
+/* #undef HAVE_STRUCT_STAT_ST_FSTYPE_CHAR */
+
+/* define to 1 if st_fstype is int */
+/* #undef HAVE_STRUCT_STAT_ST_FSTYPE_INT */
+
+/* Define to 1 if `st_vfstype' is a member of `struct stat'. */
+/* #undef HAVE_STRUCT_STAT_ST_VFSTYPE */
+
+/* Define to 1 if you have the <synch.h> header file. */
+/* #undef HAVE_SYNCH_H */
+
+/* Define to 1 if you have the `sysconf' function. */
+#define HAVE_SYSCONF 1
+
+/* Define to 1 if you have the <sysexits.h> header file. */
+#define HAVE_SYSEXITS_H 1
+
+/* Define to 1 if you have the <syslog.h> header file. */
+#define HAVE_SYSLOG_H 1
+
+/* Define to 1 if you have the <sys/devpoll.h> header file. */
+/* #undef HAVE_SYS_DEVPOLL_H */
+
+/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
+   */
+/* #undef HAVE_SYS_DIR_H */
+
+/* Define to 1 if you have the <sys/epoll.h> header file. */
+#define HAVE_SYS_EPOLL_H 1
+
+/* define if you actually have sys_errlist in your libs */
+#define HAVE_SYS_ERRLIST 1
+
+/* Define to 1 if you have the <sys/errno.h> header file. */
+#define HAVE_SYS_ERRNO_H 1
+
+/* Define to 1 if you have the <sys/event.h> header file. */
+/* #undef HAVE_SYS_EVENT_H */
+
+/* Define to 1 if you have the <sys/file.h> header file. */
+#define HAVE_SYS_FILE_H 1
+
+/* Define to 1 if you have the <sys/filio.h> header file. */
+/* #undef HAVE_SYS_FILIO_H */
+
+/* Define to 1 if you have the <sys/fstyp.h> header file. */
+/* #undef HAVE_SYS_FSTYP_H */
+
+/* Define to 1 if you have the <sys/ioctl.h> header file. */
+#define HAVE_SYS_IOCTL_H 1
+
+/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
+   */
+/* #undef HAVE_SYS_NDIR_H */
+
+/* Define to 1 if you have the <sys/param.h> header file. */
+#define HAVE_SYS_PARAM_H 1
+
+/* Define to 1 if you have the <sys/poll.h> header file. */
+#define HAVE_SYS_POLL_H 1
+
+/* Define to 1 if you have the <sys/privgrp.h> header file. */
+/* #undef HAVE_SYS_PRIVGRP_H */
+
+/* Define to 1 if you have the <sys/resource.h> header file. */
+#define HAVE_SYS_RESOURCE_H 1
+
+/* Define to 1 if you have the <sys/select.h> header file. */
+#define HAVE_SYS_SELECT_H 1
+
+/* Define to 1 if you have the <sys/socket.h> header file. */
+#define HAVE_SYS_SOCKET_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/syslog.h> header file. */
+#define HAVE_SYS_SYSLOG_H 1
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#define HAVE_SYS_TIME_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <sys/ucred.h> header file. */
+/* #undef HAVE_SYS_UCRED_H */
+
+/* Define to 1 if you have the <sys/uio.h> header file. */
+#define HAVE_SYS_UIO_H 1
+
+/* Define to 1 if you have the <sys/un.h> header file. */
+#define HAVE_SYS_UN_H 1
+
+/* Define to 1 if you have the <sys/uuid.h> header file. */
+/* #undef HAVE_SYS_UUID_H */
+
+/* Define to 1 if you have the <sys/vmount.h> header file. */
+/* #undef HAVE_SYS_VMOUNT_H */
+
+/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
+#define HAVE_SYS_WAIT_H 1
+
+/* define if you have -lwrap */
+/* #undef HAVE_TCPD */
+
+/* Define to 1 if you have the <tcpd.h> header file. */
+/* #undef HAVE_TCPD_H */
+
+/* Define to 1 if you have the <termios.h> header file. */
+#define HAVE_TERMIOS_H 1
+
+/* if you have Solaris LWP (thr) package */
+/* #undef HAVE_THR */
+
+/* Define to 1 if you have the <thread.h> header file. */
+/* #undef HAVE_THREAD_H */
+
+/* Define to 1 if you have the `thr_getconcurrency' function. */
+/* #undef HAVE_THR_GETCONCURRENCY */
+
+/* Define to 1 if you have the `thr_setconcurrency' function. */
+/* #undef HAVE_THR_SETCONCURRENCY */
+
+/* Define to 1 if you have the `thr_yield' function. */
+/* #undef HAVE_THR_YIELD */
+
+/* define if you have TLS */
+#define HAVE_TLS 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to 1 if you have the <utime.h> header file. */
+#define HAVE_UTIME_H 1
+
+/* define if you have uuid_generate() */
+/* #undef HAVE_UUID_GENERATE */
+
+/* define if you have uuid_to_str() */
+/* #undef HAVE_UUID_TO_STR */
+
+/* Define to 1 if you have the <uuid/uuid.h> header file. */
+/* #undef HAVE_UUID_UUID_H */
+
+/* Define to 1 if you have the `vprintf' function. */
+#define HAVE_VPRINTF 1
+
+/* Define to 1 if you have the `vsnprintf' function. */
+#define HAVE_VSNPRINTF 1
+
+/* Define to 1 if you have the `wait4' function. */
+#define HAVE_WAIT4 1
+
+/* Define to 1 if you have the `waitpid' function. */
+#define HAVE_WAITPID 1
+
+/* define if you have winsock */
+/* #undef HAVE_WINSOCK */
+
+/* define if you have winsock2 */
+/* #undef HAVE_WINSOCK2 */
+
+/* Define to 1 if you have the <winsock2.h> header file. */
+/* #undef HAVE_WINSOCK2_H */
+
+/* Define to 1 if you have the <winsock.h> header file. */
+/* #undef HAVE_WINSOCK_H */
+
+/* Define to 1 if you have the <wiredtiger.h> header file. */
+/* #undef HAVE_WIREDTIGER_H */
+
+/* Define to 1 if you have the `write' function. */
+#define HAVE_WRITE 1
+
+/* define if select implicitly yields */
+#define HAVE_YIELDING_SELECT 1
+
+/* Define to 1 if you have the `_vsnprintf' function. */
+/* #undef HAVE__VSNPRINTF */
+
+/* define to 32-bit or greater integer type */
+#define LBER_INT_T int
+
+/* define to large integer type */
+#define LBER_LEN_T long
+
+/* define to socket descriptor type */
+#define LBER_SOCKET_T int
+
+/* define to large integer type */
+#define LBER_TAG_T long
+
+/* define to 1 if library is thread safe */
+#define LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE 1
+
+/* define to LDAP VENDOR VERSION */
+/* #undef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */
+
+/* define this to add debugging code */
+/* #undef LDAP_DEBUG */
+
+/* define if LDAP libs are dynamic */
+/* #undef LDAP_LIBS_DYNAMIC */
+
+/* define to support PF_INET6 */
+#define LDAP_PF_INET6 1
+
+/* define to support PF_LOCAL */
+#define LDAP_PF_LOCAL 1
+
+/* define this to add SLAPI code */
+/* #undef LDAP_SLAPI */
+
+/* define this to add syslog code */
+/* #undef LDAP_SYSLOG */
+
+/* Version */
+#define LDAP_VENDOR_VERSION 20501
+
+/* Major */
+#define LDAP_VENDOR_VERSION_MAJOR 2
+
+/* Minor */
+#define LDAP_VENDOR_VERSION_MINOR 5
+
+/* Patch */
+#define LDAP_VENDOR_VERSION_PATCH X
+
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
+#define LT_OBJDIR ".libs/"
+
+/* define if memcmp is not 8-bit clean or is otherwise broken */
+/* #undef NEED_MEMCMP_REPLACEMENT */
+
+/* define if you have (or want) no threads */
+/* #undef NO_THREADS */
+
+/* define to use the original debug style */
+/* #undef OLD_DEBUG */
+
+/* Package */
+#define OPENLDAP_PACKAGE "OpenLDAP"
+
+/* Version */
+#define OPENLDAP_VERSION "2.5.X"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT ""
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME ""
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING ""
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME ""
+
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION ""
+
+/* define if sched_yield yields the entire process */
+/* #undef REPLACE_BROKEN_YIELD */
+
+/* Define as the return type of signal handlers (`int' or `void'). */
+#define RETSIGTYPE void
+
+/* Define to the type of arg 1 for `select'. */
+#define SELECT_TYPE_ARG1 int
+
+/* Define to the type of args 2, 3 and 4 for `select'. */
+#define SELECT_TYPE_ARG234 (fd_set *)
+
+/* Define to the type of arg 5 for `select'. */
+#define SELECT_TYPE_ARG5 (struct timeval *)
+
+/* The size of `int', as computed by sizeof. */
+#define SIZEOF_INT 4
+
+/* The size of `long', as computed by sizeof. */
+#define SIZEOF_LONG 8
+
+/* The size of `long long', as computed by sizeof. */
+#define SIZEOF_LONG_LONG 8
+
+/* The size of `short', as computed by sizeof. */
+#define SIZEOF_SHORT 2
+
+/* The size of `wchar_t', as computed by sizeof. */
+#define SIZEOF_WCHAR_T 4
+
+/* define to support per-object ACIs */
+/* #undef SLAPD_ACI_ENABLED */
+
+/* define to support LDAP Async Metadirectory backend */
+/* #undef SLAPD_ASYNCMETA */
+
+/* define to support cleartext passwords */
+/* #undef SLAPD_CLEARTEXT */
+
+/* define to support crypt(3) passwords */
+/* #undef SLAPD_CRYPT */
+
+/* define to support DNS SRV backend */
+/* #undef SLAPD_DNSSRV */
+
+/* define to support LDAP backend */
+/* #undef SLAPD_LDAP */
+
+/* define to support MDB backend */
+/* #undef SLAPD_MDB */
+
+/* define to support LDAP Metadirectory backend */
+/* #undef SLAPD_META */
+
+/* define to support modules */
+/* #undef SLAPD_MODULES */
+
+/* dynamically linked module */
+#define SLAPD_MOD_DYNAMIC 2
+
+/* statically linked module */
+#define SLAPD_MOD_STATIC 1
+
+/* define to support cn=Monitor backend */
+/* #undef SLAPD_MONITOR */
+
+/* define to support NDB backend */
+/* #undef SLAPD_NDB */
+
+/* define to support NULL backend */
+/* #undef SLAPD_NULL */
+
+/* define for In-Directory Access Logging overlay */
+/* #undef SLAPD_OVER_ACCESSLOG */
+
+/* define for Audit Logging overlay */
+/* #undef SLAPD_OVER_AUDITLOG */
+
+/* define for Automatic Certificate Authority overlay */
+/* #undef SLAPD_OVER_AUTOCA */
+
+/* define for Collect overlay */
+/* #undef SLAPD_OVER_COLLECT */
+
+/* define for Attribute Constraint overlay */
+/* #undef SLAPD_OVER_CONSTRAINT */
+
+/* define for Dynamic Directory Services overlay */
+/* #undef SLAPD_OVER_DDS */
+
+/* define for Dynamic Directory Services overlay */
+/* #undef SLAPD_OVER_DEREF */
+
+/* define for Dynamic Group overlay */
+/* #undef SLAPD_OVER_DYNGROUP */
+
+/* define for Dynamic List overlay */
+/* #undef SLAPD_OVER_DYNLIST */
+
+/* define for Reverse Group Membership overlay */
+/* #undef SLAPD_OVER_MEMBEROF */
+
+/* define for Password Policy overlay */
+/* #undef SLAPD_OVER_PPOLICY */
+
+/* define for Proxy Cache overlay */
+/* #undef SLAPD_OVER_PROXYCACHE */
+
+/* define for Referential Integrity overlay */
+/* #undef SLAPD_OVER_REFINT */
+
+/* define for Return Code overlay */
+/* #undef SLAPD_OVER_RETCODE */
+
+/* define for Rewrite/Remap overlay */
+/* #undef SLAPD_OVER_RWM */
+
+/* define for Sequential Modify overlay */
+/* #undef SLAPD_OVER_SEQMOD */
+
+/* define for ServerSideSort/VLV overlay */
+/* #undef SLAPD_OVER_SSSVLV */
+
+/* define for Syncrepl Provider overlay */
+/* #undef SLAPD_OVER_SYNCPROV */
+
+/* define for Translucent Proxy overlay */
+/* #undef SLAPD_OVER_TRANSLUCENT */
+
+/* define for Attribute Uniqueness overlay */
+/* #undef SLAPD_OVER_UNIQUE */
+
+/* define for Value Sorting overlay */
+/* #undef SLAPD_OVER_VALSORT */
+
+/* define to support PASSWD backend */
+/* #undef SLAPD_PASSWD */
+
+/* define to support PERL backend */
+/* #undef SLAPD_PERL */
+
+/* define to support relay backend */
+/* #undef SLAPD_RELAY */
+
+/* define to support reverse lookups */
+/* #undef SLAPD_RLOOKUPS */
+
+/* define to support SHELL backend */
+/* #undef SLAPD_SHELL */
+
+/* define to support SOCK backend */
+/* #undef SLAPD_SOCK */
+
+/* define to support SASL passwords */
+/* #undef SLAPD_SPASSWD */
+
+/* define to support SQL backend */
+/* #undef SLAPD_SQL */
+
+/* define to support WiredTiger backend */
+/* #undef SLAPD_WT */
+
+/* define to support run-time loadable ACL */
+/* #undef SLAP_DYNACL */
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+#define TIME_WITH_SYS_TIME 1
+
+/* Define to 1 if your <sys/time.h> declares `struct tm'. */
+/* #undef TM_IN_SYS_TIME */
+
+/* set to urandom device */
+#define URANDOM_DEVICE "/dev/urandom"
+
+/* define to use OpenSSL BIGNUM for MP */
+/* #undef USE_MP_BIGNUM */
+
+/* define to use GMP for MP */
+/* #undef USE_MP_GMP */
+
+/* define to use 'long' for MP */
+/* #undef USE_MP_LONG */
+
+/* define to use 'long long' for MP */
+/* #undef USE_MP_LONG_LONG */
+
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+/* #  undef WORDS_BIGENDIAN */
+# endif
+#endif
+
+/* Define to the type of arg 3 for `accept'. */
+#define ber_socklen_t socklen_t
+
+/* Define to `char *' if <sys/types.h> does not define. */
+/* #undef caddr_t */
+
+/* Define to empty if `const' does not conform to ANSI C. */
+/* #undef const */
+
+/* Define to `int' if <sys/types.h> doesn't define. */
+/* #undef gid_t */
+
+/* Define to `int' if <sys/types.h> does not define. */
+/* #undef mode_t */
+
+/* Define to `long' if <sys/types.h> does not define. */
+/* #undef off_t */
+
+/* Define to `int' if <sys/types.h> does not define. */
+/* #undef pid_t */
+
+/* Define to `int' if <signal.h> does not define. */
+/* #undef sig_atomic_t */
+
+/* Define to `unsigned' if <sys/types.h> does not define. */
+/* #undef size_t */
+
+/* define to snprintf routine */
+/* #undef snprintf */
+
+/* Define like ber_socklen_t if <sys/socket.h> does not define. */
+/* #undef socklen_t */
+
+/* Define to `signed int' if <sys/types.h> does not define. */
+/* #undef ssize_t */
+
+/* Define to `int' if <sys/types.h> doesn't define. */
+/* #undef uid_t */
+
+/* define as empty if volatile is not supported */
+/* #undef volatile */
+
+/* define to snprintf routine */
+/* #undef vsnprintf */
+
+
+/* begin of portable.h.post */
+
+#ifdef _WIN32
+/* don't suck in all of the win32 api */
+# define WIN32_LEAN_AND_MEAN 1
+#endif
+
+#ifndef LDAP_NEEDS_PROTOTYPES
+/* force LDAP_P to always include prototypes */
+#define LDAP_NEEDS_PROTOTYPES 1
+#endif
+
+#ifndef LDAP_REL_ENG
+#if (LDAP_VENDOR_VERSION == 000000) && !defined(LDAP_DEVEL)
+#define LDAP_DEVEL
+#endif
+#if defined(LDAP_DEVEL) && !defined(LDAP_TEST)
+#define LDAP_TEST
+#endif
+#endif
+
+#ifdef HAVE_STDDEF_H
+# include <stddef.h>
+#endif
+
+#ifdef HAVE_EBCDIC
+/* ASCII/EBCDIC converting replacements for stdio funcs
+ * vsnprintf and snprintf are used too, but they are already
+ * checked by the configure script
+ */
+#define fputs ber_pvt_fputs
+#define fgets ber_pvt_fgets
+#define printf ber_pvt_printf
+#define fprintf ber_pvt_fprintf
+#define vfprintf ber_pvt_vfprintf
+#define vsprintf ber_pvt_vsprintf
+#endif
+
+#include "ac/fdset.h"
+
+#include "ldap_cdefs.h"
+#include "ldap_features.h"
+
+#include "ac/assert.h"
+#include "ac/localize.h"
+
+#endif /* _LDAP_PORTABLE_H */
+/* end of portable.h.post */
+
diff --git a/contrib/poco b/contrib/poco
index fbaaba4a02e..b7d9ec16ee3 160000
--- a/contrib/poco
+++ b/contrib/poco
@@ -1 +1 @@
-Subproject commit fbaaba4a02e29987b8c584747a496c79528f125f
+Subproject commit b7d9ec16ee33ca76643d5fcd907ea9a33285640a
diff --git a/contrib/poco-cmake/Foundation/CMakeLists.txt b/contrib/poco-cmake/Foundation/CMakeLists.txt
index f4647461ec0..6476845b4e3 100644
--- a/contrib/poco-cmake/Foundation/CMakeLists.txt
+++ b/contrib/poco-cmake/Foundation/CMakeLists.txt
@@ -233,3 +233,10 @@ else ()
 
     message (STATUS "Using Poco::Foundation: ${LIBRARY_POCO_FOUNDATION} ${INCLUDE_POCO_FOUNDATION}")
 endif ()
+
+if(OS_DARWIN AND ARCH_AARCH64)
+    target_compile_definitions (_poco_foundation
+        PRIVATE
+            POCO_NO_STAT64
+    )
+endif()
diff --git a/contrib/replxx b/contrib/replxx
index cdb6e3f2ce4..2b24f14594d 160000
--- a/contrib/replxx
+++ b/contrib/replxx
@@ -1 +1 @@
-Subproject commit cdb6e3f2ce4464225daf9c8beeae7db98d590bdc
+Subproject commit 2b24f14594d7606792b92544bb112a6322ba34d7
diff --git a/contrib/rocksdb-cmake/CMakeLists.txt b/contrib/rocksdb-cmake/CMakeLists.txt
index 77a30776a4a..117015ef5c2 100644
--- a/contrib/rocksdb-cmake/CMakeLists.txt
+++ b/contrib/rocksdb-cmake/CMakeLists.txt
@@ -142,14 +142,14 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64")
   endif(HAS_ALTIVEC)
 endif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64")
 
-if(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64")
+if(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64|arm64|ARM64")
   CHECK_C_COMPILER_FLAG("-march=armv8-a+crc+crypto" HAS_ARMV8_CRC)
   if(HAS_ARMV8_CRC)
     message(STATUS " HAS_ARMV8_CRC yes")
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=armv8-a+crc+crypto -Wno-unused-function")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=armv8-a+crc+crypto -Wno-unused-function")
   endif(HAS_ARMV8_CRC)
-endif(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64")
+endif(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64|arm64|ARM64")
 
 
 include(CheckCXXSourceCompiles)
diff --git a/contrib/simdjson b/contrib/simdjson
index 3190d66a490..95b4870e20b 160000
--- a/contrib/simdjson
+++ b/contrib/simdjson
@@ -1 +1 @@
-Subproject commit 3190d66a49059092a1753dc35595923debfc1698
+Subproject commit 95b4870e20be5f97d9dcf63b23b1c6f520c366c1
diff --git a/contrib/zlib-ng b/contrib/zlib-ng
index 6fd1846c8b8..5cc4d232020 160000
--- a/contrib/zlib-ng
+++ b/contrib/zlib-ng
@@ -1 +1 @@
-Subproject commit 6fd1846c8b8f59436fe2dd752d0f316ddbb64df6
+Subproject commit 5cc4d232020dc66d1d6c5438834457e2a2f6127b
diff --git a/debian/changelog b/debian/changelog
index 53b36cae114..8b6626416a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-clickhouse (21.3.1.1) unstable; urgency=low
+clickhouse (21.6.1.1) unstable; urgency=low
 
   * Modified source code
 
- -- clickhouse-release <clickhouse-release@yandex-team.ru>  Mon, 01 Feb 2021 12:50:53 +0300
+ -- clickhouse-release <clickhouse-release@yandex-team.ru>  Tue, 20 Apr 2021 01:48:16 +0300
diff --git a/debian/clickhouse-common-static.install b/debian/clickhouse-common-static.install
index f1cbf0848d3..087a6dbba8f 100644
--- a/debian/clickhouse-common-static.install
+++ b/debian/clickhouse-common-static.install
@@ -1,4 +1,5 @@
 usr/bin/clickhouse
 usr/bin/clickhouse-odbc-bridge
+usr/bin/clickhouse-library-bridge
 usr/bin/clickhouse-extract-from-config
-etc/security/limits.d/clickhouse.conf
+usr/share/bash-completion/completions
diff --git a/debian/clickhouse-server.config b/debian/clickhouse-server.config
deleted file mode 100644
index 636ff7f4da7..00000000000
--- a/debian/clickhouse-server.config
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh -e
-
-test -f /usr/share/debconf/confmodule && . /usr/share/debconf/confmodule
-
-db_fget clickhouse-server/default-password seen || true
-password_seen="$RET"
-
-if [ "$1" = "reconfigure" ]; then
-    password_seen=false
-fi
-
-if [ "$password_seen" != "true" ]; then
-    db_input high clickhouse-server/default-password || true
-    db_go || true
-fi
-db_go || true
diff --git a/debian/clickhouse-server.postinst b/debian/clickhouse-server.postinst
index dc876f45954..419c13e3daf 100644
--- a/debian/clickhouse-server.postinst
+++ b/debian/clickhouse-server.postinst
@@ -23,11 +23,13 @@ if [ ! -f "/etc/debian_version" ]; then
 fi
 
 if [ "$1" = configure ] || [ -n "$not_deb_os" ]; then
+
+    ${CLICKHOUSE_GENERIC_PROGRAM} install --user "${CLICKHOUSE_USER}" --group "${CLICKHOUSE_GROUP}" --pid-path "${CLICKHOUSE_PIDDIR}" --config-path "${CLICKHOUSE_CONFDIR}" --binary-path "${CLICKHOUSE_BINDIR}" --log-path "${CLICKHOUSE_LOGDIR}" --data-path "${CLICKHOUSE_DATADIR}"
+
     if [ -x "/bin/systemctl" ] && [ -f /etc/systemd/system/clickhouse-server.service ] && [ -d /run/systemd/system ]; then
         # if old rc.d service present - remove it
         if [ -x "/etc/init.d/clickhouse-server" ] && [ -x "/usr/sbin/update-rc.d" ]; then
             /usr/sbin/update-rc.d clickhouse-server remove
-            echo "ClickHouse init script has migrated to systemd. Please manually stop old server and restart the service: sudo killall clickhouse-server && sleep 5 && sudo service clickhouse-server restart"
         fi
 
         /bin/systemctl daemon-reload
@@ -38,10 +40,8 @@ if [ "$1" = configure ] || [ -n "$not_deb_os" ]; then
             if [ -x "/usr/sbin/update-rc.d" ]; then
                 /usr/sbin/update-rc.d clickhouse-server defaults 19 19 >/dev/null || exit $?
             else
-                echo # TODO [ "$OS" = "rhel" ] || [ "$OS" = "centos" ] || [ "$OS" = "fedora" ]
+                echo # Other OS
             fi
         fi
     fi
-
-    ${CLICKHOUSE_GENERIC_PROGRAM} install --user "${CLICKHOUSE_USER}" --group "${CLICKHOUSE_GROUP}" --pid-path "${CLICKHOUSE_PIDDIR}" --config-path "${CLICKHOUSE_CONFDIR}" --binary-path "${CLICKHOUSE_BINDIR}" --log-path "${CLICKHOUSE_LOGDIR}" --data-path "${CLICKHOUSE_DATADIR}"
 fi
diff --git a/debian/clickhouse-server.preinst b/debian/clickhouse-server.preinst
deleted file mode 100644
index 3529aefa7da..00000000000
--- a/debian/clickhouse-server.preinst
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-if [ "$1" = "upgrade" ]; then
-    # Return etc/cron.d/clickhouse-server to original state
-    service clickhouse-server disable_cron ||:
-fi
-
-#DEBHELPER#
diff --git a/debian/clickhouse-server.prerm b/debian/clickhouse-server.prerm
deleted file mode 100644
index 02e855a7125..00000000000
--- a/debian/clickhouse-server.prerm
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-if [ "$1" = "upgrade" ] || [ "$1" = "remove" ]; then
-    # Return etc/cron.d/clickhouse-server to original state
-    service clickhouse-server disable_cron ||:
-fi
diff --git a/debian/clickhouse-server.templates b/debian/clickhouse-server.templates
deleted file mode 100644
index dd55824e15c..00000000000
--- a/debian/clickhouse-server.templates
+++ /dev/null
@@ -1,3 +0,0 @@
-Template: clickhouse-server/default-password
-Type: password
-Description: Enter password for default user:
diff --git a/debian/clickhouse.limits b/debian/clickhouse.limits
deleted file mode 100644
index aca44082c4e..00000000000
--- a/debian/clickhouse.limits
+++ /dev/null
@@ -1,2 +0,0 @@
-clickhouse	soft	nofile	262144
-clickhouse	hard	nofile	262144
diff --git a/debian/rules b/debian/rules
index 8eb47e95389..73d1f3d3b34 100755
--- a/debian/rules
+++ b/debian/rules
@@ -113,9 +113,6 @@ override_dh_install:
 	ln -sf clickhouse-server.docs debian/clickhouse-client.docs
 	ln -sf clickhouse-server.docs debian/clickhouse-common-static.docs
 
-	mkdir -p $(DESTDIR)/etc/security/limits.d
-	cp debian/clickhouse.limits $(DESTDIR)/etc/security/limits.d/clickhouse.conf
-
 	# systemd compatibility
 	mkdir -p $(DESTDIR)/etc/systemd/system/
 	cp debian/clickhouse-server.service $(DESTDIR)/etc/systemd/system/
diff --git a/debian/watch b/debian/watch
index 7ad4cedf713..ed3cab97ade 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,6 +1,6 @@
 version=4
 
 opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)-stable\.tar\.gz%clickhouse-$1.tar.gz%" \
-   https://github.com/yandex/clickhouse/tags \
+   https://github.com/ClickHouse/ClickHouse/tags \
    (?:.*?/)?v?(\d[\d.]*)-stable\.tar\.gz debian uupdate
 
diff --git a/docker/client/Dockerfile b/docker/client/Dockerfile
index 43921a4d3c4..569025dec1c 100644
--- a/docker/client/Dockerfile
+++ b/docker/client/Dockerfile
@@ -1,7 +1,7 @@
 FROM ubuntu:18.04
 
 ARG repository="deb https://repo.clickhouse.tech/deb/stable/ main/"
-ARG version=21.3.1.*
+ARG version=21.6.1.*
 
 RUN apt-get update \
     && apt-get install --yes --no-install-recommends \
@@ -18,6 +18,7 @@ RUN apt-get update \
             clickhouse-client=$version \
             clickhouse-common-static=$version \
             locales \
+            tzdata \
     && rm -rf /var/lib/apt/lists/* /var/cache/debconf \
     && apt-get clean
 
diff --git a/docker/images.json b/docker/images.json
index 303bd159ce4..e2e22468596 100644
--- a/docker/images.json
+++ b/docker/images.json
@@ -138,7 +138,8 @@
             "docker/test/stateless_unbundled",
             "docker/test/stateless_pytest",
             "docker/test/integration/base",
-            "docker/test/fuzzer"
+            "docker/test/fuzzer",
+            "docker/test/keeper-jepsen"
          ]
     },
     "docker/packager/unbundled": {
@@ -159,5 +160,9 @@
     "docker/test/sqlancer": {
         "name": "yandex/clickhouse-sqlancer-test",
         "dependent": []
+    },
+    "docker/test/keeper-jepsen": {
+        "name": "yandex/clickhouse-keeper-jepsen-test",
+        "dependent": []
     }
 }
diff --git a/docker/packager/binary/Dockerfile b/docker/packager/binary/Dockerfile
index 74de1a3e9bd..6948aeb3b18 100644
--- a/docker/packager/binary/Dockerfile
+++ b/docker/packager/binary/Dockerfile
@@ -4,14 +4,22 @@ FROM ubuntu:20.04
 ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=11
 
 RUN apt-get update \
-    && apt-get install ca-certificates lsb-release wget gnupg apt-transport-https \
+    && apt-get install \
+        apt-transport-https \
+        apt-utils \
+        ca-certificates \
+        dnsutils \
+        gnupg \
+        iputils-ping \
+        lsb-release \
+        wget \
         --yes --no-install-recommends --verbose-versions \
     && export LLVM_PUBKEY_HASH="bda960a8da687a275a2078d43c111d66b1c6a893a3275271beedf266c1ff4a0cdecb429c7a5cccf9f486ea7aa43fd27f" \
     && wget -nv -O /tmp/llvm-snapshot.gpg.key https://apt.llvm.org/llvm-snapshot.gpg.key \
     && echo "${LLVM_PUBKEY_HASH} /tmp/llvm-snapshot.gpg.key" | sha384sum -c \
     && apt-key add /tmp/llvm-snapshot.gpg.key \
     && export CODENAME="$(lsb_release --codename --short | tr 'A-Z' 'a-z')" \
-    && echo "deb [trusted=yes] http://apt.llvm.org/${CODENAME}/ llvm-toolchain-${CODENAME}-${LLVM_VERSION} main" >> \
+    && echo "deb [trusted=yes] https://apt.llvm.org/${CODENAME}/ llvm-toolchain-${CODENAME}-${LLVM_VERSION} main" >> \
         /etc/apt/sources.list
 
 # initial packages
@@ -27,35 +35,38 @@ RUN apt-get update \
 RUN apt-get update \
     && apt-get install \
         bash \
-        cmake \
+        build-essential \
         ccache \
-        curl \
-        gcc-9 \
-        g++-9 \
         clang-10 \
-        clang-tidy-10 \
-        lld-10 \
-        llvm-10 \
-        llvm-10-dev \
         clang-11 \
+        clang-tidy-10 \
         clang-tidy-11 \
-        lld-11 \
-        llvm-11 \
-        llvm-11-dev \
+        cmake \
+        cmake \
+        curl \
+        g++-9 \
+        gcc-9 \
+        gdb \
+        git \
+        gperf \
+        gperf \
+        intel-opencl-icd \
         libicu-dev \
         libreadline-dev \
+        lld-10 \
+        lld-11 \
+        llvm-10 \
+        llvm-10-dev \
+        llvm-11 \
+        llvm-11-dev \
+        moreutils \
         ninja-build \
-        gperf \
-        git \
-        opencl-headers \
         ocl-icd-libopencl1 \
-        intel-opencl-icd \
-        tzdata \
-        gperf \
-        cmake \
-        gdb \
+        opencl-headers \
+        pigz \
+        pixz \
         rename \
-        build-essential \
+        tzdata \
         --yes --no-install-recommends
 
 # This symlink required by gcc to find lld compiler
@@ -103,4 +114,4 @@ RUN rm /etc/apt/sources.list.d/proposed-repositories.list && apt-get update
 
 
 COPY build.sh /
-CMD ["/bin/bash", "/build.sh"]
+CMD ["bash", "-c", "/build.sh 2>&1 | ts"]
diff --git a/docker/packager/binary/build.sh b/docker/packager/binary/build.sh
index a42789c6186..cf74105fbbb 100755
--- a/docker/packager/binary/build.sh
+++ b/docker/packager/binary/build.sh
@@ -11,17 +11,28 @@ tar xJf gcc-arm-8.3-2019.03-x86_64-aarch64-linux-gnu.tar.xz -C build/cmake/toolc
 mkdir -p build/cmake/toolchain/freebsd-x86_64
 tar xJf freebsd-11.3-toolchain.tar.xz -C build/cmake/toolchain/freebsd-x86_64 --strip-components=1
 
+# Uncomment to debug ccache. Don't put ccache log in /output right away, or it
+# will be confusingly packed into the "performance" package.
+# export CCACHE_LOGFILE=/build/ccache.log
+# export CCACHE_DEBUG=1
+
 mkdir -p build/build_docker
 cd build/build_docker
-ccache --show-stats ||:
-ccache --zero-stats ||:
-ln -s /usr/lib/x86_64-linux-gnu/libOpenCL.so.1.0.0 /usr/lib/libOpenCL.so ||:
 rm -f CMakeCache.txt
 # Read cmake arguments into array (possibly empty)
 read -ra CMAKE_FLAGS <<< "${CMAKE_FLAGS:-}"
 cmake --debug-trycompile --verbose=1 -DCMAKE_VERBOSE_MAKEFILE=1 -LA "-DCMAKE_BUILD_TYPE=$BUILD_TYPE" "-DSANITIZE=$SANITIZER" -DENABLE_CHECK_HEAVY_BUILDS=1 "${CMAKE_FLAGS[@]}" ..
+
+ccache --show-config ||:
+ccache --show-stats ||:
+ccache --zero-stats ||:
+
 # shellcheck disable=SC2086 # No quotes because I want it to expand to nothing if empty.
 ninja $NINJA_FLAGS clickhouse-bundle
+
+ccache --show-config ||:
+ccache --show-stats ||:
+
 mv ./programs/clickhouse* /output
 mv ./src/unit_tests_dbms /output ||: # may not exist for some binary builds
 find . -name '*.so' -print -exec mv '{}' /output \;
@@ -65,8 +76,21 @@ then
     cp ../programs/server/config.xml /output/config
     cp ../programs/server/users.xml /output/config
     cp -r --dereference ../programs/server/config.d /output/config
-    tar -czvf "$COMBINED_OUTPUT.tgz" /output
+    tar -cv -I pigz -f "$COMBINED_OUTPUT.tgz" /output
     rm -r /output/*
     mv "$COMBINED_OUTPUT.tgz" /output
 fi
-ccache --show-stats ||:
+
+if [ "${CCACHE_DEBUG:-}" == "1" ]
+then
+    find . -name '*.ccache-*' -print0 \
+        | tar -c -I pixz -f /output/ccache-debug.txz --null -T -
+fi
+
+if [ -n "$CCACHE_LOGFILE" ]
+then
+    # Compress the log as well, or else the CI will try to compress all log
+    # files in place, and will fail because this directory is not writable.
+    tar -cv -I pixz -f /output/ccache.log.txz "$CCACHE_LOGFILE"
+fi
+
diff --git a/docker/packager/deb/Dockerfile b/docker/packager/deb/Dockerfile
index 8fd89d60f85..902929a2644 100644
--- a/docker/packager/deb/Dockerfile
+++ b/docker/packager/deb/Dockerfile
@@ -34,31 +34,32 @@ RUN curl -O https://clickhouse-builds.s3.yandex.net/utils/1/dpkg-deb \
 # Libraries from OS are only needed to test the "unbundled" build (this is not used in production).
 RUN apt-get update \
     && apt-get install \
-        gcc-9 \
-        g++-9 \
-        clang-11 \
-        clang-tidy-11 \
-        lld-11 \
-        llvm-11 \
-        llvm-11-dev \
+        alien \
         clang-10 \
+        clang-11 \
         clang-tidy-10 \
+        clang-tidy-11 \
+        cmake \
+        debhelper \
+        devscripts \
+        g++-9 \
+        gcc-9 \
+        gdb  \
+        git \
+        gperf \
         lld-10 \
+        lld-11 \
         llvm-10 \
         llvm-10-dev \
+        llvm-11 \
+        llvm-11-dev \
+        moreutils \
         ninja-build \
         perl \
-        pkg-config \
-        devscripts \
-        debhelper \
-        git \
-        tzdata \
-        gperf \
-        alien \
-        cmake \
-        gdb  \
-        moreutils \
         pigz \
+        pixz \
+        pkg-config \
+        tzdata \
         --yes --no-install-recommends
 
 # NOTE: For some reason we have outdated version of gcc-10 in ubuntu 20.04 stable.
diff --git a/docker/packager/deb/build.sh b/docker/packager/deb/build.sh
index 6450e21d289..c1a0b27db5d 100755
--- a/docker/packager/deb/build.sh
+++ b/docker/packager/deb/build.sh
@@ -2,8 +2,14 @@
 
 set -x -e
 
+# Uncomment to debug ccache.
+# export CCACHE_LOGFILE=/build/ccache.log
+# export CCACHE_DEBUG=1
+
+ccache --show-config ||:
 ccache --show-stats ||:
 ccache --zero-stats ||:
+
 read -ra ALIEN_PKGS <<< "${ALIEN_PKGS:-}"
 build/release --no-pbuilder "${ALIEN_PKGS[@]}" | ts '%Y-%m-%d %H:%M:%S'
 mv /*.deb /output
@@ -22,5 +28,19 @@ then
     mv /build/obj-*/src/unit_tests_dbms /output/binary
   fi
 fi
+
+ccache --show-config ||:
 ccache --show-stats ||:
-ln -s /usr/lib/x86_64-linux-gnu/libOpenCL.so.1.0.0 /usr/lib/libOpenCL.so ||:
+
+if [ "${CCACHE_DEBUG:-}" == "1" ]
+then
+    find /build -name '*.ccache-*' -print0 \
+        | tar -c -I pixz -f /output/ccache-debug.txz --null -T -
+fi
+
+if [ -n "$CCACHE_LOGFILE" ]
+then
+    # Compress the log as well, or else the CI will try to compress all log
+    # files in place, and will fail because this directory is not writable.
+    tar -cv -I pixz -f /output/ccache.log.txz "$CCACHE_LOGFILE"
+fi
diff --git a/docker/packager/unbundled/build.sh b/docker/packager/unbundled/build.sh
index 54575ab977c..99fc34fd9f3 100755
--- a/docker/packager/unbundled/build.sh
+++ b/docker/packager/unbundled/build.sh
@@ -13,4 +13,3 @@ mv /*.rpm /output ||: # if exists
 mv /*.tgz /output ||: # if exists
 
 ccache --show-stats ||:
-ln -s /usr/lib/x86_64-linux-gnu/libOpenCL.so.1.0.0 /usr/lib/libOpenCL.so ||:
diff --git a/docker/server/Dockerfile b/docker/server/Dockerfile
index 8e39af5646c..48c978366c6 100644
--- a/docker/server/Dockerfile
+++ b/docker/server/Dockerfile
@@ -1,9 +1,24 @@
 FROM ubuntu:20.04
 
 ARG repository="deb https://repo.clickhouse.tech/deb/stable/ main/"
-ARG version=21.3.1.*
+ARG version=21.6.1.*
 ARG gosu_ver=1.10
 
+# set non-empty deb_location_url url to create a docker image
+# from debs created by CI build, for example:
+# docker build . --network host --build-arg version="21.4.1.6282" --build-arg deb_location_url="https://clickhouse-builds.s3.yandex.net/21852/069cfbff388b3d478d1a16dc7060b48073f5d522/clickhouse_build_check/clang-11_relwithdebuginfo_none_bundled_unsplitted_disable_False_deb/" -t filimonovq/clickhouse-server:pr21852
+ARG deb_location_url=""
+
+# set non-empty single_binary_location_url to create docker image
+# from a single binary url (useful for non-standard builds - with sanitizers, for arm64).
+# for example (run on aarch64 server):
+# docker build . --network host --build-arg single_binary_location_url="https://builds.clickhouse.tech/master/aarch64/clickhouse" -t altinity/clickhouse-server:master-testing-arm
+# note: clickhouse-odbc-bridge is not supported there.
+ARG single_binary_location_url=""
+
+# see https://github.com/moby/moby/issues/4032#issuecomment-192327844
+ARG DEBIAN_FRONTEND=noninteractive
+
 # user/group precreated explicitly with fixed uid/gid on purpose.
 # It is especially important for rootless containers: in that case entrypoint
 # can't do chown and owners of mounted volumes should be configured externally.
@@ -19,19 +34,37 @@ RUN groupadd -r clickhouse --gid=101 \
         ca-certificates \
         dirmngr \
         gnupg \
+        locales \
+        wget \
+        tzdata \
     && mkdir -p /etc/apt/sources.list.d \
     && apt-key adv --keyserver keyserver.ubuntu.com --recv E0C56BD4 \
     && echo $repository > /etc/apt/sources.list.d/clickhouse.list \
-    && apt-get update \
-    && env DEBIAN_FRONTEND=noninteractive \
-        apt-get --yes -o "Dpkg::Options::=--force-confdef" -o "Dpkg::Options::=--force-confold" upgrade \
-    && env DEBIAN_FRONTEND=noninteractive \
-        apt-get install --allow-unauthenticated --yes --no-install-recommends \
-            clickhouse-common-static=$version \
-            clickhouse-client=$version \
-            clickhouse-server=$version \
-            locales \
-            wget \
+    && if [ -n "$deb_location_url" ]; then \
+            echo "installing from custom url with deb packages: $deb_location_url" \
+            rm -rf /tmp/clickhouse_debs \
+            && mkdir -p /tmp/clickhouse_debs \
+            && wget --progress=bar:force:noscroll "${deb_location_url}/clickhouse-common-static_${version}_amd64.deb" -P /tmp/clickhouse_debs \
+            && wget --progress=bar:force:noscroll "${deb_location_url}/clickhouse-client_${version}_all.deb" -P /tmp/clickhouse_debs \
+            && wget --progress=bar:force:noscroll "${deb_location_url}/clickhouse-server_${version}_all.deb" -P /tmp/clickhouse_debs \
+            && dpkg -i /tmp/clickhouse_debs/*.deb ; \
+       elif [ -n "$single_binary_location_url" ]; then \
+            echo "installing from single binary url: $single_binary_location_url" \
+            && rm -rf /tmp/clickhouse_binary \
+            && mkdir -p /tmp/clickhouse_binary \
+            && wget --progress=bar:force:noscroll "$single_binary_location_url" -O /tmp/clickhouse_binary/clickhouse \
+            && chmod +x /tmp/clickhouse_binary/clickhouse \
+            && /tmp/clickhouse_binary/clickhouse install --user "clickhouse" --group "clickhouse" ; \
+       else \
+           echo "installing from repository: $repository" \
+           && apt-get update \
+           && apt-get --yes -o "Dpkg::Options::=--force-confdef" -o "Dpkg::Options::=--force-confold" upgrade \
+           && apt-get install --allow-unauthenticated --yes --no-install-recommends \
+                clickhouse-common-static=$version \
+                clickhouse-client=$version \
+                clickhouse-server=$version ; \
+       fi \
+    && clickhouse-local -q 'SELECT * FROM system.build_options' \
     && rm -rf \
         /var/lib/apt/lists/* \
         /var/cache/debconf \
diff --git a/docker/server/Dockerfile.alpine b/docker/server/Dockerfile.alpine
index 0f9de1996ab..cd192c0c9da 100644
--- a/docker/server/Dockerfile.alpine
+++ b/docker/server/Dockerfile.alpine
@@ -21,7 +21,9 @@ RUN addgroup -S -g 101 clickhouse \
     && chown clickhouse:clickhouse /var/lib/clickhouse \
     && chown root:clickhouse /var/log/clickhouse-server \
     && chmod +x /entrypoint.sh \
-    && apk add --no-cache su-exec bash \
+    && apk add --no-cache su-exec bash tzdata \
+    && cp /usr/share/zoneinfo/UTC /etc/localtime \
+    && echo "UTC" > /etc/timezone \
     && chmod ugo+Xrw -R /var/lib/clickhouse /var/log/clickhouse-server /etc/clickhouse-server /etc/clickhouse-client
 
 # we need to allow "others" access to clickhouse folder, because docker container
diff --git a/docker/server/entrypoint.sh b/docker/server/entrypoint.sh
index 0138a165505..4486b0d9d7f 100755
--- a/docker/server/entrypoint.sh
+++ b/docker/server/entrypoint.sh
@@ -38,17 +38,16 @@ if ! $gosu test -f "$CLICKHOUSE_CONFIG" -a -r "$CLICKHOUSE_CONFIG"; then
     exit 1
 fi
 
-# port is needed to check if clickhouse-server is ready for connections
-HTTP_PORT="$(clickhouse extract-from-config --config-file "$CLICKHOUSE_CONFIG" --key=http_port)"
-
 # get CH directories locations
 DATA_DIR="$(clickhouse extract-from-config --config-file "$CLICKHOUSE_CONFIG" --key=path || true)"
 TMP_DIR="$(clickhouse extract-from-config --config-file "$CLICKHOUSE_CONFIG" --key=tmp_path || true)"
 USER_PATH="$(clickhouse extract-from-config --config-file "$CLICKHOUSE_CONFIG" --key=user_files_path || true)"
 LOG_PATH="$(clickhouse extract-from-config --config-file "$CLICKHOUSE_CONFIG" --key=logger.log || true)"
-LOG_DIR="$(dirname "$LOG_PATH" || true)"
+LOG_DIR=""
+if [ -n "$LOG_PATH" ]; then LOG_DIR="$(dirname "$LOG_PATH")"; fi
 ERROR_LOG_PATH="$(clickhouse extract-from-config --config-file "$CLICKHOUSE_CONFIG" --key=logger.errorlog || true)"
-ERROR_LOG_DIR="$(dirname "$ERROR_LOG_PATH" || true)"
+ERROR_LOG_DIR=""
+if [ -n "$ERROR_LOG_PATH" ]; then ERROR_LOG_DIR="$(dirname "$ERROR_LOG_PATH")"; fi
 FORMAT_SCHEMA_PATH="$(clickhouse extract-from-config --config-file "$CLICKHOUSE_CONFIG" --key=format_schema_path || true)"
 
 CLICKHOUSE_USER="${CLICKHOUSE_USER:-default}"
@@ -106,6 +105,9 @@ EOT
 fi
 
 if [ -n "$(ls /docker-entrypoint-initdb.d/)" ] || [ -n "$CLICKHOUSE_DB" ]; then
+    # port is needed to check if clickhouse-server is ready for connections
+    HTTP_PORT="$(clickhouse extract-from-config --config-file "$CLICKHOUSE_CONFIG" --key=http_port)"
+
     # Listen only on localhost until the initialization is done
     $gosu /usr/bin/clickhouse-server --config-file="$CLICKHOUSE_CONFIG" -- --listen_host=127.0.0.1 &
     pid="$!"
diff --git a/docker/test/Dockerfile b/docker/test/Dockerfile
index f151ae8fddf..0e4646386ce 100644
--- a/docker/test/Dockerfile
+++ b/docker/test/Dockerfile
@@ -1,7 +1,7 @@
 FROM ubuntu:18.04
 
 ARG repository="deb https://repo.clickhouse.tech/deb/stable/ main/"
-ARG version=21.3.1.*
+ARG version=21.6.1.*
 
 RUN apt-get update && \
     apt-get install -y apt-transport-https dirmngr && \
diff --git a/docker/test/fasttest/Dockerfile b/docker/test/fasttest/Dockerfile
index 64be52d8e30..2864f7fc4da 100644
--- a/docker/test/fasttest/Dockerfile
+++ b/docker/test/fasttest/Dockerfile
@@ -1,7 +1,7 @@
 #  docker build -t yandex/clickhouse-fasttest .
 FROM ubuntu:20.04
 
-ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=10
+ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=11
 
 RUN apt-get update \
     && apt-get install ca-certificates lsb-release wget gnupg apt-transport-https \
@@ -43,20 +43,20 @@ RUN apt-get update \
         clang-tidy-${LLVM_VERSION} \
         cmake \
         curl \
-        lsof \
         expect \
         fakeroot \
-        git \
         gdb \
+        git \
         gperf \
         lld-${LLVM_VERSION} \
         llvm-${LLVM_VERSION} \
+        lsof \
         moreutils \
         ninja-build \
         psmisc \
         python3 \
-        python3-pip \
         python3-lxml \
+        python3-pip \
         python3-requests \
         python3-termcolor \
         rename \
diff --git a/docker/test/fasttest/run.sh b/docker/test/fasttest/run.sh
index b6fcdd7f7d2..a7cc398e5c9 100755
--- a/docker/test/fasttest/run.sh
+++ b/docker/test/fasttest/run.sh
@@ -8,6 +8,9 @@ trap 'kill $(jobs -pr) ||:' EXIT
 # that we can run the "everything else" stage from the cloned source.
 stage=${stage:-}
 
+# Compiler version, normally set by Dockerfile
+export LLVM_VERSION=${LLVM_VERSION:-11}
+
 # A variable to pass additional flags to CMake.
 # Here we explicitly default it to nothing so that bash doesn't complain about
 # it being undefined. Also read it as array so that we can pass an empty list
@@ -70,6 +73,7 @@ function start_server
         --path "$FASTTEST_DATA"
         --user_files_path "$FASTTEST_DATA/user_files"
         --top_level_domains_path "$FASTTEST_DATA/top_level_domains"
+        --keeper_server.log_storage_path "$FASTTEST_DATA/coordination"
     )
     clickhouse-server "${opts[@]}" &>> "$FASTTEST_OUTPUT/server.log" &
     server_pid=$!
@@ -123,22 +127,26 @@ continue
 
 function clone_root
 {
-    git clone https://github.com/ClickHouse/ClickHouse.git -- "$FASTTEST_SOURCE" | ts '%Y-%m-%d %H:%M:%S' | tee "$FASTTEST_OUTPUT/clone_log.txt"
+    git clone --depth 1 https://github.com/ClickHouse/ClickHouse.git -- "$FASTTEST_SOURCE" 2>&1 | ts '%Y-%m-%d %H:%M:%S' | tee "$FASTTEST_OUTPUT/clone_log.txt"
 
     (
         cd "$FASTTEST_SOURCE"
         if [ "$PULL_REQUEST_NUMBER" != "0" ]; then
-            if git fetch origin "+refs/pull/$PULL_REQUEST_NUMBER/merge"; then
+            if git fetch --depth 1 origin "+refs/pull/$PULL_REQUEST_NUMBER/merge"; then
                 git checkout FETCH_HEAD
-                echo 'Clonned merge head'
+                echo "Checked out pull/$PULL_REQUEST_NUMBER/merge ($(git rev-parse FETCH_HEAD))"
             else
-                git fetch origin "+refs/pull/$PULL_REQUEST_NUMBER/head"
+                git fetch --depth 1 origin "+refs/pull/$PULL_REQUEST_NUMBER/head"
                 git checkout "$COMMIT_SHA"
-                echo 'Checked out to commit'
+                echo "Checked out nominal SHA $COMMIT_SHA for PR $PULL_REQUEST_NUMBER"
             fi
         else
             if [ -v COMMIT_SHA ]; then
+                git fetch --depth 1 origin "$COMMIT_SHA"
                 git checkout "$COMMIT_SHA"
+                echo "Checked out nominal SHA $COMMIT_SHA for master"
+            else
+                echo  "Using default repository head $(git rev-parse HEAD)"
             fi
         fi
     )
@@ -150,6 +158,7 @@ function clone_submodules
         cd "$FASTTEST_SOURCE"
 
         SUBMODULES_TO_UPDATE=(
+            contrib/abseil-cpp
             contrib/antlr4-runtime
             contrib/boost
             contrib/zlib-ng
@@ -179,7 +188,7 @@ function clone_submodules
         )
 
         git submodule sync
-        git submodule update --init --recursive "${SUBMODULES_TO_UPDATE[@]}"
+        git submodule update --depth 1 --init --recursive "${SUBMODULES_TO_UPDATE[@]}"
         git submodule foreach git reset --hard
         git submodule foreach git checkout @ -f
         git submodule foreach git clean -xfd
@@ -213,7 +222,7 @@ function run_cmake
 
     (
         cd "$FASTTEST_BUILD"
-        cmake "$FASTTEST_SOURCE" -DCMAKE_CXX_COMPILER=clang++-10 -DCMAKE_C_COMPILER=clang-10 "${CMAKE_LIBS_CONFIG[@]}" "${FASTTEST_CMAKE_FLAGS[@]}" | ts '%Y-%m-%d %H:%M:%S' | tee "$FASTTEST_OUTPUT/cmake_log.txt"
+        cmake "$FASTTEST_SOURCE" -DCMAKE_CXX_COMPILER="clang++-${LLVM_VERSION}" -DCMAKE_C_COMPILER="clang-${LLVM_VERSION}" "${CMAKE_LIBS_CONFIG[@]}" "${FASTTEST_CMAKE_FLAGS[@]}" 2>&1 | ts '%Y-%m-%d %H:%M:%S' | tee "$FASTTEST_OUTPUT/cmake_log.txt"
     )
 }
 
@@ -221,7 +230,7 @@ function build
 {
     (
         cd "$FASTTEST_BUILD"
-        time ninja clickhouse-bundle | ts '%Y-%m-%d %H:%M:%S' | tee "$FASTTEST_OUTPUT/build_log.txt"
+        time ninja clickhouse-bundle 2>&1 | ts '%Y-%m-%d %H:%M:%S' | tee "$FASTTEST_OUTPUT/build_log.txt"
         if [ "$COPY_CLICKHOUSE_BINARY_TO_OUTPUT" -eq "1" ]; then
             cp programs/clickhouse "$FASTTEST_OUTPUT/clickhouse"
         fi
@@ -290,6 +299,8 @@ function run_tests
         01318_decrypt                           # Depends on OpenSSL
         01663_aes_msan                          # Depends on OpenSSL
         01667_aes_args_check                    # Depends on OpenSSL
+        01776_decrypt_aead_size_check           # Depends on OpenSSL
+        01811_filter_by_null                    # Depends on OpenSSL
         01281_unsucceeded_insert_select_queries_counter
         01292_create_user
         01294_lazy_database_concurrent
@@ -297,10 +308,8 @@ function run_tests
         01354_order_by_tuple_collate_const
         01355_ilike
         01411_bayesian_ab_testing
-        01532_collate_in_low_cardinality
-        01533_collate_in_nullable
-        01542_collate_in_array
-        01543_collate_in_tuple
+        collate
+        collation
         _orc_
         arrow
         avro
@@ -355,7 +364,12 @@ function run_tests
 
         # JSON functions
         01666_blns
-        01674_htm_xml_coarse_parse
+
+        # Requires postgresql-client
+        01802_test_postgresql_protocol_with_row_policy
+
+        # Depends on AWS
+        01801_s3_cluster
     )
 
     (time clickhouse-test --hung-check -j 8 --order=random --use-skip-list --no-long --testname --shard --zookeeper --skip "${TESTS_TO_SKIP[@]}" -- "$FASTTEST_FOCUS" 2>&1 ||:) | ts '%Y-%m-%d %H:%M:%S' | tee "$FASTTEST_OUTPUT/test_log.txt"
@@ -375,7 +389,7 @@ function run_tests
         stop_server ||:
 
         # Clean the data so that there is no interference from the previous test run.
-        rm -rf "$FASTTEST_DATA"/{{meta,}data,user_files} ||:
+        rm -rf "$FASTTEST_DATA"/{{meta,}data,user_files,coordination} ||:
 
         start_server
 
@@ -418,7 +432,7 @@ case "$stage" in
     # See the compatibility hacks in `clone_root` stage above. Remove at the same time,
     # after Nov 1, 2020.
     cd "$FASTTEST_WORKSPACE"
-    clone_submodules | ts '%Y-%m-%d %H:%M:%S' | tee "$FASTTEST_OUTPUT/submodule_log.txt"
+    clone_submodules 2>&1 | ts '%Y-%m-%d %H:%M:%S' | tee "$FASTTEST_OUTPUT/submodule_log.txt"
     ;&
 "run_cmake")
     run_cmake
@@ -429,7 +443,7 @@ case "$stage" in
 "configure")
     # The `install_log.txt` is also needed for compatibility with old CI task --
     # if there is no log, it will decide that build failed.
-    configure | ts '%Y-%m-%d %H:%M:%S' | tee "$FASTTEST_OUTPUT/install_log.txt"
+    configure 2>&1 | ts '%Y-%m-%d %H:%M:%S' | tee "$FASTTEST_OUTPUT/install_log.txt"
     ;&
 "run_tests")
     run_tests
diff --git a/docker/test/fuzzer/run-fuzzer.sh b/docker/test/fuzzer/run-fuzzer.sh
index 766fec76179..626bedb453c 100755
--- a/docker/test/fuzzer/run-fuzzer.sh
+++ b/docker/test/fuzzer/run-fuzzer.sh
@@ -4,7 +4,9 @@
 set -eux
 set -o pipefail
 trap "exit" INT TERM
-trap 'kill $(jobs -pr) ||:' EXIT
+# The watchdog is in the separate process group, so we have to kill it separately
+# if the script terminates earlier.
+trap 'kill $(jobs -pr) ${watchdog_pid:-} ||:' EXIT
 
 stage=${stage:-}
 script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
@@ -14,35 +16,28 @@ BINARY_TO_DOWNLOAD=${BINARY_TO_DOWNLOAD:="clang-11_debug_none_bundled_unsplitted
 
 function clone
 {
-(
+    # The download() function is dependent on CI binaries anyway, so we can take
+    # the repo from the CI as well. For local runs, start directly from the "fuzz"
+    # stage.
     rm -rf ch ||:
-    mkdir ch
-    cd ch
-
-    git init
-    git remote add origin https://github.com/ClickHouse/ClickHouse
-
-    # Network is unreliable. GitHub neither.
-    for _ in {1..100}; do git fetch --depth=100 origin "$SHA_TO_TEST" && break; sleep 1; done
-    # Used to obtain the list of modified or added tests
-    for _ in {1..100}; do git fetch --depth=100 origin master && break; sleep 1; done
-
-    # If not master, try to fetch pull/.../{head,merge}
-    if [ "$PR_TO_TEST" != "0" ]
-    then
-        for _ in {1..100}; do git fetch --depth=100 origin "refs/pull/$PR_TO_TEST/*:refs/heads/pull/$PR_TO_TEST/*" && break; sleep 1; done
-    fi
-
-    git checkout "$SHA_TO_TEST"
-)
+    mkdir ch ||:
+    wget -nv -nd -c "https://clickhouse-test-reports.s3.yandex.net/$PR_TO_TEST/$SHA_TO_TEST/repo/clickhouse_no_subs.tar.gz"
+    tar -C ch --strip-components=1 -xf clickhouse_no_subs.tar.gz
+    ls -lath ||:
 }
 
 function download
 {
-    wget -nv -nd -c "https://clickhouse-builds.s3.yandex.net/$PR_TO_TEST/$SHA_TO_TEST/clickhouse_build_check/$BINARY_TO_DOWNLOAD/clickhouse"
+    wget -nv -nd -c "https://clickhouse-builds.s3.yandex.net/$PR_TO_TEST/$SHA_TO_TEST/clickhouse_build_check/$BINARY_TO_DOWNLOAD/clickhouse" &
+    wget -nv -nd -c "https://clickhouse-test-reports.s3.yandex.net/$PR_TO_TEST/$SHA_TO_TEST/repo/ci-changed-files.txt" &
+    wait
+
     chmod +x clickhouse
     ln -s ./clickhouse ./clickhouse-server
     ln -s ./clickhouse ./clickhouse-client
+
+    # clickhouse-server is in the current dir
+    export PATH="$PWD:$PATH"
 }
 
 function configure
@@ -74,25 +69,38 @@ function watchdog
     killall -9 clickhouse-client ||:
 }
 
+function filter_exists
+{
+    local path
+    for path in "$@"; do
+        if [ -e "$path" ]; then
+            echo "$path"
+        else
+            echo "'$path' does not exists" >&2
+        fi
+    done
+}
+
 function fuzz
 {
     # Obtain the list of newly added tests. They will be fuzzed in more extreme way than other tests.
-    cd ch
-    NEW_TESTS=$(git diff --name-only "$(git merge-base origin/master "$SHA_TO_TEST"~)" "$SHA_TO_TEST" | grep -P 'tests/queries/0_stateless/.*\.sql' | sed -r -e 's!^!ch/!' | sort -R)
-    cd ..
+    # Don't overwrite the NEW_TESTS_OPT so that it can be set from the environment.
+    NEW_TESTS="$(grep -P 'tests/queries/0_stateless/.*\.sql' ci-changed-files.txt | sed -r -e 's!^!ch/!' | sort -R)"
+    # ci-changed-files.txt contains also files that has been deleted/renamed, filter them out.
+    NEW_TESTS="$(filter_exists $NEW_TESTS)"
     if [[ -n "$NEW_TESTS" ]]
     then
-        NEW_TESTS_OPT="--interleave-queries-file ${NEW_TESTS}"
+        NEW_TESTS_OPT="${NEW_TESTS_OPT:---interleave-queries-file ${NEW_TESTS}}"
     else
-        NEW_TESTS_OPT=""
+        NEW_TESTS_OPT="${NEW_TESTS_OPT:-}"
     fi
 
-    ./clickhouse-server --config-file db/config.xml -- --path db 2>&1 | tail -100000 > server.log &
+    clickhouse-server --config-file db/config.xml -- --path db 2>&1 | tail -100000 > server.log &
 
     server_pid=$!
     kill -0 $server_pid
-    while ! ./clickhouse-client --query "select 1" && kill -0 $server_pid ; do echo . ; sleep 1 ; done
-    ./clickhouse-client --query "select 1"
+    while ! clickhouse-client --query "select 1" && kill -0 $server_pid ; do echo . ; sleep 1 ; done
+    clickhouse-client --query "select 1"
     kill -0 $server_pid
     echo Server started
 
@@ -111,14 +119,14 @@ continue
     # SC2012: Use find instead of ls to better handle non-alphanumeric filenames. They are all alphanumeric.
     # SC2046: Quote this to prevent word splitting. Actually I need word splitting.
     # shellcheck disable=SC2012,SC2046
-    ./clickhouse-client --query-fuzzer-runs=1000 --queries-file $(ls -1 ch/tests/queries/0_stateless/*.sql | sort -R) $NEW_TESTS_OPT \
+    clickhouse-client --query-fuzzer-runs=1000 --queries-file $(ls -1 ch/tests/queries/0_stateless/*.sql | sort -R) $NEW_TESTS_OPT \
         > >(tail -n 100000 > fuzzer.log) \
         2>&1 \
         || fuzzer_exit_code=$?
 
     echo "Fuzzer exit code is $fuzzer_exit_code"
 
-    ./clickhouse-client --query "select elapsed, query from system.processes" ||:
+    clickhouse-client --query "select elapsed, query from system.processes" ||:
     killall clickhouse-server ||:
     for _ in {1..10}
     do
@@ -190,7 +198,7 @@ case "$stage" in
         # Lost connection to the server. This probably means that the server died
         # with abort.
         echo "failure" > status.txt
-        if ! grep -ao "Received signal.*\|Logical error.*\|Assertion.*failed\|Failed assertion.*\|.*runtime error: .*\|.*is located.*\|SUMMARY: MemorySanitizer:.*\|SUMMARY: ThreadSanitizer:.*\|.*_LIBCPP_ASSERT.*" server.log > description.txt
+        if ! grep -ao "Received signal.*\|Logical error.*\|Assertion.*failed\|Failed assertion.*\|.*runtime error: .*\|.*is located.*\|SUMMARY: AddressSanitizer:.*\|SUMMARY: MemorySanitizer:.*\|SUMMARY: ThreadSanitizer:.*\|.*_LIBCPP_ASSERT.*" server.log > description.txt
         then
             echo "Lost connection to server. See the logs." > description.txt
         fi
diff --git a/docker/test/integration/base/Dockerfile b/docker/test/integration/base/Dockerfile
index 4963ff0094d..1c962f1bf8f 100644
--- a/docker/test/integration/base/Dockerfile
+++ b/docker/test/integration/base/Dockerfile
@@ -18,7 +18,9 @@ RUN apt-get update \
         curl \
         tar \
         krb5-user \
-        iproute2
+        iproute2 \
+        lsof \
+        g++
 RUN rm -rf \
         /var/lib/apt/lists/* \
         /var/cache/debconf \
diff --git a/docker/test/integration/runner/Dockerfile b/docker/test/integration/runner/Dockerfile
index e0e5e36a3d6..783e689ed01 100644
--- a/docker/test/integration/runner/Dockerfile
+++ b/docker/test/integration/runner/Dockerfile
@@ -31,6 +31,7 @@ RUN apt-get update \
     software-properties-common \
     libkrb5-dev \
     krb5-user \
+    g++ \
     && rm -rf \
         /var/lib/apt/lists/* \
         /var/cache/debconf \
diff --git a/docker/test/integration/runner/compose/docker_compose_mysql_cluster.yml b/docker/test/integration/runner/compose/docker_compose_mysql_cluster.yml
new file mode 100644
index 00000000000..d0674362709
--- /dev/null
+++ b/docker/test/integration/runner/compose/docker_compose_mysql_cluster.yml
@@ -0,0 +1,23 @@
+version: '2.3'
+services:
+    mysql2:
+        image: mysql:5.7
+        restart: always
+        environment:
+            MYSQL_ROOT_PASSWORD: clickhouse
+        ports:
+            - 3348:3306
+    mysql3:
+        image: mysql:5.7
+        restart: always
+        environment:
+            MYSQL_ROOT_PASSWORD: clickhouse
+        ports:
+            - 3388:3306
+    mysql4:
+        image: mysql:5.7
+        restart: always
+        environment:
+            MYSQL_ROOT_PASSWORD: clickhouse
+        ports:
+            - 3368:3306
diff --git a/docker/test/integration/runner/compose/docker_compose_postgres_cluster.yml b/docker/test/integration/runner/compose/docker_compose_postgres_cluster.yml
new file mode 100644
index 00000000000..d04c8a2f3a6
--- /dev/null
+++ b/docker/test/integration/runner/compose/docker_compose_postgres_cluster.yml
@@ -0,0 +1,23 @@
+version: '2.3'
+services:
+    postgres2:
+        image: postgres
+        restart: always
+        environment:
+            POSTGRES_PASSWORD: mysecretpassword
+        ports:
+            - 5421:5432
+    postgres3:
+        image: postgres
+        restart: always
+        environment:
+            POSTGRES_PASSWORD: mysecretpassword
+        ports:
+            - 5441:5432
+    postgres4:
+        image: postgres
+        restart: always
+        environment:
+            POSTGRES_PASSWORD: mysecretpassword
+        ports:
+            - 5461:5432
diff --git a/docker/test/integration/runner/compose/docker_compose_zookeeper.yml b/docker/test/integration/runner/compose/docker_compose_zookeeper.yml
index 49e285b5515..1601d217a25 100644
--- a/docker/test/integration/runner/compose/docker_compose_zookeeper.yml
+++ b/docker/test/integration/runner/compose/docker_compose_zookeeper.yml
@@ -1,11 +1,11 @@
 version: '2.3'
 services:
     zoo1:
-        image: zookeeper:3.4.12
+        image: zookeeper:3.6.2
         restart: always
         environment:
             ZOO_TICK_TIME: 500
-            ZOO_SERVERS: server.1=zoo1:2888:3888 server.2=zoo2:2888:3888 server.3=zoo3:2888:3888
+            ZOO_SERVERS: server.1=zoo1:2888:3888;2181 server.2=zoo2:2888:3888;2181 server.3=zoo3:2888:3888;2181
             ZOO_MY_ID: 1
             JVMFLAGS: -Dzookeeper.forceSync=no
         volumes:
@@ -16,11 +16,11 @@ services:
               source: ${ZK_DATA_LOG1:-}
               target: /datalog
     zoo2:
-        image: zookeeper:3.4.12
+        image: zookeeper:3.6.2
         restart: always
         environment:
             ZOO_TICK_TIME: 500
-            ZOO_SERVERS: server.1=zoo1:2888:3888 server.2=zoo2:2888:3888 server.3=zoo3:2888:3888
+            ZOO_SERVERS: server.1=zoo1:2888:3888;2181 server.2=zoo2:2888:3888;2181 server.3=zoo3:2888:3888
             ZOO_MY_ID: 2
             JVMFLAGS: -Dzookeeper.forceSync=no
         volumes:
@@ -31,11 +31,11 @@ services:
               source: ${ZK_DATA_LOG2:-}
               target: /datalog
     zoo3:
-        image: zookeeper:3.4.12
+        image: zookeeper:3.6.2
         restart: always
         environment:
             ZOO_TICK_TIME: 500
-            ZOO_SERVERS: server.1=zoo1:2888:3888 server.2=zoo2:2888:3888 server.3=zoo3:2888:3888
+            ZOO_SERVERS: server.1=zoo1:2888:3888;2181 server.2=zoo2:2888:3888;2181 server.3=zoo3:2888:3888;2181
             ZOO_MY_ID: 3
             JVMFLAGS: -Dzookeeper.forceSync=no
         volumes:
diff --git a/docker/test/integration/runner/dockerd-entrypoint.sh b/docker/test/integration/runner/dockerd-entrypoint.sh
index c0255d3d706..bda6f5a719d 100755
--- a/docker/test/integration/runner/dockerd-entrypoint.sh
+++ b/docker/test/integration/runner/dockerd-entrypoint.sh
@@ -21,6 +21,7 @@ export CLICKHOUSE_TESTS_SERVER_BIN_PATH=/clickhouse
 export CLICKHOUSE_TESTS_CLIENT_BIN_PATH=/clickhouse
 export CLICKHOUSE_TESTS_BASE_CONFIG_DIR=/clickhouse-config
 export CLICKHOUSE_ODBC_BRIDGE_BINARY_PATH=/clickhouse-odbc-bridge
+export CLICKHOUSE_LIBRARY_BRIDGE_BINARY_PATH=/clickhouse-library-bridge
 
 export DOCKER_MYSQL_GOLANG_CLIENT_TAG=${DOCKER_MYSQL_GOLANG_CLIENT_TAG:=latest}
 export DOCKER_MYSQL_JAVA_CLIENT_TAG=${DOCKER_MYSQL_JAVA_CLIENT_TAG:=latest}
diff --git a/docker/test/keeper-jepsen/Dockerfile b/docker/test/keeper-jepsen/Dockerfile
new file mode 100644
index 00000000000..1a62d5e793f
--- /dev/null
+++ b/docker/test/keeper-jepsen/Dockerfile
@@ -0,0 +1,39 @@
+# docker build -t yandex/clickhouse-keeper-jepsen-test .
+FROM yandex/clickhouse-test-base
+
+ENV DEBIAN_FRONTEND=noninteractive
+ENV CLOJURE_VERSION=1.10.3.814
+
+# arguments
+ENV PR_TO_TEST=""
+ENV SHA_TO_TEST=""
+
+ENV NODES_USERNAME="root"
+ENV NODES_PASSWORD=""
+ENV TESTS_TO_RUN="30"
+ENV TIME_LIMIT="30"
+
+
+# volumes
+ENV NODES_FILE_PATH="/nodes.txt"
+ENV TEST_OUTPUT="/test_output"
+
+RUN mkdir "/root/.ssh"
+RUN touch "/root/.ssh/known_hosts"
+
+# install java
+RUN apt-get update && apt-get install default-jre default-jdk libjna-java libjna-jni ssh gnuplot graphviz --yes --no-install-recommends
+
+# install clojure
+RUN curl -O "https://download.clojure.org/install/linux-install-${CLOJURE_VERSION}.sh" && \
+    chmod +x "linux-install-${CLOJURE_VERSION}.sh" && \
+    bash "./linux-install-${CLOJURE_VERSION}.sh"
+
+# install leiningen
+RUN curl -O "https://raw.githubusercontent.com/technomancy/leiningen/stable/bin/lein" && \
+    chmod +x ./lein && \
+    mv ./lein /usr/bin
+
+COPY run.sh /
+
+CMD ["/bin/bash", "/run.sh"]
diff --git a/docker/test/keeper-jepsen/run.sh b/docker/test/keeper-jepsen/run.sh
new file mode 100644
index 00000000000..352585e16e3
--- /dev/null
+++ b/docker/test/keeper-jepsen/run.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+
+CLICKHOUSE_PACKAGE=${CLICKHOUSE_PACKAGE:="https://clickhouse-builds.s3.yandex.net/$PR_TO_TEST/$SHA_TO_TEST/clickhouse_build_check/clang-11_relwithdebuginfo_none_bundled_unsplitted_disable_False_binary/clickhouse"}
+CLICKHOUSE_REPO_PATH=${CLICKHOUSE_REPO_PATH:=""}
+
+
+if [ -z "$CLICKHOUSE_REPO_PATH" ]; then
+    CLICKHOUSE_REPO_PATH=ch
+    rm -rf ch ||:
+    mkdir ch ||:
+    wget -nv -nd -c "https://clickhouse-test-reports.s3.yandex.net/$PR_TO_TEST/$SHA_TO_TEST/repo/clickhouse_no_subs.tar.gz"
+    tar -C ch --strip-components=1 -xf clickhouse_no_subs.tar.gz
+    ls -lath ||:
+fi
+
+cd "$CLICKHOUSE_REPO_PATH/tests/jepsen.clickhouse-keeper"
+
+(lein run test-all --nodes-file "$NODES_FILE_PATH" --username "$NODES_USERNAME" --logging-json --password "$NODES_PASSWORD" --time-limit "$TIME_LIMIT" --concurrency 50 -r 50 --snapshot-distance 100 --stale-log-gap 100 --reserved-log-items 10 --lightweight-run  --clickhouse-source "$CLICKHOUSE_PACKAGE" -q --test-count "$TESTS_TO_RUN" || true) | tee "$TEST_OUTPUT/jepsen_run_all_tests.log"
+
+mv store "$TEST_OUTPUT/"
diff --git a/docker/test/performance-comparison/compare.sh b/docker/test/performance-comparison/compare.sh
index 2b19a5e75a8..4507de16492 100755
--- a/docker/test/performance-comparison/compare.sh
+++ b/docker/test/performance-comparison/compare.sh
@@ -2,7 +2,9 @@
 set -exu
 set -o pipefail
 trap "exit" INT TERM
-trap 'kill $(jobs -pr) ||:' EXIT
+# The watchdog is in the separate process group, so we have to kill it separately
+# if the script terminates earlier.
+trap 'kill $(jobs -pr) ${watchdog_pid:-} ||:' EXIT
 
 stage=${stage:-}
 script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
@@ -358,6 +360,8 @@ mkdir analyze analyze/tmp ||:
 build_log_column_definitions
 
 # Split the raw test output into files suitable for analysis.
+# To debug calculations only for a particular test, substitute a suitable
+# wildcard here, e.g. `for test_file in modulo-raw.tsv`.
 for test_file in *-raw.tsv
 do
     test_name=$(basename "$test_file" "-raw.tsv")
@@ -467,7 +471,13 @@ create view broken_queries as
 create table query_run_metrics_for_stats engine File(
         TSV, -- do not add header -- will parse with grep
         'analyze/query-run-metrics-for-stats.tsv')
-    as select test, query_index, 0 run, version, metric_values
+    as select test, query_index, 0 run, version,
+        -- For debugging, add a filter for a particular metric like this:
+        -- arrayFilter(m, n -> n = 'client_time', metric_values, metric_names)
+        --     metric_values
+        -- Note that further reporting may break, because the metric names are
+        -- not filtered.
+        metric_values
     from query_run_metric_arrays
     where (test, query_index) not in broken_queries
     order by test, query_index, run, version
@@ -585,8 +595,19 @@ create view query_metric_stats as
 -- Main statistics for queries -- query time as reported in query log.
 create table queries engine File(TSVWithNamesAndTypes, 'report/queries.tsv')
     as select
-        abs(diff) > report_threshold        and abs(diff) > stat_threshold as changed_fail,
-        abs(diff) > report_threshold - 0.05 and abs(diff) > stat_threshold as changed_show,
+        -- It is important to have a non-strict inequality with stat_threshold
+        -- here. The randomization distribution is actually discrete, and when
+        -- the number of runs is small, the quantile we need (e.g. 0.99) turns
+        -- out to be the maximum value of the distribution. We can also hit this
+        -- maximum possible value with our test run, and this obviously means
+        -- that we have observed the difference to the best precision possible
+        -- for the given number of runs. If we use a strict equality here, we
+        -- will miss such cases. This happened in the wild and lead to some
+        -- uncaught regressions, because for the default 7 runs we do for PRs,
+        -- the randomization distribution has only 16 values, so the max quantile
+        -- is actually 0.9375.
+        abs(diff) > report_threshold        and abs(diff) >= stat_threshold as changed_fail,
+        abs(diff) > report_threshold - 0.05 and abs(diff) >= stat_threshold as changed_show,
 
         not changed_fail and stat_threshold > report_threshold + 0.10 as unstable_fail,
         not changed_show and stat_threshold > report_threshold - 0.05 as unstable_show,
@@ -739,7 +760,7 @@ create view test_times_view as
         total_client_time,
         queries,
         query_max,
-        real / queries avg_real_per_query,
+        real / if(queries > 0, queries, 1) avg_real_per_query,
         query_min,
         runs
     from test_time
@@ -760,7 +781,7 @@ create view test_times_view_total as
         sum(total_client_time),
         sum(queries),
         max(query_max),
-        sum(real) / sum(queries) avg_real_per_query,
+        sum(real) / if(sum(queries) > 0, sum(queries), 1) avg_real_per_query,
         min(query_min),
         -- Totaling the number of runs doesn't make sense, but use the max so
         -- that the reporting script doesn't complain about queries being too
diff --git a/docker/test/performance-comparison/config/config.d/user_files.xml b/docker/test/performance-comparison/config/config.d/user_files.xml
new file mode 100644
index 00000000000..9dc8daab66b
--- /dev/null
+++ b/docker/test/performance-comparison/config/config.d/user_files.xml
@@ -0,0 +1,10 @@
+<yandex>
+    <!-- Directory with user provided files that are accessible by 'file' table function. -->
+    <user_files_path>/var/lib/clickhouse/user_files/</user_files_path>
+
+    <!-- Path to configuration file with users, access rights, profiles of settings, quotas. -->
+    <users_config>users.xml</users_config>
+
+    <!-- Path to directory where users created by SQL commands are stored. -->
+    <access_control_path>access/</access_control_path>
+</yandex>
diff --git a/docker/test/performance-comparison/config/config.d/zzz-perf-comparison-tweaks-config.xml b/docker/test/performance-comparison/config/config.d/zzz-perf-comparison-tweaks-config.xml
index ee2006201b0..7b941f844de 100644
--- a/docker/test/performance-comparison/config/config.d/zzz-perf-comparison-tweaks-config.xml
+++ b/docker/test/performance-comparison/config/config.d/zzz-perf-comparison-tweaks-config.xml
@@ -1,9 +1,10 @@
 <yandex>
     <http_port remove="remove"/>
     <mysql_port remove="remove"/>
+    <postgresql_port remove="remove"/>
     <interserver_http_port remove="remove"/>
     <tcp_with_proxy_port remove="remove"/>
-    <test_keeper_server remove="remove"/>
+    <keeper_server remove="remove"/>
     <listen_host>::</listen_host>
 
     <logger>
diff --git a/docker/test/performance-comparison/config/users.d/perf-comparison-tweaks-users.xml b/docker/test/performance-comparison/config/users.d/perf-comparison-tweaks-users.xml
index f3609bcfcdb..63e23d8453c 100644
--- a/docker/test/performance-comparison/config/users.d/perf-comparison-tweaks-users.xml
+++ b/docker/test/performance-comparison/config/users.d/perf-comparison-tweaks-users.xml
@@ -17,6 +17,14 @@
 
             <!-- One NUMA node w/o hyperthreading -->
             <max_threads>12</max_threads>
+
+            <!-- mmap shows some improvements in perf tests -->
+            <min_bytes_to_use_mmap_io>64Mi</min_bytes_to_use_mmap_io>
         </default>
     </profiles>
+    <users>
+        <default>
+            <access_management>1</access_management>
+        </default>
+    </users>
 </yandex>
diff --git a/docker/test/performance-comparison/eqmed.sql b/docker/test/performance-comparison/eqmed.sql
index 139f0758798..d0111550ee6 100644
--- a/docker/test/performance-comparison/eqmed.sql
+++ b/docker/test/performance-comparison/eqmed.sql
@@ -1,4 +1,6 @@
--- input is table(test text, query text, run UInt32, version int, metrics Array(float))
+-- The input is table(test text, query text, run UInt32, version UInt8, metrics Array(float)).
+-- Run like this:
+-- clickhouse-local --queries-file eqmed.sql -S 'test text, query text, run UInt32, version UInt8, metrics Array(float)' --file analyze/tmp/modulo_0.tsv
 select
    arrayMap(x -> floor(x, 4), original_medians_array.medians_by_version[1] as l) l_rounded,
    arrayMap(x -> floor(x, 4), original_medians_array.medians_by_version[2] as r) r_rounded,
@@ -8,14 +10,19 @@ select
 from
    (
       -- quantiles of randomization distributions
+      -- note that for small number of runs, the exact quantile might not make
+      -- sense, because the last possible value of randomization distribution
+      -- might take a larger percentage of distirbution (i.e. the distribution
+      -- actually has discrete values, and the last step can be large).
       select quantileExactForEach(0.99)(
         arrayMap(x, y -> abs(x - y), metrics_by_label[1], metrics_by_label[2]) as d
       ) threshold
-      ---- uncomment to see what the distribution is really like
-      --, uniqExact(d.1) u
+      ---- Uncomment to see what the distribution is really like. This debug
+      ---- code only works for single (the first) metric.
+      --, uniqExact(d[1]) u
       --, arraySort(x->x.1,
       --      arrayZip(
-      --          (sumMap([d.1], [1]) as f).1,
+      --          (sumMap([d[1]], [1]) as f).1,
       --          f.2)) full_histogram
       from
          (
diff --git a/docker/test/performance-comparison/perf.py b/docker/test/performance-comparison/perf.py
index f1c5df146aa..2588b9f4213 100755
--- a/docker/test/performance-comparison/perf.py
+++ b/docker/test/performance-comparison/perf.py
@@ -66,7 +66,12 @@ reportStageEnd('parse')
 subst_elems = root.findall('substitutions/substitution')
 available_parameters = {} # { 'table': ['hits_10m', 'hits_100m'], ... }
 for e in subst_elems:
-    available_parameters[e.find('name').text] = [v.text for v in e.findall('values/value')]
+    name = e.find('name').text
+    values = [v.text for v in e.findall('values/value')]
+    if not values:
+        raise Exception(f'No values given for substitution {{{name}}}')
+
+    available_parameters[name] = values
 
 # Takes parallel lists of templates, substitutes them with all combos of
 # parameters. The set of parameters is determined based on the first list.
@@ -263,8 +268,16 @@ for query_index in queries_to_run:
     for conn_index, c in enumerate(all_connections):
         try:
             prewarm_id = f'{query_prefix}.prewarm0'
-            # Will also detect too long queries during warmup stage
-            res = c.execute(q, query_id = prewarm_id, settings = {'max_execution_time': 10})
+
+            try:
+                # Will also detect too long queries during warmup stage
+                res = c.execute(q, query_id = prewarm_id, settings = {'max_execution_time': args.max_query_seconds})
+            except clickhouse_driver.errors.Error as e:
+                # Add query id to the exception to make debugging easier.
+                e.args = (prewarm_id, *e.args)
+                e.message = prewarm_id + ': ' + e.message
+                raise
+
             print(f'prewarm\t{query_index}\t{prewarm_id}\t{conn_index}\t{c.last_query.elapsed}')
         except KeyboardInterrupt:
             raise
@@ -311,8 +324,8 @@ for query_index in queries_to_run:
 
         for conn_index, c in enumerate(this_query_connections):
             try:
-                res = c.execute(q, query_id = run_id)
-            except Exception as e:
+                res = c.execute(q, query_id = run_id, settings = {'max_execution_time': args.max_query_seconds})
+            except clickhouse_driver.errors.Error as e:
                 # Add query id to the exception to make debugging easier.
                 e.args = (run_id, *e.args)
                 e.message = run_id + ': ' + e.message
@@ -389,7 +402,7 @@ for query_index in queries_to_run:
             try:
                 res = c.execute(q, query_id = run_id, settings = {'query_profiler_real_time_period_ns': 10000000})
                 print(f'profile\t{query_index}\t{run_id}\t{conn_index}\t{c.last_query.elapsed}')
-            except Exception as e:
+            except clickhouse_driver.errors.Error as e:
                 # Add query id to the exception to make debugging easier.
                 e.args = (run_id, *e.args)
                 e.message = run_id + ': ' + e.message
diff --git a/docker/test/split_build_smoke_test/Dockerfile b/docker/test/split_build_smoke_test/Dockerfile
index c77db1c6c88..54a9eb17868 100644
--- a/docker/test/split_build_smoke_test/Dockerfile
+++ b/docker/test/split_build_smoke_test/Dockerfile
@@ -2,5 +2,6 @@
 FROM yandex/clickhouse-binary-builder
 
 COPY run.sh /run.sh
+COPY process_split_build_smoke_test_result.py /
 
 CMD /run.sh
diff --git a/docker/test/split_build_smoke_test/process_split_build_smoke_test_result.py b/docker/test/split_build_smoke_test/process_split_build_smoke_test_result.py
new file mode 100755
index 00000000000..58d6ba8c62a
--- /dev/null
+++ b/docker/test/split_build_smoke_test/process_split_build_smoke_test_result.py
@@ -0,0 +1,61 @@
+#!/usr/bin/env python3
+
+import os
+import logging
+import argparse
+import csv
+
+RESULT_LOG_NAME = "run.log"
+
+def process_result(result_folder):
+
+    status = "success"
+    description = 'Server started and responded'
+    summary = [("Smoke test", "OK")]
+    with open(os.path.join(result_folder, RESULT_LOG_NAME), 'r') as run_log:
+        lines = run_log.read().split('\n')
+        if not lines or lines[0].strip() != 'OK':
+            status = "failure"
+            logging.info("Lines is not ok: %s", str('\n'.join(lines)))
+            summary = [("Smoke test", "FAIL")]
+            description = 'Server failed to respond, see result in logs'
+
+    result_logs = []
+    server_log_path = os.path.join(result_folder, "clickhouse-server.log")
+    stderr_log_path = os.path.join(result_folder, "stderr.log")
+    client_stderr_log_path = os.path.join(result_folder, "clientstderr.log")
+
+    if os.path.exists(server_log_path):
+        result_logs.append(server_log_path)
+
+    if os.path.exists(stderr_log_path):
+        result_logs.append(stderr_log_path)
+
+    if os.path.exists(client_stderr_log_path):
+        result_logs.append(client_stderr_log_path)
+
+    return status, description, summary, result_logs
+
+
+def write_results(results_file, status_file, results, status):
+    with open(results_file, 'w') as f:
+        out = csv.writer(f, delimiter='\t')
+        out.writerows(results)
+    with open(status_file, 'w') as f:
+        out = csv.writer(f, delimiter='\t')
+        out.writerow(status)
+
+
+if __name__ == "__main__":
+    logging.basicConfig(level=logging.INFO, format='%(asctime)s %(message)s')
+    parser = argparse.ArgumentParser(description="ClickHouse script for parsing results of split build smoke test")
+    parser.add_argument("--in-results-dir", default='/test_output/')
+    parser.add_argument("--out-results-file", default='/test_output/test_results.tsv')
+    parser.add_argument("--out-status-file", default='/test_output/check_status.tsv')
+    args = parser.parse_args()
+
+    state, description, test_results, logs = process_result(args.in_results_dir)
+    logging.info("Result parsed")
+    status = (state, description)
+    write_results(args.out_results_file, args.out_status_file, test_results, status)
+    logging.info("Result written")
diff --git a/docker/test/split_build_smoke_test/run.sh b/docker/test/split_build_smoke_test/run.sh
index eac9848030e..b565d7a481e 100755
--- a/docker/test/split_build_smoke_test/run.sh
+++ b/docker/test/split_build_smoke_test/run.sh
@@ -5,16 +5,18 @@ set -x
 install_and_run_server() {
     mkdir /unpacked
     tar -xzf /package_folder/shared_build.tgz -C /unpacked --strip 1
-    LD_LIBRARY_PATH=/unpacked /unpacked/clickhouse-server --config /unpacked/config/config.xml >/var/log/clickhouse-server/stderr.log 2>&1 &
+    LD_LIBRARY_PATH=/unpacked /unpacked/clickhouse-server --config /unpacked/config/config.xml >/test_output/stderr.log 2>&1 &
 }
 
 run_client() {
     for i in {1..100}; do
         sleep 1
-        LD_LIBRARY_PATH=/unpacked /unpacked/clickhouse-client --query "select 'OK'" 2>/var/log/clickhouse-server/clientstderr.log && break
+        LD_LIBRARY_PATH=/unpacked /unpacked/clickhouse-client --query "select 'OK'" > /test_output/run.log 2> /test_output/clientstderr.log && break
         [[ $i == 100 ]] && echo 'FAIL'
     done
 }
 
 install_and_run_server
 run_client
+mv /var/log/clickhouse-server/clickhouse-server.log /test_output/clickhouse-server.log
+/process_split_build_smoke_test_result.py || echo -e "failure\tCannot parse results" > /test_output/check_status.tsv
diff --git a/docker/test/sqlancer/Dockerfile b/docker/test/sqlancer/Dockerfile
index 38a773e65ad..253ca1b729a 100644
--- a/docker/test/sqlancer/Dockerfile
+++ b/docker/test/sqlancer/Dockerfile
@@ -1,8 +1,7 @@
 # docker build -t yandex/clickhouse-sqlancer-test .
 FROM ubuntu:20.04
 
-RUN apt-get update --yes && env DEBIAN_FRONTEND=noninteractive apt-get install wget unzip git openjdk-14-jdk maven --yes --no-install-recommends
-
+RUN apt-get update --yes && env DEBIAN_FRONTEND=noninteractive apt-get install wget unzip git openjdk-14-jdk maven python3 --yes --no-install-recommends
 RUN wget https://github.com/sqlancer/sqlancer/archive/master.zip -O /sqlancer.zip
 RUN mkdir /sqlancer && \
 	cd /sqlancer && \
@@ -10,4 +9,5 @@ RUN mkdir /sqlancer && \
 RUN cd /sqlancer/sqlancer-master && mvn package -DskipTests
 
 COPY run.sh /
+COPY process_sqlancer_result.py /
 CMD ["/bin/bash", "/run.sh"]
diff --git a/docker/test/sqlancer/process_sqlancer_result.py b/docker/test/sqlancer/process_sqlancer_result.py
new file mode 100755
index 00000000000..ede3cabc1c5
--- /dev/null
+++ b/docker/test/sqlancer/process_sqlancer_result.py
@@ -0,0 +1,75 @@
+#!/usr/bin/env python3
+
+import os
+import logging
+import argparse
+import csv
+
+
+def process_result(result_folder):
+    status = "success"
+    summary = []
+    paths = []
+    tests = ["TLPWhere", "TLPGroupBy", "TLPHaving", "TLPWhereGroupBy", "TLPDistinct", "TLPAggregate"]
+
+    for test in tests:
+        err_path = '{}/{}.err'.format(result_folder, test)
+        out_path = '{}/{}.out'.format(result_folder, test)
+        if not os.path.exists(err_path):
+            logging.info("No output err on path %s", err_path)
+            summary.append((test, "SKIPPED"))
+        elif not os.path.exists(out_path):
+            logging.info("No output log on path %s", out_path)
+        else:
+            paths.append(err_path)
+            paths.append(out_path)
+            with open(err_path, 'r') as f:
+                if 'AssertionError' in f.read():
+                    summary.append((test, "FAIL"))
+                    status = 'failure'
+                else:
+                    summary.append((test, "OK"))
+
+    logs_path = '{}/logs.tar.gz'.format(result_folder)
+    if not os.path.exists(logs_path):
+        logging.info("No logs tar on path %s", logs_path)
+    else:
+        paths.append(logs_path)
+    stdout_path = '{}/stdout.log'.format(result_folder)
+    if not os.path.exists(stdout_path):
+        logging.info("No stdout log on path %s", stdout_path)
+    else:
+        paths.append(stdout_path)
+    stderr_path = '{}/stderr.log'.format(result_folder)
+    if not os.path.exists(stderr_path):
+        logging.info("No stderr log on path %s", stderr_path)
+    else:
+        paths.append(stderr_path)
+
+    description = "SQLancer test run. See report"
+
+    return status, description, summary, paths
+
+
+def write_results(results_file, status_file, results, status):
+    with open(results_file, 'w') as f:
+        out = csv.writer(f, delimiter='\t')
+        out.writerows(results)
+    with open(status_file, 'w') as f:
+        out = csv.writer(f, delimiter='\t')
+        out.writerow(status)
+
+
+if __name__ == "__main__":
+    logging.basicConfig(level=logging.INFO, format='%(asctime)s %(message)s')
+    parser = argparse.ArgumentParser(description="ClickHouse script for parsing results of sqlancer test")
+    parser.add_argument("--in-results-dir", default='/test_output/')
+    parser.add_argument("--out-results-file", default='/test_output/test_results.tsv')
+    parser.add_argument("--out-status-file", default='/test_output/check_status.tsv')
+    args = parser.parse_args()
+
+    state, description, test_results, logs = process_result(args.in_results_dir)
+    logging.info("Result parsed")
+    status = (state, description)
+    write_results(args.out_results_file, args.out_status_file, test_results, status)
+    logging.info("Result written")
diff --git a/docker/test/sqlancer/run.sh b/docker/test/sqlancer/run.sh
index ffe0afd98a8..e465ba1c993 100755
--- a/docker/test/sqlancer/run.sh
+++ b/docker/test/sqlancer/run.sh
@@ -11,7 +11,7 @@ service clickhouse-server start && sleep 5
 
 cd /sqlancer/sqlancer-master
 
-export TIMEOUT=60
+export TIMEOUT=300
 export NUM_QUERIES=1000
 
 ( java -jar target/sqlancer-*.jar --num-threads 10 --timeout-seconds $TIMEOUT --num-queries $NUM_QUERIES  --username default --password "" clickhouse --oracle TLPWhere | tee /test_output/TLPWhere.out )  3>&1 1>&2 2>&3 | tee /test_output/TLPWhere.err
@@ -29,4 +29,5 @@ tail -n 1000 /var/log/clickhouse-server/stderr.log > /test_output/stderr.log
 tail -n 1000 /var/log/clickhouse-server/stdout.log > /test_output/stdout.log
 tail -n 1000 /var/log/clickhouse-server/clickhouse-server.log > /test_output/clickhouse-server.log
 
+/process_sqlancer_result.py || echo -e "failure\tCannot parse results" > /test_output/check_status.tsv
 ls /test_output
diff --git a/docker/test/stateful/run.sh b/docker/test/stateful/run.sh
index 7779f0e9dc2..8d865431570 100755
--- a/docker/test/stateful/run.sh
+++ b/docker/test/stateful/run.sh
@@ -13,6 +13,25 @@ dpkg -i package_folder/clickhouse-test_*.deb
 
 function start()
 {
+    if [[ -n "$USE_DATABASE_REPLICATED" ]] && [[ "$USE_DATABASE_REPLICATED" -eq 1 ]]; then
+        # NOTE We run "clickhouse server" instead of "clickhouse-server"
+        # to make "pidof clickhouse-server" return single pid of the main instance.
+        # We wil run main instance using "service clickhouse-server start"
+        sudo -E -u clickhouse /usr/bin/clickhouse server --config /etc/clickhouse-server1/config.xml --daemon \
+        -- --path /var/lib/clickhouse1/ --logger.stderr /var/log/clickhouse-server/stderr1.log \
+        --logger.log /var/log/clickhouse-server/clickhouse-server1.log --logger.errorlog /var/log/clickhouse-server/clickhouse-server1.err.log \
+        --tcp_port 19000 --tcp_port_secure 19440 --http_port 18123 --https_port 18443 --interserver_http_port 19009 --tcp_with_proxy_port 19010 \
+        --mysql_port 19004 --postgresql_port 19005 \
+        --keeper_server.tcp_port 19181 --keeper_server.server_id 2
+
+        sudo -E -u clickhouse /usr/bin/clickhouse server --config /etc/clickhouse-server2/config.xml --daemon \
+        -- --path /var/lib/clickhouse2/ --logger.stderr /var/log/clickhouse-server/stderr2.log \
+        --logger.log /var/log/clickhouse-server/clickhouse-server2.log --logger.errorlog /var/log/clickhouse-server/clickhouse-server2.err.log \
+        --tcp_port 29000 --tcp_port_secure 29440 --http_port 28123 --https_port 28443 --interserver_http_port 29009 --tcp_with_proxy_port 29010 \
+        --mysql_port 29004 --postgresql_port 29005 \
+        --keeper_server.tcp_port 29181 --keeper_server.server_id 3
+    fi
+
     counter=0
     until clickhouse-client --query "SELECT 1"
     do
@@ -35,9 +54,8 @@ start
 /s3downloader --dataset-names $DATASETS
 chmod 777 -R /var/lib/clickhouse
 clickhouse-client --query "SHOW DATABASES"
-clickhouse-client --query "ATTACH DATABASE datasets ENGINE = Ordinary"
-clickhouse-client --query "CREATE DATABASE test"
 
+clickhouse-client --query "ATTACH DATABASE datasets ENGINE = Ordinary"
 service clickhouse-server restart
 
 # Wait for server to start accepting connections
@@ -47,21 +65,61 @@ for _ in {1..120}; do
 done
 
 clickhouse-client --query "SHOW TABLES FROM datasets"
-clickhouse-client --query "SHOW TABLES FROM test"
-clickhouse-client --query "RENAME TABLE datasets.hits_v1 TO test.hits"
-clickhouse-client --query "RENAME TABLE datasets.visits_v1 TO test.visits"
-clickhouse-client --query "SHOW TABLES FROM test"
-
-if grep -q -- "--use-skip-list" /usr/bin/clickhouse-test ; then
-    SKIP_LIST_OPT="--use-skip-list"
-fi
-
-# We can have several additional options so we path them as array because it's
-# more idiologically correct.
-read -ra ADDITIONAL_OPTIONS <<< "${ADDITIONAL_OPTIONS:-}"
 
 if [[ -n "$USE_DATABASE_REPLICATED" ]] && [[ "$USE_DATABASE_REPLICATED" -eq 1 ]]; then
-    ADDITIONAL_OPTIONS+=('--replicated-database')
+    clickhouse-client --query "CREATE DATABASE test ON CLUSTER 'test_cluster_database_replicated'
+        ENGINE=Replicated('/test/clickhouse/db/test', '{shard}', '{replica}')"
+
+    clickhouse-client --query "CREATE TABLE test.hits AS datasets.hits_v1"
+    clickhouse-client --query "CREATE TABLE test.visits AS datasets.visits_v1"
+
+    clickhouse-client --query "INSERT INTO test.hits SELECT * FROM datasets.hits_v1"
+    clickhouse-client --query "INSERT INTO test.visits SELECT * FROM datasets.visits_v1"
+
+    clickhouse-client --query "DROP TABLE datasets.hits_v1"
+    clickhouse-client --query "DROP TABLE datasets.visits_v1"
+
+    MAX_RUN_TIME=$((MAX_RUN_TIME < 9000 ? MAX_RUN_TIME : 9000))  # min(MAX_RUN_TIME, 2.5 hours)
+    MAX_RUN_TIME=$((MAX_RUN_TIME != 0 ? MAX_RUN_TIME : 9000))    # set to 2.5 hours if 0 (unlimited)
+else
+    clickhouse-client --query "CREATE DATABASE test"
+    clickhouse-client --query "SHOW TABLES FROM test"
+    clickhouse-client --query "RENAME TABLE datasets.hits_v1 TO test.hits"
+    clickhouse-client --query "RENAME TABLE datasets.visits_v1 TO test.visits"
 fi
 
-clickhouse-test --testname --shard --zookeeper --no-stateless --hung-check --print-time "$SKIP_LIST_OPT" "${ADDITIONAL_OPTIONS[@]}" "$SKIP_TESTS_OPTION" 2>&1 | ts '%Y-%m-%d %H:%M:%S' | tee test_output/test_result.txt
+clickhouse-client --query "SHOW TABLES FROM test"
+clickhouse-client --query "SELECT count() FROM test.hits"
+clickhouse-client --query "SELECT count() FROM test.visits"
+
+function run_tests()
+{
+    set -x
+    # We can have several additional options so we path them as array because it's
+    # more idiologically correct.
+    read -ra ADDITIONAL_OPTIONS <<< "${ADDITIONAL_OPTIONS:-}"
+
+    if [[ -n "$USE_DATABASE_REPLICATED" ]] && [[ "$USE_DATABASE_REPLICATED" -eq 1 ]]; then
+        ADDITIONAL_OPTIONS+=('--replicated-database')
+    fi
+
+    clickhouse-test --testname --shard --zookeeper --no-stateless --hung-check --use-skip-list --print-time "${ADDITIONAL_OPTIONS[@]}" \
+        "$SKIP_TESTS_OPTION" 2>&1 | ts '%Y-%m-%d %H:%M:%S' | tee test_output/test_result.txt
+}
+
+export -f run_tests
+timeout "$MAX_RUN_TIME" bash -c run_tests ||:
+
+./process_functional_tests_result.py || echo -e "failure\tCannot parse results" > /test_output/check_status.tsv
+
+pigz < /var/log/clickhouse-server/clickhouse-server.log > /test_output/clickhouse-server.log.gz ||:
+mv /var/log/clickhouse-server/stderr.log /test_output/ ||:
+if [[ -n "$WITH_COVERAGE" ]] && [[ "$WITH_COVERAGE" -eq 1 ]]; then
+    tar -chf /test_output/clickhouse_coverage.tar.gz /profraw ||:
+fi
+if [[ -n "$USE_DATABASE_REPLICATED" ]] && [[ "$USE_DATABASE_REPLICATED" -eq 1 ]]; then
+    pigz < /var/log/clickhouse-server/clickhouse-server1.log > /test_output/clickhouse-server1.log.gz ||:
+    pigz < /var/log/clickhouse-server/clickhouse-server2.log > /test_output/clickhouse-server2.log.gz ||:
+    mv /var/log/clickhouse-server/stderr1.log /test_output/ ||:
+    mv /var/log/clickhouse-server/stderr2.log /test_output/ ||:
+fi
diff --git a/docker/test/stateless/Dockerfile b/docker/test/stateless/Dockerfile
index 2437415d17c..658ae1f27ba 100644
--- a/docker/test/stateless/Dockerfile
+++ b/docker/test/stateless/Dockerfile
@@ -28,7 +28,8 @@ RUN apt-get update -y \
             tree \
             unixodbc \
             wget \
-            mysql-client=5.7*
+            mysql-client=5.7* \
+            postgresql-client
 
 RUN pip3 install numpy scipy pandas
 
@@ -46,4 +47,5 @@ ENV NUM_TRIES=1
 ENV MAX_RUN_TIME=0
 
 COPY run.sh /
+COPY process_functional_tests_result.py /
 CMD ["/bin/bash", "/run.sh"]
diff --git a/docker/test/stateless/process_functional_tests_result.py b/docker/test/stateless/process_functional_tests_result.py
new file mode 100755
index 00000000000..02adf108212
--- /dev/null
+++ b/docker/test/stateless/process_functional_tests_result.py
@@ -0,0 +1,126 @@
+#!/usr/bin/env python3
+
+import os
+import logging
+import argparse
+import csv
+
+OK_SIGN = "[ OK "
+FAIL_SING = "[ FAIL "
+TIMEOUT_SING = "[ Timeout! "
+UNKNOWN_SIGN = "[ UNKNOWN "
+SKIPPED_SIGN = "[ SKIPPED "
+HUNG_SIGN = "Found hung queries in processlist"
+
+NO_TASK_TIMEOUT_SIGN = "All tests have finished"
+
+def process_test_log(log_path):
+    total = 0
+    skipped = 0
+    unknown = 0
+    failed = 0
+    success = 0
+    hung = False
+    task_timeout = True
+    test_results = []
+    with open(log_path, 'r') as test_file:
+        for line in test_file:
+            line = line.strip()
+            if NO_TASK_TIMEOUT_SIGN in line:
+                task_timeout = False
+            if HUNG_SIGN in line:
+                hung = True
+            if any(sign in line for sign in (OK_SIGN, FAIL_SING, UNKNOWN_SIGN, SKIPPED_SIGN)):
+                test_name = line.split(' ')[2].split(':')[0]
+
+                test_time = ''
+                try:
+                    time_token = line.split(']')[1].strip().split()[0]
+                    float(time_token)
+                    test_time = time_token
+                except:
+                    pass
+
+                total += 1
+                if TIMEOUT_SING in line:
+                    failed += 1
+                    test_results.append((test_name, "Timeout", test_time))
+                elif FAIL_SING in line:
+                    failed += 1
+                    test_results.append((test_name, "FAIL", test_time))
+                elif UNKNOWN_SIGN in line:
+                    unknown += 1
+                    test_results.append((test_name, "FAIL", test_time))
+                elif SKIPPED_SIGN in line:
+                    skipped += 1
+                    test_results.append((test_name, "SKIPPED", test_time))
+                else:
+                    success += int(OK_SIGN in line)
+                    test_results.append((test_name, "OK", test_time))
+    return total, skipped, unknown, failed, success, hung, task_timeout, test_results
+
+def process_result(result_path):
+    test_results = []
+    state = "success"
+    description = ""
+    files = os.listdir(result_path)
+    if files:
+        logging.info("Find files in result folder %s", ','.join(files))
+        result_path = os.path.join(result_path, 'test_result.txt')
+    else:
+        result_path = None
+        description = "No output log"
+        state = "error"
+
+    if result_path and os.path.exists(result_path):
+        total, skipped, unknown, failed, success, hung, task_timeout, test_results = process_test_log(result_path)
+        is_flacky_check = 1 < int(os.environ.get('NUM_TRIES', 1))
+        # If no tests were run (success == 0) it indicates an error (e.g. server did not start or crashed immediately)
+        # But it's Ok for "flaky checks" - they can contain just one test for check which is marked as skipped.
+        if failed != 0 or unknown != 0 or (success == 0 and (not is_flacky_check)):
+            state = "failure"
+
+        if hung:
+            description = "Some queries hung, "
+            state = "failure"
+        elif task_timeout:
+            description = "Timeout, "
+            state = "failure"
+        else:
+            description = ""
+
+        description += "fail: {}, passed: {}".format(failed, success)
+        if skipped != 0:
+            description += ", skipped: {}".format(skipped)
+        if unknown != 0:
+            description += ", unknown: {}".format(unknown)
+    else:
+        state = "failure"
+        description = "Output log doesn't exist"
+        test_results = []
+
+    return state, description, test_results
+
+
+def write_results(results_file, status_file, results, status):
+    with open(results_file, 'w') as f:
+        out = csv.writer(f, delimiter='\t')
+        out.writerows(results)
+    with open(status_file, 'w') as f:
+        out = csv.writer(f, delimiter='\t')
+        out.writerow(status)
+
+
+if __name__ == "__main__":
+    logging.basicConfig(level=logging.INFO, format='%(asctime)s %(message)s')
+    parser = argparse.ArgumentParser(description="ClickHouse script for parsing results of functional tests")
+    parser.add_argument("--in-results-dir", default='/test_output/')
+    parser.add_argument("--out-results-file", default='/test_output/test_results.tsv')
+    parser.add_argument("--out-status-file", default='/test_output/check_status.tsv')
+    args = parser.parse_args()
+
+    state, description, test_results = process_result(args.in_results_dir)
+    logging.info("Result parsed")
+    status = (state, description)
+    write_results(args.out_results_file, args.out_status_file, test_results, status)
+    logging.info("Result written")
diff --git a/docker/test/stateless/run.sh b/docker/test/stateless/run.sh
index d078f3739fd..e6f2d678aa9 100755
--- a/docker/test/stateless/run.sh
+++ b/docker/test/stateless/run.sh
@@ -34,36 +34,61 @@ if [ "$NUM_TRIES" -gt "1" ]; then
 
     # simpliest way to forward env variables to server
     sudo -E -u clickhouse /usr/bin/clickhouse-server --config /etc/clickhouse-server/config.xml --daemon
-    sleep 5
 else
-    service clickhouse-server start && sleep 5
+    service clickhouse-server start
 fi
 
-if grep -q -- "--use-skip-list" /usr/bin/clickhouse-test; then
-    SKIP_LIST_OPT="--use-skip-list"
+if [[ -n "$USE_DATABASE_REPLICATED" ]] && [[ "$USE_DATABASE_REPLICATED" -eq 1 ]]; then
+
+    sudo -E -u clickhouse /usr/bin/clickhouse server --config /etc/clickhouse-server1/config.xml --daemon \
+    -- --path /var/lib/clickhouse1/ --logger.stderr /var/log/clickhouse-server/stderr1.log \
+    --logger.log /var/log/clickhouse-server/clickhouse-server1.log --logger.errorlog /var/log/clickhouse-server/clickhouse-server1.err.log \
+    --tcp_port 19000 --tcp_port_secure 19440 --http_port 18123 --https_port 18443 --interserver_http_port 19009 --tcp_with_proxy_port 19010 \
+    --mysql_port 19004 --postgresql_port 19005 \
+    --keeper_server.tcp_port 19181 --keeper_server.server_id 2 \
+    --macros.replica r2   # It doesn't work :(
+
+    sudo -E -u clickhouse /usr/bin/clickhouse server --config /etc/clickhouse-server2/config.xml --daemon \
+    -- --path /var/lib/clickhouse2/ --logger.stderr /var/log/clickhouse-server/stderr2.log \
+    --logger.log /var/log/clickhouse-server/clickhouse-server2.log --logger.errorlog /var/log/clickhouse-server/clickhouse-server2.err.log \
+    --tcp_port 29000 --tcp_port_secure 29440 --http_port 28123 --https_port 28443 --interserver_http_port 29009 --tcp_with_proxy_port 29010 \
+    --mysql_port 29004 --postgresql_port 29005 \
+    --keeper_server.tcp_port 29181 --keeper_server.server_id 3 \
+    --macros.shard s2   # It doesn't work :(
+
+    MAX_RUN_TIME=$((MAX_RUN_TIME < 9000 ? MAX_RUN_TIME : 9000))  # min(MAX_RUN_TIME, 2.5 hours)
+    MAX_RUN_TIME=$((MAX_RUN_TIME != 0 ? MAX_RUN_TIME : 9000))    # set to 2.5 hours if 0 (unlimited)
 fi
 
+sleep 5
+
 function run_tests()
 {
+    set -x
     # We can have several additional options so we path them as array because it's
     # more idiologically correct.
     read -ra ADDITIONAL_OPTIONS <<< "${ADDITIONAL_OPTIONS:-}"
 
     # Skip these tests, because they fail when we rerun them multiple times
     if [ "$NUM_TRIES" -gt "1" ]; then
+        ADDITIONAL_OPTIONS+=('--order=random')
         ADDITIONAL_OPTIONS+=('--skip')
         ADDITIONAL_OPTIONS+=('00000_no_tests_to_skip')
-        ADDITIONAL_OPTIONS+=('--jobs')
-        ADDITIONAL_OPTIONS+=('4')
+        # Note that flaky check must be ran in parallel, but for now we run
+        # everything in parallel except DatabaseReplicated. See below.
     fi
 
     if [[ -n "$USE_DATABASE_REPLICATED" ]] && [[ "$USE_DATABASE_REPLICATED" -eq 1 ]]; then
         ADDITIONAL_OPTIONS+=('--replicated-database')
+    else
+        # Too many tests fail for DatabaseReplicated in parallel. All other
+        # configurations are OK.
+        ADDITIONAL_OPTIONS+=('--jobs')
+        ADDITIONAL_OPTIONS+=('8')
     fi
 
     clickhouse-test --testname --shard --zookeeper --hung-check --print-time \
-            --test-runs "$NUM_TRIES" \
-            "$SKIP_LIST_OPT" "${ADDITIONAL_OPTIONS[@]}" 2>&1 \
+            --use-skip-list --test-runs "$NUM_TRIES" "${ADDITIONAL_OPTIONS[@]}" 2>&1 \
         | ts '%Y-%m-%d %H:%M:%S' \
         | tee -a test_output/test_result.txt
 }
@@ -72,5 +97,34 @@ export -f run_tests
 
 timeout "$MAX_RUN_TIME" bash -c run_tests ||:
 
+./process_functional_tests_result.py || echo -e "failure\tCannot parse results" > /test_output/check_status.tsv
+
+clickhouse-client -q "system flush logs" ||:
+
+pigz < /var/log/clickhouse-server/clickhouse-server.log > /test_output/clickhouse-server.log.gz &
+clickhouse-client -q "select * from system.query_log format TSVWithNamesAndTypes" | pigz > /test_output/query-log.tsv.gz &
+clickhouse-client -q "select * from system.query_thread_log format TSVWithNamesAndTypes" | pigz > /test_output/query-thread-log.tsv.gz &
+clickhouse-client --allow_introspection_functions=1 -q "
+    WITH
+        arrayMap(x -> concat(demangle(addressToSymbol(x)), ':', addressToLine(x)), trace) AS trace_array,
+        arrayStringConcat(trace_array, '\n') AS trace_string
+    SELECT * EXCEPT(trace), trace_string FROM system.trace_log FORMAT TSVWithNamesAndTypes
+" | pigz > /test_output/trace-log.tsv.gz &
+wait ||:
+
+mv /var/log/clickhouse-server/stderr.log /test_output/ ||:
+if [[ -n "$WITH_COVERAGE" ]] && [[ "$WITH_COVERAGE" -eq 1 ]]; then
+    tar -chf /test_output/clickhouse_coverage.tar.gz /profraw ||:
+fi
 tar -chf /test_output/text_log_dump.tar /var/lib/clickhouse/data/system/text_log ||:
 tar -chf /test_output/query_log_dump.tar /var/lib/clickhouse/data/system/query_log ||:
+tar -chf /test_output/coordination.tar /var/lib/clickhouse/coordination ||:
+
+if [[ -n "$USE_DATABASE_REPLICATED" ]] && [[ "$USE_DATABASE_REPLICATED" -eq 1 ]]; then
+    pigz < /var/log/clickhouse-server/clickhouse-server1.log > /test_output/clickhouse-server1.log.gz ||:
+    pigz < /var/log/clickhouse-server/clickhouse-server2.log > /test_output/clickhouse-server2.log.gz ||:
+    mv /var/log/clickhouse-server/stderr1.log /test_output/ ||:
+    mv /var/log/clickhouse-server/stderr2.log /test_output/ ||:
+    tar -chf /test_output/coordination1.tar /var/lib/clickhouse1/coordination ||:
+    tar -chf /test_output/coordination2.tar /var/lib/clickhouse2/coordination ||:
+fi
diff --git a/docker/test/stress/run.sh b/docker/test/stress/run.sh
index dc1e4db4477..74a88df21e0 100755
--- a/docker/test/stress/run.sh
+++ b/docker/test/stress/run.sh
@@ -53,10 +53,14 @@ handle SIGBUS stop print
 handle SIGABRT stop print
 continue
 thread apply all backtrace
-continue
+detach
+quit
 " > script.gdb
 
-    gdb -batch -command script.gdb -p "$(cat /var/run/clickhouse-server/clickhouse-server.pid)" &
+    # FIXME Hung check may work incorrectly because of attached gdb
+    # 1. False positives are possible
+    # 2. We cannot attach another gdb to get stacktraces if some queries hung
+    gdb -batch -command script.gdb -p "$(cat /var/run/clickhouse-server/clickhouse-server.pid)" >> /test_output/gdb.log &
 }
 
 configure
@@ -78,9 +82,62 @@ clickhouse-client --query "RENAME TABLE datasets.hits_v1 TO test.hits"
 clickhouse-client --query "RENAME TABLE datasets.visits_v1 TO test.visits"
 clickhouse-client --query "SHOW TABLES FROM test"
 
-./stress --hung-check --output-folder test_output --skip-func-tests "$SKIP_TESTS_OPTION" && echo "OK" > /test_output/script_exit_code.txt || echo "FAIL" > /test_output/script_exit_code.txt
+./stress --hung-check --output-folder test_output --skip-func-tests "$SKIP_TESTS_OPTION" \
+    && echo -e 'Test script exit code\tOK' >> /test_output/test_results.tsv \
+    || echo -e 'Test script failed\tFAIL' >> /test_output/test_results.tsv
 
 stop
 start
 
-clickhouse-client --query "SELECT 'Server successfuly started'" > /test_output/alive_check.txt || echo 'Server failed to start' > /test_output/alive_check.txt
+clickhouse-client --query "SELECT 'Server successfully started', 'OK'" >> /test_output/test_results.tsv \
+                       || echo -e 'Server failed to start\tFAIL' >> /test_output/test_results.tsv
+
+[ -f /var/log/clickhouse-server/clickhouse-server.log ] || echo -e "Server log does not exist\tFAIL"
+[ -f /var/log/clickhouse-server/stderr.log ] || echo -e "Stderr log does not exist\tFAIL"
+
+# Print Fatal log messages to stdout
+zgrep -Fa " <Fatal> " /var/log/clickhouse-server/clickhouse-server.log
+
+# Grep logs for sanitizer asserts, crashes and other critical errors
+
+# Sanitizer asserts
+zgrep -Fa "==================" /var/log/clickhouse-server/stderr.log >> /test_output/tmp
+zgrep -Fa "WARNING" /var/log/clickhouse-server/stderr.log >> /test_output/tmp
+zgrep -Fav "ASan doesn't fully support makecontext/swapcontext functions" > /dev/null \
+    && echo -e 'Sanitizer assert (in stderr.log)\tFAIL' >> /test_output/test_results.tsv \
+    || echo -e 'No sanitizer asserts\tOK' >> /test_output/test_results.tsv
+rm -f /test_output/tmp
+
+# OOM
+zgrep -Fa " <Fatal> Application: Child process was terminated by signal 9" /var/log/clickhouse-server/clickhouse-server.log > /dev/null \
+    && echo -e 'OOM killer (or signal 9) in clickhouse-server.log\tFAIL' >> /test_output/test_results.tsv \
+    || echo -e 'No OOM messages in clickhouse-server.log\tOK' >> /test_output/test_results.tsv
+
+# Logical errors
+zgrep -Fa "Code: 49, e.displayText() = DB::Exception:" /var/log/clickhouse-server/clickhouse-server.log > /dev/null \
+    && echo -e 'Logical error thrown (see clickhouse-server.log)\tFAIL' >> /test_output/test_results.tsv \
+    || echo -e 'No logical errors\tOK' >> /test_output/test_results.tsv
+
+# Crash
+zgrep -Fa "########################################" /var/log/clickhouse-server/clickhouse-server.log > /dev/null \
+    && echo -e 'Killed by signal (in clickhouse-server.log)\tFAIL' >> /test_output/test_results.tsv \
+    || echo -e 'Not crashed\tOK' >> /test_output/test_results.tsv
+
+# It also checks for crash without stacktrace (printed by watchdog)
+zgrep -Fa " <Fatal> " /var/log/clickhouse-server/clickhouse-server.log > /dev/null \
+    && echo -e 'Fatal message in clickhouse-server.log\tFAIL' >> /test_output/test_results.tsv \
+    || echo -e 'No fatal messages in clickhouse-server.log\tOK' >> /test_output/test_results.tsv
+
+zgrep -Fa "########################################" /test_output/* > /dev/null \
+    && echo -e 'Killed by signal (output files)\tFAIL' >> /test_output/test_results.tsv
+
+# Put logs into /test_output/
+pigz < /var/log/clickhouse-server/clickhouse-server.log > /test_output/clickhouse-server.log.gz
+tar -chf /test_output/coordination.tar /var/lib/clickhouse/coordination ||:
+mv /var/log/clickhouse-server/stderr.log /test_output/
+tar -chf /test_output/query_log_dump.tar /var/lib/clickhouse/data/system/query_log ||:
+tar -chf /test_output/trace_log_dump.tar /var/lib/clickhouse/data/system/trace_log ||:
+
+# Write check result into check_status.tsv
+clickhouse-local --structure "test String, res String" -q "SELECT 'failure', test FROM table WHERE res != 'OK' order by (lower(test) like '%hung%') LIMIT 1" < /test_output/test_results.tsv > /test_output/check_status.tsv
+[ -s /test_output/check_status.tsv ] || echo -e "success\tNo errors found" > /test_output/check_status.tsv
diff --git a/docker/test/stress/stress b/docker/test/stress/stress
index 841556cf090..4fbedceb0b8 100755
--- a/docker/test/stress/stress
+++ b/docker/test/stress/stress
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 from multiprocessing import cpu_count
-from subprocess import Popen, call, STDOUT
+from subprocess import Popen, call, check_output, STDOUT
 import os
 import sys
 import shutil
@@ -58,6 +58,54 @@ def run_func_test(cmd, output_prefix, num_processes, skip_tests_option, global_t
         time.sleep(0.5)
     return pipes
 
+def prepare_for_hung_check():
+    # FIXME this function should not exist, but...
+
+    # We attach gdb to clickhouse-server before running tests
+    # to print stacktraces of all crashes even if clickhouse cannot print it for some reason.
+    # However, it obstruct checking for hung queries.
+    logging.info("Will terminate gdb (if any)")
+    call("kill -TERM $(pidof gdb)", shell=True, stderr=STDOUT)
+
+    # Some tests set too low memory limit for default user and forget to reset in back.
+    # It may cause SYSTEM queries to fail, let's disable memory limit.
+    call("clickhouse client --max_memory_usage_for_user=0 -q 'SELECT 1 FORMAT Null'", shell=True, stderr=STDOUT)
+
+    # Some tests execute SYSTEM STOP MERGES or similar queries.
+    # It may cause some ALTERs to hang.
+    # Possibly we should fix tests and forbid to use such queries without specifying table.
+    call("clickhouse client -q 'SYSTEM START MERGES'", shell=True, stderr=STDOUT)
+    call("clickhouse client -q 'SYSTEM START DISTRIBUTED SENDS'", shell=True, stderr=STDOUT)
+    call("clickhouse client -q 'SYSTEM START TTL MERGES'", shell=True, stderr=STDOUT)
+    call("clickhouse client -q 'SYSTEM START MOVES'", shell=True, stderr=STDOUT)
+    call("clickhouse client -q 'SYSTEM START FETCHES'", shell=True, stderr=STDOUT)
+    call("clickhouse client -q 'SYSTEM START REPLICATED SENDS'", shell=True, stderr=STDOUT)
+    call("clickhouse client -q 'SYSTEM START REPLICATION QUEUES'", shell=True, stderr=STDOUT)
+
+    # Issue #21004, live views are experimental, so let's just suppress it
+    call("""clickhouse client -q "KILL QUERY WHERE upper(query) LIKE 'WATCH %'" """, shell=True, stderr=STDOUT)
+
+    # Kill other queries which known to be slow
+    # It's query from 01232_preparing_sets_race_condition_long, it may take up to 1000 seconds in slow builds
+    call("""clickhouse client -q "KILL QUERY WHERE query LIKE 'insert into tableB select %'" """, shell=True, stderr=STDOUT)
+    # Long query from 00084_external_agregation
+    call("""clickhouse client -q "KILL QUERY WHERE query LIKE 'SELECT URL, uniq(SearchPhrase) AS u FROM test.hits GROUP BY URL ORDER BY u %'" """, shell=True, stderr=STDOUT)
+
+    # Wait for last queries to finish if any, not longer than 300 seconds
+    call("""clickhouse client -q "select sleepEachRow((
+            select maxOrDefault(300 - elapsed) + 1 from system.processes where query not like '%from system.processes%' and elapsed < 300
+            ) / 300) from numbers(300) format Null" """, shell=True, stderr=STDOUT)
+
+    # Even if all clickhouse-test processes are finished, there are probably some sh scripts,
+    # which still run some new queries. Let's ignore them.
+    try:
+        query = """clickhouse client -q "SELECT count() FROM system.processes where where elapsed > 300" """
+        output = check_output(query, shell=True, stderr=STDOUT).decode('utf-8').strip()
+        if int(output) == 0:
+            return False
+    except:
+        pass
+    return True
 
 if __name__ == "__main__":
     logging.basicConfig(level=logging.INFO, format='%(asctime)s %(message)s')
@@ -88,11 +136,14 @@ if __name__ == "__main__":
 
     logging.info("All processes finished")
     if args.hung_check:
+        have_long_running_queries = prepare_for_hung_check()
         logging.info("Checking if some queries hung")
         cmd = "{} {} {}".format(args.test_cmd, "--hung-check", "00001_select_1")
         res = call(cmd, shell=True, stderr=STDOUT)
-        if res != 0:
+        hung_check_status = "No queries hung\tOK\n"
+        if res != 0 and have_long_running_queries:
             logging.info("Hung check failed with exit code {}".format(res))
-            sys.exit(1)
+            hung_check_status = "Hung check failed\tFAIL\n"
+        open(os.path.join(args.output_folder, "test_results.tsv"), 'w+').write(hung_check_status)
 
     logging.info("Stress test finished")
diff --git a/docker/test/style/Dockerfile b/docker/test/style/Dockerfile
index e70f9e05679..86595a77a54 100644
--- a/docker/test/style/Dockerfile
+++ b/docker/test/style/Dockerfile
@@ -10,14 +10,6 @@ RUN apt-get update && env DEBIAN_FRONTEND=noninteractive apt-get install --yes \
     yamllint \
     && pip3 install codespell
 
-
-# For |& syntax
-SHELL ["bash", "-c"]
-
-CMD cd /ClickHouse/utils/check-style && \
-    ./check-style -n              |& tee /test_output/style_output.txt && \
-    ./check-typos                 |& tee /test_output/typos_output.txt && \
-    ./check-whitespaces -n        |& tee /test_output/whitespaces_output.txt && \
-    ./check-duplicate-includes.sh |& tee /test_output/duplicate_output.txt && \
-    ./shellcheck-run.sh           |& tee /test_output/shellcheck_output.txt && \
-    true
+COPY run.sh /
+COPY process_style_check_result.py /
+CMD ["/bin/bash", "/run.sh"]
diff --git a/docker/test/style/process_style_check_result.py b/docker/test/style/process_style_check_result.py
new file mode 100755
index 00000000000..61b1e0f05c5
--- /dev/null
+++ b/docker/test/style/process_style_check_result.py
@@ -0,0 +1,96 @@
+#!/usr/bin/env python3
+
+import os
+import logging
+import argparse
+import csv
+
+
+def process_result(result_folder):
+    status = "success"
+    description = ""
+    test_results = []
+
+    style_log_path = '{}/style_output.txt'.format(result_folder)
+    if not os.path.exists(style_log_path):
+        logging.info("No style check log on path %s", style_log_path)
+        return "exception", "No style check log", []
+    elif os.stat(style_log_path).st_size != 0:
+        description += "Style check failed. "
+        test_results.append(("Style check", "FAIL"))
+        status = "failure"  # Disabled for now
+    else:
+        test_results.append(("Style check", "OK"))
+
+    typos_log_path = '{}/typos_output.txt'.format(result_folder)
+    if not os.path.exists(style_log_path):
+        logging.info("No typos check log on path %s", style_log_path)
+        return "exception", "No typos check log", []
+    elif os.stat(typos_log_path).st_size != 0:
+        description += "Typos check failed. "
+        test_results.append(("Typos check", "FAIL"))
+        status = "failure"
+    else:
+        test_results.append(("Typos check", "OK"))
+
+    whitespaces_log_path = '{}/whitespaces_output.txt'.format(result_folder)
+    if not os.path.exists(style_log_path):
+        logging.info("No whitespaces check log on path %s", style_log_path)
+        return "exception", "No whitespaces check log", []
+    elif os.stat(whitespaces_log_path).st_size != 0:
+        description += "Whitespaces check failed. "
+        test_results.append(("Whitespaces check", "FAIL"))
+        status = "failure"
+    else:
+        test_results.append(("Whitespaces check", "OK"))
+
+    duplicate_log_path = '{}/duplicate_output.txt'.format(result_folder)
+    if not os.path.exists(duplicate_log_path):
+        logging.info("No header duplicates check log on path %s", duplicate_log_path)
+        return "exception", "No header duplicates check log", []
+    elif os.stat(duplicate_log_path).st_size != 0:
+        description += " Header duplicates check failed. "
+        test_results.append(("Header duplicates check", "FAIL"))
+        status = "failure"
+    else:
+        test_results.append(("Header duplicates check", "OK"))
+
+    shellcheck_log_path = '{}/shellcheck_output.txt'.format(result_folder)
+    if not os.path.exists(shellcheck_log_path):
+        logging.info("No shellcheck  log on path %s", shellcheck_log_path)
+        return "exception", "No shellcheck log", []
+    elif os.stat(shellcheck_log_path).st_size != 0:
+        description += " Shellcheck check failed. "
+        test_results.append(("Shellcheck ", "FAIL"))
+        status = "failure"
+    else:
+        test_results.append(("Shellcheck", "OK"))
+
+    if not description:
+        description += "Style check success"
+
+    return status, description, test_results
+
+
+def write_results(results_file, status_file, results, status):
+    with open(results_file, 'w') as f:
+        out = csv.writer(f, delimiter='\t')
+        out.writerows(results)
+    with open(status_file, 'w') as f:
+        out = csv.writer(f, delimiter='\t')
+        out.writerow(status)
+
+
+if __name__ == "__main__":
+    logging.basicConfig(level=logging.INFO, format='%(asctime)s %(message)s')
+    parser = argparse.ArgumentParser(description="ClickHouse script for parsing results of style check")
+    parser.add_argument("--in-results-dir", default='/test_output/')
+    parser.add_argument("--out-results-file", default='/test_output/test_results.tsv')
+    parser.add_argument("--out-status-file", default='/test_output/check_status.tsv')
+    args = parser.parse_args()
+
+    state, description, test_results = process_result(args.in_results_dir)
+    logging.info("Result parsed")
+    status = (state, description)
+    write_results(args.out_results_file, args.out_status_file, test_results, status)
+    logging.info("Result written")
diff --git a/docker/test/style/run.sh b/docker/test/style/run.sh
new file mode 100755
index 00000000000..424bfe71b15
--- /dev/null
+++ b/docker/test/style/run.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+cd /ClickHouse/utils/check-style || echo -e "failure\tRepo not found" > /test_output/check_status.tsv
+./check-style -n              |& tee /test_output/style_output.txt
+./check-typos                 |& tee /test_output/typos_output.txt
+./check-whitespaces -n        |& tee /test_output/whitespaces_output.txt
+./check-duplicate-includes.sh |& tee /test_output/duplicate_output.txt
+./shellcheck-run.sh           |& tee /test_output/shellcheck_output.txt
+/process_style_check_result.py || echo -e "failure\tCannot parse results" > /test_output/check_status.tsv
diff --git a/docker/test/testflows/runner/Dockerfile b/docker/test/testflows/runner/Dockerfile
index 4139fb9e044..bd7eee4c166 100644
--- a/docker/test/testflows/runner/Dockerfile
+++ b/docker/test/testflows/runner/Dockerfile
@@ -35,7 +35,7 @@ RUN apt-get update \
 ENV TZ=Europe/Moscow
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
-RUN pip3 install urllib3 testflows==1.6.72 docker-compose docker dicttoxml kazoo tzlocal
+RUN pip3 install urllib3 testflows==1.6.74 docker-compose docker dicttoxml kazoo tzlocal
 
 ENV DOCKER_CHANNEL stable
 ENV DOCKER_VERSION 17.09.1-ce
@@ -61,6 +61,7 @@ RUN set -eux; \
 
 COPY modprobe.sh /usr/local/bin/modprobe
 COPY dockerd-entrypoint.sh /usr/local/bin/
+COPY process_testflows_result.py /usr/local/bin/
 
 RUN set -x \
   && addgroup --system dockremap \
@@ -72,5 +73,5 @@ RUN set -x \
 VOLUME /var/lib/docker
 EXPOSE 2375
 ENTRYPOINT ["dockerd-entrypoint.sh"]
-CMD ["sh", "-c", "python3 regression.py --no-color -o classic --local --clickhouse-binary-path ${CLICKHOUSE_TESTS_SERVER_BIN_PATH} --log test.log ${TESTFLOWS_OPTS}; cat test.log | tfs report results --format json > results.json"]
+CMD ["sh", "-c", "python3 regression.py --no-color -o classic --local --clickhouse-binary-path ${CLICKHOUSE_TESTS_SERVER_BIN_PATH} --log test.log ${TESTFLOWS_OPTS}; cat test.log | tfs report results --format json > results.json; /usr/local/bin/process_testflows_result.py || echo -e 'failure\tCannot parse results' > check_status.tsv"]
 
diff --git a/docker/test/testflows/runner/dockerd-entrypoint.sh b/docker/test/testflows/runner/dockerd-entrypoint.sh
index 1bac94a9df2..01593488648 100755
--- a/docker/test/testflows/runner/dockerd-entrypoint.sh
+++ b/docker/test/testflows/runner/dockerd-entrypoint.sh
@@ -16,6 +16,14 @@ while true; do
 done
 set -e
 
+echo "Configure to use Yandex dockerhub-proxy"
+cat > /etc/docker/daemon.json << EOF
+{
+    "insecure-registries": ["dockerhub-proxy.sas.yp-c.yandex.net:5000"],
+    "registry-mirrors": ["dockerhub-proxy.sas.yp-c.yandex.net:5000"]
+}
+EOF
+
 echo "Start tests"
 export CLICKHOUSE_TESTS_SERVER_BIN_PATH=/clickhouse
 export CLICKHOUSE_TESTS_CLIENT_BIN_PATH=/clickhouse
diff --git a/docker/test/testflows/runner/process_testflows_result.py b/docker/test/testflows/runner/process_testflows_result.py
new file mode 100755
index 00000000000..37d0b6a69d1
--- /dev/null
+++ b/docker/test/testflows/runner/process_testflows_result.py
@@ -0,0 +1,67 @@
+#!/usr/bin/env python3
+
+import os
+import logging
+import argparse
+import csv
+import json
+
+
+def process_result(result_folder):
+    json_path = os.path.join(result_folder, "results.json")
+    if not os.path.exists(json_path):
+        return "success", "No testflows in branch", None, []
+
+    test_binary_log = os.path.join(result_folder, "test.log")
+    with open(json_path) as source:
+        results = json.loads(source.read())
+
+    total_tests = 0
+    total_ok = 0
+    total_fail = 0
+    total_other = 0
+    test_results = []
+    for test in results["tests"]:
+        test_name = test['test']['test_name']
+        test_result = test['result']['result_type'].upper()
+        test_time = str(test['result']['message_rtime'])
+        total_tests += 1
+        if test_result == "OK":
+            total_ok += 1
+        elif test_result == "FAIL" or test_result == "ERROR":
+            total_fail += 1
+        else:
+            total_other += 1
+
+        test_results.append((test_name, test_result, test_time))
+    if total_fail != 0:
+        status = "failure"
+    else:
+        status = "success"
+
+    description = "failed: {}, passed: {}, other: {}".format(total_fail, total_ok, total_other)
+    return status, description, test_results, [json_path, test_binary_log]
+
+
+def write_results(results_file, status_file, results, status):
+    with open(results_file, 'w') as f:
+        out = csv.writer(f, delimiter='\t')
+        out.writerows(results)
+    with open(status_file, 'w') as f:
+        out = csv.writer(f, delimiter='\t')
+        out.writerow(status)
+
+if __name__ == "__main__":
+    logging.basicConfig(level=logging.INFO, format='%(asctime)s %(message)s')
+    parser = argparse.ArgumentParser(description="ClickHouse script for parsing results of Testflows tests")
+    parser.add_argument("--in-results-dir", default='./')
+    parser.add_argument("--out-results-file", default='./test_results.tsv')
+    parser.add_argument("--out-status-file", default='./check_status.tsv')
+    args = parser.parse_args()
+
+    state, description, test_results, logs = process_result(args.in_results_dir)
+    logging.info("Result parsed")
+    status = (state, description)
+    write_results(args.out_results_file, args.out_status_file, test_results, status)
+    logging.info("Result written")
+
diff --git a/docker/test/unit/Dockerfile b/docker/test/unit/Dockerfile
index f01ed613918..e2f4a691939 100644
--- a/docker/test/unit/Dockerfile
+++ b/docker/test/unit/Dockerfile
@@ -5,6 +5,6 @@ ENV TZ=Europe/Moscow
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 RUN apt-get install gdb
 
-CMD service zookeeper start && sleep 7 && /usr/share/zookeeper/bin/zkCli.sh -server localhost:2181 -create create /clickhouse_test ''; \
-    gdb -q  -ex 'set print inferior-events off' -ex 'set confirm off' -ex 'set print thread-events off' -ex run -ex bt -ex quit --args ./unit_tests_dbms | tee test_output/test_result.txt
-
+COPY run.sh /
+COPY process_unit_tests_result.py /
+CMD ["/bin/bash", "/run.sh"]
diff --git a/docker/test/unit/process_unit_tests_result.py b/docker/test/unit/process_unit_tests_result.py
new file mode 100755
index 00000000000..7219aa13b82
--- /dev/null
+++ b/docker/test/unit/process_unit_tests_result.py
@@ -0,0 +1,96 @@
+#!/usr/bin/env python3
+
+import os
+import logging
+import argparse
+import csv
+
+OK_SIGN = 'OK ]'
+FAILED_SIGN = 'FAILED  ]'
+SEGFAULT = 'Segmentation fault'
+SIGNAL = 'received signal SIG'
+PASSED = 'PASSED'
+
+def get_test_name(line):
+    elements = reversed(line.split(' '))
+    for element in elements:
+        if '(' not in element and ')' not in element:
+            return element
+    raise Exception("No test name in line '{}'".format(line))
+
+def process_result(result_folder):
+    summary = []
+    total_counter = 0
+    failed_counter = 0
+    result_log_path = '{}/test_result.txt'.format(result_folder)
+    if not os.path.exists(result_log_path):
+        logging.info("No output log on path %s", result_log_path)
+        return "exception", "No output log", []
+
+    status = "success"
+    description = ""
+    passed = False
+    with open(result_log_path, 'r') as test_result:
+        for line in test_result:
+            if OK_SIGN in line:
+                logging.info("Found ok line: '%s'", line)
+                test_name = get_test_name(line.strip())
+                logging.info("Test name: '%s'", test_name)
+                summary.append((test_name, "OK"))
+                total_counter += 1
+            elif FAILED_SIGN in line and 'listed below' not in line and 'ms)' in line:
+                logging.info("Found fail line: '%s'", line)
+                test_name = get_test_name(line.strip())
+                logging.info("Test name: '%s'", test_name)
+                summary.append((test_name, "FAIL"))
+                total_counter += 1
+                failed_counter += 1
+            elif SEGFAULT in line:
+                logging.info("Found segfault line: '%s'", line)
+                status = "failure"
+                description += "Segmentation fault. "
+                break
+            elif SIGNAL in line:
+                logging.info("Received signal line: '%s'", line)
+                status = "failure"
+                description += "Exit on signal. "
+                break
+            elif PASSED in line:
+                logging.info("PASSED record found: '%s'", line)
+                passed = True
+
+    if not passed:
+        status = "failure"
+        description += "PASSED record not found. "
+
+    if failed_counter != 0:
+        status = "failure"
+
+    if not description:
+        description += "fail: {}, passed: {}".format(failed_counter, total_counter - failed_counter)
+
+    return status, description, summary
+
+
+def write_results(results_file, status_file, results, status):
+    with open(results_file, 'w') as f:
+        out = csv.writer(f, delimiter='\t')
+        out.writerows(results)
+    with open(status_file, 'w') as f:
+        out = csv.writer(f, delimiter='\t')
+        out.writerow(status)
+
+if __name__ == "__main__":
+    logging.basicConfig(level=logging.INFO, format='%(asctime)s %(message)s')
+    parser = argparse.ArgumentParser(description="ClickHouse script for parsing results of unit tests")
+    parser.add_argument("--in-results-dir", default='/test_output/')
+    parser.add_argument("--out-results-file", default='/test_output/test_results.tsv')
+    parser.add_argument("--out-status-file", default='/test_output/check_status.tsv')
+    args = parser.parse_args()
+
+    state, description, test_results = process_result(args.in_results_dir)
+    logging.info("Result parsed")
+    status = (state, description)
+    write_results(args.out_results_file, args.out_status_file, test_results, status)
+    logging.info("Result written")
+
diff --git a/docker/test/unit/run.sh b/docker/test/unit/run.sh
new file mode 100644
index 00000000000..abc35fa40d2
--- /dev/null
+++ b/docker/test/unit/run.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -x
+
+service zookeeper start && sleep 7 && /usr/share/zookeeper/bin/zkCli.sh -server localhost:2181 -create create /clickhouse_test '';
+gdb -q  -ex 'set print inferior-events off' -ex 'set confirm off' -ex 'set print thread-events off' -ex run -ex bt -ex quit --args ./unit_tests_dbms | tee test_output/test_result.txt
+./process_unit_tests_result.py  || echo -e "failure\tCannot parse results" > /test_output/check_status.tsv
diff --git a/docs/.gitignore b/docs/.gitignore
new file mode 100644
index 00000000000..378eac25d31
--- /dev/null
+++ b/docs/.gitignore
@@ -0,0 +1 @@
+build
diff --git a/docs/README.md b/docs/README.md
index 8b3066501bf..a4df023a6ad 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -126,7 +126,13 @@ Contribute all new information in English language. Other languages are translat
 
 ### Adding a New File
 
-When adding a new file:
+When you add a new file, it should end with a link like:
+
+`[Original article](https://clickhouse.tech/docs/<path-to-the-page>) <!--hide-->`
+
+and there should be **a new empty line** after it.
+
+{## When adding a new file:
 
 - Make symbolic links for all other languages. You can use the following commands:
 
@@ -134,7 +140,7 @@ When adding a new file:
     $ cd /ClickHouse/clone/directory/docs
     $ ln -sr en/new/file.md lang/new/file.md
     ```
-
+##}
 <a name="adding-a-new-language"/>
 
 ### Adding a New Language
@@ -195,8 +201,11 @@ Templates:
 
 - [Function](_description_templates/template-function.md)
 - [Setting](_description_templates/template-setting.md)
+- [Server Setting](_description_templates/template-server-setting.md)
 - [Database or Table engine](_description_templates/template-engine.md)
 - [System table](_description_templates/template-system-table.md)
+- [Data type](_description_templates/data-type.md)
+- [Statement](_description_templates/statement.md)
 
 
 <a name="how-to-build-docs"/>
diff --git a/docs/_description_templates/template-data-type.md b/docs/_description_templates/template-data-type.md
index edb6586ee7d..5e560b9325d 100644
--- a/docs/_description_templates/template-data-type.md
+++ b/docs/_description_templates/template-data-type.md
@@ -26,4 +26,4 @@ The name of an additional section can be any, for example, **Usage**.
 
 -   [link](#)
 
-[Original article](https://clickhouse.tech/docs/en/data_types/<data-type-name>/) <!--hide-->
+[Original article](https://clickhouse.tech/docs/en/data-types/<data-type-name>/) <!--hide-->
diff --git a/docs/_description_templates/template-engine.md b/docs/_description_templates/template-engine.md
index 35181881134..490f490fc4e 100644
--- a/docs/_description_templates/template-engine.md
+++ b/docs/_description_templates/template-engine.md
@@ -58,6 +58,6 @@ Result:
 
 Follow up with any text to clarify the example.
 
-## See Also {#see-also}
+**See Also** 
 
 -   [link](#)
diff --git a/docs/_description_templates/template-function.md b/docs/_description_templates/template-function.md
index a0074a76ef6..3d4d921898a 100644
--- a/docs/_description_templates/template-function.md
+++ b/docs/_description_templates/template-function.md
@@ -14,12 +14,12 @@ More text (Optional).
 
 **Arguments** (Optional)
 
--   `x` — Description. [Type name](relative/path/to/type/dscr.md#type).
--   `y` — Description. [Type name](relative/path/to/type/dscr.md#type).
+-   `x` — Description. Optional (only for optional arguments). Possible values: <values list>. Default value: <value>. [Type name](relative/path/to/type/dscr.md#type). 
+-   `y` — Description. Optional (only for optional arguments). Possible values: <values list>.Default value: <value>. [Type name](relative/path/to/type/dscr.md#type). 
 
 **Parameters** (Optional, only for parametric aggregate functions)
 
--   `z` — Description. [Type name](relative/path/to/type/dscr.md#type).
+-   `z` — Description. Optional (only for optional parameters). Possible values: <values list>. Default value: <value>. [Type name](relative/path/to/type/dscr.md#type).
 
 **Returned value(s)**
 
diff --git a/docs/_description_templates/template-server-setting.md b/docs/_description_templates/template-server-setting.md
index 36a2bcacfba..0b37d46cf41 100644
--- a/docs/_description_templates/template-server-setting.md
+++ b/docs/_description_templates/template-server-setting.md
@@ -8,14 +8,14 @@ Possible value: ...
 
 Default value: ...
 
-Settings: (Optional)
+**Settings** (Optional)
 
 If the section contains several settings, list them here. Specify possible values and default values:
 
 -   setting_1 — Description.
 -   setting_2 — Description.
 
-**Example:**
+**Example**
 
 ```xml
 <server_setting_name>
diff --git a/docs/_description_templates/template-statement.md b/docs/_description_templates/template-statement.md
index 62ea51edf83..bca015a2ac6 100644
--- a/docs/_description_templates/template-statement.md
+++ b/docs/_description_templates/template-statement.md
@@ -1,14 +1,14 @@
-# Statement name (for example, SHOW USER)
+# Statement name (for example, SHOW USER) {#statement-name-in-lower-case}
 
 Brief description of what the statement does.
 
-Syntax:
+**Syntax**
 
 ```sql
 Syntax of the statement.
 ```
 
-## Other necessary sections of the description (Optional)
+## Other necessary sections of the description (Optional) {#anchor}
 
 Examples of descriptions with a complicated structure:
 
@@ -17,7 +17,7 @@ Examples of descriptions with a complicated structure:
 - https://clickhouse.tech/docs/en/sql-reference/statements/select/join/
 
 
-## See Also (Optional)
+**See Also** (Optional)
 
 Links to related topics as a list.
 
diff --git a/docs/en/commercial/cloud.md b/docs/en/commercial/cloud.md
index 0490881c622..953a0ab5748 100644
--- a/docs/en/commercial/cloud.md
+++ b/docs/en/commercial/cloud.md
@@ -29,6 +29,18 @@ toc_title: Cloud
 -   Cross-AZ scaling for performance and high availability
 -   Built-in monitoring and SQL query editor
 
+## Alibaba Cloud {#alibaba-cloud}
+
+Alibaba Cloud Managed Service for ClickHouse. [China Site](https://www.aliyun.com/product/clickhouse) (will be available at the international site in May 2021). Provides the following key features:
+
+-   Highly reliable cloud disk storage engine based on [Alibaba Cloud Apsara](https://www.alibabacloud.com/product/apsara-stack) distributed system
+-   Expand capacity on-demand without manual data migration
+-   Support single-node, single-replica, multi-node, and multi-replica architectures, and support hot and cold data tiering
+-   Support access allow-list, one-key recovery, multi-layer network security protection, cloud disk encryption
+-   Seamless integration with cloud log systems, databases, and data application tools
+-   Built-in monitoring and database management platform
+-   Professional database expert technical support and service
+
 ## Tencent Cloud {#tencent-cloud}
 
 [Tencent Managed Service for ClickHouse](https://cloud.tencent.com/product/cdwch) provides the following key features:
diff --git a/docs/en/commercial/support.md b/docs/en/commercial/support.md
index 37bc54e3e8b..1a3d1b71869 100644
--- a/docs/en/commercial/support.md
+++ b/docs/en/commercial/support.md
@@ -7,6 +7,10 @@ toc_title: Support
 
 !!! info "Info"
     If you have launched a ClickHouse commercial support service, feel free to [open a pull-request](https://github.com/ClickHouse/ClickHouse/edit/master/docs/en/commercial/support.md) adding it to the following list.
+    
+## Yandex.Cloud
+
+ClickHouse worldwide support from the authors of ClickHouse. Supports on-premise and cloud deployments. Ask details on clickhouse-support@yandex-team.com
 
 ## Altinity {#altinity}
 
diff --git a/docs/en/development/build-osx.md b/docs/en/development/build-osx.md
index e0b1be710f1..24ecbdc1c2c 100644
--- a/docs/en/development/build-osx.md
+++ b/docs/en/development/build-osx.md
@@ -5,44 +5,80 @@ toc_title: Build on Mac OS X
 
 # How to Build ClickHouse on Mac OS X {#how-to-build-clickhouse-on-mac-os-x}
 
-Build should work on Mac OS X 10.15 (Catalina).
+Build should work on x86_64 (Intel) and arm64 (Apple Silicon) based macOS 10.15 (Catalina) and higher with recent Xcode's native AppleClang, or Homebrew's vanilla Clang or GCC compilers.
 
 ## Install Homebrew {#install-homebrew}
 
 ``` bash
-$ /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
+/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+# ...and follow the printed instructions on any additional steps required to complete the installation.
 ```
 
+## Install Xcode and Command Line Tools {#install-xcode-and-command-line-tools}
+
+Install the latest [Xcode](https://apps.apple.com/am/app/xcode/id497799835?mt=12) from App Store.
+
+Open it at least once to accept the end-user license agreement and automatically install the required components.
+
+Then, make sure that the latest Comman Line Tools are installed and selected in the system:
+
+``` bash
+sudo rm -rf /Library/Developer/CommandLineTools
+sudo xcode-select --install
+```
+
+Reboot.
+
 ## Install Required Compilers, Tools, and Libraries {#install-required-compilers-tools-and-libraries}
 
 ``` bash
-$ brew install cmake ninja libtool gettext llvm
+brew update
+brew install cmake ninja libtool gettext llvm gcc
 ```
 
 ## Checkout ClickHouse Sources {#checkout-clickhouse-sources}
 
 ``` bash
-$ git clone --recursive git@github.com:ClickHouse/ClickHouse.git
-```
-
-or
-
-``` bash
-$ git clone --recursive https://github.com/ClickHouse/ClickHouse.git
-
-$ cd ClickHouse
+git clone --recursive git@github.com:ClickHouse/ClickHouse.git
+# ...alternatively, you can use https://github.com/ClickHouse/ClickHouse.git as the repo URL.
 ```
 
 ## Build ClickHouse {#build-clickhouse}
 
-> Please note: ClickHouse doesn't support build with native Apple Clang compiler, we need use clang from LLVM.
+To build using Xcode's native AppleClang compiler:
 
 ``` bash
-$ mkdir build
-$ cd build
-$ cmake .. -DCMAKE_C_COMPILER=`brew --prefix llvm`/bin/clang -DCMAKE_CXX_COMPILER=`brew --prefix llvm`/bin/clang++ -DCMAKE_PREFIX_PATH=`brew --prefix llvm`
-$ ninja
-$ cd ..
+cd ClickHouse
+rm -rf build
+mkdir build
+cd build
+cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo ..
+cmake --build . --config RelWithDebInfo
+cd ..
+```
+
+To build using Homebrew's vanilla Clang compiler:
+
+``` bash
+cd ClickHouse
+rm -rf build
+mkdir build
+cd build
+cmake -DCMAKE_C_COMPILER=$(brew --prefix llvm)/bin/clang -DCMAKE_CXX_COMPILER=$(brew --prefix llvm)/bin/clang++ -DCMAKE_BUILD_TYPE=RelWithDebInfo ..
+cmake --build . --config RelWithDebInfo
+cd ..
+```
+
+To build using Homebrew's vanilla GCC compiler:
+
+``` bash
+cd ClickHouse
+rm -rf build
+mkdir build
+cd build
+cmake -DCMAKE_C_COMPILER=$(brew --prefix gcc)/bin/gcc-10 -DCMAKE_CXX_COMPILER=$(brew --prefix gcc)/bin/g++-10 -DCMAKE_BUILD_TYPE=RelWithDebInfo ..
+cmake --build . --config RelWithDebInfo
+cd ..
 ```
 
 ## Caveats {#caveats}
@@ -81,7 +117,7 @@ To do so, create the `/Library/LaunchDaemons/limit.maxfiles.plist` file with the
 Execute the following command:
 
 ``` bash
-$ sudo chown root:wheel /Library/LaunchDaemons/limit.maxfiles.plist
+sudo chown root:wheel /Library/LaunchDaemons/limit.maxfiles.plist
 ```
 
 Reboot.
diff --git a/docs/en/development/build.md b/docs/en/development/build.md
index f98329e748f..3181f26800d 100644
--- a/docs/en/development/build.md
+++ b/docs/en/development/build.md
@@ -170,7 +170,7 @@ $ ./release
 Normally all tools of the ClickHouse bundle, such as `clickhouse-server`, `clickhouse-client` etc., are linked into a single static executable, `clickhouse`. This executable must be re-linked on every change, which might be slow. Two common ways to improve linking time are to use `lld` linker, and use the 'split' build configuration, which builds a separate binary for every tool, and further splits the code into serveral shared libraries. To enable these tweaks, pass the following flags to `cmake`:
 
 ```
--DCMAKE_C_FLAGS="-fuse-ld=lld" -DCMAKE_CXX_FLAGS="-fuse-ld=lld" -DUSE_STATIC_LIBRARIES=0 -DSPLIT_SHARED_LIBRARIES=1 -DCLICKHOUSE_SPLIT_BINARY=1
+-DCMAKE_C_FLAGS="--ld-path=lld" -DCMAKE_CXX_FLAGS="--ld-path=lld" -DUSE_STATIC_LIBRARIES=0 -DSPLIT_SHARED_LIBRARIES=1 -DCLICKHOUSE_SPLIT_BINARY=1
 ```
 
 ## You Don’t Have to Build ClickHouse {#you-dont-have-to-build-clickhouse}
diff --git a/docs/en/development/cmake-in-clickhouse.md b/docs/en/development/cmake-in-clickhouse.md
new file mode 100644
index 00000000000..6e6ac825587
--- /dev/null
+++ b/docs/en/development/cmake-in-clickhouse.md
@@ -0,0 +1,284 @@
+# CMake in ClickHouse
+
+## TL; DR How to make ClickHouse compile and link faster?
+
+Developer only! This command will likely fulfill most of your needs. Run before calling `ninja`.
+
+```cmake
+cmake .. \
+    -DCMAKE_C_COMPILER=/bin/clang-10 \
+    -DCMAKE_CXX_COMPILER=/bin/clang++-10 \
+    -DCMAKE_BUILD_TYPE=Debug \
+    -DENABLE_CLICKHOUSE_ALL=OFF \
+    -DENABLE_CLICKHOUSE_SERVER=ON \
+    -DENABLE_CLICKHOUSE_CLIENT=ON \
+    -DUSE_STATIC_LIBRARIES=OFF \
+    -DSPLIT_SHARED_LIBRARIES=ON \
+    -DENABLE_LIBRARIES=OFF \
+    -DUSE_UNWIND=ON \
+    -DENABLE_UTILS=OFF \
+    -DENABLE_TESTS=OFF
+```
+
+## CMake files types
+
+1. ClickHouse's source CMake files (located in the root directory and in `/src`).
+2. Arch-dependent CMake files (located in `/cmake/*os_name*`).
+3. Libraries finders (search for contrib libraries, located in `/cmake/find`).
+3. Contrib build CMake files (used instead of libraries' own CMake files, located in `/cmake/modules`)
+
+## List of CMake flags
+
+* This list is auto-generated by [this Python script](https://github.com/clickhouse/clickhouse/blob/master/docs/tools/cmake_in_clickhouse_generator.py).
+* The flag name is a link to its position in the code.
+* If an option's default value is itself an option, it's also a link to its position in this list.
+### ClickHouse modes
+
+| Name | Default value | Description | Comment |
+|------|---------------|-------------|---------|
+| <a name="enable-clickhouse-all"></a>[`ENABLE_CLICKHOUSE_ALL`](https://github.com/clickhouse/clickhouse/blob/master/programs/CMakeLists.txt#L8) | `ON` | Enable all ClickHouse modes by default | The `clickhouse` binary is a multi purpose tool that contains multiple execution modes (client, server, etc.), each of them may be built and linked as a separate library. If you do not know what modes you need, turn this option OFF and enable SERVER and CLIENT only.  |
+| <a name="enable-clickhouse-benchmark"></a>[`ENABLE_CLICKHOUSE_BENCHMARK`](https://github.com/clickhouse/clickhouse/blob/master/programs/CMakeLists.txt#L18) | `ENABLE_CLICKHOUSE_ALL` | Queries benchmarking mode | https://clickhouse.tech/docs/en/operations/utilities/clickhouse-benchmark/  |
+| <a name="enable-clickhouse-client"></a>[`ENABLE_CLICKHOUSE_CLIENT`](https://github.com/clickhouse/clickhouse/blob/master/programs/CMakeLists.txt#L11) | `ENABLE_CLICKHOUSE_ALL` | Client mode (interactive tui/shell that connects to the server) |  |
+| <a name="enable-clickhouse-compressor"></a>[`ENABLE_CLICKHOUSE_COMPRESSOR`](https://github.com/clickhouse/clickhouse/blob/master/programs/CMakeLists.txt#L23) | `ENABLE_CLICKHOUSE_ALL` | Data compressor and decompressor | https://clickhouse.tech/docs/en/operations/utilities/clickhouse-compressor/  |
+| <a name="enable-clickhouse-copier"></a>[`ENABLE_CLICKHOUSE_COPIER`](https://github.com/clickhouse/clickhouse/blob/master/programs/CMakeLists.txt#L26) | `ENABLE_CLICKHOUSE_ALL` | Inter-cluster data copying mode | https://clickhouse.tech/docs/en/operations/utilities/clickhouse-copier/  |
+| <a name="enable-clickhouse-extract-from-config"></a>[`ENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG`](https://github.com/clickhouse/clickhouse/blob/master/programs/CMakeLists.txt#L20) | `ENABLE_CLICKHOUSE_ALL` | Configs processor (extract values etc.) |  |
+| <a name="enable-clickhouse-format"></a>[`ENABLE_CLICKHOUSE_FORMAT`](https://github.com/clickhouse/clickhouse/blob/master/programs/CMakeLists.txt#L28) | `ENABLE_CLICKHOUSE_ALL` | Queries pretty-printer and formatter with syntax highlighting |  |
+| <a name="enable-clickhouse-git-import"></a>[`ENABLE_CLICKHOUSE_GIT_IMPORT`](https://github.com/clickhouse/clickhouse/blob/master/programs/CMakeLists.txt#L40) | `ENABLE_CLICKHOUSE_ALL` | A tool to analyze Git repositories | https://presentations.clickhouse.tech/matemarketing_2020/  |
+| <a name="enable-clickhouse-install"></a>[`ENABLE_CLICKHOUSE_INSTALL`](https://github.com/clickhouse/clickhouse/blob/master/programs/CMakeLists.txt#L44) | `OFF` | Install ClickHouse without .deb/.rpm/.tgz packages (having the binary only) |  |
+| <a name="enable-clickhouse-local"></a>[`ENABLE_CLICKHOUSE_LOCAL`](https://github.com/clickhouse/clickhouse/blob/master/programs/CMakeLists.txt#L15) | `ENABLE_CLICKHOUSE_ALL` | Local files fast processing mode | https://clickhouse.tech/docs/en/operations/utilities/clickhouse-local/  |
+| <a name="enable-clickhouse-obfuscator"></a>[`ENABLE_CLICKHOUSE_OBFUSCATOR`](https://github.com/clickhouse/clickhouse/blob/master/programs/CMakeLists.txt#L32) | `ENABLE_CLICKHOUSE_ALL` | Table data obfuscator (convert real data to benchmark-ready one) | https://clickhouse.tech/docs/en/operations/utilities/clickhouse-obfuscator/  |
+| <a name="enable-clickhouse-odbc-bridge"></a>[`ENABLE_CLICKHOUSE_ODBC_BRIDGE`](https://github.com/clickhouse/clickhouse/blob/master/programs/CMakeLists.txt#L36) | `ENABLE_CLICKHOUSE_ALL` | HTTP-server working like a proxy to ODBC driver | https://clickhouse.tech/docs/en/operations/utilities/odbc-bridge/  |
+| <a name="enable-clickhouse-server"></a>[`ENABLE_CLICKHOUSE_SERVER`](https://github.com/clickhouse/clickhouse/blob/master/programs/CMakeLists.txt#L10) | `ENABLE_CLICKHOUSE_ALL` | Server mode (main mode) |  |
+
+### External libraries
+Note that ClickHouse uses forks of these libraries, see https://github.com/ClickHouse-Extras.
+
+| Name | Default value | Description | Comment |
+|------|---------------|-------------|---------|
+| <a name="enable-amqpcpp"></a>[`ENABLE_AMQPCPP`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/amqpcpp.cmake#L1) | `ENABLE_LIBRARIES` | Enalbe AMQP-CPP |  |
+| <a name="enable-avro"></a>[`ENABLE_AVRO`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/avro.cmake#L2) | `ENABLE_LIBRARIES` | Enable Avro | Needed when using Apache Avro serialization format  |
+| <a name="enable-base"></a>[`ENABLE_BASE64`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/base64.cmake#L1) | `ENABLE_LIBRARIES` | Enable base64 |  |
+| <a name="enable-brotli"></a>[`ENABLE_BROTLI`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/brotli.cmake#L1) | `ENABLE_LIBRARIES` | Enable brotli |  |
+| <a name="enable-capnp"></a>[`ENABLE_CAPNP`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/capnp.cmake#L1) | `ENABLE_LIBRARIES` | Enable Cap'n Proto |  |
+| <a name="enable-cassandra"></a>[`ENABLE_CASSANDRA`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/cassandra.cmake#L1) | `ENABLE_LIBRARIES` | Enable Cassandra |  |
+| <a name="enable-ccache"></a>[`ENABLE_CCACHE`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/ccache.cmake#L22) | `ENABLE_CCACHE_BY_DEFAULT` | Speedup re-compilations using ccache (external tool) | https://ccache.dev/  |
+| <a name="enable-clang-tidy"></a>[`ENABLE_CLANG_TIDY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/analysis.cmake#L2) | `OFF` | Use clang-tidy static analyzer | https://clang.llvm.org/extra/clang-tidy/  |
+| <a name="enable-curl"></a>[`ENABLE_CURL`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/curl.cmake#L1) | `ENABLE_LIBRARIES` | Enable curl |  |
+| <a name="enable-embedded-compiler"></a>[`ENABLE_EMBEDDED_COMPILER`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/llvm.cmake#L5) | `ENABLE_LIBRARIES` | Set to TRUE to enable support for 'compile_expressions' option for query execution |  |
+| <a name="enable-fastops"></a>[`ENABLE_FASTOPS`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/fastops.cmake#L2) | `ENABLE_LIBRARIES` | Enable fast vectorized mathematical functions library by Mikhail Parakhin |  |
+| <a name="enable-gperf"></a>[`ENABLE_GPERF`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/gperf.cmake#L5) | `ENABLE_LIBRARIES` | Use gperf function hash generator tool |  |
+| <a name="enable-grpc"></a>[`ENABLE_GRPC`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/grpc.cmake#L8) | `ENABLE_GRPC_DEFAULT` | Use gRPC |  |
+| <a name="enable-gsasl-library"></a>[`ENABLE_GSASL_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/libgsasl.cmake#L1) | `ENABLE_LIBRARIES` | Enable gsasl library |  |
+| <a name="enable-h"></a>[`ENABLE_H3`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/h3.cmake#L1) | `ENABLE_LIBRARIES` | Enable H3 |  |
+| <a name="enable-hdfs"></a>[`ENABLE_HDFS`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/hdfs3.cmake#L2) | `ENABLE_LIBRARIES` | Enable HDFS |  |
+| <a name="enable-icu"></a>[`ENABLE_ICU`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/icu.cmake#L2) | `ENABLE_LIBRARIES` | Enable ICU |  |
+| <a name="enable-ldap"></a>[`ENABLE_LDAP`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/ldap.cmake#L5) | `ENABLE_LIBRARIES` | Enable LDAP |  |
+| <a name="enable-libpqxx"></a>[`ENABLE_LIBPQXX`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/libpqxx.cmake#L1) | `ENABLE_LIBRARIES` | Enalbe libpqxx |  |
+| <a name="enable-msgpack"></a>[`ENABLE_MSGPACK`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/msgpack.cmake#L1) | `ENABLE_LIBRARIES` | Enable msgpack library |  |
+| <a name="enable-mysql"></a>[`ENABLE_MYSQL`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/mysqlclient.cmake#L2) | `ENABLE_LIBRARIES` | Enable MySQL |  |
+| <a name="enable-nuraft"></a>[`ENABLE_NURAFT`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/nuraft.cmake#L1) | `ENABLE_LIBRARIES` | Enable NuRaft |  |
+| <a name="enable-odbc"></a>[`ENABLE_ODBC`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/odbc.cmake#L1) | `ENABLE_LIBRARIES` | Enable ODBC library |  |
+| <a name="enable-orc"></a>[`ENABLE_ORC`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/orc.cmake#L1) | `ENABLE_LIBRARIES` | Enable ORC |  |
+| <a name="enable-parquet"></a>[`ENABLE_PARQUET`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/parquet.cmake#L2) | `ENABLE_LIBRARIES` | Enable parquet |  |
+| <a name="enable-protobuf"></a>[`ENABLE_PROTOBUF`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/protobuf.cmake#L1) | `ENABLE_LIBRARIES` | Enable protobuf |  |
+| <a name="enable-rapidjson"></a>[`ENABLE_RAPIDJSON`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/rapidjson.cmake#L1) | `ENABLE_LIBRARIES` | Use rapidjson |  |
+| <a name="enable-rdkafka"></a>[`ENABLE_RDKAFKA`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/rdkafka.cmake#L1) | `ENABLE_LIBRARIES` | Enable kafka |  |
+| <a name="enable-rocksdb"></a>[`ENABLE_ROCKSDB`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/rocksdb.cmake#L1) | `ENABLE_LIBRARIES` | Enable ROCKSDB |  |
+| <a name="enable-s"></a>[`ENABLE_S3`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/s3.cmake#L2) | `ENABLE_LIBRARIES` | Enable S3 |  |
+| <a name="enable-ssl"></a>[`ENABLE_SSL`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/ssl.cmake#L3) | `ENABLE_LIBRARIES` | Enable ssl | Needed when securely connecting to an external server, e.g. clickhouse-client --host ... --secure  |
+| <a name="enable-stats"></a>[`ENABLE_STATS`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/stats.cmake#L1) | `ENABLE_LIBRARIES` | Enalbe StatsLib library |  |
+
+
+### External libraries system/bundled mode
+
+| Name | Default value | Description | Comment |
+|------|---------------|-------------|---------|
+| <a name="use-internal-avro-library"></a>[`USE_INTERNAL_AVRO_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/avro.cmake#L11) | `ON` | Set to FALSE to use system avro library instead of bundled |  |
+| <a name="use-internal-aws-s-library"></a>[`USE_INTERNAL_AWS_S3_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/s3.cmake#L14) | `ON` | Set to FALSE to use system S3 instead of bundled (experimental set to OFF on your own risk) |  |
+| <a name="use-internal-brotli-library"></a>[`USE_INTERNAL_BROTLI_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/brotli.cmake#L12) | `USE_STATIC_LIBRARIES` | Set to FALSE to use system libbrotli library instead of bundled | Many system ship only dynamic brotly libraries, so we back off to bundled by default  |
+| <a name="use-internal-capnp-library"></a>[`USE_INTERNAL_CAPNP_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/capnp.cmake#L10) | `NOT_UNBUNDLED` | Set to FALSE to use system capnproto library instead of bundled |  |
+| <a name="use-internal-curl"></a>[`USE_INTERNAL_CURL`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/curl.cmake#L10) | `NOT_UNBUNDLED` | Use internal curl library |  |
+| <a name="use-internal-grpc-library"></a>[`USE_INTERNAL_GRPC_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/grpc.cmake#L25) | `NOT_UNBUNDLED` | Set to FALSE to use system gRPC library instead of bundled. (Experimental. Set to OFF on your own risk) | Normally we use the internal gRPC framework. You can set USE_INTERNAL_GRPC_LIBRARY to OFF to force using the external gRPC framework, which should be installed in the system in this case. The external gRPC framework can be installed in the system by running sudo apt-get install libgrpc++-dev protobuf-compiler-grpc  |
+| <a name="use-internal-gtest-library"></a>[`USE_INTERNAL_GTEST_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/gtest.cmake#L3) | `NOT_UNBUNDLED` | Set to FALSE to use system Google Test instead of bundled |  |
+| <a name="use-internal-h-library"></a>[`USE_INTERNAL_H3_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/h3.cmake#L9) | `ON` | Set to FALSE to use system h3 library instead of bundled |  |
+| <a name="use-internal-hdfs-library"></a>[`USE_INTERNAL_HDFS3_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/hdfs3.cmake#L14) | `ON` | Set to FALSE to use system HDFS3 instead of bundled (experimental - set to OFF on your own risk) |  |
+| <a name="use-internal-icu-library"></a>[`USE_INTERNAL_ICU_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/icu.cmake#L15) | `NOT_UNBUNDLED` | Set to FALSE to use system ICU library instead of bundled |  |
+| <a name="use-internal-ldap-library"></a>[`USE_INTERNAL_LDAP_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/ldap.cmake#L14) | `NOT_UNBUNDLED` | Set to FALSE to use system *LDAP library instead of bundled |  |
+| <a name="use-internal-libcxx-library"></a>[`USE_INTERNAL_LIBCXX_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/cxx.cmake#L15) | `USE_INTERNAL_LIBCXX_LIBRARY_DEFAULT` | Disable to use system libcxx and libcxxabi libraries instead of bundled |  |
+| <a name="use-internal-libgsasl-library"></a>[`USE_INTERNAL_LIBGSASL_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/libgsasl.cmake#L12) | `USE_STATIC_LIBRARIES` | Set to FALSE to use system libgsasl library instead of bundled | when USE_STATIC_LIBRARIES we usually need to pick up hell a lot of dependencies for libgsasl  |
+| <a name="use-internal-libxml-library"></a>[`USE_INTERNAL_LIBXML2_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/libxml2.cmake#L1) | `NOT_UNBUNDLED` | Set to FALSE to use system libxml2 library instead of bundled |  |
+| <a name="use-internal-llvm-library"></a>[`USE_INTERNAL_LLVM_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/llvm.cmake#L8) | `NOT_UNBUNDLED` | Use bundled or system LLVM library. |  |
+| <a name="use-internal-msgpack-library"></a>[`USE_INTERNAL_MSGPACK_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/msgpack.cmake#L10) | `NOT_UNBUNDLED` | Set to FALSE to use system msgpack library instead of bundled |  |
+| <a name="use-internal-mysql-library"></a>[`USE_INTERNAL_MYSQL_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/mysqlclient.cmake#L15) | `NOT_UNBUNDLED` | Set to FALSE to use system mysqlclient library instead of bundled |  |
+| <a name="use-internal-odbc-library"></a>[`USE_INTERNAL_ODBC_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/odbc.cmake#L22) | `NOT_UNBUNDLED` | Use internal ODBC library |  |
+| <a name="use-internal-orc-library"></a>[`USE_INTERNAL_ORC_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/orc.cmake#L11) | `ON` | Set to FALSE to use system ORC instead of bundled (experimental set to OFF on your own risk) |  |
+| <a name="use-internal-parquet-library"></a>[`USE_INTERNAL_PARQUET_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/parquet.cmake#L16) | `NOT_UNBUNDLED` | Set to FALSE to use system parquet library instead of bundled |  |
+| <a name="use-internal-poco-library"></a>[`USE_INTERNAL_POCO_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/poco.cmake#L1) | `ON` | Use internal Poco library |  |
+| <a name="use-internal-protobuf-library"></a>[`USE_INTERNAL_PROTOBUF_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/protobuf.cmake#L14) | `NOT_UNBUNDLED` | Set to FALSE to use system protobuf instead of bundled. (Experimental. Set to OFF on your own risk) | Normally we use the internal protobuf library. You can set USE_INTERNAL_PROTOBUF_LIBRARY to OFF to force using the external protobuf library, which should be installed in the system in this case. The external protobuf library can be installed in the system by running sudo apt-get install libprotobuf-dev protobuf-compiler libprotoc-dev  |
+| <a name="use-internal-rapidjson-library"></a>[`USE_INTERNAL_RAPIDJSON_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/rapidjson.cmake#L9) | `NOT_UNBUNDLED` | Set to FALSE to use system rapidjson library instead of bundled |  |
+| <a name="use-internal-rdkafka-library"></a>[`USE_INTERNAL_RDKAFKA_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/rdkafka.cmake#L10) | `NOT_UNBUNDLED` | Set to FALSE to use system librdkafka instead of the bundled |  |
+| <a name="use-internal-re-library"></a>[`USE_INTERNAL_RE2_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/re2.cmake#L1) | `NOT_UNBUNDLED` | Set to FALSE to use system re2 library instead of bundled [slower] |  |
+| <a name="use-internal-rocksdb-library"></a>[`USE_INTERNAL_ROCKSDB_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/rocksdb.cmake#L10) | `NOT_UNBUNDLED` | Set to FALSE to use system ROCKSDB library instead of bundled |  |
+| <a name="use-internal-snappy-library"></a>[`USE_INTERNAL_SNAPPY_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/snappy.cmake#L10) | `NOT_UNBUNDLED` | Set to FALSE to use system snappy library instead of bundled |  |
+| <a name="use-internal-sparsehash-library"></a>[`USE_INTERNAL_SPARSEHASH_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/sparsehash.cmake#L1) | `ON` | Set to FALSE to use system sparsehash library instead of bundled |  |
+| <a name="use-internal-ssl-library"></a>[`USE_INTERNAL_SSL_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/ssl.cmake#L12) | `NOT_UNBUNDLED` | Set to FALSE to use system *ssl library instead of bundled |  |
+| <a name="use-internal-zlib-library"></a>[`USE_INTERNAL_ZLIB_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/zlib.cmake#L1) | `NOT_UNBUNDLED` | Set to FALSE to use system zlib library instead of bundled |  |
+| <a name="use-internal-zstd-library"></a>[`USE_INTERNAL_ZSTD_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/zstd.cmake#L1) | `NOT_UNBUNDLED` | Set to FALSE to use system zstd library instead of bundled |  |
+
+
+### Other flags
+
+| Name | Default value | Description | Comment |
+|------|---------------|-------------|---------|
+| <a name="add-gdb-index-for-gold"></a>[`ADD_GDB_INDEX_FOR_GOLD`](https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L195) | `OFF` | Add .gdb-index to resulting binaries for gold linker. | Ignored if `lld` is used  |
+| <a name="arch-native"></a>[`ARCH_NATIVE`](https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L248) | `OFF` | Add -march=native compiler flag |  |
+| <a name="clickhouse-split-binary"></a>[`CLICKHOUSE_SPLIT_BINARY`](https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L98) | `OFF` | Make several binaries (clickhouse-server, clickhouse-client etc.) instead of one bundled |  |
+| <a name="compiler-pipe"></a>[`COMPILER_PIPE`](https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L235) | `ON` | -pipe compiler option | Less `/tmp` usage, more RAM usage.  |
+| <a name="enable-check-heavy-builds"></a>[`ENABLE_CHECK_HEAVY_BUILDS`](https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L69) | `OFF` | Don't allow C++ translation units to compile too long or to take too much memory while compiling |  |
+| <a name="enable-fuzzing"></a>[`ENABLE_FUZZING`](https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L115) | `OFF` | Fuzzy testing using libfuzzer | Implies `WITH_COVERAGE`  |
+| <a name="enable-libraries"></a>[`ENABLE_LIBRARIES`](https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L357) | `ON` | Enable all external libraries by default | Turns on all external libs like s3, kafka, ODBC, ...  |
+| <a name="enable-multitarget-code"></a>[`ENABLE_MULTITARGET_CODE`](https://github.com/clickhouse/clickhouse/blob/master/src/Functions/CMakeLists.txt#L100) | `ON` | Enable platform-dependent code | ClickHouse developers may use platform-dependent code under some macro (e.g. `ifdef ENABLE_MULTITARGET`). If turned ON, this option defines such macro. See `src/Functions/TargetSpecific.h`  |
+| <a name="enable-tests"></a>[`ENABLE_TESTS`](https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L154) | `ON` | Provide unit_test_dbms target with Google.Test unit tests | If turned `ON`, assumes the user has either the system GTest library or the bundled one.  |
+| <a name="enable-thinlto"></a>[`ENABLE_THINLTO`](https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L313) | `ON` | Clang-specific link time optimization | https://clang.llvm.org/docs/ThinLTO.html Applies to clang only. Disabled when building with tests or sanitizers.  |
+| <a name="fail-on-unsupported-options-combination"></a>[`FAIL_ON_UNSUPPORTED_OPTIONS_COMBINATION`](https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L32) | `ON` | Stop/Fail CMake configuration if some ENABLE_XXX option is defined (either ON or OFF)   but is not possible to satisfy | If turned off: e.g. when ENABLE_FOO is ON, but FOO tool was not found, the CMake will continue.  |
+| <a name="glibc-compatibility"></a>[`GLIBC_COMPATIBILITY`](https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L159) | `ON` | Enable compatibility with older glibc libraries. | Only for Linux, x86_64. Implies `ENABLE_FASTMEMCPY`  |
+| <a name="linker-name"></a>[`LINKER_NAME`](https://github.com/clickhouse/clickhouse/blob/master/cmake/tools.cmake#L44) | `OFF` | Linker name or full path | Example values: `lld-10`, `gold`.  |
+| <a name="llvm-has-rtti"></a>[`LLVM_HAS_RTTI`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/llvm.cmake#L40) | `ON` | Enable if LLVM was build with RTTI enabled |  |
+| <a name="make-static-libraries"></a>[`MAKE_STATIC_LIBRARIES`](https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L91) | `USE_STATIC_LIBRARIES` | Disable to make shared libraries |  |
+| <a name="parallel-compile-jobs"></a>[`PARALLEL_COMPILE_JOBS`](https://github.com/clickhouse/clickhouse/blob/master/cmake/limit_jobs.cmake#L10) | `""` | Maximum number of concurrent compilation jobs | 1 if not set  |
+| <a name="parallel-link-jobs"></a>[`PARALLEL_LINK_JOBS`](https://github.com/clickhouse/clickhouse/blob/master/cmake/limit_jobs.cmake#L13) | `""` | Maximum number of concurrent link jobs | 1 if not set  |
+| <a name="sanitize"></a>[`SANITIZE`](https://github.com/clickhouse/clickhouse/blob/master/cmake/sanitize.cmake#L7) | `""` | Enable one of the code sanitizers | Possible values: - `address` (ASan) - `memory` (MSan) - `thread` (TSan) - `undefined` (UBSan) - "" (no sanitizing)  |
+| <a name="split-shared-libraries"></a>[`SPLIT_SHARED_LIBRARIES`](https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L96) | `OFF` | Keep all internal libraries as separate .so files | DEVELOPER ONLY. Faster linking if turned on.  |
+| <a name="strip-debug-symbols-functions"></a>[`STRIP_DEBUG_SYMBOLS_FUNCTIONS`](https://github.com/clickhouse/clickhouse/blob/master/src/Functions/CMakeLists.txt#L49) | `STRIP_DSF_DEFAULT` | Do not generate debugger info for ClickHouse functions | Provides faster linking and lower binary size. Tradeoff is the inability to debug some source files with e.g. gdb (empty stack frames and no local variables)."  |
+| <a name="unbundled"></a>[`UNBUNDLED`](https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L363) | `OFF` | Use system libraries instead of ones in contrib/ | We recommend avoiding this mode for production builds because we can't guarantee all needed libraries exist in your system. This mode exists for enthusiastic developers who are searching for trouble. Useful for maintainers of OS packages.  |
+| <a name="use-include-what-you-use"></a>[`USE_INCLUDE_WHAT_YOU_USE`](https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L418) | `OFF` | Automatically reduce unneeded includes in source code (external tool) | https://github.com/include-what-you-use/include-what-you-use  |
+| <a name="use-libcxx"></a>[`USE_LIBCXX`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/cxx.cmake#L1) | `NOT_UNBUNDLED` | Use libc++ and libc++abi instead of libstdc++ |  |
+| <a name="use-sentry"></a>[`USE_SENTRY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/sentry.cmake#L13) | `ENABLE_LIBRARIES` | Use Sentry |  |
+| <a name="use-simdjson"></a>[`USE_SIMDJSON`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/simdjson.cmake#L1) | `ENABLE_LIBRARIES` | Use simdjson |  |
+| <a name="use-snappy"></a>[`USE_SNAPPY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/snappy.cmake#L1) | `ENABLE_LIBRARIES` | Enable snappy library |  |
+| <a name="use-static-libraries"></a>[`USE_STATIC_LIBRARIES`](https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L90) | `ON` | Disable to use shared libraries |  |
+| <a name="use-unwind"></a>[`USE_UNWIND`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/unwind.cmake#L1) | `ENABLE_LIBRARIES` | Enable libunwind (better stacktraces) |  |
+| <a name="werror"></a>[`WERROR`](https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L373) | `OFF` | Enable -Werror compiler option | Using system libs can cause a lot of warnings in includes (on macro expansion).  |
+| <a name="weverything"></a>[`WEVERYTHING`](https://github.com/clickhouse/clickhouse/blob/master/cmake/warnings.cmake#L22) | `ON` | Enable -Weverything option with some exceptions. | Add some warnings that are not available even with -Wall -Wextra -Wpedantic. Intended for exploration of new compiler warnings that may be found useful. Applies to clang only  |
+| <a name="with-coverage"></a>[`WITH_COVERAGE`](https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L274) | `OFF` | Profile the resulting binary/binaries | Compiler-specific coverage flags e.g. -fcoverage-mapping for gcc  |
+
+## Developer's guide for adding new CMake options
+
+### Don't be obvious. Be informative.
+
+Bad:
+```cmake
+option (ENABLE_TESTS "Enables testing" OFF)
+```
+
+This description is quite useless as is neither gives the viewer any additional information nor explains the option purpose.
+
+Better:
+
+```cmake
+option(ENABLE_TESTS "Provide unit_test_dbms target with Google.test unit tests" OFF)
+```
+
+If the option's purpose can't be guessed by its name, or the purpose guess may be misleading, or option has some 
+pre-conditions, leave a comment above the `option()` line and explain what it does. 
+The best way would be linking the docs page (if it exists).
+The comment is parsed into a separate column (see below).
+
+Even better:
+
+```cmake
+# implies ${TESTS_ARE_ENABLED}
+# see tests/CMakeLists.txt for implementation detail.
+option(ENABLE_TESTS "Provide unit_test_dbms target with Google.test unit tests" OFF)
+```
+
+### If the option's state could produce unwanted (or unusual) result, explicitly warn the user.
+
+Suppose you have an option that may strip debug symbols from the ClickHouse's part.
+This can speed up the linking process, but produces a binary that cannot be debugged.
+In that case, prefer explicitly raising a warning telling the developer that he may be doing something wrong. 
+Also, such options should be disabled if applies.
+
+Bad:
+```cmake
+option(STRIP_DEBUG_SYMBOLS_FUNCTIONS
+    "Do not generate debugger info for ClickHouse functions.
+    ${STRIP_DSF_DEFAULT})
+
+if (STRIP_DEBUG_SYMBOLS_FUNCTIONS)
+    target_compile_options(clickhouse_functions PRIVATE "-g0")
+endif()
+
+```
+Better:
+
+```cmake
+# Provides faster linking and lower binary size.
+# Tradeoff is the inability to debug some source files with e.g. gdb
+# (empty stack frames and no local variables)."
+option(STRIP_DEBUG_SYMBOLS_FUNCTIONS
+    "Do not generate debugger info for ClickHouse functions."
+    ${STRIP_DSF_DEFAULT})
+
+if (STRIP_DEBUG_SYMBOLS_FUNCTIONS)
+    message(WARNING "Not generating debugger info for ClickHouse functions")
+    target_compile_options(clickhouse_functions PRIVATE "-g0")
+endif()
+```
+
+### In the option's description, explain WHAT the option does rather than WHY it does something.
+
+The WHY explanation should be placed in the comment.
+You may find that the option's name is self-descriptive.
+
+Bad:
+
+```cmake
+option(ENABLE_THINLTO "Enable Thin LTO. Only applicable for clang. It's also suppressed when building with tests or sanitizers." ON)
+```
+
+Better:
+
+```cmake
+# Only applicable for clang.
+# Turned off when building with tests or sanitizers.
+option(ENABLE_THINLTO "Clang-specific link time optimisation" ON).
+```
+
+### Don't assume other developers know as much as you do.
+
+In ClickHouse, there are many tools used that an ordinary developer may not know. If you are in doubt, give a link to
+the tool's docs. It won't take much of your time.
+
+Bad:
+
+```cmake
+option(ENABLE_THINLTO "Enable Thin LTO. Only applicable for clang. It's also suppressed when building with tests or sanitizers." ON)
+```
+
+Better (combined with the above hint):
+
+```cmake
+# https://clang.llvm.org/docs/ThinLTO.html
+# Only applicable for clang.
+# Turned off when building with tests or sanitizers.
+option(ENABLE_THINLTO "Clang-specific link time optimisation" ON).
+```
+
+Other example, bad:
+
+```cmake
+option (USE_INCLUDE_WHAT_YOU_USE "Use 'include-what-you-use' tool" OFF)
+```
+
+Better:
+
+```cmake
+# https://github.com/include-what-you-use/include-what-you-use
+option (USE_INCLUDE_WHAT_YOU_USE "Reduce unneeded #include s (external tool)" OFF)
+```
+
+### Prefer consistent default values.
+
+CMake allows you to pass a plethora of values representing boolean `true/false`, e.g. `1, ON, YES, ...`.
+Prefer the `ON/OFF` values, if possible.
diff --git a/docs/en/development/contrib.md b/docs/en/development/contrib.md
index 76a2f647231..64ca2387029 100644
--- a/docs/en/development/contrib.md
+++ b/docs/en/development/contrib.md
@@ -5,36 +5,87 @@ toc_title: Third-Party Libraries Used
 
 # Third-Party Libraries Used {#third-party-libraries-used}
 
-| Library             | License                                                                                                                                      |
-|---------------------|----------------------------------------------------------------------------------------------------------------------------------------------|
-| base64              | [BSD 2-Clause License](https://github.com/aklomp/base64/blob/a27c565d1b6c676beaf297fe503c4518185666f7/LICENSE)                               |
-| boost               | [Boost Software License 1.0](https://github.com/ClickHouse-Extras/boost-extra/blob/6883b40449f378019aec792f9983ce3afc7ff16e/LICENSE_1_0.txt) |
-| brotli              | [MIT](https://github.com/google/brotli/blob/master/LICENSE)                                                                                  |
-| capnproto           | [MIT](https://github.com/capnproto/capnproto/blob/master/LICENSE)                                                                            |
-| cctz                | [Apache License 2.0](https://github.com/google/cctz/blob/4f9776a310f4952454636363def82c2bf6641d5f/LICENSE.txt)                               |
-| double-conversion   | [BSD 3-Clause License](https://github.com/google/double-conversion/blob/cf2f0f3d547dc73b4612028a155b80536902ba02/LICENSE)                    |
-| FastMemcpy          | [MIT](https://github.com/ClickHouse/ClickHouse/blob/master/libs/libmemcpy/impl/LICENSE)                                                      |
-| googletest          | [BSD 3-Clause License](https://github.com/google/googletest/blob/master/LICENSE)                                                             |
-| h3                  | [Apache License 2.0](https://github.com/uber/h3/blob/master/LICENSE)                                                                         |
-| hyperscan           | [BSD 3-Clause License](https://github.com/intel/hyperscan/blob/master/LICENSE)                                                               |
-| libcxxabi           | [BSD + MIT](https://github.com/ClickHouse/ClickHouse/blob/master/libs/libglibc-compatibility/libcxxabi/LICENSE.TXT)                          |
-| libdivide           | [Zlib License](https://github.com/ClickHouse/ClickHouse/blob/master/contrib/libdivide/LICENSE.txt)                                           |
-| libgsasl            | [LGPL v2.1](https://github.com/ClickHouse-Extras/libgsasl/blob/3b8948a4042e34fb00b4fb987535dc9e02e39040/LICENSE)                             |
-| libhdfs3            | [Apache License 2.0](https://github.com/ClickHouse-Extras/libhdfs3/blob/bd6505cbb0c130b0db695305b9a38546fa880e5a/LICENSE.txt)                |
-| libmetrohash        | [Apache License 2.0](https://github.com/ClickHouse/ClickHouse/blob/master/contrib/libmetrohash/LICENSE)                                      |
-| libpcg-random       | [Apache License 2.0](https://github.com/ClickHouse/ClickHouse/blob/master/contrib/libpcg-random/LICENSE-APACHE.txt)                          |
-| libressl            | [OpenSSL License](https://github.com/ClickHouse-Extras/ssl/blob/master/COPYING)                                                              |
-| librdkafka          | [BSD 2-Clause License](https://github.com/edenhill/librdkafka/blob/363dcad5a23dc29381cc626620e68ae418b3af19/LICENSE)                         |
-| libwidechar_width  | [CC0 1.0 Universal](https://github.com/ClickHouse/ClickHouse/blob/master/libs/libwidechar_width/LICENSE)                                     |
-| llvm                | [BSD 3-Clause License](https://github.com/ClickHouse-Extras/llvm/blob/163def217817c90fb982a6daf384744d8472b92b/llvm/LICENSE.TXT)             |
-| lz4                 | [BSD 2-Clause License](https://github.com/lz4/lz4/blob/c10863b98e1503af90616ae99725ecd120265dfb/LICENSE)                                     |
-| mariadb-connector-c | [LGPL v2.1](https://github.com/ClickHouse-Extras/mariadb-connector-c/blob/3.1/COPYING.LIB)                                                   |
-| murmurhash          | [Public Domain](https://github.com/ClickHouse/ClickHouse/blob/master/contrib/murmurhash/LICENSE)                                             |
-| pdqsort             | [Zlib License](https://github.com/ClickHouse/ClickHouse/blob/master/contrib/pdqsort/license.txt)                                             |
-| poco                | [Boost Software License - Version 1.0](https://github.com/ClickHouse-Extras/poco/blob/fe5505e56c27b6ecb0dcbc40c49dc2caf4e9637f/LICENSE)      |
-| protobuf            | [BSD 3-Clause License](https://github.com/ClickHouse-Extras/protobuf/blob/12735370922a35f03999afff478e1c6d7aa917a4/LICENSE)                  |
-| re2                 | [BSD 3-Clause License](https://github.com/google/re2/blob/7cf8b88e8f70f97fd4926b56aa87e7f53b2717e0/LICENSE)                                  |
-| sentry-native       | [MIT License](https://github.com/getsentry/sentry-native/blob/master/LICENSE)                                                                 |
-| UnixODBC            | [LGPL v2.1](https://github.com/ClickHouse-Extras/UnixODBC/tree/b0ad30f7f6289c12b76f04bfb9d466374bb32168)                                     |
-| zlib-ng             | [Zlib License](https://github.com/ClickHouse-Extras/zlib-ng/blob/develop/LICENSE.md)                                                         |
-| zstd                | [BSD 3-Clause License](https://github.com/facebook/zstd/blob/dev/LICENSE)                                                                    |
+The list of third-party libraries can be obtained by the following query:
+
+```
+SELECT library_name, license_type, license_path FROM system.licenses ORDER BY library_name COLLATE 'en'
+```
+
+[Example](https://gh-api.clickhouse.tech/play?user=play#U0VMRUNUIGxpYnJhcnlfbmFtZSwgbGljZW5zZV90eXBlLCBsaWNlbnNlX3BhdGggRlJPTSBzeXN0ZW0ubGljZW5zZXMgT1JERVIgQlkgbGlicmFyeV9uYW1lIENPTExBVEUgJ2VuJw==)
+
+| library_name | license_type | license_path | 
+|:-|:-|:-|
+| abseil-cpp | Apache | /contrib/abseil-cpp/LICENSE |
+| AMQP-CPP | Apache | /contrib/AMQP-CPP/LICENSE |
+| arrow | Apache | /contrib/arrow/LICENSE.txt |
+| avro | Apache | /contrib/avro/LICENSE.txt |
+| aws | Apache | /contrib/aws/LICENSE.txt |
+| aws-c-common | Apache | /contrib/aws-c-common/LICENSE |
+| aws-c-event-stream | Apache | /contrib/aws-c-event-stream/LICENSE |
+| aws-checksums | Apache | /contrib/aws-checksums/LICENSE |
+| base64 | BSD 2-clause | /contrib/base64/LICENSE |
+| boost | Boost | /contrib/boost/LICENSE_1_0.txt |
+| boringssl | BSD | /contrib/boringssl/LICENSE |
+| brotli | MIT | /contrib/brotli/LICENSE |
+| capnproto | MIT | /contrib/capnproto/LICENSE |
+| cassandra | Apache | /contrib/cassandra/LICENSE.txt |
+| cctz | Apache | /contrib/cctz/LICENSE.txt |
+| cityhash102 | MIT | /contrib/cityhash102/COPYING |
+| cppkafka | BSD 2-clause | /contrib/cppkafka/LICENSE |
+| croaring | Apache | /contrib/croaring/LICENSE |
+| curl | Apache | /contrib/curl/docs/LICENSE-MIXING.md |
+| cyrus-sasl | BSD 2-clause | /contrib/cyrus-sasl/COPYING |
+| double-conversion | BSD 3-clause | /contrib/double-conversion/LICENSE |
+| dragonbox | Apache | /contrib/dragonbox/LICENSE-Apache2-LLVM |
+| fast_float | Apache | /contrib/fast_float/LICENSE |
+| fastops | MIT | /contrib/fastops/LICENSE |
+| flatbuffers | Apache | /contrib/flatbuffers/LICENSE.txt |
+| fmtlib | Unknown | /contrib/fmtlib/LICENSE.rst |
+| gcem | Apache | /contrib/gcem/LICENSE |
+| googletest | BSD 3-clause | /contrib/googletest/LICENSE |
+| grpc | Apache | /contrib/grpc/LICENSE |
+| h3 | Apache | /contrib/h3/LICENSE |
+| hyperscan | Boost | /contrib/hyperscan/LICENSE |
+| icu | Public Domain | /contrib/icu/icu4c/LICENSE |
+| icudata | Public Domain | /contrib/icudata/LICENSE |
+| jemalloc | BSD 2-clause | /contrib/jemalloc/COPYING |
+| krb5 | MIT | /contrib/krb5/src/lib/gssapi/LICENSE |
+| libc-headers | LGPL | /contrib/libc-headers/LICENSE |
+| libcpuid | BSD 2-clause | /contrib/libcpuid/COPYING |
+| libcxx | Apache | /contrib/libcxx/LICENSE.TXT |
+| libcxxabi | Apache | /contrib/libcxxabi/LICENSE.TXT |
+| libdivide | zLib | /contrib/libdivide/LICENSE.txt |
+| libfarmhash | MIT | /contrib/libfarmhash/COPYING |
+| libgsasl | LGPL | /contrib/libgsasl/LICENSE |
+| libhdfs3 | Apache | /contrib/libhdfs3/LICENSE.txt |
+| libmetrohash | Apache | /contrib/libmetrohash/LICENSE |
+| libpq | Unknown | /contrib/libpq/COPYRIGHT |
+| libpqxx | BSD 3-clause | /contrib/libpqxx/COPYING |
+| librdkafka | MIT | /contrib/librdkafka/LICENSE.murmur2 |
+| libunwind | Apache | /contrib/libunwind/LICENSE.TXT |
+| libuv | BSD | /contrib/libuv/LICENSE |
+| llvm | Apache | /contrib/llvm/llvm/LICENSE.TXT |
+| lz4 | BSD | /contrib/lz4/LICENSE |
+| mariadb-connector-c | LGPL | /contrib/mariadb-connector-c/COPYING.LIB |
+| miniselect | Boost | /contrib/miniselect/LICENSE_1_0.txt |
+| msgpack-c | Boost | /contrib/msgpack-c/LICENSE_1_0.txt |
+| murmurhash | Public Domain | /contrib/murmurhash/LICENSE |
+| NuRaft | Apache | /contrib/NuRaft/LICENSE |
+| openldap | Unknown | /contrib/openldap/LICENSE |
+| orc | Apache | /contrib/orc/LICENSE |
+| poco | Boost | /contrib/poco/LICENSE |
+| protobuf | BSD 3-clause | /contrib/protobuf/LICENSE |
+| rapidjson | MIT | /contrib/rapidjson/bin/jsonschema/LICENSE |
+| re2 | BSD 3-clause | /contrib/re2/LICENSE |
+| replxx | BSD 3-clause | /contrib/replxx/LICENSE.md |
+| rocksdb | BSD 3-clause | /contrib/rocksdb/LICENSE.leveldb |
+| sentry-native | MIT | /contrib/sentry-native/LICENSE |
+| simdjson | Apache | /contrib/simdjson/LICENSE |
+| snappy | Public Domain | /contrib/snappy/COPYING |
+| sparsehash-c11 | BSD 3-clause | /contrib/sparsehash-c11/LICENSE |
+| stats | Apache | /contrib/stats/LICENSE |
+| thrift | Apache | /contrib/thrift/LICENSE |
+| unixodbc | LGPL | /contrib/unixodbc/COPYING |
+| xz | Public Domain | /contrib/xz/COPYING |
+| zlib-ng | zLib | /contrib/zlib-ng/LICENSE.md |
+| zstd | BSD | /contrib/zstd/LICENSE |
diff --git a/docs/en/development/tests.md b/docs/en/development/tests.md
index fb453e55417..7547497b9af 100644
--- a/docs/en/development/tests.md
+++ b/docs/en/development/tests.md
@@ -233,7 +233,7 @@ Google OSS-Fuzz can be found at `docker/fuzz`.
 We also use simple fuzz test to generate random SQL queries and to check that the server doesn’t die executing them.
 You can find it in `00746_sql_fuzzy.pl`. This test should be run continuously (overnight and longer).
 
-We also use sophisticated AST-based query fuzzer that is able to find huge amount of corner cases. It does random permutations and substitutions in queries AST. It remembers AST nodes from previous tests to use them for fuzzing of subsequent tests while processing them in random order.
+We also use sophisticated AST-based query fuzzer that is able to find huge amount of corner cases. It does random permutations and substitutions in queries AST. It remembers AST nodes from previous tests to use them for fuzzing of subsequent tests while processing them in random order. You can learn more about this fuzzer in [this blog article](https://clickhouse.tech/blog/en/2021/fuzzing-clickhouse/).
 
 ## Stress test
 
diff --git a/docs/en/engines/database-engines/atomic.md b/docs/en/engines/database-engines/atomic.md
index f019b94a00b..d897631dd6e 100644
--- a/docs/en/engines/database-engines/atomic.md
+++ b/docs/en/engines/database-engines/atomic.md
@@ -3,15 +3,52 @@ toc_priority: 32
 toc_title: Atomic
 ---
 
-
 # Atomic {#atomic}
 
-It is supports non-blocking `DROP` and `RENAME TABLE` queries and atomic `EXCHANGE TABLES t1 AND t2` queries. Atomic database engine is used by default.
+It supports non-blocking [DROP TABLE](#drop-detach-table) and [RENAME TABLE](#rename-table) queries and atomic [EXCHANGE TABLES t1 AND t2](#exchange-tables) queries. `Atomic` database engine is used by default.
 
 ## Creating a Database {#creating-a-database}
 
-```sql
-CREATE DATABASE test ENGINE = Atomic;
+``` sql
+    CREATE DATABASE test[ ENGINE = Atomic];
 ```
 
-[Original article](https://clickhouse.tech/docs/en/engines/database_engines/atomic/) <!--hide-->
+## Specifics and recommendations {#specifics-and-recommendations}
+
+### Table UUID {#table-uuid}
+
+All tables in database `Atomic` have persistent [UUID](../../sql-reference/data-types/uuid.md) and store data in directory `/clickhouse_path/store/xxx/xxxyyyyy-yyyy-yyyy-yyyy-yyyyyyyyyyyy/`, where `xxxyyyyy-yyyy-yyyy-yyyy-yyyyyyyyyyyy` is UUID of the table. 
+Usually, the UUID is generated automatically, but the user can also explicitly specify the UUID in the same way when creating the table (this is not recommended). To display the `SHOW CREATE` query with the UUID you can use setting [show_table_uuid_in_table_create_query_if_not_nil](../../operations/settings/settings.md#show_table_uuid_in_table_create_query_if_not_nil). For example:
+
+```sql
+CREATE TABLE name UUID '28f1c61c-2970-457a-bffe-454156ddcfef' (n UInt64) ENGINE = ...;
+```
+### RENAME TABLE {#rename-table}
+
+`RENAME` queries are performed without changing UUID and moving table data. These queries do not wait for the completion of queries using the table and will be executed instantly.
+
+### DROP/DETACH TABLE {#drop-detach-table}
+
+On `DROP TABLE` no data is removed, database `Atomic` just marks table as dropped by moving metadata to `/clickhouse_path/metadata_dropped/` and notifies background thread. Delay before final table data deletion is specify by [database_atomic_delay_before_drop_table_sec](../../operations/server-configuration-parameters/settings.md#database_atomic_delay_before_drop_table_sec) setting.
+You can specify synchronous mode using `SYNC` modifier. Use the [database_atomic_wait_for_drop_and_detach_synchronously](../../operations/settings/settings.md#database_atomic_wait_for_drop_and_detach_synchronously) setting to do this. In this case `DROP` waits for running `SELECT`, `INSERT` and other queries which are using the table to finish. Table will be actually removed when it's not in use.
+
+### EXCHANGE TABLES {#exchange-tables}
+
+`EXCHANGE` query swaps tables atomically. So instead of this non-atomic operation:
+
+```sql
+RENAME TABLE new_table TO tmp, old_table TO new_table, tmp TO old_table;
+```
+you can use one atomic query:
+
+``` sql
+EXCHANGE TABLES new_table AND old_table;
+```
+
+### ReplicatedMergeTree in Atomic Database {#replicatedmergetree-in-atomic-database}
+
+For [ReplicatedMergeTree](../table-engines/mergetree-family/replication.md#table_engines-replication) tables is recomended do not specify parameters of engine - path in ZooKeeper and replica name. In this case will be used parameters of the configuration [default_replica_path](../../operations/server-configuration-parameters/settings.md#default_replica_path) and [default_replica_name](../../operations/server-configuration-parameters/settings.md#default_replica_name). If you want specify parameters of engine explicitly than recomended to use {uuid} macros. This is useful so that unique paths are automatically generated for each table in the ZooKeeper.
+
+## See Also
+
+-   [system.databases](../../operations/system-tables/databases.md) system table
diff --git a/docs/en/engines/database-engines/index.md b/docs/en/engines/database-engines/index.md
index 2db11998483..b6892099378 100644
--- a/docs/en/engines/database-engines/index.md
+++ b/docs/en/engines/database-engines/index.md
@@ -18,4 +18,8 @@ You can also use the following database engines:
 
 -   [Lazy](../../engines/database-engines/lazy.md)
 
+-   [Atomic](../../engines/database-engines/atomic.md)
+
+-   [PostgreSQL](../../engines/database-engines/postgresql.md)
+
 [Original article](https://clickhouse.tech/docs/en/database_engines/) <!--hide-->
diff --git a/docs/en/engines/database-engines/materialize-mysql.md b/docs/en/engines/database-engines/materialize-mysql.md
index 2e361cc82f0..69d3122c268 100644
--- a/docs/en/engines/database-engines/materialize-mysql.md
+++ b/docs/en/engines/database-engines/materialize-mysql.md
@@ -69,7 +69,7 @@ MySQL DDL queries are converted into the corresponding ClickHouse DDL queries ([
 
 - MySQL `INSERT` query is converted into `INSERT` with `_sign=1`.
 
-- MySQl `DELETE` query is converted into `INSERT` with `_sign=-1`. 
+- MySQL `DELETE` query is converted into `INSERT` with `_sign=-1`. 
 
 - MySQL `UPDATE` query is converted into `INSERT` with `_sign=-1` and `INSERT` with `_sign=1`.
 
diff --git a/docs/en/engines/database-engines/postgresql.md b/docs/en/engines/database-engines/postgresql.md
new file mode 100644
index 00000000000..1fa86b7ac21
--- /dev/null
+++ b/docs/en/engines/database-engines/postgresql.md
@@ -0,0 +1,138 @@
+---
+toc_priority: 35
+toc_title: PostgreSQL
+---
+
+# PostgreSQL {#postgresql}
+
+Allows to connect to databases on a remote [PostgreSQL](https://www.postgresql.org) server. Supports read and write operations (`SELECT` and `INSERT` queries) to exchange data between ClickHouse and PostgreSQL.
+
+Gives the real-time access to table list and table structure from remote PostgreSQL with the help of `SHOW TABLES` and `DESCRIBE TABLE` queries.
+
+Supports table structure modifications (`ALTER TABLE ... ADD|DROP COLUMN`). If `use_table_cache` parameter (see the Engine Parameters below) it set to `1`, the table structure is cached and not checked for being modified, but can be updated with `DETACH` and `ATTACH` queries.
+
+## Creating a Database {#creating-a-database}
+
+``` sql
+CREATE DATABASE test_database 
+ENGINE = PostgreSQL('host:port', 'database', 'user', 'password'[, `use_table_cache`]);
+```
+
+**Engine Parameters**
+
+-   `host:port` — PostgreSQL server address.
+-   `database` — Remote database name.
+-   `user` — PostgreSQL user.
+-   `password` — User password.
+-   `use_table_cache` —  Defines if the database table structure is cached or not. Optional. Default value: `0`.
+
+## Data Types Support {#data_types-support}
+
+| PostgerSQL       | ClickHouse                                                   |
+|------------------|--------------------------------------------------------------|
+| DATE             | [Date](../../sql-reference/data-types/date.md)               |
+| TIMESTAMP        | [DateTime](../../sql-reference/data-types/datetime.md)       |
+| REAL             | [Float32](../../sql-reference/data-types/float.md)           |
+| DOUBLE           | [Float64](../../sql-reference/data-types/float.md)           |
+| DECIMAL, NUMERIC | [Decimal](../../sql-reference/data-types/decimal.md)       |
+| SMALLINT         | [Int16](../../sql-reference/data-types/int-uint.md)          |
+| INTEGER          | [Int32](../../sql-reference/data-types/int-uint.md)          |
+| BIGINT           | [Int64](../../sql-reference/data-types/int-uint.md)          |
+| SERIAL           | [UInt32](../../sql-reference/data-types/int-uint.md)         |
+| BIGSERIAL        | [UInt64](../../sql-reference/data-types/int-uint.md)         |
+| TEXT, CHAR       | [String](../../sql-reference/data-types/string.md)           |
+| INTEGER          | Nullable([Int32](../../sql-reference/data-types/int-uint.md))|
+| ARRAY            | [Array](../../sql-reference/data-types/array.md)             |
+ 
+
+## Examples of Use {#examples-of-use}
+
+Database in ClickHouse, exchanging data with the PostgreSQL server:
+
+``` sql
+CREATE DATABASE test_database 
+ENGINE = PostgreSQL('postgres1:5432', 'test_database', 'postgres', 'mysecretpassword', 1);
+```
+
+``` sql
+SHOW DATABASES;
+```
+
+``` text
+┌─name──────────┐
+│ default       │
+│ test_database │
+│ system        │
+└───────────────┘
+```
+
+``` sql
+SHOW TABLES FROM test_database;
+```
+
+``` text
+┌─name───────┐
+│ test_table │
+└────────────┘
+```
+
+Reading data from the PostgreSQL table:
+
+``` sql
+SELECT * FROM test_database.test_table;
+```
+
+``` text
+┌─id─┬─value─┐
+│  1 │     2 │
+└────┴───────┘
+```
+
+Writing data to the PostgreSQL table:
+
+``` sql
+INSERT INTO test_database.test_table VALUES (3,4);
+SELECT * FROM test_database.test_table;
+```
+
+``` text
+┌─int_id─┬─value─┐
+│      1 │     2 │
+│      3 │     4 │
+└────────┴───────┘
+```
+
+Consider the table structure was modified in PostgreSQL: 
+
+``` sql
+postgre> ALTER TABLE test_table ADD COLUMN data Text
+```
+
+As the `use_table_cache` parameter was set to `1` when the database was created, the table structure in ClickHouse was cached and therefore not modified:
+
+``` sql
+DESCRIBE TABLE test_database.test_table;
+```
+``` text
+┌─name───┬─type──────────────┐
+│ id     │ Nullable(Integer) │
+│ value  │ Nullable(Integer) │
+└────────┴───────────────────┘
+```
+
+After detaching the table and attaching it again, the structure was updated:
+
+``` sql
+DETACH TABLE test_database.test_table;
+ATTACH TABLE test_database.test_table;
+DESCRIBE TABLE test_database.test_table;
+```
+``` text
+┌─name───┬─type──────────────┐
+│ id     │ Nullable(Integer) │
+│ value  │ Nullable(Integer) │
+│ data   │ Nullable(String)  │
+└────────┴───────────────────┘
+```
+
+[Original article](https://clickhouse.tech/docs/en/database-engines/postgresql/) <!--hide-->
diff --git a/docs/en/engines/table-engines/index.md b/docs/en/engines/table-engines/index.md
index 546557beb57..eb4fc583f88 100644
--- a/docs/en/engines/table-engines/index.md
+++ b/docs/en/engines/table-engines/index.md
@@ -47,12 +47,17 @@ Engines for communicating with other data storage and processing systems.
 
 Engines in the family:
 
--   [Kafka](../../engines/table-engines/integrations/kafka.md#kafka)
--   [MySQL](../../engines/table-engines/integrations/mysql.md#mysql)
--   [ODBC](../../engines/table-engines/integrations/odbc.md#table-engine-odbc)
--   [JDBC](../../engines/table-engines/integrations/jdbc.md#table-engine-jdbc)
--   [HDFS](../../engines/table-engines/integrations/hdfs.md#hdfs)
--   [S3](../../engines/table-engines/integrations/s3.md#table_engines-s3)
+
+-   [ODBC](../../engines/table-engines/integrations/odbc.md)
+-   [JDBC](../../engines/table-engines/integrations/jdbc.md)
+-   [MySQL](../../engines/table-engines/integrations/mysql.md)
+-   [MongoDB](../../engines/table-engines/integrations/mongodb.md)
+-   [HDFS](../../engines/table-engines/integrations/hdfs.md)
+-   [S3](../../engines/table-engines/integrations/s3.md)
+-   [Kafka](../../engines/table-engines/integrations/kafka.md)
+-   [EmbeddedRocksDB](../../engines/table-engines/integrations/embedded-rocksdb.md)
+-   [RabbitMQ](../../engines/table-engines/integrations/rabbitmq.md)
+-   [PostgreSQL](../../engines/table-engines/integrations/postgresql.md)
 
 ### Special Engines {#special-engines}
 
diff --git a/docs/en/engines/table-engines/integrations/embedded-rocksdb.md b/docs/en/engines/table-engines/integrations/embedded-rocksdb.md
index 6e864751cc3..88c8973eeab 100644
--- a/docs/en/engines/table-engines/integrations/embedded-rocksdb.md
+++ b/docs/en/engines/table-engines/integrations/embedded-rocksdb.md
@@ -1,5 +1,5 @@
 ---
-toc_priority: 6
+toc_priority: 9
 toc_title: EmbeddedRocksDB
 ---
 
@@ -39,4 +39,4 @@ ENGINE = EmbeddedRocksDB
 PRIMARY KEY key
 ```
 
-[Original article](https://clickhouse.tech/docs/en/operations/table_engines/embedded-rocksdb/) <!--hide-->
+[Original article](https://clickhouse.tech/docs/en/engines/table-engines/integrations/embedded-rocksdb/) <!--hide-->
diff --git a/docs/en/engines/table-engines/integrations/hdfs.md b/docs/en/engines/table-engines/integrations/hdfs.md
index 5c36e3f1c21..cf4bb5ecbf7 100644
--- a/docs/en/engines/table-engines/integrations/hdfs.md
+++ b/docs/en/engines/table-engines/integrations/hdfs.md
@@ -1,11 +1,11 @@
 ---
-toc_priority: 4
+toc_priority: 6
 toc_title: HDFS
 ---
 
 # HDFS {#table_engines-hdfs}
 
-This engine provides integration with [Apache Hadoop](https://en.wikipedia.org/wiki/Apache_Hadoop) ecosystem by allowing to manage data on [HDFS](https://hadoop.apache.org/docs/current/hadoop-project-dist/hadoop-hdfs/HdfsDesign.html)via ClickHouse. This engine is similar
+This engine provides integration with [Apache Hadoop](https://en.wikipedia.org/wiki/Apache_Hadoop) ecosystem by allowing to manage data on [HDFS](https://hadoop.apache.org/docs/current/hadoop-project-dist/hadoop-hdfs/HdfsDesign.html) via ClickHouse. This engine is similar
 to the [File](../../../engines/table-engines/special/file.md#table_engines-file) and [URL](../../../engines/table-engines/special/url.md#table_engines-url) engines, but provides Hadoop-specific features.
 
 ## Usage {#usage}
@@ -174,7 +174,7 @@ Similar to GraphiteMergeTree, the HDFS engine supports extended configuration us
 | dfs\_domain\_socket\_path                             | ""                      |
 
 
-[HDFS Configuration Reference ](https://hawq.apache.org/docs/userguide/2.3.0.0-incubating/reference/HDFSConfigurationParameterReference.html) might explain some parameters.
+[HDFS Configuration Reference](https://hawq.apache.org/docs/userguide/2.3.0.0-incubating/reference/HDFSConfigurationParameterReference.html) might explain some parameters.
 
 
 #### ClickHouse extras {#clickhouse-extras}
@@ -185,7 +185,6 @@ Similar to GraphiteMergeTree, the HDFS engine supports extended configuration us
 |hadoop\_kerberos\_kinit\_command                       | kinit                   |
 
 #### Limitations {#limitations}
-
   * hadoop\_security\_kerberos\_ticket\_cache\_path can be global only, not user specific
 
 ## Kerberos support {#kerberos-support}
@@ -207,4 +206,4 @@ If hadoop\_kerberos\_keytab, hadoop\_kerberos\_principal or hadoop\_kerberos\_ki
 
 -   [Virtual columns](../../../engines/table-engines/index.md#table_engines-virtual_columns)
 
-[Original article](https://clickhouse.tech/docs/en/operations/table_engines/hdfs/) <!--hide-->
+[Original article](https://clickhouse.tech/docs/en/engines/table-engines/integrations/hdfs/) <!--hide-->
diff --git a/docs/en/engines/table-engines/integrations/index.md b/docs/en/engines/table-engines/integrations/index.md
index 288c9c3cd56..eb1c5411e18 100644
--- a/docs/en/engines/table-engines/integrations/index.md
+++ b/docs/en/engines/table-engines/integrations/index.md
@@ -1,6 +1,6 @@
 ---
 toc_folder_title: Integrations
-toc_priority: 30
+toc_priority: 1
 ---
 
 # Table Engines for Integrations {#table-engines-for-integrations}
@@ -18,3 +18,4 @@ List of supported integrations:
 -   [Kafka](../../../engines/table-engines/integrations/kafka.md)
 -   [EmbeddedRocksDB](../../../engines/table-engines/integrations/embedded-rocksdb.md)
 -   [RabbitMQ](../../../engines/table-engines/integrations/rabbitmq.md)
+-   [PostgreSQL](../../../engines/table-engines/integrations/postgresql.md)
diff --git a/docs/en/engines/table-engines/integrations/jdbc.md b/docs/en/engines/table-engines/integrations/jdbc.md
index 2144be9f1e3..82efb842ae7 100644
--- a/docs/en/engines/table-engines/integrations/jdbc.md
+++ b/docs/en/engines/table-engines/integrations/jdbc.md
@@ -1,5 +1,5 @@
 ---
-toc_priority: 2
+toc_priority: 3
 toc_title: JDBC
 ---
 
@@ -85,4 +85,4 @@ FROM jdbc_table
 
 -   [JDBC table function](../../../sql-reference/table-functions/jdbc.md).
 
-[Original article](https://clickhouse.tech/docs/en/operations/table_engines/jdbc/) <!--hide-->
+[Original article](https://clickhouse.tech/docs/en/engines/table-engines/integrations/jdbc/) <!--hide-->
diff --git a/docs/en/engines/table-engines/integrations/kafka.md b/docs/en/engines/table-engines/integrations/kafka.md
index c519d6bb136..2eebf5bdb92 100644
--- a/docs/en/engines/table-engines/integrations/kafka.md
+++ b/docs/en/engines/table-engines/integrations/kafka.md
@@ -1,5 +1,5 @@
 ---
-toc_priority: 5
+toc_priority: 8
 toc_title: Kafka
 ---
 
@@ -38,20 +38,20 @@ SETTINGS
 
 Required parameters:
 
--   `kafka_broker_list` – A comma-separated list of brokers (for example, `localhost:9092`).
--   `kafka_topic_list` – A list of Kafka topics.
--   `kafka_group_name` – A group of Kafka consumers. Reading margins are tracked for each group separately. If you don’t want messages to be duplicated in the cluster, use the same group name everywhere.
--   `kafka_format` – Message format. Uses the same notation as the SQL `FORMAT` function, such as `JSONEachRow`. For more information, see the [Formats](../../../interfaces/formats.md) section.
+-   `kafka_broker_list` — A comma-separated list of brokers (for example, `localhost:9092`).
+-   `kafka_topic_list` — A list of Kafka topics.
+-   `kafka_group_name` — A group of Kafka consumers. Reading margins are tracked for each group separately. If you don’t want messages to be duplicated in the cluster, use the same group name everywhere.
+-   `kafka_format` — Message format. Uses the same notation as the SQL `FORMAT` function, such as `JSONEachRow`. For more information, see the [Formats](../../../interfaces/formats.md) section.
 
 Optional parameters:
 
--   `kafka_row_delimiter` – Delimiter character, which ends the message.
--   `kafka_schema` – Parameter that must be used if the format requires a schema definition. For example, [Cap’n Proto](https://capnproto.org/) requires the path to the schema file and the name of the root `schema.capnp:Message` object.
--   `kafka_num_consumers` – The number of consumers per table. Default: `1`. Specify more consumers if the throughput of one consumer is insufficient. The total number of consumers should not exceed the number of partitions in the topic, since only one consumer can be assigned per partition.
--   `kafka_max_block_size` - The maximum batch size (in messages) for poll (default: `max_block_size`).
--   `kafka_skip_broken_messages` – Kafka message parser tolerance to schema-incompatible messages per block. Default: `0`. If `kafka_skip_broken_messages = N` then the engine skips *N* Kafka messages that cannot be parsed (a message equals a row of data).
--   `kafka_commit_every_batch` - Commit every consumed and handled batch instead of a single commit after writing a whole block (default: `0`).
--   `kafka_thread_per_consumer` - Provide independent thread for each consumer (default: `0`). When enabled, every consumer flush the data independently, in parallel (otherwise - rows from several consumers squashed to form one block).
+-   `kafka_row_delimiter` — Delimiter character, which ends the message.
+-   `kafka_schema` — Parameter that must be used if the format requires a schema definition. For example, [Cap’n Proto](https://capnproto.org/) requires the path to the schema file and the name of the root `schema.capnp:Message` object.
+-   `kafka_num_consumers` — The number of consumers per table. Default: `1`. Specify more consumers if the throughput of one consumer is insufficient. The total number of consumers should not exceed the number of partitions in the topic, since only one consumer can be assigned per partition.
+-   `kafka_max_block_size` — The maximum batch size (in messages) for poll (default: `max_block_size`).
+-   `kafka_skip_broken_messages` — Kafka message parser tolerance to schema-incompatible messages per block. Default: `0`. If `kafka_skip_broken_messages = N` then the engine skips *N* Kafka messages that cannot be parsed (a message equals a row of data).
+-   `kafka_commit_every_batch` — Commit every consumed and handled batch instead of a single commit after writing a whole block (default: `0`).
+-   `kafka_thread_per_consumer` — Provide independent thread for each consumer (default: `0`). When enabled, every consumer flush the data independently, in parallel (otherwise — rows from several consumers squashed to form one block).
 
 Examples:
 
@@ -194,4 +194,4 @@ Example:
 -   [Virtual columns](../../../engines/table-engines/index.md#table_engines-virtual_columns)
 -   [background_schedule_pool_size](../../../operations/settings/settings.md#background_schedule_pool_size)
 
-[Original article](https://clickhouse.tech/docs/en/operations/table_engines/kafka/) <!--hide-->
+[Original article](https://clickhouse.tech/docs/en/engines/table-engines/integrations/kafka/) <!--hide-->
diff --git a/docs/en/engines/table-engines/integrations/mongodb.md b/docs/en/engines/table-engines/integrations/mongodb.md
index e648a13b5e0..a378ab03f55 100644
--- a/docs/en/engines/table-engines/integrations/mongodb.md
+++ b/docs/en/engines/table-engines/integrations/mongodb.md
@@ -1,5 +1,5 @@
 ---
-toc_priority: 7
+toc_priority: 5
 toc_title: MongoDB
 ---
 
@@ -54,4 +54,4 @@ SELECT COUNT() FROM mongo_table;
 └─────────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/operations/table_engines/integrations/mongodb/) <!--hide-->
+[Original article](https://clickhouse.tech/docs/en/engines/table-engines/integrations/mongodb/) <!--hide-->
diff --git a/docs/en/engines/table-engines/integrations/mysql.md b/docs/en/engines/table-engines/integrations/mysql.md
index 2cb1facce91..3847e7a9e0e 100644
--- a/docs/en/engines/table-engines/integrations/mysql.md
+++ b/docs/en/engines/table-engines/integrations/mysql.md
@@ -1,5 +1,5 @@
 ---
-toc_priority: 3
+toc_priority: 4
 toc_title: MySQL
 ---
 
@@ -24,6 +24,7 @@ The table structure can differ from the original MySQL table structure:
 
 -   Column names should be the same as in the original MySQL table, but you can use just some of these columns and in any order.
 -   Column types may differ from those in the original MySQL table. ClickHouse tries to [cast](../../../sql-reference/functions/type-conversion-functions.md#type_conversion_function-cast) values to the ClickHouse data types.
+-   Setting `external_table_functions_use_nulls` defines how to handle Nullable columns. Default is true, if false - table function will not make nullable columns and will insert default values instead of nulls. This is also applicable for null values inside array data types.
 
 **Engine Parameters**
 
@@ -100,4 +101,4 @@ SELECT * FROM mysql_table
 -   [The ‘mysql’ table function](../../../sql-reference/table-functions/mysql.md)
 -   [Using MySQL as a source of external dictionary](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md#dicts-external_dicts_dict_sources-mysql)
 
-[Original article](https://clickhouse.tech/docs/en/operations/table_engines/mysql/) <!--hide-->
+[Original article](https://clickhouse.tech/docs/en/engines/table-engines/integrations/mysql/) <!--hide-->
diff --git a/docs/en/engines/table-engines/integrations/odbc.md b/docs/en/engines/table-engines/integrations/odbc.md
index fffc125b0ff..26bfb6aeb0d 100644
--- a/docs/en/engines/table-engines/integrations/odbc.md
+++ b/docs/en/engines/table-engines/integrations/odbc.md
@@ -1,5 +1,5 @@
 ---
-toc_priority: 1
+toc_priority: 2
 toc_title: ODBC
 ---
 
@@ -29,6 +29,7 @@ The table structure can differ from the source table structure:
 
 -   Column names should be the same as in the source table, but you can use just some of these columns and in any order.
 -   Column types may differ from those in the source table. ClickHouse tries to [cast](../../../sql-reference/functions/type-conversion-functions.md#type_conversion_function-cast) values to the ClickHouse data types.
+-   Setting `external_table_functions_use_nulls` defines how to handle Nullable columns. Default is true, if false - table function will not make nullable columns and will insert default values instead of nulls. This is also applicable for null values inside array data types.
 
 **Engine Parameters**
 
@@ -127,4 +128,4 @@ SELECT * FROM odbc_t
 -   [ODBC external dictionaries](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md#dicts-external_dicts_dict_sources-odbc)
 -   [ODBC table function](../../../sql-reference/table-functions/odbc.md)
 
-[Original article](https://clickhouse.tech/docs/en/operations/table_engines/odbc/) <!--hide-->
+[Original article](https://clickhouse.tech/docs/en/engines/table-engines/integrations/odbc/) <!--hide-->
diff --git a/docs/en/engines/table-engines/integrations/postgresql.md b/docs/en/engines/table-engines/integrations/postgresql.md
new file mode 100644
index 00000000000..4474b764d2e
--- /dev/null
+++ b/docs/en/engines/table-engines/integrations/postgresql.md
@@ -0,0 +1,145 @@
+---
+toc_priority: 11
+toc_title: PostgreSQL
+---
+
+# PostgreSQL {#postgresql}
+
+The PostgreSQL engine allows to perform `SELECT` and `INSERT` queries on data that is stored on a remote PostgreSQL server.
+
+## Creating a Table {#creating-a-table}
+
+``` sql
+CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
+(
+    name1 [type1] [DEFAULT|MATERIALIZED|ALIAS expr1] [TTL expr1],
+    name2 [type2] [DEFAULT|MATERIALIZED|ALIAS expr2] [TTL expr2],
+    ...
+) ENGINE = PostgreSQL('host:port', 'database', 'table', 'user', 'password'[, `schema`]);
+```
+
+See a detailed description of the [CREATE TABLE](../../../sql-reference/statements/create/table.md#create-table-query) query.
+
+The table structure can differ from the original PostgreSQL table structure:
+
+-   Column names should be the same as in the original PostgreSQL table, but you can use just some of these columns and in any order.
+-   Column types may differ from those in the original PostgreSQL table. ClickHouse tries to [cast](../../../sql-reference/functions/type-conversion-functions.md#type_conversion_function-cast) values to the ClickHouse data types.
+-   Setting `external_table_functions_use_nulls` defines how to handle Nullable columns. Default is 1, if 0 - table function will not make nullable columns and will insert default values instead of nulls. This is also applicable for null values inside array data types.
+
+**Engine Parameters**
+
+-   `host:port` — PostgreSQL server address.
+-   `database` — Remote database name.
+-   `table` — Remote table name.
+-   `user` — PostgreSQL user.
+-   `password` — User password.
+-   `schema` — Non-default table schema. Optional.
+
+## Implementation Details {#implementation-details}
+
+`SELECT` queries on PostgreSQL side run as `COPY (SELECT ...) TO STDOUT` inside read-only PostgreSQL transaction with commit after each `SELECT` query.
+
+Simple `WHERE` clauses such as `=`, `!=`, `>`, `>=`, `<`, `<=`, and `IN` are executed on the PostgreSQL server.
+
+All joins, aggregations, sorting, `IN [ array ]` conditions and the `LIMIT` sampling constraint are executed in ClickHouse only after the query to PostgreSQL finishes.
+
+`INSERT` queries on PostgreSQL side run as `COPY "table_name" (field1, field2, ... fieldN) FROM STDIN` inside PostgreSQL transaction with auto-commit after each `INSERT` statement.
+
+PostgreSQL `Array` types are converted into ClickHouse arrays.
+
+!!! info "Note"
+    Be careful - in PostgreSQL an array data, created like a `type_name[]`, may contain multi-dimensional arrays of different dimensions in different table rows in same column. But in ClickHouse it is only allowed to have multidimensional arrays of the same count of dimensions in all table rows in same column.
+
+Replicas priority for PostgreSQL dictionary source is supported. The bigger the number in map, the less the priority. The highest priority is `0`. 
+
+In the example below replica `example01-1` has the highest priority:
+
+```xml
+<postgresql>
+    <port>5432</port>
+    <user>clickhouse</user>
+    <password>qwerty</password>
+    <replica>
+        <host>example01-1</host>
+        <priority>1</priority>
+    </replica>
+    <replica>
+        <host>example01-2</host>
+        <priority>2</priority>
+    </replica>
+    <db>db_name</db>
+    <table>table_name</table>
+    <where>id=10</where>
+    <invalidate_query>SQL_QUERY</invalidate_query>
+</postgresql>
+</source>
+```
+
+## Usage Example {#usage-example}
+
+Table in PostgreSQL:
+
+``` text
+postgres=# CREATE TABLE "public"."test" (
+"int_id" SERIAL,
+"int_nullable" INT NULL DEFAULT NULL,
+"float" FLOAT NOT NULL,
+"str" VARCHAR(100) NOT NULL DEFAULT '',
+"float_nullable" FLOAT NULL DEFAULT NULL,
+PRIMARY KEY (int_id));
+
+CREATE TABLE
+
+postgres=# INSERT INTO test (int_id, str, "float") VALUES (1,'test',2);
+INSERT 0 1
+
+postgresql> SELECT * FROM test;
+  int_id | int_nullable | float | str  | float_nullable
+ --------+--------------+-------+------+----------------
+       1 |              |     2 | test |
+ (1 row)
+```
+
+Table in ClickHouse, retrieving data from the PostgreSQL table created above:
+
+``` sql
+CREATE TABLE default.postgresql_table
+(
+    `float_nullable` Nullable(Float32),
+    `str` String,
+    `int_id` Int32
+)
+ENGINE = PostgreSQL('localhost:5432', 'public', 'test', 'postges_user', 'postgres_password');
+```
+
+``` sql
+SELECT * FROM postgresql_table WHERE str IN ('test');
+```
+
+``` text
+┌─float_nullable─┬─str──┬─int_id─┐
+│           ᴺᵁᴸᴸ │ test │      1 │
+└────────────────┴──────┴────────┘
+```
+
+Using Non-default Schema:
+
+```text
+postgres=# CREATE SCHEMA "nice.schema";
+
+postgres=# CREATE TABLE "nice.schema"."nice.table" (a integer);
+
+postgres=# INSERT INTO "nice.schema"."nice.table" SELECT i FROM generate_series(0, 99) as t(i)
+```
+
+```sql
+CREATE TABLE pg_table_schema_with_dots (a UInt32)
+        ENGINE PostgreSQL('localhost:5432', 'clickhouse', 'nice.table', 'postgrsql_user', 'password', 'nice.schema');
+```
+
+**See Also**
+
+-   [The `postgresql` table function](../../../sql-reference/table-functions/postgresql.md)
+-   [Using PostgreSQL as a source of external dictionary](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md#dicts-external_dicts_dict_sources-postgresql)
+
+[Original article](https://clickhouse.tech/docs/en/engines/table-engines/integrations/postgresql/) <!--hide-->
diff --git a/docs/en/engines/table-engines/integrations/rabbitmq.md b/docs/en/engines/table-engines/integrations/rabbitmq.md
index 4a0550275ca..5fb9ce5b151 100644
--- a/docs/en/engines/table-engines/integrations/rabbitmq.md
+++ b/docs/en/engines/table-engines/integrations/rabbitmq.md
@@ -1,5 +1,5 @@
 ---
-toc_priority: 6
+toc_priority: 10
 toc_title: RabbitMQ
 ---
 
@@ -163,3 +163,5 @@ Example:
 -   `_redelivered` - `redelivered` flag of the message.
 -   `_message_id` - messageID of the received message; non-empty if was set, when message was published.
 -   `_timestamp` - timestamp of the received message; non-empty if was set, when message was published.
+
+[Original article](https://clickhouse.tech/docs/en/engines/table-engines/integrations/rabbitmq/) <!--hide-->
diff --git a/docs/en/engines/table-engines/integrations/s3.md b/docs/en/engines/table-engines/integrations/s3.md
index 5858a0803e6..6592f8b9752 100644
--- a/docs/en/engines/table-engines/integrations/s3.md
+++ b/docs/en/engines/table-engines/integrations/s3.md
@@ -1,52 +1,58 @@
 ---
-toc_priority: 4
+toc_priority: 7
 toc_title: S3
 ---
 
-# S3 {#table_engines-s3}
+# S3 Table Engine {#table-engine-s3}
 
-This engine provides integration with [Amazon S3](https://aws.amazon.com/s3/) ecosystem. This engine is similar
-to the [HDFS](../../../engines/table-engines/special/file.md#table_engines-hdfs) engine, but provides S3-specific features.
+This engine provides integration with [Amazon S3](https://aws.amazon.com/s3/) ecosystem. This engine is similar to the [HDFS](../../../engines/table-engines/special/file.md#table_engines-hdfs) engine, but provides S3-specific features.
 
-## Usage {#usage}
+## Create Table {#creating-a-table}
 
 ``` sql
+CREATE TABLE s3_engine_table (name String, value UInt32) 
 ENGINE = S3(path, [aws_access_key_id, aws_secret_access_key,] format, structure, [compression])
 ```
 
-**Input parameters**
+**Engine parameters**
 
--   `path` — Bucket url with path to file. Supports following wildcards in readonly mode: *, ?, {abc,def} and {N..M} where N, M — numbers, `’abc’, ‘def’ — strings.
+-   `path` — Bucket url with path to file. Supports following wildcards in readonly mode: `*`, `?`, `{abc,def}` and `{N..M}` where `N`, `M` — numbers, `'abc'`, `'def'` — strings. For more information see [below](#wildcards-in-path).
 -   `format` — The [format](../../../interfaces/formats.md#formats) of the file.
 -   `structure` — Structure of the table. Format `'column1_name column1_type, column2_name column2_type, ...'`.
--   `compression` — Parameter is optional. Supported values: none, gzip/gz, brotli/br, xz/LZMA, zstd/zst. By default, it will autodetect compression by file extension.
+-   `compression` — Compression type. Supported values: `none`, `gzip/gz`, `brotli/br`, `xz/LZMA`, `zstd/zst`. Parameter is optional. By default, it will autodetect compression by file extension.
 
-**Example:**
+**Example**
 
-**1.** Set up the `s3_engine_table` table:
+1. Set up the `s3_engine_table` table:
 
 ``` sql
-CREATE TABLE s3_engine_table (name String, value UInt32) ENGINE=S3('https://storage.yandexcloud.net/my-test-bucket-768/test-data.csv.gz', 'CSV', 'name String, value UInt32', 'gzip')
+CREATE TABLE s3_engine_table (name String, value UInt32) ENGINE=S3('https://storage.yandexcloud.net/my-test-bucket-768/test-data.csv.gz', 'CSV', 'name String, value UInt32', 'gzip');
 ```
 
-**2.** Fill file:
+2. Fill file:
 
 ``` sql
-INSERT INTO s3_engine_table VALUES ('one', 1), ('two', 2), ('three', 3)
+INSERT INTO s3_engine_table VALUES ('one', 1), ('two', 2), ('three', 3);
 ```
 
-**3.** Query the data:
+3. Query the data:
 
 ``` sql
-SELECT * FROM s3_engine_table LIMIT 2
+SELECT * FROM s3_engine_table LIMIT 2;
 ```
 
-``` text
+```text
 ┌─name─┬─value─┐
 │ one  │     1 │
 │ two  │     2 │
 └──────┴───────┘
 ```
+## Virtual columns {#virtual-columns}
+
+-   `_path` — Path to the file.
+-   `_file` — Name of the file.
+
+For more information about virtual columns see [here](../../../engines/table-engines/index.md#table_engines-virtual_columns).
 
 ## Implementation Details {#implementation-details}
 
@@ -56,9 +62,9 @@ SELECT * FROM s3_engine_table LIMIT 2
     -   Indexes.
     -   Replication.
 
-**Globs in path**
+## Wildcards In Path {#wildcards-in-path}
 
-Multiple path components can have globs. For being processed file should exist and match to the whole path pattern. Listing of files determines during `SELECT` (not at `CREATE` moment).
+`path` argument can specify multiple files using bash-like wildcards. For being processed file should exist and match to the whole path pattern. Listing of files is determined during `SELECT` (not at `CREATE` moment).
 
 -   `*` — Substitutes any number of any characters except `/` including empty string.
 -   `?` — Substitutes any single character.
@@ -69,7 +75,7 @@ Constructions with `{}` are similar to the [remote](../../../sql-reference/table
 
 **Example**
 
-1. Suppose we have several files in TSV format with the following URIs on HDFS:
+1. Suppose we have several files in CSV format with the following URIs on S3:
 
 -   ‘https://storage.yandexcloud.net/my-test-bucket-768/some_prefix/some_file_1.csv’
 -   ‘https://storage.yandexcloud.net/my-test-bucket-768/some_prefix/some_file_2.csv’
@@ -78,35 +84,34 @@ Constructions with `{}` are similar to the [remote](../../../sql-reference/table
 -   ‘https://storage.yandexcloud.net/my-test-bucket-768/another_prefix/some_file_2.csv’
 -   ‘https://storage.yandexcloud.net/my-test-bucket-768/another_prefix/some_file_3.csv’
 
-2. There are several ways to make a table consisting of all six files:
+There are several ways to make a table consisting of all six files:
 
-<!-- -->
+The first way:
 
 ``` sql
-CREATE TABLE table_with_range (name String, value UInt32) ENGINE = S3('https://storage.yandexcloud.net/my-test-bucket-768/{some,another}_prefix/some_file_{1..3}', 'CSV')
+CREATE TABLE table_with_range (name String, value UInt32) ENGINE = S3('https://storage.yandexcloud.net/my-test-bucket-768/{some,another}_prefix/some_file_{1..3}', 'CSV');
 ```
 
-3. Another way:
+Another way:
 
 ``` sql
-CREATE TABLE table_with_question_mark (name String, value UInt32) ENGINE = S3('https://storage.yandexcloud.net/my-test-bucket-768/{some,another}_prefix/some_file_?', 'CSV')
+CREATE TABLE table_with_question_mark (name String, value UInt32) ENGINE = S3('https://storage.yandexcloud.net/my-test-bucket-768/{some,another}_prefix/some_file_?', 'CSV');
 ```
 
-4. Table consists of all the files in both directories (all files should satisfy format and schema described in query):
+Table consists of all the files in both directories (all files should satisfy format and schema described in query):
 
 ``` sql
-CREATE TABLE table_with_asterisk (name String, value UInt32) ENGINE = S3('https://storage.yandexcloud.net/my-test-bucket-768/{some,another}_prefix/*', 'CSV')
+CREATE TABLE table_with_asterisk (name String, value UInt32) ENGINE = S3('https://storage.yandexcloud.net/my-test-bucket-768/{some,another}_prefix/*', 'CSV');
 ```
 
-!!! warning "Warning"
-    If the listing of files contains number ranges with leading zeros, use the construction with braces for each digit separately or use `?`.
+If the listing of files contains number ranges with leading zeros, use the construction with braces for each digit separately or use `?`.
 
 **Example**
 
 Create table with files named `file-000.csv`, `file-001.csv`, … , `file-999.csv`:
 
 ``` sql
-CREATE TABLE big_table (name String, value UInt32) ENGINE = S3('https://storage.yandexcloud.net/my-test-bucket-768/big_prefix/file-{000..999}.csv', 'CSV')
+CREATE TABLE big_table (name String, value UInt32) ENGINE = S3('https://storage.yandexcloud.net/my-test-bucket-768/big_prefix/file-{000..999}.csv', 'CSV');
 ```
 
 ## Virtual Columns {#virtual-columns}
@@ -122,35 +127,82 @@ CREATE TABLE big_table (name String, value UInt32) ENGINE = S3('https://storage.
 
 The following settings can be set before query execution or placed into configuration file.
 
--   `s3_max_single_part_upload_size` — Default value is `64Mb`. The maximum size of object to upload using singlepart upload to S3.
--   `s3_min_upload_part_size` — Default value is `512Mb`. The minimum size of part to upload during multipart upload to [S3 Multipart upload](https://docs.aws.amazon.com/AmazonS3/latest/dev/uploadobjusingmpu.html).
--   `s3_max_redirects` — Default value is `10`. Max number of S3 redirects hops allowed.
+-   `s3_max_single_part_upload_size` — The maximum size of object to upload using singlepart upload to S3. Default value is `64Mb`.
+-   `s3_min_upload_part_size` — The minimum size of part to upload during multipart upload to [S3 Multipart upload](https://docs.aws.amazon.com/AmazonS3/latest/dev/uploadobjusingmpu.html). Default value is `512Mb`.
+-   `s3_max_redirects` — Max number of S3 redirects hops allowed. Default value is `10`.
 
 Security consideration: if malicious user can specify arbitrary S3 URLs, `s3_max_redirects` must be set to zero to avoid [SSRF](https://en.wikipedia.org/wiki/Server-side_request_forgery) attacks; or alternatively, `remote_host_filter` must be specified in server configuration.
 
-### Endpoint-based settings {#endpointsettings}
+## Endpoint-based Settings {#endpoint-settings}
 
 The following settings can be specified in configuration file for given endpoint (which will be matched by exact prefix of a URL):
 
--   `endpoint` — Mandatory. Specifies prefix of an endpoint.
--   `access_key_id` and `secret_access_key` — Optional. Specifies credentials to use with given endpoint.
--   `use_environment_credentials` — Optional, default value is `false`. If set to `true`, S3 client will try to obtain credentials from environment variables and Amazon EC2 metadata for given endpoint.
--   `header` — Optional, can be speficied multiple times. Adds specified HTTP header to a request to given endpoint.
--   `server_side_encryption_customer_key_base64` — Optional. If specified, required headers for accessing S3 objects with SSE-C encryption will be set.
+-   `endpoint` — Specifies prefix of an endpoint. Mandatory.
+-   `access_key_id` and `secret_access_key` — Specifies credentials to use with given endpoint. Optional.
+-   `use_environment_credentials` — If set to `true`, S3 client will try to obtain credentials from environment variables and Amazon EC2 metadata for given endpoint. Optional, default value is `false`.
+-   `use_insecure_imds_request` — If set to `true`, S3 client will use insecure IMDS request while obtaining credentials from Amazon EC2 metadata. Optional, default value is `false`.
+-   `header` —  Adds specified HTTP header to a request to given endpoint. Optional, can be speficied multiple times.
+-   `server_side_encryption_customer_key_base64` — If specified, required headers for accessing S3 objects with SSE-C encryption will be set. Optional.
 
-Example:
+**Example:**
 
-```
+``` xml
 <s3>
     <endpoint-name>
         <endpoint>https://storage.yandexcloud.net/my-test-bucket-768/</endpoint>
         <!-- <access_key_id>ACCESS_KEY_ID</access_key_id> -->
         <!-- <secret_access_key>SECRET_ACCESS_KEY</secret_access_key> -->
         <!-- <use_environment_credentials>false</use_environment_credentials> -->
+        <!-- <use_insecure_imds_request>false</use_insecure_imds_request> -->
         <!-- <header>Authorization: Bearer SOME-TOKEN</header> -->
         <!-- <server_side_encryption_customer_key_base64>BASE64-ENCODED-KEY</server_side_encryption_customer_key_base64> -->
     </endpoint-name>
 </s3>
 ```
 
-[Original article](https://clickhouse.tech/docs/en/operations/table_engines/s3/) <!--hide-->
+## Usage {#usage-examples}
+
+Suppose we have several files in TSV format with the following URIs on HDFS:
+
+-   'https://storage.yandexcloud.net/my-test-bucket-768/some_prefix/some_file_1.csv'
+-   'https://storage.yandexcloud.net/my-test-bucket-768/some_prefix/some_file_2.csv'
+-   'https://storage.yandexcloud.net/my-test-bucket-768/some_prefix/some_file_3.csv'
+-   'https://storage.yandexcloud.net/my-test-bucket-768/another_prefix/some_file_1.csv'
+-   'https://storage.yandexcloud.net/my-test-bucket-768/another_prefix/some_file_2.csv'
+-   'https://storage.yandexcloud.net/my-test-bucket-768/another_prefix/some_file_3.csv'
+
+
+1. There are several ways to make a table consisting of all six files:
+
+``` sql
+CREATE TABLE table_with_range (name String, value UInt32) 
+ENGINE = S3('https://storage.yandexcloud.net/my-test-bucket-768/{some,another}_prefix/some_file_{1..3}', 'CSV');
+```
+
+2. Another way:
+
+``` sql
+CREATE TABLE table_with_question_mark (name String, value UInt32) 
+ENGINE = S3('https://storage.yandexcloud.net/my-test-bucket-768/{some,another}_prefix/some_file_?', 'CSV');
+```
+
+3. Table consists of all the files in both directories (all files should satisfy format and schema described in query):
+
+``` sql
+CREATE TABLE table_with_asterisk (name String, value UInt32) 
+ENGINE = S3('https://storage.yandexcloud.net/my-test-bucket-768/{some,another}_prefix/*', 'CSV');
+```
+
+!!! warning "Warning"
+    If the listing of files contains number ranges with leading zeros, use the construction with braces for each digit separately or use `?`.
+
+4. Create table with files named `file-000.csv`, `file-001.csv`, … , `file-999.csv`:
+
+``` sql
+CREATE TABLE big_table (name String, value UInt32) 
+ENGINE = S3('https://storage.yandexcloud.net/my-test-bucket-768/big_prefix/file-{000..999}.csv', 'CSV');
+```
+
+## See also
+
+-  [S3 table function](../../../sql-reference/table-functions/s3.md)
diff --git a/docs/en/engines/table-engines/mergetree-family/aggregatingmergetree.md b/docs/en/engines/table-engines/mergetree-family/aggregatingmergetree.md
index 1a997b6b237..818830646cb 100644
--- a/docs/en/engines/table-engines/mergetree-family/aggregatingmergetree.md
+++ b/docs/en/engines/table-engines/mergetree-family/aggregatingmergetree.md
@@ -3,7 +3,7 @@ toc_priority: 35
 toc_title: AggregatingMergeTree
 ---
 
-# Aggregatingmergetree {#aggregatingmergetree}
+# AggregatingMergeTree {#aggregatingmergetree}
 
 The engine inherits from [MergeTree](../../../engines/table-engines/mergetree-family/mergetree.md#table_engines-mergetree), altering the logic for data parts merging. ClickHouse replaces all rows with the same primary key (or more accurately, with the same [sorting key](../../../engines/table-engines/mergetree-family/mergetree.md)) with a single row (within a one data part) that stores a combination of states of aggregate functions.
 
diff --git a/docs/en/engines/table-engines/mergetree-family/mergetree.md b/docs/en/engines/table-engines/mergetree-family/mergetree.md
index 753859b46d2..9874e87be78 100644
--- a/docs/en/engines/table-engines/mergetree-family/mergetree.md
+++ b/docs/en/engines/table-engines/mergetree-family/mergetree.md
@@ -353,7 +353,7 @@ The `set` index can be used with all functions. Function subsets for other index
 | Function (operator) / Index                                                                                | primary key | minmax | ngrambf_v1 | tokenbf_v1 | bloom_filter |
 |------------------------------------------------------------------------------------------------------------|-------------|--------|-------------|-------------|---------------|
 | [equals (=, ==)](../../../sql-reference/functions/comparison-functions.md#function-equals)                 | ✔           | ✔      | ✔           | ✔           | ✔             |
-| [notEquals(!=, \<\>)](../../../sql-reference/functions/comparison-functions.md#function-notequals)         | ✔           | ✔      | ✔           | ✔           | ✔             |
+| [notEquals(!=, <>)](../../../sql-reference/functions/comparison-functions.md#function-notequals)         | ✔           | ✔      | ✔           | ✔           | ✔             |
 | [like](../../../sql-reference/functions/string-search-functions.md#function-like)                          | ✔           | ✔      | ✔           | ✔           | ✗             |
 | [notLike](../../../sql-reference/functions/string-search-functions.md#function-notlike)                    | ✔           | ✔      | ✔           | ✔           | ✗             |
 | [startsWith](../../../sql-reference/functions/string-functions.md#startswith)                              | ✔           | ✔      | ✔           | ✔           | ✗             |
@@ -361,10 +361,10 @@ The `set` index can be used with all functions. Function subsets for other index
 | [multiSearchAny](../../../sql-reference/functions/string-search-functions.md#function-multisearchany)      | ✗           | ✗      | ✔           | ✗           | ✗             |
 | [in](../../../sql-reference/functions/in-functions.md#in-functions)                                        | ✔           | ✔      | ✔           | ✔           | ✔             |
 | [notIn](../../../sql-reference/functions/in-functions.md#in-functions)                                     | ✔           | ✔      | ✔           | ✔           | ✔             |
-| [less (\<)](../../../sql-reference/functions/comparison-functions.md#function-less)                        | ✔           | ✔      | ✗           | ✗           | ✗             |
-| [greater (\>)](../../../sql-reference/functions/comparison-functions.md#function-greater)                  | ✔           | ✔      | ✗           | ✗           | ✗             |
-| [lessOrEquals (\<=)](../../../sql-reference/functions/comparison-functions.md#function-lessorequals)       | ✔           | ✔      | ✗           | ✗           | ✗             |
-| [greaterOrEquals (\>=)](../../../sql-reference/functions/comparison-functions.md#function-greaterorequals) | ✔           | ✔      | ✗           | ✗           | ✗             |
+| [less (<)](../../../sql-reference/functions/comparison-functions.md#function-less)                        | ✔           | ✔      | ✗           | ✗           | ✗             |
+| [greater (>)](../../../sql-reference/functions/comparison-functions.md#function-greater)                  | ✔           | ✔      | ✗           | ✗           | ✗             |
+| [lessOrEquals (<=)](../../../sql-reference/functions/comparison-functions.md#function-lessorequals)       | ✔           | ✔      | ✗           | ✗           | ✗             |
+| [greaterOrEquals (>=)](../../../sql-reference/functions/comparison-functions.md#function-greaterorequals) | ✔           | ✔      | ✗           | ✗           | ✗             |
 | [empty](../../../sql-reference/functions/array-functions.md#function-empty)                                | ✔           | ✔      | ✗           | ✗           | ✗             |
 | [notEmpty](../../../sql-reference/functions/array-functions.md#function-notempty)                          | ✔           | ✔      | ✗           | ✗           | ✗             |
 | hasToken                                                                                                   | ✗           | ✗      | ✗           | ✔           | ✗             |
@@ -529,7 +529,7 @@ CREATE TABLE table_for_aggregation
     y Int
 )
 ENGINE = MergeTree
-ORDER BY k1, k2
+ORDER BY (k1, k2)
 TTL d + INTERVAL 1 MONTH GROUP BY k1, k2 SET x = max(x), y = min(y);
 ```
 
@@ -701,6 +701,32 @@ The `default` storage policy implies using only one volume, which consists of on
 
 The number of threads performing background moves of data parts can be changed by [background_move_pool_size](../../../operations/settings/settings.md#background_move_pool_size) setting.
 
+### Details {#details}
+
+In the case of `MergeTree` tables, data is getting to disk in different ways:
+
+-   As a result of an insert (`INSERT` query).
+-   During background merges and [mutations](../../../sql-reference/statements/alter/index.md#alter-mutations).
+-   When downloading from another replica.
+-   As a result of partition freezing [ALTER TABLE … FREEZE PARTITION](../../../sql-reference/statements/alter/partition.md#alter_freeze-partition).
+
+In all these cases except for mutations and partition freezing, a part is stored on a volume and a disk according to the given storage policy:
+
+1.  The first volume (in the order of definition) that has enough disk space for storing a part (`unreserved_space > current_part_size`) and allows for storing parts of a given size (`max_data_part_size_bytes > current_part_size`) is chosen.
+2.  Within this volume, that disk is chosen that follows the one, which was used for storing the previous chunk of data, and that has free space more than the part size (`unreserved_space - keep_free_space_bytes > current_part_size`).
+
+Under the hood, mutations and partition freezing make use of [hard links](https://en.wikipedia.org/wiki/Hard_link). Hard links between different disks are not supported, therefore in such cases the resulting parts are stored on the same disks as the initial ones.
+
+In the background, parts are moved between volumes on the basis of the amount of free space (`move_factor` parameter) according to the order the volumes are declared in the configuration file.
+Data is never transferred from the last one and into the first one. One may use system tables [system.part_log](../../../operations/system-tables/part_log.md#system_tables-part-log) (field `type = MOVE_PART`) and [system.parts](../../../operations/system-tables/parts.md#system_tables-parts) (fields `path` and `disk`) to monitor background moves. Also, the detailed information can be found in server logs.
+
+User can force moving a part or a partition from one volume to another using the query [ALTER TABLE … MOVE PART\|PARTITION … TO VOLUME\|DISK …](../../../sql-reference/statements/alter/partition.md#alter_move-partition), all the restrictions for background operations are taken into account. The query initiates a move on its own and does not wait for background operations to be completed. User will get an error message if not enough free space is available or if any of the required conditions are not met.
+
+Moving data does not interfere with data replication. Therefore, different storage policies can be specified for the same table on different replicas.
+
+After the completion of background merges and mutations, old parts are removed only after a certain amount of time (`old_parts_lifetime`).
+During this time, they are not moved to other volumes or disks. Therefore, until the parts are finally removed, they are still taken into account for evaluation of the occupied disk space.
+
 ## Using S3 for Data Storage {#table_engine-mergetree-s3}
 
 `MergeTree` family table engines is able to store data to [S3](https://aws.amazon.com/s3/) using a disk with type `s3`.
@@ -722,7 +748,6 @@ Configuration markup:
             </proxy>
             <connect_timeout_ms>10000</connect_timeout_ms>
             <request_timeout_ms>5000</request_timeout_ms>
-            <max_connections>100</max_connections>
             <retry_attempts>10</retry_attempts>
             <min_bytes_for_seek>1000</min_bytes_for_seek>
             <metadata_path>/var/lib/clickhouse/disks/s3/</metadata_path>
@@ -742,10 +767,10 @@ Required parameters:
 
 Optional parameters:    
 -   `use_environment_credentials` — Reads AWS credentials from the Environment variables AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY and AWS_SESSION_TOKEN if they exist. Default value is `false`.
+-   `use_insecure_imds_request` — If set to `true`, S3 client will use insecure IMDS request while obtaining credentials from Amazon EC2 metadata. Default value is `false`.
 -   `proxy` — Proxy configuration for S3 endpoint. Each `uri` element inside `proxy` block should contain a proxy URL. 
 -   `connect_timeout_ms` — Socket connect timeout in milliseconds. Default value is `10 seconds`. 
 -   `request_timeout_ms` — Request timeout in milliseconds. Default value is `5 seconds`. 
--   `max_connections` — S3 connections pool size. Default value is `100`. 
 -   `retry_attempts` — Number of retry attempts in case of failed request. Default value is `10`. 
 -   `min_bytes_for_seek` — Minimal number of bytes to use seek operation instead of sequential read. Default value is `1 Mb`. 
 -   `metadata_path` — Path on local FS to store metadata files for S3. Default value is `/var/lib/clickhouse/disks/<disk_name>/`. 
@@ -793,30 +818,4 @@ S3 disk can be configured as `main` or `cold` storage:
 
 In case of `cold` option a data can be moved to S3 if local disk free size will be smaller than `move_factor * disk_size` or by TTL move rule. 
 
-### Details {#details}
-
-In the case of `MergeTree` tables, data is getting to disk in different ways:
-
--   As a result of an insert (`INSERT` query).
--   During background merges and [mutations](../../../sql-reference/statements/alter/index.md#alter-mutations).
--   When downloading from another replica.
--   As a result of partition freezing [ALTER TABLE … FREEZE PARTITION](../../../sql-reference/statements/alter/partition.md#alter_freeze-partition).
-
-In all these cases except for mutations and partition freezing, a part is stored on a volume and a disk according to the given storage policy:
-
-1.  The first volume (in the order of definition) that has enough disk space for storing a part (`unreserved_space > current_part_size`) and allows for storing parts of a given size (`max_data_part_size_bytes > current_part_size`) is chosen.
-2.  Within this volume, that disk is chosen that follows the one, which was used for storing the previous chunk of data, and that has free space more than the part size (`unreserved_space - keep_free_space_bytes > current_part_size`).
-
-Under the hood, mutations and partition freezing make use of [hard links](https://en.wikipedia.org/wiki/Hard_link). Hard links between different disks are not supported, therefore in such cases the resulting parts are stored on the same disks as the initial ones.
-
-In the background, parts are moved between volumes on the basis of the amount of free space (`move_factor` parameter) according to the order the volumes are declared in the configuration file.
-Data is never transferred from the last one and into the first one. One may use system tables [system.part_log](../../../operations/system-tables/part_log.md#system_tables-part-log) (field `type = MOVE_PART`) and [system.parts](../../../operations/system-tables/parts.md#system_tables-parts) (fields `path` and `disk`) to monitor background moves. Also, the detailed information can be found in server logs.
-
-User can force moving a part or a partition from one volume to another using the query [ALTER TABLE … MOVE PART\|PARTITION … TO VOLUME\|DISK …](../../../sql-reference/statements/alter/partition.md#alter_move-partition), all the restrictions for background operations are taken into account. The query initiates a move on its own and does not wait for background operations to be completed. User will get an error message if not enough free space is available or if any of the required conditions are not met.
-
-Moving data does not interfere with data replication. Therefore, different storage policies can be specified for the same table on different replicas.
-
-After the completion of background merges and mutations, old parts are removed only after a certain amount of time (`old_parts_lifetime`).
-During this time, they are not moved to other volumes or disks. Therefore, until the parts are finally removed, they are still taken into account for evaluation of the occupied disk space.
-
 [Original article](https://clickhouse.tech/docs/ru/operations/table_engines/mergetree/) <!--hide-->
diff --git a/docs/en/engines/table-engines/special/buffer.md b/docs/en/engines/table-engines/special/buffer.md
index bf6c08f8f6c..8245cd19e8c 100644
--- a/docs/en/engines/table-engines/special/buffer.md
+++ b/docs/en/engines/table-engines/special/buffer.md
@@ -18,11 +18,17 @@ Engine parameters:
 -   `num_layers` – Parallelism layer. Physically, the table will be represented as `num_layers` of independent buffers. Recommended value: 16.
 -   `min_time`, `max_time`, `min_rows`, `max_rows`, `min_bytes`, and `max_bytes` – Conditions for flushing data from the buffer.
 
+Optional engine parameters:
+
+-   `flush_time`, `flush_rows`, `flush_bytes` – Conditions for flushing data from the buffer, that will happen only in background (ommited or zero means no `flush*` parameters).
+
 Data is flushed from the buffer and written to the destination table if all the `min*` conditions or at least one `max*` condition are met.
 
--   `min_time`, `max_time` – Condition for the time in seconds from the moment of the first write to the buffer.
--   `min_rows`, `max_rows` – Condition for the number of rows in the buffer.
--   `min_bytes`, `max_bytes` – Condition for the number of bytes in the buffer.
+Also if at least one `flush*` condition are met flush initiated in background, this is different from `max*`, since `flush*` allows you to configure background flushes separately to avoid adding latency for `INSERT` (into `Buffer`) queries.
+
+-   `min_time`, `max_time`, `flush_time` – Condition for the time in seconds from the moment of the first write to the buffer.
+-   `min_rows`, `max_rows`, `flush_rows` – Condition for the number of rows in the buffer.
+-   `min_bytes`, `max_bytes`, `flush_bytes` – Condition for the number of bytes in the buffer.
 
 During the write operation, data is inserted to a `num_layers` number of random buffers. Or, if the data part to insert is large enough (greater than `max_rows` or `max_bytes`), it is written directly to the destination table, omitting the buffer.
 
diff --git a/docs/en/engines/table-engines/special/distributed.md b/docs/en/engines/table-engines/special/distributed.md
index 7fffa962480..c47e0c27cd2 100644
--- a/docs/en/engines/table-engines/special/distributed.md
+++ b/docs/en/engines/table-engines/special/distributed.md
@@ -31,6 +31,12 @@ Also it accept the following settings:
 
 - `fsync_directories` - do the `fsync` for directories. Guarantees that the OS refreshed directory metadata after operations related to asynchronous inserts on Distributed table (after insert, after sending the data to shard, etc).
 
+- `bytes_to_throw_insert` - if more than this number of compressed bytes will be pending for async INSERT, an exception will be thrown. 0 - do not throw. Default 0.
+
+- `bytes_to_delay_insert` - if more than this number of compressed bytes will be pending for async INSERT, the query will be delayed. 0 - do not delay. Default 0.
+
+- `max_delay_to_insert` - max delay of inserting data into Distributed table in seconds, if there are a lot of pending bytes for async send. Default 60.
+
 !!! note "Note"
 
     **Durability settings** (`fsync_...`):
@@ -39,6 +45,12 @@ Also it accept the following settings:
     - May significantly decrease the inserts' performance
     - Affect writing the data stored inside Distributed table folder into the **node which accepted your insert**. If you need to have guarantees of writing data to underlying MergeTree tables - see durability settings (`...fsync...`) in `system.merge_tree_settings`
 
+    For **Insert limit settings** (`..._insert`) see also:
+
+    - [insert_distributed_sync](../../../operations/settings/settings.md#insert_distributed_sync) setting
+    - [prefer_localhost_replica](../../../operations/settings/settings.md#settings-prefer-localhost-replica) setting
+    - `bytes_to_throw_insert` handled before `bytes_to_delay_insert`, so you should not set it to the value less then `bytes_to_delay_insert`
+
 Example:
 
 ``` sql
@@ -61,19 +73,18 @@ Clusters are set like this:
 ``` xml
 <remote_servers>
     <logs>
+        <!-- Inter-server per-cluster secret for Distributed queries
+             default: no secret (no authentication will be performed)
+
+             If set, then Distributed queries will be validated on shards, so at least:
+             - such cluster should exist on the shard,
+             - such cluster should have the same secret.
+
+             And also (and which is more important), the initial_user will
+             be used as current user for the query.
+        -->
+        <!-- <secret></secret> -->
         <shard>
-            <!-- Inter-server per-cluster secret for Distributed queries
-                 default: no secret (no authentication will be performed)
-
-                 If set, then Distributed queries will be validated on shards, so at least:
-                 - such cluster should exist on the shard,
-                 - such cluster should have the same secret.
-
-                 And also (and which is more important), the initial_user will
-                 be used as current user for the query.
-            -->
-            <!-- <secret></secret> -->
-
             <!-- Optional. Shard weight when writing data. Default: 1. -->
             <weight>1</weight>
             <!-- Optional. Whether to write data to just one of the replicas. Default: false (write data to all replicas). -->
diff --git a/docs/en/engines/table-engines/special/file.md b/docs/en/engines/table-engines/special/file.md
index cda16c2a226..2acec40ef02 100644
--- a/docs/en/engines/table-engines/special/file.md
+++ b/docs/en/engines/table-engines/special/file.md
@@ -66,7 +66,8 @@ SELECT * FROM file_engine_table
 
 ## Usage in ClickHouse-local {#usage-in-clickhouse-local}
 
-In [clickhouse-local](../../../operations/utilities/clickhouse-local.md) File engine accepts file path in addition to `Format`. Default input/output streams can be specified using numeric or human-readable names like `0` or `stdin`, `1` or `stdout`.
+In [clickhouse-local](../../../operations/utilities/clickhouse-local.md) File engine accepts file path in addition to `Format`. Default input/output streams can be specified using numeric or human-readable names like `0` or `stdin`, `1` or `stdout`. It is possible to read and write compressed files based on an additional engine parameter or file extension (`gz`, `br` or `xz`).
+
 **Example:**
 
 ``` bash
diff --git a/docs/en/faq/integration/json-import.md b/docs/en/faq/integration/json-import.md
index 7038cc539d2..3fa026c794a 100644
--- a/docs/en/faq/integration/json-import.md
+++ b/docs/en/faq/integration/json-import.md
@@ -19,7 +19,7 @@ $ echo '{"foo":"bar"}' | curl 'http://localhost:8123/?query=INSERT%20INTO%20test
 Using [CLI interface](../../interfaces/cli.md):
 
 ``` bash
-$ echo '{"foo":"bar"}'  | clickhouse-client ---query="INSERT INTO test FORMAT JSONEachRow"
+$ echo '{"foo":"bar"}'  | clickhouse-client --query="INSERT INTO test FORMAT JSONEachRow"
 ```
 
 Instead of inserting data manually, you might consider to use one of [client libraries](../../interfaces/index.md) instead.
diff --git a/docs/en/getting-started/example-datasets/brown-benchmark.md b/docs/en/getting-started/example-datasets/brown-benchmark.md
index b5ca23eddb9..c9b74a84a54 100644
--- a/docs/en/getting-started/example-datasets/brown-benchmark.md
+++ b/docs/en/getting-started/example-datasets/brown-benchmark.md
@@ -5,7 +5,7 @@ toc_title: Brown University Benchmark
 
 # Brown University Benchmark
 
-MgBench - A new analytical benchmark for machine-generated log data, [Andrew Crotty](http://cs.brown.edu/people/acrotty/).
+`MgBench` is a new analytical benchmark for machine-generated log data, [Andrew Crotty](http://cs.brown.edu/people/acrotty/).
 
 Download the data:
 ```
@@ -153,7 +153,7 @@ ORDER BY dt,
          hr;
 
 
--- Q1.4: Over a 1-month period, how often was each server blocked on disk I/O?
+-- Q1.4: Over 1 month, how often was each server blocked on disk I/O?
 
 SELECT machine_name,
        COUNT(*) AS spikes
@@ -301,7 +301,7 @@ WHERE event_type = 'temperature'
   AND log_time >= '2019-11-29 17:00:00.000';
 
 
--- Q3.4: Over the past 6 months, how frequently was each door opened?
+-- Q3.4: Over the past 6 months, how frequently were each door opened?
 
 SELECT device_name,
        device_floor,
@@ -412,3 +412,5 @@ ORDER BY yr,
 ```
 
 The data is also available for interactive queries in the [Playground](https://gh-api.clickhouse.tech/play?user=play), [example](https://gh-api.clickhouse.tech/play?user=play#U0VMRUNUIG1hY2hpbmVfbmFtZSwKICAgICAgIE1JTihjcHUpIEFTIGNwdV9taW4sCiAgICAgICBNQVgoY3B1KSBBUyBjcHVfbWF4LAogICAgICAgQVZHKGNwdSkgQVMgY3B1X2F2ZywKICAgICAgIE1JTihuZXRfaW4pIEFTIG5ldF9pbl9taW4sCiAgICAgICBNQVgobmV0X2luKSBBUyBuZXRfaW5fbWF4LAogICAgICAgQVZHKG5ldF9pbikgQVMgbmV0X2luX2F2ZywKICAgICAgIE1JTihuZXRfb3V0KSBBUyBuZXRfb3V0X21pbiwKICAgICAgIE1BWChuZXRfb3V0KSBBUyBuZXRfb3V0X21heCwKICAgICAgIEFWRyhuZXRfb3V0KSBBUyBuZXRfb3V0X2F2ZwpGUk9NICgKICBTRUxFQ1QgbWFjaGluZV9uYW1lLAogICAgICAgICBDT0FMRVNDRShjcHVfdXNlciwgMC4wKSBBUyBjcHUsCiAgICAgICAgIENPQUxFU0NFKGJ5dGVzX2luLCAwLjApIEFTIG5ldF9pbiwKICAgICAgICAgQ09BTEVTQ0UoYnl0ZXNfb3V0LCAwLjApIEFTIG5ldF9vdXQKICBGUk9NIG1nYmVuY2gubG9nczEKICBXSEVSRSBtYWNoaW5lX25hbWUgSU4gKCdhbmFuc2knLCdhcmFnb2cnLCd1cmQnKQogICAgQU5EIGxvZ190aW1lID49IFRJTUVTVEFNUCAnMjAxNy0wMS0xMSAwMDowMDowMCcKKSBBUyByCkdST1VQIEJZIG1hY2hpbmVfbmFtZQ==).
+
+[Original article](https://clickhouse.tech/docs/en/getting_started/example_datasets/brown-benchmark/) <!--hide-->
diff --git a/docs/en/getting-started/example-datasets/cell-towers.md b/docs/en/getting-started/example-datasets/cell-towers.md
new file mode 100644
index 00000000000..7028b650ad1
--- /dev/null
+++ b/docs/en/getting-started/example-datasets/cell-towers.md
@@ -0,0 +1,132 @@
+---
+toc_priority: 21
+toc_title: Cell Towers
+---
+
+# Cell Towers {#cell-towers}
+
+This dataset is from [OpenCellid](https://www.opencellid.org/) - The world's largest Open Database of Cell Towers.
+
+As of 2021, it contains more than 40 million records about cell towers (GSM, LTE, UMTS, etc.) around the world with their geographical coordinates and metadata (country code, network, etc).
+
+OpenCelliD Project is licensed under a Creative Commons Attribution-ShareAlike 4.0 International License, and we redistribute a snapshot of this dataset under the terms of the same license. The up-to-date version of the dataset is available to download after sign in.
+
+
+## Get the Dataset {#get-the-dataset}
+
+1. Download the snapshot of the dataset from February 2021: [https://datasets.clickhouse.tech/cell_towers.csv.xz] (729 MB).
+
+2. Validate the integrity (optional step):
+```
+md5sum cell_towers.csv.xz
+8cf986f4a0d9f12c6f384a0e9192c908  cell_towers.csv.xz
+```
+
+3. Decompress it with the following command:
+```
+xz -d cell_towers.csv.xz
+```
+
+4. Create a table:
+
+```
+CREATE TABLE cell_towers
+(
+    radio Enum8('' = 0, 'CDMA' = 1, 'GSM' = 2, 'LTE' = 3, 'NR' = 4, 'UMTS' = 5),
+    mcc UInt16,
+    net UInt16,
+    area UInt16,
+    cell UInt64,
+    unit Int16,
+    lon Float64,
+    lat Float64,
+    range UInt32,
+    samples UInt32,
+    changeable UInt8,
+    created DateTime,
+    updated DateTime,
+    averageSignal UInt8
+)
+ENGINE = MergeTree ORDER BY (radio, mcc, net, created);
+```
+
+5. Insert the dataset:
+```
+clickhouse-client --query "INSERT INTO cell_towers FORMAT CSVWithNames" < cell_towers.csv
+```
+
+## Examples {#examples}
+
+1. A number of cell towers by type:
+
+```
+SELECT radio, count() AS c FROM cell_towers GROUP BY radio ORDER BY c DESC
+
+┌─radio─┬────────c─┐
+│ UMTS  │ 20686487 │
+│ LTE   │ 12101148 │
+│ GSM   │  9931312 │
+│ CDMA  │   556344 │
+│ NR    │      867 │
+└───────┴──────────┘
+
+5 rows in set. Elapsed: 0.011 sec. Processed 43.28 million rows, 43.28 MB (3.83 billion rows/s., 3.83 GB/s.)
+```
+
+2. Cell towers by [mobile country code (MCC)](https://en.wikipedia.org/wiki/Mobile_country_code):
+
+```
+SELECT mcc, count() FROM cell_towers GROUP BY mcc ORDER BY count() DESC LIMIT 10
+
+┌─mcc─┬─count()─┐
+│ 310 │ 5024650 │
+│ 262 │ 2622423 │
+│ 250 │ 1953176 │
+│ 208 │ 1891187 │
+│ 724 │ 1836150 │
+│ 404 │ 1729151 │
+│ 234 │ 1618924 │
+│ 510 │ 1353998 │
+│ 440 │ 1343355 │
+│ 311 │ 1332798 │
+└─────┴─────────┘
+
+10 rows in set. Elapsed: 0.019 sec. Processed 43.28 million rows, 86.55 MB (2.33 billion rows/s., 4.65 GB/s.)
+```
+
+So, the top countries are: the USA, Germany, and Russia.
+
+You may want to create an [External Dictionary](../../sql-reference/dictionaries/external-dictionaries/external-dicts.md) in ClickHouse to decode these values.
+
+
+## Use case {#use-case}
+
+Using `pointInPolygon` function.
+
+1. Create a table where we will store polygons:
+
+```
+CREATE TEMPORARY TABLE moscow (polygon Array(Tuple(Float64, Float64)));
+```
+
+2. This is a rough shape of Moscow (without "new Moscow"):
+
+```
+INSERT INTO moscow VALUES ([(37.84172564285271, 55.78000432402266), (37.8381207618713, 55.775874525970494), (37.83979446823122, 55.775626746008065), (37.84243326983639, 55.77446586811748), (37.84262672750849, 55.771974101091104), (37.84153238623039, 55.77114545193181), (37.841124690460184, 55.76722010265554), (37.84239076983644, 55.76654891107098), (37.842283558197025, 55.76258709833121), (37.8421759312134, 55.758073999993734), (37.84198330422974, 55.75381499999371), (37.8416827275085, 55.749277102484484), (37.84157576190186, 55.74794544108413), (37.83897929098507, 55.74525257875241), (37.83739676451868, 55.74404373042019), (37.838732481460525, 55.74298009816793), (37.841183997352545, 55.743060321833575), (37.84097476190185, 55.73938799999373), (37.84048155819702, 55.73570799999372), (37.840095812164286, 55.73228210777237), (37.83983814285274, 55.73080491981639), (37.83846476321406, 55.729799917464675), (37.83835745269769, 55.72919751082619), (37.838636380279524, 55.72859509486539), (37.8395161005249, 55.727705075632784), (37.83897964285276, 55.722727886185154), (37.83862557539366, 55.72034817326636), (37.83559735744853, 55.71944437307499), (37.835370708803126, 55.71831419154461), (37.83738169402022, 55.71765218986692), (37.83823396494291, 55.71691750159089), (37.838056931213345, 55.71547311301385), (37.836812846557606, 55.71221445615604), (37.83522525396725, 55.709331054395555), (37.83269301586908, 55.70953687463627), (37.829667367706236, 55.70903403789297), (37.83311126588435, 55.70552351822608), (37.83058993121339, 55.70041317726053), (37.82983872750851, 55.69883771404813), (37.82934501586913, 55.69718947487017), (37.828926414016685, 55.69504441658371), (37.82876530422971, 55.69287499999378), (37.82894754100031, 55.690759754047335), (37.827697554878185, 55.68951421135665), (37.82447346292115, 55.68965045405069), (37.83136543914793, 55.68322046195302), (37.833554015869154, 55.67814012759211), (37.83544184655761, 55.67295011628339), (37.837480388885474, 55.6672498719639), (37.838960677246064, 55.66316274139358), (37.83926093121332, 55.66046999999383), (37.839025050262435, 55.65869897264431), (37.83670784390257, 55.65794084879904), (37.835656529083245, 55.65694309303843), (37.83704060449217, 55.65689306460552), (37.83696819873806, 55.65550363526252), (37.83760389616388, 55.65487847246661), (37.83687972750851, 55.65356745541324), (37.83515216004943, 55.65155951234079), (37.83312418518067, 55.64979413590619), (37.82801726983639, 55.64640836412121), (37.820614174591, 55.64164525405531), (37.818908190475426, 55.6421883258084), (37.81717543386075, 55.64112490388471), (37.81690987037274, 55.63916106913107), (37.815099354492155, 55.637925371757085), (37.808769150787356, 55.633798276884455), (37.80100123544311, 55.62873670012244), (37.79598013491824, 55.62554336109055), (37.78634567724606, 55.62033499605651), (37.78334147619623, 55.618768681480326), (37.77746201055901, 55.619855533402706), (37.77527329626457, 55.61909966711279), (37.77801986242668, 55.618770300976294), (37.778212973541216, 55.617257701952106), (37.77784818518065, 55.61574504433011), (37.77016867724609, 55.61148576294007), (37.760191219573976, 55.60599579539028), (37.75338926983641, 55.60227892751446), (37.746329965606634, 55.59920577639331), (37.73939925396728, 55.59631430313617), (37.73273665739439, 55.5935318803559), (37.7299954450912, 55.59350760316188), (37.7268679946899, 55.59469840523759), (37.72626726983634, 55.59229549697373), (37.7262673598022, 55.59081598950582), (37.71897193121335, 55.5877595845419), (37.70871550793456, 55.58393177431724), (37.700497489410374, 55.580917323756644), (37.69204305026244, 55.57778089778455), (37.68544477378839, 55.57815154690915), (37.68391050793454, 55.57472945079756), (37.678803592590306, 55.57328235936491), (37.6743402539673, 55.57255251445782), (37.66813862698363, 55.57216388774464), (37.617927457672096, 55.57505691895805), (37.60443099999999, 55.5757737568051), (37.599683515869145, 55.57749105910326), (37.59754177842709, 55.57796291823627), (37.59625834786988, 55.57906686095235), (37.59501783265684, 55.57746616444403), (37.593090671936025, 55.57671634534502), (37.587018007904, 55.577944600233785), (37.578692203704804, 55.57982895000019), (37.57327546607398, 55.58116294118248), (37.57385012109279, 55.581550362779), (37.57399562266922, 55.5820107079112), (37.5735356072979, 55.58226289171689), (37.57290393054962, 55.582393529795155), (37.57037722355653, 55.581919415056234), (37.5592298306885, 55.584471614867844), (37.54189249206543, 55.58867650795186), (37.5297256269836, 55.59158133551745), (37.517837865081766, 55.59443656218868), (37.51200186508174, 55.59635625174229), (37.506808949737554, 55.59907823904434), (37.49820432275389, 55.6062944994944), (37.494406071441674, 55.60967103463367), (37.494760001358024, 55.61066689753365), (37.49397137107085, 55.61220931698269), (37.49016528606031, 55.613417718449064), (37.48773249206542, 55.61530616333343), (37.47921386508177, 55.622640129112334), (37.470652153442394, 55.62993723476164), (37.46273446298218, 55.6368075123157), (37.46350692265317, 55.64068225239439), (37.46050283203121, 55.640794546982576), (37.457627470916734, 55.64118904154646), (37.450718034393326, 55.64690488145138), (37.44239252645875, 55.65397824729769), (37.434587576721185, 55.66053543155961), (37.43582144975277, 55.661693766520735), (37.43576786245721, 55.662755031737014), (37.430982915344174, 55.664610641628116), (37.428547447097685, 55.66778515273695), (37.42945134592044, 55.668633314343566), (37.42859571562949, 55.66948145750025), (37.4262836402282, 55.670813882451405), (37.418709037048295, 55.6811141674414), (37.41922139651101, 55.68235377885389), (37.419218771842885, 55.68359335082235), (37.417196501327446, 55.684375235224735), (37.41607020370478, 55.68540557585352), (37.415640857147146, 55.68686637150793), (37.414632153442334, 55.68903015131686), (37.413344899475064, 55.690896881757396), (37.41171432275391, 55.69264232162232), (37.40948282275393, 55.69455101638112), (37.40703674603271, 55.69638690385348), (37.39607169577025, 55.70451821283731), (37.38952706878662, 55.70942491932811), (37.387778313491815, 55.71149057784176), (37.39049275399779, 55.71419814298992), (37.385557272491454, 55.7155489617061), (37.38388335714726, 55.71849856042102), (37.378368238098155, 55.7292763261685), (37.37763597123337, 55.730845879211614), (37.37890062088197, 55.73167906388319), (37.37750451918789, 55.734703664681774), (37.375610832015965, 55.734851959522246), (37.3723813571472, 55.74105626086403), (37.37014935714723, 55.746115620904355), (37.36944173016362, 55.750883999993725), (37.36975304365541, 55.76335905525834), (37.37244070571134, 55.76432079697595), (37.3724259757175, 55.76636979670426), (37.369922155757884, 55.76735417953104), (37.369892695770275, 55.76823419316575), (37.370214730163575, 55.782312184391266), (37.370493611114505, 55.78436801120489), (37.37120164550783, 55.78596427165359), (37.37284851456452, 55.7874378183096), (37.37608325135799, 55.7886695054807), (37.3764587460632, 55.78947647305964), (37.37530000265506, 55.79146512926804), (37.38235915344241, 55.79899647809345), (37.384344043655396, 55.80113596939471), (37.38594269577028, 55.80322699999366), (37.38711208598329, 55.804919036911976), (37.3880239841309, 55.806610999993666), (37.38928977249147, 55.81001864976979), (37.39038389947512, 55.81348641242801), (37.39235781481933, 55.81983538336746), (37.393709457672124, 55.82417822811877), (37.394685720901464, 55.82792275755836), (37.39557615344238, 55.830447148154136), (37.39844478226658, 55.83167107969975), (37.40019761214057, 55.83151823557964), (37.400398790382326, 55.83264967594742), (37.39659544313046, 55.83322180909622), (37.39667059524539, 55.83402792148566), (37.39682089947515, 55.83638877400216), (37.39643489154053, 55.83861656112751), (37.3955338994751, 55.84072348043264), (37.392680272491454, 55.84502158126453), (37.39241188227847, 55.84659117913199), (37.392529730163616, 55.84816071336481), (37.39486835714723, 55.85288092980303), (37.39873052645878, 55.859893456073635), (37.40272161111449, 55.86441833633205), (37.40697072750854, 55.867579567544375), (37.410007082016016, 55.868369880337), (37.4120992989502, 55.86920843741314), (37.412668021163924, 55.87055369615854), (37.41482461111453, 55.87170587948249), (37.41862266137694, 55.873183961039565), (37.42413732540892, 55.874879126654704), (37.4312182698669, 55.875614937236705), (37.43111093783558, 55.8762723478417), (37.43332105622856, 55.87706546369396), (37.43385747619623, 55.87790681284802), (37.441303050262405, 55.88027084462084), (37.44747234260555, 55.87942070143253), (37.44716141796871, 55.88072960917233), (37.44769797085568, 55.88121221323979), (37.45204320500181, 55.882080694420715), (37.45673176190186, 55.882346110794586), (37.463383999999984, 55.88252729504517), (37.46682797486874, 55.88294937719063), (37.470014457672086, 55.88361266759345), (37.47751410450743, 55.88546991372396), (37.47860317658232, 55.88534929207307), (37.48165826025772, 55.882563306475106), (37.48316434442331, 55.8815803226785), (37.483831555817645, 55.882427612793315), (37.483182967125686, 55.88372791409729), (37.483092277908824, 55.88495581062434), (37.4855716508179, 55.8875561994203), (37.486440636245746, 55.887827444039566), (37.49014203439328, 55.88897899871799), (37.493210285705544, 55.890208937135604), (37.497512451065035, 55.891342397444696), (37.49780744510645, 55.89174030252967), (37.49940333499519, 55.89239745507079), (37.50018383334346, 55.89339220941865), (37.52421672750851, 55.903869074155224), (37.52977457672118, 55.90564076517974), (37.53503220370484, 55.90661661218259), (37.54042858064267, 55.90714113744566), (37.54320461007303, 55.905645048442985), (37.545686966066306, 55.906608607018505), (37.54743976120755, 55.90788552162358), (37.55796999999999, 55.90901557907218), (37.572711542327866, 55.91059395704873), (37.57942799999998, 55.91073854155573), (37.58502865872187, 55.91009969268444), (37.58739968913264, 55.90794809960554), (37.59131567193598, 55.908713267595054), (37.612687423278814, 55.902866854295375), (37.62348079629517, 55.90041967242986), (37.635797880950896, 55.898141151686396), (37.649487626983664, 55.89639275532968), (37.65619302513125, 55.89572360207488), (37.66294133862307, 55.895295577183965), (37.66874564418033, 55.89505457604897), (37.67375601586915, 55.89254677027454), (37.67744661901856, 55.8947775867987), (37.688347, 55.89450045676125), (37.69480554232789, 55.89422926332761), (37.70107096560668, 55.89322256101114), (37.705962965606716, 55.891763491662616), (37.711885134918205, 55.889110234998974), (37.71682005026245, 55.886577568759876), (37.7199315476074, 55.88458159806678), (37.72234560316464, 55.882281005794134), (37.72364385977171, 55.8809452036196), (37.725371142837474, 55.8809722706006), (37.727870902099546, 55.88037213862385), (37.73394330422971, 55.877941504088696), (37.745339592590376, 55.87208120378722), (37.75525267724611, 55.86703807949492), (37.76919976190188, 55.859821640197474), (37.827835219574, 55.82962968399116), (37.83341438888553, 55.82575289922351), (37.83652584655761, 55.82188784027888), (37.83809213491821, 55.81612575504693), (37.83605359521481, 55.81460347077685), (37.83632178569025, 55.81276696067908), (37.838623105812026, 55.811486181656385), (37.83912198147584, 55.807329380532785), (37.839079078033414, 55.80510270463816), (37.83965844708251, 55.79940712529036), (37.840581150787344, 55.79131399999368), (37.84172564285271, 55.78000432402266)]);
+```
+
+3. Check how many cell towers are in Moscow:
+
+```
+SELECT count() FROM cell_towers WHERE pointInPolygon((lon, lat), (SELECT * FROM moscow))
+
+┌─count()─┐
+│  310463 │
+└─────────┘
+
+1 rows in set. Elapsed: 0.067 sec. Processed 43.28 million rows, 692.42 MB (645.83 million rows/s., 10.33 GB/s.)
+```
+
+The data is also available for interactive queries in the [Playground](https://gh-api.clickhouse.tech/play?user=play), [example](https://gh-api.clickhouse.tech/play?user=play#U0VMRUNUIG1jYywgY291bnQoKSBGUk9NIGNlbGxfdG93ZXJzIEdST1VQIEJZIG1jYyBPUkRFUiBCWSBjb3VudCgpIERFU0M=).
+
+Although you cannot create temporary tables there.
\ No newline at end of file
diff --git a/docs/en/getting-started/example-datasets/index.md b/docs/en/getting-started/example-datasets/index.md
index 72f44d8caf1..53007c33306 100644
--- a/docs/en/getting-started/example-datasets/index.md
+++ b/docs/en/getting-started/example-datasets/index.md
@@ -20,5 +20,6 @@ The list of documented datasets:
 -   [Terabyte of Click Logs from Criteo](../../getting-started/example-datasets/criteo.md)
 -   [AMPLab Big Data Benchmark](../../getting-started/example-datasets/amplab-benchmark.md)
 -   [Brown University Benchmark](../../getting-started/example-datasets/brown-benchmark.md)
+-   [Cell Towers](../../getting-started/example-datasets/cell-towers.md)
 
 [Original article](https://clickhouse.tech/docs/en/getting_started/example_datasets) <!--hide-->
diff --git a/docs/en/getting-started/example-datasets/ontime.md b/docs/en/getting-started/example-datasets/ontime.md
index 6e46cddba52..83673cdceb6 100644
--- a/docs/en/getting-started/example-datasets/ontime.md
+++ b/docs/en/getting-started/example-datasets/ontime.md
@@ -15,17 +15,9 @@ This dataset can be obtained in two ways:
 Downloading data:
 
 ``` bash
-for s in `seq 1987 2018`
-do
-for m in `seq 1 12`
-do
-wget https://transtats.bts.gov/PREZIP/On_Time_Reporting_Carrier_On_Time_Performance_1987_present_${s}_${m}.zip
-done
-done
+echo https://transtats.bts.gov/PREZIP/On_Time_Reporting_Carrier_On_Time_Performance_1987_present_{1987..2021}_{1..12}.zip | xargs -P10 wget --no-check-certificate --continue
 ```
 
-(from https://github.com/Percona-Lab/ontime-airline-performance/blob/master/download.sh )
-
 Creating a table:
 
 ``` sql
@@ -145,12 +137,14 @@ ORDER BY (Carrier, FlightDate)
 SETTINGS index_granularity = 8192;
 ```
 
-Loading data:
+Loading data with multiple threads:
 
 ``` bash
-$ for i in *.zip; do echo $i; unzip -cq $i '*.csv' | sed 's/\.00//g' | clickhouse-client --input_format_with_names_use_header=0 --host=example-perftest01j --query="INSERT INTO ontime FORMAT CSVWithNames"; done
+ls -1 *.zip | xargs -I{} -P $(nproc) bash -c "echo {}; unzip -cq {} '*.csv' | sed 's/\.00//g' | clickhouse-client --input_format_with_names_use_header=0 --query='INSERT INTO ontime FORMAT CSVWithNames'"
 ```
 
+(if you will have memory shortage or other issues on your server, remove the `-P $(nproc)` part)
+
 ## Download of Prepared Partitions {#download-of-prepared-partitions}
 
 ``` bash
diff --git a/docs/en/getting-started/example-datasets/recipes.md b/docs/en/getting-started/example-datasets/recipes.md
index b3c7d82f485..0f4e81c8470 100644
--- a/docs/en/getting-started/example-datasets/recipes.md
+++ b/docs/en/getting-started/example-datasets/recipes.md
@@ -7,15 +7,17 @@ toc_title: Recipes Dataset
 
 RecipeNLG dataset is available for download [here](https://recipenlg.cs.put.poznan.pl/dataset). It contains 2.2 million recipes. The size is slightly less than 1 GB.
 
-## Download and unpack the dataset
+## Download and Unpack the Dataset
 
-Accept Terms and Conditions and download it [here](https://recipenlg.cs.put.poznan.pl/dataset). Unpack the zip file with `unzip`. You will get the `full_dataset.csv` file.
+1. Go to the download page [https://recipenlg.cs.put.poznan.pl/dataset](https://recipenlg.cs.put.poznan.pl/dataset).
+1. Accept Terms and Conditions and download zip file.
+1. Unpack the zip file with `unzip`. You will get the `full_dataset.csv` file.
 
-## Create a table
+## Create a Table
 
 Run clickhouse-client and execute the following CREATE query:
 
-```
+``` sql
 CREATE TABLE recipes
 (
     title String,
@@ -27,11 +29,11 @@ CREATE TABLE recipes
 ) ENGINE = MergeTree ORDER BY title;
 ```
 
-## Insert the data
+## Insert the Data
 
 Run the following command:
 
-```
+``` bash
 clickhouse-client --query "
     INSERT INTO recipes
     SELECT
@@ -49,32 +51,41 @@ clickhouse-client --query "
 This is a showcase how to parse custom CSV, as it requires multiple tunes.
 
 Explanation:
-- the dataset is in CSV format, but it requires some preprocessing on insertion; we use table function [input](../../sql-reference/table-functions/input/) to perform preprocessing;
-- the structure of CSV file is specified in the argument of the table function `input`;
-- the field `num` (row number) is unneeded - we parse it from file and ignore;
-- we use `FORMAT CSVWithNames` but the header in CSV will be ignored (by command line parameter `--input_format_with_names_use_header 0`), because the header does not contain the name for the first field;
-- file is using only double quotes to enclose CSV strings; some strings are not enclosed in double quotes, and single quote must not be parsed as the string enclosing - that's why we also add the `--format_csv_allow_single_quote 0` parameter;
-- some strings from CSV cannot parse, because they contain `\M/` sequence at the beginning of the value; the only value starting with backslash in CSV can be `\N` that is parsed as SQL NULL. We add `--input_format_allow_errors_num 10` parameter and up to ten malformed records can be skipped;
-- there are arrays for ingredients, directions and NER fields; these arrays are represented in unusual form: they are serialized into string as JSON and then placed in CSV - we parse them as String and then use [JSONExtract](../../sql-reference/functions/json-functions/) function to transform it to Array.
+-   The dataset is in CSV format, but it requires some preprocessing on insertion; we use table function [input](../../sql-reference/table-functions/input.md) to perform preprocessing;
+-   The structure of CSV file is specified in the argument of the table function `input`;
+-   The field `num` (row number) is unneeded - we parse it from file and ignore;
+-   We use `FORMAT CSVWithNames` but the header in CSV will be ignored (by command line parameter `--input_format_with_names_use_header 0`), because the header does not contain the name for the first field;
+-   File is using only double quotes to enclose CSV strings; some strings are not enclosed in double quotes, and single quote must not be parsed as the string enclosing - that's why we also add the `--format_csv_allow_single_quote 0` parameter;
+-   Some strings from CSV cannot parse, because they contain `\M/` sequence at the beginning of the value; the only value starting with backslash in CSV can be `\N` that is parsed as SQL NULL. We add `--input_format_allow_errors_num 10` parameter and up to ten malformed records can be skipped;
+-   There are arrays for ingredients, directions and NER fields; these arrays are represented in unusual form: they are serialized into string as JSON and then placed in CSV - we parse them as String and then use [JSONExtract](../../sql-reference/functions/json-functions/) function to transform it to Array.
 
-## Validate the inserted data
+## Validate the Inserted Data
 
 By checking the row count:
 
-```
-SELECT count() FROM recipes
+Query:
 
+``` sq;
+SELECT count() FROM recipes;
+```
+
+Result:
+
+``` text
 ┌─count()─┐
 │ 2231141 │
 └─────────┘
 ```
 
+## Example Queries
 
-## Example queries
+### Top Components by the Number of Recipes:
 
-### Top components by the number of recipes:
+In this example we learn how to use [arrayJoin](../../sql-reference/functions/array-join/) function to expand an array into a set of rows.
 
-```
+Query:
+
+``` sql
 SELECT
     arrayJoin(NER) AS k,
     count() AS c
@@ -82,7 +93,11 @@ FROM recipes
 GROUP BY k
 ORDER BY c DESC
 LIMIT 50
+```
 
+Result:
+
+``` text
 ┌─k────────────────────┬──────c─┐
 │ salt                 │ 890741 │
 │ sugar                │ 620027 │
@@ -139,11 +154,9 @@ LIMIT 50
 50 rows in set. Elapsed: 0.112 sec. Processed 2.23 million rows, 361.57 MB (19.99 million rows/s., 3.24 GB/s.)
 ```
 
-In this example we learn how to use [arrayJoin](../../sql-reference/functions/array-join/) function to multiply data by array elements.
+### The Most Complex Recipes with Strawberry
 
-### The most complex recipes with strawberry
-
-```
+``` sql
 SELECT
     title,
     length(NER),
@@ -152,7 +165,11 @@ FROM recipes
 WHERE has(NER, 'strawberry')
 ORDER BY length(directions) DESC
 LIMIT 10
+```
 
+Result:
+
+``` text
 ┌─title────────────────────────────────────────────────────────────┬─length(NER)─┬─length(directions)─┐
 │ Chocolate-Strawberry-Orange Wedding Cake                         │          24 │                126 │
 │ Strawberry Cream Cheese Crumble Tart                             │          19 │                 47 │
@@ -171,15 +188,19 @@ LIMIT 10
 
 In this example, we involve [has](../../sql-reference/functions/array-functions/#hasarr-elem) function to filter by array elements and sort by the number of directions.
 
-There is a wedding cake that requires the whole 126 steps to produce!
+There is a wedding cake that requires the whole 126 steps to produce! Show that directions:
 
-Show that directions:
+Query:
 
-```
+``` sql
 SELECT arrayJoin(directions)
 FROM recipes
 WHERE title = 'Chocolate-Strawberry-Orange Wedding Cake'
+```
 
+Result:
+
+``` text
 ┌─arrayJoin(directions)───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
 │ Position 1 rack in center and 1 rack in bottom third of oven and preheat to 350F.                                                                                           │
 │ Butter one 5-inch-diameter cake pan with 2-inch-high sides, one 8-inch-diameter cake pan with 2-inch-high sides and one 12-inch-diameter cake pan with 2-inch-high sides.   │
@@ -312,6 +333,8 @@ WHERE title = 'Chocolate-Strawberry-Orange Wedding Cake'
 126 rows in set. Elapsed: 0.011 sec. Processed 8.19 thousand rows, 5.34 MB (737.75 thousand rows/s., 480.59 MB/s.)
 ```
 
-### Online playground
+### Online Playground
 
-The dataset is also available in the [Playground](https://gh-api.clickhouse.tech/play?user=play#U0VMRUNUCiAgICBhcnJheUpvaW4oTkVSKSBBUyBrLAogICAgY291bnQoKSBBUyBjCkZST00gcmVjaXBlcwpHUk9VUCBCWSBrCk9SREVSIEJZIGMgREVTQwpMSU1JVCA1MA==).
+The dataset is also available in the [Online Playground](https://gh-api.clickhouse.tech/play?user=play#U0VMRUNUCiAgICBhcnJheUpvaW4oTkVSKSBBUyBrLAogICAgY291bnQoKSBBUyBjCkZST00gcmVjaXBlcwpHUk9VUCBCWSBrCk9SREVSIEJZIGMgREVTQwpMSU1JVCA1MA==).
+
+[Original article](https://clickhouse.tech/docs/en/getting-started/example-datasets/recipes/) <!--hide-->
diff --git a/docs/en/getting-started/playground.md b/docs/en/getting-started/playground.md
index 7838dad14ea..9adf0423cf3 100644
--- a/docs/en/getting-started/playground.md
+++ b/docs/en/getting-started/playground.md
@@ -38,10 +38,10 @@ The queries are executed as a read-only user. It implies some limitations:
 
 The following settings are also enforced:
 
-- [max_result_bytes=10485760](../operations/settings/query_complexity/#max-result-bytes)
-- [max_result_rows=2000](../operations/settings/query_complexity/#setting-max_result_rows)
-- [result_overflow_mode=break](../operations/settings/query_complexity/#result-overflow-mode)
-- [max_execution_time=60000](../operations/settings/query_complexity/#max-execution-time)
+- [max_result_bytes=10485760](../operations/settings/query-complexity/#max-result-bytes)
+- [max_result_rows=2000](../operations/settings/query-complexity/#setting-max_result_rows)
+- [result_overflow_mode=break](../operations/settings/query-complexity/#result-overflow-mode)
+- [max_execution_time=60000](../operations/settings/query-complexity/#max-execution-time)
 
 ## Examples {#examples}
 
diff --git a/docs/en/guides/apply-catboost-model.md b/docs/en/guides/apply-catboost-model.md
index f614b121714..7c2c8a575ec 100644
--- a/docs/en/guides/apply-catboost-model.md
+++ b/docs/en/guides/apply-catboost-model.md
@@ -159,6 +159,9 @@ The fastest way to evaluate a CatBoost model is compile `libcatboostmodel.<so|dl
 <models_config>/home/catboost/models/*_model.xml</models_config>
 ```
 
+!!! note "Note"
+    You can change path to the CatBoost model configuration later without restarting server.
+
 ## 4. Run the Model Inference from SQL {#run-model-inference}
 
 For test model run the ClickHouse client `$ clickhouse client`.
diff --git a/docs/en/interfaces/formats.md b/docs/en/interfaces/formats.md
index 33bf90a8b52..5987ba0f676 100644
--- a/docs/en/interfaces/formats.md
+++ b/docs/en/interfaces/formats.md
@@ -50,7 +50,7 @@ The supported formats are:
 | [Parquet](#data-format-parquet)                                                         | ✔     | ✔      |
 | [Arrow](#data-format-arrow)                                                             | ✔     | ✔      |
 | [ArrowStream](#data-format-arrow-stream)                                                | ✔     | ✔      |
-| [ORC](#data-format-orc)                                                                 | ✔     | ✗      |
+| [ORC](#data-format-orc)                                                                 | ✔     | ✔      |
 | [RowBinary](#rowbinary)                                                                 | ✔     | ✔      |
 | [RowBinaryWithNamesAndTypes](#rowbinarywithnamesandtypes)                               | ✔     | ✔      |
 | [Native](#native)                                                                       | ✔     | ✔      |
@@ -1254,7 +1254,7 @@ ClickHouse supports configurable precision of `Decimal` type. The `INSERT` query
 
 Unsupported Parquet data types: `DATE32`, `TIME32`, `FIXED_SIZE_BINARY`, `JSON`, `UUID`, `ENUM`.
 
-Data types of ClickHouse table columns can differ from the corresponding fields of the Parquet data inserted. When inserting data, ClickHouse interprets data types according to the table above and then [cast](../query_language/functions/type_conversion_functions/#type_conversion_function-cast) the data to that data type which is set for the ClickHouse table column.
+Data types of ClickHouse table columns can differ from the corresponding fields of the Parquet data inserted. When inserting data, ClickHouse interprets data types according to the table above and then [cast](../sql-reference/functions/type-conversion-functions/#type_conversion_function-cast) the data to that data type which is set for the ClickHouse table column.
 
 ### Inserting and Selecting Data {#inserting-and-selecting-data}
 
@@ -1284,32 +1284,33 @@ To exchange data with Hadoop, you can use [HDFS table engine](../engines/table-e
 
 ## ORC {#data-format-orc}
 
-[Apache ORC](https://orc.apache.org/) is a columnar storage format widespread in the Hadoop ecosystem. You can only insert data in this format to ClickHouse.
+[Apache ORC](https://orc.apache.org/) is a columnar storage format widespread in the [Hadoop](https://hadoop.apache.org/) ecosystem.
 
 ### Data Types Matching {#data_types-matching-3}
 
-The table below shows supported data types and how they match ClickHouse [data types](../sql-reference/data-types/index.md) in `INSERT` queries.
+The table below shows supported data types and how they match ClickHouse [data types](../sql-reference/data-types/index.md) in `INSERT` and `SELECT` queries.
 
-| ORC data type (`INSERT`) | ClickHouse data type                                |
-|--------------------------|-----------------------------------------------------|
-| `UINT8`, `BOOL`          | [UInt8](../sql-reference/data-types/int-uint.md)    |
-| `INT8`                   | [Int8](../sql-reference/data-types/int-uint.md)     |
-| `UINT16`                 | [UInt16](../sql-reference/data-types/int-uint.md)   |
-| `INT16`                  | [Int16](../sql-reference/data-types/int-uint.md)    |
-| `UINT32`                 | [UInt32](../sql-reference/data-types/int-uint.md)   |
-| `INT32`                  | [Int32](../sql-reference/data-types/int-uint.md)    |
-| `UINT64`                 | [UInt64](../sql-reference/data-types/int-uint.md)   |
-| `INT64`                  | [Int64](../sql-reference/data-types/int-uint.md)    |
-| `FLOAT`, `HALF_FLOAT`    | [Float32](../sql-reference/data-types/float.md)     |
-| `DOUBLE`                 | [Float64](../sql-reference/data-types/float.md)     |
-| `DATE32`                 | [Date](../sql-reference/data-types/date.md)         |
-| `DATE64`, `TIMESTAMP`    | [DateTime](../sql-reference/data-types/datetime.md) |
-| `STRING`, `BINARY`       | [String](../sql-reference/data-types/string.md)     |
-| `DECIMAL`                | [Decimal](../sql-reference/data-types/decimal.md)   |
+| ORC data type (`INSERT`) | ClickHouse data type                                | ORC data type (`SELECT`) |
+|--------------------------|-----------------------------------------------------|--------------------------|
+| `UINT8`, `BOOL`          | [UInt8](../sql-reference/data-types/int-uint.md)    | `UINT8`                  |
+| `INT8`                   | [Int8](../sql-reference/data-types/int-uint.md)     | `INT8`                   |
+| `UINT16`                 | [UInt16](../sql-reference/data-types/int-uint.md)   | `UINT16`                 |
+| `INT16`                  | [Int16](../sql-reference/data-types/int-uint.md)    | `INT16`                  |
+| `UINT32`                 | [UInt32](../sql-reference/data-types/int-uint.md)   | `UINT32`                 |
+| `INT32`                  | [Int32](../sql-reference/data-types/int-uint.md)    | `INT32`                  |
+| `UINT64`                 | [UInt64](../sql-reference/data-types/int-uint.md)   | `UINT64`                 |
+| `INT64`                  | [Int64](../sql-reference/data-types/int-uint.md)    | `INT64`                  |
+| `FLOAT`, `HALF_FLOAT`    | [Float32](../sql-reference/data-types/float.md)     | `FLOAT`                  |
+| `DOUBLE`                 | [Float64](../sql-reference/data-types/float.md)     | `DOUBLE`                 |
+| `DATE32`                 | [Date](../sql-reference/data-types/date.md)         | `DATE32`                 |
+| `DATE64`, `TIMESTAMP`    | [DateTime](../sql-reference/data-types/datetime.md) | `TIMESTAMP`              |
+| `STRING`, `BINARY`       | [String](../sql-reference/data-types/string.md)     | `BINARY`                 |
+| `DECIMAL`                | [Decimal](../sql-reference/data-types/decimal.md)   | `DECIMAL`                |
+| `-`                      | [Array](../sql-reference/data-types/array.md)       | `LIST`                   |
 
 ClickHouse supports configurable precision of the `Decimal` type. The `INSERT` query treats the ORC `DECIMAL` type as the ClickHouse `Decimal128` type.
 
-Unsupported ORC data types: `DATE32`, `TIME32`, `FIXED_SIZE_BINARY`, `JSON`, `UUID`, `ENUM`.
+Unsupported ORC data types: `TIME32`, `FIXED_SIZE_BINARY`, `JSON`, `UUID`, `ENUM`.
 
 The data types of ClickHouse table columns don’t have to match the corresponding ORC data fields. When inserting data, ClickHouse interprets data types according to the table above and then [casts](../sql-reference/functions/type-conversion-functions.md#type_conversion_function-cast) the data to the data type set for the ClickHouse table column.
 
@@ -1321,6 +1322,14 @@ You can insert ORC data from a file into ClickHouse table by the following comma
 $ cat filename.orc | clickhouse-client --query="INSERT INTO some_table FORMAT ORC"
 ```
 
+### Selecting Data {#selecting-data-2}
+
+You can select data from a ClickHouse table and save them into some file in the ORC format by the following command:
+
+``` bash
+$ clickhouse-client --query="SELECT * FROM {some_table} FORMAT ORC" > {filename.orc}
+```
+
 To exchange data with Hadoop, you can use [HDFS table engine](../engines/table-engines/integrations/hdfs.md).
 
 ## LineAsString {#lineasstring}
@@ -1359,15 +1368,15 @@ When working with the `Regexp` format, you can use the following settings:
     - Escaped (similarly to [TSV](#tabseparated))
     - Quoted (similarly to [Values](#data-format-values))
     - Raw (extracts subpatterns as a whole, no escaping rules)
-- `format_regexp_skip_unmatched` — [UInt8](../sql-reference/data-types/int-uint.md). Defines the need to throw an exeption in case the `format_regexp` expression does not match the imported data. Can be set to `0` or `1`. 
+- `format_regexp_skip_unmatched` — [UInt8](../sql-reference/data-types/int-uint.md). Defines the need to throw an exeption in case the `format_regexp` expression does not match the imported data. Can be set to `0` or `1`.
 
-**Usage** 
+**Usage**
 
-The regular expression from `format_regexp` setting is applied to every line of imported data. The number of subpatterns in the regular expression must be equal to the number of columns in imported dataset. 
+The regular expression from `format_regexp` setting is applied to every line of imported data. The number of subpatterns in the regular expression must be equal to the number of columns in imported dataset.
 
-Lines of the imported data must be separated by newline character `'\n'` or DOS-style newline `"\r\n"`. 
+Lines of the imported data must be separated by newline character `'\n'` or DOS-style newline `"\r\n"`.
 
-The content of every matched subpattern is parsed with the method of corresponding data type, according to `format_regexp_escaping_rule` setting. 
+The content of every matched subpattern is parsed with the method of corresponding data type, according to `format_regexp_escaping_rule` setting.
 
 If the regular expression does not match the line and `format_regexp_skip_unmatched` is set to 1, the line is silently skipped. If `format_regexp_skip_unmatched` is set to 0, exception is thrown.
 
diff --git a/docs/en/interfaces/http.md b/docs/en/interfaces/http.md
index 310286e3d44..18533cfc6c2 100644
--- a/docs/en/interfaces/http.md
+++ b/docs/en/interfaces/http.md
@@ -148,28 +148,48 @@ $ echo 'DROP TABLE t' | curl 'http://localhost:8123/' --data-binary @-
 
 For successful requests that don’t return a data table, an empty response body is returned.
 
-You can use the internal ClickHouse compression format when transmitting data. The compressed data has a non-standard format, and you will need to use the special `clickhouse-compressor` program to work with it (it is installed with the `clickhouse-client` package). To increase the efficiency of data insertion, you can disable server-side checksum verification by using the [http_native_compression_disable_checksumming_on_decompress](../operations/settings/settings.md#settings-http_native_compression_disable_checksumming_on_decompress) setting.
 
-If you specified `compress=1` in the URL, the server compresses the data it sends you.
-If you specified `decompress=1` in the URL, the server decompresses the same data that you pass in the `POST` method.
+## Compression {#compression}
 
-You can also choose to use [HTTP compression](https://en.wikipedia.org/wiki/HTTP_compression). To send a compressed `POST` request, append the request header `Content-Encoding: compression_method`. In order for ClickHouse to compress the response, you must append `Accept-Encoding: compression_method`. ClickHouse supports `gzip`, `br`, and `deflate` [compression methods](https://en.wikipedia.org/wiki/HTTP_compression#Content-Encoding_tokens). To enable HTTP compression, you must use the ClickHouse [enable_http_compression](../operations/settings/settings.md#settings-enable_http_compression) setting. You can configure the data compression level in the [http_zlib_compression_level](#settings-http_zlib_compression_level) setting for all the compression methods.
+You can use compression to reduce network traffic when transmitting a large amount of data or for creating dumps that are immediately compressed.
 
-You can use this to reduce network traffic when transmitting a large amount of data, or for creating dumps that are immediately compressed.
+You can use the internal ClickHouse compression format when transmitting data. The compressed data has a non-standard format, and you need `clickhouse-compressor` program to work with it. It is installed with the `clickhouse-client` package. To increase the efficiency of data insertion, you can disable server-side checksum verification by using the [http_native_compression_disable_checksumming_on_decompress](../operations/settings/settings.md#settings-http_native_compression_disable_checksumming_on_decompress) setting.
 
-Examples of sending data with compression:
+If you specify `compress=1` in the URL, the server will compress the data it sends to you. If you specify `decompress=1` in the URL, the server will decompress the data which you pass in the `POST` method.
 
-``` bash
-#Sending data to the server:
-$ curl -vsS "http://localhost:8123/?enable_http_compression=1" -d 'SELECT number FROM system.numbers LIMIT 10' -H 'Accept-Encoding: gzip'
+You can also choose to use [HTTP compression](https://en.wikipedia.org/wiki/HTTP_compression). ClickHouse supports the following [compression methods](https://en.wikipedia.org/wiki/HTTP_compression#Content-Encoding_tokens):
 
-#Sending data to the client:
-$ echo "SELECT 1" | gzip -c | curl -sS --data-binary @- -H 'Content-Encoding: gzip' 'http://localhost:8123/'
-```
+- `gzip`
+- `br`
+- `deflate`
+- `xz`
+
+To send a compressed `POST` request, append the request header `Content-Encoding: compression_method`.
+In order for ClickHouse to compress the response, enable compression with [enable_http_compression](../operations/settings/settings.md#settings-enable_http_compression) setting and append `Accept-Encoding: compression_method` header to the request. You can configure the data compression level in the [http_zlib_compression_level](../operations/settings/settings.md#settings-http_zlib_compression_level) setting for all compression methods.
 
 !!! note "Note"
     Some HTTP clients might decompress data from the server by default (with `gzip` and `deflate`) and you might get decompressed data even if you use the compression settings correctly.
 
+**Examples**
+
+``` bash
+# Sending compressed data to the server
+$ echo "SELECT 1" | gzip -c | \
+  curl -sS --data-binary @- -H 'Content-Encoding: gzip' 'http://localhost:8123/'
+```
+
+``` bash
+# Receiving compressed data from the server
+$ curl -vsS "http://localhost:8123/?enable_http_compression=1" \
+    -H 'Accept-Encoding: gzip' --output result.gz -d 'SELECT number FROM system.numbers LIMIT 3'
+$ zcat result.gz
+0
+1
+2
+```
+
+## Default Database {#default-database}
+
 You can use the ‘database’ URL parameter or the ‘X-ClickHouse-Database’ header to specify the default database.
 
 ``` bash
diff --git a/docs/en/interfaces/third-party/client-libraries.md b/docs/en/interfaces/third-party/client-libraries.md
index c08eec61b1c..f5c85289171 100644
--- a/docs/en/interfaces/third-party/client-libraries.md
+++ b/docs/en/interfaces/third-party/client-libraries.md
@@ -23,6 +23,7 @@ toc_title: Client Libraries
     -   [SeasClick C++ client](https://github.com/SeasX/SeasClick)
     -   [one-ck](https://github.com/lizhichao/one-ck)
     -   [glushkovds/phpclickhouse-laravel](https://packagist.org/packages/glushkovds/phpclickhouse-laravel)
+    -   [kolya7k ClickHouse PHP extension](https://github.com//kolya7k/clickhouse-php)
 -   Go
     -   [clickhouse](https://github.com/kshvakov/clickhouse/)
     -   [go-clickhouse](https://github.com/roistat/go-clickhouse)
diff --git a/docs/en/interfaces/third-party/gui.md b/docs/en/interfaces/third-party/gui.md
index fa123d8b23d..e54e40441ca 100644
--- a/docs/en/interfaces/third-party/gui.md
+++ b/docs/en/interfaces/third-party/gui.md
@@ -167,4 +167,23 @@ Features:
 
 [How to configure ClickHouse in Looker.](https://docs.looker.com/setup-and-management/database-config/clickhouse)
 
-[Original article](https://clickhouse.tech/docs/en/interfaces/third-party/gui/) <!--hide-->
+### SeekTable {#seektable}
+
+[SeekTable](https://www.seektable.com) is a self-service BI tool for data exploration and operational reporting. It is available both as a cloud service and a self-hosted version. Reports from SeekTable may be embedded into any web-app.
+
+Features:
+
+-   Business users-friendly reports builder.
+-   Powerful report parameters for SQL filtering and report-specific query customizations.
+-   Can connect to ClickHouse both with a native TCP/IP endpoint and a HTTP(S) interface (2 different drivers).
+-   It is possible to use all power of ClickHouse SQL dialect in dimensions/measures definitions.
+-   [Web API](https://www.seektable.com/help/web-api-integration) for automated reports generation.
+-   Supports reports development flow with account data [backup/restore](https://www.seektable.com/help/self-hosted-backup-restore); data models (cubes) / reports configuration is a human-readable XML and can be stored under version control system.
+
+SeekTable is [free](https://www.seektable.com/help/cloud-pricing) for personal/individual usage.
+
+[How to configure ClickHouse connection in SeekTable.](https://www.seektable.com/help/clickhouse-pivot-table)
+
+### Chadmin {#chadmin}
+
+[Chadmin](https://github.com/bun4uk/chadmin) is a simple UI where you can visualize your currently running queries on your ClickHouse cluster and info about them and kill them if you want.
diff --git a/docs/en/introduction/adopters.md b/docs/en/introduction/adopters.md
index 454d856f779..fa257a84173 100644
--- a/docs/en/introduction/adopters.md
+++ b/docs/en/introduction/adopters.md
@@ -12,9 +12,13 @@ toc_title: Adopters
 |---------|----------|---------|--------------|------------------------------------------------------------------------------|-----------|
 | <a href="https://2gis.ru" class="favicon">2gis</a> | Maps | Monitoring | — | — | [Talk in Russian, July 2019](https://youtu.be/58sPkXfq6nw) |
 | <a href="https://getadmiral.com/" class="favicon">Admiral</a> | Martech | Engagement Management | — | — | [Webinar Slides, June 2020](https://altinity.com/presentations/2020/06/16/big-data-in-real-time-how-clickhouse-powers-admirals-visitor-relationships-for-publishers) |
+| <a href="http://www.adscribe.tv/" class="favicon">AdScribe</a> | Ads | TV Analytics | — | — | [A quote from CTO](https://altinity.com/24x7-support/) |
+| <a href="https://ahrefs.com/" class="favicon">Ahrefs</a> | SEO | Analytics | — | — | [Job listing](https://ahrefs.com/jobs/data-scientist-search) |
 | <a href="https://cn.aliyun.com/" class="favicon">Alibaba Cloud</a> | Cloud | Managed Service | — | — | [Official Website](https://help.aliyun.com/product/144466.html) |
 | <a href="https://alohabrowser.com/" class="favicon">Aloha Browser</a> | Mobile App | Browser backend | — | — | [Slides in Russian, May 2019](https://presentations.clickhouse.tech/meetup22/aloha.pdf) |
+| <a href="https://altinity.com/" class="favicon">Altinity</a> | Cloud, SaaS | Main product | — | — | [Official Website](https://altinity.com/) |
 | <a href="https://amadeus.com/" class="favicon">Amadeus</a> | Travel | Analytics | — | — | [Press Release, April 2018](https://www.altinity.com/blog/2018/4/5/amadeus-technologies-launches-investment-and-insights-tool-based-on-machine-learning-and-strategy-algorithms) |
+| <a href="https://apiroad.net/" class="favicon">ApiRoad</a> | API marketplace | Analytics | — | — | [Blog post, Nov 2018, Mar 2020](https://pixeljets.com/blog/clickhouse-vs-elasticsearch/) |
 | <a href="https://www.appsflyer.com" class="favicon">Appsflyer</a> | Mobile analytics | Main product | — | — | [Talk in Russian, July 2019](https://www.youtube.com/watch?v=M3wbRlcpBbY) |
 | <a href="https://arenadata.tech/" class="favicon">ArenaData</a> | Data Platform | Main product | — | — | [Slides in Russian, December 2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup38/indexes.pdf) |
 | <a href="https://avito.ru/" class="favicon">Avito</a> | Classifieds | Monitoring | — | — | [Meetup, April 2020](https://www.youtube.com/watch?v=n1tm4j4W8ZQ) |
@@ -37,23 +41,27 @@ toc_title: Adopters
 | <a href="https://www.creditx.com" class="favicon">CraiditX 氪信</a> | Finance AI | Analysis | — | — | [Slides in English, November 2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup33/udf.pptx) |
 | <a href="https://crazypanda.ru/en/" class="favicon">Crazypanda</a> | Games | | — | — | Live session on ClickHouse meetup |
 | <a href="https://www.criteo.com/" class="favicon">Criteo</a> | Retail | Main product | — | — | [Slides in English, October 2018](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup18/3_storetail.pptx) |
+| <a href="https://cryptology.com/" class="favicon">Cryptology</a> | Digital Assets Trading Platform | — | — | — | [Job advertisement, March 2021](https://career.habr.com/companies/cryptology/vacancies) |
 | <a href="https://www.chinatelecomglobal.com/" class="favicon">Dataliance for China Telecom</a> | Telecom | Analytics | — | — | [Slides in Chinese, January 2018](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup12/telecom.pdf) |
 | <a href="https://db.com" class="favicon">Deutsche Bank</a> | Finance | BI Analytics | — | — | [Slides in English, October 2019](https://bigdatadays.ru/wp-content/uploads/2019/10/D2-H3-3_Yakunin-Goihburg.pdf) |
 | <a href="https://deeplay.io/eng/" class="favicon">Deeplay</a> | Gaming Analytics | — | — | — | [Job advertisement, 2020](https://career.habr.com/vacancies/1000062568) |
 | <a href="https://www.diva-e.com" class="favicon">Diva-e</a> | Digital consulting | Main Product | — | — | [Slides in English, September 2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup29/ClickHouse-MeetUp-Unusual-Applications-sd-2019-09-17.pdf) |
 | <a href="https://www.ecwid.com/" class="favicon">Ecwid</a> | E-commerce SaaS | Metrics, Logging | — | — | [Slides in Russian, April 2019](https://nastachku.ru/var/files/1/presentation/backend/2_Backend_6.pdf) |
 | <a href="https://www.ebay.com/" class="favicon">eBay</a> | E-commerce | Logs, Metrics and Events | — | — | [Official website, Sep 2020](https://tech.ebayinc.com/engineering/ou-online-analytical-processing/) |
-| <a href="https://www.exness.com" class="favicon">Exness</a> | Trading | Metrics, Logging | — | — | [Talk in Russian, May 2019](https://youtu.be/_rpU-TvSfZ8?t=3215) |
+| <a href="https://www.exness.com/" class="favicon">Exness</a> | Trading | Metrics, Logging | — | — | [Talk in Russian, May 2019](https://youtu.be/_rpU-TvSfZ8?t=3215) |
+| <a href="https://www.eventbunker.io/" class="favicon">EventBunker.io</a> | Serverless Data Processing | — | — | — | [Tweet, April 2021](https://twitter.com/Halil_D_/status/1379839133472985091) |
 | <a href="https://fastnetmon.com/" class="favicon">FastNetMon</a> | DDoS Protection | Main Product | | — | [Official website](https://fastnetmon.com/docs-fnm-advanced/fastnetmon-advanced-traffic-persistency/) |
 | <a href="https://www.flipkart.com/" class="favicon">Flipkart</a> | e-Commerce | — | — | — | [Talk in English, July 2020](https://youtu.be/GMiXCMFDMow?t=239) |
 | <a href="https://fun.co/rp" class="favicon">FunCorp</a> | Games | | — | 14 bn records/day as of Jan 2021 | [Article](https://www.altinity.com/blog/migrating-from-redshift-to-clickhouse) |
 | <a href="https://geniee.co.jp" class="favicon">Geniee</a> | Ad network | Main product | — | — | [Blog post in Japanese, July 2017](https://tech.geniee.co.jp/entry/2017/07/20/160100) |
 | <a href="https://www.genotek.ru/" class="favicon">Genotek</a> | Bioinformatics | Main product | — | — | [Video, August 2020](https://youtu.be/v3KyZbz9lEE) |
+| <a href="https://glaber.io/" class="favicon">Glaber</a> | Monitoring | Main product | — | — | [Website](https://glaber.io/) |
 | <a href="https://www.huya.com/" class="favicon">HUYA</a> | Video Streaming | Analytics | — | — | [Slides in Chinese, October 2018](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup19/7.%20ClickHouse万亿数据分析实践%20李本旺(sundy-li)%20虎牙.pdf) |
 | <a href="https://www.the-ica.com/" class="favicon">ICA</a> | FinTech | Risk Management | — | — | [Blog Post in English, Sep 2020](https://altinity.com/blog/clickhouse-vs-redshift-performance-for-fintech-risk-management?utm_campaign=ClickHouse%20vs%20RedShift&utm_content=143520807&utm_medium=social&utm_source=twitter&hss_channel=tw-3894792263) |
 | <a href="https://www.idealista.com" class="favicon">Idealista</a> | Real Estate | Analytics | — | — | [Blog Post in English, April 2019](https://clickhouse.tech/blog/en/clickhouse-meetup-in-madrid-on-april-2-2019) |
 | <a href="https://www.infovista.com/" class="favicon">Infovista</a> | Networks | Analytics | — | — | [Slides in English, October 2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup30/infovista.pdf) |
 | <a href="https://www.innogames.com" class="favicon">InnoGames</a> | Games | Metrics, Logging | — | — | [Slides in Russian, September 2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup28/graphite_and_clickHouse.pdf) |
+| <a href="https://instabug.com/" class="favicon">Instabug</a> | APM Platform | Main product | — | — | [A quote from Co-Founder](https://altinity.com/) |
 | <a href="https://www.instana.com" class="favicon">Instana</a> | APM Platform | Main product | — | — | [Twitter post](https://twitter.com/mieldonkers/status/1248884119158882304) |
 | <a href="https://integros.com" class="favicon">Integros</a> | Platform for video services | Analytics | — | — | [Slides in Russian, May 2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup22/strategies.pdf) |
 | <a href="https://ippon.tech" class="favicon">Ippon Technologies</a> | Technology Consulting | — | — | — | [Talk in English, July 2020](https://youtu.be/GMiXCMFDMow?t=205) |
@@ -65,15 +73,20 @@ toc_title: Adopters
 | <a href="https://www.lbl.gov" class="favicon">Lawrence Berkeley National Laboratory</a> | Research | Traffic analysis | 1 server | 11.8 TiB | [Slides in English, April 2019](https://www.smitasin.com/presentations/2019-04-17_DOE-NSM.pdf) |
 | <a href="https://lifestreet.com/" class="favicon">LifeStreet</a> | Ad network | Main product | 75 servers (3 replicas) | 5.27 PiB | [Blog post in Russian, February 2017](https://habr.com/en/post/322620/) |
 | <a href="https://mcs.mail.ru/" class="favicon">Mail.ru Cloud Solutions</a> | Cloud services | Main product | — | — | [Article in Russian](https://mcs.mail.ru/help/db-create/clickhouse#) |
+| <a href="https://maxilect.com/" class="favicon">MAXILECT</a> | Ad Tech, Blockchain, ML, AI | — | — | — | [Job advertisement, 2021](https://www.linkedin.com/feed/update/urn:li:activity:6780842017229430784/) |
 | <a href="https://tech.mymarilyn.ru" class="favicon">Marilyn</a> | Advertising | Statistics | — | — | [Talk in Russian, June 2017](https://www.youtube.com/watch?v=iXlIgx2khwc) |
 | <a href="https://mellodesign.ru/" class="favicon">Mello</a> | Marketing | Analytics | 1 server | — | [Article, Oct 2020](https://vc.ru/marketing/166180-razrabotka-tipovogo-otcheta-skvoznoy-analitiki) |
 | <a href="https://www.messagebird.com" class="favicon">MessageBird</a> | Telecommunications | Statistics | — | — | [Slides in English, November 2018](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup20/messagebird.pdf) |
-| <a href="https://www.mindsdb.com/" class="favicon">MindsDB</a> | Machine Learning | Main Product | — | — | [Official Website](https://www.mindsdb.com/blog/machine-learning-models-as-tables-in-ch) |x
+| <a href="https://clarity.microsoft.com/" class="favicon">Microsoft</a> | Web Analytics | Clarity (Main Product) | — | — | [A question on GitHub](https://github.com/ClickHouse/ClickHouse/issues/21556) |
+| <a href="https://www.mindsdb.com/" class="favicon">MindsDB</a> | Machine Learning | Main Product | — | — | [Official Website](https://www.mindsdb.com/blog/machine-learning-models-as-tables-in-ch) |
 | <a href="https://mux.com/" class="favicon">MUX</a> | Online Video | Video Analytics | — | — | [Talk in English, August 2019](https://altinity.com/presentations/2019/8/13/how-clickhouse-became-the-default-analytics-database-for-mux/) |
 | <a href="https://www.mgid.com/" class="favicon">MGID</a> | Ad network | Web-analytics | — | — | [Blog post in Russian, April 2020](http://gs-studio.com/news-about-it/32777----clickhouse---c) |
+| <a href="https://www.netskope.com/" class="favicon">Netskope</a> | Network Security | — | — | — | [Job advertisement, March 2021](https://www.mendeley.com/careers/job/senior-software-developer-backend-developer-1346348) |
+| <a href="https://niclabs.cl/" class="favicon">NIC Labs</a> | Network Monitoring | RaTA-DNS | — | — | [Blog post, March 2021](https://niclabs.cl/ratadns/2021/03/Clickhouse) |
 | <a href="https://getnoc.com/" class="favicon">NOC Project</a> | Network Monitoring | Analytics | Main Product | — | [Official Website](https://getnoc.com/features/big-data/) |
 | <a href="https://www.nuna.com/" class="favicon">Nuna Inc.</a> | Health Data Analytics | — | — | — | [Talk in English, July 2020](https://youtu.be/GMiXCMFDMow?t=170) |
 | <a href="https://www.oneapm.com/" class="favicon">OneAPM</a> | Monitorings and Data Analysis | Main product | — | — | [Slides in Chinese, October 2018](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup19/8.%20clickhouse在OneAPM的应用%20杜龙.pdf) |
+| <a href="https://corp.ozon.com/" class="favicon">OZON</a> | E-commerce | — | — | — | [Official website](https://job.ozon.ru/vacancy/razrabotchik-clickhouse-ekspluatatsiya-40991870/) |
 | <a href="https://panelbear.com/" class="favicon">Panelbear | Analytics | Monitoring and Analytics | — | — | [Tech Stack, November 2020](https://panelbear.com/blog/tech-stack/) |
 | <a href="https://www.percent.cn/" class="favicon">Percent 百分点</a> | Analytics | Main Product | — | — | [Slides in Chinese, June 2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup24/4.%20ClickHouse万亿数据双中心的设计与实践%20.pdf) |
 | <a href="https://www.percona.com/" class="favicon">Percona</a> | Performance analysis | Percona Monitoring and Management | — | — | [Official website, Mar 2020](https://www.percona.com/blog/2020/03/30/advanced-query-analysis-in-percona-monitoring-and-management-with-direct-clickhouse-access/) |
@@ -90,14 +103,17 @@ toc_title: Adopters
 | <a href="https://rspamd.com/" class="favicon">Rspamd</a> | Antispam | Analytics | — | — | [Official Website](https://rspamd.com/doc/modules/clickhouse.html) |
 | <a href="https://rusiem.com/en" class="favicon">RuSIEM</a> | SIEM | Main Product | — | — | [Official Website](https://rusiem.com/en/products/architecture) |
 | <a href="https://www.s7.ru" class="favicon">S7 Airlines</a> | Airlines | Metrics, Logging | — | — | [Talk in Russian, March 2019](https://www.youtube.com/watch?v=nwG68klRpPg&t=15s) |
+| <a href="https://www.sberbank.com/index" class="favicon">Sber</a> | Banking, Fintech, Retail, Cloud, Media | — | — | — | [Job advertisement, March 2021](https://career.habr.com/vacancies/1000073536) |
 | <a href="https://www.scireum.de/" class="favicon">scireum GmbH</a> | e-Commerce | Main product | — | — | [Talk in German, February 2020](https://www.youtube.com/watch?v=7QWAn5RbyR4) |
 | <a href="https://segment.com/" class="favicon">Segment</a> | Data processing | Main product | 9 * i3en.3xlarge nodes 7.5TB NVME SSDs, 96GB Memory, 12 vCPUs | — | [Slides, 2019](https://slides.com/abraithwaite/segment-clickhouse) |
+| <a href="https://sembot.io/" class="favicon">sembot.io</a> | Shopping Ads | — | — | — | A comment on LinkedIn, 2020 |
 | <a href="https://www.semrush.com/" class="favicon">SEMrush</a> | Marketing | Main product | — | — | [Slides in Russian, August 2018](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup17/5_semrush.pdf) |
 | <a href="https://sentry.io/" class="favicon">Sentry</a> | Software Development | Main product | — | — | [Blog Post in English, May 2019](https://blog.sentry.io/2019/05/16/introducing-snuba-sentrys-new-search-infrastructure) |
 | <a href="https://seo.do/" class="favicon">seo.do</a> | Analytics | Main product | — | — | [Slides in English, November 2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup35/CH%20Presentation-%20Metehan%20Çetinkaya.pdf) |
 | <a href="http://www.sgk.gov.tr/wps/portal/sgk/tr" class="favicon">SGK</a> | Goverment Social Security | Analytics | — | — | [Slides in English, November 2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup35/ClickHouse%20Meetup-Ramazan%20POLAT.pdf) |
 | <a href="http://english.sina.com/index.html" class="favicon">Sina</a> | News | — | — | — | [Slides in Chinese, October 2018](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup19/6.%20ClickHouse最佳实践%20高鹏_新浪.pdf) |
 | <a href="https://smi2.ru/" class="favicon">SMI2</a> | News | Analytics | — | — | [Blog Post in Russian, November 2017](https://habr.com/ru/company/smi2/blog/314558/) |
+| <a href="https://www.spark.co.nz/" class="favicon">Spark New Zealand</a> | Telecommunications | Security Operations | — | — | [Blog Post, Feb 2020](https://blog.n0p.me/2020/02/2020-02-05-dnsmonster/) |
 | <a href="https://www.splunk.com/" class="favicon">Splunk</a> | Business Analytics | Main product | — | — | [Slides in English, January 2018](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup12/splunk.pdf) |
 | <a href="https://www.spotify.com" class="favicon">Spotify</a> | Music | Experimentation | — | — | [Slides, July 2018](https://www.slideshare.net/glebus/using-clickhouse-for-experimentation-104247173) |
 | <a href="https://www.staffcop.ru/" class="favicon">Staffcop</a> | Information Security | Main Product | — | — | [Official website, Documentation](https://www.staffcop.ru/sce43) |
@@ -106,22 +122,31 @@ toc_title: Adopters
 | <a href="https://www.tencent.com" class="favicon">Tencent</a> | Big Data | Data processing | — | — | [Slides in Chinese, October 2018](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup19/5.%20ClickHouse大数据集群应用_李俊飞腾讯网媒事业部.pdf) |
 | <a href="https://www.tencent.com" class="favicon">Tencent</a> | Messaging | Logging | — | — | [Talk in Chinese, November 2019](https://youtu.be/T-iVQRuw-QY?t=5050) |
 | <a href="https://www.tencentmusic.com/" class="favicon">Tencent Music Entertainment (TME)</a> | BigData | Data processing | — | — | [Blog in Chinese, June 2020](https://cloud.tencent.com/developer/article/1637840) |
+| <a href="https://www.tinybird.co/" class="favicon">Tinybird</a> | Real-time Data Products | Data processing | — | — | [Official website](https://www.tinybird.co/) |
 | <a href="https://trafficstars.com/" class="favicon">Traffic Stars</a> | AD network | — | — | — | [Slides in Russian, May 2018](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup15/lightning/ninja.pdf) |
 | <a href="https://www.uber.com" class="favicon">Uber</a> | Taxi | Logging | — | — | [Slides, February 2020](https://presentations.clickhouse.tech/meetup40/uber.pdf) |
+| <a href="https://hello.utmstat.com/" class="favicon">UTMSTAT</a> | Analytics | Main product | — | — | [Blog post, June 2020](https://vc.ru/tribuna/133956-striming-dannyh-iz-servisa-skvoznoy-analitiki-v-clickhouse) |
 | <a href="https://vk.com" class="favicon">VKontakte</a> | Social Network | Statistics, Logging | — | — | [Slides in Russian, August 2018](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup17/3_vk.pdf) |
+| <a href="https://www.vmware.com/" class="favicon">VMWare</a> | Cloud | VeloCloud, SDN | — | — | [Product documentation](https://docs.vmware.com/en/vRealize-Operations-Manager/8.3/com.vmware.vcom.metrics.doc/GUID-A9AD72E1-C948-4CA2-971B-919385AB3CA8.html) |
 | <a href="https://www.walmartlabs.com/" class="favicon">Walmart Labs</a> | Internet, Retail | — | — | — | [Talk in English, July 2020](https://youtu.be/GMiXCMFDMow?t=144) |
 | <a href="https://wargaming.com/en/" class="favicon">Wargaming</a> | Games | | — | — | [Interview](https://habr.com/en/post/496954/) |
+| <a href="https://www.wildberries.ru/" class="favicon">Wildberries</a> | E-commerce | | — | — | [Official website](https://it.wildberries.ru/) |
 | <a href="https://wisebits.com/" class="favicon">Wisebits</a> | IT Solutions | Analytics | — | — | [Slides in Russian, May 2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup22/strategies.pdf) |
 | <a href="https://www.workato.com/" class="favicon">Workato</a> | Automation Software | — | — | — | [Talk in English, July 2020](https://youtu.be/GMiXCMFDMow?t=334) |
+| <a href="https://xenoss.io/" class="favicon">Xenoss</a> | Marketing, Advertising | — | — | — | [Instagram, March 2021](https://www.instagram.com/p/CNATV7qBgB1/) |
 | <a href="http://www.xiaoxintech.cn/" class="favicon">Xiaoxin Tech</a> | Education | Common purpose | — | — | [Slides in English, November 2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup33/sync-clickhouse-with-mysql-mongodb.pptx) |
 | <a href="https://www.ximalaya.com/" class="favicon">Ximalaya</a> | Audio sharing | OLAP | — | — | [Slides in English, November 2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup33/ximalaya.pdf) |
 | <a href="https://cloud.yandex.ru/services/managed-clickhouse" class="favicon">Yandex Cloud</a> | Public Cloud | Main product | — | — | [Talk in Russian, December 2019](https://www.youtube.com/watch?v=pgnak9e_E0o) |
 | <a href="https://cloud.yandex.ru/services/datalens" class="favicon">Yandex DataLens</a> | Business Intelligence | Main product | — | — | [Slides in Russian, December 2019](https://presentations.clickhouse.tech/meetup38/datalens.pdf) |
 | <a href="https://market.yandex.ru/" class="favicon">Yandex Market</a> | e-Commerce | Metrics, Logging | — | — | [Talk in Russian, January 2019](https://youtu.be/_l1qP0DyBcA?t=478) |
 | <a href="https://metrica.yandex.com" class="favicon">Yandex Metrica</a> | Web analytics | Main product | 630 servers in one cluster, 360 servers in another cluster, 1862 servers in one department | 133 PiB / 8.31 PiB / 120 trillion records | [Slides, February 2020](https://presentations.clickhouse.tech/meetup40/introduction/#13) |
+| <a href="https://www.yotascale.com/" class="favicon">Yotascale</a> | Cloud | Data pipeline | — | 2 bn records/day | [LinkedIn (Accomplishments)](https://www.linkedin.com/in/adilsaleem/) |
 | <a href="https://htc-cs.ru/" class="favicon">ЦВТ</a> | Software Development | Metrics, Logging | — | — | [Blog Post, March 2019, in Russian](https://vc.ru/dev/62715-kak-my-stroili-monitoring-na-prometheus-clickhouse-i-elk) |
 | <a href="https://mkb.ru/" class="favicon">МКБ</a> | Bank | Web-system monitoring | — | — | [Slides in Russian, September 2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup28/mkb.pdf) |
 | <a href="https://cft.ru/" class="favicon">ЦФТ</a> | Banking, Financial products, Payments | — | — | — | [Meetup in Russian, April 2020](https://team.cft.ru/events/162) |
+| <a href="https://promo.croc.ru/digitalworker" class="favicon">Цифровой Рабочий</a> | Industrial IoT, Analytics | — | — | — | [Blog post in Russian, March 2021](https://habr.com/en/company/croc/blog/548018/) |
 | <a href="https://www.kakaocorp.com/" class="favicon">kakaocorp</a> | Internet company | — | — | — | [if(kakao)2020 conference](https://if.kakao.com/session/117) |
+| <a href="https://shop.okraina.ru/" class="favicon">ООО «МПЗ Богородский»</a> | Agriculture | — | — | — | [Article in Russian, November 2020](https://cloud.yandex.ru/cases/okraina) |
+| <a href="https://www.tesla.com/" class="favicon">Tesla</a> | Electric vehicle and clean energy company | — | — | — | [Vacancy description, March 2021](https://news.ycombinator.com/item?id=26306170) |
 
 [Original article](https://clickhouse.tech/docs/en/introduction/adopters/) <!--hide-->
diff --git a/docs/en/introduction/distinctive-features.md b/docs/en/introduction/distinctive-features.md
index 4a8f31b8d56..be7c2d2e7c1 100644
--- a/docs/en/introduction/distinctive-features.md
+++ b/docs/en/introduction/distinctive-features.md
@@ -7,9 +7,9 @@ toc_title: Distinctive Features
 
 ## True Column-Oriented Database Management System {#true-column-oriented-dbms}
 
-In a true column-oriented DBMS, no extra data is stored with the values. Among other things, this means that constant-length values must be supported, to avoid storing their length “number” next to the values. As an example, a billion UInt8-type values should consume around 1 GB uncompressed, or this strongly affects the CPU use. It is essential to store data compactly (without any “garbage”) even when uncompressed, since the speed of decompression (CPU usage) depends mainly on the volume of uncompressed data.
+In a real column-oriented DBMS, no extra data is stored with the values. Among other things, this means that constant-length values must be supported, to avoid storing their length “number” next to the values. For example, a billion UInt8-type values should consume around 1 GB uncompressed, or this strongly affects the CPU use. It is essential to store data compactly (without any “garbage”) even when uncompressed since the speed of decompression (CPU usage) depends mainly on the volume of uncompressed data.
 
-It is worth noting because there are systems that can store values of different columns separately, but that can’t effectively process analytical queries due to their optimization for other scenarios. Examples are HBase, BigTable, Cassandra, and HyperTable. In these systems, you would get throughput around a hundred thousand rows per second, but not hundreds of millions of rows per second.
+It is worth noting because there are systems that can store values of different columns separately, but that can’t effectively process analytical queries due to their optimization for other scenarios. Examples are HBase, BigTable, Cassandra, and HyperTable. You would get throughput around a hundred thousand rows per second in these systems, but not hundreds of millions of rows per second.
 
 It’s also worth noting that ClickHouse is a database management system, not a single database. ClickHouse allows creating tables and databases in runtime, loading data, and running queries without reconfiguring and restarting the server.
 
diff --git a/docs/en/operations/caches.md b/docs/en/operations/caches.md
index 7b096b76f75..ec7e4239a9d 100644
--- a/docs/en/operations/caches.md
+++ b/docs/en/operations/caches.md
@@ -8,18 +8,21 @@ toc_title: Caches
 When performing queries, ClichHouse uses different caches.
 
 Main cache types:
+
 - `mark_cache` — Cache of marks used by table engines of the [MergeTree](../engines/table-engines/mergetree-family/mergetree.md) family.
 - `uncompressed_cache` — Cache of uncompressed data used by table engines of the [MergeTree](../engines/table-engines/mergetree-family/mergetree.md) family.
 
 Additional cache types:
-- DNS cache
-- [regexp](../interfaces/formats.md#data-format-regexp) cache
-- compiled expressions cache
-- [Avro format](../interfaces/formats.md#data-format-avro) schemas cache
-- [dictionaries data cache](../sql-reference/dictionaries/index.md)
+
+- DNS cache.
+- [Regexp](../interfaces/formats.md#data-format-regexp) cache.
+- Compiled expressions cache.
+- [Avro format](../interfaces/formats.md#data-format-avro) schemas cache.
+- [Dictionaries](../sql-reference/dictionaries/index.md) data cache.
 
 Indirectly used:
-- OS page cache
+
+- OS page cache.
 
 To drop cache, use [SYSTEM DROP ... CACHE](../sql-reference/statements/system.md) statements.
 
diff --git a/docs/en/operations/external-authenticators/index.md b/docs/en/operations/external-authenticators/index.md
index 95f80f192f5..aa220f50ef8 100644
--- a/docs/en/operations/external-authenticators/index.md
+++ b/docs/en/operations/external-authenticators/index.md
@@ -11,3 +11,6 @@ ClickHouse supports authenticating and managing users using external services.
 The following external authenticators and directories are supported:
 
 - [LDAP](./ldap.md#external-authenticators-ldap) [Authenticator](./ldap.md#ldap-external-authenticator) and [Directory](./ldap.md#ldap-external-user-directory)
+- Kerberos [Authenticator](./kerberos.md#external-authenticators-kerberos)
+
+[Original article](https://clickhouse.tech/docs/en/operations/external-authenticators/index/) <!--hide-->
diff --git a/docs/en/operations/external-authenticators/kerberos.md b/docs/en/operations/external-authenticators/kerberos.md
new file mode 100644
index 00000000000..5fe0b2bfc37
--- /dev/null
+++ b/docs/en/operations/external-authenticators/kerberos.md
@@ -0,0 +1,115 @@
+# Kerberos {#external-authenticators-kerberos}
+
+Existing and properly configured ClickHouse users can be authenticated via Kerberos authentication protocol.
+
+Currently, Kerberos can only be used as an external authenticator for existing users, which are defined in `users.xml` or in local access control paths. Those users may only use HTTP requests and must be able to authenticate using GSS-SPNEGO mechanism.
+
+For this approach, Kerberos must be configured in the system and must be enabled in ClickHouse config.
+
+
+## Enabling Kerberos in ClickHouse {#enabling-kerberos-in-clickhouse}
+
+To enable Kerberos, one should include `kerberos` section in `config.xml`. This section may contain additional parameters.
+
+#### Parameters:
+
+- `principal` - canonical service principal name that will be acquired and used when accepting security contexts.
+  - This parameter is optional, if omitted, the default principal will be used.
+
+
+- `realm` - a realm, that will be used to restrict authentication to only those requests whose initiator's realm matches it.
+  - This parameter is optional, if omitted, no additional filtering by realm will be applied.
+
+Example (goes into `config.xml`):
+
+```xml
+<yandex>
+    <!- ... -->
+    <kerberos />
+</yandex>
+```
+
+With principal specification:
+
+```xml
+<yandex>
+    <!- ... -->
+    <kerberos>
+        <principal>HTTP/clickhouse.example.com@EXAMPLE.COM</principal>
+    </kerberos>
+</yandex>
+```
+
+With filtering by realm:
+
+```xml
+<yandex>
+    <!- ... -->
+    <kerberos>
+        <realm>EXAMPLE.COM</realm>
+    </kerberos>
+</yandex>
+```
+
+!!! warning "Note"
+    You can define only one `kerberos` section. The presence of multiple `kerberos` sections will force ClickHouse to disable Kerberos authentication.
+
+!!! warning "Note"
+    `principal` and `realm` sections cannot be specified at the same time. The presence of both `principal` and `realm` sections will force ClickHouse to disable Kerberos authentication.
+
+
+## Kerberos as an external authenticator for existing users {#kerberos-as-an-external-authenticator-for-existing-users}
+
+Kerberos can be used as a method for verifying the identity of locally defined users (users defined in `users.xml` or in local access control paths). Currently, **only** requests over the HTTP interface can be *kerberized* (via GSS-SPNEGO mechanism).
+
+Kerberos principal name format usually follows this pattern:
+
+- *primary/instance@REALM*
+
+The */instance* part may occur zero or more times. **The *primary* part of the canonical principal name of the initiator is expected to match the kerberized user name for authentication to succeed**.
+
+### Enabling Kerberos in `users.xml` {#enabling-kerberos-in-users-xml}
+
+In order to enable Kerberos authentication for the user, specify `kerberos` section instead of `password` or similar sections in the user definition.
+
+Parameters:
+
+- `realm` - a realm that will be used to restrict authentication to only those requests whose initiator's realm matches it.
+  - This parameter is optional, if omitted, no additional filtering by realm will be applied.
+
+Example (goes into `users.xml`):
+
+```xml
+<yandex>
+    <!- ... -->
+    <users>
+        <!- ... -->
+        <my_user>
+            <!- ... -->
+            <kerberos>
+                <realm>EXAMPLE.COM</realm>
+            </kerberos>
+        </my_user>
+    </users>
+</yandex>
+```
+
+!!! warning "Warning"
+    Note that Kerberos authentication cannot be used alongside with any other authentication mechanism. The presence of any other sections like `password` alongside `kerberos` will force ClickHouse to shutdown.
+
+!!! info "Reminder"
+    Note, that now, once user `my_user` uses `kerberos`, Kerberos must be enabled in the main `config.xml` file as described previously.
+
+### Enabling Kerberos using SQL {#enabling-kerberos-using-sql}
+
+When [SQL-driven Access Control and Account Management](../access-rights.md#access-control) is enabled in ClickHouse, users identified by Kerberos can also be created using SQL statements.
+
+```sql
+CREATE USER my_user IDENTIFIED WITH kerberos REALM 'EXAMPLE.COM'
+```
+
+...or, without filtering by realm:
+
+```sql
+CREATE USER my_user IDENTIFIED WITH kerberos
+```
diff --git a/docs/en/operations/external-authenticators/ldap.md b/docs/en/operations/external-authenticators/ldap.md
index 36a13227852..1b65ecc968b 100644
--- a/docs/en/operations/external-authenticators/ldap.md
+++ b/docs/en/operations/external-authenticators/ldap.md
@@ -1,15 +1,17 @@
-# LDAP {#external-authenticators-ldap} 
+# LDAP {#external-authenticators-ldap}
 
 LDAP server can be used to authenticate ClickHouse users. There are two different approaches for doing this:
 
-- use LDAP as an external authenticator for existing users, which are defined in `users.xml` or in local access control paths
-- use LDAP as an external user directory and allow locally undefined users to be authenticated if they exist on the LDAP server
+- Use LDAP as an external authenticator for existing users, which are defined in `users.xml` or in local access control paths.
+- Use LDAP as an external user directory and allow locally undefined users to be authenticated if they exist on the LDAP server.
 
-For both of these approaches, an internally named LDAP server must be defined in the ClickHouse config so that other parts of config are able to refer to it.
+For both of these approaches, an internally named LDAP server must be defined in the ClickHouse config so that other parts of the config can refer to it.
 
 ## LDAP Server Definition {#ldap-server-definition}
 
-To define LDAP server you must add `ldap_servers` section to the `config.xml`. For example,
+To define LDAP server you must add `ldap_servers` section to the `config.xml`.
+
+**Example**
 
 ```xml
 <yandex>
@@ -35,38 +37,35 @@ To define LDAP server you must add `ldap_servers` section to the `config.xml`. F
 
 Note, that you can define multiple LDAP servers inside the `ldap_servers` section using distinct names.
 
-Parameters:
+**Parameters**
 
-- `host` - LDAP server hostname or IP, this parameter is mandatory and cannot be empty.
-- `port` - LDAP server port, default is `636` if `enable_tls` is set to `true`, `389` otherwise.
-- `bind_dn` - template used to construct the DN to bind to.
-    - The resulting DN will be constructed by replacing all `{user_name}` substrings of the
-      template with the actual user name during each authentication attempt.
-- `verification_cooldown` - a period of time, in seconds, after a successful bind attempt,
-  during which the user will be assumed to be successfully authenticated for all consecutive
-  requests without contacting the LDAP server.
+- `host` — LDAP server hostname or IP, this parameter is mandatory and cannot be empty.
+- `port` — LDAP server port, default is `636` if `enable_tls` is set to `true`, `389` otherwise.
+- `bind_dn` — Template used to construct the DN to bind to.
+    - The resulting DN will be constructed by replacing all `{user_name}` substrings of the template with the actual user name during each authentication attempt.
+- `verification_cooldown` — A period of time, in seconds, after a successful bind attempt, during which the user will be assumed to be successfully authenticated for all consecutive requests without contacting the LDAP server.
     - Specify `0` (the default) to disable caching and force contacting the LDAP server for each authentication request.
-- `enable_tls` - flag to trigger use of secure connection to the LDAP server.
+- `enable_tls` — A flag to trigger the use of the secure connection to the LDAP server.
     - Specify `no` for plain text `ldap://` protocol (not recommended).
     - Specify `yes` for LDAP over SSL/TLS `ldaps://` protocol (recommended, the default).
     - Specify `starttls` for legacy StartTLS protocol (plain text `ldap://` protocol, upgraded to TLS).
-- `tls_minimum_protocol_version` - the minimum protocol version of SSL/TLS.
+- `tls_minimum_protocol_version` — The minimum protocol version of SSL/TLS.
     - Accepted values are: `ssl2`, `ssl3`, `tls1.0`, `tls1.1`, `tls1.2` (the default).
-- `tls_require_cert` - SSL/TLS peer certificate verification behavior.
+- `tls_require_cert` — SSL/TLS peer certificate verification behavior.
     - Accepted values are: `never`, `allow`, `try`, `demand` (the default).
-- `tls_cert_file` - path to certificate file.
-- `tls_key_file` - path to certificate key file.
-- `tls_ca_cert_file` - path to CA certificate file.
-- `tls_ca_cert_dir` - path to the directory containing CA certificates.
-- `tls_cipher_suite` - allowed cipher suite (in OpenSSL notation).
+- `tls_cert_file` — Path to certificate file.
+- `tls_key_file` — Path to certificate key file.
+- `tls_ca_cert_file` — Path to CA certificate file.
+- `tls_ca_cert_dir` — Path to the directory containing CA certificates.
+- `tls_cipher_suite` — Allowed cipher suite (in OpenSSL notation).
 
 ## LDAP External Authenticator {#ldap-external-authenticator}
 
-A remote LDAP server can be used as a method for verifying passwords for locally defined users (users defined in `users.xml` or in local access control paths). In order to achieve this, specify previously defined LDAP server name instead of `password` or similar sections in the user definition.
+A remote LDAP server can be used as a method for verifying passwords for locally defined users (users defined in `users.xml` or in local access control paths). To achieve this, specify previously defined LDAP server name instead of `password` or similar sections in the user definition.
 
-At each login attempt, ClickHouse will try to "bind" to the specified DN defined by the `bind_dn` parameter in the [LDAP server definition](#ldap-server-definition) using the provided credentials, and if successful, the user will be considered authenticated. This is often called a "simple bind" method.
+At each login attempt, ClickHouse tries to "bind" to the specified DN defined by the `bind_dn` parameter in the [LDAP server definition](#ldap-server-definition) using the provided credentials, and if successful, the user is considered authenticated. This is often called a "simple bind" method.
 
-For example,
+**Example**
 
 ```xml
 <yandex>
@@ -85,20 +84,24 @@ For example,
 
 Note, that user `my_user` refers to `my_ldap_server`. This LDAP server must be configured in the main `config.xml` file as described previously.
 
-When SQL-driven [Access Control and Account Management](../access-rights.md#access-control) is enabled in ClickHouse, users that are authenticated by LDAP servers can also be created using the [CRATE USER](../../sql-reference/statements/create/user.md#create-user-statement) statement.
+When SQL-driven [Access Control and Account Management](../access-rights.md#access-control) is enabled, users that are authenticated by LDAP servers can also be created using the [CREATE USER](../../sql-reference/statements/create/user.md#create-user-statement) statement.
 
 
+Query:
+
 ```sql
-CREATE USER my_user IDENTIFIED WITH ldap_server BY 'my_ldap_server'
+CREATE USER my_user IDENTIFIED WITH ldap SERVER 'my_ldap_server';
 ```
 
 ## LDAP Exernal User Directory {#ldap-external-user-directory}
 
-In addition to the locally defined users, a remote LDAP server can be used as a source of user definitions. In order to achieve this, specify previously defined LDAP server name (see [LDAP Server Definition](#ldap-server-definition)) in the `ldap` section inside the `users_directories` section of the `config.xml` file.
+In addition to the locally defined users, a remote LDAP server can be used as a source of user definitions. To achieve this, specify previously defined LDAP server name (see [LDAP Server Definition](#ldap-server-definition)) in the `ldap` section inside the `users_directories` section of the `config.xml` file.
 
-At each login attempt, ClickHouse will try to find the user definition locally and authenticate it as usual, but if the user is not defined, ClickHouse will assume it exists in the external LDAP directory, and will try to "bind" to the specified DN at the LDAP server using the provided credentials. If successful, the user will be considered existing and authenticated. The user will be assigned roles from the list specified in the `roles` section. Additionally, LDAP "search" can be performed and results can be transformed and treated as role names and then be assigned to the user if the `role_mapping` section is also configured. All this implies that the SQL-driven [Access Control and Account Management](../access-rights.md#access-control) is enabled and roles are created using the [CREATE ROLE](../../sql-reference/statements/create/role.md#create-role-statement) statement.
+At each login attempt, ClickHouse tries to find the user definition locally and authenticate it as usual. If the user is not defined, ClickHouse will assume the definition exists in the external LDAP directory and will try to "bind" to the specified DN at the LDAP server using the provided credentials. If successful, the user will be considered existing and authenticated. The user will be assigned roles from the list specified in the `roles` section. Additionally, LDAP "search" can be performed and results can be transformed and treated as role names and then be assigned to the user if the `role_mapping` section is also configured. All this implies that the SQL-driven [Access Control and Account Management](../access-rights.md#access-control) is enabled and roles are created using the [CREATE ROLE](../../sql-reference/statements/create/role.md#create-role-statement) statement.
 
-Example (goes into `config.xml`):
+**Example**
+
+Goes into `config.xml`.
 
 ```xml
 <yandex>
@@ -123,34 +126,24 @@ Example (goes into `config.xml`):
 </yandex>
 ```
 
-Note that `my_ldap_server` referred in the `ldap` section inside the `user_directories` section must be a previously
-defined LDAP server that is configured in the `config.xml` (see [LDAP Server Definition](#ldap-server-definition)).
+Note that `my_ldap_server` referred in the `ldap` section inside the `user_directories` section must be a previously defined LDAP server that is configured in the `config.xml` (see [LDAP Server Definition](#ldap-server-definition)).
 
-Parameters:
+**Parameters**
 
-- `server` - one of LDAP server names defined in the `ldap_servers` config section above.
-  This parameter is mandatory and cannot be empty.
-- `roles` - section with a list of locally defined roles that will be assigned to each user retrieved from the LDAP server.
-    - If no roles are specified here or assigned during role mapping (below), user will not be able
-      to perform any actions after authentication.
-- `role_mapping` - section with LDAP search parameters and mapping rules.
-    - When a user authenticates, while still bound to LDAP, an LDAP search is performed using `search_filter`
-      and the name of the logged in user. For each entry found during that search, the value of the specified
-      attribute is extracted. For each attribute value that has the specified prefix, the prefix is removed,
-      and the rest of the value becomes the name of a local role defined in ClickHouse,
-      which is expected to be created beforehand by the [CREATE ROLE](../../sql-reference/statements/create/role.md#create-role-statement) statement.
+- `server` — One of LDAP server names defined in the `ldap_servers` config section above. This parameter is mandatory and cannot be empty.
+- `roles` — Section with a list of locally defined roles that will be assigned to each user retrieved from the LDAP server.
+    - If no roles are specified here or assigned during role mapping (below), user will not be able to perform any actions after authentication.
+- `role_mapping` — Section with LDAP search parameters and mapping rules.
+    - When a user authenticates, while still bound to LDAP, an LDAP search is performed using `search_filter` and the name of the logged-in user. For each entry found during that search, the value of the specified attribute is extracted. For each attribute value that has the specified prefix, the prefix is removed, and the rest of the value becomes the name of a local role defined in ClickHouse, which is expected to be created beforehand by the [CREATE ROLE](../../sql-reference/statements/create/role.md#create-role-statement) statement.
     - There can be multiple `role_mapping` sections defined inside the same `ldap` section. All of them will be applied.
-        - `base_dn` - template used to construct the base DN for the LDAP search.
-           - The resulting DN will be constructed by replacing all `{user_name}` and `{bind_dn}`
-             substrings of the template with the actual user name and bind DN during each LDAP search.
-        - `scope` - scope of the LDAP search.
+        - `base_dn` — Template used to construct the base DN for the LDAP search.
+           - The resulting DN will be constructed by replacing all `{user_name}` and `{bind_dn}` substrings of the template with the actual user name and bind DN during each LDAP search.
+        - `scope` — Scope of the LDAP search.
             - Accepted values are: `base`, `one_level`, `children`, `subtree` (the default).
-        - `search_filter` - template used to construct the search filter for the LDAP search.
-            - The resulting filter will be constructed by replacing all `{user_name}`, `{bind_dn}`, and `{base_dn}`
-              substrings of the template with the actual user name, bind DN, and base DN during each LDAP search.
+        - `search_filter` — Template used to construct the search filter for the LDAP search.
+            - The resulting filter will be constructed by replacing all `{user_name}`, `{bind_dn}` and `{base_dn}` substrings of the template with the actual user name, bind DN and base DN during each LDAP search.
             - Note, that the special characters must be escaped properly in XML.
-        - `attribute` - attribute name whose values will be returned by the LDAP search.
-        - `prefix` - prefix, that will be expected to be in front of each string in the original
-          list of strings returned by the LDAP search. Prefix will be removed from the original
-          strings and resulting strings will be treated as local role names. Empty, by default.
+        - `attribute` — Attribute name whose values will be returned by the LDAP search.
+        - `prefix` — Prefix, that will be expected to be in front of each string in the original list of strings returned by the LDAP search. The prefix will be removed from the original strings and the resulting strings will be treated as local role names. Empty by default.
 
+[Original article](https://clickhouse.tech/docs/en/operations/external-authenticators/ldap/) <!--hide-->
diff --git a/docs/en/operations/opentelemetry.md b/docs/en/operations/opentelemetry.md
index 2afeabc7956..74c9c6dd18f 100644
--- a/docs/en/operations/opentelemetry.md
+++ b/docs/en/operations/opentelemetry.md
@@ -5,74 +5,40 @@ toc_title: OpenTelemetry Support
 
 # [experimental] OpenTelemetry Support
 
-[OpenTelemetry](https://opentelemetry.io/) is an open standard for collecting
-traces and metrics from distributed application. ClickHouse has some support
-for OpenTelemetry.
+[OpenTelemetry](https://opentelemetry.io/) is an open standard for collecting traces and metrics from the distributed application. ClickHouse has some support for OpenTelemetry.
 
 !!! warning "Warning"
-This is an experimental feature that will change in backwards-incompatible ways in the future releases.
-
+    This is an experimental feature that will change in backwards-incompatible ways in future releases.
 
 ## Supplying Trace Context to ClickHouse
 
-ClickHouse accepts trace context HTTP headers, as described by
-the [W3C recommendation](https://www.w3.org/TR/trace-context/).
-It also accepts trace context over native protocol that is used for
-communication between ClickHouse servers or between the client and server.
-For manual testing, trace context headers conforming to the Trace Context
-recommendation can be supplied to `clickhouse-client` using
-`--opentelemetry-traceparent` and `--opentelemetry-tracestate` flags.
-
-If no parent trace context is supplied, ClickHouse can start a new trace, with
-probability controlled by the `opentelemetry_start_trace_probability` setting.
+ClickHouse accepts trace context HTTP headers, as described by the [W3C recommendation](https://www.w3.org/TR/trace-context/). It also accepts trace context over a native protocol that is used for communication between ClickHouse servers or between the client and server. For manual testing, trace context headers conforming to the Trace Context recommendation can be supplied to `clickhouse-client` using `--opentelemetry-traceparent` and `--opentelemetry-tracestate` flags.
 
+If no parent trace context is supplied, ClickHouse can start a new trace, with probability controlled by the [opentelemetry_start_trace_probability](../operations/settings/settings.md#opentelemetry-start-trace-probability) setting.
 
 ## Propagating the Trace Context
 
 The trace context is propagated to downstream services in the following cases:
 
-* Queries to remote ClickHouse servers, such as when using `Distributed` table
-  engine.
-
-* `URL` table function. Trace context information is sent in HTTP headers.
+* Queries to remote ClickHouse servers, such as when using [Distributed](../engines/table-engines/special/distributed.md) table engine.
 
+* [url](../sql-reference/table-functions/url.md) table function. Trace context information is sent in HTTP headers.
 
 ## Tracing the ClickHouse Itself
 
-ClickHouse creates _trace spans_ for each query and some of the query execution
-stages, such as query planning or distributed queries.
+ClickHouse creates `trace spans` for each query and some of the query execution stages, such as query planning or distributed queries.
 
-To be useful, the tracing information has to be exported to a monitoring system
-that supports OpenTelemetry, such as Jaeger or Prometheus. ClickHouse avoids
-a dependency on a particular monitoring system, instead only providing the
-tracing data through a system table. OpenTelemetry trace span information
-[required by the standard](https://github.com/open-telemetry/opentelemetry-specification/blob/master/specification/overview.md#span)
-is stored in the `system.opentelemetry_span_log` table.
+To be useful, the tracing information has to be exported to a monitoring system that supports OpenTelemetry, such as [Jaeger](https://jaegertracing.io/) or [Prometheus](https://prometheus.io/). ClickHouse avoids a dependency on a particular monitoring system, instead only providing the tracing data through a system table. OpenTelemetry trace span information [required by the standard](https://github.com/open-telemetry/opentelemetry-specification/blob/master/specification/overview.md#span) is stored in the [system.opentelemetry_span_log](../operations/system-tables/opentelemetry_span_log.md) table.
 
-The table must be enabled in the server configuration, see the `opentelemetry_span_log`
-element in the default config file `config.xml`. It is enabled by default.
+The table must be enabled in the server configuration, see the `opentelemetry_span_log` element in the default config file `config.xml`. It is enabled by default.
 
-The table has the following columns:
-
-- `trace_id` 
-- `span_id`
-- `parent_span_id`
-- `operation_name`
-- `start_time`
-- `finish_time`
-- `finish_date`
-- `attribute.name`
-- `attribute.values`
-
-The tags or attributes are saved as two parallel arrays, containing the keys
-and values. Use `ARRAY JOIN` to work with them.
+The tags or attributes are saved as two parallel arrays, containing the keys and values. Use [ARRAY JOIN](../sql-reference/statements/select/array-join.md) to work with them.
 
 ## Integration with monitoring systems
 
-At the moment, there is no ready tool that can export the tracing data from
-ClickHouse to a monitoring system.
+At the moment, there is no ready tool that can export the tracing data from ClickHouse to a monitoring system.
 
-For testing, it is possible to setup the export using a materialized view with the URL engine over the `system.opentelemetry_span_log` table, which would push the arriving log data to an HTTP endpoint of a trace collector. For example, to push the minimal span data to a Zipkin instance running at `http://localhost:9411`, in Zipkin v2 JSON format:
+For testing, it is possible to setup the export using a materialized view with the [URL](../engines/table-engines/special/url.md) engine over the [system.opentelemetry_span_log](../operations/system-tables/opentelemetry_span_log.md) table, which would push the arriving log data to an HTTP endpoint of a trace collector. For example, to push the minimal span data to a Zipkin instance running at `http://localhost:9411`, in Zipkin v2 JSON format:
 
 ```sql
 CREATE MATERIALIZED VIEW default.zipkin_spans
@@ -94,3 +60,5 @@ FROM system.opentelemetry_span_log
 ```
 
 In case of any errors, the part of the log data for which the error has occurred will be silently lost. Check the server log for error messages if the data does not arrive.
+
+[Original article](https://clickhouse.tech/docs/en/operations/opentelemetry/) <!--hide-->
diff --git a/docs/en/operations/server-configuration-parameters/settings.md b/docs/en/operations/server-configuration-parameters/settings.md
index 89fcbafe663..f86e9668f00 100644
--- a/docs/en/operations/server-configuration-parameters/settings.md
+++ b/docs/en/operations/server-configuration-parameters/settings.md
@@ -100,6 +100,11 @@ Default value: `1073741824` (1 GB).
     <size_limit>1073741824</size_limit>
 </core_dump> 
 ```
+## database_atomic_delay_before_drop_table_sec {#database_atomic_delay_before_drop_table_sec}
+
+Sets the delay before remove table data in seconds. If the query has `SYNC` modifier, this setting is ignored.
+
+Default value: `480` (8 minute).
 
 ## default_database {#default-database}
 
@@ -125,6 +130,25 @@ Settings profiles are located in the file specified in the parameter `user_confi
 <default_profile>default</default_profile>
 ```
 
+## default_replica_path {#default_replica_path}
+
+The path to the table in ZooKeeper.
+
+**Example**
+
+``` xml
+<default_replica_path>/clickhouse/tables/{uuid}/{shard}</default_replica_path>
+```
+## default_replica_name {#default_replica_name}
+
+ The replica name in ZooKeeper.
+
+**Example**
+
+``` xml
+<default_replica_name>{replica}</default_replica_name>
+```
+
 ## dictionaries_config {#server_configuration_parameters-dictionaries_config}
 
 The path to the config file for external dictionaries.
@@ -321,7 +345,8 @@ Similar to `interserver_http_host`, except that this hostname can be used by oth
 The username and password used to authenticate during [replication](../../engines/table-engines/mergetree-family/replication.md) with the Replicated\* engines. These credentials are used only for communication between replicas and are unrelated to credentials for ClickHouse clients. The server is checking these credentials for connecting replicas and use the same credentials when connecting to other replicas. So, these credentials should be set the same for all replicas in a cluster.
 By default, the authentication is not used.
 
-**Note:** These credentials are common for replication through `HTTP` and `HTTPS`.
+!!! note "Note"
+    These credentials are common for replication through `HTTP` and `HTTPS`.
 
 This section contains the following parameters:
 
@@ -502,7 +527,15 @@ On hosts with low RAM and swap, you possibly need setting `max_server_memory_usa
 
 ## max_concurrent_queries {#max-concurrent-queries}
 
-The maximum number of simultaneously processed requests.
+The maximum number of simultaneously processed queries related to MergeTree table. Queries may be limited by other settings: [max_concurrent_queries_for_all_users](#max-concurrent-queries-for-all-users), [min_marks_to_honor_max_concurrent_queries](#min-marks-to-honor-max-concurrent-queries).
+
+!!! info "Note"
+	These settings can be modified at runtime and will take effect immediately. Queries that are already running will remain unchanged.
+
+Possible values:
+
+-   Positive integer.
+-   0 — Disabled.
 
 **Example**
 
@@ -530,6 +563,21 @@ Default value: `0` that means no limit.
 
 -   [max_concurrent_queries](#max-concurrent-queries)
 
+## min_marks_to_honor_max_concurrent_queries {#min-marks-to-honor-max-concurrent-queries}
+
+The minimal number of marks read by the query for applying the [max_concurrent_queries](#max-concurrent-queries) setting.
+
+Possible values:
+
+-   Positive integer.
+-   0 — Disabled.
+
+**Example**
+
+``` xml
+<min_marks_to_honor_max_concurrent_queries>10</min_marks_to_honor_max_concurrent_queries>
+```
+
 ## max_connections {#max-connections}
 
 The maximum number of inbound connections.
diff --git a/docs/en/operations/settings/merge-tree-settings.md b/docs/en/operations/settings/merge-tree-settings.md
index 77b68715ba9..b2470207dcc 100644
--- a/docs/en/operations/settings/merge-tree-settings.md
+++ b/docs/en/operations/settings/merge-tree-settings.md
@@ -56,6 +56,26 @@ Default value: 150.
 
 ClickHouse artificially executes `INSERT` longer (adds ‘sleep’) so that the background merge process can merge parts faster than they are added.
 
+## inactive_parts_to_throw_insert {#inactive-parts-to-throw-insert}
+
+If the number of inactive parts in a single partition more than the `inactive_parts_to_throw_insert` value, `INSERT` is interrupted with the "Too many inactive parts (N). Parts cleaning are processing significantly slower than inserts" exception.
+
+Possible values:
+
+-   Any positive integer.
+
+Default value: 0 (unlimited).
+
+## inactive_parts_to_delay_insert {#inactive-parts-to-delay-insert}
+
+If the number of inactive parts in a single partition in the table at least that many the `inactive_parts_to_delay_insert` value, an `INSERT` artificially slows down. It is useful when a server fails to clean up parts quickly enough.
+
+Possible values:
+
+-   Any positive integer.
+
+Default value: 0 (unlimited).
+
 ## max_delay_to_insert {#max-delay-to-insert}
 
 The value in seconds, which is used to calculate the `INSERT` delay, if the number of active parts in a single partition exceeds the [parts_to_delay_insert](#parts-to-delay-insert) value.
diff --git a/docs/en/operations/settings/settings.md b/docs/en/operations/settings/settings.md
index 6440f09bb40..6a1b25982a0 100644
--- a/docs/en/operations/settings/settings.md
+++ b/docs/en/operations/settings/settings.md
@@ -769,6 +769,38 @@ Example:
 log_query_threads=1
 ```
 
+## log_comment {#settings-log-comment}
+
+Specifies the value for the `log_comment` field of the [system.query_log](../system-tables/query_log.md) table and comment text for the server log.
+
+It can be used to improve the readability of server logs. Additionally, it helps to select queries related to the test from the `system.query_log` after running [clickhouse-test](../../development/tests.md).
+
+Possible values:
+
+-   Any string no longer than [max_query_size](#settings-max_query_size). If length is exceeded, the server throws an exception.
+
+Default value: empty string.
+
+**Example**
+
+Query:
+
+``` sql
+SET log_comment = 'log_comment test', log_queries = 1;
+SELECT 1;
+SYSTEM FLUSH LOGS;
+SELECT type, query FROM system.query_log WHERE log_comment = 'log_comment test' AND event_date >= yesterday() ORDER BY event_time DESC LIMIT 2;
+```
+
+Result:
+
+``` text
+┌─type────────┬─query─────┐
+│ QueryStart  │ SELECT 1; │
+│ QueryFinish │ SELECT 1; │
+└─────────────┴───────────┘
+```
+
 ## max_insert_block_size {#settings-max_insert_block_size}
 
 The size of blocks (in a count of rows) to form for insertion into a table.
@@ -1097,14 +1129,25 @@ See the section “WITH TOTALS modifier”.
 
 ## max_parallel_replicas {#settings-max_parallel_replicas}
 
-The maximum number of replicas for each shard when executing a query. In limited circumstances, this can make a query faster by executing it on more servers. This setting is only useful for replicated tables with a sampling key. There are cases where performance will not improve or even worsen:
+The maximum number of replicas for each shard when executing a query.
 
-- the position of the sampling key in the partitioning key's order doesn't allow efficient range scans
-- adding a sampling key to the table makes filtering by other columns less efficient
-- the sampling key is an expression that is expensive to calculate
-- the cluster's latency distribution has a long tail, so that querying more servers increases the query's overall latency
+Possible values:
 
-In addition, this setting will produce incorrect results when joins or subqueries are involved, and all tables don't meet certain conditions. See [Distributed Subqueries and max_parallel_replicas](../../sql-reference/operators/in.md/#max_parallel_replica-subqueries) for more details.
+-   Positive integer.
+
+Default value: `1`.
+
+**Additional Info** 
+
+This setting is useful for replicated tables with a sampling key. A query may be processed faster if it is executed on several servers in parallel. But the query performance may degrade in the following cases:
+
+- The position of the sampling key in the partitioning key doesn't allow efficient range scans.
+- Adding a sampling key to the table makes filtering by other columns less efficient.
+- The sampling key is an expression that is expensive to calculate.
+- The cluster latency distribution has a long tail, so that querying more servers increases the query overall latency.
+
+!!! warning "Warning"
+    This setting will produce incorrect results when joins or subqueries are involved, and all tables don't meet certain requirements. See [Distributed Subqueries and max_parallel_replicas](../../sql-reference/operators/in.md#max_parallel_replica-subqueries) for more details.
 
 ## compile {#compile}
 
@@ -1503,6 +1546,14 @@ FORMAT PrettyCompactMonoBlock
 
 Default value: 0
 
+## optimize_skip_unused_shards_limit {#optimize-skip-unused-shards-limit}
+
+Limit for number of sharding key values, turns off `optimize_skip_unused_shards` if the limit is reached.
+
+Too many values may require significant amount for processing, while the benefit is doubtful, since if you have huge number of values in `IN (...)`, then most likely the query will be sent to all shards anyway.
+
+Default value: 1000
+
 ## optimize_skip_unused_shards {#optimize-skip-unused-shards}
 
 Enables or disables skipping of unused shards for [SELECT](../../sql-reference/statements/select/index.md) queries that have sharding key condition in `WHERE/PREWHERE` (assuming that the data is distributed by sharding key, otherwise does nothing).
@@ -1514,6 +1565,17 @@ Possible values:
 
 Default value: 0
 
+## optimize_skip_unused_shards_rewrite_in {#optimize-skip-unused-shardslrewrite-in}
+
+Rewrite IN in query for remote shards to exclude values that does not belong to the shard (requires optimize_skip_unused_shards).
+
+Possible values:
+
+-   0 — Disabled.
+-   1 — Enabled.
+
+Default value: 1 (since it requires `optimize_skip_unused_shards` anyway, which `0` by default)
+
 ## allow_nondeterministic_optimize_skip_unused_shards {#allow-nondeterministic-optimize-skip-unused-shards}
 
 Allow nondeterministic (like `rand` or `dictGet`, since later has some caveats with updates) functions in sharding key.
@@ -1863,7 +1925,7 @@ Default value: `0`.
 
 Enables or disables random shard insertion into a [Distributed](../../engines/table-engines/special/distributed.md#distributed) table when there is no distributed key.
 
-By default, when inserting data into a `Distributed` table with more than one shard, the ClickHouse server will any insertion request if there is no distributed key. When `insert_distributed_one_random_shard = 1`, insertions are allowed and data is forwarded randomly among all shards.
+By default, when inserting data into a `Distributed` table with more than one shard, the ClickHouse server will reject any insertion request if there is no distributed key. When `insert_distributed_one_random_shard = 1`, insertions are allowed and data is forwarded randomly among all shards.
 
 Possible values:
 
@@ -1872,6 +1934,53 @@ Possible values:
 
 Default value: `0`.
 
+## insert_shard_id {#insert_shard_id}
+
+If not `0`, specifies the shard of [Distributed](../../engines/table-engines/special/distributed.md#distributed) table into which the data will be inserted synchronously.
+
+If `insert_shard_id` value is incorrect, the server will throw an exception.
+
+To get the number of shards on `requested_cluster`, you can check server config or use this query:
+
+``` sql
+SELECT uniq(shard_num) FROM system.clusters WHERE cluster = 'requested_cluster';
+```
+
+Possible values:
+
+-   0 — Disabled.
+-   Any number from `1` to `shards_num` of corresponding [Distributed](../../engines/table-engines/special/distributed.md#distributed) table.
+
+Default value: `0`.
+
+**Example**
+
+Query:
+
+```sql
+CREATE TABLE x AS system.numbers ENGINE = MergeTree ORDER BY number;
+CREATE TABLE x_dist AS x ENGINE = Distributed('test_cluster_two_shards_localhost', currentDatabase(), x);
+INSERT INTO x_dist SELECT * FROM numbers(5) SETTINGS insert_shard_id = 1;
+SELECT * FROM x_dist ORDER BY number ASC;
+```
+
+Result:
+
+``` text
+┌─number─┐
+│      0 │
+│      0 │
+│      1 │
+│      1 │
+│      2 │
+│      2 │
+│      3 │
+│      3 │
+│      4 │
+│      4 │
+└────────┘
+```
+
 ## use_compact_format_in_distributed_parts_names {#use_compact_format_in_distributed_parts_names}
 
 Uses compact format for storing blocks for async (`insert_distributed_sync`) INSERT into tables with `Distributed` engine.
@@ -1956,8 +2065,8 @@ Default value: 16.
 
 **See Also**
 
--   [Kafka](../../engines/table-engines/integrations/kafka.md#kafka) engine
--   [RabbitMQ](../../engines/table-engines/integrations/rabbitmq.md#rabbitmq-engine) engine
+-   [Kafka](../../engines/table-engines/integrations/kafka.md#kafka) engine.
+-   [RabbitMQ](../../engines/table-engines/integrations/rabbitmq.md#rabbitmq-engine) engine.
 
 ## validate_polygons {#validate_polygons}
 
@@ -2658,8 +2767,6 @@ Result:
 
 Note that this setting influences [Materialized view](../../sql-reference/statements/create/view.md#materialized) and [MaterializeMySQL](../../engines/database-engines/materialize-mysql.md) behaviour.
 
-[Original article](https://clickhouse.tech/docs/en/operations/settings/settings/) <!-- hide -->
-
 ## engine_file_empty_if_not_exists {#engine-file-empty_if-not-exists}
 
 Allows to select data from a file engine table without file.
@@ -2672,10 +2779,91 @@ Default value: `0`.
 
 ## engine_file_truncate_on_insert {#engine-file-truncate-on-insert}
 
-Enables or disables truncate before insert in file engine tables.
+Enables or disables truncate before insert in [File](../../engines/table-engines/special/file.md) engine tables.
 
 Possible values:
-- 0 — Disabled.
-- 1 — Enabled.
+- 0 — `INSERT` query appends new data to the end of the file.
+- 1 — `INSERT` replaces existing content of the file with the new data.
 
 Default value: `0`.
+
+## allow_experimental_geo_types {#allow-experimental-geo-types}
+
+Allows working with experimental [geo data types](../../sql-reference/data-types/geo.md).
+
+Possible values:
+
+-   0 — Working with geo data types is disabled.
+-   1 — Working with geo data types is enabled.
+
+Default value: `0`.
+
+## database_atomic_wait_for_drop_and_detach_synchronously {#database_atomic_wait_for_drop_and_detach_synchronously}
+
+Adds a modifier `SYNC` to all `DROP` and `DETACH` queries. 
+
+Possible values:
+
+-   0 — Queries will be executed with delay.
+-   1 — Queries will be executed without delay.
+
+Default value: `0`.
+
+## show_table_uuid_in_table_create_query_if_not_nil {#show_table_uuid_in_table_create_query_if_not_nil}
+
+Sets the `SHOW TABLE` query display.
+
+Possible values:
+
+-   0 — The query will be displayed without table UUID.
+-   1 — The query will be displayed with table UUID.
+
+Default value: `0`.
+
+## allow_experimental_live_view {#allow-experimental-live-view}
+
+Allows creation of experimental [live views](../../sql-reference/statements/create/view.md#live-view).
+
+Possible values:
+
+-   0 — Working with live views is disabled.
+-   1 — Working with live views is enabled.
+
+Default value: `0`.
+
+## live_view_heartbeat_interval {#live-view-heartbeat-interval}
+
+Sets the heartbeat interval in seconds to indicate [live view](../../sql-reference/statements/create/view.md#live-view) is alive .
+
+Default value: `15`.
+
+## max_live_view_insert_blocks_before_refresh {#max-live-view-insert-blocks-before-refresh}
+
+Sets the maximum number of inserted blocks after which mergeable blocks are dropped and query for [live view](../../sql-reference/statements/create/view.md#live-view) is re-executed.
+
+Default value: `64`.
+
+## temporary_live_view_timeout {#temporary-live-view-timeout}
+
+Sets the interval in seconds after which [live view](../../sql-reference/statements/create/view.md#live-view) with timeout is deleted.
+
+Default value: `5`.
+
+## periodic_live_view_refresh {#periodic-live-view-refresh}
+
+Sets the interval in seconds after which periodically refreshed [live view](../../sql-reference/statements/create/view.md#live-view) is forced to refresh.
+
+Default value: `60`.
+
+## check_query_single_value_result {#check_query_single_value_result}
+
+Defines the level of detail for the [CHECK TABLE](../../sql-reference/statements/check-table.md#checking-mergetree-tables) query result for `MergeTree` family engines .
+
+Possible values:
+
+-   0 — the query shows a check status for every individual data part of a table.
+-   1 — the query shows the general table check status.
+
+Default value: `0`.
+
+[Original article](https://clickhouse.tech/docs/en/operations/settings/settings/) <!-- hide -->
diff --git a/docs/en/operations/system-tables/columns.md b/docs/en/operations/system-tables/columns.md
index 92a6315d06b..9160dca9a1a 100644
--- a/docs/en/operations/system-tables/columns.md
+++ b/docs/en/operations/system-tables/columns.md
@@ -4,7 +4,9 @@ Contains information about columns in all the tables.
 
 You can use this table to get information similar to the [DESCRIBE TABLE](../../sql-reference/statements/misc.md#misc-describe-table) query, but for multiple tables at once.
 
-The `system.columns` table contains the following columns (the column type is shown in brackets):
+Columns from [temporary tables](../../sql-reference/statements/create/table.md#temporary-tables) are visible in the `system.columns` only in those session where they have been created. They are shown with the empty `database` field. 
+
+Columns:
 
 -   `database` ([String](../../sql-reference/data-types/string.md)) — Database name.
 -   `table` ([String](../../sql-reference/data-types/string.md)) — Table name.
@@ -26,7 +28,7 @@ The `system.columns` table contains the following columns (the column type is sh
 **Example**
 
 ```sql
-:) select * from system.columns LIMIT 2 FORMAT Vertical;
+SELECT * FROM system.columns LIMIT 2 FORMAT Vertical;
 ```
 
 ```text
@@ -65,8 +67,6 @@ is_in_sorting_key:       0
 is_in_primary_key:       0
 is_in_sampling_key:      0
 compression_codec:       
-
-2 rows in set. Elapsed: 0.002 sec. 
 ```
 
 [Original article](https://clickhouse.tech/docs/en/operations/system_tables/columns) <!--hide-->
diff --git a/docs/en/operations/system-tables/data_type_families.md b/docs/en/operations/system-tables/data_type_families.md
index ddda91ed151..4e439f13aa5 100644
--- a/docs/en/operations/system-tables/data_type_families.md
+++ b/docs/en/operations/system-tables/data_type_families.md
@@ -1,6 +1,6 @@
 # system.data_type_families {#system_tables-data_type_families}
 
-Contains information about supported [data types](../../sql-reference/data-types/).
+Contains information about supported [data types](../../sql-reference/data-types/index.md).
 
 Columns:
 
diff --git a/docs/en/operations/system-tables/distributed_ddl_queue.md b/docs/en/operations/system-tables/distributed_ddl_queue.md
index c252458af8a..fa871d215b5 100644
--- a/docs/en/operations/system-tables/distributed_ddl_queue.md
+++ b/docs/en/operations/system-tables/distributed_ddl_queue.md
@@ -14,7 +14,7 @@ Columns:
 -   `initiator` ([String](../../sql-reference/data-types/string.md)) — Node that executed the query.
 -   `query_start_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — Query start time.
 -   `query_finish_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — Query finish time.
--   `query_duration_ms` ([UInt64](../../sql-reference/data-types/datetime64.md)) — Duration of query execution (in milliseconds).
+-   `query_duration_ms` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Duration of query execution (in milliseconds).
 -   `exception_code` ([Enum8](../../sql-reference/data-types/enum.md)) — Exception code from [ZooKeeper](../../operations/tips.md#zookeeper).
 
 **Example**
diff --git a/docs/en/operations/system-tables/errors.md b/docs/en/operations/system-tables/errors.md
index ec874efd711..583cce88ca4 100644
--- a/docs/en/operations/system-tables/errors.md
+++ b/docs/en/operations/system-tables/errors.md
@@ -7,11 +7,15 @@ Columns:
 -   `name` ([String](../../sql-reference/data-types/string.md)) — name of the error (`errorCodeToName`).
 -   `code` ([Int32](../../sql-reference/data-types/int-uint.md)) — code number of the error.
 -   `value` ([UInt64](../../sql-reference/data-types/int-uint.md)) — the number of times this error has been happened.
+-   `last_error_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — time when the last error happened.
+-   `last_error_message` ([String](../../sql-reference/data-types/string.md)) — message for the last error.
+-   `last_error_trace` ([Array(UInt64)](../../sql-reference/data-types/array.md)) — A [stack trace](https://en.wikipedia.org/wiki/Stack_trace) which represents a list of physical addresses where the called methods are stored.
+-   `remote` ([UInt8](../../sql-reference/data-types/int-uint.md)) — remote exception (i.e. received during one of the distributed query).
 
 **Example**
 
 ``` sql
-SELECT *
+SELECT name, code, value
 FROM system.errors
 WHERE value > 0
 ORDER BY code ASC
@@ -21,3 +25,12 @@ LIMIT 1
 │ CANNOT_OPEN_FILE │   76 │     1 │
 └──────────────────┴──────┴───────┘
 ```
+
+``` sql
+WITH arrayMap(x -> demangle(addressToSymbol(x)), last_error_trace) AS all
+SELECT name, arrayStringConcat(all, '\n') AS res
+FROM system.errors
+LIMIT 1
+SETTINGS allow_introspection_functions=1\G
+```
+
diff --git a/docs/en/operations/system-tables/index.md b/docs/en/operations/system-tables/index.md
index 5dc23aee686..e66f082167e 100644
--- a/docs/en/operations/system-tables/index.md
+++ b/docs/en/operations/system-tables/index.md
@@ -20,7 +20,7 @@ System tables:
 
 Most of system tables store their data in RAM. A ClickHouse server creates such system tables at the start.
 
-Unlike other system tables, the system log tables [metric_log](../../operations/system-tables/metric_log.md), [query_log](../../operations/system-tables/query_log.md), [query_thread_log](../../operations/system-tables/query_thread_log.md), [trace_log](../../operations/system-tables/trace_log.md), [part_log](../../operations/system-tables/part_log.md), crash_log and [text_log](../../operations/system-tables/text_log.md) are served by [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md) table engine and store their data in a storage filesystem by default. If you remove a table from a filesystem, the ClickHouse server creates the empty one again at the time of the next data writing. If system table schema changed in a new release, then ClickHouse renames the current table and creates a new one.
+Unlike other system tables, the system log tables [metric_log](../../operations/system-tables/metric_log.md), [query_log](../../operations/system-tables/query_log.md), [query_thread_log](../../operations/system-tables/query_thread_log.md), [trace_log](../../operations/system-tables/trace_log.md), [part_log](../../operations/system-tables/part_log.md), [crash_log](../../operations/system-tables/crash-log.md) and [text_log](../../operations/system-tables/text_log.md) are served by [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md) table engine and store their data in a filesystem by default. If you remove a table from a filesystem, the ClickHouse server creates the empty one again at the time of the next data writing. If system table schema changed in a new release, then ClickHouse renames the current table and creates a new one.
 
 System log tables can be customized by creating a config file with the same name as the table under `/etc/clickhouse-server/config.d/`, or setting corresponding elements in `/etc/clickhouse-server/config.xml`. Elements can be customized are:
 
@@ -33,7 +33,7 @@ System log tables can be customized by creating a config file with the same name
 
 An example:
 
-```
+```xml
 <yandex>
     <query_log>
         <database>system</database>
diff --git a/docs/en/operations/system-tables/part_log.md b/docs/en/operations/system-tables/part_log.md
index 579fdaefb0a..3f9110349dd 100644
--- a/docs/en/operations/system-tables/part_log.md
+++ b/docs/en/operations/system-tables/part_log.md
@@ -17,7 +17,6 @@ The `system.part_log` table contains the following columns:
 -   `event_date` ([Date](../../sql-reference/data-types/date.md)) — Event date.
 -   `event_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — Event time.
 -   `event_time_microseconds` ([DateTime64](../../sql-reference/data-types/datetime64.md)) — Event time with microseconds precision.
-
 -   `duration_ms` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Duration.
 -   `database` ([String](../../sql-reference/data-types/string.md)) — Name of the database the data part is in.
 -   `table` ([String](../../sql-reference/data-types/string.md)) — Name of the table the data part is in.
diff --git a/docs/en/operations/system-tables/query_log.md b/docs/en/operations/system-tables/query_log.md
index 32b2bdf2133..6cf87ee1f17 100644
--- a/docs/en/operations/system-tables/query_log.md
+++ b/docs/en/operations/system-tables/query_log.md
@@ -44,9 +44,15 @@ Columns:
 -   `result_rows` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Number of rows in a result of the `SELECT` query, or a number of rows in the `INSERT` query.
 -   `result_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — RAM volume in bytes used to store a query result.
 -   `memory_usage` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Memory consumption by the query.
+-   `current_database` ([String](../../sql-reference/data-types/string.md)) — Name of the current database.
 -   `query` ([String](../../sql-reference/data-types/string.md)) — Query string.
--   `exception` ([String](../../sql-reference/data-types/string.md)) — Exception message.
+-   `normalized_query_hash` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Identical hash value without the values of literals for similar queries.
+-   `query_kind` ([LowCardinality(String)](../../sql-reference/data-types/lowcardinality.md)) — Type of the query.
+-   `databases` ([Array](../../sql-reference/data-types/array.md)([LowCardinality(String)](../../sql-reference/data-types/lowcardinality.md))) — Names of the databases present in the query.
+-   `tables` ([Array](../../sql-reference/data-types/array.md)([LowCardinality(String)](../../sql-reference/data-types/lowcardinality.md))) — Names of the tables present in the query.
+-   `columns` ([Array](../../sql-reference/data-types/array.md)([LowCardinality(String)](../../sql-reference/data-types/lowcardinality.md))) — Names of the columns present in the query.
 -   `exception_code` ([Int32](../../sql-reference/data-types/int-uint.md)) — Code of an exception.
+-   `exception` ([String](../../sql-reference/data-types/string.md)) — Exception message.
 -   `stack_trace` ([String](../../sql-reference/data-types/string.md)) — [Stack trace](https://en.wikipedia.org/wiki/Stack_trace). An empty string, if the query was completed successfully.
 -   `is_initial_query` ([UInt8](../../sql-reference/data-types/int-uint.md)) — Query type. Possible values:
     -   1 — Query was initiated by the client.
@@ -73,69 +79,98 @@ Columns:
     -   0 — The query was launched from the TCP interface.
     -   1 — `GET` method was used.
     -   2 — `POST` method was used.
--   `http_user_agent` ([String](../../sql-reference/data-types/string.md)) — The `UserAgent` header passed in the HTTP request.
--   `quota_key` ([String](../../sql-reference/data-types/string.md)) — The “quota key” specified in the [quotas](../../operations/quotas.md) setting (see `keyed`).
+-   `http_user_agent` ([String](../../sql-reference/data-types/string.md)) — HTTP header `UserAgent` passed in the HTTP query.
+-   `http_referer` ([String](../../sql-reference/data-types/string.md)) — HTTP header `Referer` passed in the HTTP query (contains an absolute or partial address of the page making the query).
+-   `forwarded_for` ([String](../../sql-reference/data-types/string.md)) — HTTP header `X-Forwarded-For` passed in the HTTP query.
+-   `quota_key` ([String](../../sql-reference/data-types/string.md)) — The `quota key` specified in the [quotas](../../operations/quotas.md) setting (see `keyed`).
 -   `revision` ([UInt32](../../sql-reference/data-types/int-uint.md)) — ClickHouse revision.
--   `thread_numbers` ([Array(UInt32)](../../sql-reference/data-types/array.md)) — Number of threads that are participating in query execution.
+-   `log_comment` ([String](../../sql-reference/data-types/string.md)) — Log comment. It can be set to arbitrary string no longer than [max_query_size](../../operations/settings/settings.md#settings-max_query_size). An empty string if it is not defined.
+-   `thread_ids` ([Array(UInt64)](../../sql-reference/data-types/array.md)) — Thread ids that are participating in query execution.
 -   `ProfileEvents.Names` ([Array(String)](../../sql-reference/data-types/array.md)) — Counters that measure different metrics. The description of them could be found in the table [system.events](../../operations/system-tables/events.md#system_tables-events)
 -   `ProfileEvents.Values` ([Array(UInt64)](../../sql-reference/data-types/array.md)) — Values of metrics that are listed in the `ProfileEvents.Names` column.
 -   `Settings.Names` ([Array(String)](../../sql-reference/data-types/array.md)) — Names of settings that were changed when the client ran the query. To enable logging changes to settings, set the `log_query_settings` parameter to 1.
 -   `Settings.Values` ([Array(String)](../../sql-reference/data-types/array.md)) — Values of settings that are listed in the `Settings.Names` column.
+-   `used_aggregate_functions` ([Array(String)](../../sql-reference/data-types/array.md)) — Canonical names of `aggregate functions`, which were used during query execution.
+-   `used_aggregate_function_combinators` ([Array(String)](../../sql-reference/data-types/array.md)) — Canonical names of `aggregate functions combinators`, which were used during query execution.
+-   `used_database_engines` ([Array(String)](../../sql-reference/data-types/array.md)) — Canonical names of `database engines`, which were used during query execution.
+-   `used_data_type_families` ([Array(String)](../../sql-reference/data-types/array.md)) — Canonical names of `data type families`, which were used during query execution.
+-   `used_dictionaries` ([Array(String)](../../sql-reference/data-types/array.md)) — Canonical names of `dictionaries`, which were used during query execution.
+-   `used_formats` ([Array(String)](../../sql-reference/data-types/array.md)) — Canonical names of `formats`, which were used during query execution.
+-   `used_functions` ([Array(String)](../../sql-reference/data-types/array.md)) — Canonical names of `functions`, which were used during query execution.
+-   `used_storages` ([Array(String)](../../sql-reference/data-types/array.md)) — Canonical names of `storages`, which were used during query execution.
+-   `used_table_functions` ([Array(String)](../../sql-reference/data-types/array.md)) — Canonical names of `table functions`, which were used during query execution.
 
 **Example**
 
 ``` sql
-SELECT * FROM system.query_log LIMIT 1 \G
+SELECT * FROM system.query_log WHERE type = 'QueryFinish' AND (query LIKE '%toDate(\'2000-12-05\')%') ORDER BY query_start_time DESC LIMIT 1 FORMAT Vertical;
 ```
 
 ``` text
 Row 1:
 ──────
-type:                          QueryStart
-event_date:                    2020-09-11
-event_time:                    2020-09-11 10:08:17
-event_time_microseconds:       2020-09-11 10:08:17.063321
-query_start_time:              2020-09-11 10:08:17
-query_start_time_microseconds: 2020-09-11 10:08:17.063321
-query_duration_ms:             0
-read_rows:                     0
-read_bytes:                    0
-written_rows:                  0
-written_bytes:                 0
-result_rows:                   0
-result_bytes:                  0
-memory_usage:                  0
-current_database:              default
-query:                         INSERT INTO test1 VALUES
-exception_code:                0
-exception:                     
-stack_trace:                   
-is_initial_query:              1
-user:                          default
-query_id:                      50a320fd-85a8-49b8-8761-98a86bcbacef
-address:                       ::ffff:127.0.0.1
-port:                          33452
-initial_user:                  default
-initial_query_id:              50a320fd-85a8-49b8-8761-98a86bcbacef
-initial_address:               ::ffff:127.0.0.1
-initial_port:                  33452
-interface:                     1
-os_user:                       bharatnc
-client_hostname:               tower
-client_name:                   ClickHouse 
-client_revision:               54437
-client_version_major:          20
-client_version_minor:          7
-client_version_patch:          2
-http_method:                   0
-http_user_agent:               
-quota_key:                     
-revision:                      54440
-thread_ids:                    []
-ProfileEvents.Names:           []
-ProfileEvents.Values:          []
-Settings.Names:                ['use_uncompressed_cache','load_balancing','log_queries','max_memory_usage','allow_introspection_functions']
-Settings.Values:               ['0','random','1','10000000000','1']
+type:                                QueryFinish
+event_date:                          2021-03-18
+event_time:                          2021-03-18 20:54:18
+event_time_microseconds:             2021-03-18 20:54:18.676686
+query_start_time:                    2021-03-18 20:54:18
+query_start_time_microseconds:       2021-03-18 20:54:18.673934
+query_duration_ms:                   2
+read_rows:                           100
+read_bytes:                          800
+written_rows:                        0
+written_bytes:                       0
+result_rows:                         2
+result_bytes:                        4858
+memory_usage:                        0
+current_database:                    default
+query:                               SELECT uniqArray([1, 1, 2]), SUBSTRING('Hello, world', 7, 5), flatten([[[BIT_AND(123)]], [[mod(3, 2)], [CAST('1' AS INTEGER)]]]), week(toDate('2000-12-05')), CAST(arrayJoin([NULL, NULL]) AS Nullable(TEXT)), avgOrDefaultIf(number, number % 2), sumOrNull(number), toTypeName(sumOrNull(number)), countIf(toDate('2000-12-05') + number as d, toDayOfYear(d) % 2) FROM numbers(100)
+normalized_query_hash:               17858008518552525706
+query_kind:                          Select
+databases:                           ['_table_function']
+tables:                              ['_table_function.numbers']
+columns:                             ['_table_function.numbers.number']
+exception_code:                      0
+exception:
+stack_trace:
+is_initial_query:                    1
+user:                                default
+query_id:                            58f3d392-0fa0-4663-ae1d-29917a1a9c9c
+address:                             ::ffff:127.0.0.1
+port:                                37486
+initial_user:                        default
+initial_query_id:                    58f3d392-0fa0-4663-ae1d-29917a1a9c9c
+initial_address:                     ::ffff:127.0.0.1
+initial_port:                        37486
+interface:                           1
+os_user:                             sevirov
+client_hostname:                     clickhouse.ru-central1.internal
+client_name:                         ClickHouse
+client_revision:                     54447
+client_version_major:                21
+client_version_minor:                4
+client_version_patch:                1
+http_method:                         0
+http_user_agent:
+http_referer:
+forwarded_for:
+quota_key:
+revision:                            54449
+log_comment:
+thread_ids:                          [587,11939]
+ProfileEvents.Names:                 ['Query','SelectQuery','ReadCompressedBytes','CompressedReadBufferBlocks','CompressedReadBufferBytes','IOBufferAllocs','IOBufferAllocBytes','ArenaAllocChunks','ArenaAllocBytes','FunctionExecute','TableFunctionExecute','NetworkSendElapsedMicroseconds','SelectedRows','SelectedBytes','ContextLock','RWLockAcquiredReadLocks','RealTimeMicroseconds','UserTimeMicroseconds','SystemTimeMicroseconds','SoftPageFaults','OSCPUVirtualTimeMicroseconds','OSWriteBytes']
+ProfileEvents.Values:                [1,1,36,1,10,2,1048680,1,4096,36,1,110,100,800,77,1,3137,1476,1101,8,2577,8192]
+Settings.Names:                      ['load_balancing','max_memory_usage']
+Settings.Values:                     ['random','10000000000']
+used_aggregate_functions:            ['groupBitAnd','avg','sum','count','uniq']
+used_aggregate_function_combinators: ['OrDefault','If','OrNull','Array']
+used_database_engines:               []
+used_data_type_families:             ['String','Array','Int32','Nullable']
+used_dictionaries:                   []
+used_formats:                        []
+used_functions:                      ['toWeek','CAST','arrayFlatten','toTypeName','toDayOfYear','addDays','array','toDate','modulo','substring','plus']
+used_storages:                       []
+used_table_functions:                ['numbers']
 ```
 
 **See Also**
@@ -143,4 +178,3 @@ Settings.Values:               ['0','random','1','10000000000','1']
 -   [system.query_thread_log](../../operations/system-tables/query_thread_log.md#system_tables-query_thread_log) — This table contains information about each query execution thread.
 
 [Original article](https://clickhouse.tech/docs/en/operations/system_tables/query_log) <!--hide-->
-
diff --git a/docs/en/operations/system-tables/quota_limits.md b/docs/en/operations/system-tables/quota_limits.md
index c2dcb4db34d..11616990206 100644
--- a/docs/en/operations/system-tables/quota_limits.md
+++ b/docs/en/operations/system-tables/quota_limits.md
@@ -17,5 +17,3 @@ Columns:
 - `max_read_rows` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — Maximum number of rows read from all tables and table functions participated in queries.
 - `max_read_bytes` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — Maximum number of bytes read from all tables and table functions participated in queries.
 - `max_execution_time` ([Nullable](../../sql-reference/data-types/nullable.md)([Float64](../../sql-reference/data-types/float.md))) — Maximum of the query execution time, in seconds.
-
-[Original article](https://clickhouse.tech/docs/en/operations/system_tables/quota_limits) <!--hide-->
diff --git a/docs/en/operations/system-tables/quota_usage.md b/docs/en/operations/system-tables/quota_usage.md
index 17af9ad9a30..89fdfe70069 100644
--- a/docs/en/operations/system-tables/quota_usage.md
+++ b/docs/en/operations/system-tables/quota_usage.md
@@ -28,5 +28,3 @@ Columns:
 ## See Also {#see-also}
 
 -   [SHOW QUOTA](../../sql-reference/statements/show.md#show-quota-statement)
-
-[Original article](https://clickhouse.tech/docs/en/operations/system_tables/quota_usage) <!--hide-->
diff --git a/docs/en/operations/system-tables/quotas_usage.md b/docs/en/operations/system-tables/quotas_usage.md
index 31aafd3e697..04cf91cb990 100644
--- a/docs/en/operations/system-tables/quotas_usage.md
+++ b/docs/en/operations/system-tables/quotas_usage.md
@@ -30,6 +30,4 @@ Columns:
 
 ## See Also {#see-also}
 
--   [SHOW QUOTA](../../sql-reference/statements/show.md#show-quota-statement)
-
-[Original article](https://clickhouse.tech/docs/en/operations/system_tables/quotas_usage) <!--hide-->
+-   [SHOW QUOTA](../../sql-reference/statements/show.md#show-quota-statement)
\ No newline at end of file
diff --git a/docs/en/operations/system-tables/replication_queue.md b/docs/en/operations/system-tables/replication_queue.md
index aa379caa46c..f3e3a35f13b 100644
--- a/docs/en/operations/system-tables/replication_queue.md
+++ b/docs/en/operations/system-tables/replication_queue.md
@@ -14,7 +14,17 @@ Columns:
 
 -   `node_name` ([String](../../sql-reference/data-types/string.md)) — Node name in ZooKeeper.
 
--   `type` ([String](../../sql-reference/data-types/string.md)) — Type of the task in the queue: `GET_PARTS`, `MERGE_PARTS`, `DETACH_PARTS`, `DROP_PARTS`, or `MUTATE_PARTS`.
+-   `type` ([String](../../sql-reference/data-types/string.md)) — Type of the task in the queue, one of:
+    - `GET_PART`       - Get the part from another replica.
+    - `ATTACH_PART`    - Attach the part, possibly from our own replica (if found in `detached` folder). 
+    You may think of it as a `GET_PART` with some optimisations as they're nearly identical.
+    - `MERGE_PARTS`    - Merge the parts.
+    - `DROP_RANGE`     - Delete the parts in the specified partition in the specified number range.
+    - `CLEAR_COLUMN`   - NOTE: Deprecated. Drop specific column from specified partition.
+    - `CLEAR_INDEX`    - NOTE: Deprecated. Drop specific index from specified partition.
+    - `REPLACE_RANGE`  - Drop certain range of partitions and replace them by new ones
+    - `MUTATE_PART`    - Apply one or several mutations to the part.
+    - `ALTER_METADATA` - Apply alter modification according to global /metadata and /columns paths
 
 -   `create_time` ([Datetime](../../sql-reference/data-types/datetime.md)) — Date and time when the task was submitted for execution.
 
@@ -70,12 +80,12 @@ num_tries:              36
 last_exception:         Code: 226, e.displayText() = DB::Exception: Marks file '/opt/clickhouse/data/merge/visits_v2/tmp_fetch_20201130_121373_121384_2/CounterID.mrk' doesn't exist (version 20.8.7.15 (official build))
 last_attempt_time:      2020-12-08 17:35:54
 num_postponed:          0
-postpone_reason:        
+postpone_reason:
 last_postpone_time:     1970-01-01 03:00:00
 ```
 
 **See Also**
 
--   [Managing ReplicatedMergeTree Tables](../../sql-reference/statements/system.md/#query-language-system-replicated)
+-   [Managing ReplicatedMergeTree Tables](../../sql-reference/statements/system.md#query-language-system-replicated)
 
 [Original article](https://clickhouse.tech/docs/en/operations/system_tables/replication_queue) <!--hide-->
diff --git a/docs/en/operations/system-tables/settings.md b/docs/en/operations/system-tables/settings.md
index a1db0a3d558..7034fe1204f 100644
--- a/docs/en/operations/system-tables/settings.md
+++ b/docs/en/operations/system-tables/settings.md
@@ -48,5 +48,6 @@ SELECT * FROM system.settings WHERE changed AND name='load_balancing'
 -   [Settings](../../operations/settings/index.md#session-settings-intro)
 -   [Permissions for Queries](../../operations/settings/permissions-for-queries.md#settings_readonly)
 -   [Constraints on Settings](../../operations/settings/constraints-on-settings.md)
+-   [SHOW SETTINGS](../../sql-reference/statements/show.md#show-settings) statement
 
 [Original article](https://clickhouse.tech/docs/en/operations/system_tables/settings) <!--hide-->
diff --git a/docs/en/operations/system-tables/tables.md b/docs/en/operations/system-tables/tables.md
index 6ad1425e032..ccc9ab94f8b 100644
--- a/docs/en/operations/system-tables/tables.md
+++ b/docs/en/operations/system-tables/tables.md
@@ -1,59 +1,65 @@
 # system.tables {#system-tables}
 
-Contains metadata of each table that the server knows about. Detached tables are not shown in `system.tables`.
+Contains metadata of each table that the server knows about. 
 
-This table contains the following columns (the column type is shown in brackets):
+[Detached](../../sql-reference/statements/detach.md) tables are not shown in `system.tables`.
 
--   `database` (String) — The name of the database the table is in.
+[Temporary tables](../../sql-reference/statements/create/table.md#temporary-tables) are visible in the `system.tables` only in those session where they have been created. They are shown with the empty `database` field and with the `is_temporary` flag switched on. 
 
--   `name` (String) — Table name.
+Columns:
 
--   `engine` (String) — Table engine name (without parameters).
+-   `database` ([String](../../sql-reference/data-types/string.md)) — The name of the database the table is in. 
 
--   `is_temporary` (UInt8) - Flag that indicates whether the table is temporary.
+-   `name` ([String](../../sql-reference/data-types/string.md)) — Table name. 
 
--   `data_path` (String) - Path to the table data in the file system.
+-   `engine` ([String](../../sql-reference/data-types/string.md)) — Table engine name (without parameters). 
 
--   `metadata_path` (String) - Path to the table metadata in the file system.
+-   `is_temporary` ([UInt8](../../sql-reference/data-types/int-uint.md)) - Flag that indicates whether the table is temporary. 
 
--   `metadata_modification_time` (DateTime) - Time of latest modification of the table metadata.
+-   `data_path` ([String](../../sql-reference/data-types/string.md)) - Path to the table data in the file system. 
 
--   `dependencies_database` (Array(String)) - Database dependencies.
+-   `metadata_path` ([String](../../sql-reference/data-types/string.md)) - Path to the table metadata in the file system. 
 
--   `dependencies_table` (Array(String)) - Table dependencies ([MaterializedView](../../engines/table-engines/special/materializedview.md) tables based on the current table).
+-   `metadata_modification_time` ([DateTime](../../sql-reference/data-types/datetime.md)) - Time of latest modification of the table metadata.
 
--   `create_table_query` (String) - The query that was used to create the table.
+-   `dependencies_database` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) - Database dependencies.
 
--   `engine_full` (String) - Parameters of the table engine.
+-   `dependencies_table` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) - Table dependencies ([MaterializedView](../../engines/table-engines/special/materializedview.md) tables based on the current table).
 
--   `partition_key` (String) - The partition key expression specified in the table.
+-   `create_table_query` ([String](../../sql-reference/data-types/string.md)) - The query that was used to create the table.
 
--   `sorting_key` (String) - The sorting key expression specified in the table.
+-   `engine_full` ([String](../../sql-reference/data-types/string.md)) - Parameters of the table engine. 
 
--   `primary_key` (String) - The primary key expression specified in the table.
+-   `partition_key` ([String](../../sql-reference/data-types/string.md)) - The partition key expression specified in the table. 
 
--   `sampling_key` (String) - The sampling key expression specified in the table.
+-   `sorting_key` ([String](../../sql-reference/data-types/string.md)) - The sorting key expression specified in the table. 
 
--   `storage_policy` (String) - The storage policy:
+-   `primary_key` ([String](../../sql-reference/data-types/string.md)) - The primary key expression specified in the table. 
+
+-   `sampling_key` ([String](../../sql-reference/data-types/string.md)) - The sampling key expression specified in the table. 
+
+-   `storage_policy` ([String](../../sql-reference/data-types/string.md)) - The storage policy:
 
     -   [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-multiple-volumes)
     -   [Distributed](../../engines/table-engines/special/distributed.md#distributed)
 
--   `total_rows` (Nullable(UInt64)) - Total number of rows, if it is possible to quickly determine exact number of rows in the table, otherwise `Null` (including underying `Buffer` table).
+-   `total_rows` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) - Total number of rows, if it is possible to quickly determine exact number of rows in the table, otherwise `NULL` (including underying `Buffer` table). 
 
--   `total_bytes` (Nullable(UInt64)) - Total number of bytes, if it is possible to quickly determine exact number of bytes for the table on storage, otherwise `Null` (**does not** includes any underlying storage).
+-   `total_bytes` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) - Total number of bytes, if it is possible to quickly determine exact number of bytes for the table on storage, otherwise `NULL` (does not includes any underlying storage). 
 
     -   If the table stores data on disk, returns used space on disk (i.e. compressed).
     -   If the table stores data in memory, returns approximated number of used bytes in memory.
 
--   `lifetime_rows` (Nullable(UInt64)) - Total number of rows INSERTed since server start (only for `Buffer` tables).
+-   `lifetime_rows` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) - Total number of rows INSERTed since server start (only for `Buffer` tables). 
 
--   `lifetime_bytes` (Nullable(UInt64)) - Total number of bytes INSERTed since server start (only for `Buffer` tables).
+-   `lifetime_bytes` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) - Total number of bytes INSERTed since server start (only for `Buffer` tables). 
 
 The `system.tables` table is used in `SHOW TABLES` query implementation.
 
+**Example**
+
 ```sql
-:) SELECT * FROM system.tables LIMIT 2 FORMAT Vertical;
+SELECT * FROM system.tables LIMIT 2 FORMAT Vertical;
 ```
 
 ```text
@@ -100,8 +106,6 @@ sampling_key:
 storage_policy:             
 total_rows:                 ᴺᵁᴸᴸ
 total_bytes:                ᴺᵁᴸᴸ
-
-2 rows in set. Elapsed: 0.004 sec. 
 ```
 
 [Original article](https://clickhouse.tech/docs/en/operations/system_tables/tables) <!--hide-->
diff --git a/docs/en/operations/system-tables/trace_log.md b/docs/en/operations/system-tables/trace_log.md
index 2903e0d3bd7..e4c01a65d9d 100644
--- a/docs/en/operations/system-tables/trace_log.md
+++ b/docs/en/operations/system-tables/trace_log.md
@@ -20,10 +20,12 @@ Columns:
 
     When connecting to the server by `clickhouse-client`, you see the string similar to `Connected to ClickHouse server version 19.18.1 revision 54429.`. This field contains the `revision`, but not the `version` of a server.
 
--   `timer_type` ([Enum8](../../sql-reference/data-types/enum.md)) — Timer type:
+-   `trace_type` ([Enum8](../../sql-reference/data-types/enum.md)) — Trace type:
 
-    -   `Real` represents wall-clock time.
-    -   `CPU` represents CPU time.
+    -   `Real` represents collecting stack traces by wall-clock time.
+    -   `CPU` represents collecting stack traces by CPU time.
+    -   `Memory` represents collecting allocations and deallocations when memory allocation exceeds the subsequent watermark.
+    -   `MemorySample` represents collecting random allocations and deallocations.
 
 -   `thread_number` ([UInt32](../../sql-reference/data-types/int-uint.md)) — Thread identifier.
 
@@ -52,4 +54,5 @@ trace:                   [371912858,371912789,371798468,371799717,371801313,3717
 size:                    5244400
 ```
 
- [Original article](https://clickhouse.tech/docs/en/operations/system_tables/trace_log) <!--hide-->
\ No newline at end of file
+ [Original article](https://clickhouse.tech/docs/en/operations/system-tables/trace_log) <!--hide-->
+ 
diff --git a/docs/en/operations/tips.md b/docs/en/operations/tips.md
index e62dea0b04e..865fe58d7cd 100644
--- a/docs/en/operations/tips.md
+++ b/docs/en/operations/tips.md
@@ -191,8 +191,9 @@ dynamicConfigFile=/etc/zookeeper-{{ '{{' }} cluster['name'] {{ '}}' }}/conf/zoo.
 Java version:
 
 ``` text
-Java(TM) SE Runtime Environment (build 1.8.0_25-b17)
-Java HotSpot(TM) 64-Bit Server VM (build 25.25-b02, mixed mode)
+openjdk 11.0.5-shenandoah 2019-10-15
+OpenJDK Runtime Environment (build 11.0.5-shenandoah+10-adhoc.heretic.src)
+OpenJDK 64-Bit Server VM (build 11.0.5-shenandoah+10-adhoc.heretic.src, mixed mode)
 ```
 
 JVM parameters:
@@ -204,7 +205,7 @@ ZOOCFGDIR=/etc/$NAME/conf
 # TODO this is really ugly
 # How to find out, which jars are needed?
 # seems, that log4j requires the log4j.properties file to be in the classpath
-CLASSPATH="$ZOOCFGDIR:/usr/build/classes:/usr/build/lib/*.jar:/usr/share/zookeeper/zookeeper-3.5.1-metrika.jar:/usr/share/zookeeper/slf4j-log4j12-1.7.5.jar:/usr/share/zookeeper/slf4j-api-1.7.5.jar:/usr/share/zookeeper/servlet-api-2.5-20081211.jar:/usr/share/zookeeper/netty-3.7.0.Final.jar:/usr/share/zookeeper/log4j-1.2.16.jar:/usr/share/zookeeper/jline-2.11.jar:/usr/share/zookeeper/jetty-util-6.1.26.jar:/usr/share/zookeeper/jetty-6.1.26.jar:/usr/share/zookeeper/javacc.jar:/usr/share/zookeeper/jackson-mapper-asl-1.9.11.jar:/usr/share/zookeeper/jackson-core-asl-1.9.11.jar:/usr/share/zookeeper/commons-cli-1.2.jar:/usr/src/java/lib/*.jar:/usr/etc/zookeeper"
+CLASSPATH="$ZOOCFGDIR:/usr/build/classes:/usr/build/lib/*.jar:/usr/share/zookeeper-3.6.2/lib/audience-annotations-0.5.0.jar:/usr/share/zookeeper-3.6.2/lib/commons-cli-1.2.jar:/usr/share/zookeeper-3.6.2/lib/commons-lang-2.6.jar:/usr/share/zookeeper-3.6.2/lib/jackson-annotations-2.10.3.jar:/usr/share/zookeeper-3.6.2/lib/jackson-core-2.10.3.jar:/usr/share/zookeeper-3.6.2/lib/jackson-databind-2.10.3.jar:/usr/share/zookeeper-3.6.2/lib/javax.servlet-api-3.1.0.jar:/usr/share/zookeeper-3.6.2/lib/jetty-http-9.4.24.v20191120.jar:/usr/share/zookeeper-3.6.2/lib/jetty-io-9.4.24.v20191120.jar:/usr/share/zookeeper-3.6.2/lib/jetty-security-9.4.24.v20191120.jar:/usr/share/zookeeper-3.6.2/lib/jetty-server-9.4.24.v20191120.jar:/usr/share/zookeeper-3.6.2/lib/jetty-servlet-9.4.24.v20191120.jar:/usr/share/zookeeper-3.6.2/lib/jetty-util-9.4.24.v20191120.jar:/usr/share/zookeeper-3.6.2/lib/jline-2.14.6.jar:/usr/share/zookeeper-3.6.2/lib/json-simple-1.1.1.jar:/usr/share/zookeeper-3.6.2/lib/log4j-1.2.17.jar:/usr/share/zookeeper-3.6.2/lib/metrics-core-3.2.5.jar:/usr/share/zookeeper-3.6.2/lib/netty-buffer-4.1.50.Final.jar:/usr/share/zookeeper-3.6.2/lib/netty-codec-4.1.50.Final.jar:/usr/share/zookeeper-3.6.2/lib/netty-common-4.1.50.Final.jar:/usr/share/zookeeper-3.6.2/lib/netty-handler-4.1.50.Final.jar:/usr/share/zookeeper-3.6.2/lib/netty-resolver-4.1.50.Final.jar:/usr/share/zookeeper-3.6.2/lib/netty-transport-4.1.50.Final.jar:/usr/share/zookeeper-3.6.2/lib/netty-transport-native-epoll-4.1.50.Final.jar:/usr/share/zookeeper-3.6.2/lib/netty-transport-native-unix-common-4.1.50.Final.jar:/usr/share/zookeeper-3.6.2/lib/simpleclient-0.6.0.jar:/usr/share/zookeeper-3.6.2/lib/simpleclient_common-0.6.0.jar:/usr/share/zookeeper-3.6.2/lib/simpleclient_hotspot-0.6.0.jar:/usr/share/zookeeper-3.6.2/lib/simpleclient_servlet-0.6.0.jar:/usr/share/zookeeper-3.6.2/lib/slf4j-api-1.7.25.jar:/usr/share/zookeeper-3.6.2/lib/slf4j-log4j12-1.7.25.jar:/usr/share/zookeeper-3.6.2/lib/snappy-java-1.1.7.jar:/usr/share/zookeeper-3.6.2/lib/zookeeper-3.6.2.jar:/usr/share/zookeeper-3.6.2/lib/zookeeper-jute-3.6.2.jar:/usr/share/zookeeper-3.6.2/lib/zookeeper-prometheus-metrics-3.6.2.jar:/usr/share/zookeeper-3.6.2/etc"
 
 ZOOCFG="$ZOOCFGDIR/zoo.cfg"
 ZOO_LOG_DIR=/var/log/$NAME
@@ -213,27 +214,17 @@ GROUP=zookeeper
 PIDDIR=/var/run/$NAME
 PIDFILE=$PIDDIR/$NAME.pid
 SCRIPTNAME=/etc/init.d/$NAME
-JAVA=/usr/bin/java
+JAVA=/usr/local/jdk-11/bin/java
 ZOOMAIN="org.apache.zookeeper.server.quorum.QuorumPeerMain"
 ZOO_LOG4J_PROP="INFO,ROLLINGFILE"
 JMXLOCALONLY=false
 JAVA_OPTS="-Xms{{ '{{' }} cluster.get('xms','128M') {{ '}}' }} \
     -Xmx{{ '{{' }} cluster.get('xmx','1G') {{ '}}' }} \
-    -Xloggc:/var/log/$NAME/zookeeper-gc.log \
-    -XX:+UseGCLogFileRotation \
-    -XX:NumberOfGCLogFiles=16 \
-    -XX:GCLogFileSize=16M \
+    -Xlog:safepoint,gc*=info,age*=debug:file=/var/log/$NAME/zookeeper-gc.log:time,level,tags:filecount=16,filesize=16M
     -verbose:gc \
-    -XX:+PrintGCTimeStamps \
-    -XX:+PrintGCDateStamps \
-    -XX:+PrintGCDetails
-    -XX:+PrintTenuringDistribution \
-    -XX:+PrintGCApplicationStoppedTime \
-    -XX:+PrintGCApplicationConcurrentTime \
-    -XX:+PrintSafepointStatistics \
-    -XX:+UseParNewGC \
-    -XX:+UseConcMarkSweepGC \
--XX:+CMSParallelRemarkEnabled"
+    -XX:+UseG1GC \
+    -Djute.maxbuffer=8388608 \
+    -XX:MaxGCPauseMillis=50"
 ```
 
 Salt init:
diff --git a/docs/en/operations/update.md b/docs/en/operations/update.md
index 9fa9c44e130..dbcf9ae2b3e 100644
--- a/docs/en/operations/update.md
+++ b/docs/en/operations/update.md
@@ -15,7 +15,8 @@ $ sudo service clickhouse-server restart
 
 If you installed ClickHouse using something other than the recommended `deb` packages, use the appropriate update method.
 
-ClickHouse does not support a distributed update. The operation should be performed consecutively on each separate server. Do not update all the servers on a cluster simultaneously, or the cluster will be unavailable for some time.
+!!! note "Note"
+    You can update multiple servers at once as soon as there is no moment when all replicas of one shard are offline.    
 
 The upgrade of older version of ClickHouse to specific version:
 
@@ -28,7 +29,3 @@ $ sudo apt-get update
 $ sudo apt-get install clickhouse-server=xx.yy.a.b clickhouse-client=xx.yy.a.b clickhouse-common-static=xx.yy.a.b
 $ sudo service clickhouse-server restart
 ```
-
-
-
-
diff --git a/docs/en/operations/utilities/clickhouse-local.md b/docs/en/operations/utilities/clickhouse-local.md
index 04f9f3660b5..cfabf42bff1 100644
--- a/docs/en/operations/utilities/clickhouse-local.md
+++ b/docs/en/operations/utilities/clickhouse-local.md
@@ -91,6 +91,8 @@ $ clickhouse-local --query "
 
 Now let’s output memory user for each Unix user:
 
+Query:
+
 ``` bash
 $ ps aux | tail -n +2 | awk '{ printf("%s\t%s\n", $1, $4) }' \
     | clickhouse-local --structure "user String, mem Float64" \
@@ -98,6 +100,8 @@ $ ps aux | tail -n +2 | awk '{ printf("%s\t%s\n", $1, $4) }' \
             FROM table GROUP BY user ORDER BY memTotal DESC FORMAT Pretty"
 ```
 
+Result:
+
 ``` text
 Read 186 rows, 4.15 KiB in 0.035 sec., 5302 rows/sec., 118.34 KiB/sec.
 ┏━━━━━━━━━━┳━━━━━━━━━━┓
diff --git a/docs/en/sql-reference/aggregate-functions/combinators.md b/docs/en/sql-reference/aggregate-functions/combinators.md
index 015c90e90c7..259202805d3 100644
--- a/docs/en/sql-reference/aggregate-functions/combinators.md
+++ b/docs/en/sql-reference/aggregate-functions/combinators.md
@@ -27,7 +27,37 @@ Example 2: `uniqArray(arr)` – Counts the number of unique elements in all ‘a
 
 ## -SimpleState {#agg-functions-combinator-simplestate}
 
-If you apply this combinator, the aggregate function returns the same value but with a different type. This is an `SimpleAggregateFunction(...)` that can be stored in a table to work with [AggregatingMergeTree](../../engines/table-engines/mergetree-family/aggregatingmergetree.md) table engines.
+If you apply this combinator, the aggregate function returns the same value but with a different type. This is a [SimpleAggregateFunction(...)](../../sql-reference/data-types/simpleaggregatefunction.md) that can be stored in a table to work with [AggregatingMergeTree](../../engines/table-engines/mergetree-family/aggregatingmergetree.md) tables.
+
+**Syntax**
+
+``` sql
+<aggFunction>SimpleState(x)
+```
+
+**Arguments**
+
+-   `x` — Aggregate function parameters.
+
+**Returned values**
+
+The value of an aggregate function with the `SimpleAggregateFunction(...)` type.
+
+**Example**
+
+Query:
+
+``` sql
+WITH anySimpleState(number) AS c SELECT toTypeName(c), c FROM numbers(1);
+```
+
+Result:
+
+``` text
+┌─toTypeName(c)────────────────────────┬─c─┐
+│ SimpleAggregateFunction(any, UInt64) │ 0 │
+└──────────────────────────────────────┴───┘
+```
 
 ## -State {#agg-functions-combinator-state}
 
@@ -249,5 +279,3 @@ FROM people
 └────────┴───────────────────────────┘
 ```
 
-
-[Original article](https://clickhouse.tech/docs/en/query_language/agg_functions/combinators/) <!--hide-->
diff --git a/docs/en/sql-reference/aggregate-functions/index.md b/docs/en/sql-reference/aggregate-functions/index.md
index 543a5d3fed8..d2b46f6de53 100644
--- a/docs/en/sql-reference/aggregate-functions/index.md
+++ b/docs/en/sql-reference/aggregate-functions/index.md
@@ -59,4 +59,3 @@ SELECT groupArray(y) FROM t_null_big
 `groupArray` does not include `NULL` in the resulting array.
 
 
-[Original article](https://clickhouse.tech/docs/en/query_language/agg_functions/) <!--hide-->
diff --git a/docs/en/sql-reference/aggregate-functions/parametric-functions.md b/docs/en/sql-reference/aggregate-functions/parametric-functions.md
index 035bc91b9ed..b9d504241db 100644
--- a/docs/en/sql-reference/aggregate-functions/parametric-functions.md
+++ b/docs/en/sql-reference/aggregate-functions/parametric-functions.md
@@ -243,7 +243,7 @@ The function works according to the algorithm:
 **Syntax**
 
 ``` sql
-windowFunnel(window, [mode])(timestamp, cond1, cond2, ..., condN)
+windowFunnel(window, [mode, [mode, ... ]])(timestamp, cond1, cond2, ..., condN)
 ```
 
 **Arguments**
@@ -253,9 +253,11 @@ windowFunnel(window, [mode])(timestamp, cond1, cond2, ..., condN)
 
 **Parameters**
 
--   `window` — Length of the sliding window. The unit of `window` depends on the timestamp itself and varies. Determined using the expression `timestamp of cond2 <= timestamp of cond1 + window`.
--   `mode` - It is an optional parameter.
-    -   `'strict'` - When the `'strict'` is set, the windowFunnel() applies conditions only for the unique values.
+-   `window` — Length of the sliding window, it is the time interval between first condition and last condition. The unit of `window` depends on the `timestamp` itself and varies. Determined using the expression `timestamp of cond1 <= timestamp of cond2 <= ... <= timestamp of condN <= timestamp of cond1 + window`.
+-   `mode` — It is an optional argument. One or more modes can be set.
+    -   `'strict'` — If same condition holds for sequence of events then such non-unique events would be skipped. 
+    -   `'strict_order'` — Don't allow interventions of other events. E.g. in the case of `A->B->D->C`, it stops finding `A->B->C` at the `D` and the max event level is 2.
+    -   `'strict_increase'` — Apply conditions only to events with strictly increasing timestamps.
 
 **Returned value**
 
@@ -336,14 +338,14 @@ retention(cond1, cond2, ..., cond32);
 
 **Arguments**
 
--   `cond` — an expression that returns a `UInt8` result (1 or 0).
+-   `cond` — An expression that returns a `UInt8` result (1 or 0).
 
 **Returned value**
 
 The array of 1 or 0.
 
--   1 — condition was met for the event.
--   0 — condition wasn’t met for the event.
+-   1 — Condition was met for the event.
+-   0 — Condition wasn’t met for the event.
 
 Type: `UInt8`.
 
@@ -500,7 +502,6 @@ Problem: Generate a report that shows only keywords that produced at least 5 uni
 Solution: Write in the GROUP BY query SearchPhrase HAVING uniqUpTo(4)(UserID) >= 5
 ```
 
-[Original article](https://clickhouse.tech/docs/en/query_language/agg_functions/parametric_functions/) <!--hide-->
 
 ## sumMapFiltered(keys_to_keep)(keys, values) {#summapfilteredkeys-to-keepkeys-values}
 
diff --git a/docs/en/sql-reference/aggregate-functions/reference/argmax.md b/docs/en/sql-reference/aggregate-functions/reference/argmax.md
index 7639117042f..72aa607a751 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/argmax.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/argmax.md
@@ -52,15 +52,15 @@ Input table:
 Query:
 
 ``` sql
-SELECT argMax(user, salary), argMax(tuple(user, salary)) FROM salary;
+SELECT argMax(user, salary), argMax(tuple(user, salary), salary), argMax(tuple(user, salary)) FROM salary;
 ```
 
 Result:
 
 ``` text
-┌─argMax(user, salary)─┬─argMax(tuple(user, salary))─┐
-│ director             │ ('director',5000)           │
-└──────────────────────┴─────────────────────────────┘
+┌─argMax(user, salary)─┬─argMax(tuple(user, salary), salary)─┬─argMax(tuple(user, salary))─┐
+│ director             │ ('director',5000)                   │ ('director',5000)           │
+└──────────────────────┴─────────────────────────────────────┴─────────────────────────────┘
 ```
 
 [Original article](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/argmax/) <!--hide-->
diff --git a/docs/en/sql-reference/aggregate-functions/reference/avg.md b/docs/en/sql-reference/aggregate-functions/reference/avg.md
index 12dc4ac1e9d..cbd409ccab6 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/avg.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/avg.md
@@ -9,31 +9,24 @@ Calculates the arithmetic mean.
 **Syntax**
 
 ``` sql
-avgWeighted(x)
+avg(x)
 ```
 
 **Arguments**
 
--   `x` — Values.
-
-`x` must be
-[Integer](../../../sql-reference/data-types/int-uint.md),
-[floating-point](../../../sql-reference/data-types/float.md), or 
-[Decimal](../../../sql-reference/data-types/decimal.md).
+-   `x` — input values, must be [Integer](../../../sql-reference/data-types/int-uint.md), [Float](../../../sql-reference/data-types/float.md), or [Decimal](../../../sql-reference/data-types/decimal.md).
 
 **Returned value**
 
-- `NaN` if the supplied parameter is empty.
-- Mean otherwise.
-
-**Return type** is always [Float64](../../../sql-reference/data-types/float.md).
+-   The arithmetic mean, always as [Float64](../../../sql-reference/data-types/float.md).
+-   `NaN` if the input parameter `x` is empty.
 
 **Example**
 
 Query:
 
 ``` sql
-SELECT avg(x) FROM values('x Int8', 0, 1, 2, 3, 4, 5)
+SELECT avg(x) FROM values('x Int8', 0, 1, 2, 3, 4, 5);
 ```
 
 Result:
@@ -46,11 +39,20 @@ Result:
 
 **Example**
 
+Create a temp table:
+
 Query:
 
 ``` sql
 CREATE table test (t UInt8) ENGINE = Memory;
-SELECT avg(t) FROM test
+```
+
+Get the arithmetic mean: 
+
+Query:
+
+```
+SELECT avg(t) FROM test;
 ```
 
 Result:
@@ -60,3 +62,5 @@ Result:
 │    nan │
 └────────┘
 ```
+
+[Original article](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/avg/) <!--hide-->
diff --git a/docs/en/sql-reference/aggregate-functions/reference/count.md b/docs/en/sql-reference/aggregate-functions/reference/count.md
index 0a5aef2fe97..48c6f3f8c05 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/count.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/count.md
@@ -7,8 +7,9 @@ toc_priority: 1
 Counts the number of rows or not-NULL values.
 
 ClickHouse supports the following syntaxes for `count`:
-- `count(expr)` or `COUNT(DISTINCT expr)`.
-- `count()` or `COUNT(*)`. The `count()` syntax is ClickHouse-specific.
+
+-   `count(expr)` or `COUNT(DISTINCT expr)`.
+-   `count()` or `COUNT(*)`. The `count()` syntax is ClickHouse-specific.
 
 **Arguments**
 
diff --git a/docs/en/sql-reference/aggregate-functions/reference/deltasum.md b/docs/en/sql-reference/aggregate-functions/reference/deltasum.md
index bb6f802ccaf..e0c74576bb6 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/deltasum.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/deltasum.md
@@ -4,16 +4,66 @@ toc_priority: 141
 
 # deltaSum {#agg_functions-deltasum}
 
-Syntax: `deltaSum(value)`
+Sums the arithmetic difference between consecutive rows. If the difference is negative, it is ignored.
 
-Adds the differences between consecutive rows. If the difference is negative, it is ignored. 
-`value` must be some integer or floating point type.
+**Syntax**
 
-Example:
-
-```sql
-select deltaSum(arrayJoin([1, 2, 3]));                  -- => 2
-select deltaSum(arrayJoin([1, 2, 3, 0, 3, 4, 2, 3]));   -- => 7
-select deltaSum(arrayJoin([2.25, 3, 4.5])); -- => 2.25
+``` sql
+deltaSum(value)
 ```
 
+**Arguments**
+
+-   `value` — Input values, must be [Integer](../../data-types/int-uint.md) or [Float](../../data-types/float.md) type.
+
+**Returned value**
+
+- A gained arithmetic difference of the `Integer` or `Float` type.
+
+**Examples**
+
+Query:
+
+``` sql
+SELECT deltaSum(arrayJoin([1, 2, 3]));
+```
+
+Result:
+
+``` text
+┌─deltaSum(arrayJoin([1, 2, 3]))─┐
+│                              2 │
+└────────────────────────────────┘
+```
+
+Query:
+
+``` sql
+SELECT deltaSum(arrayJoin([1, 2, 3, 0, 3, 4, 2, 3]));
+```
+
+Result:
+
+``` text
+┌─deltaSum(arrayJoin([1, 2, 3, 0, 3, 4, 2, 3]))─┐
+│                                             7 │
+└───────────────────────────────────────────────┘
+```
+
+Query:
+
+``` sql
+SELECT deltaSum(arrayJoin([2.25, 3, 4.5]));
+```
+
+Result:
+
+``` text
+┌─deltaSum(arrayJoin([2.25, 3, 4.5]))─┐
+│                                2.25 │
+└─────────────────────────────────────┘
+```
+
+## See Also {#see-also}
+
+-   [runningDifference](../../functions/other-functions.md#other_functions-runningdifference)
diff --git a/docs/en/sql-reference/aggregate-functions/reference/grouparrayinsertat.md b/docs/en/sql-reference/aggregate-functions/reference/grouparrayinsertat.md
index 68456bf7844..d29550b007e 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/grouparrayinsertat.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/grouparrayinsertat.md
@@ -9,7 +9,7 @@ Inserts a value into the array at the specified position.
 **Syntax**
 
 ``` sql
-groupArrayInsertAt(default_x, size)(x, pos);
+groupArrayInsertAt(default_x, size)(x, pos)
 ```
 
 If in one query several values are inserted into the same position, the function behaves in the following ways:
@@ -21,8 +21,8 @@ If in one query several values are inserted into the same position, the function
 
 -   `x` — Value to be inserted. [Expression](../../../sql-reference/syntax.md#syntax-expressions) resulting in one of the [supported data types](../../../sql-reference/data-types/index.md).
 -   `pos` — Position at which the specified element `x` is to be inserted. Index numbering in the array starts from zero. [UInt32](../../../sql-reference/data-types/int-uint.md#uint-ranges).
--   `default_x`— Default value for substituting in empty positions. Optional parameter. [Expression](../../../sql-reference/syntax.md#syntax-expressions) resulting in the data type configured for the `x` parameter. If `default_x` is not defined, the [default values](../../../sql-reference/statements/create/table.md#create-default-values) are used.
--   `size`— Length of the resulting array. Optional parameter. When using this parameter, the default value `default_x` must be specified. [UInt32](../../../sql-reference/data-types/int-uint.md#uint-ranges).
+-   `default_x` — Default value for substituting in empty positions. Optional parameter. [Expression](../../../sql-reference/syntax.md#syntax-expressions) resulting in the data type configured for the `x` parameter. If `default_x` is not defined, the [default values](../../../sql-reference/statements/create/table.md#create-default-values) are used.
+-   `size` — Length of the resulting array. Optional parameter. When using this parameter, the default value `default_x` must be specified. [UInt32](../../../sql-reference/data-types/int-uint.md#uint-ranges).
 
 **Returned value**
 
diff --git a/docs/en/sql-reference/aggregate-functions/reference/groupbitmapor.md b/docs/en/sql-reference/aggregate-functions/reference/groupbitmapor.md
index a4d99fd29e3..d3f40f63f65 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/groupbitmapor.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/groupbitmapor.md
@@ -14,7 +14,7 @@ groupBitmapOr(expr)
 
 `expr` – An expression that results in `AggregateFunction(groupBitmap, UInt*)` type.
 
-**Return value**
+**Returned value**
 
 Value of the `UInt64` type.
 
diff --git a/docs/en/sql-reference/aggregate-functions/reference/groupbitmapxor.md b/docs/en/sql-reference/aggregate-functions/reference/groupbitmapxor.md
index 834f088d02f..cbe01e08145 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/groupbitmapxor.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/groupbitmapxor.md
@@ -14,7 +14,7 @@ groupBitmapOr(expr)
 
 `expr` – An expression that results in `AggregateFunction(groupBitmap, UInt*)` type.
 
-**Return value**
+**Returned value**
 
 Value of the `UInt64` type.
 
diff --git a/docs/en/sql-reference/aggregate-functions/reference/groupbitor.md b/docs/en/sql-reference/aggregate-functions/reference/groupbitor.md
index e427a9ad970..24077de0adc 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/groupbitor.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/groupbitor.md
@@ -14,7 +14,7 @@ groupBitOr(expr)
 
 `expr` – An expression that results in `UInt*` type.
 
-**Return value**
+**Returned value**
 
 Value of the `UInt*` type.
 
diff --git a/docs/en/sql-reference/aggregate-functions/reference/initializeAggregation.md b/docs/en/sql-reference/aggregate-functions/reference/initializeAggregation.md
index 313d6bf81f5..c8fb535089b 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/initializeAggregation.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/initializeAggregation.md
@@ -10,7 +10,7 @@ Use it for tests or to process columns of types `AggregateFunction` and `Aggrega
 **Syntax**
 
 ``` sql
-initializeAggregation (aggregate_function, column_1, column_2);
+initializeAggregation (aggregate_function, column_1, column_2)
 ```
 
 **Arguments**
diff --git a/docs/en/sql-reference/aggregate-functions/reference/kurtpop.md b/docs/en/sql-reference/aggregate-functions/reference/kurtpop.md
index db402c99663..c51c4b92e74 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/kurtpop.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/kurtpop.md
@@ -21,5 +21,5 @@ The kurtosis of the given distribution. Type — [Float64](../../../sql-referenc
 **Example**
 
 ``` sql
-SELECT kurtPop(value) FROM series_with_value_column
+SELECT kurtPop(value) FROM series_with_value_column;
 ```
diff --git a/docs/en/sql-reference/aggregate-functions/reference/kurtsamp.md b/docs/en/sql-reference/aggregate-functions/reference/kurtsamp.md
index 4bb9f76763b..0ee40138adc 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/kurtsamp.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/kurtsamp.md
@@ -23,5 +23,5 @@ The kurtosis of the given distribution. Type — [Float64](../../../sql-referenc
 **Example**
 
 ``` sql
-SELECT kurtSamp(value) FROM series_with_value_column
+SELECT kurtSamp(value) FROM series_with_value_column;
 ```
diff --git a/docs/en/sql-reference/aggregate-functions/reference/mannwhitneyutest.md b/docs/en/sql-reference/aggregate-functions/reference/mannwhitneyutest.md
index dc5fc45b878..34e8188299c 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/mannwhitneyutest.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/mannwhitneyutest.md
@@ -27,7 +27,7 @@ The null hypothesis is that two populations are stochastically equal. Also one-s
     -   `'two-sided'`;
     -   `'greater'`;
     -   `'less'`.
--   `continuity_correction` - if not 0 then continuity correction in the normal approximation for the p-value is applied. (Optional, default: 1.) [UInt64](../../../sql-reference/data-types/int-uint.md).
+-   `continuity_correction` — if not 0 then continuity correction in the normal approximation for the p-value is applied. (Optional, default: 1.) [UInt64](../../../sql-reference/data-types/int-uint.md).
 
 **Returned values**
 
diff --git a/docs/en/sql-reference/aggregate-functions/reference/quantiletdigest.md b/docs/en/sql-reference/aggregate-functions/reference/quantiletdigest.md
index dcc665a68af..dd0d59978d1 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/quantiletdigest.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/quantiletdigest.md
@@ -6,7 +6,7 @@ toc_priority: 207
 
 Computes an approximate [quantile](https://en.wikipedia.org/wiki/Quantile) of a numeric data sequence using the [t-digest](https://github.com/tdunning/t-digest/blob/master/docs/t-digest-paper/histo.pdf) algorithm.
 
-The maximum error is 1%. Memory consumption is `log(n)`, where `n` is a number of values. The result depends on the order of running the query, and is nondeterministic.
+Memory consumption is `log(n)`, where `n` is a number of values. The result depends on the order of running the query, and is nondeterministic.
 
 The performance of the function is lower than performance of [quantile](../../../sql-reference/aggregate-functions/reference/quantile.md#quantile) or [quantileTiming](../../../sql-reference/aggregate-functions/reference/quantiletiming.md#quantiletiming). In terms of the ratio of State size to precision, this function is much better than `quantile`.
 
diff --git a/docs/en/sql-reference/aggregate-functions/reference/skewpop.md b/docs/en/sql-reference/aggregate-functions/reference/skewpop.md
index b9dfc390f9d..f84f8897a35 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/skewpop.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/skewpop.md
@@ -21,5 +21,5 @@ The skewness of the given distribution. Type — [Float64](../../../sql-referenc
 **Example**
 
 ``` sql
-SELECT skewPop(value) FROM series_with_value_column
+SELECT skewPop(value) FROM series_with_value_column;
 ```
diff --git a/docs/en/sql-reference/aggregate-functions/reference/skewsamp.md b/docs/en/sql-reference/aggregate-functions/reference/skewsamp.md
index f7a6df8f507..48a049ca69d 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/skewsamp.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/skewsamp.md
@@ -23,5 +23,5 @@ The skewness of the given distribution. Type — [Float64](../../../sql-referenc
 **Example**
 
 ``` sql
-SELECT skewSamp(value) FROM series_with_value_column
+SELECT skewSamp(value) FROM series_with_value_column;
 ```
diff --git a/docs/en/sql-reference/aggregate-functions/reference/studentttest.md b/docs/en/sql-reference/aggregate-functions/reference/studentttest.md
index a1d7ae33fe1..3398fc1ca8c 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/studentttest.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/studentttest.md
@@ -18,8 +18,8 @@ The null hypothesis is that means of populations are equal. Normal distribution
 
 **Arguments**
 
--   `sample_data` — sample data. [Integer](../../../sql-reference/data-types/int-uint.md), [Float](../../../sql-reference/data-types/float.md) or [Decimal](../../../sql-reference/data-types/decimal.md).
--   `sample_index` — sample index. [Integer](../../../sql-reference/data-types/int-uint.md).
+-   `sample_data` — Sample data. [Integer](../../../sql-reference/data-types/int-uint.md), [Float](../../../sql-reference/data-types/float.md) or [Decimal](../../../sql-reference/data-types/decimal.md).
+-   `sample_index` — Sample index. [Integer](../../../sql-reference/data-types/int-uint.md).
 
 **Returned values**
 
diff --git a/docs/en/sql-reference/aggregate-functions/reference/topk.md b/docs/en/sql-reference/aggregate-functions/reference/topk.md
index b3e79803ba1..b9bea013ea8 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/topk.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/topk.md
@@ -18,13 +18,13 @@ We recommend using the `N < 10` value; performance is reduced with large `N` val
 
 **Arguments**
 
--   ‘N’ is the number of elements to return.
+-   `N` – The number of elements to return.
 
 If the parameter is omitted, default value 10 is used.
 
 **Arguments**
 
--   ’ x ’ – The value to calculate frequency.
+-   `x` – The value to calculate frequency.
 
 **Example**
 
diff --git a/docs/en/sql-reference/aggregate-functions/reference/topkweighted.md b/docs/en/sql-reference/aggregate-functions/reference/topkweighted.md
index 02b9f77ea6f..8562336c829 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/topkweighted.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/topkweighted.md
@@ -18,7 +18,7 @@ topKWeighted(N)(x, weight)
 
 **Arguments**
 
--   `x` – The value.
+-   `x` — The value.
 -   `weight` — The weight. [UInt8](../../../sql-reference/data-types/int-uint.md).
 
 **Returned value**
diff --git a/docs/en/sql-reference/aggregate-functions/reference/uniqhll12.md b/docs/en/sql-reference/aggregate-functions/reference/uniqhll12.md
index 5b23ea81eae..4983220ed7f 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/uniqhll12.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/uniqhll12.md
@@ -26,7 +26,7 @@ Function:
 
 -   Uses the HyperLogLog algorithm to approximate the number of different argument values.
 
-        212 5-bit cells are used. The size of the state is slightly more than 2.5 KB. The result is not very accurate (up to ~10% error) for small data sets (<10K elements). However, the result is fairly accurate for high-cardinality data sets (10K-100M), with a maximum error of ~1.6%. Starting from 100M, the estimation error increases, and the function will return very inaccurate results for data sets with extremely high cardinality (1B+ elements).
+        2^12 5-bit cells are used. The size of the state is slightly more than 2.5 KB. The result is not very accurate (up to ~10% error) for small data sets (<10K elements). However, the result is fairly accurate for high-cardinality data sets (10K-100M), with a maximum error of ~1.6%. Starting from 100M, the estimation error increases, and the function will return very inaccurate results for data sets with extremely high cardinality (1B+ elements).
 
 -   Provides the determinate result (it doesn’t depend on the query processing order).
 
diff --git a/docs/en/sql-reference/aggregate-functions/reference/welchttest.md b/docs/en/sql-reference/aggregate-functions/reference/welchttest.md
index b391fb1d979..02238de42ef 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/welchttest.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/welchttest.md
@@ -18,8 +18,8 @@ The null hypothesis is that means of populations are equal. Normal distribution
 
 **Arguments**
 
--   `sample_data` — sample data. [Integer](../../../sql-reference/data-types/int-uint.md), [Float](../../../sql-reference/data-types/float.md) or [Decimal](../../../sql-reference/data-types/decimal.md).
--   `sample_index` — sample index. [Integer](../../../sql-reference/data-types/int-uint.md).
+-   `sample_data` — Sample data. [Integer](../../../sql-reference/data-types/int-uint.md), [Float](../../../sql-reference/data-types/float.md) or [Decimal](../../../sql-reference/data-types/decimal.md).
+-   `sample_index` — Sample index. [Integer](../../../sql-reference/data-types/int-uint.md).
 
 **Returned values**
 
diff --git a/docs/en/sql-reference/data-types/date.md b/docs/en/sql-reference/data-types/date.md
index 886e93f433c..0cfac4d59fe 100644
--- a/docs/en/sql-reference/data-types/date.md
+++ b/docs/en/sql-reference/data-types/date.md
@@ -5,7 +5,7 @@ toc_title: Date
 
 # Date {#data_type-date}
 
-A date. Stored in two bytes as the number of days since 1970-01-01 (unsigned). Allows storing values from just after the beginning of the Unix Epoch to the upper threshold defined by a constant at the compilation stage (currently, this is until the year 2106, but the final fully-supported year is 2105).
+A date. Stored in two bytes as the number of days since 1970-01-01 (unsigned). Allows storing values from just after the beginning of the Unix Epoch to the upper threshold defined by a constant at the compilation stage (currently, this is until the year 2149, but the final fully-supported year is 2148).
 
 The date value is stored without the time zone.
 
diff --git a/docs/en/sql-reference/data-types/datetime.md b/docs/en/sql-reference/data-types/datetime.md
index 07a6e38a5fa..d95abe57510 100644
--- a/docs/en/sql-reference/data-types/datetime.md
+++ b/docs/en/sql-reference/data-types/datetime.md
@@ -19,15 +19,17 @@ Resolution: 1 second.
 
 ## Usage Remarks {#usage-remarks}
 
-The point in time is saved as a [Unix timestamp](https://en.wikipedia.org/wiki/Unix_time), regardless of the time zone or daylight saving time. Additionally, the `DateTime` type can store time zone that is the same for the entire column, that affects how the values of the `DateTime` type values are displayed in text format and how the values specified as strings are parsed (‘2020-01-01 05:00:01’). The time zone is not stored in the rows of the table (or in resultset), but is stored in the column metadata.
-A list of supported time zones can be found in the [IANA Time Zone Database](https://www.iana.org/time-zones).
-The `tzdata` package, containing [IANA Time Zone Database](https://www.iana.org/time-zones), should be installed in the system. Use the `timedatectl list-timezones` command to list timezones known by a local system.
+The point in time is saved as a [Unix timestamp](https://en.wikipedia.org/wiki/Unix_time), regardless of the time zone or daylight saving time. The time zone affects how the values of the `DateTime` type values are displayed in text format and how the values specified as strings are parsed (‘2020-01-01 05:00:01’).
 
-You can explicitly set a time zone for `DateTime`-type columns when creating a table. If the time zone isn’t set, ClickHouse uses the value of the [timezone](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone) parameter in the server settings or the operating system settings at the moment of the ClickHouse server start.
+Timezone agnostic unix timestamp is stored in tables, and the timezone is used to transform it to text format or back during data import/export or to make calendar calculations on the values (example: `toDate`, `toHour` functions et cetera). The time zone is not stored in the rows of the table (or in resultset), but is stored in the column metadata.
+
+A list of supported time zones can be found in the [IANA Time Zone Database](https://www.iana.org/time-zones) and also can be queried by `SELECT * FROM system.time_zones`.
+
+You can explicitly set a time zone for `DateTime`-type columns when creating a table. Example: `DateTime('UTC')`. If the time zone isn’t set, ClickHouse uses the value of the [timezone](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone) parameter in the server settings or the operating system settings at the moment of the ClickHouse server start.
 
 The [clickhouse-client](../../interfaces/cli.md) applies the server time zone by default if a time zone isn’t explicitly set when initializing the data type. To use the client time zone, run `clickhouse-client` with the `--use_client_time_zone` parameter.
 
-ClickHouse outputs values depending on the value of the [date\_time\_output\_format](../../operations/settings/settings.md#settings-date_time_output_format) setting. `YYYY-MM-DD hh:mm:ss` text format by default. Additionaly you can change the output with the [formatDateTime](../../sql-reference/functions/date-time-functions.md#formatdatetime) function.
+ClickHouse outputs values depending on the value of the [date_time_output_format](../../operations/settings/settings.md#settings-date_time_output_format) setting. `YYYY-MM-DD hh:mm:ss` text format by default. Additionaly you can change the output with the [formatDateTime](../../sql-reference/functions/date-time-functions.md#formatdatetime) function.
 
 When inserting data into ClickHouse, you can use different formats of date and time strings, depending on the value of the [date_time_input_format](../../operations/settings/settings.md#settings-date_time_input_format) setting.
 
@@ -114,6 +116,24 @@ FROM dt
 └─────────────────────┴─────────────────────┘
 ```
 
+As timezone conversion only changes the metadata, the operation has no computation cost.
+
+
+## Limitations on timezones support
+
+Some timezones may not be supported completely. There are a few cases:
+
+If the offset from UTC is not a multiple of 15 minutes, the calculation of hours and minutes can be incorrect. For example, the time zone in Monrovia, Liberia has offset UTC -0:44:30 before 7 Jan 1972. If you are doing calculations on the historical time in Monrovia timezone, the time processing functions may give incorrect results. The results after 7 Jan 1972 will be correct nevertheless.
+
+If the time transition (due to daylight saving time or for other reasons) was performed at a point of time that is not a multiple of 15 minutes, you can also get incorrect results at this specific day.
+
+Non-monotonic calendar dates. For example, in Happy Valley - Goose Bay, the time was transitioned one hour backwards at 00:01:00 7 Nov 2010 (one minute after midnight). So after 6th Nov has ended, people observed a whole one minute of 7th Nov, then time was changed back to 23:01 6th Nov and after another 59 minutes the 7th Nov started again. ClickHouse does not (yet) support this kind of fun. During these days the results of time processing functions may be slightly incorrect.
+
+Similar issue exists for Casey Antarctic station in year 2010. They changed time three hours back at 5 Mar, 02:00. If you are working in antarctic station, please don't afraid to use ClickHouse. Just make sure you set timezone to UTC or be aware of inaccuracies.
+
+Time shifts for multiple days. Some pacific islands changed their timezone offset from UTC+14 to UTC-12. That's alright but some inaccuracies may present if you do calculations with their timezone for historical time points at the days of conversion.
+
+
 ## See Also {#see-also}
 
 -   [Type conversion functions](../../sql-reference/functions/type-conversion-functions.md)
diff --git a/docs/en/sql-reference/data-types/datetime64.md b/docs/en/sql-reference/data-types/datetime64.md
index 5cba8315090..1d3725b9fb3 100644
--- a/docs/en/sql-reference/data-types/datetime64.md
+++ b/docs/en/sql-reference/data-types/datetime64.md
@@ -9,7 +9,7 @@ Allows to store an instant in time, that can be expressed as a calendar date and
 
 Tick size (precision): 10<sup>-precision</sup> seconds
 
-Syntax:
+**Syntax:**
 
 ``` sql
 DateTime64(precision, [timezone])
@@ -17,9 +17,11 @@ DateTime64(precision, [timezone])
 
 Internally, stores data as a number of ‘ticks’ since epoch start (1970-01-01 00:00:00 UTC) as Int64. The tick resolution is determined by the precision parameter. Additionally, the `DateTime64` type can store time zone that is the same for the entire column, that affects how the values of the `DateTime64` type values are displayed in text format and how the values specified as strings are parsed (‘2020-01-01 05:00:01.000’). The time zone is not stored in the rows of the table (or in resultset), but is stored in the column metadata. See details in [DateTime](../../sql-reference/data-types/datetime.md).
 
+Supported range from January 1, 1925 till December 31, 2283.
+
 ## Examples {#examples}
 
-**1.** Creating a table with `DateTime64`-type column and inserting data into it:
+1. Creating a table with `DateTime64`-type column and inserting data into it:
 
 ``` sql
 CREATE TABLE dt
@@ -27,15 +29,15 @@ CREATE TABLE dt
     `timestamp` DateTime64(3, 'Europe/Moscow'),
     `event_id` UInt8
 )
-ENGINE = TinyLog
+ENGINE = TinyLog;
 ```
 
 ``` sql
-INSERT INTO dt Values (1546300800000, 1), ('2019-01-01 00:00:00', 2)
+INSERT INTO dt Values (1546300800000, 1), ('2019-01-01 00:00:00', 2);
 ```
 
 ``` sql
-SELECT * FROM dt
+SELECT * FROM dt;
 ```
 
 ``` text
@@ -45,13 +47,13 @@ SELECT * FROM dt
 └─────────────────────────┴──────────┘
 ```
 
--   When inserting datetime as an integer, it is treated as an appropriately scaled Unix Timestamp (UTC). `1546300800000` (with precision 3) represents `'2019-01-01 00:00:00'` UTC. However, as `timestamp` column has `Europe/Moscow` (UTC+3) timezone specified, when outputting as a string the value will be shown as `'2019-01-01 03:00:00'`
+-   When inserting datetime as an integer, it is treated as an appropriately scaled Unix Timestamp (UTC). `1546300800000` (with precision 3) represents `'2019-01-01 00:00:00'` UTC. However, as `timestamp` column has `Europe/Moscow` (UTC+3) timezone specified, when outputting as a string the value will be shown as `'2019-01-01 03:00:00'`.
 -   When inserting string value as datetime, it is treated as being in column timezone. `'2019-01-01 00:00:00'` will be treated as being in `Europe/Moscow` timezone and stored as `1546290000000`.
 
-**2.** Filtering on `DateTime64` values
+2. Filtering on `DateTime64` values
 
 ``` sql
-SELECT * FROM dt WHERE timestamp = toDateTime64('2019-01-01 00:00:00', 3, 'Europe/Moscow')
+SELECT * FROM dt WHERE timestamp = toDateTime64('2019-01-01 00:00:00', 3, 'Europe/Moscow');
 ```
 
 ``` text
@@ -60,12 +62,12 @@ SELECT * FROM dt WHERE timestamp = toDateTime64('2019-01-01 00:00:00', 3, 'Europ
 └─────────────────────────┴──────────┘
 ```
 
-Unlike `DateTime`, `DateTime64` values are not converted from `String` automatically
+Unlike `DateTime`, `DateTime64` values are not converted from `String` automatically.
 
-**3.** Getting a time zone for a `DateTime64`-type value:
+3. Getting a time zone for a `DateTime64`-type value:
 
 ``` sql
-SELECT toDateTime64(now(), 3, 'Europe/Moscow') AS column, toTypeName(column) AS x
+SELECT toDateTime64(now(), 3, 'Europe/Moscow') AS column, toTypeName(column) AS x;
 ```
 
 ``` text
@@ -74,13 +76,13 @@ SELECT toDateTime64(now(), 3, 'Europe/Moscow') AS column, toTypeName(column) AS
 └─────────────────────────┴────────────────────────────────┘
 ```
 
-**4.** Timezone conversion
+4. Timezone conversion
 
 ``` sql
 SELECT
 toDateTime64(timestamp, 3, 'Europe/London') as lon_time,
 toDateTime64(timestamp, 3, 'Europe/Moscow') as mos_time
-FROM dt
+FROM dt;
 ```
 
 ``` text
@@ -90,7 +92,7 @@ FROM dt
 └─────────────────────────┴─────────────────────────┘
 ```
 
-## See Also {#see-also}
+**See Also**
 
 -   [Type conversion functions](../../sql-reference/functions/type-conversion-functions.md)
 -   [Functions for working with dates and times](../../sql-reference/functions/date-time-functions.md)
diff --git a/docs/en/sql-reference/data-types/geo.md b/docs/en/sql-reference/data-types/geo.md
new file mode 100644
index 00000000000..9ed328e0de6
--- /dev/null
+++ b/docs/en/sql-reference/data-types/geo.md
@@ -0,0 +1,106 @@
+---
+toc_priority: 62
+toc_title: Geo
+---
+
+# Geo Data Types {#geo-data-types}
+
+Clickhouse supports data types for representing geographical objects — locations, lands, etc. 
+
+!!! warning "Warning"
+    Currently geo data types are an experimental feature. To work with them you must set `allow_experimental_geo_types = 1`.
+
+**See Also**
+- [Representing simple geographical features](https://en.wikipedia.org/wiki/GeoJSON).
+- [allow_experimental_geo_types](../../operations/settings/settings.md#allow-experimental-geo-types) setting.
+
+## Point {#point-data-type}
+
+`Point` is represented by its X and Y coordinates, stored as a [Tuple](tuple.md)([Float64](float.md), [Float64](float.md)).
+
+**Example**
+
+Query:
+
+```sql
+SET allow_experimental_geo_types = 1;
+CREATE TABLE geo_point (p Point) ENGINE = Memory();
+INSERT INTO geo_point VALUES((10, 10));
+SELECT p, toTypeName(p) FROM geo_point;
+```
+Result: 
+
+``` text
+┌─p─────┬─toTypeName(p)─┐
+│ (10,10) │ Point         │
+└───────┴───────────────┘
+```
+
+## Ring {#ring-data-type}
+
+`Ring` is a simple polygon without holes stored as an array of points: [Array](array.md)([Point](#point-data-type)).
+
+**Example**
+
+Query:
+
+```sql
+SET allow_experimental_geo_types = 1;
+CREATE TABLE geo_ring (r Ring) ENGINE = Memory();
+INSERT INTO geo_ring VALUES([(0, 0), (10, 0), (10, 10), (0, 10)]);
+SELECT r, toTypeName(r) FROM geo_ring;
+```
+Result: 
+
+``` text
+┌─r─────────────────────────────┬─toTypeName(r)─┐
+│ [(0,0),(10,0),(10,10),(0,10)] │ Ring          │
+└───────────────────────────────┴───────────────┘
+```
+
+## Polygon {#polygon-data-type}
+
+`Polygon` is a polygon with holes stored as an array of rings: [Array](array.md)([Ring](#ring-data-type)). First element of outer array is the outer shape of polygon and all the following elements are holes.
+
+**Example**
+
+This is a polygon with one hole:
+
+```sql
+SET allow_experimental_geo_types = 1;
+CREATE TABLE geo_polygon (pg Polygon) ENGINE = Memory();
+INSERT INTO geo_polygon VALUES([[(20, 20), (50, 20), (50, 50), (20, 50)], [(30, 30), (50, 50), (50, 30)]]);
+SELECT pg, toTypeName(pg) FROM geo_polygon;
+```
+
+Result: 
+
+``` text
+┌─pg────────────────────────────────────────────────────────────┬─toTypeName(pg)─┐
+│ [[(20,20),(50,20),(50,50),(20,50)],[(30,30),(50,50),(50,30)]] │ Polygon        │
+└───────────────────────────────────────────────────────────────┴────────────────┘
+```
+
+## MultiPolygon {#multipolygon-data-type}
+
+`MultiPolygon` consists of multiple polygons and is stored as an array of polygons: [Array](array.md)([Polygon](#polygon-data-type)). 
+
+**Example**
+
+This multipolygon consists of two separate polygons — the first one without holes, and the second with one hole:
+
+```sql
+SET allow_experimental_geo_types = 1;
+CREATE TABLE geo_multipolygon (mpg MultiPolygon) ENGINE = Memory();
+INSERT INTO geo_multipolygon VALUES([[[(0, 0), (10, 0), (10, 10), (0, 10)]], [[(20, 20), (50, 20), (50, 50), (20, 50)],[(30, 30), (50, 50), (50, 30)]]]);
+SELECT mpg, toTypeName(mpg) FROM geo_multipolygon;
+```
+Result: 
+
+``` text
+┌─mpg─────────────────────────────────────────────────────────────────────────────────────────────┬─toTypeName(mpg)─┐
+│ [[[(0,0),(10,0),(10,10),(0,10)]],[[(20,20),(50,20),(50,50),(20,50)],[(30,30),(50,50),(50,30)]]] │ MultiPolygon    │
+└─────────────────────────────────────────────────────────────────────────────────────────────────┴─────────────────┘
+```
+
+[Original article](https://clickhouse.tech/docs/en/data-types/geo/) <!--hide-->
diff --git a/docs/en/sql-reference/data-types/simpleaggregatefunction.md b/docs/en/sql-reference/data-types/simpleaggregatefunction.md
index 2d2746f85d3..af12a03ab51 100644
--- a/docs/en/sql-reference/data-types/simpleaggregatefunction.md
+++ b/docs/en/sql-reference/data-types/simpleaggregatefunction.md
@@ -2,6 +2,8 @@
 
 `SimpleAggregateFunction(name, types_of_arguments…)` data type stores current value of the aggregate function, and does not store its full state as [`AggregateFunction`](../../sql-reference/data-types/aggregatefunction.md) does. This optimization can be applied to functions for which the following property holds: the result of applying a function `f` to a row set `S1 UNION ALL S2` can be obtained by applying `f` to parts of the row set separately, and then again applying `f` to the results: `f(S1 UNION ALL S2) = f(f(S1) UNION ALL f(S2))`. This property guarantees that partial aggregation results are enough to compute the combined one, so we don’t have to store and process any extra data.
 
+The common way to produce an aggregate function value is by calling the aggregate function with the [-SimpleState](../../sql-reference/aggregate-functions/combinators.md#agg-functions-combinator-simplestate) suffix.
+
 The following aggregate functions are supported:
 
 -   [`any`](../../sql-reference/aggregate-functions/reference/any.md#agg_function-any)
@@ -21,7 +23,11 @@ The following aggregate functions are supported:
 -   [`argMin`](../../sql-reference/aggregate-functions/reference/argmin.md)
 -   [`argMax`](../../sql-reference/aggregate-functions/reference/argmax.md)
 
-Values of the `SimpleAggregateFunction(func, Type)` look and stored the same way as `Type`, so you do not need to apply functions with `-Merge`/`-State` suffixes. `SimpleAggregateFunction` has better performance than `AggregateFunction` with same aggregation function.
+
+!!! note "Note"
+    Values of the `SimpleAggregateFunction(func, Type)` look and stored the same way as `Type`, so you do not need to apply functions with `-Merge`/`-State` suffixes.
+    
+    `SimpleAggregateFunction` has better performance than `AggregateFunction` with same aggregation function.
 
 **Parameters**
 
@@ -31,11 +37,7 @@ Values of the `SimpleAggregateFunction(func, Type)` look and stored the same way
 **Example**
 
 ``` sql
-CREATE TABLE t
-(
-    column1 SimpleAggregateFunction(sum, UInt64),
-    column2 SimpleAggregateFunction(any, String)
-) ENGINE = ...
+CREATE TABLE simple (id UInt64, val SimpleAggregateFunction(sum, Double)) ENGINE=AggregatingMergeTree ORDER BY id;
 ```
 
 [Original article](https://clickhouse.tech/docs/en/data_types/simpleaggregatefunction/) <!--hide-->
diff --git a/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-hierarchical.md b/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-hierarchical.md
index a5e105d2e13..08d3b8d8ad0 100644
--- a/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-hierarchical.md
+++ b/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-hierarchical.md
@@ -65,4 +65,3 @@ For our example, the structure of dictionary can be the following:
 </dictionary>
 ```
 
-[Original article](https://clickhouse.tech/docs/en/query_language/dicts/external_dicts_dict_hierarchical/) <!--hide-->
diff --git a/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md b/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md
index efef91b4b09..de6a780235f 100644
--- a/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md
+++ b/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md
@@ -320,8 +320,6 @@ Similar to `cache`, but stores data on SSD and index in RAM.
         <write_buffer_size>1048576</write_buffer_size>
         <!-- Path where cache file will be stored. -->
         <path>/var/lib/clickhouse/clickhouse_dictionaries/test_dict</path>
-        <!-- Max number on stored keys in the cache. Rounded up to a power of two. -->
-        <max_stored_keys>1048576</max_stored_keys>
     </ssd_cache>
 </layout>
 ```
@@ -329,8 +327,8 @@ Similar to `cache`, but stores data on SSD and index in RAM.
 or
 
 ``` sql
-LAYOUT(CACHE(BLOCK_SIZE 4096 FILE_SIZE 16777216 READ_BUFFER_SIZE 1048576
-    PATH /var/lib/clickhouse/clickhouse_dictionaries/test_dict MAX_STORED_KEYS 1048576))
+LAYOUT(SSD_CACHE(BLOCK_SIZE 4096 FILE_SIZE 16777216 READ_BUFFER_SIZE 1048576
+    PATH /var/lib/clickhouse/clickhouse_dictionaries/test_dict))
 ```
 
 ### complex_key_ssd_cache {#complex-key-ssd-cache}
@@ -445,4 +443,3 @@ Other types are not supported yet. The function returns the attribute for the pr
 
 Data must completely fit into RAM.
 
-[Original article](https://clickhouse.tech/docs/en/query_language/dicts/external_dicts_dict_layout/) <!--hide-->
diff --git a/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md b/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md
index 20486ebbcc8..081cc5b0b69 100644
--- a/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md
+++ b/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md
@@ -19,6 +19,8 @@ Example of settings:
 </dictionary>
 ```
 
+or
+
 ``` sql
 CREATE DICTIONARY (...)
 ...
@@ -58,7 +60,7 @@ When upgrading the dictionaries, the ClickHouse server applies different logic d
 -   For MySQL source, the time of modification is checked using a `SHOW TABLE STATUS` query (in case of MySQL 8 you need to disable meta-information caching in MySQL by `set global information_schema_stats_expiry=0`. 
 -   Dictionaries from other sources are updated every time by default.
 
-For other sources (ODBC, ClickHouse, etc), you can set up a query that will update the dictionaries only if they really changed, rather than each time. To do this, follow these steps:
+For other sources (ODBC, PostgreSQL, ClickHouse, etc), you can set up a query that will update the dictionaries only if they really changed, rather than each time. To do this, follow these steps:
 
 -   The dictionary table must have a field that always changes when the source data is updated.
 -   The settings of the source must specify a query that retrieves the changing field. The ClickHouse server interprets the query result as a row, and if this row has changed relative to its previous state, the dictionary is updated. Specify the query in the `<invalidate_query>` field in the settings for the [source](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md).
@@ -84,4 +86,3 @@ SOURCE(ODBC(... invalidate_query 'SELECT update_time FROM dictionary_source wher
 ...
 ```
 
-[Original article](https://clickhouse.tech/docs/en/query_language/dicts/external_dicts_dict_lifetime/) <!--hide-->
diff --git a/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md b/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md
index 7cd26a9dffb..dc0b6e17198 100644
--- a/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md
+++ b/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md
@@ -65,9 +65,12 @@ Types of sources (`source_type`):
 -   DBMS
     -   [ODBC](#dicts-external_dicts_dict_sources-odbc)
     -   [MySQL](#dicts-external_dicts_dict_sources-mysql)
+    -   [PostgreSQL](#dicts-external_dicts_dict_sources-postgresql)
     -   [ClickHouse](#dicts-external_dicts_dict_sources-clickhouse)
     -   [MongoDB](#dicts-external_dicts_dict_sources-mongodb)
     -   [Redis](#dicts-external_dicts_dict_sources-redis)
+    -   [Cassandra](#dicts-external_dicts_dict_sources-cassandra)
+    -   [PostgreSQL](#dicts-external_dicts_dict_sources-postgresql)    
 
 ## Local File {#dicts-external_dicts_dict_sources-local_file}
 
@@ -659,7 +662,7 @@ Example of settings:
 
 Setting fields:
 - `host` – The Cassandra host or comma-separated list of hosts.
-- `port` – The port on the Cassandra servers. If not specified, default port is used.
+- `port` – The port on the Cassandra servers. If not specified, default port 9042 is used.
 - `user` – Name of the Cassandra user.
 - `password` – Password of the Cassandra user.
 - `keyspace` – Name of the keyspace (database).
@@ -673,4 +676,52 @@ Default value is 1 (the first key column is a partition key and other key column
 - `where` – Optional selection criteria.
 - `max_threads` – The maximum number of threads to use for loading data from multiple partitions in compose key dictionaries.
 
-[Original article](https://clickhouse.tech/docs/en/query_language/dicts/external_dicts_dict_sources/) <!--hide-->
+### PosgreSQL {#dicts-external_dicts_dict_sources-postgresql}
+
+Example of settings:
+
+``` xml
+<source>
+  <postgresql>
+      <port>5432</port>
+      <user>clickhouse</user>
+      <password>qwerty</password>
+      <db>db_name</db>
+      <table>table_name</table>
+      <where>id=10</where>
+      <invalidate_query>SQL_QUERY</invalidate_query>
+  </postgresql>
+</source>
+```
+
+or
+
+``` sql
+SOURCE(POSTGRESQL(
+    port 5432
+    host 'postgresql-hostname'
+    user 'postgres_user'
+    password 'postgres_password'
+    db 'db_name'
+    table 'table_name'
+    replica(host 'example01-1' port 5432 priority 1)
+    replica(host 'example01-2' port 5432 priority 2)
+    where 'id=10'
+    invalidate_query 'SQL_QUERY'
+))
+```
+
+Setting fields:
+
+-   `host` – The host on the PostgreSQL server. You can specify it for all replicas, or for each one individually (inside `<replica>`).
+-   `port` – The port on the PostgreSQL server. You can specify it for all replicas, or for each one individually (inside `<replica>`).
+-   `user` – Name of the PostgreSQL user. You can specify it for all replicas, or for each one individually (inside `<replica>`).
+-   `password` – Password of the PostgreSQL user. You can specify it for all replicas, or for each one individually (inside `<replica>`).
+-   `replica` – Section of replica configurations. There can be multiple sections.
+        - `replica/host` – The PostgreSQL host.
+        - `replica/port` – The PostgreSQL port.
+        - `replica/priority` – The replica priority. When attempting to connect, ClickHouse traverses the replicas in order of priority. The lower the number, the higher the priority.
+-   `db` – Name of the database.
+-   `table` – Name of the table.
+-   `where` – The selection criteria. The syntax for conditions is the same as for `WHERE` clause in PostgreSQL, for example, `id > 10 AND id < 20`. Optional parameter.
+-   `invalidate_query` – Query for checking the dictionary status. Optional parameter. Read more in the section [Updating dictionaries](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md).
diff --git a/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md b/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md
index e25b3ab78c3..f22d2a0b59e 100644
--- a/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md
+++ b/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md
@@ -159,15 +159,14 @@ Configuration fields:
 | Tag                                                  | Description                                                                                                                                                                                                                                                                                                                                     | Required |
 |------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|
 | `name`                                               | Column name.                                                                                                                                                                                                                                                                                                                                    | Yes      |
-| `type`                                               | ClickHouse data type.<br/>ClickHouse tries to cast value from dictionary to the specified data type. For example, for MySQL, the field might be `TEXT`, `VARCHAR`, or `BLOB` in the MySQL source table, but it can be uploaded as `String` in ClickHouse.<br/>[Nullable](../../../sql-reference/data-types/nullable.md) is not supported.       | Yes      |
-| `null_value`                                         | Default value for a non-existing element.<br/>In the example, it is an empty string. You cannot use `NULL` in this field.                                                                                                                                                                                                                       | Yes      |
+| `type`                                               | ClickHouse data type.<br/>ClickHouse tries to cast value from dictionary to the specified data type. For example, for MySQL, the field might be `TEXT`, `VARCHAR`, or `BLOB` in the MySQL source table, but it can be uploaded as `String` in ClickHouse.<br/>[Nullable](../../../sql-reference/data-types/nullable.md) is currently supported for [Flat](external-dicts-dict-layout.md#flat), [Hashed](external-dicts-dict-layout.md#dicts-external_dicts_dict_layout-hashed), [ComplexKeyHashed](external-dicts-dict-layout.md#complex-key-hashed), [Direct](external-dicts-dict-layout.md#direct), [ComplexKeyDirect](external-dicts-dict-layout.md#complex-key-direct), [RangeHashed](external-dicts-dict-layout.md#range-hashed), [Polygon](external-dicts-dict-polygon.md) dictionaries. In [Cache](external-dicts-dict-layout.md#cache), [ComplexKeyCache](external-dicts-dict-layout.md#complex-key-cache), [SSDCache](external-dicts-dict-layout.md#ssd-cache), [SSDComplexKeyCache](external-dicts-dict-layout.md#complex-key-ssd-cache), [IPTrie](external-dicts-dict-layout.md#ip-trie) dictionaries `Nullable` types are not supported.       | Yes      |
+| `null_value`                                         | Default value for a non-existing element.<br/>In the example, it is an empty string. [NULL](../../syntax.md#null-literal) value can be used only for the `Nullable` types (see the previous line with types description).                                                                                                                                                                                                                       | Yes      |
 | `expression`                                         | [Expression](../../../sql-reference/syntax.md#syntax-expressions) that ClickHouse executes on the value.<br/>The expression can be a column name in the remote SQL database. Thus, you can use it to create an alias for the remote column.<br/><br/>Default value: no expression.                                                              | No       |
 | <a name="hierarchical-dict-attr"></a> `hierarchical` | If `true`, the attribute contains the value of a parent key for the current key. See [Hierarchical Dictionaries](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-hierarchical.md).<br/><br/>Default value: `false`.                                                                                               | No       |
 | `injective`                                          | Flag that shows whether the `id -> attribute` image is [injective](https://en.wikipedia.org/wiki/Injective_function).<br/>If `true`, ClickHouse can automatically place after the `GROUP BY` clause the requests to dictionaries with injection. Usually it significantly reduces the amount of such requests.<br/><br/>Default value: `false`. | No       |
 | `is_object_id`                                       | Flag that shows whether the query is executed for a MongoDB document by `ObjectID`.<br/><br/>Default value: `false`.                                                                                                                                                                                                                            | No       |
 
-## See Also {#see-also}
+**See Also**
 
 -   [Functions for working with external dictionaries](../../../sql-reference/functions/ext-dict-functions.md).
 
-[Original article](https://clickhouse.tech/docs/en/query_language/dicts/external_dicts_dict_structure/) <!--hide-->
diff --git a/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict.md b/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict.md
index 17ad110aa19..e15d944130e 100644
--- a/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict.md
+++ b/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict.md
@@ -48,4 +48,3 @@ LIFETIME(...) -- Lifetime of dictionary in memory
 -   [structure](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md) — Structure of the dictionary . A key and attributes that can be retrieved by this key.
 -   [lifetime](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md) — Frequency of dictionary updates.
 
-[Original article](https://clickhouse.tech/docs/en/query_language/dicts/external_dicts_dict/) <!--hide-->
diff --git a/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts.md b/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts.md
index 99a62002822..8217fb8da3a 100644
--- a/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts.md
+++ b/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts.md
@@ -57,4 +57,3 @@ You can [configure](../../../sql-reference/dictionaries/external-dictionaries/ex
 -   [Dictionary Key and Fields](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md)
 -   [Functions for Working with External Dictionaries](../../../sql-reference/functions/ext-dict-functions.md)
 
-[Original article](https://clickhouse.tech/docs/en/query_language/dicts/external_dicts/) <!--hide-->
diff --git a/docs/en/sql-reference/dictionaries/index.md b/docs/en/sql-reference/dictionaries/index.md
index 420182642bb..22f4182a1c0 100644
--- a/docs/en/sql-reference/dictionaries/index.md
+++ b/docs/en/sql-reference/dictionaries/index.md
@@ -10,11 +10,8 @@ A dictionary is a mapping (`key -> attributes`) that is convenient for various t
 
 ClickHouse supports special functions for working with dictionaries that can be used in queries. It is easier and more efficient to use dictionaries with functions than a `JOIN` with reference tables.
 
-[NULL](../../sql-reference/syntax.md#null-literal) values can’t be stored in a dictionary.
-
 ClickHouse supports:
 
 -   [Built-in dictionaries](../../sql-reference/dictionaries/internal-dicts.md#internal_dicts) with a specific [set of functions](../../sql-reference/functions/ym-dict-functions.md).
 -   [Plug-in (external) dictionaries](../../sql-reference/dictionaries/external-dictionaries/external-dicts.md#dicts-external-dicts) with a [set of functions](../../sql-reference/functions/ext-dict-functions.md).
 
-[Original article](https://clickhouse.tech/docs/en/query_language/dicts/) <!--hide-->
diff --git a/docs/en/sql-reference/dictionaries/internal-dicts.md b/docs/en/sql-reference/dictionaries/internal-dicts.md
index 7d657d4177f..472351a19a4 100644
--- a/docs/en/sql-reference/dictionaries/internal-dicts.md
+++ b/docs/en/sql-reference/dictionaries/internal-dicts.md
@@ -50,4 +50,3 @@ We recommend periodically updating the dictionaries with the geobase. During an
 
 There are also functions for working with OS identifiers and Yandex.Metrica search engines, but they shouldn’t be used.
 
-[Original article](https://clickhouse.tech/docs/en/query_language/dicts/internal_dicts/) <!--hide-->
diff --git a/docs/en/sql-reference/functions/arithmetic-functions.md b/docs/en/sql-reference/functions/arithmetic-functions.md
index c4b151f59ce..faa03dfc9d3 100644
--- a/docs/en/sql-reference/functions/arithmetic-functions.md
+++ b/docs/en/sql-reference/functions/arithmetic-functions.md
@@ -82,4 +82,3 @@ An exception is thrown when dividing by zero or when dividing a minimal negative
 Returns the least common multiple of the numbers.
 An exception is thrown when dividing by zero or when dividing a minimal negative number by minus one.
 
-[Original article](https://clickhouse.tech/docs/en/query_language/functions/arithmetic_functions/) <!--hide-->
diff --git a/docs/en/sql-reference/functions/array-functions.md b/docs/en/sql-reference/functions/array-functions.md
index c9c418d57a4..499376a70d4 100644
--- a/docs/en/sql-reference/functions/array-functions.md
+++ b/docs/en/sql-reference/functions/array-functions.md
@@ -245,7 +245,7 @@ Elements set to `NULL` are handled as normal values.
 
 Returns the number of elements in the arr array for which func returns something other than 0. If ‘func’ is not specified, it returns the number of non-zero elements in the array.
 
-Note that the `arrayCount` is a [higher-order function](../../sql-reference/functions/index.md#higher-order-functions). You can pass a lambda function to it as the first argument. 
+Note that the `arrayCount` is a [higher-order function](../../sql-reference/functions/index.md#higher-order-functions). You can pass a lambda function to it as the first argument.
 
 ## countEqual(arr, x) {#countequalarr-x}
 
@@ -376,7 +376,7 @@ arrayPopBack(array)
 **Example**
 
 ``` sql
-SELECT arrayPopBack([1, 2, 3]) AS res
+SELECT arrayPopBack([1, 2, 3]) AS res;
 ```
 
 ``` text
@@ -400,7 +400,7 @@ arrayPopFront(array)
 **Example**
 
 ``` sql
-SELECT arrayPopFront([1, 2, 3]) AS res
+SELECT arrayPopFront([1, 2, 3]) AS res;
 ```
 
 ``` text
@@ -425,7 +425,7 @@ arrayPushBack(array, single_value)
 **Example**
 
 ``` sql
-SELECT arrayPushBack(['a'], 'b') AS res
+SELECT arrayPushBack(['a'], 'b') AS res;
 ```
 
 ``` text
@@ -450,7 +450,7 @@ arrayPushFront(array, single_value)
 **Example**
 
 ``` sql
-SELECT arrayPushFront(['b'], 'a') AS res
+SELECT arrayPushFront(['b'], 'a') AS res;
 ```
 
 ``` text
@@ -482,7 +482,7 @@ An array of length `size`.
 **Examples of calls**
 
 ``` sql
-SELECT arrayResize([1], 3)
+SELECT arrayResize([1], 3);
 ```
 
 ``` text
@@ -492,7 +492,7 @@ SELECT arrayResize([1], 3)
 ```
 
 ``` sql
-SELECT arrayResize([1], 3, NULL)
+SELECT arrayResize([1], 3, NULL);
 ```
 
 ``` text
@@ -513,12 +513,12 @@ arraySlice(array, offset[, length])
 
 -   `array` – Array of data.
 -   `offset` – Indent from the edge of the array. A positive value indicates an offset on the left, and a negative value is an indent on the right. Numbering of the array items begins with 1.
--   `length` - The length of the required slice. If you specify a negative value, the function returns an open slice `[offset, array_length - length)`. If you omit the value, the function returns the slice `[offset, the_end_of_array]`.
+-   `length` – The length of the required slice. If you specify a negative value, the function returns an open slice `[offset, array_length - length)`. If you omit the value, the function returns the slice `[offset, the_end_of_array]`.
 
 **Example**
 
 ``` sql
-SELECT arraySlice([1, 2, NULL, 4, 5], 2, 3) AS res
+SELECT arraySlice([1, 2, NULL, 4, 5], 2, 3) AS res;
 ```
 
 ``` text
@@ -766,7 +766,7 @@ Type: [UInt\*](https://clickhouse.tech/docs/en/data_types/int_uint/#uint-ranges)
 Query:
 
 ``` sql
-SELECT arrayDifference([1, 2, 3, 4])
+SELECT arrayDifference([1, 2, 3, 4]);
 ```
 
 Result:
@@ -782,7 +782,7 @@ Example of the overflow due to result type Int64:
 Query:
 
 ``` sql
-SELECT arrayDifference([0, 10000000000000000000])
+SELECT arrayDifference([0, 10000000000000000000]);
 ```
 
 Result:
@@ -816,7 +816,7 @@ Returns an array containing the distinct elements.
 Query:
 
 ``` sql
-SELECT arrayDistinct([1, 2, 2, 3, 1])
+SELECT arrayDistinct([1, 2, 2, 3, 1]);
 ```
 
 Result:
@@ -883,7 +883,7 @@ arrayReduce(agg_func, arr1, arr2, ..., arrN)
 Query:
 
 ``` sql
-SELECT arrayReduce('max', [1, 2, 3])
+SELECT arrayReduce('max', [1, 2, 3]);
 ```
 
 Result:
@@ -899,7 +899,7 @@ If an aggregate function takes multiple arguments, then this function must be ap
 Query:
 
 ``` sql
-SELECT arrayReduce('maxIf', [3, 5], [1, 0])
+SELECT arrayReduce('maxIf', [3, 5], [1, 0]);
 ```
 
 Result:
@@ -915,7 +915,7 @@ Example with a parametric aggregate function:
 Query:
 
 ``` sql
-SELECT arrayReduce('uniqUpTo(3)', [1, 2, 3, 4, 5, 6, 7, 8, 9, 10])
+SELECT arrayReduce('uniqUpTo(3)', [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
 ```
 
 Result:
@@ -1014,7 +1014,7 @@ Alias: `flatten`.
 **Examples**
 
 ``` sql
-SELECT flatten([[[1]], [[2], [3]]])
+SELECT flatten([[[1]], [[2], [3]]]);
 ```
 
 ``` text
@@ -1048,7 +1048,7 @@ Type: `Array`.
 Query:
 
 ``` sql
-SELECT arrayCompact([1, 1, nan, nan, 2, 3, 3, 3])
+SELECT arrayCompact([1, 1, nan, nan, 2, 3, 3, 3]);
 ```
 
 Result:
@@ -1086,7 +1086,7 @@ Type: [Array](../../sql-reference/data-types/array.md).
 Query:
 
 ``` sql
-SELECT arrayZip(['a', 'b', 'c'], [5, 2, 1])
+SELECT arrayZip(['a', 'b', 'c'], [5, 2, 1]);
 ```
 
 Result:
@@ -1108,17 +1108,20 @@ arrayAUC(arr_scores, arr_labels)
 ```
 
 **Arguments**
+
 - `arr_scores` — scores prediction model gives.
 - `arr_labels` — labels of samples, usually 1 for positive sample and 0 for negtive sample.
 
 **Returned value**
+
 Returns AUC value with type Float64.
 
 **Example**
+
 Query:
 
 ``` sql
-select arrayAUC([0.1, 0.4, 0.35, 0.8], [0, 0, 1, 1])
+select arrayAUC([0.1, 0.4, 0.35, 0.8], [0, 0, 1, 1]);
 ```
 
 Result:
@@ -1226,7 +1229,7 @@ SELECT arrayReverseFill(x -> not isNull(x), [1, null, 3, 11, 12, null, null, 5,
 └────────────────────────────────────┘
 ```
 
-Note that the `arrayReverseFilter` is a [higher-order function](../../sql-reference/functions/index.md#higher-order-functions). You must pass a lambda function to it as the first argument, and it can’t be omitted.
+Note that the `arrayReverseFill` is a [higher-order function](../../sql-reference/functions/index.md#higher-order-functions). You must pass a lambda function to it as the first argument, and it can’t be omitted.
 
 ## arraySplit(func, arr1, …) {#array-split}
 
@@ -1290,7 +1293,7 @@ Note that the `arrayFirstIndex` is a [higher-order function](../../sql-reference
 
 ## arrayMin {#array-min}
 
-Returns the minimum of elements in the source array. 
+Returns the minimum of elements in the source array.
 
 If the `func` function is specified, returns the mininum of elements converted by this function.
 
@@ -1309,9 +1312,9 @@ arrayMin([func,] arr)
 
 **Returned value**
 
--   The minimum of function values (or the array minimum). 
+-   The minimum of function values (or the array minimum).
 
-Type: if `func` is specified, matches `func` return value type, else matches the array elements type. 
+Type: if `func` is specified, matches `func` return value type, else matches the array elements type.
 
 **Examples**
 
@@ -1345,7 +1348,7 @@ Result:
 
 ## arrayMax {#array-max}
 
-Returns the maximum of elements in the source array. 
+Returns the maximum of elements in the source array.
 
 If the `func` function is specified, returns the maximum of elements converted by this function.
 
@@ -1364,9 +1367,9 @@ arrayMax([func,] arr)
 
 **Returned value**
 
--   The maximum of function values (or the array maximum). 
+-   The maximum of function values (or the array maximum).
 
-Type: if `func` is specified, matches `func` return value type, else matches the array elements type. 
+Type: if `func` is specified, matches `func` return value type, else matches the array elements type.
 
 **Examples**
 
@@ -1400,7 +1403,7 @@ Result:
 
 ## arraySum {#array-sum}
 
-Returns the sum of elements in the source array. 
+Returns the sum of elements in the source array.
 
 If the `func` function is specified, returns the sum of elements converted by this function.
 
@@ -1415,7 +1418,7 @@ arraySum([func,] arr)
 **Arguments**
 
 -   `func` — Function. [Expression](../../sql-reference/data-types/special-data-types/expression.md).
--   `arr` — Array. [Array](../../sql-reference/data-types/array.md).   
+-   `arr` — Array. [Array](../../sql-reference/data-types/array.md).
 
 **Returned value**
 
@@ -1455,7 +1458,7 @@ Result:
 
 ## arrayAvg {#array-avg}
 
-Returns the average of elements in the source array. 
+Returns the average of elements in the source array.
 
 If the `func` function is specified, returns the average of elements converted by this function.
 
@@ -1470,7 +1473,7 @@ arrayAvg([func,] arr)
 **Arguments**
 
 -   `func` — Function. [Expression](../../sql-reference/data-types/special-data-types/expression.md).
--   `arr` — Array. [Array](../../sql-reference/data-types/array.md).   
+-   `arr` — Array. [Array](../../sql-reference/data-types/array.md).
 
 **Returned value**
 
@@ -1541,4 +1544,3 @@ SELECT arrayCumSumNonNegative([1, 1, -4, 1]) AS res
 ```
 Note that the `arraySumNonNegative` is a [higher-order function](../../sql-reference/functions/index.md#higher-order-functions). You can pass a lambda function to it as the first argument.
 
-[Original article](https://clickhouse.tech/docs/en/query_language/functions/array_functions/) <!--hide-->
diff --git a/docs/en/sql-reference/functions/array-join.md b/docs/en/sql-reference/functions/array-join.md
index f1f9a545366..f35e0d10117 100644
--- a/docs/en/sql-reference/functions/array-join.md
+++ b/docs/en/sql-reference/functions/array-join.md
@@ -32,4 +32,3 @@ SELECT arrayJoin([1, 2, 3] AS src) AS dst, 'Hello', src
 └─────┴───────────┴─────────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/query_language/functions/array_join/) <!--hide-->
diff --git a/docs/en/sql-reference/functions/bit-functions.md b/docs/en/sql-reference/functions/bit-functions.md
index a3d0c82d8ab..e07f28c0f24 100644
--- a/docs/en/sql-reference/functions/bit-functions.md
+++ b/docs/en/sql-reference/functions/bit-functions.md
@@ -37,8 +37,8 @@ SELECT bitTest(number, index)
 
 **Arguments**
 
--   `number` – integer number.
--   `index` – position of bit.
+-   `number` – Integer number.
+-   `index` – Position of bit.
 
 **Returned values**
 
@@ -53,7 +53,7 @@ For example, the number 43 in base-2 (binary) numeral system is 101011.
 Query:
 
 ``` sql
-SELECT bitTest(43, 1)
+SELECT bitTest(43, 1);
 ```
 
 Result:
@@ -69,7 +69,7 @@ Another example:
 Query:
 
 ``` sql
-SELECT bitTest(43, 2)
+SELECT bitTest(43, 2);
 ```
 
 Result:
@@ -102,8 +102,8 @@ SELECT bitTestAll(number, index1, index2, index3, index4, ...)
 
 **Arguments**
 
--   `number` – integer number.
--   `index1`, `index2`, `index3`, `index4` – positions of bit. For example, for set of positions (`index1`, `index2`, `index3`, `index4`) is true if and only if all of its positions are true (`index1` ⋀ `index2`, ⋀ `index3` ⋀ `index4`).
+-   `number` – Integer number.
+-   `index1`, `index2`, `index3`, `index4` – Positions of bit. For example, for set of positions (`index1`, `index2`, `index3`, `index4`) is true if and only if all of its positions are true (`index1` ⋀ `index2`, ⋀ `index3` ⋀ `index4`).
 
 **Returned values**
 
@@ -118,7 +118,7 @@ For example, the number 43 in base-2 (binary) numeral system is 101011.
 Query:
 
 ``` sql
-SELECT bitTestAll(43, 0, 1, 3, 5)
+SELECT bitTestAll(43, 0, 1, 3, 5);
 ```
 
 Result:
@@ -134,7 +134,7 @@ Another example:
 Query:
 
 ``` sql
-SELECT bitTestAll(43, 0, 1, 3, 5, 2)
+SELECT bitTestAll(43, 0, 1, 3, 5, 2);
 ```
 
 Result:
@@ -167,8 +167,8 @@ SELECT bitTestAny(number, index1, index2, index3, index4, ...)
 
 **Arguments**
 
--   `number` – integer number.
--   `index1`, `index2`, `index3`, `index4` – positions of bit.
+-   `number` – Integer number.
+-   `index1`, `index2`, `index3`, `index4` – Positions of bit.
 
 **Returned values**
 
@@ -183,7 +183,7 @@ For example, the number 43 in base-2 (binary) numeral system is 101011.
 Query:
 
 ``` sql
-SELECT bitTestAny(43, 0, 2)
+SELECT bitTestAny(43, 0, 2);
 ```
 
 Result:
@@ -199,7 +199,7 @@ Another example:
 Query:
 
 ``` sql
-SELECT bitTestAny(43, 4, 2)
+SELECT bitTestAny(43, 4, 2);
 ```
 
 Result:
@@ -239,7 +239,7 @@ Take for example the number 333. Its binary representation: 0000000101001101.
 Query:
 
 ``` sql
-SELECT bitCount(333)
+SELECT bitCount(333);
 ```
 
 Result:
@@ -250,4 +250,53 @@ Result:
 └───────────────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/query_language/functions/bit_functions/) <!--hide-->
+## bitHammingDistance {#bithammingdistance}
+
+Returns the [Hamming Distance](https://en.wikipedia.org/wiki/Hamming_distance) between the bit representations of two integer values. Can be used with [SimHash](../../sql-reference/functions/hash-functions.md#ngramsimhash) functions for detection of semi-duplicate strings. The smaller is the distance, the more likely those strings are the same.
+
+**Syntax**
+
+``` sql
+bitHammingDistance(int1, int2)
+```
+
+**Arguments**
+
+-   `int1` — First integer value. [Int64](../../sql-reference/data-types/int-uint.md).
+-   `int2` — Second integer value. [Int64](../../sql-reference/data-types/int-uint.md).
+
+**Returned value**
+
+-   The Hamming distance. 
+
+Type: [UInt8](../../sql-reference/data-types/int-uint.md).
+
+**Examples**
+
+Query:
+
+``` sql
+SELECT bitHammingDistance(111, 121);
+```
+
+Result:
+
+``` text
+┌─bitHammingDistance(111, 121)─┐
+│                            3 │
+└──────────────────────────────┘
+```
+
+With [SimHash](../../sql-reference/functions/hash-functions.md#ngramsimhash):
+
+``` sql
+SELECT bitHammingDistance(ngramSimHash('cat ate rat'), ngramSimHash('rat ate cat'));
+```
+
+Result:
+
+``` text
+┌─bitHammingDistance(ngramSimHash('cat ate rat'), ngramSimHash('rat ate cat'))─┐
+│                                                                            5 │
+└──────────────────────────────────────────────────────────────────────────────┘
+```
diff --git a/docs/en/sql-reference/functions/bitmap-functions.md b/docs/en/sql-reference/functions/bitmap-functions.md
index bfff70576f2..4875532605e 100644
--- a/docs/en/sql-reference/functions/bitmap-functions.md
+++ b/docs/en/sql-reference/functions/bitmap-functions.md
@@ -23,17 +23,17 @@ bitmapBuild(array)
 
 **Arguments**
 
--   `array` – unsigned integer array.
+-   `array` – Unsigned integer array.
 
 **Example**
 
 ``` sql
-SELECT bitmapBuild([1, 2, 3, 4, 5]) AS res, toTypeName(res)
+SELECT bitmapBuild([1, 2, 3, 4, 5]) AS res, toTypeName(res);
 ```
 
 ``` text
 ┌─res─┬─toTypeName(bitmapBuild([1, 2, 3, 4, 5]))─────┐
-│ 
    │ AggregateFunction(groupBitmap, UInt8)    │
+│     │ AggregateFunction(groupBitmap, UInt8)        │
 └─────┴──────────────────────────────────────────────┘
 ```
 
@@ -47,12 +47,12 @@ bitmapToArray(bitmap)
 
 **Arguments**
 
--   `bitmap` – bitmap object.
+-   `bitmap` – Bitmap object.
 
 **Example**
 
 ``` sql
-SELECT bitmapToArray(bitmapBuild([1, 2, 3, 4, 5])) AS res
+SELECT bitmapToArray(bitmapBuild([1, 2, 3, 4, 5])) AS res;
 ```
 
 ``` text
@@ -72,13 +72,13 @@ bitmapSubsetInRange(bitmap, range_start, range_end)
 **Arguments**
 
 -   `bitmap` – [Bitmap object](#bitmap_functions-bitmapbuild).
--   `range_start` – range start point. Type: [UInt32](../../sql-reference/data-types/int-uint.md).
--   `range_end` – range end point(excluded). Type: [UInt32](../../sql-reference/data-types/int-uint.md).
+-   `range_start` – Range start point. Type: [UInt32](../../sql-reference/data-types/int-uint.md).
+-   `range_end` – Range end point (excluded). Type: [UInt32](../../sql-reference/data-types/int-uint.md).
 
 **Example**
 
 ``` sql
-SELECT bitmapToArray(bitmapSubsetInRange(bitmapBuild([0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,100,200,500]), toUInt32(30), toUInt32(200))) AS res
+SELECT bitmapToArray(bitmapSubsetInRange(bitmapBuild([0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,100,200,500]), toUInt32(30), toUInt32(200))) AS res;
 ```
 
 ``` text
@@ -114,7 +114,7 @@ Type: `Bitmap object`.
 Query:
 
 ``` sql
-SELECT bitmapToArray(bitmapSubsetLimit(bitmapBuild([0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,100,200,500]), toUInt32(30), toUInt32(200))) AS res
+SELECT bitmapToArray(bitmapSubsetLimit(bitmapBuild([0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,100,200,500]), toUInt32(30), toUInt32(200))) AS res;
 ```
 
 Result:
@@ -148,7 +148,7 @@ Type: `UInt8`.
 **Example**
 
 ``` sql
-SELECT bitmapContains(bitmapBuild([1,5,7,9]), toUInt32(9)) AS res
+SELECT bitmapContains(bitmapBuild([1,5,7,9]), toUInt32(9)) AS res;
 ```
 
 ``` text
@@ -169,7 +169,7 @@ If you are sure that `bitmap2` contains strictly one element, consider using the
 
 **Arguments**
 
--   `bitmap*` – bitmap object.
+-   `bitmap*` – Bitmap object.
 
 **Return values**
 
@@ -179,7 +179,7 @@ If you are sure that `bitmap2` contains strictly one element, consider using the
 **Example**
 
 ``` sql
-SELECT bitmapHasAny(bitmapBuild([1,2,3]),bitmapBuild([3,4,5])) AS res
+SELECT bitmapHasAny(bitmapBuild([1,2,3]),bitmapBuild([3,4,5])) AS res;
 ```
 
 ``` text
@@ -199,12 +199,12 @@ bitmapHasAll(bitmap,bitmap)
 
 **Arguments**
 
--   `bitmap` – bitmap object.
+-   `bitmap` – Bitmap object.
 
 **Example**
 
 ``` sql
-SELECT bitmapHasAll(bitmapBuild([1,2,3]),bitmapBuild([3,4,5])) AS res
+SELECT bitmapHasAll(bitmapBuild([1,2,3]),bitmapBuild([3,4,5])) AS res;
 ```
 
 ``` text
@@ -223,12 +223,12 @@ bitmapCardinality(bitmap)
 
 **Arguments**
 
--   `bitmap` – bitmap object.
+-   `bitmap` – Bitmap object.
 
 **Example**
 
 ``` sql
-SELECT bitmapCardinality(bitmapBuild([1, 2, 3, 4, 5])) AS res
+SELECT bitmapCardinality(bitmapBuild([1, 2, 3, 4, 5])) AS res;
 ```
 
 ``` text
@@ -245,17 +245,19 @@ Retrun the smallest value of type UInt64 in the set, UINT32_MAX if the set is em
 
 **Arguments**
 
--   `bitmap` – bitmap object.
+-   `bitmap` – Bitmap object.
 
 **Example**
 
 ``` sql
-SELECT bitmapMin(bitmapBuild([1, 2, 3, 4, 5])) AS res
+SELECT bitmapMin(bitmapBuild([1, 2, 3, 4, 5])) AS res;
 ```
 
-    ┌─res─┐
-    │   1 │
-    └─────┘
+``` text
+ ┌─res─┐
+ │   1 │
+ └─────┘
+```
 
 ## bitmapMax {#bitmapmax}
 
@@ -265,17 +267,19 @@ Retrun the greatest value of type UInt64 in the set, 0 if the set is empty.
 
 **Arguments**
 
--   `bitmap` – bitmap object.
+-   `bitmap` – Bitmap object.
 
 **Example**
 
 ``` sql
-SELECT bitmapMax(bitmapBuild([1, 2, 3, 4, 5])) AS res
+SELECT bitmapMax(bitmapBuild([1, 2, 3, 4, 5])) AS res;
 ```
 
-    ┌─res─┐
-    │   5 │
-    └─────┘
+``` text
+ ┌─res─┐
+ │   5 │
+ └─────┘
+```
 
 ## bitmapTransform {#bitmaptransform}
 
@@ -285,19 +289,21 @@ Transform an array of values in a bitmap to another array of values, the result
 
 **Arguments**
 
--   `bitmap` – bitmap object.
+-   `bitmap` – Bitmap object.
 -   `from_array` – UInt32 array. For idx in range \[0, from_array.size()), if bitmap contains from_array\[idx\], then replace it with to_array\[idx\]. Note that the result depends on array ordering if there are common elements between from_array and to_array.
 -   `to_array` – UInt32 array, its size shall be the same to from_array.
 
 **Example**
 
 ``` sql
-SELECT bitmapToArray(bitmapTransform(bitmapBuild([1, 2, 3, 4, 5, 6, 7, 8, 9, 10]), cast([5,999,2] as Array(UInt32)), cast([2,888,20] as Array(UInt32)))) AS res
+SELECT bitmapToArray(bitmapTransform(bitmapBuild([1, 2, 3, 4, 5, 6, 7, 8, 9, 10]), cast([5,999,2] as Array(UInt32)), cast([2,888,20] as Array(UInt32)))) AS res;
 ```
 
-    ┌─res───────────────────┐
-    │ [1,3,4,6,7,8,9,10,20] │
-    └───────────────────────┘
+``` text
+ ┌─res───────────────────┐
+ │ [1,3,4,6,7,8,9,10,20] │
+ └───────────────────────┘
+```
 
 ## bitmapAnd {#bitmapand}
 
@@ -309,12 +315,12 @@ bitmapAnd(bitmap,bitmap)
 
 **Arguments**
 
--   `bitmap` – bitmap object.
+-   `bitmap` – Bitmap object.
 
 **Example**
 
 ``` sql
-SELECT bitmapToArray(bitmapAnd(bitmapBuild([1,2,3]),bitmapBuild([3,4,5]))) AS res
+SELECT bitmapToArray(bitmapAnd(bitmapBuild([1,2,3]),bitmapBuild([3,4,5]))) AS res;
 ```
 
 ``` text
@@ -333,12 +339,12 @@ bitmapOr(bitmap,bitmap)
 
 **Arguments**
 
--   `bitmap` – bitmap object.
+-   `bitmap` – Bitmap object.
 
 **Example**
 
 ``` sql
-SELECT bitmapToArray(bitmapOr(bitmapBuild([1,2,3]),bitmapBuild([3,4,5]))) AS res
+SELECT bitmapToArray(bitmapOr(bitmapBuild([1,2,3]),bitmapBuild([3,4,5]))) AS res;
 ```
 
 ``` text
@@ -357,12 +363,12 @@ bitmapXor(bitmap,bitmap)
 
 **Arguments**
 
--   `bitmap` – bitmap object.
+-   `bitmap` – Bitmap object.
 
 **Example**
 
 ``` sql
-SELECT bitmapToArray(bitmapXor(bitmapBuild([1,2,3]),bitmapBuild([3,4,5]))) AS res
+SELECT bitmapToArray(bitmapXor(bitmapBuild([1,2,3]),bitmapBuild([3,4,5]))) AS res;
 ```
 
 ``` text
@@ -381,12 +387,12 @@ bitmapAndnot(bitmap,bitmap)
 
 **Arguments**
 
--   `bitmap` – bitmap object.
+-   `bitmap` – Bitmap object.
 
 **Example**
 
 ``` sql
-SELECT bitmapToArray(bitmapAndnot(bitmapBuild([1,2,3]),bitmapBuild([3,4,5]))) AS res
+SELECT bitmapToArray(bitmapAndnot(bitmapBuild([1,2,3]),bitmapBuild([3,4,5]))) AS res;
 ```
 
 ``` text
@@ -405,7 +411,7 @@ bitmapAndCardinality(bitmap,bitmap)
 
 **Arguments**
 
--   `bitmap` – bitmap object.
+-   `bitmap` – Bitmap object.
 
 **Example**
 
@@ -429,7 +435,7 @@ bitmapOrCardinality(bitmap,bitmap)
 
 **Arguments**
 
--   `bitmap` – bitmap object.
+-   `bitmap` – Bitmap object.
 
 **Example**
 
@@ -453,7 +459,7 @@ bitmapXorCardinality(bitmap,bitmap)
 
 **Arguments**
 
--   `bitmap` – bitmap object.
+-   `bitmap` – Bitmap object.
 
 **Example**
 
@@ -477,7 +483,7 @@ bitmapAndnotCardinality(bitmap,bitmap)
 
 **Arguments**
 
--   `bitmap` – bitmap object.
+-   `bitmap` – Bitmap object.
 
 **Example**
 
@@ -491,4 +497,3 @@ SELECT bitmapAndnotCardinality(bitmapBuild([1,2,3]),bitmapBuild([3,4,5])) AS res
 └─────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/query_language/functions/bitmap_functions/) <!--hide-->
diff --git a/docs/en/sql-reference/functions/comparison-functions.md b/docs/en/sql-reference/functions/comparison-functions.md
index 0b6d8b6e36e..edaf0a01c73 100644
--- a/docs/en/sql-reference/functions/comparison-functions.md
+++ b/docs/en/sql-reference/functions/comparison-functions.md
@@ -32,4 +32,3 @@ Strings are compared by bytes. A shorter string is smaller than all strings that
 
 ## greaterOrEquals, \>= operator {#function-greaterorequals}
 
-[Original article](https://clickhouse.tech/docs/en/query_language/functions/comparison_functions/) <!--hide-->
diff --git a/docs/en/sql-reference/functions/conditional-functions.md b/docs/en/sql-reference/functions/conditional-functions.md
index 2d57cbb3bd5..a23da82a9c6 100644
--- a/docs/en/sql-reference/functions/conditional-functions.md
+++ b/docs/en/sql-reference/functions/conditional-functions.md
@@ -20,8 +20,8 @@ If the condition `cond` evaluates to a non-zero value, returns the result of the
 **Arguments**
 
 -   `cond` – The condition for evaluation that can be zero or not. The type is UInt8, Nullable(UInt8) or NULL.
--   `then` - The expression to return if condition is met.
--   `else` - The expression to return if condition is not met.
+-   `then` – The expression to return if condition is met.
+-   `else` – The expression to return if condition is not met.
 
 **Returned values**
 
@@ -32,7 +32,7 @@ The function executes `then` and `else` expressions and returns its result, depe
 Query:
 
 ``` sql
-SELECT if(1, plus(2, 2), plus(2, 6))
+SELECT if(1, plus(2, 2), plus(2, 6));
 ```
 
 Result:
@@ -46,7 +46,7 @@ Result:
 Query:
 
 ``` sql
-SELECT if(0, plus(2, 2), plus(2, 6))
+SELECT if(0, plus(2, 2), plus(2, 6));
 ```
 
 Result:
@@ -202,4 +202,3 @@ FROM LEFT_RIGHT
 └──────┴───────┴──────────────────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/query_language/functions/conditional_functions/) <!--hide-->
diff --git a/docs/en/sql-reference/functions/date-time-functions.md b/docs/en/sql-reference/functions/date-time-functions.md
index f26e1bee6c9..b0636b0305e 100644
--- a/docs/en/sql-reference/functions/date-time-functions.md
+++ b/docs/en/sql-reference/functions/date-time-functions.md
@@ -61,40 +61,58 @@ int32samoa: 1546300800
 
 Converts a date or date with time to a UInt16 number containing the year number (AD).
 
+Alias: `YEAR`.
+
 ## toQuarter {#toquarter}
 
 Converts a date or date with time to a UInt8 number containing the quarter number.
 
+Alias: `QUARTER`.
+
 ## toMonth {#tomonth}
 
 Converts a date or date with time to a UInt8 number containing the month number (1-12).
 
+Alias: `MONTH`.
+
 ## toDayOfYear {#todayofyear}
 
 Converts a date or date with time to a UInt16 number containing the number of the day of the year (1-366).
 
+Alias: `DAYOFYEAR`.
+
 ## toDayOfMonth {#todayofmonth}
 
 Converts a date or date with time to a UInt8 number containing the number of the day of the month (1-31).
 
+Aliases: `DAYOFMONTH`, `DAY`.
+
 ## toDayOfWeek {#todayofweek}
 
 Converts a date or date with time to a UInt8 number containing the number of the day of the week (Monday is 1, and Sunday is 7).
 
+Alias: `DAYOFWEEK`.
+
 ## toHour {#tohour}
 
 Converts a date with time to a UInt8 number containing the number of the hour in 24-hour time (0-23).
 This function assumes that if clocks are moved ahead, it is by one hour and occurs at 2 a.m., and if clocks are moved back, it is by one hour and occurs at 3 a.m. (which is not always true – even in Moscow the clocks were twice changed at a different time).
 
+Alias: `HOUR`.
+
 ## toMinute {#tominute}
 
 Converts a date with time to a UInt8 number containing the number of the minute of the hour (0-59).
 
+Alias: `MINUTE`.
+
 ## toSecond {#tosecond}
 
 Converts a date with time to a UInt8 number containing the number of the second in the minute (0-59).
 Leap seconds are not accounted for.
 
+Alias: `SECOND`.
+
 ## toUnixTimestamp {#to-unix-timestamp}
 
 For DateTime argument: converts value to the number with type UInt32 -- Unix Timestamp (https://en.wikipedia.org/wiki/Unix_time).
@@ -129,6 +147,9 @@ Result:
 └────────────────┘
 ```
 
+!!! attention "Attention"
+    The return type `toStartOf*` functions described below is `Date` or `DateTime`. Though these functions can take `DateTime64` as an argument, passing them a `DateTime64` that is out of normal range (years 1970 - 2105) will give incorrect result.
+
 ## toStartOfYear {#tostartofyear}
 
 Rounds down a date or date with time to the first day of the year.
@@ -370,13 +391,13 @@ SELECT toDate('2016-12-27') AS date, toYearWeek(date) AS yearWeek0, toYearWeek(d
 
 Truncates date and time data to the specified part of date.
 
-**Syntax** 
+**Syntax**
 
 ``` sql
 date_trunc(unit, value[, timezone])
 ```
 
-Alias: `dateTrunc`. 
+Alias: `dateTrunc`.
 
 **Arguments**
 
@@ -431,41 +452,55 @@ Result:
 └─────────────────────┴────────────────────────────────────────────┘
 ```
 
-**See also**
+**See Also**
 
 -   [toStartOfInterval](#tostartofintervaltime-or-data-interval-x-unit-time-zone)
 
 ## date\_add {#date_add}
 
-Adds specified date/time interval to the provided date.
+Adds the time interval or date interval to the provided date or date with time.
 
-**Syntax** 
+**Syntax**
 
 ``` sql
 date_add(unit, value, date)
 ```
 
-Aliases: `dateAdd`, `DATE_ADD`. 
+Aliases: `dateAdd`, `DATE_ADD`.
 
 **Arguments**
 
 -   `unit` — The type of interval to add. [String](../../sql-reference/data-types/string.md).
+    Possible values:
 
-        Supported values: second, minute, hour, day, week, month, quarter, year.
--   `value` - Value in specified unit - [Int](../../sql-reference/data-types/int-uint.md)    
--   `date` — [Date](../../sql-reference/data-types/date.md) or [DateTime](../../sql-reference/data-types/datetime.md).
+    - `second`
+    - `minute`
+    - `hour`
+    - `day`
+    - `week`
+    - `month`
+    - `quarter`
+    - `year`
 
+-   `value` — Value of interval to add. [Int](../../sql-reference/data-types/int-uint.md).  
+-   `date` — The date or date with time to which `value` is added. [Date](../../sql-reference/data-types/date.md) or [DateTime](../../sql-reference/data-types/datetime.md).
 
 **Returned value**
 
-Returns Date or DateTime with `value` expressed in `unit` added to `date`. 
+Date or date with time obtained by adding `value`, expressed in `unit`, to `date`.
+
+Type: [Date](../../sql-reference/data-types/date.md) or [DateTime](../../sql-reference/data-types/datetime.md).
 
 **Example**
 
+Query:
+
 ```sql
-select date_add(YEAR, 3, toDate('2018-01-01'));
+SELECT date_add(YEAR, 3, toDate('2018-01-01'));
 ```
 
+Result:
+
 ```text
 ┌─plus(toDate('2018-01-01'), toIntervalYear(3))─┐
 │                                    2021-01-01 │
@@ -474,7 +509,7 @@ select date_add(YEAR, 3, toDate('2018-01-01'));
 
 ## date\_diff {#date_diff}
 
-Returns the difference between two Date or DateTime values.
+Returns the difference between two dates or dates with time values.
 
 **Syntax**
 
@@ -482,25 +517,33 @@ Returns the difference between two Date or DateTime values.
 date_diff('unit', startdate, enddate, [timezone])
 ```
 
-Aliases: `dateDiff`, `DATE_DIFF`. 
+Aliases: `dateDiff`, `DATE_DIFF`.
 
 **Arguments**
 
--   `unit` — The type of interval for result [String](../../sql-reference/data-types/string.md).
+-   `unit` — The type of interval for result. [String](../../sql-reference/data-types/string.md).
+    Possible values:
 
-        Supported values: second, minute, hour, day, week, month, quarter, year.
+    - `second`
+    - `minute`
+    - `hour`
+    - `day`
+    - `week`
+    - `month`
+    - `quarter`
+    - `year`
 
 -   `startdate` — The first time value to subtract (the subtrahend). [Date](../../sql-reference/data-types/date.md) or [DateTime](../../sql-reference/data-types/datetime.md).
 
 -   `enddate` — The second time value to subtract from (the minuend). [Date](../../sql-reference/data-types/date.md) or [DateTime](../../sql-reference/data-types/datetime.md).
 
--   `timezone` — Optional parameter. If specified, it is applied to both `startdate` and `enddate`. If not specified, timezones of `startdate` and `enddate` are used. If they are not the same, the result is unspecified.
+-   `timezone` — [Timezone name](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone) (optional). If specified, it is applied to both `startdate` and `enddate`. If not specified, timezones of `startdate` and `enddate` are used. If they are not the same, the result is unspecified. [String](../../sql-reference/data-types/string.md).
 
 **Returned value**
 
 Difference between `enddate` and `startdate` expressed in `unit`.
 
-Type: `int`.
+Type: [Int](../../sql-reference/data-types/int-uint.md).
 
 **Example**
 
@@ -520,7 +563,7 @@ Result:
 
 ## date\_sub {#date_sub}
 
-Subtracts a time/date interval from the provided date.
+Subtracts the time interval or date interval from the provided date or date with time.
 
 **Syntax**
 
@@ -528,19 +571,30 @@ Subtracts a time/date interval from the provided date.
 date_sub(unit, value, date)
 ```
 
-Aliases: `dateSub`, `DATE_SUB`. 
+Aliases: `dateSub`, `DATE_SUB`.
 
 **Arguments**
 
 -   `unit` — The type of interval to subtract. [String](../../sql-reference/data-types/string.md).
+    Possible values:
 
-        Supported values: second, minute, hour, day, week, month, quarter, year.
--   `value` - Value in specified unit - [Int](../../sql-reference/data-types/int-uint.md)    
--   `date` — [Date](../../sql-reference/data-types/date.md) or [DateTime](../../sql-reference/data-types/datetime.md) to subtract value from.
+    - `second`
+    - `minute`
+    - `hour`
+    - `day`
+    - `week`
+    - `month`
+    - `quarter`
+    - `year`
+
+-   `value` — Value of interval to subtract. [Int](../../sql-reference/data-types/int-uint.md).    
+-   `date` — The date or date with time from which `value` is subtracted. [Date](../../sql-reference/data-types/date.md) or [DateTime](../../sql-reference/data-types/datetime.md).
 
 **Returned value**
 
-Returns Date or DateTime with `value` expressed in `unit` subtracted from `date`. 
+Date or date with time obtained by subtracting `value`, expressed in `unit`, from `date`.
+
+Type: [Date](../../sql-reference/data-types/date.md) or [DateTime](../../sql-reference/data-types/datetime.md).
 
 **Example**
 
@@ -562,32 +616,46 @@ Result:
 
 Adds the specified time value with the provided date or date time value.
 
-**Syntax** 
+**Syntax**
 
 ``` sql
 timestamp_add(date, INTERVAL value unit)
 ```
 
-Aliases: `timeStampAdd`, `TIMESTAMP_ADD`. 
+Aliases: `timeStampAdd`, `TIMESTAMP_ADD`.
 
 **Arguments**
-    
--   `date` — Date or Date with time - [Date](../../sql-reference/data-types/date.md) or [DateTime](../../sql-reference/data-types/datetime.md).
--   `value` - Value in specified unit - [Int](../../sql-reference/data-types/int-uint.md)
--   `unit` — The type of interval to add. [String](../../sql-reference/data-types/string.md).
 
-        Supported values: second, minute, hour, day, week, month, quarter, year.
+-   `date` — Date or date with time. [Date](../../sql-reference/data-types/date.md) or [DateTime](../../sql-reference/data-types/datetime.md).
+-   `value` — Value of interval to add. [Int](../../sql-reference/data-types/int-uint.md).
+-   `unit` — The type of interval to add. [String](../../sql-reference/data-types/string.md).
+    Possible values:
+
+    - `second`
+    - `minute`
+    - `hour`
+    - `day`
+    - `week`
+    - `month`
+    - `quarter`
+    - `year`
 
 **Returned value**
 
-Returns Date or DateTime with the specified `value`  expressed in `unit` added to `date`. 
-    
+Date or date with time with the specified `value` expressed in `unit` added to `date`.
+
+Type: [Date](../../sql-reference/data-types/date.md) or [DateTime](../../sql-reference/data-types/datetime.md).
+
 **Example**
 
+Query:
+
 ```sql
 select timestamp_add(toDate('2018-01-01'), INTERVAL 3 MONTH);
 ```
 
+Result:
+
 ```text
 ┌─plus(toDate('2018-01-01'), toIntervalMonth(3))─┐
 │                                     2018-04-01 │
@@ -596,45 +664,60 @@ select timestamp_add(toDate('2018-01-01'), INTERVAL 3 MONTH);
 
 ## timestamp\_sub {#timestamp_sub}
 
-Returns the difference between two dates in the specified unit.
+Subtracts the time interval from the provided date or date with time.
 
-**Syntax** 
+**Syntax**
 
 ``` sql
 timestamp_sub(unit, value, date)
 ```
 
-Aliases: `timeStampSub`, `TIMESTAMP_SUB`. 
+Aliases: `timeStampSub`, `TIMESTAMP_SUB`.
 
 **Arguments**
 
--   `unit` — The type of interval to add. [String](../../sql-reference/data-types/string.md).
+-   `unit` — The type of interval to subtract. [String](../../sql-reference/data-types/string.md).
+    Possible values:
 
-        Supported values: second, minute, hour, day, week, month, quarter, year.
--   `value` - Value in specified unit - [Int](../../sql-reference/data-types/int-uint.md).   
--   `date`- [Date](../../sql-reference/data-types/date.md) or [DateTime](../../sql-reference/data-types/datetime.md).
+    - `second`
+    - `minute`
+    - `hour`
+    - `day`
+    - `week`
+    - `month`
+    - `quarter`
+    - `year`
+
+-   `value` — Value of interval to subtract. [Int](../../sql-reference/data-types/int-uint.md).   
+-   `date` — Date or date with time. [Date](../../sql-reference/data-types/date.md) or [DateTime](../../sql-reference/data-types/datetime.md).
 
 **Returned value**
 
-Difference between `date` and the specified `value` expressed in `unit`.
+Date or date with time obtained by subtracting `value`, expressed in `unit`, from `date`.
+
+Type: [Date](../../sql-reference/data-types/date.md) or [DateTime](../../sql-reference/data-types/datetime.md).
 
 **Example**
 
+Query:
+
 ```sql
 select timestamp_sub(MONTH, 5, toDateTime('2018-12-18 01:02:03'));
 ```
 
+Result:
+
 ```text
 ┌─minus(toDateTime('2018-12-18 01:02:03'), toIntervalMonth(5))─┐
 │                                          2018-07-18 01:02:03 │
 └──────────────────────────────────────────────────────────────┘
 ```
-    
+
 ## now {#now}
 
-Returns the current date and time. 
+Returns the current date and time.
 
-**Syntax** 
+**Syntax**
 
 ``` sql
 now([timezone])
@@ -753,7 +836,7 @@ This is necessary for searching for pageviews in the corresponding session.
 
 ## formatDateTime {#formatdatetime}
 
-Function formats a Time according given Format string. N.B.: Format is a constant expression, e.g. you can not have multiple formats for single result column.
+Formats a Time according to the given Format string. Format is a constant expression, so you cannot have multiple formats for a single result column.
 
 **Syntax**
 
@@ -773,7 +856,7 @@ Using replacement fields, you can define a pattern for the resulting string. “
 | %C       | year divided by 100 and truncated to integer (00-99)    | 20         |
 | %d       | day of the month, zero-padded (01-31)                   | 02         |
 | %D       | Short MM/DD/YY date, equivalent to %m/%d/%y             | 01/02/18   |
-| %e       | day of the month, space-padded ( 1-31)                  |  2         |
+| %e       | day of the month, space-padded ( 1-31)                  | &nbsp; 2   |
 | %F       | short YYYY-MM-DD date, equivalent to %Y-%m-%d           | 2018-01-02 |
 | %G       | four-digit year format for ISO week number, calculated from the week-based year [defined by the ISO 8601](https://en.wikipedia.org/wiki/ISO_8601#Week_dates) standard, normally useful only with %V  | 2018         |
 | %g       | two-digit year format, aligned to ISO 8601, abbreviated from four-digit notation                                | 18       |
@@ -812,31 +895,32 @@ Result:
 └────────────────────────────────────────────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/query_language/functions/date_time_functions/) <!--hide-->
-
 ## FROM\_UNIXTIME {#fromunixfime}
 
-When there is only single argument of integer type, it act in the same way as `toDateTime` and return [DateTime](../../sql-reference/data-types/datetime.md).
-type.
+Function converts Unix timestamp to a calendar date and a time of a day. When there is only a single argument of [Integer](../../sql-reference/data-types/int-uint.md) type, it acts in the same way as [toDateTime](../../sql-reference/functions/type-conversion-functions.md#todatetime) and return [DateTime](../../sql-reference/data-types/datetime.md) type.
 
-For example:
+**Example:**
+
+Query:
 
 ```sql
-SELECT FROM_UNIXTIME(423543535)
+SELECT FROM_UNIXTIME(423543535);
 ```
 
+Result:
+
 ```text
 ┌─FROM_UNIXTIME(423543535)─┐
 │      1983-06-04 10:58:55 │
 └──────────────────────────┘
 ```
 
-When there are two arguments, first is integer or DateTime, second is constant format string, it act in the same way as `formatDateTime` and return `String` type.
+When there are two arguments: first is an [Integer](../../sql-reference/data-types/int-uint.md) or [DateTime](../../sql-reference/data-types/datetime.md), second is a constant format string — it acts in the same way as [formatDateTime](#formatdatetime) and return [String](../../sql-reference/data-types/string.md#string) type.
 
 For example:
 
 ```sql
-SELECT FROM_UNIXTIME(1234334543, '%Y-%m-%d %R:%S') AS DateTime
+SELECT FROM_UNIXTIME(1234334543, '%Y-%m-%d %R:%S') AS DateTime;
 ```
 
 ```text
diff --git a/docs/en/sql-reference/functions/encoding-functions.md b/docs/en/sql-reference/functions/encoding-functions.md
index 31e84c08b39..6b72d3c2269 100644
--- a/docs/en/sql-reference/functions/encoding-functions.md
+++ b/docs/en/sql-reference/functions/encoding-functions.md
@@ -30,7 +30,7 @@ Type: `String`.
 Query:
 
 ``` sql
-SELECT char(104.1, 101, 108.9, 108.9, 111) AS hello
+SELECT char(104.1, 101, 108.9, 108.9, 111) AS hello;
 ```
 
 Result:
@@ -75,6 +75,8 @@ Result:
 
 Returns a string containing the argument’s hexadecimal representation.
 
+Alias: `HEX`.
+
 **Syntax**
 
 ``` sql
@@ -170,4 +172,3 @@ Accepts an integer. Returns a string containing the list of powers of two that t
 
 Accepts an integer. Returns an array of UInt64 numbers containing the list of powers of two that total the source number when summed. Numbers in the array are in ascending order.
 
-[Original article](https://clickhouse.tech/docs/en/query_language/functions/encoding_functions/) <!--hide-->
diff --git a/docs/en/sql-reference/functions/encryption-functions.md b/docs/en/sql-reference/functions/encryption-functions.md
index 0dd7469b25e..df27685dcb3 100644
--- a/docs/en/sql-reference/functions/encryption-functions.md
+++ b/docs/en/sql-reference/functions/encryption-functions.md
@@ -55,7 +55,7 @@ CREATE TABLE encryption_test
     `comment` String,
     `secret` String
 )
-ENGINE = Memory
+ENGINE = Memory;
 ```
 
 Insert some data (please avoid storing the keys/ivs in the database as this undermines the whole concept of encryption), also storing 'hints' is unsafe too and used only for illustrative purposes:
@@ -110,7 +110,7 @@ Result:
 
 Compatible with mysql encryption and resulting ciphertext can be decrypted with [AES_DECRYPT](https://dev.mysql.com/doc/refman/8.0/en/encryption-functions.html#function_aes-decrypt) function.
 
-Will produce same ciphertext as `encrypt` on equal inputs. But when `key` or `iv` are longer than they should normally be, `aes_encrypt_mysql` will stick to what MySQL's `aes_encrypt` does: 'fold' `key` and ignore excess bits of `IV`.
+Will produce the same ciphertext as `encrypt` on equal inputs. But when `key` or `iv` are longer than they should normally be, `aes_encrypt_mysql` will stick to what MySQL's `aes_encrypt` does: 'fold' `key` and ignore excess bits of `iv`.
 
 Supported encryption modes:
 
@@ -132,13 +132,12 @@ aes_encrypt_mysql('mode', 'plaintext', 'key' [, iv])
 -   `mode` — Encryption mode. [String](../../sql-reference/data-types/string.md#string).
 -   `plaintext` — Text that needs to be encrypted. [String](../../sql-reference/data-types/string.md#string).
 -   `key` — Encryption key. If key is longer than required by mode, MySQL-specific key folding is performed. [String](../../sql-reference/data-types/string.md#string).
--   `iv` — Initialization vector. Optinal, only first 16 bytes are taken into account [String](../../sql-reference/data-types/string.md#string).
+-   `iv` — Initialization vector. Optional, only first 16 bytes are taken into account [String](../../sql-reference/data-types/string.md#string).
 
 **Returned value**
 
 - Ciphertext binary string. [String](../../sql-reference/data-types/string.md#string).
 
-
 **Examples**
 
 Given equal input `encrypt` and `aes_encrypt_mysql` produce the same ciphertext:
@@ -157,7 +156,6 @@ Result:
 └───────────────────┘
 ```
 
-
 But `encrypt` fails when `key` or `iv` is longer than expected:
 
 Query:
@@ -252,7 +250,7 @@ decrypt('mode', 'ciphertext', 'key' [, iv, aad])
 
 **Examples**
 
-Re-using table from [encrypt](./encryption-functions.md#encrypt).
+Re-using table from [encrypt](#encrypt).
 
 Query:
 
@@ -284,6 +282,7 @@ SELECT comment, decrypt('aes-256-cfb128', secret, '12345678910121314151617181920
 ```
 
 Result:
+
 ``` text
 ┌─comment─────────────────────────────┬─plaintext─┐
 │ aes-256-cfb128 no IV                │ Secret    │
@@ -294,7 +293,7 @@ Result:
 └─────────────────────────────────────┴───────────┘
 ```
 
-Notice how only portion of the data was properly decrypted, and the rest is gibberish since either `mode`, `key`, or `iv` were different upon encryption.
+Notice how only a portion of the data was properly decrypted, and the rest is gibberish since either `mode`, `key`, or `iv` were different upon encryption.
 
 ## aes_decrypt_mysql {#aes_decrypt_mysql}
 
@@ -331,6 +330,7 @@ aes_decrypt_mysql('mode', 'ciphertext', 'key' [, iv])
 **Examples**
 
 Let's decrypt data we've previously encrypted with MySQL:
+
 ``` sql
 mysql> SET  block_encryption_mode='aes-256-cfb128';
 Query OK, 0 rows affected (0.00 sec)
@@ -345,11 +345,13 @@ mysql> SELECT aes_encrypt('Secret', '123456789101213141516171819202122', 'iviviv
 ```
 
 Query:
+
 ``` sql
 SELECT aes_decrypt_mysql('aes-256-cfb128', unhex('24E9E4966469'), '123456789101213141516171819202122', 'iviviviviviviviv123456') AS plaintext
 ```
 
 Result:
+
 ``` text
 ┌─plaintext─┐
 │ Secret    │
diff --git a/docs/en/sql-reference/functions/ext-dict-functions.md b/docs/en/sql-reference/functions/ext-dict-functions.md
index 834fcdf8282..5fc146f603f 100644
--- a/docs/en/sql-reference/functions/ext-dict-functions.md
+++ b/docs/en/sql-reference/functions/ext-dict-functions.md
@@ -203,4 +203,3 @@ dictGet[Type]OrDefault('dict_name', 'attr_name', id_expr, default_value_expr)
 
 ClickHouse throws an exception if it cannot parse the value of the attribute or the value doesn’t match the attribute data type.
 
-[Original article](https://clickhouse.tech/docs/en/query_language/functions/ext_dict_functions/) <!--hide-->
diff --git a/docs/en/sql-reference/functions/files.md b/docs/en/sql-reference/functions/files.md
new file mode 100644
index 00000000000..9cbf8932465
--- /dev/null
+++ b/docs/en/sql-reference/functions/files.md
@@ -0,0 +1,35 @@
+---
+toc_priority: 43
+toc_title: Files
+---
+
+# Functions for Working with Files {#functions-for-working-with-files}
+
+## file {#file}
+
+Reads file as a String. The file content is not parsed, so any information is read as one string and placed into the specified column.
+
+**Syntax**
+
+``` sql
+file(path)
+```
+
+**Arguments**
+
+-   `path` — The relative path to the file from [user_files_path](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-user_files_path). Path to file support following wildcards: `*`, `?`, `{abc,def}` and `{N..M}` where `N`, `M` — numbers, `'abc', 'def'` — strings.
+
+**Example**
+
+Inserting data from files a.txt and b.txt into a table as strings:
+
+Query:
+
+``` sql
+INSERT INTO table SELECT file('a.txt'), file('b.txt');
+```
+
+**See Also**
+
+-   [user_files_path](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-user_files_path)
+-   [file](../table-functions/file.md)
diff --git a/docs/en/sql-reference/functions/functions-for-nulls.md b/docs/en/sql-reference/functions/functions-for-nulls.md
index df75e96c8fb..5cc95fe298a 100644
--- a/docs/en/sql-reference/functions/functions-for-nulls.md
+++ b/docs/en/sql-reference/functions/functions-for-nulls.md
@@ -13,6 +13,8 @@ Checks whether the argument is [NULL](../../sql-reference/syntax.md#null-literal
 isNull(x)
 ```
 
+Alias: `ISNULL`.
+
 **Arguments**
 
 -   `x` — A value with a non-compound data type.
@@ -36,7 +38,7 @@ Input table
 Query
 
 ``` sql
-SELECT x FROM t_null WHERE isNull(y)
+SELECT x FROM t_null WHERE isNull(y);
 ```
 
 ``` text
@@ -76,7 +78,7 @@ Input table
 Query
 
 ``` sql
-SELECT x FROM t_null WHERE isNotNull(y)
+SELECT x FROM t_null WHERE isNotNull(y);
 ```
 
 ``` text
@@ -118,7 +120,7 @@ The `mail` and `phone` fields are of type String, but the `icq` field is `UInt32
 Get the first available contact method for the customer from the contact list:
 
 ``` sql
-SELECT coalesce(mail, phone, CAST(icq,'Nullable(String)')) FROM aBook
+SELECT coalesce(mail, phone, CAST(icq,'Nullable(String)')) FROM aBook;
 ```
 
 ``` text
@@ -149,7 +151,7 @@ ifNull(x,alt)
 **Example**
 
 ``` sql
-SELECT ifNull('a', 'b')
+SELECT ifNull('a', 'b');
 ```
 
 ``` text
@@ -159,7 +161,7 @@ SELECT ifNull('a', 'b')
 ```
 
 ``` sql
-SELECT ifNull(NULL, 'b')
+SELECT ifNull(NULL, 'b');
 ```
 
 ``` text
@@ -188,7 +190,7 @@ nullIf(x, y)
 **Example**
 
 ``` sql
-SELECT nullIf(1, 1)
+SELECT nullIf(1, 1);
 ```
 
 ``` text
@@ -198,7 +200,7 @@ SELECT nullIf(1, 1)
 ```
 
 ``` sql
-SELECT nullIf(1, 2)
+SELECT nullIf(1, 2);
 ```
 
 ``` text
@@ -229,7 +231,7 @@ assumeNotNull(x)
 Consider the `t_null` table.
 
 ``` sql
-SHOW CREATE TABLE t_null
+SHOW CREATE TABLE t_null;
 ```
 
 ``` text
@@ -248,7 +250,7 @@ SHOW CREATE TABLE t_null
 Apply the `assumeNotNull` function to the `y` column.
 
 ``` sql
-SELECT assumeNotNull(y) FROM t_null
+SELECT assumeNotNull(y) FROM t_null;
 ```
 
 ``` text
@@ -259,7 +261,7 @@ SELECT assumeNotNull(y) FROM t_null
 ```
 
 ``` sql
-SELECT toTypeName(assumeNotNull(y)) FROM t_null
+SELECT toTypeName(assumeNotNull(y)) FROM t_null;
 ```
 
 ``` text
@@ -288,7 +290,7 @@ toNullable(x)
 **Example**
 
 ``` sql
-SELECT toTypeName(10)
+SELECT toTypeName(10);
 ```
 
 ``` text
@@ -298,7 +300,7 @@ SELECT toTypeName(10)
 ```
 
 ``` sql
-SELECT toTypeName(toNullable(10))
+SELECT toTypeName(toNullable(10));
 ```
 
 ``` text
@@ -307,4 +309,3 @@ SELECT toTypeName(toNullable(10))
 └────────────────────────────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/query_language/functions/functions_for_nulls/) <!--hide-->
diff --git a/docs/en/sql-reference/functions/geo/geohash.md b/docs/en/sql-reference/functions/geo/geohash.md
index c27eab0b421..cfe35746809 100644
--- a/docs/en/sql-reference/functions/geo/geohash.md
+++ b/docs/en/sql-reference/functions/geo/geohash.md
@@ -29,7 +29,7 @@ geohashEncode(longitude, latitude, [precision])
 **Example**
 
 ``` sql
-SELECT geohashEncode(-5.60302734375, 42.593994140625, 0) AS res
+SELECT geohashEncode(-5.60302734375, 42.593994140625, 0) AS res;
 ```
 
 ``` text
@@ -53,7 +53,7 @@ Decodes any [geohash](#geohash)-encoded string into longitude and latitude.
 **Example**
 
 ``` sql
-SELECT geohashDecode('ezs42') AS res
+SELECT geohashDecode('ezs42') AS res;
 ```
 
 ``` text
@@ -98,8 +98,9 @@ Type: [Array](../../../sql-reference/data-types/array.md)([String](../../../sql-
 Query:
 
 ``` sql
-SELECT geohashesInBox(24.48, 40.56, 24.785, 40.81, 4) AS thasos
+SELECT geohashesInBox(24.48, 40.56, 24.785, 40.81, 4) AS thasos;
 ```
+
 Result:
 
 ``` text
diff --git a/docs/en/sql-reference/functions/geo/h3.md b/docs/en/sql-reference/functions/geo/h3.md
index 9dda947b3a7..20dc7b29902 100644
--- a/docs/en/sql-reference/functions/geo/h3.md
+++ b/docs/en/sql-reference/functions/geo/h3.md
@@ -40,8 +40,9 @@ Type: [UInt8](../../../sql-reference/data-types/int-uint.md).
 Query:
 
 ``` sql
-SELECT h3IsValid(630814730351855103) as h3IsValid
+SELECT h3IsValid(630814730351855103) as h3IsValid;
 ```
+
 Result:
 
 ``` text
@@ -76,8 +77,9 @@ Type: [UInt8](../../../sql-reference/data-types/int-uint.md).
 Query:
 
 ``` sql
-SELECT h3GetResolution(639821929606596015) as resolution
+SELECT h3GetResolution(639821929606596015) as resolution;
 ```
+
 Result:
 
 ``` text
@@ -109,8 +111,9 @@ h3EdgeAngle(resolution)
 Query:
 
 ``` sql
-SELECT h3EdgeAngle(10) as edgeAngle
+SELECT h3EdgeAngle(10) as edgeAngle;
 ```
+
 Result:
 
 ``` text
@@ -142,8 +145,9 @@ h3EdgeLengthM(resolution)
 Query: 
 
 ``` sql
-SELECT h3EdgeLengthM(15) as edgeLengthM
+SELECT h3EdgeLengthM(15) as edgeLengthM;
 ```
+
 Result:
 
 ``` text
@@ -180,7 +184,7 @@ Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
 Query:
 
 ``` sql
-SELECT geoToH3(37.79506683, 55.71290588, 15) as h3Index
+SELECT geoToH3(37.79506683, 55.71290588, 15) as h3Index;
 ```
 
 Result:
@@ -217,8 +221,9 @@ Type: [Array](../../../sql-reference/data-types/array.md)([UInt64](../../../sql-
 Query:
 
 ``` sql
-SELECT arrayJoin(h3kRing(644325529233966508, 1)) AS h3index
+SELECT arrayJoin(h3kRing(644325529233966508, 1)) AS h3index;
 ```
+
 Result:
 
 ``` text
diff --git a/docs/en/sql-reference/functions/hash-functions.md b/docs/en/sql-reference/functions/hash-functions.md
index 6bf1bebabaa..0ea4cfd6fbe 100644
--- a/docs/en/sql-reference/functions/hash-functions.md
+++ b/docs/en/sql-reference/functions/hash-functions.md
@@ -7,9 +7,11 @@ toc_title: Hash
 
 Hash functions can be used for the deterministic pseudo-random shuffling of elements.
 
+Simhash is a hash function, which returns close hash values for close (similar) arguments.
+
 ## halfMD5 {#hash-functions-halfmd5}
 
-[Interprets](../../sql-reference/functions/type-conversion-functions.md#type_conversion_function-reinterpretAsString) all the input parameters as strings and calculates the [MD5](https://en.wikipedia.org/wiki/MD5) hash value for each of them. Then combines hashes, takes the first 8 bytes of the hash of the resulting string, and interprets them as `UInt64` in big-endian byte order.
+[Interprets](../../sql-reference/functions/type-conversion-functions.md#type_conversion_functions-reinterpretAsString) all the input parameters as strings and calculates the [MD5](https://en.wikipedia.org/wiki/MD5) hash value for each of them. Then combines hashes, takes the first 8 bytes of the hash of the resulting string, and interprets them as `UInt64` in big-endian byte order.
 
 ``` sql
 halfMD5(par1, ...)
@@ -29,7 +31,7 @@ A [UInt64](../../sql-reference/data-types/int-uint.md) data type hash value.
 **Example**
 
 ``` sql
-SELECT halfMD5(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')) AS halfMD5hash, toTypeName(halfMD5hash) AS type
+SELECT halfMD5(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')) AS halfMD5hash, toTypeName(halfMD5hash) AS type;
 ```
 
 ``` text
@@ -54,7 +56,7 @@ sipHash64(par1,...)
 
 This is a cryptographic hash function. It works at least three times faster than the [MD5](#hash_functions-md5) function.
 
-Function [interprets](../../sql-reference/functions/type-conversion-functions.md#type_conversion_function-reinterpretAsString) all the input parameters as strings and calculates the hash value for each of them. Then combines hashes by the following algorithm:
+Function [interprets](../../sql-reference/functions/type-conversion-functions.md#type_conversion_functions-reinterpretAsString) all the input parameters as strings and calculates the hash value for each of them. Then combines hashes by the following algorithm:
 
 1.  After hashing all the input parameters, the function gets the array of hashes.
 2.  Function takes the first and the second elements and calculates a hash for the array of them.
@@ -72,7 +74,7 @@ A [UInt64](../../sql-reference/data-types/int-uint.md) data type hash value.
 **Example**
 
 ``` sql
-SELECT sipHash64(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')) AS SipHash, toTypeName(SipHash) AS type
+SELECT sipHash64(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')) AS SipHash, toTypeName(SipHash) AS type;
 ```
 
 ``` text
@@ -110,7 +112,7 @@ A [UInt64](../../sql-reference/data-types/int-uint.md) data type hash value.
 Call example:
 
 ``` sql
-SELECT cityHash64(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')) AS CityHash, toTypeName(CityHash) AS type
+SELECT cityHash64(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')) AS CityHash, toTypeName(CityHash) AS type;
 ```
 
 ``` text
@@ -177,7 +179,7 @@ A [UInt64](../../sql-reference/data-types/int-uint.md) data type hash value.
 **Example**
 
 ``` sql
-SELECT farmHash64(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')) AS FarmHash, toTypeName(FarmHash) AS type
+SELECT farmHash64(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')) AS FarmHash, toTypeName(FarmHash) AS type;
 ```
 
 ``` text
@@ -193,7 +195,7 @@ Calculates [JavaHash](http://hg.openjdk.java.net/jdk8u/jdk8u/jdk/file/478a4add97
 **Syntax**
 
 ``` sql
-SELECT javaHash('');
+SELECT javaHash('')
 ```
 
 **Returned value**
@@ -241,7 +243,7 @@ Correct query with UTF-16LE encoded string.
 Query:
 
 ``` sql
-SELECT javaHashUTF16LE(convertCharset('test', 'utf-8', 'utf-16le'))
+SELECT javaHashUTF16LE(convertCharset('test', 'utf-8', 'utf-16le'));
 ```
 
 Result:
@@ -257,7 +259,7 @@ Result:
 Calculates `HiveHash` from a string.
 
 ``` sql
-SELECT hiveHash('');
+SELECT hiveHash('')
 ```
 
 This is just [JavaHash](#hash_functions-javahash) with zeroed out sign bit. This function is used in [Apache Hive](https://en.wikipedia.org/wiki/Apache_Hive) for versions before 3.0. This hash function is neither fast nor having a good quality. The only reason to use it is when this algorithm is already used in another system and you have to calculate exactly the same result.
@@ -303,7 +305,7 @@ A [UInt64](../../sql-reference/data-types/int-uint.md) data type hash value.
 **Example**
 
 ``` sql
-SELECT metroHash64(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')) AS MetroHash, toTypeName(MetroHash) AS type
+SELECT metroHash64(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')) AS MetroHash, toTypeName(MetroHash) AS type;
 ```
 
 ``` text
@@ -339,7 +341,7 @@ Both functions take a variable number of input parameters. Arguments can be any
 **Example**
 
 ``` sql
-SELECT murmurHash2_64(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')) AS MurmurHash2, toTypeName(MurmurHash2) AS type
+SELECT murmurHash2_64(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')) AS MurmurHash2, toTypeName(MurmurHash2) AS type;
 ```
 
 ``` text
@@ -355,7 +357,7 @@ Calculates a 64-bit [MurmurHash2](https://github.com/aappleby/smhasher) hash val
 **Syntax**
 
 ``` sql
-gccMurmurHash(par1, ...);
+gccMurmurHash(par1, ...)
 ```
 
 **Arguments**
@@ -407,7 +409,7 @@ Both functions take a variable number of input parameters. Arguments can be any
 **Example**
 
 ``` sql
-SELECT murmurHash3_32(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')) AS MurmurHash3, toTypeName(MurmurHash3) AS type
+SELECT murmurHash3_32(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')) AS MurmurHash3, toTypeName(MurmurHash3) AS type;
 ```
 
 ``` text
@@ -435,13 +437,13 @@ A [FixedString(16)](../../sql-reference/data-types/fixedstring.md) data type has
 **Example**
 
 ``` sql
-SELECT murmurHash3_128('example_string') AS MurmurHash3, toTypeName(MurmurHash3) AS type
+SELECT hex(murmurHash3_128('example_string')) AS MurmurHash3, toTypeName(MurmurHash3) AS type;
 ```
 
 ``` text
-┌─MurmurHash3──────┬─type────────────┐
-│ 6�1�4"S5KT�~~q │ FixedString(16) │
-└──────────────────┴─────────────────┘
+┌─MurmurHash3──────────────────────┬─type───┐
+│ 368A1A311CB7342253354B548E7E7E71 │ String │
+└──────────────────────────────────┴────────┘
 ```
 
 ## xxHash32, xxHash64 {#hash-functions-xxhash32}
@@ -449,11 +451,11 @@ SELECT murmurHash3_128('example_string') AS MurmurHash3, toTypeName(MurmurHash3)
 Calculates `xxHash` from a string. It is proposed in two flavors, 32 and 64 bits.
 
 ``` sql
-SELECT xxHash32('');
+SELECT xxHash32('')
 
 OR
 
-SELECT xxHash64('');
+SELECT xxHash64('')
 ```
 
 **Returned value**
@@ -482,4 +484,938 @@ Result:
 
 -   [xxHash](http://cyan4973.github.io/xxHash/).
 
-[Original article](https://clickhouse.tech/docs/en/query_language/functions/hash_functions/) <!--hide-->
+## ngramSimHash {#ngramsimhash}
+
+Splits a ASCII string into n-grams of `ngramsize` symbols and returns the n-gram `simhash`. Is case sensitive.
+
+Can be used for detection of semi-duplicate strings with [bitHammingDistance](../../sql-reference/functions/bit-functions.md#bithammingdistance). The smaller is the [Hamming Distance](https://en.wikipedia.org/wiki/Hamming_distance) of the calculated `simhashes` of two strings, the more likely these strings are the same.
+
+**Syntax**
+
+``` sql
+ngramSimHash(string[, ngramsize])
+```
+
+**Arguments**
+
+-   `string` — String. [String](../../sql-reference/data-types/string.md).
+-   `ngramsize` — The size of an n-gram. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](../../sql-reference/data-types/int-uint.md).
+
+**Returned value**
+
+-   Hash value.
+
+Type: [UInt64](../../sql-reference/data-types/int-uint.md).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT ngramSimHash('ClickHouse') AS Hash;
+```
+
+Result:
+
+``` text
+┌───────Hash─┐
+│ 1627567969 │
+└────────────┘
+```
+
+## ngramSimHashCaseInsensitive {#ngramsimhashcaseinsensitive}
+
+Splits a ASCII string into n-grams of `ngramsize` symbols and returns the n-gram `simhash`. Is case insensitive.
+
+Can be used for detection of semi-duplicate strings with [bitHammingDistance](../../sql-reference/functions/bit-functions.md#bithammingdistance). The smaller is the [Hamming Distance](https://en.wikipedia.org/wiki/Hamming_distance) of the calculated `simhashes` of two strings, the more likely these strings are the same.
+
+**Syntax**
+
+``` sql
+ngramSimHashCaseInsensitive(string[, ngramsize])
+```
+
+**Arguments**
+
+-   `string` — String. [String](../../sql-reference/data-types/string.md).
+-   `ngramsize` — The size of an n-gram. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](../../sql-reference/data-types/int-uint.md).
+
+**Returned value**
+
+-   Hash value.
+
+Type: [UInt64](../../sql-reference/data-types/int-uint.md).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT ngramSimHashCaseInsensitive('ClickHouse') AS Hash;
+```
+
+Result:
+
+``` text
+┌──────Hash─┐
+│ 562180645 │
+└───────────┘
+```
+
+## ngramSimHashUTF8 {#ngramsimhashutf8}
+
+Splits a UTF-8 string into n-grams of `ngramsize` symbols and returns the n-gram `simhash`. Is case sensitive.
+
+Can be used for detection of semi-duplicate strings with [bitHammingDistance](../../sql-reference/functions/bit-functions.md#bithammingdistance). The smaller is the [Hamming Distance](https://en.wikipedia.org/wiki/Hamming_distance) of the calculated `simhashes` of two strings, the more likely these strings are the same.
+
+**Syntax**
+
+``` sql
+ngramSimHashUTF8(string[, ngramsize])
+```
+
+**Arguments**
+
+-   `string` — String. [String](../../sql-reference/data-types/string.md).
+-   `ngramsize` — The size of an n-gram. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](../../sql-reference/data-types/int-uint.md).
+
+**Returned value**
+
+-   Hash value.
+
+Type: [UInt64](../../sql-reference/data-types/int-uint.md).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT ngramSimHashUTF8('ClickHouse') AS Hash;
+```
+
+Result:
+
+``` text
+┌───────Hash─┐
+│ 1628157797 │
+└────────────┘
+```
+
+## ngramSimHashCaseInsensitiveUTF8 {#ngramsimhashcaseinsensitiveutf8}
+
+Splits a UTF-8 string into n-grams of `ngramsize` symbols and returns the n-gram `simhash`. Is case insensitive.
+
+Can be used for detection of semi-duplicate strings with [bitHammingDistance](../../sql-reference/functions/bit-functions.md#bithammingdistance). The smaller is the [Hamming Distance](https://en.wikipedia.org/wiki/Hamming_distance) of the calculated `simhashes` of two strings, the more likely these strings are the same.
+
+**Syntax**
+
+``` sql
+ngramSimHashCaseInsensitiveUTF8(string[, ngramsize])
+```
+
+**Arguments**
+
+-   `string` — String. [String](../../sql-reference/data-types/string.md).
+-   `ngramsize` — The size of an n-gram. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](../../sql-reference/data-types/int-uint.md).
+
+**Returned value**
+
+-   Hash value.
+
+Type: [UInt64](../../sql-reference/data-types/int-uint.md).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT ngramSimHashCaseInsensitiveUTF8('ClickHouse') AS Hash;
+```
+
+Result:
+
+``` text
+┌───────Hash─┐
+│ 1636742693 │
+└────────────┘
+```
+
+## wordShingleSimHash {#wordshinglesimhash}
+
+Splits a ASCII string into parts (shingles) of `shinglesize` words and returns the word shingle `simhash`. Is case sensitive.
+
+Can be used for detection of semi-duplicate strings with [bitHammingDistance](../../sql-reference/functions/bit-functions.md#bithammingdistance). The smaller is the [Hamming Distance](https://en.wikipedia.org/wiki/Hamming_distance) of the calculated `simhashes` of two strings, the more likely these strings are the same.
+
+**Syntax**
+
+``` sql
+wordShingleSimHash(string[, shinglesize])
+```
+
+**Arguments**
+
+-   `string` — String. [String](../../sql-reference/data-types/string.md).
+-   `shinglesize` — The size of a word shingle. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](../../sql-reference/data-types/int-uint.md).
+
+**Returned value**
+
+-   Hash value.
+
+Type: [UInt64](../../sql-reference/data-types/int-uint.md).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT wordShingleSimHash('ClickHouse® is a column-oriented database management system (DBMS) for online analytical processing of queries (OLAP).') AS Hash;
+```
+
+Result:
+
+``` text
+┌───────Hash─┐
+│ 2328277067 │
+└────────────┘
+```
+
+## wordShingleSimHashCaseInsensitive {#wordshinglesimhashcaseinsensitive}
+
+Splits a ASCII string into parts (shingles) of `shinglesize` words and returns the word shingle `simhash`. Is case insensitive.
+
+Can be used for detection of semi-duplicate strings with [bitHammingDistance](../../sql-reference/functions/bit-functions.md#bithammingdistance). The smaller is the [Hamming Distance](https://en.wikipedia.org/wiki/Hamming_distance) of the calculated `simhashes` of two strings, the more likely these strings are the same.
+
+**Syntax**
+
+``` sql
+wordShingleSimHashCaseInsensitive(string[, shinglesize])
+```
+
+**Arguments**
+
+-   `string` — String. [String](../../sql-reference/data-types/string.md).
+-   `shinglesize` — The size of a word shingle. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](../../sql-reference/data-types/int-uint.md).
+
+**Returned value**
+
+-   Hash value.
+
+Type: [UInt64](../../sql-reference/data-types/int-uint.md).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT wordShingleSimHashCaseInsensitive('ClickHouse® is a column-oriented database management system (DBMS) for online analytical processing of queries (OLAP).') AS Hash;
+```
+
+Result:
+
+``` text
+┌───────Hash─┐
+│ 2194812424 │
+└────────────┘
+```
+
+## wordShingleSimHashUTF8 {#wordshinglesimhashutf8}
+
+Splits a UTF-8 string into parts (shingles) of `shinglesize` words and returns the word shingle `simhash`. Is case sensitive.
+
+Can be used for detection of semi-duplicate strings with [bitHammingDistance](../../sql-reference/functions/bit-functions.md#bithammingdistance). The smaller is the [Hamming Distance](https://en.wikipedia.org/wiki/Hamming_distance) of the calculated `simhashes` of two strings, the more likely these strings are the same.
+
+**Syntax**
+
+``` sql
+wordShingleSimHashUTF8(string[, shinglesize])
+```
+
+**Arguments**
+
+-   `string` — String. [String](../../sql-reference/data-types/string.md).
+-   `shinglesize` — The size of a word shingle. Optinal. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](../../sql-reference/data-types/int-uint.md).
+
+**Returned value**
+
+-   Hash value.
+
+Type: [UInt64](../../sql-reference/data-types/int-uint.md).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT wordShingleSimHashUTF8('ClickHouse® is a column-oriented database management system (DBMS) for online analytical processing of queries (OLAP).') AS Hash;
+```
+
+Result:
+
+``` text
+┌───────Hash─┐
+│ 2328277067 │
+└────────────┘
+```
+
+## wordShingleSimHashCaseInsensitiveUTF8 {#wordshinglesimhashcaseinsensitiveutf8}
+
+Splits a UTF-8 string into parts (shingles) of `shinglesize` words and returns the word shingle `simhash`. Is case insensitive.
+
+Can be used for detection of semi-duplicate strings with [bitHammingDistance](../../sql-reference/functions/bit-functions.md#bithammingdistance). The smaller is the [Hamming Distance](https://en.wikipedia.org/wiki/Hamming_distance) of the calculated `simhashes` of two strings, the more likely these strings are the same.
+
+**Syntax**
+
+``` sql
+wordShingleSimHashCaseInsensitiveUTF8(string[, shinglesize])
+```
+
+**Arguments**
+
+-   `string` — String. [String](../../sql-reference/data-types/string.md).
+-   `shinglesize` — The size of a word shingle. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](../../sql-reference/data-types/int-uint.md).
+
+**Returned value**
+
+-   Hash value.
+
+Type: [UInt64](../../sql-reference/data-types/int-uint.md).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT wordShingleSimHashCaseInsensitiveUTF8('ClickHouse® is a column-oriented database management system (DBMS) for online analytical processing of queries (OLAP).') AS Hash;
+```
+
+Result:
+
+``` text
+┌───────Hash─┐
+│ 2194812424 │
+└────────────┘
+```
+
+## ngramMinHash {#ngramminhash}
+
+Splits a ASCII string into n-grams of `ngramsize` symbols and calculates hash values for each n-gram. Uses `hashnum` minimum hashes to calculate the minimum hash and `hashnum` maximum hashes to calculate the maximum hash. Returns a tuple with these hashes. Is case sensitive.
+
+Can be used for detection of semi-duplicate strings with [tupleHammingDistance](../../sql-reference/functions/tuple-functions.md#tuplehammingdistance). For two strings: if one of the returned hashes is the same for both strings, we think that those strings are the same.
+
+**Syntax**
+
+``` sql
+ngramMinHash(string[, ngramsize, hashnum])
+```
+
+**Arguments**
+
+-   `string` — String. [String](../../sql-reference/data-types/string.md).
+-   `ngramsize` — The size of an n-gram. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](../../sql-reference/data-types/int-uint.md).
+-   `hashnum` — The number of minimum and maximum hashes used to calculate the result. Optional. Possible values: any number from `1` to `25`. Default value: `6`. [UInt8](../../sql-reference/data-types/int-uint.md).
+
+**Returned value**
+
+-   Tuple with two hashes — the minimum and the maximum.
+
+Type: [Tuple](../../sql-reference/data-types/tuple.md)([UInt64](../../sql-reference/data-types/int-uint.md), [UInt64](../../sql-reference/data-types/int-uint.md)).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT ngramMinHash('ClickHouse') AS Tuple;
+```
+
+Result:
+
+``` text
+┌─Tuple──────────────────────────────────────┐
+│ (18333312859352735453,9054248444481805918) │
+└────────────────────────────────────────────┘
+```
+
+## ngramMinHashCaseInsensitive {#ngramminhashcaseinsensitive}
+
+Splits a ASCII string into n-grams of `ngramsize` symbols and calculates hash values for each n-gram. Uses `hashnum` minimum hashes to calculate the minimum hash and `hashnum` maximum hashes to calculate the maximum hash. Returns a tuple with these hashes. Is case insensitive.
+
+Can be used for detection of semi-duplicate strings with [tupleHammingDistance](../../sql-reference/functions/tuple-functions.md#tuplehammingdistance). For two strings: if one of the returned hashes is the same for both strings, we think that those strings are the same.
+
+**Syntax**
+
+``` sql
+ngramMinHashCaseInsensitive(string[, ngramsize, hashnum])
+```
+
+**Arguments**
+
+-   `string` — String. [String](../../sql-reference/data-types/string.md).
+-   `ngramsize` — The size of an n-gram. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](../../sql-reference/data-types/int-uint.md).
+-   `hashnum` — The number of minimum and maximum hashes used to calculate the result. Optional. Possible values: any number from `1` to `25`. Default value: `6`. [UInt8](../../sql-reference/data-types/int-uint.md).
+
+**Returned value**
+
+-   Tuple with two hashes — the minimum and the maximum.
+
+Type: [Tuple](../../sql-reference/data-types/tuple.md)([UInt64](../../sql-reference/data-types/int-uint.md), [UInt64](../../sql-reference/data-types/int-uint.md)).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT ngramMinHashCaseInsensitive('ClickHouse') AS Tuple;
+```
+
+Result:
+
+``` text
+┌─Tuple──────────────────────────────────────┐
+│ (2106263556442004574,13203602793651726206) │
+└────────────────────────────────────────────┘
+```
+
+## ngramMinHashUTF8 {#ngramminhashutf8}
+
+Splits a UTF-8 string into n-grams of `ngramsize` symbols and calculates hash values for each n-gram. Uses `hashnum` minimum hashes to calculate the minimum hash and `hashnum` maximum hashes to calculate the maximum hash. Returns a tuple with these hashes. Is case sensitive.
+
+Can be used for detection of semi-duplicate strings with [tupleHammingDistance](../../sql-reference/functions/tuple-functions.md#tuplehammingdistance). For two strings: if one of the returned hashes is the same for both strings, we think that those strings are the same.
+
+**Syntax**
+
+``` sql
+ngramMinHashUTF8(string[, ngramsize, hashnum])
+```
+
+**Arguments**
+
+-   `string` — String. [String](../../sql-reference/data-types/string.md).
+-   `ngramsize` — The size of an n-gram. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](../../sql-reference/data-types/int-uint.md).
+-   `hashnum` — The number of minimum and maximum hashes used to calculate the result. Optional. Possible values: any number from `1` to `25`. Default value: `6`. [UInt8](../../sql-reference/data-types/int-uint.md).
+
+**Returned value**
+
+-   Tuple with two hashes — the minimum and the maximum.
+
+Type: [Tuple](../../sql-reference/data-types/tuple.md)([UInt64](../../sql-reference/data-types/int-uint.md), [UInt64](../../sql-reference/data-types/int-uint.md)).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT ngramMinHashUTF8('ClickHouse') AS Tuple;
+```
+
+Result:
+
+``` text
+┌─Tuple──────────────────────────────────────┐
+│ (18333312859352735453,6742163577938632877) │
+└────────────────────────────────────────────┘
+```
+
+## ngramMinHashCaseInsensitiveUTF8 {#ngramminhashcaseinsensitiveutf8}
+
+Splits a UTF-8 string into n-grams of `ngramsize` symbols and calculates hash values for each n-gram. Uses `hashnum` minimum hashes to calculate the minimum hash and `hashnum` maximum hashes to calculate the maximum hash. Returns a tuple with these hashes. Is case insensitive.
+
+Can be used for detection of semi-duplicate strings with [tupleHammingDistance](../../sql-reference/functions/tuple-functions.md#tuplehammingdistance). For two strings: if one of the returned hashes is the same for both strings, we think that those strings are the same.
+
+**Syntax**
+
+``` sql
+ngramMinHashCaseInsensitiveUTF8(string [, ngramsize, hashnum])
+```
+
+**Arguments**
+
+-   `string` — String. [String](../../sql-reference/data-types/string.md).
+-   `ngramsize` — The size of an n-gram. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](../../sql-reference/data-types/int-uint.md).
+-   `hashnum` — The number of minimum and maximum hashes used to calculate the result. Optional. Possible values: any number from `1` to `25`. Default value: `6`. [UInt8](../../sql-reference/data-types/int-uint.md).
+
+**Returned value**
+
+-   Tuple with two hashes — the minimum and the maximum.
+
+Type: [Tuple](../../sql-reference/data-types/tuple.md)([UInt64](../../sql-reference/data-types/int-uint.md), [UInt64](../../sql-reference/data-types/int-uint.md)).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT ngramMinHashCaseInsensitiveUTF8('ClickHouse') AS Tuple;
+```
+
+Result:
+
+``` text
+┌─Tuple───────────────────────────────────────┐
+│ (12493625717655877135,13203602793651726206) │
+└─────────────────────────────────────────────┘
+```
+
+## ngramMinHashArg {#ngramminhasharg}
+
+Splits a ASCII string into n-grams of `ngramsize` symbols and returns the n-grams with minimum and maximum hashes, calculated by the [ngramMinHash](#ngramminhash) function with the same input. Is case sensitive.
+
+**Syntax**
+
+``` sql
+ngramMinHashArg(string[, ngramsize, hashnum])
+```
+
+**Arguments**
+
+-   `string` — String. [String](../../sql-reference/data-types/string.md).
+-   `ngramsize` — The size of an n-gram. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](../../sql-reference/data-types/int-uint.md).
+-   `hashnum` — The number of minimum and maximum hashes used to calculate the result. Optional. Possible values: any number from `1` to `25`. Default value: `6`. [UInt8](../../sql-reference/data-types/int-uint.md).
+
+**Returned value**
+
+-   Tuple with two tuples with `hashnum` n-grams each.
+
+Type: [Tuple](../../sql-reference/data-types/tuple.md)([Tuple](../../sql-reference/data-types/tuple.md)([String](../../sql-reference/data-types/string.md)), [Tuple](../../sql-reference/data-types/tuple.md)([String](../../sql-reference/data-types/string.md))).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT ngramMinHashArg('ClickHouse') AS Tuple;
+```
+
+Result:
+
+``` text
+┌─Tuple─────────────────────────────────────────────────────────────────────────┐
+│ (('ous','ick','lic','Hou','kHo','use'),('Hou','lic','ick','ous','ckH','Cli')) │
+└───────────────────────────────────────────────────────────────────────────────┘
+```
+
+## ngramMinHashArgCaseInsensitive {#ngramminhashargcaseinsensitive}
+
+Splits a ASCII string into n-grams of `ngramsize` symbols and returns the n-grams with minimum and maximum hashes, calculated by the [ngramMinHashCaseInsensitive](#ngramminhashcaseinsensitive) function with the same input. Is case insensitive.
+
+**Syntax**
+
+``` sql
+ngramMinHashArgCaseInsensitive(string[, ngramsize, hashnum])
+```
+
+**Arguments**
+
+-   `string` — String. [String](../../sql-reference/data-types/string.md).
+-   `ngramsize` — The size of an n-gram. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](../../sql-reference/data-types/int-uint.md).
+-   `hashnum` — The number of minimum and maximum hashes used to calculate the result. Optional. Possible values: any number from `1` to `25`. Default value: `6`. [UInt8](../../sql-reference/data-types/int-uint.md).
+
+**Returned value**
+
+-   Tuple with two tuples with `hashnum` n-grams each.
+
+Type: [Tuple](../../sql-reference/data-types/tuple.md)([Tuple](../../sql-reference/data-types/tuple.md)([String](../../sql-reference/data-types/string.md)), [Tuple](../../sql-reference/data-types/tuple.md)([String](../../sql-reference/data-types/string.md))).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT ngramMinHashArgCaseInsensitive('ClickHouse') AS Tuple;
+```
+
+Result:
+
+``` text
+┌─Tuple─────────────────────────────────────────────────────────────────────────┐
+│ (('ous','ick','lic','kHo','use','Cli'),('kHo','lic','ick','ous','ckH','Hou')) │
+└───────────────────────────────────────────────────────────────────────────────┘
+```
+
+## ngramMinHashArgUTF8 {#ngramminhashargutf8}
+
+Splits a UTF-8 string into n-grams of `ngramsize` symbols and returns the n-grams with minimum and maximum hashes, calculated by the [ngramMinHashUTF8](#ngramminhashutf8) function with the same input. Is case sensitive.
+
+**Syntax**
+
+``` sql
+ngramMinHashArgUTF8(string[, ngramsize, hashnum])
+```
+
+**Arguments**
+
+-   `string` — String. [String](../../sql-reference/data-types/string.md).
+-   `ngramsize` — The size of an n-gram. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](../../sql-reference/data-types/int-uint.md).
+-   `hashnum` — The number of minimum and maximum hashes used to calculate the result. Optional. Possible values: any number from `1` to `25`. Default value: `6`. [UInt8](../../sql-reference/data-types/int-uint.md).
+
+**Returned value**
+
+-   Tuple with two tuples with `hashnum` n-grams each.
+
+Type: [Tuple](../../sql-reference/data-types/tuple.md)([Tuple](../../sql-reference/data-types/tuple.md)([String](../../sql-reference/data-types/string.md)), [Tuple](../../sql-reference/data-types/tuple.md)([String](../../sql-reference/data-types/string.md))).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT ngramMinHashArgUTF8('ClickHouse') AS Tuple;
+```
+
+Result:
+
+``` text
+┌─Tuple─────────────────────────────────────────────────────────────────────────┐
+│ (('ous','ick','lic','Hou','kHo','use'),('kHo','Hou','lic','ick','ous','ckH')) │
+└───────────────────────────────────────────────────────────────────────────────┘
+```
+
+## ngramMinHashArgCaseInsensitiveUTF8 {#ngramminhashargcaseinsensitiveutf8}
+
+Splits a UTF-8 string into n-grams of `ngramsize` symbols and returns the n-grams with minimum and maximum hashes, calculated by the [ngramMinHashCaseInsensitiveUTF8](#ngramminhashcaseinsensitiveutf8) function with the same input. Is case insensitive.
+
+**Syntax**
+
+``` sql
+ngramMinHashArgCaseInsensitiveUTF8(string[, ngramsize, hashnum])
+```
+
+**Arguments**
+
+-   `string` — String. [String](../../sql-reference/data-types/string.md).
+-   `ngramsize` — The size of an n-gram. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](../../sql-reference/data-types/int-uint.md).
+-   `hashnum` — The number of minimum and maximum hashes used to calculate the result. Optional. Possible values: any number from `1` to `25`. Default value: `6`. [UInt8](../../sql-reference/data-types/int-uint.md).
+
+**Returned value**
+
+-   Tuple with two tuples with `hashnum` n-grams each.
+
+Type: [Tuple](../../sql-reference/data-types/tuple.md)([Tuple](../../sql-reference/data-types/tuple.md)([String](../../sql-reference/data-types/string.md)), [Tuple](../../sql-reference/data-types/tuple.md)([String](../../sql-reference/data-types/string.md))).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT ngramMinHashArgCaseInsensitiveUTF8('ClickHouse') AS Tuple;
+```
+
+Result:
+
+``` text
+┌─Tuple─────────────────────────────────────────────────────────────────────────┐
+│ (('ckH','ous','ick','lic','kHo','use'),('kHo','lic','ick','ous','ckH','Hou')) │
+└───────────────────────────────────────────────────────────────────────────────┘
+```
+
+## wordShingleMinHash {#wordshingleminhash}
+
+Splits a ASCII string into parts (shingles) of `shinglesize` words and calculates hash values for each word shingle. Uses `hashnum` minimum hashes to calculate the minimum hash and `hashnum` maximum hashes to calculate the maximum hash. Returns a tuple with these hashes. Is case sensitive.
+
+Can be used for detection of semi-duplicate strings with [tupleHammingDistance](../../sql-reference/functions/tuple-functions.md#tuplehammingdistance). For two strings: if one of the returned hashes is the same for both strings, we think that those strings are the same.
+
+**Syntax**
+
+``` sql
+wordShingleMinHash(string[, shinglesize, hashnum])
+```
+
+**Arguments**
+
+-   `string` — String. [String](../../sql-reference/data-types/string.md).
+-   `shinglesize` — The size of a word shingle. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](../../sql-reference/data-types/int-uint.md).
+-   `hashnum` — The number of minimum and maximum hashes used to calculate the result. Optional. Possible values: any number from `1` to `25`. Default value: `6`. [UInt8](../../sql-reference/data-types/int-uint.md).
+
+**Returned value**
+
+-   Tuple with two hashes — the minimum and the maximum.
+
+Type: [Tuple](../../sql-reference/data-types/tuple.md)([UInt64](../../sql-reference/data-types/int-uint.md), [UInt64](../../sql-reference/data-types/int-uint.md)).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT wordShingleMinHash('ClickHouse® is a column-oriented database management system (DBMS) for online analytical processing of queries (OLAP).') AS Tuple;
+```
+
+Result:
+
+``` text
+┌─Tuple──────────────────────────────────────┐
+│ (16452112859864147620,5844417301642981317) │
+└────────────────────────────────────────────┘
+```
+
+## wordShingleMinHashCaseInsensitive {#wordshingleminhashcaseinsensitive}
+
+Splits a ASCII string into parts (shingles) of `shinglesize` words and calculates hash values for each word shingle. Uses `hashnum` minimum hashes to calculate the minimum hash and `hashnum` maximum hashes to calculate the maximum hash. Returns a tuple with these hashes. Is case insensitive.
+
+Can be used for detection of semi-duplicate strings with [tupleHammingDistance](../../sql-reference/functions/tuple-functions.md#tuplehammingdistance). For two strings: if one of the returned hashes is the same for both strings, we think that those strings are the same.
+
+**Syntax**
+
+``` sql
+wordShingleMinHashCaseInsensitive(string[, shinglesize, hashnum])
+```
+
+**Arguments**
+
+-   `string` — String. [String](../../sql-reference/data-types/string.md).
+-   `shinglesize` — The size of a word shingle. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](../../sql-reference/data-types/int-uint.md).
+-   `hashnum` — The number of minimum and maximum hashes used to calculate the result. Optional. Possible values: any number from `1` to `25`. Default value: `6`. [UInt8](../../sql-reference/data-types/int-uint.md).
+
+**Returned value**
+
+-   Tuple with two hashes — the minimum and the maximum.
+
+Type: [Tuple](../../sql-reference/data-types/tuple.md)([UInt64](../../sql-reference/data-types/int-uint.md), [UInt64](../../sql-reference/data-types/int-uint.md)).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT wordShingleMinHashCaseInsensitive('ClickHouse® is a column-oriented database management system (DBMS) for online analytical processing of queries (OLAP).') AS Tuple;
+```
+
+Result:
+
+``` text
+┌─Tuple─────────────────────────────────────┐
+│ (3065874883688416519,1634050779997673240) │
+└───────────────────────────────────────────┘
+```
+
+## wordShingleMinHashUTF8 {#wordshingleminhashutf8}
+
+Splits a UTF-8 string into parts (shingles) of `shinglesize` words and calculates hash values for each word shingle. Uses `hashnum` minimum hashes to calculate the minimum hash and `hashnum` maximum hashes to calculate the maximum hash. Returns a tuple with these hashes. Is case sensitive.
+
+Can be used for detection of semi-duplicate strings with [tupleHammingDistance](../../sql-reference/functions/tuple-functions.md#tuplehammingdistance). For two strings: if one of the returned hashes is the same for both strings, we think that those strings are the same.
+
+**Syntax**
+
+``` sql
+wordShingleMinHashUTF8(string[, shinglesize, hashnum])
+```
+
+**Arguments**
+
+-   `string` — String. [String](../../sql-reference/data-types/string.md).
+-   `shinglesize` — The size of a word shingle. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](../../sql-reference/data-types/int-uint.md).
+-   `hashnum` — The number of minimum and maximum hashes used to calculate the result. Optional. Possible values: any number from `1` to `25`. Default value: `6`. [UInt8](../../sql-reference/data-types/int-uint.md).
+
+**Returned value**
+
+-   Tuple with two hashes — the minimum and the maximum.
+
+Type: [Tuple](../../sql-reference/data-types/tuple.md)([UInt64](../../sql-reference/data-types/int-uint.md), [UInt64](../../sql-reference/data-types/int-uint.md)).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT wordShingleMinHashUTF8('ClickHouse® is a column-oriented database management system (DBMS) for online analytical processing of queries (OLAP).') AS Tuple;
+```
+
+Result:
+
+``` text
+┌─Tuple──────────────────────────────────────┐
+│ (16452112859864147620,5844417301642981317) │
+└────────────────────────────────────────────┘
+```
+
+## wordShingleMinHashCaseInsensitiveUTF8 {#wordshingleminhashcaseinsensitiveutf8}
+
+Splits a UTF-8 string into parts (shingles) of `shinglesize` words and calculates hash values for each word shingle. Uses `hashnum` minimum hashes to calculate the minimum hash and `hashnum` maximum hashes to calculate the maximum hash. Returns a tuple with these hashes. Is case insensitive.
+
+Can be used for detection of semi-duplicate strings with [tupleHammingDistance](../../sql-reference/functions/tuple-functions.md#tuplehammingdistance). For two strings: if one of the returned hashes is the same for both strings, we think that those strings are the same.
+
+**Syntax**
+
+``` sql
+wordShingleMinHashCaseInsensitiveUTF8(string[, shinglesize, hashnum])
+```
+
+**Arguments**
+
+-   `string` — String. [String](../../sql-reference/data-types/string.md).
+-   `shinglesize` — The size of a word shingle. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](../../sql-reference/data-types/int-uint.md).
+-   `hashnum` — The number of minimum and maximum hashes used to calculate the result. Optional. Possible values: any number from `1` to `25`. Default value: `6`. [UInt8](../../sql-reference/data-types/int-uint.md).
+
+**Returned value**
+
+-   Tuple with two hashes — the minimum and the maximum.
+
+Type: [Tuple](../../sql-reference/data-types/tuple.md)([UInt64](../../sql-reference/data-types/int-uint.md), [UInt64](../../sql-reference/data-types/int-uint.md)).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT wordShingleMinHashCaseInsensitiveUTF8('ClickHouse® is a column-oriented database management system (DBMS) for online analytical processing of queries (OLAP).') AS Tuple;
+```
+
+Result:
+
+``` text
+┌─Tuple─────────────────────────────────────┐
+│ (3065874883688416519,1634050779997673240) │
+└───────────────────────────────────────────┘
+```
+
+## wordShingleMinHashArg {#wordshingleminhasharg}
+
+Splits a ASCII string into parts (shingles) of `shinglesize` words each and returns the shingles with minimum and maximum word hashes, calculated by the [wordshingleMinHash](#wordshingleminhash) function with the same input. Is case sensitive.
+
+**Syntax**
+
+``` sql
+wordShingleMinHashArg(string[, shinglesize, hashnum])
+```
+
+**Arguments**
+
+-   `string` — String. [String](../../sql-reference/data-types/string.md).
+-   `shinglesize` — The size of a word shingle. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](../../sql-reference/data-types/int-uint.md).
+-   `hashnum` — The number of minimum and maximum hashes used to calculate the result. Optional. Possible values: any number from `1` to `25`. Default value: `6`. [UInt8](../../sql-reference/data-types/int-uint.md).
+
+**Returned value**
+
+-   Tuple with two tuples with `hashnum` word shingles each.
+
+Type: [Tuple](../../sql-reference/data-types/tuple.md)([Tuple](../../sql-reference/data-types/tuple.md)([String](../../sql-reference/data-types/string.md)), [Tuple](../../sql-reference/data-types/tuple.md)([String](../../sql-reference/data-types/string.md))).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT wordShingleMinHashArg('ClickHouse® is a column-oriented database management system (DBMS) for online analytical processing of queries (OLAP).', 1, 3) AS Tuple;
+```
+
+Result:
+
+``` text
+┌─Tuple─────────────────────────────────────────────────────────────────┐
+│ (('OLAP','database','analytical'),('online','oriented','processing')) │
+└───────────────────────────────────────────────────────────────────────┘
+```
+
+## wordShingleMinHashArgCaseInsensitive {#wordshingleminhashargcaseinsensitive}
+
+Splits a ASCII string into parts (shingles) of `shinglesize` words each and returns the shingles with minimum and maximum word hashes, calculated by the [wordShingleMinHashCaseInsensitive](#wordshingleminhashcaseinsensitive) function with the same input. Is case insensitive.
+
+**Syntax**
+
+``` sql
+wordShingleMinHashArgCaseInsensitive(string[, shinglesize, hashnum])
+```
+
+**Arguments**
+
+-   `string` — String. [String](../../sql-reference/data-types/string.md).
+-   `shinglesize` — The size of a word shingle. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](../../sql-reference/data-types/int-uint.md).
+-   `hashnum` — The number of minimum and maximum hashes used to calculate the result. Optional. Possible values: any number from `1` to `25`. Default value: `6`. [UInt8](../../sql-reference/data-types/int-uint.md).
+
+**Returned value**
+
+-   Tuple with two tuples with `hashnum` word shingles each.
+
+Type: [Tuple](../../sql-reference/data-types/tuple.md)([Tuple](../../sql-reference/data-types/tuple.md)([String](../../sql-reference/data-types/string.md)), [Tuple](../../sql-reference/data-types/tuple.md)([String](../../sql-reference/data-types/string.md))).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT wordShingleMinHashArgCaseInsensitive('ClickHouse® is a column-oriented database management system (DBMS) for online analytical processing of queries (OLAP).', 1, 3) AS Tuple;
+```
+
+Result:
+
+``` text
+┌─Tuple──────────────────────────────────────────────────────────────────┐
+│ (('queries','database','analytical'),('oriented','processing','DBMS')) │
+└────────────────────────────────────────────────────────────────────────┘
+```
+
+## wordShingleMinHashArgUTF8 {#wordshingleminhashargutf8}
+
+Splits a UTF-8 string into parts (shingles) of `shinglesize` words each and returns the shingles with minimum and maximum word hashes, calculated by the [wordShingleMinHashUTF8](#wordshingleminhashutf8) function with the same input. Is case sensitive.
+
+**Syntax**
+
+``` sql
+wordShingleMinHashArgUTF8(string[, shinglesize, hashnum])
+```
+
+**Arguments**
+
+-   `string` — String. [String](../../sql-reference/data-types/string.md).
+-   `shinglesize` — The size of a word shingle. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](../../sql-reference/data-types/int-uint.md).
+-   `hashnum` — The number of minimum and maximum hashes used to calculate the result. Optional. Possible values: any number from `1` to `25`. Default value: `6`. [UInt8](../../sql-reference/data-types/int-uint.md).
+
+**Returned value**
+
+-   Tuple with two tuples with `hashnum` word shingles each.
+
+Type: [Tuple](../../sql-reference/data-types/tuple.md)([Tuple](../../sql-reference/data-types/tuple.md)([String](../../sql-reference/data-types/string.md)), [Tuple](../../sql-reference/data-types/tuple.md)([String](../../sql-reference/data-types/string.md))).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT wordShingleMinHashArgUTF8('ClickHouse® is a column-oriented database management system (DBMS) for online analytical processing of queries (OLAP).', 1, 3) AS Tuple;
+```
+
+Result:
+
+``` text
+┌─Tuple─────────────────────────────────────────────────────────────────┐
+│ (('OLAP','database','analytical'),('online','oriented','processing')) │
+└───────────────────────────────────────────────────────────────────────┘
+```
+
+## wordShingleMinHashArgCaseInsensitiveUTF8 {#wordshingleminhashargcaseinsensitiveutf8}
+
+Splits a UTF-8 string into parts (shingles) of `shinglesize` words each and returns the shingles with minimum and maximum word hashes, calculated by the [wordShingleMinHashCaseInsensitiveUTF8](#wordshingleminhashcaseinsensitiveutf8) function with the same input. Is case insensitive.
+
+**Syntax**
+
+``` sql
+wordShingleMinHashArgCaseInsensitiveUTF8(string[, shinglesize, hashnum])
+```
+
+**Arguments**
+
+-   `string` — String. [String](../../sql-reference/data-types/string.md).
+-   `shinglesize` — The size of a word shingle. Optional. Possible values: any number from `1` to `25`. Default value: `3`. [UInt8](../../sql-reference/data-types/int-uint.md).
+-   `hashnum` — The number of minimum and maximum hashes used to calculate the result. Optional. Possible values: any number from `1` to `25`. Default value: `6`. [UInt8](../../sql-reference/data-types/int-uint.md).
+
+**Returned value**
+
+-   Tuple with two tuples with `hashnum` word shingles each.
+
+Type: [Tuple](../../sql-reference/data-types/tuple.md)([Tuple](../../sql-reference/data-types/tuple.md)([String](../../sql-reference/data-types/string.md)), [Tuple](../../sql-reference/data-types/tuple.md)([String](../../sql-reference/data-types/string.md))).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT wordShingleMinHashArgCaseInsensitiveUTF8('ClickHouse® is a column-oriented database management system (DBMS) for online analytical processing of queries (OLAP).', 1, 3) AS Tuple;
+```
+
+Result:
+
+``` text
+┌─Tuple──────────────────────────────────────────────────────────────────┐
+│ (('queries','database','analytical'),('oriented','processing','DBMS')) │
+└────────────────────────────────────────────────────────────────────────┘
+```
diff --git a/docs/en/sql-reference/functions/in-functions.md b/docs/en/sql-reference/functions/in-functions.md
index dd3c1900fdc..c8936e74954 100644
--- a/docs/en/sql-reference/functions/in-functions.md
+++ b/docs/en/sql-reference/functions/in-functions.md
@@ -9,4 +9,3 @@ toc_title: IN Operator
 
 See the section [IN operators](../../sql-reference/operators/in.md#select-in-operators).
 
-[Original article](https://clickhouse.tech/docs/en/query_language/functions/in_functions/) <!--hide-->
diff --git a/docs/en/sql-reference/functions/index.md b/docs/en/sql-reference/functions/index.md
index 1a0b9d83b5f..32408759b98 100644
--- a/docs/en/sql-reference/functions/index.md
+++ b/docs/en/sql-reference/functions/index.md
@@ -84,4 +84,3 @@ Another example is the `hostName` function, which returns the name of the server
 
 If a function in a query is performed on the requestor server, but you need to perform it on remote servers, you can wrap it in an ‘any’ aggregate function or add it to a key in `GROUP BY`.
 
-[Original article](https://clickhouse.tech/docs/en/query_language/functions/) <!--hide-->
diff --git a/docs/en/sql-reference/functions/introspection.md b/docs/en/sql-reference/functions/introspection.md
index 964265a461b..44685e3cb67 100644
--- a/docs/en/sql-reference/functions/introspection.md
+++ b/docs/en/sql-reference/functions/introspection.md
@@ -53,13 +53,13 @@ Type: [String](../../sql-reference/data-types/string.md).
 Enabling introspection functions:
 
 ``` sql
-SET allow_introspection_functions=1
+SET allow_introspection_functions=1;
 ```
 
 Selecting the first string from the `trace_log` system table:
 
 ``` sql
-SELECT * FROM system.trace_log LIMIT 1 \G
+SELECT * FROM system.trace_log LIMIT 1 \G;
 ```
 
 ``` text
@@ -79,7 +79,7 @@ The `trace` field contains the stack trace at the moment of sampling.
 Getting the source code filename and the line number for a single address:
 
 ``` sql
-SELECT addressToLine(94784076370703) \G
+SELECT addressToLine(94784076370703) \G;
 ```
 
 ``` text
@@ -139,13 +139,13 @@ Type: [String](../../sql-reference/data-types/string.md).
 Enabling introspection functions:
 
 ``` sql
-SET allow_introspection_functions=1
+SET allow_introspection_functions=1;
 ```
 
 Selecting the first string from the `trace_log` system table:
 
 ``` sql
-SELECT * FROM system.trace_log LIMIT 1 \G
+SELECT * FROM system.trace_log LIMIT 1 \G;
 ```
 
 ``` text
@@ -165,7 +165,7 @@ The `trace` field contains the stack trace at the moment of sampling.
 Getting a symbol for a single address:
 
 ``` sql
-SELECT addressToSymbol(94138803686098) \G
+SELECT addressToSymbol(94138803686098) \G;
 ```
 
 ``` text
@@ -236,13 +236,13 @@ Type: [String](../../sql-reference/data-types/string.md).
 Enabling introspection functions:
 
 ``` sql
-SET allow_introspection_functions=1
+SET allow_introspection_functions=1;
 ```
 
 Selecting the first string from the `trace_log` system table:
 
 ``` sql
-SELECT * FROM system.trace_log LIMIT 1 \G
+SELECT * FROM system.trace_log LIMIT 1 \G;
 ```
 
 ``` text
@@ -262,7 +262,7 @@ The `trace` field contains the stack trace at the moment of sampling.
 Getting a function name for a single address:
 
 ``` sql
-SELECT demangle(addressToSymbol(94138803686098)) \G
+SELECT demangle(addressToSymbol(94138803686098)) \G;
 ```
 
 ``` text
@@ -335,6 +335,7 @@ Result:
 │  3878 │
 └───────┘
 ```
+
 ## logTrace {#logtrace}
 
 Emits trace log message to server log for each [Block](https://clickhouse.tech/docs/en/development/architecture/#block).
@@ -369,4 +370,3 @@ Result:
 └──────────────────────────────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/query_language/functions/introspection/) <!--hide-->
diff --git a/docs/en/sql-reference/functions/ip-address-functions.md b/docs/en/sql-reference/functions/ip-address-functions.md
index eaea5e250fb..0b5dd7160b8 100644
--- a/docs/en/sql-reference/functions/ip-address-functions.md
+++ b/docs/en/sql-reference/functions/ip-address-functions.md
@@ -9,10 +9,14 @@ toc_title: IP Addresses
 
 Takes a UInt32 number. Interprets it as an IPv4 address in big endian. Returns a string containing the corresponding IPv4 address in the format A.B.C.d (dot-separated numbers in decimal form).
 
+Alias: `INET_NTOA`.
+
 ## IPv4StringToNum(s) {#ipv4stringtonums}
 
 The reverse function of IPv4NumToString. If the IPv4 address has an invalid format, it returns 0.
 
+Alias: `INET_ATON`.
+
 ## IPv4NumToStringClassC(num) {#ipv4numtostringclasscnum}
 
 Similar to IPv4NumToString, but using xxx instead of the last octet.
@@ -49,10 +53,14 @@ Since using ‘xxx’ is highly unusual, this may be changed in the future. We r
 ### IPv6NumToString(x) {#ipv6numtostringx}
 
 Accepts a FixedString(16) value containing the IPv6 address in binary format. Returns a string containing this address in text format.
-IPv6-mapped IPv4 addresses are output in the format ::ffff:111.222.33.44. Examples:
+IPv6-mapped IPv4 addresses are output in the format ::ffff:111.222.33.44. 
+
+Alias: `INET6_NTOA`.
+
+Examples:
 
 ``` sql
-SELECT IPv6NumToString(toFixedString(unhex('2A0206B8000000000000000000000011'), 16)) AS addr
+SELECT IPv6NumToString(toFixedString(unhex('2A0206B8000000000000000000000011'), 16)) AS addr;
 ```
 
 ``` text
@@ -113,28 +121,59 @@ LIMIT 10
 └────────────────────────────┴────────┘
 ```
 
-## IPv6StringToNum(s) {#ipv6stringtonums}
+## IPv6StringToNum {#ipv6stringtonums}
 
-The reverse function of IPv6NumToString. If the IPv6 address has an invalid format, it returns a string of null bytes. 
-If the IP address is a valid IPv4 address then the IPv6 equivalent of the IPv4 address is returned.
+The reverse function of [IPv6NumToString](#ipv6numtostringx). If the IPv6 address has an invalid format, it returns a string of null bytes. 
+
+If the input string contains a valid IPv4 address, returns its IPv6 equivalent.
 HEX can be uppercase or lowercase.
 
+Alias: `INET6_ATON`.
+
+**Syntax**
+
 ``` sql
-SELECT cutIPv6(IPv6StringToNum('127.0.0.1'), 0, 0);
+IPv6StringToNum(string)
 ```
 
-``` text
-┌─cutIPv6(IPv6StringToNum('127.0.0.1'), 0, 0)─┐
-│ ::ffff:127.0.0.1                            │
-└─────────────────────────────────────────────┘
+**Argument** 
+
+-   `string` — IP address. [String](../../sql-reference/data-types/string.md).
+
+**Returned value**
+
+-   IPv6 address in binary format. 
+
+Type: [FixedString(16)](../../sql-reference/data-types/fixedstring.md).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT addr, cutIPv6(IPv6StringToNum(addr), 0, 0) FROM (SELECT ['notaddress', '127.0.0.1', '1111::ffff'] AS addr) ARRAY JOIN addr;
 ```
 
+Result:
+
+``` text
+┌─addr───────┬─cutIPv6(IPv6StringToNum(addr), 0, 0)─┐
+│ notaddress │ ::                                   │
+│ 127.0.0.1  │ ::ffff:127.0.0.1                     │
+│ 1111::ffff │ 1111::ffff                           │
+└────────────┴──────────────────────────────────────┘
+```
+
+**See Also**
+
+-   [cutIPv6](#cutipv6x-bytestocutforipv6-bytestocutforipv4).
+
 ## IPv4ToIPv6(x) {#ipv4toipv6x}
 
 Takes a `UInt32` number. Interprets it as an IPv4 address in [big endian](https://en.wikipedia.org/wiki/Endianness). Returns a `FixedString(16)` value containing the IPv6 address in binary format. Examples:
 
 ``` sql
-SELECT IPv6NumToString(IPv4ToIPv6(IPv4StringToNum('192.168.0.1'))) AS addr
+SELECT IPv6NumToString(IPv4ToIPv6(IPv4StringToNum('192.168.0.1'))) AS addr;
 ```
 
 ``` text
@@ -167,7 +206,7 @@ SELECT
 Accepts an IPv4 and an UInt8 value containing the [CIDR](https://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing). Return a tuple with two IPv4 containing the lower range and the higher range of the subnet.
 
 ``` sql
-SELECT IPv4CIDRToRange(toIPv4('192.168.5.2'), 16)
+SELECT IPv4CIDRToRange(toIPv4('192.168.5.2'), 16);
 ```
 
 ``` text
@@ -222,43 +261,56 @@ SELECT
 └───────────────────────────────────┴──────────────────────────┘
 ```
 
-## toIPv6(string) {#toipv6string}
+## toIPv6 {#toipv6string}
 
-An alias to `IPv6StringToNum()` that takes a string form of IPv6 address and returns value of [IPv6](../../sql-reference/data-types/domains/ipv6.md) type, which is binary equal to value returned by `IPv6StringToNum()`.
-If the IP address is a valid IPv4 address then the IPv6 equivalent of the IPv4 address is returned.
+Converts a string form of IPv6 address to [IPv6](../../sql-reference/data-types/domains/ipv6.md) type. If the IPv6 address has an invalid format, returns an empty value.
+Similar to [IPv6StringToNum](#ipv6stringtonums) function, which converts IPv6 address to binary format.
 
-``` sql
-WITH
-    '2001:438:ffff::407d:1bc1' as IPv6_string
-SELECT
-    toTypeName(IPv6StringToNum(IPv6_string)),
-    toTypeName(toIPv6(IPv6_string))
+If the input string contains a valid IPv4 address, then the IPv6 equivalent of the IPv4 address is returned.
+
+**Syntax**
+
+```sql
+toIPv6(string)
 ```
 
-``` text
-┌─toTypeName(IPv6StringToNum(IPv6_string))─┬─toTypeName(toIPv6(IPv6_string))─┐
-│ FixedString(16)                          │ IPv6                            │
-└──────────────────────────────────────────┴─────────────────────────────────┘
-```
+**Argument**
+
+-   `string` — IP address. [String](../../sql-reference/data-types/string.md)
+
+**Returned value**
+
+-   IP address. 
+
+Type: [IPv6](../../sql-reference/data-types/domains/ipv6.md).
+
+**Examples**
+
+Query:
 
 ``` sql
-WITH
-    '2001:438:ffff::407d:1bc1' as IPv6_string
+WITH '2001:438:ffff::407d:1bc1' AS IPv6_string
 SELECT
     hex(IPv6StringToNum(IPv6_string)),
-    hex(toIPv6(IPv6_string))
+    hex(toIPv6(IPv6_string));
 ```
 
+Result:
+
 ``` text
 ┌─hex(IPv6StringToNum(IPv6_string))─┬─hex(toIPv6(IPv6_string))─────────┐
 │ 20010438FFFF000000000000407D1BC1  │ 20010438FFFF000000000000407D1BC1 │
 └───────────────────────────────────┴──────────────────────────────────┘
 ```
 
+Query:
+
 ``` sql
-SELECT toIPv6('127.0.0.1')
+SELECT toIPv6('127.0.0.1');
 ```
 
+Result:
+
 ``` text
 ┌─toIPv6('127.0.0.1')─┐
 │ ::ffff:127.0.0.1    │
@@ -290,7 +342,7 @@ Type: [UInt8](../../sql-reference/data-types/int-uint.md).
 Query:
 
 ```sql
-SELECT addr, isIPv4String(addr) FROM ( SELECT ['0.0.0.0', '127.0.0.1', '::ffff:127.0.0.1'] AS addr ) ARRAY JOIN addr
+SELECT addr, isIPv4String(addr) FROM ( SELECT ['0.0.0.0', '127.0.0.1', '::ffff:127.0.0.1'] AS addr ) ARRAY JOIN addr;
 ```
 
 Result:
@@ -328,7 +380,7 @@ Type: [UInt8](../../sql-reference/data-types/int-uint.md).
 Query:
 
 ``` sql
-SELECT addr, isIPv6String(addr) FROM ( SELECT ['::', '1111::ffff', '::ffff:127.0.0.1', '127.0.0.1'] AS addr ) ARRAY JOIN addr
+SELECT addr, isIPv6String(addr) FROM ( SELECT ['::', '1111::ffff', '::ffff:127.0.0.1', '127.0.0.1'] AS addr ) ARRAY JOIN addr;
 ```
 
 Result:
@@ -342,4 +394,55 @@ Result:
 └──────────────────┴────────────────────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/query_language/functions/ip_address_functions/) <!--hide-->
+## isIPAddressInRange {#isipaddressinrange}
+
+Determines if an IP address is contained in a network represented in the [CIDR](https://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing) notation. Returns `1` if true, or `0` otherwise.
+
+**Syntax**
+
+``` sql
+isIPAddressInRange(address, prefix)
+```
+
+This function accepts both IPv4 and IPv6 addresses (and networks) represented as strings. It returns `0` if the IP version of the address and the CIDR don't match.
+
+**Arguments**
+
+-   `address` — An IPv4 or IPv6 address. [String](../../sql-reference/data-types/string.md).
+-   `prefix` — An IPv4 or IPv6 network prefix in CIDR. [String](../../sql-reference/data-types/string.md).
+
+**Returned value**
+
+-   `1` or `0`.
+
+Type: [UInt8](../../sql-reference/data-types/int-uint.md).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT isIPAddressInRange('127.0.0.1', '127.0.0.0/8')
+```
+
+Result:
+
+``` text
+┌─isIPAddressInRange('127.0.0.1', '127.0.0.0/8')─┐
+│                                              1 │
+└────────────────────────────────────────────────┘
+```
+
+Query:
+
+``` sql
+SELECT isIPAddressInRange('127.0.0.1', 'ffff::/16')
+```
+
+Result:
+
+``` text
+┌─isIPAddressInRange('127.0.0.1', 'ffff::/16')─┐
+│                                            0 │
+└──────────────────────────────────────────────┘
+```
diff --git a/docs/en/sql-reference/functions/json-functions.md b/docs/en/sql-reference/functions/json-functions.md
index edee048eb77..d545a0ae4e6 100644
--- a/docs/en/sql-reference/functions/json-functions.md
+++ b/docs/en/sql-reference/functions/json-functions.md
@@ -16,46 +16,60 @@ The following assumptions are made:
 
 ## visitParamHas(params, name) {#visitparamhasparams-name}
 
-Checks whether there is a field with the ‘name’ name.
+Checks whether there is a field with the `name` name.
+
+Alias: `simpleJSONHas`.
 
 ## visitParamExtractUInt(params, name) {#visitparamextractuintparams-name}
 
-Parses UInt64 from the value of the field named ‘name’. If this is a string field, it tries to parse a number from the beginning of the string. If the field doesn’t exist, or it exists but doesn’t contain a number, it returns 0.
+Parses UInt64 from the value of the field named `name`. If this is a string field, it tries to parse a number from the beginning of the string. If the field doesn’t exist, or it exists but doesn’t contain a number, it returns 0.
+
+Alias: `simpleJSONExtractUInt`.
 
 ## visitParamExtractInt(params, name) {#visitparamextractintparams-name}
 
 The same as for Int64.
 
+Alias: `simpleJSONExtractInt`.
+
 ## visitParamExtractFloat(params, name) {#visitparamextractfloatparams-name}
 
 The same as for Float64.
 
+Alias: `simpleJSONExtractFloat`.
+
 ## visitParamExtractBool(params, name) {#visitparamextractboolparams-name}
 
 Parses a true/false value. The result is UInt8.
 
+Alias: `simpleJSONExtractBool`.
+
 ## visitParamExtractRaw(params, name) {#visitparamextractrawparams-name}
 
 Returns the value of a field, including separators.
 
+Alias: `simpleJSONExtractRaw`.
+
 Examples:
 
 ``` sql
-visitParamExtractRaw('{"abc":"\\n\\u0000"}', 'abc') = '"\\n\\u0000"'
-visitParamExtractRaw('{"abc":{"def":[1,2,3]}}', 'abc') = '{"def":[1,2,3]}'
+visitParamExtractRaw('{"abc":"\\n\\u0000"}', 'abc') = '"\\n\\u0000"';
+visitParamExtractRaw('{"abc":{"def":[1,2,3]}}', 'abc') = '{"def":[1,2,3]}';
 ```
 
 ## visitParamExtractString(params, name) {#visitparamextractstringparams-name}
 
 Parses the string in double quotes. The value is unescaped. If unescaping failed, it returns an empty string.
 
+Alias: `simpleJSONExtractString`.
+
 Examples:
 
 ``` sql
-visitParamExtractString('{"abc":"\\n\\u0000"}', 'abc') = '\n\0'
-visitParamExtractString('{"abc":"\\u263a"}', 'abc') = '☺'
-visitParamExtractString('{"abc":"\\u263"}', 'abc') = ''
-visitParamExtractString('{"abc":"hello}', 'abc') = ''
+visitParamExtractString('{"abc":"\\n\\u0000"}', 'abc') = '\n\0';
+visitParamExtractString('{"abc":"\\u263a"}', 'abc') = '☺';
+visitParamExtractString('{"abc":"\\u263"}', 'abc') = '';
+visitParamExtractString('{"abc":"hello}', 'abc') = '';
 ```
 
 There is currently no support for code points in the format `\uXXXX\uYYYY` that are not from the basic multilingual plane (they are converted to CESU-8 instead of UTF-8).
@@ -199,7 +213,7 @@ Parses key-value pairs from a JSON where the values are of the given ClickHouse
 Example:
 
 ``` sql
-SELECT JSONExtractKeysAndValues('{"x": {"a": 5, "b": 7, "c": 11}}', 'x', 'Int8') = [('a',5),('b',7),('c',11)]
+SELECT JSONExtractKeysAndValues('{"x": {"a": 5, "b": 7, "c": 11}}', 'x', 'Int8') = [('a',5),('b',7),('c',11)];
 ```
 
 ## JSONExtractRaw(json\[, indices_or_keys\]…) {#jsonextractrawjson-indices-or-keys}
@@ -211,7 +225,7 @@ If the part does not exist or has a wrong type, an empty string will be returned
 Example:
 
 ``` sql
-SELECT JSONExtractRaw('{"a": "hello", "b": [-100, 200.0, 300]}', 'b') = '[-100, 200.0, 300]'
+SELECT JSONExtractRaw('{"a": "hello", "b": [-100, 200.0, 300]}', 'b') = '[-100, 200.0, 300]';
 ```
 
 ## JSONExtractArrayRaw(json\[, indices_or_keys…\]) {#jsonextractarrayrawjson-indices-or-keys}
@@ -223,7 +237,7 @@ If the part does not exist or isn’t array, an empty array will be returned.
 Example:
 
 ``` sql
-SELECT JSONExtractArrayRaw('{"a": "hello", "b": [-100, 200.0, "hello"]}', 'b') = ['-100', '200.0', '"hello"']'
+SELECT JSONExtractArrayRaw('{"a": "hello", "b": [-100, 200.0, "hello"]}', 'b') = ['-100', '200.0', '"hello"']';
 ```
 
 ## JSONExtractKeysAndValuesRaw {#json-extract-keys-and-values-raw}
@@ -253,7 +267,7 @@ Type: [Array](../../sql-reference/data-types/array.md)([Tuple](../../sql-referen
 Query:
 
 ``` sql
-SELECT JSONExtractKeysAndValuesRaw('{"a": [-100, 200.0], "b":{"c": {"d": "hello", "f": "world"}}}')
+SELECT JSONExtractKeysAndValuesRaw('{"a": [-100, 200.0], "b":{"c": {"d": "hello", "f": "world"}}}');
 ```
 
 Result:
@@ -267,7 +281,7 @@ Result:
 Query:
 
 ``` sql
-SELECT JSONExtractKeysAndValuesRaw('{"a": [-100, 200.0], "b":{"c": {"d": "hello", "f": "world"}}}', 'b')
+SELECT JSONExtractKeysAndValuesRaw('{"a": [-100, 200.0], "b":{"c": {"d": "hello", "f": "world"}}}', 'b');
 ```
 
 Result:
@@ -281,7 +295,7 @@ Result:
 Query:
 
 ``` sql
-SELECT JSONExtractKeysAndValuesRaw('{"a": [-100, 200.0], "b":{"c": {"d": "hello", "f": "world"}}}', -1, 'c')
+SELECT JSONExtractKeysAndValuesRaw('{"a": [-100, 200.0], "b":{"c": {"d": "hello", "f": "world"}}}', -1, 'c');
 ```
 
 Result:
@@ -292,4 +306,3 @@ Result:
 └───────────────────────────────────────────────────────────────────────────────────────────────────────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/query_language/functions/json_functions/) <!--hide-->
diff --git a/docs/en/sql-reference/functions/logical-functions.md b/docs/en/sql-reference/functions/logical-functions.md
index 13452f88a85..6cce0e4fff5 100644
--- a/docs/en/sql-reference/functions/logical-functions.md
+++ b/docs/en/sql-reference/functions/logical-functions.md
@@ -17,4 +17,3 @@ Zero as an argument is considered “false,” while any non-zero value is consi
 
 ## xor {#xor}
 
-[Original article](https://clickhouse.tech/docs/en/query_language/functions/logical_functions/) <!--hide-->
diff --git a/docs/en/sql-reference/functions/machine-learning-functions.md b/docs/en/sql-reference/functions/machine-learning-functions.md
index f103a4ea421..60dabd73781 100644
--- a/docs/en/sql-reference/functions/machine-learning-functions.md
+++ b/docs/en/sql-reference/functions/machine-learning-functions.md
@@ -9,7 +9,7 @@ toc_title: Machine Learning
 
 Prediction using fitted regression models uses `evalMLMethod` function. See link in `linearRegression`.
 
-## stochasticLinearRegressionn {#stochastic-linear-regression}
+## stochasticLinearRegression {#stochastic-linear-regression}
 
 The [stochasticLinearRegression](../../sql-reference/aggregate-functions/reference/stochasticlinearregression.md#agg_functions-stochasticlinearregression) aggregate function implements stochastic gradient descent method using linear model and MSE loss function. Uses `evalMLMethod` to predict on new data.
 
@@ -36,14 +36,14 @@ bayesAB(distribution_name, higher_is_better, variant_names, x, y)
 
 -   `higher_is_better` — Boolean flag. [Boolean](../../sql-reference/data-types/boolean.md). Possible values:
 
-    -    `0` - lower values are considered to be better than higher
-    -    `1` - higher values are considered to be better than lower
+    -    `0` — lower values are considered to be better than higher
+    -    `1` — higher values are considered to be better than lower
 
--   `variant_names` - Variant names. [Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md)).
+-   `variant_names` — Variant names. [Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md)).
 
--   `x` - Numbers of tests for the corresponding variants. [Array](../../sql-reference/data-types/array.md)([Float64](../../sql-reference/data-types/float.md)).
+-   `x` — Numbers of tests for the corresponding variants. [Array](../../sql-reference/data-types/array.md)([Float64](../../sql-reference/data-types/float.md)).
 
--   `y` - Numbers of successful tests for the corresponding variants. [Array](../../sql-reference/data-types/array.md)([Float64](../../sql-reference/data-types/float.md)).
+-   `y` — Numbers of successful tests for the corresponding variants. [Array](../../sql-reference/data-types/array.md)([Float64](../../sql-reference/data-types/float.md)).
 
 !!! note "Note"
     All three arrays must have the same size. All `x` and `y` values must be non-negative constant numbers. `y` cannot be larger than `x`.
@@ -51,8 +51,8 @@ bayesAB(distribution_name, higher_is_better, variant_names, x, y)
 **Returned values**
 
 For each variant the function calculates:
--   `beats_control` - long-term probability to out-perform the first (control) variant
--   `to_be_best` - long-term probability to out-perform all other variants
+-   `beats_control` — long-term probability to out-perform the first (control) variant
+-   `to_be_best` — long-term probability to out-perform all other variants
 
 Type: JSON.
 
@@ -94,4 +94,3 @@ Result:
 }
 ```
 
-[Original article](https://clickhouse.tech/docs/en/query_language/functions/machine-learning-functions/) <!--hide-->
diff --git a/docs/en/sql-reference/functions/math-functions.md b/docs/en/sql-reference/functions/math-functions.md
index f56a721c0c0..2b3c000bc19 100644
--- a/docs/en/sql-reference/functions/math-functions.md
+++ b/docs/en/sql-reference/functions/math-functions.md
@@ -54,7 +54,7 @@ If ‘x’ is non-negative, then `erf(x / σ√2)` is the probability that a ran
 Example (three sigma rule):
 
 ``` sql
-SELECT erf(3 / sqrt(2))
+SELECT erf(3 / sqrt(2));
 ```
 
 ``` text
@@ -415,7 +415,7 @@ Result:
 
 ## sign(x) {#signx}
 
-The `sign` function can extract the sign of a real number.
+Returns the sign of a real number.
 
 **Syntax**
 
@@ -433,9 +433,9 @@ sign(x)
 -  0 for `x = 0`
 -  1 for `x > 0`
 
-**Example**
+**Examples**
 
-Query:
+Sign for the zero value:
 
 ``` sql
 SELECT sign(0);
@@ -449,7 +449,7 @@ Result:
 └─────────┘
 ```
 
-Query:
+Sign for the positive value:
 
 ``` sql
 SELECT sign(1);
@@ -463,7 +463,7 @@ Result:
 └─────────┘
 ```
 
-Query:
+Sign for the negative value:
 
 ``` sql
 SELECT sign(-1);
@@ -477,4 +477,3 @@ Result:
 └──────────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/query_language/functions/math_functions/) <!--hide-->
diff --git a/docs/en/sql-reference/functions/other-functions.md b/docs/en/sql-reference/functions/other-functions.md
index 04e921b5c55..9d7743e186f 100644
--- a/docs/en/sql-reference/functions/other-functions.md
+++ b/docs/en/sql-reference/functions/other-functions.md
@@ -728,7 +728,7 @@ The result of the function depends on the affected data blocks and the order of
     It can reach the neighbor rows only inside the currently processed data block.
 
 The rows order used during the calculation of `neighbor` can differ from the order of rows returned to the user.
-To prevent that you can make a subquery with ORDER BY and call the function from outside the subquery.
+To prevent that you can make a subquery with [ORDER BY](../../sql-reference/statements/select/order-by.md) and call the function from outside the subquery.
 
 **Arguments**
 
@@ -834,12 +834,12 @@ Calculates the difference between successive row values ​​in the data block.
 Returns 0 for the first row and the difference from the previous row for each subsequent row.
 
 !!! warning "Warning"
-    It can reach the previos row only inside the currently processed data block.
+    It can reach the previous row only inside the currently processed data block.
     
 The result of the function depends on the affected data blocks and the order of data in the block.
 
 The rows order used during the calculation of `runningDifference` can differ from the order of rows returned to the user.
-To prevent that you can make a subquery with ORDER BY and call the function from outside the subquery.
+To prevent that you can make a subquery with [ORDER BY](../../sql-reference/statements/select/order-by.md) and call the function from outside the subquery.
 
 Example:
 
@@ -907,66 +907,64 @@ WHERE diff != 1
 
 ## runningDifferenceStartingWithFirstValue {#runningdifferencestartingwithfirstvalue}
 
-Same as for [runningDifference](../../sql-reference/functions/other-functions.md#other_functions-runningdifference), the difference is the value of the first row, returned the value of the first row, and each subsequent row returns the difference from the previous row.
+Same as for [runningDifference](./other-functions.md#other_functions-runningdifference), the difference is the value of the first row, returned the value of the first row, and each subsequent row returns the difference from the previous row.
 
 ## runningConcurrency {#runningconcurrency}
 
-Given a series of beginning time and ending time of events, this function calculates concurrency of the events at each of the data point, that is, the beginning time.
+Calculates the number of concurrent events.
+Each event has a start time and an end time. The start time is included in the event, while the end time is excluded. Columns with a start time and an end time must be of the same data type. 
+The function calculates the total number of active (concurrent) events for each event start time.
+
 
 !!! warning "Warning"
-    Events spanning multiple data blocks will not be processed correctly. The function resets its state for each new data block.
-
-The result of the function depends on the order of data in the block. It assumes the beginning time is sorted in ascending order.
+    Events must be ordered by the start time in ascending order. If this requirement is violated the function raises an exception.
+    Every data block is processed separately. If events from different data blocks overlap then they can not be processed correctly.
 
 **Syntax**
 
 ``` sql
-runningConcurrency(begin, end)
+runningConcurrency(start, end)
 ```
 
 **Arguments**
 
--   `begin` — A column for the beginning time of events (inclusive). [Date](../../sql-reference/data-types/date.md), [DateTime](../../sql-reference/data-types/datetime.md), or [DateTime64](../../sql-reference/data-types/datetime64.md).
--   `end` — A column for the ending time of events (exclusive).  [Date](../../sql-reference/data-types/date.md), [DateTime](../../sql-reference/data-types/datetime.md), or [DateTime64](../../sql-reference/data-types/datetime64.md).
-
-Note that two columns `begin` and `end` must have the same type.
+-   `start` — A column with the start time of events. [Date](../../sql-reference/data-types/date.md), [DateTime](../../sql-reference/data-types/datetime.md), or [DateTime64](../../sql-reference/data-types/datetime64.md).
+-   `end` — A column with the end time of events.  [Date](../../sql-reference/data-types/date.md), [DateTime](../../sql-reference/data-types/datetime.md), or [DateTime64](../../sql-reference/data-types/datetime64.md).
 
 **Returned values**
 
--   The concurrency of events at the data point.
+-   The number of concurrent events at each event start time.
 
 Type: [UInt32](../../sql-reference/data-types/int-uint.md)
 
 **Example**
 
-Input table:
+Consider the table:
 
 ``` text
-┌───────────────begin─┬─────────────────end─┐
-│ 2020-12-01 00:00:00 │ 2020-12-01 00:59:59 │
-│ 2020-12-01 00:30:00 │ 2020-12-01 00:59:59 │
-│ 2020-12-01 00:40:00 │ 2020-12-01 01:30:30 │
-│ 2020-12-01 01:10:00 │ 2020-12-01 01:30:30 │
-│ 2020-12-01 01:50:00 │ 2020-12-01 01:59:59 │
-└─────────────────────┴─────────────────────┘
+┌──────start─┬────────end─┐
+│ 2021-03-03 │ 2021-03-11 │
+│ 2021-03-06 │ 2021-03-12 │
+│ 2021-03-07 │ 2021-03-08 │
+│ 2021-03-11 │ 2021-03-12 │
+└────────────┴────────────┘
 ```
 
 Query:
 
 ``` sql
-SELECT runningConcurrency(begin, end) FROM example
+SELECT start, runningConcurrency(start, end) FROM example_table;
 ```
 
 Result:
 
 ``` text
-┌─runningConcurrency(begin, end)─┐
-│                              1 │
-│                              2 │
-│                              3 │
-│                              2 │
-│                              1 │
-└────────────────────────────────┘
+┌──────start─┬─runningConcurrency(start, end)─┐
+│ 2021-03-03 │                              1 │
+│ 2021-03-06 │                              2 │
+│ 2021-03-07 │                              3 │
+│ 2021-03-11 │                              2 │
+└────────────┴────────────────────────────────┘
 ```
 
 ## MACNumToString(num) {#macnumtostringnum}
@@ -1194,6 +1192,109 @@ SELECT defaultValueOfTypeName('Nullable(Int8)')
 └──────────────────────────────────────────┘
 ```
 
+## indexHint {#indexhint}
+The function is intended for debugging and introspection purposes. The function ignores it's argument and always returns 1. Arguments are not even evaluated.
+
+But for the purpose of index analysis, the argument of this function is analyzed as if it was present directly without being wrapped inside `indexHint` function. This allows to select data in index ranges by the corresponding condition but without further filtering by this condition. The index in ClickHouse is sparse and using `indexHint` will yield more data than specifying the same condition directly.
+
+**Syntax**
+
+```sql
+SELECT * FROM table WHERE indexHint(<expression>)
+```
+
+**Returned value**
+
+1. Type: [Uint8](https://clickhouse.yandex/docs/en/data_types/int_uint/#diapazony-uint).
+
+**Example**
+
+Here is the example of test data from the table [ontime](../../getting-started/example-datasets/ontime.md).
+
+Input table:
+
+```sql
+SELECT count() FROM ontime
+```
+
+```text
+┌─count()─┐
+│ 4276457 │
+└─────────┘
+```
+
+The table has indexes on the fields `(FlightDate, (Year, FlightDate))`.
+
+Create a query, where the index is not used.
+
+Query:
+
+```sql
+SELECT FlightDate AS k, count() FROM ontime GROUP BY k ORDER BY k
+```
+
+ClickHouse processed the entire table (`Processed 4.28 million rows`).
+
+Result:
+
+```text
+┌──────────k─┬─count()─┐
+│ 2017-01-01 │   13970 │
+│ 2017-01-02 │   15882 │
+........................
+│ 2017-09-28 │   16411 │
+│ 2017-09-29 │   16384 │
+│ 2017-09-30 │   12520 │
+└────────────┴─────────┘
+```
+
+To apply the index, select a specific date.
+
+Query:
+
+```sql
+SELECT FlightDate AS k, count() FROM ontime WHERE k = '2017-09-15' GROUP BY k ORDER BY k
+```
+
+By using the index, ClickHouse processed a significantly smaller number of rows (`Processed 32.74 thousand rows`).
+
+Result:
+
+```text
+┌──────────k─┬─count()─┐
+│ 2017-09-15 │   16428 │
+└────────────┴─────────┘
+```
+
+Now wrap the expression `k = '2017-09-15'` into `indexHint` function.
+
+Query:
+
+```sql
+SELECT
+    FlightDate AS k,
+    count()
+FROM ontime
+WHERE indexHint(k = '2017-09-15')
+GROUP BY k
+ORDER BY k ASC
+```
+
+ClickHouse used the index in the same way as the previous time (`Processed 32.74 thousand rows`).
+The expression `k = '2017-09-15'` was not used when generating the result.
+In examle the `indexHint` function allows to see adjacent dates.
+
+Result:
+
+```text
+┌──────────k─┬─count()─┐
+│ 2017-09-14 │    7071 │
+│ 2017-09-15 │   16428 │
+│ 2017-09-16 │    1077 │
+│ 2017-09-30 │    8167 │
+└────────────┴─────────┘
+```
+
 ## replicate {#other-functions-replicate}
 
 Creates an array with a single value.
@@ -1762,7 +1863,6 @@ Result:
 
 ```
 
-
 ## randomStringUTF8 {#randomstringutf8}
 
 Generates a random string of a specified length. Result string contains valid UTF-8 code points. The value of code points may be outside of the range of assigned Unicode.
@@ -1971,4 +2071,3 @@ Result:
 
 -   [tcp_port](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-tcp_port)
 
-[Original article](https://clickhouse.tech/docs/en/query_language/functions/other_functions/) <!--hide-->
diff --git a/docs/en/sql-reference/functions/random-functions.md b/docs/en/sql-reference/functions/random-functions.md
index 2b9846344e4..aab9483de45 100644
--- a/docs/en/sql-reference/functions/random-functions.md
+++ b/docs/en/sql-reference/functions/random-functions.md
@@ -102,4 +102,3 @@ FROM numbers(3)
 │ aeca2A │
 └───────────────────────────────────────┘
 
-[Original article](https://clickhouse.tech/docs/en/query_language/functions/random_functions/) <!--hide-->
diff --git a/docs/en/sql-reference/functions/rounding-functions.md b/docs/en/sql-reference/functions/rounding-functions.md
index 83db1975366..c0bd44a6467 100644
--- a/docs/en/sql-reference/functions/rounding-functions.md
+++ b/docs/en/sql-reference/functions/rounding-functions.md
@@ -35,7 +35,7 @@ The function returns the nearest number of the specified order. In case when giv
 round(expression [, decimal_places])
 ```
 
-**Arguments:**
+**Arguments**
 
 -   `expression` — A number to be rounded. Can be any [expression](../../sql-reference/syntax.md#syntax-expressions) returning the numeric [data type](../../sql-reference/data-types/index.md#data_types).
 -   `decimal-places` — An integer value.
@@ -185,4 +185,3 @@ Accepts a number. If the number is less than 18, it returns 0. Otherwise, it rou
 
 Accepts a number and rounds it down to an element in the specified array. If the value is less than the lowest bound, the lowest bound is returned.
 
-[Original article](https://clickhouse.tech/docs/en/query_language/functions/rounding_functions/) <!--hide-->
diff --git a/docs/en/sql-reference/functions/splitting-merging-functions.md b/docs/en/sql-reference/functions/splitting-merging-functions.md
index c70ee20f076..bd7e209549c 100644
--- a/docs/en/sql-reference/functions/splitting-merging-functions.md
+++ b/docs/en/sql-reference/functions/splitting-merging-functions.md
@@ -150,4 +150,3 @@ Result:
 └───────────────────────────────────────────────────────────────────────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/query_language/functions/splitting_merging_functions/) <!--hide-->
diff --git a/docs/en/sql-reference/functions/string-functions.md b/docs/en/sql-reference/functions/string-functions.md
index 191bd100dda..85570cb408d 100644
--- a/docs/en/sql-reference/functions/string-functions.md
+++ b/docs/en/sql-reference/functions/string-functions.md
@@ -73,19 +73,19 @@ Returns 1, if the set of bytes is valid UTF-8 encoded, otherwise 0.
 Replaces invalid UTF-8 characters by the `�` (U+FFFD) character. All running in a row invalid characters are collapsed into the one replacement character.
 
 ``` sql
-toValidUTF8( input_string )
+toValidUTF8(input_string)
 ```
 
 **Arguments**
 
--   input_string — Any set of bytes represented as the [String](../../sql-reference/data-types/string.md) data type object.
+-   `input_string` — Any set of bytes represented as the [String](../../sql-reference/data-types/string.md) data type object.
 
 Returned value: Valid UTF-8 string.
 
 **Example**
 
 ``` sql
-SELECT toValidUTF8('\x61\xF0\x80\x80\x80b')
+SELECT toValidUTF8('\x61\xF0\x80\x80\x80b');
 ```
 
 ``` text
@@ -98,6 +98,8 @@ SELECT toValidUTF8('\x61\xF0\x80\x80\x80b')
 
 Repeats a string as many times as specified and concatenates the replicated values as a single string.
 
+Alias: `REPEAT`.
+
 **Syntax**
 
 ``` sql
@@ -120,7 +122,7 @@ Type: `String`.
 Query:
 
 ``` sql
-SELECT repeat('abc', 10)
+SELECT repeat('abc', 10);
 ```
 
 Result:
@@ -188,7 +190,7 @@ If any of argument values is `NULL`, `concat` returns `NULL`.
 Query:
 
 ``` sql
-SELECT concat('Hello, ', 'World!')
+SELECT concat('Hello, ', 'World!');
 ```
 
 Result:
@@ -243,7 +245,7 @@ SELECT * from key_val;
 Query:
 
 ``` sql
-SELECT concat(key1, key2), sum(value) FROM key_val GROUP BY concatAssumeInjective(key1, key2)
+SELECT concat(key1, key2), sum(value) FROM key_val GROUP BY concatAssumeInjective(key1, key2);
 ```
 
 Result:
@@ -276,10 +278,14 @@ Returns the string ‘s’ that was converted from the encoding in ‘from’ to
 
 Encodes ‘s’ string into base64
 
+Alias: `TO_BASE64`.
+
 ## base64Decode(s) {#base64decode}
 
 Decode base64-encoded string ‘s’ into original string. In case of failure raises an exception.
 
+Alias: `FROM_BASE64`.
+
 ## tryBase64Decode(s) {#trybase64decode}
 
 Similar to base64Decode, but in case of error an empty string would be returned.
@@ -330,8 +336,8 @@ trim([[LEADING|TRAILING|BOTH] trim_character FROM] input_string)
 
 **Arguments**
 
--   `trim_character` — specified characters for trim. [String](../../sql-reference/data-types/string.md).
--   `input_string` — string for trim. [String](../../sql-reference/data-types/string.md).
+-   `trim_character` — Specified characters for trim. [String](../../sql-reference/data-types/string.md).
+-   `input_string` — String for trim. [String](../../sql-reference/data-types/string.md).
 
 **Returned value**
 
@@ -344,7 +350,7 @@ Type: `String`.
 Query:
 
 ``` sql
-SELECT trim(BOTH ' ()' FROM '(   Hello, world!   )')
+SELECT trim(BOTH ' ()' FROM '(   Hello, world!   )');
 ```
 
 Result:
@@ -382,7 +388,7 @@ Type: `String`.
 Query:
 
 ``` sql
-SELECT trimLeft('     Hello, world!     ')
+SELECT trimLeft('     Hello, world!     ');
 ```
 
 Result:
@@ -420,7 +426,7 @@ Type: `String`.
 Query:
 
 ``` sql
-SELECT trimRight('     Hello, world!     ')
+SELECT trimRight('     Hello, world!     ');
 ```
 
 Result:
@@ -458,7 +464,7 @@ Type: `String`.
 Query:
 
 ``` sql
-SELECT trimBoth('     Hello, world!     ')
+SELECT trimBoth('     Hello, world!     ');
 ```
 
 Result:
@@ -491,7 +497,8 @@ The result type is UInt64.
 
 Replaces literals, sequences of literals and complex aliases with placeholders.
 
-**Syntax** 
+**Syntax**
+
 ``` sql
 normalizeQuery(x)
 ```
@@ -611,7 +618,7 @@ This function also replaces numeric character references with Unicode characters
 decodeXMLComponent(x)
 ```
 
-**Parameters**
+**Arguments**
 
 -   `x` — A sequence of characters. [String](../../sql-reference/data-types/string.md).
 
@@ -642,4 +649,65 @@ Result:
 -   [List of XML and HTML character entity references](https://en.wikipedia.org/wiki/List_of_XML_and_HTML_character_entity_references)
 
 
-[Original article](https://clickhouse.tech/docs/en/query_language/functions/string_functions/) <!--hide-->
+
+## extractTextFromHTML {#extracttextfromhtml}
+
+A function to extract text from HTML or XHTML.
+It does not necessarily 100% conform to any of the HTML, XML or XHTML standards, but the implementation is reasonably accurate and it is fast. The rules are the following:
+
+1. Comments are skipped. Example: `<!-- test -->`. Comment must end with `-->`. Nested comments are not possible.
+Note: constructions like `<!-->` and `<!--->` are not valid comments in HTML but they are skipped by other rules.
+2. CDATA is pasted verbatim. Note: CDATA is XML/XHTML specific. But it is processed for "best-effort" approach.
+3. `script` and `style` elements are removed with all their content. Note: it is assumed that closing tag cannot appear inside content. For example, in JS string literal has to be escaped like `"<\/script>"`.
+Note: comments and CDATA are possible inside `script` or `style` - then closing tags are not searched inside CDATA. Example: `<script><![CDATA[</script>]]></script>`. But they are still searched inside comments. Sometimes it becomes complicated: `<script>var x = "<!--"; </script> var y = "-->"; alert(x + y);</script>`
+Note: `script` and `style` can be the names of XML namespaces - then they are not treated like usual `script` or `style` elements. Example: `<script:a>Hello</script:a>`.
+Note: whitespaces are possible after closing tag name: `</script >` but not before: `< / script>`.
+4. Other tags or tag-like elements are skipped without inner content. Example: `<a>.</a>`
+Note: it is expected that this HTML is illegal: `<a test=">"></a>`
+Note: it also skips something like tags: `<>`, `<!>`, etc.
+Note: tag without end is skipped to the end of input: `<hello   `
+5. HTML and XML entities are not decoded. They must be processed by separate function.
+6. Whitespaces in the text are collapsed or inserted by specific rules.
+    - Whitespaces at the beginning and at the end are removed.
+    - Consecutive whitespaces are collapsed.
+    - But if the text is separated by other elements and there is no whitespace, it is inserted.
+    - It may cause unnatural examples: `Hello<b>world</b>`, `Hello<!-- -->world` - there is no whitespace in HTML, but the function inserts it. Also consider: `Hello<p>world</p>`, `Hello<br>world`. This behavior is reasonable for data analysis, e.g. to convert HTML to a bag of words.
+7. Also note that correct handling of whitespaces requires the support of `<pre></pre>` and CSS `display` and `white-space` properties.
+
+**Syntax**
+
+``` sql
+extractTextFromHTML(x)
+```
+
+**Arguments**
+
+-   `x` — input text. [String](../../sql-reference/data-types/string.md). 
+
+**Returned value**
+
+-   Extracted text.
+
+Type: [String](../../sql-reference/data-types/string.md).
+
+**Example**
+
+The first example contains several tags and a comment and also shows whitespace processing.
+The second example shows `CDATA` and `script` tag processing.
+In the third example text is extracted from the full HTML response received by the [url](../../sql-reference/table-functions/url.md) function.
+
+Query:
+
+``` sql
+SELECT extractTextFromHTML(' <p> A text <i>with</i><b>tags</b>. <!-- comments --> </p> ');
+SELECT extractTextFromHTML('<![CDATA[The content within <b>CDATA</b>]]> <script>alert("Script");</script>');
+SELECT extractTextFromHTML(html) FROM url('http://www.donothingfor2minutes.com/', RawBLOB, 'html String');
+```
+
+Result:
+
+``` text
+A text with tags .
+The content within <b>CDATA</b>
+Do Nothing for 2 Minutes 2:00 &nbsp;
+```
diff --git a/docs/en/sql-reference/functions/string-replace-functions.md b/docs/en/sql-reference/functions/string-replace-functions.md
index 8905500995c..144b4fbc1da 100644
--- a/docs/en/sql-reference/functions/string-replace-functions.md
+++ b/docs/en/sql-reference/functions/string-replace-functions.md
@@ -92,4 +92,3 @@ Predefined characters: `\0`, `\\`, `|`, `(`, `)`, `^`, `$`, `.`, `[`, `]`, `?`,
 This implementation slightly differs from re2::RE2::QuoteMeta. It escapes zero byte as `\0` instead of `\x00` and it escapes only required characters.
 For more information, see the link: [RE2](https://github.com/google/re2/blob/master/re2/re2.cc#L473)
 
-[Original article](https://clickhouse.tech/docs/en/query_language/functions/string_replace_functions/) <!--hide-->
diff --git a/docs/en/sql-reference/functions/string-search-functions.md b/docs/en/sql-reference/functions/string-search-functions.md
index 83b0edea438..01b1dd2d004 100644
--- a/docs/en/sql-reference/functions/string-search-functions.md
+++ b/docs/en/sql-reference/functions/string-search-functions.md
@@ -12,7 +12,9 @@ The search is case-sensitive by default in all these functions. There are separa
 
 ## position(haystack, needle), locate(haystack, needle) {#position}
 
-Returns the position (in bytes) of the found substring in the string, starting from 1.
+Searches for the substring `needle` in the string `haystack`.
+
+Returns the position (in bytes) of the found substring in the string, starting from 1. 
 
 For a case-insensitive search, use the function [positionCaseInsensitive](#positioncaseinsensitive).
 
@@ -20,15 +22,22 @@ For a case-insensitive search, use the function [positionCaseInsensitive](#posit
 
 ``` sql
 position(haystack, needle[, start_pos])
-```
+``` 
+
+``` sql
+position(needle IN haystack)
+``` 
 
 Alias: `locate(haystack, needle[, start_pos])`.
 
+!!! note "Note"
+    Syntax of `position(needle IN haystack)` provides SQL-compatibility, the function works the same way as to `position(haystack, needle)`.
+
 **Arguments**
 
--   `haystack` — string, in which substring will to be searched. [String](../../sql-reference/syntax.md#syntax-string-literal).
--   `needle` — substring to be searched. [String](../../sql-reference/syntax.md#syntax-string-literal).
--   `start_pos` – Optional parameter, position of the first character in the string to start search. [UInt](../../sql-reference/data-types/int-uint.md)
+-   `haystack` — String, in which substring will to be searched. [String](../../sql-reference/syntax.md#syntax-string-literal).
+-   `needle` — Substring to be searched. [String](../../sql-reference/syntax.md#syntax-string-literal).
+-   `start_pos` – Position of the first character in the string to start search. [UInt](../../sql-reference/data-types/int-uint.md). Optional.
 
 **Returned values**
 
@@ -44,7 +53,7 @@ The phrase “Hello, world!” contains a set of bytes representing a single-byt
 Query:
 
 ``` sql
-SELECT position('Hello, world!', '!')
+SELECT position('Hello, world!', '!');
 ```
 
 Result:
@@ -72,7 +81,7 @@ The same phrase in Russian contains characters which can’t be represented usin
 Query:
 
 ``` sql
-SELECT position('Привет, мир!', '!')
+SELECT position('Привет, мир!', '!');
 ```
 
 Result:
@@ -83,6 +92,36 @@ Result:
 └───────────────────────────────┘
 ```
 
+**Examples for POSITION(needle IN haystack) syntax**
+
+Query:
+
+```sql
+SELECT 3 = position('c' IN 'abc');
+```
+
+Result:
+
+```text
+┌─equals(3, position('abc', 'c'))─┐
+│                               1 │
+└─────────────────────────────────┘
+```
+
+Query:
+
+```sql
+SELECT 6 = position('/' IN s) FROM (SELECT 'Hello/World' AS s);
+```
+
+Result:
+
+```text
+┌─equals(6, position(s, '/'))─┐
+│                           1 │
+└─────────────────────────────┘
+```
+
 ## positionCaseInsensitive {#positioncaseinsensitive}
 
 The same as [position](#position) returns the position (in bytes) of the found substring in the string, starting from 1. Use the function for a case-insensitive search.
@@ -97,9 +136,9 @@ positionCaseInsensitive(haystack, needle[, start_pos])
 
 **Arguments**
 
--   `haystack` — string, in which substring will to be searched. [String](../../sql-reference/syntax.md#syntax-string-literal).
--   `needle` — substring to be searched. [String](../../sql-reference/syntax.md#syntax-string-literal).
--   `start_pos` – Optional parameter, position of the first character in the string to start search. [UInt](../../sql-reference/data-types/int-uint.md)
+-   `haystack` — String, in which substring will to be searched. [String](../../sql-reference/syntax.md#syntax-string-literal).
+-   `needle` — Substring to be searched. [String](../../sql-reference/syntax.md#syntax-string-literal).
+-   `start_pos` — Optional parameter, position of the first character in the string to start search. [UInt](../../sql-reference/data-types/int-uint.md).
 
 **Returned values**
 
@@ -113,7 +152,7 @@ Type: `Integer`.
 Query:
 
 ``` sql
-SELECT positionCaseInsensitive('Hello, world!', 'hello')
+SELECT positionCaseInsensitive('Hello, world!', 'hello');
 ```
 
 Result:
@@ -140,9 +179,9 @@ positionUTF8(haystack, needle[, start_pos])
 
 **Arguments**
 
--   `haystack` — string, in which substring will to be searched. [String](../../sql-reference/syntax.md#syntax-string-literal).
--   `needle` — substring to be searched. [String](../../sql-reference/syntax.md#syntax-string-literal).
--   `start_pos` – Optional parameter, position of the first character in the string to start search. [UInt](../../sql-reference/data-types/int-uint.md)
+-   `haystack` — String, in which substring will to be searched. [String](../../sql-reference/syntax.md#syntax-string-literal).
+-   `needle` — Substring to be searched. [String](../../sql-reference/syntax.md#syntax-string-literal).
+-   `start_pos` — Optional parameter, position of the first character in the string to start search. [UInt](../../sql-reference/data-types/int-uint.md)
 
 **Returned values**
 
@@ -158,7 +197,7 @@ The phrase “Hello, world!” in Russian contains a set of Unicode points repre
 Query:
 
 ``` sql
-SELECT positionUTF8('Привет, мир!', '!')
+SELECT positionUTF8('Привет, мир!', '!');
 ```
 
 Result:
@@ -174,7 +213,7 @@ The phrase “Salut, étudiante!”, where character `é` can be represented usi
 Query for the letter `é`, which is represented one Unicode point `U+00E9`:
 
 ``` sql
-SELECT positionUTF8('Salut, étudiante!', '!')
+SELECT positionUTF8('Salut, étudiante!', '!');
 ```
 
 Result:
@@ -188,7 +227,7 @@ Result:
 Query for the letter `é`, which is represented two Unicode points `U+0065U+0301`:
 
 ``` sql
-SELECT positionUTF8('Salut, étudiante!', '!')
+SELECT positionUTF8('Salut, étudiante!', '!');
 ```
 
 Result:
@@ -213,9 +252,9 @@ positionCaseInsensitiveUTF8(haystack, needle[, start_pos])
 
 **Arguments**
 
--   `haystack` — string, in which substring will to be searched. [String](../../sql-reference/syntax.md#syntax-string-literal).
--   `needle` — substring to be searched. [String](../../sql-reference/syntax.md#syntax-string-literal).
--   `start_pos` – Optional parameter, position of the first character in the string to start search. [UInt](../../sql-reference/data-types/int-uint.md)
+-   `haystack` — String, in which substring will to be searched. [String](../../sql-reference/syntax.md#syntax-string-literal).
+-   `needle` — Substring to be searched. [String](../../sql-reference/syntax.md#syntax-string-literal).
+-   `start_pos` — Optional parameter, position of the first character in the string to start search. [UInt](../../sql-reference/data-types/int-uint.md)
 
 **Returned value**
 
@@ -229,7 +268,7 @@ Type: `Integer`.
 Query:
 
 ``` sql
-SELECT positionCaseInsensitiveUTF8('Привет, мир!', 'Мир')
+SELECT positionCaseInsensitiveUTF8('Привет, мир!', 'Мир');
 ```
 
 Result:
@@ -258,8 +297,8 @@ multiSearchAllPositions(haystack, [needle1, needle2, ..., needlen])
 
 **Arguments**
 
--   `haystack` — string, in which substring will to be searched. [String](../../sql-reference/syntax.md#syntax-string-literal).
--   `needle` — substring to be searched. [String](../../sql-reference/syntax.md#syntax-string-literal).
+-   `haystack` — String, in which substring will to be searched. [String](../../sql-reference/syntax.md#syntax-string-literal).
+-   `needle` — Substring to be searched. [String](../../sql-reference/syntax.md#syntax-string-literal).
 
 **Returned values**
 
@@ -270,7 +309,7 @@ multiSearchAllPositions(haystack, [needle1, needle2, ..., needlen])
 Query:
 
 ``` sql
-SELECT multiSearchAllPositions('Hello, World!', ['hello', '!', 'world'])
+SELECT multiSearchAllPositions('Hello, World!', ['hello', '!', 'world']);
 ```
 
 Result:
@@ -387,7 +426,7 @@ If `haystack` doesn’t match the `pattern` regex, an array of empty arrays is r
 Query:
 
 ``` sql
-SELECT extractAllGroupsHorizontal('abc=111, def=222, ghi=333', '("[^"]+"|\\w+)=("[^"]+"|\\w+)')
+SELECT extractAllGroupsHorizontal('abc=111, def=222, ghi=333', '("[^"]+"|\\w+)=("[^"]+"|\\w+)');
 ```
 
 Result:
@@ -428,7 +467,7 @@ If `haystack` doesn’t match the `pattern` regex, an empty array is returned.
 Query:
 
 ``` sql
-SELECT extractAllGroupsVertical('abc=111, def=222, ghi=333', '("[^"]+"|\\w+)=("[^"]+"|\\w+)')
+SELECT extractAllGroupsVertical('abc=111, def=222, ghi=333', '("[^"]+"|\\w+)=("[^"]+"|\\w+)');
 ```
 
 Result:
@@ -506,7 +545,7 @@ Input table:
 Query:
 
 ``` sql
-SELECT * FROM Months WHERE ilike(name, '%j%')
+SELECT * FROM Months WHERE ilike(name, '%j%');
 ```
 
 Result:
@@ -618,7 +657,7 @@ countSubstringsCaseInsensitive(haystack, needle[, start_pos])
 
 -   `haystack` — The string to search in. [String](../../sql-reference/syntax.md#syntax-string-literal).
 -   `needle` — The substring to search for. [String](../../sql-reference/syntax.md#syntax-string-literal).
--   `start_pos` – Position of the first character in the string to start search. Optional. [UInt](../../sql-reference/data-types/int-uint.md).
+-   `start_pos` — Position of the first character in the string to start search. Optional. [UInt](../../sql-reference/data-types/int-uint.md).
 
 **Returned values**
 
@@ -631,7 +670,7 @@ Type: [UInt64](../../sql-reference/data-types/int-uint.md).
 Query:
 
 ``` sql
-select countSubstringsCaseInsensitive('aba', 'B');
+SELECT countSubstringsCaseInsensitive('aba', 'B');
 ```
 
 Result:
@@ -684,7 +723,7 @@ SELECT countSubstringsCaseInsensitiveUTF8(haystack, needle[, start_pos])
 
 -   `haystack` — The string to search in. [String](../../sql-reference/syntax.md#syntax-string-literal).
 -   `needle` — The substring to search for. [String](../../sql-reference/syntax.md#syntax-string-literal).
--   `start_pos` – Position of the first character in the string to start search. Optional. [UInt](../../sql-reference/data-types/int-uint.md).
+-   `start_pos` — Position of the first character in the string to start search. Optional. [UInt](../../sql-reference/data-types/int-uint.md).
 
 **Returned values**
 
@@ -772,5 +811,3 @@ Result:
 │                             2 │
 └───────────────────────────────┘
 ```
-
-[Original article](https://clickhouse.tech/docs/en/query_language/functions/string_search_functions/) <!--hide-->
diff --git a/docs/en/sql-reference/functions/tuple-functions.md b/docs/en/sql-reference/functions/tuple-functions.md
index 1006b68b8ee..86442835425 100644
--- a/docs/en/sql-reference/functions/tuple-functions.md
+++ b/docs/en/sql-reference/functions/tuple-functions.md
@@ -47,7 +47,7 @@ You can use the `EXCEPT` expression to skip columns as a result of the query.
 
 **Arguments**
 
--   `x` - A `tuple` function, column, or tuple of elements. [Tuple](../../sql-reference/data-types/tuple.md).
+-   `x` — A `tuple` function, column, or tuple of elements. [Tuple](../../sql-reference/data-types/tuple.md).
 
 **Returned value**
 
@@ -111,4 +111,55 @@ Result:
 
 -   [Tuple](../../sql-reference/data-types/tuple.md)
 
-[Original article](https://clickhouse.tech/docs/en/sql-reference/functions/tuple-functions/) <!--hide-->
+## tupleHammingDistance {#tuplehammingdistance}
+
+Returns the [Hamming Distance](https://en.wikipedia.org/wiki/Hamming_distance) between two tuples of the same size.
+
+**Syntax**
+
+``` sql
+tupleHammingDistance(tuple1, tuple2)
+```
+
+**Arguments**
+
+-   `tuple1` — First tuple. [Tuple](../../sql-reference/data-types/tuple.md).
+-   `tuple2` — Second tuple. [Tuple](../../sql-reference/data-types/tuple.md).
+
+Tuples should have the same type of the elements.
+
+**Returned value**
+
+-   The Hamming distance.
+
+Type: [UInt8](../../sql-reference/data-types/int-uint.md).
+
+**Examples**
+
+Query:
+
+``` sql
+SELECT tupleHammingDistance((1, 2, 3), (3, 2, 1)) AS HammingDistance;
+```
+
+Result:
+
+``` text
+┌─HammingDistance─┐
+│               2 │
+└─────────────────┘
+```
+
+Can be used with [MinHash](../../sql-reference/functions/hash-functions.md#ngramminhash) functions for detection of semi-duplicate strings:
+
+``` sql
+SELECT tupleHammingDistance(wordShingleMinHash(string), wordShingleMinHashCaseInsensitive(string)) as HammingDistance FROM (SELECT 'Clickhouse is a column-oriented database management system for online analytical processing of queries.' AS string);
+```
+
+Result:
+
+``` text
+┌─HammingDistance─┐
+│               2 │
+└─────────────────┘
+```
diff --git a/docs/en/sql-reference/functions/tuple-map-functions.md b/docs/en/sql-reference/functions/tuple-map-functions.md
index 2b3a9d9103f..8b0710c0182 100644
--- a/docs/en/sql-reference/functions/tuple-map-functions.md
+++ b/docs/en/sql-reference/functions/tuple-map-functions.md
@@ -66,7 +66,6 @@ Result:
 
 -   [Map(key, value)](../../sql-reference/data-types/map.md) data type
 
-
 ## mapAdd {#function-mapadd}
 
 Collect all the keys and sum corresponding values.
@@ -174,4 +173,129 @@ Result:
 └──────────────────────────────┴───────────────────────────────────┘
 ```
 
+## mapContains {#mapcontains}
+
+Determines  whether the `map` contains the `key` parameter.
+
+**Syntax**
+
+``` sql
+mapContains(map, key)
+```
+
+**Parameters** 
+
+-   `map` — Map. [Map](../../sql-reference/data-types/map.md).
+-   `key` — Key. Type matches the type of keys of `map` parameter.
+
+**Returned value**
+
+-   `1` if `map` contains `key`, `0` if not.
+
+Type: [UInt8](../../sql-reference/data-types/int-uint.md).
+
+**Example**
+
+Query:
+
+```sql
+CREATE TABLE test (a Map(String,String)) ENGINE = Memory;
+
+INSERT INTO test VALUES ({'name':'eleven','age':'11'}), ({'number':'twelve','position':'6.0'});
+
+SELECT mapContains(a, 'name') FROM test;
+
+```
+
+Result:
+
+```text
+┌─mapContains(a, 'name')─┐
+│                      1 │
+│                      0 │
+└────────────────────────┘
+```
+
+## mapKeys {#mapkeys}
+
+Returns all keys from the `map` parameter.
+
+**Syntax**
+
+```sql
+mapKeys(map)
+```
+
+**Parameters**
+
+-   `map` — Map. [Map](../../sql-reference/data-types/map.md).
+
+**Returned value**
+
+-   Array containing all keys from the `map`.
+
+Type: [Array](../../sql-reference/data-types/array.md).
+
+**Example**
+
+Query:
+
+```sql
+CREATE TABLE test (a Map(String,String)) ENGINE = Memory;
+
+INSERT INTO test VALUES ({'name':'eleven','age':'11'}), ({'number':'twelve','position':'6.0'});
+
+SELECT mapKeys(a) FROM test;
+```
+
+Result:
+
+```text
+┌─mapKeys(a)────────────┐
+│ ['name','age']        │
+│ ['number','position'] │
+└───────────────────────┘
+```
+
+## mapValues {#mapvalues}
+
+Returns all values from the `map` parameter.
+
+**Syntax**
+
+```sql
+mapKeys(map)
+```
+
+**Parameters**
+
+-   `map` — Map. [Map](../../sql-reference/data-types/map.md).
+
+**Returned value**
+
+-   Array containing all the values from `map`.
+
+Type: [Array](../../sql-reference/data-types/array.md).
+
+**Example**
+
+Query:
+
+```sql
+CREATE TABLE test (a Map(String,String)) ENGINE = Memory;
+
+INSERT INTO test VALUES ({'name':'eleven','age':'11'}), ({'number':'twelve','position':'6.0'});
+
+SELECT mapValues(a) FROM test;
+```
+
+Result:
+
+```text
+┌─mapValues(a)─────┐
+│ ['eleven','11']  │
+│ ['twelve','6.0'] │
+└──────────────────┘
+```
+
 [Original article](https://clickhouse.tech/docs/en/sql-reference/functions/tuple-map-functions/) <!--hide-->
diff --git a/docs/en/sql-reference/functions/type-conversion-functions.md b/docs/en/sql-reference/functions/type-conversion-functions.md
index 0ea2bf0f1a6..d8d13d81d97 100644
--- a/docs/en/sql-reference/functions/type-conversion-functions.md
+++ b/docs/en/sql-reference/functions/type-conversion-functions.md
@@ -36,10 +36,14 @@ The behavior of functions for the [NaN and Inf](../../sql-reference/data-types/f
 
 **Example**
 
+Query:
+
 ``` sql
-SELECT toInt64(nan), toInt32(32), toInt16('16'), toInt8(8.8)
+SELECT toInt64(nan), toInt32(32), toInt16('16'), toInt8(8.8);
 ```
 
+Result:
+
 ``` text
 ┌─────────toInt64(nan)─┬─toInt32(32)─┬─toInt16('16')─┬─toInt8(8.8)─┐
 │ -9223372036854775808 │          32 │            16 │           8 │
@@ -52,10 +56,14 @@ It takes an argument of type String and tries to parse it into Int (8 \| 16 \| 3
 
 **Example**
 
+Query:
+
 ``` sql
-select toInt64OrZero('123123'), toInt8OrZero('123qwe123')
+SELECT toInt64OrZero('123123'), toInt8OrZero('123qwe123');
 ```
 
+Result:
+
 ``` text
 ┌─toInt64OrZero('123123')─┬─toInt8OrZero('123qwe123')─┐
 │                  123123 │                         0 │
@@ -68,10 +76,14 @@ It takes an argument of type String and tries to parse it into Int (8 \| 16 \| 3
 
 **Example**
 
+Query:
+
 ``` sql
-select toInt64OrNull('123123'), toInt8OrNull('123qwe123')
+SELECT toInt64OrNull('123123'), toInt8OrNull('123qwe123');
 ```
 
+Result:
+
 ``` text
 ┌─toInt64OrNull('123123')─┬─toInt8OrNull('123qwe123')─┐
 │                  123123 │                      ᴺᵁᴸᴸ │
@@ -102,10 +114,14 @@ The behavior of functions for negative agruments and for the [NaN and Inf](../..
 
 **Example**
 
+Query:
+
 ``` sql
-SELECT toUInt64(nan), toUInt32(-32), toUInt16('16'), toUInt8(8.8)
+SELECT toUInt64(nan), toUInt32(-32), toUInt16('16'), toUInt8(8.8);
 ```
 
+Result:
+
 ``` text
 ┌───────toUInt64(nan)─┬─toUInt32(-32)─┬─toUInt16('16')─┬─toUInt8(8.8)─┐
 │ 9223372036854775808 │    4294967264 │             16 │            8 │
@@ -124,6 +140,8 @@ SELECT toUInt64(nan), toUInt32(-32), toUInt16('16'), toUInt8(8.8)
 
 ## toDate {#todate}
 
+Alias: `DATE`.
+
 ## toDateOrZero {#todateorzero}
 
 ## toDateOrNull {#todateornull}
@@ -168,20 +186,28 @@ A value in the `Nullable(Decimal(P,S))` data type. The value contains:
 
 **Examples**
 
+Query:
+
 ``` sql
-SELECT toDecimal32OrNull(toString(-1.111), 5) AS val, toTypeName(val)
+SELECT toDecimal32OrNull(toString(-1.111), 5) AS val, toTypeName(val);
 ```
 
+Result:
+
 ``` text
 ┌──────val─┬─toTypeName(toDecimal32OrNull(toString(-1.111), 5))─┐
 │ -1.11100 │ Nullable(Decimal(9, 5))                            │
 └──────────┴────────────────────────────────────────────────────┘
 ```
 
+Query:
+
 ``` sql
-SELECT toDecimal32OrNull(toString(-1.111), 2) AS val, toTypeName(val)
+SELECT toDecimal32OrNull(toString(-1.111), 2) AS val, toTypeName(val);
 ```
 
+Result:
+
 ``` text
 ┌──val─┬─toTypeName(toDecimal32OrNull(toString(-1.111), 2))─┐
 │ ᴺᵁᴸᴸ │ Nullable(Decimal(9, 2))                            │
@@ -213,20 +239,28 @@ A value in the `Nullable(Decimal(P,S))` data type. The value contains:
 
 **Example**
 
+Query:
+
 ``` sql
-SELECT toDecimal32OrZero(toString(-1.111), 5) AS val, toTypeName(val)
+SELECT toDecimal32OrZero(toString(-1.111), 5) AS val, toTypeName(val);
 ```
 
+Result:
+
 ``` text
 ┌──────val─┬─toTypeName(toDecimal32OrZero(toString(-1.111), 5))─┐
 │ -1.11100 │ Decimal(9, 5)                                      │
 └──────────┴────────────────────────────────────────────────────┘
 ```
 
+Query:
+
 ``` sql
-SELECT toDecimal32OrZero(toString(-1.111), 2) AS val, toTypeName(val)
+SELECT toDecimal32OrZero(toString(-1.111), 2) AS val, toTypeName(val);
 ```
 
+Result:
+
 ``` text
 ┌──val─┬─toTypeName(toDecimal32OrZero(toString(-1.111), 2))─┐
 │ 0.00 │ Decimal(9, 2)                                      │
@@ -258,12 +292,18 @@ Conversion between numeric types uses the same rules as assignments between diff
 
 Additionally, the toString function of the DateTime argument can take a second String argument containing the name of the time zone. Example: `Asia/Yekaterinburg` In this case, the time is formatted according to the specified time zone.
 
+**Example**
+
+Query:
+
 ``` sql
 SELECT
     now() AS now_local,
-    toString(now(), 'Asia/Yekaterinburg') AS now_yekat
+    toString(now(), 'Asia/Yekaterinburg') AS now_yekat;
 ```
 
+Result:
+
 ``` text
 ┌───────────now_local─┬─now_yekat───────────┐
 │ 2016-06-15 00:11:21 │ 2016-06-15 02:11:21 │
@@ -281,76 +321,159 @@ If the string has fewer bytes than N, it is padded with null bytes to the right.
 
 Accepts a String or FixedString argument. Returns the String with the content truncated at the first zero byte found.
 
-Example:
+**Example**
+
+Query:
 
 ``` sql
-SELECT toFixedString('foo', 8) AS s, toStringCutToZero(s) AS s_cut
+SELECT toFixedString('foo', 8) AS s, toStringCutToZero(s) AS s_cut;
 ```
 
+Result:
+
 ``` text
 ┌─s─────────────┬─s_cut─┐
 │ foo\0\0\0\0\0 │ foo   │
 └───────────────┴───────┘
 ```
 
+Query:
+
 ``` sql
-SELECT toFixedString('foo\0bar', 8) AS s, toStringCutToZero(s) AS s_cut
+SELECT toFixedString('foo\0bar', 8) AS s, toStringCutToZero(s) AS s_cut;
 ```
 
+Result:
+
 ``` text
 ┌─s──────────┬─s_cut─┐
 │ foo\0bar\0 │ foo   │
 └────────────┴───────┘
 ```
 
-## reinterpret(x, T) {#type_conversion_function-reinterpret}
+## reinterpretAsUInt(8\|16\|32\|64) {#reinterpretasuint8163264}
 
-Performs byte reinterpretation of ‘x’ as ‘t’ data type.
+## reinterpretAsInt(8\|16\|32\|64) {#reinterpretasint8163264}
 
-Following reinterpretations are allowed:
-1. Any type that has fixed size and value of that type can be represented continuously into FixedString.
-2. Any type that if value of that type can be represented continuously into String. Null bytes are dropped from the end. For example, a UInt32 type value of 255 is a string that is one byte long.
-3. FixedString, String, types that can be interpreted as numeric (Integers, Float, Date, DateTime, UUID) into types that can be interpreted as numeric (Integers, Float, Date, DateTime, UUID) into FixedString,
+## reinterpretAsFloat(32\|64) {#reinterpretasfloat3264}
+
+## reinterpretAsDate {#reinterpretasdate}
+
+## reinterpretAsDateTime {#reinterpretasdatetime}
+
+These functions accept a string and interpret the bytes placed at the beginning of the string as a number in host order (little endian). If the string isn’t long enough, the functions work as if the string is padded with the necessary number of null bytes. If the string is longer than needed, the extra bytes are ignored. A date is interpreted as the number of days since the beginning of the Unix Epoch, and a date with time is interpreted as the number of seconds since the beginning of the Unix Epoch.
+
+## reinterpretAsString {#type_conversion_functions-reinterpretAsString}
+
+This function accepts a number or date or date with time, and returns a string containing bytes representing the corresponding value in host order (little endian). Null bytes are dropped from the end. For example, a UInt32 type value of 255 is a string that is one byte long.
+
+## reinterpretAsFixedString {#reinterpretasfixedstring}
+
+This function accepts a number or date or date with time, and returns a FixedString containing bytes representing the corresponding value in host order (little endian). Null bytes are dropped from the end. For example, a UInt32 type value of 255 is a FixedString that is one byte long.
+
+## reinterpretAsUUID {#reinterpretasuuid}
+
+This function accepts 16 bytes string, and returns UUID containing bytes representing the corresponding value in network byte order (big-endian). If the string isn't long enough, the functions work as if the string is padded with the necessary number of null bytes to the end. If the string longer than 16 bytes, the extra bytes at the end are ignored. 
+
+**Syntax**
 
 ``` sql
+reinterpretAsUUID(fixed_string)
+```
+
+**Arguments**
+
+-   `fixed_string` — Big-endian byte string. [FixedString](../../sql-reference/data-types/fixedstring.md#fixedstring).
+
+**Returned value**
+
+-   The UUID type value. [UUID](../../sql-reference/data-types/uuid.md#uuid-data-type).
+
+**Examples**
+
+String to UUID.
+
+Query:
+
+``` sql
+SELECT reinterpretAsUUID(reverse(unhex('000102030405060708090a0b0c0d0e0f')));
+```
+
+Result:
+
+``` text
+┌─reinterpretAsUUID(reverse(unhex('000102030405060708090a0b0c0d0e0f')))─┐
+│                                  08090a0b-0c0d-0e0f-0001-020304050607 │
+└───────────────────────────────────────────────────────────────────────┘
+```
+
+Going back and forth from String to UUID.
+
+Query:
+
+``` sql
+WITH
+    generateUUIDv4() AS uuid,
+    identity(lower(hex(reverse(reinterpretAsString(uuid))))) AS str,
+    reinterpretAsUUID(reverse(unhex(str))) AS uuid2
+SELECT uuid = uuid2;
+```
+
+Result:
+
+``` text
+┌─equals(uuid, uuid2)─┐
+│                   1 │
+└─────────────────────┘
+```
+
+## reinterpret(x, T) {#type_conversion_function-reinterpret}
+
+Use the same source in-memory bytes sequence for `x` value and reinterpret it to destination type
+
+Query:
+```sql
 SELECT reinterpret(toInt8(-1), 'UInt8') as int_to_uint,
     reinterpret(toInt8(1), 'Float32') as int_to_float,
     reinterpret('1', 'UInt32') as string_to_int;
 ```
 
-``` text
+Result:
+
+```
 ┌─int_to_uint─┬─int_to_float─┬─string_to_int─┐
 │         255 │        1e-45 │            49 │
 └─────────────┴──────────────┴───────────────┘
 ```
 
-## reinterpretAsUInt(8\|16\|32\|64\|256) {#reinterpretAsUInt8163264256}
-
-## reinterpretAsInt(8\|16\|32\|64\|128\|256) {#reinterpretAsInt8163264128256}
-
-## reinterpretAsDecimal(32\|64\|128\|256) {#reinterpretAsDecimal3264128256}
-
-## reinterpretAsFloat(32\|64) {#type_conversion_function-reinterpretAsFloat}
-
-## reinterpretAsDate {#type_conversion_function-reinterpretAsDate}
-
-## reinterpretAsDateTime {#type_conversion_function-reinterpretAsDateTime}
-
-## reinterpretAsDateTime64 {#type_conversion_function-reinterpretAsDateTime64}
-
-## reinterpretAsString {#type_conversion_function-reinterpretAsString}
-
-## reinterpretAsFixedString {#type_conversion_function-reinterpretAsFixedString}
-
-## reinterpretAsUUID {#type_conversion_function-reinterpretAsUUID}
-
-These functions are aliases for `reinterpret` function.
-
 ## CAST(x, T) {#type_conversion_function-cast}
 
-Converts ‘x’ to the ‘t’ data type. The syntax CAST(x AS t) is also supported.
+Converts input value `x` to the `T` data type. Unlike to `reinterpret` function use external representation of `x` value. 
 
-Example:
+The syntax `CAST(x AS t)` is also supported.
+
+Note, that if value `x` does not fit the bounds of type T, the function overflows. For example, CAST(-1, 'UInt8') returns 255.
+
+**Examples**
+
+Query:
+
+```sql
+SELECT
+    cast(toInt8(-1), 'UInt8') AS cast_int_to_uint,
+    cast(toInt8(1), 'Float32') AS cast_int_to_float,
+    cast('1', 'UInt32') AS cast_string_to_int
+```
+
+Result:
+
+```
+┌─cast_int_to_uint─┬─cast_int_to_float─┬─cast_string_to_int─┐
+│              255 │                 1 │                  1 │
+└──────────────────┴───────────────────┴────────────────────┘
+```
+
+Query:
 
 ``` sql
 SELECT
@@ -358,9 +481,11 @@ SELECT
     CAST(timestamp AS DateTime) AS datetime,
     CAST(timestamp AS Date) AS date,
     CAST(timestamp, 'String') AS string,
-    CAST(timestamp, 'FixedString(22)') AS fixed_string
+    CAST(timestamp, 'FixedString(22)') AS fixed_string;
 ```
 
+Result:
+
 ``` text
 ┌─timestamp───────────┬────────────datetime─┬───────date─┬─string──────────────┬─fixed_string──────────────┐
 │ 2016-06-15 23:00:00 │ 2016-06-15 23:00:00 │ 2016-06-15 │ 2016-06-15 23:00:00 │ 2016-06-15 23:00:00\0\0\0 │
@@ -369,12 +494,18 @@ SELECT
 
 Conversion to FixedString(N) only works for arguments of type String or FixedString(N).
 
-Type conversion to [Nullable](../../sql-reference/data-types/nullable.md) and back is supported. Example:
+Type conversion to [Nullable](../../sql-reference/data-types/nullable.md) and back is supported. 
+
+**Example**
+
+Query:
 
 ``` sql
-SELECT toTypeName(x) FROM t_null
+SELECT toTypeName(x) FROM t_null;
 ```
 
+Result:
+
 ``` text
 ┌─toTypeName(x)─┐
 │ Int8          │
@@ -382,10 +513,14 @@ SELECT toTypeName(x) FROM t_null
 └───────────────┘
 ```
 
+Query:
+
 ``` sql
-SELECT toTypeName(CAST(x, 'Nullable(UInt16)')) FROM t_null
+SELECT toTypeName(CAST(x, 'Nullable(UInt16)')) FROM t_null;
 ```
 
+Result:
+
 ``` text
 ┌─toTypeName(CAST(x, 'Nullable(UInt16)'))─┐
 │ Nullable(UInt16)                        │
@@ -399,15 +534,19 @@ SELECT toTypeName(CAST(x, 'Nullable(UInt16)')) FROM t_null
 
 ## accurateCast(x, T) {#type_conversion_function-accurate-cast}
 
-Converts ‘x’ to the ‘t’ data type. The differente from cast(x, T) is that accurateCast
-does not allow overflow of numeric types during cast if type value x does not fit
-bounds of type T.
+Converts `x` to the `T` data type. 
+
+The difference from [cast(x, T)](#type_conversion_function-cast) is that `accurateCast` does not allow overflow of numeric types during cast if type value `x` does not fit the bounds of type `T`. For example, `accurateCast(-1, 'UInt8')` throws an exception.
+
+**Example**
+
+Query:
 
-Example
 ``` sql
 SELECT cast(-1, 'UInt8') as uint8;
 ```
 
+Result:
 
 ``` text
 ┌─uint8─┐
@@ -415,38 +554,46 @@ SELECT cast(-1, 'UInt8') as uint8;
 └───────┘
 ```
 
+Query:
+
 ```sql
 SELECT accurateCast(-1, 'UInt8') as uint8;
 ```
 
+Result:
+
 ``` text
 Code: 70. DB::Exception: Received from localhost:9000. DB::Exception: Value in column Int8 cannot be safely converted into type UInt8: While processing accurateCast(-1, 'UInt8') AS uint8.
-
 ```
 
 ## accurateCastOrNull(x, T) {#type_conversion_function-accurate-cast_or_null}
 
-Converts ‘x’ to the ‘t’ data type. Always returns nullable type and returns NULL
-if the casted value is not representable in the target type.
+Converts input value `x` to the specified data type `T`. Always returns [Nullable](../../sql-reference/data-types/nullable.md) type and returns [NULL](../../sql-reference/syntax.md#null-literal) if the casted value is not representable in the target type.
 
-Example:
+**Syntax**
+
+```sql
+accurateCastOrNull(x, T)
+```
+
+**Parameters**
+
+-   `x` — Input value.
+-   `T` — The name of the returned data type.
+
+**Returned value**
+
+-   The value, converted to the specified data type `T`.
+
+**Example**
+
+Query:
 
 ``` sql
-SELECT
-    accurateCastOrNull(-1, 'UInt8') as uint8,
-    accurateCastOrNull(128, 'Int8') as int8,
-    accurateCastOrNull('Test', 'FixedString(2)') as fixed_string
+SELECT toTypeName(accurateCastOrNull(5, 'UInt8'));
 ```
 
-``` text
-┌─uint8─┬─int8─┬─fixed_string─┐
-│  ᴺᵁᴸᴸ │ ᴺᵁᴸᴸ │ ᴺᵁᴸᴸ         │
-└───────┴──────┴──────────────┘┘
-```
-
-``` sql
-SELECT toTypeName(accurateCastOrNull(5, 'UInt8'))
-```
+Result:
 
 ``` text
 ┌─toTypeName(accurateCastOrNull(5, 'UInt8'))─┐
@@ -454,6 +601,23 @@ SELECT toTypeName(accurateCastOrNull(5, 'UInt8'))
 └────────────────────────────────────────────┘
 ```
 
+Query:
+
+``` sql
+SELECT
+    accurateCastOrNull(-1, 'UInt8') as uint8,
+    accurateCastOrNull(128, 'Int8') as int8,
+    accurateCastOrNull('Test', 'FixedString(2)') as fixed_string;
+```
+
+Result:
+
+``` text
+┌─uint8─┬─int8─┬─fixed_string─┐
+│  ᴺᵁᴸᴸ │ ᴺᵁᴸᴸ │ ᴺᵁᴸᴸ         │
+└───────┴──────┴──────────────┘
+```
+
 ## toInterval(Year\|Quarter\|Month\|Week\|Day\|Hour\|Minute\|Second) {#function-tointerval}
 
 Converts a Number type argument to an [Interval](../../sql-reference/data-types/special-data-types/interval.md) data type.
@@ -481,6 +645,8 @@ toIntervalYear(number)
 
 **Example**
 
+Query:
+
 ``` sql
 WITH
     toDate('2019-01-01') AS date,
@@ -488,9 +654,11 @@ WITH
     toIntervalWeek(1) AS interval_to_week
 SELECT
     date + interval_week,
-    date + interval_to_week
+    date + interval_to_week;
 ```
 
+Result:
+
 ``` text
 ┌─plus(date, interval_week)─┬─plus(date, interval_to_week)─┐
 │                2019-01-08 │                   2019-01-08 │
@@ -498,6 +666,7 @@ SELECT
 ```
 
 ## parseDateTimeBestEffort {#parsedatetimebesteffort}
+## parseDateTime32BestEffort {#parsedatetime32besteffort}
 
 Converts a date and time in the [String](../../sql-reference/data-types/string.md) representation to [DateTime](../../sql-reference/data-types/datetime.md#data_type-datetime) data type.
 
@@ -506,7 +675,7 @@ The function parses [ISO 8601](https://en.wikipedia.org/wiki/ISO_8601), [RFC 112
 **Syntax**
 
 ``` sql
-parseDateTimeBestEffort(time_string [, time_zone]);
+parseDateTimeBestEffort(time_string [, time_zone])
 ```
 
 **Arguments**
@@ -549,7 +718,7 @@ Query:
 
 ``` sql
 SELECT parseDateTimeBestEffort('Sat, 18 Aug 2018 07:22:16 GMT', 'Europe/Moscow')
-AS parseDateTimeBestEffort
+AS parseDateTimeBestEffort;
 ```
 
 Result:
@@ -564,7 +733,7 @@ Query:
 
 ``` sql
 SELECT parseDateTimeBestEffort('1284101485')
-AS parseDateTimeBestEffort
+AS parseDateTimeBestEffort;
 ```
 
 Result:
@@ -579,7 +748,7 @@ Query:
 
 ``` sql
 SELECT parseDateTimeBestEffort('2018-12-12 10:12:12')
-AS parseDateTimeBestEffort
+AS parseDateTimeBestEffort;
 ```
 
 Result:
@@ -593,7 +762,7 @@ Result:
 Query:
 
 ``` sql
-SELECT parseDateTimeBestEffort('10 20:19')
+SELECT parseDateTimeBestEffort('10 20:19');
 ```
 
 Result:
@@ -613,12 +782,12 @@ Result:
 
 ## parseDateTimeBestEffortUS {#parsedatetimebesteffortUS}
 
-This function is similar to [‘parseDateTimeBestEffort’](#parsedatetimebesteffort), the only difference is that this function prefers US date format (`MM/DD/YYYY` etc.) in case of ambiguity.
+This function is similar to [parseDateTimeBestEffort](#parsedatetimebesteffort), the only difference is that this function prefers US date format (`MM/DD/YYYY` etc.) in case of ambiguity.
 
 **Syntax**
 
 ``` sql
-parseDateTimeBestEffortUS(time_string [, time_zone]);
+parseDateTimeBestEffortUS(time_string [, time_zone])
 ```
 
 **Arguments**
@@ -686,13 +855,238 @@ Result:
 ```
 
 ## parseDateTimeBestEffortOrNull {#parsedatetimebesteffortornull}
+## parseDateTime32BestEffortOrNull {#parsedatetime32besteffortornull}
 
-Same as for [parseDateTimeBestEffort](#parsedatetimebesteffort) except that it returns null when it encounters a date format that cannot be processed.
+Same as for [parseDateTimeBestEffort](#parsedatetimebesteffort) except that it returns `NULL` when it encounters a date format that cannot be processed.
 
 ## parseDateTimeBestEffortOrZero {#parsedatetimebesteffortorzero}
+## parseDateTime32BestEffortOrZero {#parsedatetime32besteffortorzero}
 
 Same as for [parseDateTimeBestEffort](#parsedatetimebesteffort) except that it returns zero date or zero date time when it encounters a date format that cannot be processed.
 
+## parseDateTimeBestEffortUSOrNull {#parsedatetimebesteffortusornull}
+
+Same as [parseDateTimeBestEffortUS](#parsedatetimebesteffortUS) function except that it returns `NULL` when it encounters a date format that cannot be processed.
+
+**Syntax**
+
+``` sql
+parseDateTimeBestEffortUSOrNull(time_string[, time_zone])
+```
+
+**Parameters**
+
+-   `time_string` — String containing a date or date with time to convert. The date must be in the US date format (`MM/DD/YYYY`, etc). [String](../../sql-reference/data-types/string.md).
+-   `time_zone` — [Timezone](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone). The function parses `time_string` according to the timezone. Optional. [String](../../sql-reference/data-types/string.md).
+
+**Supported non-standard formats**
+
+-   A string containing 9..10 digit [unix timestamp](https://en.wikipedia.org/wiki/Unix_time).
+-   A string with a date and a time components: `YYYYMMDDhhmmss`, `MM/DD/YYYY hh:mm:ss`, `MM-DD-YY hh:mm`, `YYYY-MM-DD hh:mm:ss`, etc.
+-   A string with a date, but no time component: `YYYY`, `YYYYMM`, `YYYY*MM`, `MM/DD/YYYY`, `MM-DD-YY`, etc.
+-   A string with a day and time: `DD`, `DD hh`, `DD hh:mm`. In this case, `YYYY-MM` are substituted with `2000-01`.
+-   A string that includes date and time along with timezone offset information: `YYYY-MM-DD hh:mm:ss ±h:mm`, etc. For example, `2020-12-12 17:36:00 -5:00`.
+
+**Returned values**
+
+-   `time_string` converted to the [DateTime](../../sql-reference/data-types/datetime.md) data type.
+-   `NULL` if the input string cannot be converted to the `DateTime` data type.
+
+**Examples**
+
+Query:
+
+``` sql
+SELECT parseDateTimeBestEffortUSOrNull('02/10/2021 21:12:57') AS parseDateTimeBestEffortUSOrNull;
+```
+
+Result:
+
+``` text
+┌─parseDateTimeBestEffortUSOrNull─┐
+│             2021-02-10 21:12:57 │
+└─────────────────────────────────┘
+```
+
+Query:
+
+``` sql
+SELECT parseDateTimeBestEffortUSOrNull('02-10-2021 21:12:57 GMT', 'Europe/Moscow') AS parseDateTimeBestEffortUSOrNull;
+```
+
+Result:
+
+``` text
+┌─parseDateTimeBestEffortUSOrNull─┐
+│             2021-02-11 00:12:57 │
+└─────────────────────────────────┘
+```
+
+Query:
+
+``` sql
+SELECT parseDateTimeBestEffortUSOrNull('02.10.2021') AS parseDateTimeBestEffortUSOrNull;
+```
+
+Result:
+
+``` text
+┌─parseDateTimeBestEffortUSOrNull─┐
+│             2021-02-10 00:00:00 │
+└─────────────────────────────────┘
+```
+
+Query:
+
+``` sql
+SELECT parseDateTimeBestEffortUSOrNull('10.2021') AS parseDateTimeBestEffortUSOrNull;
+```
+
+Result:
+
+``` text
+┌─parseDateTimeBestEffortUSOrNull─┐
+│                            ᴺᵁᴸᴸ │
+└─────────────────────────────────┘
+```
+
+## parseDateTimeBestEffortUSOrZero {#parsedatetimebesteffortusorzero}
+
+Same as [parseDateTimeBestEffortUS](#parsedatetimebesteffortUS) function except that it returns zero date (`1970-01-01`) or zero date with time (`1970-01-01 00:00:00`) when it encounters a date format that cannot be processed.
+
+**Syntax**
+
+``` sql
+parseDateTimeBestEffortUSOrZero(time_string[, time_zone])
+```
+
+**Parameters**
+
+-   `time_string` — String containing a date or date with time to convert. The date must be in the US date format (`MM/DD/YYYY`, etc). [String](../../sql-reference/data-types/string.md).
+-   `time_zone` — [Timezone](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone). The function parses `time_string` according to the timezone. Optional. [String](../../sql-reference/data-types/string.md).
+
+**Supported non-standard formats**
+
+-   A string containing 9..10 digit [unix timestamp](https://en.wikipedia.org/wiki/Unix_time).
+-   A string with a date and a time components: `YYYYMMDDhhmmss`, `MM/DD/YYYY hh:mm:ss`, `MM-DD-YY hh:mm`, `YYYY-MM-DD hh:mm:ss`, etc.
+-   A string with a date, but no time component: `YYYY`, `YYYYMM`, `YYYY*MM`, `MM/DD/YYYY`, `MM-DD-YY`, etc.
+-   A string with a day and time: `DD`, `DD hh`, `DD hh:mm`. In this case, `YYYY-MM` are substituted with `2000-01`.
+-   A string that includes date and time along with timezone offset information: `YYYY-MM-DD hh:mm:ss ±h:mm`, etc. For example, `2020-12-12 17:36:00 -5:00`.
+
+**Returned values**
+
+-   `time_string` converted to the [DateTime](../../sql-reference/data-types/datetime.md) data type.
+-   Zero date or zero date with time if the input string cannot be converted to the `DateTime` data type.
+
+**Examples**
+
+Query:
+
+``` sql
+SELECT parseDateTimeBestEffortUSOrZero('02/10/2021 21:12:57') AS parseDateTimeBestEffortUSOrZero;
+```
+
+Result:
+
+``` text
+┌─parseDateTimeBestEffortUSOrZero─┐
+│             2021-02-10 21:12:57 │
+└─────────────────────────────────┘
+```
+
+Query:
+
+``` sql
+SELECT parseDateTimeBestEffortUSOrZero('02-10-2021 21:12:57 GMT', 'Europe/Moscow') AS parseDateTimeBestEffortUSOrZero;
+```
+
+Result:
+
+``` text
+┌─parseDateTimeBestEffortUSOrZero─┐
+│             2021-02-11 00:12:57 │
+└─────────────────────────────────┘
+```
+
+Query:
+
+``` sql
+SELECT parseDateTimeBestEffortUSOrZero('02.10.2021') AS parseDateTimeBestEffortUSOrZero;
+```
+
+Result:
+
+``` text
+┌─parseDateTimeBestEffortUSOrZero─┐
+│             2021-02-10 00:00:00 │
+└─────────────────────────────────┘
+```
+
+Query:
+
+``` sql
+SELECT parseDateTimeBestEffortUSOrZero('02.2021') AS parseDateTimeBestEffortUSOrZero;
+```
+
+Result:
+
+``` text
+┌─parseDateTimeBestEffortUSOrZero─┐
+│             1970-01-01 00:00:00 │
+└─────────────────────────────────┘
+```
+
+## parseDateTime64BestEffort {#parsedatetime64besteffort}
+
+Same as [parseDateTimeBestEffort](#parsedatetimebesteffort) function but also parse milliseconds and microseconds and return `DateTime64(3)` or `DateTime64(6)` data types.
+
+**Syntax**
+
+``` sql
+parseDateTime64BestEffort(time_string [, precision [, time_zone]])
+```
+
+**Parameters**
+
+-   `time_string` — String containing a date or date with time to convert. [String](../../sql-reference/data-types/string.md).
+-   `precision` — `3` for milliseconds, `6` for microseconds. Default `3`. Optional [UInt8](../../sql-reference/data-types/int-uint.md).
+-   `time_zone` — [Timezone](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone). The function parses `time_string` according to the timezone. Optional. [String](../../sql-reference/data-types/string.md).
+
+**Examples**
+
+Query:
+
+```sql
+SELECT parseDateTime64BestEffort('2021-01-01') AS a, toTypeName(a) AS t
+UNION ALL
+SELECT parseDateTime64BestEffort('2021-01-01 01:01:00.12346') AS a, toTypeName(a) AS t
+UNION ALL
+SELECT parseDateTime64BestEffort('2021-01-01 01:01:00.12346',6) AS a, toTypeName(a) AS t
+UNION ALL
+SELECT parseDateTime64BestEffort('2021-01-01 01:01:00.12346',3,'Europe/Moscow') AS a, toTypeName(a) AS t
+FORMAT PrettyCompactMonoBlcok
+```
+
+Result:
+
+```
+┌──────────────────────────a─┬─t──────────────────────────────┐
+│ 2021-01-01 01:01:00.123000 │ DateTime64(3)                  │
+│ 2021-01-01 00:00:00.000000 │ DateTime64(3)                  │
+│ 2021-01-01 01:01:00.123460 │ DateTime64(6)                  │
+│ 2020-12-31 22:01:00.123000 │ DateTime64(3, 'Europe/Moscow') │
+└────────────────────────────┴────────────────────────────────┘
+```
+
+## parseDateTime64BestEffortOrNull {#parsedatetime32besteffortornull}
+
+Same as for [parseDateTime64BestEffort](#parsedatetime64besteffort) except that it returns `NULL` when it encounters a date format that cannot be processed.
+
+## parseDateTime64BestEffortOrZero {#parsedatetime64besteffortorzero}
+
+Same as for [parseDateTime64BestEffort](#parsedatetimebesteffort) except that it returns zero date or zero date time when it encounters a date format that cannot be processed.
+
+
 ## toLowCardinality {#tolowcardinality}
 
 Converts input parameter to the [LowCardianlity](../../sql-reference/data-types/lowcardinality.md) version of same data type.
@@ -701,7 +1095,7 @@ To convert data from the `LowCardinality` data type use the [CAST](#type_convers
 
 **Syntax**
 
-``` sql
+```sql
 toLowCardinality(expr)
 ```
 
@@ -719,8 +1113,8 @@ Type: `LowCardinality(expr_result_type)`
 
 Query:
 
-``` sql
-SELECT toLowCardinality('1')
+```sql
+SELECT toLowCardinality('1');
 ```
 
 Result:
@@ -737,7 +1131,8 @@ Result:
 
 ## toUnixTimestamp64Nano {#tounixtimestamp64nano}
 
-Converts a `DateTime64` to a `Int64` value with fixed sub-second precision. Input value is scaled up or down appropriately depending on it precision. Please note that output value is a timestamp in UTC, not in timezone of `DateTime64`.
+Converts a `DateTime64` to a `Int64` value with fixed sub-second precision.
+Input value is scaled up or down appropriately depending on it precision. Please note that output value is a timestamp in UTC, not in timezone of `DateTime64`.
 
 **Syntax**
 
@@ -759,7 +1154,7 @@ Query:
 
 ``` sql
 WITH toDateTime64('2019-09-16 19:20:12.345678910', 6) AS dt64
-SELECT toUnixTimestamp64Milli(dt64)
+SELECT toUnixTimestamp64Milli(dt64);
 ```
 
 Result:
@@ -770,9 +1165,11 @@ Result:
 └──────────────────────────────┘
 ```
 
+Query: 
+
 ``` sql
 WITH toDateTime64('2019-09-16 19:20:12.345678910', 6) AS dt64
-SELECT toUnixTimestamp64Nano(dt64)
+SELECT toUnixTimestamp64Nano(dt64);
 ```
 
 Result:
@@ -806,13 +1203,17 @@ fromUnixTimestamp64Milli(value [, ti])
 
 -   `value` converted to the `DateTime64` data type.
 
-**Examples**
+**Example**
+
+Query:
 
 ``` sql
 WITH CAST(1234567891011, 'Int64') AS i64
-SELECT fromUnixTimestamp64Milli(i64, 'UTC')
+SELECT fromUnixTimestamp64Milli(i64, 'UTC');
 ```
 
+Result:
+
 ``` text
 ┌─fromUnixTimestamp64Milli(i64, 'UTC')─┐
 │              2009-02-13 23:31:31.011 │
@@ -844,7 +1245,7 @@ Query:
 
 ``` sql
 SELECT formatRow('CSV', number, 'good')
-FROM numbers(3)
+FROM numbers(3);
 ```
 
 Result:
@@ -885,7 +1286,7 @@ Query:
 
 ``` sql
 SELECT formatRowNoNewline('CSV', number, 'good')
-FROM numbers(3)
+FROM numbers(3);
 ```
 
 Result:
@@ -898,4 +1299,3 @@ Result:
 └───────────────────────────────────────────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/query_language/functions/type_conversion_functions/) <!--hide-->
diff --git a/docs/en/sql-reference/functions/url-functions.md b/docs/en/sql-reference/functions/url-functions.md
index 9e79ef2d0cb..9feb7a3c711 100644
--- a/docs/en/sql-reference/functions/url-functions.md
+++ b/docs/en/sql-reference/functions/url-functions.md
@@ -55,7 +55,7 @@ Type: `String`.
 **Example**
 
 ``` sql
-SELECT domain('svn+ssh://some.svn-hosting.com:80/repo/trunk')
+SELECT domain('svn+ssh://some.svn-hosting.com:80/repo/trunk');
 ```
 
 ``` text
@@ -98,7 +98,7 @@ Type: `String`.
 **Example**
 
 ``` sql
-SELECT topLevelDomain('svn+ssh://www.some.svn-hosting.com:80/repo/trunk')
+SELECT topLevelDomain('svn+ssh://www.some.svn-hosting.com:80/repo/trunk');
 ```
 
 ``` text
@@ -420,4 +420,3 @@ Removes the query string and fragment identifier. The question mark and number s
 
 Removes the ‘name’ URL parameter, if present. This function works under the assumption that the parameter name is encoded in the URL exactly the same way as in the passed argument.
 
-[Original article](https://clickhouse.tech/docs/en/query_language/functions/url_functions/) <!--hide-->
diff --git a/docs/en/sql-reference/functions/uuid-functions.md b/docs/en/sql-reference/functions/uuid-functions.md
index 01a61c65b67..e7e55c699cd 100644
--- a/docs/en/sql-reference/functions/uuid-functions.md
+++ b/docs/en/sql-reference/functions/uuid-functions.md
@@ -165,4 +165,3 @@ SELECT
 
 -   [dictGetUUID](../../sql-reference/functions/ext-dict-functions.md#ext_dict_functions-other)
 
-[Original article](https://clickhouse.tech/docs/en/query_language/functions/uuid_function/) <!--hide-->
diff --git a/docs/en/sql-reference/functions/ym-dict-functions.md b/docs/en/sql-reference/functions/ym-dict-functions.md
index 56530b5e83b..941f75ff006 100644
--- a/docs/en/sql-reference/functions/ym-dict-functions.md
+++ b/docs/en/sql-reference/functions/ym-dict-functions.md
@@ -112,7 +112,7 @@ Finds the highest continent in the hierarchy for the region.
 **Syntax**
 
 ``` sql
-regionToTopContinent(id[, geobase]);
+regionToTopContinent(id[, geobase])
 ```
 
 **Arguments**
@@ -150,4 +150,3 @@ Accepts a UInt32 number – the region ID from the Yandex geobase. A string with
 
 `ua` and `uk` both mean Ukrainian.
 
-[Original article](https://clickhouse.tech/docs/en/query_language/functions/ym_dict_functions/) <!--hide-->
diff --git a/docs/en/sql-reference/operators/in.md b/docs/en/sql-reference/operators/in.md
index bfa8b3d1003..0abeabc7f57 100644
--- a/docs/en/sql-reference/operators/in.md
+++ b/docs/en/sql-reference/operators/in.md
@@ -13,10 +13,28 @@ SELECT (CounterID, UserID) IN ((34, 123), (101500, 456)) FROM ...
 
 If the left side is a single column that is in the index, and the right side is a set of constants, the system uses the index for processing the query.
 
-Don’t list too many values explicitly (i.e. millions). If a data set is large, put it in a temporary table (for example, see the section “External data for query processing”), then use a subquery.
+Don’t list too many values explicitly (i.e. millions). If a data set is large, put it in a temporary table (for example, see the section [External data for query processing](../../engines/table-engines/special/external-data.md)), then use a subquery.
 
 The right side of the operator can be a set of constant expressions, a set of tuples with constant expressions (shown in the examples above), or the name of a database table or SELECT subquery in brackets.
 
+ClickHouse allows types to differ in the left and the right parts of `IN` subquery. In this case it converts the left side value to the type of the right side, as if the [accurateCastOrNull](../functions/type-conversion-functions.md#type_conversion_function-accurate-cast_or_null) function is applied. That means, that the data type becomes [Nullable](../../sql-reference/data-types/nullable.md), and if the conversion cannot be performed, it returns [NULL](../../sql-reference/syntax.md#null-literal).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT '1' IN (SELECT 1);
+```
+
+Result:
+
+``` text
+┌─in('1', _subquery49)─┐
+│                    1 │
+└──────────────────────┘
+```
+
 If the right side of the operator is the name of a table (for example, `UserID IN users`), this is equivalent to the subquery `UserID IN (SELECT * FROM users)`. Use this when working with external data that is sent along with the query. For example, the query can be sent together with a set of user IDs loaded to the ‘users’ temporary table, which should be filtered.
 
 If the right side of the operator is a table name that has the Set engine (a prepared data set that is always in RAM), the data set will not be created over again for each query.
@@ -203,7 +221,7 @@ It also makes sense to specify a local table in the `GLOBAL IN` clause, in case
 When max_parallel_replicas is greater than 1, distributed queries are further transformed. For example, the following:
 
 ```sql
-SEELECT CounterID, count() FROM distributed_table_1 WHERE UserID IN (SELECT UserID FROM local_table_2 WHERE CounterID < 100)
+SELECT CounterID, count() FROM distributed_table_1 WHERE UserID IN (SELECT UserID FROM local_table_2 WHERE CounterID < 100)
 SETTINGS max_parallel_replicas=3
 ```
 
diff --git a/docs/en/sql-reference/operators/index.md b/docs/en/sql-reference/operators/index.md
index 274f7269bc8..e073d5f23f0 100644
--- a/docs/en/sql-reference/operators/index.md
+++ b/docs/en/sql-reference/operators/index.md
@@ -296,4 +296,3 @@ SELECT * FROM t_null WHERE y IS NOT NULL
 └───┴───┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/query_language/operators/) <!--hide-->
diff --git a/docs/en/sql-reference/statements/alter/column.md b/docs/en/sql-reference/statements/alter/column.md
index 16aa266ebf9..d661bd4cd59 100644
--- a/docs/en/sql-reference/statements/alter/column.md
+++ b/docs/en/sql-reference/statements/alter/column.md
@@ -74,6 +74,9 @@ Deletes the column with the name `name`. If the `IF EXISTS` clause is specified,
 
 Deletes data from the file system. Since this deletes entire files, the query is completed almost instantly.
 
+!!! warning "Warning"
+    You can’t delete a column if it is referenced by [materialized view](../../../sql-reference/statements/create/view.md#materialized). Otherwise, it returns an error.
+
 Example:
 
 ``` sql
@@ -144,7 +147,7 @@ This query changes the `name` column properties:
 
 -   TTL
 
-        For examples of columns TTL modifying, see [Column TTL](../../engines/table_engines/mergetree_family/mergetree.md#mergetree-column-ttl).
+For examples of columns TTL modifying, see [Column TTL](../../../engines/table-engines/mergetree-family/mergetree.md#mergetree-column-ttl).
 
 If the `IF EXISTS` clause is specified, the query won’t return an error if the column doesn’t exist.
 
@@ -180,7 +183,7 @@ ALTER TABLE table_name MODIFY column_name REMOVE property;
 ALTER TABLE table_with_ttl MODIFY COLUMN column_ttl REMOVE TTL;
 ```
 
-## See Also
+**See Also**
 
 - [REMOVE TTL](ttl.md).
 
@@ -191,7 +194,7 @@ Renames an existing column.
 Syntax:
 
 ```sql
-ALTER TABLE table_name RENAME COLUMN column_name TO new_column_name;
+ALTER TABLE table_name RENAME COLUMN column_name TO new_column_name
 ```
 
 **Example**
diff --git a/docs/en/sql-reference/statements/alter/index.md b/docs/en/sql-reference/statements/alter/index.md
index 30603122096..71333e6fcce 100644
--- a/docs/en/sql-reference/statements/alter/index.md
+++ b/docs/en/sql-reference/statements/alter/index.md
@@ -47,4 +47,3 @@ For `ALTER ... ATTACH|DETACH|DROP` queries, you can use the `replication_alter_p
 
 For `ALTER TABLE ... UPDATE|DELETE` queries the synchronicity is defined by the [mutations_sync](../../../operations/settings/settings.md#mutations_sync) setting.
 
-[Original article](https://clickhouse.tech/docs/en/query_language/alter/) <!--hide-->
diff --git a/docs/en/sql-reference/statements/alter/partition.md b/docs/en/sql-reference/statements/alter/partition.md
index 42396223b86..948711e6d9e 100644
--- a/docs/en/sql-reference/statements/alter/partition.md
+++ b/docs/en/sql-reference/statements/alter/partition.md
@@ -16,7 +16,7 @@ The following operations with [partitions](../../../engines/table-engines/merget
 -   [CLEAR COLUMN IN PARTITION](#alter_clear-column-partition) — Resets the value of a specified column in a partition.
 -   [CLEAR INDEX IN PARTITION](#alter_clear-index-partition) — Resets the specified secondary index in a partition.
 -   [FREEZE PARTITION](#alter_freeze-partition) — Creates a backup of a partition.
--   [FETCH PARTITION](#alter_fetch-partition) — Downloads a partition from another server.
+-   [FETCH PARTITION\|PART](#alter_fetch-partition) — Downloads a part or partition from another server.
 -   [MOVE PARTITION\|PART](#alter_move-partition) — Move partition/data part to another disk or volume.
 
 <!-- -->
@@ -40,7 +40,7 @@ Read about setting the partition expression in a section [How to specify the par
 
 After the query is executed, you can do whatever you want with the data in the `detached` directory — delete it from the file system, or just leave it.
 
-This query is replicated – it moves the data to the `detached` directory on all replicas. Note that you can execute this query only on a leader replica. To find out if a replica is a leader, perform the `SELECT` query to the [system.replicas](../../../operations/system-tables/replicas.md#system_tables-replicas) table. Alternatively, it is easier to make a `DETACH` query on all replicas - all the replicas throw an exception, except the leader replica.
+This query is replicated – it moves the data to the `detached` directory on all replicas. Note that you can execute this query only on a leader replica. To find out if a replica is a leader, perform the `SELECT` query to the [system.replicas](../../../operations/system-tables/replicas.md#system_tables-replicas) table. Alternatively, it is easier to make a `DETACH` query on all replicas - all the replicas throw an exception, except the leader replicas (as multiple leaders are allowed).
 
 ## DROP PARTITION\|PART {#alter_drop-partition}
 
@@ -85,9 +85,15 @@ ALTER TABLE visits ATTACH PART 201901_2_2_0;
 
 Read more about setting the partition expression in a section [How to specify the partition expression](#alter-how-to-specify-part-expr).
 
-This query is replicated. The replica-initiator checks whether there is data in the `detached` directory. If data exists, the query checks its integrity. If everything is correct, the query adds the data to the table. All other replicas download the data from the replica-initiator.
+This query is replicated. The replica-initiator checks whether there is data in the `detached` directory. 
+If data exists, the query checks its integrity. If everything is correct, the query adds the data to the table.
 
-So you can put data to the `detached` directory on one replica, and use the `ALTER ... ATTACH` query to add it to the table on all replicas.
+If the non-initiator replica, receiving the attach command, finds the part with the correct checksums in its own 
+`detached` folder, it attaches the data without fetching it from other replicas.
+If there is no part with the correct checksums, the data is downloaded from any replica having the part.
+
+You can put data to the `detached` directory on one replica and use the `ALTER ... ATTACH` query to add it to the 
+table on all replicas.
 
 ## ATTACH PARTITION FROM {#alter_attach-partition-from}
 
@@ -95,7 +101,8 @@ So you can put data to the `detached` directory on one replica, and use the `ALT
 ALTER TABLE table2 ATTACH PARTITION partition_expr FROM table1
 ```
 
-This query copies the data partition from the `table1` to `table2` adds data to exsisting in the `table2`. Note that data won’t be deleted from `table1`.
+This query copies the data partition from the `table1` to `table2`.
+Note that data won't be deleted neither from `table1` nor from `table2`.
 
 For the query to run successfully, the following conditions must be met:
 
@@ -191,29 +198,35 @@ ALTER TABLE table_name CLEAR INDEX index_name IN PARTITION partition_expr
 
 The query works similar to `CLEAR COLUMN`, but it resets an index instead of a column data.
 
-## FETCH PARTITION {#alter_fetch-partition}
+## FETCH PARTITION|PART {#alter_fetch-partition}
 
 ``` sql
-ALTER TABLE table_name FETCH PARTITION partition_expr FROM 'path-in-zookeeper'
+ALTER TABLE table_name FETCH PARTITION|PART partition_expr FROM 'path-in-zookeeper'
 ```
 
 Downloads a partition from another server. This query only works for the replicated tables.
 
 The query does the following:
 
-1.  Downloads the partition from the specified shard. In ‘path-in-zookeeper’ you must specify a path to the shard in ZooKeeper.
+1.  Downloads the partition|part from the specified shard. In ‘path-in-zookeeper’ you must specify a path to the shard in ZooKeeper.
 2.  Then the query puts the downloaded data to the `detached` directory of the `table_name` table. Use the [ATTACH PARTITION\|PART](#alter_attach-partition) query to add the data to the table.
 
 For example:
 
+1. FETCH PARTITION
 ``` sql
 ALTER TABLE users FETCH PARTITION 201902 FROM '/clickhouse/tables/01-01/visits';
 ALTER TABLE users ATTACH PARTITION 201902;
 ```
+2. FETCH PART
+``` sql
+ALTER TABLE users FETCH PART 201901_2_2_0 FROM '/clickhouse/tables/01-01/visits';
+ALTER TABLE users ATTACH PART 201901_2_2_0;
+```
 
 Note that:
 
--   The `ALTER ... FETCH PARTITION` query isn’t replicated. It places the partition to the `detached` directory only on the local server.
+-   The `ALTER ... FETCH PARTITION|PART` query isn’t replicated. It places the part or partition to the `detached` directory only on the local server.
 -   The `ALTER TABLE ... ATTACH` query is replicated. It adds the data to all replicas. The data is added to one of the replicas from the `detached` directory, and to the others - from neighboring replicas.
 
 Before downloading, the system checks if the partition exists and the table structure matches. The most appropriate replica is selected automatically from the healthy replicas.
diff --git a/docs/en/sql-reference/statements/alter/quota.md b/docs/en/sql-reference/statements/alter/quota.md
index a43b5255598..05130a569ab 100644
--- a/docs/en/sql-reference/statements/alter/quota.md
+++ b/docs/en/sql-reference/statements/alter/quota.md
@@ -36,4 +36,4 @@ For the default user limit the maximum execution time with half a second in 30 m
 
 ``` sql
 ALTER QUOTA IF EXISTS qB FOR INTERVAL 30 minute MAX execution_time = 0.5, FOR INTERVAL 5 quarter MAX queries = 321, errors = 10 TO default;
-```
+```
\ No newline at end of file
diff --git a/docs/en/sql-reference/statements/alter/ttl.md b/docs/en/sql-reference/statements/alter/ttl.md
index 5331afdb2f8..9cd63d3b8fe 100644
--- a/docs/en/sql-reference/statements/alter/ttl.md
+++ b/docs/en/sql-reference/statements/alter/ttl.md
@@ -18,7 +18,7 @@ ALTER TABLE table_name MODIFY TTL ttl_expression;
 TTL-property can be removed from table with the following query:
 
 ```sql
-ALTER TABLE table_name REMOVE TTL 
+ALTER TABLE table_name REMOVE TTL
 ```
 
 **Example**
@@ -79,7 +79,7 @@ The `TTL` is no longer there, so the second row is not deleted:
 └───────────────────────┴─────────┴──────────────┘
 ```
 
-### See Also
+**See Also**
 
-- More about the [TTL-expression](../../../sql-reference/statements/create/table#ttl-expression).
-- Modify column [with TTL](../../../sql-reference/statements/alter/column#alter_modify-column).
+- More about the [TTL-expression](../../../sql-reference/statements/create/table.md#ttl-expression).
+- Modify column [with TTL](../../../sql-reference/statements/alter/column.md#alter_modify-column).
diff --git a/docs/en/sql-reference/statements/alter/user.md b/docs/en/sql-reference/statements/alter/user.md
index efad6561439..b590bf4887d 100644
--- a/docs/en/sql-reference/statements/alter/user.md
+++ b/docs/en/sql-reference/statements/alter/user.md
@@ -12,10 +12,10 @@ Syntax:
 ``` sql
 ALTER USER [IF EXISTS] name1 [ON CLUSTER cluster_name1] [RENAME TO new_name1] 
         [, name2 [ON CLUSTER cluster_name2] [RENAME TO new_name2] ...]
-    [IDENTIFIED [WITH {PLAINTEXT_PASSWORD|SHA256_PASSWORD|DOUBLE_SHA1_PASSWORD}] BY {'password'|'hash'}]
-    [[ADD|DROP] HOST {LOCAL | NAME 'name' | REGEXP 'name_regexp' | IP 'address' | LIKE 'pattern'} [,...] | ANY | NONE]
+    [NOT IDENTIFIED | IDENTIFIED {[WITH {no_password | plaintext_password | sha256_password | sha256_hash | double_sha1_password | double_sha1_hash}] BY {'password' | 'hash'}} | {WITH ldap SERVER 'server_name'} | {WITH kerberos [REALM 'realm']}]
+    [[ADD | DROP] HOST {LOCAL | NAME 'name' | REGEXP 'name_regexp' | IP 'address' | LIKE 'pattern'} [,...] | ANY | NONE]
     [DEFAULT ROLE role [,...] | ALL | ALL EXCEPT role [,...] ]
-    [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | PROFILE 'profile_name'] [,...]
+    [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY | WRITABLE] | PROFILE 'profile_name'] [,...]
 ```
 
 To use `ALTER USER` you must have the [ALTER USER](../../../sql-reference/statements/grant.md#grant-access-management) privilege.
diff --git a/docs/en/sql-reference/statements/attach.md b/docs/en/sql-reference/statements/attach.md
index 035441ef5f1..01783e9cb2f 100644
--- a/docs/en/sql-reference/statements/attach.md
+++ b/docs/en/sql-reference/statements/attach.md
@@ -5,16 +5,55 @@ toc_title: ATTACH
 
 # ATTACH Statement {#attach}
 
-This query is exactly the same as [CREATE](../../sql-reference/statements/create/table.md), but
+Attaches the table, for example, when moving a database to another server. 
 
--   Instead of the word `CREATE` it uses the word `ATTACH`.
--   The query does not create data on the disk, but assumes that data is already in the appropriate places, and just adds information about the table to the server.
-    After executing an ATTACH query, the server will know about the existence of the table.
+The query does not create data on the disk, but assumes that data is already in the appropriate places, and just adds information about the table to the server. After executing an `ATTACH` query, the server will know about the existence of the table.
 
-If the table was previously detached ([DETACH](../../sql-reference/statements/detach.md)), meaning that its structure is known, you can use shorthand without defining the structure.
+If the table was previously detached ([DETACH](../../sql-reference/statements/detach.md)) query, meaning that its structure is known, you can use shorthand without defining the structure.
+
+## Syntax Forms {#syntax-forms}
+### Attach Existing Table {#attach-existing-table}
 
 ``` sql
 ATTACH TABLE [IF NOT EXISTS] [db.]name [ON CLUSTER cluster]
 ```
 
-This query is used when starting the server. The server stores table metadata as files with `ATTACH` queries, which it simply runs at launch (with the exception of system tables, which are explicitly created on the server).
+This query is used when starting the server. The server stores table metadata as files with `ATTACH` queries, which it simply runs at launch (with the exception of some system tables, which are explicitly created on the server).
+
+If the table was detached permanently, it won't be reattached at the server start, so you need to use `ATTACH` query explicitly.
+
+### Сreate New Table And Attach Data {#create-new-table-and-attach-data}
+
+**With specify path to table data**
+
+```sql
+ATTACH TABLE name FROM 'path/to/data/' (col1 Type1, ...)
+```
+
+It creates new table with provided structure and attaches table data from provided directory in `user_files`.
+
+**Example**
+
+Query:
+
+```sql
+DROP TABLE IF EXISTS test;
+INSERT INTO TABLE FUNCTION file('01188_attach/test/data.TSV', 'TSV', 's String, n UInt8') VALUES ('test', 42);
+ATTACH TABLE test FROM '01188_attach/test' (s String, n UInt8) ENGINE = File(TSV);
+SELECT * FROM test;
+```
+Result:
+
+```sql
+┌─s────┬──n─┐
+│ test │ 42 │
+└──────┴────┘
+```
+
+**With specify table UUID** (Only for `Atomic` database)
+
+```sql
+ATTACH TABLE name UUID '<uuid>' (col1 Type1, ...)
+```
+
+It creates new table with provided structure and attaches data from table with the specified UUID.
\ No newline at end of file
diff --git a/docs/en/sql-reference/statements/check-table.md b/docs/en/sql-reference/statements/check-table.md
index 450447acaf8..65e6238ebbc 100644
--- a/docs/en/sql-reference/statements/check-table.md
+++ b/docs/en/sql-reference/statements/check-table.md
@@ -30,9 +30,36 @@ Performed over the tables with another table engines causes an exception.
 
 Engines from the `*Log` family don’t provide automatic data recovery on failure. Use the `CHECK TABLE` query to track data loss in a timely manner.
 
-For `MergeTree` family engines, the `CHECK TABLE` query shows a check status for every individual data part of a table on the local server.
+## Checking the MergeTree Family Tables {#checking-mergetree-tables}
 
-**If the data is corrupted**
+For `MergeTree` family engines, if [check_query_single_value_result](../../operations/settings/settings.md#check_query_single_value_result) = 0, the `CHECK TABLE` query shows a check status for every individual data part of a table on the local server. 
+
+```sql
+SET check_query_single_value_result = 0;
+CHECK TABLE test_table;
+```
+
+```text
+┌─part_path─┬─is_passed─┬─message─┐
+│ all_1_4_1 │         1 │         │
+│ all_1_4_2 │         1 │         │
+└───────────┴───────────┴─────────┘
+```
+
+If `check_query_single_value_result` = 0, the `CHECK TABLE` query shows the general table check status.
+
+```sql
+SET check_query_single_value_result = 1;
+CHECK TABLE test_table;
+```
+
+```text
+┌─result─┐
+│      1 │
+└────────┘
+```
+
+## If the Data Is Corrupted {#if-data-is-corrupted}
 
 If the table is corrupted, you can copy the non-corrupted data to another table. To do this:
 
diff --git a/docs/en/sql-reference/statements/create/quota.md b/docs/en/sql-reference/statements/create/quota.md
index 71416abf588..0698d9bede5 100644
--- a/docs/en/sql-reference/statements/create/quota.md
+++ b/docs/en/sql-reference/statements/create/quota.md
@@ -18,7 +18,7 @@ CREATE QUOTA [IF NOT EXISTS | OR REPLACE] name [ON CLUSTER cluster_name]
     [TO {role [,...] | ALL | ALL EXCEPT role [,...]}]
 ```
 
-Keys `user_name`,  `ip_address`, `client_key`, `client_key, user_name` and `client_key, ip_address` correspond to the fields in the [system.quotas](../../../operations/system-tables/quotas.md) table.
+Keys `user_name`, `ip_address`, `client_key`, `client_key, user_name` and `client_key, ip_address` correspond to the fields in the [system.quotas](../../../operations/system-tables/quotas.md) table.
 
 Parameters `queries`, `query_selects`, `query_inserts`, `errors`, `result_rows`, `result_bytes`, `read_rows`, `read_bytes`, `execution_time` correspond to the fields in the [system.quotas_usage](../../../operations/system-tables/quotas_usage.md) table.
 
diff --git a/docs/en/sql-reference/statements/create/row-policy.md b/docs/en/sql-reference/statements/create/row-policy.md
index cbe639c6fc5..5a1fa218fad 100644
--- a/docs/en/sql-reference/statements/create/row-policy.md
+++ b/docs/en/sql-reference/statements/create/row-policy.md
@@ -5,39 +5,81 @@ toc_title: ROW POLICY
 
 # CREATE ROW POLICY {#create-row-policy-statement}
 
-Creates [filters for rows](../../../operations/access-rights.md#row-policy-management), which a user can read from a table.
+Creates a [row policy](../../../operations/access-rights.md#row-policy-management), i.e. a filter used to determine which rows a user can read from a table.
 
 Syntax:
 
 ``` sql
 CREATE [ROW] POLICY [IF NOT EXISTS | OR REPLACE] policy_name1 [ON CLUSTER cluster_name1] ON [db1.]table1 
         [, policy_name2 [ON CLUSTER cluster_name2] ON [db2.]table2 ...] 
+    [FOR SELECT] USING condition
     [AS {PERMISSIVE | RESTRICTIVE}]
-    [FOR SELECT]
-    [USING condition]
     [TO {role1 [, role2 ...] | ALL | ALL EXCEPT role1 [, role2 ...]}]
 ```
 
-`ON CLUSTER` clause allows creating row policies on a cluster, see [Distributed DDL](../../../sql-reference/distributed-ddl.md).
+## USING Clause {#create-row-policy-using}
 
-## AS Clause {#create-row-policy-as}
-
-Using this section you can create permissive or restrictive policies.
-
-Permissive policy grants access to rows. Permissive policies which apply to the same table are combined together using the boolean `OR` operator. Policies are permissive by default.
-
-Restrictive policy restricts access to rows. Restrictive policies which apply to the same table are combined together using the boolean `AND` operator.
-
-Restrictive policies apply to rows that passed the permissive filters. If you set restrictive policies but no permissive policies, the user can’t get any row from the table.
+Allows to specify a condition to filter rows. An user will see a row if the condition is calculated to non-zero for the row.
 
 ## TO Clause {#create-row-policy-to}
 
-In the section `TO` you can provide a mixed list of roles and users, for example, `CREATE ROW POLICY ... TO accountant, john@localhost`.
+In the section `TO` you can provide a list of users and roles this policy should work for. For example, `CREATE ROW POLICY ... TO accountant, john@localhost`.
 
-Keyword `ALL` means all the ClickHouse users including current user. Keywords `ALL EXCEPT` allow to exclude some users from the all users list, for example, `CREATE ROW POLICY ... TO ALL EXCEPT accountant, john@localhost`
+Keyword `ALL` means all the ClickHouse users including current user. Keyword `ALL EXCEPT` allow to exclude some users from the all users list, for example, `CREATE ROW POLICY ... TO ALL EXCEPT accountant, john@localhost`
 
-## Examples {#examples}
+!!! note "Note"
+    If there are no row policies defined for a table then any user can `SELECT` all the row from the table. Defining one or more row policies for the table makes the access to the table depending on the row policies no matter if those row policies are defined for the current user or not. For example, the following policy
+    
+    `CREATE ROW POLICY pol1 ON mydb.table1 USING b=1 TO mira, peter`
 
-`CREATE ROW POLICY filter ON mydb.mytable FOR SELECT USING a<1000 TO accountant, john@localhost`
+    forbids the users `mira` and `peter` to see the rows with `b != 1`, and any non-mentioned user (e.g., the user `paul`) will see no rows from `mydb.table1` at all.
+    
+    If that's not desirable it can't be fixed by adding one more row policy, like the following:
 
-`CREATE ROW POLICY filter ON mydb.mytable FOR SELECT USING a<1000 TO ALL EXCEPT mira`
+    `CREATE ROW POLICY pol2 ON mydb.table1 USING 1 TO ALL EXCEPT mira, peter`
+
+## AS Clause {#create-row-policy-as}
+
+It's allowed to have more than one policy enabled on the same table for the same user at the one time. So we need a way to combine the conditions from multiple policies.
+
+By default policies are combined using the boolean `OR` operator. For example, the following policies
+
+``` sql
+CREATE ROW POLICY pol1 ON mydb.table1 USING b=1 TO mira, peter
+CREATE ROW POLICY pol2 ON mydb.table1 USING c=2 TO peter, antonio
+```
+
+enables the user `peter` to see rows with either `b=1` or `c=2`.
+
+The `AS` clause specifies how policies should be combined with other policies. Policies can be either permissive or restrictive. By default policies are permissive, which means they are combined using the boolean `OR` operator.
+
+A policy can be defined as restrictive as an alternative. Restrictive policies are combined using the boolean `AND` operator.
+
+Here is the general formula:
+
+```
+row_is_visible = (one or more of the permissive policies' conditions are non-zero) AND
+                 (all of the restrictive policies's conditions are non-zero)
+```
+
+For example, the following policies
+
+``` sql
+CREATE ROW POLICY pol1 ON mydb.table1 USING b=1 TO mira, peter
+CREATE ROW POLICY pol2 ON mydb.table1 USING c=2 AS RESTRICTIVE TO peter, antonio
+```
+
+enables the user `peter` to see rows only if both `b=1` AND `c=2`.
+
+## ON CLUSTER Clause {#create-row-policy-on-cluster}
+
+Allows creating row policies on a cluster, see [Distributed DDL](../../../sql-reference/distributed-ddl.md).
+
+
+## Examples
+
+`CREATE ROW POLICY filter1 ON mydb.mytable USING a<1000 TO accountant, john@localhost`
+
+`CREATE ROW POLICY filter2 ON mydb.mytable USING a<1000 AND b=5 TO ALL EXCEPT mira`
+
+`CREATE ROW POLICY filter3 ON mydb.mytable USING 1 TO admin`
diff --git a/docs/en/sql-reference/statements/create/table.md b/docs/en/sql-reference/statements/create/table.md
index 0090eec14b7..5f1f0151350 100644
--- a/docs/en/sql-reference/statements/create/table.md
+++ b/docs/en/sql-reference/statements/create/table.md
@@ -47,19 +47,38 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name AS table_function()
 
 Creates a table with the same result as that of the [table function](../../../sql-reference/table-functions/index.md#table-functions) specified. The created table will also work in the same way as the corresponding table function that was specified.
 
+### From SELECT query {#from-select-query}
+
 ``` sql
-CREATE TABLE [IF NOT EXISTS] [db.]table_name ENGINE = engine AS SELECT ...
+CREATE TABLE [IF NOT EXISTS] [db.]table_name[(name1 [type1], name2 [type2], ...)] ENGINE = engine AS SELECT ...
 ```
 
-Creates a table with a structure like the result of the `SELECT` query, with the `engine` engine, and fills it with data from SELECT.
+Creates a table with a structure like the result of the `SELECT` query, with the `engine` engine, and fills it with data from `SELECT`. Also you can explicitly specify columns description.
 
-In all cases, if `IF NOT EXISTS` is specified, the query won’t return an error if the table already exists. In this case, the query won’t do anything.
+If the table already exists and `IF NOT EXISTS` is specified, the query won’t do anything.
 
 There can be other clauses after the `ENGINE` clause in the query. See detailed documentation on how to create tables in the descriptions of [table engines](../../../engines/table-engines/index.md#table_engines).
 
+**Example**
+
+Query:
+
+``` sql
+CREATE TABLE t1 (x String) ENGINE = Memory AS SELECT 1;
+SELECT x, toTypeName(x) FROM t1;
+```
+
+Result:
+
+```text
+┌─x─┬─toTypeName(x)─┐
+│ 1 │ String        │
+└───┴───────────────┘
+```
+
 ## NULL Or NOT NULL Modifiers {#null-modifiers}
 
-`NULL` and `NOT NULL` modifiers after data type in column definition allow or do not allow it to be [Nullable](../../../sql-reference/data-types/nullable.md#data_type-nullable). 
+`NULL` and `NOT NULL` modifiers after data type in column definition allow or do not allow it to be [Nullable](../../../sql-reference/data-types/nullable.md#data_type-nullable).
 
 If the type is not `Nullable` and if `NULL` is specified, it will be treated as `Nullable`; if `NOT NULL` is specified, then no. For example, `INT NULL` is the same as `Nullable(INT)`. If the type is `Nullable` and `NULL` or `NOT NULL` modifiers are specified, the exception will be thrown.
 
@@ -109,16 +128,16 @@ It is not possible to set default values for elements in nested data structures.
 
 ## Primary Key {#primary-key}
 
-You can define a [primary key](../../../engines/table-engines/mergetree-family/mergetree.md#primary-keys-and-indexes-in-queries) when creating a table. Primary key can be specified in two ways: 
+You can define a [primary key](../../../engines/table-engines/mergetree-family/mergetree.md#primary-keys-and-indexes-in-queries) when creating a table. Primary key can be specified in two ways:
 
 - Inside the column list
 
 ``` sql
-CREATE TABLE db.table_name 
-( 
-    name1 type1, name2 type2, ..., 
+CREATE TABLE db.table_name
+(
+    name1 type1, name2 type2, ...,
     PRIMARY KEY(expr1[, expr2,...])]
-) 
+)
 ENGINE = engine;
 ```
 
@@ -126,9 +145,9 @@ ENGINE = engine;
 
 ``` sql
 CREATE TABLE db.table_name
-( 
+(
     name1 type1, name2 type2, ...
-) 
+)
 ENGINE = engine
 PRIMARY KEY(expr1[, expr2,...]);
 ```
@@ -285,7 +304,9 @@ REPLACE TABLE myOldTable SELECT * FROM myOldTable WHERE CounterID <12345;
 
 ### Syntax
 
-{CREATE [OR REPLACE]|REPLACE} TABLE [db.]table_name
+``` sql
+{CREATE [OR REPLACE] | REPLACE} TABLE [db.]table_name
+```
 
 All syntax forms for `CREATE` query also work for this query. `REPLACE` for a non-existent table will cause an error.
 
@@ -333,5 +354,3 @@ SELECT * FROM base.t1;
 │ 3 │
 └───┘
 ```
-
- [Original article](https://clickhouse.tech/docs/en/sql-reference/statements/create/table) <!--hide-->
diff --git a/docs/en/sql-reference/statements/create/user.md b/docs/en/sql-reference/statements/create/user.md
index c1a52e3b864..49a4e3813a1 100644
--- a/docs/en/sql-reference/statements/create/user.md
+++ b/docs/en/sql-reference/statements/create/user.md
@@ -12,10 +12,10 @@ Syntax:
 ``` sql
 CREATE USER [IF NOT EXISTS | OR REPLACE] name1 [ON CLUSTER cluster_name1] 
         [, name2 [ON CLUSTER cluster_name2] ...]
-    [IDENTIFIED [WITH {NO_PASSWORD|PLAINTEXT_PASSWORD|SHA256_PASSWORD|SHA256_HASH|DOUBLE_SHA1_PASSWORD|DOUBLE_SHA1_HASH|LDAP_SERVER}] BY {'password'|'hash'}]
+    [NOT IDENTIFIED | IDENTIFIED {[WITH {no_password | plaintext_password | sha256_password | sha256_hash | double_sha1_password | double_sha1_hash}] BY {'password' | 'hash'}} | {WITH ldap SERVER 'server_name'} | {WITH kerberos [REALM 'realm']}]
     [HOST {LOCAL | NAME 'name' | REGEXP 'name_regexp' | IP 'address' | LIKE 'pattern'} [,...] | ANY | NONE]
     [DEFAULT ROLE role [,...]]
-    [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | PROFILE 'profile_name'] [,...]
+    [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY | WRITABLE] | PROFILE 'profile_name'] [,...]
 ```
 
 `ON CLUSTER` clause allows creating users on a cluster, see [Distributed DDL](../../../sql-reference/distributed-ddl.md).
@@ -30,7 +30,8 @@ There are multiple ways of user identification:
 -   `IDENTIFIED WITH sha256_hash BY 'hash'`
 -   `IDENTIFIED WITH double_sha1_password BY 'qwerty'`
 -   `IDENTIFIED WITH double_sha1_hash BY 'hash'`
--   `IDENTIFIED WITH ldap_server BY 'server'`
+-   `IDENTIFIED WITH ldap SERVER 'server_name'`
+-   `IDENTIFIED WITH kerberos` or `IDENTIFIED WITH kerberos REALM 'realm'`
 
 ## User Host {#user-host}
 
diff --git a/docs/en/sql-reference/statements/create/view.md b/docs/en/sql-reference/statements/create/view.md
index 8acd58f4338..633db355d4a 100644
--- a/docs/en/sql-reference/statements/create/view.md
+++ b/docs/en/sql-reference/statements/create/view.md
@@ -62,13 +62,13 @@ Note that materialized view is influenced by [optimize_on_insert](../../../opera
 
 Views look the same as normal tables. For example, they are listed in the result of the `SHOW TABLES` query.
 
-There isn’t a separate query for deleting views. To delete a view, use [DROP TABLE](../../../sql-reference/statements/drop.md).
+To delete a view, use [DROP VIEW](../../../sql-reference/statements/drop.md#drop-view). Although `DROP TABLE` works for VIEWs as well.
 
 ## Live View (Experimental) {#live-view}
 
 !!! important "Important"
     This is an experimental feature that may change in backwards-incompatible ways in the future releases.
-    Enable usage of live views and `WATCH` query using `set allow_experimental_live_view = 1`.
+    Enable usage of live views and `WATCH` query using [allow_experimental_live_view](../../../operations/settings/settings.md#allow-experimental-live-view) setting. Input the command `set allow_experimental_live_view = 1`.
 
 
 ```sql
@@ -90,7 +90,9 @@ Live views work similarly to how a query in a distributed table works. But inste
 
     See [WITH REFRESH](#live-view-with-refresh) to force periodic updates of a live view that in some cases can be used as a workaround.
 
-You can watch for changes in the live view query result using the [WATCH](../../../sql-reference/statements/watch.md) query
+### Monitoring Changes {#live-view-monitoring}
+
+You can monitor changes in the `LIVE VIEW` query result using [WATCH](../../../sql-reference/statements/watch.md) query.
 
 ```sql
 WATCH [db.]live_view
@@ -102,11 +104,10 @@ WATCH [db.]live_view
 CREATE TABLE mt (x Int8) Engine = MergeTree ORDER BY x;
 CREATE LIVE VIEW lv AS SELECT sum(x) FROM mt;
 ```
-
 Watch a live view while doing a parallel insert into the source table.
 
 ```sql
-WATCH lv
+WATCH lv;
 ```
 
 ```bash
@@ -128,16 +129,16 @@ INSERT INTO mt VALUES (2);
 INSERT INTO mt VALUES (3);
 ```
 
-or add [EVENTS](../../../sql-reference/statements/watch.md#events-clause) clause to just get change events.
+Or add [EVENTS](../../../sql-reference/statements/watch.md#events-clause) clause to just get change events.
 
 ```sql
-WATCH [db.]live_view EVENTS
+WATCH [db.]live_view EVENTS;
 ```
 
 **Example:**
 
 ```sql
-WATCH lv EVENTS
+WATCH lv EVENTS;
 ```
 
 ```bash
@@ -163,15 +164,15 @@ SELECT * FROM [db.]live_view WHERE ...
 
 You can force live view refresh using the `ALTER LIVE VIEW [db.]table_name REFRESH` statement.
 
-### With Timeout {#live-view-with-timeout}
+### WITH TIMEOUT Clause {#live-view-with-timeout}
 
-When a live view is create with a `WITH TIMEOUT` clause then the live view will be dropped automatically after the specified number of seconds elapse since the end of the last [WATCH](../../../sql-reference/statements/watch.md) query that was watching the live view. 
+When a live view is created with a `WITH TIMEOUT` clause then the live view will be dropped automatically after the specified number of seconds elapse since the end of the last [WATCH](../../../sql-reference/statements/watch.md) query that was watching the live view. 
 
 ```sql
 CREATE LIVE VIEW [db.]table_name WITH TIMEOUT [value_in_sec] AS SELECT ...
 ```
 
-If the timeout value is not specified then the value specified by the `temporary_live_view_timeout` setting is used.
+If the timeout value is not specified then the value specified by the [temporary_live_view_timeout](../../../operations/settings/settings.md#temporary-live-view-timeout) setting is used.
 
 **Example:**
 
@@ -180,7 +181,7 @@ CREATE TABLE mt (x Int8) Engine = MergeTree ORDER BY x;
 CREATE LIVE VIEW lv WITH TIMEOUT 15 AS SELECT sum(x) FROM mt;
 ```
 
-### With Refresh {#live-view-with-refresh}
+### WITH REFRESH Clause {#live-view-with-refresh}
 
 When a live view is created with a `WITH REFRESH` clause then it will be automatically refreshed after the specified number of seconds elapse since the last refresh or trigger.
 
@@ -188,7 +189,7 @@ When a live view is created with a `WITH REFRESH` clause then it will be automat
 CREATE LIVE VIEW [db.]table_name WITH REFRESH [value_in_sec] AS SELECT ...
 ```
 
-If the refresh value is not specified then the value specified by the `periodic_live_view_refresh` setting is used.
+If the refresh value is not specified then the value specified by the [periodic_live_view_refresh](../../../operations/settings/settings.md#periodic-live-view-refresh) setting is used.
 
 **Example:**
 
@@ -231,7 +232,7 @@ WATCH lv
 Code: 60. DB::Exception: Received from localhost:9000. DB::Exception: Table default.lv doesn't exist.. 
 ```
 
-### Usage
+### Usage {#live-view-usage}
 
 Most common uses of live view tables include:
 
@@ -240,15 +241,4 @@ Most common uses of live view tables include:
 - Watching for table changes and triggering a follow-up select queries.
 - Watching metrics from system tables using periodic refresh.
 
-### Settings {#live-view-settings}
-
-You can use the following settings to control the behaviour of live views.
-
-- `allow_experimental_live_view` - enable live views. Default is `0`.
-- `live_view_heartbeat_interval` - the heartbeat interval in seconds to indicate live query is alive. Default is `15` seconds.
-- `max_live_view_insert_blocks_before_refresh` - maximum number of inserted blocks after which
-   mergeable blocks are dropped and query is re-executed. Default is `64` inserts.
-- `temporary_live_view_timeout` - interval after which live view with timeout is deleted. Default is `5` seconds.
-- `periodic_live_view_refresh` - interval after which periodically refreshed live view is forced to refresh. Default is `60` seconds.
-
 [Original article](https://clickhouse.tech/docs/en/sql-reference/statements/create/view/) <!--hide-->
diff --git a/docs/en/sql-reference/statements/detach.md b/docs/en/sql-reference/statements/detach.md
index 62a7c0cc1e0..e9c9ed3693c 100644
--- a/docs/en/sql-reference/statements/detach.md
+++ b/docs/en/sql-reference/statements/detach.md
@@ -5,12 +5,66 @@ toc_title: DETACH
 
 # DETACH Statement {#detach}
 
-Deletes information about the ‘name’ table from the server. The server stops knowing about the table’s existence.
+Makes the server "forget" about the existence of the table or materialized view.
+
+Syntax:
 
 ``` sql
-DETACH TABLE [IF EXISTS] [db.]name [ON CLUSTER cluster]
+DETACH TABLE|VIEW [IF EXISTS] [db.]name [PERMANENTLY] [ON CLUSTER cluster]
 ```
 
-This does not delete the table’s data or metadata. On the next server launch, the server will read the metadata and find out about the table again.
+Detaching does not delete the data or metadata for the table or materialized view. If the table or view was not detached `PERMANENTLY`, on the next server launch the server will read the metadata and recall the table/view again. If the table or view was detached `PERMANENTLY`, there will be no automatic recall. 
 
-Similarly, a “detached” table can be re-attached using the `ATTACH` query (with the exception of system tables, which do not have metadata stored for them).
+Whether the table was detached permanently or not, in both cases you can reattach it using the [ATTACH](../../sql-reference/statements/attach.md). System log tables can be also attached back (e.g. `query_log`, `text_log`, etc). Other system tables can't be reattached. On the next server launch the server will recall those tables again.
+
+`ATTACH MATERIALIZED VIEW` doesn't work with short syntax (without `SELECT`), but you can attach it using the `ATTACH TABLE` query.
+
+Note that you can not detach permanently the table which is already detached (temporary). But you can attach it back and then detach permanently again. 
+
+Also you can not [DROP](../../sql-reference/statements/drop.md#drop-table) the detached table, or [CREATE TABLE](../../sql-reference/statements/create/table.md) with the same name as detached permanently, or replace it with the other table with [RENAME TABLE](../../sql-reference/statements/rename.md) query.
+
+**Example**
+
+Creating a table:
+
+Query:
+
+``` sql
+CREATE TABLE test ENGINE = Log AS SELECT * FROM numbers(10);
+SELECT * FROM test;
+```
+
+Result:
+
+``` text
+┌─number─┐
+│      0 │
+│      1 │
+│      2 │
+│      3 │
+│      4 │
+│      5 │
+│      6 │
+│      7 │
+│      8 │
+│      9 │
+└────────┘
+```
+
+Detaching the table:
+
+Query:
+
+``` sql
+DETACH TABLE test;
+SELECT * FROM test;
+```
+
+Result:
+
+``` text
+Received exception from server (version 21.4.1):
+Code: 60. DB::Exception: Received from localhost:9000. DB::Exception: Table default.test doesn't exist.
+```
+
+[Original article](https://clickhouse.tech/docs/en/sql-reference/statements/detach/) <!--hide-->
diff --git a/docs/en/sql-reference/statements/grant.md b/docs/en/sql-reference/statements/grant.md
index f3829de2fbb..89f35b5f701 100644
--- a/docs/en/sql-reference/statements/grant.md
+++ b/docs/en/sql-reference/statements/grant.md
@@ -91,7 +91,7 @@ Hierarchy of privileges:
             -   `ALTER ADD CONSTRAINT`
             -   `ALTER DROP CONSTRAINT`
         -   `ALTER TTL`
-        -   `ALTER MATERIALIZE TTL`
+            -   `ALTER MATERIALIZE TTL`
         -   `ALTER SETTINGS`
         -   `ALTER MOVE PARTITION`
         -   `ALTER FETCH PARTITION`
@@ -102,9 +102,9 @@ Hierarchy of privileges:
 -   [CREATE](#grant-create)
     -   `CREATE DATABASE`
     -   `CREATE TABLE`
+        -   `CREATE TEMPORARY TABLE`
     -   `CREATE VIEW`
     -   `CREATE DICTIONARY`
-    -   `CREATE TEMPORARY TABLE`
 -   [DROP](#grant-drop)
     -   `DROP DATABASE`
     -   `DROP TABLE`
@@ -150,7 +150,7 @@ Hierarchy of privileges:
     -   `SYSTEM RELOAD`
         -   `SYSTEM RELOAD CONFIG`
         -   `SYSTEM RELOAD DICTIONARY`
-        -   `SYSTEM RELOAD EMBEDDED DICTIONARIES`
+            -   `SYSTEM RELOAD EMBEDDED DICTIONARIES`
     -   `SYSTEM MERGES`
     -   `SYSTEM TTL MERGES`
     -   `SYSTEM FETCHES`
@@ -276,10 +276,10 @@ Allows executing [ALTER](../../sql-reference/statements/alter/index.md) queries
             -   `ALTER ADD CONSTRAINT`. Level: `TABLE`. Aliases: `ADD CONSTRAINT`
             -   `ALTER DROP CONSTRAINT`. Level: `TABLE`. Aliases: `DROP CONSTRAINT`
         -   `ALTER TTL`. Level: `TABLE`. Aliases: `ALTER MODIFY TTL`, `MODIFY TTL`
-        -   `ALTER MATERIALIZE TTL`. Level: `TABLE`. Aliases: `MATERIALIZE TTL`
+            -   `ALTER MATERIALIZE TTL`. Level: `TABLE`. Aliases: `MATERIALIZE TTL`
         -   `ALTER SETTINGS`. Level: `TABLE`. Aliases: `ALTER SETTING`, `ALTER MODIFY SETTING`, `MODIFY SETTING`
         -   `ALTER MOVE PARTITION`. Level: `TABLE`. Aliases: `ALTER MOVE PART`, `MOVE PARTITION`, `MOVE PART`
-        -   `ALTER FETCH PARTITION`. Level: `TABLE`. Aliases: `FETCH PARTITION`
+        -   `ALTER FETCH PARTITION`. Level: `TABLE`. Aliases: `ALTER FETCH PART`, `FETCH PARTITION`, `FETCH PART`
         -   `ALTER FREEZE PARTITION`. Level: `TABLE`. Aliases: `FREEZE PARTITION`
     -   `ALTER VIEW` Level: `GROUP`
         -   `ALTER VIEW REFRESH`. Level: `VIEW`. Aliases: `ALTER LIVE VIEW REFRESH`, `REFRESH VIEW`
@@ -304,9 +304,9 @@ Allows executing [CREATE](../../sql-reference/statements/create/index.md) and [A
 -   `CREATE`. Level: `GROUP`
     -   `CREATE DATABASE`. Level: `DATABASE`
     -   `CREATE TABLE`. Level: `TABLE`
+        -   `CREATE TEMPORARY TABLE`. Level: `GLOBAL`
     -   `CREATE VIEW`. Level: `VIEW`
     -   `CREATE DICTIONARY`. Level: `DICTIONARY`
-    -   `CREATE TEMPORARY TABLE`. Level: `GLOBAL`
 
 **Notes**
 
@@ -401,7 +401,7 @@ Allows a user to execute [SYSTEM](../../sql-reference/statements/system.md) quer
     -   `SYSTEM RELOAD`. Level: `GROUP`
         -   `SYSTEM RELOAD CONFIG`. Level: `GLOBAL`. Aliases: `RELOAD CONFIG`
         -   `SYSTEM RELOAD DICTIONARY`. Level: `GLOBAL`. Aliases: `SYSTEM RELOAD DICTIONARIES`, `RELOAD DICTIONARY`, `RELOAD DICTIONARIES`
-        -   `SYSTEM RELOAD EMBEDDED DICTIONARIES`. Level: `GLOBAL`. Aliases: R`ELOAD EMBEDDED DICTIONARIES`
+            -   `SYSTEM RELOAD EMBEDDED DICTIONARIES`. Level: `GLOBAL`. Aliases: `RELOAD EMBEDDED DICTIONARIES`
     -   `SYSTEM MERGES`. Level: `TABLE`. Aliases: `SYSTEM STOP MERGES`, `SYSTEM START MERGES`, `STOP MERGES`, `START MERGES`
     -   `SYSTEM TTL MERGES`. Level: `TABLE`. Aliases: `SYSTEM STOP TTL MERGES`, `SYSTEM START TTL MERGES`, `STOP TTL MERGES`, `START TTL MERGES`
     -   `SYSTEM FETCHES`. Level: `TABLE`. Aliases: `SYSTEM STOP FETCHES`, `SYSTEM START FETCHES`, `STOP FETCHES`, `START FETCHES`
@@ -473,4 +473,3 @@ Doesn’t grant any privileges.
 
 The `ADMIN OPTION` privilege allows a user to grant their role to another user.
 
-[Original article](https://clickhouse.tech/docs/en/query_language/grant/) <!--hide-->
diff --git a/docs/en/sql-reference/statements/insert-into.md b/docs/en/sql-reference/statements/insert-into.md
index c517a515ab7..66effcccc3f 100644
--- a/docs/en/sql-reference/statements/insert-into.md
+++ b/docs/en/sql-reference/statements/insert-into.md
@@ -117,4 +117,3 @@ Performance will not decrease if:
 -   Data is added in real time.
 -   You upload data that is usually sorted by time.
 
-[Original article](https://clickhouse.tech/docs/en/query_language/insert_into/) <!--hide-->
diff --git a/docs/en/sql-reference/statements/optimize.md b/docs/en/sql-reference/statements/optimize.md
index a67f282e793..247252d3f4e 100644
--- a/docs/en/sql-reference/statements/optimize.md
+++ b/docs/en/sql-reference/statements/optimize.md
@@ -5,20 +5,89 @@ toc_title: OPTIMIZE
 
 # OPTIMIZE Statement {#misc_operations-optimize}
 
+This query tries to initialize an unscheduled merge of data parts for tables.
+
+!!! warning "Warning"
+    `OPTIMIZE` can’t fix the `Too many parts` error.
+
+**Syntax**
+
 ``` sql
-OPTIMIZE TABLE [db.]name [ON CLUSTER cluster] [PARTITION partition | PARTITION ID 'partition_id'] [FINAL] [DEDUPLICATE]
+OPTIMIZE TABLE [db.]name [ON CLUSTER cluster] [PARTITION partition | PARTITION ID 'partition_id'] [FINAL] [DEDUPLICATE [BY expression]]
 ```
 
-This query tries to initialize an unscheduled merge of data parts for tables with a table engine from the [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md) family.
-
-The `OPTMIZE` query is also supported for the [MaterializedView](../../engines/table-engines/special/materializedview.md) and the [Buffer](../../engines/table-engines/special/buffer.md) engines. Other table engines aren’t supported.
+The `OPTMIZE` query is supported for [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md) family, the [MaterializedView](../../engines/table-engines/special/materializedview.md) and the [Buffer](../../engines/table-engines/special/buffer.md) engines. Other table engines aren’t supported.
 
 When `OPTIMIZE` is used with the [ReplicatedMergeTree](../../engines/table-engines/mergetree-family/replication.md) family of table engines, ClickHouse creates a task for merging and waits for execution on all nodes (if the `replication_alter_partitions_sync` setting is enabled).
 
 -   If `OPTIMIZE` doesn’t perform a merge for any reason, it doesn’t notify the client. To enable notifications, use the [optimize_throw_if_noop](../../operations/settings/settings.md#setting-optimize_throw_if_noop) setting.
 -   If you specify a `PARTITION`, only the specified partition is optimized. [How to set partition expression](../../sql-reference/statements/alter/index.md#alter-how-to-specify-part-expr).
--   If you specify `FINAL`, optimization is performed even when all the data is already in one part.
--   If you specify `DEDUPLICATE`, then completely identical rows will be deduplicated (all columns are compared), it makes sense only for the MergeTree engine.
+-   If you specify `FINAL`, optimization is performed even when all the data is already in one part. Also merge is forced even if concurrent merges are performed.
+-   If you specify `DEDUPLICATE`, then completely identical rows (unless by-clause is specified) will be deduplicated (all columns are compared), it makes sense only for the MergeTree engine.
 
-!!! warning "Warning"
-    `OPTIMIZE` can’t fix the “Too many parts” error.
+
+## BY expression {#by-expression}
+
+If you want to perform deduplication on custom set of columns rather than on all, you can specify list of columns explicitly or use any combination of [`*`](../../sql-reference/statements/select/index.md#asterisk), [`COLUMNS`](../../sql-reference/statements/select/index.md#columns-expression) or [`EXCEPT`](../../sql-reference/statements/select/index.md#except-modifier) expressions. The explictly written or implicitly expanded list of columns must include all columns specified in row ordering expression (both primary and sorting keys) and partitioning expression (partitioning key).
+
+!!! note "Note"
+    Notice that `*` behaves just like in `SELECT`: `MATERIALIZED` and `ALIAS` columns are not used for expansion.
+    Also, it is an error to specify empty list of columns, or write an expression that results in an empty list of columns, or deduplicate by an ALIAS column.
+
+``` sql
+OPTIMIZE TABLE table DEDUPLICATE; -- the old one
+OPTIMIZE TABLE table DEDUPLICATE BY *; -- not the same as the old one, excludes MATERIALIZED columns (see the note above)
+OPTIMIZE TABLE table DEDUPLICATE BY * EXCEPT colX;
+OPTIMIZE TABLE table DEDUPLICATE BY * EXCEPT (colX, colY);
+OPTIMIZE TABLE table DEDUPLICATE BY col1,col2,col3;
+OPTIMIZE TABLE table DEDUPLICATE BY COLUMNS('column-matched-by-regex');
+OPTIMIZE TABLE table DEDUPLICATE BY COLUMNS('column-matched-by-regex') EXCEPT colX;
+OPTIMIZE TABLE table DEDUPLICATE BY COLUMNS('column-matched-by-regex') EXCEPT (colX, colY);
+```
+
+**Examples**
+
+Create a table:
+
+``` sql
+CREATE TABLE example (
+    primary_key Int32,
+    secondary_key Int32,
+    value UInt32,
+    partition_key UInt32,
+    materialized_value UInt32 MATERIALIZED 12345,
+    aliased_value UInt32 ALIAS 2,
+    PRIMARY KEY primary_key
+) ENGINE=MergeTree
+PARTITION BY partition_key
+ORDER BY (primary_key, secondary_key);
+```
+
+The 'old' deduplicate, all columns are taken into account, i.e. row is removed only if all values in all columns are equal to corresponding values in previous row.
+
+``` sql
+OPTIMIZE TABLE example FINAL DEDUPLICATE;
+```
+
+Deduplicate by all columns that are not `ALIAS` or `MATERIALIZED`: `primary_key`, `secondary_key`, `value`, `partition_key`, and `materialized_value` columns.
+
+``` sql
+OPTIMIZE TABLE example FINAL DEDUPLICATE BY *;
+```
+
+Deduplicate by all columns that are not `ALIAS` or `MATERIALIZED` and explicitly not `materialized_value`: `primary_key`, `secondary_key`, `value`, and `partition_key` columns.
+
+``` sql
+OPTIMIZE TABLE example FINAL DEDUPLICATE BY * EXCEPT materialized_value;
+```
+
+Deduplicate explicitly by `primary_key`, `secondary_key`, and `partition_key` columns.
+``` sql
+OPTIMIZE TABLE example FINAL DEDUPLICATE BY primary_key, secondary_key, partition_key;
+```
+
+Deduplicate by any column matching a regex: `primary_key`, `secondary_key`, and `partition_key` columns.
+
+``` sql
+OPTIMIZE TABLE example FINAL DEDUPLICATE BY COLUMNS('.*_key');
+```
diff --git a/docs/en/sql-reference/statements/rename.md b/docs/en/sql-reference/statements/rename.md
index 4f14ad016a3..a9dda6ed3b2 100644
--- a/docs/en/sql-reference/statements/rename.md
+++ b/docs/en/sql-reference/statements/rename.md
@@ -5,6 +5,14 @@ toc_title: RENAME
 
 # RENAME Statement {#misc_operations-rename}
 
+## RENAME DATABASE {#misc_operations-rename_database}
+Renames database, support only for Atomic database engine
+
+```
+RENAME DATABASE atomic_database1 TO atomic_database2 [ON CLUSTER cluster]
+```
+
+## RENAME TABLE {#misc_operations-rename_table}
 Renames one or more tables.
 
 ``` sql
diff --git a/docs/en/sql-reference/statements/select/all.md b/docs/en/sql-reference/statements/select/all.md
index 5e0de4c142b..891b82c4319 100644
--- a/docs/en/sql-reference/statements/select/all.md
+++ b/docs/en/sql-reference/statements/select/all.md
@@ -4,10 +4,8 @@ toc_title: ALL
 
 # ALL Clause {#select-all}
 
-`SELECT ALL` is identical to `SELECT` without `DISTINCT`.
+If there are multiple matching rows in the table, then `ALL` returns all of them. `SELECT ALL` is identical to `SELECT` without `DISTINCT`. If both `ALL` and `DISTINCT` specified, exception will be thrown.
 
-- If `ALL` specified, ignore it.
-- If both `ALL` and `DISTINCT` specified, exception will be thrown.
 
 `ALL` can also be specified inside aggregate function with the same effect(noop), for instance:
 
@@ -19,3 +17,5 @@ equals to
 ```sql
 SELECT sum(number) FROM numbers(10);
 ```
+
+[Original article](https://clickhouse.tech/docs/en/sql-reference/statements/select/all) <!--hide-->
diff --git a/docs/en/sql-reference/statements/select/index.md b/docs/en/sql-reference/statements/select/index.md
index e99ebef838c..ada4699c224 100644
--- a/docs/en/sql-reference/statements/select/index.md
+++ b/docs/en/sql-reference/statements/select/index.md
@@ -57,6 +57,9 @@ Specifics of each optional clause are covered in separate sections, which are li
 
 If you want to include all columns in the result, use the asterisk (`*`) symbol. For example, `SELECT * FROM ...`.
 
+
+### COLUMNS expression {#columns-expression}
+
 To match some columns in the result with a [re2](https://en.wikipedia.org/wiki/RE2_(software)) regular expression, you can use the `COLUMNS` expression.
 
 ``` sql
diff --git a/docs/en/sql-reference/statements/show.md b/docs/en/sql-reference/statements/show.md
index 35631f8c8d6..7b3f709b876 100644
--- a/docs/en/sql-reference/statements/show.md
+++ b/docs/en/sql-reference/statements/show.md
@@ -428,4 +428,69 @@ errors_count:            0
 estimated_recovery_time: 0
 ```
 
-[Original article](https://clickhouse.tech/docs/en/query_language/show/) <!--hide-->
+## SHOW SETTINGS {#show-settings}
+
+Returns a list of system settings and their values. Selects data from the [system.settings](../../operations/system-tables/settings.md) table.
+
+**Syntax**
+
+```sql
+SHOW [CHANGED] SETTINGS LIKE|ILIKE <name>
+```
+
+**Clauses**
+
+`LIKE|ILIKE` allow to specify a matching pattern for the setting name. It can contain globs such as `%` or `_`. `LIKE` clause is case-sensitive, `ILIKE` — case insensitive.
+
+When the `CHANGED` clause is used, the query returns only settings changed from their default values.
+
+**Examples**
+
+Query with the `LIKE` clause:
+
+```sql
+SHOW SETTINGS LIKE 'send_timeout';
+```
+Result:
+
+```text
+┌─name─────────┬─type────┬─value─┐
+│ send_timeout │ Seconds │ 300   │
+└──────────────┴─────────┴───────┘
+```
+
+Query with the `ILIKE` clause:
+
+```sql
+SHOW SETTINGS ILIKE '%CONNECT_timeout%'
+```
+
+Result:
+
+```text
+┌─name────────────────────────────────────┬─type─────────┬─value─┐
+│ connect_timeout                         │ Seconds      │ 10    │
+│ connect_timeout_with_failover_ms        │ Milliseconds │ 50    │
+│ connect_timeout_with_failover_secure_ms │ Milliseconds │ 100   │
+└─────────────────────────────────────────┴──────────────┴───────┘
+```
+
+Query with the `CHANGED` clause:
+
+```sql
+SHOW CHANGED SETTINGS ILIKE '%MEMORY%'
+```
+
+Result:
+
+```text
+┌─name─────────────┬─type───┬─value───────┐
+│ max_memory_usage │ UInt64 │ 10000000000 │
+└──────────────────┴────────┴─────────────┘
+```
+
+**See Also**
+
+-   [system.settings](../../operations/system-tables/settings.md) table
+
+[Original article](https://clickhouse.tech/docs/en/sql-reference/statements/show/) <!--hide-->
diff --git a/docs/en/sql-reference/statements/system.md b/docs/en/sql-reference/statements/system.md
index bb279703cc2..919bd65d56b 100644
--- a/docs/en/sql-reference/statements/system.md
+++ b/docs/en/sql-reference/statements/system.md
@@ -169,7 +169,7 @@ SYSTEM START MERGES [ON VOLUME <volume_name> | [db.]merge_tree_family_table_name
 ### STOP TTL MERGES {#query_language-stop-ttl-merges}
 
 Provides possibility to stop background delete old data according to [TTL expression](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-ttl) for tables in the MergeTree family:
-Return `Ok.` even table doesn’t exists or table have not MergeTree engine. Return error when database doesn’t exists:
+Returns `Ok.` even if table doesn’t exist or table has not MergeTree engine. Returns error when database doesn’t exist:
 
 ``` sql
 SYSTEM STOP TTL MERGES [[db.]merge_tree_family_table_name]
@@ -178,7 +178,7 @@ SYSTEM STOP TTL MERGES [[db.]merge_tree_family_table_name]
 ### START TTL MERGES {#query_language-start-ttl-merges}
 
 Provides possibility to start background delete old data according to [TTL expression](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-ttl) for tables in the MergeTree family:
-Return `Ok.` even table doesn’t exists. Return error when database doesn’t exists:
+Returns `Ok.` even if table doesn’t exist. Returns error when database doesn’t exist:
 
 ``` sql
 SYSTEM START TTL MERGES [[db.]merge_tree_family_table_name]
@@ -187,7 +187,7 @@ SYSTEM START TTL MERGES [[db.]merge_tree_family_table_name]
 ### STOP MOVES {#query_language-stop-moves}
 
 Provides possibility to stop background move data according to [TTL table expression with TO VOLUME or TO DISK clause](../../engines/table-engines/mergetree-family/mergetree.md#mergetree-table-ttl) for tables in the MergeTree family:
-Return `Ok.` even table doesn’t exists. Return error when database doesn’t exists:
+Returns `Ok.` even if table doesn’t exist. Returns error when database doesn’t exist:
 
 ``` sql
 SYSTEM STOP MOVES [[db.]merge_tree_family_table_name]
@@ -196,7 +196,7 @@ SYSTEM STOP MOVES [[db.]merge_tree_family_table_name]
 ### START MOVES {#query_language-start-moves}
 
 Provides possibility to start background move data according to [TTL table expression with TO VOLUME and TO DISK clause](../../engines/table-engines/mergetree-family/mergetree.md#mergetree-table-ttl) for tables in the MergeTree family:
-Return `Ok.` even table doesn’t exists. Return error when database doesn’t exists:
+Returns `Ok.` even if table doesn’t exist. Returns error when database doesn’t exist:
 
 ``` sql
 SYSTEM STOP MOVES [[db.]merge_tree_family_table_name]
@@ -209,7 +209,7 @@ ClickHouse can manage background replication related processes in [ReplicatedMer
 ### STOP FETCHES {#query_language-system-stop-fetches}
 
 Provides possibility to stop background fetches for inserted parts for tables in the `ReplicatedMergeTree` family:
-Always returns `Ok.` regardless of the table engine and even table or database doesn’t exists.
+Always returns `Ok.` regardless of the table engine and even if table or database doesn’t exist.
 
 ``` sql
 SYSTEM STOP FETCHES [[db.]replicated_merge_tree_family_table_name]
@@ -218,7 +218,7 @@ SYSTEM STOP FETCHES [[db.]replicated_merge_tree_family_table_name]
 ### START FETCHES {#query_language-system-start-fetches}
 
 Provides possibility to start background fetches for inserted parts for tables in the `ReplicatedMergeTree` family:
-Always returns `Ok.` regardless of the table engine and even table or database doesn’t exists.
+Always returns `Ok.` regardless of the table engine and even if table or database doesn’t exist.
 
 ``` sql
 SYSTEM START FETCHES [[db.]replicated_merge_tree_family_table_name]
@@ -264,6 +264,10 @@ Wait until a `ReplicatedMergeTree` table will be synced with other replicas in a
 SYSTEM SYNC REPLICA [db.]replicated_merge_tree_family_table_name
 ```
 
+After running this statement the `[db.]replicated_merge_tree_family_table_name` fetches commands from
+the common replicated log into its own replication queue, and then the query waits till the replica processes all
+of the fetched commands.
+
 ### RESTART REPLICA {#query_language-system-restart-replica}
 
 Provides possibility to reinitialize Zookeeper sessions state for `ReplicatedMergeTree` table, will compare current state with Zookeeper as source of true and add tasks to Zookeeper queue if needed
@@ -276,5 +280,3 @@ SYSTEM RESTART REPLICA [db.]replicated_merge_tree_family_table_name
 ### RESTART REPLICAS {#query_language-system-restart-replicas}
 
 Provides possibility to reinitialize Zookeeper sessions state for all `ReplicatedMergeTree` tables, will compare current state with Zookeeper as source of true and add tasks to Zookeeper queue if needed
-
-[Original article](https://clickhouse.tech/docs/en/query_language/system/) <!--hide-->
diff --git a/docs/en/sql-reference/statements/watch.md b/docs/en/sql-reference/statements/watch.md
index 761bc8a041e..be793d30f3d 100644
--- a/docs/en/sql-reference/statements/watch.md
+++ b/docs/en/sql-reference/statements/watch.md
@@ -17,19 +17,21 @@ WATCH [db.]live_view
 [FORMAT format]
 ```
 
-The `WATCH` query performs continuous data retrieval from a [live view](./create/view.md#live-view) table. Unless the `LIMIT` clause is specified it provides an infinite stream of query results from a [live view](./create/view.md#live-view).
+The `WATCH` query performs continuous data retrieval from a [LIVE VIEW](./create/view.md#live-view) table. Unless the `LIMIT` clause is specified it provides an infinite stream of query results from a [LIVE VIEW](./create/view.md#live-view).
 
 ```sql
-WATCH [db.]live_view
+WATCH [db.]live_view [EVENTS] [LIMIT n] [FORMAT format]
 ```
 
+## Virtual columns {#watch-virtual-columns}
+
 The virtual `_version` column in the query result indicates the current result version.
 
 **Example:**
 
 ```sql
 CREATE LIVE VIEW lv WITH REFRESH 5 AS SELECT now();
-WATCH lv
+WATCH lv;
 ```
 
 ```bash
@@ -47,6 +49,8 @@ WATCH lv
 
 By default, the requested data is returned to the client, while in conjunction with [INSERT INTO](../../sql-reference/statements/insert-into.md) it can be forwarded to a different table.
 
+**Example:**
+
 ```sql
 INSERT INTO [db.]table WATCH [db.]live_view ...
 ```
@@ -56,14 +60,14 @@ INSERT INTO [db.]table WATCH [db.]live_view ...
 The `EVENTS` clause can be used to obtain a short form of the `WATCH` query where instead of the query result you will just get the latest query result version.
 
 ```sql
-WATCH [db.]live_view EVENTS
+WATCH [db.]live_view EVENTS;
 ```
 
 **Example:**
 
 ```sql
 CREATE LIVE VIEW lv WITH REFRESH 5 AS SELECT now();
-WATCH lv EVENTS
+WATCH lv EVENTS;
 ```
 
 ```bash
@@ -78,17 +82,17 @@ WATCH lv EVENTS
 
 ## LIMIT Clause {#limit-clause}
 
-The `LIMIT n` clause species the number of updates the `WATCH` query should wait for before terminating. By default there is no limit on the number of updates and therefore the query will not terminate. The value of `0` indicates that the `WATCH` query should not wait for any new query results and therefore will return immediately once query is evaluated.
+The `LIMIT n` clause specifies the number of updates the `WATCH` query should wait for before terminating. By default there is no limit on the number of updates and therefore the query will not terminate. The value of `0` indicates that the `WATCH` query should not wait for any new query results and therefore will return immediately once query result is evaluated.
 
 ```sql
-WATCH [db.]live_view LIMIT 1
+WATCH [db.]live_view LIMIT 1;
 ```
 
 **Example:**
 
 ```sql
 CREATE LIVE VIEW lv WITH REFRESH 5 AS SELECT now();
-WATCH lv EVENTS LIMIT 1
+WATCH lv EVENTS LIMIT 1;
 ```
 
 ```bash
@@ -102,5 +106,4 @@ WATCH lv EVENTS LIMIT 1
 The `FORMAT` clause works the same way as for the [SELECT](../../sql-reference/statements/select/format.md#format-clause).
 
 !!! info "Note"
-    The [JSONEachRowWithProgress](../../../interfaces/formats/#jsoneachrowwithprogress) format should be used when watching [live view](./create/view.md#live-view) tables over the HTTP interface. The progress messages will be added to the output to keep the long-lived HTTP connection alive until the query result changes. The interval between progress messages is controlled using the [live_view_heartbeat_interval](./create/view.md#live-view-settings) setting.
-
+    The [JSONEachRowWithProgress](../../interfaces/formats.md#jsoneachrowwithprogress) format should be used when watching [LIVE VIEW](./create/view.md#live-view) tables over the HTTP interface. The progress messages will be added to the output to keep the long-lived HTTP connection alive until the query result changes. The interval between progress messages is controlled using the [live_view_heartbeat_interval](./create/view.md#live-view-settings) setting.
diff --git a/docs/en/sql-reference/table-functions/file.md b/docs/en/sql-reference/table-functions/file.md
index d1eb81e52c6..e1459b5e254 100644
--- a/docs/en/sql-reference/table-functions/file.md
+++ b/docs/en/sql-reference/table-functions/file.md
@@ -5,7 +5,7 @@ toc_title: file
 
 # file {#file}
 
-Creates a table from a file. This table function is similar to [url](../../sql-reference/table-functions/url.md) and [hdfs](../../sql-reference/table-functions/hdfs.md) ones. 
+Creates a table from a file. This table function is similar to [url](../../sql-reference/table-functions/url.md) and [hdfs](../../sql-reference/table-functions/hdfs.md) ones.
 
 `file` function can be used in `SELECT` and `INSERT` queries on data in [File](../../engines/table-engines/special/file.md) tables.
 
@@ -15,9 +15,9 @@ Creates a table from a file. This table function is similar to [url](../../sql-r
 file(path, format, structure)
 ```
 
-**Input parameters**
+**Parameters**
 
--   `path` — The relative path to the file from [user_files_path](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-user_files_path). Path to file support following globs in readonly mode: `*`, `?`, `{abc,def}` and `{N..M}` where `N`, `M` — numbers, `'abc', 'def'` — strings.
+-   `path` — The relative path to the file from [user_files_path](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-user_files_path). Path to file support following globs in read-only mode: `*`, `?`, `{abc,def}` and `{N..M}` where `N`, `M` — numbers, `'abc', 'def'` — strings.
 -   `format` — The [format](../../interfaces/formats.md#formats) of the file.
 -   `structure` — Structure of the table. Format: `'column1_name column1_type, column2_name column2_type, ...'`.
 
@@ -39,7 +39,7 @@ $ cat /var/lib/clickhouse/user_files/test.csv
     78,43,45
 ```
 
-Getting data from a table in `test.csv` and selecting first two rows from it:
+Getting data from a table in `test.csv` and selecting the first two rows from it:
 
 ``` sql
 SELECT * FROM file('test.csv', 'CSV', 'column1 UInt32, column2 UInt32, column3 UInt32') LIMIT 2;
@@ -51,7 +51,8 @@ SELECT * FROM file('test.csv', 'CSV', 'column1 UInt32, column2 UInt32, column3 U
 │       3 │       2 │       1 │
 └─────────┴─────────┴─────────┘
 ```
-Getting the first 10 lines of a table that contains 3 columns of UInt32 type from a CSV file:
+
+Getting the first 10 lines of a table that contains 3 columns of [UInt32](../../sql-reference/data-types/int-uint.md) type from a CSV file:
 
 ``` sql
 SELECT * FROM file('test.csv', 'CSV', 'column1 UInt32, column2 UInt32, column3 UInt32') LIMIT 10;
@@ -71,17 +72,16 @@ SELECT * FROM file('test.csv', 'CSV', 'column1 UInt32, column2 UInt32, column3 U
 └─────────┴─────────┴─────────┘
 ```
 
-
 ## Globs in Path {#globs-in-path}
 
-Multiple path components can have globs. For being processed file should exists and matches to the whole path pattern (not only suffix or prefix).
+Multiple path components can have globs. For being processed file must exist and match to the whole path pattern (not only suffix or prefix).
 
 -   `*` — Substitutes any number of any characters except `/` including empty string.
 -   `?` — Substitutes any single character.
 -   `{some_string,another_string,yet_another_one}` — Substitutes any of strings `'some_string', 'another_string', 'yet_another_one'`.
 -   `{N..M}` — Substitutes any number in range from N to M including both borders.
 
-Constructions with `{}` are similar to the [remote table function](../../sql-reference/table-functions/remote.md)).
+Constructions with `{}` are similar to the [remote](remote.md) table function.
 
 **Example**
 
@@ -94,13 +94,13 @@ Suppose we have several files with the following relative paths:
 -   'another_dir/some_file_2'
 -   'another_dir/some_file_3'
 
-Query the amount of rows in these files:
+Query the number of rows in these files:
 
 ``` sql
 SELECT count(*) FROM file('{some,another}_dir/some_file_{1..3}', 'TSV', 'name String, value UInt32');
 ```
 
-Query the amount of rows in all files of these two directories:
+Query the number of rows in all files of these two directories:
 
 ``` sql
 SELECT count(*) FROM file('{some,another}_dir/*', 'TSV', 'name String, value UInt32');
@@ -124,6 +124,6 @@ SELECT count(*) FROM file('big_dir/file{0..9}{0..9}{0..9}', 'CSV', 'name String,
 
 **See Also**
 
--   [Virtual columns](https://clickhouse.tech/docs/en/operations/table_engines/#table_engines-virtual_columns)
+-   [Virtual columns](../../engines/table-engines/index.md#table_engines-virtual_columns)
 
 [Original article](https://clickhouse.tech/docs/en/sql-reference/table-functions/file/) <!--hide-->
diff --git a/docs/en/sql-reference/table-functions/generate.md b/docs/en/sql-reference/table-functions/generate.md
index be6ba2b8bc4..ae22e1a1b88 100644
--- a/docs/en/sql-reference/table-functions/generate.md
+++ b/docs/en/sql-reference/table-functions/generate.md
@@ -10,7 +10,7 @@ Allows to populate test tables with data.
 Supports all data types that can be stored in table except `LowCardinality` and `AggregateFunction`.
 
 ``` sql
-generateRandom('name TypeName[, name TypeName]...', [, 'random_seed'[, 'max_string_length'[, 'max_array_length']]]);
+generateRandom('name TypeName[, name TypeName]...', [, 'random_seed'[, 'max_string_length'[, 'max_array_length']]])
 ```
 
 **Arguments**
@@ -39,4 +39,3 @@ SELECT * FROM generateRandom('a Array(Int8), d Decimal32(4), c Tuple(DateTime64(
 └──────────┴──────────────┴────────────────────────────────────────────────────────────────────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/query_language/table_functions/generate/) <!--hide-->
diff --git a/docs/en/sql-reference/table-functions/hdfs.md b/docs/en/sql-reference/table-functions/hdfs.md
index 512f47a2b46..a7c3baca299 100644
--- a/docs/en/sql-reference/table-functions/hdfs.md
+++ b/docs/en/sql-reference/table-functions/hdfs.md
@@ -97,6 +97,5 @@ FROM hdfs('hdfs://hdfs1:9000/big_dir/file{0..9}{0..9}{0..9}', 'CSV', 'name Strin
 
 **See Also**
 
--   [Virtual columns](https://clickhouse.tech/docs/en/operations/table_engines/#table_engines-virtual_columns)
+-   [Virtual columns](../../engines/table-engines/index.md#table_engines-virtual_columns)
 
-[Original article](https://clickhouse.tech/docs/en/query_language/table_functions/hdfs/) <!--hide-->
diff --git a/docs/en/sql-reference/table-functions/index.md b/docs/en/sql-reference/table-functions/index.md
index 691687dea25..d65a18ab985 100644
--- a/docs/en/sql-reference/table-functions/index.md
+++ b/docs/en/sql-reference/table-functions/index.md
@@ -21,17 +21,18 @@ You can use table functions in:
 !!! warning "Warning"
     You can’t use table functions if the [allow_ddl](../../operations/settings/permissions-for-queries.md#settings_allow_ddl) setting is disabled.
 
-| Function                                                  | Description                                                                                                                            |
-|-----------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------|
-| [file](../../sql-reference/table-functions/file.md)       | Creates a [File](../../engines/table-engines/special/file.md)-engine table.                                                            |
-| [merge](../../sql-reference/table-functions/merge.md)     | Creates a [Merge](../../engines/table-engines/special/merge.md)-engine table.                                                          |
-| [numbers](../../sql-reference/table-functions/numbers.md) | Creates a table with a single column filled with integer numbers.                                                                      |
-| [remote](../../sql-reference/table-functions/remote.md)   | Allows you to access remote servers without creating a [Distributed](../../engines/table-engines/special/distributed.md)-engine table. |
-| [url](../../sql-reference/table-functions/url.md)         | Creates a [Url](../../engines/table-engines/special/url.md)-engine table.                                                              |
-| [mysql](../../sql-reference/table-functions/mysql.md)     | Creates a [MySQL](../../engines/table-engines/integrations/mysql.md)-engine table.                                                     |
-| [jdbc](../../sql-reference/table-functions/jdbc.md)       | Creates a [JDBC](../../engines/table-engines/integrations/jdbc.md)-engine table.                                                       |
-| [odbc](../../sql-reference/table-functions/odbc.md)       | Creates a [ODBC](../../engines/table-engines/integrations/odbc.md)-engine table.                                                       |
-| [hdfs](../../sql-reference/table-functions/hdfs.md)       | Creates a [HDFS](../../engines/table-engines/integrations/hdfs.md)-engine table.                                                       |
-| [s3](../../sql-reference/table-functions/s3.md)           | Creates a [S3](../../engines/table-engines/integrations/s3.md)-engine table.                                                       |
+| Function                                                         | Description                                                                                                                            |
+|------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------|
+| [file](../../sql-reference/table-functions/file.md)              | Creates a [File](../../engines/table-engines/special/file.md)-engine table.                                                            |
+| [merge](../../sql-reference/table-functions/merge.md)            | Creates a [Merge](../../engines/table-engines/special/merge.md)-engine table.                                                          |
+| [numbers](../../sql-reference/table-functions/numbers.md)        | Creates a table with a single column filled with integer numbers.                                                                      |
+| [remote](../../sql-reference/table-functions/remote.md)          | Allows you to access remote servers without creating a [Distributed](../../engines/table-engines/special/distributed.md)-engine table. |
+| [url](../../sql-reference/table-functions/url.md)                | Creates a [Url](../../engines/table-engines/special/url.md)-engine table.                                                              |
+| [mysql](../../sql-reference/table-functions/mysql.md)            | Creates a [MySQL](../../engines/table-engines/integrations/mysql.md)-engine table.                                                     |
+| [postgresql](../../sql-reference/table-functions/postgresql.md)  | Creates a [PostgreSQL](../../engines/table-engines/integrations/postgresql.md)-engine table.                                           |
+| [jdbc](../../sql-reference/table-functions/jdbc.md)              | Creates a [JDBC](../../engines/table-engines/integrations/jdbc.md)-engine table.                                                       |
+| [odbc](../../sql-reference/table-functions/odbc.md)              | Creates a [ODBC](../../engines/table-engines/integrations/odbc.md)-engine table.                                                       |
+| [hdfs](../../sql-reference/table-functions/hdfs.md)              | Creates a [HDFS](../../engines/table-engines/integrations/hdfs.md)-engine table.                                                       |
+| [s3](../../sql-reference/table-functions/s3.md)                  | Creates a [S3](../../engines/table-engines/integrations/s3.md)-engine table.                                                           |
 
-[Original article](https://clickhouse.tech/docs/en/query_language/table_functions/) <!--hide-->
+[Original article](https://clickhouse.tech/docs/en/sql-reference/table-functions/) <!--hide-->
diff --git a/docs/en/sql-reference/table-functions/input.md b/docs/en/sql-reference/table-functions/input.md
index 40f9f4f7f6f..17707b798d6 100644
--- a/docs/en/sql-reference/table-functions/input.md
+++ b/docs/en/sql-reference/table-functions/input.md
@@ -42,4 +42,3 @@ $ cat data.csv | clickhouse-client --query="INSERT INTO test FORMAT CSV"
 $ cat data.csv | clickhouse-client --query="INSERT INTO test SELECT * FROM input('test_structure') FORMAT CSV"
 ```
 
-[Original article](https://clickhouse.tech/docs/en/query_language/table_functions/input/) <!--hide-->
diff --git a/docs/en/sql-reference/table-functions/jdbc.md b/docs/en/sql-reference/table-functions/jdbc.md
index 6fd53b0e794..c6df022c342 100644
--- a/docs/en/sql-reference/table-functions/jdbc.md
+++ b/docs/en/sql-reference/table-functions/jdbc.md
@@ -24,4 +24,3 @@ SELECT * FROM jdbc('mysql://localhost:3306/?user=root&password=root', 'schema',
 SELECT * FROM jdbc('datasource://mysql-local', 'schema', 'table')
 ```
 
-[Original article](https://clickhouse.tech/docs/en/query_language/table_functions/jdbc/) <!--hide-->
diff --git a/docs/en/sql-reference/table-functions/merge.md b/docs/en/sql-reference/table-functions/merge.md
index 7b3d88f6266..a5c74b71069 100644
--- a/docs/en/sql-reference/table-functions/merge.md
+++ b/docs/en/sql-reference/table-functions/merge.md
@@ -9,4 +9,3 @@ toc_title: merge
 
 The table structure is taken from the first table encountered that matches the regular expression.
 
-[Original article](https://clickhouse.tech/docs/en/query_language/table_functions/merge/) <!--hide-->
diff --git a/docs/en/sql-reference/table-functions/mysql.md b/docs/en/sql-reference/table-functions/mysql.md
index 14cd4369285..7b4e2a301b3 100644
--- a/docs/en/sql-reference/table-functions/mysql.md
+++ b/docs/en/sql-reference/table-functions/mysql.md
@@ -44,7 +44,7 @@ The rest of the conditions and the `LIMIT` sampling constraint are executed in C
 A table object with the same columns as the original MySQL table.
 
 !!! info "Note"
-    In the `INSERT` query to distinguish table function `mysql(...)` from table name with column names list you must use keywords `FUNCTION` or `TABLE FUNCTION`. See examples below. 
+    In the `INSERT` query to distinguish table function `mysql(...)` from table name with column names list, you must use keywords `FUNCTION` or `TABLE FUNCTION`. See examples below. 
 
 **Examples**
 
diff --git a/docs/en/sql-reference/table-functions/numbers.md b/docs/en/sql-reference/table-functions/numbers.md
index 53e4e42a2f8..f9735056b05 100644
--- a/docs/en/sql-reference/table-functions/numbers.md
+++ b/docs/en/sql-reference/table-functions/numbers.md
@@ -25,4 +25,3 @@ Examples:
 select toDate('2010-01-01') + number as d FROM numbers(365);
 ```
 
-[Original article](https://clickhouse.tech/docs/en/query_language/table_functions/numbers/) <!--hide-->
diff --git a/docs/en/sql-reference/table-functions/odbc.md b/docs/en/sql-reference/table-functions/odbc.md
index ea79cd44a93..a8481fbfd68 100644
--- a/docs/en/sql-reference/table-functions/odbc.md
+++ b/docs/en/sql-reference/table-functions/odbc.md
@@ -102,5 +102,3 @@ SELECT * FROM odbc('DSN=mysqlconn', 'test', 'test')
 
 -   [ODBC external dictionaries](../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md#dicts-external_dicts_dict_sources-odbc)
 -   [ODBC table engine](../../engines/table-engines/integrations/odbc.md).
-
-[Original article](https://clickhouse.tech/docs/en/query_language/table_functions/jdbc/) <!--hide-->
diff --git a/docs/en/sql-reference/table-functions/postgresql.md b/docs/en/sql-reference/table-functions/postgresql.md
new file mode 100644
index 00000000000..3eab572ac12
--- /dev/null
+++ b/docs/en/sql-reference/table-functions/postgresql.md
@@ -0,0 +1,120 @@
+---
+toc_priority: 42
+toc_title: postgresql
+---
+
+# postgresql {#postgresql}
+
+Allows `SELECT` and `INSERT` queries to be performed on data that is stored on a remote PostgreSQL server.
+
+**Syntax**
+
+``` sql
+postgresql('host:port', 'database', 'table', 'user', 'password'[, `schema`])
+```
+
+**Arguments**
+
+-   `host:port` — PostgreSQL server address.
+-   `database` — Remote database name.
+-   `table` — Remote table name.
+-   `user` — PostgreSQL user.
+-   `password` — User password.
+-   `schema` — Non-default table schema. Optional.
+
+**Returned Value**
+
+A table object with the same columns as the original PostgreSQL table.
+
+!!! info "Note"
+    In the `INSERT` query to distinguish table function `postgresql(...)` from table name with column names list you must use keywords `FUNCTION` or `TABLE FUNCTION`. See examples below.
+
+## Implementation Details {#implementation-details}
+
+`SELECT` queries on PostgreSQL side run as `COPY (SELECT ...) TO STDOUT` inside read-only PostgreSQL transaction with commit after each `SELECT` query.
+
+Simple `WHERE` clauses such as `=`, `!=`, `>`, `>=`, `<`, `<=`, and `IN` are executed on the PostgreSQL server.
+
+All joins, aggregations, sorting, `IN [ array ]` conditions and the `LIMIT` sampling constraint are executed in ClickHouse only after the query to PostgreSQL finishes.
+
+`INSERT` queries on PostgreSQL side run as `COPY "table_name" (field1, field2, ... fieldN) FROM STDIN` inside PostgreSQL transaction with auto-commit after each `INSERT` statement.
+
+PostgreSQL Array types converts into ClickHouse arrays.
+
+!!! info "Note"
+    Be careful, in PostgreSQL an array data type column like Integer[] may contain arrays of different dimensions in different rows, but in ClickHouse it is only allowed to have multidimensional arrays of the same dimension in all rows.
+
+Supports replicas priority for PostgreSQL dictionary source. The bigger the number in map, the less the priority. The highest priority is `0`. 
+
+**Examples**
+
+Table in PostgreSQL:
+
+``` text
+postgres=# CREATE TABLE "public"."test" (
+"int_id" SERIAL,
+"int_nullable" INT NULL DEFAULT NULL,
+"float" FLOAT NOT NULL,
+"str" VARCHAR(100) NOT NULL DEFAULT '',
+"float_nullable" FLOAT NULL DEFAULT NULL,
+PRIMARY KEY (int_id));
+
+CREATE TABLE
+
+postgres=# INSERT INTO test (int_id, str, "float") VALUES (1,'test',2);
+INSERT 0 1
+
+postgresql> SELECT * FROM test;
+  int_id | int_nullable | float | str  | float_nullable
+ --------+--------------+-------+------+----------------
+       1 |              |     2 | test |
+(1 row)
+```
+
+Selecting data from ClickHouse:
+
+```sql
+SELECT * FROM postgresql('localhost:5432', 'test', 'test', 'postgresql_user', 'password') WHERE str IN ('test');
+```
+
+``` text
+┌─int_id─┬─int_nullable─┬─float─┬─str──┬─float_nullable─┐
+│      1 │         ᴺᵁᴸᴸ │     2 │ test │           ᴺᵁᴸᴸ │
+└────────┴──────────────┴───────┴──────┴────────────────┘
+```
+
+Inserting:
+
+```sql
+INSERT INTO TABLE FUNCTION postgresql('localhost:5432', 'test', 'test', 'postgrsql_user', 'password') (int_id, float) VALUES (2, 3);
+SELECT * FROM postgresql('localhost:5432', 'test', 'test', 'postgresql_user', 'password');
+```
+
+``` text
+┌─int_id─┬─int_nullable─┬─float─┬─str──┬─float_nullable─┐
+│      1 │         ᴺᵁᴸᴸ │     2 │ test │           ᴺᵁᴸᴸ │
+│      2 │         ᴺᵁᴸᴸ │     3 │      │           ᴺᵁᴸᴸ │
+└────────┴──────────────┴───────┴──────┴────────────────┘
+```
+
+Using Non-default Schema:
+
+```text
+postgres=# CREATE SCHEMA "nice.schema";
+
+postgres=# CREATE TABLE "nice.schema"."nice.table" (a integer);
+
+postgres=# INSERT INTO "nice.schema"."nice.table" SELECT i FROM generate_series(0, 99) as t(i)
+```
+
+```sql
+CREATE TABLE pg_table_schema_with_dots (a UInt32)
+        ENGINE PostgreSQL('localhost:5432', 'clickhouse', 'nice.table', 'postgrsql_user', 'password', 'nice.schema');
+```
+
+**See Also**
+
+-   [The PostgreSQL table engine](../../engines/table-engines/integrations/postgresql.md)
+-   [Using PostgreSQL as a source of external dictionary](../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md#dicts-external_dicts_dict_sources-postgresql)
+
+[Original article](https://clickhouse.tech/docs/en/sql-reference/table-functions/postgresql/) <!--hide-->
diff --git a/docs/en/sql-reference/table-functions/remote.md b/docs/en/sql-reference/table-functions/remote.md
index 8af5b588412..e80e58a76aa 100644
--- a/docs/en/sql-reference/table-functions/remote.md
+++ b/docs/en/sql-reference/table-functions/remote.md
@@ -5,7 +5,7 @@ toc_title: remote
 
 # remote, remoteSecure {#remote-remotesecure}
 
-Allows to access remote servers without creating a [Distributed](../../engines/table-engines/special/distributed.md) table. `remoteSecure` - same as `remote` but with secured connection. 
+Allows to access remote servers without creating a [Distributed](../../engines/table-engines/special/distributed.md) table. `remoteSecure` - same as `remote` but with a secured connection.
 
 Both functions can be used in `SELECT` and `INSERT` queries.
 
@@ -18,31 +18,31 @@ remoteSecure('addresses_expr', db, table[, 'user'[, 'password'], sharding_key])
 remoteSecure('addresses_expr', db.table[, 'user'[, 'password'], sharding_key])
 ```
 
-**Input parameters**
+**Parameters**
 
-- `addresses_expr` – An expression that generates addresses of remote servers. This may be just one server address. The server address is `host:port`, or just `host`. 
+- `addresses_expr` — An expression that generates addresses of remote servers. This may be just one server address. The server address is `host:port`, or just `host`. 
    
     The host can be specified as the server name, or as the IPv4 or IPv6 address. An IPv6 address is specified in square brackets. 
    
-    The port is the TCP port on the remote server. If the port is omitted, it uses  [tcp_port](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-tcp_port) from the server’s config file in `remote` (by default, 9000) and [tcp_port_secure](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-tcp_port_secure) in `remoteSecure` (by default, 9440). 
+    The port is the TCP port on the remote server. If the port is omitted, it uses [tcp_port](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-tcp_port) from the server’s config file in `remote` (by default, 9000) and [tcp_port_secure](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-tcp_port_secure) in `remoteSecure` (by default, 9440).
 
     The port is required for an IPv6 address.
 
     Type: [String](../../sql-reference/data-types/string.md).
 
-- `db` - Database name. Type: [String](../../sql-reference/data-types/string.md).
-- `table` - Table name. Type: [String](../../sql-reference/data-types/string.md).
-- `user` - User name. If the user is not specified, `default` is used. Type: [String](../../sql-reference/data-types/string.md).
-- `password` - User password. If the password is not specified, an empty password is used. Type: [String](../../sql-reference/data-types/string.md).
-- `sharding_key` - Sharding key to support distributing data across nodes. For example: `insert into remote('127.0.0.1:9000,127.0.0.2', db, table, 'default', rand())`. Type: [UInt32](../../sql-reference/data-types/int-uint.md).
+- `db` — Database name. Type: [String](../../sql-reference/data-types/string.md).
+- `table` — Table name. Type: [String](../../sql-reference/data-types/string.md).
+- `user` — User name. If the user is not specified, `default` is used. Type: [String](../../sql-reference/data-types/string.md).
+- `password` — User password. If the password is not specified, an empty password is used. Type: [String](../../sql-reference/data-types/string.md).
+- `sharding_key` — Sharding key to support distributing data across nodes. For example: `insert into remote('127.0.0.1:9000,127.0.0.2', db, table, 'default', rand())`. Type: [UInt32](../../sql-reference/data-types/int-uint.md).
 
 **Returned value**
 
-Dataset from remote servers.
+The dataset from remote servers.
 
 **Usage**
 
-Using the `remote` table function is less optimal than creating a `Distributed` table, because in this case the server connection is re-established for every request. In addition, if host names are set, the names are resolved, and errors are not counted when working with various replicas. When processing a large number of queries, always create the `Distributed` table ahead of time, and don’t use the `remote` table function.
+Using the `remote` table function is less optimal than creating a `Distributed` table because in this case the server connection is re-established for every request. Also, if hostnames are set, the names are resolved, and errors are not counted when working with various replicas. When processing a large number of queries, always create the `Distributed` table ahead of time, and don’t use the `remote` table function.
 
 The `remote` table function can be useful in the following cases:
 
@@ -62,7 +62,7 @@ localhost
 [2a02:6b8:0:1111::11]:9000
 ```
 
-Multiple addresses can be comma-separated. In this case, ClickHouse will use distributed processing, so it will send the query to all specified addresses (like to shards with different data). Example:
+Multiple addresses can be comma-separated. In this case, ClickHouse will use distributed processing, so it will send the query to all specified addresses (like shards with different data). Example:
 
 ``` text
 example01-01-1,example01-02-1
@@ -82,7 +82,7 @@ example01-{01..02}-1
 
 If you have multiple pairs of curly brackets, it generates the direct product of the corresponding sets.
 
-Addresses and parts of addresses in curly brackets can be separated by the pipe symbol (\|). In this case, the corresponding sets of addresses are interpreted as replicas, and the query will be sent to the first healthy replica. However, the replicas are iterated in the order currently set in the [load_balancing](../../operations/settings/settings.md) setting. This example specifies two shards that each have two replicas:
+Addresses and parts of addresses in curly brackets can be separated by the pipe symbol (\|). In this case, the corresponding sets of addresses are interpreted as replicas, and the query will be sent to the first healthy replica. However, the replicas are iterated in the order currently set in the [load_balancing](../../operations/settings/settings.md#settings-load_balancing) setting. This example specifies two shards that each have two replicas:
 
 ``` text
 example01-{01..02}-{1|2}
diff --git a/docs/en/sql-reference/table-functions/s3.md b/docs/en/sql-reference/table-functions/s3.md
index 76a0e042ea4..285ec862aab 100644
--- a/docs/en/sql-reference/table-functions/s3.md
+++ b/docs/en/sql-reference/table-functions/s3.md
@@ -3,33 +3,35 @@ toc_priority: 45
 toc_title: s3
 ---
 
-# s3 {#s3}
+# S3 Table Function {#s3-table-function}
 
-Provides table-like interface to select/insert files in S3. This table function is similar to [hdfs](../../sql-reference/table-functions/hdfs.md).
+Provides table-like interface to select/insert files in [Amazon S3](https://aws.amazon.com/s3/). This table function is similar to [hdfs](../../sql-reference/table-functions/hdfs.md), but provides S3-specific features.
+
+**Syntax**
 
 ``` sql
 s3(path, [aws_access_key_id, aws_secret_access_key,] format, structure, [compression])
 ```
 
-**Input parameters**
+**Arguments**
 
--   `path` — Bucket url with path to file. Supports following wildcards in readonly mode: *, ?, {abc,def} and {N..M} where N, M — numbers, `’abc’, ‘def’ — strings.
+-   `path` — Bucket url with path to file. Supports following wildcards in readonly mode: `*`, `?`, `{abc,def}` and `{N..M}` where `N`, `M` — numbers, `'abc'`, `'def'` — strings. For more information see [here](../../engines/table-engines/integrations/s3.md#wildcards-in-path).
 -   `format` — The [format](../../interfaces/formats.md#formats) of the file.
 -   `structure` — Structure of the table. Format `'column1_name column1_type, column2_name column2_type, ...'`.
--   `compression` — Parameter is optional. Supported values: none, gzip/gz, brotli/br, xz/LZMA, zstd/zst. By default, it will autodetect compression by file extension.
+-   `compression` — Parameter is optional. Supported values: `none`, `gzip/gz`, `brotli/br`, `xz/LZMA`, `zstd/zst`. By default, it will autodetect compression by file extension.
 
 **Returned value**
 
 A table with the specified structure for reading or writing data in the specified file.
 
-**Example**
+**Examples**
 
-Table from S3 file `https://storage.yandexcloud.net/my-test-bucket-768/data.csv` and selection of the first two rows from it:
+Selecting the first two rows from the table from S3 file `https://storage.yandexcloud.net/my-test-bucket-768/data.csv`:
 
 ``` sql
 SELECT *
 FROM s3('https://storage.yandexcloud.net/my-test-bucket-768/data.csv', 'CSV', 'column1 UInt32, column2 UInt32, column3 UInt32')
-LIMIT 2
+LIMIT 2;
 ```
 
 ``` text
@@ -44,7 +46,7 @@ The similar but from file with `gzip` compression:
 ``` sql
 SELECT *
 FROM s3('https://storage.yandexcloud.net/my-test-bucket-768/data.csv.gz', 'CSV', 'column1 UInt32, column2 UInt32, column3 UInt32', 'gzip')
-LIMIT 2
+LIMIT 2;
 ```
 
 ``` text
@@ -54,33 +56,20 @@ LIMIT 2
 └─────────┴─────────┴─────────┘
 ```
 
-**Globs in path**
+## Usage {#usage-examples}
 
-Multiple path components can have globs. For being processed file should exists and matches to the whole path pattern (not only suffix or prefix).
+Suppose that we have several files with following URIs on S3:
 
--   `*` — Substitutes any number of any characters except `/` including empty string.
--   `?` — Substitutes any single character.
--   `{some_string,another_string,yet_another_one}` — Substitutes any of strings `'some_string', 'another_string', 'yet_another_one'`.
--   `{N..M}` — Substitutes any number in range from N to M including both borders. N and M can have leading zeroes e.g. `000..078`.
+-   'https://storage.yandexcloud.net/my-test-bucket-768/some_prefix/some_file_1.csv'
+-   'https://storage.yandexcloud.net/my-test-bucket-768/some_prefix/some_file_2.csv'
+-   'https://storage.yandexcloud.net/my-test-bucket-768/some_prefix/some_file_3.csv'
+-   'https://storage.yandexcloud.net/my-test-bucket-768/some_prefix/some_file_4.csv'
+-   'https://storage.yandexcloud.net/my-test-bucket-768/another_prefix/some_file_1.csv'
+-   'https://storage.yandexcloud.net/my-test-bucket-768/another_prefix/some_file_2.csv'
+-   'https://storage.yandexcloud.net/my-test-bucket-768/another_prefix/some_file_3.csv'
+-   'https://storage.yandexcloud.net/my-test-bucket-768/another_prefix/some_file_4.csv'
 
-Constructions with `{}` are similar to the [remote table function](../../sql-reference/table-functions/remote.md)).
-
-**Example**
-
-1.  Suppose that we have several files with following URIs on S3:
-
--   ‘https://storage.yandexcloud.net/my-test-bucket-768/some_prefix/some_file_1.csv’
--   ‘https://storage.yandexcloud.net/my-test-bucket-768/some_prefix/some_file_2.csv’
--   ‘https://storage.yandexcloud.net/my-test-bucket-768/some_prefix/some_file_3.csv’
--   ‘https://storage.yandexcloud.net/my-test-bucket-768/some_prefix/some_file_4.csv’
--   ‘https://storage.yandexcloud.net/my-test-bucket-768/another_prefix/some_file_1.csv’
--   ‘https://storage.yandexcloud.net/my-test-bucket-768/another_prefix/some_file_2.csv’
--   ‘https://storage.yandexcloud.net/my-test-bucket-768/another_prefix/some_file_3.csv’
--   ‘https://storage.yandexcloud.net/my-test-bucket-768/another_prefix/some_file_4.csv’
-
-2.  Query the amount of rows in files end with number from 1 to 3:
-
-<!-- -->
+Count the amount of rows in files ending with numbers from 1 to 3:
 
 ``` sql
 SELECT count(*)
@@ -93,9 +82,7 @@ FROM s3('https://storage.yandexcloud.net/my-test-bucket-768/{some,another}_prefi
 └─────────┘
 ```
 
-3.  Query the amount of rows in all files of these two directories:
-
-<!-- -->
+Count the total amount of rows in all files in these two directories:
 
 ``` sql
 SELECT count(*)
@@ -108,17 +95,14 @@ FROM s3('https://storage.yandexcloud.net/my-test-bucket-768/{some,another}_prefi
 └─────────┘
 ```
 
-
 !!! warning "Warning"
     If your listing of files contains number ranges with leading zeros, use the construction with braces for each digit separately or use `?`.
 
-**Example**
-
-Query the data from files named `file-000.csv`, `file-001.csv`, … , `file-999.csv`:
+Count the total amount of rows in files named `file-000.csv`, `file-001.csv`, … , `file-999.csv`:
 
 ``` sql
 SELECT count(*)
-FROM s3('https://storage.yandexcloud.net/my-test-bucket-768/big_prefix/file-{000..999}.csv', 'CSV', 'name String, value UInt32')
+FROM s3('https://storage.yandexcloud.net/my-test-bucket-768/big_prefix/file-{000..999}.csv', 'CSV', 'name String, value UInt32');
 ```
 
 ``` text
@@ -127,43 +111,22 @@ FROM s3('https://storage.yandexcloud.net/my-test-bucket-768/big_prefix/file-{000
 └─────────┘
 ```
 
-**Data insert**
-
-The S3 table function may be used for data insert as well.
-
-**Example**
-
-Insert a data into file `test-data.csv.gz`:
+Insert data into file `test-data.csv.gz`:
 
 ``` sql
 INSERT INTO s3('https://storage.yandexcloud.net/my-test-bucket-768/test-data.csv.gz', 'CSV', 'name String, value UInt32', 'gzip')
-VALUES ('test-data', 1), ('test-data-2', 2)
+VALUES ('test-data', 1), ('test-data-2', 2);
 ```
 
-Insert a data into file `test-data.csv.gz` from existing table:
+Insert data into file `test-data.csv.gz` from existing table:
 
 ``` sql
 INSERT INTO s3('https://storage.yandexcloud.net/my-test-bucket-768/test-data.csv.gz', 'CSV', 'name String, value UInt32', 'gzip')
-SELECT name, value FROM existing_table
+SELECT name, value FROM existing_table;
 ```
 
-## Virtual Columns {#virtual-columns}
-
--   `_path` — Path to the file.
--   `_file` — Name of the file.
-
-## S3-related settings {#settings}
-
-The following settings can be set before query execution or placed into configuration file.
-
--   `s3_max_single_part_upload_size` — Default value is `64Mb`. The maximum size of object to upload using singlepart upload to S3.
--   `s3_min_upload_part_size` — Default value is `512Mb`. The minimum size of part to upload during multipart upload to [S3 Multipart upload](https://docs.aws.amazon.com/AmazonS3/latest/dev/uploadobjusingmpu.html).
--   `s3_max_redirects` — Default value is `10`. Max number of S3 redirects hops allowed.
-
-Security consideration: if malicious user can specify arbitrary S3 URLs, `s3_max_redirects` must be set to zero to avoid [SSRF](https://en.wikipedia.org/wiki/Server-side_request_forgery) attacks; or alternatively, `remote_host_filter` must be specified in server configuration.
-
 **See Also**
 
--   [Virtual columns](https://clickhouse.tech/docs/en/operations/table_engines/#table_engines-virtual_columns)
+-   [S3 engine](../../engines/table-engines/integrations/s3.md)
 
-[Original article](https://clickhouse.tech/docs/en/query_language/table_functions/s3/) <!--hide-->
+[Original article](https://clickhouse.tech/docs/en/sql-reference/table-functions/s3/) <!--hide-->
diff --git a/docs/en/sql-reference/table-functions/url.md b/docs/en/sql-reference/table-functions/url.md
index d70774b7588..2192b69d006 100644
--- a/docs/en/sql-reference/table-functions/url.md
+++ b/docs/en/sql-reference/table-functions/url.md
@@ -15,25 +15,25 @@ toc_title: url
 url(URL, format, structure)
 ```
 
-**Input parameters**
+**Parameters**
 
-- `URL` - HTTP or HTTPS server address, which can accept `GET` (for `SELECT`) or `POST` (for `INSERT`) requests. Type: [String](../../sql-reference/data-types/string.md).
-- `format` - [Format](../../interfaces/formats.md#formats) of the data. Type: [String](../../sql-reference/data-types/string.md).
-- `structure` - Table structure in `'UserID UInt64, Name String'` format. Determines column names and types. Type: [String](../../sql-reference/data-types/string.md).
+- `URL` — HTTP or HTTPS server address, which can accept `GET` or `POST` requests (for `SELECT` or `INSERT` queries correspondingly). Type: [String](../../sql-reference/data-types/string.md).
+- `format` — [Format](../../interfaces/formats.md#formats) of the data. Type: [String](../../sql-reference/data-types/string.md).
+- `structure` — Table structure in `'UserID UInt64, Name String'` format. Determines column names and types. Type: [String](../../sql-reference/data-types/string.md).
 
 **Returned value**
 
-A table with the specified format and structure and with data from the defined URL.
+A table with the specified format and structure and with data from the defined `URL`.
 
 **Examples**
 
-Getting the first 3 lines of a table that contains columns of `String` and `UInt32` type from HTTP-server which answers in `CSV` format.
+Getting the first 3 lines of a table that contains columns of `String` and [UInt32](../../sql-reference/data-types/int-uint.md) type from HTTP-server which answers in [CSV](../../interfaces/formats.md#csv) format.
 
 ``` sql
 SELECT * FROM url('http://127.0.0.1:12345/', CSV, 'column1 String, column2 UInt32') LIMIT 3;
 ```
 
-Inserting data from a URL into a table:
+Inserting data from a `URL` into a table:
 
 ``` sql
 CREATE TABLE test_table (column1 String, column2 UInt32) ENGINE=Memory;
diff --git a/docs/en/sql-reference/table-functions/view.md b/docs/en/sql-reference/table-functions/view.md
index 08096c2b019..e49a9f5218b 100644
--- a/docs/en/sql-reference/table-functions/view.md
+++ b/docs/en/sql-reference/table-functions/view.md
@@ -37,7 +37,7 @@ Input table:
 Query:
 
 ``` sql
-SELECT * FROM view(SELECT name FROM months)
+SELECT * FROM view(SELECT name FROM months);
 ```
 
 Result:
@@ -54,14 +54,15 @@ Result:
 You can use the `view` function as a parameter of the [remote](https://clickhouse.tech/docs/en/sql-reference/table-functions/remote/#remote-remotesecure) and [cluster](https://clickhouse.tech/docs/en/sql-reference/table-functions/cluster/#cluster-clusterallreplicas) table functions:
 
 ``` sql
-SELECT * FROM remote(`127.0.0.1`, view(SELECT a, b, c FROM table_name))
+SELECT * FROM remote(`127.0.0.1`, view(SELECT a, b, c FROM table_name));
 ```
 
 ``` sql
-SELECT * FROM cluster(`cluster_name`, view(SELECT a, b, c FROM table_name))
+SELECT * FROM cluster(`cluster_name`, view(SELECT a, b, c FROM table_name));
 ```
 
 **See Also**
 
 -   [View Table Engine](https://clickhouse.tech/docs/en/engines/table-engines/special/view/)
-[Original article](https://clickhouse.tech/docs/en/query_language/table_functions/view/) <!--hide-->
\ No newline at end of file
+
+[Original article](https://clickhouse.tech/docs/en/sql-reference/table-functions/view/) <!--hide-->
diff --git a/docs/en/sql-reference/window-functions/index.md b/docs/en/sql-reference/window-functions/index.md
index cbf03a44d46..a646347ea60 100644
--- a/docs/en/sql-reference/window-functions/index.md
+++ b/docs/en/sql-reference/window-functions/index.md
@@ -23,7 +23,9 @@ ClickHouse supports the standard grammar for defining windows and window functio
 | `GROUPS` frame | not supported |
 | Calculating aggregate functions over a frame (`sum(value) over (order by time)`) | all aggregate functions are supported |
 | `rank()`, `dense_rank()`, `row_number()` | supported |
-| `lag/lead(value, offset)` | not supported, replace with `any(value) over (.... rows between <offset> preceding and <offset> preceding)`, or `following` for `lead`| 
+| `lag/lead(value, offset)` | Not supported. Workarounds: |
+|  | 1) replace with `any(value) over (.... rows between <offset> preceding and <offset> preceding)`, or `following` for `lead`|
+|  | 2) use `lagInFrame/leadInFrame`, which are analogous, but respect the window frame. To get behavior identical to `lag/lead`, use `rows between unbounded preceding and unbounded following` |
 
 ## References
 
diff --git a/docs/es/commercial/cloud.md b/docs/es/commercial/cloud.md
deleted file mode 100644
index bc593a82ad7..00000000000
--- a/docs/es/commercial/cloud.md
+++ /dev/null
@@ -1,23 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 1
-toc_title: Nube
----
-
-# Proveedores de servicios en la nube de ClickHouse {#clickhouse-cloud-service-providers}
-
-!!! info "INFO"
-    Si ha lanzado una nube pública con el servicio ClickHouse administrado, no dude en [abrir una solicitud de extracción](https://github.com/ClickHouse/ClickHouse/edit/master/docs/en/commercial/cloud.md) añadiéndolo a la siguiente lista.
-
-## Nube de Yandex {#yandex-cloud}
-
-[Servicio administrado de Yandex para ClickHouse](https://cloud.yandex.com/services/managed-clickhouse?utm_source=referrals&utm_medium=clickhouseofficialsite&utm_campaign=link3) proporciona las siguientes características clave:
-
--   Servicio ZooKeeper totalmente gestionado para [Replicación de ClickHouse](../engines/table-engines/mergetree-family/replication.md)
--   Múltiples opciones de tipo de almacenamiento
--   Réplicas en diferentes zonas de disponibilidad
--   Cifrado y aislamiento
--   Mantenimiento automatizado
-
-{## [Artículo Original](https://clickhouse.tech/docs/en/commercial/cloud/) ##}
diff --git a/docs/es/commercial/index.md b/docs/es/commercial/index.md
deleted file mode 100644
index b367631ae1c..00000000000
--- a/docs/es/commercial/index.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: Comercial
-toc_priority: 70
-toc_title: Comercial
----
-
-
diff --git a/docs/es/commercial/support.md b/docs/es/commercial/support.md
deleted file mode 100644
index a817d90dcb5..00000000000
--- a/docs/es/commercial/support.md
+++ /dev/null
@@ -1,23 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 3
-toc_title: Apoyo
----
-
-# Proveedores de servicios de soporte comercial ClickHouse {#clickhouse-commercial-support-service-providers}
-
-!!! info "INFO"
-    Si ha lanzado un servicio de soporte comercial ClickHouse, no dude en [abrir una solicitud de extracción](https://github.com/ClickHouse/ClickHouse/edit/master/docs/en/commercial/support.md) añadiéndolo a la siguiente lista.
-
-## Altinidad {#altinity}
-
-Altinity ha ofrecido soporte y servicios empresariales ClickHouse desde 2017. Los clientes de Altinity van desde empresas Fortune 100 hasta startups. Visitar [Más información](https://www.altinity.com/) para más información.
-
-## Mafiree {#mafiree}
-
-[Descripción del servicio](http://mafiree.com/clickhouse-analytics-services.php)
-
-## MinervaDB {#minervadb}
-
-[Descripción del servicio](https://minervadb.com/index.php/clickhouse-consulting-and-support-by-minervadb/)
diff --git a/docs/es/development/architecture.md b/docs/es/development/architecture.md
deleted file mode 100644
index 1620a58a3a0..00000000000
--- a/docs/es/development/architecture.md
+++ /dev/null
@@ -1,203 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 62
-toc_title: "Descripci\xF3n general de la arquitectura ClickHouse"
----
-
-# Descripción general de la arquitectura ClickHouse {#overview-of-clickhouse-architecture}
-
-ClickHouse es un verdadero DBMS orientado a columnas. Los datos se almacenan por columnas y durante la ejecución de matrices (vectores o fragmentos de columnas). Siempre que sea posible, las operaciones se envían en matrices, en lugar de en valores individuales. Se llama “vectorized query execution,” y ayuda a reducir el costo del procesamiento de datos real.
-
-> Esta idea no es nada nuevo. Se remonta a la `APL` lenguaje de programación y sus descendientes: `A +`, `J`, `K`, y `Q`. La programación de matrices se utiliza en el procesamiento de datos científicos. Tampoco es esta idea algo nuevo en las bases de datos relacionales: por ejemplo, se usa en el `Vectorwise` sistema.
-
-Existen dos enfoques diferentes para acelerar el procesamiento de consultas: la ejecución de consultas vectorizadas y la generación de código en tiempo de ejecución. Este último elimina toda la indirección y el despacho dinámico. Ninguno de estos enfoques es estrictamente mejor que el otro. La generación de código de tiempo de ejecución puede ser mejor cuando fusiona muchas operaciones, utilizando así las unidades de ejecución de la CPU y la canalización. La ejecución de consultas vectorizadas puede ser menos práctica porque implica vectores temporales que deben escribirse en la memoria caché y leerse. Si los datos temporales no caben en la memoria caché L2, esto se convierte en un problema. Pero la ejecución de consultas vectorizadas utiliza más fácilmente las capacidades SIMD de la CPU. Un [documento de investigación](http://15721.courses.cs.cmu.edu/spring2016/papers/p5-sompolski.pdf) escrito por nuestros amigos muestra que es mejor combinar ambos enfoques. ClickHouse utiliza la ejecución de consultas vectorizadas y tiene un soporte inicial limitado para la generación de código en tiempo de ejecución.
-
-## Columna {#columns}
-
-`IColumn` interfaz se utiliza para representar columnas en la memoria (en realidad, fragmentos de columnas). Esta interfaz proporciona métodos auxiliares para la implementación de varios operadores relacionales. Casi todas las operaciones son inmutables: no modifican la columna original, sino que crean una nueva modificada. Por ejemplo, el `IColumn :: filter` método acepta una máscara de bytes de filtro. Se utiliza para el `WHERE` y `HAVING` operadores relacionales. Ejemplos adicionales: el `IColumn :: permute` para apoyar `ORDER BY`, el `IColumn :: cut` para apoyar `LIMIT`.
-
-Diversos `IColumn` aplicación (`ColumnUInt8`, `ColumnString`, y así sucesivamente) son responsables del diseño de memoria de las columnas. El diseño de memoria suele ser una matriz contigua. Para el tipo entero de columnas, es solo una matriz contigua, como `std :: vector`. Para `String` y `Array` columnas, son dos vectores: uno para todos los elementos de la matriz, colocados contiguamente, y un segundo para los desplazamientos al comienzo de cada matriz. También hay `ColumnConst` que almacena solo un valor en la memoria, pero parece una columna.
-
-## Campo {#field}
-
-Sin embargo, también es posible trabajar con valores individuales. Para representar un valor individual, el `Field` se utiliza. `Field` es sólo una unión discriminada de `UInt64`, `Int64`, `Float64`, `String` y `Array`. `IColumn` tiene el `operator[]` para obtener el valor n-ésimo como un `Field` y el `insert` método para agregar un `Field` al final de una columna. Estos métodos no son muy eficientes, ya que requieren tratar con temporal `Field` objetos que representan un valor individual. Hay métodos más eficientes, tales como `insertFrom`, `insertRangeFrom` y así sucesivamente.
-
-`Field` no tiene suficiente información sobre un tipo de datos específico para una tabla. Por ejemplo, `UInt8`, `UInt16`, `UInt32`, y `UInt64` todos están representados como `UInt64` en una `Field`.
-
-## Abstracciones con fugas {#leaky-abstractions}
-
-`IColumn` tiene métodos para transformaciones relacionales comunes de datos, pero no satisfacen todas las necesidades. Por ejemplo, `ColumnUInt64` no tiene un método para calcular la suma de dos columnas, y `ColumnString` no tiene un método para ejecutar una búsqueda de subcadena. Estas innumerables rutinas se implementan fuera de `IColumn`.
-
-Varias funciones en columnas se pueden implementar de una manera genérica, no eficiente utilizando `IColumn` para extraer `Field` valores, o de una manera especializada utilizando el conocimiento del diseño de la memoria interna de los datos en un `IColumn` aplicación. Se implementa mediante la conversión de funciones a un `IColumn` escriba y trate con la representación interna directamente. Por ejemplo, `ColumnUInt64` tiene el `getData` método que devuelve una referencia a una matriz interna, luego una rutina separada lee o llena esa matriz directamente. Tenemos “leaky abstractions” para permitir especializaciones eficientes de varias rutinas.
-
-## Tipos de datos {#data_types}
-
-`IDataType` es responsable de la serialización y deserialización: para leer y escribir fragmentos de columnas o valores individuales en formato binario o de texto. `IDataType` corresponde directamente a los tipos de datos en las tablas. Por ejemplo, hay `DataTypeUInt32`, `DataTypeDateTime`, `DataTypeString` y así sucesivamente.
-
-`IDataType` y `IColumn` están vagamente relacionados entre sí. Diferentes tipos de datos se pueden representar en la memoria por el mismo `IColumn` aplicación. Por ejemplo, `DataTypeUInt32` y `DataTypeDateTime` están representados por `ColumnUInt32` o `ColumnConstUInt32`. Además, el mismo tipo de datos se puede representar mediante `IColumn` aplicación. Por ejemplo, `DataTypeUInt8` puede ser representado por `ColumnUInt8` o `ColumnConstUInt8`.
-
-`IDataType` sólo almacena metadatos. Por ejemplo, `DataTypeUInt8` no almacena nada en absoluto (excepto vptr) y `DataTypeFixedString` tiendas solo `N` (el tamaño de las cadenas de tamaño fijo).
-
-`IDataType` tiene métodos auxiliares para varios formatos de datos. Los ejemplos son métodos para serializar un valor con posibles citas, para serializar un valor para JSON y para serializar un valor como parte del formato XML. No hay correspondencia directa con los formatos de datos. Por ejemplo, los diferentes formatos de datos `Pretty` y `TabSeparated` puede utilizar el mismo `serializeTextEscaped` método de ayuda de la `IDataType` interfaz.
-
-## Bloque {#block}
-
-A `Block` es un contenedor que representa un subconjunto (porción) de una tabla en la memoria. Es sólo un conjunto de triples: `(IColumn, IDataType, column name)`. Durante la ejecución de la consulta, los datos son procesados por `Block`s. Si tenemos un `Block`, tenemos datos (en el `IColumn` objeto), tenemos información sobre su tipo (en `IDataType`) que nos dice cómo lidiar con esa columna, y tenemos el nombre de la columna. Podría ser el nombre de columna original de la tabla o algún nombre artificial asignado para obtener resultados temporales de los cálculos.
-
-Cuando calculamos alguna función sobre columnas en un bloque, agregamos otra columna con su resultado al bloque, y no tocamos columnas para argumentos de la función porque las operaciones son inmutables. Más tarde, las columnas innecesarias se pueden eliminar del bloque, pero no se pueden modificar. Es conveniente para la eliminación de subexpresiones comunes.
-
-Se crean bloques para cada fragmento de datos procesado. Tenga en cuenta que para el mismo tipo de cálculo, los nombres y tipos de columna siguen siendo los mismos para diferentes bloques y solo cambian los datos de columna. Es mejor dividir los datos del bloque desde el encabezado del bloque porque los tamaños de bloque pequeños tienen una gran sobrecarga de cadenas temporales para copiar shared_ptrs y nombres de columna.
-
-## Bloquear flujos {#block-streams}
-
-Los flujos de bloques son para procesar datos. Usamos flujos de bloques para leer datos de algún lugar, realizar transformaciones de datos o escribir datos en algún lugar. `IBlockInputStream` tiene el `read` método para buscar el siguiente bloque mientras esté disponible. `IBlockOutputStream` tiene el `write` método para empujar el bloque en alguna parte.
-
-Los flujos son responsables de:
-
-1.  Leer o escribir en una mesa. La tabla solo devuelve una secuencia para leer o escribir bloques.
-2.  Implementación de formatos de datos. Por ejemplo, si desea enviar datos a un terminal en `Pretty` formato, crea un flujo de salida de bloque donde presiona bloques y los formatea.
-3.  Realización de transformaciones de datos. Digamos que tienes `IBlockInputStream` y desea crear una secuencia filtrada. Usted crea `FilterBlockInputStream` e inicializarlo con su transmisión. Luego, cuando tiras de un bloque de `FilterBlockInputStream`, extrae un bloque de su flujo, lo filtra y le devuelve el bloque filtrado. Las canalizaciones de ejecución de consultas se representan de esta manera.
-
-Hay transformaciones más sofisticadas. Por ejemplo, cuando tiras de `AggregatingBlockInputStream`, lee todos los datos de su origen, los agrega y, a continuación, devuelve un flujo de datos agregados para usted. Otro ejemplo: `UnionBlockInputStream` acepta muchas fuentes de entrada en el constructor y también una serie de subprocesos. Lanza múltiples hilos y lee de múltiples fuentes en paralelo.
-
-> Las secuencias de bloques usan el “pull” enfoque para controlar el flujo: cuando extrae un bloque de la primera secuencia, en consecuencia extrae los bloques requeridos de las secuencias anidadas, y toda la tubería de ejecución funcionará. Ni “pull” ni “push” es la mejor solución, porque el flujo de control está implícito y eso limita la implementación de varias características, como la ejecución simultánea de múltiples consultas (fusionando muchas tuberías). Esta limitación podría superarse con coroutines o simplemente ejecutando hilos adicionales que se esperan el uno al otro. Podemos tener más posibilidades si hacemos explícito el flujo de control: si localizamos la lógica para pasar datos de una unidad de cálculo a otra fuera de esas unidades de cálculo. Lea esto [artículo](http://journal.stuffwithstuff.com/2013/01/13/iteration-inside-and-out/) para más pensamientos.
-
-Debemos tener en cuenta que la canalización de ejecución de consultas crea datos temporales en cada paso. Tratamos de mantener el tamaño del bloque lo suficientemente pequeño para que los datos temporales se ajusten a la memoria caché de la CPU. Con esa suposición, escribir y leer datos temporales es casi gratis en comparación con otros cálculos. Podríamos considerar una alternativa, que es fusionar muchas operaciones en la tubería. Podría hacer que la tubería sea lo más corta posible y eliminar gran parte de los datos temporales, lo que podría ser una ventaja, pero también tiene inconvenientes. Por ejemplo, una canalización dividida facilita la implementación de almacenamiento en caché de datos intermedios, el robo de datos intermedios de consultas similares que se ejecutan al mismo tiempo y la fusión de canalizaciones para consultas similares.
-
-## Formato {#formats}
-
-Los formatos de datos se implementan con flujos de bloques. Hay “presentational” sólo es adecuado para la salida de datos al cliente, tales como `Pretty` formato, que proporciona sólo `IBlockOutputStream`. Y hay formatos de entrada / salida, como `TabSeparated` o `JSONEachRow`.
-
-También hay secuencias de filas: `IRowInputStream` y `IRowOutputStream`. Permiten pull/push datos por filas individuales, no por bloques. Y solo son necesarios para simplificar la implementación de formatos orientados a filas. Envoltura `BlockInputStreamFromRowInputStream` y `BlockOutputStreamFromRowOutputStream` le permite convertir flujos orientados a filas en flujos regulares orientados a bloques.
-
-## I/O {#io}
-
-Para la entrada / salida orientada a bytes, hay `ReadBuffer` y `WriteBuffer` clases abstractas. Se usan en lugar de C ++ `iostream`s. No se preocupe: cada proyecto maduro de C ++ está usando algo más que `iostream`s por buenas razones.
-
-`ReadBuffer` y `WriteBuffer` son solo un búfer contiguo y un cursor apuntando a la posición en ese búfer. Las implementaciones pueden poseer o no la memoria del búfer. Hay un método virtual para llenar el búfer con los siguientes datos (para `ReadBuffer`) o para vaciar el búfer en algún lugar (para `WriteBuffer`). Los métodos virtuales rara vez se llaman.
-
-Implementaciones de `ReadBuffer`/`WriteBuffer` se utilizan para trabajar con archivos y descriptores de archivos y sockets de red, para implementar la compresión (`CompressedWriteBuffer` is initialized with another WriteBuffer and performs compression before writing data to it), and for other purposes – the names `ConcatReadBuffer`, `LimitReadBuffer`, y `HashingWriteBuffer` hablar por sí mismos.
-
-Read / WriteBuffers solo se ocupan de bytes. Hay funciones de `ReadHelpers` y `WriteHelpers` archivos de encabezado para ayudar con el formato de entrada / salida. Por ejemplo, hay ayudantes para escribir un número en formato decimal.
-
-Veamos qué sucede cuando quieres escribir un conjunto de resultados en `JSON` formato a stdout. Tiene un conjunto de resultados listo para ser recuperado de `IBlockInputStream`. Usted crea `WriteBufferFromFileDescriptor(STDOUT_FILENO)` para escribir bytes en stdout. Usted crea `JSONRowOutputStream`, inicializado con eso `WriteBuffer` para escribir filas en `JSON` a stdout. Usted crea `BlockOutputStreamFromRowOutputStream` encima de él, para representarlo como `IBlockOutputStream`. Entonces usted llama `copyData` para transferir datos desde `IBlockInputStream` a `IBlockOutputStream` y todo funciona. Internamente, `JSONRowOutputStream` escribirá varios delimitadores JSON y llamará al `IDataType::serializeTextJSON` con una referencia a `IColumn` y el número de fila como argumentos. Consecuentemente, `IDataType::serializeTextJSON` llamará a un método de `WriteHelpers.h`: por ejemplo, `writeText` para tipos numéricos y `writeJSONString` para `DataTypeString`.
-
-## Tabla {#tables}
-
-El `IStorage` interfaz representa tablas. Las diferentes implementaciones de esa interfaz son diferentes motores de tabla. Los ejemplos son `StorageMergeTree`, `StorageMemory` y así sucesivamente. Las instancias de estas clases son solo tablas.
-
-Clave `IStorage` son `read` y `write`. También hay `alter`, `rename`, `drop` y así sucesivamente. El `read` método acepta los siguientes argumentos: el conjunto de columnas para leer de una tabla, el `AST` consulta a considerar, y el número deseado de flujos para devolver. Devuelve uno o varios `IBlockInputStream` objetos e información sobre la etapa de procesamiento de datos que se completó dentro de un motor de tablas durante la ejecución de la consulta.
-
-En la mayoría de los casos, el método de lectura solo es responsable de leer las columnas especificadas de una tabla, no de ningún procesamiento de datos adicional. Todo el procesamiento de datos adicional es realizado por el intérprete de consultas y está fuera de la responsabilidad de `IStorage`.
-
-Pero hay excepciones notables:
-
--   La consulta AST se pasa al `read` método, y el motor de tablas puede usarlo para derivar el uso del índice y leer menos datos de una tabla.
--   A veces, el motor de tablas puede procesar los datos a una etapa específica. Por ejemplo, `StorageDistributed` puede enviar una consulta a servidores remotos, pedirles que procesen datos a una etapa donde se puedan fusionar datos de diferentes servidores remotos y devolver esos datos preprocesados. El intérprete de consultas termina de procesar los datos.
-
-Tabla `read` método puede devolver múltiples `IBlockInputStream` objetos para permitir el procesamiento de datos en paralelo. Estos flujos de entrada de bloques múltiples pueden leer de una tabla en paralelo. A continuación, puede ajustar estas secuencias con varias transformaciones (como la evaluación de expresiones o el filtrado) que se pueden calcular de forma independiente y crear un `UnionBlockInputStream` encima de ellos, para leer desde múltiples flujos en paralelo.
-
-También hay `TableFunction`s. Estas son funciones que devuelven un `IStorage` objeto a utilizar en el `FROM` cláusula de una consulta.
-
-Para tener una idea rápida de cómo implementar su motor de tabla, vea algo simple, como `StorageMemory` o `StorageTinyLog`.
-
-> Como resultado de la `read` método, `IStorage` devoluciones `QueryProcessingStage` – information about what parts of the query were already calculated inside storage.
-
-## Analizador {#parsers}
-
-Un analizador de descenso recursivo escrito a mano analiza una consulta. Por ejemplo, `ParserSelectQuery` simplemente llama recursivamente a los analizadores subyacentes para varias partes de la consulta. Los analizadores crean un `AST`. El `AST` está representado por nodos, que son instancias de `IAST`.
-
-> Los generadores de analizadores no se utilizan por razones históricas.
-
-## Interprete {#interpreters}
-
-Los intérpretes son responsables de crear la canalización de ejecución de consultas `AST`. Hay intérpretes simples, como `InterpreterExistsQuery` y `InterpreterDropQuery` o el más sofisticado `InterpreterSelectQuery`. La canalización de ejecución de consultas es una combinación de flujos de entrada o salida de bloques. Por ejemplo, el resultado de interpretar el `SELECT` la consulta es la `IBlockInputStream` para leer el conjunto de resultados; el resultado de la consulta INSERT es el `IBlockOutputStream` para escribir datos para su inserción, y el resultado de interpretar el `INSERT SELECT` la consulta es la `IBlockInputStream` que devuelve un conjunto de resultados vacío en la primera lectura, pero que copia datos de `SELECT` a `INSERT` al mismo tiempo.
-
-`InterpreterSelectQuery` utilizar `ExpressionAnalyzer` y `ExpressionActions` maquinaria para el análisis de consultas y transformaciones. Aquí es donde se realizan la mayoría de las optimizaciones de consultas basadas en reglas. `ExpressionAnalyzer` es bastante complicado y debe reescribirse: se deben extraer varias transformaciones de consultas y optimizaciones para separar clases para permitir transformaciones modulares o consultas.
-
-## Función {#functions}
-
-Hay funciones ordinarias y funciones agregadas. Para las funciones agregadas, consulte la siguiente sección.
-
-Ordinary functions don't change the number of rows – they work as if they are processing each row independently. In fact, functions are not called for individual rows, but for `Block`de datos para implementar la ejecución de consultas vectorizadas.
-
-Hay algunas funciones diversas, como [BlockSize](../sql-reference/functions/other-functions.md#function-blocksize), [rowNumberInBlock](../sql-reference/functions/other-functions.md#function-rownumberinblock), y [runningAccumulate](../sql-reference/functions/other-functions.md#function-runningaccumulate), que explotan el procesamiento de bloques y violan la independencia de las filas.
-
-ClickHouse tiene una tipificación fuerte, por lo que no hay conversión de tipo implícita. Si una función no admite una combinación específica de tipos, produce una excepción. Pero las funciones pueden funcionar (estar sobrecargadas) para muchas combinaciones diferentes de tipos. Por ejemplo, el `plus` función (para implementar el `+` operador) funciona para cualquier combinación de tipos numéricos: `UInt8` + `Float32`, `UInt16` + `Int8` y así sucesivamente. Además, algunas funciones variadas pueden aceptar cualquier número de argumentos, como el `concat` función.
-
-Implementar una función puede ser un poco inconveniente porque una función distribuye explícitamente tipos de datos compatibles y `IColumns`. Por ejemplo, el `plus` La función tiene código generado por la creación de instancias de una plantilla de C ++ para cada combinación de tipos numéricos y argumentos izquierdo y derecho constantes o no constantes.
-
-Es un excelente lugar para implementar la generación de código en tiempo de ejecución para evitar la hinchazón del código de plantilla. Además, permite agregar funciones fusionadas como multiplicar-agregar fusionado o hacer comparaciones múltiples en una iteración de bucle.
-
-Debido a la ejecución de consultas vectorizadas, las funciones no se cortocircuitan. Por ejemplo, si escribe `WHERE f(x) AND g(y)`, ambos lados se calculan, incluso para las filas, cuando `f(x)` es cero (excepto cuando `f(x)` es una expresión constante cero). Pero si la selectividad del `f(x)` la condición es alta, y el cálculo de `f(x)` es mucho más barato que `g(y)`, es mejor implementar el cálculo de paso múltiple. Primero calcularía `f(x)`, a continuación, filtrar columnas por el resultado, y luego calcular `g(y)` solo para trozos de datos más pequeños y filtrados.
-
-## Funciones agregadas {#aggregate-functions}
-
-Las funciones agregadas son funciones con estado. Acumulan valores pasados en algún estado y le permiten obtener resultados de ese estado. Se gestionan con el `IAggregateFunction` interfaz. Los estados pueden ser bastante simples (el estado para `AggregateFunctionCount` es sólo una sola `UInt64` valor) o bastante complejo (el estado de `AggregateFunctionUniqCombined` es una combinación de una matriz lineal, una tabla hash, y un `HyperLogLog` estructura de datos probabilística).
-
-Los Estados están asignados en `Arena` (un grupo de memoria) para tratar con múltiples estados mientras se ejecuta una alta cardinalidad `GROUP BY` consulta. Los estados pueden tener un constructor y destructor no trivial: por ejemplo, los estados de agregación complicados pueden asignar memoria adicional ellos mismos. Requiere cierta atención a la creación y destrucción de estados y a la adecuada aprobación de su orden de propiedad y destrucción.
-
-Los estados de agregación se pueden serializar y deserializar para pasar a través de la red durante la ejecución de consultas distribuidas o para escribirlos en el disco donde no hay suficiente RAM. Incluso se pueden almacenar en una tabla con el `DataTypeAggregateFunction` para permitir la agregación incremental de datos.
-
-> El formato de datos serializados para los estados de función agregados no tiene versiones en este momento. Está bien si los estados agregados solo se almacenan temporalmente. Pero tenemos el `AggregatingMergeTree` motor de tabla para la agregación incremental, y la gente ya lo está utilizando en producción. Es la razón por la que se requiere compatibilidad con versiones anteriores al cambiar el formato serializado para cualquier función agregada en el futuro.
-
-## Servidor {#server}
-
-El servidor implementa varias interfaces diferentes:
-
--   Una interfaz HTTP para cualquier cliente extranjero.
--   Una interfaz TCP para el cliente nativo de ClickHouse y para la comunicación entre servidores durante la ejecución de consultas distribuidas.
--   Una interfaz para transferir datos para la replicación.
-
-Internamente, es solo un servidor multiproceso primitivo sin corutinas ni fibras. Dado que el servidor no está diseñado para procesar una alta tasa de consultas simples, sino para procesar una tasa relativamente baja de consultas complejas, cada uno de ellos puede procesar una gran cantidad de datos para análisis.
-
-El servidor inicializa el `Context` clase con el entorno necesario para la ejecución de consultas: la lista de bases de datos disponibles, usuarios y derechos de acceso, configuración, clústeres, la lista de procesos, el registro de consultas, etc. Los intérpretes utilizan este entorno.
-
-Mantenemos una compatibilidad total con versiones anteriores y posteriores para el protocolo TCP del servidor: los clientes antiguos pueden hablar con servidores nuevos y los nuevos clientes pueden hablar con servidores antiguos. Pero no queremos mantenerlo eternamente, y estamos eliminando el soporte para versiones antiguas después de aproximadamente un año.
-
-!!! note "Nota"
-    Para la mayoría de las aplicaciones externas, recomendamos usar la interfaz HTTP porque es simple y fácil de usar. El protocolo TCP está más estrechamente vinculado a las estructuras de datos internas: utiliza un formato interno para pasar bloques de datos y utiliza marcos personalizados para datos comprimidos. No hemos lanzado una biblioteca C para ese protocolo porque requiere vincular la mayor parte de la base de código ClickHouse, lo cual no es práctico.
-
-## Ejecución de consultas distribuidas {#distributed-query-execution}
-
-Los servidores de una configuración de clúster son en su mayoría independientes. Puede crear un `Distributed` en uno o todos los servidores de un clúster. El `Distributed` table does not store data itself – it only provides a “view” a todas las tablas locales en varios nodos de un clúster. Cuando se SELECCIONA desde un `Distributed` tabla, reescribe esa consulta, elige nodos remotos de acuerdo con la configuración de equilibrio de carga y les envía la consulta. El `Distributed` table solicita a los servidores remotos que procesen una consulta hasta una etapa en la que se pueden fusionar resultados intermedios de diferentes servidores. Luego recibe los resultados intermedios y los fusiona. La tabla distribuida intenta distribuir tanto trabajo como sea posible a servidores remotos y no envía muchos datos intermedios a través de la red.
-
-Las cosas se vuelven más complicadas cuando tiene subconsultas en cláusulas IN o JOIN, y cada una de ellas usa un `Distributed` tabla. Tenemos diferentes estrategias para la ejecución de estas consultas.
-
-No existe un plan de consulta global para la ejecución de consultas distribuidas. Cada nodo tiene su plan de consulta local para su parte del trabajo. Solo tenemos una ejecución simple de consultas distribuidas de un solo paso: enviamos consultas para nodos remotos y luego fusionamos los resultados. Pero esto no es factible para consultas complicadas con alta cardinalidad GROUP BY o con una gran cantidad de datos temporales para JOIN. En tales casos, necesitamos “reshuffle” datos entre servidores, lo que requiere una coordinación adicional. ClickHouse no admite ese tipo de ejecución de consultas, y tenemos que trabajar en ello.
-
-## Árbol de fusión {#merge-tree}
-
-`MergeTree` es una familia de motores de almacenamiento que admite la indexación por clave principal. La clave principal puede ser una tupla arbitraria de columnas o expresiones. Datos en un `MergeTree` se almacena en “parts”. Cada parte almacena los datos en el orden de la clave principal, por lo que la tupla de la clave principal ordena los datos lexicográficamente. Todas las columnas de la tabla se almacenan en `column.bin` archivos en estas partes. Los archivos consisten en bloques comprimidos. Cada bloque suele ser de 64 KB a 1 MB de datos sin comprimir, dependiendo del tamaño del valor promedio. Los bloques constan de valores de columna colocados contiguamente uno tras otro. Los valores de columna están en el mismo orden para cada columna (la clave principal define el orden), por lo que cuando itera por muchas columnas, obtiene valores para las filas correspondientes.
-
-La clave principal en sí es “sparse”. No aborda cada fila, sino solo algunos rangos de datos. Separado `primary.idx` file tiene el valor de la clave principal para cada fila N-ésima, donde se llama N `index_granularity` (generalmente, N = 8192). Además, para cada columna, tenemos `column.mrk` archivos con “marks,” que son desplazamientos a cada fila N-ésima en el archivo de datos. Cada marca es un par: el desplazamiento en el archivo al comienzo del bloque comprimido y el desplazamiento en el bloque descomprimido al comienzo de los datos. Por lo general, los bloques comprimidos están alineados por marcas, y el desplazamiento en el bloque descomprimido es cero. Datos para `primary.idx` siempre reside en la memoria, y los datos para `column.mrk` archivos se almacena en caché.
-
-Cuando vamos a leer algo de una parte en `MergeTree` miramos `primary.idx` datos y localice rangos que podrían contener datos solicitados, luego mire `column.mrk` datos y calcular compensaciones para dónde comenzar a leer esos rangos. Debido a la escasez, el exceso de datos puede ser leído. ClickHouse no es adecuado para una gran carga de consultas de puntos simples, porque todo el rango con `index_granularity` se deben leer filas para cada clave, y todo el bloque comprimido debe descomprimirse para cada columna. Hicimos que el índice sea disperso porque debemos poder mantener billones de filas por único servidor sin un consumo de memoria notable para el índice. Además, debido a que la clave principal es escasa, no es única: no puede verificar la existencia de la clave en la tabla en el momento de INSERTAR. Podría tener muchas filas con la misma clave en una tabla.
-
-Cuando `INSERT` un montón de datos en `MergeTree`, ese grupo está ordenado por orden de clave primaria y forma una nueva parte. Hay subprocesos de fondo que seleccionan periódicamente algunas partes y las fusionan en una sola parte ordenada para mantener el número de partes relativamente bajo. Es por eso que se llama `MergeTree`. Por supuesto, la fusión conduce a “write amplification”. Todas las partes son inmutables: solo se crean y eliminan, pero no se modifican. Cuando se ejecuta SELECT, contiene una instantánea de la tabla (un conjunto de partes). Después de la fusión, también mantenemos las piezas viejas durante algún tiempo para facilitar la recuperación después de la falla, por lo que si vemos que alguna parte fusionada probablemente esté rota, podemos reemplazarla con sus partes de origen.
-
-`MergeTree` no es un árbol de LSM porque no contiene “memtable” y “log”: inserted data is written directly to the filesystem. This makes it suitable only to INSERT data in batches, not by individual row and not very frequently – about once per second is ok, but a thousand times a second is not. We did it this way for simplicity's sake, and because we are already inserting data in batches in our applications.
-
-> Las tablas MergeTree solo pueden tener un índice (primario): no hay índices secundarios. Sería bueno permitir múltiples representaciones físicas bajo una tabla lógica, por ejemplo, para almacenar datos en más de un orden físico o incluso para permitir representaciones con datos preagregados junto con datos originales.
-
-Hay motores MergeTree que están haciendo un trabajo adicional durante las fusiones en segundo plano. Los ejemplos son `CollapsingMergeTree` y `AggregatingMergeTree`. Esto podría tratarse como soporte especial para actualizaciones. Tenga en cuenta que estas no son actualizaciones reales porque los usuarios generalmente no tienen control sobre el tiempo en que se ejecutan las fusiones en segundo plano y los datos en un `MergeTree` casi siempre se almacena en más de una parte, no en forma completamente fusionada.
-
-## Replicación {#replication}
-
-La replicación en ClickHouse se puede configurar por tabla. Podría tener algunas tablas replicadas y otras no replicadas en el mismo servidor. También puede tener tablas replicadas de diferentes maneras, como una tabla con replicación de dos factores y otra con replicación de tres factores.
-
-La replicación se implementa en el `ReplicatedMergeTree` motor de almacenamiento. El camino en `ZooKeeper` se especifica como un parámetro para el motor de almacenamiento. Todas las tablas con la misma ruta en `ZooKeeper` se convierten en réplicas entre sí: sincronizan sus datos y mantienen la coherencia. Las réplicas se pueden agregar y eliminar dinámicamente simplemente creando o soltando una tabla.
-
-La replicación utiliza un esquema multi-maestro asíncrono. Puede insertar datos en cualquier réplica que tenga una sesión con `ZooKeeper`, y los datos se replican en todas las demás réplicas de forma asíncrona. Como ClickHouse no admite UPDATE, la replicación está libre de conflictos. Como no hay reconocimiento de quórum de inserciones, los datos recién insertados pueden perderse si un nodo falla.
-
-Los metadatos para la replicación se almacenan en ZooKeeper. Hay un registro de replicación que enumera las acciones que se deben realizar. Las acciones son: obtener parte; fusionar partes; soltar una partición, etc. Cada réplica copia el registro de replicación en su cola y, a continuación, ejecuta las acciones desde la cola. Por ejemplo, en la inserción, el “get the part” la acción se crea en el registro y cada réplica descarga esa parte. Las fusiones se coordinan entre réplicas para obtener resultados idénticos en bytes. Todas las piezas se combinan de la misma manera en todas las réplicas. Se logra eligiendo una réplica como líder, y esa réplica inicia fusiones y escrituras “merge parts” acciones al registro.
-
-La replicación es física: solo las partes comprimidas se transfieren entre nodos, no consultas. Las fusiones se procesan en cada réplica de forma independiente en la mayoría de los casos para reducir los costos de red al evitar la amplificación de la red. Las piezas combinadas grandes se envían a través de la red solo en casos de retraso de replicación significativo.
-
-Además, cada réplica almacena su estado en ZooKeeper como el conjunto de piezas y sus sumas de comprobación. Cuando el estado en el sistema de archivos local difiere del estado de referencia en ZooKeeper, la réplica restaura su coherencia descargando partes faltantes y rotas de otras réplicas. Cuando hay algunos datos inesperados o rotos en el sistema de archivos local, ClickHouse no los elimina, sino que los mueve a un directorio separado y los olvida.
-
-!!! note "Nota"
-    El clúster ClickHouse consta de fragmentos independientes y cada fragmento consta de réplicas. El clúster es **no elástico**, por lo tanto, después de agregar un nuevo fragmento, los datos no se reequilibran automáticamente entre fragmentos. En su lugar, se supone que la carga del clúster debe ajustarse para que sea desigual. Esta implementación le da más control, y está bien para clústeres relativamente pequeños, como decenas de nodos. Pero para los clústeres con cientos de nodos que estamos utilizando en producción, este enfoque se convierte en un inconveniente significativo. Debemos implementar un motor de tablas que abarque todo el clúster con regiones replicadas dinámicamente que puedan dividirse y equilibrarse entre clústeres automáticamente.
-
-{## [Artículo Original](https://clickhouse.tech/docs/en/development/architecture/) ##}
diff --git a/docs/es/development/browse-code.md b/docs/es/development/browse-code.md
deleted file mode 100644
index ca031ad03f3..00000000000
--- a/docs/es/development/browse-code.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 63
-toc_title: "Buscar c\xF3digo fuente"
----
-
-# Examinar el código fuente de ClickHouse {#browse-clickhouse-source-code}
-
-Usted puede utilizar **Woboq** navegador de código en línea disponible [aqui](https://clickhouse.tech/codebrowser/html_report/ClickHouse/src/index.html). Proporciona navegación de código y resaltado semántico, búsqueda e indexación. La instantánea de código se actualiza diariamente.
-
-Además, puede navegar por las fuentes en [GitHub](https://github.com/ClickHouse/ClickHouse) como de costumbre.
-
-Si está interesado en qué IDE usar, recomendamos CLion, QT Creator, VS Code y KDevelop (con advertencias). Puedes usar cualquier IDE favorito. Vim y Emacs también cuentan.
diff --git a/docs/es/development/build-cross-arm.md b/docs/es/development/build-cross-arm.md
deleted file mode 100644
index 2758e9a0e94..00000000000
--- a/docs/es/development/build-cross-arm.md
+++ /dev/null
@@ -1,43 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 67
-toc_title: "C\xF3mo construir ClickHouse en Linux para AARCH64 (ARM64)"
----
-
-# Cómo construir ClickHouse en Linux para la arquitectura AARCH64 (ARM64) {#how-to-build-clickhouse-on-linux-for-aarch64-arm64-architecture}
-
-Esto es para el caso cuando tiene una máquina Linux y desea usarla para compilar `clickhouse` binario que se ejecutará en otra máquina Linux con arquitectura de CPU AARCH64. Esto está destinado a las comprobaciones de integración continua que se ejecutan en servidores Linux.
-
-La compilación cruzada para AARCH64 se basa en el [Instrucciones de construcción](build.md), seguirlos primero.
-
-# Instalar Clang-8 {#install-clang-8}
-
-Siga las instrucciones de https://apt.llvm.org/ para la configuración de Ubuntu o Debian.
-Por ejemplo, en Ubuntu Bionic puede usar los siguientes comandos:
-
-``` bash
-echo "deb [trusted=yes] http://apt.llvm.org/bionic/ llvm-toolchain-bionic-8 main" | sudo tee /etc/apt/sources.list.d/llvm.list
-sudo apt-get update
-sudo apt-get install clang-8
-```
-
-# Instalar conjunto de herramientas de compilación cruzada {#install-cross-compilation-toolset}
-
-``` bash
-cd ClickHouse
-mkdir -p build-aarch64/cmake/toolchain/linux-aarch64
-wget 'https://developer.arm.com/-/media/Files/downloads/gnu-a/8.3-2019.03/binrel/gcc-arm-8.3-2019.03-x86_64-aarch64-linux-gnu.tar.xz?revision=2e88a73f-d233-4f96-b1f4-d8b36e9bb0b9&la=en' -O gcc-arm-8.3-2019.03-x86_64-aarch64-linux-gnu.tar.xz
-tar xJf gcc-arm-8.3-2019.03-x86_64-aarch64-linux-gnu.tar.xz -C build-aarch64/cmake/toolchain/linux-aarch64 --strip-components=1
-```
-
-# Construir ClickHouse {#build-clickhouse}
-
-``` bash
-cd ClickHouse
-mkdir build-arm64
-CC=clang-8 CXX=clang++-8 cmake . -Bbuild-arm64 -DCMAKE_TOOLCHAIN_FILE=cmake/linux/toolchain-aarch64.cmake
-ninja -C build-arm64
-```
-
-El binario resultante se ejecutará solo en Linux con la arquitectura de CPU AARCH64.
diff --git a/docs/es/development/build-cross-osx.md b/docs/es/development/build-cross-osx.md
deleted file mode 100644
index d00e57c5d31..00000000000
--- a/docs/es/development/build-cross-osx.md
+++ /dev/null
@@ -1,64 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 66
-toc_title: "C\xF3mo construir ClickHouse en Linux para Mac OS X"
----
-
-# Cómo construir ClickHouse en Linux para Mac OS X {#how-to-build-clickhouse-on-linux-for-mac-os-x}
-
-Esto es para el caso cuando tiene una máquina Linux y desea usarla para compilar `clickhouse` Esto está destinado a las comprobaciones de integración continuas que se ejecutan en servidores Linux. Si desea crear ClickHouse directamente en Mac OS X, continúe con [otra instrucción](build-osx.md).
-
-La compilación cruzada para Mac OS X se basa en el [Instrucciones de construcción](build.md), seguirlos primero.
-
-# Instalar Clang-8 {#install-clang-8}
-
-Siga las instrucciones de https://apt.llvm.org/ para la configuración de Ubuntu o Debian.
-Por ejemplo, los comandos para Bionic son como:
-
-``` bash
-sudo echo "deb [trusted=yes] http://apt.llvm.org/bionic/ llvm-toolchain-bionic-8 main" >> /etc/apt/sources.list
-sudo apt-get install clang-8
-```
-
-# Instalar conjunto de herramientas de compilación cruzada {#install-cross-compilation-toolset}
-
-Recordemos la ruta donde instalamos `cctools` como ${CCTOOLS}
-
-``` bash
-mkdir ${CCTOOLS}
-
-git clone https://github.com/tpoechtrager/apple-libtapi.git
-cd apple-libtapi
-INSTALLPREFIX=${CCTOOLS} ./build.sh
-./install.sh
-cd ..
-
-git clone https://github.com/tpoechtrager/cctools-port.git
-cd cctools-port/cctools
-./configure --prefix=${CCTOOLS} --with-libtapi=${CCTOOLS} --target=x86_64-apple-darwin
-make install
-```
-
-Además, necesitamos descargar macOS X SDK en el árbol de trabajo.
-
-``` bash
-cd ClickHouse
-wget 'https://github.com/phracker/MacOSX-SDKs/releases/download/10.15/MacOSX10.15.sdk.tar.xz'
-mkdir -p build-darwin/cmake/toolchain/darwin-x86_64
-tar xJf MacOSX10.15.sdk.tar.xz -C build-darwin/cmake/toolchain/darwin-x86_64 --strip-components=1
-```
-
-# Construir ClickHouse {#build-clickhouse}
-
-``` bash
-cd ClickHouse
-mkdir build-osx
-CC=clang-8 CXX=clang++-8 cmake . -Bbuild-osx -DCMAKE_TOOLCHAIN_FILE=cmake/darwin/toolchain-x86_64.cmake \
-    -DCMAKE_AR:FILEPATH=${CCTOOLS}/bin/x86_64-apple-darwin-ar \
-    -DCMAKE_RANLIB:FILEPATH=${CCTOOLS}/bin/x86_64-apple-darwin-ranlib \
-    -DLINKER_NAME=${CCTOOLS}/bin/x86_64-apple-darwin-ld
-ninja -C build-osx
-```
-
-El binario resultante tendrá un formato ejecutable Mach-O y no se puede ejecutar en Linux.
diff --git a/docs/es/development/build-osx.md b/docs/es/development/build-osx.md
deleted file mode 100644
index 39eba389798..00000000000
--- a/docs/es/development/build-osx.md
+++ /dev/null
@@ -1,93 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 65
-toc_title: "C\xF3mo crear ClickHouse en Mac OS X"
----
-
-# Cómo crear ClickHouse en Mac OS X {#how-to-build-clickhouse-on-mac-os-x}
-
-Build debería funcionar en Mac OS X 10.15 (Catalina)
-
-## Instalar Homebrew {#install-homebrew}
-
-``` bash
-$ /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
-```
-
-## Instalar compiladores, herramientas y bibliotecas necesarios {#install-required-compilers-tools-and-libraries}
-
-``` bash
-$ brew install cmake ninja libtool gettext
-```
-
-## Fuentes de ClickHouse de pago {#checkout-clickhouse-sources}
-
-``` bash
-$ git clone --recursive git@github.com:ClickHouse/ClickHouse.git
-```
-
-o
-
-``` bash
-$ git clone --recursive https://github.com/ClickHouse/ClickHouse.git
-
-$ cd ClickHouse
-```
-
-## Construir ClickHouse {#build-clickhouse}
-
-``` bash
-$ mkdir build
-$ cd build
-$ cmake .. -DCMAKE_CXX_COMPILER=`which clang++` -DCMAKE_C_COMPILER=`which clang`
-$ ninja
-$ cd ..
-```
-
-## Advertencia {#caveats}
-
-Si tiene la intención de ejecutar clickhouse-server, asegúrese de aumentar la variable maxfiles del sistema.
-
-!!! info "Nota"
-    Tendrás que usar sudo.
-
-Para ello, cree el siguiente archivo:
-
-/Library/LaunchDaemons/limit.maxfiles.lista:
-
-``` xml
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN"
-        "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-  <dict>
-    <key>Label</key>
-    <string>limit.maxfiles</string>
-    <key>ProgramArguments</key>
-    <array>
-      <string>launchctl</string>
-      <string>limit</string>
-      <string>maxfiles</string>
-      <string>524288</string>
-      <string>524288</string>
-    </array>
-    <key>RunAtLoad</key>
-    <true/>
-    <key>ServiceIPC</key>
-    <false/>
-  </dict>
-</plist>
-```
-
-Ejecute el siguiente comando:
-
-``` bash
-$ sudo chown root:wheel /Library/LaunchDaemons/limit.maxfiles.plist
-```
-
-Reiniciar.
-
-Para verificar si está funcionando, puede usar `ulimit -n` comando.
-
-[Artículo Original](https://clickhouse.tech/docs/en/development/build_osx/) <!--hide-->
diff --git a/docs/es/development/build.md b/docs/es/development/build.md
deleted file mode 100644
index 42cd9b5433f..00000000000
--- a/docs/es/development/build.md
+++ /dev/null
@@ -1,141 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 64
-toc_title: "C\xF3mo crear ClickHouse en Linux"
----
-
-# Cómo construir ClickHouse para el desarrollo {#how-to-build-clickhouse-for-development}
-
-El siguiente tutorial se basa en el sistema Ubuntu Linux.
-Con los cambios apropiados, también debería funcionar en cualquier otra distribución de Linux.
-Plataformas compatibles: x86_64 y AArch64. El soporte para Power9 es experimental.
-
-## Instalar Git, CMake, Python y Ninja {#install-git-cmake-python-and-ninja}
-
-``` bash
-$ sudo apt-get install git cmake python ninja-build
-```
-
-O cmake3 en lugar de cmake en sistemas más antiguos.
-
-## Instalar GCC 10 {#install-gcc-10}
-
-Hay varias formas de hacer esto.
-
-### Instalar desde un paquete PPA {#install-from-a-ppa-package}
-
-``` bash
-$ sudo apt-get install software-properties-common
-$ sudo apt-add-repository ppa:ubuntu-toolchain-r/test
-$ sudo apt-get update
-$ sudo apt-get install gcc-10 g++-10
-```
-
-### Instalar desde fuentes {#install-from-sources}
-
-Mira [Sistema abierto.](https://github.com/ClickHouse/ClickHouse/blob/master/utils/ci/build-gcc-from-sources.sh)
-
-## Usar GCC 10 para compilaciones {#use-gcc-10-for-builds}
-
-``` bash
-$ export CC=gcc-10
-$ export CXX=g++-10
-```
-
-## Fuentes de ClickHouse de pago {#checkout-clickhouse-sources}
-
-``` bash
-$ git clone --recursive git@github.com:ClickHouse/ClickHouse.git
-```
-
-o
-
-``` bash
-$ git clone --recursive https://github.com/ClickHouse/ClickHouse.git
-```
-
-## Construir ClickHouse {#build-clickhouse}
-
-``` bash
-$ cd ClickHouse
-$ mkdir build
-$ cd build
-$ cmake ..
-$ ninja
-$ cd ..
-```
-
-Para crear un ejecutable, ejecute `ninja clickhouse`.
-Esto creará el `programs/clickhouse` ejecutable, que se puede usar con `client` o `server` argumento.
-
-# Cómo construir ClickHouse en cualquier Linux {#how-to-build-clickhouse-on-any-linux}
-
-La compilación requiere los siguientes componentes:
-
--   Git (se usa solo para verificar las fuentes, no es necesario para la compilación)
--   CMake 3.10 o más reciente
--   Ninja (recomendado) o Hacer
--   Compilador de C ++: gcc 10 o clang 8 o más reciente
--   Enlazador: lld u oro (el clásico GNU ld no funcionará)
--   Python (solo se usa dentro de la compilación LLVM y es opcional)
-
-Si todos los componentes están instalados, puede compilar de la misma manera que los pasos anteriores.
-
-Ejemplo para Ubuntu Eoan:
-
-    sudo apt update
-    sudo apt install git cmake ninja-build g++ python
-    git clone --recursive https://github.com/ClickHouse/ClickHouse.git
-    mkdir build && cd build
-    cmake ../ClickHouse
-    ninja
-
-Ejemplo de OpenSUSE Tumbleweed:
-
-    sudo zypper install git cmake ninja gcc-c++ python lld
-    git clone --recursive https://github.com/ClickHouse/ClickHouse.git
-    mkdir build && cd build
-    cmake ../ClickHouse
-    ninja
-
-Ejemplo de Fedora Rawhide:
-
-    sudo yum update
-    yum --nogpg install git cmake make gcc-c++ python3
-    git clone --recursive https://github.com/ClickHouse/ClickHouse.git
-    mkdir build && cd build
-    cmake ../ClickHouse
-    make -j $(nproc)
-
-# No tienes que construir ClickHouse {#you-dont-have-to-build-clickhouse}
-
-ClickHouse está disponible en binarios y paquetes preconstruidos. Los binarios son portátiles y se pueden ejecutar en cualquier tipo de Linux.
-
-Están diseñados para lanzamientos estables, preestablecidos y de prueba, siempre que para cada compromiso con el maestro y para cada solicitud de extracción.
-
-Para encontrar la construcción más fresca de `master`, ir a [se compromete página](https://github.com/ClickHouse/ClickHouse/commits/master), haga clic en la primera marca de verificación verde o cruz roja cerca de confirmar, y haga clic en “Details” enlace justo después “ClickHouse Build Check”.
-
-# Cómo construir el paquete Debian ClickHouse {#how-to-build-clickhouse-debian-package}
-
-## Instalar Git y Pbuilder {#install-git-and-pbuilder}
-
-``` bash
-$ sudo apt-get update
-$ sudo apt-get install git python pbuilder debhelper lsb-release fakeroot sudo debian-archive-keyring debian-keyring
-```
-
-## Fuentes de ClickHouse de pago {#checkout-clickhouse-sources-1}
-
-``` bash
-$ git clone --recursive --branch master https://github.com/ClickHouse/ClickHouse.git
-$ cd ClickHouse
-```
-
-## Ejecutar secuencia de comandos de lanzamiento {#run-release-script}
-
-``` bash
-$ ./release
-```
-
-[Artículo Original](https://clickhouse.tech/docs/en/development/build/) <!--hide-->
diff --git a/docs/es/development/contrib.md b/docs/es/development/contrib.md
deleted file mode 100644
index 3f3013570e5..00000000000
--- a/docs/es/development/contrib.md
+++ /dev/null
@@ -1,41 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 70
-toc_title: Bibliotecas de terceros utilizadas
----
-
-# Bibliotecas de terceros utilizadas {#third-party-libraries-used}
-
-| Biblioteca         | Licencia                                                                                                                                         |
-|--------------------|--------------------------------------------------------------------------------------------------------------------------------------------------|
-| base64             | [Licencia BSD de 2 cláusulas](https://github.com/aklomp/base64/blob/a27c565d1b6c676beaf297fe503c4518185666f7/LICENSE)                            |
-| impulsar           | [Licencia de software Boost 1.0](https://github.com/ClickHouse-Extras/boost-extra/blob/6883b40449f378019aec792f9983ce3afc7ff16e/LICENSE_1_0.txt) |
-| Bienvenido         | [MIT](https://github.com/google/brotli/blob/master/LICENSE)                                                                                      |
-| capnproto          | [MIT](https://github.com/capnproto/capnproto/blob/master/LICENSE)                                                                                |
-| Cctz               | [Licencia Apache 2.0](https://github.com/google/cctz/blob/4f9776a310f4952454636363def82c2bf6641d5f/LICENSE.txt)                                  |
-| doble conversión   | [Licencia de 3 cláusulas BSD](https://github.com/google/double-conversion/blob/cf2f0f3d547dc73b4612028a155b80536902ba02/LICENSE)                 |
-| FastMemcpy         | [MIT](https://github.com/ClickHouse/ClickHouse/blob/master/libs/libmemcpy/impl/LICENSE)                                                          |
-| Más información    | [Licencia de 3 cláusulas BSD](https://github.com/google/googletest/blob/master/LICENSE)                                                          |
-| H3                 | [Licencia Apache 2.0](https://github.com/uber/h3/blob/master/LICENSE)                                                                            |
-| hyperscan          | [Licencia de 3 cláusulas BSD](https://github.com/intel/hyperscan/blob/master/LICENSE)                                                            |
-| libcxxabi          | [BSD + MIT](https://github.com/ClickHouse/ClickHouse/blob/master/libs/libglibc-compatibility/libcxxabi/LICENSE.TXT)                              |
-| libdivide          | [Licencia Zlib](https://github.com/ClickHouse/ClickHouse/blob/master/contrib/libdivide/LICENSE.txt)                                              |
-| libgsasl           | [Información adicional](https://github.com/ClickHouse-Extras/libgsasl/blob/3b8948a4042e34fb00b4fb987535dc9e02e39040/LICENSE)                     |
-| libhdfs3           | [Licencia Apache 2.0](https://github.com/ClickHouse-Extras/libhdfs3/blob/bd6505cbb0c130b0db695305b9a38546fa880e5a/LICENSE.txt)                   |
-| libmetrohash       | [Licencia Apache 2.0](https://github.com/ClickHouse/ClickHouse/blob/master/contrib/libmetrohash/LICENSE)                                         |
-| libpcg-al azar     | [Licencia Apache 2.0](https://github.com/ClickHouse/ClickHouse/blob/master/contrib/libpcg-random/LICENSE-APACHE.txt)                             |
-| Libressl           | [Licencia OpenSSL](https://github.com/ClickHouse-Extras/ssl/blob/master/COPYING)                                                                 |
-| Librdkafka         | [Licencia BSD de 2 cláusulas](https://github.com/edenhill/librdkafka/blob/363dcad5a23dc29381cc626620e68ae418b3af19/LICENSE)                      |
-| libwidechar_width | [CC0 1.0 Universal](https://github.com/ClickHouse/ClickHouse/blob/master/libs/libwidechar_width/LICENSE)                                         |
-| llvm               | [Licencia de 3 cláusulas BSD](https://github.com/ClickHouse-Extras/llvm/blob/163def217817c90fb982a6daf384744d8472b92b/llvm/LICENSE.TXT)          |
-| lz4                | [Licencia BSD de 2 cláusulas](https://github.com/lz4/lz4/blob/c10863b98e1503af90616ae99725ecd120265dfb/LICENSE)                                  |
-| mariadb-conector-c | [Información adicional](https://github.com/ClickHouse-Extras/mariadb-connector-c/blob/3.1/COPYING.LIB)                                           |
-| murmurhash         | [Dominio público](https://github.com/ClickHouse/ClickHouse/blob/master/contrib/murmurhash/LICENSE)                                               |
-| pdqsort            | [Licencia Zlib](https://github.com/ClickHouse/ClickHouse/blob/master/contrib/pdqsort/license.txt)                                                |
-| Poco               | [Boost Software License - Versión 1.0](https://github.com/ClickHouse-Extras/poco/blob/fe5505e56c27b6ecb0dcbc40c49dc2caf4e9637f/LICENSE)          |
-| protobuf           | [Licencia de 3 cláusulas BSD](https://github.com/ClickHouse-Extras/protobuf/blob/12735370922a35f03999afff478e1c6d7aa917a4/LICENSE)               |
-| Re2                | [Licencia de 3 cláusulas BSD](https://github.com/google/re2/blob/7cf8b88e8f70f97fd4926b56aa87e7f53b2717e0/LICENSE)                               |
-| UnixODBC           | [Información adicional](https://github.com/ClickHouse-Extras/UnixODBC/tree/b0ad30f7f6289c12b76f04bfb9d466374bb32168)                             |
-| Sistema abierto.   | [Licencia Zlib](https://github.com/ClickHouse-Extras/zlib-ng/blob/develop/LICENSE.md)                                                            |
-| zstd               | [Licencia de 3 cláusulas BSD](https://github.com/facebook/zstd/blob/dev/LICENSE)                                                                 |
diff --git a/docs/es/development/developer-instruction.md b/docs/es/development/developer-instruction.md
deleted file mode 100644
index 0ce5d0b457a..00000000000
--- a/docs/es/development/developer-instruction.md
+++ /dev/null
@@ -1,287 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 61
-toc_title: "La instrucci\xF3n para desarrolladores de ClickHouse para principiantes"
----
-
-La construcción de ClickHouse es compatible con Linux, FreeBSD y Mac OS X.
-
-# Si utiliza Windows {#if-you-use-windows}
-
-Si usa Windows, necesita crear una máquina virtual con Ubuntu. Para comenzar a trabajar con una máquina virtual, instale VirtualBox. Puede descargar Ubuntu desde el sitio web: https://www.ubuntu.com/#download. Por favor, cree una máquina virtual a partir de la imagen descargada (debe reservar al menos 4 GB de RAM para ello). Para ejecutar un terminal de línea de comandos en Ubuntu, busque un programa que contenga la palabra “terminal” en su nombre (gnome-terminal, konsole etc.) o simplemente presione Ctrl + Alt + T.
-
-# Si utiliza un sistema de 32 bits {#if-you-use-a-32-bit-system}
-
-ClickHouse no puede funcionar ni construir en un sistema de 32 bits. Debe adquirir acceso a un sistema de 64 bits y puede continuar leyendo.
-
-# Creación de un repositorio en GitHub {#creating-a-repository-on-github}
-
-Para comenzar a trabajar con el repositorio de ClickHouse, necesitará una cuenta de GitHub.
-
-Probablemente ya tenga uno, pero si no lo hace, regístrese en https://github.com . En caso de que no tenga claves SSH, debe generarlas y luego cargarlas en GitHub. Es necesario para enviar a través de sus parches. También es posible usar las mismas claves SSH que usa con cualquier otro servidor SSH, probablemente ya las tenga.
-
-Cree una bifurcación del repositorio ClickHouse. Para hacerlo por favor haga clic en el “fork” botón en la esquina superior derecha en https://github.com/ClickHouse/ClickHouse . Se bifurcará su propia copia de ClickHouse/ClickHouse a su cuenta.
-
-El proceso de desarrollo consiste en comprometer primero los cambios previstos en su bifurcación de ClickHouse y luego crear un “pull request” para que estos cambios sean aceptados en el repositorio principal (ClickHouse / ClickHouse).
-
-Para trabajar con repositorios git, instale `git`.
-
-Para hacer eso en Ubuntu, ejecutaría en la terminal de línea de comandos:
-
-    sudo apt update
-    sudo apt install git
-
-Puede encontrar un breve manual sobre el uso de Git aquí: https://education.github.com/git-cheat-sheet-education.pdf .
-Para obtener un manual detallado sobre Git, consulte https://git-scm.com/book/en/v2 .
-
-# Clonación de un repositorio en su máquina de desarrollo {#cloning-a-repository-to-your-development-machine}
-
-A continuación, debe descargar los archivos fuente en su máquina de trabajo. Esto se llama “to clone a repository” porque crea una copia local del repositorio en su máquina de trabajo.
-
-En el terminal de línea de comandos, ejecute:
-
-    git clone --recursive git@github.com:your_github_username/ClickHouse.git
-    cd ClickHouse
-
-Nota: por favor, sustituye *your_github_username* con lo que es apropiado!
-
-Este comando creará un directorio `ClickHouse` que contiene la copia de trabajo del proyecto.
-
-Es importante que la ruta al directorio de trabajo no contenga espacios en blanco, ya que puede ocasionar problemas con la ejecución del sistema de compilación.
-
-Tenga en cuenta que el repositorio ClickHouse utiliza `submodules`. That is what the references to additional repositories are called (i.e. external libraries on which the project depends). It means that when cloning the repository you need to specify the `--recursive` como en el ejemplo anterior. Si el repositorio se ha clonado sin submódulos, para descargarlos debe ejecutar lo siguiente:
-
-    git submodule init
-    git submodule update
-
-Puede verificar el estado con el comando: `git submodule status`.
-
-Si recibe el siguiente mensaje de error:
-
-    Permission denied (publickey).
-    fatal: Could not read from remote repository.
-
-    Please make sure you have the correct access rights
-    and the repository exists.
-
-Por lo general, significa que faltan las claves SSH para conectarse a GitHub. Estas teclas se encuentran normalmente en `~/.ssh`. Para que las claves SSH sean aceptadas, debe cargarlas en la sección de configuración de la interfaz de usuario de GitHub.
-
-También puede clonar el repositorio a través del protocolo https:
-
-    git clone https://github.com/ClickHouse/ClickHouse.git
-
-Sin embargo, esto no le permitirá enviar los cambios al servidor. Aún puede usarlo temporalmente y agregar las claves SSH más tarde reemplazando la dirección remota del repositorio con `git remote` comando.
-
-También puede agregar la dirección original del repositorio de ClickHouse a su repositorio local para extraer actualizaciones desde allí:
-
-    git remote add upstream git@github.com:ClickHouse/ClickHouse.git
-
-Después de ejecutar con éxito este comando, podrá extraer actualizaciones del repositorio principal de ClickHouse ejecutando `git pull upstream master`.
-
-## Trabajar con submódulos {#working-with-submodules}
-
-Trabajar con submódulos en git podría ser doloroso. Los siguientes comandos ayudarán a administrarlo:
-
-    # ! each command accepts --recursive
-    # Update remote URLs for submodules. Barely rare case
-    git submodule sync
-    # Add new submodules
-    git submodule init
-    # Update existing submodules to the current state
-    git submodule update
-    # Two last commands could be merged together
-    git submodule update --init
-
-Los siguientes comandos le ayudarían a restablecer todos los submódulos al estado inicial (!¡ADVERTENCIA! - cualquier cambio en el interior será eliminado):
-
-    # Synchronizes submodules' remote URL with .gitmodules
-    git submodule sync --recursive
-    # Update the registered submodules with initialize not yet initialized
-    git submodule update --init --recursive
-    # Reset all changes done after HEAD
-    git submodule foreach git reset --hard
-    # Clean files from .gitignore
-    git submodule foreach git clean -xfd
-    # Repeat last 4 commands for all submodule
-    git submodule foreach git submodule sync --recursive
-    git submodule foreach git submodule update --init --recursive
-    git submodule foreach git submodule foreach git reset --hard
-    git submodule foreach git submodule foreach git clean -xfd
-
-# Sistema de construcción {#build-system}
-
-ClickHouse utiliza CMake y Ninja para la construcción.
-
-CMake - un sistema de meta-construcción que puede generar archivos Ninja (tareas de construcción).
-Ninja: un sistema de compilación más pequeño con un enfoque en la velocidad utilizada para ejecutar esas tareas generadas por cmake.
-
-Para instalar en Ubuntu, Debian o Mint run `sudo apt install cmake ninja-build`.
-
-En CentOS, RedHat se ejecuta `sudo yum install cmake ninja-build`.
-
-Si usa Arch o Gentoo, probablemente lo sepa usted mismo cómo instalar CMake.
-
-Para instalar CMake y Ninja en Mac OS X, primero instale Homebrew y luego instale todo lo demás a través de brew:
-
-    /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
-    brew install cmake ninja
-
-A continuación, verifique la versión de CMake: `cmake --version`. Si está por debajo de 3.3, debe instalar una versión más reciente desde el sitio web: https://cmake.org/download/.
-
-# Bibliotecas externas opcionales {#optional-external-libraries}
-
-ClickHouse utiliza varias bibliotecas externas para la construcción. Todos ellos no necesitan ser instalados por separado, ya que se construyen junto con ClickHouse a partir de las fuentes ubicadas en los submódulos. Puede consultar la lista en `contrib`.
-
-# Compilador de C ++ {#c-compiler}
-
-Los compiladores GCC a partir de la versión 10 y Clang versión 8 o superior son compatibles para construir ClickHouse.
-
-Las compilaciones oficiales de Yandex actualmente usan GCC porque genera código de máquina de un rendimiento ligeramente mejor (con una diferencia de hasta varios por ciento según nuestros puntos de referencia). Y Clang es más conveniente para el desarrollo generalmente. Sin embargo, nuestra plataforma de integración continua (CI) ejecuta verificaciones de aproximadamente una docena de combinaciones de compilación.
-
-Para instalar GCC en Ubuntu, ejecute: `sudo apt install gcc g++`
-
-Compruebe la versión de gcc: `gcc --version`. Si está por debajo de 9, siga las instrucciones aquí: https://clickhouse.tech/docs/es/development/build/#install-gcc-10.
-
-La compilación de Mac OS X solo es compatible con Clang. Sólo tiene que ejecutar `brew install llvm`
-
-Si decide utilizar Clang, también puede instalar `libc++` y `lld` si usted sabe lo que es. Utilizar `ccache` también se recomienda.
-
-# El proceso de construcción {#the-building-process}
-
-Ahora que está listo para construir ClickHouse, le recomendamos que cree un directorio separado `build` dentro `ClickHouse` que contendrá todos los de la generación de artefactos:
-
-    mkdir build
-    cd build
-
-Puede tener varios directorios diferentes (build_release, build_debug, etc.) para diferentes tipos de construcción.
-
-Mientras que dentro de la `build` directorio, configure su compilación ejecutando CMake. Antes de la primera ejecución, debe definir variables de entorno que especifiquen el compilador (compilador gcc versión 10 en este ejemplo).
-
-Linux:
-
-    export CC=gcc-10 CXX=g++-10
-    cmake ..
-
-Mac OS X:
-
-    export CC=clang CXX=clang++
-    cmake ..
-
-El `CC` variable especifica el compilador para C (abreviatura de C Compiler), y `CXX` variable indica qué compilador de C ++ se usará para compilar.
-
-Para una construcción más rápida, puede recurrir al `debug` tipo de compilación: una compilación sin optimizaciones. Para ese suministro el siguiente parámetro `-D CMAKE_BUILD_TYPE=Debug`:
-
-    cmake -D CMAKE_BUILD_TYPE=Debug ..
-
-Puede cambiar el tipo de compilación ejecutando este comando en el `build` directorio.
-
-Ejecutar ninja para construir:
-
-    ninja clickhouse-server clickhouse-client
-
-Solo los binarios requeridos se van a construir en este ejemplo.
-
-Si necesita construir todos los binarios (utilidades y pruebas), debe ejecutar ninja sin parámetros:
-
-    ninja
-
-La compilación completa requiere aproximadamente 30 GB de espacio libre en disco o 15 GB para construir los binarios principales.
-
-Cuando hay una gran cantidad de RAM disponible en la máquina de compilación, debe limitar el número de tareas de compilación que se ejecutan en paralelo con `-j` parámetro:
-
-    ninja -j 1 clickhouse-server clickhouse-client
-
-En máquinas con 4GB de RAM, se recomienda especificar 1, para 8GB de RAM `-j 2` se recomienda.
-
-Si recibe el mensaje: `ninja: error: loading 'build.ninja': No such file or directory`, significa que la generación de una configuración de compilación ha fallado y necesita inspeccionar el mensaje anterior.
-
-Cuando se inicie correctamente el proceso de construcción, verá el progreso de la compilación: el número de tareas procesadas y el número total de tareas.
-
-Al crear mensajes sobre archivos protobuf en la biblioteca libhdfs2, como `libprotobuf WARNING` puede aparecer. Afectan a nada y son seguros para ser ignorado.
-
-Tras la compilación exitosa, obtienes un archivo ejecutable `ClickHouse/<build_dir>/programs/clickhouse`:
-
-    ls -l programs/clickhouse
-
-# Ejecución del ejecutable construido de ClickHouse {#running-the-built-executable-of-clickhouse}
-
-Para ejecutar el servidor bajo el usuario actual, debe navegar hasta `ClickHouse/programs/server/` (situado fuera de `build`) y ejecutar:
-
-    ../../build/programs/clickhouse server
-
-En este caso, ClickHouse usará archivos de configuración ubicados en el directorio actual. Puede ejecutar `clickhouse server` desde cualquier directorio que especifique la ruta a un archivo de configuración como un parámetro de línea de comandos `--config-file`.
-
-Para conectarse a ClickHouse con clickhouse-client en otro terminal, vaya a `ClickHouse/build/programs/` y ejecutar `./clickhouse client`.
-
-Si usted consigue `Connection refused` mensaje en Mac OS X o FreeBSD, intente especificar la dirección de host 127.0.0.1:
-
-    clickhouse client --host 127.0.0.1
-
-Puede reemplazar la versión de producción del binario ClickHouse instalado en su sistema con su binario ClickHouse personalizado. Para ello, instale ClickHouse en su máquina siguiendo las instrucciones del sitio web oficial. A continuación, ejecute lo siguiente:
-
-    sudo service clickhouse-server stop
-    sudo cp ClickHouse/build/programs/clickhouse /usr/bin/
-    sudo service clickhouse-server start
-
-Tenga en cuenta que `clickhouse-client`, `clickhouse-server` y otros son enlaces simbólicos a los comúnmente compartidos `clickhouse` binario.
-
-También puede ejecutar su binario ClickHouse personalizado con el archivo de configuración del paquete ClickHouse instalado en su sistema:
-
-    sudo service clickhouse-server stop
-    sudo -u clickhouse ClickHouse/build/programs/clickhouse server --config-file /etc/clickhouse-server/config.xml
-
-# IDE (entorno de desarrollo integrado) {#ide-integrated-development-environment}
-
-Si no sabe qué IDE usar, le recomendamos que use CLion. CLion es un software comercial, pero ofrece un período de prueba gratuito de 30 días. También es gratuito para los estudiantes. CLion se puede usar tanto en Linux como en Mac OS X.
-
-KDevelop y QTCreator son otras excelentes alternativas de un IDE para desarrollar ClickHouse. KDevelop viene como un IDE muy útil aunque inestable. Si KDevelop se bloquea después de un tiempo al abrir el proyecto, debe hacer clic “Stop All” botón tan pronto como se ha abierto la lista de archivos del proyecto. Después de hacerlo, KDevelop debería estar bien para trabajar.
-
-Como editores de código simples, puede usar Sublime Text o Visual Studio Code, o Kate (todos los cuales están disponibles en Linux).
-
-Por si acaso, vale la pena mencionar que CLion crea `build` por sí mismo, también por sí mismo selecciona `debug` para el tipo de compilación, para la configuración usa una versión de CMake que está definida en CLion y no la instalada por usted, y finalmente, CLion usará `make` para ejecutar tareas de compilación en lugar de `ninja`. Este es un comportamiento normal, solo tenlo en cuenta para evitar confusiones.
-
-# Código de escritura {#writing-code}
-
-La descripción de la arquitectura ClickHouse se puede encontrar aquí: https://clickhouse.tech/docs/es/desarrollo/arquitectura/
-
-La Guía de estilo de código: https://clickhouse.tech/docs/en/development/style/
-
-Pruebas de escritura: https://clickhouse.tech/docs/en/development/tests/
-
-Lista de tareas: https://github.com/ClickHouse/ClickHouse/issues?q=is%3Aopen+is%3Aissue+label%3A%22easy+task%22
-
-# Datos de prueba {#test-data}
-
-El desarrollo de ClickHouse a menudo requiere cargar conjuntos de datos realistas. Es particularmente importante para las pruebas de rendimiento. Tenemos un conjunto especialmente preparado de datos anónimos de Yandex.Métrica. Se requiere, además, unos 3 GB de espacio libre en disco. Tenga en cuenta que estos datos no son necesarios para realizar la mayoría de las tareas de desarrollo.
-
-    sudo apt install wget xz-utils
-
-    wget https://datasets.clickhouse.tech/hits/tsv/hits_v1.tsv.xz
-    wget https://datasets.clickhouse.tech/visits/tsv/visits_v1.tsv.xz
-
-    xz -v -d hits_v1.tsv.xz
-    xz -v -d visits_v1.tsv.xz
-
-    clickhouse-client
-
-    CREATE DATABASE IF NOT EXISTS test
-
-    CREATE TABLE test.hits ( WatchID UInt64,  JavaEnable UInt8,  Title String,  GoodEvent Int16,  EventTime DateTime,  EventDate Date,  CounterID UInt32,  ClientIP UInt32,  ClientIP6 FixedString(16),  RegionID UInt32,  UserID UInt64,  CounterClass Int8,  OS UInt8,  UserAgent UInt8,  URL String,  Referer String,  URLDomain String,  RefererDomain String,  Refresh UInt8,  IsRobot UInt8,  RefererCategories Array(UInt16),  URLCategories Array(UInt16),  URLRegions Array(UInt32),  RefererRegions Array(UInt32),  ResolutionWidth UInt16,  ResolutionHeight UInt16,  ResolutionDepth UInt8,  FlashMajor UInt8,  FlashMinor UInt8,  FlashMinor2 String,  NetMajor UInt8,  NetMinor UInt8,  UserAgentMajor UInt16,  UserAgentMinor FixedString(2),  CookieEnable UInt8,  JavascriptEnable UInt8,  IsMobile UInt8,  MobilePhone UInt8,  MobilePhoneModel String,  Params String,  IPNetworkID UInt32,  TraficSourceID Int8,  SearchEngineID UInt16,  SearchPhrase String,  AdvEngineID UInt8,  IsArtifical UInt8,  WindowClientWidth UInt16,  WindowClientHeight UInt16,  ClientTimeZone Int16,  ClientEventTime DateTime,  SilverlightVersion1 UInt8,  SilverlightVersion2 UInt8,  SilverlightVersion3 UInt32,  SilverlightVersion4 UInt16,  PageCharset String,  CodeVersion UInt32,  IsLink UInt8,  IsDownload UInt8,  IsNotBounce UInt8,  FUniqID UInt64,  HID UInt32,  IsOldCounter UInt8,  IsEvent UInt8,  IsParameter UInt8,  DontCountHits UInt8,  WithHash UInt8,  HitColor FixedString(1),  UTCEventTime DateTime,  Age UInt8,  Sex UInt8,  Income UInt8,  Interests UInt16,  Robotness UInt8,  GeneralInterests Array(UInt16),  RemoteIP UInt32,  RemoteIP6 FixedString(16),  WindowName Int32,  OpenerName Int32,  HistoryLength Int16,  BrowserLanguage FixedString(2),  BrowserCountry FixedString(2),  SocialNetwork String,  SocialAction String,  HTTPError UInt16,  SendTiming Int32,  DNSTiming Int32,  ConnectTiming Int32,  ResponseStartTiming Int32,  ResponseEndTiming Int32,  FetchTiming Int32,  RedirectTiming Int32,  DOMInteractiveTiming Int32,  DOMContentLoadedTiming Int32,  DOMCompleteTiming Int32,  LoadEventStartTiming Int32,  LoadEventEndTiming Int32,  NSToDOMContentLoadedTiming Int32,  FirstPaintTiming Int32,  RedirectCount Int8,  SocialSourceNetworkID UInt8,  SocialSourcePage String,  ParamPrice Int64,  ParamOrderID String,  ParamCurrency FixedString(3),  ParamCurrencyID UInt16,  GoalsReached Array(UInt32),  OpenstatServiceName String,  OpenstatCampaignID String,  OpenstatAdID String,  OpenstatSourceID String,  UTMSource String,  UTMMedium String,  UTMCampaign String,  UTMContent String,  UTMTerm String,  FromTag String,  HasGCLID UInt8,  RefererHash UInt64,  URLHash UInt64,  CLID UInt32,  YCLID UInt64,  ShareService String,  ShareURL String,  ShareTitle String,  `ParsedParams.Key1` Array(String),  `ParsedParams.Key2` Array(String),  `ParsedParams.Key3` Array(String),  `ParsedParams.Key4` Array(String),  `ParsedParams.Key5` Array(String),  `ParsedParams.ValueDouble` Array(Float64),  IslandID FixedString(16),  RequestNum UInt32,  RequestTry UInt8) ENGINE = MergeTree PARTITION BY toYYYYMM(EventDate) SAMPLE BY intHash32(UserID) ORDER BY (CounterID, EventDate, intHash32(UserID), EventTime);
-
-    CREATE TABLE test.visits ( CounterID UInt32,  StartDate Date,  Sign Int8,  IsNew UInt8,  VisitID UInt64,  UserID UInt64,  StartTime DateTime,  Duration UInt32,  UTCStartTime DateTime,  PageViews Int32,  Hits Int32,  IsBounce UInt8,  Referer String,  StartURL String,  RefererDomain String,  StartURLDomain String,  EndURL String,  LinkURL String,  IsDownload UInt8,  TraficSourceID Int8,  SearchEngineID UInt16,  SearchPhrase String,  AdvEngineID UInt8,  PlaceID Int32,  RefererCategories Array(UInt16),  URLCategories Array(UInt16),  URLRegions Array(UInt32),  RefererRegions Array(UInt32),  IsYandex UInt8,  GoalReachesDepth Int32,  GoalReachesURL Int32,  GoalReachesAny Int32,  SocialSourceNetworkID UInt8,  SocialSourcePage String,  MobilePhoneModel String,  ClientEventTime DateTime,  RegionID UInt32,  ClientIP UInt32,  ClientIP6 FixedString(16),  RemoteIP UInt32,  RemoteIP6 FixedString(16),  IPNetworkID UInt32,  SilverlightVersion3 UInt32,  CodeVersion UInt32,  ResolutionWidth UInt16,  ResolutionHeight UInt16,  UserAgentMajor UInt16,  UserAgentMinor UInt16,  WindowClientWidth UInt16,  WindowClientHeight UInt16,  SilverlightVersion2 UInt8,  SilverlightVersion4 UInt16,  FlashVersion3 UInt16,  FlashVersion4 UInt16,  ClientTimeZone Int16,  OS UInt8,  UserAgent UInt8,  ResolutionDepth UInt8,  FlashMajor UInt8,  FlashMinor UInt8,  NetMajor UInt8,  NetMinor UInt8,  MobilePhone UInt8,  SilverlightVersion1 UInt8,  Age UInt8,  Sex UInt8,  Income UInt8,  JavaEnable UInt8,  CookieEnable UInt8,  JavascriptEnable UInt8,  IsMobile UInt8,  BrowserLanguage UInt16,  BrowserCountry UInt16,  Interests UInt16,  Robotness UInt8,  GeneralInterests Array(UInt16),  Params Array(String),  `Goals.ID` Array(UInt32),  `Goals.Serial` Array(UInt32),  `Goals.EventTime` Array(DateTime),  `Goals.Price` Array(Int64),  `Goals.OrderID` Array(String),  `Goals.CurrencyID` Array(UInt32),  WatchIDs Array(UInt64),  ParamSumPrice Int64,  ParamCurrency FixedString(3),  ParamCurrencyID UInt16,  ClickLogID UInt64,  ClickEventID Int32,  ClickGoodEvent Int32,  ClickEventTime DateTime,  ClickPriorityID Int32,  ClickPhraseID Int32,  ClickPageID Int32,  ClickPlaceID Int32,  ClickTypeID Int32,  ClickResourceID Int32,  ClickCost UInt32,  ClickClientIP UInt32,  ClickDomainID UInt32,  ClickURL String,  ClickAttempt UInt8,  ClickOrderID UInt32,  ClickBannerID UInt32,  ClickMarketCategoryID UInt32,  ClickMarketPP UInt32,  ClickMarketCategoryName String,  ClickMarketPPName String,  ClickAWAPSCampaignName String,  ClickPageName String,  ClickTargetType UInt16,  ClickTargetPhraseID UInt64,  ClickContextType UInt8,  ClickSelectType Int8,  ClickOptions String,  ClickGroupBannerID Int32,  OpenstatServiceName String,  OpenstatCampaignID String,  OpenstatAdID String,  OpenstatSourceID String,  UTMSource String,  UTMMedium String,  UTMCampaign String,  UTMContent String,  UTMTerm String,  FromTag String,  HasGCLID UInt8,  FirstVisit DateTime,  PredLastVisit Date,  LastVisit Date,  TotalVisits UInt32,  `TraficSource.ID` Array(Int8),  `TraficSource.SearchEngineID` Array(UInt16),  `TraficSource.AdvEngineID` Array(UInt8),  `TraficSource.PlaceID` Array(UInt16),  `TraficSource.SocialSourceNetworkID` Array(UInt8),  `TraficSource.Domain` Array(String),  `TraficSource.SearchPhrase` Array(String),  `TraficSource.SocialSourcePage` Array(String),  Attendance FixedString(16),  CLID UInt32,  YCLID UInt64,  NormalizedRefererHash UInt64,  SearchPhraseHash UInt64,  RefererDomainHash UInt64,  NormalizedStartURLHash UInt64,  StartURLDomainHash UInt64,  NormalizedEndURLHash UInt64,  TopLevelDomain UInt64,  URLScheme UInt64,  OpenstatServiceNameHash UInt64,  OpenstatCampaignIDHash UInt64,  OpenstatAdIDHash UInt64,  OpenstatSourceIDHash UInt64,  UTMSourceHash UInt64,  UTMMediumHash UInt64,  UTMCampaignHash UInt64,  UTMContentHash UInt64,  UTMTermHash UInt64,  FromHash UInt64,  WebVisorEnabled UInt8,  WebVisorActivity UInt32,  `ParsedParams.Key1` Array(String),  `ParsedParams.Key2` Array(String),  `ParsedParams.Key3` Array(String),  `ParsedParams.Key4` Array(String),  `ParsedParams.Key5` Array(String),  `ParsedParams.ValueDouble` Array(Float64),  `Market.Type` Array(UInt8),  `Market.GoalID` Array(UInt32),  `Market.OrderID` Array(String),  `Market.OrderPrice` Array(Int64),  `Market.PP` Array(UInt32),  `Market.DirectPlaceID` Array(UInt32),  `Market.DirectOrderID` Array(UInt32),  `Market.DirectBannerID` Array(UInt32),  `Market.GoodID` Array(String),  `Market.GoodName` Array(String),  `Market.GoodQuantity` Array(Int32),  `Market.GoodPrice` Array(Int64),  IslandID FixedString(16)) ENGINE = CollapsingMergeTree(Sign) PARTITION BY toYYYYMM(StartDate) SAMPLE BY intHash32(UserID) ORDER BY (CounterID, StartDate, intHash32(UserID), VisitID);
-
-    clickhouse-client --max_insert_block_size 100000 --query "INSERT INTO test.hits FORMAT TSV" < hits_v1.tsv
-    clickhouse-client --max_insert_block_size 100000 --query "INSERT INTO test.visits FORMAT TSV" < visits_v1.tsv
-
-# Creación de solicitud de extracción {#creating-pull-request}
-
-Navega a tu repositorio de fork en la interfaz de usuario de GitHub. Si ha estado desarrollando en una sucursal, debe seleccionar esa sucursal. Habrá un “Pull request” botón situado en la pantalla. En esencia, esto significa “create a request for accepting my changes into the main repository”.
-
-Se puede crear una solicitud de extracción incluso si el trabajo aún no se ha completado. En este caso, por favor ponga la palabra “WIP” (trabajo en curso) al comienzo del título, se puede cambiar más tarde. Esto es útil para la revisión cooperativa y la discusión de los cambios, así como para ejecutar todas las pruebas disponibles. Es importante que proporcione una breve descripción de sus cambios, que más tarde se utilizará para generar registros de cambios de lanzamiento.
-
-Las pruebas comenzarán tan pronto como los empleados de Yandex etiqueten su PR con una etiqueta “can be tested”. The results of some first checks (e.g. code style) will come in within several minutes. Build check results will arrive within half an hour. And the main set of tests will report itself within an hour.
-
-El sistema preparará compilaciones binarias ClickHouse para su solicitud de extracción individualmente. Para recuperar estas compilaciones, haga clic en “Details” junto al link “ClickHouse build check” en la lista de cheques. Allí encontrará enlaces directos a la construcción.deb paquetes de ClickHouse que puede implementar incluso en sus servidores de producción (si no tiene miedo).
-
-Lo más probable es que algunas de las compilaciones fallen las primeras veces. Esto se debe al hecho de que verificamos las compilaciones tanto con gcc como con clang, con casi todas las advertencias existentes (siempre con el `-Werror` bandera) habilitado para sonido. En esa misma página, puede encontrar todos los registros de compilación para que no tenga que compilar ClickHouse de todas las formas posibles.
diff --git a/docs/es/development/index.md b/docs/es/development/index.md
deleted file mode 100644
index 6f96f9b3f02..00000000000
--- a/docs/es/development/index.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: Desarrollo
-toc_hidden: true
-toc_priority: 58
-toc_title: oculto
----
-
-# Desarrollo de ClickHouse {#clickhouse-development}
-
-[Artículo Original](https://clickhouse.tech/docs/en/development/) <!--hide-->
diff --git a/docs/es/development/style.md b/docs/es/development/style.md
deleted file mode 100644
index ec55516fe2c..00000000000
--- a/docs/es/development/style.md
+++ /dev/null
@@ -1,841 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 68
-toc_title: "C\xF3mo escribir c\xF3digo C ++"
----
-
-# Cómo escribir código C ++ {#how-to-write-c-code}
-
-## Recomendaciones generales {#general-recommendations}
-
-**1.** Las siguientes son recomendaciones, no requisitos.
-
-**2.** Si está editando código, tiene sentido seguir el formato del código existente.
-
-**3.** El estilo de código es necesario para la coherencia. La consistencia facilita la lectura del código y también facilita la búsqueda del código.
-
-**4.** Muchas de las reglas no tienen razones lógicas; están dictadas por prácticas establecidas.
-
-## Formatear {#formatting}
-
-**1.** La mayor parte del formato se realizará automáticamente por `clang-format`.
-
-**2.** Las sangrías son 4 espacios. Configure el entorno de desarrollo para que una pestaña agregue cuatro espacios.
-
-**3.** Abrir y cerrar llaves deben estar en una línea separada.
-
-``` cpp
-inline void readBoolText(bool & x, ReadBuffer & buf)
-{
-    char tmp = '0';
-    readChar(tmp, buf);
-    x = tmp != '0';
-}
-```
-
-**4.** Si todo el cuerpo de la función es `statement`, se puede colocar en una sola línea. Coloque espacios alrededor de llaves (además del espacio al final de la línea).
-
-``` cpp
-inline size_t mask() const                { return buf_size() - 1; }
-inline size_t place(HashValue x) const    { return x & mask(); }
-```
-
-**5.** Para funciones. No coloque espacios alrededor de los corchetes.
-
-``` cpp
-void reinsert(const Value & x)
-```
-
-``` cpp
-memcpy(&buf[place_value], &x, sizeof(x));
-```
-
-**6.** En `if`, `for`, `while` y otras expresiones, se inserta un espacio delante del corchete de apertura (a diferencia de las llamadas a funciones).
-
-``` cpp
-for (size_t i = 0; i < rows; i += storage.index_granularity)
-```
-
-**7.** Agregar espacios alrededor de los operadores binarios (`+`, `-`, `*`, `/`, `%`, …) and the ternary operator `?:`.
-
-``` cpp
-UInt16 year = (s[0] - '0') * 1000 + (s[1] - '0') * 100 + (s[2] - '0') * 10 + (s[3] - '0');
-UInt8 month = (s[5] - '0') * 10 + (s[6] - '0');
-UInt8 day = (s[8] - '0') * 10 + (s[9] - '0');
-```
-
-**8.** Si se introduce un avance de línea, coloque al operador en una nueva línea y aumente la sangría antes de ella.
-
-``` cpp
-if (elapsed_ns)
-    message << " ("
-        << rows_read_on_server * 1000000000 / elapsed_ns << " rows/s., "
-        << bytes_read_on_server * 1000.0 / elapsed_ns << " MB/s.) ";
-```
-
-**9.** Puede utilizar espacios para la alineación dentro de una línea, si lo desea.
-
-``` cpp
-dst.ClickLogID         = click.LogID;
-dst.ClickEventID       = click.EventID;
-dst.ClickGoodEvent     = click.GoodEvent;
-```
-
-**10.** No use espacios alrededor de los operadores `.`, `->`.
-
-Si es necesario, el operador se puede envolver a la siguiente línea. En este caso, el desplazamiento frente a él aumenta.
-
-**11.** No utilice un espacio para separar los operadores unarios (`--`, `++`, `*`, `&`, …) from the argument.
-
-**12.** Pon un espacio después de una coma, pero no antes. La misma regla se aplica a un punto y coma dentro de un `for` expresion.
-
-**13.** No utilice espacios para separar el `[]` operador.
-
-**14.** En un `template <...>` expresión, use un espacio entre `template` y `<`; sin espacios después de `<` o antes `>`.
-
-``` cpp
-template <typename TKey, typename TValue>
-struct AggregatedStatElement
-{}
-```
-
-**15.** En clases y estructuras, escribe `public`, `private`, y `protected` en el mismo nivel que `class/struct`, y sangrar el resto del código.
-
-``` cpp
-template <typename T>
-class MultiVersion
-{
-public:
-    /// Version of object for usage. shared_ptr manage lifetime of version.
-    using Version = std::shared_ptr<const T>;
-    ...
-}
-```
-
-**16.** Si el mismo `namespace` se usa para todo el archivo, y no hay nada más significativo, no es necesario un desplazamiento dentro `namespace`.
-
-**17.** Si el bloque para un `if`, `for`, `while`, u otra expresión consiste en una sola `statement`, las llaves son opcionales. Coloque el `statement` en una línea separada, en su lugar. Esta regla también es válida para `if`, `for`, `while`, …
-
-Pero si el interior `statement` contiene llaves o `else`, el bloque externo debe escribirse entre llaves.
-
-``` cpp
-/// Finish write.
-for (auto & stream : streams)
-    stream.second->finalize();
-```
-
-**18.** No debería haber espacios al final de las líneas.
-
-**19.** Los archivos de origen están codificados en UTF-8.
-
-**20.** Los caracteres no ASCII se pueden usar en literales de cadena.
-
-``` cpp
-<< ", " << (timer.elapsed() / chunks_stats.hits) << " μsec/hit.";
-```
-
-**21.** No escriba varias expresiones en una sola línea.
-
-**22.** Agrupe secciones de código dentro de las funciones y sepárelas con no más de una línea vacía.
-
-**23.** Separe funciones, clases, etc. con una o dos líneas vacías.
-
-**24.** `A const` (relacionado con un valor) debe escribirse antes del nombre del tipo.
-
-``` cpp
-//correct
-const char * pos
-const std::string & s
-//incorrect
-char const * pos
-```
-
-**25.** Al declarar un puntero o referencia, el `*` y `&` Los símbolos deben estar separados por espacios en ambos lados.
-
-``` cpp
-//correct
-const char * pos
-//incorrect
-const char* pos
-const char *pos
-```
-
-**26.** Cuando utilice tipos de plantilla, alias con el `using` palabra clave (excepto en los casos más simples).
-
-En otras palabras, los parámetros de la plantilla se especifican solo en `using` y no se repiten en el código.
-
-`using` se puede declarar localmente, como dentro de una función.
-
-``` cpp
-//correct
-using FileStreams = std::map<std::string, std::shared_ptr<Stream>>;
-FileStreams streams;
-//incorrect
-std::map<std::string, std::shared_ptr<Stream>> streams;
-```
-
-**27.** No declare varias variables de diferentes tipos en una instrucción.
-
-``` cpp
-//incorrect
-int x, *y;
-```
-
-**28.** No utilice moldes de estilo C.
-
-``` cpp
-//incorrect
-std::cerr << (int)c <<; std::endl;
-//correct
-std::cerr << static_cast<int>(c) << std::endl;
-```
-
-**29.** En clases y estructuras, los miembros del grupo y las funciones por separado dentro de cada ámbito de visibilidad.
-
-**30.** Para clases y estructuras pequeñas, no es necesario separar la declaración del método de la implementación.
-
-Lo mismo es cierto para los métodos pequeños en cualquier clase o estructura.
-
-Para clases y estructuras con plantillas, no separe las declaraciones de métodos de la implementación (porque de lo contrario deben definirse en la misma unidad de traducción).
-
-**31.** Puede ajustar líneas en 140 caracteres, en lugar de 80.
-
-**32.** Utilice siempre los operadores de incremento / decremento de prefijo si no se requiere postfix.
-
-``` cpp
-for (Names::const_iterator it = column_names.begin(); it != column_names.end(); ++it)
-```
-
-## Comentario {#comments}
-
-**1.** Asegúrese de agregar comentarios para todas las partes no triviales del código.
-
-Esto es muy importante. Escribir el comentario puede ayudarte a darte cuenta de que el código no es necesario o que está diseñado incorrectamente.
-
-``` cpp
-/** Part of piece of memory, that can be used.
-  * For example, if internal_buffer is 1MB, and there was only 10 bytes loaded to buffer from file for reading,
-  * then working_buffer will have size of only 10 bytes
-  * (working_buffer.end() will point to position right after those 10 bytes available for read).
-  */
-```
-
-**2.** Los comentarios pueden ser tan detallados como sea necesario.
-
-**3.** Coloque comentarios antes del código que describen. En casos raros, los comentarios pueden aparecer después del código, en la misma línea.
-
-``` cpp
-/** Parses and executes the query.
-*/
-void executeQuery(
-    ReadBuffer & istr, /// Where to read the query from (and data for INSERT, if applicable)
-    WriteBuffer & ostr, /// Where to write the result
-    Context & context, /// DB, tables, data types, engines, functions, aggregate functions...
-    BlockInputStreamPtr & query_plan, /// Here could be written the description on how query was executed
-    QueryProcessingStage::Enum stage = QueryProcessingStage::Complete /// Up to which stage process the SELECT query
-    )
-```
-
-**4.** Los comentarios deben escribirse en inglés solamente.
-
-**5.** Si está escribiendo una biblioteca, incluya comentarios detallados que la expliquen en el archivo de encabezado principal.
-
-**6.** No agregue comentarios que no proporcionen información adicional. En particular, no deje comentarios vacíos como este:
-
-``` cpp
-/*
-* Procedure Name:
-* Original procedure name:
-* Author:
-* Date of creation:
-* Dates of modification:
-* Modification authors:
-* Original file name:
-* Purpose:
-* Intent:
-* Designation:
-* Classes used:
-* Constants:
-* Local variables:
-* Parameters:
-* Date of creation:
-* Purpose:
-*/
-```
-
-El ejemplo se toma prestado del recurso http://home.tamk.fi/~jaalto/course/coding-style/doc/unmaintainable-code/.
-
-**7.** No escriba comentarios de basura (autor, fecha de creación ..) al principio de cada archivo.
-
-**8.** Los comentarios de una sola línea comienzan con tres barras: `///` y los comentarios de varias líneas comienzan con `/**`. Estos comentarios son considerados “documentation”.
-
-Nota: Puede usar Doxygen para generar documentación a partir de estos comentarios. Pero Doxygen no se usa generalmente porque es más conveniente navegar por el código en el IDE.
-
-**9.** Los comentarios de varias líneas no deben tener líneas vacías al principio y al final (excepto la línea que cierra un comentario de varias líneas).
-
-**10.** Para comentar el código, use comentarios básicos, no “documenting” comentario.
-
-**11.** Elimine las partes comentadas del código antes de confirmar.
-
-**12.** No use blasfemias en comentarios o código.
-
-**13.** No use letras mayúsculas. No use puntuación excesiva.
-
-``` cpp
-/// WHAT THE FAIL???
-```
-
-**14.** No use comentarios para hacer delímetros.
-
-``` cpp
-///******************************************************
-```
-
-**15.** No comiencen las discusiones en los comentarios.
-
-``` cpp
-/// Why did you do this stuff?
-```
-
-**16.** No es necesario escribir un comentario al final de un bloque que describa de qué se trataba.
-
-``` cpp
-/// for
-```
-
-## Nombre {#names}
-
-**1.** Use letras minúsculas con guiones bajos en los nombres de variables y miembros de clase.
-
-``` cpp
-size_t max_block_size;
-```
-
-**2.** Para los nombres de las funciones (métodos), use camelCase comenzando con una letra minúscula.
-
-``` cpp
-std::string getName() const override { return "Memory"; }
-```
-
-**3.** Para los nombres de las clases (estructuras), use CamelCase comenzando con una letra mayúscula. Los prefijos distintos de I no se usan para interfaces.
-
-``` cpp
-class StorageMemory : public IStorage
-```
-
-**4.** `using` se nombran de la misma manera que las clases, o con `_t` al final.
-
-**5.** Nombres de argumentos de tipo de plantilla: en casos simples, use `T`; `T`, `U`; `T1`, `T2`.
-
-Para casos más complejos, siga las reglas para los nombres de clase o agregue el prefijo `T`.
-
-``` cpp
-template <typename TKey, typename TValue>
-struct AggregatedStatElement
-```
-
-**6.** Nombres de argumentos constantes de plantilla: siga las reglas para los nombres de variables o use `N` en casos simples.
-
-``` cpp
-template <bool without_www>
-struct ExtractDomain
-```
-
-**7.** Para clases abstractas (interfaces) puede agregar el `I` prefijo.
-
-``` cpp
-class IBlockInputStream
-```
-
-**8.** Si usa una variable localmente, puede usar el nombre corto.
-
-En todos los demás casos, use un nombre que describa el significado.
-
-``` cpp
-bool info_successfully_loaded = false;
-```
-
-**9.** Nombres de `define`s y las constantes globales usan ALL_CAPS con guiones bajos.
-
-``` cpp
-#define MAX_SRC_TABLE_NAMES_TO_STORE 1000
-```
-
-**10.** Los nombres de archivo deben usar el mismo estilo que su contenido.
-
-Si un archivo contiene una sola clase, nombre el archivo de la misma manera que la clase (CamelCase).
-
-Si el archivo contiene una sola función, nombre el archivo de la misma manera que la función (camelCase).
-
-**11.** Si el nombre contiene una abreviatura, :
-
--   Para los nombres de variables, la abreviatura debe usar letras minúsculas `mysql_connection` (ni `mySQL_connection`).
--   Para los nombres de clases y funciones, mantenga las letras mayúsculas en la abreviatura`MySQLConnection` (ni `MySqlConnection`).
-
-**12.** Los argumentos del constructor que se usan solo para inicializar los miembros de la clase deben nombrarse de la misma manera que los miembros de la clase, pero con un guión bajo al final.
-
-``` cpp
-FileQueueProcessor(
-    const std::string & path_,
-    const std::string & prefix_,
-    std::shared_ptr<FileHandler> handler_)
-    : path(path_),
-    prefix(prefix_),
-    handler(handler_),
-    log(&Logger::get("FileQueueProcessor"))
-{
-}
-```
-
-El sufijo de subrayado se puede omitir si el argumento no se usa en el cuerpo del constructor.
-
-**13.** No hay diferencia en los nombres de las variables locales y los miembros de la clase (no se requieren prefijos).
-
-``` cpp
-timer (not m_timer)
-```
-
-**14.** Para las constantes en un `enum`, usar CamelCase con una letra mayúscula. ALL_CAPS también es aceptable. Si el `enum` no es local, utilice un `enum class`.
-
-``` cpp
-enum class CompressionMethod
-{
-    QuickLZ = 0,
-    LZ4     = 1,
-};
-```
-
-**15.** Todos los nombres deben estar en inglés. La transliteración de palabras rusas no está permitida.
-
-    not Stroka
-
-**16.** Las abreviaturas son aceptables si son bien conocidas (cuando puede encontrar fácilmente el significado de la abreviatura en Wikipedia o en un motor de búsqueda).
-
-    `AST`, `SQL`.
-
-    Not `NVDH` (some random letters)
-
-Las palabras incompletas son aceptables si la versión abreviada es de uso común.
-
-También puede usar una abreviatura si el nombre completo se incluye junto a él en los comentarios.
-
-**17.** Los nombres de archivo con código fuente de C++ deben tener `.cpp` ampliación. Los archivos de encabezado deben tener `.h` ampliación.
-
-## Cómo escribir código {#how-to-write-code}
-
-**1.** Gestión de la memoria.
-
-Desasignación de memoria manual (`delete`) solo se puede usar en el código de la biblioteca.
-
-En el código de la biblioteca, el `delete` operador sólo se puede utilizar en destructores.
-
-En el código de la aplicación, la memoria debe ser liberada por el objeto que la posee.
-
-Ejemplos:
-
--   La forma más fácil es colocar un objeto en la pila o convertirlo en miembro de otra clase.
--   Para una gran cantidad de objetos pequeños, use contenedores.
--   Para la desasignación automática de un pequeño número de objetos que residen en el montón, use `shared_ptr/unique_ptr`.
-
-**2.** Gestión de recursos.
-
-Utilizar `RAII` y ver arriba.
-
-**3.** Manejo de errores.
-
-Utilice excepciones. En la mayoría de los casos, solo necesita lanzar una excepción y no necesita atraparla (debido a `RAII`).
-
-En las aplicaciones de procesamiento de datos fuera de línea, a menudo es aceptable no detectar excepciones.
-
-En los servidores que manejan las solicitudes de los usuarios, generalmente es suficiente detectar excepciones en el nivel superior del controlador de conexión.
-
-En las funciones de subproceso, debe capturar y mantener todas las excepciones para volver a lanzarlas en el subproceso principal después `join`.
-
-``` cpp
-/// If there weren't any calculations yet, calculate the first block synchronously
-if (!started)
-{
-    calculate();
-    started = true;
-}
-else /// If calculations are already in progress, wait for the result
-    pool.wait();
-
-if (exception)
-    exception->rethrow();
-```
-
-Nunca oculte excepciones sin manejo. Nunca simplemente ponga ciegamente todas las excepciones para iniciar sesión.
-
-``` cpp
-//Not correct
-catch (...) {}
-```
-
-Si necesita ignorar algunas excepciones, hágalo solo para las específicas y vuelva a lanzar el resto.
-
-``` cpp
-catch (const DB::Exception & e)
-{
-    if (e.code() == ErrorCodes::UNKNOWN_AGGREGATE_FUNCTION)
-        return nullptr;
-    else
-        throw;
-}
-```
-
-Al usar funciones con códigos de respuesta o `errno`, siempre verifique el resultado y arroje una excepción en caso de error.
-
-``` cpp
-if (0 != close(fd))
-    throwFromErrno("Cannot close file " + file_name, ErrorCodes::CANNOT_CLOSE_FILE);
-```
-
-`Do not use assert`.
-
-**4.** Tipos de excepción.
-
-No es necesario utilizar una jerarquía de excepciones compleja en el código de la aplicación. El texto de excepción debe ser comprensible para un administrador del sistema.
-
-**5.** Lanzar excepciones de destructores.
-
-Esto no es recomendable, pero está permitido.
-
-Utilice las siguientes opciones:
-
--   Crear una función (`done()` o `finalize()`) que hará todo el trabajo de antemano que podría conducir a una excepción. Si se llamó a esa función, no debería haber excepciones en el destructor más adelante.
--   Las tareas que son demasiado complejas (como enviar mensajes a través de la red) se pueden poner en un método separado al que el usuario de la clase tendrá que llamar antes de la destrucción.
--   Si hay una excepción en el destructor, es mejor registrarla que ocultarla (si el registrador está disponible).
--   En aplicaciones simples, es aceptable confiar en `std::terminate` (para los casos de `noexcept` de forma predeterminada en C ++ 11) para manejar excepciones.
-
-**6.** Bloques de código anónimos.
-
-Puede crear un bloque de código separado dentro de una sola función para hacer que ciertas variables sean locales, de modo que se llame a los destructores al salir del bloque.
-
-``` cpp
-Block block = data.in->read();
-
-{
-    std::lock_guard<std::mutex> lock(mutex);
-    data.ready = true;
-    data.block = block;
-}
-
-ready_any.set();
-```
-
-**7.** Multithreading.
-
-En programas de procesamiento de datos fuera de línea:
-
--   Trate de obtener el mejor rendimiento posible en un solo núcleo de CPU. A continuación, puede paralelizar su código si es necesario.
-
-En aplicaciones de servidor:
-
--   Utilice el grupo de subprocesos para procesar solicitudes. En este punto, no hemos tenido ninguna tarea que requiera el cambio de contexto de espacio de usuario.
-
-La horquilla no se usa para la paralelización.
-
-**8.** Sincronización de hilos.
-
-A menudo es posible hacer que diferentes hilos usen diferentes celdas de memoria (incluso mejor: diferentes líneas de caché) y no usar ninguna sincronización de hilos (excepto `joinAll`).
-
-Si se requiere sincronización, en la mayoría de los casos, es suficiente usar mutex bajo `lock_guard`.
-
-En otros casos, use primitivas de sincronización del sistema. No utilice la espera ocupada.
-
-Las operaciones atómicas deben usarse solo en los casos más simples.
-
-No intente implementar estructuras de datos sin bloqueo a menos que sea su principal área de especialización.
-
-**9.** Punteros vs referencias.
-
-En la mayoría de los casos, prefiera referencias.
-
-**10.** Construir.
-
-Usar referencias constantes, punteros a constantes, `const_iterator`, y métodos const.
-
-Considerar `const` para ser predeterminado y usar no-`const` sólo cuando sea necesario.
-
-Al pasar variables por valor, usando `const` por lo general no tiene sentido.
-
-**11.** sin firmar.
-
-Utilizar `unsigned` si es necesario.
-
-**12.** Tipos numéricos.
-
-Utilice los tipos `UInt8`, `UInt16`, `UInt32`, `UInt64`, `Int8`, `Int16`, `Int32`, y `Int64`, así como `size_t`, `ssize_t`, y `ptrdiff_t`.
-
-No use estos tipos para números: `signed/unsigned long`, `long long`, `short`, `signed/unsigned char`, `char`.
-
-**13.** Pasando argumentos.
-
-Pasar valores complejos por referencia (incluyendo `std::string`).
-
-Si una función captura la propiedad de un objeto creado en el montón, cree el tipo de argumento `shared_ptr` o `unique_ptr`.
-
-**14.** Valores devueltos.
-
-En la mayoría de los casos, sólo tiene que utilizar `return`. No escribir `return std::move(res)`.
-
-Si la función asigna un objeto en el montón y lo devuelve, use `shared_ptr` o `unique_ptr`.
-
-En casos excepcionales, es posible que deba devolver el valor a través de un argumento. En este caso, el argumento debe ser una referencia.
-
-``` cpp
-using AggregateFunctionPtr = std::shared_ptr<IAggregateFunction>;
-
-/** Allows creating an aggregate function by its name.
-  */
-class AggregateFunctionFactory
-{
-public:
-    AggregateFunctionFactory();
-    AggregateFunctionPtr get(const String & name, const DataTypes & argument_types) const;
-```
-
-**15.** espacio de nombres.
-
-No hay necesidad de usar un `namespace` para el código de aplicación.
-
-Las bibliotecas pequeñas tampoco necesitan esto.
-
-Para bibliotecas medianas a grandes, coloque todo en un `namespace`.
-
-En la biblioteca `.h` archivo, se puede utilizar `namespace detail` para ocultar los detalles de implementación no necesarios para el código de la aplicación.
-
-En un `.cpp` archivo, puede usar un `static` o espacio de nombres anónimo para ocultar símbolos.
-
-Además, un `namespace` puede ser utilizado para un `enum` para evitar que los nombres correspondientes caigan en un `namespace` (pero es mejor usar un `enum class`).
-
-**16.** Inicialización diferida.
-
-Si se requieren argumentos para la inicialización, normalmente no debe escribir un constructor predeterminado.
-
-Si más adelante tendrá que retrasar la inicialización, puede agregar un constructor predeterminado que creará un objeto no válido. O, para un pequeño número de objetos, puede usar `shared_ptr/unique_ptr`.
-
-``` cpp
-Loader(DB::Connection * connection_, const std::string & query, size_t max_block_size_);
-
-/// For deferred initialization
-Loader() {}
-```
-
-**17.** Funciones virtuales.
-
-Si la clase no está destinada para uso polimórfico, no necesita hacer que las funciones sean virtuales. Esto también se aplica al destructor.
-
-**18.** Codificación.
-
-Usa UTF-8 en todas partes. Utilizar `std::string`y`char *`. No use `std::wstring`y`wchar_t`.
-
-**19.** Tala.
-
-Vea los ejemplos en todas partes del código.
-
-Antes de confirmar, elimine todo el registro de depuración y sin sentido, y cualquier otro tipo de salida de depuración.
-
-Se debe evitar el registro en ciclos, incluso en el nivel Trace.
-
-Los registros deben ser legibles en cualquier nivel de registro.
-
-El registro solo debe usarse en el código de la aplicación, en su mayor parte.
-
-Los mensajes de registro deben estar escritos en inglés.
-
-El registro debe ser preferiblemente comprensible para el administrador del sistema.
-
-No use blasfemias en el registro.
-
-Utilice la codificación UTF-8 en el registro. En casos excepcionales, puede usar caracteres que no sean ASCII en el registro.
-
-**20.** Entrada-salida.
-
-No utilice `iostreams` en ciclos internos que son críticos para el rendimiento de la aplicación (y nunca usan `stringstream`).
-
-Utilice el `DB/IO` biblioteca en su lugar.
-
-**21.** Fecha y hora.
-
-Ver el `DateLUT` biblioteca.
-
-**22.** incluir.
-
-Utilice siempre `#pragma once` en lugar de incluir guardias.
-
-**23.** utilizar.
-
-`using namespace` no se utiliza. Usted puede utilizar `using` con algo específico. Pero hazlo local dentro de una clase o función.
-
-**24.** No use `trailing return type` para funciones a menos que sea necesario.
-
-``` cpp
-auto f() -> void
-```
-
-**25.** Declaración e inicialización de variables.
-
-``` cpp
-//right way
-std::string s = "Hello";
-std::string s{"Hello"};
-
-//wrong way
-auto s = std::string{"Hello"};
-```
-
-**26.** Para funciones virtuales, escriba `virtual` en la clase base, pero escribe `override` en lugar de `virtual` en las clases descendientes.
-
-## Características no utilizadas de C ++ {#unused-features-of-c}
-
-**1.** La herencia virtual no se utiliza.
-
-**2.** Los especificadores de excepción de C ++ 03 no se usan.
-
-## Plataforma {#platform}
-
-**1.** Escribimos código para una plataforma específica.
-
-Pero en igualdad de condiciones, se prefiere el código multiplataforma o portátil.
-
-**2.** Idioma: C++20.
-
-**3.** Compilación: `gcc`. En este momento (agosto 2020), el código se compila utilizando la versión 9.3. (También se puede compilar usando `clang 8`.)
-
-Se utiliza la biblioteca estándar (`libc++`).
-
-**4.**OS: Linux Ubuntu, no más viejo que Precise.
-
-**5.**El código está escrito para la arquitectura de CPU x86_64.
-
-El conjunto de instrucciones de CPU es el conjunto mínimo admitido entre nuestros servidores. Actualmente, es SSE 4.2.
-
-**6.** Utilizar `-Wall -Wextra -Werror` flags de compilación.
-
-**7.** Use enlaces estáticos con todas las bibliotecas, excepto aquellas a las que son difíciles de conectar estáticamente (consulte la salida de la `ldd` comando).
-
-**8.** El código se desarrolla y se depura con la configuración de la versión.
-
-## Herramienta {#tools}
-
-**1.** KDevelop es un buen IDE.
-
-**2.** Para la depuración, use `gdb`, `valgrind` (`memcheck`), `strace`, `-fsanitize=...`, o `tcmalloc_minimal_debug`.
-
-**3.** Para crear perfiles, use `Linux Perf`, `valgrind` (`callgrind`), o `strace -cf`.
-
-**4.** Las fuentes están en Git.
-
-**5.** Usos de ensamblaje `CMake`.
-
-**6.** Los programas se lanzan usando `deb` paquete.
-
-**7.** Los compromisos a dominar no deben romper la compilación.
-
-Aunque solo las revisiones seleccionadas se consideran viables.
-
-**8.** Realice confirmaciones tan a menudo como sea posible, incluso si el código está parcialmente listo.
-
-Use ramas para este propósito.
-
-Si su código en el `master` branch todavía no se puede construir, excluirlo de la compilación antes de la `push`. Tendrá que terminarlo o eliminarlo dentro de unos días.
-
-**9.** Para cambios no triviales, use ramas y publíquelas en el servidor.
-
-**10.** El código no utilizado se elimina del repositorio.
-
-## Biblioteca {#libraries}
-
-**1.** Se utiliza la biblioteca estándar de C++20 (se permiten extensiones experimentales), así como `boost` y `Poco` marco.
-
-**2.** Si es necesario, puede usar cualquier biblioteca conocida disponible en el paquete del sistema operativo.
-
-Si ya hay una buena solución disponible, úsela, incluso si eso significa que debe instalar otra biblioteca.
-
-(Pero prepárese para eliminar las bibliotecas incorrectas del código.)
-
-**3.** Puede instalar una biblioteca que no esté en los paquetes, si los paquetes no tienen lo que necesita o tienen una versión obsoleta o el tipo de compilación incorrecto.
-
-**4.** Si la biblioteca es pequeña y no tiene su propio sistema de compilación complejo, coloque los archivos `contrib` carpeta.
-
-**5.** Siempre se da preferencia a las bibliotecas que ya están en uso.
-
-## Recomendaciones generales {#general-recommendations-1}
-
-**1.** Escribe el menor código posible.
-
-**2.** Pruebe la solución más simple.
-
-**3.** No escriba código hasta que sepa cómo va a funcionar y cómo funcionará el bucle interno.
-
-**4.** En los casos más simples, use `using` en lugar de clases o estructuras.
-
-**5.** Si es posible, no escriba constructores de copia, operadores de asignación, destructores (que no sean virtuales, si la clase contiene al menos una función virtual), mueva constructores o mueva operadores de asignación. En otras palabras, las funciones generadas por el compilador deben funcionar correctamente. Usted puede utilizar `default`.
-
-**6.** Se fomenta la simplificación del código. Reduzca el tamaño de su código siempre que sea posible.
-
-## Recomendaciones adicionales {#additional-recommendations}
-
-**1.** Especificar explícitamente `std::` para tipos de `stddef.h`
-
-no se recomienda. En otras palabras, recomendamos escribir `size_t` en su lugar `std::size_t` porque es más corto.
-
-Es aceptable agregar `std::`.
-
-**2.** Especificar explícitamente `std::` para funciones de la biblioteca C estándar
-
-no se recomienda. En otras palabras, escribir `memcpy` en lugar de `std::memcpy`.
-
-La razón es que hay funciones no estándar similares, tales como `memmem`. Utilizamos estas funciones en ocasiones. Estas funciones no existen en `namespace std`.
-
-Si usted escribe `std::memcpy` en lugar de `memcpy` en todas partes, entonces `memmem` sin `std::` se verá extraño.
-
-Sin embargo, todavía puedes usar `std::` si lo prefieres.
-
-**3.** Usar funciones de C cuando las mismas están disponibles en la biblioteca estándar de C ++.
-
-Esto es aceptable si es más eficiente.
-
-Por ejemplo, use `memcpy` en lugar de `std::copy` para copiar grandes trozos de memoria.
-
-**4.** Argumentos de función multilínea.
-
-Se permite cualquiera de los siguientes estilos de ajuste:
-
-``` cpp
-function(
-  T1 x1,
-  T2 x2)
-```
-
-``` cpp
-function(
-  size_t left, size_t right,
-  const & RangesInDataParts ranges,
-  size_t limit)
-```
-
-``` cpp
-function(size_t left, size_t right,
-  const & RangesInDataParts ranges,
-  size_t limit)
-```
-
-``` cpp
-function(size_t left, size_t right,
-      const & RangesInDataParts ranges,
-      size_t limit)
-```
-
-``` cpp
-function(
-      size_t left,
-      size_t right,
-      const & RangesInDataParts ranges,
-      size_t limit)
-```
-
-[Artículo Original](https://clickhouse.tech/docs/en/development/style/) <!--hide-->
diff --git a/docs/es/development/tests.md b/docs/es/development/tests.md
deleted file mode 120000
index c03d36c3916..00000000000
--- a/docs/es/development/tests.md
+++ /dev/null
@@ -1 +0,0 @@
-../../en/development/tests.md
\ No newline at end of file
diff --git a/docs/es/engines/database-engines/atomic.md b/docs/es/engines/database-engines/atomic.md
deleted file mode 100644
index f019b94a00b..00000000000
--- a/docs/es/engines/database-engines/atomic.md
+++ /dev/null
@@ -1,17 +0,0 @@
----
-toc_priority: 32
-toc_title: Atomic
----
-
-
-# Atomic {#atomic}
-
-It is supports non-blocking `DROP` and `RENAME TABLE` queries and atomic `EXCHANGE TABLES t1 AND t2` queries. Atomic database engine is used by default.
-
-## Creating a Database {#creating-a-database}
-
-```sql
-CREATE DATABASE test ENGINE = Atomic;
-```
-
-[Original article](https://clickhouse.tech/docs/en/engines/database_engines/atomic/) <!--hide-->
diff --git a/docs/es/engines/database-engines/index.md b/docs/es/engines/database-engines/index.md
deleted file mode 100644
index 8784b9bd02b..00000000000
--- a/docs/es/engines/database-engines/index.md
+++ /dev/null
@@ -1,21 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: Motores de base de datos
-toc_priority: 27
-toc_title: "Implantaci\xF3n"
----
-
-# Motores de base de datos {#database-engines}
-
-Los motores de bases de datos le permiten trabajar con tablas.
-
-De forma predeterminada, ClickHouse utiliza su motor de base de datos nativa, que proporciona [motores de mesa](../../engines/table-engines/index.md) y una [Dialecto SQL](../../sql-reference/syntax.md).
-
-También puede utilizar los siguientes motores de base de datos:
-
--   [MySQL](mysql.md)
-
--   [Perezoso](lazy.md)
-
-[Artículo Original](https://clickhouse.tech/docs/en/database_engines/) <!--hide-->
diff --git a/docs/es/engines/database-engines/lazy.md b/docs/es/engines/database-engines/lazy.md
deleted file mode 100644
index 0988c4cb395..00000000000
--- a/docs/es/engines/database-engines/lazy.md
+++ /dev/null
@@ -1,18 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 31
-toc_title: Perezoso
----
-
-# Perezoso {#lazy}
-
-Mantiene las tablas en RAM solamente `expiration_time_in_seconds` segundos después del último acceso. Solo se puede usar con tablas \*Log.
-
-Está optimizado para almacenar muchas tablas pequeñas \* Log, para las cuales hay un largo intervalo de tiempo entre los accesos.
-
-## Creación de una base de datos {#creating-a-database}
-
-    CREATE DATABASE testlazy ENGINE = Lazy(expiration_time_in_seconds);
-
-[Artículo Original](https://clickhouse.tech/docs/en/database_engines/lazy/) <!--hide-->
diff --git a/docs/es/engines/database-engines/mysql.md b/docs/es/engines/database-engines/mysql.md
deleted file mode 100644
index 5f1dec97f35..00000000000
--- a/docs/es/engines/database-engines/mysql.md
+++ /dev/null
@@ -1,135 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 30
-toc_title: MySQL
----
-
-# MySQL {#mysql}
-
-Permite conectarse a bases de datos en un servidor MySQL remoto y realizar `INSERT` y `SELECT` consultas para intercambiar datos entre ClickHouse y MySQL.
-
-El `MySQL` motor de base de datos traducir consultas al servidor MySQL para que pueda realizar operaciones tales como `SHOW TABLES` o `SHOW CREATE TABLE`.
-
-No puede realizar las siguientes consultas:
-
--   `RENAME`
--   `CREATE TABLE`
--   `ALTER`
-
-## Creación de una base de datos {#creating-a-database}
-
-``` sql
-CREATE DATABASE [IF NOT EXISTS] db_name [ON CLUSTER cluster]
-ENGINE = MySQL('host:port', ['database' | database], 'user', 'password')
-```
-
-**Parámetros del motor**
-
--   `host:port` — MySQL server address.
--   `database` — Remote database name.
--   `user` — MySQL user.
--   `password` — User password.
-
-## Soporte de tipos de datos {#data_types-support}
-
-| MySQL                            | Haga clic en Casa                                            |
-|----------------------------------|--------------------------------------------------------------|
-| UNSIGNED TINYINT                 | [UInt8](../../sql-reference/data-types/int-uint.md)          |
-| TINYINT                          | [Int8](../../sql-reference/data-types/int-uint.md)           |
-| UNSIGNED SMALLINT                | [UInt16](../../sql-reference/data-types/int-uint.md)         |
-| SMALLINT                         | [Int16](../../sql-reference/data-types/int-uint.md)          |
-| UNSIGNED INT, UNSIGNED MEDIUMINT | [UInt32](../../sql-reference/data-types/int-uint.md)         |
-| INT, MEDIUMINT                   | [Int32](../../sql-reference/data-types/int-uint.md)          |
-| UNSIGNED BIGINT                  | [UInt64](../../sql-reference/data-types/int-uint.md)         |
-| BIGINT                           | [Int64](../../sql-reference/data-types/int-uint.md)          |
-| FLOAT                            | [Float32](../../sql-reference/data-types/float.md)           |
-| DOUBLE                           | [Float64](../../sql-reference/data-types/float.md)           |
-| DATE                             | [Fecha](../../sql-reference/data-types/date.md)              |
-| DATETIME, TIMESTAMP              | [FechaHora](../../sql-reference/data-types/datetime.md)      |
-| BINARY                           | [Cadena fija](../../sql-reference/data-types/fixedstring.md) |
-
-Todos los demás tipos de datos MySQL se convierten en [Cadena](../../sql-reference/data-types/string.md).
-
-[NULL](../../sql-reference/data-types/nullable.md) se admite.
-
-## Ejemplos de uso {#examples-of-use}
-
-Tabla en MySQL:
-
-``` text
-mysql> USE test;
-Database changed
-
-mysql> CREATE TABLE `mysql_table` (
-    ->   `int_id` INT NOT NULL AUTO_INCREMENT,
-    ->   `float` FLOAT NOT NULL,
-    ->   PRIMARY KEY (`int_id`));
-Query OK, 0 rows affected (0,09 sec)
-
-mysql> insert into mysql_table (`int_id`, `float`) VALUES (1,2);
-Query OK, 1 row affected (0,00 sec)
-
-mysql> select * from mysql_table;
-+------+-----+
-| int_id | value |
-+------+-----+
-|      1 |     2 |
-+------+-----+
-1 row in set (0,00 sec)
-```
-
-Base de datos en ClickHouse, intercambiando datos con el servidor MySQL:
-
-``` sql
-CREATE DATABASE mysql_db ENGINE = MySQL('localhost:3306', 'test', 'my_user', 'user_password')
-```
-
-``` sql
-SHOW DATABASES
-```
-
-``` text
-┌─name─────┐
-│ default  │
-│ mysql_db │
-│ system   │
-└──────────┘
-```
-
-``` sql
-SHOW TABLES FROM mysql_db
-```
-
-``` text
-┌─name─────────┐
-│  mysql_table │
-└──────────────┘
-```
-
-``` sql
-SELECT * FROM mysql_db.mysql_table
-```
-
-``` text
-┌─int_id─┬─value─┐
-│      1 │     2 │
-└────────┴───────┘
-```
-
-``` sql
-INSERT INTO mysql_db.mysql_table VALUES (3,4)
-```
-
-``` sql
-SELECT * FROM mysql_db.mysql_table
-```
-
-``` text
-┌─int_id─┬─value─┐
-│      1 │     2 │
-│      3 │     4 │
-└────────┴───────┘
-```
-
-[Artículo Original](https://clickhouse.tech/docs/en/database_engines/mysql/) <!--hide-->
diff --git a/docs/es/engines/index.md b/docs/es/engines/index.md
deleted file mode 100644
index 03e4426dd8d..00000000000
--- a/docs/es/engines/index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: Motor
-toc_priority: 25
----
-
-
diff --git a/docs/es/engines/table-engines/index.md b/docs/es/engines/table-engines/index.md
deleted file mode 100644
index 7be315e3ee3..00000000000
--- a/docs/es/engines/table-engines/index.md
+++ /dev/null
@@ -1,85 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: Motores de mesa
-toc_priority: 26
-toc_title: "Implantaci\xF3n"
----
-
-# Motores de mesa {#table_engines}
-
-El motor de tabla (tipo de tabla) determina:
-
--   Cómo y dónde se almacenan los datos, dónde escribirlos y dónde leerlos.
--   Qué consultas son compatibles y cómo.
--   Acceso a datos simultáneos.
--   Uso de índices, si está presente.
--   Si es posible la ejecución de solicitudes multiproceso.
--   Parámetros de replicación de datos.
-
-## Familias de motores {#engine-families}
-
-### Método de codificación de datos: {#mergetree}
-
-Los motores de mesa más universales y funcionales para tareas de alta carga. La propiedad compartida por estos motores es la inserción rápida de datos con el posterior procesamiento de datos en segundo plano. `MergeTree` Los motores familiares admiten la replicación de datos (con [Replicado\*](mergetree-family/replication.md#table_engines-replication) versiones de motores), particionamiento y otras características no admitidas en otros motores.
-
-Motores en la familia:
-
--   [Método de codificación de datos:](mergetree-family/mergetree.md#mergetree)
--   [ReplacingMergeTree](mergetree-family/replacingmergetree.md#replacingmergetree)
--   [SummingMergeTree](mergetree-family/summingmergetree.md#summingmergetree)
--   [AgregaciónMergeTree](mergetree-family/aggregatingmergetree.md#aggregatingmergetree)
--   [ColapsarMergeTree](mergetree-family/collapsingmergetree.md#table_engine-collapsingmergetree)
--   [VersionedCollapsingMergeTree](mergetree-family/versionedcollapsingmergetree.md#versionedcollapsingmergetree)
--   [GraphiteMergeTree](mergetree-family/graphitemergetree.md#graphitemergetree)
-
-### Registro {#log}
-
-Ligero [motor](log-family/index.md) con funcionalidad mínima. Son los más efectivos cuando necesita escribir rápidamente muchas tablas pequeñas (hasta aproximadamente 1 millón de filas) y leerlas más tarde como un todo.
-
-Motores en la familia:
-
--   [TinyLog](log-family/tinylog.md#tinylog)
--   [StripeLog](log-family/stripelog.md#stripelog)
--   [Registro](log-family/log.md#log)
-
-### Motores de integración {#integration-engines}
-
-Motores para comunicarse con otros sistemas de almacenamiento y procesamiento de datos.
-
-Motores en la familia:
-
--   [Kafka](integrations/kafka.md#kafka)
--   [MySQL](integrations/mysql.md#mysql)
--   [ODBC](integrations/odbc.md#table-engine-odbc)
--   [JDBC](integrations/jdbc.md#table-engine-jdbc)
--   [HDFS](integrations/hdfs.md#hdfs)
-
-### Motores especiales {#special-engines}
-
-Motores en la familia:
-
--   [Distribuido](special/distributed.md#distributed)
--   [Método de codificación de datos:](special/materializedview.md#materializedview)
--   [Diccionario](special/dictionary.md#dictionary)
--   \[Fusión\](special/merge.md#merge
--   [File](special/file.md#file)
--   [Nulo](special/null.md#null)
--   [Establecer](special/set.md#set)
--   [Unir](special/join.md#join)
--   [URL](special/url.md#table_engines-url)
--   [Vista](special/view.md#table_engines-view)
--   [Memoria](special/memory.md#memory)
--   [Búfer](special/buffer.md#buffer)
-
-## Virtual Columnas {#table_engines-virtual_columns}
-
-La columna virtual es un atributo de motor de tabla integral que se define en el código fuente del motor.
-
-No debe especificar columnas virtuales en el `CREATE TABLE` consulta y no puedes verlos en `SHOW CREATE TABLE` y `DESCRIBE TABLE` resultados de la consulta. Las columnas virtuales también son de solo lectura, por lo que no puede insertar datos en columnas virtuales.
-
-Para seleccionar datos de una columna virtual, debe especificar su nombre en el `SELECT` consulta. `SELECT *` no devuelve valores de columnas virtuales.
-
-Si crea una tabla con una columna que tiene el mismo nombre que una de las columnas virtuales de la tabla, la columna virtual se vuelve inaccesible. No recomendamos hacer esto. Para ayudar a evitar conflictos, los nombres de columna virtual suelen tener el prefijo de un guión bajo.
-
-[Artículo Original](https://clickhouse.tech/docs/en/operations/table_engines/) <!--hide-->
diff --git a/docs/es/engines/table-engines/integrations/hdfs.md b/docs/es/engines/table-engines/integrations/hdfs.md
deleted file mode 100644
index 5e0211660f5..00000000000
--- a/docs/es/engines/table-engines/integrations/hdfs.md
+++ /dev/null
@@ -1,123 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 36
-toc_title: HDFS
----
-
-# HDFS {#table_engines-hdfs}
-
-Este motor proporciona integración con [Acerca de nosotros](https://en.wikipedia.org/wiki/Apache_Hadoop) permitiendo gestionar datos sobre [HDFS](https://hadoop.apache.org/docs/current/hadoop-project-dist/hadoop-hdfs/HdfsDesign.html)a través de ClickHouse. Este motor es similar
-a la [File](../special/file.md#table_engines-file) y [URL](../special/url.md#table_engines-url) motores, pero proporciona características específicas de Hadoop.
-
-## Uso {#usage}
-
-``` sql
-ENGINE = HDFS(URI, format)
-```
-
-El `URI` El parámetro es el URI del archivo completo en HDFS.
-El `format` parámetro especifica uno de los formatos de archivo disponibles. Realizar
-`SELECT` consultas, el formato debe ser compatible para la entrada, y para realizar
-`INSERT` queries – for output. The available formats are listed in the
-[Formato](../../../interfaces/formats.md#formats) apartado.
-La parte de la ruta de `URI` puede contener globs. En este caso, la tabla sería de solo lectura.
-
-**Ejemplo:**
-
-**1.** Configurar el `hdfs_engine_table` tabla:
-
-``` sql
-CREATE TABLE hdfs_engine_table (name String, value UInt32) ENGINE=HDFS('hdfs://hdfs1:9000/other_storage', 'TSV')
-```
-
-**2.** Llenar archivo:
-
-``` sql
-INSERT INTO hdfs_engine_table VALUES ('one', 1), ('two', 2), ('three', 3)
-```
-
-**3.** Consultar los datos:
-
-``` sql
-SELECT * FROM hdfs_engine_table LIMIT 2
-```
-
-``` text
-┌─name─┬─value─┐
-│ one  │     1 │
-│ two  │     2 │
-└──────┴───────┘
-```
-
-## Detalles de implementación {#implementation-details}
-
--   Las lecturas y escrituras pueden ser paralelas
--   No soportado:
-    -   `ALTER` y `SELECT...SAMPLE` operación.
-    -   Índices.
-    -   Replicación.
-
-**Globs en el camino**
-
-Múltiples componentes de ruta de acceso pueden tener globs. Para ser procesado, el archivo debe existir y coincidir con todo el patrón de ruta. Listado de archivos determina durante `SELECT` (no en `CREATE` momento).
-
--   `*` — Substitutes any number of any characters except `/` incluyendo cadena vacía.
--   `?` — Substitutes any single character.
--   `{some_string,another_string,yet_another_one}` — Substitutes any of strings `'some_string', 'another_string', 'yet_another_one'`.
--   `{N..M}` — Substitutes any number in range from N to M including both borders.
-
-Construcciones con `{}` son similares a la [remoto](../../../sql-reference/table-functions/remote.md) función de la tabla.
-
-**Ejemplo**
-
-1.  Supongamos que tenemos varios archivos en formato TSV con los siguientes URI en HDFS:
-
--   ‘hdfs://hdfs1:9000/some_dir/some_file_1’
--   ‘hdfs://hdfs1:9000/some_dir/some_file_2’
--   ‘hdfs://hdfs1:9000/some_dir/some_file_3’
--   ‘hdfs://hdfs1:9000/another_dir/some_file_1’
--   ‘hdfs://hdfs1:9000/another_dir/some_file_2’
--   ‘hdfs://hdfs1:9000/another_dir/some_file_3’
-
-1.  Hay varias maneras de hacer una tabla que consta de los seis archivos:
-
-<!-- -->
-
-``` sql
-CREATE TABLE table_with_range (name String, value UInt32) ENGINE = HDFS('hdfs://hdfs1:9000/{some,another}_dir/some_file_{1..3}', 'TSV')
-```
-
-Otra forma:
-
-``` sql
-CREATE TABLE table_with_question_mark (name String, value UInt32) ENGINE = HDFS('hdfs://hdfs1:9000/{some,another}_dir/some_file_?', 'TSV')
-```
-
-La tabla consta de todos los archivos en ambos directorios (todos los archivos deben satisfacer el formato y el esquema descritos en la consulta):
-
-``` sql
-CREATE TABLE table_with_asterisk (name String, value UInt32) ENGINE = HDFS('hdfs://hdfs1:9000/{some,another}_dir/*', 'TSV')
-```
-
-!!! warning "Advertencia"
-    Si la lista de archivos contiene rangos de números con ceros a la izquierda, use la construcción con llaves para cada dígito por separado o use `?`.
-
-**Ejemplo**
-
-Crear tabla con archivos llamados `file000`, `file001`, … , `file999`:
-
-``` sql
-CREARE TABLE big_table (name String, value UInt32) ENGINE = HDFS('hdfs://hdfs1:9000/big_dir/file{0..9}{0..9}{0..9}', 'CSV')
-```
-
-## Virtual Columnas {#virtual-columns}
-
--   `_path` — Path to the file.
--   `_file` — Name of the file.
-
-**Ver también**
-
--   [Virtual columnas](../index.md#table_engines-virtual_columns)
-
-[Artículo Original](https://clickhouse.tech/docs/en/operations/table_engines/hdfs/) <!--hide-->
diff --git a/docs/es/engines/table-engines/integrations/index.md b/docs/es/engines/table-engines/integrations/index.md
deleted file mode 100644
index e57aaf88744..00000000000
--- a/docs/es/engines/table-engines/integrations/index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: "Integraci\xF3n"
-toc_priority: 30
----
-
-
diff --git a/docs/es/engines/table-engines/integrations/jdbc.md b/docs/es/engines/table-engines/integrations/jdbc.md
deleted file mode 100644
index fd3450cef7c..00000000000
--- a/docs/es/engines/table-engines/integrations/jdbc.md
+++ /dev/null
@@ -1,90 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 34
-toc_title: JDBC
----
-
-# JDBC {#table-engine-jdbc}
-
-Permite que ClickHouse se conecte a bases de datos externas a través de [JDBC](https://en.wikipedia.org/wiki/Java_Database_Connectivity).
-
-Para implementar la conexión JDBC, ClickHouse utiliza el programa independiente [Sistema abierto.](https://github.com/alex-krash/clickhouse-jdbc-bridge) que debería ejecutarse como un demonio.
-
-Este motor soporta el [NULL](../../../sql-reference/data-types/nullable.md) tipo de datos.
-
-## Creación de una tabla {#creating-a-table}
-
-``` sql
-CREATE TABLE [IF NOT EXISTS] [db.]table_name
-(
-    columns list...
-)
-ENGINE = JDBC(dbms_uri, external_database, external_table)
-```
-
-**Parámetros del motor**
-
--   `dbms_uri` — URI of an external DBMS.
-
-    Formato: `jdbc:<driver_name>://<host_name>:<port>/?user=<username>&password=<password>`.
-    Ejemplo para MySQL: `jdbc:mysql://localhost:3306/?user=root&password=root`.
-
--   `external_database` — Database in an external DBMS.
-
--   `external_table` — Name of the table in `external_database`.
-
-## Ejemplo de uso {#usage-example}
-
-Crear una tabla en el servidor MySQL conectándose directamente con su cliente de consola:
-
-``` text
-mysql> CREATE TABLE `test`.`test` (
-    ->   `int_id` INT NOT NULL AUTO_INCREMENT,
-    ->   `int_nullable` INT NULL DEFAULT NULL,
-    ->   `float` FLOAT NOT NULL,
-    ->   `float_nullable` FLOAT NULL DEFAULT NULL,
-    ->   PRIMARY KEY (`int_id`));
-Query OK, 0 rows affected (0,09 sec)
-
-mysql> insert into test (`int_id`, `float`) VALUES (1,2);
-Query OK, 1 row affected (0,00 sec)
-
-mysql> select * from test;
-+------+----------+-----+----------+
-| int_id | int_nullable | float | float_nullable |
-+------+----------+-----+----------+
-|      1 |         NULL |     2 |           NULL |
-+------+----------+-----+----------+
-1 row in set (0,00 sec)
-```
-
-Creación de una tabla en el servidor ClickHouse y selección de datos de ella:
-
-``` sql
-CREATE TABLE jdbc_table
-(
-    `int_id` Int32,
-    `int_nullable` Nullable(Int32),
-    `float` Float32,
-    `float_nullable` Nullable(Float32)
-)
-ENGINE JDBC('jdbc:mysql://localhost:3306/?user=root&password=root', 'test', 'test')
-```
-
-``` sql
-SELECT *
-FROM jdbc_table
-```
-
-``` text
-┌─int_id─┬─int_nullable─┬─float─┬─float_nullable─┐
-│      1 │         ᴺᵁᴸᴸ │     2 │           ᴺᵁᴸᴸ │
-└────────┴──────────────┴───────┴────────────────┘
-```
-
-## Ver también {#see-also}
-
--   [Función de la tabla de JDBC](../../../sql-reference/table-functions/jdbc.md).
-
-[Artículo Original](https://clickhouse.tech/docs/en/operations/table_engines/jdbc/) <!--hide-->
diff --git a/docs/es/engines/table-engines/integrations/kafka.md b/docs/es/engines/table-engines/integrations/kafka.md
deleted file mode 100644
index 54250aae82a..00000000000
--- a/docs/es/engines/table-engines/integrations/kafka.md
+++ /dev/null
@@ -1,180 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 32
-toc_title: Kafka
----
-
-# Kafka {#kafka}
-
-Este motor funciona con [Acerca de nosotros](http://kafka.apache.org/).
-
-Kafka te permite:
-
--   Publicar o suscribirse a flujos de datos.
--   Organice el almacenamiento tolerante a fallos.
--   Secuencias de proceso a medida que estén disponibles.
-
-## Creación de una tabla {#table_engine-kafka-creating-a-table}
-
-``` sql
-CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
-(
-    name1 [type1] [DEFAULT|MATERIALIZED|ALIAS expr1],
-    name2 [type2] [DEFAULT|MATERIALIZED|ALIAS expr2],
-    ...
-) ENGINE = Kafka()
-SETTINGS
-    kafka_broker_list = 'host:port',
-    kafka_topic_list = 'topic1,topic2,...',
-    kafka_group_name = 'group_name',
-    kafka_format = 'data_format'[,]
-    [kafka_row_delimiter = 'delimiter_symbol',]
-    [kafka_schema = '',]
-    [kafka_num_consumers = N,]
-    [kafka_max_block_size = 0,]
-    [kafka_skip_broken_messages = N,]
-    [kafka_commit_every_batch = 0]
-```
-
-Parámetros requeridos:
-
--   `kafka_broker_list` – A comma-separated list of brokers (for example, `localhost:9092`).
--   `kafka_topic_list` – A list of Kafka topics.
--   `kafka_group_name` – A group of Kafka consumers. Reading margins are tracked for each group separately. If you don't want messages to be duplicated in the cluster, use the same group name everywhere.
--   `kafka_format` – Message format. Uses the same notation as the SQL `FORMAT` función, tal como `JSONEachRow`. Para obtener más información, consulte [Formato](../../../interfaces/formats.md) apartado.
-
-Parámetros opcionales:
-
--   `kafka_row_delimiter` – Delimiter character, which ends the message.
--   `kafka_schema` – Parameter that must be used if the format requires a schema definition. For example, [Cap'n Proto](https://capnproto.org/) requiere la ruta de acceso al archivo de esquema y el nombre de la raíz `schema.capnp:Message` objeto.
--   `kafka_num_consumers` – The number of consumers per table. Default: `1`. Especifique más consumidores si el rendimiento de un consumidor es insuficiente. El número total de consumidores no debe exceder el número de particiones en el tema, ya que solo se puede asignar un consumidor por partición.
--   `kafka_max_block_size` - El tamaño máximo de lote (en mensajes) para la encuesta (predeterminado: `max_block_size`).
--   `kafka_skip_broken_messages` – Kafka message parser tolerance to schema-incompatible messages per block. Default: `0`. Si `kafka_skip_broken_messages = N` entonces el motor salta *N* Mensajes de Kafka que no se pueden analizar (un mensaje es igual a una fila de datos).
--   `kafka_commit_every_batch` - Confirmar cada lote consumido y manejado en lugar de una única confirmación después de escribir un bloque completo (predeterminado: `0`).
-
-Ejemplos:
-
-``` sql
-  CREATE TABLE queue (
-    timestamp UInt64,
-    level String,
-    message String
-  ) ENGINE = Kafka('localhost:9092', 'topic', 'group1', 'JSONEachRow');
-
-  SELECT * FROM queue LIMIT 5;
-
-  CREATE TABLE queue2 (
-    timestamp UInt64,
-    level String,
-    message String
-  ) ENGINE = Kafka SETTINGS kafka_broker_list = 'localhost:9092',
-                            kafka_topic_list = 'topic',
-                            kafka_group_name = 'group1',
-                            kafka_format = 'JSONEachRow',
-                            kafka_num_consumers = 4;
-
-  CREATE TABLE queue2 (
-    timestamp UInt64,
-    level String,
-    message String
-  ) ENGINE = Kafka('localhost:9092', 'topic', 'group1')
-              SETTINGS kafka_format = 'JSONEachRow',
-                       kafka_num_consumers = 4;
-```
-
-<details markdown="1">
-
-<summary>Método obsoleto para crear una tabla</summary>
-
-!!! attention "Atención"
-    No utilice este método en nuevos proyectos. Si es posible, cambie los proyectos antiguos al método descrito anteriormente.
-
-``` sql
-Kafka(kafka_broker_list, kafka_topic_list, kafka_group_name, kafka_format
-      [, kafka_row_delimiter, kafka_schema, kafka_num_consumers, kafka_skip_broken_messages])
-```
-
-</details>
-
-## Descripci {#description}
-
-Los mensajes entregados se realizan un seguimiento automático, por lo que cada mensaje de un grupo solo se cuenta una vez. Si desea obtener los datos dos veces, cree una copia de la tabla con otro nombre de grupo.
-
-Los grupos son flexibles y se sincronizan en el clúster. Por ejemplo, si tiene 10 temas y 5 copias de una tabla en un clúster, cada copia obtiene 2 temas. Si el número de copias cambia, los temas se redistribuyen automáticamente entre las copias. Lea más sobre esto en http://kafka.apache.org/intro .
-
-`SELECT` no es particularmente útil para leer mensajes (excepto para la depuración), ya que cada mensaje se puede leer solo una vez. Es más práctico crear subprocesos en tiempo real utilizando vistas materializadas. Para hacer esto:
-
-1.  Use el motor para crear un consumidor de Kafka y considérelo como un flujo de datos.
-2.  Crea una tabla con la estructura deseada.
-3.  Cree una vista materializada que convierta los datos del motor y los coloque en una tabla creada previamente.
-
-Cuando el `MATERIALIZED VIEW` se une al motor, comienza a recopilar datos en segundo plano. Esto le permite recibir continuamente mensajes de Kafka y convertirlos al formato requerido usando `SELECT`.
-Una tabla kafka puede tener tantas vistas materializadas como desee, no leen datos de la tabla kafka directamente, sino que reciben nuevos registros (en bloques), de esta manera puede escribir en varias tablas con diferentes niveles de detalle (con agrupación - agregación y sin).
-
-Ejemplo:
-
-``` sql
-  CREATE TABLE queue (
-    timestamp UInt64,
-    level String,
-    message String
-  ) ENGINE = Kafka('localhost:9092', 'topic', 'group1', 'JSONEachRow');
-
-  CREATE TABLE daily (
-    day Date,
-    level String,
-    total UInt64
-  ) ENGINE = SummingMergeTree(day, (day, level), 8192);
-
-  CREATE MATERIALIZED VIEW consumer TO daily
-    AS SELECT toDate(toDateTime(timestamp)) AS day, level, count() as total
-    FROM queue GROUP BY day, level;
-
-  SELECT level, sum(total) FROM daily GROUP BY level;
-```
-
-Para mejorar el rendimiento, los mensajes recibidos se agrupan en bloques del tamaño de [Max_insert_block_size](../../../operations/server-configuration-parameters/settings.md#settings-max_insert_block_size). Si el bloque no se formó dentro de [Nombre de la red inalámbrica (SSID):](../../../operations/server-configuration-parameters/settings.md) milisegundos, los datos se vaciarán a la tabla independientemente de la integridad del bloque.
-
-Para detener la recepción de datos de tema o cambiar la lógica de conversión, desconecte la vista materializada:
-
-``` sql
-  DETACH TABLE consumer;
-  ATTACH TABLE consumer;
-```
-
-Si desea cambiar la tabla de destino utilizando `ALTER`, recomendamos deshabilitar la vista de material para evitar discrepancias entre la tabla de destino y los datos de la vista.
-
-## Configuración {#configuration}
-
-Similar a GraphiteMergeTree, el motor Kafka admite una configuración extendida utilizando el archivo de configuración ClickHouse. Hay dos claves de configuración que puede usar: global (`kafka`) y a nivel de tema (`kafka_*`). La configuración global se aplica primero y, a continuación, se aplica la configuración de nivel de tema (si existe).
-
-``` xml
-  <!-- Global configuration options for all tables of Kafka engine type -->
-  <kafka>
-    <debug>cgrp</debug>
-    <auto_offset_reset>smallest</auto_offset_reset>
-  </kafka>
-
-  <!-- Configuration specific for topic "logs" -->
-  <kafka_logs>
-    <retry_backoff_ms>250</retry_backoff_ms>
-    <fetch_min_bytes>100000</fetch_min_bytes>
-  </kafka_logs>
-```
-
-Para obtener una lista de posibles opciones de configuración, consulte [referencia de configuración librdkafka](https://github.com/edenhill/librdkafka/blob/master/CONFIGURATION.md). Usa el guión bajo (`_`) en lugar de un punto en la configuración de ClickHouse. Por ejemplo, `check.crcs=true` será `<check_crcs>true</check_crcs>`.
-
-## Virtual Columnas {#virtual-columns}
-
--   `_topic` — Kafka topic.
--   `_key` — Key of the message.
--   `_offset` — Offset of the message.
--   `_timestamp` — Timestamp of the message.
--   `_partition` — Partition of Kafka topic.
-
-**Ver también**
-
--   [Virtual columnas](../index.md#table_engines-virtual_columns)
-
-[Artículo Original](https://clickhouse.tech/docs/en/operations/table_engines/kafka/) <!--hide-->
diff --git a/docs/es/engines/table-engines/integrations/mysql.md b/docs/es/engines/table-engines/integrations/mysql.md
deleted file mode 100644
index 52799117255..00000000000
--- a/docs/es/engines/table-engines/integrations/mysql.md
+++ /dev/null
@@ -1,105 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 33
-toc_title: MySQL
----
-
-# Mysql {#mysql}
-
-El motor MySQL le permite realizar `SELECT` consultas sobre datos almacenados en un servidor MySQL remoto.
-
-## Creación de una tabla {#creating-a-table}
-
-``` sql
-CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
-(
-    name1 [type1] [DEFAULT|MATERIALIZED|ALIAS expr1] [TTL expr1],
-    name2 [type2] [DEFAULT|MATERIALIZED|ALIAS expr2] [TTL expr2],
-    ...
-) ENGINE = MySQL('host:port', 'database', 'table', 'user', 'password'[, replace_query, 'on_duplicate_clause']);
-```
-
-Vea una descripción detallada del [CREATE TABLE](../../../sql-reference/statements/create.md#create-table-query) consulta.
-
-La estructura de la tabla puede diferir de la estructura de la tabla MySQL original:
-
--   Los nombres de columna deben ser los mismos que en la tabla MySQL original, pero puede usar solo algunas de estas columnas y en cualquier orden.
--   Los tipos de columna pueden diferir de los de la tabla MySQL original. ClickHouse intenta [elenco](../../../sql-reference/functions/type-conversion-functions.md#type_conversion_function-cast) valores a los tipos de datos ClickHouse.
-
-**Parámetros del motor**
-
--   `host:port` — MySQL server address.
-
--   `database` — Remote database name.
-
--   `table` — Remote table name.
-
--   `user` — MySQL user.
-
--   `password` — User password.
-
--   `replace_query` — Flag that converts `INSERT INTO` consultas a `REPLACE INTO`. Si `replace_query=1`, la consulta se sustituye.
-
--   `on_duplicate_clause` — The `ON DUPLICATE KEY on_duplicate_clause` expresión que se añade a la `INSERT` consulta.
-
-    Ejemplo: `INSERT INTO t (c1,c2) VALUES ('a', 2) ON DUPLICATE KEY UPDATE c2 = c2 + 1`, donde `on_duplicate_clause` ser `UPDATE c2 = c2 + 1`. Ver el [Documentación de MySQL](https://dev.mysql.com/doc/refman/8.0/en/insert-on-duplicate.html) para encontrar qué `on_duplicate_clause` se puede utilizar con el `ON DUPLICATE KEY` clausula.
-
-    Especificar `on_duplicate_clause` tienes que pasar `0` a la `replace_query` parámetro. Si pasa simultáneamente `replace_query = 1` y `on_duplicate_clause`, ClickHouse genera una excepción.
-
-Simple `WHERE` cláusulas tales como `=, !=, >, >=, <, <=` se ejecutan en el servidor MySQL.
-
-El resto de las condiciones y el `LIMIT` La restricción de muestreo se ejecuta en ClickHouse solo después de que finalice la consulta a MySQL.
-
-## Ejemplo de uso {#usage-example}
-
-Tabla en MySQL:
-
-``` text
-mysql> CREATE TABLE `test`.`test` (
-    ->   `int_id` INT NOT NULL AUTO_INCREMENT,
-    ->   `int_nullable` INT NULL DEFAULT NULL,
-    ->   `float` FLOAT NOT NULL,
-    ->   `float_nullable` FLOAT NULL DEFAULT NULL,
-    ->   PRIMARY KEY (`int_id`));
-Query OK, 0 rows affected (0,09 sec)
-
-mysql> insert into test (`int_id`, `float`) VALUES (1,2);
-Query OK, 1 row affected (0,00 sec)
-
-mysql> select * from test;
-+------+----------+-----+----------+
-| int_id | int_nullable | float | float_nullable |
-+------+----------+-----+----------+
-|      1 |         NULL |     2 |           NULL |
-+------+----------+-----+----------+
-1 row in set (0,00 sec)
-```
-
-Tabla en ClickHouse, recuperando datos de la tabla MySQL creada anteriormente:
-
-``` sql
-CREATE TABLE mysql_table
-(
-    `float_nullable` Nullable(Float32),
-    `int_id` Int32
-)
-ENGINE = MySQL('localhost:3306', 'test', 'test', 'bayonet', '123')
-```
-
-``` sql
-SELECT * FROM mysql_table
-```
-
-``` text
-┌─float_nullable─┬─int_id─┐
-│           ᴺᵁᴸᴸ │      1 │
-└────────────────┴────────┘
-```
-
-## Ver también {#see-also}
-
--   [El ‘mysql’ función de la tabla](../../../sql-reference/table-functions/mysql.md)
--   [Uso de MySQL como fuente de diccionario externo](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md#dicts-external_dicts_dict_sources-mysql)
-
-[Artículo Original](https://clickhouse.tech/docs/en/operations/table_engines/mysql/) <!--hide-->
diff --git a/docs/es/engines/table-engines/integrations/odbc.md b/docs/es/engines/table-engines/integrations/odbc.md
deleted file mode 100644
index 75c79484d61..00000000000
--- a/docs/es/engines/table-engines/integrations/odbc.md
+++ /dev/null
@@ -1,132 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 35
-toc_title: ODBC
----
-
-# ODBC {#table-engine-odbc}
-
-Permite que ClickHouse se conecte a bases de datos externas a través de [ODBC](https://en.wikipedia.org/wiki/Open_Database_Connectivity).
-
-Para implementar con seguridad conexiones ODBC, ClickHouse usa un programa separado `clickhouse-odbc-bridge`. Si el controlador ODBC se carga directamente desde `clickhouse-server`, problemas de controlador pueden bloquear el servidor ClickHouse. ClickHouse se inicia automáticamente `clickhouse-odbc-bridge` cuando se requiere. El programa de puente ODBC se instala desde el mismo paquete que el `clickhouse-server`.
-
-Este motor soporta el [NULL](../../../sql-reference/data-types/nullable.md) tipo de datos.
-
-## Creación de una tabla {#creating-a-table}
-
-``` sql
-CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
-(
-    name1 [type1],
-    name2 [type2],
-    ...
-)
-ENGINE = ODBC(connection_settings, external_database, external_table)
-```
-
-Vea una descripción detallada del [CREATE TABLE](../../../sql-reference/statements/create.md#create-table-query) consulta.
-
-La estructura de la tabla puede diferir de la estructura de la tabla de origen:
-
--   Los nombres de columna deben ser los mismos que en la tabla de origen, pero puede usar solo algunas de estas columnas y en cualquier orden.
--   Los tipos de columna pueden diferir de los de la tabla de origen. ClickHouse intenta [elenco](../../../sql-reference/functions/type-conversion-functions.md#type_conversion_function-cast) valores a los tipos de datos ClickHouse.
-
-**Parámetros del motor**
-
--   `connection_settings` — Name of the section with connection settings in the `odbc.ini` file.
--   `external_database` — Name of a database in an external DBMS.
--   `external_table` — Name of a table in the `external_database`.
-
-## Ejemplo de uso {#usage-example}
-
-**Recuperación de datos de la instalación local de MySQL a través de ODBC**
-
-Este ejemplo se comprueba para Ubuntu Linux 18.04 y el servidor MySQL 5.7.
-
-Asegúrese de que unixODBC y MySQL Connector están instalados.
-
-De forma predeterminada (si se instala desde paquetes), ClickHouse comienza como usuario `clickhouse`. Por lo tanto, debe crear y configurar este usuario en el servidor MySQL.
-
-``` bash
-$ sudo mysql
-```
-
-``` sql
-mysql> CREATE USER 'clickhouse'@'localhost' IDENTIFIED BY 'clickhouse';
-mysql> GRANT ALL PRIVILEGES ON *.* TO 'clickhouse'@'clickhouse' WITH GRANT OPTION;
-```
-
-A continuación, configure la conexión en `/etc/odbc.ini`.
-
-``` bash
-$ cat /etc/odbc.ini
-[mysqlconn]
-DRIVER = /usr/local/lib/libmyodbc5w.so
-SERVER = 127.0.0.1
-PORT = 3306
-DATABASE = test
-USERNAME = clickhouse
-PASSWORD = clickhouse
-```
-
-Puede verificar la conexión usando el `isql` utilidad desde la instalación de unixODBC.
-
-``` bash
-$ isql -v mysqlconn
-+-------------------------+
-| Connected!                            |
-|                                       |
-...
-```
-
-Tabla en MySQL:
-
-``` text
-mysql> CREATE TABLE `test`.`test` (
-    ->   `int_id` INT NOT NULL AUTO_INCREMENT,
-    ->   `int_nullable` INT NULL DEFAULT NULL,
-    ->   `float` FLOAT NOT NULL,
-    ->   `float_nullable` FLOAT NULL DEFAULT NULL,
-    ->   PRIMARY KEY (`int_id`));
-Query OK, 0 rows affected (0,09 sec)
-
-mysql> insert into test (`int_id`, `float`) VALUES (1,2);
-Query OK, 1 row affected (0,00 sec)
-
-mysql> select * from test;
-+------+----------+-----+----------+
-| int_id | int_nullable | float | float_nullable |
-+------+----------+-----+----------+
-|      1 |         NULL |     2 |           NULL |
-+------+----------+-----+----------+
-1 row in set (0,00 sec)
-```
-
-Tabla en ClickHouse, recuperando datos de la tabla MySQL:
-
-``` sql
-CREATE TABLE odbc_t
-(
-    `int_id` Int32,
-    `float_nullable` Nullable(Float32)
-)
-ENGINE = ODBC('DSN=mysqlconn', 'test', 'test')
-```
-
-``` sql
-SELECT * FROM odbc_t
-```
-
-``` text
-┌─int_id─┬─float_nullable─┐
-│      1 │           ᴺᵁᴸᴸ │
-└────────┴────────────────┘
-```
-
-## Ver también {#see-also}
-
--   [Diccionarios externos ODBC](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md#dicts-external_dicts_dict_sources-odbc)
--   [Tabla ODBC función](../../../sql-reference/table-functions/odbc.md)
-
-[Artículo Original](https://clickhouse.tech/docs/en/operations/table_engines/odbc/) <!--hide-->
diff --git a/docs/es/engines/table-engines/log-family/index.md b/docs/es/engines/table-engines/log-family/index.md
deleted file mode 100644
index a7a3016f967..00000000000
--- a/docs/es/engines/table-engines/log-family/index.md
+++ /dev/null
@@ -1,47 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: Familia de registro
-toc_priority: 29
-toc_title: "Implantaci\xF3n"
----
-
-# Familia del motor de registro {#log-engine-family}
-
-Estos motores fueron desarrollados para escenarios en los que necesita escribir rápidamente muchas tablas pequeñas (hasta aproximadamente 1 millón de filas) y leerlas más tarde en su conjunto.
-
-Motores de la familia:
-
--   [StripeLog](stripelog.md)
--   [Registro](log.md)
--   [TinyLog](tinylog.md)
-
-## Propiedades comunes {#common-properties}
-
-Motor:
-
--   Almacenar datos en un disco.
-
--   Agregue datos al final del archivo al escribir.
-
--   Bloqueos de soporte para el acceso a datos simultáneos.
-
-    Durante `INSERT` consultas, la tabla está bloqueada y otras consultas para leer y escribir datos esperan a que la tabla se desbloquee. Si no hay consultas de escritura de datos, se puede realizar cualquier número de consultas de lectura de datos simultáneamente.
-
--   No apoyo [mutación](../../../sql-reference/statements/alter.md#alter-mutations) operación.
-
--   No admite índices.
-
-    Esto significa que `SELECT` las consultas para rangos de datos no son eficientes.
-
--   No escriba datos atómicamente.
-
-    Puede obtener una tabla con datos dañados si algo rompe la operación de escritura, por ejemplo, un cierre anormal del servidor.
-
-## Diferencia {#differences}
-
-El `TinyLog` es el más simple de la familia y proporciona la funcionalidad más pobre y la eficiencia más baja. El `TinyLog` el motor no admite la lectura de datos paralelos por varios hilos. Lee datos más lentamente que otros motores de la familia que admiten lectura paralela y utiliza casi tantos descriptores como los `Log` motor porque almacena cada columna en un archivo separado. Úselo en escenarios simples de baja carga.
-
-El `Log` y `StripeLog` Los motores admiten lectura de datos paralela. Al leer datos, ClickHouse usa múltiples hilos. Cada subproceso procesa un bloque de datos separado. El `Log` utiliza un archivo separado para cada columna de la tabla. `StripeLog` almacena todos los datos en un archivo. Como resultado, el `StripeLog` el motor utiliza menos descriptores en el sistema operativo, pero el `Log` proporciona una mayor eficiencia al leer datos.
-
-[Artículo Original](https://clickhouse.tech/docs/en/operations/table_engines/log_family/) <!--hide-->
diff --git a/docs/es/engines/table-engines/log-family/log.md b/docs/es/engines/table-engines/log-family/log.md
deleted file mode 100644
index 1db374390e4..00000000000
--- a/docs/es/engines/table-engines/log-family/log.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 33
-toc_title: Registro
----
-
-# Registro {#log}
-
-El motor pertenece a la familia de motores de registro. Consulte las propiedades comunes de los motores de registro y sus diferencias en [Familia del motor de registro](index.md) artículo.
-
-El registro difiere de [TinyLog](tinylog.md) en que un pequeño archivo de “marks” reside con los archivos de columna. Estas marcas se escriben en cada bloque de datos y contienen compensaciones que indican dónde comenzar a leer el archivo para omitir el número especificado de filas. Esto hace posible leer datos de tabla en múltiples hilos.
-Para el acceso a datos simultáneos, las operaciones de lectura se pueden realizar simultáneamente, mientras que las operaciones de escritura bloquean las lecturas entre sí.
-El motor de registro no admite índices. Del mismo modo, si la escritura en una tabla falla, la tabla se rompe y la lectura de ella devuelve un error. El motor de registro es adecuado para datos temporales, tablas de escritura única y para fines de prueba o demostración.
-
-[Artículo Original](https://clickhouse.tech/docs/en/operations/table_engines/log/) <!--hide-->
diff --git a/docs/es/engines/table-engines/log-family/stripelog.md b/docs/es/engines/table-engines/log-family/stripelog.md
deleted file mode 100644
index 0965e9a987c..00000000000
--- a/docs/es/engines/table-engines/log-family/stripelog.md
+++ /dev/null
@@ -1,95 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 32
-toc_title: StripeLog
----
-
-# Lista de Stripelog {#stripelog}
-
-Este motor pertenece a la familia de motores de registro. Consulte las propiedades comunes de los motores de registro y sus diferencias en [Familia del motor de registro](index.md) artículo.
-
-Utilice este motor en escenarios en los que necesite escribir muchas tablas con una pequeña cantidad de datos (menos de 1 millón de filas).
-
-## Creación de una tabla {#table_engines-stripelog-creating-a-table}
-
-``` sql
-CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
-(
-    column1_name [type1] [DEFAULT|MATERIALIZED|ALIAS expr1],
-    column2_name [type2] [DEFAULT|MATERIALIZED|ALIAS expr2],
-    ...
-) ENGINE = StripeLog
-```
-
-Vea la descripción detallada del [CREATE TABLE](../../../sql-reference/statements/create.md#create-table-query) consulta.
-
-## Escribir los datos {#table_engines-stripelog-writing-the-data}
-
-El `StripeLog` el motor almacena todas las columnas en un archivo. Para cada `INSERT` consulta, ClickHouse agrega el bloque de datos al final de un archivo de tabla, escribiendo columnas una por una.
-
-Para cada tabla, ClickHouse escribe los archivos:
-
--   `data.bin` — Data file.
--   `index.mrk` — File with marks. Marks contain offsets for each column of each data block inserted.
-
-El `StripeLog` el motor no soporta el `ALTER UPDATE` y `ALTER DELETE` operación.
-
-## Lectura de los datos {#table_engines-stripelog-reading-the-data}
-
-El archivo con marcas permite ClickHouse paralelizar la lectura de datos. Esto significa que un `SELECT` query devuelve filas en un orden impredecible. Utilice el `ORDER BY` cláusula para ordenar filas.
-
-## Ejemplo de uso {#table_engines-stripelog-example-of-use}
-
-Creación de una tabla:
-
-``` sql
-CREATE TABLE stripe_log_table
-(
-    timestamp DateTime,
-    message_type String,
-    message String
-)
-ENGINE = StripeLog
-```
-
-Insertar datos:
-
-``` sql
-INSERT INTO stripe_log_table VALUES (now(),'REGULAR','The first regular message')
-INSERT INTO stripe_log_table VALUES (now(),'REGULAR','The second regular message'),(now(),'WARNING','The first warning message')
-```
-
-Se utilizaron dos `INSERT` consultas para crear dos bloques de datos dentro del `data.bin` file.
-
-ClickHouse usa múltiples subprocesos al seleccionar datos. Cada subproceso lee un bloque de datos separado y devuelve las filas resultantes de forma independiente a medida que termina. Como resultado, el orden de los bloques de filas en la salida no coincide con el orden de los mismos bloques en la entrada en la mayoría de los casos. Por ejemplo:
-
-``` sql
-SELECT * FROM stripe_log_table
-```
-
-``` text
-┌───────────timestamp─┬─message_type─┬─message────────────────────┐
-│ 2019-01-18 14:27:32 │ REGULAR      │ The second regular message │
-│ 2019-01-18 14:34:53 │ WARNING      │ The first warning message  │
-└─────────────────────┴──────────────┴────────────────────────────┘
-┌───────────timestamp─┬─message_type─┬─message───────────────────┐
-│ 2019-01-18 14:23:43 │ REGULAR      │ The first regular message │
-└─────────────────────┴──────────────┴───────────────────────────┘
-```
-
-Ordenación de los resultados (orden ascendente por defecto):
-
-``` sql
-SELECT * FROM stripe_log_table ORDER BY timestamp
-```
-
-``` text
-┌───────────timestamp─┬─message_type─┬─message────────────────────┐
-│ 2019-01-18 14:23:43 │ REGULAR      │ The first regular message  │
-│ 2019-01-18 14:27:32 │ REGULAR      │ The second regular message │
-│ 2019-01-18 14:34:53 │ WARNING      │ The first warning message  │
-└─────────────────────┴──────────────┴────────────────────────────┘
-```
-
-[Artículo Original](https://clickhouse.tech/docs/en/operations/table_engines/stripelog/) <!--hide-->
diff --git a/docs/es/engines/table-engines/log-family/tinylog.md b/docs/es/engines/table-engines/log-family/tinylog.md
deleted file mode 100644
index a2cbf7257b6..00000000000
--- a/docs/es/engines/table-engines/log-family/tinylog.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 34
-toc_title: TinyLog
----
-
-# TinyLog {#tinylog}
-
-El motor pertenece a la familia de motores de registro. Ver [Familia del motor de registro](index.md) para las propiedades comunes de los motores de registro y sus diferencias.
-
-Este motor de tablas se usa normalmente con el método write-once: escribir datos una vez, luego leerlos tantas veces como sea necesario. Por ejemplo, puede usar `TinyLog`-type tablas para datos intermedios que se procesan en pequeños lotes. Tenga en cuenta que el almacenamiento de datos en un gran número de tablas pequeñas es ineficiente.
-
-Las consultas se ejecutan en una sola secuencia. En otras palabras, este motor está diseñado para tablas relativamente pequeñas (hasta aproximadamente 1,000,000 filas). Tiene sentido usar este motor de tablas si tiene muchas tablas pequeñas, ya que es más simple que el [Registro](log.md) motor (menos archivos necesitan ser abiertos).
-
-[Artículo Original](https://clickhouse.tech/docs/en/operations/table_engines/tinylog/) <!--hide-->
diff --git a/docs/es/engines/table-engines/mergetree-family/aggregatingmergetree.md b/docs/es/engines/table-engines/mergetree-family/aggregatingmergetree.md
deleted file mode 100644
index 2aedfbd2317..00000000000
--- a/docs/es/engines/table-engines/mergetree-family/aggregatingmergetree.md
+++ /dev/null
@@ -1,105 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 35
-toc_title: "Agregaci\xF3nMergeTree"
----
-
-# Aggregatingmergetree {#aggregatingmergetree}
-
-El motor hereda de [Método de codificación de datos:](mergetree.md#table_engines-mergetree), alterando la lógica para la fusión de partes de datos. ClickHouse reemplaza todas las filas con la misma clave principal (o más exactamente, con la misma [clave de clasificación](mergetree.md)) con una sola fila (dentro de una parte de datos) que almacena una combinación de estados de funciones agregadas.
-
-Usted puede utilizar `AggregatingMergeTree` tablas para la agregación de datos incrementales, incluidas las vistas materializadas agregadas.
-
-El motor procesa todas las columnas con los siguientes tipos:
-
--   [AggregateFunction](../../../sql-reference/data-types/aggregatefunction.md)
--   [SimpleAggregateFunction](../../../sql-reference/data-types/simpleaggregatefunction.md)
-
-Es apropiado usar `AggregatingMergeTree` si reduce el número de filas por pedidos.
-
-## Creación de una tabla {#creating-a-table}
-
-``` sql
-CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
-(
-    name1 [type1] [DEFAULT|MATERIALIZED|ALIAS expr1],
-    name2 [type2] [DEFAULT|MATERIALIZED|ALIAS expr2],
-    ...
-) ENGINE = AggregatingMergeTree()
-[PARTITION BY expr]
-[ORDER BY expr]
-[SAMPLE BY expr]
-[TTL expr]
-[SETTINGS name=value, ...]
-```
-
-Para obtener una descripción de los parámetros de solicitud, consulte [descripción de la solicitud](../../../sql-reference/statements/create.md).
-
-**Cláusulas de consulta**
-
-Al crear un `AggregatingMergeTree` mesa de la misma [clausula](mergetree.md) se requieren, como al crear un `MergeTree` tabla.
-
-<details markdown="1">
-
-<summary>Método obsoleto para crear una tabla</summary>
-
-!!! attention "Atención"
-    No use este método en proyectos nuevos y, si es posible, cambie los proyectos antiguos al método descrito anteriormente.
-
-``` sql
-CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
-(
-    name1 [type1] [DEFAULT|MATERIALIZED|ALIAS expr1],
-    name2 [type2] [DEFAULT|MATERIALIZED|ALIAS expr2],
-    ...
-) ENGINE [=] AggregatingMergeTree(date-column [, sampling_expression], (primary, key), index_granularity)
-```
-
-Todos los parámetros tienen el mismo significado que en `MergeTree`.
-</details>
-
-## SELECCIONAR e INSERTAR {#select-and-insert}
-
-Para insertar datos, utilice [INSERT SELECT](../../../sql-reference/statements/insert-into.md) consulta con funciones agregadas -State-.
-Al seleccionar datos de `AggregatingMergeTree` mesa, uso `GROUP BY` cláusula y las mismas funciones agregadas que al insertar datos, pero usando `-Merge` sufijo.
-
-En los resultados de `SELECT` consulta, los valores de `AggregateFunction` tipo tiene representación binaria específica de la implementación para todos los formatos de salida de ClickHouse. Si volcar datos en, por ejemplo, `TabSeparated` formato con `SELECT` consulta entonces este volcado se puede cargar de nuevo usando `INSERT` consulta.
-
-## Ejemplo de una vista materializada agregada {#example-of-an-aggregated-materialized-view}
-
-`AggregatingMergeTree` vista materializada que mira el `test.visits` tabla:
-
-``` sql
-CREATE MATERIALIZED VIEW test.basic
-ENGINE = AggregatingMergeTree() PARTITION BY toYYYYMM(StartDate) ORDER BY (CounterID, StartDate)
-AS SELECT
-    CounterID,
-    StartDate,
-    sumState(Sign)    AS Visits,
-    uniqState(UserID) AS Users
-FROM test.visits
-GROUP BY CounterID, StartDate;
-```
-
-Insertar datos en el `test.visits` tabla.
-
-``` sql
-INSERT INTO test.visits ...
-```
-
-Los datos se insertan tanto en la tabla como en la vista `test.basic` que realizará la agregación.
-
-Para obtener los datos agregados, necesitamos ejecutar una consulta como `SELECT ... GROUP BY ...` de la vista `test.basic`:
-
-``` sql
-SELECT
-    StartDate,
-    sumMerge(Visits) AS Visits,
-    uniqMerge(Users) AS Users
-FROM test.basic
-GROUP BY StartDate
-ORDER BY StartDate;
-```
-
-[Artículo Original](https://clickhouse.tech/docs/en/operations/table_engines/aggregatingmergetree/) <!--hide-->
diff --git a/docs/es/engines/table-engines/mergetree-family/collapsingmergetree.md b/docs/es/engines/table-engines/mergetree-family/collapsingmergetree.md
deleted file mode 100644
index 027d5c2adf7..00000000000
--- a/docs/es/engines/table-engines/mergetree-family/collapsingmergetree.md
+++ /dev/null
@@ -1,306 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 36
-toc_title: ColapsarMergeTree
----
-
-# ColapsarMergeTree {#table_engine-collapsingmergetree}
-
-El motor hereda de [Método de codificación de datos:](mergetree.md) y agrega la lógica de las filas que colapsan al algoritmo de fusión de partes de datos.
-
-`CollapsingMergeTree` elimina de forma asincrónica (colapsa) pares de filas si todos los campos de una clave de ordenación (`ORDER BY`) son equivalentes excepto el campo particular `Sign` que puede tener `1` y `-1` valor. Las filas sin un par se mantienen. Para más detalles, consulte el [Derrumbar](#table_engine-collapsingmergetree-collapsing) sección del documento.
-
-El motor puede reducir significativamente el volumen de almacenamiento y aumentar la eficiencia de `SELECT` consulta como consecuencia.
-
-## Creación de una tabla {#creating-a-table}
-
-``` sql
-CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
-(
-    name1 [type1] [DEFAULT|MATERIALIZED|ALIAS expr1],
-    name2 [type2] [DEFAULT|MATERIALIZED|ALIAS expr2],
-    ...
-) ENGINE = CollapsingMergeTree(sign)
-[PARTITION BY expr]
-[ORDER BY expr]
-[SAMPLE BY expr]
-[SETTINGS name=value, ...]
-```
-
-Para obtener una descripción de los parámetros de consulta, consulte [descripción de la consulta](../../../sql-reference/statements/create.md).
-
-**CollapsingMergeTree Parámetros**
-
--   `sign` — Name of the column with the type of row: `1` es una “state” fila, `-1` es una “cancel” fila.
-
-    Column data type — `Int8`.
-
-**Cláusulas de consulta**
-
-Al crear un `CollapsingMergeTree` mesa, la misma [cláusulas de consulta](mergetree.md#table_engine-mergetree-creating-a-table) se requieren, como al crear un `MergeTree` tabla.
-
-<details markdown="1">
-
-<summary>Método obsoleto para crear una tabla</summary>
-
-!!! attention "Atención"
-    No use este método en proyectos nuevos y, si es posible, cambie los proyectos antiguos al método descrito anteriormente.
-
-``` sql
-CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
-(
-    name1 [type1] [DEFAULT|MATERIALIZED|ALIAS expr1],
-    name2 [type2] [DEFAULT|MATERIALIZED|ALIAS expr2],
-    ...
-) ENGINE [=] CollapsingMergeTree(date-column [, sampling_expression], (primary, key), index_granularity, sign)
-```
-
-Todos los parámetros excepto `sign` el mismo significado que en `MergeTree`.
-
--   `sign` — Name of the column with the type of row: `1` — “state” fila, `-1` — “cancel” fila.
-
-    Column Data Type — `Int8`.
-
-</details>
-
-## Derrumbar {#table_engine-collapsingmergetree-collapsing}
-
-### Datos {#data}
-
-Considere la situación en la que necesita guardar datos que cambian continuamente para algún objeto. Parece lógico tener una fila para un objeto y actualizarla en cualquier cambio, pero la operación de actualización es costosa y lenta para DBMS porque requiere la reescritura de los datos en el almacenamiento. Si necesita escribir datos rápidamente, la actualización no es aceptable, pero puede escribir los cambios de un objeto secuencialmente de la siguiente manera.
-
-Utilice la columna en particular `Sign`. Si `Sign = 1` significa que la fila es un estado de un objeto, llamémoslo “state” fila. Si `Sign = -1` significa la cancelación del estado de un objeto con los mismos atributos, llamémoslo “cancel” fila.
-
-Por ejemplo, queremos calcular cuántas páginas revisaron los usuarios en algún sitio y cuánto tiempo estuvieron allí. En algún momento escribimos la siguiente fila con el estado de la actividad del usuario:
-
-``` text
-┌──────────────UserID─┬─PageViews─┬─Duration─┬─Sign─┐
-│ 4324182021466249494 │         5 │      146 │    1 │
-└─────────────────────┴───────────┴──────────┴──────┘
-```
-
-En algún momento después registramos el cambio de actividad del usuario y lo escribimos con las siguientes dos filas.
-
-``` text
-┌──────────────UserID─┬─PageViews─┬─Duration─┬─Sign─┐
-│ 4324182021466249494 │         5 │      146 │   -1 │
-│ 4324182021466249494 │         6 │      185 │    1 │
-└─────────────────────┴───────────┴──────────┴──────┘
-```
-
-La primera fila cancela el estado anterior del objeto (usuario). Debe copiar los campos clave de ordenación del estado cancelado exceptuando `Sign`.
-
-La segunda fila contiene el estado actual.
-
-Como solo necesitamos el último estado de actividad del usuario, las filas
-
-``` text
-┌──────────────UserID─┬─PageViews─┬─Duration─┬─Sign─┐
-│ 4324182021466249494 │         5 │      146 │    1 │
-│ 4324182021466249494 │         5 │      146 │   -1 │
-└─────────────────────┴───────────┴──────────┴──────┘
-```
-
-se puede eliminar colapsando el estado no válido (antiguo) de un objeto. `CollapsingMergeTree` hace esto mientras se fusionan las partes de datos.
-
-Por qué necesitamos 2 filas para cada cambio leído en el [Algoritmo](#table_engine-collapsingmergetree-collapsing-algorithm) apartado.
-
-**Propiedades peculiares de tal enfoque**
-
-1.  El programa que escribe los datos debe recordar el estado de un objeto para poder cancelarlo. “Cancel” debe contener copias de los campos de clave de ordenación “state” y lo opuesto `Sign`. Aumenta el tamaño inicial de almacenamiento, pero permite escribir los datos rápidamente.
-2.  Las matrices de largo crecimiento en columnas reducen la eficiencia del motor debido a la carga para escribir. Los datos más sencillos, mayor será la eficiencia.
-3.  El `SELECT` Los resultados dependen en gran medida de la consistencia del historial de cambios de objetos. Sea preciso al preparar los datos para insertarlos. Puede obtener resultados impredecibles en datos incoherentes, por ejemplo, valores negativos para métricas no negativas, como la profundidad de la sesión.
-
-### Algoritmo {#table_engine-collapsingmergetree-collapsing-algorithm}
-
-Cuando ClickHouse combina partes de datos, cada grupo de filas consecutivas tiene la misma clave de ordenación (`ORDER BY`) se reduce a no más de dos filas, una con `Sign = 1` (“state” fila) y otro con `Sign = -1` (“cancel” fila). En otras palabras, las entradas colapsan.
-
-Para cada parte de datos resultante, ClickHouse guarda:
-
-1.  El primero “cancel” y el último “state” si el número de “state” y “cancel” y la última fila es una “state” fila.
-2.  El último “state” fila, si hay más “state” filas que “cancel” filas.
-3.  El primero “cancel” fila, si hay más “cancel” filas que “state” filas.
-4.  Ninguna de las filas, en todos los demás casos.
-
-También cuando hay al menos 2 más “state” filas que “cancel” filas, o al menos 2 más “cancel” filas entonces “state” fila, la fusión continúa, pero ClickHouse trata esta situación como un error lógico y la registra en el registro del servidor. Este error puede producirse si se insertan los mismos datos más de una vez.
-
-Por lo tanto, el colapso no debe cambiar los resultados del cálculo de las estadísticas.
-Los cambios colapsaron gradualmente para que al final solo quedara el último estado de casi todos los objetos.
-
-El `Sign` se requiere porque el algoritmo de fusión no garantiza que todas las filas con la misma clave de clasificación estén en la misma parte de datos resultante e incluso en el mismo servidor físico. Proceso de ClickHouse `SELECT` consultas con múltiples hilos, y no puede predecir el orden de las filas en el resultado. La agregación es necesaria si hay una necesidad de obtener completamente “collapsed” datos de `CollapsingMergeTree` tabla.
-
-Para finalizar el colapso, escriba una consulta con `GROUP BY` cláusula y funciones agregadas que representan el signo. Por ejemplo, para calcular la cantidad, use `sum(Sign)` en lugar de `count()`. Para calcular la suma de algo, use `sum(Sign * x)` en lugar de `sum(x)` y así sucesivamente, y también añadir `HAVING sum(Sign) > 0`.
-
-Los agregados `count`, `sum` y `avg` podría calcularse de esta manera. El agregado `uniq` podría calcularse si un objeto tiene al menos un estado no colapsado. Los agregados `min` y `max` no se pudo calcular porque `CollapsingMergeTree` no guarda el historial de valores de los estados colapsados.
-
-Si necesita extraer datos sin agregación (por ejemplo, para comprobar si hay filas presentes cuyos valores más recientes coinciden con ciertas condiciones), puede utilizar el `FINAL` modificador para el `FROM` clausula. Este enfoque es significativamente menos eficiente.
-
-## Ejemplo de uso {#example-of-use}
-
-Datos de ejemplo:
-
-``` text
-┌──────────────UserID─┬─PageViews─┬─Duration─┬─Sign─┐
-│ 4324182021466249494 │         5 │      146 │    1 │
-│ 4324182021466249494 │         5 │      146 │   -1 │
-│ 4324182021466249494 │         6 │      185 │    1 │
-└─────────────────────┴───────────┴──────────┴──────┘
-```
-
-Creación de la tabla:
-
-``` sql
-CREATE TABLE UAct
-(
-    UserID UInt64,
-    PageViews UInt8,
-    Duration UInt8,
-    Sign Int8
-)
-ENGINE = CollapsingMergeTree(Sign)
-ORDER BY UserID
-```
-
-Inserción de los datos:
-
-``` sql
-INSERT INTO UAct VALUES (4324182021466249494, 5, 146, 1)
-```
-
-``` sql
-INSERT INTO UAct VALUES (4324182021466249494, 5, 146, -1),(4324182021466249494, 6, 185, 1)
-```
-
-Usamos dos `INSERT` consultas para crear dos partes de datos diferentes. Si insertamos los datos con una consulta, ClickHouse crea una parte de datos y nunca realizará ninguna fusión.
-
-Obtener los datos:
-
-``` sql
-SELECT * FROM UAct
-```
-
-``` text
-┌──────────────UserID─┬─PageViews─┬─Duration─┬─Sign─┐
-│ 4324182021466249494 │         5 │      146 │   -1 │
-│ 4324182021466249494 │         6 │      185 │    1 │
-└─────────────────────┴───────────┴──────────┴──────┘
-┌──────────────UserID─┬─PageViews─┬─Duration─┬─Sign─┐
-│ 4324182021466249494 │         5 │      146 │    1 │
-└─────────────────────┴───────────┴──────────┴──────┘
-```
-
-¿Qué vemos y dónde está colapsando?
-
-Con dos `INSERT` consultas, hemos creado 2 partes de datos. El `SELECT` la consulta se realizó en 2 hilos, y obtuvimos un orden aleatorio de filas. No se ha producido un colapso porque todavía no se había fusionado las partes de datos. ClickHouse fusiona parte de datos en un momento desconocido que no podemos predecir.
-
-Por lo tanto, necesitamos agregación:
-
-``` sql
-SELECT
-    UserID,
-    sum(PageViews * Sign) AS PageViews,
-    sum(Duration * Sign) AS Duration
-FROM UAct
-GROUP BY UserID
-HAVING sum(Sign) > 0
-```
-
-``` text
-┌──────────────UserID─┬─PageViews─┬─Duration─┐
-│ 4324182021466249494 │         6 │      185 │
-└─────────────────────┴───────────┴──────────┘
-```
-
-Si no necesitamos agregación y queremos forzar el colapso, podemos usar `FINAL` modificador para `FROM` clausula.
-
-``` sql
-SELECT * FROM UAct FINAL
-```
-
-``` text
-┌──────────────UserID─┬─PageViews─┬─Duration─┬─Sign─┐
-│ 4324182021466249494 │         6 │      185 │    1 │
-└─────────────────────┴───────────┴──────────┴──────┘
-```
-
-Esta forma de seleccionar los datos es muy ineficiente. No lo use para mesas grandes.
-
-## Ejemplo de otro enfoque {#example-of-another-approach}
-
-Datos de ejemplo:
-
-``` text
-┌──────────────UserID─┬─PageViews─┬─Duration─┬─Sign─┐
-│ 4324182021466249494 │         5 │      146 │    1 │
-│ 4324182021466249494 │        -5 │     -146 │   -1 │
-│ 4324182021466249494 │         6 │      185 │    1 │
-└─────────────────────┴───────────┴──────────┴──────┘
-```
-
-La idea es que las fusiones tengan en cuenta solo los campos clave. Y en el “Cancel” línea podemos especificar valores negativos que igualan la versión anterior de la fila al sumar sin usar la columna Sign. Para este enfoque, es necesario cambiar el tipo de datos `PageViews`,`Duration` para almacenar valores negativos de UInt8 -\> Int16.
-
-``` sql
-CREATE TABLE UAct
-(
-    UserID UInt64,
-    PageViews Int16,
-    Duration Int16,
-    Sign Int8
-)
-ENGINE = CollapsingMergeTree(Sign)
-ORDER BY UserID
-```
-
-Vamos a probar el enfoque:
-
-``` sql
-insert into UAct values(4324182021466249494,  5,  146,  1);
-insert into UAct values(4324182021466249494, -5, -146, -1);
-insert into UAct values(4324182021466249494,  6,  185,  1);
-
-select * from UAct final; // avoid using final in production (just for a test or small tables)
-```
-
-``` text
-┌──────────────UserID─┬─PageViews─┬─Duration─┬─Sign─┐
-│ 4324182021466249494 │         6 │      185 │    1 │
-└─────────────────────┴───────────┴──────────┴──────┘
-```
-
-``` sql
-SELECT
-    UserID,
-    sum(PageViews) AS PageViews,
-    sum(Duration) AS Duration
-FROM UAct
-GROUP BY UserID
-```text
-┌──────────────UserID─┬─PageViews─┬─Duration─┐
-│ 4324182021466249494 │         6 │      185 │
-└─────────────────────┴───────────┴──────────┘
-```
-
-``` sqk
-select count() FROM UAct
-```
-
-``` text
-┌─count()─┐
-│       3 │
-└─────────┘
-```
-
-``` sql
-optimize table UAct final;
-
-select * FROM UAct
-```
-
-``` text
-┌──────────────UserID─┬─PageViews─┬─Duration─┬─Sign─┐
-│ 4324182021466249494 │         6 │      185 │    1 │
-└─────────────────────┴───────────┴──────────┴──────┘
-```
-
-[Artículo Original](https://clickhouse.tech/docs/en/operations/table_engines/collapsingmergetree/) <!--hide-->
diff --git a/docs/es/engines/table-engines/mergetree-family/custom-partitioning-key.md b/docs/es/engines/table-engines/mergetree-family/custom-partitioning-key.md
deleted file mode 100644
index 6cbc0a9192e..00000000000
--- a/docs/es/engines/table-engines/mergetree-family/custom-partitioning-key.md
+++ /dev/null
@@ -1,127 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 32
-toc_title: "Clave de partici\xF3n personalizada"
----
-
-# Clave de partición personalizada {#custom-partitioning-key}
-
-La partición está disponible para el [Método de codificación de datos:](mergetree.md) mesas familiares (incluyendo [repetición](replication.md) tabla). [Vistas materializadas](../special/materializedview.md#materializedview) basado en tablas MergeTree soporte de particionamiento, también.
-
-Una partición es una combinación lógica de registros en una tabla por un criterio especificado. Puede establecer una partición por un criterio arbitrario, como por mes, por día o por tipo de evento. Cada partición se almacena por separado para simplificar las manipulaciones de estos datos. Al acceder a los datos, ClickHouse utiliza el subconjunto más pequeño de particiones posible.
-
-La partición se especifica en el `PARTITION BY expr` cláusula cuando [creando una tabla](mergetree.md#table_engine-mergetree-creating-a-table). La clave de partición puede ser cualquier expresión de las columnas de la tabla. Por ejemplo, para especificar la partición por mes, utilice la expresión `toYYYYMM(date_column)`:
-
-``` sql
-CREATE TABLE visits
-(
-    VisitDate Date,
-    Hour UInt8,
-    ClientID UUID
-)
-ENGINE = MergeTree()
-PARTITION BY toYYYYMM(VisitDate)
-ORDER BY Hour;
-```
-
-La clave de partición también puede ser una tupla de expresiones (similar a la [clave primaria](mergetree.md#primary-keys-and-indexes-in-queries)). Por ejemplo:
-
-``` sql
-ENGINE = ReplicatedCollapsingMergeTree('/clickhouse/tables/name', 'replica1', Sign)
-PARTITION BY (toMonday(StartDate), EventType)
-ORDER BY (CounterID, StartDate, intHash32(UserID));
-```
-
-En este ejemplo, establecemos la partición por los tipos de eventos que se produjeron durante la semana actual.
-
-Al insertar datos nuevos en una tabla, estos datos se almacenan como una parte separada (porción) ordenada por la clave principal. En 10-15 minutos después de insertar, las partes de la misma partición se fusionan en toda la parte.
-
-!!! info "INFO"
-    Una combinación solo funciona para partes de datos que tienen el mismo valor para la expresión de partición. Esto significa **no deberías hacer particiones demasiado granulares** (más de un millar de particiones). De lo contrario, el `SELECT` consulta funciona mal debido a un número excesivamente grande de archivos en el sistema de archivos y descriptores de archivos abiertos.
-
-Utilice el [sistema.parte](../../../operations/system-tables.md#system_tables-parts) tabla para ver las partes y particiones de la tabla. Por ejemplo, supongamos que tenemos un `visits` tabla con partición por mes. Vamos a realizar el `SELECT` consulta para el `system.parts` tabla:
-
-``` sql
-SELECT
-    partition,
-    name,
-    active
-FROM system.parts
-WHERE table = 'visits'
-```
-
-``` text
-┌─partition─┬─name───────────┬─active─┐
-│ 201901    │ 201901_1_3_1   │      0 │
-│ 201901    │ 201901_1_9_2   │      1 │
-│ 201901    │ 201901_8_8_0   │      0 │
-│ 201901    │ 201901_9_9_0   │      0 │
-│ 201902    │ 201902_4_6_1   │      1 │
-│ 201902    │ 201902_10_10_0 │      1 │
-│ 201902    │ 201902_11_11_0 │      1 │
-└───────────┴────────────────┴────────┘
-```
-
-El `partition` columna contiene los nombres de las particiones. Hay dos particiones en este ejemplo: `201901` y `201902`. Puede utilizar este valor de columna para especificar el nombre de partición en [ALTER … PARTITION](#alter_manipulations-with-partitions) consulta.
-
-El `name` columna contiene los nombres de las partes de datos de partición. Puede utilizar esta columna para especificar el nombre de la pieza [ALTER ATTACH PART](#alter_attach-partition) consulta.
-
-Vamos a desglosar el nombre de la primera parte: `201901_1_3_1`:
-
--   `201901` es el nombre de la partición.
--   `1` es el número mínimo del bloque de datos.
--   `3` es el número máximo del bloque de datos.
--   `1` es el nivel de fragmento (la profundidad del árbol de fusión del que se forma).
-
-!!! info "INFO"
-    Las partes de las tablas de tipo antiguo tienen el nombre: `20190117_20190123_2_2_0` (fecha mínima - fecha máxima - número de bloque mínimo - número de bloque máximo - nivel).
-
-El `active` columna muestra el estado de la pieza. `1` está activo; `0` está inactivo. Las partes inactivas son, por ejemplo, las partes de origen que quedan después de fusionarse con una parte más grande. Las partes de datos dañadas también se indican como inactivas.
-
-Como puede ver en el ejemplo, hay varias partes separadas de la misma partición (por ejemplo, `201901_1_3_1` y `201901_1_9_2`). Esto significa que estas partes aún no están fusionadas. ClickHouse combina las partes insertadas de datos periódicamente, aproximadamente 15 minutos después de la inserción. Además, puede realizar una fusión no programada utilizando el [OPTIMIZE](../../../sql-reference/statements/misc.md#misc_operations-optimize) consulta. Ejemplo:
-
-``` sql
-OPTIMIZE TABLE visits PARTITION 201902;
-```
-
-``` text
-┌─partition─┬─name───────────┬─active─┐
-│ 201901    │ 201901_1_3_1   │      0 │
-│ 201901    │ 201901_1_9_2   │      1 │
-│ 201901    │ 201901_8_8_0   │      0 │
-│ 201901    │ 201901_9_9_0   │      0 │
-│ 201902    │ 201902_4_6_1   │      0 │
-│ 201902    │ 201902_4_11_2  │      1 │
-│ 201902    │ 201902_10_10_0 │      0 │
-│ 201902    │ 201902_11_11_0 │      0 │
-└───────────┴────────────────┴────────┘
-```
-
-Las partes inactivas se eliminarán aproximadamente 10 minutos después de la fusión.
-
-Otra forma de ver un conjunto de partes y particiones es ir al directorio de la tabla: `/var/lib/clickhouse/data/<database>/<table>/`. Por ejemplo:
-
-``` bash
-/var/lib/clickhouse/data/default/visits$ ls -l
-total 40
-drwxr-xr-x 2 clickhouse clickhouse 4096 Feb  1 16:48 201901_1_3_1
-drwxr-xr-x 2 clickhouse clickhouse 4096 Feb  5 16:17 201901_1_9_2
-drwxr-xr-x 2 clickhouse clickhouse 4096 Feb  5 15:52 201901_8_8_0
-drwxr-xr-x 2 clickhouse clickhouse 4096 Feb  5 15:52 201901_9_9_0
-drwxr-xr-x 2 clickhouse clickhouse 4096 Feb  5 16:17 201902_10_10_0
-drwxr-xr-x 2 clickhouse clickhouse 4096 Feb  5 16:17 201902_11_11_0
-drwxr-xr-x 2 clickhouse clickhouse 4096 Feb  5 16:19 201902_4_11_2
-drwxr-xr-x 2 clickhouse clickhouse 4096 Feb  5 12:09 201902_4_6_1
-drwxr-xr-x 2 clickhouse clickhouse 4096 Feb  1 16:48 detached
-```
-
-Carpeta ‘201901_1_1_0’, ‘201901_1_7_1’ y así sucesivamente son los directorios de las partes. Cada parte se relaciona con una partición correspondiente y contiene datos solo para un mes determinado (la tabla de este ejemplo tiene particiones por mes).
-
-El `detached` el directorio contiene partes que se separaron de la tabla utilizando el [DETACH](../../../sql-reference/statements/alter.md#alter_detach-partition) consulta. Las partes dañadas también se mueven a este directorio, en lugar de eliminarse. El servidor no utiliza las piezas del `detached` directory. You can add, delete, or modify the data in this directory at any time – the server will not know about this until you run the [ATTACH](../../../sql-reference/statements/alter.md#alter_attach-partition) consulta.
-
-Tenga en cuenta que en el servidor operativo, no puede cambiar manualmente el conjunto de piezas o sus datos en el sistema de archivos, ya que el servidor no lo sabrá. Para tablas no replicadas, puede hacer esto cuando se detiene el servidor, pero no se recomienda. Para tablas replicadas, el conjunto de piezas no se puede cambiar en ningún caso.
-
-ClickHouse le permite realizar operaciones con las particiones: eliminarlas, copiar de una tabla a otra o crear una copia de seguridad. Consulte la lista de todas las operaciones en la sección [Manipulaciones con particiones y piezas](../../../sql-reference/statements/alter.md#alter_manipulations-with-partitions).
-
-[Artículo Original](https://clickhouse.tech/docs/en/operations/table_engines/custom_partitioning_key/) <!--hide-->
diff --git a/docs/es/engines/table-engines/mergetree-family/graphitemergetree.md b/docs/es/engines/table-engines/mergetree-family/graphitemergetree.md
deleted file mode 100644
index d33ddcebac2..00000000000
--- a/docs/es/engines/table-engines/mergetree-family/graphitemergetree.md
+++ /dev/null
@@ -1,174 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 38
-toc_title: GraphiteMergeTree
----
-
-# GraphiteMergeTree {#graphitemergetree}
-
-Este motor está diseñado para el adelgazamiento y la agregación / promedio (rollup) [Grafito](http://graphite.readthedocs.io/en/latest/index.html) datos. Puede ser útil para los desarrolladores que desean usar ClickHouse como almacén de datos para Graphite.
-
-Puede usar cualquier motor de tabla ClickHouse para almacenar los datos de Graphite si no necesita un paquete acumulativo, pero si necesita un paquete acumulativo, use `GraphiteMergeTree`. El motor reduce el volumen de almacenamiento y aumenta la eficiencia de las consultas de Graphite.
-
-El motor hereda propiedades de [Método de codificación de datos:](mergetree.md).
-
-## Creación de una tabla {#creating-table}
-
-``` sql
-CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
-(
-    Path String,
-    Time DateTime,
-    Value <Numeric_type>,
-    Version <Numeric_type>
-    ...
-) ENGINE = GraphiteMergeTree(config_section)
-[PARTITION BY expr]
-[ORDER BY expr]
-[SAMPLE BY expr]
-[SETTINGS name=value, ...]
-```
-
-Vea una descripción detallada del [CREATE TABLE](../../../sql-reference/statements/create.md#create-table-query) consulta.
-
-Una tabla para los datos de grafito debe tener las siguientes columnas para los siguientes datos:
-
--   Nombre métrico (sensor de grafito). Tipo de datos: `String`.
-
--   Tiempo de medición de la métrica. Tipo de datos: `DateTime`.
-
--   Valor de la métrica. Tipo de datos: cualquier numérico.
-
--   Versión de la métrica. Tipo de datos: cualquier numérico.
-
-    ClickHouse guarda las filas con la versión más alta o la última escrita si las versiones son las mismas. Otras filas se eliminan durante la fusión de partes de datos.
-
-Los nombres de estas columnas deben establecerse en la configuración acumulativa.
-
-**GraphiteMergeTree parámetros**
-
--   `config_section` — Name of the section in the configuration file, where are the rules of rollup set.
-
-**Cláusulas de consulta**
-
-Al crear un `GraphiteMergeTree` mesa, la misma [clausula](mergetree.md#table_engine-mergetree-creating-a-table) se requieren, como al crear un `MergeTree` tabla.
-
-<details markdown="1">
-
-<summary>Método obsoleto para crear una tabla</summary>
-
-!!! attention "Atención"
-    No use este método en proyectos nuevos y, si es posible, cambie los proyectos antiguos al método descrito anteriormente.
-
-``` sql
-CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
-(
-    EventDate Date,
-    Path String,
-    Time DateTime,
-    Value <Numeric_type>,
-    Version <Numeric_type>
-    ...
-) ENGINE [=] GraphiteMergeTree(date-column [, sampling_expression], (primary, key), index_granularity, config_section)
-```
-
-Todos los parámetros excepto `config_section` el mismo significado que en `MergeTree`.
-
--   `config_section` — Name of the section in the configuration file, where are the rules of rollup set.
-
-</details>
-
-## Configuración acumulativa {#rollup-configuration}
-
-La configuración del paquete acumulativo está definida por [graphite_rollup](../../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-graphite) parámetro en la configuración del servidor. El nombre del parámetro podría ser cualquiera. Puede crear varias configuraciones y usarlas para diferentes tablas.
-
-Estructura de configuración Rollup:
-
-      required-columns
-      patterns
-
-### Columnas requeridas {#required-columns}
-
--   `path_column_name` — The name of the column storing the metric name (Graphite sensor). Default value: `Path`.
--   `time_column_name` — The name of the column storing the time of measuring the metric. Default value: `Time`.
--   `value_column_name` — The name of the column storing the value of the metric at the time set in `time_column_name`. Valor predeterminado: `Value`.
--   `version_column_name` — The name of the column storing the version of the metric. Default value: `Timestamp`.
-
-### Patrón {#patterns}
-
-Estructura del `patterns` apartado:
-
-``` text
-pattern
-    regexp
-    function
-pattern
-    regexp
-    age + precision
-    ...
-pattern
-    regexp
-    function
-    age + precision
-    ...
-pattern
-    ...
-default
-    function
-    age + precision
-    ...
-```
-
-!!! warning "Atención"
-    Los patrones deben ser estrictamente ordenados:
-
-      1. Patterns without `function` or `retention`.
-      1. Patterns with both `function` and `retention`.
-      1. Pattern `default`.
-
-Al procesar una fila, ClickHouse comprueba las reglas en el `pattern` apartado. Cada uno de `pattern` (incluir `default` secciones pueden contener `function` parámetro para la agregación, `retention` parámetros o ambos. Si el nombre de la métrica coincide con `regexp`, las reglas de la `pattern` sección (o secciones); de lo contrario, las reglas de la `default` sección se utilizan.
-
-Campos para `pattern` y `default` apartado:
-
--   `regexp`– A pattern for the metric name.
--   `age` – The minimum age of the data in seconds.
--   `precision`– How precisely to define the age of the data in seconds. Should be a divisor for 86400 (seconds in a day).
--   `function` – The name of the aggregating function to apply to data whose age falls within the range `[age, age + precision]`.
-
-### Ejemplo de configuración {#configuration-example}
-
-``` xml
-<graphite_rollup>
-    <version_column_name>Version</version_column_name>
-    <pattern>
-        <regexp>click_cost</regexp>
-        <function>any</function>
-        <retention>
-            <age>0</age>
-            <precision>5</precision>
-        </retention>
-        <retention>
-            <age>86400</age>
-            <precision>60</precision>
-        </retention>
-    </pattern>
-    <default>
-        <function>max</function>
-        <retention>
-            <age>0</age>
-            <precision>60</precision>
-        </retention>
-        <retention>
-            <age>3600</age>
-            <precision>300</precision>
-        </retention>
-        <retention>
-            <age>86400</age>
-            <precision>3600</precision>
-        </retention>
-    </default>
-</graphite_rollup>
-```
-
-[Artículo Original](https://clickhouse.tech/docs/en/operations/table_engines/graphitemergetree/) <!--hide-->
diff --git a/docs/es/engines/table-engines/mergetree-family/index.md b/docs/es/engines/table-engines/mergetree-family/index.md
deleted file mode 100644
index 359d58b2ff1..00000000000
--- a/docs/es/engines/table-engines/mergetree-family/index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: Familia MergeTree
-toc_priority: 28
----
-
-
diff --git a/docs/es/engines/table-engines/mergetree-family/mergetree.md b/docs/es/engines/table-engines/mergetree-family/mergetree.md
deleted file mode 100644
index a4bab840b52..00000000000
--- a/docs/es/engines/table-engines/mergetree-family/mergetree.md
+++ /dev/null
@@ -1,654 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 30
-toc_title: "M\xE9todo de codificaci\xF3n de datos:"
----
-
-# Método de codificación de datos: {#table_engines-mergetree}
-
-El `MergeTree` motor y otros motores de esta familia (`*MergeTree`) son los motores de mesa ClickHouse más robustos.
-
-Motores en el `MergeTree` familia están diseñados para insertar una gran cantidad de datos en una tabla. Los datos se escriben rápidamente en la tabla parte por parte, luego se aplican reglas para fusionar las partes en segundo plano. Este método es mucho más eficiente que reescribir continuamente los datos en almacenamiento durante la inserción.
-
-Principales características:
-
--   Almacena datos ordenados por clave principal.
-
-    Esto le permite crear un pequeño índice disperso que ayuda a encontrar datos más rápido.
-
--   Las particiones se pueden utilizar si [clave de partición](custom-partitioning-key.md) se especifica.
-
-    ClickHouse admite ciertas operaciones con particiones que son más efectivas que las operaciones generales en los mismos datos con el mismo resultado. ClickHouse también corta automáticamente los datos de partición donde se especifica la clave de partición en la consulta. Esto también mejora el rendimiento de las consultas.
-
--   Soporte de replicación de datos.
-
-    La familia de `ReplicatedMergeTree` proporciona la replicación de datos. Para obtener más información, consulte [Replicación de datos](replication.md).
-
--   Soporte de muestreo de datos.
-
-    Si es necesario, puede establecer el método de muestreo de datos en la tabla.
-
-!!! info "INFO"
-    El [Fusionar](../special/merge.md#merge) el motor no pertenece al `*MergeTree` familia.
-
-## Creación de una tabla {#table_engine-mergetree-creating-a-table}
-
-``` sql
-CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
-(
-    name1 [type1] [DEFAULT|MATERIALIZED|ALIAS expr1] [TTL expr1],
-    name2 [type2] [DEFAULT|MATERIALIZED|ALIAS expr2] [TTL expr2],
-    ...
-    INDEX index_name1 expr1 TYPE type1(...) GRANULARITY value1,
-    INDEX index_name2 expr2 TYPE type2(...) GRANULARITY value2
-) ENGINE = MergeTree()
-[PARTITION BY expr]
-[ORDER BY expr]
-[PRIMARY KEY expr]
-[SAMPLE BY expr]
-[TTL expr [DELETE|TO DISK 'xxx'|TO VOLUME 'xxx'], ...]
-[SETTINGS name=value, ...]
-```
-
-Para obtener una descripción de los parámetros, consulte [Descripción de la consulta CREATE](../../../sql-reference/statements/create.md).
-
-!!! note "Nota"
-    `INDEX` es una característica experimental, ver [Índices de saltos de datos](#table_engine-mergetree-data_skipping-indexes).
-
-### Cláusulas de consulta {#mergetree-query-clauses}
-
--   `ENGINE` — Name and parameters of the engine. `ENGINE = MergeTree()`. El `MergeTree` el motor no tiene parámetros.
-
--   `PARTITION BY` — The [clave de partición](custom-partitioning-key.md).
-
-    Para particionar por mes, utilice el `toYYYYMM(date_column)` expresión, donde `date_column` es una columna con una fecha del tipo [Fecha](../../../sql-reference/data-types/date.md). Los nombres de partición aquí tienen el `"YYYYMM"` formato.
-
--   `ORDER BY` — The sorting key.
-
-    Una tupla de columnas o expresiones arbitrarias. Ejemplo: `ORDER BY (CounterID, EventDate)`.
-
--   `PRIMARY KEY` — The primary key if it [difiere de la clave de clasificación](#choosing-a-primary-key-that-differs-from-the-sorting-key).
-
-    De forma predeterminada, la clave principal es la misma que la clave de ordenación (que se especifica `ORDER BY` clausula). Por lo tanto, en la mayoría de los casos no es necesario especificar un `PRIMARY KEY` clausula.
-
--   `SAMPLE BY` — An expression for sampling.
-
-    Si se utiliza una expresión de muestreo, la clave principal debe contenerla. Ejemplo: `SAMPLE BY intHash32(UserID) ORDER BY (CounterID, EventDate, intHash32(UserID))`.
-
--   `TTL` — A list of rules specifying storage duration of rows and defining logic of automatic parts movement [entre discos y volúmenes](#table_engine-mergetree-multiple-volumes).
-
-    La expresión debe tener una `Date` o `DateTime` columna como resultado. Ejemplo:
-    `TTL date + INTERVAL 1 DAY`
-
-    Tipo de regla `DELETE|TO DISK 'xxx'|TO VOLUME 'xxx'` especifica una acción que debe realizarse con la pieza si la expresión está satisfecha (alcanza la hora actual): eliminación de filas caducadas, mover una pieza (si la expresión está satisfecha para todas las filas de una pieza) al disco especificado (`TO DISK 'xxx'`) o al volumen (`TO VOLUME 'xxx'`). El tipo predeterminado de la regla es la eliminación (`DELETE`). Se puede especificar una lista de varias reglas, pero no debe haber más de una `DELETE` regla.
-
-    Para obtener más información, consulte [TTL para columnas y tablas](#table_engine-mergetree-ttl)
-
--   `SETTINGS` — Additional parameters that control the behavior of the `MergeTree`:
-
-    -   `index_granularity` — Maximum number of data rows between the marks of an index. Default value: 8192. See [Almacenamiento de datos](#mergetree-data-storage).
-    -   `index_granularity_bytes` — Maximum size of data granules in bytes. Default value: 10Mb. To restrict the granule size only by number of rows, set to 0 (not recommended). See [Almacenamiento de datos](#mergetree-data-storage).
-    -   `enable_mixed_granularity_parts` — Enables or disables transitioning to control the granule size with the `index_granularity_bytes` configuración. Antes de la versión 19.11, sólo existía el `index_granularity` ajuste para restringir el tamaño del gránulo. El `index_granularity_bytes` mejora el rendimiento de ClickHouse al seleccionar datos de tablas con filas grandes (decenas y cientos de megabytes). Si tiene tablas con filas grandes, puede habilitar esta configuración para que las tablas mejoren la eficiencia de `SELECT` consulta.
-    -   `use_minimalistic_part_header_in_zookeeper` — Storage method of the data parts headers in ZooKeeper. If `use_minimalistic_part_header_in_zookeeper=1`, entonces ZooKeeper almacena menos datos. Para obtener más información, consulte [descripción del ajuste](../../../operations/server-configuration-parameters/settings.md#server-settings-use_minimalistic_part_header_in_zookeeper) en “Server configuration parameters”.
-    -   `min_merge_bytes_to_use_direct_io` — The minimum data volume for merge operation that is required for using direct I/O access to the storage disk. When merging data parts, ClickHouse calculates the total storage volume of all the data to be merged. If the volume exceeds `min_merge_bytes_to_use_direct_io` bytes, ClickHouse lee y escribe los datos en el disco de almacenamiento utilizando la interfaz de E / S directa (`O_DIRECT` opcion). Si `min_merge_bytes_to_use_direct_io = 0`, entonces la E/S directa está deshabilitada. Valor predeterminado: `10 * 1024 * 1024 * 1024` byte.
-        <a name="mergetree_setting-merge_with_ttl_timeout"></a>
-    -   `merge_with_ttl_timeout` — Minimum delay in seconds before repeating a merge with TTL. Default value: 86400 (1 day).
-    -   `write_final_mark` — Enables or disables writing the final index mark at the end of data part (after the last byte). Default value: 1. Don't turn it off.
-    -   `merge_max_block_size` — Maximum number of rows in block for merge operations. Default value: 8192.
-    -   `storage_policy` — Storage policy. See [Uso de varios dispositivos de bloque para el almacenamiento de datos](#table_engine-mergetree-multiple-volumes).
-
-**Ejemplo de configuración de secciones**
-
-``` sql
-ENGINE MergeTree() PARTITION BY toYYYYMM(EventDate) ORDER BY (CounterID, EventDate, intHash32(UserID)) SAMPLE BY intHash32(UserID) SETTINGS index_granularity=8192
-```
-
-En el ejemplo, configuramos la partición por mes.
-
-También establecemos una expresión para el muestreo como un hash por el ID de usuario. Esto le permite pseudoaleatorizar los datos en la tabla para cada `CounterID` y `EventDate`. Si define un [SAMPLE](../../../sql-reference/statements/select/sample.md#select-sample-clause) cláusula al seleccionar los datos, ClickHouse devolverá una muestra de datos pseudoaleatoria uniforme para un subconjunto de usuarios.
-
-El `index_granularity` se puede omitir porque 8192 es el valor predeterminado.
-
-<details markdown="1">
-
-<summary>Método obsoleto para crear una tabla</summary>
-
-!!! attention "Atención"
-    No utilice este método en nuevos proyectos. Si es posible, cambie los proyectos antiguos al método descrito anteriormente.
-
-``` sql
-CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
-(
-    name1 [type1] [DEFAULT|MATERIALIZED|ALIAS expr1],
-    name2 [type2] [DEFAULT|MATERIALIZED|ALIAS expr2],
-    ...
-) ENGINE [=] MergeTree(date-column [, sampling_expression], (primary, key), index_granularity)
-```
-
-**Parámetros MergeTree()**
-
--   `date-column` — The name of a column of the [Fecha](../../../sql-reference/data-types/date.md) tipo. ClickHouse crea automáticamente particiones por mes en función de esta columna. Los nombres de partición están en el `"YYYYMM"` formato.
--   `sampling_expression` — An expression for sampling.
--   `(primary, key)` — Primary key. Type: [Tupla()](../../../sql-reference/data-types/tuple.md)
--   `index_granularity` — The granularity of an index. The number of data rows between the “marks” de un índice. El valor 8192 es apropiado para la mayoría de las tareas.
-
-**Ejemplo**
-
-``` sql
-MergeTree(EventDate, intHash32(UserID), (CounterID, EventDate, intHash32(UserID)), 8192)
-```
-
-El `MergeTree` engine se configura de la misma manera que en el ejemplo anterior para el método de configuración del motor principal.
-</details>
-
-## Almacenamiento de datos {#mergetree-data-storage}
-
-Una tabla consta de partes de datos ordenadas por clave principal.
-
-Cuando se insertan datos en una tabla, se crean partes de datos separadas y cada una de ellas se ordena lexicográficamente por clave principal. Por ejemplo, si la clave principal es `(CounterID, Date)`, los datos en la parte se ordenan por `CounterID`, y dentro de cada `CounterID` es ordenado por `Date`.
-
-Los datos que pertenecen a diferentes particiones se separan en diferentes partes. En el fondo, ClickHouse combina partes de datos para un almacenamiento más eficiente. Las piezas que pertenecen a particiones diferentes no se fusionan. El mecanismo de combinación no garantiza que todas las filas con la misma clave principal estén en la misma parte de datos.
-
-Cada parte de datos se divide lógicamente en gránulos. Un gránulo es el conjunto de datos indivisibles más pequeño que ClickHouse lee al seleccionar datos. ClickHouse no divide filas o valores, por lo que cada gránulo siempre contiene un número entero de filas. La primera fila de un gránulo está marcada con el valor de la clave principal de la fila. Para cada parte de datos, ClickHouse crea un archivo de índice que almacena las marcas. Para cada columna, ya sea en la clave principal o no, ClickHouse también almacena las mismas marcas. Estas marcas le permiten encontrar datos directamente en archivos de columnas.
-
-El tamaño del gránulo es restringido por `index_granularity` y `index_granularity_bytes` configuración del motor de tabla. El número de filas en un gránulo se encuentra en el `[1, index_granularity]` rango, dependiendo del tamaño de las filas. El tamaño de un gránulo puede exceder `index_granularity_bytes` si el tamaño de una sola fila es mayor que el valor de la configuración. En este caso, el tamaño del gránulo es igual al tamaño de la fila.
-
-## Claves e índices principales en consultas {#primary-keys-and-indexes-in-queries}
-
-Tome el `(CounterID, Date)` clave primaria como ejemplo. En este caso, la clasificación y el índice se pueden ilustrar de la siguiente manera:
-
-      Whole data:     [---------------------------------------------]
-      CounterID:      [aaaaaaaaaaaaaaaaaabbbbcdeeeeeeeeeeeeefgggggggghhhhhhhhhiiiiiiiiikllllllll]
-      Date:           [1111111222222233331233211111222222333211111112122222223111112223311122333]
-      Marks:           |      |      |      |      |      |      |      |      |      |      |
-                      a,1    a,2    a,3    b,3    e,2    e,3    g,1    h,2    i,1    i,3    l,3
-      Marks numbers:   0      1      2      3      4      5      6      7      8      9      10
-
-Si la consulta de datos especifica:
-
--   `CounterID in ('a', 'h')`, el servidor lee los datos en los rangos de marcas `[0, 3)` y `[6, 8)`.
--   `CounterID IN ('a', 'h') AND Date = 3`, el servidor lee los datos en los rangos de marcas `[1, 3)` y `[7, 8)`.
--   `Date = 3`, el servidor lee los datos en el rango de marcas `[1, 10]`.
-
-Los ejemplos anteriores muestran que siempre es más efectivo usar un índice que un análisis completo.
-
-Un índice disperso permite leer datos adicionales. Al leer un único rango de la clave primaria, hasta `index_granularity * 2` se pueden leer filas adicionales en cada bloque de datos.
-
-Los índices dispersos le permiten trabajar con una gran cantidad de filas de tabla, porque en la mayoría de los casos, dichos índices caben en la RAM de la computadora.
-
-ClickHouse no requiere una clave principal única. Puede insertar varias filas con la misma clave principal.
-
-### Selección de la clave principal {#selecting-the-primary-key}
-
-El número de columnas en la clave principal no está explícitamente limitado. Dependiendo de la estructura de datos, puede incluir más o menos columnas en la clave principal. Esto puede:
-
--   Mejorar el rendimiento de un índice.
-
-    Si la clave principal es `(a, b)`, a continuación, añadir otra columna `c` mejorará el rendimiento si se cumplen las siguientes condiciones:
-
-    -   Hay consultas con una condición en la columna `c`.
-    -   Rangos de datos largos (varias veces más `index_granularity`) con valores idénticos para `(a, b)` son comunes. En otras palabras, al agregar otra columna le permite omitir rangos de datos bastante largos.
-
--   Mejorar la compresión de datos.
-
-    ClickHouse ordena los datos por clave principal, por lo que cuanto mayor sea la consistencia, mejor será la compresión.
-
--   Proporcione una lógica adicional al fusionar partes de datos en el [ColapsarMergeTree](collapsingmergetree.md#table_engine-collapsingmergetree) y [SummingMergeTree](summingmergetree.md) motor.
-
-    En este caso tiene sentido especificar el *clave de clasificación* que es diferente de la clave principal.
-
-Una clave principal larga afectará negativamente al rendimiento de la inserción y al consumo de memoria, pero las columnas adicionales de la clave principal no afectarán al rendimiento de ClickHouse durante `SELECT` consulta.
-
-### Elegir una clave principal que difiere de la clave de ordenación {#choosing-a-primary-key-that-differs-from-the-sorting-key}
-
-Es posible especificar una clave principal (una expresión con valores que se escriben en el archivo de índice para cada marca) que es diferente de la clave de ordenación (una expresión para ordenar las filas en partes de datos). En este caso, la tupla de expresión de clave primaria debe ser un prefijo de la tupla de expresión de clave de ordenación.
-
-Esta característica es útil cuando se [SummingMergeTree](summingmergetree.md) y
-[AgregaciónMergeTree](aggregatingmergetree.md) motores de mesa. En un caso común cuando se utilizan estos motores, la tabla tiene dos tipos de columnas: *cota* y *medida*. Las consultas típicas agregan valores de columnas de medida con `GROUP BY` y filtrado por dimensiones. Debido a que SummingMergeTree y AggregatingMergeTree agregan filas con el mismo valor de la clave de ordenación, es natural agregarle todas las dimensiones. Como resultado, la expresión de clave consta de una larga lista de columnas y esta lista debe actualizarse con frecuencia con las dimensiones recién agregadas.
-
-En este caso, tiene sentido dejar solo unas pocas columnas en la clave principal que proporcionarán análisis de rango eficientes y agregarán las columnas de dimensión restantes a la tupla de clave de clasificación.
-
-[ALTER](../../../sql-reference/statements/alter.md) de la clave de ordenación es una operación ligera porque cuando se agrega una nueva columna simultáneamente a la tabla y a la clave de ordenación, las partes de datos existentes no necesitan ser cambiadas. Dado que la clave de ordenación anterior es un prefijo de la nueva clave de ordenación y no hay datos en la columna recién agregada, los datos se ordenan tanto por las claves de ordenación antiguas como por las nuevas en el momento de la modificación de la tabla.
-
-### Uso de índices y particiones en consultas {#use-of-indexes-and-partitions-in-queries}
-
-Para `SELECT` consultas, ClickHouse analiza si se puede usar un índice. Se puede usar un índice si el `WHERE/PREWHERE` clause tiene una expresión (como uno de los elementos de conjunción, o enteramente) que representa una operación de comparación de igualdad o desigualdad, o si tiene `IN` o `LIKE` con un prefijo fijo en columnas o expresiones que están en la clave principal o clave de partición, o en ciertas funciones parcialmente repetitivas de estas columnas, o relaciones lógicas de estas expresiones.
-
-Por lo tanto, es posible ejecutar rápidamente consultas en uno o varios rangos de la clave principal. En este ejemplo, las consultas serán rápidas cuando se ejecuten para una etiqueta de seguimiento específica, para una etiqueta y un intervalo de fechas específicos, para una etiqueta y una fecha específicas, para varias etiquetas con un intervalo de fechas, etc.
-
-Veamos el motor configurado de la siguiente manera:
-
-      ENGINE MergeTree() PARTITION BY toYYYYMM(EventDate) ORDER BY (CounterID, EventDate) SETTINGS index_granularity=8192
-
-En este caso, en consultas:
-
-``` sql
-SELECT count() FROM table WHERE EventDate = toDate(now()) AND CounterID = 34
-SELECT count() FROM table WHERE EventDate = toDate(now()) AND (CounterID = 34 OR CounterID = 42)
-SELECT count() FROM table WHERE ((EventDate >= toDate('2014-01-01') AND EventDate <= toDate('2014-01-31')) OR EventDate = toDate('2014-05-01')) AND CounterID IN (101500, 731962, 160656) AND (CounterID = 101500 OR EventDate != toDate('2014-05-01'))
-```
-
-ClickHouse utilizará el índice de clave principal para recortar datos incorrectos y la clave de partición mensual para recortar particiones que están en intervalos de fechas incorrectos.
-
-Las consultas anteriores muestran que el índice se usa incluso para expresiones complejas. La lectura de la tabla está organizada de modo que el uso del índice no puede ser más lento que un escaneo completo.
-
-En el siguiente ejemplo, el índice no se puede usar.
-
-``` sql
-SELECT count() FROM table WHERE CounterID = 34 OR URL LIKE '%upyachka%'
-```
-
-Para comprobar si ClickHouse puede usar el índice al ejecutar una consulta, use la configuración [Fecha de nacimiento](../../../operations/settings/settings.md#settings-force_index_by_date) y [force_primary_key](../../../operations/settings/settings.md).
-
-La clave para particionar por mes permite leer solo aquellos bloques de datos que contienen fechas del rango adecuado. En este caso, el bloque de datos puede contener datos para muchas fechas (hasta un mes). Dentro de un bloque, los datos se ordenan por clave principal, que puede no contener la fecha como la primera columna. Debido a esto, el uso de una consulta con solo una condición de fecha que no especifica el prefijo de clave principal hará que se lean más datos que para una sola fecha.
-
-### Uso del índice para claves primarias parcialmente monótonas {#use-of-index-for-partially-monotonic-primary-keys}
-
-Considere, por ejemplo, los días del mes. Ellos forman un [monótona secuencia](https://en.wikipedia.org/wiki/Monotonic_function) durante un mes, pero no monótono durante períodos más prolongados. Esta es una secuencia parcialmente monotónica. Si un usuario crea la tabla con clave primaria parcialmente monótona, ClickHouse crea un índice disperso como de costumbre. Cuando un usuario selecciona datos de este tipo de tabla, ClickHouse analiza las condiciones de consulta. Si el usuario desea obtener datos entre dos marcas del índice y ambas marcas caen dentro de un mes, ClickHouse puede usar el índice en este caso particular porque puede calcular la distancia entre los parámetros de una consulta y las marcas de índice.
-
-ClickHouse no puede usar un índice si los valores de la clave principal en el rango de parámetros de consulta no representan una secuencia monotónica. En este caso, ClickHouse utiliza el método de análisis completo.
-
-ClickHouse usa esta lógica no solo para secuencias de días del mes, sino para cualquier clave principal que represente una secuencia parcialmente monotónica.
-
-### Índices de saltos de datos (experimental) {#table_engine-mergetree-data_skipping-indexes}
-
-La declaración de índice se encuentra en la sección de columnas del `CREATE` consulta.
-
-``` sql
-INDEX index_name expr TYPE type(...) GRANULARITY granularity_value
-```
-
-Para tablas de la `*MergeTree` familia, se pueden especificar índices de omisión de datos.
-
-Estos índices agregan cierta información sobre la expresión especificada en bloques, que consisten en `granularity_value` gránulos (el tamaño del gránulo se especifica utilizando el `index_granularity` ajuste en el motor de la tabla). Entonces estos agregados se usan en `SELECT` consultas para reducir la cantidad de datos a leer desde el disco omitiendo grandes bloques de datos donde el `where` consulta no puede ser satisfecha.
-
-**Ejemplo**
-
-``` sql
-CREATE TABLE table_name
-(
-    u64 UInt64,
-    i32 Int32,
-    s String,
-    ...
-    INDEX a (u64 * i32, s) TYPE minmax GRANULARITY 3,
-    INDEX b (u64 * length(s)) TYPE set(1000) GRANULARITY 4
-) ENGINE = MergeTree()
-...
-```
-
-ClickHouse puede utilizar los índices del ejemplo para reducir la cantidad de datos que se leen desde el disco en las siguientes consultas:
-
-``` sql
-SELECT count() FROM table WHERE s < 'z'
-SELECT count() FROM table WHERE u64 * i32 == 10 AND u64 * length(s) >= 1234
-```
-
-#### Tipos de índices disponibles {#available-types-of-indices}
-
--   `minmax`
-
-    Almacena los extremos de la expresión especificada (si la expresión `tuple`, entonces almacena extremos para cada elemento de `tuple`), utiliza información almacenada para omitir bloques de datos como la clave principal.
-
--   `set(max_rows)`
-
-    Almacena valores únicos de la expresión especificada (no más de `max_rows` filas, `max_rows=0` medio “no limits”). Utiliza los valores para comprobar si `WHERE` expresión no es satisfactorio en un bloque de datos.
-
--   `ngrambf_v1(n, size_of_bloom_filter_in_bytes, number_of_hash_functions, random_seed)`
-
-    Tiendas a [Filtro de floración](https://en.wikipedia.org/wiki/Bloom_filter) que contiene todos los ngrams de un bloque de datos. Funciona solo con cadenas. Puede ser utilizado para la optimización de `equals`, `like` y `in` expresiones.
-
-    -   `n` — ngram size,
-    -   `size_of_bloom_filter_in_bytes` — Bloom filter size in bytes (you can use large values here, for example, 256 or 512, because it can be compressed well).
-    -   `number_of_hash_functions` — The number of hash functions used in the Bloom filter.
-    -   `random_seed` — The seed for Bloom filter hash functions.
-
--   `tokenbf_v1(size_of_bloom_filter_in_bytes, number_of_hash_functions, random_seed)`
-
-    Lo mismo que `ngrambf_v1`, pero almacena tokens en lugar de ngrams. Los tokens son secuencias separadas por caracteres no alfanuméricos.
-
--   `bloom_filter([false_positive])` — Stores a [Filtro de floración](https://en.wikipedia.org/wiki/Bloom_filter) para las columnas especificadas.
-
-    Opcional `false_positive` parámetro es la probabilidad de recibir una respuesta falsa positiva del filtro. Valores posibles: (0, 1). Valor predeterminado: 0.025.
-
-    Tipos de datos admitidos: `Int*`, `UInt*`, `Float*`, `Enum`, `Date`, `DateTime`, `String`, `FixedString`, `Array`, `LowCardinality`, `Nullable`.
-
-    Las siguientes funciones pueden usarlo: [igual](../../../sql-reference/functions/comparison-functions.md), [notEquals](../../../sql-reference/functions/comparison-functions.md), [en](../../../sql-reference/functions/in-functions.md), [noEn](../../../sql-reference/functions/in-functions.md), [tener](../../../sql-reference/functions/array-functions.md).
-
-<!-- -->
-
-``` sql
-INDEX sample_index (u64 * length(s)) TYPE minmax GRANULARITY 4
-INDEX sample_index2 (u64 * length(str), i32 + f64 * 100, date, str) TYPE set(100) GRANULARITY 4
-INDEX sample_index3 (lower(str), str) TYPE ngrambf_v1(3, 256, 2, 0) GRANULARITY 4
-```
-
-#### Funciones de apoyo {#functions-support}
-
-Condiciones en el `WHERE` cláusula contiene llamadas de las funciones que operan con columnas. Si la columna forma parte de un índice, ClickHouse intenta usar este índice al realizar las funciones. ClickHouse admite diferentes subconjuntos de funciones para usar índices.
-
-El `set` index se puede utilizar con todas las funciones. Subconjuntos de funciones para otros índices se muestran en la siguiente tabla.
-
-| Función (operador) / Índice                                                                              | clave primaria | minmax | Descripción | Sistema abierto. | bloom_filter |
-|----------------------------------------------------------------------------------------------------------|----------------|--------|-------------|------------------|---------------|
-| [igual (=, ==)](../../../sql-reference/functions/comparison-functions.md#function-equals)                | ✔              | ✔      | ✔           | ✔                | ✔             |
-| [notEquals(!=, \<\>)](../../../sql-reference/functions/comparison-functions.md#function-notequals)       | ✔              | ✔      | ✔           | ✔                | ✔             |
-| [como](../../../sql-reference/functions/string-search-functions.md#function-like)                        | ✔              | ✔      | ✔           | ✗                | ✗             |
-| [No como](../../../sql-reference/functions/string-search-functions.md#function-notlike)                  | ✔              | ✔      | ✔           | ✗                | ✗             |
-| [Comienza con](../../../sql-reference/functions/string-functions.md#startswith)                          | ✔              | ✔      | ✔           | ✔                | ✗             |
-| [Finaliza con](../../../sql-reference/functions/string-functions.md#endswith)                            | ✗              | ✗      | ✔           | ✔                | ✗             |
-| [multiSearchAny](../../../sql-reference/functions/string-search-functions.md#function-multisearchany)    | ✗              | ✗      | ✔           | ✗                | ✗             |
-| [en](../../../sql-reference/functions/in-functions.md#in-functions)                                      | ✔              | ✔      | ✔           | ✔                | ✔             |
-| [noEn](../../../sql-reference/functions/in-functions.md#in-functions)                                    | ✔              | ✔      | ✔           | ✔                | ✔             |
-| [menos (\<)](../../../sql-reference/functions/comparison-functions.md#function-less)                     | ✔              | ✔      | ✗           | ✗                | ✗             |
-| [mayor (\>)](../../../sql-reference/functions/comparison-functions.md#function-greater)                  | ✔              | ✔      | ✗           | ✗                | ✗             |
-| [menosOrEquals (\<=)](../../../sql-reference/functions/comparison-functions.md#function-lessorequals)    | ✔              | ✔      | ✗           | ✗                | ✗             |
-| [mayorOrEquals (\>=)](../../../sql-reference/functions/comparison-functions.md#function-greaterorequals) | ✔              | ✔      | ✗           | ✗                | ✗             |
-| [vaciar](../../../sql-reference/functions/array-functions.md#function-empty)                             | ✔              | ✔      | ✗           | ✗                | ✗             |
-| [notEmpty](../../../sql-reference/functions/array-functions.md#function-notempty)                        | ✔              | ✔      | ✗           | ✗                | ✗             |
-| hasToken                                                                                                 | ✗              | ✗      | ✗           | ✔                | ✗             |
-
-Las funciones con un argumento constante que es menor que el tamaño de ngram no pueden ser utilizadas por `ngrambf_v1` para la optimización de consultas.
-
-Los filtros Bloom pueden tener coincidencias falsas positivas, por lo que `ngrambf_v1`, `tokenbf_v1`, y `bloom_filter` los índices no se pueden usar para optimizar consultas donde se espera que el resultado de una función sea falso, por ejemplo:
-
--   Puede ser optimizado:
-    -   `s LIKE '%test%'`
-    -   `NOT s NOT LIKE '%test%'`
-    -   `s = 1`
-    -   `NOT s != 1`
-    -   `startsWith(s, 'test')`
--   No se puede optimizar:
-    -   `NOT s LIKE '%test%'`
-    -   `s NOT LIKE '%test%'`
-    -   `NOT s = 1`
-    -   `s != 1`
-    -   `NOT startsWith(s, 'test')`
-
-## Acceso a datos simultáneos {#concurrent-data-access}
-
-Para el acceso simultáneo a tablas, usamos versiones múltiples. En otras palabras, cuando una tabla se lee y actualiza simultáneamente, los datos se leen de un conjunto de partes que está actualizado en el momento de la consulta. No hay cerraduras largas. Las inserciones no se interponen en el camino de las operaciones de lectura.
-
-La lectura de una tabla se paralela automáticamente.
-
-## TTL para columnas y tablas {#table_engine-mergetree-ttl}
-
-Determina la duración de los valores.
-
-El `TTL` se puede establecer para toda la tabla y para cada columna individual. TTL de nivel de tabla también puede especificar la lógica de movimiento automático de datos entre discos y volúmenes.
-
-Las expresiones deben evaluar [Fecha](../../../sql-reference/data-types/date.md) o [FechaHora](../../../sql-reference/data-types/datetime.md) tipo de datos.
-
-Ejemplo:
-
-``` sql
-TTL time_column
-TTL time_column + interval
-```
-
-Definir `interval`, utilizar [intervalo de tiempo](../../../sql-reference/operators/index.md#operators-datetime) operador.
-
-``` sql
-TTL date_time + INTERVAL 1 MONTH
-TTL date_time + INTERVAL 15 HOUR
-```
-
-### Columna TTL {#mergetree-column-ttl}
-
-Cuando los valores de la columna caducan, ClickHouse los reemplaza con los valores predeterminados para el tipo de datos de columna. Si todos los valores de columna en la parte de datos caducan, ClickHouse elimina esta columna de la parte de datos en un sistema de archivos.
-
-El `TTL` cláusula no se puede utilizar para columnas clave.
-
-Ejemplos:
-
-Creación de una tabla con TTL
-
-``` sql
-CREATE TABLE example_table
-(
-    d DateTime,
-    a Int TTL d + INTERVAL 1 MONTH,
-    b Int TTL d + INTERVAL 1 MONTH,
-    c String
-)
-ENGINE = MergeTree
-PARTITION BY toYYYYMM(d)
-ORDER BY d;
-```
-
-Adición de TTL a una columna de una tabla existente
-
-``` sql
-ALTER TABLE example_table
-    MODIFY COLUMN
-    c String TTL d + INTERVAL 1 DAY;
-```
-
-Modificación de TTL de la columna
-
-``` sql
-ALTER TABLE example_table
-    MODIFY COLUMN
-    c String TTL d + INTERVAL 1 MONTH;
-```
-
-### Tabla TTL {#mergetree-table-ttl}
-
-La tabla puede tener una expresión para la eliminación de filas caducadas y varias expresiones para el movimiento automático de partes entre [discos o volúmenes](#table_engine-mergetree-multiple-volumes). Cuando las filas de la tabla caducan, ClickHouse elimina todas las filas correspondientes. Para la entidad de movimiento de piezas, todas las filas de una pieza deben cumplir los criterios de expresión de movimiento.
-
-``` sql
-TTL expr [DELETE|TO DISK 'aaa'|TO VOLUME 'bbb'], ...
-```
-
-El tipo de regla TTL puede seguir cada expresión TTL. Afecta a una acción que debe realizarse una vez que se satisface la expresión (alcanza la hora actual):
-
--   `DELETE` - Eliminar filas caducadas (acción predeterminada);
--   `TO DISK 'aaa'` - mover parte al disco `aaa`;
--   `TO VOLUME 'bbb'` - mover parte al disco `bbb`.
-
-Ejemplos:
-
-Creación de una tabla con TTL
-
-``` sql
-CREATE TABLE example_table
-(
-    d DateTime,
-    a Int
-)
-ENGINE = MergeTree
-PARTITION BY toYYYYMM(d)
-ORDER BY d
-TTL d + INTERVAL 1 MONTH [DELETE],
-    d + INTERVAL 1 WEEK TO VOLUME 'aaa',
-    d + INTERVAL 2 WEEK TO DISK 'bbb';
-```
-
-Modificación de TTL de la tabla
-
-``` sql
-ALTER TABLE example_table
-    MODIFY TTL d + INTERVAL 1 DAY;
-```
-
-**Eliminación de datos**
-
-Los datos con un TTL caducado se eliminan cuando ClickHouse fusiona partes de datos.
-
-Cuando ClickHouse ve que los datos han caducado, realiza una combinación fuera de programación. Para controlar la frecuencia de tales fusiones, puede establecer `merge_with_ttl_timeout`. Si el valor es demasiado bajo, realizará muchas fusiones fuera de horario que pueden consumir muchos recursos.
-
-Si realiza el `SELECT` consulta entre fusiones, puede obtener datos caducados. Para evitarlo, use el [OPTIMIZE](../../../sql-reference/statements/misc.md#misc_operations-optimize) consulta antes `SELECT`.
-
-## Uso de varios dispositivos de bloque para el almacenamiento de datos {#table_engine-mergetree-multiple-volumes}
-
-### Implantación {#introduction}
-
-`MergeTree` Los motores de tablas familiares pueden almacenar datos en múltiples dispositivos de bloque. Por ejemplo, puede ser útil cuando los datos de una determinada tabla se dividen implícitamente en “hot” y “cold”. Los datos más recientes se solicitan regularmente, pero solo requieren una pequeña cantidad de espacio. Por el contrario, los datos históricos de cola gorda se solicitan raramente. Si hay varios discos disponibles, el “hot” los datos pueden estar ubicados en discos rápidos (por ejemplo, SSD NVMe o en memoria), mientras que “cold” datos - en los relativamente lentos (por ejemplo, HDD).
-
-La parte de datos es la unidad móvil mínima para `MergeTree`-mesas de motor. Los datos que pertenecen a una parte se almacenan en un disco. Las partes de datos se pueden mover entre discos en segundo plano (según la configuración del usuario) así como por medio de la [ALTER](../../../sql-reference/statements/alter.md#alter_move-partition) consulta.
-
-### Plazo {#terms}
-
--   Disk — Block device mounted to the filesystem.
--   Default disk — Disk that stores the path specified in the [camino](../../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-path) configuración del servidor.
--   Volume — Ordered set of equal disks (similar to [JBOD](https://en.wikipedia.org/wiki/Non-RAID_drive_architectures)).
--   Storage policy — Set of volumes and the rules for moving data between them.
-
-Los nombres dados a las entidades descritas se pueden encontrar en las tablas del sistema, [sistema.almacenamiento_policies](../../../operations/system-tables.md#system_tables-storage_policies) y [sistema.disco](../../../operations/system-tables.md#system_tables-disks). Para aplicar una de las directivas de almacenamiento configuradas para una tabla, `storage_policy` establecimiento de `MergeTree`-mesas de la familia del motor.
-
-### Configuración {#table_engine-mergetree-multiple-volumes_configure}
-
-Los discos, los volúmenes y las políticas de almacenamiento deben declararse `<storage_configuration>` etiqueta ya sea en el archivo principal `config.xml` o en un archivo distinto en el `config.d` directorio.
-
-Estructura de configuración:
-
-``` xml
-<storage_configuration>
-    <disks>
-        <disk_name_1> <!-- disk name -->
-            <path>/mnt/fast_ssd/clickhouse/</path>
-        </disk_name_1>
-        <disk_name_2>
-            <path>/mnt/hdd1/clickhouse/</path>
-            <keep_free_space_bytes>10485760</keep_free_space_bytes>
-        </disk_name_2>
-        <disk_name_3>
-            <path>/mnt/hdd2/clickhouse/</path>
-            <keep_free_space_bytes>10485760</keep_free_space_bytes>
-        </disk_name_3>
-
-        ...
-    </disks>
-
-    ...
-</storage_configuration>
-```
-
-Tags:
-
--   `<disk_name_N>` — Disk name. Names must be different for all disks.
--   `path` — path under which a server will store data (`data` y `shadow` carpetas), debe terminarse con ‘/’.
--   `keep_free_space_bytes` — the amount of free disk space to be reserved.
-
-El orden de la definición del disco no es importante.
-
-Marcado de configuración de directivas de almacenamiento:
-
-``` xml
-<storage_configuration>
-    ...
-    <policies>
-        <policy_name_1>
-            <volumes>
-                <volume_name_1>
-                    <disk>disk_name_from_disks_configuration</disk>
-                    <max_data_part_size_bytes>1073741824</max_data_part_size_bytes>
-                </volume_name_1>
-                <volume_name_2>
-                    <!-- configuration -->
-                </volume_name_2>
-                <!-- more volumes -->
-            </volumes>
-            <move_factor>0.2</move_factor>
-        </policy_name_1>
-        <policy_name_2>
-            <!-- configuration -->
-        </policy_name_2>
-
-        <!-- more policies -->
-    </policies>
-    ...
-</storage_configuration>
-```
-
-Tags:
-
--   `policy_name_N` — Policy name. Policy names must be unique.
--   `volume_name_N` — Volume name. Volume names must be unique.
--   `disk` — a disk within a volume.
--   `max_data_part_size_bytes` — the maximum size of a part that can be stored on any of the volume's disks.
--   `move_factor` — when the amount of available space gets lower than this factor, data automatically start to move on the next volume if any (by default, 0.1).
-
-Cofiguration ejemplos:
-
-``` xml
-<storage_configuration>
-    ...
-    <policies>
-        <hdd_in_order> <!-- policy name -->
-            <volumes>
-                <single> <!-- volume name -->
-                    <disk>disk1</disk>
-                    <disk>disk2</disk>
-                </single>
-            </volumes>
-        </hdd_in_order>
-
-        <moving_from_ssd_to_hdd>
-            <volumes>
-                <hot>
-                    <disk>fast_ssd</disk>
-                    <max_data_part_size_bytes>1073741824</max_data_part_size_bytes>
-                </hot>
-                <cold>
-                    <disk>disk1</disk>
-                </cold>
-            </volumes>
-            <move_factor>0.2</move_factor>
-        </moving_from_ssd_to_hdd>
-    </policies>
-    ...
-</storage_configuration>
-```
-
-En un ejemplo dado, el `hdd_in_order` la política implementa el [Ronda-robin](https://en.wikipedia.org/wiki/Round-robin_scheduling) enfoque. Por lo tanto, esta política define solo un volumen (`single`), las partes de datos se almacenan en todos sus discos en orden circular. Dicha política puede ser bastante útil si hay varios discos similares montados en el sistema, pero RAID no está configurado. Tenga en cuenta que cada unidad de disco individual no es confiable y es posible que desee compensarlo con un factor de replicación de 3 o más.
-
-Si hay diferentes tipos de discos disponibles en el sistema, `moving_from_ssd_to_hdd` política se puede utilizar en su lugar. Volumen `hot` consta de un disco SSD (`fast_ssd`), y el tamaño máximo de una pieza que se puede almacenar en este volumen es de 1 GB. Todas las piezas con el tamaño más grande que 1GB serán almacenadas directamente en `cold` volumen, que contiene un disco duro `disk1`.
-Además, una vez que el disco `fast_ssd` se llena en más del 80%, los datos se transferirán al `disk1` por un proceso en segundo plano.
-
-El orden de enumeración de volúmenes dentro de una directiva de almacenamiento es importante. Una vez que un volumen está sobrellenado, los datos se mueven al siguiente. El orden de la enumeración del disco también es importante porque los datos se almacenan en ellos por turnos.
-
-Al crear una tabla, se puede aplicarle una de las directivas de almacenamiento configuradas:
-
-``` sql
-CREATE TABLE table_with_non_default_policy (
-    EventDate Date,
-    OrderID UInt64,
-    BannerID UInt64,
-    SearchPhrase String
-) ENGINE = MergeTree
-ORDER BY (OrderID, BannerID)
-PARTITION BY toYYYYMM(EventDate)
-SETTINGS storage_policy = 'moving_from_ssd_to_hdd'
-```
-
-El `default` política de almacenamiento implica el uso de un solo volumen, que consiste en un solo disco dado en `<path>`. Una vez que se crea una tabla, no se puede cambiar su política de almacenamiento.
-
-### Detalles {#details}
-
-En el caso de `MergeTree` tablas, los datos están llegando al disco de diferentes maneras:
-
--   Como resultado de un inserto (`INSERT` consulta).
--   Durante las fusiones de fondo y [mutación](../../../sql-reference/statements/alter.md#alter-mutations).
--   Al descargar desde otra réplica.
--   Como resultado de la congelación de particiones [ALTER TABLE … FREEZE PARTITION](../../../sql-reference/statements/alter.md#alter_freeze-partition).
-
-En todos estos casos, excepto las mutaciones y la congelación de particiones, una pieza se almacena en un volumen y un disco de acuerdo con la política de almacenamiento dada:
-
-1.  El primer volumen (en el orden de definición) que tiene suficiente espacio en disco para almacenar una pieza (`unreserved_space > current_part_size`) y permite almacenar partes de un tamaño determinado (`max_data_part_size_bytes > current_part_size`) se elige.
-2.  Dentro de este volumen, se elige ese disco que sigue al que se utilizó para almacenar el fragmento de datos anterior y que tiene espacio libre más que el tamaño de la pieza (`unreserved_space - keep_free_space_bytes > current_part_size`).
-
-Bajo el capó, las mutaciones y la congelación de particiones hacen uso de [enlaces duros](https://en.wikipedia.org/wiki/Hard_link). Los enlaces duros entre diferentes discos no son compatibles, por lo tanto, en tales casos las partes resultantes se almacenan en los mismos discos que los iniciales.
-
-En el fondo, las partes se mueven entre volúmenes en función de la cantidad de espacio libre (`move_factor` parámetro) según el orden en que se declaran los volúmenes en el archivo de configuración.
-Los datos nunca se transfieren desde el último y al primero. Uno puede usar tablas del sistema [sistema.part_log](../../../operations/system-tables.md#system_tables-part-log) (campo `type = MOVE_PART`) y [sistema.parte](../../../operations/system-tables.md#system_tables-parts) (campo `path` y `disk`) para monitorear movimientos de fondo. Además, la información detallada se puede encontrar en los registros del servidor.
-
-El usuario puede forzar el movimiento de una pieza o una partición de un volumen a otro mediante la consulta [ALTER TABLE … MOVE PART\|PARTITION … TO VOLUME\|DISK …](../../../sql-reference/statements/alter.md#alter_move-partition), todas las restricciones para las operaciones en segundo plano se tienen en cuenta. La consulta inicia un movimiento por sí misma y no espera a que se completen las operaciones en segundo plano. El usuario recibirá un mensaje de error si no hay suficiente espacio libre disponible o si no se cumple alguna de las condiciones requeridas.
-
-Mover datos no interfiere con la replicación de datos. Por lo tanto, se pueden especificar diferentes directivas de almacenamiento para la misma tabla en diferentes réplicas.
-
-Después de la finalización de las fusiones y mutaciones de fondo, las partes viejas se eliminan solo después de un cierto período de tiempo (`old_parts_lifetime`).
-Durante este tiempo, no se mueven a otros volúmenes o discos. Por lo tanto, hasta que las partes finalmente se eliminen, aún se tienen en cuenta para la evaluación del espacio en disco ocupado.
-
-[Artículo Original](https://clickhouse.tech/docs/ru/operations/table_engines/mergetree/) <!--hide-->
diff --git a/docs/es/engines/table-engines/mergetree-family/replacingmergetree.md b/docs/es/engines/table-engines/mergetree-family/replacingmergetree.md
deleted file mode 100644
index a1e95c5b5f4..00000000000
--- a/docs/es/engines/table-engines/mergetree-family/replacingmergetree.md
+++ /dev/null
@@ -1,69 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 33
-toc_title: ReplacingMergeTree
----
-
-# ReplacingMergeTree {#replacingmergetree}
-
-El motor difiere de [Método de codificación de datos:](mergetree.md#table_engines-mergetree) en que elimina las entradas duplicadas con el mismo valor de clave principal (o más exactamente, con el mismo [clave de clasificación](mergetree.md) valor).
-
-La desduplicación de datos solo se produce durante una fusión. La fusión ocurre en segundo plano en un momento desconocido, por lo que no puede planificarla. Algunos de los datos pueden permanecer sin procesar. Aunque puede ejecutar una fusión no programada utilizando el `OPTIMIZE` consulta, no cuente con usarlo, porque el `OPTIMIZE` consulta leerá y escribirá una gran cantidad de datos.
-
-Así, `ReplacingMergeTree` es adecuado para borrar datos duplicados en segundo plano para ahorrar espacio, pero no garantiza la ausencia de duplicados.
-
-## Creación de una tabla {#creating-a-table}
-
-``` sql
-CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
-(
-    name1 [type1] [DEFAULT|MATERIALIZED|ALIAS expr1],
-    name2 [type2] [DEFAULT|MATERIALIZED|ALIAS expr2],
-    ...
-) ENGINE = ReplacingMergeTree([ver])
-[PARTITION BY expr]
-[ORDER BY expr]
-[PRIMARY KEY expr]
-[SAMPLE BY expr]
-[SETTINGS name=value, ...]
-```
-
-Para obtener una descripción de los parámetros de solicitud, consulte [descripción de la solicitud](../../../sql-reference/statements/create.md).
-
-**ReplacingMergeTree Parámetros**
-
--   `ver` — column with version. Type `UInt*`, `Date` o `DateTime`. Parámetro opcional.
-
-    Al fusionar, `ReplacingMergeTree` de todas las filas con la misma clave primaria deja solo una:
-
-    -   Último en la selección, si `ver` no establecido.
-    -   Con la versión máxima, si `ver` indicado.
-
-**Cláusulas de consulta**
-
-Al crear un `ReplacingMergeTree` mesa de la misma [clausula](mergetree.md) se requieren, como al crear un `MergeTree` tabla.
-
-<details markdown="1">
-
-<summary>Método obsoleto para crear una tabla</summary>
-
-!!! attention "Atención"
-    No use este método en proyectos nuevos y, si es posible, cambie los proyectos antiguos al método descrito anteriormente.
-
-``` sql
-CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
-(
-    name1 [type1] [DEFAULT|MATERIALIZED|ALIAS expr1],
-    name2 [type2] [DEFAULT|MATERIALIZED|ALIAS expr2],
-    ...
-) ENGINE [=] ReplacingMergeTree(date-column [, sampling_expression], (primary, key), index_granularity, [ver])
-```
-
-Todos los parámetros excepto `ver` el mismo significado que en `MergeTree`.
-
--   `ver` - columna con la versión. Parámetro opcional. Para una descripción, vea el texto anterior.
-
-</details>
-
-[Artículo Original](https://clickhouse.tech/docs/en/operations/table_engines/replacingmergetree/) <!--hide-->
diff --git a/docs/es/engines/table-engines/mergetree-family/replication.md b/docs/es/engines/table-engines/mergetree-family/replication.md
deleted file mode 100644
index 505f5223800..00000000000
--- a/docs/es/engines/table-engines/mergetree-family/replication.md
+++ /dev/null
@@ -1,218 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 31
-toc_title: "Replicaci\xF3n de datos"
----
-
-# Replicación de datos {#table_engines-replication}
-
-La replicación solo se admite para tablas de la familia MergeTree:
-
--   ReplicatedMergeTree
--   ReplicatedSummingMergeTree
--   ReplicatedReplacingMergeTree
--   ReplicatedAggregatingMergeTree
--   ReplicatedCollapsingMergeTree
--   ReplicatedVersionedCollapsingMergetree
--   ReplicatedGraphiteMergeTree
-
-La replicación funciona a nivel de una tabla individual, no de todo el servidor. Un servidor puede almacenar tablas replicadas y no replicadas al mismo tiempo.
-
-La replicación no depende de la fragmentación. Cada fragmento tiene su propia replicación independiente.
-
-Datos comprimidos para `INSERT` y `ALTER` se replica (para obtener más información, consulte la documentación para [ALTER](../../../sql-reference/statements/alter.md#query_language_queries_alter)).
-
-`CREATE`, `DROP`, `ATTACH`, `DETACH` y `RENAME` las consultas se ejecutan en un único servidor y no se replican:
-
--   El `CREATE TABLE` query crea una nueva tabla replicable en el servidor donde se ejecuta la consulta. Si esta tabla ya existe en otros servidores, agrega una nueva réplica.
--   El `DROP TABLE` query elimina la réplica ubicada en el servidor donde se ejecuta la consulta.
--   El `RENAME` query cambia el nombre de la tabla en una de las réplicas. En otras palabras, las tablas replicadas pueden tener diferentes nombres en diferentes réplicas.
-
-Uso de ClickHouse [Apache ZooKeeper](https://zookeeper.apache.org) para almacenar metainformación de réplicas. Utilice ZooKeeper versión 3.4.5 o posterior.
-
-Para utilizar la replicación, establezca los parámetros [Zookeeper](../../../operations/server-configuration-parameters/settings.md#server-settings_zookeeper) sección de configuración del servidor.
-
-!!! attention "Atención"
-    No descuides la configuración de seguridad. ClickHouse soporta el `digest` [Esquema de ACL](https://zookeeper.apache.org/doc/current/zookeeperProgrammers.html#sc_ZooKeeperAccessControl) del subsistema de seguridad ZooKeeper.
-
-Ejemplo de configuración de las direcciones del clúster ZooKeeper:
-
-``` xml
-<zookeeper>
-    <node index="1">
-        <host>example1</host>
-        <port>2181</port>
-    </node>
-    <node index="2">
-        <host>example2</host>
-        <port>2181</port>
-    </node>
-    <node index="3">
-        <host>example3</host>
-        <port>2181</port>
-    </node>
-</zookeeper>
-```
-
-Puede especificar cualquier clúster ZooKeeper existente y el sistema utilizará un directorio en él para sus propios datos (el directorio se especifica al crear una tabla replicable).
-
-Si ZooKeeper no está establecido en el archivo de configuración, no puede crear tablas replicadas y las tablas replicadas existentes serán de solo lectura.
-
-ZooKeeper no se utiliza en `SELECT` consultas porque la replicación no afecta al rendimiento de `SELECT` y las consultas se ejecutan tan rápido como lo hacen para las tablas no replicadas. Al consultar tablas replicadas distribuidas, el comportamiento de ClickHouse se controla mediante la configuración [max_replica_delay_for_distributed_queries](../../../operations/settings/settings.md#settings-max_replica_delay_for_distributed_queries) y [fallback_to_stale_replicas_for_distributed_queries](../../../operations/settings/settings.md#settings-fallback_to_stale_replicas_for_distributed_queries).
-
-Para cada `INSERT` consulta, aproximadamente diez entradas se agregan a ZooKeeper a través de varias transacciones. (Para ser más precisos, esto es para cada bloque de datos insertado; una consulta INSERT contiene un bloque o un bloque por `max_insert_block_size = 1048576` filas.) Esto conduce a latencias ligeramente más largas para `INSERT` en comparación con las tablas no replicadas. Pero si sigue las recomendaciones para insertar datos en lotes de no más de uno `INSERT` por segundo, no crea ningún problema. Todo el clúster ClickHouse utilizado para coordinar un clúster ZooKeeper tiene un total de varios cientos `INSERTs` por segundo. El rendimiento en las inserciones de datos (el número de filas por segundo) es tan alto como para los datos no replicados.
-
-Para clústeres muy grandes, puede usar diferentes clústeres de ZooKeeper para diferentes fragmentos. Sin embargo, esto no ha demostrado ser necesario en el Yandex.Clúster Metrica (aproximadamente 300 servidores).
-
-La replicación es asíncrona y multi-master. `INSERT` consultas (así como `ALTER`) se puede enviar a cualquier servidor disponible. Los datos se insertan en el servidor donde se ejecuta la consulta y, a continuación, se copian a los demás servidores. Debido a que es asincrónico, los datos insertados recientemente aparecen en las otras réplicas con cierta latencia. Si parte de las réplicas no está disponible, los datos se escriben cuando estén disponibles. Si hay una réplica disponible, la latencia es la cantidad de tiempo que tarda en transferir el bloque de datos comprimidos a través de la red.
-
-De forma predeterminada, una consulta INSERT espera la confirmación de la escritura de los datos de una sola réplica. Si los datos fue correctamente escrito a sólo una réplica y el servidor con esta réplica deja de existir, los datos almacenados se perderán. Para habilitar la confirmación de las escrituras de datos de varias réplicas, utilice `insert_quorum` opcion.
-
-Cada bloque de datos se escribe atómicamente. La consulta INSERT se divide en bloques hasta `max_insert_block_size = 1048576` filas. En otras palabras, si el `INSERT` consulta tiene menos de 1048576 filas, se hace atómicamente.
-
-Los bloques de datos se deduplican. Para varias escrituras del mismo bloque de datos (bloques de datos del mismo tamaño que contienen las mismas filas en el mismo orden), el bloque solo se escribe una vez. La razón de esto es en caso de fallas de red cuando la aplicación cliente no sabe si los datos se escribieron en la base de datos, por lo que `INSERT` consulta simplemente se puede repetir. No importa a qué réplica se enviaron los INSERT con datos idénticos. `INSERTs` son idempotentes. Los parámetros de desduplicación son controlados por [merge_tree](../../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-merge_tree) configuración del servidor.
-
-Durante la replicación, sólo los datos de origen que se van a insertar se transfieren a través de la red. La transformación de datos adicional (fusión) se coordina y se realiza en todas las réplicas de la misma manera. Esto minimiza el uso de la red, lo que significa que la replicación funciona bien cuando las réplicas residen en centros de datos diferentes. (Tenga en cuenta que la duplicación de datos en diferentes centros de datos es el objetivo principal de la replicación.)
-
-Puede tener cualquier número de réplicas de los mismos datos. El Yandex.Metrica utiliza doble replicación en producción. Cada servidor utiliza RAID-5 o RAID-6, y RAID-10 en algunos casos. Esta es una solución relativamente confiable y conveniente.
-
-El sistema supervisa la sincronicidad de los datos en las réplicas y puede recuperarse después de un fallo. La conmutación por error es automática (para pequeñas diferencias en los datos) o semiautomática (cuando los datos difieren demasiado, lo que puede indicar un error de configuración).
-
-## Creación de tablas replicadas {#creating-replicated-tables}
-
-El `Replicated` prefijo se agrega al nombre del motor de tabla. Por ejemplo:`ReplicatedMergeTree`.
-
-**Replicated\*MergeTree parámetros**
-
--   `zoo_path` — The path to the table in ZooKeeper.
--   `replica_name` — The replica name in ZooKeeper.
-
-Ejemplo:
-
-``` sql
-CREATE TABLE table_name
-(
-    EventDate DateTime,
-    CounterID UInt32,
-    UserID UInt32
-) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{layer}-{shard}/table_name', '{replica}')
-PARTITION BY toYYYYMM(EventDate)
-ORDER BY (CounterID, EventDate, intHash32(UserID))
-SAMPLE BY intHash32(UserID)
-```
-
-<details markdown="1">
-
-<summary>Ejemplo en sintaxis obsoleta</summary>
-
-``` sql
-CREATE TABLE table_name
-(
-    EventDate DateTime,
-    CounterID UInt32,
-    UserID UInt32
-) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{layer}-{shard}/table_name', '{replica}', EventDate, intHash32(UserID), (CounterID, EventDate, intHash32(UserID), EventTime), 8192)
-```
-
-</details>
-
-Como muestra el ejemplo, estos parámetros pueden contener sustituciones entre llaves. Los valores sustituidos se toman de la ‘macros’ sección del archivo de configuración. Ejemplo:
-
-``` xml
-<macros>
-    <layer>05</layer>
-    <shard>02</shard>
-    <replica>example05-02-1.yandex.ru</replica>
-</macros>
-```
-
-La ruta de acceso a la tabla en ZooKeeper debe ser única para cada tabla replicada. Las tablas en diferentes fragmentos deben tener rutas diferentes.
-En este caso, la ruta consta de las siguientes partes:
-
-`/clickhouse/tables/` es el prefijo común. Recomendamos usar exactamente este.
-
-`{layer}-{shard}` es el identificador de fragmento. En este ejemplo consta de dos partes, ya que el Yandex.Metrica clúster utiliza sharding de dos niveles. Para la mayoría de las tareas, puede dejar solo la sustitución {shard}, que se expandirá al identificador de fragmento.
-
-`table_name` es el nombre del nodo de la tabla en ZooKeeper. Es una buena idea hacerlo igual que el nombre de la tabla. Se define explícitamente, porque a diferencia del nombre de la tabla, no cambia después de una consulta RENAME.
-*HINT*: podría agregar un nombre de base de datos delante de `table_name` También. Nivel de Cifrado WEP `db_name.table_name`
-
-El nombre de réplica identifica diferentes réplicas de la misma tabla. Puede usar el nombre del servidor para esto, como en el ejemplo. El nombre solo tiene que ser único dentro de cada fragmento.
-
-Puede definir los parámetros explícitamente en lugar de utilizar sustituciones. Esto podría ser conveniente para probar y para configurar clústeres pequeños. Sin embargo, no puede usar consultas DDL distribuidas (`ON CLUSTER` en este caso.
-
-Cuando se trabaja con clústeres grandes, se recomienda utilizar sustituciones porque reducen la probabilidad de error.
-
-Ejecute el `CREATE TABLE` consulta en cada réplica. Esta consulta crea una nueva tabla replicada o agrega una nueva réplica a una existente.
-
-Si agrega una nueva réplica después de que la tabla ya contenga algunos datos en otras réplicas, los datos se copiarán de las otras réplicas a la nueva después de ejecutar la consulta. En otras palabras, la nueva réplica se sincroniza con las demás.
-
-Para eliminar una réplica, ejecute `DROP TABLE`. However, only one replica is deleted – the one that resides on the server where you run the query.
-
-## Recuperación después de fallos {#recovery-after-failures}
-
-Si ZooKeeper no está disponible cuando se inicia un servidor, las tablas replicadas cambian al modo de solo lectura. El sistema intenta conectarse periódicamente a ZooKeeper.
-
-Si ZooKeeper no está disponible durante un `INSERT`, o se produce un error al interactuar con ZooKeeper, se produce una excepción.
-
-Después de conectarse a ZooKeeper, el sistema comprueba si el conjunto de datos en el sistema de archivos local coincide con el conjunto de datos esperado (ZooKeeper almacena esta información). Si hay incoherencias menores, el sistema las resuelve sincronizando datos con las réplicas.
-
-Si el sistema detecta partes de datos rotas (con un tamaño incorrecto de archivos) o partes no reconocidas (partes escritas en el sistema de archivos pero no grabadas en ZooKeeper), las mueve al `detached` subdirectorio (no se eliminan). Las piezas que faltan se copian de las réplicas.
-
-Tenga en cuenta que ClickHouse no realiza ninguna acción destructiva, como eliminar automáticamente una gran cantidad de datos.
-
-Cuando el servidor se inicia (o establece una nueva sesión con ZooKeeper), solo verifica la cantidad y el tamaño de todos los archivos. Si los tamaños de los archivos coinciden pero los bytes se han cambiado en algún punto intermedio, esto no se detecta inmediatamente, sino solo cuando se intenta leer los datos `SELECT` consulta. La consulta produce una excepción sobre una suma de comprobación no coincidente o el tamaño de un bloque comprimido. En este caso, las partes de datos se agregan a la cola de verificación y se copian de las réplicas si es necesario.
-
-Si el conjunto local de datos difiere demasiado del esperado, se activa un mecanismo de seguridad. El servidor ingresa esto en el registro y se niega a iniciarse. La razón de esto es que este caso puede indicar un error de configuración, como si una réplica en un fragmento se configurara accidentalmente como una réplica en un fragmento diferente. Sin embargo, los umbrales para este mecanismo se establecen bastante bajos, y esta situación puede ocurrir durante la recuperación de falla normal. En este caso, los datos se restauran semiautomáticamente, mediante “pushing a button”.
-
-Para iniciar la recuperación, cree el nodo `/path_to_table/replica_name/flags/force_restore_data` en ZooKeeper con cualquier contenido, o ejecute el comando para restaurar todas las tablas replicadas:
-
-``` bash
-sudo -u clickhouse touch /var/lib/clickhouse/flags/force_restore_data
-```
-
-A continuación, reinicie el servidor. Al iniciar, el servidor elimina estos indicadores e inicia la recuperación.
-
-## Recuperación después de la pérdida completa de datos {#recovery-after-complete-data-loss}
-
-Si todos los datos y metadatos desaparecieron de uno de los servidores, siga estos pasos para la recuperación:
-
-1.  Instale ClickHouse en el servidor. Defina correctamente las sustituciones en el archivo de configuración que contiene el identificador de fragmento y las réplicas, si las usa.
-2.  Si tenía tablas no duplicadas que deben duplicarse manualmente en los servidores, copie sus datos desde una réplica (en el directorio `/var/lib/clickhouse/data/db_name/table_name/`).
-3.  Copiar definiciones de tablas ubicadas en `/var/lib/clickhouse/metadata/` de una réplica. Si un identificador de fragmento o réplica se define explícitamente en las definiciones de tabla, corríjalo para que corresponda a esta réplica. (Como alternativa, inicie el servidor y `ATTACH TABLE` consultas que deberían haber estado en el .sql archivos en `/var/lib/clickhouse/metadata/`.)
-4.  Para iniciar la recuperación, cree el nodo ZooKeeper `/path_to_table/replica_name/flags/force_restore_data` con cualquier contenido o ejecute el comando para restaurar todas las tablas replicadas: `sudo -u clickhouse touch /var/lib/clickhouse/flags/force_restore_data`
-
-Luego inicie el servidor (reinicie, si ya se está ejecutando). Los datos se descargarán de las réplicas.
-
-Una opción de recuperación alternativa es eliminar información sobre la réplica perdida de ZooKeeper (`/path_to_table/replica_name`), luego vuelva a crear la réplica como se describe en “[Creación de tablas replicadas](#creating-replicated-tables)”.
-
-No hay restricción en el ancho de banda de la red durante la recuperación. Tenga esto en cuenta si está restaurando muchas réplicas a la vez.
-
-## La conversión de MergeTree a ReplicatedMergeTree {#converting-from-mergetree-to-replicatedmergetree}
-
-Usamos el término `MergeTree` para referirse a todos los motores de mesa en el `MergeTree family`, lo mismo que para `ReplicatedMergeTree`.
-
-Si usted tenía un `MergeTree` tabla replicada manualmente, puede convertirla en una tabla replicada. Es posible que tenga que hacer esto si ya ha recopilado una gran cantidad de datos `MergeTree` y ahora desea habilitar la replicación.
-
-Si los datos difieren en varias réplicas, primero sincronícelos o elimínelos en todas las réplicas, excepto en una.
-
-Cambie el nombre de la tabla MergeTree existente y, a continuación, cree un `ReplicatedMergeTree` mesa con el antiguo nombre.
-Mueva los datos de la tabla antigua a la `detached` subdirectorio dentro del directorio con los nuevos datos de la tabla (`/var/lib/clickhouse/data/db_name/table_name/`).
-Luego ejecuta `ALTER TABLE ATTACH PARTITION` en una de las réplicas para agregar estas partes de datos al conjunto de trabajo.
-
-## La conversión de ReplicatedMergeTree a MergeTree {#converting-from-replicatedmergetree-to-mergetree}
-
-Cree una tabla MergeTree con un nombre diferente. Mueva todos los datos del directorio con el `ReplicatedMergeTree` datos de la tabla al directorio de datos de la nueva tabla. A continuación, elimine el `ReplicatedMergeTree` y reinicie el servidor.
-
-Si desea deshacerse de un `ReplicatedMergeTree` sin iniciar el servidor:
-
--   Eliminar el correspondiente `.sql` archivo en el directorio de metadatos (`/var/lib/clickhouse/metadata/`).
--   Eliminar la ruta correspondiente en ZooKeeper (`/path_to_table/replica_name`).
-
-Después de esto, puede iniciar el servidor, crear un `MergeTree` tabla, mueva los datos a su directorio y, a continuación, reinicie el servidor.
-
-## Recuperación cuando se pierden o se dañan los metadatos del clúster Zookeeper {#recovery-when-metadata-in-the-zookeeper-cluster-is-lost-or-damaged}
-
-Si los datos de ZooKeeper se perdieron o se dañaron, puede guardar los datos moviéndolos a una tabla no duplicada como se describió anteriormente.
-
-[Artículo Original](https://clickhouse.tech/docs/en/operations/table_engines/replication/) <!--hide-->
diff --git a/docs/es/engines/table-engines/mergetree-family/summingmergetree.md b/docs/es/engines/table-engines/mergetree-family/summingmergetree.md
deleted file mode 100644
index 3ae9a1515c0..00000000000
--- a/docs/es/engines/table-engines/mergetree-family/summingmergetree.md
+++ /dev/null
@@ -1,141 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 34
-toc_title: SummingMergeTree
----
-
-# SummingMergeTree {#summingmergetree}
-
-El motor hereda de [Método de codificación de datos:](mergetree.md#table_engines-mergetree). La diferencia es que al fusionar partes de datos para `SummingMergeTree` ClickHouse reemplaza todas las filas con la misma clave primaria (o más exactamente, con la misma [clave de clasificación](mergetree.md)) con una fila que contiene valores resumidos para las columnas con el tipo de datos numérico. Si la clave de ordenación está compuesta de manera que un solo valor de clave corresponde a un gran número de filas, esto reduce significativamente el volumen de almacenamiento y acelera la selección de datos.
-
-Recomendamos usar el motor junto con `MergeTree`. Almacenar datos completos en `MergeTree` mesa, y el uso `SummingMergeTree` para el almacenamiento de datos agregados, por ejemplo, al preparar informes. Tal enfoque evitará que pierda datos valiosos debido a una clave primaria compuesta incorrectamente.
-
-## Creación de una tabla {#creating-a-table}
-
-``` sql
-CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
-(
-    name1 [type1] [DEFAULT|MATERIALIZED|ALIAS expr1],
-    name2 [type2] [DEFAULT|MATERIALIZED|ALIAS expr2],
-    ...
-) ENGINE = SummingMergeTree([columns])
-[PARTITION BY expr]
-[ORDER BY expr]
-[SAMPLE BY expr]
-[SETTINGS name=value, ...]
-```
-
-Para obtener una descripción de los parámetros de solicitud, consulte [descripción de la solicitud](../../../sql-reference/statements/create.md).
-
-**Parámetros de SummingMergeTree**
-
--   `columns` - una tupla con los nombres de las columnas donde se resumirán los valores. Parámetro opcional.
-    Las columnas deben ser de tipo numérico y no deben estar en la clave principal.
-
-    Si `columns` no especificado, ClickHouse resume los valores de todas las columnas con un tipo de datos numérico que no están en la clave principal.
-
-**Cláusulas de consulta**
-
-Al crear un `SummingMergeTree` mesa de la misma [clausula](mergetree.md) se requieren, como al crear un `MergeTree` tabla.
-
-<details markdown="1">
-
-<summary>Método obsoleto para crear una tabla</summary>
-
-!!! attention "Atención"
-    No use este método en proyectos nuevos y, si es posible, cambie los proyectos antiguos al método descrito anteriormente.
-
-``` sql
-CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
-(
-    name1 [type1] [DEFAULT|MATERIALIZED|ALIAS expr1],
-    name2 [type2] [DEFAULT|MATERIALIZED|ALIAS expr2],
-    ...
-) ENGINE [=] SummingMergeTree(date-column [, sampling_expression], (primary, key), index_granularity, [columns])
-```
-
-Todos los parámetros excepto `columns` el mismo significado que en `MergeTree`.
-
--   `columns` — tuple with names of columns values of which will be summarized. Optional parameter. For a description, see the text above.
-
-</details>
-
-## Ejemplo de uso {#usage-example}
-
-Considere la siguiente tabla:
-
-``` sql
-CREATE TABLE summtt
-(
-    key UInt32,
-    value UInt32
-)
-ENGINE = SummingMergeTree()
-ORDER BY key
-```
-
-Insertar datos:
-
-``` sql
-INSERT INTO summtt Values(1,1),(1,2),(2,1)
-```
-
-ClickHouse puede sumar todas las filas no completamente ([ver abajo](#data-processing)), entonces usamos una función agregada `sum` y `GROUP BY` cláusula en la consulta.
-
-``` sql
-SELECT key, sum(value) FROM summtt GROUP BY key
-```
-
-``` text
-┌─key─┬─sum(value)─┐
-│   2 │          1 │
-│   1 │          3 │
-└─────┴────────────┘
-```
-
-## Procesamiento de datos {#data-processing}
-
-Cuando los datos se insertan en una tabla, se guardan tal cual. ClickHouse combina las partes insertadas de los datos periódicamente y esto es cuando las filas con la misma clave principal se suman y se reemplazan con una para cada parte resultante de los datos.
-
-ClickHouse can merge the data parts so that different resulting parts of data cat consist rows with the same primary key, i.e. the summation will be incomplete. Therefore (`SELECT`) una función agregada [resumir()](../../../sql-reference/aggregate-functions/reference.md#agg_function-sum) y `GROUP BY` cláusula se debe utilizar en una consulta como se describe en el ejemplo anterior.
-
-### Reglas comunes para la suma {#common-rules-for-summation}
-
-Se resumen los valores de las columnas con el tipo de datos numérico. El conjunto de columnas está definido por el parámetro `columns`.
-
-Si los valores eran 0 en todas las columnas para la suma, se elimina la fila.
-
-Si la columna no está en la clave principal y no se resume, se selecciona un valor arbitrario entre los existentes.
-
-Los valores no se resumen para las columnas de la clave principal.
-
-### La suma en las columnas de función agregada {#the-summation-in-the-aggregatefunction-columns}
-
-Para columnas de [Tipo AggregateFunction](../../../sql-reference/data-types/aggregatefunction.md) ClickHouse se comporta como [AgregaciónMergeTree](aggregatingmergetree.md) agregación del motor según la función.
-
-### Estructuras anidadas {#nested-structures}
-
-La tabla puede tener estructuras de datos anidadas que se procesan de una manera especial.
-
-Si el nombre de una tabla anidada termina con `Map` y contiene al menos dos columnas que cumplen los siguientes criterios:
-
--   la primera columna es numérica `(*Int*, Date, DateTime)` o una cadena `(String, FixedString)`, vamos a llamarlo `key`,
--   las otras columnas son aritméticas `(*Int*, Float32/64)`, vamos a llamarlo `(values...)`,
-
-entonces esta tabla anidada se interpreta como una asignación de `key => (values...)`, y al fusionar sus filas, los elementos de dos conjuntos de datos se fusionan por `key` con una suma de los correspondientes `(values...)`.
-
-Ejemplos:
-
-``` text
-[(1, 100)] + [(2, 150)] -> [(1, 100), (2, 150)]
-[(1, 100)] + [(1, 150)] -> [(1, 250)]
-[(1, 100)] + [(1, 150), (2, 150)] -> [(1, 250), (2, 150)]
-[(1, 100), (2, 150)] + [(1, -100)] -> [(2, 150)]
-```
-
-Al solicitar datos, utilice el [sumMap(clave, valor)](../../../sql-reference/aggregate-functions/reference.md) función para la agregación de `Map`.
-
-Para la estructura de datos anidados, no necesita especificar sus columnas en la tupla de columnas para la suma.
-
-[Artículo Original](https://clickhouse.tech/docs/en/operations/table_engines/summingmergetree/) <!--hide-->
diff --git a/docs/es/engines/table-engines/mergetree-family/versionedcollapsingmergetree.md b/docs/es/engines/table-engines/mergetree-family/versionedcollapsingmergetree.md
deleted file mode 100644
index d69bfe9440e..00000000000
--- a/docs/es/engines/table-engines/mergetree-family/versionedcollapsingmergetree.md
+++ /dev/null
@@ -1,238 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 37
-toc_title: VersionedCollapsingMergeTree
----
-
-# VersionedCollapsingMergeTree {#versionedcollapsingmergetree}
-
-Este motor:
-
--   Permite la escritura rápida de estados de objetos que cambian continuamente.
--   Elimina los estados de objetos antiguos en segundo plano. Esto reduce significativamente el volumen de almacenamiento.
-
-Vea la sección [Derrumbar](#table_engines_versionedcollapsingmergetree) para más detalles.
-
-El motor hereda de [Método de codificación de datos:](mergetree.md#table_engines-mergetree) y agrega la lógica para colapsar filas al algoritmo para fusionar partes de datos. `VersionedCollapsingMergeTree` tiene el mismo propósito que [ColapsarMergeTree](collapsingmergetree.md) pero usa un algoritmo de colapso diferente que permite insertar los datos en cualquier orden con múltiples hilos. En particular, el `Version` columna ayuda a contraer las filas correctamente, incluso si se insertan en el orden incorrecto. En contraste, `CollapsingMergeTree` sólo permite la inserción estrictamente consecutiva.
-
-## Creación de una tabla {#creating-a-table}
-
-``` sql
-CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
-(
-    name1 [type1] [DEFAULT|MATERIALIZED|ALIAS expr1],
-    name2 [type2] [DEFAULT|MATERIALIZED|ALIAS expr2],
-    ...
-) ENGINE = VersionedCollapsingMergeTree(sign, version)
-[PARTITION BY expr]
-[ORDER BY expr]
-[SAMPLE BY expr]
-[SETTINGS name=value, ...]
-```
-
-Para obtener una descripción de los parámetros de consulta, consulte [descripción de la consulta](../../../sql-reference/statements/create.md).
-
-**Parámetros del motor**
-
-``` sql
-VersionedCollapsingMergeTree(sign, version)
-```
-
--   `sign` — Name of the column with the type of row: `1` es una “state” fila, `-1` es una “cancel” fila.
-
-    El tipo de datos de columna debe ser `Int8`.
-
--   `version` — Name of the column with the version of the object state.
-
-    El tipo de datos de columna debe ser `UInt*`.
-
-**Cláusulas de consulta**
-
-Al crear un `VersionedCollapsingMergeTree` mesa, la misma [clausula](mergetree.md) se requieren como al crear un `MergeTree` tabla.
-
-<details markdown="1">
-
-<summary>Método obsoleto para crear una tabla</summary>
-
-!!! attention "Atención"
-    No utilice este método en nuevos proyectos. Si es posible, cambie los proyectos antiguos al método descrito anteriormente.
-
-``` sql
-CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
-(
-    name1 [type1] [DEFAULT|MATERIALIZED|ALIAS expr1],
-    name2 [type2] [DEFAULT|MATERIALIZED|ALIAS expr2],
-    ...
-) ENGINE [=] VersionedCollapsingMergeTree(date-column [, samp#table_engines_versionedcollapsingmergetreeling_expression], (primary, key), index_granularity, sign, version)
-```
-
-Todos los parámetros excepto `sign` y `version` el mismo significado que en `MergeTree`.
-
--   `sign` — Name of the column with the type of row: `1` es una “state” fila, `-1` es una “cancel” fila.
-
-    Column Data Type — `Int8`.
-
--   `version` — Name of the column with the version of the object state.
-
-    El tipo de datos de columna debe ser `UInt*`.
-
-</details>
-
-## Derrumbar {#table_engines_versionedcollapsingmergetree}
-
-### Datos {#data}
-
-Considere una situación en la que necesite guardar datos que cambien continuamente para algún objeto. Es razonable tener una fila para un objeto y actualizar la fila siempre que haya cambios. Sin embargo, la operación de actualización es costosa y lenta para un DBMS porque requiere volver a escribir los datos en el almacenamiento. La actualización no es aceptable si necesita escribir datos rápidamente, pero puede escribir los cambios en un objeto secuencialmente de la siguiente manera.
-
-Utilice el `Sign` columna al escribir la fila. Si `Sign = 1` significa que la fila es un estado de un objeto (llamémoslo el “state” fila). Si `Sign = -1` indica la cancelación del estado de un objeto con los mismos atributos (llamémoslo el “cancel” fila). También use el `Version` columna, que debe identificar cada estado de un objeto con un número separado.
-
-Por ejemplo, queremos calcular cuántas páginas visitaron los usuarios en algún sitio y cuánto tiempo estuvieron allí. En algún momento escribimos la siguiente fila con el estado de la actividad del usuario:
-
-``` text
-┌──────────────UserID─┬─PageViews─┬─Duration─┬─Sign─┬─Version─┐
-│ 4324182021466249494 │         5 │      146 │    1 │       1 |
-└─────────────────────┴───────────┴──────────┴──────┴─────────┘
-```
-
-En algún momento después registramos el cambio de actividad del usuario y lo escribimos con las siguientes dos filas.
-
-``` text
-┌──────────────UserID─┬─PageViews─┬─Duration─┬─Sign─┬─Version─┐
-│ 4324182021466249494 │         5 │      146 │   -1 │       1 |
-│ 4324182021466249494 │         6 │      185 │    1 │       2 |
-└─────────────────────┴───────────┴──────────┴──────┴─────────┘
-```
-
-La primera fila cancela el estado anterior del objeto (usuario). Debe copiar todos los campos del estado cancelado excepto `Sign`.
-
-La segunda fila contiene el estado actual.
-
-Debido a que solo necesitamos el último estado de actividad del usuario, las filas
-
-``` text
-┌──────────────UserID─┬─PageViews─┬─Duration─┬─Sign─┬─Version─┐
-│ 4324182021466249494 │         5 │      146 │    1 │       1 |
-│ 4324182021466249494 │         5 │      146 │   -1 │       1 |
-└─────────────────────┴───────────┴──────────┴──────┴─────────┘
-```
-
-se puede eliminar, colapsando el estado no válido (antiguo) del objeto. `VersionedCollapsingMergeTree` hace esto mientras fusiona las partes de datos.
-
-Para averiguar por qué necesitamos dos filas para cada cambio, vea [Algoritmo](#table_engines-versionedcollapsingmergetree-algorithm).
-
-**Notas sobre el uso**
-
-1.  El programa que escribe los datos debe recordar el estado de un objeto para cancelarlo. El “cancel” cadena debe ser una copia de la “state” con lo opuesto `Sign`. Esto aumenta el tamaño inicial de almacenamiento, pero permite escribir los datos rápidamente.
-2.  Las matrices de largo crecimiento en columnas reducen la eficiencia del motor debido a la carga para escribir. Cuanto más sencillos sean los datos, mejor será la eficiencia.
-3.  `SELECT` Los resultados dependen en gran medida de la coherencia del historial de cambios de objetos. Sea preciso al preparar los datos para insertarlos. Puede obtener resultados impredecibles con datos incoherentes, como valores negativos para métricas no negativas, como la profundidad de la sesión.
-
-### Algoritmo {#table_engines-versionedcollapsingmergetree-algorithm}
-
-Cuando ClickHouse combina partes de datos, elimina cada par de filas que tienen la misma clave principal y versión y diferentes `Sign`. El orden de las filas no importa.
-
-Cuando ClickHouse inserta datos, ordena filas por la clave principal. Si el `Version` la columna no está en la clave principal, ClickHouse la agrega a la clave principal implícitamente como el último campo y la usa para ordenar.
-
-## Selección de datos {#selecting-data}
-
-ClickHouse no garantiza que todas las filas con la misma clave principal estén en la misma parte de datos resultante o incluso en el mismo servidor físico. Esto es cierto tanto para escribir los datos como para la posterior fusión de las partes de datos. Además, ClickHouse procesa `SELECT` consultas con múltiples subprocesos, y no puede predecir el orden de las filas en el resultado. Esto significa que la agregación es necesaria si hay una necesidad de obtener completamente “collapsed” datos de un `VersionedCollapsingMergeTree` tabla.
-
-Para finalizar el colapso, escriba una consulta con un `GROUP BY` cláusula y funciones agregadas que representan el signo. Por ejemplo, para calcular la cantidad, use `sum(Sign)` en lugar de `count()`. Para calcular la suma de algo, use `sum(Sign * x)` en lugar de `sum(x)` y agregar `HAVING sum(Sign) > 0`.
-
-Los agregados `count`, `sum` y `avg` se puede calcular de esta manera. El agregado `uniq` se puede calcular si un objeto tiene al menos un estado no colapsado. Los agregados `min` y `max` no se puede calcular porque `VersionedCollapsingMergeTree` no guarda el historial de valores de estados colapsados.
-
-Si necesita extraer los datos con “collapsing” pero sin agregación (por ejemplo, para verificar si hay filas presentes cuyos valores más nuevos coinciden con ciertas condiciones), puede usar el `FINAL` modificador para el `FROM` clausula. Este enfoque es ineficiente y no debe usarse con tablas grandes.
-
-## Ejemplo de uso {#example-of-use}
-
-Datos de ejemplo:
-
-``` text
-┌──────────────UserID─┬─PageViews─┬─Duration─┬─Sign─┬─Version─┐
-│ 4324182021466249494 │         5 │      146 │    1 │       1 |
-│ 4324182021466249494 │         5 │      146 │   -1 │       1 |
-│ 4324182021466249494 │         6 │      185 │    1 │       2 |
-└─────────────────────┴───────────┴──────────┴──────┴─────────┘
-```
-
-Creación de la tabla:
-
-``` sql
-CREATE TABLE UAct
-(
-    UserID UInt64,
-    PageViews UInt8,
-    Duration UInt8,
-    Sign Int8,
-    Version UInt8
-)
-ENGINE = VersionedCollapsingMergeTree(Sign, Version)
-ORDER BY UserID
-```
-
-Insertar los datos:
-
-``` sql
-INSERT INTO UAct VALUES (4324182021466249494, 5, 146, 1, 1)
-```
-
-``` sql
-INSERT INTO UAct VALUES (4324182021466249494, 5, 146, -1, 1),(4324182021466249494, 6, 185, 1, 2)
-```
-
-Usamos dos `INSERT` consultas para crear dos partes de datos diferentes. Si insertamos los datos con una sola consulta, ClickHouse crea una parte de datos y nunca realizará ninguna fusión.
-
-Obtener los datos:
-
-``` sql
-SELECT * FROM UAct
-```
-
-``` text
-┌──────────────UserID─┬─PageViews─┬─Duration─┬─Sign─┬─Version─┐
-│ 4324182021466249494 │         5 │      146 │    1 │       1 │
-└─────────────────────┴───────────┴──────────┴──────┴─────────┘
-┌──────────────UserID─┬─PageViews─┬─Duration─┬─Sign─┬─Version─┐
-│ 4324182021466249494 │         5 │      146 │   -1 │       1 │
-│ 4324182021466249494 │         6 │      185 │    1 │       2 │
-└─────────────────────┴───────────┴──────────┴──────┴─────────┘
-```
-
-¿Qué vemos aquí y dónde están las partes colapsadas?
-Creamos dos partes de datos usando dos `INSERT` consulta. El `SELECT` la consulta se realizó en dos subprocesos, y el resultado es un orden aleatorio de filas.
-No se produjo el colapso porque las partes de datos aún no se han fusionado. ClickHouse fusiona partes de datos en un punto desconocido en el tiempo que no podemos predecir.
-
-Es por eso que necesitamos agregación:
-
-``` sql
-SELECT
-    UserID,
-    sum(PageViews * Sign) AS PageViews,
-    sum(Duration * Sign) AS Duration,
-    Version
-FROM UAct
-GROUP BY UserID, Version
-HAVING sum(Sign) > 0
-```
-
-``` text
-┌──────────────UserID─┬─PageViews─┬─Duration─┬─Version─┐
-│ 4324182021466249494 │         6 │      185 │       2 │
-└─────────────────────┴───────────┴──────────┴─────────┘
-```
-
-Si no necesitamos agregación y queremos forzar el colapso, podemos usar el `FINAL` modificador para el `FROM` clausula.
-
-``` sql
-SELECT * FROM UAct FINAL
-```
-
-``` text
-┌──────────────UserID─┬─PageViews─┬─Duration─┬─Sign─┬─Version─┐
-│ 4324182021466249494 │         6 │      185 │    1 │       2 │
-└─────────────────────┴───────────┴──────────┴──────┴─────────┘
-```
-
-Esta es una forma muy ineficiente de seleccionar datos. No lo use para mesas grandes.
-
-[Artículo Original](https://clickhouse.tech/docs/en/operations/table_engines/versionedcollapsingmergetree/) <!--hide-->
diff --git a/docs/es/engines/table-engines/special/buffer.md b/docs/es/engines/table-engines/special/buffer.md
deleted file mode 100644
index b3a26ff356a..00000000000
--- a/docs/es/engines/table-engines/special/buffer.md
+++ /dev/null
@@ -1,71 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 45
-toc_title: "B\xFAfer"
----
-
-# Búfer {#buffer}
-
-Almacena los datos para escribir en la memoria RAM, enjuagándolos periódicamente a otra tabla. Durante la operación de lectura, los datos se leen desde el búfer y la otra tabla simultáneamente.
-
-``` sql
-Buffer(database, table, num_layers, min_time, max_time, min_rows, max_rows, min_bytes, max_bytes)
-```
-
-Parámetros del motor:
-
--   `database` – Database name. Instead of the database name, you can use a constant expression that returns a string.
--   `table` – Table to flush data to.
--   `num_layers` – Parallelism layer. Physically, the table will be represented as `num_layers` de búferes independientes. Valor recomendado: 16.
--   `min_time`, `max_time`, `min_rows`, `max_rows`, `min_bytes`, y `max_bytes` – Conditions for flushing data from the buffer.
-
-Los datos se vacían del búfer y se escriben en la tabla de destino si `min*` condiciones o al menos una `max*` condición se cumplen.
-
--   `min_time`, `max_time` – Condition for the time in seconds from the moment of the first write to the buffer.
--   `min_rows`, `max_rows` – Condition for the number of rows in the buffer.
--   `min_bytes`, `max_bytes` – Condition for the number of bytes in the buffer.
-
-Durante la operación de escritura, los datos se insertan en un `num_layers` número de búferes aleatorios. O bien, si la parte de datos para insertar es lo suficientemente grande (mayor que `max_rows` o `max_bytes`), se escribe directamente en la tabla de destino, omitiendo el búfer.
-
-Las condiciones para el lavado de los datos se calculan por separado para cada uno de los `num_layers` búfer. Por ejemplo, si `num_layers = 16` y `max_bytes = 100000000`, el consumo máximo de RAM es de 1.6 GB.
-
-Ejemplo:
-
-``` sql
-CREATE TABLE merge.hits_buffer AS merge.hits ENGINE = Buffer(merge, hits, 16, 10, 100, 10000, 1000000, 10000000, 100000000)
-```
-
-Creación de un ‘merge.hits_buffer’ mesa con la misma estructura que ‘merge.hits’ y usando el motor Buffer. Al escribir en esta tabla, los datos se almacenan en la memoria RAM y ‘merge.hits’ tabla. Se crean 16 búferes. Los datos de cada uno de ellos se vacían si han pasado 100 segundos o se han escrito un millón de filas o se han escrito 100 MB de datos; o si simultáneamente han pasado 10 segundos y se han escrito 10.000 filas y 10 MB de datos. Por ejemplo, si solo se ha escrito una fila, después de 100 segundos se vaciará, pase lo que pase. Pero si se han escrito muchas filas, los datos se vaciarán antes.
-
-Cuando se detiene el servidor, con DROP TABLE o DETACH TABLE, los datos del búfer también se vacían a la tabla de destino.
-
-Puede establecer cadenas vacías entre comillas simples para la base de datos y el nombre de la tabla. Esto indica la ausencia de una tabla de destino. En este caso, cuando se alcanzan las condiciones de descarga de datos, el búfer simplemente se borra. Esto puede ser útil para mantener una ventana de datos en la memoria.
-
-Al leer desde una tabla de búfer, los datos se procesan tanto desde el búfer como desde la tabla de destino (si hay uno).
-Tenga en cuenta que las tablas Buffer no admiten un índice. En otras palabras, los datos del búfer se analizan por completo, lo que puede ser lento para los búferes grandes. (Para los datos de una tabla subordinada, se utilizará el índice que admite.)
-
-Si el conjunto de columnas de la tabla Buffer no coincide con el conjunto de columnas de una tabla subordinada, se inserta un subconjunto de columnas que existen en ambas tablas.
-
-Si los tipos no coinciden con una de las columnas de la tabla Búfer y una tabla subordinada, se escribe un mensaje de error en el registro del servidor y se borra el búfer.
-Lo mismo sucede si la tabla subordinada no existe cuando se vacía el búfer.
-
-Si necesita ejecutar ALTER para una tabla subordinada y la tabla de búfer, se recomienda eliminar primero la tabla de búfer, ejecutar ALTER para la tabla subordinada y, a continuación, crear la tabla de búfer de nuevo.
-
-Si el servidor se reinicia de forma anormal, se pierden los datos del búfer.
-
-FINAL y SAMPLE no funcionan correctamente para las tablas Buffer. Estas condiciones se pasan a la tabla de destino, pero no se utilizan para procesar datos en el búfer. Si se requieren estas características, recomendamos usar solo la tabla Buffer para escribir, mientras lee desde la tabla de destino.
-
-Al agregar datos a un búfer, uno de los búferes está bloqueado. Esto provoca retrasos si se realiza una operación de lectura simultáneamente desde la tabla.
-
-Los datos que se insertan en una tabla de búfer pueden terminar en la tabla subordinada en un orden diferente y en bloques diferentes. Debido a esto, una tabla Buffer es difícil de usar para escribir en un CollapsingMergeTree correctamente. Para evitar problemas, puede establecer ‘num_layers’ a 1.
-
-Si se replica la tabla de destino, se pierden algunas características esperadas de las tablas replicadas al escribir en una tabla de búfer. Los cambios aleatorios en el orden de las filas y los tamaños de las partes de datos hacen que la desduplicación de datos deje de funcionar, lo que significa que no es posible tener un ‘exactly once’ escribir en tablas replicadas.
-
-Debido a estas desventajas, solo podemos recomendar el uso de una tabla Buffer en casos raros.
-
-Una tabla de búfer se usa cuando se reciben demasiados INSERT de un gran número de servidores durante una unidad de tiempo y los datos no se pueden almacenar en búfer antes de la inserción, lo que significa que los INSERT no pueden ejecutarse lo suficientemente rápido.
-
-Tenga en cuenta que no tiene sentido insertar datos una fila a la vez, incluso para las tablas de búfer. Esto solo producirá una velocidad de unos pocos miles de filas por segundo, mientras que la inserción de bloques de datos más grandes puede producir más de un millón de filas por segundo (consulte la sección “Performance”).
-
-[Artículo Original](https://clickhouse.tech/docs/en/operations/table_engines/buffer/) <!--hide-->
diff --git a/docs/es/engines/table-engines/special/dictionary.md b/docs/es/engines/table-engines/special/dictionary.md
deleted file mode 100644
index 6d9136a6a23..00000000000
--- a/docs/es/engines/table-engines/special/dictionary.md
+++ /dev/null
@@ -1,97 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 35
-toc_title: Diccionario
----
-
-# Diccionario {#dictionary}
-
-El `Dictionary` el motor muestra el [diccionario](../../../sql-reference/dictionaries/external-dictionaries/external-dicts.md) datos como una tabla ClickHouse.
-
-Como ejemplo, considere un diccionario de `products` con la siguiente configuración:
-
-``` xml
-<dictionaries>
-<dictionary>
-        <name>products</name>
-        <source>
-            <odbc>
-                <table>products</table>
-                <connection_string>DSN=some-db-server</connection_string>
-            </odbc>
-        </source>
-        <lifetime>
-            <min>300</min>
-            <max>360</max>
-        </lifetime>
-        <layout>
-            <flat/>
-        </layout>
-        <structure>
-            <id>
-                <name>product_id</name>
-            </id>
-            <attribute>
-                <name>title</name>
-                <type>String</type>
-                <null_value></null_value>
-            </attribute>
-        </structure>
-</dictionary>
-</dictionaries>
-```
-
-Consultar los datos del diccionario:
-
-``` sql
-SELECT
-    name,
-    type,
-    key,
-    attribute.names,
-    attribute.types,
-    bytes_allocated,
-    element_count,
-    source
-FROM system.dictionaries
-WHERE name = 'products'
-```
-
-``` text
-┌─name─────┬─type─┬─key────┬─attribute.names─┬─attribute.types─┬─bytes_allocated─┬─element_count─┬─source──────────┐
-│ products │ Flat │ UInt64 │ ['title']       │ ['String']      │        23065376 │        175032 │ ODBC: .products │
-└──────────┴──────┴────────┴─────────────────┴─────────────────┴─────────────────┴───────────────┴─────────────────┘
-```
-
-Puede usar el [dictGet\*](../../../sql-reference/functions/ext-dict-functions.md#ext_dict_functions) función para obtener los datos del diccionario en este formato.
-
-Esta vista no es útil cuando necesita obtener datos sin procesar o cuando `JOIN` operación. Para estos casos, puede usar el `Dictionary` motor, que muestra los datos del diccionario en una tabla.
-
-Sintaxis:
-
-``` sql
-CREATE TABLE %table_name% (%fields%) engine = Dictionary(%dictionary_name%)`
-```
-
-Ejemplo de uso:
-
-``` sql
-create table products (product_id UInt64, title String) Engine = Dictionary(products);
-```
-
-      Ok
-
-Echa un vistazo a lo que hay en la mesa.
-
-``` sql
-select * from products limit 1;
-```
-
-``` text
-┌────product_id─┬─title───────────┐
-│        152689 │ Some item       │
-└───────────────┴─────────────────┘
-```
-
-[Artículo Original](https://clickhouse.tech/docs/en/operations/table_engines/dictionary/) <!--hide-->
diff --git a/docs/es/engines/table-engines/special/distributed.md b/docs/es/engines/table-engines/special/distributed.md
deleted file mode 100644
index bac407a651a..00000000000
--- a/docs/es/engines/table-engines/special/distributed.md
+++ /dev/null
@@ -1,152 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 33
-toc_title: Distribuido
----
-
-# Distribuido {#distributed}
-
-**Las tablas con motor distribuido no almacenan ningún dato por sí mismas**, pero permite el procesamiento de consultas distribuidas en varios servidores.
-La lectura se paralela automáticamente. Durante una lectura, se utilizan los índices de tabla en servidores remotos, si los hay.
-
-El motor distribuido acepta parámetros:
-
--   el nombre del clúster en el archivo de configuración del servidor
-
--   el nombre de una base de datos remota
-
--   el nombre de una tabla remota
-
--   (opcionalmente) clave de fragmentación
-
--   nombre de política (opcionalmente), se usará para almacenar archivos temporales para el envío asíncrono
-
-    Ver también:
-
-    -   `insert_distributed_sync` configuración
-    -   [Método de codificación de datos:](../mergetree-family/mergetree.md#table_engine-mergetree-multiple-volumes) para los ejemplos
-
-Ejemplo:
-
-``` sql
-Distributed(logs, default, hits[, sharding_key[, policy_name]])
-```
-
-Los datos se leerán desde todos los servidores ‘logs’ clúster, desde el valor predeterminado.tabla de éxitos ubicada en cada servidor del clúster.
-Los datos no solo se leen sino que se procesan parcialmente en los servidores remotos (en la medida en que esto sea posible).
-Por ejemplo, para una consulta con GROUP BY, los datos se agregarán en servidores remotos y los estados intermedios de las funciones agregadas se enviarán al servidor solicitante. Luego, los datos se agregarán más.
-
-En lugar del nombre de la base de datos, puede usar una expresión constante que devuelva una cadena. Por ejemplo: currentDatabase().
-
-logs – The cluster name in the server's config file.
-
-Los clústeres se establecen así:
-
-``` xml
-<remote_servers>
-    <logs>
-        <shard>
-            <!-- Optional. Shard weight when writing data. Default: 1. -->
-            <weight>1</weight>
-            <!-- Optional. Whether to write data to just one of the replicas. Default: false (write data to all replicas). -->
-            <internal_replication>false</internal_replication>
-            <replica>
-                <host>example01-01-1</host>
-                <port>9000</port>
-            </replica>
-            <replica>
-                <host>example01-01-2</host>
-                <port>9000</port>
-            </replica>
-        </shard>
-        <shard>
-            <weight>2</weight>
-            <internal_replication>false</internal_replication>
-            <replica>
-                <host>example01-02-1</host>
-                <port>9000</port>
-            </replica>
-            <replica>
-                <host>example01-02-2</host>
-                <secure>1</secure>
-                <port>9440</port>
-            </replica>
-        </shard>
-    </logs>
-</remote_servers>
-```
-
-Aquí se define un clúster con el nombre ‘logs’ que consta de dos fragmentos, cada uno de los cuales contiene dos réplicas.
-Los fragmentos se refieren a los servidores que contienen diferentes partes de los datos (para leer todos los datos, debe acceder a todos los fragmentos).
-Las réplicas están duplicando servidores (para leer todos los datos, puede acceder a los datos en cualquiera de las réplicas).
-
-Los nombres de clúster no deben contener puntos.
-
-Los parámetros `host`, `port`, y opcionalmente `user`, `password`, `secure`, `compression` se especifican para cada servidor:
-- `host` – The address of the remote server. You can use either the domain or the IPv4 or IPv6 address. If you specify the domain, the server makes a DNS request when it starts, and the result is stored as long as the server is running. If the DNS request fails, the server doesn't start. If you change the DNS record, restart the server.
-- `port` – The TCP port for messenger activity (‘tcp_port’ en la configuración, generalmente establecido en 9000). No lo confundas con http_port.
-- `user` – Name of the user for connecting to a remote server. Default value: default. This user must have access to connect to the specified server. Access is configured in the users.xml file. For more information, see the section [Derechos de acceso](../../../operations/access-rights.md).
-- `password` – The password for connecting to a remote server (not masked). Default value: empty string.
-- `secure` - Use ssl para la conexión, por lo general también debe definir `port` = 9440. El servidor debe escuchar en `<tcp_port_secure>9440</tcp_port_secure>` y tener certificados correctos.
-- `compression` - Utilice la compresión de datos. Valor predeterminado: true.
-
-When specifying replicas, one of the available replicas will be selected for each of the shards when reading. You can configure the algorithm for load balancing (the preference for which replica to access) – see the [load_balancing](../../../operations/settings/settings.md#settings-load_balancing) configuración.
-Si no se establece la conexión con el servidor, habrá un intento de conectarse con un breve tiempo de espera. Si la conexión falla, se seleccionará la siguiente réplica, y así sucesivamente para todas las réplicas. Si el intento de conexión falló para todas las réplicas, el intento se repetirá de la misma manera, varias veces.
-Esto funciona a favor de la resiliencia, pero no proporciona una tolerancia completa a errores: un servidor remoto podría aceptar la conexión, pero podría no funcionar o funcionar mal.
-
-Puede especificar solo uno de los fragmentos (en este caso, el procesamiento de consultas debe denominarse remoto, en lugar de distribuido) o hasta cualquier número de fragmentos. En cada fragmento, puede especificar entre una y cualquier número de réplicas. Puede especificar un número diferente de réplicas para cada fragmento.
-
-Puede especificar tantos clústeres como desee en la configuración.
-
-Para ver los clústeres, utilice el ‘system.clusters’ tabla.
-
-El motor distribuido permite trabajar con un clúster como un servidor local. Sin embargo, el clúster es inextensible: debe escribir su configuración en el archivo de configuración del servidor (mejor aún, para todos los servidores del clúster).
-
-The Distributed engine requires writing clusters to the config file. Clusters from the config file are updated on the fly, without restarting the server. If you need to send a query to an unknown set of shards and replicas each time, you don't need to create a Distributed table – use the ‘remote’ función de tabla en su lugar. Vea la sección [Funciones de tabla](../../../sql-reference/table-functions/index.md).
-
-Hay dos métodos para escribir datos en un clúster:
-
-Primero, puede definir a qué servidores escribir en qué datos y realizar la escritura directamente en cada fragmento. En otras palabras, realice INSERT en las tablas que la tabla distribuida “looks at”. Esta es la solución más flexible, ya que puede usar cualquier esquema de fragmentación, que podría ser no trivial debido a los requisitos del área temática. Esta es también la solución más óptima ya que los datos se pueden escribir en diferentes fragmentos de forma completamente independiente.
-
-En segundo lugar, puede realizar INSERT en una tabla distribuida. En este caso, la tabla distribuirá los datos insertados a través de los propios servidores. Para escribir en una tabla distribuida, debe tener un conjunto de claves de fragmentación (el último parámetro). Además, si solo hay un fragmento, la operación de escritura funciona sin especificar la clave de fragmentación, ya que no significa nada en este caso.
-
-Cada fragmento puede tener un peso definido en el archivo de configuración. Por defecto, el peso es igual a uno. Los datos se distribuyen entre fragmentos en la cantidad proporcional al peso del fragmento. Por ejemplo, si hay dos fragmentos y el primero tiene un peso de 9 mientras que el segundo tiene un peso de 10, el primero se enviará 9 / 19 partes de las filas, y el segundo se enviará 10 / 19.
-
-Cada fragmento puede tener el ‘internal_replication’ parámetro definido en el archivo de configuración.
-
-Si este parámetro se establece en ‘true’, la operación de escritura selecciona la primera réplica en buen estado y escribe datos en ella. Utilice esta alternativa si la tabla Distribuida “looks at” tablas replicadas. En otras palabras, si la tabla donde se escribirán los datos los replicará por sí misma.
-
-Si se establece en ‘false’ (el valor predeterminado), los datos se escriben en todas las réplicas. En esencia, esto significa que la tabla distribuida replica los datos en sí. Esto es peor que usar tablas replicadas, porque no se verifica la consistencia de las réplicas y, con el tiempo, contendrán datos ligeramente diferentes.
-
-Para seleccionar el fragmento al que se envía una fila de datos, se analiza la expresión de fragmentación y su resto se toma de dividirlo por el peso total de los fragmentos. La fila se envía al fragmento que corresponde al medio intervalo de los restos de ‘prev_weight’ a ‘prev_weights + weight’, donde ‘prev_weights’ es el peso total de los fragmentos con el número más pequeño, y ‘weight’ es el peso de este fragmento. Por ejemplo, si hay dos fragmentos, y el primero tiene un peso de 9 mientras que el segundo tiene un peso de 10, la fila se enviará al primer fragmento para los restos del rango \[0, 9), y al segundo para los restos del rango \[9, 19).
-
-La expresión de fragmentación puede ser cualquier expresión de constantes y columnas de tabla que devuelva un entero. Por ejemplo, puede usar la expresión ‘rand()’ para la distribución aleatoria de datos, o ‘UserID’ para la distribución por el resto de dividir la ID del usuario (entonces los datos de un solo usuario residirán en un solo fragmento, lo que simplifica la ejecución de IN y JOIN por los usuarios). Si una de las columnas no se distribuye lo suficientemente uniformemente, puede envolverla en una función hash: intHash64(UserID) .
-
-Un simple recordatorio de la división es una solución limitada para sharding y no siempre es apropiado. Funciona para volúmenes medianos y grandes de datos (docenas de servidores), pero no para volúmenes muy grandes de datos (cientos de servidores o más). En este último caso, use el esquema de fragmentación requerido por el área asunto, en lugar de usar entradas en Tablas distribuidas.
-
-SELECT queries are sent to all the shards and work regardless of how data is distributed across the shards (they can be distributed completely randomly). When you add a new shard, you don't have to transfer the old data to it. You can write new data with a heavier weight – the data will be distributed slightly unevenly, but queries will work correctly and efficiently.
-
-Debería preocuparse por el esquema de fragmentación en los siguientes casos:
-
--   Se utilizan consultas que requieren unir datos (IN o JOIN) mediante una clave específica. Si esta clave fragmenta datos, puede usar IN local o JOIN en lugar de GLOBAL IN o GLOBAL JOIN, que es mucho más eficiente.
--   Se usa una gran cantidad de servidores (cientos o más) con una gran cantidad de consultas pequeñas (consultas de clientes individuales: sitios web, anunciantes o socios). Para que las pequeñas consultas no afecten a todo el clúster, tiene sentido ubicar datos para un solo cliente en un solo fragmento. Alternativamente, como lo hemos hecho en Yandex.Metrica, puede configurar sharding de dos niveles: divida todo el clúster en “layers”, donde una capa puede consistir en varios fragmentos. Los datos de un único cliente se encuentran en una sola capa, pero los fragmentos se pueden agregar a una capa según sea necesario y los datos se distribuyen aleatoriamente dentro de ellos. Las tablas distribuidas se crean para cada capa y se crea una única tabla distribuida compartida para consultas globales.
-
-Los datos se escriben de forma asíncrona. Cuando se inserta en la tabla, el bloque de datos se acaba de escribir en el sistema de archivos local. Los datos se envían a los servidores remotos en segundo plano tan pronto como sea posible. El período de envío de datos está gestionado por el [Distributed_directory_monitor_sleep_time_ms](../../../operations/settings/settings.md#distributed_directory_monitor_sleep_time_ms) y [Distributed_directory_monitor_max_sleep_time_ms](../../../operations/settings/settings.md#distributed_directory_monitor_max_sleep_time_ms) configuración. El `Distributed` el motor envía cada archivo con datos insertados por separado, pero puede habilitar el envío por lotes de archivos [distributed_directory_monitor_batch_inserts](../../../operations/settings/settings.md#distributed_directory_monitor_batch_inserts) configuración. Esta configuración mejora el rendimiento del clúster al utilizar mejor los recursos de red y servidor local. Debe comprobar si los datos se envían correctamente comprobando la lista de archivos (datos en espera de ser enviados) en el directorio de la tabla: `/var/lib/clickhouse/data/database/table/`.
-
-Si el servidor dejó de existir o tuvo un reinicio aproximado (por ejemplo, después de un error de dispositivo) después de un INSERT en una tabla distribuida, es posible que se pierdan los datos insertados. Si se detecta un elemento de datos dañado en el directorio de la tabla, se transfiere al ‘broken’ subdirectorio y ya no se utiliza.
-
-Cuando la opción max_parallel_replicas está habilitada, el procesamiento de consultas se paralela en todas las réplicas dentro de un solo fragmento. Para obtener más información, consulte la sección [max_parallel_replicas](../../../operations/settings/settings.md#settings-max_parallel_replicas).
-
-## Virtual Columnas {#virtual-columns}
-
--   `_shard_num` — Contains the `shard_num` (de `system.clusters`). Tipo: [UInt32](../../../sql-reference/data-types/int-uint.md).
-
-!!! note "Nota"
-    Ya [`remote`](../../../sql-reference/table-functions/remote.md)/`cluster` funciones de tabla crean internamente instancia temporal del mismo motor distribuido, `_shard_num` está disponible allí también.
-
-**Ver también**
-
--   [Virtual columnas](index.md#table_engines-virtual_columns)
-
-[Artículo Original](https://clickhouse.tech/docs/en/operations/table_engines/distributed/) <!--hide-->
diff --git a/docs/es/engines/table-engines/special/external-data.md b/docs/es/engines/table-engines/special/external-data.md
deleted file mode 100644
index f2ce4abbb0f..00000000000
--- a/docs/es/engines/table-engines/special/external-data.md
+++ /dev/null
@@ -1,68 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 34
-toc_title: Datos externos
----
-
-# Datos externos para el procesamiento de consultas {#external-data-for-query-processing}
-
-ClickHouse permite enviar a un servidor los datos necesarios para procesar una consulta, junto con una consulta SELECT. Estos datos se colocan en una tabla temporal (consulte la sección “Temporary tables”) y se puede utilizar en la consulta (por ejemplo, en operadores IN).
-
-Por ejemplo, si tiene un archivo de texto con identificadores de usuario importantes, puede cargarlo en el servidor junto con una consulta que utilice la filtración de esta lista.
-
-Si necesita ejecutar más de una consulta con un gran volumen de datos externos, no utilice esta función. Es mejor cargar los datos a la base de datos con anticipación.
-
-Los datos externos se pueden cargar mediante el cliente de línea de comandos (en modo no interactivo) o mediante la interfaz HTTP.
-
-En el cliente de línea de comandos, puede especificar una sección de parámetros en el formato
-
-``` bash
---external --file=... [--name=...] [--format=...] [--types=...|--structure=...]
-```
-
-Puede tener varias secciones como esta, para el número de tablas que se transmiten.
-
-**–external** – Marks the beginning of a clause.
-**–file** – Path to the file with the table dump, or -, which refers to stdin.
-Solo se puede recuperar una sola tabla de stdin.
-
-Los siguientes parámetros son opcionales: **–name**– Name of the table. If omitted, _data is used.
-**–format** – Data format in the file. If omitted, TabSeparated is used.
-
-Se requiere uno de los siguientes parámetros:**–types** – A list of comma-separated column types. For example: `UInt64,String`. The columns will be named _1, _2, …
-**–structure**– The table structure in the format`UserID UInt64`, `URL String`. Define los nombres y tipos de columna.
-
-Los archivos especificados en ‘file’ se analizará mediante el formato especificado en ‘format’ utilizando los tipos de datos especificados en ‘types’ o ‘structure’. La mesa será cargado en el servidor y accesibles, como una tabla temporal con el nombre de ‘name’.
-
-Ejemplos:
-
-``` bash
-$ echo -ne "1\n2\n3\n" | clickhouse-client --query="SELECT count() FROM test.visits WHERE TraficSourceID IN _data" --external --file=- --types=Int8
-849897
-$ cat /etc/passwd | sed 's/:/\t/g' | clickhouse-client --query="SELECT shell, count() AS c FROM passwd GROUP BY shell ORDER BY c DESC" --external --file=- --name=passwd --structure='login String, unused String, uid UInt16, gid UInt16, comment String, home String, shell String'
-/bin/sh 20
-/bin/false      5
-/bin/bash       4
-/usr/sbin/nologin       1
-/bin/sync       1
-```
-
-Cuando se utiliza la interfaz HTTP, los datos externos se pasan en el formato multipart/form-data. Cada tabla se transmite como un archivo separado. El nombre de la tabla se toma del nombre del archivo. El ‘query_string’ se pasa los parámetros ‘name_format’, ‘name_types’, y ‘name_structure’, donde ‘name’ es el nombre de la tabla a la que corresponden estos parámetros. El significado de los parámetros es el mismo que cuando se usa el cliente de línea de comandos.
-
-Ejemplo:
-
-``` bash
-$ cat /etc/passwd | sed 's/:/\t/g' > passwd.tsv
-
-$ curl -F 'passwd=@passwd.tsv;' 'http://localhost:8123/?query=SELECT+shell,+count()+AS+c+FROM+passwd+GROUP+BY+shell+ORDER+BY+c+DESC&passwd_structure=login+String,+unused+String,+uid+UInt16,+gid+UInt16,+comment+String,+home+String,+shell+String'
-/bin/sh 20
-/bin/false      5
-/bin/bash       4
-/usr/sbin/nologin       1
-/bin/sync       1
-```
-
-Para el procesamiento de consultas distribuidas, las tablas temporales se envían a todos los servidores remotos.
-
-[Artículo Original](https://clickhouse.tech/docs/en/operations/table_engines/external_data/) <!--hide-->
diff --git a/docs/es/engines/table-engines/special/file.md b/docs/es/engines/table-engines/special/file.md
deleted file mode 100644
index fb739506a22..00000000000
--- a/docs/es/engines/table-engines/special/file.md
+++ /dev/null
@@ -1,90 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 37
-toc_title: File
----
-
-# File {#table_engines-file}
-
-El motor de tabla de archivos mantiene los datos en un archivo en uno de los [file
-formato](../../../interfaces/formats.md#formats) (TabSeparated, Native, etc.).
-
-Ejemplos de uso:
-
--   Exportación de datos de ClickHouse a archivo.
--   Convertir datos de un formato a otro.
--   Actualización de datos en ClickHouse mediante la edición de un archivo en un disco.
-
-## Uso en el servidor ClickHouse {#usage-in-clickhouse-server}
-
-``` sql
-File(Format)
-```
-
-El `Format` parámetro especifica uno de los formatos de archivo disponibles. Realizar
-`SELECT` consultas, el formato debe ser compatible para la entrada, y para realizar
-`INSERT` queries – for output. The available formats are listed in the
-[Formato](../../../interfaces/formats.md#formats) apartado.
-
-ClickHouse no permite especificar la ruta del sistema de archivos para`File`. Utilizará la carpeta definida por [camino](../../../operations/server-configuration-parameters/settings.md) configuración en la configuración del servidor.
-
-Al crear una tabla usando `File(Format)` crea un subdirectorio vacío en esa carpeta. Cuando los datos se escriben en esa tabla, se colocan en `data.Format` en ese subdirectorio.
-
-Puede crear manualmente esta subcarpeta y archivo en el sistema de archivos del servidor y luego [ATTACH](../../../sql-reference/statements/misc.md) para mostrar información con el nombre coincidente, para que pueda consultar datos desde ese archivo.
-
-!!! warning "Advertencia"
-    Tenga cuidado con esta funcionalidad, ya que ClickHouse no realiza un seguimiento de los cambios externos en dichos archivos. El resultado de las escrituras simultáneas a través de ClickHouse y fuera de ClickHouse no está definido.
-
-**Ejemplo:**
-
-**1.** Configurar el `file_engine_table` tabla:
-
-``` sql
-CREATE TABLE file_engine_table (name String, value UInt32) ENGINE=File(TabSeparated)
-```
-
-Por defecto, ClickHouse creará una carpeta `/var/lib/clickhouse/data/default/file_engine_table`.
-
-**2.** Crear manualmente `/var/lib/clickhouse/data/default/file_engine_table/data.TabSeparated` contener:
-
-``` bash
-$ cat data.TabSeparated
-one 1
-two 2
-```
-
-**3.** Consultar los datos:
-
-``` sql
-SELECT * FROM file_engine_table
-```
-
-``` text
-┌─name─┬─value─┐
-│ one  │     1 │
-│ two  │     2 │
-└──────┴───────┘
-```
-
-## Uso en ClickHouse-local {#usage-in-clickhouse-local}
-
-En [Sistema abierto.](../../../operations/utilities/clickhouse-local.md#clickhouse-local) El motor de archivos acepta la ruta del archivo además de `Format`. Los flujos de entrada / salida predeterminados se pueden especificar utilizando nombres numéricos o legibles por humanos como `0` o `stdin`, `1` o `stdout`.
-**Ejemplo:**
-
-``` bash
-$ echo -e "1,2\n3,4" | clickhouse-local -q "CREATE TABLE table (a Int64, b Int64) ENGINE = File(CSV, stdin); SELECT a, b FROM table; DROP TABLE table"
-```
-
-## Detalles de la implementación {#details-of-implementation}
-
--   Multiple `SELECT` las consultas se pueden realizar simultáneamente, pero `INSERT` las consultas se esperarán entre sí.
--   Apoyado la creación de nuevos archivos por `INSERT` consulta.
--   Si el archivo existe, `INSERT` añadiría nuevos valores en él.
--   No soportado:
-    -   `ALTER`
-    -   `SELECT ... SAMPLE`
-    -   Indice
-    -   Replicación
-
-[Artículo Original](https://clickhouse.tech/docs/en/operations/table_engines/file/) <!--hide-->
diff --git a/docs/es/engines/table-engines/special/generate.md b/docs/es/engines/table-engines/special/generate.md
deleted file mode 100644
index 67e664284b4..00000000000
--- a/docs/es/engines/table-engines/special/generate.md
+++ /dev/null
@@ -1,61 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 46
-toc_title: GenerateRandom
----
-
-# Generaterandom {#table_engines-generate}
-
-El motor de tabla GenerateRandom produce datos aleatorios para el esquema de tabla determinado.
-
-Ejemplos de uso:
-
--   Se usa en la prueba para poblar una tabla grande reproducible.
--   Generar entrada aleatoria para pruebas de fuzzing.
-
-## Uso en el servidor ClickHouse {#usage-in-clickhouse-server}
-
-``` sql
-ENGINE = GenerateRandom(random_seed, max_string_length, max_array_length)
-```
-
-El `max_array_length` y `max_string_length` parámetros especifican la longitud máxima de todos
-columnas y cadenas de matriz correspondientemente en los datos generados.
-
-Generar motor de tabla sólo admite `SELECT` consulta.
-
-Es compatible con todos [Tipos de datos](../../../sql-reference/data-types/index.md) que se pueden almacenar en una tabla excepto `LowCardinality` y `AggregateFunction`.
-
-**Ejemplo:**
-
-**1.** Configurar el `generate_engine_table` tabla:
-
-``` sql
-CREATE TABLE generate_engine_table (name String, value UInt32) ENGINE = GenerateRandom(1, 5, 3)
-```
-
-**2.** Consultar los datos:
-
-``` sql
-SELECT * FROM generate_engine_table LIMIT 3
-```
-
-``` text
-┌─name─┬──────value─┐
-│ c4xJ │ 1412771199 │
-│ r    │ 1791099446 │
-│ 7#$  │  124312908 │
-└──────┴────────────┘
-```
-
-## Detalles de la implementación {#details-of-implementation}
-
--   No soportado:
-    -   `ALTER`
-    -   `SELECT ... SAMPLE`
-    -   `INSERT`
-    -   Indice
-    -   Replicación
-
-[Artículo Original](https://clickhouse.tech/docs/en/operations/table_engines/generate/) <!--hide-->
diff --git a/docs/es/engines/table-engines/special/index.md b/docs/es/engines/table-engines/special/index.md
deleted file mode 100644
index 9927a1f61d9..00000000000
--- a/docs/es/engines/table-engines/special/index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: Especial
-toc_priority: 31
----
-
-
diff --git a/docs/es/engines/table-engines/special/join.md b/docs/es/engines/table-engines/special/join.md
deleted file mode 100644
index 83e21b7c8cc..00000000000
--- a/docs/es/engines/table-engines/special/join.md
+++ /dev/null
@@ -1,111 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 40
-toc_title: Unir
----
-
-# Unir {#join}
-
-Estructura de datos preparada para usar en [JOIN](../../../sql-reference/statements/select/join.md#select-join) operación.
-
-## Creación de una tabla {#creating-a-table}
-
-``` sql
-CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
-(
-    name1 [type1] [DEFAULT|MATERIALIZED|ALIAS expr1] [TTL expr1],
-    name2 [type2] [DEFAULT|MATERIALIZED|ALIAS expr2] [TTL expr2],
-) ENGINE = Join(join_strictness, join_type, k1[, k2, ...])
-```
-
-Vea la descripción detallada del [CREATE TABLE](../../../sql-reference/statements/create.md#create-table-query) consulta.
-
-**Parámetros del motor**
-
--   `join_strictness` – [ÚNETE a la rigurosidad](../../../sql-reference/statements/select/join.md#select-join-types).
--   `join_type` – [Tipo de unión](../../../sql-reference/statements/select/join.md#select-join-types).
--   `k1[, k2, ...]` – Key columns from the `USING` cláusula que el `JOIN` operación se hace con.
-
-Entrar `join_strictness` y `join_type` parámetros sin comillas, por ejemplo, `Join(ANY, LEFT, col1)`. Deben coincidir con el `JOIN` operación para la que se utilizará la tabla. Si los parámetros no coinciden, ClickHouse no lanza una excepción y puede devolver datos incorrectos.
-
-## Uso de la tabla {#table-usage}
-
-### Ejemplo {#example}
-
-Creación de la tabla del lado izquierdo:
-
-``` sql
-CREATE TABLE id_val(`id` UInt32, `val` UInt32) ENGINE = TinyLog
-```
-
-``` sql
-INSERT INTO id_val VALUES (1,11)(2,12)(3,13)
-```
-
-Creando el lado derecho `Join` tabla:
-
-``` sql
-CREATE TABLE id_val_join(`id` UInt32, `val` UInt8) ENGINE = Join(ANY, LEFT, id)
-```
-
-``` sql
-INSERT INTO id_val_join VALUES (1,21)(1,22)(3,23)
-```
-
-Unirse a las tablas:
-
-``` sql
-SELECT * FROM id_val ANY LEFT JOIN id_val_join USING (id) SETTINGS join_use_nulls = 1
-```
-
-``` text
-┌─id─┬─val─┬─id_val_join.val─┐
-│  1 │  11 │              21 │
-│  2 │  12 │            ᴺᵁᴸᴸ │
-│  3 │  13 │              23 │
-└────┴─────┴─────────────────┘
-```
-
-Como alternativa, puede recuperar datos del `Join` tabla, especificando el valor de la clave de unión:
-
-``` sql
-SELECT joinGet('id_val_join', 'val', toUInt32(1))
-```
-
-``` text
-┌─joinGet('id_val_join', 'val', toUInt32(1))─┐
-│                                         21 │
-└────────────────────────────────────────────┘
-```
-
-### Selección e inserción de datos {#selecting-and-inserting-data}
-
-Usted puede utilizar `INSERT` consultas para agregar datos al `Join`-mesas de motor. Si la tabla se creó con el `ANY` estricta, se ignoran los datos de las claves duplicadas. Con el `ALL` estricta, se agregan todas las filas.
-
-No se puede realizar una `SELECT` consulta directamente desde la tabla. En su lugar, use uno de los siguientes métodos:
-
--   Coloque la mesa hacia el lado derecho en un `JOIN` clausula.
--   Llame al [joinGet](../../../sql-reference/functions/other-functions.md#joinget) función, que le permite extraer datos de la tabla de la misma manera que de un diccionario.
-
-### Limitaciones y ajustes {#join-limitations-and-settings}
-
-Al crear una tabla, se aplican los siguientes valores:
-
--   [Sistema abierto.](../../../operations/settings/settings.md#join_use_nulls)
--   [Método de codificación de datos:](../../../operations/settings/query-complexity.md#settings-max_rows_in_join)
--   [Método de codificación de datos:](../../../operations/settings/query-complexity.md#settings-max_bytes_in_join)
--   [join_overflow_mode](../../../operations/settings/query-complexity.md#settings-join_overflow_mode)
--   [join_any_take_last_row](../../../operations/settings/settings.md#settings-join_any_take_last_row)
-
-El `Join`-las tablas del motor no se pueden usar en `GLOBAL JOIN` operación.
-
-El `Join`-motor permite el uso [Sistema abierto.](../../../operations/settings/settings.md#join_use_nulls) ajuste en el `CREATE TABLE` instrucción. Y [SELECT](../../../sql-reference/statements/select/index.md) consulta permite el uso `join_use_nulls` demasiado. Si tienes diferentes `join_use_nulls` configuración, puede obtener un error al unirse a la tabla. Depende del tipo de JOIN. Cuando se utiliza [joinGet](../../../sql-reference/functions/other-functions.md#joinget) función, usted tiene que utilizar el mismo `join_use_nulls` ajuste en `CRATE TABLE` y `SELECT` instrucción.
-
-## Almacenamiento de datos {#data-storage}
-
-`Join` datos de la tabla siempre se encuentra en la memoria RAM. Al insertar filas en una tabla, ClickHouse escribe bloques de datos en el directorio del disco para que puedan restaurarse cuando se reinicie el servidor.
-
-Si el servidor se reinicia incorrectamente, el bloque de datos en el disco puede perderse o dañarse. En este caso, es posible que deba eliminar manualmente el archivo con datos dañados.
-
-[Artículo Original](https://clickhouse.tech/docs/en/operations/table_engines/join/) <!--hide-->
diff --git a/docs/es/engines/table-engines/special/materializedview.md b/docs/es/engines/table-engines/special/materializedview.md
deleted file mode 100644
index 87e5218eb6a..00000000000
--- a/docs/es/engines/table-engines/special/materializedview.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 43
-toc_title: "M\xE9todo de codificaci\xF3n de datos:"
----
-
-# Método de codificación de datos: {#materializedview}
-
-Se utiliza para implementar vistas materializadas (para obtener más información, consulte [CREATE TABLE](../../../sql-reference/statements/create.md#create-table-query)). Para almacenar datos, utiliza un motor diferente que se especificó al crear la vista. Al leer desde una tabla, solo usa este motor.
-
-[Artículo Original](https://clickhouse.tech/docs/en/operations/table_engines/materializedview/) <!--hide-->
diff --git a/docs/es/engines/table-engines/special/memory.md b/docs/es/engines/table-engines/special/memory.md
deleted file mode 100644
index 3d4f8ddff54..00000000000
--- a/docs/es/engines/table-engines/special/memory.md
+++ /dev/null
@@ -1,19 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 44
-toc_title: Memoria
----
-
-# Memoria {#memory}
-
-El motor de memoria almacena datos en RAM, en forma sin comprimir. Los datos se almacenan exactamente en la misma forma en que se reciben cuando se leen. En otras palabras, la lectura de esta tabla es completamente gratuita.
-El acceso a los datos simultáneos está sincronizado. Los bloqueos son cortos: las operaciones de lectura y escritura no se bloquean entre sí.
-Los índices no son compatibles. La lectura está paralelizada.
-La productividad máxima (más de 10 GB/s) se alcanza en consultas simples, porque no hay lectura del disco, descomprimir o deserializar datos. (Cabe señalar que, en muchos casos, la productividad del motor MergeTree es casi tan alta.)
-Al reiniciar un servidor, los datos desaparecen de la tabla y la tabla queda vacía.
-Normalmente, el uso de este motor de tabla no está justificado. Sin embargo, se puede usar para pruebas y para tareas donde se requiere la velocidad máxima en un número relativamente pequeño de filas (hasta aproximadamente 100,000,000).
-
-El sistema utiliza el motor de memoria para tablas temporales con datos de consulta externos (consulte la sección “External data for processing a query”), y para la implementación de GLOBAL IN (véase la sección “IN operators”).
-
-[Artículo Original](https://clickhouse.tech/docs/en/operations/table_engines/memory/) <!--hide-->
diff --git a/docs/es/engines/table-engines/special/merge.md b/docs/es/engines/table-engines/special/merge.md
deleted file mode 100644
index 6ed2c272914..00000000000
--- a/docs/es/engines/table-engines/special/merge.md
+++ /dev/null
@@ -1,70 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 36
-toc_title: Fusionar
----
-
-# Fusionar {#merge}
-
-El `Merge` motor (no debe confundirse con `MergeTree`) no almacena datos en sí, pero permite leer de cualquier número de otras tablas simultáneamente.
-La lectura se paralela automáticamente. No se admite la escritura en una tabla. Al leer, se usan los índices de las tablas que realmente se están leyendo, si existen.
-El `Merge` engine acepta parámetros: el nombre de la base de datos y una expresión regular para las tablas.
-
-Ejemplo:
-
-``` sql
-Merge(hits, '^WatchLog')
-```
-
-Los datos se leerán de las tablas en el `hits` base de datos que tienen nombres que coinciden con la expresión regular ‘`^WatchLog`’.
-
-En lugar del nombre de la base de datos, puede usar una expresión constante que devuelva una cadena. Por ejemplo, `currentDatabase()`.
-
-Regular expressions — [Re2](https://github.com/google/re2) (soporta un subconjunto de PCRE), sensible a mayúsculas y minúsculas.
-Vea las notas sobre los símbolos de escape en expresiones regulares en el “match” apartado.
-
-Al seleccionar tablas para leer, el `Merge` no se seleccionará la tabla en sí, incluso si coincide con la expresión regular. Esto es para evitar bucles.
-Es posible crear dos `Merge` tablas que intentarán interminablemente leer los datos de los demás, pero esta no es una buena idea.
-
-La forma típica de usar el `Merge` para trabajar con un gran número de `TinyLog` tablas como si con una sola tabla.
-
-Ejemplo 2:
-
-Digamos que tiene una tabla antigua (WatchLog_old) y decidió cambiar la partición sin mover datos a una nueva tabla (WatchLog_new) y necesita ver datos de ambas tablas.
-
-``` sql
-CREATE TABLE WatchLog_old(date Date, UserId Int64, EventType String, Cnt UInt64)
-ENGINE=MergeTree(date, (UserId, EventType), 8192);
-INSERT INTO WatchLog_old VALUES ('2018-01-01', 1, 'hit', 3);
-
-CREATE TABLE WatchLog_new(date Date, UserId Int64, EventType String, Cnt UInt64)
-ENGINE=MergeTree PARTITION BY date ORDER BY (UserId, EventType) SETTINGS index_granularity=8192;
-INSERT INTO WatchLog_new VALUES ('2018-01-02', 2, 'hit', 3);
-
-CREATE TABLE WatchLog as WatchLog_old ENGINE=Merge(currentDatabase(), '^WatchLog');
-
-SELECT *
-FROM WatchLog
-```
-
-``` text
-┌───────date─┬─UserId─┬─EventType─┬─Cnt─┐
-│ 2018-01-01 │      1 │ hit       │   3 │
-└────────────┴────────┴───────────┴─────┘
-┌───────date─┬─UserId─┬─EventType─┬─Cnt─┐
-│ 2018-01-02 │      2 │ hit       │   3 │
-└────────────┴────────┴───────────┴─────┘
-```
-
-## Virtual Columnas {#virtual-columns}
-
--   `_table` — Contains the name of the table from which data was read. Type: [Cadena](../../../sql-reference/data-types/string.md).
-
-    Puede establecer las condiciones constantes en `_table` en el `WHERE/PREWHERE` cláusula (por ejemplo, `WHERE _table='xyz'`). En este caso, la operación de lectura se realiza sólo para las tablas donde la condición en `_table` está satisfecho, por lo que el `_table` columna actúa como un índice.
-
-**Ver también**
-
--   [Virtual columnas](index.md#table_engines-virtual_columns)
-
-[Artículo Original](https://clickhouse.tech/docs/en/operations/table_engines/merge/) <!--hide-->
diff --git a/docs/es/engines/table-engines/special/null.md b/docs/es/engines/table-engines/special/null.md
deleted file mode 100644
index cc05e7839c9..00000000000
--- a/docs/es/engines/table-engines/special/null.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 38
-toc_title: Nulo
----
-
-# Nulo {#null}
-
-Al escribir en una tabla Null, los datos se ignoran. Al leer desde una tabla Null, la respuesta está vacía.
-
-Sin embargo, puede crear una vista materializada en una tabla Null. Entonces los datos escritos en la tabla terminarán en la vista.
-
-[Artículo Original](https://clickhouse.tech/docs/en/operations/table_engines/null/) <!--hide-->
diff --git a/docs/es/engines/table-engines/special/set.md b/docs/es/engines/table-engines/special/set.md
deleted file mode 100644
index 4ff23202443..00000000000
--- a/docs/es/engines/table-engines/special/set.md
+++ /dev/null
@@ -1,19 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 39
-toc_title: Establecer
----
-
-# Establecer {#set}
-
-Un conjunto de datos que siempre está en la memoria RAM. Está diseñado para su uso en el lado derecho del operador IN (consulte la sección “IN operators”).
-
-Puede usar INSERT para insertar datos en la tabla. Se agregarán nuevos elementos al conjunto de datos, mientras que los duplicados se ignorarán.
-Pero no puede realizar SELECT desde la tabla. La única forma de recuperar datos es usándolos en la mitad derecha del operador IN.
-
-Los datos siempre se encuentran en la memoria RAM. Para INSERT, los bloques de datos insertados también se escriben en el directorio de tablas en el disco. Al iniciar el servidor, estos datos se cargan en la RAM. En otras palabras, después de reiniciar, los datos permanecen en su lugar.
-
-Para un reinicio aproximado del servidor, el bloque de datos en el disco puede perderse o dañarse. En este último caso, es posible que deba eliminar manualmente el archivo con datos dañados.
-
-[Artículo Original](https://clickhouse.tech/docs/en/operations/table_engines/set/) <!--hide-->
diff --git a/docs/es/engines/table-engines/special/url.md b/docs/es/engines/table-engines/special/url.md
deleted file mode 100644
index 654b8e99a4e..00000000000
--- a/docs/es/engines/table-engines/special/url.md
+++ /dev/null
@@ -1,82 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 41
-toc_title: URL
----
-
-# URL(URL, Formato) {#table_engines-url}
-
-Administra datos en un servidor HTTP/HTTPS remoto. Este motor es similar
-a la [File](file.md) motor.
-
-## Uso del motor en el servidor ClickHouse {#using-the-engine-in-the-clickhouse-server}
-
-El `format` debe ser uno que ClickHouse pueda usar en
-`SELECT` consultas y, si es necesario, en `INSERTs`. Para obtener la lista completa de formatos admitidos, consulte
-[Formato](../../../interfaces/formats.md#formats).
-
-El `URL` debe ajustarse a la estructura de un localizador uniforme de recursos. La dirección URL especificada debe apuntar a un servidor
-que utiliza HTTP o HTTPS. Esto no requiere ningún
-encabezados adicionales para obtener una respuesta del servidor.
-
-`INSERT` y `SELECT` las consultas se transforman en `POST` y `GET` peticiones,
-respectivamente. Para el procesamiento `POST` solicitudes, el servidor remoto debe admitir
-[Codificación de transferencia fragmentada](https://en.wikipedia.org/wiki/Chunked_transfer_encoding).
-
-Puede limitar el número máximo de saltos de redirección HTTP GET utilizando el [Nombre de la red inalámbrica (SSID):](../../../operations/settings/settings.md#setting-max_http_get_redirects) configuración.
-
-**Ejemplo:**
-
-**1.** Crear un `url_engine_table` tabla en el servidor :
-
-``` sql
-CREATE TABLE url_engine_table (word String, value UInt64)
-ENGINE=URL('http://127.0.0.1:12345/', CSV)
-```
-
-**2.** Cree un servidor HTTP básico utilizando las herramientas estándar de Python 3 y
-comenzarlo:
-
-``` python3
-from http.server import BaseHTTPRequestHandler, HTTPServer
-
-class CSVHTTPServer(BaseHTTPRequestHandler):
-    def do_GET(self):
-        self.send_response(200)
-        self.send_header('Content-type', 'text/csv')
-        self.end_headers()
-
-        self.wfile.write(bytes('Hello,1\nWorld,2\n', "utf-8"))
-
-if __name__ == "__main__":
-    server_address = ('127.0.0.1', 12345)
-    HTTPServer(server_address, CSVHTTPServer).serve_forever()
-```
-
-``` bash
-$ python3 server.py
-```
-
-**3.** Solicitar datos:
-
-``` sql
-SELECT * FROM url_engine_table
-```
-
-``` text
-┌─word──┬─value─┐
-│ Hello │     1 │
-│ World │     2 │
-└───────┴───────┘
-```
-
-## Detalles de la implementación {#details-of-implementation}
-
--   Las lecturas y escrituras pueden ser paralelas
--   No soportado:
-    -   `ALTER` y `SELECT...SAMPLE` operación.
-    -   Índices.
-    -   Replicación.
-
-[Artículo Original](https://clickhouse.tech/docs/en/operations/table_engines/url/) <!--hide-->
diff --git a/docs/es/engines/table-engines/special/view.md b/docs/es/engines/table-engines/special/view.md
deleted file mode 100644
index dbb496bcca4..00000000000
--- a/docs/es/engines/table-engines/special/view.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 42
-toc_title: Vista
----
-
-# Vista {#table_engines-view}
-
-Se utiliza para implementar vistas (para obtener más información, consulte `CREATE VIEW query`). No almacena datos, pero solo almacena los datos especificados `SELECT` consulta. Al leer desde una tabla, ejecuta esta consulta (y elimina todas las columnas innecesarias de la consulta).
-
-[Artículo Original](https://clickhouse.tech/docs/en/operations/table_engines/view/) <!--hide-->
diff --git a/docs/es/faq/general.md b/docs/es/faq/general.md
deleted file mode 100644
index f8446e99152..00000000000
--- a/docs/es/faq/general.md
+++ /dev/null
@@ -1,60 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 78
-toc_title: Preguntas generales
----
-
-# Preguntas generales {#general-questions}
-
-## ¿Por qué no usar algo como MapReduce? {#why-not-use-something-like-mapreduce}
-
-Podemos referirnos a sistemas como MapReduce como sistemas informáticos distribuidos en los que la operación de reducción se basa en la clasificación distribuida. La solución de código abierto más común en esta clase es [Acerca de nosotros](http://hadoop.apache.org). Yandex utiliza su solución interna, YT.
-
-Estos sistemas no son apropiados para consultas en línea debido a su alta latencia. En otras palabras, no se pueden usar como back-end para una interfaz web. Estos tipos de sistemas no son útiles para actualizaciones de datos en tiempo real. La clasificación distribuida no es la mejor manera de realizar operaciones de reducción si el resultado de la operación y todos los resultados intermedios (si los hay) se encuentran en la RAM de un único servidor, que generalmente es el caso de las consultas en línea. En tal caso, una tabla hash es una forma óptima de realizar operaciones de reducción. Un enfoque común para optimizar las tareas de reducción de mapas es la preagregación (reducción parcial) utilizando una tabla hash en RAM. El usuario realiza esta optimización manualmente. La clasificación distribuida es una de las principales causas de un rendimiento reducido cuando se ejecutan tareas simples de reducción de mapas.
-
-La mayoría de las implementaciones de MapReduce le permiten ejecutar código arbitrario en un clúster. Pero un lenguaje de consulta declarativo es más adecuado para OLAP para ejecutar experimentos rápidamente. Por ejemplo, Hadoop tiene Hive y Pig. También considere Cloudera Impala o Shark (obsoleto) para Spark, así como Spark SQL, Presto y Apache Drill. El rendimiento cuando se ejecutan tales tareas es muy subóptimo en comparación con los sistemas especializados, pero la latencia relativamente alta hace que sea poco realista utilizar estos sistemas como back-end para una interfaz web.
-
-## ¿Qué sucede si tengo un problema con las codificaciones al usar Oracle a través de ODBC? {#oracle-odbc-encodings}
-
-Si utiliza Oracle a través del controlador ODBC como fuente de diccionarios externos, debe establecer el valor `NLS_LANG` variable de entorno en `/etc/default/clickhouse`. Para obtener más información, consulte [Oracle NLS_LANG Preguntas frecuentes](https://www.oracle.com/technetwork/products/globalization/nls-lang-099431.html).
-
-**Ejemplo**
-
-``` sql
-NLS_LANG=RUSSIAN_RUSSIA.UTF8
-```
-
-## Cómo exporto datos de ClickHouse a un archivo? {#how-to-export-to-file}
-
-### Uso de la cláusula INTO OUTFILE {#using-into-outfile-clause}
-
-Añadir un [INTO OUTFILE](../sql-reference/statements/select/into-outfile.md#into-outfile-clause) cláusula a su consulta.
-
-Por ejemplo:
-
-``` sql
-SELECT * FROM table INTO OUTFILE 'file'
-```
-
-De forma predeterminada, ClickHouse usa el [TabSeparated](../interfaces/formats.md#tabseparated) formato de datos de salida. Para seleccionar el [formato de datos](../interfaces/formats.md), utilizar el [Cláusula FORMAT](../sql-reference/statements/select/format.md#format-clause).
-
-Por ejemplo:
-
-``` sql
-SELECT * FROM table INTO OUTFILE 'file' FORMAT CSV
-```
-
-### Uso de una tabla de motor de archivo {#using-a-file-engine-table}
-
-Ver [File](../engines/table-engines/special/file.md).
-
-### Uso de la redirección de línea de comandos {#using-command-line-redirection}
-
-``` sql
-$ clickhouse-client --query "SELECT * from table" --format FormatName > result.txt
-```
-
-Ver [Casa de clics-cliente](../interfaces/cli.md).
-
-{## [Artículo Original](https://clickhouse.tech/docs/en/faq/general/) ##}
diff --git a/docs/es/faq/index.md b/docs/es/faq/index.md
deleted file mode 100644
index a44dbb31e89..00000000000
--- a/docs/es/faq/index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: F.A.Q.
-toc_priority: 76
----
-
-
diff --git a/docs/es/getting-started/example-datasets/amplab-benchmark.md b/docs/es/getting-started/example-datasets/amplab-benchmark.md
deleted file mode 100644
index 066bf036266..00000000000
--- a/docs/es/getting-started/example-datasets/amplab-benchmark.md
+++ /dev/null
@@ -1,129 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 17
-toc_title: Referencia de Big Data de AMPLab
----
-
-# Referencia de Big Data de AMPLab {#amplab-big-data-benchmark}
-
-Ver https://amplab.cs.berkeley.edu/benchmark/
-
-Regístrese para obtener una cuenta gratuita en https://aws.amazon.com. Requiere una tarjeta de crédito, correo electrónico y número de teléfono. Obtenga una nueva clave de acceso en https://console.aws.amazon.com/iam/home?nc2=h_m_sc#security_credential
-
-Ejecute lo siguiente en la consola:
-
-``` bash
-$ sudo apt-get install s3cmd
-$ mkdir tiny; cd tiny;
-$ s3cmd sync s3://big-data-benchmark/pavlo/text-deflate/tiny/ .
-$ cd ..
-$ mkdir 1node; cd 1node;
-$ s3cmd sync s3://big-data-benchmark/pavlo/text-deflate/1node/ .
-$ cd ..
-$ mkdir 5nodes; cd 5nodes;
-$ s3cmd sync s3://big-data-benchmark/pavlo/text-deflate/5nodes/ .
-$ cd ..
-```
-
-Ejecute las siguientes consultas de ClickHouse:
-
-``` sql
-CREATE TABLE rankings_tiny
-(
-    pageURL String,
-    pageRank UInt32,
-    avgDuration UInt32
-) ENGINE = Log;
-
-CREATE TABLE uservisits_tiny
-(
-    sourceIP String,
-    destinationURL String,
-    visitDate Date,
-    adRevenue Float32,
-    UserAgent String,
-    cCode FixedString(3),
-    lCode FixedString(6),
-    searchWord String,
-    duration UInt32
-) ENGINE = MergeTree(visitDate, visitDate, 8192);
-
-CREATE TABLE rankings_1node
-(
-    pageURL String,
-    pageRank UInt32,
-    avgDuration UInt32
-) ENGINE = Log;
-
-CREATE TABLE uservisits_1node
-(
-    sourceIP String,
-    destinationURL String,
-    visitDate Date,
-    adRevenue Float32,
-    UserAgent String,
-    cCode FixedString(3),
-    lCode FixedString(6),
-    searchWord String,
-    duration UInt32
-) ENGINE = MergeTree(visitDate, visitDate, 8192);
-
-CREATE TABLE rankings_5nodes_on_single
-(
-    pageURL String,
-    pageRank UInt32,
-    avgDuration UInt32
-) ENGINE = Log;
-
-CREATE TABLE uservisits_5nodes_on_single
-(
-    sourceIP String,
-    destinationURL String,
-    visitDate Date,
-    adRevenue Float32,
-    UserAgent String,
-    cCode FixedString(3),
-    lCode FixedString(6),
-    searchWord String,
-    duration UInt32
-) ENGINE = MergeTree(visitDate, visitDate, 8192);
-```
-
-Volver a la consola:
-
-``` bash
-$ for i in tiny/rankings/*.deflate; do echo $i; zlib-flate -uncompress < $i | clickhouse-client --host=example-perftest01j --query="INSERT INTO rankings_tiny FORMAT CSV"; done
-$ for i in tiny/uservisits/*.deflate; do echo $i; zlib-flate -uncompress < $i | clickhouse-client --host=example-perftest01j --query="INSERT INTO uservisits_tiny FORMAT CSV"; done
-$ for i in 1node/rankings/*.deflate; do echo $i; zlib-flate -uncompress < $i | clickhouse-client --host=example-perftest01j --query="INSERT INTO rankings_1node FORMAT CSV"; done
-$ for i in 1node/uservisits/*.deflate; do echo $i; zlib-flate -uncompress < $i | clickhouse-client --host=example-perftest01j --query="INSERT INTO uservisits_1node FORMAT CSV"; done
-$ for i in 5nodes/rankings/*.deflate; do echo $i; zlib-flate -uncompress < $i | clickhouse-client --host=example-perftest01j --query="INSERT INTO rankings_5nodes_on_single FORMAT CSV"; done
-$ for i in 5nodes/uservisits/*.deflate; do echo $i; zlib-flate -uncompress < $i | clickhouse-client --host=example-perftest01j --query="INSERT INTO uservisits_5nodes_on_single FORMAT CSV"; done
-```
-
-Consultas para obtener muestras de datos:
-
-``` sql
-SELECT pageURL, pageRank FROM rankings_1node WHERE pageRank > 1000
-
-SELECT substring(sourceIP, 1, 8), sum(adRevenue) FROM uservisits_1node GROUP BY substring(sourceIP, 1, 8)
-
-SELECT
-    sourceIP,
-    sum(adRevenue) AS totalRevenue,
-    avg(pageRank) AS pageRank
-FROM rankings_1node ALL INNER JOIN
-(
-    SELECT
-        sourceIP,
-        destinationURL AS pageURL,
-        adRevenue
-    FROM uservisits_1node
-    WHERE (visitDate > '1980-01-01') AND (visitDate < '1980-04-01')
-) USING pageURL
-GROUP BY sourceIP
-ORDER BY totalRevenue DESC
-LIMIT 1
-```
-
-[Artículo Original](https://clickhouse.tech/docs/en/getting_started/example_datasets/amplab_benchmark/) <!--hide-->
diff --git a/docs/es/getting-started/example-datasets/criteo.md b/docs/es/getting-started/example-datasets/criteo.md
deleted file mode 100644
index 79203b0276d..00000000000
--- a/docs/es/getting-started/example-datasets/criteo.md
+++ /dev/null
@@ -1,81 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 19
-toc_title: Registros de clics de Terabyte de Criteo
----
-
-# Terabyte de registros de clics de Criteo {#terabyte-of-click-logs-from-criteo}
-
-Descargue los datos de http://labs.criteo.com/downloads/download-terabyte-click-logs/
-
-Cree una tabla para importar el registro:
-
-``` sql
-CREATE TABLE criteo_log (date Date, clicked UInt8, int1 Int32, int2 Int32, int3 Int32, int4 Int32, int5 Int32, int6 Int32, int7 Int32, int8 Int32, int9 Int32, int10 Int32, int11 Int32, int12 Int32, int13 Int32, cat1 String, cat2 String, cat3 String, cat4 String, cat5 String, cat6 String, cat7 String, cat8 String, cat9 String, cat10 String, cat11 String, cat12 String, cat13 String, cat14 String, cat15 String, cat16 String, cat17 String, cat18 String, cat19 String, cat20 String, cat21 String, cat22 String, cat23 String, cat24 String, cat25 String, cat26 String) ENGINE = Log
-```
-
-Descargar los datos:
-
-``` bash
-$ for i in {00..23}; do echo $i; zcat datasets/criteo/day_${i#0}.gz | sed -r 's/^/2000-01-'${i/00/24}'\t/' | clickhouse-client --host=example-perftest01j --query="INSERT INTO criteo_log FORMAT TabSeparated"; done
-```
-
-Crear una tabla para los datos convertidos:
-
-``` sql
-CREATE TABLE criteo
-(
-    date Date,
-    clicked UInt8,
-    int1 Int32,
-    int2 Int32,
-    int3 Int32,
-    int4 Int32,
-    int5 Int32,
-    int6 Int32,
-    int7 Int32,
-    int8 Int32,
-    int9 Int32,
-    int10 Int32,
-    int11 Int32,
-    int12 Int32,
-    int13 Int32,
-    icat1 UInt32,
-    icat2 UInt32,
-    icat3 UInt32,
-    icat4 UInt32,
-    icat5 UInt32,
-    icat6 UInt32,
-    icat7 UInt32,
-    icat8 UInt32,
-    icat9 UInt32,
-    icat10 UInt32,
-    icat11 UInt32,
-    icat12 UInt32,
-    icat13 UInt32,
-    icat14 UInt32,
-    icat15 UInt32,
-    icat16 UInt32,
-    icat17 UInt32,
-    icat18 UInt32,
-    icat19 UInt32,
-    icat20 UInt32,
-    icat21 UInt32,
-    icat22 UInt32,
-    icat23 UInt32,
-    icat24 UInt32,
-    icat25 UInt32,
-    icat26 UInt32
-) ENGINE = MergeTree(date, intHash32(icat1), (date, intHash32(icat1)), 8192)
-```
-
-Transforme los datos del registro sin procesar y colóquelos en la segunda tabla:
-
-``` sql
-INSERT INTO criteo SELECT date, clicked, int1, int2, int3, int4, int5, int6, int7, int8, int9, int10, int11, int12, int13, reinterpretAsUInt32(unhex(cat1)) AS icat1, reinterpretAsUInt32(unhex(cat2)) AS icat2, reinterpretAsUInt32(unhex(cat3)) AS icat3, reinterpretAsUInt32(unhex(cat4)) AS icat4, reinterpretAsUInt32(unhex(cat5)) AS icat5, reinterpretAsUInt32(unhex(cat6)) AS icat6, reinterpretAsUInt32(unhex(cat7)) AS icat7, reinterpretAsUInt32(unhex(cat8)) AS icat8, reinterpretAsUInt32(unhex(cat9)) AS icat9, reinterpretAsUInt32(unhex(cat10)) AS icat10, reinterpretAsUInt32(unhex(cat11)) AS icat11, reinterpretAsUInt32(unhex(cat12)) AS icat12, reinterpretAsUInt32(unhex(cat13)) AS icat13, reinterpretAsUInt32(unhex(cat14)) AS icat14, reinterpretAsUInt32(unhex(cat15)) AS icat15, reinterpretAsUInt32(unhex(cat16)) AS icat16, reinterpretAsUInt32(unhex(cat17)) AS icat17, reinterpretAsUInt32(unhex(cat18)) AS icat18, reinterpretAsUInt32(unhex(cat19)) AS icat19, reinterpretAsUInt32(unhex(cat20)) AS icat20, reinterpretAsUInt32(unhex(cat21)) AS icat21, reinterpretAsUInt32(unhex(cat22)) AS icat22, reinterpretAsUInt32(unhex(cat23)) AS icat23, reinterpretAsUInt32(unhex(cat24)) AS icat24, reinterpretAsUInt32(unhex(cat25)) AS icat25, reinterpretAsUInt32(unhex(cat26)) AS icat26 FROM criteo_log;
-
-DROP TABLE criteo_log;
-```
-
-[Artículo Original](https://clickhouse.tech/docs/en/getting_started/example_datasets/criteo/) <!--hide-->
diff --git a/docs/es/getting-started/example-datasets/index.md b/docs/es/getting-started/example-datasets/index.md
deleted file mode 100644
index 28e06987af1..00000000000
--- a/docs/es/getting-started/example-datasets/index.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: Datos De Ejemplo
-toc_priority: 12
-toc_title: "Implantaci\xF3n"
----
-
-# Datos De Ejemplo {#example-datasets}
-
-En esta sección se describe cómo obtener conjuntos de datos de ejemplo e importarlos a ClickHouse.
-Para algunos conjuntos de datos también están disponibles consultas de ejemplo.
-
--   [Yandex anonimizado.Conjunto de datos de Metrica](metrica.md)
--   [Estrella Schema Benchmark](star-schema.md)
--   [Nombre de la red inalámbrica (SSID):](wikistat.md)
--   [Terabyte de registros de clics de Criteo](criteo.md)
--   [Referencia de Big Data de AMPLab](amplab-benchmark.md)
--   [Datos de taxis de Nueva York](nyc-taxi.md)
--   [A tiempo](ontime.md)
-
-[Artículo Original](https://clickhouse.tech/docs/en/getting_started/example_datasets) <!--hide-->
diff --git a/docs/es/getting-started/example-datasets/metrica.md b/docs/es/getting-started/example-datasets/metrica.md
deleted file mode 100644
index 0b3bc8b6833..00000000000
--- a/docs/es/getting-started/example-datasets/metrica.md
+++ /dev/null
@@ -1,70 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 14
-toc_title: El Yandex.Metrica Datos
----
-
-# Yandex anonimizado.Metrica Datos {#anonymized-yandex-metrica-data}
-
-El conjunto de datos consta de dos tablas que contienen datos anónimos sobre los hits (`hits_v1`) y visitas (`visits_v1`) el Yandex.Métrica. Puedes leer más sobre Yandex.Metrica en [Historial de ClickHouse](../../introduction/history.md) apartado.
-
-El conjunto de datos consta de dos tablas, cualquiera de ellas se puede descargar como `tsv.xz` o como particiones preparadas. Además, una versión extendida de la `hits` La tabla que contiene 100 millones de filas está disponible como TSV en https://datasets.clickhouse.tech/hits/tsv/hits_100m_obfuscated_v1.tsv.xz y como particiones preparadas en https://datasets.clickhouse.tech/hits/partitions/hits_100m_obfuscated_v1.tar.xz.
-
-## Obtención de tablas a partir de particiones preparadas {#obtaining-tables-from-prepared-partitions}
-
-Descargar e importar tabla de hits:
-
-``` bash
-curl -O https://datasets.clickhouse.tech/hits/partitions/hits_v1.tar
-tar xvf hits_v1.tar -C /var/lib/clickhouse # path to ClickHouse data directory
-# check permissions on unpacked data, fix if required
-sudo service clickhouse-server restart
-clickhouse-client --query "SELECT COUNT(*) FROM datasets.hits_v1"
-```
-
-Descargar e importar visitas:
-
-``` bash
-curl -O https://datasets.clickhouse.tech/visits/partitions/visits_v1.tar
-tar xvf visits_v1.tar -C /var/lib/clickhouse # path to ClickHouse data directory
-# check permissions on unpacked data, fix if required
-sudo service clickhouse-server restart
-clickhouse-client --query "SELECT COUNT(*) FROM datasets.visits_v1"
-```
-
-## Obtención de tablas a partir de un archivo TSV comprimido {#obtaining-tables-from-compressed-tsv-file}
-
-Descargar e importar hits desde un archivo TSV comprimido:
-
-``` bash
-curl https://datasets.clickhouse.tech/hits/tsv/hits_v1.tsv.xz | unxz --threads=`nproc` > hits_v1.tsv
-# now create table
-clickhouse-client --query "CREATE DATABASE IF NOT EXISTS datasets"
-clickhouse-client --query "CREATE TABLE datasets.hits_v1 ( WatchID UInt64,  JavaEnable UInt8,  Title String,  GoodEvent Int16,  EventTime DateTime,  EventDate Date,  CounterID UInt32,  ClientIP UInt32,  ClientIP6 FixedString(16),  RegionID UInt32,  UserID UInt64,  CounterClass Int8,  OS UInt8,  UserAgent UInt8,  URL String,  Referer String,  URLDomain String,  RefererDomain String,  Refresh UInt8,  IsRobot UInt8,  RefererCategories Array(UInt16),  URLCategories Array(UInt16), URLRegions Array(UInt32),  RefererRegions Array(UInt32),  ResolutionWidth UInt16,  ResolutionHeight UInt16,  ResolutionDepth UInt8,  FlashMajor UInt8, FlashMinor UInt8,  FlashMinor2 String,  NetMajor UInt8,  NetMinor UInt8, UserAgentMajor UInt16,  UserAgentMinor FixedString(2),  CookieEnable UInt8, JavascriptEnable UInt8,  IsMobile UInt8,  MobilePhone UInt8,  MobilePhoneModel String,  Params String,  IPNetworkID UInt32,  TraficSourceID Int8, SearchEngineID UInt16,  SearchPhrase String,  AdvEngineID UInt8,  IsArtifical UInt8,  WindowClientWidth UInt16,  WindowClientHeight UInt16,  ClientTimeZone Int16,  ClientEventTime DateTime,  SilverlightVersion1 UInt8, SilverlightVersion2 UInt8,  SilverlightVersion3 UInt32,  SilverlightVersion4 UInt16,  PageCharset String,  CodeVersion UInt32,  IsLink UInt8,  IsDownload UInt8,  IsNotBounce UInt8,  FUniqID UInt64,  HID UInt32,  IsOldCounter UInt8, IsEvent UInt8,  IsParameter UInt8,  DontCountHits UInt8,  WithHash UInt8, HitColor FixedString(1),  UTCEventTime DateTime,  Age UInt8,  Sex UInt8,  Income UInt8,  Interests UInt16,  Robotness UInt8,  GeneralInterests Array(UInt16), RemoteIP UInt32,  RemoteIP6 FixedString(16),  WindowName Int32,  OpenerName Int32,  HistoryLength Int16,  BrowserLanguage FixedString(2),  BrowserCountry FixedString(2),  SocialNetwork String,  SocialAction String,  HTTPError UInt16, SendTiming Int32,  DNSTiming Int32,  ConnectTiming Int32,  ResponseStartTiming Int32,  ResponseEndTiming Int32,  FetchTiming Int32,  RedirectTiming Int32, DOMInteractiveTiming Int32,  DOMContentLoadedTiming Int32,  DOMCompleteTiming Int32,  LoadEventStartTiming Int32,  LoadEventEndTiming Int32, NSToDOMContentLoadedTiming Int32,  FirstPaintTiming Int32,  RedirectCount Int8, SocialSourceNetworkID UInt8,  SocialSourcePage String,  ParamPrice Int64, ParamOrderID String,  ParamCurrency FixedString(3),  ParamCurrencyID UInt16, GoalsReached Array(UInt32),  OpenstatServiceName String,  OpenstatCampaignID String,  OpenstatAdID String,  OpenstatSourceID String,  UTMSource String, UTMMedium String,  UTMCampaign String,  UTMContent String,  UTMTerm String, FromTag String,  HasGCLID UInt8,  RefererHash UInt64,  URLHash UInt64,  CLID UInt32,  YCLID UInt64,  ShareService String,  ShareURL String,  ShareTitle String,  ParsedParams Nested(Key1 String,  Key2 String, Key3 String, Key4 String, Key5 String,  ValueDouble Float64),  IslandID FixedString(16),  RequestNum UInt32,  RequestTry UInt8) ENGINE = MergeTree() PARTITION BY toYYYYMM(EventDate) ORDER BY (CounterID, EventDate, intHash32(UserID)) SAMPLE BY intHash32(UserID) SETTINGS index_granularity = 8192"
-# import data
-cat hits_v1.tsv | clickhouse-client --query "INSERT INTO datasets.hits_v1 FORMAT TSV" --max_insert_block_size=100000
-# optionally you can optimize table
-clickhouse-client --query "OPTIMIZE TABLE datasets.hits_v1 FINAL"
-clickhouse-client --query "SELECT COUNT(*) FROM datasets.hits_v1"
-```
-
-Descargue e importe visitas desde un archivo tsv comprimido:
-
-``` bash
-curl https://datasets.clickhouse.tech/visits/tsv/visits_v1.tsv.xz | unxz --threads=`nproc` > visits_v1.tsv
-# now create table
-clickhouse-client --query "CREATE DATABASE IF NOT EXISTS datasets"
-clickhouse-client --query "CREATE TABLE datasets.visits_v1 ( CounterID UInt32,  StartDate Date,  Sign Int8,  IsNew UInt8,  VisitID UInt64,  UserID UInt64,  StartTime DateTime,  Duration UInt32,  UTCStartTime DateTime,  PageViews Int32,  Hits Int32,  IsBounce UInt8,  Referer String,  StartURL String,  RefererDomain String,  StartURLDomain String,  EndURL String,  LinkURL String,  IsDownload UInt8,  TraficSourceID Int8,  SearchEngineID UInt16,  SearchPhrase String,  AdvEngineID UInt8,  PlaceID Int32,  RefererCategories Array(UInt16),  URLCategories Array(UInt16),  URLRegions Array(UInt32),  RefererRegions Array(UInt32),  IsYandex UInt8,  GoalReachesDepth Int32,  GoalReachesURL Int32,  GoalReachesAny Int32,  SocialSourceNetworkID UInt8,  SocialSourcePage String,  MobilePhoneModel String,  ClientEventTime DateTime,  RegionID UInt32,  ClientIP UInt32,  ClientIP6 FixedString(16),  RemoteIP UInt32,  RemoteIP6 FixedString(16),  IPNetworkID UInt32,  SilverlightVersion3 UInt32,  CodeVersion UInt32,  ResolutionWidth UInt16,  ResolutionHeight UInt16,  UserAgentMajor UInt16,  UserAgentMinor UInt16,  WindowClientWidth UInt16,  WindowClientHeight UInt16,  SilverlightVersion2 UInt8,  SilverlightVersion4 UInt16,  FlashVersion3 UInt16,  FlashVersion4 UInt16,  ClientTimeZone Int16,  OS UInt8,  UserAgent UInt8,  ResolutionDepth UInt8,  FlashMajor UInt8,  FlashMinor UInt8,  NetMajor UInt8,  NetMinor UInt8,  MobilePhone UInt8,  SilverlightVersion1 UInt8,  Age UInt8,  Sex UInt8,  Income UInt8,  JavaEnable UInt8,  CookieEnable UInt8,  JavascriptEnable UInt8,  IsMobile UInt8,  BrowserLanguage UInt16,  BrowserCountry UInt16,  Interests UInt16,  Robotness UInt8,  GeneralInterests Array(UInt16),  Params Array(String),  Goals Nested(ID UInt32, Serial UInt32, EventTime DateTime,  Price Int64,  OrderID String, CurrencyID UInt32),  WatchIDs Array(UInt64),  ParamSumPrice Int64,  ParamCurrency FixedString(3),  ParamCurrencyID UInt16,  ClickLogID UInt64,  ClickEventID Int32,  ClickGoodEvent Int32,  ClickEventTime DateTime,  ClickPriorityID Int32,  ClickPhraseID Int32,  ClickPageID Int32,  ClickPlaceID Int32,  ClickTypeID Int32,  ClickResourceID Int32,  ClickCost UInt32,  ClickClientIP UInt32,  ClickDomainID UInt32,  ClickURL String,  ClickAttempt UInt8,  ClickOrderID UInt32,  ClickBannerID UInt32,  ClickMarketCategoryID UInt32,  ClickMarketPP UInt32,  ClickMarketCategoryName String,  ClickMarketPPName String,  ClickAWAPSCampaignName String,  ClickPageName String,  ClickTargetType UInt16,  ClickTargetPhraseID UInt64,  ClickContextType UInt8,  ClickSelectType Int8,  ClickOptions String,  ClickGroupBannerID Int32,  OpenstatServiceName String,  OpenstatCampaignID String,  OpenstatAdID String,  OpenstatSourceID String,  UTMSource String,  UTMMedium String,  UTMCampaign String,  UTMContent String,  UTMTerm String,  FromTag String,  HasGCLID UInt8,  FirstVisit DateTime,  PredLastVisit Date,  LastVisit Date,  TotalVisits UInt32,  TraficSource    Nested(ID Int8,  SearchEngineID UInt16, AdvEngineID UInt8, PlaceID UInt16, SocialSourceNetworkID UInt8, Domain String, SearchPhrase String, SocialSourcePage String),  Attendance FixedString(16),  CLID UInt32,  YCLID UInt64,  NormalizedRefererHash UInt64,  SearchPhraseHash UInt64,  RefererDomainHash UInt64,  NormalizedStartURLHash UInt64,  StartURLDomainHash UInt64,  NormalizedEndURLHash UInt64,  TopLevelDomain UInt64,  URLScheme UInt64,  OpenstatServiceNameHash UInt64,  OpenstatCampaignIDHash UInt64,  OpenstatAdIDHash UInt64,  OpenstatSourceIDHash UInt64,  UTMSourceHash UInt64,  UTMMediumHash UInt64,  UTMCampaignHash UInt64,  UTMContentHash UInt64,  UTMTermHash UInt64,  FromHash UInt64,  WebVisorEnabled UInt8,  WebVisorActivity UInt32,  ParsedParams    Nested(Key1 String,  Key2 String,  Key3 String,  Key4 String, Key5 String, ValueDouble    Float64),  Market Nested(Type UInt8, GoalID UInt32, OrderID String,  OrderPrice Int64,  PP UInt32,  DirectPlaceID UInt32,  DirectOrderID  UInt32,  DirectBannerID UInt32,  GoodID String, GoodName String, GoodQuantity Int32,  GoodPrice Int64),  IslandID FixedString(16)) ENGINE = CollapsingMergeTree(Sign) PARTITION BY toYYYYMM(StartDate) ORDER BY (CounterID, StartDate, intHash32(UserID), VisitID) SAMPLE BY intHash32(UserID) SETTINGS index_granularity = 8192"
-# import data
-cat visits_v1.tsv | clickhouse-client --query "INSERT INTO datasets.visits_v1 FORMAT TSV" --max_insert_block_size=100000
-# optionally you can optimize table
-clickhouse-client --query "OPTIMIZE TABLE datasets.visits_v1 FINAL"
-clickhouse-client --query "SELECT COUNT(*) FROM datasets.visits_v1"
-```
-
-## Consultas de ejemplo {#example-queries}
-
-[Tutorial de ClickHouse](../../getting-started/tutorial.md) se basa en Yandex.El conjunto de datos de Metrica y la forma recomendada de comenzar con este conjunto de datos es simplemente pasar por el tutorial.
-
-Se pueden encontrar ejemplos adicionales de consultas a estas tablas entre [pruebas estatales](https://github.com/ClickHouse/ClickHouse/tree/master/tests/queries/1_stateful) de ClickHouse (se nombran `test.hists` y `test.visits` alli).
diff --git a/docs/es/getting-started/example-datasets/nyc-taxi.md b/docs/es/getting-started/example-datasets/nyc-taxi.md
deleted file mode 100644
index c6441311c96..00000000000
--- a/docs/es/getting-started/example-datasets/nyc-taxi.md
+++ /dev/null
@@ -1,390 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 16
-toc_title: Datos de taxis de Nueva York
----
-
-# Datos de taxis de Nueva York {#new-york-taxi-data}
-
-Este conjunto de datos se puede obtener de dos maneras:
-
--   importación de datos sin procesar
--   descarga de particiones preparadas
-
-## Cómo importar los datos sin procesar {#how-to-import-the-raw-data}
-
-Consulte https://github.com/toddwschneider/nyc-taxi-data y http://tech.marksblogg.com/billion-nyc-taxi-rides-redshift.html para obtener la descripción de un conjunto de datos e instrucciones para descargar.
-
-La descarga dará como resultado aproximadamente 227 GB de datos sin comprimir en archivos CSV. La descarga tarda aproximadamente una hora en una conexión de 1 Gbit (la descarga paralela de s3.amazonaws.com recupera al menos la mitad de un canal de 1 Gbit).
-Es posible que algunos de los archivos no se descarguen por completo. Verifique los tamaños de archivo y vuelva a descargar cualquiera que parezca dudoso.
-
-Algunos de los archivos pueden contener filas no válidas. Puede arreglarlos de la siguiente manera:
-
-``` bash
-sed -E '/(.*,){18,}/d' data/yellow_tripdata_2010-02.csv > data/yellow_tripdata_2010-02.csv_
-sed -E '/(.*,){18,}/d' data/yellow_tripdata_2010-03.csv > data/yellow_tripdata_2010-03.csv_
-mv data/yellow_tripdata_2010-02.csv_ data/yellow_tripdata_2010-02.csv
-mv data/yellow_tripdata_2010-03.csv_ data/yellow_tripdata_2010-03.csv
-```
-
-Entonces los datos deben ser preprocesados en PostgreSQL. Esto creará selecciones de puntos en los polígonos (para hacer coincidir los puntos en el mapa con los distritos de la ciudad de Nueva York) y combinará todos los datos en una única tabla plana desnormalizada mediante el uso de una unión. Para hacer esto, deberá instalar PostgreSQL con soporte PostGIS.
-
-Tenga cuidado al correr `initialize_database.sh` y volver a verificar manualmente que todas las tablas se crearon correctamente.
-
-Se tarda entre 20 y 30 minutos en procesar los datos de cada mes en PostgreSQL, por un total de aproximadamente 48 horas.
-
-Puede comprobar el número de filas descargadas de la siguiente manera:
-
-``` bash
-$ time psql nyc-taxi-data -c "SELECT count(*) FROM trips;"
-## Count
- 1298979494
-(1 row)
-
-real    7m9.164s
-```
-
-(Esto es un poco más de 1.1 mil millones de filas reportadas por Mark Litwintschik en una serie de publicaciones de blog.)
-
-Los datos en PostgreSQL utilizan 370 GB de espacio.
-
-Exportación de los datos de PostgreSQL:
-
-``` sql
-COPY
-(
-    SELECT trips.id,
-           trips.vendor_id,
-           trips.pickup_datetime,
-           trips.dropoff_datetime,
-           trips.store_and_fwd_flag,
-           trips.rate_code_id,
-           trips.pickup_longitude,
-           trips.pickup_latitude,
-           trips.dropoff_longitude,
-           trips.dropoff_latitude,
-           trips.passenger_count,
-           trips.trip_distance,
-           trips.fare_amount,
-           trips.extra,
-           trips.mta_tax,
-           trips.tip_amount,
-           trips.tolls_amount,
-           trips.ehail_fee,
-           trips.improvement_surcharge,
-           trips.total_amount,
-           trips.payment_type,
-           trips.trip_type,
-           trips.pickup,
-           trips.dropoff,
-
-           cab_types.type cab_type,
-
-           weather.precipitation_tenths_of_mm rain,
-           weather.snow_depth_mm,
-           weather.snowfall_mm,
-           weather.max_temperature_tenths_degrees_celsius max_temp,
-           weather.min_temperature_tenths_degrees_celsius min_temp,
-           weather.average_wind_speed_tenths_of_meters_per_second wind,
-
-           pick_up.gid pickup_nyct2010_gid,
-           pick_up.ctlabel pickup_ctlabel,
-           pick_up.borocode pickup_borocode,
-           pick_up.boroname pickup_boroname,
-           pick_up.ct2010 pickup_ct2010,
-           pick_up.boroct2010 pickup_boroct2010,
-           pick_up.cdeligibil pickup_cdeligibil,
-           pick_up.ntacode pickup_ntacode,
-           pick_up.ntaname pickup_ntaname,
-           pick_up.puma pickup_puma,
-
-           drop_off.gid dropoff_nyct2010_gid,
-           drop_off.ctlabel dropoff_ctlabel,
-           drop_off.borocode dropoff_borocode,
-           drop_off.boroname dropoff_boroname,
-           drop_off.ct2010 dropoff_ct2010,
-           drop_off.boroct2010 dropoff_boroct2010,
-           drop_off.cdeligibil dropoff_cdeligibil,
-           drop_off.ntacode dropoff_ntacode,
-           drop_off.ntaname dropoff_ntaname,
-           drop_off.puma dropoff_puma
-    FROM trips
-    LEFT JOIN cab_types
-        ON trips.cab_type_id = cab_types.id
-    LEFT JOIN central_park_weather_observations_raw weather
-        ON weather.date = trips.pickup_datetime::date
-    LEFT JOIN nyct2010 pick_up
-        ON pick_up.gid = trips.pickup_nyct2010_gid
-    LEFT JOIN nyct2010 drop_off
-        ON drop_off.gid = trips.dropoff_nyct2010_gid
-) TO '/opt/milovidov/nyc-taxi-data/trips.tsv';
-```
-
-La instantánea de datos se crea a una velocidad de aproximadamente 50 MB por segundo. Al crear la instantánea, PostgreSQL lee desde el disco a una velocidad de aproximadamente 28 MB por segundo.
-Esto toma alrededor de 5 horas. El archivo TSV resultante es 590612904969 bytes.
-
-Crear una tabla temporal en ClickHouse:
-
-``` sql
-CREATE TABLE trips
-(
-trip_id                 UInt32,
-vendor_id               String,
-pickup_datetime         DateTime,
-dropoff_datetime        Nullable(DateTime),
-store_and_fwd_flag      Nullable(FixedString(1)),
-rate_code_id            Nullable(UInt8),
-pickup_longitude        Nullable(Float64),
-pickup_latitude         Nullable(Float64),
-dropoff_longitude       Nullable(Float64),
-dropoff_latitude        Nullable(Float64),
-passenger_count         Nullable(UInt8),
-trip_distance           Nullable(Float64),
-fare_amount             Nullable(Float32),
-extra                   Nullable(Float32),
-mta_tax                 Nullable(Float32),
-tip_amount              Nullable(Float32),
-tolls_amount            Nullable(Float32),
-ehail_fee               Nullable(Float32),
-improvement_surcharge   Nullable(Float32),
-total_amount            Nullable(Float32),
-payment_type            Nullable(String),
-trip_type               Nullable(UInt8),
-pickup                  Nullable(String),
-dropoff                 Nullable(String),
-cab_type                Nullable(String),
-precipitation           Nullable(UInt8),
-snow_depth              Nullable(UInt8),
-snowfall                Nullable(UInt8),
-max_temperature         Nullable(UInt8),
-min_temperature         Nullable(UInt8),
-average_wind_speed      Nullable(UInt8),
-pickup_nyct2010_gid     Nullable(UInt8),
-pickup_ctlabel          Nullable(String),
-pickup_borocode         Nullable(UInt8),
-pickup_boroname         Nullable(String),
-pickup_ct2010           Nullable(String),
-pickup_boroct2010       Nullable(String),
-pickup_cdeligibil       Nullable(FixedString(1)),
-pickup_ntacode          Nullable(String),
-pickup_ntaname          Nullable(String),
-pickup_puma             Nullable(String),
-dropoff_nyct2010_gid    Nullable(UInt8),
-dropoff_ctlabel         Nullable(String),
-dropoff_borocode        Nullable(UInt8),
-dropoff_boroname        Nullable(String),
-dropoff_ct2010          Nullable(String),
-dropoff_boroct2010      Nullable(String),
-dropoff_cdeligibil      Nullable(String),
-dropoff_ntacode         Nullable(String),
-dropoff_ntaname         Nullable(String),
-dropoff_puma            Nullable(String)
-) ENGINE = Log;
-```
-
-Es necesario para convertir campos a tipos de datos más correctos y, si es posible, para eliminar NULL.
-
-``` bash
-$ time clickhouse-client --query="INSERT INTO trips FORMAT TabSeparated" < trips.tsv
-
-real    75m56.214s
-```
-
-Los datos se leen a una velocidad de 112-140 Mb / segundo.
-La carga de datos en una tabla de tipos de registro en una secuencia tardó 76 minutos.
-Los datos de esta tabla utilizan 142 GB.
-
-(Importar datos directamente desde Postgres también es posible usando `COPY ... TO PROGRAM`.)
-
-Unfortunately, all the fields associated with the weather (precipitation…average_wind_speed) were filled with NULL. Because of this, we will remove them from the final data set.
-
-Para empezar, crearemos una tabla en un único servidor. Posteriormente haremos la mesa distribuida.
-
-Crear y rellenar una tabla de resumen:
-
-``` sql
-CREATE TABLE trips_mergetree
-ENGINE = MergeTree(pickup_date, pickup_datetime, 8192)
-AS SELECT
-
-trip_id,
-CAST(vendor_id AS Enum8('1' = 1, '2' = 2, 'CMT' = 3, 'VTS' = 4, 'DDS' = 5, 'B02512' = 10, 'B02598' = 11, 'B02617' = 12, 'B02682' = 13, 'B02764' = 14)) AS vendor_id,
-toDate(pickup_datetime) AS pickup_date,
-ifNull(pickup_datetime, toDateTime(0)) AS pickup_datetime,
-toDate(dropoff_datetime) AS dropoff_date,
-ifNull(dropoff_datetime, toDateTime(0)) AS dropoff_datetime,
-assumeNotNull(store_and_fwd_flag) IN ('Y', '1', '2') AS store_and_fwd_flag,
-assumeNotNull(rate_code_id) AS rate_code_id,
-assumeNotNull(pickup_longitude) AS pickup_longitude,
-assumeNotNull(pickup_latitude) AS pickup_latitude,
-assumeNotNull(dropoff_longitude) AS dropoff_longitude,
-assumeNotNull(dropoff_latitude) AS dropoff_latitude,
-assumeNotNull(passenger_count) AS passenger_count,
-assumeNotNull(trip_distance) AS trip_distance,
-assumeNotNull(fare_amount) AS fare_amount,
-assumeNotNull(extra) AS extra,
-assumeNotNull(mta_tax) AS mta_tax,
-assumeNotNull(tip_amount) AS tip_amount,
-assumeNotNull(tolls_amount) AS tolls_amount,
-assumeNotNull(ehail_fee) AS ehail_fee,
-assumeNotNull(improvement_surcharge) AS improvement_surcharge,
-assumeNotNull(total_amount) AS total_amount,
-CAST((assumeNotNull(payment_type) AS pt) IN ('CSH', 'CASH', 'Cash', 'CAS', 'Cas', '1') ? 'CSH' : (pt IN ('CRD', 'Credit', 'Cre', 'CRE', 'CREDIT', '2') ? 'CRE' : (pt IN ('NOC', 'No Charge', 'No', '3') ? 'NOC' : (pt IN ('DIS', 'Dispute', 'Dis', '4') ? 'DIS' : 'UNK'))) AS Enum8('CSH' = 1, 'CRE' = 2, 'UNK' = 0, 'NOC' = 3, 'DIS' = 4)) AS payment_type_,
-assumeNotNull(trip_type) AS trip_type,
-ifNull(toFixedString(unhex(pickup), 25), toFixedString('', 25)) AS pickup,
-ifNull(toFixedString(unhex(dropoff), 25), toFixedString('', 25)) AS dropoff,
-CAST(assumeNotNull(cab_type) AS Enum8('yellow' = 1, 'green' = 2, 'uber' = 3)) AS cab_type,
-
-assumeNotNull(pickup_nyct2010_gid) AS pickup_nyct2010_gid,
-toFloat32(ifNull(pickup_ctlabel, '0')) AS pickup_ctlabel,
-assumeNotNull(pickup_borocode) AS pickup_borocode,
-CAST(assumeNotNull(pickup_boroname) AS Enum8('Manhattan' = 1, 'Queens' = 4, 'Brooklyn' = 3, '' = 0, 'Bronx' = 2, 'Staten Island' = 5)) AS pickup_boroname,
-toFixedString(ifNull(pickup_ct2010, '000000'), 6) AS pickup_ct2010,
-toFixedString(ifNull(pickup_boroct2010, '0000000'), 7) AS pickup_boroct2010,
-CAST(assumeNotNull(ifNull(pickup_cdeligibil, ' ')) AS Enum8(' ' = 0, 'E' = 1, 'I' = 2)) AS pickup_cdeligibil,
-toFixedString(ifNull(pickup_ntacode, '0000'), 4) AS pickup_ntacode,
-
-CAST(assumeNotNull(pickup_ntaname) AS Enum16('' = 0, 'Airport' = 1, 'Allerton-Pelham Gardens' = 2, 'Annadale-Huguenot-Prince\'s Bay-Eltingville' = 3, 'Arden Heights' = 4, 'Astoria' = 5, 'Auburndale' = 6, 'Baisley Park' = 7, 'Bath Beach' = 8, 'Battery Park City-Lower Manhattan' = 9, 'Bay Ridge' = 10, 'Bayside-Bayside Hills' = 11, 'Bedford' = 12, 'Bedford Park-Fordham North' = 13, 'Bellerose' = 14, 'Belmont' = 15, 'Bensonhurst East' = 16, 'Bensonhurst West' = 17, 'Borough Park' = 18, 'Breezy Point-Belle Harbor-Rockaway Park-Broad Channel' = 19, 'Briarwood-Jamaica Hills' = 20, 'Brighton Beach' = 21, 'Bronxdale' = 22, 'Brooklyn Heights-Cobble Hill' = 23, 'Brownsville' = 24, 'Bushwick North' = 25, 'Bushwick South' = 26, 'Cambria Heights' = 27, 'Canarsie' = 28, 'Carroll Gardens-Columbia Street-Red Hook' = 29, 'Central Harlem North-Polo Grounds' = 30, 'Central Harlem South' = 31, 'Charleston-Richmond Valley-Tottenville' = 32, 'Chinatown' = 33, 'Claremont-Bathgate' = 34, 'Clinton' = 35, 'Clinton Hill' = 36, 'Co-op City' = 37, 'College Point' = 38, 'Corona' = 39, 'Crotona Park East' = 40, 'Crown Heights North' = 41, 'Crown Heights South' = 42, 'Cypress Hills-City Line' = 43, 'DUMBO-Vinegar Hill-Downtown Brooklyn-Boerum Hill' = 44, 'Douglas Manor-Douglaston-Little Neck' = 45, 'Dyker Heights' = 46, 'East Concourse-Concourse Village' = 47, 'East Elmhurst' = 48, 'East Flatbush-Farragut' = 49, 'East Flushing' = 50, 'East Harlem North' = 51, 'East Harlem South' = 52, 'East New York' = 53, 'East New York (Pennsylvania Ave)' = 54, 'East Tremont' = 55, 'East Village' = 56, 'East Williamsburg' = 57, 'Eastchester-Edenwald-Baychester' = 58, 'Elmhurst' = 59, 'Elmhurst-Maspeth' = 60, 'Erasmus' = 61, 'Far Rockaway-Bayswater' = 62, 'Flatbush' = 63, 'Flatlands' = 64, 'Flushing' = 65, 'Fordham South' = 66, 'Forest Hills' = 67, 'Fort Greene' = 68, 'Fresh Meadows-Utopia' = 69, 'Ft. Totten-Bay Terrace-Clearview' = 70, 'Georgetown-Marine Park-Bergen Beach-Mill Basin' = 71, 'Glen Oaks-Floral Park-New Hyde Park' = 72, 'Glendale' = 73, 'Gramercy' = 74, 'Grasmere-Arrochar-Ft. Wadsworth' = 75, 'Gravesend' = 76, 'Great Kills' = 77, 'Greenpoint' = 78, 'Grymes Hill-Clifton-Fox Hills' = 79, 'Hamilton Heights' = 80, 'Hammels-Arverne-Edgemere' = 81, 'Highbridge' = 82, 'Hollis' = 83, 'Homecrest' = 84, 'Hudson Yards-Chelsea-Flatiron-Union Square' = 85, 'Hunters Point-Sunnyside-West Maspeth' = 86, 'Hunts Point' = 87, 'Jackson Heights' = 88, 'Jamaica' = 89, 'Jamaica Estates-Holliswood' = 90, 'Kensington-Ocean Parkway' = 91, 'Kew Gardens' = 92, 'Kew Gardens Hills' = 93, 'Kingsbridge Heights' = 94, 'Laurelton' = 95, 'Lenox Hill-Roosevelt Island' = 96, 'Lincoln Square' = 97, 'Lindenwood-Howard Beach' = 98, 'Longwood' = 99, 'Lower East Side' = 100, 'Madison' = 101, 'Manhattanville' = 102, 'Marble Hill-Inwood' = 103, 'Mariner\'s Harbor-Arlington-Port Ivory-Graniteville' = 104, 'Maspeth' = 105, 'Melrose South-Mott Haven North' = 106, 'Middle Village' = 107, 'Midtown-Midtown South' = 108, 'Midwood' = 109, 'Morningside Heights' = 110, 'Morrisania-Melrose' = 111, 'Mott Haven-Port Morris' = 112, 'Mount Hope' = 113, 'Murray Hill' = 114, 'Murray Hill-Kips Bay' = 115, 'New Brighton-Silver Lake' = 116, 'New Dorp-Midland Beach' = 117, 'New Springville-Bloomfield-Travis' = 118, 'North Corona' = 119, 'North Riverdale-Fieldston-Riverdale' = 120, 'North Side-South Side' = 121, 'Norwood' = 122, 'Oakland Gardens' = 123, 'Oakwood-Oakwood Beach' = 124, 'Ocean Hill' = 125, 'Ocean Parkway South' = 126, 'Old Astoria' = 127, 'Old Town-Dongan Hills-South Beach' = 128, 'Ozone Park' = 129, 'Park Slope-Gowanus' = 130, 'Parkchester' = 131, 'Pelham Bay-Country Club-City Island' = 132, 'Pelham Parkway' = 133, 'Pomonok-Flushing Heights-Hillcrest' = 134, 'Port Richmond' = 135, 'Prospect Heights' = 136, 'Prospect Lefferts Gardens-Wingate' = 137, 'Queens Village' = 138, 'Queensboro Hill' = 139, 'Queensbridge-Ravenswood-Long Island City' = 140, 'Rego Park' = 141, 'Richmond Hill' = 142, 'Ridgewood' = 143, 'Rikers Island' = 144, 'Rosedale' = 145, 'Rossville-Woodrow' = 146, 'Rugby-Remsen Village' = 147, 'Schuylerville-Throgs Neck-Edgewater Park' = 148, 'Seagate-Coney Island' = 149, 'Sheepshead Bay-Gerritsen Beach-Manhattan Beach' = 150, 'SoHo-TriBeCa-Civic Center-Little Italy' = 151, 'Soundview-Bruckner' = 152, 'Soundview-Castle Hill-Clason Point-Harding Park' = 153, 'South Jamaica' = 154, 'South Ozone Park' = 155, 'Springfield Gardens North' = 156, 'Springfield Gardens South-Brookville' = 157, 'Spuyten Duyvil-Kingsbridge' = 158, 'St. Albans' = 159, 'Stapleton-Rosebank' = 160, 'Starrett City' = 161, 'Steinway' = 162, 'Stuyvesant Heights' = 163, 'Stuyvesant Town-Cooper Village' = 164, 'Sunset Park East' = 165, 'Sunset Park West' = 166, 'Todt Hill-Emerson Hill-Heartland Village-Lighthouse Hill' = 167, 'Turtle Bay-East Midtown' = 168, 'University Heights-Morris Heights' = 169, 'Upper East Side-Carnegie Hill' = 170, 'Upper West Side' = 171, 'Van Cortlandt Village' = 172, 'Van Nest-Morris Park-Westchester Square' = 173, 'Washington Heights North' = 174, 'Washington Heights South' = 175, 'West Brighton' = 176, 'West Concourse' = 177, 'West Farms-Bronx River' = 178, 'West New Brighton-New Brighton-St. George' = 179, 'West Village' = 180, 'Westchester-Unionport' = 181, 'Westerleigh' = 182, 'Whitestone' = 183, 'Williamsbridge-Olinville' = 184, 'Williamsburg' = 185, 'Windsor Terrace' = 186, 'Woodhaven' = 187, 'Woodlawn-Wakefield' = 188, 'Woodside' = 189, 'Yorkville' = 190, 'park-cemetery-etc-Bronx' = 191, 'park-cemetery-etc-Brooklyn' = 192, 'park-cemetery-etc-Manhattan' = 193, 'park-cemetery-etc-Queens' = 194, 'park-cemetery-etc-Staten Island' = 195)) AS pickup_ntaname,
-
-toUInt16(ifNull(pickup_puma, '0')) AS pickup_puma,
-
-assumeNotNull(dropoff_nyct2010_gid) AS dropoff_nyct2010_gid,
-toFloat32(ifNull(dropoff_ctlabel, '0')) AS dropoff_ctlabel,
-assumeNotNull(dropoff_borocode) AS dropoff_borocode,
-CAST(assumeNotNull(dropoff_boroname) AS Enum8('Manhattan' = 1, 'Queens' = 4, 'Brooklyn' = 3, '' = 0, 'Bronx' = 2, 'Staten Island' = 5)) AS dropoff_boroname,
-toFixedString(ifNull(dropoff_ct2010, '000000'), 6) AS dropoff_ct2010,
-toFixedString(ifNull(dropoff_boroct2010, '0000000'), 7) AS dropoff_boroct2010,
-CAST(assumeNotNull(ifNull(dropoff_cdeligibil, ' ')) AS Enum8(' ' = 0, 'E' = 1, 'I' = 2)) AS dropoff_cdeligibil,
-toFixedString(ifNull(dropoff_ntacode, '0000'), 4) AS dropoff_ntacode,
-
-CAST(assumeNotNull(dropoff_ntaname) AS Enum16('' = 0, 'Airport' = 1, 'Allerton-Pelham Gardens' = 2, 'Annadale-Huguenot-Prince\'s Bay-Eltingville' = 3, 'Arden Heights' = 4, 'Astoria' = 5, 'Auburndale' = 6, 'Baisley Park' = 7, 'Bath Beach' = 8, 'Battery Park City-Lower Manhattan' = 9, 'Bay Ridge' = 10, 'Bayside-Bayside Hills' = 11, 'Bedford' = 12, 'Bedford Park-Fordham North' = 13, 'Bellerose' = 14, 'Belmont' = 15, 'Bensonhurst East' = 16, 'Bensonhurst West' = 17, 'Borough Park' = 18, 'Breezy Point-Belle Harbor-Rockaway Park-Broad Channel' = 19, 'Briarwood-Jamaica Hills' = 20, 'Brighton Beach' = 21, 'Bronxdale' = 22, 'Brooklyn Heights-Cobble Hill' = 23, 'Brownsville' = 24, 'Bushwick North' = 25, 'Bushwick South' = 26, 'Cambria Heights' = 27, 'Canarsie' = 28, 'Carroll Gardens-Columbia Street-Red Hook' = 29, 'Central Harlem North-Polo Grounds' = 30, 'Central Harlem South' = 31, 'Charleston-Richmond Valley-Tottenville' = 32, 'Chinatown' = 33, 'Claremont-Bathgate' = 34, 'Clinton' = 35, 'Clinton Hill' = 36, 'Co-op City' = 37, 'College Point' = 38, 'Corona' = 39, 'Crotona Park East' = 40, 'Crown Heights North' = 41, 'Crown Heights South' = 42, 'Cypress Hills-City Line' = 43, 'DUMBO-Vinegar Hill-Downtown Brooklyn-Boerum Hill' = 44, 'Douglas Manor-Douglaston-Little Neck' = 45, 'Dyker Heights' = 46, 'East Concourse-Concourse Village' = 47, 'East Elmhurst' = 48, 'East Flatbush-Farragut' = 49, 'East Flushing' = 50, 'East Harlem North' = 51, 'East Harlem South' = 52, 'East New York' = 53, 'East New York (Pennsylvania Ave)' = 54, 'East Tremont' = 55, 'East Village' = 56, 'East Williamsburg' = 57, 'Eastchester-Edenwald-Baychester' = 58, 'Elmhurst' = 59, 'Elmhurst-Maspeth' = 60, 'Erasmus' = 61, 'Far Rockaway-Bayswater' = 62, 'Flatbush' = 63, 'Flatlands' = 64, 'Flushing' = 65, 'Fordham South' = 66, 'Forest Hills' = 67, 'Fort Greene' = 68, 'Fresh Meadows-Utopia' = 69, 'Ft. Totten-Bay Terrace-Clearview' = 70, 'Georgetown-Marine Park-Bergen Beach-Mill Basin' = 71, 'Glen Oaks-Floral Park-New Hyde Park' = 72, 'Glendale' = 73, 'Gramercy' = 74, 'Grasmere-Arrochar-Ft. Wadsworth' = 75, 'Gravesend' = 76, 'Great Kills' = 77, 'Greenpoint' = 78, 'Grymes Hill-Clifton-Fox Hills' = 79, 'Hamilton Heights' = 80, 'Hammels-Arverne-Edgemere' = 81, 'Highbridge' = 82, 'Hollis' = 83, 'Homecrest' = 84, 'Hudson Yards-Chelsea-Flatiron-Union Square' = 85, 'Hunters Point-Sunnyside-West Maspeth' = 86, 'Hunts Point' = 87, 'Jackson Heights' = 88, 'Jamaica' = 89, 'Jamaica Estates-Holliswood' = 90, 'Kensington-Ocean Parkway' = 91, 'Kew Gardens' = 92, 'Kew Gardens Hills' = 93, 'Kingsbridge Heights' = 94, 'Laurelton' = 95, 'Lenox Hill-Roosevelt Island' = 96, 'Lincoln Square' = 97, 'Lindenwood-Howard Beach' = 98, 'Longwood' = 99, 'Lower East Side' = 100, 'Madison' = 101, 'Manhattanville' = 102, 'Marble Hill-Inwood' = 103, 'Mariner\'s Harbor-Arlington-Port Ivory-Graniteville' = 104, 'Maspeth' = 105, 'Melrose South-Mott Haven North' = 106, 'Middle Village' = 107, 'Midtown-Midtown South' = 108, 'Midwood' = 109, 'Morningside Heights' = 110, 'Morrisania-Melrose' = 111, 'Mott Haven-Port Morris' = 112, 'Mount Hope' = 113, 'Murray Hill' = 114, 'Murray Hill-Kips Bay' = 115, 'New Brighton-Silver Lake' = 116, 'New Dorp-Midland Beach' = 117, 'New Springville-Bloomfield-Travis' = 118, 'North Corona' = 119, 'North Riverdale-Fieldston-Riverdale' = 120, 'North Side-South Side' = 121, 'Norwood' = 122, 'Oakland Gardens' = 123, 'Oakwood-Oakwood Beach' = 124, 'Ocean Hill' = 125, 'Ocean Parkway South' = 126, 'Old Astoria' = 127, 'Old Town-Dongan Hills-South Beach' = 128, 'Ozone Park' = 129, 'Park Slope-Gowanus' = 130, 'Parkchester' = 131, 'Pelham Bay-Country Club-City Island' = 132, 'Pelham Parkway' = 133, 'Pomonok-Flushing Heights-Hillcrest' = 134, 'Port Richmond' = 135, 'Prospect Heights' = 136, 'Prospect Lefferts Gardens-Wingate' = 137, 'Queens Village' = 138, 'Queensboro Hill' = 139, 'Queensbridge-Ravenswood-Long Island City' = 140, 'Rego Park' = 141, 'Richmond Hill' = 142, 'Ridgewood' = 143, 'Rikers Island' = 144, 'Rosedale' = 145, 'Rossville-Woodrow' = 146, 'Rugby-Remsen Village' = 147, 'Schuylerville-Throgs Neck-Edgewater Park' = 148, 'Seagate-Coney Island' = 149, 'Sheepshead Bay-Gerritsen Beach-Manhattan Beach' = 150, 'SoHo-TriBeCa-Civic Center-Little Italy' = 151, 'Soundview-Bruckner' = 152, 'Soundview-Castle Hill-Clason Point-Harding Park' = 153, 'South Jamaica' = 154, 'South Ozone Park' = 155, 'Springfield Gardens North' = 156, 'Springfield Gardens South-Brookville' = 157, 'Spuyten Duyvil-Kingsbridge' = 158, 'St. Albans' = 159, 'Stapleton-Rosebank' = 160, 'Starrett City' = 161, 'Steinway' = 162, 'Stuyvesant Heights' = 163, 'Stuyvesant Town-Cooper Village' = 164, 'Sunset Park East' = 165, 'Sunset Park West' = 166, 'Todt Hill-Emerson Hill-Heartland Village-Lighthouse Hill' = 167, 'Turtle Bay-East Midtown' = 168, 'University Heights-Morris Heights' = 169, 'Upper East Side-Carnegie Hill' = 170, 'Upper West Side' = 171, 'Van Cortlandt Village' = 172, 'Van Nest-Morris Park-Westchester Square' = 173, 'Washington Heights North' = 174, 'Washington Heights South' = 175, 'West Brighton' = 176, 'West Concourse' = 177, 'West Farms-Bronx River' = 178, 'West New Brighton-New Brighton-St. George' = 179, 'West Village' = 180, 'Westchester-Unionport' = 181, 'Westerleigh' = 182, 'Whitestone' = 183, 'Williamsbridge-Olinville' = 184, 'Williamsburg' = 185, 'Windsor Terrace' = 186, 'Woodhaven' = 187, 'Woodlawn-Wakefield' = 188, 'Woodside' = 189, 'Yorkville' = 190, 'park-cemetery-etc-Bronx' = 191, 'park-cemetery-etc-Brooklyn' = 192, 'park-cemetery-etc-Manhattan' = 193, 'park-cemetery-etc-Queens' = 194, 'park-cemetery-etc-Staten Island' = 195)) AS dropoff_ntaname,
-
-toUInt16(ifNull(dropoff_puma, '0')) AS dropoff_puma
-
-FROM trips
-```
-
-Esto toma 3030 segundos a una velocidad de aproximadamente 428,000 filas por segundo.
-Para cargarlo más rápido, puede crear la tabla con el `Log` motor en lugar de `MergeTree`. En este caso, la descarga funciona más rápido que 200 segundos.
-
-La tabla utiliza 126 GB de espacio en disco.
-
-``` sql
-SELECT formatReadableSize(sum(bytes)) FROM system.parts WHERE table = 'trips_mergetree' AND active
-```
-
-``` text
-┌─formatReadableSize(sum(bytes))─┐
-│ 126.18 GiB                     │
-└────────────────────────────────┘
-```
-
-Entre otras cosas, puede ejecutar la consulta OPTIMIZE en MergeTree. Pero no es necesario ya que todo estará bien sin él.
-
-## Descarga de Prepared Partitions {#download-of-prepared-partitions}
-
-``` bash
-$ curl -O https://datasets.clickhouse.tech/trips_mergetree/partitions/trips_mergetree.tar
-$ tar xvf trips_mergetree.tar -C /var/lib/clickhouse # path to ClickHouse data directory
-$ # check permissions of unpacked data, fix if required
-$ sudo service clickhouse-server restart
-$ clickhouse-client --query "select count(*) from datasets.trips_mergetree"
-```
-
-!!! info "INFO"
-    Si va a ejecutar las consultas que se describen a continuación, debe usar el nombre completo de la tabla, `datasets.trips_mergetree`.
-
-## Resultados en un solo servidor {#results-on-single-server}
-
-Q1:
-
-``` sql
-SELECT cab_type, count(*) FROM trips_mergetree GROUP BY cab_type
-```
-
-0.490 segundos.
-
-Q2:
-
-``` sql
-SELECT passenger_count, avg(total_amount) FROM trips_mergetree GROUP BY passenger_count
-```
-
-1.224 segundos.
-
-Q3:
-
-``` sql
-SELECT passenger_count, toYear(pickup_date) AS year, count(*) FROM trips_mergetree GROUP BY passenger_count, year
-```
-
-2.104 segundos.
-
-Q4:
-
-``` sql
-SELECT passenger_count, toYear(pickup_date) AS year, round(trip_distance) AS distance, count(*)
-FROM trips_mergetree
-GROUP BY passenger_count, year, distance
-ORDER BY year, count(*) DESC
-```
-
-3.593 segundos.
-
-Se utilizó el siguiente servidor:
-
-Dos CPU Intel (R) Xeon (R) E5-2650 v2 @ 2.60GHz, 16 núcleos físicos en total, 128 GiB RAM, 8x6 TB HD en hardware RAID-5
-
-El tiempo de ejecución es el mejor de tres carreras. Pero a partir de la segunda ejecución, las consultas leen datos de la memoria caché del sistema de archivos. No se produce más almacenamiento en caché: los datos se leen y procesan en cada ejecución.
-
-Creación de una tabla en tres servidores:
-
-En cada servidor:
-
-``` sql
-CREATE TABLE default.trips_mergetree_third ( trip_id UInt32,  vendor_id Enum8('1' = 1, '2' = 2, 'CMT' = 3, 'VTS' = 4, 'DDS' = 5, 'B02512' = 10, 'B02598' = 11, 'B02617' = 12, 'B02682' = 13, 'B02764' = 14),  pickup_date Date,  pickup_datetime DateTime,  dropoff_date Date,  dropoff_datetime DateTime,  store_and_fwd_flag UInt8,  rate_code_id UInt8,  pickup_longitude Float64,  pickup_latitude Float64,  dropoff_longitude Float64,  dropoff_latitude Float64,  passenger_count UInt8,  trip_distance Float64,  fare_amount Float32,  extra Float32,  mta_tax Float32,  tip_amount Float32,  tolls_amount Float32,  ehail_fee Float32,  improvement_surcharge Float32,  total_amount Float32,  payment_type_ Enum8('UNK' = 0, 'CSH' = 1, 'CRE' = 2, 'NOC' = 3, 'DIS' = 4),  trip_type UInt8,  pickup FixedString(25),  dropoff FixedString(25),  cab_type Enum8('yellow' = 1, 'green' = 2, 'uber' = 3),  pickup_nyct2010_gid UInt8,  pickup_ctlabel Float32,  pickup_borocode UInt8,  pickup_boroname Enum8('' = 0, 'Manhattan' = 1, 'Bronx' = 2, 'Brooklyn' = 3, 'Queens' = 4, 'Staten Island' = 5),  pickup_ct2010 FixedString(6),  pickup_boroct2010 FixedString(7),  pickup_cdeligibil Enum8(' ' = 0, 'E' = 1, 'I' = 2),  pickup_ntacode FixedString(4),  pickup_ntaname Enum16('' = 0, 'Airport' = 1, 'Allerton-Pelham Gardens' = 2, 'Annadale-Huguenot-Prince\'s Bay-Eltingville' = 3, 'Arden Heights' = 4, 'Astoria' = 5, 'Auburndale' = 6, 'Baisley Park' = 7, 'Bath Beach' = 8, 'Battery Park City-Lower Manhattan' = 9, 'Bay Ridge' = 10, 'Bayside-Bayside Hills' = 11, 'Bedford' = 12, 'Bedford Park-Fordham North' = 13, 'Bellerose' = 14, 'Belmont' = 15, 'Bensonhurst East' = 16, 'Bensonhurst West' = 17, 'Borough Park' = 18, 'Breezy Point-Belle Harbor-Rockaway Park-Broad Channel' = 19, 'Briarwood-Jamaica Hills' = 20, 'Brighton Beach' = 21, 'Bronxdale' = 22, 'Brooklyn Heights-Cobble Hill' = 23, 'Brownsville' = 24, 'Bushwick North' = 25, 'Bushwick South' = 26, 'Cambria Heights' = 27, 'Canarsie' = 28, 'Carroll Gardens-Columbia Street-Red Hook' = 29, 'Central Harlem North-Polo Grounds' = 30, 'Central Harlem South' = 31, 'Charleston-Richmond Valley-Tottenville' = 32, 'Chinatown' = 33, 'Claremont-Bathgate' = 34, 'Clinton' = 35, 'Clinton Hill' = 36, 'Co-op City' = 37, 'College Point' = 38, 'Corona' = 39, 'Crotona Park East' = 40, 'Crown Heights North' = 41, 'Crown Heights South' = 42, 'Cypress Hills-City Line' = 43, 'DUMBO-Vinegar Hill-Downtown Brooklyn-Boerum Hill' = 44, 'Douglas Manor-Douglaston-Little Neck' = 45, 'Dyker Heights' = 46, 'East Concourse-Concourse Village' = 47, 'East Elmhurst' = 48, 'East Flatbush-Farragut' = 49, 'East Flushing' = 50, 'East Harlem North' = 51, 'East Harlem South' = 52, 'East New York' = 53, 'East New York (Pennsylvania Ave)' = 54, 'East Tremont' = 55, 'East Village' = 56, 'East Williamsburg' = 57, 'Eastchester-Edenwald-Baychester' = 58, 'Elmhurst' = 59, 'Elmhurst-Maspeth' = 60, 'Erasmus' = 61, 'Far Rockaway-Bayswater' = 62, 'Flatbush' = 63, 'Flatlands' = 64, 'Flushing' = 65, 'Fordham South' = 66, 'Forest Hills' = 67, 'Fort Greene' = 68, 'Fresh Meadows-Utopia' = 69, 'Ft. Totten-Bay Terrace-Clearview' = 70, 'Georgetown-Marine Park-Bergen Beach-Mill Basin' = 71, 'Glen Oaks-Floral Park-New Hyde Park' = 72, 'Glendale' = 73, 'Gramercy' = 74, 'Grasmere-Arrochar-Ft. Wadsworth' = 75, 'Gravesend' = 76, 'Great Kills' = 77, 'Greenpoint' = 78, 'Grymes Hill-Clifton-Fox Hills' = 79, 'Hamilton Heights' = 80, 'Hammels-Arverne-Edgemere' = 81, 'Highbridge' = 82, 'Hollis' = 83, 'Homecrest' = 84, 'Hudson Yards-Chelsea-Flatiron-Union Square' = 85, 'Hunters Point-Sunnyside-West Maspeth' = 86, 'Hunts Point' = 87, 'Jackson Heights' = 88, 'Jamaica' = 89, 'Jamaica Estates-Holliswood' = 90, 'Kensington-Ocean Parkway' = 91, 'Kew Gardens' = 92, 'Kew Gardens Hills' = 93, 'Kingsbridge Heights' = 94, 'Laurelton' = 95, 'Lenox Hill-Roosevelt Island' = 96, 'Lincoln Square' = 97, 'Lindenwood-Howard Beach' = 98, 'Longwood' = 99, 'Lower East Side' = 100, 'Madison' = 101, 'Manhattanville' = 102, 'Marble Hill-Inwood' = 103, 'Mariner\'s Harbor-Arlington-Port Ivory-Graniteville' = 104, 'Maspeth' = 105, 'Melrose South-Mott Haven North' = 106, 'Middle Village' = 107, 'Midtown-Midtown South' = 108, 'Midwood' = 109, 'Morningside Heights' = 110, 'Morrisania-Melrose' = 111, 'Mott Haven-Port Morris' = 112, 'Mount Hope' = 113, 'Murray Hill' = 114, 'Murray Hill-Kips Bay' = 115, 'New Brighton-Silver Lake' = 116, 'New Dorp-Midland Beach' = 117, 'New Springville-Bloomfield-Travis' = 118, 'North Corona' = 119, 'North Riverdale-Fieldston-Riverdale' = 120, 'North Side-South Side' = 121, 'Norwood' = 122, 'Oakland Gardens' = 123, 'Oakwood-Oakwood Beach' = 124, 'Ocean Hill' = 125, 'Ocean Parkway South' = 126, 'Old Astoria' = 127, 'Old Town-Dongan Hills-South Beach' = 128, 'Ozone Park' = 129, 'Park Slope-Gowanus' = 130, 'Parkchester' = 131, 'Pelham Bay-Country Club-City Island' = 132, 'Pelham Parkway' = 133, 'Pomonok-Flushing Heights-Hillcrest' = 134, 'Port Richmond' = 135, 'Prospect Heights' = 136, 'Prospect Lefferts Gardens-Wingate' = 137, 'Queens Village' = 138, 'Queensboro Hill' = 139, 'Queensbridge-Ravenswood-Long Island City' = 140, 'Rego Park' = 141, 'Richmond Hill' = 142, 'Ridgewood' = 143, 'Rikers Island' = 144, 'Rosedale' = 145, 'Rossville-Woodrow' = 146, 'Rugby-Remsen Village' = 147, 'Schuylerville-Throgs Neck-Edgewater Park' = 148, 'Seagate-Coney Island' = 149, 'Sheepshead Bay-Gerritsen Beach-Manhattan Beach' = 150, 'SoHo-TriBeCa-Civic Center-Little Italy' = 151, 'Soundview-Bruckner' = 152, 'Soundview-Castle Hill-Clason Point-Harding Park' = 153, 'South Jamaica' = 154, 'South Ozone Park' = 155, 'Springfield Gardens North' = 156, 'Springfield Gardens South-Brookville' = 157, 'Spuyten Duyvil-Kingsbridge' = 158, 'St. Albans' = 159, 'Stapleton-Rosebank' = 160, 'Starrett City' = 161, 'Steinway' = 162, 'Stuyvesant Heights' = 163, 'Stuyvesant Town-Cooper Village' = 164, 'Sunset Park East' = 165, 'Sunset Park West' = 166, 'Todt Hill-Emerson Hill-Heartland Village-Lighthouse Hill' = 167, 'Turtle Bay-East Midtown' = 168, 'University Heights-Morris Heights' = 169, 'Upper East Side-Carnegie Hill' = 170, 'Upper West Side' = 171, 'Van Cortlandt Village' = 172, 'Van Nest-Morris Park-Westchester Square' = 173, 'Washington Heights North' = 174, 'Washington Heights South' = 175, 'West Brighton' = 176, 'West Concourse' = 177, 'West Farms-Bronx River' = 178, 'West New Brighton-New Brighton-St. George' = 179, 'West Village' = 180, 'Westchester-Unionport' = 181, 'Westerleigh' = 182, 'Whitestone' = 183, 'Williamsbridge-Olinville' = 184, 'Williamsburg' = 185, 'Windsor Terrace' = 186, 'Woodhaven' = 187, 'Woodlawn-Wakefield' = 188, 'Woodside' = 189, 'Yorkville' = 190, 'park-cemetery-etc-Bronx' = 191, 'park-cemetery-etc-Brooklyn' = 192, 'park-cemetery-etc-Manhattan' = 193, 'park-cemetery-etc-Queens' = 194, 'park-cemetery-etc-Staten Island' = 195),  pickup_puma UInt16,  dropoff_nyct2010_gid UInt8,  dropoff_ctlabel Float32,  dropoff_borocode UInt8,  dropoff_boroname Enum8('' = 0, 'Manhattan' = 1, 'Bronx' = 2, 'Brooklyn' = 3, 'Queens' = 4, 'Staten Island' = 5),  dropoff_ct2010 FixedString(6),  dropoff_boroct2010 FixedString(7),  dropoff_cdeligibil Enum8(' ' = 0, 'E' = 1, 'I' = 2),  dropoff_ntacode FixedString(4),  dropoff_ntaname Enum16('' = 0, 'Airport' = 1, 'Allerton-Pelham Gardens' = 2, 'Annadale-Huguenot-Prince\'s Bay-Eltingville' = 3, 'Arden Heights' = 4, 'Astoria' = 5, 'Auburndale' = 6, 'Baisley Park' = 7, 'Bath Beach' = 8, 'Battery Park City-Lower Manhattan' = 9, 'Bay Ridge' = 10, 'Bayside-Bayside Hills' = 11, 'Bedford' = 12, 'Bedford Park-Fordham North' = 13, 'Bellerose' = 14, 'Belmont' = 15, 'Bensonhurst East' = 16, 'Bensonhurst West' = 17, 'Borough Park' = 18, 'Breezy Point-Belle Harbor-Rockaway Park-Broad Channel' = 19, 'Briarwood-Jamaica Hills' = 20, 'Brighton Beach' = 21, 'Bronxdale' = 22, 'Brooklyn Heights-Cobble Hill' = 23, 'Brownsville' = 24, 'Bushwick North' = 25, 'Bushwick South' = 26, 'Cambria Heights' = 27, 'Canarsie' = 28, 'Carroll Gardens-Columbia Street-Red Hook' = 29, 'Central Harlem North-Polo Grounds' = 30, 'Central Harlem South' = 31, 'Charleston-Richmond Valley-Tottenville' = 32, 'Chinatown' = 33, 'Claremont-Bathgate' = 34, 'Clinton' = 35, 'Clinton Hill' = 36, 'Co-op City' = 37, 'College Point' = 38, 'Corona' = 39, 'Crotona Park East' = 40, 'Crown Heights North' = 41, 'Crown Heights South' = 42, 'Cypress Hills-City Line' = 43, 'DUMBO-Vinegar Hill-Downtown Brooklyn-Boerum Hill' = 44, 'Douglas Manor-Douglaston-Little Neck' = 45, 'Dyker Heights' = 46, 'East Concourse-Concourse Village' = 47, 'East Elmhurst' = 48, 'East Flatbush-Farragut' = 49, 'East Flushing' = 50, 'East Harlem North' = 51, 'East Harlem South' = 52, 'East New York' = 53, 'East New York (Pennsylvania Ave)' = 54, 'East Tremont' = 55, 'East Village' = 56, 'East Williamsburg' = 57, 'Eastchester-Edenwald-Baychester' = 58, 'Elmhurst' = 59, 'Elmhurst-Maspeth' = 60, 'Erasmus' = 61, 'Far Rockaway-Bayswater' = 62, 'Flatbush' = 63, 'Flatlands' = 64, 'Flushing' = 65, 'Fordham South' = 66, 'Forest Hills' = 67, 'Fort Greene' = 68, 'Fresh Meadows-Utopia' = 69, 'Ft. Totten-Bay Terrace-Clearview' = 70, 'Georgetown-Marine Park-Bergen Beach-Mill Basin' = 71, 'Glen Oaks-Floral Park-New Hyde Park' = 72, 'Glendale' = 73, 'Gramercy' = 74, 'Grasmere-Arrochar-Ft. Wadsworth' = 75, 'Gravesend' = 76, 'Great Kills' = 77, 'Greenpoint' = 78, 'Grymes Hill-Clifton-Fox Hills' = 79, 'Hamilton Heights' = 80, 'Hammels-Arverne-Edgemere' = 81, 'Highbridge' = 82, 'Hollis' = 83, 'Homecrest' = 84, 'Hudson Yards-Chelsea-Flatiron-Union Square' = 85, 'Hunters Point-Sunnyside-West Maspeth' = 86, 'Hunts Point' = 87, 'Jackson Heights' = 88, 'Jamaica' = 89, 'Jamaica Estates-Holliswood' = 90, 'Kensington-Ocean Parkway' = 91, 'Kew Gardens' = 92, 'Kew Gardens Hills' = 93, 'Kingsbridge Heights' = 94, 'Laurelton' = 95, 'Lenox Hill-Roosevelt Island' = 96, 'Lincoln Square' = 97, 'Lindenwood-Howard Beach' = 98, 'Longwood' = 99, 'Lower East Side' = 100, 'Madison' = 101, 'Manhattanville' = 102, 'Marble Hill-Inwood' = 103, 'Mariner\'s Harbor-Arlington-Port Ivory-Graniteville' = 104, 'Maspeth' = 105, 'Melrose South-Mott Haven North' = 106, 'Middle Village' = 107, 'Midtown-Midtown South' = 108, 'Midwood' = 109, 'Morningside Heights' = 110, 'Morrisania-Melrose' = 111, 'Mott Haven-Port Morris' = 112, 'Mount Hope' = 113, 'Murray Hill' = 114, 'Murray Hill-Kips Bay' = 115, 'New Brighton-Silver Lake' = 116, 'New Dorp-Midland Beach' = 117, 'New Springville-Bloomfield-Travis' = 118, 'North Corona' = 119, 'North Riverdale-Fieldston-Riverdale' = 120, 'North Side-South Side' = 121, 'Norwood' = 122, 'Oakland Gardens' = 123, 'Oakwood-Oakwood Beach' = 124, 'Ocean Hill' = 125, 'Ocean Parkway South' = 126, 'Old Astoria' = 127, 'Old Town-Dongan Hills-South Beach' = 128, 'Ozone Park' = 129, 'Park Slope-Gowanus' = 130, 'Parkchester' = 131, 'Pelham Bay-Country Club-City Island' = 132, 'Pelham Parkway' = 133, 'Pomonok-Flushing Heights-Hillcrest' = 134, 'Port Richmond' = 135, 'Prospect Heights' = 136, 'Prospect Lefferts Gardens-Wingate' = 137, 'Queens Village' = 138, 'Queensboro Hill' = 139, 'Queensbridge-Ravenswood-Long Island City' = 140, 'Rego Park' = 141, 'Richmond Hill' = 142, 'Ridgewood' = 143, 'Rikers Island' = 144, 'Rosedale' = 145, 'Rossville-Woodrow' = 146, 'Rugby-Remsen Village' = 147, 'Schuylerville-Throgs Neck-Edgewater Park' = 148, 'Seagate-Coney Island' = 149, 'Sheepshead Bay-Gerritsen Beach-Manhattan Beach' = 150, 'SoHo-TriBeCa-Civic Center-Little Italy' = 151, 'Soundview-Bruckner' = 152, 'Soundview-Castle Hill-Clason Point-Harding Park' = 153, 'South Jamaica' = 154, 'South Ozone Park' = 155, 'Springfield Gardens North' = 156, 'Springfield Gardens South-Brookville' = 157, 'Spuyten Duyvil-Kingsbridge' = 158, 'St. Albans' = 159, 'Stapleton-Rosebank' = 160, 'Starrett City' = 161, 'Steinway' = 162, 'Stuyvesant Heights' = 163, 'Stuyvesant Town-Cooper Village' = 164, 'Sunset Park East' = 165, 'Sunset Park West' = 166, 'Todt Hill-Emerson Hill-Heartland Village-Lighthouse Hill' = 167, 'Turtle Bay-East Midtown' = 168, 'University Heights-Morris Heights' = 169, 'Upper East Side-Carnegie Hill' = 170, 'Upper West Side' = 171, 'Van Cortlandt Village' = 172, 'Van Nest-Morris Park-Westchester Square' = 173, 'Washington Heights North' = 174, 'Washington Heights South' = 175, 'West Brighton' = 176, 'West Concourse' = 177, 'West Farms-Bronx River' = 178, 'West New Brighton-New Brighton-St. George' = 179, 'West Village' = 180, 'Westchester-Unionport' = 181, 'Westerleigh' = 182, 'Whitestone' = 183, 'Williamsbridge-Olinville' = 184, 'Williamsburg' = 185, 'Windsor Terrace' = 186, 'Woodhaven' = 187, 'Woodlawn-Wakefield' = 188, 'Woodside' = 189, 'Yorkville' = 190, 'park-cemetery-etc-Bronx' = 191, 'park-cemetery-etc-Brooklyn' = 192, 'park-cemetery-etc-Manhattan' = 193, 'park-cemetery-etc-Queens' = 194, 'park-cemetery-etc-Staten Island' = 195),  dropoff_puma UInt16) ENGINE = MergeTree(pickup_date, pickup_datetime, 8192)
-```
-
-En el servidor de origen:
-
-``` sql
-CREATE TABLE trips_mergetree_x3 AS trips_mergetree_third ENGINE = Distributed(perftest, default, trips_mergetree_third, rand())
-```
-
-La siguiente consulta redistribuye los datos:
-
-``` sql
-INSERT INTO trips_mergetree_x3 SELECT * FROM trips_mergetree
-```
-
-Esto tarda 2454 segundos.
-
-En tres servidores:
-
-Q1: 0.212 segundos.
-Q2: 0.438 segundos.
-Q3: 0.733 segundos.
-Q4: 1.241 segundos.
-
-No hay sorpresas aquí, ya que las consultas se escalan linealmente.
-
-También tenemos los resultados de un clúster de 140 servidores:
-
-Q1: 0,028 seg.
-Q2: 0,043 seg.
-Q3: 0,051 seg.
-Q4: 0,072 seg.
-
-En este caso, el tiempo de procesamiento de la consulta está determinado sobre todo por la latencia de la red.
-Ejecutamos consultas utilizando un cliente ubicado en un centro de datos de Yandex en Finlandia en un clúster en Rusia, que agregó aproximadamente 20 ms de latencia.
-
-## Resumen {#summary}
-
-| servidor | Q1    | Q2    | Q3    | Q4    |
-|----------|-------|-------|-------|-------|
-| 1        | 0.490 | 1.224 | 2.104 | 3.593 |
-| 3        | 0.212 | 0.438 | 0.733 | 1.241 |
-| 140      | 0.028 | 0.043 | 0.051 | 0.072 |
-
-[Artículo Original](https://clickhouse.tech/docs/en/getting_started/example_datasets/nyc_taxi/) <!--hide-->
diff --git a/docs/es/getting-started/example-datasets/ontime.md b/docs/es/getting-started/example-datasets/ontime.md
deleted file mode 100644
index f89d74048bd..00000000000
--- a/docs/es/getting-started/example-datasets/ontime.md
+++ /dev/null
@@ -1,412 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 15
-toc_title: A tiempo
----
-
-# A tiempo {#ontime}
-
-Este conjunto de datos se puede obtener de dos maneras:
-
--   importación de datos sin procesar
--   descarga de particiones preparadas
-
-## Importar desde datos sin procesar {#import-from-raw-data}
-
-Descarga de datos:
-
-``` bash
-for s in `seq 1987 2018`
-do
-for m in `seq 1 12`
-do
-wget https://transtats.bts.gov/PREZIP/On_Time_Reporting_Carrier_On_Time_Performance_1987_present_${s}_${m}.zip
-done
-done
-```
-
-(a partir de https://github.com/Percona-Lab/ontime-airline-performance/blob/master/download.sh )
-
-Creación de una tabla:
-
-``` sql
-CREATE TABLE `ontime` (
-  `Year` UInt16,
-  `Quarter` UInt8,
-  `Month` UInt8,
-  `DayofMonth` UInt8,
-  `DayOfWeek` UInt8,
-  `FlightDate` Date,
-  `UniqueCarrier` FixedString(7),
-  `AirlineID` Int32,
-  `Carrier` FixedString(2),
-  `TailNum` String,
-  `FlightNum` String,
-  `OriginAirportID` Int32,
-  `OriginAirportSeqID` Int32,
-  `OriginCityMarketID` Int32,
-  `Origin` FixedString(5),
-  `OriginCityName` String,
-  `OriginState` FixedString(2),
-  `OriginStateFips` String,
-  `OriginStateName` String,
-  `OriginWac` Int32,
-  `DestAirportID` Int32,
-  `DestAirportSeqID` Int32,
-  `DestCityMarketID` Int32,
-  `Dest` FixedString(5),
-  `DestCityName` String,
-  `DestState` FixedString(2),
-  `DestStateFips` String,
-  `DestStateName` String,
-  `DestWac` Int32,
-  `CRSDepTime` Int32,
-  `DepTime` Int32,
-  `DepDelay` Int32,
-  `DepDelayMinutes` Int32,
-  `DepDel15` Int32,
-  `DepartureDelayGroups` String,
-  `DepTimeBlk` String,
-  `TaxiOut` Int32,
-  `WheelsOff` Int32,
-  `WheelsOn` Int32,
-  `TaxiIn` Int32,
-  `CRSArrTime` Int32,
-  `ArrTime` Int32,
-  `ArrDelay` Int32,
-  `ArrDelayMinutes` Int32,
-  `ArrDel15` Int32,
-  `ArrivalDelayGroups` Int32,
-  `ArrTimeBlk` String,
-  `Cancelled` UInt8,
-  `CancellationCode` FixedString(1),
-  `Diverted` UInt8,
-  `CRSElapsedTime` Int32,
-  `ActualElapsedTime` Int32,
-  `AirTime` Int32,
-  `Flights` Int32,
-  `Distance` Int32,
-  `DistanceGroup` UInt8,
-  `CarrierDelay` Int32,
-  `WeatherDelay` Int32,
-  `NASDelay` Int32,
-  `SecurityDelay` Int32,
-  `LateAircraftDelay` Int32,
-  `FirstDepTime` String,
-  `TotalAddGTime` String,
-  `LongestAddGTime` String,
-  `DivAirportLandings` String,
-  `DivReachedDest` String,
-  `DivActualElapsedTime` String,
-  `DivArrDelay` String,
-  `DivDistance` String,
-  `Div1Airport` String,
-  `Div1AirportID` Int32,
-  `Div1AirportSeqID` Int32,
-  `Div1WheelsOn` String,
-  `Div1TotalGTime` String,
-  `Div1LongestGTime` String,
-  `Div1WheelsOff` String,
-  `Div1TailNum` String,
-  `Div2Airport` String,
-  `Div2AirportID` Int32,
-  `Div2AirportSeqID` Int32,
-  `Div2WheelsOn` String,
-  `Div2TotalGTime` String,
-  `Div2LongestGTime` String,
-  `Div2WheelsOff` String,
-  `Div2TailNum` String,
-  `Div3Airport` String,
-  `Div3AirportID` Int32,
-  `Div3AirportSeqID` Int32,
-  `Div3WheelsOn` String,
-  `Div3TotalGTime` String,
-  `Div3LongestGTime` String,
-  `Div3WheelsOff` String,
-  `Div3TailNum` String,
-  `Div4Airport` String,
-  `Div4AirportID` Int32,
-  `Div4AirportSeqID` Int32,
-  `Div4WheelsOn` String,
-  `Div4TotalGTime` String,
-  `Div4LongestGTime` String,
-  `Div4WheelsOff` String,
-  `Div4TailNum` String,
-  `Div5Airport` String,
-  `Div5AirportID` Int32,
-  `Div5AirportSeqID` Int32,
-  `Div5WheelsOn` String,
-  `Div5TotalGTime` String,
-  `Div5LongestGTime` String,
-  `Div5WheelsOff` String,
-  `Div5TailNum` String
-) ENGINE = MergeTree
-PARTITION BY Year
-ORDER BY (Carrier, FlightDate)
-SETTINGS index_granularity = 8192;
-```
-
-Carga de datos:
-
-``` bash
-$ for i in *.zip; do echo $i; unzip -cq $i '*.csv' | sed 's/\.00//g' | clickhouse-client --host=example-perftest01j --query="INSERT INTO ontime FORMAT CSVWithNames"; done
-```
-
-## Descarga de Prepared Partitions {#download-of-prepared-partitions}
-
-``` bash
-$ curl -O https://datasets.clickhouse.tech/ontime/partitions/ontime.tar
-$ tar xvf ontime.tar -C /var/lib/clickhouse # path to ClickHouse data directory
-$ # check permissions of unpacked data, fix if required
-$ sudo service clickhouse-server restart
-$ clickhouse-client --query "select count(*) from datasets.ontime"
-```
-
-!!! info "INFO"
-    Si va a ejecutar las consultas que se describen a continuación, debe usar el nombre completo de la tabla, `datasets.ontime`.
-
-## Consulta {#queries}
-
-Q0.
-
-``` sql
-SELECT avg(c1)
-FROM
-(
-    SELECT Year, Month, count(*) AS c1
-    FROM ontime
-    GROUP BY Year, Month
-);
-```
-
-Q1. El número de vuelos por día desde el año 2000 hasta 2008
-
-``` sql
-SELECT DayOfWeek, count(*) AS c
-FROM ontime
-WHERE Year>=2000 AND Year<=2008
-GROUP BY DayOfWeek
-ORDER BY c DESC;
-```
-
-Preguntas frecuentes El número de vuelos retrasados por más de 10 minutos, agrupados por el día de la semana, para 2000-2008
-
-``` sql
-SELECT DayOfWeek, count(*) AS c
-FROM ontime
-WHERE DepDelay>10 AND Year>=2000 AND Year<=2008
-GROUP BY DayOfWeek
-ORDER BY c DESC;
-```
-
-Q3. El número de retrasos por parte del aeropuerto para 2000-2008
-
-``` sql
-SELECT Origin, count(*) AS c
-FROM ontime
-WHERE DepDelay>10 AND Year>=2000 AND Year<=2008
-GROUP BY Origin
-ORDER BY c DESC
-LIMIT 10;
-```
-
-Preguntas más frecuentes Número de retrasos por transportista para 2007
-
-``` sql
-SELECT Carrier, count(*)
-FROM ontime
-WHERE DepDelay>10 AND Year=2007
-GROUP BY Carrier
-ORDER BY count(*) DESC;
-```
-
-Q5. El porcentaje de retrasos por transportista para 2007
-
-``` sql
-SELECT Carrier, c, c2, c*100/c2 as c3
-FROM
-(
-    SELECT
-        Carrier,
-        count(*) AS c
-    FROM ontime
-    WHERE DepDelay>10
-        AND Year=2007
-    GROUP BY Carrier
-)
-JOIN
-(
-    SELECT
-        Carrier,
-        count(*) AS c2
-    FROM ontime
-    WHERE Year=2007
-    GROUP BY Carrier
-) USING Carrier
-ORDER BY c3 DESC;
-```
-
-Mejor versión de la misma consulta:
-
-``` sql
-SELECT Carrier, avg(DepDelay>10)*100 AS c3
-FROM ontime
-WHERE Year=2007
-GROUP BY Carrier
-ORDER BY c3 DESC
-```
-
-¿Por qué? La solicitud anterior de una gama más amplia de años, 2000-2008
-
-``` sql
-SELECT Carrier, c, c2, c*100/c2 as c3
-FROM
-(
-    SELECT
-        Carrier,
-        count(*) AS c
-    FROM ontime
-    WHERE DepDelay>10
-        AND Year>=2000 AND Year<=2008
-    GROUP BY Carrier
-)
-JOIN
-(
-    SELECT
-        Carrier,
-        count(*) AS c2
-    FROM ontime
-    WHERE Year>=2000 AND Year<=2008
-    GROUP BY Carrier
-) USING Carrier
-ORDER BY c3 DESC;
-```
-
-Mejor versión de la misma consulta:
-
-``` sql
-SELECT Carrier, avg(DepDelay>10)*100 AS c3
-FROM ontime
-WHERE Year>=2000 AND Year<=2008
-GROUP BY Carrier
-ORDER BY c3 DESC;
-```
-
-Preguntas frecuentes Porcentaje de vuelos retrasados por más de 10 minutos, por año
-
-``` sql
-SELECT Year, c1/c2
-FROM
-(
-    select
-        Year,
-        count(*)*100 as c1
-    from ontime
-    WHERE DepDelay>10
-    GROUP BY Year
-)
-JOIN
-(
-    select
-        Year,
-        count(*) as c2
-    from ontime
-    GROUP BY Year
-) USING (Year)
-ORDER BY Year;
-```
-
-Mejor versión de la misma consulta:
-
-``` sql
-SELECT Year, avg(DepDelay>10)*100
-FROM ontime
-GROUP BY Year
-ORDER BY Year;
-```
-
-¿Por qué? Los destinos más populares por el número de ciudades conectadas directamente para varios rangos de año
-
-``` sql
-SELECT DestCityName, uniqExact(OriginCityName) AS u
-FROM ontime
-WHERE Year >= 2000 and Year <= 2010
-GROUP BY DestCityName
-ORDER BY u DESC LIMIT 10;
-```
-
-Q9.
-
-``` sql
-SELECT Year, count(*) AS c1
-FROM ontime
-GROUP BY Year;
-```
-
-Q10.
-
-``` sql
-SELECT
-   min(Year), max(Year), Carrier, count(*) AS cnt,
-   sum(ArrDelayMinutes>30) AS flights_delayed,
-   round(sum(ArrDelayMinutes>30)/count(*),2) AS rate
-FROM ontime
-WHERE
-   DayOfWeek NOT IN (6,7) AND OriginState NOT IN ('AK', 'HI', 'PR', 'VI')
-   AND DestState NOT IN ('AK', 'HI', 'PR', 'VI')
-   AND FlightDate < '2010-01-01'
-GROUP by Carrier
-HAVING cnt>100000 and max(Year)>1990
-ORDER by rate DESC
-LIMIT 1000;
-```
-
-Bono:
-
-``` sql
-SELECT avg(cnt)
-FROM
-(
-    SELECT Year,Month,count(*) AS cnt
-    FROM ontime
-    WHERE DepDel15=1
-    GROUP BY Year,Month
-);
-
-SELECT avg(c1) FROM
-(
-    SELECT Year,Month,count(*) AS c1
-    FROM ontime
-    GROUP BY Year,Month
-);
-
-SELECT DestCityName, uniqExact(OriginCityName) AS u
-FROM ontime
-GROUP BY DestCityName
-ORDER BY u DESC
-LIMIT 10;
-
-SELECT OriginCityName, DestCityName, count() AS c
-FROM ontime
-GROUP BY OriginCityName, DestCityName
-ORDER BY c DESC
-LIMIT 10;
-
-SELECT OriginCityName, count() AS c
-FROM ontime
-GROUP BY OriginCityName
-ORDER BY c DESC
-LIMIT 10;
-```
-
-Esta prueba de rendimiento fue creada por Vadim Tkachenko. Ver:
-
--   https://www.percona.com/blog/2009/10/02/analyzing-air-traffic-performance-with-infobright-and-monetdb/
--   https://www.percona.com/blog/2009/10/26/air-traffic-queries-in-luciddb/
--   https://www.percona.com/blog/2009/11/02/air-traffic-queries-in-infinidb-early-alpha/
--   https://www.percona.com/blog/2014/04/21/using-apache-hadoop-and-impala-together-with-mysql-for-data-analysis/
--   https://www.percona.com/blog/2016/01/07/apache-spark-with-air-ontime-performance-data/
--   http://nickmakos.blogspot.ru/2012/08/analyzing-air-traffic-performance-with.html
-
-[Artículo Original](https://clickhouse.tech/docs/en/getting_started/example_datasets/ontime/) <!--hide-->
diff --git a/docs/es/getting-started/example-datasets/star-schema.md b/docs/es/getting-started/example-datasets/star-schema.md
deleted file mode 100644
index 43f878eb205..00000000000
--- a/docs/es/getting-started/example-datasets/star-schema.md
+++ /dev/null
@@ -1,370 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 20
-toc_title: Estrella Schema Benchmark
----
-
-# Estrella Schema Benchmark {#star-schema-benchmark}
-
-Compilación de dbgen:
-
-``` bash
-$ git clone git@github.com:vadimtk/ssb-dbgen.git
-$ cd ssb-dbgen
-$ make
-```
-
-Generación de datos:
-
-!!! warning "Atención"
-    Con `-s 100` dbgen genera 600 millones de filas (67 GB), mientras que `-s 1000` genera 6 mil millones de filas (lo que lleva mucho tiempo)
-
-``` bash
-$ ./dbgen -s 1000 -T c
-$ ./dbgen -s 1000 -T l
-$ ./dbgen -s 1000 -T p
-$ ./dbgen -s 1000 -T s
-$ ./dbgen -s 1000 -T d
-```
-
-Creación de tablas en ClickHouse:
-
-``` sql
-CREATE TABLE customer
-(
-        C_CUSTKEY       UInt32,
-        C_NAME          String,
-        C_ADDRESS       String,
-        C_CITY          LowCardinality(String),
-        C_NATION        LowCardinality(String),
-        C_REGION        LowCardinality(String),
-        C_PHONE         String,
-        C_MKTSEGMENT    LowCardinality(String)
-)
-ENGINE = MergeTree ORDER BY (C_CUSTKEY);
-
-CREATE TABLE lineorder
-(
-    LO_ORDERKEY             UInt32,
-    LO_LINENUMBER           UInt8,
-    LO_CUSTKEY              UInt32,
-    LO_PARTKEY              UInt32,
-    LO_SUPPKEY              UInt32,
-    LO_ORDERDATE            Date,
-    LO_ORDERPRIORITY        LowCardinality(String),
-    LO_SHIPPRIORITY         UInt8,
-    LO_QUANTITY             UInt8,
-    LO_EXTENDEDPRICE        UInt32,
-    LO_ORDTOTALPRICE        UInt32,
-    LO_DISCOUNT             UInt8,
-    LO_REVENUE              UInt32,
-    LO_SUPPLYCOST           UInt32,
-    LO_TAX                  UInt8,
-    LO_COMMITDATE           Date,
-    LO_SHIPMODE             LowCardinality(String)
-)
-ENGINE = MergeTree PARTITION BY toYear(LO_ORDERDATE) ORDER BY (LO_ORDERDATE, LO_ORDERKEY);
-
-CREATE TABLE part
-(
-        P_PARTKEY       UInt32,
-        P_NAME          String,
-        P_MFGR          LowCardinality(String),
-        P_CATEGORY      LowCardinality(String),
-        P_BRAND         LowCardinality(String),
-        P_COLOR         LowCardinality(String),
-        P_TYPE          LowCardinality(String),
-        P_SIZE          UInt8,
-        P_CONTAINER     LowCardinality(String)
-)
-ENGINE = MergeTree ORDER BY P_PARTKEY;
-
-CREATE TABLE supplier
-(
-        S_SUPPKEY       UInt32,
-        S_NAME          String,
-        S_ADDRESS       String,
-        S_CITY          LowCardinality(String),
-        S_NATION        LowCardinality(String),
-        S_REGION        LowCardinality(String),
-        S_PHONE         String
-)
-ENGINE = MergeTree ORDER BY S_SUPPKEY;
-```
-
-Insertar datos:
-
-``` bash
-$ clickhouse-client --query "INSERT INTO customer FORMAT CSV" < customer.tbl
-$ clickhouse-client --query "INSERT INTO part FORMAT CSV" < part.tbl
-$ clickhouse-client --query "INSERT INTO supplier FORMAT CSV" < supplier.tbl
-$ clickhouse-client --query "INSERT INTO lineorder FORMAT CSV" < lineorder.tbl
-```
-
-Conversión “star schema” a desnormalizado “flat schema”:
-
-``` sql
-SET max_memory_usage = 20000000000;
-
-CREATE TABLE lineorder_flat
-ENGINE = MergeTree
-PARTITION BY toYear(LO_ORDERDATE)
-ORDER BY (LO_ORDERDATE, LO_ORDERKEY) AS
-SELECT
-    l.LO_ORDERKEY AS LO_ORDERKEY,
-    l.LO_LINENUMBER AS LO_LINENUMBER,
-    l.LO_CUSTKEY AS LO_CUSTKEY,
-    l.LO_PARTKEY AS LO_PARTKEY,
-    l.LO_SUPPKEY AS LO_SUPPKEY,
-    l.LO_ORDERDATE AS LO_ORDERDATE,
-    l.LO_ORDERPRIORITY AS LO_ORDERPRIORITY,
-    l.LO_SHIPPRIORITY AS LO_SHIPPRIORITY,
-    l.LO_QUANTITY AS LO_QUANTITY,
-    l.LO_EXTENDEDPRICE AS LO_EXTENDEDPRICE,
-    l.LO_ORDTOTALPRICE AS LO_ORDTOTALPRICE,
-    l.LO_DISCOUNT AS LO_DISCOUNT,
-    l.LO_REVENUE AS LO_REVENUE,
-    l.LO_SUPPLYCOST AS LO_SUPPLYCOST,
-    l.LO_TAX AS LO_TAX,
-    l.LO_COMMITDATE AS LO_COMMITDATE,
-    l.LO_SHIPMODE AS LO_SHIPMODE,
-    c.C_NAME AS C_NAME,
-    c.C_ADDRESS AS C_ADDRESS,
-    c.C_CITY AS C_CITY,
-    c.C_NATION AS C_NATION,
-    c.C_REGION AS C_REGION,
-    c.C_PHONE AS C_PHONE,
-    c.C_MKTSEGMENT AS C_MKTSEGMENT,
-    s.S_NAME AS S_NAME,
-    s.S_ADDRESS AS S_ADDRESS,
-    s.S_CITY AS S_CITY,
-    s.S_NATION AS S_NATION,
-    s.S_REGION AS S_REGION,
-    s.S_PHONE AS S_PHONE,
-    p.P_NAME AS P_NAME,
-    p.P_MFGR AS P_MFGR,
-    p.P_CATEGORY AS P_CATEGORY,
-    p.P_BRAND AS P_BRAND,
-    p.P_COLOR AS P_COLOR,
-    p.P_TYPE AS P_TYPE,
-    p.P_SIZE AS P_SIZE,
-    p.P_CONTAINER AS P_CONTAINER
-FROM lineorder AS l
-INNER JOIN customer AS c ON c.C_CUSTKEY = l.LO_CUSTKEY
-INNER JOIN supplier AS s ON s.S_SUPPKEY = l.LO_SUPPKEY
-INNER JOIN part AS p ON p.P_PARTKEY = l.LO_PARTKEY;
-```
-
-Las consultas:
-
-Q1.1
-
-``` sql
-SELECT sum(LO_EXTENDEDPRICE * LO_DISCOUNT) AS revenue
-FROM lineorder_flat
-WHERE toYear(LO_ORDERDATE) = 1993 AND LO_DISCOUNT BETWEEN 1 AND 3 AND LO_QUANTITY < 25;
-```
-
-Q1.2
-
-``` sql
-SELECT sum(LO_EXTENDEDPRICE * LO_DISCOUNT) AS revenue
-FROM lineorder_flat
-WHERE toYYYYMM(LO_ORDERDATE) = 199401 AND LO_DISCOUNT BETWEEN 4 AND 6 AND LO_QUANTITY BETWEEN 26 AND 35;
-```
-
-Q1.3
-
-``` sql
-SELECT sum(LO_EXTENDEDPRICE * LO_DISCOUNT) AS revenue
-FROM lineorder_flat
-WHERE toISOWeek(LO_ORDERDATE) = 6 AND toYear(LO_ORDERDATE) = 1994
-  AND LO_DISCOUNT BETWEEN 5 AND 7 AND LO_QUANTITY BETWEEN 26 AND 35;
-```
-
-Q2.1
-
-``` sql
-SELECT
-    sum(LO_REVENUE),
-    toYear(LO_ORDERDATE) AS year,
-    P_BRAND
-FROM lineorder_flat
-WHERE P_CATEGORY = 'MFGR#12' AND S_REGION = 'AMERICA'
-GROUP BY
-    year,
-    P_BRAND
-ORDER BY
-    year,
-    P_BRAND;
-```
-
-Q2.2
-
-``` sql
-SELECT
-    sum(LO_REVENUE),
-    toYear(LO_ORDERDATE) AS year,
-    P_BRAND
-FROM lineorder_flat
-WHERE P_BRAND >= 'MFGR#2221' AND P_BRAND <= 'MFGR#2228' AND S_REGION = 'ASIA'
-GROUP BY
-    year,
-    P_BRAND
-ORDER BY
-    year,
-    P_BRAND;
-```
-
-Q2.3
-
-``` sql
-SELECT
-    sum(LO_REVENUE),
-    toYear(LO_ORDERDATE) AS year,
-    P_BRAND
-FROM lineorder_flat
-WHERE P_BRAND = 'MFGR#2239' AND S_REGION = 'EUROPE'
-GROUP BY
-    year,
-    P_BRAND
-ORDER BY
-    year,
-    P_BRAND;
-```
-
-Q3.1
-
-``` sql
-SELECT
-    C_NATION,
-    S_NATION,
-    toYear(LO_ORDERDATE) AS year,
-    sum(LO_REVENUE) AS revenue
-FROM lineorder_flat
-WHERE C_REGION = 'ASIA' AND S_REGION = 'ASIA' AND year >= 1992 AND year <= 1997
-GROUP BY
-    C_NATION,
-    S_NATION,
-    year
-ORDER BY
-    year ASC,
-    revenue DESC;
-```
-
-Q3.2
-
-``` sql
-SELECT
-    C_CITY,
-    S_CITY,
-    toYear(LO_ORDERDATE) AS year,
-    sum(LO_REVENUE) AS revenue
-FROM lineorder_flat
-WHERE C_NATION = 'UNITED STATES' AND S_NATION = 'UNITED STATES' AND year >= 1992 AND year <= 1997
-GROUP BY
-    C_CITY,
-    S_CITY,
-    year
-ORDER BY
-    year ASC,
-    revenue DESC;
-```
-
-Q3.3
-
-``` sql
-SELECT
-    C_CITY,
-    S_CITY,
-    toYear(LO_ORDERDATE) AS year,
-    sum(LO_REVENUE) AS revenue
-FROM lineorder_flat
-WHERE (C_CITY = 'UNITED KI1' OR C_CITY = 'UNITED KI5') AND (S_CITY = 'UNITED KI1' OR S_CITY = 'UNITED KI5') AND year >= 1992 AND year <= 1997
-GROUP BY
-    C_CITY,
-    S_CITY,
-    year
-ORDER BY
-    year ASC,
-    revenue DESC;
-```
-
-Q3.4
-
-``` sql
-SELECT
-    C_CITY,
-    S_CITY,
-    toYear(LO_ORDERDATE) AS year,
-    sum(LO_REVENUE) AS revenue
-FROM lineorder_flat
-WHERE (C_CITY = 'UNITED KI1' OR C_CITY = 'UNITED KI5') AND (S_CITY = 'UNITED KI1' OR S_CITY = 'UNITED KI5') AND toYYYYMM(LO_ORDERDATE) = 199712
-GROUP BY
-    C_CITY,
-    S_CITY,
-    year
-ORDER BY
-    year ASC,
-    revenue DESC;
-```
-
-Q4.1
-
-``` sql
-SELECT
-    toYear(LO_ORDERDATE) AS year,
-    C_NATION,
-    sum(LO_REVENUE - LO_SUPPLYCOST) AS profit
-FROM lineorder_flat
-WHERE C_REGION = 'AMERICA' AND S_REGION = 'AMERICA' AND (P_MFGR = 'MFGR#1' OR P_MFGR = 'MFGR#2')
-GROUP BY
-    year,
-    C_NATION
-ORDER BY
-    year ASC,
-    C_NATION ASC;
-```
-
-Q4.2
-
-``` sql
-SELECT
-    toYear(LO_ORDERDATE) AS year,
-    S_NATION,
-    P_CATEGORY,
-    sum(LO_REVENUE - LO_SUPPLYCOST) AS profit
-FROM lineorder_flat
-WHERE C_REGION = 'AMERICA' AND S_REGION = 'AMERICA' AND (year = 1997 OR year = 1998) AND (P_MFGR = 'MFGR#1' OR P_MFGR = 'MFGR#2')
-GROUP BY
-    year,
-    S_NATION,
-    P_CATEGORY
-ORDER BY
-    year ASC,
-    S_NATION ASC,
-    P_CATEGORY ASC;
-```
-
-Q4.3
-
-``` sql
-SELECT
-    toYear(LO_ORDERDATE) AS year,
-    S_CITY,
-    P_BRAND,
-    sum(LO_REVENUE - LO_SUPPLYCOST) AS profit
-FROM lineorder_flat
-WHERE S_NATION = 'UNITED STATES' AND (year = 1997 OR year = 1998) AND P_CATEGORY = 'MFGR#14'
-GROUP BY
-    year,
-    S_CITY,
-    P_BRAND
-ORDER BY
-    year ASC,
-    S_CITY ASC,
-    P_BRAND ASC;
-```
-
-[Artículo Original](https://clickhouse.tech/docs/en/getting_started/example_datasets/star_schema/) <!--hide-->
diff --git a/docs/es/getting-started/example-datasets/wikistat.md b/docs/es/getting-started/example-datasets/wikistat.md
deleted file mode 100644
index 49d7263cdec..00000000000
--- a/docs/es/getting-started/example-datasets/wikistat.md
+++ /dev/null
@@ -1,35 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 18
-toc_title: "Nombre de la red inal\xE1mbrica (SSID):"
----
-
-# Nombre de la red inalámbrica (SSID): {#wikistat}
-
-Ver: http://dumps.wikimedia.org/other/pagecounts-raw/
-
-Creación de una tabla:
-
-``` sql
-CREATE TABLE wikistat
-(
-    date Date,
-    time DateTime,
-    project String,
-    subproject String,
-    path String,
-    hits UInt64,
-    size UInt64
-) ENGINE = MergeTree(date, (path, time), 8192);
-```
-
-Carga de datos:
-
-``` bash
-$ for i in {2007..2016}; do for j in {01..12}; do echo $i-$j >&2; curl -sSL "http://dumps.wikimedia.org/other/pagecounts-raw/$i/$i-$j/" | grep -oE 'pagecounts-[0-9]+-[0-9]+\.gz'; done; done | sort | uniq | tee links.txt
-$ cat links.txt | while read link; do wget http://dumps.wikimedia.org/other/pagecounts-raw/$(echo $link | sed -r 's/pagecounts-([0-9]{4})([0-9]{2})[0-9]{2}-[0-9]+\.gz/\1/')/$(echo $link | sed -r 's/pagecounts-([0-9]{4})([0-9]{2})[0-9]{2}-[0-9]+\.gz/\1-\2/')/$link; done
-$ ls -1 /opt/wikistat/ | grep gz | while read i; do echo $i; gzip -cd /opt/wikistat/$i | ./wikistat-loader --time="$(echo -n $i | sed -r 's/pagecounts-([0-9]{4})([0-9]{2})([0-9]{2})-([0-9]{2})([0-9]{2})([0-9]{2})\.gz/\1-\2-\3 \4-00-00/')" | clickhouse-client --query="INSERT INTO wikistat FORMAT TabSeparated"; done
-```
-
-[Artículo Original](https://clickhouse.tech/docs/en/getting_started/example_datasets/wikistat/) <!--hide-->
diff --git a/docs/es/getting-started/index.md b/docs/es/getting-started/index.md
deleted file mode 100644
index 681c2017ac1..00000000000
--- a/docs/es/getting-started/index.md
+++ /dev/null
@@ -1,17 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: Primeros pasos
-toc_hidden: true
-toc_priority: 8
-toc_title: oculto
----
-
-# Primeros pasos {#getting-started}
-
-Si eres nuevo en ClickHouse y quieres tener una sensación práctica de su rendimiento, antes que nada, debes pasar por el [proceso de instalación](install.md). Después de eso puedes:
-
--   [Ir a través de tutorial detallado](tutorial.md)
--   [Experimente con conjuntos de datos de ejemplo](example-datasets/ontime.md)
-
-[Artículo Original](https://clickhouse.tech/docs/en/getting_started/) <!--hide-->
diff --git a/docs/es/getting-started/install.md b/docs/es/getting-started/install.md
deleted file mode 100644
index 092ef47b2f7..00000000000
--- a/docs/es/getting-started/install.md
+++ /dev/null
@@ -1,182 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 11
-toc_title: "Instalaci\xF3n"
----
-
-# Instalación {#installation}
-
-## Requisitos del sistema {#system-requirements}
-
-ClickHouse puede ejecutarse en cualquier Linux, FreeBSD o Mac OS X con arquitectura de CPU x86_64, AArch64 o PowerPC64LE.
-
-Los binarios oficiales preconstruidos generalmente se compilan para x86_64 y aprovechan el conjunto de instrucciones SSE 4.2, por lo que, a menos que se indique lo contrario, el uso de la CPU que lo admite se convierte en un requisito adicional del sistema. Aquí está el comando para verificar si la CPU actual tiene soporte para SSE 4.2:
-
-``` bash
-$ grep -q sse4_2 /proc/cpuinfo && echo "SSE 4.2 supported" || echo "SSE 4.2 not supported"
-```
-
-Para ejecutar ClickHouse en procesadores que no admiten SSE 4.2 o tienen arquitectura AArch64 o PowerPC64LE, debe [construir ClickHouse a partir de fuentes](#from-sources) con los ajustes de configuración adecuados.
-
-## Opciones de instalación disponibles {#available-installation-options}
-
-### De paquetes DEB {#install-from-deb-packages}
-
-Se recomienda utilizar pre-compilado oficial `deb` Paquetes para Debian o Ubuntu. Ejecute estos comandos para instalar paquetes:
-
-``` bash
-{% include 'install/deb.sh' %}
-```
-
-Si desea utilizar la versión más reciente, reemplace `stable` con `testing` (esto se recomienda para sus entornos de prueba).
-
-También puede descargar e instalar paquetes manualmente desde [aqui](https://repo.clickhouse.tech/deb/stable/main/).
-
-#### Paquete {#packages}
-
--   `clickhouse-common-static` — Installs ClickHouse compiled binary files.
--   `clickhouse-server` — Creates a symbolic link for `clickhouse-server` e instala la configuración predeterminada del servidor.
--   `clickhouse-client` — Creates a symbolic link for `clickhouse-client` y otras herramientas relacionadas con el cliente. e instala los archivos de configuración del cliente.
--   `clickhouse-common-static-dbg` — Installs ClickHouse compiled binary files with debug info.
-
-### De paquetes RPM {#from-rpm-packages}
-
-Se recomienda utilizar pre-compilado oficial `rpm` También puede utilizar los paquetes para CentOS, RedHat y todas las demás distribuciones de Linux basadas en rpm.
-
-Primero, necesitas agregar el repositorio oficial:
-
-``` bash
-sudo yum install yum-utils
-sudo rpm --import https://repo.clickhouse.tech/CLICKHOUSE-KEY.GPG
-sudo yum-config-manager --add-repo https://repo.clickhouse.tech/rpm/stable/x86_64
-```
-
-Si desea utilizar la versión más reciente, reemplace `stable` con `testing` (esto se recomienda para sus entornos de prueba). El `prestable` etiqueta a veces está disponible también.
-
-A continuación, ejecute estos comandos para instalar paquetes:
-
-``` bash
-sudo yum install clickhouse-server clickhouse-client
-```
-
-También puede descargar e instalar paquetes manualmente desde [aqui](https://repo.clickhouse.tech/rpm/stable/x86_64).
-
-### De archivos Tgz {#from-tgz-archives}
-
-Se recomienda utilizar pre-compilado oficial `tgz` para todas las distribuciones de Linux, donde la instalación de `deb` o `rpm` paquetes no es posible.
-
-La versión requerida se puede descargar con `curl` o `wget` desde el repositorio https://repo.clickhouse.tech/tgz/.
-Después de eso, los archivos descargados deben desempaquetarse e instalarse con scripts de instalación. Ejemplo para la última versión:
-
-``` bash
-export LATEST_VERSION=`curl https://api.github.com/repos/ClickHouse/ClickHouse/tags 2>/dev/null | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+' | head -n 1`
-curl -O https://repo.clickhouse.tech/tgz/clickhouse-common-static-$LATEST_VERSION.tgz
-curl -O https://repo.clickhouse.tech/tgz/clickhouse-common-static-dbg-$LATEST_VERSION.tgz
-curl -O https://repo.clickhouse.tech/tgz/clickhouse-server-$LATEST_VERSION.tgz
-curl -O https://repo.clickhouse.tech/tgz/clickhouse-client-$LATEST_VERSION.tgz
-
-tar -xzvf clickhouse-common-static-$LATEST_VERSION.tgz
-sudo clickhouse-common-static-$LATEST_VERSION/install/doinst.sh
-
-tar -xzvf clickhouse-common-static-dbg-$LATEST_VERSION.tgz
-sudo clickhouse-common-static-dbg-$LATEST_VERSION/install/doinst.sh
-
-tar -xzvf clickhouse-server-$LATEST_VERSION.tgz
-sudo clickhouse-server-$LATEST_VERSION/install/doinst.sh
-sudo /etc/init.d/clickhouse-server start
-
-tar -xzvf clickhouse-client-$LATEST_VERSION.tgz
-sudo clickhouse-client-$LATEST_VERSION/install/doinst.sh
-```
-
-Para los entornos de producción, se recomienda utilizar las últimas `stable`-versión. Puede encontrar su número en la página de GitHub https://github.com/ClickHouse/ClickHouse/tags con postfix `-stable`.
-
-### Desde Docker Image {#from-docker-image}
-
-Para ejecutar ClickHouse dentro de Docker, siga la guía en [Eje de acoplador](https://hub.docker.com/r/yandex/clickhouse-server/). Esas imágenes usan oficial `deb` paquetes dentro.
-
-### De fuentes {#from-sources}
-
-Para compilar manualmente ClickHouse, siga las instrucciones para [Linux](../development/build.md) o [Mac OS X](../development/build-osx.md).
-
-Puede compilar paquetes e instalarlos o usar programas sin instalar paquetes. Además, al construir manualmente, puede deshabilitar el requisito de SSE 4.2 o compilar para CPU AArch64.
-
-      Client: programs/clickhouse-client
-      Server: programs/clickhouse-server
-
-Tendrá que crear carpetas de datos y metadatos y `chown` para el usuario deseado. Sus rutas se pueden cambiar en la configuración del servidor (src/programs/server/config.xml), por defecto son:
-
-      /opt/clickhouse/data/default/
-      /opt/clickhouse/metadata/default/
-
-En Gentoo, puedes usar `emerge clickhouse` para instalar ClickHouse desde fuentes.
-
-## Lanzar {#launch}
-
-Para iniciar el servidor como demonio, ejecute:
-
-``` bash
-$ sudo service clickhouse-server start
-```
-
-Si no tienes `service` comando ejecutar como
-
-``` bash
-$ sudo /etc/init.d/clickhouse-server start
-```
-
-Vea los registros en el `/var/log/clickhouse-server/` directorio.
-
-Si el servidor no se inicia, compruebe las configuraciones en el archivo `/etc/clickhouse-server/config.xml`.
-
-También puede iniciar manualmente el servidor desde la consola:
-
-``` bash
-$ clickhouse-server --config-file=/etc/clickhouse-server/config.xml
-```
-
-En este caso, el registro se imprimirá en la consola, lo cual es conveniente durante el desarrollo.
-Si el archivo de configuración está en el directorio actual, no es necesario `--config-file` parámetro. De forma predeterminada, utiliza `./config.xml`.
-
-ClickHouse admite la configuración de restricción de acceso. Están ubicados en el `users.xml` archivo (junto a `config.xml`).
-De forma predeterminada, se permite el acceso desde cualquier lugar `default` usuario, sin una contraseña. Ver `user/default/networks`.
-Para obtener más información, consulte la sección [“Configuration Files”](../operations/configuration-files.md).
-
-Después de iniciar el servidor, puede usar el cliente de línea de comandos para conectarse a él:
-
-``` bash
-$ clickhouse-client
-```
-
-Por defecto, se conecta a `localhost:9000` en nombre del usuario `default` sin una contraseña. También se puede usar para conectarse a un servidor remoto usando `--host` argumento.
-
-El terminal debe usar codificación UTF-8.
-Para obtener más información, consulte la sección [“Command-line client”](../interfaces/cli.md).
-
-Ejemplo:
-
-``` bash
-$ ./clickhouse-client
-ClickHouse client version 0.0.18749.
-Connecting to localhost:9000.
-Connected to ClickHouse server version 0.0.18749.
-
-:) SELECT 1
-
-SELECT 1
-
-┌─1─┐
-│ 1 │
-└───┘
-
-1 rows in set. Elapsed: 0.003 sec.
-
-:)
-```
-
-**Felicidades, el sistema funciona!**
-
-Para continuar experimentando, puede descargar uno de los conjuntos de datos de prueba o pasar por [tutorial](https://clickhouse.tech/tutorial.html).
-
-[Artículo Original](https://clickhouse.tech/docs/en/getting_started/install/) <!--hide-->
diff --git a/docs/es/getting-started/playground.md b/docs/es/getting-started/playground.md
deleted file mode 100644
index 1ab7246e2d4..00000000000
--- a/docs/es/getting-started/playground.md
+++ /dev/null
@@ -1,48 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 14
-toc_title: Infantil
----
-
-# Zona de juegos ClickHouse {#clickhouse-playground}
-
-[Zona de juegos ClickHouse](https://play.clickhouse.tech?file=welcome) permite a las personas experimentar con ClickHouse ejecutando consultas al instante, sin configurar su servidor o clúster.
-Varios conjuntos de datos de ejemplo están disponibles en Playground, así como consultas de ejemplo que muestran las características de ClickHouse.
-
-Las consultas se ejecutan como un usuario de sólo lectura. Implica algunas limitaciones:
-
--   No se permiten consultas DDL
--   Las consultas INSERT no están permitidas
-
-También se aplican los siguientes valores:
-- [`max_result_bytes=10485760`](../operations/settings/query_complexity/#max-result-bytes)
-- [`max_result_rows=2000`](../operations/settings/query_complexity/#setting-max_result_rows)
-- [`result_overflow_mode=break`](../operations/settings/query_complexity/#result-overflow-mode)
-- [`max_execution_time=60000`](../operations/settings/query_complexity/#max-execution-time)
-
-ClickHouse Playground da la experiencia de m2.pequeño
-[Servicio administrado para ClickHouse](https://cloud.yandex.com/services/managed-clickhouse)
-instancia alojada en [El Yandex.Nube](https://cloud.yandex.com/).
-Más información sobre [proveedores de la nube](../commercial/cloud.md).
-
-La interfaz web de ClickHouse Playground realiza solicitudes a través de ClickHouse [HTTP API](../interfaces/http.md).
-El backend Playground es solo un clúster ClickHouse sin ninguna aplicación adicional del lado del servidor.
-El punto final HTTPS de ClickHouse también está disponible como parte de Playground.
-
-Puede realizar consultas al patio de recreo utilizando cualquier cliente HTTP, por ejemplo [rizo](https://curl.haxx.se) o [wget](https://www.gnu.org/software/wget/), o configurar una conexión usando [JDBC](../interfaces/jdbc.md) o [ODBC](../interfaces/odbc.md) controlador.
-Más información sobre los productos de software compatibles con ClickHouse está disponible [aqui](../interfaces/index.md).
-
-| Parámetro   | Valor                                         |
-|:------------|:----------------------------------------------|
-| Punto final | https://play-api.casa de clic.tecnología:8443 |
-| Usuario     | `playground`                                  |
-| Contraseña  | `clickhouse`                                  |
-
-Tenga en cuenta que este extremo requiere una conexión segura.
-
-Ejemplo:
-
-``` bash
-curl "https://play-api.clickhouse.tech:8443/?query=SELECT+'Play+ClickHouse!';&user=playground&password=clickhouse&database=datasets"
-```
diff --git a/docs/es/getting-started/tutorial.md b/docs/es/getting-started/tutorial.md
deleted file mode 100644
index 2cc9339f954..00000000000
--- a/docs/es/getting-started/tutorial.md
+++ /dev/null
@@ -1,664 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 12
-toc_title: Tutorial
----
-
-# Tutorial de ClickHouse {#clickhouse-tutorial}
-
-## Qué Esperar de Este Tutorial? {#what-to-expect-from-this-tutorial}
-
-Al pasar por este tutorial, aprenderá cómo configurar un clúster de ClickHouse simple. Será pequeño, pero tolerante a fallos y escalable. Luego usaremos uno de los conjuntos de datos de ejemplo para llenarlo con datos y ejecutar algunas consultas de demostración.
-
-## Configuración de nodo único {#single-node-setup}
-
-Para posponer las complejidades de un entorno distribuido, comenzaremos con la implementación de ClickHouse en un único servidor o máquina virtual. ClickHouse generalmente se instala desde [deb](install.md#install-from-deb-packages) o [RPM](install.md#from-rpm-packages) paquetes, pero hay [alternativa](install.md#from-docker-image) para los sistemas operativos que no los admiten.
-
-Por ejemplo, ha elegido `deb` paquetes y ejecutado:
-
-``` bash
-{% include 'install/deb.sh' %}
-```
-
-¿Qué tenemos en los paquetes que tengo instalados:
-
--   `clickhouse-client` el paquete contiene [Casa de clics-cliente](../interfaces/cli.md) aplicación, cliente interactivo de la consola ClickHouse.
--   `clickhouse-common` El paquete contiene un archivo ejecutable ClickHouse.
--   `clickhouse-server` El paquete contiene archivos de configuración para ejecutar ClickHouse como servidor.
-
-Los archivos de configuración del servidor se encuentran en `/etc/clickhouse-server/`. Antes de ir más lejos, tenga en cuenta el `<path>` elemento en `config.xml`. La ruta determina la ubicación para el almacenamiento de datos, por lo que debe ubicarse en un volumen con gran capacidad de disco; el valor predeterminado es `/var/lib/clickhouse/`. Si desea ajustar la configuración, no es útil editar directamente `config.xml` archivo, teniendo en cuenta que podría ser reescrito en futuras actualizaciones de paquetes. La forma recomendada de anular los elementos de configuración es crear [archivos en config.directorio d](../operations/configuration-files.md) que sirven como “patches” de configuración.XML.
-
-Como habrás notado, `clickhouse-server` no se inicia automáticamente después de la instalación del paquete. Tampoco se reiniciará automáticamente después de las actualizaciones. La forma en que inicia el servidor depende de su sistema de inicio, por lo general, es:
-
-``` bash
-sudo service clickhouse-server start
-```
-
-o
-
-``` bash
-sudo /etc/init.d/clickhouse-server start
-```
-
-La ubicación predeterminada para los registros del servidor es `/var/log/clickhouse-server/`. El servidor está listo para manejar las conexiones de cliente una vez que registra el `Ready for connections` mensaje.
-
-Una vez que el `clickhouse-server` está en funcionamiento, podemos usar `clickhouse-client` para conectarse al servidor y ejecutar algunas consultas de prueba como `SELECT "Hello, world!";`.
-
-<details markdown="1">
-
-<summary>Consejos rápidos para clickhouse-cliente</summary>
-
-Modo interactivo:
-
-``` bash
-clickhouse-client
-clickhouse-client --host=... --port=... --user=... --password=...
-```
-
-Habilitar consultas multilínea:
-
-``` bash
-clickhouse-client -m
-clickhouse-client --multiline
-```
-
-Ejecutar consultas en modo por lotes:
-
-``` bash
-clickhouse-client --query='SELECT 1'
-echo 'SELECT 1' | clickhouse-client
-clickhouse-client <<< 'SELECT 1'
-```
-
-Insertar datos de un archivo en el formato especificado:
-
-``` bash
-clickhouse-client --query='INSERT INTO table VALUES' < data.txt
-clickhouse-client --query='INSERT INTO table FORMAT TabSeparated' < data.tsv
-```
-
-</details>
-
-## Importar conjunto de datos de muestra {#import-sample-dataset}
-
-Ahora es el momento de llenar nuestro servidor ClickHouse con algunos datos de muestra. En este tutorial, usaremos los datos anónimos de Yandex.Metrica, el primer servicio que ejecuta ClickHouse en forma de producción antes de que se convirtiera en código abierto (más sobre eso en [sección de historia](../introduction/history.md)). Hay [múltiples formas de importar Yandex.Conjunto de datos de Metrica](example-datasets/metrica.md), y por el bien del tutorial, iremos con el más realista.
-
-### Descargar y extraer datos de tabla {#download-and-extract-table-data}
-
-``` bash
-curl https://datasets.clickhouse.tech/hits/tsv/hits_v1.tsv.xz | unxz --threads=`nproc` > hits_v1.tsv
-curl https://datasets.clickhouse.tech/visits/tsv/visits_v1.tsv.xz | unxz --threads=`nproc` > visits_v1.tsv
-```
-
-Los archivos extraídos tienen un tamaño de aproximadamente 10 GB.
-
-### Crear tablas {#create-tables}
-
-Como en la mayoría de los sistemas de gestión de bases de datos, ClickHouse agrupa lógicamente las tablas en “databases”. Hay un `default` base de datos, pero crearemos una nueva llamada `tutorial`:
-
-``` bash
-clickhouse-client --query "CREATE DATABASE IF NOT EXISTS tutorial"
-```
-
-La sintaxis para crear tablas es mucho más complicada en comparación con las bases de datos (ver [referencia](../sql-reference/statements/create.md). En general `CREATE TABLE` declaración tiene que especificar tres cosas clave:
-
-1.  Nombre de la tabla que se va a crear.
-2.  Table schema, i.e. list of columns and their [tipos de datos](../sql-reference/data-types/index.md).
-3.  [Motor de tabla](../engines/table-engines/index.md) y su configuración, que determina todos los detalles sobre cómo se ejecutarán físicamente las consultas a esta tabla.
-
-El Yandex.Metrica es un servicio de análisis web, y el conjunto de datos de muestra no cubre toda su funcionalidad, por lo que solo hay dos tablas para crear:
-
--   `hits` es una tabla con cada acción realizada por todos los usuarios en todos los sitios web cubiertos por el servicio.
--   `visits` es una tabla que contiene sesiones precompiladas en lugar de acciones individuales.
-
-Veamos y ejecutemos las consultas de tabla de creación real para estas tablas:
-
-``` sql
-CREATE TABLE tutorial.hits_v1
-(
-    `WatchID` UInt64,
-    `JavaEnable` UInt8,
-    `Title` String,
-    `GoodEvent` Int16,
-    `EventTime` DateTime,
-    `EventDate` Date,
-    `CounterID` UInt32,
-    `ClientIP` UInt32,
-    `ClientIP6` FixedString(16),
-    `RegionID` UInt32,
-    `UserID` UInt64,
-    `CounterClass` Int8,
-    `OS` UInt8,
-    `UserAgent` UInt8,
-    `URL` String,
-    `Referer` String,
-    `URLDomain` String,
-    `RefererDomain` String,
-    `Refresh` UInt8,
-    `IsRobot` UInt8,
-    `RefererCategories` Array(UInt16),
-    `URLCategories` Array(UInt16),
-    `URLRegions` Array(UInt32),
-    `RefererRegions` Array(UInt32),
-    `ResolutionWidth` UInt16,
-    `ResolutionHeight` UInt16,
-    `ResolutionDepth` UInt8,
-    `FlashMajor` UInt8,
-    `FlashMinor` UInt8,
-    `FlashMinor2` String,
-    `NetMajor` UInt8,
-    `NetMinor` UInt8,
-    `UserAgentMajor` UInt16,
-    `UserAgentMinor` FixedString(2),
-    `CookieEnable` UInt8,
-    `JavascriptEnable` UInt8,
-    `IsMobile` UInt8,
-    `MobilePhone` UInt8,
-    `MobilePhoneModel` String,
-    `Params` String,
-    `IPNetworkID` UInt32,
-    `TraficSourceID` Int8,
-    `SearchEngineID` UInt16,
-    `SearchPhrase` String,
-    `AdvEngineID` UInt8,
-    `IsArtifical` UInt8,
-    `WindowClientWidth` UInt16,
-    `WindowClientHeight` UInt16,
-    `ClientTimeZone` Int16,
-    `ClientEventTime` DateTime,
-    `SilverlightVersion1` UInt8,
-    `SilverlightVersion2` UInt8,
-    `SilverlightVersion3` UInt32,
-    `SilverlightVersion4` UInt16,
-    `PageCharset` String,
-    `CodeVersion` UInt32,
-    `IsLink` UInt8,
-    `IsDownload` UInt8,
-    `IsNotBounce` UInt8,
-    `FUniqID` UInt64,
-    `HID` UInt32,
-    `IsOldCounter` UInt8,
-    `IsEvent` UInt8,
-    `IsParameter` UInt8,
-    `DontCountHits` UInt8,
-    `WithHash` UInt8,
-    `HitColor` FixedString(1),
-    `UTCEventTime` DateTime,
-    `Age` UInt8,
-    `Sex` UInt8,
-    `Income` UInt8,
-    `Interests` UInt16,
-    `Robotness` UInt8,
-    `GeneralInterests` Array(UInt16),
-    `RemoteIP` UInt32,
-    `RemoteIP6` FixedString(16),
-    `WindowName` Int32,
-    `OpenerName` Int32,
-    `HistoryLength` Int16,
-    `BrowserLanguage` FixedString(2),
-    `BrowserCountry` FixedString(2),
-    `SocialNetwork` String,
-    `SocialAction` String,
-    `HTTPError` UInt16,
-    `SendTiming` Int32,
-    `DNSTiming` Int32,
-    `ConnectTiming` Int32,
-    `ResponseStartTiming` Int32,
-    `ResponseEndTiming` Int32,
-    `FetchTiming` Int32,
-    `RedirectTiming` Int32,
-    `DOMInteractiveTiming` Int32,
-    `DOMContentLoadedTiming` Int32,
-    `DOMCompleteTiming` Int32,
-    `LoadEventStartTiming` Int32,
-    `LoadEventEndTiming` Int32,
-    `NSToDOMContentLoadedTiming` Int32,
-    `FirstPaintTiming` Int32,
-    `RedirectCount` Int8,
-    `SocialSourceNetworkID` UInt8,
-    `SocialSourcePage` String,
-    `ParamPrice` Int64,
-    `ParamOrderID` String,
-    `ParamCurrency` FixedString(3),
-    `ParamCurrencyID` UInt16,
-    `GoalsReached` Array(UInt32),
-    `OpenstatServiceName` String,
-    `OpenstatCampaignID` String,
-    `OpenstatAdID` String,
-    `OpenstatSourceID` String,
-    `UTMSource` String,
-    `UTMMedium` String,
-    `UTMCampaign` String,
-    `UTMContent` String,
-    `UTMTerm` String,
-    `FromTag` String,
-    `HasGCLID` UInt8,
-    `RefererHash` UInt64,
-    `URLHash` UInt64,
-    `CLID` UInt32,
-    `YCLID` UInt64,
-    `ShareService` String,
-    `ShareURL` String,
-    `ShareTitle` String,
-    `ParsedParams` Nested(
-        Key1 String,
-        Key2 String,
-        Key3 String,
-        Key4 String,
-        Key5 String,
-        ValueDouble Float64),
-    `IslandID` FixedString(16),
-    `RequestNum` UInt32,
-    `RequestTry` UInt8
-)
-ENGINE = MergeTree()
-PARTITION BY toYYYYMM(EventDate)
-ORDER BY (CounterID, EventDate, intHash32(UserID))
-SAMPLE BY intHash32(UserID)
-```
-
-``` sql
-CREATE TABLE tutorial.visits_v1
-(
-    `CounterID` UInt32,
-    `StartDate` Date,
-    `Sign` Int8,
-    `IsNew` UInt8,
-    `VisitID` UInt64,
-    `UserID` UInt64,
-    `StartTime` DateTime,
-    `Duration` UInt32,
-    `UTCStartTime` DateTime,
-    `PageViews` Int32,
-    `Hits` Int32,
-    `IsBounce` UInt8,
-    `Referer` String,
-    `StartURL` String,
-    `RefererDomain` String,
-    `StartURLDomain` String,
-    `EndURL` String,
-    `LinkURL` String,
-    `IsDownload` UInt8,
-    `TraficSourceID` Int8,
-    `SearchEngineID` UInt16,
-    `SearchPhrase` String,
-    `AdvEngineID` UInt8,
-    `PlaceID` Int32,
-    `RefererCategories` Array(UInt16),
-    `URLCategories` Array(UInt16),
-    `URLRegions` Array(UInt32),
-    `RefererRegions` Array(UInt32),
-    `IsYandex` UInt8,
-    `GoalReachesDepth` Int32,
-    `GoalReachesURL` Int32,
-    `GoalReachesAny` Int32,
-    `SocialSourceNetworkID` UInt8,
-    `SocialSourcePage` String,
-    `MobilePhoneModel` String,
-    `ClientEventTime` DateTime,
-    `RegionID` UInt32,
-    `ClientIP` UInt32,
-    `ClientIP6` FixedString(16),
-    `RemoteIP` UInt32,
-    `RemoteIP6` FixedString(16),
-    `IPNetworkID` UInt32,
-    `SilverlightVersion3` UInt32,
-    `CodeVersion` UInt32,
-    `ResolutionWidth` UInt16,
-    `ResolutionHeight` UInt16,
-    `UserAgentMajor` UInt16,
-    `UserAgentMinor` UInt16,
-    `WindowClientWidth` UInt16,
-    `WindowClientHeight` UInt16,
-    `SilverlightVersion2` UInt8,
-    `SilverlightVersion4` UInt16,
-    `FlashVersion3` UInt16,
-    `FlashVersion4` UInt16,
-    `ClientTimeZone` Int16,
-    `OS` UInt8,
-    `UserAgent` UInt8,
-    `ResolutionDepth` UInt8,
-    `FlashMajor` UInt8,
-    `FlashMinor` UInt8,
-    `NetMajor` UInt8,
-    `NetMinor` UInt8,
-    `MobilePhone` UInt8,
-    `SilverlightVersion1` UInt8,
-    `Age` UInt8,
-    `Sex` UInt8,
-    `Income` UInt8,
-    `JavaEnable` UInt8,
-    `CookieEnable` UInt8,
-    `JavascriptEnable` UInt8,
-    `IsMobile` UInt8,
-    `BrowserLanguage` UInt16,
-    `BrowserCountry` UInt16,
-    `Interests` UInt16,
-    `Robotness` UInt8,
-    `GeneralInterests` Array(UInt16),
-    `Params` Array(String),
-    `Goals` Nested(
-        ID UInt32,
-        Serial UInt32,
-        EventTime DateTime,
-        Price Int64,
-        OrderID String,
-        CurrencyID UInt32),
-    `WatchIDs` Array(UInt64),
-    `ParamSumPrice` Int64,
-    `ParamCurrency` FixedString(3),
-    `ParamCurrencyID` UInt16,
-    `ClickLogID` UInt64,
-    `ClickEventID` Int32,
-    `ClickGoodEvent` Int32,
-    `ClickEventTime` DateTime,
-    `ClickPriorityID` Int32,
-    `ClickPhraseID` Int32,
-    `ClickPageID` Int32,
-    `ClickPlaceID` Int32,
-    `ClickTypeID` Int32,
-    `ClickResourceID` Int32,
-    `ClickCost` UInt32,
-    `ClickClientIP` UInt32,
-    `ClickDomainID` UInt32,
-    `ClickURL` String,
-    `ClickAttempt` UInt8,
-    `ClickOrderID` UInt32,
-    `ClickBannerID` UInt32,
-    `ClickMarketCategoryID` UInt32,
-    `ClickMarketPP` UInt32,
-    `ClickMarketCategoryName` String,
-    `ClickMarketPPName` String,
-    `ClickAWAPSCampaignName` String,
-    `ClickPageName` String,
-    `ClickTargetType` UInt16,
-    `ClickTargetPhraseID` UInt64,
-    `ClickContextType` UInt8,
-    `ClickSelectType` Int8,
-    `ClickOptions` String,
-    `ClickGroupBannerID` Int32,
-    `OpenstatServiceName` String,
-    `OpenstatCampaignID` String,
-    `OpenstatAdID` String,
-    `OpenstatSourceID` String,
-    `UTMSource` String,
-    `UTMMedium` String,
-    `UTMCampaign` String,
-    `UTMContent` String,
-    `UTMTerm` String,
-    `FromTag` String,
-    `HasGCLID` UInt8,
-    `FirstVisit` DateTime,
-    `PredLastVisit` Date,
-    `LastVisit` Date,
-    `TotalVisits` UInt32,
-    `TraficSource` Nested(
-        ID Int8,
-        SearchEngineID UInt16,
-        AdvEngineID UInt8,
-        PlaceID UInt16,
-        SocialSourceNetworkID UInt8,
-        Domain String,
-        SearchPhrase String,
-        SocialSourcePage String),
-    `Attendance` FixedString(16),
-    `CLID` UInt32,
-    `YCLID` UInt64,
-    `NormalizedRefererHash` UInt64,
-    `SearchPhraseHash` UInt64,
-    `RefererDomainHash` UInt64,
-    `NormalizedStartURLHash` UInt64,
-    `StartURLDomainHash` UInt64,
-    `NormalizedEndURLHash` UInt64,
-    `TopLevelDomain` UInt64,
-    `URLScheme` UInt64,
-    `OpenstatServiceNameHash` UInt64,
-    `OpenstatCampaignIDHash` UInt64,
-    `OpenstatAdIDHash` UInt64,
-    `OpenstatSourceIDHash` UInt64,
-    `UTMSourceHash` UInt64,
-    `UTMMediumHash` UInt64,
-    `UTMCampaignHash` UInt64,
-    `UTMContentHash` UInt64,
-    `UTMTermHash` UInt64,
-    `FromHash` UInt64,
-    `WebVisorEnabled` UInt8,
-    `WebVisorActivity` UInt32,
-    `ParsedParams` Nested(
-        Key1 String,
-        Key2 String,
-        Key3 String,
-        Key4 String,
-        Key5 String,
-        ValueDouble Float64),
-    `Market` Nested(
-        Type UInt8,
-        GoalID UInt32,
-        OrderID String,
-        OrderPrice Int64,
-        PP UInt32,
-        DirectPlaceID UInt32,
-        DirectOrderID UInt32,
-        DirectBannerID UInt32,
-        GoodID String,
-        GoodName String,
-        GoodQuantity Int32,
-        GoodPrice Int64),
-    `IslandID` FixedString(16)
-)
-ENGINE = CollapsingMergeTree(Sign)
-PARTITION BY toYYYYMM(StartDate)
-ORDER BY (CounterID, StartDate, intHash32(UserID), VisitID)
-SAMPLE BY intHash32(UserID)
-```
-
-Puede ejecutar esas consultas utilizando el modo interactivo de `clickhouse-client` (simplemente ejecútelo en un terminal sin especificar una consulta por adelantado) o pruebe algunos [interfaz alternativa](../interfaces/index.md) Si quieres.
-
-Como podemos ver, `hits_v1` utiliza el [motor básico MergeTree](../engines/table-engines/mergetree-family/mergetree.md), mientras que el `visits_v1` utiliza el [Derrumbar](../engines/table-engines/mergetree-family/collapsingmergetree.md) variante.
-
-### Importar datos {#import-data}
-
-La importación de datos a ClickHouse se realiza a través de [INSERT INTO](../sql-reference/statements/insert-into.md) consulta como en muchas otras bases de datos SQL. Sin embargo, los datos generalmente se proporcionan en uno de los [Formatos de serialización compatibles](../interfaces/formats.md) en lugar de `VALUES` cláusula (que también es compatible).
-
-Los archivos que descargamos anteriormente están en formato separado por tabuladores, así que aquí le mostramos cómo importarlos a través del cliente de la consola:
-
-``` bash
-clickhouse-client --query "INSERT INTO tutorial.hits_v1 FORMAT TSV" --max_insert_block_size=100000 < hits_v1.tsv
-clickhouse-client --query "INSERT INTO tutorial.visits_v1 FORMAT TSV" --max_insert_block_size=100000 < visits_v1.tsv
-```
-
-ClickHouse tiene un montón de [ajustes para sintonizar](../operations/settings/index.md) y una forma de especificarlos en el cliente de la consola es a través de argumentos, como podemos ver con `--max_insert_block_size`. La forma más fácil de averiguar qué configuraciones están disponibles, qué significan y cuáles son los valores predeterminados es consultar el `system.settings` tabla:
-
-``` sql
-SELECT name, value, changed, description
-FROM system.settings
-WHERE name LIKE '%max_insert_b%'
-FORMAT TSV
-
-max_insert_block_size    1048576    0    "The maximum block size for insertion, if we control the creation of blocks for insertion."
-```
-
-Opcionalmente se puede [OPTIMIZE](../sql-reference/statements/misc.md#misc_operations-optimize) las tablas después de la importación. Las tablas que están configuradas con un motor de la familia MergeTree siempre fusionan partes de datos en segundo plano para optimizar el almacenamiento de datos (o al menos verificar si tiene sentido). Estas consultas obligan al motor de tablas a realizar la optimización del almacenamiento en este momento en lugar de algún tiempo después:
-
-``` bash
-clickhouse-client --query "OPTIMIZE TABLE tutorial.hits_v1 FINAL"
-clickhouse-client --query "OPTIMIZE TABLE tutorial.visits_v1 FINAL"
-```
-
-Estas consultas inician una operación intensiva de E / S y CPU, por lo que si la tabla recibe datos nuevos de manera consistente, es mejor dejarlos solos y dejar que las fusiones se ejecuten en segundo plano.
-
-Ahora podemos comprobar si la importación de la tabla fue exitosa:
-
-``` bash
-clickhouse-client --query "SELECT COUNT(*) FROM tutorial.hits_v1"
-clickhouse-client --query "SELECT COUNT(*) FROM tutorial.visits_v1"
-```
-
-## Consultas de ejemplo {#example-queries}
-
-``` sql
-SELECT
-    StartURL AS URL,
-    AVG(Duration) AS AvgDuration
-FROM tutorial.visits_v1
-WHERE StartDate BETWEEN '2014-03-23' AND '2014-03-30'
-GROUP BY URL
-ORDER BY AvgDuration DESC
-LIMIT 10
-```
-
-``` sql
-SELECT
-    sum(Sign) AS visits,
-    sumIf(Sign, has(Goals.ID, 1105530)) AS goal_visits,
-    (100. * goal_visits) / visits AS goal_percent
-FROM tutorial.visits_v1
-WHERE (CounterID = 912887) AND (toYYYYMM(StartDate) = 201403) AND (domain(StartURL) = 'yandex.ru')
-```
-
-## Implementación de clúster {#cluster-deployment}
-
-El clúster ClickHouse es un clúster homogéneo. Pasos para configurar:
-
-1.  Instale el servidor ClickHouse en todas las máquinas del clúster
-2.  Configurar configuraciones de clúster en archivos de configuración
-3.  Crear tablas locales en cada instancia
-4.  Crear un [Tabla distribuida](../engines/table-engines/special/distributed.md)
-
-[Tabla distribuida](../engines/table-engines/special/distributed.md) es en realidad una especie de “view” a las tablas locales del clúster ClickHouse. La consulta SELECT de una tabla distribuida se ejecuta utilizando recursos de todos los fragmentos del clúster. Puede especificar configuraciones para varios clústeres y crear varias tablas distribuidas que proporcionen vistas a diferentes clústeres.
-
-Ejemplo de configuración para un clúster con tres fragmentos, una réplica cada uno:
-
-``` xml
-<remote_servers>
-    <perftest_3shards_1replicas>
-        <shard>
-            <replica>
-                <host>example-perftest01j.yandex.ru</host>
-                <port>9000</port>
-            </replica>
-        </shard>
-        <shard>
-            <replica>
-                <host>example-perftest02j.yandex.ru</host>
-                <port>9000</port>
-            </replica>
-        </shard>
-        <shard>
-            <replica>
-                <host>example-perftest03j.yandex.ru</host>
-                <port>9000</port>
-            </replica>
-        </shard>
-    </perftest_3shards_1replicas>
-</remote_servers>
-```
-
-Para más demostraciones, vamos a crear una nueva tabla local con la misma `CREATE TABLE` consulta que utilizamos para `hits_v1`, pero nombre de tabla diferente:
-
-``` sql
-CREATE TABLE tutorial.hits_local (...) ENGINE = MergeTree() ...
-```
-
-Creación de una tabla distribuida que proporcione una vista en las tablas locales del clúster:
-
-``` sql
-CREATE TABLE tutorial.hits_all AS tutorial.hits_local
-ENGINE = Distributed(perftest_3shards_1replicas, tutorial, hits_local, rand());
-```
-
-Una práctica común es crear tablas distribuidas similares en todas las máquinas del clúster. Permite ejecutar consultas distribuidas en cualquier máquina del clúster. También hay una opción alternativa para crear una tabla distribuida temporal para una consulta SELECT determinada usando [remoto](../sql-reference/table-functions/remote.md) función de la tabla.
-
-Vamos a correr [INSERT SELECT](../sql-reference/statements/insert-into.md) en la tabla Distributed para extender la tabla a varios servidores.
-
-``` sql
-INSERT INTO tutorial.hits_all SELECT * FROM tutorial.hits_v1;
-```
-
-!!! warning "Aviso"
-    Este enfoque no es adecuado para la fragmentación de tablas grandes. Hay una herramienta separada [Método de codificación de datos:](../operations/utilities/clickhouse-copier.md) que puede volver a fragmentar tablas grandes arbitrarias.
-
-Como era de esperar, las consultas computacionalmente pesadas se ejecutan N veces más rápido si utilizan 3 servidores en lugar de uno.
-
-En este caso, hemos utilizado un clúster con 3 fragmentos, y cada uno contiene una sola réplica.
-
-Para proporcionar resiliencia en un entorno de producción, se recomienda que cada fragmento contenga 2-3 réplicas distribuidas entre varias zonas de disponibilidad o centros de datos (o al menos racks). Tenga en cuenta que ClickHouse admite un número ilimitado de réplicas.
-
-Ejemplo de configuración para un clúster de un fragmento que contiene tres réplicas:
-
-``` xml
-<remote_servers>
-    ...
-    <perftest_1shards_3replicas>
-        <shard>
-            <replica>
-                <host>example-perftest01j.yandex.ru</host>
-                <port>9000</port>
-             </replica>
-             <replica>
-                <host>example-perftest02j.yandex.ru</host>
-                <port>9000</port>
-             </replica>
-             <replica>
-                <host>example-perftest03j.yandex.ru</host>
-                <port>9000</port>
-             </replica>
-        </shard>
-    </perftest_1shards_3replicas>
-</remote_servers>
-```
-
-Para habilitar la replicación nativa [ZooKeeper](http://zookeeper.apache.org/) se requiere. ClickHouse se encarga de la coherencia de los datos en todas las réplicas y ejecuta el procedimiento de restauración después de la falla automáticamente. Se recomienda implementar el clúster ZooKeeper en servidores independientes (donde no se están ejecutando otros procesos, incluido ClickHouse).
-
-!!! note "Nota"
-    ZooKeeper no es un requisito estricto: en algunos casos simples, puede duplicar los datos escribiéndolos en todas las réplicas de su código de aplicación. Este enfoque es **ni** recomendado, en este caso, ClickHouse no podrá garantizar la coherencia de los datos en todas las réplicas. Por lo tanto, se convierte en responsabilidad de su aplicación.
-
-Las ubicaciones de ZooKeeper se especifican en el archivo de configuración:
-
-``` xml
-<zookeeper>
-    <node>
-        <host>zoo01.yandex.ru</host>
-        <port>2181</port>
-    </node>
-    <node>
-        <host>zoo02.yandex.ru</host>
-        <port>2181</port>
-    </node>
-    <node>
-        <host>zoo03.yandex.ru</host>
-        <port>2181</port>
-    </node>
-</zookeeper>
-```
-
-Además, necesitamos establecer macros para identificar cada fragmento y réplica que se utilizan en la creación de tablas:
-
-``` xml
-<macros>
-    <shard>01</shard>
-    <replica>01</replica>
-</macros>
-```
-
-Si no hay réplicas en este momento en la creación de la tabla replicada, se crea una instancia de una nueva primera réplica. Si ya hay réplicas activas, la nueva réplica clona los datos de las existentes. Tiene la opción de crear primero todas las tablas replicadas y, a continuación, insertar datos en ella. Otra opción es crear algunas réplicas y agregar las otras después o durante la inserción de datos.
-
-``` sql
-CREATE TABLE tutorial.hits_replica (...)
-ENGINE = ReplcatedMergeTree(
-    '/clickhouse_perftest/tables/{shard}/hits',
-    '{replica}'
-)
-...
-```
-
-Aquí usamos [ReplicatedMergeTree](../engines/table-engines/mergetree-family/replication.md) motor de mesa. En los parámetros, especificamos la ruta ZooKeeper que contiene identificadores de fragmentos y réplicas.
-
-``` sql
-INSERT INTO tutorial.hits_replica SELECT * FROM tutorial.hits_local;
-```
-
-La replicación funciona en modo multi-master. Los datos se pueden cargar en cualquier réplica y el sistema los sincroniza automáticamente con otras instancias. La replicación es asíncrona, por lo que en un momento dado, no todas las réplicas pueden contener datos insertados recientemente. Al menos una réplica debe estar disponible para permitir la ingestión de datos. Otros sincronizarán los datos y repararán la coherencia una vez que vuelvan a activarse. Tenga en cuenta que este enfoque permite la baja posibilidad de una pérdida de datos recientemente insertados.
-
-[Artículo Original](https://clickhouse.tech/docs/en/getting_started/tutorial/) <!--hide-->
diff --git a/docs/es/guides/apply-catboost-model.md b/docs/es/guides/apply-catboost-model.md
deleted file mode 100644
index b1fe50f3276..00000000000
--- a/docs/es/guides/apply-catboost-model.md
+++ /dev/null
@@ -1,239 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 41
-toc_title: "Aplicaci\xF3n de modelos CatBoost"
----
-
-# Aplicación de un modelo Catboost en ClickHouse {#applying-catboost-model-in-clickhouse}
-
-[CatBoost](https://catboost.ai) es una biblioteca de impulso de gradiente libre y de código abierto desarrollada en [Yandex](https://yandex.com/company/) para el aprendizaje automático.
-
-Con esta instrucción, aprenderá a aplicar modelos preentrenados en ClickHouse ejecutando la inferencia de modelos desde SQL.
-
-Para aplicar un modelo CatBoost en ClickHouse:
-
-1.  [Crear una tabla](#create-table).
-2.  [Insertar los datos en la tabla](#insert-data-to-table).
-3.  [Integrar CatBoost en ClickHouse](#integrate-catboost-into-clickhouse) (Paso opcional).
-4.  [Ejecute la inferencia del modelo desde SQL](#run-model-inference).
-
-Para obtener más información sobre la formación de modelos CatBoost, consulte [Entrenamiento y aplicación de modelos](https://catboost.ai/docs/features/training.html#training).
-
-## Requisito {#prerequisites}
-
-Si no tienes el [Acoplador](https://docs.docker.com/install/) sin embargo, instalarlo.
-
-!!! note "Nota"
-    [Acoplador](https://www.docker.com) es una plataforma de software que le permite crear contenedores que aíslan una instalación de CatBoost y ClickHouse del resto del sistema.
-
-Antes de aplicar un modelo CatBoost:
-
-**1.** Tire de la [Imagen de acoplador](https://hub.docker.com/r/yandex/tutorial-catboost-clickhouse) del registro:
-
-``` bash
-$ docker pull yandex/tutorial-catboost-clickhouse
-```
-
-Esta imagen de Docker contiene todo lo que necesita para ejecutar CatBoost y ClickHouse: código, tiempo de ejecución, bibliotecas, variables de entorno y archivos de configuración.
-
-**2.** Asegúrese de que la imagen de Docker se haya extraído correctamente:
-
-``` bash
-$ docker image ls
-REPOSITORY                            TAG                 IMAGE ID            CREATED             SIZE
-yandex/tutorial-catboost-clickhouse   latest              622e4d17945b        22 hours ago        1.37GB
-```
-
-**3.** Inicie un contenedor Docker basado en esta imagen:
-
-``` bash
-$ docker run -it -p 8888:8888 yandex/tutorial-catboost-clickhouse
-```
-
-## 1. Crear una tabla {#create-table}
-
-Para crear una tabla ClickHouse para el ejemplo de capacitación:
-
-**1.** Inicie el cliente de consola ClickHouse en el modo interactivo:
-
-``` bash
-$ clickhouse client
-```
-
-!!! note "Nota"
-    El servidor ClickHouse ya se está ejecutando dentro del contenedor Docker.
-
-**2.** Cree la tabla usando el comando:
-
-``` sql
-:) CREATE TABLE amazon_train
-(
-    date Date MATERIALIZED today(),
-    ACTION UInt8,
-    RESOURCE UInt32,
-    MGR_ID UInt32,
-    ROLE_ROLLUP_1 UInt32,
-    ROLE_ROLLUP_2 UInt32,
-    ROLE_DEPTNAME UInt32,
-    ROLE_TITLE UInt32,
-    ROLE_FAMILY_DESC UInt32,
-    ROLE_FAMILY UInt32,
-    ROLE_CODE UInt32
-)
-ENGINE = MergeTree ORDER BY date
-```
-
-**3.** Salir del cliente de la consola ClickHouse:
-
-``` sql
-:) exit
-```
-
-## 2. Insertar los datos en la tabla {#insert-data-to-table}
-
-Para insertar los datos:
-
-**1.** Ejecute el siguiente comando:
-
-``` bash
-$ clickhouse client --host 127.0.0.1 --query 'INSERT INTO amazon_train FORMAT CSVWithNames' < ~/amazon/train.csv
-```
-
-**2.** Inicie el cliente de consola ClickHouse en el modo interactivo:
-
-``` bash
-$ clickhouse client
-```
-
-**3.** Asegúrese de que los datos se hayan cargado:
-
-``` sql
-:) SELECT count() FROM amazon_train
-
-SELECT count()
-FROM amazon_train
-
-+-count()-+
-|   65538 |
-+-------+
-```
-
-## 3. Integrar CatBoost en ClickHouse {#integrate-catboost-into-clickhouse}
-
-!!! note "Nota"
-    **Paso opcional.** La imagen de Docker contiene todo lo que necesita para ejecutar CatBoost y ClickHouse.
-
-Para integrar CatBoost en ClickHouse:
-
-**1.** Construir la biblioteca de evaluación.
-
-La forma más rápida de evaluar un modelo CatBoost es compilar `libcatboostmodel.<so|dll|dylib>` biblioteca. Para obtener más información acerca de cómo construir la biblioteca, vea [Documentación de CatBoost](https://catboost.ai/docs/concepts/c-plus-plus-api_dynamic-c-pluplus-wrapper.html).
-
-**2.** Cree un nuevo directorio en cualquier lugar y con cualquier nombre, por ejemplo, `data` y poner la biblioteca creada en ella. La imagen de Docker ya contiene la biblioteca `data/libcatboostmodel.so`.
-
-**3.** Cree un nuevo directorio para el modelo de configuración en cualquier lugar y con cualquier nombre, por ejemplo, `models`.
-
-**4.** Cree un archivo de configuración de modelo con cualquier nombre, por ejemplo, `models/amazon_model.xml`.
-
-**5.** Describir la configuración del modelo:
-
-``` xml
-<models>
-    <model>
-        <!-- Model type. Now catboost only. -->
-        <type>catboost</type>
-        <!-- Model name. -->
-        <name>amazon</name>
-        <!-- Path to trained model. -->
-        <path>/home/catboost/tutorial/catboost_model.bin</path>
-        <!-- Update interval. -->
-        <lifetime>0</lifetime>
-    </model>
-</models>
-```
-
-**6.** Agregue la ruta de acceso a CatBoost y la configuración del modelo a la configuración de ClickHouse:
-
-``` xml
-<!-- File etc/clickhouse-server/config.d/models_config.xml. -->
-<catboost_dynamic_library_path>/home/catboost/data/libcatboostmodel.so</catboost_dynamic_library_path>
-<models_config>/home/catboost/models/*_model.xml</models_config>
-```
-
-## 4. Ejecute la inferencia del modelo desde SQL {#run-model-inference}
-
-Para el modelo de prueba, ejecute el cliente ClickHouse `$ clickhouse client`.
-
-Asegurémonos de que el modelo esté funcionando:
-
-``` sql
-:) SELECT
-    modelEvaluate('amazon',
-                RESOURCE,
-                MGR_ID,
-                ROLE_ROLLUP_1,
-                ROLE_ROLLUP_2,
-                ROLE_DEPTNAME,
-                ROLE_TITLE,
-                ROLE_FAMILY_DESC,
-                ROLE_FAMILY,
-                ROLE_CODE) > 0 AS prediction,
-    ACTION AS target
-FROM amazon_train
-LIMIT 10
-```
-
-!!! note "Nota"
-    Función [modelEvaluar](../sql-reference/functions/other-functions.md#function-modelevaluate) devuelve tupla con predicciones sin procesar por clase para modelos multiclase.
-
-Vamos a predecir la probabilidad:
-
-``` sql
-:) SELECT
-    modelEvaluate('amazon',
-                RESOURCE,
-                MGR_ID,
-                ROLE_ROLLUP_1,
-                ROLE_ROLLUP_2,
-                ROLE_DEPTNAME,
-                ROLE_TITLE,
-                ROLE_FAMILY_DESC,
-                ROLE_FAMILY,
-                ROLE_CODE) AS prediction,
-    1. / (1 + exp(-prediction)) AS probability,
-    ACTION AS target
-FROM amazon_train
-LIMIT 10
-```
-
-!!! note "Nota"
-    Más información sobre [exp()](../sql-reference/functions/math-functions.md) función.
-
-Vamos a calcular LogLoss en la muestra:
-
-``` sql
-:) SELECT -avg(tg * log(prob) + (1 - tg) * log(1 - prob)) AS logloss
-FROM
-(
-    SELECT
-        modelEvaluate('amazon',
-                    RESOURCE,
-                    MGR_ID,
-                    ROLE_ROLLUP_1,
-                    ROLE_ROLLUP_2,
-                    ROLE_DEPTNAME,
-                    ROLE_TITLE,
-                    ROLE_FAMILY_DESC,
-                    ROLE_FAMILY,
-                    ROLE_CODE) AS prediction,
-        1. / (1. + exp(-prediction)) AS prob,
-        ACTION AS tg
-    FROM amazon_train
-)
-```
-
-!!! note "Nota"
-    Más información sobre [avg()](../sql-reference/aggregate-functions/reference.md#agg_function-avg) y [registro()](../sql-reference/functions/math-functions.md) función.
-
-[Artículo Original](https://clickhouse.tech/docs/en/guides/apply_catboost_model/) <!--hide-->
diff --git a/docs/es/guides/index.md b/docs/es/guides/index.md
deleted file mode 100644
index c8332ac7846..00000000000
--- a/docs/es/guides/index.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: Guiar
-toc_priority: 38
-toc_title: "Descripci\xF3n"
----
-
-# Guías de ClickHouse {#clickhouse-guides}
-
-Lista de instrucciones detalladas paso a paso que ayudan a resolver varias tareas usando ClickHouse:
-
--   [Tutorial sobre la configuración simple del clúster](../getting-started/tutorial.md)
--   [Aplicación de un modelo CatBoost en ClickHouse](apply-catboost-model.md)
-
-[Artículo Original](https://clickhouse.tech/docs/en/guides/) <!--hide-->
diff --git a/docs/es/images/column-oriented.gif b/docs/es/images/column-oriented.gif
deleted file mode 100644
index d5ac7c82848..00000000000
Binary files a/docs/es/images/column-oriented.gif and /dev/null differ
diff --git a/docs/es/images/logo.svg b/docs/es/images/logo.svg
deleted file mode 100644
index b5ab923ff65..00000000000
--- a/docs/es/images/logo.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="54" height="48" markdown="1" viewBox="0 0 9 8"><style>.o{fill:#fc0}.r{fill:red}</style><path d="M0,7 h1 v1 h-1 z" class="r"/><path d="M0,0 h1 v7 h-1 z" class="o"/><path d="M2,0 h1 v8 h-1 z" class="o"/><path d="M4,0 h1 v8 h-1 z" class="o"/><path d="M6,0 h1 v8 h-1 z" class="o"/><path d="M8,3.25 h1 v1.5 h-1 z" class="o"/></svg>
\ No newline at end of file
diff --git a/docs/es/images/row-oriented.gif b/docs/es/images/row-oriented.gif
deleted file mode 100644
index 41395b5693e..00000000000
Binary files a/docs/es/images/row-oriented.gif and /dev/null differ
diff --git a/docs/es/index.md b/docs/es/index.md
deleted file mode 100644
index c76fe32e33b..00000000000
--- a/docs/es/index.md
+++ /dev/null
@@ -1,97 +0,0 @@
----
-machine_translated: false
-machine_translated_rev: 
-toc_priority: 0
-toc_title: "Descripción"
----
-
-# ¿Qué es ClickHouse? {#what-is-clickhouse}
-
-ClickHouse es un sistema de gestión de bases de datos (DBMS), orientado a columnas, para el procesamiento analítico de consultas en línea (OLAP).
-
-En un DBMS “normal”, orientado a filas, los datos se almacenan en este orden:
-
-| Fila | Argumento   | JavaEnable | Titular                   | GoodEvent | EventTime           |
-|------|-------------|------------|---------------------------|-----------|---------------------|
-| #0  | 89354350662 | 1          | Relaciones con inversores | 1         | 2016-05-18 05:19:20 |
-| #1  | 90329509958 | 0          | Contáctenos               | 1         | 2016-05-18 08:10:20 |
-| #2  | 89953706054 | 1          | Mision                    | 1         | 2016-05-18 07:38:00 |
-| #N  | …           | …          | …                         | …         | …                   |
-
-En otras palabras, todos los valores relacionados con una fila se almacenan físicamente uno junto al otro.
-
-Ejemplos de un DBMS orientado a filas son MySQL, Postgres y MS SQL Server.
-
-En un DBMS orientado a columnas, los datos se almacenan así:
-
-| Fila:       | #0                       | #1                 | #2                 | #N |
-|-------------|---------------------------|---------------------|---------------------|-----|
-| Argumento:  | 89354350662               | 90329509958         | 89953706054         | …   |
-| JavaEnable: | 1                         | 0                   | 1                   | …   |
-| Titular:    | Relaciones con inversores | Contáctenos         | Mision              | …   |
-| GoodEvent:  | 1                         | 1                   | 1                   | …   |
-| EventTime:  | 2016-05-18 05:19:20       | 2016-05-18 08:10:20 | 2016-05-18 07:38:00 | …   |
-
-Estos ejemplos solo muestran el orden en el que se organizan los datos. Los valores de diferentes columnas se almacenan por separado y los datos de la misma columna se almacenan juntos.
-
-Ejemplos de un DBMS orientado a columnas: Vertica, Paraccel (Actian Matrix y Amazon Redshift), Sybase IQ, Exasol, Infobright, InfiniDB, MonetDB (VectorWise y Actian Vector), LucidDB, SAP HANA, Google Dremel, Google PowerDrill, Druid y kdb+.
-
-Los diferentes modos de ordenar los datos al guardarlos se adecúan mejor a diferentes escenarios. El escenario de acceso a los datos se refiere a qué consultas se hacen, con qué frecuencia y en qué proporción; cuántos datos se leen para cada tipo de consulta - filas, columnas y bytes; la relación entre lectura y actualización de datos; el tamaño de trabajo de los datos y qué tan localmente son usados; si se usan transacciones y qué tan aisladas están;requerimientos de replicación de los datos y de integridad lógica, requerimientos de latencia y caudal (throughput) para cada tipo de consulta, y cosas por el estilo.
-
-Cuanto mayor sea la carga en el sistema, más importante es personalizar el sistema configurado para que coincida con los requisitos del escenario de uso, y más fino será esta personalización. No existe un sistema que sea igualmente adecuado para escenarios significativamente diferentes. Si un sistema es adaptable a un amplio conjunto de escenarios, bajo una carga alta, el sistema manejará todos los escenarios igualmente mal, o funcionará bien para solo uno o algunos de los escenarios posibles.
-
-## Propiedades clave del escenario OLAP {#key-properties-of-olap-scenario}
-
--   La gran mayoría de las solicitudes son para acceso de lectura.
--   Los datos se actualizan en lotes bastante grandes (\> 1000 filas), no por filas individuales; o no se actualiza en absoluto.
--   Los datos se agregan a la base de datos pero no se modifican.
--   Para las lecturas, se extrae un número bastante grande de filas de la base de datos, pero solo un pequeño subconjunto de columnas.
--   Las tablas son “wide,” lo que significa que contienen un gran número de columnas.
--   Las consultas son relativamente raras (generalmente cientos de consultas por servidor o menos por segundo).
--   Para consultas simples, se permiten latencias de alrededor de 50 ms.
--   Los valores de columna son bastante pequeños: números y cadenas cortas (por ejemplo, 60 bytes por URL).
--   Requiere un alto rendimiento al procesar una sola consulta (hasta miles de millones de filas por segundo por servidor).
--   Las transacciones no son necesarias.
--   Bajos requisitos para la coherencia de los datos.
--   Hay una tabla grande por consulta. Todas las mesas son pequeñas, excepto una.
--   Un resultado de consulta es significativamente menor que los datos de origen. En otras palabras, los datos se filtran o se agregan, por lo que el resultado se ajusta a la RAM de un solo servidor.
-
-Es fácil ver que el escenario OLAP es muy diferente de otros escenarios populares (como el acceso OLTP o Key-Value). Por lo tanto, no tiene sentido intentar usar OLTP o una base de datos de valor clave para procesar consultas analíticas si desea obtener un rendimiento decente. Por ejemplo, si intenta usar MongoDB o Redis para análisis, obtendrá un rendimiento muy bajo en comparación con las bases de datos OLAP.
-
-## Por qué las bases de datos orientadas a columnas funcionan mejor en el escenario OLAP {#why-column-oriented-databases-work-better-in-the-olap-scenario}
-
-Las bases de datos orientadas a columnas son más adecuadas para los escenarios OLAP: son al menos 100 veces más rápidas en el procesamiento de la mayoría de las consultas. Las razones se explican en detalle a continuación, pero el hecho es más fácil de demostrar visualmente:
-
-**DBMS orientado a filas**
-
-![Row-oriented](images/row-oriented.gif#)
-
-**DBMS orientado a columnas**
-
-![Column-oriented](images/column-oriented.gif#)
-
-Ver la diferencia?
-
-### Entrada/salida {#inputoutput}
-
-1.  Para una consulta analítica, solo es necesario leer un pequeño número de columnas de tabla. En una base de datos orientada a columnas, puede leer solo los datos que necesita. Por ejemplo, si necesita 5 columnas de 100, puede esperar una reducción de 20 veces en E/S.
-2.  Dado que los datos se leen en paquetes, es más fácil de comprimir. Los datos en columnas también son más fáciles de comprimir. Esto reduce aún más el volumen de E/S.
-3.  Debido a la reducción de E / S, más datos se ajustan a la memoria caché del sistema.
-
-Por ejemplo, la consulta “count the number of records for each advertising platform” requiere leer uno “advertising platform ID” columna, que ocupa 1 byte sin comprimir. Si la mayor parte del tráfico no proviene de plataformas publicitarias, puede esperar al menos una compresión de 10 veces de esta columna. Cuando se utiliza un algoritmo de compresión rápida, la descompresión de datos es posible a una velocidad de al menos varios gigabytes de datos sin comprimir por segundo. En otras palabras, esta consulta se puede procesar a una velocidad de aproximadamente varios miles de millones de filas por segundo en un único servidor. Esta velocidad se logra realmente en la práctica.
-
-### CPU {#cpu}
-
-Dado que la ejecución de una consulta requiere procesar un gran número de filas, ayuda enviar todas las operaciones para vectores completos en lugar de para filas separadas, o implementar el motor de consultas para que casi no haya costo de envío. Si no hace esto, con cualquier subsistema de disco medio decente, el intérprete de consultas inevitablemente detiene la CPU. Tiene sentido almacenar datos en columnas y procesarlos, cuando sea posible, por columnas.
-
-Hay dos formas de hacer esto:
-
-1.  Un vector motor. Todas las operaciones se escriben para vectores, en lugar de para valores separados. Esto significa que no necesita llamar a las operaciones con mucha frecuencia, y los costos de envío son insignificantes. El código de operación contiene un ciclo interno optimizado.
-
-2.  Generación de código. El código generado para la consulta tiene todas las llamadas indirectas.
-
-Esto no se hace en “normal” bases de datos, porque no tiene sentido cuando se ejecutan consultas simples. Sin embargo, hay excepciones. Por ejemplo, MemSQL utiliza la generación de código para reducir la latencia al procesar consultas SQL. (A modo de comparación, los DBMS analíticos requieren la optimización del rendimiento, no la latencia.)
-
-Tenga en cuenta que para la eficiencia de la CPU, el lenguaje de consulta debe ser declarativo (SQL o MDX), o al menos un vector (J, K). La consulta solo debe contener bucles implícitos, lo que permite la optimización.
-
-{## [Artículo Original](https://clickhouse.tech/docs/en/) ##}
diff --git a/docs/es/interfaces/cli.md b/docs/es/interfaces/cli.md
deleted file mode 100644
index 395f9831a4e..00000000000
--- a/docs/es/interfaces/cli.md
+++ /dev/null
@@ -1,149 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 17
-toc_title: "Cliente de l\xEDnea de comandos"
----
-
-# Cliente de línea de comandos {#command-line-client}
-
-ClickHouse proporciona un cliente de línea de comandos nativo: `clickhouse-client`. El cliente admite opciones de línea de comandos y archivos de configuración. Para obtener más información, consulte [Configuración](#interfaces_cli_configuration).
-
-[Instalar](../getting-started/index.md) desde el `clickhouse-client` paquete y ejecútelo con el comando `clickhouse-client`.
-
-``` bash
-$ clickhouse-client
-ClickHouse client version 19.17.1.1579 (official build).
-Connecting to localhost:9000 as user default.
-Connected to ClickHouse server version 19.17.1 revision 54428.
-
-:)
-```
-
-Las diferentes versiones de cliente y servidor son compatibles entre sí, pero es posible que algunas funciones no estén disponibles en clientes anteriores. Se recomienda utilizar la misma versión del cliente que la aplicación de servidor. Cuando intenta usar un cliente de la versión anterior, entonces el servidor, `clickhouse-client` muestra el mensaje:
-
-      ClickHouse client version is older than ClickHouse server. It may lack support for new features.
-
-## Uso {#cli_usage}
-
-El cliente se puede utilizar en modo interactivo y no interactivo (por lotes). Para utilizar el modo por lotes, especifique el ‘query’ parámetro, o enviar datos a ‘stdin’ (verifica que ‘stdin’ no es un terminal), o ambos. Similar a la interfaz HTTP, cuando se utiliza el ‘query’ parámetro y el envío de datos a ‘stdin’ la solicitud es una concatenación de la ‘query’ parámetro, un avance de línea y los datos en ‘stdin’. Esto es conveniente para grandes consultas INSERT.
-
-Ejemplo de uso del cliente para insertar datos:
-
-``` bash
-$ echo -ne "1, 'some text', '2016-08-14 00:00:00'\n2, 'some more text', '2016-08-14 00:00:01'" | clickhouse-client --database=test --query="INSERT INTO test FORMAT CSV";
-
-$ cat <<_EOF | clickhouse-client --database=test --query="INSERT INTO test FORMAT CSV";
-3, 'some text', '2016-08-14 00:00:00'
-4, 'some more text', '2016-08-14 00:00:01'
-_EOF
-
-$ cat file.csv | clickhouse-client --database=test --query="INSERT INTO test FORMAT CSV";
-```
-
-En el modo por lotes, el formato de datos predeterminado es TabSeparated. Puede establecer el formato en la cláusula FORMAT de la consulta.
-
-De forma predeterminada, solo puede procesar una única consulta en modo por lotes. Para realizar múltiples consultas desde un “script,” utilizar el `--multiquery` parámetro. Esto funciona para todas las consultas excepto INSERT . Los resultados de la consulta se generan consecutivamente sin separadores adicionales. Del mismo modo, para procesar un gran número de consultas, puede ejecutar ‘clickhouse-client’ para cada consulta. Tenga en cuenta que puede tomar decenas de milisegundos para iniciar el ‘clickhouse-client’ programa.
-
-En el modo interactivo, obtiene una línea de comandos donde puede ingresar consultas.
-
-Si ‘multiline’ no se especifica (el valor predeterminado): Para ejecutar la consulta, pulse Intro. El punto y coma no es necesario al final de la consulta. Para introducir una consulta de varias líneas, introduzca una barra invertida `\` antes de la alimentación de línea. Después de presionar Enter, se le pedirá que ingrese la siguiente línea de la consulta.
-
-Si se especifica multilínea: Para ejecutar una consulta, finalícela con un punto y coma y presione Intro. Si se omitió el punto y coma al final de la línea ingresada, se le pedirá que ingrese la siguiente línea de la consulta.
-
-Solo se ejecuta una sola consulta, por lo que se ignora todo después del punto y coma.
-
-Puede especificar `\G` en lugar o después del punto y coma. Esto indica el formato vertical. En este formato, cada valor se imprime en una línea separada, lo cual es conveniente para tablas anchas. Esta característica inusual se agregó por compatibilidad con la CLI de MySQL.
-
-La línea de comandos se basa en ‘replxx’ (similar a ‘readline’). En otras palabras, utiliza los atajos de teclado familiares y mantiene un historial. La historia está escrita para `~/.clickhouse-client-history`.
-
-De forma predeterminada, el formato utilizado es PrettyCompact. Puede cambiar el formato en la cláusula FORMAT de la consulta o especificando `\G` al final de la consulta, utilizando el `--format` o `--vertical` en la línea de comandos, o utilizando el archivo de configuración del cliente.
-
-Para salir del cliente, presione Ctrl+D o introduzca una de las siguientes opciones en lugar de una consulta: “exit”, “quit”, “logout”, “exit;”, “quit;”, “logout;”, “q”, “Q”, “:q”
-
-Al procesar una consulta, el cliente muestra:
-
-1.  Progreso, que se actualiza no más de 10 veces por segundo (de forma predeterminada). Para consultas rápidas, es posible que el progreso no tenga tiempo para mostrarse.
-2.  La consulta con formato después del análisis, para la depuración.
-3.  El resultado en el formato especificado.
-4.  El número de líneas en el resultado, el tiempo transcurrido y la velocidad promedio de procesamiento de consultas.
-
-Puede cancelar una consulta larga presionando Ctrl + C. Sin embargo, aún tendrá que esperar un poco para que el servidor aborte la solicitud. No es posible cancelar una consulta en determinadas etapas. Si no espera y presiona Ctrl + C por segunda vez, el cliente saldrá.
-
-El cliente de línea de comandos permite pasar datos externos (tablas temporales externas) para consultar. Para obtener más información, consulte la sección “External data for query processing”.
-
-### Consultas con parámetros {#cli-queries-with-parameters}
-
-Puede crear una consulta con parámetros y pasarles valores desde la aplicación cliente. Esto permite evitar formatear consultas con valores dinámicos específicos en el lado del cliente. Por ejemplo:
-
-``` bash
-$ clickhouse-client --param_parName="[1, 2]"  -q "SELECT * FROM table WHERE a = {parName:Array(UInt16)}"
-```
-
-#### Sintaxis de consulta {#cli-queries-with-parameters-syntax}
-
-Formatee una consulta como de costumbre, luego coloque los valores que desea pasar de los parámetros de la aplicación a la consulta entre llaves en el siguiente formato:
-
-``` sql
-{<name>:<data type>}
-```
-
--   `name` — Placeholder identifier. In the console client it should be used in app parameters as `--param_<name> = value`.
--   `data type` — [Tipo de datos](../sql-reference/data-types/index.md) del valor del parámetro de la aplicación. Por ejemplo, una estructura de datos como `(integer, ('string', integer))` puede tener el `Tuple(UInt8, Tuple(String, UInt8))` tipo de datos (también puede usar otro [entero](../sql-reference/data-types/int-uint.md) tipo).
-
-#### Ejemplo {#example}
-
-``` bash
-$ clickhouse-client --param_tuple_in_tuple="(10, ('dt', 10))" -q "SELECT * FROM table WHERE val = {tuple_in_tuple:Tuple(UInt8, Tuple(String, UInt8))}"
-```
-
-## Configuración {#interfaces_cli_configuration}
-
-Puede pasar parámetros a `clickhouse-client` (todos los parámetros tienen un valor predeterminado) usando:
-
--   Desde la línea de comandos
-
-    Las opciones de la línea de comandos anulan los valores y valores predeterminados de los archivos de configuración.
-
--   Archivos de configuración.
-
-    Los valores de los archivos de configuración anulan los valores predeterminados.
-
-### Opciones de línea de comandos {#command-line-options}
-
--   `--host, -h` -– The server name, ‘localhost’ predeterminada. Puede utilizar el nombre o la dirección IPv4 o IPv6.
--   `--port` – The port to connect to. Default value: 9000. Note that the HTTP interface and the native interface use different ports.
--   `--user, -u` – The username. Default value: default.
--   `--password` – The password. Default value: empty string.
--   `--query, -q` – The query to process when using non-interactive mode.
--   `--database, -d` – Select the current default database. Default value: the current database from the server settings (‘default’ predeterminada).
--   `--multiline, -m` – If specified, allow multiline queries (do not send the query on Enter).
--   `--multiquery, -n` – If specified, allow processing multiple queries separated by semicolons.
--   `--format, -f` – Use the specified default format to output the result.
--   `--vertical, -E` – If specified, use the Vertical format by default to output the result. This is the same as ‘–format=Vertical’. En este formato, cada valor se imprime en una línea separada, lo que es útil cuando se muestran tablas anchas.
--   `--time, -t` – If specified, print the query execution time to ‘stderr’ en modo no interactivo.
--   `--stacktrace` – If specified, also print the stack trace if an exception occurs.
--   `--config-file` – The name of the configuration file.
--   `--secure` – If specified, will connect to server over secure connection.
--   `--param_<name>` — Value for a [consulta con parámetros](#cli-queries-with-parameters).
-
-### Archivos de configuración {#configuration_files}
-
-`clickhouse-client` utiliza el primer archivo existente de los siguientes:
-
--   Definido en el `--config-file` parámetro.
--   `./clickhouse-client.xml`
--   `~/.clickhouse-client/config.xml`
--   `/etc/clickhouse-client/config.xml`
-
-Ejemplo de un archivo de configuración:
-
-``` xml
-<config>
-    <user>username</user>
-    <password>password</password>
-    <secure>False</secure>
-</config>
-```
-
-[Artículo Original](https://clickhouse.tech/docs/en/interfaces/cli/) <!--hide-->
diff --git a/docs/es/interfaces/cpp.md b/docs/es/interfaces/cpp.md
deleted file mode 100644
index bc5dc3dbc24..00000000000
--- a/docs/es/interfaces/cpp.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 24
-toc_title: Biblioteca de clientes de C++
----
-
-# Biblioteca de clientes de C++ {#c-client-library}
-
-Ver README en [Bienvenidos](https://github.com/ClickHouse/clickhouse-cpp) repositorio.
-
-[Artículo Original](https://clickhouse.tech/docs/en/interfaces/cpp/) <!--hide-->
diff --git a/docs/es/interfaces/formats.md b/docs/es/interfaces/formats.md
deleted file mode 100644
index 03c1873d306..00000000000
--- a/docs/es/interfaces/formats.md
+++ /dev/null
@@ -1,1212 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 21
-toc_title: Formatos de entrada y salida
----
-
-# Formatos para datos de entrada y salida {#formats}
-
-ClickHouse puede aceptar y devolver datos en varios formatos. Se puede utilizar un formato admitido para la entrada para analizar los datos proporcionados a `INSERT`s, para llevar a cabo `SELECT`s de una tabla respaldada por archivos como File, URL o HDFS, o para leer un diccionario externo. Se puede utilizar un formato compatible con la salida para organizar el
-resultados de un `SELECT`, y realizar `INSERT`s en una tabla respaldada por archivos.
-
-Los formatos soportados son:
-
-| Formato                                                         | Entrada | Salida |
-|-----------------------------------------------------------------|---------|--------|
-| [TabSeparated](#tabseparated)                                   | ✔       | ✔      |
-| [TabSeparatedRaw](#tabseparatedraw)                             | ✗       | ✔      |
-| [TabSeparatedWithNames](#tabseparatedwithnames)                 | ✔       | ✔      |
-| [TabSeparatedWithNamesAndTypes](#tabseparatedwithnamesandtypes) | ✔       | ✔      |
-| [Plantilla](#format-template)                                   | ✔       | ✔      |
-| [TemplateIgnoreSpaces](#templateignorespaces)                   | ✔       | ✗      |
-| [CSV](#csv)                                                     | ✔       | ✔      |
-| [CSVWithNames](#csvwithnames)                                   | ✔       | ✔      |
-| [CustomSeparated](#format-customseparated)                      | ✔       | ✔      |
-| [Valor](#data-format-values)                                    | ✔       | ✔      |
-| [Vertical](#vertical)                                           | ✗       | ✔      |
-| [VerticalRaw](#verticalraw)                                     | ✗       | ✔      |
-| [JSON](#json)                                                   | ✗       | ✔      |
-| [JSONCompact](#jsoncompact)                                     | ✗       | ✔      |
-| [JSONEachRow](#jsoneachrow)                                     | ✔       | ✔      |
-| [TSKV](#tskv)                                                   | ✔       | ✔      |
-| [Bastante](#pretty)                                             | ✗       | ✔      |
-| [PrettyCompact](#prettycompact)                                 | ✗       | ✔      |
-| [PrettyCompactMonoBlock](#prettycompactmonoblock)               | ✗       | ✔      |
-| [PrettyNoEscapes](#prettynoescapes)                             | ✗       | ✔      |
-| [Bienvenido a WordPress.](#prettyspace)                         | ✗       | ✔      |
-| [Protobuf](#protobuf)                                           | ✔       | ✔      |
-| [Avro](#data-format-avro)                                       | ✔       | ✔      |
-| [AvroConfluent](#data-format-avro-confluent)                    | ✔       | ✗      |
-| [Parquet](#data-format-parquet)                                 | ✔       | ✔      |
-| [ORC](#data-format-orc)                                         | ✔       | ✗      |
-| [RowBinary](#rowbinary)                                         | ✔       | ✔      |
-| [RowBinaryWithNamesAndTypes](#rowbinarywithnamesandtypes)       | ✔       | ✔      |
-| [Nativo](#native)                                               | ✔       | ✔      |
-| [Nulo](#null)                                                   | ✗       | ✔      |
-| [XML](#xml)                                                     | ✗       | ✔      |
-| [CapnProto](#capnproto)                                         | ✔       | ✗      |
-
-Puede controlar algunos parámetros de procesamiento de formato con la configuración de ClickHouse. Para obtener más información, lea el [Configuración](../operations/settings/settings.md) apartado.
-
-## TabSeparated {#tabseparated}
-
-En el formato TabSeparated, los datos se escriben por fila. Cada fila contiene valores separados por pestañas. Cada valor es seguido por una ficha, excepto el último valor de la fila, que es seguido por un avance de línea. Estrictamente las fuentes de línea Unix se asumen en todas partes. La última fila también debe contener un avance de línea al final. Los valores se escriben en formato de texto, sin incluir comillas y con caracteres especiales escapados.
-
-Este formato también está disponible bajo el nombre `TSV`.
-
-El `TabSeparated` es conveniente para procesar datos utilizando programas y scripts personalizados. Se usa de forma predeterminada en la interfaz HTTP y en el modo por lotes del cliente de línea de comandos. Este formato también permite transferir datos entre diferentes DBMS. Por ejemplo, puede obtener un volcado de MySQL y subirlo a ClickHouse, o viceversa.
-
-El `TabSeparated` el formato admite la salida de valores totales (cuando se usa WITH TOTALS) y valores extremos (cuando ‘extremes’ se establece en 1). En estos casos, los valores totales y los extremos se emiten después de los datos principales. El resultado principal, los valores totales y los extremos están separados entre sí por una línea vacía. Ejemplo:
-
-``` sql
-SELECT EventDate, count() AS c FROM test.hits GROUP BY EventDate WITH TOTALS ORDER BY EventDate FORMAT TabSeparated``
-```
-
-``` text
-2014-03-17      1406958
-2014-03-18      1383658
-2014-03-19      1405797
-2014-03-20      1353623
-2014-03-21      1245779
-2014-03-22      1031592
-2014-03-23      1046491
-
-1970-01-01      8873898
-
-2014-03-17      1031592
-2014-03-23      1406958
-```
-
-### Formato de datos {#data-formatting}
-
-Los números enteros se escriben en forma decimal. Los números pueden contener un extra “+” carácter al principio (ignorado al analizar y no grabado al formatear). Los números no negativos no pueden contener el signo negativo. Al leer, se permite analizar una cadena vacía como cero, o (para tipos con signo) una cadena que consiste en solo un signo menos como cero. Los números que no encajan en el tipo de datos correspondiente se pueden analizar como un número diferente, sin un mensaje de error.
-
-Los números de punto flotante se escriben en forma decimal. El punto se usa como separador decimal. Las entradas exponenciales son compatibles, al igual que ‘inf’, ‘+inf’, ‘-inf’, y ‘nan’. Una entrada de números de coma flotante puede comenzar o terminar con un punto decimal.
-Durante el formateo, la precisión puede perderse en los números de coma flotante.
-Durante el análisis, no es estrictamente necesario leer el número representable de la máquina más cercano.
-
-Las fechas se escriben en formato AAAA-MM-DD y se analizan en el mismo formato, pero con los caracteres como separadores.
-Las fechas con horas se escriben en el formato `YYYY-MM-DD hh:mm:ss` y analizado en el mismo formato, pero con cualquier carácter como separadores.
-Todo esto ocurre en la zona horaria del sistema en el momento en que se inicia el cliente o servidor (dependiendo de cuál de ellos formatea los datos). Para fechas con horarios, no se especifica el horario de verano. Por lo tanto, si un volcado tiene tiempos durante el horario de verano, el volcado no coincide inequívocamente con los datos, y el análisis seleccionará una de las dos veces.
-Durante una operación de lectura, las fechas incorrectas y las fechas con horas se pueden analizar con desbordamiento natural o como fechas y horas nulas, sin un mensaje de error.
-
-Como excepción, el análisis de fechas con horas también se admite en el formato de marca de tiempo Unix, si consta de exactamente 10 dígitos decimales. El resultado no depende de la zona horaria. Los formatos AAAA-MM-DD hh:mm:ss y NNNNNNNNNN se diferencian automáticamente.
-
-Las cadenas se generan con caracteres especiales de escape de barra invertida. Las siguientes secuencias de escape se utilizan para la salida: `\b`, `\f`, `\r`, `\n`, `\t`, `\0`, `\'`, `\\`. El análisis también admite las secuencias `\a`, `\v`, y `\xHH` (secuencias de escape hexagonales) y cualquier `\c` secuencias, donde `c` es cualquier carácter (estas secuencias se convierten en `c`). Por lo tanto, la lectura de datos admite formatos donde un avance de línea se puede escribir como `\n` o `\` o como un avance de línea. Por ejemplo, la cadena `Hello world` con un avance de línea entre las palabras en lugar de espacio se puede analizar en cualquiera de las siguientes variaciones:
-
-``` text
-Hello\nworld
-
-Hello\
-world
-```
-
-La segunda variante es compatible porque MySQL la usa al escribir volcados separados por tabuladores.
-
-El conjunto mínimo de caracteres que debe escapar al pasar datos en formato TabSeparated: tabulación, salto de línea (LF) y barra invertida.
-
-Solo se escapa un pequeño conjunto de símbolos. Puede tropezar fácilmente con un valor de cadena que su terminal arruinará en la salida.
-
-Las matrices se escriben como una lista de valores separados por comas entre corchetes. Los elementos numéricos de la matriz tienen el formato normal. `Date` y `DateTime` están escritos entre comillas simples. Las cadenas se escriben entre comillas simples con las mismas reglas de escape que las anteriores.
-
-[NULL](../sql-reference/syntax.md) se formatea como `\N`.
-
-Cada elemento de [Anidar](../sql-reference/data-types/nested-data-structures/nested.md) estructuras se representa como una matriz.
-
-Por ejemplo:
-
-``` sql
-CREATE TABLE nestedt
-(
-    `id` UInt8,
-    `aux` Nested(
-        a UInt8,
-        b String
-    )
-)
-ENGINE = TinyLog
-```
-
-``` sql
-INSERT INTO nestedt Values ( 1, [1], ['a'])
-```
-
-``` sql
-SELECT * FROM nestedt FORMAT TSV
-```
-
-``` text
-1  [1]    ['a']
-```
-
-## TabSeparatedRaw {#tabseparatedraw}
-
-Difiere de `TabSeparated` formato en que las filas se escriben sin escapar.
-Este formato solo es apropiado para generar un resultado de consulta, pero no para analizar (recuperar datos para insertar en una tabla).
-
-Este formato también está disponible bajo el nombre `TSVRaw`.
-
-## TabSeparatedWithNames {#tabseparatedwithnames}
-
-Difiere de la `TabSeparated` formato en que los nombres de columna se escriben en la primera fila.
-Durante el análisis, la primera fila se ignora por completo. No puede usar nombres de columna para determinar su posición o para comprobar su corrección.
-(Se puede agregar soporte para analizar la fila de encabezado en el futuro.)
-
-Este formato también está disponible bajo el nombre `TSVWithNames`.
-
-## TabSeparatedWithNamesAndTypes {#tabseparatedwithnamesandtypes}
-
-Difiere de la `TabSeparated` formato en que los nombres de columna se escriben en la primera fila, mientras que los tipos de columna están en la segunda fila.
-Durante el análisis, la primera y la segunda filas se ignoran por completo.
-
-Este formato también está disponible bajo el nombre `TSVWithNamesAndTypes`.
-
-## Plantilla {#format-template}
-
-Este formato permite especificar una cadena de formato personalizado con marcadores de posición para los valores con una regla de escape especificada.
-
-Utiliza la configuración `format_template_resultset`, `format_template_row`, `format_template_rows_between_delimiter` and some settings of other formats (e.g. `output_format_json_quote_64bit_integers` cuando se utiliza `JSON` escapar, ver más)
-
-Configuración `format_template_row` especifica la ruta de acceso al archivo, que contiene una cadena de formato para las filas con la siguiente sintaxis:
-
-`delimiter_1${column_1:serializeAs_1}delimiter_2${column_2:serializeAs_2} ... delimiter_N`,
-
-donde `delimiter_i` es un delimitador entre valores (`$` símbolo se puede escapar como `$$`),
-`column_i` es un nombre o índice de una columna cuyos valores se deben seleccionar o insertar (si está vacío, se omitirá la columna),
-`serializeAs_i` es una regla de escape para los valores de columna. Se admiten las siguientes reglas de escape:
-
--   `CSV`, `JSON`, `XML` (similar a los formatos de los mismos nombres)
--   `Escaped` (similar a `TSV`)
--   `Quoted` (similar a `Values`)
--   `Raw` (sin escapar, de manera similar a `TSVRaw`)
--   `None` (sin regla de escape, ver más)
-
-Si se omite una regla de escape, entonces `None` se utilizará. `XML` y `Raw` son adecuados sólo para la salida.
-
-Entonces, para la siguiente cadena de formato:
-
-      `Search phrase: ${SearchPhrase:Quoted}, count: ${c:Escaped}, ad price: $$${price:JSON};`
-
-los valores de `SearchPhrase`, `c` y `price` columnas, que se escapan como `Quoted`, `Escaped` y `JSON` se imprimirá (para seleccionar) o se esperará (para insertar) entre `Search phrase:`, `, count:`, `, ad price: $` y `;` delimitadores respectivamente. Por ejemplo:
-
-`Search phrase: 'bathroom interior design', count: 2166, ad price: $3;`
-
-El `format_template_rows_between_delimiter` setting especifica el delimitador entre filas, que se imprime (o se espera) después de cada fila, excepto la última (`\n` predeterminada)
-
-Configuración `format_template_resultset` especifica la ruta al archivo, que contiene una cadena de formato para el conjunto de resultados. La cadena de formato para el conjunto de resultados tiene la misma sintaxis que una cadena de formato para la fila y permite especificar un prefijo, un sufijo y una forma de imprimir información adicional. Contiene los siguientes marcadores de posición en lugar de nombres de columna:
-
--   `data` son las filas con datos en `format_template_row` formato, separados por `format_template_rows_between_delimiter`. Este marcador de posición debe ser el primer marcador de posición en la cadena de formato.
--   `totals` es la fila con valores totales en `format_template_row` formato (cuando se usa WITH TOTALS)
--   `min` es la fila con valores mínimos en `format_template_row` formato (cuando los extremos se establecen en 1)
--   `max` es la fila con valores máximos en `format_template_row` formato (cuando los extremos se establecen en 1)
--   `rows` es el número total de filas de salida
--   `rows_before_limit` es el número mínimo de filas que habría habido sin LIMIT. Salida solo si la consulta contiene LIMIT. Si la consulta contiene GROUP BY, rows_before_limit_at_least es el número exacto de filas que habría habido sin un LIMIT .
--   `time` es el tiempo de ejecución de la solicitud en segundos
--   `rows_read` es el número de filas que se ha leído
--   `bytes_read` es el número de bytes (sin comprimir) que se ha leído
-
-Marcador `data`, `totals`, `min` y `max` no debe tener una regla de escape especificada (o `None` debe especificarse explícitamente). Los marcadores de posición restantes pueden tener cualquier regla de escape especificada.
-Si el `format_template_resultset` valor es una cadena vacía, `${data}` se utiliza como valor predeterminado.
-Para el formato de consultas de inserción permite omitir algunas columnas o algunos campos si prefijo o sufijo (ver ejemplo).
-
-Seleccionar ejemplo:
-
-``` sql
-SELECT SearchPhrase, count() AS c FROM test.hits GROUP BY SearchPhrase ORDER BY c DESC LIMIT 5 FORMAT Template SETTINGS
-format_template_resultset = '/some/path/resultset.format', format_template_row = '/some/path/row.format', format_template_rows_between_delimiter = '\n    '
-```
-
-`/some/path/resultset.format`:
-
-``` text
-<!DOCTYPE HTML>
-<html> <head> <title>Search phrases</title> </head>
- <body>
-  <table border="1"> <caption>Search phrases</caption>
-    <tr> <th>Search phrase</th> <th>Count</th> </tr>
-    ${data}
-  </table>
-  <table border="1"> <caption>Max</caption>
-    ${max}
-  </table>
-  <b>Processed ${rows_read:XML} rows in ${time:XML} sec</b>
- </body>
-</html>
-```
-
-`/some/path/row.format`:
-
-``` text
-<tr> <td>${0:XML}</td> <td>${1:XML}</td> </tr>
-```
-
-Resultado:
-
-``` html
-<!DOCTYPE HTML>
-<html> <head> <title>Search phrases</title> </head>
- <body>
-  <table border="1"> <caption>Search phrases</caption>
-    <tr> <th>Search phrase</th> <th>Count</th> </tr>
-    <tr> <td></td> <td>8267016</td> </tr>
-    <tr> <td>bathroom interior design</td> <td>2166</td> </tr>
-    <tr> <td>yandex</td> <td>1655</td> </tr>
-    <tr> <td>spring 2014 fashion</td> <td>1549</td> </tr>
-    <tr> <td>freeform photos</td> <td>1480</td> </tr>
-  </table>
-  <table border="1"> <caption>Max</caption>
-    <tr> <td></td> <td>8873898</td> </tr>
-  </table>
-  <b>Processed 3095973 rows in 0.1569913 sec</b>
- </body>
-</html>
-```
-
-Insertar ejemplo:
-
-``` text
-Some header
-Page views: 5, User id: 4324182021466249494, Useless field: hello, Duration: 146, Sign: -1
-Page views: 6, User id: 4324182021466249494, Useless field: world, Duration: 185, Sign: 1
-Total rows: 2
-```
-
-``` sql
-INSERT INTO UserActivity FORMAT Template SETTINGS
-format_template_resultset = '/some/path/resultset.format', format_template_row = '/some/path/row.format'
-```
-
-`/some/path/resultset.format`:
-
-``` text
-Some header\n${data}\nTotal rows: ${:CSV}\n
-```
-
-`/some/path/row.format`:
-
-``` text
-Page views: ${PageViews:CSV}, User id: ${UserID:CSV}, Useless field: ${:CSV}, Duration: ${Duration:CSV}, Sign: ${Sign:CSV}
-```
-
-`PageViews`, `UserID`, `Duration` y `Sign` dentro de los marcadores de posición son nombres de columnas en la tabla. Valores después `Useless field` en filas y después `\nTotal rows:` en el sufijo será ignorado.
-Todos los delimitadores de los datos de entrada deben ser estrictamente iguales a los delimitadores de las cadenas de formato especificadas.
-
-## TemplateIgnoreSpaces {#templateignorespaces}
-
-Este formato es adecuado sólo para la entrada.
-Similar a `Template`, pero omite caracteres de espacio en blanco entre delimitadores y valores en la secuencia de entrada. Sin embargo, si las cadenas de formato contienen caracteres de espacio en blanco, se esperarán estos caracteres en la secuencia de entrada. También permite especificar marcadores de posición vacíos (`${}` o `${:None}`) para dividir algún delimitador en partes separadas para ignorar los espacios entre ellos. Dichos marcadores de posición se usan solo para omitir caracteres de espacio en blanco.
-Es posible leer `JSON` usando este formato, si los valores de las columnas tienen el mismo orden en todas las filas. Por ejemplo, la siguiente solicitud se puede utilizar para insertar datos del ejemplo de salida de formato [JSON](#json):
-
-``` sql
-INSERT INTO table_name FORMAT TemplateIgnoreSpaces SETTINGS
-format_template_resultset = '/some/path/resultset.format', format_template_row = '/some/path/row.format', format_template_rows_between_delimiter = ','
-```
-
-`/some/path/resultset.format`:
-
-``` text
-{${}"meta"${}:${:JSON},${}"data"${}:${}[${data}]${},${}"totals"${}:${:JSON},${}"extremes"${}:${:JSON},${}"rows"${}:${:JSON},${}"rows_before_limit_at_least"${}:${:JSON}${}}
-```
-
-`/some/path/row.format`:
-
-``` text
-{${}"SearchPhrase"${}:${}${phrase:JSON}${},${}"c"${}:${}${cnt:JSON}${}}
-```
-
-## TSKV {#tskv}
-
-Similar a TabSeparated , pero genera un valor en formato name=value . Los nombres se escapan de la misma manera que en el formato TabSeparated, y el símbolo = también se escapa.
-
-``` text
-SearchPhrase=   count()=8267016
-SearchPhrase=bathroom interior design    count()=2166
-SearchPhrase=yandex     count()=1655
-SearchPhrase=2014 spring fashion    count()=1549
-SearchPhrase=freeform photos       count()=1480
-SearchPhrase=angelina jolie    count()=1245
-SearchPhrase=omsk       count()=1112
-SearchPhrase=photos of dog breeds    count()=1091
-SearchPhrase=curtain designs        count()=1064
-SearchPhrase=baku       count()=1000
-```
-
-[NULL](../sql-reference/syntax.md) se formatea como `\N`.
-
-``` sql
-SELECT * FROM t_null FORMAT TSKV
-```
-
-``` text
-x=1    y=\N
-```
-
-Cuando hay una gran cantidad de columnas pequeñas, este formato no es efectivo y generalmente no hay razón para usarlo. Sin embargo, no es peor que JSONEachRow en términos de eficiencia.
-
-Both data output and parsing are supported in this format. For parsing, any order is supported for the values of different columns. It is acceptable for some values to be omitted – they are treated as equal to their default values. In this case, zeros and blank rows are used as default values. Complex values that could be specified in the table are not supported as defaults.
-
-El análisis permite la presencia del campo adicional `tskv` sin el signo igual o un valor. Este campo se ignora.
-
-## CSV {#csv}
-
-Formato de valores separados por comas ([RFC](https://tools.ietf.org/html/rfc4180)).
-
-Al formatear, las filas están encerradas en comillas dobles. Una comilla doble dentro de una cadena se genera como dos comillas dobles en una fila. No hay otras reglas para escapar de los personajes. Fecha y fecha-hora están encerrados en comillas dobles. Los números se emiten sin comillas. Los valores están separados por un carácter delimitador, que es `,` predeterminada. El carácter delimitador se define en la configuración [Formato_csv_delimiter](../operations/settings/settings.md#settings-format_csv_delimiter). Las filas se separan usando el avance de línea Unix (LF). Las matrices se serializan en CSV de la siguiente manera: primero, la matriz se serializa en una cadena como en el formato TabSeparated, y luego la cadena resultante se envía a CSV en comillas dobles. Las tuplas en formato CSV se serializan como columnas separadas (es decir, se pierde su anidamiento en la tupla).
-
-``` bash
-$ clickhouse-client --format_csv_delimiter="|" --query="INSERT INTO test.csv FORMAT CSV" < data.csv
-```
-
-\*De forma predeterminada, el delimitador es `,`. Ver el [Formato_csv_delimiter](../operations/settings/settings.md#settings-format_csv_delimiter) para obtener más información.
-
-Al analizar, todos los valores se pueden analizar con o sin comillas. Ambas comillas dobles y simples son compatibles. Las filas también se pueden organizar sin comillas. En este caso, se analizan hasta el carácter delimitador o el avance de línea (CR o LF). En violación del RFC, al analizar filas sin comillas, se ignoran los espacios y pestañas iniciales y finales. Para el avance de línea, se admiten los tipos Unix (LF), Windows (CR LF) y Mac OS Classic (CR LF).
-
-Los valores de entrada vacíos sin comillas se sustituyen por valores predeterminados para las columnas respectivas, si
-[Entrada_format_defaults_for_omitted_fields](../operations/settings/settings.md#session_settings-input_format_defaults_for_omitted_fields)
-está habilitado.
-
-`NULL` se formatea como `\N` o `NULL` o una cadena vacía sin comillas (consulte la configuración [input_format_csv_unquoted_null_literal_as_null](../operations/settings/settings.md#settings-input_format_csv_unquoted_null_literal_as_null) y [Entrada_format_defaults_for_omitted_fields](../operations/settings/settings.md#session_settings-input_format_defaults_for_omitted_fields)).
-
-El formato CSV admite la salida de totales y extremos de la misma manera que `TabSeparated`.
-
-## CSVWithNames {#csvwithnames}
-
-También imprime la fila del encabezado, similar a `TabSeparatedWithNames`.
-
-## CustomSeparated {#format-customseparated}
-
-Similar a [Plantilla](#format-template), pero imprime o lee todas las columnas y usa la regla de escape de la configuración `format_custom_escaping_rule` y delimitadores desde la configuración `format_custom_field_delimiter`, `format_custom_row_before_delimiter`, `format_custom_row_after_delimiter`, `format_custom_row_between_delimiter`, `format_custom_result_before_delimiter` y `format_custom_result_after_delimiter`, no de cadenas de formato.
-También hay `CustomSeparatedIgnoreSpaces` formato, que es similar a `TemplateIgnoreSpaces`.
-
-## JSON {#json}
-
-Salida de datos en formato JSON. Además de las tablas de datos, también genera nombres y tipos de columnas, junto con información adicional: el número total de filas de salida y el número de filas que podrían haberse generado si no hubiera un LIMIT . Ejemplo:
-
-``` sql
-SELECT SearchPhrase, count() AS c FROM test.hits GROUP BY SearchPhrase WITH TOTALS ORDER BY c DESC LIMIT 5 FORMAT JSON
-```
-
-``` json
-{
-        "meta":
-        [
-                {
-                        "name": "SearchPhrase",
-                        "type": "String"
-                },
-                {
-                        "name": "c",
-                        "type": "UInt64"
-                }
-        ],
-
-        "data":
-        [
-                {
-                        "SearchPhrase": "",
-                        "c": "8267016"
-                },
-                {
-                        "SearchPhrase": "bathroom interior design",
-                        "c": "2166"
-                },
-                {
-                        "SearchPhrase": "yandex",
-                        "c": "1655"
-                },
-                {
-                        "SearchPhrase": "spring 2014 fashion",
-                        "c": "1549"
-                },
-                {
-                        "SearchPhrase": "freeform photos",
-                        "c": "1480"
-                }
-        ],
-
-        "totals":
-        {
-                "SearchPhrase": "",
-                "c": "8873898"
-        },
-
-        "extremes":
-        {
-                "min":
-                {
-                        "SearchPhrase": "",
-                        "c": "1480"
-                },
-                "max":
-                {
-                        "SearchPhrase": "",
-                        "c": "8267016"
-                }
-        },
-
-        "rows": 5,
-
-        "rows_before_limit_at_least": 141137
-}
-```
-
-El JSON es compatible con JavaScript. Para garantizar esto, algunos caracteres se escapan adicionalmente: la barra inclinada `/` se escapa como `\/`; saltos de línea alternativos `U+2028` y `U+2029`, que rompen algunos navegadores, se escapan como `\uXXXX`. Los caracteres de control ASCII se escapan: retroceso, avance de formulario, avance de línea, retorno de carro y tabulación horizontal se reemplazan con `\b`, `\f`, `\n`, `\r`, `\t` , así como los bytes restantes en el rango 00-1F usando `\uXXXX` sequences. Invalid UTF-8 sequences are changed to the replacement character � so the output text will consist of valid UTF-8 sequences. For compatibility with JavaScript, Int64 and UInt64 integers are enclosed in double-quotes by default. To remove the quotes, you can set the configuration parameter [output_format_json_quote_64bit_integers](../operations/settings/settings.md#session_settings-output_format_json_quote_64bit_integers) a 0.
-
-`rows` – The total number of output rows.
-
-`rows_before_limit_at_least` El número mínimo de filas habría sido sin LIMIT . Salida solo si la consulta contiene LIMIT.
-Si la consulta contiene GROUP BY, rows_before_limit_at_least es el número exacto de filas que habría habido sin un LIMIT .
-
-`totals` – Total values (when using WITH TOTALS).
-
-`extremes` – Extreme values (when extremes are set to 1).
-
-Este formato solo es apropiado para generar un resultado de consulta, pero no para analizar (recuperar datos para insertar en una tabla).
-
-Soporta ClickHouse [NULL](../sql-reference/syntax.md), que se muestra como `null` en la salida JSON.
-
-Ver también el [JSONEachRow](#jsoneachrow) formato.
-
-## JSONCompact {#jsoncompact}
-
-Difiere de JSON solo en que las filas de datos se generan en matrices, no en objetos.
-
-Ejemplo:
-
-``` json
-{
-        "meta":
-        [
-                {
-                        "name": "SearchPhrase",
-                        "type": "String"
-                },
-                {
-                        "name": "c",
-                        "type": "UInt64"
-                }
-        ],
-
-        "data":
-        [
-                ["", "8267016"],
-                ["bathroom interior design", "2166"],
-                ["yandex", "1655"],
-                ["fashion trends spring 2014", "1549"],
-                ["freeform photo", "1480"]
-        ],
-
-        "totals": ["","8873898"],
-
-        "extremes":
-        {
-                "min": ["","1480"],
-                "max": ["","8267016"]
-        },
-
-        "rows": 5,
-
-        "rows_before_limit_at_least": 141137
-}
-```
-
-Este formato solo es apropiado para generar un resultado de consulta, pero no para analizar (recuperar datos para insertar en una tabla).
-Ver también el `JSONEachRow` formato.
-
-## JSONEachRow {#jsoneachrow}
-
-Al usar este formato, ClickHouse genera filas como objetos JSON separados, delimitados por nuevas líneas, pero los datos en su conjunto no son JSON válidos.
-
-``` json
-{"SearchPhrase":"curtain designs","count()":"1064"}
-{"SearchPhrase":"baku","count()":"1000"}
-{"SearchPhrase":"","count()":"8267016"}
-```
-
-Al insertar los datos, debe proporcionar un objeto JSON independiente para cada fila.
-
-### Insertar datos {#inserting-data}
-
-``` sql
-INSERT INTO UserActivity FORMAT JSONEachRow {"PageViews":5, "UserID":"4324182021466249494", "Duration":146,"Sign":-1} {"UserID":"4324182021466249494","PageViews":6,"Duration":185,"Sign":1}
-```
-
-ClickHouse permite:
-
--   Cualquier orden de pares clave-valor en el objeto.
--   Omitiendo algunos valores.
-
-ClickHouse ignora los espacios entre los elementos y las comas después de los objetos. Puede pasar todos los objetos en una línea. No tiene que separarlos con saltos de línea.
-
-**Procesamiento de valores omitidos**
-
-ClickHouse sustituye los valores omitidos por los valores predeterminados para el [tipos de datos](../sql-reference/data-types/index.md).
-
-Si `DEFAULT expr` se especifica, ClickHouse utiliza diferentes reglas de sustitución dependiendo de la [Entrada_format_defaults_for_omitted_fields](../operations/settings/settings.md#session_settings-input_format_defaults_for_omitted_fields) configuración.
-
-Considere la siguiente tabla:
-
-``` sql
-CREATE TABLE IF NOT EXISTS example_table
-(
-    x UInt32,
-    a DEFAULT x * 2
-) ENGINE = Memory;
-```
-
--   Si `input_format_defaults_for_omitted_fields = 0`, entonces el valor predeterminado para `x` y `a` igual `0` (como el valor predeterminado para el `UInt32` tipo de datos).
--   Si `input_format_defaults_for_omitted_fields = 1`, entonces el valor predeterminado para `x` igual `0` pero el valor predeterminado de `a` igual `x * 2`.
-
-!!! note "Advertencia"
-    Al insertar datos con `insert_sample_with_metadata = 1`, ClickHouse consume más recursos computacionales, en comparación con la inserción con `insert_sample_with_metadata = 0`.
-
-### Selección de datos {#selecting-data}
-
-Considere el `UserActivity` tabla como un ejemplo:
-
-``` text
-┌──────────────UserID─┬─PageViews─┬─Duration─┬─Sign─┐
-│ 4324182021466249494 │         5 │      146 │   -1 │
-│ 4324182021466249494 │         6 │      185 │    1 │
-└─────────────────────┴───────────┴──────────┴──────┘
-```
-
-Consulta `SELECT * FROM UserActivity FORMAT JSONEachRow` devoluciones:
-
-``` text
-{"UserID":"4324182021466249494","PageViews":5,"Duration":146,"Sign":-1}
-{"UserID":"4324182021466249494","PageViews":6,"Duration":185,"Sign":1}
-```
-
-A diferencia de la [JSON](#json) formato, no hay sustitución de secuencias UTF-8 no válidas. Los valores se escapan de la misma manera que para `JSON`.
-
-!!! note "Nota"
-    Cualquier conjunto de bytes se puede generar en las cadenas. Utilice el `JSONEachRow` si está seguro de que los datos de la tabla se pueden formatear como JSON sin perder ninguna información.
-
-### Uso de estructuras anidadas {#jsoneachrow-nested}
-
-Si tienes una mesa con [Anidar](../sql-reference/data-types/nested-data-structures/nested.md) columnas de tipo de datos, puede insertar datos JSON con la misma estructura. Habilite esta función con el [Entrada_format_import_nested_json](../operations/settings/settings.md#settings-input_format_import_nested_json) configuración.
-
-Por ejemplo, considere la siguiente tabla:
-
-``` sql
-CREATE TABLE json_each_row_nested (n Nested (s String, i Int32) ) ENGINE = Memory
-```
-
-Como se puede ver en el `Nested` descripción del tipo de datos, ClickHouse trata cada componente de la estructura anidada como una columna separada (`n.s` y `n.i` para nuestra mesa). Puede insertar datos de la siguiente manera:
-
-``` sql
-INSERT INTO json_each_row_nested FORMAT JSONEachRow {"n.s": ["abc", "def"], "n.i": [1, 23]}
-```
-
-Para insertar datos como un objeto JSON jerárquico, establezca [input_format_import_nested_json=1](../operations/settings/settings.md#settings-input_format_import_nested_json).
-
-``` json
-{
-    "n": {
-        "s": ["abc", "def"],
-        "i": [1, 23]
-    }
-}
-```
-
-Sin esta configuración, ClickHouse produce una excepción.
-
-``` sql
-SELECT name, value FROM system.settings WHERE name = 'input_format_import_nested_json'
-```
-
-``` text
-┌─name────────────────────────────┬─value─┐
-│ input_format_import_nested_json │ 0     │
-└─────────────────────────────────┴───────┘
-```
-
-``` sql
-INSERT INTO json_each_row_nested FORMAT JSONEachRow {"n": {"s": ["abc", "def"], "i": [1, 23]}}
-```
-
-``` text
-Code: 117. DB::Exception: Unknown field found while parsing JSONEachRow format: n: (at row 1)
-```
-
-``` sql
-SET input_format_import_nested_json=1
-INSERT INTO json_each_row_nested FORMAT JSONEachRow {"n": {"s": ["abc", "def"], "i": [1, 23]}}
-SELECT * FROM json_each_row_nested
-```
-
-``` text
-┌─n.s───────────┬─n.i────┐
-│ ['abc','def'] │ [1,23] │
-└───────────────┴────────┘
-```
-
-## Nativo {#native}
-
-El formato más eficiente. Los datos son escritos y leídos por bloques en formato binario. Para cada bloque, el número de filas, número de columnas, nombres y tipos de columnas y partes de columnas de este bloque se registran una tras otra. En otras palabras, este formato es “columnar” – it doesn't convert columns to rows. This is the format used in the native interface for interaction between servers, for using the command-line client, and for C++ clients.
-
-Puede utilizar este formato para generar rápidamente volcados que sólo pueden ser leídos por el DBMS de ClickHouse. No tiene sentido trabajar con este formato usted mismo.
-
-## Nulo {#null}
-
-Nada es salida. Sin embargo, la consulta se procesa y, cuando se utiliza el cliente de línea de comandos, los datos se transmiten al cliente. Esto se usa para pruebas, incluidas las pruebas de rendimiento.
-Obviamente, este formato solo es apropiado para la salida, no para el análisis.
-
-## Bastante {#pretty}
-
-Salidas de datos como tablas de arte Unicode, también utilizando secuencias de escape ANSI para establecer colores en el terminal.
-Se dibuja una cuadrícula completa de la tabla, y cada fila ocupa dos líneas en la terminal.
-Cada bloque de resultados se muestra como una tabla separada. Esto es necesario para que los bloques se puedan generar sin resultados de almacenamiento en búfer (el almacenamiento en búfer sería necesario para calcular previamente el ancho visible de todos los valores).
-
-[NULL](../sql-reference/syntax.md) se emite como `ᴺᵁᴸᴸ`.
-
-Ejemplo (mostrado para el [PrettyCompact](#prettycompact) formato):
-
-``` sql
-SELECT * FROM t_null
-```
-
-``` text
-┌─x─┬────y─┐
-│ 1 │ ᴺᵁᴸᴸ │
-└───┴──────┘
-```
-
-Las filas no se escapan en formatos Pretty \*. Se muestra un ejemplo para el [PrettyCompact](#prettycompact) formato:
-
-``` sql
-SELECT 'String with \'quotes\' and \t character' AS Escaping_test
-```
-
-``` text
-┌─Escaping_test────────────────────────┐
-│ String with 'quotes' and      character │
-└──────────────────────────────────────┘
-```
-
-Para evitar volcar demasiados datos al terminal, solo se imprimen las primeras 10.000 filas. Si el número de filas es mayor o igual que 10.000, el mensaje “Showed first 10 000” se imprime.
-Este formato solo es apropiado para generar un resultado de consulta, pero no para analizar (recuperar datos para insertar en una tabla).
-
-El formato Pretty admite la salida de valores totales (cuando se usa WITH TOTALS) y extremos (cuando ‘extremes’ se establece en 1). En estos casos, los valores totales y los valores extremos se generan después de los datos principales, en tablas separadas. Ejemplo (mostrado para el [PrettyCompact](#prettycompact) formato):
-
-``` sql
-SELECT EventDate, count() AS c FROM test.hits GROUP BY EventDate WITH TOTALS ORDER BY EventDate FORMAT PrettyCompact
-```
-
-``` text
-┌──EventDate─┬───────c─┐
-│ 2014-03-17 │ 1406958 │
-│ 2014-03-18 │ 1383658 │
-│ 2014-03-19 │ 1405797 │
-│ 2014-03-20 │ 1353623 │
-│ 2014-03-21 │ 1245779 │
-│ 2014-03-22 │ 1031592 │
-│ 2014-03-23 │ 1046491 │
-└────────────┴─────────┘
-
-Totals:
-┌──EventDate─┬───────c─┐
-│ 1970-01-01 │ 8873898 │
-└────────────┴─────────┘
-
-Extremes:
-┌──EventDate─┬───────c─┐
-│ 2014-03-17 │ 1031592 │
-│ 2014-03-23 │ 1406958 │
-└────────────┴─────────┘
-```
-
-## PrettyCompact {#prettycompact}
-
-Difiere de [Bastante](#pretty) en que la cuadrícula se dibuja entre filas y el resultado es más compacto.
-Este formato se usa de forma predeterminada en el cliente de línea de comandos en modo interactivo.
-
-## PrettyCompactMonoBlock {#prettycompactmonoblock}
-
-Difiere de [PrettyCompact](#prettycompact) en que hasta 10,000 filas se almacenan en búfer, luego se salen como una sola tabla, no por bloques.
-
-## PrettyNoEscapes {#prettynoescapes}
-
-Difiere de Pretty en que las secuencias de escape ANSI no se usan. Esto es necesario para mostrar este formato en un navegador, así como para usar el ‘watch’ utilidad de línea de comandos.
-
-Ejemplo:
-
-``` bash
-$ watch -n1 "clickhouse-client --query='SELECT event, value FROM system.events FORMAT PrettyCompactNoEscapes'"
-```
-
-Puede usar la interfaz HTTP para mostrar en el navegador.
-
-### PrettyCompactNoEscapes {#prettycompactnoescapes}
-
-Lo mismo que el ajuste anterior.
-
-### PrettySpaceNoEscapes {#prettyspacenoescapes}
-
-Lo mismo que el ajuste anterior.
-
-## Bienvenido a WordPress {#prettyspace}
-
-Difiere de [PrettyCompact](#prettycompact) en ese espacio en blanco (caracteres de espacio) se usa en lugar de la cuadrícula.
-
-## RowBinary {#rowbinary}
-
-Formatea y analiza datos por fila en formato binario. Las filas y los valores se enumeran consecutivamente, sin separadores.
-Este formato es menos eficiente que el formato nativo, ya que está basado en filas.
-
-Los integradores usan una representación little-endian de longitud fija. Por ejemplo, UInt64 usa 8 bytes.
-DateTime se representa como UInt32 que contiene la marca de tiempo Unix como el valor.
-Date se representa como un objeto UInt16 que contiene el número de días desde 1970-01-01 como el valor.
-La cadena se representa como una longitud varint (sin signo [LEB128](https://en.wikipedia.org/wiki/LEB128)), seguido de los bytes de la cadena.
-FixedString se representa simplemente como una secuencia de bytes.
-
-La matriz se representa como una longitud varint (sin signo [LEB128](https://en.wikipedia.org/wiki/LEB128)), seguido de elementos sucesivos de la matriz.
-
-Para [NULL](../sql-reference/syntax.md#null-literal) soporte, se añade un byte adicional que contiene 1 o 0 antes de cada [NULL](../sql-reference/data-types/nullable.md) valor. Si 1, entonces el valor es `NULL` y este byte se interpreta como un valor separado. Si es 0, el valor después del byte no es `NULL`.
-
-## RowBinaryWithNamesAndTypes {#rowbinarywithnamesandtypes}
-
-Similar a [RowBinary](#rowbinary), pero con encabezado añadido:
-
--   [LEB128](https://en.wikipedia.org/wiki/LEB128)-número codificado de columnas (N)
--   N `String`s especificando nombres de columna
--   N `String`s especificando tipos de columna
-
-## Valor {#data-format-values}
-
-Imprime cada fila entre paréntesis. Las filas están separadas por comas. No hay coma después de la última fila. Los valores dentro de los corchetes también están separados por comas. Los números se emiten en formato decimal sin comillas. Las matrices se emiten entre corchetes. Las cadenas, fechas y fechas con horas se generan entre comillas. Las reglas de escape y el análisis son similares a las [TabSeparated](#tabseparated) formato. Durante el formateo, los espacios adicionales no se insertan, pero durante el análisis, se permiten y omiten (excepto los espacios dentro de los valores de la matriz, que no están permitidos). [NULL](../sql-reference/syntax.md) se representa como `NULL`.
-
-The minimum set of characters that you need to escape when passing data in Values ​​format: single quotes and backslashes.
-
-Este es el formato que se utiliza en `INSERT INTO t VALUES ...`, pero también puede usarlo para formatear los resultados de la consulta.
-
-Ver también: [input_format_values_interpret_expressions](../operations/settings/settings.md#settings-input_format_values_interpret_expressions) y [input_format_values_deduce_templates_of_expressions](../operations/settings/settings.md#settings-input_format_values_deduce_templates_of_expressions) configuración.
-
-## Vertical {#vertical}
-
-Imprime cada valor en una línea independiente con el nombre de columna especificado. Este formato es conveniente para imprimir solo una o varias filas si cada fila consta de un gran número de columnas.
-
-[NULL](../sql-reference/syntax.md) se emite como `ᴺᵁᴸᴸ`.
-
-Ejemplo:
-
-``` sql
-SELECT * FROM t_null FORMAT Vertical
-```
-
-``` text
-Row 1:
-──────
-x: 1
-y: ᴺᵁᴸᴸ
-```
-
-Las filas no se escapan en formato vertical:
-
-``` sql
-SELECT 'string with \'quotes\' and \t with some special \n characters' AS test FORMAT Vertical
-```
-
-``` text
-Row 1:
-──────
-test: string with 'quotes' and      with some special
- characters
-```
-
-Este formato solo es apropiado para generar un resultado de consulta, pero no para analizar (recuperar datos para insertar en una tabla).
-
-## VerticalRaw {#verticalraw}
-
-Similar a [Vertical](#vertical), pero con escapar deshabilitado. Este formato solo es adecuado para generar resultados de consultas, no para analizar (recibir datos e insertarlos en la tabla).
-
-## XML {#xml}
-
-El formato XML es adecuado solo para la salida, no para el análisis. Ejemplo:
-
-``` xml
-<?xml version='1.0' encoding='UTF-8' ?>
-<result>
-        <meta>
-                <columns>
-                        <column>
-                                <name>SearchPhrase</name>
-                                <type>String</type>
-                        </column>
-                        <column>
-                                <name>count()</name>
-                                <type>UInt64</type>
-                        </column>
-                </columns>
-        </meta>
-        <data>
-                <row>
-                        <SearchPhrase></SearchPhrase>
-                        <field>8267016</field>
-                </row>
-                <row>
-                        <SearchPhrase>bathroom interior design</SearchPhrase>
-                        <field>2166</field>
-                </row>
-                <row>
-                        <SearchPhrase>yandex</SearchPhrase>
-                        <field>1655</field>
-                </row>
-                <row>
-                        <SearchPhrase>2014 spring fashion</SearchPhrase>
-                        <field>1549</field>
-                </row>
-                <row>
-                        <SearchPhrase>freeform photos</SearchPhrase>
-                        <field>1480</field>
-                </row>
-                <row>
-                        <SearchPhrase>angelina jolie</SearchPhrase>
-                        <field>1245</field>
-                </row>
-                <row>
-                        <SearchPhrase>omsk</SearchPhrase>
-                        <field>1112</field>
-                </row>
-                <row>
-                        <SearchPhrase>photos of dog breeds</SearchPhrase>
-                        <field>1091</field>
-                </row>
-                <row>
-                        <SearchPhrase>curtain designs</SearchPhrase>
-                        <field>1064</field>
-                </row>
-                <row>
-                        <SearchPhrase>baku</SearchPhrase>
-                        <field>1000</field>
-                </row>
-        </data>
-        <rows>10</rows>
-        <rows_before_limit_at_least>141137</rows_before_limit_at_least>
-</result>
-```
-
-Si el nombre de la columna no tiene un formato aceptable, simplemente ‘field’ se utiliza como el nombre del elemento. En general, la estructura XML sigue la estructura JSON.
-Just as for JSON, invalid UTF-8 sequences are changed to the replacement character � so the output text will consist of valid UTF-8 sequences.
-
-En los valores de cadena, los caracteres `<` y `&` se escaparon como `<` y `&`.
-
-Las matrices se emiten como `<array><elem>Hello</elem><elem>World</elem>...</array>`y tuplas como `<tuple><elem>Hello</elem><elem>World</elem>...</tuple>`.
-
-## CapnProto {#capnproto}
-
-Cap'n Proto es un formato de mensaje binario similar a Protocol Buffers y Thrift, pero no como JSON o MessagePack.
-
-Los mensajes de Cap'n Proto están estrictamente escritos y no autodescribidos, lo que significa que necesitan una descripción de esquema externo. El esquema se aplica sobre la marcha y se almacena en caché para cada consulta.
-
-``` bash
-$ cat capnproto_messages.bin | clickhouse-client --query "INSERT INTO test.hits FORMAT CapnProto SETTINGS format_schema='schema:Message'"
-```
-
-Donde `schema.capnp` se ve así:
-
-``` capnp
-struct Message {
-  SearchPhrase @0 :Text;
-  c @1 :Uint64;
-}
-```
-
-La deserialización es efectiva y generalmente no aumenta la carga del sistema.
-
-Ver también [Esquema de formato](#formatschema).
-
-## Protobuf {#protobuf}
-
-Protobuf - es un [Búferes de protocolo](https://developers.google.com/protocol-buffers/) formato.
-
-Este formato requiere un esquema de formato externo. El esquema se almacena en caché entre las consultas.
-ClickHouse soporta ambos `proto2` y `proto3` sintaxis. Se admiten campos repetidos / opcionales / requeridos.
-
-Ejemplos de uso:
-
-``` sql
-SELECT * FROM test.table FORMAT Protobuf SETTINGS format_schema = 'schemafile:MessageType'
-```
-
-``` bash
-cat protobuf_messages.bin | clickhouse-client --query "INSERT INTO test.table FORMAT Protobuf SETTINGS format_schema='schemafile:MessageType'"
-```
-
-donde el archivo `schemafile.proto` se ve así:
-
-``` capnp
-syntax = "proto3";
-
-message MessageType {
-  string name = 1;
-  string surname = 2;
-  uint32 birthDate = 3;
-  repeated string phoneNumbers = 4;
-};
-```
-
-Para encontrar la correspondencia entre las columnas de la tabla y los campos del tipo de mensaje de Protocol Buffers, ClickHouse compara sus nombres.
-Esta comparación no distingue entre mayúsculas y minúsculas y los caracteres `_` (subrayado) y `.` (punto) se consideran iguales.
-Si los tipos de una columna y un campo del mensaje de Protocol Buffers son diferentes, se aplica la conversión necesaria.
-
-Los mensajes anidados son compatibles. Por ejemplo, para el campo `z` en el siguiente tipo de mensaje
-
-``` capnp
-message MessageType {
-  message XType {
-    message YType {
-      int32 z;
-    };
-    repeated YType y;
-  };
-  XType x;
-};
-```
-
-ClickHouse intenta encontrar una columna llamada `x.y.z` (o `x_y_z` o `X.y_Z` y así sucesivamente).
-Los mensajes anidados son adecuados para [estructuras de datos anidados](../sql-reference/data-types/nested-data-structures/nested.md).
-
-Valores predeterminados definidos en un esquema protobuf como este
-
-``` capnp
-syntax = "proto2";
-
-message MessageType {
-  optional int32 result_per_page = 3 [default = 10];
-}
-```
-
-no se aplican; el [valores predeterminados de la tabla](../sql-reference/statements/create.md#create-default-values) se utilizan en lugar de ellos.
-
-ClickHouse entra y emite mensajes protobuf en el `length-delimited` formato.
-Significa que antes de cada mensaje debe escribirse su longitud como un [varint](https://developers.google.com/protocol-buffers/docs/encoding#varints).
-Ver también [cómo leer / escribir mensajes protobuf delimitados por longitud en idiomas populares](https://cwiki.apache.org/confluence/display/GEODE/Delimiting+Protobuf+Messages).
-
-## Avro {#data-format-avro}
-
-[Más información](http://avro.apache.org/) es un marco de serialización de datos orientado a filas desarrollado dentro del proyecto Hadoop de Apache.
-
-El formato ClickHouse Avro admite lectura y escritura [Archivos de datos Avro](http://avro.apache.org/docs/current/spec.html#Object+Container+Files).
-
-### Coincidencia de tipos de datos {#data_types-matching}
-
-La siguiente tabla muestra los tipos de datos admitidos y cómo coinciden con ClickHouse [tipos de datos](../sql-reference/data-types/index.md) en `INSERT` y `SELECT` consulta.
-
-| Tipo de datos Avro `INSERT`                 | Tipo de datos ClickHouse                                                                                                | Tipo de datos Avro `SELECT`  |
-|---------------------------------------------|-------------------------------------------------------------------------------------------------------------------------|------------------------------|
-| `boolean`, `int`, `long`, `float`, `double` | [¿Cómo funciona?)](../sql-reference/data-types/int-uint.md), [UInt(8\|16\|32)](../sql-reference/data-types/int-uint.md) | `int`                        |
-| `boolean`, `int`, `long`, `float`, `double` | [Int64](../sql-reference/data-types/int-uint.md), [UInt64](../sql-reference/data-types/int-uint.md)                     | `long`                       |
-| `boolean`, `int`, `long`, `float`, `double` | [Float32](../sql-reference/data-types/float.md)                                                                         | `float`                      |
-| `boolean`, `int`, `long`, `float`, `double` | [Float64](../sql-reference/data-types/float.md)                                                                         | `double`                     |
-| `bytes`, `string`, `fixed`, `enum`          | [Cadena](../sql-reference/data-types/string.md)                                                                         | `bytes`                      |
-| `bytes`, `string`, `fixed`                  | [Cadena fija (N)](../sql-reference/data-types/fixedstring.md)                                                           | `fixed(N)`                   |
-| `enum`                                      | [Enum (8\|16)](../sql-reference/data-types/enum.md)                                                                     | `enum`                       |
-| `array(T)`                                  | [Matriz (T)](../sql-reference/data-types/array.md)                                                                      | `array(T)`                   |
-| `union(null, T)`, `union(T, null)`          | [Nivel de Cifrado WEP)](../sql-reference/data-types/date.md)                                                            | `union(null, T)`             |
-| `null`                                      | [Nullable (nada)](../sql-reference/data-types/special-data-types/nothing.md)                                            | `null`                       |
-| `int (date)` \*                             | [Fecha](../sql-reference/data-types/date.md)                                                                            | `int (date)` \*              |
-| `long (timestamp-millis)` \*                | [¿Qué puedes encontrar en Neodigit)](../sql-reference/data-types/datetime.md)                                           | `long (timestamp-millis)` \* |
-| `long (timestamp-micros)` \*                | [Cómo hacer esto?)](../sql-reference/data-types/datetime.md)                                                            | `long (timestamp-micros)` \* |
-
-\* [Tipos lógicos Avro](http://avro.apache.org/docs/current/spec.html#Logical+Types)
-
-Tipos de datos Avro no admitidos: `record` (no root), `map`
-
-Tipos de datos lógicos Avro no admitidos: `uuid`, `time-millis`, `time-micros`, `duration`
-
-### Insertar datos {#inserting-data-1}
-
-Para insertar datos de un archivo Avro en la tabla ClickHouse:
-
-``` bash
-$ cat file.avro | clickhouse-client --query="INSERT INTO {some_table} FORMAT Avro"
-```
-
-El esquema raíz del archivo Avro de entrada debe ser de `record` tipo.
-
-Para encontrar la correspondencia entre las columnas de la tabla y los campos de Avro esquema ClickHouse compara sus nombres. Esta comparación distingue entre mayúsculas y minúsculas.
-Los campos no utilizados se omiten.
-
-Los tipos de datos de las columnas de tabla ClickHouse pueden diferir de los campos correspondientes de los datos de Avro insertados. Al insertar datos, ClickHouse interpreta los tipos de datos de acuerdo con la tabla anterior y luego [elenco](../sql-reference/functions/type-conversion-functions.md#type_conversion_function-cast) los datos al tipo de columna correspondiente.
-
-### Selección de datos {#selecting-data-1}
-
-Para seleccionar datos de la tabla ClickHouse en un archivo Avro:
-
-``` bash
-$ clickhouse-client --query="SELECT * FROM {some_table} FORMAT Avro" > file.avro
-```
-
-Los nombres de columna deben:
-
--   comenzar con `[A-Za-z_]`
--   posteriormente contienen sólo `[A-Za-z0-9_]`
-
-La compresión de archivos Avro de salida y el intervalo de sincronización se pueden configurar con [Sistema abierto.](../operations/settings/settings.md#settings-output_format_avro_codec) y [Sistema abierto.](../operations/settings/settings.md#settings-output_format_avro_sync_interval) respectivamente.
-
-## AvroConfluent {#data-format-avro-confluent}
-
-AvroConfluent admite la decodificación de mensajes Avro de un solo objeto comúnmente utilizados con [Kafka](https://kafka.apache.org/) y [Registro de Esquemas Confluentes](https://docs.confluent.io/current/schema-registry/index.html).
-
-Cada mensaje de Avro incrusta un id de esquema que se puede resolver en el esquema real con la ayuda del Registro de esquemas.
-
-Los esquemas se almacenan en caché una vez resueltos.
-
-La URL del registro de esquemas se configura con [Todos los derechos reservados.](../operations/settings/settings.md#settings-format_avro_schema_registry_url)
-
-### Coincidencia de tipos de datos {#data_types-matching-1}
-
-Lo mismo que [Avro](#data-format-avro)
-
-### Uso {#usage}
-
-Para verificar rápidamente la resolución del esquema, puede usar [Método de codificación de datos:](https://github.com/edenhill/kafkacat) con [Sistema abierto.](../operations/utilities/clickhouse-local.md#clickhouse-local):
-
-``` bash
-$ kafkacat -b kafka-broker  -C -t topic1 -o beginning -f '%s' -c 3 | clickhouse-local   --input-format AvroConfluent --format_avro_schema_registry_url 'http://schema-registry' -S "field1 Int64, field2 String"  -q 'select *  from table'
-1 a
-2 b
-3 c
-```
-
-Utilizar `AvroConfluent` con [Kafka](../engines/table-engines/integrations/kafka.md):
-
-``` sql
-CREATE TABLE topic1_stream
-(
-    field1 String,
-    field2 String
-)
-ENGINE = Kafka()
-SETTINGS
-kafka_broker_list = 'kafka-broker',
-kafka_topic_list = 'topic1',
-kafka_group_name = 'group1',
-kafka_format = 'AvroConfluent';
-
-SET format_avro_schema_registry_url = 'http://schema-registry';
-
-SELECT * FROM topic1_stream;
-```
-
-!!! note "Advertencia"
-    Configuración `format_avro_schema_registry_url` necesita ser configurado en `users.xml` para mantener su valor después de un reinicio.
-
-## Parquet {#data-format-parquet}
-
-[Apache Parquet](http://parquet.apache.org/) es un formato de almacenamiento columnar generalizado en el ecosistema Hadoop. ClickHouse admite operaciones de lectura y escritura para este formato.
-
-### Coincidencia de tipos de datos {#data_types-matching-2}
-
-La siguiente tabla muestra los tipos de datos admitidos y cómo coinciden con ClickHouse [tipos de datos](../sql-reference/data-types/index.md) en `INSERT` y `SELECT` consulta.
-
-| Tipo de datos de parquet (`INSERT`) | Tipo de datos ClickHouse                                  | Tipo de datos de parquet (`SELECT`) |
-|-------------------------------------|-----------------------------------------------------------|-------------------------------------|
-| `UINT8`, `BOOL`                     | [UInt8](../sql-reference/data-types/int-uint.md)          | `UINT8`                             |
-| `INT8`                              | [Int8](../sql-reference/data-types/int-uint.md)           | `INT8`                              |
-| `UINT16`                            | [UInt16](../sql-reference/data-types/int-uint.md)         | `UINT16`                            |
-| `INT16`                             | [Int16](../sql-reference/data-types/int-uint.md)          | `INT16`                             |
-| `UINT32`                            | [UInt32](../sql-reference/data-types/int-uint.md)         | `UINT32`                            |
-| `INT32`                             | [Int32](../sql-reference/data-types/int-uint.md)          | `INT32`                             |
-| `UINT64`                            | [UInt64](../sql-reference/data-types/int-uint.md)         | `UINT64`                            |
-| `INT64`                             | [Int64](../sql-reference/data-types/int-uint.md)          | `INT64`                             |
-| `FLOAT`, `HALF_FLOAT`               | [Float32](../sql-reference/data-types/float.md)           | `FLOAT`                             |
-| `DOUBLE`                            | [Float64](../sql-reference/data-types/float.md)           | `DOUBLE`                            |
-| `DATE32`                            | [Fecha](../sql-reference/data-types/date.md)              | `UINT16`                            |
-| `DATE64`, `TIMESTAMP`               | [FechaHora](../sql-reference/data-types/datetime.md)      | `UINT32`                            |
-| `STRING`, `BINARY`                  | [Cadena](../sql-reference/data-types/string.md)           | `STRING`                            |
-| —                                   | [Cadena fija](../sql-reference/data-types/fixedstring.md) | `STRING`                            |
-| `DECIMAL`                           | [Decimal](../sql-reference/data-types/decimal.md)         | `DECIMAL`                           |
-
-ClickHouse admite una precisión configurable de `Decimal` tipo. El `INSERT` consulta trata el Parquet `DECIMAL` tipo como el ClickHouse `Decimal128` tipo.
-
-Tipos de datos de parquet no admitidos: `DATE32`, `TIME32`, `FIXED_SIZE_BINARY`, `JSON`, `UUID`, `ENUM`.
-
-Los tipos de datos de las columnas de tabla ClickHouse pueden diferir de los campos correspondientes de los datos de Parquet insertados. Al insertar datos, ClickHouse interpreta los tipos de datos de acuerdo con la tabla anterior y luego [elenco](../query_language/functions/type_conversion_functions/#type_conversion_function-cast) los datos de ese tipo de datos que se establece para la columna de tabla ClickHouse.
-
-### Insertar y seleccionar datos {#inserting-and-selecting-data}
-
-Puede insertar datos de Parquet desde un archivo en la tabla ClickHouse mediante el siguiente comando:
-
-``` bash
-$ cat {filename} | clickhouse-client --query="INSERT INTO {some_table} FORMAT Parquet"
-```
-
-Puede seleccionar datos de una tabla ClickHouse y guardarlos en algún archivo en el formato Parquet mediante el siguiente comando:
-
-``` bash
-$ clickhouse-client --query="SELECT * FROM {some_table} FORMAT Parquet" > {some_file.pq}
-```
-
-Para intercambiar datos con Hadoop, puede usar [Motor de mesa HDFS](../engines/table-engines/integrations/hdfs.md).
-
-## ORC {#data-format-orc}
-
-[Apache ORC](https://orc.apache.org/) es un formato de almacenamiento columnar generalizado en el ecosistema Hadoop. Solo puede insertar datos en este formato en ClickHouse.
-
-### Coincidencia de tipos de datos {#data_types-matching-3}
-
-La siguiente tabla muestra los tipos de datos admitidos y cómo coinciden con ClickHouse [tipos de datos](../sql-reference/data-types/index.md) en `INSERT` consulta.
-
-| Tipo de datos ORC (`INSERT`) | Tipo de datos ClickHouse                             |
-|------------------------------|------------------------------------------------------|
-| `UINT8`, `BOOL`              | [UInt8](../sql-reference/data-types/int-uint.md)     |
-| `INT8`                       | [Int8](../sql-reference/data-types/int-uint.md)      |
-| `UINT16`                     | [UInt16](../sql-reference/data-types/int-uint.md)    |
-| `INT16`                      | [Int16](../sql-reference/data-types/int-uint.md)     |
-| `UINT32`                     | [UInt32](../sql-reference/data-types/int-uint.md)    |
-| `INT32`                      | [Int32](../sql-reference/data-types/int-uint.md)     |
-| `UINT64`                     | [UInt64](../sql-reference/data-types/int-uint.md)    |
-| `INT64`                      | [Int64](../sql-reference/data-types/int-uint.md)     |
-| `FLOAT`, `HALF_FLOAT`        | [Float32](../sql-reference/data-types/float.md)      |
-| `DOUBLE`                     | [Float64](../sql-reference/data-types/float.md)      |
-| `DATE32`                     | [Fecha](../sql-reference/data-types/date.md)         |
-| `DATE64`, `TIMESTAMP`        | [FechaHora](../sql-reference/data-types/datetime.md) |
-| `STRING`, `BINARY`           | [Cadena](../sql-reference/data-types/string.md)      |
-| `DECIMAL`                    | [Decimal](../sql-reference/data-types/decimal.md)    |
-
-ClickHouse soporta la precisión configurable de la `Decimal` tipo. El `INSERT` consulta trata el ORC `DECIMAL` tipo como el ClickHouse `Decimal128` tipo.
-
-Tipos de datos ORC no admitidos: `DATE32`, `TIME32`, `FIXED_SIZE_BINARY`, `JSON`, `UUID`, `ENUM`.
-
-Los tipos de datos de las columnas de tabla ClickHouse no tienen que coincidir con los campos de datos ORC correspondientes. Al insertar datos, ClickHouse interpreta los tipos de datos de acuerdo con la tabla anterior y luego [elenco](../sql-reference/functions/type-conversion-functions.md#type_conversion_function-cast) los datos al tipo de datos establecido para la columna de tabla ClickHouse.
-
-### Insertar datos {#inserting-data-2}
-
-Puede insertar datos ORC de un archivo en la tabla ClickHouse mediante el siguiente comando:
-
-``` bash
-$ cat filename.orc | clickhouse-client --query="INSERT INTO some_table FORMAT ORC"
-```
-
-Para intercambiar datos con Hadoop, puede usar [Motor de mesa HDFS](../engines/table-engines/integrations/hdfs.md).
-
-## Esquema de formato {#formatschema}
-
-El valor establece el nombre de archivo que contiene el esquema de formato `format_schema`.
-Es necesario establecer esta configuración cuando se utiliza uno de los formatos `Cap'n Proto` y `Protobuf`.
-El esquema de formato es una combinación de un nombre de archivo y el nombre de un tipo de mensaje en este archivo, delimitado por dos puntos,
-e.g. `schemafile.proto:MessageType`.
-Si el archivo tiene la extensión estándar para el formato (por ejemplo, `.proto` para `Protobuf`),
-se puede omitir y en este caso, el esquema de formato se ve así `schemafile:MessageType`.
-
-Si introduce o emite datos a través del [cliente](../interfaces/cli.md) en el [modo interactivo](../interfaces/cli.md#cli_usage), el nombre de archivo especificado en el esquema de formato
-puede contener una ruta absoluta o una ruta relativa al directorio actual en el cliente.
-Si utiliza el cliente en el [modo por lotes](../interfaces/cli.md#cli_usage), la ruta de acceso al esquema debe ser relativa por razones de seguridad.
-
-Si introduce o emite datos a través del [Interfaz HTTP](../interfaces/http.md) el nombre de archivo especificado en el esquema de formato
-debe estar ubicado en el directorio especificado en [format_schema_path](../operations/server-configuration-parameters/settings.md#server_configuration_parameters-format_schema_path)
-en la configuración del servidor.
-
-## Salto de errores {#skippingerrors}
-
-Algunos formatos como `CSV`, `TabSeparated`, `TSKV`, `JSONEachRow`, `Template`, `CustomSeparated` y `Protobuf` puede omitir la fila rota si se produjo un error de análisis y continuar el análisis desde el comienzo de la siguiente fila. Ver [Entrada_format_allow_errors_num](../operations/settings/settings.md#settings-input_format_allow_errors_num) y
-[Entrada_format_allow_errors_ratio](../operations/settings/settings.md#settings-input_format_allow_errors_ratio) configuración.
-Limitacion:
-- En caso de error de análisis `JSONEachRow` omite todos los datos hasta la nueva línea (o EOF), por lo que las filas deben estar delimitadas por `\n` para contar los errores correctamente.
-- `Template` y `CustomSeparated` use el delimitador después de la última columna y el delimitador entre filas para encontrar el comienzo de la siguiente fila, por lo que omitir errores solo funciona si al menos uno de ellos no está vacío.
-
-[Artículo Original](https://clickhouse.tech/docs/en/interfaces/formats/) <!--hide-->
diff --git a/docs/es/interfaces/http.md b/docs/es/interfaces/http.md
deleted file mode 100644
index ab510a268e3..00000000000
--- a/docs/es/interfaces/http.md
+++ /dev/null
@@ -1,617 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 19
-toc_title: Interfaz HTTP
----
-
-# Interfaz HTTP {#http-interface}
-
-La interfaz HTTP le permite usar ClickHouse en cualquier plataforma desde cualquier lenguaje de programación. Lo usamos para trabajar desde Java y Perl, así como scripts de shell. En otros departamentos, la interfaz HTTP se usa desde Perl, Python y Go. La interfaz HTTP es más limitada que la interfaz nativa, pero tiene una mejor compatibilidad.
-
-De forma predeterminada, clickhouse-server escucha HTTP en el puerto 8123 (esto se puede cambiar en la configuración).
-
-Si realiza una solicitud GET / sin parámetros, devuelve 200 códigos de respuesta y la cadena que definió en [http_server_default_response](../operations/server-configuration-parameters/settings.md#server_configuration_parameters-http_server_default_response) valor predeterminado “Ok.” (con un avance de línea al final)
-
-``` bash
-$ curl 'http://localhost:8123/'
-Ok.
-```
-
-Use la solicitud GET / ping en los scripts de comprobación de estado. Este controlador siempre devuelve “Ok.” (con un avance de línea al final). Disponible a partir de la versión 18.12.13.
-
-``` bash
-$ curl 'http://localhost:8123/ping'
-Ok.
-```
-
-Enviar la solicitud como una URL ‘query’ parámetro, o como un POST. O envíe el comienzo de la consulta en el ‘query’ parámetro, y el resto en el POST (explicaremos más adelante por qué esto es necesario). El tamaño de la URL está limitado a 16 KB, así que tenga esto en cuenta al enviar consultas grandes.
-
-Si tiene éxito, recibirá el código de respuesta 200 y el resultado en el cuerpo de respuesta.
-Si se produce un error, recibirá el código de respuesta 500 y un texto de descripción de error en el cuerpo de la respuesta.
-
-Al usar el método GET, ‘readonly’ se establece. En otras palabras, para consultas que modifican datos, solo puede usar el método POST. Puede enviar la consulta en sí misma en el cuerpo POST o en el parámetro URL.
-
-Ejemplos:
-
-``` bash
-$ curl 'http://localhost:8123/?query=SELECT%201'
-1
-
-$ wget -nv -O- 'http://localhost:8123/?query=SELECT 1'
-1
-
-$ echo -ne 'GET /?query=SELECT%201 HTTP/1.0\r\n\r\n' | nc localhost 8123
-HTTP/1.0 200 OK
-Date: Wed, 27 Nov 2019 10:30:18 GMT
-Connection: Close
-Content-Type: text/tab-separated-values; charset=UTF-8
-X-ClickHouse-Server-Display-Name: clickhouse.ru-central1.internal
-X-ClickHouse-Query-Id: 5abe861c-239c-467f-b955-8a201abb8b7f
-X-ClickHouse-Summary: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"0"}
-
-1
-```
-
-Como puede ver, curl es algo inconveniente ya que los espacios deben ser URL escapadas.
-Aunque wget escapa de todo en sí, no recomendamos usarlo porque no funciona bien sobre HTTP 1.1 cuando se usa keep-alive y Transfer-Encoding: chunked .
-
-``` bash
-$ echo 'SELECT 1' | curl 'http://localhost:8123/' --data-binary @-
-1
-
-$ echo 'SELECT 1' | curl 'http://localhost:8123/?query=' --data-binary @-
-1
-
-$ echo '1' | curl 'http://localhost:8123/?query=SELECT' --data-binary @-
-1
-```
-
-Si se envía parte de la consulta en el parámetro y parte en el POST, se inserta un avance de línea entre estas dos partes de datos.
-Ejemplo (esto no funcionará):
-
-``` bash
-$ echo 'ECT 1' | curl 'http://localhost:8123/?query=SEL' --data-binary @-
-Code: 59, e.displayText() = DB::Exception: Syntax error: failed at position 0: SEL
-ECT 1
-, expected One of: SHOW TABLES, SHOW DATABASES, SELECT, INSERT, CREATE, ATTACH, RENAME, DROP, DETACH, USE, SET, OPTIMIZE., e.what() = DB::Exception
-```
-
-De forma predeterminada, los datos se devuelven en formato TabSeparated (para obtener más información, “Formats” apartado).
-Utilice la cláusula FORMAT de la consulta para solicitar cualquier otro formato.
-
-``` bash
-$ echo 'SELECT 1 FORMAT Pretty' | curl 'http://localhost:8123/?' --data-binary @-
-┏━━━┓
-┃ 1 ┃
-┡━━━┩
-│ 1 │
-└───┘
-```
-
-El método POST de transmitir datos es necesario para las consultas INSERT. En este caso, puede escribir el comienzo de la consulta en el parámetro URL y usar POST para pasar los datos a insertar. Los datos a insertar podrían ser, por ejemplo, un volcado separado por tabuladores de MySQL. De esta manera, la consulta INSERT reemplaza LOAD DATA LOCAL INFILE de MySQL.
-
-Ejemplos: Crear una tabla:
-
-``` bash
-$ echo 'CREATE TABLE t (a UInt8) ENGINE = Memory' | curl 'http://localhost:8123/' --data-binary @-
-```
-
-Uso de la consulta INSERT familiar para la inserción de datos:
-
-``` bash
-$ echo 'INSERT INTO t VALUES (1),(2),(3)' | curl 'http://localhost:8123/' --data-binary @-
-```
-
-Los datos se pueden enviar por separado de la consulta:
-
-``` bash
-$ echo '(4),(5),(6)' | curl 'http://localhost:8123/?query=INSERT%20INTO%20t%20VALUES' --data-binary @-
-```
-
-Puede especificar cualquier formato de datos. El ‘Values’ el formato es el mismo que el que se usa al escribir INSERT INTO t VALUES:
-
-``` bash
-$ echo '(7),(8),(9)' | curl 'http://localhost:8123/?query=INSERT%20INTO%20t%20FORMAT%20Values' --data-binary @-
-```
-
-Para insertar datos de un volcado separado por tabuladores, especifique el formato correspondiente:
-
-``` bash
-$ echo -ne '10\n11\n12\n' | curl 'http://localhost:8123/?query=INSERT%20INTO%20t%20FORMAT%20TabSeparated' --data-binary @-
-```
-
-Lectura del contenido de la tabla. Los datos se emiten en orden aleatorio debido al procesamiento de consultas paralelas:
-
-``` bash
-$ curl 'http://localhost:8123/?query=SELECT%20a%20FROM%20t'
-7
-8
-9
-10
-11
-12
-1
-2
-3
-4
-5
-6
-```
-
-Eliminando la mesa.
-
-``` bash
-$ echo 'DROP TABLE t' | curl 'http://localhost:8123/' --data-binary @-
-```
-
-Para las solicitudes correctas que no devuelven una tabla de datos, se devuelve un cuerpo de respuesta vacío.
-
-Puede utilizar el formato interno de compresión ClickHouse al transmitir datos. Los datos comprimidos tienen un formato no estándar, y deberá usar el `clickhouse-compressor` programa para trabajar con él (se instala con el `clickhouse-client` paquete). Para aumentar la eficiencia de la inserción de datos, puede deshabilitar la verificación de suma de comprobación [http_native_compression_disable_checksumming_on_decompress](../operations/settings/settings.md#settings-http_native_compression_disable_checksumming_on_decompress) configuración.
-
-Si ha especificado `compress=1` en la URL, el servidor comprime los datos que le envía.
-Si ha especificado `decompress=1` en la dirección URL, el servidor descomprime los mismos datos que `POST` método.
-
-También puede optar por utilizar [Compresión HTTP](https://en.wikipedia.org/wiki/HTTP_compression). Para enviar un `POST` solicitud, agregue el encabezado de solicitud `Content-Encoding: compression_method`. Para que ClickHouse comprima la respuesta, debe agregar `Accept-Encoding: compression_method`. Soporta ClickHouse `gzip`, `br`, y `deflate` [métodos de compresión](https://en.wikipedia.org/wiki/HTTP_compression#Content-Encoding_tokens). Para habilitar la compresión HTTP, debe usar ClickHouse [enable_http_compression](../operations/settings/settings.md#settings-enable_http_compression) configuración. Puede configurar el nivel de compresión de datos [http_zlib_compression_level](#settings-http_zlib_compression_level) para todos los métodos de compresión.
-
-Puede usar esto para reducir el tráfico de red al transmitir una gran cantidad de datos o para crear volcados que se comprimen inmediatamente.
-
-Ejemplos de envío de datos con compresión:
-
-``` bash
-#Sending data to the server:
-$ curl -vsS "http://localhost:8123/?enable_http_compression=1" -d 'SELECT number FROM system.numbers LIMIT 10' -H 'Accept-Encoding: gzip'
-
-#Sending data to the client:
-$ echo "SELECT 1" | gzip -c | curl -sS --data-binary @- -H 'Content-Encoding: gzip' 'http://localhost:8123/'
-```
-
-!!! note "Nota"
-    Algunos clientes HTTP pueden descomprimir datos del servidor de forma predeterminada (con `gzip` y `deflate`) y puede obtener datos descomprimidos incluso si usa la configuración de compresión correctamente.
-
-Puede usar el ‘database’ Parámetro URL para especificar la base de datos predeterminada.
-
-``` bash
-$ echo 'SELECT number FROM numbers LIMIT 10' | curl 'http://localhost:8123/?database=system' --data-binary @-
-0
-1
-2
-3
-4
-5
-6
-7
-8
-9
-```
-
-De forma predeterminada, la base de datos que está registrada en la configuración del servidor se utiliza como base de datos predeterminada. De forma predeterminada, esta es la base de datos llamada ‘default’. Como alternativa, siempre puede especificar la base de datos utilizando un punto antes del nombre de la tabla.
-
-El nombre de usuario y la contraseña se pueden indicar de una de estas tres maneras:
-
-1.  Uso de la autenticación básica HTTP. Ejemplo:
-
-<!-- -->
-
-``` bash
-$ echo 'SELECT 1' | curl 'http://user:password@localhost:8123/' -d @-
-```
-
-1.  En el ‘user’ y ‘password’ Parámetros de URL. Ejemplo:
-
-<!-- -->
-
-``` bash
-$ echo 'SELECT 1' | curl 'http://localhost:8123/?user=user&password=password' -d @-
-```
-
-1.  Utilizar ‘X-ClickHouse-User’ y ‘X-ClickHouse-Key’ cabecera. Ejemplo:
-
-<!-- -->
-
-``` bash
-$ echo 'SELECT 1' | curl -H 'X-ClickHouse-User: user' -H 'X-ClickHouse-Key: password' 'http://localhost:8123/' -d @-
-```
-
-Si no se especifica el nombre de usuario, `default` se utiliza el nombre. Si no se especifica la contraseña, se utiliza la contraseña vacía.
-También puede utilizar los parámetros de URL para especificar cualquier configuración para procesar una sola consulta o perfiles completos de configuración. Ejemplo:http://localhost:8123/?perfil=web&max_rows_to_read=1000000000&consulta=SELECCIONA+1
-
-Para obtener más información, consulte [Configuración](../operations/settings/index.md) apartado.
-
-``` bash
-$ echo 'SELECT number FROM system.numbers LIMIT 10' | curl 'http://localhost:8123/?' --data-binary @-
-0
-1
-2
-3
-4
-5
-6
-7
-8
-9
-```
-
-Para obtener información sobre otros parámetros, consulte la sección “SET”.
-
-Del mismo modo, puede utilizar sesiones ClickHouse en el protocolo HTTP. Para hacer esto, debe agregar el `session_id` GET parámetro a la solicitud. Puede usar cualquier cadena como ID de sesión. De forma predeterminada, la sesión finaliza después de 60 segundos de inactividad. Para cambiar este tiempo de espera, modifique `default_session_timeout` configuración en la configuración del servidor, o `session_timeout` GET parámetro a la solicitud. Para comprobar el estado de la sesión, `session_check=1` parámetro. Solo se puede ejecutar una consulta a la vez en una sola sesión.
-
-Puede recibir información sobre el progreso de una consulta en `X-ClickHouse-Progress` encabezados de respuesta. Para hacer esto, habilite [send_progress_in_http_headers](../operations/settings/settings.md#settings-send_progress_in_http_headers). Ejemplo de la secuencia de encabezado:
-
-``` text
-X-ClickHouse-Progress: {"read_rows":"2752512","read_bytes":"240570816","total_rows_to_read":"8880128"}
-X-ClickHouse-Progress: {"read_rows":"5439488","read_bytes":"482285394","total_rows_to_read":"8880128"}
-X-ClickHouse-Progress: {"read_rows":"8783786","read_bytes":"819092887","total_rows_to_read":"8880128"}
-```
-
-Posibles campos de encabezado:
-
--   `read_rows` — Number of rows read.
--   `read_bytes` — Volume of data read in bytes.
--   `total_rows_to_read` — Total number of rows to be read.
--   `written_rows` — Number of rows written.
--   `written_bytes` — Volume of data written in bytes.
-
-Las solicitudes en ejecución no se detienen automáticamente si se pierde la conexión HTTP. El análisis y el formato de datos se realizan en el lado del servidor, y el uso de la red puede ser ineficaz.
-Opcional ‘query_id’ parámetro se puede pasar como el ID de consulta (cualquier cadena). Para obtener más información, consulte la sección “Settings, replace_running_query”.
-
-Opcional ‘quota_key’ parámetro se puede pasar como la clave de cuota (cualquier cadena). Para obtener más información, consulte la sección “Quotas”.
-
-La interfaz HTTP permite pasar datos externos (tablas temporales externas) para consultar. Para obtener más información, consulte la sección “External data for query processing”.
-
-## Almacenamiento en búfer de respuesta {#response-buffering}
-
-Puede habilitar el almacenamiento en búfer de respuestas en el lado del servidor. El `buffer_size` y `wait_end_of_query` Los parámetros URL se proporcionan para este propósito.
-
-`buffer_size` determina el número de bytes en el resultado para almacenar en búfer en la memoria del servidor. Si un cuerpo de resultado es mayor que este umbral, el búfer se escribe en el canal HTTP y los datos restantes se envían directamente al canal HTTP.
-
-Para asegurarse de que toda la respuesta se almacena en búfer, establezca `wait_end_of_query=1`. En este caso, los datos que no se almacenan en la memoria se almacenarán en un archivo de servidor temporal.
-
-Ejemplo:
-
-``` bash
-$ curl -sS 'http://localhost:8123/?max_result_bytes=4000000&buffer_size=3000000&wait_end_of_query=1' -d 'SELECT toUInt8(number) FROM system.numbers LIMIT 9000000 FORMAT RowBinary'
-```
-
-Utilice el almacenamiento en búfer para evitar situaciones en las que se produjo un error de procesamiento de consultas después de enviar al cliente el código de respuesta y los encabezados HTTP. En esta situación, se escribe un mensaje de error al final del cuerpo de la respuesta y, en el lado del cliente, el error solo se puede detectar en la etapa de análisis.
-
-### Consultas con parámetros {#cli-queries-with-parameters}
-
-Puede crear una consulta con parámetros y pasar valores para ellos desde los parámetros de solicitud HTTP correspondientes. Para obtener más información, consulte [Consultas con parámetros para CLI](cli.md#cli-queries-with-parameters).
-
-### Ejemplo {#example}
-
-``` bash
-$ curl -sS "<address>?param_id=2&param_phrase=test" -d "SELECT * FROM table WHERE int_column = {id:UInt8} and string_column = {phrase:String}"
-```
-
-## Interfaz HTTP predefinida {#predefined_http_interface}
-
-ClickHouse admite consultas específicas a través de la interfaz HTTP. Por ejemplo, puede escribir datos en una tabla de la siguiente manera:
-
-``` bash
-$ echo '(4),(5),(6)' | curl 'http://localhost:8123/?query=INSERT%20INTO%20t%20VALUES' --data-binary @-
-```
-
-ClickHouse también es compatible con la interfaz HTTP predefinida que puede ayudarle a una integración más fácil con herramientas de terceros como [Prometheus exportador](https://github.com/percona-lab/clickhouse_exporter).
-
-Ejemplo:
-
--   En primer lugar, agregue esta sección al archivo de configuración del servidor:
-
-<!-- -->
-
-``` xml
-<http_handlers>
-    <rule>
-        <url>/predefined_query</url>
-        <methods>POST,GET</methods>
-        <handler>
-            <type>predefined_query_handler</type>
-            <query>SELECT * FROM system.metrics LIMIT 5 FORMAT Template SETTINGS format_template_resultset = 'prometheus_template_output_format_resultset', format_template_row = 'prometheus_template_output_format_row', format_template_rows_between_delimiter = '\n'</query>
-        </handler>
-    </rule>
-    <rule>...</rule>
-    <rule>...</rule>
-</http_handlers>
-```
-
--   Ahora puede solicitar la url directamente para los datos en el formato Prometheus:
-
-<!-- -->
-
-``` bash
-$ curl -v 'http://localhost:8123/predefined_query'
-*   Trying ::1...
-* Connected to localhost (::1) port 8123 (#0)
-> GET /predefined_query HTTP/1.1
-> Host: localhost:8123
-> User-Agent: curl/7.47.0
-> Accept: */*
->
-< HTTP/1.1 200 OK
-< Date: Tue, 28 Apr 2020 08:52:56 GMT
-< Connection: Keep-Alive
-< Content-Type: text/plain; charset=UTF-8
-< X-ClickHouse-Server-Display-Name: i-mloy5trc
-< Transfer-Encoding: chunked
-< X-ClickHouse-Query-Id: 96fe0052-01e6-43ce-b12a-6b7370de6e8a
-< X-ClickHouse-Format: Template
-< X-ClickHouse-Timezone: Asia/Shanghai
-< Keep-Alive: timeout=3
-< X-ClickHouse-Summary: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"0"}
-<
-# HELP "Query" "Number of executing queries"
-# TYPE "Query" counter
-"Query" 1
-
-# HELP "Merge" "Number of executing background merges"
-# TYPE "Merge" counter
-"Merge" 0
-
-# HELP "PartMutation" "Number of mutations (ALTER DELETE/UPDATE)"
-# TYPE "PartMutation" counter
-"PartMutation" 0
-
-# HELP "ReplicatedFetch" "Number of data parts being fetched from replica"
-# TYPE "ReplicatedFetch" counter
-"ReplicatedFetch" 0
-
-# HELP "ReplicatedSend" "Number of data parts being sent to replicas"
-# TYPE "ReplicatedSend" counter
-"ReplicatedSend" 0
-
-* Connection #0 to host localhost left intact
-
-
-* Connection #0 to host localhost left intact
-```
-
-Como puede ver en el ejemplo, si `<http_handlers>` está configurado en la configuración.archivo xml y `<http_handlers>` puede contener muchos `<rule>s`. ClickHouse coincidirá con las solicitudes HTTP recibidas con el tipo predefinido en `<rule>` y el primer emparejado ejecuta el controlador. Luego, ClickHouse ejecutará la consulta predefinida correspondiente si la coincidencia es exitosa.
-
-> Ahora `<rule>` puede configurar `<method>`, `<headers>`, `<url>`,`<handler>`:
-> `<method>` es responsable de hacer coincidir la parte del método de la solicitud HTTP. `<method>` se ajusta plenamente a la definición de [método](https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods) en el protocolo HTTP. Es una configuración opcional. Si no está definido en el archivo de configuración, no coincide con la parte del método de la solicitud HTTP.
->
-> `<url>` es responsable de hacer coincidir la parte url de la solicitud HTTP. Es compatible con [RE2](https://github.com/google/re2)expresiones regulares. Es una configuración opcional. Si no está definido en el archivo de configuración, no coincide con la parte url de la solicitud HTTP.
->
-> `<headers>` es responsable de hacer coincidir la parte del encabezado de la solicitud HTTP. Es compatible con las expresiones regulares de RE2. Es una configuración opcional. Si no está definido en el archivo de configuración, no coincide con la parte de encabezado de la solicitud HTTP.
->
-> `<handler>` contiene la parte de procesamiento principal. Ahora `<handler>` puede configurar `<type>`, `<status>`, `<content_type>`, `<response_content>`, `<query>`, `<query_param_name>`.
-> \> `<type>` Actualmente soporta tres tipos: **Dirección de correo electrónico**, **Nombre de la red inalámbrica (SSID):**, **estática**.
-> \>
-> \> `<query>` - utilizar con el tipo predefined_query_handler, ejecuta la consulta cuando se llama al controlador.
-> \>
-> \> `<query_param_name>` - utilizar con el tipo dynamic_query_handler, extrae y ejecuta el valor correspondiente al `<query_param_name>` valor en parámetros de solicitud HTTP.
-> \>
-> \> `<status>` - uso con tipo estático, código de estado de respuesta.
-> \>
-> \> `<content_type>` - uso con tipo estático, respuesta [tipo de contenido](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Type).
-> \>
-> \> `<response_content>` - uso con tipo estático, contenido de respuesta enviado al cliente, cuando se usa el prefijo ‘file://’ o ‘config://’, encontrar el contenido del archivo o configuración enviar al cliente.
-
-A continuación están los métodos de configuración para los diferentes `<type>`.
-
-## Dirección de correo electrónico {#predefined_query_handler}
-
-`<predefined_query_handler>` admite la configuración de valores Settings y query_params. Puede configurar `<query>` en el tipo de `<predefined_query_handler>`.
-
-`<query>` valor es una consulta predefinida de `<predefined_query_handler>`, que es ejecutado por ClickHouse cuando se hace coincidir una solicitud HTTP y se devuelve el resultado de la consulta. Es una configuración imprescindible.
-
-En el ejemplo siguiente se definen los valores de `max_threads` y `max_alter_threads` configuración, a continuación, consulta la tabla del sistema para comprobar si estos ajustes se han establecido correctamente.
-
-Ejemplo:
-
-``` xml
-<http_handlers>
-    <rule>
-        <url><![CDATA[/query_param_with_url/\w+/(?P<name_1>[^/]+)(/(?P<name_2>[^/]+))?]]></url>
-        <method>GET</method>
-        <headers>
-            <XXX>TEST_HEADER_VALUE</XXX>
-            <PARAMS_XXX><![CDATA[(?P<name_1>[^/]+)(/(?P<name_2>[^/]+))?]]></PARAMS_XXX>
-        </headers>
-        <handler>
-            <type>predefined_query_handler</type>
-            <query>SELECT value FROM system.settings WHERE name = {name_1:String}</query>
-            <query>SELECT name, value FROM system.settings WHERE name = {name_2:String}</query>
-        </handler>
-    </rule>
-</http_handlers>
-```
-
-``` bash
-$ curl -H 'XXX:TEST_HEADER_VALUE' -H 'PARAMS_XXX:max_threads' 'http://localhost:8123/query_param_with_url/1/max_threads/max_alter_threads?max_threads=1&max_alter_threads=2'
-1
-max_alter_threads   2
-```
-
-!!! note "precaución"
-    En uno `<predefined_query_handler>` sólo es compatible con uno `<query>` de un tipo de plaquita.
-
-## Nombre de la red inalámbrica (SSID): {#dynamic_query_handler}
-
-En `<dynamic_query_handler>`, consulta se escribe en forma de param de la solicitud HTTP. La diferencia es que en `<predefined_query_handler>`, consulta se escribe en el archivo de configuración. Puede configurar `<query_param_name>` en `<dynamic_query_handler>`.
-
-ClickHouse extrae y ejecuta el valor correspondiente al `<query_param_name>` valor en la url de la solicitud HTTP. El valor predeterminado de `<query_param_name>` ser `/query` . Es una configuración opcional. Si no hay una definición en el archivo de configuración, el parámetro no se pasa.
-
-Para experimentar con esta funcionalidad, el ejemplo define los valores de max_threads y max_alter_threads y consulta si la configuración se estableció correctamente.
-
-Ejemplo:
-
-``` xml
-<http_handlers>
-    <rule>
-    <headers>
-        <XXX>TEST_HEADER_VALUE_DYNAMIC</XXX>    </headers>
-    <handler>
-        <type>dynamic_query_handler</type>
-        <query_param_name>query_param</query_param_name>
-    </handler>
-    </rule>
-</http_handlers>
-```
-
-``` bash
-$ curl  -H 'XXX:TEST_HEADER_VALUE_DYNAMIC'  'http://localhost:8123/own?max_threads=1&max_alter_threads=2&param_name_1=max_threads&param_name_2=max_alter_threads&query_param=SELECT%20name,value%20FROM%20system.settings%20where%20name%20=%20%7Bname_1:String%7D%20OR%20name%20=%20%7Bname_2:String%7D'
-max_threads 1
-max_alter_threads   2
-```
-
-## estática {#static}
-
-`<static>` puede volver [Content_type](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Type), [estatus](https://developer.mozilla.org/en-US/docs/Web/HTTP/Status) y response_content. response_content puede devolver el contenido especificado
-
-Ejemplo:
-
-Devuelve un mensaje.
-
-``` xml
-<http_handlers>
-        <rule>
-            <methods>GET</methods>
-            <headers><XXX>xxx</XXX></headers>
-            <url>/hi</url>
-            <handler>
-                <type>static</type>
-                <status>402</status>
-                <content_type>text/html; charset=UTF-8</content_type>
-                <response_content>Say Hi!</response_content>
-            </handler>
-        </rule>
-<http_handlers>
-```
-
-``` bash
-$ curl -vv  -H 'XXX:xxx' 'http://localhost:8123/hi'
-*   Trying ::1...
-* Connected to localhost (::1) port 8123 (#0)
-> GET /hi HTTP/1.1
-> Host: localhost:8123
-> User-Agent: curl/7.47.0
-> Accept: */*
-> XXX:xxx
->
-< HTTP/1.1 402 Payment Required
-< Date: Wed, 29 Apr 2020 03:51:26 GMT
-< Connection: Keep-Alive
-< Content-Type: text/html; charset=UTF-8
-< Transfer-Encoding: chunked
-< Keep-Alive: timeout=3
-< X-ClickHouse-Summary: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"0"}
-<
-* Connection #0 to host localhost left intact
-Say Hi!%
-```
-
-Busque el contenido de la configuración enviada al cliente.
-
-``` xml
-<get_config_static_handler><![CDATA[<html ng-app="SMI2"><head><base href="http://ui.tabix.io/"></head><body><div ui-view="" class="content-ui"></div><script src="http://loader.tabix.io/master.js"></script></body></html>]]></get_config_static_handler>
-
-<http_handlers>
-        <rule>
-            <methods>GET</methods>
-            <headers><XXX>xxx</XXX></headers>
-            <url>/get_config_static_handler</url>
-            <handler>
-                <type>static</type>
-                <response_content>config://get_config_static_handler</response_content>
-            </handler>
-        </rule>
-</http_handlers>
-```
-
-``` bash
-$ curl -v  -H 'XXX:xxx' 'http://localhost:8123/get_config_static_handler'
-*   Trying ::1...
-* Connected to localhost (::1) port 8123 (#0)
-> GET /get_config_static_handler HTTP/1.1
-> Host: localhost:8123
-> User-Agent: curl/7.47.0
-> Accept: */*
-> XXX:xxx
->
-< HTTP/1.1 200 OK
-< Date: Wed, 29 Apr 2020 04:01:24 GMT
-< Connection: Keep-Alive
-< Content-Type: text/plain; charset=UTF-8
-< Transfer-Encoding: chunked
-< Keep-Alive: timeout=3
-< X-ClickHouse-Summary: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"0"}
-<
-* Connection #0 to host localhost left intact
-<html ng-app="SMI2"><head><base href="http://ui.tabix.io/"></head><body><div ui-view="" class="content-ui"></div><script src="http://loader.tabix.io/master.js"></script></body></html>%
-```
-
-Encuentra el contenido del archivo enviado al cliente.
-
-``` xml
-<http_handlers>
-        <rule>
-            <methods>GET</methods>
-            <headers><XXX>xxx</XXX></headers>
-            <url>/get_absolute_path_static_handler</url>
-            <handler>
-                <type>static</type>
-                <content_type>text/html; charset=UTF-8</content_type>
-                <response_content>file:///absolute_path_file.html</response_content>
-            </handler>
-        </rule>
-        <rule>
-            <methods>GET</methods>
-            <headers><XXX>xxx</XXX></headers>
-            <url>/get_relative_path_static_handler</url>
-            <handler>
-                <type>static</type>
-                <content_type>text/html; charset=UTF-8</content_type>
-                <response_content>file://./relative_path_file.html</response_content>
-            </handler>
-        </rule>
-</http_handlers>
-```
-
-``` bash
-$ user_files_path='/var/lib/clickhouse/user_files'
-$ sudo echo "<html><body>Relative Path File</body></html>" > $user_files_path/relative_path_file.html
-$ sudo echo "<html><body>Absolute Path File</body></html>" > $user_files_path/absolute_path_file.html
-$ curl -vv -H 'XXX:xxx' 'http://localhost:8123/get_absolute_path_static_handler'
-*   Trying ::1...
-* Connected to localhost (::1) port 8123 (#0)
-> GET /get_absolute_path_static_handler HTTP/1.1
-> Host: localhost:8123
-> User-Agent: curl/7.47.0
-> Accept: */*
-> XXX:xxx
->
-< HTTP/1.1 200 OK
-< Date: Wed, 29 Apr 2020 04:18:16 GMT
-< Connection: Keep-Alive
-< Content-Type: text/html; charset=UTF-8
-< Transfer-Encoding: chunked
-< Keep-Alive: timeout=3
-< X-ClickHouse-Summary: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"0"}
-<
-<html><body>Absolute Path File</body></html>
-* Connection #0 to host localhost left intact
-$ curl -vv -H 'XXX:xxx' 'http://localhost:8123/get_relative_path_static_handler'
-*   Trying ::1...
-* Connected to localhost (::1) port 8123 (#0)
-> GET /get_relative_path_static_handler HTTP/1.1
-> Host: localhost:8123
-> User-Agent: curl/7.47.0
-> Accept: */*
-> XXX:xxx
->
-< HTTP/1.1 200 OK
-< Date: Wed, 29 Apr 2020 04:18:31 GMT
-< Connection: Keep-Alive
-< Content-Type: text/html; charset=UTF-8
-< Transfer-Encoding: chunked
-< Keep-Alive: timeout=3
-< X-ClickHouse-Summary: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"0"}
-<
-<html><body>Relative Path File</body></html>
-* Connection #0 to host localhost left intact
-```
-
-[Artículo Original](https://clickhouse.tech/docs/en/interfaces/http_interface/) <!--hide-->
diff --git a/docs/es/interfaces/index.md b/docs/es/interfaces/index.md
deleted file mode 100644
index 3632c8a9e29..00000000000
--- a/docs/es/interfaces/index.md
+++ /dev/null
@@ -1,29 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: Interfaz
-toc_priority: 14
-toc_title: "Implantaci\xF3n"
----
-
-# Interfaz {#interfaces}
-
-ClickHouse proporciona dos interfaces de red (ambas se pueden ajustar opcionalmente en TLS para mayor seguridad):
-
--   [HTTP](http.md), que está documentado y fácil de usar directamente.
--   [TCP nativo](tcp.md), que tiene menos sobrecarga.
-
-En la mayoría de los casos, se recomienda utilizar la herramienta o biblioteca apropiada en lugar de interactuar con ellos directamente. Oficialmente apoyados por Yandex son los siguientes:
-
--   [Cliente de línea de comandos](cli.md)
--   [Controlador JDBC](jdbc.md)
--   [Controlador ODBC](odbc.md)
--   [Biblioteca cliente de C++](cpp.md)
-
-También hay una amplia gama de bibliotecas de terceros para trabajar con ClickHouse:
-
--   [Bibliotecas de clientes](third-party/client-libraries.md)
--   [Integración](third-party/integrations.md)
--   [Interfaces visuales](third-party/gui.md)
-
-[Artículo Original](https://clickhouse.tech/docs/en/interfaces/) <!--hide-->
diff --git a/docs/es/interfaces/jdbc.md b/docs/es/interfaces/jdbc.md
deleted file mode 100644
index 7303dec8960..00000000000
--- a/docs/es/interfaces/jdbc.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 22
-toc_title: Controlador JDBC
----
-
-# Controlador JDBC {#jdbc-driver}
-
--   **[Conductor oficial](https://github.com/ClickHouse/clickhouse-jdbc)**
--   Controladores de terceros:
-    -   [Sistema abierto.](https://github.com/housepower/ClickHouse-Native-JDBC)
-    -   [Método de codificación de datos:](https://github.com/blynkkk/clickhouse4j)
-
-[Artículo Original](https://clickhouse.tech/docs/en/interfaces/jdbc/) <!--hide-->
diff --git a/docs/es/interfaces/mysql.md b/docs/es/interfaces/mysql.md
deleted file mode 100644
index a5124c61dd5..00000000000
--- a/docs/es/interfaces/mysql.md
+++ /dev/null
@@ -1,49 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 20
-toc_title: Interfaz MySQL
----
-
-# Interfaz MySQL {#mysql-interface}
-
-ClickHouse soporta el protocolo de cable MySQL. Puede ser habilitado por [mysql_port](../operations/server-configuration-parameters/settings.md#server_configuration_parameters-mysql_port) configuración en el archivo de configuración:
-
-``` xml
-<mysql_port>9004</mysql_port>
-```
-
-Ejemplo de conexión mediante la herramienta de línea de comandos `mysql`:
-
-``` bash
-$ mysql --protocol tcp -u default -P 9004
-```
-
-Salida si una conexión se realizó correctamente:
-
-``` text
-Welcome to the MySQL monitor.  Commands end with ; or \g.
-Your MySQL connection id is 4
-Server version: 20.2.1.1-ClickHouse
-
-Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
-
-Oracle is a registered trademark of Oracle Corporation and/or its
-affiliates. Other names may be trademarks of their respective
-owners.
-
-Type 'help;' or '\h' for help. Type '\c' to clear the current input statement.
-
-mysql>
-```
-
-Para la compatibilidad con todos los clientes MySQL, se recomienda especificar la contraseña de usuario con [doble SHA1](../operations/settings/settings-users.md#password_double_sha1_hex) en el archivo de configuración.
-Si la contraseña de usuario se especifica usando [SHA256](../operations/settings/settings-users.md#password_sha256_hex), algunos clientes no podrán autenticarse (mysqljs y versiones antiguas de la herramienta de línea de comandos mysql).
-
-Restricción:
-
--   las consultas preparadas no son compatibles
-
--   algunos tipos de datos se envían como cadenas
-
-[Artículo Original](https://clickhouse.tech/docs/en/interfaces/mysql/) <!--hide-->
diff --git a/docs/es/interfaces/odbc.md b/docs/es/interfaces/odbc.md
deleted file mode 100644
index 6ccb979c7f7..00000000000
--- a/docs/es/interfaces/odbc.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 23
-toc_title: Conductor ODBC
----
-
-# Conductor ODBC {#odbc-driver}
-
--   [Conductor oficial](https://github.com/ClickHouse/clickhouse-odbc).
-
-[Artículo Original](https://clickhouse.tech/docs/en/interfaces/odbc/) <!--hide-->
diff --git a/docs/es/interfaces/tcp.md b/docs/es/interfaces/tcp.md
deleted file mode 100644
index 47df0d12829..00000000000
--- a/docs/es/interfaces/tcp.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 18
-toc_title: Interfaz nativa (TCP)
----
-
-# Interfaz nativa (TCP) {#native-interface-tcp}
-
-El protocolo nativo se utiliza en el [cliente de línea de comandos](cli.md), para la comunicación entre servidores durante el procesamiento de consultas distribuidas, y también en otros programas de C, Desafortunadamente, el protocolo nativo de ClickHouse aún no tiene especificaciones formales, pero puede ser diseñado de manera inversa desde el código fuente de ClickHouse (comenzando [por aquí](https://github.com/ClickHouse/ClickHouse/tree/master/src/Client)) y/o mediante la interceptación y el análisis del tráfico TCP.
-
-[Artículo Original](https://clickhouse.tech/docs/en/interfaces/tcp/) <!--hide-->
diff --git a/docs/es/interfaces/third-party/client-libraries.md b/docs/es/interfaces/third-party/client-libraries.md
deleted file mode 100644
index b61ab1a5d9c..00000000000
--- a/docs/es/interfaces/third-party/client-libraries.md
+++ /dev/null
@@ -1,60 +0,0 @@
----
-toc_priority: 26
-toc_title: Client Libraries
----
-
-# Client Libraries from Third-party Developers {#client-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
-    -   [infi.clickhouse_orm](https://github.com/Infinidat/infi.clickhouse_orm)
-    -   [clickhouse-driver](https://github.com/mymarilyn/clickhouse-driver)
-    -   [clickhouse-client](https://github.com/yurial/clickhouse-client)
-    -   [aiochclient](https://github.com/maximdanilchenko/aiochclient)
-    -   [asynch](https://github.com/long2ice/asynch)
--   PHP
-    -   [smi2/phpclickhouse](https://packagist.org/packages/smi2/phpClickHouse)
-    -   [8bitov/clickhouse-php-client](https://packagist.org/packages/8bitov/clickhouse-php-client)
-    -   [bozerkins/clickhouse-client](https://packagist.org/packages/bozerkins/clickhouse-client)
-    -   [simpod/clickhouse-client](https://packagist.org/packages/simpod/clickhouse-client)
-    -   [seva-code/php-click-house-client](https://packagist.org/packages/seva-code/php-click-house-client)
-    -   [SeasClick C++ client](https://github.com/SeasX/SeasClick)
--   Go
-    -   [clickhouse](https://github.com/kshvakov/clickhouse/)
-    -   [go-clickhouse](https://github.com/roistat/go-clickhouse)
-    -   [mailrugo-clickhouse](https://github.com/mailru/go-clickhouse)
-    -   [golang-clickhouse](https://github.com/leprosus/golang-clickhouse)
--   NodeJs
-    -   [clickhouse (NodeJs)](https://github.com/TimonKK/clickhouse)
-    -   [node-clickhouse](https://github.com/apla/node-clickhouse)
--   Perl
-    -   [perl-DBD-ClickHouse](https://github.com/elcamlost/perl-DBD-ClickHouse)
-    -   [HTTP-ClickHouse](https://metacpan.org/release/HTTP-ClickHouse)
-    -   [AnyEvent-ClickHouse](https://metacpan.org/release/AnyEvent-ClickHouse)
--   Ruby
-    -   [ClickHouse (Ruby)](https://github.com/shlima/click_house)
-    -   [clickhouse-activerecord](https://github.com/PNixx/clickhouse-activerecord)
--   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)
-    -   [clickhouse-client](https://github.com/Ecwid/clickhouse-client)
--   Scala
-    -   [clickhouse-scala-client](https://github.com/crobox/clickhouse-scala-client)
--   Kotlin
-    -   [AORM](https://github.com/TanVD/AORM)
--   C#
-    -   [Octonica.ClickHouseClient](https://github.com/Octonica/ClickHouseClient)
-    -   [ClickHouse.Ado](https://github.com/killwort/ClickHouse-Net)
-    -   [ClickHouse.Client](https://github.com/DarkWanderer/ClickHouse.Client)
-    -   [ClickHouse.Net](https://github.com/ilyabreev/ClickHouse.Net)
--   Elixir
-    -   [clickhousex](https://github.com/appodeal/clickhousex/)
-    -   [pillar](https://github.com/sofakingworld/pillar)
--   Nim
-    -   [nim-clickhouse](https://github.com/leonardoce/nim-clickhouse)
-
-[Original article](https://clickhouse.tech/docs/en/interfaces/third-party/client_libraries/) <!--hide-->
diff --git a/docs/es/interfaces/third-party/gui.md b/docs/es/interfaces/third-party/gui.md
deleted file mode 100644
index 754c0f68c69..00000000000
--- a/docs/es/interfaces/third-party/gui.md
+++ /dev/null
@@ -1,156 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 28
-toc_title: Interfaces Visuales
----
-
-# Interfaces visuales de desarrolladores de terceros {#visual-interfaces-from-third-party-developers}
-
-## De código abierto {#open-source}
-
-### Tabix {#tabix}
-
-Interfaz web para ClickHouse en el [Tabix](https://github.com/tabixio/tabix) proyecto.
-
-Función:
-
--   Funciona con ClickHouse directamente desde el navegador, sin la necesidad de instalar software adicional.
--   Editor de consultas con resaltado de sintaxis.
--   Autocompletado de comandos.
--   Herramientas para el análisis gráfico de la ejecución de consultas.
--   Opciones de esquema de color.
-
-[Documentación de Tabix](https://tabix.io/doc/).
-
-### Sistema abierto {#houseops}
-
-[Sistema abierto.](https://github.com/HouseOps/HouseOps) Es una interfaz de usuario / IDE para OSX, Linux y Windows.
-
-Función:
-
--   Generador de consultas con resaltado de sintaxis. Ver la respuesta en una tabla o vista JSON.
--   Exportar resultados de consultas como CSV o JSON.
--   Lista de procesos con descripciones. Modo de escritura. Capacidad de parar (`KILL`) proceso.
--   Gráfico de base de datos. Muestra todas las tablas y sus columnas con información adicional.
--   Una vista rápida del tamaño de la columna.
--   Configuración del servidor.
-
-Las siguientes características están planificadas para el desarrollo:
-
--   Gestión de bases de datos.
--   Gestión de usuarios.
--   Análisis de datos en tiempo real.
--   Supervisión de clúster.
--   Gestión de clústeres.
--   Monitoreo de tablas replicadas y Kafka.
-
-### Faro {#lighthouse}
-
-[Faro](https://github.com/VKCOM/lighthouse) Es una interfaz web ligera para ClickHouse.
-
-Función:
-
--   Lista de tablas con filtrado y metadatos.
--   Vista previa de la tabla con filtrado y clasificación.
--   Ejecución de consultas de sólo lectura.
-
-### Redash {#redash}
-
-[Redash](https://github.com/getredash/redash) es una plataforma para la visualización de datos.
-
-Admite múltiples fuentes de datos, incluido ClickHouse, Redash puede unir los resultados de consultas de diferentes fuentes de datos en un conjunto de datos final.
-
-Función:
-
--   Potente editor de consultas.
--   Explorador de base de datos.
--   Herramientas de visualización, que le permiten representar datos en diferentes formas.
-
-### DBeaver {#dbeaver}
-
-[DBeaver](https://dbeaver.io/) - Cliente de base de datos de escritorio universal con soporte ClickHouse.
-
-Función:
-
--   Desarrollo de consultas con resaltado de sintaxis y autocompletado.
--   Lista de tablas con filtros y búsqueda de metadatos.
--   Vista previa de datos de tabla.
--   Búsqueda de texto completo.
-
-### Sistema abierto {#clickhouse-cli}
-
-[Sistema abierto.](https://github.com/hatarist/clickhouse-cli) es un cliente de línea de comandos alternativo para ClickHouse, escrito en Python 3.
-
-Función:
-
--   Autocompletado.
--   Resaltado de sintaxis para las consultas y la salida de datos.
--   Soporte de buscapersonas para la salida de datos.
--   Comandos similares a PostgreSQL personalizados.
-
-### Sistema abierto {#clickhouse-flamegraph}
-
-[Sistema abierto.](https://github.com/Slach/clickhouse-flamegraph) es una herramienta especializada para visualizar el `system.trace_log` como [Flamegraph](http://www.brendangregg.com/flamegraphs.html).
-
-### Bienvenidos al Portal de Licitación Electrónica de Licitación Electrónica {#clickhouse-plantuml}
-
-[Método de codificación de datos:](https://pypi.org/project/clickhouse-plantuml/) es un script para generar [PlantUML](https://plantuml.com/) diagrama de esquemas de tablas.
-
-## Comercial {#commercial}
-
-### DataGrip {#datagrip}
-
-[DataGrip](https://www.jetbrains.com/datagrip/) Es un IDE de base de datos de JetBrains con soporte dedicado para ClickHouse. También está integrado en otras herramientas basadas en IntelliJ: PyCharm, IntelliJ IDEA, GoLand, PhpStorm y otros.
-
-Función:
-
--   Finalización de código muy rápida.
--   Resaltado de sintaxis de ClickHouse.
--   Soporte para características específicas de ClickHouse, por ejemplo, columnas anidadas, motores de tablas.
--   Editor de datos.
--   Refactorizaciones.
--   Búsqueda y navegación.
-
-### Yandex DataLens {#yandex-datalens}
-
-[Yandex DataLens](https://cloud.yandex.ru/services/datalens) es un servicio de visualización y análisis de datos.
-
-Función:
-
--   Amplia gama de visualizaciones disponibles, desde simples gráficos de barras hasta paneles complejos.
--   Los paneles podrían ponerse a disposición del público.
--   Soporte para múltiples fuentes de datos, incluyendo ClickHouse.
--   Almacenamiento de datos materializados basados en ClickHouse.
-
-Nivel de Cifrado WEP [disponible de forma gratuita](https://cloud.yandex.com/docs/datalens/pricing) para proyectos de baja carga, incluso para uso comercial.
-
--   [Documentación de DataLens](https://cloud.yandex.com/docs/datalens/).
--   [Tutorial](https://cloud.yandex.com/docs/solutions/datalens/data-from-ch-visualization) en la visualización de datos de una base de datos ClickHouse.
-
-### Software de Holística {#holistics-software}
-
-[Holística](https://www.holistics.io/) es una plataforma de datos de pila completa y una herramienta de inteligencia de negocios.
-
-Función:
-
--   Correo electrónico automatizado, Slack y horarios de informes de Google Sheet.
--   Editor SQL con visualizaciones, control de versiones, autocompletado, componentes de consulta reutilizables y filtros dinámicos.
--   Análisis integrado de informes y cuadros de mando a través de iframe.
--   Preparación de datos y capacidades ETL.
--   Soporte de modelado de datos SQL para mapeo relacional de datos.
-
-### Mirador {#looker}
-
-[Mirador](https://looker.com) Es una plataforma de datos y una herramienta de inteligencia de negocios con soporte para más de 50 dialectos de bases de datos, incluido ClickHouse. Bravo está disponible como una plataforma SaaS y auto-organizada. Los usuarios pueden utilizar Looker a través del navegador para explorar datos, crear visualizaciones y paneles, programar informes y compartir sus conocimientos con colegas. Looker proporciona un amplio conjunto de herramientas para incrustar estas características en otras aplicaciones y una API
-para integrar datos con otras aplicaciones.
-
-Función:
-
--   Desarrollo fácil y ágil utilizando LookML, un lenguaje que soporta curado
-    [Modelado de datos](https://looker.com/platform/data-modeling) para apoyar a los redactores de informes y a los usuarios finales.
--   Potente integración de flujo de trabajo a través de Looker's [Acciones de datos](https://looker.com/platform/actions).
-
-[Cómo configurar ClickHouse en Looker.](https://docs.looker.com/setup-and-management/database-config/clickhouse)
-
-[Artículo Original](https://clickhouse.tech/docs/en/interfaces/third-party/gui/) <!--hide-->
diff --git a/docs/es/interfaces/third-party/index.md b/docs/es/interfaces/third-party/index.md
deleted file mode 100644
index adf50b05cdf..00000000000
--- a/docs/es/interfaces/third-party/index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: tercero
-toc_priority: 24
----
-
-
diff --git a/docs/es/interfaces/third-party/integrations.md b/docs/es/interfaces/third-party/integrations.md
deleted file mode 100644
index 7588bef0230..00000000000
--- a/docs/es/interfaces/third-party/integrations.md
+++ /dev/null
@@ -1,108 +0,0 @@
----
-toc_priority: 27
-toc_title: Integrations
----
-
-# Integration Libraries from Third-party Developers {#integration-libraries-from-third-party-developers}
-
-!!! warning "Disclaimer"
-    Yandex does **not** maintain the tools and libraries listed below and haven’t done any extensive testing to ensure their quality.
-
-## Infrastructure Products {#infrastructure-products}
-
--   Relational database management systems
-    -   [MySQL](https://www.mysql.com)
-        -   [mysql2ch](https://github.com/long2ice/mysql2ch)
-        -   [ProxySQL](https://github.com/sysown/proxysql/wiki/ClickHouse-Support)
-        -   [clickhouse-mysql-data-reader](https://github.com/Altinity/clickhouse-mysql-data-reader)
-        -   [horgh-replicator](https://github.com/larsnovikov/horgh-replicator)
-    -   [PostgreSQL](https://www.postgresql.org)
-        -   [clickhousedb_fdw](https://github.com/Percona-Lab/clickhousedb_fdw)
-        -   [infi.clickhouse_fdw](https://github.com/Infinidat/infi.clickhouse_fdw) (uses [infi.clickhouse_orm](https://github.com/Infinidat/infi.clickhouse_orm))
-        -   [pg2ch](https://github.com/mkabilov/pg2ch)
-        -   [clickhouse_fdw](https://github.com/adjust/clickhouse_fdw)
-    -   [MSSQL](https://en.wikipedia.org/wiki/Microsoft_SQL_Server)
-        -   [ClickHouseMigrator](https://github.com/zlzforever/ClickHouseMigrator)
--   Message queues
-    -   [Kafka](https://kafka.apache.org)
-        -   [clickhouse_sinker](https://github.com/housepower/clickhouse_sinker) (uses [Go client](https://github.com/ClickHouse/clickhouse-go/))
-        -   [stream-loader-clickhouse](https://github.com/adform/stream-loader)
--   Stream processing
-    -   [Flink](https://flink.apache.org)
-        -   [flink-clickhouse-sink](https://github.com/ivi-ru/flink-clickhouse-sink)
--   Object storages
-    -   [S3](https://en.wikipedia.org/wiki/Amazon_S3)
-        -   [clickhouse-backup](https://github.com/AlexAkulov/clickhouse-backup)
--   Container orchestration
-    -   [Kubernetes](https://kubernetes.io)
-        -   [clickhouse-operator](https://github.com/Altinity/clickhouse-operator)
--   Configuration management
-    -   [puppet](https://puppet.com)
-        -   [innogames/clickhouse](https://forge.puppet.com/innogames/clickhouse)
-        -   [mfedotov/clickhouse](https://forge.puppet.com/mfedotov/clickhouse)
--   Monitoring
-    -   [Graphite](https://graphiteapp.org)
-        -   [graphouse](https://github.com/yandex/graphouse)
-        -   [carbon-clickhouse](https://github.com/lomik/carbon-clickhouse) +
-        -   [graphite-clickhouse](https://github.com/lomik/graphite-clickhouse)
-        -   [graphite-ch-optimizer](https://github.com/innogames/graphite-ch-optimizer) - optimizes staled partitions in [\*GraphiteMergeTree](../../engines/table-engines/mergetree-family/graphitemergetree.md#graphitemergetree) if rules from [rollup configuration](../../engines/table-engines/mergetree-family/graphitemergetree.md#rollup-configuration) could be applied
-    -   [Grafana](https://grafana.com/)
-        -   [clickhouse-grafana](https://github.com/Vertamedia/clickhouse-grafana)
-    -   [Prometheus](https://prometheus.io/)
-        -   [clickhouse_exporter](https://github.com/f1yegor/clickhouse_exporter)
-        -   [PromHouse](https://github.com/Percona-Lab/PromHouse)
-        -   [clickhouse_exporter](https://github.com/hot-wifi/clickhouse_exporter) (uses [Go client](https://github.com/kshvakov/clickhouse/))
-    -   [Nagios](https://www.nagios.org/)
-        -   [check_clickhouse](https://github.com/exogroup/check_clickhouse/)
-        -   [check_clickhouse.py](https://github.com/innogames/igmonplugins/blob/master/src/check_clickhouse.py)
-    -   [Zabbix](https://www.zabbix.com)
-        -   [clickhouse-zabbix-template](https://github.com/Altinity/clickhouse-zabbix-template)
-    -   [Sematext](https://sematext.com/)
-        -   [clickhouse integration](https://github.com/sematext/sematext-agent-integrations/tree/master/clickhouse)
--   Logging
-    -   [rsyslog](https://www.rsyslog.com/)
-        -   [omclickhouse](https://www.rsyslog.com/doc/master/configuration/modules/omclickhouse.html)
-    -   [fluentd](https://www.fluentd.org)
-        -   [loghouse](https://github.com/flant/loghouse) (for [Kubernetes](https://kubernetes.io))
-    -   [logagent](https://www.sematext.com/logagent)
-        -   [logagent output-plugin-clickhouse](https://sematext.com/docs/logagent/output-plugin-clickhouse/)
--   Geo
-    -   [MaxMind](https://dev.maxmind.com/geoip/)
-        -   [clickhouse-maxmind-geoip](https://github.com/AlexeyKupershtokh/clickhouse-maxmind-geoip)
-
-## Programming Language Ecosystems {#programming-language-ecosystems}
-
--   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))
-    -   [pandas](https://pandas.pydata.org)
-        -   [pandahouse](https://github.com/kszucs/pandahouse)
--   PHP
-    -   [Doctrine](https://www.doctrine-project.org/)
-        -   [dbal-clickhouse](https://packagist.org/packages/friendsofdoctrine/dbal-clickhouse)
--   R
-    -   [dplyr](https://db.rstudio.com/dplyr/)
-        -   [RClickHouse](https://github.com/IMSMWU/RClickHouse) (uses [clickhouse-cpp](https://github.com/artpaul/clickhouse-cpp))
--   Java
-    -   [Hadoop](http://hadoop.apache.org)
-        -   [clickhouse-hdfs-loader](https://github.com/jaykelin/clickhouse-hdfs-loader) (uses [JDBC](../../sql-reference/table-functions/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.Client](https://github.com/DarkWanderer/ClickHouse.Client)
-        -   [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)
--   Ruby
-    -   [Ruby on Rails](https://rubyonrails.org/)
-        -   [activecube](https://github.com/bitquery/activecube)
-        -   [ActiveRecord](https://github.com/PNixx/clickhouse-activerecord)
-    -   [GraphQL](https://github.com/graphql)
-        -   [activecube-graphql](https://github.com/bitquery/activecube-graphql)
-
-[Original article](https://clickhouse.tech/docs/en/interfaces/third-party/integrations/) <!--hide-->
diff --git a/docs/es/interfaces/third-party/proxy.md b/docs/es/interfaces/third-party/proxy.md
deleted file mode 100644
index e1aabf8fce4..00000000000
--- a/docs/es/interfaces/third-party/proxy.md
+++ /dev/null
@@ -1,46 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 29
-toc_title: Proxy
----
-
-# Servidores proxy de desarrolladores de terceros {#proxy-servers-from-third-party-developers}
-
-## chproxy {#chproxy}
-
-[chproxy](https://github.com/Vertamedia/chproxy), es un proxy HTTP y equilibrador de carga para la base de datos ClickHouse.
-
-Función:
-
--   Enrutamiento por usuario y almacenamiento en caché de respuestas.
--   Flexible límites.
--   Renovación automática del certificado SSL.
-
-Implementado en Go.
-
-## Bienvenido a WordPress {#kittenhouse}
-
-[Bienvenido a WordPress.](https://github.com/VKCOM/kittenhouse) está diseñado para ser un proxy local entre ClickHouse y el servidor de aplicaciones en caso de que sea imposible o inconveniente almacenar los datos INSERT en el lado de su aplicación.
-
-Función:
-
--   Almacenamiento en búfer de datos en memoria y en disco.
--   Enrutamiento por tabla.
--   Equilibrio de carga y comprobación de estado.
-
-Implementado en Go.
-
-## Bienvenidos al Portal de Licitación Electrónica de Licitación Electrónica {#clickhouse-bulk}
-
-[Bienvenidos al Portal de Licitación Electrónica de Licitación Electrónica](https://github.com/nikepan/clickhouse-bulk) es un simple colector de insertos ClickHouse.
-
-Función:
-
--   Agrupe las solicitudes y envíe por umbral o intervalo.
--   Múltiples servidores remotos.
--   Autenticación básica.
-
-Implementado en Go.
-
-[Artículo Original](https://clickhouse.tech/docs/en/interfaces/third-party/proxy/) <!--hide-->
diff --git a/docs/es/introduction/adopters.md b/docs/es/introduction/adopters.md
deleted file mode 100644
index 4c0aa78d57b..00000000000
--- a/docs/es/introduction/adopters.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 8
-toc_title: Adoptante
----
-
-# Adoptadores de ClickHouse {#clickhouse-adopters}
-
-!!! warning "Descargo"
-    La siguiente lista de empresas que utilizan ClickHouse y sus historias de éxito se recopila a partir de fuentes públicas, por lo que podría diferir de la realidad actual. Le agradeceríamos que compartiera la historia de adoptar ClickHouse en su empresa y [agregarlo a la lista](https://github.com/ClickHouse/ClickHouse/edit/master/docs/en/introduction/adopters.md), pero por favor asegúrese de que usted no tendrá ningunos problemas de NDA haciendo así. Proporcionar actualizaciones con publicaciones de otras compañías también es útil.
-
-| Empresa                                                                                         | Industria                          | Usecase                     | Tamaño de clúster                                                | (Un)Tamaño de datos comprimidos<abbr title="of single replica"><sup>\*</sup></abbr> | Referencia                                                                                                                                                                                                                             |
-|-------------------------------------------------------------------------------------------------|------------------------------------|-----------------------------|------------------------------------------------------------------|-------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| <a href="https://2gis.ru" class="favicon">2gis</a>                                              | Asignar                            | Monitoreo                   | —                                                                | —                                                                                   | [Charla en ruso, julio 2019](https://youtu.be/58sPkXfq6nw)                                                                                                                                                                             |
-| <a href="https://alohabrowser.com/" class="favicon">Aloha Browser</a>                           | Aplicación móvil                   | Backend del navegador       | —                                                                | —                                                                                   | [Diapositivas en ruso, mayo 2019](https://github.com/yandex/clickhouse-presentations/blob/master/meetup22/aloha.pdf)                                                                                                                   |
-| <a href="https://amadeus.com/" class="favicon">Amadeus</a>                                      | Viaje                              | Analítica                   | —                                                                | —                                                                                   | [Comunicado de prensa, abril de 2018](https://www.altinity.com/blog/2018/4/5/amadeus-technologies-launches-investment-and-insights-tool-based-on-machine-learning-and-strategy-algorithms)                                             |
-| <a href="https://www.appsflyer.com" class="favicon">Appsflyer</a>                               | Análisis móvil                     | Producto principal          | —                                                                | —                                                                                   | [Charla en ruso, julio 2019](https://www.youtube.com/watch?v=M3wbRlcpBbY)                                                                                                                                                              |
-| <a href="https://arenadata.tech/" class="favicon">ArenaData</a>                                 | Plataforma de datos                | Producto principal          | —                                                                | —                                                                                   | [Diapositivas en ruso, diciembre 2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup38/indexes.pdf)                                                                                                        |
-| <a href="https://badoo.com" class="favicon">Badoo</a>                                           | Citas                              | Serie de tiempo             | —                                                                | —                                                                                   | [Diapositivas en ruso, diciembre 2019](https://presentations.clickhouse.tech/meetup38/forecast.pdf)                                                                                                                                    |
-| <a href="https://www.benocs.com/" class="favicon">Benocs</a>                                    | Telemetría y análisis de red       | Producto principal          | —                                                                | —                                                                                   | [Diapositivas en español, octubre de 2017](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup9/lpm.pdf)                                                                                                         |
-| <a href="https://www.bloomberg.com/" class="favicon">Bloomberg</a>                              | Finanzas, Medios                   | Monitoreo                   | 102 servidores                                                   | —                                                                                   | [Diapositivas, Mayo 2018](https://www.slideshare.net/Altinity/http-analytics-for-6m-requests-per-second-using-clickhouse-by-alexander-bocharov)                                                                                        |
-| <a href="https://bloxy.info" class="favicon">Bloxy</a>                                          | Blockchain                         | Analítica                   | —                                                                | —                                                                                   | [Diapositivas en ruso, agosto 2018](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup17/4_bloxy.pptx)                                                                                                          |
-| <a href="https://www.chinatelecomglobal.com/" class="favicon">Dataliance para China Telecom</a> | Telecomunicaciones                 | Analítica                   | —                                                                | —                                                                                   | [Diapositivas en chino, enero 2018](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup12/telecom.pdf)                                                                                                           |
-| <a href="https://carto.com/" class="favicon">CARTO</a>                                          | Inteligencia de negocios           | Análisis geográfico         | —                                                                | —                                                                                   | [Procesamiento geoespacial con ClickHouse](https://carto.com/blog/geospatial-processing-with-clickhouse/)                                                                                                                              |
-| <a href="http://public.web.cern.ch/public/" class="favicon">CERN</a>                            | Investigación                      | Experimento                 | —                                                                | —                                                                                   | [Comunicado de prensa, abril de 2012](https://www.yandex.com/company/press_center/press_releases/2012/2012-04-10/)                                                                                                                     |
-| <a href="http://cisco.com/" class="favicon">Cisco</a>                                           | Red                                | Análisis de tráfico         | —                                                                | —                                                                                   | [Charla relámpago, octubre 2019](https://youtu.be/-hI1vDR2oPY?t=5057)                                                                                                                                                                  |
-| <a href="https://www.citadelsecurities.com/" class="favicon">Citadel Securities</a>             | Financiación                       | —                           | —                                                                | —                                                                                   | [Contribución, marzo 2019](https://github.com/ClickHouse/ClickHouse/pull/4774)                                                                                                                                                         |
-| <a href="https://city-mobil.ru" class="favicon">Más información</a>                             | Taxi                               | Analítica                   | —                                                                | —                                                                                   | [Blog Post en ruso, marzo 2020](https://habr.com/en/company/citymobil/blog/490660/)                                                                                                                                                    |
-| <a href="https://contentsquare.com" class="favicon">ContentSquare</a>                           | Análisis web                       | Producto principal          | —                                                                | —                                                                                   | [Publicación de blog en francés, noviembre 2018](http://souslecapot.net/2018/11/21/patrick-chatain-vp-engineering-chez-contentsquare-penser-davantage-amelioration-continue-que-revolution-constante/)                                 |
-| <a href="https://cloudflare.com" class="favicon">Cloudflare</a>                                 | CDN                                | Análisis de tráfico         | 36 servidores                                                    | —                                                                                   | [Mensaje del blog, Mayo 2017](https://blog.cloudflare.com/how-cloudflare-analyzes-1m-dns-queries-per-second/), [Mensaje del blog, marzo 2018](https://blog.cloudflare.com/http-analytics-for-6m-requests-per-second-using-clickhouse/) |
-| <a href="https://coru.net/" class="favicon">Corunet</a>                                         | Analítica                          | Producto principal          | —                                                                | —                                                                                   | [Diapositivas en español, Abril 2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup21/predictive_models.pdf)                                                                                               |
-| <a href="https://www.creditx.com" class="favicon">CraiditX 氪信</a>                             | Finanzas AI                        | Análisis                    | —                                                                | —                                                                                   | [Diapositivas en español, noviembre 2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup33/udf.pptx)                                                                                                        |
-| <a href="https://www.criteo.com/" class="favicon">Criteo</a>                                    | Menor                              | Producto principal          | —                                                                | —                                                                                   | [Diapositivas en español, octubre 2018](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup18/3_storetail.pptx)                                                                                                  |
-| <a href="https://db.com" class="favicon">Deutsche Bank</a>                                      | Financiación                       | BI Analytics                | —                                                                | —                                                                                   | [Diapositivas en español, octubre 2019](https://bigdatadays.ru/wp-content/uploads/2019/10/D2-H3-3_Yakunin-Goihburg.pdf)                                                                                                                |
-| <a href="https://www.diva-e.com" class="favicon">Diva-e</a>                                     | Consultoría digital                | Producto principal          | —                                                                | —                                                                                   | [Diapositivas en español, septiembre 2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup29/ClickHouse-MeetUp-Unusual-Applications-sd-2019-09-17.pdf)                                                       |
-| <a href="https://www.exness.com" class="favicon">Exness</a>                                     | Comercio                           | Métricas, Registro          | —                                                                | —                                                                                   | [Charla en ruso, mayo 2019](https://youtu.be/_rpU-TvSfZ8?t=3215)                                                                                                                                                                       |
-| <a href="https://geniee.co.jp" class="favicon">Sistema abierto.</a>                             | Red Ad                             | Producto principal          | —                                                                | —                                                                                   | [Publicación de blog en japonés, julio 2017](https://tech.geniee.co.jp/entry/2017/07/20/160100)                                                                                                                                        |
-| <a href="https://www.huya.com/" class="favicon">HUYA</a>                                        | Video Streaming                    | Analítica                   | —                                                                | —                                                                                   | [Diapositivas en chino, octubre 2018](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup19/7.%20ClickHouse万亿数据分析实践%20李本旺(sundy-li)%20虎牙.pdf)                                                       |
-| <a href="https://www.idealista.com" class="favicon">Idealista</a>                               | Inmobiliario                       | Analítica                   | —                                                                | —                                                                                   | [Blog Post en Inglés, Abril 2019](https://clickhouse.tech/blog/en/clickhouse-meetup-in-madrid-on-april-2-2019)                                                                                                                       |
-| <a href="https://www.infovista.com/" class="favicon">Infovista</a>                              | Red                                | Analítica                   | —                                                                | —                                                                                   | [Diapositivas en español, octubre 2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup30/infovista.pdf)                                                                                                     |
-| <a href="https://www.innogames.com" class="favicon">InnoGames</a>                               | Juego                              | Métricas, Registro          | —                                                                | —                                                                                   | [Diapositivas en ruso, septiembre 2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup28/graphite_and_clickHouse.pdf)                                                                                       |
-| <a href="https://integros.com" class="favicon">Integros</a>                                     | Plataforma para servicios de video | Analítica                   | —                                                                | —                                                                                   | [Diapositivas en ruso, mayo 2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup22/strategies.pdf)                                                                                                          |
-| <a href="https://www.kodiakdata.com/" class="favicon">Datos de Kodiak</a>                       | Nube                               | Producto principal          | —                                                                | —                                                                                   | [Diapositivas en Engish, Abril 2018](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup13/kodiak_data.pdf)                                                                                                      |
-| <a href="https://kontur.ru" class="favicon">Kontur</a>                                          | Desarrollo de software             | Métricas                    | —                                                                | —                                                                                   | [Charla en ruso, noviembre 2018](https://www.youtube.com/watch?v=U4u4Bd0FtrY)                                                                                                                                                          |
-| <a href="https://lifestreet.com/" class="favicon">Sistema abierto.</a>                          | Red Ad                             | Producto principal          | 75 servidores (3 réplicas)                                       | 5.27 PiB                                                                            | [Publicación de blog en ruso, febrero 2017](https://habr.com/en/post/322620/)                                                                                                                                                          |
-| <a href="https://mcs.mail.ru/" class="favicon">Soluciones en la nube de Mail.ru</a>             | Servicios en la nube               | Producto principal          | —                                                                | —                                                                                   | [Artículo en ruso](https://mcs.mail.ru/help/db-create/clickhouse#)                                                                                                                                                                     |
-| <a href="https://www.messagebird.com" class="favicon">Mensaje de pájaro</a>                     | Telecomunicaciones                 | Estadísticas                | —                                                                | —                                                                                   | [Diapositivas en español, noviembre 2018](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup20/messagebird.pdf)                                                                                                 |
-| <a href="https://www.mgid.com/" class="favicon">MGID</a>                                        | Red Ad                             | Analítica Web               | —                                                                | —                                                                                   | [Publicación de blog en ruso, abril 2020](http://gs-studio.com/news-about-it/32777----clickhouse---c)                                                                                                                                  |
-| <a href="https://www.oneapm.com/" class="favicon">UnoAPM</a>                                    | Supervisión y análisis de datos    | Producto principal          | —                                                                | —                                                                                   | [Diapositivas en chino, octubre 2018](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup19/8.%20clickhouse在OneAPM的应用%20杜龙.pdf)                                                                            |
-| <a href="http://www.pragma-innovation.fr/" class="favicon">Pragma Innovation</a>                | Telemetría y Análisis de Big Data  | Producto principal          | —                                                                | —                                                                                   | [Diapositivas en español, octubre 2018](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup18/4_pragma_innovation.pdf)                                                                                           |
-| <a href="https://www.qingcloud.com/" class="favicon">QINGCLOUD</a>                              | Servicios en la nube               | Producto principal          | —                                                                | —                                                                                   | [Diapositivas en chino, octubre 2018](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup19/4.%20Cloud%20%2B%20TSDB%20for%20ClickHouse%20张健%20QingCloud.pdf)                                                   |
-| <a href="https://qrator.net" class="favicon">Qrator</a>                                         | Protección DDoS                    | Producto principal          | —                                                                | —                                                                                   | [Blog Post, marzo 2019](https://blog.qrator.net/en/clickhouse-ddos-mitigation_37/)                                                                                                                                                     |
-| <a href="https://www.percent.cn/" class="favicon">Percent 百分点</a>                            | Analítica                          | Producto principal          | —                                                                | —                                                                                   | [Diapositivas en chino, junio 2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup24/4.%20ClickHouse万亿数据双中心的设计与实践%20.pdf)                                                                      |
-| <a href="https://rambler.ru" class="favicon">Rambler</a>                                        | Servicios de Internet              | Analítica                   | —                                                                | —                                                                                   | [Charla en ruso, abril 2018](https://medium.com/@ramblertop/разработка-api-clickhouse-для-рамблер-топ-100-f4c7e56f3141)                                                                                                                |
-| <a href="https://www.tencent.com" class="favicon">Tencent</a>                                   | Mensajería                         | Tala                        | —                                                                | —                                                                                   | [Charla en chino, noviembre 2019](https://youtu.be/T-iVQRuw-QY?t=5050)                                                                                                                                                                 |
-| <a href="https://trafficstars.com/" class="favicon">Traffic Stars</a>                           | Red AD                             | —                           | —                                                                | —                                                                                   | [Diapositivas en ruso, mayo 2018](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup15/lightning/ninja.pdf)                                                                                                     |
-| <a href="https://www.s7.ru" class="favicon">S7 Airlines</a>                                     | Aérea                              | Métricas, Registro          | —                                                                | —                                                                                   | [Charla en ruso, marzo 2019](https://www.youtube.com/watch?v=nwG68klRpPg&t=15s)                                                                                                                                                        |
-| <a href="https://www.semrush.com/" class="favicon">SEMrush</a>                                  | Marketing                          | Producto principal          | —                                                                | —                                                                                   | [Diapositivas en ruso, agosto 2018](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup17/5_semrush.pdf)                                                                                                         |
-| <a href="https://www.scireum.de/" class="favicon">scireum GmbH</a>                              | Comercio electrónico               | Producto principal          | —                                                                | —                                                                                   | [Charla en alemán, febrero de 2020](https://www.youtube.com/watch?v=7QWAn5RbyR4)                                                                                                                                                       |
-| <a href="https://sentry.io/" class="favicon">Centinela</a>                                      | Desarrollador de software          | Backend para el producto    | —                                                                | —                                                                                   | [Publicación de blog en inglés, mayo 2019](https://blog.sentry.io/2019/05/16/introducing-snuba-sentrys-new-search-infrastructure)                                                                                                      |
-| <a href="http://www.sgk.gov.tr/wps/portal/sgk/tr" class="favicon">SGK</a>                       | Gobierno Seguridad Social          | Analítica                   | —                                                                | —                                                                                   | [Diapositivas en español, noviembre 2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup35/ClickHouse%20Meetup-Ramazan%20POLAT.pdf)                                                                         |
-| <a href="https://seo.do/" class="favicon">el seo.¿</a>                                          | Analítica                          | Producto principal          | —                                                                | —                                                                                   | [Diapositivas en español, noviembre 2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup35/CH%20Presentation-%20Metehan%20Çetinkaya.pdf)                                                                    |
-| <a href="http://english.sina.com/index.html" class="favicon">Sina</a>                           | Noticia                            | —                           | —                                                                | —                                                                                   | [Diapositivas en chino, octubre 2018](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup19/6.%20ClickHouse最佳实践%20高鹏_新浪.pdf)                                                                             |
-| <a href="https://smi2.ru/" class="favicon">SMI2</a>                                             | Noticia                            | Analítica                   | —                                                                | —                                                                                   | [Blog Post en ruso, noviembre 2017](https://habr.com/ru/company/smi2/blog/314558/)                                                                                                                                                     |
-| <a href="https://www.splunk.com/" class="favicon">Salto</a>                                     | Análisis de negocios               | Producto principal          | —                                                                | —                                                                                   | [Diapositivas en español, enero 2018](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup12/splunk.pdf)                                                                                                          |
-| <a href="https://www.spotify.com" class="favicon">Spotify</a>                                   | Sica                               | Experimentación             | —                                                                | —                                                                                   | [Diapositivas, julio 2018](https://www.slideshare.net/glebus/using-clickhouse-for-experimentation-104247173)                                                                                                                           |
-| <a href="https://www.tencent.com" class="favicon">Tencent</a>                                   | Grandes Datos                      | Procesamiento de datos      | —                                                                | —                                                                                   | [Diapositivas en chino, octubre 2018](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup19/5.%20ClickHouse大数据集群应用_李俊飞腾讯网媒事业部.pdf)                                                              |
-| <a href="https://www.uber.com" class="favicon">Más información</a>                              | Taxi                               | Tala                        | —                                                                | —                                                                                   | [Diapositivas, febrero de 2020](https://presentations.clickhouse.tech/meetup40/uber.pdf)                                                                                                                                               |
-| <a href="https://vk.com" class="favicon">VKontakte</a>                                          | Red social                         | Estadísticas, Registro      | —                                                                | —                                                                                   | [Diapositivas en ruso, agosto 2018](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup17/3_vk.pdf)                                                                                                              |
-| <a href="https://wisebits.com/" class="favicon">Método de codificación de datos:</a>            | Soluciones de TI                   | Analítica                   | —                                                                | —                                                                                   | [Diapositivas en ruso, mayo 2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup22/strategies.pdf)                                                                                                          |
-| <a href="http://www.xiaoxintech.cn/" class="favicon">Xiaoxin Tech</a>                           | Educación                          | Propósito común             | —                                                                | —                                                                                   | [Diapositivas en español, noviembre 2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup33/sync-clickhouse-with-mysql-mongodb.pptx)                                                                         |
-| <a href="https://www.ximalaya.com/" class="favicon">Ximalaya</a>                                | Compartir audio                    | OLAP                        | —                                                                | —                                                                                   | [Diapositivas en español, noviembre 2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup33/ximalaya.pdf)                                                                                                    |
-| <a href="https://cloud.yandex.ru/services/managed-clickhouse" class="favicon">Yandex Cloud</a>  | Nube pública                       | Producto principal          | —                                                                | —                                                                                   | [Charla en ruso, diciembre 2019](https://www.youtube.com/watch?v=pgnak9e_E0o)                                                                                                                                                          |
-| <a href="https://cloud.yandex.ru/services/datalens" class="favicon">Yandex DataLens</a>         | Inteligencia de negocios           | Producto principal          | —                                                                | —                                                                                   | [Diapositivas en ruso, diciembre 2019](https://presentations.clickhouse.tech/meetup38/datalens.pdf)                                                                                                                                    |
-| <a href="https://market.yandex.ru/" class="favicon">Yandex Market</a>                           | Comercio electrónico               | Métricas, Registro          | —                                                                | —                                                                                   | [Charla en ruso, enero 2019](https://youtu.be/_l1qP0DyBcA?t=478)                                                                                                                                                                       |
-| <a href="https://metrica.yandex.com" class="favicon">Yandex Metrica</a>                         | Análisis web                       | Producto principal          | 360 servidores en un clúster, 1862 servidores en un departamento | 66.41 PiB / 5.68 PiB                                                                | [Diapositivas, febrero de 2020](https://presentations.clickhouse.tech/meetup40/introduction/#13)                                                                                                                                       |
-| <a href="https://htc-cs.ru/" class="favicon">ЦВТ</a>                                            | Desarrollo de software             | Métricas, Registro          | —                                                                | —                                                                                   | [Blog Post, marzo 2019, en ruso](https://vc.ru/dev/62715-kak-my-stroili-monitoring-na-prometheus-clickhouse-i-elk)                                                                                                                     |
-| <a href="https://mkb.ru/" class="favicon">МКБ</a>                                               | Banco                              | Supervisión del sistema web | —                                                                | —                                                                                   | [Diapositivas en ruso, septiembre 2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup28/mkb.pdf)                                                                                                           |
-| <a href="https://jinshuju.net" class="favicon">Jinshuju 金数据</a>                              | BI Analytics                       | Producto principal          | —                                                                | —                                                                                   | [Diapositivas en chino, octubre 2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup24/3.%20金数据数据架构调整方案Public.pdf)                                                                               |
-| <a href="https://www.instana.com" class="favicon">Instana</a>                                   | Plataforma APM                     | Producto principal          | —                                                                | —                                                                                   | [Publicación de Twitter](https://twitter.com/mieldonkers/status/1248884119158882304)                                                                                                                                                   |
-| <a href="https://wargaming.com/en/" class="favicon">Wargaming</a>                               | Juego                              |                             | —                                                                | —                                                                                   | [Entrevista](https://habr.com/en/post/496954/)                                                                                                                                                                                         |
-| <a href="https://crazypanda.ru/en/" class="favicon">Crazypanda</a>                              | Juego                              |                             | —                                                                | —                                                                                   | Sesión en vivo en ClickHouse meetup                                                                                                                                                                                                    |
-| <a href="https://fun.co/rp" class="favicon">FunCorp</a>                                         | Juego                              |                             | —                                                                | —                                                                                   | [Artículo](https://www.altinity.com/blog/migrating-from-redshift-to-clickhouse)                                                                                                                                                        |
-
-[Artículo Original](https://clickhouse.tech/docs/en/introduction/adopters/) <!--hide-->
diff --git a/docs/es/introduction/distinctive-features.md b/docs/es/introduction/distinctive-features.md
deleted file mode 100644
index 154b12a65e9..00000000000
--- a/docs/es/introduction/distinctive-features.md
+++ /dev/null
@@ -1,77 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 4
-toc_title: "Caracter\xEDsticas distintivas"
----
-
-# Características distintivas de ClickHouse {#distinctive-features-of-clickhouse}
-
-## DBMS orientado a columnas verdaderas {#true-column-oriented-dbms}
-
-En un verdadero DBMS orientado a columnas, no se almacenan datos adicionales con los valores. Entre otras cosas, esto significa que los valores de longitud constante deben ser compatibles, para evitar almacenar su longitud “number” al lado de los valores. Como ejemplo, mil millones de valores de tipo UInt8 deberían consumir alrededor de 1 GB sin comprimir, o esto afecta fuertemente el uso de la CPU. Es esencial almacenar los datos de forma compacta (sin “garbage”) incluso sin comprimir, ya que la velocidad de descompresión (uso de CPU) depende principalmente del volumen de datos sin comprimir.
-
-Vale la pena señalar porque hay sistemas que pueden almacenar valores de diferentes columnas por separado, pero que no pueden procesar efectivamente las consultas analíticas debido a su optimización para otros escenarios. Los ejemplos son HBase, BigTable, Cassandra e HyperTable. En estos sistemas, obtendría un rendimiento de alrededor de cien mil filas por segundo, pero no cientos de millones de filas por segundo.
-
-También vale la pena señalar que ClickHouse es un sistema de administración de bases de datos, no una sola base de datos. ClickHouse permite crear tablas y bases de datos en tiempo de ejecución, cargar datos y ejecutar consultas sin volver a configurar y reiniciar el servidor.
-
-## Compresión de datos {#data-compression}
-
-Algunos DBMS orientados a columnas (InfiniDB CE y MonetDB) no utilizan la compresión de datos. Sin embargo, la compresión de datos juega un papel clave para lograr un rendimiento excelente.
-
-## Almacenamiento en disco de datos {#disk-storage-of-data}
-
-Mantener los datos físicamente ordenados por clave principal permite extraer datos para sus valores específicos o rangos de valores con baja latencia, menos de unas pocas docenas de milisegundos. Algunos DBMS orientados a columnas (como SAP HANA y Google PowerDrill) solo pueden funcionar en RAM. Este enfoque fomenta la asignación de un presupuesto de hardware más grande que el necesario para el análisis en tiempo real. ClickHouse está diseñado para funcionar en discos duros normales, lo que significa que el costo por GB de almacenamiento de datos es bajo, pero SSD y RAM adicional también se utilizan completamente si están disponibles.
-
-## Procesamiento paralelo en varios núcleos {#parallel-processing-on-multiple-cores}
-
-Las consultas grandes se paralelizan naturalmente, tomando todos los recursos necesarios disponibles en el servidor actual.
-
-## Procesamiento distribuido en varios servidores {#distributed-processing-on-multiple-servers}
-
-Casi ninguno de los DBMS columnar mencionados anteriormente tiene soporte para el procesamiento de consultas distribuidas.
-En ClickHouse, los datos pueden residir en diferentes fragmentos. Cada fragmento puede ser un grupo de réplicas utilizadas para la tolerancia a errores. Todos los fragmentos se utilizan para ejecutar una consulta en paralelo, de forma transparente para el usuario.
-
-## Soporte SQL {#sql-support}
-
-ClickHouse admite un lenguaje de consulta declarativo basado en SQL que es idéntico al estándar SQL en muchos casos.
-Las consultas admitidas incluyen GROUP BY, ORDER BY, subconsultas en cláusulas FROM, IN y JOIN y subconsultas escalares.
-No se admiten subconsultas y funciones de ventana dependientes.
-
-## Motor del vector {#vector-engine}
-
-Los datos no solo se almacenan mediante columnas, sino que se procesan mediante vectores (partes de columnas), lo que permite lograr una alta eficiencia de CPU.
-
-## Actualizaciones de datos en tiempo real {#real-time-data-updates}
-
-ClickHouse admite tablas con una clave principal. Para realizar consultas rápidamente en el rango de la clave principal, los datos se ordenan de forma incremental utilizando el árbol de combinación. Debido a esto, los datos se pueden agregar continuamente a la tabla. No se toman bloqueos cuando se ingieren nuevos datos.
-
-## Indice {#index}
-
-Tener un dato ordenado físicamente por clave principal permite extraer datos para sus valores específicos o rangos de valores con baja latencia, menos de unas pocas docenas de milisegundos.
-
-## Adecuado para consultas en línea {#suitable-for-online-queries}
-
-La baja latencia significa que las consultas se pueden procesar sin demora y sin intentar preparar una respuesta por adelantado, justo en el mismo momento mientras se carga la página de la interfaz de usuario. En otras palabras, en línea.
-
-## Soporte para cálculos aproximados {#support-for-approximated-calculations}
-
-ClickHouse proporciona varias formas de intercambiar precisión por rendimiento:
-
-1.  Funciones agregadas para el cálculo aproximado del número de valores distintos, medianas y cuantiles.
-2.  Ejecutar una consulta basada en una parte (muestra) de datos y obtener un resultado aproximado. En este caso, se recuperan proporcionalmente menos datos del disco.
-3.  Ejecutar una agregación para un número limitado de claves aleatorias, en lugar de para todas las claves. Bajo ciertas condiciones para la distribución de claves en los datos, esto proporciona un resultado razonablemente preciso mientras se utilizan menos recursos.
-
-## Replicación de datos e integridad de datos {#data-replication-and-data-integrity-support}
-
-ClickHouse utiliza la replicación multi-maestro asincrónica. Después de escribir en cualquier réplica disponible, todas las réplicas restantes recuperan su copia en segundo plano. El sistema mantiene datos idénticos en diferentes réplicas. La recuperación después de la mayoría de las fallas se realiza automáticamente, o semiautomáticamente en casos complejos.
-
-Para obtener más información, consulte la sección [Replicación de datos](../engines/table-engines/mergetree-family/replication.md).
-
-## Características que pueden considerarse desventajas {#clickhouse-features-that-can-be-considered-disadvantages}
-
-1.  No hay transacciones completas.
-2.  Falta de capacidad para modificar o eliminar datos ya insertados con alta tasa y baja latencia. Hay eliminaciones y actualizaciones por lotes disponibles para limpiar o modificar datos, por ejemplo, para cumplir con [GDPR](https://gdpr-info.eu).
-3.  El índice disperso hace que ClickHouse no sea tan adecuado para consultas de puntos que recuperan filas individuales por sus claves.
-
-[Artículo Original](https://clickhouse.tech/docs/en/introduction/distinctive_features/) <!--hide-->
diff --git a/docs/es/introduction/history.md b/docs/es/introduction/history.md
deleted file mode 100644
index 7311fa01959..00000000000
--- a/docs/es/introduction/history.md
+++ /dev/null
@@ -1,56 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 7
-toc_title: Historia
----
-
-# Historial de ClickHouse {#clickhouse-history}
-
-ClickHouse se ha desarrollado inicialmente para alimentar [El Yandex.Métrica](https://metrica.yandex.com/), [la segunda plataforma de análisis web más grande del mundo](http://w3techs.com/technologies/overview/traffic_analysis/all), y sigue siendo el componente central de este sistema. Con más de 13 billones de registros en la base de datos y más de 20 mil millones de eventos diarios, ClickHouse permite generar informes personalizados sobre la marcha directamente a partir de datos no agregados. Este artículo cubre brevemente los objetivos de ClickHouse en las primeras etapas de su desarrollo.
-
-El Yandex.Metrica construye informes personalizados sobre la marcha basados en hits y sesiones, con segmentos arbitrarios definidos por el usuario. Hacerlo a menudo requiere construir agregados complejos, como el número de usuarios únicos. Los nuevos datos para crear un informe llegan en tiempo real.
-
-A partir de abril de 2014, Yandex.Metrica estaba rastreando alrededor de 12 mil millones de eventos (vistas de páginas y clics) diariamente. Todos estos eventos deben almacenarse para crear informes personalizados. Una sola consulta puede requerir escanear millones de filas en unos pocos cientos de milisegundos, o cientos de millones de filas en solo unos segundos.
-
-## Uso en Yandex.Metrica y otros servicios de Yandex {#usage-in-yandex-metrica-and-other-yandex-services}
-
-ClickHouse sirve para múltiples propósitos en Yandex.Métrica.
-Su tarea principal es crear informes en modo en línea utilizando datos no agregados. Utiliza un clúster de 374 servidores, que almacenan más de 20,3 billones de filas en la base de datos. El volumen de datos comprimidos es de aproximadamente 2 PB, sin tener en cuenta duplicados y réplicas. El volumen de datos sin comprimir (en formato TSV) sería de aproximadamente 17 PB.
-
-ClickHouse también juega un papel clave en los siguientes procesos:
-
--   Almacenamiento de datos para Session Replay de Yandex.Métrica.
--   Procesamiento de datos intermedios.
--   Creación de informes globales con Analytics.
--   Ejecutar consultas para depurar el Yandex.Motor Metrica.
--   Análisis de registros desde la API y la interfaz de usuario.
-
-Hoy en día, hay varias docenas de instalaciones de ClickHouse en otros servicios y departamentos de Yandex: verticales de búsqueda, comercio electrónico, publicidad, análisis de negocios, desarrollo móvil, servicios personales y otros.
-
-## Datos agregados y no agregados {#aggregated-and-non-aggregated-data}
-
-Existe una opinión generalizada de que para calcular las estadísticas de manera efectiva, debe agregar datos ya que esto reduce el volumen de datos.
-
-Pero la agregación de datos viene con muchas limitaciones:
-
--   Debe tener una lista predefinida de los informes necesarios.
--   El usuario no puede hacer informes personalizados.
--   Al agregar sobre un gran número de claves distintas, el volumen de datos apenas se reduce, por lo que la agregación es inútil.
--   Para un gran número de informes, hay demasiadas variaciones de agregación (explosión combinatoria).
--   Al agregar claves con alta cardinalidad (como las URL), el volumen de datos no se reduce en mucho (menos del doble).
--   Por esta razón, el volumen de datos con agregación podría crecer en lugar de reducirse.
--   Los usuarios no ven todos los informes que generamos para ellos. Una gran parte de esos cálculos es inútil.
--   La integridad lógica de los datos puede ser violada para varias agregaciones.
-
-Si no agregamos nada y trabajamos con datos no agregados, esto podría reducir el volumen de cálculos.
-
-Sin embargo, con la agregación, una parte significativa del trabajo se desconecta y se completa con relativa calma. Por el contrario, los cálculos en línea requieren calcular lo más rápido posible, ya que el usuario está esperando el resultado.
-
-El Yandex.Metrica tiene un sistema especializado para agregar datos llamado Metrage, que se utilizó para la mayoría de los informes.
-A partir de 2009, Yandex.Metrica también utilizó una base de datos OLAP especializada para datos no agregados llamada OLAPServer, que anteriormente se usaba para el generador de informes.
-OLAPServer funcionó bien para datos no agregados, pero tenía muchas restricciones que no permitían que se utilizara para todos los informes según lo deseado. Estos incluyeron la falta de soporte para tipos de datos (solo números) y la incapacidad de actualizar datos de forma incremental en tiempo real (solo se podía hacer reescribiendo datos diariamente). OLAPServer no es un DBMS, sino una base de datos especializada.
-
-El objetivo inicial de ClickHouse era eliminar las limitaciones de OLAPServer y resolver el problema de trabajar con datos no agregados para todos los informes, pero a lo largo de los años, se ha convertido en un sistema de gestión de bases de datos de propósito general adecuado para una amplia gama de tareas analíticas.
-
-[Artículo Original](https://clickhouse.tech/docs/en/introduction/history/) <!--hide-->
diff --git a/docs/es/introduction/index.md b/docs/es/introduction/index.md
deleted file mode 100644
index 7026dc800e4..00000000000
--- a/docs/es/introduction/index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: "Implantaci\xF3n"
-toc_priority: 1
----
-
-
diff --git a/docs/es/introduction/performance.md b/docs/es/introduction/performance.md
deleted file mode 100644
index 01640439128..00000000000
--- a/docs/es/introduction/performance.md
+++ /dev/null
@@ -1,32 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 6
-toc_title: Rendimiento
----
-
-# Rendimiento {#performance}
-
-De acuerdo con los resultados de las pruebas internas en Yandex, ClickHouse muestra el mejor rendimiento (tanto el mayor rendimiento para consultas largas como la menor latencia en consultas cortas) para escenarios operativos comparables entre los sistemas de su clase que estaban disponibles para pruebas. Puede ver los resultados de la prueba en un [página separada](https://clickhouse.tech/benchmark/dbms/).
-
-Numerosos puntos de referencia independientes llegaron a conclusiones similares. No son difíciles de encontrar mediante una búsqueda en Internet, o se puede ver [nuestra pequeña colección de enlaces relacionados](https://clickhouse.tech/#independent-benchmarks).
-
-## Rendimiento para una única consulta grande {#throughput-for-a-single-large-query}
-
-El rendimiento se puede medir en filas por segundo o megabytes por segundo. Si los datos se colocan en la caché de la página, una consulta que no es demasiado compleja se procesa en hardware moderno a una velocidad de aproximadamente 2-10 GB / s de datos sin comprimir en un solo servidor (para los casos más sencillos, la velocidad puede alcanzar 30 GB / s). Si los datos no se colocan en la memoria caché de la página, la velocidad depende del subsistema de disco y la velocidad de compresión de datos. Por ejemplo, si el subsistema de disco permite leer datos a 400 MB/s y la tasa de compresión de datos es 3, se espera que la velocidad sea de alrededor de 1,2 GB/s. Para obtener la velocidad en filas por segundo, divida la velocidad en bytes por segundo por el tamaño total de las columnas utilizadas en la consulta. Por ejemplo, si se extraen 10 bytes de columnas, se espera que la velocidad sea de alrededor de 100-200 millones de filas por segundo.
-
-La velocidad de procesamiento aumenta casi linealmente para el procesamiento distribuido, pero solo si el número de filas resultantes de la agregación o la clasificación no es demasiado grande.
-
-## Latencia al procesar consultas cortas {#latency-when-processing-short-queries}
-
-Si una consulta usa una clave principal y no selecciona demasiadas columnas y filas para procesar (cientos de miles), puede esperar menos de 50 milisegundos de latencia (dígitos individuales de milisegundos en el mejor de los casos) si los datos se colocan en la memoria caché de la página. De lo contrario, la latencia está dominada principalmente por el número de búsquedas. Si utiliza unidades de disco giratorias, para un sistema que no está sobrecargado, la latencia se puede estimar con esta fórmula: `seek time (10 ms) * count of columns queried * count of data parts`.
-
-## Rendimiento al procesar una gran cantidad de consultas cortas {#throughput-when-processing-a-large-quantity-of-short-queries}
-
-En las mismas condiciones, ClickHouse puede manejar varios cientos de consultas por segundo en un solo servidor (hasta varios miles en el mejor de los casos). Dado que este escenario no es típico para DBMS analíticos, se recomienda esperar un máximo de 100 consultas por segundo.
-
-## Rendimiento al insertar datos {#performance-when-inserting-data}
-
-Recomendamos insertar datos en paquetes de al menos 1000 filas o no más de una sola solicitud por segundo. Al insertar en una tabla MergeTree desde un volcado separado por tabuladores, la velocidad de inserción puede ser de 50 a 200 MB/s. Si las filas insertadas tienen alrededor de 1 Kb de tamaño, la velocidad será de 50,000 a 200,000 filas por segundo. Si las filas son pequeñas, el rendimiento puede ser mayor en filas por segundo (en los datos del sistema Banner -`>` 500.000 filas por segundo; en datos de grafito -`>` 1.000.000 de filas por segundo). Para mejorar el rendimiento, puede realizar varias consultas INSERT en paralelo, que se escala linealmente.
-
-[Artículo Original](https://clickhouse.tech/docs/en/introduction/performance/) <!--hide-->
diff --git a/docs/es/operations/access-rights.md b/docs/es/operations/access-rights.md
deleted file mode 100644
index 6c777d9f081..00000000000
--- a/docs/es/operations/access-rights.md
+++ /dev/null
@@ -1,143 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 48
-toc_title: "Control de acceso y gesti\xF3n de cuentas"
----
-
-# Control de acceso y gestión de cuentas {#access-control}
-
-ClickHouse admite la administración de control de acceso basada en [RBAC](https://en.wikipedia.org/wiki/Role-based_access_control) enfoque.
-
-Entidades de acceso de ClickHouse:
-- [Cuenta de usuario](#user-account-management)
-- [Rol](#role-management)
-- [Política de fila](#row-policy-management)
-- [Perfil de configuración](#settings-profiles-management)
-- [Cuota](#quotas-management)
-
-Puede configurar entidades de acceso utilizando:
-
--   Flujo de trabajo controlado por SQL.
-
-    Es necesario [permitir](#enabling-access-control) esta funcionalidad.
-
--   Servidor [archivos de configuración](configuration-files.md) `users.xml` y `config.xml`.
-
-Se recomienda utilizar el flujo de trabajo controlado por SQL. Ambos métodos de configuración funcionan simultáneamente, por lo que si utiliza los archivos de configuración del servidor para administrar cuentas y derechos de acceso, puede pasar suavemente al flujo de trabajo controlado por SQL.
-
-!!! note "Advertencia"
-    No puede administrar la misma entidad de acceso mediante ambos métodos de configuración simultáneamente.
-
-## Uso {#access-control-usage}
-
-De forma predeterminada, el servidor ClickHouse proporciona la cuenta de usuario `default` que no está permitido usar control de acceso controlado por SQL y administración de cuentas, pero tiene todos los derechos y permisos. El `default` cuenta de usuario se utiliza en cualquier caso cuando el nombre de usuario no está definido, por ejemplo, al iniciar sesión desde el cliente o en consultas distribuidas. En el procesamiento de consultas distribuidas se utiliza una cuenta de usuario predeterminada, si la configuración del servidor o clúster no [usuario y contraseña](../engines/table-engines/special/distributed.md) propiedad.
-
-Si acaba de comenzar a usar ClickHouse, puede usar el siguiente escenario:
-
-1.  [Permitir](#enabling-access-control) Control de acceso basado en SQL y gestión de cuentas `default` usuario.
-2.  Inicie sesión bajo el `default` cuenta de usuario y crear todos los usuarios. No olvides crear una cuenta de administrador (`GRANT ALL ON *.* WITH GRANT OPTION TO admin_user_account`).
-3.  [Restringir permisos](settings/permissions-for-queries.md#permissions_for_queries) para el `default` usuario y deshabilitar el control de acceso impulsado por SQL y la administración de cuentas para ello.
-
-### Propiedades de la solución actual {#access-control-properties}
-
--   Puede conceder permisos para bases de datos y tablas incluso si no existen.
--   Si se eliminó una tabla, no se revocarán todos los privilegios que corresponden a esta tabla. Por lo tanto, si se crea una nueva tabla más tarde con el mismo nombre, todos los privilegios vuelven a ser reales. Para revocar los privilegios correspondientes a la tabla eliminada, debe realizar, por ejemplo, el `REVOKE ALL PRIVILEGES ON db.table FROM ALL` consulta.
--   No hay ninguna configuración de por vida para los privilegios.
-
-## Cuenta de usuario {#user-account-management}
-
-Una cuenta de usuario es una entidad de acceso que permite autorizar a alguien en ClickHouse. Una cuenta de usuario contiene:
-
--   Información de identificación.
--   [Privilegio](../sql-reference/statements/grant.md#grant-privileges) que definen un ámbito de consultas que el usuario puede realizar.
--   Hosts desde los que se permite la conexión al servidor ClickHouse.
--   Roles otorgados y predeterminados.
--   Configuración con sus restricciones que se aplican de forma predeterminada en el inicio de sesión del usuario.
--   Perfiles de configuración asignados.
-
-Los privilegios a una cuenta de usuario pueden ser otorgados por el [GRANT](../sql-reference/statements/grant.md) consulta o asignando [rol](#role-management). Para revocar privilegios de un usuario, ClickHouse proporciona el [REVOKE](../sql-reference/statements/revoke.md) consulta. Para listar los privilegios de un usuario, utilice - [SHOW GRANTS](../sql-reference/statements/show.md#show-grants-statement) instrucción.
-
-Consultas de gestión:
-
--   [CREATE USER](../sql-reference/statements/create.md#create-user-statement)
--   [ALTER USER](../sql-reference/statements/alter.md#alter-user-statement)
--   [DROP USER](../sql-reference/statements/misc.md#drop-user-statement)
--   [SHOW CREATE USER](../sql-reference/statements/show.md#show-create-user-statement)
-
-### Ajustes Aplicación {#access-control-settings-applying}
-
-Los ajustes se pueden establecer de diferentes maneras: para una cuenta de usuario, en sus roles y perfiles de configuración concedidos. En un inicio de sesión de usuario, si se establece una configuración en diferentes entidades de acceso, el valor y las restricciones de esta configuración se aplican mediante las siguientes prioridades (de mayor a menor):
-
-1.  Configuración de la cuenta de usuario.
-2.  La configuración de los roles predeterminados de la cuenta de usuario. Si se establece una configuración en algunos roles, el orden de la configuración que se aplica no está definido.
-3.  La configuración de los perfiles de configuración asignados a un usuario o a sus roles predeterminados. Si se establece una configuración en algunos perfiles, el orden de aplicación de la configuración no está definido.
-4.  Ajustes aplicados a todo el servidor de forma predeterminada o desde el [perfil predeterminado](server-configuration-parameters/settings.md#default-profile).
-
-## Rol {#role-management}
-
-Role es un contenedor para las entidades de acceso que se pueden conceder a una cuenta de usuario.
-
-El rol contiene:
-
--   [Privilegio](../sql-reference/statements/grant.md#grant-privileges)
--   Configuración y restricciones
--   Lista de funciones concedidas
-
-Consultas de gestión:
-
--   [CREATE ROLE](../sql-reference/statements/create.md#create-role-statement)
--   [ALTER ROLE](../sql-reference/statements/alter.md#alter-role-statement)
--   [DROP ROLE](../sql-reference/statements/misc.md#drop-role-statement)
--   [SET ROLE](../sql-reference/statements/misc.md#set-role-statement)
--   [SET DEFAULT ROLE](../sql-reference/statements/misc.md#set-default-role-statement)
--   [SHOW CREATE ROLE](../sql-reference/statements/show.md#show-create-role-statement)
-
-Los privilegios a un rol pueden ser otorgados por el [GRANT](../sql-reference/statements/grant.md) consulta. Para revocar privilegios de un rol, ClickHouse proporciona el [REVOKE](../sql-reference/statements/revoke.md) consulta.
-
-## Política de fila {#row-policy-management}
-
-La directiva de filas es un filtro que define qué filas está disponible para un usuario o para un rol. La directiva de filas contiene filtros para una tabla específica y una lista de roles y/o usuarios que deben usar esta directiva de filas.
-
-Consultas de gestión:
-
--   [CREATE ROW POLICY](../sql-reference/statements/create.md#create-row-policy-statement)
--   [ALTER ROW POLICY](../sql-reference/statements/alter.md#alter-row-policy-statement)
--   [DROP ROW POLICY](../sql-reference/statements/misc.md#drop-row-policy-statement)
--   [SHOW CREATE ROW POLICY](../sql-reference/statements/show.md#show-create-row-policy-statement)
-
-## Perfil de configuración {#settings-profiles-management}
-
-El perfil de configuración es una colección de [configuración](settings/index.md). El perfil de configuración contiene configuraciones y restricciones, y una lista de roles y/o usuarios a los que se aplica esta cuota.
-
-Consultas de gestión:
-
--   [CREATE SETTINGS PROFILE](../sql-reference/statements/create.md#create-settings-profile-statement)
--   [ALTER SETTINGS PROFILE](../sql-reference/statements/alter.md#alter-settings-profile-statement)
--   [DROP SETTINGS PROFILE](../sql-reference/statements/misc.md#drop-settings-profile-statement)
--   [SHOW CREATE SETTINGS PROFILE](../sql-reference/statements/show.md#show-create-settings-profile-statement)
-
-## Cuota {#quotas-management}
-
-La cuota limita el uso de recursos. Ver [Cuota](quotas.md).
-
-La cuota contiene un conjunto de límites para algunas duraciones y una lista de roles y / o usuarios que deben usar esta cuota.
-
-Consultas de gestión:
-
--   [CREATE QUOTA](../sql-reference/statements/create.md#create-quota-statement)
--   [ALTER QUOTA](../sql-reference/statements/alter.md#alter-quota-statement)
--   [DROP QUOTA](../sql-reference/statements/misc.md#drop-quota-statement)
--   [SHOW CREATE QUOTA](../sql-reference/statements/show.md#show-create-quota-statement)
-
-## Habilitación del control de acceso basado en SQL y la administración de cuentas {#enabling-access-control}
-
--   Configure un directorio para el almacenamiento de configuraciones.
-
-    ClickHouse almacena las configuraciones de entidades de acceso en la carpeta [access_control_path](server-configuration-parameters/settings.md#access_control_path) parámetro de configuración del servidor.
-
--   Habilite el control de acceso controlado por SQL y la administración de cuentas para al menos una cuenta de usuario.
-
-    De forma predeterminada, el control de acceso controlado por SQL y la administración de cuentas se activan para todos los usuarios. Debe configurar al menos un usuario en el `users.xml` archivo de configuración y asigne 1 al [access_management](settings/settings-users.md#access_management-user-setting) configuración.
-
-[Artículo Original](https://clickhouse.tech/docs/en/operations/access_rights/) <!--hide-->
diff --git a/docs/es/operations/backup.md b/docs/es/operations/backup.md
deleted file mode 100644
index be33851574a..00000000000
--- a/docs/es/operations/backup.md
+++ /dev/null
@@ -1,39 +0,0 @@
----
-toc_priority: 49
-toc_title: Copia de seguridad de datos
----
-
-# Copia de seguridad de datos {#data-backup}
-
-Mientras que la [replicación](../engines/table-engines/mergetree-family/replication.md) proporciona protección contra fallos de hardware, no protege de errores humanos: el borrado accidental de datos, elminar la tabla equivocada o una tabla en el clúster equivocado, y bugs de software que dan como resultado un procesado incorrecto de los datos o la corrupción de los datos. En muchos casos, errores como estos afectarán a todas las réplicas. ClickHouse dispone de salvaguardas para prevenir algunos tipos de errores — por ejemplo, por defecto [no se puede simplemente eliminar tablas con un motor similar a MergeTree que contenga más de 50 Gb de datos](server-configuration-parameters/settings.md#max-table-size-to-drop). Sin embargo, estas salvaguardas no cubren todos los casos posibles y pueden eludirse.
-
-Para mitigar eficazmente los posibles errores humanos, debe preparar cuidadosamente una estrategia para realizar copias de seguridad y restaurar sus datos **previamente**.
-
-Cada empresa tiene diferentes recursos disponibles y requisitos comerciales, por lo que no existe una solución universal para las copias de seguridad y restauraciones de ClickHouse que se adapten a cada situación. Lo que funciona para un gigabyte de datos probablemente no funcionará para decenas de petabytes. Hay una variedad de posibles enfoques con sus propios pros y contras, que se discutirán a continuación. Es una buena idea utilizar varios enfoques en lugar de uno solo para compensar sus diversas deficiencias.
-
-!!! note "Nota"
-    Tenga en cuenta que si realizó una copia de seguridad de algo y nunca intentó restaurarlo, es probable que la restauración no funcione correctamente cuando realmente la necesite (o al menos tomará más tiempo de lo que las empresas pueden tolerar). Por lo tanto, cualquiera que sea el enfoque de copia de seguridad que elija, asegúrese de automatizar el proceso de restauración también y ponerlo en practica en un clúster de ClickHouse de repuesto regularmente.
-
-## Duplicar datos de origen en otro lugar {#duplicating-source-data-somewhere-else}
-
-A menudo, los datos que se ingieren en ClickHouse se entregan a través de algún tipo de cola persistente, como [Acerca de nosotros](https://kafka.apache.org). En este caso, es posible configurar un conjunto adicional de suscriptores que leerá el mismo flujo de datos mientras se escribe en ClickHouse y lo almacenará en almacenamiento en frío en algún lugar. La mayoría de las empresas ya tienen algún almacenamiento en frío recomendado por defecto, que podría ser un almacén de objetos o un sistema de archivos distribuido como [HDFS](https://hadoop.apache.org/docs/stable/hadoop-project-dist/hadoop-hdfs/HdfsDesign.html).
-
-## Instantáneas del sistema de archivos {#filesystem-snapshots}
-
-Algunos sistemas de archivos locales proporcionan funcionalidad de instantánea (por ejemplo, [ZFS](https://en.wikipedia.org/wiki/ZFS)), pero podrían no ser la mejor opción para servir consultas en vivo. Una posible solución es crear réplicas adicionales con este tipo de sistema de archivos y excluirlas del [Distribuido](../engines/table-engines/special/distributed.md) tablas que se utilizan para `SELECT` consulta. Las instantáneas en tales réplicas estarán fuera del alcance de cualquier consulta que modifique los datos. Como beneficio adicional, estas réplicas podrían tener configuraciones de hardware especiales con más discos conectados por servidor, lo que sería rentable.
-
-## Método de codificación de datos: {#clickhouse-copier}
-
-[Método de codificación de datos:](utilities/clickhouse-copier.md) es una herramienta versátil que se creó inicialmente para volver a dividir tablas de tamaño petabyte. También se puede usar con fines de copia de seguridad y restauración porque copia datos de forma fiable entre tablas y clústeres de ClickHouse.
-
-Para volúmenes de datos más pequeños, un simple `INSERT INTO ... SELECT ...` a tablas remotas podría funcionar también.
-
-## Manipulaciones con piezas {#manipulations-with-parts}
-
-ClickHouse permite usar la consulta `ALTER TABLE ... FREEZE PARTITION ...` para crear una copia local de particiones de tabla. Esto se implementa utilizando enlaces duros a la carpeta `/var/lib/clickhouse/shadow/`, por lo que generalmente no consume espacio adicional en disco para datos antiguos. Las copias creadas de archivos no son manejadas por el servidor ClickHouse, por lo que puede dejarlas allí: tendrá una copia de seguridad simple que no requiere ningún sistema externo adicional, pero seguirá siendo propenso a problemas de hardware. Por esta razón, es mejor copiarlos de forma remota en otra ubicación y luego eliminar las copias locales. Los sistemas de archivos distribuidos y los almacenes de objetos siguen siendo una buena opción para esto, pero los servidores de archivos conectados normales con una capacidad lo suficientemente grande podrían funcionar también (en este caso, la transferencia ocurrirá a través del sistema de archivos de red o tal vez [rsync](https://en.wikipedia.org/wiki/Rsync)).
-
-Para obtener más información sobre las consultas relacionadas con las manipulaciones de particiones, consulte [Documentación de ALTER](../sql-reference/statements/alter.md#alter_manipulations-with-partitions).
-
-Una herramienta de terceros está disponible para automatizar este enfoque: [Haga clic en el botón de copia de seguridad](https://github.com/AlexAkulov/clickhouse-backup).
-
-[Artículo Original](https://clickhouse.tech/docs/en/operations/backup/) <!--hide-->
diff --git a/docs/es/operations/configuration-files.md b/docs/es/operations/configuration-files.md
deleted file mode 100644
index d9aa8567868..00000000000
--- a/docs/es/operations/configuration-files.md
+++ /dev/null
@@ -1,57 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 50
-toc_title: "Archivos de configuraci\xF3n"
----
-
-# Archivos de configuración {#configuration_files}
-
-ClickHouse admite la administración de configuración de varios archivos. El archivo de configuración del servidor principal es `/etc/clickhouse-server/config.xml`. Otros archivos deben estar en el `/etc/clickhouse-server/config.d` directorio.
-
-!!! note "Nota"
-    Todos los archivos de configuración deben estar en formato XML. Además, deben tener el mismo elemento raíz, generalmente `<yandex>`.
-
-Algunos valores especificados en el archivo de configuración principal se pueden anular en otros archivos de configuración. El `replace` o `remove` se pueden especificar atributos para los elementos de estos archivos de configuración.
-
-Si no se especifica ninguno, combina el contenido de los elementos de forma recursiva, reemplazando los valores de los elementos secundarios duplicados.
-
-Si `replace` se especifica, reemplaza todo el elemento por el especificado.
-
-Si `remove` se especifica, elimina el elemento.
-
-La configuración también puede definir “substitutions”. Si un elemento tiene el `incl` atributo, la sustitución correspondiente del archivo se utilizará como el valor. De forma predeterminada, la ruta al archivo con sustituciones es `/etc/metrika.xml`. Esto se puede cambiar en el [include_from](server-configuration-parameters/settings.md#server_configuration_parameters-include_from) elemento en la configuración del servidor. Los valores de sustitución se especifican en `/yandex/substitution_name` elementos en este archivo. Si una sustitución especificada en `incl` no existe, se registra en el registro. Para evitar que ClickHouse registre las sustituciones que faltan, especifique `optional="true"` atributo (por ejemplo, ajustes para [macro](server-configuration-parameters/settings.md)).
-
-Las sustituciones también se pueden realizar desde ZooKeeper. Para hacer esto, especifique el atributo `from_zk = "/path/to/node"`. El valor del elemento se sustituye por el contenido del nodo en `/path/to/node` en ZooKeeper. También puede colocar un subárbol XML completo en el nodo ZooKeeper y se insertará completamente en el elemento de origen.
-
-El `config.xml` file puede especificar una configuración separada con configuraciones de usuario, perfiles y cuotas. La ruta relativa a esta configuración se establece en el `users_config` elemento. Por defecto, es `users.xml`. Si `users_config` se omite, la configuración de usuario, los perfiles y las cuotas se especifican directamente en `config.xml`.
-
-La configuración de los usuarios se puede dividir en archivos separados similares a `config.xml` y `config.d/`.
-El nombre del directorio se define como `users_config` sin `.xml` postfix concatenado con `.d`.
-Directorio `users.d` se utiliza por defecto, como `users_config` por defecto `users.xml`.
-Por ejemplo, puede tener un archivo de configuración separado para cada usuario como este:
-
-``` bash
-$ cat /etc/clickhouse-server/users.d/alice.xml
-```
-
-``` xml
-<yandex>
-    <users>
-      <alice>
-          <profile>analytics</profile>
-            <networks>
-                  <ip>::/0</ip>
-            </networks>
-          <password_sha256_hex>...</password_sha256_hex>
-          <quota>analytics</quota>
-      </alice>
-    </users>
-</yandex>
-```
-
-Para cada archivo de configuración, el servidor también genera `file-preprocessed.xml` archivos al iniciar. Estos archivos contienen todas las sustituciones y anulaciones completadas, y están destinados para uso informativo. Si se utilizaron sustituciones de ZooKeeper en los archivos de configuración pero ZooKeeper no está disponible en el inicio del servidor, el servidor carga la configuración desde el archivo preprocesado.
-
-El servidor realiza un seguimiento de los cambios en los archivos de configuración, así como archivos y nodos ZooKeeper que se utilizaron al realizar sustituciones y anulaciones, y vuelve a cargar la configuración de los usuarios y clústeres sobre la marcha. Esto significa que puede modificar el clúster, los usuarios y su configuración sin reiniciar el servidor.
-
-[Artículo Original](https://clickhouse.tech/docs/en/operations/configuration_files/) <!--hide-->
diff --git a/docs/es/operations/index.md b/docs/es/operations/index.md
deleted file mode 100644
index 9a928fa0f01..00000000000
--- a/docs/es/operations/index.md
+++ /dev/null
@@ -1,28 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: "Operaci\xF3n"
-toc_priority: 41
-toc_title: "Implantaci\xF3n"
----
-
-# Operación {#operations}
-
-El manual de operaciones de ClickHouse consta de las siguientes secciones principales:
-
--   [Requisito](requirements.md)
--   [Monitoreo](monitoring.md)
--   [Solución de problemas](troubleshooting.md)
--   [Recomendaciones de uso](tips.md)
--   [Procedimiento de actualización](update.md)
--   [Derechos de acceso](access-rights.md)
--   [Copia de seguridad de datos](backup.md)
--   [Archivos de configuración](configuration-files.md)
--   [Cuota](quotas.md)
--   [Tablas del sistema](system-tables.md)
--   [Parámetros de configuración del servidor](server-configuration-parameters/index.md)
--   [Cómo probar su hardware con ClickHouse](performance-test.md)
--   [Configuración](settings/index.md)
--   [Utilidad](utilities/index.md)
-
-{## [Artículo Original](https://clickhouse.tech/docs/en/operations/) ##}
diff --git a/docs/es/operations/monitoring.md b/docs/es/operations/monitoring.md
deleted file mode 100644
index 19912d23f3b..00000000000
--- a/docs/es/operations/monitoring.md
+++ /dev/null
@@ -1,46 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 45
-toc_title: Monitoreo
----
-
-# Monitoreo {#monitoring}
-
-Usted puede monitorear:
-
--   Utilización de recursos de hardware.
--   Métricas del servidor ClickHouse.
-
-## Utilización de recursos {#resource-utilization}
-
-ClickHouse no supervisa el estado de los recursos de hardware por sí mismo.
-
-Se recomienda encarecidamente configurar la supervisión para:
-
--   Carga y temperatura en los procesadores.
-
-    Usted puede utilizar [dmesg](https://en.wikipedia.org/wiki/Dmesg), [Turbostat](https://www.linux.org/docs/man8/turbostat.html) u otros instrumentos.
-
--   Utilización del sistema de almacenamiento, RAM y red.
-
-## Métricas del servidor ClickHouse {#clickhouse-server-metrics}
-
-El servidor ClickHouse tiene instrumentos integrados para el monitoreo de estado propio.
-
-Para realizar un seguimiento de los eventos del servidor, use los registros del servidor. Ver el [registrador](server-configuration-parameters/settings.md#server_configuration_parameters-logger) sección del archivo de configuración.
-
-ClickHouse recoge:
-
--   Diferentes métricas de cómo el servidor utiliza recursos computacionales.
--   Estadísticas comunes sobre el procesamiento de consultas.
-
-Puede encontrar métricas en el [sistema.métricas](../operations/system-tables.md#system_tables-metrics), [sistema.evento](../operations/system-tables.md#system_tables-events), y [sistema.asynchronous_metrics](../operations/system-tables.md#system_tables-asynchronous_metrics) tabla.
-
-Puede configurar ClickHouse para exportar métricas a [Grafito](https://github.com/graphite-project). Ver el [Sección de grafito](server-configuration-parameters/settings.md#server_configuration_parameters-graphite) en el archivo de configuración del servidor ClickHouse. Antes de configurar la exportación de métricas, debe configurar Graphite siguiendo sus [guiar](https://graphite.readthedocs.io/en/latest/install.html).
-
-Puede configurar ClickHouse para exportar métricas a [Prometeo](https://prometheus.io). Ver el [Sección Prometheus](server-configuration-parameters/settings.md#server_configuration_parameters-prometheus) en el archivo de configuración del servidor ClickHouse. Antes de configurar la exportación de métricas, debe configurar Prometheus siguiendo su oficial [guiar](https://prometheus.io/docs/prometheus/latest/installation/).
-
-Además, puede supervisar la disponibilidad del servidor a través de la API HTTP. Enviar el `HTTP GET` solicitud de `/ping`. Si el servidor está disponible, responde con `200 OK`.
-
-Para supervisar servidores en una configuración de clúster, debe establecer [max_replica_delay_for_distributed_queries](settings/settings.md#settings-max_replica_delay_for_distributed_queries) parámetro y utilizar el recurso HTTP `/replicas_status`. Una solicitud para `/replicas_status` devoluciones `200 OK` si la réplica está disponible y no se retrasa detrás de las otras réplicas. Si una réplica se retrasa, devuelve `503 HTTP_SERVICE_UNAVAILABLE` con información sobre la brecha.
diff --git a/docs/es/operations/optimizing-performance/index.md b/docs/es/operations/optimizing-performance/index.md
deleted file mode 100644
index d2796c6e0d3..00000000000
--- a/docs/es/operations/optimizing-performance/index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: "Optimizaci\xF3n del rendimiento"
-toc_priority: 52
----
-
-
diff --git a/docs/es/operations/optimizing-performance/sampling-query-profiler.md b/docs/es/operations/optimizing-performance/sampling-query-profiler.md
deleted file mode 100644
index a474dde6af2..00000000000
--- a/docs/es/operations/optimizing-performance/sampling-query-profiler.md
+++ /dev/null
@@ -1,64 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 54
-toc_title: "Generaci\xF3n de perfiles de consultas"
----
-
-# Analizador de consultas de muestreo {#sampling-query-profiler}
-
-ClickHouse ejecuta el generador de perfiles de muestreo que permite analizar la ejecución de consultas. Utilizando el generador de perfiles puede encontrar rutinas de código fuente que se utilizan con más frecuencia durante la ejecución de la consulta. Puede rastrear el tiempo de CPU y el tiempo de reloj de pared invertido, incluido el tiempo de inactividad.
-
-Para usar el generador de perfiles:
-
--   Configurar el [trace_log](../server-configuration-parameters/settings.md#server_configuration_parameters-trace_log) sección de la configuración del servidor.
-
-    Esta sección configura la [trace_log](../../operations/system-tables.md#system_tables-trace_log) tabla del sistema que contiene los resultados del funcionamiento del generador de perfiles. Está configurado de forma predeterminada. Recuerde que los datos de esta tabla solo son válidos para un servidor en ejecución. Después de reiniciar el servidor, ClickHouse no limpia la tabla y toda la dirección de memoria virtual almacenada puede dejar de ser válida.
-
--   Configurar el [Los resultados de la prueba](../settings/settings.md#query_profiler_cpu_time_period_ns) o [query_profiler_real_time_period_ns](../settings/settings.md#query_profiler_real_time_period_ns) configuración. Ambos ajustes se pueden utilizar simultáneamente.
-
-    Estas opciones le permiten configurar temporizadores del generador de perfiles. Como estos son los ajustes de sesión, puede obtener diferentes frecuencias de muestreo para todo el servidor, usuarios individuales o perfiles de usuario, para su sesión interactiva y para cada consulta individual.
-
-La frecuencia de muestreo predeterminada es una muestra por segundo y tanto la CPU como los temporizadores reales están habilitados. Esta frecuencia permite recopilar suficiente información sobre el clúster ClickHouse. Al mismo tiempo, al trabajar con esta frecuencia, el generador de perfiles no afecta el rendimiento del servidor ClickHouse. Si necesita perfilar cada consulta individual, intente usar una mayor frecuencia de muestreo.
-
-Para analizar el `trace_log` tabla del sistema:
-
--   Instale el `clickhouse-common-static-dbg` paquete. Ver [Instalar desde paquetes DEB](../../getting-started/install.md#install-from-deb-packages).
-
--   Permitir funciones de introspección [allow_introspection_functions](../settings/settings.md#settings-allow_introspection_functions) configuración.
-
-    Por razones de seguridad, las funciones de introspección están deshabilitadas de forma predeterminada.
-
--   Utilice el `addressToLine`, `addressToSymbol` y `demangle` [funciones de la introspección](../../sql-reference/functions/introspection.md) para obtener nombres de funciones y sus posiciones en el código ClickHouse. Para obtener un perfil para alguna consulta, debe agregar datos del `trace_log` tabla. Puede agregar datos por funciones individuales o por los seguimientos de pila completos.
-
-Si necesita visualizar `trace_log` información, intente [Flamegraph](../../interfaces/third-party/gui/#clickhouse-flamegraph) y [Nivel de Cifrado WEP](https://github.com/laplab/clickhouse-speedscope).
-
-## Ejemplo {#example}
-
-En este ejemplo nos:
-
--   Filtrado `trace_log` datos por un identificador de consulta y la fecha actual.
-
--   Agregando por seguimiento de pila.
-
--   Usando funciones de introspección, obtendremos un informe de:
-
-    -   Nombres de símbolos y funciones de código fuente correspondientes.
-    -   Ubicaciones del código fuente de estas funciones.
-
-<!-- -->
-
-``` sql
-SELECT
-    count(),
-    arrayStringConcat(arrayMap(x -> concat(demangle(addressToSymbol(x)), '\n    ', addressToLine(x)), trace), '\n') AS sym
-FROM system.trace_log
-WHERE (query_id = 'ebca3574-ad0a-400a-9cbc-dca382f5998c') AND (event_date = today())
-GROUP BY trace
-ORDER BY count() DESC
-LIMIT 10
-```
-
-``` text
-{% include "examples/sampling_query_profiler_result.txt" %}
-```
diff --git a/docs/es/operations/performance-test.md b/docs/es/operations/performance-test.md
deleted file mode 100644
index 97444f339cd..00000000000
--- a/docs/es/operations/performance-test.md
+++ /dev/null
@@ -1,82 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 54
-toc_title: Prueba de hardware
----
-
-# Cómo probar su hardware con ClickHouse {#how-to-test-your-hardware-with-clickhouse}
-
-Con esta instrucción, puede ejecutar una prueba de rendimiento básica de ClickHouse en cualquier servidor sin instalar paquetes de ClickHouse.
-
-1.  Ir a “commits” página: https://github.com/ClickHouse/ClickHouse/commits/master
-
-2.  Haga clic en la primera marca de verificación verde o cruz roja con verde “ClickHouse Build Check” y haga clic en el “Details” enlace cerca “ClickHouse Build Check”. No existe tal enlace en algunas confirmaciones, por ejemplo, confirmaciones con documentación. En este caso, elija la confirmación más cercana que tenga este enlace.
-
-3.  Copie el enlace a “clickhouse” binario para amd64 o aarch64.
-
-4.  ssh al servidor y descargarlo con wget:
-
-<!-- -->
-
-      # For amd64:
-      wget https://clickhouse-builds.s3.yandex.net/0/00ba767f5d2a929394ea3be193b1f79074a1c4bc/1578163263_binary/clickhouse
-      # For aarch64:
-      wget https://clickhouse-builds.s3.yandex.net/0/00ba767f5d2a929394ea3be193b1f79074a1c4bc/1578161264_binary/clickhouse
-      # Then do:
-      chmod a+x clickhouse
-
-1.  Descargar configs:
-
-<!-- -->
-
-      wget https://raw.githubusercontent.com/ClickHouse/ClickHouse/master/programs/server/config.xml
-      wget https://raw.githubusercontent.com/ClickHouse/ClickHouse/master/programs/server/users.xml
-      mkdir config.d
-      wget https://raw.githubusercontent.com/ClickHouse/ClickHouse/master/programs/server/config.d/path.xml -O config.d/path.xml
-      wget https://raw.githubusercontent.com/ClickHouse/ClickHouse/master/programs/server/config.d/log_to_console.xml -O config.d/log_to_console.xml
-
-1.  Descargar archivos de referencia:
-
-<!-- -->
-
-      wget https://raw.githubusercontent.com/ClickHouse/ClickHouse/master/benchmark/clickhouse/benchmark-new.sh
-      chmod a+x benchmark-new.sh
-      wget https://raw.githubusercontent.com/ClickHouse/ClickHouse/master/benchmark/clickhouse/queries.sql
-
-1.  Descargue los datos de prueba de acuerdo con el [El Yandex.Conjunto de datos de Metrica](../getting-started/example-datasets/metrica.md) instrucción (“hits” tabla que contiene 100 millones de filas).
-
-<!-- -->
-
-      wget https://datasets.clickhouse.tech/hits/partitions/hits_100m_obfuscated_v1.tar.xz
-      tar xvf hits_100m_obfuscated_v1.tar.xz -C .
-      mv hits_100m_obfuscated_v1/* .
-
-1.  Ejecute el servidor:
-
-<!-- -->
-
-      ./clickhouse server
-
-1.  Verifique los datos: ssh al servidor en otro terminal
-
-<!-- -->
-
-      ./clickhouse client --query "SELECT count() FROM hits_100m_obfuscated"
-      100000000
-
-1.  Edite el benchmark-new.sh, cambie `clickhouse-client` a `./clickhouse client` y añadir `–-max_memory_usage 100000000000` parámetro.
-
-<!-- -->
-
-      mcedit benchmark-new.sh
-
-1.  Ejecute el punto de referencia:
-
-<!-- -->
-
-      ./benchmark-new.sh hits_100m_obfuscated
-
-1.  Envíe los números y la información sobre la configuración de su hardware a clickhouse-feedback@yandex-team.com
-
-Todos los resultados se publican aquí: https://clickhouse.tecnología/punto de referencia/hardware/
diff --git a/docs/es/operations/quotas.md b/docs/es/operations/quotas.md
deleted file mode 100644
index 9d84ce21339..00000000000
--- a/docs/es/operations/quotas.md
+++ /dev/null
@@ -1,112 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 51
-toc_title: Cuota
----
-
-# Cuota {#quotas}
-
-Las cuotas le permiten limitar el uso de recursos durante un período de tiempo o realizar un seguimiento del uso de recursos.
-Las cuotas se configuran en la configuración del usuario, que generalmente ‘users.xml’.
-
-El sistema también tiene una característica para limitar la complejidad de una sola consulta. Vea la sección “Restrictions on query complexity”).
-
-A diferencia de las restricciones de complejidad de consultas, las cuotas:
-
--   Coloque restricciones en un conjunto de consultas que se pueden ejecutar durante un período de tiempo, en lugar de limitar una sola consulta.
--   Tenga en cuenta los recursos gastados en todos los servidores remotos para el procesamiento de consultas distribuidas.
-
-Veamos la sección del ‘users.xml’ fichero que define las cuotas.
-
-``` xml
-<!-- Quotas -->
-<quotas>
-    <!-- Quota name. -->
-    <default>
-        <!-- Restrictions for a time period. You can set many intervals with different restrictions. -->
-        <interval>
-            <!-- Length of the interval. -->
-            <duration>3600</duration>
-
-            <!-- Unlimited. Just collect data for the specified time interval. -->
-            <queries>0</queries>
-            <errors>0</errors>
-            <result_rows>0</result_rows>
-            <read_rows>0</read_rows>
-            <execution_time>0</execution_time>
-        </interval>
-    </default>
-```
-
-De forma predeterminada, la cuota realiza un seguimiento del consumo de recursos para cada hora, sin limitar el uso.
-El consumo de recursos calculado para cada intervalo se envía al registro del servidor después de cada solicitud.
-
-``` xml
-<statbox>
-    <!-- Restrictions for a time period. You can set many intervals with different restrictions. -->
-    <interval>
-        <!-- Length of the interval. -->
-        <duration>3600</duration>
-
-        <queries>1000</queries>
-        <errors>100</errors>
-        <result_rows>1000000000</result_rows>
-        <read_rows>100000000000</read_rows>
-        <execution_time>900</execution_time>
-    </interval>
-
-    <interval>
-        <duration>86400</duration>
-
-        <queries>10000</queries>
-        <errors>1000</errors>
-        <result_rows>5000000000</result_rows>
-        <read_rows>500000000000</read_rows>
-        <execution_time>7200</execution_time>
-    </interval>
-</statbox>
-```
-
-Para el ‘statbox’ Las restricciones se establecen por cada hora y por cada 24 horas (86.400 segundos). El intervalo de tiempo se cuenta, a partir de un momento fijo definido por la implementación en el tiempo. En otras palabras, el intervalo de 24 horas no necesariamente comienza a medianoche.
-
-Cuando finaliza el intervalo, se borran todos los valores recopilados. Para la siguiente hora, el cálculo de la cuota comienza de nuevo.
-
-Estas son las cantidades que se pueden restringir:
-
-`queries` – The total number of requests.
-
-`errors` – The number of queries that threw an exception.
-
-`result_rows` – The total number of rows given as a result.
-
-`read_rows` – The total number of source rows read from tables for running the query on all remote servers.
-
-`execution_time` – The total query execution time, in seconds (wall time).
-
-Si se excede el límite durante al menos un intervalo de tiempo, se lanza una excepción con un texto sobre qué restricción se excedió, para qué intervalo y cuándo comienza el nuevo intervalo (cuando se pueden enviar consultas nuevamente).
-
-Las cuotas pueden usar el “quota key” característica para informar sobre los recursos para múltiples claves de forma independiente. Aquí hay un ejemplo de esto:
-
-``` xml
-<!-- For the global reports designer. -->
-<web_global>
-    <!-- keyed – The quota_key "key" is passed in the query parameter,
-            and the quota is tracked separately for each key value.
-        For example, you can pass a Yandex.Metrica username as the key,
-            so the quota will be counted separately for each username.
-        Using keys makes sense only if quota_key is transmitted by the program, not by a user.
-
-        You can also write <keyed_by_ip />, so the IP address is used as the quota key.
-        (But keep in mind that users can change the IPv6 address fairly easily.)
-    -->
-    <keyed />
-```
-
-La cuota se asigna a los usuarios ‘users’ sección de la configuración. Vea la sección “Access rights”.
-
-Para el procesamiento de consultas distribuidas, los importes acumulados se almacenan en el servidor del solicitante. Entonces, si el usuario va a otro servidor, la cuota allí “start over”.
-
-Cuando se reinicia el servidor, las cuotas se restablecen.
-
-[Artículo Original](https://clickhouse.tech/docs/en/operations/quotas/) <!--hide-->
diff --git a/docs/es/operations/requirements.md b/docs/es/operations/requirements.md
deleted file mode 100644
index d6f0f25cf21..00000000000
--- a/docs/es/operations/requirements.md
+++ /dev/null
@@ -1,61 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 44
-toc_title: Requisito
----
-
-# Requisito {#requirements}
-
-## CPU {#cpu}
-
-Para la instalación desde paquetes deb precompilados, utilice una CPU con arquitectura x86_64 y soporte para las instrucciones de SSE 4.2. Para ejecutar ClickHouse con procesadores que no admiten SSE 4.2 o tienen arquitectura AArch64 o PowerPC64LE, debe compilar ClickHouse a partir de fuentes.
-
-ClickHouse implementa el procesamiento de datos paralelo y utiliza todos los recursos de hardware disponibles. Al elegir un procesador, tenga en cuenta que ClickHouse funciona de manera más eficiente en configuraciones con un gran número de núcleos pero con una velocidad de reloj más baja que en configuraciones con menos núcleos y una velocidad de reloj más alta. Por ejemplo, 16 núcleos con 2600 MHz es preferible a 8 núcleos con 3600 MHz.
-
-Se recomienda usar **Impulso de Turbo** y **hiper-threading** tecnología. Mejora significativamente el rendimiento con una carga de trabajo típica.
-
-## RAM {#ram}
-
-Recomendamos utilizar un mínimo de 4 GB de RAM para realizar consultas no triviales. El servidor ClickHouse puede ejecutarse con una cantidad mucho menor de RAM, pero requiere memoria para procesar consultas.
-
-El volumen requerido de RAM depende de:
-
--   La complejidad de las consultas.
--   La cantidad de datos que se procesan en las consultas.
-
-Para calcular el volumen requerido de RAM, debe estimar el tamaño de los datos temporales para [GROUP BY](../sql-reference/statements/select/group-by.md#select-group-by-clause), [DISTINCT](../sql-reference/statements/select/distinct.md#select-distinct), [JOIN](../sql-reference/statements/select/join.md#select-join) y otras operaciones que utilice.
-
-ClickHouse puede usar memoria externa para datos temporales. Ver [GROUP BY en memoria externa](../sql-reference/statements/select/group-by.md#select-group-by-in-external-memory) para más detalles.
-
-## Archivo de intercambio {#swap-file}
-
-Deshabilite el archivo de intercambio para entornos de producción.
-
-## Subsistema de almacenamiento {#storage-subsystem}
-
-Necesita tener 2 GB de espacio libre en disco para instalar ClickHouse.
-
-El volumen de almacenamiento requerido para sus datos debe calcularse por separado. La evaluación debe incluir:
-
--   Estimación del volumen de datos.
-
-    Puede tomar una muestra de los datos y obtener el tamaño promedio de una fila de ella. Luego multiplique el valor por el número de filas que planea almacenar.
-
--   El coeficiente de compresión de datos.
-
-    Para estimar el coeficiente de compresión de datos, cargue una muestra de sus datos en ClickHouse y compare el tamaño real de los datos con el tamaño de la tabla almacenada. Por ejemplo, los datos de clickstream generalmente se comprimen de 6 a 10 veces.
-
-Para calcular el volumen final de datos que se almacenarán, aplique el coeficiente de compresión al volumen de datos estimado. Si planea almacenar datos en varias réplicas, multiplique el volumen estimado por el número de réplicas.
-
-## Red {#network}
-
-Si es posible, use redes de 10G o clase superior.
-
-El ancho de banda de la red es fundamental para procesar consultas distribuidas con una gran cantidad de datos intermedios. Además, la velocidad de la red afecta a los procesos de replicación.
-
-## Software {#software}
-
-ClickHouse está desarrollado principalmente para la familia de sistemas operativos Linux. La distribución de Linux recomendada es Ubuntu. El `tzdata` paquete debe ser instalado en el sistema.
-
-ClickHouse también puede funcionar en otras familias de sistemas operativos. Ver detalles en el [Primeros pasos](../getting-started/index.md) sección de la documentación.
diff --git a/docs/es/operations/server-configuration-parameters/index.md b/docs/es/operations/server-configuration-parameters/index.md
deleted file mode 100644
index e1e2e777b94..00000000000
--- a/docs/es/operations/server-configuration-parameters/index.md
+++ /dev/null
@@ -1,19 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: "Par\xE1metros de configuraci\xF3n del servidor"
-toc_priority: 54
-toc_title: "Implantaci\xF3n"
----
-
-# Parámetros de configuración del servidor {#server-settings}
-
-Esta sección contiene descripciones de la configuración del servidor que no se puede cambiar en el nivel de sesión o consulta.
-
-Estos ajustes se almacenan en el `config.xml` archivo en el servidor ClickHouse.
-
-Otros ajustes se describen en el “[Configuración](../settings/index.md#session-settings-intro)” apartado.
-
-Antes de estudiar la configuración, lea el [Archivos de configuración](../configuration-files.md#configuration_files) sección y tomar nota del uso de sustituciones (el `incl` y `optional` atributo).
-
-[Artículo Original](https://clickhouse.tech/docs/en/operations/server_configuration_parameters/) <!--hide-->
diff --git a/docs/es/operations/server-configuration-parameters/settings.md b/docs/es/operations/server-configuration-parameters/settings.md
deleted file mode 100644
index 86264ed0440..00000000000
--- a/docs/es/operations/server-configuration-parameters/settings.md
+++ /dev/null
@@ -1,906 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 57
-toc_title: "Configuraci\xF3n del servidor"
----
-
-# Configuración del servidor {#server-settings}
-
-## builtin_dictionaries_reload_interval {#builtin-dictionaries-reload-interval}
-
-El intervalo en segundos antes de volver a cargar los diccionarios integrados.
-
-ClickHouse recarga los diccionarios incorporados cada x segundos. Esto hace posible editar diccionarios “on the fly” sin reiniciar el servidor.
-
-Valor predeterminado: 3600.
-
-**Ejemplo**
-
-``` xml
-<builtin_dictionaries_reload_interval>3600</builtin_dictionaries_reload_interval>
-```
-
-## compresión {#server-settings-compression}
-
-Ajustes de compresión de datos para [Método de codificación de datos:](../../engines/table-engines/mergetree-family/mergetree.md)-mesas de motor.
-
-!!! warning "Advertencia"
-    No lo use si acaba de comenzar a usar ClickHouse.
-
-Plantilla de configuración:
-
-``` xml
-<compression>
-    <case>
-      <min_part_size>...</min_part_size>
-      <min_part_size_ratio>...</min_part_size_ratio>
-      <method>...</method>
-    </case>
-    ...
-</compression>
-```
-
-`<case>` campo:
-
--   `min_part_size` – The minimum size of a data part.
--   `min_part_size_ratio` – The ratio of the data part size to the table size.
--   `method` – Compression method. Acceptable values: `lz4` o `zstd`.
-
-Puede configurar múltiples `<case>` apartado.
-
-Acciones cuando se cumplen las condiciones:
-
--   Si un elemento de datos coincide con un conjunto de condiciones, ClickHouse utiliza el método de compresión especificado.
--   Si un elemento de datos coincide con varios conjuntos de condiciones, ClickHouse utiliza el primer conjunto de condiciones coincidente.
-
-Si no se cumplen condiciones para un elemento de datos, ClickHouse utiliza el `lz4` compresión.
-
-**Ejemplo**
-
-``` xml
-<compression incl="clickhouse_compression">
-    <case>
-        <min_part_size>10000000000</min_part_size>
-        <min_part_size_ratio>0.01</min_part_size_ratio>
-        <method>zstd</method>
-    </case>
-</compression>
-```
-
-## default_database {#default-database}
-
-La base de datos predeterminada.
-
-Para obtener una lista de bases de datos, [SHOW DATABASES](../../sql-reference/statements/show.md#show-databases) consulta.
-
-**Ejemplo**
-
-``` xml
-<default_database>default</default_database>
-```
-
-## default_profile {#default-profile}
-
-Perfil de configuración predeterminado.
-
-Los perfiles de configuración se encuentran en el archivo especificado en el parámetro `user_config`.
-
-**Ejemplo**
-
-``` xml
-<default_profile>default</default_profile>
-```
-
-## Diccionarios_config {#server_configuration_parameters-dictionaries_config}
-
-La ruta de acceso al archivo de configuración para diccionarios externos.
-
-Camino:
-
--   Especifique la ruta absoluta o la ruta relativa al archivo de configuración del servidor.
--   La ruta puede contener comodines \* y ?.
-
-Ver también “[Diccionarios externos](../../sql-reference/dictionaries/external-dictionaries/external-dicts.md)”.
-
-**Ejemplo**
-
-``` xml
-<dictionaries_config>*_dictionary.xml</dictionaries_config>
-```
-
-## Diccionarios_lazy_load {#server_configuration_parameters-dictionaries_lazy_load}
-
-La carga perezosa de los diccionarios.
-
-Si `true`, entonces cada diccionario es creado en el primer uso. Si se produce un error en la creación del diccionario, la función que estaba utilizando el diccionario produce una excepción.
-
-Si `false`, todos los diccionarios se crean cuando se inicia el servidor, y si hay un error, el servidor se apaga.
-
-El valor predeterminado es `true`.
-
-**Ejemplo**
-
-``` xml
-<dictionaries_lazy_load>true</dictionaries_lazy_load>
-```
-
-## format_schema_path {#server_configuration_parameters-format_schema_path}
-
-La ruta de acceso al directorio con los esquemas para los datos de entrada, como los esquemas [CapnProto](../../interfaces/formats.md#capnproto) formato.
-
-**Ejemplo**
-
-``` xml
-  <!-- Directory containing schema files for various input formats. -->
-  <format_schema_path>format_schemas/</format_schema_path>
-```
-
-## grafito {#server_configuration_parameters-graphite}
-
-Envío de datos a [Grafito](https://github.com/graphite-project).
-
-Configuración:
-
--   host – The Graphite server.
--   port – The port on the Graphite server.
--   interval – The interval for sending, in seconds.
--   timeout – The timeout for sending data, in seconds.
--   root_path – Prefix for keys.
--   metrics – Sending data from the [sistema.métricas](../../operations/system-tables.md#system_tables-metrics) tabla.
--   events – Sending deltas data accumulated for the time period from the [sistema.evento](../../operations/system-tables.md#system_tables-events) tabla.
--   events_cumulative – Sending cumulative data from the [sistema.evento](../../operations/system-tables.md#system_tables-events) tabla.
--   asynchronous_metrics – Sending data from the [sistema.asynchronous_metrics](../../operations/system-tables.md#system_tables-asynchronous_metrics) tabla.
-
-Puede configurar múltiples `<graphite>` clausula. Por ejemplo, puede usar esto para enviar datos diferentes a intervalos diferentes.
-
-**Ejemplo**
-
-``` xml
-<graphite>
-    <host>localhost</host>
-    <port>42000</port>
-    <timeout>0.1</timeout>
-    <interval>60</interval>
-    <root_path>one_min</root_path>
-    <metrics>true</metrics>
-    <events>true</events>
-    <events_cumulative>false</events_cumulative>
-    <asynchronous_metrics>true</asynchronous_metrics>
-</graphite>
-```
-
-## graphite_rollup {#server_configuration_parameters-graphite-rollup}
-
-Ajustes para reducir los datos de grafito.
-
-Para obtener más información, consulte [GraphiteMergeTree](../../engines/table-engines/mergetree-family/graphitemergetree.md).
-
-**Ejemplo**
-
-``` xml
-<graphite_rollup_example>
-    <default>
-        <function>max</function>
-        <retention>
-            <age>0</age>
-            <precision>60</precision>
-        </retention>
-        <retention>
-            <age>3600</age>
-            <precision>300</precision>
-        </retention>
-        <retention>
-            <age>86400</age>
-            <precision>3600</precision>
-        </retention>
-    </default>
-</graphite_rollup_example>
-```
-
-## http_port/https_port {#http-porthttps-port}
-
-El puerto para conectarse al servidor a través de HTTP(s).
-
-Si `https_port` se especifica, [openSSL](#server_configuration_parameters-openssl) debe ser configurado.
-
-Si `http_port` se especifica, la configuración de OpenSSL se ignora incluso si está establecida.
-
-**Ejemplo**
-
-``` xml
-<https_port>9999</https_port>
-```
-
-## http_server_default_response {#server_configuration_parameters-http_server_default_response}
-
-La página que se muestra de forma predeterminada al acceder al servidor HTTP de ClickHouse.
-El valor predeterminado es “Ok.” (con un avance de línea al final)
-
-**Ejemplo**
-
-Abrir `https://tabix.io/` al acceder `http://localhost: http_port`.
-
-``` xml
-<http_server_default_response>
-  <![CDATA[<html ng-app="SMI2"><head><base href="http://ui.tabix.io/"></head><body><div ui-view="" class="content-ui"></div><script src="http://loader.tabix.io/master.js"></script></body></html>]]>
-</http_server_default_response>
-```
-
-## include_from {#server_configuration_parameters-include_from}
-
-La ruta al archivo con sustituciones.
-
-Para obtener más información, consulte la sección “[Archivos de configuración](../configuration-files.md#configuration_files)”.
-
-**Ejemplo**
-
-``` xml
-<include_from>/etc/metrica.xml</include_from>
-```
-
-## Interesante {#interserver-http-port}
-
-Puerto para el intercambio de datos entre servidores ClickHouse.
-
-**Ejemplo**
-
-``` xml
-<interserver_http_port>9009</interserver_http_port>
-```
-
-## Sistema abierto {#interserver-http-host}
-
-El nombre de host que pueden utilizar otros servidores para acceder a este servidor.
-
-Si se omite, se define de la misma manera que el `hostname-f` comando.
-
-Útil para separarse de una interfaz de red específica.
-
-**Ejemplo**
-
-``` xml
-<interserver_http_host>example.yandex.ru</interserver_http_host>
-```
-
-## interserver_http_credentials {#server-settings-interserver-http-credentials}
-
-El nombre de usuario y la contraseña utilizados para [replicación](../../engines/table-engines/mergetree-family/replication.md) con los motores Replicated\*. Estas credenciales sólo se utilizan para la comunicación entre réplicas y no están relacionadas con las credenciales de los clientes de ClickHouse. El servidor está comprobando estas credenciales para conectar réplicas y utiliza las mismas credenciales cuando se conecta a otras réplicas. Por lo tanto, estas credenciales deben establecerse igual para todas las réplicas de un clúster.
-De forma predeterminada, la autenticación no se utiliza.
-
-Esta sección contiene los siguientes parámetros:
-
--   `user` — username.
--   `password` — password.
-
-**Ejemplo**
-
-``` xml
-<interserver_http_credentials>
-    <user>admin</user>
-    <password>222</password>
-</interserver_http_credentials>
-```
-
-## keep_alive_timeout {#keep-alive-timeout}
-
-El número de segundos que ClickHouse espera las solicitudes entrantes antes de cerrar la conexión. El valor predeterminado es de 3 segundos.
-
-**Ejemplo**
-
-``` xml
-<keep_alive_timeout>3</keep_alive_timeout>
-```
-
-## listen_host {#server_configuration_parameters-listen_host}
-
-Restricción en hosts de los que pueden provenir las solicitudes. Si desea que el servidor responda a todos ellos, especifique `::`.
-
-Ejemplos:
-
-``` xml
-<listen_host>::1</listen_host>
-<listen_host>127.0.0.1</listen_host>
-```
-
-## registrador {#server_configuration_parameters-logger}
-
-Configuración de registro.
-
-Claves:
-
--   level – Logging level. Acceptable values: `trace`, `debug`, `information`, `warning`, `error`.
--   log – The log file. Contains all the entries according to `level`.
--   errorlog – Error log file.
--   size – Size of the file. Applies to `log`y`errorlog`. Una vez que el archivo alcanza `size`, ClickHouse archiva y cambia el nombre, y crea un nuevo archivo de registro en su lugar.
--   count – The number of archived log files that ClickHouse stores.
-
-**Ejemplo**
-
-``` xml
-<logger>
-    <level>trace</level>
-    <log>/var/log/clickhouse-server/clickhouse-server.log</log>
-    <errorlog>/var/log/clickhouse-server/clickhouse-server.err.log</errorlog>
-    <size>1000M</size>
-    <count>10</count>
-</logger>
-```
-
-También se admite la escritura en el syslog. Config ejemplo:
-
-``` xml
-<logger>
-    <use_syslog>1</use_syslog>
-    <syslog>
-        <address>syslog.remote:10514</address>
-        <hostname>myhost.local</hostname>
-        <facility>LOG_LOCAL6</facility>
-        <format>syslog</format>
-    </syslog>
-</logger>
-```
-
-Claves:
-
--   use_syslog — Required setting if you want to write to the syslog.
--   address — The host\[:port\] of syslogd. If omitted, the local daemon is used.
--   hostname — Optional. The name of the host that logs are sent from.
--   facility — [La palabra clave syslog facility](https://en.wikipedia.org/wiki/Syslog#Facility) en letras mayúsculas con el “LOG_” prefijo: (`LOG_USER`, `LOG_DAEMON`, `LOG_LOCAL3` y así sucesivamente).
-    Valor predeterminado: `LOG_USER` si `address` se especifica, `LOG_DAEMON otherwise.`
--   format – Message format. Possible values: `bsd` y `syslog.`
-
-## macro {#macros}
-
-Sustituciones de parámetros para tablas replicadas.
-
-Se puede omitir si no se utilizan tablas replicadas.
-
-Para obtener más información, consulte la sección “[Creación de tablas replicadas](../../engines/table-engines/mergetree-family/replication.md)”.
-
-**Ejemplo**
-
-``` xml
-<macros incl="macros" optional="true" />
-```
-
-## Método de codificación de datos: {#server-mark-cache-size}
-
-Tamaño aproximado (en bytes) de la memoria caché de marcas utilizadas por los motores de [Método de codificación de datos:](../../engines/table-engines/mergetree-family/mergetree.md) familia.
-
-La memoria caché se comparte para el servidor y la memoria se asigna según sea necesario. El tamaño de la memoria caché debe ser al menos 5368709120.
-
-**Ejemplo**
-
-``` xml
-<mark_cache_size>5368709120</mark_cache_size>
-```
-
-## max_concurrent_queries {#max-concurrent-queries}
-
-El número máximo de solicitudes procesadas simultáneamente.
-
-**Ejemplo**
-
-``` xml
-<max_concurrent_queries>100</max_concurrent_queries>
-```
-
-## max_connections {#max-connections}
-
-El número máximo de conexiones entrantes.
-
-**Ejemplo**
-
-``` xml
-<max_connections>4096</max_connections>
-```
-
-## max_open_files {#max-open-files}
-
-El número máximo de archivos abiertos.
-
-Predeterminada: `maximum`.
-
-Recomendamos usar esta opción en Mac OS X desde el `getrlimit()` función devuelve un valor incorrecto.
-
-**Ejemplo**
-
-``` xml
-<max_open_files>262144</max_open_files>
-```
-
-## max_table_size_to_drop {#max-table-size-to-drop}
-
-Restricción en la eliminación de tablas.
-
-Si el tamaño de un [Método de codificación de datos:](../../engines/table-engines/mergetree-family/mergetree.md) mesa excede `max_table_size_to_drop` (en bytes), no puede eliminarlo usando una consulta DROP.
-
-Si aún necesita eliminar la tabla sin reiniciar el servidor ClickHouse, cree el `<clickhouse-path>/flags/force_drop_table` y ejecute la consulta DROP.
-
-Valor predeterminado: 50 GB.
-
-El valor 0 significa que puede eliminar todas las tablas sin restricciones.
-
-**Ejemplo**
-
-``` xml
-<max_table_size_to_drop>0</max_table_size_to_drop>
-```
-
-## merge_tree {#server_configuration_parameters-merge_tree}
-
-Ajuste fino para tablas en el [Método de codificación de datos:](../../engines/table-engines/mergetree-family/mergetree.md).
-
-Para obtener más información, vea MergeTreeSettings.h archivo de encabezado.
-
-**Ejemplo**
-
-``` xml
-<merge_tree>
-    <max_suspicious_broken_parts>5</max_suspicious_broken_parts>
-</merge_tree>
-```
-
-## openSSL {#server_configuration_parameters-openssl}
-
-Configuración cliente/servidor SSL.
-
-El soporte para SSL es proporcionado por el `libpoco` biblioteca. La interfaz se describe en el archivo [Nombre de la red inalámbrica (SSID):h](https://github.com/ClickHouse-Extras/poco/blob/master/NetSSL_OpenSSL/include/Poco/Net/SSLManager.h)
-
-Claves para la configuración del servidor/cliente:
-
--   privateKeyFile – The path to the file with the secret key of the PEM certificate. The file may contain a key and certificate at the same time.
--   certificateFile – The path to the client/server certificate file in PEM format. You can omit it if `privateKeyFile` contiene el certificado.
--   caConfig – The path to the file or directory that contains trusted root certificates.
--   verificationMode – The method for checking the node's certificates. Details are in the description of the [Contexto](https://github.com/ClickHouse-Extras/poco/blob/master/NetSSL_OpenSSL/include/Poco/Net/Context.h) clase. Valores posibles: `none`, `relaxed`, `strict`, `once`.
--   verificationDepth – The maximum length of the verification chain. Verification will fail if the certificate chain length exceeds the set value.
--   loadDefaultCAFile – Indicates that built-in CA certificates for OpenSSL will be used. Acceptable values: `true`, `false`. \|
--   cipherList – Supported OpenSSL encryptions. For example: `ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH`.
--   cacheSessions – Enables or disables caching sessions. Must be used in combination with `sessionIdContext`. Valores aceptables: `true`, `false`.
--   sessionIdContext – A unique set of random characters that the server appends to each generated identifier. The length of the string must not exceed `SSL_MAX_SSL_SESSION_ID_LENGTH`. Este parámetro siempre se recomienda ya que ayuda a evitar problemas tanto si el servidor almacena en caché la sesión como si el cliente solicita el almacenamiento en caché. Valor predeterminado: `${application.name}`.
--   sessionCacheSize – The maximum number of sessions that the server caches. Default value: 1024\*20. 0 – Unlimited sessions.
--   sessionTimeout – Time for caching the session on the server.
--   extendedVerification – Automatically extended verification of certificates after the session ends. Acceptable values: `true`, `false`.
--   requireTLSv1 – Require a TLSv1 connection. Acceptable values: `true`, `false`.
--   requireTLSv1_1 – Require a TLSv1.1 connection. Acceptable values: `true`, `false`.
--   requireTLSv1 – Require a TLSv1.2 connection. Acceptable values: `true`, `false`.
--   fips – Activates OpenSSL FIPS mode. Supported if the library's OpenSSL version supports FIPS.
--   privateKeyPassphraseHandler – Class (PrivateKeyPassphraseHandler subclass) that requests the passphrase for accessing the private key. For example: `<privateKeyPassphraseHandler>`, `<name>KeyFileHandler</name>`, `<options><password>test</password></options>`, `</privateKeyPassphraseHandler>`.
--   invalidCertificateHandler – Class (a subclass of CertificateHandler) for verifying invalid certificates. For example: `<invalidCertificateHandler> <name>ConsoleCertificateHandler</name> </invalidCertificateHandler>` .
--   disableProtocols – Protocols that are not allowed to use.
--   preferServerCiphers – Preferred server ciphers on the client.
-
-**Ejemplo de configuración:**
-
-``` xml
-<openSSL>
-    <server>
-        <!-- openssl req -subj "/CN=localhost" -new -newkey rsa:2048 -days 365 -nodes -x509 -keyout /etc/clickhouse-server/server.key -out /etc/clickhouse-server/server.crt -->
-        <certificateFile>/etc/clickhouse-server/server.crt</certificateFile>
-        <privateKeyFile>/etc/clickhouse-server/server.key</privateKeyFile>
-        <!-- openssl dhparam -out /etc/clickhouse-server/dhparam.pem 4096 -->
-        <dhParamsFile>/etc/clickhouse-server/dhparam.pem</dhParamsFile>
-        <verificationMode>none</verificationMode>
-        <loadDefaultCAFile>true</loadDefaultCAFile>
-        <cacheSessions>true</cacheSessions>
-        <disableProtocols>sslv2,sslv3</disableProtocols>
-        <preferServerCiphers>true</preferServerCiphers>
-    </server>
-    <client>
-        <loadDefaultCAFile>true</loadDefaultCAFile>
-        <cacheSessions>true</cacheSessions>
-        <disableProtocols>sslv2,sslv3</disableProtocols>
-        <preferServerCiphers>true</preferServerCiphers>
-        <!-- Use for self-signed: <verificationMode>none</verificationMode> -->
-        <invalidCertificateHandler>
-            <!-- Use for self-signed: <name>AcceptCertificateHandler</name> -->
-            <name>RejectCertificateHandler</name>
-        </invalidCertificateHandler>
-    </client>
-</openSSL>
-```
-
-## part_log {#server_configuration_parameters-part-log}
-
-Registro de eventos asociados con [Método de codificación de datos:](../../engines/table-engines/mergetree-family/mergetree.md). Por ejemplo, agregar o fusionar datos. Puede utilizar el registro para simular algoritmos de combinación y comparar sus características. Puede visualizar el proceso de fusión.
-
-Las consultas se registran en el [sistema.part_log](../../operations/system-tables.md#system_tables-part-log) tabla, no en un archivo separado. Puede configurar el nombre de esta tabla en el `table` parámetro (ver más abajo).
-
-Utilice los siguientes parámetros para configurar el registro:
-
--   `database` – Name of the database.
--   `table` – Name of the system table.
--   `partition_by` – Sets a [clave de partición personalizada](../../engines/table-engines/mergetree-family/custom-partitioning-key.md).
--   `flush_interval_milliseconds` – Interval for flushing data from the buffer in memory to the table.
-
-**Ejemplo**
-
-``` xml
-<part_log>
-    <database>system</database>
-    <table>part_log</table>
-    <partition_by>toMonday(event_date)</partition_by>
-    <flush_interval_milliseconds>7500</flush_interval_milliseconds>
-</part_log>
-```
-
-## camino {#server_configuration_parameters-path}
-
-La ruta de acceso al directorio que contiene los datos.
-
-!!! note "Nota"
-    La barra diagonal es obligatoria.
-
-**Ejemplo**
-
-``` xml
-<path>/var/lib/clickhouse/</path>
-```
-
-## prometeo {#server_configuration_parameters-prometheus}
-
-Exponer datos de métricas para raspar desde [Prometeo](https://prometheus.io).
-
-Configuración:
-
--   `endpoint` – HTTP endpoint for scraping metrics by prometheus server. Start from ‘/’.
--   `port` – Port for `endpoint`.
--   `metrics` – Flag that sets to expose metrics from the [sistema.métricas](../system-tables.md#system_tables-metrics) tabla.
--   `events` – Flag that sets to expose metrics from the [sistema.evento](../system-tables.md#system_tables-events) tabla.
--   `asynchronous_metrics` – Flag that sets to expose current metrics values from the [sistema.asynchronous_metrics](../system-tables.md#system_tables-asynchronous_metrics) tabla.
-
-**Ejemplo**
-
-``` xml
- <prometheus>
-        <endpoint>/metrics</endpoint>
-        <port>8001</port>
-        <metrics>true</metrics>
-        <events>true</events>
-        <asynchronous_metrics>true</asynchronous_metrics>
-    </prometheus>
-```
-
-## query_log {#server_configuration_parameters-query-log}
-
-Configuración de las consultas de registro recibidas con [log_queries=1](../settings/settings.md) configuración.
-
-Las consultas se registran en el [sistema.query_log](../../operations/system-tables.md#system_tables-query_log) tabla, no en un archivo separado. Puede cambiar el nombre de la tabla en el `table` parámetro (ver más abajo).
-
-Utilice los siguientes parámetros para configurar el registro:
-
--   `database` – Name of the database.
--   `table` – Name of the system table the queries will be logged in.
--   `partition_by` – Sets a [clave de partición personalizada](../../engines/table-engines/mergetree-family/custom-partitioning-key.md) para una mesa.
--   `flush_interval_milliseconds` – Interval for flushing data from the buffer in memory to the table.
-
-Si la tabla no existe, ClickHouse la creará. Si la estructura del registro de consultas cambió cuando se actualizó el servidor ClickHouse, se cambia el nombre de la tabla con la estructura anterior y se crea una nueva tabla automáticamente.
-
-**Ejemplo**
-
-``` xml
-<query_log>
-    <database>system</database>
-    <table>query_log</table>
-    <partition_by>toMonday(event_date)</partition_by>
-    <flush_interval_milliseconds>7500</flush_interval_milliseconds>
-</query_log>
-```
-
-## Sistema abierto {#server_configuration_parameters-query-thread-log}
-
-Configuración de subprocesos de registro de consultas recibidas con [Log_query_threads = 1](../settings/settings.md#settings-log-query-threads) configuración.
-
-Las consultas se registran en el [sistema.Sistema abierto.](../../operations/system-tables.md#system_tables-query-thread-log) tabla, no en un archivo separado. Puede cambiar el nombre de la tabla en el `table` parámetro (ver más abajo).
-
-Utilice los siguientes parámetros para configurar el registro:
-
--   `database` – Name of the database.
--   `table` – Name of the system table the queries will be logged in.
--   `partition_by` – Sets a [clave de partición personalizada](../../engines/table-engines/mergetree-family/custom-partitioning-key.md) para una tabla del sistema.
--   `flush_interval_milliseconds` – Interval for flushing data from the buffer in memory to the table.
-
-Si la tabla no existe, ClickHouse la creará. Si la estructura del registro de subprocesos de consulta cambió cuando se actualizó el servidor ClickHouse, se cambia el nombre de la tabla con la estructura anterior y se crea una nueva tabla automáticamente.
-
-**Ejemplo**
-
-``` xml
-<query_thread_log>
-    <database>system</database>
-    <table>query_thread_log</table>
-    <partition_by>toMonday(event_date)</partition_by>
-    <flush_interval_milliseconds>7500</flush_interval_milliseconds>
-</query_thread_log>
-```
-
-## trace_log {#server_configuration_parameters-trace_log}
-
-Ajustes para el [trace_log](../../operations/system-tables.md#system_tables-trace_log) operación de la tabla del sistema.
-
-Parámetros:
-
--   `database` — Database for storing a table.
--   `table` — Table name.
--   `partition_by` — [Clave de partición personalizada](../../engines/table-engines/mergetree-family/custom-partitioning-key.md) para una tabla del sistema.
--   `flush_interval_milliseconds` — Interval for flushing data from the buffer in memory to the table.
-
-El archivo de configuración del servidor predeterminado `config.xml` contiene la siguiente sección de configuración:
-
-``` xml
-<trace_log>
-    <database>system</database>
-    <table>trace_log</table>
-    <partition_by>toYYYYMM(event_date)</partition_by>
-    <flush_interval_milliseconds>7500</flush_interval_milliseconds>
-</trace_log>
-```
-
-## query_masking_rules {#query-masking-rules}
-
-Reglas basadas en Regexp, que se aplicarán a las consultas, así como a todos los mensajes de registro antes de almacenarlos en los registros del servidor,
-`system.query_log`, `system.text_log`, `system.processes` tabla, y en los registros enviados al cliente. Eso permite prevenir
-fuga de datos sensible de consultas SQL (como nombres, correos electrónicos,
-identificadores o números de tarjetas de crédito) a los registros.
-
-**Ejemplo**
-
-``` xml
-<query_masking_rules>
-    <rule>
-        <name>hide SSN</name>
-        <regexp>(^|\D)\d{3}-\d{2}-\d{4}($|\D)</regexp>
-        <replace>000-00-0000</replace>
-    </rule>
-</query_masking_rules>
-```
-
-Campos de configuración:
-- `name` - nombre de la regla (opcional)
-- `regexp` - Expresión regular compatible con RE2 (obligatoria)
-- `replace` - cadena de sustitución para datos confidenciales (opcional, por defecto - seis asteriscos)
-
-Las reglas de enmascaramiento se aplican a toda la consulta (para evitar fugas de datos confidenciales de consultas mal formadas / no analizables).
-
-`system.events` la tabla tiene contador `QueryMaskingRulesMatch` que tienen un número total de coincidencias de reglas de enmascaramiento de consultas.
-
-Para consultas distribuidas, cada servidor debe configurarse por separado; de lo contrario, las subconsultas pasan a otros
-los nodos se almacenarán sin enmascarar.
-
-## remote_servers {#server-settings-remote-servers}
-
-Configuración de los clústeres utilizados por [Distribuido](../../engines/table-engines/special/distributed.md) motor de mesa y por el `cluster` función de la tabla.
-
-**Ejemplo**
-
-``` xml
-<remote_servers incl="clickhouse_remote_servers" />
-```
-
-Para el valor de la `incl` atributo, consulte la sección “[Archivos de configuración](../configuration-files.md#configuration_files)”.
-
-**Ver también**
-
--   [skip_unavailable_shards](../settings/settings.md#settings-skip_unavailable_shards)
-
-## Zona horaria {#server_configuration_parameters-timezone}
-
-La zona horaria del servidor.
-
-Especificado como un identificador de la IANA para la zona horaria UTC o la ubicación geográfica (por ejemplo, África/Abidjan).
-
-La zona horaria es necesaria para las conversiones entre los formatos String y DateTime cuando los campos DateTime se envían al formato de texto (impreso en la pantalla o en un archivo) y cuando se obtiene DateTime de una cadena. Además, la zona horaria se usa en funciones que funcionan con la hora y la fecha si no recibieron la zona horaria en los parámetros de entrada.
-
-**Ejemplo**
-
-``` xml
-<timezone>Europe/Moscow</timezone>
-```
-
-## Tcp_port {#server_configuration_parameters-tcp_port}
-
-Puerto para comunicarse con clientes a través del protocolo TCP.
-
-**Ejemplo**
-
-``` xml
-<tcp_port>9000</tcp_port>
-```
-
-## Tcp_port_secure {#server_configuration_parameters-tcp_port_secure}
-
-Puerto TCP para una comunicación segura con los clientes. Úselo con [OpenSSL](#server_configuration_parameters-openssl) configuración.
-
-**Valores posibles**
-
-Entero positivo.
-
-**Valor predeterminado**
-
-``` xml
-<tcp_port_secure>9440</tcp_port_secure>
-```
-
-## mysql_port {#server_configuration_parameters-mysql_port}
-
-Puerto para comunicarse con clientes a través del protocolo MySQL.
-
-**Valores posibles**
-
-Entero positivo.
-
-Ejemplo
-
-``` xml
-<mysql_port>9004</mysql_port>
-```
-
-## tmp_path {#server-settings-tmp_path}
-
-Ruta de acceso a datos temporales para procesar consultas grandes.
-
-!!! note "Nota"
-    La barra diagonal es obligatoria.
-
-**Ejemplo**
-
-``` xml
-<tmp_path>/var/lib/clickhouse/tmp/</tmp_path>
-```
-
-## tmp_policy {#server-settings-tmp-policy}
-
-Política de [`storage_configuration`](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-multiple-volumes) para almacenar archivos temporales.
-Si no se establece [`tmp_path`](#server-settings-tmp_path) se utiliza, de lo contrario se ignora.
-
-!!! note "Nota"
-    - `move_factor` se ignora
-- `keep_free_space_bytes` se ignora
-- `max_data_part_size_bytes` se ignora
-- debe tener exactamente un volumen en esa política
-
-## Uncompressed_cache_size {#server-settings-uncompressed_cache_size}
-
-Tamaño de la memoria caché (en bytes) para los datos sin comprimir utilizados por los motores de [Método de codificación de datos:](../../engines/table-engines/mergetree-family/mergetree.md).
-
-Hay una caché compartida para el servidor. La memoria se asigna a pedido. La caché se usa si la opción [Use_uncompressed_cache](../settings/settings.md#setting-use_uncompressed_cache) está habilitado.
-
-La caché sin comprimir es ventajosa para consultas muy cortas en casos individuales.
-
-**Ejemplo**
-
-``` xml
-<uncompressed_cache_size>8589934592</uncompressed_cache_size>
-```
-
-## user_files_path {#server_configuration_parameters-user_files_path}
-
-El directorio con archivos de usuario. Utilizado en la función de tabla [file()](../../sql-reference/table-functions/file.md).
-
-**Ejemplo**
-
-``` xml
-<user_files_path>/var/lib/clickhouse/user_files/</user_files_path>
-```
-
-## users_config {#users-config}
-
-Ruta de acceso al archivo que contiene:
-
--   Configuraciones de usuario.
--   Derechos de acceso.
--   Perfiles de configuración.
--   Configuración de cuota.
-
-**Ejemplo**
-
-``` xml
-<users_config>users.xml</users_config>
-```
-
-## Zookeeper {#server-settings_zookeeper}
-
-Contiene la configuración que permite a ClickHouse interactuar con [ZooKeeper](http://zookeeper.apache.org/) Cluster.
-
-ClickHouse utiliza ZooKeeper para almacenar metadatos de réplicas cuando se utilizan tablas replicadas. Si no se utilizan tablas replicadas, se puede omitir esta sección de parámetros.
-
-Esta sección contiene los siguientes parámetros:
-
--   `node` — ZooKeeper endpoint. You can set multiple endpoints.
-
-    Por ejemplo:
-
-<!-- -->
-
-``` xml
-    <node index="1">
-        <host>example_host</host>
-        <port>2181</port>
-    </node>
-```
-
-      The `index` attribute specifies the node order when trying to connect to the ZooKeeper cluster.
-
--   `session_timeout` — Maximum timeout for the client session in milliseconds.
--   `root` — The [Znode](http://zookeeper.apache.org/doc/r3.5.5/zookeeperOver.html#Nodes+and+ephemeral+nodes) que se utiliza como la raíz de los znodes utilizados por el servidor ClickHouse. Opcional.
--   `identity` — User and password, that can be required by ZooKeeper to give access to requested znodes. Optional.
-
-**Ejemplo de configuración**
-
-``` xml
-<zookeeper>
-    <node>
-        <host>example1</host>
-        <port>2181</port>
-    </node>
-    <node>
-        <host>example2</host>
-        <port>2181</port>
-    </node>
-    <session_timeout_ms>30000</session_timeout_ms>
-    <operation_timeout_ms>10000</operation_timeout_ms>
-    <!-- Optional. Chroot suffix. Should exist. -->
-    <root>/path/to/zookeeper/node</root>
-    <!-- Optional. Zookeeper digest ACL string. -->
-    <identity>user:password</identity>
-</zookeeper>
-```
-
-**Ver también**
-
--   [Replicación](../../engines/table-engines/mergetree-family/replication.md)
--   [Guía del programador ZooKeeper](http://zookeeper.apache.org/doc/current/zookeeperProgrammers.html)
-
-## use_minimalistic_part_header_in_zookeeper {#server-settings-use_minimalistic_part_header_in_zookeeper}
-
-Método de almacenamiento para encabezados de parte de datos en ZooKeeper.
-
-Esta configuración sólo se aplica a `MergeTree` familia. Se puede especificar:
-
--   A nivel mundial en el [merge_tree](#server_configuration_parameters-merge_tree) sección de la `config.xml` file.
-
-    ClickHouse utiliza la configuración para todas las tablas del servidor. Puede cambiar la configuración en cualquier momento. Las tablas existentes cambian su comportamiento cuando cambia la configuración.
-
--   Para cada tabla.
-
-    Al crear una tabla, especifique la correspondiente [ajuste del motor](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-creating-a-table). El comportamiento de una tabla existente con esta configuración no cambia, incluso si la configuración global cambia.
-
-**Valores posibles**
-
--   0 — Functionality is turned off.
--   1 — Functionality is turned on.
-
-Si `use_minimalistic_part_header_in_zookeeper = 1`, entonces [repetición](../../engines/table-engines/mergetree-family/replication.md) las tablas almacenan los encabezados de las partes de datos de forma compacta `znode`. Si la tabla contiene muchas columnas, este método de almacenamiento reduce significativamente el volumen de los datos almacenados en Zookeeper.
-
-!!! attention "Atención"
-    Después de aplicar `use_minimalistic_part_header_in_zookeeper = 1`, no puede degradar el servidor ClickHouse a una versión que no admite esta configuración. Tenga cuidado al actualizar ClickHouse en servidores de un clúster. No actualice todos los servidores a la vez. Es más seguro probar nuevas versiones de ClickHouse en un entorno de prueba o solo en unos pocos servidores de un clúster.
-
-      Data part headers already stored with this setting can't be restored to their previous (non-compact) representation.
-
-**Valor predeterminado:** 0.
-
-## disable_internal_dns_cache {#server-settings-disable-internal-dns-cache}
-
-Deshabilita la memoria caché DNS interna. Recomendado para operar ClickHouse en sistemas
-con infraestructura que cambia frecuentemente como Kubernetes.
-
-**Valor predeterminado:** 0.
-
-## dns_cache_update_period {#server-settings-dns-cache-update-period}
-
-El período de actualización de las direcciones IP almacenadas en la caché DNS interna de ClickHouse (en segundos).
-La actualización se realiza de forma asíncrona, en un subproceso del sistema separado.
-
-**Valor predeterminado**: 15.
-
-## access_control_path {#access_control_path}
-
-Ruta de acceso a una carpeta donde un servidor ClickHouse almacena configuraciones de usuario y rol creadas por comandos SQL.
-
-Valor predeterminado: `/var/lib/clickhouse/access/`.
-
-**Ver también**
-
--   [Control de acceso y gestión de cuentas](../access-rights.md#access-control)
-
-[Artículo Original](https://clickhouse.tech/docs/en/operations/server_configuration_parameters/settings/) <!--hide-->
diff --git a/docs/es/operations/settings/constraints-on-settings.md b/docs/es/operations/settings/constraints-on-settings.md
deleted file mode 100644
index fe385f6ddbb..00000000000
--- a/docs/es/operations/settings/constraints-on-settings.md
+++ /dev/null
@@ -1,75 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 62
-toc_title: "Restricciones en la configuraci\xF3n"
----
-
-# Restricciones en la configuración {#constraints-on-settings}
-
-Las restricciones en los ajustes se pueden definir en el `profiles` sección de la `user.xml` el archivo de configuración y prohíba a los usuarios cambiar algunos de los ajustes `SET` consulta.
-Las restricciones se definen como las siguientes:
-
-``` xml
-<profiles>
-  <user_name>
-    <constraints>
-      <setting_name_1>
-        <min>lower_boundary</min>
-      </setting_name_1>
-      <setting_name_2>
-        <max>upper_boundary</max>
-      </setting_name_2>
-      <setting_name_3>
-        <min>lower_boundary</min>
-        <max>upper_boundary</max>
-      </setting_name_3>
-      <setting_name_4>
-        <readonly/>
-      </setting_name_4>
-    </constraints>
-  </user_name>
-</profiles>
-```
-
-Si el usuario intenta violar las restricciones, se lanza una excepción y la configuración no se cambia.
-Se admiten tres tipos de restricciones: `min`, `max`, `readonly`. El `min` y `max` Las restricciones especifican los límites superior e inferior para una configuración numérica y se pueden usar en combinación. El `readonly` constraint especifica que el usuario no puede cambiar la configuración correspondiente en absoluto.
-
-**Ejemplo:** Dejar `users.xml` incluye líneas:
-
-``` xml
-<profiles>
-  <default>
-    <max_memory_usage>10000000000</max_memory_usage>
-    <force_index_by_date>0</force_index_by_date>
-    ...
-    <constraints>
-      <max_memory_usage>
-        <min>5000000000</min>
-        <max>20000000000</max>
-      </max_memory_usage>
-      <force_index_by_date>
-        <readonly/>
-      </force_index_by_date>
-    </constraints>
-  </default>
-</profiles>
-```
-
-Las siguientes consultas arrojan excepciones:
-
-``` sql
-SET max_memory_usage=20000000001;
-SET max_memory_usage=4999999999;
-SET force_index_by_date=1;
-```
-
-``` text
-Code: 452, e.displayText() = DB::Exception: Setting max_memory_usage should not be greater than 20000000000.
-Code: 452, e.displayText() = DB::Exception: Setting max_memory_usage should not be less than 5000000000.
-Code: 452, e.displayText() = DB::Exception: Setting force_index_by_date should not be changed.
-```
-
-**Nota:** el `default` perfil tiene un manejo especial: todas las restricciones definidas para el `default` profile se convierten en las restricciones predeterminadas, por lo que restringen a todos los usuarios hasta que se anulan explícitamente para estos usuarios.
-
-[Artículo Original](https://clickhouse.tech/docs/en/operations/settings/constraints_on_settings/) <!--hide-->
diff --git a/docs/es/operations/settings/index.md b/docs/es/operations/settings/index.md
deleted file mode 100644
index 37aab0a7e1b..00000000000
--- a/docs/es/operations/settings/index.md
+++ /dev/null
@@ -1,33 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: "Configuraci\xF3n"
-toc_priority: 55
-toc_title: "Implantaci\xF3n"
----
-
-# Configuración {#session-settings-intro}
-
-Hay varias maneras de realizar todos los ajustes descritos en esta sección de documentación.
-
-Los ajustes se configuran en capas, por lo que cada capa subsiguiente redefine los ajustes anteriores.
-
-Formas de configurar los ajustes, por orden de prioridad:
-
--   Ajustes en el `users.xml` archivo de configuración del servidor.
-
-    Establecer en el elemento `<profiles>`.
-
--   Configuración de la sesión.
-
-    Enviar `SET setting=value` desde el cliente de consola ClickHouse en modo interactivo.
-    Del mismo modo, puede utilizar sesiones ClickHouse en el protocolo HTTP. Para hacer esto, debe especificar el `session_id` Parámetro HTTP.
-
--   Configuración de consulta.
-
-    -   Al iniciar el cliente de consola de ClickHouse en modo no interactivo, establezca el parámetro de inicio `--setting=value`.
-    -   Al usar la API HTTP, pase los parámetros CGI (`URL?setting_1=value&setting_2=value...`).
-
-Los ajustes que solo se pueden realizar en el archivo de configuración del servidor no se tratan en esta sección.
-
-[Artículo Original](https://clickhouse.tech/docs/en/operations/settings/) <!--hide-->
diff --git a/docs/es/operations/settings/permissions-for-queries.md b/docs/es/operations/settings/permissions-for-queries.md
deleted file mode 100644
index f9f669b876e..00000000000
--- a/docs/es/operations/settings/permissions-for-queries.md
+++ /dev/null
@@ -1,61 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 58
-toc_title: Permisos para consultas
----
-
-# Permisos para consultas {#permissions_for_queries}
-
-Las consultas en ClickHouse se pueden dividir en varios tipos:
-
-1.  Leer consultas de datos: `SELECT`, `SHOW`, `DESCRIBE`, `EXISTS`.
-2.  Escribir consultas de datos: `INSERT`, `OPTIMIZE`.
-3.  Cambiar la consulta de configuración: `SET`, `USE`.
-4.  [DDL](https://en.wikipedia.org/wiki/Data_definition_language) consulta: `CREATE`, `ALTER`, `RENAME`, `ATTACH`, `DETACH`, `DROP` `TRUNCATE`.
-5.  `KILL QUERY`.
-
-La siguiente configuración regula los permisos de usuario según el tipo de consulta:
-
--   [sólo lectura](#settings_readonly) — Restricts permissions for all types of queries except DDL queries.
--   [Método de codificación de datos:](#settings_allow_ddl) — Restricts permissions for DDL queries.
-
-`KILL QUERY` se puede realizar con cualquier configuración.
-
-## sólo lectura {#settings_readonly}
-
-Restringe los permisos para leer datos, escribir datos y cambiar las consultas de configuración.
-
-Vea cómo las consultas se dividen en tipos [arriba](#permissions_for_queries).
-
-Valores posibles:
-
--   0 — All queries are allowed.
--   1 — Only read data queries are allowed.
--   2 — Read data and change settings queries are allowed.
-
-Después de configurar `readonly = 1` el usuario no puede cambiar `readonly` y `allow_ddl` configuración en la sesión actual.
-
-Cuando se utiliza el `GET` método en el [Interfaz HTTP](../../interfaces/http.md), `readonly = 1` se establece automáticamente. Para modificar los datos, `POST` método.
-
-Configuración `readonly = 1` prohibir al usuario cambiar todas las configuraciones. Hay una manera de prohibir al usuario
-de cambiar sólo ajustes específicos, para más detalles ver [restricciones en la configuración](constraints-on-settings.md).
-
-Valor predeterminado: 0
-
-## Método de codificación de datos: {#settings_allow_ddl}
-
-Permite o niega [DDL](https://en.wikipedia.org/wiki/Data_definition_language) consulta.
-
-Vea cómo las consultas se dividen en tipos [arriba](#permissions_for_queries).
-
-Valores posibles:
-
--   0 — DDL queries are not allowed.
--   1 — DDL queries are allowed.
-
-No se puede ejecutar `SET allow_ddl = 1` si `allow_ddl = 0` para la sesión actual.
-
-Valor predeterminado: 1
-
-[Artículo Original](https://clickhouse.tech/docs/en/operations/settings/permissions_for_queries/) <!--hide-->
diff --git a/docs/es/operations/settings/query-complexity.md b/docs/es/operations/settings/query-complexity.md
deleted file mode 100644
index 82bc235c30d..00000000000
--- a/docs/es/operations/settings/query-complexity.md
+++ /dev/null
@@ -1,300 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 59
-toc_title: Restricciones en la complejidad de consultas
----
-
-# Restricciones en la complejidad de consultas {#restrictions-on-query-complexity}
-
-Las restricciones en la complejidad de la consulta forman parte de la configuración.
-Se utilizan para proporcionar una ejecución más segura desde la interfaz de usuario.
-Casi todas las restricciones solo se aplican a `SELECT`. Para el procesamiento de consultas distribuidas, las restricciones se aplican en cada servidor por separado.
-
-ClickHouse comprueba las restricciones para las partes de datos, no para cada fila. Significa que puede exceder el valor de restricción con el tamaño de la parte de datos.
-
-Restricciones en el “maximum amount of something” puede tomar el valor 0, lo que significa “unrestricted”.
-La mayoría de las restricciones también tienen un ‘overflow_mode’ establecer, lo que significa qué hacer cuando se excede el límite.
-Puede tomar uno de dos valores: `throw` o `break`. Las restricciones en la agregación (group_by_overflow_mode) también tienen el valor `any`.
-
-`throw` – Throw an exception (default).
-
-`break` – Stop executing the query and return the partial result, as if the source data ran out.
-
-`any (only for group_by_overflow_mode)` – Continuing aggregation for the keys that got into the set, but don't add new keys to the set.
-
-## Método de codificación de datos: {#settings_max_memory_usage}
-
-La cantidad máxima de RAM que se utiliza para ejecutar una consulta en un único servidor.
-
-En el archivo de configuración predeterminado, el máximo es de 10 GB.
-
-La configuración no tiene en cuenta el volumen de memoria disponible ni el volumen total de memoria en la máquina.
-La restricción se aplica a una sola consulta dentro de un único servidor.
-Usted puede utilizar `SHOW PROCESSLIST` para ver el consumo de memoria actual para cada consulta.
-Además, el consumo máximo de memoria se rastrea para cada consulta y se escribe en el registro.
-
-El uso de memoria no se supervisa para los estados de ciertas funciones agregadas.
-
-El uso de memoria no se realiza un seguimiento completo de los estados de las funciones agregadas `min`, `max`, `any`, `anyLast`, `argMin`, `argMax` de `String` y `Array` argumento.
-
-El consumo de memoria también está restringido por los parámetros `max_memory_usage_for_user` y `max_memory_usage_for_all_queries`.
-
-## Max_memory_usage_for_user {#max-memory-usage-for-user}
-
-La cantidad máxima de RAM que se utilizará para ejecutar las consultas de un usuario en un único servidor.
-
-Los valores predeterminados se definen en [Configuración.h](https://github.com/ClickHouse/ClickHouse/blob/master/src/Core/Settings.h#L288). De forma predeterminada, el importe no está restringido (`max_memory_usage_for_user = 0`).
-
-Ver también la descripción de [Método de codificación de datos:](#settings_max_memory_usage).
-
-## Todos los derechos reservados {#max-memory-usage-for-all-queries}
-
-La cantidad máxima de RAM que se utilizará para ejecutar todas las consultas en un único servidor.
-
-Los valores predeterminados se definen en [Configuración.h](https://github.com/ClickHouse/ClickHouse/blob/master/src/Core/Settings.h#L289). De forma predeterminada, el importe no está restringido (`max_memory_usage_for_all_queries = 0`).
-
-Ver también la descripción de [Método de codificación de datos:](#settings_max_memory_usage).
-
-## ¿Qué puedes encontrar en Neodigit {#max-rows-to-read}
-
-Las siguientes restricciones se pueden verificar en cada bloque (en lugar de en cada fila). Es decir, las restricciones se pueden romper un poco.
-
-Un número máximo de filas que se pueden leer de una tabla al ejecutar una consulta.
-
-## ¿Qué puedes encontrar en Neodigit {#max-bytes-to-read}
-
-Un número máximo de bytes (datos sin comprimir) que se pueden leer de una tabla al ejecutar una consulta.
-
-## Método de codificación de datos: {#read-overflow-mode}
-
-Qué hacer cuando el volumen de datos leídos excede uno de los límites: ‘throw’ o ‘break’. Por defecto, throw.
-
-## Método de codificación de datos: {#settings-max-rows-to-group-by}
-
-Un número máximo de claves únicas recibidas de la agregación. Esta configuración le permite limitar el consumo de memoria al agregar.
-
-## Grupo_by_overflow_mode {#group-by-overflow-mode}
-
-Qué hacer cuando el número de claves únicas para la agregación excede el límite: ‘throw’, ‘break’, o ‘any’. Por defecto, throw.
-Uso de la ‘any’ valor le permite ejecutar una aproximación de GROUP BY. La calidad de esta aproximación depende de la naturaleza estadística de los datos.
-
-## max_bytes_before_external_group_by {#settings-max_bytes_before_external_group_by}
-
-Habilita o deshabilita la ejecución de `GROUP BY` en la memoria externa. Ver [GROUP BY en memoria externa](../../sql-reference/statements/select/group-by.md#select-group-by-in-external-memory).
-
-Valores posibles:
-
--   Volumen máximo de RAM (en bytes) que puede ser utilizado por el único [GROUP BY](../../sql-reference/statements/select/group-by.md#select-group-by-clause) operación.
--   0 — `GROUP BY` en la memoria externa deshabilitada.
-
-Valor predeterminado: 0.
-
-## Método de codificación de datos: {#max-rows-to-sort}
-
-Un número máximo de filas antes de ordenar. Esto le permite limitar el consumo de memoria al ordenar.
-
-## Método de codificación de datos: {#max-bytes-to-sort}
-
-Un número máximo de bytes antes de ordenar.
-
-## sort_overflow_mode {#sort-overflow-mode}
-
-Qué hacer si el número de filas recibidas antes de ordenar excede uno de los límites: ‘throw’ o ‘break’. Por defecto, throw.
-
-## max_result_rows {#setting-max_result_rows}
-
-Límite en el número de filas en el resultado. También se comprueba si hay subconsultas y en servidores remotos cuando se ejecutan partes de una consulta distribuida.
-
-## max_result_bytes {#max-result-bytes}
-
-Límite en el número de bytes en el resultado. Lo mismo que el ajuste anterior.
-
-## result_overflow_mode {#result-overflow-mode}
-
-Qué hacer si el volumen del resultado excede uno de los límites: ‘throw’ o ‘break’. Por defecto, throw.
-
-Utilizar ‘break’ es similar a usar LIMIT. `Break` interrumpe la ejecución sólo en el nivel de bloque. Esto significa que la cantidad de filas devueltas es mayor que [max_result_rows](#setting-max_result_rows), múltiplo de [max_block_size](settings.md#setting-max_block_size) y depende de [max_threads](settings.md#settings-max_threads).
-
-Ejemplo:
-
-``` sql
-SET max_threads = 3, max_block_size = 3333;
-SET max_result_rows = 3334, result_overflow_mode = 'break';
-
-SELECT *
-FROM numbers_mt(100000)
-FORMAT Null;
-```
-
-Resultado:
-
-``` text
-6666 rows in set. ...
-```
-
-## max_execution_time {#max-execution-time}
-
-Tiempo máximo de ejecución de la consulta en segundos.
-En este momento, no se comprueba una de las etapas de clasificación, o al fusionar y finalizar funciones agregadas.
-
-## timeout_overflow_mode {#timeout-overflow-mode}
-
-Qué hacer si la consulta se ejecuta más de ‘max_execution_time’: ‘throw’ o ‘break’. Por defecto, throw.
-
-## Método de codificación de datos: {#min-execution-speed}
-
-Velocidad de ejecución mínima en filas por segundo. Comprobado en cada bloque de datos cuando ‘timeout_before_checking_execution_speed’ expirar. Si la velocidad de ejecución es menor, se produce una excepción.
-
-## Todos los derechos reservados {#min-execution-speed-bytes}
-
-Un número mínimo de bytes de ejecución por segundo. Comprobado en cada bloque de datos cuando ‘timeout_before_checking_execution_speed’ expirar. Si la velocidad de ejecución es menor, se produce una excepción.
-
-## Max_execution_speed {#max-execution-speed}
-
-Un número máximo de filas de ejecución por segundo. Comprobado en cada bloque de datos cuando ‘timeout_before_checking_execution_speed’ expirar. Si la velocidad de ejecución es alta, la velocidad de ejecución se reducirá.
-
-## Max_execution_speed_bytes {#max-execution-speed-bytes}
-
-Un número máximo de bytes de ejecución por segundo. Comprobado en cada bloque de datos cuando ‘timeout_before_checking_execution_speed’ expirar. Si la velocidad de ejecución es alta, la velocidad de ejecución se reducirá.
-
-## Tiempo de espera antes de comprobar_ejecución_velocidad {#timeout-before-checking-execution-speed}
-
-Comprueba que la velocidad de ejecución no sea demasiado lenta (no menos de ‘min_execution_speed’), después de que el tiempo especificado en segundos haya expirado.
-
-## Max_columns_to_read {#max-columns-to-read}
-
-Un número máximo de columnas que se pueden leer de una tabla en una sola consulta. Si una consulta requiere leer un mayor número de columnas, produce una excepción.
-
-## max_temporary_columns {#max-temporary-columns}
-
-Un número máximo de columnas temporales que se deben mantener en la memoria RAM al mismo tiempo cuando se ejecuta una consulta, incluidas las columnas constantes. Si hay más columnas temporales que esto, arroja una excepción.
-
-## max_temporary_non_const_columns {#max-temporary-non-const-columns}
-
-Lo mismo que ‘max_temporary_columns’, pero sin contar columnas constantes.
-Tenga en cuenta que las columnas constantes se forman con bastante frecuencia cuando se ejecuta una consulta, pero requieren aproximadamente cero recursos informáticos.
-
-## max_subquery_depth {#max-subquery-depth}
-
-Profundidad máxima de anidamiento de subconsultas. Si las subconsultas son más profundas, se produce una excepción. De forma predeterminada, 100.
-
-## max_pipeline_depth {#max-pipeline-depth}
-
-Profundidad máxima de la tubería. Corresponde al número de transformaciones que realiza cada bloque de datos durante el procesamiento de consultas. Contado dentro de los límites de un único servidor. Si la profundidad de la canalización es mayor, se produce una excepción. Por defecto, 1000.
-
-## max_ast_depth {#max-ast-depth}
-
-Profundidad máxima de anidamiento de un árbol sintáctico de consulta. Si se supera, se produce una excepción.
-En este momento, no se verifica durante el análisis, sino solo después de analizar la consulta. Es decir, se puede crear un árbol sintáctico demasiado profundo durante el análisis, pero la consulta fallará. Por defecto, 1000.
-
-## max_ast_elements {#max-ast-elements}
-
-Un número máximo de elementos en un árbol sintáctico de consulta. Si se supera, se produce una excepción.
-De la misma manera que la configuración anterior, se verifica solo después de analizar la consulta. De forma predeterminada, 50.000.
-
-## Método de codificación de datos: {#max-rows-in-set}
-
-Un número máximo de filas para un conjunto de datos en la cláusula IN creada a partir de una subconsulta.
-
-## Método de codificación de datos: {#max-bytes-in-set}
-
-Número máximo de bytes (datos sin comprimir) utilizados por un conjunto en la cláusula IN creada a partir de una subconsulta.
-
-## set_overflow_mode {#set-overflow-mode}
-
-Qué hacer cuando la cantidad de datos excede uno de los límites: ‘throw’ o ‘break’. Por defecto, throw.
-
-## Método de codificación de datos: {#max-rows-in-distinct}
-
-Un número máximo de filas diferentes al usar DISTINCT.
-
-## Método de codificación de datos: {#max-bytes-in-distinct}
-
-Un número máximo de bytes utilizados por una tabla hash cuando se utiliza DISTINCT.
-
-## distinct_overflow_mode {#distinct-overflow-mode}
-
-Qué hacer cuando la cantidad de datos excede uno de los límites: ‘throw’ o ‘break’. Por defecto, throw.
-
-## max_rows_to_transfer {#max-rows-to-transfer}
-
-Un número máximo de filas que se pueden pasar a un servidor remoto o guardar en una tabla temporal cuando se utiliza GLOBAL IN.
-
-## max_bytes_to_transfer {#max-bytes-to-transfer}
-
-Un número máximo de bytes (datos sin comprimir) que se pueden pasar a un servidor remoto o guardar en una tabla temporal cuando se utiliza GLOBAL IN.
-
-## transfer_overflow_mode {#transfer-overflow-mode}
-
-Qué hacer cuando la cantidad de datos excede uno de los límites: ‘throw’ o ‘break’. Por defecto, throw.
-
-## Método de codificación de datos: {#settings-max_rows_in_join}
-
-Limita el número de filas de la tabla hash que se utiliza al unir tablas.
-
-Esta configuración se aplica a [SELECT … JOIN](../../sql-reference/statements/select/join.md#select-join) operaciones y la [Unir](../../engines/table-engines/special/join.md) motor de mesa.
-
-Si una consulta contiene varias combinaciones, ClickHouse comprueba esta configuración para cada resultado intermedio.
-
-ClickHouse puede proceder con diferentes acciones cuando se alcanza el límite. Utilice el [join_overflow_mode](#settings-join_overflow_mode) configuración para elegir la acción.
-
-Valores posibles:
-
--   Entero positivo.
--   0 — Unlimited number of rows.
-
-Valor predeterminado: 0.
-
-## Método de codificación de datos: {#settings-max_bytes_in_join}
-
-Limita el tamaño en bytes de la tabla hash utilizada al unir tablas.
-
-Esta configuración se aplica a [SELECT … JOIN](../../sql-reference/statements/select/join.md#select-join) operaciones y [Unirse al motor de tabla](../../engines/table-engines/special/join.md).
-
-Si la consulta contiene combinaciones, ClickHouse comprueba esta configuración para cada resultado intermedio.
-
-ClickHouse puede proceder con diferentes acciones cuando se alcanza el límite. Utilizar [join_overflow_mode](#settings-join_overflow_mode) para elegir la acción.
-
-Valores posibles:
-
--   Entero positivo.
--   0 — Memory control is disabled.
-
-Valor predeterminado: 0.
-
-## join_overflow_mode {#settings-join_overflow_mode}
-
-Define qué acción realiza ClickHouse cuando se alcanza cualquiera de los siguientes límites de combinación:
-
--   [Método de codificación de datos:](#settings-max_bytes_in_join)
--   [Método de codificación de datos:](#settings-max_rows_in_join)
-
-Valores posibles:
-
--   `THROW` — ClickHouse throws an exception and breaks operation.
--   `BREAK` — ClickHouse breaks operation and doesn't throw an exception.
-
-Valor predeterminado: `THROW`.
-
-**Ver también**
-
--   [Cláusula JOIN](../../sql-reference/statements/select/join.md#select-join)
--   [Unirse al motor de tabla](../../engines/table-engines/special/join.md)
-
-## max_partitions_per_insert_block {#max-partitions-per-insert-block}
-
-Limita el número máximo de particiones en un único bloque insertado.
-
--   Entero positivo.
--   0 — Unlimited number of partitions.
-
-Valor predeterminado: 100.
-
-**Detalles**
-
-Al insertar datos, ClickHouse calcula el número de particiones en el bloque insertado. Si el número de particiones es mayor que `max_partitions_per_insert_block`, ClickHouse lanza una excepción con el siguiente texto:
-
-> “Too many partitions for single INSERT block (more than” ¿Cómo puedo hacerlo? “). The limit is controlled by ‘max_partitions_per_insert_block’ setting. A large number of partitions is a common misconception. It will lead to severe negative performance impact, including slow server startup, slow INSERT queries and slow SELECT queries. Recommended total number of partitions for a table is under 1000..10000. Please note, that partitioning is not intended to speed up SELECT queries (ORDER BY key is sufficient to make range queries fast). Partitions are intended for data manipulation (DROP PARTITION, etc).”
-
-[Artículo Original](https://clickhouse.tech/docs/en/operations/settings/query_complexity/) <!--hide-->
diff --git a/docs/es/operations/settings/settings-profiles.md b/docs/es/operations/settings/settings-profiles.md
deleted file mode 100644
index 3d96a2c8fba..00000000000
--- a/docs/es/operations/settings/settings-profiles.md
+++ /dev/null
@@ -1,81 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 61
-toc_title: "Perfiles de configuraci\xF3n"
----
-
-# Perfiles de configuración {#settings-profiles}
-
-Un perfil de configuración es una colección de configuraciones agrupadas con el mismo nombre.
-
-!!! note "Información"
-    ClickHouse también es compatible [Flujo de trabajo controlado por SQL](../access-rights.md#access-control) para administrar perfiles de configuración. Recomendamos usarlo.
-
-Un perfil puede tener cualquier nombre. El perfil puede tener cualquier nombre. Puede especificar el mismo perfil para diferentes usuarios. Lo más importante que puede escribir en el perfil de configuración es `readonly=1`, que asegura el acceso de sólo lectura.
-
-Los perfiles de configuración pueden heredar unos de otros. Para usar la herencia, indique una o varias `profile` configuraciones antes de las demás configuraciones que se enumeran en el perfil. En caso de que se defina una configuración en diferentes perfiles, se utiliza la última definida.
-
-Para aplicar todos los ajustes de un perfil, establezca el `profile` configuración.
-
-Ejemplo:
-
-Instale el `web` perfil.
-
-``` sql
-SET profile = 'web'
-```
-
-Los perfiles de configuración se declaran en el archivo de configuración del usuario. Esto suele ser `users.xml`.
-
-Ejemplo:
-
-``` xml
-<!-- Settings profiles -->
-<profiles>
-    <!-- Default settings -->
-    <default>
-        <!-- The maximum number of threads when running a single query. -->
-        <max_threads>8</max_threads>
-    </default>
-
-    <!-- Settings for quries from the user interface -->
-    <web>
-        <max_rows_to_read>1000000000</max_rows_to_read>
-        <max_bytes_to_read>100000000000</max_bytes_to_read>
-
-        <max_rows_to_group_by>1000000</max_rows_to_group_by>
-        <group_by_overflow_mode>any</group_by_overflow_mode>
-
-        <max_rows_to_sort>1000000</max_rows_to_sort>
-        <max_bytes_to_sort>1000000000</max_bytes_to_sort>
-
-        <max_result_rows>100000</max_result_rows>
-        <max_result_bytes>100000000</max_result_bytes>
-        <result_overflow_mode>break</result_overflow_mode>
-
-        <max_execution_time>600</max_execution_time>
-        <min_execution_speed>1000000</min_execution_speed>
-        <timeout_before_checking_execution_speed>15</timeout_before_checking_execution_speed>
-
-        <max_columns_to_read>25</max_columns_to_read>
-        <max_temporary_columns>100</max_temporary_columns>
-        <max_temporary_non_const_columns>50</max_temporary_non_const_columns>
-
-        <max_subquery_depth>2</max_subquery_depth>
-        <max_pipeline_depth>25</max_pipeline_depth>
-        <max_ast_depth>50</max_ast_depth>
-        <max_ast_elements>100</max_ast_elements>
-
-        <readonly>1</readonly>
-    </web>
-</profiles>
-```
-
-El ejemplo especifica dos perfiles: `default` y `web`.
-
-El `default` tiene un propósito especial: siempre debe estar presente y se aplica al iniciar el servidor. En otras palabras, el `default` perfil contiene la configuración predeterminada.
-
-El `web` profile es un perfil regular que se puede establecer utilizando el `SET` consulta o utilizando un parámetro URL en una consulta HTTP.
-
-[Artículo Original](https://clickhouse.tech/docs/en/operations/settings/settings_profiles/) <!--hide-->
diff --git a/docs/es/operations/settings/settings-users.md b/docs/es/operations/settings/settings-users.md
deleted file mode 100644
index 1c1ac7914f0..00000000000
--- a/docs/es/operations/settings/settings-users.md
+++ /dev/null
@@ -1,164 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 63
-toc_title: "Configuraci\xF3n del usuario"
----
-
-# Configuración del usuario {#user-settings}
-
-El `users` sección de la `user.xml` el archivo de configuración contiene la configuración del usuario.
-
-!!! note "Información"
-    ClickHouse también es compatible [Flujo de trabajo controlado por SQL](../access-rights.md#access-control) para la gestión de usuarios. Recomendamos usarlo.
-
-Estructura del `users` apartado:
-
-``` xml
-<users>
-    <!-- If user name was not specified, 'default' user is used. -->
-    <user_name>
-        <password></password>
-        <!-- Or -->
-        <password_sha256_hex></password_sha256_hex>
-
-        <access_management>0|1</access_management>
-
-        <networks incl="networks" replace="replace">
-        </networks>
-
-        <profile>profile_name</profile>
-
-        <quota>default</quota>
-
-        <databases>
-            <database_name>
-                <table_name>
-                    <filter>expression</filter>
-                <table_name>
-            </database_name>
-        </databases>
-    </user_name>
-    <!-- Other users settings -->
-</users>
-```
-
-### user_name/contraseña {#user-namepassword}
-
-La contraseña se puede especificar en texto sin formato o en SHA256 (formato hexagonal).
-
--   Para asignar una contraseña en texto sin formato (**no se recomienda**), colóquelo en un `password` elemento.
-
-    Por ejemplo, `<password>qwerty</password>`. La contraseña se puede dejar en blanco.
-
-<a id="password_sha256_hex"></a>
-
--   Para asignar una contraseña utilizando su hash SHA256, colóquela en un `password_sha256_hex` elemento.
-
-    Por ejemplo, `<password_sha256_hex>65e84be33532fb784c48129675f9eff3a682b27168c0ea744b2cf58ee02337c5</password_sha256_hex>`.
-
-    Ejemplo de cómo generar una contraseña desde el shell:
-
-          PASSWORD=$(base64 < /dev/urandom | head -c8); echo "$PASSWORD"; echo -n "$PASSWORD" | sha256sum | tr -d '-'
-
-    La primera línea del resultado es la contraseña. La segunda línea es el hash SHA256 correspondiente.
-
-<a id="password_double_sha1_hex"></a>
-
--   Para la compatibilidad con los clientes MySQL, la contraseña se puede especificar en doble hash SHA1. Colóquelo en `password_double_sha1_hex` elemento.
-
-    Por ejemplo, `<password_double_sha1_hex>08b4a0f1de6ad37da17359e592c8d74788a83eb0</password_double_sha1_hex>`.
-
-    Ejemplo de cómo generar una contraseña desde el shell:
-
-          PASSWORD=$(base64 < /dev/urandom | head -c8); echo "$PASSWORD"; echo -n "$PASSWORD" | sha1sum | tr -d '-' | xxd -r -p | sha1sum | tr -d '-'
-
-    La primera línea del resultado es la contraseña. La segunda línea es el hash SHA1 doble correspondiente.
-
-### access_management {#access_management-user-setting}
-
-Esta configuración habilita deshabilita el uso de [control de acceso y gestión de cuentas](../access-rights.md#access-control) para el usuario.
-
-Valores posibles:
-
--   0 — Disabled.
--   1 — Enabled.
-
-Valor predeterminado: 0.
-
-### user_name/redes {#user-namenetworks}
-
-Lista de redes desde las que el usuario puede conectarse al servidor ClickHouse.
-
-Cada elemento de la lista puede tener una de las siguientes formas:
-
--   `<ip>` — IP address or network mask.
-
-    Ejemplos: `213.180.204.3`, `10.0.0.1/8`, `10.0.0.1/255.255.255.0`, `2a02:6b8::3`, `2a02:6b8::3/64`, `2a02:6b8::3/ffff:ffff:ffff:ffff::`.
-
--   `<host>` — Hostname.
-
-    Ejemplo: `example01.host.ru`.
-
-    Para comprobar el acceso, se realiza una consulta DNS y todas las direcciones IP devueltas se comparan con la dirección del mismo nivel.
-
--   `<host_regexp>` — Regular expression for hostnames.
-
-    Ejemplo, `^example\d\d-\d\d-\d\.host\.ru$`
-
-    Para comprobar el acceso, un [Consulta de DNS PTR](https://en.wikipedia.org/wiki/Reverse_DNS_lookup) se realiza para la dirección del mismo nivel y luego se aplica la expresión regular especificada. A continuación, se realiza otra consulta DNS para los resultados de la consulta PTR y todas las direcciones recibidas se comparan con la dirección del mismo nivel. Recomendamos encarecidamente que regexp termine con $ .
-
-Todos los resultados de las solicitudes DNS se almacenan en caché hasta que el servidor se reinicia.
-
-**Ejemplos**
-
-Para abrir el acceso del usuario desde cualquier red, especifique:
-
-``` xml
-<ip>::/0</ip>
-```
-
-!!! warning "Advertencia"
-    No es seguro abrir el acceso desde cualquier red a menos que tenga un firewall configurado correctamente o el servidor no esté conectado directamente a Internet.
-
-Para abrir el acceso solo desde localhost, especifique:
-
-``` xml
-<ip>::1</ip>
-<ip>127.0.0.1</ip>
-```
-
-### user_name/perfil {#user-nameprofile}
-
-Puede asignar un perfil de configuración para el usuario. Los perfiles de configuración se configuran en una sección separada del `users.xml` file. Para obtener más información, consulte [Perfiles de configuración](settings-profiles.md).
-
-### user_name/cuota {#user-namequota}
-
-Las cuotas le permiten realizar un seguimiento o limitar el uso de recursos durante un período de tiempo. Las cuotas se configuran en el `quotas`
-sección de la `users.xml` archivo de configuración.
-
-Puede asignar un conjunto de cuotas para el usuario. Para obtener una descripción detallada de la configuración de las cuotas, consulte [Cuota](../quotas.md#quotas).
-
-### nombre_usuario/bases de datos {#user-namedatabases}
-
-En esta sección, puede limitar las filas devueltas por ClickHouse para `SELECT` consultas realizadas por el usuario actual, implementando así la seguridad básica a nivel de fila.
-
-**Ejemplo**
-
-La siguiente configuración obliga a que el usuario `user1` sólo puede ver las filas de `table1` como resultado de `SELECT` consultas, donde el valor de la `id` campo es 1000.
-
-``` xml
-<user1>
-    <databases>
-        <database_name>
-            <table1>
-                <filter>id = 1000</filter>
-            </table1>
-        </database_name>
-    </databases>
-</user1>
-```
-
-El `filter` puede ser cualquier expresión que resulte en un [UInt8](../../sql-reference/data-types/int-uint.md)-tipo de valor. Por lo general, contiene comparaciones y operadores lógicos. Filas de `database_name.table1` donde los resultados del filtro a 0 no se devuelven para este usuario. El filtrado es incompatible con `PREWHERE` operaciones y desactiva `WHERE→PREWHERE` optimización.
-
-[Artículo Original](https://clickhouse.tech/docs/en/operations/settings/settings_users/) <!--hide-->
diff --git a/docs/es/operations/settings/settings.md b/docs/es/operations/settings/settings.md
deleted file mode 100644
index 62511dd9fc0..00000000000
--- a/docs/es/operations/settings/settings.md
+++ /dev/null
@@ -1,1254 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
----
-
-# Configuración {#settings}
-
-## distributed_product_mode {#distributed-product-mode}
-
-Cambia el comportamiento de [subconsultas distribuidas](../../sql-reference/operators/in.md).
-
-ClickHouse applies this setting when the query contains the product of distributed tables, i.e. when the query for a distributed table contains a non-GLOBAL subquery for the distributed table.
-
-Restricción:
-
--   Solo se aplica para las subconsultas IN y JOIN.
--   Solo si la sección FROM utiliza una tabla distribuida que contiene más de un fragmento.
--   Si la subconsulta se refiere a una tabla distribuida que contiene más de un fragmento.
--   No se usa para un valor de tabla [remoto](../../sql-reference/table-functions/remote.md) función.
-
-Valores posibles:
-
--   `deny` — Default value. Prohibits using these types of subqueries (returns the “Double-distributed in/JOIN subqueries is denied” salvedad).
--   `local` — Replaces the database and table in the subquery with local ones for the destination server (shard), leaving the normal `IN`/`JOIN.`
--   `global` — Replaces the `IN`/`JOIN` consulta con `GLOBAL IN`/`GLOBAL JOIN.`
--   `allow` — Allows the use of these types of subqueries.
-
-## enable_optimize_predicate_expression {#enable-optimize-predicate-expression}
-
-Activa el pushdown de predicado en `SELECT` consulta.
-
-La extracción de predicados puede reducir significativamente el tráfico de red para consultas distribuidas.
-
-Valores posibles:
-
--   0 — Disabled.
--   1 — Enabled.
-
-Valor predeterminado: 1.
-
-Uso
-
-Considere las siguientes consultas:
-
-1.  `SELECT count() FROM test_table WHERE date = '2018-10-10'`
-2.  `SELECT count() FROM (SELECT * FROM test_table) WHERE date = '2018-10-10'`
-
-Si `enable_optimize_predicate_expression = 1`, entonces el tiempo de ejecución de estas consultas es igual porque se aplica ClickHouse `WHERE` a la subconsulta al procesarla.
-
-Si `enable_optimize_predicate_expression = 0`, entonces el tiempo de ejecución de la segunda consulta es mucho más largo, porque el `WHERE` cláusula se aplica a todos los datos después de que finalice la subconsulta.
-
-## fallback_to_stale_replicas_for_distributed_queries {#settings-fallback_to_stale_replicas_for_distributed_queries}
-
-Fuerza una consulta a una réplica obsoleta si los datos actualizados no están disponibles. Ver [Replicación](../../engines/table-engines/mergetree-family/replication.md).
-
-ClickHouse selecciona la más relevante de las réplicas obsoletas de la tabla.
-
-Se utiliza al realizar `SELECT` desde una tabla distribuida que apunta a tablas replicadas.
-
-De forma predeterminada, 1 (habilitado).
-
-## Fecha de nacimiento {#settings-force_index_by_date}
-
-Deshabilita la ejecución de consultas si el índice no se puede usar por fecha.
-
-Funciona con tablas de la familia MergeTree.
-
-Si `force_index_by_date=1`, ClickHouse comprueba si la consulta tiene una condición de clave de fecha que se puede usar para restringir intervalos de datos. Si no hay una condición adecuada, arroja una excepción. Sin embargo, no comprueba si la condición reduce la cantidad de datos a leer. Por ejemplo, la condición `Date != ' 2000-01-01 '` es aceptable incluso cuando coincide con todos los datos de la tabla (es decir, ejecutar la consulta requiere un escaneo completo). Para obtener más información acerca de los intervalos de datos en las tablas MergeTree, vea [Método de codificación de datos:](../../engines/table-engines/mergetree-family/mergetree.md).
-
-## force_primary_key {#force-primary-key}
-
-Deshabilita la ejecución de consultas si no es posible la indexación mediante la clave principal.
-
-Funciona con tablas de la familia MergeTree.
-
-Si `force_primary_key=1`, ClickHouse comprueba si la consulta tiene una condición de clave principal que se puede usar para restringir rangos de datos. Si no hay una condición adecuada, arroja una excepción. Sin embargo, no comprueba si la condición reduce la cantidad de datos a leer. Para obtener más información acerca de los intervalos de datos en las tablas MergeTree, consulte [Método de codificación de datos:](../../engines/table-engines/mergetree-family/mergetree.md).
-
-## Formato_esquema {#format-schema}
-
-Este parámetro es útil cuando se utilizan formatos que requieren una definición de esquema, como [Cap'n Proto](https://capnproto.org/) o [Protobuf](https://developers.google.com/protocol-buffers/). El valor depende del formato.
-
-## fsync_metadata {#fsync-metadata}
-
-Habilita o deshabilita [fsync](http://pubs.opengroup.org/onlinepubs/9699919799/functions/fsync.html) al escribir `.sql` file. Habilitado de forma predeterminada.
-
-Tiene sentido desactivarlo si el servidor tiene millones de pequeñas tablas que se crean y destruyen constantemente.
-
-## enable_http_compression {#settings-enable_http_compression}
-
-Habilita o deshabilita la compresión de datos en la respuesta a una solicitud HTTP.
-
-Para obtener más información, lea el [Descripción de la interfaz HTTP](../../interfaces/http.md).
-
-Valores posibles:
-
--   0 — Disabled.
--   1 — Enabled.
-
-Valor predeterminado: 0.
-
-## http_zlib_compression_level {#settings-http_zlib_compression_level}
-
-Establece el nivel de compresión de datos en la respuesta a una solicitud HTTP si [enable_http_compression = 1](#settings-enable_http_compression).
-
-Valores posibles: Números del 1 al 9.
-
-Valor predeterminado: 3.
-
-## http_native_compression_disable_checksumming_on_decompress {#settings-http_native_compression_disable_checksumming_on_decompress}
-
-Habilita o deshabilita la verificación de suma de comprobación al descomprimir los datos HTTP POST del cliente. Se usa solo para el formato de compresión nativa ClickHouse (no se usa con `gzip` o `deflate`).
-
-Para obtener más información, lea el [Descripción de la interfaz HTTP](../../interfaces/http.md).
-
-Valores posibles:
-
--   0 — Disabled.
--   1 — Enabled.
-
-Valor predeterminado: 0.
-
-## send_progress_in_http_headers {#settings-send_progress_in_http_headers}
-
-Habilita o deshabilita `X-ClickHouse-Progress` Encabezados de respuesta HTTP en `clickhouse-server` respuesta.
-
-Para obtener más información, lea el [Descripción de la interfaz HTTP](../../interfaces/http.md).
-
-Valores posibles:
-
--   0 — Disabled.
--   1 — Enabled.
-
-Valor predeterminado: 0.
-
-## Nombre de la red inalámbrica (SSID): {#setting-max_http_get_redirects}
-
-Limita el número máximo de saltos de redirección HTTP GET para [URL](../../engines/table-engines/special/url.md)-mesas de motor. La configuración se aplica a ambos tipos de tablas: las creadas por [CREATE TABLE](../../sql-reference/statements/create.md#create-table-query) consulta y por el [URL](../../sql-reference/table-functions/url.md) función de la tabla.
-
-Valores posibles:
-
--   Cualquier número entero positivo de saltos.
--   0 — No hops allowed.
-
-Valor predeterminado: 0.
-
-## Entrada_format_allow_errors_num {#settings-input_format_allow_errors_num}
-
-Establece el número máximo de errores aceptables al leer desde formatos de texto (CSV, TSV, etc.).
-
-El valor predeterminado es 0.
-
-Siempre emparejarlo con `input_format_allow_errors_ratio`.
-
-Si se produjo un error al leer filas, pero el contador de errores sigue siendo menor que `input_format_allow_errors_num`, ClickHouse ignora la fila y pasa a la siguiente.
-
-Si ambos `input_format_allow_errors_num` y `input_format_allow_errors_ratio` se exceden, ClickHouse lanza una excepción.
-
-## Entrada_format_allow_errors_ratio {#settings-input_format_allow_errors_ratio}
-
-Establece el porcentaje máximo de errores permitidos al leer desde formatos de texto (CSV, TSV, etc.).
-El porcentaje de errores se establece como un número de punto flotante entre 0 y 1.
-
-El valor predeterminado es 0.
-
-Siempre emparejarlo con `input_format_allow_errors_num`.
-
-Si se produjo un error al leer filas, pero el contador de errores sigue siendo menor que `input_format_allow_errors_ratio`, ClickHouse ignora la fila y pasa a la siguiente.
-
-Si ambos `input_format_allow_errors_num` y `input_format_allow_errors_ratio` se exceden, ClickHouse lanza una excepción.
-
-## input_format_values_interpret_expressions {#settings-input_format_values_interpret_expressions}
-
-Habilita o deshabilita el analizador SQL completo si el analizador de secuencias rápidas no puede analizar los datos. Esta configuración sólo se utiliza para [Valor](../../interfaces/formats.md#data-format-values) formato en la inserción de datos. Para obtener más información sobre el análisis de sintaxis, consulte [Sintaxis](../../sql-reference/syntax.md) apartado.
-
-Valores posibles:
-
--   0 — Disabled.
-
-    En este caso, debe proporcionar datos con formato. Ver el [Formato](../../interfaces/formats.md) apartado.
-
--   1 — Enabled.
-
-    En este caso, puede usar una expresión SQL como valor, pero la inserción de datos es mucho más lenta de esta manera. Si inserta solo datos con formato, ClickHouse se comporta como si el valor de configuración fuera 0.
-
-Valor predeterminado: 1.
-
-Ejemplo de uso
-
-Inserte el [FechaHora](../../sql-reference/data-types/datetime.md) valor de tipo con los diferentes ajustes.
-
-``` sql
-SET input_format_values_interpret_expressions = 0;
-INSERT INTO datetime_t VALUES (now())
-```
-
-``` text
-Exception on client:
-Code: 27. DB::Exception: Cannot parse input: expected ) before: now()): (at row 1)
-```
-
-``` sql
-SET input_format_values_interpret_expressions = 1;
-INSERT INTO datetime_t VALUES (now())
-```
-
-``` text
-Ok.
-```
-
-La última consulta es equivalente a la siguiente:
-
-``` sql
-SET input_format_values_interpret_expressions = 0;
-INSERT INTO datetime_t SELECT now()
-```
-
-``` text
-Ok.
-```
-
-## input_format_values_deduce_templates_of_expressions {#settings-input_format_values_deduce_templates_of_expressions}
-
-Habilita o deshabilita la deducción de plantilla para expresiones SQL en [Valor](../../interfaces/formats.md#data-format-values) formato. Permite analizar e interpretar expresiones en `Values` mucho más rápido si las expresiones en filas consecutivas tienen la misma estructura. ClickHouse intenta deducir la plantilla de una expresión, analizar las siguientes filas utilizando esta plantilla y evaluar la expresión en un lote de filas analizadas correctamente.
-
-Valores posibles:
-
--   0 — Disabled.
--   1 — Enabled.
-
-Valor predeterminado: 1.
-
-Para la siguiente consulta:
-
-``` sql
-INSERT INTO test VALUES (lower('Hello')), (lower('world')), (lower('INSERT')), (upper('Values')), ...
-```
-
--   Si `input_format_values_interpret_expressions=1` y `format_values_deduce_templates_of_expressions=0`, las expresiones se interpretan por separado para cada fila (esto es muy lento para un gran número de filas).
--   Si `input_format_values_interpret_expressions=0` y `format_values_deduce_templates_of_expressions=1`, las expresiones en la primera, segunda y tercera filas se analizan usando la plantilla `lower(String)` e interpretados juntos, la expresión en la cuarta fila se analiza con otra plantilla (`upper(String)`).
--   Si `input_format_values_interpret_expressions=1` y `format_values_deduce_templates_of_expressions=1`, lo mismo que en el caso anterior, pero también permite la alternativa a la interpretación de expresiones por separado si no es posible deducir la plantilla.
-
-## Entrada_format_values_accurate_types_of_literals {#settings-input-format-values-accurate-types-of-literals}
-
-Esta configuración sólo se utiliza cuando `input_format_values_deduce_templates_of_expressions = 1`. Puede suceder que las expresiones para alguna columna tengan la misma estructura, pero contengan literales numéricos de diferentes tipos, por ejemplo
-
-``` sql
-(..., abs(0), ...),             -- UInt64 literal
-(..., abs(3.141592654), ...),   -- Float64 literal
-(..., abs(-1), ...),            -- Int64 literal
-```
-
-Valores posibles:
-
--   0 — Disabled.
-
-    In this case, ClickHouse may use a more general type for some literals (e.g., `Float64` o `Int64` en lugar de `UInt64` para `42`), pero puede causar problemas de desbordamiento y precisión.
-
--   1 — Enabled.
-
-    En este caso, ClickHouse comprueba el tipo real de literal y utiliza una plantilla de expresión del tipo correspondiente. En algunos casos, puede ralentizar significativamente la evaluación de expresiones en `Values`.
-
-Valor predeterminado: 1.
-
-## Entrada_format_defaults_for_omitted_fields {#session_settings-input_format_defaults_for_omitted_fields}
-
-Al realizar `INSERT` consultas, reemplace los valores de columna de entrada omitidos con valores predeterminados de las columnas respectivas. Esta opción sólo se aplica a [JSONEachRow](../../interfaces/formats.md#jsoneachrow), [CSV](../../interfaces/formats.md#csv) y [TabSeparated](../../interfaces/formats.md#tabseparated) formato.
-
-!!! note "Nota"
-    Cuando esta opción está habilitada, los metadatos de la tabla extendida se envían del servidor al cliente. Consume recursos informáticos adicionales en el servidor y puede reducir el rendimiento.
-
-Valores posibles:
-
--   0 — Disabled.
--   1 — Enabled.
-
-Valor predeterminado: 1.
-
-## input_format_tsv_empty_as_default {#settings-input-format-tsv-empty-as-default}
-
-Cuando esté habilitado, reemplace los campos de entrada vacíos en TSV con valores predeterminados. Para expresiones predeterminadas complejas `input_format_defaults_for_omitted_fields` debe estar habilitado también.
-
-Deshabilitado de forma predeterminada.
-
-## input_format_null_as_default {#settings-input-format-null-as-default}
-
-Habilita o deshabilita el uso de valores predeterminados si los datos de entrada `NULL`, pero el tipo de datos de la columna correspondiente en no `Nullable(T)` (para formatos de entrada de texto).
-
-## input_format_skip_unknown_fields {#settings-input-format-skip-unknown-fields}
-
-Habilita o deshabilita omitir la inserción de datos adicionales.
-
-Al escribir datos, ClickHouse produce una excepción si los datos de entrada contienen columnas que no existen en la tabla de destino. Si la omisión está habilitada, ClickHouse no inserta datos adicionales y no lanza una excepción.
-
-Formatos soportados:
-
--   [JSONEachRow](../../interfaces/formats.md#jsoneachrow)
--   [CSVWithNames](../../interfaces/formats.md#csvwithnames)
--   [TabSeparatedWithNames](../../interfaces/formats.md#tabseparatedwithnames)
--   [TSKV](../../interfaces/formats.md#tskv)
-
-Valores posibles:
-
--   0 — Disabled.
--   1 — Enabled.
-
-Valor predeterminado: 0.
-
-## Entrada_format_import_nested_json {#settings-input_format_import_nested_json}
-
-Habilita o deshabilita la inserción de datos JSON con objetos anidados.
-
-Formatos soportados:
-
--   [JSONEachRow](../../interfaces/formats.md#jsoneachrow)
-
-Valores posibles:
-
--   0 — Disabled.
--   1 — Enabled.
-
-Valor predeterminado: 0.
-
-Ver también:
-
--   [Uso de estructuras anidadas](../../interfaces/formats.md#jsoneachrow-nested) con el `JSONEachRow` formato.
-
-## Entrada_format_with_names_use_header {#settings-input-format-with-names-use-header}
-
-Habilita o deshabilita la comprobación del orden de las columnas al insertar datos.
-
-Para mejorar el rendimiento de la inserción, se recomienda deshabilitar esta comprobación si está seguro de que el orden de columna de los datos de entrada es el mismo que en la tabla de destino.
-
-Formatos soportados:
-
--   [CSVWithNames](../../interfaces/formats.md#csvwithnames)
--   [TabSeparatedWithNames](../../interfaces/formats.md#tabseparatedwithnames)
-
-Valores posibles:
-
--   0 — Disabled.
--   1 — Enabled.
-
-Valor predeterminado: 1.
-
-## Date_time_input_format {#settings-date_time_input_format}
-
-Permite elegir un analizador de la representación de texto de fecha y hora.
-
-La configuración no se aplica a [Funciones de fecha y hora](../../sql-reference/functions/date-time-functions.md).
-
-Valores posibles:
-
--   `'best_effort'` — Enables extended parsing.
-
-    ClickHouse puede analizar el básico `YYYY-MM-DD HH:MM:SS` formato y todo [ISO 8601](https://en.wikipedia.org/wiki/ISO_8601) formatos de fecha y hora. Por ejemplo, `'2018-06-08T01:02:03.000Z'`.
-
--   `'basic'` — Use basic parser.
-
-    ClickHouse puede analizar solo lo básico `YYYY-MM-DD HH:MM:SS` formato. Por ejemplo, `'2019-08-20 10:18:56'`.
-
-Valor predeterminado: `'basic'`.
-
-Ver también:
-
--   [Tipo de datos DateTime.](../../sql-reference/data-types/datetime.md)
--   [Funciones para trabajar con fechas y horas.](../../sql-reference/functions/date-time-functions.md)
-
-## Por favor, introduzca su dirección de correo electrónico {#settings-join_default_strictness}
-
-Establece el rigor predeterminado para [Cláusulas JOIN](../../sql-reference/statements/select/join.md#select-join).
-
-Valores posibles:
-
--   `ALL` — If the right table has several matching rows, ClickHouse creates a [Producto cartesiano](https://en.wikipedia.org/wiki/Cartesian_product) de filas coincidentes. Esta es la normal `JOIN` comportamiento de SQL estándar.
--   `ANY` — If the right table has several matching rows, only the first one found is joined. If the right table has only one matching row, the results of `ANY` y `ALL` son los mismos.
--   `ASOF` — For joining sequences with an uncertain match.
--   `Empty string` — If `ALL` o `ANY` no se especifica en la consulta, ClickHouse produce una excepción.
-
-Valor predeterminado: `ALL`.
-
-## join_any_take_last_row {#settings-join_any_take_last_row}
-
-Cambia el comportamiento de las operaciones de unión con `ANY` rigor.
-
-!!! warning "Atención"
-    Esta configuración sólo se aplica a `JOIN` operaciones con [Unir](../../engines/table-engines/special/join.md) mesas de motores.
-
-Valores posibles:
-
--   0 — If the right table has more than one matching row, only the first one found is joined.
--   1 — If the right table has more than one matching row, only the last one found is joined.
-
-Valor predeterminado: 0.
-
-Ver también:
-
--   [Cláusula JOIN](../../sql-reference/statements/select/join.md#select-join)
--   [Unirse al motor de tabla](../../engines/table-engines/special/join.md)
--   [Por favor, introduzca su dirección de correo electrónico](#settings-join_default_strictness)
-
-## Sistema abierto {#join_use_nulls}
-
-Establece el tipo de [JOIN](../../sql-reference/statements/select/join.md) comportamiento. Al fusionar tablas, pueden aparecer celdas vacías. ClickHouse los rellena de manera diferente según esta configuración.
-
-Valores posibles:
-
--   0 — The empty cells are filled with the default value of the corresponding field type.
--   1 — `JOIN` se comporta de la misma manera que en SQL estándar. El tipo del campo correspondiente se convierte en [NULL](../../sql-reference/data-types/nullable.md#data_type-nullable), y las celdas vacías se llenan con [NULL](../../sql-reference/syntax.md).
-
-Valor predeterminado: 0.
-
-## max_block_size {#setting-max_block_size}
-
-En ClickHouse, los datos se procesan mediante bloques (conjuntos de partes de columna). Los ciclos de procesamiento interno para un solo bloque son lo suficientemente eficientes, pero hay gastos notables en cada bloque. El `max_block_size` set es una recomendación para el tamaño del bloque (en un recuento de filas) para cargar desde las tablas. El tamaño del bloque no debe ser demasiado pequeño, por lo que los gastos en cada bloque aún se notan, pero no demasiado grande para que la consulta con LIMIT que se complete después del primer bloque se procese rápidamente. El objetivo es evitar consumir demasiada memoria al extraer un gran número de columnas en múltiples subprocesos y preservar al menos alguna localidad de caché.
-
-Valor predeterminado: 65,536.
-
-Bloquea el tamaño de `max_block_size` no siempre se cargan desde la tabla. Si es obvio que se deben recuperar menos datos, se procesa un bloque más pequeño.
-
-## preferred_block_size_bytes {#preferred-block-size-bytes}
-
-Utilizado para el mismo propósito que `max_block_size`, pero establece el tamaño de bloque recomendado en bytes adaptándolo al número de filas en el bloque.
-Sin embargo, el tamaño del bloque no puede ser más que `max_block_size` filas.
-Por defecto: 1,000,000. Solo funciona cuando se lee desde los motores MergeTree.
-
-## merge_tree_min_rows_for_concurrent_read {#setting-merge-tree-min-rows-for-concurrent-read}
-
-Si el número de filas que se leerán de un fichero [Método de codificación de datos:](../../engines/table-engines/mergetree-family/mergetree.md) mesa excede `merge_tree_min_rows_for_concurrent_read` luego ClickHouse intenta realizar una lectura simultánea de este archivo en varios hilos.
-
-Valores posibles:
-
--   Cualquier entero positivo.
-
-Valor predeterminado: 163840.
-
-## merge_tree_min_bytes_for_concurrent_read {#setting-merge-tree-min-bytes-for-concurrent-read}
-
-Si el número de bytes a leer de un archivo de un [Método de codificación de datos:](../../engines/table-engines/mergetree-family/mergetree.md)-La tabla del motor excede `merge_tree_min_bytes_for_concurrent_read`, entonces ClickHouse intenta leer simultáneamente este archivo en varios subprocesos.
-
-Valor posible:
-
--   Cualquier entero positivo.
-
-Valor predeterminado: 251658240.
-
-## Método de codificación de datos: {#setting-merge-tree-min-rows-for-seek}
-
-Si la distancia entre dos bloques de datos que se leen en un archivo es menor que `merge_tree_min_rows_for_seek` filas, luego ClickHouse no busca a través del archivo, sino que lee los datos secuencialmente.
-
-Valores posibles:
-
--   Cualquier entero positivo.
-
-Valor predeterminado: 0.
-
-## merge_tree_min_bytes_for_seek {#setting-merge-tree-min-bytes-for-seek}
-
-Si la distancia entre dos bloques de datos que se leen en un archivo es menor que `merge_tree_min_bytes_for_seek` bytes, luego ClickHouse lee secuencialmente un rango de archivos que contiene ambos bloques, evitando así la búsqueda adicional.
-
-Valores posibles:
-
--   Cualquier entero positivo.
-
-Valor predeterminado: 0.
-
-## merge_tree_coarse_index_granularity {#setting-merge-tree-coarse-index-granularity}
-
-Al buscar datos, ClickHouse comprueba las marcas de datos en el archivo de índice. Si ClickHouse encuentra que las claves requeridas están en algún rango, divide este rango en `merge_tree_coarse_index_granularity` subintervalos y busca las claves necesarias allí de forma recursiva.
-
-Valores posibles:
-
--   Cualquier entero incluso positivo.
-
-Valor predeterminado: 8.
-
-## merge_tree_max_rows_to_use_cache {#setting-merge-tree-max-rows-to-use-cache}
-
-Si ClickHouse debería leer más de `merge_tree_max_rows_to_use_cache` en una consulta, no usa la memoria caché de bloques sin comprimir.
-
-La memoria caché de bloques sin comprimir almacena datos extraídos para consultas. ClickHouse utiliza esta memoria caché para acelerar las respuestas a pequeñas consultas repetidas. Esta configuración protege la memoria caché del deterioro de las consultas que leen una gran cantidad de datos. El [Uncompressed_cache_size](../server-configuration-parameters/settings.md#server-settings-uncompressed_cache_size) configuración del servidor define el tamaño de la memoria caché de bloques sin comprimir.
-
-Valores posibles:
-
--   Cualquier entero positivo.
-
-Default value: 128 ✕ 8192.
-
-## merge_tree_max_bytes_to_use_cache {#setting-merge-tree-max-bytes-to-use-cache}
-
-Si ClickHouse debería leer más de `merge_tree_max_bytes_to_use_cache` bytes en una consulta, no usa el caché de bloques sin comprimir.
-
-La memoria caché de bloques sin comprimir almacena datos extraídos para consultas. ClickHouse utiliza esta memoria caché para acelerar las respuestas a pequeñas consultas repetidas. Esta configuración protege la memoria caché del deterioro de las consultas que leen una gran cantidad de datos. El [Uncompressed_cache_size](../server-configuration-parameters/settings.md#server-settings-uncompressed_cache_size) configuración del servidor define el tamaño de la memoria caché de bloques sin comprimir.
-
-Valor posible:
-
--   Cualquier entero positivo.
-
-Valor predeterminado: 2013265920.
-
-## Todos los derechos reservados {#settings-min-bytes-to-use-direct-io}
-
-El volumen de datos mínimo necesario para utilizar el acceso directo de E/S al disco de almacenamiento.
-
-ClickHouse usa esta configuración al leer datos de tablas. Si el volumen total de almacenamiento de todos los datos a leer excede `min_bytes_to_use_direct_io` luego ClickHouse lee los datos del disco de almacenamiento con el `O_DIRECT` opcion.
-
-Valores posibles:
-
--   0 — Direct I/O is disabled.
--   Entero positivo.
-
-Valor predeterminado: 0.
-
-## Log_queries {#settings-log-queries}
-
-Configuración del registro de consultas.
-
-Las consultas enviadas a ClickHouse con esta configuración se registran de acuerdo con las reglas [query_log](../server-configuration-parameters/settings.md#server_configuration_parameters-query-log) parámetro de configuración del servidor.
-
-Ejemplo:
-
-``` text
-log_queries=1
-```
-
-## Nombre de la red inalámbrica (SSID): {#settings-log-queries-min-type}
-
-`query_log` tipo mínimo para iniciar sesión.
-
-Valores posibles:
-- `QUERY_START` (`=1`)
-- `QUERY_FINISH` (`=2`)
-- `EXCEPTION_BEFORE_START` (`=3`)
-- `EXCEPTION_WHILE_PROCESSING` (`=4`)
-
-Valor predeterminado: `QUERY_START`.
-
-Se puede usar para limitar a qué entiries va `query_log`, digamos que eres interesante solo en errores, entonces puedes usar `EXCEPTION_WHILE_PROCESSING`:
-
-``` text
-log_queries_min_type='EXCEPTION_WHILE_PROCESSING'
-```
-
-## Log_query_threads {#settings-log-query-threads}
-
-Configuración del registro de subprocesos de consulta.
-
-Los subprocesos de consultas ejecutados por ClickHouse con esta configuración se registran de acuerdo con las reglas en el [Sistema abierto.](../server-configuration-parameters/settings.md#server_configuration_parameters-query-thread-log) parámetro de configuración del servidor.
-
-Ejemplo:
-
-``` text
-log_query_threads=1
-```
-
-## Max_insert_block_size {#settings-max_insert_block_size}
-
-El tamaño de los bloques a formar para su inserción en una tabla.
-Esta configuración solo se aplica en los casos en que el servidor forma los bloques.
-Por ejemplo, para un INSERT a través de la interfaz HTTP, el servidor analiza el formato de datos y forma bloques del tamaño especificado.
-Pero al usar clickhouse-client, el cliente analiza los datos en sí, y el ‘max_insert_block_size’ configuración en el servidor no afecta el tamaño de los bloques insertados.
-La configuración tampoco tiene un propósito cuando se usa INSERT SELECT , ya que los datos se insertan usando los mismos bloques que se forman después de SELECT .
-
-Valor predeterminado: 1.048.576.
-
-El valor predeterminado es ligeramente más que `max_block_size`. La razón de esto se debe a que ciertos motores de mesa (`*MergeTree`) formar una parte de datos en el disco para cada bloque insertado, que es una entidad bastante grande. Similar, `*MergeTree` las tablas ordenan los datos durante la inserción y un tamaño de bloque lo suficientemente grande permiten clasificar más datos en la RAM.
-
-## Nombre de la red inalámbrica (SSID): {#min-insert-block-size-rows}
-
-Establece el número mínimo de filas en el bloque que se pueden insertar en una tabla `INSERT` consulta. Los bloques de menor tamaño se aplastan en otros más grandes.
-
-Valores posibles:
-
--   Entero positivo.
--   0 — Squashing disabled.
-
-Valor predeterminado: 1048576.
-
-## Todos los derechos reservados {#min-insert-block-size-bytes}
-
-Establece el número mínimo de bytes en el bloque que se pueden insertar en una tabla `INSERT` consulta. Los bloques de menor tamaño se aplastan en otros más grandes.
-
-Valores posibles:
-
--   Entero positivo.
--   0 — Squashing disabled.
-
-Valor predeterminado: 268435456.
-
-## max_replica_delay_for_distributed_queries {#settings-max_replica_delay_for_distributed_queries}
-
-Deshabilita las réplicas rezagadas para consultas distribuidas. Ver [Replicación](../../engines/table-engines/mergetree-family/replication.md).
-
-Establece el tiempo en segundos. Si una réplica tiene un retraso superior al valor establecido, no se utiliza esta réplica.
-
-Valor predeterminado: 300.
-
-Se utiliza al realizar `SELECT` desde una tabla distribuida que apunta a tablas replicadas.
-
-## max_threads {#settings-max_threads}
-
-El número máximo de subprocesos de procesamiento de consultas, excluyendo subprocesos para recuperar datos de servidores ‘max_distributed_connections’ parámetro).
-
-Este parámetro se aplica a los subprocesos que realizan las mismas etapas de la canalización de procesamiento de consultas en paralelo.
-Por ejemplo, al leer desde una tabla, si es posible evaluar expresiones con funciones, filtre con WHERE y preagregue para GROUP BY en paralelo usando al menos ‘max_threads’ número de hilos, entonces ‘max_threads’ se utilizan.
-
-Valor predeterminado: el número de núcleos de CPU físicos.
-
-Si normalmente se ejecuta menos de una consulta SELECT en un servidor a la vez, establezca este parámetro en un valor ligeramente inferior al número real de núcleos de procesador.
-
-Para las consultas que se completan rápidamente debido a un LIMIT, puede establecer un ‘max_threads’. Por ejemplo, si el número necesario de entradas se encuentra en cada bloque y max_threads = 8, entonces se recuperan 8 bloques, aunque hubiera sido suficiente leer solo uno.
-
-Cuanto menor sea el `max_threads` valor, menos memoria se consume.
-
-## Método de codificación de datos: {#settings-max-insert-threads}
-
-El número máximo de subprocesos para ejecutar el `INSERT SELECT` consulta.
-
-Valores posibles:
-
--   0 (or 1) — `INSERT SELECT` sin ejecución paralela.
--   Entero positivo. Más grande que 1.
-
-Valor predeterminado: 0.
-
-Paralelo `INSERT SELECT` sólo tiene efecto si el `SELECT` parte se ejecuta en paralelo, ver [max_threads](#settings-max_threads) configuración.
-Los valores más altos conducirán a un mayor uso de memoria.
-
-## max_compress_block_size {#max-compress-block-size}
-
-El tamaño máximo de bloques de datos sin comprimir antes de comprimir para escribir en una tabla. De forma predeterminada, 1.048.576 (1 MiB). Si se reduce el tamaño, la tasa de compresión se reduce significativamente, la velocidad de compresión y descompresión aumenta ligeramente debido a la localidad de la memoria caché, y se reduce el consumo de memoria. Por lo general, no hay ninguna razón para cambiar esta configuración.
-
-No confunda bloques para la compresión (un fragmento de memoria que consta de bytes) con bloques para el procesamiento de consultas (un conjunto de filas de una tabla).
-
-## Descripción del producto {#min-compress-block-size}
-
-Para [Método de codificación de datos:](../../engines/table-engines/mergetree-family/mergetree.md)" tabla. Para reducir la latencia al procesar consultas, un bloque se comprime al escribir la siguiente marca si su tamaño es al menos ‘min_compress_block_size’. De forma predeterminada, 65.536.
-
-El tamaño real del bloque, si los datos sin comprimir son menores que ‘max_compress_block_size’, no es menor que este valor y no menor que el volumen de datos para una marca.
-
-Veamos un ejemplo. Supongamos que ‘index_granularity’ se estableció en 8192 durante la creación de la tabla.
-
-Estamos escribiendo una columna de tipo UInt32 (4 bytes por valor). Al escribir 8192 filas, el total será de 32 KB de datos. Como min_compress_block_size = 65,536, se formará un bloque comprimido por cada dos marcas.
-
-Estamos escribiendo una columna URL con el tipo String (tamaño promedio de 60 bytes por valor). Al escribir 8192 filas, el promedio será ligeramente inferior a 500 KB de datos. Como esto es más de 65,536, se formará un bloque comprimido para cada marca. En este caso, al leer datos del disco en el rango de una sola marca, los datos adicionales no se descomprimirán.
-
-Por lo general, no hay ninguna razón para cambiar esta configuración.
-
-## max_query_size {#settings-max_query_size}
-
-La parte máxima de una consulta que se puede llevar a la RAM para analizar con el analizador SQL.
-La consulta INSERT también contiene datos para INSERT que es procesado por un analizador de secuencias independiente (que consume O(1) RAM), que no está incluido en esta restricción.
-
-Valor predeterminado: 256 KiB.
-
-## interactive_delay {#interactive-delay}
-
-El intervalo en microsegundos para comprobar si la ejecución de la solicitud se ha cancelado y enviar el progreso.
-
-Valor predeterminado: 100.000 (comprueba la cancelación y envía el progreso diez veces por segundo).
-
-## ¿Cómo puedo hacerlo? {#connect-timeout-receive-timeout-send-timeout}
-
-Tiempos de espera en segundos en el socket utilizado para comunicarse con el cliente.
-
-Valor predeterminado: 10, 300, 300.
-
-## Cancel_http_readonly_queries_on_client_close {#cancel-http-readonly-queries-on-client-close}
-
-Cancels HTTP read-only queries (e.g. SELECT) when a client closes the connection without waiting for the response.
-
-Valor predeterminado: 0
-
-## poll_interval {#poll-interval}
-
-Bloquear en un bucle de espera durante el número especificado de segundos.
-
-Valor predeterminado: 10.
-
-## max_distributed_connections {#max-distributed-connections}
-
-El número máximo de conexiones simultáneas con servidores remotos para el procesamiento distribuido de una única consulta a una única tabla distribuida. Se recomienda establecer un valor no menor que el número de servidores en el clúster.
-
-Valor predeterminado: 1024.
-
-Los siguientes parámetros solo se usan al crear tablas distribuidas (y al iniciar un servidor), por lo que no hay ninguna razón para cambiarlas en tiempo de ejecución.
-
-## Distributed_connections_pool_size {#distributed-connections-pool-size}
-
-El número máximo de conexiones simultáneas con servidores remotos para el procesamiento distribuido de todas las consultas a una única tabla distribuida. Se recomienda establecer un valor no menor que el número de servidores en el clúster.
-
-Valor predeterminado: 1024.
-
-## Conecte_timeout_with_failover_ms {#connect-timeout-with-failover-ms}
-
-El tiempo de espera en milisegundos para conectarse a un servidor remoto para un motor de tablas distribuidas ‘shard’ y ‘replica’ secciones se utilizan en la definición de clúster.
-Si no tiene éxito, se realizan varios intentos para conectarse a varias réplicas.
-
-Valor predeterminado: 50.
-
-## connections_with_failover_max_tries {#connections-with-failover-max-tries}
-
-El número máximo de intentos de conexión con cada réplica para el motor de tablas distribuidas.
-
-Valor predeterminado: 3.
-
-## extremo {#extremes}
-
-Ya sea para contar valores extremos (los mínimos y máximos en columnas de un resultado de consulta). Acepta 0 o 1. De forma predeterminada, 0 (deshabilitado).
-Para obtener más información, consulte la sección “Extreme values”.
-
-## Use_uncompressed_cache {#setting-use_uncompressed_cache}
-
-Si se debe usar una memoria caché de bloques sin comprimir. Acepta 0 o 1. De forma predeterminada, 0 (deshabilitado).
-El uso de la memoria caché sin comprimir (solo para tablas de la familia MergeTree) puede reducir significativamente la latencia y aumentar el rendimiento cuando se trabaja con un gran número de consultas cortas. Habilite esta configuración para los usuarios que envían solicitudes cortas frecuentes. También preste atención al [Uncompressed_cache_size](../server-configuration-parameters/settings.md#server-settings-uncompressed_cache_size) configuration parameter (only set in the config file) – the size of uncompressed cache blocks. By default, it is 8 GiB. The uncompressed cache is filled in as needed and the least-used data is automatically deleted.
-
-Para consultas que leen al menos un volumen algo grande de datos (un millón de filas o más), la memoria caché sin comprimir se desactiva automáticamente para ahorrar espacio para consultas realmente pequeñas. Esto significa que puede mantener el ‘use_uncompressed_cache’ ajuste siempre establecido en 1.
-
-## Reemplazar_running_query {#replace-running-query}
-
-Cuando se utiliza la interfaz HTTP, el ‘query_id’ parámetro puede ser pasado. Se trata de cualquier cadena que sirva como identificador de consulta.
-Si una consulta del mismo usuario ‘query_id’ que ya existe en este momento, el comportamiento depende de la ‘replace_running_query’ parámetro.
-
-`0` (default) – Throw an exception (don't allow the query to run if a query with the same ‘query_id’ ya se está ejecutando).
-
-`1` – Cancel the old query and start running the new one.
-
-El Yandex.Metrica utiliza este parámetro establecido en 1 para implementar sugerencias para las condiciones de segmentación. Después de ingresar el siguiente carácter, si la consulta anterior aún no ha finalizado, debe cancelarse.
-
-## Nombre de la red inalámbrica (SSID): {#stream-flush-interval-ms}
-
-Funciona para tablas con streaming en el caso de un tiempo de espera, o cuando un subproceso genera [Max_insert_block_size](#settings-max_insert_block_size) filas.
-
-El valor predeterminado es 7500.
-
-Cuanto menor sea el valor, más a menudo los datos se vacían en la tabla. Establecer el valor demasiado bajo conduce a un rendimiento deficiente.
-
-## load_balancing {#settings-load_balancing}
-
-Especifica el algoritmo de selección de réplicas que se utiliza para el procesamiento de consultas distribuidas.
-
-ClickHouse admite los siguientes algoritmos para elegir réplicas:
-
--   [Aleatorio](#load_balancing-random) (predeterminada)
--   [Nombre de host más cercano](#load_balancing-nearest_hostname)
--   [En orden](#load_balancing-in_order)
--   [Primero o aleatorio](#load_balancing-first_or_random)
-
-### Aleatorio (por defecto) {#load_balancing-random}
-
-``` sql
-load_balancing = random
-```
-
-El número de errores se cuenta para cada réplica. La consulta se envía a la réplica con el menor número de errores, y si hay varios de estos, a cualquiera de ellos.
-Desventajas: La proximidad del servidor no se tiene en cuenta; si las réplicas tienen datos diferentes, también obtendrá datos diferentes.
-
-### Nombre de host más cercano {#load_balancing-nearest_hostname}
-
-``` sql
-load_balancing = nearest_hostname
-```
-
-The number of errors is counted for each replica. Every 5 minutes, the number of errors is integrally divided by 2. Thus, the number of errors is calculated for a recent time with exponential smoothing. If there is one replica with a minimal number of errors (i.e. errors occurred recently on the other replicas), the query is sent to it. If there are multiple replicas with the same minimal number of errors, the query is sent to the replica with a hostname that is most similar to the server's hostname in the config file (for the number of different characters in identical positions, up to the minimum length of both hostnames).
-
-Por ejemplo, example01-01-1 y example01-01-2.yandex.ru son diferentes en una posición, mientras que example01-01-1 y example01-02-2 difieren en dos lugares.
-Este método puede parecer primitivo, pero no requiere datos externos sobre la topología de red, y no compara las direcciones IP, lo que sería complicado para nuestras direcciones IPv6.
-
-Por lo tanto, si hay réplicas equivalentes, se prefiere la más cercana por nombre.
-También podemos suponer que al enviar una consulta al mismo servidor, en ausencia de fallas, una consulta distribuida también irá a los mismos servidores. Por lo tanto, incluso si se colocan datos diferentes en las réplicas, la consulta devolverá principalmente los mismos resultados.
-
-### En orden {#load_balancing-in_order}
-
-``` sql
-load_balancing = in_order
-```
-
-Se accede a las réplicas con el mismo número de errores en el mismo orden en que se especifican en la configuración.
-Este método es apropiado cuando se sabe exactamente qué réplica es preferible.
-
-### Primero o aleatorio {#load_balancing-first_or_random}
-
-``` sql
-load_balancing = first_or_random
-```
-
-Este algoritmo elige la primera réplica del conjunto o una réplica aleatoria si la primera no está disponible. Es efectivo en configuraciones de topología de replicación cruzada, pero inútil en otras configuraciones.
-
-El `first_or_random` resuelve el problema del algoritmo `in_order` algoritmo. Con `in_order`, si una réplica se cae, la siguiente obtiene una carga doble mientras que las réplicas restantes manejan la cantidad habitual de tráfico. Cuando se utiliza el `first_or_random` algoritmo, la carga se distribuye uniformemente entre las réplicas que todavía están disponibles.
-
-## prefer_localhost_replica {#settings-prefer-localhost-replica}
-
-Habilita/deshabilita el uso preferible de la réplica localhost al procesar consultas distribuidas.
-
-Valores posibles:
-
--   1 — ClickHouse always sends a query to the localhost replica if it exists.
--   0 — ClickHouse uses the balancing strategy specified by the [load_balancing](#settings-load_balancing) configuración.
-
-Valor predeterminado: 1.
-
-!!! warning "Advertencia"
-    Deshabilite esta configuración si usa [max_parallel_replicas](#settings-max_parallel_replicas).
-
-## totals_mode {#totals-mode}
-
-Cómo calcular TOTALS cuando HAVING está presente, así como cuando max_rows_to_group_by y group_by_overflow_mode = ‘any’ están presentes.
-Vea la sección “WITH TOTALS modifier”.
-
-## totals_auto_threshold {#totals-auto-threshold}
-
-El umbral para `totals_mode = 'auto'`.
-Vea la sección “WITH TOTALS modifier”.
-
-## max_parallel_replicas {#settings-max_parallel_replicas}
-
-El número máximo de réplicas para cada fragmento al ejecutar una consulta.
-Para obtener coherencia (para obtener diferentes partes de la misma división de datos), esta opción solo funciona cuando se establece la clave de muestreo.
-El retraso de réplica no está controlado.
-
-## compilar {#compile}
-
-Habilitar la compilación de consultas. De forma predeterminada, 0 (deshabilitado).
-
-La compilación solo se usa para parte de la canalización de procesamiento de consultas: para la primera etapa de agregación (GROUP BY).
-Si se compiló esta parte de la canalización, la consulta puede ejecutarse más rápido debido a la implementación de ciclos cortos y a las llamadas de función agregadas en línea. La mejora del rendimiento máximo (hasta cuatro veces más rápido en casos excepcionales) se ve para consultas con múltiples funciones agregadas simples. Por lo general, la ganancia de rendimiento es insignificante. En casos muy raros, puede ralentizar la ejecución de la consulta.
-
-## min_count_to_compile {#min-count-to-compile}
-
-¿Cuántas veces usar potencialmente un fragmento de código compilado antes de ejecutar la compilación? Por defecto, 3.
-For testing, the value can be set to 0: compilation runs synchronously and the query waits for the end of the compilation process before continuing execution. For all other cases, use values ​​starting with 1. Compilation normally takes about 5-10 seconds.
-Si el valor es 1 o más, la compilación se produce de forma asíncrona en un subproceso independiente. El resultado se utilizará tan pronto como esté listo, incluidas las consultas que se están ejecutando actualmente.
-
-Se requiere código compilado para cada combinación diferente de funciones agregadas utilizadas en la consulta y el tipo de claves en la cláusula GROUP BY.
-The results of the compilation are saved in the build directory in the form of .so files. There is no restriction on the number of compilation results since they don't use very much space. Old results will be used after server restarts, except in the case of a server upgrade – in this case, the old results are deleted.
-
-## output_format_json_quote_64bit_integers {#session_settings-output_format_json_quote_64bit_integers}
-
-Si el valor es true, los enteros aparecen entre comillas cuando se usan los formatos JSON\* Int64 y UInt64 (por compatibilidad con la mayoría de las implementaciones de JavaScript); de lo contrario, los enteros se generan sin las comillas.
-
-## Formato_csv_delimiter {#settings-format_csv_delimiter}
-
-El carácter interpretado como un delimitador en los datos CSV. De forma predeterminada, el delimitador es `,`.
-
-## input_format_csv_unquoted_null_literal_as_null {#settings-input_format_csv_unquoted_null_literal_as_null}
-
-Para el formato de entrada CSV, habilita o deshabilita el análisis de `NULL` como literal (sinónimo de `\N`).
-
-## output_format_csv_crlf_end_of_line {#settings-output-format-csv-crlf-end-of-line}
-
-Utilice el separador de línea de estilo DOS / Windows (CRLF) en CSV en lugar de estilo Unix (LF).
-
-## output_format_tsv_crlf_end_of_line {#settings-output-format-tsv-crlf-end-of-line}
-
-Utilice el separador de línea de estilo DOC / Windows (CRLF) en TSV en lugar del estilo Unix (LF).
-
-## insert_quorum {#settings-insert_quorum}
-
-Habilita las escrituras de quórum.
-
--   Si `insert_quorum < 2`, las escrituras de quórum están deshabilitadas.
--   Si `insert_quorum >= 2`, las escrituras de quórum están habilitadas.
-
-Valor predeterminado: 0.
-
-Quorum escribe
-
-`INSERT` solo tiene éxito cuando ClickHouse logra escribir correctamente datos en el `insert_quorum` de réplicas durante el `insert_quorum_timeout`. Si por alguna razón el número de réplicas con escrituras exitosas no alcanza el `insert_quorum`, la escritura se considera fallida y ClickHouse eliminará el bloque insertado de todas las réplicas donde los datos ya se han escrito.
-
-Todas las réplicas del quórum son consistentes, es decir, contienen datos de todas las réplicas anteriores `INSERT` consulta. El `INSERT` la secuencia está linealizada.
-
-Al leer los datos escritos desde el `insert_quorum` usted puede utilizar el [select_sequential_consistency](#settings-select_sequential_consistency) opcion.
-
-ClickHouse genera una excepción
-
--   Si el número de réplicas disponibles en el momento de la consulta es `insert_quorum`.
--   En un intento de escribir datos cuando el bloque anterior aún no se ha insertado en el `insert_quorum` de réplicas. Esta situación puede ocurrir si el usuario intenta realizar una `INSERT` antes de la anterior con el `insert_quorum` se ha completado.
-
-Ver también:
-
--   [insert_quorum_timeout](#settings-insert_quorum_timeout)
--   [select_sequential_consistency](#settings-select_sequential_consistency)
-
-## insert_quorum_timeout {#settings-insert_quorum_timeout}
-
-Escribir en tiempo de espera de quórum en segundos. Si el tiempo de espera ha pasado y aún no se ha realizado ninguna escritura, ClickHouse generará una excepción y el cliente debe repetir la consulta para escribir el mismo bloque en la misma réplica o en cualquier otra réplica.
-
-Valor predeterminado: 60 segundos.
-
-Ver también:
-
--   [insert_quorum](#settings-insert_quorum)
--   [select_sequential_consistency](#settings-select_sequential_consistency)
-
-## select_sequential_consistency {#settings-select_sequential_consistency}
-
-Habilita o deshabilita la coherencia secuencial para `SELECT` consulta:
-
-Valores posibles:
-
--   0 — Disabled.
--   1 — Enabled.
-
-Valor predeterminado: 0.
-
-Uso
-
-Cuando se habilita la coherencia secuencial, ClickHouse permite al cliente ejecutar el `SELECT` consulta sólo para aquellas réplicas que contienen datos de todas las `INSERT` consultas ejecutadas con `insert_quorum`. Si el cliente hace referencia a una réplica parcial, ClickHouse generará una excepción. La consulta SELECT no incluirá datos que aún no se hayan escrito en el quórum de réplicas.
-
-Ver también:
-
--   [insert_quorum](#settings-insert_quorum)
--   [insert_quorum_timeout](#settings-insert_quorum_timeout)
-
-## insert_deduplicate {#settings-insert-deduplicate}
-
-Habilita o deshabilita la desduplicación de bloques `INSERT` (para tablas replicadas\*
-
-Valores posibles:
-
--   0 — Disabled.
--   1 — Enabled.
-
-Valor predeterminado: 1.
-
-De forma predeterminada, los bloques insertados en tablas replicadas `INSERT` declaración se deduplican (ver [Replicación de datos](../../engines/table-engines/mergetree-family/replication.md)).
-
-## deduplicate_blocks_in_dependent_materialized_views {#settings-deduplicate-blocks-in-dependent-materialized-views}
-
-Habilita o deshabilita la comprobación de desduplicación para las vistas materializadas que reciben datos de tablas replicadas\*.
-
-Valores posibles:
-
-      0 — Disabled.
-      1 — Enabled.
-
-Valor predeterminado: 0.
-
-Uso
-
-De forma predeterminada, la desduplicación no se realiza para las vistas materializadas, sino que se realiza en sentido ascendente, en la tabla de origen.
-Si se omite un bloque INSERTed debido a la desduplicación en la tabla de origen, no habrá inserción en las vistas materializadas adjuntas. Este comportamiento existe para permitir la inserción de datos altamente agregados en vistas materializadas, para los casos en que los bloques insertados son los mismos después de la agregación de vistas materializadas pero derivados de diferentes INSERT en la tabla de origen.
-Al mismo tiempo, este comportamiento “breaks” `INSERT` idempotencia. Si una `INSERT` en la mesa principal fue exitoso y `INSERT` into a materialized view failed (e.g. because of communication failure with Zookeeper) a client will get an error and can retry the operation. However, the materialized view won't receive the second insert because it will be discarded by deduplication in the main (source) table. The setting `deduplicate_blocks_in_dependent_materialized_views` permite cambiar este comportamiento. Al reintentar, una vista materializada recibirá la inserción de repetición y realizará la comprobación de desduplicación por sí misma,
-ignorando el resultado de la comprobación para la tabla de origen, e insertará filas perdidas debido a la primera falla.
-
-## Método de codificación de datos: {#settings-max-network-bytes}
-
-Limita el volumen de datos (en bytes) que se recibe o se transmite a través de la red al ejecutar una consulta. Esta configuración se aplica a cada consulta individual.
-
-Valores posibles:
-
--   Entero positivo.
--   0 — Data volume control is disabled.
-
-Valor predeterminado: 0.
-
-## Método de codificación de datos: {#settings-max-network-bandwidth}
-
-Limita la velocidad del intercambio de datos a través de la red en bytes por segundo. Esta configuración se aplica a todas las consultas.
-
-Valores posibles:
-
--   Entero positivo.
--   0 — Bandwidth control is disabled.
-
-Valor predeterminado: 0.
-
-## Todos los derechos reservados {#settings-max-network-bandwidth-for-user}
-
-Limita la velocidad del intercambio de datos a través de la red en bytes por segundo. Esta configuración se aplica a todas las consultas que se ejecutan simultáneamente realizadas por un único usuario.
-
-Valores posibles:
-
--   Entero positivo.
--   0 — Control of the data speed is disabled.
-
-Valor predeterminado: 0.
-
-## Todos los derechos reservados {#settings-max-network-bandwidth-for-all-users}
-
-Limita la velocidad a la que se intercambian datos a través de la red en bytes por segundo. Esta configuración se aplica a todas las consultas que se ejecutan simultáneamente en el servidor.
-
-Valores posibles:
-
--   Entero positivo.
--   0 — Control of the data speed is disabled.
-
-Valor predeterminado: 0.
-
-## count_distinct_implementation {#settings-count_distinct_implementation}
-
-Especifica cuál de las `uniq*` se deben utilizar para realizar el [COUNT(DISTINCT …)](../../sql-reference/aggregate-functions/reference.md#agg_function-count) construcción.
-
-Valores posibles:
-
--   [uniq](../../sql-reference/aggregate-functions/reference.md#agg_function-uniq)
--   [uniqCombined](../../sql-reference/aggregate-functions/reference.md#agg_function-uniqcombined)
--   [UniqCombined64](../../sql-reference/aggregate-functions/reference.md#agg_function-uniqcombined64)
--   [uniqHLL12](../../sql-reference/aggregate-functions/reference.md#agg_function-uniqhll12)
--   [uniqExact](../../sql-reference/aggregate-functions/reference.md#agg_function-uniqexact)
-
-Valor predeterminado: `uniqExact`.
-
-## skip_unavailable_shards {#settings-skip_unavailable_shards}
-
-Habilita o deshabilita la omisión silenciosa de fragmentos no disponibles.
-
-El fragmento se considera no disponible si todas sus réplicas no están disponibles. Una réplica no está disponible en los siguientes casos:
-
--   ClickHouse no puede conectarse a la réplica por ningún motivo.
-
-    Al conectarse a una réplica, ClickHouse realiza varios intentos. Si todos estos intentos fallan, la réplica se considera que no está disponible.
-
--   La réplica no se puede resolver a través de DNS.
-
-    Si el nombre de host de la réplica no se puede resolver a través de DNS, puede indicar las siguientes situaciones:
-
-    -   El host de Replica no tiene registro DNS. Puede ocurrir en sistemas con DNS dinámico, por ejemplo, [Kubernetes](https://kubernetes.io), donde los nodos pueden ser irresolubles durante el tiempo de inactividad, y esto no es un error.
-
-    -   Error de configuración. El archivo de configuración de ClickHouse contiene un nombre de host incorrecto.
-
-Valores posibles:
-
--   1 — skipping enabled.
-
-    Si un fragmento no está disponible, ClickHouse devuelve un resultado basado en datos parciales y no informa de problemas de disponibilidad de nodos.
-
--   0 — skipping disabled.
-
-    Si un fragmento no está disponible, ClickHouse produce una excepción.
-
-Valor predeterminado: 0.
-
-## Optize_skip_unused_shards {#settings-optimize_skip_unused_shards}
-
-Habilita o deshabilita la omisión de fragmentos no utilizados para las consultas SELECT que tienen la condición de clave de fragmentación en PREWHERE / WHERE (supone que los datos se distribuyen mediante clave de fragmentación, de lo contrario no hacer nada).
-
-Valor predeterminado: 0
-
-## Fuerza_optimize_skip_unused_shards {#settings-force_optimize_skip_unused_shards}
-
-Habilita o deshabilita la ejecución de consultas si [`optimize_skip_unused_shards`](#settings-optimize_skip_unused_shards) no es posible omitir fragmentos no utilizados. Si la omisión no es posible y la configuración está habilitada, se lanzará una excepción.
-
-Valores posibles:
-
--   0 - Discapacitados (no lanza)
--   1: deshabilite la ejecución de consultas solo si la tabla tiene una clave de fragmentación
--   2: deshabilita la ejecución de consultas independientemente de que se haya definido la clave de fragmentación para la tabla
-
-Valor predeterminado: 0
-
-## Optize_throw_if_noop {#setting-optimize_throw_if_noop}
-
-Habilita o deshabilita el lanzamiento de una excepción [OPTIMIZE](../../sql-reference/statements/misc.md#misc_operations-optimize) la consulta no realizó una fusión.
-
-Predeterminada, `OPTIMIZE` devuelve con éxito incluso si no hizo nada. Esta configuración le permite diferenciar estas situaciones y obtener el motivo en un mensaje de excepción.
-
-Valores posibles:
-
--   1 — Throwing an exception is enabled.
--   0 — Throwing an exception is disabled.
-
-Valor predeterminado: 0.
-
-## distributed_replica_error_half_life {#settings-distributed_replica_error_half_life}
-
--   Tipo: segundos
--   Valor predeterminado: 60 segundos
-
-Controla la rapidez con la que se ponen a cero los errores en las tablas distribuidas. Si una réplica no está disponible durante algún tiempo, acumula 5 errores y distribut_replica_error_half_life se establece en 1 segundo, la réplica se considera normal 3 segundos después del último error.
-
-Ver también:
-
--   [Motor de tabla distribuido](../../engines/table-engines/special/distributed.md)
--   [distributed_replica_error_cap](#settings-distributed_replica_error_cap)
-
-## distributed_replica_error_cap {#settings-distributed_replica_error_cap}
-
--   Tipo: unsigned int
--   Valor predeterminado: 1000
-
-El recuento de errores de cada réplica está limitado a este valor, lo que impide que una sola réplica acumule demasiados errores.
-
-Ver también:
-
--   [Motor de tabla distribuido](../../engines/table-engines/special/distributed.md)
--   [distributed_replica_error_half_life](#settings-distributed_replica_error_half_life)
-
-## Distributed_directory_monitor_sleep_time_ms {#distributed_directory_monitor_sleep_time_ms}
-
-Intervalo base para el [Distribuido](../../engines/table-engines/special/distributed.md) motor de tabla para enviar datos. El intervalo real crece exponencialmente en caso de errores.
-
-Valores posibles:
-
--   Un número entero positivo de milisegundos.
-
-Valor predeterminado: 100 milisegundos.
-
-## Distributed_directory_monitor_max_sleep_time_ms {#distributed_directory_monitor_max_sleep_time_ms}
-
-Intervalo máximo para el [Distribuido](../../engines/table-engines/special/distributed.md) motor de tabla para enviar datos. Limita el crecimiento exponencial del intervalo establecido en el [Distributed_directory_monitor_sleep_time_ms](#distributed_directory_monitor_sleep_time_ms) configuración.
-
-Valores posibles:
-
--   Un número entero positivo de milisegundos.
-
-Valor predeterminado: 30000 milisegundos (30 segundos).
-
-## distributed_directory_monitor_batch_inserts {#distributed_directory_monitor_batch_inserts}
-
-Habilita/deshabilita el envío de datos insertados en lotes.
-
-Cuando el envío por lotes está habilitado, el [Distribuido](../../engines/table-engines/special/distributed.md) El motor de tabla intenta enviar varios archivos de datos insertados en una operación en lugar de enviarlos por separado. El envío por lotes mejora el rendimiento del clúster al utilizar mejor los recursos del servidor y de la red.
-
-Valores posibles:
-
--   1 — Enabled.
--   0 — Disabled.
-
-Valor predeterminado: 0.
-
-## os_thread_priority {#setting-os-thread-priority}
-
-Establece la prioridad ([agradable](https://en.wikipedia.org/wiki/Nice_(Unix))) para subprocesos que ejecutan consultas. El programador del sistema operativo considera esta prioridad al elegir el siguiente hilo para ejecutar en cada núcleo de CPU disponible.
-
-!!! warning "Advertencia"
-    Para utilizar esta configuración, debe establecer el `CAP_SYS_NICE` capacidad. El `clickhouse-server` paquete lo configura durante la instalación. Algunos entornos virtuales no le permiten establecer `CAP_SYS_NICE` capacidad. En este caso, `clickhouse-server` muestra un mensaje al respecto al principio.
-
-Valores posibles:
-
--   Puede establecer valores en el rango `[-20, 19]`.
-
-Los valores más bajos significan mayor prioridad. Hilos con bajo `nice` Los valores de prioridad se ejecutan con más frecuencia que los subprocesos con valores altos. Los valores altos son preferibles para consultas no interactivas de larga ejecución porque les permite renunciar rápidamente a recursos en favor de consultas interactivas cortas cuando llegan.
-
-Valor predeterminado: 0.
-
-## query_profiler_real_time_period_ns {#query_profiler_real_time_period_ns}
-
-Establece el período para un temporizador de reloj real del [perfilador de consultas](../../operations/optimizing-performance/sampling-query-profiler.md). El temporizador de reloj real cuenta el tiempo del reloj de pared.
-
-Valores posibles:
-
--   Número entero positivo, en nanosegundos.
-
-    Valores recomendados:
-
-            - 10000000 (100 times a second) nanoseconds and less for single queries.
-            - 1000000000 (once a second) for cluster-wide profiling.
-
--   0 para apagar el temporizador.
-
-Tipo: [UInt64](../../sql-reference/data-types/int-uint.md).
-
-Valor predeterminado: 1000000000 nanosegundos (una vez por segundo).
-
-Ver también:
-
--   Tabla del sistema [trace_log](../../operations/system-tables.md#system_tables-trace_log)
-
-## Los resultados de la prueba {#query_profiler_cpu_time_period_ns}
-
-Establece el período para un temporizador de reloj de CPU [perfilador de consultas](../../operations/optimizing-performance/sampling-query-profiler.md). Este temporizador solo cuenta el tiempo de CPU.
-
-Valores posibles:
-
--   Un número entero positivo de nanosegundos.
-
-    Valores recomendados:
-
-            - 10000000 (100 times a second) nanoseconds and more for single queries.
-            - 1000000000 (once a second) for cluster-wide profiling.
-
--   0 para apagar el temporizador.
-
-Tipo: [UInt64](../../sql-reference/data-types/int-uint.md).
-
-Valor predeterminado: 1000000000 nanosegundos.
-
-Ver también:
-
--   Tabla del sistema [trace_log](../../operations/system-tables.md#system_tables-trace_log)
-
-## allow_introspection_functions {#settings-allow_introspection_functions}
-
-Habilita deshabilita [funciones de introspecciones](../../sql-reference/functions/introspection.md) para la creación de perfiles de consultas.
-
-Valores posibles:
-
--   1 — Introspection functions enabled.
--   0 — Introspection functions disabled.
-
-Valor predeterminado: 0.
-
-**Ver también**
-
--   [Analizador de consultas de muestreo](../optimizing-performance/sampling-query-profiler.md)
--   Tabla del sistema [trace_log](../../operations/system-tables.md#system_tables-trace_log)
-
-## input_format_parallel_parsing {#input-format-parallel-parsing}
-
--   Tipo: bool
--   Valor predeterminado: True
-
-Habilitar el análisis paralelo de los formatos de datos para preservar el orden. Solo se admite para los formatos TSV, TKSV, CSV y JSONEachRow.
-
-## También puede utilizar los siguientes métodos de envío: {#min-chunk-bytes-for-parallel-parsing}
-
--   Tipo: unsigned int
--   Valor predeterminado: 1 MiB
-
-El tamaño mínimo de fragmento en bytes, que cada subproceso analizará en paralelo.
-
-## Sistema abierto {#settings-output_format_avro_codec}
-
-Establece el códec de compresión utilizado para el archivo Avro de salida.
-
-Tipo: cadena
-
-Valores posibles:
-
--   `null` — No compression
--   `deflate` — Compress with Deflate (zlib)
--   `snappy` — Compress with [Rápido](https://google.github.io/snappy/)
-
-Valor predeterminado: `snappy` (si está disponible) o `deflate`.
-
-## Sistema abierto {#settings-output_format_avro_sync_interval}
-
-Establece el tamaño mínimo de datos (en bytes) entre los marcadores de sincronización para el archivo Avro de salida.
-
-Tipo: unsigned int
-
-Valores posibles: 32 (32 bytes) - 1073741824 (1 GiB)
-
-Valor predeterminado: 32768 (32 KiB)
-
-## Todos los derechos reservados {#settings-format_avro_schema_registry_url}
-
-Establece la URL del Registro de esquemas confluentes para usar con [AvroConfluent](../../interfaces/formats.md#data-format-avro-confluent) formato
-
-Tipo: URL
-
-Valor predeterminado: Vacío
-
-## background_pool_size {#background_pool_size}
-
-Establece el número de subprocesos que realizan operaciones en segundo plano en motores de tabla (por ejemplo, fusiona [Motor MergeTree](../../engines/table-engines/mergetree-family/index.md) tabla). Esta configuración se aplica al inicio del servidor ClickHouse y no se puede cambiar en una sesión de usuario. Al ajustar esta configuración, puede administrar la carga de la CPU y el disco. Un tamaño de grupo más pequeño utiliza menos recursos de CPU y disco, pero los procesos en segundo plano avanzan más lentamente, lo que eventualmente podría afectar el rendimiento de la consulta.
-
-Valores posibles:
-
--   Cualquier entero positivo.
-
-Valor predeterminado: 16.
-
-[Artículo Original](https://clickhouse.tech/docs/en/operations/settings/settings/) <!-- hide -->
diff --git a/docs/es/operations/system-tables.md b/docs/es/operations/system-tables.md
deleted file mode 100644
index 18e7f7227da..00000000000
--- a/docs/es/operations/system-tables.md
+++ /dev/null
@@ -1,1168 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 52
-toc_title: Tablas del sistema
----
-
-# Tablas del sistema {#system-tables}
-
-Las tablas del sistema se utilizan para implementar parte de la funcionalidad del sistema y para proporcionar acceso a información sobre cómo funciona el sistema.
-No puede eliminar una tabla del sistema (pero puede realizar DETACH).
-Las tablas del sistema no tienen archivos con datos en el disco o archivos con metadatos. El servidor crea todas las tablas del sistema cuando se inicia.
-Las tablas del sistema son de solo lectura.
-Están ubicados en el ‘system’ base.
-
-## sistema.asynchronous_metrics {#system_tables-asynchronous_metrics}
-
-Contiene métricas que se calculan periódicamente en segundo plano. Por ejemplo, la cantidad de RAM en uso.
-
-Columna:
-
--   `metric` ([Cadena](../sql-reference/data-types/string.md)) — Metric name.
--   `value` ([Float64](../sql-reference/data-types/float.md)) — Metric value.
-
-**Ejemplo**
-
-``` sql
-SELECT * FROM system.asynchronous_metrics LIMIT 10
-```
-
-``` text
-┌─metric──────────────────────────────────┬──────value─┐
-│ jemalloc.background_thread.run_interval │          0 │
-│ jemalloc.background_thread.num_runs     │          0 │
-│ jemalloc.background_thread.num_threads  │          0 │
-│ jemalloc.retained                       │  422551552 │
-│ jemalloc.mapped                         │ 1682989056 │
-│ jemalloc.resident                       │ 1656446976 │
-│ jemalloc.metadata_thp                   │          0 │
-│ jemalloc.metadata                       │   10226856 │
-│ UncompressedCacheCells                  │          0 │
-│ MarkCacheFiles                          │          0 │
-└─────────────────────────────────────────┴────────────┘
-```
-
-**Ver también**
-
--   [Monitoreo](monitoring.md) — Base concepts of ClickHouse monitoring.
--   [sistema.métricas](#system_tables-metrics) — Contains instantly calculated metrics.
--   [sistema.evento](#system_tables-events) — Contains a number of events that have occurred.
--   [sistema.metric_log](#system_tables-metric_log) — Contains a history of metrics values from tables `system.metrics` и `system.events`.
-
-## sistema.Cluster {#system-clusters}
-
-Contiene información sobre los clústeres disponibles en el archivo de configuración y los servidores que contienen.
-
-Columna:
-
--   `cluster` (String) — The cluster name.
--   `shard_num` (UInt32) — The shard number in the cluster, starting from 1.
--   `shard_weight` (UInt32) — The relative weight of the shard when writing data.
--   `replica_num` (UInt32) — The replica number in the shard, starting from 1.
--   `host_name` (String) — The host name, as specified in the config.
--   `host_address` (String) — The host IP address obtained from DNS.
--   `port` (UInt16) — The port to use for connecting to the server.
--   `user` (String) — The name of the user for connecting to the server.
--   `errors_count` (UInt32): número de veces que este host no pudo alcanzar la réplica.
--   `estimated_recovery_time` (UInt32): quedan segundos hasta que el recuento de errores de réplica se ponga a cero y se considere que vuelve a la normalidad.
-
-Tenga en cuenta que `errors_count` se actualiza una vez por consulta al clúster, pero `estimated_recovery_time` se vuelve a calcular bajo demanda. Entonces podría haber un caso distinto de cero `errors_count` y cero `estimated_recovery_time`, esa próxima consulta será cero `errors_count` e intente usar la réplica como si no tuviera errores.
-
-**Ver también**
-
--   [Motor de tabla distribuido](../engines/table-engines/special/distributed.md)
--   [distributed_replica_error_cap configuración](settings/settings.md#settings-distributed_replica_error_cap)
--   [distributed_replica_error_half_life configuración](settings/settings.md#settings-distributed_replica_error_half_life)
-
-## sistema.columna {#system-columns}
-
-Contiene información sobre las columnas de todas las tablas.
-
-Puede utilizar esta tabla para obtener información similar a la [DESCRIBE TABLE](../sql-reference/statements/misc.md#misc-describe-table) consulta, pero para varias tablas a la vez.
-
-El `system.columns` tabla contiene las siguientes columnas (el tipo de columna se muestra entre corchetes):
-
--   `database` (String) — Database name.
--   `table` (String) — Table name.
--   `name` (String) — Column name.
--   `type` (String) — Column type.
--   `default_kind` (String) — Expression type (`DEFAULT`, `MATERIALIZED`, `ALIAS`) para el valor predeterminado, o una cadena vacía si no está definida.
--   `default_expression` (String) — Expression for the default value, or an empty string if it is not defined.
--   `data_compressed_bytes` (UInt64) — The size of compressed data, in bytes.
--   `data_uncompressed_bytes` (UInt64) — The size of decompressed data, in bytes.
--   `marks_bytes` (UInt64) — The size of marks, in bytes.
--   `comment` (String) — Comment on the column, or an empty string if it is not defined.
--   `is_in_partition_key` (UInt8) — Flag that indicates whether the column is in the partition expression.
--   `is_in_sorting_key` (UInt8) — Flag that indicates whether the column is in the sorting key expression.
--   `is_in_primary_key` (UInt8) — Flag that indicates whether the column is in the primary key expression.
--   `is_in_sampling_key` (UInt8) — Flag that indicates whether the column is in the sampling key expression.
-
-## sistema.colaborador {#system-contributors}
-
-Contiene información sobre los colaboradores. Todos los constributores en orden aleatorio. El orden es aleatorio en el momento de la ejecución de la consulta.
-
-Columna:
-
--   `name` (String) — Contributor (author) name from git log.
-
-**Ejemplo**
-
-``` sql
-SELECT * FROM system.contributors LIMIT 10
-```
-
-``` text
-┌─name─────────────┐
-│ Olga Khvostikova │
-│ Max Vetrov       │
-│ LiuYangkuan      │
-│ svladykin        │
-│ zamulla          │
-│ Šimon Podlipský  │
-│ BayoNet          │
-│ Ilya Khomutov    │
-│ Amy Krishnevsky  │
-│ Loud_Scream      │
-└──────────────────┘
-```
-
-Para descubrirlo en la tabla, use una consulta:
-
-``` sql
-SELECT * FROM system.contributors WHERE name='Olga Khvostikova'
-```
-
-``` text
-┌─name─────────────┐
-│ Olga Khvostikova │
-└──────────────────┘
-```
-
-## sistema.base {#system-databases}
-
-Esta tabla contiene una sola columna String llamada ‘name’ – the name of a database.
-Cada base de datos que el servidor conoce tiene una entrada correspondiente en la tabla.
-Esta tabla del sistema se utiliza para implementar el `SHOW DATABASES` consulta.
-
-## sistema.detached_parts {#system_tables-detached_parts}
-
-Contiene información sobre piezas separadas de [Método de codificación de datos:](../engines/table-engines/mergetree-family/mergetree.md) tabla. El `reason` columna especifica por qué se separó la pieza. Para las piezas separadas por el usuario, el motivo está vacío. Tales partes se pueden unir con [ALTER TABLE ATTACH PARTITION\|PART](../sql-reference/statements/alter.md#alter_attach-partition) comando. Para obtener la descripción de otras columnas, consulte [sistema.parte](#system_tables-parts). Si el nombre de la pieza no es válido, los valores de algunas columnas pueden ser `NULL`. Tales partes se pueden eliminar con [ALTER TABLE DROP DETACHED PART](../sql-reference/statements/alter.md#alter_drop-detached).
-
-## sistema.diccionario {#system_tables-dictionaries}
-
-Contiene información sobre [diccionarios externos](../sql-reference/dictionaries/external-dictionaries/external-dicts.md).
-
-Columna:
-
--   `database` ([Cadena](../sql-reference/data-types/string.md)) — Name of the database containing the dictionary created by DDL query. Empty string for other dictionaries.
--   `name` ([Cadena](../sql-reference/data-types/string.md)) — [Nombre del diccionario](../sql-reference/dictionaries/external-dictionaries/external-dicts-dict.md).
--   `status` ([Enum8](../sql-reference/data-types/enum.md)) — Dictionary status. Possible values:
-    -   `NOT_LOADED` — Dictionary was not loaded because it was not used.
-    -   `LOADED` — Dictionary loaded successfully.
-    -   `FAILED` — Unable to load the dictionary as a result of an error.
-    -   `LOADING` — Dictionary is loading now.
-    -   `LOADED_AND_RELOADING` — Dictionary is loaded successfully, and is being reloaded right now (frequent reasons: [SYSTEM RELOAD DICTIONARY](../sql-reference/statements/system.md#query_language-system-reload-dictionary) consulta, tiempo de espera, configuración del diccionario ha cambiado).
-    -   `FAILED_AND_RELOADING` — Could not load the dictionary as a result of an error and is loading now.
--   `origin` ([Cadena](../sql-reference/data-types/string.md)) — Path to the configuration file that describes the dictionary.
--   `type` ([Cadena](../sql-reference/data-types/string.md)) — Type of a dictionary allocation. [Almacenamiento de diccionarios en la memoria](../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md).
--   `key` — [Tipo de llave](../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md#ext_dict_structure-key): Clave numérica ([UInt64](../sql-reference/data-types/int-uint.md#uint-ranges)) or Сomposite key ([Cadena](../sql-reference/data-types/string.md)) — form “(type 1, type 2, …, type n)”.
--   `attribute.names` ([Matriz](../sql-reference/data-types/array.md)([Cadena](../sql-reference/data-types/string.md))) — Array of [nombres de atributos](../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md#ext_dict_structure-attributes) proporcionada por el diccionario.
--   `attribute.types` ([Matriz](../sql-reference/data-types/array.md)([Cadena](../sql-reference/data-types/string.md))) — Corresponding array of [tipos de atributos](../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md#ext_dict_structure-attributes) que son proporcionados por el diccionario.
--   `bytes_allocated` ([UInt64](../sql-reference/data-types/int-uint.md#uint-ranges)) — Amount of RAM allocated for the dictionary.
--   `query_count` ([UInt64](../sql-reference/data-types/int-uint.md#uint-ranges)) — Number of queries since the dictionary was loaded or since the last successful reboot.
--   `hit_rate` ([Float64](../sql-reference/data-types/float.md)) — For cache dictionaries, the percentage of uses for which the value was in the cache.
--   `element_count` ([UInt64](../sql-reference/data-types/int-uint.md#uint-ranges)) — Number of items stored in the dictionary.
--   `load_factor` ([Float64](../sql-reference/data-types/float.md)) — Percentage filled in the dictionary (for a hashed dictionary, the percentage filled in the hash table).
--   `source` ([Cadena](../sql-reference/data-types/string.md)) — Text describing the [fuente de datos](../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md) para el diccionario.
--   `lifetime_min` ([UInt64](../sql-reference/data-types/int-uint.md#uint-ranges)) — Minimum [vida](../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md) del diccionario en la memoria, después de lo cual ClickHouse intenta volver a cargar el diccionario (si `invalidate_query` está configurado, entonces solo si ha cambiado). Establecer en segundos.
--   `lifetime_max` ([UInt64](../sql-reference/data-types/int-uint.md#uint-ranges)) — Maximum [vida](../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md) del diccionario en la memoria, después de lo cual ClickHouse intenta volver a cargar el diccionario (si `invalidate_query` está configurado, entonces solo si ha cambiado). Establecer en segundos.
--   `loading_start_time` ([FechaHora](../sql-reference/data-types/datetime.md)) — Start time for loading the dictionary.
--   `last_successful_update_time` ([FechaHora](../sql-reference/data-types/datetime.md)) — End time for loading or updating the dictionary. Helps to monitor some troubles with external sources and investigate causes.
--   `loading_duration` ([Float32](../sql-reference/data-types/float.md)) — Duration of a dictionary loading.
--   `last_exception` ([Cadena](../sql-reference/data-types/string.md)) — Text of the error that occurs when creating or reloading the dictionary if the dictionary couldn't be created.
-
-**Ejemplo**
-
-Configurar el diccionario.
-
-``` sql
-CREATE DICTIONARY dictdb.dict
-(
-    `key` Int64 DEFAULT -1,
-    `value_default` String DEFAULT 'world',
-    `value_expression` String DEFAULT 'xxx' EXPRESSION 'toString(127 * 172)'
-)
-PRIMARY KEY key
-SOURCE(CLICKHOUSE(HOST 'localhost' PORT 9000 USER 'default' TABLE 'dicttbl' DB 'dictdb'))
-LIFETIME(MIN 0 MAX 1)
-LAYOUT(FLAT())
-```
-
-Asegúrese de que el diccionario esté cargado.
-
-``` sql
-SELECT * FROM system.dictionaries
-```
-
-``` text
-┌─database─┬─name─┬─status─┬─origin──────┬─type─┬─key────┬─attribute.names──────────────────────┬─attribute.types─────┬─bytes_allocated─┬─query_count─┬─hit_rate─┬─element_count─┬───────────load_factor─┬─source─────────────────────┬─lifetime_min─┬─lifetime_max─┬──loading_start_time─┌──last_successful_update_time─┬──────loading_duration─┬─last_exception─┐
-│ dictdb   │ dict │ LOADED │ dictdb.dict │ Flat │ UInt64 │ ['value_default','value_expression'] │ ['String','String'] │           74032 │           0 │        1 │             1 │ 0.0004887585532746823 │ ClickHouse: dictdb.dicttbl │            0 │            1 │ 2020-03-04 04:17:34 │   2020-03-04 04:30:34        │                 0.002 │                │
-└──────────┴──────┴────────┴─────────────┴──────┴────────┴──────────────────────────────────────┴─────────────────────┴─────────────────┴─────────────┴──────────┴───────────────┴───────────────────────┴────────────────────────────┴──────────────┴──────────────┴─────────────────────┴──────────────────────────────┘───────────────────────┴────────────────┘
-```
-
-## sistema.evento {#system_tables-events}
-
-Contiene información sobre el número de eventos que se han producido en el sistema. Por ejemplo, en la tabla, puede encontrar cuántos `SELECT` las consultas se procesaron desde que se inició el servidor ClickHouse.
-
-Columna:
-
--   `event` ([Cadena](../sql-reference/data-types/string.md)) — Event name.
--   `value` ([UInt64](../sql-reference/data-types/int-uint.md)) — Number of events occurred.
--   `description` ([Cadena](../sql-reference/data-types/string.md)) — Event description.
-
-**Ejemplo**
-
-``` sql
-SELECT * FROM system.events LIMIT 5
-```
-
-``` text
-┌─event─────────────────────────────────┬─value─┬─description────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
-│ Query                                 │    12 │ Number of queries to be interpreted and potentially executed. Does not include queries that failed to parse or were rejected due to AST size limits, quota limits or limits on the number of simultaneously running queries. May include internal queries initiated by ClickHouse itself. Does not count subqueries.                  │
-│ SelectQuery                           │     8 │ Same as Query, but only for SELECT queries.                                                                                                                                                                                                                │
-│ FileOpen                              │    73 │ Number of files opened.                                                                                                                                                                                                                                    │
-│ ReadBufferFromFileDescriptorRead      │   155 │ Number of reads (read/pread) from a file descriptor. Does not include sockets.                                                                                                                                                                             │
-│ ReadBufferFromFileDescriptorReadBytes │  9931 │ Number of bytes read from file descriptors. If the file is compressed, this will show the compressed data size.                                                                                                                                              │
-└───────────────────────────────────────┴───────┴────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
-```
-
-**Ver también**
-
--   [sistema.asynchronous_metrics](#system_tables-asynchronous_metrics) — Contains periodically calculated metrics.
--   [sistema.métricas](#system_tables-metrics) — Contains instantly calculated metrics.
--   [sistema.metric_log](#system_tables-metric_log) — Contains a history of metrics values from tables `system.metrics` и `system.events`.
--   [Monitoreo](monitoring.md) — Base concepts of ClickHouse monitoring.
-
-## sistema.función {#system-functions}
-
-Contiene información sobre funciones normales y agregadas.
-
-Columna:
-
--   `name`(`String`) – The name of the function.
--   `is_aggregate`(`UInt8`) — Whether the function is aggregate.
-
-## sistema.graphite_retentions {#system-graphite-retentions}
-
-Contiene información sobre los parámetros [graphite_rollup](server-configuration-parameters/settings.md#server_configuration_parameters-graphite) que se utilizan en tablas con [\*GraphiteMergeTree](../engines/table-engines/mergetree-family/graphitemergetree.md) motor.
-
-Columna:
-
--   `config_name` (Cadena) - `graphite_rollup` nombre del parámetro.
--   `regexp` (Cadena) - Un patrón para el nombre de la métrica.
--   `function` (String) - El nombre de la función de agregación.
--   `age` (UInt64) - La edad mínima de los datos en segundos.
--   `precision` (UInt64) - Cómo definir con precisión la edad de los datos en segundos.
--   `priority` (UInt16) - Prioridad de patrón.
--   `is_default` (UInt8) - Si el patrón es el predeterminado.
--   `Tables.database` (Array(String)) - Matriz de nombres de tablas de base de datos que utilizan `config_name` parámetro.
--   `Tables.table` (Array(String)) - Matriz de nombres de tablas que utilizan `config_name` parámetro.
-
-## sistema.fusionar {#system-merges}
-
-Contiene información sobre fusiones y mutaciones de piezas actualmente en proceso para tablas de la familia MergeTree.
-
-Columna:
-
--   `database` (String) — The name of the database the table is in.
--   `table` (String) — Table name.
--   `elapsed` (Float64) — The time elapsed (in seconds) since the merge started.
--   `progress` (Float64) — The percentage of completed work from 0 to 1.
--   `num_parts` (UInt64) — The number of pieces to be merged.
--   `result_part_name` (String) — The name of the part that will be formed as the result of merging.
--   `is_mutation` (UInt8) - 1 si este proceso es una mutación parte.
--   `total_size_bytes_compressed` (UInt64) — The total size of the compressed data in the merged chunks.
--   `total_size_marks` (UInt64) — The total number of marks in the merged parts.
--   `bytes_read_uncompressed` (UInt64) — Number of bytes read, uncompressed.
--   `rows_read` (UInt64) — Number of rows read.
--   `bytes_written_uncompressed` (UInt64) — Number of bytes written, uncompressed.
--   `rows_written` (UInt64) — Number of rows written.
-
-## sistema.métricas {#system_tables-metrics}
-
-Contiene métricas que pueden calcularse instantáneamente o tener un valor actual. Por ejemplo, el número de consultas procesadas simultáneamente o el retraso de réplica actual. Esta tabla está siempre actualizada.
-
-Columna:
-
--   `metric` ([Cadena](../sql-reference/data-types/string.md)) — Metric name.
--   `value` ([Int64](../sql-reference/data-types/int-uint.md)) — Metric value.
--   `description` ([Cadena](../sql-reference/data-types/string.md)) — Metric description.
-
-La lista de métricas admitidas que puede encontrar en el [src/Common/CurrentMetrics.cpp](https://github.com/ClickHouse/ClickHouse/blob/master/src/Common/CurrentMetrics.cpp) archivo fuente de ClickHouse.
-
-**Ejemplo**
-
-``` sql
-SELECT * FROM system.metrics LIMIT 10
-```
-
-``` text
-┌─metric─────────────────────┬─value─┬─description──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
-│ Query                      │     1 │ Number of executing queries                                                                                                                                                                      │
-│ Merge                      │     0 │ Number of executing background merges                                                                                                                                                            │
-│ PartMutation               │     0 │ Number of mutations (ALTER DELETE/UPDATE)                                                                                                                                                        │
-│ ReplicatedFetch            │     0 │ Number of data parts being fetched from replicas                                                                                                                                                │
-│ ReplicatedSend             │     0 │ Number of data parts being sent to replicas                                                                                                                                                      │
-│ ReplicatedChecks           │     0 │ Number of data parts checking for consistency                                                                                                                                                    │
-│ BackgroundPoolTask         │     0 │ Number of active tasks in BackgroundProcessingPool (merges, mutations, fetches, or replication queue bookkeeping)                                                                                │
-│ BackgroundSchedulePoolTask │     0 │ Number of active tasks in BackgroundSchedulePool. This pool is used for periodic ReplicatedMergeTree tasks, like cleaning old data parts, altering data parts, replica re-initialization, etc.   │
-│ DiskSpaceReservedForMerge  │     0 │ Disk space reserved for currently running background merges. It is slightly more than the total size of currently merging parts.                                                                     │
-│ DistributedSend            │     0 │ Number of connections to remote servers sending data that was INSERTed into Distributed tables. Both synchronous and asynchronous mode.                                                          │
-└────────────────────────────┴───────┴──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
-```
-
-**Ver también**
-
--   [sistema.asynchronous_metrics](#system_tables-asynchronous_metrics) — Contains periodically calculated metrics.
--   [sistema.evento](#system_tables-events) — Contains a number of events that occurred.
--   [sistema.metric_log](#system_tables-metric_log) — Contains a history of metrics values from tables `system.metrics` и `system.events`.
--   [Monitoreo](monitoring.md) — Base concepts of ClickHouse monitoring.
-
-## sistema.metric_log {#system_tables-metric_log}
-
-Contiene el historial de valores de métricas de tablas `system.metrics` y `system.events`, periódicamente enjuagado al disco.
-Para activar la recopilación de historial de métricas en `system.metric_log`, crear `/etc/clickhouse-server/config.d/metric_log.xml` con el siguiente contenido:
-
-``` xml
-<yandex>
-    <metric_log>
-        <database>system</database>
-        <table>metric_log</table>
-        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
-        <collect_interval_milliseconds>1000</collect_interval_milliseconds>
-    </metric_log>
-</yandex>
-```
-
-**Ejemplo**
-
-``` sql
-SELECT * FROM system.metric_log LIMIT 1 FORMAT Vertical;
-```
-
-``` text
-Row 1:
-──────
-event_date:                                                 2020-02-18
-event_time:                                                 2020-02-18 07:15:33
-milliseconds:                                               554
-ProfileEvent_Query:                                         0
-ProfileEvent_SelectQuery:                                   0
-ProfileEvent_InsertQuery:                                   0
-ProfileEvent_FileOpen:                                      0
-ProfileEvent_Seek:                                          0
-ProfileEvent_ReadBufferFromFileDescriptorRead:              1
-ProfileEvent_ReadBufferFromFileDescriptorReadFailed:        0
-ProfileEvent_ReadBufferFromFileDescriptorReadBytes:         0
-ProfileEvent_WriteBufferFromFileDescriptorWrite:            1
-ProfileEvent_WriteBufferFromFileDescriptorWriteFailed:      0
-ProfileEvent_WriteBufferFromFileDescriptorWriteBytes:       56
-...
-CurrentMetric_Query:                                        0
-CurrentMetric_Merge:                                        0
-CurrentMetric_PartMutation:                                 0
-CurrentMetric_ReplicatedFetch:                              0
-CurrentMetric_ReplicatedSend:                               0
-CurrentMetric_ReplicatedChecks:                             0
-...
-```
-
-**Ver también**
-
--   [sistema.asynchronous_metrics](#system_tables-asynchronous_metrics) — Contains periodically calculated metrics.
--   [sistema.evento](#system_tables-events) — Contains a number of events that occurred.
--   [sistema.métricas](#system_tables-metrics) — Contains instantly calculated metrics.
--   [Monitoreo](monitoring.md) — Base concepts of ClickHouse monitoring.
-
-## sistema.numero {#system-numbers}
-
-Esta tabla contiene una única columna UInt64 llamada ‘number’ que contiene casi todos los números naturales a partir de cero.
-Puede usar esta tabla para pruebas, o si necesita hacer una búsqueda de fuerza bruta.
-Las lecturas de esta tabla no están paralelizadas.
-
-## sistema.Números_mt {#system-numbers-mt}
-
-Lo mismo que ‘system.numbers’ pero las lecturas están paralelizadas. Los números se pueden devolver en cualquier orden.
-Se utiliza para pruebas.
-
-## sistema.una {#system-one}
-
-Esta tabla contiene una sola fila con una ‘dummy’ Columna UInt8 que contiene el valor 0.
-Esta tabla se utiliza si una consulta SELECT no especifica la cláusula FROM.
-Esto es similar a la tabla DUAL que se encuentra en otros DBMS.
-
-## sistema.parte {#system_tables-parts}
-
-Contiene información sobre partes de [Método de codificación de datos:](../engines/table-engines/mergetree-family/mergetree.md) tabla.
-
-Cada fila describe una parte de datos.
-
-Columna:
-
--   `partition` (String) – The partition name. To learn what a partition is, see the description of the [ALTER](../sql-reference/statements/alter.md#query_language_queries_alter) consulta.
-
-    Formato:
-
-    -   `YYYYMM` para la partición automática por mes.
-    -   `any_string` al particionar manualmente.
-
--   `name` (`String`) – Name of the data part.
-
--   `active` (`UInt8`) – Flag that indicates whether the data part is active. If a data part is active, it's used in a table. Otherwise, it's deleted. Inactive data parts remain after merging.
-
--   `marks` (`UInt64`) – The number of marks. To get the approximate number of rows in a data part, multiply `marks` por la granularidad del índice (generalmente 8192) (esta sugerencia no funciona para la granularidad adaptativa).
-
--   `rows` (`UInt64`) – The number of rows.
-
--   `bytes_on_disk` (`UInt64`) – Total size of all the data part files in bytes.
-
--   `data_compressed_bytes` (`UInt64`) – Total size of compressed data in the data part. All the auxiliary files (for example, files with marks) are not included.
-
--   `data_uncompressed_bytes` (`UInt64`) – Total size of uncompressed data in the data part. All the auxiliary files (for example, files with marks) are not included.
-
--   `marks_bytes` (`UInt64`) – The size of the file with marks.
-
--   `modification_time` (`DateTime`) – The time the directory with the data part was modified. This usually corresponds to the time of data part creation.\|
-
--   `remove_time` (`DateTime`) – The time when the data part became inactive.
-
--   `refcount` (`UInt32`) – The number of places where the data part is used. A value greater than 2 indicates that the data part is used in queries or merges.
-
--   `min_date` (`Date`) – The minimum value of the date key in the data part.
-
--   `max_date` (`Date`) – The maximum value of the date key in the data part.
-
--   `min_time` (`DateTime`) – The minimum value of the date and time key in the data part.
-
--   `max_time`(`DateTime`) – The maximum value of the date and time key in the data part.
-
--   `partition_id` (`String`) – ID of the partition.
-
--   `min_block_number` (`UInt64`) – The minimum number of data parts that make up the current part after merging.
-
--   `max_block_number` (`UInt64`) – The maximum number of data parts that make up the current part after merging.
-
--   `level` (`UInt32`) – Depth of the merge tree. Zero means that the current part was created by insert rather than by merging other parts.
-
--   `data_version` (`UInt64`) – Number that is used to determine which mutations should be applied to the data part (mutations with a version higher than `data_version`).
-
--   `primary_key_bytes_in_memory` (`UInt64`) – The amount of memory (in bytes) used by primary key values.
-
--   `primary_key_bytes_in_memory_allocated` (`UInt64`) – The amount of memory (in bytes) reserved for primary key values.
-
--   `is_frozen` (`UInt8`) – Flag that shows that a partition data backup exists. 1, the backup exists. 0, the backup doesn't exist. For more details, see [FREEZE PARTITION](../sql-reference/statements/alter.md#alter_freeze-partition)
-
--   `database` (`String`) – Name of the database.
-
--   `table` (`String`) – Name of the table.
-
--   `engine` (`String`) – Name of the table engine without parameters.
-
--   `path` (`String`) – Absolute path to the folder with data part files.
-
--   `disk` (`String`) – Name of a disk that stores the data part.
-
--   `hash_of_all_files` (`String`) – [sipHash128](../sql-reference/functions/hash-functions.md#hash_functions-siphash128) de archivos comprimidos.
-
--   `hash_of_uncompressed_files` (`String`) – [sipHash128](../sql-reference/functions/hash-functions.md#hash_functions-siphash128) de archivos sin comprimir (archivos con marcas, archivo de índice, etc.).
-
--   `uncompressed_hash_of_compressed_files` (`String`) – [sipHash128](../sql-reference/functions/hash-functions.md#hash_functions-siphash128) de datos en los archivos comprimidos como si estuvieran descomprimidos.
-
--   `bytes` (`UInt64`) – Alias for `bytes_on_disk`.
-
--   `marks_size` (`UInt64`) – Alias for `marks_bytes`.
-
-## sistema.part_log {#system_tables-part-log}
-
-El `system.part_log` se crea sólo si el [part_log](server-configuration-parameters/settings.md#server_configuration_parameters-part-log) se especifica la configuración del servidor.
-
-Esta tabla contiene información sobre eventos que ocurrieron con [partes de datos](../engines/table-engines/mergetree-family/custom-partitioning-key.md) en el [Método de codificación de datos:](../engines/table-engines/mergetree-family/mergetree.md) tablas familiares, como agregar o fusionar datos.
-
-El `system.part_log` contiene las siguientes columnas:
-
--   `event_type` (Enum) — Type of the event that occurred with the data part. Can have one of the following values:
-    -   `NEW_PART` — Inserting of a new data part.
-    -   `MERGE_PARTS` — Merging of data parts.
-    -   `DOWNLOAD_PART` — Downloading a data part.
-    -   `REMOVE_PART` — Removing or detaching a data part using [DETACH PARTITION](../sql-reference/statements/alter.md#alter_detach-partition).
-    -   `MUTATE_PART` — Mutating of a data part.
-    -   `MOVE_PART` — Moving the data part from the one disk to another one.
--   `event_date` (Date) — Event date.
--   `event_time` (DateTime) — Event time.
--   `duration_ms` (UInt64) — Duration.
--   `database` (String) — Name of the database the data part is in.
--   `table` (String) — Name of the table the data part is in.
--   `part_name` (String) — Name of the data part.
--   `partition_id` (String) — ID of the partition that the data part was inserted to. The column takes the ‘all’ valor si la partición es por `tuple()`.
--   `rows` (UInt64) — The number of rows in the data part.
--   `size_in_bytes` (UInt64) — Size of the data part in bytes.
--   `merged_from` (Array(String)) — An array of names of the parts which the current part was made up from (after the merge).
--   `bytes_uncompressed` (UInt64) — Size of uncompressed bytes.
--   `read_rows` (UInt64) — The number of rows was read during the merge.
--   `read_bytes` (UInt64) — The number of bytes was read during the merge.
--   `error` (UInt16) — The code number of the occurred error.
--   `exception` (String) — Text message of the occurred error.
-
-El `system.part_log` se crea después de la primera inserción de datos `MergeTree` tabla.
-
-## sistema.procesa {#system_tables-processes}
-
-Esta tabla del sistema se utiliza para implementar el `SHOW PROCESSLIST` consulta.
-
-Columna:
-
--   `user` (String) – The user who made the query. Keep in mind that for distributed processing, queries are sent to remote servers under the `default` usuario. El campo contiene el nombre de usuario para una consulta específica, no para una consulta que esta consulta inició.
--   `address` (String) – The IP address the request was made from. The same for distributed processing. To track where a distributed query was originally made from, look at `system.processes` en el servidor de solicitud de consulta.
--   `elapsed` (Float64) – The time in seconds since request execution started.
--   `rows_read` (UInt64) – The number of rows read from the table. For distributed processing, on the requestor server, this is the total for all remote servers.
--   `bytes_read` (UInt64) – The number of uncompressed bytes read from the table. For distributed processing, on the requestor server, this is the total for all remote servers.
--   `total_rows_approx` (UInt64) – The approximation of the total number of rows that should be read. For distributed processing, on the requestor server, this is the total for all remote servers. It can be updated during request processing, when new sources to process become known.
--   `memory_usage` (UInt64) – Amount of RAM the request uses. It might not include some types of dedicated memory. See the [Método de codificación de datos:](../operations/settings/query-complexity.md#settings_max_memory_usage) configuración.
--   `query` (String) – The query text. For `INSERT`, no incluye los datos para insertar.
--   `query_id` (String) – Query ID, if defined.
-
-## sistema.text_log {#system_tables-text_log}
-
-Contiene entradas de registro. El nivel de registro que va a esta tabla se puede limitar con `text_log.level` configuración del servidor.
-
-Columna:
-
--   `event_date` (`Date`) - Fecha de la entrada.
--   `event_time` (`DateTime`) - Hora de la entrada.
--   `microseconds` (`UInt32`) - Microsegundos de la entrada.
--   `thread_name` (String) — Name of the thread from which the logging was done.
--   `thread_id` (UInt64) — OS thread ID.
--   `level` (`Enum8`) - Nivel de entrada.
-    -   `'Fatal' = 1`
-    -   `'Critical' = 2`
-    -   `'Error' = 3`
-    -   `'Warning' = 4`
-    -   `'Notice' = 5`
-    -   `'Information' = 6`
-    -   `'Debug' = 7`
-    -   `'Trace' = 8`
--   `query_id` (`String`) - ID de la consulta.
--   `logger_name` (`LowCardinality(String)`) - Name of the logger (i.e. `DDLWorker`)
--   `message` (`String`) - El mensaje en sí.
--   `revision` (`UInt32`) - Revisión de ClickHouse.
--   `source_file` (`LowCardinality(String)`) - Archivo de origen desde el que se realizó el registro.
--   `source_line` (`UInt64`) - Línea de origen desde la que se realizó el registro.
-
-## sistema.query_log {#system_tables-query_log}
-
-Contiene información sobre la ejecución de consultas. Para cada consulta, puede ver la hora de inicio del procesamiento, la duración del procesamiento, los mensajes de error y otra información.
-
-!!! note "Nota"
-    La tabla no contiene datos de entrada para `INSERT` consulta.
-
-ClickHouse crea esta tabla sólo si el [query_log](server-configuration-parameters/settings.md#server_configuration_parameters-query-log) se especifica el parámetro server. Este parámetro establece las reglas de registro, como el intervalo de registro o el nombre de la tabla en la que se registrarán las consultas.
-
-Para habilitar el registro de consultas, [Log_queries](settings/settings.md#settings-log-queries) parámetro a 1. Para obtener más información, consulte el [Configuración](settings/settings.md) apartado.
-
-El `system.query_log` tabla registra dos tipos de consultas:
-
-1.  Consultas iniciales ejecutadas directamente por el cliente.
-2.  Consultas secundarias iniciadas por otras consultas (para la ejecución de consultas distribuidas). Para estos tipos de consultas, la información sobre las consultas principales se muestra en el `initial_*` columna.
-
-Columna:
-
--   `type` (`Enum8`) — Type of event that occurred when executing the query. Values:
-    -   `'QueryStart' = 1` — Successful start of query execution.
-    -   `'QueryFinish' = 2` — Successful end of query execution.
-    -   `'ExceptionBeforeStart' = 3` — Exception before the start of query execution.
-    -   `'ExceptionWhileProcessing' = 4` — Exception during the query execution.
--   `event_date` (Date) — Query starting date.
--   `event_time` (DateTime) — Query starting time.
--   `query_start_time` (DateTime) — Start time of query execution.
--   `query_duration_ms` (UInt64) — Duration of query execution.
--   `read_rows` (UInt64) — Number of read rows.
--   `read_bytes` (UInt64) — Number of read bytes.
--   `written_rows` (UInt64) — For `INSERT` consultas, el número de filas escritas. Para otras consultas, el valor de la columna es 0.
--   `written_bytes` (UInt64) — For `INSERT` consultas, el número de bytes escritos. Para otras consultas, el valor de la columna es 0.
--   `result_rows` (UInt64) — Number of rows in the result.
--   `result_bytes` (UInt64) — Number of bytes in the result.
--   `memory_usage` (UInt64) — Memory consumption by the query.
--   `query` (String) — Query string.
--   `exception` (String) — Exception message.
--   `stack_trace` (String) — Stack trace (a list of methods called before the error occurred). An empty string, if the query is completed successfully.
--   `is_initial_query` (UInt8) — Query type. Possible values:
-    -   1 — Query was initiated by the client.
-    -   0 — Query was initiated by another query for distributed query execution.
--   `user` (String) — Name of the user who initiated the current query.
--   `query_id` (String) — ID of the query.
--   `address` (IPv6) — IP address that was used to make the query.
--   `port` (UInt16) — The client port that was used to make the query.
--   `initial_user` (String) — Name of the user who ran the initial query (for distributed query execution).
--   `initial_query_id` (String) — ID of the initial query (for distributed query execution).
--   `initial_address` (IPv6) — IP address that the parent query was launched from.
--   `initial_port` (UInt16) — The client port that was used to make the parent query.
--   `interface` (UInt8) — Interface that the query was initiated from. Possible values:
-    -   1 — TCP.
-    -   2 — HTTP.
--   `os_user` (String) — OS's username who runs [Casa de clics-cliente](../interfaces/cli.md).
--   `client_hostname` (String) — Hostname of the client machine where the [Casa de clics-cliente](../interfaces/cli.md) o se ejecuta otro cliente TCP.
--   `client_name` (String) — The [Casa de clics-cliente](../interfaces/cli.md) o otro nombre de cliente TCP.
--   `client_revision` (UInt32) — Revision of the [Casa de clics-cliente](../interfaces/cli.md) o otro cliente TCP.
--   `client_version_major` (UInt32) — Major version of the [Casa de clics-cliente](../interfaces/cli.md) o otro cliente TCP.
--   `client_version_minor` (UInt32) — Minor version of the [Casa de clics-cliente](../interfaces/cli.md) o otro cliente TCP.
--   `client_version_patch` (UInt32) — Patch component of the [Casa de clics-cliente](../interfaces/cli.md) o otra versión de cliente TCP.
--   `http_method` (UInt8) — HTTP method that initiated the query. Possible values:
-    -   0 — The query was launched from the TCP interface.
-    -   1 — `GET` se utilizó el método.
-    -   2 — `POST` se utilizó el método.
--   `http_user_agent` (String) — The `UserAgent` encabezado pasado en la solicitud HTTP.
--   `quota_key` (String) — The “quota key” especificado en el [cuota](quotas.md) ajuste (ver `keyed`).
--   `revision` (UInt32) — ClickHouse revision.
--   `thread_numbers` (Array(UInt32)) — Number of threads that are participating in query execution.
--   `ProfileEvents.Names` (Array(String)) — Counters that measure different metrics. The description of them could be found in the table [sistema.evento](#system_tables-events)
--   `ProfileEvents.Values` (Array(UInt64)) — Values of metrics that are listed in the `ProfileEvents.Names` columna.
--   `Settings.Names` (Array(String)) — Names of settings that were changed when the client ran the query. To enable logging changes to settings, set the `log_query_settings` parámetro a 1.
--   `Settings.Values` (Array(String)) — Values of settings that are listed in the `Settings.Names` columna.
-
-Cada consulta crea una o dos filas en el `query_log` tabla, dependiendo del estado de la consulta:
-
-1.  Si la ejecución de la consulta se realiza correctamente, se crean dos eventos con los tipos 1 y 2 (consulte `type` columna).
-2.  Si se produjo un error durante el procesamiento de la consulta, se crean dos eventos con los tipos 1 y 4.
-3.  Si se produjo un error antes de iniciar la consulta, se crea un solo evento con el tipo 3.
-
-De forma predeterminada, los registros se agregan a la tabla a intervalos de 7,5 segundos. Puede establecer este intervalo en el [query_log](server-configuration-parameters/settings.md#server_configuration_parameters-query-log) configuración del servidor (consulte el `flush_interval_milliseconds` parámetro). Para vaciar los registros a la fuerza desde el búfer de memoria a la tabla, utilice `SYSTEM FLUSH LOGS` consulta.
-
-Cuando la tabla se elimina manualmente, se creará automáticamente sobre la marcha. Tenga en cuenta que se eliminarán todos los registros anteriores.
-
-!!! note "Nota"
-    El período de almacenamiento para los registros es ilimitado. Los registros no se eliminan automáticamente de la tabla. Debe organizar la eliminación de registros obsoletos usted mismo.
-
-Puede especificar una clave de partición arbitraria `system.query_log` mesa en el [query_log](server-configuration-parameters/settings.md#server_configuration_parameters-query-log) configuración del servidor (consulte el `partition_by` parámetro).
-
-## sistema.Sistema abierto {#system_tables-query-thread-log}
-
-La tabla contiene información sobre cada subproceso de ejecución de consultas.
-
-ClickHouse crea esta tabla sólo si el [Sistema abierto.](server-configuration-parameters/settings.md#server_configuration_parameters-query-thread-log) se especifica el parámetro server. Este parámetro establece las reglas de registro, como el intervalo de registro o el nombre de la tabla en la que se registrarán las consultas.
-
-Para habilitar el registro de consultas, [Log_query_threads](settings/settings.md#settings-log-query-threads) parámetro a 1. Para obtener más información, consulte el [Configuración](settings/settings.md) apartado.
-
-Columna:
-
--   `event_date` (Date) — the date when the thread has finished execution of the query.
--   `event_time` (DateTime) — the date and time when the thread has finished execution of the query.
--   `query_start_time` (DateTime) — Start time of query execution.
--   `query_duration_ms` (UInt64) — Duration of query execution.
--   `read_rows` (UInt64) — Number of read rows.
--   `read_bytes` (UInt64) — Number of read bytes.
--   `written_rows` (UInt64) — For `INSERT` consultas, el número de filas escritas. Para otras consultas, el valor de la columna es 0.
--   `written_bytes` (UInt64) — For `INSERT` consultas, el número de bytes escritos. Para otras consultas, el valor de la columna es 0.
--   `memory_usage` (Int64) — The difference between the amount of allocated and freed memory in context of this thread.
--   `peak_memory_usage` (Int64) — The maximum difference between the amount of allocated and freed memory in context of this thread.
--   `thread_name` (String) — Name of the thread.
--   `thread_number` (UInt32) — Internal thread ID.
--   `os_thread_id` (Int32) — OS thread ID.
--   `master_thread_id` (UInt64) — OS initial ID of initial thread.
--   `query` (String) — Query string.
--   `is_initial_query` (UInt8) — Query type. Possible values:
-    -   1 — Query was initiated by the client.
-    -   0 — Query was initiated by another query for distributed query execution.
--   `user` (String) — Name of the user who initiated the current query.
--   `query_id` (String) — ID of the query.
--   `address` (IPv6) — IP address that was used to make the query.
--   `port` (UInt16) — The client port that was used to make the query.
--   `initial_user` (String) — Name of the user who ran the initial query (for distributed query execution).
--   `initial_query_id` (String) — ID of the initial query (for distributed query execution).
--   `initial_address` (IPv6) — IP address that the parent query was launched from.
--   `initial_port` (UInt16) — The client port that was used to make the parent query.
--   `interface` (UInt8) — Interface that the query was initiated from. Possible values:
-    -   1 — TCP.
-    -   2 — HTTP.
--   `os_user` (String) — OS's username who runs [Casa de clics-cliente](../interfaces/cli.md).
--   `client_hostname` (String) — Hostname of the client machine where the [Casa de clics-cliente](../interfaces/cli.md) o se ejecuta otro cliente TCP.
--   `client_name` (String) — The [Casa de clics-cliente](../interfaces/cli.md) o otro nombre de cliente TCP.
--   `client_revision` (UInt32) — Revision of the [Casa de clics-cliente](../interfaces/cli.md) o otro cliente TCP.
--   `client_version_major` (UInt32) — Major version of the [Casa de clics-cliente](../interfaces/cli.md) o otro cliente TCP.
--   `client_version_minor` (UInt32) — Minor version of the [Casa de clics-cliente](../interfaces/cli.md) o otro cliente TCP.
--   `client_version_patch` (UInt32) — Patch component of the [Casa de clics-cliente](../interfaces/cli.md) o otra versión de cliente TCP.
--   `http_method` (UInt8) — HTTP method that initiated the query. Possible values:
-    -   0 — The query was launched from the TCP interface.
-    -   1 — `GET` se utilizó el método.
-    -   2 — `POST` se utilizó el método.
--   `http_user_agent` (String) — The `UserAgent` encabezado pasado en la solicitud HTTP.
--   `quota_key` (String) — The “quota key” especificado en el [cuota](quotas.md) ajuste (ver `keyed`).
--   `revision` (UInt32) — ClickHouse revision.
--   `ProfileEvents.Names` (Array(String)) — Counters that measure different metrics for this thread. The description of them could be found in the table [sistema.evento](#system_tables-events)
--   `ProfileEvents.Values` (Array(UInt64)) — Values of metrics for this thread that are listed in the `ProfileEvents.Names` columna.
-
-De forma predeterminada, los registros se agregan a la tabla a intervalos de 7,5 segundos. Puede establecer este intervalo en el [Sistema abierto.](server-configuration-parameters/settings.md#server_configuration_parameters-query-thread-log) configuración del servidor (consulte el `flush_interval_milliseconds` parámetro). Para vaciar los registros a la fuerza desde el búfer de memoria a la tabla, utilice `SYSTEM FLUSH LOGS` consulta.
-
-Cuando la tabla se elimina manualmente, se creará automáticamente sobre la marcha. Tenga en cuenta que se eliminarán todos los registros anteriores.
-
-!!! note "Nota"
-    El período de almacenamiento para los registros es ilimitado. Los registros no se eliminan automáticamente de la tabla. Debe organizar la eliminación de registros obsoletos usted mismo.
-
-Puede especificar una clave de partición arbitraria `system.query_thread_log` mesa en el [Sistema abierto.](server-configuration-parameters/settings.md#server_configuration_parameters-query-thread-log) configuración del servidor (consulte el `partition_by` parámetro).
-
-## sistema.trace_log {#system_tables-trace_log}
-
-Contiene seguimientos de pila recopilados por el generador de perfiles de consultas de muestreo.
-
-ClickHouse crea esta tabla cuando el [trace_log](server-configuration-parameters/settings.md#server_configuration_parameters-trace_log) se establece la sección de configuración del servidor. También el [query_profiler_real_time_period_ns](settings/settings.md#query_profiler_real_time_period_ns) y [Los resultados de la prueba](settings/settings.md#query_profiler_cpu_time_period_ns) los ajustes deben establecerse.
-
-Para analizar los registros, utilice el `addressToLine`, `addressToSymbol` y `demangle` funciones de inspección.
-
-Columna:
-
--   `event_date` ([Fecha](../sql-reference/data-types/date.md)) — Date of sampling moment.
-
--   `event_time` ([FechaHora](../sql-reference/data-types/datetime.md)) — Timestamp of the sampling moment.
-
--   `timestamp_ns` ([UInt64](../sql-reference/data-types/int-uint.md)) — Timestamp of the sampling moment in nanoseconds.
-
--   `revision` ([UInt32](../sql-reference/data-types/int-uint.md)) — ClickHouse server build revision.
-
-    Cuando se conecta al servidor por `clickhouse-client`, ves la cadena similar a `Connected to ClickHouse server version 19.18.1 revision 54429.`. Este campo contiene el `revision`, pero no el `version` de un servidor.
-
--   `timer_type` ([Enum8](../sql-reference/data-types/enum.md)) — Timer type:
-
-    -   `Real` representa el tiempo del reloj de pared.
-    -   `CPU` representa el tiempo de CPU.
-
--   `thread_number` ([UInt32](../sql-reference/data-types/int-uint.md)) — Thread identifier.
-
--   `query_id` ([Cadena](../sql-reference/data-types/string.md)) — Query identifier that can be used to get details about a query that was running from the [query_log](#system_tables-query_log) tabla del sistema.
-
--   `trace` ([Matriz (UInt64)](../sql-reference/data-types/array.md)) — Stack trace at the moment of sampling. Each element is a virtual memory address inside ClickHouse server process.
-
-**Ejemplo**
-
-``` sql
-SELECT * FROM system.trace_log LIMIT 1 \G
-```
-
-``` text
-Row 1:
-──────
-event_date:    2019-11-15
-event_time:    2019-11-15 15:09:38
-revision:      54428
-timer_type:    Real
-thread_number: 48
-query_id:      acc4d61f-5bd1-4a3e-bc91-2180be37c915
-trace:         [94222141367858,94222152240175,94222152325351,94222152329944,94222152330796,94222151449980,94222144088167,94222151682763,94222144088167,94222151682763,94222144088167,94222144058283,94222144059248,94222091840750,94222091842302,94222091831228,94222189631488,140509950166747,140509942945935]
-```
-
-## sistema.Replica {#system_tables-replicas}
-
-Contiene información y estado de las tablas replicadas que residen en el servidor local.
-Esta tabla se puede utilizar para el monitoreo. La tabla contiene una fila para cada tabla Replicated\*.
-
-Ejemplo:
-
-``` sql
-SELECT *
-FROM system.replicas
-WHERE table = 'visits'
-FORMAT Vertical
-```
-
-``` text
-Row 1:
-──────
-database:                   merge
-table:                      visits
-engine:                     ReplicatedCollapsingMergeTree
-is_leader:                  1
-can_become_leader:          1
-is_readonly:                0
-is_session_expired:         0
-future_parts:               1
-parts_to_check:             0
-zookeeper_path:             /clickhouse/tables/01-06/visits
-replica_name:               example01-06-1.yandex.ru
-replica_path:               /clickhouse/tables/01-06/visits/replicas/example01-06-1.yandex.ru
-columns_version:            9
-queue_size:                 1
-inserts_in_queue:           0
-merges_in_queue:            1
-part_mutations_in_queue:    0
-queue_oldest_time:          2020-02-20 08:34:30
-inserts_oldest_time:        1970-01-01 00:00:00
-merges_oldest_time:         2020-02-20 08:34:30
-part_mutations_oldest_time: 1970-01-01 00:00:00
-oldest_part_to_get:
-oldest_part_to_merge_to:    20200220_20284_20840_7
-oldest_part_to_mutate_to:
-log_max_index:              596273
-log_pointer:                596274
-last_queue_update:          2020-02-20 08:34:32
-absolute_delay:             0
-total_replicas:             2
-active_replicas:            2
-```
-
-Columna:
-
--   `database` (`String`) - Nombre de la base de datos
--   `table` (`String`) - Nombre de la tabla
--   `engine` (`String`) - Nombre del motor de tabla
--   `is_leader` (`UInt8`) - Si la réplica es la líder.
-    Sólo una réplica a la vez puede ser el líder. El líder es responsable de seleccionar las fusiones de fondo para realizar.
-    Tenga en cuenta que las escrituras se pueden realizar en cualquier réplica que esté disponible y tenga una sesión en ZK, independientemente de si es un líder.
--   `can_become_leader` (`UInt8`) - Si la réplica puede ser elegida como líder.
--   `is_readonly` (`UInt8`) - Si la réplica está en modo de sólo lectura.
-    Este modo se activa si la configuración no tiene secciones con ZooKeeper, si se produce un error desconocido al reinicializar sesiones en ZooKeeper y durante la reinicialización de sesiones en ZooKeeper.
--   `is_session_expired` (`UInt8`) - la sesión con ZooKeeper ha expirado. Básicamente lo mismo que `is_readonly`.
--   `future_parts` (`UInt32`) - El número de partes de datos que aparecerán como resultado de INSERTs o fusiones que aún no se han realizado.
--   `parts_to_check` (`UInt32`) - El número de partes de datos en la cola para la verificación. Una pieza se coloca en la cola de verificación si existe la sospecha de que podría estar dañada.
--   `zookeeper_path` (`String`) - Ruta de acceso a los datos de la tabla en ZooKeeper.
--   `replica_name` (`String`) - Nombre de réplica en ZooKeeper. Diferentes réplicas de la misma tabla tienen diferentes nombres.
--   `replica_path` (`String`) - Ruta de acceso a los datos de réplica en ZooKeeper. Lo mismo que concatenar ‘zookeeper_path/replicas/replica_path’.
--   `columns_version` (`Int32`) - Número de versión de la estructura de la tabla. Indica cuántas veces se realizó ALTER. Si las réplicas tienen versiones diferentes, significa que algunas réplicas aún no han hecho todas las ALTER.
--   `queue_size` (`UInt32`) - Tamaño de la cola para las operaciones en espera de ser realizadas. Las operaciones incluyen insertar bloques de datos, fusiones y otras acciones. Por lo general, coincide con `future_parts`.
--   `inserts_in_queue` (`UInt32`) - Número de inserciones de bloques de datos que deben realizarse. Las inserciones generalmente se replican con bastante rapidez. Si este número es grande, significa que algo anda mal.
--   `merges_in_queue` (`UInt32`) - El número de fusiones en espera de hacerse. A veces las fusiones son largas, por lo que este valor puede ser mayor que cero durante mucho tiempo.
--   `part_mutations_in_queue` (`UInt32`) - El número de mutaciones a la espera de hacerse.
--   `queue_oldest_time` (`DateTime`) - Si `queue_size` mayor que 0, muestra cuándo se agregó la operación más antigua a la cola.
--   `inserts_oldest_time` (`DateTime`) - Ver `queue_oldest_time`
--   `merges_oldest_time` (`DateTime`) - Ver `queue_oldest_time`
--   `part_mutations_oldest_time` (`DateTime`) - Ver `queue_oldest_time`
-
-Las siguientes 4 columnas tienen un valor distinto de cero solo cuando hay una sesión activa con ZK.
-
--   `log_max_index` (`UInt64`) - Número máximo de inscripción en el registro de actividad general.
--   `log_pointer` (`UInt64`) - Número máximo de entrada en el registro de actividad general que la réplica copió en su cola de ejecución, más uno. Si `log_pointer` es mucho más pequeño que `log_max_index`, algo está mal.
--   `last_queue_update` (`DateTime`) - Cuando la cola se actualizó la última vez.
--   `absolute_delay` (`UInt64`) - ¿Qué tan grande retraso en segundos tiene la réplica actual.
--   `total_replicas` (`UInt8`) - El número total de réplicas conocidas de esta tabla.
--   `active_replicas` (`UInt8`) - El número de réplicas de esta tabla que tienen una sesión en ZooKeeper (es decir, el número de réplicas en funcionamiento).
-
-Si solicita todas las columnas, la tabla puede funcionar un poco lentamente, ya que se realizan varias lecturas de ZooKeeper para cada fila.
-Si no solicita las últimas 4 columnas (log_max_index, log_pointer, total_replicas, active_replicas), la tabla funciona rápidamente.
-
-Por ejemplo, puede verificar que todo funcione correctamente de esta manera:
-
-``` sql
-SELECT
-    database,
-    table,
-    is_leader,
-    is_readonly,
-    is_session_expired,
-    future_parts,
-    parts_to_check,
-    columns_version,
-    queue_size,
-    inserts_in_queue,
-    merges_in_queue,
-    log_max_index,
-    log_pointer,
-    total_replicas,
-    active_replicas
-FROM system.replicas
-WHERE
-       is_readonly
-    OR is_session_expired
-    OR future_parts > 20
-    OR parts_to_check > 10
-    OR queue_size > 20
-    OR inserts_in_queue > 10
-    OR log_max_index - log_pointer > 10
-    OR total_replicas < 2
-    OR active_replicas < total_replicas
-```
-
-Si esta consulta no devuelve nada, significa que todo está bien.
-
-## sistema.configuración {#system-tables-system-settings}
-
-Contiene información sobre la configuración de sesión para el usuario actual.
-
-Columna:
-
--   `name` ([Cadena](../sql-reference/data-types/string.md)) — Setting name.
--   `value` ([Cadena](../sql-reference/data-types/string.md)) — Setting value.
--   `changed` ([UInt8](../sql-reference/data-types/int-uint.md#uint-ranges)) — Shows whether a setting is changed from its default value.
--   `description` ([Cadena](../sql-reference/data-types/string.md)) — Short setting description.
--   `min` ([NULL](../sql-reference/data-types/nullable.md)([Cadena](../sql-reference/data-types/string.md))) — Minimum value of the setting, if any is set via [limitación](settings/constraints-on-settings.md#constraints-on-settings). Si la configuración no tiene ningún valor mínimo, contiene [NULL](../sql-reference/syntax.md#null-literal).
--   `max` ([NULL](../sql-reference/data-types/nullable.md)([Cadena](../sql-reference/data-types/string.md))) — Maximum value of the setting, if any is set via [limitación](settings/constraints-on-settings.md#constraints-on-settings). Si la configuración no tiene ningún valor máximo, contiene [NULL](../sql-reference/syntax.md#null-literal).
--   `readonly` ([UInt8](../sql-reference/data-types/int-uint.md#uint-ranges)) — Shows whether the current user can change the setting:
-    -   `0` — Current user can change the setting.
-    -   `1` — Current user can't change the setting.
-
-**Ejemplo**
-
-En el ejemplo siguiente se muestra cómo obtener información sobre la configuración cuyo nombre contiene `min_i`.
-
-``` sql
-SELECT *
-FROM system.settings
-WHERE name LIKE '%min_i%'
-```
-
-``` text
-┌─name────────────────────────────────────────┬─value─────┬─changed─┬─description───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┬─min──┬─max──┬─readonly─┐
-│ min_insert_block_size_rows                  │ 1048576   │       0 │ Squash blocks passed to INSERT query to specified size in rows, if blocks are not big enough.                                                                         │ ᴺᵁᴸᴸ │ ᴺᵁᴸᴸ │        0 │
-│ min_insert_block_size_bytes                 │ 268435456 │       0 │ Squash blocks passed to INSERT query to specified size in bytes, if blocks are not big enough.                                                                        │ ᴺᵁᴸᴸ │ ᴺᵁᴸᴸ │        0 │
-│ read_backoff_min_interval_between_events_ms │ 1000      │       0 │ Settings to reduce the number of threads in case of slow reads. Do not pay attention to the event, if the previous one has passed less than a certain amount of time. │ ᴺᵁᴸᴸ │ ᴺᵁᴸᴸ │        0 │
-└─────────────────────────────────────────────┴───────────┴─────────┴───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┴──────┴──────┴──────────┘
-```
-
-Uso de `WHERE changed` puede ser útil, por ejemplo, cuando se desea comprobar:
-
--   Si los ajustes de los archivos de configuración se cargan correctamente y están en uso.
--   Configuración que cambió en la sesión actual.
-
-<!-- -->
-
-``` sql
-SELECT * FROM system.settings WHERE changed AND name='load_balancing'
-```
-
-**Ver también**
-
--   [Configuración](settings/index.md#session-settings-intro)
--   [Permisos para consultas](settings/permissions-for-queries.md#settings_readonly)
--   [Restricciones en la configuración](settings/constraints-on-settings.md)
-
-## sistema.table_engines {#system.table_engines}
-
-``` text
-┌─name───────────────────┬─value───────┐
-│ max_threads            │ 8           │
-│ use_uncompressed_cache │ 0           │
-│ load_balancing         │ random      │
-│ max_memory_usage       │ 10000000000 │
-└────────────────────────┴─────────────┘
-```
-
-## sistema.merge_tree_settings {#system-merge_tree_settings}
-
-Contiene información sobre la configuración `MergeTree` tabla.
-
-Columna:
-
--   `name` (String) — Setting name.
--   `value` (String) — Setting value.
--   `description` (String) — Setting description.
--   `type` (String) — Setting type (implementation specific string value).
--   `changed` (UInt8) — Whether the setting was explicitly defined in the config or explicitly changed.
-
-## sistema.table_engines {#system-table-engines}
-
-Contiene la descripción de los motores de tablas admitidos por el servidor y su información de soporte de características.
-
-Esta tabla contiene las siguientes columnas (el tipo de columna se muestra entre corchetes):
-
--   `name` (String) — The name of table engine.
--   `supports_settings` (UInt8) — Flag that indicates if table engine supports `SETTINGS` clausula.
--   `supports_skipping_indices` (UInt8) — Flag that indicates if table engine supports [Índices de saltos](../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-data_skipping-indexes).
--   `supports_ttl` (UInt8) — Flag that indicates if table engine supports [TTL](../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-ttl).
--   `supports_sort_order` (UInt8) — Flag that indicates if table engine supports clauses `PARTITION_BY`, `PRIMARY_KEY`, `ORDER_BY` y `SAMPLE_BY`.
--   `supports_replication` (UInt8) — Flag that indicates if table engine supports [Replicación de datos](../engines/table-engines/mergetree-family/replication.md).
--   `supports_duduplication` (UInt8) — Flag that indicates if table engine supports data deduplication.
-
-Ejemplo:
-
-``` sql
-SELECT *
-FROM system.table_engines
-WHERE name in ('Kafka', 'MergeTree', 'ReplicatedCollapsingMergeTree')
-```
-
-``` text
-┌─name──────────────────────────┬─supports_settings─┬─supports_skipping_indices─┬─supports_sort_order─┬─supports_ttl─┬─supports_replication─┬─supports_deduplication─┐
-│ Kafka                         │                 1 │                         0 │                   0 │            0 │                    0 │                      0 │
-│ MergeTree                     │                 1 │                         1 │                   1 │            1 │                    0 │                      0 │
-│ ReplicatedCollapsingMergeTree │                 1 │                         1 │                   1 │            1 │                    1 │                      1 │
-└───────────────────────────────┴───────────────────┴───────────────────────────┴─────────────────────┴──────────────┴──────────────────────┴────────────────────────┘
-```
-
-**Ver también**
-
--   Familia MergeTree [cláusulas de consulta](../engines/table-engines/mergetree-family/mergetree.md#mergetree-query-clauses)
--   Kafka [configuración](../engines/table-engines/integrations/kafka.md#table_engine-kafka-creating-a-table)
--   Unir [configuración](../engines/table-engines/special/join.md#join-limitations-and-settings)
-
-## sistema.tabla {#system-tables}
-
-Contiene metadatos de cada tabla que el servidor conoce. Las tablas separadas no se muestran en `system.tables`.
-
-Esta tabla contiene las siguientes columnas (el tipo de columna se muestra entre corchetes):
-
--   `database` (String) — The name of the database the table is in.
-
--   `name` (String) — Table name.
-
--   `engine` (String) — Table engine name (without parameters).
-
--   `is_temporary` (UInt8): marca que indica si la tabla es temporal.
-
--   `data_path` (String) - Ruta de acceso a los datos de la tabla en el sistema de archivos.
-
--   `metadata_path` (String) - Ruta de acceso a los metadatos de la tabla en el sistema de archivos.
-
--   `metadata_modification_time` (DateTime) - Hora de la última modificación de los metadatos de la tabla.
-
--   `dependencies_database` (Array(String)) - Dependencias de base de datos.
-
--   `dependencies_table` (Array(String)) - Dependencias de tabla ([Método de codificación de datos:](../engines/table-engines/special/materializedview.md) tablas basadas en la tabla actual).
-
--   `create_table_query` (String) - La consulta que se utilizó para crear la tabla.
-
--   `engine_full` (String) - Parámetros del motor de tabla.
-
--   `partition_key` (String) - La expresión de clave de partición especificada en la tabla.
-
--   `sorting_key` (String) - La expresión de clave de ordenación especificada en la tabla.
-
--   `primary_key` (String) - La expresión de clave principal especificada en la tabla.
-
--   `sampling_key` (String) - La expresión de clave de muestreo especificada en la tabla.
-
--   `storage_policy` (String) - La política de almacenamiento:
-
-    -   [Método de codificación de datos:](../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-multiple-volumes)
-    -   [Distribuido](../engines/table-engines/special/distributed.md#distributed)
-
--   `total_rows` (Nullable(UInt64)) - Número total de filas, si es posible determinar rápidamente el número exacto de filas en la tabla, de lo contrario `Null` (incluyendo underying `Buffer` tabla).
-
--   `total_bytes` (Nullable(UInt64)) - Número total de bytes, si es posible determinar rápidamente el número exacto de bytes para la tabla en el almacenamiento, de lo contrario `Null` (**no** incluye cualquier almacenamiento subyacente).
-
-    -   If the table stores data on disk, returns used space on disk (i.e. compressed).
-    -   Si la tabla almacena datos en la memoria, devuelve el número aproximado de bytes utilizados en la memoria.
-
-El `system.tables` se utiliza en `SHOW TABLES` implementación de consultas.
-
-## sistema.Zookeeper {#system-zookeeper}
-
-La tabla no existe si ZooKeeper no está configurado. Permite leer datos del clúster ZooKeeper definido en la configuración.
-La consulta debe tener un ‘path’ condición de igualdad en la cláusula WHERE. Este es el camino en ZooKeeper para los niños para los que desea obtener datos.
-
-Consulta `SELECT * FROM system.zookeeper WHERE path = '/clickhouse'` salidas de datos para todos los niños en el `/clickhouse` nodo.
-Para generar datos para todos los nodos raíz, escriba path = ‘/’.
-Si la ruta especificada en ‘path’ no existe, se lanzará una excepción.
-
-Columna:
-
--   `name` (String) — The name of the node.
--   `path` (String) — The path to the node.
--   `value` (String) — Node value.
--   `dataLength` (Int32) — Size of the value.
--   `numChildren` (Int32) — Number of descendants.
--   `czxid` (Int64) — ID of the transaction that created the node.
--   `mzxid` (Int64) — ID of the transaction that last changed the node.
--   `pzxid` (Int64) — ID of the transaction that last deleted or added descendants.
--   `ctime` (DateTime) — Time of node creation.
--   `mtime` (DateTime) — Time of the last modification of the node.
--   `version` (Int32) — Node version: the number of times the node was changed.
--   `cversion` (Int32) — Number of added or removed descendants.
--   `aversion` (Int32) — Number of changes to the ACL.
--   `ephemeralOwner` (Int64) — For ephemeral nodes, the ID of the session that owns this node.
-
-Ejemplo:
-
-``` sql
-SELECT *
-FROM system.zookeeper
-WHERE path = '/clickhouse/tables/01-08/visits/replicas'
-FORMAT Vertical
-```
-
-``` text
-Row 1:
-──────
-name:           example01-08-1.yandex.ru
-value:
-czxid:          932998691229
-mzxid:          932998691229
-ctime:          2015-03-27 16:49:51
-mtime:          2015-03-27 16:49:51
-version:        0
-cversion:       47
-aversion:       0
-ephemeralOwner: 0
-dataLength:     0
-numChildren:    7
-pzxid:          987021031383
-path:           /clickhouse/tables/01-08/visits/replicas
-
-Row 2:
-──────
-name:           example01-08-2.yandex.ru
-value:
-czxid:          933002738135
-mzxid:          933002738135
-ctime:          2015-03-27 16:57:01
-mtime:          2015-03-27 16:57:01
-version:        0
-cversion:       37
-aversion:       0
-ephemeralOwner: 0
-dataLength:     0
-numChildren:    7
-pzxid:          987021252247
-path:           /clickhouse/tables/01-08/visits/replicas
-```
-
-## sistema.mutación {#system_tables-mutations}
-
-La tabla contiene información sobre [mutación](../sql-reference/statements/alter.md#alter-mutations) de las tablas MergeTree y su progreso. Cada comando de mutación está representado por una sola fila. La tabla tiene las siguientes columnas:
-
-**base**, **tabla** - El nombre de la base de datos y la tabla a la que se aplicó la mutación.
-
-**mutation_id** - La identificación de la mutación. Para las tablas replicadas, estos identificadores corresponden a los nombres de znode `<table_path_in_zookeeper>/mutations/` directorio en ZooKeeper. Para las tablas no duplicadas, los ID corresponden a los nombres de archivo en el directorio de datos de la tabla.
-
-**comando** - La cadena de comandos de mutación (la parte de la consulta después de `ALTER TABLE [db.]table`).
-
-**create_time** - Cuando este comando de mutación fue enviado para su ejecución.
-
-**block_numbers.partition_id**, **block_numbers.numero** - Una columna anidada. Para las mutaciones de tablas replicadas, contiene un registro para cada partición: el ID de partición y el número de bloque que fue adquirido por la mutación (en cada partición, solo se mutarán las partes que contienen bloques con números menores que el número de bloque adquirido por la mutación en esa partición). En tablas no replicadas, los números de bloque en todas las particiones forman una sola secuencia. Esto significa que para las mutaciones de tablas no replicadas, la columna contendrá un registro con un solo número de bloque adquirido por la mutación.
-
-**partes_a_do** - El número de partes de datos que deben mutarse para que finalice la mutación.
-
-**is_done** - Es la mutación hecho? Tenga en cuenta que incluso si `parts_to_do = 0` es posible que aún no se haya realizado una mutación de una tabla replicada debido a un INSERT de larga ejecución que creará una nueva parte de datos que deberá mutarse.
-
-Si hubo problemas con la mutación de algunas partes, las siguientes columnas contienen información adicional:
-
-**Método de codificación de datos:** - El nombre de la parte más reciente que no se pudo mutar.
-
-**Método de codificación de datos:** - El momento del fracaso de la mutación de la parte más reciente.
-
-**Método de codificación de datos:** - El mensaje de excepción que causó el error de mutación de parte más reciente.
-
-## sistema.disco {#system_tables-disks}
-
-Contiene información sobre los discos definidos en el [configuración del servidor](../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-multiple-volumes_configure).
-
-Columna:
-
--   `name` ([Cadena](../sql-reference/data-types/string.md)) — Name of a disk in the server configuration.
--   `path` ([Cadena](../sql-reference/data-types/string.md)) — Path to the mount point in the file system.
--   `free_space` ([UInt64](../sql-reference/data-types/int-uint.md)) — Free space on disk in bytes.
--   `total_space` ([UInt64](../sql-reference/data-types/int-uint.md)) — Disk volume in bytes.
--   `keep_free_space` ([UInt64](../sql-reference/data-types/int-uint.md)) — Amount of disk space that should stay free on disk in bytes. Defined in the `keep_free_space_bytes` parámetro de configuración del disco.
-
-## sistema.almacenamiento_policies {#system_tables-storage_policies}
-
-Contiene información sobre las directivas de almacenamiento y los volúmenes [configuración del servidor](../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-multiple-volumes_configure).
-
-Columna:
-
--   `policy_name` ([Cadena](../sql-reference/data-types/string.md)) — Name of the storage policy.
--   `volume_name` ([Cadena](../sql-reference/data-types/string.md)) — Volume name defined in the storage policy.
--   `volume_priority` ([UInt64](../sql-reference/data-types/int-uint.md)) — Volume order number in the configuration.
--   `disks` ([Array(Cadena)](../sql-reference/data-types/array.md)) — Disk names, defined in the storage policy.
--   `max_data_part_size` ([UInt64](../sql-reference/data-types/int-uint.md)) — Maximum size of a data part that can be stored on volume disks (0 — no limit).
--   `move_factor` ([Float64](../sql-reference/data-types/float.md)) — Ratio of free disk space. When the ratio exceeds the value of configuration parameter, ClickHouse start to move data to the next volume in order.
-
-Si la directiva de almacenamiento contiene más de un volumen, la información de cada volumen se almacena en la fila individual de la tabla.
-
-[Artículo Original](https://clickhouse.tech/docs/en/operations/system_tables/) <!--hide-->
diff --git a/docs/es/operations/tips.md b/docs/es/operations/tips.md
deleted file mode 100644
index deb226450aa..00000000000
--- a/docs/es/operations/tips.md
+++ /dev/null
@@ -1,251 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 58
-toc_title: Recomendaciones de uso
----
-
-# Recomendaciones de uso {#usage-recommendations}
-
-## CPU Scaling Governor {#cpu-scaling-governor}
-
-Utilice siempre el `performance` gobernador de escala. El `on-demand` regulador de escala funciona mucho peor con una demanda constante.
-
-``` bash
-$ echo 'performance' | sudo tee /sys/devices/system/cpu/cpu*/cpufreq/scaling_governor
-```
-
-## Limitaciones de la CPU {#cpu-limitations}
-
-Los procesadores pueden sobrecalentarse. Utilizar `dmesg` para ver si la velocidad de reloj de la CPU era limitada debido al sobrecalentamiento.
-La restricción también se puede establecer externamente en el nivel del centro de datos. Usted puede utilizar `turbostat` para controlarlo bajo una carga.
-
-## RAM {#ram}
-
-Para pequeñas cantidades de datos (hasta ~200 GB comprimidos), es mejor usar tanta memoria como el volumen de datos.
-Para grandes cantidades de datos y al procesar consultas interactivas (en línea), debe usar una cantidad razonable de RAM (128 GB o más) para que el subconjunto de datos en caliente quepa en la memoria caché de páginas.
-Incluso para volúmenes de datos de ~ 50 TB por servidor, el uso de 128 GB de RAM mejora significativamente el rendimiento de las consultas en comparación con 64 GB.
-
-No deshabilite el sobrecompromiso. Valor `cat /proc/sys/vm/overcommit_memory` debe ser 0 o 1. Ejecutar
-
-``` bash
-$ echo 0 | sudo tee /proc/sys/vm/overcommit_memory
-```
-
-## Páginas enormes {#huge-pages}
-
-Siempre deshabilite las páginas enormes transparentes. Interfiere con los asignadores de memoria, lo que conduce a una degradación significativa del rendimiento.
-
-``` bash
-$ echo 'never' | sudo tee /sys/kernel/mm/transparent_hugepage/enabled
-```
-
-Utilizar `perf top` para ver el tiempo pasado en el kernel para la administración de memoria.
-Las páginas enormes permanentes tampoco necesitan ser asignadas.
-
-## Subsistema de almacenamiento {#storage-subsystem}
-
-Si su presupuesto le permite usar SSD, use SSD.
-Si no, use HDD. Los discos duros SATA 7200 RPM servirán.
-
-Dar preferencia a una gran cantidad de servidores con discos duros locales sobre un número menor de servidores con estantes de discos conectados.
-Pero para almacenar archivos con consultas raras, los estantes funcionarán.
-
-## RAID {#raid}
-
-Al usar HDD, puede combinar su RAID-10, RAID-5, RAID-6 o RAID-50.
-Para Linux, el software RAID es mejor (con `mdadm`). No recomendamos usar LVM.
-Al crear RAID-10, seleccione el `far` diseño.
-Si su presupuesto lo permite, elija RAID-10.
-
-Si tiene más de 4 discos, utilice RAID-6 (preferido) o RAID-50, en lugar de RAID-5.
-Cuando use RAID-5, RAID-6 o RAID-50, siempre aumente stripe_cache_size, ya que el valor predeterminado generalmente no es la mejor opción.
-
-``` bash
-$ echo 4096 | sudo tee /sys/block/md2/md/stripe_cache_size
-```
-
-Calcule el número exacto a partir del número de dispositivos y el tamaño del bloque, utilizando la fórmula: `2 * num_devices * chunk_size_in_bytes / 4096`.
-
-Un tamaño de bloque de 1024 KB es suficiente para todas las configuraciones RAID.
-Nunca ajuste el tamaño del bloque demasiado pequeño o demasiado grande.
-
-Puede usar RAID-0 en SSD.
-Independientemente del uso de RAID, utilice siempre la replicación para la seguridad de los datos.
-
-Habilite NCQ con una cola larga. Para HDD, elija el programador CFQ, y para SSD, elija noop. No reduzca el ‘readahead’ configuración.
-Para HDD, habilite la memoria caché de escritura.
-
-## Sistema de archivos {#file-system}
-
-Ext4 es la opción más confiable. Establecer las opciones de montaje `noatime, nobarrier`.
-XFS también es adecuado, pero no ha sido probado tan a fondo con ClickHouse.
-La mayoría de los otros sistemas de archivos también deberían funcionar bien. Los sistemas de archivos con asignación retrasada funcionan mejor.
-
-## Núcleo de Linux {#linux-kernel}
-
-No use un kernel de Linux obsoleto.
-
-## Red {#network}
-
-Si está utilizando IPv6, aumente el tamaño de la caché de ruta.
-El kernel de Linux anterior a 3.2 tenía una multitud de problemas con la implementación de IPv6.
-
-Utilice al menos una red de 10 GB, si es posible. 1 Gb también funcionará, pero será mucho peor para parchear réplicas con decenas de terabytes de datos, o para procesar consultas distribuidas con una gran cantidad de datos intermedios.
-
-## ZooKeeper {#zookeeper}
-
-Probablemente ya esté utilizando ZooKeeper para otros fines. Puede usar la misma instalación de ZooKeeper, si aún no está sobrecargada.
-
-It's best to use a fresh version of ZooKeeper – 3.4.9 or later. The version in stable Linux distributions may be outdated.
-
-Nunca debe usar scripts escritos manualmente para transferir datos entre diferentes clústeres de ZooKeeper, ya que el resultado será incorrecto para los nodos secuenciales. Nunca utilice el “zkcopy” utilidad por la misma razón: https://github.com/ksprojects/zkcopy/issues/15
-
-Si desea dividir un clúster ZooKeeper existente en dos, la forma correcta es aumentar el número de sus réplicas y, a continuación, volver a configurarlo como dos clústeres independientes.
-
-No ejecute ZooKeeper en los mismos servidores que ClickHouse. Porque ZooKeeper es muy sensible a la latencia y ClickHouse puede utilizar todos los recursos del sistema disponibles.
-
-Con la configuración predeterminada, ZooKeeper es una bomba de tiempo:
-
-> El servidor ZooKeeper no eliminará archivos de instantáneas y registros antiguos cuando utilice la configuración predeterminada (consulte autopurge), y esto es responsabilidad del operador.
-
-Esta bomba debe ser desactivada.
-
-La configuración ZooKeeper (3.5.1) a continuación se usa en Yandex.Entorno de producción de Métrica al 20 de mayo de 2017:
-
-zoológico.Cómo:
-
-``` bash
-# http://hadoop.apache.org/zookeeper/docs/current/zookeeperAdmin.html
-
-# The number of milliseconds of each tick
-tickTime=2000
-# The number of ticks that the initial
-# synchronization phase can take
-initLimit=30000
-# The number of ticks that can pass between
-# sending a request and getting an acknowledgement
-syncLimit=10
-
-maxClientCnxns=2000
-
-maxSessionTimeout=60000000
-# the directory where the snapshot is stored.
-dataDir=/opt/zookeeper/{{ '{{' }} cluster['name'] {{ '}}' }}/data
-# Place the dataLogDir to a separate physical disc for better performance
-dataLogDir=/opt/zookeeper/{{ '{{' }} cluster['name'] {{ '}}' }}/logs
-
-autopurge.snapRetainCount=10
-autopurge.purgeInterval=1
-
-
-# To avoid seeks ZooKeeper allocates space in the transaction log file in
-# blocks of preAllocSize kilobytes. The default block size is 64M. One reason
-# for changing the size of the blocks is to reduce the block size if snapshots
-# are taken more often. (Also, see snapCount).
-preAllocSize=131072
-
-# Clients can submit requests faster than ZooKeeper can process them,
-# especially if there are a lot of clients. To prevent ZooKeeper from running
-# out of memory due to queued requests, ZooKeeper will throttle clients so that
-# there is no more than globalOutstandingLimit outstanding requests in the
-# system. The default limit is 1,000.ZooKeeper logs transactions to a
-# transaction log. After snapCount transactions are written to a log file a
-# snapshot is started and a new transaction log file is started. The default
-# snapCount is 10,000.
-snapCount=3000000
-
-# If this option is defined, requests will be will logged to a trace file named
-# traceFile.year.month.day.
-#traceFile=
-
-# Leader accepts client connections. Default value is "yes". The leader machine
-# coordinates updates. For higher update throughput at thes slight expense of
-# read throughput the leader can be configured to not accept clients and focus
-# on coordination.
-leaderServes=yes
-
-standaloneEnabled=false
-dynamicConfigFile=/etc/zookeeper-{{ '{{' }} cluster['name'] {{ '}}' }}/conf/zoo.cfg.dynamic
-```
-
-Versión Java:
-
-``` text
-Java(TM) SE Runtime Environment (build 1.8.0_25-b17)
-Java HotSpot(TM) 64-Bit Server VM (build 25.25-b02, mixed mode)
-```
-
-Parámetros de JVM:
-
-``` bash
-NAME=zookeeper-{{ '{{' }} cluster['name'] {{ '}}' }}
-ZOOCFGDIR=/etc/$NAME/conf
-
-# TODO this is really ugly
-# How to find out, which jars are needed?
-# seems, that log4j requires the log4j.properties file to be in the classpath
-CLASSPATH="$ZOOCFGDIR:/usr/build/classes:/usr/build/lib/*.jar:/usr/share/zookeeper/zookeeper-3.5.1-metrika.jar:/usr/share/zookeeper/slf4j-log4j12-1.7.5.jar:/usr/share/zookeeper/slf4j-api-1.7.5.jar:/usr/share/zookeeper/servlet-api-2.5-20081211.jar:/usr/share/zookeeper/netty-3.7.0.Final.jar:/usr/share/zookeeper/log4j-1.2.16.jar:/usr/share/zookeeper/jline-2.11.jar:/usr/share/zookeeper/jetty-util-6.1.26.jar:/usr/share/zookeeper/jetty-6.1.26.jar:/usr/share/zookeeper/javacc.jar:/usr/share/zookeeper/jackson-mapper-asl-1.9.11.jar:/usr/share/zookeeper/jackson-core-asl-1.9.11.jar:/usr/share/zookeeper/commons-cli-1.2.jar:/usr/src/java/lib/*.jar:/usr/etc/zookeeper"
-
-ZOOCFG="$ZOOCFGDIR/zoo.cfg"
-ZOO_LOG_DIR=/var/log/$NAME
-USER=zookeeper
-GROUP=zookeeper
-PIDDIR=/var/run/$NAME
-PIDFILE=$PIDDIR/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-JAVA=/usr/bin/java
-ZOOMAIN="org.apache.zookeeper.server.quorum.QuorumPeerMain"
-ZOO_LOG4J_PROP="INFO,ROLLINGFILE"
-JMXLOCALONLY=false
-JAVA_OPTS="-Xms{{ '{{' }} cluster.get('xms','128M') {{ '}}' }} \
-    -Xmx{{ '{{' }} cluster.get('xmx','1G') {{ '}}' }} \
-    -Xloggc:/var/log/$NAME/zookeeper-gc.log \
-    -XX:+UseGCLogFileRotation \
-    -XX:NumberOfGCLogFiles=16 \
-    -XX:GCLogFileSize=16M \
-    -verbose:gc \
-    -XX:+PrintGCTimeStamps \
-    -XX:+PrintGCDateStamps \
-    -XX:+PrintGCDetails
-    -XX:+PrintTenuringDistribution \
-    -XX:+PrintGCApplicationStoppedTime \
-    -XX:+PrintGCApplicationConcurrentTime \
-    -XX:+PrintSafepointStatistics \
-    -XX:+UseParNewGC \
-    -XX:+UseConcMarkSweepGC \
--XX:+CMSParallelRemarkEnabled"
-```
-
-Sal init:
-
-``` text
-description "zookeeper-{{ '{{' }} cluster['name'] {{ '}}' }} centralized coordination service"
-
-start on runlevel [2345]
-stop on runlevel [!2345]
-
-respawn
-
-limit nofile 8192 8192
-
-pre-start script
-    [ -r "/etc/zookeeper-{{ '{{' }} cluster['name'] {{ '}}' }}/conf/environment" ] || exit 0
-    . /etc/zookeeper-{{ '{{' }} cluster['name'] {{ '}}' }}/conf/environment
-    [ -d $ZOO_LOG_DIR ] || mkdir -p $ZOO_LOG_DIR
-    chown $USER:$GROUP $ZOO_LOG_DIR
-end script
-
-script
-    . /etc/zookeeper-{{ '{{' }} cluster['name'] {{ '}}' }}/conf/environment
-    [ -r /etc/default/zookeeper ] && . /etc/default/zookeeper
-    if [ -z "$JMXDISABLE" ]; then
-        JAVA_OPTS="$JAVA_OPTS -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.local.only=$JMXLOCALONLY"
-    fi
-    exec start-stop-daemon --start -c $USER --exec $JAVA --name zookeeper-{{ '{{' }} cluster['name'] {{ '}}' }} \
-        -- -cp $CLASSPATH $JAVA_OPTS -Dzookeeper.log.dir=${ZOO_LOG_DIR} \
-        -Dzookeeper.root.logger=${ZOO_LOG4J_PROP} $ZOOMAIN $ZOOCFG
-end script
-```
-
-{## [Artículo Original](https://clickhouse.tech/docs/en/operations/tips/) ##}
diff --git a/docs/es/operations/troubleshooting.md b/docs/es/operations/troubleshooting.md
deleted file mode 100644
index 9e8d2caca59..00000000000
--- a/docs/es/operations/troubleshooting.md
+++ /dev/null
@@ -1,146 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 46
-toc_title: "Soluci\xF3n de problemas"
----
-
-# Solución de problemas {#troubleshooting}
-
--   [Instalación](#troubleshooting-installation-errors)
--   [Conexión al servidor](#troubleshooting-accepts-no-connections)
--   [Procesamiento de consultas](#troubleshooting-does-not-process-queries)
--   [Eficiencia del procesamiento de consultas](#troubleshooting-too-slow)
-
-## Instalación {#troubleshooting-installation-errors}
-
-### No puede obtener paquetes Deb del repositorio ClickHouse con Apt-get {#you-cannot-get-deb-packages-from-clickhouse-repository-with-apt-get}
-
--   Compruebe la configuración del firewall.
--   Si no puede acceder al repositorio por cualquier motivo, descargue los paquetes como se describe en el [Primeros pasos](../getting-started/index.md) artículo e instálelos manualmente usando el `sudo dpkg -i <packages>` comando. También necesitará el `tzdata` paquete.
-
-## Conexión al servidor {#troubleshooting-accepts-no-connections}
-
-Posibles problemas:
-
--   El servidor no se está ejecutando.
--   Parámetros de configuración inesperados o incorrectos.
-
-### El servidor no se está ejecutando {#server-is-not-running}
-
-**Compruebe si el servidor está ejecutado**
-
-Comando:
-
-``` bash
-$ sudo service clickhouse-server status
-```
-
-Si el servidor no se está ejecutando, inícielo con el comando:
-
-``` bash
-$ sudo service clickhouse-server start
-```
-
-**Comprobar registros**
-
-El registro principal de `clickhouse-server` está en `/var/log/clickhouse-server/clickhouse-server.log` predeterminada.
-
-Si el servidor se inició correctamente, debería ver las cadenas:
-
--   `<Information> Application: starting up.` — Server started.
--   `<Information> Application: Ready for connections.` — Server is running and ready for connections.
-
-Si `clickhouse-server` error de inicio con un error de configuración, debería ver el `<Error>` cadena con una descripción de error. Por ejemplo:
-
-``` text
-2019.01.11 15:23:25.549505 [ 45 ] {} <Error> ExternalDictionaries: Failed reloading 'event2id' external dictionary: Poco::Exception. Code: 1000, e.code() = 111, e.displayText() = Connection refused, e.what() = Connection refused
-```
-
-Si no ve un error al final del archivo, revise todo el archivo a partir de la cadena:
-
-``` text
-<Information> Application: starting up.
-```
-
-Si intenta iniciar una segunda instancia de `clickhouse-server` en el servidor, verá el siguiente registro:
-
-``` text
-2019.01.11 15:25:11.151730 [ 1 ] {} <Information> : Starting ClickHouse 19.1.0 with revision 54413
-2019.01.11 15:25:11.154578 [ 1 ] {} <Information> Application: starting up
-2019.01.11 15:25:11.156361 [ 1 ] {} <Information> StatusFile: Status file ./status already exists - unclean restart. Contents:
-PID: 8510
-Started at: 2019-01-11 15:24:23
-Revision: 54413
-
-2019.01.11 15:25:11.156673 [ 1 ] {} <Error> Application: DB::Exception: Cannot lock file ./status. Another server instance in same directory is already running.
-2019.01.11 15:25:11.156682 [ 1 ] {} <Information> Application: shutting down
-2019.01.11 15:25:11.156686 [ 1 ] {} <Debug> Application: Uninitializing subsystem: Logging Subsystem
-2019.01.11 15:25:11.156716 [ 2 ] {} <Information> BaseDaemon: Stop SignalListener thread
-```
-
-**Ver sistema.d registros**
-
-Si no encuentra ninguna información útil en `clickhouse-server` registros o no hay registros, puede ver `system.d` registros usando el comando:
-
-``` bash
-$ sudo journalctl -u clickhouse-server
-```
-
-**Iniciar clickhouse-server en modo interactivo**
-
-``` bash
-$ sudo -u clickhouse /usr/bin/clickhouse-server --config-file /etc/clickhouse-server/config.xml
-```
-
-Este comando inicia el servidor como una aplicación interactiva con parámetros estándar del script de inicio automático. En este modo `clickhouse-server` imprime todos los mensajes de eventos en la consola.
-
-### Parámetros de configuración {#configuration-parameters}
-
-Comprobar:
-
--   Configuración de Docker.
-
-    Si ejecuta ClickHouse en Docker en una red IPv6, asegúrese de que `network=host` se establece.
-
--   Configuración del punto final.
-
-    Comprobar [listen_host](server-configuration-parameters/settings.md#server_configuration_parameters-listen_host) y [Tcp_port](server-configuration-parameters/settings.md#server_configuration_parameters-tcp_port) configuración.
-
-    El servidor ClickHouse acepta conexiones localhost solo de forma predeterminada.
-
--   Configuración del protocolo HTTP.
-
-    Compruebe la configuración del protocolo para la API HTTP.
-
--   Configuración de conexión segura.
-
-    Comprobar:
-
-    -   El [Tcp_port_secure](server-configuration-parameters/settings.md#server_configuration_parameters-tcp_port_secure) configuración.
-    -   Ajustes para [Sertificados SSL](server-configuration-parameters/settings.md#server_configuration_parameters-openssl).
-
-    Utilice los parámetros adecuados mientras se conecta. Por ejemplo, utilice el `port_secure` parámetro con `clickhouse_client`.
-
--   Configuración del usuario.
-
-    Es posible que esté utilizando el nombre de usuario o la contraseña incorrectos.
-
-## Procesamiento de consultas {#troubleshooting-does-not-process-queries}
-
-Si ClickHouse no puede procesar la consulta, envía una descripción de error al cliente. En el `clickhouse-client` obtienes una descripción del error en la consola. Si está utilizando la interfaz HTTP, ClickHouse envía la descripción del error en el cuerpo de la respuesta. Por ejemplo:
-
-``` bash
-$ curl 'http://localhost:8123/' --data-binary "SELECT a"
-Code: 47, e.displayText() = DB::Exception: Unknown identifier: a. Note that there are no tables (FROM clause) in your query, context: required_names: 'a' source_tables: table_aliases: private_aliases: column_aliases: public_columns: 'a' masked_columns: array_join_columns: source_columns: , e.what() = DB::Exception
-```
-
-Si empiezas `clickhouse-client` con el `stack-trace` parámetro, ClickHouse devuelve el seguimiento de la pila del servidor con la descripción de un error.
-
-Es posible que vea un mensaje sobre una conexión rota. En este caso, puede repetir la consulta. Si la conexión se rompe cada vez que realiza la consulta, compruebe si hay errores en los registros del servidor.
-
-## Eficiencia del procesamiento de consultas {#troubleshooting-too-slow}
-
-Si ve que ClickHouse funciona demasiado lentamente, debe perfilar la carga en los recursos del servidor y la red para sus consultas.
-
-Puede utilizar la utilidad clickhouse-benchmark para crear perfiles de consultas. Muestra el número de consultas procesadas por segundo, el número de filas procesadas por segundo y percentiles de tiempos de procesamiento de consultas.
diff --git a/docs/es/operations/update.md b/docs/es/operations/update.md
deleted file mode 100644
index 11d15381d72..00000000000
--- a/docs/es/operations/update.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 47
-toc_title: "Actualizaci\xF3n de ClickHouse"
----
-
-# Actualización de ClickHouse {#clickhouse-update}
-
-Si se instaló ClickHouse desde paquetes deb, ejecute los siguientes comandos en el servidor:
-
-``` bash
-$ sudo apt-get update
-$ sudo apt-get install clickhouse-client clickhouse-server
-$ sudo service clickhouse-server restart
-```
-
-Si ha instalado ClickHouse utilizando algo distinto de los paquetes deb recomendados, utilice el método de actualización adecuado.
-
-ClickHouse no admite una actualización distribuida. La operación debe realizarse consecutivamente en cada servidor separado. No actualice todos los servidores de un clúster simultáneamente, o el clúster no estará disponible durante algún tiempo.
diff --git a/docs/es/operations/utilities/clickhouse-benchmark.md b/docs/es/operations/utilities/clickhouse-benchmark.md
deleted file mode 100644
index 9bcafa40dfe..00000000000
--- a/docs/es/operations/utilities/clickhouse-benchmark.md
+++ /dev/null
@@ -1,156 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 61
-toc_title: Sistema abierto.
----
-
-# Sistema abierto {#clickhouse-benchmark}
-
-Se conecta a un servidor ClickHouse y envía repetidamente las consultas especificadas.
-
-Sintaxis:
-
-``` bash
-$ echo "single query" | clickhouse-benchmark [keys]
-```
-
-o
-
-``` bash
-$ clickhouse-benchmark [keys] <<< "single query"
-```
-
-Si desea enviar un conjunto de consultas, cree un archivo de texto y coloque cada consulta en la cadena individual de este archivo. Por ejemplo:
-
-``` sql
-SELECT * FROM system.numbers LIMIT 10000000
-SELECT 1
-```
-
-Luego pase este archivo a una entrada estándar de `clickhouse-benchmark`.
-
-``` bash
-clickhouse-benchmark [keys] < queries_file
-```
-
-## Claves {#clickhouse-benchmark-keys}
-
--   `-c N`, `--concurrency=N` — Number of queries that `clickhouse-benchmark` se envía simultáneamente. Valor predeterminado: 1.
--   `-d N`, `--delay=N` — Interval in seconds between intermediate reports (set 0 to disable reports). Default value: 1.
--   `-h WORD`, `--host=WORD` — Server host. Default value: `localhost`. Para el [modo de comparación](#clickhouse-benchmark-comparison-mode) puedes usar múltiples `-h` claves.
--   `-p N`, `--port=N` — Server port. Default value: 9000. For the [modo de comparación](#clickhouse-benchmark-comparison-mode) puedes usar múltiples `-p` claves.
--   `-i N`, `--iterations=N` — Total number of queries. Default value: 0.
--   `-r`, `--randomize` — Random order of queries execution if there is more then one input query.
--   `-s`, `--secure` — Using TLS connection.
--   `-t N`, `--timelimit=N` — Time limit in seconds. `clickhouse-benchmark` detiene el envío de consultas cuando se alcanza el límite de tiempo especificado. Valor predeterminado: 0 (límite de tiempo desactivado).
--   `--confidence=N` — Level of confidence for T-test. Possible values: 0 (80%), 1 (90%), 2 (95%), 3 (98%), 4 (99%), 5 (99.5%). Default value: 5. In the [modo de comparación](#clickhouse-benchmark-comparison-mode) `clickhouse-benchmark` realiza el [Prueba t independiente de dos muestras para estudiantes](https://en.wikipedia.org/wiki/Student%27s_t-test#Independent_two-sample_t-test) prueba para determinar si las dos distribuciones no son diferentes con el nivel de confianza seleccionado.
--   `--cumulative` — Printing cumulative data instead of data per interval.
--   `--database=DATABASE_NAME` — ClickHouse database name. Default value: `default`.
--   `--json=FILEPATH` — JSON output. When the key is set, `clickhouse-benchmark` emite un informe al archivo JSON especificado.
--   `--user=USERNAME` — ClickHouse user name. Default value: `default`.
--   `--password=PSWD` — ClickHouse user password. Default value: empty string.
--   `--stacktrace` — Stack traces output. When the key is set, `clickhouse-bencmark` las salidas acumulan rastros de excepciones.
--   `--stage=WORD` — Query processing stage at server. ClickHouse stops query processing and returns answer to `clickhouse-benchmark` en la etapa especificada. Valores posibles: `complete`, `fetch_columns`, `with_mergeable_state`. Valor predeterminado: `complete`.
--   `--help` — Shows the help message.
-
-Si desea aplicar alguna [configuración](../../operations/settings/index.md) para consultas, páselas como una clave `--<session setting name>= SETTING_VALUE`. Por ejemplo, `--max_memory_usage=1048576`.
-
-## Salida {#clickhouse-benchmark-output}
-
-Predeterminada, `clickhouse-benchmark` informes para cada `--delay` intervalo.
-
-Ejemplo del informe:
-
-``` text
-Queries executed: 10.
-
-localhost:9000, queries 10, QPS: 6.772, RPS: 67904487.440, MiB/s: 518.070, result RPS: 67721584.984, result MiB/s: 516.675.
-
-0.000%      0.145 sec.
-10.000%     0.146 sec.
-20.000%     0.146 sec.
-30.000%     0.146 sec.
-40.000%     0.147 sec.
-50.000%     0.148 sec.
-60.000%     0.148 sec.
-70.000%     0.148 sec.
-80.000%     0.149 sec.
-90.000%     0.150 sec.
-95.000%     0.150 sec.
-99.000%     0.150 sec.
-99.900%     0.150 sec.
-99.990%     0.150 sec.
-```
-
-En el informe puedes encontrar:
-
--   Número de consultas en el `Queries executed:` campo.
-
--   Cadena de estado que contiene (en orden):
-
-    -   Punto final del servidor ClickHouse.
-    -   Número de consultas procesadas.
-    -   QPS: QPS: ¿Cuántas consultas realizó el servidor por segundo durante un período `--delay` argumento.
-    -   RPS: ¿Cuántas filas lee el servidor por segundo durante un período `--delay` argumento.
-    -   MiB/s: ¿Cuántos mebibytes servidor leído por segundo durante un período especificado en el `--delay` argumento.
-    -   resultado RPS: ¿Cuántas filas colocadas por el servidor al resultado de una consulta por segundo durante un período `--delay` argumento.
-    -   resultado MiB/s. ¿Cuántos mebibytes colocados por el servidor al resultado de una consulta por segundo durante un período especificado en el `--delay` argumento.
-
--   Percentiles de tiempo de ejecución de consultas.
-
-## Modo de comparación {#clickhouse-benchmark-comparison-mode}
-
-`clickhouse-benchmark` puede comparar el rendimiento de dos servidores ClickHouse en ejecución.
-
-Para utilizar el modo de comparación, especifique los puntos finales de ambos servidores `--host`, `--port` claves. Las claves coinciden entre sí por posición en la lista de argumentos, la primera `--host` se empareja con la primera `--port` y así sucesivamente. `clickhouse-benchmark` establece conexiones a ambos servidores, luego envía consultas. Cada consulta dirigida a un servidor seleccionado al azar. Los resultados se muestran para cada servidor por separado.
-
-## Ejemplo {#clickhouse-benchmark-example}
-
-``` bash
-$ echo "SELECT * FROM system.numbers LIMIT 10000000 OFFSET 10000000" | clickhouse-benchmark -i 10
-```
-
-``` text
-Loaded 1 queries.
-
-Queries executed: 6.
-
-localhost:9000, queries 6, QPS: 6.153, RPS: 123398340.957, MiB/s: 941.455, result RPS: 61532982.200, result MiB/s: 469.459.
-
-0.000%      0.159 sec.
-10.000%     0.159 sec.
-20.000%     0.159 sec.
-30.000%     0.160 sec.
-40.000%     0.160 sec.
-50.000%     0.162 sec.
-60.000%     0.164 sec.
-70.000%     0.165 sec.
-80.000%     0.166 sec.
-90.000%     0.166 sec.
-95.000%     0.167 sec.
-99.000%     0.167 sec.
-99.900%     0.167 sec.
-99.990%     0.167 sec.
-
-
-
-Queries executed: 10.
-
-localhost:9000, queries 10, QPS: 6.082, RPS: 121959604.568, MiB/s: 930.478, result RPS: 60815551.642, result MiB/s: 463.986.
-
-0.000%      0.159 sec.
-10.000%     0.159 sec.
-20.000%     0.160 sec.
-30.000%     0.163 sec.
-40.000%     0.164 sec.
-50.000%     0.165 sec.
-60.000%     0.166 sec.
-70.000%     0.166 sec.
-80.000%     0.167 sec.
-90.000%     0.167 sec.
-95.000%     0.170 sec.
-99.000%     0.172 sec.
-99.900%     0.172 sec.
-99.990%     0.172 sec.
-```
diff --git a/docs/es/operations/utilities/clickhouse-copier.md b/docs/es/operations/utilities/clickhouse-copier.md
deleted file mode 100644
index 5717ffaa737..00000000000
--- a/docs/es/operations/utilities/clickhouse-copier.md
+++ /dev/null
@@ -1,176 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 59
-toc_title: "M\xE9todo de codificaci\xF3n de datos:"
----
-
-# Método de codificación de datos: {#clickhouse-copier}
-
-Copia datos de las tablas de un clúster en tablas de otro (o del mismo) clúster.
-
-Puede ejecutar varios `clickhouse-copier` instancias en diferentes servidores para realizar el mismo trabajo. ZooKeeper se utiliza para sincronizar los procesos.
-
-Después de comenzar, `clickhouse-copier`:
-
--   Se conecta a ZooKeeper y recibe:
-
-    -   Copia de trabajos.
-    -   El estado de los trabajos de copia.
-
--   Realiza los trabajos.
-
-    Cada proceso en ejecución elige el “closest” el fragmento del clúster de origen y copia los datos en el clúster de destino, reafirmando los datos si es necesario.
-
-`clickhouse-copier` realiza un seguimiento de los cambios en ZooKeeper y los aplica sobre la marcha.
-
-Para reducir el tráfico de red, recomendamos ejecutar `clickhouse-copier` en el mismo servidor donde se encuentran los datos de origen.
-
-## Ejecución de Clickhouse-copiadora {#running-clickhouse-copier}
-
-La utilidad debe ejecutarse manualmente:
-
-``` bash
-$ clickhouse-copier copier --daemon --config zookeeper.xml --task-path /task/path --base-dir /path/to/dir
-```
-
-Parámetros:
-
--   `daemon` — Starts `clickhouse-copier` en modo daemon.
--   `config` — The path to the `zookeeper.xml` con los parámetros para la conexión a ZooKeeper.
--   `task-path` — The path to the ZooKeeper node. This node is used for syncing `clickhouse-copier` procesos y tareas de almacenamiento. Las tareas se almacenan en `$task-path/description`.
--   `task-file` — Optional path to file with task configuration for initial upload to ZooKeeper.
--   `task-upload-force` — Force upload `task-file` incluso si el nodo ya existe.
--   `base-dir` — The path to logs and auxiliary files. When it starts, `clickhouse-copier` crear `clickhouse-copier_YYYYMMHHSS_<PID>` subdirectorios en `$base-dir`. Si se omite este parámetro, los directorios se crean en el directorio donde `clickhouse-copier` se puso en marcha.
-
-## Formato de Zookeeper.XML {#format-of-zookeeper-xml}
-
-``` xml
-<yandex>
-    <logger>
-        <level>trace</level>
-        <size>100M</size>
-        <count>3</count>
-    </logger>
-
-    <zookeeper>
-        <node index="1">
-            <host>127.0.0.1</host>
-            <port>2181</port>
-        </node>
-    </zookeeper>
-</yandex>
-```
-
-## Configuración de tareas de copia {#configuration-of-copying-tasks}
-
-``` xml
-<yandex>
-    <!-- Configuration of clusters as in an ordinary server config -->
-    <remote_servers>
-        <source_cluster>
-            <shard>
-                <internal_replication>false</internal_replication>
-                    <replica>
-                        <host>127.0.0.1</host>
-                        <port>9000</port>
-                    </replica>
-            </shard>
-            ...
-        </source_cluster>
-
-        <destination_cluster>
-        ...
-        </destination_cluster>
-    </remote_servers>
-
-    <!-- How many simultaneously active workers are possible. If you run more workers superfluous workers will sleep. -->
-    <max_workers>2</max_workers>
-
-    <!-- Setting used to fetch (pull) data from source cluster tables -->
-    <settings_pull>
-        <readonly>1</readonly>
-    </settings_pull>
-
-    <!-- Setting used to insert (push) data to destination cluster tables -->
-    <settings_push>
-        <readonly>0</readonly>
-    </settings_push>
-
-    <!-- Common setting for fetch (pull) and insert (push) operations. Also, copier process context uses it.
-         They are overlaid by <settings_pull/> and <settings_push/> respectively. -->
-    <settings>
-        <connect_timeout>3</connect_timeout>
-        <!-- Sync insert is set forcibly, leave it here just in case. -->
-        <insert_distributed_sync>1</insert_distributed_sync>
-    </settings>
-
-    <!-- Copying tasks description.
-         You could specify several table task in the same task description (in the same ZooKeeper node), they will be performed
-         sequentially.
-    -->
-    <tables>
-        <!-- A table task, copies one table. -->
-        <table_hits>
-            <!-- Source cluster name (from <remote_servers/> section) and tables in it that should be copied -->
-            <cluster_pull>source_cluster</cluster_pull>
-            <database_pull>test</database_pull>
-            <table_pull>hits</table_pull>
-
-            <!-- Destination cluster name and tables in which the data should be inserted -->
-            <cluster_push>destination_cluster</cluster_push>
-            <database_push>test</database_push>
-            <table_push>hits2</table_push>
-
-            <!-- Engine of destination tables.
-                 If destination tables have not be created, workers create them using columns definition from source tables and engine
-                 definition from here.
-
-                 NOTE: If the first worker starts insert data and detects that destination partition is not empty then the partition will
-                 be dropped and refilled, take it into account if you already have some data in destination tables. You could directly
-                 specify partitions that should be copied in <enabled_partitions/>, they should be in quoted format like partition column of
-                 system.parts table.
-            -->
-            <engine>
-            ENGINE=ReplicatedMergeTree('/clickhouse/tables/{cluster}/{shard}/hits2', '{replica}')
-            PARTITION BY toMonday(date)
-            ORDER BY (CounterID, EventDate)
-            </engine>
-
-            <!-- Sharding key used to insert data to destination cluster -->
-            <sharding_key>jumpConsistentHash(intHash64(UserID), 2)</sharding_key>
-
-            <!-- Optional expression that filter data while pull them from source servers -->
-            <where_condition>CounterID != 0</where_condition>
-
-            <!-- This section specifies partitions that should be copied, other partition will be ignored.
-                 Partition names should have the same format as
-                 partition column of system.parts table (i.e. a quoted text).
-                 Since partition key of source and destination cluster could be different,
-                 these partition names specify destination partitions.
-
-                 NOTE: In spite of this section is optional (if it is not specified, all partitions will be copied),
-                 it is strictly recommended to specify them explicitly.
-                 If you already have some ready partitions on destination cluster they
-                 will be removed at the start of the copying since they will be interpeted
-                 as unfinished data from the previous copying!!!
-            -->
-            <enabled_partitions>
-                <partition>'2018-02-26'</partition>
-                <partition>'2018-03-05'</partition>
-                ...
-            </enabled_partitions>
-        </table_hits>
-
-        <!-- Next table to copy. It is not copied until previous table is copying. -->
-        </table_visits>
-        ...
-        </table_visits>
-        ...
-    </tables>
-</yandex>
-```
-
-`clickhouse-copier` seguimiento de los cambios en `/task/path/description` y los aplica sobre la marcha. Por ejemplo, si cambia el valor de `max_workers`, el número de procesos que ejecutan tareas también cambiará.
-
-[Artículo Original](https://clickhouse.tech/docs/en/operations/utils/clickhouse-copier/) <!--hide-->
diff --git a/docs/es/operations/utilities/clickhouse-local.md b/docs/es/operations/utilities/clickhouse-local.md
deleted file mode 100644
index e122f668f53..00000000000
--- a/docs/es/operations/utilities/clickhouse-local.md
+++ /dev/null
@@ -1,81 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 60
-toc_title: clickhouse-local
----
-
-# clickhouse-local {#clickhouse-local}
-
-El `clickhouse-local` El programa le permite realizar un procesamiento rápido en archivos locales, sin tener que implementar y configurar el servidor ClickHouse.
-
-Acepta datos que representan tablas y las consulta usando [Nombre de la red inalámbrica (SSID):](../../sql-reference/index.md).
-
-`clickhouse-local` utiliza el mismo núcleo que el servidor ClickHouse, por lo que es compatible con la mayoría de las características y el mismo conjunto de formatos y motores de tabla.
-
-Predeterminada `clickhouse-local` no tiene acceso a los datos en el mismo host, pero admite la carga de la configuración del servidor `--config-file` argumento.
-
-!!! warning "Advertencia"
-    No se recomienda cargar la configuración del servidor de producción en `clickhouse-local` Porque los datos pueden dañarse en caso de error humano.
-
-## Uso {#usage}
-
-Uso básico:
-
-``` bash
-$ clickhouse-local --structure "table_structure" --input-format "format_of_incoming_data" -q "query"
-```
-
-Argumento:
-
--   `-S`, `--structure` — table structure for input data.
--   `-if`, `--input-format` — input format, `TSV` predeterminada.
--   `-f`, `--file` — path to data, `stdin` predeterminada.
--   `-q` `--query` — queries to execute with `;` como delimitador.
--   `-N`, `--table` — table name where to put output data, `table` predeterminada.
--   `-of`, `--format`, `--output-format` — output format, `TSV` predeterminada.
--   `--stacktrace` — whether to dump debug output in case of exception.
--   `--verbose` — more details on query execution.
--   `-s` — disables `stderr` tala.
--   `--config-file` — path to configuration file in same format as for ClickHouse server, by default the configuration empty.
--   `--help` — arguments references for `clickhouse-local`.
-
-También hay argumentos para cada variable de configuración de ClickHouse que se usan más comúnmente en lugar de `--config-file`.
-
-## Ejemplos {#examples}
-
-``` bash
-$ echo -e "1,2\n3,4" | clickhouse-local -S "a Int64, b Int64" -if "CSV" -q "SELECT * FROM table"
-Read 2 rows, 32.00 B in 0.000 sec., 5182 rows/sec., 80.97 KiB/sec.
-1   2
-3   4
-```
-
-El ejemplo anterior es el mismo que:
-
-``` bash
-$ echo -e "1,2\n3,4" | clickhouse-local -q "CREATE TABLE table (a Int64, b Int64) ENGINE = File(CSV, stdin); SELECT a, b FROM table; DROP TABLE table"
-Read 2 rows, 32.00 B in 0.000 sec., 4987 rows/sec., 77.93 KiB/sec.
-1   2
-3   4
-```
-
-Ahora vamos a usuario de memoria de salida para cada usuario de Unix:
-
-``` bash
-$ ps aux | tail -n +2 | awk '{ printf("%s\t%s\n", $1, $4) }' | clickhouse-local -S "user String, mem Float64" -q "SELECT user, round(sum(mem), 2) as memTotal FROM table GROUP BY user ORDER BY memTotal DESC FORMAT Pretty"
-```
-
-``` text
-Read 186 rows, 4.15 KiB in 0.035 sec., 5302 rows/sec., 118.34 KiB/sec.
-┏━━━━━━━━━━┳━━━━━━━━━━┓
-┃ user     ┃ memTotal ┃
-┡━━━━━━━━━━╇━━━━━━━━━━┩
-│ bayonet  │    113.5 │
-├──────────┼──────────┤
-│ root     │      8.8 │
-├──────────┼──────────┤
-...
-```
-
-[Artículo Original](https://clickhouse.tech/docs/en/operations/utils/clickhouse-local/) <!--hide-->
diff --git a/docs/es/operations/utilities/index.md b/docs/es/operations/utilities/index.md
deleted file mode 100644
index a69397a326c..00000000000
--- a/docs/es/operations/utilities/index.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: Utilidad
-toc_priority: 56
-toc_title: "Descripci\xF3n"
----
-
-# Utilidad ClickHouse {#clickhouse-utility}
-
--   [Sistema abierto.](clickhouse-local.md#clickhouse-local) — Allows running SQL queries on data without stopping the ClickHouse server, similar to how `awk` hace esto.
--   [Método de codificación de datos:](clickhouse-copier.md) — Copies (and reshards) data from one cluster to another cluster.
--   [Sistema abierto.](clickhouse-benchmark.md) — Loads server with the custom queries and settings.
-
-[Artículo Original](https://clickhouse.tech/docs/en/operations/utils/) <!--hide-->
diff --git a/docs/es/roadmap.md b/docs/es/roadmap.md
deleted file mode 100644
index 60db1c608df..00000000000
--- a/docs/es/roadmap.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-machine_translated: true
----
-
-# Hoja De Ruta {#roadmap}
-
-## Q1 2020 {#q1-2020}
-
--   Control de acceso basado en roles
-
-## Q2 2020 {#q2-2020}
-
--   Integración con servicios de autenticación externos
--   Grupos de recursos para una distribución más precisa de la capacidad del clúster entre los usuarios
-
-{## [Artículo Original](https://clickhouse.tech/docs/es/roadmap/) ##}
diff --git a/docs/es/sql-reference/aggregate-functions/combinators.md b/docs/es/sql-reference/aggregate-functions/combinators.md
deleted file mode 100644
index c9fdcb9478f..00000000000
--- a/docs/es/sql-reference/aggregate-functions/combinators.md
+++ /dev/null
@@ -1,245 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 37
-toc_title: Combinadores
----
-
-# Combinadores de funciones agregadas {#aggregate_functions_combinators}
-
-El nombre de una función agregada puede tener un sufijo anexado. Esto cambia la forma en que funciona la función de agregado.
-
-## -Si {#agg-functions-combinator-if}
-
-The suffix -If can be appended to the name of any aggregate function. In this case, the aggregate function accepts an extra argument – a condition (Uint8 type). The aggregate function processes only the rows that trigger the condition. If the condition was not triggered even once, it returns a default value (usually zeros or empty strings).
-
-Ejemplos: `sumIf(column, cond)`, `countIf(cond)`, `avgIf(x, cond)`, `quantilesTimingIf(level1, level2)(x, cond)`, `argMinIf(arg, val, cond)` y así sucesivamente.
-
-Con las funciones de agregado condicional, puede calcular agregados para varias condiciones a la vez, sin utilizar subconsultas y `JOIN`Por ejemplo, en Yandex.Metrica, las funciones de agregado condicional se utilizan para implementar la funcionalidad de comparación de segmentos.
-
-## -Matriz {#agg-functions-combinator-array}
-
-El sufijo -Array se puede agregar a cualquier función agregada. En este caso, la función de agregado toma argumentos del ‘Array(T)’ tipo (arrays) en lugar de ‘T’ argumentos de tipo. Si la función de agregado acepta varios argumentos, deben ser matrices de igual longitud. Al procesar matrices, la función de agregado funciona como la función de agregado original en todos los elementos de la matriz.
-
-Ejemplo 1: `sumArray(arr)` - Totales de todos los elementos de todos ‘arr’ matriz. En este ejemplo, podría haber sido escrito más simplemente: `sum(arraySum(arr))`.
-
-Ejemplo 2: `uniqArray(arr)` – Counts the number of unique elements in all ‘arr’ matriz. Esto podría hacerse de una manera más fácil: `uniq(arrayJoin(arr))`, pero no siempre es posible agregar ‘arrayJoin’ a una consulta.
-
--If y -Array se pueden combinar. Obstante, ‘Array’ debe venir primero, entonces ‘If’. Ejemplos: `uniqArrayIf(arr, cond)`, `quantilesTimingArrayIf(level1, level2)(arr, cond)`. Debido a este pedido, el ‘cond’ argumento no será una matriz.
-
-## -Estado {#agg-functions-combinator-state}
-
-Si aplica este combinador, la función de agregado no devuelve el valor resultante (como el número de valores únicos para el [uniq](reference.md#agg_function-uniq) función), pero un estado intermedio de la agregación (para `uniq`, esta es la tabla hash para calcular el número de valores únicos). Este es un `AggregateFunction(...)` que puede ser utilizado para su posterior procesamiento o almacenado en una tabla para terminar de agregar más tarde.
-
-Para trabajar con estos estados, use:
-
--   [AgregaciónMergeTree](../../engines/table-engines/mergetree-family/aggregatingmergetree.md) motor de mesa.
--   [finalizeAggregation](../../sql-reference/functions/other-functions.md#function-finalizeaggregation) función.
--   [runningAccumulate](../../sql-reference/functions/other-functions.md#function-runningaccumulate) función.
--   [-Fusionar](#aggregate_functions_combinators-merge) combinador.
--   [-MergeState](#aggregate_functions_combinators-mergestate) combinador.
-
-## -Fusionar {#aggregate_functions_combinators-merge}
-
-Si aplica este combinador, la función de agregado toma el estado de agregación intermedio como argumento, combina los estados para finalizar la agregación y devuelve el valor resultante.
-
-## -MergeState {#aggregate_functions_combinators-mergestate}
-
-Combina los estados de agregación intermedios de la misma manera que el combinador -Merge. Sin embargo, no devuelve el valor resultante, sino un estado de agregación intermedio, similar al combinador -State.
-
-## -ForEach {#agg-functions-combinator-foreach}
-
-Convierte una función de agregado para tablas en una función de agregado para matrices que agrega los elementos de matriz correspondientes y devuelve una matriz de resultados. Por ejemplo, `sumForEach` para las matrices `[1, 2]`, `[3, 4, 5]`y`[6, 7]`devuelve el resultado `[10, 13, 5]` después de agregar los elementos de la matriz correspondientes.
-
-## -OPor defecto {#agg-functions-combinator-ordefault}
-
-Cambia el comportamiento de una función agregada.
-
-Si una función agregada no tiene valores de entrada, con este combinador devuelve el valor predeterminado para su tipo de datos de retorno. Se aplica a las funciones agregadas que pueden tomar datos de entrada vacíos.
-
-`-OrDefault` se puede utilizar con otros combinadores.
-
-**Sintaxis**
-
-``` sql
-<aggFunction>OrDefault(x)
-```
-
-**Parámetros**
-
--   `x` — Aggregate function parameters.
-
-**Valores devueltos**
-
-Devuelve el valor predeterminado del tipo devuelto de una función de agregado si no hay nada que agregar.
-
-El tipo depende de la función de agregado utilizada.
-
-**Ejemplo**
-
-Consulta:
-
-``` sql
-SELECT avg(number), avgOrDefault(number) FROM numbers(0)
-```
-
-Resultado:
-
-``` text
-┌─avg(number)─┬─avgOrDefault(number)─┐
-│         nan │                    0 │
-└─────────────┴──────────────────────┘
-```
-
-También `-OrDefault` se puede utilizar con otros combinadores. Es útil cuando la función de agregado no acepta la entrada vacía.
-
-Consulta:
-
-``` sql
-SELECT avgOrDefaultIf(x, x > 10)
-FROM
-(
-    SELECT toDecimal32(1.23, 2) AS x
-)
-```
-
-Resultado:
-
-``` text
-┌─avgOrDefaultIf(x, greater(x, 10))─┐
-│                              0.00 │
-└───────────────────────────────────┘
-```
-
-## -OrNull {#agg-functions-combinator-ornull}
-
-Cambia el comportamiento de una función agregada.
-
-Este combinador convierte un resultado de una función agregada en [NULL](../data-types/nullable.md) tipo de datos. Si la función de agregado no tiene valores para calcular devuelve [NULL](../syntax.md#null-literal).
-
-`-OrNull` se puede utilizar con otros combinadores.
-
-**Sintaxis**
-
-``` sql
-<aggFunction>OrNull(x)
-```
-
-**Parámetros**
-
--   `x` — Aggregate function parameters.
-
-**Valores devueltos**
-
--   El resultado de la función de agregado, convertida a la `Nullable` tipo de datos.
--   `NULL`, si no hay nada que agregar.
-
-Tipo: `Nullable(aggregate function return type)`.
-
-**Ejemplo**
-
-Añadir `-orNull` hasta el final de la función agregada.
-
-Consulta:
-
-``` sql
-SELECT sumOrNull(number), toTypeName(sumOrNull(number)) FROM numbers(10) WHERE number > 10
-```
-
-Resultado:
-
-``` text
-┌─sumOrNull(number)─┬─toTypeName(sumOrNull(number))─┐
-│              ᴺᵁᴸᴸ │ Nullable(UInt64)              │
-└───────────────────┴───────────────────────────────┘
-```
-
-También `-OrNull` se puede utilizar con otros combinadores. Es útil cuando la función de agregado no acepta la entrada vacía.
-
-Consulta:
-
-``` sql
-SELECT avgOrNullIf(x, x > 10)
-FROM
-(
-    SELECT toDecimal32(1.23, 2) AS x
-)
-```
-
-Resultado:
-
-``` text
-┌─avgOrNullIf(x, greater(x, 10))─┐
-│                           ᴺᵁᴸᴸ │
-└────────────────────────────────┘
-```
-
-## -Remuestrear {#agg-functions-combinator-resample}
-
-Permite dividir los datos en grupos y, a continuación, agregar por separado los datos de esos grupos. Los grupos se crean dividiendo los valores de una columna en intervalos.
-
-``` sql
-<aggFunction>Resample(start, end, step)(<aggFunction_params>, resampling_key)
-```
-
-**Parámetros**
-
--   `start` — Starting value of the whole required interval for `resampling_key` valor.
--   `stop` — Ending value of the whole required interval for `resampling_key` valor. Todo el intervalo no incluye el `stop` valor `[start, stop)`.
--   `step` — Step for separating the whole interval into subintervals. The `aggFunction` se ejecuta sobre cada uno de esos subintervalos de forma independiente.
--   `resampling_key` — Column whose values are used for separating data into intervals.
--   `aggFunction_params` — `aggFunction` parámetros.
-
-**Valores devueltos**
-
--   Matriz de `aggFunction` resultados para cada subintervalo.
-
-**Ejemplo**
-
-Considere el `people` con los siguientes datos:
-
-``` text
-┌─name───┬─age─┬─wage─┐
-│ John   │  16 │   10 │
-│ Alice  │  30 │   15 │
-│ Mary   │  35 │    8 │
-│ Evelyn │  48 │ 11.5 │
-│ David  │  62 │  9.9 │
-│ Brian  │  60 │   16 │
-└────────┴─────┴──────┘
-```
-
-Obtengamos los nombres de las personas cuya edad se encuentra en los intervalos de `[30,60)` y `[60,75)`. Como usamos la representación entera para la edad, obtenemos edades en el `[30, 59]` y `[60,74]` intervalo.
-
-Para agregar nombres en una matriz, usamos el [Método de codificación de datos:](reference.md#agg_function-grouparray) función de agregado. Se necesita un argumento. En nuestro caso, es el `name` columna. El `groupArrayResample` función debe utilizar el `age` columna para agregar nombres por edad. Para definir los intervalos requeridos, pasamos el `30, 75, 30` discusiones sobre el `groupArrayResample` función.
-
-``` sql
-SELECT groupArrayResample(30, 75, 30)(name, age) FROM people
-```
-
-``` text
-┌─groupArrayResample(30, 75, 30)(name, age)─────┐
-│ [['Alice','Mary','Evelyn'],['David','Brian']] │
-└───────────────────────────────────────────────┘
-```
-
-Considera los resultados.
-
-`Jonh` est? fuera de la muestra porque es demasiado joven. Otras personas se distribuyen de acuerdo con los intervalos de edad especificados.
-
-Ahora vamos a contar el número total de personas y su salario promedio en los intervalos de edad especificados.
-
-``` sql
-SELECT
-    countResample(30, 75, 30)(name, age) AS amount,
-    avgResample(30, 75, 30)(wage, age) AS avg_wage
-FROM people
-```
-
-``` text
-┌─amount─┬─avg_wage──────────────────┐
-│ [3,2]  │ [11.5,12.949999809265137] │
-└────────┴───────────────────────────┘
-```
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/agg_functions/combinators/) <!--hide-->
diff --git a/docs/es/sql-reference/aggregate-functions/index.md b/docs/es/sql-reference/aggregate-functions/index.md
deleted file mode 100644
index 7c7d58d5f94..00000000000
--- a/docs/es/sql-reference/aggregate-functions/index.md
+++ /dev/null
@@ -1,62 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: Funciones agregadas
-toc_priority: 33
-toc_title: "Implantaci\xF3n"
----
-
-# Funciones agregadas {#aggregate-functions}
-
-Las funciones agregadas funcionan en el [normal](http://www.sql-tutorial.com/sql-aggregate-functions-sql-tutorial) forma esperada por los expertos en bases de datos.
-
-ClickHouse también es compatible:
-
--   [Funciones agregadas paramétricas](parametric-functions.md#aggregate_functions_parametric) que aceptan otros parámetros además de las columnas.
--   [Combinadores](combinators.md#aggregate_functions_combinators), que cambian el comportamiento de las funciones agregadas.
-
-## Procesamiento NULL {#null-processing}
-
-Durante la agregación, todos `NULL`s se omiten.
-
-**Ejemplos:**
-
-Considere esta tabla:
-
-``` text
-┌─x─┬────y─┐
-│ 1 │    2 │
-│ 2 │ ᴺᵁᴸᴸ │
-│ 3 │    2 │
-│ 3 │    3 │
-│ 3 │ ᴺᵁᴸᴸ │
-└───┴──────┘
-```
-
-Digamos que necesita sumar los valores en el `y` columna:
-
-``` sql
-SELECT sum(y) FROM t_null_big
-```
-
-    ┌─sum(y)─┐
-    │      7 │
-    └────────┘
-
-El `sum` función interpreta `NULL` como `0`. En particular, esto significa que si la función recibe la entrada de una selección donde todos los valores son `NULL`, entonces el resultado será `0`, ni `NULL`.
-
-Ahora puedes usar el `groupArray` función para crear una matriz a partir de la `y` columna:
-
-``` sql
-SELECT groupArray(y) FROM t_null_big
-```
-
-``` text
-┌─groupArray(y)─┐
-│ [2,2,3]       │
-└───────────────┘
-```
-
-`groupArray` no incluye `NULL` en la matriz resultante.
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/agg_functions/) <!--hide-->
diff --git a/docs/es/sql-reference/aggregate-functions/parametric-functions.md b/docs/es/sql-reference/aggregate-functions/parametric-functions.md
deleted file mode 100644
index ea32920401b..00000000000
--- a/docs/es/sql-reference/aggregate-functions/parametric-functions.md
+++ /dev/null
@@ -1,499 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 38
-toc_title: "Param\xE9trico"
----
-
-# Funciones agregadas paramétricas {#aggregate_functions_parametric}
-
-Some aggregate functions can accept not only argument columns (used for compression), but a set of parameters – constants for initialization. The syntax is two pairs of brackets instead of one. The first is for parameters, and the second is for arguments.
-
-## histograma {#histogram}
-
-Calcula un histograma adaptativo. No garantiza resultados precisos.
-
-``` sql
-histogram(number_of_bins)(values)
-```
-
-Las funciones utiliza [Un algoritmo de árbol de decisión paralelo de transmisión](http://jmlr.org/papers/volume11/ben-haim10a/ben-haim10a.pdf). Los bordes de los contenedores de histograma se ajustan a medida que los nuevos datos entran en una función. En caso común, los anchos de los contenedores no son iguales.
-
-**Parámetros**
-
-`number_of_bins` — Upper limit for the number of bins in the histogram. The function automatically calculates the number of bins. It tries to reach the specified number of bins, but if it fails, it uses fewer bins.
-`values` — [Expresion](../syntax.md#syntax-expressions) resultando en valores de entrada.
-
-**Valores devueltos**
-
--   [Matriz](../../sql-reference/data-types/array.md) de [Tuples](../../sql-reference/data-types/tuple.md) del siguiente formato:
-
-        ```
-        [(lower_1, upper_1, height_1), ... (lower_N, upper_N, height_N)]
-        ```
-
-        - `lower` — Lower bound of the bin.
-        - `upper` — Upper bound of the bin.
-        - `height` — Calculated height of the bin.
-
-**Ejemplo**
-
-``` sql
-SELECT histogram(5)(number + 1)
-FROM (
-    SELECT *
-    FROM system.numbers
-    LIMIT 20
-)
-```
-
-``` text
-┌─histogram(5)(plus(number, 1))───────────────────────────────────────────┐
-│ [(1,4.5,4),(4.5,8.5,4),(8.5,12.75,4.125),(12.75,17,4.625),(17,20,3.25)] │
-└─────────────────────────────────────────────────────────────────────────┘
-```
-
-Puede visualizar un histograma con el [Bar](../../sql-reference/functions/other-functions.md#function-bar) función, por ejemplo:
-
-``` sql
-WITH histogram(5)(rand() % 100) AS hist
-SELECT
-    arrayJoin(hist).3 AS height,
-    bar(height, 0, 6, 5) AS bar
-FROM
-(
-    SELECT *
-    FROM system.numbers
-    LIMIT 20
-)
-```
-
-``` text
-┌─height─┬─bar───┐
-│  2.125 │ █▋    │
-│   3.25 │ ██▌   │
-│  5.625 │ ████▏ │
-│  5.625 │ ████▏ │
-│  3.375 │ ██▌   │
-└────────┴───────┘
-```
-
-En este caso, debe recordar que no conoce los bordes del contenedor del histograma.
-
-## sequenceMatch(pattern)(timestamp, cond1, cond2, …) {#function-sequencematch}
-
-Comprueba si la secuencia contiene una cadena de eventos que coincida con el patrón.
-
-``` sql
-sequenceMatch(pattern)(timestamp, cond1, cond2, ...)
-```
-
-!!! warning "Advertencia"
-    Los eventos que ocurren en el mismo segundo pueden estar en la secuencia en un orden indefinido que afecta el resultado.
-
-**Parámetros**
-
--   `pattern` — Pattern string. See [Sintaxis de patrón](#sequence-function-pattern-syntax).
-
--   `timestamp` — Column considered to contain time data. Typical data types are `Date` y `DateTime`. También puede utilizar cualquiera de los [UInt](../../sql-reference/data-types/int-uint.md) tipos de datos.
-
--   `cond1`, `cond2` — Conditions that describe the chain of events. Data type: `UInt8`. Puede pasar hasta 32 argumentos de condición. La función sólo tiene en cuenta los eventos descritos en estas condiciones. Si la secuencia contiene datos que no se describen en una condición, la función los omite.
-
-**Valores devueltos**
-
--   1, si el patrón coincide.
--   0, si el patrón no coincide.
-
-Tipo: `UInt8`.
-
-<a name="sequence-function-pattern-syntax"></a>
-**Sintaxis de patrón**
-
--   `(?N)` — Matches the condition argument at position `N`. Las condiciones están numeradas en el `[1, 32]` gama. Por ejemplo, `(?1)` coincide con el argumento pasado al `cond1` parámetro.
-
--   `.*` — Matches any number of events. You don't need conditional arguments to match this element of the pattern.
-
--   `(?t operator value)` — Sets the time in seconds that should separate two events. For example, pattern `(?1)(?t>1800)(?2)` coincide con los eventos que ocurren a más de 1800 segundos el uno del otro. Un número arbitrario de cualquier evento puede estar entre estos eventos. Puede usar el `>=`, `>`, `<`, `<=` operador.
-
-**Ejemplos**
-
-Considere los datos en el `t` tabla:
-
-``` text
-┌─time─┬─number─┐
-│    1 │      1 │
-│    2 │      3 │
-│    3 │      2 │
-└──────┴────────┘
-```
-
-Realizar la consulta:
-
-``` sql
-SELECT sequenceMatch('(?1)(?2)')(time, number = 1, number = 2) FROM t
-```
-
-``` text
-┌─sequenceMatch('(?1)(?2)')(time, equals(number, 1), equals(number, 2))─┐
-│                                                                     1 │
-└───────────────────────────────────────────────────────────────────────┘
-```
-
-La función encontró la cadena de eventos donde el número 2 sigue al número 1. Se saltó el número 3 entre ellos, porque el número no se describe como un evento. Si queremos tener en cuenta este número al buscar la cadena de eventos dada en el ejemplo, debemos establecer una condición para ello.
-
-``` sql
-SELECT sequenceMatch('(?1)(?2)')(time, number = 1, number = 2, number = 3) FROM t
-```
-
-``` text
-┌─sequenceMatch('(?1)(?2)')(time, equals(number, 1), equals(number, 2), equals(number, 3))─┐
-│                                                                                        0 │
-└──────────────────────────────────────────────────────────────────────────────────────────┘
-```
-
-En este caso, la función no pudo encontrar la cadena de eventos que coincida con el patrón, porque el evento para el número 3 ocurrió entre 1 y 2. Si en el mismo caso comprobamos la condición para el número 4, la secuencia coincidiría con el patrón.
-
-``` sql
-SELECT sequenceMatch('(?1)(?2)')(time, number = 1, number = 2, number = 4) FROM t
-```
-
-``` text
-┌─sequenceMatch('(?1)(?2)')(time, equals(number, 1), equals(number, 2), equals(number, 4))─┐
-│                                                                                        1 │
-└──────────────────────────────────────────────────────────────────────────────────────────┘
-```
-
-**Ver también**
-
--   [sequenceCount](#function-sequencecount)
-
-## sequenceCount(pattern)(time, cond1, cond2, …) {#function-sequencecount}
-
-Cuenta el número de cadenas de eventos que coinciden con el patrón. La función busca cadenas de eventos que no se superponen. Comienza a buscar la siguiente cadena después de que se haga coincidir la cadena actual.
-
-!!! warning "Advertencia"
-    Los eventos que ocurren en el mismo segundo pueden estar en la secuencia en un orden indefinido que afecta el resultado.
-
-``` sql
-sequenceCount(pattern)(timestamp, cond1, cond2, ...)
-```
-
-**Parámetros**
-
--   `pattern` — Pattern string. See [Sintaxis de patrón](#sequence-function-pattern-syntax).
-
--   `timestamp` — Column considered to contain time data. Typical data types are `Date` y `DateTime`. También puede utilizar cualquiera de los [UInt](../../sql-reference/data-types/int-uint.md) tipos de datos.
-
--   `cond1`, `cond2` — Conditions that describe the chain of events. Data type: `UInt8`. Puede pasar hasta 32 argumentos de condición. La función sólo tiene en cuenta los eventos descritos en estas condiciones. Si la secuencia contiene datos que no se describen en una condición, la función los omite.
-
-**Valores devueltos**
-
--   Número de cadenas de eventos no superpuestas que coinciden.
-
-Tipo: `UInt64`.
-
-**Ejemplo**
-
-Considere los datos en el `t` tabla:
-
-``` text
-┌─time─┬─number─┐
-│    1 │      1 │
-│    2 │      3 │
-│    3 │      2 │
-│    4 │      1 │
-│    5 │      3 │
-│    6 │      2 │
-└──────┴────────┘
-```
-
-Cuente cuántas veces ocurre el número 2 después del número 1 con cualquier cantidad de otros números entre ellos:
-
-``` sql
-SELECT sequenceCount('(?1).*(?2)')(time, number = 1, number = 2) FROM t
-```
-
-``` text
-┌─sequenceCount('(?1).*(?2)')(time, equals(number, 1), equals(number, 2))─┐
-│                                                                       2 │
-└─────────────────────────────────────────────────────────────────────────┘
-```
-
-**Ver también**
-
--   [sequenceMatch](#function-sequencematch)
-
-## ventanaEmbudo {#windowfunnel}
-
-Busca cadenas de eventos en una ventana de tiempo deslizante y calcula el número máximo de eventos que ocurrieron desde la cadena.
-
-La función funciona de acuerdo con el algoritmo:
-
--   La función busca datos que desencadenan la primera condición en la cadena y establece el contador de eventos en 1. Este es el momento en que comienza la ventana deslizante.
-
--   Si los eventos de la cadena ocurren secuencialmente dentro de la ventana, el contador se incrementa. Si se interrumpe la secuencia de eventos, el contador no se incrementa.
-
--   Si los datos tienen varias cadenas de eventos en diferentes puntos de finalización, la función solo generará el tamaño de la cadena más larga.
-
-**Sintaxis**
-
-``` sql
-windowFunnel(window, [mode])(timestamp, cond1, cond2, ..., condN)
-```
-
-**Parámetros**
-
--   `window` — Length of the sliding window in seconds.
--   `mode` - Es un argumento opcional.
-    -   `'strict'` - Cuando el `'strict'` se establece, windowFunnel() aplica condiciones solo para los valores únicos.
--   `timestamp` — Name of the column containing the timestamp. Data types supported: [Fecha](../../sql-reference/data-types/date.md), [FechaHora](../../sql-reference/data-types/datetime.md#data_type-datetime) y otros tipos de enteros sin signo (tenga en cuenta que aunque timestamp admite el `UInt64` tipo, su valor no puede exceder el máximo de Int64, que es 2 ^ 63 - 1).
--   `cond` — Conditions or data describing the chain of events. [UInt8](../../sql-reference/data-types/int-uint.md).
-
-**Valor devuelto**
-
-El número máximo de condiciones desencadenadas consecutivas de la cadena dentro de la ventana de tiempo deslizante.
-Se analizan todas las cadenas en la selección.
-
-Tipo: `Integer`.
-
-**Ejemplo**
-
-Determine si un período de tiempo establecido es suficiente para que el usuario seleccione un teléfono y lo compre dos veces en la tienda en línea.
-
-Establezca la siguiente cadena de eventos:
-
-1.  El usuario inició sesión en su cuenta en la tienda (`eventID = 1003`).
-2.  El usuario busca un teléfono (`eventID = 1007, product = 'phone'`).
-3.  El usuario realizó un pedido (`eventID = 1009`).
-4.  El usuario volvió a realizar el pedido (`eventID = 1010`).
-
-Tabla de entrada:
-
-``` text
-┌─event_date─┬─user_id─┬───────────timestamp─┬─eventID─┬─product─┐
-│ 2019-01-28 │       1 │ 2019-01-29 10:00:00 │    1003 │ phone   │
-└────────────┴─────────┴─────────────────────┴─────────┴─────────┘
-┌─event_date─┬─user_id─┬───────────timestamp─┬─eventID─┬─product─┐
-│ 2019-01-31 │       1 │ 2019-01-31 09:00:00 │    1007 │ phone   │
-└────────────┴─────────┴─────────────────────┴─────────┴─────────┘
-┌─event_date─┬─user_id─┬───────────timestamp─┬─eventID─┬─product─┐
-│ 2019-01-30 │       1 │ 2019-01-30 08:00:00 │    1009 │ phone   │
-└────────────┴─────────┴─────────────────────┴─────────┴─────────┘
-┌─event_date─┬─user_id─┬───────────timestamp─┬─eventID─┬─product─┐
-│ 2019-02-01 │       1 │ 2019-02-01 08:00:00 │    1010 │ phone   │
-└────────────┴─────────┴─────────────────────┴─────────┴─────────┘
-```
-
-Averigüe hasta qué punto el usuario `user_id` podría atravesar la cadena en un período de enero a febrero de 2019.
-
-Consulta:
-
-``` sql
-SELECT
-    level,
-    count() AS c
-FROM
-(
-    SELECT
-        user_id,
-        windowFunnel(6048000000000000)(timestamp, eventID = 1003, eventID = 1009, eventID = 1007, eventID = 1010) AS level
-    FROM trend
-    WHERE (event_date >= '2019-01-01') AND (event_date <= '2019-02-02')
-    GROUP BY user_id
-)
-GROUP BY level
-ORDER BY level ASC
-```
-
-Resultado:
-
-``` text
-┌─level─┬─c─┐
-│     4 │ 1 │
-└───────┴───┘
-```
-
-## retención {#retention}
-
-La función toma como argumentos un conjunto de condiciones de 1 a 32 argumentos de tipo `UInt8` que indican si se cumplió una determinada condición para el evento.
-Cualquier condición se puede especificar como un argumento (como en [WHERE](../../sql-reference/statements/select/where.md#select-where)).
-
-Las condiciones, excepto la primera, se aplican en pares: el resultado del segundo será verdadero si el primero y el segundo son verdaderos, del tercero si el primero y el fird son verdaderos, etc.
-
-**Sintaxis**
-
-``` sql
-retention(cond1, cond2, ..., cond32);
-```
-
-**Parámetros**
-
--   `cond` — an expression that returns a `UInt8` resultado (1 o 0).
-
-**Valor devuelto**
-
-La matriz de 1 o 0.
-
--   1 — condition was met for the event.
--   0 — condition wasn't met for the event.
-
-Tipo: `UInt8`.
-
-**Ejemplo**
-
-Consideremos un ejemplo de cálculo del `retention` función para determinar el tráfico del sitio.
-
-**1.** Сreate a table to illustrate an example.
-
-``` sql
-CREATE TABLE retention_test(date Date, uid Int32) ENGINE = Memory;
-
-INSERT INTO retention_test SELECT '2020-01-01', number FROM numbers(5);
-INSERT INTO retention_test SELECT '2020-01-02', number FROM numbers(10);
-INSERT INTO retention_test SELECT '2020-01-03', number FROM numbers(15);
-```
-
-Tabla de entrada:
-
-Consulta:
-
-``` sql
-SELECT * FROM retention_test
-```
-
-Resultado:
-
-``` text
-┌───────date─┬─uid─┐
-│ 2020-01-01 │   0 │
-│ 2020-01-01 │   1 │
-│ 2020-01-01 │   2 │
-│ 2020-01-01 │   3 │
-│ 2020-01-01 │   4 │
-└────────────┴─────┘
-┌───────date─┬─uid─┐
-│ 2020-01-02 │   0 │
-│ 2020-01-02 │   1 │
-│ 2020-01-02 │   2 │
-│ 2020-01-02 │   3 │
-│ 2020-01-02 │   4 │
-│ 2020-01-02 │   5 │
-│ 2020-01-02 │   6 │
-│ 2020-01-02 │   7 │
-│ 2020-01-02 │   8 │
-│ 2020-01-02 │   9 │
-└────────────┴─────┘
-┌───────date─┬─uid─┐
-│ 2020-01-03 │   0 │
-│ 2020-01-03 │   1 │
-│ 2020-01-03 │   2 │
-│ 2020-01-03 │   3 │
-│ 2020-01-03 │   4 │
-│ 2020-01-03 │   5 │
-│ 2020-01-03 │   6 │
-│ 2020-01-03 │   7 │
-│ 2020-01-03 │   8 │
-│ 2020-01-03 │   9 │
-│ 2020-01-03 │  10 │
-│ 2020-01-03 │  11 │
-│ 2020-01-03 │  12 │
-│ 2020-01-03 │  13 │
-│ 2020-01-03 │  14 │
-└────────────┴─────┘
-```
-
-**2.** Agrupar usuarios por ID único `uid` utilizando el `retention` función.
-
-Consulta:
-
-``` sql
-SELECT
-    uid,
-    retention(date = '2020-01-01', date = '2020-01-02', date = '2020-01-03') AS r
-FROM retention_test
-WHERE date IN ('2020-01-01', '2020-01-02', '2020-01-03')
-GROUP BY uid
-ORDER BY uid ASC
-```
-
-Resultado:
-
-``` text
-┌─uid─┬─r───────┐
-│   0 │ [1,1,1] │
-│   1 │ [1,1,1] │
-│   2 │ [1,1,1] │
-│   3 │ [1,1,1] │
-│   4 │ [1,1,1] │
-│   5 │ [0,0,0] │
-│   6 │ [0,0,0] │
-│   7 │ [0,0,0] │
-│   8 │ [0,0,0] │
-│   9 │ [0,0,0] │
-│  10 │ [0,0,0] │
-│  11 │ [0,0,0] │
-│  12 │ [0,0,0] │
-│  13 │ [0,0,0] │
-│  14 │ [0,0,0] │
-└─────┴─────────┘
-```
-
-**3.** Calcule el número total de visitas al sitio por día.
-
-Consulta:
-
-``` sql
-SELECT
-    sum(r[1]) AS r1,
-    sum(r[2]) AS r2,
-    sum(r[3]) AS r3
-FROM
-(
-    SELECT
-        uid,
-        retention(date = '2020-01-01', date = '2020-01-02', date = '2020-01-03') AS r
-    FROM retention_test
-    WHERE date IN ('2020-01-01', '2020-01-02', '2020-01-03')
-    GROUP BY uid
-)
-```
-
-Resultado:
-
-``` text
-┌─r1─┬─r2─┬─r3─┐
-│  5 │  5 │  5 │
-└────┴────┴────┘
-```
-
-Donde:
-
--   `r1`- el número de visitantes únicos que visitaron el sitio durante 2020-01-01 (la `cond1` condición).
--   `r2`- el número de visitantes únicos que visitaron el sitio durante un período de tiempo específico entre 2020-01-01 y 2020-01-02 (`cond1` y `cond2` condición).
--   `r3`- el número de visitantes únicos que visitaron el sitio durante un período de tiempo específico entre 2020-01-01 y 2020-01-03 (`cond1` y `cond3` condición).
-
-## UniqUpTo(N)(x) {#uniquptonx}
-
-Calculates the number of different argument values ​​if it is less than or equal to N. If the number of different argument values is greater than N, it returns N + 1.
-
-Recomendado para usar con Ns pequeños, hasta 10. El valor máximo de N es 100.
-
-Para el estado de una función agregada, utiliza la cantidad de memoria igual a 1 + N \* el tamaño de un valor de bytes.
-Para las cadenas, almacena un hash no criptográfico de 8 bytes. Es decir, el cálculo se aproxima a las cadenas.
-
-La función también funciona para varios argumentos.
-
-Funciona lo más rápido posible, excepto en los casos en que se usa un valor N grande y el número de valores únicos es ligeramente menor que N.
-
-Ejemplo de uso:
-
-``` text
-Problem: Generate a report that shows only keywords that produced at least 5 unique users.
-Solution: Write in the GROUP BY query SearchPhrase HAVING uniqUpTo(4)(UserID) >= 5
-```
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/agg_functions/parametric_functions/) <!--hide-->
-
-## sumMapFiltered(keys_to_keep)(claves, valores) {#summapfilteredkeys-to-keepkeys-values}
-
-El mismo comportamiento que [sumMap](reference.md#agg_functions-summap) excepto que una matriz de claves se pasa como un parámetro. Esto puede ser especialmente útil cuando se trabaja con una alta cardinalidad de claves.
diff --git a/docs/es/sql-reference/aggregate-functions/reference.md b/docs/es/sql-reference/aggregate-functions/reference.md
deleted file mode 100644
index 572c4d01051..00000000000
--- a/docs/es/sql-reference/aggregate-functions/reference.md
+++ /dev/null
@@ -1,1914 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 36
-toc_title: Referencia
----
-
-# Referencia de función agregada {#aggregate-functions-reference}
-
-## contar {#agg_function-count}
-
-Cuenta el número de filas o valores no NULL.
-
-ClickHouse admite las siguientes sintaxis para `count`:
-- `count(expr)` o `COUNT(DISTINCT expr)`.
-- `count()` o `COUNT(*)`. El `count()` la sintaxis es específica de ClickHouse.
-
-**Parámetros**
-
-La función puede tomar:
-
--   Cero parámetros.
--   Una [expresion](../syntax.md#syntax-expressions).
-
-**Valor devuelto**
-
--   Si se llama a la función sin parámetros, cuenta el número de filas.
--   Si el [expresion](../syntax.md#syntax-expressions) se pasa, entonces la función cuenta cuántas veces esta expresión devuelve no nula. Si la expresión devuelve un [NULL](../../sql-reference/data-types/nullable.md)-type valor, entonces el resultado de `count` no se queda `Nullable`. La función devuelve 0 si la expresión devuelta `NULL` para todas las filas.
-
-En ambos casos el tipo del valor devuelto es [UInt64](../../sql-reference/data-types/int-uint.md).
-
-**Detalles**
-
-ClickHouse soporta el `COUNT(DISTINCT ...)` sintaxis. El comportamiento de esta construcción depende del [count_distinct_implementation](../../operations/settings/settings.md#settings-count_distinct_implementation) configuración. Define cuál de las [uniq\*](#agg_function-uniq) se utiliza para realizar la operación. El valor predeterminado es el [uniqExact](#agg_function-uniqexact) función.
-
-El `SELECT count() FROM table` consulta no está optimizado, porque el número de entradas en la tabla no se almacena por separado. Elige una pequeña columna de la tabla y cuenta el número de valores en ella.
-
-**Ejemplos**
-
-Ejemplo 1:
-
-``` sql
-SELECT count() FROM t
-```
-
-``` text
-┌─count()─┐
-│       5 │
-└─────────┘
-```
-
-Ejemplo 2:
-
-``` sql
-SELECT name, value FROM system.settings WHERE name = 'count_distinct_implementation'
-```
-
-``` text
-┌─name──────────────────────────┬─value─────┐
-│ count_distinct_implementation │ uniqExact │
-└───────────────────────────────┴───────────┘
-```
-
-``` sql
-SELECT count(DISTINCT num) FROM t
-```
-
-``` text
-┌─uniqExact(num)─┐
-│              3 │
-└────────────────┘
-```
-
-Este ejemplo muestra que `count(DISTINCT num)` se realiza por el `uniqExact` función según el `count_distinct_implementation` valor de ajuste.
-
-## cualquiera (x) {#agg_function-any}
-
-Selecciona el primer valor encontrado.
-La consulta se puede ejecutar en cualquier orden e incluso en un orden diferente cada vez, por lo que el resultado de esta función es indeterminado.
-Para obtener un resultado determinado, puede usar el ‘min’ o ‘max’ función en lugar de ‘any’.
-
-En algunos casos, puede confiar en el orden de ejecución. Esto se aplica a los casos en que SELECT proviene de una subconsulta que usa ORDER BY.
-
-Cuando un `SELECT` consulta tiene el `GROUP BY` cláusula o al menos una función agregada, ClickHouse (en contraste con MySQL) requiere que todas las expresiones `SELECT`, `HAVING`, y `ORDER BY` las cláusulas pueden calcularse a partir de claves o de funciones agregadas. En otras palabras, cada columna seleccionada de la tabla debe usarse en claves o dentro de funciones agregadas. Para obtener un comportamiento como en MySQL, puede colocar las otras columnas en el `any` función de agregado.
-
-## Cualquier pesado (x) {#anyheavyx}
-
-Selecciona un valor que ocurre con frecuencia [pesos pesados](http://www.cs.umd.edu/~samir/498/karp.pdf) algoritmo. Si hay un valor que se produce más de la mitad de los casos en cada uno de los subprocesos de ejecución de la consulta, se devuelve este valor. Normalmente, el resultado es no determinista.
-
-``` sql
-anyHeavy(column)
-```
-
-**Argumento**
-
--   `column` – The column name.
-
-**Ejemplo**
-
-Tome el [A tiempo](../../getting-started/example-datasets/ontime.md) conjunto de datos y seleccione cualquier valor que ocurra con frecuencia `AirlineID` columna.
-
-``` sql
-SELECT anyHeavy(AirlineID) AS res
-FROM ontime
-```
-
-``` text
-┌───res─┐
-│ 19690 │
-└───────┘
-```
-
-## Cualquier último (x) {#anylastx}
-
-Selecciona el último valor encontrado.
-El resultado es tan indeterminado como para el `any` función.
-
-## Método de codificación de datos: {#groupbitand}
-
-Se aplica bit a bit `AND` para la serie de números.
-
-``` sql
-groupBitAnd(expr)
-```
-
-**Parámetros**
-
-`expr` – An expression that results in `UInt*` tipo.
-
-**Valor de retorno**
-
-Valor de la `UInt*` tipo.
-
-**Ejemplo**
-
-Datos de prueba:
-
-``` text
-binary     decimal
-00101100 = 44
-00011100 = 28
-00001101 = 13
-01010101 = 85
-```
-
-Consulta:
-
-``` sql
-SELECT groupBitAnd(num) FROM t
-```
-
-Donde `num` es la columna con los datos de prueba.
-
-Resultado:
-
-``` text
-binary     decimal
-00000100 = 4
-```
-
-## GrupoBitO {#groupbitor}
-
-Se aplica bit a bit `OR` para la serie de números.
-
-``` sql
-groupBitOr(expr)
-```
-
-**Parámetros**
-
-`expr` – An expression that results in `UInt*` tipo.
-
-**Valor de retorno**
-
-Valor de la `UInt*` tipo.
-
-**Ejemplo**
-
-Datos de prueba:
-
-``` text
-binary     decimal
-00101100 = 44
-00011100 = 28
-00001101 = 13
-01010101 = 85
-```
-
-Consulta:
-
-``` sql
-SELECT groupBitOr(num) FROM t
-```
-
-Donde `num` es la columna con los datos de prueba.
-
-Resultado:
-
-``` text
-binary     decimal
-01111101 = 125
-```
-
-## GrupoBitXor {#groupbitxor}
-
-Se aplica bit a bit `XOR` para la serie de números.
-
-``` sql
-groupBitXor(expr)
-```
-
-**Parámetros**
-
-`expr` – An expression that results in `UInt*` tipo.
-
-**Valor de retorno**
-
-Valor de la `UInt*` tipo.
-
-**Ejemplo**
-
-Datos de prueba:
-
-``` text
-binary     decimal
-00101100 = 44
-00011100 = 28
-00001101 = 13
-01010101 = 85
-```
-
-Consulta:
-
-``` sql
-SELECT groupBitXor(num) FROM t
-```
-
-Donde `num` es la columna con los datos de prueba.
-
-Resultado:
-
-``` text
-binary     decimal
-01101000 = 104
-```
-
-## Método de codificación de datos: {#groupbitmap}
-
-Mapa de bits o cálculos agregados de una columna entera sin signo, devuelve cardinalidad de tipo UInt64, si agrega el sufijo -State, luego devuelve [objeto de mapa de bits](../../sql-reference/functions/bitmap-functions.md).
-
-``` sql
-groupBitmap(expr)
-```
-
-**Parámetros**
-
-`expr` – An expression that results in `UInt*` tipo.
-
-**Valor de retorno**
-
-Valor de la `UInt64` tipo.
-
-**Ejemplo**
-
-Datos de prueba:
-
-``` text
-UserID
-1
-1
-2
-3
-```
-
-Consulta:
-
-``` sql
-SELECT groupBitmap(UserID) as num FROM t
-```
-
-Resultado:
-
-``` text
-num
-3
-```
-
-## Mínimo (x) {#agg_function-min}
-
-Calcula el mínimo.
-
-## máximo (x) {#agg_function-max}
-
-Calcula el máximo.
-
-## ¿Cómo puedo hacerlo?) {#agg-function-argmin}
-
-Calcula el ‘arg’ para un valor mínimo ‘val’ valor. Si hay varios valores diferentes de ‘arg’ para valores mínimos de ‘val’, el primero de estos valores encontrados es la salida.
-
-**Ejemplo:**
-
-``` text
-┌─user─────┬─salary─┐
-│ director │   5000 │
-│ manager  │   3000 │
-│ worker   │   1000 │
-└──────────┴────────┘
-```
-
-``` sql
-SELECT argMin(user, salary) FROM salary
-```
-
-``` text
-┌─argMin(user, salary)─┐
-│ worker               │
-└──────────────────────┘
-```
-
-## Descripción) {#agg-function-argmax}
-
-Calcula el ‘arg’ para un valor máximo ‘val’ valor. Si hay varios valores diferentes de ‘arg’ para valores máximos de ‘val’, el primero de estos valores encontrados es la salida.
-
-## suma (x) {#agg_function-sum}
-
-Calcula la suma.
-Solo funciona para números.
-
-## ¿Cómo puedo obtener más información?) {#sumwithoverflowx}
-
-Calcula la suma de los números, utilizando el mismo tipo de datos para el resultado que para los parámetros de entrada. Si la suma supera el valor máximo para este tipo de datos, la función devuelve un error.
-
-Solo funciona para números.
-
-## Por ejemplo, el valor es el siguiente:)) {#agg_functions-summap}
-
-Totals el ‘value’ matriz de acuerdo con las claves especificadas en el ‘key’ matriz.
-Pasar una tupla de matrices de claves y valores es sinónimo de pasar dos matrices de claves y valores.
-El número de elementos en ‘key’ y ‘value’ debe ser el mismo para cada fila que se sume.
-Returns a tuple of two arrays: keys in sorted order, and values ​​summed for the corresponding keys.
-
-Ejemplo:
-
-``` sql
-CREATE TABLE sum_map(
-    date Date,
-    timeslot DateTime,
-    statusMap Nested(
-        status UInt16,
-        requests UInt64
-    ),
-    statusMapTuple Tuple(Array(Int32), Array(Int32))
-) ENGINE = Log;
-INSERT INTO sum_map VALUES
-    ('2000-01-01', '2000-01-01 00:00:00', [1, 2, 3], [10, 10, 10], ([1, 2, 3], [10, 10, 10])),
-    ('2000-01-01', '2000-01-01 00:00:00', [3, 4, 5], [10, 10, 10], ([3, 4, 5], [10, 10, 10])),
-    ('2000-01-01', '2000-01-01 00:01:00', [4, 5, 6], [10, 10, 10], ([4, 5, 6], [10, 10, 10])),
-    ('2000-01-01', '2000-01-01 00:01:00', [6, 7, 8], [10, 10, 10], ([6, 7, 8], [10, 10, 10]));
-
-SELECT
-    timeslot,
-    sumMap(statusMap.status, statusMap.requests),
-    sumMap(statusMapTuple)
-FROM sum_map
-GROUP BY timeslot
-```
-
-``` text
-┌────────────timeslot─┬─sumMap(statusMap.status, statusMap.requests)─┬─sumMap(statusMapTuple)─────────┐
-│ 2000-01-01 00:00:00 │ ([1,2,3,4,5],[10,10,20,10,10])               │ ([1,2,3,4,5],[10,10,20,10,10]) │
-│ 2000-01-01 00:01:00 │ ([4,5,6,7,8],[10,10,20,10,10])               │ ([4,5,6,7,8],[10,10,20,10,10]) │
-└─────────────────────┴──────────────────────────────────────────────┴────────────────────────────────┘
-```
-
-## SkewPop {#skewpop}
-
-Calcula el [la asimetría](https://en.wikipedia.org/wiki/Skewness) de una secuencia.
-
-``` sql
-skewPop(expr)
-```
-
-**Parámetros**
-
-`expr` — [Expresion](../syntax.md#syntax-expressions) devolviendo un número.
-
-**Valor devuelto**
-
-The skewness of the given distribution. Type — [Float64](../../sql-reference/data-types/float.md)
-
-**Ejemplo**
-
-``` sql
-SELECT skewPop(value) FROM series_with_value_column
-```
-
-## Sistema abierto {#skewsamp}
-
-Calcula el [asimetría de la muestra](https://en.wikipedia.org/wiki/Skewness) de una secuencia.
-
-Representa una estimación imparcial de la asimetría de una variable aleatoria si los valores pasados forman su muestra.
-
-``` sql
-skewSamp(expr)
-```
-
-**Parámetros**
-
-`expr` — [Expresion](../syntax.md#syntax-expressions) devolviendo un número.
-
-**Valor devuelto**
-
-The skewness of the given distribution. Type — [Float64](../../sql-reference/data-types/float.md). Si `n <= 1` (`n` es el tamaño de la muestra), luego la función devuelve `nan`.
-
-**Ejemplo**
-
-``` sql
-SELECT skewSamp(value) FROM series_with_value_column
-```
-
-## KurtPop {#kurtpop}
-
-Calcula el [curtosis](https://en.wikipedia.org/wiki/Kurtosis) de una secuencia.
-
-``` sql
-kurtPop(expr)
-```
-
-**Parámetros**
-
-`expr` — [Expresion](../syntax.md#syntax-expressions) devolviendo un número.
-
-**Valor devuelto**
-
-The kurtosis of the given distribution. Type — [Float64](../../sql-reference/data-types/float.md)
-
-**Ejemplo**
-
-``` sql
-SELECT kurtPop(value) FROM series_with_value_column
-```
-
-## KurtSamp {#kurtsamp}
-
-Calcula el [curtosis muestra](https://en.wikipedia.org/wiki/Kurtosis) de una secuencia.
-
-Representa una estimación imparcial de la curtosis de una variable aleatoria si los valores pasados forman su muestra.
-
-``` sql
-kurtSamp(expr)
-```
-
-**Parámetros**
-
-`expr` — [Expresion](../syntax.md#syntax-expressions) devolviendo un número.
-
-**Valor devuelto**
-
-The kurtosis of the given distribution. Type — [Float64](../../sql-reference/data-types/float.md). Si `n <= 1` (`n` es un tamaño de la muestra), luego la función devuelve `nan`.
-
-**Ejemplo**
-
-``` sql
-SELECT kurtSamp(value) FROM series_with_value_column
-```
-
-## Acerca de) {#agg_function-avg}
-
-Calcula el promedio.
-Solo funciona para números.
-El resultado es siempre Float64.
-
-## avgPonderado {#avgweighted}
-
-Calcula el [media aritmética ponderada](https://en.wikipedia.org/wiki/Weighted_arithmetic_mean).
-
-**Sintaxis**
-
-``` sql
-avgWeighted(x, weight)
-```
-
-**Parámetros**
-
--   `x` — Values. [Entero](../data-types/int-uint.md) o [punto flotante](../data-types/float.md).
--   `weight` — Weights of the values. [Entero](../data-types/int-uint.md) o [punto flotante](../data-types/float.md).
-
-Tipo de `x` y `weight` debe ser el mismo.
-
-**Valor devuelto**
-
--   Media ponderada.
--   `NaN`. Si todos los pesos son iguales a 0.
-
-Tipo: [Float64](../data-types/float.md).
-
-**Ejemplo**
-
-Consulta:
-
-``` sql
-SELECT avgWeighted(x, w)
-FROM values('x Int8, w Int8', (4, 1), (1, 0), (10, 2))
-```
-
-Resultado:
-
-``` text
-┌─avgWeighted(x, weight)─┐
-│                      8 │
-└────────────────────────┘
-```
-
-## uniq {#agg_function-uniq}
-
-Calcula el número aproximado de diferentes valores del argumento.
-
-``` sql
-uniq(x[, ...])
-```
-
-**Parámetros**
-
-La función toma un número variable de parámetros. Los parámetros pueden ser `Tuple`, `Array`, `Date`, `DateTime`, `String`, o tipos numéricos.
-
-**Valor devuelto**
-
--   A [UInt64](../../sql-reference/data-types/int-uint.md)-tipo número.
-
-**Detalles de implementación**
-
-Función:
-
--   Calcula un hash para todos los parámetros en el agregado, luego lo usa en los cálculos.
-
--   Utiliza un algoritmo de muestreo adaptativo. Para el estado de cálculo, la función utiliza una muestra de valores hash de elemento de hasta 65536.
-
-        This algorithm is very accurate and very efficient on the CPU. When the query contains several of these functions, using `uniq` is almost as fast as using other aggregate functions.
-
--   Proporciona el resultado de forma determinista (no depende del orden de procesamiento de la consulta).
-
-Recomendamos usar esta función en casi todos los escenarios.
-
-**Ver también**
-
--   [uniqCombined](#agg_function-uniqcombined)
--   [UniqCombined64](#agg_function-uniqcombined64)
--   [uniqHLL12](#agg_function-uniqhll12)
--   [uniqExact](#agg_function-uniqexact)
-
-## uniqCombined {#agg_function-uniqcombined}
-
-Calcula el número aproximado de diferentes valores de argumento.
-
-``` sql
-uniqCombined(HLL_precision)(x[, ...])
-```
-
-El `uniqCombined` es una buena opción para calcular el número de valores diferentes.
-
-**Parámetros**
-
-La función toma un número variable de parámetros. Los parámetros pueden ser `Tuple`, `Array`, `Date`, `DateTime`, `String`, o tipos numéricos.
-
-`HLL_precision` es el logaritmo base-2 del número de células en [HyperLogLog](https://en.wikipedia.org/wiki/HyperLogLog). Opcional, puede utilizar la función como `uniqCombined(x[, ...])`. El valor predeterminado para `HLL_precision` es 17, que es efectivamente 96 KiB de espacio (2 ^ 17 celdas, 6 bits cada una).
-
-**Valor devuelto**
-
--   Numero [UInt64](../../sql-reference/data-types/int-uint.md)-tipo número.
-
-**Detalles de implementación**
-
-Función:
-
--   Calcula un hash (hash de 64 bits para `String` y 32 bits de lo contrario) para todos los parámetros en el agregado, luego lo usa en los cálculos.
-
--   Utiliza una combinación de tres algoritmos: matriz, tabla hash e HyperLogLog con una tabla de corrección de errores.
-
-        For a small number of distinct elements, an array is used. When the set size is larger, a hash table is used. For a larger number of elements, HyperLogLog is used, which will occupy a fixed amount of memory.
-
--   Proporciona el resultado de forma determinista (no depende del orden de procesamiento de la consulta).
-
-!!! note "Nota"
-    Dado que usa hash de 32 bits para no-`String` tipo, el resultado tendrá un error muy alto para cardinalidades significativamente mayores que `UINT_MAX` (el error aumentará rápidamente después de unas pocas decenas de miles de millones de valores distintos), por lo tanto, en este caso debe usar [UniqCombined64](#agg_function-uniqcombined64)
-
-En comparación con el [uniq](#agg_function-uniq) función, el `uniqCombined`:
-
--   Consume varias veces menos memoria.
--   Calcula con una precisión varias veces mayor.
--   Por lo general, tiene un rendimiento ligeramente menor. En algunos escenarios, `uniqCombined` puede funcionar mejor que `uniq`, por ejemplo, con consultas distribuidas que transmiten un gran número de estados de agregación a través de la red.
-
-**Ver también**
-
--   [uniq](#agg_function-uniq)
--   [UniqCombined64](#agg_function-uniqcombined64)
--   [uniqHLL12](#agg_function-uniqhll12)
--   [uniqExact](#agg_function-uniqexact)
-
-## UniqCombined64 {#agg_function-uniqcombined64}
-
-Lo mismo que [uniqCombined](#agg_function-uniqcombined), pero utiliza hash de 64 bits para todos los tipos de datos.
-
-## uniqHLL12 {#agg_function-uniqhll12}
-
-Calcula el número aproximado de diferentes valores de argumento [HyperLogLog](https://en.wikipedia.org/wiki/HyperLogLog) algoritmo.
-
-``` sql
-uniqHLL12(x[, ...])
-```
-
-**Parámetros**
-
-La función toma un número variable de parámetros. Los parámetros pueden ser `Tuple`, `Array`, `Date`, `DateTime`, `String`, o tipos numéricos.
-
-**Valor devuelto**
-
--   A [UInt64](../../sql-reference/data-types/int-uint.md)-tipo número.
-
-**Detalles de implementación**
-
-Función:
-
--   Calcula un hash para todos los parámetros en el agregado, luego lo usa en los cálculos.
-
--   Utiliza el algoritmo HyperLogLog para aproximar el número de valores de argumento diferentes.
-
-        212 5-bit cells are used. The size of the state is slightly more than 2.5 KB. The result is not very accurate (up to ~10% error) for small data sets (<10K elements). However, the result is fairly accurate for high-cardinality data sets (10K-100M), with a maximum error of ~1.6%. Starting from 100M, the estimation error increases, and the function will return very inaccurate results for data sets with extremely high cardinality (1B+ elements).
-
--   Proporciona el resultado determinado (no depende del orden de procesamiento de la consulta).
-
-No recomendamos usar esta función. En la mayoría de los casos, use el [uniq](#agg_function-uniq) o [uniqCombined](#agg_function-uniqcombined) función.
-
-**Ver también**
-
--   [uniq](#agg_function-uniq)
--   [uniqCombined](#agg_function-uniqcombined)
--   [uniqExact](#agg_function-uniqexact)
-
-## uniqExact {#agg_function-uniqexact}
-
-Calcula el número exacto de diferentes valores de argumento.
-
-``` sql
-uniqExact(x[, ...])
-```
-
-Utilice el `uniqExact` función si necesita absolutamente un resultado exacto. De lo contrario, use el [uniq](#agg_function-uniq) función.
-
-El `uniqExact` función utiliza más memoria que `uniq`, porque el tamaño del estado tiene un crecimiento ilimitado a medida que aumenta el número de valores diferentes.
-
-**Parámetros**
-
-La función toma un número variable de parámetros. Los parámetros pueden ser `Tuple`, `Array`, `Date`, `DateTime`, `String`, o tipos numéricos.
-
-**Ver también**
-
--   [uniq](#agg_function-uniq)
--   [uniqCombined](#agg_function-uniqcombined)
--   [uniqHLL12](#agg_function-uniqhll12)
-
-## ¿Cómo puedo hacerlo?) {#agg_function-grouparray}
-
-Crea una matriz de valores de argumento.
-Los valores se pueden agregar a la matriz en cualquier orden (indeterminado).
-
-La segunda versión (con el `max_size` parámetro) limita el tamaño de la matriz resultante a `max_size` elemento.
-Por ejemplo, `groupArray (1) (x)` es equivalente a `[any (x)]`.
-
-En algunos casos, aún puede confiar en el orden de ejecución. Esto se aplica a los casos en que `SELECT` procede de una subconsulta que utiliza `ORDER BY`.
-
-## GrupoArrayInsertAt {#grouparrayinsertat}
-
-Inserta un valor en la matriz en la posición especificada.
-
-**Sintaxis**
-
-``` sql
-groupArrayInsertAt(default_x, size)(x, pos);
-```
-
-Si en una consulta se insertan varios valores en la misma posición, la función se comporta de las siguientes maneras:
-
--   Si se ejecuta una consulta en un solo subproceso, se utiliza el primero de los valores insertados.
--   Si una consulta se ejecuta en varios subprocesos, el valor resultante es uno indeterminado de los valores insertados.
-
-**Parámetros**
-
--   `x` — Value to be inserted. [Expresion](../syntax.md#syntax-expressions) lo que resulta en uno de los [tipos de datos compatibles](../../sql-reference/data-types/index.md).
--   `pos` — Position at which the specified element `x` se va a insertar. La numeración de índices en la matriz comienza desde cero. [UInt32](../../sql-reference/data-types/int-uint.md#uint-ranges).
--   `default_x`— Default value for substituting in empty positions. Optional parameter. [Expresion](../syntax.md#syntax-expressions) dando como resultado el tipo de datos configurado para `x` parámetro. Si `default_x` no está definido, el [valores predeterminados](../../sql-reference/statements/create.md#create-default-values) se utilizan.
--   `size`— Length of the resulting array. Optional parameter. When using this parameter, the default value `default_x` debe ser especificado. [UInt32](../../sql-reference/data-types/int-uint.md#uint-ranges).
-
-**Valor devuelto**
-
--   Matriz con valores insertados.
-
-Tipo: [Matriz](../../sql-reference/data-types/array.md#data-type-array).
-
-**Ejemplo**
-
-Consulta:
-
-``` sql
-SELECT groupArrayInsertAt(toString(number), number * 2) FROM numbers(5);
-```
-
-Resultado:
-
-``` text
-┌─groupArrayInsertAt(toString(number), multiply(number, 2))─┐
-│ ['0','','1','','2','','3','','4']                         │
-└───────────────────────────────────────────────────────────┘
-```
-
-Consulta:
-
-``` sql
-SELECT groupArrayInsertAt('-')(toString(number), number * 2) FROM numbers(5);
-```
-
-Resultado:
-
-``` text
-┌─groupArrayInsertAt('-')(toString(number), multiply(number, 2))─┐
-│ ['0','-','1','-','2','-','3','-','4']                          │
-└────────────────────────────────────────────────────────────────┘
-```
-
-Consulta:
-
-``` sql
-SELECT groupArrayInsertAt('-', 5)(toString(number), number * 2) FROM numbers(5);
-```
-
-Resultado:
-
-``` text
-┌─groupArrayInsertAt('-', 5)(toString(number), multiply(number, 2))─┐
-│ ['0','-','1','-','2']                                             │
-└───────────────────────────────────────────────────────────────────┘
-```
-
-Inserción multihilo de elementos en una posición.
-
-Consulta:
-
-``` sql
-SELECT groupArrayInsertAt(number, 0) FROM numbers_mt(10) SETTINGS max_block_size = 1;
-```
-
-Como resultado de esta consulta, obtiene un entero aleatorio en el `[0,9]` gama. Por ejemplo:
-
-``` text
-┌─groupArrayInsertAt(number, 0)─┐
-│ [7]                           │
-└───────────────────────────────┘
-```
-
-## groupArrayMovingSum {#agg_function-grouparraymovingsum}
-
-Calcula la suma móvil de los valores de entrada.
-
-``` sql
-groupArrayMovingSum(numbers_for_summing)
-groupArrayMovingSum(window_size)(numbers_for_summing)
-```
-
-La función puede tomar el tamaño de la ventana como un parámetro. Si no se especifica, la función toma el tamaño de ventana igual al número de filas de la columna.
-
-**Parámetros**
-
--   `numbers_for_summing` — [Expresion](../syntax.md#syntax-expressions) dando como resultado un valor de tipo de datos numérico.
--   `window_size` — Size of the calculation window.
-
-**Valores devueltos**
-
--   Matriz del mismo tamaño y tipo que los datos de entrada.
-
-**Ejemplo**
-
-La tabla de ejemplo:
-
-``` sql
-CREATE TABLE t
-(
-    `int` UInt8,
-    `float` Float32,
-    `dec` Decimal32(2)
-)
-ENGINE = TinyLog
-```
-
-``` text
-┌─int─┬─float─┬──dec─┐
-│   1 │   1.1 │ 1.10 │
-│   2 │   2.2 │ 2.20 │
-│   4 │   4.4 │ 4.40 │
-│   7 │  7.77 │ 7.77 │
-└─────┴───────┴──────┘
-```
-
-Consulta:
-
-``` sql
-SELECT
-    groupArrayMovingSum(int) AS I,
-    groupArrayMovingSum(float) AS F,
-    groupArrayMovingSum(dec) AS D
-FROM t
-```
-
-``` text
-┌─I──────────┬─F───────────────────────────────┬─D──────────────────────┐
-│ [1,3,7,14] │ [1.1,3.3000002,7.7000003,15.47] │ [1.10,3.30,7.70,15.47] │
-└────────────┴─────────────────────────────────┴────────────────────────┘
-```
-
-``` sql
-SELECT
-    groupArrayMovingSum(2)(int) AS I,
-    groupArrayMovingSum(2)(float) AS F,
-    groupArrayMovingSum(2)(dec) AS D
-FROM t
-```
-
-``` text
-┌─I──────────┬─F───────────────────────────────┬─D──────────────────────┐
-│ [1,3,6,11] │ [1.1,3.3000002,6.6000004,12.17] │ [1.10,3.30,6.60,12.17] │
-└────────────┴─────────────────────────────────┴────────────────────────┘
-```
-
-## Método de codificación de datos: {#agg_function-grouparraymovingavg}
-
-Calcula la media móvil de los valores de entrada.
-
-``` sql
-groupArrayMovingAvg(numbers_for_summing)
-groupArrayMovingAvg(window_size)(numbers_for_summing)
-```
-
-La función puede tomar el tamaño de la ventana como un parámetro. Si no se especifica, la función toma el tamaño de ventana igual al número de filas de la columna.
-
-**Parámetros**
-
--   `numbers_for_summing` — [Expresion](../syntax.md#syntax-expressions) dando como resultado un valor de tipo de datos numérico.
--   `window_size` — Size of the calculation window.
-
-**Valores devueltos**
-
--   Matriz del mismo tamaño y tipo que los datos de entrada.
-
-La función utiliza [redondeando hacia cero](https://en.wikipedia.org/wiki/Rounding#Rounding_towards_zero). Trunca los decimales insignificantes para el tipo de datos resultante.
-
-**Ejemplo**
-
-La tabla de ejemplo `b`:
-
-``` sql
-CREATE TABLE t
-(
-    `int` UInt8,
-    `float` Float32,
-    `dec` Decimal32(2)
-)
-ENGINE = TinyLog
-```
-
-``` text
-┌─int─┬─float─┬──dec─┐
-│   1 │   1.1 │ 1.10 │
-│   2 │   2.2 │ 2.20 │
-│   4 │   4.4 │ 4.40 │
-│   7 │  7.77 │ 7.77 │
-└─────┴───────┴──────┘
-```
-
-Consulta:
-
-``` sql
-SELECT
-    groupArrayMovingAvg(int) AS I,
-    groupArrayMovingAvg(float) AS F,
-    groupArrayMovingAvg(dec) AS D
-FROM t
-```
-
-``` text
-┌─I─────────┬─F───────────────────────────────────┬─D─────────────────────┐
-│ [0,0,1,3] │ [0.275,0.82500005,1.9250001,3.8675] │ [0.27,0.82,1.92,3.86] │
-└───────────┴─────────────────────────────────────┴───────────────────────┘
-```
-
-``` sql
-SELECT
-    groupArrayMovingAvg(2)(int) AS I,
-    groupArrayMovingAvg(2)(float) AS F,
-    groupArrayMovingAvg(2)(dec) AS D
-FROM t
-```
-
-``` text
-┌─I─────────┬─F────────────────────────────────┬─D─────────────────────┐
-│ [0,1,3,5] │ [0.55,1.6500001,3.3000002,6.085] │ [0.55,1.65,3.30,6.08] │
-└───────────┴──────────────────────────────────┴───────────────────────┘
-```
-
-## ¿Cómo puedo obtener más información?) {#groupuniqarrayx-groupuniqarraymax-sizex}
-
-Crea una matriz a partir de diferentes valores de argumento. El consumo de memoria es el mismo que para el `uniqExact` función.
-
-La segunda versión (con el `max_size` parámetro) limita el tamaño de la matriz resultante a `max_size` elemento.
-Por ejemplo, `groupUniqArray(1)(x)` es equivalente a `[any(x)]`.
-
-## cuantil {#quantile}
-
-Calcula un aproximado [cuantil](https://en.wikipedia.org/wiki/Quantile) de una secuencia de datos numéricos.
-
-Esta función se aplica [muestreo de embalses](https://en.wikipedia.org/wiki/Reservoir_sampling) con un tamaño de depósito de hasta 8192 y un generador de números aleatorios para el muestreo. El resultado es no determinista. Para obtener un cuantil exacto, use el [quantileExact](#quantileexact) función.
-
-Cuando se utilizan múltiples `quantile*` funciones con diferentes niveles en una consulta, los estados internos no se combinan (es decir, la consulta funciona de manera menos eficiente de lo que podría). En este caso, use el [cantiles](#quantiles) función.
-
-**Sintaxis**
-
-``` sql
-quantile(level)(expr)
-```
-
-Apodo: `median`.
-
-**Parámetros**
-
--   `level` — Level of quantile. Optional parameter. Constant floating-point number from 0 to 1. We recommend using a `level` valor en el rango de `[0.01, 0.99]`. Valor predeterminado: 0.5. En `level=0.5` la función calcula [mediana](https://en.wikipedia.org/wiki/Median).
--   `expr` — Expression over the column values resulting in numeric [tipos de datos](../../sql-reference/data-types/index.md#data_types), [Fecha](../../sql-reference/data-types/date.md) o [FechaHora](../../sql-reference/data-types/datetime.md).
-
-**Valor devuelto**
-
--   Cuantil aproximado del nivel especificado.
-
-Tipo:
-
--   [Float64](../../sql-reference/data-types/float.md) para la entrada de tipo de datos numéricos.
--   [Fecha](../../sql-reference/data-types/date.md) si los valores de entrada tienen `Date` tipo.
--   [FechaHora](../../sql-reference/data-types/datetime.md) si los valores de entrada tienen `DateTime` tipo.
-
-**Ejemplo**
-
-Tabla de entrada:
-
-``` text
-┌─val─┐
-│   1 │
-│   1 │
-│   2 │
-│   3 │
-└─────┘
-```
-
-Consulta:
-
-``` sql
-SELECT quantile(val) FROM t
-```
-
-Resultado:
-
-``` text
-┌─quantile(val)─┐
-│           1.5 │
-└───────────────┘
-```
-
-**Ver también**
-
--   [mediana](#median)
--   [cantiles](#quantiles)
-
-## quantileDeterminista {#quantiledeterministic}
-
-Calcula un aproximado [cuantil](https://en.wikipedia.org/wiki/Quantile) de una secuencia de datos numéricos.
-
-Esta función se aplica [muestreo de embalses](https://en.wikipedia.org/wiki/Reservoir_sampling) con un tamaño de depósito de hasta 8192 y algoritmo determinista de muestreo. El resultado es determinista. Para obtener un cuantil exacto, use el [quantileExact](#quantileexact) función.
-
-Cuando se utilizan múltiples `quantile*` funciones con diferentes niveles en una consulta, los estados internos no se combinan (es decir, la consulta funciona de manera menos eficiente de lo que podría). En este caso, use el [cantiles](#quantiles) función.
-
-**Sintaxis**
-
-``` sql
-quantileDeterministic(level)(expr, determinator)
-```
-
-Apodo: `medianDeterministic`.
-
-**Parámetros**
-
--   `level` — Level of quantile. Optional parameter. Constant floating-point number from 0 to 1. We recommend using a `level` valor en el rango de `[0.01, 0.99]`. Valor predeterminado: 0.5. En `level=0.5` la función calcula [mediana](https://en.wikipedia.org/wiki/Median).
--   `expr` — Expression over the column values resulting in numeric [tipos de datos](../../sql-reference/data-types/index.md#data_types), [Fecha](../../sql-reference/data-types/date.md) o [FechaHora](../../sql-reference/data-types/datetime.md).
--   `determinator` — Number whose hash is used instead of a random number generator in the reservoir sampling algorithm to make the result of sampling deterministic. As a determinator you can use any deterministic positive number, for example, a user id or an event id. If the same determinator value occures too often, the function works incorrectly.
-
-**Valor devuelto**
-
--   Cuantil aproximado del nivel especificado.
-
-Tipo:
-
--   [Float64](../../sql-reference/data-types/float.md) para la entrada de tipo de datos numéricos.
--   [Fecha](../../sql-reference/data-types/date.md) si los valores de entrada tienen `Date` tipo.
--   [FechaHora](../../sql-reference/data-types/datetime.md) si los valores de entrada tienen `DateTime` tipo.
-
-**Ejemplo**
-
-Tabla de entrada:
-
-``` text
-┌─val─┐
-│   1 │
-│   1 │
-│   2 │
-│   3 │
-└─────┘
-```
-
-Consulta:
-
-``` sql
-SELECT quantileDeterministic(val, 1) FROM t
-```
-
-Resultado:
-
-``` text
-┌─quantileDeterministic(val, 1)─┐
-│                           1.5 │
-└───────────────────────────────┘
-```
-
-**Ver también**
-
--   [mediana](#median)
--   [cantiles](#quantiles)
-
-## quantileExact {#quantileexact}
-
-Calcula exactamente el [cuantil](https://en.wikipedia.org/wiki/Quantile) de una secuencia de datos numéricos.
-
-To get exact value, all the passed values ​​are combined into an array, which is then partially sorted. Therefore, the function consumes `O(n)` memoria, donde `n` es un número de valores que se pasaron. Sin embargo, para un pequeño número de valores, la función es muy efectiva.
-
-Cuando se utilizan múltiples `quantile*` funciones con diferentes niveles en una consulta, los estados internos no se combinan (es decir, la consulta funciona de manera menos eficiente de lo que podría). En este caso, use el [cantiles](#quantiles) función.
-
-**Sintaxis**
-
-``` sql
-quantileExact(level)(expr)
-```
-
-Apodo: `medianExact`.
-
-**Parámetros**
-
--   `level` — Level of quantile. Optional parameter. Constant floating-point number from 0 to 1. We recommend using a `level` valor en el rango de `[0.01, 0.99]`. Valor predeterminado: 0.5. En `level=0.5` la función calcula [mediana](https://en.wikipedia.org/wiki/Median).
--   `expr` — Expression over the column values resulting in numeric [tipos de datos](../../sql-reference/data-types/index.md#data_types), [Fecha](../../sql-reference/data-types/date.md) o [FechaHora](../../sql-reference/data-types/datetime.md).
-
-**Valor devuelto**
-
--   Cuantil del nivel especificado.
-
-Tipo:
-
--   [Float64](../../sql-reference/data-types/float.md) para la entrada de tipo de datos numéricos.
--   [Fecha](../../sql-reference/data-types/date.md) si los valores de entrada tienen `Date` tipo.
--   [FechaHora](../../sql-reference/data-types/datetime.md) si los valores de entrada tienen `DateTime` tipo.
-
-**Ejemplo**
-
-Consulta:
-
-``` sql
-SELECT quantileExact(number) FROM numbers(10)
-```
-
-Resultado:
-
-``` text
-┌─quantileExact(number)─┐
-│                     5 │
-└───────────────────────┘
-```
-
-**Ver también**
-
--   [mediana](#median)
--   [cantiles](#quantiles)
-
-## quantileExactWeighted {#quantileexactweighted}
-
-Calcula exactamente el [cuantil](https://en.wikipedia.org/wiki/Quantile) de una secuencia de datos numéricos, teniendo en cuenta el peso de cada elemento.
-
-To get exact value, all the passed values ​​are combined into an array, which is then partially sorted. Each value is counted with its weight, as if it is present `weight` times. A hash table is used in the algorithm. Because of this, if the passed values ​​are frequently repeated, the function consumes less RAM than [quantileExact](#quantileexact). Puede usar esta función en lugar de `quantileExact` y especifique el peso 1.
-
-Cuando se utilizan múltiples `quantile*` funciones con diferentes niveles en una consulta, los estados internos no se combinan (es decir, la consulta funciona de manera menos eficiente de lo que podría). En este caso, use el [cantiles](#quantiles) función.
-
-**Sintaxis**
-
-``` sql
-quantileExactWeighted(level)(expr, weight)
-```
-
-Apodo: `medianExactWeighted`.
-
-**Parámetros**
-
--   `level` — Level of quantile. Optional parameter. Constant floating-point number from 0 to 1. We recommend using a `level` valor en el rango de `[0.01, 0.99]`. Valor predeterminado: 0.5. En `level=0.5` la función calcula [mediana](https://en.wikipedia.org/wiki/Median).
--   `expr` — Expression over the column values resulting in numeric [tipos de datos](../../sql-reference/data-types/index.md#data_types), [Fecha](../../sql-reference/data-types/date.md) o [FechaHora](../../sql-reference/data-types/datetime.md).
--   `weight` — Column with weights of sequence members. Weight is a number of value occurrences.
-
-**Valor devuelto**
-
--   Cuantil del nivel especificado.
-
-Tipo:
-
--   [Float64](../../sql-reference/data-types/float.md) para la entrada de tipo de datos numéricos.
--   [Fecha](../../sql-reference/data-types/date.md) si los valores de entrada tienen `Date` tipo.
--   [FechaHora](../../sql-reference/data-types/datetime.md) si los valores de entrada tienen `DateTime` tipo.
-
-**Ejemplo**
-
-Tabla de entrada:
-
-``` text
-┌─n─┬─val─┐
-│ 0 │   3 │
-│ 1 │   2 │
-│ 2 │   1 │
-│ 5 │   4 │
-└───┴─────┘
-```
-
-Consulta:
-
-``` sql
-SELECT quantileExactWeighted(n, val) FROM t
-```
-
-Resultado:
-
-``` text
-┌─quantileExactWeighted(n, val)─┐
-│                             1 │
-└───────────────────────────────┘
-```
-
-**Ver también**
-
--   [mediana](#median)
--   [cantiles](#quantiles)
-
-## quantileTiming {#quantiletiming}
-
-Con la precisión determinada calcula el [cuantil](https://en.wikipedia.org/wiki/Quantile) de una secuencia de datos numéricos.
-
-El resultado es determinista (no depende del orden de procesamiento de la consulta). La función está optimizada para trabajar con secuencias que describen distribuciones como tiempos de carga de páginas web o tiempos de respuesta de back-end.
-
-Cuando se utilizan múltiples `quantile*` funciones con diferentes niveles en una consulta, los estados internos no se combinan (es decir, la consulta funciona de manera menos eficiente de lo que podría). En este caso, use el [cantiles](#quantiles) función.
-
-**Sintaxis**
-
-``` sql
-quantileTiming(level)(expr)
-```
-
-Apodo: `medianTiming`.
-
-**Parámetros**
-
--   `level` — Level of quantile. Optional parameter. Constant floating-point number from 0 to 1. We recommend using a `level` valor en el rango de `[0.01, 0.99]`. Valor predeterminado: 0.5. En `level=0.5` la función calcula [mediana](https://en.wikipedia.org/wiki/Median).
-
--   `expr` — [Expresion](../syntax.md#syntax-expressions) sobre una columna valores que devuelven un [Flotante\*](../../sql-reference/data-types/float.md)-tipo número.
-
-        - If negative values are passed to the function, the behavior is undefined.
-        - If the value is greater than 30,000 (a page loading time of more than 30 seconds), it is assumed to be 30,000.
-
-**Exactitud**
-
-El cálculo es preciso si:
-
--   El número total de valores no supera los 5670.
--   El número total de valores supera los 5670, pero el tiempo de carga de la página es inferior a 1024 ms.
-
-De lo contrario, el resultado del cálculo se redondea al múltiplo más cercano de 16 ms.
-
-!!! note "Nota"
-    Para calcular los cuantiles de tiempo de carga de la página, esta función es más efectiva y precisa que [cuantil](#quantile).
-
-**Valor devuelto**
-
--   Cuantil del nivel especificado.
-
-Tipo: `Float32`.
-
-!!! note "Nota"
-    Si no se pasan valores a la función (cuando se `quantileTimingIf`), [NaN](../../sql-reference/data-types/float.md#data_type-float-nan-inf) se devuelve. El propósito de esto es diferenciar estos casos de los casos que resultan en cero. Ver [ORDER BY cláusula](../statements/select/order-by.md#select-order-by) para notas sobre la clasificación `NaN` valor.
-
-**Ejemplo**
-
-Tabla de entrada:
-
-``` text
-┌─response_time─┐
-│            72 │
-│           112 │
-│           126 │
-│           145 │
-│           104 │
-│           242 │
-│           313 │
-│           168 │
-│           108 │
-└───────────────┘
-```
-
-Consulta:
-
-``` sql
-SELECT quantileTiming(response_time) FROM t
-```
-
-Resultado:
-
-``` text
-┌─quantileTiming(response_time)─┐
-│                           126 │
-└───────────────────────────────┘
-```
-
-**Ver también**
-
--   [mediana](#median)
--   [cantiles](#quantiles)
-
-## quantileTimingWeighted {#quantiletimingweighted}
-
-Con la precisión determinada calcula el [cuantil](https://en.wikipedia.org/wiki/Quantile) de una secuencia de datos numéricos según el peso de cada miembro de secuencia.
-
-El resultado es determinista (no depende del orden de procesamiento de la consulta). La función está optimizada para trabajar con secuencias que describen distribuciones como tiempos de carga de páginas web o tiempos de respuesta de back-end.
-
-Cuando se utilizan múltiples `quantile*` funciones con diferentes niveles en una consulta, los estados internos no se combinan (es decir, la consulta funciona de manera menos eficiente de lo que podría). En este caso, use el [cantiles](#quantiles) función.
-
-**Sintaxis**
-
-``` sql
-quantileTimingWeighted(level)(expr, weight)
-```
-
-Apodo: `medianTimingWeighted`.
-
-**Parámetros**
-
--   `level` — Level of quantile. Optional parameter. Constant floating-point number from 0 to 1. We recommend using a `level` valor en el rango de `[0.01, 0.99]`. Valor predeterminado: 0.5. En `level=0.5` la función calcula [mediana](https://en.wikipedia.org/wiki/Median).
-
--   `expr` — [Expresion](../syntax.md#syntax-expressions) sobre una columna valores que devuelven un [Flotante\*](../../sql-reference/data-types/float.md)-tipo número.
-
-        - If negative values are passed to the function, the behavior is undefined.
-        - If the value is greater than 30,000 (a page loading time of more than 30 seconds), it is assumed to be 30,000.
-
--   `weight` — Column with weights of sequence elements. Weight is a number of value occurrences.
-
-**Exactitud**
-
-El cálculo es preciso si:
-
--   El número total de valores no supera los 5670.
--   El número total de valores supera los 5670, pero el tiempo de carga de la página es inferior a 1024 ms.
-
-De lo contrario, el resultado del cálculo se redondea al múltiplo más cercano de 16 ms.
-
-!!! note "Nota"
-    Para calcular los cuantiles de tiempo de carga de la página, esta función es más efectiva y precisa que [cuantil](#quantile).
-
-**Valor devuelto**
-
--   Cuantil del nivel especificado.
-
-Tipo: `Float32`.
-
-!!! note "Nota"
-    Si no se pasan valores a la función (cuando se `quantileTimingIf`), [NaN](../../sql-reference/data-types/float.md#data_type-float-nan-inf) se devuelve. El propósito de esto es diferenciar estos casos de los casos que resultan en cero. Ver [ORDER BY cláusula](../statements/select/order-by.md#select-order-by) para notas sobre la clasificación `NaN` valor.
-
-**Ejemplo**
-
-Tabla de entrada:
-
-``` text
-┌─response_time─┬─weight─┐
-│            68 │      1 │
-│           104 │      2 │
-│           112 │      3 │
-│           126 │      2 │
-│           138 │      1 │
-│           162 │      1 │
-└───────────────┴────────┘
-```
-
-Consulta:
-
-``` sql
-SELECT quantileTimingWeighted(response_time, weight) FROM t
-```
-
-Resultado:
-
-``` text
-┌─quantileTimingWeighted(response_time, weight)─┐
-│                                           112 │
-└───────────────────────────────────────────────┘
-```
-
-**Ver también**
-
--   [mediana](#median)
--   [cantiles](#quantiles)
-
-## quantileTDigest {#quantiletdigest}
-
-Calcula un aproximado [cuantil](https://en.wikipedia.org/wiki/Quantile) de una secuencia de datos numéricos usando el [T-digest](https://github.com/tdunning/t-digest/blob/master/docs/t-digest-paper/histo.pdf) algoritmo.
-
-El error máximo es 1%. El consumo de memoria es `log(n)`, donde `n` es un número de valores. El resultado depende del orden de ejecución de la consulta y no es determinista.
-
-El rendimiento de la función es menor que el rendimiento de [cuantil](#quantile) o [quantileTiming](#quantiletiming). En términos de la relación entre el tamaño del estado y la precisión, esta función es mucho mejor que `quantile`.
-
-Cuando se utilizan múltiples `quantile*` funciones con diferentes niveles en una consulta, los estados internos no se combinan (es decir, la consulta funciona de manera menos eficiente de lo que podría). En este caso, use el [cantiles](#quantiles) función.
-
-**Sintaxis**
-
-``` sql
-quantileTDigest(level)(expr)
-```
-
-Apodo: `medianTDigest`.
-
-**Parámetros**
-
--   `level` — Level of quantile. Optional parameter. Constant floating-point number from 0 to 1. We recommend using a `level` valor en el rango de `[0.01, 0.99]`. Valor predeterminado: 0.5. En `level=0.5` la función calcula [mediana](https://en.wikipedia.org/wiki/Median).
--   `expr` — Expression over the column values resulting in numeric [tipos de datos](../../sql-reference/data-types/index.md#data_types), [Fecha](../../sql-reference/data-types/date.md) o [FechaHora](../../sql-reference/data-types/datetime.md).
-
-**Valor devuelto**
-
--   Cuantil aproximado del nivel especificado.
-
-Tipo:
-
--   [Float64](../../sql-reference/data-types/float.md) para la entrada de tipo de datos numéricos.
--   [Fecha](../../sql-reference/data-types/date.md) si los valores de entrada tienen `Date` tipo.
--   [FechaHora](../../sql-reference/data-types/datetime.md) si los valores de entrada tienen `DateTime` tipo.
-
-**Ejemplo**
-
-Consulta:
-
-``` sql
-SELECT quantileTDigest(number) FROM numbers(10)
-```
-
-Resultado:
-
-``` text
-┌─quantileTDigest(number)─┐
-│                     4.5 │
-└─────────────────────────┘
-```
-
-**Ver también**
-
--   [mediana](#median)
--   [cantiles](#quantiles)
-
-## quantileTDigestWeighted {#quantiletdigestweighted}
-
-Calcula un aproximado [cuantil](https://en.wikipedia.org/wiki/Quantile) de una secuencia de datos numéricos usando el [T-digest](https://github.com/tdunning/t-digest/blob/master/docs/t-digest-paper/histo.pdf) algoritmo. La función tiene en cuenta el peso de cada miembro de secuencia. El error máximo es 1%. El consumo de memoria es `log(n)`, donde `n` es un número de valores.
-
-El rendimiento de la función es menor que el rendimiento de [cuantil](#quantile) o [quantileTiming](#quantiletiming). En términos de la relación entre el tamaño del estado y la precisión, esta función es mucho mejor que `quantile`.
-
-El resultado depende del orden de ejecución de la consulta y no es determinista.
-
-Cuando se utilizan múltiples `quantile*` funciones con diferentes niveles en una consulta, los estados internos no se combinan (es decir, la consulta funciona de manera menos eficiente de lo que podría). En este caso, use el [cantiles](#quantiles) función.
-
-**Sintaxis**
-
-``` sql
-quantileTDigest(level)(expr)
-```
-
-Apodo: `medianTDigest`.
-
-**Parámetros**
-
--   `level` — Level of quantile. Optional parameter. Constant floating-point number from 0 to 1. We recommend using a `level` valor en el rango de `[0.01, 0.99]`. Valor predeterminado: 0.5. En `level=0.5` la función calcula [mediana](https://en.wikipedia.org/wiki/Median).
--   `expr` — Expression over the column values resulting in numeric [tipos de datos](../../sql-reference/data-types/index.md#data_types), [Fecha](../../sql-reference/data-types/date.md) o [FechaHora](../../sql-reference/data-types/datetime.md).
--   `weight` — Column with weights of sequence elements. Weight is a number of value occurrences.
-
-**Valor devuelto**
-
--   Cuantil aproximado del nivel especificado.
-
-Tipo:
-
--   [Float64](../../sql-reference/data-types/float.md) para la entrada de tipo de datos numéricos.
--   [Fecha](../../sql-reference/data-types/date.md) si los valores de entrada tienen `Date` tipo.
--   [FechaHora](../../sql-reference/data-types/datetime.md) si los valores de entrada tienen `DateTime` tipo.
-
-**Ejemplo**
-
-Consulta:
-
-``` sql
-SELECT quantileTDigestWeighted(number, 1) FROM numbers(10)
-```
-
-Resultado:
-
-``` text
-┌─quantileTDigestWeighted(number, 1)─┐
-│                                4.5 │
-└────────────────────────────────────┘
-```
-
-**Ver también**
-
--   [mediana](#median)
--   [cantiles](#quantiles)
-
-## mediana {#median}
-
-El `median*` funciones son los alias para el `quantile*` función. Calculan la mediana de una muestra de datos numéricos.
-
-Función:
-
--   `median` — Alias for [cuantil](#quantile).
--   `medianDeterministic` — Alias for [quantileDeterminista](#quantiledeterministic).
--   `medianExact` — Alias for [quantileExact](#quantileexact).
--   `medianExactWeighted` — Alias for [quantileExactWeighted](#quantileexactweighted).
--   `medianTiming` — Alias for [quantileTiming](#quantiletiming).
--   `medianTimingWeighted` — Alias for [quantileTimingWeighted](#quantiletimingweighted).
--   `medianTDigest` — Alias for [quantileTDigest](#quantiletdigest).
--   `medianTDigestWeighted` — Alias for [quantileTDigestWeighted](#quantiletdigestweighted).
-
-**Ejemplo**
-
-Tabla de entrada:
-
-``` text
-┌─val─┐
-│   1 │
-│   1 │
-│   2 │
-│   3 │
-└─────┘
-```
-
-Consulta:
-
-``` sql
-SELECT medianDeterministic(val, 1) FROM t
-```
-
-Resultado:
-
-``` text
-┌─medianDeterministic(val, 1)─┐
-│                         1.5 │
-└─────────────────────────────┘
-```
-
-## quantiles(level1, level2, …)(x) {#quantiles}
-
-Todas las funciones de cuantiles también tienen funciones de cuantiles correspondientes: `quantiles`, `quantilesDeterministic`, `quantilesTiming`, `quantilesTimingWeighted`, `quantilesExact`, `quantilesExactWeighted`, `quantilesTDigest`. Estas funciones calculan todos los cuantiles de los niveles enumerados en una sola pasada y devuelven una matriz de los valores resultantes.
-
-## Acerca de Nosotros) {#varsampx}
-
-Calcula la cantidad `Σ((x - x̅)^2) / (n - 1)`, donde `n` es el tamaño de la muestra y `x̅`es el valor promedio de `x`.
-
-Representa una estimación imparcial de la varianza de una variable aleatoria si los valores pasados forman su muestra.
-
-Devoluciones `Float64`. Cuando `n <= 1`, devoluciones `+∞`.
-
-!!! note "Nota"
-    Esta función utiliza un algoritmo numéricamente inestable. Si necesita [estabilidad numérica](https://en.wikipedia.org/wiki/Numerical_stability) en los cálculos, utilice el `varSampStable` función. Funciona más lento, pero proporciona un menor error computacional.
-
-## Nombre de la red inalámbrica (SSID):) {#varpopx}
-
-Calcula la cantidad `Σ((x - x̅)^2) / n`, donde `n` es el tamaño de la muestra y `x̅`es el valor promedio de `x`.
-
-En otras palabras, dispersión para un conjunto de valores. Devoluciones `Float64`.
-
-!!! note "Nota"
-    Esta función utiliza un algoritmo numéricamente inestable. Si necesita [estabilidad numérica](https://en.wikipedia.org/wiki/Numerical_stability) en los cálculos, utilice el `varPopStable` función. Funciona más lento, pero proporciona un menor error computacional.
-
-## Soporte técnico) {#stddevsampx}
-
-El resultado es igual a la raíz cuadrada de `varSamp(x)`.
-
-!!! note "Nota"
-    Esta función utiliza un algoritmo numéricamente inestable. Si necesita [estabilidad numérica](https://en.wikipedia.org/wiki/Numerical_stability) en los cálculos, utilice el `stddevSampStable` función. Funciona más lento, pero proporciona un menor error computacional.
-
-## stddevPop(x) {#stddevpopx}
-
-El resultado es igual a la raíz cuadrada de `varPop(x)`.
-
-!!! note "Nota"
-    Esta función utiliza un algoritmo numéricamente inestable. Si necesita [estabilidad numérica](https://en.wikipedia.org/wiki/Numerical_stability) en los cálculos, utilice el `stddevPopStable` función. Funciona más lento, pero proporciona un menor error computacional.
-
-## topK(N)(x) {#topknx}
-
-Devuelve una matriz de los valores aproximadamente más frecuentes de la columna especificada. La matriz resultante se ordena en orden descendente de frecuencia aproximada de valores (no por los valores mismos).
-
-Implementa el [Ahorro de espacio filtrado](http://www.l2f.inesc-id.pt/~fmmb/wiki/uploads/Work/misnis.ref0a.pdf) algoritmo para analizar TopK, basado en el algoritmo de reducción y combinación de [Ahorro de espacio paralelo](https://arxiv.org/pdf/1401.0702.pdf).
-
-``` sql
-topK(N)(column)
-```
-
-Esta función no proporciona un resultado garantizado. En ciertas situaciones, pueden producirse errores y pueden devolver valores frecuentes que no son los valores más frecuentes.
-
-Recomendamos usar el `N < 10` valor; el rendimiento se reduce con grandes `N` valor. Valor máximo de `N = 65536`.
-
-**Parámetros**
-
--   ‘N’ es el número de elementos a devolver.
-
-Si se omite el parámetro, se utiliza el valor predeterminado 10.
-
-**Argumento**
-
--   ' x ' – The value to calculate frequency.
-
-**Ejemplo**
-
-Tome el [A tiempo](../../getting-started/example-datasets/ontime.md) conjunto de datos y seleccione los tres valores más frecuentes `AirlineID` columna.
-
-``` sql
-SELECT topK(3)(AirlineID) AS res
-FROM ontime
-```
-
-``` text
-┌─res─────────────────┐
-│ [19393,19790,19805] │
-└─────────────────────┘
-```
-
-## topKPeso {#topkweighted}
-
-Similar a `topK` pero toma un argumento adicional de tipo entero - `weight`. Cada valor se contabiliza `weight` veces para el cálculo de la frecuencia.
-
-**Sintaxis**
-
-``` sql
-topKWeighted(N)(x, weight)
-```
-
-**Parámetros**
-
--   `N` — The number of elements to return.
-
-**Argumento**
-
--   `x` – The value.
--   `weight` — The weight. [UInt8](../../sql-reference/data-types/int-uint.md).
-
-**Valor devuelto**
-
-Devuelve una matriz de los valores con la suma aproximada máxima de pesos.
-
-**Ejemplo**
-
-Consulta:
-
-``` sql
-SELECT topKWeighted(10)(number, number) FROM numbers(1000)
-```
-
-Resultado:
-
-``` text
-┌─topKWeighted(10)(number, number)──────────┐
-│ [999,998,997,996,995,994,993,992,991,990] │
-└───────────────────────────────────────────┘
-```
-
-## covarSamp(x, y) {#covarsampx-y}
-
-Calcula el valor de `Σ((x - x̅)(y - y̅)) / (n - 1)`.
-
-Devuelve Float64. Cuando `n <= 1`, returns +∞.
-
-!!! note "Nota"
-    Esta función utiliza un algoritmo numéricamente inestable. Si necesita [estabilidad numérica](https://en.wikipedia.org/wiki/Numerical_stability) en los cálculos, utilice el `covarSampStable` función. Funciona más lento, pero proporciona un menor error computacional.
-
-## covarPop(x, y) {#covarpopx-y}
-
-Calcula el valor de `Σ((x - x̅)(y - y̅)) / n`.
-
-!!! note "Nota"
-    Esta función utiliza un algoritmo numéricamente inestable. Si necesita [estabilidad numérica](https://en.wikipedia.org/wiki/Numerical_stability) en los cálculos, utilice el `covarPopStable` función. Funciona más lento pero proporciona un menor error computacional.
-
-## corr(x, y) {#corrx-y}
-
-Calcula el coeficiente de correlación de Pearson: `Σ((x - x̅)(y - y̅)) / sqrt(Σ((x - x̅)^2) * Σ((y - y̅)^2))`.
-
-!!! note "Nota"
-    Esta función utiliza un algoritmo numéricamente inestable. Si necesita [estabilidad numérica](https://en.wikipedia.org/wiki/Numerical_stability) en los cálculos, utilice el `corrStable` función. Funciona más lento, pero proporciona un menor error computacional.
-
-## categoricalInformationValue {#categoricalinformationvalue}
-
-Calcula el valor de `(P(tag = 1) - P(tag = 0))(log(P(tag = 1)) - log(P(tag = 0)))` para cada categoría.
-
-``` sql
-categoricalInformationValue(category1, category2, ..., tag)
-```
-
-El resultado indica cómo una característica discreta (categórica `[category1, category2, ...]` contribuir a un modelo de aprendizaje que predice el valor de `tag`.
-
-## SimpleLinearRegression {#simplelinearregression}
-
-Realiza una regresión lineal simple (unidimensional).
-
-``` sql
-simpleLinearRegression(x, y)
-```
-
-Parámetros:
-
--   `x` — Column with dependent variable values.
--   `y` — Column with explanatory variable values.
-
-Valores devueltos:
-
-Constante `(a, b)` de la línea resultante `y = a*x + b`.
-
-**Ejemplos**
-
-``` sql
-SELECT arrayReduce('simpleLinearRegression', [0, 1, 2, 3], [0, 1, 2, 3])
-```
-
-``` text
-┌─arrayReduce('simpleLinearRegression', [0, 1, 2, 3], [0, 1, 2, 3])─┐
-│ (1,0)                                                             │
-└───────────────────────────────────────────────────────────────────┘
-```
-
-``` sql
-SELECT arrayReduce('simpleLinearRegression', [0, 1, 2, 3], [3, 4, 5, 6])
-```
-
-``` text
-┌─arrayReduce('simpleLinearRegression', [0, 1, 2, 3], [3, 4, 5, 6])─┐
-│ (1,3)                                                             │
-└───────────────────────────────────────────────────────────────────┘
-```
-
-## stochasticLinearRegression {#agg_functions-stochasticlinearregression}
-
-Esta función implementa la regresión lineal estocástica. Admite parámetros personalizados para la tasa de aprendizaje, el coeficiente de regularización L2, el tamaño de mini lote y tiene pocos métodos para actualizar los pesos ([Adán](https://en.wikipedia.org/wiki/Stochastic_gradient_descent#Adam) (utilizado por defecto), [SGD simple](https://en.wikipedia.org/wiki/Stochastic_gradient_descent), [Impulso](https://en.wikipedia.org/wiki/Stochastic_gradient_descent#Momentum), [Nesterov](https://mipt.ru/upload/medialibrary/d7e/41-91.pdf)).
-
-### Parámetros {#agg_functions-stochasticlinearregression-parameters}
-
-Hay 4 parámetros personalizables. Se pasan a la función secuencialmente, pero no es necesario pasar los cuatro; se usarán valores predeterminados, sin embargo, un buen modelo requirió algún ajuste de parámetros.
-
-``` text
-stochasticLinearRegression(1.0, 1.0, 10, 'SGD')
-```
-
-1.  `learning rate` es el coeficiente en la longitud del paso, cuando se realiza el paso de descenso de gradiente. Una tasa de aprendizaje demasiado grande puede causar pesos infinitos del modelo. El valor predeterminado es `0.00001`.
-2.  `l2 regularization coefficient` que puede ayudar a prevenir el sobreajuste. El valor predeterminado es `0.1`.
-3.  `mini-batch size` establece el número de elementos, cuyos gradientes se calcularán y sumarán para realizar un paso de descenso de gradiente. El descenso estocástico puro usa un elemento, sin embargo, tener lotes pequeños (aproximadamente 10 elementos) hace que los pasos de gradiente sean más estables. El valor predeterminado es `15`.
-4.  `method for updating weights`, son: `Adam` (predeterminada), `SGD`, `Momentum`, `Nesterov`. `Momentum` y `Nesterov` requieren un poco más de cálculos y memoria, sin embargo, resultan útiles en términos de velocidad de convergencia y estabilidad de los métodos de gradiente estocásticos.
-
-### Uso {#agg_functions-stochasticlinearregression-usage}
-
-`stochasticLinearRegression` se utiliza en dos pasos: ajustar el modelo y predecir nuevos datos. Para ajustar el modelo y guardar su estado para su uso posterior, utilizamos `-State` combinador, que básicamente guarda el estado (pesos del modelo, etc.).
-Para predecir usamos la función [evalMLMethod](../functions/machine-learning-functions.md#machine_learning_methods-evalmlmethod), que toma un estado como argumento, así como características para predecir.
-
-<a name="stochasticlinearregression-usage-fitting"></a>
-
-**1.** Accesorio
-
-Dicha consulta puede ser utilizada.
-
-``` sql
-CREATE TABLE IF NOT EXISTS train_data
-(
-    param1 Float64,
-    param2 Float64,
-    target Float64
-) ENGINE = Memory;
-
-CREATE TABLE your_model ENGINE = Memory AS SELECT
-stochasticLinearRegressionState(0.1, 0.0, 5, 'SGD')(target, param1, param2)
-AS state FROM train_data;
-```
-
-Aquí también tenemos que insertar datos en `train_data` tabla. El número de parámetros no es fijo, depende solo del número de argumentos, pasados a `linearRegressionState`. Todos deben ser valores numéricos.
-Tenga en cuenta que la columna con valor objetivo (que nos gustaría aprender a predecir) se inserta como primer argumento.
-
-**2.** Predecir
-
-Después de guardar un estado en la tabla, podemos usarlo varias veces para la predicción, o incluso fusionarlo con otros estados y crear nuevos modelos aún mejores.
-
-``` sql
-WITH (SELECT state FROM your_model) AS model SELECT
-evalMLMethod(model, param1, param2) FROM test_data
-```
-
-La consulta devolverá una columna de valores predichos. Tenga en cuenta que el primer argumento de `evalMLMethod` ser `AggregateFunctionState` objeto, siguiente son columnas de características.
-
-`test_data` es una mesa como `train_data` pero puede no contener el valor objetivo.
-
-### Nota {#agg_functions-stochasticlinearregression-notes}
-
-1.  Para fusionar dos modelos, el usuario puede crear dicha consulta:
-    `sql  SELECT state1 + state2 FROM your_models`
-    donde `your_models` la tabla contiene ambos modelos. Esta consulta devolverá un nuevo `AggregateFunctionState` objeto.
-
-2.  El usuario puede obtener pesos del modelo creado para sus propios fines sin guardar el modelo si no `-State` combinador se utiliza.
-    `sql  SELECT stochasticLinearRegression(0.01)(target, param1, param2) FROM train_data`
-    Dicha consulta se ajustará al modelo y devolverá sus pesos: primero son los pesos, que corresponden a los parámetros del modelo, el último es el sesgo. Entonces, en el ejemplo anterior, la consulta devolverá una columna con 3 valores.
-
-**Ver también**
-
--   [stochasticLogisticRegression](#agg_functions-stochasticlogisticregression)
--   [Diferencia entre regresiones lineales y logísticas](https://stackoverflow.com/questions/12146914/what-is-the-difference-between-linear-regression-and-logistic-regression)
-
-## stochasticLogisticRegression {#agg_functions-stochasticlogisticregression}
-
-Esta función implementa la regresión logística estocástica. Se puede usar para problemas de clasificación binaria, admite los mismos parámetros personalizados que stochasticLinearRegression y funciona de la misma manera.
-
-### Parámetros {#agg_functions-stochasticlogisticregression-parameters}
-
-Los parámetros son exactamente los mismos que en stochasticLinearRegression:
-`learning rate`, `l2 regularization coefficient`, `mini-batch size`, `method for updating weights`.
-Para obtener más información, consulte [parámetros](#agg_functions-stochasticlinearregression-parameters).
-
-``` text
-stochasticLogisticRegression(1.0, 1.0, 10, 'SGD')
-```
-
-1.  Accesorio
-
-<!-- -->
-
-    See the `Fitting` section in the [stochasticLinearRegression](#stochasticlinearregression-usage-fitting) description.
-
-    Predicted labels have to be in \[-1, 1\].
-
-1.  Predecir
-
-<!-- -->
-
-    Using saved state we can predict probability of object having label `1`.
-
-    ``` sql
-    WITH (SELECT state FROM your_model) AS model SELECT
-    evalMLMethod(model, param1, param2) FROM test_data
-    ```
-
-    The query will return a column of probabilities. Note that first argument of `evalMLMethod` is `AggregateFunctionState` object, next are columns of features.
-
-    We can also set a bound of probability, which assigns elements to different labels.
-
-    ``` sql
-    SELECT ans < 1.1 AND ans > 0.5 FROM
-    (WITH (SELECT state FROM your_model) AS model SELECT
-    evalMLMethod(model, param1, param2) AS ans FROM test_data)
-    ```
-
-    Then the result will be labels.
-
-    `test_data` is a table like `train_data` but may not contain target value.
-
-**Ver también**
-
--   [stochasticLinearRegression](#agg_functions-stochasticlinearregression)
--   [Diferencia entre regresiones lineales y logísticas.](https://stackoverflow.com/questions/12146914/what-is-the-difference-between-linear-regression-and-logistic-regression)
-
-## Método de codificación de datos: {#groupbitmapand}
-
-Calcula el AND de una columna de mapa de bits, devuelve la cardinalidad del tipo UInt64, si agrega el sufijo -State, luego devuelve [objeto de mapa de bits](../../sql-reference/functions/bitmap-functions.md).
-
-``` sql
-groupBitmapAnd(expr)
-```
-
-**Parámetros**
-
-`expr` – An expression that results in `AggregateFunction(groupBitmap, UInt*)` tipo.
-
-**Valor de retorno**
-
-Valor de la `UInt64` tipo.
-
-**Ejemplo**
-
-``` sql
-DROP TABLE IF EXISTS bitmap_column_expr_test2;
-CREATE TABLE bitmap_column_expr_test2
-(
-    tag_id String,
-    z AggregateFunction(groupBitmap, UInt32)
-)
-ENGINE = MergeTree
-ORDER BY tag_id;
-
-INSERT INTO bitmap_column_expr_test2 VALUES ('tag1', bitmapBuild(cast([1,2,3,4,5,6,7,8,9,10] as Array(UInt32))));
-INSERT INTO bitmap_column_expr_test2 VALUES ('tag2', bitmapBuild(cast([6,7,8,9,10,11,12,13,14,15] as Array(UInt32))));
-INSERT INTO bitmap_column_expr_test2 VALUES ('tag3', bitmapBuild(cast([2,4,6,8,10,12] as Array(UInt32))));
-
-SELECT groupBitmapAnd(z) FROM bitmap_column_expr_test2 WHERE like(tag_id, 'tag%');
-┌─groupBitmapAnd(z)─┐
-│               3   │
-└───────────────────┘
-
-SELECT arraySort(bitmapToArray(groupBitmapAndState(z))) FROM bitmap_column_expr_test2 WHERE like(tag_id, 'tag%');
-┌─arraySort(bitmapToArray(groupBitmapAndState(z)))─┐
-│ [6,8,10]                                         │
-└──────────────────────────────────────────────────┘
-```
-
-## Método de codificación de datos: {#groupbitmapor}
-
-Calcula el OR de una columna de mapa de bits, devuelve la cardinalidad del tipo UInt64, si agrega el sufijo -State, luego devuelve [objeto de mapa de bits](../../sql-reference/functions/bitmap-functions.md). Esto es equivalente a `groupBitmapMerge`.
-
-``` sql
-groupBitmapOr(expr)
-```
-
-**Parámetros**
-
-`expr` – An expression that results in `AggregateFunction(groupBitmap, UInt*)` tipo.
-
-**Valor de retorno**
-
-Valor de la `UInt64` tipo.
-
-**Ejemplo**
-
-``` sql
-DROP TABLE IF EXISTS bitmap_column_expr_test2;
-CREATE TABLE bitmap_column_expr_test2
-(
-    tag_id String,
-    z AggregateFunction(groupBitmap, UInt32)
-)
-ENGINE = MergeTree
-ORDER BY tag_id;
-
-INSERT INTO bitmap_column_expr_test2 VALUES ('tag1', bitmapBuild(cast([1,2,3,4,5,6,7,8,9,10] as Array(UInt32))));
-INSERT INTO bitmap_column_expr_test2 VALUES ('tag2', bitmapBuild(cast([6,7,8,9,10,11,12,13,14,15] as Array(UInt32))));
-INSERT INTO bitmap_column_expr_test2 VALUES ('tag3', bitmapBuild(cast([2,4,6,8,10,12] as Array(UInt32))));
-
-SELECT groupBitmapOr(z) FROM bitmap_column_expr_test2 WHERE like(tag_id, 'tag%');
-┌─groupBitmapOr(z)─┐
-│             15   │
-└──────────────────┘
-
-SELECT arraySort(bitmapToArray(groupBitmapOrState(z))) FROM bitmap_column_expr_test2 WHERE like(tag_id, 'tag%');
-┌─arraySort(bitmapToArray(groupBitmapOrState(z)))─┐
-│ [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15]           │
-└─────────────────────────────────────────────────┘
-```
-
-## Método de codificación de datos: {#groupbitmapxor}
-
-Calcula el XOR de una columna de mapa de bits, devuelve la cardinalidad del tipo UInt64, si agrega el sufijo -State, luego devuelve [objeto de mapa de bits](../../sql-reference/functions/bitmap-functions.md).
-
-``` sql
-groupBitmapOr(expr)
-```
-
-**Parámetros**
-
-`expr` – An expression that results in `AggregateFunction(groupBitmap, UInt*)` tipo.
-
-**Valor de retorno**
-
-Valor de la `UInt64` tipo.
-
-**Ejemplo**
-
-``` sql
-DROP TABLE IF EXISTS bitmap_column_expr_test2;
-CREATE TABLE bitmap_column_expr_test2
-(
-    tag_id String,
-    z AggregateFunction(groupBitmap, UInt32)
-)
-ENGINE = MergeTree
-ORDER BY tag_id;
-
-INSERT INTO bitmap_column_expr_test2 VALUES ('tag1', bitmapBuild(cast([1,2,3,4,5,6,7,8,9,10] as Array(UInt32))));
-INSERT INTO bitmap_column_expr_test2 VALUES ('tag2', bitmapBuild(cast([6,7,8,9,10,11,12,13,14,15] as Array(UInt32))));
-INSERT INTO bitmap_column_expr_test2 VALUES ('tag3', bitmapBuild(cast([2,4,6,8,10,12] as Array(UInt32))));
-
-SELECT groupBitmapXor(z) FROM bitmap_column_expr_test2 WHERE like(tag_id, 'tag%');
-┌─groupBitmapXor(z)─┐
-│              10   │
-└───────────────────┘
-
-SELECT arraySort(bitmapToArray(groupBitmapXorState(z))) FROM bitmap_column_expr_test2 WHERE like(tag_id, 'tag%');
-┌─arraySort(bitmapToArray(groupBitmapXorState(z)))─┐
-│ [1,3,5,6,8,10,11,13,14,15]                       │
-└──────────────────────────────────────────────────┘
-```
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/agg_functions/reference/) <!--hide-->
diff --git a/docs/es/sql-reference/ansi.md b/docs/es/sql-reference/ansi.md
deleted file mode 100644
index 29e2c5b12e9..00000000000
--- a/docs/es/sql-reference/ansi.md
+++ /dev/null
@@ -1,180 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: ad252bbb4f7e2899c448eb42ecc39ff195c8faa1
-toc_priority: 40
-toc_title: Compatibilidad con ANSI
----
-
-# Compatibilidad de SQL ANSI de ClickHouse SQL Dialect {#ansi-sql-compatibility-of-clickhouse-sql-dialect}
-
-!!! note "Nota"
-    Este artículo se basa en la Tabla 38, “Feature taxonomy and definition for mandatory features”, Annex F of ISO/IEC CD 9075-2:2013.
-
-## Diferencias en el comportamiento {#differences-in-behaviour}
-
-En la tabla siguiente se enumeran los casos en que la característica de consulta funciona en ClickHouse, pero no se comporta como se especifica en ANSI SQL.
-
-| Feature ID | Nombre de la función                               | Diferencia                                                                                                                                 |
-|------------|----------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------|
-| E011       | Tipos de datos numéricos                           | El literal numérico con punto se interpreta como aproximado (`Float64`) en lugar de exacta (`Decimal`)                                     |
-| E051-05    | Los elementos seleccionados pueden ser renombrados | Los cambios de nombre de los elementos tienen un alcance de visibilidad más amplio que solo el resultado SELECT                            |
-| E141-01    | Restricciones NOT NULL                             | `NOT NULL` está implícito para las columnas de tabla de forma predeterminada                                                               |
-| E011-04    | Operadores aritméticos                             | ClickHouse se desborda en lugar de la aritmética comprobada y cambia el tipo de datos de resultado en función de las reglas personalizadas |
-
-## Estado de la función {#feature-status}
-
-| Feature ID | Nombre de la función                                                                                                                                    | Estatus                    | Comentario                                                                                                                                                                                                 |
-|------------|---------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| **E011**   | **Tipos de datos numéricos**                                                                                                                            | **Parcial**{.text-warning} |                                                                                                                                                                                                            |
-| E011-01    | Tipos de datos INTEGER y SMALLINT                                                                                                                       | Sí {.text-success}          |                                                                                                                                                                                                            |
-| E011-02    | REAL, DOUBLE PRECISION y FLOAT tipos de datos tipos de datos                                                                                            | Parcial {.text-warning}     | `FLOAT(<binary_precision>)`, `REAL` y `DOUBLE PRECISION` no son compatibles                                                                                                                                |
-| E011-03    | Tipos de datos DECIMAL y NUMERIC                                                                                                                        | Parcial {.text-warning}     | Solo `DECIMAL(p,s)` es compatible, no `NUMERIC`                                                                                                                                                            |
-| E011-04    | Operadores aritméticos                                                                                                                                  | Sí {.text-success}          |                                                                                                                                                                                                            |
-| E011-05    | Comparación numérica                                                                                                                                    | Sí {.text-success}          |                                                                                                                                                                                                            |
-| E011-06    | Conversión implícita entre los tipos de datos numéricos                                                                                                 | No {.text-danger}           | ANSI SQL permite la conversión implícita arbitraria entre tipos numéricos, mientras que ClickHouse se basa en funciones que tienen múltiples sobrecargas en lugar de conversión implícita                  |
-| **E021**   | **Tipos de cadena de caracteres**                                                                                                                       | **Parcial**{.text-warning} |                                                                                                                                                                                                            |
-| E021-01    | Tipo de datos CHARACTER                                                                                                                                 | No {.text-danger}           |                                                                                                                                                                                                            |
-| E021-02    | Tipo de datos CHARACTER VARYING                                                                                                                         | No {.text-danger}           | `String` se comporta de manera similar, pero sin límite de longitud entre paréntesis                                                                                                                       |
-| E021-03    | Literales de caracteres                                                                                                                                 | Parcial {.text-warning}     | Sin concatenación automática de literales consecutivos y compatibilidad con el conjunto de caracteres                                                                                                      |
-| E021-04    | Función CHARACTER_LENGTH                                                                                                                               | Parcial {.text-warning}     | No `USING` clausula                                                                                                                                                                                        |
-| E021-05    | Función OCTET_LENGTH                                                                                                                                   | No {.text-danger}           | `LENGTH` se comporta de manera similar                                                                                                                                                                     |
-| E021-06    | SUBSTRING                                                                                                                                               | Parcial {.text-warning}     | No hay soporte para `SIMILAR` y `ESCAPE` cláusulas, no `SUBSTRING_REGEX` variante                                                                                                                          |
-| E021-07    | Concatenación de caracteres                                                                                                                             | Parcial {.text-warning}     | No `COLLATE` clausula                                                                                                                                                                                      |
-| E021-08    | Funciones SUPERIOR e INFERIOR                                                                                                                           | Sí {.text-success}          |                                                                                                                                                                                                            |
-| E021-09    | Función TRIM                                                                                                                                            | Sí {.text-success}          |                                                                                                                                                                                                            |
-| E021-10    | Conversión implícita entre los tipos de cadena de caracteres de longitud fija y longitud variable                                                       | No {.text-danger}           | ANSI SQL permite la conversión implícita arbitraria entre tipos de cadena, mientras que ClickHouse se basa en funciones que tienen múltiples sobrecargas en lugar de conversión implícita                  |
-| E021-11    | Función POSITION                                                                                                                                        | Parcial {.text-warning}     | No hay soporte para `IN` y `USING` cláusulas, no `POSITION_REGEX` variante                                                                                                                                 |
-| E021-12    | Comparación de caracteres                                                                                                                               | Sí {.text-success}          |                                                                                                                                                                                                            |
-| **E031**   | **Identificador**                                                                                                                                       | **Parcial**{.text-warning} |                                                                                                                                                                                                            |
-| E031-01    | Identificadores delimitados                                                                                                                             | Parcial {.text-warning}     | El soporte literal Unicode es limitado                                                                                                                                                                     |
-| E031-02    | Identificadores de minúsculas                                                                                                                           | Sí {.text-success}          |                                                                                                                                                                                                            |
-| E031-03    | Trailing subrayado                                                                                                                                      | Sí {.text-success}          |                                                                                                                                                                                                            |
-| **E051**   | **Especificación básica de la consulta**                                                                                                                | **Parcial**{.text-warning} |                                                                                                                                                                                                            |
-| E051-01    | SELECT DISTINCT                                                                                                                                         | Sí {.text-success}          |                                                                                                                                                                                                            |
-| E051-02    | Cláusula GROUP BY                                                                                                                                       | Sí {.text-success}          |                                                                                                                                                                                                            |
-| E051-04    | GROUP BY puede contener columnas que no estén en `<select list>`                                                                                        | Sí {.text-success}          |                                                                                                                                                                                                            |
-| E051-05    | Los elementos seleccionados pueden ser renombrados                                                                                                      | Sí {.text-success}          |                                                                                                                                                                                                            |
-| E051-06    | Cláusula HAVING                                                                                                                                         | Sí {.text-success}          |                                                                                                                                                                                                            |
-| E051-07    | Calificado \* en la lista de selección                                                                                                                  | Sí {.text-success}          |                                                                                                                                                                                                            |
-| E051-08    | Nombre de correlación en la cláusula FROM                                                                                                               | Sí {.text-success}          |                                                                                                                                                                                                            |
-| E051-09    | Cambiar el nombre de las columnas en la cláusula FROM                                                                                                   | No {.text-danger}           |                                                                                                                                                                                                            |
-| **E061**   | **Predicados básicos y condiciones de búsqueda**                                                                                                        | **Parcial**{.text-warning} |                                                                                                                                                                                                            |
-| E061-01    | Predicado de comparación                                                                                                                                | Sí {.text-success}          |                                                                                                                                                                                                            |
-| E061-02    | ENTRE predicado                                                                                                                                         | Parcial {.text-warning}     | No `SYMMETRIC` y `ASYMMETRIC` clausula                                                                                                                                                                     |
-| E061-03    | Predicado IN con lista de valores                                                                                                                       | Sí {.text-success}          |                                                                                                                                                                                                            |
-| E061-04    | COMO predicado                                                                                                                                          | Sí {.text-success}          |                                                                                                                                                                                                            |
-| E061-05    | Predicado LIKE: cláusula ESCAPE                                                                                                                         | No {.text-danger}           |                                                                                                                                                                                                            |
-| E061-06    | Predicado NULL                                                                                                                                          | Sí {.text-success}          |                                                                                                                                                                                                            |
-| E061-07    | Predicado de comparación cuantificado                                                                                                                   | No {.text-danger}           |                                                                                                                                                                                                            |
-| E061-08    | Predicado EXISTS                                                                                                                                        | No {.text-danger}           |                                                                                                                                                                                                            |
-| E061-09    | Subconsultas en predicado de comparación                                                                                                                | Sí {.text-success}          |                                                                                                                                                                                                            |
-| E061-11    | Subconsultas en el predicado IN                                                                                                                         | Sí {.text-success}          |                                                                                                                                                                                                            |
-| E061-12    | Subconsultas en predicado de comparación cuantificado                                                                                                   | No {.text-danger}           |                                                                                                                                                                                                            |
-| E061-13    | Subconsultas correlacionadas                                                                                                                            | No {.text-danger}           |                                                                                                                                                                                                            |
-| E061-14    | Condición de búsqueda                                                                                                                                   | Sí {.text-success}          |                                                                                                                                                                                                            |
-| **E071**   | **Expresiones de consulta básicas**                                                                                                                     | **Parcial**{.text-warning} |                                                                                                                                                                                                            |
-| E071-01    | Operador de tabla UNION DISTINCT                                                                                                                        | No {.text-danger}           |                                                                                                                                                                                                            |
-| E071-02    | Operador de tabla UNION ALL                                                                                                                             | Sí {.text-success}          |                                                                                                                                                                                                            |
-| E071-03    | EXCEPTO operador de tabla DISTINCT                                                                                                                      | No {.text-danger}           |                                                                                                                                                                                                            |
-| E071-05    | Las columnas combinadas a través de operadores de tabla no necesitan tener exactamente el mismo tipo de datos                                           | Sí {.text-success}          |                                                                                                                                                                                                            |
-| E071-06    | Operadores de tabla en subconsultas                                                                                                                     | Sí {.text-success}          |                                                                                                                                                                                                            |
-| **E081**   | **Privilegios básicos**                                                                                                                                 | **Parcial**{.text-warning} | Trabajo en curso                                                                                                                                                                                           |
-| **E091**   | **Establecer funciones**                                                                                                                                | **Sí**{.text-success}      |                                                                                                                                                                                                            |
-| E091-01    | AVG                                                                                                                                                     | Sí {.text-success}          |                                                                                                                                                                                                            |
-| E091-02    | COUNT                                                                                                                                                   | Sí {.text-success}          |                                                                                                                                                                                                            |
-| E091-03    | MAX                                                                                                                                                     | Sí {.text-success}          |                                                                                                                                                                                                            |
-| E091-04    | MIN                                                                                                                                                     | Sí {.text-success}          |                                                                                                                                                                                                            |
-| E091-05    | SUM                                                                                                                                                     | Sí {.text-success}          |                                                                                                                                                                                                            |
-| E091-06    | Cuantificador ALL                                                                                                                                       | No {.text-danger}           |                                                                                                                                                                                                            |
-| E091-07    | Cuantificador DISTINCT                                                                                                                                  | Parcial {.text-warning}     | No se admiten todas las funciones agregadas                                                                                                                                                                |
-| **E101**   | **Manipulación de datos básicos**                                                                                                                       | **Parcial**{.text-warning} |                                                                                                                                                                                                            |
-| E101-01    | Instrucción INSERT                                                                                                                                      | Sí {.text-success}          | Nota: la clave principal en ClickHouse no implica el `UNIQUE` limitación                                                                                                                                   |
-| E101-03    | Instrucción UPDATE buscada                                                                                                                              | No {.text-danger}           | Hay una `ALTER UPDATE` declaración para la modificación de datos por lotes                                                                                                                                 |
-| E101-04    | Instrucción DELETE buscada                                                                                                                              | No {.text-danger}           | Hay una `ALTER DELETE` declaración para la eliminación de datos por lotes                                                                                                                                  |
-| **E111**   | **Instrucción SELECT de una sola fila**                                                                                                                 | **No**{.text-danger}       |                                                                                                                                                                                                            |
-| **E121**   | **Soporte básico del cursor**                                                                                                                           | **No**{.text-danger}       |                                                                                                                                                                                                            |
-| E121-01    | DECLARE CURSOR                                                                                                                                          | No {.text-danger}           |                                                                                                                                                                                                            |
-| E121-02    | Las columnas PEDIR POR no necesitan estar en la lista de selección                                                                                      | No {.text-danger}           |                                                                                                                                                                                                            |
-| E121-03    | Expresiones de valor en la cláusula ORDER BY                                                                                                            | No {.text-danger}           |                                                                                                                                                                                                            |
-| E121-04    | Declaración ABIERTA                                                                                                                                     | No {.text-danger}           |                                                                                                                                                                                                            |
-| E121-06    | Instrucción UPDATE posicionada                                                                                                                          | No {.text-danger}           |                                                                                                                                                                                                            |
-| E121-07    | Instrucción DELETE posicionada                                                                                                                          | No {.text-danger}           |                                                                                                                                                                                                            |
-| E121-08    | Declaración CERRAR                                                                                                                                      | No {.text-danger}           |                                                                                                                                                                                                            |
-| E121-10    | Declaración FETCH: implícita NEXT                                                                                                                       | No {.text-danger}           |                                                                                                                                                                                                            |
-| E121-17    | CON Cursores HOLD                                                                                                                                       | No {.text-danger}           |                                                                                                                                                                                                            |
-| **E131**   | **Soporte de valor nulo (nulos en lugar de valores)**                                                                                                   | **Parcial**{.text-warning} | Se aplican algunas restricciones                                                                                                                                                                           |
-| **E141**   | **Restricciones de integridad básicas**                                                                                                                 | **Parcial**{.text-warning} |                                                                                                                                                                                                            |
-| E141-01    | Restricciones NOT NULL                                                                                                                                  | Sí {.text-success}          | Nota: `NOT NULL` está implícito para las columnas de tabla de forma predeterminada                                                                                                                         |
-| E141-02    | Restricción UNIQUE de columnas NOT NULL                                                                                                                 | No {.text-danger}           |                                                                                                                                                                                                            |
-| E141-03    | Restricciones PRIMARY KEY                                                                                                                               | No {.text-danger}           |                                                                                                                                                                                                            |
-| E141-04    | Restricción básica FOREIGN KEY con el valor predeterminado NO ACTION para la acción de eliminación referencial y la acción de actualización referencial | No {.text-danger}           |                                                                                                                                                                                                            |
-| E141-06    | Restricción CHECK                                                                                                                                       | Sí {.text-success}          |                                                                                                                                                                                                            |
-| E141-07    | Valores predeterminados de columna                                                                                                                      | Sí {.text-success}          |                                                                                                                                                                                                            |
-| E141-08    | NO NULL inferido en CLAVE PRIMARIA                                                                                                                      | Sí {.text-success}          |                                                                                                                                                                                                            |
-| E141-10    | Los nombres de una clave externa se pueden especificar en cualquier orden                                                                               | No {.text-danger}           |                                                                                                                                                                                                            |
-| **E151**   | **Soporte de transacciones**                                                                                                                            | **No**{.text-danger}       |                                                                                                                                                                                                            |
-| E151-01    | Declaración COMMIT                                                                                                                                      | No {.text-danger}           |                                                                                                                                                                                                            |
-| E151-02    | Instrucción ROLLBACK                                                                                                                                    | No {.text-danger}           |                                                                                                                                                                                                            |
-| **E152**   | **Instrucción SET TRANSACTION básica**                                                                                                                  | **No**{.text-danger}       |                                                                                                                                                                                                            |
-| E152-01    | Instrucción SET TRANSACTION: cláusula ISOLATION LEVEL SERIALIZABLE                                                                                      | No {.text-danger}           |                                                                                                                                                                                                            |
-| E152-02    | Instrucción SET TRANSACTION: cláusulas READ ONLY y READ WRITE                                                                                           | No {.text-danger}           |                                                                                                                                                                                                            |
-| **E153**   | **Consultas actualizables con subconsultas**                                                                                                            | **No**{.text-danger}       |                                                                                                                                                                                                            |
-| **E161**   | **Comentarios SQL usando doble menos inicial**                                                                                                          | **Sí**{.text-success}      |                                                                                                                                                                                                            |
-| **E171**   | **Soporte SQLSTATE**                                                                                                                                    | **No**{.text-danger}       |                                                                                                                                                                                                            |
-| **E182**   | **Enlace de idioma de host**                                                                                                                            | **No**{.text-danger}       |                                                                                                                                                                                                            |
-| **F031**   | **Manipulación básica del esquema**                                                                                                                     | **Parcial**{.text-warning} |                                                                                                                                                                                                            |
-| F031-01    | Instrucción CREATE TABLE para crear tablas base persistentes                                                                                            | Parcial {.text-warning}     | No `SYSTEM VERSIONING`, `ON COMMIT`, `GLOBAL`, `LOCAL`, `PRESERVE`, `DELETE`, `REF IS`, `WITH OPTIONS`, `UNDER`, `LIKE`, `PERIOD FOR` cláusulas y sin soporte para tipos de datos resueltos por el usuario |
-| F031-02    | Instrucción CREATE VIEW                                                                                                                                 | Parcial {.text-warning}     | No `RECURSIVE`, `CHECK`, `UNDER`, `WITH OPTIONS` cláusulas y sin soporte para tipos de datos resueltos por el usuario                                                                                      |
-| F031-03    | Declaración GRANT                                                                                                                                       | Sí {.text-success}          |                                                                                                                                                                                                            |
-| F031-04    | Sentencia ALTER TABLE: cláusula ADD COLUMN                                                                                                              | Parcial {.text-warning}     | No hay soporte para `GENERATED` cláusula y período de tiempo del sistema                                                                                                                                   |
-| F031-13    | Instrucción DROP TABLE: cláusula RESTRICT                                                                                                               | No {.text-danger}           |                                                                                                                                                                                                            |
-| F031-16    | Instrucción DROP VIEW: cláusula RESTRICT                                                                                                                | No {.text-danger}           |                                                                                                                                                                                                            |
-| F031-19    | Declaración REVOKE: cláusula RESTRICT                                                                                                                   | No {.text-danger}           |                                                                                                                                                                                                            |
-| **F041**   | **Tabla unida básica**                                                                                                                                  | **Parcial**{.text-warning} |                                                                                                                                                                                                            |
-| F041-01    | Unión interna (pero no necesariamente la palabra clave INNER)                                                                                           | Sí {.text-success}          |                                                                                                                                                                                                            |
-| F041-02    | Palabra clave INTERNA                                                                                                                                   | Sí {.text-success}          |                                                                                                                                                                                                            |
-| F041-03    | LEFT OUTER JOIN                                                                                                                                         | Sí {.text-success}          |                                                                                                                                                                                                            |
-| F041-04    | RIGHT OUTER JOIN                                                                                                                                        | Sí {.text-success}          |                                                                                                                                                                                                            |
-| F041-05    | Las uniones externas se pueden anidar                                                                                                                   | Sí {.text-success}          |                                                                                                                                                                                                            |
-| F041-07    | La tabla interna en una combinación externa izquierda o derecha también se puede usar en una combinación interna                                        | Sí {.text-success}          |                                                                                                                                                                                                            |
-| F041-08    | Todos los operadores de comparación son compatibles (en lugar de solo =)                                                                                | No {.text-danger}           |                                                                                                                                                                                                            |
-| **F051**   | **Fecha y hora básicas**                                                                                                                                | **Parcial**{.text-warning} |                                                                                                                                                                                                            |
-| F051-01    | Tipo de datos DATE (incluido el soporte del literal DATE)                                                                                               | Parcial {.text-warning}     | No literal                                                                                                                                                                                                 |
-| F051-02    | Tipo de datos TIME (incluido el soporte del literal TIME) con una precisión de segundos fraccionarios de al menos 0                                     | No {.text-danger}           |                                                                                                                                                                                                            |
-| F051-03    | Tipo de datos TIMESTAMP (incluido el soporte del literal TIMESTAMP) con una precisión de segundos fraccionarios de al menos 0 y 6                       | No {.text-danger}           | `DateTime64` tiempo proporciona una funcionalidad similar                                                                                                                                                  |
-| F051-04    | Predicado de comparación en los tipos de datos DATE, TIME y TIMESTAMP                                                                                   | Parcial {.text-warning}     | Sólo un tipo de datos disponible                                                                                                                                                                           |
-| F051-05    | CAST explícito entre tipos de fecha y hora y tipos de cadena de caracteres                                                                              | Sí {.text-success}          |                                                                                                                                                                                                            |
-| F051-06    | CURRENT_DATE                                                                                                                                           | No {.text-danger}           | `today()` es similar                                                                                                                                                                                       |
-| F051-07    | LOCALTIME                                                                                                                                               | No {.text-danger}           | `now()` es similar                                                                                                                                                                                         |
-| F051-08    | LOCALTIMESTAMP                                                                                                                                          | No {.text-danger}           |                                                                                                                                                                                                            |
-| **F081**   | **UNIÓN y EXCEPTO en vistas**                                                                                                                           | **Parcial**{.text-warning} |                                                                                                                                                                                                            |
-| **F131**   | **Operaciones agrupadas**                                                                                                                               | **Parcial**{.text-warning} |                                                                                                                                                                                                            |
-| F131-01    | Cláusulas WHERE, GROUP BY y HAVING admitidas en consultas con vistas agrupadas                                                                          | Sí {.text-success}          |                                                                                                                                                                                                            |
-| F131-02    | Múltiples tablas admitidas en consultas con vistas agrupadas                                                                                            | Sí {.text-success}          |                                                                                                                                                                                                            |
-| F131-03    | Establecer funciones admitidas en consultas con vistas agrupadas                                                                                        | Sí {.text-success}          |                                                                                                                                                                                                            |
-| F131-04    | Subconsultas con cláusulas GROUP BY y HAVING y vistas agrupadas                                                                                         | Sí {.text-success}          |                                                                                                                                                                                                            |
-| F131-05    | SELECCIONAR una sola fila con cláusulas GROUP BY y HAVING y vistas agrupadas                                                                            | No {.text-danger}           |                                                                                                                                                                                                            |
-| **F181**   | **Múltiples módulos de apoyo**                                                                                                                          | **No**{.text-danger}       |                                                                                                                                                                                                            |
-| **F201**   | **Función de fundición**                                                                                                                                | **Sí**{.text-success}      |                                                                                                                                                                                                            |
-| **F221**   | **Valores predeterminados explícitos**                                                                                                                  | **No**{.text-danger}       |                                                                                                                                                                                                            |
-| **F261**   | **Expresión CASE**                                                                                                                                      | **Sí**{.text-success}      |                                                                                                                                                                                                            |
-| F261-01    | Caso simple                                                                                                                                             | Sí {.text-success}          |                                                                                                                                                                                                            |
-| F261-02    | CASO buscado                                                                                                                                            | Sí {.text-success}          |                                                                                                                                                                                                            |
-| F261-03    | NULLIF                                                                                                                                                  | Sí {.text-success}          |                                                                                                                                                                                                            |
-| F261-04    | COALESCE                                                                                                                                                | Sí {.text-success}          |                                                                                                                                                                                                            |
-| **F311**   | **Instrucción de definición de esquema**                                                                                                                | **Parcial**{.text-warning} |                                                                                                                                                                                                            |
-| F311-01    | CREATE SCHEMA                                                                                                                                           | No {.text-danger}           |                                                                                                                                                                                                            |
-| F311-02    | CREATE TABLE para tablas base persistentes                                                                                                              | Sí {.text-success}          |                                                                                                                                                                                                            |
-| F311-03    | CREATE VIEW                                                                                                                                             | Sí {.text-success}          |                                                                                                                                                                                                            |
-| F311-04    | CREATE VIEW: WITH CHECK OPTION                                                                                                                          | No {.text-danger}           |                                                                                                                                                                                                            |
-| F311-05    | Declaración GRANT                                                                                                                                       | Sí {.text-success}          |                                                                                                                                                                                                            |
-| **F471**   | **Valores escalares de la subconsulta**                                                                                                                 | **Sí**{.text-success}      |                                                                                                                                                                                                            |
-| **F481**   | **Predicado NULL expandido**                                                                                                                            | **Sí**{.text-success}      |                                                                                                                                                                                                            |
-| **F812**   | **Marcado básico**                                                                                                                                      | **No**{.text-danger}       |                                                                                                                                                                                                            |
-| **T321**   | **Rutinas básicas invocadas por SQL**                                                                                                                   | **No**{.text-danger}       |                                                                                                                                                                                                            |
-| T321-01    | Funciones definidas por el usuario sin sobrecarga                                                                                                       | No {.text-danger}           |                                                                                                                                                                                                            |
-| T321-02    | Procedimientos almacenados definidos por el usuario sin sobrecarga                                                                                      | No {.text-danger}           |                                                                                                                                                                                                            |
-| T321-03    | Invocación de función                                                                                                                                   | No {.text-danger}           |                                                                                                                                                                                                            |
-| T321-04    | Declaración de LLAMADA                                                                                                                                  | No {.text-danger}           |                                                                                                                                                                                                            |
-| T321-05    | Declaración DEVOLUCIÓN                                                                                                                                  | No {.text-danger}           |                                                                                                                                                                                                            |
-| **T631**   | **Predicado IN con un elemento de lista**                                                                                                               | **Sí**{.text-success}      |                                                                                                                                                                                                            |
diff --git a/docs/es/sql-reference/data-types/aggregatefunction.md b/docs/es/sql-reference/data-types/aggregatefunction.md
deleted file mode 100644
index c7eab28c6ce..00000000000
--- a/docs/es/sql-reference/data-types/aggregatefunction.md
+++ /dev/null
@@ -1,70 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 52
-toc_title: "Agregar funci\xF3n (nombre, types_of_arguments)...)"
----
-
-# AggregateFunction(name, types_of_arguments…) {#data-type-aggregatefunction}
-
-Aggregate functions can have an implementation-defined intermediate state that can be serialized to an AggregateFunction(…) data type and stored in a table, usually, by means of [una vista materializada](../../sql-reference/statements/create.md#create-view). La forma común de producir un estado de función agregada es llamando a la función agregada con el `-State` sufijo. Para obtener el resultado final de la agregación en el futuro, debe utilizar la misma función de agregado con el `-Merge`sufijo.
-
-`AggregateFunction` — parametric data type.
-
-**Parámetros**
-
--   Nombre de la función de agregado.
-
-        If the function is parametric, specify its parameters too.
-
--   Tipos de los argumentos de la función agregada.
-
-**Ejemplo**
-
-``` sql
-CREATE TABLE t
-(
-    column1 AggregateFunction(uniq, UInt64),
-    column2 AggregateFunction(anyIf, String, UInt8),
-    column3 AggregateFunction(quantiles(0.5, 0.9), UInt64)
-) ENGINE = ...
-```
-
-[uniq](../../sql-reference/aggregate-functions/reference.md#agg_function-uniq), anyIf ([cualquier](../../sql-reference/aggregate-functions/reference.md#agg_function-any)+[Si](../../sql-reference/aggregate-functions/combinators.md#agg-functions-combinator-if)) y [cantiles](../../sql-reference/aggregate-functions/reference.md) son las funciones agregadas admitidas en ClickHouse.
-
-## Uso {#usage}
-
-### Inserción de datos {#data-insertion}
-
-Para insertar datos, utilice `INSERT SELECT` con agregado `-State`- función.
-
-**Ejemplos de funciones**
-
-``` sql
-uniqState(UserID)
-quantilesState(0.5, 0.9)(SendTiming)
-```
-
-En contraste con las funciones correspondientes `uniq` y `quantiles`, `-State`- funciones devuelven el estado, en lugar del valor final. En otras palabras, devuelven un valor de `AggregateFunction` tipo.
-
-En los resultados de `SELECT` consulta, los valores de `AggregateFunction` tipo tiene representación binaria específica de la implementación para todos los formatos de salida de ClickHouse. Si volcar datos en, por ejemplo, `TabSeparated` formato con `SELECT` consulta, entonces este volcado se puede cargar de nuevo usando `INSERT` consulta.
-
-### Selección de datos {#data-selection}
-
-Al seleccionar datos de `AggregatingMergeTree` mesa, uso `GROUP BY` cláusula y las mismas funciones agregadas que al insertar datos, pero usando `-Merge`sufijo.
-
-Una función agregada con `-Merge` sufijo toma un conjunto de estados, los combina y devuelve el resultado de la agregación de datos completa.
-
-Por ejemplo, las siguientes dos consultas devuelven el mismo resultado:
-
-``` sql
-SELECT uniq(UserID) FROM table
-
-SELECT uniqMerge(state) FROM (SELECT uniqState(UserID) AS state FROM table GROUP BY RegionID)
-```
-
-## Ejemplo de uso {#usage-example}
-
-Ver [AgregaciónMergeTree](../../engines/table-engines/mergetree-family/aggregatingmergetree.md) Descripción del motor.
-
-[Artículo Original](https://clickhouse.tech/docs/en/data_types/nested_data_structures/aggregatefunction/) <!--hide-->
diff --git a/docs/es/sql-reference/data-types/array.md b/docs/es/sql-reference/data-types/array.md
deleted file mode 100644
index d100361906e..00000000000
--- a/docs/es/sql-reference/data-types/array.md
+++ /dev/null
@@ -1,77 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 51
-toc_title: Matriz (T)
----
-
-# Matriz (t) {#data-type-array}
-
-Una matriz de `T`-tipo de artículos. `T` puede ser cualquier tipo de datos, incluida una matriz.
-
-## Creación de una matriz {#creating-an-array}
-
-Puede usar una función para crear una matriz:
-
-``` sql
-array(T)
-```
-
-También puede usar corchetes.
-
-``` sql
-[]
-```
-
-Ejemplo de creación de una matriz:
-
-``` sql
-SELECT array(1, 2) AS x, toTypeName(x)
-```
-
-``` text
-┌─x─────┬─toTypeName(array(1, 2))─┐
-│ [1,2] │ Array(UInt8)            │
-└───────┴─────────────────────────┘
-```
-
-``` sql
-SELECT [1, 2] AS x, toTypeName(x)
-```
-
-``` text
-┌─x─────┬─toTypeName([1, 2])─┐
-│ [1,2] │ Array(UInt8)       │
-└───────┴────────────────────┘
-```
-
-## Trabajar con tipos de datos {#working-with-data-types}
-
-Al crear una matriz sobre la marcha, ClickHouse define automáticamente el tipo de argumento como el tipo de datos más estrecho que puede almacenar todos los argumentos enumerados. Si hay alguna [NULL](nullable.md#data_type-nullable) o literal [NULL](../../sql-reference/syntax.md#null-literal) valores, el tipo de un elemento de matriz también se convierte en [NULL](nullable.md).
-
-Si ClickHouse no pudo determinar el tipo de datos, genera una excepción. Por ejemplo, esto sucede cuando se intenta crear una matriz con cadenas y números simultáneamente (`SELECT array(1, 'a')`).
-
-Ejemplos de detección automática de tipos de datos:
-
-``` sql
-SELECT array(1, 2, NULL) AS x, toTypeName(x)
-```
-
-``` text
-┌─x──────────┬─toTypeName(array(1, 2, NULL))─┐
-│ [1,2,NULL] │ Array(Nullable(UInt8))        │
-└────────────┴───────────────────────────────┘
-```
-
-Si intenta crear una matriz de tipos de datos incompatibles, ClickHouse produce una excepción:
-
-``` sql
-SELECT array(1, 'a')
-```
-
-``` text
-Received exception from server (version 1.1.54388):
-Code: 386. DB::Exception: Received from localhost:9000, 127.0.0.1. DB::Exception: There is no supertype for types UInt8, String because some of them are String/FixedString and some of them are not.
-```
-
-[Artículo Original](https://clickhouse.tech/docs/en/data_types/array/) <!--hide-->
diff --git a/docs/es/sql-reference/data-types/boolean.md b/docs/es/sql-reference/data-types/boolean.md
deleted file mode 100644
index 09a05c7369d..00000000000
--- a/docs/es/sql-reference/data-types/boolean.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 43
-toc_title: Booleana
----
-
-# Valores booleanos {#boolean-values}
-
-No hay un tipo separado para los valores booleanos. Utilice el tipo UInt8, restringido a los valores 0 o 1.
-
-[Artículo Original](https://clickhouse.tech/docs/en/data_types/boolean/) <!--hide-->
diff --git a/docs/es/sql-reference/data-types/date.md b/docs/es/sql-reference/data-types/date.md
deleted file mode 100644
index 71828fd8276..00000000000
--- a/docs/es/sql-reference/data-types/date.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 47
-toc_title: Fecha
----
-
-# Fecha {#date}
-
-Fecha. Almacenado en dos bytes como el número de días desde 1970-01-01 (sin signo). Permite almacenar valores desde justo después del comienzo de la Época Unix hasta el umbral superior definido por una constante en la etapa de compilación (actualmente, esto es hasta el año 2106, pero el último año totalmente soportado es 2105).
-
-El valor de fecha se almacena sin la zona horaria.
-
-[Artículo Original](https://clickhouse.tech/docs/en/data_types/date/) <!--hide-->
diff --git a/docs/es/sql-reference/data-types/datetime.md b/docs/es/sql-reference/data-types/datetime.md
deleted file mode 100644
index 0163da2002a..00000000000
--- a/docs/es/sql-reference/data-types/datetime.md
+++ /dev/null
@@ -1,129 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 48
-toc_title: FechaHora
----
-
-# Datetime {#data_type-datetime}
-
-Permite almacenar un instante en el tiempo, que se puede expresar como una fecha del calendario y una hora de un día.
-
-Sintaxis:
-
-``` sql
-DateTime([timezone])
-```
-
-Rango de valores: \[1970-01-01 00:00:00, 2105-12-31 23:59:59\].
-
-Resolución: 1 segundo.
-
-## Observaciones de uso {#usage-remarks}
-
-El punto en el tiempo se guarda como un [Timestamp de Unix](https://en.wikipedia.org/wiki/Unix_time), independientemente de la zona horaria o el horario de verano. Además, el `DateTime` tipo puede almacenar zona horaria que es la misma para toda la columna, que afecta a cómo los valores de la `DateTime` Los valores de tipo se muestran en formato de texto y cómo se analizan los valores especificados como cadenas (‘2020-01-01 05:00:01’). La zona horaria no se almacena en las filas de la tabla (o en el conjunto de resultados), sino que se almacena en los metadatos de la columna.
-Se puede encontrar una lista de zonas horarias compatibles en el [Base de datos de zonas horarias de IANA](https://www.iana.org/time-zones).
-El `tzdata` paquete, que contiene [Base de datos de zonas horarias de IANA](https://www.iana.org/time-zones), debe instalarse en el sistema. Utilice el `timedatectl list-timezones` comando para listar zonas horarias conocidas por un sistema local.
-
-Puede establecer explícitamente una zona horaria para `DateTime`-type columnas al crear una tabla. Si la zona horaria no está establecida, ClickHouse usa el valor [Zona horaria](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone) parámetro en la configuración del servidor o la configuración del sistema operativo en el momento del inicio del servidor ClickHouse.
-
-El [Casa de clics-cliente](../../interfaces/cli.md) aplica la zona horaria del servidor de forma predeterminada si una zona horaria no se establece explícitamente al inicializar el tipo de datos. Para utilizar la zona horaria del cliente, ejecute `clickhouse-client` con el `--use_client_time_zone` parámetro.
-
-ClickHouse genera valores en `YYYY-MM-DD hh:mm:ss` formato de texto por defecto. Puede cambiar la salida con el [formatDateTime](../../sql-reference/functions/date-time-functions.md#formatdatetime) función.
-
-Al insertar datos en ClickHouse, puede usar diferentes formatos de cadenas de fecha y hora, dependiendo del valor de la [Date_time_input_format](../../operations/settings/settings.md#settings-date_time_input_format) configuración.
-
-## Ejemplos {#examples}
-
-**1.** Creación de una tabla con un `DateTime`-tipo de columna e insertar datos en ella:
-
-``` sql
-CREATE TABLE dt
-(
-    `timestamp` DateTime('Europe/Moscow'),
-    `event_id` UInt8
-)
-ENGINE = TinyLog;
-```
-
-``` sql
-INSERT INTO dt Values (1546300800, 1), ('2019-01-01 00:00:00', 2);
-```
-
-``` sql
-SELECT * FROM dt;
-```
-
-``` text
-┌───────────timestamp─┬─event_id─┐
-│ 2019-01-01 03:00:00 │        1 │
-│ 2019-01-01 00:00:00 │        2 │
-└─────────────────────┴──────────┘
-```
-
--   Al insertar datetime como un entero, se trata como Unix Timestamp (UTC). `1546300800` representar `'2019-01-01 00:00:00'` UTC. Sin embargo, como `timestamp` columna tiene `Europe/Moscow` (UTC + 3) zona horaria especificada, al emitir como cadena, el valor se mostrará como `'2019-01-01 03:00:00'`
--   Al insertar el valor de cadena como fecha y hora, se trata como si estuviera en la zona horaria de la columna. `'2019-01-01 00:00:00'` será tratado como estar en `Europe/Moscow` zona horaria y guardado como `1546290000`.
-
-**2.** Filtrado en `DateTime` valor
-
-``` sql
-SELECT * FROM dt WHERE timestamp = toDateTime('2019-01-01 00:00:00', 'Europe/Moscow')
-```
-
-``` text
-┌───────────timestamp─┬─event_id─┐
-│ 2019-01-01 00:00:00 │        2 │
-└─────────────────────┴──────────┘
-```
-
-`DateTime` se pueden filtrar usando un valor de cadena en `WHERE` predicado. Se convertirá a `DateTime` automática:
-
-``` sql
-SELECT * FROM dt WHERE timestamp = '2019-01-01 00:00:00'
-```
-
-``` text
-┌───────────timestamp─┬─event_id─┐
-│ 2019-01-01 03:00:00 │        1 │
-└─────────────────────┴──────────┘
-```
-
-**3.** Obtener una zona horaria para un `DateTime`-tipo columna:
-
-``` sql
-SELECT toDateTime(now(), 'Europe/Moscow') AS column, toTypeName(column) AS x
-```
-
-``` text
-┌──────────────column─┬─x─────────────────────────┐
-│ 2019-10-16 04:12:04 │ DateTime('Europe/Moscow') │
-└─────────────────────┴───────────────────────────┘
-```
-
-**4.** Conversión de zona horaria
-
-``` sql
-SELECT
-toDateTime(timestamp, 'Europe/London') as lon_time,
-toDateTime(timestamp, 'Europe/Moscow') as mos_time
-FROM dt
-```
-
-``` text
-┌───────────lon_time──┬────────────mos_time─┐
-│ 2019-01-01 00:00:00 │ 2019-01-01 03:00:00 │
-│ 2018-12-31 21:00:00 │ 2019-01-01 00:00:00 │
-└─────────────────────┴─────────────────────┘
-```
-
-## Ver también {#see-also}
-
--   [Funciones de conversión de tipos](../../sql-reference/functions/type-conversion-functions.md)
--   [Funciones para trabajar con fechas y horas](../../sql-reference/functions/date-time-functions.md)
--   [Funciones para trabajar con matrices](../../sql-reference/functions/array-functions.md)
--   [El `date_time_input_format` configuración](../../operations/settings/settings.md#settings-date_time_input_format)
--   [El `timezone` parámetro de configuración del servidor](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone)
--   [Operadores para trabajar con fechas y horas](../../sql-reference/operators/index.md#operators-datetime)
--   [El `Date` tipo de datos](date.md)
-
-[Artículo Original](https://clickhouse.tech/docs/en/data_types/datetime/) <!--hide-->
diff --git a/docs/es/sql-reference/data-types/datetime64.md b/docs/es/sql-reference/data-types/datetime64.md
deleted file mode 100644
index 19ae28bf4f8..00000000000
--- a/docs/es/sql-reference/data-types/datetime64.md
+++ /dev/null
@@ -1,104 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 49
-toc_title: DateTime64
----
-
-# Datetime64 {#data_type-datetime64}
-
-Permite almacenar un instante en el tiempo, que se puede expresar como una fecha de calendario y una hora de un día, con una precisión de subsegundo definida
-
-Tamaño de la marca (precisión): 10<sup>-Precision</sup> segundo
-
-Sintaxis:
-
-``` sql
-DateTime64(precision, [timezone])
-```
-
-Internamente, almacena datos como un número de ‘ticks’ desde el inicio de la época (1970-01-01 00:00:00 UTC) como Int64. La resolución de tick está determinada por el parámetro precision. Además, el `DateTime64` tipo puede almacenar zona horaria que es la misma para toda la columna, que afecta a cómo los valores de la `DateTime64` Los valores de tipo se muestran en formato de texto y cómo se analizan los valores especificados como cadenas (‘2020-01-01 05:00:01.000’). La zona horaria no se almacena en las filas de la tabla (o en el conjunto de resultados), sino que se almacena en los metadatos de la columna. Ver detalles en [FechaHora](datetime.md).
-
-## Ejemplos {#examples}
-
-**1.** Creación de una tabla con `DateTime64`-tipo de columna e insertar datos en ella:
-
-``` sql
-CREATE TABLE dt
-(
-    `timestamp` DateTime64(3, 'Europe/Moscow'),
-    `event_id` UInt8
-)
-ENGINE = TinyLog
-```
-
-``` sql
-INSERT INTO dt Values (1546300800000, 1), ('2019-01-01 00:00:00', 2)
-```
-
-``` sql
-SELECT * FROM dt
-```
-
-``` text
-┌───────────────timestamp─┬─event_id─┐
-│ 2019-01-01 03:00:00.000 │        1 │
-│ 2019-01-01 00:00:00.000 │        2 │
-└─────────────────────────┴──────────┘
-```
-
--   Al insertar datetime como un entero, se trata como una marca de tiempo Unix (UTC) apropiadamente escalada. `1546300800000` (con precisión 3) representa `'2019-01-01 00:00:00'` UTC. Sin embargo, como `timestamp` columna tiene `Europe/Moscow` (UTC + 3) zona horaria especificada, al emitir como una cadena, el valor se mostrará como `'2019-01-01 03:00:00'`
--   Al insertar el valor de cadena como fecha y hora, se trata como si estuviera en la zona horaria de la columna. `'2019-01-01 00:00:00'` será tratado como estar en `Europe/Moscow` zona horaria y se almacena como `1546290000000`.
-
-**2.** Filtrado en `DateTime64` valor
-
-``` sql
-SELECT * FROM dt WHERE timestamp = toDateTime64('2019-01-01 00:00:00', 3, 'Europe/Moscow')
-```
-
-``` text
-┌───────────────timestamp─┬─event_id─┐
-│ 2019-01-01 00:00:00.000 │        2 │
-└─────────────────────────┴──────────┘
-```
-
-A diferencia de `DateTime`, `DateTime64` los valores no se convierten desde `String` automática
-
-**3.** Obtener una zona horaria para un `DateTime64`-tipo de valor:
-
-``` sql
-SELECT toDateTime64(now(), 3, 'Europe/Moscow') AS column, toTypeName(column) AS x
-```
-
-``` text
-┌──────────────────column─┬─x──────────────────────────────┐
-│ 2019-10-16 04:12:04.000 │ DateTime64(3, 'Europe/Moscow') │
-└─────────────────────────┴────────────────────────────────┘
-```
-
-**4.** Conversión de zona horaria
-
-``` sql
-SELECT
-toDateTime64(timestamp, 3, 'Europe/London') as lon_time,
-toDateTime64(timestamp, 3, 'Europe/Moscow') as mos_time
-FROM dt
-```
-
-``` text
-┌───────────────lon_time──┬────────────────mos_time─┐
-│ 2019-01-01 00:00:00.000 │ 2019-01-01 03:00:00.000 │
-│ 2018-12-31 21:00:00.000 │ 2019-01-01 00:00:00.000 │
-└─────────────────────────┴─────────────────────────┘
-```
-
-## Ver también {#see-also}
-
--   [Funciones de conversión de tipos](../../sql-reference/functions/type-conversion-functions.md)
--   [Funciones para trabajar con fechas y horas](../../sql-reference/functions/date-time-functions.md)
--   [Funciones para trabajar con matrices](../../sql-reference/functions/array-functions.md)
--   [El `date_time_input_format` configuración](../../operations/settings/settings.md#settings-date_time_input_format)
--   [El `timezone` parámetro de configuración del servidor](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone)
--   [Operadores para trabajar con fechas y horas](../../sql-reference/operators/index.md#operators-datetime)
--   [`Date` tipo de datos](date.md)
--   [`DateTime` tipo de datos](datetime.md)
diff --git a/docs/es/sql-reference/data-types/decimal.md b/docs/es/sql-reference/data-types/decimal.md
deleted file mode 100644
index 78cb296c9d3..00000000000
--- a/docs/es/sql-reference/data-types/decimal.md
+++ /dev/null
@@ -1,109 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 42
-toc_title: Decimal
----
-
-# Decimal(P, S), Decimal32(S), Decimal64(S), Decimal128(S) {#decimalp-s-decimal32s-decimal64s-decimal128s}
-
-Números de punto fijo firmados que mantienen la precisión durante las operaciones de suma, resta y multiplicación. Para la división se descartan los dígitos menos significativos (no redondeados).
-
-## Parámetros {#parameters}
-
--   P - precisión. Rango válido: \[ 1 : 38 \]. Determina cuántos dígitos decimales puede tener el número (incluida la fracción).
--   S - escala. Rango válido: \[ 0 : P \]. Determina cuántos dígitos decimales puede tener la fracción.
-
-Dependiendo del valor del parámetro P Decimal(P, S) es un sinónimo de:
-- P de \[ 1 : 9 \] - para Decimal32(S)
-- P de \[ 10 : 18 \] - para Decimal64(S)
-- P de \[ 19 : 38 \] - para Decimal128(S)
-
-## Rangos de valores decimales {#decimal-value-ranges}
-
--   Decimal32(S) - ( -1 \* 10^(9 - S), 1 \* 10^(9 - S) )
--   Decimal64(S) - ( -1 \* 10^(18 - S), 1 \* 10^(18 - S) )
--   Decimal128(S) - ( -1 \* 10^(38 - S), 1 \* 10^(38 - S) )
-
-Por ejemplo, Decimal32(4) puede contener números de -99999.9999 a 99999.9999 con el paso 0.0001.
-
-## Representación interna {#internal-representation}
-
-Internamente, los datos se representan como enteros con signo normal con el ancho de bits respectivo. Los rangos de valores reales que se pueden almacenar en la memoria son un poco más grandes que los especificados anteriormente, que se verifican solo en la conversión de una cadena.
-
-Debido a que las CPU modernas no admiten enteros de 128 bits de forma nativa, las operaciones en Decimal128 se emulan. Debido a esto, Decimal128 funciona significativamente más lento que Decimal32 / Decimal64.
-
-## Operaciones y tipo de resultado {#operations-and-result-type}
-
-Las operaciones binarias en Decimal dan como resultado un tipo de resultado más amplio (con cualquier orden de argumentos).
-
--   `Decimal64(S1) <op> Decimal32(S2) -> Decimal64(S)`
--   `Decimal128(S1) <op> Decimal32(S2) -> Decimal128(S)`
--   `Decimal128(S1) <op> Decimal64(S2) -> Decimal128(S)`
-
-Reglas para la escala:
-
--   Sumar, restar: S = max(S1, S2).
--   multuply: S = S1 + S2.
--   división: S = S1.
-
-Para operaciones similares entre Decimal y enteros, el resultado es Decimal del mismo tamaño que un argumento.
-
-Las operaciones entre Decimal y Float32 / Float64 no están definidas. Si los necesita, puede convertir explícitamente uno de los argumentos utilizando toDecimal32, toDecimal64, toDecimal128 o toFloat32, toFloat64 builtins. Tenga en cuenta que el resultado perderá precisión y la conversión de tipo es una operación computacionalmente costosa.
-
-Algunas funciones en Decimal devuelven el resultado como Float64 (por ejemplo, var o stddev). Los cálculos intermedios aún se pueden realizar en Decimal, lo que podría dar lugar a resultados diferentes entre las entradas Float64 y Decimal con los mismos valores.
-
-## Comprobaciones de desbordamiento {#overflow-checks}
-
-Durante los cálculos en Decimal, pueden producirse desbordamientos de enteros. Los dígitos excesivos en una fracción se descartan (no se redondean). Los dígitos excesivos en la parte entera conducirán a una excepción.
-
-``` sql
-SELECT toDecimal32(2, 4) AS x, x / 3
-```
-
-``` text
-┌──────x─┬─divide(toDecimal32(2, 4), 3)─┐
-│ 2.0000 │                       0.6666 │
-└────────┴──────────────────────────────┘
-```
-
-``` sql
-SELECT toDecimal32(4.2, 8) AS x, x * x
-```
-
-``` text
-DB::Exception: Scale is out of bounds.
-```
-
-``` sql
-SELECT toDecimal32(4.2, 8) AS x, 6 * x
-```
-
-``` text
-DB::Exception: Decimal math overflow.
-```
-
-Las comprobaciones de desbordamiento conducen a la desaceleración de las operaciones. Si se sabe que los desbordamientos no son posibles, tiene sentido deshabilitar las verificaciones usando `decimal_check_overflow` configuración. Cuando las comprobaciones están deshabilitadas y se produce el desbordamiento, el resultado será incorrecto:
-
-``` sql
-SET decimal_check_overflow = 0;
-SELECT toDecimal32(4.2, 8) AS x, 6 * x
-```
-
-``` text
-┌──────────x─┬─multiply(6, toDecimal32(4.2, 8))─┐
-│ 4.20000000 │                     -17.74967296 │
-└────────────┴──────────────────────────────────┘
-```
-
-Las comprobaciones de desbordamiento ocurren no solo en operaciones aritméticas sino también en la comparación de valores:
-
-``` sql
-SELECT toDecimal32(1, 8) < 100
-```
-
-``` text
-DB::Exception: Can't compare.
-```
-
-[Artículo Original](https://clickhouse.tech/docs/en/data_types/decimal/) <!--hide-->
diff --git a/docs/es/sql-reference/data-types/domains/index.md b/docs/es/sql-reference/data-types/domains/index.md
deleted file mode 100644
index 136058e35c8..00000000000
--- a/docs/es/sql-reference/data-types/domains/index.md
+++ /dev/null
@@ -1,33 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 56
-toc_folder_title: Dominio
-toc_title: "Descripci\xF3n"
----
-
-# Dominio {#domains}
-
-Los dominios son tipos de propósito especial que agregan algunas características adicionales encima del tipo base existente, pero dejando intacto el formato en cable y en disco del tipo de datos subyacente. Por el momento, ClickHouse no admite dominios definidos por el usuario.
-
-Puede usar dominios en cualquier lugar que se pueda usar el tipo base correspondiente, por ejemplo:
-
--   Crear una columna de un tipo de dominio
--   Leer/escribir valores desde/a la columna de dominio
--   Úselo como un índice si un tipo base se puede usar como un índice
--   Funciones de llamada con valores de la columna de dominio
-
-### Características adicionales de los dominios {#extra-features-of-domains}
-
--   Nombre de tipo de columna explícito en `SHOW CREATE TABLE` o `DESCRIBE TABLE`
--   Entrada del formato humano-amistoso con `INSERT INTO domain_table(domain_column) VALUES(...)`
--   Salida al formato humano-amistoso para `SELECT domain_column FROM domain_table`
--   Carga de datos desde una fuente externa en el formato de uso humano: `INSERT INTO domain_table FORMAT CSV ...`
-
-### Limitacion {#limitations}
-
--   No se puede convertir la columna de índice del tipo base al tipo de dominio a través de `ALTER TABLE`.
--   No se pueden convertir implícitamente valores de cadena en valores de dominio al insertar datos de otra columna o tabla.
--   Domain no agrega restricciones en los valores almacenados.
-
-[Artículo Original](https://clickhouse.tech/docs/en/data_types/domains/) <!--hide-->
diff --git a/docs/es/sql-reference/data-types/domains/ipv4.md b/docs/es/sql-reference/data-types/domains/ipv4.md
deleted file mode 100644
index 6e271f10fd2..00000000000
--- a/docs/es/sql-reference/data-types/domains/ipv4.md
+++ /dev/null
@@ -1,84 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 59
-toc_title: IPv4
----
-
-## IPv4 {#ipv4}
-
-`IPv4` es un dominio basado en `UInt32` tipo y sirve como un reemplazo con tipo para almacenar valores IPv4. Proporciona un almacenamiento compacto con el formato de entrada-salida amigable para los humanos y la información sobre el tipo de columna en la inspección.
-
-### Uso básico {#basic-usage}
-
-``` sql
-CREATE TABLE hits (url String, from IPv4) ENGINE = MergeTree() ORDER BY url;
-
-DESCRIBE TABLE hits;
-```
-
-``` text
-┌─name─┬─type───┬─default_type─┬─default_expression─┬─comment─┬─codec_expression─┐
-│ url  │ String │              │                    │         │                  │
-│ from │ IPv4   │              │                    │         │                  │
-└──────┴────────┴──────────────┴────────────────────┴─────────┴──────────────────┘
-```
-
-O puede usar el dominio IPv4 como clave:
-
-``` sql
-CREATE TABLE hits (url String, from IPv4) ENGINE = MergeTree() ORDER BY from;
-```
-
-`IPv4` domain admite formato de entrada personalizado como cadenas IPv4:
-
-``` sql
-INSERT INTO hits (url, from) VALUES ('https://wikipedia.org', '116.253.40.133')('https://clickhouse.tech', '183.247.232.58')('https://clickhouse.tech/docs/en/', '116.106.34.242');
-
-SELECT * FROM hits;
-```
-
-``` text
-┌─url────────────────────────────────┬───────────from─┐
-│ https://clickhouse.tech/docs/en/ │ 116.106.34.242 │
-│ https://wikipedia.org              │ 116.253.40.133 │
-│ https://clickhouse.tech          │ 183.247.232.58 │
-└────────────────────────────────────┴────────────────┘
-```
-
-Los valores se almacenan en forma binaria compacta:
-
-``` sql
-SELECT toTypeName(from), hex(from) FROM hits LIMIT 1;
-```
-
-``` text
-┌─toTypeName(from)─┬─hex(from)─┐
-│ IPv4             │ B7F7E83A  │
-└──────────────────┴───────────┘
-```
-
-Los valores de dominio no se pueden convertir implícitamente en tipos distintos de `UInt32`.
-Si desea convertir `IPv4` valor a una cadena, tienes que hacer eso explícitamente con `IPv4NumToString()` función:
-
-``` sql
-SELECT toTypeName(s), IPv4NumToString(from) as s FROM hits LIMIT 1;
-```
-
-    ┌─toTypeName(IPv4NumToString(from))─┬─s──────────────┐
-    │ String                            │ 183.247.232.58 │
-    └───────────────────────────────────┴────────────────┘
-
-O echar a un `UInt32` valor:
-
-``` sql
-SELECT toTypeName(i), CAST(from as UInt32) as i FROM hits LIMIT 1;
-```
-
-``` text
-┌─toTypeName(CAST(from, 'UInt32'))─┬──────────i─┐
-│ UInt32                           │ 3086477370 │
-└──────────────────────────────────┴────────────┘
-```
-
-[Artículo Original](https://clickhouse.tech/docs/en/data_types/domains/ipv4) <!--hide-->
diff --git a/docs/es/sql-reference/data-types/domains/ipv6.md b/docs/es/sql-reference/data-types/domains/ipv6.md
deleted file mode 100644
index 2f45a353053..00000000000
--- a/docs/es/sql-reference/data-types/domains/ipv6.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 60
-toc_title: IPv6
----
-
-## IPv6 {#ipv6}
-
-`IPv6` es un dominio basado en `FixedString(16)` tipo y sirve como un reemplazo con tipo para almacenar valores IPv6. Proporciona un almacenamiento compacto con el formato de entrada-salida amigable para los humanos y la información sobre el tipo de columna en la inspección.
-
-### Uso básico {#basic-usage}
-
-``` sql
-CREATE TABLE hits (url String, from IPv6) ENGINE = MergeTree() ORDER BY url;
-
-DESCRIBE TABLE hits;
-```
-
-``` text
-┌─name─┬─type───┬─default_type─┬─default_expression─┬─comment─┬─codec_expression─┐
-│ url  │ String │              │                    │         │                  │
-│ from │ IPv6   │              │                    │         │                  │
-└──────┴────────┴──────────────┴────────────────────┴─────────┴──────────────────┘
-```
-
-O puedes usar `IPv6` dominio como clave:
-
-``` sql
-CREATE TABLE hits (url String, from IPv6) ENGINE = MergeTree() ORDER BY from;
-```
-
-`IPv6` domain admite entradas personalizadas como cadenas IPv6:
-
-``` sql
-INSERT INTO hits (url, from) VALUES ('https://wikipedia.org', '2a02:aa08:e000:3100::2')('https://clickhouse.tech', '2001:44c8:129:2632:33:0:252:2')('https://clickhouse.tech/docs/en/', '2a02:e980:1e::1');
-
-SELECT * FROM hits;
-```
-
-``` text
-┌─url────────────────────────────────┬─from──────────────────────────┐
-│ https://clickhouse.tech          │ 2001:44c8:129:2632:33:0:252:2 │
-│ https://clickhouse.tech/docs/en/ │ 2a02:e980:1e::1               │
-│ https://wikipedia.org              │ 2a02:aa08:e000:3100::2        │
-└────────────────────────────────────┴───────────────────────────────┘
-```
-
-Los valores se almacenan en forma binaria compacta:
-
-``` sql
-SELECT toTypeName(from), hex(from) FROM hits LIMIT 1;
-```
-
-``` text
-┌─toTypeName(from)─┬─hex(from)────────────────────────┐
-│ IPv6             │ 200144C8012926320033000002520002 │
-└──────────────────┴──────────────────────────────────┘
-```
-
-Los valores de dominio no se pueden convertir implícitamente en tipos distintos de `FixedString(16)`.
-Si desea convertir `IPv6` valor a una cadena, tienes que hacer eso explícitamente con `IPv6NumToString()` función:
-
-``` sql
-SELECT toTypeName(s), IPv6NumToString(from) as s FROM hits LIMIT 1;
-```
-
-``` text
-┌─toTypeName(IPv6NumToString(from))─┬─s─────────────────────────────┐
-│ String                            │ 2001:44c8:129:2632:33:0:252:2 │
-└───────────────────────────────────┴───────────────────────────────┘
-```
-
-O echar a un `FixedString(16)` valor:
-
-``` sql
-SELECT toTypeName(i), CAST(from as FixedString(16)) as i FROM hits LIMIT 1;
-```
-
-``` text
-┌─toTypeName(CAST(from, 'FixedString(16)'))─┬─i───────┐
-│ FixedString(16)                           │  ��� │
-└───────────────────────────────────────────┴─────────┘
-```
-
-[Artículo Original](https://clickhouse.tech/docs/en/data_types/domains/ipv6) <!--hide-->
diff --git a/docs/es/sql-reference/data-types/enum.md b/docs/es/sql-reference/data-types/enum.md
deleted file mode 100644
index aa990dcaef9..00000000000
--- a/docs/es/sql-reference/data-types/enum.md
+++ /dev/null
@@ -1,132 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 50
-toc_title: Enum
----
-
-# Enum {#enum}
-
-Tipo enumerado que consta de valores con nombre.
-
-Los valores con nombre deben declararse como `'string' = integer` par. ClickHouse almacena solo números, pero admite operaciones con los valores a través de sus nombres.
-
-Soporta ClickHouse:
-
--   de 8 bits `Enum`. Puede contener hasta 256 valores enumerados en el `[-128, 127]` gama.
--   de 16 bits `Enum`. Puede contener hasta 65536 valores enumerados en el `[-32768, 32767]` gama.
-
-ClickHouse elige automáticamente el tipo de `Enum` cuando se insertan datos. También puede utilizar `Enum8` o `Enum16` para estar seguro en el tamaño de almacenamiento.
-
-## Ejemplos de uso {#usage-examples}
-
-Aquí creamos una tabla con un `Enum8('hello' = 1, 'world' = 2)` tipo columna:
-
-``` sql
-CREATE TABLE t_enum
-(
-    x Enum('hello' = 1, 'world' = 2)
-)
-ENGINE = TinyLog
-```
-
-Columna `x` sólo puede almacenar valores que se enumeran en la definición de tipo: `'hello'` o `'world'`. Si intenta guardar cualquier otro valor, ClickHouse generará una excepción. Tamaño de 8 bits para esto `Enum` se elige automáticamente.
-
-``` sql
-INSERT INTO t_enum VALUES ('hello'), ('world'), ('hello')
-```
-
-``` text
-Ok.
-```
-
-``` sql
-INSERT INTO t_enum values('a')
-```
-
-``` text
-Exception on client:
-Code: 49. DB::Exception: Unknown element 'a' for type Enum('hello' = 1, 'world' = 2)
-```
-
-Al consultar datos de la tabla, ClickHouse genera los valores de cadena de `Enum`.
-
-``` sql
-SELECT * FROM t_enum
-```
-
-``` text
-┌─x─────┐
-│ hello │
-│ world │
-│ hello │
-└───────┘
-```
-
-Si necesita ver los equivalentes numéricos de las filas, debe `Enum` valor a tipo entero.
-
-``` sql
-SELECT CAST(x, 'Int8') FROM t_enum
-```
-
-``` text
-┌─CAST(x, 'Int8')─┐
-│               1 │
-│               2 │
-│               1 │
-└─────────────────┘
-```
-
-Para crear un valor Enum en una consulta, también debe usar `CAST`.
-
-``` sql
-SELECT toTypeName(CAST('a', 'Enum(\'a\' = 1, \'b\' = 2)'))
-```
-
-``` text
-┌─toTypeName(CAST('a', 'Enum(\'a\' = 1, \'b\' = 2)'))─┐
-│ Enum8('a' = 1, 'b' = 2)                             │
-└─────────────────────────────────────────────────────┘
-```
-
-## Reglas generales y uso {#general-rules-and-usage}
-
-A cada uno de los valores se le asigna un número en el rango `-128 ... 127` para `Enum8` o en el rango `-32768 ... 32767` para `Enum16`. Todas las cadenas y números deben ser diferentes. Se permite una cadena vacía. Si se especifica este tipo (en una definición de tabla), los números pueden estar en un orden arbitrario. Sin embargo, el orden no importa.
-
-Ni la cadena ni el valor numérico en un `Enum` puede ser [NULL](../../sql-reference/syntax.md).
-
-Un `Enum` puede estar contenido en [NULL](nullable.md) tipo. Entonces, si crea una tabla usando la consulta
-
-``` sql
-CREATE TABLE t_enum_nullable
-(
-    x Nullable( Enum8('hello' = 1, 'world' = 2) )
-)
-ENGINE = TinyLog
-```
-
-puede almacenar no sólo `'hello'` y `'world'`, pero `NULL`, también.
-
-``` sql
-INSERT INTO t_enum_nullable Values('hello'),('world'),(NULL)
-```
-
-En RAM, un `Enum` columna se almacena de la misma manera que `Int8` o `Int16` de los valores numéricos correspondientes.
-
-Al leer en forma de texto, ClickHouse analiza el valor como una cadena y busca la cadena correspondiente del conjunto de valores Enum. Si no se encuentra, se lanza una excepción. Al leer en formato de texto, se lee la cadena y se busca el valor numérico correspondiente. Se lanzará una excepción si no se encuentra.
-Al escribir en forma de texto, escribe el valor como la cadena correspondiente. Si los datos de columna contienen elementos no utilizados (números que no son del conjunto válido), se produce una excepción. Al leer y escribir en forma binaria, funciona de la misma manera que para los tipos de datos Int8 e Int16.
-El valor predeterminado es el valor con el número más bajo.
-
-Durante `ORDER BY`, `GROUP BY`, `IN`, `DISTINCT` y así sucesivamente, las enumeraciones se comportan de la misma manera que los números correspondientes. Por ejemplo, ORDER BY los ordena numéricamente. Los operadores de igualdad y comparación funcionan de la misma manera en enumeraciones que en los valores numéricos subyacentes.
-
-Los valores de Enum no se pueden comparar con los números. Las enumeraciones se pueden comparar con una cadena constante. Si la cadena en comparación con no es un valor válido para el Enum, se lanzará una excepción. El operador IN es compatible con el Enum en el lado izquierdo y un conjunto de cadenas en el lado derecho. Las cadenas son los valores del Enum correspondiente.
-
-Most numeric and string operations are not defined for Enum values, e.g. adding a number to an Enum or concatenating a string to an Enum.
-Sin embargo, el Enum tiene un `toString` función que devuelve su valor de cadena.
-
-Los valores de Enum también se pueden convertir a tipos numéricos utilizando el `toT` función, donde T es un tipo numérico. Cuando T corresponde al tipo numérico subyacente de la enumeración, esta conversión es de costo cero.
-El tipo Enum se puede cambiar sin costo usando ALTER, si solo se cambia el conjunto de valores. Es posible agregar y eliminar miembros del Enum usando ALTER (eliminar es seguro solo si el valor eliminado nunca se ha usado en la tabla). Como salvaguardia, al cambiar el valor numérico de un miembro Enum definido previamente se producirá una excepción.
-
-Usando ALTER, es posible cambiar un Enum8 a un Enum16 o viceversa, al igual que cambiar un Int8 a Int16.
-
-[Artículo Original](https://clickhouse.tech/docs/en/data_types/enum/) <!--hide-->
diff --git a/docs/es/sql-reference/data-types/fixedstring.md b/docs/es/sql-reference/data-types/fixedstring.md
deleted file mode 100644
index f12a308b7de..00000000000
--- a/docs/es/sql-reference/data-types/fixedstring.md
+++ /dev/null
@@ -1,63 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 45
-toc_title: Cadena fija (N)
----
-
-# Cuerda fija {#fixedstring}
-
-Una cadena de longitud fija de `N` bytes (ni caracteres ni puntos de código).
-
-Para declarar una columna de `FixedString` tipo, utilice la siguiente sintaxis:
-
-``` sql
-<column_name> FixedString(N)
-```
-
-Donde `N` es un número natural.
-
-El `FixedString` tipo es eficiente cuando los datos tienen la longitud de `N` byte. En todos los demás casos, es probable que reduzca la eficiencia.
-
-Ejemplos de los valores que se pueden almacenar eficientemente en `FixedString`escrito columnas:
-
--   La representación binaria de direcciones IP (`FixedString(16)` para IPv6).
--   Language codes (ru_RU, en_US … ).
--   Currency codes (USD, RUB … ).
--   Representación binaria de hashes (`FixedString(16)` para MD5, `FixedString(32)` para SHA256).
-
-Para almacenar valores UUID, utilice el [UUID](uuid.md) tipo de datos.
-
-Al insertar los datos, ClickHouse:
-
--   Complementa una cadena con bytes nulos si la cadena contiene menos de `N` byte.
--   Lanza el `Too large value for FixedString(N)` excepción si la cadena contiene más de `N` byte.
-
-Al seleccionar los datos, ClickHouse no elimina los bytes nulos al final de la cadena. Si utiliza el `WHERE` cláusula, debe agregar bytes nulos manualmente para que coincida con el `FixedString` valor. En el ejemplo siguiente se muestra cómo utilizar el `WHERE` cláusula con `FixedString`.
-
-Consideremos la siguiente tabla con el único `FixedString(2)` columna:
-
-``` text
-┌─name──┐
-│ b     │
-└───────┘
-```
-
-Consulta `SELECT * FROM FixedStringTable WHERE a = 'b'` no devuelve ningún dato como resultado. Debemos complementar el patrón de filtro con bytes nulos.
-
-``` sql
-SELECT * FROM FixedStringTable
-WHERE a = 'b\0'
-```
-
-``` text
-┌─a─┐
-│ b │
-└───┘
-```
-
-Este comportamiento difiere de MySQL para el `CHAR` tipo (donde las cadenas se rellenan con espacios y los espacios se eliminan para la salida).
-
-Tenga en cuenta que la longitud del `FixedString(N)` el valor es constante. El [longitud](../../sql-reference/functions/array-functions.md#array_functions-length) función devuelve `N` incluso si el `FixedString(N)` sólo se rellena con bytes nulos, pero el valor [vaciar](../../sql-reference/functions/string-functions.md#empty) función devuelve `1` en este caso.
-
-[Artículo Original](https://clickhouse.tech/docs/en/data_types/fixedstring/) <!--hide-->
diff --git a/docs/es/sql-reference/data-types/float.md b/docs/es/sql-reference/data-types/float.md
deleted file mode 100644
index 3102dc9c14b..00000000000
--- a/docs/es/sql-reference/data-types/float.md
+++ /dev/null
@@ -1,87 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 41
-toc_title: "Descripci\xF3n del producto"
----
-
-# Descripción del producto {#float32-float64}
-
-[Números de punto flotante](https://en.wikipedia.org/wiki/IEEE_754).
-
-Los tipos son equivalentes a los tipos de C:
-
--   `Float32` - `float`
--   `Float64` - `double`
-
-Le recomendamos que almacene los datos en formato entero siempre que sea posible. Por ejemplo, convierta números de precisión fija en valores enteros, como importes monetarios o tiempos de carga de página en milisegundos.
-
-## Uso de números de punto flotante {#using-floating-point-numbers}
-
--   Los cálculos con números de punto flotante pueden producir un error de redondeo.
-
-<!-- -->
-
-``` sql
-SELECT 1 - 0.9
-```
-
-``` text
-┌───────minus(1, 0.9)─┐
-│ 0.09999999999999998 │
-└─────────────────────┘
-```
-
--   El resultado del cálculo depende del método de cálculo (el tipo de procesador y la arquitectura del sistema informático).
--   Los cálculos de puntos flotantes pueden dar como resultado números como el infinito (`Inf`) y “not-a-number” (`NaN`). Esto debe tenerse en cuenta al procesar los resultados de los cálculos.
--   Al analizar números de punto flotante a partir de texto, el resultado puede no ser el número representable por máquina más cercano.
-
-## NaN y Inf {#data_type-float-nan-inf}
-
-A diferencia de SQL estándar, ClickHouse admite las siguientes categorías de números de punto flotante:
-
--   `Inf` – Infinity.
-
-<!-- -->
-
-``` sql
-SELECT 0.5 / 0
-```
-
-``` text
-┌─divide(0.5, 0)─┐
-│            inf │
-└────────────────┘
-```
-
--   `-Inf` – Negative infinity.
-
-<!-- -->
-
-``` sql
-SELECT -0.5 / 0
-```
-
-``` text
-┌─divide(-0.5, 0)─┐
-│            -inf │
-└─────────────────┘
-```
-
--   `NaN` – Not a number.
-
-<!-- -->
-
-``` sql
-SELECT 0 / 0
-```
-
-``` text
-┌─divide(0, 0)─┐
-│          nan │
-└──────────────┘
-```
-
-    See the rules for `NaN` sorting in the section [ORDER BY clause](../sql_reference/statements/select/order-by.md).
-
-[Artículo Original](https://clickhouse.tech/docs/en/data_types/float/) <!--hide-->
diff --git a/docs/es/sql-reference/data-types/index.md b/docs/es/sql-reference/data-types/index.md
deleted file mode 100644
index e26a42ebc44..00000000000
--- a/docs/es/sql-reference/data-types/index.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: Tipos de datos
-toc_priority: 37
-toc_title: "Implantaci\xF3n"
----
-
-# Tipos de datos {#data_types}
-
-ClickHouse puede almacenar varios tipos de datos en celdas de tabla.
-
-En esta sección se describen los tipos de datos admitidos y las consideraciones especiales para usarlos o implementarlos, si los hubiere.
-
-[Artículo Original](https://clickhouse.tech/docs/en/data_types/) <!--hide-->
diff --git a/docs/es/sql-reference/data-types/int-uint.md b/docs/es/sql-reference/data-types/int-uint.md
deleted file mode 100644
index 976e1eb0782..00000000000
--- a/docs/es/sql-reference/data-types/int-uint.md
+++ /dev/null
@@ -1,26 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 40
-toc_title: UInt8, UInt16, UInt32, UInt64, Int8, Int16, Int32, Int64
----
-
-# UInt8, UInt16, UInt32, UInt64, Int8, Int16, Int32, Int64 {#uint8-uint16-uint32-uint64-int8-int16-int32-int64}
-
-Enteros de longitud fija, con o sin signo.
-
-## Rangos Int {#int-ranges}
-
--   Int8 - \[-128 : 127\]
--   Int16 - \[-32768 : 32767\]
--   Int32 - \[-2147483648 : 2147483647\]
--   Int64 - \[-9223372036854775808 : 9223372036854775807\]
-
-## Rangos de Uint {#uint-ranges}
-
--   UInt8 - \[0 : 255\]
--   UInt16 - \[0 : 65535\]
--   UInt32 - \[0 : 4294967295\]
--   UInt64 - \[0 : 18446744073709551615\]
-
-[Artículo Original](https://clickhouse.tech/docs/en/data_types/int_uint/) <!--hide-->
diff --git a/docs/es/sql-reference/data-types/nested-data-structures/index.md b/docs/es/sql-reference/data-types/nested-data-structures/index.md
deleted file mode 100644
index 89ce044f7b4..00000000000
--- a/docs/es/sql-reference/data-types/nested-data-structures/index.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: Estructuras de datos anidados
-toc_hidden: true
-toc_priority: 54
-toc_title: oculto
----
-
-# Estructuras de datos anidados {#nested-data-structures}
-
-[Artículo Original](https://clickhouse.tech/docs/en/data_types/nested_data_structures/) <!--hide-->
diff --git a/docs/es/sql-reference/data-types/nested-data-structures/nested.md b/docs/es/sql-reference/data-types/nested-data-structures/nested.md
deleted file mode 100644
index bf48b915954..00000000000
--- a/docs/es/sql-reference/data-types/nested-data-structures/nested.md
+++ /dev/null
@@ -1,106 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 57
-toc_title: Anidado (Nombre1 Tipo1, Nombre2 Tipo2, ...)
----
-
-# Nested(name1 Type1, Name2 Type2, …) {#nestedname1-type1-name2-type2}
-
-A nested data structure is like a table inside a cell. The parameters of a nested data structure – the column names and types – are specified the same way as in a [CREATE TABLE](../../../sql-reference/statements/create.md) consulta. Cada fila de la tabla puede corresponder a cualquier número de filas en una estructura de datos anidada.
-
-Ejemplo:
-
-``` sql
-CREATE TABLE test.visits
-(
-    CounterID UInt32,
-    StartDate Date,
-    Sign Int8,
-    IsNew UInt8,
-    VisitID UInt64,
-    UserID UInt64,
-    ...
-    Goals Nested
-    (
-        ID UInt32,
-        Serial UInt32,
-        EventTime DateTime,
-        Price Int64,
-        OrderID String,
-        CurrencyID UInt32
-    ),
-    ...
-) ENGINE = CollapsingMergeTree(StartDate, intHash32(UserID), (CounterID, StartDate, intHash32(UserID), VisitID), 8192, Sign)
-```
-
-Este ejemplo declara la `Goals` estructura de datos anidada, que contiene datos sobre conversiones (objetivos alcanzados). Cada fila en el ‘visits’ la tabla puede corresponder a cero o cualquier número de conversiones.
-
-Solo se admite un único nivel de anidamiento. Las columnas de estructuras anidadas que contienen matrices son equivalentes a matrices multidimensionales, por lo que tienen un soporte limitado (no hay soporte para almacenar estas columnas en tablas con el motor MergeTree).
-
-En la mayoría de los casos, cuando se trabaja con una estructura de datos anidada, sus columnas se especifican con nombres de columna separados por un punto. Estas columnas forman una matriz de tipos coincidentes. Todas las matrices de columnas de una sola estructura de datos anidados tienen la misma longitud.
-
-Ejemplo:
-
-``` sql
-SELECT
-    Goals.ID,
-    Goals.EventTime
-FROM test.visits
-WHERE CounterID = 101500 AND length(Goals.ID) < 5
-LIMIT 10
-```
-
-``` text
-┌─Goals.ID───────────────────────┬─Goals.EventTime───────────────────────────────────────────────────────────────────────────┐
-│ [1073752,591325,591325]        │ ['2014-03-17 16:38:10','2014-03-17 16:38:48','2014-03-17 16:42:27']                       │
-│ [1073752]                      │ ['2014-03-17 00:28:25']                                                                   │
-│ [1073752]                      │ ['2014-03-17 10:46:20']                                                                   │
-│ [1073752,591325,591325,591325] │ ['2014-03-17 13:59:20','2014-03-17 22:17:55','2014-03-17 22:18:07','2014-03-17 22:18:51'] │
-│ []                             │ []                                                                                        │
-│ [1073752,591325,591325]        │ ['2014-03-17 11:37:06','2014-03-17 14:07:47','2014-03-17 14:36:21']                       │
-│ []                             │ []                                                                                        │
-│ []                             │ []                                                                                        │
-│ [591325,1073752]               │ ['2014-03-17 00:46:05','2014-03-17 00:46:05']                                             │
-│ [1073752,591325,591325,591325] │ ['2014-03-17 13:28:33','2014-03-17 13:30:26','2014-03-17 18:51:21','2014-03-17 18:51:45'] │
-└────────────────────────────────┴───────────────────────────────────────────────────────────────────────────────────────────┘
-```
-
-Es más fácil pensar en una estructura de datos anidados como un conjunto de múltiples matrices de columnas de la misma longitud.
-
-El único lugar donde una consulta SELECT puede especificar el nombre de una estructura de datos anidada completa en lugar de columnas individuales es la cláusula ARRAY JOIN. Para obtener más información, consulte “ARRAY JOIN clause”. Ejemplo:
-
-``` sql
-SELECT
-    Goal.ID,
-    Goal.EventTime
-FROM test.visits
-ARRAY JOIN Goals AS Goal
-WHERE CounterID = 101500 AND length(Goals.ID) < 5
-LIMIT 10
-```
-
-``` text
-┌─Goal.ID─┬──────Goal.EventTime─┐
-│ 1073752 │ 2014-03-17 16:38:10 │
-│  591325 │ 2014-03-17 16:38:48 │
-│  591325 │ 2014-03-17 16:42:27 │
-│ 1073752 │ 2014-03-17 00:28:25 │
-│ 1073752 │ 2014-03-17 10:46:20 │
-│ 1073752 │ 2014-03-17 13:59:20 │
-│  591325 │ 2014-03-17 22:17:55 │
-│  591325 │ 2014-03-17 22:18:07 │
-│  591325 │ 2014-03-17 22:18:51 │
-│ 1073752 │ 2014-03-17 11:37:06 │
-└─────────┴─────────────────────┘
-```
-
-No puede realizar SELECT para toda una estructura de datos anidados. Solo puede enumerar explícitamente columnas individuales que forman parte de él.
-
-Para una consulta INSERT, debe pasar todas las matrices de columnas de componentes de una estructura de datos anidada por separado (como si fueran matrices de columnas individuales). Durante la inserción, el sistema comprueba que tienen la misma longitud.
-
-Para una consulta DESCRIBE, las columnas de una estructura de datos anidada se enumeran por separado de la misma manera.
-
-La consulta ALTER para elementos en una estructura de datos anidados tiene limitaciones.
-
-[Artículo Original](https://clickhouse.tech/docs/en/data_types/nested_data_structures/nested/) <!--hide-->
diff --git a/docs/es/sql-reference/data-types/nullable.md b/docs/es/sql-reference/data-types/nullable.md
deleted file mode 100644
index bec05e1c756..00000000000
--- a/docs/es/sql-reference/data-types/nullable.md
+++ /dev/null
@@ -1,46 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 54
-toc_title: 'NULL'
----
-
-# Nivel de Cifrado WEP) {#data_type-nullable}
-
-Permite almacenar marcador especial ([NULL](../../sql-reference/syntax.md)) que denota “missing value” junto con los valores normales permitidos por `TypeName`. Por ejemplo, un `Nullable(Int8)` tipo columna puede almacenar `Int8` valores de tipo, y las filas que no tienen un valor almacenarán `NULL`.
-
-Para un `TypeName`, no puede usar tipos de datos compuestos [Matriz](array.md) y [Tupla](tuple.md). Los tipos de datos compuestos pueden contener `Nullable` valores de tipo, como `Array(Nullable(Int8))`.
-
-A `Nullable` no se puede incluir en los índices de tabla.
-
-`NULL` es el valor predeterminado para cualquier `Nullable` tipo, a menos que se especifique lo contrario en la configuración del servidor ClickHouse.
-
-## Características de almacenamiento {#storage-features}
-
-Almacenar `Nullable` en una columna de tabla, ClickHouse usa un archivo separado con `NULL` máscaras además del archivo normal con valores. Las entradas en el archivo de máscaras permiten ClickHouse distinguir entre `NULL` y un valor predeterminado del tipo de datos correspondiente para cada fila de la tabla. Debido a un archivo adicional, `Nullable` La columna consume espacio de almacenamiento adicional en comparación con una normal similar.
-
-!!! info "Nota"
-    Utilizar `Nullable` casi siempre afecta negativamente al rendimiento, tenga esto en cuenta al diseñar sus bases de datos.
-
-## Ejemplo de uso {#usage-example}
-
-``` sql
-CREATE TABLE t_null(x Int8, y Nullable(Int8)) ENGINE TinyLog
-```
-
-``` sql
-INSERT INTO t_null VALUES (1, NULL), (2, 3)
-```
-
-``` sql
-SELECT x + y FROM t_null
-```
-
-``` text
-┌─plus(x, y)─┐
-│       ᴺᵁᴸᴸ │
-│          5 │
-└────────────┘
-```
-
-[Artículo Original](https://clickhouse.tech/docs/en/data_types/nullable/) <!--hide-->
diff --git a/docs/es/sql-reference/data-types/simpleaggregatefunction.md b/docs/es/sql-reference/data-types/simpleaggregatefunction.md
deleted file mode 100644
index 48591993cea..00000000000
--- a/docs/es/sql-reference/data-types/simpleaggregatefunction.md
+++ /dev/null
@@ -1,33 +0,0 @@
-# SimpleAggregateFunction {#data-type-simpleaggregatefunction}
-
-El tipo de dato `SimpleAggregateFunction(name, types_of_arguments…)` almacena el valor actual de la función agregada, no almacena su estado completo como hace [`AggregateFunction`](aggregatefunction.md). Esta optimización se puede aplicar a las funciones con la siguiente propiedad: el resultado de aplicar una función `f` a un conjunto de filas `S1 UNION ALL S2` se puede obtener aplicando `f` a partes de la fila establecida por separado, y luego aplicar de nuevo `f` los resultados: `f(S1 UNION ALL S2) = f(f(S1) UNION ALL f(S2))`. Un ejemplo de función con esta propiedad es la suma. Esta propiedad garantiza que los resultados de agregación parcial son suficientes para calcular el combinado, por lo que no tenemos que almacenar y procesar ningún dato adicional.
-
-La lista de functiones de agregación soportadas son:
-
--   [`any`](../../sql-reference/aggregate-functions/reference.md#agg_function-any)
--   [`anyLast`](../../sql-reference/aggregate-functions/reference.md#anylastx)
--   [`min`](../../sql-reference/aggregate-functions/reference.md#agg_function-min)
--   [`max`](../../sql-reference/aggregate-functions/reference.md#agg_function-max)
--   [`sum`](../../sql-reference/aggregate-functions/reference.md#agg_function-sum)
--   [`groupBitAnd`](../../sql-reference/aggregate-functions/reference.md#groupbitand)
--   [`groupBitOr`](../../sql-reference/aggregate-functions/reference.md#groupbitor)
--   [`groupBitXor`](../../sql-reference/aggregate-functions/reference.md#groupbitxor)
-
-Cuando se usa `SimpleAggregateFunction(func, Type)` el resultado es almacenado datos `Type` así que no necesita aplicar los suficos `-Merge`/`-State` a las funciones de agregación para usarlas. Para la misma función de agregación `SimpleAggregateFunction` tiene un mejor rendimiento que `AggregateFunction`.
-
-**Parámetros**
-
--   Nombre de la función de agregado.
--   Tipos de los argumentos de la función agregada.
-
-**Ejemplo**
-
-``` sql
-CREATE TABLE t
-(
-    column1 SimpleAggregateFunction(sum, UInt64),
-    column2 SimpleAggregateFunction(any, String)
-) ENGINE = ...
-```
-
-[Artículo Original](https://clickhouse.tech/docs/en/data_types/simpleaggregatefunction/) <!--hide-->
diff --git a/docs/es/sql-reference/data-types/special-data-types/expression.md b/docs/es/sql-reference/data-types/special-data-types/expression.md
deleted file mode 100644
index d1e170ab343..00000000000
--- a/docs/es/sql-reference/data-types/special-data-types/expression.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 58
-toc_title: Expresion
----
-
-# Expresion {#expression}
-
-Las expresiones se utilizan para representar lambdas en funciones de orden superior.
-
-[Artículo Original](https://clickhouse.tech/docs/en/data_types/special_data_types/expression/) <!--hide-->
diff --git a/docs/es/sql-reference/data-types/special-data-types/index.md b/docs/es/sql-reference/data-types/special-data-types/index.md
deleted file mode 100644
index 8c14a96bca9..00000000000
--- a/docs/es/sql-reference/data-types/special-data-types/index.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: Tipos de datos especiales
-toc_hidden: true
-toc_priority: 55
-toc_title: oculto
----
-
-# Tipos de datos especiales {#special-data-types}
-
-Los valores de tipo de datos especiales no se pueden serializar para guardar en una tabla o salida en los resultados de la consulta, pero se pueden usar como un resultado intermedio durante la ejecución de la consulta.
-
-[Artículo Original](https://clickhouse.tech/docs/en/data_types/special_data_types/) <!--hide-->
diff --git a/docs/es/sql-reference/data-types/special-data-types/interval.md b/docs/es/sql-reference/data-types/special-data-types/interval.md
deleted file mode 100644
index c4c4a67c8cd..00000000000
--- a/docs/es/sql-reference/data-types/special-data-types/interval.md
+++ /dev/null
@@ -1,85 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 61
-toc_title: Intervalo
----
-
-# Intervalo {#data-type-interval}
-
-La familia de tipos de datos que representan intervalos de fecha y hora. Los tipos resultantes del [INTERVAL](../../../sql-reference/operators/index.md#operator-interval) operador.
-
-!!! warning "Advertencia"
-    `Interval` los valores de tipo de datos no se pueden almacenar en tablas.
-
-Estructura:
-
--   Intervalo de tiempo como un valor entero sin signo.
--   Tipo de intervalo.
-
-Tipos de intervalo admitidos:
-
--   `SECOND`
--   `MINUTE`
--   `HOUR`
--   `DAY`
--   `WEEK`
--   `MONTH`
--   `QUARTER`
--   `YEAR`
-
-Para cada tipo de intervalo, hay un tipo de datos independiente. Por ejemplo, el `DAY` el intervalo corresponde a la `IntervalDay` tipo de datos:
-
-``` sql
-SELECT toTypeName(INTERVAL 4 DAY)
-```
-
-``` text
-┌─toTypeName(toIntervalDay(4))─┐
-│ IntervalDay                  │
-└──────────────────────────────┘
-```
-
-## Observaciones de uso {#data-type-interval-usage-remarks}
-
-Usted puede utilizar `Interval`-type valores en operaciones aritméticas con [Fecha](../../../sql-reference/data-types/date.md) y [FechaHora](../../../sql-reference/data-types/datetime.md)-type valores. Por ejemplo, puede agregar 4 días a la hora actual:
-
-``` sql
-SELECT now() as current_date_time, current_date_time + INTERVAL 4 DAY
-```
-
-``` text
-┌───current_date_time─┬─plus(now(), toIntervalDay(4))─┐
-│ 2019-10-23 10:58:45 │           2019-10-27 10:58:45 │
-└─────────────────────┴───────────────────────────────┘
-```
-
-Los intervalos con diferentes tipos no se pueden combinar. No puedes usar intervalos como `4 DAY 1 HOUR`. Especifique los intervalos en unidades que son más pequeñas o iguales que la unidad más pequeña del intervalo, por ejemplo, el intervalo `1 day and an hour` se puede expresar como `25 HOUR` o `90000 SECOND`.
-
-No puede realizar operaciones aritméticas con `Interval`-type valores, pero puede agregar intervalos de diferentes tipos en consecuencia a los valores en `Date` o `DateTime` tipos de datos. Por ejemplo:
-
-``` sql
-SELECT now() AS current_date_time, current_date_time + INTERVAL 4 DAY + INTERVAL 3 HOUR
-```
-
-``` text
-┌───current_date_time─┬─plus(plus(now(), toIntervalDay(4)), toIntervalHour(3))─┐
-│ 2019-10-23 11:16:28 │                                    2019-10-27 14:16:28 │
-└─────────────────────┴────────────────────────────────────────────────────────┘
-```
-
-La siguiente consulta provoca una excepción:
-
-``` sql
-select now() AS current_date_time, current_date_time + (INTERVAL 4 DAY + INTERVAL 3 HOUR)
-```
-
-``` text
-Received exception from server (version 19.14.1):
-Code: 43. DB::Exception: Received from localhost:9000. DB::Exception: Wrong argument types for function plus: if one argument is Interval, then another must be Date or DateTime..
-```
-
-## Ver también {#see-also}
-
--   [INTERVAL](../../../sql-reference/operators/index.md#operator-interval) operador
--   [ToInterval](../../../sql-reference/functions/type-conversion-functions.md#function-tointerval) funciones de conversión de tipo
diff --git a/docs/es/sql-reference/data-types/special-data-types/nothing.md b/docs/es/sql-reference/data-types/special-data-types/nothing.md
deleted file mode 100644
index 31c881d1cc6..00000000000
--- a/docs/es/sql-reference/data-types/special-data-types/nothing.md
+++ /dev/null
@@ -1,26 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 60
-toc_title: Nada
----
-
-# Nada {#nothing}
-
-El único propósito de este tipo de datos es representar casos en los que no se espera un valor. Entonces no puedes crear un `Nothing` valor de tipo.
-
-Por ejemplo, literal [NULL](../../../sql-reference/syntax.md#null-literal) tiene tipo de `Nullable(Nothing)`. Ver más sobre [NULL](../../../sql-reference/data-types/nullable.md).
-
-El `Nothing` tipo puede también se utiliza para denotar matrices vacías:
-
-``` sql
-SELECT toTypeName(array())
-```
-
-``` text
-┌─toTypeName(array())─┐
-│ Array(Nothing)      │
-└─────────────────────┘
-```
-
-[Artículo Original](https://clickhouse.tech/docs/en/data_types/special_data_types/nothing/) <!--hide-->
diff --git a/docs/es/sql-reference/data-types/special-data-types/set.md b/docs/es/sql-reference/data-types/special-data-types/set.md
deleted file mode 100644
index 70b6d5d7383..00000000000
--- a/docs/es/sql-reference/data-types/special-data-types/set.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 59
-toc_title: Establecer
----
-
-# Establecer {#set}
-
-Utilizado para la mitad derecha de un [IN](../../operators/in.md#select-in-operators) expresion.
-
-[Artículo Original](https://clickhouse.tech/docs/en/data_types/special_data_types/set/) <!--hide-->
diff --git a/docs/es/sql-reference/data-types/string.md b/docs/es/sql-reference/data-types/string.md
deleted file mode 100644
index 603dd36cd8d..00000000000
--- a/docs/es/sql-reference/data-types/string.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 44
-toc_title: Cadena
----
-
-# Cadena {#string}
-
-Cuerdas de una longitud arbitraria. La longitud no está limitada. El valor puede contener un conjunto arbitrario de bytes, incluidos los bytes nulos.
-El tipo String reemplaza los tipos VARCHAR, BLOB, CLOB y otros de otros DBMS.
-
-## Codificación {#encodings}
-
-ClickHouse no tiene el concepto de codificaciones. Las cadenas pueden contener un conjunto arbitrario de bytes, que se almacenan y salen tal cual.
-Si necesita almacenar textos, le recomendamos que utilice la codificación UTF-8. Como mínimo, si su terminal usa UTF-8 (según lo recomendado), puede leer y escribir sus valores sin realizar conversiones.
-Del mismo modo, ciertas funciones para trabajar con cadenas tienen variaciones separadas que funcionan bajo el supuesto de que la cadena contiene un conjunto de bytes que representan un texto codificado en UTF-8.
-Por ejemplo, el ‘length’ función calcula la longitud de cadena en bytes, mientras que la ‘lengthUTF8’ función calcula la longitud de la cadena en puntos de código Unicode, suponiendo que el valor está codificado UTF-8.
-
-[Artículo Original](https://clickhouse.tech/docs/en/data_types/string/) <!--hide-->
diff --git a/docs/es/sql-reference/data-types/tuple.md b/docs/es/sql-reference/data-types/tuple.md
deleted file mode 100644
index d6411df5290..00000000000
--- a/docs/es/sql-reference/data-types/tuple.md
+++ /dev/null
@@ -1,52 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 53
-toc_title: Tuple (T1, T2, ...)
----
-
-# Tuple(t1, T2, …) {#tuplet1-t2}
-
-Una tupla de elementos, cada uno con un individuo [tipo](index.md#data_types).
-
-Las tuplas se utilizan para la agrupación temporal de columnas. Las columnas se pueden agrupar cuando se usa una expresión IN en una consulta y para especificar ciertos parámetros formales de las funciones lambda. Para obtener más información, consulte las secciones [IN operadores](../../sql-reference/operators/in.md) y [Funciones de orden superior](../../sql-reference/functions/higher-order-functions.md).
-
-Las tuplas pueden ser el resultado de una consulta. En este caso, para formatos de texto distintos de JSON, los valores están separados por comas entre corchetes. En formatos JSON, las tuplas se generan como matrices (entre corchetes).
-
-## Creación de una tupla {#creating-a-tuple}
-
-Puedes usar una función para crear una tupla:
-
-``` sql
-tuple(T1, T2, ...)
-```
-
-Ejemplo de creación de una tupla:
-
-``` sql
-SELECT tuple(1,'a') AS x, toTypeName(x)
-```
-
-``` text
-┌─x───────┬─toTypeName(tuple(1, 'a'))─┐
-│ (1,'a') │ Tuple(UInt8, String)      │
-└─────────┴───────────────────────────┘
-```
-
-## Trabajar con tipos de datos {#working-with-data-types}
-
-Al crear una tupla sobre la marcha, ClickHouse detecta automáticamente el tipo de cada argumento como el mínimo de los tipos que pueden almacenar el valor del argumento. Si el argumento es [NULL](../../sql-reference/syntax.md#null-literal), el tipo del elemento de tupla es [NULL](nullable.md).
-
-Ejemplo de detección automática de tipos de datos:
-
-``` sql
-SELECT tuple(1, NULL) AS x, toTypeName(x)
-```
-
-``` text
-┌─x────────┬─toTypeName(tuple(1, NULL))──────┐
-│ (1,NULL) │ Tuple(UInt8, Nullable(Nothing)) │
-└──────────┴─────────────────────────────────┘
-```
-
-[Artículo Original](https://clickhouse.tech/docs/en/data_types/tuple/) <!--hide-->
diff --git a/docs/es/sql-reference/data-types/uuid.md b/docs/es/sql-reference/data-types/uuid.md
deleted file mode 100644
index 633db62d65f..00000000000
--- a/docs/es/sql-reference/data-types/uuid.md
+++ /dev/null
@@ -1,77 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 46
-toc_title: UUID
----
-
-# UUID {#uuid-data-type}
-
-Un identificador único universal (UUID) es un número de 16 bytes utilizado para identificar registros. Para obtener información detallada sobre el UUID, consulte [Wikipedia](https://en.wikipedia.org/wiki/Universally_unique_identifier).
-
-El ejemplo de valor de tipo UUID se representa a continuación:
-
-``` text
-61f0c404-5cb3-11e7-907b-a6006ad3dba0
-```
-
-Si no especifica el valor de la columna UUID al insertar un nuevo registro, el valor UUID se rellena con cero:
-
-``` text
-00000000-0000-0000-0000-000000000000
-```
-
-## Cómo generar {#how-to-generate}
-
-Para generar el valor UUID, ClickHouse proporciona el [GenerateUUIDv4](../../sql-reference/functions/uuid-functions.md) función.
-
-## Ejemplo de uso {#usage-example}
-
-**Ejemplo 1**
-
-En este ejemplo se muestra la creación de una tabla con la columna de tipo UUID e insertar un valor en la tabla.
-
-``` sql
-CREATE TABLE t_uuid (x UUID, y String) ENGINE=TinyLog
-```
-
-``` sql
-INSERT INTO t_uuid SELECT generateUUIDv4(), 'Example 1'
-```
-
-``` sql
-SELECT * FROM t_uuid
-```
-
-``` text
-┌────────────────────────────────────x─┬─y─────────┐
-│ 417ddc5d-e556-4d27-95dd-a34d84e46a50 │ Example 1 │
-└──────────────────────────────────────┴───────────┘
-```
-
-**Ejemplo 2**
-
-En este ejemplo, el valor de la columna UUID no se especifica al insertar un nuevo registro.
-
-``` sql
-INSERT INTO t_uuid (y) VALUES ('Example 2')
-```
-
-``` sql
-SELECT * FROM t_uuid
-```
-
-``` text
-┌────────────────────────────────────x─┬─y─────────┐
-│ 417ddc5d-e556-4d27-95dd-a34d84e46a50 │ Example 1 │
-│ 00000000-0000-0000-0000-000000000000 │ Example 2 │
-└──────────────────────────────────────┴───────────┘
-```
-
-## Restricción {#restrictions}
-
-El tipo de datos UUID sólo admite funciones que [Cadena](string.md) tipo de datos también soporta (por ejemplo, [minuto](../../sql-reference/aggregate-functions/reference.md#agg_function-min), [máximo](../../sql-reference/aggregate-functions/reference.md#agg_function-max), y [contar](../../sql-reference/aggregate-functions/reference.md#agg_function-count)).
-
-El tipo de datos UUID no es compatible con operaciones aritméticas (por ejemplo, [abdominales](../../sql-reference/functions/arithmetic-functions.md#arithm_func-abs)) o funciones agregadas, tales como [resumir](../../sql-reference/aggregate-functions/reference.md#agg_function-sum) y [avg](../../sql-reference/aggregate-functions/reference.md#agg_function-avg).
-
-[Artículo Original](https://clickhouse.tech/docs/en/data_types/uuid/) <!--hide-->
diff --git a/docs/es/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-hierarchical.md b/docs/es/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-hierarchical.md
deleted file mode 100644
index 68f18367872..00000000000
--- a/docs/es/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-hierarchical.md
+++ /dev/null
@@ -1,70 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 45
-toc_title: "Diccionarios jer\xE1rquicos"
----
-
-# Diccionarios jerárquicos {#hierarchical-dictionaries}
-
-ClickHouse soporta diccionarios jerárquicos con un [llave numérica](external-dicts-dict-structure.md#ext_dict-numeric-key).
-
-Mira la siguiente estructura jerárquica:
-
-``` text
-0 (Common parent)
-│
-├── 1 (Russia)
-│   │
-│   └── 2 (Moscow)
-│       │
-│       └── 3 (Center)
-│
-└── 4 (Great Britain)
-    │
-    └── 5 (London)
-```
-
-Esta jerarquía se puede expresar como la siguiente tabla de diccionario.
-
-| region_id | parent_region | nombre_región |
-|------------|----------------|----------------|
-| 1          | 0              | Rusia          |
-| 2          | 1              | Moscu          |
-| 3          | 2              | Centrar        |
-| 4          | 0              | Gran Bretaña   |
-| 5          | 4              | Londres        |
-
-Esta tabla contiene una columna `parent_region` que contiene la clave del padre más cercano para el elemento.
-
-ClickHouse soporta el [jerárquica](external-dicts-dict-structure.md#hierarchical-dict-attr) propiedad para [diccionario externo](index.md) atributo. Esta propiedad le permite configurar el diccionario jerárquico similar al descrito anteriormente.
-
-El [dictGetHierarchy](../../../sql-reference/functions/ext-dict-functions.md#dictgethierarchy) función le permite obtener la cadena principal de un elemento.
-
-Para nuestro ejemplo, la estructura del diccionario puede ser la siguiente:
-
-``` xml
-<dictionary>
-    <structure>
-        <id>
-            <name>region_id</name>
-        </id>
-
-        <attribute>
-            <name>parent_region</name>
-            <type>UInt64</type>
-            <null_value>0</null_value>
-            <hierarchical>true</hierarchical>
-        </attribute>
-
-        <attribute>
-            <name>region_name</name>
-            <type>String</type>
-            <null_value></null_value>
-        </attribute>
-
-    </structure>
-</dictionary>
-```
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/dicts/external_dicts_dict_hierarchical/) <!--hide-->
diff --git a/docs/es/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md b/docs/es/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md
deleted file mode 100644
index 85001c181eb..00000000000
--- a/docs/es/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md
+++ /dev/null
@@ -1,396 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 41
-toc_title: Almacenamiento de diccionarios en la memoria
----
-
-# Almacenamiento de diccionarios en la memoria {#dicts-external-dicts-dict-layout}
-
-Hay una variedad de formas de almacenar diccionarios en la memoria.
-
-Recomendamos [plano](#flat), [Hashed](#dicts-external_dicts_dict_layout-hashed) y [Método de codificación de datos:](#complex-key-hashed). que proporcionan una velocidad de procesamiento óptima.
-
-No se recomienda el almacenamiento en caché debido al rendimiento potencialmente bajo y las dificultades para seleccionar los parámetros óptimos. Lea más en la sección “[cache](#cache)”.
-
-Hay varias formas de mejorar el rendimiento del diccionario:
-
--   Llame a la función para trabajar con el diccionario después `GROUP BY`.
--   Marque los atributos para extraer como inyectivos. Un atributo se llama injective si diferentes valores de atributo corresponden a claves diferentes. Entonces, cuando `GROUP BY` utiliza una función que obtiene un valor de atributo mediante la clave, esta función se elimina automáticamente de `GROUP BY`.
-
-ClickHouse genera una excepción para errores con diccionarios. Ejemplos de errores:
-
--   No se pudo cargar el diccionario al que se accede.
--   Error al consultar un `cached` diccionario.
-
-Puede ver la lista de diccionarios externos y sus estados en el `system.dictionaries` tabla.
-
-La configuración se ve así:
-
-``` xml
-<yandex>
-    <dictionary>
-        ...
-        <layout>
-            <layout_type>
-                <!-- layout settings -->
-            </layout_type>
-        </layout>
-        ...
-    </dictionary>
-</yandex>
-```
-
-Correspondiente [Consulta DDL](../../statements/create.md#create-dictionary-query):
-
-``` sql
-CREATE DICTIONARY (...)
-...
-LAYOUT(LAYOUT_TYPE(param value)) -- layout settings
-...
-```
-
-## Maneras de almacenar diccionarios en la memoria {#ways-to-store-dictionaries-in-memory}
-
--   [plano](#flat)
--   [Hashed](#dicts-external_dicts_dict_layout-hashed)
--   [Sistema abierto.](#dicts-external_dicts_dict_layout-sparse_hashed)
--   [cache](#cache)
--   [directo](#direct)
--   [range_hashed](#range-hashed)
--   [Método de codificación de datos:](#complex-key-hashed)
--   [complejo_key_cache](#complex-key-cache)
--   [Método de codificación de datos:](#ip-trie)
-
-### plano {#flat}
-
-El diccionario está completamente almacenado en la memoria en forma de matrices planas. ¿Cuánta memoria usa el diccionario? La cantidad es proporcional al tamaño de la clave más grande (en el espacio utilizado).
-
-La clave del diccionario tiene el `UInt64` tipo y el valor está limitado a 500.000. Si se descubre una clave más grande al crear el diccionario, ClickHouse produce una excepción y no crea el diccionario.
-
-Se admiten todos los tipos de fuentes. Al actualizar, los datos (de un archivo o de una tabla) se leen en su totalidad.
-
-Este método proporciona el mejor rendimiento entre todos los métodos disponibles para almacenar el diccionario.
-
-Ejemplo de configuración:
-
-``` xml
-<layout>
-  <flat />
-</layout>
-```
-
-o
-
-``` sql
-LAYOUT(FLAT())
-```
-
-### Hashed {#dicts-external_dicts_dict_layout-hashed}
-
-El diccionario está completamente almacenado en la memoria en forma de una tabla hash. El diccionario puede contener cualquier número de elementos con cualquier identificador En la práctica, el número de claves puede alcanzar decenas de millones de elementos.
-
-Se admiten todos los tipos de fuentes. Al actualizar, los datos (de un archivo o de una tabla) se leen en su totalidad.
-
-Ejemplo de configuración:
-
-``` xml
-<layout>
-  <hashed />
-</layout>
-```
-
-o
-
-``` sql
-LAYOUT(HASHED())
-```
-
-### Sistema abierto {#dicts-external_dicts_dict_layout-sparse_hashed}
-
-Similar a `hashed`, pero usa menos memoria a favor más uso de CPU.
-
-Ejemplo de configuración:
-
-``` xml
-<layout>
-  <sparse_hashed />
-</layout>
-```
-
-``` sql
-LAYOUT(SPARSE_HASHED())
-```
-
-### Método de codificación de datos: {#complex-key-hashed}
-
-Este tipo de almacenamiento es para su uso con material compuesto [claves](external-dicts-dict-structure.md). Similar a `hashed`.
-
-Ejemplo de configuración:
-
-``` xml
-<layout>
-  <complex_key_hashed />
-</layout>
-```
-
-``` sql
-LAYOUT(COMPLEX_KEY_HASHED())
-```
-
-### range_hashed {#range-hashed}
-
-El diccionario se almacena en la memoria en forma de una tabla hash con una matriz ordenada de rangos y sus valores correspondientes.
-
-Este método de almacenamiento funciona de la misma manera que hash y permite el uso de intervalos de fecha / hora (tipo numérico arbitrario) además de la clave.
-
-Ejemplo: La tabla contiene descuentos para cada anunciante en el formato:
-
-``` text
-+---------|-------------|-------------|------+
-| advertiser id | discount start date | discount end date | amount |
-+===============+=====================+===================+========+
-| 123           | 2015-01-01          | 2015-01-15        | 0.15   |
-+---------|-------------|-------------|------+
-| 123           | 2015-01-16          | 2015-01-31        | 0.25   |
-+---------|-------------|-------------|------+
-| 456           | 2015-01-01          | 2015-01-15        | 0.05   |
-+---------|-------------|-------------|------+
-```
-
-Para utilizar un ejemplo para intervalos de fechas, defina el `range_min` y `range_max` elementos en el [estructura](external-dicts-dict-structure.md). Estos elementos deben contener elementos `name` y`type` (si `type` no se especifica, se utilizará el tipo predeterminado - Fecha). `type` puede ser de cualquier tipo numérico (Fecha / DateTime / UInt64 / Int32 / otros).
-
-Ejemplo:
-
-``` xml
-<structure>
-    <id>
-        <name>Id</name>
-    </id>
-    <range_min>
-        <name>first</name>
-        <type>Date</type>
-    </range_min>
-    <range_max>
-        <name>last</name>
-        <type>Date</type>
-    </range_max>
-    ...
-```
-
-o
-
-``` sql
-CREATE DICTIONARY somedict (
-    id UInt64,
-    first Date,
-    last Date
-)
-PRIMARY KEY id
-LAYOUT(RANGE_HASHED())
-RANGE(MIN first MAX last)
-```
-
-Para trabajar con estos diccionarios, debe pasar un argumento adicional al `dictGetT` función, para la que se selecciona un rango:
-
-``` sql
-dictGetT('dict_name', 'attr_name', id, date)
-```
-
-Esta función devuelve el valor para el `id`s y el intervalo de fechas que incluye la fecha pasada.
-
-Detalles del algoritmo:
-
--   Si el `id` no se encuentra o no se encuentra un rango para el `id` devuelve el valor predeterminado para el diccionario.
--   Si hay rangos superpuestos, puede usar cualquiera.
--   Si el delimitador de rango es `NULL` o una fecha no válida (como 1900-01-01 o 2039-01-01), el rango se deja abierto. La gama puede estar abierta en ambos lados.
-
-Ejemplo de configuración:
-
-``` xml
-<yandex>
-        <dictionary>
-
-                ...
-
-                <layout>
-                        <range_hashed />
-                </layout>
-
-                <structure>
-                        <id>
-                                <name>Abcdef</name>
-                        </id>
-                        <range_min>
-                                <name>StartTimeStamp</name>
-                                <type>UInt64</type>
-                        </range_min>
-                        <range_max>
-                                <name>EndTimeStamp</name>
-                                <type>UInt64</type>
-                        </range_max>
-                        <attribute>
-                                <name>XXXType</name>
-                                <type>String</type>
-                                <null_value />
-                        </attribute>
-                </structure>
-
-        </dictionary>
-</yandex>
-```
-
-o
-
-``` sql
-CREATE DICTIONARY somedict(
-    Abcdef UInt64,
-    StartTimeStamp UInt64,
-    EndTimeStamp UInt64,
-    XXXType String DEFAULT ''
-)
-PRIMARY KEY Abcdef
-RANGE(MIN StartTimeStamp MAX EndTimeStamp)
-```
-
-### cache {#cache}
-
-El diccionario se almacena en una memoria caché que tiene un número fijo de celdas. Estas celdas contienen elementos de uso frecuente.
-
-Al buscar un diccionario, primero se busca en la memoria caché. Para cada bloque de datos, todas las claves que no se encuentran en la memoria caché o están desactualizadas se solicitan desde el origen utilizando `SELECT attrs... FROM db.table WHERE id IN (k1, k2, ...)`. Los datos recibidos se escriben en la memoria caché.
-
-Para los diccionarios de caché, la caducidad [vida](external-dicts-dict-lifetime.md) de datos en la memoria caché se puede establecer. Si más tiempo que `lifetime` ha pasado desde que se cargaron los datos en una celda, el valor de la celda no se usa y se vuelve a solicitar la próxima vez que se deba usar.
-Esta es la menos efectiva de todas las formas de almacenar diccionarios. La velocidad de la memoria caché depende en gran medida de la configuración correcta y del escenario de uso. Un diccionario de tipo de caché funciona bien solo cuando las tasas de aciertos son lo suficientemente altas (recomendado 99% y superior). Puede ver la tasa de aciertos promedio en el `system.dictionaries` tabla.
-
-Para mejorar el rendimiento de la caché, utilice una subconsulta con `LIMIT`, y llame a la función con el diccionario externamente.
-
-Apoyar [fuente](external-dicts-dict-sources.md): MySQL, ClickHouse, ejecutable, HTTP.
-
-Ejemplo de configuración:
-
-``` xml
-<layout>
-    <cache>
-        <!-- The size of the cache, in number of cells. Rounded up to a power of two. -->
-        <size_in_cells>1000000000</size_in_cells>
-    </cache>
-</layout>
-```
-
-o
-
-``` sql
-LAYOUT(CACHE(SIZE_IN_CELLS 1000000000))
-```
-
-Establezca un tamaño de caché lo suficientemente grande. Necesitas experimentar para seleccionar el número de celdas:
-
-1.  Establecer algún valor.
-2.  Ejecute consultas hasta que la memoria caché esté completamente llena.
-3.  Evalúe el consumo de memoria utilizando el `system.dictionaries` tabla.
-4.  Aumente o disminuya el número de celdas hasta que se alcance el consumo de memoria requerido.
-
-!!! warning "Advertencia"
-    No use ClickHouse como fuente, ya que es lento procesar consultas con lecturas aleatorias.
-
-### complejo_key_cache {#complex-key-cache}
-
-Este tipo de almacenamiento es para su uso con material compuesto [claves](external-dicts-dict-structure.md). Similar a `cache`.
-
-### directo {#direct}
-
-El diccionario no se almacena en la memoria y va directamente a la fuente durante el procesamiento de una solicitud.
-
-La clave del diccionario tiene el `UInt64` tipo.
-
-Todos los tipos de [fuente](external-dicts-dict-sources.md), excepto los archivos locales, son compatibles.
-
-Ejemplo de configuración:
-
-``` xml
-<layout>
-  <direct />
-</layout>
-```
-
-o
-
-``` sql
-LAYOUT(DIRECT())
-```
-
-### Método de codificación de datos: {#ip-trie}
-
-Este tipo de almacenamiento sirve para asignar prefijos de red (direcciones IP) a metadatos como ASN.
-
-Ejemplo: La tabla contiene prefijos de red y su correspondiente número AS y código de país:
-
-``` text
-  +-----------|-----|------+
-  | prefix          | asn   | cca2   |
-  +=================+=======+========+
-  | 202.79.32.0/20  | 17501 | NP     |
-  +-----------|-----|------+
-  | 2620:0:870::/48 | 3856  | US     |
-  +-----------|-----|------+
-  | 2a02:6b8:1::/48 | 13238 | RU     |
-  +-----------|-----|------+
-  | 2001:db8::/32   | 65536 | ZZ     |
-  +-----------|-----|------+
-```
-
-Cuando se utiliza este tipo de diseño, la estructura debe tener una clave compuesta.
-
-Ejemplo:
-
-``` xml
-<structure>
-    <key>
-        <attribute>
-            <name>prefix</name>
-            <type>String</type>
-        </attribute>
-    </key>
-    <attribute>
-            <name>asn</name>
-            <type>UInt32</type>
-            <null_value />
-    </attribute>
-    <attribute>
-            <name>cca2</name>
-            <type>String</type>
-            <null_value>??</null_value>
-    </attribute>
-    ...
-```
-
-o
-
-``` sql
-CREATE DICTIONARY somedict (
-    prefix String,
-    asn UInt32,
-    cca2 String DEFAULT '??'
-)
-PRIMARY KEY prefix
-```
-
-La clave debe tener solo un atributo de tipo String que contenga un prefijo IP permitido. Todavía no se admiten otros tipos.
-
-Para consultas, debe utilizar las mismas funciones (`dictGetT` con una tupla) como para diccionarios con claves compuestas:
-
-``` sql
-dictGetT('dict_name', 'attr_name', tuple(ip))
-```
-
-La función toma cualquiera `UInt32` para IPv4, o `FixedString(16)` para IPv6:
-
-``` sql
-dictGetString('prefix', 'asn', tuple(IPv6StringToNum('2001:db8::1')))
-```
-
-Todavía no se admiten otros tipos. La función devuelve el atributo para el prefijo que corresponde a esta dirección IP. Si hay prefijos superpuestos, se devuelve el más específico.
-
-Los datos se almacenan en un `trie`. Debe encajar completamente en la RAM.
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/dicts/external_dicts_dict_layout/) <!--hide-->
diff --git a/docs/es/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md b/docs/es/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md
deleted file mode 100644
index a1b50e40138..00000000000
--- a/docs/es/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md
+++ /dev/null
@@ -1,91 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 42
-toc_title: Actualizaciones del diccionario
----
-
-# Actualizaciones del diccionario {#dictionary-updates}
-
-ClickHouse actualiza periódicamente los diccionarios. El intervalo de actualización para los diccionarios completamente descargados y el intervalo de invalidación para los diccionarios almacenados en caché se `<lifetime>` etiqueta en segundos.
-
-Las actualizaciones del diccionario (aparte de la carga para el primer uso) no bloquean las consultas. Durante las actualizaciones, se utiliza la versión anterior de un diccionario. Si se produce un error durante una actualización, el error se escribe en el registro del servidor y las consultas continúan utilizando la versión anterior de los diccionarios.
-
-Ejemplo de configuración:
-
-``` xml
-<dictionary>
-    ...
-    <lifetime>300</lifetime>
-    ...
-</dictionary>
-```
-
-``` sql
-CREATE DICTIONARY (...)
-...
-LIFETIME(300)
-...
-```
-
-Configuración `<lifetime>0</lifetime>` (`LIFETIME(0)`) impide que los diccionarios se actualicen.
-
-Puede establecer un intervalo de tiempo para las actualizaciones, y ClickHouse elegirá un tiempo uniformemente aleatorio dentro de este rango. Esto es necesario para distribuir la carga en la fuente del diccionario cuando se actualiza en una gran cantidad de servidores.
-
-Ejemplo de configuración:
-
-``` xml
-<dictionary>
-    ...
-    <lifetime>
-        <min>300</min>
-        <max>360</max>
-    </lifetime>
-    ...
-</dictionary>
-```
-
-o
-
-``` sql
-LIFETIME(MIN 300 MAX 360)
-```
-
-Si `<min>0</min>` y `<max>0</max>`, ClickHouse no vuelve a cargar el diccionario por tiempo de espera.
-En este caso, ClickHouse puede volver a cargar el diccionario anteriormente si el archivo de configuración del diccionario `SYSTEM RELOAD DICTIONARY` se ejecutó el comando.
-
-Al actualizar los diccionarios, el servidor ClickHouse aplica una lógica diferente según el tipo de [fuente](external-dicts-dict-sources.md):
-
-Al actualizar los diccionarios, el servidor ClickHouse aplica una lógica diferente según el tipo de [fuente](external-dicts-dict-sources.md):
-
--   Para un archivo de texto, comprueba el tiempo de modificación. Si la hora difiere de la hora previamente grabada, el diccionario se actualiza.
--   Para las tablas MyISAM, el tiempo de modificación se comprueba utilizando un `SHOW TABLE STATUS` consulta.
--   Los diccionarios de otras fuentes se actualizan cada vez de forma predeterminada.
-
-Para fuentes MySQL (InnoDB), ODBC y ClickHouse, puede configurar una consulta que actualizará los diccionarios solo si realmente cambiaron, en lugar de cada vez. Para ello, siga estos pasos:
-
--   La tabla del diccionario debe tener un campo que siempre cambie cuando se actualizan los datos de origen.
--   La configuración del origen debe especificar una consulta que recupere el campo de cambio. El servidor ClickHouse interpreta el resultado de la consulta como una fila, y si esta fila ha cambiado en relación con su estado anterior, el diccionario se actualiza. Especifique la consulta en el `<invalidate_query>` en la configuración de la [fuente](external-dicts-dict-sources.md).
-
-Ejemplo de configuración:
-
-``` xml
-<dictionary>
-    ...
-    <odbc>
-      ...
-      <invalidate_query>SELECT update_time FROM dictionary_source where id = 1</invalidate_query>
-    </odbc>
-    ...
-</dictionary>
-```
-
-o
-
-``` sql
-...
-SOURCE(ODBC(... invalidate_query 'SELECT update_time FROM dictionary_source where id = 1'))
-...
-```
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/dicts/external_dicts_dict_lifetime/) <!--hide-->
diff --git a/docs/es/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md b/docs/es/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md
deleted file mode 100644
index afeef7b4480..00000000000
--- a/docs/es/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md
+++ /dev/null
@@ -1,630 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 43
-toc_title: Fuentes de diccionarios externos
----
-
-# Fuentes de diccionarios externos {#dicts-external-dicts-dict-sources}
-
-Un diccionario externo se puede conectar desde muchas fuentes diferentes.
-
-Si el diccionario se configura usando xml-file, la configuración se ve así:
-
-``` xml
-<yandex>
-  <dictionary>
-    ...
-    <source>
-      <source_type>
-        <!-- Source configuration -->
-      </source_type>
-    </source>
-    ...
-  </dictionary>
-  ...
-</yandex>
-```
-
-En caso de [Consulta DDL](../../statements/create.md#create-dictionary-query), la configuración igual parecerá:
-
-``` sql
-CREATE DICTIONARY dict_name (...)
-...
-SOURCE(SOURCE_TYPE(param1 val1 ... paramN valN)) -- Source configuration
-...
-```
-
-El origen está configurado en el `source` apartado.
-
-Para tipos de origen [Archivo Local](#dicts-external_dicts_dict_sources-local_file), [Archivo ejecutable](#dicts-external_dicts_dict_sources-executable), [HTTP(s))](#dicts-external_dicts_dict_sources-http), [Haga clic en Casa](#dicts-external_dicts_dict_sources-clickhouse)
-ajustes opcionales están disponibles:
-
-``` xml
-<source>
-  <file>
-    <path>/opt/dictionaries/os.tsv</path>
-    <format>TabSeparated</format>
-  </file>
-  <settings>
-      <format_csv_allow_single_quotes>0</format_csv_allow_single_quotes>
-  </settings>
-</source>
-```
-
-o
-
-``` sql
-SOURCE(FILE(path '/opt/dictionaries/os.tsv' format 'TabSeparated'))
-SETTINGS(format_csv_allow_single_quotes = 0)
-```
-
-Tipos de fuentes (`source_type`):
-
--   [Archivo Local](#dicts-external_dicts_dict_sources-local_file)
--   [Archivo ejecutable](#dicts-external_dicts_dict_sources-executable)
--   [HTTP(s))](#dicts-external_dicts_dict_sources-http)
--   DBMS
-    -   [ODBC](#dicts-external_dicts_dict_sources-odbc)
-    -   [MySQL](#dicts-external_dicts_dict_sources-mysql)
-    -   [Haga clic en Casa](#dicts-external_dicts_dict_sources-clickhouse)
-    -   [MongoDB](#dicts-external_dicts_dict_sources-mongodb)
-    -   [Redis](#dicts-external_dicts_dict_sources-redis)
-
-## Archivo Local {#dicts-external_dicts_dict_sources-local_file}
-
-Ejemplo de configuración:
-
-``` xml
-<source>
-  <file>
-    <path>/opt/dictionaries/os.tsv</path>
-    <format>TabSeparated</format>
-  </file>
-</source>
-```
-
-o
-
-``` sql
-SOURCE(FILE(path '/opt/dictionaries/os.tsv' format 'TabSeparated'))
-```
-
-Configuración de campos:
-
--   `path` – The absolute path to the file.
--   `format` – The file format. All the formats described in “[Formato](../../../interfaces/formats.md#formats)” son compatibles.
-
-## Archivo ejecutable {#dicts-external_dicts_dict_sources-executable}
-
-Trabajar con archivos ejecutables depende de [cómo se almacena el diccionario en la memoria](external-dicts-dict-layout.md). Si el diccionario se almacena usando `cache` y `complex_key_cache`, ClickHouse solicita las claves necesarias enviando una solicitud al STDIN del archivo ejecutable. De lo contrario, ClickHouse inicia el archivo ejecutable y trata su salida como datos del diccionario.
-
-Ejemplo de configuración:
-
-``` xml
-<source>
-    <executable>
-        <command>cat /opt/dictionaries/os.tsv</command>
-        <format>TabSeparated</format>
-    </executable>
-</source>
-```
-
-o
-
-``` sql
-SOURCE(EXECUTABLE(command 'cat /opt/dictionaries/os.tsv' format 'TabSeparated'))
-```
-
-Configuración de campos:
-
--   `command` – The absolute path to the executable file, or the file name (if the program directory is written to `PATH`).
--   `format` – The file format. All the formats described in “[Formato](../../../interfaces/formats.md#formats)” son compatibles.
-
-## Http(s) {#dicts-external_dicts_dict_sources-http}
-
-Trabajar con un servidor HTTP depende de [cómo se almacena el diccionario en la memoria](external-dicts-dict-layout.md). Si el diccionario se almacena usando `cache` y `complex_key_cache`, ClickHouse solicita las claves necesarias enviando una solicitud a través del `POST` método.
-
-Ejemplo de configuración:
-
-``` xml
-<source>
-    <http>
-        <url>http://[::1]/os.tsv</url>
-        <format>TabSeparated</format>
-        <credentials>
-            <user>user</user>
-            <password>password</password>
-        </credentials>
-        <headers>
-            <header>
-                <name>API-KEY</name>
-                <value>key</value>
-            </header>
-        </headers>
-    </http>
-</source>
-```
-
-o
-
-``` sql
-SOURCE(HTTP(
-    url 'http://[::1]/os.tsv'
-    format 'TabSeparated'
-    credentials(user 'user' password 'password')
-    headers(header(name 'API-KEY' value 'key'))
-))
-```
-
-Para que ClickHouse tenga acceso a un recurso HTTPS, debe [configurar openSSL](../../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-openssl) en la configuración del servidor.
-
-Configuración de campos:
-
--   `url` – The source URL.
--   `format` – The file format. All the formats described in “[Formato](../../../interfaces/formats.md#formats)” son compatibles.
--   `credentials` – Basic HTTP authentication. Optional parameter.
-    -   `user` – Username required for the authentication.
-    -   `password` – Password required for the authentication.
--   `headers` – All custom HTTP headers entries used for the HTTP request. Optional parameter.
-    -   `header` – Single HTTP header entry.
-    -   `name` – Identifiant name used for the header send on the request.
-    -   `value` – Value set for a specific identifiant name.
-
-## ODBC {#dicts-external_dicts_dict_sources-odbc}
-
-Puede utilizar este método para conectar cualquier base de datos que tenga un controlador ODBC.
-
-Ejemplo de configuración:
-
-``` xml
-<source>
-    <odbc>
-        <db>DatabaseName</db>
-        <table>ShemaName.TableName</table>
-        <connection_string>DSN=some_parameters</connection_string>
-        <invalidate_query>SQL_QUERY</invalidate_query>
-    </odbc>
-</source>
-```
-
-o
-
-``` sql
-SOURCE(ODBC(
-    db 'DatabaseName'
-    table 'SchemaName.TableName'
-    connection_string 'DSN=some_parameters'
-    invalidate_query 'SQL_QUERY'
-))
-```
-
-Configuración de campos:
-
--   `db` – Name of the database. Omit it if the database name is set in the `<connection_string>` parámetros.
--   `table` – Name of the table and schema if exists.
--   `connection_string` – Connection string.
--   `invalidate_query` – Query for checking the dictionary status. Optional parameter. Read more in the section [Actualización de diccionarios](external-dicts-dict-lifetime.md).
-
-ClickHouse recibe símbolos de cotización del controlador ODBC y cita todas las configuraciones en las consultas al controlador, por lo que es necesario establecer el nombre de la tabla de acuerdo con el caso del nombre de la tabla en la base de datos.
-
-Si tiene problemas con las codificaciones al utilizar Oracle, consulte el [FAQ](../../../faq/general.md#oracle-odbc-encodings) artículo.
-
-### Vulnerabilidad conocida de la funcionalidad del diccionario ODBC {#known-vulnerability-of-the-odbc-dictionary-functionality}
-
-!!! attention "Atención"
-    Cuando se conecta a la base de datos a través del parámetro de conexión del controlador ODBC `Servername` puede ser sustituido. En este caso los valores de `USERNAME` y `PASSWORD` de `odbc.ini` se envían al servidor remoto y pueden verse comprometidos.
-
-**Ejemplo de uso inseguro**
-
-Vamos a configurar unixODBC para PostgreSQL. Contenido de `/etc/odbc.ini`:
-
-``` text
-[gregtest]
-Driver = /usr/lib/psqlodbca.so
-Servername = localhost
-PORT = 5432
-DATABASE = test_db
-#OPTION = 3
-USERNAME = test
-PASSWORD = test
-```
-
-Si luego realiza una consulta como
-
-``` sql
-SELECT * FROM odbc('DSN=gregtest;Servername=some-server.com', 'test_db');
-```
-
-El controlador ODBC enviará valores de `USERNAME` y `PASSWORD` de `odbc.ini` a `some-server.com`.
-
-### Ejemplo de Connecting Postgresql {#example-of-connecting-postgresql}
-
-Sistema operativo Ubuntu.
-
-Instalación de unixODBC y el controlador ODBC para PostgreSQL:
-
-``` bash
-$ sudo apt-get install -y unixodbc odbcinst odbc-postgresql
-```
-
-Configuración `/etc/odbc.ini` (o `~/.odbc.ini`):
-
-``` text
-    [DEFAULT]
-    Driver = myconnection
-
-    [myconnection]
-    Description         = PostgreSQL connection to my_db
-    Driver              = PostgreSQL Unicode
-    Database            = my_db
-    Servername          = 127.0.0.1
-    UserName            = username
-    Password            = password
-    Port                = 5432
-    Protocol            = 9.3
-    ReadOnly            = No
-    RowVersioning       = No
-    ShowSystemTables    = No
-    ConnSettings        =
-```
-
-La configuración del diccionario en ClickHouse:
-
-``` xml
-<yandex>
-    <dictionary>
-        <name>table_name</name>
-        <source>
-            <odbc>
-                <!-- You can specify the following parameters in connection_string: -->
-                <!-- DSN=myconnection;UID=username;PWD=password;HOST=127.0.0.1;PORT=5432;DATABASE=my_db -->
-                <connection_string>DSN=myconnection</connection_string>
-                <table>postgresql_table</table>
-            </odbc>
-        </source>
-        <lifetime>
-            <min>300</min>
-            <max>360</max>
-        </lifetime>
-        <layout>
-            <hashed/>
-        </layout>
-        <structure>
-            <id>
-                <name>id</name>
-            </id>
-            <attribute>
-                <name>some_column</name>
-                <type>UInt64</type>
-                <null_value>0</null_value>
-            </attribute>
-        </structure>
-    </dictionary>
-</yandex>
-```
-
-o
-
-``` sql
-CREATE DICTIONARY table_name (
-    id UInt64,
-    some_column UInt64 DEFAULT 0
-)
-PRIMARY KEY id
-SOURCE(ODBC(connection_string 'DSN=myconnection' table 'postgresql_table'))
-LAYOUT(HASHED())
-LIFETIME(MIN 300 MAX 360)
-```
-
-Es posible que tenga que editar `odbc.ini` para especificar la ruta completa a la biblioteca con el controlador `DRIVER=/usr/local/lib/psqlodbcw.so`.
-
-### Ejemplo de conexión de MS SQL Server {#example-of-connecting-ms-sql-server}
-
-Sistema operativo Ubuntu.
-
-Instalación del controlador: :
-
-``` bash
-$ sudo apt-get install tdsodbc freetds-bin sqsh
-```
-
-Configuración del controlador:
-
-``` bash
-    $ cat /etc/freetds/freetds.conf
-    ...
-
-    [MSSQL]
-    host = 192.168.56.101
-    port = 1433
-    tds version = 7.0
-    client charset = UTF-8
-
-    $ cat /etc/odbcinst.ini
-    ...
-
-    [FreeTDS]
-    Description     = FreeTDS
-    Driver          = /usr/lib/x86_64-linux-gnu/odbc/libtdsodbc.so
-    Setup           = /usr/lib/x86_64-linux-gnu/odbc/libtdsS.so
-    FileUsage       = 1
-    UsageCount      = 5
-
-    $ cat ~/.odbc.ini
-    ...
-
-    [MSSQL]
-    Description     = FreeTDS
-    Driver          = FreeTDS
-    Servername      = MSSQL
-    Database        = test
-    UID             = test
-    PWD             = test
-    Port            = 1433
-```
-
-Configuración del diccionario en ClickHouse:
-
-``` xml
-<yandex>
-    <dictionary>
-        <name>test</name>
-        <source>
-            <odbc>
-                <table>dict</table>
-                <connection_string>DSN=MSSQL;UID=test;PWD=test</connection_string>
-            </odbc>
-        </source>
-
-        <lifetime>
-            <min>300</min>
-            <max>360</max>
-        </lifetime>
-
-        <layout>
-            <flat />
-        </layout>
-
-        <structure>
-            <id>
-                <name>k</name>
-            </id>
-            <attribute>
-                <name>s</name>
-                <type>String</type>
-                <null_value></null_value>
-            </attribute>
-        </structure>
-    </dictionary>
-</yandex>
-```
-
-o
-
-``` sql
-CREATE DICTIONARY test (
-    k UInt64,
-    s String DEFAULT ''
-)
-PRIMARY KEY k
-SOURCE(ODBC(table 'dict' connection_string 'DSN=MSSQL;UID=test;PWD=test'))
-LAYOUT(FLAT())
-LIFETIME(MIN 300 MAX 360)
-```
-
-## DBMS {#dbms}
-
-### Mysql {#dicts-external_dicts_dict_sources-mysql}
-
-Ejemplo de configuración:
-
-``` xml
-<source>
-  <mysql>
-      <port>3306</port>
-      <user>clickhouse</user>
-      <password>qwerty</password>
-      <replica>
-          <host>example01-1</host>
-          <priority>1</priority>
-      </replica>
-      <replica>
-          <host>example01-2</host>
-          <priority>1</priority>
-      </replica>
-      <db>db_name</db>
-      <table>table_name</table>
-      <where>id=10</where>
-      <invalidate_query>SQL_QUERY</invalidate_query>
-  </mysql>
-</source>
-```
-
-o
-
-``` sql
-SOURCE(MYSQL(
-    port 3306
-    user 'clickhouse'
-    password 'qwerty'
-    replica(host 'example01-1' priority 1)
-    replica(host 'example01-2' priority 1)
-    db 'db_name'
-    table 'table_name'
-    where 'id=10'
-    invalidate_query 'SQL_QUERY'
-))
-```
-
-Configuración de campos:
-
--   `port` – The port on the MySQL server. You can specify it for all replicas, or for each one individually (inside `<replica>`).
-
--   `user` – Name of the MySQL user. You can specify it for all replicas, or for each one individually (inside `<replica>`).
-
--   `password` – Password of the MySQL user. You can specify it for all replicas, or for each one individually (inside `<replica>`).
-
--   `replica` – Section of replica configurations. There can be multiple sections.
-
-        - `replica/host` – The MySQL host.
-        - `replica/priority` – The replica priority. When attempting to connect, ClickHouse traverses the replicas in order of priority. The lower the number, the higher the priority.
-
--   `db` – Name of the database.
-
--   `table` – Name of the table.
-
--   `where` – The selection criteria. The syntax for conditions is the same as for `WHERE` cláusula en MySQL, por ejemplo, `id > 10 AND id < 20`. Parámetro opcional.
-
--   `invalidate_query` – Query for checking the dictionary status. Optional parameter. Read more in the section [Actualización de diccionarios](external-dicts-dict-lifetime.md).
-
-MySQL se puede conectar en un host local a través de sockets. Para hacer esto, establezca `host` y `socket`.
-
-Ejemplo de configuración:
-
-``` xml
-<source>
-  <mysql>
-      <host>localhost</host>
-      <socket>/path/to/socket/file.sock</socket>
-      <user>clickhouse</user>
-      <password>qwerty</password>
-      <db>db_name</db>
-      <table>table_name</table>
-      <where>id=10</where>
-      <invalidate_query>SQL_QUERY</invalidate_query>
-  </mysql>
-</source>
-```
-
-o
-
-``` sql
-SOURCE(MYSQL(
-    host 'localhost'
-    socket '/path/to/socket/file.sock'
-    user 'clickhouse'
-    password 'qwerty'
-    db 'db_name'
-    table 'table_name'
-    where 'id=10'
-    invalidate_query 'SQL_QUERY'
-))
-```
-
-### Haga clic en Casa {#dicts-external_dicts_dict_sources-clickhouse}
-
-Ejemplo de configuración:
-
-``` xml
-<source>
-    <clickhouse>
-        <host>example01-01-1</host>
-        <port>9000</port>
-        <user>default</user>
-        <password></password>
-        <db>default</db>
-        <table>ids</table>
-        <where>id=10</where>
-    </clickhouse>
-</source>
-```
-
-o
-
-``` sql
-SOURCE(CLICKHOUSE(
-    host 'example01-01-1'
-    port 9000
-    user 'default'
-    password ''
-    db 'default'
-    table 'ids'
-    where 'id=10'
-))
-```
-
-Configuración de campos:
-
--   `host` – The ClickHouse host. If it is a local host, the query is processed without any network activity. To improve fault tolerance, you can create a [Distribuido](../../../engines/table-engines/special/distributed.md) tabla e ingrésela en configuraciones posteriores.
--   `port` – The port on the ClickHouse server.
--   `user` – Name of the ClickHouse user.
--   `password` – Password of the ClickHouse user.
--   `db` – Name of the database.
--   `table` – Name of the table.
--   `where` – The selection criteria. May be omitted.
--   `invalidate_query` – Query for checking the dictionary status. Optional parameter. Read more in the section [Actualización de diccionarios](external-dicts-dict-lifetime.md).
-
-### Mongodb {#dicts-external_dicts_dict_sources-mongodb}
-
-Ejemplo de configuración:
-
-``` xml
-<source>
-    <mongodb>
-        <host>localhost</host>
-        <port>27017</port>
-        <user></user>
-        <password></password>
-        <db>test</db>
-        <collection>dictionary_source</collection>
-    </mongodb>
-</source>
-```
-
-o
-
-``` sql
-SOURCE(MONGO(
-    host 'localhost'
-    port 27017
-    user ''
-    password ''
-    db 'test'
-    collection 'dictionary_source'
-))
-```
-
-Configuración de campos:
-
--   `host` – The MongoDB host.
--   `port` – The port on the MongoDB server.
--   `user` – Name of the MongoDB user.
--   `password` – Password of the MongoDB user.
--   `db` – Name of the database.
--   `collection` – Name of the collection.
-
-### Redis {#dicts-external_dicts_dict_sources-redis}
-
-Ejemplo de configuración:
-
-``` xml
-<source>
-    <redis>
-        <host>localhost</host>
-        <port>6379</port>
-        <storage_type>simple</storage_type>
-        <db_index>0</db_index>
-    </redis>
-</source>
-```
-
-o
-
-``` sql
-SOURCE(REDIS(
-    host 'localhost'
-    port 6379
-    storage_type 'simple'
-    db_index 0
-))
-```
-
-Configuración de campos:
-
--   `host` – The Redis host.
--   `port` – The port on the Redis server.
--   `storage_type` – The structure of internal Redis storage using for work with keys. `simple` es para fuentes simples y para fuentes de clave única hash, `hash_map` es para fuentes hash con dos teclas. Los orígenes a distancia y los orígenes de caché con clave compleja no son compatibles. Puede omitirse, el valor predeterminado es `simple`.
--   `db_index` – The specific numeric index of Redis logical database. May be omitted, default value is 0.
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/dicts/external_dicts_dict_sources/) <!--hide-->
diff --git a/docs/es/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md b/docs/es/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md
deleted file mode 100644
index 74e8ccde074..00000000000
--- a/docs/es/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md
+++ /dev/null
@@ -1,175 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 44
-toc_title: Clave y campos del diccionario
----
-
-# Clave y campos del diccionario {#dictionary-key-and-fields}
-
-El `<structure>` cláusula describe la clave del diccionario y los campos disponibles para consultas.
-
-Descripción XML:
-
-``` xml
-<dictionary>
-    <structure>
-        <id>
-            <name>Id</name>
-        </id>
-
-        <attribute>
-            <!-- Attribute parameters -->
-        </attribute>
-
-        ...
-
-    </structure>
-</dictionary>
-```
-
-Los atributos se describen en los elementos:
-
--   `<id>` — [Columna clave](external-dicts-dict-structure.md#ext_dict_structure-key).
--   `<attribute>` — [Columna de datos](external-dicts-dict-structure.md#ext_dict_structure-attributes). Puede haber un número múltiple de atributos.
-
-Consulta DDL:
-
-``` sql
-CREATE DICTIONARY dict_name (
-    Id UInt64,
-    -- attributes
-)
-PRIMARY KEY Id
-...
-```
-
-Los atributos se describen en el cuerpo de la consulta:
-
--   `PRIMARY KEY` — [Columna clave](external-dicts-dict-structure.md#ext_dict_structure-key)
--   `AttrName AttrType` — [Columna de datos](external-dicts-dict-structure.md#ext_dict_structure-attributes). Puede haber un número múltiple de atributos.
-
-## Clave {#ext_dict_structure-key}
-
-ClickHouse admite los siguientes tipos de claves:
-
--   Tecla numérica. `UInt64`. Definido en el `<id>` etiqueta o usando `PRIMARY KEY` palabra clave.
--   Clave compuesta. Conjunto de valores de diferentes tipos. Definido en la etiqueta `<key>` o `PRIMARY KEY` palabra clave.
-
-Una estructura xml puede contener `<id>` o `<key>`. La consulta DDL debe contener `PRIMARY KEY`.
-
-!!! warning "Advertencia"
-    No debe describir la clave como un atributo.
-
-### Tecla numérica {#ext_dict-numeric-key}
-
-Tipo: `UInt64`.
-
-Ejemplo de configuración:
-
-``` xml
-<id>
-    <name>Id</name>
-</id>
-```
-
-Campos de configuración:
-
--   `name` – The name of the column with keys.
-
-Para consulta DDL:
-
-``` sql
-CREATE DICTIONARY (
-    Id UInt64,
-    ...
-)
-PRIMARY KEY Id
-...
-```
-
--   `PRIMARY KEY` – The name of the column with keys.
-
-### Clave compuesta {#composite-key}
-
-La clave puede ser un `tuple` de cualquier tipo de campo. El [diseño](external-dicts-dict-layout.md) en este caso debe ser `complex_key_hashed` o `complex_key_cache`.
-
-!!! tip "Consejo"
-    Una clave compuesta puede consistir en un solo elemento. Esto hace posible usar una cadena como clave, por ejemplo.
-
-La estructura clave se establece en el elemento `<key>`. Los campos clave se especifican en el mismo formato que el diccionario [atributo](external-dicts-dict-structure.md). Ejemplo:
-
-``` xml
-<structure>
-    <key>
-        <attribute>
-            <name>field1</name>
-            <type>String</type>
-        </attribute>
-        <attribute>
-            <name>field2</name>
-            <type>UInt32</type>
-        </attribute>
-        ...
-    </key>
-...
-```
-
-o
-
-``` sql
-CREATE DICTIONARY (
-    field1 String,
-    field2 String
-    ...
-)
-PRIMARY KEY field1, field2
-...
-```
-
-Para una consulta al `dictGet*` función, una tupla se pasa como la clave. Ejemplo: `dictGetString('dict_name', 'attr_name', tuple('string for field1', num_for_field2))`.
-
-## Atributo {#ext_dict_structure-attributes}
-
-Ejemplo de configuración:
-
-``` xml
-<structure>
-    ...
-    <attribute>
-        <name>Name</name>
-        <type>ClickHouseDataType</type>
-        <null_value></null_value>
-        <expression>rand64()</expression>
-        <hierarchical>true</hierarchical>
-        <injective>true</injective>
-        <is_object_id>true</is_object_id>
-    </attribute>
-</structure>
-```
-
-o
-
-``` sql
-CREATE DICTIONARY somename (
-    Name ClickHouseDataType DEFAULT '' EXPRESSION rand64() HIERARCHICAL INJECTIVE IS_OBJECT_ID
-)
-```
-
-Campos de configuración:
-
-| Etiqueta                                             | Descripci                                                                                                                                                                                                                                                                                                                                                                                 | Requerir |
-|------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|
-| `name`                                               | Nombre de columna.                                                                                                                                                                                                                                                                                                                                                                        | Sí       |
-| `type`                                               | Tipo de datos ClickHouse.<br/>ClickHouse intenta convertir el valor del diccionario al tipo de datos especificado. Por ejemplo, para MySQL, el campo podría ser `TEXT`, `VARCHAR`, o `BLOB` en la tabla fuente de MySQL, pero se puede cargar como `String` en ClickHouse.<br/>[NULL](../../../sql-reference/data-types/nullable.md) no es compatible.                                    | Sí       |
-| `null_value`                                         | Valor predeterminado para un elemento no existente.<br/>En el ejemplo, es una cadena vacía. No se puede utilizar `NULL` en este campo.                                                                                                                                                                                                                                                    | Sí       |
-| `expression`                                         | [Expresion](../../syntax.md#syntax-expressions) que ClickHouse ejecuta en el valor.<br/>La expresión puede ser un nombre de columna en la base de datos SQL remota. Por lo tanto, puede usarlo para crear un alias para la columna remota.<br/><br/>Valor predeterminado: sin expresión.                                                                                                  | No       |
-| <a name="hierarchical-dict-attr"></a> `hierarchical` | Si `true` el atributo contiene el valor de una clave primaria para la clave actual. Ver [Diccionarios jerárquicos](external-dicts-dict-hierarchical.md).<br/><br/>Valor predeterminado: `false`.                                                                                                                                                                                          | No       |
-| `injective`                                          | Indicador que muestra si el `id -> attribute` la imagen es [inyectivo](https://en.wikipedia.org/wiki/Injective_function).<br/>Si `true`, ClickHouse puede colocar automáticamente después de la `GROUP BY` cláusula las solicitudes a los diccionarios con inyección. Por lo general, reduce significativamente la cantidad de tales solicitudes.<br/><br/>Valor predeterminado: `false`. | No       |
-| `is_object_id`                                       | Indicador que muestra si la consulta se ejecuta para un documento MongoDB mediante `ObjectID`.<br/><br/>Valor predeterminado: `false`.                                                                                                                                                                                                                                                    | No       |
-
-## Ver también {#see-also}
-
--   [Funciones para trabajar con diccionarios externos](../../../sql-reference/functions/ext-dict-functions.md).
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/dicts/external_dicts_dict_structure/) <!--hide-->
diff --git a/docs/es/sql-reference/dictionaries/external-dictionaries/external-dicts-dict.md b/docs/es/sql-reference/dictionaries/external-dictionaries/external-dicts-dict.md
deleted file mode 100644
index 87026003388..00000000000
--- a/docs/es/sql-reference/dictionaries/external-dictionaries/external-dicts-dict.md
+++ /dev/null
@@ -1,53 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 40
-toc_title: "Configuraci\xF3n de un diccionario externo"
----
-
-# Configuración de un diccionario externo {#dicts-external-dicts-dict}
-
-Si el diccionario se configura usando un archivo xml, la configuración del diccionario tiene la siguiente estructura:
-
-``` xml
-<dictionary>
-    <name>dict_name</name>
-
-    <structure>
-      <!-- Complex key configuration -->
-    </structure>
-
-    <source>
-      <!-- Source configuration -->
-    </source>
-
-    <layout>
-      <!-- Memory layout configuration -->
-    </layout>
-
-    <lifetime>
-      <!-- Lifetime of dictionary in memory -->
-    </lifetime>
-</dictionary>
-```
-
-Correspondiente [Consulta DDL](../../statements/create.md#create-dictionary-query) tiene la siguiente estructura:
-
-``` sql
-CREATE DICTIONARY dict_name
-(
-    ... -- attributes
-)
-PRIMARY KEY ... -- complex or single key configuration
-SOURCE(...) -- Source configuration
-LAYOUT(...) -- Memory layout configuration
-LIFETIME(...) -- Lifetime of dictionary in memory
-```
-
--   `name` – The identifier that can be used to access the dictionary. Use the characters `[a-zA-Z0-9_\-]`.
--   [fuente](external-dicts-dict-sources.md) — Source of the dictionary.
--   [diseño](external-dicts-dict-layout.md) — Dictionary layout in memory.
--   [estructura](external-dicts-dict-structure.md) — Structure of the dictionary . A key and attributes that can be retrieved by this key.
--   [vida](external-dicts-dict-lifetime.md) — Frequency of dictionary updates.
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/dicts/external_dicts_dict/) <!--hide-->
diff --git a/docs/es/sql-reference/dictionaries/external-dictionaries/external-dicts.md b/docs/es/sql-reference/dictionaries/external-dictionaries/external-dicts.md
deleted file mode 100644
index ecb4fa9fc63..00000000000
--- a/docs/es/sql-reference/dictionaries/external-dictionaries/external-dicts.md
+++ /dev/null
@@ -1,62 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 39
-toc_title: "Descripci\xF3n General"
----
-
-# Diccionarios externos {#dicts-external-dicts}
-
-Puede agregar sus propios diccionarios de varias fuentes de datos. El origen de datos de un diccionario puede ser un archivo ejecutable o de texto local, un recurso HTTP u otro DBMS. Para obtener más información, consulte “[Fuentes para diccionarios externos](external-dicts-dict-sources.md)”.
-
-Haga clic en Casa:
-
--   Almacena total o parcialmente los diccionarios en RAM.
--   Actualiza periódicamente los diccionarios y carga dinámicamente los valores que faltan. En otras palabras, los diccionarios se pueden cargar dinámicamente.
--   Permite crear diccionarios externos con archivos xml o [Consultas DDL](../../statements/create.md#create-dictionary-query).
-
-La configuración de diccionarios externos se puede ubicar en uno o más archivos xml. La ruta de acceso a la configuración se especifica en el [Diccionarios_config](../../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-dictionaries_config) parámetro.
-
-Los diccionarios se pueden cargar en el inicio del servidor o en el primer uso, dependiendo de la [Diccionarios_lazy_load](../../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-dictionaries_lazy_load) configuración.
-
-El [diccionario](../../../operations/system-tables.md#system_tables-dictionaries) La tabla del sistema contiene información sobre los diccionarios configurados en el servidor. Para cada diccionario se puede encontrar allí:
-
--   Estado del diccionario.
--   Parámetros de configuración.
--   Métricas como la cantidad de RAM asignada para el diccionario o un número de consultas desde que el diccionario se cargó correctamente.
-
-El archivo de configuración del diccionario tiene el siguiente formato:
-
-``` xml
-<yandex>
-    <comment>An optional element with any content. Ignored by the ClickHouse server.</comment>
-
-    <!--Optional element. File name with substitutions-->
-    <include_from>/etc/metrika.xml</include_from>
-
-
-    <dictionary>
-        <!-- Dictionary configuration. -->
-        <!-- There can be any number of <dictionary> sections in the configuration file. -->
-    </dictionary>
-
-</yandex>
-```
-
-Usted puede [configurar](external-dicts-dict.md) cualquier número de diccionarios en el mismo archivo.
-
-[Consultas DDL para diccionarios](../../statements/create.md#create-dictionary-query) no requiere ningún registro adicional en la configuración del servidor. Permiten trabajar con diccionarios como entidades de primera clase, como tablas o vistas.
-
-!!! attention "Atención"
-    Puede convertir valores para un diccionario pequeño describiéndolo en un `SELECT` consulta (ver el [transformar](../../../sql-reference/functions/other-functions.md) función). Esta funcionalidad no está relacionada con diccionarios externos.
-
-## Ver también {#ext-dicts-see-also}
-
--   [Configuración de un diccionario externo](external-dicts-dict.md)
--   [Almacenamiento de diccionarios en la memoria](external-dicts-dict-layout.md)
--   [Actualizaciones del diccionario](external-dicts-dict-lifetime.md)
--   [Fuentes de diccionarios externos](external-dicts-dict-sources.md)
--   [Clave y campos del diccionario](external-dicts-dict-structure.md)
--   [Funciones para trabajar con diccionarios externos](../../../sql-reference/functions/ext-dict-functions.md)
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/dicts/external_dicts/) <!--hide-->
diff --git a/docs/es/sql-reference/dictionaries/external-dictionaries/index.md b/docs/es/sql-reference/dictionaries/external-dictionaries/index.md
deleted file mode 100644
index 290b54cb7b8..00000000000
--- a/docs/es/sql-reference/dictionaries/external-dictionaries/index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: Diccionarios externos
-toc_priority: 37
----
-
-
diff --git a/docs/es/sql-reference/dictionaries/index.md b/docs/es/sql-reference/dictionaries/index.md
deleted file mode 100644
index 21219fb3688..00000000000
--- a/docs/es/sql-reference/dictionaries/index.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: Diccionario
-toc_priority: 35
-toc_title: "Implantaci\xF3n"
----
-
-# Diccionario {#dictionaries}
-
-Un diccionario es un mapeo (`key -> attributes`) que es conveniente para varios tipos de listas de referencia.
-
-ClickHouse admite funciones especiales para trabajar con diccionarios que se pueden usar en consultas. Es más fácil y más eficiente usar diccionarios con funciones que un `JOIN` con tablas de referencia.
-
-[NULL](../../sql-reference/syntax.md#null-literal) los valores no se pueden almacenar en un diccionario.
-
-Soporta ClickHouse:
-
--   [Diccionarios incorporados](internal-dicts.md#internal_dicts) con una específica [conjunto de funciones](../../sql-reference/functions/ym-dict-functions.md).
--   [Diccionarios complementarios (externos)](external-dictionaries/external-dicts.md#dicts-external-dicts) con un [conjunto de funciones](../../sql-reference/functions/ext-dict-functions.md).
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/dicts/) <!--hide-->
diff --git a/docs/es/sql-reference/dictionaries/internal-dicts.md b/docs/es/sql-reference/dictionaries/internal-dicts.md
deleted file mode 100644
index 9f5217e6fc3..00000000000
--- a/docs/es/sql-reference/dictionaries/internal-dicts.md
+++ /dev/null
@@ -1,55 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 39
-toc_title: Diccionarios internos
----
-
-# Diccionarios internos {#internal_dicts}
-
-ClickHouse contiene una función integrada para trabajar con una geobase.
-
-Esto le permite:
-
--   Utilice el ID de una región para obtener su nombre en el idioma deseado.
--   Utilice el ID de una región para obtener el ID de una ciudad, área, distrito federal, país o continente.
--   Compruebe si una región es parte de otra región.
--   Obtener una cadena de regiones principales.
-
-Todas las funciones de apoyo “translocality,” la capacidad de utilizar simultáneamente diferentes perspectivas sobre la propiedad de la región. Para obtener más información, consulte la sección “Functions for working with Yandex.Metrica dictionaries”.
-
-Los diccionarios internos están deshabilitados en el paquete predeterminado.
-Para habilitarlos, descomente los parámetros `path_to_regions_hierarchy_file` y `path_to_regions_names_files` en el archivo de configuración del servidor.
-
-La geobase se carga desde archivos de texto.
-
-Coloque el `regions_hierarchy*.txt` archivos en el `path_to_regions_hierarchy_file` directorio. Este parámetro de configuración debe contener la ruta `regions_hierarchy.txt` archivo (la jerarquía regional predeterminada), y los otros archivos (`regions_hierarchy_ua.txt`) debe estar ubicado en el mismo directorio.
-
-Ponga el `regions_names_*.txt` archivos en el `path_to_regions_names_files` directorio.
-
-También puede crear estos archivos usted mismo. El formato de archivo es el siguiente:
-
-`regions_hierarchy*.txt`: TabSeparated (sin encabezado), columnas:
-
--   ID de la región (`UInt32`)
--   ID de región padre (`UInt32`)
--   tipo de región (`UInt8`): 1 - continente, 3 - país, 4 - distrito federal, 5 - región, 6 - ciudad; otros tipos no tienen valores
--   población (`UInt32`) — optional column
-
-`regions_names_*.txt`: TabSeparated (sin encabezado), columnas:
-
--   ID de la región (`UInt32`)
--   nombre de la región (`String`) — Can't contain tabs or line feeds, even escaped ones.
-
-Una matriz plana se usa para almacenar en RAM. Por esta razón, los ID no deberían ser más de un millón.
-
-Los diccionarios se pueden actualizar sin reiniciar el servidor. Sin embargo, el conjunto de diccionarios disponibles no se actualiza.
-Para las actualizaciones, se comprueban los tiempos de modificación de archivos. Si un archivo ha cambiado, el diccionario se actualiza.
-El intervalo para comprobar si hay cambios se configura en el `builtin_dictionaries_reload_interval` parámetro.
-Las actualizaciones del diccionario (aparte de la carga al primer uso) no bloquean las consultas. Durante las actualizaciones, las consultas utilizan las versiones anteriores de los diccionarios. Si se produce un error durante una actualización, el error se escribe en el registro del servidor y las consultas continúan utilizando la versión anterior de los diccionarios.
-
-Recomendamos actualizar periódicamente los diccionarios con la geobase. Durante una actualización, genere nuevos archivos y escríbalos en una ubicación separada. Cuando todo esté listo, cambie el nombre a los archivos utilizados por el servidor.
-
-También hay funciones para trabajar con identificadores de sistema operativo y Yandex.Motores de búsqueda Metrica, pero no deben ser utilizados.
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/dicts/internal_dicts/) <!--hide-->
diff --git a/docs/es/sql-reference/functions/arithmetic-functions.md b/docs/es/sql-reference/functions/arithmetic-functions.md
deleted file mode 100644
index 02bd37a8169..00000000000
--- a/docs/es/sql-reference/functions/arithmetic-functions.md
+++ /dev/null
@@ -1,87 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 35
-toc_title: "Aritm\xE9tica"
----
-
-# Funciones aritméticas {#arithmetic-functions}
-
-Para todas las funciones aritméticas, el tipo de resultado se calcula como el tipo de número más pequeño en el que encaja el resultado, si existe dicho tipo. El mínimo se toma simultáneamente en función del número de bits, si está firmado y si flota. Si no hay suficientes bits, se toma el tipo de bit más alto.
-
-Ejemplo:
-
-``` sql
-SELECT toTypeName(0), toTypeName(0 + 0), toTypeName(0 + 0 + 0), toTypeName(0 + 0 + 0 + 0)
-```
-
-``` text
-┌─toTypeName(0)─┬─toTypeName(plus(0, 0))─┬─toTypeName(plus(plus(0, 0), 0))─┬─toTypeName(plus(plus(plus(0, 0), 0), 0))─┐
-│ UInt8         │ UInt16                 │ UInt32                          │ UInt64                                   │
-└───────────────┴────────────────────────┴─────────────────────────────────┴──────────────────────────────────────────┘
-```
-
-Las funciones aritméticas funcionan para cualquier par de tipos de UInt8, UInt16, UInt32, UInt64, Int8, Int16, Int32, Int64, Float32 o Float64.
-
-El desbordamiento se produce de la misma manera que en C ++.
-
-## más (a, b), a + b operador {#plusa-b-a-b-operator}
-
-Calcula la suma de los números.
-También puede agregar números enteros con una fecha o fecha y hora. En el caso de una fecha, agregar un entero significa agregar el número correspondiente de días. Para una fecha con hora, significa agregar el número correspondiente de segundos.
-
-## menos(a, b), a - b operador {#minusa-b-a-b-operator}
-
-Calcula la diferencia. El resultado siempre está firmado.
-
-You can also calculate integer numbers from a date or date with time. The idea is the same – see above for ‘plus’.
-
-## multiplicar(a, b) a \* b operador {#multiplya-b-a-b-operator}
-
-Calcula el producto de los números.
-
-## divide (a, b), operador a / b {#dividea-b-a-b-operator}
-
-Calcula el cociente de los números. El tipo de resultado es siempre un tipo de punto flotante.
-No es una división entera. Para la división de enteros, use el ‘intDiv’ función.
-Al dividir por cero obtienes ‘inf’, ‘-inf’, o ‘nan’.
-
-## Información de uso) {#intdiva-b}
-
-Calcula el cociente de los números. Se divide en enteros, redondeando hacia abajo (por el valor absoluto).
-Se produce una excepción al dividir por cero o al dividir un número negativo mínimo por menos uno.
-
-## IntDivOrZero (a, b) {#intdivorzeroa-b}
-
-Difiere de ‘intDiv’ en que devuelve cero al dividir por cero o al dividir un número negativo mínimo por menos uno.
-
-## modulo(a, b), a % b operador {#moduloa-b-a-b-operator}
-
-Calcula el resto después de la división.
-Si los argumentos son números de coma flotante, se convierten previamente en enteros eliminando la parte decimal.
-El resto se toma en el mismo sentido que en C ++. La división truncada se usa para números negativos.
-Se produce una excepción al dividir por cero o al dividir un número negativo mínimo por menos uno.
-
-## moduloOrZero (a, b) {#moduloorzeroa-b}
-
-Difiere de ‘modulo’ en que devuelve cero cuando el divisor es cero.
-
-## negate(a), -un operador {#negatea-a-operator}
-
-Calcula un número con el signo inverso. El resultado siempre está firmado.
-
-## abs (a) {#arithm_func-abs}
-
-Calcula el valor absoluto del número (a). Es decir, si un \<0, devuelve -a . Para los tipos sin firmar no hace nada. Para los tipos de enteros con signo, devuelve un número sin signo.
-
-## GCD (a, b) {#gcda-b}
-
-Devuelve el mayor divisor común de los números.
-Se produce una excepción al dividir por cero o al dividir un número negativo mínimo por menos uno.
-
-## Lcm(a, b) {#lcma-b}
-
-Devuelve el mínimo múltiplo común de los números.
-Se produce una excepción al dividir por cero o al dividir un número negativo mínimo por menos uno.
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/functions/arithmetic_functions/) <!--hide-->
diff --git a/docs/es/sql-reference/functions/array-functions.md b/docs/es/sql-reference/functions/array-functions.md
deleted file mode 100644
index 460e4775b44..00000000000
--- a/docs/es/sql-reference/functions/array-functions.md
+++ /dev/null
@@ -1,1061 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 46
-toc_title: Trabajar con matrices
----
-
-# Funciones para trabajar con matrices {#functions-for-working-with-arrays}
-
-## vaciar {#function-empty}
-
-Devuelve 1 para una matriz vacía, o 0 para una matriz no vacía.
-El tipo de resultado es UInt8.
-La función también funciona para cadenas.
-
-## notEmpty {#function-notempty}
-
-Devuelve 0 para una matriz vacía, o 1 para una matriz no vacía.
-El tipo de resultado es UInt8.
-La función también funciona para cadenas.
-
-## longitud {#array_functions-length}
-
-Devuelve el número de elementos de la matriz.
-El tipo de resultado es UInt64.
-La función también funciona para cadenas.
-
-## Para obtener más información, consulta nuestra Política de privacidad y nuestras Condiciones de uso {#emptyarrayuint8-emptyarrayuint16-emptyarrayuint32-emptyarrayuint64}
-
-## Para obtener más información, consulta nuestra Política de privacidad y nuestras Condiciones de uso {#emptyarrayint8-emptyarrayint16-emptyarrayint32-emptyarrayint64}
-
-## Para obtener más información, consulta nuestra Política de privacidad y nuestras Condiciones de uso {#emptyarrayfloat32-emptyarrayfloat64}
-
-## emptyArrayDate, emptyArrayDateTime {#emptyarraydate-emptyarraydatetime}
-
-## emptyArrayString {#emptyarraystring}
-
-Acepta cero argumentos y devuelve una matriz vacía del tipo apropiado.
-
-## emptyArrayToSingle {#emptyarraytosingle}
-
-Acepta una matriz vacía y devuelve una matriz de un elemento que es igual al valor predeterminado.
-
-## rango(final), rango(inicio, fin \[, paso\]) {#rangeend-rangestart-end-step}
-
-Devuelve una matriz de números de principio a fin-1 por paso.
-Si el argumento `start` no se especifica, el valor predeterminado es 0.
-Si el argumento `step` no se especifica, el valor predeterminado es 1.
-Se comporta casi como pitónico `range`. Pero la diferencia es que todos los tipos de argumentos deben ser `UInt` numero.
-Por si acaso, se produce una excepción si se crean matrices con una longitud total de más de 100,000,000 de elementos en un bloque de datos.
-
-## array(x1, …), operator \[x1, …\] {#arrayx1-operator-x1}
-
-Crea una matriz a partir de los argumentos de la función.
-Los argumentos deben ser constantes y tener tipos que tengan el tipo común más pequeño. Se debe pasar al menos un argumento, porque de lo contrario no está claro qué tipo de matriz crear. Es decir, no puede usar esta función para crear una matriz vacía (para hacerlo, use el ‘emptyArray\*’ función descrita anteriormente).
-Devuelve un ‘Array(T)’ tipo resultado, donde ‘T’ es el tipo común más pequeño de los argumentos pasados.
-
-## arrayConcat {#arrayconcat}
-
-Combina matrices pasadas como argumentos.
-
-``` sql
-arrayConcat(arrays)
-```
-
-**Parámetros**
-
--   `arrays` – Arbitrary number of arguments of [Matriz](../../sql-reference/data-types/array.md) tipo.
-    **Ejemplo**
-
-<!-- -->
-
-``` sql
-SELECT arrayConcat([1, 2], [3, 4], [5, 6]) AS res
-```
-
-``` text
-┌─res───────────┐
-│ [1,2,3,4,5,6] │
-└───────────────┘
-```
-
-## Por ejemplo, el operador arr\[n\] {#arrayelementarr-n-operator-arrn}
-
-Obtener el elemento con el índice `n` de la matriz `arr`. `n` debe ser de cualquier tipo entero.
-Los índices de una matriz comienzan desde uno.
-Los índices negativos son compatibles. En este caso, selecciona el elemento correspondiente numerado desde el final. Por ejemplo, `arr[-1]` es el último elemento de la matriz.
-
-Si el índice cae fuera de los límites de una matriz, devuelve algún valor predeterminado (0 para números, una cadena vacía para cadenas, etc.), a excepción del caso con una matriz no constante y un índice constante 0 (en este caso habrá un error `Array indices are 1-based`).
-
-## Tiene(arr, elem) {#hasarr-elem}
-
-Comprueba si el ‘arr’ la matriz tiene el ‘elem’ elemento.
-Devuelve 0 si el elemento no está en la matriz, o 1 si es.
-
-`NULL` se procesa como un valor.
-
-``` sql
-SELECT has([1, 2, NULL], NULL)
-```
-
-``` text
-┌─has([1, 2, NULL], NULL)─┐
-│                       1 │
-└─────────────────────────┘
-```
-
-## TieneTodo {#hasall}
-
-Comprueba si una matriz es un subconjunto de otra.
-
-``` sql
-hasAll(set, subset)
-```
-
-**Parámetros**
-
--   `set` – Array of any type with a set of elements.
--   `subset` – Array of any type with elements that should be tested to be a subset of `set`.
-
-**Valores de retorno**
-
--   `1`, si `set` contiene todos los elementos de `subset`.
--   `0`, de lo contrario.
-
-**Propiedades peculiares**
-
--   Una matriz vacía es un subconjunto de cualquier matriz.
--   `Null` procesado como un valor.
--   El orden de los valores en ambas matrices no importa.
-
-**Ejemplos**
-
-`SELECT hasAll([], [])` devoluciones 1.
-
-`SELECT hasAll([1, Null], [Null])` devoluciones 1.
-
-`SELECT hasAll([1.0, 2, 3, 4], [1, 3])` devoluciones 1.
-
-`SELECT hasAll(['a', 'b'], ['a'])` devoluciones 1.
-
-`SELECT hasAll([1], ['a'])` devuelve 0.
-
-`SELECT hasAll([[1, 2], [3, 4]], [[1, 2], [3, 5]])` devuelve 0.
-
-## TieneCualquier {#hasany}
-
-Comprueba si dos matrices tienen intersección por algunos elementos.
-
-``` sql
-hasAny(array1, array2)
-```
-
-**Parámetros**
-
--   `array1` – Array of any type with a set of elements.
--   `array2` – Array of any type with a set of elements.
-
-**Valores de retorno**
-
--   `1`, si `array1` y `array2` tienen un elemento similar al menos.
--   `0`, de lo contrario.
-
-**Propiedades peculiares**
-
--   `Null` procesado como un valor.
--   El orden de los valores en ambas matrices no importa.
-
-**Ejemplos**
-
-`SELECT hasAny([1], [])` devoluciones `0`.
-
-`SELECT hasAny([Null], [Null, 1])` devoluciones `1`.
-
-`SELECT hasAny([-128, 1., 512], [1])` devoluciones `1`.
-
-`SELECT hasAny([[1, 2], [3, 4]], ['a', 'c'])` devoluciones `0`.
-
-`SELECT hasAll([[1, 2], [3, 4]], [[1, 2], [1, 2]])` devoluciones `1`.
-
-## ¿Cómo puedo hacerlo?) {#indexofarr-x}
-
-Devuelve el índice de la primera ‘x’ elemento (comenzando desde 1) si está en la matriz, o 0 si no lo está.
-
-Ejemplo:
-
-``` sql
-SELECT indexOf([1, 3, NULL, NULL], NULL)
-```
-
-``` text
-┌─indexOf([1, 3, NULL, NULL], NULL)─┐
-│                                 3 │
-└───────────────────────────────────┘
-```
-
-Elementos establecidos en `NULL` se manejan como valores normales.
-
-## Cuenta igual (arr, x) {#countequalarr-x}
-
-Devuelve el número de elementos de la matriz igual a x. Equivalente a arrayCount (elem -\> elem = x, arr).
-
-`NULL` los elementos se manejan como valores separados.
-
-Ejemplo:
-
-``` sql
-SELECT countEqual([1, 2, NULL, NULL], NULL)
-```
-
-``` text
-┌─countEqual([1, 2, NULL, NULL], NULL)─┐
-│                                    2 │
-└──────────────────────────────────────┘
-```
-
-## Información detallada) {#array_functions-arrayenumerate}
-
-Returns the array \[1, 2, 3, …, length (arr) \]
-
-Esta función se utiliza normalmente con ARRAY JOIN. Permite contar algo solo una vez para cada matriz después de aplicar ARRAY JOIN . Ejemplo:
-
-``` sql
-SELECT
-    count() AS Reaches,
-    countIf(num = 1) AS Hits
-FROM test.hits
-ARRAY JOIN
-    GoalsReached,
-    arrayEnumerate(GoalsReached) AS num
-WHERE CounterID = 160656
-LIMIT 10
-```
-
-``` text
-┌─Reaches─┬──Hits─┐
-│   95606 │ 31406 │
-└─────────┴───────┘
-```
-
-En este ejemplo, Reaches es el número de conversiones (las cadenas recibidas después de aplicar ARRAY JOIN) y Hits es el número de páginas vistas (cadenas antes de ARRAY JOIN). En este caso particular, puede obtener el mismo resultado de una manera más fácil:
-
-``` sql
-SELECT
-    sum(length(GoalsReached)) AS Reaches,
-    count() AS Hits
-FROM test.hits
-WHERE (CounterID = 160656) AND notEmpty(GoalsReached)
-```
-
-``` text
-┌─Reaches─┬──Hits─┐
-│   95606 │ 31406 │
-└─────────┴───────┘
-```
-
-Esta función también se puede utilizar en funciones de orden superior. Por ejemplo, puede usarlo para obtener índices de matriz para elementos que coinciden con una condición.
-
-## arrayEnumerateUniq(arr, …) {#arrayenumerateuniqarr}
-
-Devuelve una matriz del mismo tamaño que la matriz de origen, indicando para cada elemento cuál es su posición entre los elementos con el mismo valor.
-Por ejemplo: arrayEnumerateUniq(\[10, 20, 10, 30\]) = \[1, 1, 2, 1\].
-
-Esta función es útil cuando se utiliza ARRAY JOIN y la agregación de elementos de matriz.
-Ejemplo:
-
-``` sql
-SELECT
-    Goals.ID AS GoalID,
-    sum(Sign) AS Reaches,
-    sumIf(Sign, num = 1) AS Visits
-FROM test.visits
-ARRAY JOIN
-    Goals,
-    arrayEnumerateUniq(Goals.ID) AS num
-WHERE CounterID = 160656
-GROUP BY GoalID
-ORDER BY Reaches DESC
-LIMIT 10
-```
-
-``` text
-┌──GoalID─┬─Reaches─┬─Visits─┐
-│   53225 │    3214 │   1097 │
-│ 2825062 │    3188 │   1097 │
-│   56600 │    2803 │    488 │
-│ 1989037 │    2401 │    365 │
-│ 2830064 │    2396 │    910 │
-│ 1113562 │    2372 │    373 │
-│ 3270895 │    2262 │    812 │
-│ 1084657 │    2262 │    345 │
-│   56599 │    2260 │    799 │
-│ 3271094 │    2256 │    812 │
-└─────────┴─────────┴────────┘
-```
-
-En este ejemplo, cada ID de objetivo tiene un cálculo del número de conversiones (cada elemento de la estructura de datos anidados Objetivos es un objetivo alcanzado, al que nos referimos como conversión) y el número de sesiones. Sin ARRAY JOIN, habríamos contado el número de sesiones como sum(Sign) . Pero en este caso particular, las filas se multiplicaron por la estructura de Objetivos anidados, por lo que para contar cada sesión una vez después de esto, aplicamos una condición al valor de la función arrayEnumerateUniq(Goals.ID) .
-
-La función arrayEnumerateUniq puede tomar varias matrices del mismo tamaño que los argumentos. En este caso, la singularidad se considera para tuplas de elementos en las mismas posiciones en todas las matrices.
-
-``` sql
-SELECT arrayEnumerateUniq([1, 1, 1, 2, 2, 2], [1, 1, 2, 1, 1, 2]) AS res
-```
-
-``` text
-┌─res───────────┐
-│ [1,2,1,1,2,1] │
-└───────────────┘
-```
-
-Esto es necesario cuando se utiliza ARRAY JOIN con una estructura de datos anidados y una agregación adicional a través de múltiples elementos de esta estructura.
-
-## arrayPopBack {#arraypopback}
-
-Quita el último elemento de la matriz.
-
-``` sql
-arrayPopBack(array)
-```
-
-**Parámetros**
-
--   `array` – Array.
-
-**Ejemplo**
-
-``` sql
-SELECT arrayPopBack([1, 2, 3]) AS res
-```
-
-``` text
-┌─res───┐
-│ [1,2] │
-└───────┘
-```
-
-## arrayPopFront {#arraypopfront}
-
-Quita el primer elemento de la matriz.
-
-``` sql
-arrayPopFront(array)
-```
-
-**Parámetros**
-
--   `array` – Array.
-
-**Ejemplo**
-
-``` sql
-SELECT arrayPopFront([1, 2, 3]) AS res
-```
-
-``` text
-┌─res───┐
-│ [2,3] │
-└───────┘
-```
-
-## arrayPushBack {#arraypushback}
-
-Agrega un elemento al final de la matriz.
-
-``` sql
-arrayPushBack(array, single_value)
-```
-
-**Parámetros**
-
--   `array` – Array.
--   `single_value` – A single value. Only numbers can be added to an array with numbers, and only strings can be added to an array of strings. When adding numbers, ClickHouse automatically sets the `single_value` tipo para el tipo de datos de la matriz. Para obtener más información sobre los tipos de datos en ClickHouse, consulte “[Tipos de datos](../../sql-reference/data-types/index.md#data_types)”. Puede ser `NULL`. La función agrega un `NULL` elemento de matriz a una matriz, y el tipo de elementos de matriz se convierte en `Nullable`.
-
-**Ejemplo**
-
-``` sql
-SELECT arrayPushBack(['a'], 'b') AS res
-```
-
-``` text
-┌─res───────┐
-│ ['a','b'] │
-└───────────┘
-```
-
-## arrayPushFront {#arraypushfront}
-
-Agrega un elemento al principio de la matriz.
-
-``` sql
-arrayPushFront(array, single_value)
-```
-
-**Parámetros**
-
--   `array` – Array.
--   `single_value` – A single value. Only numbers can be added to an array with numbers, and only strings can be added to an array of strings. When adding numbers, ClickHouse automatically sets the `single_value` tipo para el tipo de datos de la matriz. Para obtener más información sobre los tipos de datos en ClickHouse, consulte “[Tipos de datos](../../sql-reference/data-types/index.md#data_types)”. Puede ser `NULL`. La función agrega un `NULL` elemento de matriz a una matriz, y el tipo de elementos de matriz se convierte en `Nullable`.
-
-**Ejemplo**
-
-``` sql
-SELECT arrayPushFront(['b'], 'a') AS res
-```
-
-``` text
-┌─res───────┐
-│ ['a','b'] │
-└───────────┘
-```
-
-## arrayResize {#arrayresize}
-
-Cambia la longitud de la matriz.
-
-``` sql
-arrayResize(array, size[, extender])
-```
-
-**Parámetros:**
-
--   `array` — Array.
--   `size` — Required length of the array.
-    -   Si `size` es menor que el tamaño original de la matriz, la matriz se trunca desde la derecha.
--   Si `size` es mayor que el tamaño inicial de la matriz, la matriz se extiende a la derecha con `extender` valores predeterminados para el tipo de datos de los elementos de la matriz.
--   `extender` — Value for extending an array. Can be `NULL`.
-
-**Valor devuelto:**
-
-Una matriz de longitud `size`.
-
-**Ejemplos de llamadas**
-
-``` sql
-SELECT arrayResize([1], 3)
-```
-
-``` text
-┌─arrayResize([1], 3)─┐
-│ [1,0,0]             │
-└─────────────────────┘
-```
-
-``` sql
-SELECT arrayResize([1], 3, NULL)
-```
-
-``` text
-┌─arrayResize([1], 3, NULL)─┐
-│ [1,NULL,NULL]             │
-└───────────────────────────┘
-```
-
-## arraySlice {#arrayslice}
-
-Devuelve una porción de la matriz.
-
-``` sql
-arraySlice(array, offset[, length])
-```
-
-**Parámetros**
-
--   `array` – Array of data.
--   `offset` – Indent from the edge of the array. A positive value indicates an offset on the left, and a negative value is an indent on the right. Numbering of the array items begins with 1.
--   `length` - La longitud de la porción requerida. Si especifica un valor negativo, la función devuelve un segmento abierto `[offset, array_length - length)`. Si omite el valor, la función devuelve el sector `[offset, the_end_of_array]`.
-
-**Ejemplo**
-
-``` sql
-SELECT arraySlice([1, 2, NULL, 4, 5], 2, 3) AS res
-```
-
-``` text
-┌─res────────┐
-│ [2,NULL,4] │
-└────────────┘
-```
-
-Elementos de matriz establecidos en `NULL` se manejan como valores normales.
-
-## arraySort(\[func,\] arr, …) {#array_functions-sort}
-
-Ordena los elementos del `arr` matriz en orden ascendente. Si el `func` se especifica la función, el orden de clasificación está determinado por el resultado `func` función aplicada a los elementos de la matriz. Si `func` acepta múltiples argumentos, el `arraySort` función se pasa varias matrices que los argumentos de `func` corresponderá a. Los ejemplos detallados se muestran al final de `arraySort` descripci.
-
-Ejemplo de clasificación de valores enteros:
-
-``` sql
-SELECT arraySort([1, 3, 3, 0]);
-```
-
-``` text
-┌─arraySort([1, 3, 3, 0])─┐
-│ [0,1,3,3]               │
-└─────────────────────────┘
-```
-
-Ejemplo de ordenación de valores de cadena:
-
-``` sql
-SELECT arraySort(['hello', 'world', '!']);
-```
-
-``` text
-┌─arraySort(['hello', 'world', '!'])─┐
-│ ['!','hello','world']              │
-└────────────────────────────────────┘
-```
-
-Considere el siguiente orden de clasificación `NULL`, `NaN` y `Inf` valor:
-
-``` sql
-SELECT arraySort([1, nan, 2, NULL, 3, nan, -4, NULL, inf, -inf]);
-```
-
-``` text
-┌─arraySort([1, nan, 2, NULL, 3, nan, -4, NULL, inf, -inf])─┐
-│ [-inf,-4,1,2,3,inf,nan,nan,NULL,NULL]                     │
-└───────────────────────────────────────────────────────────┘
-```
-
--   `-Inf` los valores son los primeros en la matriz.
--   `NULL` los valores son los últimos en la matriz.
--   `NaN` los valores están justo antes `NULL`.
--   `Inf` los valores están justo antes `NaN`.
-
-Tenga en cuenta que `arraySort` es una [función de orden superior](higher-order-functions.md). Puede pasarle una función lambda como primer argumento. En este caso, el orden de clasificación está determinado por el resultado de la función lambda aplicada a los elementos de la matriz.
-
-Consideremos el siguiente ejemplo:
-
-``` sql
-SELECT arraySort((x) -> -x, [1, 2, 3]) as res;
-```
-
-``` text
-┌─res─────┐
-│ [3,2,1] │
-└─────────┘
-```
-
-For each element of the source array, the lambda function returns the sorting key, that is, \[1 –\> -1, 2 –\> -2, 3 –\> -3\]. Since the `arraySort` función ordena las teclas en orden ascendente, el resultado es \[3, 2, 1\]. Por lo tanto, el `(x) –> -x` la función lambda establece la [orden descendente](#array_functions-reverse-sort) en una clasificación.
-
-La función lambda puede aceptar múltiples argumentos. En este caso, debe pasar el `arraySort` función varias matrices de idéntica longitud a las que corresponderán los argumentos de la función lambda. La matriz resultante constará de elementos de la primera matriz de entrada; los elementos de la siguiente matriz de entrada especifican las claves de clasificación. Por ejemplo:
-
-``` sql
-SELECT arraySort((x, y) -> y, ['hello', 'world'], [2, 1]) as res;
-```
-
-``` text
-┌─res────────────────┐
-│ ['world', 'hello'] │
-└────────────────────┘
-```
-
-Aquí, los elementos que se pasan en la segunda matriz (\[2, 1\]) definen una clave de ordenación para el elemento correspondiente de la matriz de origen (\[‘hello’, ‘world’Es decir,, \[‘hello’ –\> 2, ‘world’ –\> 1\]. Since the lambda function doesn't use `x`, los valores reales de la matriz de origen no afectan el orden en el resultado. Tan, ‘hello’ será el segundo elemento en el resultado, y ‘world’ será la primera.
-
-Otros ejemplos se muestran a continuación.
-
-``` sql
-SELECT arraySort((x, y) -> y, [0, 1, 2], ['c', 'b', 'a']) as res;
-```
-
-``` text
-┌─res─────┐
-│ [2,1,0] │
-└─────────┘
-```
-
-``` sql
-SELECT arraySort((x, y) -> -y, [0, 1, 2], [1, 2, 3]) as res;
-```
-
-``` text
-┌─res─────┐
-│ [2,1,0] │
-└─────────┘
-```
-
-!!! note "Nota"
-    Para mejorar la eficiencia de clasificación, el [Transformación de Schwartzian](https://en.wikipedia.org/wiki/Schwartzian_transform) se utiliza.
-
-## arrayReverseSort(\[func,\] arr, …) {#array_functions-reverse-sort}
-
-Ordena los elementos del `arr` matriz en orden descendente. Si el `func` se especifica la función, `arr` se ordena de acuerdo con el resultado de la `func` función aplicada a los elementos de la matriz, y luego la matriz ordenada se invierte. Si `func` acepta múltiples argumentos, el `arrayReverseSort` función se pasa varias matrices que los argumentos de `func` corresponderá a. Los ejemplos detallados se muestran al final de `arrayReverseSort` descripci.
-
-Ejemplo de clasificación de valores enteros:
-
-``` sql
-SELECT arrayReverseSort([1, 3, 3, 0]);
-```
-
-``` text
-┌─arrayReverseSort([1, 3, 3, 0])─┐
-│ [3,3,1,0]                      │
-└────────────────────────────────┘
-```
-
-Ejemplo de ordenación de valores de cadena:
-
-``` sql
-SELECT arrayReverseSort(['hello', 'world', '!']);
-```
-
-``` text
-┌─arrayReverseSort(['hello', 'world', '!'])─┐
-│ ['world','hello','!']                     │
-└───────────────────────────────────────────┘
-```
-
-Considere el siguiente orden de clasificación `NULL`, `NaN` y `Inf` valor:
-
-``` sql
-SELECT arrayReverseSort([1, nan, 2, NULL, 3, nan, -4, NULL, inf, -inf]) as res;
-```
-
-``` text
-┌─res───────────────────────────────────┐
-│ [inf,3,2,1,-4,-inf,nan,nan,NULL,NULL] │
-└───────────────────────────────────────┘
-```
-
--   `Inf` los valores son los primeros en la matriz.
--   `NULL` los valores son los últimos en la matriz.
--   `NaN` los valores están justo antes `NULL`.
--   `-Inf` los valores están justo antes `NaN`.
-
-Tenga en cuenta que el `arrayReverseSort` es una [función de orden superior](higher-order-functions.md). Puede pasarle una función lambda como primer argumento. Ejemplo se muestra a continuación.
-
-``` sql
-SELECT arrayReverseSort((x) -> -x, [1, 2, 3]) as res;
-```
-
-``` text
-┌─res─────┐
-│ [1,2,3] │
-└─────────┘
-```
-
-La matriz se ordena de la siguiente manera:
-
-1.  Al principio, la matriz de origen (\[1, 2, 3\]) se ordena de acuerdo con el resultado de la función lambda aplicada a los elementos de la matriz. El resultado es una matriz \[3, 2, 1\].
-2.  Matriz que se obtiene en el paso anterior, se invierte. Entonces, el resultado final es \[1, 2, 3\].
-
-La función lambda puede aceptar múltiples argumentos. En este caso, debe pasar el `arrayReverseSort` función varias matrices de idéntica longitud a las que corresponderán los argumentos de la función lambda. La matriz resultante constará de elementos de la primera matriz de entrada; los elementos de la siguiente matriz de entrada especifican las claves de clasificación. Por ejemplo:
-
-``` sql
-SELECT arrayReverseSort((x, y) -> y, ['hello', 'world'], [2, 1]) as res;
-```
-
-``` text
-┌─res───────────────┐
-│ ['hello','world'] │
-└───────────────────┘
-```
-
-En este ejemplo, la matriz se ordena de la siguiente manera:
-
-1.  Al principio, la matriz de origen (\[‘hello’, ‘world’\]) se ordena de acuerdo con el resultado de la función lambda aplicada a los elementos de las matrices. Los elementos que se pasan en la segunda matriz (\[2, 1\]), definen las claves de ordenación para los elementos correspondientes de la matriz de origen. El resultado es una matriz \[‘world’, ‘hello’\].
-2.  Matriz que se ordenó en el paso anterior, se invierte. Entonces, el resultado final es \[‘hello’, ‘world’\].
-
-Otros ejemplos se muestran a continuación.
-
-``` sql
-SELECT arrayReverseSort((x, y) -> y, [4, 3, 5], ['a', 'b', 'c']) AS res;
-```
-
-``` text
-┌─res─────┐
-│ [5,3,4] │
-└─────────┘
-```
-
-``` sql
-SELECT arrayReverseSort((x, y) -> -y, [4, 3, 5], [1, 2, 3]) AS res;
-```
-
-``` text
-┌─res─────┐
-│ [4,3,5] │
-└─────────┘
-```
-
-## arrayUniq(arr, …) {#arrayuniqarr}
-
-Si se pasa un argumento, cuenta el número de elementos diferentes en la matriz.
-Si se pasan varios argumentos, cuenta el número de tuplas diferentes de elementos en las posiciones correspondientes en múltiples matrices.
-
-Si desea obtener una lista de elementos únicos en una matriz, puede usar arrayReduce(‘groupUniqArray’ arr).
-
-## Información adicional) {#array-functions-join}
-
-Una función especial. Vea la sección [“ArrayJoin function”](array-join.md#functions_arrayjoin).
-
-## arrayDifference {#arraydifference}
-
-Calcula la diferencia entre los elementos de matriz adyacentes. Devuelve una matriz donde el primer elemento será 0, el segundo es la diferencia entre `a[1] - a[0]`, etc. The type of elements in the resulting array is determined by the type inference rules for subtraction (e.g. `UInt8` - `UInt8` = `Int16`).
-
-**Sintaxis**
-
-``` sql
-arrayDifference(array)
-```
-
-**Parámetros**
-
--   `array` – [Matriz](https://clickhouse.tech/docs/en/data_types/array/).
-
-**Valores devueltos**
-
-Devuelve una matriz de diferencias entre los elementos adyacentes.
-
-Tipo: [UInt\*](https://clickhouse.tech/docs/en/data_types/int_uint/#uint-ranges), [En\*](https://clickhouse.tech/docs/en/data_types/int_uint/#int-ranges), [Flotante\*](https://clickhouse.tech/docs/en/data_types/float/).
-
-**Ejemplo**
-
-Consulta:
-
-``` sql
-SELECT arrayDifference([1, 2, 3, 4])
-```
-
-Resultado:
-
-``` text
-┌─arrayDifference([1, 2, 3, 4])─┐
-│ [0,1,1,1]                     │
-└───────────────────────────────┘
-```
-
-Ejemplo del desbordamiento debido al tipo de resultado Int64:
-
-Consulta:
-
-``` sql
-SELECT arrayDifference([0, 10000000000000000000])
-```
-
-Resultado:
-
-``` text
-┌─arrayDifference([0, 10000000000000000000])─┐
-│ [0,-8446744073709551616]                   │
-└────────────────────────────────────────────┘
-```
-
-## arrayDistinct {#arraydistinct}
-
-Toma una matriz, devuelve una matriz que contiene solo los elementos distintos.
-
-**Sintaxis**
-
-``` sql
-arrayDistinct(array)
-```
-
-**Parámetros**
-
--   `array` – [Matriz](https://clickhouse.tech/docs/en/data_types/array/).
-
-**Valores devueltos**
-
-Devuelve una matriz que contiene los elementos distintos.
-
-**Ejemplo**
-
-Consulta:
-
-``` sql
-SELECT arrayDistinct([1, 2, 2, 3, 1])
-```
-
-Resultado:
-
-``` text
-┌─arrayDistinct([1, 2, 2, 3, 1])─┐
-│ [1,2,3]                        │
-└────────────────────────────────┘
-```
-
-## Aquí hay algunas opciones) {#array_functions-arrayenumeratedense}
-
-Devuelve una matriz del mismo tamaño que la matriz de origen, lo que indica dónde aparece cada elemento por primera vez en la matriz de origen.
-
-Ejemplo:
-
-``` sql
-SELECT arrayEnumerateDense([10, 20, 10, 30])
-```
-
-``` text
-┌─arrayEnumerateDense([10, 20, 10, 30])─┐
-│ [1,2,1,3]                             │
-└───────────────────────────────────────┘
-```
-
-## Información detallada) {#array-functions-arrayintersect}
-
-Toma varias matrices, devuelve una matriz con elementos que están presentes en todas las matrices de origen. El orden de los elementos en la matriz resultante es el mismo que en la primera matriz.
-
-Ejemplo:
-
-``` sql
-SELECT
-    arrayIntersect([1, 2], [1, 3], [2, 3]) AS no_intersect,
-    arrayIntersect([1, 2], [1, 3], [1, 4]) AS intersect
-```
-
-``` text
-┌─no_intersect─┬─intersect─┐
-│ []           │ [1]       │
-└──────────────┴───────────┘
-```
-
-## arrayReduce {#arrayreduce}
-
-Aplica una función de agregado a los elementos de la matriz y devuelve su resultado. El nombre de la función de agregación se pasa como una cadena entre comillas simples `'max'`, `'sum'`. Cuando se utilizan funciones de agregado paramétrico, el parámetro se indica después del nombre de la función entre paréntesis `'uniqUpTo(6)'`.
-
-**Sintaxis**
-
-``` sql
-arrayReduce(agg_func, arr1, arr2, ..., arrN)
-```
-
-**Parámetros**
-
--   `agg_func` — The name of an aggregate function which should be a constant [cadena](../../sql-reference/data-types/string.md).
--   `arr` — Any number of [matriz](../../sql-reference/data-types/array.md) escriba columnas como los parámetros de la función de agregación.
-
-**Valor devuelto**
-
-**Ejemplo**
-
-``` sql
-SELECT arrayReduce('max', [1, 2, 3])
-```
-
-``` text
-┌─arrayReduce('max', [1, 2, 3])─┐
-│                             3 │
-└───────────────────────────────┘
-```
-
-Si una función agregada toma varios argumentos, esta función debe aplicarse a varias matrices del mismo tamaño.
-
-``` sql
-SELECT arrayReduce('maxIf', [3, 5], [1, 0])
-```
-
-``` text
-┌─arrayReduce('maxIf', [3, 5], [1, 0])─┐
-│                                    3 │
-└──────────────────────────────────────┘
-```
-
-Ejemplo con una función de agregado paramétrico:
-
-``` sql
-SELECT arrayReduce('uniqUpTo(3)', [1, 2, 3, 4, 5, 6, 7, 8, 9, 10])
-```
-
-``` text
-┌─arrayReduce('uniqUpTo(3)', [1, 2, 3, 4, 5, 6, 7, 8, 9, 10])─┐
-│                                                           4 │
-└─────────────────────────────────────────────────────────────┘
-```
-
-## arrayReduceInRanges {#arrayreduceinranges}
-
-Aplica una función de agregado a los elementos de matriz en rangos dados y devuelve una matriz que contiene el resultado correspondiente a cada rango. La función devolverá el mismo resultado que múltiples `arrayReduce(agg_func, arraySlice(arr1, index, length), ...)`.
-
-**Sintaxis**
-
-``` sql
-arrayReduceInRanges(agg_func, ranges, arr1, arr2, ..., arrN)
-```
-
-**Parámetros**
-
--   `agg_func` — The name of an aggregate function which should be a constant [cadena](../../sql-reference/data-types/string.md).
--   `ranges` — The ranges to aggretate which should be an [matriz](../../sql-reference/data-types/array.md) de [tuplas](../../sql-reference/data-types/tuple.md) que contiene el índice y la longitud de cada rango.
--   `arr` — Any number of [matriz](../../sql-reference/data-types/array.md) escriba columnas como los parámetros de la función de agregación.
-
-**Valor devuelto**
-
-**Ejemplo**
-
-``` sql
-SELECT arrayReduceInRanges(
-    'sum',
-    [(1, 5), (2, 3), (3, 4), (4, 4)],
-    [1000000, 200000, 30000, 4000, 500, 60, 7]
-) AS res
-```
-
-``` text
-┌─res─────────────────────────┐
-│ [1234500,234000,34560,4567] │
-└─────────────────────────────┘
-```
-
-## arrayReverse (arr) {#arrayreverse}
-
-Devuelve una matriz del mismo tamaño que la matriz original que contiene los elementos en orden inverso.
-
-Ejemplo:
-
-``` sql
-SELECT arrayReverse([1, 2, 3])
-```
-
-``` text
-┌─arrayReverse([1, 2, 3])─┐
-│ [3,2,1]                 │
-└─────────────────────────┘
-```
-
-## inversa(arr) {#array-functions-reverse}
-
-Sinónimo de [“arrayReverse”](#arrayreverse)
-
-## arrayFlatten {#arrayflatten}
-
-Convierte una matriz de matrices en una matriz plana.
-
-Función:
-
--   Se aplica a cualquier profundidad de matrices anidadas.
--   No cambia las matrices que ya son planas.
-
-La matriz aplanada contiene todos los elementos de todas las matrices de origen.
-
-**Sintaxis**
-
-``` sql
-flatten(array_of_arrays)
-```
-
-Apodo: `flatten`.
-
-**Parámetros**
-
--   `array_of_arrays` — [Matriz](../../sql-reference/data-types/array.md) de matrices. Por ejemplo, `[[1,2,3], [4,5]]`.
-
-**Ejemplos**
-
-``` sql
-SELECT flatten([[[1]], [[2], [3]]])
-```
-
-``` text
-┌─flatten(array(array([1]), array([2], [3])))─┐
-│ [1,2,3]                                     │
-└─────────────────────────────────────────────┘
-```
-
-## arrayCompact {#arraycompact}
-
-Elimina elementos duplicados consecutivos de una matriz. El orden de los valores de resultado está determinado por el orden de la matriz de origen.
-
-**Sintaxis**
-
-``` sql
-arrayCompact(arr)
-```
-
-**Parámetros**
-
-`arr` — The [matriz](../../sql-reference/data-types/array.md) inspeccionar.
-
-**Valor devuelto**
-
-La matriz sin duplicado.
-
-Tipo: `Array`.
-
-**Ejemplo**
-
-Consulta:
-
-``` sql
-SELECT arrayCompact([1, 1, nan, nan, 2, 3, 3, 3])
-```
-
-Resultado:
-
-``` text
-┌─arrayCompact([1, 1, nan, nan, 2, 3, 3, 3])─┐
-│ [1,nan,nan,2,3]                            │
-└────────────────────────────────────────────┘
-```
-
-## arrayZip {#arrayzip}
-
-Combina varias matrices en una sola matriz. La matriz resultante contiene los elementos correspondientes de las matrices de origen agrupadas en tuplas en el orden de argumentos enumerado.
-
-**Sintaxis**
-
-``` sql
-arrayZip(arr1, arr2, ..., arrN)
-```
-
-**Parámetros**
-
--   `arrN` — [Matriz](../data-types/array.md).
-
-La función puede tomar cualquier cantidad de matrices de diferentes tipos. Todas las matrices de entrada deben ser del mismo tamaño.
-
-**Valor devuelto**
-
--   Matriz con elementos de las matrices de origen agrupadas en [tuplas](../data-types/tuple.md). Los tipos de datos en la tupla son los mismos que los tipos de las matrices de entrada y en el mismo orden en que se pasan las matrices.
-
-Tipo: [Matriz](../data-types/array.md).
-
-**Ejemplo**
-
-Consulta:
-
-``` sql
-SELECT arrayZip(['a', 'b', 'c'], [5, 2, 1])
-```
-
-Resultado:
-
-``` text
-┌─arrayZip(['a', 'b', 'c'], [5, 2, 1])─┐
-│ [('a',5),('b',2),('c',1)]            │
-└──────────────────────────────────────┘
-```
-
-## arrayAUC {#arrayauc}
-
-Calcule AUC (Área bajo la curva, que es un concepto en el aprendizaje automático, vea más detalles: https://en.wikipedia.org/wiki/Receiver_operating_characteristic#Area_under_the_curve ).
-
-**Sintaxis**
-
-``` sql
-arrayAUC(arr_scores, arr_labels)
-```
-
-**Parámetros**
-- `arr_scores` — scores prediction model gives.
-- `arr_labels` — labels of samples, usually 1 for positive sample and 0 for negtive sample.
-
-**Valor devuelto**
-Devuelve el valor AUC con el tipo Float64.
-
-**Ejemplo**
-Consulta:
-
-``` sql
-select arrayAUC([0.1, 0.4, 0.35, 0.8], [0, 0, 1, 1])
-```
-
-Resultado:
-
-``` text
-┌─arrayAUC([0.1, 0.4, 0.35, 0.8], [0, 0, 1, 1])─┐
-│                                          0.75 │
-└────────────────────────────────────────---──┘
-```
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/functions/array_functions/) <!--hide-->
diff --git a/docs/es/sql-reference/functions/array-join.md b/docs/es/sql-reference/functions/array-join.md
deleted file mode 100644
index 555b609c5d2..00000000000
--- a/docs/es/sql-reference/functions/array-join.md
+++ /dev/null
@@ -1,37 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 61
-toc_title: arrayJoin
----
-
-# arrayJoin función {#functions_arrayjoin}
-
-Esta es una función muy inusual.
-
-Las funciones normales no cambian un conjunto de filas, sino que simplemente cambian los valores en cada fila (mapa).
-Las funciones agregadas comprimen un conjunto de filas (doblar o reducir).
-El ‘arrayJoin’ función toma cada fila y genera un conjunto de filas (desplegar).
-
-Esta función toma una matriz como argumento y propaga la fila de origen a varias filas para el número de elementos de la matriz.
-Todos los valores de las columnas simplemente se copian, excepto los valores de la columna donde se aplica esta función; se reemplaza con el valor de matriz correspondiente.
-
-Una consulta puede usar múltiples `arrayJoin` función. En este caso, la transformación se realiza varias veces.
-
-Tenga en cuenta la sintaxis ARRAY JOIN en la consulta SELECT, que proporciona posibilidades más amplias.
-
-Ejemplo:
-
-``` sql
-SELECT arrayJoin([1, 2, 3] AS src) AS dst, 'Hello', src
-```
-
-``` text
-┌─dst─┬─\'Hello\'─┬─src─────┐
-│   1 │ Hello     │ [1,2,3] │
-│   2 │ Hello     │ [1,2,3] │
-│   3 │ Hello     │ [1,2,3] │
-└─────┴───────────┴─────────┘
-```
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/functions/array_join/) <!--hide-->
diff --git a/docs/es/sql-reference/functions/bit-functions.md b/docs/es/sql-reference/functions/bit-functions.md
deleted file mode 100644
index b5743051b7d..00000000000
--- a/docs/es/sql-reference/functions/bit-functions.md
+++ /dev/null
@@ -1,255 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 48
-toc_title: Trozo
----
-
-# Bit Funciones {#bit-functions}
-
-Las funciones de bits funcionan para cualquier par de tipos de UInt8, UInt16, UInt32, UInt64, Int8, Int16, Int32, Int64, Float32 o Float64.
-
-El tipo de resultado es un entero con bits iguales a los bits máximos de sus argumentos. Si al menos uno de los argumentos está firmado, el resultado es un número firmado. Si un argumento es un número de coma flotante, se convierte en Int64.
-
-## pocoY(a, b) {#bitanda-b}
-
-## bitOr (a, b) {#bitora-b}
-
-## ¿Por qué?) {#bitxora-b}
-
-## ¿Por qué?) {#bitnota}
-
-## ¿Cómo puedo hacerlo?) {#bitshiftlefta-b}
-
-## ¿Cómo puedo hacerlo?) {#bitshiftrighta-b}
-
-## ¿Cómo puedo hacerlo?) {#bitrotatelefta-b}
-
-## ¿Cómo puedo hacerlo?) {#bitrotaterighta-b}
-
-## bitTest {#bittest}
-
-Toma cualquier entero y lo convierte en [forma binaria](https://en.wikipedia.org/wiki/Binary_number) devuelve el valor de un bit en la posición especificada. La cuenta atrás comienza desde 0 de derecha a izquierda.
-
-**Sintaxis**
-
-``` sql
-SELECT bitTest(number, index)
-```
-
-**Parámetros**
-
--   `number` – integer number.
--   `index` – position of bit.
-
-**Valores devueltos**
-
-Devuelve un valor de bit en la posición especificada.
-
-Tipo: `UInt8`.
-
-**Ejemplo**
-
-Por ejemplo, el número 43 en el sistema numérico base-2 (binario) es 101011.
-
-Consulta:
-
-``` sql
-SELECT bitTest(43, 1)
-```
-
-Resultado:
-
-``` text
-┌─bitTest(43, 1)─┐
-│              1 │
-└────────────────┘
-```
-
-Otro ejemplo:
-
-Consulta:
-
-``` sql
-SELECT bitTest(43, 2)
-```
-
-Resultado:
-
-``` text
-┌─bitTest(43, 2)─┐
-│              0 │
-└────────────────┘
-```
-
-## bitTestAll {#bittestall}
-
-Devuelve el resultado de [conjunción lógica](https://en.wikipedia.org/wiki/Logical_conjunction) (Operador AND) de todos los bits en posiciones dadas. La cuenta atrás comienza desde 0 de derecha a izquierda.
-
-La conjucción para operaciones bit a bit:
-
-0 AND 0 = 0
-
-0 AND 1 = 0
-
-1 AND 0 = 0
-
-1 AND 1 = 1
-
-**Sintaxis**
-
-``` sql
-SELECT bitTestAll(number, index1, index2, index3, index4, ...)
-```
-
-**Parámetros**
-
--   `number` – integer number.
--   `index1`, `index2`, `index3`, `index4` – positions of bit. For example, for set of positions (`index1`, `index2`, `index3`, `index4`) es verdadero si y solo si todas sus posiciones son verdaderas (`index1` ⋀ `index2`, ⋀ `index3` ⋀ `index4`).
-
-**Valores devueltos**
-
-Devuelve el resultado de la conjunción lógica.
-
-Tipo: `UInt8`.
-
-**Ejemplo**
-
-Por ejemplo, el número 43 en el sistema numérico base-2 (binario) es 101011.
-
-Consulta:
-
-``` sql
-SELECT bitTestAll(43, 0, 1, 3, 5)
-```
-
-Resultado:
-
-``` text
-┌─bitTestAll(43, 0, 1, 3, 5)─┐
-│                          1 │
-└────────────────────────────┘
-```
-
-Otro ejemplo:
-
-Consulta:
-
-``` sql
-SELECT bitTestAll(43, 0, 1, 3, 5, 2)
-```
-
-Resultado:
-
-``` text
-┌─bitTestAll(43, 0, 1, 3, 5, 2)─┐
-│                             0 │
-└───────────────────────────────┘
-```
-
-## bitTestAny {#bittestany}
-
-Devuelve el resultado de [disyunción lógica](https://en.wikipedia.org/wiki/Logical_disjunction) (O operador) de todos los bits en posiciones dadas. La cuenta atrás comienza desde 0 de derecha a izquierda.
-
-La disyunción para las operaciones bit a bit:
-
-0 OR 0 = 0
-
-0 OR 1 = 1
-
-1 OR 0 = 1
-
-1 OR 1 = 1
-
-**Sintaxis**
-
-``` sql
-SELECT bitTestAny(number, index1, index2, index3, index4, ...)
-```
-
-**Parámetros**
-
--   `number` – integer number.
--   `index1`, `index2`, `index3`, `index4` – positions of bit.
-
-**Valores devueltos**
-
-Devuelve el resultado de disjuction lógico.
-
-Tipo: `UInt8`.
-
-**Ejemplo**
-
-Por ejemplo, el número 43 en el sistema numérico base-2 (binario) es 101011.
-
-Consulta:
-
-``` sql
-SELECT bitTestAny(43, 0, 2)
-```
-
-Resultado:
-
-``` text
-┌─bitTestAny(43, 0, 2)─┐
-│                    1 │
-└──────────────────────┘
-```
-
-Otro ejemplo:
-
-Consulta:
-
-``` sql
-SELECT bitTestAny(43, 4, 2)
-```
-
-Resultado:
-
-``` text
-┌─bitTestAny(43, 4, 2)─┐
-│                    0 │
-└──────────────────────┘
-```
-
-## bitCount {#bitcount}
-
-Calcula el número de bits establecido en uno en la representación binaria de un número.
-
-**Sintaxis**
-
-``` sql
-bitCount(x)
-```
-
-**Parámetros**
-
--   `x` — [Entero](../../sql-reference/data-types/int-uint.md) o [punto flotante](../../sql-reference/data-types/float.md) numero. La función utiliza la representación de valor en la memoria. Permite admitir números de punto flotante.
-
-**Valor devuelto**
-
--   Número de bits establecido en uno en el número de entrada.
-
-La función no convierte el valor de entrada a un tipo más grande ([extensión de signo](https://en.wikipedia.org/wiki/Sign_extension)). Entonces, por ejemplo, `bitCount(toUInt8(-1)) = 8`.
-
-Tipo: `UInt8`.
-
-**Ejemplo**
-
-Tomemos por ejemplo el número 333. Su representación binaria: 0000000101001101.
-
-Consulta:
-
-``` sql
-SELECT bitCount(333)
-```
-
-Resultado:
-
-``` text
-┌─bitCount(333)─┐
-│             5 │
-└───────────────┘
-```
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/functions/bit_functions/) <!--hide-->
diff --git a/docs/es/sql-reference/functions/bitmap-functions.md b/docs/es/sql-reference/functions/bitmap-functions.md
deleted file mode 100644
index 1643801c77b..00000000000
--- a/docs/es/sql-reference/functions/bitmap-functions.md
+++ /dev/null
@@ -1,496 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 49
-toc_title: Bits
----
-
-# Funciones de mapa de bits {#bitmap-functions}
-
-Las funciones de mapa de bits funcionan para dos mapas de bits Cálculo del valor del objeto, es devolver un nuevo mapa de bits o cardinalidad mientras se usa el cálculo de la fórmula, como y, o, xor, y no, etc.
-
-Hay 2 tipos de métodos de construcción para Bitmap Object. Uno debe ser construido por la función de agregación groupBitmap con -State , el otro debe ser construido por Array Object . También es para convertir objeto de mapa de bits a objeto de matriz.
-
-RoaringBitmap se envuelve en una estructura de datos, mientras que el almacenamiento real de los objetos de mapa de bits. Cuando la cardinalidad es menor o igual que 32, utiliza Set objet. Cuando la cardinalidad es mayor que 32, utiliza el objeto RoaringBitmap. Es por eso que el almacenamiento del conjunto de baja cardinalidad es más rápido.
-
-Para obtener más información sobre RoaringBitmap, consulte: [CRoaring](https://github.com/RoaringBitmap/CRoaring).
-
-## bitmapBuild {#bitmap_functions-bitmapbuild}
-
-Construya un mapa de bits a partir de una matriz de enteros sin signo.
-
-``` sql
-bitmapBuild(array)
-```
-
-**Parámetros**
-
--   `array` – unsigned integer array.
-
-**Ejemplo**
-
-``` sql
-SELECT bitmapBuild([1, 2, 3, 4, 5]) AS res, toTypeName(res)
-```
-
-``` text
-┌─res─┬─toTypeName(bitmapBuild([1, 2, 3, 4, 5]))─────┐
-│ 
    │ AggregateFunction(groupBitmap, UInt8)    │
-└─────┴──────────────────────────────────────────────┘
-```
-
-## bitmapToArray {#bitmaptoarray}
-
-Convertir mapa de bits a matriz entera.
-
-``` sql
-bitmapToArray(bitmap)
-```
-
-**Parámetros**
-
--   `bitmap` – bitmap object.
-
-**Ejemplo**
-
-``` sql
-SELECT bitmapToArray(bitmapBuild([1, 2, 3, 4, 5])) AS res
-```
-
-``` text
-┌─res─────────┐
-│ [1,2,3,4,5] │
-└─────────────┘
-```
-
-## bitmapSubsetInRange {#bitmap-functions-bitmapsubsetinrange}
-
-Devuelve el subconjunto en el rango especificado (no incluye range_end).
-
-``` sql
-bitmapSubsetInRange(bitmap, range_start, range_end)
-```
-
-**Parámetros**
-
--   `bitmap` – [Objeto de mapa de bits](#bitmap_functions-bitmapbuild).
--   `range_start` – range start point. Type: [UInt32](../../sql-reference/data-types/int-uint.md).
--   `range_end` – range end point(excluded). Type: [UInt32](../../sql-reference/data-types/int-uint.md).
-
-**Ejemplo**
-
-``` sql
-SELECT bitmapToArray(bitmapSubsetInRange(bitmapBuild([0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,100,200,500]), toUInt32(30), toUInt32(200))) AS res
-```
-
-``` text
-┌─res───────────────┐
-│ [30,31,32,33,100] │
-└───────────────────┘
-```
-
-## bitmapSubsetLimit {#bitmapsubsetlimit}
-
-Crea un subconjunto de mapa de bits con n elementos tomados entre `range_start` y `cardinality_limit`.
-
-**Sintaxis**
-
-``` sql
-bitmapSubsetLimit(bitmap, range_start, cardinality_limit)
-```
-
-**Parámetros**
-
--   `bitmap` – [Objeto de mapa de bits](#bitmap_functions-bitmapbuild).
--   `range_start` – The subset starting point. Type: [UInt32](../../sql-reference/data-types/int-uint.md).
--   `cardinality_limit` – The subset cardinality upper limit. Type: [UInt32](../../sql-reference/data-types/int-uint.md).
-
-**Valor devuelto**
-
-Subconjunto.
-
-Tipo: `Bitmap object`.
-
-**Ejemplo**
-
-Consulta:
-
-``` sql
-SELECT bitmapToArray(bitmapSubsetLimit(bitmapBuild([0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,100,200,500]), toUInt32(30), toUInt32(200))) AS res
-```
-
-Resultado:
-
-``` text
-┌─res───────────────────────┐
-│ [30,31,32,33,100,200,500] │
-└───────────────────────────┘
-```
-
-## bitmapContains {#bitmap_functions-bitmapcontains}
-
-Comprueba si el mapa de bits contiene un elemento.
-
-``` sql
-bitmapContains(haystack, needle)
-```
-
-**Parámetros**
-
--   `haystack` – [Objeto de mapa de bits](#bitmap_functions-bitmapbuild), donde la función busca.
--   `needle` – Value that the function searches. Type: [UInt32](../../sql-reference/data-types/int-uint.md).
-
-**Valores devueltos**
-
--   0 — If `haystack` no contiene `needle`.
--   1 — If `haystack` contener `needle`.
-
-Tipo: `UInt8`.
-
-**Ejemplo**
-
-``` sql
-SELECT bitmapContains(bitmapBuild([1,5,7,9]), toUInt32(9)) AS res
-```
-
-``` text
-┌─res─┐
-│  1  │
-└─────┘
-```
-
-## bitmapHasAny {#bitmaphasany}
-
-Comprueba si dos mapas de bits tienen intersección por algunos elementos.
-
-``` sql
-bitmapHasAny(bitmap1, bitmap2)
-```
-
-Si está seguro de que `bitmap2` contiene estrictamente un elemento, considere usar el [bitmapContains](#bitmap_functions-bitmapcontains) función. Funciona de manera más eficiente.
-
-**Parámetros**
-
--   `bitmap*` – bitmap object.
-
-**Valores de retorno**
-
--   `1`, si `bitmap1` y `bitmap2` tienen un elemento similar al menos.
--   `0`, de lo contrario.
-
-**Ejemplo**
-
-``` sql
-SELECT bitmapHasAny(bitmapBuild([1,2,3]),bitmapBuild([3,4,5])) AS res
-```
-
-``` text
-┌─res─┐
-│  1  │
-└─────┘
-```
-
-## bitmapHasAll {#bitmaphasall}
-
-Análogo a `hasAll(array, array)` devuelve 1 si el primer mapa de bits contiene todos los elementos del segundo, 0 de lo contrario.
-Si el segundo argumento es un mapa de bits vacío, devuelve 1.
-
-``` sql
-bitmapHasAll(bitmap,bitmap)
-```
-
-**Parámetros**
-
--   `bitmap` – bitmap object.
-
-**Ejemplo**
-
-``` sql
-SELECT bitmapHasAll(bitmapBuild([1,2,3]),bitmapBuild([3,4,5])) AS res
-```
-
-``` text
-┌─res─┐
-│  0  │
-└─────┘
-```
-
-## bitmapCardinalidad {#bitmapcardinality}
-
-Vuelva a ejecutar la cardinalidad del mapa de bits de tipo UInt64.
-
-``` sql
-bitmapCardinality(bitmap)
-```
-
-**Parámetros**
-
--   `bitmap` – bitmap object.
-
-**Ejemplo**
-
-``` sql
-SELECT bitmapCardinality(bitmapBuild([1, 2, 3, 4, 5])) AS res
-```
-
-``` text
-┌─res─┐
-│   5 │
-└─────┘
-```
-
-## bitmapMin {#bitmapmin}
-
-Vuelva a ejecutar el valor más pequeño de tipo UInt64 en el conjunto, UINT32_MAX si el conjunto está vacío.
-
-    bitmapMin(bitmap)
-
-**Parámetros**
-
--   `bitmap` – bitmap object.
-
-**Ejemplo**
-
-``` sql
-SELECT bitmapMin(bitmapBuild([1, 2, 3, 4, 5])) AS res
-```
-
-    ┌─res─┐
-    │   1 │
-    └─────┘
-
-## bitmapMax {#bitmapmax}
-
-Vuelva a ejecutar el mayor valor de tipo UInt64 en el conjunto, 0 si el conjunto está vacío.
-
-    bitmapMax(bitmap)
-
-**Parámetros**
-
--   `bitmap` – bitmap object.
-
-**Ejemplo**
-
-``` sql
-SELECT bitmapMax(bitmapBuild([1, 2, 3, 4, 5])) AS res
-```
-
-    ┌─res─┐
-    │   5 │
-    └─────┘
-
-## bitmapTransform {#bitmaptransform}
-
-Transformar una matriz de valores en un mapa de bits a otra matriz de valores, el resultado es un nuevo mapa de bits.
-
-    bitmapTransform(bitmap, from_array, to_array)
-
-**Parámetros**
-
--   `bitmap` – bitmap object.
--   `from_array` – UInt32 array. For idx in range \[0, from_array.size()), if bitmap contains from_array\[idx\], then replace it with to_array\[idx\]. Note that the result depends on array ordering if there are common elements between from_array and to_array.
--   `to_array` – UInt32 array, its size shall be the same to from_array.
-
-**Ejemplo**
-
-``` sql
-SELECT bitmapToArray(bitmapTransform(bitmapBuild([1, 2, 3, 4, 5, 6, 7, 8, 9, 10]), cast([5,999,2] as Array(UInt32)), cast([2,888,20] as Array(UInt32)))) AS res
-```
-
-    ┌─res───────────────────┐
-    │ [1,3,4,6,7,8,9,10,20] │
-    └───────────────────────┘
-
-## bitmapAnd {#bitmapand}
-
-Dos mapa de bits y cálculo, el resultado es un nuevo mapa de bits.
-
-``` sql
-bitmapAnd(bitmap,bitmap)
-```
-
-**Parámetros**
-
--   `bitmap` – bitmap object.
-
-**Ejemplo**
-
-``` sql
-SELECT bitmapToArray(bitmapAnd(bitmapBuild([1,2,3]),bitmapBuild([3,4,5]))) AS res
-```
-
-``` text
-┌─res─┐
-│ [3] │
-└─────┘
-```
-
-## bitmapO {#bitmapor}
-
-Dos mapa de bits o cálculo, el resultado es un nuevo mapa de bits.
-
-``` sql
-bitmapOr(bitmap,bitmap)
-```
-
-**Parámetros**
-
--   `bitmap` – bitmap object.
-
-**Ejemplo**
-
-``` sql
-SELECT bitmapToArray(bitmapOr(bitmapBuild([1,2,3]),bitmapBuild([3,4,5]))) AS res
-```
-
-``` text
-┌─res─────────┐
-│ [1,2,3,4,5] │
-└─────────────┘
-```
-
-## bitmapXor {#bitmapxor}
-
-Dos bitmap xor cálculo, el resultado es un nuevo mapa de bits.
-
-``` sql
-bitmapXor(bitmap,bitmap)
-```
-
-**Parámetros**
-
--   `bitmap` – bitmap object.
-
-**Ejemplo**
-
-``` sql
-SELECT bitmapToArray(bitmapXor(bitmapBuild([1,2,3]),bitmapBuild([3,4,5]))) AS res
-```
-
-``` text
-┌─res───────┐
-│ [1,2,4,5] │
-└───────────┘
-```
-
-## bitmapAndnot {#bitmapandnot}
-
-Dos mapas de bits y no cálculo, el resultado es un nuevo mapa de bits.
-
-``` sql
-bitmapAndnot(bitmap,bitmap)
-```
-
-**Parámetros**
-
--   `bitmap` – bitmap object.
-
-**Ejemplo**
-
-``` sql
-SELECT bitmapToArray(bitmapAndnot(bitmapBuild([1,2,3]),bitmapBuild([3,4,5]))) AS res
-```
-
-``` text
-┌─res───┐
-│ [1,2] │
-└───────┘
-```
-
-## Bienvenido a WordPress {#bitmapandcardinality}
-
-Dos mapa de bits y cálculo, devuelven cardinalidad de tipo UInt64.
-
-``` sql
-bitmapAndCardinality(bitmap,bitmap)
-```
-
-**Parámetros**
-
--   `bitmap` – bitmap object.
-
-**Ejemplo**
-
-``` sql
-SELECT bitmapAndCardinality(bitmapBuild([1,2,3]),bitmapBuild([3,4,5])) AS res;
-```
-
-``` text
-┌─res─┐
-│   1 │
-└─────┘
-```
-
-## bitmapOrCardinalidad {#bitmaporcardinality}
-
-Dos mapa de bits o cálculo, retorno cardinalidad de tipo UInt64.
-
-``` sql
-bitmapOrCardinality(bitmap,bitmap)
-```
-
-**Parámetros**
-
--   `bitmap` – bitmap object.
-
-**Ejemplo**
-
-``` sql
-SELECT bitmapOrCardinality(bitmapBuild([1,2,3]),bitmapBuild([3,4,5])) AS res;
-```
-
-``` text
-┌─res─┐
-│   5 │
-└─────┘
-```
-
-## bitmapXorCardinalidad {#bitmapxorcardinality}
-
-Dos bitmap xor cálculo, retorno cardinalidad de tipo UInt64.
-
-``` sql
-bitmapXorCardinality(bitmap,bitmap)
-```
-
-**Parámetros**
-
--   `bitmap` – bitmap object.
-
-**Ejemplo**
-
-``` sql
-SELECT bitmapXorCardinality(bitmapBuild([1,2,3]),bitmapBuild([3,4,5])) AS res;
-```
-
-``` text
-┌─res─┐
-│   4 │
-└─────┘
-```
-
-## Por favor, introduzca su dirección de correo electrónico {#bitmapandnotcardinality}
-
-Dos mapas de bits yno cálculo, devuelve cardinalidad de tipo UInt64.
-
-``` sql
-bitmapAndnotCardinality(bitmap,bitmap)
-```
-
-**Parámetros**
-
--   `bitmap` – bitmap object.
-
-**Ejemplo**
-
-``` sql
-SELECT bitmapAndnotCardinality(bitmapBuild([1,2,3]),bitmapBuild([3,4,5])) AS res;
-```
-
-``` text
-┌─res─┐
-│   2 │
-└─────┘
-```
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/functions/bitmap_functions/) <!--hide-->
diff --git a/docs/es/sql-reference/functions/comparison-functions.md b/docs/es/sql-reference/functions/comparison-functions.md
deleted file mode 100644
index 316288c9bc1..00000000000
--- a/docs/es/sql-reference/functions/comparison-functions.md
+++ /dev/null
@@ -1,37 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 36
-toc_title: "Comparaci\xF3n"
----
-
-# Funciones de comparación {#comparison-functions}
-
-Las funciones de comparación siempre devuelven 0 o 1 (Uint8).
-
-Se pueden comparar los siguientes tipos:
-
--   numero
--   cuerdas y cuerdas fijas
--   fechas
--   fechas con tiempos
-
-dentro de cada grupo, pero no entre diferentes grupos.
-
-Por ejemplo, no puede comparar una fecha con una cadena. Debe usar una función para convertir la cadena a una fecha, o viceversa.
-
-Las cadenas se comparan por bytes. Una cadena más corta es más pequeña que todas las cadenas que comienzan con ella y que contienen al menos un carácter más.
-
-## iguales, a = b y a == b operador {#function-equals}
-
-## notEquals, un ! operador = b y un \<\> b {#function-notequals}
-
-## menos, operador \<  {#function-less}
-
-## Saludos {#function-greater}
-
-## lessOrEquals, operador \<=  {#function-lessorequals}
-
-## greaterOrEquals, operador \>=  {#function-greaterorequals}
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/functions/comparison_functions/) <!--hide-->
diff --git a/docs/es/sql-reference/functions/conditional-functions.md b/docs/es/sql-reference/functions/conditional-functions.md
deleted file mode 100644
index 5e6097d7c19..00000000000
--- a/docs/es/sql-reference/functions/conditional-functions.md
+++ /dev/null
@@ -1,207 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 43
-toc_title: 'Condicional '
----
-
-# Funciones condicionales {#conditional-functions}
-
-## si {#if}
-
-Controla la bifurcación condicional. A diferencia de la mayoría de los sistemas, ClickHouse siempre evalúa ambas expresiones `then` y `else`.
-
-**Sintaxis**
-
-``` sql
-SELECT if(cond, then, else)
-```
-
-Si la condición `cond` evalúa a un valor distinto de cero, devuelve el resultado de la expresión `then` y el resultado de la expresión `else` si está presente, se omite. Si el `cond` es cero o `NULL` el resultado de la `then` expresión se omite y el resultado de la `else` expresión, si está presente, se devuelve.
-
-**Parámetros**
-
--   `cond` – The condition for evaluation that can be zero or not. The type is UInt8, Nullable(UInt8) or NULL.
--   `then` - La expresión que se va a devolver si se cumple la condición.
--   `else` - La expresión a devolver si no se cumple la condición.-
-
-**Valores devueltos**
-
-La función se ejecuta `then` y `else` expresiones y devuelve su resultado, dependiendo de si la condición `cond` terminó siendo cero o no.
-
-**Ejemplo**
-
-Consulta:
-
-``` sql
-SELECT if(1, plus(2, 2), plus(2, 6))
-```
-
-Resultado:
-
-``` text
-┌─plus(2, 2)─┐
-│          4 │
-└────────────┘
-```
-
-Consulta:
-
-``` sql
-SELECT if(0, plus(2, 2), plus(2, 6))
-```
-
-Resultado:
-
-``` text
-┌─plus(2, 6)─┐
-│          8 │
-└────────────┘
-```
-
--   `then` y `else` debe tener el tipo común más bajo.
-
-**Ejemplo:**
-
-Toma esto `LEFT_RIGHT` tabla:
-
-``` sql
-SELECT *
-FROM LEFT_RIGHT
-
-┌─left─┬─right─┐
-│ ᴺᵁᴸᴸ │     4 │
-│    1 │     3 │
-│    2 │     2 │
-│    3 │     1 │
-│    4 │  ᴺᵁᴸᴸ │
-└──────┴───────┘
-```
-
-La siguiente consulta compara `left` y `right` valor:
-
-``` sql
-SELECT
-    left,
-    right,
-    if(left < right, 'left is smaller than right', 'right is greater or equal than left') AS is_smaller
-FROM LEFT_RIGHT
-WHERE isNotNull(left) AND isNotNull(right)
-
-┌─left─┬─right─┬─is_smaller──────────────────────────┐
-│    1 │     3 │ left is smaller than right          │
-│    2 │     2 │ right is greater or equal than left │
-│    3 │     1 │ right is greater or equal than left │
-└──────┴───────┴─────────────────────────────────────┘
-```
-
-Nota: `NULL` los valores no se utilizan en este ejemplo, compruebe [Valores NULL en condicionales](#null-values-in-conditionals) apartado.
-
-## Operador ternario {#ternary-operator}
-
-Funciona igual que `if` función.
-
-Sintaxis: `cond ? then : else`
-
-Devoluciones `then` si el `cond` evalúa que es verdadero (mayor que cero), de lo contrario devuelve `else`.
-
--   `cond` debe ser de tipo de `UInt8`, y `then` y `else` debe tener el tipo común más bajo.
-
--   `then` y `else` puede ser `NULL`
-
-**Ver también**
-
--   [ifNotFinite](other-functions.md#ifnotfinite).
-
-## MultiIf {#multiif}
-
-Le permite escribir el [CASE](../operators/index.md#operator_case) operador más compacto en la consulta.
-
-Sintaxis: `multiIf(cond_1, then_1, cond_2, then_2, ..., else)`
-
-**Parámetros:**
-
--   `cond_N` — The condition for the function to return `then_N`.
--   `then_N` — The result of the function when executed.
--   `else` — The result of the function if none of the conditions is met.
-
-La función acepta `2N+1` parámetros.
-
-**Valores devueltos**
-
-La función devuelve uno de los valores `then_N` o `else` dependiendo de las condiciones `cond_N`.
-
-**Ejemplo**
-
-De nuevo usando `LEFT_RIGHT` tabla.
-
-``` sql
-SELECT
-    left,
-    right,
-    multiIf(left < right, 'left is smaller', left > right, 'left is greater', left = right, 'Both equal', 'Null value') AS result
-FROM LEFT_RIGHT
-
-┌─left─┬─right─┬─result──────────┐
-│ ᴺᵁᴸᴸ │     4 │ Null value      │
-│    1 │     3 │ left is smaller │
-│    2 │     2 │ Both equal      │
-│    3 │     1 │ left is greater │
-│    4 │  ᴺᵁᴸᴸ │ Null value      │
-└──────┴───────┴─────────────────┘
-```
-
-## Uso directo de resultados condicionales {#using-conditional-results-directly}
-
-Los condicionales siempre dan como resultado `0`, `1` o `NULL`. Entonces puedes usar resultados condicionales directamente como este:
-
-``` sql
-SELECT left < right AS is_small
-FROM LEFT_RIGHT
-
-┌─is_small─┐
-│     ᴺᵁᴸᴸ │
-│        1 │
-│        0 │
-│        0 │
-│     ᴺᵁᴸᴸ │
-└──────────┘
-```
-
-## Valores NULL en condicionales {#null-values-in-conditionals}
-
-Cuando `NULL` están involucrados en condicionales, el resultado también será `NULL`.
-
-``` sql
-SELECT
-    NULL < 1,
-    2 < NULL,
-    NULL < NULL,
-    NULL = NULL
-
-┌─less(NULL, 1)─┬─less(2, NULL)─┬─less(NULL, NULL)─┬─equals(NULL, NULL)─┐
-│ ᴺᵁᴸᴸ          │ ᴺᵁᴸᴸ          │ ᴺᵁᴸᴸ             │ ᴺᵁᴸᴸ               │
-└───────────────┴───────────────┴──────────────────┴────────────────────┘
-```
-
-Por lo tanto, debe construir sus consultas cuidadosamente si los tipos son `Nullable`.
-
-El siguiente ejemplo demuestra esto al no agregar la condición equals a `multiIf`.
-
-``` sql
-SELECT
-    left,
-    right,
-    multiIf(left < right, 'left is smaller', left > right, 'right is smaller', 'Both equal') AS faulty_result
-FROM LEFT_RIGHT
-
-┌─left─┬─right─┬─faulty_result────┐
-│ ᴺᵁᴸᴸ │     4 │ Both equal       │
-│    1 │     3 │ left is smaller  │
-│    2 │     2 │ Both equal       │
-│    3 │     1 │ right is smaller │
-│    4 │  ᴺᵁᴸᴸ │ Both equal       │
-└──────┴───────┴──────────────────┘
-```
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/functions/conditional_functions/) <!--hide-->
diff --git a/docs/es/sql-reference/functions/date-time-functions.md b/docs/es/sql-reference/functions/date-time-functions.md
deleted file mode 100644
index f80805d0558..00000000000
--- a/docs/es/sql-reference/functions/date-time-functions.md
+++ /dev/null
@@ -1,450 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 39
-toc_title: Trabajar con fechas y horas
----
-
-# Funciones para trabajar con fechas y horas {#functions-for-working-with-dates-and-times}
-
-Soporte para zonas horarias
-
-Todas las funciones para trabajar con la fecha y la hora que tienen un uso lógico para la zona horaria pueden aceptar un segundo argumento de zona horaria opcional. Ejemplo: Asia/Ekaterimburgo. En este caso, utilizan la zona horaria especificada en lugar de la local (predeterminada).
-
-``` sql
-SELECT
-    toDateTime('2016-06-15 23:00:00') AS time,
-    toDate(time) AS date_local,
-    toDate(time, 'Asia/Yekaterinburg') AS date_yekat,
-    toString(time, 'US/Samoa') AS time_samoa
-```
-
-``` text
-┌────────────────time─┬─date_local─┬─date_yekat─┬─time_samoa──────────┐
-│ 2016-06-15 23:00:00 │ 2016-06-15 │ 2016-06-16 │ 2016-06-15 09:00:00 │
-└─────────────────────┴────────────┴────────────┴─────────────────────┘
-```
-
-Solo se admiten las zonas horarias que difieren de UTC por un número entero de horas.
-
-## Todos los derechos reservados {#totimezone}
-
-Convierta la hora o la fecha y la hora a la zona horaria especificada.
-
-## paraAño {#toyear}
-
-Convierte una fecha o fecha con hora en un número UInt16 que contiene el número de año (AD).
-
-## aTrimestre {#toquarter}
-
-Convierte una fecha o fecha con hora en un número UInt8 que contiene el número de trimestre.
-
-## ParaMes {#tomonth}
-
-Convierte una fecha o fecha con hora en un número UInt8 que contiene el número de mes (1-12).
-
-## Todos los derechos reservados {#todayofyear}
-
-Convierte una fecha o fecha con hora en un número UInt16 que contiene el número del día del año (1-366).
-
-## Todos los derechos reservados {#todayofmonth}
-
-Convierte una fecha o fecha con hora en un número UInt8 que contiene el número del día del mes (1-31).
-
-## Todos los derechos reservados {#todayofweek}
-
-Convierte una fecha o fecha con hora en un número UInt8 que contiene el número del día de la semana (el lunes es 1 y el domingo es 7).
-
-## ParaHora {#tohour}
-
-Convierte una fecha con hora en un número UInt8 que contiene el número de la hora en el tiempo de 24 horas (0-23).
-This function assumes that if clocks are moved ahead, it is by one hour and occurs at 2 a.m., and if clocks are moved back, it is by one hour and occurs at 3 a.m. (which is not always true – even in Moscow the clocks were twice changed at a different time).
-
-## ToMinute {#tominute}
-
-Convierte una fecha con hora en un número UInt8 que contiene el número del minuto de la hora (0-59).
-
-## aSegundo {#tosecond}
-
-Convierte una fecha con hora en un número UInt8 que contiene el número del segundo en el minuto (0-59).
-Los segundos de salto no se contabilizan.
-
-## Todos los derechos reservados {#to-unix-timestamp}
-
-Para el argumento DateTime: convierte el valor a su representación numérica interna (Unix Timestamp).
-Para el argumento String: analice la fecha y hora de la cadena de acuerdo con la zona horaria (segundo argumento opcional, la zona horaria del servidor se usa de forma predeterminada) y devuelve la marca de tiempo de Unix correspondiente.
-Para el argumento Date : el comportamiento no está especificado.
-
-**Sintaxis**
-
-``` sql
-toUnixTimestamp(datetime)
-toUnixTimestamp(str, [timezone])
-```
-
-**Valor devuelto**
-
--   Devuelve la marca de tiempo de Unix.
-
-Tipo: `UInt32`.
-
-**Ejemplo**
-
-Consulta:
-
-``` sql
-SELECT toUnixTimestamp('2017-11-05 08:07:47', 'Asia/Tokyo') AS unix_timestamp
-```
-
-Resultado:
-
-``` text
-┌─unix_timestamp─┐
-│     1509836867 │
-└────────────────┘
-```
-
-## Todos los derechos reservados {#tostartofyear}
-
-Redondea una fecha o fecha con la hora hasta el primer día del año.
-Devuelve la fecha.
-
-## Todos los derechos reservados {#tostartofisoyear}
-
-Redondea una fecha o fecha con la hora hasta el primer día del año ISO.
-Devuelve la fecha.
-
-## Todos los derechos reservados {#tostartofquarter}
-
-Redondea una fecha o fecha con la hora hasta el primer día del trimestre.
-El primer día del trimestre es el 1 de enero, el 1 de abril, el 1 de julio o el 1 de octubre.
-Devuelve la fecha.
-
-## Todos los derechos reservados {#tostartofmonth}
-
-Redondea una fecha o fecha con la hora hasta el primer día del mes.
-Devuelve la fecha.
-
-!!! attention "Atención"
-    El comportamiento de analizar fechas incorrectas es específico de la implementación. ClickHouse puede devolver una fecha cero, lanzar una excepción o hacer “natural” desbordamiento.
-
-## paraLunes {#tomonday}
-
-Redondea una fecha o fecha con hora al lunes más cercano.
-Devuelve la fecha.
-
-## ¿Cómo puedo hacerlo?\]) {#tostartofweektmode}
-
-Redondea una fecha o fecha con hora al domingo o lunes más cercano por modo.
-Devuelve la fecha.
-El argumento mode funciona exactamente igual que el argumento mode a toWeek() . Para la sintaxis de argumento único, se utiliza un valor de modo de 0.
-
-## Todos los derechos reservados {#tostartofday}
-
-Redondea una fecha con el tiempo hasta el comienzo del día.
-
-## Todos los derechos reservados {#tostartofhour}
-
-Redondea una fecha con el tiempo hasta el comienzo de la hora.
-
-## Todos los derechos reservados {#tostartofminute}
-
-Redondea una fecha con el tiempo hasta el inicio del minuto.
-
-## Acerca de nosotros {#tostartoffiveminute}
-
-Redondea una fecha con el tiempo hasta el inicio del intervalo de cinco minutos.
-
-## Acerca de Nosotros {#tostartoftenminutes}
-
-Redondea una fecha con el tiempo hasta el inicio del intervalo de diez minutos.
-
-## Para comenzar de quince minutos {#tostartoffifteenminutes}
-
-Redondea la fecha con el tiempo hasta el inicio del intervalo de quince minutos.
-
-## También puede usar una interfaz de usuario.\]) {#tostartofintervaltime-or-data-interval-x-unit-time-zone}
-
-Esta es una generalización de otras funciones llamadas `toStartOf*`. Por ejemplo,
-`toStartOfInterval(t, INTERVAL 1 year)` devuelve lo mismo que `toStartOfYear(t)`,
-`toStartOfInterval(t, INTERVAL 1 month)` devuelve lo mismo que `toStartOfMonth(t)`,
-`toStartOfInterval(t, INTERVAL 1 day)` devuelve lo mismo que `toStartOfDay(t)`,
-`toStartOfInterval(t, INTERVAL 15 minute)` devuelve lo mismo que `toStartOfFifteenMinutes(t)` sucesivamente.
-
-## Tiempo {#totime}
-
-Convierte una fecha con hora en una fecha fija determinada, preservando al mismo tiempo la hora.
-
-## Todos los derechos reservados {#torelativeyearnum}
-
-Convierte una fecha con hora o fecha en el número del año, a partir de un determinado punto fijo en el pasado.
-
-## Nombre de la red inalámbrica (SSID): {#torelativequarternum}
-
-Convierte una fecha con hora o fecha en el número del trimestre, a partir de un determinado punto fijo en el pasado.
-
-## Nombre de la red inalámbrica (SSID): {#torelativemonthnum}
-
-Convierte una fecha con hora o fecha en el número del mes, a partir de un determinado punto fijo en el pasado.
-
-## Nombre de la red inalámbrica (SSID): {#torelativeweeknum}
-
-Convierte una fecha con hora o fecha en el número de la semana, a partir de un determinado punto fijo en el pasado.
-
-## Nombre de la red inalámbrica (SSID): {#torelativedaynum}
-
-Convierte una fecha con hora o fecha en el número del día, a partir de un determinado punto fijo en el pasado.
-
-## Nombre de la red inalámbrica (SSID): {#torelativehournum}
-
-Convierte una fecha con hora o fecha en el número de la hora, a partir de un determinado punto fijo en el pasado.
-
-## Todos los derechos reservados {#torelativeminutenum}
-
-Convierte una fecha con hora o fecha en el número del minuto, a partir de un cierto punto fijo en el pasado.
-
-## Todos los derechos reservados {#torelativesecondnum}
-
-Convierte una fecha con hora o fecha en el número de la segunda, a partir de un cierto punto fijo en el pasado.
-
-## AISOAño {#toisoyear}
-
-Convierte una fecha o fecha con hora en un número UInt16 que contiene el número ISO Year.
-
-## paraISOWeek {#toisoweek}
-
-Convierte una fecha o fecha con hora en un número UInt8 que contiene el número de semana ISO.
-
-## ToWeek(fecha\[,modo\]) {#toweekdatemode}
-
-Esta función devuelve el número de semana para la fecha o la fecha y hora. La forma de dos argumentos de toWeek() le permite especificar si la semana comienza el domingo o el lunes y si el valor de retorno debe estar en el rango de 0 a 53 o de 1 a 53. Si se omite el argumento mode, el modo predeterminado es 0.
-`toISOWeek()`es una función de compatibilidad que es equivalente a `toWeek(date,3)`.
-La siguiente tabla describe cómo funciona el argumento mode.
-
-| Modo | Primer día de la semana | Gama | Week 1 is the first week … |
-|------|-------------------------|------|----------------------------|
-| 0    | Domingo                 | 0-53 | con un domingo de este año |
-| 1    | Lunes                   | 0-53 | con 4 o más días este año  |
-| 2    | Domingo                 | 1-53 | con un domingo de este año |
-| 3    | Lunes                   | 1-53 | con 4 o más días este año  |
-| 4    | Domingo                 | 0-53 | con 4 o más días este año  |
-| 5    | Lunes                   | 0-53 | con un lunes de este año   |
-| 6    | Domingo                 | 1-53 | con 4 o más días este año  |
-| 7    | Lunes                   | 1-53 | con un lunes de este año   |
-| 8    | Domingo                 | 1-53 | contiene 1 de enero        |
-| 9    | Lunes                   | 1-53 | contiene 1 de enero        |
-
-Para valores de modo con un significado de “with 4 or more days this year,” semanas están numeradas según ISO 8601:1988:
-
--   Si la semana que contiene el 1 de enero tiene 4 o más días en el nuevo año, es la semana 1.
-
--   De lo contrario, es la última semana del año anterior, y la semana siguiente es la semana 1.
-
-Para valores de modo con un significado de “contains January 1”, la semana contiene 1 de enero es la semana 1. No importa cuántos días en el nuevo año contenía la semana, incluso si contenía solo un día.
-
-``` sql
-toWeek(date, [, mode][, Timezone])
-```
-
-**Parámetros**
-
--   `date` – Date or DateTime.
--   `mode` – Optional parameter, Range of values is \[0,9\], default is 0.
--   `Timezone` – Optional parameter, it behaves like any other conversion function.
-
-**Ejemplo**
-
-``` sql
-SELECT toDate('2016-12-27') AS date, toWeek(date) AS week0, toWeek(date,1) AS week1, toWeek(date,9) AS week9;
-```
-
-``` text
-┌───────date─┬─week0─┬─week1─┬─week9─┐
-│ 2016-12-27 │    52 │    52 │     1 │
-└────────────┴───────┴───────┴───────┘
-```
-
-## aYearWeek(fecha\[,modo\]) {#toyearweekdatemode}
-
-Devuelve año y semana para una fecha. El año en el resultado puede ser diferente del año en el argumento de fecha para la primera y la última semana del año.
-
-El argumento mode funciona exactamente igual que el argumento mode a toWeek() . Para la sintaxis de argumento único, se utiliza un valor de modo de 0.
-
-`toISOYear()`es una función de compatibilidad que es equivalente a `intDiv(toYearWeek(date,3),100)`.
-
-**Ejemplo**
-
-``` sql
-SELECT toDate('2016-12-27') AS date, toYearWeek(date) AS yearWeek0, toYearWeek(date,1) AS yearWeek1, toYearWeek(date,9) AS yearWeek9;
-```
-
-``` text
-┌───────date─┬─yearWeek0─┬─yearWeek1─┬─yearWeek9─┐
-│ 2016-12-27 │    201652 │    201652 │    201701 │
-└────────────┴───────────┴───────────┴───────────┘
-```
-
-## ahora {#now}
-
-Acepta cero argumentos y devuelve la hora actual en uno de los momentos de ejecución de la solicitud.
-Esta función devuelve una constante, incluso si la solicitud tardó mucho en completarse.
-
-## hoy {#today}
-
-Acepta cero argumentos y devuelve la fecha actual en uno de los momentos de ejecución de la solicitud.
-Lo mismo que ‘toDate(now())’.
-
-## ayer {#yesterday}
-
-Acepta cero argumentos y devuelve la fecha de ayer en uno de los momentos de ejecución de la solicitud.
-Lo mismo que ‘today() - 1’.
-
-## timeSlot {#timeslot}
-
-Redondea el tiempo a la media hora.
-Esta función es específica de Yandex.Metrica, ya que media hora es la cantidad mínima de tiempo para dividir una sesión en dos sesiones si una etiqueta de seguimiento muestra las páginas vistas consecutivas de un solo usuario que difieren en el tiempo en estrictamente más de esta cantidad. Esto significa que las tuplas (el ID de etiqueta, el ID de usuario y el intervalo de tiempo) se pueden usar para buscar páginas vistas que se incluyen en la sesión correspondiente.
-
-## paraYYYYMM {#toyyyymm}
-
-Convierte una fecha o fecha con hora en un número UInt32 que contiene el número de año y mes (YYYY \* 100 + MM).
-
-## paraYYYYMMDD {#toyyyymmdd}
-
-Convierte una fecha o fecha con hora en un número UInt32 que contiene el número de año y mes (AAAA \* 10000 + MM \* 100 + DD).
-
-## paraYYYYMMDDhhmmss {#toyyyymmddhhmmss}
-
-Convierte una fecha o fecha con hora en un número UInt64 que contiene el número de año y mes (YYYY \* 10000000000 + MM \* 100000000 + DD \* 1000000 + hh \* 10000 + mm \* 100 + ss).
-
-## Por ejemplo, en el caso de que el usuario pueda acceder a la página de inicio de sesión, seleccione la página de inicio de sesión {#addyears-addmonths-addweeks-adddays-addhours-addminutes-addseconds-addquarters}
-
-La función agrega un intervalo de fecha / fecha y hora a una fecha / fecha y hora y luego devuelve la fecha / fecha y hora. Por ejemplo:
-
-``` sql
-WITH
-    toDate('2018-01-01') AS date,
-    toDateTime('2018-01-01 00:00:00') AS date_time
-SELECT
-    addYears(date, 1) AS add_years_with_date,
-    addYears(date_time, 1) AS add_years_with_date_time
-```
-
-``` text
-┌─add_years_with_date─┬─add_years_with_date_time─┐
-│          2019-01-01 │      2019-01-01 00:00:00 │
-└─────────────────────┴──────────────────────────┘
-```
-
-## restarAños, restarMeses, restarSemanas, restarDías, restarHoras, restarMinutos, restarSegundos, restarCuartos {#subtractyears-subtractmonths-subtractweeks-subtractdays-subtracthours-subtractminutes-subtractseconds-subtractquarters}
-
-La función resta un intervalo de fecha / fecha y hora a una fecha / fecha y hora y luego devuelve la fecha / fecha y hora. Por ejemplo:
-
-``` sql
-WITH
-    toDate('2019-01-01') AS date,
-    toDateTime('2019-01-01 00:00:00') AS date_time
-SELECT
-    subtractYears(date, 1) AS subtract_years_with_date,
-    subtractYears(date_time, 1) AS subtract_years_with_date_time
-```
-
-``` text
-┌─subtract_years_with_date─┬─subtract_years_with_date_time─┐
-│               2018-01-01 │           2018-01-01 00:00:00 │
-└──────────────────────────┴───────────────────────────────┘
-```
-
-## dateDiff {#datediff}
-
-Devuelve la diferencia entre dos valores Date o DateTime.
-
-**Sintaxis**
-
-``` sql
-dateDiff('unit', startdate, enddate, [timezone])
-```
-
-**Parámetros**
-
--   `unit` — Time unit, in which the returned value is expressed. [Cadena](../syntax.md#syntax-string-literal).
-
-        Supported values:
-
-        | unit   |
-        | ---- |
-        |second  |
-        |minute  |
-        |hour    |
-        |day     |
-        |week    |
-        |month   |
-        |quarter |
-        |year    |
-
--   `startdate` — The first time value to compare. [Fecha](../../sql-reference/data-types/date.md) o [FechaHora](../../sql-reference/data-types/datetime.md).
-
--   `enddate` — The second time value to compare. [Fecha](../../sql-reference/data-types/date.md) o [FechaHora](../../sql-reference/data-types/datetime.md).
-
--   `timezone` — Optional parameter. If specified, it is applied to both `startdate` y `enddate`. Si no se especifica, las zonas horarias `startdate` y `enddate` se utilizan. Si no son lo mismo, el resultado no está especificado.
-
-**Valor devuelto**
-
-Diferencia entre `startdate` y `enddate` expresado en `unit`.
-
-Tipo: `int`.
-
-**Ejemplo**
-
-Consulta:
-
-``` sql
-SELECT dateDiff('hour', toDateTime('2018-01-01 22:00:00'), toDateTime('2018-01-02 23:00:00'));
-```
-
-Resultado:
-
-``` text
-┌─dateDiff('hour', toDateTime('2018-01-01 22:00:00'), toDateTime('2018-01-02 23:00:00'))─┐
-│                                                                                     25 │
-└────────────────────────────────────────────────────────────────────────────────────────┘
-```
-
-## timeSlots(Hora de inicio, Duración, \[, Tamaño\]) {#timeslotsstarttime-duration-size}
-
-Para un intervalo de tiempo a partir de ‘StartTime’ y continuando por ‘Duration’ segundos, devuelve una matriz de momentos en el tiempo, que consiste en puntos de este intervalo ‘Size’ en segundos. ‘Size’ es un parámetro opcional: una constante UInt32, establecida en 1800 por defecto.
-Por ejemplo, `timeSlots(toDateTime('2012-01-01 12:20:00'), 600) = [toDateTime('2012-01-01 12:00:00'), toDateTime('2012-01-01 12:30:00')]`.
-Esto es necesario para buscar páginas vistas en la sesión correspondiente.
-
-## formatDateTime(Hora, Formato\[, Zona horaria\]) {#formatdatetime}
-
-Function formats a Time according given Format string. N.B.: Format is a constant expression, e.g. you can not have multiple formats for single result column.
-
-Modificadores compatibles para Formato:
-(“Example” columna muestra el resultado de formateo para el tiempo `2018-01-02 22:33:44`)
-
-| Modificador     | Descripci                                                        | Ejemplo    |
-|-----------------|------------------------------------------------------------------|------------|
-| %C              | año dividido por 100 y truncado a entero (00-99)                 | 20         |
-| %d              | día del mes, cero acolchado (01-31)                              | 02         |
-| %D              | Fecha corta de MM/DD/YY, equivalente a %m/%d/%y                  | 01/02/18   |
-| %e              | día del mes, espacio acolchado ( 1-31)                           | 2          |
-| %F              | fecha corta AAAA-MM-DD, equivalente a %Y-%m-%d                   | 2018-01-02 |
-| %H              | hora en formato 24h (00-23)                                      | 22         |
-| %I              | hora en formato 12h (01-12)                                      | 10         |
-| %j              | día del año (001-366)                                            | 002        |
-| Más información | mes como un número decimal (01-12)                               | 01         |
-| %M              | minutos (00-59)                                                  | 33         |
-| %y              | carácter de nueva línea ('')                                     |            |
-| %p              | Designación AM o PM                                              | PM         |
-| %R              | HH de 24 horas: Tiempo del milímetro, equivalente a %H: %M       | 22:33      |
-| %S              | segundo (00-59)                                                  | 44         |
-| % t             | carácter de pestaña horizontal (')                               |            |
-| %T              | Formato de hora ISO 8601 (HH:MM:SS), equivalente a %H:%M:%S      | 22:33:44   |
-| %u              | ISO 8601 día de la semana como número con el lunes como 1 (1-7)  | 2          |
-| %V              | Número de semana ISO 8601 (01-53)                                | 01         |
-| % w             | día de la semana como un número decimal con domingo como 0 (0-6) | 2          |
-| %y              | Año, últimos dos dígitos (00-99)                                 | 18         |
-| %Y              | Año                                                              | 2018       |
-| %%              | signo                                                            | %          |
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/functions/date_time_functions/) <!--hide-->
diff --git a/docs/es/sql-reference/functions/encoding-functions.md b/docs/es/sql-reference/functions/encoding-functions.md
deleted file mode 100644
index d3bbd68f335..00000000000
--- a/docs/es/sql-reference/functions/encoding-functions.md
+++ /dev/null
@@ -1,175 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 52
-toc_title: "Codificaci\xF3n"
----
-
-# Funciones de codificación {#encoding-functions}
-
-## char {#char}
-
-Devuelve la cadena con la longitud como el número de argumentos pasados y cada byte tiene el valor del argumento correspondiente. Acepta varios argumentos de tipos numéricos. Si el valor del argumento está fuera del rango del tipo de datos UInt8, se convierte a UInt8 con posible redondeo y desbordamiento.
-
-**Sintaxis**
-
-``` sql
-char(number_1, [number_2, ..., number_n]);
-```
-
-**Parámetros**
-
--   `number_1, number_2, ..., number_n` — Numerical arguments interpreted as integers. Types: [En](../../sql-reference/data-types/int-uint.md), [Flotante](../../sql-reference/data-types/float.md).
-
-**Valor devuelto**
-
--   una cadena de bytes.
-
-Tipo: `String`.
-
-**Ejemplo**
-
-Consulta:
-
-``` sql
-SELECT char(104.1, 101, 108.9, 108.9, 111) AS hello
-```
-
-Resultado:
-
-``` text
-┌─hello─┐
-│ hello │
-└───────┘
-```
-
-Puede construir una cadena de codificación arbitraria pasando los bytes correspondientes. Aquí hay un ejemplo para UTF-8:
-
-Consulta:
-
-``` sql
-SELECT char(0xD0, 0xBF, 0xD1, 0x80, 0xD0, 0xB8, 0xD0, 0xB2, 0xD0, 0xB5, 0xD1, 0x82) AS hello;
-```
-
-Resultado:
-
-``` text
-┌─hello──┐
-│ привет │
-└────────┘
-```
-
-Consulta:
-
-``` sql
-SELECT char(0xE4, 0xBD, 0xA0, 0xE5, 0xA5, 0xBD) AS hello;
-```
-
-Resultado:
-
-``` text
-┌─hello─┐
-│ 你好  │
-└───────┘
-```
-
-## hexagonal {#hex}
-
-Devuelve una cadena que contiene la representación hexadecimal del argumento.
-
-**Sintaxis**
-
-``` sql
-hex(arg)
-```
-
-La función está usando letras mayúsculas `A-F` y no usar ningún prefijo (como `0x`) o sufijos (como `h`).
-
-Para argumentos enteros, imprime dígitos hexadecimales (“nibbles”) del más significativo al menos significativo (big endian o “human readable” orden). Comienza con el byte distinto de cero más significativo (se omiten los cero bytes principales) pero siempre imprime ambos dígitos de cada byte incluso si el dígito inicial es cero.
-
-Ejemplo:
-
-**Ejemplo**
-
-Consulta:
-
-``` sql
-SELECT hex(1);
-```
-
-Resultado:
-
-``` text
-01
-```
-
-Valores de tipo `Date` y `DateTime` están formateados como enteros correspondientes (el número de días desde Epoch para Date y el valor de Unix Timestamp para DateTime).
-
-Para `String` y `FixedString`, todos los bytes son simplemente codificados como dos números hexadecimales. No se omiten cero bytes.
-
-Los valores de los tipos de coma flotante y Decimal se codifican como su representación en la memoria. Como apoyamos la pequeña arquitectura endian, están codificados en little endian. No se omiten cero bytes iniciales / finales.
-
-**Parámetros**
-
--   `arg` — A value to convert to hexadecimal. Types: [Cadena](../../sql-reference/data-types/string.md), [UInt](../../sql-reference/data-types/int-uint.md), [Flotante](../../sql-reference/data-types/float.md), [Decimal](../../sql-reference/data-types/decimal.md), [Fecha](../../sql-reference/data-types/date.md) o [FechaHora](../../sql-reference/data-types/datetime.md).
-
-**Valor devuelto**
-
--   Una cadena con la representación hexadecimal del argumento.
-
-Tipo: `String`.
-
-**Ejemplo**
-
-Consulta:
-
-``` sql
-SELECT hex(toFloat32(number)) as hex_presentation FROM numbers(15, 2);
-```
-
-Resultado:
-
-``` text
-┌─hex_presentation─┐
-│ 00007041         │
-│ 00008041         │
-└──────────────────┘
-```
-
-Consulta:
-
-``` sql
-SELECT hex(toFloat64(number)) as hex_presentation FROM numbers(15, 2);
-```
-
-Resultado:
-
-``` text
-┌─hex_presentation─┐
-│ 0000000000002E40 │
-│ 0000000000003040 │
-└──────────────────┘
-```
-
-## unhex(str) {#unhexstr}
-
-Acepta una cadena que contiene cualquier número de dígitos hexadecimales y devuelve una cadena que contiene los bytes correspondientes. Admite letras mayúsculas y minúsculas A-F. El número de dígitos hexadecimales no tiene que ser par. Si es impar, el último dígito se interpreta como la mitad menos significativa del byte 00-0F. Si la cadena de argumento contiene algo que no sean dígitos hexadecimales, se devuelve algún resultado definido por la implementación (no se produce una excepción).
-Si desea convertir el resultado en un número, puede usar el ‘reverse’ y ‘reinterpretAsType’ función.
-
-## UUIDStringToNum (str) {#uuidstringtonumstr}
-
-Acepta una cadena que contiene 36 caracteres en el formato `123e4567-e89b-12d3-a456-426655440000`, y lo devuelve como un conjunto de bytes en un FixedString(16).
-
-## UUIDNumToString (str) {#uuidnumtostringstr}
-
-Acepta un valor de FixedString(16). Devuelve una cadena que contiene 36 caracteres en formato de texto.
-
-## ¿Cómo puedo hacerlo?) {#bitmasktolistnum}
-
-Acepta un entero. Devuelve una cadena que contiene la lista de potencias de dos que suman el número de origen cuando se suma. Están separados por comas sin espacios en formato de texto, en orden ascendente.
-
-## ¿Qué puedes encontrar en Neodigit) {#bitmasktoarraynum}
-
-Acepta un entero. Devuelve una matriz de números UInt64 que contiene la lista de potencias de dos que suman el número de origen cuando se suma. Los números en la matriz están en orden ascendente.
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/functions/encoding_functions/) <!--hide-->
diff --git a/docs/es/sql-reference/functions/ext-dict-functions.md b/docs/es/sql-reference/functions/ext-dict-functions.md
deleted file mode 100644
index 329e0b75664..00000000000
--- a/docs/es/sql-reference/functions/ext-dict-functions.md
+++ /dev/null
@@ -1,205 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 58
-toc_title: Trabajar con diccionarios externos
----
-
-# Funciones para trabajar con diccionarios externos {#ext_dict_functions}
-
-Para obtener información sobre cómo conectar y configurar diccionarios externos, consulte [Diccionarios externos](../../sql-reference/dictionaries/external-dictionaries/external-dicts.md).
-
-## dictGet {#dictget}
-
-Recupera un valor de un diccionario externo.
-
-``` sql
-dictGet('dict_name', 'attr_name', id_expr)
-dictGetOrDefault('dict_name', 'attr_name', id_expr, default_value_expr)
-```
-
-**Parámetros**
-
--   `dict_name` — Name of the dictionary. [Literal de cadena](../syntax.md#syntax-string-literal).
--   `attr_name` — Name of the column of the dictionary. [Literal de cadena](../syntax.md#syntax-string-literal).
--   `id_expr` — Key value. [Expresion](../syntax.md#syntax-expressions) devolviendo un [UInt64](../../sql-reference/data-types/int-uint.md) o [Tupla](../../sql-reference/data-types/tuple.md)valor -type dependiendo de la configuración del diccionario.
--   `default_value_expr` — Value returned if the dictionary doesn't contain a row with the `id_expr` clave. [Expresion](../syntax.md#syntax-expressions) devolviendo el valor en el tipo de datos configurado para `attr_name` atributo.
-
-**Valor devuelto**
-
--   Si ClickHouse analiza el atributo correctamente en el [tipo de datos del atributo](../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md#ext_dict_structure-attributes), funciones devuelven el valor del atributo de diccionario que corresponde a `id_expr`.
-
--   Si no hay la clave, correspondiente a `id_expr` en el diccionario, entonces:
-
-        - `dictGet` returns the content of the `<null_value>` element specified for the attribute in the dictionary configuration.
-        - `dictGetOrDefault` returns the value passed as the `default_value_expr` parameter.
-
-ClickHouse produce una excepción si no puede analizar el valor del atributo o si el valor no coincide con el tipo de datos del atributo.
-
-**Ejemplo**
-
-Crear un archivo de texto `ext-dict-text.csv` que contiene los siguientes:
-
-``` text
-1,1
-2,2
-```
-
-La primera columna es `id` la segunda columna es `c1`.
-
-Configurar el diccionario externo:
-
-``` xml
-<yandex>
-    <dictionary>
-        <name>ext-dict-test</name>
-        <source>
-            <file>
-                <path>/path-to/ext-dict-test.csv</path>
-                <format>CSV</format>
-            </file>
-        </source>
-        <layout>
-            <flat />
-        </layout>
-        <structure>
-            <id>
-                <name>id</name>
-            </id>
-            <attribute>
-                <name>c1</name>
-                <type>UInt32</type>
-                <null_value></null_value>
-            </attribute>
-        </structure>
-        <lifetime>0</lifetime>
-    </dictionary>
-</yandex>
-```
-
-Realizar la consulta:
-
-``` sql
-SELECT
-    dictGetOrDefault('ext-dict-test', 'c1', number + 1, toUInt32(number * 10)) AS val,
-    toTypeName(val) AS type
-FROM system.numbers
-LIMIT 3
-```
-
-``` text
-┌─val─┬─type───┐
-│   1 │ UInt32 │
-│   2 │ UInt32 │
-│  20 │ UInt32 │
-└─────┴────────┘
-```
-
-**Ver también**
-
--   [Diccionarios externos](../../sql-reference/dictionaries/external-dictionaries/external-dicts.md)
-
-## dictHas {#dicthas}
-
-Comprueba si hay una clave en un diccionario.
-
-``` sql
-dictHas('dict_name', id_expr)
-```
-
-**Parámetros**
-
--   `dict_name` — Name of the dictionary. [Literal de cadena](../syntax.md#syntax-string-literal).
--   `id_expr` — Key value. [Expresion](../syntax.md#syntax-expressions) devolviendo un [UInt64](../../sql-reference/data-types/int-uint.md)-tipo de valor.
-
-**Valor devuelto**
-
--   0, si no hay clave.
--   1, si hay una llave.
-
-Tipo: `UInt8`.
-
-## dictGetHierarchy {#dictgethierarchy}
-
-Crea una matriz, que contiene todos los padres de una clave [diccionario jerárquico](../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-hierarchical.md).
-
-**Sintaxis**
-
-``` sql
-dictGetHierarchy('dict_name', key)
-```
-
-**Parámetros**
-
--   `dict_name` — Name of the dictionary. [Literal de cadena](../syntax.md#syntax-string-literal).
--   `key` — Key value. [Expresion](../syntax.md#syntax-expressions) devolviendo un [UInt64](../../sql-reference/data-types/int-uint.md)-tipo de valor.
-
-**Valor devuelto**
-
--   Padres por la llave.
-
-Tipo: [Matriz (UInt64)](../../sql-reference/data-types/array.md).
-
-## DictIsIn {#dictisin}
-
-Comprueba el antecesor de una clave a través de toda la cadena jerárquica en el diccionario.
-
-``` sql
-dictIsIn('dict_name', child_id_expr, ancestor_id_expr)
-```
-
-**Parámetros**
-
--   `dict_name` — Name of the dictionary. [Literal de cadena](../syntax.md#syntax-string-literal).
--   `child_id_expr` — Key to be checked. [Expresion](../syntax.md#syntax-expressions) devolviendo un [UInt64](../../sql-reference/data-types/int-uint.md)-tipo de valor.
--   `ancestor_id_expr` — Alleged ancestor of the `child_id_expr` clave. [Expresion](../syntax.md#syntax-expressions) devolviendo un [UInt64](../../sql-reference/data-types/int-uint.md)-tipo de valor.
-
-**Valor devuelto**
-
--   0, si `child_id_expr` no es un niño de `ancestor_id_expr`.
--   1, si `child_id_expr` es un niño de `ancestor_id_expr` o si `child_id_expr` es una `ancestor_id_expr`.
-
-Tipo: `UInt8`.
-
-## Otras funciones {#ext_dict_functions-other}
-
-ClickHouse admite funciones especializadas que convierten los valores de atributo de diccionario a un tipo de datos específico, independientemente de la configuración del diccionario.
-
-Función:
-
--   `dictGetInt8`, `dictGetInt16`, `dictGetInt32`, `dictGetInt64`
--   `dictGetUInt8`, `dictGetUInt16`, `dictGetUInt32`, `dictGetUInt64`
--   `dictGetFloat32`, `dictGetFloat64`
--   `dictGetDate`
--   `dictGetDateTime`
--   `dictGetUUID`
--   `dictGetString`
-
-Todas estas funciones tienen el `OrDefault` modificación. Por ejemplo, `dictGetDateOrDefault`.
-
-Sintaxis:
-
-``` sql
-dictGet[Type]('dict_name', 'attr_name', id_expr)
-dictGet[Type]OrDefault('dict_name', 'attr_name', id_expr, default_value_expr)
-```
-
-**Parámetros**
-
--   `dict_name` — Name of the dictionary. [Literal de cadena](../syntax.md#syntax-string-literal).
--   `attr_name` — Name of the column of the dictionary. [Literal de cadena](../syntax.md#syntax-string-literal).
--   `id_expr` — Key value. [Expresion](../syntax.md#syntax-expressions) devolviendo un [UInt64](../../sql-reference/data-types/int-uint.md)-tipo de valor.
--   `default_value_expr` — Value which is returned if the dictionary doesn't contain a row with the `id_expr` clave. [Expresion](../syntax.md#syntax-expressions) devolviendo un valor en el tipo de datos configurado para `attr_name` atributo.
-
-**Valor devuelto**
-
--   Si ClickHouse analiza el atributo correctamente en el [tipo de datos del atributo](../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md#ext_dict_structure-attributes), funciones devuelven el valor del atributo de diccionario que corresponde a `id_expr`.
-
--   Si no se solicita `id_expr` en el diccionario entonces:
-
-        - `dictGet[Type]` returns the content of the `<null_value>` element specified for the attribute in the dictionary configuration.
-        - `dictGet[Type]OrDefault` returns the value passed as the `default_value_expr` parameter.
-
-ClickHouse produce una excepción si no puede analizar el valor del atributo o si el valor no coincide con el tipo de datos del atributo.
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/functions/ext_dict_functions/) <!--hide-->
diff --git a/docs/es/sql-reference/functions/functions-for-nulls.md b/docs/es/sql-reference/functions/functions-for-nulls.md
deleted file mode 100644
index e5b066d7228..00000000000
--- a/docs/es/sql-reference/functions/functions-for-nulls.md
+++ /dev/null
@@ -1,312 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 63
-toc_title: Trabajar con argumentos Nullable
----
-
-# Funciones para trabajar con agregados anulables {#functions-for-working-with-nullable-aggregates}
-
-## IsNull {#isnull}
-
-Comprueba si el argumento es [NULL](../../sql-reference/syntax.md#null-literal).
-
-``` sql
-isNull(x)
-```
-
-**Parámetros**
-
--   `x` — A value with a non-compound data type.
-
-**Valor devuelto**
-
--   `1` si `x` ser `NULL`.
--   `0` si `x` no es `NULL`.
-
-**Ejemplo**
-
-Tabla de entrada
-
-``` text
-┌─x─┬────y─┐
-│ 1 │ ᴺᵁᴸᴸ │
-│ 2 │    3 │
-└───┴──────┘
-```
-
-Consulta
-
-``` sql
-SELECT x FROM t_null WHERE isNull(y)
-```
-
-``` text
-┌─x─┐
-│ 1 │
-└───┘
-```
-
-## isNotNull {#isnotnull}
-
-Comprueba si el argumento es [NULL](../../sql-reference/syntax.md#null-literal).
-
-``` sql
-isNotNull(x)
-```
-
-**Parámetros:**
-
--   `x` — A value with a non-compound data type.
-
-**Valor devuelto**
-
--   `0` si `x` ser `NULL`.
--   `1` si `x` no es `NULL`.
-
-**Ejemplo**
-
-Tabla de entrada
-
-``` text
-┌─x─┬────y─┐
-│ 1 │ ᴺᵁᴸᴸ │
-│ 2 │    3 │
-└───┴──────┘
-```
-
-Consulta
-
-``` sql
-SELECT x FROM t_null WHERE isNotNull(y)
-```
-
-``` text
-┌─x─┐
-│ 2 │
-└───┘
-```
-
-## Coalesce {#coalesce}
-
-Comprueba de izquierda a derecha si `NULL` se aprobaron argumentos y devuelve el primer no-`NULL` argumento.
-
-``` sql
-coalesce(x,...)
-```
-
-**Parámetros:**
-
--   Cualquier número de parámetros de un tipo no compuesto. Todos los parámetros deben ser compatibles por tipo de datos.
-
-**Valores devueltos**
-
--   El primer no-`NULL` argumento.
--   `NULL` si todos los argumentos son `NULL`.
-
-**Ejemplo**
-
-Considere una lista de contactos que pueden especificar varias formas de contactar a un cliente.
-
-``` text
-┌─name─────┬─mail─┬─phone─────┬──icq─┐
-│ client 1 │ ᴺᵁᴸᴸ │ 123-45-67 │  123 │
-│ client 2 │ ᴺᵁᴸᴸ │ ᴺᵁᴸᴸ      │ ᴺᵁᴸᴸ │
-└──────────┴──────┴───────────┴──────┘
-```
-
-El `mail` y `phone` los campos son de tipo String, pero el `icq` campo `UInt32`, por lo que necesita ser convertido a `String`.
-
-Obtenga el primer método de contacto disponible para el cliente de la lista de contactos:
-
-``` sql
-SELECT coalesce(mail, phone, CAST(icq,'Nullable(String)')) FROM aBook
-```
-
-``` text
-┌─name─────┬─coalesce(mail, phone, CAST(icq, 'Nullable(String)'))─┐
-│ client 1 │ 123-45-67                                            │
-│ client 2 │ ᴺᵁᴸᴸ                                                 │
-└──────────┴──────────────────────────────────────────────────────┘
-```
-
-## ifNull {#ifnull}
-
-Devuelve un valor alternativo si el argumento principal es `NULL`.
-
-``` sql
-ifNull(x,alt)
-```
-
-**Parámetros:**
-
--   `x` — The value to check for `NULL`.
--   `alt` — The value that the function returns if `x` ser `NULL`.
-
-**Valores devueltos**
-
--   Valor `x`, si `x` no es `NULL`.
--   Valor `alt`, si `x` ser `NULL`.
-
-**Ejemplo**
-
-``` sql
-SELECT ifNull('a', 'b')
-```
-
-``` text
-┌─ifNull('a', 'b')─┐
-│ a                │
-└──────────────────┘
-```
-
-``` sql
-SELECT ifNull(NULL, 'b')
-```
-
-``` text
-┌─ifNull(NULL, 'b')─┐
-│ b                 │
-└───────────────────┘
-```
-
-## nullIf {#nullif}
-
-Devoluciones `NULL` si los argumentos son iguales.
-
-``` sql
-nullIf(x, y)
-```
-
-**Parámetros:**
-
-`x`, `y` — Values for comparison. They must be compatible types, or ClickHouse will generate an exception.
-
-**Valores devueltos**
-
--   `NULL` si los argumentos son iguales.
--   El `x` valor, si los argumentos no son iguales.
-
-**Ejemplo**
-
-``` sql
-SELECT nullIf(1, 1)
-```
-
-``` text
-┌─nullIf(1, 1)─┐
-│         ᴺᵁᴸᴸ │
-└──────────────┘
-```
-
-``` sql
-SELECT nullIf(1, 2)
-```
-
-``` text
-┌─nullIf(1, 2)─┐
-│            1 │
-└──────────────┘
-```
-
-## assumeNotNull {#assumenotnull}
-
-Resultados en un valor de tipo [NULL](../../sql-reference/data-types/nullable.md) para un no- `Nullable` si el valor no es `NULL`.
-
-``` sql
-assumeNotNull(x)
-```
-
-**Parámetros:**
-
--   `x` — The original value.
-
-**Valores devueltos**
-
--   El valor original del-`Nullable` tipo, si no es `NULL`.
--   El valor predeterminado para el-`Nullable` tipo si el valor original fue `NULL`.
-
-**Ejemplo**
-
-Considere el `t_null` tabla.
-
-``` sql
-SHOW CREATE TABLE t_null
-```
-
-``` text
-┌─statement─────────────────────────────────────────────────────────────────┐
-│ CREATE TABLE default.t_null ( x Int8,  y Nullable(Int8)) ENGINE = TinyLog │
-└───────────────────────────────────────────────────────────────────────────┘
-```
-
-``` text
-┌─x─┬────y─┐
-│ 1 │ ᴺᵁᴸᴸ │
-│ 2 │    3 │
-└───┴──────┘
-```
-
-Aplicar el `assumeNotNull` función a la `y` columna.
-
-``` sql
-SELECT assumeNotNull(y) FROM t_null
-```
-
-``` text
-┌─assumeNotNull(y)─┐
-│                0 │
-│                3 │
-└──────────────────┘
-```
-
-``` sql
-SELECT toTypeName(assumeNotNull(y)) FROM t_null
-```
-
-``` text
-┌─toTypeName(assumeNotNull(y))─┐
-│ Int8                         │
-│ Int8                         │
-└──────────────────────────────┘
-```
-
-## Acerca de Nosotros {#tonullable}
-
-Convierte el tipo de argumento a `Nullable`.
-
-``` sql
-toNullable(x)
-```
-
-**Parámetros:**
-
--   `x` — The value of any non-compound type.
-
-**Valor devuelto**
-
--   El valor de entrada con un `Nullable` tipo.
-
-**Ejemplo**
-
-``` sql
-SELECT toTypeName(10)
-```
-
-``` text
-┌─toTypeName(10)─┐
-│ UInt8          │
-└────────────────┘
-```
-
-``` sql
-SELECT toTypeName(toNullable(10))
-```
-
-``` text
-┌─toTypeName(toNullable(10))─┐
-│ Nullable(UInt8)            │
-└────────────────────────────┘
-```
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/functions/functions_for_nulls/) <!--hide-->
diff --git a/docs/es/sql-reference/functions/geo.md b/docs/es/sql-reference/functions/geo.md
deleted file mode 100644
index b8e3a3b5ffd..00000000000
--- a/docs/es/sql-reference/functions/geo.md
+++ /dev/null
@@ -1,510 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 62
-toc_title: "Trabajar con coordenadas geogr\xE1ficas"
----
-
-# Funciones para trabajar con coordenadas geográficas {#functions-for-working-with-geographical-coordinates}
-
-## GreatCircleDistance {#greatcircledistance}
-
-Calcule la distancia entre dos puntos en la superficie de la Tierra usando [la fórmula del gran círculo](https://en.wikipedia.org/wiki/Great-circle_distance).
-
-``` sql
-greatCircleDistance(lon1Deg, lat1Deg, lon2Deg, lat2Deg)
-```
-
-**Parámetros de entrada**
-
--   `lon1Deg` — Longitude of the first point in degrees. Range: `[-180°, 180°]`.
--   `lat1Deg` — Latitude of the first point in degrees. Range: `[-90°, 90°]`.
--   `lon2Deg` — Longitude of the second point in degrees. Range: `[-180°, 180°]`.
--   `lat2Deg` — Latitude of the second point in degrees. Range: `[-90°, 90°]`.
-
-Los valores positivos corresponden a latitud norte y longitud este, y los valores negativos corresponden a latitud sur y longitud oeste.
-
-**Valor devuelto**
-
-La distancia entre dos puntos en la superficie de la Tierra, en metros.
-
-Genera una excepción cuando los valores de los parámetros de entrada están fuera del intervalo.
-
-**Ejemplo**
-
-``` sql
-SELECT greatCircleDistance(55.755831, 37.617673, -55.755831, -37.617673)
-```
-
-``` text
-┌─greatCircleDistance(55.755831, 37.617673, -55.755831, -37.617673)─┐
-│                                                14132374.194975413 │
-└───────────────────────────────────────────────────────────────────┘
-```
-
-## pointInEllipses {#pointinellipses}
-
-Comprueba si el punto pertenece al menos a una de las elipses.
-Las coordenadas son geométricas en el sistema de coordenadas cartesianas.
-
-``` sql
-pointInEllipses(x, y, x₀, y₀, a₀, b₀,...,xₙ, yₙ, aₙ, bₙ)
-```
-
-**Parámetros de entrada**
-
--   `x, y` — Coordinates of a point on the plane.
--   `xᵢ, yᵢ` — Coordinates of the center of the `i`-ésimo puntos suspensivos.
--   `aᵢ, bᵢ` — Axes of the `i`-ésimo puntos suspensivos en unidades de coordenadas x, y.
-
-Los parámetros de entrada deben ser `2+4⋅n`, donde `n` es el número de puntos suspensivos.
-
-**Valores devueltos**
-
-`1` si el punto está dentro de al menos una de las elipses; `0`si no lo es.
-
-**Ejemplo**
-
-``` sql
-SELECT pointInEllipses(10., 10., 10., 9.1, 1., 0.9999)
-```
-
-``` text
-┌─pointInEllipses(10., 10., 10., 9.1, 1., 0.9999)─┐
-│                                               1 │
-└─────────────────────────────────────────────────┘
-```
-
-## pointInPolygon {#pointinpolygon}
-
-Comprueba si el punto pertenece al polígono en el plano.
-
-``` sql
-pointInPolygon((x, y), [(a, b), (c, d) ...], ...)
-```
-
-**Valores de entrada**
-
--   `(x, y)` — Coordinates of a point on the plane. Data type — [Tupla](../../sql-reference/data-types/tuple.md) — A tuple of two numbers.
--   `[(a, b), (c, d) ...]` — Polygon vertices. Data type — [Matriz](../../sql-reference/data-types/array.md). Cada vértice está representado por un par de coordenadas `(a, b)`. Los vértices deben especificarse en sentido horario o antihorario. El número mínimo de vértices es 3. El polígono debe ser constante.
--   La función también admite polígonos con agujeros (secciones recortadas). En este caso, agregue polígonos que definan las secciones recortadas utilizando argumentos adicionales de la función. La función no admite polígonos no simplemente conectados.
-
-**Valores devueltos**
-
-`1` si el punto está dentro del polígono, `0` si no lo es.
-Si el punto está en el límite del polígono, la función puede devolver 0 o 1.
-
-**Ejemplo**
-
-``` sql
-SELECT pointInPolygon((3., 3.), [(6, 0), (8, 4), (5, 8), (0, 2)]) AS res
-```
-
-``` text
-┌─res─┐
-│   1 │
-└─────┘
-```
-
-## geohashEncode {#geohashencode}
-
-Codifica la latitud y la longitud como una cadena geohash, consulte (http://geohash.org/, https://en.wikipedia.org/wiki/Geohash).
-
-``` sql
-geohashEncode(longitude, latitude, [precision])
-```
-
-**Valores de entrada**
-
--   longitud - longitud parte de la coordenada que desea codificar. Flotando en el rango`[-180°, 180°]`
--   latitude : parte de latitud de la coordenada que desea codificar. Flotando en el rango `[-90°, 90°]`
--   precision - Opcional, longitud de la cadena codificada resultante, por defecto es `12`. Entero en el rango `[1, 12]`. Cualquier valor menor que `1` o mayor que `12` se convierte silenciosamente a `12`.
-
-**Valores devueltos**
-
--   alfanumérico `String` de coordenadas codificadas (se utiliza la versión modificada del alfabeto de codificación base32).
-
-**Ejemplo**
-
-``` sql
-SELECT geohashEncode(-5.60302734375, 42.593994140625, 0) AS res
-```
-
-``` text
-┌─res──────────┐
-│ ezs42d000000 │
-└──────────────┘
-```
-
-## geohashDecode {#geohashdecode}
-
-Decodifica cualquier cadena codificada por geohash en longitud y latitud.
-
-**Valores de entrada**
-
--   encoded string - cadena codificada geohash.
-
-**Valores devueltos**
-
--   (longitud, latitud) - 2-tupla de `Float64` valores de longitud y latitud.
-
-**Ejemplo**
-
-``` sql
-SELECT geohashDecode('ezs42') AS res
-```
-
-``` text
-┌─res─────────────────────────────┐
-│ (-5.60302734375,42.60498046875) │
-└─────────────────────────────────┘
-```
-
-## geoToH3 {#geotoh3}
-
-Devoluciones [H3](https://uber.github.io/h3/#/documentation/overview/introduction) índice de punto `(lon, lat)` con la resolución especificada.
-
-[H3](https://uber.github.io/h3/#/documentation/overview/introduction) es un sistema de indexación geográfica donde la superficie de la Tierra se divide en incluso azulejos hexagonales. Este sistema es jerárquico, es decir, cada hexágono en el nivel superior se puede dividir en siete incluso pero más pequeños y así sucesivamente.
-
-Este índice se utiliza principalmente para ubicaciones de bucketing y otras manipulaciones geoespaciales.
-
-**Sintaxis**
-
-``` sql
-geoToH3(lon, lat, resolution)
-```
-
-**Parámetros**
-
--   `lon` — Longitude. Type: [Float64](../../sql-reference/data-types/float.md).
--   `lat` — Latitude. Type: [Float64](../../sql-reference/data-types/float.md).
--   `resolution` — Index resolution. Range: `[0, 15]`. Tipo: [UInt8](../../sql-reference/data-types/int-uint.md).
-
-**Valores devueltos**
-
--   Número de índice hexagonal.
--   0 en caso de error.
-
-Tipo: `UInt64`.
-
-**Ejemplo**
-
-Consulta:
-
-``` sql
-SELECT geoToH3(37.79506683, 55.71290588, 15) as h3Index
-```
-
-Resultado:
-
-``` text
-┌────────────h3Index─┐
-│ 644325524701193974 │
-└────────────────────┘
-```
-
-## Información adicional {#geohashesinbox}
-
-Devuelve una matriz de cadenas codificadas por geohash de precisión dada que caen dentro e intersecan los límites de un cuadro dado, básicamente una cuadrícula 2D aplanada en una matriz.
-
-**Valores de entrada**
-
--   longitude_min - longitud mínima, valor flotante en el rango `[-180°, 180°]`
--   latitude_min - latitud mínima, valor flotante en el rango `[-90°, 90°]`
--   longitude_max - longitud máxima, valor flotante en el rango `[-180°, 180°]`
--   latitude_max - latitud máxima, valor flotante en el rango `[-90°, 90°]`
--   precisión - precisión del geohash, `UInt8` en el rango `[1, 12]`
-
-Tenga en cuenta que todos los parámetros de coordenadas deben ser del mismo tipo: `Float32` o `Float64`.
-
-**Valores devueltos**
-
--   matriz de cadenas de precisión largas de geohash-cajas que cubren el área proporcionada, no debe confiar en el orden de los artículos.
--   \[\] - matriz vacía si *minuto* valores de *latitud* y *longitud* no son menos que los correspondientes *máximo* valor.
-
-Tenga en cuenta que la función arrojará una excepción si la matriz resultante tiene más de 10'000'000 de elementos.
-
-**Ejemplo**
-
-``` sql
-SELECT geohashesInBox(24.48, 40.56, 24.785, 40.81, 4) AS thasos
-```
-
-``` text
-┌─thasos──────────────────────────────────────┐
-│ ['sx1q','sx1r','sx32','sx1w','sx1x','sx38'] │
-└─────────────────────────────────────────────┘
-```
-
-## h3GetBaseCell {#h3getbasecell}
-
-Devuelve el número de celda base del índice.
-
-**Sintaxis**
-
-``` sql
-h3GetBaseCell(index)
-```
-
-**Parámetros**
-
--   `index` — Hexagon index number. Type: [UInt64](../../sql-reference/data-types/int-uint.md).
-
-**Valores devueltos**
-
--   Número de celda base hexagonal. Tipo: [UInt8](../../sql-reference/data-types/int-uint.md).
-
-**Ejemplo**
-
-Consulta:
-
-``` sql
-SELECT h3GetBaseCell(612916788725809151) as basecell
-```
-
-Resultado:
-
-``` text
-┌─basecell─┐
-│       12 │
-└──────────┘
-```
-
-## H3HexAreaM2 {#h3hexaream2}
-
-Área hexagonal promedio en metros cuadrados a la resolución dada.
-
-**Sintaxis**
-
-``` sql
-h3HexAreaM2(resolution)
-```
-
-**Parámetros**
-
--   `resolution` — Index resolution. Range: `[0, 15]`. Tipo: [UInt8](../../sql-reference/data-types/int-uint.md).
-
-**Valores devueltos**
-
--   Area in m². Type: [Float64](../../sql-reference/data-types/float.md).
-
-**Ejemplo**
-
-Consulta:
-
-``` sql
-SELECT h3HexAreaM2(13) as area
-```
-
-Resultado:
-
-``` text
-┌─area─┐
-│ 43.9 │
-└──────┘
-```
-
-## h3IndexesAreNeighbors {#h3indexesareneighbors}
-
-Devuelve si los H3Indexes proporcionados son vecinos o no.
-
-**Sintaxis**
-
-``` sql
-h3IndexesAreNeighbors(index1, index2)
-```
-
-**Parámetros**
-
--   `index1` — Hexagon index number. Type: [UInt64](../../sql-reference/data-types/int-uint.md).
--   `index2` — Hexagon index number. Type: [UInt64](../../sql-reference/data-types/int-uint.md).
-
-**Valores devueltos**
-
--   Devoluciones `1` si los índices son vecinos, `0` de lo contrario. Tipo: [UInt8](../../sql-reference/data-types/int-uint.md).
-
-**Ejemplo**
-
-Consulta:
-
-``` sql
-SELECT h3IndexesAreNeighbors(617420388351344639, 617420388352655359) AS n
-```
-
-Resultado:
-
-``` text
-┌─n─┐
-│ 1 │
-└───┘
-```
-
-## H3ToChildren {#h3tochildren}
-
-Devuelve una matriz con los índices secundarios del índice dado.
-
-**Sintaxis**
-
-``` sql
-h3ToChildren(index, resolution)
-```
-
-**Parámetros**
-
--   `index` — Hexagon index number. Type: [UInt64](../../sql-reference/data-types/int-uint.md).
--   `resolution` — Index resolution. Range: `[0, 15]`. Tipo: [UInt8](../../sql-reference/data-types/int-uint.md).
-
-**Valores devueltos**
-
--   Matriz con los índices H3 hijo. Matriz de tipo: [UInt64](../../sql-reference/data-types/int-uint.md).
-
-**Ejemplo**
-
-Consulta:
-
-``` sql
-SELECT h3ToChildren(599405990164561919, 6) AS children
-```
-
-Resultado:
-
-``` text
-┌─children───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
-│ [603909588852408319,603909588986626047,603909589120843775,603909589255061503,603909589389279231,603909589523496959,603909589657714687] │
-└────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
-```
-
-## H3ToParent {#h3toparent}
-
-Devuelve el índice primario (más grueso) que contiene el índice dado.
-
-**Sintaxis**
-
-``` sql
-h3ToParent(index, resolution)
-```
-
-**Parámetros**
-
--   `index` — Hexagon index number. Type: [UInt64](../../sql-reference/data-types/int-uint.md).
--   `resolution` — Index resolution. Range: `[0, 15]`. Tipo: [UInt8](../../sql-reference/data-types/int-uint.md).
-
-**Valores devueltos**
-
--   Índice padre H3. Tipo: [UInt64](../../sql-reference/data-types/int-uint.md).
-
-**Ejemplo**
-
-Consulta:
-
-``` sql
-SELECT h3ToParent(599405990164561919, 3) as parent
-```
-
-Resultado:
-
-``` text
-┌─────────────parent─┐
-│ 590398848891879423 │
-└────────────────────┘
-```
-
-## H3ToString {#h3tostring}
-
-Convierte la representación H3Index del índice en la representación de cadena.
-
-``` sql
-h3ToString(index)
-```
-
-**Parámetros**
-
--   `index` — Hexagon index number. Type: [UInt64](../../sql-reference/data-types/int-uint.md).
-
-**Valores devueltos**
-
--   Representación de cadena del índice H3. Tipo: [Cadena](../../sql-reference/data-types/string.md).
-
-**Ejemplo**
-
-Consulta:
-
-``` sql
-SELECT h3ToString(617420388352917503) as h3_string
-```
-
-Resultado:
-
-``` text
-┌─h3_string───────┐
-│ 89184926cdbffff │
-└─────────────────┘
-```
-
-## stringToH3 {#stringtoh3}
-
-Convierte la representación de cadena en representación H3Index (UInt64).
-
-``` sql
-stringToH3(index_str)
-```
-
-**Parámetros**
-
--   `index_str` — String representation of the H3 index. Type: [Cadena](../../sql-reference/data-types/string.md).
-
-**Valores devueltos**
-
--   Número de índice hexagonal. Devuelve 0 en caso de error. Tipo: [UInt64](../../sql-reference/data-types/int-uint.md).
-
-**Ejemplo**
-
-Consulta:
-
-``` sql
-SELECT stringToH3('89184926cc3ffff') as index
-```
-
-Resultado:
-
-``` text
-┌──────────────index─┐
-│ 617420388351344639 │
-└────────────────────┘
-```
-
-## h3GetResolution {#h3getresolution}
-
-Devuelve la resolución del índice.
-
-**Sintaxis**
-
-``` sql
-h3GetResolution(index)
-```
-
-**Parámetros**
-
--   `index` — Hexagon index number. Type: [UInt64](../../sql-reference/data-types/int-uint.md).
-
-**Valores devueltos**
-
--   Resolución del índice. Gama: `[0, 15]`. Tipo: [UInt8](../../sql-reference/data-types/int-uint.md).
-
-**Ejemplo**
-
-Consulta:
-
-``` sql
-SELECT h3GetResolution(617420388352917503) as res
-```
-
-Resultado:
-
-``` text
-┌─res─┐
-│   9 │
-└─────┘
-```
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/functions/geo/) <!--hide-->
diff --git a/docs/es/sql-reference/functions/hash-functions.md b/docs/es/sql-reference/functions/hash-functions.md
deleted file mode 100644
index 165ca2be3d7..00000000000
--- a/docs/es/sql-reference/functions/hash-functions.md
+++ /dev/null
@@ -1,484 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 50
-toc_title: Hash
----
-
-# Funciones de Hash {#hash-functions}
-
-Las funciones Hash se pueden usar para la barajada pseudoaleatoria determinista de elementos.
-
-## HalfMD5 {#hash-functions-halfmd5}
-
-[Interpretar](../../sql-reference/functions/type-conversion-functions.md#type_conversion_functions-reinterpretAsString) todos los parámetros de entrada como cadenas y calcula el [MD5](https://en.wikipedia.org/wiki/MD5) valor hash para cada uno de ellos. Luego combina hashes, toma los primeros 8 bytes del hash de la cadena resultante y los interpreta como `UInt64` en orden de bytes de big-endian.
-
-``` sql
-halfMD5(par1, ...)
-```
-
-La función es relativamente lenta (5 millones de cadenas cortas por segundo por núcleo del procesador).
-Considere usar el [sipHash64](#hash_functions-siphash64) función en su lugar.
-
-**Parámetros**
-
-La función toma un número variable de parámetros de entrada. Los parámetros pueden ser cualquiera de los [tipos de datos compatibles](../../sql-reference/data-types/index.md).
-
-**Valor devuelto**
-
-A [UInt64](../../sql-reference/data-types/int-uint.md) tipo de datos valor hash.
-
-**Ejemplo**
-
-``` sql
-SELECT halfMD5(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')) AS halfMD5hash, toTypeName(halfMD5hash) AS type
-```
-
-``` text
-┌────────halfMD5hash─┬─type───┐
-│ 186182704141653334 │ UInt64 │
-└────────────────────┴────────┘
-```
-
-## MD5 {#hash_functions-md5}
-
-Calcula el MD5 de una cadena y devuelve el conjunto de bytes resultante como FixedString(16).
-Si no necesita MD5 en particular, pero necesita un hash criptográfico decente de 128 bits, use el ‘sipHash128’ función en su lugar.
-Si desea obtener el mismo resultado que la salida de la utilidad md5sum, use lower(hex(MD5(s)) .
-
-## sipHash64 {#hash_functions-siphash64}
-
-Produce un [SipHash](https://131002.net/siphash/) valor hash.
-
-``` sql
-sipHash64(par1,...)
-```
-
-Esta es una función hash criptográfica. Funciona al menos tres veces más rápido que el [MD5](#hash_functions-md5) función.
-
-Función [interpretar](../../sql-reference/functions/type-conversion-functions.md#type_conversion_functions-reinterpretAsString) todos los parámetros de entrada como cadenas y calcula el valor hash para cada uno de ellos. Luego combina hashes por el siguiente algoritmo:
-
-1.  Después de hash todos los parámetros de entrada, la función obtiene la matriz de hashes.
-2.  La función toma el primero y el segundo elementos y calcula un hash para la matriz de ellos.
-3.  Luego, la función toma el valor hash, calculado en el paso anterior, y el tercer elemento de la matriz hash inicial, y calcula un hash para la matriz de ellos.
-4.  El paso anterior se repite para todos los elementos restantes de la matriz hash inicial.
-
-**Parámetros**
-
-La función toma un número variable de parámetros de entrada. Los parámetros pueden ser cualquiera de los [tipos de datos compatibles](../../sql-reference/data-types/index.md).
-
-**Valor devuelto**
-
-A [UInt64](../../sql-reference/data-types/int-uint.md) tipo de datos valor hash.
-
-**Ejemplo**
-
-``` sql
-SELECT sipHash64(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')) AS SipHash, toTypeName(SipHash) AS type
-```
-
-``` text
-┌──────────────SipHash─┬─type───┐
-│ 13726873534472839665 │ UInt64 │
-└──────────────────────┴────────┘
-```
-
-## sipHash128 {#hash_functions-siphash128}
-
-Calcula SipHash a partir de una cadena.
-Acepta un argumento de tipo String. Devuelve FixedString(16).
-Difiere de sipHash64 en que el estado final de plegado xor solo se realiza hasta 128 bits.
-
-## cityHash64 {#cityhash64}
-
-Produce un [Método de codificación de datos:](https://github.com/google/cityhash) valor hash.
-
-``` sql
-cityHash64(par1,...)
-```
-
-Esta es una función hash rápida no criptográfica. Utiliza el algoritmo CityHash para parámetros de cadena y la función hash no criptográfica rápida específica de la implementación para parámetros con otros tipos de datos. La función utiliza el combinador CityHash para obtener los resultados finales.
-
-**Parámetros**
-
-La función toma un número variable de parámetros de entrada. Los parámetros pueden ser cualquiera de los [tipos de datos compatibles](../../sql-reference/data-types/index.md).
-
-**Valor devuelto**
-
-A [UInt64](../../sql-reference/data-types/int-uint.md) tipo de datos valor hash.
-
-**Ejemplos**
-
-Ejemplo de llamada:
-
-``` sql
-SELECT cityHash64(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')) AS CityHash, toTypeName(CityHash) AS type
-```
-
-``` text
-┌─────────────CityHash─┬─type───┐
-│ 12072650598913549138 │ UInt64 │
-└──────────────────────┴────────┘
-```
-
-En el ejemplo siguiente se muestra cómo calcular la suma de comprobación de toda la tabla con precisión hasta el orden de fila:
-
-``` sql
-SELECT groupBitXor(cityHash64(*)) FROM table
-```
-
-## intHash32 {#inthash32}
-
-Calcula un código hash de 32 bits a partir de cualquier tipo de entero.
-Esta es una función hash no criptográfica relativamente rápida de calidad media para los números.
-
-## intHash64 {#inthash64}
-
-Calcula un código hash de 64 bits a partir de cualquier tipo de entero.
-Funciona más rápido que intHash32. Calidad media.
-
-## SHA1 {#sha1}
-
-## SHA224 {#sha224}
-
-## SHA256 {#sha256}
-
-Calcula SHA-1, SHA-224 o SHA-256 de una cadena y devuelve el conjunto de bytes resultante como FixedString(20), FixedString(28) o FixedString(32).
-La función funciona bastante lentamente (SHA-1 procesa alrededor de 5 millones de cadenas cortas por segundo por núcleo del procesador, mientras que SHA-224 y SHA-256 procesan alrededor de 2.2 millones).
-Recomendamos usar esta función solo en los casos en que necesite una función hash específica y no pueda seleccionarla.
-Incluso en estos casos, recomendamos aplicar la función offline y precalcular valores al insertarlos en la tabla, en lugar de aplicarlo en SELECTS.
-
-## Nombre de la red inalámbrica (SSID):\]) {#urlhashurl-n}
-
-Una función hash no criptográfica rápida y de calidad decente para una cadena obtenida de una URL utilizando algún tipo de normalización.
-`URLHash(s)` – Calculates a hash from a string without one of the trailing symbols `/`,`?` o `#` al final, si está presente.
-`URLHash(s, N)` – Calculates a hash from a string up to the N level in the URL hierarchy, without one of the trailing symbols `/`,`?` o `#` al final, si está presente.
-Los niveles son los mismos que en URLHierarchy. Esta función es específica de Yandex.Métrica.
-
-## Método de codificación de datos: {#farmhash64}
-
-Produce un [Método de codificación de datos:](https://github.com/google/farmhash) valor hash.
-
-``` sql
-farmHash64(par1, ...)
-```
-
-La función utiliza el `Hash64` de todos [métodos disponibles](https://github.com/google/farmhash/blob/master/src/farmhash.h).
-
-**Parámetros**
-
-La función toma un número variable de parámetros de entrada. Los parámetros pueden ser cualquiera de los [tipos de datos compatibles](../../sql-reference/data-types/index.md).
-
-**Valor devuelto**
-
-A [UInt64](../../sql-reference/data-types/int-uint.md) tipo de datos valor hash.
-
-**Ejemplo**
-
-``` sql
-SELECT farmHash64(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')) AS FarmHash, toTypeName(FarmHash) AS type
-```
-
-``` text
-┌─────────────FarmHash─┬─type───┐
-│ 17790458267262532859 │ UInt64 │
-└──────────────────────┴────────┘
-```
-
-## Nombre de la red inalámbrica (SSID): {#hash_functions-javahash}
-
-Calcular [Nivel de Cifrado WEP](http://hg.openjdk.java.net/jdk8u/jdk8u/jdk/file/478a4add975b/src/share/classes/java/lang/String.java#l1452) de una cuerda. Esta función hash no es rápida ni tiene una buena calidad. La única razón para usarlo es cuando este algoritmo ya se usa en otro sistema y debe calcular exactamente el mismo resultado.
-
-**Sintaxis**
-
-``` sql
-SELECT javaHash('');
-```
-
-**Valor devuelto**
-
-A `Int32` tipo de datos valor hash.
-
-**Ejemplo**
-
-Consulta:
-
-``` sql
-SELECT javaHash('Hello, world!');
-```
-
-Resultado:
-
-``` text
-┌─javaHash('Hello, world!')─┐
-│               -1880044555 │
-└───────────────────────────┘
-```
-
-## javaHashUTF16LE {#javahashutf16le}
-
-Calcular [Nivel de Cifrado WEP](http://hg.openjdk.java.net/jdk8u/jdk8u/jdk/file/478a4add975b/src/share/classes/java/lang/String.java#l1452) de una cadena, suponiendo que contiene bytes que representan una cadena en codificación UTF-16LE.
-
-**Sintaxis**
-
-``` sql
-javaHashUTF16LE(stringUtf16le)
-```
-
-**Parámetros**
-
--   `stringUtf16le` — a string in UTF-16LE encoding.
-
-**Valor devuelto**
-
-A `Int32` tipo de datos valor hash.
-
-**Ejemplo**
-
-Consulta correcta con cadena codificada UTF-16LE.
-
-Consulta:
-
-``` sql
-SELECT javaHashUTF16LE(convertCharset('test', 'utf-8', 'utf-16le'))
-```
-
-Resultado:
-
-``` text
-┌─javaHashUTF16LE(convertCharset('test', 'utf-8', 'utf-16le'))─┐
-│                                                      3556498 │
-└──────────────────────────────────────────────────────────────┘
-```
-
-## HiveHash {#hash-functions-hivehash}
-
-Calcular `HiveHash` de una cuerda.
-
-``` sql
-SELECT hiveHash('');
-```
-
-Esto es sólo [Nivel de Cifrado WEP](#hash_functions-javahash) con poco de signo puesto a cero. Esta función se utiliza en [Colmena de Apache](https://en.wikipedia.org/wiki/Apache_Hive) para versiones anteriores a la 3.0. Esta función hash no es rápida ni tiene una buena calidad. La única razón para usarlo es cuando este algoritmo ya se usa en otro sistema y debe calcular exactamente el mismo resultado.
-
-**Valor devuelto**
-
-A `Int32` tipo de datos valor hash.
-
-Tipo: `hiveHash`.
-
-**Ejemplo**
-
-Consulta:
-
-``` sql
-SELECT hiveHash('Hello, world!');
-```
-
-Resultado:
-
-``` text
-┌─hiveHash('Hello, world!')─┐
-│                 267439093 │
-└───────────────────────────┘
-```
-
-## Método de codificación de datos: {#metrohash64}
-
-Produce un [Método de codificación de datos:](http://www.jandrewrogers.com/2015/05/27/metrohash/) valor hash.
-
-``` sql
-metroHash64(par1, ...)
-```
-
-**Parámetros**
-
-La función toma un número variable de parámetros de entrada. Los parámetros pueden ser cualquiera de los [tipos de datos compatibles](../../sql-reference/data-types/index.md).
-
-**Valor devuelto**
-
-A [UInt64](../../sql-reference/data-types/int-uint.md) tipo de datos valor hash.
-
-**Ejemplo**
-
-``` sql
-SELECT metroHash64(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')) AS MetroHash, toTypeName(MetroHash) AS type
-```
-
-``` text
-┌────────────MetroHash─┬─type───┐
-│ 14235658766382344533 │ UInt64 │
-└──────────────────────┴────────┘
-```
-
-## SaltarConsistentHash {#jumpconsistenthash}
-
-Calcula JumpConsistentHash forma un UInt64.
-Acepta dos argumentos: una clave de tipo UInt64 y el número de cubos. Devuelve Int32.
-Para obtener más información, consulte el enlace: [SaltarConsistentHash](https://arxiv.org/pdf/1406.2294.pdf)
-
-## murmurHash2_32, murmurHash2_64 {#murmurhash2-32-murmurhash2-64}
-
-Produce un [Método de codificación de datos:](https://github.com/aappleby/smhasher) valor hash.
-
-``` sql
-murmurHash2_32(par1, ...)
-murmurHash2_64(par1, ...)
-```
-
-**Parámetros**
-
-Ambas funciones toman un número variable de parámetros de entrada. Los parámetros pueden ser cualquiera de los [tipos de datos compatibles](../../sql-reference/data-types/index.md).
-
-**Valor devuelto**
-
--   El `murmurHash2_32` función devuelve el valor hash que tiene el [UInt32](../../sql-reference/data-types/int-uint.md) tipo de datos.
--   El `murmurHash2_64` función devuelve el valor hash que tiene el [UInt64](../../sql-reference/data-types/int-uint.md) tipo de datos.
-
-**Ejemplo**
-
-``` sql
-SELECT murmurHash2_64(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')) AS MurmurHash2, toTypeName(MurmurHash2) AS type
-```
-
-``` text
-┌──────────MurmurHash2─┬─type───┐
-│ 11832096901709403633 │ UInt64 │
-└──────────────────────┴────────┘
-```
-
-## GccMurmurHash {#gccmurmurhash}
-
-Calcula un valor de 64 bits [Método de codificación de datos:](https://github.com/aappleby/smhasher) valor hash usando la misma semilla de hash que [Gcc](https://github.com/gcc-mirror/gcc/blob/41d6b10e96a1de98e90a7c0378437c3255814b16/libstdc%2B%2B-v3/include/bits/functional_hash.h#L191). Es portátil entre las compilaciones CLang y GCC.
-
-**Sintaxis**
-
-``` sql
-gccMurmurHash(par1, ...);
-```
-
-**Parámetros**
-
--   `par1, ...` — A variable number of parameters that can be any of the [tipos de datos compatibles](../../sql-reference/data-types/index.md#data_types).
-
-**Valor devuelto**
-
--   Valor hash calculado.
-
-Tipo: [UInt64](../../sql-reference/data-types/int-uint.md).
-
-**Ejemplo**
-
-Consulta:
-
-``` sql
-SELECT
-    gccMurmurHash(1, 2, 3) AS res1,
-    gccMurmurHash(('a', [1, 2, 3], 4, (4, ['foo', 'bar'], 1, (1, 2)))) AS res2
-```
-
-Resultado:
-
-``` text
-┌─────────────────res1─┬────────────────res2─┐
-│ 12384823029245979431 │ 1188926775431157506 │
-└──────────────────────┴─────────────────────┘
-```
-
-## murmurHash3_32, murmurHash3_64 {#murmurhash3-32-murmurhash3-64}
-
-Produce un [Método de codificación de datos:](https://github.com/aappleby/smhasher) valor hash.
-
-``` sql
-murmurHash3_32(par1, ...)
-murmurHash3_64(par1, ...)
-```
-
-**Parámetros**
-
-Ambas funciones toman un número variable de parámetros de entrada. Los parámetros pueden ser cualquiera de los [tipos de datos compatibles](../../sql-reference/data-types/index.md).
-
-**Valor devuelto**
-
--   El `murmurHash3_32` función devuelve un [UInt32](../../sql-reference/data-types/int-uint.md) tipo de datos valor hash.
--   El `murmurHash3_64` función devuelve un [UInt64](../../sql-reference/data-types/int-uint.md) tipo de datos valor hash.
-
-**Ejemplo**
-
-``` sql
-SELECT murmurHash3_32(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')) AS MurmurHash3, toTypeName(MurmurHash3) AS type
-```
-
-``` text
-┌─MurmurHash3─┬─type───┐
-│     2152717 │ UInt32 │
-└─────────────┴────────┘
-```
-
-## murmurHash3_128 {#murmurhash3-128}
-
-Produce un [Método de codificación de datos:](https://github.com/aappleby/smhasher) valor hash.
-
-``` sql
-murmurHash3_128( expr )
-```
-
-**Parámetros**
-
--   `expr` — [Expresiones](../syntax.md#syntax-expressions) devolviendo un [Cadena](../../sql-reference/data-types/string.md)-tipo de valor.
-
-**Valor devuelto**
-
-A [Cadena fija (16)](../../sql-reference/data-types/fixedstring.md) tipo de datos valor hash.
-
-**Ejemplo**
-
-``` sql
-SELECT murmurHash3_128('example_string') AS MurmurHash3, toTypeName(MurmurHash3) AS type
-```
-
-``` text
-┌─MurmurHash3──────┬─type────────────┐
-│ 6�1�4"S5KT�~~q │ FixedString(16) │
-└──────────────────┴─────────────────┘
-```
-
-## xxHash32, xxHash64 {#hash-functions-xxhash32}
-
-Calcular `xxHash` de una cuerda. Se propone en dos sabores, 32 y 64 bits.
-
-``` sql
-SELECT xxHash32('');
-
-OR
-
-SELECT xxHash64('');
-```
-
-**Valor devuelto**
-
-A `Uint32` o `Uint64` tipo de datos valor hash.
-
-Tipo: `xxHash`.
-
-**Ejemplo**
-
-Consulta:
-
-``` sql
-SELECT xxHash32('Hello, world!');
-```
-
-Resultado:
-
-``` text
-┌─xxHash32('Hello, world!')─┐
-│                 834093149 │
-└───────────────────────────┘
-```
-
-**Ver también**
-
--   [xxHash](http://cyan4973.github.io/xxHash/).
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/functions/hash_functions/) <!--hide-->
diff --git a/docs/es/sql-reference/functions/higher-order-functions.md b/docs/es/sql-reference/functions/higher-order-functions.md
deleted file mode 100644
index a4c97d81361..00000000000
--- a/docs/es/sql-reference/functions/higher-order-functions.md
+++ /dev/null
@@ -1,264 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 57
-toc_title: Orden superior
----
-
-# Funciones de orden superior {#higher-order-functions}
-
-## `->` operador, función lambda (params, expr) {#operator-lambdaparams-expr-function}
-
-Allows describing a lambda function for passing to a higher-order function. The left side of the arrow has a formal parameter, which is any ID, or multiple formal parameters – any IDs in a tuple. The right side of the arrow has an expression that can use these formal parameters, as well as any table columns.
-
-Ejemplos: `x -> 2 * x, str -> str != Referer.`
-
-Las funciones de orden superior solo pueden aceptar funciones lambda como su argumento funcional.
-
-Una función lambda que acepta múltiples argumentos se puede pasar a una función de orden superior. En este caso, a la función de orden superior se le pasan varias matrices de idéntica longitud a las que corresponderán estos argumentos.
-
-Para algunas funciones, tales como [arrayCount](#higher_order_functions-array-count) o [arraySum](#higher_order_functions-array-count), el primer argumento (la función lambda) se puede omitir. En este caso, se supone un mapeo idéntico.
-
-No se puede omitir una función lambda para las siguientes funciones:
-
--   [arrayMap](#higher_order_functions-array-map)
--   [arrayFilter](#higher_order_functions-array-filter)
--   [arrayFill](#higher_order_functions-array-fill)
--   [arrayReverseFill](#higher_order_functions-array-reverse-fill)
--   [arraySplit](#higher_order_functions-array-split)
--   [arrayReverseSplit](#higher_order_functions-array-reverse-split)
--   [arrayFirst](#higher_order_functions-array-first)
--   [arrayFirstIndex](#higher_order_functions-array-first-index)
-
-### arrayMap(func, arr1, …) {#higher_order_functions-array-map}
-
-Devuelve una matriz obtenida de la aplicación original `func` función a cada elemento en el `arr` matriz.
-
-Ejemplos:
-
-``` sql
-SELECT arrayMap(x -> (x + 2), [1, 2, 3]) as res;
-```
-
-``` text
-┌─res─────┐
-│ [3,4,5] │
-└─────────┘
-```
-
-En el ejemplo siguiente se muestra cómo crear una tupla de elementos de diferentes matrices:
-
-``` sql
-SELECT arrayMap((x, y) -> (x, y), [1, 2, 3], [4, 5, 6]) AS res
-```
-
-``` text
-┌─res─────────────────┐
-│ [(1,4),(2,5),(3,6)] │
-└─────────────────────┘
-```
-
-Tenga en cuenta que el primer argumento (función lambda) no se puede omitir en el `arrayMap` función.
-
-### arrayFilter(func, arr1, …) {#higher_order_functions-array-filter}
-
-Devuelve una matriz que contiene sólo los elementos en `arr1` para los cuales `func` devuelve algo distinto de 0.
-
-Ejemplos:
-
-``` sql
-SELECT arrayFilter(x -> x LIKE '%World%', ['Hello', 'abc World']) AS res
-```
-
-``` text
-┌─res───────────┐
-│ ['abc World'] │
-└───────────────┘
-```
-
-``` sql
-SELECT
-    arrayFilter(
-        (i, x) -> x LIKE '%World%',
-        arrayEnumerate(arr),
-        ['Hello', 'abc World'] AS arr)
-    AS res
-```
-
-``` text
-┌─res─┐
-│ [2] │
-└─────┘
-```
-
-Tenga en cuenta que el primer argumento (función lambda) no se puede omitir en el `arrayFilter` función.
-
-### arrayFill(func, arr1, …) {#higher_order_functions-array-fill}
-
-Escanear a través de `arr1` desde el primer elemento hasta el último elemento y reemplazar `arr1[i]` por `arr1[i - 1]` si `func` devuelve 0. El primer elemento de `arr1` no será reemplazado.
-
-Ejemplos:
-
-``` sql
-SELECT arrayFill(x -> not isNull(x), [1, null, 3, 11, 12, null, null, 5, 6, 14, null, null]) AS res
-```
-
-``` text
-┌─res──────────────────────────────┐
-│ [1,1,3,11,12,12,12,5,6,14,14,14] │
-└──────────────────────────────────┘
-```
-
-Tenga en cuenta que el primer argumento (función lambda) no se puede omitir en el `arrayFill` función.
-
-### arrayReverseFill(func, arr1, …) {#higher_order_functions-array-reverse-fill}
-
-Escanear a través de `arr1` del último elemento al primer elemento y reemplace `arr1[i]` por `arr1[i + 1]` si `func` devuelve 0. El último elemento de `arr1` no será reemplazado.
-
-Ejemplos:
-
-``` sql
-SELECT arrayReverseFill(x -> not isNull(x), [1, null, 3, 11, 12, null, null, 5, 6, 14, null, null]) AS res
-```
-
-``` text
-┌─res────────────────────────────────┐
-│ [1,3,3,11,12,5,5,5,6,14,NULL,NULL] │
-└────────────────────────────────────┘
-```
-
-Tenga en cuenta que el primer argumento (función lambda) no se puede omitir en el `arrayReverseFill` función.
-
-### arraySplit(func, arr1, …) {#higher_order_functions-array-split}
-
-Dividir `arr1` en múltiples matrices. Cuando `func` devuelve algo distinto de 0, la matriz se dividirá en el lado izquierdo del elemento. La matriz no se dividirá antes del primer elemento.
-
-Ejemplos:
-
-``` sql
-SELECT arraySplit((x, y) -> y, [1, 2, 3, 4, 5], [1, 0, 0, 1, 0]) AS res
-```
-
-``` text
-┌─res─────────────┐
-│ [[1,2,3],[4,5]] │
-└─────────────────┘
-```
-
-Tenga en cuenta que el primer argumento (función lambda) no se puede omitir en el `arraySplit` función.
-
-### arrayReverseSplit(func, arr1, …) {#higher_order_functions-array-reverse-split}
-
-Dividir `arr1` en múltiples matrices. Cuando `func` devuelve algo distinto de 0, la matriz se dividirá en el lado derecho del elemento. La matriz no se dividirá después del último elemento.
-
-Ejemplos:
-
-``` sql
-SELECT arrayReverseSplit((x, y) -> y, [1, 2, 3, 4, 5], [1, 0, 0, 1, 0]) AS res
-```
-
-``` text
-┌─res───────────────┐
-│ [[1],[2,3,4],[5]] │
-└───────────────────┘
-```
-
-Tenga en cuenta que el primer argumento (función lambda) no se puede omitir en el `arraySplit` función.
-
-### arrayCount(\[func,\] arr1, …) {#higher_order_functions-array-count}
-
-Devuelve el número de elementos de la matriz arr para los cuales func devuelve algo distinto de 0. Si ‘func’ no se especifica, devuelve el número de elementos distintos de cero en la matriz.
-
-### arrayExists(\[func,\] arr1, …) {#arrayexistsfunc-arr1}
-
-Devuelve 1 si hay al menos un elemento en ‘arr’ para los cuales ‘func’ devuelve algo distinto de 0. De lo contrario, devuelve 0.
-
-### arrayAll(\[func,\] arr1, …) {#arrayallfunc-arr1}
-
-Devuelve 1 si ‘func’ devuelve algo distinto de 0 para todos los elementos en ‘arr’. De lo contrario, devuelve 0.
-
-### arraySum(\[func,\] arr1, …) {#higher-order-functions-array-sum}
-
-Devuelve la suma de la ‘func’ valor. Si se omite la función, simplemente devuelve la suma de los elementos de la matriz.
-
-### arrayFirst(func, arr1, …) {#higher_order_functions-array-first}
-
-Devuelve el primer elemento en el ‘arr1’ matriz para la cual ‘func’ devuelve algo distinto de 0.
-
-Tenga en cuenta que el primer argumento (función lambda) no se puede omitir en el `arrayFirst` función.
-
-### arrayFirstIndex(func, arr1, …) {#higher_order_functions-array-first-index}
-
-Devuelve el índice del primer elemento ‘arr1’ matriz para la cual ‘func’ devuelve algo distinto de 0.
-
-Tenga en cuenta que el primer argumento (función lambda) no se puede omitir en el `arrayFirstIndex` función.
-
-### arrayCumSum(\[func,\] arr1, …) {#arraycumsumfunc-arr1}
-
-Devuelve una matriz de sumas parciales de elementos en la matriz de origen (una suma en ejecución). Si el `func` se especifica la función, luego los valores de los elementos de la matriz se convierten mediante esta función antes de sumar.
-
-Ejemplo:
-
-``` sql
-SELECT arrayCumSum([1, 1, 1, 1]) AS res
-```
-
-``` text
-┌─res──────────┐
-│ [1, 2, 3, 4] │
-└──────────────┘
-```
-
-### Información de archivo) {#arraycumsumnonnegativearr}
-
-Lo mismo que `arrayCumSum`, devuelve una matriz de sumas parciales de elementos en la matriz de origen (una suma en ejecución). Diferente `arrayCumSum`, cuando el valor devuelto contiene un valor menor que cero, el valor se reemplaza con cero y el cálculo posterior se realiza con cero parámetros. Por ejemplo:
-
-``` sql
-SELECT arrayCumSumNonNegative([1, 1, -4, 1]) AS res
-```
-
-``` text
-┌─res───────┐
-│ [1,2,0,1] │
-└───────────┘
-```
-
-### arraySort(\[func,\] arr1, …) {#arraysortfunc-arr1}
-
-Devuelve una matriz como resultado de ordenar los elementos de `arr1` en orden ascendente. Si el `func` se especifica la función, el orden de clasificación se determina por el resultado de la función `func` aplicado a los elementos de la matriz (arrays)
-
-El [Transformación de Schwartzian](https://en.wikipedia.org/wiki/Schwartzian_transform) se utiliza para mejorar la eficiencia de clasificación.
-
-Ejemplo:
-
-``` sql
-SELECT arraySort((x, y) -> y, ['hello', 'world'], [2, 1]);
-```
-
-``` text
-┌─res────────────────┐
-│ ['world', 'hello'] │
-└────────────────────┘
-```
-
-Para obtener más información sobre el `arraySort` método, véase el [Funciones para trabajar con matrices](array-functions.md#array_functions-sort) apartado.
-
-### arrayReverseSort(\[func,\] arr1, …) {#arrayreversesortfunc-arr1}
-
-Devuelve una matriz como resultado de ordenar los elementos de `arr1` en orden descendente. Si el `func` se especifica la función, el orden de clasificación se determina por el resultado de la función `func` aplicado a los elementos de la matriz (arrays).
-
-Ejemplo:
-
-``` sql
-SELECT arrayReverseSort((x, y) -> y, ['hello', 'world'], [2, 1]) as res;
-```
-
-``` text
-┌─res───────────────┐
-│ ['hello','world'] │
-└───────────────────┘
-```
-
-Para obtener más información sobre el `arrayReverseSort` método, véase el [Funciones para trabajar con matrices](array-functions.md#array_functions-reverse-sort) apartado.
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/functions/higher_order_functions/) <!--hide-->
diff --git a/docs/es/sql-reference/functions/in-functions.md b/docs/es/sql-reference/functions/in-functions.md
deleted file mode 100644
index 3788582fa60..00000000000
--- a/docs/es/sql-reference/functions/in-functions.md
+++ /dev/null
@@ -1,26 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 60
-toc_title: "Implementaci\xF3n del operador IN"
----
-
-# Funciones para implementar el operador IN {#functions-for-implementing-the-in-operator}
-
-## Información de uso {#in-functions}
-
-Vea la sección [IN operadores](../operators/in.md#select-in-operators).
-
-## tuple(x, y, …), operator (x, y, …) {#tuplex-y-operator-x-y}
-
-Una función que permite agrupar varias columnas.
-For columns with the types T1, T2, …, it returns a Tuple(T1, T2, …) type tuple containing these columns. There is no cost to execute the function.
-Las tuplas se usan normalmente como valores intermedios para un argumento de operadores IN, o para crear una lista de parámetros formales de funciones lambda. Las tuplas no se pueden escribir en una tabla.
-
-## Puede utilizar el siguiente ejemplo: {#tupleelementtuple-n-operator-x-n}
-
-Una función que permite obtener una columna de una tupla.
-‘N’ es el índice de columna, comenzando desde 1. N debe ser una constante. ‘N’ debe ser una constante. ‘N’ debe ser un entero postivo estricto no mayor que el tamaño de la tupla.
-No hay ningún costo para ejecutar la función.
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/functions/in_functions/) <!--hide-->
diff --git a/docs/es/sql-reference/functions/index.md b/docs/es/sql-reference/functions/index.md
deleted file mode 100644
index bbb0cfc7386..00000000000
--- a/docs/es/sql-reference/functions/index.md
+++ /dev/null
@@ -1,74 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: "Funci\xF3n"
-toc_priority: 32
-toc_title: "Implantaci\xF3n"
----
-
-# Función {#functions}
-
-Hay al menos \* dos tipos de funciones: funciones regulares (simplemente se llaman “functions”) and aggregate functions. These are completely different concepts. Regular functions work as if they are applied to each row separately (for each row, the result of the function doesn't depend on the other rows). Aggregate functions accumulate a set of values from various rows (i.e. they depend on the entire set of rows).
-
-En esta sección discutimos las funciones regulares. Para las funciones agregadas, consulte la sección “Aggregate functions”.
-
-\* - Existe un tercer tipo de función que el ‘arrayJoin’ la función pertenece a; las funciones de la tabla también se pueden mencionar por separado.\*
-
-## Fuerte mecanografía {#strong-typing}
-
-A diferencia del SQL estándar, ClickHouse tiene una tipificación fuerte. En otras palabras, no hace conversiones implícitas entre tipos. Cada función funciona para un conjunto específico de tipos. Esto significa que a veces necesita usar funciones de conversión de tipos.
-
-## Eliminación de subexpresiones comunes {#common-subexpression-elimination}
-
-Se considera que todas las expresiones de una consulta que tienen el mismo AST (el mismo registro o el mismo resultado del análisis sintáctico) tienen valores idénticos. Tales expresiones se concatenan y se ejecutan una vez. Las subconsultas idénticas también se eliminan de esta manera.
-
-## Tipos de resultados {#types-of-results}
-
-Todas las funciones devuelven un único retorno como resultado (no varios valores, y no valores cero). El tipo de resultado generalmente se define solo por los tipos de argumentos, no por los valores. Las excepciones son la función tupleElement (el operador a.N) y la función toFixedString.
-
-## Constante {#constants}
-
-Para simplificar, ciertas funciones solo pueden funcionar con constantes para algunos argumentos. Por ejemplo, el argumento correcto del operador LIKE debe ser una constante.
-Casi todas las funciones devuelven una constante para argumentos constantes. La excepción son las funciones que generan números aleatorios.
-El ‘now’ function devuelve valores diferentes para las consultas que se ejecutaron en diferentes momentos, pero el resultado se considera una constante, ya que la constancia solo es importante dentro de una sola consulta.
-Una expresión constante también se considera una constante (por ejemplo, la mitad derecha del operador LIKE se puede construir a partir de múltiples constantes).
-
-Las funciones se pueden implementar de diferentes maneras para argumentos constantes y no constantes (se ejecuta un código diferente). Pero los resultados para una constante y para una columna verdadera que contiene solo el mismo valor deben coincidir entre sí.
-
-## Procesamiento NULL {#null-processing}
-
-Las funciones tienen los siguientes comportamientos:
-
--   Si al menos uno de los argumentos de la función es `NULL` el resultado de la función es también `NULL`.
--   Comportamiento especial que se especifica individualmente en la descripción de cada función. En el código fuente de ClickHouse, estas funciones tienen `UseDefaultImplementationForNulls=false`.
-
-## Constancia {#constancy}
-
-Functions can't change the values of their arguments – any changes are returned as the result. Thus, the result of calculating separate functions does not depend on the order in which the functions are written in the query.
-
-## Manejo de errores {#error-handling}
-
-Algunas funciones pueden producir una excepción si los datos no son válidos. En este caso, la consulta se cancela y se devuelve un texto de error al cliente. Para el procesamiento distribuido, cuando se produce una excepción en uno de los servidores, los otros servidores también intentan anular la consulta.
-
-## Evaluación de las expresiones de argumento {#evaluation-of-argument-expressions}
-
-En casi todos los lenguajes de programación, uno de los argumentos puede no evaluarse para ciertos operadores. Esto suele ser los operadores `&&`, `||`, y `?:`.
-Pero en ClickHouse, los argumentos de las funciones (operadores) siempre se evalúan. Esto se debe a que partes enteras de columnas se evalúan a la vez, en lugar de calcular cada fila por separado.
-
-## Realización de funciones para el procesamiento de consultas distribuidas {#performing-functions-for-distributed-query-processing}
-
-Para el procesamiento de consultas distribuidas, se realizan tantas etapas de procesamiento de consultas como sea posible en servidores remotos, y el resto de las etapas (fusionando resultados intermedios y todo lo posterior) se realizan en el servidor solicitante.
-
-Esto significa que las funciones se pueden realizar en diferentes servidores.
-Por ejemplo, en la consulta `SELECT f(sum(g(x))) FROM distributed_table GROUP BY h(y),`
-
--   si una `distributed_table` tiene al menos dos fragmentos, las funciones ‘g’ y ‘h’ se realizan en servidores remotos, y la función ‘f’ se realiza en el servidor solicitante.
--   si una `distributed_table` tiene sólo un fragmento, todos los ‘f’, ‘g’, y ‘h’ funciones se realizan en el servidor de este fragmento.
-
-El resultado de una función generalmente no depende del servidor en el que se realice. Sin embargo, a veces esto es importante.
-Por ejemplo, las funciones que funcionan con diccionarios utilizan el diccionario que existe en el servidor en el que se están ejecutando.
-Otro ejemplo es el `hostName` función, que devuelve el nombre del servidor en el que se está ejecutando para `GROUP BY` por servidores en un `SELECT` consulta.
-
-Si se realiza una función en una consulta en el servidor solicitante, pero debe realizarla en servidores remotos, puede envolverla en un ‘any’ agregar o agregarlo a una clave en `GROUP BY`.
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/functions/) <!--hide-->
diff --git a/docs/es/sql-reference/functions/introspection.md b/docs/es/sql-reference/functions/introspection.md
deleted file mode 100644
index 1482bbc3190..00000000000
--- a/docs/es/sql-reference/functions/introspection.md
+++ /dev/null
@@ -1,310 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 65
-toc_title: "Introspecci\xF3n"
----
-
-# Funciones de introspección {#introspection-functions}
-
-Puede utilizar las funciones descritas en este capítulo para [ELF](https://en.wikipedia.org/wiki/Executable_and_Linkable_Format) y [DWARF](https://en.wikipedia.org/wiki/DWARF) para la creación de perfiles de consultas.
-
-!!! warning "Advertencia"
-    Estas funciones son lentas y pueden imponer consideraciones de seguridad.
-
-Para el correcto funcionamiento de las funciones de introspección:
-
--   Instale el `clickhouse-common-static-dbg` paquete.
-
--   Establezca el [allow_introspection_functions](../../operations/settings/settings.md#settings-allow_introspection_functions) a 1.
-
-        For security reasons introspection functions are disabled by default.
-
-ClickHouse guarda los informes del generador de perfiles [trace_log](../../operations/system-tables.md#system_tables-trace_log) tabla del sistema. Asegúrese de que la tabla y el generador de perfiles estén configurados correctamente.
-
-## addressToLine {#addresstoline}
-
-Convierte la dirección de memoria virtual dentro del proceso del servidor ClickHouse en el nombre de archivo y el número de línea en el código fuente de ClickHouse.
-
-Si utiliza paquetes oficiales de ClickHouse, debe instalar el `clickhouse-common-static-dbg` paquete.
-
-**Sintaxis**
-
-``` sql
-addressToLine(address_of_binary_instruction)
-```
-
-**Parámetros**
-
--   `address_of_binary_instruction` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Address of instruction in a running process.
-
-**Valor devuelto**
-
--   Nombre de archivo del código fuente y el número de línea en este archivo delimitado por dos puntos.
-
-        For example, `/build/obj-x86_64-linux-gnu/../src/Common/ThreadPool.cpp:199`, where `199` is a line number.
-
--   Nombre de un binario, si la función no pudo encontrar la información de depuración.
-
--   Cadena vacía, si la dirección no es válida.
-
-Tipo: [Cadena](../../sql-reference/data-types/string.md).
-
-**Ejemplo**
-
-Habilitación de las funciones de introspección:
-
-``` sql
-SET allow_introspection_functions=1
-```
-
-Seleccionando la primera cadena de la `trace_log` tabla del sistema:
-
-``` sql
-SELECT * FROM system.trace_log LIMIT 1 \G
-```
-
-``` text
-Row 1:
-──────
-event_date:              2019-11-19
-event_time:              2019-11-19 18:57:23
-revision:                54429
-timer_type:              Real
-thread_number:           48
-query_id:                421b6855-1858-45a5-8f37-f383409d6d72
-trace:                   [140658411141617,94784174532828,94784076370703,94784076372094,94784076361020,94784175007680,140658411116251,140658403895439]
-```
-
-El `trace` campo contiene el seguimiento de la pila en el momento del muestreo.
-
-Obtener el nombre de archivo del código fuente y el número de línea para una sola dirección:
-
-``` sql
-SELECT addressToLine(94784076370703) \G
-```
-
-``` text
-Row 1:
-──────
-addressToLine(94784076370703): /build/obj-x86_64-linux-gnu/../src/Common/ThreadPool.cpp:199
-```
-
-Aplicando la función a todo el seguimiento de la pila:
-
-``` sql
-SELECT
-    arrayStringConcat(arrayMap(x -> addressToLine(x), trace), '\n') AS trace_source_code_lines
-FROM system.trace_log
-LIMIT 1
-\G
-```
-
-El [arrayMap](higher-order-functions.md#higher_order_functions-array-map) permite procesar cada elemento individual de la `trace` matriz por el `addressToLine` función. El resultado de este procesamiento se ve en el `trace_source_code_lines` columna de salida.
-
-``` text
-Row 1:
-──────
-trace_source_code_lines: /lib/x86_64-linux-gnu/libpthread-2.27.so
-/usr/lib/debug/usr/bin/clickhouse
-/build/obj-x86_64-linux-gnu/../src/Common/ThreadPool.cpp:199
-/build/obj-x86_64-linux-gnu/../src/Common/ThreadPool.h:155
-/usr/include/c++/9/bits/atomic_base.h:551
-/usr/lib/debug/usr/bin/clickhouse
-/lib/x86_64-linux-gnu/libpthread-2.27.so
-/build/glibc-OTsEL5/glibc-2.27/misc/../sysdeps/unix/sysv/linux/x86_64/clone.S:97
-```
-
-## addressToSymbol {#addresstosymbol}
-
-Convierte la dirección de memoria virtual dentro del proceso del servidor ClickHouse en el símbolo de los archivos de objetos ClickHouse.
-
-**Sintaxis**
-
-``` sql
-addressToSymbol(address_of_binary_instruction)
-```
-
-**Parámetros**
-
--   `address_of_binary_instruction` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Address of instruction in a running process.
-
-**Valor devuelto**
-
--   Símbolo de archivos de objetos ClickHouse.
--   Cadena vacía, si la dirección no es válida.
-
-Tipo: [Cadena](../../sql-reference/data-types/string.md).
-
-**Ejemplo**
-
-Habilitación de las funciones de introspección:
-
-``` sql
-SET allow_introspection_functions=1
-```
-
-Seleccionando la primera cadena de la `trace_log` tabla del sistema:
-
-``` sql
-SELECT * FROM system.trace_log LIMIT 1 \G
-```
-
-``` text
-Row 1:
-──────
-event_date:    2019-11-20
-event_time:    2019-11-20 16:57:59
-revision:      54429
-timer_type:    Real
-thread_number: 48
-query_id:      724028bf-f550-45aa-910d-2af6212b94ac
-trace:         [94138803686098,94138815010911,94138815096522,94138815101224,94138815102091,94138814222988,94138806823642,94138814457211,94138806823642,94138814457211,94138806823642,94138806795179,94138806796144,94138753770094,94138753771646,94138753760572,94138852407232,140399185266395,140399178045583]
-```
-
-El `trace` campo contiene el seguimiento de la pila en el momento del muestreo.
-
-Obtener un símbolo para una sola dirección:
-
-``` sql
-SELECT addressToSymbol(94138803686098) \G
-```
-
-``` text
-Row 1:
-──────
-addressToSymbol(94138803686098): _ZNK2DB24IAggregateFunctionHelperINS_20AggregateFunctionSumImmNS_24AggregateFunctionSumDataImEEEEE19addBatchSinglePlaceEmPcPPKNS_7IColumnEPNS_5ArenaE
-```
-
-Aplicando la función a todo el seguimiento de la pila:
-
-``` sql
-SELECT
-    arrayStringConcat(arrayMap(x -> addressToSymbol(x), trace), '\n') AS trace_symbols
-FROM system.trace_log
-LIMIT 1
-\G
-```
-
-El [arrayMap](higher-order-functions.md#higher_order_functions-array-map) permite procesar cada elemento individual de la `trace` matriz por el `addressToSymbols` función. El resultado de este procesamiento se ve en el `trace_symbols` columna de salida.
-
-``` text
-Row 1:
-──────
-trace_symbols: _ZNK2DB24IAggregateFunctionHelperINS_20AggregateFunctionSumImmNS_24AggregateFunctionSumDataImEEEEE19addBatchSinglePlaceEmPcPPKNS_7IColumnEPNS_5ArenaE
-_ZNK2DB10Aggregator21executeWithoutKeyImplERPcmPNS0_28AggregateFunctionInstructionEPNS_5ArenaE
-_ZN2DB10Aggregator14executeOnBlockESt6vectorIN3COWINS_7IColumnEE13immutable_ptrIS3_EESaIS6_EEmRNS_22AggregatedDataVariantsERS1_IPKS3_SaISC_EERS1_ISE_SaISE_EERb
-_ZN2DB10Aggregator14executeOnBlockERKNS_5BlockERNS_22AggregatedDataVariantsERSt6vectorIPKNS_7IColumnESaIS9_EERS6_ISB_SaISB_EERb
-_ZN2DB10Aggregator7executeERKSt10shared_ptrINS_17IBlockInputStreamEERNS_22AggregatedDataVariantsE
-_ZN2DB27AggregatingBlockInputStream8readImplEv
-_ZN2DB17IBlockInputStream4readEv
-_ZN2DB26ExpressionBlockInputStream8readImplEv
-_ZN2DB17IBlockInputStream4readEv
-_ZN2DB26ExpressionBlockInputStream8readImplEv
-_ZN2DB17IBlockInputStream4readEv
-_ZN2DB28AsynchronousBlockInputStream9calculateEv
-_ZNSt17_Function_handlerIFvvEZN2DB28AsynchronousBlockInputStream4nextEvEUlvE_E9_M_invokeERKSt9_Any_data
-_ZN14ThreadPoolImplI20ThreadFromGlobalPoolE6workerESt14_List_iteratorIS0_E
-_ZZN20ThreadFromGlobalPoolC4IZN14ThreadPoolImplIS_E12scheduleImplIvEET_St8functionIFvvEEiSt8optionalImEEUlvE1_JEEEOS4_DpOT0_ENKUlvE_clEv
-_ZN14ThreadPoolImplISt6threadE6workerESt14_List_iteratorIS0_E
-execute_native_thread_routine
-start_thread
-clone
-```
-
-## demangle {#demangle}
-
-Convierte un símbolo que puede obtener utilizando el [addressToSymbol](#addresstosymbol) función a la función de C++ nombre.
-
-**Sintaxis**
-
-``` sql
-demangle(symbol)
-```
-
-**Parámetros**
-
--   `symbol` ([Cadena](../../sql-reference/data-types/string.md)) — Symbol from an object file.
-
-**Valor devuelto**
-
--   Nombre de la función C++
--   Cadena vacía si un símbolo no es válido.
-
-Tipo: [Cadena](../../sql-reference/data-types/string.md).
-
-**Ejemplo**
-
-Habilitación de las funciones de introspección:
-
-``` sql
-SET allow_introspection_functions=1
-```
-
-Seleccionando la primera cadena de la `trace_log` tabla del sistema:
-
-``` sql
-SELECT * FROM system.trace_log LIMIT 1 \G
-```
-
-``` text
-Row 1:
-──────
-event_date:    2019-11-20
-event_time:    2019-11-20 16:57:59
-revision:      54429
-timer_type:    Real
-thread_number: 48
-query_id:      724028bf-f550-45aa-910d-2af6212b94ac
-trace:         [94138803686098,94138815010911,94138815096522,94138815101224,94138815102091,94138814222988,94138806823642,94138814457211,94138806823642,94138814457211,94138806823642,94138806795179,94138806796144,94138753770094,94138753771646,94138753760572,94138852407232,140399185266395,140399178045583]
-```
-
-El `trace` campo contiene el seguimiento de la pila en el momento del muestreo.
-
-Obtener un nombre de función para una sola dirección:
-
-``` sql
-SELECT demangle(addressToSymbol(94138803686098)) \G
-```
-
-``` text
-Row 1:
-──────
-demangle(addressToSymbol(94138803686098)): DB::IAggregateFunctionHelper<DB::AggregateFunctionSum<unsigned long, unsigned long, DB::AggregateFunctionSumData<unsigned long> > >::addBatchSinglePlace(unsigned long, char*, DB::IColumn const**, DB::Arena*) const
-```
-
-Aplicando la función a todo el seguimiento de la pila:
-
-``` sql
-SELECT
-    arrayStringConcat(arrayMap(x -> demangle(addressToSymbol(x)), trace), '\n') AS trace_functions
-FROM system.trace_log
-LIMIT 1
-\G
-```
-
-El [arrayMap](higher-order-functions.md#higher_order_functions-array-map) permite procesar cada elemento individual de la `trace` matriz por el `demangle` función. El resultado de este procesamiento se ve en el `trace_functions` columna de salida.
-
-``` text
-Row 1:
-──────
-trace_functions: DB::IAggregateFunctionHelper<DB::AggregateFunctionSum<unsigned long, unsigned long, DB::AggregateFunctionSumData<unsigned long> > >::addBatchSinglePlace(unsigned long, char*, DB::IColumn const**, DB::Arena*) const
-DB::Aggregator::executeWithoutKeyImpl(char*&, unsigned long, DB::Aggregator::AggregateFunctionInstruction*, DB::Arena*) const
-DB::Aggregator::executeOnBlock(std::vector<COW<DB::IColumn>::immutable_ptr<DB::IColumn>, std::allocator<COW<DB::IColumn>::immutable_ptr<DB::IColumn> > >, unsigned long, DB::AggregatedDataVariants&, std::vector<DB::IColumn const*, std::allocator<DB::IColumn const*> >&, std::vector<std::vector<DB::IColumn const*, std::allocator<DB::IColumn const*> >, std::allocator<std::vector<DB::IColumn const*, std::allocator<DB::IColumn const*> > > >&, bool&)
-DB::Aggregator::executeOnBlock(DB::Block const&, DB::AggregatedDataVariants&, std::vector<DB::IColumn const*, std::allocator<DB::IColumn const*> >&, std::vector<std::vector<DB::IColumn const*, std::allocator<DB::IColumn const*> >, std::allocator<std::vector<DB::IColumn const*, std::allocator<DB::IColumn const*> > > >&, bool&)
-DB::Aggregator::execute(std::shared_ptr<DB::IBlockInputStream> const&, DB::AggregatedDataVariants&)
-DB::AggregatingBlockInputStream::readImpl()
-DB::IBlockInputStream::read()
-DB::ExpressionBlockInputStream::readImpl()
-DB::IBlockInputStream::read()
-DB::ExpressionBlockInputStream::readImpl()
-DB::IBlockInputStream::read()
-DB::AsynchronousBlockInputStream::calculate()
-std::_Function_handler<void (), DB::AsynchronousBlockInputStream::next()::{lambda()#1}>::_M_invoke(std::_Any_data const&)
-ThreadPoolImpl<ThreadFromGlobalPool>::worker(std::_List_iterator<ThreadFromGlobalPool>)
-ThreadFromGlobalPool::ThreadFromGlobalPool<ThreadPoolImpl<ThreadFromGlobalPool>::scheduleImpl<void>(std::function<void ()>, int, std::optional<unsigned long>)::{lambda()#3}>(ThreadPoolImpl<ThreadFromGlobalPool>::scheduleImpl<void>(std::function<void ()>, int, std::optional<unsigned long>)::{lambda()#3}&&)::{lambda()#1}::operator()() const
-ThreadPoolImpl<std::thread>::worker(std::_List_iterator<std::thread>)
-execute_native_thread_routine
-start_thread
-clone
-```
diff --git a/docs/es/sql-reference/functions/ip-address-functions.md b/docs/es/sql-reference/functions/ip-address-functions.md
deleted file mode 100644
index 6db0fe0584d..00000000000
--- a/docs/es/sql-reference/functions/ip-address-functions.md
+++ /dev/null
@@ -1,248 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 55
-toc_title: Trabajar con direcciones IP
----
-
-# Funciones para trabajar con direcciones IP {#functions-for-working-with-ip-addresses}
-
-## Número de código: IPv4NumToString (num) {#ipv4numtostringnum}
-
-Toma un número UInt32. Lo interpreta como una dirección IPv4 en big endian. Devuelve una cadena que contiene la dirección IPv4 correspondiente en el formato A.B.C.d (números separados por puntos en forma decimal).
-
-## Nombre de la red inalámbrica (SSID):) {#ipv4stringtonums}
-
-La función inversa de IPv4NumToString. Si la dirección IPv4 tiene un formato no válido, devuelve 0.
-
-## Cómo hacer esto?) {#ipv4numtostringclasscnum}
-
-Similar a IPv4NumToString, pero usando xxx en lugar del último octeto.
-
-Ejemplo:
-
-``` sql
-SELECT
-    IPv4NumToStringClassC(ClientIP) AS k,
-    count() AS c
-FROM test.hits
-GROUP BY k
-ORDER BY c DESC
-LIMIT 10
-```
-
-``` text
-┌─k──────────────┬─────c─┐
-│ 83.149.9.xxx   │ 26238 │
-│ 217.118.81.xxx │ 26074 │
-│ 213.87.129.xxx │ 25481 │
-│ 83.149.8.xxx   │ 24984 │
-│ 217.118.83.xxx │ 22797 │
-│ 78.25.120.xxx  │ 22354 │
-│ 213.87.131.xxx │ 21285 │
-│ 78.25.121.xxx  │ 20887 │
-│ 188.162.65.xxx │ 19694 │
-│ 83.149.48.xxx  │ 17406 │
-└────────────────┴───────┘
-```
-
-Desde el uso ‘xxx’ es altamente inusual, esto puede cambiarse en el futuro. Le recomendamos que no confíe en el formato exacto de este fragmento.
-
-### ¿Cómo puedo hacerlo?) {#ipv6numtostringx}
-
-Acepta un valor FixedString(16) que contiene la dirección IPv6 en formato binario. Devuelve una cadena que contiene esta dirección en formato de texto.
-Las direcciones IPv4 asignadas a IPv6 se emiten en el formato ::ffff:111.222.33.44. Ejemplos:
-
-``` sql
-SELECT IPv6NumToString(toFixedString(unhex('2A0206B8000000000000000000000011'), 16)) AS addr
-```
-
-``` text
-┌─addr─────────┐
-│ 2a02:6b8::11 │
-└──────────────┘
-```
-
-``` sql
-SELECT
-    IPv6NumToString(ClientIP6 AS k),
-    count() AS c
-FROM hits_all
-WHERE EventDate = today() AND substring(ClientIP6, 1, 12) != unhex('00000000000000000000FFFF')
-GROUP BY k
-ORDER BY c DESC
-LIMIT 10
-```
-
-``` text
-┌─IPv6NumToString(ClientIP6)──────────────┬─────c─┐
-│ 2a02:2168:aaa:bbbb::2                   │ 24695 │
-│ 2a02:2698:abcd:abcd:abcd:abcd:8888:5555 │ 22408 │
-│ 2a02:6b8:0:fff::ff                      │ 16389 │
-│ 2a01:4f8:111:6666::2                    │ 16016 │
-│ 2a02:2168:888:222::1                    │ 15896 │
-│ 2a01:7e00::ffff:ffff:ffff:222           │ 14774 │
-│ 2a02:8109:eee:ee:eeee:eeee:eeee:eeee    │ 14443 │
-│ 2a02:810b:8888:888:8888:8888:8888:8888  │ 14345 │
-│ 2a02:6b8:0:444:4444:4444:4444:4444      │ 14279 │
-│ 2a01:7e00::ffff:ffff:ffff:ffff          │ 13880 │
-└─────────────────────────────────────────┴───────┘
-```
-
-``` sql
-SELECT
-    IPv6NumToString(ClientIP6 AS k),
-    count() AS c
-FROM hits_all
-WHERE EventDate = today()
-GROUP BY k
-ORDER BY c DESC
-LIMIT 10
-```
-
-``` text
-┌─IPv6NumToString(ClientIP6)─┬──────c─┐
-│ ::ffff:94.26.111.111       │ 747440 │
-│ ::ffff:37.143.222.4        │ 529483 │
-│ ::ffff:5.166.111.99        │ 317707 │
-│ ::ffff:46.38.11.77         │ 263086 │
-│ ::ffff:79.105.111.111      │ 186611 │
-│ ::ffff:93.92.111.88        │ 176773 │
-│ ::ffff:84.53.111.33        │ 158709 │
-│ ::ffff:217.118.11.22       │ 154004 │
-│ ::ffff:217.118.11.33       │ 148449 │
-│ ::ffff:217.118.11.44       │ 148243 │
-└────────────────────────────┴────────┘
-```
-
-## Nombre de la red inalámbrica (SSID):) {#ipv6stringtonums}
-
-La función inversa de IPv6NumToString. Si la dirección IPv6 tiene un formato no válido, devuelve una cadena de bytes nulos.
-HEX puede ser mayúscula o minúscula.
-
-## IPv4ToIPv6 (x) {#ipv4toipv6x}
-
-Toma un `UInt32` numero. Lo interpreta como una dirección IPv4 en [gran endian](https://en.wikipedia.org/wiki/Endianness). Devuelve un `FixedString(16)` valor que contiene la dirección IPv6 en formato binario. Ejemplos:
-
-``` sql
-SELECT IPv6NumToString(IPv4ToIPv6(IPv4StringToNum('192.168.0.1'))) AS addr
-```
-
-``` text
-┌─addr───────────────┐
-│ ::ffff:192.168.0.1 │
-└────────────────────┘
-```
-
-## Para obtener más información, consulta nuestra Política de privacidad y nuestras Condiciones de uso) {#cutipv6x-bytestocutforipv6-bytestocutforipv4}
-
-Acepta un valor FixedString(16) que contiene la dirección IPv6 en formato binario. Devuelve una cadena que contiene la dirección del número especificado de bytes eliminados en formato de texto. Por ejemplo:
-
-``` sql
-WITH
-    IPv6StringToNum('2001:0DB8:AC10:FE01:FEED:BABE:CAFE:F00D') AS ipv6,
-    IPv4ToIPv6(IPv4StringToNum('192.168.0.1')) AS ipv4
-SELECT
-    cutIPv6(ipv6, 2, 0),
-    cutIPv6(ipv4, 0, 2)
-```
-
-``` text
-┌─cutIPv6(ipv6, 2, 0)─────────────────┬─cutIPv6(ipv4, 0, 2)─┐
-│ 2001:db8:ac10:fe01:feed:babe:cafe:0 │ ::ffff:192.168.0.0  │
-└─────────────────────────────────────┴─────────────────────┘
-```
-
-## IPv4CIDRToRange (ipv4, Cidr), {#ipv4cidrtorangeipv4-cidr}
-
-Acepta un valor IPv4 y UInt8 que contiene el valor [CIDR](https://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing). Devuelve una tupla con dos IPv4 que contienen el rango inferior y el rango superior de la subred.
-
-``` sql
-SELECT IPv4CIDRToRange(toIPv4('192.168.5.2'), 16)
-```
-
-``` text
-┌─IPv4CIDRToRange(toIPv4('192.168.5.2'), 16)─┐
-│ ('192.168.0.0','192.168.255.255')          │
-└────────────────────────────────────────────┘
-```
-
-## IPv6CIDRToRange(ipv6, Cidr), {#ipv6cidrtorangeipv6-cidr}
-
-Acepta un valor IPv6 y UInt8 que contiene el CIDR. Devuelve una tupla con dos IPv6 que contienen el rango inferior y el rango superior de la subred.
-
-``` sql
-SELECT IPv6CIDRToRange(toIPv6('2001:0db8:0000:85a3:0000:0000:ac1f:8001'), 32);
-```
-
-``` text
-┌─IPv6CIDRToRange(toIPv6('2001:0db8:0000:85a3:0000:0000:ac1f:8001'), 32)─┐
-│ ('2001:db8::','2001:db8:ffff:ffff:ffff:ffff:ffff:ffff')                │
-└────────────────────────────────────────────────────────────────────────┘
-```
-
-## Acerca de nosotros) {#toipv4string}
-
-Un alias para `IPv4StringToNum()` que toma una forma de cadena de dirección IPv4 y devuelve el valor de [IPv4](../../sql-reference/data-types/domains/ipv4.md) tipo, que es binario igual al valor devuelto por `IPv4StringToNum()`.
-
-``` sql
-WITH
-    '171.225.130.45' as IPv4_string
-SELECT
-    toTypeName(IPv4StringToNum(IPv4_string)),
-    toTypeName(toIPv4(IPv4_string))
-```
-
-``` text
-┌─toTypeName(IPv4StringToNum(IPv4_string))─┬─toTypeName(toIPv4(IPv4_string))─┐
-│ UInt32                                   │ IPv4                            │
-└──────────────────────────────────────────┴─────────────────────────────────┘
-```
-
-``` sql
-WITH
-    '171.225.130.45' as IPv4_string
-SELECT
-    hex(IPv4StringToNum(IPv4_string)),
-    hex(toIPv4(IPv4_string))
-```
-
-``` text
-┌─hex(IPv4StringToNum(IPv4_string))─┬─hex(toIPv4(IPv4_string))─┐
-│ ABE1822D                          │ ABE1822D                 │
-└───────────────────────────────────┴──────────────────────────┘
-```
-
-## Acerca de nosotros) {#toipv6string}
-
-Un alias para `IPv6StringToNum()` que toma una forma de cadena de dirección IPv6 y devuelve el valor de [IPv6](../../sql-reference/data-types/domains/ipv6.md) tipo, que es binario igual al valor devuelto por `IPv6StringToNum()`.
-
-``` sql
-WITH
-    '2001:438:ffff::407d:1bc1' as IPv6_string
-SELECT
-    toTypeName(IPv6StringToNum(IPv6_string)),
-    toTypeName(toIPv6(IPv6_string))
-```
-
-``` text
-┌─toTypeName(IPv6StringToNum(IPv6_string))─┬─toTypeName(toIPv6(IPv6_string))─┐
-│ FixedString(16)                          │ IPv6                            │
-└──────────────────────────────────────────┴─────────────────────────────────┘
-```
-
-``` sql
-WITH
-    '2001:438:ffff::407d:1bc1' as IPv6_string
-SELECT
-    hex(IPv6StringToNum(IPv6_string)),
-    hex(toIPv6(IPv6_string))
-```
-
-``` text
-┌─hex(IPv6StringToNum(IPv6_string))─┬─hex(toIPv6(IPv6_string))─────────┐
-│ 20010438FFFF000000000000407D1BC1  │ 20010438FFFF000000000000407D1BC1 │
-└───────────────────────────────────┴──────────────────────────────────┘
-```
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/functions/ip_address_functions/) <!--hide-->
diff --git a/docs/es/sql-reference/functions/json-functions.md b/docs/es/sql-reference/functions/json-functions.md
deleted file mode 100644
index 09b66abb2b8..00000000000
--- a/docs/es/sql-reference/functions/json-functions.md
+++ /dev/null
@@ -1,297 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 56
-toc_title: Trabajar con JSON
----
-
-# Funciones para trabajar con JSON {#functions-for-working-with-json}
-
-En el Yandex.Metrica, JSON es transmitido por los usuarios como parámetros de sesión. Hay algunas funciones especiales para trabajar con este JSON. (Aunque en la mayoría de los casos, los JSON también se procesan previamente, y los valores resultantes se colocan en columnas separadas en su formato procesado.) Todas estas funciones se basan en sólidas suposiciones sobre lo que puede ser el JSON, pero tratan de hacer lo menos posible para hacer el trabajo.
-
-Se hacen las siguientes suposiciones:
-
-1.  El nombre de campo (argumento de función) debe ser una constante.
-2.  El nombre del campo de alguna manera está codificado canónicamente en JSON. Por ejemplo: `visitParamHas('{"abc":"def"}', 'abc') = 1`, pero `visitParamHas('{"\\u0061\\u0062\\u0063":"def"}', 'abc') = 0`
-3.  Los campos se buscan en cualquier nivel de anidación, indiscriminadamente. Si hay varios campos coincidentes, se utiliza la primera aparición.
-4.  El JSON no tiene caracteres de espacio fuera de los literales de cadena.
-
-## visitParamHas (params, nombre) {#visitparamhasparams-name}
-
-Comprueba si hay un campo con el ‘name’ nombre.
-
-## visitParamExtractUInt (params, nombre) {#visitparamextractuintparams-name}
-
-Analiza UInt64 a partir del valor del campo denominado ‘name’. Si se trata de un campo de cadena, intenta analizar un número desde el principio de la cadena. Si el campo no existe, o existe pero no contiene un número, devuelve 0.
-
-## visitParamExtractInt (params, nombre) {#visitparamextractintparams-name}
-
-Lo mismo que para Int64.
-
-## visitParamExtractFloat (params, nombre) {#visitparamextractfloatparams-name}
-
-Lo mismo que para Float64.
-
-## visitParamExtractBool (params, nombre) {#visitparamextractboolparams-name}
-
-Analiza un valor verdadero/falso. El resultado es UInt8.
-
-## visitParamExtractRaw (params, nombre) {#visitparamextractrawparams-name}
-
-Devuelve el valor de un campo, incluidos los separadores.
-
-Ejemplos:
-
-``` sql
-visitParamExtractRaw('{"abc":"\\n\\u0000"}', 'abc') = '"\\n\\u0000"'
-visitParamExtractRaw('{"abc":{"def":[1,2,3]}}', 'abc') = '{"def":[1,2,3]}'
-```
-
-## visitParamExtractString(params, nombre) {#visitparamextractstringparams-name}
-
-Analiza la cadena entre comillas dobles. El valor es sin escape. Si no se pudo desescapar, devuelve una cadena vacía.
-
-Ejemplos:
-
-``` sql
-visitParamExtractString('{"abc":"\\n\\u0000"}', 'abc') = '\n\0'
-visitParamExtractString('{"abc":"\\u263a"}', 'abc') = '☺'
-visitParamExtractString('{"abc":"\\u263"}', 'abc') = ''
-visitParamExtractString('{"abc":"hello}', 'abc') = ''
-```
-
-Actualmente no hay soporte para puntos de código en el formato `\uXXXX\uYYYY` que no son del plano multilingüe básico (se convierten a CESU-8 en lugar de UTF-8).
-
-Las siguientes funciones se basan en [simdjson](https://github.com/lemire/simdjson) diseñado para requisitos de análisis JSON más complejos. La suposición 2 mencionada anteriormente todavía se aplica.
-
-## ¿Qué puedes encontrar en Neodigit) {#isvalidjsonjson}
-
-Comprueba que la cadena pasada es un json válido.
-
-Ejemplos:
-
-``` sql
-SELECT isValidJSON('{"a": "hello", "b": [-100, 200.0, 300]}') = 1
-SELECT isValidJSON('not a json') = 0
-```
-
-## JSONHas(json\[, indices_or_keys\]…) {#jsonhasjson-indices-or-keys}
-
-Si el valor existe en el documento JSON, `1` serán devueltos.
-
-Si el valor no existe, `0` serán devueltos.
-
-Ejemplos:
-
-``` sql
-SELECT JSONHas('{"a": "hello", "b": [-100, 200.0, 300]}', 'b') = 1
-SELECT JSONHas('{"a": "hello", "b": [-100, 200.0, 300]}', 'b', 4) = 0
-```
-
-`indices_or_keys` es una lista de cero o más argumentos, cada uno de ellos puede ser de cadena o entero.
-
--   Cadena = miembro del objeto de acceso por clave.
--   Entero positivo = acceder al n-ésimo miembro / clave desde el principio.
--   Entero negativo = acceder al n-ésimo miembro / clave desde el final.
-
-El índice mínimo del elemento es 1. Por lo tanto, el elemento 0 no existe.
-
-Puede usar enteros para acceder a matrices JSON y objetos JSON.
-
-Entonces, por ejemplo:
-
-``` sql
-SELECT JSONExtractKey('{"a": "hello", "b": [-100, 200.0, 300]}', 1) = 'a'
-SELECT JSONExtractKey('{"a": "hello", "b": [-100, 200.0, 300]}', 2) = 'b'
-SELECT JSONExtractKey('{"a": "hello", "b": [-100, 200.0, 300]}', -1) = 'b'
-SELECT JSONExtractKey('{"a": "hello", "b": [-100, 200.0, 300]}', -2) = 'a'
-SELECT JSONExtractString('{"a": "hello", "b": [-100, 200.0, 300]}', 1) = 'hello'
-```
-
-## JSONLength(json\[, indices_or_keys\]…) {#jsonlengthjson-indices-or-keys}
-
-Devuelve la longitud de una matriz JSON o un objeto JSON.
-
-Si el valor no existe o tiene un tipo incorrecto, `0` serán devueltos.
-
-Ejemplos:
-
-``` sql
-SELECT JSONLength('{"a": "hello", "b": [-100, 200.0, 300]}', 'b') = 3
-SELECT JSONLength('{"a": "hello", "b": [-100, 200.0, 300]}') = 2
-```
-
-## JSONType(json\[, indices_or_keys\]…) {#jsontypejson-indices-or-keys}
-
-Devuelve el tipo de un valor JSON.
-
-Si el valor no existe, `Null` serán devueltos.
-
-Ejemplos:
-
-``` sql
-SELECT JSONType('{"a": "hello", "b": [-100, 200.0, 300]}') = 'Object'
-SELECT JSONType('{"a": "hello", "b": [-100, 200.0, 300]}', 'a') = 'String'
-SELECT JSONType('{"a": "hello", "b": [-100, 200.0, 300]}', 'b') = 'Array'
-```
-
-## JSONExtractUInt(json\[, indices_or_keys\]…) {#jsonextractuintjson-indices-or-keys}
-
-## JSONExtractInt(json\[, indices_or_keys\]…) {#jsonextractintjson-indices-or-keys}
-
-## JSONExtractFloat(json\[, indices_or_keys\]…) {#jsonextractfloatjson-indices-or-keys}
-
-## JSONExtractBool(json\[, indices_or_keys\]…) {#jsonextractbooljson-indices-or-keys}
-
-Analiza un JSON y extrae un valor. Estas funciones son similares a `visitParam` función.
-
-Si el valor no existe o tiene un tipo incorrecto, `0` serán devueltos.
-
-Ejemplos:
-
-``` sql
-SELECT JSONExtractInt('{"a": "hello", "b": [-100, 200.0, 300]}', 'b', 1) = -100
-SELECT JSONExtractFloat('{"a": "hello", "b": [-100, 200.0, 300]}', 'b', 2) = 200.0
-SELECT JSONExtractUInt('{"a": "hello", "b": [-100, 200.0, 300]}', 'b', -1) = 300
-```
-
-## JSONExtractString(json\[, indices_or_keys\]…) {#jsonextractstringjson-indices-or-keys}
-
-Analiza un JSON y extrae una cadena. Esta función es similar a `visitParamExtractString` función.
-
-Si el valor no existe o tiene un tipo incorrecto, se devolverá una cadena vacía.
-
-El valor es sin escape. Si no se pudo desescapar, devuelve una cadena vacía.
-
-Ejemplos:
-
-``` sql
-SELECT JSONExtractString('{"a": "hello", "b": [-100, 200.0, 300]}', 'a') = 'hello'
-SELECT JSONExtractString('{"abc":"\\n\\u0000"}', 'abc') = '\n\0'
-SELECT JSONExtractString('{"abc":"\\u263a"}', 'abc') = '☺'
-SELECT JSONExtractString('{"abc":"\\u263"}', 'abc') = ''
-SELECT JSONExtractString('{"abc":"hello}', 'abc') = ''
-```
-
-## JSONExtract(json\[, indices_or_keys…\], Return_type) {#jsonextractjson-indices-or-keys-return-type}
-
-Analiza un JSON y extrae un valor del tipo de datos ClickHouse dado.
-
-Esta es una generalización de la anterior `JSONExtract<type>` función.
-Esto significa
-`JSONExtract(..., 'String')` devuelve exactamente lo mismo que `JSONExtractString()`,
-`JSONExtract(..., 'Float64')` devuelve exactamente lo mismo que `JSONExtractFloat()`.
-
-Ejemplos:
-
-``` sql
-SELECT JSONExtract('{"a": "hello", "b": [-100, 200.0, 300]}', 'Tuple(String, Array(Float64))') = ('hello',[-100,200,300])
-SELECT JSONExtract('{"a": "hello", "b": [-100, 200.0, 300]}', 'Tuple(b Array(Float64), a String)') = ([-100,200,300],'hello')
-SELECT JSONExtract('{"a": "hello", "b": [-100, 200.0, 300]}', 'b', 'Array(Nullable(Int8))') = [-100, NULL, NULL]
-SELECT JSONExtract('{"a": "hello", "b": [-100, 200.0, 300]}', 'b', 4, 'Nullable(Int64)') = NULL
-SELECT JSONExtract('{"passed": true}', 'passed', 'UInt8') = 1
-SELECT JSONExtract('{"day": "Thursday"}', 'day', 'Enum8(\'Sunday\' = 0, \'Monday\' = 1, \'Tuesday\' = 2, \'Wednesday\' = 3, \'Thursday\' = 4, \'Friday\' = 5, \'Saturday\' = 6)') = 'Thursday'
-SELECT JSONExtract('{"day": 5}', 'day', 'Enum8(\'Sunday\' = 0, \'Monday\' = 1, \'Tuesday\' = 2, \'Wednesday\' = 3, \'Thursday\' = 4, \'Friday\' = 5, \'Saturday\' = 6)') = 'Friday'
-```
-
-## JSONExtractKeysAndValues(json\[, indices_or_keys…\], Value_type) {#jsonextractkeysandvaluesjson-indices-or-keys-value-type}
-
-Analiza los pares clave-valor de un JSON donde los valores son del tipo de datos ClickHouse especificado.
-
-Ejemplo:
-
-``` sql
-SELECT JSONExtractKeysAndValues('{"x": {"a": 5, "b": 7, "c": 11}}', 'x', 'Int8') = [('a',5),('b',7),('c',11)]
-```
-
-## JSONExtractRaw(json\[, indices_or_keys\]…) {#jsonextractrawjson-indices-or-keys}
-
-Devuelve una parte de JSON como cadena sin analizar.
-
-Si la pieza no existe o tiene un tipo incorrecto, se devolverá una cadena vacía.
-
-Ejemplo:
-
-``` sql
-SELECT JSONExtractRaw('{"a": "hello", "b": [-100, 200.0, 300]}', 'b') = '[-100, 200.0, 300]'
-```
-
-## JSONExtractArrayRaw(json\[, indices_or_keys…\]) {#jsonextractarrayrawjson-indices-or-keys}
-
-Devuelve una matriz con elementos de matriz JSON, cada uno representado como cadena sin analizar.
-
-Si la parte no existe o no es una matriz, se devolverá una matriz vacía.
-
-Ejemplo:
-
-``` sql
-SELECT JSONExtractArrayRaw('{"a": "hello", "b": [-100, 200.0, "hello"]}', 'b') = ['-100', '200.0', '"hello"']'
-```
-
-## JSONExtractKeysAndValuesRaw {#json-extract-keys-and-values-raw}
-
-Extrae datos sin procesar de un objeto JSON.
-
-**Sintaxis**
-
-``` sql
-JSONExtractKeysAndValuesRaw(json[, p, a, t, h])
-```
-
-**Parámetros**
-
--   `json` — [Cadena](../data-types/string.md) con JSON válido.
--   `p, a, t, h` — Comma-separated indices or keys that specify the path to the inner field in a nested JSON object. Each argument can be either a [cadena](../data-types/string.md) para obtener el campo por la clave o un [entero](../data-types/int-uint.md) para obtener el campo N-ésimo (indexado desde 1, los enteros negativos cuentan desde el final). Si no se establece, todo el JSON se analiza como el objeto de nivel superior. Parámetro opcional.
-
-**Valores devueltos**
-
--   Matriz con `('key', 'value')` tuplas. Ambos miembros de tupla son cadenas.
--   Vacíe la matriz si el objeto solicitado no existe o si la entrada JSON no es válida.
-
-Tipo: [Matriz](../data-types/array.md)([Tupla](../data-types/tuple.md)([Cadena](../data-types/string.md), [Cadena](../data-types/string.md)).
-
-**Ejemplos**
-
-Consulta:
-
-``` sql
-SELECT JSONExtractKeysAndValuesRaw('{"a": [-100, 200.0], "b":{"c": {"d": "hello", "f": "world"}}}')
-```
-
-Resultado:
-
-``` text
-┌─JSONExtractKeysAndValuesRaw('{"a": [-100, 200.0], "b":{"c": {"d": "hello", "f": "world"}}}')─┐
-│ [('a','[-100,200]'),('b','{"c":{"d":"hello","f":"world"}}')]                                 │
-└──────────────────────────────────────────────────────────────────────────────────────────────┘
-```
-
-Consulta:
-
-``` sql
-SELECT JSONExtractKeysAndValuesRaw('{"a": [-100, 200.0], "b":{"c": {"d": "hello", "f": "world"}}}', 'b')
-```
-
-Resultado:
-
-``` text
-┌─JSONExtractKeysAndValuesRaw('{"a": [-100, 200.0], "b":{"c": {"d": "hello", "f": "world"}}}', 'b')─┐
-│ [('c','{"d":"hello","f":"world"}')]                                                               │
-└───────────────────────────────────────────────────────────────────────────────────────────────────┘
-```
-
-Consulta:
-
-``` sql
-SELECT JSONExtractKeysAndValuesRaw('{"a": [-100, 200.0], "b":{"c": {"d": "hello", "f": "world"}}}', -1, 'c')
-```
-
-Resultado:
-
-``` text
-┌─JSONExtractKeysAndValuesRaw('{"a": [-100, 200.0], "b":{"c": {"d": "hello", "f": "world"}}}', -1, 'c')─┐
-│ [('d','"hello"'),('f','"world"')]                                                                     │
-└───────────────────────────────────────────────────────────────────────────────────────────────────────┘
-```
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/functions/json_functions/) <!--hide-->
diff --git a/docs/es/sql-reference/functions/logical-functions.md b/docs/es/sql-reference/functions/logical-functions.md
deleted file mode 100644
index 9588c219128..00000000000
--- a/docs/es/sql-reference/functions/logical-functions.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 37
-toc_title: "L\xF3gico"
----
-
-# Funciones lógicas {#logical-functions}
-
-Las funciones lógicas aceptan cualquier tipo numérico, pero devuelven un número UInt8 igual a 0 o 1.
-
-Cero como argumento se considera “false,” mientras que cualquier valor distinto de cero se considera “true”.
-
-## y, Y operador {#and-and-operator}
-
-## o, operador O {#or-or-operator}
-
-## no, NO operador {#not-not-operator}
-
-## xor {#xor}
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/functions/logical_functions/) <!--hide-->
diff --git a/docs/es/sql-reference/functions/machine-learning-functions.md b/docs/es/sql-reference/functions/machine-learning-functions.md
deleted file mode 100644
index 70f8e3baf1b..00000000000
--- a/docs/es/sql-reference/functions/machine-learning-functions.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 64
-toc_title: "Funciones de aprendizaje autom\xE1tico"
----
-
-# Funciones de aprendizaje automático {#machine-learning-functions}
-
-## evalMLMethod (predicción) {#machine_learning_methods-evalmlmethod}
-
-Predicción utilizando modelos de regresión ajustados utiliza `evalMLMethod` función. Ver enlace en `linearRegression`.
-
-### Regresión lineal estocástica {#stochastic-linear-regression}
-
-El [stochasticLinearRegression](../../sql-reference/aggregate-functions/reference.md#agg_functions-stochasticlinearregression) la función agregada implementa el método de descenso de gradiente estocástico utilizando el modelo lineal y la función de pérdida MSE. Utilizar `evalMLMethod` para predecir sobre nuevos datos.
-
-### Regresión logística estocástica {#stochastic-logistic-regression}
-
-El [stochasticLogisticRegression](../../sql-reference/aggregate-functions/reference.md#agg_functions-stochasticlogisticregression) la función de agregado implementa el método de descenso de gradiente estocástico para el problema de clasificación binaria. Utilizar `evalMLMethod` para predecir sobre nuevos datos.
diff --git a/docs/es/sql-reference/functions/math-functions.md b/docs/es/sql-reference/functions/math-functions.md
deleted file mode 100644
index fe1a3615ef2..00000000000
--- a/docs/es/sql-reference/functions/math-functions.md
+++ /dev/null
@@ -1,116 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 44
-toc_title: "Matem\xE1tica"
----
-
-# Funciones matemáticas {#mathematical-functions}
-
-Todas las funciones devuelven un número Float64. La precisión del resultado es cercana a la precisión máxima posible, pero el resultado puede no coincidir con el número representable de la máquina más cercano al número real correspondiente.
-
-## e() {#e}
-
-Devuelve un número Float64 que está cerca del número e.
-
-## Ciudad() {#pi}
-
-Returns a Float64 number that is close to the number π.
-
-## exp(x) {#expx}
-
-Acepta un argumento numérico y devuelve un número Float64 cercano al exponente del argumento.
-
-## Información) {#logx-lnx}
-
-Acepta un argumento numérico y devuelve un número Float64 cercano al logaritmo natural del argumento.
-
-## exp2(x) {#exp2x}
-
-Acepta un argumento numérico y devuelve un número Float64 cercano a 2 a la potencia de x.
-
-## log2 (x) {#log2x}
-
-Acepta un argumento numérico y devuelve un número Float64 cercano al logaritmo binario del argumento.
-
-## exp10 (x) {#exp10x}
-
-Acepta un argumento numérico y devuelve un número Float64 cercano a 10 a la potencia de x.
-
-## log10 (x) {#log10x}
-
-Acepta un argumento numérico y devuelve un número Float64 cercano al logaritmo decimal del argumento.
-
-## sqrt(x) {#sqrtx}
-
-Acepta un argumento numérico y devuelve un número Float64 cercano a la raíz cuadrada del argumento.
-
-## Cbrt (x) {#cbrtx}
-
-Acepta un argumento numérico y devuelve un número Float64 cercano a la raíz cúbica del argumento.
-
-## erf(x) {#erfx}
-
-Si ‘x’ no es negativo, entonces `erf(x / σ√2)` es la probabilidad de que una variable aleatoria tenga una distribución normal con desviación estándar ‘σ’ toma el valor que está separado del valor esperado en más de ‘x’.
-
-Ejemplo (regla de tres sigma):
-
-``` sql
-SELECT erf(3 / sqrt(2))
-```
-
-``` text
-┌─erf(divide(3, sqrt(2)))─┐
-│      0.9973002039367398 │
-└─────────────────────────┘
-```
-
-## erfc(x) {#erfcx}
-
-Acepta un argumento numérico y devuelve un número Float64 cercano a 1 - erf(x), pero sin pérdida de precisión para grandes ‘x’ valor.
-
-## Lgamma (x) {#lgammax}
-
-El logaritmo de la función gamma.
-
-## ¿Qué puedes encontrar en Neodigit) {#tgammax}
-
-Función gamma.
-
-## sin(x) {#sinx}
-
-Sinusoidal.
-
-## cos(x) {#cosx}
-
-El coseno.
-
-## pantalla) {#tanx}
-
-Tangente.
-
-## (x) {#asinx}
-
-El arco sinusoidal.
-
-## Acerca de) {#acosx}
-
-El arco coseno.
-
-## atan (x) {#atanx}
-
-La tangente del arco.
-
-## pow(x, y), potencia(x, y) {#powx-y-powerx-y}
-
-Toma dos argumentos numéricos x e y. Devuelve un número Float64 cercano a x a la potencia de y.
-
-## IntExp2 {#intexp2}
-
-Acepta un argumento numérico y devuelve un número UInt64 cercano a 2 a la potencia de x.
-
-## IntExp10 {#intexp10}
-
-Acepta un argumento numérico y devuelve un número UInt64 cercano a 10 a la potencia de x.
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/functions/math_functions/) <!--hide-->
diff --git a/docs/es/sql-reference/functions/other-functions.md b/docs/es/sql-reference/functions/other-functions.md
deleted file mode 100644
index 3704355167a..00000000000
--- a/docs/es/sql-reference/functions/other-functions.md
+++ /dev/null
@@ -1,1205 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 66
-toc_title: Otro
----
-
-# Otras funciones {#other-functions}
-
-## nombre de host() {#hostname}
-
-Devuelve una cadena con el nombre del host en el que se realizó esta función. Para el procesamiento distribuido, este es el nombre del host del servidor remoto, si la función se realiza en un servidor remoto.
-
-## getMacro {#getmacro}
-
-Obtiene un valor con nombre del [macro](../../operations/server-configuration-parameters/settings.md#macros) sección de la configuración del servidor.
-
-**Sintaxis**
-
-``` sql
-getMacro(name);
-```
-
-**Parámetros**
-
--   `name` — Name to retrieve from the `macros` apartado. [Cadena](../../sql-reference/data-types/string.md#string).
-
-**Valor devuelto**
-
--   Valor de la macro especificada.
-
-Tipo: [Cadena](../../sql-reference/data-types/string.md).
-
-**Ejemplo**
-
-Ejemplo `macros` sección en el archivo de configuración del servidor:
-
-``` xml
-<macros>
-    <test>Value</test>
-</macros>
-```
-
-Consulta:
-
-``` sql
-SELECT getMacro('test');
-```
-
-Resultado:
-
-``` text
-┌─getMacro('test')─┐
-│ Value            │
-└──────────────────┘
-```
-
-Una forma alternativa de obtener el mismo valor:
-
-``` sql
-SELECT * FROM system.macros
-WHERE macro = 'test';
-```
-
-``` text
-┌─macro─┬─substitution─┐
-│ test  │ Value        │
-└───────┴──────────────┘
-```
-
-## FQDN {#fqdn}
-
-Devuelve el nombre de dominio completo.
-
-**Sintaxis**
-
-``` sql
-fqdn();
-```
-
-Esta función no distingue entre mayúsculas y minúsculas.
-
-**Valor devuelto**
-
--   Cadena con el nombre de dominio completo.
-
-Tipo: `String`.
-
-**Ejemplo**
-
-Consulta:
-
-``` sql
-SELECT FQDN();
-```
-
-Resultado:
-
-``` text
-┌─FQDN()──────────────────────────┐
-│ clickhouse.ru-central1.internal │
-└─────────────────────────────────┘
-```
-
-## Nombre básico {#basename}
-
-Extrae la parte final de una cadena después de la última barra o barra invertida. Esta función se utiliza a menudo para extraer el nombre de archivo de una ruta.
-
-``` sql
-basename( expr )
-```
-
-**Parámetros**
-
--   `expr` — Expression resulting in a [Cadena](../../sql-reference/data-types/string.md) valor de tipo. Todas las barras diagonales inversas deben escaparse en el valor resultante.
-
-**Valor devuelto**
-
-Una cadena que contiene:
-
--   La parte final de una cadena después de la última barra o barra invertida.
-
-        If the input string contains a path ending with slash or backslash, for example, `/` or `c:\`, the function returns an empty string.
-
--   La cadena original si no hay barras diagonales o barras diagonales inversas.
-
-**Ejemplo**
-
-``` sql
-SELECT 'some/long/path/to/file' AS a, basename(a)
-```
-
-``` text
-┌─a──────────────────────┬─basename('some\\long\\path\\to\\file')─┐
-│ some\long\path\to\file │ file                                   │
-└────────────────────────┴────────────────────────────────────────┘
-```
-
-``` sql
-SELECT 'some\\long\\path\\to\\file' AS a, basename(a)
-```
-
-``` text
-┌─a──────────────────────┬─basename('some\\long\\path\\to\\file')─┐
-│ some\long\path\to\file │ file                                   │
-└────────────────────────┴────────────────────────────────────────┘
-```
-
-``` sql
-SELECT 'some-file-name' AS a, basename(a)
-```
-
-``` text
-┌─a──────────────┬─basename('some-file-name')─┐
-│ some-file-name │ some-file-name             │
-└────────────────┴────────────────────────────┘
-```
-
-## Ancho visible (x) {#visiblewidthx}
-
-Calcula el ancho aproximado al enviar valores a la consola en formato de texto (separado por tabuladores).
-Esta función es utilizada por el sistema para implementar formatos Pretty.
-
-`NULL` se representa como una cadena correspondiente a `NULL` en `Pretty` formato.
-
-``` sql
-SELECT visibleWidth(NULL)
-```
-
-``` text
-┌─visibleWidth(NULL)─┐
-│                  4 │
-└────────────────────┘
-```
-
-## ¿Cómo puedo hacerlo?) {#totypenamex}
-
-Devuelve una cadena que contiene el nombre de tipo del argumento pasado.
-
-Si `NULL` se pasa a la función como entrada, luego devuelve el `Nullable(Nothing)` tipo, que corresponde a un tipo interno `NULL` representación en ClickHouse.
-
-## BlockSize() {#function-blocksize}
-
-Obtiene el tamaño del bloque.
-En ClickHouse, las consultas siempre se ejecutan en bloques (conjuntos de partes de columna). Esta función permite obtener el tamaño del bloque al que lo llamó.
-
-## materializar (x) {#materializex}
-
-Convierte una constante en una columna completa que contiene solo un valor.
-En ClickHouse, las columnas completas y las constantes se representan de manera diferente en la memoria. Las funciones funcionan de manera diferente para argumentos constantes y argumentos normales (se ejecuta un código diferente), aunque el resultado es casi siempre el mismo. Esta función es para depurar este comportamiento.
-
-## ignore(…) {#ignore}
-
-Acepta cualquier argumento, incluyendo `NULL`. Siempre devuelve 0.
-Sin embargo, el argumento aún se evalúa. Esto se puede usar para puntos de referencia.
-
-## sueño (segundos) {#sleepseconds}
-
-Dormir ‘seconds’ segundos en cada bloque de datos. Puede especificar un número entero o un número de punto flotante.
-
-## sleepEachRow(segundos) {#sleepeachrowseconds}
-
-Dormir ‘seconds’ segundos en cada fila. Puede especificar un número entero o un número de punto flotante.
-
-## currentDatabase() {#currentdatabase}
-
-Devuelve el nombre de la base de datos actual.
-Puede utilizar esta función en los parámetros del motor de tablas en una consulta CREATE TABLE donde debe especificar la base de datos.
-
-## currentUser() {#other-function-currentuser}
-
-Devuelve el inicio de sesión del usuario actual. El inicio de sesión del usuario, que inició la consulta, se devolverá en caso de consulta distibuted.
-
-``` sql
-SELECT currentUser();
-```
-
-Apodo: `user()`, `USER()`.
-
-**Valores devueltos**
-
--   Inicio de sesión del usuario actual.
--   Inicio de sesión del usuario que inició la consulta en caso de consulta distribuida.
-
-Tipo: `String`.
-
-**Ejemplo**
-
-Consulta:
-
-``` sql
-SELECT currentUser();
-```
-
-Resultado:
-
-``` text
-┌─currentUser()─┐
-│ default       │
-└───────────────┘
-```
-
-## isConstant {#is-constant}
-
-Comprueba si el argumento es una expresión constante.
-
-A constant expression means an expression whose resulting value is known at the query analysis (i.e. before execution). For example, expressions over [literal](../syntax.md#literals) son expresiones constantes.
-
-La función está destinada al desarrollo, depuración y demostración.
-
-**Sintaxis**
-
-``` sql
-isConstant(x)
-```
-
-**Parámetros**
-
--   `x` — Expression to check.
-
-**Valores devueltos**
-
--   `1` — `x` es constante.
--   `0` — `x` no es constante.
-
-Tipo: [UInt8](../data-types/int-uint.md).
-
-**Ejemplos**
-
-Consulta:
-
-``` sql
-SELECT isConstant(x + 1) FROM (SELECT 43 AS x)
-```
-
-Resultado:
-
-``` text
-┌─isConstant(plus(x, 1))─┐
-│                      1 │
-└────────────────────────┘
-```
-
-Consulta:
-
-``` sql
-WITH 3.14 AS pi SELECT isConstant(cos(pi))
-```
-
-Resultado:
-
-``` text
-┌─isConstant(cos(pi))─┐
-│                   1 │
-└─────────────────────┘
-```
-
-Consulta:
-
-``` sql
-SELECT isConstant(number) FROM numbers(1)
-```
-
-Resultado:
-
-``` text
-┌─isConstant(number)─┐
-│                  0 │
-└────────────────────┘
-```
-
-## isFinite(x) {#isfinitex}
-
-Acepta Float32 y Float64 y devuelve UInt8 igual a 1 si el argumento no es infinito y no es un NaN, de lo contrario 0.
-
-## IsInfinite(x) {#isinfinitex}
-
-Acepta Float32 y Float64 y devuelve UInt8 igual a 1 si el argumento es infinito, de lo contrario 0. Tenga en cuenta que se devuelve 0 para un NaN.
-
-## ifNotFinite {#ifnotfinite}
-
-Comprueba si el valor de punto flotante es finito.
-
-**Sintaxis**
-
-    ifNotFinite(x,y)
-
-**Parámetros**
-
--   `x` — Value to be checked for infinity. Type: [Flotante\*](../../sql-reference/data-types/float.md).
--   `y` — Fallback value. Type: [Flotante\*](../../sql-reference/data-types/float.md).
-
-**Valor devuelto**
-
--   `x` si `x` es finito.
--   `y` si `x` no es finito.
-
-**Ejemplo**
-
-Consulta:
-
-    SELECT 1/0 as infimum, ifNotFinite(infimum,42)
-
-Resultado:
-
-    ┌─infimum─┬─ifNotFinite(divide(1, 0), 42)─┐
-    │     inf │                            42 │
-    └─────────┴───────────────────────────────┘
-
-Puede obtener un resultado similar usando [operador ternario](conditional-functions.md#ternary-operator): `isFinite(x) ? x : y`.
-
-## isNaN(x) {#isnanx}
-
-Acepta Float32 y Float64 y devuelve UInt8 igual a 1 si el argumento es un NaN, de lo contrario 0.
-
-## hasColumnInTable(\[‘hostname’\[, ‘username’\[, ‘password’\]\],\] ‘database’, ‘table’, ‘column’) {#hascolumnintablehostname-username-password-database-table-column}
-
-Acepta cadenas constantes: nombre de base de datos, nombre de tabla y nombre de columna. Devuelve una expresión constante UInt8 igual a 1 si hay una columna; de lo contrario, 0. Si se establece el parámetro hostname, la prueba se ejecutará en un servidor remoto.
-La función produce una excepción si la tabla no existe.
-Para los elementos de una estructura de datos anidada, la función comprueba la existencia de una columna. Para la propia estructura de datos anidados, la función devuelve 0.
-
-## Bar {#function-bar}
-
-Permite construir un diagrama unicode-art.
-
-`bar(x, min, max, width)` dibuja una banda con un ancho proporcional a `(x - min)` e igual a `width` caracteres cuando `x = max`.
-
-Parámetros:
-
--   `x` — Size to display.
--   `min, max` — Integer constants. The value must fit in `Int64`.
--   `width` — Constant, positive integer, can be fractional.
-
-La banda se dibuja con precisión a un octavo de un símbolo.
-
-Ejemplo:
-
-``` sql
-SELECT
-    toHour(EventTime) AS h,
-    count() AS c,
-    bar(c, 0, 600000, 20) AS bar
-FROM test.hits
-GROUP BY h
-ORDER BY h ASC
-```
-
-``` text
-┌──h─┬──────c─┬─bar────────────────┐
-│  0 │ 292907 │ █████████▋         │
-│  1 │ 180563 │ ██████             │
-│  2 │ 114861 │ ███▋               │
-│  3 │  85069 │ ██▋                │
-│  4 │  68543 │ ██▎                │
-│  5 │  78116 │ ██▌                │
-│  6 │ 113474 │ ███▋               │
-│  7 │ 170678 │ █████▋             │
-│  8 │ 278380 │ █████████▎         │
-│  9 │ 391053 │ █████████████      │
-│ 10 │ 457681 │ ███████████████▎   │
-│ 11 │ 493667 │ ████████████████▍  │
-│ 12 │ 509641 │ ████████████████▊  │
-│ 13 │ 522947 │ █████████████████▍ │
-│ 14 │ 539954 │ █████████████████▊ │
-│ 15 │ 528460 │ █████████████████▌ │
-│ 16 │ 539201 │ █████████████████▊ │
-│ 17 │ 523539 │ █████████████████▍ │
-│ 18 │ 506467 │ ████████████████▊  │
-│ 19 │ 520915 │ █████████████████▎ │
-│ 20 │ 521665 │ █████████████████▍ │
-│ 21 │ 542078 │ ██████████████████ │
-│ 22 │ 493642 │ ████████████████▍  │
-│ 23 │ 400397 │ █████████████▎     │
-└────┴────────┴────────────────────┘
-```
-
-## transformar {#transform}
-
-Transforma un valor de acuerdo con la asignación explícitamente definida de algunos elementos a otros.
-Hay dos variaciones de esta función:
-
-### ¿Cómo puedo hacerlo?) {#transformx-array-from-array-to-default}
-
-`x` – What to transform.
-
-`array_from` – Constant array of values for converting.
-
-`array_to` – Constant array of values to convert the values in ‘from’ a.
-
-`default` – Which value to use if ‘x’ no es igual a ninguno de los valores en ‘from’.
-
-`array_from` y `array_to` – Arrays of the same size.
-
-Tipo:
-
-`transform(T, Array(T), Array(U), U) -> U`
-
-`T` y `U` pueden ser tipos numéricos, de cadena o de fecha o de fecha y hora.
-Cuando se indica la misma letra (T o U), para los tipos numéricos pueden no ser tipos coincidentes, sino tipos que tienen un tipo común.
-Por ejemplo, el primer argumento puede tener el tipo Int64, mientras que el segundo tiene el tipo Array(UInt16).
-
-Si el ‘x’ valor es igual a uno de los elementos en el ‘array_from’ matriz, devuelve el elemento existente (que está numerado igual) de la ‘array_to’ matriz. De lo contrario, devuelve ‘default’. Si hay varios elementos coincidentes en ‘array_from’, devuelve una de las coincidencias.
-
-Ejemplo:
-
-``` sql
-SELECT
-    transform(SearchEngineID, [2, 3], ['Yandex', 'Google'], 'Other') AS title,
-    count() AS c
-FROM test.hits
-WHERE SearchEngineID != 0
-GROUP BY title
-ORDER BY c DESC
-```
-
-``` text
-┌─title─────┬──────c─┐
-│ Yandex    │ 498635 │
-│ Google    │ 229872 │
-│ Other     │ 104472 │
-└───────────┴────────┘
-```
-
-### ¿Cómo puedo hacerlo?) {#transformx-array-from-array-to}
-
-Difiere de la primera variación en que el ‘default’ se omite el argumento.
-Si el ‘x’ valor es igual a uno de los elementos en el ‘array_from’ matriz, devuelve el elemento coincidente (que está numerado igual) de la ‘array_to’ matriz. De lo contrario, devuelve ‘x’.
-
-Tipo:
-
-`transform(T, Array(T), Array(T)) -> T`
-
-Ejemplo:
-
-``` sql
-SELECT
-    transform(domain(Referer), ['yandex.ru', 'google.ru', 'vk.com'], ['www.yandex', 'example.com']) AS s,
-    count() AS c
-FROM test.hits
-GROUP BY domain(Referer)
-ORDER BY count() DESC
-LIMIT 10
-```
-
-``` text
-┌─s──────────────┬───────c─┐
-│                │ 2906259 │
-│ www.yandex     │  867767 │
-│ ███████.ru     │  313599 │
-│ mail.yandex.ru │  107147 │
-│ ██████.ru      │  100355 │
-│ █████████.ru   │   65040 │
-│ news.yandex.ru │   64515 │
-│ ██████.net     │   59141 │
-│ example.com    │   57316 │
-└────────────────┴─────────┘
-```
-
-## Tamaño de formatoReadable (x) {#formatreadablesizex}
-
-Acepta el tamaño (número de bytes). Devuelve un tamaño redondeado con un sufijo (KiB, MiB, etc.) como una cadena.
-
-Ejemplo:
-
-``` sql
-SELECT
-    arrayJoin([1, 1024, 1024*1024, 192851925]) AS filesize_bytes,
-    formatReadableSize(filesize_bytes) AS filesize
-```
-
-``` text
-┌─filesize_bytes─┬─filesize───┐
-│              1 │ 1.00 B     │
-│           1024 │ 1.00 KiB   │
-│        1048576 │ 1.00 MiB   │
-│      192851925 │ 183.92 MiB │
-└────────────────┴────────────┘
-```
-
-## menos (a, b) {#leasta-b}
-
-Devuelve el valor más pequeño de a y b.
-
-## mayor(a, b) {#greatesta-b}
-
-Devuelve el valor más grande de a y b.
-
-## operatividad() {#uptime}
-
-Devuelve el tiempo de actividad del servidor en segundos.
-
-## versión() {#version}
-
-Devuelve la versión del servidor como una cadena.
-
-## Zona horaria() {#timezone}
-
-Devuelve la zona horaria del servidor.
-
-## blockNumber {#blocknumber}
-
-Devuelve el número de secuencia del bloque de datos donde se encuentra la fila.
-
-## rowNumberInBlock {#function-rownumberinblock}
-
-Devuelve el número ordinal de la fila en el bloque de datos. Los diferentes bloques de datos siempre se recalculan.
-
-## rowNumberInAllBlocks() {#rownumberinallblocks}
-
-Devuelve el número ordinal de la fila en el bloque de datos. Esta función solo considera los bloques de datos afectados.
-
-## vecino {#neighbor}
-
-La función de ventana que proporciona acceso a una fila en un desplazamiento especificado que viene antes o después de la fila actual de una columna determinada.
-
-**Sintaxis**
-
-``` sql
-neighbor(column, offset[, default_value])
-```
-
-El resultado de la función depende de los bloques de datos afectados y del orden de los datos en el bloque.
-Si realiza una subconsulta con ORDER BY y llama a la función desde fuera de la subconsulta, puede obtener el resultado esperado.
-
-**Parámetros**
-
--   `column` — A column name or scalar expression.
--   `offset` — The number of rows forwards or backwards from the current row of `column`. [Int64](../../sql-reference/data-types/int-uint.md).
--   `default_value` — Optional. The value to be returned if offset goes beyond the scope of the block. Type of data blocks affected.
-
-**Valores devueltos**
-
--   Valor para `column` en `offset` distancia de la fila actual si `offset` valor no está fuera de los límites del bloque.
--   Valor predeterminado para `column` si `offset` valor está fuera de los límites del bloque. Si `default_value` se da, entonces será utilizado.
-
-Tipo: tipo de bloques de datos afectados o tipo de valor predeterminado.
-
-**Ejemplo**
-
-Consulta:
-
-``` sql
-SELECT number, neighbor(number, 2) FROM system.numbers LIMIT 10;
-```
-
-Resultado:
-
-``` text
-┌─number─┬─neighbor(number, 2)─┐
-│      0 │                   2 │
-│      1 │                   3 │
-│      2 │                   4 │
-│      3 │                   5 │
-│      4 │                   6 │
-│      5 │                   7 │
-│      6 │                   8 │
-│      7 │                   9 │
-│      8 │                   0 │
-│      9 │                   0 │
-└────────┴─────────────────────┘
-```
-
-Consulta:
-
-``` sql
-SELECT number, neighbor(number, 2, 999) FROM system.numbers LIMIT 10;
-```
-
-Resultado:
-
-``` text
-┌─number─┬─neighbor(number, 2, 999)─┐
-│      0 │                        2 │
-│      1 │                        3 │
-│      2 │                        4 │
-│      3 │                        5 │
-│      4 │                        6 │
-│      5 │                        7 │
-│      6 │                        8 │
-│      7 │                        9 │
-│      8 │                      999 │
-│      9 │                      999 │
-└────────┴──────────────────────────┘
-```
-
-Esta función se puede utilizar para calcular el valor métrico interanual:
-
-Consulta:
-
-``` sql
-WITH toDate('2018-01-01') AS start_date
-SELECT
-    toStartOfMonth(start_date + (number * 32)) AS month,
-    toInt32(month) % 100 AS money,
-    neighbor(money, -12) AS prev_year,
-    round(prev_year / money, 2) AS year_over_year
-FROM numbers(16)
-```
-
-Resultado:
-
-``` text
-┌──────month─┬─money─┬─prev_year─┬─year_over_year─┐
-│ 2018-01-01 │    32 │         0 │              0 │
-│ 2018-02-01 │    63 │         0 │              0 │
-│ 2018-03-01 │    91 │         0 │              0 │
-│ 2018-04-01 │    22 │         0 │              0 │
-│ 2018-05-01 │    52 │         0 │              0 │
-│ 2018-06-01 │    83 │         0 │              0 │
-│ 2018-07-01 │    13 │         0 │              0 │
-│ 2018-08-01 │    44 │         0 │              0 │
-│ 2018-09-01 │    75 │         0 │              0 │
-│ 2018-10-01 │     5 │         0 │              0 │
-│ 2018-11-01 │    36 │         0 │              0 │
-│ 2018-12-01 │    66 │         0 │              0 │
-│ 2019-01-01 │    97 │        32 │           0.33 │
-│ 2019-02-01 │    28 │        63 │           2.25 │
-│ 2019-03-01 │    56 │        91 │           1.62 │
-│ 2019-04-01 │    87 │        22 │           0.25 │
-└────────────┴───────┴───────────┴────────────────┘
-```
-
-## EjecuciónDiferencia (x) {#other_functions-runningdifference}
-
-Calculates the difference between successive row values ​​in the data block.
-Devuelve 0 para la primera fila y la diferencia con respecto a la fila anterior para cada fila subsiguiente.
-
-El resultado de la función depende de los bloques de datos afectados y del orden de los datos en el bloque.
-Si realiza una subconsulta con ORDER BY y llama a la función desde fuera de la subconsulta, puede obtener el resultado esperado.
-
-Ejemplo:
-
-``` sql
-SELECT
-    EventID,
-    EventTime,
-    runningDifference(EventTime) AS delta
-FROM
-(
-    SELECT
-        EventID,
-        EventTime
-    FROM events
-    WHERE EventDate = '2016-11-24'
-    ORDER BY EventTime ASC
-    LIMIT 5
-)
-```
-
-``` text
-┌─EventID─┬───────────EventTime─┬─delta─┐
-│    1106 │ 2016-11-24 00:00:04 │     0 │
-│    1107 │ 2016-11-24 00:00:05 │     1 │
-│    1108 │ 2016-11-24 00:00:05 │     0 │
-│    1109 │ 2016-11-24 00:00:09 │     4 │
-│    1110 │ 2016-11-24 00:00:10 │     1 │
-└─────────┴─────────────────────┴───────┘
-```
-
-Tenga en cuenta que el tamaño del bloque afecta el resultado. Con cada nuevo bloque, el `runningDifference` estado de reset.
-
-``` sql
-SELECT
-    number,
-    runningDifference(number + 1) AS diff
-FROM numbers(100000)
-WHERE diff != 1
-```
-
-``` text
-┌─number─┬─diff─┐
-│      0 │    0 │
-└────────┴──────┘
-┌─number─┬─diff─┐
-│  65536 │    0 │
-└────────┴──────┘
-```
-
-``` sql
-set max_block_size=100000 -- default value is 65536!
-
-SELECT
-    number,
-    runningDifference(number + 1) AS diff
-FROM numbers(100000)
-WHERE diff != 1
-```
-
-``` text
-┌─number─┬─diff─┐
-│      0 │    0 │
-└────────┴──────┘
-```
-
-## runningDifferenceStartingWithFirstvalue {#runningdifferencestartingwithfirstvalue}
-
-Lo mismo que para [runningDifference](./other-functions.md#other_functions-runningdifference), la diferencia es el valor de la primera fila, devolvió el valor de la primera fila, y cada fila subsiguiente devuelve la diferencia de la fila anterior.
-
-## ¿Cómo puedo hacerlo?) {#macnumtostringnum}
-
-Acepta un número UInt64. Lo interpreta como una dirección MAC en big endian. Devuelve una cadena que contiene la dirección MAC correspondiente con el formato AA:BB:CC:DD:EE:FF (números separados por dos puntos en forma hexadecimal).
-
-## Sistema abierto.) {#macstringtonums}
-
-La función inversa de MACNumToString. Si la dirección MAC tiene un formato no válido, devuelve 0.
-
-## Sistema abierto.) {#macstringtoouis}
-
-Acepta una dirección MAC con el formato AA:BB:CC:DD:EE:FF (números separados por dos puntos en forma hexadecimal). Devuelve los primeros tres octetos como un número UInt64. Si la dirección MAC tiene un formato no válido, devuelve 0.
-
-## getSizeOfEnumType {#getsizeofenumtype}
-
-Devuelve el número de campos en [Enum](../../sql-reference/data-types/enum.md).
-
-``` sql
-getSizeOfEnumType(value)
-```
-
-**Parámetros:**
-
--   `value` — Value of type `Enum`.
-
-**Valores devueltos**
-
--   El número de campos con `Enum` valores de entrada.
--   Se produce una excepción si el tipo no es `Enum`.
-
-**Ejemplo**
-
-``` sql
-SELECT getSizeOfEnumType( CAST('a' AS Enum8('a' = 1, 'b' = 2) ) ) AS x
-```
-
-``` text
-┌─x─┐
-│ 2 │
-└───┘
-```
-
-## BlockSerializedSize {#blockserializedsize}
-
-Devuelve el tamaño en el disco (sin tener en cuenta la compresión).
-
-``` sql
-blockSerializedSize(value[, value[, ...]])
-```
-
-**Parámetros:**
-
--   `value` — Any value.
-
-**Valores devueltos**
-
--   El número de bytes que se escribirán en el disco para el bloque de valores (sin compresión).
-
-**Ejemplo**
-
-``` sql
-SELECT blockSerializedSize(maxState(1)) as x
-```
-
-``` text
-┌─x─┐
-│ 2 │
-└───┘
-```
-
-## ToColumnTypeName {#tocolumntypename}
-
-Devuelve el nombre de la clase que representa el tipo de datos de la columna en la RAM.
-
-``` sql
-toColumnTypeName(value)
-```
-
-**Parámetros:**
-
--   `value` — Any type of value.
-
-**Valores devueltos**
-
--   Una cadena con el nombre de la clase que se utiliza para representar la `value` tipo de datos en la memoria RAM.
-
-**Ejemplo de la diferencia entre`toTypeName ' and ' toColumnTypeName`**
-
-``` sql
-SELECT toTypeName(CAST('2018-01-01 01:02:03' AS DateTime))
-```
-
-``` text
-┌─toTypeName(CAST('2018-01-01 01:02:03', 'DateTime'))─┐
-│ DateTime                                            │
-└─────────────────────────────────────────────────────┘
-```
-
-``` sql
-SELECT toColumnTypeName(CAST('2018-01-01 01:02:03' AS DateTime))
-```
-
-``` text
-┌─toColumnTypeName(CAST('2018-01-01 01:02:03', 'DateTime'))─┐
-│ Const(UInt32)                                             │
-└───────────────────────────────────────────────────────────┘
-```
-
-El ejemplo muestra que el `DateTime` tipo de datos se almacena en la memoria como `Const(UInt32)`.
-
-## dumpColumnStructure {#dumpcolumnstructure}
-
-Produce una descripción detallada de las estructuras de datos en la memoria RAM
-
-``` sql
-dumpColumnStructure(value)
-```
-
-**Parámetros:**
-
--   `value` — Any type of value.
-
-**Valores devueltos**
-
--   Una cadena que describe la estructura que se utiliza para representar el `value` tipo de datos en la memoria RAM.
-
-**Ejemplo**
-
-``` sql
-SELECT dumpColumnStructure(CAST('2018-01-01 01:02:03', 'DateTime'))
-```
-
-``` text
-┌─dumpColumnStructure(CAST('2018-01-01 01:02:03', 'DateTime'))─┐
-│ DateTime, Const(size = 1, UInt32(size = 1))                  │
-└──────────────────────────────────────────────────────────────┘
-```
-
-## defaultValueOfArgumentType {#defaultvalueofargumenttype}
-
-Genera el valor predeterminado para el tipo de datos.
-
-No incluye valores predeterminados para columnas personalizadas establecidas por el usuario.
-
-``` sql
-defaultValueOfArgumentType(expression)
-```
-
-**Parámetros:**
-
--   `expression` — Arbitrary type of value or an expression that results in a value of an arbitrary type.
-
-**Valores devueltos**
-
--   `0` para los números.
--   Cadena vacía para cadenas.
--   `ᴺᵁᴸᴸ` para [NULL](../../sql-reference/data-types/nullable.md).
-
-**Ejemplo**
-
-``` sql
-SELECT defaultValueOfArgumentType( CAST(1 AS Int8) )
-```
-
-``` text
-┌─defaultValueOfArgumentType(CAST(1, 'Int8'))─┐
-│                                           0 │
-└─────────────────────────────────────────────┘
-```
-
-``` sql
-SELECT defaultValueOfArgumentType( CAST(1 AS Nullable(Int8) ) )
-```
-
-``` text
-┌─defaultValueOfArgumentType(CAST(1, 'Nullable(Int8)'))─┐
-│                                                  ᴺᵁᴸᴸ │
-└───────────────────────────────────────────────────────┘
-```
-
-## replicar {#other-functions-replicate}
-
-Crea una matriz con un solo valor.
-
-Utilizado para la implementación interna de [arrayJoin](array-join.md#functions_arrayjoin).
-
-``` sql
-SELECT replicate(x, arr);
-```
-
-**Parámetros:**
-
--   `arr` — Original array. ClickHouse creates a new array of the same length as the original and fills it with the value `x`.
--   `x` — The value that the resulting array will be filled with.
-
-**Valor devuelto**
-
-Una matriz llena con el valor `x`.
-
-Tipo: `Array`.
-
-**Ejemplo**
-
-Consulta:
-
-``` sql
-SELECT replicate(1, ['a', 'b', 'c'])
-```
-
-Resultado:
-
-``` text
-┌─replicate(1, ['a', 'b', 'c'])─┐
-│ [1,1,1]                       │
-└───────────────────────────────┘
-```
-
-## Sistema de archivosDisponible {#filesystemavailable}
-
-Devuelve la cantidad de espacio restante en el sistema de archivos donde se encuentran los archivos de las bases de datos. Siempre es más pequeño que el espacio libre total ([Sistema de archivosLibre](#filesystemfree)) porque algo de espacio está reservado para el sistema operativo.
-
-**Sintaxis**
-
-``` sql
-filesystemAvailable()
-```
-
-**Valor devuelto**
-
--   La cantidad de espacio restante disponible en bytes.
-
-Tipo: [UInt64](../../sql-reference/data-types/int-uint.md).
-
-**Ejemplo**
-
-Consulta:
-
-``` sql
-SELECT formatReadableSize(filesystemAvailable()) AS "Available space", toTypeName(filesystemAvailable()) AS "Type";
-```
-
-Resultado:
-
-``` text
-┌─Available space─┬─Type───┐
-│ 30.75 GiB       │ UInt64 │
-└─────────────────┴────────┘
-```
-
-## Sistema de archivosLibre {#filesystemfree}
-
-Devuelve la cantidad total del espacio libre en el sistema de archivos donde se encuentran los archivos de las bases de datos. Ver también `filesystemAvailable`
-
-**Sintaxis**
-
-``` sql
-filesystemFree()
-```
-
-**Valor devuelto**
-
--   Cantidad de espacio libre en bytes.
-
-Tipo: [UInt64](../../sql-reference/data-types/int-uint.md).
-
-**Ejemplo**
-
-Consulta:
-
-``` sql
-SELECT formatReadableSize(filesystemFree()) AS "Free space", toTypeName(filesystemFree()) AS "Type";
-```
-
-Resultado:
-
-``` text
-┌─Free space─┬─Type───┐
-│ 32.39 GiB  │ UInt64 │
-└────────────┴────────┘
-```
-
-## sistema de archivosCapacidad {#filesystemcapacity}
-
-Devuelve la capacidad del sistema de archivos en bytes. Para la evaluación, el [camino](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-path) al directorio de datos debe estar configurado.
-
-**Sintaxis**
-
-``` sql
-filesystemCapacity()
-```
-
-**Valor devuelto**
-
--   Información de capacidad del sistema de archivos en bytes.
-
-Tipo: [UInt64](../../sql-reference/data-types/int-uint.md).
-
-**Ejemplo**
-
-Consulta:
-
-``` sql
-SELECT formatReadableSize(filesystemCapacity()) AS "Capacity", toTypeName(filesystemCapacity()) AS "Type"
-```
-
-Resultado:
-
-``` text
-┌─Capacity──┬─Type───┐
-│ 39.32 GiB │ UInt64 │
-└───────────┴────────┘
-```
-
-## finalizeAggregation {#function-finalizeaggregation}
-
-Toma el estado de la función agregada. Devuelve el resultado de la agregación (estado finalizado).
-
-## runningAccumulate {#function-runningaccumulate}
-
-Toma los estados de la función agregada y devuelve una columna con valores, son el resultado de la acumulación de estos estados para un conjunto de líneas de bloque, desde la primera hasta la línea actual.
-Por ejemplo, toma el estado de la función agregada (ejemplo runningAccumulate(uniqState(UserID)) ), y para cada fila de bloque, devuelve el resultado de la función agregada en la fusión de estados de todas las filas anteriores y la fila actual.
-Por lo tanto, el resultado de la función depende de la partición de los datos en los bloques y del orden de los datos en el bloque.
-
-## joinGet {#joinget}
-
-La función le permite extraer datos de la tabla de la misma manera que [diccionario](../../sql-reference/dictionaries/index.md).
-
-Obtiene datos de [Unir](../../engines/table-engines/special/join.md#creating-a-table) usando la clave de unión especificada.
-
-Solo admite tablas creadas con `ENGINE = Join(ANY, LEFT, <join_keys>)` instrucción.
-
-**Sintaxis**
-
-``` sql
-joinGet(join_storage_table_name, `value_column`, join_keys)
-```
-
-**Parámetros**
-
--   `join_storage_table_name` — an [identificador](../syntax.md#syntax-identifiers) indica dónde se realiza la búsqueda. El identificador se busca en la base de datos predeterminada (ver parámetro `default_database` en el archivo de configuración). Para reemplazar la base de datos predeterminada, utilice `USE db_name` o especifique la base de datos y la tabla a través del separador `db_name.db_table`, ver el ejemplo.
--   `value_column` — name of the column of the table that contains required data.
--   `join_keys` — list of keys.
-
-**Valor devuelto**
-
-Devuelve la lista de valores correspondientes a la lista de claves.
-
-Si cierto no existe en la tabla fuente, entonces `0` o `null` será devuelto basado en [Sistema abierto.](../../operations/settings/settings.md#join_use_nulls) configuración.
-
-Más información sobre `join_use_nulls` en [Únase a la operación](../../engines/table-engines/special/join.md).
-
-**Ejemplo**
-
-Tabla de entrada:
-
-``` sql
-CREATE DATABASE db_test
-CREATE TABLE db_test.id_val(`id` UInt32, `val` UInt32) ENGINE = Join(ANY, LEFT, id) SETTINGS join_use_nulls = 1
-INSERT INTO db_test.id_val VALUES (1,11)(2,12)(4,13)
-```
-
-``` text
-┌─id─┬─val─┐
-│  4 │  13 │
-│  2 │  12 │
-│  1 │  11 │
-└────┴─────┘
-```
-
-Consulta:
-
-``` sql
-SELECT joinGet(db_test.id_val,'val',toUInt32(number)) from numbers(4) SETTINGS join_use_nulls = 1
-```
-
-Resultado:
-
-``` text
-┌─joinGet(db_test.id_val, 'val', toUInt32(number))─┐
-│                                                0 │
-│                                               11 │
-│                                               12 │
-│                                                0 │
-└──────────────────────────────────────────────────┘
-```
-
-## modelEvaluate(model_name, …) {#function-modelevaluate}
-
-Evaluar modelo externo.
-Acepta un nombre de modelo y argumentos de modelo. Devuelve Float64.
-
-## ¿Cómo puedo hacerlo?\]) {#throwifx-custom-message}
-
-Lance una excepción si el argumento no es cero.
-custom_message - es un parámetro opcional: una cadena constante, proporciona un mensaje de error
-
-``` sql
-SELECT throwIf(number = 3, 'Too many') FROM numbers(10);
-```
-
-``` text
-↙ Progress: 0.00 rows, 0.00 B (0.00 rows/s., 0.00 B/s.) Received exception from server (version 19.14.1):
-Code: 395. DB::Exception: Received from localhost:9000. DB::Exception: Too many.
-```
-
-## identidad {#identity}
-
-Devuelve el mismo valor que se usó como argumento. Se utiliza para la depuración y pruebas, permite cancelar el uso de índice, y obtener el rendimiento de la consulta de un análisis completo. Cuando se analiza la consulta para el posible uso del índice, el analizador no mira dentro `identity` función.
-
-**Sintaxis**
-
-``` sql
-identity(x)
-```
-
-**Ejemplo**
-
-Consulta:
-
-``` sql
-SELECT identity(42)
-```
-
-Resultado:
-
-``` text
-┌─identity(42)─┐
-│           42 │
-└──────────────┘
-```
-
-## randomPrintableASCII {#randomascii}
-
-Genera una cadena con un conjunto aleatorio de [ASCII](https://en.wikipedia.org/wiki/ASCII#Printable_characters) caracteres imprimibles.
-
-**Sintaxis**
-
-``` sql
-randomPrintableASCII(length)
-```
-
-**Parámetros**
-
--   `length` — Resulting string length. Positive integer.
-
-        If you pass `length < 0`, behavior of the function is undefined.
-
-**Valor devuelto**
-
--   Cadena con un conjunto aleatorio de [ASCII](https://en.wikipedia.org/wiki/ASCII#Printable_characters) caracteres imprimibles.
-
-Tipo: [Cadena](../../sql-reference/data-types/string.md)
-
-**Ejemplo**
-
-``` sql
-SELECT number, randomPrintableASCII(30) as str, length(str) FROM system.numbers LIMIT 3
-```
-
-``` text
-┌─number─┬─str────────────────────────────┬─length(randomPrintableASCII(30))─┐
-│      0 │ SuiCOSTvC0csfABSw=UcSzp2.`rv8x │                               30 │
-│      1 │ 1Ag NlJ &RCN:*>HVPG;PE-nO"SUFD │                               30 │
-│      2 │ /"+<"wUTh:=LjJ Vm!c&hI*m#XTfzz │                               30 │
-└────────┴────────────────────────────────┴──────────────────────────────────┘
-```
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/functions/other_functions/) <!--hide-->
diff --git a/docs/es/sql-reference/functions/random-functions.md b/docs/es/sql-reference/functions/random-functions.md
deleted file mode 100644
index a614c217546..00000000000
--- a/docs/es/sql-reference/functions/random-functions.md
+++ /dev/null
@@ -1,65 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 51
-toc_title: "Generaci\xF3n de n\xFAmeros pseudo-aleatorios"
----
-
-# Funciones para generar números pseudoaleatorios {#functions-for-generating-pseudo-random-numbers}
-
-Se utilizan generadores no criptográficos de números pseudoaleatorios.
-
-Todas las funciones aceptan cero argumentos o un argumento.
-Si se pasa un argumento, puede ser de cualquier tipo y su valor no se usa para nada.
-El único propósito de este argumento es evitar la eliminación de subexpresiones comunes, de modo que dos instancias diferentes de la misma función devuelvan columnas diferentes con números aleatorios diferentes.
-
-## rand {#rand}
-
-Devuelve un número pseudoaleatorio UInt32, distribuido uniformemente entre todos los números de tipo UInt32.
-Utiliza un generador congruente lineal.
-
-## rand64 {#rand64}
-
-Devuelve un número pseudoaleatorio UInt64, distribuido uniformemente entre todos los números de tipo UInt64.
-Utiliza un generador congruente lineal.
-
-## randConstant {#randconstant}
-
-Produce una columna constante con un valor aleatorio.
-
-**Sintaxis**
-
-``` sql
-randConstant([x])
-```
-
-**Parámetros**
-
--   `x` — [Expresion](../syntax.md#syntax-expressions) resultante en cualquiera de los [tipos de datos compatibles](../data-types/index.md#data_types). El valor resultante se descarta, pero la expresión en sí si se usa para omitir [Eliminación de subexpresiones común](index.md#common-subexpression-elimination) si la función se llama varias veces en una consulta. Parámetro opcional.
-
-**Valor devuelto**
-
--   Número pseudoaleatorio.
-
-Tipo: [UInt32](../data-types/int-uint.md).
-
-**Ejemplo**
-
-Consulta:
-
-``` sql
-SELECT rand(), rand(1), rand(number), randConstant(), randConstant(1), randConstant(number)
-FROM numbers(3)
-```
-
-Resultado:
-
-``` text
-┌─────rand()─┬────rand(1)─┬─rand(number)─┬─randConstant()─┬─randConstant(1)─┬─randConstant(number)─┐
-│ 3047369878 │ 4132449925 │   4044508545 │     2740811946 │      4229401477 │           1924032898 │
-│ 2938880146 │ 1267722397 │   4154983056 │     2740811946 │      4229401477 │           1924032898 │
-│  956619638 │ 4238287282 │   1104342490 │     2740811946 │      4229401477 │           1924032898 │
-└────────────┴────────────┴──────────────┴────────────────┴─────────────────┴──────────────────────┘
-```
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/functions/random_functions/) <!--hide-->
diff --git a/docs/es/sql-reference/functions/rounding-functions.md b/docs/es/sql-reference/functions/rounding-functions.md
deleted file mode 100644
index 1c231d4df1e..00000000000
--- a/docs/es/sql-reference/functions/rounding-functions.md
+++ /dev/null
@@ -1,190 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 45
-toc_title: Redondeo
----
-
-# Funciones de redondeo {#rounding-functions}
-
-## piso(x\[, N\]) {#floorx-n}
-
-Devuelve el número de ronda más grande que es menor o igual que `x`. Un número redondo es un múltiplo de 1 / 10N, o el número más cercano del tipo de datos apropiado si 1 / 10N no es exacto.
-‘N’ es una constante entera, parámetro opcional. Por defecto es cero, lo que significa redondear a un entero.
-‘N’ puede ser negativo.
-
-Ejemplos: `floor(123.45, 1) = 123.4, floor(123.45, -1) = 120.`
-
-`x` es cualquier tipo numérico. El resultado es un número del mismo tipo.
-Para argumentos enteros, tiene sentido redondear con un negativo `N` valor no negativo `N` la función no hace nada).
-Si el redondeo causa desbordamiento (por ejemplo, floor(-128, -1)), se devuelve un resultado específico de la implementación.
-
-## Por ejemplo:\]) {#ceilx-n-ceilingx-n}
-
-Devuelve el número redondo más pequeño que es mayor o igual que `x`. En todos los demás sentidos, es lo mismo que el `floor` función (véase más arriba).
-
-## ¿Cómo puedo hacerlo?\]) {#truncx-n-truncatex-n}
-
-Devuelve el número redondo con el valor absoluto más grande que tiene un valor absoluto menor o igual que `x`‘s. In every other way, it is the same as the ’floor’ función (véase más arriba).
-
-## Ronda (x\[, N\]) {#rounding_functions-round}
-
-Redondea un valor a un número especificado de decimales.
-
-La función devuelve el número más cercano del orden especificado. En caso de que el número dado tenga la misma distancia que los números circundantes, la función utiliza el redondeo del banquero para los tipos de números flotantes y se redondea desde cero para los otros tipos de números.
-
-``` sql
-round(expression [, decimal_places])
-```
-
-**Parámetros:**
-
--   `expression` — A number to be rounded. Can be any [expresion](../syntax.md#syntax-expressions) devolviendo el numérico [tipo de datos](../../sql-reference/data-types/index.md#data_types).
--   `decimal-places` — An integer value.
-    -   Si `decimal-places > 0` luego la función redondea el valor a la derecha del punto decimal.
-    -   Si `decimal-places < 0` luego la función redondea el valor a la izquierda del punto decimal.
-    -   Si `decimal-places = 0` entonces la función redondea el valor a entero. En este caso, el argumento puede omitirse.
-
-**Valor devuelto:**
-
-El número redondeado del mismo tipo que el número de entrada.
-
-### Ejemplos {#examples}
-
-**Ejemplo de uso**
-
-``` sql
-SELECT number / 2 AS x, round(x) FROM system.numbers LIMIT 3
-```
-
-``` text
-┌───x─┬─round(divide(number, 2))─┐
-│   0 │                        0 │
-│ 0.5 │                        0 │
-│   1 │                        1 │
-└─────┴──────────────────────────┘
-```
-
-**Ejemplos de redondeo**
-
-Redondeando al número más cercano.
-
-``` text
-round(3.2, 0) = 3
-round(4.1267, 2) = 4.13
-round(22,-1) = 20
-round(467,-2) = 500
-round(-467,-2) = -500
-```
-
-Redondeo del banquero.
-
-``` text
-round(3.5) = 4
-round(4.5) = 4
-round(3.55, 1) = 3.6
-round(3.65, 1) = 3.6
-```
-
-**Ver también**
-
--   [roundBankers](#roundbankers)
-
-## roundBankers {#roundbankers}
-
-Redondea un número a una posición decimal especificada.
-
--   Si el número de redondeo está a medio camino entre dos números, la función utiliza el redondeo del banquero.
-
-        Banker's rounding is a method of rounding fractional numbers. When the rounding number is halfway between two numbers, it's rounded to the nearest even digit at the specified decimal position. For example: 3.5 rounds up to 4, 2.5 rounds down to 2.
-
-        It's the default rounding method for floating point numbers defined in [IEEE 754](https://en.wikipedia.org/wiki/IEEE_754#Roundings_to_nearest). The [round](#rounding_functions-round) function performs the same rounding for floating point numbers. The `roundBankers` function also rounds integers the same way, for example, `roundBankers(45, -1) = 40`.
-
--   En otros casos, la función redondea los números al entero más cercano.
-
-Usando el redondeo del banquero, puede reducir el efecto que tiene el redondeo de números en los resultados de sumar o restar estos números.
-
-Por ejemplo, suma números 1.5, 2.5, 3.5, 4.5 con redondeo diferente:
-
--   Sin redondeo: 1.5 + 2.5 + 3.5 + 4.5 = 12.
--   Redondeo del banquero: 2 + 2 + 4 + 4 = 12.
--   Redondeando al entero más cercano: 2 + 3 + 4 + 5 = 14.
-
-**Sintaxis**
-
-``` sql
-roundBankers(expression [, decimal_places])
-```
-
-**Parámetros**
-
--   `expression` — A number to be rounded. Can be any [expresion](../syntax.md#syntax-expressions) devolviendo el numérico [tipo de datos](../../sql-reference/data-types/index.md#data_types).
--   `decimal-places` — Decimal places. An integer number.
-    -   `decimal-places > 0` — The function rounds the number to the given position right of the decimal point. Example: `roundBankers(3.55, 1) = 3.6`.
-    -   `decimal-places < 0` — The function rounds the number to the given position left of the decimal point. Example: `roundBankers(24.55, -1) = 20`.
-    -   `decimal-places = 0` — The function rounds the number to an integer. In this case the argument can be omitted. Example: `roundBankers(2.5) = 2`.
-
-**Valor devuelto**
-
-Un valor redondeado por el método de redondeo del banquero.
-
-### Ejemplos {#examples-1}
-
-**Ejemplo de uso**
-
-Consulta:
-
-``` sql
- SELECT number / 2 AS x, roundBankers(x, 0) AS b fROM system.numbers limit 10
-```
-
-Resultado:
-
-``` text
-┌───x─┬─b─┐
-│   0 │ 0 │
-│ 0.5 │ 0 │
-│   1 │ 1 │
-│ 1.5 │ 2 │
-│   2 │ 2 │
-│ 2.5 │ 2 │
-│   3 │ 3 │
-│ 3.5 │ 4 │
-│   4 │ 4 │
-│ 4.5 │ 4 │
-└─────┴───┘
-```
-
-**Ejemplos de redondeo de Banker**
-
-``` text
-roundBankers(0.4) = 0
-roundBankers(-3.5) = -4
-roundBankers(4.5) = 4
-roundBankers(3.55, 1) = 3.6
-roundBankers(3.65, 1) = 3.6
-roundBankers(10.35, 1) = 10.4
-roundBankers(10.755, 2) = 11,76
-```
-
-**Ver también**
-
--   [ronda](#rounding_functions-round)
-
-## ¿Cómo puedo hacerlo?) {#roundtoexp2num}
-
-Acepta un número. Si el número es menor que uno, devuelve 0. De lo contrario, redondea el número al grado más cercano (todo no negativo) de dos.
-
-## RondaDuración(num) {#rounddurationnum}
-
-Acepta un número. Si el número es menor que uno, devuelve 0. De lo contrario, redondea el número a números del conjunto: 1, 10, 30, 60, 120, 180, 240, 300, 600, 1200, 1800, 3600, 7200, 18000, 36000. Esta función es específica de Yandex.Métrica y se utiliza para aplicar el informe sobre la duración del período de sesiones.
-
-## RondaEdad(num) {#roundagenum}
-
-Acepta un número. Si el número es menor que 18, devuelve 0. De lo contrario, redondea el número a un número del conjunto: 18, 25, 35, 45, 55. Esta función es específica de Yandex.Métrica y se utiliza para la aplicación del informe sobre la edad del usuario.
-
-## ¿Cómo puedo hacerlo?) {#rounddownnum-arr}
-
-Acepta un número y lo redondea a un elemento en la matriz especificada. Si el valor es menor que el límite más bajo, se devuelve el límite más bajo.
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/functions/rounding_functions/) <!--hide-->
diff --git a/docs/es/sql-reference/functions/splitting-merging-functions.md b/docs/es/sql-reference/functions/splitting-merging-functions.md
deleted file mode 100644
index d3809f8bf72..00000000000
--- a/docs/es/sql-reference/functions/splitting-merging-functions.md
+++ /dev/null
@@ -1,116 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 47
-toc_title: "Divisi\xF3n y fusi\xF3n de cuerdas y matrices"
----
-
-# Funciones para dividir y fusionar cuerdas y matrices {#functions-for-splitting-and-merging-strings-and-arrays}
-
-## Por ejemplo:) {#splitbycharseparator-s}
-
-Divide una cadena en subcadenas separadas por un carácter especificado. Utiliza una cadena constante `separator` que consiste en exactamente un carácter.
-Devuelve una matriz de subcadenas seleccionadas. Se pueden seleccionar subcadenas vacías si el separador aparece al principio o al final de la cadena, o si hay varios separadores consecutivos.
-
-**Sintaxis**
-
-``` sql
-splitByChar(<separator>, <s>)
-```
-
-**Parámetros**
-
--   `separator` — The separator which should contain exactly one character. [Cadena](../../sql-reference/data-types/string.md).
--   `s` — The string to split. [Cadena](../../sql-reference/data-types/string.md).
-
-**Valores devueltos)**
-
-Devuelve una matriz de subcadenas seleccionadas. Las subcadenas vacías se pueden seleccionar cuando:
-
--   Se produce un separador al principio o al final de la cadena;
--   Hay varios separadores consecutivos;
--   La cadena original `s` está vacío.
-
-Tipo: [Matriz](../../sql-reference/data-types/array.md) de [Cadena](../../sql-reference/data-types/string.md).
-
-**Ejemplo**
-
-``` sql
-SELECT splitByChar(',', '1,2,3,abcde')
-```
-
-``` text
-┌─splitByChar(',', '1,2,3,abcde')─┐
-│ ['1','2','3','abcde']           │
-└─────────────────────────────────┘
-```
-
-## Por ejemplo:) {#splitbystringseparator-s}
-
-Divide una cadena en subcadenas separadas por una cadena. Utiliza una cadena constante `separator` de múltiples caracteres como separador. Si la cadena `separator` está vacío, dividirá la cadena `s` en una matriz de caracteres individuales.
-
-**Sintaxis**
-
-``` sql
-splitByString(<separator>, <s>)
-```
-
-**Parámetros**
-
--   `separator` — The separator. [Cadena](../../sql-reference/data-types/string.md).
--   `s` — The string to split. [Cadena](../../sql-reference/data-types/string.md).
-
-**Valores devueltos)**
-
-Devuelve una matriz de subcadenas seleccionadas. Las subcadenas vacías se pueden seleccionar cuando:
-
-Tipo: [Matriz](../../sql-reference/data-types/array.md) de [Cadena](../../sql-reference/data-types/string.md).
-
--   Se produce un separador no vacío al principio o al final de la cadena;
--   Hay varios separadores consecutivos no vacíos;
--   La cadena original `s` está vacío mientras el separador no está vacío.
-
-**Ejemplo**
-
-``` sql
-SELECT splitByString(', ', '1, 2 3, 4,5, abcde')
-```
-
-``` text
-┌─splitByString(', ', '1, 2 3, 4,5, abcde')─┐
-│ ['1','2 3','4,5','abcde']                 │
-└───────────────────────────────────────────┘
-```
-
-``` sql
-SELECT splitByString('', 'abcde')
-```
-
-``` text
-┌─splitByString('', 'abcde')─┐
-│ ['a','b','c','d','e']      │
-└────────────────────────────┘
-```
-
-## Por ejemplo, se puede usar una matriz.\]) {#arraystringconcatarr-separator}
-
-Concatena las cadenas enumeradas en la matriz con el separador.'separador' es un parámetro opcional: una constante de cadena, establece una cadena vacía por defecto.
-Devuelve la cadena.
-
-## Sistema abierto.) {#alphatokenss}
-
-Selecciona subcadenas de bytes consecutivos de los rangos a-z y A-Z.Devuelve una matriz de subcadenas.
-
-**Ejemplo**
-
-``` sql
-SELECT alphaTokens('abca1abc')
-```
-
-``` text
-┌─alphaTokens('abca1abc')─┐
-│ ['abca','abc']          │
-└─────────────────────────┘
-```
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/functions/splitting_merging_functions/) <!--hide-->
diff --git a/docs/es/sql-reference/functions/string-functions.md b/docs/es/sql-reference/functions/string-functions.md
deleted file mode 100644
index 43025465b31..00000000000
--- a/docs/es/sql-reference/functions/string-functions.md
+++ /dev/null
@@ -1,489 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 40
-toc_title: Trabajar con cadenas
----
-
-# Funciones para trabajar con cadenas {#functions-for-working-with-strings}
-
-## vaciar {#empty}
-
-Devuelve 1 para una cadena vacía o 0 para una cadena no vacía.
-El tipo de resultado es UInt8.
-Una cadena se considera no vacía si contiene al menos un byte, incluso si se trata de un espacio o un byte nulo.
-La función también funciona para matrices.
-
-## notEmpty {#notempty}
-
-Devuelve 0 para una cadena vacía o 1 para una cadena no vacía.
-El tipo de resultado es UInt8.
-La función también funciona para matrices.
-
-## longitud {#length}
-
-Devuelve la longitud de una cadena en bytes (no en caracteres y no en puntos de código).
-El tipo de resultado es UInt64.
-La función también funciona para matrices.
-
-## longitudUTF8 {#lengthutf8}
-
-Devuelve la longitud de una cadena en puntos de código Unicode (no en caracteres), suponiendo que la cadena contiene un conjunto de bytes que componen texto codificado en UTF-8. Si no se cumple esta suposición, devuelve algún resultado (no arroja una excepción).
-El tipo de resultado es UInt64.
-
-## char_length, CHAR_LENGTH {#char-length}
-
-Devuelve la longitud de una cadena en puntos de código Unicode (no en caracteres), suponiendo que la cadena contiene un conjunto de bytes que componen texto codificado en UTF-8. Si no se cumple esta suposición, devuelve algún resultado (no arroja una excepción).
-El tipo de resultado es UInt64.
-
-## character_length, CHARACTER_LENGTH {#character-length}
-
-Devuelve la longitud de una cadena en puntos de código Unicode (no en caracteres), suponiendo que la cadena contiene un conjunto de bytes que componen texto codificado en UTF-8. Si no se cumple esta suposición, devuelve algún resultado (no arroja una excepción).
-El tipo de resultado es UInt64.
-
-## inferior, lcase {#lower}
-
-Convierte símbolos latinos ASCII en una cadena a minúsculas.
-
-## superior, ucase {#upper}
-
-Convierte los símbolos latinos ASCII en una cadena a mayúsculas.
-
-## Método de codificación de datos: {#lowerutf8}
-
-Convierte una cadena en minúsculas, suponiendo que la cadena contiene un conjunto de bytes que componen un texto codificado en UTF-8.
-No detecta el idioma. Entonces, para el turco, el resultado podría no ser exactamente correcto.
-Si la longitud de la secuencia de bytes UTF-8 es diferente para mayúsculas y minúsculas de un punto de código, el resultado puede ser incorrecto para este punto de código.
-Si la cadena contiene un conjunto de bytes que no es UTF-8, entonces el comportamiento no está definido.
-
-## superiorUTF8 {#upperutf8}
-
-Convierte una cadena en mayúsculas, suponiendo que la cadena contiene un conjunto de bytes que componen un texto codificado en UTF-8.
-No detecta el idioma. Entonces, para el turco, el resultado podría no ser exactamente correcto.
-Si la longitud de la secuencia de bytes UTF-8 es diferente para mayúsculas y minúsculas de un punto de código, el resultado puede ser incorrecto para este punto de código.
-Si la cadena contiene un conjunto de bytes que no es UTF-8, entonces el comportamiento no está definido.
-
-## Sistema abierto {#isvalidutf8}
-
-Devuelve 1, si el conjunto de bytes es válido codificado en UTF-8, de lo contrario 0.
-
-## Acerca de Nosotros {#tovalidutf8}
-
-Reemplaza los caracteres UTF-8 no válidos por `�` (U+FFFD) carácter. Todos los caracteres no válidos que se ejecutan en una fila se contraen en el único carácter de reemplazo.
-
-``` sql
-toValidUTF8( input_string )
-```
-
-Parámetros:
-
--   input_string — Any set of bytes represented as the [Cadena](../../sql-reference/data-types/string.md) objeto de tipo de datos.
-
-Valor devuelto: cadena UTF-8 válida.
-
-**Ejemplo**
-
-``` sql
-SELECT toValidUTF8('\x61\xF0\x80\x80\x80b')
-```
-
-``` text
-┌─toValidUTF8('a����b')─┐
-│ a�b                   │
-└───────────────────────┘
-```
-
-## repetir {#repeat}
-
-Repite una cadena tantas veces como se especifique y concatena los valores replicados como una única cadena.
-
-**Sintaxis**
-
-``` sql
-repeat(s, n)
-```
-
-**Parámetros**
-
--   `s` — The string to repeat. [Cadena](../../sql-reference/data-types/string.md).
--   `n` — The number of times to repeat the string. [UInt](../../sql-reference/data-types/int-uint.md).
-
-**Valor devuelto**
-
-La cadena única, que contiene la cadena `s` repetir `n` tiempo. Si `n` \< 1, la función devuelve cadena vacía.
-
-Tipo: `String`.
-
-**Ejemplo**
-
-Consulta:
-
-``` sql
-SELECT repeat('abc', 10)
-```
-
-Resultado:
-
-``` text
-┌─repeat('abc', 10)──────────────┐
-│ abcabcabcabcabcabcabcabcabcabc │
-└────────────────────────────────┘
-```
-
-## inverso {#reverse}
-
-Invierte la cadena (como una secuencia de bytes).
-
-## reverseUTF8 {#reverseutf8}
-
-Invierte una secuencia de puntos de código Unicode, suponiendo que la cadena contiene un conjunto de bytes que representan un texto UTF-8. De lo contrario, hace otra cosa (no arroja una excepción).
-
-## format(pattern, s0, s1, …) {#format}
-
-Formatear el patrón constante con la cadena enumerada en los argumentos. `pattern` es un patrón de formato de Python simplificado. La cadena de formato contiene “replacement fields” rodeado de llaves `{}`. Cualquier cosa que no esté contenida entre llaves se considera texto literal, que se copia sin cambios en la salida. Si necesita incluir un carácter de llave en el texto literal, se puede escapar duplicando: `{{ '{{' }}` y `{{ '}}' }}`. Los nombres de campo pueden ser números (comenzando desde cero) o vacíos (luego se tratan como números de consecuencia).
-
-``` sql
-SELECT format('{1} {0} {1}', 'World', 'Hello')
-```
-
-``` text
-┌─format('{1} {0} {1}', 'World', 'Hello')─┐
-│ Hello World Hello                       │
-└─────────────────────────────────────────┘
-```
-
-``` sql
-SELECT format('{} {}', 'Hello', 'World')
-```
-
-``` text
-┌─format('{} {}', 'Hello', 'World')─┐
-│ Hello World                       │
-└───────────────────────────────────┘
-```
-
-## concat {#concat}
-
-Concatena las cadenas enumeradas en los argumentos, sin un separador.
-
-**Sintaxis**
-
-``` sql
-concat(s1, s2, ...)
-```
-
-**Parámetros**
-
-Valores de tipo String o FixedString.
-
-**Valores devueltos**
-
-Devuelve la cadena que resulta de concatenar los argumentos.
-
-Si alguno de los valores de argumento `NULL`, `concat` devoluciones `NULL`.
-
-**Ejemplo**
-
-Consulta:
-
-``` sql
-SELECT concat('Hello, ', 'World!')
-```
-
-Resultado:
-
-``` text
-┌─concat('Hello, ', 'World!')─┐
-│ Hello, World!               │
-└─────────────────────────────┘
-```
-
-## ConcatAssumeInjective {#concatassumeinjective}
-
-Lo mismo que [concat](#concat), la diferencia es que usted necesita asegurar eso `concat(s1, s2, ...) → sn` es inyectivo, se utilizará para la optimización de GROUP BY.
-
-La función se llama “injective” si siempre devuelve un resultado diferente para diferentes valores de argumentos. En otras palabras: diferentes argumentos nunca arrojan un resultado idéntico.
-
-**Sintaxis**
-
-``` sql
-concatAssumeInjective(s1, s2, ...)
-```
-
-**Parámetros**
-
-Valores de tipo String o FixedString.
-
-**Valores devueltos**
-
-Devuelve la cadena que resulta de concatenar los argumentos.
-
-Si alguno de los valores de argumento `NULL`, `concatAssumeInjective` devoluciones `NULL`.
-
-**Ejemplo**
-
-Tabla de entrada:
-
-``` sql
-CREATE TABLE key_val(`key1` String, `key2` String, `value` UInt32) ENGINE = TinyLog;
-INSERT INTO key_val VALUES ('Hello, ','World',1), ('Hello, ','World',2), ('Hello, ','World!',3), ('Hello',', World!',2);
-SELECT * from key_val;
-```
-
-``` text
-┌─key1────┬─key2─────┬─value─┐
-│ Hello,  │ World    │     1 │
-│ Hello,  │ World    │     2 │
-│ Hello,  │ World!   │     3 │
-│ Hello   │ , World! │     2 │
-└─────────┴──────────┴───────┘
-```
-
-Consulta:
-
-``` sql
-SELECT concat(key1, key2), sum(value) FROM key_val GROUP BY concatAssumeInjective(key1, key2)
-```
-
-Resultado:
-
-``` text
-┌─concat(key1, key2)─┬─sum(value)─┐
-│ Hello, World!      │          3 │
-│ Hello, World!      │          2 │
-│ Hello, World       │          3 │
-└────────────────────┴────────────┘
-```
-
-## substring(s, desplazamiento, longitud), mid(s, desplazamiento, longitud), substr(s, desplazamiento, longitud) {#substring}
-
-Devuelve una subcadena que comienza con el byte ‘offset’ índice que es ‘length’ bytes de largo. La indexación de caracteres comienza desde uno (como en SQL estándar). El ‘offset’ y ‘length’ los argumentos deben ser constantes.
-
-## substringUTF8(s, desplazamiento, longitud) {#substringutf8}
-
-Lo mismo que ‘substring’, pero para puntos de código Unicode. Funciona bajo el supuesto de que la cadena contiene un conjunto de bytes que representan un texto codificado en UTF-8. Si no se cumple esta suposición, devuelve algún resultado (no arroja una excepción).
-
-## Aquí hay algunas opciones) {#appendtrailingcharifabsent}
-
-Si el ‘s’ cadena no está vacía y no contiene el ‘c’ carácter al final, se añade el ‘c’ carácter hasta el final.
-
-## convertirCharset(s), de, a) {#convertcharset}
-
-Devuelve la cadena ‘s’ que se convirtió de la codificación en ‘from’ a la codificación en ‘to’.
-
-## Sistema abierto.) {#base64encode}
-
-Codificar ‘s’ cadena en base64
-
-## base64Decode(s)) {#base64decode}
-
-Decodificar cadena codificada en base64 ‘s’ en la cadena original. En caso de fallo plantea una excepción.
-
-## tryBase64Decode(s) {#trybase64decode}
-
-Similar a base64Decode, pero en caso de error se devolverá una cadena vacía.
-
-## endsWith(s, sufijo) {#endswith}
-
-Devuelve si se debe terminar con el sufijo especificado. Devuelve 1 si la cadena termina con el sufijo especificado, de lo contrario devuelve 0.
-
-## startsWith(str, prefijo) {#startswith}
-
-Devuelve 1 si la cadena comienza con el prefijo especificado, de lo contrario devuelve 0.
-
-``` sql
-SELECT startsWith('Spider-Man', 'Spi');
-```
-
-**Valores devueltos**
-
--   1, si la cadena comienza con el prefijo especificado.
--   0, si la cadena no comienza con el prefijo especificado.
-
-**Ejemplo**
-
-Consulta:
-
-``` sql
-SELECT startsWith('Hello, world!', 'He');
-```
-
-Resultado:
-
-``` text
-┌─startsWith('Hello, world!', 'He')─┐
-│                                 1 │
-└───────────────────────────────────┘
-```
-
-## recortar {#trim}
-
-Quita todos los caracteres especificados del inicio o el final de una cadena.
-De forma predeterminada, elimina todas las apariciones consecutivas de espacios en blanco comunes (carácter ASCII 32) de ambos extremos de una cadena.
-
-**Sintaxis**
-
-``` sql
-trim([[LEADING|TRAILING|BOTH] trim_character FROM] input_string)
-```
-
-**Parámetros**
-
--   `trim_character` — specified characters for trim. [Cadena](../../sql-reference/data-types/string.md).
--   `input_string` — string for trim. [Cadena](../../sql-reference/data-types/string.md).
-
-**Valor devuelto**
-
-Una cadena sin caracteres especificados iniciales y (o) finales.
-
-Tipo: `String`.
-
-**Ejemplo**
-
-Consulta:
-
-``` sql
-SELECT trim(BOTH ' ()' FROM '(   Hello, world!   )')
-```
-
-Resultado:
-
-``` text
-┌─trim(BOTH ' ()' FROM '(   Hello, world!   )')─┐
-│ Hello, world!                                 │
-└───────────────────────────────────────────────┘
-```
-
-## trimLeft {#trimleft}
-
-Quita todas las apariciones consecutivas de espacios en blanco comunes (carácter ASCII 32) desde el principio de una cadena. No elimina otros tipos de caracteres de espacios en blanco (tab, espacio sin interrupción, etc.).
-
-**Sintaxis**
-
-``` sql
-trimLeft(input_string)
-```
-
-Apodo: `ltrim(input_string)`.
-
-**Parámetros**
-
--   `input_string` — string to trim. [Cadena](../../sql-reference/data-types/string.md).
-
-**Valor devuelto**
-
-Una cadena sin espacios en blanco comunes iniciales.
-
-Tipo: `String`.
-
-**Ejemplo**
-
-Consulta:
-
-``` sql
-SELECT trimLeft('     Hello, world!     ')
-```
-
-Resultado:
-
-``` text
-┌─trimLeft('     Hello, world!     ')─┐
-│ Hello, world!                       │
-└─────────────────────────────────────┘
-```
-
-## trimRight {#trimright}
-
-Quita todas las apariciones consecutivas de espacios en blanco comunes (carácter ASCII 32) del final de una cadena. No elimina otros tipos de caracteres de espacios en blanco (tab, espacio sin interrupción, etc.).
-
-**Sintaxis**
-
-``` sql
-trimRight(input_string)
-```
-
-Apodo: `rtrim(input_string)`.
-
-**Parámetros**
-
--   `input_string` — string to trim. [Cadena](../../sql-reference/data-types/string.md).
-
-**Valor devuelto**
-
-Una cadena sin espacios en blanco comunes finales.
-
-Tipo: `String`.
-
-**Ejemplo**
-
-Consulta:
-
-``` sql
-SELECT trimRight('     Hello, world!     ')
-```
-
-Resultado:
-
-``` text
-┌─trimRight('     Hello, world!     ')─┐
-│      Hello, world!                   │
-└──────────────────────────────────────┘
-```
-
-## AjusteTanto {#trimboth}
-
-Quita todas las apariciones consecutivas de espacios en blanco comunes (carácter ASCII 32) de ambos extremos de una cadena. No elimina otros tipos de caracteres de espacios en blanco (tab, espacio sin interrupción, etc.).
-
-**Sintaxis**
-
-``` sql
-trimBoth(input_string)
-```
-
-Apodo: `trim(input_string)`.
-
-**Parámetros**
-
--   `input_string` — string to trim. [Cadena](../../sql-reference/data-types/string.md).
-
-**Valor devuelto**
-
-Una cadena sin espacios en blanco comunes iniciales y finales.
-
-Tipo: `String`.
-
-**Ejemplo**
-
-Consulta:
-
-``` sql
-SELECT trimBoth('     Hello, world!     ')
-```
-
-Resultado:
-
-``` text
-┌─trimBoth('     Hello, world!     ')─┐
-│ Hello, world!                       │
-└─────────────────────────────────────┘
-```
-
-## CRC32(s)) {#crc32}
-
-Devuelve la suma de comprobación CRC32 de una cadena, utilizando el polinomio CRC-32-IEEE 802.3 y el valor inicial `0xffffffff` (implementación zlib).
-
-El tipo de resultado es UInt32.
-
-## CRC32IEEE(s) {#crc32ieee}
-
-Devuelve la suma de comprobación CRC32 de una cadena, utilizando el polinomio CRC-32-IEEE 802.3.
-
-El tipo de resultado es UInt32.
-
-## CRC64(s)) {#crc64}
-
-Devuelve la suma de comprobación CRC64 de una cadena, utilizando el polinomio CRC-64-ECMA.
-
-El tipo de resultado es UInt64.
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/functions/string_functions/) <!--hide-->
diff --git a/docs/es/sql-reference/functions/string-replace-functions.md b/docs/es/sql-reference/functions/string-replace-functions.md
deleted file mode 100644
index 979d16d842b..00000000000
--- a/docs/es/sql-reference/functions/string-replace-functions.md
+++ /dev/null
@@ -1,94 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 42
-toc_title: Para reemplazar en cadenas
----
-
-# Funciones para buscar y reemplazar en cadenas {#functions-for-searching-and-replacing-in-strings}
-
-## replaceOne(pajar, patrón, reemplazo) {#replaceonehaystack-pattern-replacement}
-
-Sustituye la primera aparición, si existe, de la ‘pattern’ subcadena en ‘haystack’ con el ‘replacement’ subcadena.
-Sucesivo, ‘pattern’ y ‘replacement’ deben ser constantes.
-
-## replaceAll (pajar, patrón, reemplazo), replace (pajar, patrón, reemplazo) {#replaceallhaystack-pattern-replacement-replacehaystack-pattern-replacement}
-
-Sustituye todas las apariciones del ‘pattern’ subcadena en ‘haystack’ con el ‘replacement’ subcadena.
-
-## replaceRegexpOne (pajar, patrón, reemplazo) {#replaceregexponehaystack-pattern-replacement}
-
-Reemplazo usando el ‘pattern’ expresión regular. Una expresión regular re2.
-Sustituye sólo la primera ocurrencia, si existe.
-Un patrón se puede especificar como ‘replacement’. Este patrón puede incluir sustituciones `\0-\9`.
-Sustitución `\0` incluye toda la expresión regular. Sustitución `\1-\9` corresponden a los números de subpatrón. `\` en una plantilla, escapar de ella usando `\`.
-También tenga en cuenta que un literal de cadena requiere un escape adicional.
-
-Ejemplo 1. Conversión de la fecha a formato americano:
-
-``` sql
-SELECT DISTINCT
-    EventDate,
-    replaceRegexpOne(toString(EventDate), '(\\d{4})-(\\d{2})-(\\d{2})', '\\2/\\3/\\1') AS res
-FROM test.hits
-LIMIT 7
-FORMAT TabSeparated
-```
-
-``` text
-2014-03-17      03/17/2014
-2014-03-18      03/18/2014
-2014-03-19      03/19/2014
-2014-03-20      03/20/2014
-2014-03-21      03/21/2014
-2014-03-22      03/22/2014
-2014-03-23      03/23/2014
-```
-
-Ejemplo 2. Copiar una cadena diez veces:
-
-``` sql
-SELECT replaceRegexpOne('Hello, World!', '.*', '\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0') AS res
-```
-
-``` text
-┌─res────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
-│ Hello, World!Hello, World!Hello, World!Hello, World!Hello, World!Hello, World!Hello, World!Hello, World!Hello, World!Hello, World! │
-└────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
-```
-
-## replaceRegexpAll (pajar, patrón, reemplazo) {#replaceregexpallhaystack-pattern-replacement}
-
-Esto hace lo mismo, pero reemplaza todas las ocurrencias. Ejemplo:
-
-``` sql
-SELECT replaceRegexpAll('Hello, World!', '.', '\\0\\0') AS res
-```
-
-``` text
-┌─res────────────────────────┐
-│ HHeelllloo,,  WWoorrlldd!! │
-└────────────────────────────┘
-```
-
-Como excepción, si una expresión regular funcionó en una subcadena vacía, el reemplazo no se realiza más de una vez.
-Ejemplo:
-
-``` sql
-SELECT replaceRegexpAll('Hello, World!', '^', 'here: ') AS res
-```
-
-``` text
-┌─res─────────────────┐
-│ here: Hello, World! │
-└─────────────────────┘
-```
-
-## Sistema abierto.) {#regexpquotemetas}
-
-La función agrega una barra invertida antes de algunos caracteres predefinidos en la cadena.
-Caracteres predefinidos: ‘0’, ‘\\’, ‘\|’, ‘(’, ‘)’, ‘^’, ‘$’, ‘.’, ‘\[’, '\]', ‘?’, '\*‘,’+‘,’{‘,’:‘,’-'.
-Esta implementación difiere ligeramente de re2::RE2::QuoteMeta. Escapa de byte cero como \\0 en lugar de 00 y escapa solo de los caracteres requeridos.
-Para obtener más información, consulte el enlace: [RE2](https://github.com/google/re2/blob/master/re2/re2.cc#L473)
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/functions/string_replace_functions/) <!--hide-->
diff --git a/docs/es/sql-reference/functions/string-search-functions.md b/docs/es/sql-reference/functions/string-search-functions.md
deleted file mode 100644
index c448872a186..00000000000
--- a/docs/es/sql-reference/functions/string-search-functions.md
+++ /dev/null
@@ -1,383 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 41
-toc_title: Para buscar cadenas
----
-
-# Funciones para buscar cadenas {#functions-for-searching-strings}
-
-La búsqueda distingue entre mayúsculas y minúsculas de forma predeterminada en todas estas funciones. Hay variantes separadas para la búsqueda insensible a mayúsculas y minúsculas.
-
-## posición (pajar, aguja), localizar (pajar, aguja) {#position}
-
-Devuelve la posición (en bytes) de la subcadena encontrada en la cadena, comenzando desde 1.
-
-Funciona bajo el supuesto de que la cadena contiene un conjunto de bytes que representan un texto codificado de un solo byte. Si no se cumple esta suposición y un carácter no se puede representar usando un solo byte, la función no lanza una excepción y devuelve algún resultado inesperado. Si el carácter se puede representar usando dos bytes, usará dos bytes y así sucesivamente.
-
-Para una búsqueda sin distinción de mayúsculas y minúsculas, utilice la función [positionCaseInsensitive](#positioncaseinsensitive).
-
-**Sintaxis**
-
-``` sql
-position(haystack, needle[, start_pos])
-```
-
-Apodo: `locate(haystack, needle[, start_pos])`.
-
-**Parámetros**
-
--   `haystack` — string, in which substring will to be searched. [Cadena](../syntax.md#syntax-string-literal).
--   `needle` — substring to be searched. [Cadena](../syntax.md#syntax-string-literal).
--   `start_pos` – Optional parameter, position of the first character in the string to start search. [UInt](../../sql-reference/data-types/int-uint.md)
-
-**Valores devueltos**
-
--   Posición inicial en bytes (contando desde 1), si se encontró subcadena.
--   0, si no se encontró la subcadena.
-
-Tipo: `Integer`.
-
-**Ejemplos**
-
-Frase “Hello, world!” contiene un conjunto de bytes que representan un texto codificado de un solo byte. La función devuelve algún resultado esperado:
-
-Consulta:
-
-``` sql
-SELECT position('Hello, world!', '!')
-```
-
-Resultado:
-
-``` text
-┌─position('Hello, world!', '!')─┐
-│                             13 │
-└────────────────────────────────┘
-```
-
-La misma frase en ruso contiene caracteres que no se pueden representar usando un solo byte. La función devuelve algún resultado inesperado (uso [PosiciónUTF8](#positionutf8) función para texto codificado de varios bytes):
-
-Consulta:
-
-``` sql
-SELECT position('Привет, мир!', '!')
-```
-
-Resultado:
-
-``` text
-┌─position('Привет, мир!', '!')─┐
-│                            21 │
-└───────────────────────────────┘
-```
-
-## positionCaseInsensitive {#positioncaseinsensitive}
-
-Lo mismo que [posición](#position) devuelve la posición (en bytes) de la subcadena encontrada en la cadena, comenzando desde 1. Utilice la función para una búsqueda que no distingue entre mayúsculas y minúsculas.
-
-Funciona bajo el supuesto de que la cadena contiene un conjunto de bytes que representan un texto codificado de un solo byte. Si no se cumple esta suposición y un carácter no se puede representar usando un solo byte, la función no lanza una excepción y devuelve algún resultado inesperado. Si el carácter se puede representar usando dos bytes, usará dos bytes y así sucesivamente.
-
-**Sintaxis**
-
-``` sql
-positionCaseInsensitive(haystack, needle[, start_pos])
-```
-
-**Parámetros**
-
--   `haystack` — string, in which substring will to be searched. [Cadena](../syntax.md#syntax-string-literal).
--   `needle` — substring to be searched. [Cadena](../syntax.md#syntax-string-literal).
--   `start_pos` – Optional parameter, position of the first character in the string to start search. [UInt](../../sql-reference/data-types/int-uint.md)
-
-**Valores devueltos**
-
--   Posición inicial en bytes (contando desde 1), si se encontró subcadena.
--   0, si no se encontró la subcadena.
-
-Tipo: `Integer`.
-
-**Ejemplo**
-
-Consulta:
-
-``` sql
-SELECT positionCaseInsensitive('Hello, world!', 'hello')
-```
-
-Resultado:
-
-``` text
-┌─positionCaseInsensitive('Hello, world!', 'hello')─┐
-│                                                 1 │
-└───────────────────────────────────────────────────┘
-```
-
-## PosiciónUTF8 {#positionutf8}
-
-Devuelve la posición (en puntos Unicode) de la subcadena encontrada en la cadena, comenzando desde 1.
-
-Funciona bajo el supuesto de que la cadena contiene un conjunto de bytes que representan un texto codificado en UTF-8. Si no se cumple esta suposición, la función no produce una excepción y devuelve algún resultado inesperado. Si el carácter se puede representar usando dos puntos Unicode, usará dos y así sucesivamente.
-
-Para una búsqueda sin distinción de mayúsculas y minúsculas, utilice la función [PosiciónCasoInsensitiveUTF8](#positioncaseinsensitiveutf8).
-
-**Sintaxis**
-
-``` sql
-positionUTF8(haystack, needle[, start_pos])
-```
-
-**Parámetros**
-
--   `haystack` — string, in which substring will to be searched. [Cadena](../syntax.md#syntax-string-literal).
--   `needle` — substring to be searched. [Cadena](../syntax.md#syntax-string-literal).
--   `start_pos` – Optional parameter, position of the first character in the string to start search. [UInt](../../sql-reference/data-types/int-uint.md)
-
-**Valores devueltos**
-
--   Posición inicial en puntos Unicode (contando desde 1), si se encontró subcadena.
--   0, si no se encontró la subcadena.
-
-Tipo: `Integer`.
-
-**Ejemplos**
-
-Frase “Hello, world!” en ruso contiene un conjunto de puntos Unicode que representan un texto codificado de un solo punto. La función devuelve algún resultado esperado:
-
-Consulta:
-
-``` sql
-SELECT positionUTF8('Привет, мир!', '!')
-```
-
-Resultado:
-
-``` text
-┌─positionUTF8('Привет, мир!', '!')─┐
-│                                12 │
-└───────────────────────────────────┘
-```
-
-Frase “Salut, étudiante!”, donde el carácter `é` puede ser representado usando un un punto (`U+00E9`) o dos puntos (`U+0065U+0301`) la función se puede devolver algún resultado inesperado:
-
-Consulta de la carta `é`, que se representa un punto Unicode `U+00E9`:
-
-``` sql
-SELECT positionUTF8('Salut, étudiante!', '!')
-```
-
-Resultado:
-
-``` text
-┌─positionUTF8('Salut, étudiante!', '!')─┐
-│                                     17 │
-└────────────────────────────────────────┘
-```
-
-Consulta de la carta `é`, que se representa dos puntos Unicode `U+0065U+0301`:
-
-``` sql
-SELECT positionUTF8('Salut, étudiante!', '!')
-```
-
-Resultado:
-
-``` text
-┌─positionUTF8('Salut, étudiante!', '!')─┐
-│                                     18 │
-└────────────────────────────────────────┘
-```
-
-## PosiciónCasoInsensitiveUTF8 {#positioncaseinsensitiveutf8}
-
-Lo mismo que [PosiciónUTF8](#positionutf8), pero no distingue entre mayúsculas y minúsculas. Devuelve la posición (en puntos Unicode) de la subcadena encontrada en la cadena, comenzando desde 1.
-
-Funciona bajo el supuesto de que la cadena contiene un conjunto de bytes que representan un texto codificado en UTF-8. Si no se cumple esta suposición, la función no produce una excepción y devuelve algún resultado inesperado. Si el carácter se puede representar usando dos puntos Unicode, usará dos y así sucesivamente.
-
-**Sintaxis**
-
-``` sql
-positionCaseInsensitiveUTF8(haystack, needle[, start_pos])
-```
-
-**Parámetros**
-
--   `haystack` — string, in which substring will to be searched. [Cadena](../syntax.md#syntax-string-literal).
--   `needle` — substring to be searched. [Cadena](../syntax.md#syntax-string-literal).
--   `start_pos` – Optional parameter, position of the first character in the string to start search. [UInt](../../sql-reference/data-types/int-uint.md)
-
-**Valor devuelto**
-
--   Posición inicial en puntos Unicode (contando desde 1), si se encontró subcadena.
--   0, si no se encontró la subcadena.
-
-Tipo: `Integer`.
-
-**Ejemplo**
-
-Consulta:
-
-``` sql
-SELECT positionCaseInsensitiveUTF8('Привет, мир!', 'Мир')
-```
-
-Resultado:
-
-``` text
-┌─positionCaseInsensitiveUTF8('Привет, мир!', 'Мир')─┐
-│                                                  9 │
-└────────────────────────────────────────────────────┘
-```
-
-## multiSearchAllPositions {#multisearchallpositions}
-
-Lo mismo que [posición](string-search-functions.md#position) pero devuelve `Array` posiciones (en bytes) de las subcadenas correspondientes encontradas en la cadena. Las posiciones se indexan a partir de 1.
-
-La búsqueda se realiza en secuencias de bytes sin respecto a la codificación de cadenas y la intercalación.
-
--   Para la búsqueda ASCII sin distinción de mayúsculas y minúsculas, utilice la función `multiSearchAllPositionsCaseInsensitive`.
--   Para buscar en UTF-8, use la función [MultiSearchAllPositionsUTF8](#multiSearchAllPositionsUTF8).
--   Para la búsqueda UTF-8 sin distinción de mayúsculas y minúsculas, utilice la función multiSearchAllPositionsCaseInsensitiveUTF8.
-
-**Sintaxis**
-
-``` sql
-multiSearchAllPositions(haystack, [needle1, needle2, ..., needlen])
-```
-
-**Parámetros**
-
--   `haystack` — string, in which substring will to be searched. [Cadena](../syntax.md#syntax-string-literal).
--   `needle` — substring to be searched. [Cadena](../syntax.md#syntax-string-literal).
-
-**Valores devueltos**
-
--   Matriz de posiciones iniciales en bytes (contando desde 1), si se encontró la subcadena correspondiente y 0 si no se encuentra.
-
-**Ejemplo**
-
-Consulta:
-
-``` sql
-SELECT multiSearchAllPositions('Hello, World!', ['hello', '!', 'world'])
-```
-
-Resultado:
-
-``` text
-┌─multiSearchAllPositions('Hello, World!', ['hello', '!', 'world'])─┐
-│ [0,13,0]                                                          │
-└───────────────────────────────────────────────────────────────────┘
-```
-
-## MultiSearchAllPositionsUTF8 {#multiSearchAllPositionsUTF8}
-
-Ver `multiSearchAllPositions`.
-
-## multiSearchFirstPosition(pajar, \[aguja<sub>1</sub>, aguja<sub>2</sub>, …, needle<sub>y</sub>\]) {#multisearchfirstposition}
-
-Lo mismo que `position` pero devuelve el desplazamiento más a la izquierda de la cadena `haystack` que se corresponde con algunas de las agujas.
-
-Para una búsqueda que no distingue entre mayúsculas y minúsculas o / y en formato UTF-8, use funciones `multiSearchFirstPositionCaseInsensitive, multiSearchFirstPositionUTF8, multiSearchFirstPositionCaseInsensitiveUTF8`.
-
-## multiSearchFirstIndex(pajar, \[aguja<sub>1</sub>, aguja<sub>2</sub>, …, needle<sub>y</sub>\]) {#multisearchfirstindexhaystack-needle1-needle2-needlen}
-
-Devuelve el índice `i` (a partir de 1) de la aguja encontrada más a la izquierda<sub>me</sub> en la cadena `haystack` y 0 de lo contrario.
-
-Para una búsqueda que no distingue entre mayúsculas y minúsculas o / y en formato UTF-8, use funciones `multiSearchFirstIndexCaseInsensitive, multiSearchFirstIndexUTF8, multiSearchFirstIndexCaseInsensitiveUTF8`.
-
-## multiSearchAny(pajar, \[aguja<sub>1</sub>, aguja<sub>2</sub>, …, needle<sub>y</sub>\]) {#function-multisearchany}
-
-Devuelve 1, si al menos una aguja de cuerda<sub>me</sub> coincide con la cadena `haystack` y 0 de lo contrario.
-
-Para una búsqueda que no distingue entre mayúsculas y minúsculas o / y en formato UTF-8, use funciones `multiSearchAnyCaseInsensitive, multiSearchAnyUTF8, multiSearchAnyCaseInsensitiveUTF8`.
-
-!!! note "Nota"
-    En todos `multiSearch*` el número de agujas debe ser inferior a 2<sup>8</sup> debido a la especificación de implementación.
-
-## match (pajar, patrón) {#matchhaystack-pattern}
-
-Comprueba si la cadena coincide con la `pattern` expresión regular. Un `re2` expresión regular. El [sintaxis](https://github.com/google/re2/wiki/Syntax) de la `re2` expresiones regulares es más limitada que la sintaxis de las expresiones regulares de Perl.
-
-Devuelve 0 si no coincide, o 1 si coincide.
-
-Tenga en cuenta que el símbolo de barra invertida (`\`) se utiliza para escapar en la expresión regular. El mismo símbolo se usa para escapar en literales de cadena. Por lo tanto, para escapar del símbolo en una expresión regular, debe escribir dos barras invertidas (\\) en un literal de cadena.
-
-La expresión regular funciona con la cadena como si fuera un conjunto de bytes. La expresión regular no puede contener bytes nulos.
-Para que los patrones busquen subcadenas en una cadena, es mejor usar LIKE o ‘position’, ya que trabajan mucho más rápido.
-
-## multiMatchAny(pajar, \[patrón<sub>1</sub>, patrón<sub>2</sub>, …, pattern<sub>y</sub>\]) {#multimatchanyhaystack-pattern1-pattern2-patternn}
-
-Lo mismo que `match`, pero devuelve 0 si ninguna de las expresiones regulares coincide y 1 si alguno de los patrones coincide. Se utiliza [hyperscan](https://github.com/intel/hyperscan) biblioteca. Para que los patrones busquen subcadenas en una cadena, es mejor usar `multiSearchAny` ya que funciona mucho más rápido.
-
-!!! note "Nota"
-    La longitud de cualquiera de los `haystack` cadena debe ser inferior a 2<sup>32</sup> bytes de lo contrario, se lanza la excepción. Esta restricción tiene lugar debido a la API de hiperscan.
-
-## multiMatchAnyIndex(pajar, \[patrón<sub>1</sub>, patrón<sub>2</sub>, …, pattern<sub>y</sub>\]) {#multimatchanyindexhaystack-pattern1-pattern2-patternn}
-
-Lo mismo que `multiMatchAny`, pero devuelve cualquier índice que coincida con el pajar.
-
-## ¿Cómo puedo obtener más información?<sub>1</sub>, patrón<sub>2</sub>, …, pattern<sub>y</sub>\]) {#multimatchallindiceshaystack-pattern1-pattern2-patternn}
-
-Lo mismo que `multiMatchAny`, pero devuelve la matriz de todas las indicaciones que coinciden con el pajar en cualquier orden.
-
-## multiFuzzyMatchAny(pajar, distancia, \[patrón<sub>1</sub>, patrón<sub>2</sub>, …, pattern<sub>y</sub>\]) {#multifuzzymatchanyhaystack-distance-pattern1-pattern2-patternn}
-
-Lo mismo que `multiMatchAny`, pero devuelve 1 si algún patrón coincide con el pajar dentro de una constante [editar distancia](https://en.wikipedia.org/wiki/Edit_distance). Esta función también está en modo experimental y puede ser extremadamente lenta. Para obtener más información, consulte [documentación de hyperscan](https://intel.github.io/hyperscan/dev-reference/compilation.html#approximate-matching).
-
-## multiFuzzyMatchAnyIndex(pajar, distancia, \[patrón<sub>1</sub>, patrón<sub>2</sub>, …, pattern<sub>y</sub>\]) {#multifuzzymatchanyindexhaystack-distance-pattern1-pattern2-patternn}
-
-Lo mismo que `multiFuzzyMatchAny`, pero devuelve cualquier índice que coincida con el pajar dentro de una distancia de edición constante.
-
-## multiFuzzyMatchAllIndices(pajar, distancia, \[patrón<sub>1</sub>, patrón<sub>2</sub>, …, pattern<sub>y</sub>\]) {#multifuzzymatchallindiceshaystack-distance-pattern1-pattern2-patternn}
-
-Lo mismo que `multiFuzzyMatchAny`, pero devuelve la matriz de todos los índices en cualquier orden que coincida con el pajar dentro de una distancia de edición constante.
-
-!!! note "Nota"
-    `multiFuzzyMatch*` las funciones no admiten expresiones regulares UTF-8, y dichas expresiones se tratan como bytes debido a la restricción de hiperscan.
-
-!!! note "Nota"
-    Para desactivar todas las funciones que utilizan hyperscan, utilice la configuración `SET allow_hyperscan = 0;`.
-
-## extracto(pajar, patrón) {#extracthaystack-pattern}
-
-Extrae un fragmento de una cadena utilizando una expresión regular. Si ‘haystack’ no coincide con el ‘pattern’ regex, se devuelve una cadena vacía. Si la expresión regular no contiene subpatrones, toma el fragmento que coincide con toda la expresión regular. De lo contrario, toma el fragmento que coincide con el primer subpatrón.
-
-## extractAll(pajar, patrón) {#extractallhaystack-pattern}
-
-Extrae todos los fragmentos de una cadena utilizando una expresión regular. Si ‘haystack’ no coincide con el ‘pattern’ regex, se devuelve una cadena vacía. Devuelve una matriz de cadenas que consiste en todas las coincidencias con la expresión regular. En general, el comportamiento es el mismo que el ‘extract’ función (toma el primer subpatrón, o la expresión completa si no hay un subpatrón).
-
-## como (pajar, patrón), operador de patrón COMO pajar {#function-like}
-
-Comprueba si una cadena coincide con una expresión regular simple.
-La expresión regular puede contener los metasímbolos `%` y `_`.
-
-`%` indica cualquier cantidad de bytes (incluidos cero caracteres).
-
-`_` indica cualquier byte.
-
-Utilice la barra invertida (`\`) para escapar de metasímbolos. Vea la nota sobre el escape en la descripción del ‘match’ función.
-
-Para expresiones regulares como `%needle%`, el código es más óptimo y trabaja tan rápido como el `position` función.
-Para otras expresiones regulares, el código es el mismo que para ‘match’ función.
-
-## notLike(haystack, pattern), haystack NOT LIKE operador de patrón {#function-notlike}
-
-Lo mismo que ‘like’ pero negativo.
-
-## ngramDistance(pajar, aguja) {#ngramdistancehaystack-needle}
-
-Calcula la distancia de 4 gramos entre `haystack` y `needle`: counts the symmetric difference between two multisets of 4-grams and normalizes it by the sum of their cardinalities. Returns float number from 0 to 1 – the closer to zero, the more strings are similar to each other. If the constant `needle` o `haystack` es más de 32Kb, arroja una excepción. Si algunos de los no constantes `haystack` o `needle` Las cadenas son más de 32Kb, la distancia es siempre una.
-
-Para la búsqueda sin distinción de mayúsculas y minúsculas o / y en formato UTF-8, use funciones `ngramDistanceCaseInsensitive, ngramDistanceUTF8, ngramDistanceCaseInsensitiveUTF8`.
-
-## ngramSearch(pajar, aguja) {#ngramsearchhaystack-needle}
-
-Lo mismo que `ngramDistance` pero calcula la diferencia no simétrica entre `needle` y `haystack` – the number of n-grams from needle minus the common number of n-grams normalized by the number of `needle` n-gramas. Cuanto más cerca de uno, más probable es `needle` está en el `haystack`. Puede ser útil para la búsqueda de cadenas difusas.
-
-Para la búsqueda sin distinción de mayúsculas y minúsculas o / y en formato UTF-8, use funciones `ngramSearchCaseInsensitive, ngramSearchUTF8, ngramSearchCaseInsensitiveUTF8`.
-
-!!! note "Nota"
-    For UTF-8 case we use 3-gram distance. All these are not perfectly fair n-gram distances. We use 2-byte hashes to hash n-grams and then calculate the (non-)symmetric difference between these hash tables – collisions may occur. With UTF-8 case-insensitive format we do not use fair `tolower` function – we zero the 5-th bit (starting from zero) of each codepoint byte and first bit of zeroth byte if bytes more than one – this works for Latin and mostly for all Cyrillic letters.
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/functions/string_search_functions/) <!--hide-->
diff --git a/docs/es/sql-reference/functions/type-conversion-functions.md b/docs/es/sql-reference/functions/type-conversion-functions.md
deleted file mode 100644
index d5e41ee0e52..00000000000
--- a/docs/es/sql-reference/functions/type-conversion-functions.md
+++ /dev/null
@@ -1,534 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 38
-toc_title: "Conversi\xF3n de tipo"
----
-
-# Funciones de conversión de tipos {#type-conversion-functions}
-
-## Problemas comunes de conversiones numéricas {#numeric-conversion-issues}
-
-Cuando convierte un valor de uno a otro tipo de datos, debe recordar que, en un caso común, es una operación insegura que puede provocar una pérdida de datos. Puede producirse una pérdida de datos si intenta ajustar el valor de un tipo de datos más grande a un tipo de datos más pequeño, o si convierte valores entre diferentes tipos de datos.
-
-ClickHouse tiene el [mismo comportamiento que los programas de C++](https://en.cppreference.com/w/cpp/language/implicit_conversion).
-
-## ¿Cómo puedo obtener más información?) {#toint8163264}
-
-Convierte un valor de entrada en el [En](../../sql-reference/data-types/int-uint.md) tipo de datos. Esta familia de funciones incluye:
-
--   `toInt8(expr)` — Results in the `Int8` tipo de datos.
--   `toInt16(expr)` — Results in the `Int16` tipo de datos.
--   `toInt32(expr)` — Results in the `Int32` tipo de datos.
--   `toInt64(expr)` — Results in the `Int64` tipo de datos.
-
-**Parámetros**
-
--   `expr` — [Expresion](../syntax.md#syntax-expressions) devolviendo un número o una cadena con la representación decimal de un número. No se admiten representaciones binarias, octales y hexadecimales de números. Los ceros principales son despojados.
-
-**Valor devuelto**
-
-Valor entero en el `Int8`, `Int16`, `Int32`, o `Int64` tipo de datos.
-
-Funciones de uso [redondeando hacia cero](https://en.wikipedia.org/wiki/Rounding#Rounding_towards_zero), lo que significa que truncan dígitos fraccionarios de números.
-
-El comportamiento de las funciones [NaN y Inf](../../sql-reference/data-types/float.md#data_type-float-nan-inf) los argumentos no están definidos. Recuerde acerca de [problemas de conversión numérica](#numeric-conversion-issues), al usar las funciones.
-
-**Ejemplo**
-
-``` sql
-SELECT toInt64(nan), toInt32(32), toInt16('16'), toInt8(8.8)
-```
-
-``` text
-┌─────────toInt64(nan)─┬─toInt32(32)─┬─toInt16('16')─┬─toInt8(8.8)─┐
-│ -9223372036854775808 │          32 │            16 │           8 │
-└──────────────────────┴─────────────┴───────────────┴─────────────┘
-```
-
-## ¿Cómo puedo obtener más información? {#toint8163264orzero}
-
-Toma un argumento de tipo String e intenta analizarlo en Int (8 \| 16 \| 32 \| 64). Si falla, devuelve 0.
-
-**Ejemplo**
-
-``` sql
-select toInt64OrZero('123123'), toInt8OrZero('123qwe123')
-```
-
-``` text
-┌─toInt64OrZero('123123')─┬─toInt8OrZero('123qwe123')─┐
-│                  123123 │                         0 │
-└─────────────────────────┴───────────────────────────┘
-```
-
-## ¿Cómo puedo hacerlo? {#toint8163264ornull}
-
-Toma un argumento de tipo String e intenta analizarlo en Int (8 \| 16 \| 32 \| 64). Si falla, devuelve NULL.
-
-**Ejemplo**
-
-``` sql
-select toInt64OrNull('123123'), toInt8OrNull('123qwe123')
-```
-
-``` text
-┌─toInt64OrNull('123123')─┬─toInt8OrNull('123qwe123')─┐
-│                  123123 │                      ᴺᵁᴸᴸ │
-└─────────────────────────┴───────────────────────────┘
-```
-
-## ¿Cómo puedo obtener más información?) {#touint8163264}
-
-Convierte un valor de entrada en el [UInt](../../sql-reference/data-types/int-uint.md) tipo de datos. Esta familia de funciones incluye:
-
--   `toUInt8(expr)` — Results in the `UInt8` tipo de datos.
--   `toUInt16(expr)` — Results in the `UInt16` tipo de datos.
--   `toUInt32(expr)` — Results in the `UInt32` tipo de datos.
--   `toUInt64(expr)` — Results in the `UInt64` tipo de datos.
-
-**Parámetros**
-
--   `expr` — [Expresion](../syntax.md#syntax-expressions) devolviendo un número o una cadena con la representación decimal de un número. No se admiten representaciones binarias, octales y hexadecimales de números. Los ceros principales son despojados.
-
-**Valor devuelto**
-
-Valor entero en el `UInt8`, `UInt16`, `UInt32`, o `UInt64` tipo de datos.
-
-Funciones de uso [redondeando hacia cero](https://en.wikipedia.org/wiki/Rounding#Rounding_towards_zero), lo que significa que truncan dígitos fraccionarios de números.
-
-El comportamiento de las funciones para los instrumentos negativos y para [NaN y Inf](../../sql-reference/data-types/float.md#data_type-float-nan-inf) los argumentos no están definidos. Si pasa una cadena con un número negativo, por ejemplo `'-32'`, ClickHouse genera una excepción. Recuerde acerca de [problemas de conversión numérica](#numeric-conversion-issues), al usar las funciones.
-
-**Ejemplo**
-
-``` sql
-SELECT toUInt64(nan), toUInt32(-32), toUInt16('16'), toUInt8(8.8)
-```
-
-``` text
-┌───────toUInt64(nan)─┬─toUInt32(-32)─┬─toUInt16('16')─┬─toUInt8(8.8)─┐
-│ 9223372036854775808 │    4294967264 │             16 │            8 │
-└─────────────────────┴───────────────┴────────────────┴──────────────┘
-```
-
-## ¿Cómo puedo obtener más información? {#touint8163264orzero}
-
-## ¿Cómo puedo hacerlo? {#touint8163264ornull}
-
-## ¿Cómo puedo obtener más información?) {#tofloat3264}
-
-## ¿Cómo puedo hacerlo? {#tofloat3264orzero}
-
-## ¿Cómo puedo hacerlo? {#tofloat3264ornull}
-
-## Fecha {#todate}
-
-## Todos los derechos reservados {#todateorzero}
-
-## ToDateOrNull {#todateornull}
-
-## toDateTime {#todatetime}
-
-## ToDateTimeOrZero {#todatetimeorzero}
-
-## ToDateTimeOrNull {#todatetimeornull}
-
-## toDecimal(32/64/128) {#todecimal3264128}
-
-Convertir `value` a la [Decimal](../../sql-reference/data-types/decimal.md) tipo de datos con precisión de `S`. El `value` puede ser un número o una cadena. El `S` (escala) parámetro especifica el número de decimales.
-
--   `toDecimal32(value, S)`
--   `toDecimal64(value, S)`
--   `toDecimal128(value, S)`
-
-## ¿Cómo puedo hacer esto? {#todecimal3264128ornull}
-
-Convierte una cadena de entrada en un [Información detallada))](../../sql-reference/data-types/decimal.md) valor de tipo de datos. Esta familia de funciones incluye:
-
--   `toDecimal32OrNull(expr, S)` — Results in `Nullable(Decimal32(S))` tipo de datos.
--   `toDecimal64OrNull(expr, S)` — Results in `Nullable(Decimal64(S))` tipo de datos.
--   `toDecimal128OrNull(expr, S)` — Results in `Nullable(Decimal128(S))` tipo de datos.
-
-Estas funciones deben usarse en lugar de `toDecimal*()` funciones, si usted prefiere conseguir un `NULL` valor de entrada en lugar de una excepción en el caso de un error de análisis de valor de entrada.
-
-**Parámetros**
-
--   `expr` — [Expresion](../syntax.md#syntax-expressions), devuelve un valor en el [Cadena](../../sql-reference/data-types/string.md) tipo de datos. ClickHouse espera la representación textual del número decimal. Por ejemplo, `'1.111'`.
--   `S` — Scale, the number of decimal places in the resulting value.
-
-**Valor devuelto**
-
-Un valor en el `Nullable(Decimal(P,S))` tipo de datos. El valor contiene:
-
--   Número con `S` lugares decimales, si ClickHouse interpreta la cadena de entrada como un número.
--   `NULL`, si ClickHouse no puede interpretar la cadena de entrada como un número o si el número de entrada contiene más de `S` lugares decimales.
-
-**Ejemplos**
-
-``` sql
-SELECT toDecimal32OrNull(toString(-1.111), 5) AS val, toTypeName(val)
-```
-
-``` text
-┌──────val─┬─toTypeName(toDecimal32OrNull(toString(-1.111), 5))─┐
-│ -1.11100 │ Nullable(Decimal(9, 5))                            │
-└──────────┴────────────────────────────────────────────────────┘
-```
-
-``` sql
-SELECT toDecimal32OrNull(toString(-1.111), 2) AS val, toTypeName(val)
-```
-
-``` text
-┌──val─┬─toTypeName(toDecimal32OrNull(toString(-1.111), 2))─┐
-│ ᴺᵁᴸᴸ │ Nullable(Decimal(9, 2))                            │
-└──────┴────────────────────────────────────────────────────┘
-```
-
-## Por ejemplo: {#todecimal3264128orzero}
-
-Convierte un valor de entrada en el [Decimal (P, S)](../../sql-reference/data-types/decimal.md) tipo de datos. Esta familia de funciones incluye:
-
--   `toDecimal32OrZero( expr, S)` — Results in `Decimal32(S)` tipo de datos.
--   `toDecimal64OrZero( expr, S)` — Results in `Decimal64(S)` tipo de datos.
--   `toDecimal128OrZero( expr, S)` — Results in `Decimal128(S)` tipo de datos.
-
-Estas funciones deben usarse en lugar de `toDecimal*()` funciones, si usted prefiere conseguir un `0` valor de entrada en lugar de una excepción en el caso de un error de análisis de valor de entrada.
-
-**Parámetros**
-
--   `expr` — [Expresion](../syntax.md#syntax-expressions), devuelve un valor en el [Cadena](../../sql-reference/data-types/string.md) tipo de datos. ClickHouse espera la representación textual del número decimal. Por ejemplo, `'1.111'`.
--   `S` — Scale, the number of decimal places in the resulting value.
-
-**Valor devuelto**
-
-Un valor en el `Nullable(Decimal(P,S))` tipo de datos. El valor contiene:
-
--   Número con `S` lugares decimales, si ClickHouse interpreta la cadena de entrada como un número.
--   0 con `S` decimales, si ClickHouse no puede interpretar la cadena de entrada como un número o si el número de entrada contiene más de `S` lugares decimales.
-
-**Ejemplo**
-
-``` sql
-SELECT toDecimal32OrZero(toString(-1.111), 5) AS val, toTypeName(val)
-```
-
-``` text
-┌──────val─┬─toTypeName(toDecimal32OrZero(toString(-1.111), 5))─┐
-│ -1.11100 │ Decimal(9, 5)                                      │
-└──────────┴────────────────────────────────────────────────────┘
-```
-
-``` sql
-SELECT toDecimal32OrZero(toString(-1.111), 2) AS val, toTypeName(val)
-```
-
-``` text
-┌──val─┬─toTypeName(toDecimal32OrZero(toString(-1.111), 2))─┐
-│ 0.00 │ Decimal(9, 2)                                      │
-└──────┴────────────────────────────────────────────────────┘
-```
-
-## ToString {#tostring}
-
-Funciones para convertir entre números, cadenas (pero no cadenas fijas), fechas y fechas con horas.
-Todas estas funciones aceptan un argumento.
-
-Al convertir a o desde una cadena, el valor se formatea o se analiza utilizando las mismas reglas que para el formato TabSeparated (y casi todos los demás formatos de texto). Si la cadena no se puede analizar, se lanza una excepción y se cancela la solicitud.
-
-Al convertir fechas a números o viceversa, la fecha corresponde al número de días desde el comienzo de la época Unix.
-Al convertir fechas con horas a números o viceversa, la fecha con hora corresponde al número de segundos desde el comienzo de la época Unix.
-
-Los formatos de fecha y fecha con hora para las funciones toDate/toDateTime se definen de la siguiente manera:
-
-``` text
-YYYY-MM-DD
-YYYY-MM-DD hh:mm:ss
-```
-
-Como excepción, si convierte de tipos numéricos UInt32, Int32, UInt64 o Int64 a Date, y si el número es mayor o igual que 65536, el número se interpreta como una marca de tiempo Unix (y no como el número de días) y se redondea a la fecha. Esto permite soporte para la ocurrencia común de la escritura ‘toDate(unix_timestamp)’, que de otra manera sería un error y requeriría escribir el más engorroso ‘toDate(toDateTime(unix_timestamp))’.
-
-La conversión entre una fecha y una fecha con la hora se realiza de la manera natural: agregando un tiempo nulo o eliminando el tiempo.
-
-La conversión entre tipos numéricos utiliza las mismas reglas que las asignaciones entre diferentes tipos numéricos en C++.
-
-Además, la función toString del argumento DateTime puede tomar un segundo argumento String que contiene el nombre de la zona horaria. Ejemplo: `Asia/Yekaterinburg` En este caso, la hora se formatea de acuerdo con la zona horaria especificada.
-
-``` sql
-SELECT
-    now() AS now_local,
-    toString(now(), 'Asia/Yekaterinburg') AS now_yekat
-```
-
-``` text
-┌───────────now_local─┬─now_yekat───────────┐
-│ 2016-06-15 00:11:21 │ 2016-06-15 02:11:21 │
-└─────────────────────┴─────────────────────┘
-```
-
-Ver también el `toUnixTimestamp` función.
-
-## ¿Qué puedes encontrar en Neodigit) {#tofixedstrings-n}
-
-Convierte un argumento de tipo String en un tipo FixedString(N) (una cadena con longitud fija N). N debe ser una constante.
-Si la cadena tiene menos bytes que N, se rellena con bytes nulos a la derecha. Si la cadena tiene más bytes que N, se produce una excepción.
-
-## Todos los derechos reservados.) {#tostringcuttozeros}
-
-Acepta un argumento String o FixedString. Devuelve la cadena con el contenido truncado en el primer byte cero encontrado.
-
-Ejemplo:
-
-``` sql
-SELECT toFixedString('foo', 8) AS s, toStringCutToZero(s) AS s_cut
-```
-
-``` text
-┌─s─────────────┬─s_cut─┐
-│ foo\0\0\0\0\0 │ foo   │
-└───────────────┴───────┘
-```
-
-``` sql
-SELECT toFixedString('foo\0bar', 8) AS s, toStringCutToZero(s) AS s_cut
-```
-
-``` text
-┌─s──────────┬─s_cut─┐
-│ foo\0bar\0 │ foo   │
-└────────────┴───────┘
-```
-
-## ¿Cómo puedo obtener más información?) {#reinterpretasuint8163264}
-
-## ¿Cómo puedo obtener más información?) {#reinterpretasint8163264}
-
-## ¿Cómo puedo obtener más información?) {#reinterpretasfloat3264}
-
-## reinterpretAsDate {#reinterpretasdate}
-
-## reinterpretAsDateTime {#reinterpretasdatetime}
-
-Estas funciones aceptan una cadena e interpretan los bytes colocados al principio de la cadena como un número en orden de host (little endian). Si la cadena no es lo suficientemente larga, las funciones funcionan como si la cadena estuviera rellenada con el número necesario de bytes nulos. Si la cadena es más larga de lo necesario, se ignoran los bytes adicionales. Una fecha se interpreta como el número de días desde el comienzo de la época Unix, y una fecha con hora se interpreta como el número de segundos desde el comienzo de la época Unix.
-
-## reinterpretAsString {#type_conversion_functions-reinterpretAsString}
-
-Esta función acepta un número o fecha o fecha con hora, y devuelve una cadena que contiene bytes que representan el valor correspondiente en orden de host (little endian). Los bytes nulos se eliminan desde el final. Por ejemplo, un valor de tipo UInt32 de 255 es una cadena que tiene un byte de longitud.
-
-## reinterpretAsFixedString {#reinterpretasfixedstring}
-
-Esta función acepta un número o fecha o fecha con hora, y devuelve un FixedString que contiene bytes que representan el valor correspondiente en orden de host (little endian). Los bytes nulos se eliminan desde el final. Por ejemplo, un valor de tipo UInt32 de 255 es un FixedString que tiene un byte de longitud.
-
-## CAST(x, T) {#type_conversion_function-cast}
-
-Convertir ‘x’ a la ‘t’ tipo de datos. La sintaxis CAST(x AS t) también es compatible.
-
-Ejemplo:
-
-``` sql
-SELECT
-    '2016-06-15 23:00:00' AS timestamp,
-    CAST(timestamp AS DateTime) AS datetime,
-    CAST(timestamp AS Date) AS date,
-    CAST(timestamp, 'String') AS string,
-    CAST(timestamp, 'FixedString(22)') AS fixed_string
-```
-
-``` text
-┌─timestamp───────────┬────────────datetime─┬───────date─┬─string──────────────┬─fixed_string──────────────┐
-│ 2016-06-15 23:00:00 │ 2016-06-15 23:00:00 │ 2016-06-15 │ 2016-06-15 23:00:00 │ 2016-06-15 23:00:00\0\0\0 │
-└─────────────────────┴─────────────────────┴────────────┴─────────────────────┴───────────────────────────┘
-```
-
-La conversión a FixedString(N) solo funciona para argumentos de tipo String o FixedString(N).
-
-Conversión de tipo a [NULL](../../sql-reference/data-types/nullable.md) y la espalda es compatible. Ejemplo:
-
-``` sql
-SELECT toTypeName(x) FROM t_null
-```
-
-``` text
-┌─toTypeName(x)─┐
-│ Int8          │
-│ Int8          │
-└───────────────┘
-```
-
-``` sql
-SELECT toTypeName(CAST(x, 'Nullable(UInt16)')) FROM t_null
-```
-
-``` text
-┌─toTypeName(CAST(x, 'Nullable(UInt16)'))─┐
-│ Nullable(UInt16)                        │
-│ Nullable(UInt16)                        │
-└─────────────────────────────────────────┘
-```
-
-## toInterval(Year\|Quarter\|Month\|Week\|Day\|Hour\|Minute\|Second) {#function-tointerval}
-
-Convierte un argumento de tipo Number en un [Intervalo](../../sql-reference/data-types/special-data-types/interval.md) tipo de datos.
-
-**Sintaxis**
-
-``` sql
-toIntervalSecond(number)
-toIntervalMinute(number)
-toIntervalHour(number)
-toIntervalDay(number)
-toIntervalWeek(number)
-toIntervalMonth(number)
-toIntervalQuarter(number)
-toIntervalYear(number)
-```
-
-**Parámetros**
-
--   `number` — Duration of interval. Positive integer number.
-
-**Valores devueltos**
-
--   El valor en `Interval` tipo de datos.
-
-**Ejemplo**
-
-``` sql
-WITH
-    toDate('2019-01-01') AS date,
-    INTERVAL 1 WEEK AS interval_week,
-    toIntervalWeek(1) AS interval_to_week
-SELECT
-    date + interval_week,
-    date + interval_to_week
-```
-
-``` text
-┌─plus(date, interval_week)─┬─plus(date, interval_to_week)─┐
-│                2019-01-08 │                   2019-01-08 │
-└───────────────────────────┴──────────────────────────────┘
-```
-
-## parseDateTimeBestEffort {#parsedatetimebesteffort}
-
-Convierte una fecha y una hora en el [Cadena](../../sql-reference/data-types/string.md) representación a [FechaHora](../../sql-reference/data-types/datetime.md#data_type-datetime) tipo de datos.
-
-La función analiza [ISO 8601](https://en.wikipedia.org/wiki/ISO_8601), [RFC 1123 - 5.2.14 RFC-822 Especificación de fecha y hora](https://tools.ietf.org/html/rfc1123#page-55), ClickHouse y algunos otros formatos de fecha y hora.
-
-**Sintaxis**
-
-``` sql
-parseDateTimeBestEffort(time_string [, time_zone]);
-```
-
-**Parámetros**
-
--   `time_string` — String containing a date and time to convert. [Cadena](../../sql-reference/data-types/string.md).
--   `time_zone` — Time zone. The function parses `time_string` según la zona horaria. [Cadena](../../sql-reference/data-types/string.md).
-
-**Formatos no estándar admitidos**
-
--   Una cadena que contiene 9..10 dígitos [marca de tiempo unix](https://en.wikipedia.org/wiki/Unix_time).
--   Una cadena con un componente de fecha y hora: `YYYYMMDDhhmmss`, `DD/MM/YYYY hh:mm:ss`, `DD-MM-YY hh:mm`, `YYYY-MM-DD hh:mm:ss`, sucesivamente.
--   Una cadena con una fecha, pero sin componente de hora: `YYYY`, `YYYYMM`, `YYYY*MM`, `DD/MM/YYYY`, `DD-MM-YY` sucesivamente.
--   Una cadena con un día y una hora: `DD`, `DD hh`, `DD hh:mm`. En este caso `YYYY-MM` se sustituyen como `2000-01`.
--   Una cadena que incluye la fecha y la hora junto con la información de desplazamiento de zona horaria: `YYYY-MM-DD hh:mm:ss ±h:mm`, sucesivamente. Por ejemplo, `2020-12-12 17:36:00 -5:00`.
-
-Para todos los formatos con separador, la función analiza los nombres de meses expresados por su nombre completo o por las primeras tres letras de un nombre de mes. Ejemplos: `24/DEC/18`, `24-Dec-18`, `01-September-2018`.
-
-**Valor devuelto**
-
--   `time_string` convertido a la `DateTime` tipo de datos.
-
-**Ejemplos**
-
-Consulta:
-
-``` sql
-SELECT parseDateTimeBestEffort('12/12/2020 12:12:57')
-AS parseDateTimeBestEffort;
-```
-
-Resultado:
-
-``` text
-┌─parseDateTimeBestEffort─┐
-│     2020-12-12 12:12:57 │
-└─────────────────────────┘
-```
-
-Consulta:
-
-``` sql
-SELECT parseDateTimeBestEffort('Sat, 18 Aug 2018 07:22:16 GMT', 'Europe/Moscow')
-AS parseDateTimeBestEffort
-```
-
-Resultado:
-
-``` text
-┌─parseDateTimeBestEffort─┐
-│     2018-08-18 10:22:16 │
-└─────────────────────────┘
-```
-
-Consulta:
-
-``` sql
-SELECT parseDateTimeBestEffort('1284101485')
-AS parseDateTimeBestEffort
-```
-
-Resultado:
-
-``` text
-┌─parseDateTimeBestEffort─┐
-│     2015-07-07 12:04:41 │
-└─────────────────────────┘
-```
-
-Consulta:
-
-``` sql
-SELECT parseDateTimeBestEffort('2018-12-12 10:12:12')
-AS parseDateTimeBestEffort
-```
-
-Resultado:
-
-``` text
-┌─parseDateTimeBestEffort─┐
-│     2018-12-12 10:12:12 │
-└─────────────────────────┘
-```
-
-Consulta:
-
-``` sql
-SELECT parseDateTimeBestEffort('10 20:19')
-```
-
-Resultado:
-
-``` text
-┌─parseDateTimeBestEffort('10 20:19')─┐
-│                 2000-01-10 20:19:00 │
-└─────────────────────────────────────┘
-```
-
-**Ver también**
-
--   \[Anuncio de ISO 8601 por @xkcd¿Por qué?/)
--   [RFC 1123](https://tools.ietf.org/html/rfc1123)
--   [Fecha](#todate)
--   [toDateTime](#todatetime)
-
-## parseDateTimeBestEffortOrNull {#parsedatetimebesteffortornull}
-
-Lo mismo que para [parseDateTimeBestEffort](#parsedatetimebesteffort) excepto que devuelve null cuando encuentra un formato de fecha que no se puede procesar.
-
-## parseDateTimeBestEffortOrZero {#parsedatetimebesteffortorzero}
-
-Lo mismo que para [parseDateTimeBestEffort](#parsedatetimebesteffort) excepto que devuelve una fecha cero o una fecha cero cuando encuentra un formato de fecha que no se puede procesar.
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/functions/type_conversion_functions/) <!--hide-->
diff --git a/docs/es/sql-reference/functions/url-functions.md b/docs/es/sql-reference/functions/url-functions.md
deleted file mode 100644
index de4c32ead2b..00000000000
--- a/docs/es/sql-reference/functions/url-functions.md
+++ /dev/null
@@ -1,209 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 54
-toc_title: Trabajar con URL
----
-
-# Funciones para trabajar con URL {#functions-for-working-with-urls}
-
-Todas estas funciones no siguen el RFC. Se simplifican al máximo para mejorar el rendimiento.
-
-## Funciones que extraen partes de una URL {#functions-that-extract-parts-of-a-url}
-
-Si la parte relevante no está presente en una URL, se devuelve una cadena vacía.
-
-### protocolo {#protocol}
-
-Extrae el protocolo de una URL.
-
-Examples of typical returned values: http, https, ftp, mailto, tel, magnet…
-
-### dominio {#domain}
-
-Extrae el nombre de host de una dirección URL.
-
-``` sql
-domain(url)
-```
-
-**Parámetros**
-
--   `url` — URL. Type: [Cadena](../../sql-reference/data-types/string.md).
-
-La URL se puede especificar con o sin un esquema. Ejemplos:
-
-``` text
-svn+ssh://some.svn-hosting.com:80/repo/trunk
-some.svn-hosting.com:80/repo/trunk
-https://yandex.com/time/
-```
-
-Para estos ejemplos, el `domain` función devuelve los siguientes resultados:
-
-``` text
-some.svn-hosting.com
-some.svn-hosting.com
-yandex.com
-```
-
-**Valores devueltos**
-
--   Nombre de host. Si ClickHouse puede analizar la cadena de entrada como una URL.
--   Cadena vacía. Si ClickHouse no puede analizar la cadena de entrada como una URL.
-
-Tipo: `String`.
-
-**Ejemplo**
-
-``` sql
-SELECT domain('svn+ssh://some.svn-hosting.com:80/repo/trunk')
-```
-
-``` text
-┌─domain('svn+ssh://some.svn-hosting.com:80/repo/trunk')─┐
-│ some.svn-hosting.com                                   │
-└────────────────────────────────────────────────────────┘
-```
-
-### Nuestros servicios {#domainwithoutwww}
-
-Devuelve el dominio y no elimina más de uno ‘www.’ desde el principio de la misma, si está presente.
-
-### topLevelDomain {#topleveldomain}
-
-Extrae el dominio de nivel superior de una URL.
-
-``` sql
-topLevelDomain(url)
-```
-
-**Parámetros**
-
--   `url` — URL. Type: [Cadena](../../sql-reference/data-types/string.md).
-
-La URL se puede especificar con o sin un esquema. Ejemplos:
-
-``` text
-svn+ssh://some.svn-hosting.com:80/repo/trunk
-some.svn-hosting.com:80/repo/trunk
-https://yandex.com/time/
-```
-
-**Valores devueltos**
-
--   Nombre de dominio. Si ClickHouse puede analizar la cadena de entrada como una URL.
--   Cadena vacía. Si ClickHouse no puede analizar la cadena de entrada como una URL.
-
-Tipo: `String`.
-
-**Ejemplo**
-
-``` sql
-SELECT topLevelDomain('svn+ssh://www.some.svn-hosting.com:80/repo/trunk')
-```
-
-``` text
-┌─topLevelDomain('svn+ssh://www.some.svn-hosting.com:80/repo/trunk')─┐
-│ com                                                                │
-└────────────────────────────────────────────────────────────────────┘
-```
-
-### FirstSignificantSubdomain {#firstsignificantsubdomain}
-
-Devuelve el “first significant subdomain”. Este es un concepto no estándar específico de Yandex.Métrica. El primer subdominio significativo es un dominio de segundo nivel si es ‘com’, ‘net’, ‘org’, o ‘co’. De lo contrario, es un dominio de tercer nivel. Por ejemplo, `firstSignificantSubdomain (‘https://news.yandex.ru/’) = ‘yandex’, firstSignificantSubdomain (‘https://news.yandex.com.tr/’) = ‘yandex’`. La lista de “insignificant” dominios de segundo nivel y otros detalles de implementación pueden cambiar en el futuro.
-
-### cutToFirstSignificantSubdomain {#cuttofirstsignificantsubdomain}
-
-Devuelve la parte del dominio que incluye subdominios de nivel superior “first significant subdomain” (véase la explicación anterior).
-
-Por ejemplo, `cutToFirstSignificantSubdomain('https://news.yandex.com.tr/') = 'yandex.com.tr'`.
-
-### camino {#path}
-
-Devuelve la ruta de acceso. Ejemplo: `/top/news.html` La ruta de acceso no incluye la cadena de consulta.
-
-### pathFull {#pathfull}
-
-Lo mismo que el anterior, pero incluyendo cadena de consulta y fragmento. Ejemplo: /top/news.html?Página = 2 # comentarios
-
-### queryString {#querystring}
-
-Devuelve la cadena de consulta. Ejemplo: page=1&lr=213. query-string no incluye el signo de interrogación inicial, así como # y todo después de #.
-
-### fragmento {#fragment}
-
-Devuelve el identificador de fragmento. el fragmento no incluye el símbolo hash inicial.
-
-### queryStringAndFragment {#querystringandfragment}
-
-Devuelve la cadena de consulta y el identificador de fragmento. Ejemplo: page=1#29390.
-
-### extractURLParameter(URL, nombre) {#extracturlparameterurl-name}
-
-Devuelve el valor de la ‘name’ parámetro en la URL, si está presente. De lo contrario, una cadena vacía. Si hay muchos parámetros con este nombre, devuelve la primera aparición. Esta función funciona bajo el supuesto de que el nombre del parámetro está codificado en la URL exactamente de la misma manera que en el argumento pasado.
-
-### extractURLParameters (URL) {#extracturlparametersurl}
-
-Devuelve una matriz de cadenas name=value correspondientes a los parámetros de URL. Los valores no se decodifican de ninguna manera.
-
-### ExtractURLParameterNames (URL) {#extracturlparameternamesurl}
-
-Devuelve una matriz de cadenas de nombre correspondientes a los nombres de los parámetros de URL. Los valores no se decodifican de ninguna manera.
-
-### URLJerarquía (URL) {#urlhierarchyurl}
-
-Devuelve una matriz que contiene la URL, truncada al final por los símbolos /,? en la ruta y la cadena de consulta. Los caracteres separadores consecutivos se cuentan como uno. El corte se realiza en la posición después de todos los caracteres separadores consecutivos.
-
-### URLPathHierarchy (URL) {#urlpathhierarchyurl}
-
-Lo mismo que el anterior, pero sin el protocolo y el host en el resultado. El elemento / (raíz) no está incluido. Ejemplo: la función se utiliza para implementar informes de árbol de la URL en Yandex. Métrica.
-
-``` text
-URLPathHierarchy('https://example.com/browse/CONV-6788') =
-[
-    '/browse/',
-    '/browse/CONV-6788'
-]
-```
-
-### decodeURLComponent (URL) {#decodeurlcomponenturl}
-
-Devuelve la dirección URL decodificada.
-Ejemplo:
-
-``` sql
-SELECT decodeURLComponent('http://127.0.0.1:8123/?query=SELECT%201%3B') AS DecodedURL;
-```
-
-``` text
-┌─DecodedURL─────────────────────────────┐
-│ http://127.0.0.1:8123/?query=SELECT 1; │
-└────────────────────────────────────────┘
-```
-
-## Funciones que eliminan parte de una URL {#functions-that-remove-part-of-a-url}
-
-Si la URL no tiene nada similar, la URL permanece sin cambios.
-
-### Sistema abierto {#cutwww}
-
-Elimina no más de uno ‘www.’ desde el principio del dominio de la URL, si está presente.
-
-### cutQueryString {#cutquerystring}
-
-Quita la cadena de consulta. El signo de interrogación también se elimina.
-
-### cutFragment {#cutfragment}
-
-Quita el identificador de fragmento. El signo de número también se elimina.
-
-### cutQueryStringAndFragment {#cutquerystringandfragment}
-
-Quita la cadena de consulta y el identificador de fragmento. El signo de interrogación y el signo de número también se eliminan.
-
-### cutURLParameter(URL, nombre) {#cuturlparameterurl-name}
-
-Elimina el ‘name’ Parámetro URL, si está presente. Esta función funciona bajo el supuesto de que el nombre del parámetro está codificado en la URL exactamente de la misma manera que en el argumento pasado.
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/functions/url_functions/) <!--hide-->
diff --git a/docs/es/sql-reference/functions/uuid-functions.md b/docs/es/sql-reference/functions/uuid-functions.md
deleted file mode 100644
index c99e16e17e3..00000000000
--- a/docs/es/sql-reference/functions/uuid-functions.md
+++ /dev/null
@@ -1,122 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 53
-toc_title: Trabajando con UUID
----
-
-# Funciones para trabajar con UUID {#functions-for-working-with-uuid}
-
-Las funciones para trabajar con UUID se enumeran a continuación.
-
-## GenerateUUIDv4 {#uuid-function-generate}
-
-Genera el [UUID](../../sql-reference/data-types/uuid.md) de [versión 4](https://tools.ietf.org/html/rfc4122#section-4.4).
-
-``` sql
-generateUUIDv4()
-```
-
-**Valor devuelto**
-
-El valor de tipo UUID.
-
-**Ejemplo de uso**
-
-En este ejemplo se muestra la creación de una tabla con la columna de tipo UUID e insertar un valor en la tabla.
-
-``` sql
-CREATE TABLE t_uuid (x UUID) ENGINE=TinyLog
-
-INSERT INTO t_uuid SELECT generateUUIDv4()
-
-SELECT * FROM t_uuid
-```
-
-``` text
-┌────────────────────────────────────x─┐
-│ f4bf890f-f9dc-4332-ad5c-0c18e73f28e9 │
-└──────────────────────────────────────┘
-```
-
-## paraUUID (x) {#touuid-x}
-
-Convierte el valor de tipo de cadena en tipo UUID.
-
-``` sql
-toUUID(String)
-```
-
-**Valor devuelto**
-
-El valor de tipo UUID.
-
-**Ejemplo de uso**
-
-``` sql
-SELECT toUUID('61f0c404-5cb3-11e7-907b-a6006ad3dba0') AS uuid
-```
-
-``` text
-┌─────────────────────────────────uuid─┐
-│ 61f0c404-5cb3-11e7-907b-a6006ad3dba0 │
-└──────────────────────────────────────┘
-```
-
-## UUIDStringToNum {#uuidstringtonum}
-
-Acepta una cadena que contiene 36 caracteres en el formato `xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx`, y lo devuelve como un conjunto de bytes en un [Cadena fija (16)](../../sql-reference/data-types/fixedstring.md).
-
-``` sql
-UUIDStringToNum(String)
-```
-
-**Valor devuelto**
-
-Cadena fija (16)
-
-**Ejemplos de uso**
-
-``` sql
-SELECT
-    '612f3c40-5d3b-217e-707b-6a546a3d7b29' AS uuid,
-    UUIDStringToNum(uuid) AS bytes
-```
-
-``` text
-┌─uuid─────────────────────────────────┬─bytes────────────┐
-│ 612f3c40-5d3b-217e-707b-6a546a3d7b29 │ a/<@];!~p{jTj={) │
-└──────────────────────────────────────┴──────────────────┘
-```
-
-## UUIDNumToString {#uuidnumtostring}
-
-Acepta un [Cadena fija (16)](../../sql-reference/data-types/fixedstring.md) valor, y devuelve una cadena que contiene 36 caracteres en formato de texto.
-
-``` sql
-UUIDNumToString(FixedString(16))
-```
-
-**Valor devuelto**
-
-Cadena.
-
-**Ejemplo de uso**
-
-``` sql
-SELECT
-    'a/<@];!~p{jTj={)' AS bytes,
-    UUIDNumToString(toFixedString(bytes, 16)) AS uuid
-```
-
-``` text
-┌─bytes────────────┬─uuid─────────────────────────────────┐
-│ a/<@];!~p{jTj={) │ 612f3c40-5d3b-217e-707b-6a546a3d7b29 │
-└──────────────────┴──────────────────────────────────────┘
-```
-
-## Ver también {#see-also}
-
--   [dictGetUUID](ext-dict-functions.md#ext_dict_functions-other)
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/functions/uuid_function/) <!--hide-->
diff --git a/docs/es/sql-reference/functions/ym-dict-functions.md b/docs/es/sql-reference/functions/ym-dict-functions.md
deleted file mode 100644
index 311bbe9f5e8..00000000000
--- a/docs/es/sql-reference/functions/ym-dict-functions.md
+++ /dev/null
@@ -1,155 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 59
-toc_title: Trabajando con Yandex.Diccionarios de Metrica
----
-
-# Funciones para trabajar con Yandex.Diccionarios de Metrica {#functions-for-working-with-yandex-metrica-dictionaries}
-
-Para que las funciones a continuación funcionen, la configuración del servidor debe especificar las rutas y direcciones para obtener todo el Yandex.Diccionarios Metrica. Los diccionarios se cargan en la primera llamada de cualquiera de estas funciones. Si las listas de referencia no se pueden cargar, se lanza una excepción.
-
-Para obtener información sobre cómo crear listas de referencia, consulte la sección “Dictionaries”.
-
-## Múltiples Geobases {#multiple-geobases}
-
-ClickHouse admite trabajar con múltiples geobases alternativas (jerarquías regionales) simultáneamente, con el fin de soportar diversas perspectivas sobre a qué países pertenecen ciertas regiones.
-
-El ‘clickhouse-server’ config especifica el archivo con la jerarquía regional::`<path_to_regions_hierarchy_file>/opt/geo/regions_hierarchy.txt</path_to_regions_hierarchy_file>`
-
-Además de este archivo, también busca archivos cercanos que tengan el símbolo _ y cualquier sufijo anexado al nombre (antes de la extensión del archivo).
-Por ejemplo, también encontrará el archivo `/opt/geo/regions_hierarchy_ua.txt` si está presente.
-
-`ua` se llama la clave del diccionario. Para un diccionario sin un sufijo, la clave es una cadena vacía.
-
-Todos los diccionarios se vuelven a cargar en tiempo de ejecución (una vez cada cierto número de segundos, como se define en el parámetro de configuración builtin_dictionaries_reload_interval , o una vez por hora por defecto). Sin embargo, la lista de diccionarios disponibles se define una vez, cuando se inicia el servidor.
-
-All functions for working with regions have an optional argument at the end – the dictionary key. It is referred to as the geobase.
-Ejemplo:
-
-``` sql
-regionToCountry(RegionID) – Uses the default dictionary: /opt/geo/regions_hierarchy.txt
-regionToCountry(RegionID, '') – Uses the default dictionary: /opt/geo/regions_hierarchy.txt
-regionToCountry(RegionID, 'ua') – Uses the dictionary for the 'ua' key: /opt/geo/regions_hierarchy_ua.txt
-```
-
-### ¿Cómo puedo hacerlo?\]) {#regiontocityid-geobase}
-
-Accepts a UInt32 number – the region ID from the Yandex geobase. If this region is a city or part of a city, it returns the region ID for the appropriate city. Otherwise, returns 0.
-
-### ¿Cómo puedo hacerlo?\]) {#regiontoareaid-geobase}
-
-Convierte una región en un área (tipo 5 en la geobase). En todos los demás sentidos, esta función es la misma que ‘regionToCity’.
-
-``` sql
-SELECT DISTINCT regionToName(regionToArea(toUInt32(number), 'ua'))
-FROM system.numbers
-LIMIT 15
-```
-
-``` text
-┌─regionToName(regionToArea(toUInt32(number), \'ua\'))─┐
-│                                                      │
-│ Moscow and Moscow region                             │
-│ St. Petersburg and Leningrad region                  │
-│ Belgorod region                                      │
-│ Ivanovsk region                                      │
-│ Kaluga region                                        │
-│ Kostroma region                                      │
-│ Kursk region                                         │
-│ Lipetsk region                                       │
-│ Orlov region                                         │
-│ Ryazan region                                        │
-│ Smolensk region                                      │
-│ Tambov region                                        │
-│ Tver region                                          │
-│ Tula region                                          │
-└──────────────────────────────────────────────────────┘
-```
-
-### ¿Cómo puedo hacerlo?\]) {#regiontodistrictid-geobase}
-
-Convierte una región en un distrito federal (tipo 4 en la geobase). En todos los demás sentidos, esta función es la misma que ‘regionToCity’.
-
-``` sql
-SELECT DISTINCT regionToName(regionToDistrict(toUInt32(number), 'ua'))
-FROM system.numbers
-LIMIT 15
-```
-
-``` text
-┌─regionToName(regionToDistrict(toUInt32(number), \'ua\'))─┐
-│                                                          │
-│ Central federal district                                 │
-│ Northwest federal district                               │
-│ South federal district                                   │
-│ North Caucases federal district                          │
-│ Privolga federal district                                │
-│ Ural federal district                                    │
-│ Siberian federal district                                │
-│ Far East federal district                                │
-│ Scotland                                                 │
-│ Faroe Islands                                            │
-│ Flemish region                                           │
-│ Brussels capital region                                  │
-│ Wallonia                                                 │
-│ Federation of Bosnia and Herzegovina                     │
-└──────────────────────────────────────────────────────────┘
-```
-
-### ¿Cómo puedo hacerlo?\]) {#regiontocountryid-geobase}
-
-Convierte una región en un país. En todos los demás sentidos, esta función es la misma que ‘regionToCity’.
-Ejemplo: `regionToCountry(toUInt32(213)) = 225` convierte Moscú (213) a Rusia (225).
-
-### Aquí está el código de identificación.\]) {#regiontocontinentid-geobase}
-
-Convierte una región en un continente. En todos los demás sentidos, esta función es la misma que ‘regionToCity’.
-Ejemplo: `regionToContinent(toUInt32(213)) = 10001` convierte Moscú (213) a Eurasia (10001).
-
-### Nuestra misión es brindarle un servicio de calidad y confianza a nuestros clientes.) {#regiontotopcontinent-regiontotopcontinent}
-
-Encuentra el continente más alto en la jerarquía de la región.
-
-**Sintaxis**
-
-``` sql
-regionToTopContinent(id[, geobase]);
-```
-
-**Parámetros**
-
--   `id` — Region ID from the Yandex geobase. [UInt32](../../sql-reference/data-types/int-uint.md).
--   `geobase` — Dictionary key. See [Múltiples Geobases](#multiple-geobases). [Cadena](../../sql-reference/data-types/string.md). Opcional.
-
-**Valor devuelto**
-
--   Identificador del continente de nivel superior (este último cuando subes la jerarquía de regiones).
--   0, si no hay ninguno.
-
-Tipo: `UInt32`.
-
-### Aquí está el código de identificación de la población.\]) {#regiontopopulationid-geobase}
-
-Obtiene la población de una región.
-La población se puede registrar en archivos con la geobase. Vea la sección “External dictionaries”.
-Si la población no se registra para la región, devuelve 0.
-En la geobase de Yandex, la población podría registrarse para las regiones secundarias, pero no para las regiones parentales.
-
-### ¿Cómo puedo hacerlo?\]) {#regioninlhs-rhs-geobase}
-
-Comprueba si un ‘lhs’ región pertenece a un ‘rhs’ regi. Devuelve un número UInt8 igual a 1 si pertenece, o 0 si no pertenece.
-The relationship is reflexive – any region also belongs to itself.
-
-### RegiónJerarquía (id\[, geobase\]) {#regionhierarchyid-geobase}
-
-Accepts a UInt32 number – the region ID from the Yandex geobase. Returns an array of region IDs consisting of the passed region and all parents along the chain.
-Ejemplo: `regionHierarchy(toUInt32(213)) = [213,1,3,225,10001,10000]`.
-
-### ¿Cómo puedo hacerlo?\]) {#regiontonameid-lang}
-
-Accepts a UInt32 number – the region ID from the Yandex geobase. A string with the name of the language can be passed as a second argument. Supported languages are: ru, en, ua, uk, by, kz, tr. If the second argument is omitted, the language ‘ru’ is used. If the language is not supported, an exception is thrown. Returns a string – the name of the region in the corresponding language. If the region with the specified ID doesn't exist, an empty string is returned.
-
-`ua` y `uk` ambos significan ucraniano.
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/functions/ym_dict_functions/) <!--hide-->
diff --git a/docs/es/sql-reference/index.md b/docs/es/sql-reference/index.md
deleted file mode 100644
index c57c17bcaa8..00000000000
--- a/docs/es/sql-reference/index.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: Referencia SQL
-toc_hidden: true
-toc_priority: 28
-toc_title: oculto
----
-
-# Referencia SQL {#sql-reference}
-
-ClickHouse admite los siguientes tipos de consultas:
-
--   [SELECT](statements/select/index.md)
--   [INSERT INTO](statements/insert-into.md)
--   [CREATE](statements/create.md)
--   [ALTER](statements/alter.md#query_language_queries_alter)
--   [Otros tipos de consultas](statements/misc.md)
-
-[Artículo Original](https://clickhouse.tech/docs/en/sql-reference/) <!--hide-->
diff --git a/docs/es/sql-reference/operators/in.md b/docs/es/sql-reference/operators/in.md
deleted file mode 100644
index 988aafb25cb..00000000000
--- a/docs/es/sql-reference/operators/in.md
+++ /dev/null
@@ -1,204 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
----
-
-### IN Operadores {#select-in-operators}
-
-El `IN`, `NOT IN`, `GLOBAL IN`, y `GLOBAL NOT IN` están cubiertos por separado, ya que su funcionalidad es bastante rica.
-
-El lado izquierdo del operador es una sola columna o una tupla.
-
-Ejemplos:
-
-``` sql
-SELECT UserID IN (123, 456) FROM ...
-SELECT (CounterID, UserID) IN ((34, 123), (101500, 456)) FROM ...
-```
-
-Si el lado izquierdo es una sola columna que está en el índice, y el lado derecho es un conjunto de constantes, el sistema usa el índice para procesar la consulta.
-
-Don't list too many values explicitly (i.e. millions). If a data set is large, put it in a temporary table (for example, see the section “External data for query processing”), luego use una subconsulta.
-
-El lado derecho del operador puede ser un conjunto de expresiones constantes, un conjunto de tuplas con expresiones constantes (mostradas en los ejemplos anteriores) o el nombre de una tabla de base de datos o subconsulta SELECT entre paréntesis.
-
-Si el lado derecho del operador es el nombre de una tabla (por ejemplo, `UserID IN users`), esto es equivalente a la subconsulta `UserID IN (SELECT * FROM users)`. Úselo cuando trabaje con datos externos que se envían junto con la consulta. Por ejemplo, la consulta se puede enviar junto con un conjunto de ID de usuario ‘users’ tabla temporal, que debe ser filtrada.
-
-Si el lado derecho del operador es un nombre de tabla que tiene el motor Set (un conjunto de datos preparado que siempre está en RAM), el conjunto de datos no se volverá a crear para cada consulta.
-
-La subconsulta puede especificar más de una columna para filtrar tuplas.
-Ejemplo:
-
-``` sql
-SELECT (CounterID, UserID) IN (SELECT CounterID, UserID FROM ...) FROM ...
-```
-
-Las columnas a la izquierda y a la derecha del operador IN deben tener el mismo tipo.
-
-El operador IN y la subconsulta pueden aparecer en cualquier parte de la consulta, incluidas las funciones agregadas y las funciones lambda.
-Ejemplo:
-
-``` sql
-SELECT
-    EventDate,
-    avg(UserID IN
-    (
-        SELECT UserID
-        FROM test.hits
-        WHERE EventDate = toDate('2014-03-17')
-    )) AS ratio
-FROM test.hits
-GROUP BY EventDate
-ORDER BY EventDate ASC
-```
-
-``` text
-┌──EventDate─┬────ratio─┐
-│ 2014-03-17 │        1 │
-│ 2014-03-18 │ 0.807696 │
-│ 2014-03-19 │ 0.755406 │
-│ 2014-03-20 │ 0.723218 │
-│ 2014-03-21 │ 0.697021 │
-│ 2014-03-22 │ 0.647851 │
-│ 2014-03-23 │ 0.648416 │
-└────────────┴──────────┘
-```
-
-Para cada día después del 17 de marzo, cuente el porcentaje de páginas vistas realizadas por los usuarios que visitaron el sitio el 17 de marzo.
-Una subconsulta en la cláusula IN siempre se ejecuta una sola vez en un único servidor. No hay subconsultas dependientes.
-
-## Procesamiento NULL {#null-processing-1}
-
-Durante el procesamiento de la solicitud, el operador IN asume que el resultado de una operación [NULL](../syntax.md#null-literal) siempre es igual a `0`, independientemente de si `NULL` está en el lado derecho o izquierdo del operador. `NULL` Los valores no se incluyen en ningún conjunto de datos, no se corresponden entre sí y no se pueden comparar.
-
-Aquí hay un ejemplo con el `t_null` tabla:
-
-``` text
-┌─x─┬────y─┐
-│ 1 │ ᴺᵁᴸᴸ │
-│ 2 │    3 │
-└───┴──────┘
-```
-
-Ejecución de la consulta `SELECT x FROM t_null WHERE y IN (NULL,3)` da el siguiente resultado:
-
-``` text
-┌─x─┐
-│ 2 │
-└───┘
-```
-
-Se puede ver que la fila en la que `y = NULL` se expulsa de los resultados de la consulta. Esto se debe a que ClickHouse no puede decidir si `NULL` está incluido en el `(NULL,3)` conjunto, devuelve `0` como resultado de la operación, y `SELECT` excluye esta fila de la salida final.
-
-``` sql
-SELECT y IN (NULL, 3)
-FROM t_null
-```
-
-``` text
-┌─in(y, tuple(NULL, 3))─┐
-│                     0 │
-│                     1 │
-└───────────────────────┘
-```
-
-## Subconsultas distribuidas {#select-distributed-subqueries}
-
-Hay dos opciones para IN-s con subconsultas (similar a JOINs): normal `IN` / `JOIN` y `GLOBAL IN` / `GLOBAL JOIN`. Se diferencian en cómo se ejecutan para el procesamiento de consultas distribuidas.
-
-!!! attention "Atención"
-    Recuerde que los algoritmos descritos a continuación pueden funcionar de manera diferente dependiendo de la [configuración](../../operations/settings/settings.md) `distributed_product_mode` configuración.
-
-Cuando se utiliza el IN normal, la consulta se envía a servidores remotos, y cada uno de ellos ejecuta las subconsultas en el `IN` o `JOIN` clausula.
-
-Cuando se utiliza `GLOBAL IN` / `GLOBAL JOINs`, primero todas las subconsultas se ejecutan para `GLOBAL IN` / `GLOBAL JOINs`, y los resultados se recopilan en tablas temporales. A continuación, las tablas temporales se envían a cada servidor remoto, donde las consultas se ejecutan utilizando estos datos temporales.
-
-Para una consulta no distribuida, utilice el `IN` / `JOIN`.
-
-Tenga cuidado al usar subconsultas en el `IN` / `JOIN` para el procesamiento de consultas distribuidas.
-
-Veamos algunos ejemplos. Supongamos que cada servidor del clúster tiene un **local_table**. Cada servidor también tiene un **distributed_table** mesa con el **Distribuido** tipo, que mira todos los servidores del clúster.
-
-Para una consulta al **distributed_table**, la consulta se enviará a todos los servidores remotos y se ejecutará en ellos usando el **local_table**.
-
-Por ejemplo, la consulta
-
-``` sql
-SELECT uniq(UserID) FROM distributed_table
-```
-
-se enviará a todos los servidores remotos como
-
-``` sql
-SELECT uniq(UserID) FROM local_table
-```
-
-y ejecutar en cada uno de ellos en paralelo, hasta que llegue a la etapa donde se pueden combinar resultados intermedios. Luego, los resultados intermedios se devolverán al servidor solicitante y se fusionarán en él, y el resultado final se enviará al cliente.
-
-Ahora examinemos una consulta con IN:
-
-``` sql
-SELECT uniq(UserID) FROM distributed_table WHERE CounterID = 101500 AND UserID IN (SELECT UserID FROM local_table WHERE CounterID = 34)
-```
-
--   Cálculo de la intersección de audiencias de dos sitios.
-
-Esta consulta se enviará a todos los servidores remotos como
-
-``` sql
-SELECT uniq(UserID) FROM local_table WHERE CounterID = 101500 AND UserID IN (SELECT UserID FROM local_table WHERE CounterID = 34)
-```
-
-En otras palabras, los datos establecidos en la cláusula IN se recopilarán en cada servidor de forma independiente, solo a través de los datos que se almacenan localmente en cada uno de los servidores.
-
-Esto funcionará correctamente y de manera óptima si está preparado para este caso y ha distribuido datos en los servidores de clúster de modo que los datos de un único ID de usuario residen completamente en un único servidor. En este caso, todos los datos necesarios estarán disponibles localmente en cada servidor. De lo contrario, el resultado será inexacto. Nos referimos a esta variación de la consulta como “local IN”.
-
-Para corregir cómo funciona la consulta cuando los datos se distribuyen aleatoriamente entre los servidores de clúster, puede especificar **distributed_table** dentro de una subconsulta. La consulta se vería así:
-
-``` sql
-SELECT uniq(UserID) FROM distributed_table WHERE CounterID = 101500 AND UserID IN (SELECT UserID FROM distributed_table WHERE CounterID = 34)
-```
-
-Esta consulta se enviará a todos los servidores remotos como
-
-``` sql
-SELECT uniq(UserID) FROM local_table WHERE CounterID = 101500 AND UserID IN (SELECT UserID FROM distributed_table WHERE CounterID = 34)
-```
-
-La subconsulta comenzará a ejecutarse en cada servidor remoto. Dado que la subconsulta utiliza una tabla distribuida, la subconsulta que se encuentra en cada servidor remoto se reenviará a cada servidor remoto como
-
-``` sql
-SELECT UserID FROM local_table WHERE CounterID = 34
-```
-
-Por ejemplo, si tiene un clúster de 100 servidores, la ejecución de toda la consulta requerirá 10.000 solicitudes elementales, lo que generalmente se considera inaceptable.
-
-En tales casos, siempre debe usar GLOBAL IN en lugar de IN. Veamos cómo funciona para la consulta
-
-``` sql
-SELECT uniq(UserID) FROM distributed_table WHERE CounterID = 101500 AND UserID GLOBAL IN (SELECT UserID FROM distributed_table WHERE CounterID = 34)
-```
-
-El servidor del solicitante ejecutará la subconsulta
-
-``` sql
-SELECT UserID FROM distributed_table WHERE CounterID = 34
-```
-
-y el resultado se colocará en una tabla temporal en la RAM. A continuación, la solicitud se enviará a cada servidor remoto como
-
-``` sql
-SELECT uniq(UserID) FROM local_table WHERE CounterID = 101500 AND UserID GLOBAL IN _data1
-```
-
-y la tabla temporal `_data1` se enviará a cada servidor remoto con la consulta (el nombre de la tabla temporal está definido por la implementación).
-
-Esto es más óptimo que usar el IN normal. Sin embargo, tenga en cuenta los siguientes puntos:
-
-1.  Al crear una tabla temporal, los datos no se hacen únicos. Para reducir el volumen de datos transmitidos a través de la red, especifique DISTINCT en la subconsulta. (No necesita hacer esto para un IN normal.)
-2.  La tabla temporal se enviará a todos los servidores remotos. La transmisión no tiene en cuenta la topología de red. Por ejemplo, si 10 servidores remotos residen en un centro de datos que es muy remoto en relación con el servidor solicitante, los datos se enviarán 10 veces a través del canal al centro de datos remoto. Intente evitar grandes conjuntos de datos cuando use GLOBAL IN.
-3.  Al transmitir datos a servidores remotos, las restricciones en el ancho de banda de la red no son configurables. Puede sobrecargar la red.
-4.  Intente distribuir datos entre servidores para que no necesite usar GLOBAL IN de forma regular.
-5.  Si necesita utilizar GLOBAL IN con frecuencia, planifique la ubicación del clúster ClickHouse para que un único grupo de réplicas resida en no más de un centro de datos con una red rápida entre ellos, de modo que una consulta se pueda procesar completamente dentro de un único centro de datos.
-
-También tiene sentido especificar una tabla local en el `GLOBAL IN` cláusula, en caso de que esta tabla local solo esté disponible en el servidor solicitante y desee usar datos de ella en servidores remotos.
diff --git a/docs/es/sql-reference/operators/index.md b/docs/es/sql-reference/operators/index.md
deleted file mode 100644
index cc0eed53089..00000000000
--- a/docs/es/sql-reference/operators/index.md
+++ /dev/null
@@ -1,277 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 37
-toc_title: Operador
----
-
-# Operador {#operators}
-
-ClickHouse transforma los operadores a sus funciones correspondientes en la etapa de análisis de consultas de acuerdo con su prioridad, precedencia y asociatividad.
-
-## Operadores de acceso {#access-operators}
-
-`a[N]` – Access to an element of an array. The `arrayElement(a, N)` función.
-
-`a.N` – Access to a tuple element. The `tupleElement(a, N)` función.
-
-## Operador de negación numérica {#numeric-negation-operator}
-
-`-a` – The `negate (a)` función.
-
-## Operadores de multiplicación y división {#multiplication-and-division-operators}
-
-`a * b` – The `multiply (a, b)` función.
-
-`a / b` – The `divide(a, b)` función.
-
-`a % b` – The `modulo(a, b)` función.
-
-## Operadores de suma y resta {#addition-and-subtraction-operators}
-
-`a + b` – The `plus(a, b)` función.
-
-`a - b` – The `minus(a, b)` función.
-
-## Operadores de comparación {#comparison-operators}
-
-`a = b` – The `equals(a, b)` función.
-
-`a == b` – The `equals(a, b)` función.
-
-`a != b` – The `notEquals(a, b)` función.
-
-`a <> b` – The `notEquals(a, b)` función.
-
-`a <= b` – The `lessOrEquals(a, b)` función.
-
-`a >= b` – The `greaterOrEquals(a, b)` función.
-
-`a < b` – The `less(a, b)` función.
-
-`a > b` – The `greater(a, b)` función.
-
-`a LIKE s` – The `like(a, b)` función.
-
-`a NOT LIKE s` – The `notLike(a, b)` función.
-
-`a BETWEEN b AND c` – The same as `a >= b AND a <= c`.
-
-`a NOT BETWEEN b AND c` – The same as `a < b OR a > c`.
-
-## Operadores para trabajar con conjuntos de datos {#operators-for-working-with-data-sets}
-
-*Ver [IN operadores](in.md).*
-
-`a IN ...` – The `in(a, b)` función.
-
-`a NOT IN ...` – The `notIn(a, b)` función.
-
-`a GLOBAL IN ...` – The `globalIn(a, b)` función.
-
-`a GLOBAL NOT IN ...` – The `globalNotIn(a, b)` función.
-
-## Operadores para trabajar con fechas y horas {#operators-datetime}
-
-### EXTRACT {#operator-extract}
-
-``` sql
-EXTRACT(part FROM date);
-```
-
-Extraer partes de una fecha determinada. Por ejemplo, puede recuperar un mes a partir de una fecha determinada o un segundo a partir de una hora.
-
-El `part` parámetro especifica qué parte de la fecha se va a recuperar. Los siguientes valores están disponibles:
-
--   `DAY` — The day of the month. Possible values: 1–31.
--   `MONTH` — The number of a month. Possible values: 1–12.
--   `YEAR` — The year.
--   `SECOND` — The second. Possible values: 0–59.
--   `MINUTE` — The minute. Possible values: 0–59.
--   `HOUR` — The hour. Possible values: 0–23.
-
-El `part` El parámetro no distingue entre mayúsculas y minúsculas.
-
-El `date` parámetro especifica la fecha o la hora a procesar. Bien [Fecha](../../sql-reference/data-types/date.md) o [FechaHora](../../sql-reference/data-types/datetime.md) tipo es compatible.
-
-Ejemplos:
-
-``` sql
-SELECT EXTRACT(DAY FROM toDate('2017-06-15'));
-SELECT EXTRACT(MONTH FROM toDate('2017-06-15'));
-SELECT EXTRACT(YEAR FROM toDate('2017-06-15'));
-```
-
-En el siguiente ejemplo creamos una tabla e insertamos en ella un valor con el `DateTime` tipo.
-
-``` sql
-CREATE TABLE test.Orders
-(
-    OrderId UInt64,
-    OrderName String,
-    OrderDate DateTime
-)
-ENGINE = Log;
-```
-
-``` sql
-INSERT INTO test.Orders VALUES (1, 'Jarlsberg Cheese', toDateTime('2008-10-11 13:23:44'));
-```
-
-``` sql
-SELECT
-    toYear(OrderDate) AS OrderYear,
-    toMonth(OrderDate) AS OrderMonth,
-    toDayOfMonth(OrderDate) AS OrderDay,
-    toHour(OrderDate) AS OrderHour,
-    toMinute(OrderDate) AS OrderMinute,
-    toSecond(OrderDate) AS OrderSecond
-FROM test.Orders;
-```
-
-``` text
-┌─OrderYear─┬─OrderMonth─┬─OrderDay─┬─OrderHour─┬─OrderMinute─┬─OrderSecond─┐
-│      2008 │         10 │       11 │        13 │          23 │          44 │
-└───────────┴────────────┴──────────┴───────────┴─────────────┴─────────────┘
-```
-
-Puedes ver más ejemplos en [prueba](https://github.com/ClickHouse/ClickHouse/blob/master/tests/queries/0_stateless/00619_extract.sql).
-
-### INTERVAL {#operator-interval}
-
-Crea un [Intervalo](../../sql-reference/data-types/special-data-types/interval.md)-type valor que debe utilizarse en operaciones aritméticas con [Fecha](../../sql-reference/data-types/date.md) y [FechaHora](../../sql-reference/data-types/datetime.md)-type valores.
-
-Tipos de intervalos:
-- `SECOND`
-- `MINUTE`
-- `HOUR`
-- `DAY`
-- `WEEK`
-- `MONTH`
-- `QUARTER`
-- `YEAR`
-
-!!! warning "Advertencia"
-    Los intervalos con diferentes tipos no se pueden combinar. No puedes usar expresiones como `INTERVAL 4 DAY 1 HOUR`. Especifique intervalos en unidades que sean más pequeñas o iguales que la unidad más pequeña del intervalo, por ejemplo, `INTERVAL 25 HOUR`. Puede usar operaciones consecutivas, como en el siguiente ejemplo.
-
-Ejemplo:
-
-``` sql
-SELECT now() AS current_date_time, current_date_time + INTERVAL 4 DAY + INTERVAL 3 HOUR
-```
-
-``` text
-┌───current_date_time─┬─plus(plus(now(), toIntervalDay(4)), toIntervalHour(3))─┐
-│ 2019-10-23 11:16:28 │                                    2019-10-27 14:16:28 │
-└─────────────────────┴────────────────────────────────────────────────────────┘
-```
-
-**Ver también**
-
--   [Intervalo](../../sql-reference/data-types/special-data-types/interval.md) tipo de datos
--   [ToInterval](../../sql-reference/functions/type-conversion-functions.md#function-tointerval) funciones de conversión de tipo
-
-## Operador de Negación Lógica {#logical-negation-operator}
-
-`NOT a` – The `not(a)` función.
-
-## Operador lógico and {#logical-and-operator}
-
-`a AND b` – The`and(a, b)` función.
-
-## Operador lógico or {#logical-or-operator}
-
-`a OR b` – The `or(a, b)` función.
-
-## Operador condicional {#conditional-operator}
-
-`a ? b : c` – The `if(a, b, c)` función.
-
-Nota:
-
-El operador condicional calcula los valores de b y c, luego verifica si se cumple la condición a y luego devuelve el valor correspondiente. Si `b` o `C` es una [arrayJoin()](../../sql-reference/functions/array-join.md#functions_arrayjoin) función, cada fila se replicará independientemente de la “a” condición.
-
-## Expresión condicional {#operator_case}
-
-``` sql
-CASE [x]
-    WHEN a THEN b
-    [WHEN ... THEN ...]
-    [ELSE c]
-END
-```
-
-Si `x` se especifica, entonces `transform(x, [a, ...], [b, ...], c)` function is used. Otherwise – `multiIf(a, b, ..., c)`.
-
-Si no hay `ELSE c` cláusula en la expresión, el valor predeterminado es `NULL`.
-
-El `transform` no funciona con `NULL`.
-
-## Operador de Concatenación {#concatenation-operator}
-
-`s1 || s2` – The `concat(s1, s2) function.`
-
-## Operador de Creación Lambda {#lambda-creation-operator}
-
-`x -> expr` – The `lambda(x, expr) function.`
-
-Los siguientes operadores no tienen prioridad ya que son corchetes:
-
-## Operador de creación de matrices {#array-creation-operator}
-
-`[x1, ...]` – The `array(x1, ...) function.`
-
-## Operador de creación de tupla {#tuple-creation-operator}
-
-`(x1, x2, ...)` – The `tuple(x2, x2, ...) function.`
-
-## Asociatividad {#associativity}
-
-Todos los operadores binarios han dejado asociatividad. Por ejemplo, `1 + 2 + 3` se transforma a `plus(plus(1, 2), 3)`.
-A veces esto no funciona de la manera que esperas. Por ejemplo, `SELECT 4 > 2 > 3` resultará en 0.
-
-Para la eficiencia, el `and` y `or` funciones aceptan cualquier número de argumentos. Las cadenas correspondientes de `AND` y `OR` operadores se transforman en una sola llamada de estas funciones.
-
-## Comprobación de `NULL` {#checking-for-null}
-
-ClickHouse soporta el `IS NULL` y `IS NOT NULL` operador.
-
-### IS NULL {#operator-is-null}
-
--   Para [NULL](../../sql-reference/data-types/nullable.md) valores de tipo, el `IS NULL` operador devuelve:
-    -   `1` si el valor es `NULL`.
-    -   `0` de lo contrario.
--   Para otros valores, el `IS NULL` operador siempre devuelve `0`.
-
-<!-- -->
-
-``` sql
-SELECT x+100 FROM t_null WHERE y IS NULL
-```
-
-``` text
-┌─plus(x, 100)─┐
-│          101 │
-└──────────────┘
-```
-
-### IS NOT NULL {#is-not-null}
-
--   Para [NULL](../../sql-reference/data-types/nullable.md) valores de tipo, el `IS NOT NULL` operador devuelve:
-    -   `0` si el valor es `NULL`.
-    -   `1` de lo contrario.
--   Para otros valores, el `IS NOT NULL` operador siempre devuelve `1`.
-
-<!-- -->
-
-``` sql
-SELECT * FROM t_null WHERE y IS NOT NULL
-```
-
-``` text
-┌─x─┬─y─┐
-│ 2 │ 3 │
-└───┴───┘
-```
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/operators/) <!--hide-->
diff --git a/docs/es/sql-reference/statements/alter.md b/docs/es/sql-reference/statements/alter.md
deleted file mode 100644
index 194b0cea00f..00000000000
--- a/docs/es/sql-reference/statements/alter.md
+++ /dev/null
@@ -1,602 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 36
-toc_title: ALTER
----
-
-## ALTER {#query_language_queries_alter}
-
-El `ALTER` consulta sólo se admite para `*MergeTree` mesas, así como `Merge`y`Distributed`. La consulta tiene varias variaciones.
-
-### Manipulaciones de columna {#column-manipulations}
-
-Cambiar la estructura de la tabla.
-
-``` sql
-ALTER TABLE [db].name [ON CLUSTER cluster] ADD|DROP|CLEAR|COMMENT|MODIFY COLUMN ...
-```
-
-En la consulta, especifique una lista de una o más acciones separadas por comas.
-Cada acción es una operación en una columna.
-
-Se admiten las siguientes acciones:
-
--   [ADD COLUMN](#alter_add-column) — Adds a new column to the table.
--   [DROP COLUMN](#alter_drop-column) — Deletes the column.
--   [CLEAR COLUMN](#alter_clear-column) — Resets column values.
--   [COMMENT COLUMN](#alter_comment-column) — Adds a text comment to the column.
--   [MODIFY COLUMN](#alter_modify-column) — Changes column's type, default expression and TTL.
-
-Estas acciones se describen en detalle a continuación.
-
-#### ADD COLUMN {#alter_add-column}
-
-``` sql
-ADD COLUMN [IF NOT EXISTS] name [type] [default_expr] [codec] [AFTER name_after]
-```
-
-Agrega una nueva columna a la tabla con el `name`, `type`, [`codec`](create.md#codecs) y `default_expr` (ver la sección [Expresiones predeterminadas](create.md#create-default-values)).
-
-Si el `IF NOT EXISTS` cláusula, la consulta no devolverá un error si la columna ya existe. Si especifica `AFTER name_after` (el nombre de otra columna), la columna se agrega después de la especificada en la lista de columnas de tabla. De lo contrario, la columna se agrega al final de la tabla. Tenga en cuenta que no hay forma de agregar una columna al principio de una tabla. Para una cadena de acciones, `name_after` puede ser el nombre de una columna que se agrega en una de las acciones anteriores.
-
-Agregar una columna solo cambia la estructura de la tabla, sin realizar ninguna acción con datos. Los datos no aparecen en el disco después de `ALTER`. Si faltan los datos para una columna al leer de la tabla, se rellena con valores predeterminados (realizando la expresión predeterminada si hay una, o usando ceros o cadenas vacías). La columna aparece en el disco después de fusionar partes de datos (consulte [Método de codificación de datos:](../../engines/table-engines/mergetree-family/mergetree.md)).
-
-Este enfoque nos permite completar el `ALTER` consulta al instante, sin aumentar el volumen de datos antiguos.
-
-Ejemplo:
-
-``` sql
-ALTER TABLE visits ADD COLUMN browser String AFTER user_id
-```
-
-#### DROP COLUMN {#alter_drop-column}
-
-``` sql
-DROP COLUMN [IF EXISTS] name
-```
-
-Elimina la columna con el nombre `name`. Si el `IF EXISTS` se especifica una cláusula, la consulta no devolverá un error si la columna no existe.
-
-Elimina datos del sistema de archivos. Dado que esto elimina archivos completos, la consulta se completa casi al instante.
-
-Ejemplo:
-
-``` sql
-ALTER TABLE visits DROP COLUMN browser
-```
-
-#### CLEAR COLUMN {#alter_clear-column}
-
-``` sql
-CLEAR COLUMN [IF EXISTS] name IN PARTITION partition_name
-```
-
-Restablece todos los datos de una columna para una partición especificada. Obtenga más información sobre cómo configurar el nombre de la partición en la sección [Cómo especificar la expresión de partición](#alter-how-to-specify-part-expr).
-
-Si el `IF EXISTS` se especifica una cláusula, la consulta no devolverá un error si la columna no existe.
-
-Ejemplo:
-
-``` sql
-ALTER TABLE visits CLEAR COLUMN browser IN PARTITION tuple()
-```
-
-#### COMMENT COLUMN {#alter_comment-column}
-
-``` sql
-COMMENT COLUMN [IF EXISTS] name 'comment'
-```
-
-Agrega un comentario a la columna. Si el `IF EXISTS` se especifica una cláusula, la consulta no devolverá un error si la columna no existe.
-
-Cada columna puede tener un comentario. Si ya existe un comentario para la columna, un nuevo comentario sobrescribe el comentario anterior.
-
-Los comentarios se almacenan en el `comment_expression` columna devuelta por el [DESCRIBE TABLE](misc.md#misc-describe-table) consulta.
-
-Ejemplo:
-
-``` sql
-ALTER TABLE visits COMMENT COLUMN browser 'The table shows the browser used for accessing the site.'
-```
-
-#### MODIFY COLUMN {#alter_modify-column}
-
-``` sql
-MODIFY COLUMN [IF EXISTS] name [type] [default_expr] [TTL]
-```
-
-Esta consulta cambia el `name` propiedades de la columna:
-
--   Tipo
-
--   Expresión predeterminada
-
--   TTL
-
-        For examples of columns TTL modifying, see [Column TTL](../engines/table_engines/mergetree_family/mergetree.md#mergetree-column-ttl).
-
-Si el `IF EXISTS` se especifica una cláusula, la consulta no devolverá un error si la columna no existe.
-
-Al cambiar el tipo, los valores se convierten como si [ToType](../../sql-reference/functions/type-conversion-functions.md) se les aplicaron funciones. Si solo se cambia la expresión predeterminada, la consulta no hace nada complejo y se completa casi al instante.
-
-Ejemplo:
-
-``` sql
-ALTER TABLE visits MODIFY COLUMN browser Array(String)
-```
-
-Changing the column type is the only complex action – it changes the contents of files with data. For large tables, this may take a long time.
-
-Hay varias etapas de procesamiento:
-
--   Preparación de archivos temporales (nuevos) con datos modificados.
--   Cambiar el nombre de los archivos antiguos.
--   Cambiar el nombre de los archivos temporales (nuevos) a los nombres antiguos.
--   Eliminar los archivos antiguos.
-
-Solo la primera etapa lleva tiempo. Si hay un error en esta etapa, los datos no se cambian.
-Si hay un error durante una de las etapas sucesivas, los datos se pueden restaurar manualmente. La excepción es si los archivos antiguos se eliminaron del sistema de archivos, pero los datos de los nuevos archivos no se escribieron en el disco y se perdieron.
-
-El `ALTER` se replica la consulta para cambiar columnas. Las instrucciones se guardan en ZooKeeper, luego cada réplica las aplica. Todo `ALTER` las consultas se ejecutan en el mismo orden. La consulta espera a que se completen las acciones adecuadas en las otras réplicas. Sin embargo, una consulta para cambiar columnas en una tabla replicada se puede interrumpir y todas las acciones se realizarán de forma asincrónica.
-
-#### Limitaciones de consulta ALTER {#alter-query-limitations}
-
-El `ALTER` query le permite crear y eliminar elementos separados (columnas) en estructuras de datos anidadas, pero no en estructuras de datos anidadas completas. Para agregar una estructura de datos anidada, puede agregar columnas con un nombre como `name.nested_name` y el tipo `Array(T)`. Una estructura de datos anidada es equivalente a varias columnas de matriz con un nombre que tiene el mismo prefijo antes del punto.
-
-No hay soporte para eliminar columnas en la clave principal o la clave de muestreo (columnas que se utilizan en el `ENGINE` expresion). Solo es posible cambiar el tipo de las columnas que se incluyen en la clave principal si este cambio no provoca que se modifiquen los datos (por ejemplo, puede agregar valores a un Enum o cambiar un tipo de `DateTime` a `UInt32`).
-
-Si el `ALTER` la consulta no es suficiente para realizar los cambios en la tabla que necesita, puede crear una nueva tabla, copiar los datos [INSERT SELECT](insert-into.md#insert_query_insert-select) consulta, luego cambie las tablas usando el [RENAME](misc.md#misc_operations-rename) consulta y elimina la tabla anterior. Puede usar el [Método de codificación de datos:](../../operations/utilities/clickhouse-copier.md) como una alternativa a la `INSERT SELECT` consulta.
-
-El `ALTER` query bloquea todas las lecturas y escrituras para la tabla. En otras palabras, si un largo `SELECT` se está ejecutando en el momento de la `ALTER` consulta, el `ALTER` la consulta esperará a que se complete. Al mismo tiempo, todas las consultas nuevas a la misma tabla esperarán `ALTER` se está ejecutando.
-
-Para tablas que no almacenan datos por sí mismas (como `Merge` y `Distributed`), `ALTER` simplemente cambia la estructura de la tabla, y no cambia la estructura de las tablas subordinadas. Por ejemplo, cuando se ejecuta ALTER para un `Distributed` mesa, también tendrá que ejecutar `ALTER` para las tablas en todos los servidores remotos.
-
-### Manipulaciones con expresiones clave {#manipulations-with-key-expressions}
-
-Se admite el siguiente comando:
-
-``` sql
-MODIFY ORDER BY new_expression
-```
-
-Solo funciona para tablas en el [`MergeTree`](../../engines/table-engines/mergetree-family/mergetree.md) familia (incluyendo
-[repetición](../../engines/table-engines/mergetree-family/replication.md) tabla). El comando cambia el
-[clave de clasificación](../../engines/table-engines/mergetree-family/mergetree.md) de la mesa
-a `new_expression` (una expresión o una tupla de expresiones). La clave principal sigue siendo la misma.
-
-El comando es liviano en el sentido de que solo cambia los metadatos. Para mantener la propiedad esa parte de datos
-las filas están ordenadas por la expresión de clave de ordenación, no puede agregar expresiones que contengan columnas existentes
-a la clave de ordenación (sólo las columnas añadidas `ADD COLUMN` comando en el mismo `ALTER` consulta).
-
-### Manipulaciones con índices de saltos de datos {#manipulations-with-data-skipping-indices}
-
-Solo funciona para tablas en el [`*MergeTree`](../../engines/table-engines/mergetree-family/mergetree.md) familia (incluyendo
-[repetición](../../engines/table-engines/mergetree-family/replication.md) tabla). Las siguientes operaciones
-están disponibles:
-
--   `ALTER TABLE [db].name ADD INDEX name expression TYPE type GRANULARITY value AFTER name [AFTER name2]` - Agrega la descripción del índice a los metadatos de las tablas.
-
--   `ALTER TABLE [db].name DROP INDEX name` - Elimina la descripción del índice de los metadatos de las tablas y elimina los archivos de índice del disco.
-
-Estos comandos son livianos en el sentido de que solo cambian los metadatos o eliminan archivos.
-Además, se replican (sincronizando metadatos de índices a través de ZooKeeper).
-
-### Manipulaciones con restricciones {#manipulations-with-constraints}
-
-Ver más en [limitación](create.md#constraints)
-
-Las restricciones se pueden agregar o eliminar utilizando la siguiente sintaxis:
-
-``` sql
-ALTER TABLE [db].name ADD CONSTRAINT constraint_name CHECK expression;
-ALTER TABLE [db].name DROP CONSTRAINT constraint_name;
-```
-
-Las consultas agregarán o eliminarán metadatos sobre restricciones de la tabla para que se procesen inmediatamente.
-
-Comprobación de restricciones *no se ejecutará* en los datos existentes si se agregaron.
-
-Todos los cambios en las tablas replicadas se transmiten a ZooKeeper, por lo que se aplicarán en otras réplicas.
-
-### Manipulaciones con particiones y piezas {#alter_manipulations-with-partitions}
-
-Las siguientes operaciones con [partición](../../engines/table-engines/mergetree-family/custom-partitioning-key.md) están disponibles:
-
--   [DETACH PARTITION](#alter_detach-partition) – Moves a partition to the `detached` directorio y olvidarlo.
--   [DROP PARTITION](#alter_drop-partition) – Deletes a partition.
--   [ATTACH PART\|PARTITION](#alter_attach-partition) – Adds a part or partition from the `detached` directorio a la tabla.
--   [ATTACH PARTITION FROM](#alter_attach-partition-from) – Copies the data partition from one table to another and adds.
--   [REPLACE PARTITION](#alter_replace-partition) - Copia la partición de datos de una tabla a otra y reemplaza.
--   [MOVE PARTITION TO TABLE](#alter_move_to_table-partition)(#alter_move_to_table-partition) - Mover la partición de datos de una tabla a otra.
--   [CLEAR COLUMN IN PARTITION](#alter_clear-column-partition) - Restablece el valor de una columna especificada en una partición.
--   [CLEAR INDEX IN PARTITION](#alter_clear-index-partition) - Restablece el índice secundario especificado en una partición.
--   [FREEZE PARTITION](#alter_freeze-partition) – Creates a backup of a partition.
--   [FETCH PARTITION](#alter_fetch-partition) – Downloads a partition from another server.
--   [MOVE PARTITION\|PART](#alter_move-partition) – Move partition/data part to another disk or volume.
-
-<!-- -->
-
-#### DETACH PARTITION {#alter_detach-partition}
-
-``` sql
-ALTER TABLE table_name DETACH PARTITION partition_expr
-```
-
-Mueve todos los datos de la partición especificada `detached` directorio. El servidor se olvida de la partición de datos separada como si no existiera. El servidor no sabrá acerca de estos datos hasta que [ATTACH](#alter_attach-partition) consulta.
-
-Ejemplo:
-
-``` sql
-ALTER TABLE visits DETACH PARTITION 201901
-```
-
-Lea cómo configurar la expresión de partición en una sección [Cómo especificar la expresión de partición](#alter-how-to-specify-part-expr).
-
-Después de ejecutar la consulta, puede hacer lo que quiera con los datos en el `detached` directory — delete it from the file system, or just leave it.
-
-This query is replicated – it moves the data to the `detached` directorio en todas las réplicas. Tenga en cuenta que solo puede ejecutar esta consulta en una réplica de líder. Para averiguar si una réplica es un líder, realice `SELECT` consulta a la [sistema.Replica](../../operations/system-tables.md#system_tables-replicas) tabla. Alternativamente, es más fácil hacer un `DETACH` consulta en todas las réplicas: todas las réplicas producen una excepción, excepto la réplica líder.
-
-#### DROP PARTITION {#alter_drop-partition}
-
-``` sql
-ALTER TABLE table_name DROP PARTITION partition_expr
-```
-
-Elimina la partición especificada de la tabla. Esta consulta etiqueta la partición como inactiva y elimina los datos por completo, aproximadamente en 10 minutos.
-
-Lea cómo configurar la expresión de partición en una sección [Cómo especificar la expresión de partición](#alter-how-to-specify-part-expr).
-
-The query is replicated – it deletes data on all replicas.
-
-#### DROP DETACHED PARTITION\|PART {#alter_drop-detached}
-
-``` sql
-ALTER TABLE table_name DROP DETACHED PARTITION|PART partition_expr
-```
-
-Quita la parte especificada o todas las partes de la partición especificada de `detached`.
-Más información sobre cómo establecer la expresión de partición en una sección [Cómo especificar la expresión de partición](#alter-how-to-specify-part-expr).
-
-#### ATTACH PARTITION\|PART {#alter_attach-partition}
-
-``` sql
-ALTER TABLE table_name ATTACH PARTITION|PART partition_expr
-```
-
-Agrega datos a la tabla desde el `detached` directorio. Es posible agregar datos para una partición completa o para una parte separada. Ejemplos:
-
-``` sql
-ALTER TABLE visits ATTACH PARTITION 201901;
-ALTER TABLE visits ATTACH PART 201901_2_2_0;
-```
-
-Más información sobre cómo establecer la expresión de partición en una sección [Cómo especificar la expresión de partición](#alter-how-to-specify-part-expr).
-
-Esta consulta se replica. El iniciador de réplica comprueba si hay datos en el `detached` directorio. Si existen datos, la consulta comprueba su integridad. Si todo es correcto, la consulta agrega los datos a la tabla. Todas las demás réplicas descargan los datos del iniciador de réplica.
-
-Entonces puedes poner datos en el `detached` en una réplica, y utilice el directorio `ALTER ... ATTACH` consulta para agregarlo a la tabla en todas las réplicas.
-
-#### ATTACH PARTITION FROM {#alter_attach-partition-from}
-
-``` sql
-ALTER TABLE table2 ATTACH PARTITION partition_expr FROM table1
-```
-
-Esta consulta copia la partición de datos `table1` a `table2` añade datos a los que existen en el `table2`. Tenga en cuenta que los datos no se eliminarán de `table1`.
-
-Para que la consulta se ejecute correctamente, se deben cumplir las siguientes condiciones:
-
--   Ambas tablas deben tener la misma estructura.
--   Ambas tablas deben tener la misma clave de partición.
-
-#### REPLACE PARTITION {#alter_replace-partition}
-
-``` sql
-ALTER TABLE table2 REPLACE PARTITION partition_expr FROM table1
-```
-
-Esta consulta copia la partición de datos `table1` a `table2` y reemplaza la partición existente en el `table2`. Tenga en cuenta que los datos no se eliminarán de `table1`.
-
-Para que la consulta se ejecute correctamente, se deben cumplir las siguientes condiciones:
-
--   Ambas tablas deben tener la misma estructura.
--   Ambas tablas deben tener la misma clave de partición.
-
-#### MOVE PARTITION TO TABLE {#alter_move_to_table-partition}
-
-``` sql
-ALTER TABLE table_source MOVE PARTITION partition_expr TO TABLE table_dest
-```
-
-Esta consulta mueve la partición de datos `table_source` a `table_dest` con la eliminación de los datos de `table_source`.
-
-Para que la consulta se ejecute correctamente, se deben cumplir las siguientes condiciones:
-
--   Ambas tablas deben tener la misma estructura.
--   Ambas tablas deben tener la misma clave de partición.
--   Ambas tablas deben ser de la misma familia de motores. (replicado o no replicado)
--   Ambas tablas deben tener la misma política de almacenamiento.
-
-#### CLEAR COLUMN IN PARTITION {#alter_clear-column-partition}
-
-``` sql
-ALTER TABLE table_name CLEAR COLUMN column_name IN PARTITION partition_expr
-```
-
-Restablece todos los valores de la columna especificada en una partición. Si el `DEFAULT` cláusula se determinó al crear una tabla, esta consulta establece el valor de columna en un valor predeterminado especificado.
-
-Ejemplo:
-
-``` sql
-ALTER TABLE visits CLEAR COLUMN hour in PARTITION 201902
-```
-
-#### FREEZE PARTITION {#alter_freeze-partition}
-
-``` sql
-ALTER TABLE table_name FREEZE [PARTITION partition_expr]
-```
-
-Esta consulta crea una copia de seguridad local de una partición especificada. Si el `PARTITION` se omite la cláusula, la consulta crea la copia de seguridad de todas las particiones a la vez.
-
-!!! note "Nota"
-    Todo el proceso de copia de seguridad se realiza sin detener el servidor.
-
-Tenga en cuenta que para las tablas de estilo antiguo puede especificar el prefijo del nombre de la partición (por ejemplo, ‘2019’) - entonces la consulta crea la copia de seguridad para todas las particiones correspondientes. Lea cómo configurar la expresión de partición en una sección [Cómo especificar la expresión de partición](#alter-how-to-specify-part-expr).
-
-En el momento de la ejecución, para una instantánea de datos, la consulta crea vínculos rígidos a los datos de una tabla. Los enlaces duros se colocan en el directorio `/var/lib/clickhouse/shadow/N/...`, donde:
-
--   `/var/lib/clickhouse/` es el directorio ClickHouse de trabajo especificado en la configuración.
--   `N` es el número incremental de la copia de seguridad.
-
-!!! note "Nota"
-    Si usted usa [un conjunto de discos para el almacenamiento de datos en una tabla](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-multiple-volumes), el `shadow/N` directorio aparece en cada disco, almacenando partes de datos que coinciden con el `PARTITION` expresion.
-
-La misma estructura de directorios se crea dentro de la copia de seguridad que dentro `/var/lib/clickhouse/`. La consulta realiza ‘chmod’ para todos los archivos, prohibiendo escribir en ellos.
-
-Después de crear la copia de seguridad, puede copiar los datos desde `/var/lib/clickhouse/shadow/` al servidor remoto y, a continuación, elimínelo del servidor local. Tenga en cuenta que el `ALTER t FREEZE PARTITION` consulta no se replica. Crea una copia de seguridad local solo en el servidor local.
-
-La consulta crea una copia de seguridad casi instantáneamente (pero primero espera a que las consultas actuales a la tabla correspondiente terminen de ejecutarse).
-
-`ALTER TABLE t FREEZE PARTITION` copia solo los datos, no los metadatos de la tabla. Para hacer una copia de seguridad de los metadatos de la tabla, copie el archivo `/var/lib/clickhouse/metadata/database/table.sql`
-
-Para restaurar los datos de una copia de seguridad, haga lo siguiente:
-
-1.  Cree la tabla si no existe. Para ver la consulta, utilice el .archivo sql (reemplazar `ATTACH` en ella con `CREATE`).
-2.  Copie los datos de la `data/database/table/` directorio dentro de la copia de seguridad a la `/var/lib/clickhouse/data/database/table/detached/` directorio.
-3.  Ejecutar `ALTER TABLE t ATTACH PARTITION` consultas para agregar los datos a una tabla.
-
-La restauración desde una copia de seguridad no requiere detener el servidor.
-
-Para obtener más información sobre las copias de seguridad y la restauración de datos, consulte [Copia de seguridad de datos](../../operations/backup.md) apartado.
-
-#### CLEAR INDEX IN PARTITION {#alter_clear-index-partition}
-
-``` sql
-ALTER TABLE table_name CLEAR INDEX index_name IN PARTITION partition_expr
-```
-
-La consulta funciona de forma similar a `CLEAR COLUMN`, pero restablece un índice en lugar de una columna de datos.
-
-#### FETCH PARTITION {#alter_fetch-partition}
-
-``` sql
-ALTER TABLE table_name FETCH PARTITION partition_expr FROM 'path-in-zookeeper'
-```
-
-Descarga una partición desde otro servidor. Esta consulta solo funciona para las tablas replicadas.
-
-La consulta hace lo siguiente:
-
-1.  Descarga la partición del fragmento especificado. En ‘path-in-zookeeper’ debe especificar una ruta al fragmento en ZooKeeper.
-2.  Luego, la consulta coloca los datos descargados en el `detached` directorio de la `table_name` tabla. Utilice el [ATTACH PARTITION\|PART](#alter_attach-partition) consulta para agregar los datos a la tabla.
-
-Por ejemplo:
-
-``` sql
-ALTER TABLE users FETCH PARTITION 201902 FROM '/clickhouse/tables/01-01/visits';
-ALTER TABLE users ATTACH PARTITION 201902;
-```
-
-Tenga en cuenta que:
-
--   El `ALTER ... FETCH PARTITION` consulta no se replica. Coloca la partición en el `detached` sólo en el servidor local.
--   El `ALTER TABLE ... ATTACH` consulta se replica. Agrega los datos a todas las réplicas. Los datos se agregan a una de las réplicas desde el `detached` directorio, y para los demás - de réplicas vecinas.
-
-Antes de descargar, el sistema verifica si la partición existe y la estructura de la tabla coincide. La réplica más adecuada se selecciona automáticamente de las réplicas en buen estado.
-
-Aunque se llama a la consulta `ALTER TABLE`, no cambia la estructura de la tabla y no cambiar inmediatamente los datos disponibles en la tabla.
-
-#### MOVE PARTITION\|PART {#alter_move-partition}
-
-Mueve particiones o partes de datos a otro volumen o disco para `MergeTree`-mesas de motor. Ver [Uso de varios dispositivos de bloque para el almacenamiento de datos](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-multiple-volumes).
-
-``` sql
-ALTER TABLE table_name MOVE PARTITION|PART partition_expr TO DISK|VOLUME 'disk_name'
-```
-
-El `ALTER TABLE t MOVE` consulta:
-
--   No replicado, porque diferentes réplicas pueden tener diferentes directivas de almacenamiento.
--   Devuelve un error si el disco o volumen especificado no está configurado. La consulta también devuelve un error si no se pueden aplicar las condiciones de movimiento de datos especificadas en la directiva de almacenamiento.
--   Puede devolver un error en el caso, cuando los datos que se moverán ya se mueven por un proceso en segundo plano, concurrente `ALTER TABLE t MOVE` consulta o como resultado de la fusión de datos de fondo. Un usuario no debe realizar ninguna acción adicional en este caso.
-
-Ejemplo:
-
-``` sql
-ALTER TABLE hits MOVE PART '20190301_14343_16206_438' TO VOLUME 'slow'
-ALTER TABLE hits MOVE PARTITION '2019-09-01' TO DISK 'fast_ssd'
-```
-
-#### Cómo establecer la expresión de partición {#alter-how-to-specify-part-expr}
-
-Puede especificar la expresión de partición en `ALTER ... PARTITION` de diferentes maneras:
-
--   Como valor de la `partition` columna de la `system.parts` tabla. Por ejemplo, `ALTER TABLE visits DETACH PARTITION 201901`.
--   Como la expresión de la columna de la tabla. Se admiten constantes y expresiones constantes. Por ejemplo, `ALTER TABLE visits DETACH PARTITION toYYYYMM(toDate('2019-01-25'))`.
--   Usando el ID de partición. El ID de partición es un identificador de cadena de la partición (legible por humanos, si es posible) que se usa como nombres de particiones en el sistema de archivos y en ZooKeeper. El ID de partición debe especificarse en el `PARTITION ID` cláusula, entre comillas simples. Por ejemplo, `ALTER TABLE visits DETACH PARTITION ID '201901'`.
--   En el [ALTER ATTACH PART](#alter_attach-partition) y [DROP DETACHED PART](#alter_drop-detached) consulta, para especificar el nombre de una parte, utilice un literal de cadena con un valor `name` columna de la [sistema.detached_parts](../../operations/system-tables.md#system_tables-detached_parts) tabla. Por ejemplo, `ALTER TABLE visits ATTACH PART '201901_1_1_0'`.
-
-El uso de comillas al especificar la partición depende del tipo de expresión de partición. Por ejemplo, para el `String` tipo, debe especificar su nombre entre comillas (`'`). Para el `Date` y `Int*` tipos no se necesitan comillas.
-
-Para las tablas de estilo antiguo, puede especificar la partición como un número `201901` o una cadena `'201901'`. La sintaxis para las tablas de nuevo estilo es más estricta con los tipos (similar al analizador para el formato de entrada VALUES).
-
-Todas las reglas anteriores también son ciertas para el [OPTIMIZE](misc.md#misc_operations-optimize) consulta. Si necesita especificar la única partición al optimizar una tabla no particionada, establezca la expresión `PARTITION tuple()`. Por ejemplo:
-
-``` sql
-OPTIMIZE TABLE table_not_partitioned PARTITION tuple() FINAL;
-```
-
-Los ejemplos de `ALTER ... PARTITION` las consultas se demuestran en las pruebas [`00502_custom_partitioning_local`](https://github.com/ClickHouse/ClickHouse/blob/master/tests/queries/0_stateless/00502_custom_partitioning_local.sql) y [`00502_custom_partitioning_replicated_zookeeper`](https://github.com/ClickHouse/ClickHouse/blob/master/tests/queries/0_stateless/00502_custom_partitioning_replicated_zookeeper.sql).
-
-### Manipulaciones con Tabla TTL {#manipulations-with-table-ttl}
-
-Usted puede cambiar [tabla TTL](../../engines/table-engines/mergetree-family/mergetree.md#mergetree-table-ttl) con una solicitud del siguiente formulario:
-
-``` sql
-ALTER TABLE table-name MODIFY TTL ttl-expression
-```
-
-### Sincronicidad de las consultas ALTER {#synchronicity-of-alter-queries}
-
-Para tablas no replicables, todas `ALTER` las consultas se realizan de forma sincrónica. Para las tablas replicables, la consulta solo agrega instrucciones para las acciones apropiadas para `ZooKeeper`, y las acciones mismas se realizan tan pronto como sea posible. Sin embargo, la consulta puede esperar a que estas acciones se completen en todas las réplicas.
-
-Para `ALTER ... ATTACH|DETACH|DROP` consultas, puede utilizar el `replication_alter_partitions_sync` configuración para configurar la espera.
-Valores posibles: `0` – do not wait; `1` – only wait for own execution (default); `2` – wait for all.
-
-### Mutación {#alter-mutations}
-
-Las mutaciones son una variante de consulta ALTER que permite cambiar o eliminar filas en una tabla. En contraste con el estándar `UPDATE` y `DELETE` consultas destinadas a cambios de datos puntuales, las mutaciones están destinadas a operaciones pesadas que cambian muchas filas en una tabla. Apoyado para el `MergeTree` familia de motores de mesa, incluidos los motores con soporte de replicación.
-
-Las tablas existentes están listas para las mutaciones tal como están (no es necesaria la conversión), pero después de que la primera mutación se aplica a una tabla, su formato de metadatos se vuelve incompatible con las versiones anteriores del servidor y volver a una versión anterior se vuelve imposible.
-
-Comandos disponibles actualmente:
-
-``` sql
-ALTER TABLE [db.]table DELETE WHERE filter_expr
-```
-
-El `filter_expr` debe ser de tipo `UInt8`. La consulta elimina las filas de la tabla para la que esta expresión toma un valor distinto de cero.
-
-``` sql
-ALTER TABLE [db.]table UPDATE column1 = expr1 [, ...] WHERE filter_expr
-```
-
-El `filter_expr` debe ser de tipo `UInt8`. Esta consulta actualiza los valores de las columnas especificadas a los valores de las expresiones correspondientes `filter_expr` toma un valor distinto de cero. Los valores se convierten al tipo de columna utilizando el `CAST` operador. No se admite la actualización de columnas que se utilizan en el cálculo de la clave principal o de partición.
-
-``` sql
-ALTER TABLE [db.]table MATERIALIZE INDEX name IN PARTITION partition_name
-```
-
-La consulta reconstruye el índice secundario `name` en la partición `partition_name`.
-
-Una consulta puede contener varios comandos separados por comas.
-
-Para las tablas \*MergeTree, las mutaciones se ejecutan reescribiendo partes de datos completas. No hay atomicidad - las partes se sustituyen por partes mutadas tan pronto como están listas y una `SELECT` La consulta que comenzó a ejecutarse durante una mutación verá datos de partes que ya han sido mutadas junto con datos de partes que aún no han sido mutadas.
-
-Las mutaciones están totalmente ordenadas por su orden de creación y se aplican a cada parte en ese orden. Las mutaciones también se ordenan parcialmente con INSERTs: los datos que se insertaron en la tabla antes de que se enviara la mutación se mutarán y los datos que se insertaron después de eso no se mutarán. Tenga en cuenta que las mutaciones no bloquean INSERTs de ninguna manera.
-
-Una consulta de mutación regresa inmediatamente después de agregar la entrada de mutación (en el caso de tablas replicadas a ZooKeeper, para tablas no replicadas, al sistema de archivos). La mutación en sí se ejecuta de forma asíncrona utilizando la configuración del perfil del sistema. Para realizar un seguimiento del progreso de las mutaciones, puede usar el [`system.mutations`](../../operations/system-tables.md#system_tables-mutations) tabla. Una mutación que se envió correctamente continuará ejecutándose incluso si se reinician los servidores ClickHouse. No hay forma de revertir la mutación una vez que se presenta, pero si la mutación está atascada por alguna razón, puede cancelarse con el [`KILL MUTATION`](misc.md#kill-mutation) consulta.
-
-Las entradas de mutaciones terminadas no se eliminan de inmediato (el número de entradas conservadas viene determinado por el `finished_mutations_to_keep` parámetro del motor de almacenamiento). Las entradas de mutación más antiguas se eliminan.
-
-## ALTER USER {#alter-user-statement}
-
-Cambia las cuentas de usuario de ClickHouse.
-
-### Sintaxis {#alter-user-syntax}
-
-``` sql
-ALTER USER [IF EXISTS] name [ON CLUSTER cluster_name]
-    [RENAME TO new_name]
-    [IDENTIFIED [WITH {PLAINTEXT_PASSWORD|SHA256_PASSWORD|DOUBLE_SHA1_PASSWORD}] BY {'password'|'hash'}]
-    [[ADD|DROP] HOST {LOCAL | NAME 'name' | REGEXP 'name_regexp' | IP 'address' | LIKE 'pattern'} [,...] | ANY | NONE]
-    [DEFAULT ROLE role [,...] | ALL | ALL EXCEPT role [,...] ]
-    [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | PROFILE 'profile_name'] [,...]
-```
-
-### Descripci {#alter-user-dscr}
-
-Utilizar `ALTER USER` debe tener el [ALTER USER](grant.md#grant-access-management) privilegio.
-
-### Ejemplos {#alter-user-examples}
-
-Establecer roles concedidos como predeterminados:
-
-``` sql
-ALTER USER user DEFAULT ROLE role1, role2
-```
-
-Si los roles no se otorgan previamente a un usuario, ClickHouse produce una excepción.
-
-Establezca todas las funciones concedidas como predeterminadas:
-
-``` sql
-ALTER USER user DEFAULT ROLE ALL
-```
-
-Si se otorga un rol a un usuario en el futuro, se convertirá en predeterminado automáticamente.
-
-Establezca todas las funciones otorgadas a excepción predeterminada `role1` y `role2`:
-
-``` sql
-ALTER USER user DEFAULT ROLE ALL EXCEPT role1, role2
-```
-
-## ALTER ROLE {#alter-role-statement}
-
-Cambia los roles.
-
-### Sintaxis {#alter-role-syntax}
-
-``` sql
-ALTER ROLE [IF EXISTS] name [ON CLUSTER cluster_name]
-    [RENAME TO new_name]
-    [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | PROFILE 'profile_name'] [,...]
-```
-
-## ALTER ROW POLICY {#alter-row-policy-statement}
-
-Cambia la política de fila.
-
-### Sintaxis {#alter-row-policy-syntax}
-
-``` sql
-ALTER [ROW] POLICY [IF EXISTS] name [ON CLUSTER cluster_name] ON [database.]table
-    [RENAME TO new_name]
-    [AS {PERMISSIVE | RESTRICTIVE}]
-    [FOR SELECT]
-    [USING {condition | NONE}][,...]
-    [TO {role [,...] | ALL | ALL EXCEPT role [,...]}]
-```
-
-## ALTER QUOTA {#alter-quota-statement}
-
-Cambia las cuotas.
-
-### Sintaxis {#alter-quota-syntax}
-
-``` sql
-ALTER QUOTA [IF EXISTS] name [ON CLUSTER cluster_name]
-    [RENAME TO new_name]
-    [KEYED BY {'none' | 'user name' | 'ip address' | 'client key' | 'client key or user name' | 'client key or ip address'}]
-    [FOR [RANDOMIZED] INTERVAL number {SECOND | MINUTE | HOUR | DAY | WEEK | MONTH | QUARTER | YEAR}
-        {MAX { {QUERIES | ERRORS | RESULT ROWS | RESULT BYTES | READ ROWS | READ BYTES | EXECUTION TIME} = number } [,...] |
-        NO LIMITS | TRACKING ONLY} [,...]]
-    [TO {role [,...] | ALL | ALL EXCEPT role [,...]}]
-```
-
-## ALTER SETTINGS PROFILE {#alter-settings-profile-statement}
-
-Cambia las cuotas.
-
-### Sintaxis {#alter-settings-profile-syntax}
-
-``` sql
-ALTER SETTINGS PROFILE [IF EXISTS] name [ON CLUSTER cluster_name]
-    [RENAME TO new_name]
-    [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | INHERIT 'profile_name'] [,...]
-```
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/alter/) <!--hide-->
diff --git a/docs/es/sql-reference/statements/create.md b/docs/es/sql-reference/statements/create.md
deleted file mode 100644
index db3194ae114..00000000000
--- a/docs/es/sql-reference/statements/create.md
+++ /dev/null
@@ -1,502 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 35
-toc_title: CREATE
----
-
-# CREATE Consultas {#create-queries}
-
-## CREATE DATABASE {#query-language-create-database}
-
-Crea una base de datos.
-
-``` sql
-CREATE DATABASE [IF NOT EXISTS] db_name [ON CLUSTER cluster] [ENGINE = engine(...)]
-```
-
-### Clausula {#clauses}
-
--   `IF NOT EXISTS`
-    Si el `db_name` base de datos ya existe, entonces ClickHouse no crea una nueva base de datos y:
-
-    -   No lanza una excepción si se especifica una cláusula.
-    -   Lanza una excepción si no se especifica la cláusula.
-
--   `ON CLUSTER`
-    ClickHouse crea el `db_name` base de datos en todos los servidores de un clúster especificado.
-
--   `ENGINE`
-
-    -   [MySQL](../../engines/database-engines/mysql.md)
-        Le permite recuperar datos del servidor MySQL remoto.
-        De forma predeterminada, ClickHouse usa su propio [motor de base de datos](../../engines/database-engines/index.md).
-
-## CREATE TABLE {#create-table-query}
-
-El `CREATE TABLE` consulta puede tener varias formas.
-
-``` sql
-CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
-(
-    name1 [type1] [DEFAULT|MATERIALIZED|ALIAS expr1] [compression_codec] [TTL expr1],
-    name2 [type2] [DEFAULT|MATERIALIZED|ALIAS expr2] [compression_codec] [TTL expr2],
-    ...
-) ENGINE = engine
-```
-
-Crea una tabla llamada ‘name’ en el ‘db’ base de datos o la base de datos actual si ‘db’ no está establecida, con la estructura especificada entre paréntesis y ‘engine’ motor.
-La estructura de la tabla es una lista de descripciones de columnas. Si los índices son compatibles con el motor, se indican como parámetros para el motor de tablas.
-
-Una descripción de columna es `name type` en el caso más simple. Ejemplo: `RegionID UInt32`.
-Las expresiones también se pueden definir para los valores predeterminados (ver más abajo).
-
-``` sql
-CREATE TABLE [IF NOT EXISTS] [db.]table_name AS [db2.]name2 [ENGINE = engine]
-```
-
-Crea una tabla con la misma estructura que otra tabla. Puede especificar un motor diferente para la tabla. Si no se especifica el motor, se utilizará el mismo motor que para el `db2.name2` tabla.
-
-``` sql
-CREATE TABLE [IF NOT EXISTS] [db.]table_name AS table_function()
-```
-
-Crea una tabla con la estructura y los datos [función de la tabla](../table-functions/index.md#table-functions).
-
-``` sql
-CREATE TABLE [IF NOT EXISTS] [db.]table_name ENGINE = engine AS SELECT ...
-```
-
-Crea una tabla con una estructura como el resultado de la `SELECT` consulta, con el ‘engine’ motor, y lo llena con datos de SELECT.
-
-En todos los casos, si `IF NOT EXISTS` se especifica, la consulta no devolverá un error si la tabla ya existe. En este caso, la consulta no hará nada.
-
-Puede haber otras cláusulas después del `ENGINE` cláusula en la consulta. Consulte la documentación detallada sobre cómo crear tablas en las descripciones de [motores de mesa](../../engines/table-engines/index.md#table_engines).
-
-### Valores predeterminados {#create-default-values}
-
-La descripción de la columna puede especificar una expresión para un valor predeterminado, de una de las siguientes maneras:`DEFAULT expr`, `MATERIALIZED expr`, `ALIAS expr`.
-Ejemplo: `URLDomain String DEFAULT domain(URL)`.
-
-Si no se define una expresión para el valor predeterminado, los valores predeterminados se establecerán en ceros para números, cadenas vacías para cadenas, matrices vacías para matrices y `1970-01-01` para fechas o zero unix timestamp para las fechas con el tiempo. Los NULL no son compatibles.
-
-Si se define la expresión predeterminada, el tipo de columna es opcional. Si no hay un tipo definido explícitamente, se utiliza el tipo de expresión predeterminado. Ejemplo: `EventDate DEFAULT toDate(EventTime)` – the ‘Date’ tipo será utilizado para el ‘EventDate’ columna.
-
-Si el tipo de datos y la expresión predeterminada se definen explícitamente, esta expresión se convertirá al tipo especificado utilizando funciones de conversión de tipos. Ejemplo: `Hits UInt32 DEFAULT 0` significa lo mismo que `Hits UInt32 DEFAULT toUInt32(0)`.
-
-Default expressions may be defined as an arbitrary expression from table constants and columns. When creating and changing the table structure, it checks that expressions don't contain loops. For INSERT, it checks that expressions are resolvable – that all columns they can be calculated from have been passed.
-
-`DEFAULT expr`
-
-Valor predeterminado Normal. Si la consulta INSERT no especifica la columna correspondiente, se completará calculando la expresión correspondiente.
-
-`MATERIALIZED expr`
-
-Expresión materializada. Dicha columna no se puede especificar para INSERT, porque siempre se calcula.
-Para un INSERT sin una lista de columnas, estas columnas no se consideran.
-Además, esta columna no se sustituye cuando se utiliza un asterisco en una consulta SELECT. Esto es para preservar el invariante que el volcado obtuvo usando `SELECT *` se puede volver a insertar en la tabla usando INSERT sin especificar la lista de columnas.
-
-`ALIAS expr`
-
-Sinónimo. Tal columna no se almacena en la tabla en absoluto.
-Sus valores no se pueden insertar en una tabla, y no se sustituye cuando se usa un asterisco en una consulta SELECT.
-Se puede usar en SELECT si el alias se expande durante el análisis de consultas.
-
-Cuando se utiliza la consulta ALTER para agregar nuevas columnas, no se escriben datos antiguos para estas columnas. En su lugar, al leer datos antiguos que no tienen valores para las nuevas columnas, las expresiones se calculan sobre la marcha de forma predeterminada. Sin embargo, si la ejecución de las expresiones requiere diferentes columnas que no están indicadas en la consulta, estas columnas se leerán adicionalmente, pero solo para los bloques de datos que lo necesitan.
-
-Si agrega una nueva columna a una tabla pero luego cambia su expresión predeterminada, los valores utilizados para los datos antiguos cambiarán (para los datos donde los valores no se almacenaron en el disco). Tenga en cuenta que cuando se ejecutan combinaciones en segundo plano, los datos de las columnas que faltan en una de las partes de combinación se escriben en la parte combinada.
-
-No es posible establecer valores predeterminados para elementos en estructuras de datos anidadas.
-
-### Limitación {#constraints}
-
-Junto con las descripciones de columnas, se podrían definir restricciones:
-
-``` sql
-CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
-(
-    name1 [type1] [DEFAULT|MATERIALIZED|ALIAS expr1] [compression_codec] [TTL expr1],
-    ...
-    CONSTRAINT constraint_name_1 CHECK boolean_expr_1,
-    ...
-) ENGINE = engine
-```
-
-`boolean_expr_1` podría por cualquier expresión booleana. Si se definen restricciones para la tabla, cada una de ellas se verificará para cada fila en `INSERT` query. If any constraint is not satisfied — server will raise an exception with constraint name and checking expression.
-
-Agregar una gran cantidad de restricciones puede afectar negativamente el rendimiento de grandes `INSERT` consulta.
-
-### Expresión TTL {#ttl-expression}
-
-Define el tiempo de almacenamiento de los valores. Solo se puede especificar para tablas de la familia MergeTree. Para la descripción detallada, ver [TTL para columnas y tablas](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-ttl).
-
-### Códecs de compresión de columna {#codecs}
-
-De forma predeterminada, ClickHouse aplica el `lz4` método de compresión. Para `MergeTree`- familia de motor puede cambiar el método de compresión predeterminado en el [compresión](../../operations/server-configuration-parameters/settings.md#server-settings-compression) sección de una configuración de servidor. También puede definir el método de compresión para cada columna `CREATE TABLE` consulta.
-
-``` sql
-CREATE TABLE codec_example
-(
-    dt Date CODEC(ZSTD),
-    ts DateTime CODEC(LZ4HC),
-    float_value Float32 CODEC(NONE),
-    double_value Float64 CODEC(LZ4HC(9))
-    value Float32 CODEC(Delta, ZSTD)
-)
-ENGINE = <Engine>
-...
-```
-
-Si se especifica un códec, el códec predeterminado no se aplica. Los códecs se pueden combinar en una tubería, por ejemplo, `CODEC(Delta, ZSTD)`. Para seleccionar la mejor combinación de códecs para su proyecto, pase puntos de referencia similares a los descritos en Altinity [Nuevas codificaciones para mejorar la eficiencia de ClickHouse](https://www.altinity.com/blog/2019/7/new-encodings-to-improve-clickhouse) artículo.
-
-!!! warning "Advertencia"
-    No puede descomprimir archivos de base de datos ClickHouse con utilidades externas como `lz4`. En su lugar, use el especial [Compresor de clickhouse](https://github.com/ClickHouse/ClickHouse/tree/master/programs/compressor) utilidad.
-
-La compresión es compatible con los siguientes motores de tablas:
-
--   [Método de codificación de datos:](../../engines/table-engines/mergetree-family/mergetree.md) familia. Admite códecs de compresión de columnas y selecciona el método de compresión predeterminado mediante [compresión](../../operations/server-configuration-parameters/settings.md#server-settings-compression) configuración.
--   [Registro](../../engines/table-engines/log-family/index.md) familia. Utiliza el `lz4` método de compresión por defecto y soporta códecs de compresión de columna.
--   [Establecer](../../engines/table-engines/special/set.md). Solo admite la compresión predeterminada.
--   [Unir](../../engines/table-engines/special/join.md). Solo admite la compresión predeterminada.
-
-ClickHouse admite códecs de propósito común y códecs especializados.
-
-#### Especializados Codecs {#create-query-specialized-codecs}
-
-Estos códecs están diseñados para hacer que la compresión sea más efectiva mediante el uso de características específicas de los datos. Algunos de estos códecs no comprimen los datos por sí mismos. En su lugar, preparan los datos para un códec de propósito común, que lo comprime mejor que sin esta preparación.
-
-Especializados codecs:
-
--   `Delta(delta_bytes)` — Compression approach in which raw values are replaced by the difference of two neighboring values, except for the first value that stays unchanged. Up to `delta_bytes` se utilizan para almacenar valores delta, por lo que `delta_bytes` es el tamaño máximo de los valores brutos. Posible `delta_bytes` valores: 1, 2, 4, 8. El valor predeterminado para `delta_bytes` ser `sizeof(type)` si es igual a 1, 2, 4 u 8. En todos los demás casos, es 1.
--   `DoubleDelta` — Calculates delta of deltas and writes it in compact binary form. Optimal compression rates are achieved for monotonic sequences with a constant stride, such as time series data. Can be used with any fixed-width type. Implements the algorithm used in Gorilla TSDB, extending it to support 64-bit types. Uses 1 extra bit for 32-byte deltas: 5-bit prefixes instead of 4-bit prefixes. For additional information, see Compressing Time Stamps in [Gorila: Una base de datos de series temporales rápida, escalable y en memoria](http://www.vldb.org/pvldb/vol8/p1816-teller.pdf).
--   `Gorilla` — Calculates XOR between current and previous value and writes it in compact binary form. Efficient when storing a series of floating point values that change slowly, because the best compression rate is achieved when neighboring values are binary equal. Implements the algorithm used in Gorilla TSDB, extending it to support 64-bit types. For additional information, see Compressing Values in [Gorila: Una base de datos de series temporales rápida, escalable y en memoria](http://www.vldb.org/pvldb/vol8/p1816-teller.pdf).
--   `T64` — Compression approach that crops unused high bits of values in integer data types (including `Enum`, `Date` y `DateTime`). En cada paso de su algoritmo, el códec toma un bloque de 64 valores, los coloca en una matriz de 64x64 bits, lo transpone, recorta los bits de valores no utilizados y devuelve el resto como una secuencia. Los bits no utilizados son los bits, que no difieren entre los valores máximo y mínimo en toda la parte de datos para la que se utiliza la compresión.
-
-`DoubleDelta` y `Gorilla` códecs se utilizan en Gorilla TSDB como los componentes de su algoritmo de compresión. El enfoque de gorila es efectivo en escenarios en los que hay una secuencia de valores que cambian lentamente con sus marcas de tiempo. Las marcas de tiempo se comprimen efectivamente por el `DoubleDelta` códec, y los valores son efectivamente comprimidos por el `Gorilla` códec. Por ejemplo, para obtener una tabla almacenada efectivamente, puede crearla en la siguiente configuración:
-
-``` sql
-CREATE TABLE codec_example
-(
-    timestamp DateTime CODEC(DoubleDelta),
-    slow_values Float32 CODEC(Gorilla)
-)
-ENGINE = MergeTree()
-```
-
-#### Códecs de uso general {#create-query-general-purpose-codecs}
-
-Códecs:
-
--   `NONE` — No compression.
--   `LZ4` — Lossless [algoritmo de compresión de datos](https://github.com/lz4/lz4) utilizado por defecto. Aplica compresión rápida LZ4.
--   `LZ4HC[(level)]` — LZ4 HC (high compression) algorithm with configurable level. Default level: 9. Setting `level <= 0` aplica el nivel predeterminado. Niveles posibles: \[1, 12\]. Rango de nivel recomendado: \[4, 9\].
--   `ZSTD[(level)]` — [Algoritmo de compresión ZSTD](https://en.wikipedia.org/wiki/Zstandard) con configurable `level`. Niveles posibles: \[1, 22\]. Valor predeterminado: 1.
-
-Los altos niveles de compresión son útiles para escenarios asimétricos, como comprimir una vez, descomprimir repetidamente. Los niveles más altos significan una mejor compresión y un mayor uso de la CPU.
-
-## Tablas temporales {#temporary-tables}
-
-ClickHouse admite tablas temporales que tienen las siguientes características:
-
--   Las tablas temporales desaparecen cuando finaliza la sesión, incluso si se pierde la conexión.
--   Una tabla temporal solo utiliza el motor de memoria.
--   No se puede especificar la base de datos para una tabla temporal. Se crea fuera de las bases de datos.
--   Imposible crear una tabla temporal con consulta DDL distribuida en todos los servidores de clúster (mediante `ON CLUSTER`): esta tabla sólo existe en la sesión actual.
--   Si una tabla temporal tiene el mismo nombre que otra y una consulta especifica el nombre de la tabla sin especificar la base de datos, se utilizará la tabla temporal.
--   Para el procesamiento de consultas distribuidas, las tablas temporales utilizadas en una consulta se pasan a servidores remotos.
-
-Para crear una tabla temporal, utilice la siguiente sintaxis:
-
-``` sql
-CREATE TEMPORARY TABLE [IF NOT EXISTS] table_name
-(
-    name1 [type1] [DEFAULT|MATERIALIZED|ALIAS expr1],
-    name2 [type2] [DEFAULT|MATERIALIZED|ALIAS expr2],
-    ...
-)
-```
-
-En la mayoría de los casos, las tablas temporales no se crean manualmente, sino cuando se utilizan datos externos para una consulta o para `(GLOBAL) IN`. Para obtener más información, consulte las secciones correspondientes
-
-Es posible usar tablas con [MOTOR = Memoria](../../engines/table-engines/special/memory.md) en lugar de tablas temporales.
-
-## Consultas DDL distribuidas (cláusula ON CLUSTER) {#distributed-ddl-queries-on-cluster-clause}
-
-El `CREATE`, `DROP`, `ALTER`, y `RENAME` las consultas admiten la ejecución distribuida en un clúster.
-Por ejemplo, la siguiente consulta crea el `all_hits` `Distributed` la tabla en cada host `cluster`:
-
-``` sql
-CREATE TABLE IF NOT EXISTS all_hits ON CLUSTER cluster (p Date, i Int32) ENGINE = Distributed(cluster, default, hits)
-```
-
-Para ejecutar estas consultas correctamente, cada host debe tener la misma definición de clúster (para simplificar la sincronización de configuraciones, puede usar sustituciones de ZooKeeper). También deben conectarse a los servidores ZooKeeper.
-La versión local de la consulta finalmente se implementará en cada host del clúster, incluso si algunos hosts no están disponibles actualmente. El orden para ejecutar consultas dentro de un único host está garantizado.
-
-## CREATE VIEW {#create-view}
-
-``` sql
-CREATE [MATERIALIZED] VIEW [IF NOT EXISTS] [db.]table_name [TO[db.]name] [ENGINE = engine] [POPULATE] AS SELECT ...
-```
-
-Crea una vista. Hay dos tipos de vistas: normal y MATERIALIZADO.
-
-Las vistas normales no almacenan ningún dato, solo realizan una lectura desde otra tabla. En otras palabras, una vista normal no es más que una consulta guardada. Al leer desde una vista, esta consulta guardada se utiliza como una subconsulta en la cláusula FROM.
-
-Como ejemplo, suponga que ha creado una vista:
-
-``` sql
-CREATE VIEW view AS SELECT ...
-```
-
-y escribió una consulta:
-
-``` sql
-SELECT a, b, c FROM view
-```
-
-Esta consulta es totalmente equivalente a usar la subconsulta:
-
-``` sql
-SELECT a, b, c FROM (SELECT ...)
-```
-
-Las vistas materializadas almacenan datos transformados por la consulta SELECT correspondiente.
-
-Al crear una vista materializada sin `TO [db].[table]`, you must specify ENGINE – the table engine for storing data.
-
-Al crear una vista materializada con `TO [db].[table]` usted no debe usar `POPULATE`.
-
-Una vista materializada se organiza de la siguiente manera: al insertar datos en la tabla especificada en SELECT, parte de los datos insertados se convierte mediante esta consulta SELECT y el resultado se inserta en la vista.
-
-Si especifica POPULATE, los datos de tabla existentes se insertan en la vista al crearlos, como si `CREATE TABLE ... AS SELECT ...` . De lo contrario, la consulta solo contiene los datos insertados en la tabla después de crear la vista. No recomendamos usar POPULATE, ya que los datos insertados en la tabla durante la creación de la vista no se insertarán en ella.
-
-A `SELECT` consulta puede contener `DISTINCT`, `GROUP BY`, `ORDER BY`, `LIMIT`… Note that the corresponding conversions are performed independently on each block of inserted data. For example, if `GROUP BY` se establece, los datos se agregan durante la inserción, pero solo dentro de un solo paquete de datos insertados. Los datos no se agregarán más. La excepción es cuando se utiliza un ENGINE que realiza de forma independiente la agregación de datos, como `SummingMergeTree`.
-
-La ejecución de `ALTER` las consultas sobre vistas materializadas no se han desarrollado completamente, por lo que podrían ser inconvenientes. Si la vista materializada utiliza la construcción `TO [db.]name` puede `DETACH` la vista, ejecutar `ALTER` para la tabla de destino, y luego `ATTACH` el previamente separado (`DETACH`) vista.
-
-Las vistas tienen el mismo aspecto que las tablas normales. Por ejemplo, se enumeran en el resultado de la `SHOW TABLES` consulta.
-
-No hay una consulta separada para eliminar vistas. Para eliminar una vista, utilice `DROP TABLE`.
-
-## CREATE DICTIONARY {#create-dictionary-query}
-
-``` sql
-CREATE DICTIONARY [IF NOT EXISTS] [db.]dictionary_name [ON CLUSTER cluster]
-(
-    key1 type1  [DEFAULT|EXPRESSION expr1] [HIERARCHICAL|INJECTIVE|IS_OBJECT_ID],
-    key2 type2  [DEFAULT|EXPRESSION expr2] [HIERARCHICAL|INJECTIVE|IS_OBJECT_ID],
-    attr1 type2 [DEFAULT|EXPRESSION expr3],
-    attr2 type2 [DEFAULT|EXPRESSION expr4]
-)
-PRIMARY KEY key1, key2
-SOURCE(SOURCE_NAME([param1 value1 ... paramN valueN]))
-LAYOUT(LAYOUT_NAME([param_name param_value]))
-LIFETIME({MIN min_val MAX max_val | max_val})
-```
-
-Crear [diccionario externo](../../sql-reference/dictionaries/external-dictionaries/external-dicts.md) con dado [estructura](../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md), [fuente](../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md), [diseño](../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md) y [vida](../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md).
-
-La estructura del diccionario externo consta de atributos. Los atributos de diccionario se especifican de manera similar a las columnas de la tabla. La única propiedad de atributo requerida es su tipo, todas las demás propiedades pueden tener valores predeterminados.
-
-Dependiendo del diccionario [diseño](../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md) se pueden especificar uno o más atributos como claves de diccionario.
-
-Para obtener más información, consulte [Diccionarios externos](../dictionaries/external-dictionaries/external-dicts.md) apartado.
-
-## CREATE USER {#create-user-statement}
-
-Crea un [cuenta de usuario](../../operations/access-rights.md#user-account-management).
-
-### Sintaxis {#create-user-syntax}
-
-``` sql
-CREATE USER [IF NOT EXISTS | OR REPLACE] name [ON CLUSTER cluster_name]
-    [IDENTIFIED [WITH {NO_PASSWORD|PLAINTEXT_PASSWORD|SHA256_PASSWORD|SHA256_HASH|DOUBLE_SHA1_PASSWORD|DOUBLE_SHA1_HASH}] BY {'password'|'hash'}]
-    [HOST {LOCAL | NAME 'name' | REGEXP 'name_regexp' | IP 'address' | LIKE 'pattern'} [,...] | ANY | NONE]
-    [DEFAULT ROLE role [,...]]
-    [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | PROFILE 'profile_name'] [,...]
-```
-
-#### Identificación {#identification}
-
-Hay múltiples formas de identificación del usuario:
-
--   `IDENTIFIED WITH no_password`
--   `IDENTIFIED WITH plaintext_password BY 'qwerty'`
--   `IDENTIFIED WITH sha256_password BY 'qwerty'` o `IDENTIFIED BY 'password'`
--   `IDENTIFIED WITH sha256_hash BY 'hash'`
--   `IDENTIFIED WITH double_sha1_password BY 'qwerty'`
--   `IDENTIFIED WITH double_sha1_hash BY 'hash'`
-
-#### Anfitrión del usuario {#user-host}
-
-El host de usuario es un host desde el que se podría establecer una conexión con el servidor ClickHouse. El host se puede especificar en el `HOST` sección de consulta de las siguientes maneras:
-
--   `HOST IP 'ip_address_or_subnetwork'` — User can connect to ClickHouse server only from the specified IP address or a [subred](https://en.wikipedia.org/wiki/Subnetwork). Ejemplos: `HOST IP '192.168.0.0/16'`, `HOST IP '2001:DB8::/32'`. Para su uso en producción, sólo especifique `HOST IP` elementos (direcciones IP y sus máscaras), ya que usan `host` y `host_regexp` podría causar latencia adicional.
--   `HOST ANY` — User can connect from any location. This is default option.
--   `HOST LOCAL` — User can connect only locally.
--   `HOST NAME 'fqdn'` — User host can be specified as FQDN. For example, `HOST NAME 'mysite.com'`.
--   `HOST NAME REGEXP 'regexp'` — You can use [pcre](http://www.pcre.org/) expresiones regulares al especificar hosts de usuario. Por ejemplo, `HOST NAME REGEXP '.*\.mysite\.com'`.
--   `HOST LIKE 'template'` — Allows you use the [LIKE](../functions/string-search-functions.md#function-like) operador para filtrar los hosts de usuario. Por ejemplo, `HOST LIKE '%'` es equivalente a `HOST ANY`, `HOST LIKE '%.mysite.com'` filtros todos los anfitriones en el `mysite.com` dominio.
-
-Otra forma de especificar el host es usar `@` sintaxis con el nombre de usuario. Ejemplos:
-
--   `CREATE USER mira@'127.0.0.1'` — Equivalent to the `HOST IP` sintaxis.
--   `CREATE USER mira@'localhost'` — Equivalent to the `HOST LOCAL` sintaxis.
--   `CREATE USER mira@'192.168.%.%'` — Equivalent to the `HOST LIKE` sintaxis.
-
-!!! info "Advertencia"
-    ClickHouse trata `user_name@'address'` como un nombre de usuario en su conjunto. Por lo tanto, técnicamente puede crear múltiples usuarios con `user_name` y diferentes construcciones después `@`. No recomendamos hacerlo.
-
-### Ejemplos {#create-user-examples}
-
-Crear la cuenta de usuario `mira` protegido por la contraseña `qwerty`:
-
-``` sql
-CREATE USER mira HOST IP '127.0.0.1' IDENTIFIED WITH sha256_password BY 'qwerty'
-```
-
-`mira` debe iniciar la aplicación cliente en el host donde se ejecuta el servidor ClickHouse.
-
-Crear la cuenta de usuario `john`, asignarle roles y hacer que estos roles sean predeterminados:
-
-``` sql
-CREATE USER john DEFAULT ROLE role1, role2
-```
-
-Crear la cuenta de usuario `john` y hacer todos sus roles futuros por defecto:
-
-``` sql
-ALTER USER user DEFAULT ROLE ALL
-```
-
-Cuando se asignará algún rol a `john` en el futuro se convertirá en predeterminado automáticamente.
-
-Crear la cuenta de usuario `john` y hacer todos sus futuros roles por defecto excepto `role1` y `role2`:
-
-``` sql
-ALTER USER john DEFAULT ROLE ALL EXCEPT role1, role2
-```
-
-## CREATE ROLE {#create-role-statement}
-
-Crea un [rol](../../operations/access-rights.md#role-management).
-
-### Sintaxis {#create-role-syntax}
-
-``` sql
-CREATE ROLE [IF NOT EXISTS | OR REPLACE] name
-    [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | PROFILE 'profile_name'] [,...]
-```
-
-### Descripci {#create-role-description}
-
-El rol es un conjunto de [privilegio](grant.md#grant-privileges). Un usuario concedido con un rol obtiene todos los privilegios de este rol.
-
-A un usuario se le pueden asignar varios roles. Los usuarios pueden aplicar sus roles otorgados en combinaciones arbitrarias por el [SET ROLE](misc.md#set-role-statement) instrucción. El ámbito final de los privilegios es un conjunto combinado de todos los privilegios de todos los roles aplicados. Si un usuario tiene privilegios otorgados directamente a su cuenta de usuario, también se combinan con los privilegios otorgados por roles.
-
-El usuario puede tener roles predeterminados que se aplican al iniciar sesión del usuario. Para establecer roles predeterminados, utilice el [SET DEFAULT ROLE](misc.md#set-default-role-statement) declaración o el [ALTER USER](alter.md#alter-user-statement) instrucción.
-
-Para revocar un rol, utilice el [REVOKE](revoke.md) instrucción.
-
-Para eliminar el rol, utilice el [DROP ROLE](misc.md#drop-role-statement) instrucción. El rol eliminado se revoca automáticamente de todos los usuarios y roles a los que se concedió.
-
-### Ejemplos {#create-role-examples}
-
-``` sql
-CREATE ROLE accountant;
-GRANT SELECT ON db.* TO accountant;
-```
-
-Esta secuencia de consultas crea el rol `accountant` que tiene el privilegio de leer datos del `accounting` base.
-
-Conceder el rol al usuario `mira`:
-
-``` sql
-GRANT accountant TO mira;
-```
-
-Después de conceder el rol, el usuario puede usarlo y realizar las consultas permitidas. Por ejemplo:
-
-``` sql
-SET ROLE accountant;
-SELECT * FROM db.*;
-```
-
-## CREATE ROW POLICY {#create-row-policy-statement}
-
-Crea un [filtro para filas](../../operations/access-rights.md#row-policy-management) que un usuario puede leer de una tabla.
-
-### Sintaxis {#create-row-policy-syntax}
-
-``` sql
-CREATE [ROW] POLICY [IF NOT EXISTS | OR REPLACE] policy_name [ON CLUSTER cluster_name] ON [db.]table
-    [AS {PERMISSIVE | RESTRICTIVE}]
-    [FOR SELECT]
-    [USING condition]
-    [TO {role [,...] | ALL | ALL EXCEPT role [,...]}]
-```
-
-#### Sección AS {#create-row-policy-as}
-
-Con esta sección puede crear políticas permisivas o restrictivas.
-
-La política permisiva concede acceso a las filas. Las políticas permisivas que se aplican a la misma tabla se combinan usando el valor booleano `OR` operador. Las políticas son permisivas de forma predeterminada.
-
-La política restrictiva restringe el acceso a la fila. Las políticas restrictivas que se aplican a la misma tabla se combinan usando el valor booleano `AND` operador.
-
-Las políticas restrictivas se aplican a las filas que pasaron los filtros permisivos. Si establece directivas restrictivas pero no directivas permisivas, el usuario no puede obtener ninguna fila de la tabla.
-
-#### Sección A {#create-row-policy-to}
-
-En la sección `TO` puede dar una lista mixta de roles y usuarios, por ejemplo, `CREATE ROW POLICY ... TO accountant, john@localhost`.
-
-Palabra clave `ALL` significa todos los usuarios de ClickHouse, incluido el usuario actual. Palabras clave `ALL EXCEPT` permitir excluir a algunos usuarios de la lista de todos los usuarios, por ejemplo `CREATE ROW POLICY ... TO ALL EXCEPT accountant, john@localhost`
-
-### Ejemplos {#examples}
-
--   `CREATE ROW POLICY filter ON mydb.mytable FOR SELECT USING a<1000 TO accountant, john@localhost`
--   `CREATE ROW POLICY filter ON mydb.mytable FOR SELECT USING a<1000 TO ALL EXCEPT mira`
-
-## CREATE QUOTA {#create-quota-statement}
-
-Crea un [cuota](../../operations/access-rights.md#quotas-management) que se puede asignar a un usuario o a un rol.
-
-### Sintaxis {#create-quota-syntax}
-
-``` sql
-CREATE QUOTA [IF NOT EXISTS | OR REPLACE] name [ON CLUSTER cluster_name]
-    [KEYED BY {'none' | 'user name' | 'ip address' | 'client key' | 'client key or user name' | 'client key or ip address'}]
-    [FOR [RANDOMIZED] INTERVAL number {SECOND | MINUTE | HOUR | DAY | WEEK | MONTH | QUARTER | YEAR}
-        {MAX { {QUERIES | ERRORS | RESULT ROWS | RESULT BYTES | READ ROWS | READ BYTES | EXECUTION TIME} = number } [,...] |
-         NO LIMITS | TRACKING ONLY} [,...]]
-    [TO {role [,...] | ALL | ALL EXCEPT role [,...]}]
-```
-
-### Ejemplo {#create-quota-example}
-
-Limite el número máximo de consultas para el usuario actual con 123 consultas en una restricción de 15 meses:
-
-``` sql
-CREATE QUOTA qA FOR INTERVAL 15 MONTH MAX QUERIES 123 TO CURRENT_USER
-```
-
-## CREATE SETTINGS PROFILE {#create-settings-profile-statement}
-
-Crea un [perfil de configuración](../../operations/access-rights.md#settings-profiles-management) que se puede asignar a un usuario o a un rol.
-
-### Sintaxis {#create-settings-profile-syntax}
-
-``` sql
-CREATE SETTINGS PROFILE [IF NOT EXISTS | OR REPLACE] name [ON CLUSTER cluster_name]
-    [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | INHERIT 'profile_name'] [,...]
-```
-
-# Ejemplo {#create-settings-profile-syntax}
-
-Crear el `max_memory_usage_profile` perfil de configuración con valor y restricciones para el `max_memory_usage` configuración. Asignarlo a `robin`:
-
-``` sql
-CREATE SETTINGS PROFILE max_memory_usage_profile SETTINGS max_memory_usage = 100000001 MIN 90000000 MAX 110000000 TO robin
-```
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/create/) <!--hide-->
diff --git a/docs/es/sql-reference/statements/grant.md b/docs/es/sql-reference/statements/grant.md
deleted file mode 100644
index 783324e22db..00000000000
--- a/docs/es/sql-reference/statements/grant.md
+++ /dev/null
@@ -1,476 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 39
-toc_title: GRANT
----
-
-# GRANT {#grant}
-
--   Conceder [privilegio](#grant-privileges) a las cuentas o roles de usuario de ClickHouse.
--   Asigna roles a cuentas de usuario u otros roles.
-
-Para revocar privilegios, utilice el [REVOKE](revoke.md) instrucción. También puede enumerar los privilegios concedidos por el [SHOW GRANTS](show.md#show-grants-statement) instrucción.
-
-## Concesión de sintaxis de privilegios {#grant-privigele-syntax}
-
-``` sql
-GRANT [ON CLUSTER cluster_name] privilege[(column_name [,...])] [,...] ON {db.table|db.*|*.*|table|*} TO {user | role | CURRENT_USER} [,...] [WITH GRANT OPTION]
-```
-
--   `privilege` — Type of privilege.
--   `role` — ClickHouse user role.
--   `user` — ClickHouse user account.
-
-El `WITH GRANT OPTION` subvenciones de cláusula `user` o `role` con permiso para realizar el `GRANT` consulta. Los usuarios pueden otorgar privilegios del mismo alcance que tienen y menos.
-
-## Concesión de sintaxis de roles {#assign-role-syntax}
-
-``` sql
-GRANT [ON CLUSTER cluster_name] role [,...] TO {user | another_role | CURRENT_USER} [,...] [WITH ADMIN OPTION]
-```
-
--   `role` — ClickHouse user role.
--   `user` — ClickHouse user account.
-
-El `WITH ADMIN OPTION` conjuntos de cláusulas [ADMIN OPTION](#admin-option-privilege) privilegio para `user` o `role`.
-
-## Uso {#grant-usage}
-
-Utilizar `GRANT` su cuenta debe tener el `GRANT OPTION` privilegio. Puede otorgar privilegios solo dentro del ámbito de los privilegios de su cuenta.
-
-Por ejemplo, el administrador ha otorgado privilegios a `john` cuenta por la consulta:
-
-``` sql
-GRANT SELECT(x,y) ON db.table TO john WITH GRANT OPTION
-```
-
-Significa que `john` tiene el permiso para realizar:
-
--   `SELECT x,y FROM db.table`.
--   `SELECT x FROM db.table`.
--   `SELECT y FROM db.table`.
-
-`john` no puede realizar `SELECT z FROM db.table`. El `SELECT * FROM db.table` también no está disponible. Al procesar esta consulta, ClickHouse no devuelve ningún dato, incluso `x` y `y`. La única excepción es si una tabla `x` y `y` columnas, en este caso ClickHouse devuelve todos los datos.
-
-También `john` tiene el `GRANT OPTION` privilegios, por lo que puede otorgar a otros usuarios con privilegios del mismo o del menor alcance.
-
-Especificación de privilegios que puede utilizar asterisco (`*`) en lugar de una tabla o un nombre de base de datos. Por ejemplo, el `GRANT SELECT ON db.* TO john` consulta permite `john` para realizar el `SELECT` consulta sobre todas las tablas en `db` base. Además, puede omitir el nombre de la base de datos. En este caso, se otorgan privilegios para la base de datos actual, por ejemplo: `GRANT SELECT ON * TO john` otorga el privilegio en todas las tablas de la base de datos actual, `GRANT SELECT ON mytable TO john` otorga el privilegio sobre el `mytable` tabla en la base de datos actual.
-
-Acceso a la `system` base de datos siempre está permitida (ya que esta base de datos se utiliza para procesar consultas).
-
-Puede conceder varios privilegios a varias cuentas en una consulta. Consulta `GRANT SELECT, INSERT ON *.* TO john, robin` permite cuentas `john` y `robin` para realizar el `INSERT` y `SELECT` consultas sobre todas las tablas en todas las bases de datos en el servidor.
-
-## Privilegio {#grant-privileges}
-
-Privilegio es un permiso para realizar un tipo específico de consultas.
-
-Los privilegios tienen una estructura jerárquica. Un conjunto de consultas permitidas depende del ámbito de privilegios.
-
-Jerarquía de privilegios:
-
--   [SELECT](#grant-select)
--   [INSERT](#grant-insert)
--   [ALTER](#grant-alter)
-    -   `ALTER TABLE`
-        -   `ALTER UPDATE`
-        -   `ALTER DELETE`
-        -   `ALTER COLUMN`
-            -   `ALTER ADD COLUMN`
-            -   `ALTER DROP COLUMN`
-            -   `ALTER MODIFY COLUMN`
-            -   `ALTER COMMENT COLUMN`
-            -   `ALTER CLEAR COLUMN`
-            -   `ALTER RENAME COLUMN`
-        -   `ALTER INDEX`
-            -   `ALTER ORDER BY`
-            -   `ALTER ADD INDEX`
-            -   `ALTER DROP INDEX`
-            -   `ALTER MATERIALIZE INDEX`
-            -   `ALTER CLEAR INDEX`
-        -   `ALTER CONSTRAINT`
-            -   `ALTER ADD CONSTRAINT`
-            -   `ALTER DROP CONSTRAINT`
-        -   `ALTER TTL`
-        -   `ALTER MATERIALIZE TTL`
-        -   `ALTER SETTINGS`
-        -   `ALTER MOVE PARTITION`
-        -   `ALTER FETCH PARTITION`
-        -   `ALTER FREEZE PARTITION`
-    -   `ALTER VIEW`
-        -   `ALTER VIEW REFRESH`
-        -   `ALTER VIEW MODIFY QUERY`
--   [CREATE](#grant-create)
-    -   `CREATE DATABASE`
-    -   `CREATE TABLE`
-    -   `CREATE VIEW`
-    -   `CREATE DICTIONARY`
-    -   `CREATE TEMPORARY TABLE`
--   [DROP](#grant-drop)
-    -   `DROP DATABASE`
-    -   `DROP TABLE`
-    -   `DROP VIEW`
-    -   `DROP DICTIONARY`
--   [TRUNCATE](#grant-truncate)
--   [OPTIMIZE](#grant-optimize)
--   [SHOW](#grant-show)
-    -   `SHOW DATABASES`
-    -   `SHOW TABLES`
-    -   `SHOW COLUMNS`
-    -   `SHOW DICTIONARIES`
--   [KILL QUERY](#grant-kill-query)
--   [ACCESS MANAGEMENT](#grant-access-management)
-    -   `CREATE USER`
-    -   `ALTER USER`
-    -   `DROP USER`
-    -   `CREATE ROLE`
-    -   `ALTER ROLE`
-    -   `DROP ROLE`
-    -   `CREATE ROW POLICY`
-    -   `ALTER ROW POLICY`
-    -   `DROP ROW POLICY`
-    -   `CREATE QUOTA`
-    -   `ALTER QUOTA`
-    -   `DROP QUOTA`
-    -   `CREATE SETTINGS PROFILE`
-    -   `ALTER SETTINGS PROFILE`
-    -   `DROP SETTINGS PROFILE`
-    -   `SHOW ACCESS`
-        -   `SHOW_USERS`
-        -   `SHOW_ROLES`
-        -   `SHOW_ROW_POLICIES`
-        -   `SHOW_QUOTAS`
-        -   `SHOW_SETTINGS_PROFILES`
-    -   `ROLE ADMIN`
--   [SYSTEM](#grant-system)
-    -   `SYSTEM SHUTDOWN`
-    -   `SYSTEM DROP CACHE`
-        -   `SYSTEM DROP DNS CACHE`
-        -   `SYSTEM DROP MARK CACHE`
-        -   `SYSTEM DROP UNCOMPRESSED CACHE`
-    -   `SYSTEM RELOAD`
-        -   `SYSTEM RELOAD CONFIG`
-        -   `SYSTEM RELOAD DICTIONARY`
-        -   `SYSTEM RELOAD EMBEDDED DICTIONARIES`
-    -   `SYSTEM MERGES`
-    -   `SYSTEM TTL MERGES`
-    -   `SYSTEM FETCHES`
-    -   `SYSTEM MOVES`
-    -   `SYSTEM SENDS`
-        -   `SYSTEM DISTRIBUTED SENDS`
-        -   `SYSTEM REPLICATED SENDS`
-    -   `SYSTEM REPLICATION QUEUES`
-    -   `SYSTEM SYNC REPLICA`
-    -   `SYSTEM RESTART REPLICA`
-    -   `SYSTEM FLUSH`
-        -   `SYSTEM FLUSH DISTRIBUTED`
-        -   `SYSTEM FLUSH LOGS`
--   [INTROSPECTION](#grant-introspection)
-    -   `addressToLine`
-    -   `addressToSymbol`
-    -   `demangle`
--   [SOURCES](#grant-sources)
-    -   `FILE`
-    -   `URL`
-    -   `REMOTE`
-    -   `YSQL`
-    -   `ODBC`
-    -   `JDBC`
-    -   `HDFS`
-    -   `S3`
--   [dictGet](#grant-dictget)
-
-Ejemplos de cómo se trata esta jerarquía:
-
--   El `ALTER` privilegio incluye todos los demás `ALTER*` privilegio.
--   `ALTER CONSTRAINT` incluir `ALTER ADD CONSTRAINT` y `ALTER DROP CONSTRAINT` privilegio.
-
-Los privilegios se aplican a diferentes niveles. Conocer un nivel sugiere sintaxis disponible para privilegios.
-
-Niveles (de menor a mayor):
-
--   `COLUMN` — Privilege can be granted for column, table, database, or globally.
--   `TABLE` — Privilege can be granted for table, database, or globally.
--   `VIEW` — Privilege can be granted for view, database, or globally.
--   `DICTIONARY` — Privilege can be granted for dictionary, database, or globally.
--   `DATABASE` — Privilege can be granted for database or globally.
--   `GLOBAL` — Privilege can be granted only globally.
--   `GROUP` — Groups privileges of different levels. When `GROUP`-level privilegio se concede, sólo los privilegios del grupo se conceden que corresponden a la sintaxis utilizada.
-
-Ejemplos de sintaxis permitida:
-
--   `GRANT SELECT(x) ON db.table TO user`
--   `GRANT SELECT ON db.* TO user`
-
-Ejemplos de sintaxis no permitida:
-
--   `GRANT CREATE USER(x) ON db.table TO user`
--   `GRANT CREATE USER ON db.* TO user`
-
-El privilegio especial [ALL](#grant-all) otorga todos los privilegios a una cuenta de usuario o un rol.
-
-De forma predeterminada, una cuenta de usuario o un rol no tiene privilegios.
-
-Si un usuario o rol no tiene privilegios, se muestra como [NONE](#grant-none) privilegio.
-
-Algunas consultas por su implementación requieren un conjunto de privilegios. Por ejemplo, para realizar el [RENAME](misc.md#misc_operations-rename) consulta necesita los siguientes privilegios: `SELECT`, `CREATE TABLE`, `INSERT` y `DROP TABLE`.
-
-### SELECT {#grant-select}
-
-Permite realizar [SELECT](select/index.md) consulta.
-
-Nivel de privilegio: `COLUMN`.
-
-**Descripci**
-
-El usuario concedido con este privilegio puede realizar `SELECT` consultas sobre una lista especificada de columnas en la tabla y la base de datos especificadas. Si el usuario incluye otras columnas, entonces se especifica una consulta no devuelve datos.
-
-Considere el siguiente privilegio:
-
-``` sql
-GRANT SELECT(x,y) ON db.table TO john
-```
-
-Este privilegio permite `john` realizar cualquier `SELECT` consulta que involucra datos de la `x` y/o `y` columnas en `db.table`. Por ejemplo, `SELECT x FROM db.table`. `john` no puede realizar `SELECT z FROM db.table`. El `SELECT * FROM db.table` también no está disponible. Al procesar esta consulta, ClickHouse no devuelve ningún dato, incluso `x` y `y`. La única excepción es si una tabla `x` y `y` columnas, en este caso ClickHouse devuelve todos los datos.
-
-### INSERT {#grant-insert}
-
-Permite realizar [INSERT](insert-into.md) consulta.
-
-Nivel de privilegio: `COLUMN`.
-
-**Descripci**
-
-El usuario concedido con este privilegio puede realizar `INSERT` consultas sobre una lista especificada de columnas en la tabla y la base de datos especificadas. Si el usuario incluye otras columnas, entonces se especifica una consulta no inserta ningún dato.
-
-**Ejemplo**
-
-``` sql
-GRANT INSERT(x,y) ON db.table TO john
-```
-
-El privilegio concedido permite `john` para insertar datos en el `x` y/o `y` columnas en `db.table`.
-
-### ALTER {#grant-alter}
-
-Permite realizar [ALTER](alter.md) consultas correspondientes a la siguiente jerarquía de privilegios:
-
--   `ALTER`. Nivel: `COLUMN`.
-    -   `ALTER TABLE`. Nivel: `GROUP`
-        -   `ALTER UPDATE`. Nivel: `COLUMN`. Apodo: `UPDATE`
-        -   `ALTER DELETE`. Nivel: `COLUMN`. Apodo: `DELETE`
-        -   `ALTER COLUMN`. Nivel: `GROUP`
-            -   `ALTER ADD COLUMN`. Nivel: `COLUMN`. Apodo: `ADD COLUMN`
-            -   `ALTER DROP COLUMN`. Nivel: `COLUMN`. Apodo: `DROP COLUMN`
-            -   `ALTER MODIFY COLUMN`. Nivel: `COLUMN`. Apodo: `MODIFY COLUMN`
-            -   `ALTER COMMENT COLUMN`. Nivel: `COLUMN`. Apodo: `COMMENT COLUMN`
-            -   `ALTER CLEAR COLUMN`. Nivel: `COLUMN`. Apodo: `CLEAR COLUMN`
-            -   `ALTER RENAME COLUMN`. Nivel: `COLUMN`. Apodo: `RENAME COLUMN`
-        -   `ALTER INDEX`. Nivel: `GROUP`. Apodo: `INDEX`
-            -   `ALTER ORDER BY`. Nivel: `TABLE`. Apodo: `ALTER MODIFY ORDER BY`, `MODIFY ORDER BY`
-            -   `ALTER ADD INDEX`. Nivel: `TABLE`. Apodo: `ADD INDEX`
-            -   `ALTER DROP INDEX`. Nivel: `TABLE`. Apodo: `DROP INDEX`
-            -   `ALTER MATERIALIZE INDEX`. Nivel: `TABLE`. Apodo: `MATERIALIZE INDEX`
-            -   `ALTER CLEAR INDEX`. Nivel: `TABLE`. Apodo: `CLEAR INDEX`
-        -   `ALTER CONSTRAINT`. Nivel: `GROUP`. Apodo: `CONSTRAINT`
-            -   `ALTER ADD CONSTRAINT`. Nivel: `TABLE`. Apodo: `ADD CONSTRAINT`
-            -   `ALTER DROP CONSTRAINT`. Nivel: `TABLE`. Apodo: `DROP CONSTRAINT`
-        -   `ALTER TTL`. Nivel: `TABLE`. Apodo: `ALTER MODIFY TTL`, `MODIFY TTL`
-        -   `ALTER MATERIALIZE TTL`. Nivel: `TABLE`. Apodo: `MATERIALIZE TTL`
-        -   `ALTER SETTINGS`. Nivel: `TABLE`. Apodo: `ALTER SETTING`, `ALTER MODIFY SETTING`, `MODIFY SETTING`
-        -   `ALTER MOVE PARTITION`. Nivel: `TABLE`. Apodo: `ALTER MOVE PART`, `MOVE PARTITION`, `MOVE PART`
-        -   `ALTER FETCH PARTITION`. Nivel: `TABLE`. Apodo: `FETCH PARTITION`
-        -   `ALTER FREEZE PARTITION`. Nivel: `TABLE`. Apodo: `FREEZE PARTITION`
-    -   `ALTER VIEW` Nivel: `GROUP`
-        -   `ALTER VIEW REFRESH`. Nivel: `VIEW`. Apodo: `ALTER LIVE VIEW REFRESH`, `REFRESH VIEW`
-        -   `ALTER VIEW MODIFY QUERY`. Nivel: `VIEW`. Apodo: `ALTER TABLE MODIFY QUERY`
-
-Ejemplos de cómo se trata esta jerarquía:
-
--   El `ALTER` privilegio incluye todos los demás `ALTER*` privilegio.
--   `ALTER CONSTRAINT` incluir `ALTER ADD CONSTRAINT` y `ALTER DROP CONSTRAINT` privilegio.
-
-**Nota**
-
--   El `MODIFY SETTING` privilege permite modificar la configuración del motor de tablas. In no afecta la configuración o los parámetros de configuración del servidor.
--   El `ATTACH` operación necesita el [CREATE](#grant-create) privilegio.
--   El `DETACH` operación necesita el [DROP](#grant-drop) privilegio.
--   Para detener la mutación por el [KILL MUTATION](misc.md#kill-mutation) consulta, necesita tener un privilegio para iniciar esta mutación. Por ejemplo, si desea detener el `ALTER UPDATE` consulta, necesita el `ALTER UPDATE`, `ALTER TABLE`, o `ALTER` privilegio.
-
-### CREATE {#grant-create}
-
-Permite realizar [CREATE](create.md) y [ATTACH](misc.md#attach) Consultas DDL correspondientes a la siguiente jerarquía de privilegios:
-
--   `CREATE`. Nivel: `GROUP`
-    -   `CREATE DATABASE`. Nivel: `DATABASE`
-    -   `CREATE TABLE`. Nivel: `TABLE`
-    -   `CREATE VIEW`. Nivel: `VIEW`
-    -   `CREATE DICTIONARY`. Nivel: `DICTIONARY`
-    -   `CREATE TEMPORARY TABLE`. Nivel: `GLOBAL`
-
-**Nota**
-
--   Para eliminar la tabla creada, un usuario necesita [DROP](#grant-drop).
-
-### DROP {#grant-drop}
-
-Permite realizar [DROP](misc.md#drop) y [DETACH](misc.md#detach) consultas correspondientes a la siguiente jerarquía de privilegios:
-
--   `DROP`. Nivel:
-    -   `DROP DATABASE`. Nivel: `DATABASE`
-    -   `DROP TABLE`. Nivel: `TABLE`
-    -   `DROP VIEW`. Nivel: `VIEW`
-    -   `DROP DICTIONARY`. Nivel: `DICTIONARY`
-
-### TRUNCATE {#grant-truncate}
-
-Permite realizar [TRUNCATE](misc.md#truncate-statement) consulta.
-
-Nivel de privilegio: `TABLE`.
-
-### OPTIMIZE {#grant-optimize}
-
-Permite realizar el [OPTIMIZE TABLE](misc.md#misc_operations-optimize) consulta.
-
-Nivel de privilegio: `TABLE`.
-
-### SHOW {#grant-show}
-
-Permite realizar `SHOW`, `DESCRIBE`, `USE`, y `EXISTS` consultas, correspondientes a la siguiente jerarquía de privilegios:
-
--   `SHOW`. Nivel: `GROUP`
-    -   `SHOW DATABASES`. Nivel: `DATABASE`. Permite ejecutar `SHOW DATABASES`, `SHOW CREATE DATABASE`, `USE <database>` consulta.
-    -   `SHOW TABLES`. Nivel: `TABLE`. Permite ejecutar `SHOW TABLES`, `EXISTS <table>`, `CHECK <table>` consulta.
-    -   `SHOW COLUMNS`. Nivel: `COLUMN`. Permite ejecutar `SHOW CREATE TABLE`, `DESCRIBE` consulta.
-    -   `SHOW DICTIONARIES`. Nivel: `DICTIONARY`. Permite ejecutar `SHOW DICTIONARIES`, `SHOW CREATE DICTIONARY`, `EXISTS <dictionary>` consulta.
-
-**Nota**
-
-Un usuario tiene el `SHOW` privilegio si tiene algún otro privilegio relativo a la tabla, diccionario o base de datos especificados.
-
-### KILL QUERY {#grant-kill-query}
-
-Permite realizar el [KILL](misc.md#kill-query-statement) consultas correspondientes a la siguiente jerarquía de privilegios:
-
-Nivel de privilegio: `GLOBAL`.
-
-**Nota**
-
-`KILL QUERY` privilege permite a un usuario matar consultas de otros usuarios.
-
-### ACCESS MANAGEMENT {#grant-access-management}
-
-Permite a un usuario realizar consultas que administran usuarios, roles y directivas de fila.
-
--   `ACCESS MANAGEMENT`. Nivel: `GROUP`
-    -   `CREATE USER`. Nivel: `GLOBAL`
-    -   `ALTER USER`. Nivel: `GLOBAL`
-    -   `DROP USER`. Nivel: `GLOBAL`
-    -   `CREATE ROLE`. Nivel: `GLOBAL`
-    -   `ALTER ROLE`. Nivel: `GLOBAL`
-    -   `DROP ROLE`. Nivel: `GLOBAL`
-    -   `ROLE ADMIN`. Nivel: `GLOBAL`
-    -   `CREATE ROW POLICY`. Nivel: `GLOBAL`. Apodo: `CREATE POLICY`
-    -   `ALTER ROW POLICY`. Nivel: `GLOBAL`. Apodo: `ALTER POLICY`
-    -   `DROP ROW POLICY`. Nivel: `GLOBAL`. Apodo: `DROP POLICY`
-    -   `CREATE QUOTA`. Nivel: `GLOBAL`
-    -   `ALTER QUOTA`. Nivel: `GLOBAL`
-    -   `DROP QUOTA`. Nivel: `GLOBAL`
-    -   `CREATE SETTINGS PROFILE`. Nivel: `GLOBAL`. Apodo: `CREATE PROFILE`
-    -   `ALTER SETTINGS PROFILE`. Nivel: `GLOBAL`. Apodo: `ALTER PROFILE`
-    -   `DROP SETTINGS PROFILE`. Nivel: `GLOBAL`. Apodo: `DROP PROFILE`
-    -   `SHOW ACCESS`. Nivel: `GROUP`
-        -   `SHOW_USERS`. Nivel: `GLOBAL`. Apodo: `SHOW CREATE USER`
-        -   `SHOW_ROLES`. Nivel: `GLOBAL`. Apodo: `SHOW CREATE ROLE`
-        -   `SHOW_ROW_POLICIES`. Nivel: `GLOBAL`. Apodo: `SHOW POLICIES`, `SHOW CREATE ROW POLICY`, `SHOW CREATE POLICY`
-        -   `SHOW_QUOTAS`. Nivel: `GLOBAL`. Apodo: `SHOW CREATE QUOTA`
-        -   `SHOW_SETTINGS_PROFILES`. Nivel: `GLOBAL`. Apodo: `SHOW PROFILES`, `SHOW CREATE SETTINGS PROFILE`, `SHOW CREATE PROFILE`
-
-El `ROLE ADMIN` privilege permite a un usuario otorgar y revocar cualquier función, incluidas aquellas que no se otorgan al usuario con la opción de administrador.
-
-### SYSTEM {#grant-system}
-
-Permite a un usuario realizar el [SYSTEM](system.md) consultas correspondientes a la siguiente jerarquía de privilegios.
-
--   `SYSTEM`. Nivel: `GROUP`
-    -   `SYSTEM SHUTDOWN`. Nivel: `GLOBAL`. Apodo: `SYSTEM KILL`, `SHUTDOWN`
-    -   `SYSTEM DROP CACHE`. Apodo: `DROP CACHE`
-        -   `SYSTEM DROP DNS CACHE`. Nivel: `GLOBAL`. Apodo: `SYSTEM DROP DNS`, `DROP DNS CACHE`, `DROP DNS`
-        -   `SYSTEM DROP MARK CACHE`. Nivel: `GLOBAL`. Apodo: `SYSTEM DROP MARK`, `DROP MARK CACHE`, `DROP MARKS`
-        -   `SYSTEM DROP UNCOMPRESSED CACHE`. Nivel: `GLOBAL`. Apodo: `SYSTEM DROP UNCOMPRESSED`, `DROP UNCOMPRESSED CACHE`, `DROP UNCOMPRESSED`
-    -   `SYSTEM RELOAD`. Nivel: `GROUP`
-        -   `SYSTEM RELOAD CONFIG`. Nivel: `GLOBAL`. Apodo: `RELOAD CONFIG`
-        -   `SYSTEM RELOAD DICTIONARY`. Nivel: `GLOBAL`. Apodo: `SYSTEM RELOAD DICTIONARIES`, `RELOAD DICTIONARY`, `RELOAD DICTIONARIES`
-        -   `SYSTEM RELOAD EMBEDDED DICTIONARIES`. Nivel: `GLOBAL`. Aliases: R`ELOAD EMBEDDED DICTIONARIES`
-    -   `SYSTEM MERGES`. Nivel: `TABLE`. Apodo: `SYSTEM STOP MERGES`, `SYSTEM START MERGES`, `STOP MERGES`, `START MERGES`
-    -   `SYSTEM TTL MERGES`. Nivel: `TABLE`. Apodo: `SYSTEM STOP TTL MERGES`, `SYSTEM START TTL MERGES`, `STOP TTL MERGES`, `START TTL MERGES`
-    -   `SYSTEM FETCHES`. Nivel: `TABLE`. Apodo: `SYSTEM STOP FETCHES`, `SYSTEM START FETCHES`, `STOP FETCHES`, `START FETCHES`
-    -   `SYSTEM MOVES`. Nivel: `TABLE`. Apodo: `SYSTEM STOP MOVES`, `SYSTEM START MOVES`, `STOP MOVES`, `START MOVES`
-    -   `SYSTEM SENDS`. Nivel: `GROUP`. Apodo: `SYSTEM STOP SENDS`, `SYSTEM START SENDS`, `STOP SENDS`, `START SENDS`
-        -   `SYSTEM DISTRIBUTED SENDS`. Nivel: `TABLE`. Apodo: `SYSTEM STOP DISTRIBUTED SENDS`, `SYSTEM START DISTRIBUTED SENDS`, `STOP DISTRIBUTED SENDS`, `START DISTRIBUTED SENDS`
-        -   `SYSTEM REPLICATED SENDS`. Nivel: `TABLE`. Apodo: `SYSTEM STOP REPLICATED SENDS`, `SYSTEM START REPLICATED SENDS`, `STOP REPLICATED SENDS`, `START REPLICATED SENDS`
-    -   `SYSTEM REPLICATION QUEUES`. Nivel: `TABLE`. Apodo: `SYSTEM STOP REPLICATION QUEUES`, `SYSTEM START REPLICATION QUEUES`, `STOP REPLICATION QUEUES`, `START REPLICATION QUEUES`
-    -   `SYSTEM SYNC REPLICA`. Nivel: `TABLE`. Apodo: `SYNC REPLICA`
-    -   `SYSTEM RESTART REPLICA`. Nivel: `TABLE`. Apodo: `RESTART REPLICA`
-    -   `SYSTEM FLUSH`. Nivel: `GROUP`
-        -   `SYSTEM FLUSH DISTRIBUTED`. Nivel: `TABLE`. Apodo: `FLUSH DISTRIBUTED`
-        -   `SYSTEM FLUSH LOGS`. Nivel: `GLOBAL`. Apodo: `FLUSH LOGS`
-
-El `SYSTEM RELOAD EMBEDDED DICTIONARIES` privilegios otorgados implícitamente por el `SYSTEM RELOAD DICTIONARY ON *.*` privilegio.
-
-### INTROSPECTION {#grant-introspection}
-
-Permite usar [introspección](../../operations/optimizing-performance/sampling-query-profiler.md) función.
-
--   `INTROSPECTION`. Nivel: `GROUP`. Apodo: `INTROSPECTION FUNCTIONS`
-    -   `addressToLine`. Nivel: `GLOBAL`
-    -   `addressToSymbol`. Nivel: `GLOBAL`
-    -   `demangle`. Nivel: `GLOBAL`
-
-### SOURCES {#grant-sources}
-
-Permite utilizar fuentes de datos externas. Se aplica a [motores de mesa](../../engines/table-engines/index.md) y [funciones de la tabla](../table-functions/index.md#table-functions).
-
--   `SOURCES`. Nivel: `GROUP`
-    -   `FILE`. Nivel: `GLOBAL`
-    -   `URL`. Nivel: `GLOBAL`
-    -   `REMOTE`. Nivel: `GLOBAL`
-    -   `YSQL`. Nivel: `GLOBAL`
-    -   `ODBC`. Nivel: `GLOBAL`
-    -   `JDBC`. Nivel: `GLOBAL`
-    -   `HDFS`. Nivel: `GLOBAL`
-    -   `S3`. Nivel: `GLOBAL`
-
-El `SOURCES` privilege permite el uso de todas las fuentes. También puede otorgar un privilegio para cada fuente individualmente. Para usar fuentes, necesita privilegios adicionales.
-
-Ejemplos:
-
--   Para crear una tabla con el [Motor de tablas MySQL](../../engines/table-engines/integrations/mysql.md) usted necesita `CREATE TABLE (ON db.table_name)` y `MYSQL` privilegio.
--   Para utilizar el [función de tabla mysql](../table-functions/mysql.md) usted necesita `CREATE TEMPORARY TABLE` y `MYSQL` privilegio.
-
-### dictGet {#grant-dictget}
-
--   `dictGet`. Apodo: `dictHas`, `dictGetHierarchy`, `dictIsIn`
-
-Permite a un usuario ejecutar [dictGet](../functions/ext-dict-functions.md#dictget), [dictHas](../functions/ext-dict-functions.md#dicthas), [dictGetHierarchy](../functions/ext-dict-functions.md#dictgethierarchy), [DictIsIn](../functions/ext-dict-functions.md#dictisin) función.
-
-Nivel de privilegio: `DICTIONARY`.
-
-**Ejemplos**
-
--   `GRANT dictGet ON mydb.mydictionary TO john`
--   `GRANT dictGet ON mydictionary TO john`
-
-### ALL {#grant-all}
-
-Otorga todos los privilegios de la entidad regulada a una cuenta de usuario o un rol.
-
-### NONE {#grant-none}
-
-No otorga ningún privilegio.
-
-### ADMIN OPTION {#admin-option-privilege}
-
-El `ADMIN OPTION` privilege permite a un usuario otorgar su rol a otro usuario.
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/grant/) <!--hide-->
diff --git a/docs/es/sql-reference/statements/index.md b/docs/es/sql-reference/statements/index.md
deleted file mode 100644
index befef794c1c..00000000000
--- a/docs/es/sql-reference/statements/index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: "Instrucci\xF3n"
-toc_priority: 31
----
-
-
diff --git a/docs/es/sql-reference/statements/insert-into.md b/docs/es/sql-reference/statements/insert-into.md
deleted file mode 100644
index 4f64af830e7..00000000000
--- a/docs/es/sql-reference/statements/insert-into.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 34
-toc_title: INSERT INTO
----
-
-## INSERT {#insert}
-
-Adición de datos.
-
-Formato de consulta básico:
-
-``` sql
-INSERT INTO [db.]table [(c1, c2, c3)] VALUES (v11, v12, v13), (v21, v22, v23), ...
-```
-
-La consulta puede especificar una lista de columnas para insertar `[(c1, c2, c3)]`. En este caso, el resto de las columnas se llenan con:
-
--   Los valores calculados a partir del `DEFAULT` expresiones especificadas en la definición de la tabla.
--   Ceros y cadenas vacías, si `DEFAULT` expresiones no están definidas.
-
-Si [strict_insert_defaults=1](../../operations/settings/settings.md), columnas que no tienen `DEFAULT` definido debe figurar en la consulta.
-
-Los datos se pueden pasar al INSERT en cualquier [formato](../../interfaces/formats.md#formats) con el apoyo de ClickHouse. El formato debe especificarse explícitamente en la consulta:
-
-``` sql
-INSERT INTO [db.]table [(c1, c2, c3)] FORMAT format_name data_set
-```
-
-For example, the following query format is identical to the basic version of INSERT … VALUES:
-
-``` sql
-INSERT INTO [db.]table [(c1, c2, c3)] FORMAT Values (v11, v12, v13), (v21, v22, v23), ...
-```
-
-ClickHouse elimina todos los espacios y un avance de línea (si hay uno) antes de los datos. Al formar una consulta, recomendamos colocar los datos en una nueva línea después de los operadores de consulta (esto es importante si los datos comienzan con espacios).
-
-Ejemplo:
-
-``` sql
-INSERT INTO t FORMAT TabSeparated
-11  Hello, world!
-22  Qwerty
-```
-
-Puede insertar datos por separado de la consulta mediante el cliente de línea de comandos o la interfaz HTTP. Para obtener más información, consulte la sección “[Interfaz](../../interfaces/index.md#interfaces)”.
-
-### Limitación {#constraints}
-
-Si la tabla tiene [limitación](create.md#constraints), their expressions will be checked for each row of inserted data. If any of those constraints is not satisfied — server will raise an exception containing constraint name and expression, the query will be stopped.
-
-### Insertar los resultados de `SELECT` {#insert_query_insert-select}
-
-``` sql
-INSERT INTO [db.]table [(c1, c2, c3)] SELECT ...
-```
-
-Las columnas se asignan de acuerdo con su posición en la cláusula SELECT. Sin embargo, sus nombres en la expresión SELECT y la tabla para INSERT pueden diferir. Si es necesario, se realiza la fundición de tipo.
-
-Ninguno de los formatos de datos, excepto Valores, permite establecer valores para expresiones como `now()`, `1 + 2` y así sucesivamente. El formato Values permite el uso limitado de expresiones, pero esto no se recomienda, porque en este caso se usa código ineficiente para su ejecución.
-
-No se admiten otras consultas para modificar partes de datos: `UPDATE`, `DELETE`, `REPLACE`, `MERGE`, `UPSERT`, `INSERT UPDATE`.
-Sin embargo, puede eliminar datos antiguos usando `ALTER TABLE ... DROP PARTITION`.
-
-`FORMAT` cláusula debe especificarse al final de la consulta si `SELECT` cláusula contiene la función de tabla [entrada()](../table-functions/input.md).
-
-### Consideraciones de rendimiento {#performance-considerations}
-
-`INSERT` ordena los datos de entrada por clave principal y los divide en particiones por una clave de partición. Si inserta datos en varias particiones a la vez, puede reducir significativamente el rendimiento del `INSERT` consulta. Para evitar esto:
-
--   Agregue datos en lotes bastante grandes, como 100.000 filas a la vez.
--   Agrupe los datos por una clave de partición antes de cargarlos en ClickHouse.
-
-El rendimiento no disminuirá si:
-
--   Los datos se agregan en tiempo real.
--   Carga datos que normalmente están ordenados por tiempo.
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/insert_into/) <!--hide-->
diff --git a/docs/es/sql-reference/statements/misc.md b/docs/es/sql-reference/statements/misc.md
deleted file mode 100644
index 49cbc4fe558..00000000000
--- a/docs/es/sql-reference/statements/misc.md
+++ /dev/null
@@ -1,358 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 41
-toc_title: Otro
----
-
-# Consultas Misceláneas {#miscellaneous-queries}
-
-## ATTACH {#attach}
-
-Esta consulta es exactamente la misma que `CREATE`, pero
-
--   En lugar de la palabra `CREATE` utiliza la palabra `ATTACH`.
--   La consulta no crea datos en el disco, pero supone que los datos ya están en los lugares apropiados, y simplemente agrega información sobre la tabla al servidor.
-    Después de ejecutar una consulta ATTACH, el servidor sabrá sobre la existencia de la tabla.
-
-Si la tabla se separó previamente (`DETACH`), lo que significa que su estructura es conocida, puede usar taquigrafía sin definir la estructura.
-
-``` sql
-ATTACH TABLE [IF NOT EXISTS] [db.]name [ON CLUSTER cluster]
-```
-
-Esta consulta se utiliza al iniciar el servidor. El servidor almacena los metadatos de la tabla como archivos con `ATTACH` consultas, que simplemente se ejecuta en el lanzamiento (con la excepción de las tablas del sistema, que se crean explícitamente en el servidor).
-
-## CHECK TABLE {#check-table}
-
-Comprueba si los datos de la tabla están dañados.
-
-``` sql
-CHECK TABLE [db.]name
-```
-
-El `CHECK TABLE` query compara los tamaños de archivo reales con los valores esperados que se almacenan en el servidor. Si los tamaños de archivo no coinciden con los valores almacenados, significa que los datos están dañados. Esto puede deberse, por ejemplo, a un bloqueo del sistema durante la ejecución de la consulta.
-
-La respuesta de consulta contiene el `result` columna con una sola fila. La fila tiene un valor de
-[Booleana](../../sql-reference/data-types/boolean.md) tipo:
-
--   0 - Los datos de la tabla están dañados.
--   1 - Los datos mantienen la integridad.
-
-El `CHECK TABLE` query admite los siguientes motores de tablas:
-
--   [Registro](../../engines/table-engines/log-family/log.md)
--   [TinyLog](../../engines/table-engines/log-family/tinylog.md)
--   [StripeLog](../../engines/table-engines/log-family/stripelog.md)
--   [Familia MergeTree](../../engines/table-engines/mergetree-family/mergetree.md)
-
-Realizado sobre las tablas con otros motores de tabla causa una excepción.
-
-Motores del `*Log` la familia no proporciona la recuperación automática de datos en caso de fallo. Utilice el `CHECK TABLE` consulta para rastrear la pérdida de datos de manera oportuna.
-
-Para `MergeTree` motores familiares, el `CHECK TABLE` query muestra un estado de comprobación para cada parte de datos individual de una tabla en el servidor local.
-
-**Si los datos están dañados**
-
-Si la tabla está dañada, puede copiar los datos no dañados a otra tabla. Para hacer esto:
-
-1.  Cree una nueva tabla con la misma estructura que la tabla dañada. Para ello, ejecute la consulta `CREATE TABLE <new_table_name> AS <damaged_table_name>`.
-2.  Establezca el [max_threads](../../operations/settings/settings.md#settings-max_threads) valor a 1 para procesar la siguiente consulta en un único subproceso. Para ello, ejecute la consulta `SET max_threads = 1`.
-3.  Ejecutar la consulta `INSERT INTO <new_table_name> SELECT * FROM <damaged_table_name>`. Esta solicitud copia los datos no dañados de la tabla dañada a otra tabla. Solo se copiarán los datos anteriores a la parte dañada.
-4.  Reinicie el `clickhouse-client` para restablecer el `max_threads` valor.
-
-## DESCRIBE TABLE {#misc-describe-table}
-
-``` sql
-DESC|DESCRIBE TABLE [db.]table [INTO OUTFILE filename] [FORMAT format]
-```
-
-Devuelve lo siguiente `String` tipo columnas:
-
--   `name` — Column name.
--   `type`— Column type.
--   `default_type` — Clause that is used in [expresión predeterminada](create.md#create-default-values) (`DEFAULT`, `MATERIALIZED` o `ALIAS`). La columna contiene una cadena vacía, si no se especifica la expresión predeterminada.
--   `default_expression` — Value specified in the `DEFAULT` clausula.
--   `comment_expression` — Comment text.
-
-Las estructuras de datos anidadas se generan en “expanded” formato. Cada columna se muestra por separado, con el nombre después de un punto.
-
-## DETACH {#detach}
-
-Elimina información sobre el ‘name’ tabla desde el servidor. El servidor deja de saber sobre la existencia de la tabla.
-
-``` sql
-DETACH TABLE [IF EXISTS] [db.]name [ON CLUSTER cluster]
-```
-
-Esto no elimina los datos ni los metadatos de la tabla. En el próximo lanzamiento del servidor, el servidor leerá los metadatos y volverá a conocer la tabla.
-Del mismo modo, un “detached” se puede volver a conectar usando el `ATTACH` consulta (con la excepción de las tablas del sistema, que no tienen metadatos almacenados para ellas).
-
-No hay `DETACH DATABASE` consulta.
-
-## DROP {#drop}
-
-Esta consulta tiene dos tipos: `DROP DATABASE` y `DROP TABLE`.
-
-``` sql
-DROP DATABASE [IF EXISTS] db [ON CLUSTER cluster]
-```
-
-Elimina todas las tablas dentro del ‘db’ base de datos, a continuación, elimina ‘db’ base de datos en sí.
-Si `IF EXISTS` se especifica, no devuelve un error si la base de datos no existe.
-
-``` sql
-DROP [TEMPORARY] TABLE [IF EXISTS] [db.]name [ON CLUSTER cluster]
-```
-
-Elimina la tabla.
-Si `IF EXISTS` se especifica, no devuelve un error si la tabla no existe o la base de datos no existe.
-
-    DROP DICTIONARY [IF EXISTS] [db.]name
-
-Elimina el diccionario.
-Si `IF EXISTS` se especifica, no devuelve un error si la tabla no existe o la base de datos no existe.
-
-## DROP USER {#drop-user-statement}
-
-Elimina un usuario.
-
-### Sintaxis {#drop-user-syntax}
-
-``` sql
-DROP USER [IF EXISTS] name [,...] [ON CLUSTER cluster_name]
-```
-
-## DROP ROLE {#drop-role-statement}
-
-Elimina un rol.
-
-El rol eliminado se revoca de todas las entidades donde se concedió.
-
-### Sintaxis {#drop-role-syntax}
-
-``` sql
-DROP ROLE [IF EXISTS] name [,...] [ON CLUSTER cluster_name]
-```
-
-## DROP ROW POLICY {#drop-row-policy-statement}
-
-Elimina una directiva de fila.
-
-La directiva de filas eliminadas se revoca de todas las entidades a las que se asignó.
-
-### Sintaxis {#drop-row-policy-syntax}
-
-``` sql
-DROP [ROW] POLICY [IF EXISTS] name [,...] ON [database.]table [,...] [ON CLUSTER cluster_name]
-```
-
-## DROP QUOTA {#drop-quota-statement}
-
-Elimina una cuota.
-
-La cuota eliminada se revoca de todas las entidades a las que se asignó.
-
-### Sintaxis {#drop-quota-syntax}
-
-``` sql
-DROP QUOTA [IF EXISTS] name [,...] [ON CLUSTER cluster_name]
-```
-
-## DROP SETTINGS PROFILE {#drop-settings-profile-statement}
-
-Elimina una cuota.
-
-La cuota eliminada se revoca de todas las entidades a las que se asignó.
-
-### Sintaxis {#drop-settings-profile-syntax}
-
-``` sql
-DROP [SETTINGS] PROFILE [IF EXISTS] name [,...] [ON CLUSTER cluster_name]
-```
-
-## EXISTS {#exists-statement}
-
-``` sql
-EXISTS [TEMPORARY] [TABLE|DICTIONARY] [db.]name [INTO OUTFILE filename] [FORMAT format]
-```
-
-Devuelve una sola `UInt8`columna -type, que contiene el valor único `0` si la tabla o base de datos no existe, o `1` si la tabla existe en la base de datos especificada.
-
-## KILL QUERY {#kill-query-statement}
-
-``` sql
-KILL QUERY [ON CLUSTER cluster]
-  WHERE <where expression to SELECT FROM system.processes query>
-  [SYNC|ASYNC|TEST]
-  [FORMAT format]
-```
-
-Intenta terminar por la fuerza las consultas que se están ejecutando actualmente.
-Las consultas a finalizar se seleccionan en el sistema.tabla de procesos utilizando los criterios definidos en el `WHERE` cláusula de la `KILL` consulta.
-
-Ejemplos:
-
-``` sql
--- Forcibly terminates all queries with the specified query_id:
-KILL QUERY WHERE query_id='2-857d-4a57-9ee0-327da5d60a90'
-
--- Synchronously terminates all queries run by 'username':
-KILL QUERY WHERE user='username' SYNC
-```
-
-Los usuarios de solo lectura solo pueden detener sus propias consultas.
-
-De forma predeterminada, se utiliza la versión asincrónica de las consultas (`ASYNC`), que no espera la confirmación de que las consultas se han detenido.
-
-La versión síncrona (`SYNC`) espera a que se detengan todas las consultas y muestra información sobre cada proceso a medida que se detiene.
-La respuesta contiene el `kill_status` columna, que puede tomar los siguientes valores:
-
-1.  ‘finished’ – The query was terminated successfully.
-2.  ‘waiting’ – Waiting for the query to end after sending it a signal to terminate.
-3.  The other values ​​explain why the query can't be stopped.
-
-Una consulta de prueba (`TEST`) sólo comprueba los derechos del usuario y muestra una lista de consultas para detener.
-
-## KILL MUTATION {#kill-mutation}
-
-``` sql
-KILL MUTATION [ON CLUSTER cluster]
-  WHERE <where expression to SELECT FROM system.mutations query>
-  [TEST]
-  [FORMAT format]
-```
-
-Intenta cancelar y quitar [mutación](alter.md#alter-mutations) que se están ejecutando actualmente. Las mutaciones para cancelar se seleccionan en el [`system.mutations`](../../operations/system-tables.md#system_tables-mutations) utilizando el filtro especificado por el `WHERE` cláusula de la `KILL` consulta.
-
-Una consulta de prueba (`TEST`) sólo comprueba los derechos del usuario y muestra una lista de consultas para detener.
-
-Ejemplos:
-
-``` sql
--- Cancel and remove all mutations of the single table:
-KILL MUTATION WHERE database = 'default' AND table = 'table'
-
--- Cancel the specific mutation:
-KILL MUTATION WHERE database = 'default' AND table = 'table' AND mutation_id = 'mutation_3.txt'
-```
-
-The query is useful when a mutation is stuck and cannot finish (e.g. if some function in the mutation query throws an exception when applied to the data contained in the table).
-
-Los cambios ya realizados por la mutación no se revierten.
-
-## OPTIMIZE {#misc_operations-optimize}
-
-``` sql
-OPTIMIZE TABLE [db.]name [ON CLUSTER cluster] [PARTITION partition | PARTITION ID 'partition_id'] [FINAL] [DEDUPLICATE]
-```
-
-Esta consulta intenta inicializar una combinación no programada de partes de datos para tablas con un motor de tablas [Método de codificación de datos:](../../engines/table-engines/mergetree-family/mergetree.md) familia.
-
-El `OPTMIZE` consulta también es compatible con el [Método de codificación de datos:](../../engines/table-engines/special/materializedview.md) y el [Búfer](../../engines/table-engines/special/buffer.md) motor. No se admiten otros motores de tabla.
-
-Cuando `OPTIMIZE` se utiliza con el [ReplicatedMergeTree](../../engines/table-engines/mergetree-family/replication.md) la familia de motores de tablas, ClickHouse crea una tarea para fusionar y espera la ejecución en todos los nodos (si `replication_alter_partitions_sync` está habilitada la configuración).
-
--   Si `OPTIMIZE` no realiza una fusión por ningún motivo, no notifica al cliente. Para habilitar las notificaciones, [Optize_throw_if_noop](../../operations/settings/settings.md#setting-optimize_throw_if_noop) configuración.
--   Si especifica un `PARTITION`, sólo la partición especificada está optimizada. [Cómo establecer la expresión de partición](alter.md#alter-how-to-specify-part-expr).
--   Si especifica `FINAL`, la optimización se realiza incluso cuando todos los datos ya están en una parte.
--   Si especifica `DEDUPLICATE`, luego se deduplicarán filas completamente idénticas (se comparan todas las columnas), tiene sentido solo para el motor MergeTree.
-
-!!! warning "Advertencia"
-    `OPTIMIZE` no se puede arreglar el “Too many parts” error.
-
-## RENAME {#misc_operations-rename}
-
-Cambia el nombre de una o más tablas.
-
-``` sql
-RENAME TABLE [db11.]name11 TO [db12.]name12, [db21.]name21 TO [db22.]name22, ... [ON CLUSTER cluster]
-```
-
-Todas las tablas se renombran bajo bloqueo global. Cambiar el nombre de las tablas es una operación ligera. Si ha indicado otra base de datos después de TO, la tabla se moverá a esta base de datos. Sin embargo, los directorios con bases de datos deben residir en el mismo sistema de archivos (de lo contrario, se devuelve un error).
-
-## SET {#query-set}
-
-``` sql
-SET param = value
-```
-
-Asignar `value` a la `param` [configuración](../../operations/settings/index.md) para la sesión actual. No se puede cambiar [configuración del servidor](../../operations/server-configuration-parameters/index.md) de esta manera.
-
-También puede establecer todos los valores del perfil de configuración especificado en una sola consulta.
-
-``` sql
-SET profile = 'profile-name-from-the-settings-file'
-```
-
-Para obtener más información, consulte [Configuración](../../operations/settings/settings.md).
-
-## SET ROLE {#set-role-statement}
-
-Activa roles para el usuario actual.
-
-### Sintaxis {#set-role-syntax}
-
-``` sql
-SET ROLE {DEFAULT | NONE | role [,...] | ALL | ALL EXCEPT role [,...]}
-```
-
-## SET DEFAULT ROLE {#set-default-role-statement}
-
-Establece roles predeterminados para un usuario.
-
-Los roles predeterminados se activan automáticamente al iniciar sesión del usuario. Puede establecer como predeterminado sólo los roles concedidos anteriormente. Si el rol no se concede a un usuario, ClickHouse produce una excepción.
-
-### Sintaxis {#set-default-role-syntax}
-
-``` sql
-SET DEFAULT ROLE {NONE | role [,...] | ALL | ALL EXCEPT role [,...]} TO {user|CURRENT_USER} [,...]
-```
-
-### Ejemplos {#set-default-role-examples}
-
-Establecer varios roles predeterminados para un usuario:
-
-``` sql
-SET DEFAULT ROLE role1, role2, ... TO user
-```
-
-Establezca todos los roles concedidos como predeterminados para un usuario:
-
-``` sql
-SET DEFAULT ROLE ALL TO user
-```
-
-Borrar roles predeterminados de un usuario:
-
-``` sql
-SET DEFAULT ROLE NONE TO user
-```
-
-Establezca todos los roles concedidos como predeterminados excepto algunos de ellos:
-
-``` sql
-SET DEFAULT ROLE ALL EXCEPT role1, role2 TO user
-```
-
-## TRUNCATE {#truncate-statement}
-
-``` sql
-TRUNCATE TABLE [IF EXISTS] [db.]name [ON CLUSTER cluster]
-```
-
-Elimina todos los datos de una tabla. Cuando la cláusula `IF EXISTS` se omite, la consulta devuelve un error si la tabla no existe.
-
-El `TRUNCATE` consulta no es compatible con [Vista](../../engines/table-engines/special/view.md), [File](../../engines/table-engines/special/file.md), [URL](../../engines/table-engines/special/url.md) y [Nulo](../../engines/table-engines/special/null.md) motores de mesa.
-
-## USE {#use}
-
-``` sql
-USE db
-```
-
-Permite establecer la base de datos actual para la sesión.
-La base de datos actual se utiliza para buscar tablas si la base de datos no está definida explícitamente en la consulta con un punto antes del nombre de la tabla.
-Esta consulta no se puede realizar cuando se usa el protocolo HTTP, ya que no existe un concepto de sesión.
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/misc/) <!--hide-->
diff --git a/docs/es/sql-reference/statements/revoke.md b/docs/es/sql-reference/statements/revoke.md
deleted file mode 100644
index 2c5ee0a40f7..00000000000
--- a/docs/es/sql-reference/statements/revoke.md
+++ /dev/null
@@ -1,50 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 40
-toc_title: REVOKE
----
-
-# REVOKE {#revoke}
-
-Revoca privilegios de usuarios o roles.
-
-## Sintaxis {#revoke-syntax}
-
-**Revocación de privilegios de usuarios**
-
-``` sql
-REVOKE [ON CLUSTER cluster_name] privilege[(column_name [,...])] [,...] ON {db.table|db.*|*.*|table|*} FROM {user | CURRENT_USER} [,...] | ALL | ALL EXCEPT {user | CURRENT_USER} [,...]
-```
-
-**Revocación de roles de usuarios**
-
-``` sql
-REVOKE [ON CLUSTER cluster_name] [ADMIN OPTION FOR] role [,...] FROM {user | role | CURRENT_USER} [,...] | ALL | ALL EXCEPT {user_name | role_name | CURRENT_USER} [,...]
-```
-
-## Descripci {#revoke-description}
-
-Para revocar algún privilegio, puede usar un privilegio de alcance más amplio que planea revocar. Por ejemplo, si un usuario tiene `SELECT (x,y)` privilegio, administrador puede realizar `REVOKE SELECT(x,y) ...`, o `REVOKE SELECT * ...` o incluso `REVOKE ALL PRIVILEGES ...` consulta para revocar este privilegio.
-
-### Revocaciones parciales {#partial-revokes-dscr}
-
-Puede revocar una parte de un privilegio. Por ejemplo, si un usuario tiene `SELECT *.*` privilegio puede revocarle un privilegio para leer datos de alguna tabla o una base de datos.
-
-## Ejemplos {#revoke-example}
-
-Otorgue el `john` cuenta de usuario con un privilegio para seleccionar de todas las bases de datos `accounts` una:
-
-``` sql
-GRANT SELECT ON *.* TO john;
-REVOKE SELECT ON accounts.* FROM john;
-```
-
-Otorgue el `mira` cuenta de usuario con un privilegio para seleccionar entre todas las columnas `accounts.staff` excepción de la tabla `wage` una.
-
-``` sql
-GRANT SELECT ON accounts.staff TO mira;
-REVOKE SELECT(wage) ON accounts.staff FROM mira;
-```
-
-{## [Artículo Original](https://clickhouse.tech/docs/en/operations/settings/settings/) ##}
diff --git a/docs/es/sql-reference/statements/select/array-join.md b/docs/es/sql-reference/statements/select/array-join.md
deleted file mode 100644
index d0393dce76a..00000000000
--- a/docs/es/sql-reference/statements/select/array-join.md
+++ /dev/null
@@ -1,282 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
----
-
-# ARRAY JOIN Cláusula {#select-array-join-clause}
-
-Es una operación común para las tablas que contienen una columna de matriz para producir una nueva tabla que tiene una columna con cada elemento de matriz individual de esa columna inicial, mientras que los valores de otras columnas se duplican. Este es el caso básico de lo que `ARRAY JOIN` cláusula hace.
-
-Su nombre proviene del hecho de que se puede considerar como una ejecución `JOIN` con una matriz o estructura de datos anidada. La intención es similar a la [arrayJoin](../../functions/array-join.md#functions_arrayjoin) función, pero la funcionalidad de la cláusula es más amplia.
-
-Sintaxis:
-
-``` sql
-SELECT <expr_list>
-FROM <left_subquery>
-[LEFT] ARRAY JOIN <array>
-[WHERE|PREWHERE <expr>]
-...
-```
-
-Solo puede especificar uno `ARRAY JOIN` cláusula en una `SELECT` consulta.
-
-Tipos admitidos de `ARRAY JOIN` se enumeran a continuación:
-
--   `ARRAY JOIN` - En el caso base, las matrices vacías no se incluyen en el resultado de `JOIN`.
--   `LEFT ARRAY JOIN` - El resultado de `JOIN` contiene filas con matrices vacías. El valor de una matriz vacía se establece en el valor predeterminado para el tipo de elemento de matriz (normalmente 0, cadena vacía o NULL).
-
-## Ejemplos básicos de ARRAY JOIN {#basic-array-join-examples}
-
-Los siguientes ejemplos demuestran el uso de la `ARRAY JOIN` y `LEFT ARRAY JOIN` clausula. Vamos a crear una tabla con un [Matriz](../../../sql-reference/data-types/array.md) escriba la columna e inserte valores en ella:
-
-``` sql
-CREATE TABLE arrays_test
-(
-    s String,
-    arr Array(UInt8)
-) ENGINE = Memory;
-
-INSERT INTO arrays_test
-VALUES ('Hello', [1,2]), ('World', [3,4,5]), ('Goodbye', []);
-```
-
-``` text
-┌─s───────────┬─arr─────┐
-│ Hello       │ [1,2]   │
-│ World       │ [3,4,5] │
-│ Goodbye     │ []      │
-└─────────────┴─────────┘
-```
-
-El siguiente ejemplo utiliza el `ARRAY JOIN` clausula:
-
-``` sql
-SELECT s, arr
-FROM arrays_test
-ARRAY JOIN arr;
-```
-
-``` text
-┌─s─────┬─arr─┐
-│ Hello │   1 │
-│ Hello │   2 │
-│ World │   3 │
-│ World │   4 │
-│ World │   5 │
-└───────┴─────┘
-```
-
-El siguiente ejemplo utiliza el `LEFT ARRAY JOIN` clausula:
-
-``` sql
-SELECT s, arr
-FROM arrays_test
-LEFT ARRAY JOIN arr;
-```
-
-``` text
-┌─s───────────┬─arr─┐
-│ Hello       │   1 │
-│ Hello       │   2 │
-│ World       │   3 │
-│ World       │   4 │
-│ World       │   5 │
-│ Goodbye     │   0 │
-└─────────────┴─────┘
-```
-
-## Uso de alias {#using-aliases}
-
-Se puede especificar un alias para una matriz en el `ARRAY JOIN` clausula. En este caso, este alias puede acceder a un elemento de matriz, pero el nombre original tiene acceso a la matriz en sí. Ejemplo:
-
-``` sql
-SELECT s, arr, a
-FROM arrays_test
-ARRAY JOIN arr AS a;
-```
-
-``` text
-┌─s─────┬─arr─────┬─a─┐
-│ Hello │ [1,2]   │ 1 │
-│ Hello │ [1,2]   │ 2 │
-│ World │ [3,4,5] │ 3 │
-│ World │ [3,4,5] │ 4 │
-│ World │ [3,4,5] │ 5 │
-└───────┴─────────┴───┘
-```
-
-Usando alias, puede realizar `ARRAY JOIN` con una matriz externa. Por ejemplo:
-
-``` sql
-SELECT s, arr_external
-FROM arrays_test
-ARRAY JOIN [1, 2, 3] AS arr_external;
-```
-
-``` text
-┌─s───────────┬─arr_external─┐
-│ Hello       │            1 │
-│ Hello       │            2 │
-│ Hello       │            3 │
-│ World       │            1 │
-│ World       │            2 │
-│ World       │            3 │
-│ Goodbye     │            1 │
-│ Goodbye     │            2 │
-│ Goodbye     │            3 │
-└─────────────┴──────────────┘
-```
-
-Múltiples matrices se pueden separar por comas en el `ARRAY JOIN` clausula. En este caso, `JOIN` se realiza con ellos simultáneamente (la suma directa, no el producto cartesiano). Tenga en cuenta que todas las matrices deben tener el mismo tamaño. Ejemplo:
-
-``` sql
-SELECT s, arr, a, num, mapped
-FROM arrays_test
-ARRAY JOIN arr AS a, arrayEnumerate(arr) AS num, arrayMap(x -> x + 1, arr) AS mapped;
-```
-
-``` text
-┌─s─────┬─arr─────┬─a─┬─num─┬─mapped─┐
-│ Hello │ [1,2]   │ 1 │   1 │      2 │
-│ Hello │ [1,2]   │ 2 │   2 │      3 │
-│ World │ [3,4,5] │ 3 │   1 │      4 │
-│ World │ [3,4,5] │ 4 │   2 │      5 │
-│ World │ [3,4,5] │ 5 │   3 │      6 │
-└───────┴─────────┴───┴─────┴────────┘
-```
-
-El siguiente ejemplo utiliza el [arrayEnumerate](../../../sql-reference/functions/array-functions.md#array_functions-arrayenumerate) función:
-
-``` sql
-SELECT s, arr, a, num, arrayEnumerate(arr)
-FROM arrays_test
-ARRAY JOIN arr AS a, arrayEnumerate(arr) AS num;
-```
-
-``` text
-┌─s─────┬─arr─────┬─a─┬─num─┬─arrayEnumerate(arr)─┐
-│ Hello │ [1,2]   │ 1 │   1 │ [1,2]               │
-│ Hello │ [1,2]   │ 2 │   2 │ [1,2]               │
-│ World │ [3,4,5] │ 3 │   1 │ [1,2,3]             │
-│ World │ [3,4,5] │ 4 │   2 │ [1,2,3]             │
-│ World │ [3,4,5] │ 5 │   3 │ [1,2,3]             │
-└───────┴─────────┴───┴─────┴─────────────────────┘
-```
-
-## ARRAY JOIN con estructura de datos anidada {#array-join-with-nested-data-structure}
-
-`ARRAY JOIN` también funciona con [estructuras de datos anidados](../../../sql-reference/data-types/nested-data-structures/nested.md):
-
-``` sql
-CREATE TABLE nested_test
-(
-    s String,
-    nest Nested(
-    x UInt8,
-    y UInt32)
-) ENGINE = Memory;
-
-INSERT INTO nested_test
-VALUES ('Hello', [1,2], [10,20]), ('World', [3,4,5], [30,40,50]), ('Goodbye', [], []);
-```
-
-``` text
-┌─s───────┬─nest.x──┬─nest.y─────┐
-│ Hello   │ [1,2]   │ [10,20]    │
-│ World   │ [3,4,5] │ [30,40,50] │
-│ Goodbye │ []      │ []         │
-└─────────┴─────────┴────────────┘
-```
-
-``` sql
-SELECT s, `nest.x`, `nest.y`
-FROM nested_test
-ARRAY JOIN nest;
-```
-
-``` text
-┌─s─────┬─nest.x─┬─nest.y─┐
-│ Hello │      1 │     10 │
-│ Hello │      2 │     20 │
-│ World │      3 │     30 │
-│ World │      4 │     40 │
-│ World │      5 │     50 │
-└───────┴────────┴────────┘
-```
-
-Al especificar nombres de estructuras de datos anidadas en `ARRAY JOIN` el significado es el mismo `ARRAY JOIN` con todos los elementos de la matriz en los que consiste. Los ejemplos se enumeran a continuación:
-
-``` sql
-SELECT s, `nest.x`, `nest.y`
-FROM nested_test
-ARRAY JOIN `nest.x`, `nest.y`;
-```
-
-``` text
-┌─s─────┬─nest.x─┬─nest.y─┐
-│ Hello │      1 │     10 │
-│ Hello │      2 │     20 │
-│ World │      3 │     30 │
-│ World │      4 │     40 │
-│ World │      5 │     50 │
-└───────┴────────┴────────┘
-```
-
-Esta variación también tiene sentido:
-
-``` sql
-SELECT s, `nest.x`, `nest.y`
-FROM nested_test
-ARRAY JOIN `nest.x`;
-```
-
-``` text
-┌─s─────┬─nest.x─┬─nest.y─────┐
-│ Hello │      1 │ [10,20]    │
-│ Hello │      2 │ [10,20]    │
-│ World │      3 │ [30,40,50] │
-│ World │      4 │ [30,40,50] │
-│ World │      5 │ [30,40,50] │
-└───────┴────────┴────────────┘
-```
-
-Se puede usar un alias para una estructura de datos anidada, con el fin de seleccionar `JOIN` resultado o la matriz de origen. Ejemplo:
-
-``` sql
-SELECT s, `n.x`, `n.y`, `nest.x`, `nest.y`
-FROM nested_test
-ARRAY JOIN nest AS n;
-```
-
-``` text
-┌─s─────┬─n.x─┬─n.y─┬─nest.x──┬─nest.y─────┐
-│ Hello │   1 │  10 │ [1,2]   │ [10,20]    │
-│ Hello │   2 │  20 │ [1,2]   │ [10,20]    │
-│ World │   3 │  30 │ [3,4,5] │ [30,40,50] │
-│ World │   4 │  40 │ [3,4,5] │ [30,40,50] │
-│ World │   5 │  50 │ [3,4,5] │ [30,40,50] │
-└───────┴─────┴─────┴─────────┴────────────┘
-```
-
-Ejemplo de uso del [arrayEnumerate](../../../sql-reference/functions/array-functions.md#array_functions-arrayenumerate) función:
-
-``` sql
-SELECT s, `n.x`, `n.y`, `nest.x`, `nest.y`, num
-FROM nested_test
-ARRAY JOIN nest AS n, arrayEnumerate(`nest.x`) AS num;
-```
-
-``` text
-┌─s─────┬─n.x─┬─n.y─┬─nest.x──┬─nest.y─────┬─num─┐
-│ Hello │   1 │  10 │ [1,2]   │ [10,20]    │   1 │
-│ Hello │   2 │  20 │ [1,2]   │ [10,20]    │   2 │
-│ World │   3 │  30 │ [3,4,5] │ [30,40,50] │   1 │
-│ World │   4 │  40 │ [3,4,5] │ [30,40,50] │   2 │
-│ World │   5 │  50 │ [3,4,5] │ [30,40,50] │   3 │
-└───────┴─────┴─────┴─────────┴────────────┴─────┘
-```
-
-## Detalles de implementación {#implementation-details}
-
-El orden de ejecución de la consulta se optimiza cuando se ejecuta `ARRAY JOIN`. Aunque `ARRAY JOIN` debe especificarse siempre antes de la [WHERE](where.md)/[PREWHERE](prewhere.md) cláusula en una consulta, técnicamente se pueden realizar en cualquier orden, a menos que resultado de `ARRAY JOIN` se utiliza para filtrar. El optimizador de consultas controla el orden de procesamiento.
diff --git a/docs/es/sql-reference/statements/select/distinct.md b/docs/es/sql-reference/statements/select/distinct.md
deleted file mode 100644
index bf90f9f7d60..00000000000
--- a/docs/es/sql-reference/statements/select/distinct.md
+++ /dev/null
@@ -1,63 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
----
-
-# Cláusula DISTINCT {#select-distinct}
-
-Si `SELECT DISTINCT` se especifica, sólo las filas únicas permanecerán en un resultado de consulta. Por lo tanto, solo quedará una sola fila de todos los conjuntos de filas completamente coincidentes en el resultado.
-
-## Procesamiento nulo {#null-processing}
-
-`DISTINCT` trabaja con [NULL](../../syntax.md#null-literal) como si `NULL` Era un valor específico, y `NULL==NULL`. En otras palabras, en el `DISTINCT` resultados, diferentes combinaciones con `NULL` se producen sólo una vez. Se diferencia de `NULL` procesamiento en la mayoría de los otros contextos.
-
-## Alternativa {#alternatives}
-
-Es posible obtener el mismo resultado aplicando [GROUP BY](group-by.md) en el mismo conjunto de valores especificados como `SELECT` cláusula, sin utilizar ninguna función agregada. Pero hay pocas diferencias de `GROUP BY` enfoque:
-
--   `DISTINCT` se puede aplicar junto con `GROUP BY`.
--   Cuando [ORDER BY](order-by.md) se omite y [LIMIT](limit.md) se define, la consulta deja de ejecutarse inmediatamente después de que se haya leído el número requerido de filas diferentes.
--   Los bloques de datos se generan a medida que se procesan, sin esperar a que finalice la ejecución de toda la consulta.
-
-## Limitacion {#limitations}
-
-`DISTINCT` no se admite si `SELECT` tiene al menos una columna de matriz.
-
-## Ejemplos {#examples}
-
-ClickHouse admite el uso de `DISTINCT` y `ORDER BY` para diferentes columnas en una consulta. El `DISTINCT` cláusula se ejecuta antes de `ORDER BY` clausula.
-
-Tabla de ejemplo:
-
-``` text
-┌─a─┬─b─┐
-│ 2 │ 1 │
-│ 1 │ 2 │
-│ 3 │ 3 │
-│ 2 │ 4 │
-└───┴───┘
-```
-
-Al seleccionar datos con el `SELECT DISTINCT a FROM t1 ORDER BY b ASC` consulta, obtenemos el siguiente resultado:
-
-``` text
-┌─a─┐
-│ 2 │
-│ 1 │
-│ 3 │
-└───┘
-```
-
-Si cambiamos la dirección de clasificación `SELECT DISTINCT a FROM t1 ORDER BY b DESC`, obtenemos el siguiente resultado:
-
-``` text
-┌─a─┐
-│ 3 │
-│ 1 │
-│ 2 │
-└───┘
-```
-
-Fila `2, 4` se cortó antes de clasificar.
-
-Tenga en cuenta esta especificidad de implementación al programar consultas.
diff --git a/docs/es/sql-reference/statements/select/format.md b/docs/es/sql-reference/statements/select/format.md
deleted file mode 100644
index 00ca29ec755..00000000000
--- a/docs/es/sql-reference/statements/select/format.md
+++ /dev/null
@@ -1,18 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
----
-
-# FORMAT Cláusula {#format-clause}
-
-ClickHouse soporta una amplia gama de [formatos de serialización](../../../interfaces/formats.md) que se pueden usar en los resultados de consultas, entre otras cosas. Hay varias formas de elegir un formato para `SELECT` salida, uno de ellos es especificar `FORMAT format` al final de la consulta para obtener los datos resultantes en cualquier formato específico.
-
-El formato específico se puede utilizar ya sea por conveniencia, integración con otros sistemas o ganancia de rendimiento.
-
-## Formato predeterminado {#default-format}
-
-Si el `FORMAT` se omite la cláusula, se utiliza el formato predeterminado, que depende tanto de la configuración como de la interfaz utilizada para acceder al servidor ClickHouse. Para el [Interfaz HTTP](../../../interfaces/http.md) y el [cliente de línea de comandos](../../../interfaces/cli.md) En el modo batch, el formato predeterminado es `TabSeparated`. Para el cliente de línea de comandos en modo interactivo, el formato predeterminado es `PrettyCompact` (produce tablas compactas legibles por humanos).
-
-## Detalles de implementación {#implementation-details}
-
-Cuando se utiliza el cliente de línea de comandos, los datos siempre se pasan a través de la red en un formato interno eficiente (`Native`). El cliente interpreta independientemente el `FORMAT` cláusula de la consulta y formatea los datos en sí (aliviando así la red y el servidor de la carga adicional).
diff --git a/docs/es/sql-reference/statements/select/from.md b/docs/es/sql-reference/statements/select/from.md
deleted file mode 100644
index 718df7b952c..00000000000
--- a/docs/es/sql-reference/statements/select/from.md
+++ /dev/null
@@ -1,44 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
----
-
-# Cláusula FROM {#select-from}
-
-El `FROM` cláusula especifica la fuente de la que se leen los datos:
-
--   [Tabla](../../../engines/table-engines/index.md)
--   [Subconsultas](index.md) {## TODO: mejor enlace ##}
--   [Función de la tabla](../../table-functions/index.md#table-functions)
-
-[JOIN](join.md) y [ARRAY JOIN](array-join.md) también pueden utilizarse para ampliar la funcionalidad del `FROM` clausula.
-
-La subconsulta es otra `SELECT` consulta que se puede especificar entre paréntesis dentro `FROM` clausula.
-
-`FROM` cláusula puede contener múltiples fuentes de datos, separadas por comas, que es equivalente a realizar [CROSS JOIN](join.md) en ellos.
-
-## Modificador FINAL {#select-from-final}
-
-Cuando `FINAL` se especifica, ClickHouse fusiona completamente los datos antes de devolver el resultado y, por lo tanto, realiza todas las transformaciones de datos que ocurren durante las fusiones para el motor de tabla dado.
-
-Es aplicable cuando se seleccionan datos de tablas que utilizan [Método de codificación de datos:](../../../engines/table-engines/mergetree-family/mergetree.md)- familia del motor (excepto `GraphiteMergeTree`). También soportado para:
-
--   [Replicado](../../../engines/table-engines/mergetree-family/replication.md) versiones de `MergeTree` motor.
--   [Vista](../../../engines/table-engines/special/view.md), [Búfer](../../../engines/table-engines/special/buffer.md), [Distribuido](../../../engines/table-engines/special/distributed.md), y [Método de codificación de datos:](../../../engines/table-engines/special/materializedview.md) motores que funcionan sobre otros motores, siempre que se hayan creado sobre `MergeTree`-mesas de motor.
-
-### Inconveniente {#drawbacks}
-
-Consultas que usan `FINAL` se ejecutan no tan rápido como consultas similares que no lo hacen, porque:
-
--   La consulta se ejecuta en un solo subproceso y los datos se combinan durante la ejecución de la consulta.
--   Consultas con `FINAL` leer columnas de clave primaria además de las columnas especificadas en la consulta.
-
-**En la mayoría de los casos, evite usar `FINAL`.** El enfoque común es utilizar diferentes consultas que asumen los procesos en segundo plano de la `MergeTree` el motor aún no ha sucedido y tratar con él mediante la aplicación de agregación (por ejemplo, para descartar duplicados). {## TODO: ejemplos ##}
-
-## Detalles de implementación {#implementation-details}
-
-Si el `FROM` se omite la cláusula, los datos se leerán desde el `system.one` tabla.
-El `system.one` table contiene exactamente una fila (esta tabla cumple el mismo propósito que la tabla DUAL que se encuentra en otros DBMS).
-
-Para ejecutar una consulta, todas las columnas enumeradas en la consulta se extraen de la tabla adecuada. Las columnas no necesarias para la consulta externa se eliminan de las subconsultas.
-Si una consulta no muestra ninguna columnas (por ejemplo, `SELECT count() FROM t`), alguna columna se extrae de la tabla de todos modos (se prefiere la más pequeña), para calcular el número de filas.
diff --git a/docs/es/sql-reference/statements/select/group-by.md b/docs/es/sql-reference/statements/select/group-by.md
deleted file mode 100644
index d6be9dc06e3..00000000000
--- a/docs/es/sql-reference/statements/select/group-by.md
+++ /dev/null
@@ -1,132 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
----
-
-# GRUPO POR Cláusula {#select-group-by-clause}
-
-`GROUP BY` cláusula cambia el `SELECT` consulta en un modo de agregación, que funciona de la siguiente manera:
-
--   `GROUP BY` clause contiene una lista de expresiones (o una sola expresión, que se considera la lista de longitud uno). Esta lista actúa como un “grouping key”, mientras que cada expresión individual será referida como un “key expressions”.
--   Todas las expresiones en el [SELECT](index.md), [HAVING](having.md), y [ORDER BY](order-by.md) clausula **deber** se calculará basándose en expresiones clave **o** en [funciones agregadas](../../../sql-reference/aggregate-functions/index.md) sobre expresiones no clave (incluidas columnas simples). En otras palabras, cada columna seleccionada de la tabla debe usarse en una expresión clave o dentro de una función agregada, pero no en ambas.
--   Resultado de la agregación `SELECT` la consulta contendrá tantas filas como valores únicos de “grouping key” en la tabla de origen. Por lo general, esto reduce significativamente el recuento de filas, a menudo en órdenes de magnitud, pero no necesariamente: el recuento de filas se mantiene igual si todo “grouping key” los valores fueron distintos.
-
-!!! note "Nota"
-    Hay una forma adicional de ejecutar la agregación sobre una tabla. Si una consulta contiene columnas de tabla solo dentro de funciones agregadas, el `GROUP BY clause` se puede omitir, y se asume la agregación por un conjunto vacío de claves. Tales consultas siempre devuelven exactamente una fila.
-
-## Procesamiento NULL {#null-processing}
-
-Para agrupar, ClickHouse interpreta [NULL](../../syntax.md#null-literal) como valor, y `NULL==NULL`. Se diferencia de `NULL` procesamiento en la mayoría de los otros contextos.
-
-Aquí hay un ejemplo para mostrar lo que esto significa.
-
-Supongamos que tienes esta tabla:
-
-``` text
-┌─x─┬────y─┐
-│ 1 │    2 │
-│ 2 │ ᴺᵁᴸᴸ │
-│ 3 │    2 │
-│ 3 │    3 │
-│ 3 │ ᴺᵁᴸᴸ │
-└───┴──────┘
-```
-
-Consulta `SELECT sum(x), y FROM t_null_big GROUP BY y` resultados en:
-
-``` text
-┌─sum(x)─┬────y─┐
-│      4 │    2 │
-│      3 │    3 │
-│      5 │ ᴺᵁᴸᴸ │
-└────────┴──────┘
-```
-
-Se puede ver que `GROUP BY` para `y = NULL` resumir `x` como si `NULL` es este valor.
-
-Si pasa varias teclas a `GROUP BY` el resultado le dará todas las combinaciones de la selección, como si `NULL` fueron un valor específico.
-
-## CON TOTALS Modificador {#with-totals-modifier}
-
-Si el `WITH TOTALS` se especifica el modificador, se calculará otra fila. Esta fila tendrá columnas clave que contienen valores predeterminados (zeros o líneas vacías) y columnas de funciones agregadas con los valores calculados en todas las filas (el “total” valor).
-
-Esta fila adicional solo se produce en `JSON*`, `TabSeparated*`, y `Pretty*` formatos, por separado de las otras filas:
-
--   En `JSON*` formatos, esta fila se muestra como una ‘totals’ campo.
--   En `TabSeparated*` formatea, la fila viene después del resultado principal, precedida por una fila vacía (después de los otros datos).
--   En `Pretty*` formatea, la fila se muestra como una tabla separada después del resultado principal.
--   En los otros formatos no está disponible.
-
-`WITH TOTALS` se puede ejecutar de diferentes maneras cuando HAVING está presente. El comportamiento depende de la ‘totals_mode’ configuración.
-
-### Configuración del procesamiento de totales {#configuring-totals-processing}
-
-Predeterminada, `totals_mode = 'before_having'`. En este caso, ‘totals’ se calcula en todas las filas, incluidas las que no pasan por HAVING y `max_rows_to_group_by`.
-
-Las otras alternativas incluyen solo las filas que pasan por HAVING en ‘totals’, y comportarse de manera diferente con el ajuste `max_rows_to_group_by` y `group_by_overflow_mode = 'any'`.
-
-`after_having_exclusive` – Don't include rows that didn't pass through `max_rows_to_group_by`. En otras palabras, ‘totals’ tendrá menos o el mismo número de filas que si `max_rows_to_group_by` se omitieron.
-
-`after_having_inclusive` – Include all the rows that didn't pass through ‘max_rows_to_group_by’ en ‘totals’. En otras palabras, ‘totals’ tendrá más o el mismo número de filas como lo haría si `max_rows_to_group_by` se omitieron.
-
-`after_having_auto` – Count the number of rows that passed through HAVING. If it is more than a certain amount (by default, 50%), include all the rows that didn't pass through ‘max_rows_to_group_by’ en ‘totals’. De lo contrario, no los incluya.
-
-`totals_auto_threshold` – By default, 0.5. The coefficient for `after_having_auto`.
-
-Si `max_rows_to_group_by` y `group_by_overflow_mode = 'any'` no se utilizan, todas las variaciones de `after_having` son los mismos, y se puede utilizar cualquiera de ellos (por ejemplo, `after_having_auto`).
-
-Puede usar WITH TOTALS en subconsultas, incluidas las subconsultas en la cláusula JOIN (en este caso, se combinan los valores totales respectivos).
-
-## Ejemplos {#examples}
-
-Ejemplo:
-
-``` sql
-SELECT
-    count(),
-    median(FetchTiming > 60 ? 60 : FetchTiming),
-    count() - sum(Refresh)
-FROM hits
-```
-
-Sin embargo, a diferencia del SQL estándar, si la tabla no tiene ninguna fila (o no hay ninguna, o no hay ninguna después de usar WHERE para filtrar), se devuelve un resultado vacío, y no el resultado de una de las filas que contienen los valores iniciales de las funciones agregadas.
-
-A diferencia de MySQL (y conforme a SQL estándar), no puede obtener algún valor de alguna columna que no esté en una función clave o agregada (excepto expresiones constantes). Para evitar esto, puede usar el ‘any’ función de agregado (obtener el primer valor encontrado) o ‘min/max’.
-
-Ejemplo:
-
-``` sql
-SELECT
-    domainWithoutWWW(URL) AS domain,
-    count(),
-    any(Title) AS title -- getting the first occurred page header for each domain.
-FROM hits
-GROUP BY domain
-```
-
-Para cada valor de clave diferente encontrado, GROUP BY calcula un conjunto de valores de función agregados.
-
-GROUP BY no se admite para columnas de matriz.
-
-No se puede especificar una constante como argumentos para funciones agregadas. Ejemplo: sum(1). En lugar de esto, puedes deshacerte de la constante. Ejemplo: `count()`.
-
-## Detalles de implementación {#implementation-details}
-
-La agregación es una de las características más importantes de un DBMS orientado a columnas, y por lo tanto su implementación es una de las partes más optimizadas de ClickHouse. De forma predeterminada, la agregación se realiza en la memoria utilizando una tabla hash. Tiene más de 40 especializaciones que se eligen automáticamente dependiendo de “grouping key” tipos de datos.
-
-### GROUP BY en memoria externa {#select-group-by-in-external-memory}
-
-Puede habilitar el volcado de datos temporales en el disco para restringir el uso de memoria durante `GROUP BY`.
-El [max_bytes_before_external_group_by](../../../operations/settings/settings.md#settings-max_bytes_before_external_group_by) determina el umbral de consumo de RAM para el dumping `GROUP BY` datos temporales al sistema de archivos. Si se establece en 0 (el valor predeterminado), está deshabilitado.
-
-Cuando se utiliza `max_bytes_before_external_group_by`, le recomendamos que establezca `max_memory_usage` aproximadamente el doble de alto. Esto es necesario porque hay dos etapas para la agregación: leer los datos y formar datos intermedios (1) y fusionar los datos intermedios (2). El volcado de datos al sistema de archivos solo puede ocurrir durante la etapa 1. Si los datos temporales no se volcaron, entonces la etapa 2 puede requerir hasta la misma cantidad de memoria que en la etapa 1.
-
-Por ejemplo, si [Método de codificación de datos:](../../../operations/settings/settings.md#settings_max_memory_usage) se estableció en 10000000000 y desea usar agregación externa, tiene sentido establecer `max_bytes_before_external_group_by` a 10000000000, y `max_memory_usage` a 20000000000. Cuando se activa la agregación externa (si hubo al menos un volcado de datos temporales), el consumo máximo de RAM es solo un poco más que `max_bytes_before_external_group_by`.
-
-Con el procesamiento de consultas distribuidas, la agregación externa se realiza en servidores remotos. Para que el servidor solicitante use solo una pequeña cantidad de RAM, establezca `distributed_aggregation_memory_efficient` a 1.
-
-Al fusionar datos en el disco, así como al fusionar resultados de servidores remotos cuando `distributed_aggregation_memory_efficient` la configuración está habilitada, consume hasta `1/256 * the_number_of_threads` de la cantidad total de RAM.
-
-Cuando la agregación externa está habilitada, si `max_bytes_before_external_group_by` of data (i.e. data was not flushed), the query runs just as fast as without external aggregation. If any temporary data was flushed, the run time will be several times longer (approximately three times).
-
-Si usted tiene un [ORDER BY](order-by.md) con un [LIMIT](limit.md) despues `GROUP BY`, entonces la cantidad de RAM usada depende de la cantidad de datos en `LIMIT`, no en toda la tabla. Pero si el `ORDER BY` no tiene `LIMIT`, no se olvide de habilitar la clasificación externa (`max_bytes_before_external_sort`).
diff --git a/docs/es/sql-reference/statements/select/having.md b/docs/es/sql-reference/statements/select/having.md
deleted file mode 100644
index ce65b95e54f..00000000000
--- a/docs/es/sql-reference/statements/select/having.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
----
-
-# Cláusula HAVING {#having-clause}
-
-Permite filtrar los resultados de agregación producidos por [GROUP BY](group-by.md). Es similar a la [WHERE](where.md) cláusula, pero la diferencia es que `WHERE` se realiza antes de la agregación, mientras que `HAVING` se realiza después de eso.
-
-Es posible hacer referencia a los resultados de la agregación de `SELECT` cláusula en `HAVING` cláusula por su alias. Alternativamente, `HAVING` cláusula puede filtrar los resultados de agregados adicionales que no se devuelven en los resultados de la consulta.
-
-## Limitacion {#limitations}
-
-`HAVING` no se puede usar si no se realiza la agregación. Utilizar `WHERE` en su lugar.
diff --git a/docs/es/sql-reference/statements/select/index.md b/docs/es/sql-reference/statements/select/index.md
deleted file mode 100644
index 653f737b1d0..00000000000
--- a/docs/es/sql-reference/statements/select/index.md
+++ /dev/null
@@ -1,158 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 33
-toc_title: SELECT
----
-
-# SELECCIONAR consultas Sintaxis {#select-queries-syntax}
-
-`SELECT` realiza la recuperación de datos.
-
-``` sql
-[WITH expr_list|(subquery)]
-SELECT [DISTINCT] expr_list
-[FROM [db.]table | (subquery) | table_function] [FINAL]
-[SAMPLE sample_coeff]
-[ARRAY JOIN ...]
-[GLOBAL] [ANY|ALL|ASOF] [INNER|LEFT|RIGHT|FULL|CROSS] [OUTER|SEMI|ANTI] JOIN (subquery)|table (ON <expr_list>)|(USING <column_list>)
-[PREWHERE expr]
-[WHERE expr]
-[GROUP BY expr_list] [WITH TOTALS]
-[HAVING expr]
-[ORDER BY expr_list] [WITH FILL] [FROM expr] [TO expr] [STEP expr] 
-[LIMIT [offset_value, ]n BY columns]
-[LIMIT [n, ]m] [WITH TIES]
-[UNION ALL ...]
-[INTO OUTFILE filename]
-[FORMAT format]
-```
-
-Todas las cláusulas son opcionales, excepto la lista requerida de expresiones inmediatamente después `SELECT` que está cubierto con más detalle [debajo](#select-clause).
-
-Los detalles de cada cláusula opcional se cubren en secciones separadas, que se enumeran en el mismo orden en que se ejecutan:
-
--   [CON cláusula](with.md)
--   [Cláusula DISTINCT](distinct.md)
--   [Cláusula FROM](from.md)
--   [Cláusula SAMPLE](sample.md)
--   [Cláusula JOIN](join.md)
--   [Cláusula PREWHERE](prewhere.md)
--   [Cláusula WHERE](where.md)
--   [Cláusula GROUP BY](group-by.md)
--   [Cláusula LIMIT BY](limit-by.md)
--   [Cláusula HAVING](having.md)
--   [Cláusula SELECT](#select-clause)
--   [Cláusula LIMIT](limit.md)
--   [UNION ALL cláusula](union.md)
-
-## SELECT Cláusula {#select-clause}
-
-[Expresiones](../../syntax.md#syntax-expressions) especificado en el `SELECT` cláusula se calculan después de que todas las operaciones en las cláusulas descritas anteriormente hayan finalizado. Estas expresiones funcionan como si se aplicaran a filas separadas en el resultado. Si las expresiones en el `SELECT` cláusula contiene funciones agregadas, a continuación, ClickHouse procesa funciones agregadas y expresiones utilizadas como sus argumentos durante el [GROUP BY](group-by.md) agregación.
-
-Si desea incluir todas las columnas en el resultado, use el asterisco (`*`) simbolo. Por ejemplo, `SELECT * FROM ...`.
-
-Para hacer coincidir algunas columnas en el resultado con un [Re2](https://en.wikipedia.org/wiki/RE2_(software)) expresión regular, puede utilizar el `COLUMNS` expresion.
-
-``` sql
-COLUMNS('regexp')
-```
-
-Por ejemplo, considere la tabla:
-
-``` sql
-CREATE TABLE default.col_names (aa Int8, ab Int8, bc Int8) ENGINE = TinyLog
-```
-
-La siguiente consulta selecciona datos de todas las columnas que contienen `a` símbolo en su nombre.
-
-``` sql
-SELECT COLUMNS('a') FROM col_names
-```
-
-``` text
-┌─aa─┬─ab─┐
-│  1 │  1 │
-└────┴────┘
-```
-
-Las columnas seleccionadas no se devuelven en orden alfabético.
-
-Puede utilizar múltiples `COLUMNS` expresiones en una consulta y aplicarles funciones.
-
-Por ejemplo:
-
-``` sql
-SELECT COLUMNS('a'), COLUMNS('c'), toTypeName(COLUMNS('c')) FROM col_names
-```
-
-``` text
-┌─aa─┬─ab─┬─bc─┬─toTypeName(bc)─┐
-│  1 │  1 │  1 │ Int8           │
-└────┴────┴────┴────────────────┘
-```
-
-Cada columna devuelta por el `COLUMNS` expresión se pasa a la función como un argumento separado. También puede pasar otros argumentos a la función si los admite. Tenga cuidado al usar funciones. Si una función no admite la cantidad de argumentos que le ha pasado, ClickHouse lanza una excepción.
-
-Por ejemplo:
-
-``` sql
-SELECT COLUMNS('a') + COLUMNS('c') FROM col_names
-```
-
-``` text
-Received exception from server (version 19.14.1):
-Code: 42. DB::Exception: Received from localhost:9000. DB::Exception: Number of arguments for function plus doesn't match: passed 3, should be 2.
-```
-
-En este ejemplo, `COLUMNS('a')` devuelve dos columnas: `aa` y `ab`. `COLUMNS('c')` devuelve el `bc` columna. El `+` el operador no puede aplicar a 3 argumentos, por lo que ClickHouse lanza una excepción con el mensaje relevante.
-
-Columnas que coinciden con el `COLUMNS` expresión puede tener diferentes tipos de datos. Si `COLUMNS` no coincide con ninguna columna y es la única expresión en `SELECT`, ClickHouse lanza una excepción.
-
-### Asterisco {#asterisk}
-
-Puede poner un asterisco en cualquier parte de una consulta en lugar de una expresión. Cuando se analiza la consulta, el asterisco se expande a una lista de todas las columnas de la tabla `MATERIALIZED` y `ALIAS` columna). Solo hay unos pocos casos en los que se justifica el uso de un asterisco:
-
--   Al crear un volcado de tabla.
--   Para tablas que contienen solo unas pocas columnas, como las tablas del sistema.
--   Para obtener información sobre qué columnas están en una tabla. En este caso, establezca `LIMIT 1`. Pero es mejor usar el `DESC TABLE` consulta.
--   Cuando hay una filtración fuerte en un pequeño número de columnas usando `PREWHERE`.
--   En subconsultas (ya que las columnas que no son necesarias para la consulta externa están excluidas de las subconsultas).
-
-En todos los demás casos, no recomendamos usar el asterisco, ya que solo le da los inconvenientes de un DBMS columnar en lugar de las ventajas. En otras palabras, no se recomienda usar el asterisco.
-
-### Valores extremos {#extreme-values}
-
-Además de los resultados, también puede obtener valores mínimos y máximos para las columnas de resultados. Para hacer esto, establezca el **extremo** a 1. Los mínimos y máximos se calculan para tipos numéricos, fechas y fechas con horas. Para otras columnas, se generan los valores predeterminados.
-
-An extra two rows are calculated – the minimums and maximums, respectively. These extra two rows are output in `JSON*`, `TabSeparated*`, y `Pretty*` [formato](../../../interfaces/formats.md), separado de las otras filas. No se emiten para otros formatos.
-
-En `JSON*` los valores extremos se emiten en un formato separado. ‘extremes’ campo. En `TabSeparated*` , la fila viene después del resultado principal, y después de ‘totals’ si está presente. Está precedido por una fila vacía (después de los otros datos). En `Pretty*` formatea, la fila se muestra como una tabla separada después del resultado principal, y después de `totals` si está presente.
-
-Los valores extremos se calculan para las filas anteriores `LIMIT`, pero después `LIMIT BY`. Sin embargo, cuando se usa `LIMIT offset, size`, las filas antes `offset` están incluidos en `extremes`. En las solicitudes de secuencia, el resultado también puede incluir un pequeño número de filas que pasaron por `LIMIT`.
-
-### Nota {#notes}
-
-Puedes usar sinónimos (`AS` aliases) en cualquier parte de una consulta.
-
-El `GROUP BY` y `ORDER BY` las cláusulas no admiten argumentos posicionales. Esto contradice MySQL, pero se ajusta al SQL estándar. Por ejemplo, `GROUP BY 1, 2` will be interpreted as grouping by constants (i.e. aggregation of all rows into one).
-
-## Detalles de implementación {#implementation-details}
-
-Si la consulta omite el `DISTINCT`, `GROUP BY` y `ORDER BY` cláusulas y el `IN` y `JOIN` subconsultas, la consulta se procesará por completo, utilizando O (1) cantidad de RAM. De lo contrario, la consulta podría consumir mucha RAM si no se especifican las restricciones adecuadas:
-
--   `max_memory_usage`
--   `max_rows_to_group_by`
--   `max_rows_to_sort`
--   `max_rows_in_distinct`
--   `max_bytes_in_distinct`
--   `max_rows_in_set`
--   `max_bytes_in_set`
--   `max_rows_in_join`
--   `max_bytes_in_join`
--   `max_bytes_before_external_sort`
--   `max_bytes_before_external_group_by`
-
-Para obtener más información, consulte la sección “Settings”. Es posible utilizar la clasificación externa (guardar tablas temporales en un disco) y la agregación externa.
-
-{## [Artículo Original](https://clickhouse.tech/docs/en/sql-reference/statements/select/) ##}
diff --git a/docs/es/sql-reference/statements/select/into-outfile.md b/docs/es/sql-reference/statements/select/into-outfile.md
deleted file mode 100644
index 70f5687611e..00000000000
--- a/docs/es/sql-reference/statements/select/into-outfile.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
----
-
-# INTO OUTFILE Cláusula {#into-outfile-clause}
-
-Añadir el `INTO OUTFILE filename` cláusula (donde filename es un literal de cadena) para `SELECT query` para redirigir su salida al archivo especificado en el lado del cliente.
-
-## Detalles de implementación {#implementation-details}
-
--   Esta funcionalidad está disponible en el [cliente de línea de comandos](../../../interfaces/cli.md) y [Sistema abierto.](../../../operations/utilities/clickhouse-local.md#clickhouse-local). Por lo tanto, una consulta enviada a través de [Interfaz HTTP](../../../interfaces/http.md) fallará.
--   La consulta fallará si ya existe un archivo con el mismo nombre de archivo.
--   Predeterminado [formato de salida](../../../interfaces/formats.md) ser `TabSeparated` (como en el modo por lotes de cliente de línea de comandos).
diff --git a/docs/es/sql-reference/statements/select/join.md b/docs/es/sql-reference/statements/select/join.md
deleted file mode 100644
index 4f0c5095008..00000000000
--- a/docs/es/sql-reference/statements/select/join.md
+++ /dev/null
@@ -1,187 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
----
-
-# Cláusula JOIN {#select-join}
-
-Join produce una nueva tabla combinando columnas de una o varias tablas utilizando valores comunes a cada una. Es una operación común en bases de datos con soporte SQL, que corresponde a [álgebra relacional](https://en.wikipedia.org/wiki/Relational_algebra#Joins_and_join-like_operators) unir. El caso especial de una combinación de tabla a menudo se conoce como “self-join”.
-
-Sintaxis:
-
-``` sql
-SELECT <expr_list>
-FROM <left_table>
-[GLOBAL] [INNER|LEFT|RIGHT|FULL|CROSS] [OUTER|SEMI|ANTI|ANY|ASOF] JOIN <right_table>
-(ON <expr_list>)|(USING <column_list>) ...
-```
-
-Expresiones de `ON` y columnas de `USING` cláusula se llaman “join keys”. A menos que se indique lo contrario, join produce un [Producto cartesiano](https://en.wikipedia.org/wiki/Cartesian_product) de filas con coincidencia “join keys”, lo que podría producir resultados con muchas más filas que las tablas de origen.
-
-## Tipos admitidos de JOIN {#select-join-types}
-
-Todo estándar [SQL JOIN](https://en.wikipedia.org/wiki/Join_(SQL)) tipos son compatibles:
-
--   `INNER JOIN`, sólo se devuelven las filas coincidentes.
--   `LEFT OUTER JOIN`, filas no coincidentes de la tabla izquierda se devuelven además de las filas coincidentes.
--   `RIGHT OUTER JOIN`, filas no coincidentes de la tabla izquierda se devuelven además de las filas coincidentes.
--   `FULL OUTER JOIN`, las filas que no coinciden de ambas tablas se devuelven además de las filas coincidentes.
--   `CROSS JOIN`, produce el producto cartesiano de tablas enteras, “join keys” ser **ni** indicado.
-
-`JOIN` sin tipo especificado implica `INNER`. Palabra clave `OUTER` se puede omitir con seguridad. Sintaxis alternativa para `CROSS JOIN` está especificando múltiples tablas en [Cláusula FROM](from.md) separados por comas.
-
-Tipos de unión adicionales disponibles en ClickHouse:
-
--   `LEFT SEMI JOIN` y `RIGHT SEMI JOIN`, una lista blanca en “join keys”, sin producir un producto cartesiano.
--   `LEFT ANTI JOIN` y `RIGHT ANTI JOIN`, una lista negra sobre “join keys”, sin producir un producto cartesiano.
--   `LEFT ANY JOIN`, `RIGHT ANY JOIN` and `INNER ANY JOIN`, partially (for opposite side of `LEFT` and `RIGHT`) or completely (for `INNER` and `FULL`) disables the cartesian product for standard `JOIN` types.
--   `ASOF JOIN` and `LEFT ASOF JOIN`, joining sequences with a non-exact match. `ASOF JOIN` usage is described below.
-
-## Setting {#join-settings}
-
-!!! note "Nota"
-    El valor de rigor predeterminado se puede anular usando [Por favor, introduzca su dirección de correo electrónico](../../../operations/settings/settings.md#settings-join_default_strictness) configuración.
-
-### ASOF JOIN Uso {#asof-join-usage}
-
-`ASOF JOIN` es útil cuando necesita unir registros que no tienen una coincidencia exacta.
-
-Tablas para `ASOF JOIN` debe tener una columna de secuencia ordenada. Esta columna no puede estar sola en una tabla y debe ser uno de los tipos de datos: `UInt32`, `UInt64`, `Float32`, `Float64`, `Date`, y `DateTime`.
-
-Sintaxis `ASOF JOIN ... ON`:
-
-``` sql
-SELECT expressions_list
-FROM table_1
-ASOF LEFT JOIN table_2
-ON equi_cond AND closest_match_cond
-```
-
-Puede usar cualquier número de condiciones de igualdad y exactamente una condición de coincidencia más cercana. Por ejemplo, `SELECT count() FROM table_1 ASOF LEFT JOIN table_2 ON table_1.a == table_2.b AND table_2.t <= table_1.t`.
-
-Condiciones admitidas para la coincidencia más cercana: `>`, `>=`, `<`, `<=`.
-
-Sintaxis `ASOF JOIN ... USING`:
-
-``` sql
-SELECT expressions_list
-FROM table_1
-ASOF JOIN table_2
-USING (equi_column1, ... equi_columnN, asof_column)
-```
-
-`ASOF JOIN` utilizar `equi_columnX` para unirse a la igualdad y `asof_column` para unirse en el partido más cercano con el `table_1.asof_column >= table_2.asof_column` condición. El `asof_column` columna siempre el último en el `USING` clausula.
-
-Por ejemplo, considere las siguientes tablas:
-
-         table_1                           table_2
-      event   | ev_time | user_id       event   | ev_time | user_id
-    ----------|---------|----------   ----------|---------|----------
-                  ...                               ...
-    event_1_1 |  12:00  |  42         event_2_1 |  11:59  |   42
-                  ...                 event_2_2 |  12:30  |   42
-    event_1_2 |  13:00  |  42         event_2_3 |  13:00  |   42
-                  ...                               ...
-
-`ASOF JOIN` puede tomar la marca de tiempo de un evento de usuario de `table_1` y encontrar un evento en `table_2` donde la marca de tiempo es la más cercana a la marca de tiempo del evento `table_1` correspondiente a la condición de coincidencia más cercana. Los valores de marca de tiempo iguales son los más cercanos si están disponibles. Aquí, el `user_id` se puede utilizar para unirse a la igualdad y el `ev_time` columna se puede utilizar para unirse en el partido más cercano. En nuestro ejemplo, `event_1_1` se puede unir con `event_2_1` y `event_1_2` se puede unir con `event_2_3`, pero `event_2_2` no se puede unir.
-
-!!! note "Nota"
-    `ASOF` unirse es **ni** apoyado en el [Unir](../../../engines/table-engines/special/join.md) motor de mesa.
-
-## Unión distribuida {#global-join}
-
-Hay dos formas de ejecutar la unión que involucra tablas distribuidas:
-
--   Cuando se utiliza una normal `JOIN`, la consulta se envía a servidores remotos. Las subconsultas se ejecutan en cada una de ellas para crear la tabla correcta, y la unión se realiza con esta tabla. En otras palabras, la tabla correcta se forma en cada servidor por separado.
--   Cuando se utiliza `GLOBAL ... JOIN`, primero el servidor requestor ejecuta una subconsulta para calcular la tabla correcta. Esta tabla temporal se pasa a cada servidor remoto y las consultas se ejecutan en ellos utilizando los datos temporales que se transmitieron.
-
-Tenga cuidado al usar `GLOBAL`. Para obtener más información, consulte [Subconsultas distribuidas](../../operators/in.md#select-distributed-subqueries) apartado.
-
-## Recomendaciones de uso {#usage-recommendations}
-
-### Procesamiento de celdas vacías o NULL {#processing-of-empty-or-null-cells}
-
-Al unir tablas, pueden aparecer las celdas vacías. Configuración [Sistema abierto.](../../../operations/settings/settings.md#join_use_nulls) definir cómo ClickHouse llena estas celdas.
-
-Si el `JOIN` las llaves son [NULL](../../data-types/nullable.md) campos, las filas donde al menos una de las claves tiene el valor [NULL](../../../sql-reference/syntax.md#null-literal) no se unen.
-
-### Sintaxis {#syntax}
-
-Las columnas especificadas en `USING` debe tener los mismos nombres en ambas subconsultas, y las otras columnas deben tener un nombre diferente. Puede utilizar alias para cambiar los nombres de las columnas en subconsultas.
-
-El `USING` clause especifica una o más columnas a unir, lo que establece la igualdad de estas columnas. La lista de columnas se establece sin corchetes. No se admiten condiciones de unión más complejas.
-
-### Limitaciones de sintaxis {#syntax-limitations}
-
-Para múltiples `JOIN` cláusulas en una sola `SELECT` consulta:
-
--   Tomando todas las columnas a través de `*` está disponible solo si se unen tablas, no subconsultas.
--   El `PREWHERE` cláusula no está disponible.
-
-Para `ON`, `WHERE`, y `GROUP BY` clausula:
-
--   Las expresiones arbitrarias no se pueden utilizar en `ON`, `WHERE`, y `GROUP BY` cláusulas, pero puede definir una expresión en un `SELECT` cláusula y luego usarla en estas cláusulas a través de un alias.
-
-### Rendimiento {#performance}
-
-Cuando se ejecuta un `JOIN`, no hay optimización del orden de ejecución en relación con otras etapas de la consulta. La combinación (una búsqueda en la tabla de la derecha) se ejecuta antes de filtrar `WHERE` y antes de la agregación.
-
-Cada vez que se ejecuta una consulta `JOIN`, la subconsulta se ejecuta de nuevo porque el resultado no se almacena en caché. Para evitar esto, use el especial [Unir](../../../engines/table-engines/special/join.md) motor de tabla, que es una matriz preparada para unirse que siempre está en RAM.
-
-En algunos casos, es más eficiente de usar [IN](../../operators/in.md) en lugar de `JOIN`.
-
-Si necesita un `JOIN` para unirse a tablas de dimensión (son tablas relativamente pequeñas que contienen propiedades de dimensión, como nombres para campañas publicitarias), un `JOIN` podría no ser muy conveniente debido al hecho de que se vuelve a acceder a la tabla correcta para cada consulta. Para tales casos, hay un “external dictionaries” característica que debe utilizar en lugar de `JOIN`. Para obtener más información, consulte [Diccionarios externos](../../dictionaries/external-dictionaries/external-dicts.md) apartado.
-
-### Limitaciones de memoria {#memory-limitations}
-
-De forma predeterminada, ClickHouse usa el [hash unirse](https://en.wikipedia.org/wiki/Hash_join) algoritmo. ClickHouse toma el `<right_table>` y crea una tabla hash para ello en RAM. Después de algún umbral de consumo de memoria, ClickHouse vuelve a fusionar el algoritmo de unión.
-
-Si necesita restringir el consumo de memoria de la operación de unión, use la siguiente configuración:
-
--   [Método de codificación de datos:](../../../operations/settings/query-complexity.md#settings-max_rows_in_join) — Limits number of rows in the hash table.
--   [Método de codificación de datos:](../../../operations/settings/query-complexity.md#settings-max_bytes_in_join) — Limits size of the hash table.
-
-Cuando se alcanza cualquiera de estos límites, ClickHouse actúa como el [join_overflow_mode](../../../operations/settings/query-complexity.md#settings-join_overflow_mode) configuración instruye.
-
-## Ejemplos {#examples}
-
-Ejemplo:
-
-``` sql
-SELECT
-    CounterID,
-    hits,
-    visits
-FROM
-(
-    SELECT
-        CounterID,
-        count() AS hits
-    FROM test.hits
-    GROUP BY CounterID
-) ANY LEFT JOIN
-(
-    SELECT
-        CounterID,
-        sum(Sign) AS visits
-    FROM test.visits
-    GROUP BY CounterID
-) USING CounterID
-ORDER BY hits DESC
-LIMIT 10
-```
-
-``` text
-┌─CounterID─┬───hits─┬─visits─┐
-│   1143050 │ 523264 │  13665 │
-│    731962 │ 475698 │ 102716 │
-│    722545 │ 337212 │ 108187 │
-│    722889 │ 252197 │  10547 │
-│   2237260 │ 196036 │   9522 │
-│  23057320 │ 147211 │   7689 │
-│    722818 │  90109 │  17847 │
-│     48221 │  85379 │   4652 │
-│  19762435 │  77807 │   7026 │
-│    722884 │  77492 │  11056 │
-└───────────┴────────┴────────┘
-```
diff --git a/docs/es/sql-reference/statements/select/limit-by.md b/docs/es/sql-reference/statements/select/limit-by.md
deleted file mode 100644
index 92bc8426b78..00000000000
--- a/docs/es/sql-reference/statements/select/limit-by.md
+++ /dev/null
@@ -1,71 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
----
-
-# LIMITAR POR Cláusula {#limit-by-clause}
-
-Una consulta con el `LIMIT n BY expressions` cláusula selecciona la primera `n` para cada valor distinto de `expressions`. La clave para `LIMIT BY` puede contener cualquier número de [expresiones](../../syntax.md#syntax-expressions).
-
-ClickHouse admite las siguientes variantes de sintaxis:
-
--   `LIMIT [offset_value, ]n BY expressions`
--   `LIMIT n OFFSET offset_value BY expressions`
-
-Durante el procesamiento de consultas, ClickHouse selecciona los datos ordenados por clave de ordenación. La clave de ordenación se establece explícitamente utilizando un [ORDER BY](order-by.md) cláusula o implícitamente como una propiedad del motor de tablas. Entonces se aplica ClickHouse `LIMIT n BY expressions` y devuelve la primera `n` filas para cada combinación distinta de `expressions`. Si `OFFSET` se especifica, a continuación, para cada bloque de datos que pertenece a una combinación distinta de `expressions`, ClickHouse salta `offset_value` número de filas desde el principio del bloque y devuelve un máximo de `n` filas como resultado. Si `offset_value` es mayor que el número de filas en el bloque de datos, ClickHouse devuelve cero filas del bloque.
-
-!!! note "Nota"
-    `LIMIT BY` no está relacionado con [LIMIT](limit.md). Ambos se pueden usar en la misma consulta.
-
-## Ejemplos {#examples}
-
-Tabla de muestra:
-
-``` sql
-CREATE TABLE limit_by(id Int, val Int) ENGINE = Memory;
-INSERT INTO limit_by VALUES (1, 10), (1, 11), (1, 12), (2, 20), (2, 21);
-```
-
-Consulta:
-
-``` sql
-SELECT * FROM limit_by ORDER BY id, val LIMIT 2 BY id
-```
-
-``` text
-┌─id─┬─val─┐
-│  1 │  10 │
-│  1 │  11 │
-│  2 │  20 │
-│  2 │  21 │
-└────┴─────┘
-```
-
-``` sql
-SELECT * FROM limit_by ORDER BY id, val LIMIT 1, 2 BY id
-```
-
-``` text
-┌─id─┬─val─┐
-│  1 │  11 │
-│  1 │  12 │
-│  2 │  21 │
-└────┴─────┘
-```
-
-El `SELECT * FROM limit_by ORDER BY id, val LIMIT 2 OFFSET 1 BY id` query devuelve el mismo resultado.
-
-La siguiente consulta devuelve las 5 referencias principales para cada `domain, device_type` par con un máximo de 100 filas en total (`LIMIT n BY + LIMIT`).
-
-``` sql
-SELECT
-    domainWithoutWWW(URL) AS domain,
-    domainWithoutWWW(REFERRER_URL) AS referrer,
-    device_type,
-    count() cnt
-FROM hits
-GROUP BY domain, referrer, device_type
-ORDER BY cnt DESC
-LIMIT 5 BY domain, device_type
-LIMIT 100
-```
diff --git a/docs/es/sql-reference/statements/select/limit.md b/docs/es/sql-reference/statements/select/limit.md
deleted file mode 100644
index 60caf7f09b9..00000000000
--- a/docs/es/sql-reference/statements/select/limit.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
----
-
-# Cláusula LIMIT {#limit-clause}
-
-`LIMIT m` permite seleccionar la primera `m` filas del resultado.
-
-`LIMIT n, m` permite seleccionar el `m` el resultado después de omitir la primera `n` filas. El `LIMIT m OFFSET n` sintaxis es equivalente.
-
-`n` y `m` deben ser enteros no negativos.
-
-Si no hay [ORDER BY](order-by.md) cláusula que ordena explícitamente los resultados, la elección de las filas para el resultado puede ser arbitraria y no determinista.
diff --git a/docs/es/sql-reference/statements/select/order-by.md b/docs/es/sql-reference/statements/select/order-by.md
deleted file mode 100644
index 3955cc1665a..00000000000
--- a/docs/es/sql-reference/statements/select/order-by.md
+++ /dev/null
@@ -1,72 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
----
-
-# ORDEN POR CLÁUSULA {#select-order-by}
-
-El `ORDER BY` cláusula contiene una lista de expresiones, cada una de las cuales puede atribuirse con `DESC` (descendente) o `ASC` modificador (ascendente) que determina la dirección de clasificación. Si no se especifica la dirección, `ASC` se supone, por lo que generalmente se omite. La dirección de ordenación se aplica a una sola expresión, no a toda la lista. Ejemplo: `ORDER BY Visits DESC, SearchPhrase`
-
-Las filas que tienen valores idénticos para la lista de expresiones de clasificación se generan en un orden arbitrario, que también puede ser no determinista (diferente cada vez).
-Si se omite la cláusula ORDER BY, el orden de las filas tampoco está definido, y también puede ser no determinista.
-
-## Clasificación de valores especiales {#sorting-of-special-values}
-
-Hay dos enfoques para `NaN` y `NULL` orden de clasificación:
-
--   Por defecto o con el `NULLS LAST` modificador: primero los valores, luego `NaN`, entonces `NULL`.
--   Con el `NULLS FIRST` modificador: primero `NULL`, entonces `NaN`, luego otros valores.
-
-### Ejemplo {#example}
-
-Para la mesa
-
-``` text
-┌─x─┬────y─┐
-│ 1 │ ᴺᵁᴸᴸ │
-│ 2 │    2 │
-│ 1 │  nan │
-│ 2 │    2 │
-│ 3 │    4 │
-│ 5 │    6 │
-│ 6 │  nan │
-│ 7 │ ᴺᵁᴸᴸ │
-│ 6 │    7 │
-│ 8 │    9 │
-└───┴──────┘
-```
-
-Ejecute la consulta `SELECT * FROM t_null_nan ORDER BY y NULLS FIRST` conseguir:
-
-``` text
-┌─x─┬────y─┐
-│ 1 │ ᴺᵁᴸᴸ │
-│ 7 │ ᴺᵁᴸᴸ │
-│ 1 │  nan │
-│ 6 │  nan │
-│ 2 │    2 │
-│ 2 │    2 │
-│ 3 │    4 │
-│ 5 │    6 │
-│ 6 │    7 │
-│ 8 │    9 │
-└───┴──────┘
-```
-
-Cuando se ordenan los números de coma flotante, los NaN están separados de los otros valores. Independientemente del orden de clasificación, los NaN vienen al final. En otras palabras, para la clasificación ascendente se colocan como si fueran más grandes que todos los demás números, mientras que para la clasificación descendente se colocan como si fueran más pequeños que el resto.
-
-## Soporte de colación {#collation-support}
-
-Para ordenar por valores de cadena, puede especificar la intercalación (comparación). Ejemplo: `ORDER BY SearchPhrase COLLATE 'tr'` - para ordenar por palabra clave en orden ascendente, utilizando el alfabeto turco, insensible a mayúsculas y minúsculas, suponiendo que las cadenas están codificadas en UTF-8. COLLATE se puede especificar o no para cada expresión en ORDER BY de forma independiente. Si se especifica ASC o DESC, se especifica COLLATE después de él. Cuando se usa COLLATE, la clasificación siempre distingue entre mayúsculas y minúsculas.
-
-Solo recomendamos usar COLLATE para la clasificación final de un pequeño número de filas, ya que la clasificación con COLLATE es menos eficiente que la clasificación normal por bytes.
-
-## Detalles de implementación {#implementation-details}
-
-Menos RAM se utiliza si un pequeño suficiente [LIMIT](limit.md) se especifica además `ORDER BY`. De lo contrario, la cantidad de memoria gastada es proporcional al volumen de datos para clasificar. Para el procesamiento de consultas distribuidas, si [GROUP BY](group-by.md) se omite, la clasificación se realiza parcialmente en servidores remotos y los resultados se fusionan en el servidor solicitante. Esto significa que para la ordenación distribuida, el volumen de datos a ordenar puede ser mayor que la cantidad de memoria en un único servidor.
-
-Si no hay suficiente RAM, es posible realizar la clasificación en la memoria externa (creando archivos temporales en un disco). Utilice el ajuste `max_bytes_before_external_sort` para este propósito. Si se establece en 0 (el valor predeterminado), la ordenación externa está deshabilitada. Si está habilitada, cuando el volumen de datos a ordenar alcanza el número especificado de bytes, los datos recopilados se ordenan y se vuelcan en un archivo temporal. Después de leer todos los datos, todos los archivos ordenados se fusionan y se generan los resultados. Los archivos se escriben en el `/var/lib/clickhouse/tmp/` directorio en la configuración (de forma predeterminada, pero puede usar el `tmp_path` parámetro para cambiar esta configuración).
-
-La ejecución de una consulta puede usar más memoria que `max_bytes_before_external_sort`. Por este motivo, esta configuración debe tener un valor significativamente menor que `max_memory_usage`. Como ejemplo, si su servidor tiene 128 GB de RAM y necesita ejecutar una sola consulta, establezca `max_memory_usage` de hasta 100 GB, y `max_bytes_before_external_sort` para 80 GB.
-
-La clasificación externa funciona con mucha menos eficacia que la clasificación en RAM.
diff --git a/docs/es/sql-reference/statements/select/prewhere.md b/docs/es/sql-reference/statements/select/prewhere.md
deleted file mode 100644
index 17d283f59f1..00000000000
--- a/docs/es/sql-reference/statements/select/prewhere.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
----
-
-# PREWHERE Cláusula {#prewhere-clause}
-
-Prewhere es una optimización para aplicar el filtrado de manera más eficiente. Está habilitado de forma predeterminada incluso si `PREWHERE` cláusula no se especifica explícitamente. Funciona moviendo automáticamente parte de [WHERE](where.md) condición a la etapa prewhere. El papel de `PREWHERE` cláusula es sólo para controlar esta optimización si usted piensa que usted sabe cómo hacerlo mejor de lo que sucede por defecto.
-
-Con la optimización prewhere, al principio solo se leen las columnas necesarias para ejecutar la expresión prewhere. Luego se leen las otras columnas que son necesarias para ejecutar el resto de la consulta, pero solo aquellos bloques donde está la expresión prewhere “true” al menos para algunas filas. Si hay muchos bloques donde la expresión prewhere es “false” para todas las filas y prewhere necesita menos columnas que otras partes de la consulta, esto a menudo permite leer muchos menos datos del disco para la ejecución de la consulta.
-
-## Control de Prewhere manualmente {#controlling-prewhere-manually}
-
-La cláusula tiene el mismo significado que la `WHERE` clausula. La diferencia radica en qué datos se leen de la tabla. Al controlar manualmente `PREWHERE` para las condiciones de filtración utilizadas por una minoría de las columnas de la consulta, pero que proporcionan una filtración de datos segura. Esto reduce el volumen de datos a leer.
-
-Una consulta puede especificar simultáneamente `PREWHERE` y `WHERE`. En este caso, `PREWHERE` preceder `WHERE`.
-
-Si el `optimize_move_to_prewhere` se establece en 0, heurística para mover automáticamente partes de expresiones de `WHERE` a `PREWHERE` están deshabilitados.
-
-## Limitacion {#limitations}
-
-`PREWHERE` sólo es compatible con tablas de la `*MergeTree` familia.
diff --git a/docs/es/sql-reference/statements/select/sample.md b/docs/es/sql-reference/statements/select/sample.md
deleted file mode 100644
index 54b3f69e19c..00000000000
--- a/docs/es/sql-reference/statements/select/sample.md
+++ /dev/null
@@ -1,113 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
----
-
-# Cláusula SAMPLE {#select-sample-clause}
-
-El `SAMPLE` cláusula permite aproximadamente `SELECT` procesamiento de consultas.
-
-Cuando se habilita el muestreo de datos, la consulta no se realiza en todos los datos, sino solo en una cierta fracción de datos (muestra). Por ejemplo, si necesita calcular estadísticas para todas las visitas, es suficiente ejecutar la consulta en la fracción 1/10 de todas las visitas y luego multiplicar el resultado por 10.
-
-El procesamiento de consultas aproximado puede ser útil en los siguientes casos:
-
--   Cuando tiene requisitos de temporización estrictos (como \<100 ms) pero no puede justificar el costo de recursos de hardware adicionales para cumplirlos.
--   Cuando sus datos sin procesar no son precisos, la aproximación no degrada notablemente la calidad.
--   Los requisitos comerciales se centran en los resultados aproximados (por rentabilidad o para comercializar los resultados exactos a los usuarios premium).
-
-!!! note "Nota"
-    Sólo puede utilizar el muestreo con las tablas en el [Método de codificación de datos:](../../../engines/table-engines/mergetree-family/mergetree.md) familia, y sólo si la expresión de muestreo se especificó durante la creación de la tabla (ver [Motor MergeTree](../../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-creating-a-table)).
-
-Las características del muestreo de datos se enumeran a continuación:
-
--   El muestreo de datos es un mecanismo determinista. El resultado de la misma `SELECT .. SAMPLE` la consulta es siempre la misma.
--   El muestreo funciona consistentemente para diferentes tablas. Para tablas con una sola clave de muestreo, una muestra con el mismo coeficiente siempre selecciona el mismo subconjunto de datos posibles. Por ejemplo, una muestra de ID de usuario toma filas con el mismo subconjunto de todos los ID de usuario posibles de diferentes tablas. Esto significa que puede utilizar el ejemplo en subconsultas [IN](../../operators/in.md) clausula. Además, puede unir muestras usando el [JOIN](join.md) clausula.
--   El muestreo permite leer menos datos de un disco. Tenga en cuenta que debe especificar la clave de muestreo correctamente. Para obtener más información, consulte [Creación de una tabla MergeTree](../../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-creating-a-table).
-
-Para el `SAMPLE` cláusula se admite la siguiente sintaxis:
-
-| SAMPLE Clause Syntax | Descripci                                                                                                                                                                                                                                                                     |
-|----------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `SAMPLE k`           | Aqui `k` es el número de 0 a 1.</br>La consulta se ejecuta en `k` de datos. Por ejemplo, `SAMPLE 0.1` ejecuta la consulta en el 10% de los datos. [Leer más](#select-sample-k)                                                                                                |
-| `SAMPLE n`           | Aqui `n` es un entero suficientemente grande.</br>La consulta se ejecuta en una muestra de al menos `n` filas (pero no significativamente más que esto). Por ejemplo, `SAMPLE 10000000` ejecuta la consulta en un mínimo de 10.000.000 de filas. [Leer más](#select-sample-n) |
-| `SAMPLE k OFFSET m`  | Aqui `k` y `m` son los números del 0 al 1.</br>La consulta se ejecuta en una muestra de `k` de los datos. Los datos utilizados para el ejemplo se compensan por `m` fracción. [Leer más](#select-sample-offset)                                                               |
-
-## SAMPLE K {#select-sample-k}
-
-Aqui `k` es el número de 0 a 1 (se admiten notaciones fraccionarias y decimales). Por ejemplo, `SAMPLE 1/2` o `SAMPLE 0.5`.
-
-En un `SAMPLE k` cláusula, la muestra se toma de la `k` de datos. El ejemplo se muestra a continuación:
-
-``` sql
-SELECT
-    Title,
-    count() * 10 AS PageViews
-FROM hits_distributed
-SAMPLE 0.1
-WHERE
-    CounterID = 34
-GROUP BY Title
-ORDER BY PageViews DESC LIMIT 1000
-```
-
-En este ejemplo, la consulta se ejecuta en una muestra de 0,1 (10%) de datos. Los valores de las funciones agregadas no se corrigen automáticamente, por lo que para obtener un resultado aproximado, el valor `count()` se multiplica manualmente por 10.
-
-## SAMPLE N {#select-sample-n}
-
-Aqui `n` es un entero suficientemente grande. Por ejemplo, `SAMPLE 10000000`.
-
-En este caso, la consulta se ejecuta en una muestra de al menos `n` filas (pero no significativamente más que esto). Por ejemplo, `SAMPLE 10000000` ejecuta la consulta en un mínimo de 10.000.000 de filas.
-
-Dado que la unidad mínima para la lectura de datos es un gránulo (su tamaño se establece mediante el `index_granularity` ajuste), tiene sentido establecer una muestra que es mucho más grande que el tamaño del gránulo.
-
-Cuando se utiliza el `SAMPLE n` cláusula, no sabe qué porcentaje relativo de datos se procesó. Por lo tanto, no sabe el coeficiente por el que se deben multiplicar las funciones agregadas. Utilice el `_sample_factor` columna virtual para obtener el resultado aproximado.
-
-El `_sample_factor` columna contiene coeficientes relativos que se calculan dinámicamente. Esta columna se crea automáticamente cuando [crear](../../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-creating-a-table) una tabla con la clave de muestreo especificada. Los ejemplos de uso del `_sample_factor` columna se muestran a continuación.
-
-Consideremos la tabla `visits`, que contiene las estadísticas sobre las visitas al sitio. El primer ejemplo muestra cómo calcular el número de páginas vistas:
-
-``` sql
-SELECT sum(PageViews * _sample_factor)
-FROM visits
-SAMPLE 10000000
-```
-
-El siguiente ejemplo muestra cómo calcular el número total de visitas:
-
-``` sql
-SELECT sum(_sample_factor)
-FROM visits
-SAMPLE 10000000
-```
-
-El siguiente ejemplo muestra cómo calcular la duración media de la sesión. Tenga en cuenta que no necesita usar el coeficiente relativo para calcular los valores promedio.
-
-``` sql
-SELECT avg(Duration)
-FROM visits
-SAMPLE 10000000
-```
-
-## SAMPLE K OFFSET M {#select-sample-offset}
-
-Aqui `k` y `m` son números del 0 al 1. Los ejemplos se muestran a continuación.
-
-**Ejemplo 1**
-
-``` sql
-SAMPLE 1/10
-```
-
-En este ejemplo, la muestra es 1/10 de todos los datos:
-
-`[++------------]`
-
-**Ejemplo 2**
-
-``` sql
-SAMPLE 1/10 OFFSET 1/2
-```
-
-Aquí, se toma una muestra del 10% de la segunda mitad de los datos.
-
-`[------++------]`
diff --git a/docs/es/sql-reference/statements/select/union.md b/docs/es/sql-reference/statements/select/union.md
deleted file mode 100644
index d3aec34ba4b..00000000000
--- a/docs/es/sql-reference/statements/select/union.md
+++ /dev/null
@@ -1,35 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
----
-
-# UNION Cláusula {#union-clause}
-
-Usted puede utilizar `UNION ALL` combinar cualquier número de `SELECT` consultas extendiendo sus resultados. Ejemplo:
-
-``` sql
-SELECT CounterID, 1 AS table, toInt64(count()) AS c
-    FROM test.hits
-    GROUP BY CounterID
-
-UNION ALL
-
-SELECT CounterID, 2 AS table, sum(Sign) AS c
-    FROM test.visits
-    GROUP BY CounterID
-    HAVING c > 0
-```
-
-Las columnas de resultados coinciden con su índice (orden dentro `SELECT`). Si los nombres de columna no coinciden, los nombres del resultado final se toman de la primera consulta.
-
-La fundición de tipo se realiza para uniones. Por ejemplo, si dos consultas que se combinan tienen el mismo campo-`Nullable` y `Nullable` tipos de un tipo compatible, el resultado `UNION ALL` tiene una `Nullable` campo de tipo.
-
-Consultas que son parte de `UNION ALL` no se puede encerrar entre corchetes redondos. [ORDER BY](order-by.md) y [LIMIT](limit.md) se aplican a consultas separadas, no al resultado final. Si necesita aplicar una conversión al resultado final, puede colocar todas las consultas con `UNION ALL` en una subconsulta en el [FROM](from.md) clausula.
-
-## Limitacion {#limitations}
-
-Solo `UNION ALL` se admite. Regular `UNION` (`UNION DISTINCT`) no es compatible. Si necesita `UNION DISTINCT` usted puede escribir `SELECT DISTINCT` de una subconsulta que contiene `UNION ALL`.
-
-## Detalles de implementación {#implementation-details}
-
-Consultas que son parte de `UNION ALL` se puede ejecutar simultáneamente, y sus resultados se pueden mezclar juntos.
diff --git a/docs/es/sql-reference/statements/select/where.md b/docs/es/sql-reference/statements/select/where.md
deleted file mode 100644
index 18caecdf7a5..00000000000
--- a/docs/es/sql-reference/statements/select/where.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
----
-
-# DONDE Cláusula {#select-where}
-
-`WHERE` cláusula permite filtrar los datos que provienen de [FROM](from.md) cláusula de `SELECT`.
-
-Si hay un `WHERE` cláusula, debe contener una expresión con el `UInt8` tipo. Esta suele ser una expresión con comparación y operadores lógicos. Las filas en las que esta expresión se evalúa como 0 se explican a partir de otras transformaciones o resultados.
-
-`WHERE` expresión se evalúa en la capacidad de utilizar índices y poda de partición, si el motor de tabla subyacente lo admite.
-
-!!! note "Nota"
-    Hay una optimización de filtrado llamada [preliminar](prewhere.md).
diff --git a/docs/es/sql-reference/statements/select/with.md b/docs/es/sql-reference/statements/select/with.md
deleted file mode 100644
index 7629226bbcc..00000000000
--- a/docs/es/sql-reference/statements/select/with.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
----
-
-# CON Cláusula {#with-clause}
-
-Esta sección proporciona soporte para expresiones de tabla común ([CTE](https://en.wikipedia.org/wiki/Hierarchical_and_recursive_queries_in_SQL)), por lo que los resultados de `WITH` cláusula se puede utilizar en el interior `SELECT` clausula.
-
-## Limitacion {#limitations}
-
-1.  No se admiten consultas recursivas.
-2.  Cuando se usa subconsulta dentro de la sección WITH , su resultado debe ser escalar con exactamente una fila.
-3.  Los resultados de la expresión no están disponibles en las subconsultas.
-
-## Ejemplos {#examples}
-
-**Ejemplo 1:** Usando expresión constante como “variable”
-
-``` sql
-WITH '2019-08-01 15:23:00' as ts_upper_bound
-SELECT *
-FROM hits
-WHERE
-    EventDate = toDate(ts_upper_bound) AND
-    EventTime <= ts_upper_bound
-```
-
-**Ejemplo 2:** Evictar el resultado de la expresión de sum (bytes) de la lista de columnas de la cláusula SELECT
-
-``` sql
-WITH sum(bytes) as s
-SELECT
-    formatReadableSize(s),
-    table
-FROM system.parts
-GROUP BY table
-ORDER BY s
-```
-
-**Ejemplo 3:** Uso de los resultados de la subconsulta escalar
-
-``` sql
-/* this example would return TOP 10 of most huge tables */
-WITH
-    (
-        SELECT sum(bytes)
-        FROM system.parts
-        WHERE active
-    ) AS total_disk_usage
-SELECT
-    (sum(bytes) / total_disk_usage) * 100 AS table_disk_usage,
-    table
-FROM system.parts
-GROUP BY table
-ORDER BY table_disk_usage DESC
-LIMIT 10
-```
-
-**Ejemplo 4:** Reutilización de la expresión en subconsulta
-
-Como solución alternativa para la limitación actual para el uso de expresiones en subconsultas, puede duplicarla.
-
-``` sql
-WITH ['hello'] AS hello
-SELECT
-    hello,
-    *
-FROM
-(
-    WITH ['hello'] AS hello
-    SELECT hello
-)
-```
-
-``` text
-┌─hello─────┬─hello─────┐
-│ ['hello'] │ ['hello'] │
-└───────────┴───────────┘
-```
diff --git a/docs/es/sql-reference/statements/show.md b/docs/es/sql-reference/statements/show.md
deleted file mode 100644
index e7783692452..00000000000
--- a/docs/es/sql-reference/statements/show.md
+++ /dev/null
@@ -1,169 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 38
-toc_title: SHOW
----
-
-# MOSTRAR consultas {#show-queries}
-
-## SHOW CREATE TABLE {#show-create-table}
-
-``` sql
-SHOW CREATE [TEMPORARY] [TABLE|DICTIONARY] [db.]table [INTO OUTFILE filename] [FORMAT format]
-```
-
-Devuelve una sola `String`-tipo ‘statement’ column, which contains a single value – the `CREATE` consulta utilizada para crear el objeto especificado.
-
-## SHOW DATABASES {#show-databases}
-
-``` sql
-SHOW DATABASES [INTO OUTFILE filename] [FORMAT format]
-```
-
-Imprime una lista de todas las bases de datos.
-Esta consulta es idéntica a `SELECT name FROM system.databases [INTO OUTFILE filename] [FORMAT format]`.
-
-## SHOW PROCESSLIST {#show-processlist}
-
-``` sql
-SHOW PROCESSLIST [INTO OUTFILE filename] [FORMAT format]
-```
-
-Envía el contenido de la [sistema.procesa](../../operations/system-tables.md#system_tables-processes) tabla, que contiene una lista de consultas que se están procesando en este momento, exceptuando `SHOW PROCESSLIST` consulta.
-
-El `SELECT * FROM system.processes` query devuelve datos sobre todas las consultas actuales.
-
-Consejo (ejecutar en la consola):
-
-``` bash
-$ watch -n1 "clickhouse-client --query='SHOW PROCESSLIST'"
-```
-
-## SHOW TABLES {#show-tables}
-
-Muestra una lista de tablas.
-
-``` sql
-SHOW [TEMPORARY] TABLES [{FROM | IN} <db>] [LIKE '<pattern>' | WHERE expr] [LIMIT <N>] [INTO OUTFILE <filename>] [FORMAT <format>]
-```
-
-Si el `FROM` no se especifica la cláusula, la consulta devuelve la lista de tablas de la base de datos actual.
-
-Puede obtener los mismos resultados que el `SHOW TABLES` consulta de la siguiente manera:
-
-``` sql
-SELECT name FROM system.tables WHERE database = <db> [AND name LIKE <pattern>] [LIMIT <N>] [INTO OUTFILE <filename>] [FORMAT <format>]
-```
-
-**Ejemplo**
-
-La siguiente consulta selecciona las dos primeras filas de la lista de tablas `system` base de datos, cuyos nombres contienen `co`.
-
-``` sql
-SHOW TABLES FROM system LIKE '%co%' LIMIT 2
-```
-
-``` text
-┌─name───────────────────────────┐
-│ aggregate_function_combinators │
-│ collations                     │
-└────────────────────────────────┘
-```
-
-## SHOW DICTIONARIES {#show-dictionaries}
-
-Muestra una lista de [diccionarios externos](../../sql-reference/dictionaries/external-dictionaries/external-dicts.md).
-
-``` sql
-SHOW DICTIONARIES [FROM <db>] [LIKE '<pattern>'] [LIMIT <N>] [INTO OUTFILE <filename>] [FORMAT <format>]
-```
-
-Si el `FROM` no se especifica la cláusula, la consulta devuelve la lista de diccionarios de la base de datos actual.
-
-Puede obtener los mismos resultados que el `SHOW DICTIONARIES` consulta de la siguiente manera:
-
-``` sql
-SELECT name FROM system.dictionaries WHERE database = <db> [AND name LIKE <pattern>] [LIMIT <N>] [INTO OUTFILE <filename>] [FORMAT <format>]
-```
-
-**Ejemplo**
-
-La siguiente consulta selecciona las dos primeras filas de la lista de tablas `system` base de datos, cuyos nombres contienen `reg`.
-
-``` sql
-SHOW DICTIONARIES FROM db LIKE '%reg%' LIMIT 2
-```
-
-``` text
-┌─name─────────┐
-│ regions      │
-│ region_names │
-└──────────────┘
-```
-
-## SHOW GRANTS {#show-grants-statement}
-
-Muestra privilegios para un usuario.
-
-### Sintaxis {#show-grants-syntax}
-
-``` sql
-SHOW GRANTS [FOR user]
-```
-
-Si no se especifica user, la consulta devuelve privilegios para el usuario actual.
-
-## SHOW CREATE USER {#show-create-user-statement}
-
-Muestra los parámetros que se usaron en un [creación de usuario](create.md#create-user-statement).
-
-`SHOW CREATE USER` no genera contraseñas de usuario.
-
-### Sintaxis {#show-create-user-syntax}
-
-``` sql
-SHOW CREATE USER [name | CURRENT_USER]
-```
-
-## SHOW CREATE ROLE {#show-create-role-statement}
-
-Muestra los parámetros que se usaron en un [creación de roles](create.md#create-role-statement)
-
-### Sintaxis {#show-create-role-syntax}
-
-``` sql
-SHOW CREATE ROLE name
-```
-
-## SHOW CREATE ROW POLICY {#show-create-row-policy-statement}
-
-Muestra los parámetros que se usaron en un [creación de políticas de fila](create.md#create-row-policy-statement)
-
-### Sintaxis {#show-create-row-policy-syntax}
-
-``` sql
-SHOW CREATE [ROW] POLICY name ON [database.]table
-```
-
-## SHOW CREATE QUOTA {#show-create-quota-statement}
-
-Muestra los parámetros que se usaron en un [creación de cuotas](create.md#create-quota-statement)
-
-### Sintaxis {#show-create-row-policy-syntax}
-
-``` sql
-SHOW CREATE QUOTA [name | CURRENT]
-```
-
-## SHOW CREATE SETTINGS PROFILE {#show-create-settings-profile-statement}
-
-Muestra los parámetros que se usaron en un [configuración creación de perfil](create.md#create-settings-profile-statement)
-
-### Sintaxis {#show-create-row-policy-syntax}
-
-``` sql
-SHOW CREATE [SETTINGS] PROFILE name
-```
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/show/) <!--hide-->
diff --git a/docs/es/sql-reference/statements/system.md b/docs/es/sql-reference/statements/system.md
deleted file mode 100644
index 1443dd9a740..00000000000
--- a/docs/es/sql-reference/statements/system.md
+++ /dev/null
@@ -1,113 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 37
-toc_title: SYSTEM
----
-
-# Consultas del sistema {#query-language-system}
-
--   [RELOAD DICTIONARIES](#query_language-system-reload-dictionaries)
--   [RELOAD DICTIONARY](#query_language-system-reload-dictionary)
--   [DROP DNS CACHE](#query_language-system-drop-dns-cache)
--   [DROP MARK CACHE](#query_language-system-drop-mark-cache)
--   [FLUSH LOGS](#query_language-system-flush_logs)
--   [RELOAD CONFIG](#query_language-system-reload-config)
--   [SHUTDOWN](#query_language-system-shutdown)
--   [KILL](#query_language-system-kill)
--   [STOP DISTRIBUTED SENDS](#query_language-system-stop-distributed-sends)
--   [FLUSH DISTRIBUTED](#query_language-system-flush-distributed)
--   [START DISTRIBUTED SENDS](#query_language-system-start-distributed-sends)
--   [STOP MERGES](#query_language-system-stop-merges)
--   [START MERGES](#query_language-system-start-merges)
-
-## RELOAD DICTIONARIES {#query_language-system-reload-dictionaries}
-
-Vuelve a cargar todos los diccionarios que se han cargado correctamente antes.
-De forma predeterminada, los diccionarios se cargan perezosamente (ver [Diccionarios_lazy_load](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-dictionaries_lazy_load)), por lo que en lugar de cargarse automáticamente al inicio, se inicializan en el primer acceso a través de la función dictGet o SELECT desde tablas con ENGINE = Dictionary . El `SYSTEM RELOAD DICTIONARIES` consulta vuelve a cargar dichos diccionarios (LOADED).
-Siempre vuelve `Ok.` independientemente del resultado de la actualización del diccionario.
-
-## RELOAD DICTIONARY Dictionary_name {#query_language-system-reload-dictionary}
-
-Recarga completamente un diccionario `dictionary_name`, independientemente del estado del diccionario (LOADED / NOT_LOADED / FAILED).
-Siempre vuelve `Ok.` independientemente del resultado de la actualización del diccionario.
-El estado del diccionario se puede comprobar consultando el `system.dictionaries` tabla.
-
-``` sql
-SELECT name, status FROM system.dictionaries;
-```
-
-## DROP DNS CACHE {#query_language-system-drop-dns-cache}
-
-Restablece la caché DNS interna de ClickHouse. A veces (para versiones anteriores de ClickHouse) es necesario usar este comando al cambiar la infraestructura (cambiar la dirección IP de otro servidor de ClickHouse o el servidor utilizado por los diccionarios).
-
-Para obtener una administración de caché más conveniente (automática), consulte disable_internal_dns_cache, dns_cache_update_period parameters.
-
-## DROP MARK CACHE {#query_language-system-drop-mark-cache}
-
-Restablece la caché de marcas. Utilizado en el desarrollo de ClickHouse y pruebas de rendimiento.
-
-## FLUSH LOGS {#query_language-system-flush_logs}
-
-Flushes buffers of log messages to system tables (e.g. system.query_log). Allows you to not wait 7.5 seconds when debugging.
-
-## RELOAD CONFIG {#query_language-system-reload-config}
-
-Vuelve a cargar la configuración de ClickHouse. Se usa cuando la configuración se almacena en ZooKeeeper.
-
-## SHUTDOWN {#query_language-system-shutdown}
-
-Normalmente se apaga ClickHouse (como `service clickhouse-server stop` / `kill {$pid_clickhouse-server}`)
-
-## KILL {#query_language-system-kill}
-
-Anula el proceso de ClickHouse (como `kill -9 {$ pid_clickhouse-server}`)
-
-## Administración de tablas distribuidas {#query-language-system-distributed}
-
-ClickHouse puede administrar [distribuido](../../engines/table-engines/special/distributed.md) tabla. Cuando un usuario inserta datos en estas tablas, ClickHouse primero crea una cola de los datos que se deben enviar a los nodos del clúster y, a continuación, los envía de forma asincrónica. Puede administrar el procesamiento de colas con el [STOP DISTRIBUTED SENDS](#query_language-system-stop-distributed-sends), [FLUSH DISTRIBUTED](#query_language-system-flush-distributed), y [START DISTRIBUTED SENDS](#query_language-system-start-distributed-sends) consulta. También puede insertar sincrónicamente datos distribuidos con el `insert_distributed_sync` configuración.
-
-### STOP DISTRIBUTED SENDS {#query_language-system-stop-distributed-sends}
-
-Deshabilita la distribución de datos en segundo plano al insertar datos en tablas distribuidas.
-
-``` sql
-SYSTEM STOP DISTRIBUTED SENDS [db.]<distributed_table_name>
-```
-
-### FLUSH DISTRIBUTED {#query_language-system-flush-distributed}
-
-Obliga a ClickHouse a enviar datos a nodos de clúster de forma sincrónica. Si algún nodo no está disponible, ClickHouse produce una excepción y detiene la ejecución de la consulta. Puede volver a intentar la consulta hasta que tenga éxito, lo que sucederá cuando todos los nodos estén nuevamente en línea.
-
-``` sql
-SYSTEM FLUSH DISTRIBUTED [db.]<distributed_table_name>
-```
-
-### START DISTRIBUTED SENDS {#query_language-system-start-distributed-sends}
-
-Habilita la distribución de datos en segundo plano al insertar datos en tablas distribuidas.
-
-``` sql
-SYSTEM START DISTRIBUTED SENDS [db.]<distributed_table_name>
-```
-
-### STOP MERGES {#query_language-system-stop-merges}
-
-Proporciona la posibilidad de detener las fusiones en segundo plano para las tablas de la familia MergeTree:
-
-``` sql
-SYSTEM STOP MERGES [[db.]merge_tree_family_table_name]
-```
-
-!!! note "Nota"
-    `DETACH / ATTACH` la tabla comenzará las fusiones de fondo para la tabla, incluso en caso de que las fusiones se hayan detenido para todas las tablas MergeTree antes.
-
-### START MERGES {#query_language-system-start-merges}
-
-Proporciona la posibilidad de iniciar fusiones en segundo plano para tablas de la familia MergeTree:
-
-``` sql
-SYSTEM START MERGES [[db.]merge_tree_family_table_name]
-```
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/system/) <!--hide-->
diff --git a/docs/es/sql-reference/syntax.md b/docs/es/sql-reference/syntax.md
deleted file mode 100644
index 93cd44c2b91..00000000000
--- a/docs/es/sql-reference/syntax.md
+++ /dev/null
@@ -1,187 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 31
-toc_title: Sintaxis
----
-
-# Sintaxis {#syntax}
-
-Hay dos tipos de analizadores en el sistema: el analizador SQL completo (un analizador de descenso recursivo) y el analizador de formato de datos (un analizador de flujo rápido).
-En todos los casos, excepto el `INSERT` consulta, sólo se utiliza el analizador SQL completo.
-El `INSERT` consulta utiliza ambos analizadores:
-
-``` sql
-INSERT INTO t VALUES (1, 'Hello, world'), (2, 'abc'), (3, 'def')
-```
-
-El `INSERT INTO t VALUES` fragmento es analizado por el analizador completo, y los datos `(1, 'Hello, world'), (2, 'abc'), (3, 'def')` es analizado por el analizador de flujo rápido. También puede activar el analizador completo de los datos mediante el [input_format_values_interpret_expressions](../operations/settings/settings.md#settings-input_format_values_interpret_expressions) configuración. Cuando `input_format_values_interpret_expressions = 1`, ClickHouse primero intenta analizar valores con el analizador de flujo rápido. Si falla, ClickHouse intenta usar el analizador completo para los datos, tratándolo como un SQL [expresion](#syntax-expressions).
-
-Los datos pueden tener cualquier formato. Cuando se recibe una consulta, el servidor no calcula más de [max_query_size](../operations/settings/settings.md#settings-max_query_size) bytes de la solicitud en RAM (por defecto, 1 MB), y el resto se analiza la secuencia.
-Permite evitar problemas con grandes `INSERT` consulta.
-
-Cuando se utiliza el `Values` formato en un `INSERT` consulta, puede parecer que los datos se analizan igual que las expresiones en un `SELECT` consulta, pero esto no es cierto. El `Values` formato es mucho más limitado.
-
-El resto de este artículo cubre el analizador completo. Para obtener más información sobre los analizadores de formato, consulte [Formato](../interfaces/formats.md) apartado.
-
-## Espacio {#spaces}
-
-Puede haber cualquier número de símbolos de espacio entre las construcciones sintácticas (incluidos el principio y el final de una consulta). Los símbolos de espacio incluyen el espacio, tabulación, avance de línea, CR y avance de formulario.
-
-## Comentario {#comments}
-
-ClickHouse admite comentarios de estilo SQL y de estilo C.
-Los comentarios de estilo SQL comienzan con `--` y continuar hasta el final de la línea, un espacio después `--` se puede omitir.
-C-estilo son de `/*` a `*/`y puede ser multilínea, tampoco se requieren espacios.
-
-## Palabras clave {#syntax-keywords}
-
-Las palabras clave no distinguen entre mayúsculas y minúsculas cuando corresponden a:
-
--   Estándar SQL. Por ejemplo, `SELECT`, `select` y `SeLeCt` son todos válidos.
--   Implementación en algunos DBMS populares (MySQL o Postgres). Por ejemplo, `DateTime` es lo mismo que `datetime`.
-
-Si el nombre del tipo de datos distingue entre mayúsculas y minúsculas `system.data_type_families` tabla.
-
-A diferencia de SQL estándar, todas las demás palabras clave (incluidos los nombres de funciones) son **minúsculas**.
-
-Las palabras clave no están reservadas; se tratan como tales solo en el contexto correspondiente. Si usted usa [identificador](#syntax-identifiers) con el mismo nombre que las palabras clave, encerrarlas en comillas dobles o backticks. Por ejemplo, la consulta `SELECT "FROM" FROM table_name` es válido si la tabla `table_name` tiene columna con el nombre `"FROM"`.
-
-## Identificador {#syntax-identifiers}
-
-Los identificadores son:
-
--   Nombres de clúster, base de datos, tabla, partición y columna.
--   Función.
--   Tipos de datos.
--   [Alias de expresión](#syntax-expression_aliases).
-
-Los identificadores pueden ser citados o no citados. Este último es preferido.
-
-Los identificadores no citados deben coincidir con la expresión regular `^[a-zA-Z_][0-9a-zA-Z_]*$` y no puede ser igual a [Palabras clave](#syntax-keywords). Ejemplos: `x, _1, X_y__Z123_.`
-
-Si desea utilizar identificadores iguales a las palabras clave o si desea utilizar otros símbolos en los identificadores, cítelo con comillas dobles o retrocesos, por ejemplo, `"id"`, `` `id` ``.
-
-## Literal {#literals}
-
-Hay numérico, cadena, compuesto, y `NULL` literal.
-
-### Numérico {#numeric}
-
-Literal numérico, intenta ser analizado:
-
--   Primero, como un número firmado de 64 bits, usando el [strtoull](https://en.cppreference.com/w/cpp/string/byte/strtoul) función.
--   Si no tiene éxito, como un número de 64 bits sin signo, [Sistema abierto.](https://en.cppreference.com/w/cpp/string/byte/strtol) función.
--   Si no tiene éxito, como un número de punto flotante [strtod](https://en.cppreference.com/w/cpp/string/byte/strtof) función.
--   De lo contrario, devuelve un error.
-
-El valor literal tiene el tipo más pequeño en el que se ajusta el valor.
-Por ejemplo, 1 se analiza como `UInt8` pero 256 se analiza como `UInt16`. Para obtener más información, consulte [Tipos de datos](../sql-reference/data-types/index.md).
-
-Ejemplos: `1`, `18446744073709551615`, `0xDEADBEEF`, `01`, `0.1`, `1e100`, `-1e-100`, `inf`, `nan`.
-
-### Cadena {#syntax-string-literal}
-
-Solo se admiten literales de cadena entre comillas simples. Los caracteres incluidos se pueden escapar de barra invertida. Las siguientes secuencias de escape tienen un valor especial correspondiente: `\b`, `\f`, `\r`, `\n`, `\t`, `\0`, `\a`, `\v`, `\xHH`. En todos los demás casos, secuencias de escape en el formato `\c`, donde `c` cualquier carácter, se convierten a `c`. Significa que puedes usar las secuencias `\'`y`\\`. El valor tendrá el [Cadena](../sql-reference/data-types/string.md) tipo.
-
-En literales de cadena, necesitas escapar al menos `'` y `\`. Las comillas simples se pueden escapar con las comillas simples, literales `'It\'s'` y `'It''s'` son iguales.
-
-### Compuesto {#compound}
-
-Las matrices se construyen con corchetes `[1, 2, 3]`. Nuples están construidos con paréntesis `(1, 'Hello, world!', 2)`.
-Técnicamente, estos no son literales, sino expresiones con el operador de creación de matriz y el operador de creación de tuplas, respectivamente.
-Una matriz debe constar de al menos un elemento y una tupla debe tener al menos dos elementos.
-Hay un caso separado cuando aparecen tuplas en el `IN` cláusula de un `SELECT` consulta. Los resultados de la consulta pueden incluir tuplas, pero las tuplas no se pueden guardar en una base de datos (excepto las tablas con [Memoria](../engines/table-engines/special/memory.md) motor).
-
-### NULL {#null-literal}
-
-Indica que falta el valor.
-
-Para almacenar `NULL` en un campo de tabla, debe ser del [NULL](../sql-reference/data-types/nullable.md) tipo.
-
-Dependiendo del formato de datos (entrada o salida), `NULL` puede tener una representación diferente. Para obtener más información, consulte la documentación de [Formatos de datos](../interfaces/formats.md#formats).
-
-Hay muchos matices para el procesamiento `NULL`. Por ejemplo, si al menos uno de los argumentos de una operación de comparación es `NULL`, el resultado de esta operación también es `NULL`. Lo mismo es cierto para la multiplicación, la suma y otras operaciones. Para obtener más información, lea la documentación de cada operación.
-
-En las consultas, puede verificar `NULL` utilizando el [IS NULL](operators/index.md#operator-is-null) y [IS NOT NULL](operators/index.md) operadores y las funciones relacionadas `isNull` y `isNotNull`.
-
-## Función {#functions}
-
-Las llamadas a funciones se escriben como un identificador con una lista de argumentos (posiblemente vacíos) entre corchetes redondos. A diferencia de SQL estándar, los corchetes son necesarios, incluso para una lista de argumentos vacía. Ejemplo: `now()`.
-Hay funciones regulares y agregadas (ver la sección “Aggregate functions”). Algunas funciones agregadas pueden contener dos listas de argumentos entre paréntesis. Ejemplo: `quantile (0.9) (x)`. Estas funciones agregadas se llaman “parametric” funciones, y los argumentos en la primera lista se llaman “parameters”. La sintaxis de las funciones agregadas sin parámetros es la misma que para las funciones regulares.
-
-## Operador {#operators}
-
-Los operadores se convierten a sus funciones correspondientes durante el análisis de consultas, teniendo en cuenta su prioridad y asociatividad.
-Por ejemplo, la expresión `1 + 2 * 3 + 4` se transforma a `plus(plus(1, multiply(2, 3)), 4)`.
-
-## Tipos de datos y motores de tabla de base de datos {#data_types-and-database-table-engines}
-
-Tipos de datos y motores de tablas en el `CREATE` las consultas se escriben de la misma manera que los identificadores o funciones. En otras palabras, pueden o no contener una lista de argumentos entre corchetes. Para obtener más información, consulte las secciones “Data types,” “Table engines,” y “CREATE”.
-
-## Alias de expresión {#syntax-expression_aliases}
-
-Un alias es un nombre definido por el usuario para la expresión en una consulta.
-
-``` sql
-expr AS alias
-```
-
--   `AS` — The keyword for defining aliases. You can define the alias for a table name or a column name in a `SELECT` cláusula sin usar el `AS` palabra clave.
-
-        For example, `SELECT table_name_alias.column_name FROM table_name table_name_alias`.
-
-        In the [CAST](sql_reference/functions/type_conversion_functions.md#type_conversion_function-cast) function, the `AS` keyword has another meaning. See the description of the function.
-
--   `expr` — Any expression supported by ClickHouse.
-
-        For example, `SELECT column_name * 2 AS double FROM some_table`.
-
--   `alias` — Name for `expr`. Los alias deben cumplir con el [identificador](#syntax-identifiers) sintaxis.
-
-        For example, `SELECT "table t".column_name FROM table_name AS "table t"`.
-
-### Notas sobre el uso {#notes-on-usage}
-
-Los alias son globales para una consulta o subconsulta, y puede definir un alias en cualquier parte de una consulta para cualquier expresión. Por ejemplo, `SELECT (1 AS n) + 2, n`.
-
-Los alias no son visibles en subconsultas y entre subconsultas. Por ejemplo, al ejecutar la consulta `SELECT (SELECT sum(b.a) + num FROM b) - a.a AS num FROM a` ClickHouse genera la excepción `Unknown identifier: num`.
-
-Si se define un alias para las columnas de resultados `SELECT` cláusula de una subconsulta, estas columnas son visibles en la consulta externa. Por ejemplo, `SELECT n + m FROM (SELECT 1 AS n, 2 AS m)`.
-
-Tenga cuidado con los alias que son iguales a los nombres de columna o tabla. Consideremos el siguiente ejemplo:
-
-``` sql
-CREATE TABLE t
-(
-    a Int,
-    b Int
-)
-ENGINE = TinyLog()
-```
-
-``` sql
-SELECT
-    argMax(a, b),
-    sum(b) AS b
-FROM t
-```
-
-``` text
-Received exception from server (version 18.14.17):
-Code: 184. DB::Exception: Received from localhost:9000, 127.0.0.1. DB::Exception: Aggregate function sum(b) is found inside another aggregate function in query.
-```
-
-En este ejemplo, declaramos tabla `t` con columna `b`. Luego, al seleccionar los datos, definimos el `sum(b) AS b` apodo. Como los alias son globales, ClickHouse sustituyó el literal `b` en la expresión `argMax(a, b)` con la expresión `sum(b)`. Esta sustitución causó la excepción.
-
-## Asterisco {#asterisk}
-
-En un `SELECT` consulta, un asterisco puede reemplazar la expresión. Para obtener más información, consulte la sección “SELECT”.
-
-## Expresiones {#syntax-expressions}
-
-Una expresión es una función, identificador, literal, aplicación de un operador, expresión entre paréntesis, subconsulta o asterisco. También puede contener un alias.
-Una lista de expresiones es una o más expresiones separadas por comas.
-Las funciones y los operadores, a su vez, pueden tener expresiones como argumentos.
-
-[Artículo Original](https://clickhouse.tech/docs/en/sql_reference/syntax/) <!--hide-->
diff --git a/docs/es/sql-reference/table-functions/file.md b/docs/es/sql-reference/table-functions/file.md
deleted file mode 100644
index 0d1c9b66016..00000000000
--- a/docs/es/sql-reference/table-functions/file.md
+++ /dev/null
@@ -1,121 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 37
-toc_title: file
----
-
-# file {#file}
-
-Crea una tabla a partir de un archivo. Esta función de tabla es similar a [URL](url.md) y [Hdfs](hdfs.md) aquel.
-
-``` sql
-file(path, format, structure)
-```
-
-**Parámetros de entrada**
-
--   `path` — The relative path to the file from [user_files_path](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-user_files_path). Soporte de ruta a archivo siguiendo globs en modo de solo lectura: `*`, `?`, `{abc,def}` y `{N..M}` donde `N`, `M` — numbers, \``'abc', 'def'` — strings.
--   `format` — The [formato](../../interfaces/formats.md#formats) del archivo.
--   `structure` — Structure of the table. Format `'column1_name column1_type, column2_name column2_type, ...'`.
-
-**Valor devuelto**
-
-Una tabla con la estructura especificada para leer o escribir datos en el archivo especificado.
-
-**Ejemplo**
-
-Configuración `user_files_path` y el contenido del archivo `test.csv`:
-
-``` bash
-$ grep user_files_path /etc/clickhouse-server/config.xml
-    <user_files_path>/var/lib/clickhouse/user_files/</user_files_path>
-
-$ cat /var/lib/clickhouse/user_files/test.csv
-    1,2,3
-    3,2,1
-    78,43,45
-```
-
-Tabla de`test.csv` y selección de las dos primeras filas de ella:
-
-``` sql
-SELECT *
-FROM file('test.csv', 'CSV', 'column1 UInt32, column2 UInt32, column3 UInt32')
-LIMIT 2
-```
-
-``` text
-┌─column1─┬─column2─┬─column3─┐
-│       1 │       2 │       3 │
-│       3 │       2 │       1 │
-└─────────┴─────────┴─────────┘
-```
-
-``` sql
--- getting the first 10 lines of a table that contains 3 columns of UInt32 type from a CSV file
-SELECT * FROM file('test.csv', 'CSV', 'column1 UInt32, column2 UInt32, column3 UInt32') LIMIT 10
-```
-
-**Globs en el camino**
-
-Múltiples componentes de ruta de acceso pueden tener globs. Para ser procesado, el archivo debe existir y coincidir con todo el patrón de ruta (no solo el sufijo o el prefijo).
-
--   `*` — Substitutes any number of any characters except `/` incluyendo cadena vacía.
--   `?` — Substitutes any single character.
--   `{some_string,another_string,yet_another_one}` — Substitutes any of strings `'some_string', 'another_string', 'yet_another_one'`.
--   `{N..M}` — Substitutes any number in range from N to M including both borders.
-
-Construcciones con `{}` son similares a la [función de tabla remota](../../sql-reference/table-functions/remote.md)).
-
-**Ejemplo**
-
-1.  Supongamos que tenemos varios archivos con las siguientes rutas relativas:
-
--   ‘some_dir/some_file_1’
--   ‘some_dir/some_file_2’
--   ‘some_dir/some_file_3’
--   ‘another_dir/some_file_1’
--   ‘another_dir/some_file_2’
--   ‘another_dir/some_file_3’
-
-1.  Consulta la cantidad de filas en estos archivos:
-
-<!-- -->
-
-``` sql
-SELECT count(*)
-FROM file('{some,another}_dir/some_file_{1..3}', 'TSV', 'name String, value UInt32')
-```
-
-1.  Consulta la cantidad de filas en todos los archivos de estos dos directorios:
-
-<!-- -->
-
-``` sql
-SELECT count(*)
-FROM file('{some,another}_dir/*', 'TSV', 'name String, value UInt32')
-```
-
-!!! warning "Advertencia"
-    Si su lista de archivos contiene rangos de números con ceros a la izquierda, use la construcción con llaves para cada dígito por separado o use `?`.
-
-**Ejemplo**
-
-Consultar los datos desde archivos nombrados `file000`, `file001`, … , `file999`:
-
-``` sql
-SELECT count(*)
-FROM file('big_dir/file{0..9}{0..9}{0..9}', 'CSV', 'name String, value UInt32')
-```
-
-## Virtual Columnas {#virtual-columns}
-
--   `_path` — Path to the file.
--   `_file` — Name of the file.
-
-**Ver también**
-
--   [Virtual columnas](https://clickhouse.tech/docs/en/operations/table_engines/#table_engines-virtual_columns)
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/table_functions/file/) <!--hide-->
diff --git a/docs/es/sql-reference/table-functions/generate.md b/docs/es/sql-reference/table-functions/generate.md
deleted file mode 100644
index fd107370481..00000000000
--- a/docs/es/sql-reference/table-functions/generate.md
+++ /dev/null
@@ -1,44 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 47
-toc_title: generateRandom
----
-
-# generateRandom {#generaterandom}
-
-Genera datos aleatorios con un esquema dado.
-Permite rellenar tablas de prueba con datos.
-Admite todos los tipos de datos que se pueden almacenar en la tabla, excepto `LowCardinality` y `AggregateFunction`.
-
-``` sql
-generateRandom('name TypeName[, name TypeName]...', [, 'random_seed'[, 'max_string_length'[, 'max_array_length']]]);
-```
-
-**Parámetros**
-
--   `name` — Name of corresponding column.
--   `TypeName` — Type of corresponding column.
--   `max_array_length` — Maximum array length for all generated arrays. Defaults to `10`.
--   `max_string_length` — Maximum string length for all generated strings. Defaults to `10`.
--   `random_seed` — Specify random seed manually to produce stable results. If NULL — seed is randomly generated.
-
-**Valor devuelto**
-
-Un objeto de tabla con el esquema solicitado.
-
-## Ejemplo de uso {#usage-example}
-
-``` sql
-SELECT * FROM generateRandom('a Array(Int8), d Decimal32(4), c Tuple(DateTime64(3), UUID)', 1, 10, 2) LIMIT 3;
-```
-
-``` text
-┌─a────────┬────────────d─┬─c──────────────────────────────────────────────────────────────────┐
-│ [77]     │ -124167.6723 │ ('2061-04-17 21:59:44.573','3f72f405-ec3e-13c8-44ca-66ef335f7835') │
-│ [32,110] │ -141397.7312 │ ('1979-02-09 03:43:48.526','982486d1-5a5d-a308-e525-7bd8b80ffa73') │
-│ [68]     │  -67417.0770 │ ('2080-03-12 14:17:31.269','110425e5-413f-10a6-05ba-fa6b3e929f15') │
-└──────────┴──────────────┴────────────────────────────────────────────────────────────────────┘
-```
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/table_functions/generate/) <!--hide-->
diff --git a/docs/es/sql-reference/table-functions/hdfs.md b/docs/es/sql-reference/table-functions/hdfs.md
deleted file mode 100644
index 8c90f1d49ca..00000000000
--- a/docs/es/sql-reference/table-functions/hdfs.md
+++ /dev/null
@@ -1,104 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 45
-toc_title: Hdfs
----
-
-# Hdfs {#hdfs}
-
-Crea una tabla a partir de archivos en HDFS. Esta función de tabla es similar a [URL](url.md) y [file](file.md) aquel.
-
-``` sql
-hdfs(URI, format, structure)
-```
-
-**Parámetros de entrada**
-
--   `URI` — The relative URI to the file in HDFS. Path to file support following globs in readonly mode: `*`, `?`, `{abc,def}` y `{N..M}` donde `N`, `M` — numbers, \``'abc', 'def'` — strings.
--   `format` — The [formato](../../interfaces/formats.md#formats) del archivo.
--   `structure` — Structure of the table. Format `'column1_name column1_type, column2_name column2_type, ...'`.
-
-**Valor devuelto**
-
-Una tabla con la estructura especificada para leer o escribir datos en el archivo especificado.
-
-**Ejemplo**
-
-Tabla de `hdfs://hdfs1:9000/test` y selección de las dos primeras filas de ella:
-
-``` sql
-SELECT *
-FROM hdfs('hdfs://hdfs1:9000/test', 'TSV', 'column1 UInt32, column2 UInt32, column3 UInt32')
-LIMIT 2
-```
-
-``` text
-┌─column1─┬─column2─┬─column3─┐
-│       1 │       2 │       3 │
-│       3 │       2 │       1 │
-└─────────┴─────────┴─────────┘
-```
-
-**Globs en el camino**
-
-Múltiples componentes de ruta de acceso pueden tener globs. Para ser procesado, el archivo debe existir y coincidir con todo el patrón de ruta (no solo el sufijo o el prefijo).
-
--   `*` — Substitutes any number of any characters except `/` incluyendo cadena vacía.
--   `?` — Substitutes any single character.
--   `{some_string,another_string,yet_another_one}` — Substitutes any of strings `'some_string', 'another_string', 'yet_another_one'`.
--   `{N..M}` — Substitutes any number in range from N to M including both borders.
-
-Construcciones con `{}` son similares a la [función de tabla remota](../../sql-reference/table-functions/remote.md)).
-
-**Ejemplo**
-
-1.  Supongamos que tenemos varios archivos con los siguientes URI en HDFS:
-
--   ‘hdfs://hdfs1:9000/some_dir/some_file_1’
--   ‘hdfs://hdfs1:9000/some_dir/some_file_2’
--   ‘hdfs://hdfs1:9000/some_dir/some_file_3’
--   ‘hdfs://hdfs1:9000/another_dir/some_file_1’
--   ‘hdfs://hdfs1:9000/another_dir/some_file_2’
--   ‘hdfs://hdfs1:9000/another_dir/some_file_3’
-
-1.  Consulta la cantidad de filas en estos archivos:
-
-<!-- -->
-
-``` sql
-SELECT count(*)
-FROM hdfs('hdfs://hdfs1:9000/{some,another}_dir/some_file_{1..3}', 'TSV', 'name String, value UInt32')
-```
-
-1.  Consulta la cantidad de filas en todos los archivos de estos dos directorios:
-
-<!-- -->
-
-``` sql
-SELECT count(*)
-FROM hdfs('hdfs://hdfs1:9000/{some,another}_dir/*', 'TSV', 'name String, value UInt32')
-```
-
-!!! warning "Advertencia"
-    Si su lista de archivos contiene rangos de números con ceros a la izquierda, use la construcción con llaves para cada dígito por separado o use `?`.
-
-**Ejemplo**
-
-Consultar los datos desde archivos nombrados `file000`, `file001`, … , `file999`:
-
-``` sql
-SELECT count(*)
-FROM hdfs('hdfs://hdfs1:9000/big_dir/file{0..9}{0..9}{0..9}', 'CSV', 'name String, value UInt32')
-```
-
-## Virtual Columnas {#virtual-columns}
-
--   `_path` — Path to the file.
--   `_file` — Name of the file.
-
-**Ver también**
-
--   [Virtual columnas](https://clickhouse.tech/docs/en/operations/table_engines/#table_engines-virtual_columns)
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/table_functions/hdfs/) <!--hide-->
diff --git a/docs/es/sql-reference/table-functions/index.md b/docs/es/sql-reference/table-functions/index.md
deleted file mode 100644
index 60882327e6a..00000000000
--- a/docs/es/sql-reference/table-functions/index.md
+++ /dev/null
@@ -1,38 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: Funciones de tabla
-toc_priority: 34
-toc_title: "Implantaci\xF3n"
----
-
-# Funciones de tabla {#table-functions}
-
-Las funciones de tabla son métodos para construir tablas.
-
-Puede usar funciones de tabla en:
-
--   [FROM](../statements/select/from.md) cláusula de la `SELECT` consulta.
-
-        The method for creating a temporary table that is available only in the current query. The table is deleted when the query finishes.
-
--   [CREAR TABLA COMO \<table_function()\>](../statements/create.md#create-table-query) consulta.
-
-        It's one of the methods of creating a table.
-
-!!! warning "Advertencia"
-    No puede usar funciones de tabla si el [Método de codificación de datos:](../../operations/settings/permissions-for-queries.md#settings_allow_ddl) la configuración está deshabilitada.
-
-| Función              | Descripci                                                                                                                              |
-|----------------------|----------------------------------------------------------------------------------------------------------------------------------------|
-| [file](file.md)      | Crea un [File](../../engines/table-engines/special/file.md)-mesa del motor.                                                            |
-| [fusionar](merge.md) | Crea un [Fusionar](../../engines/table-engines/special/merge.md)-mesa del motor.                                                       |
-| [numero](numbers.md) | Crea una tabla con una sola columna llena de números enteros.                                                                          |
-| [remoto](remote.md)  | Le permite acceder a servidores remotos sin crear un [Distribuido](../../engines/table-engines/special/distributed.md)-mesa del motor. |
-| [URL](url.md)        | Crea un [URL](../../engines/table-engines/special/url.md)-mesa del motor.                                                              |
-| [mysql](mysql.md)    | Crea un [MySQL](../../engines/table-engines/integrations/mysql.md)-mesa del motor.                                                     |
-| [jdbc](jdbc.md)      | Crea un [JDBC](../../engines/table-engines/integrations/jdbc.md)-mesa del motor.                                                       |
-| [Nosotros](odbc.md)  | Crea un [ODBC](../../engines/table-engines/integrations/odbc.md)-mesa del motor.                                                       |
-| [Hdfs](hdfs.md)      | Crea un [HDFS](../../engines/table-engines/integrations/hdfs.md)-mesa del motor.                                                       |
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/table_functions/) <!--hide-->
diff --git a/docs/es/sql-reference/table-functions/input.md b/docs/es/sql-reference/table-functions/input.md
deleted file mode 100644
index c56e1c86ba9..00000000000
--- a/docs/es/sql-reference/table-functions/input.md
+++ /dev/null
@@ -1,47 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 46
-toc_title: entrada
----
-
-# entrada {#input}
-
-`input(structure)` - función de tabla que permite convertir e insertar efectivamente los datos enviados al
-servidor con estructura dada a la tabla con otra estructura.
-
-`structure` - estructura de los datos enviados al servidor en el siguiente formato `'column1_name column1_type, column2_name column2_type, ...'`.
-Por ejemplo, `'id UInt32, name String'`.
-
-Esta función sólo se puede utilizar en `INSERT SELECT` consulta y sólo una vez, pero por lo demás se comporta como función de tabla ordinaria
-(por ejemplo, se puede usar en subconsulta, etc.).
-
-Los datos se pueden enviar de cualquier manera como para ordinario `INSERT` consulta y pasado en cualquier disponible [formato](../../interfaces/formats.md#formats)
-que debe especificarse al final de la consulta (a diferencia de lo ordinario `INSERT SELECT`).
-
-La característica principal de esta función es que cuando el servidor recibe datos del cliente, los convierte simultáneamente
-según la lista de expresiones en el `SELECT` cláusula e inserta en la tabla de destino. Tabla temporal
-con todos los datos transferidos no se crea.
-
-**Ejemplos**
-
--   Deje que el `test` tiene la siguiente estructura `(a String, b String)`
-    y datos en `data.csv` tiene una estructura diferente `(col1 String, col2 Date, col3 Int32)`. Consulta de inserción
-    datos de la `data.csv` en el `test` con conversión simultánea se ve así:
-
-<!-- -->
-
-``` bash
-$ cat data.csv | clickhouse-client --query="INSERT INTO test SELECT lower(col1), col3 * col3 FROM input('col1 String, col2 Date, col3 Int32') FORMAT CSV";
-```
-
--   Si `data.csv` contiene datos de la misma estructura `test_structure` como la mesa `test` entonces estas dos consultas son iguales:
-
-<!-- -->
-
-``` bash
-$ cat data.csv | clickhouse-client --query="INSERT INTO test FORMAT CSV"
-$ cat data.csv | clickhouse-client --query="INSERT INTO test SELECT * FROM input('test_structure') FORMAT CSV"
-```
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/table_functions/input/) <!--hide-->
diff --git a/docs/es/sql-reference/table-functions/jdbc.md b/docs/es/sql-reference/table-functions/jdbc.md
deleted file mode 100644
index fd848ca78a2..00000000000
--- a/docs/es/sql-reference/table-functions/jdbc.md
+++ /dev/null
@@ -1,29 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 43
-toc_title: jdbc
----
-
-# jdbc {#table-function-jdbc}
-
-`jdbc(jdbc_connection_uri, schema, table)` - devuelve la tabla que está conectado a través del controlador JDBC.
-
-Esta función de tabla requiere `clickhouse-jdbc-bridge` programa para estar en ejecución.
-Admite tipos Nullable (basados en DDL de la tabla remota que se consulta).
-
-**Ejemplos**
-
-``` sql
-SELECT * FROM jdbc('jdbc:mysql://localhost:3306/?user=root&password=root', 'schema', 'table')
-```
-
-``` sql
-SELECT * FROM jdbc('mysql://localhost:3306/?user=root&password=root', 'schema', 'table')
-```
-
-``` sql
-SELECT * FROM jdbc('datasource://mysql-local', 'schema', 'table')
-```
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/table_functions/jdbc/) <!--hide-->
diff --git a/docs/es/sql-reference/table-functions/merge.md b/docs/es/sql-reference/table-functions/merge.md
deleted file mode 100644
index 137e764c84d..00000000000
--- a/docs/es/sql-reference/table-functions/merge.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 38
-toc_title: fusionar
----
-
-# fusionar {#merge}
-
-`merge(db_name, 'tables_regexp')` – Creates a temporary Merge table. For more information, see the section “Table engines, Merge”.
-
-La estructura de la tabla se toma de la primera tabla encontrada que coincide con la expresión regular.
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/table_functions/merge/) <!--hide-->
diff --git a/docs/es/sql-reference/table-functions/mysql.md b/docs/es/sql-reference/table-functions/mysql.md
deleted file mode 100644
index b48c18a9472..00000000000
--- a/docs/es/sql-reference/table-functions/mysql.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 42
-toc_title: mysql
----
-
-# mysql {#mysql}
-
-Permitir `SELECT` consultas que se realizarán en los datos que se almacenan en un servidor MySQL remoto.
-
-``` sql
-mysql('host:port', 'database', 'table', 'user', 'password'[, replace_query, 'on_duplicate_clause']);
-```
-
-**Parámetros**
-
--   `host:port` — MySQL server address.
-
--   `database` — Remote database name.
-
--   `table` — Remote table name.
-
--   `user` — MySQL user.
-
--   `password` — User password.
-
--   `replace_query` — Flag that converts `INSERT INTO` consultas a `REPLACE INTO`. Si `replace_query=1`, la consulta se reemplaza.
-
--   `on_duplicate_clause` — The `ON DUPLICATE KEY on_duplicate_clause` expresión que se añade a la `INSERT` consulta.
-
-        Example: `INSERT INTO t (c1,c2) VALUES ('a', 2) ON DUPLICATE KEY UPDATE c2 = c2 + 1`, where `on_duplicate_clause` is `UPDATE c2 = c2 + 1`. See the MySQL documentation to find which `on_duplicate_clause` you can use with the `ON DUPLICATE KEY` clause.
-
-        To specify `on_duplicate_clause` you need to pass `0` to the `replace_query` parameter. If you simultaneously pass `replace_query = 1` and `on_duplicate_clause`, ClickHouse generates an exception.
-
-Simple `WHERE` cláusulas tales como `=, !=, >, >=, <, <=` se ejecutan actualmente en el servidor MySQL.
-
-El resto de las condiciones y el `LIMIT` La restricción de muestreo se ejecuta en ClickHouse solo después de que finalice la consulta a MySQL.
-
-**Valor devuelto**
-
-Un objeto de tabla con las mismas columnas que la tabla MySQL original.
-
-## Ejemplo de uso {#usage-example}
-
-Tabla en MySQL:
-
-``` text
-mysql> CREATE TABLE `test`.`test` (
-    ->   `int_id` INT NOT NULL AUTO_INCREMENT,
-    ->   `int_nullable` INT NULL DEFAULT NULL,
-    ->   `float` FLOAT NOT NULL,
-    ->   `float_nullable` FLOAT NULL DEFAULT NULL,
-    ->   PRIMARY KEY (`int_id`));
-Query OK, 0 rows affected (0,09 sec)
-
-mysql> insert into test (`int_id`, `float`) VALUES (1,2);
-Query OK, 1 row affected (0,00 sec)
-
-mysql> select * from test;
-+------+----------+-----+----------+
-| int_id | int_nullable | float | float_nullable |
-+------+----------+-----+----------+
-|      1 |         NULL |     2 |           NULL |
-+------+----------+-----+----------+
-1 row in set (0,00 sec)
-```
-
-Selección de datos de ClickHouse:
-
-``` sql
-SELECT * FROM mysql('localhost:3306', 'test', 'test', 'bayonet', '123')
-```
-
-``` text
-┌─int_id─┬─int_nullable─┬─float─┬─float_nullable─┐
-│      1 │         ᴺᵁᴸᴸ │     2 │           ᴺᵁᴸᴸ │
-└────────┴──────────────┴───────┴────────────────┘
-```
-
-## Ver también {#see-also}
-
--   [El ‘MySQL’ motor de mesa](../../engines/table-engines/integrations/mysql.md)
--   [Uso de MySQL como fuente de diccionario externo](../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md#dicts-external_dicts_dict_sources-mysql)
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/table_functions/mysql/) <!--hide-->
diff --git a/docs/es/sql-reference/table-functions/numbers.md b/docs/es/sql-reference/table-functions/numbers.md
deleted file mode 100644
index 5901a50fae2..00000000000
--- a/docs/es/sql-reference/table-functions/numbers.md
+++ /dev/null
@@ -1,30 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 39
-toc_title: numero
----
-
-# numero {#numbers}
-
-`numbers(N)` – Returns a table with the single ‘number’ columna (UInt64) que contiene enteros de 0 a N-1.
-`numbers(N, M)` - Devuelve una tabla con el único ‘number’ columna (UInt64) que contiene enteros de N a (N + M - 1).
-
-Similar a la `system.numbers` tabla, puede ser utilizado para probar y generar valores sucesivos, `numbers(N, M)` más eficiente que `system.numbers`.
-
-Las siguientes consultas son equivalentes:
-
-``` sql
-SELECT * FROM numbers(10);
-SELECT * FROM numbers(0, 10);
-SELECT * FROM system.numbers LIMIT 10;
-```
-
-Ejemplos:
-
-``` sql
--- Generate a sequence of dates from 2010-01-01 to 2010-12-31
-select toDate('2010-01-01') + number as d FROM numbers(365);
-```
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/table_functions/numbers/) <!--hide-->
diff --git a/docs/es/sql-reference/table-functions/odbc.md b/docs/es/sql-reference/table-functions/odbc.md
deleted file mode 100644
index 9ba2bfeeaac..00000000000
--- a/docs/es/sql-reference/table-functions/odbc.md
+++ /dev/null
@@ -1,108 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 44
-toc_title: Nosotros
----
-
-# Nosotros {#table-functions-odbc}
-
-Devuelve la tabla que está conectada a través de [ODBC](https://en.wikipedia.org/wiki/Open_Database_Connectivity).
-
-``` sql
-odbc(connection_settings, external_database, external_table)
-```
-
-Parámetros:
-
--   `connection_settings` — Name of the section with connection settings in the `odbc.ini` file.
--   `external_database` — Name of a database in an external DBMS.
--   `external_table` — Name of a table in the `external_database`.
-
-Para implementar con seguridad conexiones ODBC, ClickHouse usa un programa separado `clickhouse-odbc-bridge`. Si el controlador ODBC se carga directamente desde `clickhouse-server`, problemas de controlador pueden bloquear el servidor ClickHouse. ClickHouse se inicia automáticamente `clickhouse-odbc-bridge` cuando se requiere. El programa de puente ODBC se instala desde el mismo paquete que el `clickhouse-server`.
-
-Los campos con el `NULL` Los valores de la tabla externa se convierten en los valores predeterminados para el tipo de datos base. Por ejemplo, si un campo de tabla MySQL remoto tiene `INT NULL` tipo se convierte a 0 (el valor predeterminado para ClickHouse `Int32` tipo de datos).
-
-## Ejemplo de uso {#usage-example}
-
-**Obtener datos de la instalación local de MySQL a través de ODBC**
-
-Este ejemplo se comprueba para Ubuntu Linux 18.04 y el servidor MySQL 5.7.
-
-Asegúrese de que unixODBC y MySQL Connector están instalados.
-
-De forma predeterminada (si se instala desde paquetes), ClickHouse comienza como usuario `clickhouse`. Por lo tanto, debe crear y configurar este usuario en el servidor MySQL.
-
-``` bash
-$ sudo mysql
-```
-
-``` sql
-mysql> CREATE USER 'clickhouse'@'localhost' IDENTIFIED BY 'clickhouse';
-mysql> GRANT ALL PRIVILEGES ON *.* TO 'clickhouse'@'clickhouse' WITH GRANT OPTION;
-```
-
-A continuación, configure la conexión en `/etc/odbc.ini`.
-
-``` bash
-$ cat /etc/odbc.ini
-[mysqlconn]
-DRIVER = /usr/local/lib/libmyodbc5w.so
-SERVER = 127.0.0.1
-PORT = 3306
-DATABASE = test
-USERNAME = clickhouse
-PASSWORD = clickhouse
-```
-
-Puede verificar la conexión usando el `isql` utilidad desde la instalación de unixODBC.
-
-``` bash
-$ isql -v mysqlconn
-+-------------------------+
-| Connected!                            |
-|                                       |
-...
-```
-
-Tabla en MySQL:
-
-``` text
-mysql> CREATE TABLE `test`.`test` (
-    ->   `int_id` INT NOT NULL AUTO_INCREMENT,
-    ->   `int_nullable` INT NULL DEFAULT NULL,
-    ->   `float` FLOAT NOT NULL,
-    ->   `float_nullable` FLOAT NULL DEFAULT NULL,
-    ->   PRIMARY KEY (`int_id`));
-Query OK, 0 rows affected (0,09 sec)
-
-mysql> insert into test (`int_id`, `float`) VALUES (1,2);
-Query OK, 1 row affected (0,00 sec)
-
-mysql> select * from test;
-+------+----------+-----+----------+
-| int_id | int_nullable | float | float_nullable |
-+------+----------+-----+----------+
-|      1 |         NULL |     2 |           NULL |
-+------+----------+-----+----------+
-1 row in set (0,00 sec)
-```
-
-Recuperación de datos de la tabla MySQL en ClickHouse:
-
-``` sql
-SELECT * FROM odbc('DSN=mysqlconn', 'test', 'test')
-```
-
-``` text
-┌─int_id─┬─int_nullable─┬─float─┬─float_nullable─┐
-│      1 │            0 │     2 │              0 │
-└────────┴──────────────┴───────┴────────────────┘
-```
-
-## Ver también {#see-also}
-
--   [Diccionarios externos ODBC](../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md#dicts-external_dicts_dict_sources-odbc)
--   [Motor de tabla ODBC](../../engines/table-engines/integrations/odbc.md).
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/table_functions/jdbc/) <!--hide-->
diff --git a/docs/es/sql-reference/table-functions/remote.md b/docs/es/sql-reference/table-functions/remote.md
deleted file mode 100644
index e9784cb4cd1..00000000000
--- a/docs/es/sql-reference/table-functions/remote.md
+++ /dev/null
@@ -1,85 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 40
-toc_title: remoto
----
-
-# remoto, remoteSecure {#remote-remotesecure}
-
-Le permite acceder a servidores remotos sin crear un `Distributed` tabla.
-
-Firma:
-
-``` sql
-remote('addresses_expr', db, table[, 'user'[, 'password']])
-remote('addresses_expr', db.table[, 'user'[, 'password']])
-remoteSecure('addresses_expr', db, table[, 'user'[, 'password']])
-remoteSecure('addresses_expr', db.table[, 'user'[, 'password']])
-```
-
-`addresses_expr` – An expression that generates addresses of remote servers. This may be just one server address. The server address is `host:port` o simplemente `host`. El host se puede especificar como nombre de servidor o como dirección IPv4 o IPv6. Una dirección IPv6 se especifica entre corchetes. El puerto es el puerto TCP del servidor remoto. Si se omite el puerto, utiliza `tcp_port` del archivo de configuración del servidor (por defecto, 9000).
-
-!!! important "Importante"
-    El puerto es necesario para una dirección IPv6.
-
-Ejemplos:
-
-``` text
-example01-01-1
-example01-01-1:9000
-localhost
-127.0.0.1
-[::]:9000
-[2a02:6b8:0:1111::11]:9000
-```
-
-Se pueden separar varias direcciones por comas. En este caso, ClickHouse usará procesamiento distribuido, por lo que enviará la consulta a todas las direcciones especificadas (como a fragmentos con datos diferentes).
-
-Ejemplo:
-
-``` text
-example01-01-1,example01-02-1
-```
-
-Parte de la expresión se puede especificar entre llaves. El ejemplo anterior se puede escribir de la siguiente manera:
-
-``` text
-example01-0{1,2}-1
-```
-
-Los corchetes rizados pueden contener un rango de números separados por dos puntos (enteros no negativos). En este caso, el rango se expande a un conjunto de valores que generan direcciones de fragmentos. Si el primer número comienza con cero, los valores se forman con la misma alineación cero. El ejemplo anterior se puede escribir de la siguiente manera:
-
-``` text
-example01-{01..02}-1
-```
-
-Si tiene varios pares de llaves, genera el producto directo de los conjuntos correspondientes.
-
-Las direcciones y partes de las direcciones entre llaves se pueden separar mediante el símbolo de tubería (\|). En este caso, los conjuntos de direcciones correspondientes se interpretan como réplicas y la consulta se enviará a la primera réplica en buen estado. Sin embargo, las réplicas se iteran en el orden establecido actualmente en el [load_balancing](../../operations/settings/settings.md) configuración.
-
-Ejemplo:
-
-``` text
-example01-{01..02}-{1|2}
-```
-
-En este ejemplo se especifican dos fragmentos que tienen dos réplicas cada uno.
-
-El número de direcciones generadas está limitado por una constante. En este momento esto es 1000 direcciones.
-
-Uso de la `remote` función de la tabla es menos óptima que la creación de un `Distributed` mesa, porque en este caso, la conexión del servidor se restablece para cada solicitud. Además, si se establecen nombres de host, los nombres se resuelven y los errores no se cuentan cuando se trabaja con varias réplicas. Cuando procese un gran número de consultas, cree siempre el `Distributed` mesa antes de tiempo, y no utilice el `remote` función de la tabla.
-
-El `remote` puede ser útil en los siguientes casos:
-
--   Acceder a un servidor específico para la comparación de datos, la depuración y las pruebas.
--   Consultas entre varios clústeres de ClickHouse con fines de investigación.
--   Solicitudes distribuidas poco frecuentes que se realizan manualmente.
--   Solicitudes distribuidas donde el conjunto de servidores se redefine cada vez.
-
-Si el usuario no está especificado, `default` se utiliza.
-Si no se especifica la contraseña, se utiliza una contraseña vacía.
-
-`remoteSecure` - igual que `remote` but with secured connection. Default port — [Tcp_port_secure](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-tcp_port_secure) de config o 9440.
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/table_functions/remote/) <!--hide-->
diff --git a/docs/es/sql-reference/table-functions/url.md b/docs/es/sql-reference/table-functions/url.md
deleted file mode 100644
index 6f86a5b2068..00000000000
--- a/docs/es/sql-reference/table-functions/url.md
+++ /dev/null
@@ -1,26 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 41
-toc_title: URL
----
-
-# URL {#url}
-
-`url(URL, format, structure)` - devuelve una tabla creada a partir del `URL` con dado
-`format` y `structure`.
-
-URL - Dirección de servidor HTTP o HTTPS, que puede aceptar `GET` y/o `POST` peticiones.
-
-formato - [formato](../../interfaces/formats.md#formats) de los datos.
-
-estructura - estructura de la tabla en `'UserID UInt64, Name String'` formato. Determina los nombres y tipos de columna.
-
-**Ejemplo**
-
-``` sql
--- getting the first 3 lines of a table that contains columns of String and UInt32 type from HTTP-server which answers in CSV format.
-SELECT * FROM url('http://127.0.0.1:12345/', CSV, 'column1 String, column2 UInt32') LIMIT 3
-```
-
-[Artículo Original](https://clickhouse.tech/docs/en/query_language/table_functions/url/) <!--hide-->
diff --git a/docs/es/whats-new/changelog/2017.md b/docs/es/whats-new/changelog/2017.md
deleted file mode 120000
index d581cbbb422..00000000000
--- a/docs/es/whats-new/changelog/2017.md
+++ /dev/null
@@ -1 +0,0 @@
-../../../en/whats-new/changelog/2017.md
\ No newline at end of file
diff --git a/docs/es/whats-new/changelog/2018.md b/docs/es/whats-new/changelog/2018.md
deleted file mode 120000
index 22874fcae85..00000000000
--- a/docs/es/whats-new/changelog/2018.md
+++ /dev/null
@@ -1 +0,0 @@
-../../../en/whats-new/changelog/2018.md
\ No newline at end of file
diff --git a/docs/es/whats-new/changelog/2019.md b/docs/es/whats-new/changelog/2019.md
deleted file mode 120000
index 0f3f095f8a1..00000000000
--- a/docs/es/whats-new/changelog/2019.md
+++ /dev/null
@@ -1 +0,0 @@
-../../../en/whats-new/changelog/2019.md
\ No newline at end of file
diff --git a/docs/es/whats-new/changelog/index.md b/docs/es/whats-new/changelog/index.md
deleted file mode 120000
index 5461b93ec8c..00000000000
--- a/docs/es/whats-new/changelog/index.md
+++ /dev/null
@@ -1 +0,0 @@
-../../../en/whats-new/changelog/index.md
\ No newline at end of file
diff --git a/docs/es/whats-new/index.md b/docs/es/whats-new/index.md
deleted file mode 100644
index f1336b241ec..00000000000
--- a/docs/es/whats-new/index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: "Qu\xE9 hay de Nuevo"
-toc_priority: 72
----
-
-
diff --git a/docs/es/whats-new/roadmap.md b/docs/es/whats-new/roadmap.md
deleted file mode 100644
index d32833b7d14..00000000000
--- a/docs/es/whats-new/roadmap.md
+++ /dev/null
@@ -1,19 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 74
-toc_title: Hoja de ruta
----
-
-# Hoja de ruta {#roadmap}
-
-## Q1 2020 {#q1-2020}
-
--   Control de acceso basado en roles
-
-## Q2 2020 {#q2-2020}
-
--   Integración con servicios de autenticación externos
--   Grupos de recursos para una distribución más precisa de la capacidad del clúster entre los usuarios
-
-{## [Artículo Original](https://clickhouse.tech/docs/en/roadmap/) ##}
diff --git a/docs/es/whats-new/security-changelog.md b/docs/es/whats-new/security-changelog.md
deleted file mode 100644
index 86d2e7df2f7..00000000000
--- a/docs/es/whats-new/security-changelog.md
+++ /dev/null
@@ -1,76 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 76
-toc_title: Seguridad Changelog
----
-
-## Corregido en la versión de ClickHouse 19.14.3.3, 2019-09-10 {#fixed-in-clickhouse-release-19-14-3-3-2019-09-10}
-
-### CVE-2019-15024 {#cve-2019-15024}
-
-Аn attacker that has write access to ZooKeeper and who ican run a custom server available from the network where ClickHouse runs, can create a custom-built malicious server that will act as a ClickHouse replica and register it in ZooKeeper. When another replica will fetch data part from the malicious replica, it can force clickhouse-server to write to arbitrary path on filesystem.
-
-Créditos: Eldar Zaitov del equipo de seguridad de la información de Yandex
-
-### CVE-2019-16535 {#cve-2019-16535}
-
-Аn OOB read, OOB write and integer underflow in decompression algorithms can be used to achieve RCE or DoS via native protocol.
-
-Créditos: Eldar Zaitov del equipo de seguridad de la información de Yandex
-
-### CVE-2019-16536 {#cve-2019-16536}
-
-Un cliente autenticado malintencionado puede desencadenar el desbordamiento de pila que conduce a DoS.
-
-Créditos: Eldar Zaitov del equipo de seguridad de la información de Yandex
-
-## Corregido en la versión de ClickHouse 19.13.6.1, 2019-09-20 {#fixed-in-clickhouse-release-19-13-6-1-2019-09-20}
-
-### CVE-2019-18657 {#cve-2019-18657}
-
-Función de la tabla `url` la vulnerabilidad permitió al atacante inyectar encabezados HTTP arbitrarios en la solicitud.
-
-Crédito: [Nikita Tikhomirov](https://github.com/NSTikhomirov)
-
-## Corregido en la versión de ClickHouse 18.12.13, 2018-09-10 {#fixed-in-clickhouse-release-18-12-13-2018-09-10}
-
-### CVE-2018-14672 {#cve-2018-14672}
-
-Las funciones para cargar modelos CatBoost permitieron el recorrido de ruta y la lectura de archivos arbitrarios a través de mensajes de error.
-
-Créditos: Andrey Krasichkov del equipo de seguridad de la información de Yandex
-
-## Corregido en la versión de ClickHouse 18.10.3, 2018-08-13 {#fixed-in-clickhouse-release-18-10-3-2018-08-13}
-
-### CVE-2018-14671 {#cve-2018-14671}
-
-unixODBC permitía cargar objetos compartidos arbitrarios desde el sistema de archivos, lo que provocó una vulnerabilidad de ejecución remota de código.
-
-Créditos: Andrey Krasichkov y Evgeny Sidorov del equipo de seguridad de la información de Yandex
-
-## Corregido en la versión de ClickHouse 1.1.54388, 2018-06-28 {#fixed-in-clickhouse-release-1-1-54388-2018-06-28}
-
-### CVE-2018-14668 {#cve-2018-14668}
-
-“remote” función de tabla permitió símbolos arbitrarios en “user”, “password” y “default_database” campos que llevaron a ataques de falsificación de solicitudes de protocolo cruzado.
-
-Créditos: Andrey Krasichkov del equipo de seguridad de la información de Yandex
-
-## Corregido en la versión de ClickHouse 1.1.54390, 2018-07-06 {#fixed-in-clickhouse-release-1-1-54390-2018-07-06}
-
-### CVE-2018-14669 {#cve-2018-14669}
-
-ClickHouse cliente MySQL tenía “LOAD DATA LOCAL INFILE” funcionalidad habilitada que permitió a una base de datos MySQL maliciosa leer archivos arbitrarios desde el servidor ClickHouse conectado.
-
-Créditos: Andrey Krasichkov y Evgeny Sidorov del equipo de seguridad de la información de Yandex
-
-## Corregido en la versión de ClickHouse 1.1.54131, 2017-01-10 {#fixed-in-clickhouse-release-1-1-54131-2017-01-10}
-
-### CVE-2018-14670 {#cve-2018-14670}
-
-Una configuración incorrecta en el paquete deb podría conducir al uso no autorizado de la base de datos.
-
-Créditos: Centro Nacional de Seguridad Cibernética del Reino Unido (NCSC)
-
-{## [Artículo Original](https://clickhouse.tech/docs/en/security_changelog/) ##}
diff --git a/docs/fr/commercial/cloud.md b/docs/fr/commercial/cloud.md
deleted file mode 100644
index 13013065bfe..00000000000
--- a/docs/fr/commercial/cloud.md
+++ /dev/null
@@ -1,23 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 1
-toc_title: Nuage
----
-
-# Fournisseurs De Services Cloud ClickHouse {#clickhouse-cloud-service-providers}
-
-!!! info "Info"
-    Si vous avez lancé un cloud public avec un service clickhouse géré, n'hésitez pas à [ouvrir une demande d'extraction](https://github.com/ClickHouse/ClickHouse/edit/master/docs/en/commercial/cloud.md) ajouter à la liste suivante.
-
-## Yandex Cloud {#yandex-cloud}
-
-[Service géré Yandex pour ClickHouse](https://cloud.yandex.com/services/managed-clickhouse?utm_source=referrals&utm_medium=clickhouseofficialsite&utm_campaign=link3) offre les fonctionnalités suivantes:
-
--   Service ZooKeeper entièrement géré pour [Réplication de ClickHouse](../engines/table-engines/mergetree-family/replication.md)
--   Choix multiples de type de stockage
--   Répliques dans différentes zones de disponibilité
--   Le chiffrement et l'isolement
--   Automatisation de la maintenance
-
-{## [Article Original](https://clickhouse.tech/docs/en/commercial/cloud/) ##}
diff --git a/docs/fr/commercial/index.md b/docs/fr/commercial/index.md
deleted file mode 100644
index 388f9a47fc8..00000000000
--- a/docs/fr/commercial/index.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: Commercial
-toc_priority: 70
-toc_title: Commercial
----
-
-
diff --git a/docs/fr/commercial/support.md b/docs/fr/commercial/support.md
deleted file mode 100644
index f5ce091272f..00000000000
--- a/docs/fr/commercial/support.md
+++ /dev/null
@@ -1,23 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 3
-toc_title: Soutien
----
-
-# Fournisseurs De Services De Soutien Commercial ClickHouse {#clickhouse-commercial-support-service-providers}
-
-!!! info "Info"
-    Si vous avez lancé un service de support commercial ClickHouse, n'hésitez pas à [ouvrir une demande d'extraction](https://github.com/ClickHouse/ClickHouse/edit/master/docs/en/commercial/support.md) ajouter à la liste suivante.
-
-## Altinity {#altinity}
-
-Altinity offre le support et les services de ClickHouse d'entreprise depuis 2017. Les clients d'Altinity vont des entreprises Fortune 100 aux startups. Visiter [www.altinity.com](https://www.altinity.com/) pour plus d'informations.
-
-## Mafiree {#mafiree}
-
-[Description du Service](http://mafiree.com/clickhouse-analytics-services.php)
-
-## MinervaDB {#minervadb}
-
-[Description du Service](https://minervadb.com/index.php/clickhouse-consulting-and-support-by-minervadb/)
diff --git a/docs/fr/development/architecture.md b/docs/fr/development/architecture.md
deleted file mode 100644
index 7c105d430f6..00000000000
--- a/docs/fr/development/architecture.md
+++ /dev/null
@@ -1,203 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 62
-toc_title: Vue d'ensemble de L'Architecture ClickHouse
----
-
-# Vue d'ensemble de L'Architecture ClickHouse {#overview-of-clickhouse-architecture}
-
-ClickHouse est un véritable SGBD orienté colonne. Les données sont stockées par colonnes et lors de l'exécution de tableaux (vecteurs ou morceaux de colonnes). Dans la mesure du possible, les opérations sont distribuées sur des tableaux, plutôt que sur des valeurs individuelles. Il est appelé “vectorized query execution,” et cela aide à réduire le coût du traitement des données réel.
-
-> Cette idée n'est pas nouvelle. Il remonte à la `APL` langage de programmation et ses descendants: `A +`, `J`, `K`, et `Q`. La programmation de tableau est utilisée dans le traitement des données scientifiques. Cette idée n'est pas non plus nouvelle dans les bases de données relationnelles: par exemple, elle est utilisée dans le `Vectorwise` système.
-
-Il existe deux approches différentes pour accélérer le traitement des requêtes: l'exécution vectorisée des requêtes et la génération de code d'exécution. Ce dernier supprime toute indirection et expédition dynamique. Aucune de ces approches est strictement meilleure que l'autre. La génération de code d'exécution peut être meilleure lorsqu'elle fusionne de nombreuses opérations, utilisant ainsi pleinement les unités D'exécution du processeur et le pipeline. L'exécution de requête vectorisée peut être moins pratique car elle implique des vecteurs temporaires qui doivent être écrits dans le cache et lus. Si les données temporaires ne rentre pas dans le cache L2, cela devient un problème. Mais l'exécution de requête vectorisée utilise plus facilement les capacités SIMD de la CPU. Un [document de recherche](http://15721.courses.cs.cmu.edu/spring2016/papers/p5-sompolski.pdf) écrit par nos amis montre qu'il est préférable de combiner les deux approches. ClickHouse utilise l'exécution de requête vectorisée et a un support initial limité pour la génération de code d'exécution.
-
-## Colonne {#columns}
-
-`IColumn` l'interface est utilisée pour représenter des colonnes en mémoire (en fait, des morceaux de colonnes). Cette interface fournit des méthodes d'aide pour la mise en œuvre de divers opérateurs relationnels. Presque toutes les opérations sont immuables: elles ne modifient pas la colonne d'origine, mais en créent une nouvelle modifiée. Par exemple, l' `IColumn :: filter` méthode accepte un masque d'octet de filtre. Il est utilisé pour le `WHERE` et `HAVING` opérateurs relationnels. Exemples supplémentaires: `IColumn :: permute` méthode de soutien `ORDER BY`, le `IColumn :: cut` méthode de soutien `LIMIT`.
-
-Divers `IColumn` application (`ColumnUInt8`, `ColumnString` et ainsi de suite) sont responsables de la mémoire disposition de colonnes. La disposition de la mémoire est généralement un tableau contigu. Pour le type entier de colonnes, c'est juste un contiguë tableau, comme `std :: vector`. Pour `String` et `Array` colonnes, il s'agit de deux vecteurs: Un pour tous les éléments du tableau, placé de manière contiguë, et un second pour les décalages au début de chaque tableau. Il y a aussi `ColumnConst` cela stocke une seule valeur en mémoire, mais ressemble à une colonne.
-
-## Champ {#field}
-
-Néanmoins, il est possible de travailler avec des valeurs individuelles ainsi. Pour représenter une valeur individuelle, la `Field` est utilisée. `Field` est juste une union discriminée de `UInt64`, `Int64`, `Float64`, `String` et `Array`. `IColumn` a l' `operator[]` méthode pour obtenir la n-ème valeur en tant que `Field` et la `insert` méthode pour ajouter un `Field` à la fin d'une colonne. Ces méthodes ne sont pas très efficaces, car ils nécessitent de traiter avec temporaire `Field` des objets représentant une valeur individuelle. Il existe des méthodes plus efficaces, telles que `insertFrom`, `insertRangeFrom` et ainsi de suite.
-
-`Field` ne pas avoir assez d'informations sur un type de données spécifique pour une table. Exemple, `UInt8`, `UInt16`, `UInt32`, et `UInt64` tous sont représentés comme `UInt64` dans un `Field`.
-
-## Abstractions Qui Fuient {#leaky-abstractions}
-
-`IColumn` a des méthodes pour les transformations relationnelles communes des données, mais elles ne répondent pas à tous les besoins. Exemple, `ColumnUInt64` ne pas avoir une méthode pour calculer la somme des deux colonnes, et `ColumnString` n'a pas de méthode pour exécuter une recherche de sous-chaîne. Ces innombrables routines sont mises en œuvre en dehors de `IColumn`.
-
-Diverses fonctions sur les colonnes peuvent être implémentées de manière générique et non efficace en utilisant `IColumn` méthodes pour extraire `Field` valeurs, ou d'une manière spécialisée en utilisant la connaissance de la disposition de la mémoire interne des données dans un `IColumn` application. Il est implémenté en lançant des fonctions à un `IColumn` tapez et traitez directement la représentation interne. Exemple, `ColumnUInt64` a l' `getData` méthode qui renvoie une référence à un tableau interne, puis une autre routine lit ou remplit ce tableau directement. Nous avons “leaky abstractions” permettent de spécialisations diverses routines.
-
-## Types De Données {#data_types}
-
-`IDataType` est responsable de la sérialisation et de la désérialisation: pour la lecture et l'écriture de morceaux de colonnes ou de valeurs individuelles sous forme binaire ou de texte. `IDataType` correspond directement aux types de données dans les tables. Par exemple, il y a `DataTypeUInt32`, `DataTypeDateTime`, `DataTypeString` et ainsi de suite.
-
-`IDataType` et `IColumn` ne sont que faiblement liés les uns aux autres. Différents types de données peuvent être représentés en mémoire par le même `IColumn` application. Exemple, `DataTypeUInt32` et `DataTypeDateTime` sont tous deux représentés par `ColumnUInt32` ou `ColumnConstUInt32`. En outre, le même type de données peut être représentée par différents `IColumn` application. Exemple, `DataTypeUInt8` peut être représenté par `ColumnUInt8` ou `ColumnConstUInt8`.
-
-`IDataType` stocke uniquement les métadonnées. Par exemple, `DataTypeUInt8` ne stocke rien du tout (sauf vptr) et `DataTypeFixedString` magasins juste `N` (la taille des chaînes de taille fixe).
-
-`IDataType` a des méthodes d'aide pour différents formats de données. Des exemples sont des méthodes pour sérialiser une valeur avec des guillemets possibles, pour sérialiser une valeur pour JSON et pour sérialiser une valeur dans le format XML. Il n'y a pas de correspondance directe avec les formats de données. Par exemple, les différents formats de données `Pretty` et `TabSeparated` pouvez utiliser le même `serializeTextEscaped` méthode d'aide à partir de la `IDataType` interface.
-
-## Bloc {#block}
-
-A `Block` est un conteneur qui représente un sous-ensemble (morceau) d'une table en mémoire. C'est juste un ensemble de triplets: `(IColumn, IDataType, column name)`. Pendant l'exécution de la requête, les données sont traitées par `Block`s. Si nous avons un `Block`, nous disposons de données (dans le `IColumn` objet), nous avons des informations sur son type (dans `IDataType`) qui nous indique comment traiter cette colonne, et nous avons le nom de la colonne. Il peut s'agir du nom de colonne d'origine de la table ou d'un nom artificiel attribué pour obtenir des résultats temporaires de calculs.
-
-Lorsque nous calculons une fonction sur des colonnes dans un bloc, nous ajoutons une autre colonne avec son résultat au bloc, et nous ne touchons pas les colonnes pour les arguments de la fonction car les opérations sont immuables. Plus tard, les colonnes inutiles peuvent être supprimées du bloc, mais pas modifiées. Il est pratique pour l'élimination des sous-expressions communes.
-
-Des blocs sont créés pour chaque bloc de données traité. Notez que pour le même type de calcul, les noms et les types de colonnes restent les mêmes pour différents blocs, et seules les données de colonne changent. Il est préférable de diviser les données de bloc de l'en-tête de bloc car les petites tailles de Bloc ont une surcharge élevée de chaînes temporaires pour copier shared_ptrs et les noms de colonnes.
-
-## Bloquer Les Flux {#block-streams}
-
-Les flux de blocs sont destinés au traitement des données. Nous utilisons des flux de blocs pour lire des données quelque part, effectuer des transformations de données ou écrire des données quelque part. `IBlockInputStream` a l' `read` méthode pour récupérer le bloc suivant, tandis que des. `IBlockOutputStream` a l' `write` méthode pour pousser le bloc quelque part.
-
-Les flux sont responsables de:
-
-1.  De la lecture ou de l'écriture dans une table. La table renvoie simplement un flux pour lire ou écrire des blocs.
-2.  Mise en œuvre des formats de données. Par exemple, si vous souhaitez envoyer des données vers un terminal `Pretty` format, vous créez un flux de sortie de bloc où vous poussez des blocs, et il les formate.
-3.  Effectuer des transformations de données. Disons que vous avez `IBlockInputStream` et veulent créer un flux filtré. Vous créez `FilterBlockInputStream` et l'initialiser avec votre flux de données. Puis quand vous tirez un bloc de `FilterBlockInputStream`, il extrait un bloc de votre flux, le filtre et vous renvoie le bloc filtré. Les pipelines d'exécution des requêtes sont représentés de cette façon.
-
-Il y a des transformations plus sophistiquées. Par exemple, lorsque vous tirez de `AggregatingBlockInputStream` il lit toutes les données à partir de sa source, agrégats, puis renvoie un flux de données agrégées pour vous. Un autre exemple: `UnionBlockInputStream` accepte de nombreuses sources d'entrée dans le constructeur et également un certain nombre de threads. Il lance plusieurs threads et lit à partir de plusieurs sources en parallèle.
-
-> Les flux de blocs utilisent le “pull” approche pour contrôler le flux: lorsque vous extrayez un bloc du premier flux, il extrait par conséquent les blocs requis des flux imbriqués, et l'ensemble du pipeline d'exécution fonctionnera. Ni “pull” ni “push” est la meilleure solution, car le flux de contrôle est implicite, ce qui limite l'implémentation de diverses fonctionnalités telles que l'exécution simultanée de plusieurs requêtes (fusion de plusieurs pipelines ensemble). Cette limitation pourrait être surmontée avec des coroutines ou simplement en exécutant des threads supplémentaires qui s'attendent les uns aux autres. Nous pouvons avoir plus de possibilités si nous rendons le flux de contrôle explicite: si nous localisons la logique pour passer des données d'une unité de calcul à une autre en dehors de ces unités de calcul. Lire ce [article](http://journal.stuffwithstuff.com/2013/01/13/iteration-inside-and-out/) pour plus de pensées.
-
-Il convient de noter que le pipeline d'exécution de la requête crée des données temporaires à chaque étape. Nous essayons de garder la taille du bloc suffisamment petite pour que les données temporaires tiennent dans le cache du processeur. Avec cette hypothèse, l'écriture et la lecture de données temporaires sont presque libres en comparaison avec d'autres calculs. Nous pourrions envisager une alternative, qui est de fusionner de nombreuses opérations dans le pipeline ensemble. Cela pourrait rendre le pipeline aussi court que possible et supprimer une grande partie des données temporaires, ce qui pourrait être un avantage, mais cela présente également des inconvénients. Par exemple, un pipeline divisé facilite l'implémentation de la mise en cache de données intermédiaires, le vol de données intermédiaires à partir de requêtes similaires exécutées en même temps et la fusion de pipelines pour des requêtes similaires.
-
-## Format {#formats}
-
-Les formats de données sont implémentés avec des flux de blocs. Il y a “presentational” formats appropriés uniquement pour la sortie de données vers le client, tels que `Pretty` format, qui fournit seulement `IBlockOutputStream`. Et il existe des formats d'entrée / sortie, tels que `TabSeparated` ou `JSONEachRow`.
-
-Il y a aussi des flux de lignes: `IRowInputStream` et `IRowOutputStream`. Ils vous permettent de tirer/pousser des données par des lignes individuelles, pas par des blocs. Et ils ne sont nécessaires que pour simplifier la mise en œuvre des formats orientés ligne. Wrapper `BlockInputStreamFromRowInputStream` et `BlockOutputStreamFromRowOutputStream` vous permet de convertir des flux orientés ligne en flux orientés blocs réguliers.
-
-## I/O {#io}
-
-Pour l'entrée/sortie orientée octet, il y a `ReadBuffer` et `WriteBuffer` les classes abstraites. Ils sont utilisés à la place de C++ `iostream`s. Ne vous inquiétez pas: chaque projet c++ mature utilise autre chose que `iostream`s pour de bonnes raisons.
-
-`ReadBuffer` et `WriteBuffer` sont juste un tampon contigu et un curseur pointant vers la position dans ce tampon. Les implémentations peuvent posséder ou non la mémoire du tampon. Il existe une méthode virtuelle pour remplir le tampon avec les données suivantes (pour `ReadBuffer`) ou pour vider le tampon quelque part (pour `WriteBuffer`). Les méthodes virtuelles sont rarement cités.
-
-Les implémentations de `ReadBuffer`/`WriteBuffer` sont utilisés pour travailler avec des fichiers et des descripteurs de fichiers et des sockets réseau, pour implémenter la compression (`CompressedWriteBuffer` is initialized with another WriteBuffer and performs compression before writing data to it), and for other purposes – the names `ConcatReadBuffer`, `LimitReadBuffer`, et `HashingWriteBuffer` parler pour eux-mêmes.
-
-Read / WriteBuffers ne traite que les octets. Il y a des fonctions de `ReadHelpers` et `WriteHelpers` fichiers d'en-tête pour aider à formater l'entrée / sortie. Par exemple, il existe des assistants pour écrire un nombre au format décimal.
-
-Regardons ce qui se passe lorsque vous voulez écrire un ensemble de résultats dans `JSON` format de sortie standard (stdout). Vous avez un jeu de résultats prêt à être récupéré `IBlockInputStream`. Vous créez `WriteBufferFromFileDescriptor(STDOUT_FILENO)` pour écrire des octets dans stdout. Vous créez `JSONRowOutputStream`, initialisé avec qui `WriteBuffer`, pour écrire des lignes dans `JSON` à stdout. Vous créez `BlockOutputStreamFromRowOutputStream` de plus, pour la représenter comme `IBlockOutputStream`. Ensuite, vous appelez `copyData` pour transférer des données de `IBlockInputStream` de `IBlockOutputStream` et tout fonctionne. Interne, `JSONRowOutputStream` écrira divers délimiteurs JSON et appellera `IDataType::serializeTextJSON` méthode avec une référence à `IColumn` et le numéro de ligne comme arguments. Conséquent, `IDataType::serializeTextJSON` appellera une méthode de `WriteHelpers.h`: exemple, `writeText` pour les types numériques et `writeJSONString` pour `DataTypeString`.
-
-## Table {#tables}
-
-Le `IStorage` l'interface représente les tables. Différentes implémentations de cette interface sont des moteurs de table différents. Les exemples sont `StorageMergeTree`, `StorageMemory` et ainsi de suite. Les Instances de ces classes ne sont que des tables.
-
-Clé `IStorage` les méthodes sont `read` et `write`. Il y a aussi des `alter`, `rename`, `drop` et ainsi de suite. Le `read` méthode accepte les arguments suivants: l'ensemble de colonnes à lire à partir d'un tableau, l' `AST` requête à considérer, et le nombre souhaité de flux de retour. Il renvoie un ou plusieurs `IBlockInputStream` objets et informations sur l'étape de traitement des données qui a été effectuée dans un moteur de table lors de l'exécution de la requête.
-
-Dans la plupart des cas, la méthode read n'est responsable que de la lecture des colonnes spécifiées à partir d'une table, et non d'un traitement ultérieur des données. Tout traitement ultérieur des données est effectué par l'interpréteur de requêtes et n'est pas de la responsabilité de `IStorage`.
-
-Mais il y a des exceptions notables:
-
--   La requête AST est transmise au `read` et le moteur de table peut l'utiliser pour dériver l'utilisation de l'index et pour lire moins de données à partir d'une table.
--   Parfois, le moteur de table peut traiter les données lui-même à une étape spécifique. Exemple, `StorageDistributed` peut envoyer une requête aux serveurs distants, leur demander de traiter les données à une étape où les données de différents serveurs distants peuvent être fusionnées, et renvoyer ces données prétraitées. L'interpréteur de requête termine ensuite le traitement des données.
-
-Table `read` la méthode peut retourner plusieurs `IBlockInputStream` objets permettant le traitement parallèle des données. Ces flux d'entrée de bloc multiples peuvent lire à partir d'une table en parallèle. Ensuite, vous pouvez envelopper ces flux avec diverses transformations (telles que l'évaluation d'expression ou le filtrage) qui peuvent être calculées indépendamment et créer un `UnionBlockInputStream` en plus d'eux, pour lire à partir de plusieurs flux en parallèle.
-
-Il y a aussi des `TableFunction`s. Ce sont des fonctions qui renvoient un `IStorage` objet à utiliser dans le `FROM` la clause d'une requête.
-
-Pour avoir une idée rapide de la façon d'implémenter votre moteur de table, regardez quelque chose de simple, comme `StorageMemory` ou `StorageTinyLog`.
-
-> Comme le résultat de l' `read` méthode, `IStorage` retourner `QueryProcessingStage` – information about what parts of the query were already calculated inside storage.
-
-## Analyseur {#parsers}
-
-Un analyseur de descente récursif écrit à la main analyse une requête. Exemple, `ParserSelectQuery` appelle simplement récursivement les analyseurs sous-jacents pour diverses parties de la requête. Les analyseurs créent un `AST`. Le `AST` est représenté par des nœuds, qui sont des instances de `IAST`.
-
-> Les générateurs d'analyseurs ne sont pas utilisés pour des raisons historiques.
-
-## Interprète {#interpreters}
-
-Les interprètes sont responsables de la création du pipeline d'exécution des requêtes à partir `AST`. Il existe des interprètes simples, tels que `InterpreterExistsQuery` et `InterpreterDropQuery` ou le plus sophistiqué de `InterpreterSelectQuery`. Le pipeline d'exécution de requête est une combinaison de flux d'entrée ou de sortie de bloc. Par exemple, le résultat de l'interprétation de la `SELECT` la requête est la `IBlockInputStream` pour lire le jeu de résultats; le résultat de la requête d'INSERTION est l' `IBlockOutputStream` pour écrire des données à insérer, et le résultat de l'interprétation `INSERT SELECT` la requête est la `IBlockInputStream` cela renvoie un jeu de résultats vide lors de la première lecture, mais qui copie `SELECT` de `INSERT` dans le même temps.
-
-`InterpreterSelectQuery` utiliser `ExpressionAnalyzer` et `ExpressionActions` machines pour l'analyse des requêtes et des transformations. C'est là que la plupart des optimisations de requêtes basées sur des règles sont effectuées. `ExpressionAnalyzer` est assez désordonné et devrait être réécrit: diverses transformations et optimisations de requête doivent être extraites dans des classes séparées pour permettre des transformations modulaires ou une requête.
-
-## Fonction {#functions}
-
-Il y a des fonctions ordinaires et des fonctions agrégées. Pour les fonctions d'agrégation, voir la section suivante.
-
-Ordinary functions don't change the number of rows – they work as if they are processing each row independently. In fact, functions are not called for individual rows, but for `Block`'s de données pour implémenter l'exécution de requête vectorisée.
-
-Il y a quelques fonctions diverses, comme [la taille de bloc](../sql-reference/functions/other-functions.md#function-blocksize), [rowNumberInBlock](../sql-reference/functions/other-functions.md#function-rownumberinblock), et [runningAccumulate](../sql-reference/functions/other-functions.md#function-runningaccumulate), qui exploitent le traitement de bloc et violent l'indépendance des lignes.
-
-ClickHouse a un typage fort, donc il n'y a pas de conversion de type implicite. Si une fonction ne prend pas en charge une combinaison spécifique de types, elle lève une exception. Mais les fonctions peuvent fonctionner (être surchargées) pour de nombreuses combinaisons de types différentes. Par exemple, l' `plus` fonction (pour mettre en œuvre la `+` opérateur) fonctionne pour toute combinaison de types numériques: `UInt8` + `Float32`, `UInt16` + `Int8` et ainsi de suite. En outre, certaines fonctions variadiques peuvent accepter n'importe quel nombre d'arguments, tels que `concat` fonction.
-
-L'implémentation d'une fonction peut être légèrement gênante car une fonction distribue explicitement les types de données pris en charge et pris en charge `IColumns`. Par exemple, l' `plus` la fonction a du code généré par l'instanciation D'un modèle C++ pour chaque combinaison de types numériques, et des arguments gauche et droit constants ou non constants.
-
-C'est un excellent endroit pour implémenter la génération de code d'exécution pour éviter le gonflement du code de modèle. En outre, il permet d'ajouter des fonctions fusionnées comme Fusionné Multiplier-Ajouter ou de faire plusieurs comparaisons dans une itération de boucle.
-
-En raison de l'exécution de requête vectorisée, les fonctions ne sont pas court-circuitées. Par exemple, si vous écrivez `WHERE f(x) AND g(y)` les deux faces sont calculés, même pour les lignes, quand `f(x)` est égal à zéro (sauf quand `f(x)` est une expression constante nulle). Mais si la sélectivité de l' `f(x)` la condition est élevée, et le calcul de `f(x)` est beaucoup moins cher que `g(y)`, il est préférable d'implémenter le calcul multi-pass. Il serait d'abord calculer `f(x)` puis filtrer les colonnes par la suite, puis de calculer `g(y)` uniquement pour les petits morceaux de données filtrés.
-
-## Les Fonctions D'Agrégation {#aggregate-functions}
-
-Les fonctions d'agrégation sont des fonctions avec État. Ils accumulent les valeurs passées dans certains etats et vous permettent d'obtenir des résultats de cet état. Ils sont gérés avec le `IAggregateFunction` interface. Les États peuvent être assez simples (l'État pour `AggregateFunctionCount` est juste un seul `UInt64` valeur) ou très complexes (l'état de `AggregateFunctionUniqCombined` est une combinaison linéaire du tableau, d'une table de hachage, et un `HyperLogLog` structure probabiliste des données).
-
-Les États sont répartis en `Arena` (un pool de mémoire) pour traiter plusieurs états lors de l'exécution d'une cardinalité élevée `GROUP BY` requête. Les États peuvent avoir un constructeur et un destructeur non triviaux: par exemple, les États d'agrégation compliqués peuvent allouer eux-mêmes de la mémoire supplémentaire. Il faut accorder une certaine attention à la création et à la destruction des États et à la transmission appropriée de leur propriété et de leur ordre de destruction.
-
-Les États d'agrégation peuvent être sérialisés et désérialisés pour passer sur le réseau pendant l'exécution de la requête distribuée ou pour les écrire sur le disque où il n'y a pas assez de RAM. Ils peuvent même être stockés dans une table avec le `DataTypeAggregateFunction` pour permettre l'agrégation incrémentielle des données.
-
-> Le format de données sérialisé pour les états de fonction d'agrégat n'est pas versionné pour le moment. C'est ok si les États d'agrégat ne sont stockés que temporairement. Mais nous avons l' `AggregatingMergeTree` moteur de table pour l'agrégation incrémentielle, et les gens l'utilisent déjà en production. C'est la raison pour laquelle la rétrocompatibilité est requise lors de la modification du format sérialisé pour toute fonction d'agrégat à l'avenir.
-
-## Serveur {#server}
-
-Le serveur implémente plusieurs interfaces différentes:
-
--   Une interface HTTP pour tous les clients étrangers.
--   Une interface TCP pour le client clickhouse natif et pour la communication inter-serveur lors de l'exécution de la requête distribuée.
--   Une interface pour transférer des données pour la réplication.
-
-En interne, il s'agit simplement d'un serveur multithread primitif sans coroutines ni fibres. Étant donné que le serveur n'est pas conçu pour traiter un taux élevé de requêtes simples, mais pour traiter un taux relativement faible de requêtes complexes, chacun d'eux peut traiter une grande quantité de données à des fins d'analyse.
-
-Le serveur initialise le `Context` classe avec l'environnement nécessaire à l'exécution des requêtes: la liste des bases de données disponibles, des utilisateurs et des droits d'accès, des paramètres, des clusters, la liste des processus, le journal des requêtes, etc. Les interprètes utilisent cet environnement.
-
-Nous maintenons une compatibilité ascendante et descendante complète pour le protocole TCP du serveur: les anciens clients peuvent parler à de nouveaux serveurs, et les nouveaux clients peuvent parler à d'anciens serveurs. Mais nous ne voulons pas le maintenir éternellement, et nous supprimons le support pour les anciennes versions après environ un an.
-
-!!! note "Note"
-    Pour la plupart des applications externes, nous vous recommandons d'utiliser L'interface HTTP car elle est simple et facile à utiliser. Le protocole TCP est plus étroitement lié aux structures de données internes: il utilise un format interne pour passer des blocs de données, et il utilise un cadrage personnalisé pour les données compressées. Nous n'avons pas publié de bibliothèque C pour ce protocole car elle nécessite de lier la plupart de la base de code ClickHouse, ce qui n'est pas pratique.
-
-## Exécution De Requête Distribuée {#distributed-query-execution}
-
-Les serveurs d'une configuration de cluster sont pour la plupart indépendants. Vous pouvez créer un `Distributed` table sur un ou tous les serveurs dans un cluster. Le `Distributed` table does not store data itself – it only provides a “view” à toutes les tables sur plusieurs nœuds d'un cluster. Lorsque vous sélectionnez à partir d'un `Distributed` table, il réécrit cette requête, choisit les nœuds distants en fonction des paramètres d'équilibrage de charge et leur envoie la requête. Le `Distributed` table demande aux serveurs distants de traiter une requête jusqu'à une étape où les résultats intermédiaires de différents serveurs peuvent être fusionnés. Puis il reçoit les résultats intermédiaires et les fusionne. La table distribuée essaie de distribuer autant de travail que possible aux serveurs distants et n'envoie pas beaucoup de données intermédiaires sur le réseau.
-
-Les choses deviennent plus compliquées lorsque vous avez des sous-requêtes dans des clauses IN ou JOIN, et que chacune d'elles utilise un `Distributed` table. Nous avons différentes stratégies pour l'exécution de ces requêtes.
-
-Il n'existe pas de plan de requête global pour l'exécution des requêtes distribuées. Chaque nœud a son plan de requête local pour sa partie du travail. Nous n'avons qu'une simple exécution de requête distribuée en une seule passe: nous envoyons des requêtes pour les nœuds distants, puis fusionnons les résultats. Mais cela n'est pas possible pour les requêtes compliquées avec des groupes de cardinalité élevés ou avec une grande quantité de données temporaires pour la jointure. Dans de tels cas, nous avons besoin de “reshuffle” données entre les serveurs, ce qui nécessite une coordination supplémentaire. ClickHouse ne supporte pas ce type d'exécution de requête, et nous devons y travailler.
-
-## Fusion De L'Arbre {#merge-tree}
-
-`MergeTree` est une famille de moteurs de stockage qui prend en charge l'indexation par clé primaire. La clé primaire peut être un tuple arbitraire de colonnes ou d'expressions. De données dans un `MergeTree` la table est stockée dans “parts”. Chaque partie stocke les données dans l'ordre de la clé primaire, de sorte que les données sont ordonnées lexicographiquement par le tuple de clé primaire. Toutes les colonnes du tableau sont stockés dans différents `column.bin` les fichiers dans ces régions. Les fichiers sont constitués de blocs compressés. Chaque bloc est généralement de 64 KO à 1 Mo de données non compressées, en fonction de la taille de la valeur moyenne. Les blocs sont constitués de valeurs de colonne placées de manière contiguë l'une après l'autre. Les valeurs de colonne sont dans le même ordre pour chaque colonne (la clé primaire définit l'ordre), donc lorsque vous itérez par plusieurs colonnes, vous obtenez des valeurs pour les lignes correspondantes.
-
-La clé primaire elle-même est “sparse”. Il ne traite pas chaque ligne, mais seulement certaines plages de données. Séparé `primary.idx` fichier a la valeur de la clé primaire pour chaque N-ième ligne, où N est appelé `index_granularity` (habituellement, N = 8192). Aussi, pour chaque colonne, nous avons `column.mrk` les fichiers avec l' “marks,” qui sont des décalages à chaque N-ème ligne dans le fichier de données. Chaque marque est une paire: le décalage dans le fichier au début du bloc compressé, et le décalage dans le bloc décompressé au début des données. Habituellement, les blocs compressés sont alignés par des marques, et le décalage dans le bloc décompressé est nul. Les données pour `primary.idx` réside toujours dans la mémoire, et les données pour `column.mrk` les fichiers sont mis en cache.
-
-Quand nous allons lire quelque chose d'une partie dans `MergeTree` nous regardons `primary.idx` données et locate plages qui pourraient contenir des données demandées, puis regardez `column.mrk` données et calculer des décalages pour savoir où commencer à lire ces plages. En raison de la rareté, les données excédentaires peuvent être lues. ClickHouse ne convient pas à une charge élevée de requêtes ponctuelles simples, car toute la gamme avec `index_granularity` les lignes doivent être lues pour chaque clé, et le bloc compressé entier doit être décompressé pour chaque colonne. Nous avons rendu l'index clairsemé parce que nous devons être en mesure de maintenir des milliards de lignes par serveur unique sans consommation de mémoire notable pour l'index. De plus, comme la clé primaire est clairsemée, elle n'est pas unique: elle ne peut pas vérifier l'existence de la clé dans la table au moment de l'insertion. Vous pourriez avoir plusieurs lignes avec la même clé dans une table.
-
-Lorsque vous `INSERT` un tas de données dans `MergeTree`, ce groupe est trié par ordre de clé primaire et forme une nouvelle partie. Il existe des threads d'arrière-plan qui sélectionnent périodiquement certaines parties et les fusionnent en une seule partie triée pour maintenir le nombre de parties relativement faible. C'est pourquoi il est appelé `MergeTree`. Bien sûr, la fusion conduit à “write amplification”. Toutes les parties sont immuables: elles sont seulement créées et supprimées, mais pas modifiées. Lorsque SELECT est exécuté, il contient un instantané de la table (un ensemble de parties). Après la Fusion, nous conservons également les anciennes pièces pendant un certain temps pour faciliter une récupération après une défaillance, donc si nous voyons qu'une partie fusionnée est probablement cassée, nous pouvons la remplacer par ses parties sources.
-
-`MergeTree` n'est pas un arbre LSM car il ne contient pas “memtable” et “log”: inserted data is written directly to the filesystem. This makes it suitable only to INSERT data in batches, not by individual row and not very frequently – about once per second is ok, but a thousand times a second is not. We did it this way for simplicity's sake, and because we are already inserting data in batches in our applications.
-
-> Les tables MergeTree ne peuvent avoir qu'un seul index (primaire): il n'y a pas d'index secondaires. Il serait bon d'autoriser plusieurs représentations physiques sous une table logique, par exemple, pour stocker des données dans plus d'un ordre physique ou même pour autoriser des représentations avec des données pré-agrégées avec des données originales.
-
-Il existe des moteurs MergeTree qui effectuent un travail supplémentaire lors des fusions en arrière-plan. Les exemples sont `CollapsingMergeTree` et `AggregatingMergeTree`. Cela pourrait être traité comme un support spécial pour les mises à jour. Gardez à l'esprit que ce ne sont pas de vraies mises à jour car les utilisateurs n'ont généralement aucun contrôle sur le moment où les fusions en arrière-plan sont exécutées et les données dans un `MergeTree` la table est presque toujours stockée dans plus d'une partie, pas sous une forme complètement fusionnée.
-
-## Réplication {#replication}
-
-La réplication dans ClickHouse peut être configurée sur une base par table. Vous pouvez avoir des tables répliquées et des tables non répliquées sur le même serveur. Vous pouvez également avoir des tables répliquées de différentes manières, comme une table avec une réplication à deux facteurs et une autre avec trois facteurs.
-
-La réplication est implémentée dans le `ReplicatedMergeTree` moteur de stockage. Le chemin d'accès dans `ZooKeeper` est spécifié comme paramètre pour le moteur de stockage. Toutes les tables avec le même chemin dans `ZooKeeper` devenez des répliques les unes des autres: elles synchronisent leurs données et maintiennent la cohérence. Les répliques peuvent être ajoutées et supprimées dynamiquement simplement en créant ou en supprimant une table.
-
-La réplication utilise un schéma multi-maître asynchrone. Vous pouvez insérer des données dans n'importe quel réplica qui a une session avec `ZooKeeper`, et les données sont répliquées à toutes les autres répliques de manière asynchrone. Parce que ClickHouse ne prend pas en charge les mises à jour, la réplication est sans conflit. Comme il n'y a pas d'accusé de réception de quorum des insertions, les données juste insérées peuvent être perdues si un nœud échoue.
-
-Les métadonnées pour la réplication sont stockées dans ZooKeeper. Il existe un journal de réplication qui répertorie les actions à effectuer. Les Actions sont: obtenir une partie; fusionner des parties; déposer une partition, et ainsi de suite. Chaque réplica copie le journal de réplication dans sa file d'attente, puis exécute les actions de la file d'attente. Par exemple, sur l'insertion, l' “get the part” l'action est créée dans le journal, et chaque réplique téléchargements de la partie. Les fusions sont coordonnées entre les répliques pour obtenir des résultats identiques aux octets. Toutes les parties sont fusionnées de la même manière sur toutes les répliques. Il est réalisé en élisant une réplique en tant que leader, et cette réplique initie fusionne et écrit “merge parts” actions dans le journal.
-
-La réplication est physique: seules les parties compressées sont transférées entre les nœuds, pas les requêtes. Les fusions sont traitées sur chaque réplique indépendamment dans la plupart des cas pour réduire les coûts du réseau en évitant l'amplification du réseau. Grand fusionné les pièces sont envoyées sur le réseau uniquement en cas de retard de réplication.
-
-En outre, chaque réplique stocke son état dans ZooKeeper comme l'ensemble des pièces et ses sommes de contrôle. Lorsque l'état sur le système de fichiers local diverge de l'état de référence dans ZooKeeper, le réplica restaure sa cohérence en téléchargeant les parties manquantes et brisées à partir d'autres réplicas. Lorsqu'il y a des données inattendues ou brisées dans le système de fichiers local, ClickHouse ne les supprime pas, mais les déplace dans un répertoire séparé et les oublie.
-
-!!! note "Note"
-    Le cluster ClickHouse est constitué de fragments indépendants, et chaque fragment est constitué de répliques. Le cluster est **pas élastique**, donc, après avoir ajouté un nouveau fragment, les données ne sont pas rééquilibrées automatiquement entre les fragments. Au lieu de cela, la charge du cluster est censée être ajustée pour être inégale. Cette implémentation vous donne plus de contrôle, et c'est ok pour des clusters relativement petits, tels que des dizaines de nœuds. Mais pour les clusters avec des centaines de nœuds que nous utilisons en production, cette approche devient un inconvénient important. Nous devrions implémenter un moteur de table qui s'étend sur le cluster avec des régions répliquées dynamiquement qui pourraient être divisées et équilibrées automatiquement entre les clusters.
-
-{## [Article Original](https://clickhouse.tech/docs/en/development/architecture/) ##}
diff --git a/docs/fr/development/browse-code.md b/docs/fr/development/browse-code.md
deleted file mode 100644
index ef8beb600c6..00000000000
--- a/docs/fr/development/browse-code.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 63
-toc_title: Parcourir Le Code Source
----
-
-# Parcourir Le Code Source De ClickHouse {#browse-clickhouse-source-code}
-
-Vous pouvez utiliser **Woboq** navigateur de code en ligne disponible [ici](https://clickhouse.tech/codebrowser/html_report/ClickHouse/src/index.html). Il fournit la navigation de code et la mise en évidence sémantique, la recherche et l'indexation. L'instantané de code est mis à jour quotidiennement.
-
-Aussi, vous pouvez parcourir les sources sur [GitHub](https://github.com/ClickHouse/ClickHouse) comme à l'habitude.
-
-Si vous êtes intéressé par L'IDE à utiliser, nous vous recommandons CLion, Qt Creator, VS Code et KDevelop (avec des mises en garde). Vous pouvez utiliser N'importe quel IDE préféré. Vim et Emacs comptent également.
diff --git a/docs/fr/development/build-cross-arm.md b/docs/fr/development/build-cross-arm.md
deleted file mode 100644
index 472862eabe5..00000000000
--- a/docs/fr/development/build-cross-arm.md
+++ /dev/null
@@ -1,43 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 67
-toc_title: Comment Construire ClickHouse sur Linux pour AARCH64 (ARM64)
----
-
-# Comment Construire ClickHouse sur Linux pour L'Architecture AARCH64 (ARM64)  {#how-to-build-clickhouse-on-linux-for-aarch64-arm64-architecture}
-
-C'est pour le cas où vous avez machine Linux et que vous voulez utiliser pour construire `clickhouse` binaire qui fonctionnera sur une autre machine Linux avec une architecture CPU AARCH64. Ceci est destiné aux contrôles d'intégration continus qui s'exécutent sur des serveurs Linux.
-
-La construction croisée pour AARCH64 est basée sur [Instructions de construction](build.md), suivez d'abord.
-
-# Installer Clang-8 {#install-clang-8}
-
-Suivez les instructions de https://apt.llvm.org/ pour votre configuration Ubuntu ou Debian.
-Par exemple, dans Ubuntu Bionic vous pouvez utiliser les commandes suivantes:
-
-``` bash
-echo "deb [trusted=yes] http://apt.llvm.org/bionic/ llvm-toolchain-bionic-8 main" | sudo tee /etc/apt/sources.list.d/llvm.list
-sudo apt-get update
-sudo apt-get install clang-8
-```
-
-# Installer Un Ensemble D'Outils De Compilation Croisée {#install-cross-compilation-toolset}
-
-``` bash
-cd ClickHouse
-mkdir -p build-aarch64/cmake/toolchain/linux-aarch64
-wget 'https://developer.arm.com/-/media/Files/downloads/gnu-a/8.3-2019.03/binrel/gcc-arm-8.3-2019.03-x86_64-aarch64-linux-gnu.tar.xz?revision=2e88a73f-d233-4f96-b1f4-d8b36e9bb0b9&la=en' -O gcc-arm-8.3-2019.03-x86_64-aarch64-linux-gnu.tar.xz
-tar xJf gcc-arm-8.3-2019.03-x86_64-aarch64-linux-gnu.tar.xz -C build-aarch64/cmake/toolchain/linux-aarch64 --strip-components=1
-```
-
-# Construire ClickHouse {#build-clickhouse}
-
-``` bash
-cd ClickHouse
-mkdir build-arm64
-CC=clang-8 CXX=clang++-8 cmake . -Bbuild-arm64 -DCMAKE_TOOLCHAIN_FILE=cmake/linux/toolchain-aarch64.cmake
-ninja -C build-arm64
-```
-
-Le binaire résultant s'exécutera uniquement sur Linux avec l'architecture CPU AARCH64.
diff --git a/docs/fr/development/build-cross-osx.md b/docs/fr/development/build-cross-osx.md
deleted file mode 100644
index a15d4650edb..00000000000
--- a/docs/fr/development/build-cross-osx.md
+++ /dev/null
@@ -1,64 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 66
-toc_title: Comment Construire ClickHouse sur Linux pour Mac OS X
----
-
-# Comment Construire ClickHouse sur Linux pour Mac OS X {#how-to-build-clickhouse-on-linux-for-mac-os-x}
-
-C'est pour le cas où vous avez machine Linux et que vous voulez utiliser pour construire `clickhouse` binaire qui s'exécutera sur OS X. Ceci est destiné aux contrôles d'intégration continus qui s'exécutent sur des serveurs Linux. Si vous voulez construire ClickHouse directement sur Mac OS X, puis procéder à [une autre instruction](build-osx.md).
-
-Le cross-build pour Mac OS X est basé sur le [Instructions de construction](build.md), suivez d'abord.
-
-# Installer Clang-8 {#install-clang-8}
-
-Suivez les instructions de https://apt.llvm.org/ pour votre configuration Ubuntu ou Debian.
-Par exemple les commandes pour Bionic sont comme:
-
-``` bash
-sudo echo "deb [trusted=yes] http://apt.llvm.org/bionic/ llvm-toolchain-bionic-8 main" >> /etc/apt/sources.list
-sudo apt-get install clang-8
-```
-
-# Installer Un Ensemble D'Outils De Compilation Croisée {#install-cross-compilation-toolset}
-
-Souvenons nous du chemin où nous installons `cctools` comme ${CCTOOLS}
-
-``` bash
-mkdir ${CCTOOLS}
-
-git clone https://github.com/tpoechtrager/apple-libtapi.git
-cd apple-libtapi
-INSTALLPREFIX=${CCTOOLS} ./build.sh
-./install.sh
-cd ..
-
-git clone https://github.com/tpoechtrager/cctools-port.git
-cd cctools-port/cctools
-./configure --prefix=${CCTOOLS} --with-libtapi=${CCTOOLS} --target=x86_64-apple-darwin
-make install
-```
-
-En outre, nous devons télécharger macOS X SDK dans l'arbre de travail.
-
-``` bash
-cd ClickHouse
-wget 'https://github.com/phracker/MacOSX-SDKs/releases/download/10.15/MacOSX10.15.sdk.tar.xz'
-mkdir -p build-darwin/cmake/toolchain/darwin-x86_64
-tar xJf MacOSX10.15.sdk.tar.xz -C build-darwin/cmake/toolchain/darwin-x86_64 --strip-components=1
-```
-
-# Construire ClickHouse {#build-clickhouse}
-
-``` bash
-cd ClickHouse
-mkdir build-osx
-CC=clang-8 CXX=clang++-8 cmake . -Bbuild-osx -DCMAKE_TOOLCHAIN_FILE=cmake/darwin/toolchain-x86_64.cmake \
-    -DCMAKE_AR:FILEPATH=${CCTOOLS}/bin/x86_64-apple-darwin-ar \
-    -DCMAKE_RANLIB:FILEPATH=${CCTOOLS}/bin/x86_64-apple-darwin-ranlib \
-    -DLINKER_NAME=${CCTOOLS}/bin/x86_64-apple-darwin-ld
-ninja -C build-osx
-```
-
-Le binaire résultant aura un format exécutable Mach-O et ne pourra pas être exécuté sous Linux.
diff --git a/docs/fr/development/build-osx.md b/docs/fr/development/build-osx.md
deleted file mode 100644
index 677e257a637..00000000000
--- a/docs/fr/development/build-osx.md
+++ /dev/null
@@ -1,93 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 65
-toc_title: Comment Construire ClickHouse sur Mac OS X
----
-
-# Comment Construire ClickHouse sur Mac OS X {#how-to-build-clickhouse-on-mac-os-x}
-
-Build devrait fonctionner sur Mac OS X 10.15 (Catalina)
-
-## Installer Homebrew {#install-homebrew}
-
-``` bash
-$ /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
-```
-
-## Installez les compilateurs, outils et bibliothèques requis {#install-required-compilers-tools-and-libraries}
-
-``` bash
-$ brew install cmake ninja libtool gettext
-```
-
-## Commander Clickhouse Sources {#checkout-clickhouse-sources}
-
-``` bash
-$ git clone --recursive git@github.com:ClickHouse/ClickHouse.git
-```
-
-ou
-
-``` bash
-$ git clone --recursive https://github.com/ClickHouse/ClickHouse.git
-
-$ cd ClickHouse
-```
-
-## Construire ClickHouse {#build-clickhouse}
-
-``` bash
-$ mkdir build
-$ cd build
-$ cmake .. -DCMAKE_CXX_COMPILER=`which clang++` -DCMAKE_C_COMPILER=`which clang`
-$ ninja
-$ cd ..
-```
-
-## Mises en garde {#caveats}
-
-Si vous avez l'intention d'exécuter clickhouse-server, assurez-vous d'augmenter la variable maxfiles du système.
-
-!!! info "Note"
-    Vous aurez besoin d'utiliser sudo.
-
-Pour ce faire, créez le fichier suivant:
-
-/ Bibliothèque / LaunchDaemons / limite.maxfiles.plist:
-
-``` xml
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN"
-        "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-  <dict>
-    <key>Label</key>
-    <string>limit.maxfiles</string>
-    <key>ProgramArguments</key>
-    <array>
-      <string>launchctl</string>
-      <string>limit</string>
-      <string>maxfiles</string>
-      <string>524288</string>
-      <string>524288</string>
-    </array>
-    <key>RunAtLoad</key>
-    <true/>
-    <key>ServiceIPC</key>
-    <false/>
-  </dict>
-</plist>
-```
-
-Exécutez la commande suivante:
-
-``` bash
-$ sudo chown root:wheel /Library/LaunchDaemons/limit.maxfiles.plist
-```
-
-Redémarrer.
-
-Pour vérifier si elle fonctionne, vous pouvez utiliser `ulimit -n` commande.
-
-[Article Original](https://clickhouse.tech/docs/en/development/build_osx/) <!--hide-->
diff --git a/docs/fr/development/build.md b/docs/fr/development/build.md
deleted file mode 100644
index 4889373c52a..00000000000
--- a/docs/fr/development/build.md
+++ /dev/null
@@ -1,141 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 64
-toc_title: Comment Construire ClickHouse sur Linux
----
-
-# Comment Construire ClickHouse pour le développement {#how-to-build-clickhouse-for-development}
-
-Le tutoriel suivant est basé sur le système Linux Ubuntu.
-Avec les modifications appropriées, il devrait également fonctionner sur toute autre distribution Linux.
-Plates-formes prises en charge: x86_64 et AArch64. La prise en charge de Power9 est expérimentale.
-
-## Installez Git, CMake, Python et Ninja {#install-git-cmake-python-and-ninja}
-
-``` bash
-$ sudo apt-get install git cmake python ninja-build
-```
-
-Ou cmake3 au lieu de cmake sur les systèmes plus anciens.
-
-## Installer GCC 10 {#install-gcc-10}
-
-Il y a plusieurs façons de le faire.
-
-### Installer à partir d'un paquet PPA {#install-from-a-ppa-package}
-
-``` bash
-$ sudo apt-get install software-properties-common
-$ sudo apt-add-repository ppa:ubuntu-toolchain-r/test
-$ sudo apt-get update
-$ sudo apt-get install gcc-10 g++-10
-```
-
-### Installer à partir de Sources {#install-from-sources}
-
-Regarder [utils/ci/build-gcc-from-sources.sh](https://github.com/ClickHouse/ClickHouse/blob/master/utils/ci/build-gcc-from-sources.sh)
-
-## Utilisez GCC 10 pour les Builds {#use-gcc-10-for-builds}
-
-``` bash
-$ export CC=gcc-10
-$ export CXX=g++-10
-```
-
-## Commander Clickhouse Sources {#checkout-clickhouse-sources}
-
-``` bash
-$ git clone --recursive git@github.com:ClickHouse/ClickHouse.git
-```
-
-ou
-
-``` bash
-$ git clone --recursive https://github.com/ClickHouse/ClickHouse.git
-```
-
-## Construire ClickHouse {#build-clickhouse}
-
-``` bash
-$ cd ClickHouse
-$ mkdir build
-$ cd build
-$ cmake ..
-$ ninja
-$ cd ..
-```
-
-Pour créer un exécutable, exécutez `ninja clickhouse`.
-Cela va créer de l' `programs/clickhouse` exécutable, qui peut être utilisé avec `client` ou `server` argument.
-
-# Comment Construire ClickHouse sur N'importe quel Linux {#how-to-build-clickhouse-on-any-linux}
-
-La construction nécessite les composants suivants:
-
--   Git (est utilisé uniquement pour extraire les sources, ce n'est pas nécessaire pour la construction)
--   CMake 3.10 ou plus récent
--   Ninja (recommandé) ou faire
--   Compilateur C++: gcc 10 ou clang 8 ou plus récent
--   Linker: lld ou gold (le classique GNU LD ne fonctionnera pas)
--   Python (est seulement utilisé dans la construction LLVM et il est facultatif)
-
-Si tous les composants sont installés, vous pouvez construire de la même manière que les étapes ci-dessus.
-
-Exemple pour Ubuntu Eoan:
-
-    sudo apt update
-    sudo apt install git cmake ninja-build g++ python
-    git clone --recursive https://github.com/ClickHouse/ClickHouse.git
-    mkdir build && cd build
-    cmake ../ClickHouse
-    ninja
-
-Exemple Pour openSUSE Tumbleweed:
-
-    sudo zypper install git cmake ninja gcc-c++ python lld
-    git clone --recursive https://github.com/ClickHouse/ClickHouse.git
-    mkdir build && cd build
-    cmake ../ClickHouse
-    ninja
-
-Exemple Pour Fedora Rawhide:
-
-    sudo yum update
-    yum --nogpg install git cmake make gcc-c++ python3
-    git clone --recursive https://github.com/ClickHouse/ClickHouse.git
-    mkdir build && cd build
-    cmake ../ClickHouse
-    make -j $(nproc)
-
-# Vous N'avez pas à construire ClickHouse {#you-dont-have-to-build-clickhouse}
-
-ClickHouse est disponible dans des binaires et des paquets pré-construits. Les binaires sont portables et peuvent être exécutés sur N'importe quelle saveur Linux.
-
-Ils sont conçus pour les versions stables, préconfigurables et de test aussi longtemps que pour chaque commit à master et pour chaque requête d'extraction.
-
-Pour trouver la construction la plus fraîche de `master`, aller à [page commits](https://github.com/ClickHouse/ClickHouse/commits/master), cliquez sur la première coche verte ou Croix Rouge près de commit, et cliquez sur le “Details” lien à droite après “ClickHouse Build Check”.
-
-# Comment construire le paquet ClickHouse Debian {#how-to-build-clickhouse-debian-package}
-
-## Installer Git et Pbuilder {#install-git-and-pbuilder}
-
-``` bash
-$ sudo apt-get update
-$ sudo apt-get install git python pbuilder debhelper lsb-release fakeroot sudo debian-archive-keyring debian-keyring
-```
-
-## Commander Clickhouse Sources {#checkout-clickhouse-sources-1}
-
-``` bash
-$ git clone --recursive --branch master https://github.com/ClickHouse/ClickHouse.git
-$ cd ClickHouse
-```
-
-## Exécuter Le Script De Publication {#run-release-script}
-
-``` bash
-$ ./release
-```
-
-[Article Original](https://clickhouse.tech/docs/en/development/build/) <!--hide-->
diff --git a/docs/fr/development/contrib.md b/docs/fr/development/contrib.md
deleted file mode 100644
index 6909ef905bd..00000000000
--- a/docs/fr/development/contrib.md
+++ /dev/null
@@ -1,41 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 70
-toc_title: "Biblioth\xE8ques Tierces Utilis\xE9es"
----
-
-# Bibliothèques Tierces Utilisées {#third-party-libraries-used}
-
-| Bibliothèque         | Licence                                                                                                                                        |
-|----------------------|------------------------------------------------------------------------------------------------------------------------------------------------|
-| base64               | [Licence BSD 2-Clause](https://github.com/aklomp/base64/blob/a27c565d1b6c676beaf297fe503c4518185666f7/LICENSE)                                 |
-| stimuler             | [Licence Logicielle Boost 1.0](https://github.com/ClickHouse-Extras/boost-extra/blob/6883b40449f378019aec792f9983ce3afc7ff16e/LICENSE_1_0.txt) |
-| brotli               | [MIT](https://github.com/google/brotli/blob/master/LICENSE)                                                                                    |
-| capnproto            | [MIT](https://github.com/capnproto/capnproto/blob/master/LICENSE)                                                                              |
-| cctz                 | [Licence Apache 2.0](https://github.com/google/cctz/blob/4f9776a310f4952454636363def82c2bf6641d5f/LICENSE.txt)                                 |
-| double-conversion    | [Licence BSD 3-Clause](https://github.com/google/double-conversion/blob/cf2f0f3d547dc73b4612028a155b80536902ba02/LICENSE)                      |
-| FastMemcpy           | [MIT](https://github.com/ClickHouse/ClickHouse/blob/master/libs/libmemcpy/impl/LICENSE)                                                        |
-| googletest           | [Licence BSD 3-Clause](https://github.com/google/googletest/blob/master/LICENSE)                                                               |
-| h3                   | [Licence Apache 2.0](https://github.com/uber/h3/blob/master/LICENSE)                                                                           |
-| hyperscan            | [Licence BSD 3-Clause](https://github.com/intel/hyperscan/blob/master/LICENSE)                                                                 |
-| libcxxabi            | [BSD + MIT](https://github.com/ClickHouse/ClickHouse/blob/master/libs/libglibc-compatibility/libcxxabi/LICENSE.TXT)                            |
-| libdivide            | [Licence Zlib](https://github.com/ClickHouse/ClickHouse/blob/master/contrib/libdivide/LICENSE.txt)                                             |
-| libgsasl             | [LGPL v2.1](https://github.com/ClickHouse-Extras/libgsasl/blob/3b8948a4042e34fb00b4fb987535dc9e02e39040/LICENSE)                               |
-| libhdfs3             | [Licence Apache 2.0](https://github.com/ClickHouse-Extras/libhdfs3/blob/bd6505cbb0c130b0db695305b9a38546fa880e5a/LICENSE.txt)                  |
-| libmetrohash         | [Licence Apache 2.0](https://github.com/ClickHouse/ClickHouse/blob/master/contrib/libmetrohash/LICENSE)                                        |
-| libpcg-aléatoire     | [Licence Apache 2.0](https://github.com/ClickHouse/ClickHouse/blob/master/contrib/libpcg-random/LICENSE-APACHE.txt)                            |
-| libressl             | [Licence OpenSSL](https://github.com/ClickHouse-Extras/ssl/blob/master/COPYING)                                                                |
-| librdkafka           | [Licence BSD 2-Clause](https://github.com/edenhill/librdkafka/blob/363dcad5a23dc29381cc626620e68ae418b3af19/LICENSE)                           |
-| libwidechar_width   | [CC0 1.0 universel](https://github.com/ClickHouse/ClickHouse/blob/master/libs/libwidechar_width/LICENSE)                                       |
-| llvm                 | [Licence BSD 3-Clause](https://github.com/ClickHouse-Extras/llvm/blob/163def217817c90fb982a6daf384744d8472b92b/llvm/LICENSE.TXT)               |
-| lz4                  | [Licence BSD 2-Clause](https://github.com/lz4/lz4/blob/c10863b98e1503af90616ae99725ecd120265dfb/LICENSE)                                       |
-| mariadb-connecteur-c | [LGPL v2.1](https://github.com/ClickHouse-Extras/mariadb-connector-c/blob/3.1/COPYING.LIB)                                                     |
-| murmurhash           | [Domaine Public](https://github.com/ClickHouse/ClickHouse/blob/master/contrib/murmurhash/LICENSE)                                              |
-| pdqsort              | [Licence Zlib](https://github.com/ClickHouse/ClickHouse/blob/master/contrib/pdqsort/license.txt)                                               |
-| poco                 | [Licence Du Logiciel Boost-Version 1.0](https://github.com/ClickHouse-Extras/poco/blob/fe5505e56c27b6ecb0dcbc40c49dc2caf4e9637f/LICENSE)       |
-| protobuf             | [Licence BSD 3-Clause](https://github.com/ClickHouse-Extras/protobuf/blob/12735370922a35f03999afff478e1c6d7aa917a4/LICENSE)                    |
-| re2                  | [Licence BSD 3-Clause](https://github.com/google/re2/blob/7cf8b88e8f70f97fd4926b56aa87e7f53b2717e0/LICENSE)                                    |
-| UnixODBC             | [LGPL v2.1](https://github.com/ClickHouse-Extras/UnixODBC/tree/b0ad30f7f6289c12b76f04bfb9d466374bb32168)                                       |
-| zlib-ng              | [Licence Zlib](https://github.com/ClickHouse-Extras/zlib-ng/blob/develop/LICENSE.md)                                                           |
-| zstd                 | [Licence BSD 3-Clause](https://github.com/facebook/zstd/blob/dev/LICENSE)                                                                      |
diff --git a/docs/fr/development/developer-instruction.md b/docs/fr/development/developer-instruction.md
deleted file mode 100644
index 610216925c3..00000000000
--- a/docs/fr/development/developer-instruction.md
+++ /dev/null
@@ -1,287 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 61
-toc_title: "Le D\xE9butant Clickhouse Developer Instruction"
----
-
-La construction de ClickHouse est prise en charge sous Linux, FreeBSD et Mac OS X.
-
-# Si Vous Utilisez Windows {#if-you-use-windows}
-
-Si vous utilisez Windows, vous devez créer une machine virtuelle avec Ubuntu. Pour commencer à travailler avec une machine virtuelle, installez VirtualBox. Vous pouvez télécharger Ubuntu sur le site: https://www.ubuntu.com/#download. veuillez créer une machine virtuelle à partir de l'image téléchargée (vous devez réserver au moins 4 Go de RAM pour cela). Pour exécuter un terminal de ligne de commande dans Ubuntu, recherchez un programme contenant le mot “terminal” dans son nom (gnome-terminal, konsole etc.) ou appuyez simplement sur Ctrl + Alt + T.
-
-# Si vous utilisez un système 32 bits {#if-you-use-a-32-bit-system}
-
-ClickHouse ne peut pas fonctionner ou construire sur un système 32 bits. Vous devez acquérir l'accès à un système 64 bits et vous pouvez continuer la lecture.
-
-# Création d'un référentiel sur GitHub {#creating-a-repository-on-github}
-
-Pour commencer à travailler avec clickhouse repository, vous aurez besoin d'un compte GitHub.
-
-Vous en avez probablement déjà un, mais si vous ne le faites pas, veuillez vous inscrire à https://github.com. dans le cas où vous n'avez pas de clés SSH, vous devez les générer, puis les télécharger sur GitHub. Il est nécessaire pour l'envoi de vos correctifs. Il est également possible d'utiliser les mêmes clés SSH que vous utilisez avec d'autres serveurs SSH - vous les avez probablement déjà.
-
-Créer un fork de clickhouse repository. Pour ce faire, cliquez sur l' “fork” bouton dans le coin supérieur droit à https://github.com/ClickHouse/ClickHouse. il fourche votre propre copie de ClickHouse / ClickHouse à votre compte.
-
-Le processus de développement consiste d'abord à valider les modifications prévues dans votre fork de ClickHouse, puis à créer un “pull request” pour que ces modifications soient acceptées dans le référentiel principal (ClickHouse/ClickHouse).
-
-Pour travailler avec les dépôts git, veuillez installer `git`.
-
-Pour ce faire dans Ubuntu vous exécutez dans le terminal de ligne de commande:
-
-    sudo apt update
-    sudo apt install git
-
-Un bref manuel sur l'utilisation de Git peut être trouvé ici: https://education.github.com/git-cheat-sheet-education.pdf.
-Pour un manuel détaillé sur Git voir https://git-scm.com/book/en/v2.
-
-# Clonage D'un référentiel sur votre machine de développement {#cloning-a-repository-to-your-development-machine}
-
-Ensuite, vous devez télécharger les fichiers source sur votre machine de travail. Ceci est appelé “to clone a repository” parce qu'il crée une copie locale du dépôt sur votre machine de travail.
-
-Dans le terminal de ligne de commande exécuter:
-
-    git clone --recursive git@github.com:your_github_username/ClickHouse.git
-    cd ClickHouse
-
-Remarque: Veuillez remplacer *your_github_username* avec ce qui est approprié!
-
-Cette commande va créer un répertoire `ClickHouse` contenant la copie de travail du projet.
-
-Il est important que le chemin d'accès au répertoire de travail ne contienne aucun espace, car cela peut entraîner des problèmes lors de l'exécution du système de construction.
-
-Veuillez noter que clickhouse repository utilise `submodules`. That is what the references to additional repositories are called (i.e. external libraries on which the project depends). It means that when cloning the repository you need to specify the `--recursive` drapeau comme dans l'exemple ci-dessus. Si le dépôt a été cloné sans submodules, pour télécharger, vous devez exécuter les opérations suivantes:
-
-    git submodule init
-    git submodule update
-
-Vous pouvez vérifier l'état avec la commande: `git submodule status`.
-
-Si vous obtenez le message d'erreur suivantes:
-
-    Permission denied (publickey).
-    fatal: Could not read from remote repository.
-
-    Please make sure you have the correct access rights
-    and the repository exists.
-
-Cela signifie généralement que les clés SSH pour la connexion à GitHub sont manquantes. Ces clés sont normalement situés dans `~/.ssh`. Pour que les clés SSH soient acceptées, vous devez les télécharger dans la section Paramètres de L'interface utilisateur GitHub.
-
-Vous pouvez également cloner le référentiel via le protocole https:
-
-    git clone https://github.com/ClickHouse/ClickHouse.git
-
-Ceci, cependant, ne vous permettra pas d'envoyer vos modifications sur le serveur. Vous pouvez toujours l'utiliser temporairement et ajouter les clés SSH plus tard en remplaçant l'adresse distante du référentiel par `git remote` commande.
-
-Vous pouvez également ajouter l'adresse du dépôt clickhouse original à votre référentiel local pour extraire les mises à jour à partir de là:
-
-    git remote add upstream git@github.com:ClickHouse/ClickHouse.git
-
-Après avoir exécuté avec succès cette commande vous serez en mesure de tirer les mises à jour du repo clickhouse principal en exécutant `git pull upstream master`.
-
-## Travailler avec des Submodules {#working-with-submodules}
-
-Travailler avec des sous-modules dans git pourrait être douloureux. Prochaines commandes aidera à gérer:
-
-    # ! each command accepts --recursive
-    # Update remote URLs for submodules. Barely rare case
-    git submodule sync
-    # Add new submodules
-    git submodule init
-    # Update existing submodules to the current state
-    git submodule update
-    # Two last commands could be merged together
-    git submodule update --init
-
-Les commandes suivantes vous aideront à réinitialiser tous les sous-modules à l'état initial (!AVERTISSEMENT! - tout changement à l'intérieur sera supprimé):
-
-    # Synchronizes submodules' remote URL with .gitmodules
-    git submodule sync --recursive
-    # Update the registered submodules with initialize not yet initialized
-    git submodule update --init --recursive
-    # Reset all changes done after HEAD
-    git submodule foreach git reset --hard
-    # Clean files from .gitignore
-    git submodule foreach git clean -xfd
-    # Repeat last 4 commands for all submodule
-    git submodule foreach git submodule sync --recursive
-    git submodule foreach git submodule update --init --recursive
-    git submodule foreach git submodule foreach git reset --hard
-    git submodule foreach git submodule foreach git clean -xfd
-
-# Système De Construction {#build-system}
-
-ClickHouse utilise CMake et Ninja pour la construction.
-
-CMake - un système de méta-construction qui peut générer des fichiers Ninja (tâches de construction).
-Ninja - un système de construction plus petit avec un accent sur la vitesse utilisée pour exécuter ces tâches générées cmake.
-
-Pour installer sur Ubuntu, Debian ou mint run `sudo apt install cmake ninja-build`.
-
-Sur CentOS, RedHat run `sudo yum install cmake ninja-build`.
-
-Si vous utilisez Arch ou Gentoo, vous savez probablement vous - même comment installer CMake.
-
-Pour installer CMake et Ninja sur Mac OS X installez D'abord Homebrew puis installez tout le reste via brew:
-
-    /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
-    brew install cmake ninja
-
-Ensuite, vérifiez la version de CMake: `cmake --version`. Si elle est inférieure à 3.3, vous devez installer une version plus récente du site web: https://cmake.org/download/.
-
-# Bibliothèques Externes Facultatives {#optional-external-libraries}
-
-ClickHouse utilise plusieurs bibliothèques externes pour la construction. Tous n'ont pas besoin d'être installés séparément car ils sont construits avec ClickHouse à partir des sources situées dans les sous-modules. Vous pouvez vérifier la liste dans `contrib`.
-
-# Compilateur C++  {#c-compiler}
-
-Les compilateurs GCC à partir de la version 10 et Clang version 8 ou supérieure sont pris en charge pour construire ClickHouse.
-
-Les builds officiels de Yandex utilisent actuellement GCC car ils génèrent du code machine de performances légèrement meilleures (ce qui donne une différence allant jusqu'à plusieurs pour cent selon nos benchmarks). Et Clang est plus pratique pour le développement habituellement. Cependant, notre plate-forme d'intégration continue (CI) vérifie environ une douzaine de combinaisons de construction.
-
-Pour installer GCC sur Ubuntu Exécutez: `sudo apt install gcc g++`
-
-Vérifiez la version de gcc: `gcc --version`. Si elle est inférieure à 10, suivez les instructions ici: https://clickhouse.tech/docs/fr/development/build/#install-gcc-10.
-
-Mac OS X build est pris en charge uniquement pour Clang. Il suffit d'exécuter `brew install llvm`
-
-Si vous décidez d'utiliser Clang, vous pouvez également installer `libc++` et `lld` si vous savez ce que c'est. Utiliser `ccache` est également recommandé.
-
-# Le Processus De Construction {#the-building-process}
-
-Maintenant que vous êtes prêt à construire ClickHouse nous vous conseillons de créer un répertoire séparé `build` à l'intérieur de `ClickHouse` qui contiendra tous les artefacts de construction:
-
-    mkdir build
-    cd build
-
-Vous pouvez avoir plusieurs répertoires différents (build_release, build_debug, etc.) pour les différents types de construction.
-
-Tandis qu'à l'intérieur de la `build` répertoire, configurez votre build en exécutant CMake. Avant la première exécution, vous devez définir des variables d'environnement qui spécifient le compilateur (compilateur gcc version 10 dans cet exemple).
-
-Linux:
-
-    export CC=gcc-10 CXX=g++-10
-    cmake ..
-
-Mac OS X:
-
-    export CC=clang CXX=clang++
-    cmake ..
-
-Le `CC` variable spécifie le compilateur pour C (abréviation de compilateur C), et `CXX` variable indique quel compilateur C++ doit être utilisé pour la construction.
-
-Pour une version plus rapide, vous pouvez recourir à l' `debug` build type - Une construction sans optimisations. Pour cela fournissez le paramètre suivant `-D CMAKE_BUILD_TYPE=Debug`:
-
-    cmake -D CMAKE_BUILD_TYPE=Debug ..
-
-Vous pouvez modifier le type de génération en exécutant cette commande dans le `build` répertoire.
-
-Exécutez ninja pour construire:
-
-    ninja clickhouse-server clickhouse-client
-
-Seules les binaires vont être construites dans cet exemple.
-
-Si vous avez besoin de construire tous les binaires (utilitaires et tests), vous devez exécuter ninja sans paramètres:
-
-    ninja
-
-La construction complète nécessite environ 30 Go d'espace disque libre ou 15 Go pour construire les binaires principaux.
-
-Lorsqu'une grande quantité de RAM est disponible sur la machine de construction vous devez limiter le nombre de tâches de construction exécutées en parallèle avec `-j` param:
-
-    ninja -j 1 clickhouse-server clickhouse-client
-
-Sur les machines avec 4 Go de RAM, il est recommandé de spécifier 1, pour 8 Go de RAM `-j 2` est recommandé.
-
-Si vous recevez le message: `ninja: error: loading 'build.ninja': No such file or directory`, cela signifie que la génération d'une configuration de construction a échoué et que vous devez inspecter le message ci-dessus.
-
-Après le démarrage réussi du processus de construction, vous verrez la progression de la construction - le nombre de tâches traitées et le nombre total de tâches.
-
-Lors de la construction de messages sur les fichiers protobuf dans la bibliothèque libhdfs2 comme `libprotobuf WARNING` peuvent apparaître. Ils touchent rien et sont sûrs d'être ignoré.
-
-Lors de la construction, vous obtenez un fichier exécutable `ClickHouse/<build_dir>/programs/clickhouse`:
-
-    ls -l programs/clickhouse
-
-# Exécution de L'exécutable construit de ClickHouse {#running-the-built-executable-of-clickhouse}
-
-Pour exécuter le serveur sous l'utilisateur actuel vous devez naviguer vers `ClickHouse/programs/server/` (situé à l'extérieur de `build` et les exécuter:
-
-    ../../build/programs/clickhouse server
-
-Dans ce cas, ClickHouse utilisera les fichiers de configuration situés dans le répertoire courant. Vous pouvez l'exécuter `clickhouse server` depuis n'importe quel répertoire spécifiant le chemin d'accès à un fichier de configuration en tant que paramètre de ligne de commande `--config-file`.
-
-Pour vous connecter à ClickHouse avec clickhouse-client dans un autre terminal, accédez à `ClickHouse/build/programs/` et exécuter `./clickhouse client`.
-
-Si vous obtenez `Connection refused` message sur Mac OS X ou FreeBSD, essayez de spécifier l'adresse hôte 127.0.0.1:
-
-    clickhouse client --host 127.0.0.1
-
-Vous pouvez remplacer la version de production de clickhouse binary installée dans votre système par votre clickhouse Binary sur mesure. Pour ce faire, installez ClickHouse sur votre machine en suivant les instructions du site officiel. Ensuite, exécutez ce qui suit:
-
-    sudo service clickhouse-server stop
-    sudo cp ClickHouse/build/programs/clickhouse /usr/bin/
-    sudo service clickhouse-server start
-
-Notez que `clickhouse-client`, `clickhouse-server` et d'autres sont des liens symboliques à la commune `clickhouse` binaire.
-
-Vous pouvez également exécuter votre binaire ClickHouse personnalisé avec le fichier de configuration du package clickhouse installé sur votre système:
-
-    sudo service clickhouse-server stop
-    sudo -u clickhouse ClickHouse/build/programs/clickhouse server --config-file /etc/clickhouse-server/config.xml
-
-# IDE (environnement de développement intégré) {#ide-integrated-development-environment}
-
-Si vous ne savez pas quel IDE utiliser, nous vous recommandons D'utiliser CLion. CLion est un logiciel commercial, mais il offre une période d'essai gratuite de 30 jours. Il est également gratuit pour les étudiants. CLion peut être utilisé à la fois sur Linux et sur Mac OS X.
-
-KDevelop et QTCreator sont d'autres grandes alternatives D'un IDE pour développer ClickHouse. KDevelop est un IDE très pratique bien qu'instable. Si KDevelop se bloque après un certain temps lors de l'ouverture du projet, vous devez cliquer sur “Stop All” bouton dès qu'il a ouvert la liste des fichiers du projet. Après cela, KDevelop devrait être bien pour travailler avec.
-
-En tant qu'éditeurs de code simples, vous pouvez utiliser Sublime Text ou Visual Studio Code, ou Kate (qui sont tous disponibles sur Linux).
-
-Juste au cas où, il convient de mentionner que CLion crée `build` chemin sur son propre, il aussi sur son propre sélectionne `debug` pour le type de construction, pour la configuration, il utilise une version de CMake définie dans CLion et non celle installée par vous, et enfin, CLion utilisera `make` pour exécuter construire des tâches au lieu de `ninja`. C'est un comportement normal, gardez cela à l'esprit pour éviter toute confusion.
-
-# L'Écriture De Code {#writing-code}
-
-La description de l'architecture ClickHouse peut être trouvée ici: https://clickhouse.tech/docs/fr/développement/architecture/
-
-Le code Style Guide: https://clickhouse.tech/docs/fr/développement/style/
-
-Rédaction de tests: https://clickhouse.tech/docs/fr/développement/tests/
-
-Liste des tâches: https://github.com/ClickHouse/ClickHouse/issues?q=is%3Aopen+is%3Aissue+label%3A%22easy+task%22
-
-# Des Données De Test {#test-data}
-
-Le développement de ClickHouse nécessite souvent le chargement d'ensembles de données réalistes. Il est particulièrement important pour les tests de performance. Nous avons un ensemble spécialement préparé de données anonymisées de Yandex.Metrica. Il nécessite en outre quelques 3 Go d'espace disque libre. Notez que ces données ne sont pas requises pour accomplir la plupart des tâches de développement.
-
-    sudo apt install wget xz-utils
-
-    wget https://datasets.clickhouse.tech/hits/tsv/hits_v1.tsv.xz
-    wget https://datasets.clickhouse.tech/visits/tsv/visits_v1.tsv.xz
-
-    xz -v -d hits_v1.tsv.xz
-    xz -v -d visits_v1.tsv.xz
-
-    clickhouse-client
-
-    CREATE DATABASE IF NOT EXISTS test
-
-    CREATE TABLE test.hits ( WatchID UInt64,  JavaEnable UInt8,  Title String,  GoodEvent Int16,  EventTime DateTime,  EventDate Date,  CounterID UInt32,  ClientIP UInt32,  ClientIP6 FixedString(16),  RegionID UInt32,  UserID UInt64,  CounterClass Int8,  OS UInt8,  UserAgent UInt8,  URL String,  Referer String,  URLDomain String,  RefererDomain String,  Refresh UInt8,  IsRobot UInt8,  RefererCategories Array(UInt16),  URLCategories Array(UInt16),  URLRegions Array(UInt32),  RefererRegions Array(UInt32),  ResolutionWidth UInt16,  ResolutionHeight UInt16,  ResolutionDepth UInt8,  FlashMajor UInt8,  FlashMinor UInt8,  FlashMinor2 String,  NetMajor UInt8,  NetMinor UInt8,  UserAgentMajor UInt16,  UserAgentMinor FixedString(2),  CookieEnable UInt8,  JavascriptEnable UInt8,  IsMobile UInt8,  MobilePhone UInt8,  MobilePhoneModel String,  Params String,  IPNetworkID UInt32,  TraficSourceID Int8,  SearchEngineID UInt16,  SearchPhrase String,  AdvEngineID UInt8,  IsArtifical UInt8,  WindowClientWidth UInt16,  WindowClientHeight UInt16,  ClientTimeZone Int16,  ClientEventTime DateTime,  SilverlightVersion1 UInt8,  SilverlightVersion2 UInt8,  SilverlightVersion3 UInt32,  SilverlightVersion4 UInt16,  PageCharset String,  CodeVersion UInt32,  IsLink UInt8,  IsDownload UInt8,  IsNotBounce UInt8,  FUniqID UInt64,  HID UInt32,  IsOldCounter UInt8,  IsEvent UInt8,  IsParameter UInt8,  DontCountHits UInt8,  WithHash UInt8,  HitColor FixedString(1),  UTCEventTime DateTime,  Age UInt8,  Sex UInt8,  Income UInt8,  Interests UInt16,  Robotness UInt8,  GeneralInterests Array(UInt16),  RemoteIP UInt32,  RemoteIP6 FixedString(16),  WindowName Int32,  OpenerName Int32,  HistoryLength Int16,  BrowserLanguage FixedString(2),  BrowserCountry FixedString(2),  SocialNetwork String,  SocialAction String,  HTTPError UInt16,  SendTiming Int32,  DNSTiming Int32,  ConnectTiming Int32,  ResponseStartTiming Int32,  ResponseEndTiming Int32,  FetchTiming Int32,  RedirectTiming Int32,  DOMInteractiveTiming Int32,  DOMContentLoadedTiming Int32,  DOMCompleteTiming Int32,  LoadEventStartTiming Int32,  LoadEventEndTiming Int32,  NSToDOMContentLoadedTiming Int32,  FirstPaintTiming Int32,  RedirectCount Int8,  SocialSourceNetworkID UInt8,  SocialSourcePage String,  ParamPrice Int64,  ParamOrderID String,  ParamCurrency FixedString(3),  ParamCurrencyID UInt16,  GoalsReached Array(UInt32),  OpenstatServiceName String,  OpenstatCampaignID String,  OpenstatAdID String,  OpenstatSourceID String,  UTMSource String,  UTMMedium String,  UTMCampaign String,  UTMContent String,  UTMTerm String,  FromTag String,  HasGCLID UInt8,  RefererHash UInt64,  URLHash UInt64,  CLID UInt32,  YCLID UInt64,  ShareService String,  ShareURL String,  ShareTitle String,  `ParsedParams.Key1` Array(String),  `ParsedParams.Key2` Array(String),  `ParsedParams.Key3` Array(String),  `ParsedParams.Key4` Array(String),  `ParsedParams.Key5` Array(String),  `ParsedParams.ValueDouble` Array(Float64),  IslandID FixedString(16),  RequestNum UInt32,  RequestTry UInt8) ENGINE = MergeTree PARTITION BY toYYYYMM(EventDate) SAMPLE BY intHash32(UserID) ORDER BY (CounterID, EventDate, intHash32(UserID), EventTime);
-
-    CREATE TABLE test.visits ( CounterID UInt32,  StartDate Date,  Sign Int8,  IsNew UInt8,  VisitID UInt64,  UserID UInt64,  StartTime DateTime,  Duration UInt32,  UTCStartTime DateTime,  PageViews Int32,  Hits Int32,  IsBounce UInt8,  Referer String,  StartURL String,  RefererDomain String,  StartURLDomain String,  EndURL String,  LinkURL String,  IsDownload UInt8,  TraficSourceID Int8,  SearchEngineID UInt16,  SearchPhrase String,  AdvEngineID UInt8,  PlaceID Int32,  RefererCategories Array(UInt16),  URLCategories Array(UInt16),  URLRegions Array(UInt32),  RefererRegions Array(UInt32),  IsYandex UInt8,  GoalReachesDepth Int32,  GoalReachesURL Int32,  GoalReachesAny Int32,  SocialSourceNetworkID UInt8,  SocialSourcePage String,  MobilePhoneModel String,  ClientEventTime DateTime,  RegionID UInt32,  ClientIP UInt32,  ClientIP6 FixedString(16),  RemoteIP UInt32,  RemoteIP6 FixedString(16),  IPNetworkID UInt32,  SilverlightVersion3 UInt32,  CodeVersion UInt32,  ResolutionWidth UInt16,  ResolutionHeight UInt16,  UserAgentMajor UInt16,  UserAgentMinor UInt16,  WindowClientWidth UInt16,  WindowClientHeight UInt16,  SilverlightVersion2 UInt8,  SilverlightVersion4 UInt16,  FlashVersion3 UInt16,  FlashVersion4 UInt16,  ClientTimeZone Int16,  OS UInt8,  UserAgent UInt8,  ResolutionDepth UInt8,  FlashMajor UInt8,  FlashMinor UInt8,  NetMajor UInt8,  NetMinor UInt8,  MobilePhone UInt8,  SilverlightVersion1 UInt8,  Age UInt8,  Sex UInt8,  Income UInt8,  JavaEnable UInt8,  CookieEnable UInt8,  JavascriptEnable UInt8,  IsMobile UInt8,  BrowserLanguage UInt16,  BrowserCountry UInt16,  Interests UInt16,  Robotness UInt8,  GeneralInterests Array(UInt16),  Params Array(String),  `Goals.ID` Array(UInt32),  `Goals.Serial` Array(UInt32),  `Goals.EventTime` Array(DateTime),  `Goals.Price` Array(Int64),  `Goals.OrderID` Array(String),  `Goals.CurrencyID` Array(UInt32),  WatchIDs Array(UInt64),  ParamSumPrice Int64,  ParamCurrency FixedString(3),  ParamCurrencyID UInt16,  ClickLogID UInt64,  ClickEventID Int32,  ClickGoodEvent Int32,  ClickEventTime DateTime,  ClickPriorityID Int32,  ClickPhraseID Int32,  ClickPageID Int32,  ClickPlaceID Int32,  ClickTypeID Int32,  ClickResourceID Int32,  ClickCost UInt32,  ClickClientIP UInt32,  ClickDomainID UInt32,  ClickURL String,  ClickAttempt UInt8,  ClickOrderID UInt32,  ClickBannerID UInt32,  ClickMarketCategoryID UInt32,  ClickMarketPP UInt32,  ClickMarketCategoryName String,  ClickMarketPPName String,  ClickAWAPSCampaignName String,  ClickPageName String,  ClickTargetType UInt16,  ClickTargetPhraseID UInt64,  ClickContextType UInt8,  ClickSelectType Int8,  ClickOptions String,  ClickGroupBannerID Int32,  OpenstatServiceName String,  OpenstatCampaignID String,  OpenstatAdID String,  OpenstatSourceID String,  UTMSource String,  UTMMedium String,  UTMCampaign String,  UTMContent String,  UTMTerm String,  FromTag String,  HasGCLID UInt8,  FirstVisit DateTime,  PredLastVisit Date,  LastVisit Date,  TotalVisits UInt32,  `TraficSource.ID` Array(Int8),  `TraficSource.SearchEngineID` Array(UInt16),  `TraficSource.AdvEngineID` Array(UInt8),  `TraficSource.PlaceID` Array(UInt16),  `TraficSource.SocialSourceNetworkID` Array(UInt8),  `TraficSource.Domain` Array(String),  `TraficSource.SearchPhrase` Array(String),  `TraficSource.SocialSourcePage` Array(String),  Attendance FixedString(16),  CLID UInt32,  YCLID UInt64,  NormalizedRefererHash UInt64,  SearchPhraseHash UInt64,  RefererDomainHash UInt64,  NormalizedStartURLHash UInt64,  StartURLDomainHash UInt64,  NormalizedEndURLHash UInt64,  TopLevelDomain UInt64,  URLScheme UInt64,  OpenstatServiceNameHash UInt64,  OpenstatCampaignIDHash UInt64,  OpenstatAdIDHash UInt64,  OpenstatSourceIDHash UInt64,  UTMSourceHash UInt64,  UTMMediumHash UInt64,  UTMCampaignHash UInt64,  UTMContentHash UInt64,  UTMTermHash UInt64,  FromHash UInt64,  WebVisorEnabled UInt8,  WebVisorActivity UInt32,  `ParsedParams.Key1` Array(String),  `ParsedParams.Key2` Array(String),  `ParsedParams.Key3` Array(String),  `ParsedParams.Key4` Array(String),  `ParsedParams.Key5` Array(String),  `ParsedParams.ValueDouble` Array(Float64),  `Market.Type` Array(UInt8),  `Market.GoalID` Array(UInt32),  `Market.OrderID` Array(String),  `Market.OrderPrice` Array(Int64),  `Market.PP` Array(UInt32),  `Market.DirectPlaceID` Array(UInt32),  `Market.DirectOrderID` Array(UInt32),  `Market.DirectBannerID` Array(UInt32),  `Market.GoodID` Array(String),  `Market.GoodName` Array(String),  `Market.GoodQuantity` Array(Int32),  `Market.GoodPrice` Array(Int64),  IslandID FixedString(16)) ENGINE = CollapsingMergeTree(Sign) PARTITION BY toYYYYMM(StartDate) SAMPLE BY intHash32(UserID) ORDER BY (CounterID, StartDate, intHash32(UserID), VisitID);
-
-    clickhouse-client --max_insert_block_size 100000 --query "INSERT INTO test.hits FORMAT TSV" < hits_v1.tsv
-    clickhouse-client --max_insert_block_size 100000 --query "INSERT INTO test.visits FORMAT TSV" < visits_v1.tsv
-
-# La Création De Pull Request {#creating-pull-request}
-
-Accédez à votre référentiel fork dans L'interface utilisateur de GitHub. Si vous avez développé dans une branche, vous devez sélectionner cette branche. Il y aura un “Pull request” bouton situé sur l'écran. En substance, cela signifie “create a request for accepting my changes into the main repository”.
-
-Une demande d'extraction peuvent être créés, même si le travail n'est pas encore terminée. Dans ce cas veuillez mettre le mot “WIP” (travaux en cours) au début du titre, il peut être modifié plus tard. Ceci est utile pour l'examen coopératif et la discussion des changements ainsi que pour l'exécution de tous les tests disponibles. Il est important que vous fournissiez une brève description de vos modifications, il sera ensuite utilisé pour générer des journaux de modifications de version.
-
-Les tests commenceront dès que les employés de Yandex étiqueteront votre PR avec une étiquette “can be tested”. The results of some first checks (e.g. code style) will come in within several minutes. Build check results will arrive within half an hour. And the main set of tests will report itself within an hour.
-
-Le système préparera les builds binaires ClickHouse pour votre demande de tirage individuellement. Pour récupérer ces versions cliquez sur le “Details” lien à côté “ClickHouse build check” entrée dans la liste de vérifications. Vous y trouverez des liens directs vers les construit .paquets deb de ClickHouse que vous pouvez déployer même sur vos serveurs de production (si vous n'avez pas peur).
-
-Très probablement, certaines des constructions échoueront à la première fois. Cela est dû au fait que nous avons vérifier s'appuie à la fois avec gcc, ainsi qu'avec clang, pratiquement tous les avertissements existants (toujours avec le `-Werror` drapeau) activé pour clang. Sur cette même page, vous pouvez trouver tous les journaux de construction afin que vous n'ayez pas à construire ClickHouse de toutes les manières possibles.
diff --git a/docs/fr/development/index.md b/docs/fr/development/index.md
deleted file mode 100644
index 6a6dbe34dda..00000000000
--- a/docs/fr/development/index.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: "D\xE9veloppement"
-toc_hidden: true
-toc_priority: 58
-toc_title: "cach\xE9s"
----
-
-# Développement De ClickHouse {#clickhouse-development}
-
-[Article Original](https://clickhouse.tech/docs/en/development/) <!--hide-->
diff --git a/docs/fr/development/style.md b/docs/fr/development/style.md
deleted file mode 100644
index ad3b470f7b4..00000000000
--- a/docs/fr/development/style.md
+++ /dev/null
@@ -1,841 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 68
-toc_title: "Comment \xE9crire du Code C++ "
----
-
-# Comment écrire du Code C++  {#how-to-write-c-code}
-
-## Recommandations Générales {#general-recommendations}
-
-**1.** Ce qui suit sont des recommandations, pas des exigences.
-
-**2.** Si vous modifiez du code, il est logique de suivre le formatage du code existant.
-
-**3.** Le style de Code est nécessaire pour la cohérence. La cohérence facilite la lecture du code et facilite également la recherche du code.
-
-**4.** Beaucoup de règles n'ont pas de raisons logiques; elles sont dictées par des pratiques établies.
-
-## Formater {#formatting}
-
-**1.** La plupart du formatage se fera automatiquement par `clang-format`.
-
-**2.** Les tirets sont 4 espaces. Configurez votre environnement de développement afin qu'un onglet ajoute quatre espaces.
-
-**3.** Les crochets d'ouverture et de fermeture doivent être sur une ligne séparée.
-
-``` cpp
-inline void readBoolText(bool & x, ReadBuffer & buf)
-{
-    char tmp = '0';
-    readChar(tmp, buf);
-    x = tmp != '0';
-}
-```
-
-**4.** Si le corps entier de la fonction est un `statement` il peut donc être placé sur une seule ligne. Place des espaces autour des accolades (en plus de l'espace à la fin de la ligne).
-
-``` cpp
-inline size_t mask() const                { return buf_size() - 1; }
-inline size_t place(HashValue x) const    { return x & mask(); }
-```
-
-**5.** Pour les fonctions. Ne mettez pas d'espaces entre parenthèses.
-
-``` cpp
-void reinsert(const Value & x)
-```
-
-``` cpp
-memcpy(&buf[place_value], &x, sizeof(x));
-```
-
-**6.** Dans `if`, `for`, `while` et d'autres expressions, un espace est inséré devant le support d'ouverture (par opposition aux appels de fonction).
-
-``` cpp
-for (size_t i = 0; i < rows; i += storage.index_granularity)
-```
-
-**7.** Ajouter des espaces autour des opérateurs binaires (`+`, `-`, `*`, `/`, `%`, …) and the ternary operator `?:`.
-
-``` cpp
-UInt16 year = (s[0] - '0') * 1000 + (s[1] - '0') * 100 + (s[2] - '0') * 10 + (s[3] - '0');
-UInt8 month = (s[5] - '0') * 10 + (s[6] - '0');
-UInt8 day = (s[8] - '0') * 10 + (s[9] - '0');
-```
-
-**8.** Si un saut de ligne est entré, placez l'opérateur sur une nouvelle ligne et augmentez le retrait avant.
-
-``` cpp
-if (elapsed_ns)
-    message << " ("
-        << rows_read_on_server * 1000000000 / elapsed_ns << " rows/s., "
-        << bytes_read_on_server * 1000.0 / elapsed_ns << " MB/s.) ";
-```
-
-**9.** Vous pouvez utiliser des espaces pour l'alignement dans une ligne, si vous le souhaitez.
-
-``` cpp
-dst.ClickLogID         = click.LogID;
-dst.ClickEventID       = click.EventID;
-dst.ClickGoodEvent     = click.GoodEvent;
-```
-
-**10.** N'utilisez pas d'espaces autour des opérateurs `.`, `->`.
-
-Si nécessaire, l'opérateur peut être renvoyé à la ligne suivante. Dans ce cas, le décalage devant celui-ci est augmenté.
-
-**11.** N'utilisez pas d'espace pour séparer les opérateurs unaires (`--`, `++`, `*`, `&`, …) from the argument.
-
-**12.** Mettre un espace après une virgule, mais pas avant. La même règle vaut pour un point-virgule à l'intérieur d'un `for` expression.
-
-**13.** Ne pas utiliser des espaces pour séparer les `[]` opérateur.
-
-**14.** Dans un `template <...>` expression, utiliser un espace entre les `template` et `<`; pas d'espace après `<` ou avant `>`.
-
-``` cpp
-template <typename TKey, typename TValue>
-struct AggregatedStatElement
-{}
-```
-
-**15.** Dans les classes et les structures, écrivez `public`, `private`, et `protected` sur le même niveau que `class/struct` et tiret le reste du code.
-
-``` cpp
-template <typename T>
-class MultiVersion
-{
-public:
-    /// Version of object for usage. shared_ptr manage lifetime of version.
-    using Version = std::shared_ptr<const T>;
-    ...
-}
-```
-
-**16.** Si le même `namespace` est utilisé pour l'ensemble du fichier, et il n'y a rien d'autre significatif, un décalage n'est pas nécessaire à l'intérieur `namespace`.
-
-**17.** Si le bloc pour un `if`, `for`, `while` ou autres expressions se compose d'un seul `statement`, les accolades sont facultatives. Place de la `statement` sur une ligne séparée, à la place. Cette règle est également valable pour les imbriqués `if`, `for`, `while`, …
-
-Mais si l'intérieur `statement` contient des accolades ou `else` le bloc externe doit être écrit dans les accolades.
-
-``` cpp
-/// Finish write.
-for (auto & stream : streams)
-    stream.second->finalize();
-```
-
-**18.** Il ne devrait pas y avoir d'espaces aux extrémités des lignes.
-
-**19.** Les fichiers Source sont encodés en UTF-8.
-
-**20.** Les caractères non-ASCII peuvent être utilisés dans les littéraux de chaîne.
-
-``` cpp
-<< ", " << (timer.elapsed() / chunks_stats.hits) << " μsec/hit.";
-```
-
-**21.** N'écrivez pas plusieurs expressions sur une seule ligne.
-
-**22.** Groupez les sections de code à l'intérieur des fonctions et séparez-les avec pas plus d'une ligne vide.
-
-**23.** Séparez les fonctions, les classes, etc. avec une ou deux lignes vides.
-
-**24.** `A const` (liés à une valeur) doit être écrit avant le nom du type.
-
-``` cpp
-//correct
-const char * pos
-const std::string & s
-//incorrect
-char const * pos
-```
-
-**25.** Lors de la déclaration d'un pointeur ou d'une référence, le `*` et `&` les symboles doivent être séparés par des espaces des deux côtés.
-
-``` cpp
-//correct
-const char * pos
-//incorrect
-const char* pos
-const char *pos
-```
-
-**26.** Lors de l'utilisation de types de modèles, les alias avec le `using` mot-clé (sauf dans les cas les plus simples).
-
-En d'autres termes, les paramètres du modèle sont indiquées que dans `using` et ne sont pas répétés dans le code.
-
-`using` peut être déclaré localement, comme dans une fonction.
-
-``` cpp
-//correct
-using FileStreams = std::map<std::string, std::shared_ptr<Stream>>;
-FileStreams streams;
-//incorrect
-std::map<std::string, std::shared_ptr<Stream>> streams;
-```
-
-**27.** Ne déclarez pas plusieurs variables de types différents dans une instruction.
-
-``` cpp
-//incorrect
-int x, *y;
-```
-
-**28.** N'utilisez pas de moulages de style C.
-
-``` cpp
-//incorrect
-std::cerr << (int)c <<; std::endl;
-//correct
-std::cerr << static_cast<int>(c) << std::endl;
-```
-
-**29.** Dans les classes et les structures, groupez les membres et les fonctions séparément dans chaque portée de visibilité.
-
-**30.** Pour les petites classes et structures, il n'est pas nécessaire de séparer la déclaration de méthode de l'implémentation.
-
-La même chose est vraie pour les petites méthodes dans toutes les classes ou structures.
-
-Pour les classes et les structures modélisées, ne séparez pas les déclarations de méthode de l'implémentation (car sinon elles doivent être définies dans la même unité de traduction).
-
-**31.** Vous pouvez envelopper des lignes à 140 caractères, au lieu de 80.
-
-**32.** Utilisez toujours les opérateurs d'incrémentation/décrémentation de préfixe si postfix n'est pas requis.
-
-``` cpp
-for (Names::const_iterator it = column_names.begin(); it != column_names.end(); ++it)
-```
-
-## Commentaire {#comments}
-
-**1.** Assurez-vous d'ajouter des commentaires pour toutes les parties non triviales du code.
-
-C'est très important. Écrit le commentaire peut vous aider à réaliser que le code n'est pas nécessaire, ou qu'il est mal conçu.
-
-``` cpp
-/** Part of piece of memory, that can be used.
-  * For example, if internal_buffer is 1MB, and there was only 10 bytes loaded to buffer from file for reading,
-  * then working_buffer will have size of only 10 bytes
-  * (working_buffer.end() will point to position right after those 10 bytes available for read).
-  */
-```
-
-**2.** Les commentaires peuvent être aussi détaillées que nécessaire.
-
-**3.** Placez les commentaires avant le code qu'ils décrivent. Dans de rares cas, des commentaires peuvent venir après le code, sur la même ligne.
-
-``` cpp
-/** Parses and executes the query.
-*/
-void executeQuery(
-    ReadBuffer & istr, /// Where to read the query from (and data for INSERT, if applicable)
-    WriteBuffer & ostr, /// Where to write the result
-    Context & context, /// DB, tables, data types, engines, functions, aggregate functions...
-    BlockInputStreamPtr & query_plan, /// Here could be written the description on how query was executed
-    QueryProcessingStage::Enum stage = QueryProcessingStage::Complete /// Up to which stage process the SELECT query
-    )
-```
-
-**4.** Les commentaires doivent être rédigés en anglais seulement.
-
-**5.** Si vous écrivez une bibliothèque, incluez des commentaires détaillés l'expliquant dans le fichier d'en-tête principal.
-
-**6.** N'ajoutez pas de commentaires qui ne fournissent pas d'informations supplémentaires. En particulier, ne laissez pas de commentaires vides comme celui-ci:
-
-``` cpp
-/*
-* Procedure Name:
-* Original procedure name:
-* Author:
-* Date of creation:
-* Dates of modification:
-* Modification authors:
-* Original file name:
-* Purpose:
-* Intent:
-* Designation:
-* Classes used:
-* Constants:
-* Local variables:
-* Parameters:
-* Date of creation:
-* Purpose:
-*/
-```
-
-L'exemple est emprunté à partir de la ressource http://home.tamk.fi/~jaalto/cours/coding-style/doc/désuète-code/.
-
-**7.** Ne pas écrire des commentaires de déchets (auteur, date de création .. au début de chaque fichier.
-
-**8.** Les commentaires sur une seule ligne commencent par trois barres obliques: `///` et les commentaires multi-lignes commencer avec `/**`. Ces commentaires sont pris en considération “documentation”.
-
-REMARQUE: Vous pouvez utiliser Doxygen pour générer de la documentation à partir de ces commentaires. Mais Doxygen n'est généralement pas utilisé car il est plus pratique de naviguer dans le code dans L'IDE.
-
-**9.** Les commentaires multilignes ne doivent pas avoir de lignes vides au début et à la fin (sauf la ligne qui ferme un commentaire multilignes).
-
-**10.** Pour commenter le code, utilisez des commentaires de base, pas “documenting” commentaire.
-
-**11.** Supprimez les parties commentées du code avant de valider.
-
-**12.** N'utilisez pas de blasphème dans les commentaires ou le code.
-
-**13.** N'utilisez pas de majuscules. N'utilisez pas de ponctuation excessive.
-
-``` cpp
-/// WHAT THE FAIL???
-```
-
-**14.** N'utilisez pas de commentaires pour créer des délimiteurs.
-
-``` cpp
-///******************************************************
-```
-
-**15.** Ne commencez pas les discussions dans les commentaires.
-
-``` cpp
-/// Why did you do this stuff?
-```
-
-**16.** Il n'est pas nécessaire d'écrire un commentaire à la fin d'un bloc décrivant de quoi il s'agissait.
-
-``` cpp
-/// for
-```
-
-## Nom {#names}
-
-**1.** Utilisez des lettres minuscules avec des traits de soulignement dans les noms des variables et des membres de la classe.
-
-``` cpp
-size_t max_block_size;
-```
-
-**2.** Pour les noms de fonctions (méthodes), utilisez camelCase commençant par une lettre minuscule.
-
-``` cpp
-std::string getName() const override { return "Memory"; }
-```
-
-**3.** Pour les noms de classes (structures), utilisez CamelCase commençant par une lettre majuscule. Les préfixes autres que I ne sont pas utilisés pour les interfaces.
-
-``` cpp
-class StorageMemory : public IStorage
-```
-
-**4.** `using` sont nommées de la même manière que les classes, ou avec `_t` sur la fin.
-
-**5.** Noms des arguments de type de modèle: dans les cas simples, utilisez `T`; `T`, `U`; `T1`, `T2`.
-
-Pour les cas plus complexes, suivez les règles pour les noms de classe ou ajoutez le préfixe `T`.
-
-``` cpp
-template <typename TKey, typename TValue>
-struct AggregatedStatElement
-```
-
-**6.** Noms des arguments constants du modèle: suivez les règles pour les noms de variables ou utilisez `N` dans les cas simples.
-
-``` cpp
-template <bool without_www>
-struct ExtractDomain
-```
-
-**7.** Pour les classes abstraites (interfaces), vous pouvez ajouter `I` préfixe.
-
-``` cpp
-class IBlockInputStream
-```
-
-**8.** Si vous utilisez une variable localement, vous pouvez utiliser le nom court.
-
-Dans tous les autres cas, utilisez un nom qui décrit la signification.
-
-``` cpp
-bool info_successfully_loaded = false;
-```
-
-**9.** Les noms de `define`les constantes s et globales utilisent ALL_CAPS avec des traits de soulignement.
-
-``` cpp
-#define MAX_SRC_TABLE_NAMES_TO_STORE 1000
-```
-
-**10.** Les noms de fichiers doivent utiliser le même style que leur contenu.
-
-Si un fichier contient une seule classe, nommez-le de la même manière que la classe (CamelCase).
-
-Si le fichier contient une seule fonction, nommez le fichier de la même manière que la fonction (camelCase).
-
-**11.** Si le nom contient une abréviation, puis:
-
--   Pour les noms de variables, l'abréviation doit utiliser des lettres minuscules `mysql_connection` (pas `mySQL_connection`).
--   Pour les noms de classes et de fonctions, conservez les majuscules dans l'abréviation`MySQLConnection` (pas `MySqlConnection`).
-
-**12.** Les arguments du constructeur utilisés uniquement pour initialiser les membres de la classe doivent être nommés de la même manière que les membres de la classe, mais avec un trait de soulignement à la fin.
-
-``` cpp
-FileQueueProcessor(
-    const std::string & path_,
-    const std::string & prefix_,
-    std::shared_ptr<FileHandler> handler_)
-    : path(path_),
-    prefix(prefix_),
-    handler(handler_),
-    log(&Logger::get("FileQueueProcessor"))
-{
-}
-```
-
-Le suffixe de soulignement peut être omis si l'argument n'est pas utilisé dans le corps du constructeur.
-
-**13.** Il n'y a pas de différence dans les noms des variables locales et des membres de classe (aucun préfixe requis).
-
-``` cpp
-timer (not m_timer)
-```
-
-**14.** Pour les constantes dans un `enum`, utilisez CamelCase avec une lettre majuscule. ALL_CAPS est également acceptable. Si l' `enum` est non local, utilisez un `enum class`.
-
-``` cpp
-enum class CompressionMethod
-{
-    QuickLZ = 0,
-    LZ4     = 1,
-};
-```
-
-**15.** Tous les noms doivent être en anglais. La translittération des mots russes n'est pas autorisé.
-
-    not Stroka
-
-**16.** Les abréviations sont acceptables si elles sont bien connues (quand vous pouvez facilement trouver la signification de l'abréviation dans Wikipédia ou dans un moteur de recherche).
-
-    `AST`, `SQL`.
-
-    Not `NVDH` (some random letters)
-
-Les mots incomplets sont acceptables si la version abrégée est d'usage courant.
-
-Vous pouvez également utiliser une abréviation si le nom complet est ensuite incluse dans les commentaires.
-
-**17.** Les noms de fichiers avec le code source C++ doivent avoir `.cpp` extension. Fichiers d'en-tête doit avoir la `.h` extension.
-
-## Comment écrire du Code {#how-to-write-code}
-
-**1.** Gestion de la mémoire.
-
-Désallocation manuelle de la mémoire (`delete`) ne peut être utilisé que dans le code de la bibliothèque.
-
-Dans le code de la bibliothèque, de la `delete` l'opérateur ne peut être utilisé dans des destructeurs.
-
-Dans le code de l'application, la mémoire doit être libérée par l'objet qui la possède.
-
-Exemple:
-
--   Le plus simple est de placer un objet sur la pile, ou d'en faire un membre d'une autre classe.
--   Pour un grand nombre de petits objets, utiliser des récipients.
--   Pour la désallocation automatique d'un petit nombre d'objets qui résident dans le tas, utilisez `shared_ptr/unique_ptr`.
-
-**2.** La gestion des ressources.
-
-Utiliser `RAII` et voir ci-dessus.
-
-**3.** La gestion des erreurs.
-
-Utilisez des exceptions. Dans la plupart des cas, vous avez seulement besoin de lancer une exception, et n'avez pas besoin de l'attraper (à cause de `RAII`).
-
-Dans les applications de traitement de données hors ligne, il est souvent acceptable de ne pas attraper d'exceptions.
-
-Dans les serveurs qui gèrent les demandes des utilisateurs, il suffit généralement d'attraper des exceptions au niveau supérieur du gestionnaire de connexion.
-
-Dans les fonctions de thread, vous devez attraper et conserver toutes les exceptions pour les repasser dans le thread principal après `join`.
-
-``` cpp
-/// If there weren't any calculations yet, calculate the first block synchronously
-if (!started)
-{
-    calculate();
-    started = true;
-}
-else /// If calculations are already in progress, wait for the result
-    pool.wait();
-
-if (exception)
-    exception->rethrow();
-```
-
-Ne cachez jamais les exceptions sans les manipuler. Ne mettez jamais aveuglément toutes les exceptions au journal.
-
-``` cpp
-//Not correct
-catch (...) {}
-```
-
-Si vous devez ignorer certaines exceptions, ne le faites que pour des exceptions spécifiques et repensez le reste.
-
-``` cpp
-catch (const DB::Exception & e)
-{
-    if (e.code() == ErrorCodes::UNKNOWN_AGGREGATE_FUNCTION)
-        return nullptr;
-    else
-        throw;
-}
-```
-
-Lorsque vous utilisez des fonctions avec des codes de réponse ou `errno` toujours vérifier le résultat et de lever une exception en cas d'erreur.
-
-``` cpp
-if (0 != close(fd))
-    throwFromErrno("Cannot close file " + file_name, ErrorCodes::CANNOT_CLOSE_FILE);
-```
-
-`Do not use assert`.
-
-**4.** Les types d'Exception.
-
-Il n'est pas nécessaire d'utiliser une hiérarchie d'exceptions complexe dans le code de l'application. Le texte d'exception doit être compréhensible pour un administrateur système.
-
-**5.** Lancer des exceptions de destructeurs.
-
-Ce n'est pas recommandé, mais il est permis.
-
-Utilisez les options suivantes:
-
--   Créer une fonction (`done()` ou `finalize()`) qui vont faire tout le travail en amont qui pourrait conduire à une exception. Si cette fonction a été appelée, il ne devrait y avoir aucune exception dans le destructeur plus tard.
--   Les tâches trop complexes (comme l'envoi de messages sur le réseau) peuvent être placées dans une méthode distincte que l'utilisateur de la classe devra appeler avant la destruction.
--   Si il y a une exception dans le destructeur, il est préférable de l'enregistrer que de le cacher (si l'enregistreur est disponible).
--   Dans les applications simples, il est acceptable de compter sur `std::terminate` (pour les cas de `noexcept` par défaut en C++11) pour gérer les exceptions.
-
-**6.** Blocs de code anonymes.
-
-Vous pouvez créer un bloc de code séparé à l'intérieur d'une seule fonction afin de rendre certaines variables locales, de sorte que les destructeurs sont appelés à la sortie du bloc.
-
-``` cpp
-Block block = data.in->read();
-
-{
-    std::lock_guard<std::mutex> lock(mutex);
-    data.ready = true;
-    data.block = block;
-}
-
-ready_any.set();
-```
-
-**7.** Multithreading.
-
-Dans les programmes de traitement de données hors ligne:
-
--   Essayez d'obtenir les meilleures performances possibles sur un seul noyau CPU. Vous pouvez ensuite paralléliser votre code si nécessaire.
-
-Dans les applications serveur:
-
--   Utiliser le pool de threads pour traiter les demandes. À ce stade, nous n'avons pas eu de tâches nécessitant un changement de contexte dans l'espace utilisateur.
-
-La fourche n'est pas utilisé pour la parallélisation.
-
-**8.** Synchronisation des threads.
-
-Souvent, il est possible de faire en sorte que différents threads utilisent différentes cellules de mémoire (encore mieux: différentes lignes de cache,) et de ne pas utiliser de synchronisation de thread (sauf `joinAll`).
-
-Si la synchronisation est nécessaire, dans la plupart des cas, il suffit d'utiliser mutex sous `lock_guard`.
-
-Dans d'autres cas, utilisez des primitives de synchronisation système. Ne pas utiliser occupé attendre.
-
-Les opérations atomiques ne doivent être utilisées que dans les cas les plus simples.
-
-N'essayez pas d'implémenter des structures de données sans verrou à moins qu'il ne s'agisse de votre principal domaine d'expertise.
-
-**9.** Pointeurs vs références.
-
-Dans la plupart des cas, préférez les références.
-
-**10.** const.
-
-Utiliser des références constantes, des pointeurs vers des constantes, `const_iterator` et const méthodes.
-
-Considérer `const` pour être par défaut et utiliser non-`const` seulement quand c'est nécessaire.
-
-Lors du passage de variables par valeur, en utilisant `const` habituellement ne fait pas de sens.
-
-**11.** non signé.
-
-Utiliser `unsigned` si nécessaire.
-
-**12.** Les types numériques.
-
-Utiliser les types `UInt8`, `UInt16`, `UInt32`, `UInt64`, `Int8`, `Int16`, `Int32`, et `Int64` ainsi que `size_t`, `ssize_t`, et `ptrdiff_t`.
-
-N'utilisez pas ces types pour les nombres: `signed/unsigned long`, `long long`, `short`, `signed/unsigned char`, `char`.
-
-**13.** Passer des arguments.
-
-Passer des valeurs complexes par référence (y compris `std::string`).
-
-Si une fonction capture la propriété d'un objet créé dans le tas, définissez le type d'argument `shared_ptr` ou `unique_ptr`.
-
-**14.** Les valeurs de retour.
-
-Dans la plupart des cas, il suffit d'utiliser `return`. Ne pas écrire `return std::move(res)`.
-
-Si la fonction alloue un objet sur le tas et le renvoie, utilisez `shared_ptr` ou `unique_ptr`.
-
-Dans de rares cas, vous devrez peut-être renvoyer la valeur via un argument. Dans ce cas, l'argument doit être une référence.
-
-``` cpp
-using AggregateFunctionPtr = std::shared_ptr<IAggregateFunction>;
-
-/** Allows creating an aggregate function by its name.
-  */
-class AggregateFunctionFactory
-{
-public:
-    AggregateFunctionFactory();
-    AggregateFunctionPtr get(const String & name, const DataTypes & argument_types) const;
-```
-
-**15.** espace de noms.
-
-Il n'est pas nécessaire d'utiliser une `namespace` pour le code de l'application.
-
-Les petites bibliothèques n'ont pas besoin de cela non plus.
-
-Pour les bibliothèques moyennes et grandes, mettez tout dans un `namespace`.
-
-Dans la bibliothèque `.h` fichier, vous pouvez utiliser `namespace detail` pour masquer les détails d'implémentation non nécessaires pour le code de l'application.
-
-Dans un `.cpp` fichier, vous pouvez utiliser un `static` ou un espace de noms anonyme pour masquer les symboles.
-
-Aussi, un `namespace` peut être utilisé pour un `enum` pour éviter que les noms correspondants ne tombent dans un `namespace` (mais il est préférable d'utiliser un `enum class`).
-
-**16.** Initialisation différée.
-
-Si des arguments sont requis pour l'initialisation, vous ne devriez normalement pas écrire de constructeur par défaut.
-
-Si plus tard, vous devez retarder l'initialisation, vous pouvez ajouter un constructeur par défaut qui créera un objet invalide. Ou, pour un petit nombre d'objets, vous pouvez utiliser `shared_ptr/unique_ptr`.
-
-``` cpp
-Loader(DB::Connection * connection_, const std::string & query, size_t max_block_size_);
-
-/// For deferred initialization
-Loader() {}
-```
-
-**17.** Des fonctions virtuelles.
-
-Si la classe n'est pas destinée à une utilisation polymorphe, vous n'avez pas besoin de rendre les fonctions virtuelles. Ceci s'applique également pour le destructeur.
-
-**18.** Encodage.
-
-Utilisez UTF-8 partout. Utiliser `std::string`et`char *`. Ne pas utiliser de `std::wstring`et`wchar_t`.
-
-**19.** Journalisation.
-
-Voir les exemples partout dans le code.
-
-Avant de valider, supprimez toute journalisation sans signification et de débogage, ainsi que tout autre type de sortie de débogage.
-
-L'enregistrement des cycles doit être évité, même au niveau de la Trace.
-
-Les journaux doivent être lisibles à tout niveau d'enregistrement.
-
-La journalisation ne doit être utilisée que dans le code de l'application, pour la plupart.
-
-Les messages du journal doivent être écrits en anglais.
-
-Le journal devrait de préférence être compréhensible pour l'administrateur système.
-
-N'utilisez pas de blasphème dans le journal.
-
-Utilisez L'encodage UTF-8 dans le journal. Dans de rares cas, vous pouvez utiliser des caractères non-ASCII dans le journal.
-
-**20.** D'entrée-sortie.
-
-Ne pas utiliser de `iostreams` dans les cycles internes qui sont critiques pour les performances de l'application (et ne jamais utiliser `stringstream`).
-
-L'utilisation de la `DB/IO` la bibliothèque la place.
-
-**21.** La Date et l'heure.
-
-Voir la `DateLUT` bibliothèque.
-
-**22.** comprendre.
-
-Toujours utiliser `#pragma once` au lieu d'inclure des gardes.
-
-**23.** utiliser.
-
-`using namespace` n'est pas utilisé. Vous pouvez utiliser `using` avec quelque chose de spécifique. Mais faire local à l'intérieur d'une classe ou d'une fonction.
-
-**24.** Ne pas utiliser de `trailing return type` pour les fonctions, sauf si nécessaire.
-
-``` cpp
-auto f() -> void
-```
-
-**25.** Déclaration et initialisation des variables.
-
-``` cpp
-//right way
-std::string s = "Hello";
-std::string s{"Hello"};
-
-//wrong way
-auto s = std::string{"Hello"};
-```
-
-**26.** Pour les fonctions virtuelles, écrire `virtual` dans la classe de base, mais d'écrire `override` plutôt `virtual` dans les classes descendantes.
-
-## Fonctionnalités inutilisées de C++ {#unused-features-of-c}
-
-**1.** L'héritage virtuel n'est pas utilisé.
-
-**2.** Les spécificateurs d'Exception de C++03 ne sont pas utilisés.
-
-## Plate {#platform}
-
-**1.** Nous écrivons du code pour une plate-forme spécifique.
-
-Mais toutes choses étant égales par ailleurs, le code multi-plateforme ou portable est préféré.
-
-**2.** Langue: C++20.
-
-**3.** Compilateur: `gcc`. En ce moment (août 2020), le code est compilé en utilisant la version 9.3. (Il peut également être compilé en utilisant `clang 8`.)
-
-La bibliothèque standard est utilisée (`libc++`).
-
-**4.**OS: Linux Ubuntu, pas plus vieux que précis.
-
-**5.**Le Code est écrit pour l'architecture CPU x86_64.
-
-Le jeu D'instructions CPU est l'ensemble minimum pris en charge parmi nos serveurs. Actuellement, il s'agit de SSE 4.2.
-
-**6.** Utiliser `-Wall -Wextra -Werror` drapeaux de compilation.
-
-**7.** Utilisez la liaison statique avec toutes les bibliothèques sauf celles qui sont difficiles à connecter statiquement (voir la sortie de la `ldd` commande).
-
-**8.** Le Code est développé et débogué avec les paramètres de version.
-
-## Outils {#tools}
-
-**1.** KDevelop est un bon IDE.
-
-**2.** Pour le débogage, utilisez `gdb`, `valgrind` (`memcheck`), `strace`, `-fsanitize=...`, ou `tcmalloc_minimal_debug`.
-
-**3.** Pour le profilage, utilisez `Linux Perf`, `valgrind` (`callgrind`), ou `strace -cf`.
-
-**4.** Les Sources sont dans Git.
-
-**5.** Assemblée utilise `CMake`.
-
-**6.** Les programmes sont libérés en utilisant `deb` paquet.
-
-**7.** Les Commits à master ne doivent pas casser la construction.
-
-Bien que seules les révisions sélectionnées soient considérées comme réalisables.
-
-**8.** Faire s'engage aussi souvent que possible, même si le code n'est que partiellement prêt.
-
-Utilisez des branches à cet effet.
-
-Si votre code dans le `master` la branche n'est pas constructible pourtant, l'exclure de la construction avant que le `push`. Vous devrez le terminer ou l'enlever dans quelques jours.
-
-**9.** Pour les modifications non triviales, utilisez les branches et publiez-les sur le serveur.
-
-**10.** Le code inutilisé est supprimé du référentiel.
-
-## Bibliothèque {#libraries}
-
-**1.** La bibliothèque standard C++20 est utilisée (les extensions expérimentales sont autorisées), ainsi que `boost` et `Poco` Framework.
-
-**2.** Si nécessaire, vous pouvez utiliser toutes les bibliothèques bien connues disponibles dans le package OS.
-
-S'il existe déjà une bonne solution, utilisez-la, même si cela signifie que vous devez installer une autre bibliothèque.
-
-(Mais soyez prêt à supprimer les mauvaises bibliothèques du code.)
-
-**3.** Vous pouvez installer une bibliothèque qui n'est pas dans les paquets, les paquets n'ont pas ce que vous souhaitez ou avez une version périmée ou le mauvais type de compilation.
-
-**4.** Si la Bibliothèque est petite et n'a pas son propre système de construction complexe, placez les fichiers source dans le `contrib` dossier.
-
-**5.** La préférence est toujours donnée aux bibliothèques déjà utilisées.
-
-## Recommandations Générales {#general-recommendations-1}
-
-**1.** Écrivez aussi peu de code que possible.
-
-**2.** Essayez la solution la plus simple.
-
-**3.** N'écrivez pas de code tant que vous ne savez pas comment cela va fonctionner et comment la boucle interne fonctionnera.
-
-**4.** Dans les cas les plus simples, utilisez `using` au lieu de classes ou des structures.
-
-**5.** Si possible, n'écrivez pas de constructeurs de copie, d'opérateurs d'affectation, de destructeurs (autres que Virtuels, si la classe contient au moins une fonction virtuelle), de constructeurs de déplacement ou d'opérateurs d'affectation de déplacement. En d'autres termes, les fonctions générées par le compilateur doivent fonctionner correctement. Vous pouvez utiliser `default`.
-
-**6.** La simplification du Code est encouragée. Réduire la taille de votre code si possible.
-
-## Recommandations Supplémentaires {#additional-recommendations}
-
-**1.** Spécifier explicitement `std::` pour les types de `stddef.h`
-
-n'est pas recommandé. En d'autres termes, nous vous recommandons d'écriture `size_t` plutôt `std::size_t` parce que c'est plus court.
-
-Il est acceptable d'ajouter `std::`.
-
-**2.** Spécifier explicitement `std::` pour les fonctions de la bibliothèque C standard
-
-n'est pas recommandé. En d'autres termes, écrire `memcpy` plutôt `std::memcpy`.
-
-La raison en est qu'il existe des fonctions non standard similaires, telles que `memmem`. Nous utilisons ces fonctions à l'occasion. Ces fonctions n'existent pas dans `namespace std`.
-
-Si vous écrivez `std::memcpy` plutôt `memcpy` partout, puis `memmem` sans `std::` va sembler étrange.
-
-Néanmoins, vous pouvez toujours utiliser `std::` si vous le souhaitez.
-
-**3.** Utilisation des fonctions de C lorsque les mêmes sont disponibles dans la bibliothèque C++ standard.
-
-Ceci est acceptable s'il est plus efficace.
-
-Par exemple, l'utilisation `memcpy` plutôt `std::copy` pour copier de gros morceaux de mémoire.
-
-**4.** Arguments de fonction multiligne.
-
-L'un des styles d'emballage suivants est autorisé:
-
-``` cpp
-function(
-  T1 x1,
-  T2 x2)
-```
-
-``` cpp
-function(
-  size_t left, size_t right,
-  const & RangesInDataParts ranges,
-  size_t limit)
-```
-
-``` cpp
-function(size_t left, size_t right,
-  const & RangesInDataParts ranges,
-  size_t limit)
-```
-
-``` cpp
-function(size_t left, size_t right,
-      const & RangesInDataParts ranges,
-      size_t limit)
-```
-
-``` cpp
-function(
-      size_t left,
-      size_t right,
-      const & RangesInDataParts ranges,
-      size_t limit)
-```
-
-[Article Original](https://clickhouse.tech/docs/en/development/style/) <!--hide-->
diff --git a/docs/fr/development/tests.md b/docs/fr/development/tests.md
deleted file mode 120000
index c03d36c3916..00000000000
--- a/docs/fr/development/tests.md
+++ /dev/null
@@ -1 +0,0 @@
-../../en/development/tests.md
\ No newline at end of file
diff --git a/docs/fr/engines/database-engines/atomic.md b/docs/fr/engines/database-engines/atomic.md
deleted file mode 100644
index f019b94a00b..00000000000
--- a/docs/fr/engines/database-engines/atomic.md
+++ /dev/null
@@ -1,17 +0,0 @@
----
-toc_priority: 32
-toc_title: Atomic
----
-
-
-# Atomic {#atomic}
-
-It is supports non-blocking `DROP` and `RENAME TABLE` queries and atomic `EXCHANGE TABLES t1 AND t2` queries. Atomic database engine is used by default.
-
-## Creating a Database {#creating-a-database}
-
-```sql
-CREATE DATABASE test ENGINE = Atomic;
-```
-
-[Original article](https://clickhouse.tech/docs/en/engines/database_engines/atomic/) <!--hide-->
diff --git a/docs/fr/engines/database-engines/index.md b/docs/fr/engines/database-engines/index.md
deleted file mode 100644
index a5b08b63453..00000000000
--- a/docs/fr/engines/database-engines/index.md
+++ /dev/null
@@ -1,21 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: "Moteurs De Base De Donn\xE9es"
-toc_priority: 27
-toc_title: Introduction
----
-
-# Moteurs De Base De Données {#database-engines}
-
-Moteurs de base de données vous permettent de travailler avec des tables.
-
-Par défaut, ClickHouse utilise son moteur de base de données natif, qui fournit [moteurs de table](../../engines/table-engines/index.md) et un [Dialecte SQL](../../sql-reference/syntax.md).
-
-Vous pouvez également utiliser les moteurs de base de données suivants:
-
--   [MySQL](mysql.md)
-
--   [Paresseux](lazy.md)
-
-[Article Original](https://clickhouse.tech/docs/en/database_engines/) <!--hide-->
diff --git a/docs/fr/engines/database-engines/lazy.md b/docs/fr/engines/database-engines/lazy.md
deleted file mode 100644
index 545936ae861..00000000000
--- a/docs/fr/engines/database-engines/lazy.md
+++ /dev/null
@@ -1,18 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 31
-toc_title: Paresseux
----
-
-# Paresseux {#lazy}
-
-Conserve les tables en RAM uniquement `expiration_time_in_seconds` secondes après le dernier accès. Peut être utilisé uniquement avec les tables \* Log.
-
-Il est optimisé pour stocker de nombreuses petites tables \*Log, pour lesquelles il y a un long intervalle de temps entre les accès.
-
-## La création d'une Base de données {#creating-a-database}
-
-    CREATE DATABASE testlazy ENGINE = Lazy(expiration_time_in_seconds);
-
-[Article Original](https://clickhouse.tech/docs/en/database_engines/lazy/) <!--hide-->
diff --git a/docs/fr/engines/database-engines/mysql.md b/docs/fr/engines/database-engines/mysql.md
deleted file mode 100644
index b40c8961b92..00000000000
--- a/docs/fr/engines/database-engines/mysql.md
+++ /dev/null
@@ -1,135 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 30
-toc_title: MySQL
----
-
-# MySQL {#mysql}
-
-Permet de se connecter à des bases de données sur un serveur MySQL distant et `INSERT` et `SELECT` requêtes pour échanger des données entre Clickhouse et MySQL.
-
-Le `MySQL` moteur de base de données traduire les requêtes sur le serveur MySQL afin que vous puissiez effectuer des opérations telles que `SHOW TABLES` ou `SHOW CREATE TABLE`.
-
-Vous ne pouvez pas effectuer les requêtes suivantes:
-
--   `RENAME`
--   `CREATE TABLE`
--   `ALTER`
-
-## La création d'une Base de données {#creating-a-database}
-
-``` sql
-CREATE DATABASE [IF NOT EXISTS] db_name [ON CLUSTER cluster]
-ENGINE = MySQL('host:port', ['database' | database], 'user', 'password')
-```
-
-**Les Paramètres Du Moteur**
-
--   `host:port` — MySQL server address.
--   `database` — Remote database name.
--   `user` — MySQL user.
--   `password` — User password.
-
-## Types De Données Soutien {#data_types-support}
-
-| MySQL                            | ClickHouse                                                   |
-|----------------------------------|--------------------------------------------------------------|
-| UNSIGNED TINYINT                 | [UInt8](../../sql-reference/data-types/int-uint.md)          |
-| TINYINT                          | [Int8](../../sql-reference/data-types/int-uint.md)           |
-| UNSIGNED SMALLINT                | [UInt16](../../sql-reference/data-types/int-uint.md)         |
-| SMALLINT                         | [Int16](../../sql-reference/data-types/int-uint.md)          |
-| UNSIGNED INT, UNSIGNED MEDIUMINT | [UInt32](../../sql-reference/data-types/int-uint.md)         |
-| INT, MEDIUMINT                   | [Int32](../../sql-reference/data-types/int-uint.md)          |
-| UNSIGNED BIGINT                  | [UInt64](../../sql-reference/data-types/int-uint.md)         |
-| BIGINT                           | [Int64](../../sql-reference/data-types/int-uint.md)          |
-| FLOAT                            | [Float32](../../sql-reference/data-types/float.md)           |
-| DOUBLE                           | [Float64](../../sql-reference/data-types/float.md)           |
-| DATE                             | [Date](../../sql-reference/data-types/date.md)               |
-| DATETIME, TIMESTAMP              | [DateTime](../../sql-reference/data-types/datetime.md)       |
-| BINARY                           | [FixedString](../../sql-reference/data-types/fixedstring.md) |
-
-Tous les autres types de données MySQL sont convertis en [Chaîne](../../sql-reference/data-types/string.md).
-
-[Nullable](../../sql-reference/data-types/nullable.md) est pris en charge.
-
-## Exemples D'utilisation {#examples-of-use}
-
-Table dans MySQL:
-
-``` text
-mysql> USE test;
-Database changed
-
-mysql> CREATE TABLE `mysql_table` (
-    ->   `int_id` INT NOT NULL AUTO_INCREMENT,
-    ->   `float` FLOAT NOT NULL,
-    ->   PRIMARY KEY (`int_id`));
-Query OK, 0 rows affected (0,09 sec)
-
-mysql> insert into mysql_table (`int_id`, `float`) VALUES (1,2);
-Query OK, 1 row affected (0,00 sec)
-
-mysql> select * from mysql_table;
-+------+-----+
-| int_id | value |
-+------+-----+
-|      1 |     2 |
-+------+-----+
-1 row in set (0,00 sec)
-```
-
-Base de données dans ClickHouse, échange de données avec le serveur MySQL:
-
-``` sql
-CREATE DATABASE mysql_db ENGINE = MySQL('localhost:3306', 'test', 'my_user', 'user_password')
-```
-
-``` sql
-SHOW DATABASES
-```
-
-``` text
-┌─name─────┐
-│ default  │
-│ mysql_db │
-│ system   │
-└──────────┘
-```
-
-``` sql
-SHOW TABLES FROM mysql_db
-```
-
-``` text
-┌─name─────────┐
-│  mysql_table │
-└──────────────┘
-```
-
-``` sql
-SELECT * FROM mysql_db.mysql_table
-```
-
-``` text
-┌─int_id─┬─value─┐
-│      1 │     2 │
-└────────┴───────┘
-```
-
-``` sql
-INSERT INTO mysql_db.mysql_table VALUES (3,4)
-```
-
-``` sql
-SELECT * FROM mysql_db.mysql_table
-```
-
-``` text
-┌─int_id─┬─value─┐
-│      1 │     2 │
-│      3 │     4 │
-└────────┴───────┘
-```
-
-[Article Original](https://clickhouse.tech/docs/en/database_engines/mysql/) <!--hide-->
diff --git a/docs/fr/engines/index.md b/docs/fr/engines/index.md
deleted file mode 100644
index 3dfb7bf3748..00000000000
--- a/docs/fr/engines/index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: Moteur
-toc_priority: 25
----
-
-
diff --git a/docs/fr/engines/table-engines/index.md b/docs/fr/engines/table-engines/index.md
deleted file mode 100644
index 51654fd6bb2..00000000000
--- a/docs/fr/engines/table-engines/index.md
+++ /dev/null
@@ -1,85 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: Moteurs De Table
-toc_priority: 26
-toc_title: Introduction
----
-
-# Moteurs De Table {#table_engines}
-
-Le moteur de table (type de table) détermine:
-
--   Comment et où les données sont stockées, où les écrire et où les lire.
--   Quelles requêtes sont prises en charge et comment.
--   Accès simultané aux données.
--   Utilisation des index, si elle est présente.
--   Indique si l'exécution d'une requête multithread est possible.
--   Paramètres de réplication des données.
-
-## Familles De Moteurs {#engine-families}
-
-### MergeTree {#mergetree}
-
-Les moteurs de table les plus universels et fonctionnels pour les tâches à forte charge. La propriété partagée par ces moteurs est l'insertion rapide des données avec traitement ultérieur des données d'arrière-plan. `MergeTree` les moteurs de la famille prennent en charge la réplication des données (avec [Répliqué\*](mergetree-family/replication.md#table_engines-replication) versions de moteurs), le partitionnement, et d'autres fonctionnalités non prises en charge dans d'autres moteurs.
-
-Moteurs dans la famille:
-
--   [MergeTree](mergetree-family/mergetree.md#mergetree)
--   [ReplacingMergeTree](mergetree-family/replacingmergetree.md#replacingmergetree)
--   [SummingMergeTree](mergetree-family/summingmergetree.md#summingmergetree)
--   [AggregatingMergeTree](mergetree-family/aggregatingmergetree.md#aggregatingmergetree)
--   [CollapsingMergeTree](mergetree-family/collapsingmergetree.md#table_engine-collapsingmergetree)
--   [VersionedCollapsingMergeTree](mergetree-family/versionedcollapsingmergetree.md#versionedcollapsingmergetree)
--   [GraphiteMergeTree](mergetree-family/graphitemergetree.md#graphitemergetree)
-
-### Journal {#log}
-
-Léger [moteur](log-family/index.md) avec une fonctionnalité minimale. Ils sont les plus efficaces lorsque vous devez écrire rapidement de nombreuses petites tables (jusqu'à environ 1 million de lignes) et les lire plus tard dans leur ensemble.
-
-Moteurs dans la famille:
-
--   [TinyLog](log-family/tinylog.md#tinylog)
--   [StripeLog](log-family/stripelog.md#stripelog)
--   [Journal](log-family/log.md#log)
-
-### Moteurs D'Intégration {#integration-engines}
-
-Moteurs de communication avec d'autres systèmes de stockage et de traitement de données.
-
-Moteurs dans la famille:
-
--   [Kafka](integrations/kafka.md#kafka)
--   [MySQL](integrations/mysql.md#mysql)
--   [ODBC](integrations/odbc.md#table-engine-odbc)
--   [JDBC](integrations/jdbc.md#table-engine-jdbc)
--   [HDFS](integrations/hdfs.md#hdfs)
-
-### Moteurs Spéciaux {#special-engines}
-
-Moteurs dans la famille:
-
--   [Distribué](special/distributed.md#distributed)
--   [MaterializedView](special/materializedview.md#materializedview)
--   [Dictionnaire](special/dictionary.md#dictionary)
--   \[Fusion\](spécial/de fusion.md#fusion
--   [Fichier](special/file.md#file)
--   [NULL](special/null.md#null)
--   [Définir](special/set.md#set)
--   [Rejoindre](special/join.md#join)
--   [URL](special/url.md#table_engines-url)
--   [Vue](special/view.md#table_engines-view)
--   [Mémoire](special/memory.md#memory)
--   [Tampon](special/buffer.md#buffer)
-
-## Les Colonnes Virtuelles {#table_engines-virtual_columns}
-
-Colonne virtuelle est un attribut de moteur de table intégrale qui est défini dans le code source du moteur.
-
-Vous ne devez pas spécifier de colonnes virtuelles dans `CREATE TABLE` requête et vous ne pouvez pas les voir dans `SHOW CREATE TABLE` et `DESCRIBE TABLE` les résultats de la requête. Les colonnes virtuelles sont également en lecture seule, vous ne pouvez donc pas insérer de données dans des colonnes virtuelles.
-
-Pour sélectionner des données dans une colonne virtuelle, vous devez spécifier son nom `SELECT` requête. `SELECT *` ne renvoie pas de valeurs à partir de colonnes virtuelles.
-
-Si vous créez une table avec une colonne portant le même nom que l'une des colonnes virtuelles de la table, la colonne virtuelle devient inaccessible. Nous ne recommandons pas de faire cela. Pour éviter les conflits, les noms de colonnes virtuelles sont généralement précédés d'un trait de soulignement.
-
-[Article Original](https://clickhouse.tech/docs/en/operations/table_engines/) <!--hide-->
diff --git a/docs/fr/engines/table-engines/integrations/hdfs.md b/docs/fr/engines/table-engines/integrations/hdfs.md
deleted file mode 100644
index 7416ed7ba91..00000000000
--- a/docs/fr/engines/table-engines/integrations/hdfs.md
+++ /dev/null
@@ -1,123 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 36
-toc_title: HDFS
----
-
-# HDFS {#table_engines-hdfs}
-
-Ce moteur fournit l'intégration avec [Apache Hadoop](https://en.wikipedia.org/wiki/Apache_Hadoop) l'écosystème en permettant de gérer les données sur [HDFS](https://hadoop.apache.org/docs/current/hadoop-project-dist/hadoop-hdfs/HdfsDesign.html)via ClickHouse. Ce moteur est similaire
-à l' [Fichier](../special/file.md#table_engines-file) et [URL](../special/url.md#table_engines-url) moteurs, mais fournit des fonctionnalités spécifiques Hadoop.
-
-## Utilisation {#usage}
-
-``` sql
-ENGINE = HDFS(URI, format)
-```
-
-Le `URI` paramètre est L'URI du fichier entier dans HDFS.
-Le `format` paramètre spécifie l'un des formats de fichier disponibles. Effectuer
-`SELECT` requêtes, le format doit être pris en charge pour l'entrée, et à effectuer
-`INSERT` queries – for output. The available formats are listed in the
-[Format](../../../interfaces/formats.md#formats) section.
-Le chemin le cadre de `URI` peut contenir des globules. Dans ce cas, le tableau serait en lecture seule.
-
-**Exemple:**
-
-**1.** Configurer le `hdfs_engine_table` table:
-
-``` sql
-CREATE TABLE hdfs_engine_table (name String, value UInt32) ENGINE=HDFS('hdfs://hdfs1:9000/other_storage', 'TSV')
-```
-
-**2.** Remplir le fichier:
-
-``` sql
-INSERT INTO hdfs_engine_table VALUES ('one', 1), ('two', 2), ('three', 3)
-```
-
-**3.** Interroger les données:
-
-``` sql
-SELECT * FROM hdfs_engine_table LIMIT 2
-```
-
-``` text
-┌─name─┬─value─┐
-│ one  │     1 │
-│ two  │     2 │
-└──────┴───────┘
-```
-
-## Détails De Mise En Œuvre {#implementation-details}
-
--   Les lectures et les écritures peuvent être parallèles
--   Pas pris en charge:
-    -   `ALTER` et `SELECT...SAMPLE` opérations.
-    -   Index.
-    -   Réplication.
-
-**Globs dans le chemin**
-
-Plusieurs composants de chemin peuvent avoir des globs. Pour être traité, le fichier devrait exister et correspondre au modèle de chemin entier. Liste des fichiers détermine pendant `SELECT` (pas à l' `CREATE` moment).
-
--   `*` — Substitutes any number of any characters except `/` y compris la chaîne vide.
--   `?` — Substitutes any single character.
--   `{some_string,another_string,yet_another_one}` — Substitutes any of strings `'some_string', 'another_string', 'yet_another_one'`.
--   `{N..M}` — Substitutes any number in range from N to M including both borders.
-
-Les Constructions avec `{}` sont similaires à l' [distant](../../../sql-reference/table-functions/remote.md) table de fonction.
-
-**Exemple**
-
-1.  Supposons que nous ayons plusieurs fichiers au format TSV avec les URI suivants sur HDFS:
-
--   ‘hdfs://hdfs1:9000/some_dir/some_file_1’
--   ‘hdfs://hdfs1:9000/some_dir/some_file_2’
--   ‘hdfs://hdfs1:9000/some_dir/some_file_3’
--   ‘hdfs://hdfs1:9000/another_dir/some_file_1’
--   ‘hdfs://hdfs1:9000/another_dir/some_file_2’
--   ‘hdfs://hdfs1:9000/another_dir/some_file_3’
-
-1.  Il y a plusieurs façons de faire une table composée des six fichiers:
-
-<!-- -->
-
-``` sql
-CREATE TABLE table_with_range (name String, value UInt32) ENGINE = HDFS('hdfs://hdfs1:9000/{some,another}_dir/some_file_{1..3}', 'TSV')
-```
-
-Une autre façon:
-
-``` sql
-CREATE TABLE table_with_question_mark (name String, value UInt32) ENGINE = HDFS('hdfs://hdfs1:9000/{some,another}_dir/some_file_?', 'TSV')
-```
-
-Table se compose de tous les fichiers dans les deux répertoires (tous les fichiers doivent satisfaire le format et le schéma décrits dans la requête):
-
-``` sql
-CREATE TABLE table_with_asterisk (name String, value UInt32) ENGINE = HDFS('hdfs://hdfs1:9000/{some,another}_dir/*', 'TSV')
-```
-
-!!! warning "Avertissement"
-    Si la liste des fichiers contient des plages de nombres avec des zéros en tête, utilisez la construction avec des accolades pour chaque chiffre séparément ou utilisez `?`.
-
-**Exemple**
-
-Créer une table avec des fichiers nommés `file000`, `file001`, … , `file999`:
-
-``` sql
-CREARE TABLE big_table (name String, value UInt32) ENGINE = HDFS('hdfs://hdfs1:9000/big_dir/file{0..9}{0..9}{0..9}', 'CSV')
-```
-
-## Les Colonnes Virtuelles {#virtual-columns}
-
--   `_path` — Path to the file.
--   `_file` — Name of the file.
-
-**Voir Aussi**
-
--   [Les colonnes virtuelles](../index.md#table_engines-virtual_columns)
-
-[Article Original](https://clickhouse.tech/docs/en/operations/table_engines/hdfs/) <!--hide-->
diff --git a/docs/fr/engines/table-engines/integrations/index.md b/docs/fr/engines/table-engines/integrations/index.md
deleted file mode 100644
index 205b631880b..00000000000
--- a/docs/fr/engines/table-engines/integrations/index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: "Int\xE9gration"
-toc_priority: 30
----
-
-
diff --git a/docs/fr/engines/table-engines/integrations/jdbc.md b/docs/fr/engines/table-engines/integrations/jdbc.md
deleted file mode 100644
index e67209f2709..00000000000
--- a/docs/fr/engines/table-engines/integrations/jdbc.md
+++ /dev/null
@@ -1,90 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 34
-toc_title: JDBC
----
-
-# JDBC {#table-engine-jdbc}
-
-Permet à ClickHouse de se connecter à des bases de données externes via [JDBC](https://en.wikipedia.org/wiki/Java_Database_Connectivity).
-
-Pour implémenter la connexion JDBC, ClickHouse utilise le programme séparé [clickhouse-JDBC-pont](https://github.com/alex-krash/clickhouse-jdbc-bridge) cela devrait fonctionner comme un démon.
-
-Ce moteur prend en charge le [Nullable](../../../sql-reference/data-types/nullable.md) type de données.
-
-## Création d'une Table {#creating-a-table}
-
-``` sql
-CREATE TABLE [IF NOT EXISTS] [db.]table_name
-(
-    columns list...
-)
-ENGINE = JDBC(dbms_uri, external_database, external_table)
-```
-
-**Les Paramètres Du Moteur**
-
--   `dbms_uri` — URI of an external DBMS.
-
-    Format: `jdbc:<driver_name>://<host_name>:<port>/?user=<username>&password=<password>`.
-    Exemple pour MySQL: `jdbc:mysql://localhost:3306/?user=root&password=root`.
-
--   `external_database` — Database in an external DBMS.
-
--   `external_table` — Name of the table in `external_database`.
-
-## Exemple D'Utilisation {#usage-example}
-
-Création d'une table dans le serveur MySQL en se connectant directement avec son client console:
-
-``` text
-mysql> CREATE TABLE `test`.`test` (
-    ->   `int_id` INT NOT NULL AUTO_INCREMENT,
-    ->   `int_nullable` INT NULL DEFAULT NULL,
-    ->   `float` FLOAT NOT NULL,
-    ->   `float_nullable` FLOAT NULL DEFAULT NULL,
-    ->   PRIMARY KEY (`int_id`));
-Query OK, 0 rows affected (0,09 sec)
-
-mysql> insert into test (`int_id`, `float`) VALUES (1,2);
-Query OK, 1 row affected (0,00 sec)
-
-mysql> select * from test;
-+------+----------+-----+----------+
-| int_id | int_nullable | float | float_nullable |
-+------+----------+-----+----------+
-|      1 |         NULL |     2 |           NULL |
-+------+----------+-----+----------+
-1 row in set (0,00 sec)
-```
-
-Création d'une table dans le serveur ClickHouse et sélection des données:
-
-``` sql
-CREATE TABLE jdbc_table
-(
-    `int_id` Int32,
-    `int_nullable` Nullable(Int32),
-    `float` Float32,
-    `float_nullable` Nullable(Float32)
-)
-ENGINE JDBC('jdbc:mysql://localhost:3306/?user=root&password=root', 'test', 'test')
-```
-
-``` sql
-SELECT *
-FROM jdbc_table
-```
-
-``` text
-┌─int_id─┬─int_nullable─┬─float─┬─float_nullable─┐
-│      1 │         ᴺᵁᴸᴸ │     2 │           ᴺᵁᴸᴸ │
-└────────┴──────────────┴───────┴────────────────┘
-```
-
-## Voir Aussi {#see-also}
-
--   [Fonction de table JDBC](../../../sql-reference/table-functions/jdbc.md).
-
-[Article Original](https://clickhouse.tech/docs/en/operations/table_engines/jdbc/) <!--hide-->
diff --git a/docs/fr/engines/table-engines/integrations/kafka.md b/docs/fr/engines/table-engines/integrations/kafka.md
deleted file mode 100644
index c8c16f2c3c4..00000000000
--- a/docs/fr/engines/table-engines/integrations/kafka.md
+++ /dev/null
@@ -1,180 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 32
-toc_title: Kafka
----
-
-# Kafka {#kafka}
-
-Ce moteur fonctionne avec [Apache Kafka](http://kafka.apache.org/).
-
-Kafka vous permet de:
-
--   Publier ou s'abonner aux flux de données.
--   Organiser le stockage tolérant aux pannes.
--   Traiter les flux à mesure qu'ils deviennent disponibles.
-
-## Création d'une Table {#table_engine-kafka-creating-a-table}
-
-``` sql
-CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
-(
-    name1 [type1] [DEFAULT|MATERIALIZED|ALIAS expr1],
-    name2 [type2] [DEFAULT|MATERIALIZED|ALIAS expr2],
-    ...
-) ENGINE = Kafka()
-SETTINGS
-    kafka_broker_list = 'host:port',
-    kafka_topic_list = 'topic1,topic2,...',
-    kafka_group_name = 'group_name',
-    kafka_format = 'data_format'[,]
-    [kafka_row_delimiter = 'delimiter_symbol',]
-    [kafka_schema = '',]
-    [kafka_num_consumers = N,]
-    [kafka_max_block_size = 0,]
-    [kafka_skip_broken_messages = N,]
-    [kafka_commit_every_batch = 0]
-```
-
-Les paramètres requis:
-
--   `kafka_broker_list` – A comma-separated list of brokers (for example, `localhost:9092`).
--   `kafka_topic_list` – A list of Kafka topics.
--   `kafka_group_name` – A group of Kafka consumers. Reading margins are tracked for each group separately. If you don't want messages to be duplicated in the cluster, use the same group name everywhere.
--   `kafka_format` – Message format. Uses the same notation as the SQL `FORMAT` la fonction, tels que `JSONEachRow`. Pour plus d'informations, voir le [Format](../../../interfaces/formats.md) section.
-
-Paramètres facultatifs:
-
--   `kafka_row_delimiter` – Delimiter character, which ends the message.
--   `kafka_schema` – Parameter that must be used if the format requires a schema definition. For example, [Cap'n Proto](https://capnproto.org/) nécessite le chemin d'accès du fichier de schéma et le nom de la racine `schema.capnp:Message` objet.
--   `kafka_num_consumers` – The number of consumers per table. Default: `1`. Spécifiez plus de consommateurs si le débit d'un consommateur est insuffisant. Le nombre total de consommateurs ne doit pas dépasser le nombre de partitions dans la rubrique, car un seul consommateur peut être affecté par partition.
--   `kafka_max_block_size` - La taille maximale du lot (dans les messages) pour le sondage (par défaut: `max_block_size`).
--   `kafka_skip_broken_messages` – Kafka message parser tolerance to schema-incompatible messages per block. Default: `0`. Si `kafka_skip_broken_messages = N` puis le moteur saute *N* Messages Kafka qui ne peuvent pas être analysés (un message est égal à une ligne de données).
--   `kafka_commit_every_batch` - Commit chaque lot consommé et traité au lieu d'un seul commit après avoir écrit un bloc entier (par défaut: `0`).
-
-Exemple:
-
-``` sql
-  CREATE TABLE queue (
-    timestamp UInt64,
-    level String,
-    message String
-  ) ENGINE = Kafka('localhost:9092', 'topic', 'group1', 'JSONEachRow');
-
-  SELECT * FROM queue LIMIT 5;
-
-  CREATE TABLE queue2 (
-    timestamp UInt64,
-    level String,
-    message String
-  ) ENGINE = Kafka SETTINGS kafka_broker_list = 'localhost:9092',
-                            kafka_topic_list = 'topic',
-                            kafka_group_name = 'group1',
-                            kafka_format = 'JSONEachRow',
-                            kafka_num_consumers = 4;
-
-  CREATE TABLE queue2 (
-    timestamp UInt64,
-    level String,
-    message String
-  ) ENGINE = Kafka('localhost:9092', 'topic', 'group1')
-              SETTINGS kafka_format = 'JSONEachRow',
-                       kafka_num_consumers = 4;
-```
-
-<details markdown="1">
-
-<summary>Méthode obsolète pour créer une Table</summary>
-
-!!! attention "Attention"
-    N'utilisez pas cette méthode dans les nouveaux projets. Si possible, optez anciens projets à la méthode décrite ci-dessus.
-
-``` sql
-Kafka(kafka_broker_list, kafka_topic_list, kafka_group_name, kafka_format
-      [, kafka_row_delimiter, kafka_schema, kafka_num_consumers, kafka_skip_broken_messages])
-```
-
-</details>
-
-## Description {#description}
-
-Les messages livrés sont suivis automatiquement, de sorte que chaque message d'un groupe n'est compté qu'une seule fois. Si vous souhaitez obtenir les données deux fois, créez une copie de la table avec un autre nom de groupe.
-
-Les groupes sont flexibles et synchronisés sur le cluster. Par exemple, si vous avez 10 thèmes et 5 copies d'une table dans un cluster, chaque copie obtient 2 sujets. Si le nombre de copies change, les rubriques sont redistribuées automatiquement entre les copies. En savoir plus à ce sujet à http://kafka.apache.org/intro.
-
-`SELECT` n'est pas particulièrement utile pour la lecture de messages (sauf pour le débogage), car chaque message ne peut être lu qu'une seule fois. Il est plus pratique de créer des threads en temps réel à l'aide de vues matérialisées. Pour ce faire:
-
-1.  Utilisez le moteur pour créer un consommateur Kafka et considérez-le comme un flux de données.
-2.  Créez une table avec la structure souhaitée.
-3.  Créer une vue matérialisée qui convertit les données du moteur et le met dans une table créée précédemment.
-
-Lorsque l' `MATERIALIZED VIEW` rejoint le moteur, il commence à collecter des données en arrière-plan. Cela vous permet de recevoir continuellement des messages de Kafka et de les convertir au format requis en utilisant `SELECT`.
-Une table kafka peut avoir autant de vues matérialisées que vous le souhaitez, elles ne lisent pas directement les données de la table kafka, mais reçoivent de nouveaux enregistrements( en blocs), de cette façon vous pouvez écrire sur plusieurs tables avec différents niveaux de détail (avec regroupement - agrégation et sans).
-
-Exemple:
-
-``` sql
-  CREATE TABLE queue (
-    timestamp UInt64,
-    level String,
-    message String
-  ) ENGINE = Kafka('localhost:9092', 'topic', 'group1', 'JSONEachRow');
-
-  CREATE TABLE daily (
-    day Date,
-    level String,
-    total UInt64
-  ) ENGINE = SummingMergeTree(day, (day, level), 8192);
-
-  CREATE MATERIALIZED VIEW consumer TO daily
-    AS SELECT toDate(toDateTime(timestamp)) AS day, level, count() as total
-    FROM queue GROUP BY day, level;
-
-  SELECT level, sum(total) FROM daily GROUP BY level;
-```
-
-Pour améliorer les performances, les messages reçus sont regroupées en blocs de la taille de [max_insert_block_size](../../../operations/server-configuration-parameters/settings.md#settings-max_insert_block_size). Si le bloc n'a pas été formé à l'intérieur [stream_flush_interval_ms](../../../operations/server-configuration-parameters/settings.md) millisecondes, les données seront vidées dans le tableau, indépendamment de l'intégralité du bloc.
-
-Pour arrêter de recevoir des données de rubrique ou pour modifier la logique de conversion, détachez la vue matérialisée:
-
-``` sql
-  DETACH TABLE consumer;
-  ATTACH TABLE consumer;
-```
-
-Si vous souhaitez modifier la table cible en utilisant `ALTER`, nous vous recommandons de désactiver la vue matériel pour éviter les divergences entre la table cible et les données de la vue.
-
-## Configuration {#configuration}
-
-Similaire à GraphiteMergeTree, le moteur Kafka prend en charge la configuration étendue à l'aide du fichier de configuration ClickHouse. Il y a deux clés de configuration que vous pouvez utiliser: global (`kafka`) et des rubriques (`kafka_*`). La configuration globale est appliquée en premier, puis la configuration au niveau de la rubrique est appliquée (si elle existe).
-
-``` xml
-  <!-- Global configuration options for all tables of Kafka engine type -->
-  <kafka>
-    <debug>cgrp</debug>
-    <auto_offset_reset>smallest</auto_offset_reset>
-  </kafka>
-
-  <!-- Configuration specific for topic "logs" -->
-  <kafka_logs>
-    <retry_backoff_ms>250</retry_backoff_ms>
-    <fetch_min_bytes>100000</fetch_min_bytes>
-  </kafka_logs>
-```
-
-Pour obtenir une liste des options de configuration possibles, consultez [librdkafka référence de configuration](https://github.com/edenhill/librdkafka/blob/master/CONFIGURATION.md). Utilisez le trait de soulignement (`_`) au lieu d'un point dans la configuration ClickHouse. Exemple, `check.crcs=true` sera `<check_crcs>true</check_crcs>`.
-
-## Les Colonnes Virtuelles {#virtual-columns}
-
--   `_topic` — Kafka topic.
--   `_key` — Key of the message.
--   `_offset` — Offset of the message.
--   `_timestamp` — Timestamp of the message.
--   `_partition` — Partition of Kafka topic.
-
-**Voir Aussi**
-
--   [Les colonnes virtuelles](../index.md#table_engines-virtual_columns)
-
-[Article Original](https://clickhouse.tech/docs/en/operations/table_engines/kafka/) <!--hide-->
diff --git a/docs/fr/engines/table-engines/integrations/mysql.md b/docs/fr/engines/table-engines/integrations/mysql.md
deleted file mode 100644
index bc291e0aebe..00000000000
--- a/docs/fr/engines/table-engines/integrations/mysql.md
+++ /dev/null
@@ -1,105 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 33
-toc_title: MySQL
----
-
-# Mysql {#mysql}
-
-Le moteur MySQL vous permet d'effectuer `SELECT` requêtes sur les données stockées sur un serveur MySQL distant.
-
-## Création d'une Table {#creating-a-table}
-
-``` sql
-CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
-(
-    name1 [type1] [DEFAULT|MATERIALIZED|ALIAS expr1] [TTL expr1],
-    name2 [type2] [DEFAULT|MATERIALIZED|ALIAS expr2] [TTL expr2],
-    ...
-) ENGINE = MySQL('host:port', 'database', 'table', 'user', 'password'[, replace_query, 'on_duplicate_clause']);
-```
-
-Voir une description détaillée de la [CREATE TABLE](../../../sql-reference/statements/create.md#create-table-query) requête.
-
-La structure de la table peut différer de la structure de la table MySQL d'origine:
-
--   Les noms de colonnes doivent être les mêmes que dans la table MySQL d'origine, mais vous pouvez utiliser seulement certaines de ces colonnes et dans n'importe quel ordre.
--   Les types de colonnes peuvent différer de ceux de la table MySQL d'origine. ClickHouse essaie de [jeter](../../../sql-reference/functions/type-conversion-functions.md#type_conversion_function-cast) valeurs des types de données ClickHouse.
-
-**Les Paramètres Du Moteur**
-
--   `host:port` — MySQL server address.
-
--   `database` — Remote database name.
-
--   `table` — Remote table name.
-
--   `user` — MySQL user.
-
--   `password` — User password.
-
--   `replace_query` — Flag that converts `INSERT INTO` les requêtes de `REPLACE INTO`. Si `replace_query=1` la requête est substitué.
-
--   `on_duplicate_clause` — The `ON DUPLICATE KEY on_duplicate_clause` expression qui est ajoutée à la `INSERT` requête.
-
-    Exemple: `INSERT INTO t (c1,c2) VALUES ('a', 2) ON DUPLICATE KEY UPDATE c2 = c2 + 1`, où `on_duplicate_clause` être `UPDATE c2 = c2 + 1`. Voir la [Documentation de MySQL](https://dev.mysql.com/doc/refman/8.0/en/insert-on-duplicate.html) pour trouver lequel `on_duplicate_clause` vous pouvez utiliser avec le `ON DUPLICATE KEY` clause.
-
-    Spécifier `on_duplicate_clause` vous avez besoin de passer `0` à l' `replace_query` paramètre. Si vous passez simultanément `replace_query = 1` et `on_duplicate_clause`, Clickhouse génère une exception.
-
-Simple `WHERE` des clauses telles que `=, !=, >, >=, <, <=` sont exécutés sur le serveur MySQL.
-
-Le reste des conditions et le `LIMIT` les contraintes d'échantillonnage sont exécutées dans ClickHouse uniquement après la fin de la requête à MySQL.
-
-## Exemple D'Utilisation {#usage-example}
-
-Table dans MySQL:
-
-``` text
-mysql> CREATE TABLE `test`.`test` (
-    ->   `int_id` INT NOT NULL AUTO_INCREMENT,
-    ->   `int_nullable` INT NULL DEFAULT NULL,
-    ->   `float` FLOAT NOT NULL,
-    ->   `float_nullable` FLOAT NULL DEFAULT NULL,
-    ->   PRIMARY KEY (`int_id`));
-Query OK, 0 rows affected (0,09 sec)
-
-mysql> insert into test (`int_id`, `float`) VALUES (1,2);
-Query OK, 1 row affected (0,00 sec)
-
-mysql> select * from test;
-+------+----------+-----+----------+
-| int_id | int_nullable | float | float_nullable |
-+------+----------+-----+----------+
-|      1 |         NULL |     2 |           NULL |
-+------+----------+-----+----------+
-1 row in set (0,00 sec)
-```
-
-Table dans ClickHouse, récupération des données de la table MySQL créée ci-dessus:
-
-``` sql
-CREATE TABLE mysql_table
-(
-    `float_nullable` Nullable(Float32),
-    `int_id` Int32
-)
-ENGINE = MySQL('localhost:3306', 'test', 'test', 'bayonet', '123')
-```
-
-``` sql
-SELECT * FROM mysql_table
-```
-
-``` text
-┌─float_nullable─┬─int_id─┐
-│           ᴺᵁᴸᴸ │      1 │
-└────────────────┴────────┘
-```
-
-## Voir Aussi {#see-also}
-
--   [Le ‘mysql’ fonction de table](../../../sql-reference/table-functions/mysql.md)
--   [Utilisation de MySQL comme source de dictionnaire externe](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md#dicts-external_dicts_dict_sources-mysql)
-
-[Article Original](https://clickhouse.tech/docs/en/operations/table_engines/mysql/) <!--hide-->
diff --git a/docs/fr/engines/table-engines/integrations/odbc.md b/docs/fr/engines/table-engines/integrations/odbc.md
deleted file mode 100644
index ee0ffb171d2..00000000000
--- a/docs/fr/engines/table-engines/integrations/odbc.md
+++ /dev/null
@@ -1,132 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 35
-toc_title: ODBC
----
-
-# ODBC {#table-engine-odbc}
-
-Permet à ClickHouse de se connecter à des bases de données externes via [ODBC](https://en.wikipedia.org/wiki/Open_Database_Connectivity).
-
-Pour implémenter en toute sécurité les connexions ODBC, ClickHouse utilise un programme distinct `clickhouse-odbc-bridge`. Si le pilote ODBC est chargé directement depuis `clickhouse-server`, les problèmes de pilote peuvent planter le serveur ClickHouse. Clickhouse démarre automatiquement `clickhouse-odbc-bridge` lorsque cela est nécessaire. Le programme ODBC bridge est installé à partir du même package que `clickhouse-server`.
-
-Ce moteur prend en charge le [Nullable](../../../sql-reference/data-types/nullable.md) type de données.
-
-## Création d'une Table {#creating-a-table}
-
-``` sql
-CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
-(
-    name1 [type1],
-    name2 [type2],
-    ...
-)
-ENGINE = ODBC(connection_settings, external_database, external_table)
-```
-
-Voir une description détaillée de la [CREATE TABLE](../../../sql-reference/statements/create.md#create-table-query) requête.
-
-La structure de la table peut différer de la structure de la table source:
-
--   Les noms de colonnes doivent être les mêmes que dans la table source, mais vous pouvez utiliser quelques-unes de ces colonnes et dans n'importe quel ordre.
--   Les types de colonnes peuvent différer de ceux de la table source. ClickHouse essaie de [jeter](../../../sql-reference/functions/type-conversion-functions.md#type_conversion_function-cast) valeurs des types de données ClickHouse.
-
-**Les Paramètres Du Moteur**
-
--   `connection_settings` — Name of the section with connection settings in the `odbc.ini` fichier.
--   `external_database` — Name of a database in an external DBMS.
--   `external_table` — Name of a table in the `external_database`.
-
-## Exemple D'Utilisation {#usage-example}
-
-**Récupération des données de L'installation MySQL locale via ODBC**
-
-Cet exemple est vérifié pour Ubuntu Linux 18.04 et MySQL server 5.7.
-
-Assurez-vous que unixODBC et MySQL Connector sont installés.
-
-Par défaut (si installé à partir de paquets), ClickHouse démarre en tant qu'utilisateur `clickhouse`. Ainsi, vous devez créer et configurer cet utilisateur dans le serveur MySQL.
-
-``` bash
-$ sudo mysql
-```
-
-``` sql
-mysql> CREATE USER 'clickhouse'@'localhost' IDENTIFIED BY 'clickhouse';
-mysql> GRANT ALL PRIVILEGES ON *.* TO 'clickhouse'@'clickhouse' WITH GRANT OPTION;
-```
-
-Puis configurez la connexion dans `/etc/odbc.ini`.
-
-``` bash
-$ cat /etc/odbc.ini
-[mysqlconn]
-DRIVER = /usr/local/lib/libmyodbc5w.so
-SERVER = 127.0.0.1
-PORT = 3306
-DATABASE = test
-USERNAME = clickhouse
-PASSWORD = clickhouse
-```
-
-Vous pouvez vérifier la connexion en utilisant le `isql` utilitaire de l'installation unixODBC.
-
-``` bash
-$ isql -v mysqlconn
-+-------------------------+
-| Connected!                            |
-|                                       |
-...
-```
-
-Table dans MySQL:
-
-``` text
-mysql> CREATE TABLE `test`.`test` (
-    ->   `int_id` INT NOT NULL AUTO_INCREMENT,
-    ->   `int_nullable` INT NULL DEFAULT NULL,
-    ->   `float` FLOAT NOT NULL,
-    ->   `float_nullable` FLOAT NULL DEFAULT NULL,
-    ->   PRIMARY KEY (`int_id`));
-Query OK, 0 rows affected (0,09 sec)
-
-mysql> insert into test (`int_id`, `float`) VALUES (1,2);
-Query OK, 1 row affected (0,00 sec)
-
-mysql> select * from test;
-+------+----------+-----+----------+
-| int_id | int_nullable | float | float_nullable |
-+------+----------+-----+----------+
-|      1 |         NULL |     2 |           NULL |
-+------+----------+-----+----------+
-1 row in set (0,00 sec)
-```
-
-Table dans ClickHouse, récupération des données de la table MySQL:
-
-``` sql
-CREATE TABLE odbc_t
-(
-    `int_id` Int32,
-    `float_nullable` Nullable(Float32)
-)
-ENGINE = ODBC('DSN=mysqlconn', 'test', 'test')
-```
-
-``` sql
-SELECT * FROM odbc_t
-```
-
-``` text
-┌─int_id─┬─float_nullable─┐
-│      1 │           ᴺᵁᴸᴸ │
-└────────┴────────────────┘
-```
-
-## Voir Aussi {#see-also}
-
--   [Dictionnaires externes ODBC](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md#dicts-external_dicts_dict_sources-odbc)
--   [Fonction de table ODBC](../../../sql-reference/table-functions/odbc.md)
-
-[Article Original](https://clickhouse.tech/docs/en/operations/table_engines/odbc/) <!--hide-->
diff --git a/docs/fr/engines/table-engines/log-family/index.md b/docs/fr/engines/table-engines/log-family/index.md
deleted file mode 100644
index a4005fcbd66..00000000000
--- a/docs/fr/engines/table-engines/log-family/index.md
+++ /dev/null
@@ -1,46 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: Journal De La Famille
-toc_title: Introduction
----
-
-# Famille De Moteurs En Rondins {#log-engine-family}
-
-Ces moteurs ont été développés pour les scénarios où vous devez écrire rapidement de nombreuses petites tables (jusqu'à environ 1 million de lignes) et les lire plus tard dans leur ensemble.
-
-Les moteurs de la famille:
-
--   [StripeLog](stripelog.md)
--   [Journal](log.md)
--   [TinyLog](tinylog.md)
-
-## Propriétés Communes {#common-properties}
-
-Moteur:
-
--   Stocker des données sur un disque.
-
--   Ajouter des données à la fin du fichier lors de l'écriture.
-
--   Bloque simultanées dans l'accès aux données.
-
-    Lors `INSERT` requêtes, la table est verrouillée, et d'autres requêtes pour la lecture et l'écriture de données attendent que la table se déverrouille. S'il n'y a pas de requêtes d'écriture de données, un certain nombre de requêtes de lecture de données peuvent être effectuées simultanément.
-
--   Ne prennent pas en charge [mutation](../../../sql-reference/statements/alter.md#alter-mutations) opérations.
-
--   Ne prennent pas en charge les index.
-
-    Cela signifie que `SELECT` les requêtes pour les plages de données ne sont pas efficaces.
-
--   N'écrivez pas de données de manière atomique.
-
-    Vous pouvez obtenir une table avec des données corrompues si quelque chose interrompt l'opération d'écriture, par exemple, un arrêt anormal du serveur.
-
-## Différence {#differences}
-
-Le `TinyLog` le moteur est le plus simple de la famille et offre la fonctionnalité la plus pauvre et la plus faible efficacité. Le `TinyLog` le moteur ne prend pas en charge la lecture de données parallèles par plusieurs threads. Il lit les données plus lentement que les autres moteurs de la famille qui prennent en charge la lecture parallèle et utilise presque autant de descripteurs que `Log` moteur, car il stocke chaque colonne dans un fichier séparé. Utilisez-le dans des scénarios simples à faible charge.
-
-Le `Log` et `StripeLog` les moteurs prennent en charge la lecture de données parallèle. Lors de la lecture de données, ClickHouse utilise plusieurs threads. Chaque thread traite un bloc de données séparé. Le `Log` le moteur utilise un fichier distinct pour chaque colonne de la table. `StripeLog` stocke toutes les données dans un seul fichier. En conséquence, la `StripeLog` moteur utilise moins de descripteurs dans le système d'exploitation, mais le `Log` moteur fournit une plus grande efficacité lors de la lecture des données.
-
-[Article Original](https://clickhouse.tech/docs/en/operations/table_engines/log_family/) <!--hide-->
diff --git a/docs/fr/engines/table-engines/log-family/log.md b/docs/fr/engines/table-engines/log-family/log.md
deleted file mode 100644
index f0d06af03d6..00000000000
--- a/docs/fr/engines/table-engines/log-family/log.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 33
-toc_title: Journal
----
-
-# Journal {#log}
-
-Moteur appartient à la famille de journal des moteurs. Voir les propriétés communes des moteurs de journal et leurs différences dans le [Famille De Moteurs En Rondins](index.md) article.
-
-Journal diffère de [TinyLog](tinylog.md) dans un petit fichier de “marks” réside avec les fichiers de colonne. Ces marques sont écrites sur chaque bloc de données et contiennent des décalages qui indiquent où commencer à lire le fichier afin d'ignorer le nombre de lignes spécifié. Cela permet de lire les données de table dans plusieurs threads.
-Pour l'accès aux données simultanées, les opérations de lecture peuvent être effectuées simultanément, tandis que les opérations d'écriture bloc lit et l'autre.
-Le moteur de journal ne prend pas en charge les index. De même, si l'écriture dans une table a échoué, la table est cassée et la lecture de celle-ci renvoie une erreur. Le moteur de journal est approprié pour les données temporaires, les tables en écriture unique, et à des fins de test ou de démonstration.
-
-[Article Original](https://clickhouse.tech/docs/en/operations/table_engines/log/) <!--hide-->
diff --git a/docs/fr/engines/table-engines/log-family/stripelog.md b/docs/fr/engines/table-engines/log-family/stripelog.md
deleted file mode 100644
index 2c2919aec21..00000000000
--- a/docs/fr/engines/table-engines/log-family/stripelog.md
+++ /dev/null
@@ -1,95 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 32
-toc_title: StripeLog
----
-
-# Stripelog {#stripelog}
-
-Ce moteur appartient à la famille des moteurs en rondins. Voir les propriétés communes des moteurs de journal et leurs différences dans le [Famille De Moteurs En Rondins](index.md) article.
-
-Utilisez ce moteur dans des scénarios lorsque vous devez écrire de nombreuses tables avec une petite quantité de données (moins de 1 million de lignes).
-
-## Création d'une Table {#table_engines-stripelog-creating-a-table}
-
-``` sql
-CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
-(
-    column1_name [type1] [DEFAULT|MATERIALIZED|ALIAS expr1],
-    column2_name [type2] [DEFAULT|MATERIALIZED|ALIAS expr2],
-    ...
-) ENGINE = StripeLog
-```
-
-Voir la description détaillée de la [CREATE TABLE](../../../sql-reference/statements/create.md#create-table-query) requête.
-
-## L'écriture des Données {#table_engines-stripelog-writing-the-data}
-
-Le `StripeLog` moteur stocke toutes les colonnes dans un fichier. Pour chaque `INSERT` requête, ClickHouse ajoute le bloc de données à la fin d'un fichier de table, en écrivant des colonnes une par une.
-
-Pour chaque table ClickHouse écrit les fichiers:
-
--   `data.bin` — Data file.
--   `index.mrk` — File with marks. Marks contain offsets for each column of each data block inserted.
-
-Le `StripeLog` moteur ne prend pas en charge la `ALTER UPDATE` et `ALTER DELETE` opérations.
-
-## La lecture des Données {#table_engines-stripelog-reading-the-data}
-
-Le fichier avec des marques permet à ClickHouse de paralléliser la lecture des données. Cela signifie qu'une `SELECT` la requête renvoie des lignes dans un ordre imprévisible. L'utilisation de la `ORDER BY` clause pour trier les lignes.
-
-## Exemple D'utilisation {#table_engines-stripelog-example-of-use}
-
-Création d'une table:
-
-``` sql
-CREATE TABLE stripe_log_table
-(
-    timestamp DateTime,
-    message_type String,
-    message String
-)
-ENGINE = StripeLog
-```
-
-Insertion de données:
-
-``` sql
-INSERT INTO stripe_log_table VALUES (now(),'REGULAR','The first regular message')
-INSERT INTO stripe_log_table VALUES (now(),'REGULAR','The second regular message'),(now(),'WARNING','The first warning message')
-```
-
-Nous avons utilisé deux `INSERT` requêtes pour créer deux blocs de données `data.bin` fichier.
-
-ClickHouse utilise plusieurs threads lors de la sélection des données. Chaque thread lit un bloc de données séparé et renvoie les lignes résultantes indépendamment à la fin. En conséquence, l'ordre des blocs de lignes dans le résultat ne correspond pas à l'ordre des mêmes blocs dans l'entrée, dans la plupart des cas. Exemple:
-
-``` sql
-SELECT * FROM stripe_log_table
-```
-
-``` text
-┌───────────timestamp─┬─message_type─┬─message────────────────────┐
-│ 2019-01-18 14:27:32 │ REGULAR      │ The second regular message │
-│ 2019-01-18 14:34:53 │ WARNING      │ The first warning message  │
-└─────────────────────┴──────────────┴────────────────────────────┘
-┌───────────timestamp─┬─message_type─┬─message───────────────────┐
-│ 2019-01-18 14:23:43 │ REGULAR      │ The first regular message │
-└─────────────────────┴──────────────┴───────────────────────────┘
-```
-
-Trier les résultats (ordre croissant par défaut):
-
-``` sql
-SELECT * FROM stripe_log_table ORDER BY timestamp
-```
-
-``` text
-┌───────────timestamp─┬─message_type─┬─message────────────────────┐
-│ 2019-01-18 14:23:43 │ REGULAR      │ The first regular message  │
-│ 2019-01-18 14:27:32 │ REGULAR      │ The second regular message │
-│ 2019-01-18 14:34:53 │ WARNING      │ The first warning message  │
-└─────────────────────┴──────────────┴────────────────────────────┘
-```
-
-[Article Original](https://clickhouse.tech/docs/en/operations/table_engines/stripelog/) <!--hide-->
diff --git a/docs/fr/engines/table-engines/log-family/tinylog.md b/docs/fr/engines/table-engines/log-family/tinylog.md
deleted file mode 100644
index 275b621718c..00000000000
--- a/docs/fr/engines/table-engines/log-family/tinylog.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 34
-toc_title: TinyLog
----
-
-# TinyLog {#tinylog}
-
-Le moteur appartient à la famille de moteurs en rondins. Voir [Famille De Moteurs En Rondins](index.md) pour les propriétés communes des moteurs en rondins et leurs différences.
-
-Ce moteur de table est généralement utilisé avec la méthode write-once: écrivez des données une fois, puis lisez-les autant de fois que nécessaire. Par exemple, vous pouvez utiliser `TinyLog`- tapez des tables pour les données intermédiaires qui sont traitées en petits lots. Notez que le stockage des données dans un grand nombre de petites tables est inefficace.
-
-Les requêtes sont exécutées dans un flux unique. En d'autres termes, ce moteur est destiné à des tables relativement petites (jusqu'à environ 1 000 000 de lignes). Il est logique d'utiliser ce moteur de table si vous avez beaucoup de petites tables, car il est plus simple que le [Journal](log.md) moteur (moins de fichiers doivent être ouverts).
-
-[Article Original](https://clickhouse.tech/docs/en/operations/table_engines/tinylog/) <!--hide-->
diff --git a/docs/fr/engines/table-engines/mergetree-family/aggregatingmergetree.md b/docs/fr/engines/table-engines/mergetree-family/aggregatingmergetree.md
deleted file mode 100644
index e8e74960545..00000000000
--- a/docs/fr/engines/table-engines/mergetree-family/aggregatingmergetree.md
+++ /dev/null
@@ -1,105 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 35
-toc_title: AggregatingMergeTree
----
-
-# Aggregatingmergetree {#aggregatingmergetree}
-
-Le moteur hérite de [MergeTree](mergetree.md#table_engines-mergetree), modifier la logique pour les parties de données Fusion. ClickHouse remplace toutes les lignes avec la même clé primaire (ou, plus précisément, avec la même [clé de tri](mergetree.md)) avec une seule ligne (dans un rayon d'une partie des données) qui stocke une combinaison d'états de fonctions d'agrégation.
-
-Vous pouvez utiliser `AggregatingMergeTree` tables pour l'agrégation incrémentielle des données, y compris pour les vues matérialisées agrégées.
-
-Le moteur traite toutes les colonnes avec les types suivants:
-
--   [AggregateFunction](../../../sql-reference/data-types/aggregatefunction.md)
--   [SimpleAggregateFunction](../../../sql-reference/data-types/simpleaggregatefunction.md)
-
-Il est approprié d'utiliser `AggregatingMergeTree` si elle réduit le nombre de lignes par commande.
-
-## Création d'une Table {#creating-a-table}
-
-``` sql
-CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
-(
-    name1 [type1] [DEFAULT|MATERIALIZED|ALIAS expr1],
-    name2 [type2] [DEFAULT|MATERIALIZED|ALIAS expr2],
-    ...
-) ENGINE = AggregatingMergeTree()
-[PARTITION BY expr]
-[ORDER BY expr]
-[SAMPLE BY expr]
-[TTL expr]
-[SETTINGS name=value, ...]
-```
-
-Pour une description des paramètres de requête, voir [demande de description](../../../sql-reference/statements/create.md).
-
-**Les clauses de requête**
-
-Lors de la création d'un `AggregatingMergeTree` la table de la même [clause](mergetree.md) sont nécessaires, comme lors de la création d'un `MergeTree` table.
-
-<details markdown="1">
-
-<summary>Méthode obsolète pour créer une Table</summary>
-
-!!! attention "Attention"
-    N'utilisez pas cette méthode dans les nouveaux projets et, si possible, remplacez les anciens projets par la méthode décrite ci-dessus.
-
-``` sql
-CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
-(
-    name1 [type1] [DEFAULT|MATERIALIZED|ALIAS expr1],
-    name2 [type2] [DEFAULT|MATERIALIZED|ALIAS expr2],
-    ...
-) ENGINE [=] AggregatingMergeTree(date-column [, sampling_expression], (primary, key), index_granularity)
-```
-
-Tous les paramètres ont la même signification que dans `MergeTree`.
-</details>
-
-## Sélectionner et insérer {#select-and-insert}
-
-Pour insérer des données, utilisez [INSERT SELECT](../../../sql-reference/statements/insert-into.md) requête avec l'ensemble-l'État des fonctions.
-Lors de la sélection des données `AggregatingMergeTree` table, utilisez `GROUP BY` et les mêmes fonctions d'agrégat que lors de l'insertion de données, mais en utilisant `-Merge` suffixe.
-
-Dans les résultats de `SELECT` requête, les valeurs de `AggregateFunction` type ont une représentation binaire spécifique à l'implémentation pour tous les formats de sortie ClickHouse. Si les données de vidage dans, par exemple, `TabSeparated` format avec `SELECT` requête alors ce vidage peut être chargé en utilisant `INSERT` requête.
-
-## Exemple D'une vue matérialisée agrégée {#example-of-an-aggregated-materialized-view}
-
-`AggregatingMergeTree` vue matérialisée qui regarde le `test.visits` table:
-
-``` sql
-CREATE MATERIALIZED VIEW test.basic
-ENGINE = AggregatingMergeTree() PARTITION BY toYYYYMM(StartDate) ORDER BY (CounterID, StartDate)
-AS SELECT
-    CounterID,
-    StartDate,
-    sumState(Sign)    AS Visits,
-    uniqState(UserID) AS Users
-FROM test.visits
-GROUP BY CounterID, StartDate;
-```
-
-Insertion de données dans la `test.visits` table.
-
-``` sql
-INSERT INTO test.visits ...
-```
-
-Les données sont insérées dans la table et la vue `test.basic` que va effectuer l'agrégation.
-
-Pour obtenir les données agrégées, nous devons exécuter une requête telle que `SELECT ... GROUP BY ...` à partir de la vue `test.basic`:
-
-``` sql
-SELECT
-    StartDate,
-    sumMerge(Visits) AS Visits,
-    uniqMerge(Users) AS Users
-FROM test.basic
-GROUP BY StartDate
-ORDER BY StartDate;
-```
-
-[Article Original](https://clickhouse.tech/docs/en/operations/table_engines/aggregatingmergetree/) <!--hide-->
diff --git a/docs/fr/engines/table-engines/mergetree-family/collapsingmergetree.md b/docs/fr/engines/table-engines/mergetree-family/collapsingmergetree.md
deleted file mode 100644
index 80f61622539..00000000000
--- a/docs/fr/engines/table-engines/mergetree-family/collapsingmergetree.md
+++ /dev/null
@@ -1,306 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 36
-toc_title: CollapsingMergeTree
----
-
-# CollapsingMergeTree {#table_engine-collapsingmergetree}
-
-Le moteur hérite de [MergeTree](mergetree.md) et ajoute la logique de l'effondrement des lignes de données de pièces algorithme de fusion.
-
-`CollapsingMergeTree` supprime de manière asynchrone (réduit) les paires de lignes si tous les champs d'une clé de tri (`ORDER BY`) sont équivalents à l'exception du champ particulier `Sign` ce qui peut avoir `1` et `-1` valeur. Les lignes sans paire sont conservées. Pour plus de détails, voir le [Effondrer](#table_engine-collapsingmergetree-collapsing) la section du document.
-
-Le moteur peut réduire considérablement le volume de stockage et augmenter l'efficacité de `SELECT` requête en conséquence.
-
-## Création d'une Table {#creating-a-table}
-
-``` sql
-CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
-(
-    name1 [type1] [DEFAULT|MATERIALIZED|ALIAS expr1],
-    name2 [type2] [DEFAULT|MATERIALIZED|ALIAS expr2],
-    ...
-) ENGINE = CollapsingMergeTree(sign)
-[PARTITION BY expr]
-[ORDER BY expr]
-[SAMPLE BY expr]
-[SETTINGS name=value, ...]
-```
-
-Pour une description des paramètres de requête, voir [description de la requête](../../../sql-reference/statements/create.md).
-
-**Paramètres CollapsingMergeTree**
-
--   `sign` — Name of the column with the type of row: `1` est un “state” rangée, `-1` est un “cancel” rangée.
-
-    Column data type — `Int8`.
-
-**Les clauses de requête**
-
-Lors de la création d'un `CollapsingMergeTree` de table, de la même [les clauses de requête](mergetree.md#table_engine-mergetree-creating-a-table) sont nécessaires, comme lors de la création d'un `MergeTree` table.
-
-<details markdown="1">
-
-<summary>Méthode obsolète pour créer une Table</summary>
-
-!!! attention "Attention"
-    N'utilisez pas cette méthode dans les nouveaux projets et, si possible, remplacez les anciens projets par la méthode décrite ci-dessus.
-
-``` sql
-CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
-(
-    name1 [type1] [DEFAULT|MATERIALIZED|ALIAS expr1],
-    name2 [type2] [DEFAULT|MATERIALIZED|ALIAS expr2],
-    ...
-) ENGINE [=] CollapsingMergeTree(date-column [, sampling_expression], (primary, key), index_granularity, sign)
-```
-
-Tous les paramètres excepté `sign` ont la même signification que dans `MergeTree`.
-
--   `sign` — Name of the column with the type of row: `1` — “state” rangée, `-1` — “cancel” rangée.
-
-    Column Data Type — `Int8`.
-
-</details>
-
-## Effondrer {#table_engine-collapsingmergetree-collapsing}
-
-### Données {#data}
-
-Considérez la situation où vous devez enregistrer des données en constante évolution pour un objet. Il semble logique d'avoir une ligne pour un objet et de la mettre à jour à tout changement, mais l'opération de mise à jour est coûteuse et lente pour le SGBD car elle nécessite une réécriture des données dans le stockage. Si vous avez besoin d'écrire des données rapidement, la mise à jour n'est pas acceptable, mais vous pouvez écrire les modifications d'un objet de manière séquentielle comme suit.
-
-Utilisez la colonne particulière `Sign`. Si `Sign = 1` cela signifie que la ligne est un état d'un objet, appelons-la “state” rangée. Si `Sign = -1` il signifie l'annulation de l'état d'un objet avec les mêmes attributs, nous allons l'appeler “cancel” rangée.
-
-Par exemple, nous voulons calculer combien de pages les utilisateurs ont vérifié sur un site et combien de temps ils étaient là. À un certain moment nous écrire la ligne suivante avec l'état de l'activité de l'utilisateur:
-
-``` text
-┌──────────────UserID─┬─PageViews─┬─Duration─┬─Sign─┐
-│ 4324182021466249494 │         5 │      146 │    1 │
-└─────────────────────┴───────────┴──────────┴──────┘
-```
-
-À un moment donné, nous enregistrons le changement d'activité de l'utilisateur et l'écrivons avec les deux lignes suivantes.
-
-``` text
-┌──────────────UserID─┬─PageViews─┬─Duration─┬─Sign─┐
-│ 4324182021466249494 │         5 │      146 │   -1 │
-│ 4324182021466249494 │         6 │      185 │    1 │
-└─────────────────────┴───────────┴──────────┴──────┘
-```
-
-La première ligne annule le précédent état de l'objet (utilisateur). Il doit copier les champs de clé de tri de l'état annulé sauf `Sign`.
-
-La deuxième ligne contient l'état actuel.
-
-Comme nous avons besoin seulement le dernier état de l'activité de l'utilisateur, les lignes
-
-``` text
-┌──────────────UserID─┬─PageViews─┬─Duration─┬─Sign─┐
-│ 4324182021466249494 │         5 │      146 │    1 │
-│ 4324182021466249494 │         5 │      146 │   -1 │
-└─────────────────────┴───────────┴──────────┴──────┘
-```
-
-peut être supprimé en réduisant l'état invalide (ancien) d'un objet. `CollapsingMergeTree` fait cela lors de la fusion des parties de données.
-
-Pourquoi nous avons besoin de 2 lignes pour chaque changement lu dans le [Algorithme](#table_engine-collapsingmergetree-collapsing-algorithm) paragraphe.
-
-**Propriétés particulières d'une telle approche**
-
-1.  Le programme qui écrit les données doit se souvenir de l'état d'un objet pour pouvoir l'annuler. “Cancel” string doit contenir des copies des champs de clé de tri du “state” chaîne et le contraire `Sign`. Il augmente la taille initiale de stockage, mais permet d'écrire les données rapidement.
-2.  Les tableaux de plus en plus longs dans les colonnes réduisent l'efficacité du moteur en raison de la charge pour l'écriture. Plus les données sont simples, plus l'efficacité est élevée.
-3.  Le `SELECT` les résultats dépendent fortement de la cohérence de l'historique des modifications d'objet. Être précis lors de la préparation des données pour l'insertion. Vous pouvez obtenir des résultats imprévisibles dans des données incohérentes, par exemple des valeurs négatives pour des mesures non négatives telles que la profondeur de session.
-
-### Algorithme {#table_engine-collapsingmergetree-collapsing-algorithm}
-
-Lorsque ClickHouse fusionne des parties de données, chaque groupe de lignes consécutives avec la même clé de tri (`ORDER BY`) est réduit à pas plus de deux rangées, une avec `Sign = 1` (“state” ligne) et l'autre avec `Sign = -1` (“cancel” rangée). En d'autres termes, les entrées de l'effondrement.
-
-Pour chaque partie de données résultante clickhouse enregistre:
-
-1.  Première “cancel” et la dernière “state” lignes, si le nombre de “state” et “cancel” lignes correspond et la dernière ligne est un “state” rangée.
-2.  La dernière “state” ligne, si il y a plus de “state” les lignes de “cancel” rangée.
-3.  Première “cancel” ligne, si il y a plus de “cancel” les lignes de “state” rangée.
-4.  Aucune des lignes, dans tous les autres cas.
-
-Aussi quand il y a au moins 2 plus “state” les lignes de “cancel” les lignes, ou au moins 2 de plus “cancel” rangs puis “state” la fusion continue, mais ClickHouse traite cette situation comme une erreur logique et l'enregistre dans le journal du serveur. Cette erreur peut se produire si les mêmes données ont été insérées plus d'une fois.
-
-Ainsi, l'effondrement ne devrait pas changer les résultats du calcul des statistiques.
-Les changements se sont progressivement effondrés de sorte qu'à la fin seul le dernier état de presque tous les objets à gauche.
-
-Le `Sign` est nécessaire car l'algorithme de fusion ne garantit pas que toutes les lignes avec la même clé de tri seront dans la même partie de données résultante et même sur le même serveur physique. Processus de ClickHouse `SELECT` les requêtes avec plusieurs threads, et il ne peut pas prédire l'ordre des lignes dans le résultat. L'agrégation est nécessaire s'il y a un besoin d'obtenir complètement “collapsed” les données de `CollapsingMergeTree` table.
-
-Pour finaliser la réduction, écrivez une requête avec `GROUP BY` fonctions de clause et d'agrégation qui tiennent compte du signe. Par exemple, pour calculer la quantité, l'utilisation `sum(Sign)` plutôt `count()`. Pour calculer la somme de quelque chose, utilisez `sum(Sign * x)` plutôt `sum(x)` et ainsi de suite , et également ajouter `HAVING sum(Sign) > 0`.
-
-Aggregate `count`, `sum` et `avg` pourrait être calculée de cette manière. Aggregate `uniq` peut être calculé si un objet a au moins un état non réduit. Aggregate `min` et `max` impossible de calculer parce que `CollapsingMergeTree` n'enregistre pas l'historique des valeurs des États réduits.
-
-Si vous avez besoin d'extraire des données sans agrégation (par exemple, pour vérifier si des lignes sont présentes dont les valeurs les plus récentes correspondent à certaines conditions), vous pouvez utiliser `FINAL` le modificateur du `FROM` clause. Cette approche est nettement moins efficace.
-
-## Exemple D'utilisation {#example-of-use}
-
-Les données de l'exemple:
-
-``` text
-┌──────────────UserID─┬─PageViews─┬─Duration─┬─Sign─┐
-│ 4324182021466249494 │         5 │      146 │    1 │
-│ 4324182021466249494 │         5 │      146 │   -1 │
-│ 4324182021466249494 │         6 │      185 │    1 │
-└─────────────────────┴───────────┴──────────┴──────┘
-```
-
-Création de la table:
-
-``` sql
-CREATE TABLE UAct
-(
-    UserID UInt64,
-    PageViews UInt8,
-    Duration UInt8,
-    Sign Int8
-)
-ENGINE = CollapsingMergeTree(Sign)
-ORDER BY UserID
-```
-
-Insertion des données:
-
-``` sql
-INSERT INTO UAct VALUES (4324182021466249494, 5, 146, 1)
-```
-
-``` sql
-INSERT INTO UAct VALUES (4324182021466249494, 5, 146, -1),(4324182021466249494, 6, 185, 1)
-```
-
-Nous utilisons deux `INSERT` requêtes pour créer deux parties de données différentes. Si nous insérons les données avec une requête, ClickHouse crée une partie de données et n'effectuera aucune fusion.
-
-L'obtention de données:
-
-``` sql
-SELECT * FROM UAct
-```
-
-``` text
-┌──────────────UserID─┬─PageViews─┬─Duration─┬─Sign─┐
-│ 4324182021466249494 │         5 │      146 │   -1 │
-│ 4324182021466249494 │         6 │      185 │    1 │
-└─────────────────────┴───────────┴──────────┴──────┘
-┌──────────────UserID─┬─PageViews─┬─Duration─┬─Sign─┐
-│ 4324182021466249494 │         5 │      146 │    1 │
-└─────────────────────┴───────────┴──────────┴──────┘
-```
-
-Que voyons-nous et où s'effondre?
-
-Avec deux `INSERT` requêtes, nous avons créé 2 parties de données. Le `SELECT` la requête a été effectuée dans 2 threads, et nous avons obtenu un ordre aléatoire de lignes. L'effondrement n'a pas eu lieu car il n'y avait pas encore de fusion des parties de données. ClickHouse fusionne une partie des données dans un moment inconnu que nous ne pouvons pas prédire.
-
-Nous avons donc besoin d'agrégation:
-
-``` sql
-SELECT
-    UserID,
-    sum(PageViews * Sign) AS PageViews,
-    sum(Duration * Sign) AS Duration
-FROM UAct
-GROUP BY UserID
-HAVING sum(Sign) > 0
-```
-
-``` text
-┌──────────────UserID─┬─PageViews─┬─Duration─┐
-│ 4324182021466249494 │         6 │      185 │
-└─────────────────────┴───────────┴──────────┘
-```
-
-Si nous n'avons pas besoin d'agrégation et de vouloir forcer l'effondrement, nous pouvons utiliser `FINAL` le modificateur `FROM` clause.
-
-``` sql
-SELECT * FROM UAct FINAL
-```
-
-``` text
-┌──────────────UserID─┬─PageViews─┬─Duration─┬─Sign─┐
-│ 4324182021466249494 │         6 │      185 │    1 │
-└─────────────────────┴───────────┴──────────┴──────┘
-```
-
-Cette façon de sélectionner les données est très inefficace. Ne l'utilisez pas pour les grandes tables.
-
-## Exemple D'une autre approche {#example-of-another-approach}
-
-Les données de l'exemple:
-
-``` text
-┌──────────────UserID─┬─PageViews─┬─Duration─┬─Sign─┐
-│ 4324182021466249494 │         5 │      146 │    1 │
-│ 4324182021466249494 │        -5 │     -146 │   -1 │
-│ 4324182021466249494 │         6 │      185 │    1 │
-└─────────────────────┴───────────┴──────────┴──────┘
-```
-
-L'idée est que les fusions ne prennent en compte que les champs clés. Et dans le “Cancel” ligne nous pouvons spécifier des valeurs négatives qui égalisent la version précédente de la ligne lors de la sommation sans utiliser la colonne de signe. Pour cette approche, il est nécessaire de changer le type de données `PageViews`,`Duration` pour stocker les valeurs négatives de UInt8 - \> Int16.
-
-``` sql
-CREATE TABLE UAct
-(
-    UserID UInt64,
-    PageViews Int16,
-    Duration Int16,
-    Sign Int8
-)
-ENGINE = CollapsingMergeTree(Sign)
-ORDER BY UserID
-```
-
-Nous allons tester l'approche:
-
-``` sql
-insert into UAct values(4324182021466249494,  5,  146,  1);
-insert into UAct values(4324182021466249494, -5, -146, -1);
-insert into UAct values(4324182021466249494,  6,  185,  1);
-
-select * from UAct final; // avoid using final in production (just for a test or small tables)
-```
-
-``` text
-┌──────────────UserID─┬─PageViews─┬─Duration─┬─Sign─┐
-│ 4324182021466249494 │         6 │      185 │    1 │
-└─────────────────────┴───────────┴──────────┴──────┘
-```
-
-``` sql
-SELECT
-    UserID,
-    sum(PageViews) AS PageViews,
-    sum(Duration) AS Duration
-FROM UAct
-GROUP BY UserID
-```text
-┌──────────────UserID─┬─PageViews─┬─Duration─┐
-│ 4324182021466249494 │         6 │      185 │
-└─────────────────────┴───────────┴──────────┘
-```
-
-``` sqk
-select count() FROM UAct
-```
-
-``` text
-┌─count()─┐
-│       3 │
-└─────────┘
-```
-
-``` sql
-optimize table UAct final;
-
-select * FROM UAct
-```
-
-``` text
-┌──────────────UserID─┬─PageViews─┬─Duration─┬─Sign─┐
-│ 4324182021466249494 │         6 │      185 │    1 │
-└─────────────────────┴───────────┴──────────┴──────┘
-```
-
-[Article Original](https://clickhouse.tech/docs/en/operations/table_engines/collapsingmergetree/) <!--hide-->
diff --git a/docs/fr/engines/table-engines/mergetree-family/custom-partitioning-key.md b/docs/fr/engines/table-engines/mergetree-family/custom-partitioning-key.md
deleted file mode 100644
index 2fa80236adc..00000000000
--- a/docs/fr/engines/table-engines/mergetree-family/custom-partitioning-key.md
+++ /dev/null
@@ -1,127 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 32
-toc_title: "Cl\xE9 De Partitionnement Personnalis\xE9e"
----
-
-# Clé De Partitionnement Personnalisée {#custom-partitioning-key}
-
-Le partitionnement est disponible pour [MergeTree](mergetree.md) table de famille (y compris les [répliqué](replication.md) table). [Les vues matérialisées](../special/materializedview.md#materializedview) basé sur les tables MergeTree prennent également en charge le partitionnement.
-
-Une partition est une combinaison logique d'enregistrements dans une table selon un critère spécifié. Vous pouvez définir une partition par un critère arbitraire, comme, par mois, par jour, ou par type d'événement. Chaque partition est stockée séparément pour simplifier les manipulations de ces données. Lors de l'accès aux données, ClickHouse utilise le plus petit sous-ensemble de partitions possible.
-
-La partition est spécifiée dans le `PARTITION BY expr` clause lors de [création d'une table](mergetree.md#table_engine-mergetree-creating-a-table). La clé de partition peut être n'importe quelle expression des colonnes de la table. Par exemple, pour spécifier le partitionnement par mois, utilisez l'expression `toYYYYMM(date_column)`:
-
-``` sql
-CREATE TABLE visits
-(
-    VisitDate Date,
-    Hour UInt8,
-    ClientID UUID
-)
-ENGINE = MergeTree()
-PARTITION BY toYYYYMM(VisitDate)
-ORDER BY Hour;
-```
-
-La clé de partition peut également être un tuple d'expressions (similaire à la [clé primaire](mergetree.md#primary-keys-and-indexes-in-queries)). Exemple:
-
-``` sql
-ENGINE = ReplicatedCollapsingMergeTree('/clickhouse/tables/name', 'replica1', Sign)
-PARTITION BY (toMonday(StartDate), EventType)
-ORDER BY (CounterID, StartDate, intHash32(UserID));
-```
-
-Dans cet exemple, nous définissons le partitionnement par les types d'événements qui se sont produits au cours de la semaine en cours.
-
-Lors de l'insertion de nouvelles données dans une table, ces données sont stockées en tant que partie séparée (bloc) triée par la clé primaire. Dans 10-15 minutes après l'insertion, les parties de la même partition sont fusionnées dans la partie entière.
-
-!!! info "Info"
-    Une fusion ne fonctionne que pour les parties de données qui ont la même valeur pour l'expression de partitionnement. Cela signifie **vous ne devriez pas faire des partitions trop granulaires** (plus d'un millier de partitions). Sinon, l' `SELECT` la requête fonctionne mal en raison d'un nombre déraisonnablement élevé de fichiers dans le système de fichiers et des descripteurs de fichiers ouverts.
-
-L'utilisation de la [système.partie](../../../operations/system-tables.md#system_tables-parts) table pour afficher les parties et les partitions de la table. Par exemple, supposons que nous avons une `visits` table avec partitionnement par mois. Nous allons effectuer le `SELECT` la requête pour l' `system.parts` table:
-
-``` sql
-SELECT
-    partition,
-    name,
-    active
-FROM system.parts
-WHERE table = 'visits'
-```
-
-``` text
-┌─partition─┬─name───────────┬─active─┐
-│ 201901    │ 201901_1_3_1   │      0 │
-│ 201901    │ 201901_1_9_2   │      1 │
-│ 201901    │ 201901_8_8_0   │      0 │
-│ 201901    │ 201901_9_9_0   │      0 │
-│ 201902    │ 201902_4_6_1   │      1 │
-│ 201902    │ 201902_10_10_0 │      1 │
-│ 201902    │ 201902_11_11_0 │      1 │
-└───────────┴────────────────┴────────┘
-```
-
-Le `partition` colonne contient les noms des partitions. Il y a deux partitions dans cet exemple: `201901` et `201902`. Vous pouvez utiliser cette valeur de colonne pour spécifier le nom de [ALTER … PARTITION](#alter_manipulations-with-partitions) requête.
-
-Le `name` colonne contient les noms des parties de données de partition. Vous pouvez utiliser cette colonne pour spécifier le nom de la partie dans la [ALTER ATTACH PART](#alter_attach-partition) requête.
-
-Décomposons le nom de la première partie: `201901_1_3_1`:
-
--   `201901` est le nom de la partition.
--   `1` est le nombre minimum du bloc de données.
--   `3` est le nombre maximal de blocs de données.
--   `1` est le niveau de bloc (la profondeur de l'arbre de fusion à partir duquel il est formé).
-
-!!! info "Info"
-    Les parties des tables de type ancien ont le nom: `20190117_20190123_2_2_0` (date minimale - date maximale - numéro de bloc minimum - numéro de bloc maximum-niveau).
-
-Le `active` colonne indique le statut de la partie. `1` est active; `0` est inactif. Les parties inactives sont, par exemple, des parties source restant après la fusion à une partie plus grande. Les parties de données corrompues sont également indiquées comme inactives.
-
-Comme vous pouvez le voir dans l'exemple, il y a plusieurs parties séparées de la même partition (par exemple, `201901_1_3_1` et `201901_1_9_2`). Cela signifie que ces parties ne sont pas encore fusionnées. Clickhouse fusionne les parties insérées des données périodiquement, environ 15 minutes après l'insertion. En outre, vous pouvez effectuer une fusion non planifiée en utilisant [OPTIMIZE](../../../sql-reference/statements/misc.md#misc_operations-optimize) requête. Exemple:
-
-``` sql
-OPTIMIZE TABLE visits PARTITION 201902;
-```
-
-``` text
-┌─partition─┬─name───────────┬─active─┐
-│ 201901    │ 201901_1_3_1   │      0 │
-│ 201901    │ 201901_1_9_2   │      1 │
-│ 201901    │ 201901_8_8_0   │      0 │
-│ 201901    │ 201901_9_9_0   │      0 │
-│ 201902    │ 201902_4_6_1   │      0 │
-│ 201902    │ 201902_4_11_2  │      1 │
-│ 201902    │ 201902_10_10_0 │      0 │
-│ 201902    │ 201902_11_11_0 │      0 │
-└───────────┴────────────────┴────────┘
-```
-
-Les parties inactives seront supprimées environ 10 minutes après la fusion.
-
-Une autre façon d'afficher un ensemble de pièces et de partitions est d'aller dans le répertoire de la table: `/var/lib/clickhouse/data/<database>/<table>/`. Exemple:
-
-``` bash
-/var/lib/clickhouse/data/default/visits$ ls -l
-total 40
-drwxr-xr-x 2 clickhouse clickhouse 4096 Feb  1 16:48 201901_1_3_1
-drwxr-xr-x 2 clickhouse clickhouse 4096 Feb  5 16:17 201901_1_9_2
-drwxr-xr-x 2 clickhouse clickhouse 4096 Feb  5 15:52 201901_8_8_0
-drwxr-xr-x 2 clickhouse clickhouse 4096 Feb  5 15:52 201901_9_9_0
-drwxr-xr-x 2 clickhouse clickhouse 4096 Feb  5 16:17 201902_10_10_0
-drwxr-xr-x 2 clickhouse clickhouse 4096 Feb  5 16:17 201902_11_11_0
-drwxr-xr-x 2 clickhouse clickhouse 4096 Feb  5 16:19 201902_4_11_2
-drwxr-xr-x 2 clickhouse clickhouse 4096 Feb  5 12:09 201902_4_6_1
-drwxr-xr-x 2 clickhouse clickhouse 4096 Feb  1 16:48 detached
-```
-
-Dossier ‘201901_1_1_0’, ‘201901_1_7_1’ et ainsi de suite sont les répertoires des parties. Chaque partie se rapporte à une partition correspondante et contient des données juste pour un certain mois (la table dans cet exemple a partitionnement par mois).
-
-Le `detached` le répertoire contient des parties qui ont été détachées de la table à l'aide [DETACH](../../../sql-reference/statements/alter.md#alter_detach-partition) requête. Les parties corrompues sont également déplacées dans ce répertoire, au lieu d'être supprimées. Le serveur n'utilise pas les pièces de la `detached` directory. You can add, delete, or modify the data in this directory at any time – the server will not know about this until you run the [ATTACH](../../../sql-reference/statements/alter.md#alter_attach-partition) requête.
-
-Notez que sur le serveur d'exploitation, vous ne pouvez pas modifier manuellement l'ensemble de pièces ou leurs données sur le système de fichiers, car le serveur ne le saura pas. Pour les tables non répliquées, vous pouvez le faire lorsque le serveur est arrêté, mais ce n'est pas recommandé. Pour les tables répliquées, l'ensemble de pièces ne peut en aucun cas être modifié.
-
-ClickHouse vous permet d'effectuer des opérations avec les partitions: les supprimer, copier d'une table à une autre, ou créer une sauvegarde. Voir la liste de toutes les opérations de la section [Manipulations avec des Partitions et des pièces](../../../sql-reference/statements/alter.md#alter_manipulations-with-partitions).
-
-[Article Original](https://clickhouse.tech/docs/en/operations/table_engines/custom_partitioning_key/) <!--hide-->
diff --git a/docs/fr/engines/table-engines/mergetree-family/graphitemergetree.md b/docs/fr/engines/table-engines/mergetree-family/graphitemergetree.md
deleted file mode 100644
index 03fae8ea261..00000000000
--- a/docs/fr/engines/table-engines/mergetree-family/graphitemergetree.md
+++ /dev/null
@@ -1,174 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 38
-toc_title: GraphiteMergeTree
----
-
-# GraphiteMergeTree {#graphitemergetree}
-
-Ce moteur est conçu pour l'amincissement et l'agrégation / moyenne (cumul) [Graphite](http://graphite.readthedocs.io/en/latest/index.html) données. Il peut être utile aux développeurs qui veulent utiliser ClickHouse comme un magasin de données pour Graphite.
-
-Vous pouvez utiliser N'importe quel moteur de table ClickHouse pour stocker les données Graphite si vous n'avez pas besoin de cumul, mais si vous avez besoin d'un cumul, utilisez `GraphiteMergeTree`. Le moteur réduit le volume de stockage et augmente l'efficacité des requêtes de Graphite.
-
-Le moteur hérite des propriétés de [MergeTree](mergetree.md).
-
-## Création d'une Table {#creating-table}
-
-``` sql
-CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
-(
-    Path String,
-    Time DateTime,
-    Value <Numeric_type>,
-    Version <Numeric_type>
-    ...
-) ENGINE = GraphiteMergeTree(config_section)
-[PARTITION BY expr]
-[ORDER BY expr]
-[SAMPLE BY expr]
-[SETTINGS name=value, ...]
-```
-
-Voir une description détaillée de la [CREATE TABLE](../../../sql-reference/statements/create.md#create-table-query) requête.
-
-Un tableau pour les données de Graphite devrait avoir les colonnes suivantes pour les données suivantes:
-
--   Nom métrique (Capteur De Graphite). Type de données: `String`.
-
--   Temps de mesure de la métrique. Type de données: `DateTime`.
-
--   La valeur de la métrique. Type de données: tout numérique.
-
--   La Version de la métrique. Type de données: tout numérique.
-
-    ClickHouse enregistre les lignes avec la version la plus élevée ou la dernière écrite si les versions sont les mêmes. Les autres lignes sont supprimées lors de la fusion des parties de données.
-
-Les noms de ces colonnes doivent être définis dans la configuration de cumul.
-
-**GraphiteMergeTree paramètres**
-
--   `config_section` — Name of the section in the configuration file, where are the rules of rollup set.
-
-**Les clauses de requête**
-
-Lors de la création d'un `GraphiteMergeTree` de table, de la même [clause](mergetree.md#table_engine-mergetree-creating-a-table) sont nécessaires, comme lors de la création d'un `MergeTree` table.
-
-<details markdown="1">
-
-<summary>Méthode obsolète pour créer une Table</summary>
-
-!!! attention "Attention"
-    N'utilisez pas cette méthode dans les nouveaux projets et, si possible, remplacez les anciens projets par la méthode décrite ci-dessus.
-
-``` sql
-CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
-(
-    EventDate Date,
-    Path String,
-    Time DateTime,
-    Value <Numeric_type>,
-    Version <Numeric_type>
-    ...
-) ENGINE [=] GraphiteMergeTree(date-column [, sampling_expression], (primary, key), index_granularity, config_section)
-```
-
-Tous les paramètres excepté `config_section` ont la même signification que dans `MergeTree`.
-
--   `config_section` — Name of the section in the configuration file, where are the rules of rollup set.
-
-</details>
-
-## Configuration De Cumul {#rollup-configuration}
-
-Les paramètres de cumul sont définis par [graphite_rollup](../../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-graphite) paramètre dans la configuration du serveur. Le nom du paramètre pourrait être tout. Vous pouvez créer plusieurs configurations et les utiliser pour différentes tables.
-
-Structure de configuration de cumul:
-
-      required-columns
-      patterns
-
-### Les Colonnes Requises {#required-columns}
-
--   `path_column_name` — The name of the column storing the metric name (Graphite sensor). Default value: `Path`.
--   `time_column_name` — The name of the column storing the time of measuring the metric. Default value: `Time`.
--   `value_column_name` — The name of the column storing the value of the metric at the time set in `time_column_name`. Valeur par défaut: `Value`.
--   `version_column_name` — The name of the column storing the version of the metric. Default value: `Timestamp`.
-
-### Modèle {#patterns}
-
-La Structure de la `patterns` section:
-
-``` text
-pattern
-    regexp
-    function
-pattern
-    regexp
-    age + precision
-    ...
-pattern
-    regexp
-    function
-    age + precision
-    ...
-pattern
-    ...
-default
-    function
-    age + precision
-    ...
-```
-
-!!! warning "Attention"
-    Les motifs doivent être strictement commandés:
-
-      1. Patterns without `function` or `retention`.
-      1. Patterns with both `function` and `retention`.
-      1. Pattern `default`.
-
-Lors du traitement d'une ligne, ClickHouse vérifie les règles `pattern` section. Chacun `pattern` (comprendre `default`) les articles peuvent contenir des `function` paramètre d'agrégation, `retention` les paramètres ou les deux à la fois. Si le nom de la métrique correspond `regexp` les règles de la `pattern` section (ou sections) sont appliquées; sinon, les règles de la `default` section sont utilisés.
-
-Champs pour `pattern` et `default` section:
-
--   `regexp`– A pattern for the metric name.
--   `age` – The minimum age of the data in seconds.
--   `precision`– How precisely to define the age of the data in seconds. Should be a divisor for 86400 (seconds in a day).
--   `function` – The name of the aggregating function to apply to data whose age falls within the range `[age, age + precision]`.
-
-### Exemple De Configuration {#configuration-example}
-
-``` xml
-<graphite_rollup>
-    <version_column_name>Version</version_column_name>
-    <pattern>
-        <regexp>click_cost</regexp>
-        <function>any</function>
-        <retention>
-            <age>0</age>
-            <precision>5</precision>
-        </retention>
-        <retention>
-            <age>86400</age>
-            <precision>60</precision>
-        </retention>
-    </pattern>
-    <default>
-        <function>max</function>
-        <retention>
-            <age>0</age>
-            <precision>60</precision>
-        </retention>
-        <retention>
-            <age>3600</age>
-            <precision>300</precision>
-        </retention>
-        <retention>
-            <age>86400</age>
-            <precision>3600</precision>
-        </retention>
-    </default>
-</graphite_rollup>
-```
-
-[Article Original](https://clickhouse.tech/docs/en/operations/table_engines/graphitemergetree/) <!--hide-->
diff --git a/docs/fr/engines/table-engines/mergetree-family/index.md b/docs/fr/engines/table-engines/mergetree-family/index.md
deleted file mode 100644
index e2de11a7591..00000000000
--- a/docs/fr/engines/table-engines/mergetree-family/index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: Famille MergeTree
-toc_priority: 28
----
-
-
diff --git a/docs/fr/engines/table-engines/mergetree-family/mergetree.md b/docs/fr/engines/table-engines/mergetree-family/mergetree.md
deleted file mode 100644
index 475682bfc93..00000000000
--- a/docs/fr/engines/table-engines/mergetree-family/mergetree.md
+++ /dev/null
@@ -1,654 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 30
-toc_title: MergeTree
----
-
-# MergeTree {#table_engines-mergetree}
-
-Le `MergeTree` moteur et autres moteurs de cette famille (`*MergeTree`) sont les moteurs de table ClickHouse les plus robustes.
-
-Les moteurs de la `MergeTree` famille sont conçus pour l'insertion d'une très grande quantité de données dans une table. Les données sont rapidement écrites dans la table partie par partie, puis des règles sont appliquées pour fusionner les parties en arrière-plan. Cette méthode est beaucoup plus efficace que de réécrire continuellement les données dans le stockage pendant l'insertion.
-
-Principales caractéristiques:
-
--   Stocke les données triées par clé primaire.
-
-    Cela vous permet de créer un petit index clairsemé qui aide à trouver les données plus rapidement.
-
--   Les Partitions peuvent être utilisées si [clé de partitionnement](custom-partitioning-key.md) est spécifié.
-
-    ClickHouse prend en charge certaines opérations avec des partitions plus efficaces que les opérations générales sur les mêmes données avec le même résultat. ClickHouse Coupe également automatiquement les données de partition où la clé de partitionnement est spécifiée dans la requête. Cela améliore également les performances de la requête.
-
--   Prise en charge de la réplication des données.
-
-    La famille de `ReplicatedMergeTree` tables fournit la réplication des données. Pour plus d'informations, voir [Réplication des données](replication.md).
-
--   Appui d'échantillonnage de données.
-
-    Si nécessaire, vous pouvez définir la méthode d'échantillonnage des données dans le tableau.
-
-!!! info "Info"
-    Le [Fusionner](../special/merge.md#merge) le moteur n'appartient pas à la `*MergeTree` famille.
-
-## Création d'une Table {#table_engine-mergetree-creating-a-table}
-
-``` sql
-CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
-(
-    name1 [type1] [DEFAULT|MATERIALIZED|ALIAS expr1] [TTL expr1],
-    name2 [type2] [DEFAULT|MATERIALIZED|ALIAS expr2] [TTL expr2],
-    ...
-    INDEX index_name1 expr1 TYPE type1(...) GRANULARITY value1,
-    INDEX index_name2 expr2 TYPE type2(...) GRANULARITY value2
-) ENGINE = MergeTree()
-[PARTITION BY expr]
-[ORDER BY expr]
-[PRIMARY KEY expr]
-[SAMPLE BY expr]
-[TTL expr [DELETE|TO DISK 'xxx'|TO VOLUME 'xxx'], ...]
-[SETTINGS name=value, ...]
-```
-
-Pour une description des paramètres, voir [Créer une description de requête](../../../sql-reference/statements/create.md).
-
-!!! note "Note"
-    `INDEX` est une fonctionnalité expérimentale, voir [Index De Saut De Données](#table_engine-mergetree-data_skipping-indexes).
-
-### Les Clauses De Requête {#mergetree-query-clauses}
-
--   `ENGINE` — Name and parameters of the engine. `ENGINE = MergeTree()`. Le `MergeTree` le moteur n'a pas de paramètres.
-
--   `PARTITION BY` — The [clé de partitionnement](custom-partitioning-key.md).
-
-    Pour le partitionnement par mois, utilisez les `toYYYYMM(date_column)` l'expression, où `date_column` est une colonne avec une date du type [Date](../../../sql-reference/data-types/date.md). Les noms de partition ici ont le `"YYYYMM"` format.
-
--   `ORDER BY` — The sorting key.
-
-    Un tuple de colonnes ou d'expressions arbitraires. Exemple: `ORDER BY (CounterID, EventDate)`.
-
--   `PRIMARY KEY` — The primary key if it [diffère de la clé de tri](#choosing-a-primary-key-that-differs-from-the-sorting-key).
-
-    Par défaut, la clé primaire est la même que la clé de tri (qui est spécifiée par `ORDER BY` clause). Ainsi dans la plupart des cas il n'est pas nécessaire de spécifier un `PRIMARY KEY` clause.
-
--   `SAMPLE BY` — An expression for sampling.
-
-    Si un échantillonnage expression est utilisée, la clé primaire doit contenir. Exemple: `SAMPLE BY intHash32(UserID) ORDER BY (CounterID, EventDate, intHash32(UserID))`.
-
--   `TTL` — A list of rules specifying storage duration of rows and defining logic of automatic parts movement [entre disques et volumes](#table_engine-mergetree-multiple-volumes).
-
-    L'Expression doit en avoir une `Date` ou `DateTime` colonne comme un résultat. Exemple:
-    `TTL date + INTERVAL 1 DAY`
-
-    Le Type de la règle `DELETE|TO DISK 'xxx'|TO VOLUME 'xxx'` spécifie une action à effectuer avec la partie si l'expression est satisfaite (atteint l'heure actuelle): suppression des Lignes expirées, déplacement d'une partie (si l'expression est satisfaite pour toutes les lignes d'une partie) sur le disque spécifié (`TO DISK 'xxx'`) ou de volume (`TO VOLUME 'xxx'`). Le type par défaut de la règle est suppression (`DELETE`). Liste de règles multiples peut spécifié, mais il ne devrait pas y avoir plus d'un `DELETE` règle.
-
-    Pour plus de détails, voir [TTL pour les colonnes et les tableaux](#table_engine-mergetree-ttl)
-
--   `SETTINGS` — Additional parameters that control the behavior of the `MergeTree`:
-
-    -   `index_granularity` — Maximum number of data rows between the marks of an index. Default value: 8192. See [Le Stockage De Données](#mergetree-data-storage).
-    -   `index_granularity_bytes` — Maximum size of data granules in bytes. Default value: 10Mb. To restrict the granule size only by number of rows, set to 0 (not recommended). See [Le Stockage De Données](#mergetree-data-storage).
-    -   `enable_mixed_granularity_parts` — Enables or disables transitioning to control the granule size with the `index_granularity_bytes` paramètre. Avant la version 19.11, il n'y avait que le `index_granularity` réglage pour restreindre la taille des granules. Le `index_granularity_bytes` le paramètre améliore les performances de ClickHouse lors de la sélection de données à partir de tables avec de grandes lignes (des dizaines et des centaines de mégaoctets). Si vous avez des tables avec de grandes lignes, vous pouvez activer ce paramètre pour les tables d'améliorer l'efficacité de `SELECT` requête.
-    -   `use_minimalistic_part_header_in_zookeeper` — Storage method of the data parts headers in ZooKeeper. If `use_minimalistic_part_header_in_zookeeper=1`, puis Zookeeper stocke moins de données. Pour plus d'informations, voir le [Description du réglage](../../../operations/server-configuration-parameters/settings.md#server-settings-use_minimalistic_part_header_in_zookeeper) dans “Server configuration parameters”.
-    -   `min_merge_bytes_to_use_direct_io` — The minimum data volume for merge operation that is required for using direct I/O access to the storage disk. When merging data parts, ClickHouse calculates the total storage volume of all the data to be merged. If the volume exceeds `min_merge_bytes_to_use_direct_io` octets, ClickHouse lit et écrit les données sur le disque de stockage en utilisant l'interface d'E/S directe (`O_DIRECT` option). Si `min_merge_bytes_to_use_direct_io = 0`, puis les e/s directes sont désactivées. Valeur par défaut: `10 * 1024 * 1024 * 1024` octet.
-        <a name="mergetree_setting-merge_with_ttl_timeout"></a>
-    -   `merge_with_ttl_timeout` — Minimum delay in seconds before repeating a merge with TTL. Default value: 86400 (1 day).
-    -   `write_final_mark` — Enables or disables writing the final index mark at the end of data part (after the last byte). Default value: 1. Don't turn it off.
-    -   `merge_max_block_size` — Maximum number of rows in block for merge operations. Default value: 8192.
-    -   `storage_policy` — Storage policy. See [Utilisation de plusieurs périphériques de bloc pour le stockage de données](#table_engine-mergetree-multiple-volumes).
-
-**Exemple de réglage des Sections**
-
-``` sql
-ENGINE MergeTree() PARTITION BY toYYYYMM(EventDate) ORDER BY (CounterID, EventDate, intHash32(UserID)) SAMPLE BY intHash32(UserID) SETTINGS index_granularity=8192
-```
-
-Dans l'exemple, nous définissons le partitionnement par mois.
-
-Nous définissons également une expression pour l'échantillonnage en tant que hachage par l'ID utilisateur. Cela vous permet de pseudorandomiser les données dans la table pour chaque `CounterID` et `EventDate`. Si vous définissez un [SAMPLE](../../../sql-reference/statements/select/sample.md#select-sample-clause) clause lors de la sélection des données, ClickHouse retournera un échantillon de données uniformément pseudo-aléatoire pour un sous-ensemble d'utilisateurs.
-
-Le `index_granularity` paramètre peut être omis, car 8192 est la valeur par défaut.
-
-<details markdown="1">
-
-<summary>Méthode obsolète pour créer une Table</summary>
-
-!!! attention "Attention"
-    N'utilisez pas cette méthode dans les nouveaux projets. Si possible, optez anciens projets à la méthode décrite ci-dessus.
-
-``` sql
-CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
-(
-    name1 [type1] [DEFAULT|MATERIALIZED|ALIAS expr1],
-    name2 [type2] [DEFAULT|MATERIALIZED|ALIAS expr2],
-    ...
-) ENGINE [=] MergeTree(date-column [, sampling_expression], (primary, key), index_granularity)
-```
-
-**Paramètres MergeTree ()**
-
--   `date-column` — The name of a column of the [Date](../../../sql-reference/data-types/date.md) type. ClickHouse crée automatiquement des partitions par mois en fonction de cette colonne. Les noms de partition sont dans le `"YYYYMM"` format.
--   `sampling_expression` — An expression for sampling.
--   `(primary, key)` — Primary key. Type: [Tuple()](../../../sql-reference/data-types/tuple.md)
--   `index_granularity` — The granularity of an index. The number of data rows between the “marks” d'un index. La valeur 8192 est appropriée pour la plupart des tâches.
-
-**Exemple**
-
-``` sql
-MergeTree(EventDate, intHash32(UserID), (CounterID, EventDate, intHash32(UserID)), 8192)
-```
-
-Le `MergeTree` le moteur est configuré de la même manière que dans l'exemple ci-dessus pour la méthode de configuration du moteur principal.
-</details>
-
-## Le Stockage De Données {#mergetree-data-storage}
-
-Une table se compose de parties de données triées par clé primaire.
-
-Lorsque des données sont insérées dans une table, des parties de données distinctes sont créées et chacune d'elles est lexicographiquement triée par clé primaire. Par exemple, si la clé primaire est `(CounterID, Date)`, les données de la pièce sont triées par `CounterID` et au sein de chaque `CounterID` il est commandé par `Date`.
-
-Les données appartenant à différentes partitions sont séparés en différentes parties. En arrière-plan, ClickHouse fusionne des parties de données pour un stockage plus efficace. Les parties appartenant à des partitions différentes ne sont pas fusionnées. La fusion mécanisme ne garantit pas que toutes les lignes avec la même clé primaire sera dans la même partie des données.
-
-Chaque partie de données est logiquement divisée en granules. Un granule est le plus petit ensemble de données indivisible que ClickHouse lit lors de la sélection des données. ClickHouse ne divise pas les lignes ou les valeurs, de sorte que chaque granule contient toujours un nombre entier de lignes. La première rangée de granules est marqué avec la valeur de la clé primaire de la ligne. Pour chaque partie de données, ClickHouse crée un fichier d'index qui stocke les marques. Pour chaque colonne, que ce soit dans la clé primaire ou non, ClickHouse stocke également les mêmes marques. Ces marques vous permettent de trouver des données directement dans les fichiers de colonnes.
-
-La taille de granule est limitée par `index_granularity` et `index_granularity_bytes` paramètres du moteur de table. Le nombre de lignes dans un granule jette dans la `[1, index_granularity]` gamme, en fonction de la taille des lignes. La taille des granulés peut dépasser `index_granularity_bytes` si la taille d'une seule ligne est supérieure à la valeur du paramètre. Dans ce cas, la taille du granule est égale à la taille de la ligne.
-
-## Clés primaires et Index dans les requêtes {#primary-keys-and-indexes-in-queries}
-
-Prendre la `(CounterID, Date)` clé primaire comme un exemple. Dans ce cas, le tri et l'index peuvent être illustrés comme suit:
-
-      Whole data:     [---------------------------------------------]
-      CounterID:      [aaaaaaaaaaaaaaaaaabbbbcdeeeeeeeeeeeeefgggggggghhhhhhhhhiiiiiiiiikllllllll]
-      Date:           [1111111222222233331233211111222222333211111112122222223111112223311122333]
-      Marks:           |      |      |      |      |      |      |      |      |      |      |
-                      a,1    a,2    a,3    b,3    e,2    e,3    g,1    h,2    i,1    i,3    l,3
-      Marks numbers:   0      1      2      3      4      5      6      7      8      9      10
-
-Si la requête de données spécifie:
-
--   `CounterID in ('a', 'h')` le serveur lit les données dans les gammes des marques `[0, 3)` et `[6, 8)`.
--   `CounterID IN ('a', 'h') AND Date = 3` le serveur lit les données dans les gammes des marques `[1, 3)` et `[7, 8)`.
--   `Date = 3`, le serveur lit les données de la plage de marque `[1, 10]`.
-
-Les exemples ci-dessus montrent qu'il est toujours plus efficace d'utiliser un indice qu'une analyse complète.
-
-Un index clairsemé permet de lire des données supplémentaires. Lors de la lecture d'une plage unique de la clé primaire, jusqu'à `index_granularity * 2` lignes supplémentaires dans chaque bloc de données peut être lu.
-
-Les index clairsemés vous permettent de travailler avec un très grand nombre de lignes de table, car dans la plupart des cas, ces index tiennent dans la RAM de l'ordinateur.
-
-ClickHouse ne nécessite pas de clé primaire unique. Vous pouvez insérer plusieurs lignes avec la même clé primaire.
-
-### Sélection de la clé primaire {#selecting-the-primary-key}
-
-Le nombre de colonnes de la clé primaire n'est pas explicitement limitée. Selon la structure de données, vous pouvez inclure plus ou moins de colonnes dans la clé primaire. Cela peut:
-
--   Améliorer la performance d'un indice.
-
-    Si la clé primaire est `(a, b)`, puis ajouter une autre colonne `c` pour améliorer les performances si les conditions suivantes sont réunies:
-
-    -   Il y a des requêtes avec une condition sur la colonne `c`.
-    -   Longues plages de données (plusieurs fois plus longues que `index_granularity`) avec des valeurs identiques pour `(a, b)` sont communs. En d'autres termes, lors de l'ajout d'une autre colonne vous permet de passer très longues plages de données.
-
--   Améliorer la compression des données.
-
-    ClickHouse trie les données par clé primaire, donc plus la cohérence est élevée, meilleure est la compression.
-
--   Fournir une logique supplémentaire lors de la fusion de parties de [CollapsingMergeTree](collapsingmergetree.md#table_engine-collapsingmergetree) et [SummingMergeTree](summingmergetree.md) moteur.
-
-    Dans ce cas, on peut spécifier l' *clé de tri* qui est différente de la clé primaire.
-
-Une clé primaire longue affectera négativement les performances d'insertion et la consommation de mémoire, mais des colonnes supplémentaires dans la clé primaire n'affecteront pas les performances de ClickHouse pendant `SELECT` requête.
-
-### Choisir une clé primaire qui diffère de la clé de tri {#choosing-a-primary-key-that-differs-from-the-sorting-key}
-
-Il est possible de spécifier une clé primaire (une expression avec des valeurs qui sont écrites dans le fichier d'index pour chaque marque) qui est différente de la clé de tri (une expression pour trier les lignes dans les parties de données). Dans ce cas, le tuple d'expression de clé primaire doit être un préfixe du tuple d'expression de clé de tri.
-
-Cette fonctionnalité est utile lorsque vous utilisez le [SummingMergeTree](summingmergetree.md) et
-[AggregatingMergeTree](aggregatingmergetree.md) table des moteurs. Dans un cas courant lors de l'utilisation de ces moteurs, la table a deux types de colonnes: *dimension* et *mesure*. Les requêtes typiques agrégent les valeurs des colonnes de mesure avec arbitraire `GROUP BY` et filtrage par dimensions. Comme SummingMergeTree et AggregatingMergeTree regroupent des lignes avec la même valeur de la clé de tri, il est naturel d'y ajouter toutes les dimensions. En conséquence, l'expression se compose d'une longue liste de colonnes, et cette liste doit être mise à jour fréquemment avec nouvellement ajoutée.
-
-Dans ce cas, il est logique de ne laisser que quelques colonnes dans la clé primaire qui fourniront des analyses de plage efficaces et ajouteront les colonnes de dimension restantes au tuple de clé de tri.
-
-[ALTER](../../../sql-reference/statements/alter.md) la clé de tri est une opération légère car lorsqu'une nouvelle colonne est ajoutée simultanément à la table et à la clé de tri, les parties de données existantes n'ont pas besoin d'être modifiées. Comme l'ancienne clé de tri est un préfixe de la nouvelle clé de tri et qu'il n'y a pas de données dans la colonne nouvellement ajoutée, les données sont triées à la fois par l'ancienne et la nouvelle clé de tri au moment de la modification de la table.
-
-### Utilisation D'Index et de Partitions dans les requêtes {#use-of-indexes-and-partitions-in-queries}
-
-Pour `SELECT` requêtes, clickhouse analyse si un index peut être utilisé. Un index peut être utilisé si le `WHERE/PREWHERE` clause a une expression (comme l'un des éléments de conjonction, ou entièrement) qui représente une opération de comparaison d'égalité ou d'inégalité, ou si elle a `IN` ou `LIKE` avec un préfixe fixe sur les colonnes ou les expressions qui sont dans la clé primaire ou la clé de partitionnement, ou sur certaines fonctions partiellement répétitives de ces colonnes, ou les relations logiques de ces expressions.
-
-Ainsi, il est possible d'exécuter des requêtes sur une ou plusieurs plages de la clé primaire. Dans cet exemple, les requêtes seront rapides lorsqu'elles sont exécutées pour une balise de suivi spécifique, pour une balise et une plage de dates spécifiques, pour une balise et une date spécifiques, pour plusieurs balises avec une plage de dates, etc.
-
-Regardons le moteur configuré comme suit:
-
-      ENGINE MergeTree() PARTITION BY toYYYYMM(EventDate) ORDER BY (CounterID, EventDate) SETTINGS index_granularity=8192
-
-Dans ce cas, dans les requêtes:
-
-``` sql
-SELECT count() FROM table WHERE EventDate = toDate(now()) AND CounterID = 34
-SELECT count() FROM table WHERE EventDate = toDate(now()) AND (CounterID = 34 OR CounterID = 42)
-SELECT count() FROM table WHERE ((EventDate >= toDate('2014-01-01') AND EventDate <= toDate('2014-01-31')) OR EventDate = toDate('2014-05-01')) AND CounterID IN (101500, 731962, 160656) AND (CounterID = 101500 OR EventDate != toDate('2014-05-01'))
-```
-
-ClickHouse utilisera l'index de clé primaire pour supprimer les données incorrectes et la clé de partitionnement mensuel pour supprimer les partitions qui se trouvent dans des plages de dates incorrectes.
-
-Les requêtes ci-dessus montrent que l'index est utilisé même pour les expressions complexes. La lecture de la table est organisée de sorte que l'utilisation de l'index ne peut pas être plus lente qu'une analyse complète.
-
-Dans l'exemple ci-dessous, l'index ne peut pas être utilisé.
-
-``` sql
-SELECT count() FROM table WHERE CounterID = 34 OR URL LIKE '%upyachka%'
-```
-
-Pour vérifier si ClickHouse pouvez utiliser l'index lors de l'exécution d'une requête, utilisez les paramètres [force_index_by_date](../../../operations/settings/settings.md#settings-force_index_by_date) et [force_primary_key](../../../operations/settings/settings.md).
-
-La clé de partitionnement par mois permet de lire uniquement les blocs de données qui contiennent des dates de la plage appropriée. Dans ce cas, le bloc de données peut contenir des données pour plusieurs dates (jusqu'à un mois entier). Dans un bloc, les données sont triées par clé primaire, qui peut ne pas contenir la date comme première colonne. Pour cette raison, l'utilisation d'une requête avec seulement une condition de date qui ne spécifie pas le préfixe de clé primaire entraînera la lecture de plus de données que pour une seule date.
-
-### Utilisation de L'Index pour les clés primaires partiellement monotones {#use-of-index-for-partially-monotonic-primary-keys}
-
-Considérons, par exemple, les jours du mois. Ils forment un [monotone de la séquence](https://en.wikipedia.org/wiki/Monotonic_function) pendant un mois, mais pas monotone pendant des périodes plus longues. C'est une séquence partiellement monotone. Si un utilisateur crée la table avec une clé primaire partiellement monotone, ClickHouse crée un index clairsemé comme d'habitude. Lorsqu'un utilisateur sélectionne des données à partir de ce type de table, ClickHouse analyse les conditions de requête. Si L'utilisateur veut obtenir des données entre deux marques de l'index et que ces deux marques tombent dans un mois, ClickHouse peut utiliser l'index dans ce cas particulier car il peut calculer la distance entre les paramètres d'une requête et les marques d'index.
-
-ClickHouse ne peut pas utiliser un index si les valeurs de la clé primaire dans la plage de paramètres de requête ne représentent pas une séquence monotone. Dans ce cas, ClickHouse utilise la méthode full scan.
-
-ClickHouse utilise cette logique non seulement pour les séquences de jours du mois, mais pour toute clé primaire qui représente une séquence partiellement monotone.
-
-### Index de saut de données (expérimental) {#table_engine-mergetree-data_skipping-indexes}
-
-La déclaration d'index se trouve dans la section colonnes du `CREATE` requête.
-
-``` sql
-INDEX index_name expr TYPE type(...) GRANULARITY granularity_value
-```
-
-Pour les tables de la `*MergeTree` famille, les indices de saut de données peuvent être spécifiés.
-
-Ces indices agrégent certaines informations sur l'expression spécifiée sur les blocs, qui consistent en `granularity_value` granules (la taille du granule est spécifiée en utilisant `index_granularity` réglage dans le moteur de table). Ensuite, ces agrégats sont utilisés dans `SELECT` requêtes pour réduire la quantité de données à lire à partir du disque en ignorant de gros blocs de données `where` la requête ne peut pas être satisfait.
-
-**Exemple**
-
-``` sql
-CREATE TABLE table_name
-(
-    u64 UInt64,
-    i32 Int32,
-    s String,
-    ...
-    INDEX a (u64 * i32, s) TYPE minmax GRANULARITY 3,
-    INDEX b (u64 * length(s)) TYPE set(1000) GRANULARITY 4
-) ENGINE = MergeTree()
-...
-```
-
-Les Indices de L'exemple peuvent être utilisés par ClickHouse pour réduire la quantité de données à lire à partir du disque dans les requêtes suivantes:
-
-``` sql
-SELECT count() FROM table WHERE s < 'z'
-SELECT count() FROM table WHERE u64 * i32 == 10 AND u64 * length(s) >= 1234
-```
-
-#### Types d'Indices disponibles {#available-types-of-indices}
-
--   `minmax`
-
-    Magasins extrêmes de l'expression spécifiée (si l'expression est `tuple` puis il stocke les extrêmes pour chaque élément de `tuple`), utilise les informations stockées pour sauter des blocs de données comme la clé primaire.
-
--   `set(max_rows)`
-
-    Stocke les valeurs uniques de l'expression spécifiée (pas plus de `max_rows` rangée, `max_rows=0` moyen “no limits”). Utilise les valeurs pour vérifier si le `WHERE` l'expression n'est pas satisfiable sur un bloc de données.
-
--   `ngrambf_v1(n, size_of_bloom_filter_in_bytes, number_of_hash_functions, random_seed)`
-
-    Magasins un [Filtre de Bloom](https://en.wikipedia.org/wiki/Bloom_filter) qui contient tous les ngrams d'un bloc de données. Fonctionne uniquement avec des chaînes. Peut être utilisé pour l'optimisation de `equals`, `like` et `in` expression.
-
-    -   `n` — ngram size,
-    -   `size_of_bloom_filter_in_bytes` — Bloom filter size in bytes (you can use large values here, for example, 256 or 512, because it can be compressed well).
-    -   `number_of_hash_functions` — The number of hash functions used in the Bloom filter.
-    -   `random_seed` — The seed for Bloom filter hash functions.
-
--   `tokenbf_v1(size_of_bloom_filter_in_bytes, number_of_hash_functions, random_seed)`
-
-    Le même que `ngrambf_v1`, mais stocke des jetons au lieu de ngrams. Les jetons sont des séquences séparées par des caractères non alphanumériques.
-
--   `bloom_filter([false_positive])` — Stores a [Filtre de Bloom](https://en.wikipedia.org/wiki/Bloom_filter) pour les colonnes spécifiées.
-
-    Facultatif `false_positive` le paramètre est la probabilité de recevoir une réponse faussement positive du filtre. Valeurs possibles: (0, 1). Valeur par défaut: 0.025.
-
-    Types de données pris en charge: `Int*`, `UInt*`, `Float*`, `Enum`, `Date`, `DateTime`, `String`, `FixedString`, `Array`, `LowCardinality`, `Nullable`.
-
-    Les fonctions suivantes peuvent l'utiliser: [égal](../../../sql-reference/functions/comparison-functions.md), [notEquals](../../../sql-reference/functions/comparison-functions.md), [dans](../../../sql-reference/functions/in-functions.md), [notIn](../../../sql-reference/functions/in-functions.md), [avoir](../../../sql-reference/functions/array-functions.md).
-
-<!-- -->
-
-``` sql
-INDEX sample_index (u64 * length(s)) TYPE minmax GRANULARITY 4
-INDEX sample_index2 (u64 * length(str), i32 + f64 * 100, date, str) TYPE set(100) GRANULARITY 4
-INDEX sample_index3 (lower(str), str) TYPE ngrambf_v1(3, 256, 2, 0) GRANULARITY 4
-```
-
-#### Les Fonctions De Soutien {#functions-support}
-
-Les Conditions dans le `WHERE` la clause contient des appels des fonctions qui fonctionnent avec des colonnes. Si la colonne fait partie d'un index, ClickHouse essaie d'utiliser cet index lors de l'exécution des fonctions. ClickHouse prend en charge différents sous-ensembles de fonctions pour l'utilisation d'index.
-
-Le `set` l'indice peut être utilisé avec toutes les fonctions. Les sous-ensembles de fonctions pour les autres index sont présentés dans le tableau ci-dessous.
-
-| Fonction (opérateur) / Indice de                                                                             | clé primaire | minmax | ngrambf_v1 | tokenbf_v1 | bloom_filter |
-|--------------------------------------------------------------------------------------------------------------|--------------|--------|-------------|-------------|---------------|
-| [égal (=, ==)](../../../sql-reference/functions/comparison-functions.md#function-equals)                     | ✔            | ✔      | ✔           | ✔           | ✔             |
-| [notEquals (!=, \<\>)](../../../sql-reference/functions/comparison-functions.md#function-notequals)          | ✔            | ✔      | ✔           | ✔           | ✔             |
-| [comme](../../../sql-reference/functions/string-search-functions.md#function-like)                           | ✔            | ✔      | ✔           | ✗           | ✗             |
-| [notLike](../../../sql-reference/functions/string-search-functions.md#function-notlike)                      | ✔            | ✔      | ✔           | ✗           | ✗             |
-| [startsWith](../../../sql-reference/functions/string-functions.md#startswith)                                | ✔            | ✔      | ✔           | ✔           | ✗             |
-| [endsWith](../../../sql-reference/functions/string-functions.md#endswith)                                    | ✗            | ✗      | ✔           | ✔           | ✗             |
-| [multiSearchAny](../../../sql-reference/functions/string-search-functions.md#function-multisearchany)        | ✗            | ✗      | ✔           | ✗           | ✗             |
-| [dans](../../../sql-reference/functions/in-functions.md#in-functions)                                        | ✔            | ✔      | ✔           | ✔           | ✔             |
-| [notIn](../../../sql-reference/functions/in-functions.md#in-functions)                                       | ✔            | ✔      | ✔           | ✔           | ✔             |
-| [peu (\<)](../../../sql-reference/functions/comparison-functions.md#function-less)                           | ✔            | ✔      | ✗           | ✗           | ✗             |
-| [grand (\>)](../../../sql-reference/functions/comparison-functions.md#function-greater)                      | ✔            | ✔      | ✗           | ✗           | ✗             |
-| [lessOrEquals (\<=)](../../../sql-reference/functions/comparison-functions.md#function-lessorequals)         | ✔            | ✔      | ✗           | ✗           | ✗             |
-| [greaterOrEquals ( \> =)](../../../sql-reference/functions/comparison-functions.md#function-greaterorequals) | ✔            | ✔      | ✗           | ✗           | ✗             |
-| [vide](../../../sql-reference/functions/array-functions.md#function-empty)                                   | ✔            | ✔      | ✗           | ✗           | ✗             |
-| [notEmpty](../../../sql-reference/functions/array-functions.md#function-notempty)                            | ✔            | ✔      | ✗           | ✗           | ✗             |
-| hasToken                                                                                                     | ✗            | ✗      | ✗           | ✔           | ✗             |
-
-Les fonctions avec un argument constant inférieur à la taille ngram ne peuvent pas être utilisées par `ngrambf_v1` pour l'optimisation de la requête.
-
-Les filtres Bloom peuvent avoir des correspondances faussement positives, de sorte que le `ngrambf_v1`, `tokenbf_v1`, et `bloom_filter` les index ne peuvent pas être utilisés pour optimiser les requêtes où le résultat d'une fonction est censé être faux, par exemple:
-
--   Peut être optimisé:
-    -   `s LIKE '%test%'`
-    -   `NOT s NOT LIKE '%test%'`
-    -   `s = 1`
-    -   `NOT s != 1`
-    -   `startsWith(s, 'test')`
--   Ne peut pas être optimisé:
-    -   `NOT s LIKE '%test%'`
-    -   `s NOT LIKE '%test%'`
-    -   `NOT s = 1`
-    -   `s != 1`
-    -   `NOT startsWith(s, 'test')`
-
-## Accès Simultané Aux Données {#concurrent-data-access}
-
-Pour l'accès aux tables simultanées, nous utilisons le multi-versioning. En d'autres termes, lorsqu'une table est lue et mise à jour simultanément, les données sont lues à partir d'un ensemble de parties en cours au moment de la requête. Il n'y a pas de longues mèches. Les Inserts ne gênent pas les opérations de lecture.
-
-Lecture à partir d'un tableau est automatiquement parallélisée.
-
-## TTL pour les colonnes et les tableaux {#table_engine-mergetree-ttl}
-
-Détermine la durée de vie de des valeurs.
-
-Le `TTL` clause peut être définie pour la table entière et pour chaque colonne individuelle. Ttl de niveau Table peut également spécifier la logique de déplacement automatique des données entre les disques et les volumes.
-
-Les Expressions doivent évaluer pour [Date](../../../sql-reference/data-types/date.md) ou [DateTime](../../../sql-reference/data-types/datetime.md) type de données.
-
-Exemple:
-
-``` sql
-TTL time_column
-TTL time_column + interval
-```
-
-Définir `interval`, utiliser [intervalle](../../../sql-reference/operators/index.md#operators-datetime) opérateur.
-
-``` sql
-TTL date_time + INTERVAL 1 MONTH
-TTL date_time + INTERVAL 15 HOUR
-```
-
-### Colonne TTL {#mergetree-column-ttl}
-
-Lorsque les valeurs de la colonne expirent, ClickHouse les remplace par les valeurs par défaut du type de données de la colonne. Si toutes les valeurs de colonne de la partie données expirent, ClickHouse supprime cette colonne de la partie données d'un système de fichiers.
-
-Le `TTL` la clause ne peut pas être utilisée pour les colonnes clés.
-
-Exemple:
-
-Création d'une table avec TTL
-
-``` sql
-CREATE TABLE example_table
-(
-    d DateTime,
-    a Int TTL d + INTERVAL 1 MONTH,
-    b Int TTL d + INTERVAL 1 MONTH,
-    c String
-)
-ENGINE = MergeTree
-PARTITION BY toYYYYMM(d)
-ORDER BY d;
-```
-
-Ajout de TTL à une colonne d'une table existante
-
-``` sql
-ALTER TABLE example_table
-    MODIFY COLUMN
-    c String TTL d + INTERVAL 1 DAY;
-```
-
-Modification de TTL de la colonne
-
-``` sql
-ALTER TABLE example_table
-    MODIFY COLUMN
-    c String TTL d + INTERVAL 1 MONTH;
-```
-
-### Tableau TTL {#mergetree-table-ttl}
-
-Table peut avoir une expression pour la suppression de Lignes expirées, et plusieurs expressions pour le déplacement automatique de pièces entre [disques ou volumes](#table_engine-mergetree-multiple-volumes). Lorsque les lignes de la table expirent, ClickHouse supprime toutes les lignes correspondantes. Pour les pièces en mouvement, toutes les lignes d'une pièce doivent satisfaire aux critères d'expression de mouvement.
-
-``` sql
-TTL expr [DELETE|TO DISK 'aaa'|TO VOLUME 'bbb'], ...
-```
-
-Type de règle TTL peut suivre chaque expression TTL. Il affecte une action qui doit être faite une fois que l'expression est satisfaite (atteint l'heure actuelle):
-
--   `DELETE` - supprimer les Lignes expirées (action par défaut);
--   `TO DISK 'aaa'` - déplacer la partie sur le disque `aaa`;
--   `TO VOLUME 'bbb'` - déplacer la partie sur le disque `bbb`.
-
-Exemple:
-
-Création d'une table avec TTL
-
-``` sql
-CREATE TABLE example_table
-(
-    d DateTime,
-    a Int
-)
-ENGINE = MergeTree
-PARTITION BY toYYYYMM(d)
-ORDER BY d
-TTL d + INTERVAL 1 MONTH [DELETE],
-    d + INTERVAL 1 WEEK TO VOLUME 'aaa',
-    d + INTERVAL 2 WEEK TO DISK 'bbb';
-```
-
-Modification de TTL de la table
-
-``` sql
-ALTER TABLE example_table
-    MODIFY TTL d + INTERVAL 1 DAY;
-```
-
-**Suppression De Données**
-
-Les données avec un TTL expiré sont supprimées lorsque ClickHouse fusionne des parties de données.
-
-Lorsque ClickHouse voit que les données sont expirées, il effectue une fusion hors calendrier. Pour contrôler la fréquence de ces fusions, vous pouvez définir `merge_with_ttl_timeout`. Si la valeur est trop faible, il effectuera de nombreuses fusions hors calendrier qui peuvent consommer beaucoup de ressources.
-
-Si vous effectuez la `SELECT` requête entre les fusionne, vous pouvez obtenir des données expirées. Pour éviter cela, utilisez la [OPTIMIZE](../../../sql-reference/statements/misc.md#misc_operations-optimize) requête avant de l' `SELECT`.
-
-## Utilisation de plusieurs périphériques de bloc pour le stockage de données {#table_engine-mergetree-multiple-volumes}
-
-### Introduction {#introduction}
-
-`MergeTree` les moteurs de table de famille peuvent stocker des données sur plusieurs périphériques de bloc. Par exemple, il peut être utile lorsque les données d'un tableau sont implicitement divisé en “hot” et “cold”. Les données les plus récentes sont régulièrement demandées mais ne nécessitent qu'une petite quantité d'espace. Au contraire, les données historiques à queue grasse sont rarement demandées. Si plusieurs disques sont disponibles, la “hot” les données peuvent être situées sur des disques rapides (par exemple, SSD NVMe ou en mémoire), tandis que le “cold” des données relativement lente (par exemple, disque dur).
-
-La partie de données est l'unité mobile minimum pour `MergeTree`-tables de moteur. Les données appartenant à une partie sont stockées sur un disque. Les parties de données peuvent être déplacées entre les disques en arrière-plan (selon les paramètres de l'utilisateur) ainsi qu'au moyen du [ALTER](../../../sql-reference/statements/alter.md#alter_move-partition) requête.
-
-### Terme {#terms}
-
--   Disk — Block device mounted to the filesystem.
--   Default disk — Disk that stores the path specified in the [chemin](../../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-path) paramètre de serveur.
--   Volume — Ordered set of equal disks (similar to [JBOD](https://en.wikipedia.org/wiki/Non-RAID_drive_architectures)).
--   Storage policy — Set of volumes and the rules for moving data between them.
-
-Les noms donnés aux entités décrites peuvent être trouvés dans les tables système, [système.storage_policies](../../../operations/system-tables.md#system_tables-storage_policies) et [système.disque](../../../operations/system-tables.md#system_tables-disks). Pour appliquer l'une des stratégies de stockage configurées pour une table, utilisez `storage_policy` réglage de `MergeTree`-moteur de table de famille.
-
-### Configuration {#table_engine-mergetree-multiple-volumes_configure}
-
-Les disques, les volumes et les stratégies de stockage doivent être déclarés `<storage_configuration>` étiquette, soit dans le fichier principal `config.xml` ou dans un fichier distinct dans le `config.d` répertoire.
-
-Structure de Configuration:
-
-``` xml
-<storage_configuration>
-    <disks>
-        <disk_name_1> <!-- disk name -->
-            <path>/mnt/fast_ssd/clickhouse/</path>
-        </disk_name_1>
-        <disk_name_2>
-            <path>/mnt/hdd1/clickhouse/</path>
-            <keep_free_space_bytes>10485760</keep_free_space_bytes>
-        </disk_name_2>
-        <disk_name_3>
-            <path>/mnt/hdd2/clickhouse/</path>
-            <keep_free_space_bytes>10485760</keep_free_space_bytes>
-        </disk_name_3>
-
-        ...
-    </disks>
-
-    ...
-</storage_configuration>
-```
-
-Balise:
-
--   `<disk_name_N>` — Disk name. Names must be different for all disks.
--   `path` — path under which a server will store data (`data` et `shadow` des dossiers), doit être terminé par ‘/’.
--   `keep_free_space_bytes` — the amount of free disk space to be reserved.
-
-L'ordre du disque définition n'est pas important.
-
-Stratégies de stockage balisage de configuration:
-
-``` xml
-<storage_configuration>
-    ...
-    <policies>
-        <policy_name_1>
-            <volumes>
-                <volume_name_1>
-                    <disk>disk_name_from_disks_configuration</disk>
-                    <max_data_part_size_bytes>1073741824</max_data_part_size_bytes>
-                </volume_name_1>
-                <volume_name_2>
-                    <!-- configuration -->
-                </volume_name_2>
-                <!-- more volumes -->
-            </volumes>
-            <move_factor>0.2</move_factor>
-        </policy_name_1>
-        <policy_name_2>
-            <!-- configuration -->
-        </policy_name_2>
-
-        <!-- more policies -->
-    </policies>
-    ...
-</storage_configuration>
-```
-
-Balise:
-
--   `policy_name_N` — Policy name. Policy names must be unique.
--   `volume_name_N` — Volume name. Volume names must be unique.
--   `disk` — a disk within a volume.
--   `max_data_part_size_bytes` — the maximum size of a part that can be stored on any of the volume's disks.
--   `move_factor` — when the amount of available space gets lower than this factor, data automatically start to move on the next volume if any (by default, 0.1).
-
-Exemples de Cofiguration:
-
-``` xml
-<storage_configuration>
-    ...
-    <policies>
-        <hdd_in_order> <!-- policy name -->
-            <volumes>
-                <single> <!-- volume name -->
-                    <disk>disk1</disk>
-                    <disk>disk2</disk>
-                </single>
-            </volumes>
-        </hdd_in_order>
-
-        <moving_from_ssd_to_hdd>
-            <volumes>
-                <hot>
-                    <disk>fast_ssd</disk>
-                    <max_data_part_size_bytes>1073741824</max_data_part_size_bytes>
-                </hot>
-                <cold>
-                    <disk>disk1</disk>
-                </cold>
-            </volumes>
-            <move_factor>0.2</move_factor>
-        </moving_from_ssd_to_hdd>
-    </policies>
-    ...
-</storage_configuration>
-```
-
-Dans l'exemple donné, la `hdd_in_order` politique met en œuvre les [round-robin](https://en.wikipedia.org/wiki/Round-robin_scheduling) approche. Ainsi cette politique ne définit qu'un seul volume (`single`), les parties des données sont stockées sur tous ses disques dans l'ordre circulaire. Une telle politique peut être très utile s'il y a plusieurs disques similaires sont montés sur le système, mais RAID N'est pas configuré. Gardez à l'esprit que chaque lecteur de disque n'est pas fiable et vous pouvez compenser avec facteur de réplication de 3 ou plus.
-
-S'il existe différents types de disques disponibles dans le système, `moving_from_ssd_to_hdd` la stratégie peut être utilisée à la place. Volume `hot` se compose d'un disque SSD (`fast_ssd`), et la taille maximale d'une pièce qui peut être stocké sur ce volume est de 1 go. Toutes les pièces avec la taille plus grande que 1 GB sera stocké directement sur le `cold` le volume, qui contient un disque dur de disque `disk1`.
-Aussi, une fois le disque `fast_ssd` est complété par plus de 80%, les données seront transférées à la `disk1` par un processus d'arrière-plan.
-
-L'ordre d'énumération des volumes dans une stratégie de stockage est important. Une fois qu'un volume est surchargé, les données sont déplacées vers le suivant. L'ordre d'énumération des disques est important parce que les données sont stockées dans les virages.
-
-Lors de la création d'une table, on peut lui appliquer l'une des stratégies de stockage configurées:
-
-``` sql
-CREATE TABLE table_with_non_default_policy (
-    EventDate Date,
-    OrderID UInt64,
-    BannerID UInt64,
-    SearchPhrase String
-) ENGINE = MergeTree
-ORDER BY (OrderID, BannerID)
-PARTITION BY toYYYYMM(EventDate)
-SETTINGS storage_policy = 'moving_from_ssd_to_hdd'
-```
-
-Le `default` la Politique de stockage implique d'utiliser un seul volume, qui se compose d'un seul disque donné dans `<path>`. Une fois qu'une table est créée, sa stratégie de stockage ne peut pas être modifiée.
-
-### Détail {#details}
-
-Dans le cas de `MergeTree` les tableaux, les données sont sur le disque de différentes façons:
-
--   En tant que résultat d'un insert (`INSERT` requête).
--   En arrière-plan fusionne et [mutation](../../../sql-reference/statements/alter.md#alter-mutations).
--   Lors du téléchargement à partir d'une autre réplique.
--   À la suite du gel de la partition [ALTER TABLE … FREEZE PARTITION](../../../sql-reference/statements/alter.md#alter_freeze-partition).
-
-Dans tous ces cas, à l'exception des mutations et du gel de partition, une pièce est stockée sur un volume et un disque selon la Politique de stockage donnée:
-
-1.  Le premier volume (dans l'ordre de définition) qui a suffisamment d'espace disque pour stocker une pièce (`unreserved_space > current_part_size`) et permet de stocker des pièces d'une taille donnée (`max_data_part_size_bytes > current_part_size`) est choisi.
-2.  Dans ce volume, ce disque est choisi qui suit celui, qui a été utilisé pour stocker le bloc de données précédent, et qui a de l'espace libre plus que la taille de la pièce (`unreserved_space - keep_free_space_bytes > current_part_size`).
-
-Sous le capot, les mutations et la congélation des cloisons utilisent [des liens en dur](https://en.wikipedia.org/wiki/Hard_link). Les liens durs entre différents disques ne sont pas pris en charge, donc dans de tels cas, les pièces résultantes sont stockées sur les mêmes disques que les disques initiaux.
-
-En arrière - plan, les pièces sont déplacées entre les volumes en fonction de la quantité d'espace libre (`move_factor` paramètre) selon l'ordre les volumes sont déclarées dans le fichier de configuration.
-Les données ne sont jamais transférées du dernier et dans le premier. On peut utiliser des tables système [système.part_log](../../../operations/system-tables.md#system_tables-part-log) (champ `type = MOVE_PART`) et [système.partie](../../../operations/system-tables.md#system_tables-parts) (Fields `path` et `disk`) pour surveiller l'arrière-plan se déplace. Aussi, les informations détaillées peuvent être trouvées dans les journaux du serveur.
-
-L'utilisateur peut forcer le déplacement d'une partie ou d'une partition d'un volume à l'autre à l'aide de la requête [ALTER TABLE … MOVE PART\|PARTITION … TO VOLUME\|DISK …](../../../sql-reference/statements/alter.md#alter_move-partition), toutes les restrictions pour les opérations de fond sont prises en compte. La requête initie un mouvement seul et n'attend pas que les opérations d'arrière-plan soient terminées. L'utilisateur recevra un message d'erreur si pas assez d'espace libre est disponible ou si l'une des conditions requises ne sont pas remplies.
-
-Le déplacement des données n'interfère pas avec la réplication des données. Par conséquent, différentes stratégies de stockage peuvent être spécifiées pour la même table sur différents réplicas.
-
-Après l'achèvement des fusions d'arrière-plan et des mutations, les anciennes parties ne sont supprimées qu'après un certain temps (`old_parts_lifetime`).
-Pendant ce temps, ils ne sont pas déplacés vers d'autres volumes ou des disques. Par conséquent, jusqu'à ce que les pièces soient finalement supprimées, elles sont toujours prises en compte pour l'évaluation de l'espace disque occupé.
-
-[Article Original](https://clickhouse.tech/docs/ru/operations/table_engines/mergetree/) <!--hide-->
diff --git a/docs/fr/engines/table-engines/mergetree-family/replacingmergetree.md b/docs/fr/engines/table-engines/mergetree-family/replacingmergetree.md
deleted file mode 100644
index ac3c0f3b021..00000000000
--- a/docs/fr/engines/table-engines/mergetree-family/replacingmergetree.md
+++ /dev/null
@@ -1,69 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 33
-toc_title: ReplacingMergeTree
----
-
-# ReplacingMergeTree {#replacingmergetree}
-
-Le moteur diffère de [MergeTree](mergetree.md#table_engines-mergetree) en ce qu'il supprime les doublons avec la même valeur de clé primaire (ou, plus précisément, avec la même [clé de tri](mergetree.md) valeur).
-
-La déduplication des données se produit uniquement lors d'une fusion. La fusion se produit en arrière-plan à un moment inconnu, vous ne pouvez donc pas le planifier. Certaines des données peuvent rester non traitées. Bien que vous puissiez exécuter une fusion imprévue en utilisant le `OPTIMIZE` requête, ne comptez pas l'utiliser, parce que la `OPTIMIZE` requête va lire et écrire une grande quantité de données.
-
-Ainsi, `ReplacingMergeTree` convient pour effacer les données en double en arrière-plan afin d'économiser de l'espace, mais cela ne garantit pas l'absence de doublons.
-
-## Création d'une Table {#creating-a-table}
-
-``` sql
-CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
-(
-    name1 [type1] [DEFAULT|MATERIALIZED|ALIAS expr1],
-    name2 [type2] [DEFAULT|MATERIALIZED|ALIAS expr2],
-    ...
-) ENGINE = ReplacingMergeTree([ver])
-[PARTITION BY expr]
-[ORDER BY expr]
-[PRIMARY KEY expr]
-[SAMPLE BY expr]
-[SETTINGS name=value, ...]
-```
-
-Pour une description des paramètres de requête, voir [demande de description](../../../sql-reference/statements/create.md).
-
-**ReplacingMergeTree Paramètres**
-
--   `ver` — column with version. Type `UInt*`, `Date` ou `DateTime`. Paramètre facultatif.
-
-    Lors de la fusion, `ReplacingMergeTree` de toutes les lignes avec la même clé primaire ne laisse qu'un:
-
-    -   Dernier dans la sélection, si `ver` pas ensemble.
-    -   Avec la version maximale, si `ver` défini.
-
-**Les clauses de requête**
-
-Lors de la création d'un `ReplacingMergeTree` la table de la même [clause](mergetree.md) sont nécessaires, comme lors de la création d'un `MergeTree` table.
-
-<details markdown="1">
-
-<summary>Méthode obsolète pour créer une Table</summary>
-
-!!! attention "Attention"
-    N'utilisez pas cette méthode dans les nouveaux projets et, si possible, remplacez les anciens projets par la méthode décrite ci-dessus.
-
-``` sql
-CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
-(
-    name1 [type1] [DEFAULT|MATERIALIZED|ALIAS expr1],
-    name2 [type2] [DEFAULT|MATERIALIZED|ALIAS expr2],
-    ...
-) ENGINE [=] ReplacingMergeTree(date-column [, sampling_expression], (primary, key), index_granularity, [ver])
-```
-
-Tous les paramètres excepté `ver` ont la même signification que dans `MergeTree`.
-
--   `ver` - colonne avec la version. Paramètre facultatif. Pour une description, voir le texte ci-dessus.
-
-</details>
-
-[Article Original](https://clickhouse.tech/docs/en/operations/table_engines/replacingmergetree/) <!--hide-->
diff --git a/docs/fr/engines/table-engines/mergetree-family/replication.md b/docs/fr/engines/table-engines/mergetree-family/replication.md
deleted file mode 100644
index 1e74475ee79..00000000000
--- a/docs/fr/engines/table-engines/mergetree-family/replication.md
+++ /dev/null
@@ -1,218 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 31
-toc_title: "R\xE9plication Des Donn\xE9es"
----
-
-# Réplication Des Données {#table_engines-replication}
-
-La réplication n'est prise en charge que pour les tables de la famille MergeTree:
-
--   ReplicatedMergeTree
--   ReplicatedSummingMergeTree
--   ReplicatedReplacingMergeTree
--   ReplicatedAggregatingMergeTree
--   ReplicatedCollapsingMergeTree
--   ReplicatedVersionedCollapsingMergetree
--   ReplicatedGraphiteMergeTree
-
-La réplication fonctionne au niveau d'une table individuelle, Pas du serveur entier. Un serveur peut stocker des tables répliquées et non répliquées en même temps.
-
-La réplication ne dépend pas de la fragmentation. Chaque fragment a sa propre réplication indépendante.
-
-Données compressées pour `INSERT` et `ALTER` les requêtes sont répliquées (pour plus d'informations, consultez la documentation de [ALTER](../../../sql-reference/statements/alter.md#query_language_queries_alter)).
-
-`CREATE`, `DROP`, `ATTACH`, `DETACH` et `RENAME` les requêtes sont exécutées sur un seul serveur et ne sont pas répliquées:
-
--   Le `CREATE TABLE` query crée une nouvelle table réplicable sur le serveur où la requête est exécutée. Si cette table existe déjà sur d'autres serveurs, il ajoute une nouvelle réplique.
--   Le `DROP TABLE` requête supprime la réplique situé sur le serveur où l'exécution de la requête.
--   Le `RENAME` requête renomme la table sur l'une des répliques. En d'autres termes, les tables répliquées peuvent avoir des noms différents sur différentes répliques.
-
-Clickhouse utilise [Apache ZooKeeper](https://zookeeper.apache.org) pour stocker des informations méta répliques. Utilisez ZooKeeper version 3.4.5 ou plus récente.
-
-Pour utiliser la réplication, définissez les paramètres [zookeeper](../../../operations/server-configuration-parameters/settings.md#server-settings_zookeeper) section de configuration du serveur.
-
-!!! attention "Attention"
-    Ne négligez pas la sécurité. Clickhouse soutient le `digest` [Schéma ACL](https://zookeeper.apache.org/doc/current/zookeeperProgrammers.html#sc_ZooKeeperAccessControl) du sous-système de sécurité ZooKeeper.
-
-Exemple de définition des adresses du cluster ZooKeeper:
-
-``` xml
-<zookeeper>
-    <node index="1">
-        <host>example1</host>
-        <port>2181</port>
-    </node>
-    <node index="2">
-        <host>example2</host>
-        <port>2181</port>
-    </node>
-    <node index="3">
-        <host>example3</host>
-        <port>2181</port>
-    </node>
-</zookeeper>
-```
-
-Vous pouvez spécifier N'importe quel cluster Zookeeper existant et le système utilisera un répertoire pour ses propres données (le répertoire est spécifié lors de la création d'une table réplicable).
-
-Si ZooKeeper n'est pas défini dans le fichier de configuration, vous ne pouvez pas créer de tables répliquées et toutes les tables répliquées existantes seront en lecture seule.
-
-La gardienne n'est pas utilisé dans `SELECT` requêtes car la réplication n'affecte pas les performances de `SELECT` et les requêtes s'exécutent aussi vite que pour les tables non répliquées. Lors de l'interrogation de tables répliquées distribuées, le comportement de ClickHouse est contrôlé par les paramètres [max_replica_delay_for_distributed_queries](../../../operations/settings/settings.md#settings-max_replica_delay_for_distributed_queries) et [fallback_to_stale_replicas_for_distributed_queries](../../../operations/settings/settings.md#settings-fallback_to_stale_replicas_for_distributed_queries).
-
-Pour chaque `INSERT` requête, environ dix entrées sont ajoutées à ZooKeeper par le biais de plusieurs transactions. (Pour être plus précis, c'est pour chaque bloc de données inséré; une requête D'insertion contient un bloc ou un bloc par `max_insert_block_size = 1048576` rangée.) Cela conduit à des latences légèrement plus longues pour `INSERT` par rapport aux tables non répliquées. Mais si vous suivez les recommandations pour insérer des données dans des lots de pas plus d'un `INSERT` par seconde, cela ne crée aucun problème. L'ensemble du cluster clickhouse utilisé pour coordonner un cluster ZooKeeper a un total de plusieurs centaines `INSERTs` par seconde. Le débit sur les insertions de données (le nombre de lignes par seconde) est aussi élevé que pour les non-données répliquées.
-
-Pour les clusters très volumineux, vous pouvez utiliser différents clusters ZooKeeper pour différents fragments. Cependant, cela ne s'est pas avéré nécessaire sur le Yandex.Cluster Metrica (environ 300 serveurs).
-
-La réplication est asynchrone et multi-maître. `INSERT` les requêtes (ainsi que `ALTER`) peuvent être envoyés à n'importe quel serveur disponible. Les données sont insérées sur le serveur où la requête est exécutée, puis il est copié sur les autres serveurs. Comme il est asynchrone, les données récemment insérées apparaissent sur les autres répliques avec une certaine latence. Si une partie des répliques ne sont pas disponibles, les données sont écrites lorsqu'elles sont disponibles. Si une réplique est disponible, la latence correspond au temps nécessaire pour transférer le bloc de données compressées sur le réseau.
-
-Par défaut, une requête INSERT attend la confirmation de l'écriture des données à partir d'un seul réplica. Si les données ont été correctement écrit sur une seule réplique et le serveur avec cette réplique cesse d'exister, les données enregistrées seront perdues. Pour activer la confirmation des Écritures de données à partir de plusieurs réplicas, utilisez `insert_quorum` option.
-
-Chaque bloc de données est écrit de manière atomique. La requête D'insertion est divisée en blocs jusqu'à `max_insert_block_size = 1048576` rangée. En d'autres termes, si l' `INSERT` la requête a moins de 1048576 lignes, elle est faite de manière atomique.
-
-Les blocs de données sont dédupliquées. Pour plusieurs écritures du même bloc de données (blocs de données de même taille contenant les mêmes lignes dans le même ordre), le bloc n'est écrit qu'une seule fois. La raison en est en cas de défaillance du réseau lorsque l'application cliente ne sait pas si les données ont été écrites dans la base de données, de sorte que le `INSERT` requête peut simplement être répété. Peu importe à quelles insertions de réplica ont été envoyées avec des données identiques. `INSERTs` sont idempotents. Les paramètres de déduplication sont contrôlés par [merge_tree](../../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-merge_tree) les paramètres du serveur.
-
-Pendant la réplication, seules les données source à insérer sont transférées sur le réseau. D'autres transformations de données (fusion) sont coordonnées et effectuées sur toutes les répliques de la même manière. Cela minimise l'utilisation du réseau, ce qui signifie que la réplication fonctionne bien lorsque les répliques résident dans différents centres de données. (Notez que la duplication de données dans différents centres de données est l'objectif principal de la réplication.)
-
-Vous pouvez avoir n'importe quel nombre de répliques des mêmes données. Yandex.Metrica utilise la double réplication en production. Chaque serveur utilise RAID-5 ou RAID-6, et RAID-10 dans certains cas. C'est une solution relativement fiable et pratique.
-
-Le système surveille la synchronicité des données sur les répliques et est capable de récupérer après une défaillance. Le basculement est automatique (pour les petites différences de données) ou semi-automatique (lorsque les données diffèrent trop, ce qui peut indiquer une erreur de configuration).
-
-## Création De Tables Répliquées {#creating-replicated-tables}
-
-Le `Replicated` le préfixe est ajouté au nom du moteur de table. Exemple:`ReplicatedMergeTree`.
-
-**Répliqué \* MergeTree paramètres**
-
--   `zoo_path` — The path to the table in ZooKeeper.
--   `replica_name` — The replica name in ZooKeeper.
-
-Exemple:
-
-``` sql
-CREATE TABLE table_name
-(
-    EventDate DateTime,
-    CounterID UInt32,
-    UserID UInt32
-) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{layer}-{shard}/table_name', '{replica}')
-PARTITION BY toYYYYMM(EventDate)
-ORDER BY (CounterID, EventDate, intHash32(UserID))
-SAMPLE BY intHash32(UserID)
-```
-
-<details markdown="1">
-
-<summary>Exemple de syntaxe obsolète</summary>
-
-``` sql
-CREATE TABLE table_name
-(
-    EventDate DateTime,
-    CounterID UInt32,
-    UserID UInt32
-) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{layer}-{shard}/table_name', '{replica}', EventDate, intHash32(UserID), (CounterID, EventDate, intHash32(UserID), EventTime), 8192)
-```
-
-</details>
-
-Comme le montre l'exemple, ces paramètres peuvent contenir des substitutions entre crochets. Les valeurs substituées sont tirées de la ‘macros’ section du fichier de configuration. Exemple:
-
-``` xml
-<macros>
-    <layer>05</layer>
-    <shard>02</shard>
-    <replica>example05-02-1.yandex.ru</replica>
-</macros>
-```
-
-Le chemin d'accès à la table dans ZooKeeper doit être unique pour chaque table répliquée. Les Tables sur différents fragments doivent avoir des chemins différents.
-Dans ce cas, le chemin se compose des parties suivantes:
-
-`/clickhouse/tables/` est le préfixe commun. Nous vous recommandons d'utiliser exactement celui-ci.
-
-`{layer}-{shard}` est l'identificateur de fragment. Dans cet exemple, il se compose de deux parties, depuis l'Yandex.Le cluster Metrica utilise le sharding à deux niveaux. Pour la plupart des tâches, vous ne pouvez laisser que la substitution {shard}, qui sera étendue à l'Identificateur de partition.
-
-`table_name` est le nom du nœud de la table dans ZooKeeper. C'est une bonne idée de le rendre identique au nom de la table. Il est défini explicitement, car contrairement au nom de la table, il ne change pas après une requête de renommage.
-*HINT*: vous pouvez ajouter un nom de base de données devant `table_name` Aussi. E. g. `db_name.table_name`
-
-Le nom du réplica identifie différentes réplicas de la même table. Vous pouvez utiliser le nom de serveur pour cela, comme dans l'exemple. Le nom doit seulement être unique dans chaque fragment.
-
-Vous pouvez définir les paramètres explicitement au lieu d'utiliser des substitutions. Cela peut être pratique pour tester et configurer de petits clusters. Cependant, vous ne pouvez pas utiliser de requêtes DDL distribuées (`ON CLUSTER`) dans ce cas.
-
-Lorsque vous travaillez avec de grands clusters, nous vous recommandons d'utiliser des substitutions car elles réduisent la probabilité d'erreur.
-
-Exécutez l' `CREATE TABLE` requête sur chaque réplique. Cette requête crée une nouvelle table répliquée, ou ajoute une nouvelle réplique à un existant.
-
-Si vous ajoutez une nouvelle réplique après que la table contient déjà des données sur d'autres répliques, les données seront copiées des autres répliques vers la nouvelle après l'exécution de la requête. En d'autres termes, la nouvelle réplique synchronise avec les autres.
-
-Pour supprimer une réplique, exécutez `DROP TABLE`. However, only one replica is deleted – the one that resides on the server where you run the query.
-
-## Récupération Après Des Échecs {#recovery-after-failures}
-
-Si ZooKeeper n'est pas disponible au démarrage d'un serveur, les tables répliquées passent en mode Lecture seule. Le système tente périodiquement de se connecter à ZooKeeper.
-
-Si ZooKeeper est indisponible pendant un `INSERT`, ou une erreur se produit lors de l'interaction avec ZooKeeper, une exception est levée.
-
-Après la connexion à ZooKeeper, le système vérifie si l'ensemble de données du système de fichiers local correspond à l'ensemble de données attendu (ZooKeeper stocke ces informations). S'il y a des incohérences mineures, le système les résout en synchronisant les données avec les répliques.
-
-Si le système détecte des parties de données brisées (avec la mauvaise taille des fichiers) ou des parties non reconnues (parties écrites dans le système de fichiers mais non enregistrées dans ZooKeeper), il les déplace vers le `detached` sous-répertoire (ils ne sont pas supprimés). Toutes les pièces manquantes sont copiées à partir des répliques.
-
-Notez que ClickHouse n'effectue aucune action destructrice telle que la suppression automatique d'une grande quantité de données.
-
-Lorsque le serveur démarre (ou établit une nouvelle session avec ZooKeeper), il vérifie uniquement la quantité et la taille de tous les fichiers. Si les tailles de fichier correspondent mais que les octets ont été modifiés quelque part au milieu, cela n'est pas détecté immédiatement, mais uniquement lorsque vous tentez de lire les données `SELECT` requête. La requête lève une exception concernant une somme de contrôle ou une taille non correspondante d'un bloc compressé. Dans ce cas, des parties de données sont ajoutées à la file d'attente de vérification et copiées à partir des répliques si nécessaire.
-
-Si la série de données diffère trop de celle attendue, un mécanisme de sécurité est déclenché. Le serveur entre cela dans le journal et refuse de lancer. La raison en est que ce cas peut indiquer une erreur de configuration, par exemple si une réplique sur un fragment a été accidentellement configurée comme une réplique sur un fragment différent. Cependant, les seuils pour ce mécanisme sont fixés assez bas, et cette situation peut se produire pendant la récupération normale de la défaillance. Dans ce cas, les données sont restaurées semi-automatiquement - par “pushing a button”.
-
-Pour démarrer la récupération, créez le nœud `/path_to_table/replica_name/flags/force_restore_data` dans ZooKeeper avec n'importe quel contenu, ou exécutez la commande pour restaurer toutes les tables répliquées:
-
-``` bash
-sudo -u clickhouse touch /var/lib/clickhouse/flags/force_restore_data
-```
-
-Puis redémarrez le serveur. Au démarrage, le serveur supprime ces indicateurs et démarre la récupération.
-
-## Récupération Après La Perte De Données Complète {#recovery-after-complete-data-loss}
-
-Si toutes les données et métadonnées ont disparu de l'un des serveurs, procédez comme suit pour la récupération:
-
-1.  Installez ClickHouse sur le serveur. Définissez correctement les substitutions dans le fichier de configuration qui contient l'Identificateur de fragment et les répliques, si vous les utilisez.
-2.  Si vous avez des tables non compliquées qui doivent être dupliquées manuellement sur les serveurs, copiez leurs données à partir d'un réplica (dans le répertoire `/var/lib/clickhouse/data/db_name/table_name/`).
-3.  Copier les définitions de table situées dans `/var/lib/clickhouse/metadata/` à partir d'une réplique. Si un identificateur de fragment ou de réplica est défini explicitement dans les définitions de table, corrigez-le de manière à ce qu'il corresponde à ce réplica. (Alternativement, démarrez le serveur et faites tous les `ATTACH TABLE` les requêtes qui auraient dû être dans les .les fichiers sql dans `/var/lib/clickhouse/metadata/`.)
-4.  Pour démarrer la récupération, créez le nœud ZooKeeper `/path_to_table/replica_name/flags/force_restore_data` tout contenu, ou d'exécuter la commande pour restaurer toutes les tables répliquées: `sudo -u clickhouse touch /var/lib/clickhouse/flags/force_restore_data`
-
-Ensuite, démarrez le serveur (redémarrez, s'il est déjà en cours d'exécution). Les données seront téléchargées à partir de répliques.
-
-Une autre option de récupération consiste à supprimer des informations sur la réplique perdue de ZooKeeper (`/path_to_table/replica_name`), puis créez à nouveau la réplique comme décrit dans “[Création de tables répliquées](#creating-replicated-tables)”.
-
-Il n'y a aucune restriction sur la bande passante réseau pendant la récupération. Gardez cela à l'esprit si vous restaurez de nombreuses répliques à la fois.
-
-## Conversion de MergeTree en ReplicatedMergeTree {#converting-from-mergetree-to-replicatedmergetree}
-
-Nous utilisons le terme `MergeTree` pour consulter tous les moteurs de la `MergeTree family` le même que pour `ReplicatedMergeTree`.
-
-Si vous avez eu une `MergeTree` table qui a été répliquée manuellement, vous pouvez le convertir en une table répliquée. Vous devrez peut-être le faire si vous avez déjà recueilli une grande quantité de données dans un `MergeTree` table et maintenant vous voulez activer la réplication.
-
-Si les données diffèrent sur différentes répliques, synchronisez-les d'abord ou supprimez-les sur toutes les répliques sauf une.
-
-Renommez la table mergetree existante, puis créez un `ReplicatedMergeTree` table avec l'ancien nom.
-Déplacez les données de l'ancienne table vers `detached` sous-répertoire à l'intérieur du répertoire avec les nouvelles données de la table (`/var/lib/clickhouse/data/db_name/table_name/`).
-Ensuite, exécutez `ALTER TABLE ATTACH PARTITION` sur l'une des répliques d'ajouter ces données à des parties de l'ensemble de travail.
-
-## Conversion de ReplicatedMergeTree en MergeTree {#converting-from-replicatedmergetree-to-mergetree}
-
-Créez une table MergeTree avec un nom différent. Déplacez toutes les données du répertoire avec le `ReplicatedMergeTree` données de la table dans le répertoire de données de la nouvelle table. Ensuite, supprimer le `ReplicatedMergeTree` table et redémarrez le serveur.
-
-Si vous voulez vous débarrasser d'un `ReplicatedMergeTree` table sans lancer le serveur:
-
--   Supprimer la `.sql` fichier dans le répertoire de métadonnées (`/var/lib/clickhouse/metadata/`).
--   Supprimer le chemin correspondant dans ZooKeeper (`/path_to_table/replica_name`).
-
-Après cela, vous pouvez lancer le serveur, créer un `MergeTree` tableau, déplacer les données de son répertoire, puis redémarrez le serveur.
-
-## Récupération lorsque les métadonnées du Cluster Zookeeper sont perdues ou endommagées {#recovery-when-metadata-in-the-zookeeper-cluster-is-lost-or-damaged}
-
-Si les données de ZooKeeper ont été perdues ou endommagées, vous pouvez les enregistrer en les déplaçant dans une table non compliquée comme décrit ci-dessus.
-
-[Article Original](https://clickhouse.tech/docs/en/operations/table_engines/replication/) <!--hide-->
diff --git a/docs/fr/engines/table-engines/mergetree-family/summingmergetree.md b/docs/fr/engines/table-engines/mergetree-family/summingmergetree.md
deleted file mode 100644
index f4f2b94a93f..00000000000
--- a/docs/fr/engines/table-engines/mergetree-family/summingmergetree.md
+++ /dev/null
@@ -1,141 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 34
-toc_title: SummingMergeTree
----
-
-# SummingMergeTree {#summingmergetree}
-
-Le moteur hérite de [MergeTree](mergetree.md#table_engines-mergetree). La différence est que lors de la fusion de parties de données pour `SummingMergeTree` tables ClickHouse remplace toutes les lignes avec la même clé primaire (ou, plus précisément, avec la même [clé de tri](mergetree.md)) avec une ligne qui contient des valeurs résumées pour les colonnes avec le type de données numériques. Si la clé de tri est composée de telle sorte qu'une seule valeur de clé correspond à un grand nombre de lignes, cela réduit considérablement le volume de stockage et accélère la sélection des données.
-
-Nous vous recommandons d'utiliser le moteur avec `MergeTree`. Stocker des données complètes dans `MergeTree` table, et l'utilisation `SummingMergeTree` pour le stockage de données agrégées, par exemple, lors de la préparation de rapports. Une telle approche vous empêchera de perdre des données précieuses en raison d'une clé primaire mal composée.
-
-## Création d'une Table {#creating-a-table}
-
-``` sql
-CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
-(
-    name1 [type1] [DEFAULT|MATERIALIZED|ALIAS expr1],
-    name2 [type2] [DEFAULT|MATERIALIZED|ALIAS expr2],
-    ...
-) ENGINE = SummingMergeTree([columns])
-[PARTITION BY expr]
-[ORDER BY expr]
-[SAMPLE BY expr]
-[SETTINGS name=value, ...]
-```
-
-Pour une description des paramètres de requête, voir [demande de description](../../../sql-reference/statements/create.md).
-
-**Paramètres de SummingMergeTree**
-
--   `columns` - un n-uplet avec les noms de colonnes où les valeurs seront résumées. Paramètre facultatif.
-    Les colonnes doivent être d'un type numérique et ne doit pas être dans la clé primaire.
-
-    Si `columns` non spécifié, ClickHouse résume les valeurs dans toutes les colonnes avec un type de données numérique qui ne sont pas dans la clé primaire.
-
-**Les clauses de requête**
-
-Lors de la création d'un `SummingMergeTree` la table de la même [clause](mergetree.md) sont nécessaires, comme lors de la création d'un `MergeTree` table.
-
-<details markdown="1">
-
-<summary>Méthode obsolète pour créer une Table</summary>
-
-!!! attention "Attention"
-    N'utilisez pas cette méthode dans les nouveaux projets et, si possible, remplacez les anciens projets par la méthode décrite ci-dessus.
-
-``` sql
-CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
-(
-    name1 [type1] [DEFAULT|MATERIALIZED|ALIAS expr1],
-    name2 [type2] [DEFAULT|MATERIALIZED|ALIAS expr2],
-    ...
-) ENGINE [=] SummingMergeTree(date-column [, sampling_expression], (primary, key), index_granularity, [columns])
-```
-
-Tous les paramètres excepté `columns` ont la même signification que dans `MergeTree`.
-
--   `columns` — tuple with names of columns values of which will be summarized. Optional parameter. For a description, see the text above.
-
-</details>
-
-## Exemple D'Utilisation {#usage-example}
-
-Considérons le tableau suivant:
-
-``` sql
-CREATE TABLE summtt
-(
-    key UInt32,
-    value UInt32
-)
-ENGINE = SummingMergeTree()
-ORDER BY key
-```
-
-Insérer des données:
-
-``` sql
-INSERT INTO summtt Values(1,1),(1,2),(2,1)
-```
-
-ClickHouse peut résumer toutes les lignes pas complètement ([voir ci-dessous](#data-processing)), nous utilisons donc une fonction d'agrégation `sum` et `GROUP BY` la clause dans la requête.
-
-``` sql
-SELECT key, sum(value) FROM summtt GROUP BY key
-```
-
-``` text
-┌─key─┬─sum(value)─┐
-│   2 │          1 │
-│   1 │          3 │
-└─────┴────────────┘
-```
-
-## Le Traitement Des Données {#data-processing}
-
-Lorsque les données sont insérées dans une table, elles sont enregistrées telles quelles. Clickhouse fusionne périodiquement les parties de données insérées et c'est à ce moment que les lignes avec la même clé primaire sont additionnées et remplacées par une pour chaque partie de données résultante.
-
-ClickHouse can merge the data parts so that different resulting parts of data cat consist rows with the same primary key, i.e. the summation will be incomplete. Therefore (`SELECT`) une fonction d'agrégation [somme()](../../../sql-reference/aggregate-functions/reference.md#agg_function-sum) et `GROUP BY` la clause doit être utilisé dans une requête comme décrit dans l'exemple ci-dessus.
-
-### Règles communes pour la sommation {#common-rules-for-summation}
-
-Les valeurs dans les colonnes avec le type de données numériques sont résumées. L'ensemble des colonnes est défini par le paramètre `columns`.
-
-Si les valeurs étaient 0 dans toutes les colonnes pour la sommation, la ligne est supprimée.
-
-Si la colonne n'est pas dans la clé primaire et n'est pas résumée, une valeur arbitraire est sélectionnée parmi celles existantes.
-
-Les valeurs ne sont pas résumés des colonnes de la clé primaire.
-
-### La somme dans les colonnes Aggregatefunction {#the-summation-in-the-aggregatefunction-columns}
-
-Pour les colonnes de [Type AggregateFunction](../../../sql-reference/data-types/aggregatefunction.md) ClickHouse se comporte comme [AggregatingMergeTree](aggregatingmergetree.md) moteur d'agrégation selon la fonction.
-
-### Structures Imbriquées {#nested-structures}
-
-Table peut avoir des structures de données imbriquées qui sont traitées d'une manière spéciale.
-
-Si le nom d'une table imbriquée se termine avec `Map` et il contient au moins deux colonnes qui répondent aux critères suivants:
-
--   la première colonne est numérique `(*Int*, Date, DateTime)` ou une chaîne de caractères `(String, FixedString)`, nous allons l'appeler `key`,
--   les autres colonnes sont arithmétique `(*Int*, Float32/64)`, nous allons l'appeler `(values...)`,
-
-ensuite, cette table imbriquée est interprétée comme un mappage de `key => (values...)` et lors de la fusion de ses lignes, les éléments de deux ensembles de données sont regroupées par `key` avec une sommation du correspondant `(values...)`.
-
-Exemple:
-
-``` text
-[(1, 100)] + [(2, 150)] -> [(1, 100), (2, 150)]
-[(1, 100)] + [(1, 150)] -> [(1, 250)]
-[(1, 100)] + [(1, 150), (2, 150)] -> [(1, 250), (2, 150)]
-[(1, 100), (2, 150)] + [(1, -100)] -> [(2, 150)]
-```
-
-Lorsque vous demandez des données, utilisez [sumMap (clé, valeur)](../../../sql-reference/aggregate-functions/reference.md) fonction pour l'agrégation de `Map`.
-
-Pour la structure de données imbriquée, vous n'avez pas besoin de spécifier ses colonnes dans le tuple de colonnes pour la sommation.
-
-[Article Original](https://clickhouse.tech/docs/en/operations/table_engines/summingmergetree/) <!--hide-->
diff --git a/docs/fr/engines/table-engines/mergetree-family/versionedcollapsingmergetree.md b/docs/fr/engines/table-engines/mergetree-family/versionedcollapsingmergetree.md
deleted file mode 100644
index 9be9fb5e76e..00000000000
--- a/docs/fr/engines/table-engines/mergetree-family/versionedcollapsingmergetree.md
+++ /dev/null
@@ -1,238 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 37
-toc_title: VersionedCollapsingMergeTree
----
-
-# VersionedCollapsingMergeTree {#versionedcollapsingmergetree}
-
-Ce moteur:
-
--   Permet l'écriture rapide des États d'objet qui changent continuellement.
--   Supprime les anciens États d'objets en arrière-plan. Cela réduit considérablement le volume de stockage.
-
-Voir la section [Effondrer](#table_engines_versionedcollapsingmergetree) pour plus de détails.
-
-Le moteur hérite de [MergeTree](mergetree.md#table_engines-mergetree) et ajoute la logique de réduction des lignes à l'algorithme de fusion des parties de données. `VersionedCollapsingMergeTree` sert le même but que [CollapsingMergeTree](collapsingmergetree.md) mais utilise un autre effondrement algorithme qui permet d'insérer les données dans n'importe quel ordre avec plusieurs threads. En particulier, l' `Version` la colonne aide à réduire correctement les lignes même si elles sont insérées dans le mauvais ordre. Contrairement, `CollapsingMergeTree` permet uniquement une insertion strictement consécutive.
-
-## Création d'une Table {#creating-a-table}
-
-``` sql
-CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
-(
-    name1 [type1] [DEFAULT|MATERIALIZED|ALIAS expr1],
-    name2 [type2] [DEFAULT|MATERIALIZED|ALIAS expr2],
-    ...
-) ENGINE = VersionedCollapsingMergeTree(sign, version)
-[PARTITION BY expr]
-[ORDER BY expr]
-[SAMPLE BY expr]
-[SETTINGS name=value, ...]
-```
-
-Pour une description des paramètres de requête, voir les [description de la requête](../../../sql-reference/statements/create.md).
-
-**Les Paramètres Du Moteur**
-
-``` sql
-VersionedCollapsingMergeTree(sign, version)
-```
-
--   `sign` — Name of the column with the type of row: `1` est un “state” rangée, `-1` est un “cancel” rangée.
-
-    Le type de données de colonne doit être `Int8`.
-
--   `version` — Name of the column with the version of the object state.
-
-    Le type de données de colonne doit être `UInt*`.
-
-**Les Clauses De Requête**
-
-Lors de la création d'un `VersionedCollapsingMergeTree` de table, de la même [clause](mergetree.md) sont requis lors de la création d'un `MergeTree` table.
-
-<details markdown="1">
-
-<summary>Méthode obsolète pour créer une Table</summary>
-
-!!! attention "Attention"
-    N'utilisez pas cette méthode dans les nouveaux projets. Si possible, passer les anciens projets à la méthode décrite ci-dessus.
-
-``` sql
-CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
-(
-    name1 [type1] [DEFAULT|MATERIALIZED|ALIAS expr1],
-    name2 [type2] [DEFAULT|MATERIALIZED|ALIAS expr2],
-    ...
-) ENGINE [=] VersionedCollapsingMergeTree(date-column [, samp#table_engines_versionedcollapsingmergetreeling_expression], (primary, key), index_granularity, sign, version)
-```
-
-Tous les paramètres, à l'exception `sign` et `version` ont la même signification que dans `MergeTree`.
-
--   `sign` — Name of the column with the type of row: `1` est un “state” rangée, `-1` est un “cancel” rangée.
-
-    Column Data Type — `Int8`.
-
--   `version` — Name of the column with the version of the object state.
-
-    Le type de données de colonne doit être `UInt*`.
-
-</details>
-
-## Effondrer {#table_engines_versionedcollapsingmergetree}
-
-### Données {#data}
-
-Considérez une situation où vous devez enregistrer des données en constante évolution pour un objet. Il est raisonnable d'avoir une ligne pour un objet et de mettre à jour la ligne chaque fois qu'il y a des modifications. Cependant, l'opération de mise à jour est coûteuse et lente pour un SGBD car elle nécessite la réécriture des données dans le stockage. La mise à jour n'est pas acceptable si vous devez écrire des données rapidement, mais vous pouvez écrire les modifications sur un objet de manière séquentielle comme suit.
-
-L'utilisation de la `Sign` colonne lors de l'écriture de la ligne. Si `Sign = 1` cela signifie que la ligne est un état d'un objet (appelons-la “state” rangée). Si `Sign = -1` il indique l'annulation de l'état d'un objet avec les mêmes attributs (appelons-la “cancel” rangée). Également utiliser l' `Version` colonne, qui doit identifier chaque état d'un objet avec un numéro distinct.
-
-Par exemple, nous voulons calculer le nombre de pages visitées sur le site et combien de temps ils étaient là. À un moment donné nous écrivons la ligne suivante avec l'état de l'activité de l'utilisateur:
-
-``` text
-┌──────────────UserID─┬─PageViews─┬─Duration─┬─Sign─┬─Version─┐
-│ 4324182021466249494 │         5 │      146 │    1 │       1 |
-└─────────────────────┴───────────┴──────────┴──────┴─────────┘
-```
-
-À un moment donné, nous enregistrons le changement d'activité de l'utilisateur et l'écrivons avec les deux lignes suivantes.
-
-``` text
-┌──────────────UserID─┬─PageViews─┬─Duration─┬─Sign─┬─Version─┐
-│ 4324182021466249494 │         5 │      146 │   -1 │       1 |
-│ 4324182021466249494 │         6 │      185 │    1 │       2 |
-└─────────────────────┴───────────┴──────────┴──────┴─────────┘
-```
-
-La première ligne annule le précédent état de l'objet (utilisateur). Il doit copier tous les champs de l'état annulé sauf `Sign`.
-
-La deuxième ligne contient l'état actuel.
-
-Parce que nous avons besoin seulement le dernier état de l'activité de l'utilisateur, les lignes
-
-``` text
-┌──────────────UserID─┬─PageViews─┬─Duration─┬─Sign─┬─Version─┐
-│ 4324182021466249494 │         5 │      146 │    1 │       1 |
-│ 4324182021466249494 │         5 │      146 │   -1 │       1 |
-└─────────────────────┴───────────┴──────────┴──────┴─────────┘
-```
-
-peut être supprimé, réduisant l'état invalide (ancien) de l'objet. `VersionedCollapsingMergeTree` fait cela lors de la fusion des parties de données.
-
-Pour savoir pourquoi nous avons besoin de deux lignes pour chaque changement, voir [Algorithme](#table_engines-versionedcollapsingmergetree-algorithm).
-
-**Notes sur l'Utilisation de la**
-
-1.  Le programme qui écrit les données devraient se souvenir de l'état d'un objet afin de l'annuler. Le “cancel” chaîne doit être une copie de la “state” chaîne avec le contraire `Sign`. Cela augmente la taille initiale de stockage, mais permet d'écrire les données rapidement.
-2.  Les tableaux de plus en plus longs dans les colonnes réduisent l'efficacité du moteur en raison de la charge d'écriture. Plus les données sont simples, meilleure est l'efficacité.
-3.  `SELECT` les résultats dépendent fortement de la cohérence de l'histoire de l'objet change. Être précis lors de la préparation des données pour l'insertion. Vous pouvez obtenir des résultats imprévisibles avec des données incohérentes, telles que des valeurs négatives pour des métriques non négatives telles que la profondeur de session.
-
-### Algorithme {#table_engines-versionedcollapsingmergetree-algorithm}
-
-Lorsque ClickHouse fusionne des parties de données, il supprime chaque paire de lignes ayant la même clé primaire et la même version et différentes `Sign`. L'ordre des lignes n'a pas d'importance.
-
-Lorsque ClickHouse insère des données, il ordonne les lignes par la clé primaire. Si l' `Version` la colonne n'est pas dans la clé primaire, ClickHouse ajoute à la clé primaire implicitement que le dernier champ et l'utilise pour la commande.
-
-## La Sélection De Données {#selecting-data}
-
-ClickHouse ne garantit pas que toutes les lignes avec la même clé primaire sera dans la même partie des données ou même sur le même serveur physique. Cela est vrai à la fois pour l'écriture des données et pour la fusion ultérieure des parties de données. En outre, les processus ClickHouse `SELECT` requêtes avec plusieurs threads, et il ne peut pas prédire l'ordre des lignes dans le résultat. Cela signifie que le regroupement est nécessaire s'il est nécessaire pour obtenir complètement “collapsed” données à partir d'un `VersionedCollapsingMergeTree` table.
-
-Pour finaliser la réduction, écrivez une requête avec un `GROUP BY` fonctions de clause et d'agrégation qui tiennent compte du signe. Par exemple, pour calculer la quantité, l'utilisation `sum(Sign)` plutôt `count()`. Pour calculer la somme de quelque chose, utilisez `sum(Sign * x)` plutôt `sum(x)` et d'ajouter `HAVING sum(Sign) > 0`.
-
-Aggregate `count`, `sum` et `avg` peut être calculée de cette manière. Aggregate `uniq` peut être calculé si un objet a au moins un non-état effondré. Aggregate `min` et `max` ne peut pas être calculé, car `VersionedCollapsingMergeTree` ne sauvegarde pas l'historique des valeurs des États réduits.
-
-Si vous avez besoin d'extraire les données avec “collapsing” mais sans agrégation (par exemple, pour vérifier si des lignes sont présentes dont les valeurs les plus récentes correspondent à certaines conditions), vous pouvez utiliser `FINAL` le modificateur du `FROM` clause. Cette approche est inefficace et ne devrait pas être utilisée avec de grandes tables.
-
-## Exemple D'utilisation {#example-of-use}
-
-Les données de l'exemple:
-
-``` text
-┌──────────────UserID─┬─PageViews─┬─Duration─┬─Sign─┬─Version─┐
-│ 4324182021466249494 │         5 │      146 │    1 │       1 |
-│ 4324182021466249494 │         5 │      146 │   -1 │       1 |
-│ 4324182021466249494 │         6 │      185 │    1 │       2 |
-└─────────────────────┴───────────┴──────────┴──────┴─────────┘
-```
-
-Création de la table:
-
-``` sql
-CREATE TABLE UAct
-(
-    UserID UInt64,
-    PageViews UInt8,
-    Duration UInt8,
-    Sign Int8,
-    Version UInt8
-)
-ENGINE = VersionedCollapsingMergeTree(Sign, Version)
-ORDER BY UserID
-```
-
-Insérer les données:
-
-``` sql
-INSERT INTO UAct VALUES (4324182021466249494, 5, 146, 1, 1)
-```
-
-``` sql
-INSERT INTO UAct VALUES (4324182021466249494, 5, 146, -1, 1),(4324182021466249494, 6, 185, 1, 2)
-```
-
-Nous utilisons deux `INSERT` requêtes pour créer deux parties de données différentes. Si nous insérons les données avec une seule requête, ClickHouse crée une partie de données et n'effectuera jamais de fusion.
-
-L'obtention de données:
-
-``` sql
-SELECT * FROM UAct
-```
-
-``` text
-┌──────────────UserID─┬─PageViews─┬─Duration─┬─Sign─┬─Version─┐
-│ 4324182021466249494 │         5 │      146 │    1 │       1 │
-└─────────────────────┴───────────┴──────────┴──────┴─────────┘
-┌──────────────UserID─┬─PageViews─┬─Duration─┬─Sign─┬─Version─┐
-│ 4324182021466249494 │         5 │      146 │   -1 │       1 │
-│ 4324182021466249494 │         6 │      185 │    1 │       2 │
-└─────────────────────┴───────────┴──────────┴──────┴─────────┘
-```
-
-Que voyons-nous ici et où sont les parties effondrées?
-Nous avons créé deux parties de données en utilisant deux `INSERT` requête. Le `SELECT` la requête a été effectuée dans deux threads, et le résultat est un ordre aléatoire de lignes.
-L'effondrement n'a pas eu lieu car les parties de données n'ont pas encore été fusionnées. ClickHouse fusionne des parties de données à un moment inconnu que nous ne pouvons pas prédire.
-
-C'est pourquoi nous avons besoin de l'agrégation:
-
-``` sql
-SELECT
-    UserID,
-    sum(PageViews * Sign) AS PageViews,
-    sum(Duration * Sign) AS Duration,
-    Version
-FROM UAct
-GROUP BY UserID, Version
-HAVING sum(Sign) > 0
-```
-
-``` text
-┌──────────────UserID─┬─PageViews─┬─Duration─┬─Version─┐
-│ 4324182021466249494 │         6 │      185 │       2 │
-└─────────────────────┴───────────┴──────────┴─────────┘
-```
-
-Si nous n'avons pas besoin d'agrégation et que nous voulons forcer l'effondrement, nous pouvons utiliser le `FINAL` le modificateur du `FROM` clause.
-
-``` sql
-SELECT * FROM UAct FINAL
-```
-
-``` text
-┌──────────────UserID─┬─PageViews─┬─Duration─┬─Sign─┬─Version─┐
-│ 4324182021466249494 │         6 │      185 │    1 │       2 │
-└─────────────────────┴───────────┴──────────┴──────┴─────────┘
-```
-
-C'est un moyen très inefficace de sélectionner des données. Ne l'utilisez pas pour les grandes tables.
-
-[Article Original](https://clickhouse.tech/docs/en/operations/table_engines/versionedcollapsingmergetree/) <!--hide-->
diff --git a/docs/fr/engines/table-engines/special/buffer.md b/docs/fr/engines/table-engines/special/buffer.md
deleted file mode 100644
index 22fde2d614e..00000000000
--- a/docs/fr/engines/table-engines/special/buffer.md
+++ /dev/null
@@ -1,71 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 45
-toc_title: Tampon
----
-
-# Tampon {#buffer}
-
-Met en mémoire tampon les données à écrire dans la RAM, les vidant périodiquement dans une autre table. Pendant l'opération de lecture, les données sont lues à partir de la mémoire tampon, et l'autre simultanément.
-
-``` sql
-Buffer(database, table, num_layers, min_time, max_time, min_rows, max_rows, min_bytes, max_bytes)
-```
-
-Les paramètres du moteur:
-
--   `database` – Database name. Instead of the database name, you can use a constant expression that returns a string.
--   `table` – Table to flush data to.
--   `num_layers` – Parallelism layer. Physically, the table will be represented as `num_layers` indépendant de tampons. Valeur recommandée: 16.
--   `min_time`, `max_time`, `min_rows`, `max_rows`, `min_bytes`, et `max_bytes` – Conditions for flushing data from the buffer.
-
-Les données sont vidées du tampon et écrites dans la table de destination si toutes les `min*` conditions ou au moins un `max*` conditions sont remplies.
-
--   `min_time`, `max_time` – Condition for the time in seconds from the moment of the first write to the buffer.
--   `min_rows`, `max_rows` – Condition for the number of rows in the buffer.
--   `min_bytes`, `max_bytes` – Condition for the number of bytes in the buffer.
-
-Pendant l'opération d'écriture, les données sont insérées dans un `num_layers` nombre aléatoire de tampons. Ou, si la partie de données à insérer est suffisamment grande (supérieure à `max_rows` ou `max_bytes`), il est écrit directement dans la table de destination, en omettant le tampon.
-
-Les conditions de purger les données sont calculées séparément pour chacun des `num_layers` tampon. Par exemple, si `num_layers = 16` et `max_bytes = 100000000`, la consommation maximale de RAM est de 1,6 Go.
-
-Exemple:
-
-``` sql
-CREATE TABLE merge.hits_buffer AS merge.hits ENGINE = Buffer(merge, hits, 16, 10, 100, 10000, 1000000, 10000000, 100000000)
-```
-
-La création d'un ‘merge.hits_buffer’ table avec la même structure que ‘merge.hits’ et en utilisant le moteur tampon. Lors de l'écriture dans cette table, les données sont mises en mémoire tampon dans la RAM ‘merge.hits’ table. 16 tampons sont créés. Les données dans chacun d'entre eux est rincé si 100 secondes sont écoulées, ou un million de lignes ont été écrites, ou 100 MO de données ont été écrits; ou si, simultanément, 10 secondes et 10 000 lignes et 10 MO de données ont été écrites. Par exemple, si une ligne a été écrite, après 100 secondes, il sera vidé, n'importe quoi. Mais si plusieurs lignes ont été écrites, les données seront vidées plus tôt.
-
-Lorsque le serveur est arrêté, avec DROP TABLE ou DETACH TABLE, les données du tampon sont également vidées vers la table de destination.
-
-Vous pouvez définir des chaînes vides entre guillemets simples pour le nom de la base de données et de la table. Cela indique l'absence d'une table de destination. Dans ce cas, lorsque les conditions de vidage des données sont atteintes, le tampon est simplement effacé. Cela peut être utile pour garder une fenêtre de données dans la mémoire.
-
-Lors de la lecture à partir d'une table tampon, les données sont traitées à la fois à partir du tampon et de la table de destination (s'il y en a une).
-Notez que les tables de tampon ne prennent pas en charge un index. En d'autres termes, les données dans le tampon sont entièrement analysées, ce qui peut être lent pour les grands tampons. (Pour les données dans une table subordonnée, l'index qu'il prend en charge sera utilisé.)
-
-Si l'ensemble de colonnes de la table tampon ne correspond pas à l'ensemble de colonnes d'une table subordonnée, un sous-ensemble de colonnes existant dans les deux tables est inséré.
-
-Si les types ne correspondent pas à l'une des colonnes de la table tampon et à une table subordonnée, un message d'erreur est entré dans le journal du serveur et le tampon est effacé.
-La même chose se produit si la table subordonnée n'existe pas lorsque le tampon est vidé.
-
-Si vous devez exécuter ALTER pour une table subordonnée et la table tampon, nous vous recommandons de supprimer d'abord la table tampon, d'exécuter ALTER pour la table subordonnée, puis de créer à nouveau la table tampon.
-
-Si le serveur est redémarré anormalement, les données dans le tampon sont perdues.
-
-FINAL et SAMPLE ne fonctionnent pas correctement pour les tables tampon. Ces conditions sont transmises à la table de destination, mais ne sont pas utilisées pour traiter les données dans le tampon. Si ces fonctionnalités sont nécessaires, nous vous recommandons d'utiliser uniquement la table tampon pour l'écriture, lors de la lecture à partir de la table de destination.
-
-Lors de l'ajout de données à un Tampon, un des tampons est verrouillé. Cela entraîne des retards si une opération de lecture est effectuée simultanément à partir de la table.
-
-Les données insérées dans une table tampon peuvent se retrouver dans la table subordonnée dans un ordre différent et dans des blocs différents. Pour cette raison, une table tampon est difficile à utiliser pour écrire correctement dans un CollapsingMergeTree. Pour éviter les problèmes, vous pouvez définir ‘num_layers’ 1.
-
-Si la table de destination est répliquée, certaines caractéristiques attendues des tables répliquées sont perdues lors de l'écriture dans une table tampon. Les modifications aléatoires apportées à l'ordre des lignes et des tailles des parties de données provoquent l'arrêt de la déduplication des données, ce qui signifie qu'il n'est pas possible d'avoir un ‘exactly once’ Ecrire dans des tables répliquées.
-
-En raison de ces inconvénients, nous ne pouvons recommander l'utilisation d'une table tampon que dans de rares cas.
-
-Une table tampon est utilisée lorsque trop D'insertions sont reçues d'un grand nombre de serveurs sur une unité de temps et que les données ne peuvent pas être mises en mémoire tampon avant l'insertion, ce qui signifie que les insertions ne peuvent pas s'exécuter assez rapidement.
-
-Notez qu'il n'est pas judicieux d'insérer des données d'une ligne de temps, même pour Tampon tables. Cela ne produira qu'une vitesse de quelques milliers de lignes par seconde, tandis que l'insertion de blocs de données plus grands peut produire plus d'un million de lignes par seconde (voir la section “Performance”).
-
-[Article Original](https://clickhouse.tech/docs/en/operations/table_engines/buffer/) <!--hide-->
diff --git a/docs/fr/engines/table-engines/special/dictionary.md b/docs/fr/engines/table-engines/special/dictionary.md
deleted file mode 100644
index 530d6510d51..00000000000
--- a/docs/fr/engines/table-engines/special/dictionary.md
+++ /dev/null
@@ -1,97 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 35
-toc_title: Dictionnaire
----
-
-# Dictionnaire {#dictionary}
-
-Le `Dictionary` le moteur affiche le [dictionnaire](../../../sql-reference/dictionaries/external-dictionaries/external-dicts.md) données comme une table ClickHouse.
-
-À titre d'exemple, considérons un dictionnaire de `products` avec la configuration suivante:
-
-``` xml
-<dictionaries>
-<dictionary>
-        <name>products</name>
-        <source>
-            <odbc>
-                <table>products</table>
-                <connection_string>DSN=some-db-server</connection_string>
-            </odbc>
-        </source>
-        <lifetime>
-            <min>300</min>
-            <max>360</max>
-        </lifetime>
-        <layout>
-            <flat/>
-        </layout>
-        <structure>
-            <id>
-                <name>product_id</name>
-            </id>
-            <attribute>
-                <name>title</name>
-                <type>String</type>
-                <null_value></null_value>
-            </attribute>
-        </structure>
-</dictionary>
-</dictionaries>
-```
-
-Interroger les données du dictionnaire:
-
-``` sql
-SELECT
-    name,
-    type,
-    key,
-    attribute.names,
-    attribute.types,
-    bytes_allocated,
-    element_count,
-    source
-FROM system.dictionaries
-WHERE name = 'products'
-```
-
-``` text
-┌─name─────┬─type─┬─key────┬─attribute.names─┬─attribute.types─┬─bytes_allocated─┬─element_count─┬─source──────────┐
-│ products │ Flat │ UInt64 │ ['title']       │ ['String']      │        23065376 │        175032 │ ODBC: .products │
-└──────────┴──────┴────────┴─────────────────┴─────────────────┴─────────────────┴───────────────┴─────────────────┘
-```
-
-Vous pouvez utiliser l' [dictGet\*](../../../sql-reference/functions/ext-dict-functions.md#ext_dict_functions) fonction pour obtenir les données du dictionnaire dans ce format.
-
-Cette vue n'est pas utile lorsque vous avez besoin d'obtenir des données brutes ou `JOIN` opération. Pour ces cas, vous pouvez utiliser le `Dictionary` moteur, qui affiche les données du dictionnaire dans une table.
-
-Syntaxe:
-
-``` sql
-CREATE TABLE %table_name% (%fields%) engine = Dictionary(%dictionary_name%)`
-```
-
-Exemple d'utilisation:
-
-``` sql
-create table products (product_id UInt64, title String) Engine = Dictionary(products);
-```
-
-      Ok
-
-Jetez un oeil à ce qui est dans le tableau.
-
-``` sql
-select * from products limit 1;
-```
-
-``` text
-┌────product_id─┬─title───────────┐
-│        152689 │ Some item       │
-└───────────────┴─────────────────┘
-```
-
-[Article Original](https://clickhouse.tech/docs/en/operations/table_engines/dictionary/) <!--hide-->
diff --git a/docs/fr/engines/table-engines/special/distributed.md b/docs/fr/engines/table-engines/special/distributed.md
deleted file mode 100644
index b40253b1b48..00000000000
--- a/docs/fr/engines/table-engines/special/distributed.md
+++ /dev/null
@@ -1,152 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 33
-toc_title: "Distribu\xE9"
----
-
-# Distribué {#distributed}
-
-**Les Tables avec moteur distribué ne stockent aucune donnée par elles mêmes**, mais autoriser le traitement des requêtes distribuées sur plusieurs serveurs.
-La lecture est automatiquement parallélisée. Lors d'une lecture, les index de table sur les serveurs distants sont utilisés, s'il y en a.
-
-Le moteur distribué accepte les paramètres:
-
--   le nom du cluster dans le fichier de configuration du serveur
-
--   le nom d'une base de données distante
-
--   le nom d'une table distante
-
--   (en option) sharding clé
-
--   (éventuellement) nom de la stratégie, il sera utilisé pour stocker des fichiers temporaires pour l'envoi asynchrone
-
-    Voir aussi:
-
-    -   `insert_distributed_sync` paramètre
-    -   [MergeTree](../mergetree-family/mergetree.md#table_engine-mergetree-multiple-volumes) pour les exemples
-
-Exemple:
-
-``` sql
-Distributed(logs, default, hits[, sharding_key[, policy_name]])
-```
-
-Les données seront lues à partir de tous les serveurs ‘logs’ cluster, à partir de la valeur par défaut.hits table située sur chaque serveur du cluster.
-Les données ne sont pas seulement lues mais sont partiellement traitées sur les serveurs distants (dans la mesure du possible).
-Par exemple, pour une requête avec GROUP BY, les données seront agrégées sur des serveurs distants et les états intermédiaires des fonctions d'agrégation seront envoyés au serveur demandeur. Ensuite, les données seront plus agrégées.
-
-Au lieu du nom de la base de données, vous pouvez utiliser une expression constante qui renvoie une chaîne. Par exemple: currentDatabase().
-
-logs – The cluster name in the server's config file.
-
-Les Clusters sont définis comme ceci:
-
-``` xml
-<remote_servers>
-    <logs>
-        <shard>
-            <!-- Optional. Shard weight when writing data. Default: 1. -->
-            <weight>1</weight>
-            <!-- Optional. Whether to write data to just one of the replicas. Default: false (write data to all replicas). -->
-            <internal_replication>false</internal_replication>
-            <replica>
-                <host>example01-01-1</host>
-                <port>9000</port>
-            </replica>
-            <replica>
-                <host>example01-01-2</host>
-                <port>9000</port>
-            </replica>
-        </shard>
-        <shard>
-            <weight>2</weight>
-            <internal_replication>false</internal_replication>
-            <replica>
-                <host>example01-02-1</host>
-                <port>9000</port>
-            </replica>
-            <replica>
-                <host>example01-02-2</host>
-                <secure>1</secure>
-                <port>9440</port>
-            </replica>
-        </shard>
-    </logs>
-</remote_servers>
-```
-
-Ici un cluster est défini avec le nom ‘logs’ qui se compose de deux fragments, dont chacune contient deux répliques.
-Les partitions se réfèrent aux serveurs qui contiennent différentes parties des données (pour lire toutes les données, vous devez accéder à tous les partitions).
-Les répliques sont des serveurs de duplication (afin de lire toutes les données, vous pouvez accéder aux données sur l'une des répliques).
-
-Les noms de Cluster ne doivent pas contenir de points.
-
-Paramètre `host`, `port` et , éventuellement, `user`, `password`, `secure`, `compression` sont spécifiés pour chaque serveur:
-- `host` – The address of the remote server. You can use either the domain or the IPv4 or IPv6 address. If you specify the domain, the server makes a DNS request when it starts, and the result is stored as long as the server is running. If the DNS request fails, the server doesn't start. If you change the DNS record, restart the server.
-- `port` – The TCP port for messenger activity (‘tcp_port’ dans la configuration, généralement définie sur 9000). Ne le confondez pas avec http_port.
-- `user` – Name of the user for connecting to a remote server. Default value: default. This user must have access to connect to the specified server. Access is configured in the users.xml file. For more information, see the section [Les droits d'accès](../../../operations/access-rights.md).
-- `password` – The password for connecting to a remote server (not masked). Default value: empty string.
-- `secure` - Utilisez ssl pour la connexion, généralement vous devez également définir `port` = 9440. Le serveur doit écouter `<tcp_port_secure>9440</tcp_port_secure>` et avoir des certificats corrects.
-- `compression` - Utiliser la compression de données. Valeur par défaut: true.
-
-When specifying replicas, one of the available replicas will be selected for each of the shards when reading. You can configure the algorithm for load balancing (the preference for which replica to access) – see the [équilibrage](../../../operations/settings/settings.md#settings-load_balancing) paramètre.
-Si la connexion avec le serveur n'est pas établie, il y aura une tentative de connexion avec un court délai. Si la connexion échoue, la réplique suivante sera sélectionnée, et ainsi de suite pour toutes les répliques. Si la tentative de connexion a échoué pour toutes les répliques, la tentative sera répété de la même façon, plusieurs fois.
-Cela fonctionne en faveur de la résilience, mais ne fournit pas de tolérance aux pannes complète: un serveur distant peut accepter la connexion, mais peut ne pas fonctionner ou fonctionner mal.
-
-Vous pouvez spécifier un seul des fragments (dans ce cas, le traitement de la requête doit être appelé distant, plutôt que distribué) ou jusqu'à un nombre quelconque de fragments. Dans chaque fragment, vous pouvez spécifier un nombre de répliques. Vous pouvez spécifier un nombre différent de répliques pour chaque fragment.
-
-Vous pouvez spécifier autant de clusters que vous souhaitez dans la configuration.
-
-Pour afficher vos clusters, utilisez ‘system.clusters’ table.
-
-Le moteur distribué permet de travailler avec un cluster comme un serveur local. Cependant, le cluster est inextensible: vous devez écrire sa configuration dans le fichier de configuration du serveur (encore mieux, pour tous les serveurs du cluster).
-
-The Distributed engine requires writing clusters to the config file. Clusters from the config file are updated on the fly, without restarting the server. If you need to send a query to an unknown set of shards and replicas each time, you don't need to create a Distributed table – use the ‘remote’ fonction de table à la place. Voir la section [Les fonctions de Table](../../../sql-reference/table-functions/index.md).
-
-Il existe deux méthodes pour écrire des données dans un cluster:
-
-Tout d'abord, vous pouvez définir les serveurs d'écrire les données à et effectuer l'écriture directement sur chaque fragment. En d'autres termes, effectuez INSERT dans les tables que la table distribuée “looks at”. C'est la solution la plus flexible car vous pouvez utiliser n'importe quel schéma de sharding, qui pourrait être non trivial en raison des exigences du sujet. C'est également la solution la plus optimale puisque les données peuvent être écrites sur différents fragments de manière complètement indépendante.
-
-Deuxièmement, vous pouvez effectuer INSERT dans une table distribuée. Dans ce cas, la table distribuera les données insérées sur les serveurs eux-mêmes. Pour écrire dans une table distribuée, elle doit avoir un jeu de clés de sharding (le dernier paramètre). De plus, s'il n'y a qu'un seul fragment, l'opération d'écriture fonctionne sans spécifier la clé de sharding, car cela ne signifie rien dans ce cas.
-
-Chaque fragment peut avoir un poids défini dans le fichier de configuration. Par défaut, le poids est égal à un. Les données sont réparties entre les fragments dans la quantité proportionnelle au poids des fragments. Par exemple, si il y a deux tessons et le premier a un poids de 9 tandis que la seconde a un poids de 10, le premier sera envoyé 9 / 19 parties de lignes, et le second sera envoyé 10 / 19.
-
-Chaque fragment peut avoir le ‘internal_replication’ paramètre défini dans le fichier de configuration.
-
-Si ce paramètre est défini à ‘true’, l'opération d'écriture sélectionne le premier saine réplique et écrit les données. Utilisez cette option si le tableau Distribué “looks at” tables répliquées. En d'autres termes, si la table où les données seront écrites va répliquer elle-même.
-
-Si elle est définie sur ‘false’ (par défaut), les données sont écrites dans toutes les répliques. En substance, cela signifie que la table distribuée réplique les données elle-même. C'est pire que d'utiliser des tables répliquées, car la cohérence des répliques n'est pas vérifiée et, au fil du temps, elles contiendront des données légèrement différentes.
-
-Pour sélectionner le fragment auquel une ligne de données est envoyée, l'expression de sharding est analysée et son reste est extrait de la diviser par le poids total des fragments. La ligne est envoyée au fragment qui correspond au demi-intervalle des restes de ‘prev_weight’ de ‘prev_weights + weight’, où ‘prev_weights’ c'est le poids total des tessons avec le plus petit nombre, et ‘weight’ est le poids de cet éclat. Par exemple, s'il y a deux fragments, et que le premier a un poids de 9 tandis que le second a un poids de 10, la ligne sera envoyée au premier fragment pour les restes de la plage \[0, 9), et au second pour les restes de la plage \[9, 19).
-
-L'expression de sharding peut être n'importe quelle expression de constantes et de colonnes de table qui renvoie un entier. Par exemple, vous pouvez utiliser l'expression ‘rand()’ pour la distribution aléatoire des données, ou ‘UserID’ pour la distribution par le reste de la division de L'ID de l'utilisateur (alors les données d'un seul utilisateur résideront sur un seul fragment, ce qui simplifie l'exécution et la jointure par les utilisateurs). Si l'une des colonnes n'est pas assez répartie uniformément, vous pouvez l'envelopper dans une fonction de hachage: intHash64 (UserID).
-
-Un simple rappel de la division est une solution limitée pour le sharding et n'est pas toujours approprié. Cela fonctionne pour des volumes de données moyens et importants (des dizaines de serveurs), mais pas pour des volumes de données très importants (des centaines de serveurs ou plus). Dans ce dernier cas, utilisez le schéma de répartition requis par le domaine, plutôt que d'utiliser des entrées dans des tableaux distribués.
-
-SELECT queries are sent to all the shards and work regardless of how data is distributed across the shards (they can be distributed completely randomly). When you add a new shard, you don't have to transfer the old data to it. You can write new data with a heavier weight – the data will be distributed slightly unevenly, but queries will work correctly and efficiently.
-
-Vous devriez être préoccupé par le système de sharding dans les cas suivants:
-
--   Les requêtes sont utilisées qui nécessitent des données de jointure (IN ou JOIN) par une clé spécifique. Si les données sont partagées par cette clé, vous pouvez utiliser local in ou JOIN au lieu de GLOBAL IN ou global JOIN, ce qui est beaucoup plus efficace.
--   Un grand nombre de serveurs est utilisé (des centaines ou plus) avec un grand nombre de petites requêtes (requêtes de clients individuels - sites Web, annonceurs ou partenaires). Pour que les petites requêtes n'affectent pas l'ensemble du cluster, il est logique de localiser les données d'un seul client sur un seul fragment. Alternativement, comme nous l'avons fait dans Yandex.Metrica, vous pouvez configurer le sharding à deux niveaux: divisez le cluster entier en “layers”, où une couche peut être constituée de plusieurs éclats. Les données d'un seul client sont situées sur une seule couche, mais des fragments peuvent être ajoutés à une couche si nécessaire, et les données sont distribuées aléatoirement à l'intérieur de celles-ci. Des tables distribuées sont créées pour chaque couche et une seule table distribuée partagée est créée pour les requêtes globales.
-
-Les données sont écrites de manière asynchrone. Lorsqu'il est inséré dans la table, le bloc de données est simplement écrit dans le système de fichiers local. Les données sont envoyées aux serveurs distants en arrière-plan dès que possible. La période d'envoi des données est gérée par [distributed_directory_monitor_sleep_time_ms](../../../operations/settings/settings.md#distributed_directory_monitor_sleep_time_ms) et [distributed_directory_monitor_max_sleep_time_ms](../../../operations/settings/settings.md#distributed_directory_monitor_max_sleep_time_ms) paramètre. Le `Distributed` moteur envoie chaque fichier de données insérées séparément, mais vous pouvez activer le lot envoi de fichiers avec l' [distributed_directory_monitor_batch_inserts](../../../operations/settings/settings.md#distributed_directory_monitor_batch_inserts) paramètre. Ce paramètre améliore les performances du cluster en utilisant mieux les ressources réseau et serveur local. Vous devriez vérifier si les données sont envoyées avec succès en vérifiant la liste des fichiers (données en attente d'envoi) dans le répertoire de la table: `/var/lib/clickhouse/data/database/table/`.
-
-Si le serveur a cessé d'exister ou a subi un redémarrage Brutal (par exemple, après une panne de périphérique) après une insertion dans une table distribuée, les données insérées peuvent être perdues. Si une partie de données endommagée est détectée dans le répertoire de la table, elle est transférée ‘broken’ sous-répertoire et n'est plus utilisé.
-
-Lorsque l'option max_parallel_replicas est activée, le traitement des requêtes est parallélisé entre toutes les répliques d'un seul fragment. Pour plus d'informations, consultez la section [max_parallel_replicas](../../../operations/settings/settings.md#settings-max_parallel_replicas).
-
-## Les Colonnes Virtuelles {#virtual-columns}
-
--   `_shard_num` — Contains the `shard_num` (de `system.clusters`). Type: [UInt32](../../../sql-reference/data-types/int-uint.md).
-
-!!! note "Note"
-    Depuis [`remote`](../../../sql-reference/table-functions/remote.md)/`cluster` les fonctions de table créent en interne une instance temporaire du même moteur distribué, `_shard_num` est disponible là-bas aussi.
-
-**Voir Aussi**
-
--   [Les colonnes virtuelles](index.md#table_engines-virtual_columns)
-
-[Article Original](https://clickhouse.tech/docs/en/operations/table_engines/distributed/) <!--hide-->
diff --git a/docs/fr/engines/table-engines/special/external-data.md b/docs/fr/engines/table-engines/special/external-data.md
deleted file mode 100644
index df867a23215..00000000000
--- a/docs/fr/engines/table-engines/special/external-data.md
+++ /dev/null
@@ -1,68 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 34
-toc_title: "De donn\xE9es externes"
----
-
-# Données externes pour le traitement des requêtes {#external-data-for-query-processing}
-
-ClickHouse permet d'Envoyer à un serveur les données nécessaires au traitement d'une requête, ainsi qu'une requête SELECT. Ces données sont placées dans une table temporaire (voir la section “Temporary tables”) et peut être utilisé dans la requête (par exemple, dans les DANS les opérateurs).
-
-Par exemple, si vous disposez d'un fichier texte avec important des identifiants d'utilisateur, vous pouvez le télécharger sur le serveur avec une requête qui utilise la filtration par cette liste.
-
-Si vous devez exécuter plusieurs requêtes avec un volume important de données externes, n'utilisez pas cette fonctionnalité. Il est préférable de télécharger les données sur la base de données à l'avance.
-
-Les données externes peuvent être téléchargées à l'aide du client de ligne de commande (en mode non interactif) ou à l'aide de L'interface HTTP.
-
-Dans le client de ligne de commande, vous pouvez spécifier une section paramètres du format
-
-``` bash
---external --file=... [--name=...] [--format=...] [--types=...|--structure=...]
-```
-
-Vous pouvez avoir plusieurs sections comme ça, pour le nombre de tables étant transmis.
-
-**–external** – Marks the beginning of a clause.
-**–file** – Path to the file with the table dump, or -, which refers to stdin.
-Une seule table peut être récupérée à partir de stdin.
-
-Les paramètres suivants sont facultatifs: **–name**– Name of the table. If omitted, _data is used.
-**–format** – Data format in the file. If omitted, TabSeparated is used.
-
-L'un des paramètres suivants est requis:**–types** – A list of comma-separated column types. For example: `UInt64,String`. The columns will be named _1, _2, …
-**–structure**– The table structure in the format`UserID UInt64`, `URL String`. Définit les noms et les types de colonnes.
-
-Les fichiers spécifiés dans ‘file’ sera analysé par le format spécifié dans ‘format’, en utilisant les types de données spécifié dans ‘types’ ou ‘structure’. La table sera téléchargée sur le serveur et accessible en tant que table temporaire avec le nom dans ‘name’.
-
-Exemple:
-
-``` bash
-$ echo -ne "1\n2\n3\n" | clickhouse-client --query="SELECT count() FROM test.visits WHERE TraficSourceID IN _data" --external --file=- --types=Int8
-849897
-$ cat /etc/passwd | sed 's/:/\t/g' | clickhouse-client --query="SELECT shell, count() AS c FROM passwd GROUP BY shell ORDER BY c DESC" --external --file=- --name=passwd --structure='login String, unused String, uid UInt16, gid UInt16, comment String, home String, shell String'
-/bin/sh 20
-/bin/false      5
-/bin/bash       4
-/usr/sbin/nologin       1
-/bin/sync       1
-```
-
-Lors de l'utilisation de L'interface HTTP, les données externes sont transmises au format multipart/form-data. Chaque tableau est transmis en tant que fichier séparé. Le nom de la table est tiré du nom du fichier. Le ‘query_string’ est passé les paramètres ‘name_format’, ‘name_types’, et ‘name_structure’, où ‘name’ est le nom de la table que ces paramètres correspondent. La signification des paramètres est la même que lors de l'utilisation du client de ligne de commande.
-
-Exemple:
-
-``` bash
-$ cat /etc/passwd | sed 's/:/\t/g' > passwd.tsv
-
-$ curl -F 'passwd=@passwd.tsv;' 'http://localhost:8123/?query=SELECT+shell,+count()+AS+c+FROM+passwd+GROUP+BY+shell+ORDER+BY+c+DESC&passwd_structure=login+String,+unused+String,+uid+UInt16,+gid+UInt16,+comment+String,+home+String,+shell+String'
-/bin/sh 20
-/bin/false      5
-/bin/bash       4
-/usr/sbin/nologin       1
-/bin/sync       1
-```
-
-Pour le traitement des requêtes distribuées, les tables temporaires sont envoyées à tous les serveurs distants.
-
-[Article Original](https://clickhouse.tech/docs/en/operations/table_engines/external_data/) <!--hide-->
diff --git a/docs/fr/engines/table-engines/special/file.md b/docs/fr/engines/table-engines/special/file.md
deleted file mode 100644
index eedc1206527..00000000000
--- a/docs/fr/engines/table-engines/special/file.md
+++ /dev/null
@@ -1,90 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 37
-toc_title: Fichier
----
-
-# Fichier {#table_engines-file}
-
-Le moteur de table de fichiers conserve les données dans un fichier dans l'un des [fichier
-format](../../../interfaces/formats.md#formats) (TabSeparated, Native, etc.).
-
-Exemples d'utilisation:
-
--   Exportation de données de ClickHouse vers un fichier.
--   Convertir des données d'un format à un autre.
--   Mise à jour des données dans ClickHouse via l'édition d'un fichier sur un disque.
-
-## Utilisation dans le serveur ClickHouse {#usage-in-clickhouse-server}
-
-``` sql
-File(Format)
-```
-
-Le `Format` paramètre spécifie l'un des formats de fichier disponibles. Effectuer
-`SELECT` requêtes, le format doit être pris en charge pour l'entrée, et à effectuer
-`INSERT` queries – for output. The available formats are listed in the
-[Format](../../../interfaces/formats.md#formats) section.
-
-ClickHouse ne permet pas de spécifier le chemin du système de fichiers pour`File`. Il utilisera le dossier défini par [chemin](../../../operations/server-configuration-parameters/settings.md) réglage dans la configuration du serveur.
-
-Lors de la création de la table en utilisant `File(Format)` il crée sous-répertoire vide dans ce dossier. Lorsque les données sont écrites dans cette table, elles sont mises dans `data.Format` fichier dans ce répertoire.
-
-Vous pouvez créer manuellement ce sous dossier et ce fichier dans le système de fichiers [ATTACH](../../../sql-reference/statements/misc.md) il à la table des informations avec le nom correspondant, de sorte que vous pouvez interroger les données de ce fichier.
-
-!!! warning "Avertissement"
-    Soyez prudent avec cette fonctionnalité, car ClickHouse ne garde pas trace des modifications externes apportées à ces fichiers. Le résultat des Écritures simultanées via ClickHouse et en dehors de ClickHouse n'est pas défini.
-
-**Exemple:**
-
-**1.** Configurer le `file_engine_table` table:
-
-``` sql
-CREATE TABLE file_engine_table (name String, value UInt32) ENGINE=File(TabSeparated)
-```
-
-Par défaut ClickHouse va créer un dossier `/var/lib/clickhouse/data/default/file_engine_table`.
-
-**2.** Créer manuellement `/var/lib/clickhouse/data/default/file_engine_table/data.TabSeparated` contenant:
-
-``` bash
-$ cat data.TabSeparated
-one 1
-two 2
-```
-
-**3.** Interroger les données:
-
-``` sql
-SELECT * FROM file_engine_table
-```
-
-``` text
-┌─name─┬─value─┐
-│ one  │     1 │
-│ two  │     2 │
-└──────┴───────┘
-```
-
-## Utilisation dans ClickHouse-local {#usage-in-clickhouse-local}
-
-Dans [clickhouse-local](../../../operations/utilities/clickhouse-local.md) Fichier moteur accepte chemin d'accès au fichier en plus `Format`. Les flux d'entrée / sortie par défaut peuvent être spécifiés en utilisant des noms numériques ou lisibles par l'homme comme `0` ou `stdin`, `1` ou `stdout`.
-**Exemple:**
-
-``` bash
-$ echo -e "1,2\n3,4" | clickhouse-local -q "CREATE TABLE table (a Int64, b Int64) ENGINE = File(CSV, stdin); SELECT a, b FROM table; DROP TABLE table"
-```
-
-## Les détails de mise en Œuvre {#details-of-implementation}
-
--   Plusieurs `SELECT` les requêtes peuvent être effectuées simultanément, mais `INSERT` requêtes s'attendre les uns les autres.
--   Prise en charge de la création d'un nouveau fichier par `INSERT` requête.
--   Si le fichier existe, `INSERT` ajouterait de nouvelles valeurs dedans.
--   Pas pris en charge:
-    -   `ALTER`
-    -   `SELECT ... SAMPLE`
-    -   Index
-    -   Réplication
-
-[Article Original](https://clickhouse.tech/docs/en/operations/table_engines/file/) <!--hide-->
diff --git a/docs/fr/engines/table-engines/special/generate.md b/docs/fr/engines/table-engines/special/generate.md
deleted file mode 100644
index 9b2aa57c3e5..00000000000
--- a/docs/fr/engines/table-engines/special/generate.md
+++ /dev/null
@@ -1,61 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 46
-toc_title: GenerateRandom
----
-
-# Generaterandom {#table_engines-generate}
-
-Le moteur de table GenerateRandom produit des données aléatoires pour un schéma de table donné.
-
-Exemples d'utilisation:
-
--   Utiliser dans le test pour remplir une grande table reproductible.
--   Générer une entrée aléatoire pour les tests de fuzzing.
-
-## Utilisation dans le serveur ClickHouse {#usage-in-clickhouse-server}
-
-``` sql
-ENGINE = GenerateRandom(random_seed, max_string_length, max_array_length)
-```
-
-Le `max_array_length` et `max_string_length` les paramètres spécifient la longueur maximale de tous
-colonnes et chaînes de tableau en conséquence dans les données générées.
-
-Générer le moteur de table prend en charge uniquement `SELECT` requête.
-
-Il prend en charge tous les [Les types de données](../../../sql-reference/data-types/index.md) cela peut être stocké dans une table sauf `LowCardinality` et `AggregateFunction`.
-
-**Exemple:**
-
-**1.** Configurer le `generate_engine_table` table:
-
-``` sql
-CREATE TABLE generate_engine_table (name String, value UInt32) ENGINE = GenerateRandom(1, 5, 3)
-```
-
-**2.** Interroger les données:
-
-``` sql
-SELECT * FROM generate_engine_table LIMIT 3
-```
-
-``` text
-┌─name─┬──────value─┐
-│ c4xJ │ 1412771199 │
-│ r    │ 1791099446 │
-│ 7#$  │  124312908 │
-└──────┴────────────┘
-```
-
-## Les détails de mise en Œuvre {#details-of-implementation}
-
--   Pas pris en charge:
-    -   `ALTER`
-    -   `SELECT ... SAMPLE`
-    -   `INSERT`
-    -   Index
-    -   Réplication
-
-[Article Original](https://clickhouse.tech/docs/en/operations/table_engines/generate/) <!--hide-->
diff --git a/docs/fr/engines/table-engines/special/index.md b/docs/fr/engines/table-engines/special/index.md
deleted file mode 100644
index 424a80c511d..00000000000
--- a/docs/fr/engines/table-engines/special/index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: "Sp\xE9cial"
-toc_priority: 31
----
-
-
diff --git a/docs/fr/engines/table-engines/special/join.md b/docs/fr/engines/table-engines/special/join.md
deleted file mode 100644
index bc10be5b9bb..00000000000
--- a/docs/fr/engines/table-engines/special/join.md
+++ /dev/null
@@ -1,111 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 40
-toc_title: Rejoindre
----
-
-# Rejoindre {#join}
-
-Structure de données préparée pour l'utilisation dans [JOIN](../../../sql-reference/statements/select/join.md#select-join) opérations.
-
-## Création d'une Table {#creating-a-table}
-
-``` sql
-CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
-(
-    name1 [type1] [DEFAULT|MATERIALIZED|ALIAS expr1] [TTL expr1],
-    name2 [type2] [DEFAULT|MATERIALIZED|ALIAS expr2] [TTL expr2],
-) ENGINE = Join(join_strictness, join_type, k1[, k2, ...])
-```
-
-Voir la description détaillée de la [CREATE TABLE](../../../sql-reference/statements/create.md#create-table-query) requête.
-
-**Les Paramètres Du Moteur**
-
--   `join_strictness` – [ADHÉRER à la rigueur](../../../sql-reference/statements/select/join.md#select-join-types).
--   `join_type` – [Type de jointure](../../../sql-reference/statements/select/join.md#select-join-types).
--   `k1[, k2, ...]` – Key columns from the `USING` la clause que l' `JOIN` l'opération est faite avec de la.
-
-Entrer `join_strictness` et `join_type` paramètres sans guillemets, par exemple, `Join(ANY, LEFT, col1)`. Ils doivent correspondre à la `JOIN` fonctionnement que le tableau sera utilisé pour. Si les paramètres ne correspondent pas, ClickHouse ne lance pas d'exception et peut renvoyer des données incorrectes.
-
-## Utilisation Du Tableau {#table-usage}
-
-### Exemple {#example}
-
-Création de la table de gauche:
-
-``` sql
-CREATE TABLE id_val(`id` UInt32, `val` UInt32) ENGINE = TinyLog
-```
-
-``` sql
-INSERT INTO id_val VALUES (1,11)(2,12)(3,13)
-```
-
-Création du côté droit `Join` table:
-
-``` sql
-CREATE TABLE id_val_join(`id` UInt32, `val` UInt8) ENGINE = Join(ANY, LEFT, id)
-```
-
-``` sql
-INSERT INTO id_val_join VALUES (1,21)(1,22)(3,23)
-```
-
-Rejoindre les tables:
-
-``` sql
-SELECT * FROM id_val ANY LEFT JOIN id_val_join USING (id) SETTINGS join_use_nulls = 1
-```
-
-``` text
-┌─id─┬─val─┬─id_val_join.val─┐
-│  1 │  11 │              21 │
-│  2 │  12 │            ᴺᵁᴸᴸ │
-│  3 │  13 │              23 │
-└────┴─────┴─────────────────┘
-```
-
-Comme alternative, vous pouvez récupérer des données de la `Join` table, spécifiant la valeur de la clé de jointure:
-
-``` sql
-SELECT joinGet('id_val_join', 'val', toUInt32(1))
-```
-
-``` text
-┌─joinGet('id_val_join', 'val', toUInt32(1))─┐
-│                                         21 │
-└────────────────────────────────────────────┘
-```
-
-### Sélection et insertion de données {#selecting-and-inserting-data}
-
-Vous pouvez utiliser `INSERT` requêtes pour ajouter des données au `Join`-tables de moteur. Si la table a été créée avec `ANY` rigueur, les données pour les clés en double sont ignorées. Avec l' `ALL` rigueur, toutes les lignes sont ajoutées.
-
-Vous ne pouvez pas effectuer un `SELECT` requête directement à partir de la table. Au lieu de cela, utilisez l'une des méthodes suivantes:
-
--   Placez la table sur le côté droit dans un `JOIN` clause.
--   Appelez le [joinGet](../../../sql-reference/functions/other-functions.md#joinget) fonction, qui vous permet d'extraire des données de la table de la même manière que d'un dictionnaire.
-
-### Limitations et paramètres {#join-limitations-and-settings}
-
-Lors de la création d'un tableau, les paramètres suivants sont appliqués:
-
--   [join_use_nulls](../../../operations/settings/settings.md#join_use_nulls)
--   [max_rows_in_join](../../../operations/settings/query-complexity.md#settings-max_rows_in_join)
--   [max_bytes_in_join](../../../operations/settings/query-complexity.md#settings-max_bytes_in_join)
--   [join_overflow_mode](../../../operations/settings/query-complexity.md#settings-join_overflow_mode)
--   [join_any_take_last_row](../../../operations/settings/settings.md#settings-join_any_take_last_row)
-
-Le `Join`- les tables de moteur ne peuvent pas être utilisées dans `GLOBAL JOIN` opérations.
-
-Le `Join`-moteur permet d'utiliser [join_use_nulls](../../../operations/settings/settings.md#join_use_nulls) réglage de la `CREATE TABLE` déclaration. Et [SELECT](../../../sql-reference/statements/select/index.md) requête permet d'utiliser `join_use_nulls` trop. Si vous avez différents `join_use_nulls` paramètres, vous pouvez obtenir une table de jointure d'erreur. Il dépend de type de JOINTURE. Lorsque vous utilisez [joinGet](../../../sql-reference/functions/other-functions.md#joinget) fonction, vous devez utiliser le même `join_use_nulls` réglage en `CRATE TABLE` et `SELECT` déclaration.
-
-## Le Stockage De Données {#data-storage}
-
-`Join` les données de la table sont toujours situées dans la RAM. Lors de l'insertion de lignes dans une table, ClickHouse écrit des blocs de données dans le répertoire du disque afin qu'ils puissent être restaurés lorsque le serveur redémarre.
-
-Si le serveur redémarre incorrectement, le bloc de données sur le disque peut être perdu ou endommagé. Dans ce cas, vous devrez peut-être supprimer manuellement le fichier contenant des données endommagées.
-
-[Article Original](https://clickhouse.tech/docs/en/operations/table_engines/join/) <!--hide-->
diff --git a/docs/fr/engines/table-engines/special/materializedview.md b/docs/fr/engines/table-engines/special/materializedview.md
deleted file mode 100644
index 700a95b4d65..00000000000
--- a/docs/fr/engines/table-engines/special/materializedview.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 43
-toc_title: MaterializedView
----
-
-# Materializedview {#materializedview}
-
-Utilisé pour implémenter des vues matérialisées (pour plus d'informations, voir [CREATE TABLE](../../../sql-reference/statements/create.md#create-table-query)). Pour stocker des données, il utilise un moteur différent qui a été spécifié lors de la création de la vue. Lors de la lecture d'une table, il utilise juste ce moteur.
-
-[Article Original](https://clickhouse.tech/docs/en/operations/table_engines/materializedview/) <!--hide-->
diff --git a/docs/fr/engines/table-engines/special/memory.md b/docs/fr/engines/table-engines/special/memory.md
deleted file mode 100644
index 94e619eae07..00000000000
--- a/docs/fr/engines/table-engines/special/memory.md
+++ /dev/null
@@ -1,19 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 44
-toc_title: "M\xE9moire"
----
-
-# Mémoire {#memory}
-
-Le moteur de mémoire stocke les données en RAM, sous forme non compressée. Les données sont stockées exactement sous la même forme qu'elles sont reçues lors de la lecture. En d'autres termes, la lecture de ce tableau est entièrement gratuit.
-L'accès aux données simultanées est synchronisé. Les verrous sont courts: les opérations de lecture et d'écriture ne se bloquent pas.
-Les index ne sont pas pris en charge. La lecture est parallélisée.
-La productivité maximale (plus de 10 Go / s) est atteinte sur les requêtes simples, car il n'y a pas de lecture à partir du disque, de décompression ou de désérialisation des données. (Il convient de noter que dans de nombreux cas, la productivité du moteur MergeTree est presque aussi élevée.)
-Lors du redémarrage d'un serveur, les données disparaissent de la table et la table devient vide.
-Normalement, l'utilisation de ce moteur de table n'est pas justifiée. Cependant, il peut être utilisé pour des tests, et pour des tâches où la vitesse maximale est requise sur un nombre relativement faible de lignes (jusqu'à environ 100 000 000).
-
-Le moteur de mémoire est utilisé par le système pour les tables temporaires avec des données de requête externes (voir la section “External data for processing a query”), et pour la mise en œuvre globale dans (voir la section “IN operators”).
-
-[Article Original](https://clickhouse.tech/docs/en/operations/table_engines/memory/) <!--hide-->
diff --git a/docs/fr/engines/table-engines/special/merge.md b/docs/fr/engines/table-engines/special/merge.md
deleted file mode 100644
index 6b41e490113..00000000000
--- a/docs/fr/engines/table-engines/special/merge.md
+++ /dev/null
@@ -1,70 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 36
-toc_title: Fusionner
----
-
-# Fusionner {#merge}
-
-Le `Merge` moteur (à ne pas confondre avec `MergeTree`) ne stocke pas les données elles-mêmes, mais permet la lecture de n'importe quel nombre d'autres tables simultanément.
-La lecture est automatiquement parallélisée. L'écriture dans une table n'est pas prise en charge. Lors de la lecture, les index des tables en cours de lecture sont utilisés, s'ils existent.
-Le `Merge` engine accepte les paramètres: le nom de la base de données et une expression régulière pour les tables.
-
-Exemple:
-
-``` sql
-Merge(hits, '^WatchLog')
-```
-
-Les données seront lues à partir des tableaux du `hits` base de données dont les noms correspondent à l'expression régulière ‘`^WatchLog`’.
-
-Au lieu du nom de la base de données, vous pouvez utiliser une expression constante qui renvoie une chaîne. Exemple, `currentDatabase()`.
-
-Regular expressions — [re2](https://github.com/google/re2) (prend en charge un sous-ensemble de PCRE), sensible à la casse.
-Voir les notes sur les symboles d'échappement dans les expressions régulières “match” section.
-
-Lors de la sélection des tables à lire, le `Merge` le tableau lui-même ne sera pas choisie, même si elle correspond à l'expression rationnelle. C'est pour éviter les boucles.
-Il est possible de créer deux `Merge` des tables qui essaieront sans cesse de lire les données des autres, mais ce n'est pas une bonne idée.
-
-L'utilisation traditionnelle de la `Merge` moteur pour travailler avec un grand nombre de `TinyLog` les tables comme si avec une seule table.
-
-Exemple 2:
-
-Disons que vous avez une ancienne table (WatchLog_old) et que vous avez décidé de changer de partitionnement sans déplacer les données vers une nouvelle table (WatchLog_new) et que vous devez voir les données des deux tables.
-
-``` sql
-CREATE TABLE WatchLog_old(date Date, UserId Int64, EventType String, Cnt UInt64)
-ENGINE=MergeTree(date, (UserId, EventType), 8192);
-INSERT INTO WatchLog_old VALUES ('2018-01-01', 1, 'hit', 3);
-
-CREATE TABLE WatchLog_new(date Date, UserId Int64, EventType String, Cnt UInt64)
-ENGINE=MergeTree PARTITION BY date ORDER BY (UserId, EventType) SETTINGS index_granularity=8192;
-INSERT INTO WatchLog_new VALUES ('2018-01-02', 2, 'hit', 3);
-
-CREATE TABLE WatchLog as WatchLog_old ENGINE=Merge(currentDatabase(), '^WatchLog');
-
-SELECT *
-FROM WatchLog
-```
-
-``` text
-┌───────date─┬─UserId─┬─EventType─┬─Cnt─┐
-│ 2018-01-01 │      1 │ hit       │   3 │
-└────────────┴────────┴───────────┴─────┘
-┌───────date─┬─UserId─┬─EventType─┬─Cnt─┐
-│ 2018-01-02 │      2 │ hit       │   3 │
-└────────────┴────────┴───────────┴─────┘
-```
-
-## Les Colonnes Virtuelles {#virtual-columns}
-
--   `_table` — Contains the name of the table from which data was read. Type: [Chaîne](../../../sql-reference/data-types/string.md).
-
-    Vous pouvez définir les conditions constantes sur `_table` dans le `WHERE/PREWHERE` clause (par exemple, `WHERE _table='xyz'`). Dans ce cas l'opération de lecture est effectuée uniquement pour les tables où la condition sur `_table` est satisfaite, pour le `_table` colonne agit comme un index.
-
-**Voir Aussi**
-
--   [Les colonnes virtuelles](index.md#table_engines-virtual_columns)
-
-[Article Original](https://clickhouse.tech/docs/en/operations/table_engines/merge/) <!--hide-->
diff --git a/docs/fr/engines/table-engines/special/null.md b/docs/fr/engines/table-engines/special/null.md
deleted file mode 100644
index 5215fc753be..00000000000
--- a/docs/fr/engines/table-engines/special/null.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 38
-toc_title: 'NULL'
----
-
-# NULL {#null}
-
-Lors de l'écriture dans une table Null, Les données sont ignorées. Lors de la lecture à partir d'une table Null, la réponse est vide.
-
-Toutefois, vous pouvez créer une vue matérialisée sur une table Nuls. Ainsi, les données écrites dans la table finira dans la vue.
-
-[Article Original](https://clickhouse.tech/docs/en/operations/table_engines/null/) <!--hide-->
diff --git a/docs/fr/engines/table-engines/special/set.md b/docs/fr/engines/table-engines/special/set.md
deleted file mode 100644
index 32bfde63698..00000000000
--- a/docs/fr/engines/table-engines/special/set.md
+++ /dev/null
@@ -1,19 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 39
-toc_title: "D\xE9finir"
----
-
-# Définir {#set}
-
-Un ensemble de données qui est toujours en RAM. Il est conçu pour être utilisé sur le côté droit de l'opérateur (voir la section “IN operators”).
-
-Vous pouvez utiliser INSERT pour insérer des données dans la table. De nouveaux éléments seront ajoutés à l'ensemble de données, tandis que les doublons seront ignorés.
-Mais vous ne pouvez pas effectuer SELECT à partir de la table. La seule façon de récupérer des données est en l'utilisant dans la moitié droite de l'opérateur.
-
-Les données sont toujours situées dans la RAM. Pour INSERT, les blocs de données insérées sont également écrits dans le répertoire des tables sur le disque. Lors du démarrage du serveur, ces données sont chargées dans la RAM. En d'autres termes, après le redémarrage, les données restent en place.
-
-Pour un redémarrage brutal du serveur, le bloc de données sur le disque peut être perdu ou endommagé. Dans ce dernier cas, vous devrez peut-être supprimer manuellement le fichier contenant des données endommagées.
-
-[Article Original](https://clickhouse.tech/docs/en/operations/table_engines/set/) <!--hide-->
diff --git a/docs/fr/engines/table-engines/special/url.md b/docs/fr/engines/table-engines/special/url.md
deleted file mode 100644
index 7b8e53b1d73..00000000000
--- a/docs/fr/engines/table-engines/special/url.md
+++ /dev/null
@@ -1,82 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 41
-toc_title: URL
----
-
-# URL (URL, Format) {#table_engines-url}
-
-Gère les données sur un serveur HTTP / HTTPS distant. Ce moteur est similaire
-à l' [Fichier](file.md) moteur.
-
-## Utilisation du moteur dans le serveur ClickHouse {#using-the-engine-in-the-clickhouse-server}
-
-Le `format` doit être celui que ClickHouse peut utiliser dans
-`SELECT` les requêtes et, si nécessaire, en `INSERTs`. Pour la liste complète des formats pris en charge, voir
-[Format](../../../interfaces/formats.md#formats).
-
-Le `URL` doit être conforme à la structure D'un Localisateur de ressources uniforme. L'URL spécifiée doit pointer vers un serveur
-qui utilise le protocole HTTP ou HTTPS. Cela ne nécessite pas de
-en-têtes supplémentaires pour obtenir une réponse du serveur.
-
-`INSERT` et `SELECT` les requêtes sont transformées en `POST` et `GET` demande,
-respectivement. Pour le traitement `POST` demandes, le serveur distant doit prendre en charge
-[Encodage de transfert en morceaux](https://en.wikipedia.org/wiki/Chunked_transfer_encoding).
-
-Vous pouvez limiter le nombre maximal de sauts de redirection HTTP GET en utilisant [max_http_get_redirects](../../../operations/settings/settings.md#setting-max_http_get_redirects) paramètre.
-
-**Exemple:**
-
-**1.** Créer un `url_engine_table` table sur le serveur :
-
-``` sql
-CREATE TABLE url_engine_table (word String, value UInt64)
-ENGINE=URL('http://127.0.0.1:12345/', CSV)
-```
-
-**2.** Créez un serveur HTTP de base à l'aide des outils Python 3 standard et
-démarrer:
-
-``` python3
-from http.server import BaseHTTPRequestHandler, HTTPServer
-
-class CSVHTTPServer(BaseHTTPRequestHandler):
-    def do_GET(self):
-        self.send_response(200)
-        self.send_header('Content-type', 'text/csv')
-        self.end_headers()
-
-        self.wfile.write(bytes('Hello,1\nWorld,2\n', "utf-8"))
-
-if __name__ == "__main__":
-    server_address = ('127.0.0.1', 12345)
-    HTTPServer(server_address, CSVHTTPServer).serve_forever()
-```
-
-``` bash
-$ python3 server.py
-```
-
-**3.** Les données de la demande:
-
-``` sql
-SELECT * FROM url_engine_table
-```
-
-``` text
-┌─word──┬─value─┐
-│ Hello │     1 │
-│ World │     2 │
-└───────┴───────┘
-```
-
-## Les détails de mise en Œuvre {#details-of-implementation}
-
--   Les lectures et les écritures peuvent être parallèles
--   Pas pris en charge:
-    -   `ALTER` et `SELECT...SAMPLE` opérations.
-    -   Index.
-    -   Réplication.
-
-[Article Original](https://clickhouse.tech/docs/en/operations/table_engines/url/) <!--hide-->
diff --git a/docs/fr/engines/table-engines/special/view.md b/docs/fr/engines/table-engines/special/view.md
deleted file mode 100644
index aaeb6ce90cb..00000000000
--- a/docs/fr/engines/table-engines/special/view.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 42
-toc_title: Vue
----
-
-# Vue {#table_engines-view}
-
-Utilisé pour implémenter des vues (pour plus d'informations, voir `CREATE VIEW query`). Il ne stocke pas de données, mais stocke uniquement les `SELECT` requête. Lors de la lecture d'une table, il exécute cette requête (et supprime toutes les colonnes inutiles de la requête).
-
-[Article Original](https://clickhouse.tech/docs/en/operations/table_engines/view/) <!--hide-->
diff --git a/docs/fr/faq/general.md b/docs/fr/faq/general.md
deleted file mode 100644
index 797709fdb20..00000000000
--- a/docs/fr/faq/general.md
+++ /dev/null
@@ -1,60 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 78
-toc_title: "Questions G\xE9n\xE9rales"
----
-
-# Questions Générales {#general-questions}
-
-## Pourquoi Ne Pas Utiliser Quelque Chose Comme MapReduce? {#why-not-use-something-like-mapreduce}
-
-Nous pouvons nous référer à des systèmes comme MapReduce en tant que systèmes informatiques distribués dans lesquels l'opération de réduction est basée sur le tri distribué. La solution open-source la plus courante dans cette classe est [Apache Hadoop](http://hadoop.apache.org). Yandex utilise sa solution interne, YT.
-
-Ces systèmes ne sont pas appropriés pour les requêtes en ligne en raison de leur latence élevée. En d'autres termes, ils ne peuvent pas être utilisés comme back-end pour une interface web. Ces types de systèmes ne sont pas utiles pour les mises à jour de données en temps réel. Le tri distribué n'est pas la meilleure façon d'effectuer des opérations de réduction si le résultat de l'opération et tous les résultats intermédiaires (s'il y en a) sont situés dans la RAM d'un seul serveur, ce qui est généralement le cas pour les requêtes en ligne. Dans un tel cas, une table de hachage est un moyen optimal d'effectuer des opérations de réduction. Une approche courante pour optimiser les tâches map-reduce est la pré-agrégation (réduction partielle) à l'aide d'une table de hachage en RAM. L'utilisateur effectue cette optimisation manuellement. Le tri distribué est l'une des principales causes de réduction des performances lors de l'exécution de tâches simples de réduction de la carte.
-
-La plupart des implémentations MapReduce vous permettent d'exécuter du code arbitraire sur un cluster. Mais un langage de requête déclaratif est mieux adapté à OLAP pour exécuter des expériences rapidement. Par exemple, Hadoop a ruche et Cochon. Considérez également Cloudera Impala ou Shark (obsolète) pour Spark, ainsi que Spark SQL, Presto et Apache Drill. Les performances lors de l'exécution de telles tâches sont très sous-optimales par rapport aux systèmes spécialisés, mais une latence relativement élevée rend irréaliste l'utilisation de ces systèmes comme backend pour une interface web.
-
-## Que Faire si j'ai un problème avec les encodages lors de l'utilisation D'Oracle via ODBC? {#oracle-odbc-encodings}
-
-Si vous utilisez Oracle via le pilote ODBC comme source de dictionnaires externes, vous devez définir la valeur correcte pour `NLS_LANG` variable d'environnement dans `/etc/default/clickhouse`. Pour plus d'informations, voir le [FAQ Oracle NLS_LANG](https://www.oracle.com/technetwork/products/globalization/nls-lang-099431.html).
-
-**Exemple**
-
-``` sql
-NLS_LANG=RUSSIAN_RUSSIA.UTF8
-```
-
-## Comment exporter des données de ClickHouse vers un fichier? {#how-to-export-to-file}
-
-### Utilisation de la Clause INTO OUTFILE {#using-into-outfile-clause}
-
-Ajouter un [INTO OUTFILE](../sql-reference/statements/select/into-outfile.md#into-outfile-clause) clause à votre requête.
-
-Exemple:
-
-``` sql
-SELECT * FROM table INTO OUTFILE 'file'
-```
-
-Par défaut, ClickHouse utilise [TabSeparated](../interfaces/formats.md#tabseparated) format pour les données de sortie. Pour sélectionner le [format de données](../interfaces/formats.md), utiliser le [FORMAT de la clause](../sql-reference/statements/select/format.md#format-clause).
-
-Exemple:
-
-``` sql
-SELECT * FROM table INTO OUTFILE 'file' FORMAT CSV
-```
-
-### Utilisation d'une Table de moteur de fichiers {#using-a-file-engine-table}
-
-Voir [Fichier](../engines/table-engines/special/file.md).
-
-### Utilisation De La Redirection En Ligne De Commande {#using-command-line-redirection}
-
-``` sql
-$ clickhouse-client --query "SELECT * from table" --format FormatName > result.txt
-```
-
-Voir [clickhouse-client](../interfaces/cli.md).
-
-{## [Article Original](https://clickhouse.tech/docs/en/faq/general/) ##}
diff --git a/docs/fr/faq/index.md b/docs/fr/faq/index.md
deleted file mode 100644
index a44dbb31e89..00000000000
--- a/docs/fr/faq/index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: F.A.Q.
-toc_priority: 76
----
-
-
diff --git a/docs/fr/getting-started/example-datasets/amplab-benchmark.md b/docs/fr/getting-started/example-datasets/amplab-benchmark.md
deleted file mode 100644
index 4a51defe7fe..00000000000
--- a/docs/fr/getting-started/example-datasets/amplab-benchmark.md
+++ /dev/null
@@ -1,129 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 17
-toc_title: AMPLab Big Data Benchmark
----
-
-# AMPLab Big Data Benchmark {#amplab-big-data-benchmark}
-
-Tu vois https://amplab.cs.berkeley.edu/benchmark/
-
-Inscrivez-vous pour un compte GRATUIT à https://aws.amazon.com. il nécessite une carte de crédit, e-mail et numéro de téléphone. Obtenir une nouvelle clé d'accès à https://console.aws.amazon.com/iam/home?nc2=h_m_sc#security_credential
-
-Exécutez ce qui suit dans la console:
-
-``` bash
-$ sudo apt-get install s3cmd
-$ mkdir tiny; cd tiny;
-$ s3cmd sync s3://big-data-benchmark/pavlo/text-deflate/tiny/ .
-$ cd ..
-$ mkdir 1node; cd 1node;
-$ s3cmd sync s3://big-data-benchmark/pavlo/text-deflate/1node/ .
-$ cd ..
-$ mkdir 5nodes; cd 5nodes;
-$ s3cmd sync s3://big-data-benchmark/pavlo/text-deflate/5nodes/ .
-$ cd ..
-```
-
-Exécutez les requêtes ClickHouse suivantes:
-
-``` sql
-CREATE TABLE rankings_tiny
-(
-    pageURL String,
-    pageRank UInt32,
-    avgDuration UInt32
-) ENGINE = Log;
-
-CREATE TABLE uservisits_tiny
-(
-    sourceIP String,
-    destinationURL String,
-    visitDate Date,
-    adRevenue Float32,
-    UserAgent String,
-    cCode FixedString(3),
-    lCode FixedString(6),
-    searchWord String,
-    duration UInt32
-) ENGINE = MergeTree(visitDate, visitDate, 8192);
-
-CREATE TABLE rankings_1node
-(
-    pageURL String,
-    pageRank UInt32,
-    avgDuration UInt32
-) ENGINE = Log;
-
-CREATE TABLE uservisits_1node
-(
-    sourceIP String,
-    destinationURL String,
-    visitDate Date,
-    adRevenue Float32,
-    UserAgent String,
-    cCode FixedString(3),
-    lCode FixedString(6),
-    searchWord String,
-    duration UInt32
-) ENGINE = MergeTree(visitDate, visitDate, 8192);
-
-CREATE TABLE rankings_5nodes_on_single
-(
-    pageURL String,
-    pageRank UInt32,
-    avgDuration UInt32
-) ENGINE = Log;
-
-CREATE TABLE uservisits_5nodes_on_single
-(
-    sourceIP String,
-    destinationURL String,
-    visitDate Date,
-    adRevenue Float32,
-    UserAgent String,
-    cCode FixedString(3),
-    lCode FixedString(6),
-    searchWord String,
-    duration UInt32
-) ENGINE = MergeTree(visitDate, visitDate, 8192);
-```
-
-Retournez à la console:
-
-``` bash
-$ for i in tiny/rankings/*.deflate; do echo $i; zlib-flate -uncompress < $i | clickhouse-client --host=example-perftest01j --query="INSERT INTO rankings_tiny FORMAT CSV"; done
-$ for i in tiny/uservisits/*.deflate; do echo $i; zlib-flate -uncompress < $i | clickhouse-client --host=example-perftest01j --query="INSERT INTO uservisits_tiny FORMAT CSV"; done
-$ for i in 1node/rankings/*.deflate; do echo $i; zlib-flate -uncompress < $i | clickhouse-client --host=example-perftest01j --query="INSERT INTO rankings_1node FORMAT CSV"; done
-$ for i in 1node/uservisits/*.deflate; do echo $i; zlib-flate -uncompress < $i | clickhouse-client --host=example-perftest01j --query="INSERT INTO uservisits_1node FORMAT CSV"; done
-$ for i in 5nodes/rankings/*.deflate; do echo $i; zlib-flate -uncompress < $i | clickhouse-client --host=example-perftest01j --query="INSERT INTO rankings_5nodes_on_single FORMAT CSV"; done
-$ for i in 5nodes/uservisits/*.deflate; do echo $i; zlib-flate -uncompress < $i | clickhouse-client --host=example-perftest01j --query="INSERT INTO uservisits_5nodes_on_single FORMAT CSV"; done
-```
-
-Requêtes pour obtenir des échantillons de données:
-
-``` sql
-SELECT pageURL, pageRank FROM rankings_1node WHERE pageRank > 1000
-
-SELECT substring(sourceIP, 1, 8), sum(adRevenue) FROM uservisits_1node GROUP BY substring(sourceIP, 1, 8)
-
-SELECT
-    sourceIP,
-    sum(adRevenue) AS totalRevenue,
-    avg(pageRank) AS pageRank
-FROM rankings_1node ALL INNER JOIN
-(
-    SELECT
-        sourceIP,
-        destinationURL AS pageURL,
-        adRevenue
-    FROM uservisits_1node
-    WHERE (visitDate > '1980-01-01') AND (visitDate < '1980-04-01')
-) USING pageURL
-GROUP BY sourceIP
-ORDER BY totalRevenue DESC
-LIMIT 1
-```
-
-[Article Original](https://clickhouse.tech/docs/en/getting_started/example_datasets/amplab_benchmark/) <!--hide-->
diff --git a/docs/fr/getting-started/example-datasets/criteo.md b/docs/fr/getting-started/example-datasets/criteo.md
deleted file mode 100644
index 8b52390cdcf..00000000000
--- a/docs/fr/getting-started/example-datasets/criteo.md
+++ /dev/null
@@ -1,81 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 19
-toc_title: "T\xE9raoctet click Logs de Criteo"
----
-
-# Téraoctet de journaux de clics de Criteo {#terabyte-of-click-logs-from-criteo}
-
-Télécharger les données à partir de http://labs.criteo.com/downloads/download-terabyte-click-logs/
-
-Créer une table pour importer le journal:
-
-``` sql
-CREATE TABLE criteo_log (date Date, clicked UInt8, int1 Int32, int2 Int32, int3 Int32, int4 Int32, int5 Int32, int6 Int32, int7 Int32, int8 Int32, int9 Int32, int10 Int32, int11 Int32, int12 Int32, int13 Int32, cat1 String, cat2 String, cat3 String, cat4 String, cat5 String, cat6 String, cat7 String, cat8 String, cat9 String, cat10 String, cat11 String, cat12 String, cat13 String, cat14 String, cat15 String, cat16 String, cat17 String, cat18 String, cat19 String, cat20 String, cat21 String, cat22 String, cat23 String, cat24 String, cat25 String, cat26 String) ENGINE = Log
-```
-
-Télécharger les données:
-
-``` bash
-$ for i in {00..23}; do echo $i; zcat datasets/criteo/day_${i#0}.gz | sed -r 's/^/2000-01-'${i/00/24}'\t/' | clickhouse-client --host=example-perftest01j --query="INSERT INTO criteo_log FORMAT TabSeparated"; done
-```
-
-Créer une table pour les données converties:
-
-``` sql
-CREATE TABLE criteo
-(
-    date Date,
-    clicked UInt8,
-    int1 Int32,
-    int2 Int32,
-    int3 Int32,
-    int4 Int32,
-    int5 Int32,
-    int6 Int32,
-    int7 Int32,
-    int8 Int32,
-    int9 Int32,
-    int10 Int32,
-    int11 Int32,
-    int12 Int32,
-    int13 Int32,
-    icat1 UInt32,
-    icat2 UInt32,
-    icat3 UInt32,
-    icat4 UInt32,
-    icat5 UInt32,
-    icat6 UInt32,
-    icat7 UInt32,
-    icat8 UInt32,
-    icat9 UInt32,
-    icat10 UInt32,
-    icat11 UInt32,
-    icat12 UInt32,
-    icat13 UInt32,
-    icat14 UInt32,
-    icat15 UInt32,
-    icat16 UInt32,
-    icat17 UInt32,
-    icat18 UInt32,
-    icat19 UInt32,
-    icat20 UInt32,
-    icat21 UInt32,
-    icat22 UInt32,
-    icat23 UInt32,
-    icat24 UInt32,
-    icat25 UInt32,
-    icat26 UInt32
-) ENGINE = MergeTree(date, intHash32(icat1), (date, intHash32(icat1)), 8192)
-```
-
-Transformez les données du journal brut et placez - les dans la deuxième table:
-
-``` sql
-INSERT INTO criteo SELECT date, clicked, int1, int2, int3, int4, int5, int6, int7, int8, int9, int10, int11, int12, int13, reinterpretAsUInt32(unhex(cat1)) AS icat1, reinterpretAsUInt32(unhex(cat2)) AS icat2, reinterpretAsUInt32(unhex(cat3)) AS icat3, reinterpretAsUInt32(unhex(cat4)) AS icat4, reinterpretAsUInt32(unhex(cat5)) AS icat5, reinterpretAsUInt32(unhex(cat6)) AS icat6, reinterpretAsUInt32(unhex(cat7)) AS icat7, reinterpretAsUInt32(unhex(cat8)) AS icat8, reinterpretAsUInt32(unhex(cat9)) AS icat9, reinterpretAsUInt32(unhex(cat10)) AS icat10, reinterpretAsUInt32(unhex(cat11)) AS icat11, reinterpretAsUInt32(unhex(cat12)) AS icat12, reinterpretAsUInt32(unhex(cat13)) AS icat13, reinterpretAsUInt32(unhex(cat14)) AS icat14, reinterpretAsUInt32(unhex(cat15)) AS icat15, reinterpretAsUInt32(unhex(cat16)) AS icat16, reinterpretAsUInt32(unhex(cat17)) AS icat17, reinterpretAsUInt32(unhex(cat18)) AS icat18, reinterpretAsUInt32(unhex(cat19)) AS icat19, reinterpretAsUInt32(unhex(cat20)) AS icat20, reinterpretAsUInt32(unhex(cat21)) AS icat21, reinterpretAsUInt32(unhex(cat22)) AS icat22, reinterpretAsUInt32(unhex(cat23)) AS icat23, reinterpretAsUInt32(unhex(cat24)) AS icat24, reinterpretAsUInt32(unhex(cat25)) AS icat25, reinterpretAsUInt32(unhex(cat26)) AS icat26 FROM criteo_log;
-
-DROP TABLE criteo_log;
-```
-
-[Article Original](https://clickhouse.tech/docs/en/getting_started/example_datasets/criteo/) <!--hide-->
diff --git a/docs/fr/getting-started/example-datasets/index.md b/docs/fr/getting-started/example-datasets/index.md
deleted file mode 100644
index 03b2f15890b..00000000000
--- a/docs/fr/getting-started/example-datasets/index.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: "Exemple De Jeux De Donn\xE9es"
-toc_priority: 12
-toc_title: Introduction
----
-
-# Exemple De Jeux De Données {#example-datasets}
-
-Cette section décrit comment obtenir des exemples de jeux de données et les importer dans ClickHouse.
-Pour certains ensembles de données exemple les requêtes sont également disponibles.
-
--   [Yandex Anonymisé.Metrica Dataset](metrica.md)
--   [Référence Du Schéma En Étoile](star-schema.md)
--   [WikiStat](wikistat.md)
--   [Téraoctet de journaux de clics de Criteo](criteo.md)
--   [AMPLab Big Data Benchmark](amplab-benchmark.md)
--   [New York Taxi Données](nyc-taxi.md)
--   [OnTime](ontime.md)
-
-[Article Original](https://clickhouse.tech/docs/en/getting_started/example_datasets) <!--hide-->
diff --git a/docs/fr/getting-started/example-datasets/metrica.md b/docs/fr/getting-started/example-datasets/metrica.md
deleted file mode 100644
index 453a30d436f..00000000000
--- a/docs/fr/getting-started/example-datasets/metrica.md
+++ /dev/null
@@ -1,70 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 14
-toc_title: "Yandex.Metrica De Donn\xE9es"
----
-
-# Yandex Anonymisé.Metrica De Données {#anonymized-yandex-metrica-data}
-
-Dataset se compose de deux tables contenant des données anonymisées sur les hits (`hits_v1`) et les visites (`visits_v1`) de Yandex.Metrica. Vous pouvez en savoir plus sur Yandex.Metrica dans [Histoire de ClickHouse](../../introduction/history.md) section.
-
-L'ensemble de données se compose de deux tables, l'une d'elles peut être téléchargée sous forme compressée `tsv.xz` fichier ou comme partitions préparées. En outre, une version étendue de l' `hits` table contenant 100 millions de lignes est disponible comme TSV à https://datasets.clickhouse.tech/hits/tsv/hits_100m_obfuscated_v1.tsv.xz et comme partitions préparées à https://datasets.clickhouse.tech/hits/partitions/hits_100m_obfuscated_v1.tar.xz.
-
-## Obtention de Tables à partir de Partitions préparées {#obtaining-tables-from-prepared-partitions}
-
-Télécharger et importer la table hits:
-
-``` bash
-curl -O https://datasets.clickhouse.tech/hits/partitions/hits_v1.tar
-tar xvf hits_v1.tar -C /var/lib/clickhouse # path to ClickHouse data directory
-# check permissions on unpacked data, fix if required
-sudo service clickhouse-server restart
-clickhouse-client --query "SELECT COUNT(*) FROM datasets.hits_v1"
-```
-
-Télécharger et importer des visites:
-
-``` bash
-curl -O https://datasets.clickhouse.tech/visits/partitions/visits_v1.tar
-tar xvf visits_v1.tar -C /var/lib/clickhouse # path to ClickHouse data directory
-# check permissions on unpacked data, fix if required
-sudo service clickhouse-server restart
-clickhouse-client --query "SELECT COUNT(*) FROM datasets.visits_v1"
-```
-
-## Obtention de Tables à partir D'un fichier TSV compressé {#obtaining-tables-from-compressed-tsv-file}
-
-Télécharger et importer des hits à partir du fichier TSV compressé:
-
-``` bash
-curl https://datasets.clickhouse.tech/hits/tsv/hits_v1.tsv.xz | unxz --threads=`nproc` > hits_v1.tsv
-# now create table
-clickhouse-client --query "CREATE DATABASE IF NOT EXISTS datasets"
-clickhouse-client --query "CREATE TABLE datasets.hits_v1 ( WatchID UInt64,  JavaEnable UInt8,  Title String,  GoodEvent Int16,  EventTime DateTime,  EventDate Date,  CounterID UInt32,  ClientIP UInt32,  ClientIP6 FixedString(16),  RegionID UInt32,  UserID UInt64,  CounterClass Int8,  OS UInt8,  UserAgent UInt8,  URL String,  Referer String,  URLDomain String,  RefererDomain String,  Refresh UInt8,  IsRobot UInt8,  RefererCategories Array(UInt16),  URLCategories Array(UInt16), URLRegions Array(UInt32),  RefererRegions Array(UInt32),  ResolutionWidth UInt16,  ResolutionHeight UInt16,  ResolutionDepth UInt8,  FlashMajor UInt8, FlashMinor UInt8,  FlashMinor2 String,  NetMajor UInt8,  NetMinor UInt8, UserAgentMajor UInt16,  UserAgentMinor FixedString(2),  CookieEnable UInt8, JavascriptEnable UInt8,  IsMobile UInt8,  MobilePhone UInt8,  MobilePhoneModel String,  Params String,  IPNetworkID UInt32,  TraficSourceID Int8, SearchEngineID UInt16,  SearchPhrase String,  AdvEngineID UInt8,  IsArtifical UInt8,  WindowClientWidth UInt16,  WindowClientHeight UInt16,  ClientTimeZone Int16,  ClientEventTime DateTime,  SilverlightVersion1 UInt8, SilverlightVersion2 UInt8,  SilverlightVersion3 UInt32,  SilverlightVersion4 UInt16,  PageCharset String,  CodeVersion UInt32,  IsLink UInt8,  IsDownload UInt8,  IsNotBounce UInt8,  FUniqID UInt64,  HID UInt32,  IsOldCounter UInt8, IsEvent UInt8,  IsParameter UInt8,  DontCountHits UInt8,  WithHash UInt8, HitColor FixedString(1),  UTCEventTime DateTime,  Age UInt8,  Sex UInt8,  Income UInt8,  Interests UInt16,  Robotness UInt8,  GeneralInterests Array(UInt16), RemoteIP UInt32,  RemoteIP6 FixedString(16),  WindowName Int32,  OpenerName Int32,  HistoryLength Int16,  BrowserLanguage FixedString(2),  BrowserCountry FixedString(2),  SocialNetwork String,  SocialAction String,  HTTPError UInt16, SendTiming Int32,  DNSTiming Int32,  ConnectTiming Int32,  ResponseStartTiming Int32,  ResponseEndTiming Int32,  FetchTiming Int32,  RedirectTiming Int32, DOMInteractiveTiming Int32,  DOMContentLoadedTiming Int32,  DOMCompleteTiming Int32,  LoadEventStartTiming Int32,  LoadEventEndTiming Int32, NSToDOMContentLoadedTiming Int32,  FirstPaintTiming Int32,  RedirectCount Int8, SocialSourceNetworkID UInt8,  SocialSourcePage String,  ParamPrice Int64, ParamOrderID String,  ParamCurrency FixedString(3),  ParamCurrencyID UInt16, GoalsReached Array(UInt32),  OpenstatServiceName String,  OpenstatCampaignID String,  OpenstatAdID String,  OpenstatSourceID String,  UTMSource String, UTMMedium String,  UTMCampaign String,  UTMContent String,  UTMTerm String, FromTag String,  HasGCLID UInt8,  RefererHash UInt64,  URLHash UInt64,  CLID UInt32,  YCLID UInt64,  ShareService String,  ShareURL String,  ShareTitle String,  ParsedParams Nested(Key1 String,  Key2 String, Key3 String, Key4 String, Key5 String,  ValueDouble Float64),  IslandID FixedString(16),  RequestNum UInt32,  RequestTry UInt8) ENGINE = MergeTree() PARTITION BY toYYYYMM(EventDate) ORDER BY (CounterID, EventDate, intHash32(UserID)) SAMPLE BY intHash32(UserID) SETTINGS index_granularity = 8192"
-# import data
-cat hits_v1.tsv | clickhouse-client --query "INSERT INTO datasets.hits_v1 FORMAT TSV" --max_insert_block_size=100000
-# optionally you can optimize table
-clickhouse-client --query "OPTIMIZE TABLE datasets.hits_v1 FINAL"
-clickhouse-client --query "SELECT COUNT(*) FROM datasets.hits_v1"
-```
-
-Télécharger et importer des visites à partir du fichier TSV compressé:
-
-``` bash
-curl https://datasets.clickhouse.tech/visits/tsv/visits_v1.tsv.xz | unxz --threads=`nproc` > visits_v1.tsv
-# now create table
-clickhouse-client --query "CREATE DATABASE IF NOT EXISTS datasets"
-clickhouse-client --query "CREATE TABLE datasets.visits_v1 ( CounterID UInt32,  StartDate Date,  Sign Int8,  IsNew UInt8,  VisitID UInt64,  UserID UInt64,  StartTime DateTime,  Duration UInt32,  UTCStartTime DateTime,  PageViews Int32,  Hits Int32,  IsBounce UInt8,  Referer String,  StartURL String,  RefererDomain String,  StartURLDomain String,  EndURL String,  LinkURL String,  IsDownload UInt8,  TraficSourceID Int8,  SearchEngineID UInt16,  SearchPhrase String,  AdvEngineID UInt8,  PlaceID Int32,  RefererCategories Array(UInt16),  URLCategories Array(UInt16),  URLRegions Array(UInt32),  RefererRegions Array(UInt32),  IsYandex UInt8,  GoalReachesDepth Int32,  GoalReachesURL Int32,  GoalReachesAny Int32,  SocialSourceNetworkID UInt8,  SocialSourcePage String,  MobilePhoneModel String,  ClientEventTime DateTime,  RegionID UInt32,  ClientIP UInt32,  ClientIP6 FixedString(16),  RemoteIP UInt32,  RemoteIP6 FixedString(16),  IPNetworkID UInt32,  SilverlightVersion3 UInt32,  CodeVersion UInt32,  ResolutionWidth UInt16,  ResolutionHeight UInt16,  UserAgentMajor UInt16,  UserAgentMinor UInt16,  WindowClientWidth UInt16,  WindowClientHeight UInt16,  SilverlightVersion2 UInt8,  SilverlightVersion4 UInt16,  FlashVersion3 UInt16,  FlashVersion4 UInt16,  ClientTimeZone Int16,  OS UInt8,  UserAgent UInt8,  ResolutionDepth UInt8,  FlashMajor UInt8,  FlashMinor UInt8,  NetMajor UInt8,  NetMinor UInt8,  MobilePhone UInt8,  SilverlightVersion1 UInt8,  Age UInt8,  Sex UInt8,  Income UInt8,  JavaEnable UInt8,  CookieEnable UInt8,  JavascriptEnable UInt8,  IsMobile UInt8,  BrowserLanguage UInt16,  BrowserCountry UInt16,  Interests UInt16,  Robotness UInt8,  GeneralInterests Array(UInt16),  Params Array(String),  Goals Nested(ID UInt32, Serial UInt32, EventTime DateTime,  Price Int64,  OrderID String, CurrencyID UInt32),  WatchIDs Array(UInt64),  ParamSumPrice Int64,  ParamCurrency FixedString(3),  ParamCurrencyID UInt16,  ClickLogID UInt64,  ClickEventID Int32,  ClickGoodEvent Int32,  ClickEventTime DateTime,  ClickPriorityID Int32,  ClickPhraseID Int32,  ClickPageID Int32,  ClickPlaceID Int32,  ClickTypeID Int32,  ClickResourceID Int32,  ClickCost UInt32,  ClickClientIP UInt32,  ClickDomainID UInt32,  ClickURL String,  ClickAttempt UInt8,  ClickOrderID UInt32,  ClickBannerID UInt32,  ClickMarketCategoryID UInt32,  ClickMarketPP UInt32,  ClickMarketCategoryName String,  ClickMarketPPName String,  ClickAWAPSCampaignName String,  ClickPageName String,  ClickTargetType UInt16,  ClickTargetPhraseID UInt64,  ClickContextType UInt8,  ClickSelectType Int8,  ClickOptions String,  ClickGroupBannerID Int32,  OpenstatServiceName String,  OpenstatCampaignID String,  OpenstatAdID String,  OpenstatSourceID String,  UTMSource String,  UTMMedium String,  UTMCampaign String,  UTMContent String,  UTMTerm String,  FromTag String,  HasGCLID UInt8,  FirstVisit DateTime,  PredLastVisit Date,  LastVisit Date,  TotalVisits UInt32,  TraficSource    Nested(ID Int8,  SearchEngineID UInt16, AdvEngineID UInt8, PlaceID UInt16, SocialSourceNetworkID UInt8, Domain String, SearchPhrase String, SocialSourcePage String),  Attendance FixedString(16),  CLID UInt32,  YCLID UInt64,  NormalizedRefererHash UInt64,  SearchPhraseHash UInt64,  RefererDomainHash UInt64,  NormalizedStartURLHash UInt64,  StartURLDomainHash UInt64,  NormalizedEndURLHash UInt64,  TopLevelDomain UInt64,  URLScheme UInt64,  OpenstatServiceNameHash UInt64,  OpenstatCampaignIDHash UInt64,  OpenstatAdIDHash UInt64,  OpenstatSourceIDHash UInt64,  UTMSourceHash UInt64,  UTMMediumHash UInt64,  UTMCampaignHash UInt64,  UTMContentHash UInt64,  UTMTermHash UInt64,  FromHash UInt64,  WebVisorEnabled UInt8,  WebVisorActivity UInt32,  ParsedParams    Nested(Key1 String,  Key2 String,  Key3 String,  Key4 String, Key5 String, ValueDouble    Float64),  Market Nested(Type UInt8, GoalID UInt32, OrderID String,  OrderPrice Int64,  PP UInt32,  DirectPlaceID UInt32,  DirectOrderID  UInt32,  DirectBannerID UInt32,  GoodID String, GoodName String, GoodQuantity Int32,  GoodPrice Int64),  IslandID FixedString(16)) ENGINE = CollapsingMergeTree(Sign) PARTITION BY toYYYYMM(StartDate) ORDER BY (CounterID, StartDate, intHash32(UserID), VisitID) SAMPLE BY intHash32(UserID) SETTINGS index_granularity = 8192"
-# import data
-cat visits_v1.tsv | clickhouse-client --query "INSERT INTO datasets.visits_v1 FORMAT TSV" --max_insert_block_size=100000
-# optionally you can optimize table
-clickhouse-client --query "OPTIMIZE TABLE datasets.visits_v1 FINAL"
-clickhouse-client --query "SELECT COUNT(*) FROM datasets.visits_v1"
-```
-
-## Exemple De Requêtes {#example-queries}
-
-[Tutoriel ClickHouse](../../getting-started/tutorial.md) est basé sur Yandex.Metrica dataset et la façon recommandée pour commencer avec cet ensemble de données est de simplement passer par tutoriel.
-
-D'autres exemples de requêtes pour ces tables peuvent être trouvés parmi [tests avec État](https://github.com/ClickHouse/ClickHouse/tree/master/tests/queries/1_stateful) de ClickHouse (ils sont nommés `test.hists` et `test.visits` y).
diff --git a/docs/fr/getting-started/example-datasets/nyc-taxi.md b/docs/fr/getting-started/example-datasets/nyc-taxi.md
deleted file mode 100644
index 46aa944e718..00000000000
--- a/docs/fr/getting-started/example-datasets/nyc-taxi.md
+++ /dev/null
@@ -1,390 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 16
-toc_title: "New York Taxi Donn\xE9es"
----
-
-# New York Taxi Données {#new-york-taxi-data}
-
-Ce jeu de données peut être obtenu de deux façons:
-
--   importation à partir de données brutes
--   téléchargement de partitions
-
-## Comment importer les données brutes {#how-to-import-the-raw-data}
-
-Tu vois https://github.com/toddwschneider/nyc-taxi-data et http://tech.marksblogg.com/billion-nyc-taxi-rides-redshift.html pour la description d'un ensemble de données et les instructions de téléchargement.
-
-Le téléchargement entraînera environ 227 Go de données non compressées dans des fichiers CSV. Le téléchargement prend environ une heure sur une connexion 1 Gbit (téléchargement parallèle depuis s3.amazonaws.com récupère au moins la moitié d'un canal 1 Gbit).
-Certains fichiers peuvent ne pas télécharger entièrement. Vérifiez la taille des fichiers et re-télécharger tout ce qui semble douteux.
-
-Certains fichiers peuvent contenir des lignes invalides. Vous pouvez les corriger comme suit:
-
-``` bash
-sed -E '/(.*,){18,}/d' data/yellow_tripdata_2010-02.csv > data/yellow_tripdata_2010-02.csv_
-sed -E '/(.*,){18,}/d' data/yellow_tripdata_2010-03.csv > data/yellow_tripdata_2010-03.csv_
-mv data/yellow_tripdata_2010-02.csv_ data/yellow_tripdata_2010-02.csv
-mv data/yellow_tripdata_2010-03.csv_ data/yellow_tripdata_2010-03.csv
-```
-
-Ensuite, les données doivent être pré-traitées dans PostgreSQL. Cela créera des sélections de points dans les polygones (pour faire correspondre les points sur la carte avec les arrondissements de New York) et combinera toutes les données en une seule table plate dénormalisée à l'aide d'une jointure. Pour ce faire, vous devrez installer PostgreSQL avec le support PostGIS.
-
-Soyez prudent lors de l'exécution `initialize_database.sh` et vérifiez à nouveau manuellement que toutes les tables ont été créées correctement.
-
-Il faut environ 20-30 minutes pour traiter la valeur de chaque mois de données dans PostgreSQL, pour un total d'environ 48 heures.
-
-Vous pouvez vérifier le nombre de téléchargé lignes comme suit:
-
-``` bash
-$ time psql nyc-taxi-data -c "SELECT count(*) FROM trips;"
-## Count
- 1298979494
-(1 row)
-
-real    7m9.164s
-```
-
-(C'est un peu plus de 1,1 milliard de lignes rapportées par Mark Litwintschik dans une série de billets de blog.)
-
-Les données de PostgreSQL utilisent 370 GO d'espace.
-
-Exportation des données depuis PostgreSQL:
-
-``` sql
-COPY
-(
-    SELECT trips.id,
-           trips.vendor_id,
-           trips.pickup_datetime,
-           trips.dropoff_datetime,
-           trips.store_and_fwd_flag,
-           trips.rate_code_id,
-           trips.pickup_longitude,
-           trips.pickup_latitude,
-           trips.dropoff_longitude,
-           trips.dropoff_latitude,
-           trips.passenger_count,
-           trips.trip_distance,
-           trips.fare_amount,
-           trips.extra,
-           trips.mta_tax,
-           trips.tip_amount,
-           trips.tolls_amount,
-           trips.ehail_fee,
-           trips.improvement_surcharge,
-           trips.total_amount,
-           trips.payment_type,
-           trips.trip_type,
-           trips.pickup,
-           trips.dropoff,
-
-           cab_types.type cab_type,
-
-           weather.precipitation_tenths_of_mm rain,
-           weather.snow_depth_mm,
-           weather.snowfall_mm,
-           weather.max_temperature_tenths_degrees_celsius max_temp,
-           weather.min_temperature_tenths_degrees_celsius min_temp,
-           weather.average_wind_speed_tenths_of_meters_per_second wind,
-
-           pick_up.gid pickup_nyct2010_gid,
-           pick_up.ctlabel pickup_ctlabel,
-           pick_up.borocode pickup_borocode,
-           pick_up.boroname pickup_boroname,
-           pick_up.ct2010 pickup_ct2010,
-           pick_up.boroct2010 pickup_boroct2010,
-           pick_up.cdeligibil pickup_cdeligibil,
-           pick_up.ntacode pickup_ntacode,
-           pick_up.ntaname pickup_ntaname,
-           pick_up.puma pickup_puma,
-
-           drop_off.gid dropoff_nyct2010_gid,
-           drop_off.ctlabel dropoff_ctlabel,
-           drop_off.borocode dropoff_borocode,
-           drop_off.boroname dropoff_boroname,
-           drop_off.ct2010 dropoff_ct2010,
-           drop_off.boroct2010 dropoff_boroct2010,
-           drop_off.cdeligibil dropoff_cdeligibil,
-           drop_off.ntacode dropoff_ntacode,
-           drop_off.ntaname dropoff_ntaname,
-           drop_off.puma dropoff_puma
-    FROM trips
-    LEFT JOIN cab_types
-        ON trips.cab_type_id = cab_types.id
-    LEFT JOIN central_park_weather_observations_raw weather
-        ON weather.date = trips.pickup_datetime::date
-    LEFT JOIN nyct2010 pick_up
-        ON pick_up.gid = trips.pickup_nyct2010_gid
-    LEFT JOIN nyct2010 drop_off
-        ON drop_off.gid = trips.dropoff_nyct2010_gid
-) TO '/opt/milovidov/nyc-taxi-data/trips.tsv';
-```
-
-L'instantané de données est créé à une vitesse d'environ 50 Mo par seconde. Lors de la création de l'instantané, PostgreSQL lit à partir du disque à une vitesse d'environ 28 Mo par seconde.
-Cela prend environ 5 heures. Le fichier TSV résultant est 590612904969 octets.
-
-Créer une table temporaire dans ClickHouse:
-
-``` sql
-CREATE TABLE trips
-(
-trip_id                 UInt32,
-vendor_id               String,
-pickup_datetime         DateTime,
-dropoff_datetime        Nullable(DateTime),
-store_and_fwd_flag      Nullable(FixedString(1)),
-rate_code_id            Nullable(UInt8),
-pickup_longitude        Nullable(Float64),
-pickup_latitude         Nullable(Float64),
-dropoff_longitude       Nullable(Float64),
-dropoff_latitude        Nullable(Float64),
-passenger_count         Nullable(UInt8),
-trip_distance           Nullable(Float64),
-fare_amount             Nullable(Float32),
-extra                   Nullable(Float32),
-mta_tax                 Nullable(Float32),
-tip_amount              Nullable(Float32),
-tolls_amount            Nullable(Float32),
-ehail_fee               Nullable(Float32),
-improvement_surcharge   Nullable(Float32),
-total_amount            Nullable(Float32),
-payment_type            Nullable(String),
-trip_type               Nullable(UInt8),
-pickup                  Nullable(String),
-dropoff                 Nullable(String),
-cab_type                Nullable(String),
-precipitation           Nullable(UInt8),
-snow_depth              Nullable(UInt8),
-snowfall                Nullable(UInt8),
-max_temperature         Nullable(UInt8),
-min_temperature         Nullable(UInt8),
-average_wind_speed      Nullable(UInt8),
-pickup_nyct2010_gid     Nullable(UInt8),
-pickup_ctlabel          Nullable(String),
-pickup_borocode         Nullable(UInt8),
-pickup_boroname         Nullable(String),
-pickup_ct2010           Nullable(String),
-pickup_boroct2010       Nullable(String),
-pickup_cdeligibil       Nullable(FixedString(1)),
-pickup_ntacode          Nullable(String),
-pickup_ntaname          Nullable(String),
-pickup_puma             Nullable(String),
-dropoff_nyct2010_gid    Nullable(UInt8),
-dropoff_ctlabel         Nullable(String),
-dropoff_borocode        Nullable(UInt8),
-dropoff_boroname        Nullable(String),
-dropoff_ct2010          Nullable(String),
-dropoff_boroct2010      Nullable(String),
-dropoff_cdeligibil      Nullable(String),
-dropoff_ntacode         Nullable(String),
-dropoff_ntaname         Nullable(String),
-dropoff_puma            Nullable(String)
-) ENGINE = Log;
-```
-
-Il est nécessaire pour convertir les champs en types de données plus corrects et, si possible, pour éliminer les valeurs Null.
-
-``` bash
-$ time clickhouse-client --query="INSERT INTO trips FORMAT TabSeparated" < trips.tsv
-
-real    75m56.214s
-```
-
-Les données sont lues à une vitesse de 112-140 Mo/seconde.
-Le chargement de données dans une table de type de journal dans un flux a pris 76 minutes.
-Les données de ce tableau utilisent 142 GO.
-
-(L'importation de données directement depuis Postgres est également possible en utilisant `COPY ... TO PROGRAM`.)
-
-Unfortunately, all the fields associated with the weather (precipitation…average_wind_speed) were filled with NULL. Because of this, we will remove them from the final data set.
-
-Pour commencer, nous allons créer une table sur un serveur unique. Plus tard, nous ferons le tableau distribué.
-
-Créer et remplir un tableau récapitulatif:
-
-``` sql
-CREATE TABLE trips_mergetree
-ENGINE = MergeTree(pickup_date, pickup_datetime, 8192)
-AS SELECT
-
-trip_id,
-CAST(vendor_id AS Enum8('1' = 1, '2' = 2, 'CMT' = 3, 'VTS' = 4, 'DDS' = 5, 'B02512' = 10, 'B02598' = 11, 'B02617' = 12, 'B02682' = 13, 'B02764' = 14)) AS vendor_id,
-toDate(pickup_datetime) AS pickup_date,
-ifNull(pickup_datetime, toDateTime(0)) AS pickup_datetime,
-toDate(dropoff_datetime) AS dropoff_date,
-ifNull(dropoff_datetime, toDateTime(0)) AS dropoff_datetime,
-assumeNotNull(store_and_fwd_flag) IN ('Y', '1', '2') AS store_and_fwd_flag,
-assumeNotNull(rate_code_id) AS rate_code_id,
-assumeNotNull(pickup_longitude) AS pickup_longitude,
-assumeNotNull(pickup_latitude) AS pickup_latitude,
-assumeNotNull(dropoff_longitude) AS dropoff_longitude,
-assumeNotNull(dropoff_latitude) AS dropoff_latitude,
-assumeNotNull(passenger_count) AS passenger_count,
-assumeNotNull(trip_distance) AS trip_distance,
-assumeNotNull(fare_amount) AS fare_amount,
-assumeNotNull(extra) AS extra,
-assumeNotNull(mta_tax) AS mta_tax,
-assumeNotNull(tip_amount) AS tip_amount,
-assumeNotNull(tolls_amount) AS tolls_amount,
-assumeNotNull(ehail_fee) AS ehail_fee,
-assumeNotNull(improvement_surcharge) AS improvement_surcharge,
-assumeNotNull(total_amount) AS total_amount,
-CAST((assumeNotNull(payment_type) AS pt) IN ('CSH', 'CASH', 'Cash', 'CAS', 'Cas', '1') ? 'CSH' : (pt IN ('CRD', 'Credit', 'Cre', 'CRE', 'CREDIT', '2') ? 'CRE' : (pt IN ('NOC', 'No Charge', 'No', '3') ? 'NOC' : (pt IN ('DIS', 'Dispute', 'Dis', '4') ? 'DIS' : 'UNK'))) AS Enum8('CSH' = 1, 'CRE' = 2, 'UNK' = 0, 'NOC' = 3, 'DIS' = 4)) AS payment_type_,
-assumeNotNull(trip_type) AS trip_type,
-ifNull(toFixedString(unhex(pickup), 25), toFixedString('', 25)) AS pickup,
-ifNull(toFixedString(unhex(dropoff), 25), toFixedString('', 25)) AS dropoff,
-CAST(assumeNotNull(cab_type) AS Enum8('yellow' = 1, 'green' = 2, 'uber' = 3)) AS cab_type,
-
-assumeNotNull(pickup_nyct2010_gid) AS pickup_nyct2010_gid,
-toFloat32(ifNull(pickup_ctlabel, '0')) AS pickup_ctlabel,
-assumeNotNull(pickup_borocode) AS pickup_borocode,
-CAST(assumeNotNull(pickup_boroname) AS Enum8('Manhattan' = 1, 'Queens' = 4, 'Brooklyn' = 3, '' = 0, 'Bronx' = 2, 'Staten Island' = 5)) AS pickup_boroname,
-toFixedString(ifNull(pickup_ct2010, '000000'), 6) AS pickup_ct2010,
-toFixedString(ifNull(pickup_boroct2010, '0000000'), 7) AS pickup_boroct2010,
-CAST(assumeNotNull(ifNull(pickup_cdeligibil, ' ')) AS Enum8(' ' = 0, 'E' = 1, 'I' = 2)) AS pickup_cdeligibil,
-toFixedString(ifNull(pickup_ntacode, '0000'), 4) AS pickup_ntacode,
-
-CAST(assumeNotNull(pickup_ntaname) AS Enum16('' = 0, 'Airport' = 1, 'Allerton-Pelham Gardens' = 2, 'Annadale-Huguenot-Prince\'s Bay-Eltingville' = 3, 'Arden Heights' = 4, 'Astoria' = 5, 'Auburndale' = 6, 'Baisley Park' = 7, 'Bath Beach' = 8, 'Battery Park City-Lower Manhattan' = 9, 'Bay Ridge' = 10, 'Bayside-Bayside Hills' = 11, 'Bedford' = 12, 'Bedford Park-Fordham North' = 13, 'Bellerose' = 14, 'Belmont' = 15, 'Bensonhurst East' = 16, 'Bensonhurst West' = 17, 'Borough Park' = 18, 'Breezy Point-Belle Harbor-Rockaway Park-Broad Channel' = 19, 'Briarwood-Jamaica Hills' = 20, 'Brighton Beach' = 21, 'Bronxdale' = 22, 'Brooklyn Heights-Cobble Hill' = 23, 'Brownsville' = 24, 'Bushwick North' = 25, 'Bushwick South' = 26, 'Cambria Heights' = 27, 'Canarsie' = 28, 'Carroll Gardens-Columbia Street-Red Hook' = 29, 'Central Harlem North-Polo Grounds' = 30, 'Central Harlem South' = 31, 'Charleston-Richmond Valley-Tottenville' = 32, 'Chinatown' = 33, 'Claremont-Bathgate' = 34, 'Clinton' = 35, 'Clinton Hill' = 36, 'Co-op City' = 37, 'College Point' = 38, 'Corona' = 39, 'Crotona Park East' = 40, 'Crown Heights North' = 41, 'Crown Heights South' = 42, 'Cypress Hills-City Line' = 43, 'DUMBO-Vinegar Hill-Downtown Brooklyn-Boerum Hill' = 44, 'Douglas Manor-Douglaston-Little Neck' = 45, 'Dyker Heights' = 46, 'East Concourse-Concourse Village' = 47, 'East Elmhurst' = 48, 'East Flatbush-Farragut' = 49, 'East Flushing' = 50, 'East Harlem North' = 51, 'East Harlem South' = 52, 'East New York' = 53, 'East New York (Pennsylvania Ave)' = 54, 'East Tremont' = 55, 'East Village' = 56, 'East Williamsburg' = 57, 'Eastchester-Edenwald-Baychester' = 58, 'Elmhurst' = 59, 'Elmhurst-Maspeth' = 60, 'Erasmus' = 61, 'Far Rockaway-Bayswater' = 62, 'Flatbush' = 63, 'Flatlands' = 64, 'Flushing' = 65, 'Fordham South' = 66, 'Forest Hills' = 67, 'Fort Greene' = 68, 'Fresh Meadows-Utopia' = 69, 'Ft. Totten-Bay Terrace-Clearview' = 70, 'Georgetown-Marine Park-Bergen Beach-Mill Basin' = 71, 'Glen Oaks-Floral Park-New Hyde Park' = 72, 'Glendale' = 73, 'Gramercy' = 74, 'Grasmere-Arrochar-Ft. Wadsworth' = 75, 'Gravesend' = 76, 'Great Kills' = 77, 'Greenpoint' = 78, 'Grymes Hill-Clifton-Fox Hills' = 79, 'Hamilton Heights' = 80, 'Hammels-Arverne-Edgemere' = 81, 'Highbridge' = 82, 'Hollis' = 83, 'Homecrest' = 84, 'Hudson Yards-Chelsea-Flatiron-Union Square' = 85, 'Hunters Point-Sunnyside-West Maspeth' = 86, 'Hunts Point' = 87, 'Jackson Heights' = 88, 'Jamaica' = 89, 'Jamaica Estates-Holliswood' = 90, 'Kensington-Ocean Parkway' = 91, 'Kew Gardens' = 92, 'Kew Gardens Hills' = 93, 'Kingsbridge Heights' = 94, 'Laurelton' = 95, 'Lenox Hill-Roosevelt Island' = 96, 'Lincoln Square' = 97, 'Lindenwood-Howard Beach' = 98, 'Longwood' = 99, 'Lower East Side' = 100, 'Madison' = 101, 'Manhattanville' = 102, 'Marble Hill-Inwood' = 103, 'Mariner\'s Harbor-Arlington-Port Ivory-Graniteville' = 104, 'Maspeth' = 105, 'Melrose South-Mott Haven North' = 106, 'Middle Village' = 107, 'Midtown-Midtown South' = 108, 'Midwood' = 109, 'Morningside Heights' = 110, 'Morrisania-Melrose' = 111, 'Mott Haven-Port Morris' = 112, 'Mount Hope' = 113, 'Murray Hill' = 114, 'Murray Hill-Kips Bay' = 115, 'New Brighton-Silver Lake' = 116, 'New Dorp-Midland Beach' = 117, 'New Springville-Bloomfield-Travis' = 118, 'North Corona' = 119, 'North Riverdale-Fieldston-Riverdale' = 120, 'North Side-South Side' = 121, 'Norwood' = 122, 'Oakland Gardens' = 123, 'Oakwood-Oakwood Beach' = 124, 'Ocean Hill' = 125, 'Ocean Parkway South' = 126, 'Old Astoria' = 127, 'Old Town-Dongan Hills-South Beach' = 128, 'Ozone Park' = 129, 'Park Slope-Gowanus' = 130, 'Parkchester' = 131, 'Pelham Bay-Country Club-City Island' = 132, 'Pelham Parkway' = 133, 'Pomonok-Flushing Heights-Hillcrest' = 134, 'Port Richmond' = 135, 'Prospect Heights' = 136, 'Prospect Lefferts Gardens-Wingate' = 137, 'Queens Village' = 138, 'Queensboro Hill' = 139, 'Queensbridge-Ravenswood-Long Island City' = 140, 'Rego Park' = 141, 'Richmond Hill' = 142, 'Ridgewood' = 143, 'Rikers Island' = 144, 'Rosedale' = 145, 'Rossville-Woodrow' = 146, 'Rugby-Remsen Village' = 147, 'Schuylerville-Throgs Neck-Edgewater Park' = 148, 'Seagate-Coney Island' = 149, 'Sheepshead Bay-Gerritsen Beach-Manhattan Beach' = 150, 'SoHo-TriBeCa-Civic Center-Little Italy' = 151, 'Soundview-Bruckner' = 152, 'Soundview-Castle Hill-Clason Point-Harding Park' = 153, 'South Jamaica' = 154, 'South Ozone Park' = 155, 'Springfield Gardens North' = 156, 'Springfield Gardens South-Brookville' = 157, 'Spuyten Duyvil-Kingsbridge' = 158, 'St. Albans' = 159, 'Stapleton-Rosebank' = 160, 'Starrett City' = 161, 'Steinway' = 162, 'Stuyvesant Heights' = 163, 'Stuyvesant Town-Cooper Village' = 164, 'Sunset Park East' = 165, 'Sunset Park West' = 166, 'Todt Hill-Emerson Hill-Heartland Village-Lighthouse Hill' = 167, 'Turtle Bay-East Midtown' = 168, 'University Heights-Morris Heights' = 169, 'Upper East Side-Carnegie Hill' = 170, 'Upper West Side' = 171, 'Van Cortlandt Village' = 172, 'Van Nest-Morris Park-Westchester Square' = 173, 'Washington Heights North' = 174, 'Washington Heights South' = 175, 'West Brighton' = 176, 'West Concourse' = 177, 'West Farms-Bronx River' = 178, 'West New Brighton-New Brighton-St. George' = 179, 'West Village' = 180, 'Westchester-Unionport' = 181, 'Westerleigh' = 182, 'Whitestone' = 183, 'Williamsbridge-Olinville' = 184, 'Williamsburg' = 185, 'Windsor Terrace' = 186, 'Woodhaven' = 187, 'Woodlawn-Wakefield' = 188, 'Woodside' = 189, 'Yorkville' = 190, 'park-cemetery-etc-Bronx' = 191, 'park-cemetery-etc-Brooklyn' = 192, 'park-cemetery-etc-Manhattan' = 193, 'park-cemetery-etc-Queens' = 194, 'park-cemetery-etc-Staten Island' = 195)) AS pickup_ntaname,
-
-toUInt16(ifNull(pickup_puma, '0')) AS pickup_puma,
-
-assumeNotNull(dropoff_nyct2010_gid) AS dropoff_nyct2010_gid,
-toFloat32(ifNull(dropoff_ctlabel, '0')) AS dropoff_ctlabel,
-assumeNotNull(dropoff_borocode) AS dropoff_borocode,
-CAST(assumeNotNull(dropoff_boroname) AS Enum8('Manhattan' = 1, 'Queens' = 4, 'Brooklyn' = 3, '' = 0, 'Bronx' = 2, 'Staten Island' = 5)) AS dropoff_boroname,
-toFixedString(ifNull(dropoff_ct2010, '000000'), 6) AS dropoff_ct2010,
-toFixedString(ifNull(dropoff_boroct2010, '0000000'), 7) AS dropoff_boroct2010,
-CAST(assumeNotNull(ifNull(dropoff_cdeligibil, ' ')) AS Enum8(' ' = 0, 'E' = 1, 'I' = 2)) AS dropoff_cdeligibil,
-toFixedString(ifNull(dropoff_ntacode, '0000'), 4) AS dropoff_ntacode,
-
-CAST(assumeNotNull(dropoff_ntaname) AS Enum16('' = 0, 'Airport' = 1, 'Allerton-Pelham Gardens' = 2, 'Annadale-Huguenot-Prince\'s Bay-Eltingville' = 3, 'Arden Heights' = 4, 'Astoria' = 5, 'Auburndale' = 6, 'Baisley Park' = 7, 'Bath Beach' = 8, 'Battery Park City-Lower Manhattan' = 9, 'Bay Ridge' = 10, 'Bayside-Bayside Hills' = 11, 'Bedford' = 12, 'Bedford Park-Fordham North' = 13, 'Bellerose' = 14, 'Belmont' = 15, 'Bensonhurst East' = 16, 'Bensonhurst West' = 17, 'Borough Park' = 18, 'Breezy Point-Belle Harbor-Rockaway Park-Broad Channel' = 19, 'Briarwood-Jamaica Hills' = 20, 'Brighton Beach' = 21, 'Bronxdale' = 22, 'Brooklyn Heights-Cobble Hill' = 23, 'Brownsville' = 24, 'Bushwick North' = 25, 'Bushwick South' = 26, 'Cambria Heights' = 27, 'Canarsie' = 28, 'Carroll Gardens-Columbia Street-Red Hook' = 29, 'Central Harlem North-Polo Grounds' = 30, 'Central Harlem South' = 31, 'Charleston-Richmond Valley-Tottenville' = 32, 'Chinatown' = 33, 'Claremont-Bathgate' = 34, 'Clinton' = 35, 'Clinton Hill' = 36, 'Co-op City' = 37, 'College Point' = 38, 'Corona' = 39, 'Crotona Park East' = 40, 'Crown Heights North' = 41, 'Crown Heights South' = 42, 'Cypress Hills-City Line' = 43, 'DUMBO-Vinegar Hill-Downtown Brooklyn-Boerum Hill' = 44, 'Douglas Manor-Douglaston-Little Neck' = 45, 'Dyker Heights' = 46, 'East Concourse-Concourse Village' = 47, 'East Elmhurst' = 48, 'East Flatbush-Farragut' = 49, 'East Flushing' = 50, 'East Harlem North' = 51, 'East Harlem South' = 52, 'East New York' = 53, 'East New York (Pennsylvania Ave)' = 54, 'East Tremont' = 55, 'East Village' = 56, 'East Williamsburg' = 57, 'Eastchester-Edenwald-Baychester' = 58, 'Elmhurst' = 59, 'Elmhurst-Maspeth' = 60, 'Erasmus' = 61, 'Far Rockaway-Bayswater' = 62, 'Flatbush' = 63, 'Flatlands' = 64, 'Flushing' = 65, 'Fordham South' = 66, 'Forest Hills' = 67, 'Fort Greene' = 68, 'Fresh Meadows-Utopia' = 69, 'Ft. Totten-Bay Terrace-Clearview' = 70, 'Georgetown-Marine Park-Bergen Beach-Mill Basin' = 71, 'Glen Oaks-Floral Park-New Hyde Park' = 72, 'Glendale' = 73, 'Gramercy' = 74, 'Grasmere-Arrochar-Ft. Wadsworth' = 75, 'Gravesend' = 76, 'Great Kills' = 77, 'Greenpoint' = 78, 'Grymes Hill-Clifton-Fox Hills' = 79, 'Hamilton Heights' = 80, 'Hammels-Arverne-Edgemere' = 81, 'Highbridge' = 82, 'Hollis' = 83, 'Homecrest' = 84, 'Hudson Yards-Chelsea-Flatiron-Union Square' = 85, 'Hunters Point-Sunnyside-West Maspeth' = 86, 'Hunts Point' = 87, 'Jackson Heights' = 88, 'Jamaica' = 89, 'Jamaica Estates-Holliswood' = 90, 'Kensington-Ocean Parkway' = 91, 'Kew Gardens' = 92, 'Kew Gardens Hills' = 93, 'Kingsbridge Heights' = 94, 'Laurelton' = 95, 'Lenox Hill-Roosevelt Island' = 96, 'Lincoln Square' = 97, 'Lindenwood-Howard Beach' = 98, 'Longwood' = 99, 'Lower East Side' = 100, 'Madison' = 101, 'Manhattanville' = 102, 'Marble Hill-Inwood' = 103, 'Mariner\'s Harbor-Arlington-Port Ivory-Graniteville' = 104, 'Maspeth' = 105, 'Melrose South-Mott Haven North' = 106, 'Middle Village' = 107, 'Midtown-Midtown South' = 108, 'Midwood' = 109, 'Morningside Heights' = 110, 'Morrisania-Melrose' = 111, 'Mott Haven-Port Morris' = 112, 'Mount Hope' = 113, 'Murray Hill' = 114, 'Murray Hill-Kips Bay' = 115, 'New Brighton-Silver Lake' = 116, 'New Dorp-Midland Beach' = 117, 'New Springville-Bloomfield-Travis' = 118, 'North Corona' = 119, 'North Riverdale-Fieldston-Riverdale' = 120, 'North Side-South Side' = 121, 'Norwood' = 122, 'Oakland Gardens' = 123, 'Oakwood-Oakwood Beach' = 124, 'Ocean Hill' = 125, 'Ocean Parkway South' = 126, 'Old Astoria' = 127, 'Old Town-Dongan Hills-South Beach' = 128, 'Ozone Park' = 129, 'Park Slope-Gowanus' = 130, 'Parkchester' = 131, 'Pelham Bay-Country Club-City Island' = 132, 'Pelham Parkway' = 133, 'Pomonok-Flushing Heights-Hillcrest' = 134, 'Port Richmond' = 135, 'Prospect Heights' = 136, 'Prospect Lefferts Gardens-Wingate' = 137, 'Queens Village' = 138, 'Queensboro Hill' = 139, 'Queensbridge-Ravenswood-Long Island City' = 140, 'Rego Park' = 141, 'Richmond Hill' = 142, 'Ridgewood' = 143, 'Rikers Island' = 144, 'Rosedale' = 145, 'Rossville-Woodrow' = 146, 'Rugby-Remsen Village' = 147, 'Schuylerville-Throgs Neck-Edgewater Park' = 148, 'Seagate-Coney Island' = 149, 'Sheepshead Bay-Gerritsen Beach-Manhattan Beach' = 150, 'SoHo-TriBeCa-Civic Center-Little Italy' = 151, 'Soundview-Bruckner' = 152, 'Soundview-Castle Hill-Clason Point-Harding Park' = 153, 'South Jamaica' = 154, 'South Ozone Park' = 155, 'Springfield Gardens North' = 156, 'Springfield Gardens South-Brookville' = 157, 'Spuyten Duyvil-Kingsbridge' = 158, 'St. Albans' = 159, 'Stapleton-Rosebank' = 160, 'Starrett City' = 161, 'Steinway' = 162, 'Stuyvesant Heights' = 163, 'Stuyvesant Town-Cooper Village' = 164, 'Sunset Park East' = 165, 'Sunset Park West' = 166, 'Todt Hill-Emerson Hill-Heartland Village-Lighthouse Hill' = 167, 'Turtle Bay-East Midtown' = 168, 'University Heights-Morris Heights' = 169, 'Upper East Side-Carnegie Hill' = 170, 'Upper West Side' = 171, 'Van Cortlandt Village' = 172, 'Van Nest-Morris Park-Westchester Square' = 173, 'Washington Heights North' = 174, 'Washington Heights South' = 175, 'West Brighton' = 176, 'West Concourse' = 177, 'West Farms-Bronx River' = 178, 'West New Brighton-New Brighton-St. George' = 179, 'West Village' = 180, 'Westchester-Unionport' = 181, 'Westerleigh' = 182, 'Whitestone' = 183, 'Williamsbridge-Olinville' = 184, 'Williamsburg' = 185, 'Windsor Terrace' = 186, 'Woodhaven' = 187, 'Woodlawn-Wakefield' = 188, 'Woodside' = 189, 'Yorkville' = 190, 'park-cemetery-etc-Bronx' = 191, 'park-cemetery-etc-Brooklyn' = 192, 'park-cemetery-etc-Manhattan' = 193, 'park-cemetery-etc-Queens' = 194, 'park-cemetery-etc-Staten Island' = 195)) AS dropoff_ntaname,
-
-toUInt16(ifNull(dropoff_puma, '0')) AS dropoff_puma
-
-FROM trips
-```
-
-Cela prend 3030 secondes à une vitesse d'environ 428 000 lignes par seconde.
-Pour le charger plus rapidement, vous pouvez créer la table avec le `Log` le moteur de `MergeTree`. Dans ce cas, le téléchargement fonctionne plus rapidement que 200 secondes.
-
-La table utilise 126 GO d'espace disque.
-
-``` sql
-SELECT formatReadableSize(sum(bytes)) FROM system.parts WHERE table = 'trips_mergetree' AND active
-```
-
-``` text
-┌─formatReadableSize(sum(bytes))─┐
-│ 126.18 GiB                     │
-└────────────────────────────────┘
-```
-
-Entre autres choses, vous pouvez exécuter la requête OPTIMIZE sur MergeTree. Mais ce n'est pas nécessaire puisque tout ira bien sans elle.
-
-## Téléchargement des Partitions préparées {#download-of-prepared-partitions}
-
-``` bash
-$ curl -O https://datasets.clickhouse.tech/trips_mergetree/partitions/trips_mergetree.tar
-$ tar xvf trips_mergetree.tar -C /var/lib/clickhouse # path to ClickHouse data directory
-$ # check permissions of unpacked data, fix if required
-$ sudo service clickhouse-server restart
-$ clickhouse-client --query "select count(*) from datasets.trips_mergetree"
-```
-
-!!! info "Info"
-    Si vous exécutez les requêtes décrites ci-dessous, vous devez utiliser le nom complet de la table, `datasets.trips_mergetree`.
-
-## Résultats sur un seul serveur {#results-on-single-server}
-
-Q1:
-
-``` sql
-SELECT cab_type, count(*) FROM trips_mergetree GROUP BY cab_type
-```
-
-0.490 secondes.
-
-Q2:
-
-``` sql
-SELECT passenger_count, avg(total_amount) FROM trips_mergetree GROUP BY passenger_count
-```
-
-1.224 secondes.
-
-Q3:
-
-``` sql
-SELECT passenger_count, toYear(pickup_date) AS year, count(*) FROM trips_mergetree GROUP BY passenger_count, year
-```
-
-2.104 secondes.
-
-Q4:
-
-``` sql
-SELECT passenger_count, toYear(pickup_date) AS year, round(trip_distance) AS distance, count(*)
-FROM trips_mergetree
-GROUP BY passenger_count, year, distance
-ORDER BY year, count(*) DESC
-```
-
-3.593 secondes.
-
-Le serveur suivant a été utilisé:
-
-Deux Intel (R) Xeon (R) CPU E5-2650 v2 @ 2.60 GHz, 16 noyaux physiques total, 128 GiB RAM, 8x6 TB HD sur le matériel RAID-5
-
-Temps d'exécution est le meilleur des trois pistes. Mais à partir de la deuxième exécution, les requêtes lisent les données du cache du système de fichiers. Aucune autre mise en cache ne se produit: les données sont lues et traitées à chaque exécution.
-
-La création d'un tableau sur trois serveurs:
-
-Sur chaque serveur:
-
-``` sql
-CREATE TABLE default.trips_mergetree_third ( trip_id UInt32,  vendor_id Enum8('1' = 1, '2' = 2, 'CMT' = 3, 'VTS' = 4, 'DDS' = 5, 'B02512' = 10, 'B02598' = 11, 'B02617' = 12, 'B02682' = 13, 'B02764' = 14),  pickup_date Date,  pickup_datetime DateTime,  dropoff_date Date,  dropoff_datetime DateTime,  store_and_fwd_flag UInt8,  rate_code_id UInt8,  pickup_longitude Float64,  pickup_latitude Float64,  dropoff_longitude Float64,  dropoff_latitude Float64,  passenger_count UInt8,  trip_distance Float64,  fare_amount Float32,  extra Float32,  mta_tax Float32,  tip_amount Float32,  tolls_amount Float32,  ehail_fee Float32,  improvement_surcharge Float32,  total_amount Float32,  payment_type_ Enum8('UNK' = 0, 'CSH' = 1, 'CRE' = 2, 'NOC' = 3, 'DIS' = 4),  trip_type UInt8,  pickup FixedString(25),  dropoff FixedString(25),  cab_type Enum8('yellow' = 1, 'green' = 2, 'uber' = 3),  pickup_nyct2010_gid UInt8,  pickup_ctlabel Float32,  pickup_borocode UInt8,  pickup_boroname Enum8('' = 0, 'Manhattan' = 1, 'Bronx' = 2, 'Brooklyn' = 3, 'Queens' = 4, 'Staten Island' = 5),  pickup_ct2010 FixedString(6),  pickup_boroct2010 FixedString(7),  pickup_cdeligibil Enum8(' ' = 0, 'E' = 1, 'I' = 2),  pickup_ntacode FixedString(4),  pickup_ntaname Enum16('' = 0, 'Airport' = 1, 'Allerton-Pelham Gardens' = 2, 'Annadale-Huguenot-Prince\'s Bay-Eltingville' = 3, 'Arden Heights' = 4, 'Astoria' = 5, 'Auburndale' = 6, 'Baisley Park' = 7, 'Bath Beach' = 8, 'Battery Park City-Lower Manhattan' = 9, 'Bay Ridge' = 10, 'Bayside-Bayside Hills' = 11, 'Bedford' = 12, 'Bedford Park-Fordham North' = 13, 'Bellerose' = 14, 'Belmont' = 15, 'Bensonhurst East' = 16, 'Bensonhurst West' = 17, 'Borough Park' = 18, 'Breezy Point-Belle Harbor-Rockaway Park-Broad Channel' = 19, 'Briarwood-Jamaica Hills' = 20, 'Brighton Beach' = 21, 'Bronxdale' = 22, 'Brooklyn Heights-Cobble Hill' = 23, 'Brownsville' = 24, 'Bushwick North' = 25, 'Bushwick South' = 26, 'Cambria Heights' = 27, 'Canarsie' = 28, 'Carroll Gardens-Columbia Street-Red Hook' = 29, 'Central Harlem North-Polo Grounds' = 30, 'Central Harlem South' = 31, 'Charleston-Richmond Valley-Tottenville' = 32, 'Chinatown' = 33, 'Claremont-Bathgate' = 34, 'Clinton' = 35, 'Clinton Hill' = 36, 'Co-op City' = 37, 'College Point' = 38, 'Corona' = 39, 'Crotona Park East' = 40, 'Crown Heights North' = 41, 'Crown Heights South' = 42, 'Cypress Hills-City Line' = 43, 'DUMBO-Vinegar Hill-Downtown Brooklyn-Boerum Hill' = 44, 'Douglas Manor-Douglaston-Little Neck' = 45, 'Dyker Heights' = 46, 'East Concourse-Concourse Village' = 47, 'East Elmhurst' = 48, 'East Flatbush-Farragut' = 49, 'East Flushing' = 50, 'East Harlem North' = 51, 'East Harlem South' = 52, 'East New York' = 53, 'East New York (Pennsylvania Ave)' = 54, 'East Tremont' = 55, 'East Village' = 56, 'East Williamsburg' = 57, 'Eastchester-Edenwald-Baychester' = 58, 'Elmhurst' = 59, 'Elmhurst-Maspeth' = 60, 'Erasmus' = 61, 'Far Rockaway-Bayswater' = 62, 'Flatbush' = 63, 'Flatlands' = 64, 'Flushing' = 65, 'Fordham South' = 66, 'Forest Hills' = 67, 'Fort Greene' = 68, 'Fresh Meadows-Utopia' = 69, 'Ft. Totten-Bay Terrace-Clearview' = 70, 'Georgetown-Marine Park-Bergen Beach-Mill Basin' = 71, 'Glen Oaks-Floral Park-New Hyde Park' = 72, 'Glendale' = 73, 'Gramercy' = 74, 'Grasmere-Arrochar-Ft. Wadsworth' = 75, 'Gravesend' = 76, 'Great Kills' = 77, 'Greenpoint' = 78, 'Grymes Hill-Clifton-Fox Hills' = 79, 'Hamilton Heights' = 80, 'Hammels-Arverne-Edgemere' = 81, 'Highbridge' = 82, 'Hollis' = 83, 'Homecrest' = 84, 'Hudson Yards-Chelsea-Flatiron-Union Square' = 85, 'Hunters Point-Sunnyside-West Maspeth' = 86, 'Hunts Point' = 87, 'Jackson Heights' = 88, 'Jamaica' = 89, 'Jamaica Estates-Holliswood' = 90, 'Kensington-Ocean Parkway' = 91, 'Kew Gardens' = 92, 'Kew Gardens Hills' = 93, 'Kingsbridge Heights' = 94, 'Laurelton' = 95, 'Lenox Hill-Roosevelt Island' = 96, 'Lincoln Square' = 97, 'Lindenwood-Howard Beach' = 98, 'Longwood' = 99, 'Lower East Side' = 100, 'Madison' = 101, 'Manhattanville' = 102, 'Marble Hill-Inwood' = 103, 'Mariner\'s Harbor-Arlington-Port Ivory-Graniteville' = 104, 'Maspeth' = 105, 'Melrose South-Mott Haven North' = 106, 'Middle Village' = 107, 'Midtown-Midtown South' = 108, 'Midwood' = 109, 'Morningside Heights' = 110, 'Morrisania-Melrose' = 111, 'Mott Haven-Port Morris' = 112, 'Mount Hope' = 113, 'Murray Hill' = 114, 'Murray Hill-Kips Bay' = 115, 'New Brighton-Silver Lake' = 116, 'New Dorp-Midland Beach' = 117, 'New Springville-Bloomfield-Travis' = 118, 'North Corona' = 119, 'North Riverdale-Fieldston-Riverdale' = 120, 'North Side-South Side' = 121, 'Norwood' = 122, 'Oakland Gardens' = 123, 'Oakwood-Oakwood Beach' = 124, 'Ocean Hill' = 125, 'Ocean Parkway South' = 126, 'Old Astoria' = 127, 'Old Town-Dongan Hills-South Beach' = 128, 'Ozone Park' = 129, 'Park Slope-Gowanus' = 130, 'Parkchester' = 131, 'Pelham Bay-Country Club-City Island' = 132, 'Pelham Parkway' = 133, 'Pomonok-Flushing Heights-Hillcrest' = 134, 'Port Richmond' = 135, 'Prospect Heights' = 136, 'Prospect Lefferts Gardens-Wingate' = 137, 'Queens Village' = 138, 'Queensboro Hill' = 139, 'Queensbridge-Ravenswood-Long Island City' = 140, 'Rego Park' = 141, 'Richmond Hill' = 142, 'Ridgewood' = 143, 'Rikers Island' = 144, 'Rosedale' = 145, 'Rossville-Woodrow' = 146, 'Rugby-Remsen Village' = 147, 'Schuylerville-Throgs Neck-Edgewater Park' = 148, 'Seagate-Coney Island' = 149, 'Sheepshead Bay-Gerritsen Beach-Manhattan Beach' = 150, 'SoHo-TriBeCa-Civic Center-Little Italy' = 151, 'Soundview-Bruckner' = 152, 'Soundview-Castle Hill-Clason Point-Harding Park' = 153, 'South Jamaica' = 154, 'South Ozone Park' = 155, 'Springfield Gardens North' = 156, 'Springfield Gardens South-Brookville' = 157, 'Spuyten Duyvil-Kingsbridge' = 158, 'St. Albans' = 159, 'Stapleton-Rosebank' = 160, 'Starrett City' = 161, 'Steinway' = 162, 'Stuyvesant Heights' = 163, 'Stuyvesant Town-Cooper Village' = 164, 'Sunset Park East' = 165, 'Sunset Park West' = 166, 'Todt Hill-Emerson Hill-Heartland Village-Lighthouse Hill' = 167, 'Turtle Bay-East Midtown' = 168, 'University Heights-Morris Heights' = 169, 'Upper East Side-Carnegie Hill' = 170, 'Upper West Side' = 171, 'Van Cortlandt Village' = 172, 'Van Nest-Morris Park-Westchester Square' = 173, 'Washington Heights North' = 174, 'Washington Heights South' = 175, 'West Brighton' = 176, 'West Concourse' = 177, 'West Farms-Bronx River' = 178, 'West New Brighton-New Brighton-St. George' = 179, 'West Village' = 180, 'Westchester-Unionport' = 181, 'Westerleigh' = 182, 'Whitestone' = 183, 'Williamsbridge-Olinville' = 184, 'Williamsburg' = 185, 'Windsor Terrace' = 186, 'Woodhaven' = 187, 'Woodlawn-Wakefield' = 188, 'Woodside' = 189, 'Yorkville' = 190, 'park-cemetery-etc-Bronx' = 191, 'park-cemetery-etc-Brooklyn' = 192, 'park-cemetery-etc-Manhattan' = 193, 'park-cemetery-etc-Queens' = 194, 'park-cemetery-etc-Staten Island' = 195),  pickup_puma UInt16,  dropoff_nyct2010_gid UInt8,  dropoff_ctlabel Float32,  dropoff_borocode UInt8,  dropoff_boroname Enum8('' = 0, 'Manhattan' = 1, 'Bronx' = 2, 'Brooklyn' = 3, 'Queens' = 4, 'Staten Island' = 5),  dropoff_ct2010 FixedString(6),  dropoff_boroct2010 FixedString(7),  dropoff_cdeligibil Enum8(' ' = 0, 'E' = 1, 'I' = 2),  dropoff_ntacode FixedString(4),  dropoff_ntaname Enum16('' = 0, 'Airport' = 1, 'Allerton-Pelham Gardens' = 2, 'Annadale-Huguenot-Prince\'s Bay-Eltingville' = 3, 'Arden Heights' = 4, 'Astoria' = 5, 'Auburndale' = 6, 'Baisley Park' = 7, 'Bath Beach' = 8, 'Battery Park City-Lower Manhattan' = 9, 'Bay Ridge' = 10, 'Bayside-Bayside Hills' = 11, 'Bedford' = 12, 'Bedford Park-Fordham North' = 13, 'Bellerose' = 14, 'Belmont' = 15, 'Bensonhurst East' = 16, 'Bensonhurst West' = 17, 'Borough Park' = 18, 'Breezy Point-Belle Harbor-Rockaway Park-Broad Channel' = 19, 'Briarwood-Jamaica Hills' = 20, 'Brighton Beach' = 21, 'Bronxdale' = 22, 'Brooklyn Heights-Cobble Hill' = 23, 'Brownsville' = 24, 'Bushwick North' = 25, 'Bushwick South' = 26, 'Cambria Heights' = 27, 'Canarsie' = 28, 'Carroll Gardens-Columbia Street-Red Hook' = 29, 'Central Harlem North-Polo Grounds' = 30, 'Central Harlem South' = 31, 'Charleston-Richmond Valley-Tottenville' = 32, 'Chinatown' = 33, 'Claremont-Bathgate' = 34, 'Clinton' = 35, 'Clinton Hill' = 36, 'Co-op City' = 37, 'College Point' = 38, 'Corona' = 39, 'Crotona Park East' = 40, 'Crown Heights North' = 41, 'Crown Heights South' = 42, 'Cypress Hills-City Line' = 43, 'DUMBO-Vinegar Hill-Downtown Brooklyn-Boerum Hill' = 44, 'Douglas Manor-Douglaston-Little Neck' = 45, 'Dyker Heights' = 46, 'East Concourse-Concourse Village' = 47, 'East Elmhurst' = 48, 'East Flatbush-Farragut' = 49, 'East Flushing' = 50, 'East Harlem North' = 51, 'East Harlem South' = 52, 'East New York' = 53, 'East New York (Pennsylvania Ave)' = 54, 'East Tremont' = 55, 'East Village' = 56, 'East Williamsburg' = 57, 'Eastchester-Edenwald-Baychester' = 58, 'Elmhurst' = 59, 'Elmhurst-Maspeth' = 60, 'Erasmus' = 61, 'Far Rockaway-Bayswater' = 62, 'Flatbush' = 63, 'Flatlands' = 64, 'Flushing' = 65, 'Fordham South' = 66, 'Forest Hills' = 67, 'Fort Greene' = 68, 'Fresh Meadows-Utopia' = 69, 'Ft. Totten-Bay Terrace-Clearview' = 70, 'Georgetown-Marine Park-Bergen Beach-Mill Basin' = 71, 'Glen Oaks-Floral Park-New Hyde Park' = 72, 'Glendale' = 73, 'Gramercy' = 74, 'Grasmere-Arrochar-Ft. Wadsworth' = 75, 'Gravesend' = 76, 'Great Kills' = 77, 'Greenpoint' = 78, 'Grymes Hill-Clifton-Fox Hills' = 79, 'Hamilton Heights' = 80, 'Hammels-Arverne-Edgemere' = 81, 'Highbridge' = 82, 'Hollis' = 83, 'Homecrest' = 84, 'Hudson Yards-Chelsea-Flatiron-Union Square' = 85, 'Hunters Point-Sunnyside-West Maspeth' = 86, 'Hunts Point' = 87, 'Jackson Heights' = 88, 'Jamaica' = 89, 'Jamaica Estates-Holliswood' = 90, 'Kensington-Ocean Parkway' = 91, 'Kew Gardens' = 92, 'Kew Gardens Hills' = 93, 'Kingsbridge Heights' = 94, 'Laurelton' = 95, 'Lenox Hill-Roosevelt Island' = 96, 'Lincoln Square' = 97, 'Lindenwood-Howard Beach' = 98, 'Longwood' = 99, 'Lower East Side' = 100, 'Madison' = 101, 'Manhattanville' = 102, 'Marble Hill-Inwood' = 103, 'Mariner\'s Harbor-Arlington-Port Ivory-Graniteville' = 104, 'Maspeth' = 105, 'Melrose South-Mott Haven North' = 106, 'Middle Village' = 107, 'Midtown-Midtown South' = 108, 'Midwood' = 109, 'Morningside Heights' = 110, 'Morrisania-Melrose' = 111, 'Mott Haven-Port Morris' = 112, 'Mount Hope' = 113, 'Murray Hill' = 114, 'Murray Hill-Kips Bay' = 115, 'New Brighton-Silver Lake' = 116, 'New Dorp-Midland Beach' = 117, 'New Springville-Bloomfield-Travis' = 118, 'North Corona' = 119, 'North Riverdale-Fieldston-Riverdale' = 120, 'North Side-South Side' = 121, 'Norwood' = 122, 'Oakland Gardens' = 123, 'Oakwood-Oakwood Beach' = 124, 'Ocean Hill' = 125, 'Ocean Parkway South' = 126, 'Old Astoria' = 127, 'Old Town-Dongan Hills-South Beach' = 128, 'Ozone Park' = 129, 'Park Slope-Gowanus' = 130, 'Parkchester' = 131, 'Pelham Bay-Country Club-City Island' = 132, 'Pelham Parkway' = 133, 'Pomonok-Flushing Heights-Hillcrest' = 134, 'Port Richmond' = 135, 'Prospect Heights' = 136, 'Prospect Lefferts Gardens-Wingate' = 137, 'Queens Village' = 138, 'Queensboro Hill' = 139, 'Queensbridge-Ravenswood-Long Island City' = 140, 'Rego Park' = 141, 'Richmond Hill' = 142, 'Ridgewood' = 143, 'Rikers Island' = 144, 'Rosedale' = 145, 'Rossville-Woodrow' = 146, 'Rugby-Remsen Village' = 147, 'Schuylerville-Throgs Neck-Edgewater Park' = 148, 'Seagate-Coney Island' = 149, 'Sheepshead Bay-Gerritsen Beach-Manhattan Beach' = 150, 'SoHo-TriBeCa-Civic Center-Little Italy' = 151, 'Soundview-Bruckner' = 152, 'Soundview-Castle Hill-Clason Point-Harding Park' = 153, 'South Jamaica' = 154, 'South Ozone Park' = 155, 'Springfield Gardens North' = 156, 'Springfield Gardens South-Brookville' = 157, 'Spuyten Duyvil-Kingsbridge' = 158, 'St. Albans' = 159, 'Stapleton-Rosebank' = 160, 'Starrett City' = 161, 'Steinway' = 162, 'Stuyvesant Heights' = 163, 'Stuyvesant Town-Cooper Village' = 164, 'Sunset Park East' = 165, 'Sunset Park West' = 166, 'Todt Hill-Emerson Hill-Heartland Village-Lighthouse Hill' = 167, 'Turtle Bay-East Midtown' = 168, 'University Heights-Morris Heights' = 169, 'Upper East Side-Carnegie Hill' = 170, 'Upper West Side' = 171, 'Van Cortlandt Village' = 172, 'Van Nest-Morris Park-Westchester Square' = 173, 'Washington Heights North' = 174, 'Washington Heights South' = 175, 'West Brighton' = 176, 'West Concourse' = 177, 'West Farms-Bronx River' = 178, 'West New Brighton-New Brighton-St. George' = 179, 'West Village' = 180, 'Westchester-Unionport' = 181, 'Westerleigh' = 182, 'Whitestone' = 183, 'Williamsbridge-Olinville' = 184, 'Williamsburg' = 185, 'Windsor Terrace' = 186, 'Woodhaven' = 187, 'Woodlawn-Wakefield' = 188, 'Woodside' = 189, 'Yorkville' = 190, 'park-cemetery-etc-Bronx' = 191, 'park-cemetery-etc-Brooklyn' = 192, 'park-cemetery-etc-Manhattan' = 193, 'park-cemetery-etc-Queens' = 194, 'park-cemetery-etc-Staten Island' = 195),  dropoff_puma UInt16) ENGINE = MergeTree(pickup_date, pickup_datetime, 8192)
-```
-
-Sur le serveur source:
-
-``` sql
-CREATE TABLE trips_mergetree_x3 AS trips_mergetree_third ENGINE = Distributed(perftest, default, trips_mergetree_third, rand())
-```
-
-La requête suivante redistribue les données:
-
-``` sql
-INSERT INTO trips_mergetree_x3 SELECT * FROM trips_mergetree
-```
-
-Cela prend 2454 secondes.
-
-Sur les trois serveurs:
-
-Q1: 0.212 secondes.
-Q2: 0.438 secondes.
-Q3: 0.733 secondes.
-Q4: 1.241 secondes.
-
-Pas de surprise ici, depuis les requêtes sont réparties linéairement.
-
-Nous avons également les résultats d'un cluster de 140 serveurs:
-
-Q1: 0,028 sec.
-Q2: 0,043 sec.
-Q3: 0,051 sec.
-Q4: 0,072 sec.
-
-Dans ce cas, le temps de traitement des requêtes est déterminé surtout par la latence du réseau.
-Nous avons exécuté des requêtes en utilisant un client situé dans un centre de données Yandex en Finlande sur un cluster en Russie, ce qui a ajouté environ 20 ms de latence.
-
-## Résumé {#summary}
-
-| serveur | Q1    | Q2    | Q3    | Q4    |
-|---------|-------|-------|-------|-------|
-| 1       | 0.490 | 1.224 | 2.104 | 3.593 |
-| 3       | 0.212 | 0.438 | 0.733 | 1.241 |
-| 140     | 0.028 | 0.043 | 0.051 | 0.072 |
-
-[Article Original](https://clickhouse.tech/docs/en/getting_started/example_datasets/nyc_taxi/) <!--hide-->
diff --git a/docs/fr/getting-started/example-datasets/ontime.md b/docs/fr/getting-started/example-datasets/ontime.md
deleted file mode 100644
index 8d036901b99..00000000000
--- a/docs/fr/getting-started/example-datasets/ontime.md
+++ /dev/null
@@ -1,412 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 15
-toc_title: OnTime
----
-
-# OnTime {#ontime}
-
-Ce jeu de données peut être obtenu de deux façons:
-
--   importation à partir de données brutes
--   téléchargement de partitions
-
-## Importation à partir de données brutes {#import-from-raw-data}
-
-Téléchargement de données:
-
-``` bash
-for s in `seq 1987 2018`
-do
-for m in `seq 1 12`
-do
-wget https://transtats.bts.gov/PREZIP/On_Time_Reporting_Carrier_On_Time_Performance_1987_present_${s}_${m}.zip
-done
-done
-```
-
-(à partir de https://github.com/Percona-Lab/ontime-airline-performance/blob/master/download.sh )
-
-Création d'une table:
-
-``` sql
-CREATE TABLE `ontime` (
-  `Year` UInt16,
-  `Quarter` UInt8,
-  `Month` UInt8,
-  `DayofMonth` UInt8,
-  `DayOfWeek` UInt8,
-  `FlightDate` Date,
-  `UniqueCarrier` FixedString(7),
-  `AirlineID` Int32,
-  `Carrier` FixedString(2),
-  `TailNum` String,
-  `FlightNum` String,
-  `OriginAirportID` Int32,
-  `OriginAirportSeqID` Int32,
-  `OriginCityMarketID` Int32,
-  `Origin` FixedString(5),
-  `OriginCityName` String,
-  `OriginState` FixedString(2),
-  `OriginStateFips` String,
-  `OriginStateName` String,
-  `OriginWac` Int32,
-  `DestAirportID` Int32,
-  `DestAirportSeqID` Int32,
-  `DestCityMarketID` Int32,
-  `Dest` FixedString(5),
-  `DestCityName` String,
-  `DestState` FixedString(2),
-  `DestStateFips` String,
-  `DestStateName` String,
-  `DestWac` Int32,
-  `CRSDepTime` Int32,
-  `DepTime` Int32,
-  `DepDelay` Int32,
-  `DepDelayMinutes` Int32,
-  `DepDel15` Int32,
-  `DepartureDelayGroups` String,
-  `DepTimeBlk` String,
-  `TaxiOut` Int32,
-  `WheelsOff` Int32,
-  `WheelsOn` Int32,
-  `TaxiIn` Int32,
-  `CRSArrTime` Int32,
-  `ArrTime` Int32,
-  `ArrDelay` Int32,
-  `ArrDelayMinutes` Int32,
-  `ArrDel15` Int32,
-  `ArrivalDelayGroups` Int32,
-  `ArrTimeBlk` String,
-  `Cancelled` UInt8,
-  `CancellationCode` FixedString(1),
-  `Diverted` UInt8,
-  `CRSElapsedTime` Int32,
-  `ActualElapsedTime` Int32,
-  `AirTime` Int32,
-  `Flights` Int32,
-  `Distance` Int32,
-  `DistanceGroup` UInt8,
-  `CarrierDelay` Int32,
-  `WeatherDelay` Int32,
-  `NASDelay` Int32,
-  `SecurityDelay` Int32,
-  `LateAircraftDelay` Int32,
-  `FirstDepTime` String,
-  `TotalAddGTime` String,
-  `LongestAddGTime` String,
-  `DivAirportLandings` String,
-  `DivReachedDest` String,
-  `DivActualElapsedTime` String,
-  `DivArrDelay` String,
-  `DivDistance` String,
-  `Div1Airport` String,
-  `Div1AirportID` Int32,
-  `Div1AirportSeqID` Int32,
-  `Div1WheelsOn` String,
-  `Div1TotalGTime` String,
-  `Div1LongestGTime` String,
-  `Div1WheelsOff` String,
-  `Div1TailNum` String,
-  `Div2Airport` String,
-  `Div2AirportID` Int32,
-  `Div2AirportSeqID` Int32,
-  `Div2WheelsOn` String,
-  `Div2TotalGTime` String,
-  `Div2LongestGTime` String,
-  `Div2WheelsOff` String,
-  `Div2TailNum` String,
-  `Div3Airport` String,
-  `Div3AirportID` Int32,
-  `Div3AirportSeqID` Int32,
-  `Div3WheelsOn` String,
-  `Div3TotalGTime` String,
-  `Div3LongestGTime` String,
-  `Div3WheelsOff` String,
-  `Div3TailNum` String,
-  `Div4Airport` String,
-  `Div4AirportID` Int32,
-  `Div4AirportSeqID` Int32,
-  `Div4WheelsOn` String,
-  `Div4TotalGTime` String,
-  `Div4LongestGTime` String,
-  `Div4WheelsOff` String,
-  `Div4TailNum` String,
-  `Div5Airport` String,
-  `Div5AirportID` Int32,
-  `Div5AirportSeqID` Int32,
-  `Div5WheelsOn` String,
-  `Div5TotalGTime` String,
-  `Div5LongestGTime` String,
-  `Div5WheelsOff` String,
-  `Div5TailNum` String
-) ENGINE = MergeTree
-PARTITION BY Year
-ORDER BY (Carrier, FlightDate)
-SETTINGS index_granularity = 8192;
-```
-
-Le chargement des données:
-
-``` bash
-$ for i in *.zip; do echo $i; unzip -cq $i '*.csv' | sed 's/\.00//g' | clickhouse-client --host=example-perftest01j --query="INSERT INTO ontime FORMAT CSVWithNames"; done
-```
-
-## Téléchargement des Partitions préparées {#download-of-prepared-partitions}
-
-``` bash
-$ curl -O https://datasets.clickhouse.tech/ontime/partitions/ontime.tar
-$ tar xvf ontime.tar -C /var/lib/clickhouse # path to ClickHouse data directory
-$ # check permissions of unpacked data, fix if required
-$ sudo service clickhouse-server restart
-$ clickhouse-client --query "select count(*) from datasets.ontime"
-```
-
-!!! info "Info"
-    Si vous exécutez les requêtes décrites ci-dessous, vous devez utiliser le nom complet de la table, `datasets.ontime`.
-
-## Requête {#queries}
-
-Q0.
-
-``` sql
-SELECT avg(c1)
-FROM
-(
-    SELECT Year, Month, count(*) AS c1
-    FROM ontime
-    GROUP BY Year, Month
-);
-```
-
-T1. Le nombre de vols par jour de l'année 2000 à 2008
-
-``` sql
-SELECT DayOfWeek, count(*) AS c
-FROM ontime
-WHERE Year>=2000 AND Year<=2008
-GROUP BY DayOfWeek
-ORDER BY c DESC;
-```
-
-T2. Le nombre de vols retardés de plus de 10 minutes, regroupés par jour de la semaine, pour 2000-2008
-
-``` sql
-SELECT DayOfWeek, count(*) AS c
-FROM ontime
-WHERE DepDelay>10 AND Year>=2000 AND Year<=2008
-GROUP BY DayOfWeek
-ORDER BY c DESC;
-```
-
-T3. Le nombre de retards par l'aéroport pour 2000-2008
-
-``` sql
-SELECT Origin, count(*) AS c
-FROM ontime
-WHERE DepDelay>10 AND Year>=2000 AND Year<=2008
-GROUP BY Origin
-ORDER BY c DESC
-LIMIT 10;
-```
-
-T4. Nombre de retards par transporteur pour 2007
-
-``` sql
-SELECT Carrier, count(*)
-FROM ontime
-WHERE DepDelay>10 AND Year=2007
-GROUP BY Carrier
-ORDER BY count(*) DESC;
-```
-
-Q5. Pourcentage de retards par transporteur pour 2007
-
-``` sql
-SELECT Carrier, c, c2, c*100/c2 as c3
-FROM
-(
-    SELECT
-        Carrier,
-        count(*) AS c
-    FROM ontime
-    WHERE DepDelay>10
-        AND Year=2007
-    GROUP BY Carrier
-)
-JOIN
-(
-    SELECT
-        Carrier,
-        count(*) AS c2
-    FROM ontime
-    WHERE Year=2007
-    GROUP BY Carrier
-) USING Carrier
-ORDER BY c3 DESC;
-```
-
-Meilleure version de la même requête:
-
-``` sql
-SELECT Carrier, avg(DepDelay>10)*100 AS c3
-FROM ontime
-WHERE Year=2007
-GROUP BY Carrier
-ORDER BY c3 DESC
-```
-
-Q6. La demande précédente pour une plus large gamme d'années, 2000-2008
-
-``` sql
-SELECT Carrier, c, c2, c*100/c2 as c3
-FROM
-(
-    SELECT
-        Carrier,
-        count(*) AS c
-    FROM ontime
-    WHERE DepDelay>10
-        AND Year>=2000 AND Year<=2008
-    GROUP BY Carrier
-)
-JOIN
-(
-    SELECT
-        Carrier,
-        count(*) AS c2
-    FROM ontime
-    WHERE Year>=2000 AND Year<=2008
-    GROUP BY Carrier
-) USING Carrier
-ORDER BY c3 DESC;
-```
-
-Meilleure version de la même requête:
-
-``` sql
-SELECT Carrier, avg(DepDelay>10)*100 AS c3
-FROM ontime
-WHERE Year>=2000 AND Year<=2008
-GROUP BY Carrier
-ORDER BY c3 DESC;
-```
-
-Q7. Pourcentage de vols retardés de plus de 10 minutes, par année
-
-``` sql
-SELECT Year, c1/c2
-FROM
-(
-    select
-        Year,
-        count(*)*100 as c1
-    from ontime
-    WHERE DepDelay>10
-    GROUP BY Year
-)
-JOIN
-(
-    select
-        Year,
-        count(*) as c2
-    from ontime
-    GROUP BY Year
-) USING (Year)
-ORDER BY Year;
-```
-
-Meilleure version de la même requête:
-
-``` sql
-SELECT Year, avg(DepDelay>10)*100
-FROM ontime
-GROUP BY Year
-ORDER BY Year;
-```
-
-Q8. Les destinations les plus populaires par le nombre de villes directement connectées pour différentes plages d'années
-
-``` sql
-SELECT DestCityName, uniqExact(OriginCityName) AS u
-FROM ontime
-WHERE Year >= 2000 and Year <= 2010
-GROUP BY DestCityName
-ORDER BY u DESC LIMIT 10;
-```
-
-Q9.
-
-``` sql
-SELECT Year, count(*) AS c1
-FROM ontime
-GROUP BY Year;
-```
-
-Q10.
-
-``` sql
-SELECT
-   min(Year), max(Year), Carrier, count(*) AS cnt,
-   sum(ArrDelayMinutes>30) AS flights_delayed,
-   round(sum(ArrDelayMinutes>30)/count(*),2) AS rate
-FROM ontime
-WHERE
-   DayOfWeek NOT IN (6,7) AND OriginState NOT IN ('AK', 'HI', 'PR', 'VI')
-   AND DestState NOT IN ('AK', 'HI', 'PR', 'VI')
-   AND FlightDate < '2010-01-01'
-GROUP by Carrier
-HAVING cnt>100000 and max(Year)>1990
-ORDER by rate DESC
-LIMIT 1000;
-```
-
-Bonus:
-
-``` sql
-SELECT avg(cnt)
-FROM
-(
-    SELECT Year,Month,count(*) AS cnt
-    FROM ontime
-    WHERE DepDel15=1
-    GROUP BY Year,Month
-);
-
-SELECT avg(c1) FROM
-(
-    SELECT Year,Month,count(*) AS c1
-    FROM ontime
-    GROUP BY Year,Month
-);
-
-SELECT DestCityName, uniqExact(OriginCityName) AS u
-FROM ontime
-GROUP BY DestCityName
-ORDER BY u DESC
-LIMIT 10;
-
-SELECT OriginCityName, DestCityName, count() AS c
-FROM ontime
-GROUP BY OriginCityName, DestCityName
-ORDER BY c DESC
-LIMIT 10;
-
-SELECT OriginCityName, count() AS c
-FROM ontime
-GROUP BY OriginCityName
-ORDER BY c DESC
-LIMIT 10;
-```
-
-Ce test de performance a été créé par Vadim Tkachenko. Voir:
-
--   https://www.percona.com/blog/2009/10/02/analyzing-air-traffic-performance-with-infobright-and-monetdb/
--   https://www.percona.com/blog/2009/10/26/air-traffic-queries-in-luciddb/
--   https://www.percona.com/blog/2009/11/02/air-traffic-queries-in-infinidb-early-alpha/
--   https://www.percona.com/blog/2014/04/21/using-apache-hadoop-and-impala-together-with-mysql-for-data-analysis/
--   https://www.percona.com/blog/2016/01/07/apache-spark-with-air-ontime-performance-data/
--   http://nickmakos.blogspot.ru/2012/08/analyzing-air-traffic-performance-with.html
-
-[Article Original](https://clickhouse.tech/docs/en/getting_started/example_datasets/ontime/) <!--hide-->
diff --git a/docs/fr/getting-started/example-datasets/star-schema.md b/docs/fr/getting-started/example-datasets/star-schema.md
deleted file mode 100644
index 6a32faaa357..00000000000
--- a/docs/fr/getting-started/example-datasets/star-schema.md
+++ /dev/null
@@ -1,370 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 20
-toc_title: "R\xE9f\xE9rence Du Sch\xE9ma En \xC9toile"
----
-
-# Référence Du Schéma En Étoile {#star-schema-benchmark}
-
-Compilation de dbgen:
-
-``` bash
-$ git clone git@github.com:vadimtk/ssb-dbgen.git
-$ cd ssb-dbgen
-$ make
-```
-
-La production de données:
-
-!!! warning "Attention"
-    Avec `-s 100` dbgen génère 600 millions de lignes (67 Go), tandis que while `-s 1000` il génère 6 milliards de lignes (ce qui prend beaucoup de temps)
-
-``` bash
-$ ./dbgen -s 1000 -T c
-$ ./dbgen -s 1000 -T l
-$ ./dbgen -s 1000 -T p
-$ ./dbgen -s 1000 -T s
-$ ./dbgen -s 1000 -T d
-```
-
-Création de tables dans ClickHouse:
-
-``` sql
-CREATE TABLE customer
-(
-        C_CUSTKEY       UInt32,
-        C_NAME          String,
-        C_ADDRESS       String,
-        C_CITY          LowCardinality(String),
-        C_NATION        LowCardinality(String),
-        C_REGION        LowCardinality(String),
-        C_PHONE         String,
-        C_MKTSEGMENT    LowCardinality(String)
-)
-ENGINE = MergeTree ORDER BY (C_CUSTKEY);
-
-CREATE TABLE lineorder
-(
-    LO_ORDERKEY             UInt32,
-    LO_LINENUMBER           UInt8,
-    LO_CUSTKEY              UInt32,
-    LO_PARTKEY              UInt32,
-    LO_SUPPKEY              UInt32,
-    LO_ORDERDATE            Date,
-    LO_ORDERPRIORITY        LowCardinality(String),
-    LO_SHIPPRIORITY         UInt8,
-    LO_QUANTITY             UInt8,
-    LO_EXTENDEDPRICE        UInt32,
-    LO_ORDTOTALPRICE        UInt32,
-    LO_DISCOUNT             UInt8,
-    LO_REVENUE              UInt32,
-    LO_SUPPLYCOST           UInt32,
-    LO_TAX                  UInt8,
-    LO_COMMITDATE           Date,
-    LO_SHIPMODE             LowCardinality(String)
-)
-ENGINE = MergeTree PARTITION BY toYear(LO_ORDERDATE) ORDER BY (LO_ORDERDATE, LO_ORDERKEY);
-
-CREATE TABLE part
-(
-        P_PARTKEY       UInt32,
-        P_NAME          String,
-        P_MFGR          LowCardinality(String),
-        P_CATEGORY      LowCardinality(String),
-        P_BRAND         LowCardinality(String),
-        P_COLOR         LowCardinality(String),
-        P_TYPE          LowCardinality(String),
-        P_SIZE          UInt8,
-        P_CONTAINER     LowCardinality(String)
-)
-ENGINE = MergeTree ORDER BY P_PARTKEY;
-
-CREATE TABLE supplier
-(
-        S_SUPPKEY       UInt32,
-        S_NAME          String,
-        S_ADDRESS       String,
-        S_CITY          LowCardinality(String),
-        S_NATION        LowCardinality(String),
-        S_REGION        LowCardinality(String),
-        S_PHONE         String
-)
-ENGINE = MergeTree ORDER BY S_SUPPKEY;
-```
-
-Insertion de données:
-
-``` bash
-$ clickhouse-client --query "INSERT INTO customer FORMAT CSV" < customer.tbl
-$ clickhouse-client --query "INSERT INTO part FORMAT CSV" < part.tbl
-$ clickhouse-client --query "INSERT INTO supplier FORMAT CSV" < supplier.tbl
-$ clickhouse-client --query "INSERT INTO lineorder FORMAT CSV" < lineorder.tbl
-```
-
-Conversion “star schema” pour dénormalisée “flat schema”:
-
-``` sql
-SET max_memory_usage = 20000000000;
-
-CREATE TABLE lineorder_flat
-ENGINE = MergeTree
-PARTITION BY toYear(LO_ORDERDATE)
-ORDER BY (LO_ORDERDATE, LO_ORDERKEY) AS
-SELECT
-    l.LO_ORDERKEY AS LO_ORDERKEY,
-    l.LO_LINENUMBER AS LO_LINENUMBER,
-    l.LO_CUSTKEY AS LO_CUSTKEY,
-    l.LO_PARTKEY AS LO_PARTKEY,
-    l.LO_SUPPKEY AS LO_SUPPKEY,
-    l.LO_ORDERDATE AS LO_ORDERDATE,
-    l.LO_ORDERPRIORITY AS LO_ORDERPRIORITY,
-    l.LO_SHIPPRIORITY AS LO_SHIPPRIORITY,
-    l.LO_QUANTITY AS LO_QUANTITY,
-    l.LO_EXTENDEDPRICE AS LO_EXTENDEDPRICE,
-    l.LO_ORDTOTALPRICE AS LO_ORDTOTALPRICE,
-    l.LO_DISCOUNT AS LO_DISCOUNT,
-    l.LO_REVENUE AS LO_REVENUE,
-    l.LO_SUPPLYCOST AS LO_SUPPLYCOST,
-    l.LO_TAX AS LO_TAX,
-    l.LO_COMMITDATE AS LO_COMMITDATE,
-    l.LO_SHIPMODE AS LO_SHIPMODE,
-    c.C_NAME AS C_NAME,
-    c.C_ADDRESS AS C_ADDRESS,
-    c.C_CITY AS C_CITY,
-    c.C_NATION AS C_NATION,
-    c.C_REGION AS C_REGION,
-    c.C_PHONE AS C_PHONE,
-    c.C_MKTSEGMENT AS C_MKTSEGMENT,
-    s.S_NAME AS S_NAME,
-    s.S_ADDRESS AS S_ADDRESS,
-    s.S_CITY AS S_CITY,
-    s.S_NATION AS S_NATION,
-    s.S_REGION AS S_REGION,
-    s.S_PHONE AS S_PHONE,
-    p.P_NAME AS P_NAME,
-    p.P_MFGR AS P_MFGR,
-    p.P_CATEGORY AS P_CATEGORY,
-    p.P_BRAND AS P_BRAND,
-    p.P_COLOR AS P_COLOR,
-    p.P_TYPE AS P_TYPE,
-    p.P_SIZE AS P_SIZE,
-    p.P_CONTAINER AS P_CONTAINER
-FROM lineorder AS l
-INNER JOIN customer AS c ON c.C_CUSTKEY = l.LO_CUSTKEY
-INNER JOIN supplier AS s ON s.S_SUPPKEY = l.LO_SUPPKEY
-INNER JOIN part AS p ON p.P_PARTKEY = l.LO_PARTKEY;
-```
-
-Exécution des requêtes:
-
-Q1.1
-
-``` sql
-SELECT sum(LO_EXTENDEDPRICE * LO_DISCOUNT) AS revenue
-FROM lineorder_flat
-WHERE toYear(LO_ORDERDATE) = 1993 AND LO_DISCOUNT BETWEEN 1 AND 3 AND LO_QUANTITY < 25;
-```
-
-Q1.2
-
-``` sql
-SELECT sum(LO_EXTENDEDPRICE * LO_DISCOUNT) AS revenue
-FROM lineorder_flat
-WHERE toYYYYMM(LO_ORDERDATE) = 199401 AND LO_DISCOUNT BETWEEN 4 AND 6 AND LO_QUANTITY BETWEEN 26 AND 35;
-```
-
-Q1.3
-
-``` sql
-SELECT sum(LO_EXTENDEDPRICE * LO_DISCOUNT) AS revenue
-FROM lineorder_flat
-WHERE toISOWeek(LO_ORDERDATE) = 6 AND toYear(LO_ORDERDATE) = 1994
-  AND LO_DISCOUNT BETWEEN 5 AND 7 AND LO_QUANTITY BETWEEN 26 AND 35;
-```
-
-Q2.1
-
-``` sql
-SELECT
-    sum(LO_REVENUE),
-    toYear(LO_ORDERDATE) AS year,
-    P_BRAND
-FROM lineorder_flat
-WHERE P_CATEGORY = 'MFGR#12' AND S_REGION = 'AMERICA'
-GROUP BY
-    year,
-    P_BRAND
-ORDER BY
-    year,
-    P_BRAND;
-```
-
-Q2.2
-
-``` sql
-SELECT
-    sum(LO_REVENUE),
-    toYear(LO_ORDERDATE) AS year,
-    P_BRAND
-FROM lineorder_flat
-WHERE P_BRAND >= 'MFGR#2221' AND P_BRAND <= 'MFGR#2228' AND S_REGION = 'ASIA'
-GROUP BY
-    year,
-    P_BRAND
-ORDER BY
-    year,
-    P_BRAND;
-```
-
-Q2.3
-
-``` sql
-SELECT
-    sum(LO_REVENUE),
-    toYear(LO_ORDERDATE) AS year,
-    P_BRAND
-FROM lineorder_flat
-WHERE P_BRAND = 'MFGR#2239' AND S_REGION = 'EUROPE'
-GROUP BY
-    year,
-    P_BRAND
-ORDER BY
-    year,
-    P_BRAND;
-```
-
-Q3.1
-
-``` sql
-SELECT
-    C_NATION,
-    S_NATION,
-    toYear(LO_ORDERDATE) AS year,
-    sum(LO_REVENUE) AS revenue
-FROM lineorder_flat
-WHERE C_REGION = 'ASIA' AND S_REGION = 'ASIA' AND year >= 1992 AND year <= 1997
-GROUP BY
-    C_NATION,
-    S_NATION,
-    year
-ORDER BY
-    year ASC,
-    revenue DESC;
-```
-
-Q3.2
-
-``` sql
-SELECT
-    C_CITY,
-    S_CITY,
-    toYear(LO_ORDERDATE) AS year,
-    sum(LO_REVENUE) AS revenue
-FROM lineorder_flat
-WHERE C_NATION = 'UNITED STATES' AND S_NATION = 'UNITED STATES' AND year >= 1992 AND year <= 1997
-GROUP BY
-    C_CITY,
-    S_CITY,
-    year
-ORDER BY
-    year ASC,
-    revenue DESC;
-```
-
-Q3.3
-
-``` sql
-SELECT
-    C_CITY,
-    S_CITY,
-    toYear(LO_ORDERDATE) AS year,
-    sum(LO_REVENUE) AS revenue
-FROM lineorder_flat
-WHERE (C_CITY = 'UNITED KI1' OR C_CITY = 'UNITED KI5') AND (S_CITY = 'UNITED KI1' OR S_CITY = 'UNITED KI5') AND year >= 1992 AND year <= 1997
-GROUP BY
-    C_CITY,
-    S_CITY,
-    year
-ORDER BY
-    year ASC,
-    revenue DESC;
-```
-
-Q3.4
-
-``` sql
-SELECT
-    C_CITY,
-    S_CITY,
-    toYear(LO_ORDERDATE) AS year,
-    sum(LO_REVENUE) AS revenue
-FROM lineorder_flat
-WHERE (C_CITY = 'UNITED KI1' OR C_CITY = 'UNITED KI5') AND (S_CITY = 'UNITED KI1' OR S_CITY = 'UNITED KI5') AND toYYYYMM(LO_ORDERDATE) = 199712
-GROUP BY
-    C_CITY,
-    S_CITY,
-    year
-ORDER BY
-    year ASC,
-    revenue DESC;
-```
-
-Q4.1
-
-``` sql
-SELECT
-    toYear(LO_ORDERDATE) AS year,
-    C_NATION,
-    sum(LO_REVENUE - LO_SUPPLYCOST) AS profit
-FROM lineorder_flat
-WHERE C_REGION = 'AMERICA' AND S_REGION = 'AMERICA' AND (P_MFGR = 'MFGR#1' OR P_MFGR = 'MFGR#2')
-GROUP BY
-    year,
-    C_NATION
-ORDER BY
-    year ASC,
-    C_NATION ASC;
-```
-
-Q4.2
-
-``` sql
-SELECT
-    toYear(LO_ORDERDATE) AS year,
-    S_NATION,
-    P_CATEGORY,
-    sum(LO_REVENUE - LO_SUPPLYCOST) AS profit
-FROM lineorder_flat
-WHERE C_REGION = 'AMERICA' AND S_REGION = 'AMERICA' AND (year = 1997 OR year = 1998) AND (P_MFGR = 'MFGR#1' OR P_MFGR = 'MFGR#2')
-GROUP BY
-    year,
-    S_NATION,
-    P_CATEGORY
-ORDER BY
-    year ASC,
-    S_NATION ASC,
-    P_CATEGORY ASC;
-```
-
-Q4.3
-
-``` sql
-SELECT
-    toYear(LO_ORDERDATE) AS year,
-    S_CITY,
-    P_BRAND,
-    sum(LO_REVENUE - LO_SUPPLYCOST) AS profit
-FROM lineorder_flat
-WHERE S_NATION = 'UNITED STATES' AND (year = 1997 OR year = 1998) AND P_CATEGORY = 'MFGR#14'
-GROUP BY
-    year,
-    S_CITY,
-    P_BRAND
-ORDER BY
-    year ASC,
-    S_CITY ASC,
-    P_BRAND ASC;
-```
-
-[Article Original](https://clickhouse.tech/docs/en/getting_started/example_datasets/star_schema/) <!--hide-->
diff --git a/docs/fr/getting-started/example-datasets/wikistat.md b/docs/fr/getting-started/example-datasets/wikistat.md
deleted file mode 100644
index cecd5ef0728..00000000000
--- a/docs/fr/getting-started/example-datasets/wikistat.md
+++ /dev/null
@@ -1,35 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 18
-toc_title: WikiStat
----
-
-# WikiStat {#wikistat}
-
-Voir: http://dumps.wikimedia.org/other/pagecounts-raw/
-
-Création d'une table:
-
-``` sql
-CREATE TABLE wikistat
-(
-    date Date,
-    time DateTime,
-    project String,
-    subproject String,
-    path String,
-    hits UInt64,
-    size UInt64
-) ENGINE = MergeTree(date, (path, time), 8192);
-```
-
-Le chargement des données:
-
-``` bash
-$ for i in {2007..2016}; do for j in {01..12}; do echo $i-$j >&2; curl -sSL "http://dumps.wikimedia.org/other/pagecounts-raw/$i/$i-$j/" | grep -oE 'pagecounts-[0-9]+-[0-9]+\.gz'; done; done | sort | uniq | tee links.txt
-$ cat links.txt | while read link; do wget http://dumps.wikimedia.org/other/pagecounts-raw/$(echo $link | sed -r 's/pagecounts-([0-9]{4})([0-9]{2})[0-9]{2}-[0-9]+\.gz/\1/')/$(echo $link | sed -r 's/pagecounts-([0-9]{4})([0-9]{2})[0-9]{2}-[0-9]+\.gz/\1-\2/')/$link; done
-$ ls -1 /opt/wikistat/ | grep gz | while read i; do echo $i; gzip -cd /opt/wikistat/$i | ./wikistat-loader --time="$(echo -n $i | sed -r 's/pagecounts-([0-9]{4})([0-9]{2})([0-9]{2})-([0-9]{2})([0-9]{2})([0-9]{2})\.gz/\1-\2-\3 \4-00-00/')" | clickhouse-client --query="INSERT INTO wikistat FORMAT TabSeparated"; done
-```
-
-[Article Original](https://clickhouse.tech/docs/en/getting_started/example_datasets/wikistat/) <!--hide-->
diff --git a/docs/fr/getting-started/index.md b/docs/fr/getting-started/index.md
deleted file mode 100644
index 3b90ff92b89..00000000000
--- a/docs/fr/getting-started/index.md
+++ /dev/null
@@ -1,17 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: Prise En Main
-toc_hidden: true
-toc_priority: 8
-toc_title: "cach\xE9s"
----
-
-# Prise En Main {#getting-started}
-
-Si vous êtes nouveau à ClickHouse et que vous voulez obtenir un sentiment pratique de sa performance, tout d'abord, vous devez passer par le [processus d'installation](install.md). Après cela, vous pouvez:
-
--   [Passez par tutoriel détaillé](tutorial.md)
--   [Expérience avec des exemples de jeux de données](example-datasets/ontime.md)
-
-[Article Original](https://clickhouse.tech/docs/en/getting_started/) <!--hide-->
diff --git a/docs/fr/getting-started/install.md b/docs/fr/getting-started/install.md
deleted file mode 100644
index db014bec974..00000000000
--- a/docs/fr/getting-started/install.md
+++ /dev/null
@@ -1,182 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 11
-toc_title: Installation
----
-
-# Installation {#installation}
-
-## Configuration Système Requise {#system-requirements}
-
-ClickHouse peut fonctionner sur N'importe quel Linux, FreeBSD ou Mac OS X avec une architecture CPU x86_64, AArch64 ou PowerPC64LE.
-
-Les binaires pré-construits officiels sont généralement compilés pour le jeu d'instructions x86_64 et leverage SSE 4.2, donc sauf indication contraire, l'utilisation du processeur qui le prend en charge devient une exigence système supplémentaire. Voici la commande pour vérifier si le processeur actuel prend en charge SSE 4.2:
-
-``` bash
-$ grep -q sse4_2 /proc/cpuinfo && echo "SSE 4.2 supported" || echo "SSE 4.2 not supported"
-```
-
-Pour exécuter ClickHouse sur des processeurs qui ne prennent pas en charge SSE 4.2 ou qui ont une architecture AArch64 ou PowerPC64LE, vous devez [construire ClickHouse à partir de sources](#from-sources) avec des ajustements de configuration appropriés.
-
-## Options D'Installation Disponibles {#available-installation-options}
-
-### À partir de paquets DEB {#install-from-deb-packages}
-
-Il est recommandé d'utiliser officiel pré-compilé `deb` Paquets Pour Debian ou Ubuntu. Exécutez ces commandes pour installer les paquets:
-
-``` bash
-{% include 'install/deb.sh' %}
-```
-
-Si vous souhaitez utiliser la version la plus récente, remplacer `stable` avec `testing` (ceci est recommandé pour vos environnements de test).
-
-Vous pouvez également télécharger et installer des paquets manuellement à partir de [ici](https://repo.clickhouse.tech/deb/stable/main/).
-
-#### Paquet {#packages}
-
--   `clickhouse-common-static` — Installs ClickHouse compiled binary files.
--   `clickhouse-server` — Creates a symbolic link for `clickhouse-server` et installe la configuration du serveur par défaut.
--   `clickhouse-client` — Creates a symbolic link for `clickhouse-client` et d'autres outils. et installe les fichiers de configuration du client.
--   `clickhouse-common-static-dbg` — Installs ClickHouse compiled binary files with debug info.
-
-### À partir de paquets RPM {#from-rpm-packages}
-
-Il est recommandé d'utiliser officiel pré-compilé `rpm` packages pour CentOS, RedHat et toutes les autres distributions Linux basées sur rpm.
-
-Tout d'abord, vous devez ajouter le dépôt officiel:
-
-``` bash
-sudo yum install yum-utils
-sudo rpm --import https://repo.clickhouse.tech/CLICKHOUSE-KEY.GPG
-sudo yum-config-manager --add-repo https://repo.clickhouse.tech/rpm/stable/x86_64
-```
-
-Si vous souhaitez utiliser la version la plus récente, remplacer `stable` avec `testing` (ceci est recommandé pour vos environnements de test). Le `prestable` la balise est parfois trop.
-
-Exécutez ensuite ces commandes pour installer les paquets:
-
-``` bash
-sudo yum install clickhouse-server clickhouse-client
-```
-
-Vous pouvez également télécharger et installer des paquets manuellement à partir de [ici](https://repo.clickhouse.tech/rpm/stable/x86_64).
-
-### À Partir D'Archives Tgz {#from-tgz-archives}
-
-Il est recommandé d'utiliser officiel pré-compilé `tgz` archives pour toutes les distributions Linux, où l'installation de `deb` ou `rpm` les emballages n'est pas possible.
-
-La version requise peut être téléchargée avec `curl` ou `wget` depuis le référentiel https://repo.clickhouse.tech/tgz/.
-Après cela, les archives téléchargées doivent être décompressées et installées avec des scripts d'installation. Exemple pour la dernière version:
-
-``` bash
-export LATEST_VERSION=`curl https://api.github.com/repos/ClickHouse/ClickHouse/tags 2>/dev/null | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+' | head -n 1`
-curl -O https://repo.clickhouse.tech/tgz/clickhouse-common-static-$LATEST_VERSION.tgz
-curl -O https://repo.clickhouse.tech/tgz/clickhouse-common-static-dbg-$LATEST_VERSION.tgz
-curl -O https://repo.clickhouse.tech/tgz/clickhouse-server-$LATEST_VERSION.tgz
-curl -O https://repo.clickhouse.tech/tgz/clickhouse-client-$LATEST_VERSION.tgz
-
-tar -xzvf clickhouse-common-static-$LATEST_VERSION.tgz
-sudo clickhouse-common-static-$LATEST_VERSION/install/doinst.sh
-
-tar -xzvf clickhouse-common-static-dbg-$LATEST_VERSION.tgz
-sudo clickhouse-common-static-dbg-$LATEST_VERSION/install/doinst.sh
-
-tar -xzvf clickhouse-server-$LATEST_VERSION.tgz
-sudo clickhouse-server-$LATEST_VERSION/install/doinst.sh
-sudo /etc/init.d/clickhouse-server start
-
-tar -xzvf clickhouse-client-$LATEST_VERSION.tgz
-sudo clickhouse-client-$LATEST_VERSION/install/doinst.sh
-```
-
-Pour les environnements de production, il est recommandé d'utiliser la dernière `stable`-version. Vous pouvez trouver son numéro sur la page GitHub https://github.com/ClickHouse/ClickHouse/tags avec postfix `-stable`.
-
-### À Partir De L'Image Docker {#from-docker-image}
-
-Pour exécuter Clickhouse à L'intérieur Docker suivez le guide sur [Hub Docker](https://hub.docker.com/r/yandex/clickhouse-server/). Ces images utilisent officiel `deb` les paquets à l'intérieur.
-
-### À Partir De Sources {#from-sources}
-
-Pour compiler manuellement ClickHouse, suivez les instructions pour [Linux](../development/build.md) ou [Mac OS X](../development/build-osx.md).
-
-Vous pouvez compiler des paquets et les installer ou utiliser des programmes sans installer de paquets. En outre, en construisant manuellement, vous pouvez désactiver L'exigence SSE 4.2 ou construire pour les processeurs AArch64.
-
-      Client: programs/clickhouse-client
-      Server: programs/clickhouse-server
-
-Vous devrez créer un dossier de données et de métadonnées et `chown` pour l'utilisateur souhaité. Leurs chemins peuvent être modifiés dans la configuration du serveur (src / programs / server / config.xml), par défaut, ils sont:
-
-      /opt/clickhouse/data/default/
-      /opt/clickhouse/metadata/default/
-
-Sur Gentoo, vous pouvez simplement utiliser `emerge clickhouse` pour installer ClickHouse à partir de sources.
-
-## Lancer {#launch}
-
-Pour démarrer le serveur en tant que démon, exécutez:
-
-``` bash
-$ sudo service clickhouse-server start
-```
-
-Si vous n'avez pas `service` commande, exécuter comme
-
-``` bash
-$ sudo /etc/init.d/clickhouse-server start
-```
-
-Voir les journaux dans le `/var/log/clickhouse-server/` répertoire.
-
-Si le serveur ne démarre pas, vérifiez les configurations dans le fichier `/etc/clickhouse-server/config.xml`.
-
-Vous pouvez également lancer manuellement le serveur à partir de la console:
-
-``` bash
-$ clickhouse-server --config-file=/etc/clickhouse-server/config.xml
-```
-
-Dans ce cas, le journal sera imprimé sur la console, ce qui est pratique lors du développement.
-Si le fichier de configuration se trouve dans le répertoire courant, vous n'avez pas besoin `--config-file` paramètre. Par défaut, il utilise `./config.xml`.
-
-ClickHouse prend en charge les paramètres de restriction d'accès. Ils sont situés dans la `users.xml` fichier (à côté de `config.xml`).
-Par défaut, l'accès est autorisé depuis n'importe où pour `default` l'utilisateur, sans un mot de passe. Voir `user/default/networks`.
-Pour plus d'informations, consultez la section [“Configuration Files”](../operations/configuration-files.md).
-
-Après le lancement du serveur, vous pouvez utiliser le client de ligne de commande pour vous y connecter:
-
-``` bash
-$ clickhouse-client
-```
-
-Par défaut, il se connecte à `localhost:9000` au nom de l'utilisateur `default` sans un mot de passe. Il peut également être utilisé pour se connecter à un serveur distant en utilisant `--host` argument.
-
-Le terminal doit utiliser L'encodage UTF-8.
-Pour plus d'informations, consultez la section [“Command-line client”](../interfaces/cli.md).
-
-Exemple:
-
-``` bash
-$ ./clickhouse-client
-ClickHouse client version 0.0.18749.
-Connecting to localhost:9000.
-Connected to ClickHouse server version 0.0.18749.
-
-:) SELECT 1
-
-SELECT 1
-
-┌─1─┐
-│ 1 │
-└───┘
-
-1 rows in set. Elapsed: 0.003 sec.
-
-:)
-```
-
-**Félicitations, le système fonctionne!**
-
-Pour continuer à expérimenter, vous pouvez télécharger l'un des jeux de données de test ou passer par [tutoriel](https://clickhouse.tech/tutorial.html).
-
-[Article Original](https://clickhouse.tech/docs/en/getting_started/install/) <!--hide-->
diff --git a/docs/fr/getting-started/playground.md b/docs/fr/getting-started/playground.md
deleted file mode 100644
index 6ddded13782..00000000000
--- a/docs/fr/getting-started/playground.md
+++ /dev/null
@@ -1,48 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 14
-toc_title: "R\xE9cr\xE9ation"
----
-
-# Clickhouse Aire De Jeux {#clickhouse-playground}
-
-[Clickhouse Aire De Jeux](https://play.clickhouse.tech?file=welcome) permet aux utilisateurs d'expérimenter avec ClickHouse en exécutant des requêtes instantanément, sans configurer leur serveur ou leur cluster.
-Plusieurs exemples de jeux de données sont disponibles dans le terrain de jeu ainsi que des exemples de requêtes qui montrent les fonctionnalités de ClickHouse.
-
-Les requêtes sont exécutées comme un utilisateur en lecture seule. Cela implique certaines limites:
-
--   Les requêtes DDL ne sont pas autorisées
--   Les requêtes D'insertion ne sont pas autorisées
-
-Les paramètres suivants sont également appliquées:
-- [`max_result_bytes=10485760`](../operations/settings/query_complexity/#max-result-bytes)
-- [`max_result_rows=2000`](../operations/settings/query_complexity/#setting-max_result_rows)
-- [`result_overflow_mode=break`](../operations/settings/query_complexity/#result-overflow-mode)
-- [`max_execution_time=60000`](../operations/settings/query_complexity/#max-execution-time)
-
-Clickhouse Playground donne l'expérience du m2.Petite
-[Service géré pour ClickHouse](https://cloud.yandex.com/services/managed-clickhouse)
-exemple hébergé dans [Yandex.Nuage](https://cloud.yandex.com/).
-Plus d'informations sur [les fournisseurs de cloud](../commercial/cloud.md).
-
-Clickhouse Playground interface web fait des demandes via ClickHouse [HTTP API](../interfaces/http.md).
-Le backend Playground est juste un cluster ClickHouse sans aucune application Côté Serveur supplémentaire.
-ClickHouse HTTPS endpoint est également disponible dans le cadre du terrain de jeu.
-
-Vous pouvez effectuer des requêtes sur playground en utilisant n'importe quel client HTTP, par exemple [curl](https://curl.haxx.se) ou [wget](https://www.gnu.org/software/wget/), ou configurer une connexion en utilisant [JDBC](../interfaces/jdbc.md) ou [ODBC](../interfaces/odbc.md) pilote.
-Plus d'informations sur les produits logiciels qui prennent en charge ClickHouse est disponible [ici](../interfaces/index.md).
-
-| Paramètre    | Valeur                                        |
-|:-------------|:----------------------------------------------|
-| Terminaison  | https://play-api.clickhouse.technologie: 8443 |
-| Utilisateur  | `playground`                                  |
-| Mot de passe | `clickhouse`                                  |
-
-Notez que ce paramètre nécessite une connexion sécurisée.
-
-Exemple:
-
-``` bash
-curl "https://play-api.clickhouse.tech:8443/?query=SELECT+'Play+ClickHouse!';&user=playground&password=clickhouse&database=datasets"
-```
diff --git a/docs/fr/getting-started/tutorial.md b/docs/fr/getting-started/tutorial.md
deleted file mode 100644
index 839af7aeb84..00000000000
--- a/docs/fr/getting-started/tutorial.md
+++ /dev/null
@@ -1,664 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 12
-toc_title: Tutoriel
----
-
-# Tutoriel ClickHouse {#clickhouse-tutorial}
-
-## À quoi S'attendre de ce tutoriel? {#what-to-expect-from-this-tutorial}
-
-En parcourant ce tutoriel, vous apprendrez à configurer un cluster ClickHouse simple. Ce sera petit, mais tolérant aux pannes et évolutif. Ensuite, nous utiliserons l'un des exemples de jeux de données pour le remplir de données et exécuter des requêtes de démonstration.
-
-## Configuration De Noeud Unique {#single-node-setup}
-
-Pour retarder les complexités d'un environnement distribué, nous allons commencer par déployer ClickHouse sur un seul serveur ou une machine virtuelle. ClickHouse est généralement installé à partir de [deb](install.md#install-from-deb-packages) ou [tr / min](install.md#from-rpm-packages) les paquets, mais il y a [alternative](install.md#from-docker-image) pour les systèmes d'exploitation qui ne sont pas les soutenir.
-
-Par exemple, vous avez choisi `deb` paquets et exécutés:
-
-``` bash
-{% include 'install/deb.sh' %}
-```
-
-Quelles sont les paquets installés:
-
--   `clickhouse-client` package contient [clickhouse-client](../interfaces/cli.md) application, client interactif de console de ClickHouse.
--   `clickhouse-common` paquet contient un fichier exécutable ClickHouse.
--   `clickhouse-server` package contient des fichiers de configuration pour exécuter ClickHouse en tant que serveur.
-
-Les fichiers de configuration du serveur sont `/etc/clickhouse-server/`. Avant d'aller plus loin, notez le `<path>` élément `config.xml`. Path détermine l'emplacement pour le stockage des données, il doit donc être situé sur le volume avec une grande capacité de disque; la valeur par défaut est `/var/lib/clickhouse/`. Si vous souhaitez ajuster la configuration, il n'est pas pratique de modifier directement `config.xml` fichier, considérant qu'il pourrait obtenir réécrit sur les futures mises à jour du progiciel. La façon recommandée de remplacer les éléments de configuration est de créer [fichiers dans config.d: répertoire](../operations/configuration-files.md) qui servent de “patches” config.XML.
-
-Comme vous l'avez peut-être remarqué, `clickhouse-server` n'est pas lancé automatiquement après l'installation du paquet. Il ne sera pas redémarré automatiquement après les mises à jour, non plus. La façon dont vous démarrez le serveur dépend de votre système d'initialisation, généralement, c'est:
-
-``` bash
-sudo service clickhouse-server start
-```
-
-ou
-
-``` bash
-sudo /etc/init.d/clickhouse-server start
-```
-
-L'emplacement par défaut pour les journaux du serveur est `/var/log/clickhouse-server/`. Le serveur est prêt à gérer les connexions client une fois `Ready for connections` message.
-
-Une fois l' `clickhouse-server` est opérationnel, nous pouvons utiliser `clickhouse-client` pour se connecter au serveur et effectuer des tests de requêtes comme `SELECT "Hello, world!";`.
-
-<details markdown="1">
-
-<summary>Conseils rapides pour clickhouse-client</summary>
-
-Mode interactif:
-
-``` bash
-clickhouse-client
-clickhouse-client --host=... --port=... --user=... --password=...
-```
-
-Activer les requêtes multilignes:
-
-``` bash
-clickhouse-client -m
-clickhouse-client --multiline
-```
-
-Exécuter des requêtes en mode batch:
-
-``` bash
-clickhouse-client --query='SELECT 1'
-echo 'SELECT 1' | clickhouse-client
-clickhouse-client <<< 'SELECT 1'
-```
-
-Insérer des données à partir d'un fichier au format spécifié:
-
-``` bash
-clickhouse-client --query='INSERT INTO table VALUES' < data.txt
-clickhouse-client --query='INSERT INTO table FORMAT TabSeparated' < data.tsv
-```
-
-</details>
-
-## Importer Un Échantillon De Données {#import-sample-dataset}
-
-Maintenant, il est temps de remplir notre serveur ClickHouse avec quelques exemples de données. Dans ce tutoriel, nous allons utiliser les données anonymisées de Yandex.Metrica, le premier service qui exécute ClickHouse en production avant de devenir open-source (plus à ce sujet dans [section d'histoire](../introduction/history.md)). Il y a [plusieurs façons d'importer Yandex.Metrica dataset](example-datasets/metrica.md), et pour le bien du tutoriel, nous irons avec le plus réaliste.
-
-### Télécharger et extraire les données de la Table {#download-and-extract-table-data}
-
-``` bash
-curl https://datasets.clickhouse.tech/hits/tsv/hits_v1.tsv.xz | unxz --threads=`nproc` > hits_v1.tsv
-curl https://datasets.clickhouse.tech/visits/tsv/visits_v1.tsv.xz | unxz --threads=`nproc` > visits_v1.tsv
-```
-
-Les fichiers extraits ont une taille d'environ 10 Go.
-
-### Créer Des Tables {#create-tables}
-
-Comme dans la plupart des systèmes de gestion de bases de données, clickhouse regroupe logiquement les tables en “databases”. Il y a un `default` base de données, mais nous allons en créer une nouvelle nommée `tutorial`:
-
-``` bash
-clickhouse-client --query "CREATE DATABASE IF NOT EXISTS tutorial"
-```
-
-La syntaxe pour créer des tables est beaucoup plus compliquée par rapport aux bases de données (voir [référence](../sql-reference/statements/create.md). En général `CREATE TABLE` déclaration doit spécifier trois choses clés:
-
-1.  Nom de la table à créer.
-2.  Table schema, i.e. list of columns and their [types de données](../sql-reference/data-types/index.md).
-3.  [Tableau moteur](../engines/table-engines/index.md) et ses paramètres, qui détermine tous les détails sur la façon dont les requêtes à cette table seront physiquement exécutées.
-
-Yandex.Metrica est un service d'analyse web, et l'exemple de jeu de données ne couvre pas toutes ses fonctionnalités, il n'y a donc que deux tables à créer:
-
--   `hits` est un tableau avec chaque action effectuée par tous les utilisateurs sur tous les sites couverts par le service.
--   `visits` est une table qui contient des sessions pré-construites au lieu d'actions individuelles.
-
-Voyons et exécutons les vraies requêtes create table pour ces tables:
-
-``` sql
-CREATE TABLE tutorial.hits_v1
-(
-    `WatchID` UInt64,
-    `JavaEnable` UInt8,
-    `Title` String,
-    `GoodEvent` Int16,
-    `EventTime` DateTime,
-    `EventDate` Date,
-    `CounterID` UInt32,
-    `ClientIP` UInt32,
-    `ClientIP6` FixedString(16),
-    `RegionID` UInt32,
-    `UserID` UInt64,
-    `CounterClass` Int8,
-    `OS` UInt8,
-    `UserAgent` UInt8,
-    `URL` String,
-    `Referer` String,
-    `URLDomain` String,
-    `RefererDomain` String,
-    `Refresh` UInt8,
-    `IsRobot` UInt8,
-    `RefererCategories` Array(UInt16),
-    `URLCategories` Array(UInt16),
-    `URLRegions` Array(UInt32),
-    `RefererRegions` Array(UInt32),
-    `ResolutionWidth` UInt16,
-    `ResolutionHeight` UInt16,
-    `ResolutionDepth` UInt8,
-    `FlashMajor` UInt8,
-    `FlashMinor` UInt8,
-    `FlashMinor2` String,
-    `NetMajor` UInt8,
-    `NetMinor` UInt8,
-    `UserAgentMajor` UInt16,
-    `UserAgentMinor` FixedString(2),
-    `CookieEnable` UInt8,
-    `JavascriptEnable` UInt8,
-    `IsMobile` UInt8,
-    `MobilePhone` UInt8,
-    `MobilePhoneModel` String,
-    `Params` String,
-    `IPNetworkID` UInt32,
-    `TraficSourceID` Int8,
-    `SearchEngineID` UInt16,
-    `SearchPhrase` String,
-    `AdvEngineID` UInt8,
-    `IsArtifical` UInt8,
-    `WindowClientWidth` UInt16,
-    `WindowClientHeight` UInt16,
-    `ClientTimeZone` Int16,
-    `ClientEventTime` DateTime,
-    `SilverlightVersion1` UInt8,
-    `SilverlightVersion2` UInt8,
-    `SilverlightVersion3` UInt32,
-    `SilverlightVersion4` UInt16,
-    `PageCharset` String,
-    `CodeVersion` UInt32,
-    `IsLink` UInt8,
-    `IsDownload` UInt8,
-    `IsNotBounce` UInt8,
-    `FUniqID` UInt64,
-    `HID` UInt32,
-    `IsOldCounter` UInt8,
-    `IsEvent` UInt8,
-    `IsParameter` UInt8,
-    `DontCountHits` UInt8,
-    `WithHash` UInt8,
-    `HitColor` FixedString(1),
-    `UTCEventTime` DateTime,
-    `Age` UInt8,
-    `Sex` UInt8,
-    `Income` UInt8,
-    `Interests` UInt16,
-    `Robotness` UInt8,
-    `GeneralInterests` Array(UInt16),
-    `RemoteIP` UInt32,
-    `RemoteIP6` FixedString(16),
-    `WindowName` Int32,
-    `OpenerName` Int32,
-    `HistoryLength` Int16,
-    `BrowserLanguage` FixedString(2),
-    `BrowserCountry` FixedString(2),
-    `SocialNetwork` String,
-    `SocialAction` String,
-    `HTTPError` UInt16,
-    `SendTiming` Int32,
-    `DNSTiming` Int32,
-    `ConnectTiming` Int32,
-    `ResponseStartTiming` Int32,
-    `ResponseEndTiming` Int32,
-    `FetchTiming` Int32,
-    `RedirectTiming` Int32,
-    `DOMInteractiveTiming` Int32,
-    `DOMContentLoadedTiming` Int32,
-    `DOMCompleteTiming` Int32,
-    `LoadEventStartTiming` Int32,
-    `LoadEventEndTiming` Int32,
-    `NSToDOMContentLoadedTiming` Int32,
-    `FirstPaintTiming` Int32,
-    `RedirectCount` Int8,
-    `SocialSourceNetworkID` UInt8,
-    `SocialSourcePage` String,
-    `ParamPrice` Int64,
-    `ParamOrderID` String,
-    `ParamCurrency` FixedString(3),
-    `ParamCurrencyID` UInt16,
-    `GoalsReached` Array(UInt32),
-    `OpenstatServiceName` String,
-    `OpenstatCampaignID` String,
-    `OpenstatAdID` String,
-    `OpenstatSourceID` String,
-    `UTMSource` String,
-    `UTMMedium` String,
-    `UTMCampaign` String,
-    `UTMContent` String,
-    `UTMTerm` String,
-    `FromTag` String,
-    `HasGCLID` UInt8,
-    `RefererHash` UInt64,
-    `URLHash` UInt64,
-    `CLID` UInt32,
-    `YCLID` UInt64,
-    `ShareService` String,
-    `ShareURL` String,
-    `ShareTitle` String,
-    `ParsedParams` Nested(
-        Key1 String,
-        Key2 String,
-        Key3 String,
-        Key4 String,
-        Key5 String,
-        ValueDouble Float64),
-    `IslandID` FixedString(16),
-    `RequestNum` UInt32,
-    `RequestTry` UInt8
-)
-ENGINE = MergeTree()
-PARTITION BY toYYYYMM(EventDate)
-ORDER BY (CounterID, EventDate, intHash32(UserID))
-SAMPLE BY intHash32(UserID)
-```
-
-``` sql
-CREATE TABLE tutorial.visits_v1
-(
-    `CounterID` UInt32,
-    `StartDate` Date,
-    `Sign` Int8,
-    `IsNew` UInt8,
-    `VisitID` UInt64,
-    `UserID` UInt64,
-    `StartTime` DateTime,
-    `Duration` UInt32,
-    `UTCStartTime` DateTime,
-    `PageViews` Int32,
-    `Hits` Int32,
-    `IsBounce` UInt8,
-    `Referer` String,
-    `StartURL` String,
-    `RefererDomain` String,
-    `StartURLDomain` String,
-    `EndURL` String,
-    `LinkURL` String,
-    `IsDownload` UInt8,
-    `TraficSourceID` Int8,
-    `SearchEngineID` UInt16,
-    `SearchPhrase` String,
-    `AdvEngineID` UInt8,
-    `PlaceID` Int32,
-    `RefererCategories` Array(UInt16),
-    `URLCategories` Array(UInt16),
-    `URLRegions` Array(UInt32),
-    `RefererRegions` Array(UInt32),
-    `IsYandex` UInt8,
-    `GoalReachesDepth` Int32,
-    `GoalReachesURL` Int32,
-    `GoalReachesAny` Int32,
-    `SocialSourceNetworkID` UInt8,
-    `SocialSourcePage` String,
-    `MobilePhoneModel` String,
-    `ClientEventTime` DateTime,
-    `RegionID` UInt32,
-    `ClientIP` UInt32,
-    `ClientIP6` FixedString(16),
-    `RemoteIP` UInt32,
-    `RemoteIP6` FixedString(16),
-    `IPNetworkID` UInt32,
-    `SilverlightVersion3` UInt32,
-    `CodeVersion` UInt32,
-    `ResolutionWidth` UInt16,
-    `ResolutionHeight` UInt16,
-    `UserAgentMajor` UInt16,
-    `UserAgentMinor` UInt16,
-    `WindowClientWidth` UInt16,
-    `WindowClientHeight` UInt16,
-    `SilverlightVersion2` UInt8,
-    `SilverlightVersion4` UInt16,
-    `FlashVersion3` UInt16,
-    `FlashVersion4` UInt16,
-    `ClientTimeZone` Int16,
-    `OS` UInt8,
-    `UserAgent` UInt8,
-    `ResolutionDepth` UInt8,
-    `FlashMajor` UInt8,
-    `FlashMinor` UInt8,
-    `NetMajor` UInt8,
-    `NetMinor` UInt8,
-    `MobilePhone` UInt8,
-    `SilverlightVersion1` UInt8,
-    `Age` UInt8,
-    `Sex` UInt8,
-    `Income` UInt8,
-    `JavaEnable` UInt8,
-    `CookieEnable` UInt8,
-    `JavascriptEnable` UInt8,
-    `IsMobile` UInt8,
-    `BrowserLanguage` UInt16,
-    `BrowserCountry` UInt16,
-    `Interests` UInt16,
-    `Robotness` UInt8,
-    `GeneralInterests` Array(UInt16),
-    `Params` Array(String),
-    `Goals` Nested(
-        ID UInt32,
-        Serial UInt32,
-        EventTime DateTime,
-        Price Int64,
-        OrderID String,
-        CurrencyID UInt32),
-    `WatchIDs` Array(UInt64),
-    `ParamSumPrice` Int64,
-    `ParamCurrency` FixedString(3),
-    `ParamCurrencyID` UInt16,
-    `ClickLogID` UInt64,
-    `ClickEventID` Int32,
-    `ClickGoodEvent` Int32,
-    `ClickEventTime` DateTime,
-    `ClickPriorityID` Int32,
-    `ClickPhraseID` Int32,
-    `ClickPageID` Int32,
-    `ClickPlaceID` Int32,
-    `ClickTypeID` Int32,
-    `ClickResourceID` Int32,
-    `ClickCost` UInt32,
-    `ClickClientIP` UInt32,
-    `ClickDomainID` UInt32,
-    `ClickURL` String,
-    `ClickAttempt` UInt8,
-    `ClickOrderID` UInt32,
-    `ClickBannerID` UInt32,
-    `ClickMarketCategoryID` UInt32,
-    `ClickMarketPP` UInt32,
-    `ClickMarketCategoryName` String,
-    `ClickMarketPPName` String,
-    `ClickAWAPSCampaignName` String,
-    `ClickPageName` String,
-    `ClickTargetType` UInt16,
-    `ClickTargetPhraseID` UInt64,
-    `ClickContextType` UInt8,
-    `ClickSelectType` Int8,
-    `ClickOptions` String,
-    `ClickGroupBannerID` Int32,
-    `OpenstatServiceName` String,
-    `OpenstatCampaignID` String,
-    `OpenstatAdID` String,
-    `OpenstatSourceID` String,
-    `UTMSource` String,
-    `UTMMedium` String,
-    `UTMCampaign` String,
-    `UTMContent` String,
-    `UTMTerm` String,
-    `FromTag` String,
-    `HasGCLID` UInt8,
-    `FirstVisit` DateTime,
-    `PredLastVisit` Date,
-    `LastVisit` Date,
-    `TotalVisits` UInt32,
-    `TraficSource` Nested(
-        ID Int8,
-        SearchEngineID UInt16,
-        AdvEngineID UInt8,
-        PlaceID UInt16,
-        SocialSourceNetworkID UInt8,
-        Domain String,
-        SearchPhrase String,
-        SocialSourcePage String),
-    `Attendance` FixedString(16),
-    `CLID` UInt32,
-    `YCLID` UInt64,
-    `NormalizedRefererHash` UInt64,
-    `SearchPhraseHash` UInt64,
-    `RefererDomainHash` UInt64,
-    `NormalizedStartURLHash` UInt64,
-    `StartURLDomainHash` UInt64,
-    `NormalizedEndURLHash` UInt64,
-    `TopLevelDomain` UInt64,
-    `URLScheme` UInt64,
-    `OpenstatServiceNameHash` UInt64,
-    `OpenstatCampaignIDHash` UInt64,
-    `OpenstatAdIDHash` UInt64,
-    `OpenstatSourceIDHash` UInt64,
-    `UTMSourceHash` UInt64,
-    `UTMMediumHash` UInt64,
-    `UTMCampaignHash` UInt64,
-    `UTMContentHash` UInt64,
-    `UTMTermHash` UInt64,
-    `FromHash` UInt64,
-    `WebVisorEnabled` UInt8,
-    `WebVisorActivity` UInt32,
-    `ParsedParams` Nested(
-        Key1 String,
-        Key2 String,
-        Key3 String,
-        Key4 String,
-        Key5 String,
-        ValueDouble Float64),
-    `Market` Nested(
-        Type UInt8,
-        GoalID UInt32,
-        OrderID String,
-        OrderPrice Int64,
-        PP UInt32,
-        DirectPlaceID UInt32,
-        DirectOrderID UInt32,
-        DirectBannerID UInt32,
-        GoodID String,
-        GoodName String,
-        GoodQuantity Int32,
-        GoodPrice Int64),
-    `IslandID` FixedString(16)
-)
-ENGINE = CollapsingMergeTree(Sign)
-PARTITION BY toYYYYMM(StartDate)
-ORDER BY (CounterID, StartDate, intHash32(UserID), VisitID)
-SAMPLE BY intHash32(UserID)
-```
-
-Vous pouvez exécuter ces requêtes en utilisant le mode interactif de `clickhouse-client` (lancez - le simplement dans un terminal sans spécifier une requête à l'avance) ou essayez-en [interface de rechange](../interfaces/index.md) Si tu veux.
-
-Comme nous pouvons le voir, `hits_v1` utilise la [moteur MergeTree de base](../engines/table-engines/mergetree-family/mergetree.md) tandis que le `visits_v1` utilise la [Effondrer](../engines/table-engines/mergetree-family/collapsingmergetree.md) variante.
-
-### Importer Des Données {#import-data}
-
-L'importation de données vers ClickHouse se fait via [INSERT INTO](../sql-reference/statements/insert-into.md) requête comme dans de nombreuses autres bases de données SQL. Toutefois, les données sont généralement fournies dans l'une des [formats de sérialisation pris en charge](../interfaces/formats.md) plutôt `VALUES` clause (qui est également pris en charge).
-
-Les fichiers que nous avons téléchargés plus tôt sont au format séparé par des onglets, alors voici comment les importer via le client console:
-
-``` bash
-clickhouse-client --query "INSERT INTO tutorial.hits_v1 FORMAT TSV" --max_insert_block_size=100000 < hits_v1.tsv
-clickhouse-client --query "INSERT INTO tutorial.visits_v1 FORMAT TSV" --max_insert_block_size=100000 < visits_v1.tsv
-```
-
-ClickHouse a beaucoup de [les paramètres de tune](../operations/settings/index.md) et une façon de Les spécifier dans le client console est via des arguments, comme nous pouvons le voir avec `--max_insert_block_size`. La façon la plus simple de comprendre quels paramètres sont disponibles, que signifient-ils et quelles sont les valeurs par défaut est d'interroger le `system.settings` table:
-
-``` sql
-SELECT name, value, changed, description
-FROM system.settings
-WHERE name LIKE '%max_insert_b%'
-FORMAT TSV
-
-max_insert_block_size    1048576    0    "The maximum block size for insertion, if we control the creation of blocks for insertion."
-```
-
-Optionnellement, vous pouvez [OPTIMIZE](../sql-reference/statements/misc.md#misc_operations-optimize) les tables après l'importation. Les Tables configurées avec un moteur de MergeTree-family font toujours des fusions de parties de données en arrière-plan pour optimiser le stockage des données (ou au moins vérifier si cela a du sens). Ces requêtes forcent le moteur de table à optimiser le stockage dès maintenant au lieu d'un certain temps plus tard:
-
-``` bash
-clickhouse-client --query "OPTIMIZE TABLE tutorial.hits_v1 FINAL"
-clickhouse-client --query "OPTIMIZE TABLE tutorial.visits_v1 FINAL"
-```
-
-Ces requêtes démarrent une opération intensive D'E/S et de CPU, donc si la table reçoit systématiquement de nouvelles données, il est préférable de la laisser seule et de laisser les fusions s'exécuter en arrière-plan.
-
-Maintenant, nous pouvons vérifier si l'importation de table a réussi:
-
-``` bash
-clickhouse-client --query "SELECT COUNT(*) FROM tutorial.hits_v1"
-clickhouse-client --query "SELECT COUNT(*) FROM tutorial.visits_v1"
-```
-
-## Exemple De Requêtes {#example-queries}
-
-``` sql
-SELECT
-    StartURL AS URL,
-    AVG(Duration) AS AvgDuration
-FROM tutorial.visits_v1
-WHERE StartDate BETWEEN '2014-03-23' AND '2014-03-30'
-GROUP BY URL
-ORDER BY AvgDuration DESC
-LIMIT 10
-```
-
-``` sql
-SELECT
-    sum(Sign) AS visits,
-    sumIf(Sign, has(Goals.ID, 1105530)) AS goal_visits,
-    (100. * goal_visits) / visits AS goal_percent
-FROM tutorial.visits_v1
-WHERE (CounterID = 912887) AND (toYYYYMM(StartDate) = 201403) AND (domain(StartURL) = 'yandex.ru')
-```
-
-## Déploiement De Cluster {#cluster-deployment}
-
-Clickhouse cluster est un cluster homogène. Étapes pour configurer:
-
-1.  Installer clickhouse server sur toutes les machines du cluster
-2.  Configurer les configurations de cluster dans les fichiers de configuration
-3.  Créer des tables locales sur chaque instance
-4.  Créer un [Distribué table](../engines/table-engines/special/distributed.md)
-
-[Distribué table](../engines/table-engines/special/distributed.md) est en fait une sorte de “view” aux tables locales du cluster ClickHouse. SELECT query from a distributed table s'exécute à l'aide des ressources de tous les fragments du cluster. Vous pouvez spécifier des configurations pour plusieurs clusters et créer plusieurs tables distribuées fournissant des vues à différents clusters.
-
-Exemple de configuration pour un cluster avec trois fragments, une réplique chacun:
-
-``` xml
-<remote_servers>
-    <perftest_3shards_1replicas>
-        <shard>
-            <replica>
-                <host>example-perftest01j.yandex.ru</host>
-                <port>9000</port>
-            </replica>
-        </shard>
-        <shard>
-            <replica>
-                <host>example-perftest02j.yandex.ru</host>
-                <port>9000</port>
-            </replica>
-        </shard>
-        <shard>
-            <replica>
-                <host>example-perftest03j.yandex.ru</host>
-                <port>9000</port>
-            </replica>
-        </shard>
-    </perftest_3shards_1replicas>
-</remote_servers>
-```
-
-Pour plus de démonstration, créons une nouvelle table locale avec le même `CREATE TABLE` la requête que nous avons utilisé pour `hits_v1`, mais nom de table différent:
-
-``` sql
-CREATE TABLE tutorial.hits_local (...) ENGINE = MergeTree() ...
-```
-
-Création d'une table distribuée fournissant une vue dans les tables locales du cluster:
-
-``` sql
-CREATE TABLE tutorial.hits_all AS tutorial.hits_local
-ENGINE = Distributed(perftest_3shards_1replicas, tutorial, hits_local, rand());
-```
-
-Une pratique courante consiste à créer des tables distribuées similaires sur toutes les machines du cluster. Il permet d'exécuter des requêtes distribuées sur n'importe quelle machine du cluster. Il existe également une autre option pour créer une table distribuée temporaire pour une requête SELECT donnée en utilisant [distant](../sql-reference/table-functions/remote.md) table de fonction.
-
-Passons à l'exécution de [INSERT SELECT](../sql-reference/statements/insert-into.md) dans les Distribué table la table à plusieurs serveurs.
-
-``` sql
-INSERT INTO tutorial.hits_all SELECT * FROM tutorial.hits_v1;
-```
-
-!!! warning "Avis"
-    Cette approche ne convient pas au sharding de grandes tables. Il y a un outil séparé [clickhouse-copieur](../operations/utilities/clickhouse-copier.md) cela peut re-fragmenter de grandes tables arbitraires.
-
-Comme vous pouvez vous y attendre, les requêtes lourdes de calcul s'exécutent N fois plus vite si elles utilisent 3 serveurs au lieu d'un.
-
-Dans ce cas, nous avons utilisé un cluster avec 3 fragments, et chacun contient une seule réplique.
-
-Pour assurer la résilience dans un environnement de production, nous recommandons que chaque fragment contienne 2-3 répliques réparties entre plusieurs zones de disponibilité ou centres de données (ou au moins des racks). Notez que ClickHouse prend en charge un nombre illimité de répliques.
-
-Exemple de configuration pour un cluster d'un fragment contenant trois répliques:
-
-``` xml
-<remote_servers>
-    ...
-    <perftest_1shards_3replicas>
-        <shard>
-            <replica>
-                <host>example-perftest01j.yandex.ru</host>
-                <port>9000</port>
-             </replica>
-             <replica>
-                <host>example-perftest02j.yandex.ru</host>
-                <port>9000</port>
-             </replica>
-             <replica>
-                <host>example-perftest03j.yandex.ru</host>
-                <port>9000</port>
-             </replica>
-        </shard>
-    </perftest_1shards_3replicas>
-</remote_servers>
-```
-
-Pour activer la réplication native [ZooKeeper](http://zookeeper.apache.org/) est requis. ClickHouse s'occupe de la cohérence des données sur toutes les répliques et exécute automatiquement la procédure de restauration après l'échec. Il est recommandé de déployer le cluster ZooKeeper sur des serveurs séparés (où aucun autre processus, y compris ClickHouse, n'est en cours d'exécution).
-
-!!! note "Note"
-    ZooKeeper est pas une exigence stricte: dans certains cas simples, vous pouvez dupliquer les données par écrit dans tous les réplicas de votre code d'application. Cette approche est **pas** recommandé, dans ce cas, ClickHouse ne sera pas en mesure de garantir la cohérence des données sur toutes les répliques. Ainsi, il devient la responsabilité de votre application.
-
-Les emplacements ZooKeeper sont spécifiés dans le fichier de configuration:
-
-``` xml
-<zookeeper>
-    <node>
-        <host>zoo01.yandex.ru</host>
-        <port>2181</port>
-    </node>
-    <node>
-        <host>zoo02.yandex.ru</host>
-        <port>2181</port>
-    </node>
-    <node>
-        <host>zoo03.yandex.ru</host>
-        <port>2181</port>
-    </node>
-</zookeeper>
-```
-
-En outre, nous devons définir des macros pour identifier chaque fragment et chaque réplique utilisés lors de la création de la table:
-
-``` xml
-<macros>
-    <shard>01</shard>
-    <replica>01</replica>
-</macros>
-```
-
-S'il n'y a pas de répliques pour le moment lors de la création de la table répliquée, une nouvelle première réplique est instanciée. S'il existe déjà des répliques en direct, la nouvelle réplique clone les données de celles existantes. Vous avez la possibilité de créer toutes les tables répliquées d'abord, et ensuite insérer les données. Une autre option consiste à créer des répliques et à en ajouter d'autres Après ou pendant l'insertion des données.
-
-``` sql
-CREATE TABLE tutorial.hits_replica (...)
-ENGINE = ReplcatedMergeTree(
-    '/clickhouse_perftest/tables/{shard}/hits',
-    '{replica}'
-)
-...
-```
-
-Ici, nous utilisons [ReplicatedMergeTree](../engines/table-engines/mergetree-family/replication.md) tableau moteur. Dans les paramètres, nous spécifions le chemin Zookeeper contenant des identificateurs de fragments et de répliques.
-
-``` sql
-INSERT INTO tutorial.hits_replica SELECT * FROM tutorial.hits_local;
-```
-
-La réplication fonctionne en mode multi-maître. Les données peuvent être chargées dans n'importe quel réplica, et le système les synchronise ensuite automatiquement avec d'autres instances. La réplication est asynchrone, donc à un moment donné, toutes les répliques ne peuvent pas contenir de données récemment insérées. Au moins une réplique devrait être en place pour permettre l'ingestion de données. D'autres synchroniseront les données et répareront la cohérence une fois qu'ils redeviendront actifs. Notez que cette approche permet une faible possibilité de perte de données récemment insérées.
-
-[Article Original](https://clickhouse.tech/docs/en/getting_started/tutorial/) <!--hide-->
diff --git a/docs/fr/guides/apply-catboost-model.md b/docs/fr/guides/apply-catboost-model.md
deleted file mode 100644
index 1b6aae9bbbd..00000000000
--- a/docs/fr/guides/apply-catboost-model.md
+++ /dev/null
@@ -1,239 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 41
-toc_title: "Application Des Mod\xE8les CatBoost"
----
-
-# Application D'un modèle Catboost dans ClickHouse {#applying-catboost-model-in-clickhouse}
-
-[CatBoost](https://catboost.ai) est une bibliothèque de dynamisation de gradient libre et open-source développée à [Yandex](https://yandex.com/company/) pour l'apprentissage automatique.
-
-Avec cette instruction, vous apprendrez à appliquer des modèles pré-formés dans ClickHouse en exécutant l'inférence de modèle à partir de SQL.
-
-Pour appliquer un modèle CatBoost dans ClickHouse:
-
-1.  [Créer une Table](#create-table).
-2.  [Insérez les données dans la Table](#insert-data-to-table).
-3.  [Intégrer CatBoost dans ClickHouse](#integrate-catboost-into-clickhouse) (Étape facultative).
-4.  [Exécutez L'inférence du modèle à partir de SQL](#run-model-inference).
-
-Pour plus d'informations sur la formation des modèles CatBoost, voir [Formation et application de modèles](https://catboost.ai/docs/features/training.html#training).
-
-## Préalable {#prerequisites}
-
-Si vous n'avez pas le [Docker](https://docs.docker.com/install/) pourtant, l'installer.
-
-!!! note "Note"
-    [Docker](https://www.docker.com) est une plate-forme logicielle qui vous permet de créer des conteneurs qui isolent une installation CatBoost et ClickHouse du reste du système.
-
-Avant d'appliquer un modèle CatBoost:
-
-**1.** Tirez la [Docker image](https://hub.docker.com/r/yandex/tutorial-catboost-clickhouse) à partir du registre:
-
-``` bash
-$ docker pull yandex/tutorial-catboost-clickhouse
-```
-
-Cette image Docker contient tout ce dont vous avez besoin pour exécuter CatBoost et ClickHouse: code, runtime, bibliothèques, variables d'environnement et fichiers de configuration.
-
-**2.** Assurez-vous que l'image Docker a été tirée avec succès:
-
-``` bash
-$ docker image ls
-REPOSITORY                            TAG                 IMAGE ID            CREATED             SIZE
-yandex/tutorial-catboost-clickhouse   latest              622e4d17945b        22 hours ago        1.37GB
-```
-
-**3.** Démarrer un conteneur Docker basé sur cette image:
-
-``` bash
-$ docker run -it -p 8888:8888 yandex/tutorial-catboost-clickhouse
-```
-
-## 1. Créer une Table {#create-table}
-
-Pour créer une table ClickHouse pour l'exemple de formation:
-
-**1.** Démarrez clickhouse console client en mode interactif:
-
-``` bash
-$ clickhouse client
-```
-
-!!! note "Note"
-    Le serveur ClickHouse est déjà en cours d'exécution dans le conteneur Docker.
-
-**2.** Créer la table à l'aide de la commande:
-
-``` sql
-:) CREATE TABLE amazon_train
-(
-    date Date MATERIALIZED today(),
-    ACTION UInt8,
-    RESOURCE UInt32,
-    MGR_ID UInt32,
-    ROLE_ROLLUP_1 UInt32,
-    ROLE_ROLLUP_2 UInt32,
-    ROLE_DEPTNAME UInt32,
-    ROLE_TITLE UInt32,
-    ROLE_FAMILY_DESC UInt32,
-    ROLE_FAMILY UInt32,
-    ROLE_CODE UInt32
-)
-ENGINE = MergeTree ORDER BY date
-```
-
-**3.** Quitter le client de la console ClickHouse:
-
-``` sql
-:) exit
-```
-
-## 2. Insérez les données dans la Table {#insert-data-to-table}
-
-Pour insérer les données:
-
-**1.** Exécutez la commande suivante:
-
-``` bash
-$ clickhouse client --host 127.0.0.1 --query 'INSERT INTO amazon_train FORMAT CSVWithNames' < ~/amazon/train.csv
-```
-
-**2.** Démarrez clickhouse console client en mode interactif:
-
-``` bash
-$ clickhouse client
-```
-
-**3.** Assurez-vous que les données ont été téléchargées:
-
-``` sql
-:) SELECT count() FROM amazon_train
-
-SELECT count()
-FROM amazon_train
-
-+-count()-+
-|   65538 |
-+-------+
-```
-
-## 3. Intégrer CatBoost dans ClickHouse {#integrate-catboost-into-clickhouse}
-
-!!! note "Note"
-    **Étape facultative.** L'image Docker contient tout ce dont vous avez besoin pour exécuter CatBoost et ClickHouse.
-
-Pour intégrer CatBoost dans ClickHouse:
-
-**1.** Construire la bibliothèque d'évaluation.
-
-Le moyen le plus rapide d'évaluer un modèle CatBoost est la compilation `libcatboostmodel.<so|dll|dylib>` bibliothèque. Pour plus d'informations sur la création de la bibliothèque, voir [Documentation CatBoost](https://catboost.ai/docs/concepts/c-plus-plus-api_dynamic-c-pluplus-wrapper.html).
-
-**2.** Créez un nouveau répertoire n'importe où et avec n'importe quel nom, par exemple, `data` et mettez la bibliothèque créée dedans. L'image Docker contient déjà la bibliothèque `data/libcatboostmodel.so`.
-
-**3.** Créez un nouveau répertoire pour le modèle de configuration n'importe où et avec n'importe quel nom, par exemple, `models`.
-
-**4.** Créez un fichier de configuration de modèle avec n'importe quel nom, par exemple, `models/amazon_model.xml`.
-
-**5.** Décrire la configuration du modèle:
-
-``` xml
-<models>
-    <model>
-        <!-- Model type. Now catboost only. -->
-        <type>catboost</type>
-        <!-- Model name. -->
-        <name>amazon</name>
-        <!-- Path to trained model. -->
-        <path>/home/catboost/tutorial/catboost_model.bin</path>
-        <!-- Update interval. -->
-        <lifetime>0</lifetime>
-    </model>
-</models>
-```
-
-**6.** Ajoutez le chemin D'accès à CatBoost et la configuration du modèle à la configuration de ClickHouse:
-
-``` xml
-<!-- File etc/clickhouse-server/config.d/models_config.xml. -->
-<catboost_dynamic_library_path>/home/catboost/data/libcatboostmodel.so</catboost_dynamic_library_path>
-<models_config>/home/catboost/models/*_model.xml</models_config>
-```
-
-## 4. Exécutez L'inférence du modèle à partir de SQL {#run-model-inference}
-
-Pour le modèle de test exécutez le client ClickHouse `$ clickhouse client`.
-
-Assurons nous que le modèle fonctionne:
-
-``` sql
-:) SELECT
-    modelEvaluate('amazon',
-                RESOURCE,
-                MGR_ID,
-                ROLE_ROLLUP_1,
-                ROLE_ROLLUP_2,
-                ROLE_DEPTNAME,
-                ROLE_TITLE,
-                ROLE_FAMILY_DESC,
-                ROLE_FAMILY,
-                ROLE_CODE) > 0 AS prediction,
-    ACTION AS target
-FROM amazon_train
-LIMIT 10
-```
-
-!!! note "Note"
-    Fonction [modelEvaluate](../sql-reference/functions/other-functions.md#function-modelevaluate) retourne tuple avec des prédictions brutes par classe pour les modèles multiclasse.
-
-Prédisons la probabilité:
-
-``` sql
-:) SELECT
-    modelEvaluate('amazon',
-                RESOURCE,
-                MGR_ID,
-                ROLE_ROLLUP_1,
-                ROLE_ROLLUP_2,
-                ROLE_DEPTNAME,
-                ROLE_TITLE,
-                ROLE_FAMILY_DESC,
-                ROLE_FAMILY,
-                ROLE_CODE) AS prediction,
-    1. / (1 + exp(-prediction)) AS probability,
-    ACTION AS target
-FROM amazon_train
-LIMIT 10
-```
-
-!!! note "Note"
-    Plus d'infos sur [exp()](../sql-reference/functions/math-functions.md) fonction.
-
-Calculons LogLoss sur l'échantillon:
-
-``` sql
-:) SELECT -avg(tg * log(prob) + (1 - tg) * log(1 - prob)) AS logloss
-FROM
-(
-    SELECT
-        modelEvaluate('amazon',
-                    RESOURCE,
-                    MGR_ID,
-                    ROLE_ROLLUP_1,
-                    ROLE_ROLLUP_2,
-                    ROLE_DEPTNAME,
-                    ROLE_TITLE,
-                    ROLE_FAMILY_DESC,
-                    ROLE_FAMILY,
-                    ROLE_CODE) AS prediction,
-        1. / (1. + exp(-prediction)) AS prob,
-        ACTION AS tg
-    FROM amazon_train
-)
-```
-
-!!! note "Note"
-    Plus d'infos sur [avg()](../sql-reference/aggregate-functions/reference.md#agg_function-avg) et [journal()](../sql-reference/functions/math-functions.md) fonction.
-
-[Article Original](https://clickhouse.tech/docs/en/guides/apply_catboost_model/) <!--hide-->
diff --git a/docs/fr/guides/index.md b/docs/fr/guides/index.md
deleted file mode 100644
index 5f6552fdb45..00000000000
--- a/docs/fr/guides/index.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: Guide
-toc_priority: 38
-toc_title: "Aper\xE7u"
----
-
-# ClickHouse Guides {#clickhouse-guides}
-
-Liste des instructions détaillées étape par étape qui aident à résoudre diverses tâches en utilisant ClickHouse:
-
--   [Tutoriel sur la configuration simple du cluster](../getting-started/tutorial.md)
--   [Application D'un modèle CatBoost dans ClickHouse](apply-catboost-model.md)
-
-[Article Original](https://clickhouse.tech/docs/en/guides/) <!--hide-->
diff --git a/docs/fr/images b/docs/fr/images
deleted file mode 120000
index 73937c941ec..00000000000
--- a/docs/fr/images
+++ /dev/null
@@ -1 +0,0 @@
-../en/images
\ No newline at end of file
diff --git a/docs/fr/index.md b/docs/fr/index.md
deleted file mode 100644
index d11744f1ab0..00000000000
--- a/docs/fr/index.md
+++ /dev/null
@@ -1,97 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 0
-toc_title: "Aper\xE7u"
----
-
-# Qu'Est-Ce Que ClickHouse? {#what-is-clickhouse}
-
-ClickHouse est un système de gestion de base de données orienté colonne (SGBD) pour le traitement analytique en ligne des requêtes (OLAP).
-
-Dans un “normal” SGBD orienté ligne, les données sont stockées dans cet ordre:
-
-| Rangée | WatchID     | JavaEnable | Intitulé                         | GoodEvent | EventTime           |
-|--------|-------------|------------|----------------------------------|-----------|---------------------|
-| #0    | 89354350662 | 1          | Relations Avec Les Investisseurs | 1         | 2016-05-18 05:19:20 |
-| #1    | 90329509958 | 0          | Contacter                        | 1         | 2016-05-18 08:10:20 |
-| #2    | 89953706054 | 1          | Mission                          | 1         | 2016-05-18 07:38:00 |
-| #N    | …           | …          | …                                | …         | …                   |
-
-En d'autres termes, toutes les valeurs liées à une ligne sont physiquement stockées l'une à côté de l'autre.
-
-Des exemples d'un SGBD orienté ligne sont MySQL, Postgres et MS SQL Server.
-
-Dans un SGBD orienté colonne, les données sont stockées comme ceci:
-
-| Rangée:     | #0                              | #1                 | #2                 | #N |
-|-------------|----------------------------------|---------------------|---------------------|-----|
-| WatchID:    | 89354350662                      | 90329509958         | 89953706054         | …   |
-| JavaEnable: | 1                                | 0                   | 1                   | …   |
-| Intitulé:   | Relations Avec Les Investisseurs | Contacter           | Mission             | …   |
-| GoodEvent:  | 1                                | 1                   | 1                   | …   |
-| EventTime:  | 2016-05-18 05:19:20              | 2016-05-18 08:10:20 | 2016-05-18 07:38:00 | …   |
-
-Ces exemples montrent l'ordre que les données sont organisées en. Les valeurs de différentes colonnes sont stockés séparément, et les données de la même colonne sont stockées ensemble.
-
-Exemples D'un SGBD orienté colonne: Vertica, Paraccel (matrice Actian et Amazon Redshift), Sybase IQ, Exasol, Infobright, InfiniDB, MonetDB (VectorWise et Actian Vector), LucidDB, SAP HANA, Google Dremel, Google PowerDrill, Druid et kdb+.
-
-Different orders for storing data are better suited to different scenarios. The data access scenario refers to what queries are made, how often, and in what proportion; how much data is read for each type of query – rows, columns, and bytes; the relationship between reading and updating data; the working size of the data and how locally it is used; whether transactions are used, and how isolated they are; requirements for data replication and logical integrity; requirements for latency and throughput for each type of query, and so on.
-
-Plus la charge sur le système est élevée, plus il est important de personnaliser le système configuré pour correspondre aux exigences du scénario d'utilisation, et plus cette personnalisation devient fine. Il n'y a pas de système qui soit aussi bien adapté à des scénarios significativement différents. Si un système est adaptable à un large ensemble de scénarios, sous une charge élevée, le système traitera tous les scénarios de manière également médiocre, ou fonctionnera bien pour un ou quelques-uns des scénarios possibles.
-
-## Propriétés clés du scénario OLAP {#key-properties-of-olap-scenario}
-
--   La grande majorité des demandes concernent l'accès en lecture.
--   Les données sont mises à jour en lots assez importants (\> 1000 lignes), pas par des lignes simples; ou elles ne sont pas mises à jour du tout.
--   Les données sont ajoutées à la base de données mais ne sont pas modifiées.
--   Pour les lectures, un assez grand nombre de lignes sont extraites de la base de données, mais seulement un petit sous-ensemble de colonnes.
--   Les Tables sont “wide,” ce qui signifie qu'ils contiennent un grand nombre de colonnes.
--   Les requêtes sont relativement rares (généralement des centaines de requêtes par serveur ou moins par seconde).
--   Pour les requêtes simples, les latences autour de 50 ms sont autorisées.
--   Les valeurs de colonne sont assez petites: nombres et chaînes courtes (par exemple, 60 octets par URL).
--   Nécessite un débit élevé lors du traitement d'une seule requête (jusqu'à des milliards de lignes par seconde par serveur).
--   Les Transactions ne sont pas nécessaires.
--   Faibles exigences en matière de cohérence des données.
--   Il y a une grande table par requête. Toutes les tables sont petites, sauf une.
--   Un résultat de requête est significativement plus petit que les données source. En d'autres termes, les données sont filtrées ou agrégées, de sorte que le résultat s'intègre dans la RAM d'un seul serveur.
-
-Il est facile de voir que le scénario OLAP est très différent des autres scénarios populaires (tels que OLTP ou key-Value access). Il n'est donc pas logique d'essayer D'utiliser OLTP ou une base de données clé-valeur pour traiter les requêtes analytiques si vous voulez obtenir des performances décentes. Par exemple, si vous essayez D'utiliser MongoDB ou Redis pour l'analyse, vous obtiendrez des performances très médiocres par rapport aux bases de données OLAP.
-
-## Pourquoi les bases de données orientées colonne fonctionnent mieux dans le scénario OLAP {#why-column-oriented-databases-work-better-in-the-olap-scenario}
-
-Les bases de données orientées colonne sont mieux adaptées aux scénarios OLAP: elles sont au moins 100 fois plus rapides dans le traitement de la plupart des requêtes. Les raisons sont expliquées en détail ci-dessous, mais le fait est plus facile de démontrer visuellement:
-
-**SGBD orienté ligne**
-
-![Row-oriented](images/row-oriented.gif#)
-
-**SGBD orienté colonne**
-
-![Column-oriented](images/column-oriented.gif#)
-
-Vous voyez la différence?
-
-### D'entrée/sortie {#inputoutput}
-
-1.  Pour une requête analytique, seul un petit nombre de colonnes de table doit être lu. Dans une base de données orientée colonne, vous pouvez lire uniquement les données dont vous avez besoin. Par exemple, si vous avez besoin de 5 colonnes sur 100, Vous pouvez vous attendre à une réduction de 20 fois des e / s.
-2.  Puisque les données sont lues en paquets, il est plus facile de les compresser. Les données dans les colonnes sont également plus faciles à compresser. Cela réduit d'autant le volume d'e/S.
-3.  En raison de la réduction des E / S, Plus de données s'insèrent dans le cache du système.
-
-Par exemple, la requête “count the number of records for each advertising platform” nécessite la lecture d'un “advertising platform ID” colonne, qui prend 1 octet non compressé. Si la majeure partie du trafic ne provenait pas de plates-formes publicitaires, vous pouvez vous attendre à une compression d'au moins 10 fois de cette colonne. Lors de l'utilisation d'un algorithme de compression rapide, la décompression des données est possible à une vitesse d'au moins plusieurs gigaoctets de données non compressées par seconde. En d'autres termes, cette requête ne peut être traitée qu'à une vitesse d'environ plusieurs milliards de lignes par seconde sur un seul serveur. Cette vitesse est effectivement atteinte dans la pratique.
-
-### CPU {#cpu}
-
-Étant donné que l'exécution d'une requête nécessite le traitement d'un grand nombre de lignes, il est utile de répartir toutes les opérations pour des vecteurs entiers au lieu de lignes séparées, ou d'implémenter le moteur de requête de sorte qu'il n'y ait presque aucun coût d'expédition. Si vous ne le faites pas, avec un sous-système de disque à moitié décent, l'interpréteur de requête bloque inévitablement le processeur. Il est logique de stocker des données dans des colonnes et de les traiter, si possible, par des colonnes.
-
-Il y a deux façons de le faire:
-
-1.  Un moteur vectoriel. Toutes les opérations sont écrites pour les vecteurs, au lieu de valeurs séparées. Cela signifie que vous n'avez pas besoin d'appeler les opérations très souvent, et les coûts d'expédition sont négligeables. Le code d'opération contient un cycle interne optimisé.
-
-2.  La génération de Code. Le code généré pour la requête contient tous les appels indirects.
-
-Ce n'est pas fait dans “normal” bases de données, car cela n'a pas de sens lors de l'exécution de requêtes simples. Cependant, il y a des exceptions. Par exemple, MemSQL utilise la génération de code pour réduire la latence lors du traitement des requêtes SQL. (À titre de comparaison, les SGBD analytiques nécessitent une optimisation du débit, et non une latence.)
-
-Notez que pour l'efficacité du processeur, le langage de requête doit être déclaratif (SQL ou MDX), ou au moins un vecteur (J, K). La requête ne doit contenir que des boucles implicites, permettant une optimisation.
-
-{## [Article Original](https://clickhouse.tech/docs/en/) ##}
diff --git a/docs/fr/interfaces/cli.md b/docs/fr/interfaces/cli.md
deleted file mode 100644
index 5b8ee67c31a..00000000000
--- a/docs/fr/interfaces/cli.md
+++ /dev/null
@@ -1,149 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 17
-toc_title: Client De Ligne De Commande
----
-
-# Client de ligne de commande {#command-line-client}
-
-ClickHouse fournit un client de ligne de commande natif: `clickhouse-client`. Le client prend en charge les options de ligne de commande et les fichiers de configuration. Pour plus d'informations, voir [Configuration](#interfaces_cli_configuration).
-
-[Installer](../getting-started/index.md) à partir de la `clickhouse-client` package et l'exécuter avec la commande `clickhouse-client`.
-
-``` bash
-$ clickhouse-client
-ClickHouse client version 19.17.1.1579 (official build).
-Connecting to localhost:9000 as user default.
-Connected to ClickHouse server version 19.17.1 revision 54428.
-
-:)
-```
-
-Différentes versions client et serveur sont compatibles les unes avec les autres, mais certaines fonctionnalités peuvent ne pas être disponibles dans les anciens clients. Nous vous recommandons d'utiliser la même version du client que l'application serveur. Lorsque vous essayez d'utiliser un client de l'ancienne version, puis le serveur, `clickhouse-client` affiche le message:
-
-      ClickHouse client version is older than ClickHouse server. It may lack support for new features.
-
-## Utilisation {#cli_usage}
-
-Le client peut être utilisé en mode interactif et non interactif (batch). Pour utiliser le mode batch, spécifiez ‘query’ d'un paramètre ou d'envoyer des données à ‘stdin’ (il vérifie que ‘stdin’ n'est pas un terminal), ou les deux. Similaire à L'interface HTTP, lors de l'utilisation ‘query’ paramètre et envoi de données à ‘stdin’ la demande est une concaténation de la ‘query’ paramètre, un saut de ligne, et les données de ‘stdin’. Ceci est pratique pour les grandes requêtes D'insertion.
-
-Exemple d'utilisation du client pour insérer des données:
-
-``` bash
-$ echo -ne "1, 'some text', '2016-08-14 00:00:00'\n2, 'some more text', '2016-08-14 00:00:01'" | clickhouse-client --database=test --query="INSERT INTO test FORMAT CSV";
-
-$ cat <<_EOF | clickhouse-client --database=test --query="INSERT INTO test FORMAT CSV";
-3, 'some text', '2016-08-14 00:00:00'
-4, 'some more text', '2016-08-14 00:00:01'
-_EOF
-
-$ cat file.csv | clickhouse-client --database=test --query="INSERT INTO test FORMAT CSV";
-```
-
-En mode batch, le format de données par défaut est TabSeparated. Vous pouvez définir le format dans la clause FORMAT de la requête.
-
-Par défaut, vous ne pouvez traiter une seule requête en mode batch. De faire plusieurs requêtes à partir d'un “script,” l'utilisation de la `--multiquery` paramètre. Cela fonctionne pour toutes les requêtes sauf INSERT. Les résultats de la requête sont produits consécutivement sans séparateurs supplémentaires. De même, pour traiter un grand nombre de requêtes, vous pouvez exécuter ‘clickhouse-client’ pour chaque requête. Notez que cela peut prendre des dizaines de millisecondes pour lancer le ‘clickhouse-client’ programme.
-
-En mode interactif, vous obtenez une ligne de commande où vous pouvez entrer des requêtes.
-
-Si ‘multiline’ n'est pas spécifié (par défaut): Pour exécuter la requête, appuyez sur Entrée. Le point-virgule n'est pas nécessaire à la fin de la requête. Pour entrer une requête multiligne, entrez une barre oblique inverse `\` avant le saut de ligne. Après avoir appuyé sur Entrée, il vous sera demandé d'entrer la ligne suivante de la requête.
-
-Si multiline est spécifié: pour exécuter une requête, terminez-la par un point-virgule et appuyez sur Entrée. Si le point-virgule a été omis à la fin de l'entrée ligne, vous serez invité à entrer la ligne suivante de la requête.
-
-Une seule requête est exécutée, donc tout après le point-virgule est ignoré.
-
-Vous pouvez spécifier `\G` au lieu de le ou après le point-virgule. Cela indique le format Vertical. Dans ce format, chaque valeur est imprimée sur une ligne distincte, ce qui est pratique pour les grandes tables. Cette fonctionnalité inhabituelle a été ajoutée pour la compatibilité avec la CLI MySQL.
-
-La ligne de commande est basé sur ‘replxx’ (similaire à ‘readline’). En d'autres termes, il utilise les raccourcis clavier familiers et conserve un historique. L'histoire est écrite à `~/.clickhouse-client-history`.
-
-Par défaut, le format utilisé est Jolicompact. Vous pouvez modifier le format dans la clause FORMAT de la requête, ou en spécifiant `\G` à la fin de la requête, en utilisant le `--format` ou `--vertical` dans la ligne de commande, ou en utilisant le fichier de configuration client.
-
-Pour quitter le client, appuyez sur Ctrl + D (ou Ctrl + C), ou entrez l'une des options suivantes au lieu d'une requête: “exit”, “quit”, “logout”, “exit;”, “quit;”, “logout;”, “q”, “Q”, “:q”
-
-Lors du traitement d'une requête, le client affiche:
-
-1.  Progrès, qui est mis à jour pas plus de 10 fois par seconde (par défaut). Pour les requêtes rapides, la progression peut ne pas avoir le temps d'être affichée.
-2.  La requête formatée après l'analyse, pour le débogage.
-3.  Le résultat dans le format spécifié.
-4.  Le nombre de lignes dans le résultat, le temps passé et la vitesse moyenne de traitement des requêtes.
-
-Vous pouvez annuler une requête longue en appuyant sur Ctrl + C. Cependant, vous devrez toujours attendre un peu pour que le serveur abandonne la requête. Il n'est pas possible d'annuler une requête à certaines étapes. Si vous n'attendez pas et appuyez une seconde fois sur Ctrl+C, le client quittera.
-
-Le client de ligne de commande permet de passer des données externes (tables temporaires externes) pour l'interrogation. Pour plus d'informations, consultez la section “External data for query processing”.
-
-### Requêtes avec paramètres {#cli-queries-with-parameters}
-
-Vous pouvez créer une requête avec des paramètres et leur transmettre des valeurs à partir de l'application cliente. Cela permet d'éviter le formatage de la requête avec des valeurs dynamiques spécifiques côté client. Exemple:
-
-``` bash
-$ clickhouse-client --param_parName="[1, 2]"  -q "SELECT * FROM table WHERE a = {parName:Array(UInt16)}"
-```
-
-#### La Syntaxe De La Requête {#cli-queries-with-parameters-syntax}
-
-Formatez une requête comme d'habitude, puis placez les valeurs que vous souhaitez transmettre des paramètres de l'application à la requête entre accolades au format suivant:
-
-``` sql
-{<name>:<data type>}
-```
-
--   `name` — Placeholder identifier. In the console client it should be used in app parameters as `--param_<name> = value`.
--   `data type` — [Type de données](../sql-reference/data-types/index.md) de l'application valeur de paramètre. Par exemple, une structure de données comme `(integer, ('string', integer))` peut avoir la `Tuple(UInt8, Tuple(String, UInt8))` type de données (vous pouvez également utiliser un autre [entier](../sql-reference/data-types/int-uint.md) type).
-
-#### Exemple {#example}
-
-``` bash
-$ clickhouse-client --param_tuple_in_tuple="(10, ('dt', 10))" -q "SELECT * FROM table WHERE val = {tuple_in_tuple:Tuple(UInt8, Tuple(String, UInt8))}"
-```
-
-## Configuration {#interfaces_cli_configuration}
-
-Vous pouvez passer des paramètres à `clickhouse-client` (tous les paramètres ont une valeur par défaut) en utilisant:
-
--   À partir de la ligne de commande
-
-    Les options de ligne de commande remplacent les valeurs et les paramètres par défaut dans les fichiers de configuration.
-
--   Les fichiers de Configuration.
-
-    Les paramètres des fichiers de configuration remplacent les valeurs par défaut.
-
-### Options De Ligne De Commande {#command-line-options}
-
--   `--host, -h` -– The server name, ‘localhost’ par défaut. Vous pouvez utiliser le nom ou L'adresse IPv4 ou IPv6.
--   `--port` – The port to connect to. Default value: 9000. Note that the HTTP interface and the native interface use different ports.
--   `--user, -u` – The username. Default value: default.
--   `--password` – The password. Default value: empty string.
--   `--query, -q` – The query to process when using non-interactive mode.
--   `--database, -d` – Select the current default database. Default value: the current database from the server settings (‘default’ par défaut).
--   `--multiline, -m` – If specified, allow multiline queries (do not send the query on Enter).
--   `--multiquery, -n` – If specified, allow processing multiple queries separated by semicolons.
--   `--format, -f` – Use the specified default format to output the result.
--   `--vertical, -E` – If specified, use the Vertical format by default to output the result. This is the same as ‘–format=Vertical’. Dans ce format, chaque valeur est imprimée sur une ligne séparée, ce qui est utile lors de l'affichage de tables larges.
--   `--time, -t` – If specified, print the query execution time to ‘stderr’ en mode non interactif.
--   `--stacktrace` – If specified, also print the stack trace if an exception occurs.
--   `--config-file` – The name of the configuration file.
--   `--secure` – If specified, will connect to server over secure connection.
--   `--param_<name>` — Value for a [requête avec paramètres](#cli-queries-with-parameters).
-
-### Fichiers De Configuration {#configuration_files}
-
-`clickhouse-client` utilise le premier fichier existant de suite:
-
--   Défini dans le `--config-file` paramètre.
--   `./clickhouse-client.xml`
--   `~/.clickhouse-client/config.xml`
--   `/etc/clickhouse-client/config.xml`
-
-Exemple de fichier de configuration:
-
-``` xml
-<config>
-    <user>username</user>
-    <password>password</password>
-    <secure>False</secure>
-</config>
-```
-
-[Article Original](https://clickhouse.tech/docs/en/interfaces/cli/) <!--hide-->
diff --git a/docs/fr/interfaces/cpp.md b/docs/fr/interfaces/cpp.md
deleted file mode 100644
index 0451b0722aa..00000000000
--- a/docs/fr/interfaces/cpp.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 24
-toc_title: "Biblioth\xE8que Client C++ "
----
-
-# Bibliothèque Client C++  {#c-client-library}
-
-Voir le fichier README à [clickhouse-cpp](https://github.com/ClickHouse/clickhouse-cpp) référentiel.
-
-[Article Original](https://clickhouse.tech/docs/en/interfaces/cpp/) <!--hide-->
diff --git a/docs/fr/interfaces/formats.md b/docs/fr/interfaces/formats.md
deleted file mode 100644
index 2022683e940..00000000000
--- a/docs/fr/interfaces/formats.md
+++ /dev/null
@@ -1,1212 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 21
-toc_title: "Formats d'entr\xE9e et de sortie"
----
-
-# Formats pour les données D'entrée et de sortie {#formats}
-
-ClickHouse peut accepter et renvoyer des données dans différents formats. Un format pris en charge pour l'entrée peut être utilisée pour analyser les données fournies à `INSERT`s, pour effectuer `SELECT`s à partir d'une table sauvegardée par fichier, telle Qu'un fichier, une URL ou un HDFS, ou pour lire un dictionnaire externe. Un format pris en charge pour la sortie peut être utilisé pour organiser
-les résultats d'une `SELECT` et pour effectuer `INSERT`s dans une table sauvegardée par fichier.
-
-Les formats pris en charge sont:
-
-| Format                                                          | Entrée | Sortie |
-|-----------------------------------------------------------------|--------|--------|
-| [TabSeparated](#tabseparated)                                   | ✔      | ✔      |
-| [TabSeparatedRaw](#tabseparatedraw)                             | ✗      | ✔      |
-| [TabSeparatedWithNames](#tabseparatedwithnames)                 | ✔      | ✔      |
-| [TabSeparatedWithNamesAndTypes](#tabseparatedwithnamesandtypes) | ✔      | ✔      |
-| [Modèle](#format-template)                                      | ✔      | ✔      |
-| [TemplateIgnoreSpaces](#templateignorespaces)                   | ✔      | ✗      |
-| [CSV](#csv)                                                     | ✔      | ✔      |
-| [CSVWithNames](#csvwithnames)                                   | ✔      | ✔      |
-| [CustomSeparated](#format-customseparated)                      | ✔      | ✔      |
-| [Valeur](#data-format-values)                                   | ✔      | ✔      |
-| [Vertical](#vertical)                                           | ✗      | ✔      |
-| [VerticalRaw](#verticalraw)                                     | ✗      | ✔      |
-| [JSON](#json)                                                   | ✗      | ✔      |
-| [JSONCompact](#jsoncompact)                                     | ✗      | ✔      |
-| [JSONEachRow](#jsoneachrow)                                     | ✔      | ✔      |
-| [TSKV](#tskv)                                                   | ✔      | ✔      |
-| [Joli](#pretty)                                                 | ✗      | ✔      |
-| [PrettyCompact](#prettycompact)                                 | ✗      | ✔      |
-| [PrettyCompactMonoBlock](#prettycompactmonoblock)               | ✗      | ✔      |
-| [PrettyNoEscapes](#prettynoescapes)                             | ✗      | ✔      |
-| [PrettySpace](#prettyspace)                                     | ✗      | ✔      |
-| [Protobuf](#protobuf)                                           | ✔      | ✔      |
-| [Avro](#data-format-avro)                                       | ✔      | ✔      |
-| [AvroConfluent](#data-format-avro-confluent)                    | ✔      | ✗      |
-| [Parquet](#data-format-parquet)                                 | ✔      | ✔      |
-| [ORC](#data-format-orc)                                         | ✔      | ✗      |
-| [RowBinary](#rowbinary)                                         | ✔      | ✔      |
-| [Rowbinarywithnamesettypes](#rowbinarywithnamesandtypes)        | ✔      | ✔      |
-| [Natif](#native)                                                | ✔      | ✔      |
-| [NULL](#null)                                                   | ✗      | ✔      |
-| [XML](#xml)                                                     | ✗      | ✔      |
-| [CapnProto](#capnproto)                                         | ✔      | ✗      |
-
-Vous pouvez contrôler certains paramètres de traitement de format avec les paramètres ClickHouse. Pour plus d'informations, lisez le [Paramètre](../operations/settings/settings.md) section.
-
-## TabSeparated {#tabseparated}
-
-Au format TabSeparated, les données sont écrites par ligne. Chaque ligne contient des valeurs séparées par des onglets. Chaque valeur est suivie par un onglet, à l'exception de la dernière valeur dans la ligne, qui est suivi par un saut de ligne. Les flux de ligne strictement Unix sont supposés partout. La dernière ligne doit également contenir un saut de ligne à la fin. Les valeurs sont écrites au format texte, sans guillemets et avec des caractères spéciaux échappés.
-
-Ce format est également disponible sous le nom de `TSV`.
-
-Le `TabSeparated` le format est pratique pour le traitement des données à l'aide de programmes et de scripts personnalisés. Il est utilisé par défaut dans L'interface HTTP et dans le mode batch du client de ligne de commande. Ce format permet également de transférer des données entre différents SGBD. Par exemple, vous pouvez obtenir un dump de MySQL et le télécharger sur ClickHouse, ou vice versa.
-
-Le `TabSeparated` format prend en charge la sortie des valeurs totales (lors de L'utilisation avec des totaux) et des valeurs extrêmes (lorsque ‘extremes’ est réglé sur 1). Dans ces cas, les valeurs totales et les extrêmes sont sorties après les données principales. Le résultat principal, les valeurs totales et les extrêmes sont séparés les uns des autres par une ligne vide. Exemple:
-
-``` sql
-SELECT EventDate, count() AS c FROM test.hits GROUP BY EventDate WITH TOTALS ORDER BY EventDate FORMAT TabSeparated``
-```
-
-``` text
-2014-03-17      1406958
-2014-03-18      1383658
-2014-03-19      1405797
-2014-03-20      1353623
-2014-03-21      1245779
-2014-03-22      1031592
-2014-03-23      1046491
-
-1970-01-01      8873898
-
-2014-03-17      1031592
-2014-03-23      1406958
-```
-
-### Mise En Forme Des Données {#data-formatting}
-
-Les nombres entiers sont écrits sous forme décimale. Les numéros peuvent contenir un supplément “+” caractère au début (ignoré lors de l'analyse, et non enregistré lors du formatage). Les nombres non négatifs ne peuvent pas contenir le signe négatif. Lors de la lecture, il est permis d'analyser une chaîne vide en tant que zéro, ou (pour les types signés) une chaîne composée d'un signe moins en tant que zéro. Les nombres qui ne correspondent pas au type de données correspondant peuvent être analysés comme un nombre différent, sans message d'erreur.
-
-Les nombres à virgule flottante sont écrits sous forme décimale. Le point est utilisé comme séparateur décimal. Les entrées exponentielles sont prises en charge, tout comme ‘inf’, ‘+inf’, ‘-inf’, et ‘nan’. Une entrée de nombres à virgule flottante peut commencer ou se terminer par une virgule décimale.
-Pendant le formatage, la précision peut être perdue sur les nombres à virgule flottante.
-Pendant l'analyse, il n'est pas strictement nécessaire de lire le nombre représentable de la machine le plus proche.
-
-Les Dates sont écrites au format AAAA-MM-JJ et analysées dans le même format, mais avec tous les caractères comme séparateurs.
-Les Dates avec les heures sont écrites dans le format `YYYY-MM-DD hh:mm:ss` et analysé dans le même format, mais avec des caractères comme séparateurs.
-Tout cela se produit dans le fuseau horaire du système au moment où le client ou le serveur démarre (selon lequel d'entre eux formate les données). Pour les dates avec des heures, l'heure d'été n'est pas spécifiée. Donc, si un vidage a des temps pendant l'heure d'été, le vidage ne correspond pas sans équivoque aux données, et l'analyse sélectionnera l'une des deux fois.
-Lors d'une opération de lecture, les dates et dates incorrectes avec des heures peuvent être analysées avec un débordement naturel ou en tant que dates et heures nulles, sans message d'erreur.
-
-À titre d'exception, l'analyse des dates avec des heures est également prise en charge au format d'horodatage Unix, si elle se compose exactement de 10 chiffres décimaux. Le résultat n'est pas dépendant du fuseau horaire. Les formats AAAA-MM-JJ hh:mm:ss et NNNNNNNNNN sont différenciés automatiquement.
-
-Les chaînes sont sorties avec des caractères spéciaux échappés par une barre oblique inverse. Les séquences d'échappement suivantes sont utilisées pour la sortie: `\b`, `\f`, `\r`, `\n`, `\t`, `\0`, `\'`, `\\`. L'analyse prend également en charge les séquences `\a`, `\v`, et `\xHH` (séquences d'échappement hexadécimales) et `\c` séquences, où `c` est un caractère (ces séquences sont convertis à `c`). Ainsi, la lecture de données prend en charge les formats où un saut de ligne peut être écrit comme `\n` ou `\` ou comme un saut de ligne. Par exemple, la chaîne `Hello world` avec un saut de ligne entre les mots au lieu de l'espace peut être analysé dans l'une des variantes suivantes:
-
-``` text
-Hello\nworld
-
-Hello\
-world
-```
-
-La deuxième variante est prise en charge car MySQL l'utilise lors de l'écriture de vidages séparés par des tabulations.
-
-L'ensemble minimum de caractères que vous devez échapper lors du passage de données au format TabSeparated: tab, saut de ligne (LF) et barre oblique inverse.
-
-Seul un petit ensemble de symboles sont échappés. Vous pouvez facilement tomber sur une valeur de chaîne que votre terminal va ruiner en sortie.
-
-Les tableaux sont écrits sous la forme d'une liste de valeurs séparées par des virgules entre crochets. Le nombre d'éléments dans le tableau sont formatés comme normalement. `Date` et `DateTime` les types sont écrits entre guillemets simples. Les chaînes sont écrites entre guillemets simples avec les mêmes règles d'échappement que ci-dessus.
-
-[NULL](../sql-reference/syntax.md) est formaté en tant qu' `\N`.
-
-Chaque élément de [Imbriqué](../sql-reference/data-types/nested-data-structures/nested.md) structures est représenté sous forme de tableau.
-
-Exemple:
-
-``` sql
-CREATE TABLE nestedt
-(
-    `id` UInt8,
-    `aux` Nested(
-        a UInt8,
-        b String
-    )
-)
-ENGINE = TinyLog
-```
-
-``` sql
-INSERT INTO nestedt Values ( 1, [1], ['a'])
-```
-
-``` sql
-SELECT * FROM nestedt FORMAT TSV
-```
-
-``` text
-1  [1]    ['a']
-```
-
-## TabSeparatedRaw {#tabseparatedraw}
-
-Diffère de `TabSeparated` format en ce que les lignes sont écrites sans échappement.
-Ce format n'est approprié que pour la sortie d'un résultat de requête, mais pas pour l'analyse (récupération des données à insérer dans une table).
-
-Ce format est également disponible sous le nom de `TSVRaw`.
-
-## TabSeparatedWithNames {#tabseparatedwithnames}
-
-Diffère de la `TabSeparated` formater en ce que les noms de colonne sont écrits dans la première ligne.
-Pendant l'analyse, la première ligne est complètement ignorée. Vous ne pouvez pas utiliser les noms de colonnes pour déterminer leur position ou vérifier leur exactitude.
-(La prise en charge de l'analyse de la ligne d'en-tête peut être ajoutée à l'avenir.)
-
-Ce format est également disponible sous le nom de `TSVWithNames`.
-
-## TabSeparatedWithNamesAndTypes {#tabseparatedwithnamesandtypes}
-
-Diffère de la `TabSeparated` format que les noms de colonne sont écrits à la première ligne, tandis que les types de colonne sont dans la deuxième rangée.
-Pendant l'analyse, les première et deuxième lignes sont complètement ignorées.
-
-Ce format est également disponible sous le nom de `TSVWithNamesAndTypes`.
-
-## Modèle {#format-template}
-
-Ce format permet de spécifier une chaîne de format personnalisée avec des espaces réservés pour les valeurs avec une règle d'échappement spécifiée.
-
-Il utilise les paramètres `format_template_resultset`, `format_template_row`, `format_template_rows_between_delimiter` and some settings of other formats (e.g. `output_format_json_quote_64bit_integers` lors de l'utilisation de `JSON` s'échapper, voir plus loin)
-
-Paramètre `format_template_row` spécifie le chemin d'accès au fichier, qui contient une chaîne de format pour les lignes avec la syntaxe suivante:
-
-`delimiter_1${column_1:serializeAs_1}delimiter_2${column_2:serializeAs_2} ... delimiter_N`,
-
-où `delimiter_i` est un délimiteur entre les valeurs (`$` symbole peut être échappé comme `$$`),
-`column_i` est un nom ou un index d'une colonne dont les valeurs sont choisies ou inséré (si vide, alors la colonne sera ignoré),
-`serializeAs_i` est une règle d'échappement pour les valeurs de colonne. Les règles d'échappement suivantes sont prises en charge:
-
--   `CSV`, `JSON`, `XML` (de même pour les formats des mêmes noms)
--   `Escaped` (de la même manière à `TSV`)
--   `Quoted` (de la même manière à `Values`)
--   `Raw` (sans s'échapper, de même pour `TSVRaw`)
--   `None` (pas de règle d'échappement, voir plus loin)
-
-Si une règle d'échappement est omise, alors `None` sera utilisé. `XML` et `Raw` sont adaptés uniquement pour la sortie.
-
-Donc, pour la chaîne de format suivante:
-
-      `Search phrase: ${SearchPhrase:Quoted}, count: ${c:Escaped}, ad price: $$${price:JSON};`
-
-les valeurs de `SearchPhrase`, `c` et `price` colonnes, qui sont échappées comme `Quoted`, `Escaped` et `JSON` imprimées (pour sélectionner) ou sera prévu (insert) entre `Search phrase:`, `, count:`, `, ad price: $` et `;` délimiteurs respectivement. Exemple:
-
-`Search phrase: 'bathroom interior design', count: 2166, ad price: $3;`
-
-Le `format_template_rows_between_delimiter` paramètre spécifie délimiteur entre les lignes, qui est imprimé (ou attendu) après chaque ligne, sauf la dernière (`\n` par défaut)
-
-Paramètre `format_template_resultset` spécifie le chemin d'accès au fichier, qui contient une chaîne de format pour resultset. Format string for resultset a la même syntaxe qu'une chaîne de format pour row et permet de spécifier un préfixe, un suffixe et un moyen d'imprimer des informations supplémentaires. Il contient les espaces réservés suivants au lieu des noms de colonnes:
-
--   `data` est les lignes avec des données dans `format_template_row` format, séparés par des `format_template_rows_between_delimiter`. Cet espace doit être le premier espace réservé dans la chaîne de format.
--   `totals` est la ligne avec des valeurs totales dans `format_template_row` format (lors de L'utilisation avec des totaux)
--   `min` est la ligne avec des valeurs minimales dans `format_template_row` format (lorsque les extrêmes sont définis sur 1)
--   `max` est la ligne avec des valeurs maximales en `format_template_row` format (lorsque les extrêmes sont définis sur 1)
--   `rows` le nombre total de lignes de sortie
--   `rows_before_limit` est le nombre minimal de lignes qu'il y aurait eu sans limite. Sortie uniquement si la requête contient LIMIT. Si la requête contient GROUP BY, rows_before_limit_at_least est le nombre exact de lignes qu'il y aurait eu sans limite.
--   `time` est le temps d'exécution de la requête en secondes
--   `rows_read` est le nombre de lignes a été lu
--   `bytes_read` est le nombre d'octets (non compressé) a été lu
-
-Réservé `data`, `totals`, `min` et `max` ne doit pas avoir de règle d'échappement spécifiée (ou `None` doit être spécifié explicitement). Les espaces réservés restants peuvent avoir une règle d'échappement spécifiée.
-Si l' `format_template_resultset` paramètre est une chaîne vide, `${data}` est utilisé comme valeur par défaut.
-Pour insérer des requêtes format permet de sauter certaines colonnes ou certains champs si préfixe ou suffixe (voir Exemple).
-
-Sélectionnez exemple:
-
-``` sql
-SELECT SearchPhrase, count() AS c FROM test.hits GROUP BY SearchPhrase ORDER BY c DESC LIMIT 5 FORMAT Template SETTINGS
-format_template_resultset = '/some/path/resultset.format', format_template_row = '/some/path/row.format', format_template_rows_between_delimiter = '\n    '
-```
-
-`/some/path/resultset.format`:
-
-``` text
-<!DOCTYPE HTML>
-<html> <head> <title>Search phrases</title> </head>
- <body>
-  <table border="1"> <caption>Search phrases</caption>
-    <tr> <th>Search phrase</th> <th>Count</th> </tr>
-    ${data}
-  </table>
-  <table border="1"> <caption>Max</caption>
-    ${max}
-  </table>
-  <b>Processed ${rows_read:XML} rows in ${time:XML} sec</b>
- </body>
-</html>
-```
-
-`/some/path/row.format`:
-
-``` text
-<tr> <td>${0:XML}</td> <td>${1:XML}</td> </tr>
-```
-
-Résultat:
-
-``` html
-<!DOCTYPE HTML>
-<html> <head> <title>Search phrases</title> </head>
- <body>
-  <table border="1"> <caption>Search phrases</caption>
-    <tr> <th>Search phrase</th> <th>Count</th> </tr>
-    <tr> <td></td> <td>8267016</td> </tr>
-    <tr> <td>bathroom interior design</td> <td>2166</td> </tr>
-    <tr> <td>yandex</td> <td>1655</td> </tr>
-    <tr> <td>spring 2014 fashion</td> <td>1549</td> </tr>
-    <tr> <td>freeform photos</td> <td>1480</td> </tr>
-  </table>
-  <table border="1"> <caption>Max</caption>
-    <tr> <td></td> <td>8873898</td> </tr>
-  </table>
-  <b>Processed 3095973 rows in 0.1569913 sec</b>
- </body>
-</html>
-```
-
-Insérez exemple:
-
-``` text
-Some header
-Page views: 5, User id: 4324182021466249494, Useless field: hello, Duration: 146, Sign: -1
-Page views: 6, User id: 4324182021466249494, Useless field: world, Duration: 185, Sign: 1
-Total rows: 2
-```
-
-``` sql
-INSERT INTO UserActivity FORMAT Template SETTINGS
-format_template_resultset = '/some/path/resultset.format', format_template_row = '/some/path/row.format'
-```
-
-`/some/path/resultset.format`:
-
-``` text
-Some header\n${data}\nTotal rows: ${:CSV}\n
-```
-
-`/some/path/row.format`:
-
-``` text
-Page views: ${PageViews:CSV}, User id: ${UserID:CSV}, Useless field: ${:CSV}, Duration: ${Duration:CSV}, Sign: ${Sign:CSV}
-```
-
-`PageViews`, `UserID`, `Duration` et `Sign` à l'intérieur des espaces réservés sont des noms de colonnes dans la table. Les valeurs après `Useless field` en rangées et après `\nTotal rows:` dans le suffixe sera ignoré.
-Tous les séparateurs dans les données d'entrée doivent être strictement égal à délimiteurs dans les chaînes de format.
-
-## TemplateIgnoreSpaces {#templateignorespaces}
-
-Ce format est adapté uniquement pour l'entrée.
-Semblable à `Template`, mais ignore les espaces entre les séparateurs et les valeurs dans le flux d'entrée. Toutefois, si les chaînes de format contiennent des espaces, ces caractères seront attendus dans le flux d'entrée. Permet également de spécifier des espaces réservés vides (`${}` ou `${:None}`) pour diviser un délimiteur en parties séparées pour ignorer les espaces entre eux. Ces espaces réservés sont utilisés uniquement pour ignorer les caractères d'espace.
-Il est possible de lire `JSON` l'utilisation de ce format, si les valeurs des colonnes ont le même ordre dans toutes les lignes. Par exemple, la requête suivante peut être utilisée pour insérer des données à partir d'un exemple de format de sortie [JSON](#json):
-
-``` sql
-INSERT INTO table_name FORMAT TemplateIgnoreSpaces SETTINGS
-format_template_resultset = '/some/path/resultset.format', format_template_row = '/some/path/row.format', format_template_rows_between_delimiter = ','
-```
-
-`/some/path/resultset.format`:
-
-``` text
-{${}"meta"${}:${:JSON},${}"data"${}:${}[${data}]${},${}"totals"${}:${:JSON},${}"extremes"${}:${:JSON},${}"rows"${}:${:JSON},${}"rows_before_limit_at_least"${}:${:JSON}${}}
-```
-
-`/some/path/row.format`:
-
-``` text
-{${}"SearchPhrase"${}:${}${phrase:JSON}${},${}"c"${}:${}${cnt:JSON}${}}
-```
-
-## TSKV {#tskv}
-
-Similaire à TabSeparated, mais affiche une valeur au format name = value. Les noms sont échappés de la même manière qu'au format TabSeparated, et le symbole = est également échappé.
-
-``` text
-SearchPhrase=   count()=8267016
-SearchPhrase=bathroom interior design    count()=2166
-SearchPhrase=yandex     count()=1655
-SearchPhrase=2014 spring fashion    count()=1549
-SearchPhrase=freeform photos       count()=1480
-SearchPhrase=angelina jolie    count()=1245
-SearchPhrase=omsk       count()=1112
-SearchPhrase=photos of dog breeds    count()=1091
-SearchPhrase=curtain designs        count()=1064
-SearchPhrase=baku       count()=1000
-```
-
-[NULL](../sql-reference/syntax.md) est formaté en tant qu' `\N`.
-
-``` sql
-SELECT * FROM t_null FORMAT TSKV
-```
-
-``` text
-x=1    y=\N
-```
-
-Quand il y a un grand nombre de petites colonnes, ce format est inefficace, et il n'y a généralement pas de raison de l'utiliser. Néanmoins, ce n'est pas pire que JSONEachRow en termes d'efficacité.
-
-Both data output and parsing are supported in this format. For parsing, any order is supported for the values of different columns. It is acceptable for some values to be omitted – they are treated as equal to their default values. In this case, zeros and blank rows are used as default values. Complex values that could be specified in the table are not supported as defaults.
-
-L'analyse permet la présence du champ supplémentaire `tskv` sans le signe égal ou de valeur. Ce champ est ignoré.
-
-## CSV {#csv}
-
-Format des valeurs séparées par des virgules ([RFC](https://tools.ietf.org/html/rfc4180)).
-
-Lors du formatage, les lignes sont entourées de guillemets doubles. Un guillemet double à l'intérieur d'une chaîne est affiché sous la forme de deux guillemets doubles dans une rangée. Il n'y a pas d'autres règles pour échapper les caractères. Date et date-heure sont entre guillemets. Les nombres sont produits sans guillemets. Les valeurs sont séparées par un caractère délimiteur, qui est `,` par défaut. Le caractère délimiteur est défini dans le paramètre [format_csv_delimiter](../operations/settings/settings.md#settings-format_csv_delimiter). Les lignes sont séparées à L'aide du saut de ligne Unix (LF). Les tableaux sont sérialisés au format CSV comme suit: tout d'abord, le tableau est sérialisé en une chaîne comme au format TabSeparated, puis la chaîne résultante est sortie au format CSV entre guillemets doubles. Les Tuples au format CSV sont sérialisés en tant que colonnes séparées (c'est-à-dire que leur imbrication dans le tuple est perdue).
-
-``` bash
-$ clickhouse-client --format_csv_delimiter="|" --query="INSERT INTO test.csv FORMAT CSV" < data.csv
-```
-
-\*Par défaut, le délimiteur est `,`. Voir la [format_csv_delimiter](../operations/settings/settings.md#settings-format_csv_delimiter) réglage pour plus d'informations.
-
-Lors de l'analyse, toutes les valeurs peuvent être analysés avec ou sans guillemets. Les guillemets doubles et simples sont pris en charge. Les lignes peuvent également être organisées sans guillemets. Dans ce cas, ils sont analysés jusqu'au caractère délimiteur ou au saut de ligne (CR ou LF). En violation de la RFC, lors de l'analyse des lignes sans guillemets, les espaces et les onglets de début et de fin sont ignorés. Pour le saut de ligne, les types Unix (LF), Windows (CR LF) et Mac OS Classic (CR LF) sont tous pris en charge.
-
-Les valeurs d'entrée non cotées vides sont remplacées par des valeurs par défaut pour les colonnes respectives, si
-[input_format_defaults_for_omitted_fields](../operations/settings/settings.md#session_settings-input_format_defaults_for_omitted_fields)
-est activé.
-
-`NULL` est formaté en tant qu' `\N` ou `NULL` ou une chaîne vide non cotée (voir paramètres [input_format_csv_unquoted_null_literal_as_null](../operations/settings/settings.md#settings-input_format_csv_unquoted_null_literal_as_null) et [input_format_defaults_for_omitted_fields](../operations/settings/settings.md#session_settings-input_format_defaults_for_omitted_fields)).
-
-Le format CSV prend en charge la sortie des totaux et des extrêmes de la même manière que `TabSeparated`.
-
-## CSVWithNames {#csvwithnames}
-
-Imprime également la ligne d'en-tête, semblable à `TabSeparatedWithNames`.
-
-## CustomSeparated {#format-customseparated}
-
-Semblable à [Modèle](#format-template), mais il imprime ou lit toutes les colonnes et utilise la règle d'échappement du paramètre `format_custom_escaping_rule` et délimiteurs de paramètres `format_custom_field_delimiter`, `format_custom_row_before_delimiter`, `format_custom_row_after_delimiter`, `format_custom_row_between_delimiter`, `format_custom_result_before_delimiter` et `format_custom_result_after_delimiter`, pas à partir de chaînes de format.
-Il y a aussi `CustomSeparatedIgnoreSpaces` le format, qui est similaire à `TemplateIgnoreSpaces`.
-
-## JSON {#json}
-
-Sorties de données au format JSON. Outre les tables de données, il génère également des noms et des types de colonnes, ainsi que des informations supplémentaires: le nombre total de lignes de sortie et le nombre de lignes qui auraient pu être sorties s'il n'y avait pas de limite. Exemple:
-
-``` sql
-SELECT SearchPhrase, count() AS c FROM test.hits GROUP BY SearchPhrase WITH TOTALS ORDER BY c DESC LIMIT 5 FORMAT JSON
-```
-
-``` json
-{
-        "meta":
-        [
-                {
-                        "name": "SearchPhrase",
-                        "type": "String"
-                },
-                {
-                        "name": "c",
-                        "type": "UInt64"
-                }
-        ],
-
-        "data":
-        [
-                {
-                        "SearchPhrase": "",
-                        "c": "8267016"
-                },
-                {
-                        "SearchPhrase": "bathroom interior design",
-                        "c": "2166"
-                },
-                {
-                        "SearchPhrase": "yandex",
-                        "c": "1655"
-                },
-                {
-                        "SearchPhrase": "spring 2014 fashion",
-                        "c": "1549"
-                },
-                {
-                        "SearchPhrase": "freeform photos",
-                        "c": "1480"
-                }
-        ],
-
-        "totals":
-        {
-                "SearchPhrase": "",
-                "c": "8873898"
-        },
-
-        "extremes":
-        {
-                "min":
-                {
-                        "SearchPhrase": "",
-                        "c": "1480"
-                },
-                "max":
-                {
-                        "SearchPhrase": "",
-                        "c": "8267016"
-                }
-        },
-
-        "rows": 5,
-
-        "rows_before_limit_at_least": 141137
-}
-```
-
-Le JSON est compatible avec JavaScript. Pour ce faire, certains caractères sont en outre échappés: la barre oblique `/` s'est échappée comme l' `\/`; sauts de ligne alternatifs `U+2028` et `U+2029`, qui cassent certains navigateurs, sont échappés comme `\uXXXX`. Les caractères de contrôle ASCII sont échappés: retour arrière, flux de formulaire, saut de ligne, retour chariot et tabulation horizontale sont remplacés par `\b`, `\f`, `\n`, `\r`, `\t` , ainsi que les octets restants dans la plage 00-1F en utilisant `\uXXXX` sequences. Invalid UTF-8 sequences are changed to the replacement character � so the output text will consist of valid UTF-8 sequences. For compatibility with JavaScript, Int64 and UInt64 integers are enclosed in double-quotes by default. To remove the quotes, you can set the configuration parameter [output_format_json_quote_64bit_integers](../operations/settings/settings.md#session_settings-output_format_json_quote_64bit_integers) à 0.
-
-`rows` – The total number of output rows.
-
-`rows_before_limit_at_least` Le nombre minimal de lignes aurait été sans limite. Sortie uniquement si la requête contient LIMIT.
-Si la requête contient GROUP BY, rows_before_limit_at_least est le nombre exact de lignes qu'il y aurait eu sans limite.
-
-`totals` – Total values (when using WITH TOTALS).
-
-`extremes` – Extreme values (when extremes are set to 1).
-
-Ce format n'est approprié que pour la sortie d'un résultat de requête, mais pas pour l'analyse (récupération des données à insérer dans une table).
-
-Supports ClickHouse [NULL](../sql-reference/syntax.md) s'affiche à l'écran `null` dans la sortie JSON.
-
-Voir aussi l' [JSONEachRow](#jsoneachrow) format.
-
-## JSONCompact {#jsoncompact}
-
-Diffère de JSON uniquement en ce que les lignes de données sont sorties dans des tableaux, pas dans des objets.
-
-Exemple:
-
-``` json
-{
-        "meta":
-        [
-                {
-                        "name": "SearchPhrase",
-                        "type": "String"
-                },
-                {
-                        "name": "c",
-                        "type": "UInt64"
-                }
-        ],
-
-        "data":
-        [
-                ["", "8267016"],
-                ["bathroom interior design", "2166"],
-                ["yandex", "1655"],
-                ["fashion trends spring 2014", "1549"],
-                ["freeform photo", "1480"]
-        ],
-
-        "totals": ["","8873898"],
-
-        "extremes":
-        {
-                "min": ["","1480"],
-                "max": ["","8267016"]
-        },
-
-        "rows": 5,
-
-        "rows_before_limit_at_least": 141137
-}
-```
-
-Ce format n'est approprié que pour la sortie d'un résultat de requête, mais pas pour l'analyse (récupération des données à insérer dans une table).
-Voir aussi l' `JSONEachRow` format.
-
-## JSONEachRow {#jsoneachrow}
-
-Lorsque vous utilisez ce format, ClickHouse affiche les lignes en tant qu'objets JSON séparés et délimités par des retours à la ligne, mais les données dans leur ensemble ne sont pas JSON valides.
-
-``` json
-{"SearchPhrase":"curtain designs","count()":"1064"}
-{"SearchPhrase":"baku","count()":"1000"}
-{"SearchPhrase":"","count()":"8267016"}
-```
-
-Lors de l'insertion des données, vous devez fournir un objet JSON distinct pour chaque ligne.
-
-### Insertion De Données {#inserting-data}
-
-``` sql
-INSERT INTO UserActivity FORMAT JSONEachRow {"PageViews":5, "UserID":"4324182021466249494", "Duration":146,"Sign":-1} {"UserID":"4324182021466249494","PageViews":6,"Duration":185,"Sign":1}
-```
-
-Clickhouse permet:
-
--   Toute commande de paires clé-valeur dans l'objet.
--   Omettre certaines valeurs.
-
-ClickHouse ignore les espaces entre les éléments et les virgules après les objets. Vous pouvez passer tous les objets en une seule ligne. Vous n'avez pas à les séparer avec des sauts de ligne.
-
-**Valeurs omises traitement**
-
-Clickhouse remplace les valeurs omises par les valeurs par défaut pour le [types de données](../sql-reference/data-types/index.md).
-
-Si `DEFAULT expr` clickhouse utilise différentes règles de substitution en fonction de [input_format_defaults_for_omitted_fields](../operations/settings/settings.md#session_settings-input_format_defaults_for_omitted_fields) paramètre.
-
-Considérons le tableau suivant:
-
-``` sql
-CREATE TABLE IF NOT EXISTS example_table
-(
-    x UInt32,
-    a DEFAULT x * 2
-) ENGINE = Memory;
-```
-
--   Si `input_format_defaults_for_omitted_fields = 0`, alors la valeur par défaut pour `x` et `a` égal `0` (la valeur par défaut pour le `UInt32` type de données).
--   Si `input_format_defaults_for_omitted_fields = 1`, alors la valeur par défaut pour `x` égal `0` mais la valeur par défaut de `a` égal `x * 2`.
-
-!!! note "Avertissement"
-    Lors de l'insertion de données avec `insert_sample_with_metadata = 1`, ClickHouse consomme plus de ressources de calcul, par rapport à l'insertion avec `insert_sample_with_metadata = 0`.
-
-### La Sélection De Données {#selecting-data}
-
-Envisager l' `UserActivity` table comme un exemple:
-
-``` text
-┌──────────────UserID─┬─PageViews─┬─Duration─┬─Sign─┐
-│ 4324182021466249494 │         5 │      146 │   -1 │
-│ 4324182021466249494 │         6 │      185 │    1 │
-└─────────────────────┴───────────┴──────────┴──────┘
-```
-
-Requête `SELECT * FROM UserActivity FORMAT JSONEachRow` retourner:
-
-``` text
-{"UserID":"4324182021466249494","PageViews":5,"Duration":146,"Sign":-1}
-{"UserID":"4324182021466249494","PageViews":6,"Duration":185,"Sign":1}
-```
-
-Contrairement à l' [JSON](#json) format, il n'y a pas de substitution de séquences UTF-8 non valides. Les valeurs sont échappés de la même manière que pour `JSON`.
-
-!!! note "Note"
-    Tout ensemble d'octets peut être sortie dans les cordes. L'utilisation de la `JSONEachRow` formater si vous êtes sûr que les données de la table peuvent être formatées en tant que JSON sans perdre aucune information.
-
-### Utilisation de Structures imbriquées {#jsoneachrow-nested}
-
-Si vous avez une table avec [Imbriqué](../sql-reference/data-types/nested-data-structures/nested.md) colonnes de type de données, vous pouvez insérer des données JSON avec la même structure. Activer cette fonctionnalité avec le [input_format_import_nested_json](../operations/settings/settings.md#settings-input_format_import_nested_json) paramètre.
-
-Par exemple, considérez le tableau suivant:
-
-``` sql
-CREATE TABLE json_each_row_nested (n Nested (s String, i Int32) ) ENGINE = Memory
-```
-
-Comme vous pouvez le voir dans la `Nested` description du type de données, ClickHouse traite chaque composant de la structure imbriquée comme une colonne distincte (`n.s` et `n.i` pour notre table). Vous pouvez insérer des données de la manière suivante:
-
-``` sql
-INSERT INTO json_each_row_nested FORMAT JSONEachRow {"n.s": ["abc", "def"], "n.i": [1, 23]}
-```
-
-Pour insérer des données en tant qu'objet JSON hiérarchique, définissez [input_format_import_nested_json=1](../operations/settings/settings.md#settings-input_format_import_nested_json).
-
-``` json
-{
-    "n": {
-        "s": ["abc", "def"],
-        "i": [1, 23]
-    }
-}
-```
-
-Sans ce paramètre, ClickHouse lance une exception.
-
-``` sql
-SELECT name, value FROM system.settings WHERE name = 'input_format_import_nested_json'
-```
-
-``` text
-┌─name────────────────────────────┬─value─┐
-│ input_format_import_nested_json │ 0     │
-└─────────────────────────────────┴───────┘
-```
-
-``` sql
-INSERT INTO json_each_row_nested FORMAT JSONEachRow {"n": {"s": ["abc", "def"], "i": [1, 23]}}
-```
-
-``` text
-Code: 117. DB::Exception: Unknown field found while parsing JSONEachRow format: n: (at row 1)
-```
-
-``` sql
-SET input_format_import_nested_json=1
-INSERT INTO json_each_row_nested FORMAT JSONEachRow {"n": {"s": ["abc", "def"], "i": [1, 23]}}
-SELECT * FROM json_each_row_nested
-```
-
-``` text
-┌─n.s───────────┬─n.i────┐
-│ ['abc','def'] │ [1,23] │
-└───────────────┴────────┘
-```
-
-## Natif {#native}
-
-Le format le plus efficace. Les données sont écrites et lues par des blocs au format binaire. Pour chaque bloc, le nombre de lignes, le nombre de colonnes, les noms et types de colonnes et les parties de colonnes de ce bloc sont enregistrés les uns après les autres. En d'autres termes, ce format est “columnar” – it doesn't convert columns to rows. This is the format used in the native interface for interaction between servers, for using the command-line client, and for C++ clients.
-
-Vous pouvez utiliser ce format pour générer rapidement des vidages qui ne peuvent être lus que par le SGBD ClickHouse. Cela n'a pas de sens de travailler avec ce format vous-même.
-
-## NULL {#null}
-
-Rien n'est sortie. Cependant, la requête est traitée et, lors de l'utilisation du client de ligne de commande, les données sont transmises au client. Ceci est utilisé pour les tests, y compris les tests de performance.
-Évidemment, ce format n'est approprié que pour la sortie, pas pour l'analyse.
-
-## Joli {#pretty}
-
-Affiche les données sous forme de tables Unicode-art, en utilisant également des séquences d'échappement ANSI pour définir les couleurs dans le terminal.
-Une grille complète de la table est dessinée, et chaque ligne occupe deux lignes dans le terminal.
-Chaque bloc de résultat est sorti sous la forme d'une table séparée. Ceci est nécessaire pour que les blocs puissent être sortis sans résultats de mise en mémoire tampon (la mise en mémoire tampon serait nécessaire pour pré-calculer la largeur visible de toutes les valeurs).
-
-[NULL](../sql-reference/syntax.md) est sortie `ᴺᵁᴸᴸ`.
-
-Exemple (montré pour le [PrettyCompact](#prettycompact) format):
-
-``` sql
-SELECT * FROM t_null
-```
-
-``` text
-┌─x─┬────y─┐
-│ 1 │ ᴺᵁᴸᴸ │
-└───┴──────┘
-```
-
-Les lignes ne sont pas échappées dans les formats Pretty\*. Exemple est montré pour la [PrettyCompact](#prettycompact) format:
-
-``` sql
-SELECT 'String with \'quotes\' and \t character' AS Escaping_test
-```
-
-``` text
-┌─Escaping_test────────────────────────┐
-│ String with 'quotes' and      character │
-└──────────────────────────────────────┘
-```
-
-Pour éviter de déverser trop de données sur le terminal, seules les 10 000 premières lignes sont imprimées. Si le nombre de lignes est supérieur ou égal à 10 000, le message “Showed first 10 000” est imprimé.
-Ce format n'est approprié que pour la sortie d'un résultat de requête, mais pas pour l'analyse (récupération des données à insérer dans une table).
-
-Le joli format prend en charge la sortie des valeurs totales (lors de L'utilisation avec des totaux) et des extrêmes (lorsque ‘extremes’ est réglé sur 1). Dans ces cas, les valeurs totales et les valeurs extrêmes sont sorties après les données principales, dans des tableaux séparés. Exemple (montré pour le [PrettyCompact](#prettycompact) format):
-
-``` sql
-SELECT EventDate, count() AS c FROM test.hits GROUP BY EventDate WITH TOTALS ORDER BY EventDate FORMAT PrettyCompact
-```
-
-``` text
-┌──EventDate─┬───────c─┐
-│ 2014-03-17 │ 1406958 │
-│ 2014-03-18 │ 1383658 │
-│ 2014-03-19 │ 1405797 │
-│ 2014-03-20 │ 1353623 │
-│ 2014-03-21 │ 1245779 │
-│ 2014-03-22 │ 1031592 │
-│ 2014-03-23 │ 1046491 │
-└────────────┴─────────┘
-
-Totals:
-┌──EventDate─┬───────c─┐
-│ 1970-01-01 │ 8873898 │
-└────────────┴─────────┘
-
-Extremes:
-┌──EventDate─┬───────c─┐
-│ 2014-03-17 │ 1031592 │
-│ 2014-03-23 │ 1406958 │
-└────────────┴─────────┘
-```
-
-## PrettyCompact {#prettycompact}
-
-Diffère de [Joli](#pretty) en ce que la grille est dessinée entre les lignes et le résultat est plus compact.
-Ce format est utilisé par défaut dans le client de ligne de commande en mode interactif.
-
-## PrettyCompactMonoBlock {#prettycompactmonoblock}
-
-Diffère de [PrettyCompact](#prettycompact) dans ce cas, jusqu'à 10 000 lignes sont mises en mémoire tampon, puis sorties en tant que table unique, pas par blocs.
-
-## PrettyNoEscapes {#prettynoescapes}
-
-Diffère de Pretty en ce que les séquences d'échappement ANSI ne sont pas utilisées. Ceci est nécessaire pour afficher ce format dans un navigateur, ainsi que pour utiliser le ‘watch’ utilitaire de ligne de commande.
-
-Exemple:
-
-``` bash
-$ watch -n1 "clickhouse-client --query='SELECT event, value FROM system.events FORMAT PrettyCompactNoEscapes'"
-```
-
-Vous pouvez utiliser L'interface HTTP pour afficher dans le navigateur.
-
-### Joliscompactnoescapes {#prettycompactnoescapes}
-
-Le même que le réglage précédent.
-
-### PrettySpaceNoEscapes {#prettyspacenoescapes}
-
-Le même que le réglage précédent.
-
-## PrettySpace {#prettyspace}
-
-Diffère de [PrettyCompact](#prettycompact) dans cet espace (caractères d'espace) est utilisé à la place de la grille.
-
-## RowBinary {#rowbinary}
-
-Formats et analyse les données par ligne au format binaire. Les lignes et les valeurs sont répertoriées consécutivement, sans séparateurs.
-Ce format est moins efficace que le format natif car il est basé sur des lignes.
-
-Les entiers utilisent une représentation little-endian de longueur fixe. Par exemple, UInt64 utilise 8 octets.
-DateTime est représenté par UInt32 contenant L'horodatage Unix comme valeur.
-Date est représenté comme un objet UInt16 qui contient le nombre de jours depuis 1970-01-01 comme valeur.
-La chaîne est représentée par une longueur varint (non signée [LEB128](https://en.wikipedia.org/wiki/LEB128)), suivie par les octets de la chaîne.
-FixedString est représenté simplement comme une séquence d'octets.
-
-Le tableau est représenté sous la forme d'une longueur varint (non signée [LEB128](https://en.wikipedia.org/wiki/LEB128)), suivie par les éléments de la matrice.
-
-Pour [NULL](../sql-reference/syntax.md#null-literal) un soutien, un octet supplémentaire contenant 1 ou 0 est ajouté avant chaque [Nullable](../sql-reference/data-types/nullable.md) valeur. Si la valeur est 1, alors la valeur est `NULL` et cet octet est interprétée comme une valeur distincte. Si 0, la valeur après l'octet n'est pas `NULL`.
-
-## Rowbinarywithnamesettypes {#rowbinarywithnamesandtypes}
-
-Semblable à [RowBinary](#rowbinary) mais avec l'ajout de l'en-tête:
-
--   [LEB128](https://en.wikipedia.org/wiki/LEB128)- nombre codé de colonnes (N)
--   N `String`s spécification des noms de colonnes
--   N `String`s spécification des types de colonnes
-
-## Valeur {#data-format-values}
-
-Imprime chaque ligne entre parenthèses. Les lignes sont séparées par des virgules. Il n'y a pas de virgule après la dernière ligne. Les valeurs entre parenthèses sont également séparées par des virgules. Les nombres sont produits dans un format décimal sans guillemets. Les tableaux sont affichés entre crochets. Les chaînes, les dates et les dates avec des heures sont affichées entre guillemets. Les règles d'échappement et l'analyse sont similaires à [TabSeparated](#tabseparated) format. Pendant le formatage, les espaces supplémentaires ne sont pas insérés, mais pendant l'analyse, ils sont autorisés et ignorés (sauf pour les espaces à l'intérieur des valeurs de tableau, qui ne sont pas autorisés). [NULL](../sql-reference/syntax.md) est représentée comme `NULL`.
-
-The minimum set of characters that you need to escape when passing data in Values ​​format: single quotes and backslashes.
-
-C'est le format qui est utilisé dans `INSERT INTO t VALUES ...`, mais vous pouvez également l'utiliser pour le formatage des résultats de requête.
-
-Voir aussi: [input_format_values_interpret_expressions](../operations/settings/settings.md#settings-input_format_values_interpret_expressions) et [input_format_values_deduce_templates_of_expressions](../operations/settings/settings.md#settings-input_format_values_deduce_templates_of_expressions) paramètre.
-
-## Vertical {#vertical}
-
-Imprime chaque valeur sur une ligne distincte avec le nom de colonne spécifié. Ce format est pratique pour imprimer une ou plusieurs lignes si chaque ligne est constituée d'un grand nombre de colonnes.
-
-[NULL](../sql-reference/syntax.md) est sortie `ᴺᵁᴸᴸ`.
-
-Exemple:
-
-``` sql
-SELECT * FROM t_null FORMAT Vertical
-```
-
-``` text
-Row 1:
-──────
-x: 1
-y: ᴺᵁᴸᴸ
-```
-
-Les lignes ne sont pas échappées au format Vertical:
-
-``` sql
-SELECT 'string with \'quotes\' and \t with some special \n characters' AS test FORMAT Vertical
-```
-
-``` text
-Row 1:
-──────
-test: string with 'quotes' and      with some special
- characters
-```
-
-Ce format n'est approprié que pour la sortie d'un résultat de requête, mais pas pour l'analyse (récupération des données à insérer dans une table).
-
-## VerticalRaw {#verticalraw}
-
-Semblable à [Vertical](#vertical), mais avec échapper désactivé. Ce format ne convient que pour la sortie des résultats de requête, pas pour l'analyse (recevoir des données et les insérer dans la table).
-
-## XML {#xml}
-
-Le format XML ne convient que pour la sortie, pas pour l'analyse. Exemple:
-
-``` xml
-<?xml version='1.0' encoding='UTF-8' ?>
-<result>
-        <meta>
-                <columns>
-                        <column>
-                                <name>SearchPhrase</name>
-                                <type>String</type>
-                        </column>
-                        <column>
-                                <name>count()</name>
-                                <type>UInt64</type>
-                        </column>
-                </columns>
-        </meta>
-        <data>
-                <row>
-                        <SearchPhrase></SearchPhrase>
-                        <field>8267016</field>
-                </row>
-                <row>
-                        <SearchPhrase>bathroom interior design</SearchPhrase>
-                        <field>2166</field>
-                </row>
-                <row>
-                        <SearchPhrase>yandex</SearchPhrase>
-                        <field>1655</field>
-                </row>
-                <row>
-                        <SearchPhrase>2014 spring fashion</SearchPhrase>
-                        <field>1549</field>
-                </row>
-                <row>
-                        <SearchPhrase>freeform photos</SearchPhrase>
-                        <field>1480</field>
-                </row>
-                <row>
-                        <SearchPhrase>angelina jolie</SearchPhrase>
-                        <field>1245</field>
-                </row>
-                <row>
-                        <SearchPhrase>omsk</SearchPhrase>
-                        <field>1112</field>
-                </row>
-                <row>
-                        <SearchPhrase>photos of dog breeds</SearchPhrase>
-                        <field>1091</field>
-                </row>
-                <row>
-                        <SearchPhrase>curtain designs</SearchPhrase>
-                        <field>1064</field>
-                </row>
-                <row>
-                        <SearchPhrase>baku</SearchPhrase>
-                        <field>1000</field>
-                </row>
-        </data>
-        <rows>10</rows>
-        <rows_before_limit_at_least>141137</rows_before_limit_at_least>
-</result>
-```
-
-Si le nom de colonne n'a pas un format acceptable, juste ‘field’ est utilisé comme le nom de l'élément. En général, la structure XML suit la structure JSON.
-Just as for JSON, invalid UTF-8 sequences are changed to the replacement character � so the output text will consist of valid UTF-8 sequences.
-
-Dans les valeurs de chaîne, les caractères `<` et `&` sont échappés comme `<` et `&`.
-
-Les tableaux sont produits comme `<array><elem>Hello</elem><elem>World</elem>...</array>`,et n-uplets d' `<tuple><elem>Hello</elem><elem>World</elem>...</tuple>`.
-
-## CapnProto {#capnproto}
-
-Cap'n Proto est un format de message binaire similaire aux tampons de protocole et Thrift, mais pas comme JSON ou MessagePack.
-
-Les messages Cap'n Proto sont strictement typés et ne sont pas auto-descriptifs, ce qui signifie qu'ils ont besoin d'une description de schéma externe. Le schéma est appliqué à la volée et mise en cache pour chaque requête.
-
-``` bash
-$ cat capnproto_messages.bin | clickhouse-client --query "INSERT INTO test.hits FORMAT CapnProto SETTINGS format_schema='schema:Message'"
-```
-
-Où `schema.capnp` ressemble à ceci:
-
-``` capnp
-struct Message {
-  SearchPhrase @0 :Text;
-  c @1 :Uint64;
-}
-```
-
-La désérialisation est efficace et n'augmente généralement pas la charge du système.
-
-Voir aussi [Schéma De Format](#formatschema).
-
-## Protobuf {#protobuf}
-
-Protobuf-est un [Protocol Buffers](https://developers.google.com/protocol-buffers/) format.
-
-Ce format nécessite un schéma de format externe. Le schéma est mis en cache entre les requêtes.
-Clickhouse prend en charge les deux `proto2` et `proto3` syntaxe. Les champs répétés/optionnels/obligatoires sont pris en charge.
-
-Exemples d'utilisation:
-
-``` sql
-SELECT * FROM test.table FORMAT Protobuf SETTINGS format_schema = 'schemafile:MessageType'
-```
-
-``` bash
-cat protobuf_messages.bin | clickhouse-client --query "INSERT INTO test.table FORMAT Protobuf SETTINGS format_schema='schemafile:MessageType'"
-```
-
-où le fichier `schemafile.proto` ressemble à ceci:
-
-``` capnp
-syntax = "proto3";
-
-message MessageType {
-  string name = 1;
-  string surname = 2;
-  uint32 birthDate = 3;
-  repeated string phoneNumbers = 4;
-};
-```
-
-Pour trouver la correspondance entre les colonnes de table et les champs du type de message des tampons de protocole, ClickHouse compare leurs noms.
-Cette comparaison est insensible à la casse et les caractères `_` (trait de soulignement) et `.` (dot) sont considérés comme égaux.
-Si les types d'une colonne et d'un champ de message des tampons de protocole sont différents, la conversion nécessaire est appliquée.
-
-Les messages imbriqués sont pris en charge. Par exemple, pour le champ `z` dans le type de message suivant
-
-``` capnp
-message MessageType {
-  message XType {
-    message YType {
-      int32 z;
-    };
-    repeated YType y;
-  };
-  XType x;
-};
-```
-
-ClickHouse tente de trouver une colonne nommée `x.y.z` (ou `x_y_z` ou `X.y_Z` et ainsi de suite).
-Les messages imbriqués conviennent à l'entrée ou à la sortie d'un [structures de données imbriquées](../sql-reference/data-types/nested-data-structures/nested.md).
-
-Valeurs par défaut définies dans un schéma protobuf comme ceci
-
-``` capnp
-syntax = "proto2";
-
-message MessageType {
-  optional int32 result_per_page = 3 [default = 10];
-}
-```
-
-ne sont pas appliquées; la [valeurs par défaut de la table](../sql-reference/statements/create.md#create-default-values) sont utilisés à leur place.
-
-Clickhouse entrées et sorties messages protobuf dans le `length-delimited` format.
-Cela signifie avant que chaque message devrait être écrit sa longueur comme un [varint](https://developers.google.com/protocol-buffers/docs/encoding#varints).
-Voir aussi [comment lire / écrire des messages protobuf délimités par la longueur dans les langues populaires](https://cwiki.apache.org/confluence/display/GEODE/Delimiting+Protobuf+Messages).
-
-## Avro {#data-format-avro}
-
-[Apache Avro](http://avro.apache.org/) est un cadre de sérialisation de données orienté ligne développé dans le projet Hadoop D'Apache.
-
-ClickHouse Avro format prend en charge la lecture et l'écriture [Fichiers de données Avro](http://avro.apache.org/docs/current/spec.html#Object+Container+Files).
-
-### Types De Données Correspondant {#data_types-matching}
-
-Le tableau ci-dessous montre les types de données pris en charge et comment ils correspondent à ClickHouse [types de données](../sql-reference/data-types/index.md) dans `INSERT` et `SELECT` requête.
-
-| Type de données Avro `INSERT`               | Type de données ClickHouse                                                                                          | Type de données Avro `SELECT` |
-|---------------------------------------------|---------------------------------------------------------------------------------------------------------------------|-------------------------------|
-| `boolean`, `int`, `long`, `float`, `double` | [Int (8/16/32)](../sql-reference/data-types/int-uint.md), [UInt (8/16/32)](../sql-reference/data-types/int-uint.md) | `int`                         |
-| `boolean`, `int`, `long`, `float`, `double` | [Int64](../sql-reference/data-types/int-uint.md), [UInt64](../sql-reference/data-types/int-uint.md)                 | `long`                        |
-| `boolean`, `int`, `long`, `float`, `double` | [Float32](../sql-reference/data-types/float.md)                                                                     | `float`                       |
-| `boolean`, `int`, `long`, `float`, `double` | [Float64](../sql-reference/data-types/float.md)                                                                     | `double`                      |
-| `bytes`, `string`, `fixed`, `enum`          | [Chaîne](../sql-reference/data-types/string.md)                                                                     | `bytes`                       |
-| `bytes`, `string`, `fixed`                  | [FixedString (N)](../sql-reference/data-types/fixedstring.md)                                                       | `fixed(N)`                    |
-| `enum`                                      | [Enum (8/16)](../sql-reference/data-types/enum.md)                                                                  | `enum`                        |
-| `array(T)`                                  | [Array(T)](../sql-reference/data-types/array.md)                                                                    | `array(T)`                    |
-| `union(null, T)`, `union(T, null)`          | [Nullable (T)](../sql-reference/data-types/date.md)                                                                 | `union(null, T)`              |
-| `null`                                      | [Les Valeurs Null(Nothing)](../sql-reference/data-types/special-data-types/nothing.md)                              | `null`                        |
-| `int (date)` \*                             | [Date](../sql-reference/data-types/date.md)                                                                         | `int (date)` \*               |
-| `long (timestamp-millis)` \*                | [DateTime64 (3)](../sql-reference/data-types/datetime.md)                                                           | `long (timestamp-millis)` \*  |
-| `long (timestamp-micros)` \*                | [DateTime64 (6)](../sql-reference/data-types/datetime.md)                                                           | `long (timestamp-micros)` \*  |
-
-\* [Types logiques Avro](http://avro.apache.org/docs/current/spec.html#Logical+Types)
-
-Types de données Avro non pris en charge: `record` (non-root), `map`
-
-Types de données logiques Avro non pris en charge: `uuid`, `time-millis`, `time-micros`, `duration`
-
-### Insertion De Données {#inserting-data-1}
-
-Pour insérer des données d'un fichier Avro dans la table ClickHouse:
-
-``` bash
-$ cat file.avro | clickhouse-client --query="INSERT INTO {some_table} FORMAT Avro"
-```
-
-Le schéma racine du fichier Avro d'entrée doit être de `record` type.
-
-Pour trouver la correspondance entre les colonnes de table et les champs du schéma Avro ClickHouse compare leurs noms. Cette comparaison est sensible à la casse.
-Les champs inutilisés sont ignorés.
-
-Les types de données des colonnes de la table ClickHouse peuvent différer des champs correspondants des données Avro insérées. Lors de l'insertion de données, ClickHouse interprète les types de données selon le tableau ci-dessus, puis [jeter](../sql-reference/functions/type-conversion-functions.md#type_conversion_function-cast) les données au type de colonne correspondant.
-
-### La Sélection De Données {#selecting-data-1}
-
-Pour sélectionner des données de la table ClickHouse dans un fichier Avro:
-
-``` bash
-$ clickhouse-client --query="SELECT * FROM {some_table} FORMAT Avro" > file.avro
-```
-
-Les noms de colonnes doivent:
-
--   commencer avec `[A-Za-z_]`
--   par la suite contenir uniquement `[A-Za-z0-9_]`
-
-Sortie Avro fichier de compression et sync intervalle peut être configuré avec [output_format_avro_codec](../operations/settings/settings.md#settings-output_format_avro_codec) et [output_format_avro_sync_interval](../operations/settings/settings.md#settings-output_format_avro_sync_interval) respectivement.
-
-## AvroConfluent {#data-format-avro-confluent}
-
-Avroconfluent prend en charge le décodage des messages Avro à objet unique couramment utilisés avec [Kafka](https://kafka.apache.org/) et [Confluentes Schéma De Registre](https://docs.confluent.io/current/schema-registry/index.html).
-
-Chaque message Avro intègre un id de schéma qui peut être résolu dans le schéma réel à l'aide du registre de schéma.
-
-Les schémas sont mis en cache une fois résolus.
-
-L'URL du registre de schéma est configurée avec [format_avro_schema_registry_url](../operations/settings/settings.md#settings-format_avro_schema_registry_url)
-
-### Types De Données Correspondant {#data_types-matching-1}
-
-Même que [Avro](#data-format-avro)
-
-### Utilisation {#usage}
-
-Pour vérifier rapidement la résolution du schéma, vous pouvez utiliser [kafkacat](https://github.com/edenhill/kafkacat) avec [clickhouse-local](../operations/utilities/clickhouse-local.md):
-
-``` bash
-$ kafkacat -b kafka-broker  -C -t topic1 -o beginning -f '%s' -c 3 | clickhouse-local   --input-format AvroConfluent --format_avro_schema_registry_url 'http://schema-registry' -S "field1 Int64, field2 String"  -q 'select *  from table'
-1 a
-2 b
-3 c
-```
-
-Utiliser `AvroConfluent` avec [Kafka](../engines/table-engines/integrations/kafka.md):
-
-``` sql
-CREATE TABLE topic1_stream
-(
-    field1 String,
-    field2 String
-)
-ENGINE = Kafka()
-SETTINGS
-kafka_broker_list = 'kafka-broker',
-kafka_topic_list = 'topic1',
-kafka_group_name = 'group1',
-kafka_format = 'AvroConfluent';
-
-SET format_avro_schema_registry_url = 'http://schema-registry';
-
-SELECT * FROM topic1_stream;
-```
-
-!!! note "Avertissement"
-    Paramètre `format_avro_schema_registry_url` doit être configuré dans `users.xml` afin de maintenir sa valeur après un redémarrage.
-
-## Parquet {#data-format-parquet}
-
-[Apache Parquet](http://parquet.apache.org/) est un format de stockage colonnaire répandu dans L'écosystème Hadoop. ClickHouse prend en charge les opérations de lecture et d'écriture pour ce format.
-
-### Types De Données Correspondant {#data_types-matching-2}
-
-Le tableau ci-dessous montre les types de données pris en charge et comment ils correspondent à ClickHouse [types de données](../sql-reference/data-types/index.md) dans `INSERT` et `SELECT` requête.
-
-| Type de données Parquet (`INSERT`) | Type de données ClickHouse                                | Type de données Parquet (`SELECT`) |
-|------------------------------------|-----------------------------------------------------------|------------------------------------|
-| `UINT8`, `BOOL`                    | [UInt8](../sql-reference/data-types/int-uint.md)          | `UINT8`                            |
-| `INT8`                             | [Int8](../sql-reference/data-types/int-uint.md)           | `INT8`                             |
-| `UINT16`                           | [UInt16](../sql-reference/data-types/int-uint.md)         | `UINT16`                           |
-| `INT16`                            | [Int16](../sql-reference/data-types/int-uint.md)          | `INT16`                            |
-| `UINT32`                           | [UInt32](../sql-reference/data-types/int-uint.md)         | `UINT32`                           |
-| `INT32`                            | [Int32](../sql-reference/data-types/int-uint.md)          | `INT32`                            |
-| `UINT64`                           | [UInt64](../sql-reference/data-types/int-uint.md)         | `UINT64`                           |
-| `INT64`                            | [Int64](../sql-reference/data-types/int-uint.md)          | `INT64`                            |
-| `FLOAT`, `HALF_FLOAT`              | [Float32](../sql-reference/data-types/float.md)           | `FLOAT`                            |
-| `DOUBLE`                           | [Float64](../sql-reference/data-types/float.md)           | `DOUBLE`                           |
-| `DATE32`                           | [Date](../sql-reference/data-types/date.md)               | `UINT16`                           |
-| `DATE64`, `TIMESTAMP`              | [DateTime](../sql-reference/data-types/datetime.md)       | `UINT32`                           |
-| `STRING`, `BINARY`                 | [Chaîne](../sql-reference/data-types/string.md)           | `STRING`                           |
-| —                                  | [FixedString](../sql-reference/data-types/fixedstring.md) | `STRING`                           |
-| `DECIMAL`                          | [Décimal](../sql-reference/data-types/decimal.md)         | `DECIMAL`                          |
-
-Clickhouse prend en charge la précision configurable de `Decimal` type. Le `INSERT` requête traite le Parquet `DECIMAL` tapez comme le ClickHouse `Decimal128` type.
-
-Types de données Parquet non pris en charge: `DATE32`, `TIME32`, `FIXED_SIZE_BINARY`, `JSON`, `UUID`, `ENUM`.
-
-Les types de données des colonnes de table ClickHouse peuvent différer des champs correspondants des données de Parquet insérées. Lors de l'insertion de données, ClickHouse interprète les types de données selon le tableau ci-dessus, puis [jeter](../query_language/functions/type_conversion_functions/#type_conversion_function-cast) les données de ce type de données qui est défini pour la colonne de la table ClickHouse.
-
-### Insertion et sélection de données {#inserting-and-selecting-data}
-
-Vous pouvez insérer des données Parquet à partir d'un fichier dans la table ClickHouse par la commande suivante:
-
-``` bash
-$ cat {filename} | clickhouse-client --query="INSERT INTO {some_table} FORMAT Parquet"
-```
-
-Vous pouvez sélectionner des données à partir d'une table de ClickHouse et les enregistrer dans un fichier au format Parquet par la commande suivante:
-
-``` bash
-$ clickhouse-client --query="SELECT * FROM {some_table} FORMAT Parquet" > {some_file.pq}
-```
-
-Pour échanger des données avec Hadoop, vous pouvez utiliser [Moteur de table HDFS](../engines/table-engines/integrations/hdfs.md).
-
-## ORC {#data-format-orc}
-
-[Apache ORC](https://orc.apache.org/) est un format de stockage colonnaire répandu dans L'écosystème Hadoop. Vous ne pouvez insérer des données dans ce format à ClickHouse.
-
-### Types De Données Correspondant {#data_types-matching-3}
-
-Le tableau ci-dessous montre les types de données pris en charge et comment ils correspondent à ClickHouse [types de données](../sql-reference/data-types/index.md) dans `INSERT` requête.
-
-| Type de données ORC (`INSERT`) | Type de données ClickHouse                          |
-|--------------------------------|-----------------------------------------------------|
-| `UINT8`, `BOOL`                | [UInt8](../sql-reference/data-types/int-uint.md)    |
-| `INT8`                         | [Int8](../sql-reference/data-types/int-uint.md)     |
-| `UINT16`                       | [UInt16](../sql-reference/data-types/int-uint.md)   |
-| `INT16`                        | [Int16](../sql-reference/data-types/int-uint.md)    |
-| `UINT32`                       | [UInt32](../sql-reference/data-types/int-uint.md)   |
-| `INT32`                        | [Int32](../sql-reference/data-types/int-uint.md)    |
-| `UINT64`                       | [UInt64](../sql-reference/data-types/int-uint.md)   |
-| `INT64`                        | [Int64](../sql-reference/data-types/int-uint.md)    |
-| `FLOAT`, `HALF_FLOAT`          | [Float32](../sql-reference/data-types/float.md)     |
-| `DOUBLE`                       | [Float64](../sql-reference/data-types/float.md)     |
-| `DATE32`                       | [Date](../sql-reference/data-types/date.md)         |
-| `DATE64`, `TIMESTAMP`          | [DateTime](../sql-reference/data-types/datetime.md) |
-| `STRING`, `BINARY`             | [Chaîne](../sql-reference/data-types/string.md)     |
-| `DECIMAL`                      | [Décimal](../sql-reference/data-types/decimal.md)   |
-
-Clickhouse prend en charge la précision configurable de la `Decimal` type. Le `INSERT` requête traite de l'ORC `DECIMAL` tapez comme le ClickHouse `Decimal128` type.
-
-Types de données ORC non pris en charge: `DATE32`, `TIME32`, `FIXED_SIZE_BINARY`, `JSON`, `UUID`, `ENUM`.
-
-Les types de données des colonnes de la table ClickHouse ne doivent pas correspondre aux champs de données Orc correspondants. Lors de l'insertion de données, ClickHouse interprète les types de données selon le tableau ci-dessus, puis [jeter](../sql-reference/functions/type-conversion-functions.md#type_conversion_function-cast) les données du type de données défini pour la colonne clickhouse table.
-
-### Insertion De Données {#inserting-data-2}
-
-Vous pouvez insérer des données ORC à partir d'un fichier dans la table ClickHouse par la commande suivante:
-
-``` bash
-$ cat filename.orc | clickhouse-client --query="INSERT INTO some_table FORMAT ORC"
-```
-
-Pour échanger des données avec Hadoop, vous pouvez utiliser [Moteur de table HDFS](../engines/table-engines/integrations/hdfs.md).
-
-## Schéma De Format {#formatschema}
-
-Le nom du fichier contenant le schéma de format est défini par le paramètre `format_schema`.
-Il est nécessaire de définir ce paramètre lorsqu'il est utilisé dans l'un des formats `Cap'n Proto` et `Protobuf`.
-Le format de schéma est une combinaison d'un nom de fichier et le nom d'un type de message dans ce fichier, délimité par une virgule,
-e.g. `schemafile.proto:MessageType`.
-Si le fichier possède l'extension standard pour le format (par exemple, `.proto` pour `Protobuf`),
-il peut être omis et dans ce cas, le format de schéma ressemble `schemafile:MessageType`.
-
-Si vous entrez ou sortez des données via le [client](../interfaces/cli.md) dans le [mode interactif](../interfaces/cli.md#cli_usage) le nom de fichier spécifié dans le format de schéma
-peut contenir un chemin absolu, soit un chemin relatif au répertoire courant sur le client.
-Si vous utilisez le client dans le [mode batch](../interfaces/cli.md#cli_usage), le chemin d'accès au schéma doit être relatif pour des raisons de sécurité.
-
-Si vous entrez ou sortez des données via le [Interface HTTP](../interfaces/http.md) le nom de fichier spécifié dans le format de schéma
-doit être situé dans le répertoire spécifié dans [format_schema_path](../operations/server-configuration-parameters/settings.md#server_configuration_parameters-format_schema_path)
-dans la configuration du serveur.
-
-## Sauter Les Erreurs {#skippingerrors}
-
-Certains formats tels que `CSV`, `TabSeparated`, `TSKV`, `JSONEachRow`, `Template`, `CustomSeparated` et `Protobuf` pouvez ignorer brisé ligne si erreur d'analyse s'est produite et poursuivre l'analyse à partir du début de la ligne suivante. Voir [input_format_allow_errors_num](../operations/settings/settings.md#settings-input_format_allow_errors_num) et
-[input_format_allow_errors_ratio](../operations/settings/settings.md#settings-input_format_allow_errors_ratio) paramètre.
-Limitation:
-- En cas d'erreur d'analyse `JSONEachRow` ignore toutes les données jusqu'à la nouvelle ligne (ou EOF), donc les lignes doivent être délimitées par `\n` pour compter les erreurs correctement.
-- `Template` et `CustomSeparated` utilisez delimiter après la dernière colonne et delimiter entre les lignes pour trouver le début de la ligne suivante, donc sauter les erreurs ne fonctionne que si au moins l'une d'entre elles n'est pas vide.
-
-[Article Original](https://clickhouse.tech/docs/en/interfaces/formats/) <!--hide-->
diff --git a/docs/fr/interfaces/http.md b/docs/fr/interfaces/http.md
deleted file mode 100644
index ea590a2b870..00000000000
--- a/docs/fr/interfaces/http.md
+++ /dev/null
@@ -1,617 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 19
-toc_title: Interface HTTP
----
-
-# Interface HTTP {#http-interface}
-
-L'interface HTTP vous permet D'utiliser ClickHouse sur n'importe quelle plate-forme à partir de n'importe quel langage de programmation. Nous l'utilisons pour travailler à partir de Java et Perl, ainsi que des scripts shell. Dans d'autres départements, L'interface HTTP est utilisée à partir de Perl, Python et Go. L'interface HTTP est plus limitée que l'interface native, mais elle a une meilleure compatibilité.
-
-Par défaut, clickhouse-server écoute HTTP sur le port 8123 (cela peut être modifié dans la configuration).
-
-Si vous faites une requête GET / sans Paramètres, elle renvoie le code de réponse 200 et la chaîne définie dans [http_server_default_response](../operations/server-configuration-parameters/settings.md#server_configuration_parameters-http_server_default_response) valeur par défaut “Ok.” (avec un saut de ligne à la fin)
-
-``` bash
-$ curl 'http://localhost:8123/'
-Ok.
-```
-
-Utilisez la requête GET /ping dans les scripts de vérification de la santé. Ce gestionnaire revient toujours “Ok.” (avec un saut de ligne à la fin). Disponible à partir de la version 18.12.13.
-
-``` bash
-$ curl 'http://localhost:8123/ping'
-Ok.
-```
-
-Envoyer la demande sous forme D'URL ‘query’ paramètre, ou comme un POSTE. Ou envoyer le début de la requête dans l' ‘query’ paramètre, et le reste dans le POST (nous expliquerons plus tard pourquoi cela est nécessaire). La taille de L'URL est limitée à 16 Ko, alors gardez cela à l'esprit lors de l'envoi de requêtes volumineuses.
-
-En cas de succès, vous recevez le code de réponse 200 et le résultat dans le corps de réponse.
-Si une erreur se produit, vous recevez le code de réponse 500 et un texte de description de l'erreur dans le corps de la réponse.
-
-Lorsque vous utilisez la méthode GET, ‘readonly’ est définie. En d'autres termes, pour les requêtes qui modifient les données, vous ne pouvez utiliser que la méthode POST. Vous pouvez envoyer la requête elle-même dans le corps du message ou dans le paramètre URL.
-
-Exemple:
-
-``` bash
-$ curl 'http://localhost:8123/?query=SELECT%201'
-1
-
-$ wget -nv -O- 'http://localhost:8123/?query=SELECT 1'
-1
-
-$ echo -ne 'GET /?query=SELECT%201 HTTP/1.0\r\n\r\n' | nc localhost 8123
-HTTP/1.0 200 OK
-Date: Wed, 27 Nov 2019 10:30:18 GMT
-Connection: Close
-Content-Type: text/tab-separated-values; charset=UTF-8
-X-ClickHouse-Server-Display-Name: clickhouse.ru-central1.internal
-X-ClickHouse-Query-Id: 5abe861c-239c-467f-b955-8a201abb8b7f
-X-ClickHouse-Summary: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"0"}
-
-1
-```
-
-Comme vous pouvez le voir, curl est un peu gênant en ce sens que les espaces doivent être échappés URL.
-Bien que wget échappe à tout lui-même, nous ne recommandons pas de l'utiliser car il ne fonctionne pas bien sur HTTP 1.1 lors de l'utilisation de keep-alive et Transfer-Encoding: chunked.
-
-``` bash
-$ echo 'SELECT 1' | curl 'http://localhost:8123/' --data-binary @-
-1
-
-$ echo 'SELECT 1' | curl 'http://localhost:8123/?query=' --data-binary @-
-1
-
-$ echo '1' | curl 'http://localhost:8123/?query=SELECT' --data-binary @-
-1
-```
-
-Si une partie de la requête est envoyée dans le paramètre et une partie dans la publication, un saut de ligne est inséré entre ces deux parties de données.
-Exemple (cela ne fonctionnera pas):
-
-``` bash
-$ echo 'ECT 1' | curl 'http://localhost:8123/?query=SEL' --data-binary @-
-Code: 59, e.displayText() = DB::Exception: Syntax error: failed at position 0: SEL
-ECT 1
-, expected One of: SHOW TABLES, SHOW DATABASES, SELECT, INSERT, CREATE, ATTACH, RENAME, DROP, DETACH, USE, SET, OPTIMIZE., e.what() = DB::Exception
-```
-
-Par défaut, les données sont renvoyées au format TabSeparated (pour plus d'informations, voir “Formats” section).
-Vous utilisez la clause FORMAT de la requête pour demander tout autre format.
-
-``` bash
-$ echo 'SELECT 1 FORMAT Pretty' | curl 'http://localhost:8123/?' --data-binary @-
-┏━━━┓
-┃ 1 ┃
-┡━━━┩
-│ 1 │
-└───┘
-```
-
-La méthode POST de transmission des données est nécessaire pour les requêtes INSERT. Dans ce cas, vous pouvez écrire le début de la requête dans le paramètre URL et utiliser POST pour transmettre les données à insérer. Les données à insérer pourraient être, par exemple, un vidage séparé par tabulation de MySQL. De cette façon, la requête INSERT remplace LOAD DATA LOCAL INFILE de MySQL.
-
-Exemples: création d'une table:
-
-``` bash
-$ echo 'CREATE TABLE t (a UInt8) ENGINE = Memory' | curl 'http://localhost:8123/' --data-binary @-
-```
-
-Utilisation de la requête D'insertion familière pour l'insertion de données:
-
-``` bash
-$ echo 'INSERT INTO t VALUES (1),(2),(3)' | curl 'http://localhost:8123/' --data-binary @-
-```
-
-Les données peuvent être envoyées séparément de la requête:
-
-``` bash
-$ echo '(4),(5),(6)' | curl 'http://localhost:8123/?query=INSERT%20INTO%20t%20VALUES' --data-binary @-
-```
-
-Vous pouvez spécifier n'importe quel format de données. Le ‘Values’ le format est le même que ce qui est utilisé lors de L'écriture INSERT dans les valeurs t:
-
-``` bash
-$ echo '(7),(8),(9)' | curl 'http://localhost:8123/?query=INSERT%20INTO%20t%20FORMAT%20Values' --data-binary @-
-```
-
-Pour insérer des données à partir d'un vidage séparé par des tabulations, spécifiez le format correspondant:
-
-``` bash
-$ echo -ne '10\n11\n12\n' | curl 'http://localhost:8123/?query=INSERT%20INTO%20t%20FORMAT%20TabSeparated' --data-binary @-
-```
-
-La lecture de la table des matières. Les données sont sorties dans un ordre aléatoire en raison d'un traitement de requête parallèle:
-
-``` bash
-$ curl 'http://localhost:8123/?query=SELECT%20a%20FROM%20t'
-7
-8
-9
-10
-11
-12
-1
-2
-3
-4
-5
-6
-```
-
-Suppression de la table.
-
-``` bash
-$ echo 'DROP TABLE t' | curl 'http://localhost:8123/' --data-binary @-
-```
-
-Pour les requêtes réussies qui ne renvoient pas de table de données, un corps de réponse vide est renvoyé.
-
-Vous pouvez utiliser le format de compression ClickHouse interne lors de la transmission de données. Les données compressées ont un format non standard, et vous devrez utiliser le spécial `clickhouse-compressor` programme de travail (il s'est installé avec le `clickhouse-client` paquet). Pour augmenter l'efficacité de l'insertion de données, vous pouvez désactiver la vérification de la somme de contrôle côté serveur en utilisant [http_native_compression_disable_checksumming_on_decompress](../operations/settings/settings.md#settings-http_native_compression_disable_checksumming_on_decompress) paramètre.
-
-Si vous avez spécifié `compress=1` dans l'URL, le serveur compresse les données qu'il vous envoie.
-Si vous avez spécifié `decompress=1` dans L'URL, le serveur décompresse les mêmes données que vous transmettez `POST` méthode.
-
-Vous pouvez également choisir d'utiliser [La compression HTTP](https://en.wikipedia.org/wiki/HTTP_compression). Pour envoyer un compressé `POST` demande, ajouter l'en-tête de requête `Content-Encoding: compression_method`. Pour que ClickHouse compresse la réponse, vous devez ajouter `Accept-Encoding: compression_method`. Supports ClickHouse `gzip`, `br`, et `deflate` [méthodes de compression](https://en.wikipedia.org/wiki/HTTP_compression#Content-Encoding_tokens). Pour activer la compression HTTP, vous devez utiliser le ClickHouse [enable_http_compression](../operations/settings/settings.md#settings-enable_http_compression) paramètre. Vous pouvez configurer le niveau de compression des données dans le [http_zlib_compression_level](#settings-http_zlib_compression_level) pour toutes les méthodes de compression.
-
-Vous pouvez l'utiliser pour réduire le trafic réseau lors de la transmission d'une grande quantité de données, ou pour créer des vidages qui sont immédiatement compressés.
-
-Exemples d'envoi de données avec compression:
-
-``` bash
-#Sending data to the server:
-$ curl -vsS "http://localhost:8123/?enable_http_compression=1" -d 'SELECT number FROM system.numbers LIMIT 10' -H 'Accept-Encoding: gzip'
-
-#Sending data to the client:
-$ echo "SELECT 1" | gzip -c | curl -sS --data-binary @- -H 'Content-Encoding: gzip' 'http://localhost:8123/'
-```
-
-!!! note "Note"
-    Certains clients HTTP peuvent décompresser les données du serveur par défaut (avec `gzip` et `deflate`) et vous pouvez obtenir des données décompressées même si vous utilisez les paramètres de compression correctement.
-
-Vous pouvez utiliser l' ‘database’ Paramètre URL pour spécifier la base de données par défaut.
-
-``` bash
-$ echo 'SELECT number FROM numbers LIMIT 10' | curl 'http://localhost:8123/?database=system' --data-binary @-
-0
-1
-2
-3
-4
-5
-6
-7
-8
-9
-```
-
-Par défaut, la base de données enregistrée dans les paramètres du serveur est utilisée comme base de données par défaut. Par défaut, c'est la base de données appelée ‘default’. Alternativement, vous pouvez toujours spécifier la base de données en utilisant un point avant le nom de la table.
-
-Le nom d'utilisateur et le mot de passe peuvent être indiqués de l'une des trois façons suivantes:
-
-1.  Utilisation de L'authentification de base HTTP. Exemple:
-
-<!-- -->
-
-``` bash
-$ echo 'SELECT 1' | curl 'http://user:password@localhost:8123/' -d @-
-```
-
-1.  Dans le ‘user’ et ‘password’ Les paramètres d'URL. Exemple:
-
-<!-- -->
-
-``` bash
-$ echo 'SELECT 1' | curl 'http://localhost:8123/?user=user&password=password' -d @-
-```
-
-1.  Utiliser ‘X-ClickHouse-User’ et ‘X-ClickHouse-Key’ tête. Exemple:
-
-<!-- -->
-
-``` bash
-$ echo 'SELECT 1' | curl -H 'X-ClickHouse-User: user' -H 'X-ClickHouse-Key: password' 'http://localhost:8123/' -d @-
-```
-
-Si le nom d'utilisateur n'est spécifié, le `default` le nom est utilisé. Si le mot de passe n'est spécifié, le mot de passe vide est utilisé.
-Vous pouvez également utiliser les paramètres D'URL pour spécifier des paramètres pour le traitement d'une seule requête ou de profils entiers de paramètres. Exemple: http: / / localhost: 8123/?profil = web & max_rows_to_read=1000000000 & query=sélectionner + 1
-
-Pour plus d'informations, voir le [Paramètre](../operations/settings/index.md) section.
-
-``` bash
-$ echo 'SELECT number FROM system.numbers LIMIT 10' | curl 'http://localhost:8123/?' --data-binary @-
-0
-1
-2
-3
-4
-5
-6
-7
-8
-9
-```
-
-Pour plus d'informations sur les autres paramètres, consultez la section “SET”.
-
-De même, vous pouvez utiliser des sessions ClickHouse dans le protocole HTTP. Pour ce faire, vous devez ajouter l' `session_id` GET paramètre à la demande. Vous pouvez utiliser n'importe quelle chaîne comme ID de session. Par défaut, la session est terminée après 60 secondes d'inactivité. Pour modifier ce délai d'attente, de modifier la `default_session_timeout` dans la configuration du serveur, ou ajoutez le `session_timeout` GET paramètre à la demande. Pour vérifier l'état de la session, utilisez `session_check=1` paramètre. Une seule requête à la fois peut être exécutée dans une seule session.
-
-Vous pouvez recevoir des informations sur le déroulement d'une requête en `X-ClickHouse-Progress` en-têtes de réponse. Pour ce faire, activez [send_progress_in_http_headers](../operations/settings/settings.md#settings-send_progress_in_http_headers). Exemple de l'en-tête de séquence:
-
-``` text
-X-ClickHouse-Progress: {"read_rows":"2752512","read_bytes":"240570816","total_rows_to_read":"8880128"}
-X-ClickHouse-Progress: {"read_rows":"5439488","read_bytes":"482285394","total_rows_to_read":"8880128"}
-X-ClickHouse-Progress: {"read_rows":"8783786","read_bytes":"819092887","total_rows_to_read":"8880128"}
-```
-
-Possibles champs d'en-tête:
-
--   `read_rows` — Number of rows read.
--   `read_bytes` — Volume of data read in bytes.
--   `total_rows_to_read` — Total number of rows to be read.
--   `written_rows` — Number of rows written.
--   `written_bytes` — Volume of data written in bytes.
-
-Les requêtes en cours d'exécution ne s'arrêtent pas automatiquement si la connexion HTTP est perdue. L'analyse et le formatage des données sont effectués côté serveur et l'utilisation du réseau peut s'avérer inefficace.
-Facultatif ‘query_id’ le paramètre peut être passé comme ID de requête (n'importe quelle chaîne). Pour plus d'informations, consultez la section “Settings, replace_running_query”.
-
-Facultatif ‘quota_key’ le paramètre peut être passé comme clé de quota (n'importe quelle chaîne). Pour plus d'informations, consultez la section “Quotas”.
-
-L'interface HTTP permet de transmettre des données externes (tables temporaires externes) pour l'interrogation. Pour plus d'informations, consultez la section “External data for query processing”.
-
-## Tampon De Réponse {#response-buffering}
-
-Vous pouvez activer la mise en mémoire tampon des réponses côté serveur. Le `buffer_size` et `wait_end_of_query` Les paramètres D'URL sont fournis à cette fin.
-
-`buffer_size` détermine le nombre d'octets dans le résultat de tampon dans la mémoire du serveur. Si un corps de résultat est supérieur à ce seuil, le tampon est écrit sur le canal HTTP et les données restantes sont envoyées directement au canal HTTP.
-
-Pour vous assurer que la réponse entière est mise en mémoire tampon, définissez `wait_end_of_query=1`. Dans ce cas, les données ne sont pas stockées dans la mémoire tampon temporaire du serveur de fichiers.
-
-Exemple:
-
-``` bash
-$ curl -sS 'http://localhost:8123/?max_result_bytes=4000000&buffer_size=3000000&wait_end_of_query=1' -d 'SELECT toUInt8(number) FROM system.numbers LIMIT 9000000 FORMAT RowBinary'
-```
-
-Utilisez la mise en mémoire tampon pour éviter les situations où une erreur de traitement de requête s'est produite après l'envoi du code de réponse et des en-têtes HTTP au client. Dans cette situation, un message d'erreur est écrit à la fin du corps de la réponse, et du côté client, l'erreur ne peut être détectée qu'à l'étape d'analyse.
-
-### Requêtes avec paramètres {#cli-queries-with-parameters}
-
-Vous pouvez créer une requête avec paramètres et transmettre des valeurs des paramètres de la requête HTTP. Pour plus d'informations, voir [Requêtes avec des paramètres pour CLI](cli.md#cli-queries-with-parameters).
-
-### Exemple {#example}
-
-``` bash
-$ curl -sS "<address>?param_id=2&param_phrase=test" -d "SELECT * FROM table WHERE int_column = {id:UInt8} and string_column = {phrase:String}"
-```
-
-## Interface HTTP prédéfinie {#predefined_http_interface}
-
-ClickHouse prend en charge des requêtes spécifiques via L'interface HTTP. Par exemple, vous pouvez écrire des données dans un tableau comme suit:
-
-``` bash
-$ echo '(4),(5),(6)' | curl 'http://localhost:8123/?query=INSERT%20INTO%20t%20VALUES' --data-binary @-
-```
-
-ClickHouse prend également en charge L'Interface HTTP prédéfinie qui peut vous aider à une intégration plus facile avec des outils tiers tels que [Prometheus exportateur](https://github.com/percona-lab/clickhouse_exporter).
-
-Exemple:
-
--   Tout d'abord, ajoutez cette section au fichier de configuration du serveur:
-
-<!-- -->
-
-``` xml
-<http_handlers>
-    <rule>
-        <url>/predefined_query</url>
-        <methods>POST,GET</methods>
-        <handler>
-            <type>predefined_query_handler</type>
-            <query>SELECT * FROM system.metrics LIMIT 5 FORMAT Template SETTINGS format_template_resultset = 'prometheus_template_output_format_resultset', format_template_row = 'prometheus_template_output_format_row', format_template_rows_between_delimiter = '\n'</query>
-        </handler>
-    </rule>
-    <rule>...</rule>
-    <rule>...</rule>
-</http_handlers>
-```
-
--   Vous pouvez maintenant demander l'url directement pour les données au format Prometheus:
-
-<!-- -->
-
-``` bash
-$ curl -v 'http://localhost:8123/predefined_query'
-*   Trying ::1...
-* Connected to localhost (::1) port 8123 (#0)
-> GET /predefined_query HTTP/1.1
-> Host: localhost:8123
-> User-Agent: curl/7.47.0
-> Accept: */*
->
-< HTTP/1.1 200 OK
-< Date: Tue, 28 Apr 2020 08:52:56 GMT
-< Connection: Keep-Alive
-< Content-Type: text/plain; charset=UTF-8
-< X-ClickHouse-Server-Display-Name: i-mloy5trc
-< Transfer-Encoding: chunked
-< X-ClickHouse-Query-Id: 96fe0052-01e6-43ce-b12a-6b7370de6e8a
-< X-ClickHouse-Format: Template
-< X-ClickHouse-Timezone: Asia/Shanghai
-< Keep-Alive: timeout=3
-< X-ClickHouse-Summary: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"0"}
-<
-# HELP "Query" "Number of executing queries"
-# TYPE "Query" counter
-"Query" 1
-
-# HELP "Merge" "Number of executing background merges"
-# TYPE "Merge" counter
-"Merge" 0
-
-# HELP "PartMutation" "Number of mutations (ALTER DELETE/UPDATE)"
-# TYPE "PartMutation" counter
-"PartMutation" 0
-
-# HELP "ReplicatedFetch" "Number of data parts being fetched from replica"
-# TYPE "ReplicatedFetch" counter
-"ReplicatedFetch" 0
-
-# HELP "ReplicatedSend" "Number of data parts being sent to replicas"
-# TYPE "ReplicatedSend" counter
-"ReplicatedSend" 0
-
-* Connection #0 to host localhost left intact
-
-
-* Connection #0 to host localhost left intact
-```
-
-Comme vous pouvez le voir dans l'exemple, si `<http_handlers>` est configuré dans la configuration.fichier xml et `<http_handlers>` peut contenir beaucoup `<rule>s`. ClickHouse fera correspondre les requêtes HTTP reçues au type prédéfini `<rule>` et la première appariés exécute le gestionnaire. Ensuite, ClickHouse exécutera la requête prédéfinie correspondante si la correspondance est réussie.
-
-> Maintenant `<rule>` pouvez configurer `<method>`, `<headers>`, `<url>`,`<handler>`:
-> `<method>` est responsable de la correspondance de la partie méthode de la requête HTTP. `<method>` entièrement conforme à la définition de [méthode](https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods) dans le protocole HTTP. C'est une option de configuration. S'il n'est pas défini dans le fichier de configuration, il ne correspond pas à la partie méthode de la requête HTTP.
->
-> `<url>` est responsable de la correspondance de la partie url de la requête HTTP. Il est compatible avec [RE2](https://github.com/google/re2)s 'expressions régulières. C'est une option de configuration. S'il n'est pas défini dans le fichier de configuration, il ne correspond pas à la partie url de la requête HTTP.
->
-> `<headers>` est responsable de la correspondance de la partie d'en-tête de la requête HTTP. Il est compatible avec les expressions régulières de RE2. C'est une option de configuration. S'il n'est pas défini dans le fichier de configuration, il ne correspond pas à la partie d'en-tête de la requête HTTP.
->
-> `<handler>` contient la partie de traitement principale. Maintenant `<handler>` pouvez configurer `<type>`, `<status>`, `<content_type>`, `<response_content>`, `<query>`, `<query_param_name>`.
-> \> `<type>` prend actuellement en charge trois types: **predefined_query_handler**, **dynamic_query_handler**, **statique**.
-> \>
-> \> `<query>` - utiliser avec le type predefined_query_handler, exécute la requête lorsque le gestionnaire est appelé.
-> \>
-> \> `<query_param_name>` - utiliser avec le type dynamic_query_handler, extrait et exécute la valeur correspondant au `<query_param_name>` valeur dans les paramètres de requête HTTP.
-> \>
-> \> `<status>` - utiliser avec le type statique, code d'état de réponse.
-> \>
-> \> `<content_type>` - utiliser avec statique type, réponse [content-type](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Type).
-> \>
-> \> `<response_content>` - utiliser avec le type statique, le contenu de la réponse envoyé au client, lors de l'utilisation du préfixe ‘file://’ ou ‘config://’, trouver le contenu du fichier ou de la configuration envoyer au client.
-
-Viennent ensuite les méthodes de configuration pour les différents `<type>`.
-
-## predefined_query_handler {#predefined_query_handler}
-
-`<predefined_query_handler>` prend en charge les paramètres de réglage et les valeurs query_params. Vous pouvez configurer `<query>` dans le type de `<predefined_query_handler>`.
-
-`<query>` la valeur est une requête prédéfinie de `<predefined_query_handler>`, qui est exécuté par ClickHouse lorsqu'une requête HTTP est mise en correspondance et que le résultat de la requête est renvoyé. C'est une configuration incontournable.
-
-L'exemple suivant définit les valeurs de `max_threads` et `max_alter_threads` Paramètres, puis interroge la table système pour vérifier si ces paramètres ont été définis avec succès.
-
-Exemple:
-
-``` xml
-<http_handlers>
-    <rule>
-        <url><![CDATA[/query_param_with_url/\w+/(?P<name_1>[^/]+)(/(?P<name_2>[^/]+))?]]></url>
-        <method>GET</method>
-        <headers>
-            <XXX>TEST_HEADER_VALUE</XXX>
-            <PARAMS_XXX><![CDATA[(?P<name_1>[^/]+)(/(?P<name_2>[^/]+))?]]></PARAMS_XXX>
-        </headers>
-        <handler>
-            <type>predefined_query_handler</type>
-            <query>SELECT value FROM system.settings WHERE name = {name_1:String}</query>
-            <query>SELECT name, value FROM system.settings WHERE name = {name_2:String}</query>
-        </handler>
-    </rule>
-</http_handlers>
-```
-
-``` bash
-$ curl -H 'XXX:TEST_HEADER_VALUE' -H 'PARAMS_XXX:max_threads' 'http://localhost:8123/query_param_with_url/1/max_threads/max_alter_threads?max_threads=1&max_alter_threads=2'
-1
-max_alter_threads   2
-```
-
-!!! note "précaution"
-    Dans un `<predefined_query_handler>` prend en charge un seul `<query>` d'un type d'insertion.
-
-## dynamic_query_handler {#dynamic_query_handler}
-
-Dans `<dynamic_query_handler>`, la requête est écrite sous la forme de param de la requête HTTP. La différence est que dans `<predefined_query_handler>`, la requête est écrite dans le fichier de configuration. Vous pouvez configurer `<query_param_name>` dans `<dynamic_query_handler>`.
-
-Clickhouse extrait et exécute la valeur correspondant au `<query_param_name>` valeur dans l'url de la requête HTTP. La valeur par défaut de `<query_param_name>` être `/query` . C'est une option de configuration. Si il n'y a pas de définition dans le fichier de configuration, le paramètre n'est pas passé.
-
-Pour expérimenter cette fonctionnalité, l'exemple définit les valeurs de max_threads et max_alter_threads et demande si les paramètres ont été définis avec succès.
-
-Exemple:
-
-``` xml
-<http_handlers>
-    <rule>
-    <headers>
-        <XXX>TEST_HEADER_VALUE_DYNAMIC</XXX>    </headers>
-    <handler>
-        <type>dynamic_query_handler</type>
-        <query_param_name>query_param</query_param_name>
-    </handler>
-    </rule>
-</http_handlers>
-```
-
-``` bash
-$ curl  -H 'XXX:TEST_HEADER_VALUE_DYNAMIC'  'http://localhost:8123/own?max_threads=1&max_alter_threads=2&param_name_1=max_threads&param_name_2=max_alter_threads&query_param=SELECT%20name,value%20FROM%20system.settings%20where%20name%20=%20%7Bname_1:String%7D%20OR%20name%20=%20%7Bname_2:String%7D'
-max_threads 1
-max_alter_threads   2
-```
-
-## statique {#static}
-
-`<static>` peut-retour [content_type](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Type), [statut](https://developer.mozilla.org/en-US/docs/Web/HTTP/Status) et response_content. response_content peut renvoyer le contenu spécifié
-
-Exemple:
-
-De retour d'un message.
-
-``` xml
-<http_handlers>
-        <rule>
-            <methods>GET</methods>
-            <headers><XXX>xxx</XXX></headers>
-            <url>/hi</url>
-            <handler>
-                <type>static</type>
-                <status>402</status>
-                <content_type>text/html; charset=UTF-8</content_type>
-                <response_content>Say Hi!</response_content>
-            </handler>
-        </rule>
-<http_handlers>
-```
-
-``` bash
-$ curl -vv  -H 'XXX:xxx' 'http://localhost:8123/hi'
-*   Trying ::1...
-* Connected to localhost (::1) port 8123 (#0)
-> GET /hi HTTP/1.1
-> Host: localhost:8123
-> User-Agent: curl/7.47.0
-> Accept: */*
-> XXX:xxx
->
-< HTTP/1.1 402 Payment Required
-< Date: Wed, 29 Apr 2020 03:51:26 GMT
-< Connection: Keep-Alive
-< Content-Type: text/html; charset=UTF-8
-< Transfer-Encoding: chunked
-< Keep-Alive: timeout=3
-< X-ClickHouse-Summary: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"0"}
-<
-* Connection #0 to host localhost left intact
-Say Hi!%
-```
-
-Trouvez le contenu de la configuration envoyer au client.
-
-``` xml
-<get_config_static_handler><![CDATA[<html ng-app="SMI2"><head><base href="http://ui.tabix.io/"></head><body><div ui-view="" class="content-ui"></div><script src="http://loader.tabix.io/master.js"></script></body></html>]]></get_config_static_handler>
-
-<http_handlers>
-        <rule>
-            <methods>GET</methods>
-            <headers><XXX>xxx</XXX></headers>
-            <url>/get_config_static_handler</url>
-            <handler>
-                <type>static</type>
-                <response_content>config://get_config_static_handler</response_content>
-            </handler>
-        </rule>
-</http_handlers>
-```
-
-``` bash
-$ curl -v  -H 'XXX:xxx' 'http://localhost:8123/get_config_static_handler'
-*   Trying ::1...
-* Connected to localhost (::1) port 8123 (#0)
-> GET /get_config_static_handler HTTP/1.1
-> Host: localhost:8123
-> User-Agent: curl/7.47.0
-> Accept: */*
-> XXX:xxx
->
-< HTTP/1.1 200 OK
-< Date: Wed, 29 Apr 2020 04:01:24 GMT
-< Connection: Keep-Alive
-< Content-Type: text/plain; charset=UTF-8
-< Transfer-Encoding: chunked
-< Keep-Alive: timeout=3
-< X-ClickHouse-Summary: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"0"}
-<
-* Connection #0 to host localhost left intact
-<html ng-app="SMI2"><head><base href="http://ui.tabix.io/"></head><body><div ui-view="" class="content-ui"></div><script src="http://loader.tabix.io/master.js"></script></body></html>%
-```
-
-Trouvez le contenu du fichier envoyé au client.
-
-``` xml
-<http_handlers>
-        <rule>
-            <methods>GET</methods>
-            <headers><XXX>xxx</XXX></headers>
-            <url>/get_absolute_path_static_handler</url>
-            <handler>
-                <type>static</type>
-                <content_type>text/html; charset=UTF-8</content_type>
-                <response_content>file:///absolute_path_file.html</response_content>
-            </handler>
-        </rule>
-        <rule>
-            <methods>GET</methods>
-            <headers><XXX>xxx</XXX></headers>
-            <url>/get_relative_path_static_handler</url>
-            <handler>
-                <type>static</type>
-                <content_type>text/html; charset=UTF-8</content_type>
-                <response_content>file://./relative_path_file.html</response_content>
-            </handler>
-        </rule>
-</http_handlers>
-```
-
-``` bash
-$ user_files_path='/var/lib/clickhouse/user_files'
-$ sudo echo "<html><body>Relative Path File</body></html>" > $user_files_path/relative_path_file.html
-$ sudo echo "<html><body>Absolute Path File</body></html>" > $user_files_path/absolute_path_file.html
-$ curl -vv -H 'XXX:xxx' 'http://localhost:8123/get_absolute_path_static_handler'
-*   Trying ::1...
-* Connected to localhost (::1) port 8123 (#0)
-> GET /get_absolute_path_static_handler HTTP/1.1
-> Host: localhost:8123
-> User-Agent: curl/7.47.0
-> Accept: */*
-> XXX:xxx
->
-< HTTP/1.1 200 OK
-< Date: Wed, 29 Apr 2020 04:18:16 GMT
-< Connection: Keep-Alive
-< Content-Type: text/html; charset=UTF-8
-< Transfer-Encoding: chunked
-< Keep-Alive: timeout=3
-< X-ClickHouse-Summary: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"0"}
-<
-<html><body>Absolute Path File</body></html>
-* Connection #0 to host localhost left intact
-$ curl -vv -H 'XXX:xxx' 'http://localhost:8123/get_relative_path_static_handler'
-*   Trying ::1...
-* Connected to localhost (::1) port 8123 (#0)
-> GET /get_relative_path_static_handler HTTP/1.1
-> Host: localhost:8123
-> User-Agent: curl/7.47.0
-> Accept: */*
-> XXX:xxx
->
-< HTTP/1.1 200 OK
-< Date: Wed, 29 Apr 2020 04:18:31 GMT
-< Connection: Keep-Alive
-< Content-Type: text/html; charset=UTF-8
-< Transfer-Encoding: chunked
-< Keep-Alive: timeout=3
-< X-ClickHouse-Summary: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"0"}
-<
-<html><body>Relative Path File</body></html>
-* Connection #0 to host localhost left intact
-```
-
-[Article Original](https://clickhouse.tech/docs/en/interfaces/http_interface/) <!--hide-->
diff --git a/docs/fr/interfaces/index.md b/docs/fr/interfaces/index.md
deleted file mode 100644
index bba875be1f2..00000000000
--- a/docs/fr/interfaces/index.md
+++ /dev/null
@@ -1,29 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: Interface
-toc_priority: 14
-toc_title: Introduction
----
-
-# Interface {#interfaces}
-
-ClickHouse fournit deux interfaces réseau (les deux peuvent être encapsulées en option dans TLS pour plus de sécurité):
-
--   [HTTP](http.md) qui est documenté et facile à utiliser directement.
--   [Natif de TCP](tcp.md) qui a moins de frais généraux.
-
-Dans la plupart des cas, il est recommandé d'utiliser un outil ou une bibliothèque approprié au lieu d'interagir directement avec ceux-ci. Officiellement pris en charge par Yandex sont les suivants:
-
--   [Client de ligne de commande](cli.md)
--   [JDBC](jdbc.md)
--   [Pilote ODBC](odbc.md)
--   [Bibliothèque client c++ ](cpp.md)
-
-Il existe également un large éventail de bibliothèques tierces pour travailler avec ClickHouse:
-
--   [Bibliothèques clientes](third-party/client-libraries.md)
--   [Intégration](third-party/integrations.md)
--   [Les interfaces visuelles](third-party/gui.md)
-
-[Article Original](https://clickhouse.tech/docs/en/interfaces/) <!--hide-->
diff --git a/docs/fr/interfaces/jdbc.md b/docs/fr/interfaces/jdbc.md
deleted file mode 100644
index dc68dcb9831..00000000000
--- a/docs/fr/interfaces/jdbc.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 22
-toc_title: JDBC
----
-
-# JDBC {#jdbc-driver}
-
--   **[Pilote officiel](https://github.com/ClickHouse/clickhouse-jdbc)**
--   Les pilotes tiers:
-    -   [ClickHouse-natif-JDBC](https://github.com/housepower/ClickHouse-Native-JDBC)
-    -   [clickhouse4j](https://github.com/blynkkk/clickhouse4j)
-
-[Article Original](https://clickhouse.tech/docs/en/interfaces/jdbc/) <!--hide-->
diff --git a/docs/fr/interfaces/mysql.md b/docs/fr/interfaces/mysql.md
deleted file mode 100644
index 051538d45b2..00000000000
--- a/docs/fr/interfaces/mysql.md
+++ /dev/null
@@ -1,49 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 20
-toc_title: Interface MySQL
----
-
-# Interface MySQL {#mysql-interface}
-
-ClickHouse prend en charge le protocole de fil MySQL. Il peut être activé par [mysql_port](../operations/server-configuration-parameters/settings.md#server_configuration_parameters-mysql_port) paramètre dans le fichier de configuration:
-
-``` xml
-<mysql_port>9004</mysql_port>
-```
-
-Exemple de connexion à l'aide d'outil de ligne de commande `mysql`:
-
-``` bash
-$ mysql --protocol tcp -u default -P 9004
-```
-
-Sortie si une connexion a réussi:
-
-``` text
-Welcome to the MySQL monitor.  Commands end with ; or \g.
-Your MySQL connection id is 4
-Server version: 20.2.1.1-ClickHouse
-
-Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
-
-Oracle is a registered trademark of Oracle Corporation and/or its
-affiliates. Other names may be trademarks of their respective
-owners.
-
-Type 'help;' or '\h' for help. Type '\c' to clear the current input statement.
-
-mysql>
-```
-
-Pour la compatibilité avec tous les clients MySQL, il est recommandé de spécifier le mot de passe utilisateur avec [double SHA1](../operations/settings/settings-users.md#password_double_sha1_hex) dans le fichier de configuration.
-Si le mot de passe de l'utilisateur est spécifié [SHA256](../operations/settings/settings-users.md#password_sha256_hex), certains clients ne pourront pas s'authentifier (mysqljs et anciennes versions de l'outil de ligne de commande mysql).
-
-Restriction:
-
--   les requêtes préparées ne sont pas prises en charge
-
--   certains types de données sont envoyés sous forme de chaînes
-
-[Article Original](https://clickhouse.tech/docs/en/interfaces/mysql/) <!--hide-->
diff --git a/docs/fr/interfaces/odbc.md b/docs/fr/interfaces/odbc.md
deleted file mode 100644
index 991dc833502..00000000000
--- a/docs/fr/interfaces/odbc.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 23
-toc_title: Pilote ODBC
----
-
-# Pilote ODBC {#odbc-driver}
-
--   [Pilote officiel](https://github.com/ClickHouse/clickhouse-odbc).
-
-[Article Original](https://clickhouse.tech/docs/en/interfaces/odbc/) <!--hide-->
diff --git a/docs/fr/interfaces/tcp.md b/docs/fr/interfaces/tcp.md
deleted file mode 100644
index d1fa251e0e4..00000000000
--- a/docs/fr/interfaces/tcp.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 18
-toc_title: Interface Native (TCP)
----
-
-# Interface Native (TCP) {#native-interface-tcp}
-
-Le protocole natif est utilisé dans le [client de ligne de commande](cli.md), pour la communication inter-serveur pendant le traitement de requête distribué, et également dans d'autres programmes C++. Malheureusement, le protocole clickhouse natif n'a pas encore de spécification formelle, mais il peut être rétro-conçu à partir du code source ClickHouse (démarrage [ici](https://github.com/ClickHouse/ClickHouse/tree/master/src/Client)) et/ou en interceptant et en analysant le trafic TCP.
-
-[Article Original](https://clickhouse.tech/docs/en/interfaces/tcp/) <!--hide-->
diff --git a/docs/fr/interfaces/third-party/client-libraries.md b/docs/fr/interfaces/third-party/client-libraries.md
deleted file mode 100644
index 7949aa1d7cf..00000000000
--- a/docs/fr/interfaces/third-party/client-libraries.md
+++ /dev/null
@@ -1,62 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 26
-toc_title: "Biblioth\xE8ques Clientes"
----
-
-# Bibliothèques clientes de développeurs tiers {#client-libraries-from-third-party-developers}
-
-!!! warning "Avertissement"
-    Yandex ne **pas** maintenir les bibliothèques énumérées ci-dessous et n'ont pas fait de tests approfondis pour assurer leur qualité.
-
--   Python
-    -   [infi.clickhouse_orm](https://github.com/Infinidat/infi.clickhouse_orm)
-    -   [clickhouse-chauffeur](https://github.com/mymarilyn/clickhouse-driver)
-    -   [clickhouse-client](https://github.com/yurial/clickhouse-client)
-    -   [aiochclient](https://github.com/maximdanilchenko/aiochclient)
-    -   [asynch](https://github.com/long2ice/asynch)
--   PHP
-    -   [smi2 / phpclickhouse](https://packagist.org/packages/smi2/phpClickHouse)
-    -   [8bitov / clickhouse-PHP-client](https://packagist.org/packages/8bitov/clickhouse-php-client)
-    -   [bozerkins / clickhouse-client](https://packagist.org/packages/bozerkins/clickhouse-client)
-    -   [simpod / clickhouse-client](https://packagist.org/packages/simpod/clickhouse-client)
-    -   [seva-code/php-cliquez-maison-client](https://packagist.org/packages/seva-code/php-click-house-client)
-    -   [Client Seasclick c++ ](https://github.com/SeasX/SeasClick)
--   Aller
-    -   [clickhouse](https://github.com/kshvakov/clickhouse/)
-    -   [aller-clickhouse](https://github.com/roistat/go-clickhouse)
-    -   [mailrugo-clickhouse](https://github.com/mailru/go-clickhouse)
-    -   [golang-clickhouse](https://github.com/leprosus/golang-clickhouse)
--   NodeJs
-    -   [clickhouse (NodeJs)](https://github.com/TimonKK/clickhouse)
-    -   [node-clickhouse](https://github.com/apla/node-clickhouse)
--   Perl
-    -   [perl-DBD-ClickHouse](https://github.com/elcamlost/perl-DBD-ClickHouse)
-    -   [HTTP-ClickHouse](https://metacpan.org/release/HTTP-ClickHouse)
-    -   [AnyEvent-ClickHouse](https://metacpan.org/release/AnyEvent-ClickHouse)
--   Rubis
-    -   [ClickHouse (Ruby)](https://github.com/shlima/click_house)
-    -   [clickhouse-activerecord](https://github.com/PNixx/clickhouse-activerecord)
--   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)
-    -   [clickhouse-client](https://github.com/Ecwid/clickhouse-client)
--   Scala
-    -   [clickhouse-Scala-client](https://github.com/crobox/clickhouse-scala-client)
--   Kotlin
-    -   [AORM](https://github.com/TanVD/AORM)
--   C#
-    -   [Octonica.ClickHouseClient](https://github.com/Octonica/ClickHouseClient)
-    -   [ClickHouse.Ado](https://github.com/killwort/ClickHouse-Net)
-    -   [ClickHouse.Client](https://github.com/DarkWanderer/ClickHouse.Client)
-    -   [ClickHouse.Net](https://github.com/ilyabreev/ClickHouse.Net)
--   Elixir
-    -   [clickhousex](https://github.com/appodeal/clickhousex/)
-    -   [pilier](https://github.com/sofakingworld/pillar)
--   Nim
-    -   [nim-clickhouse](https://github.com/leonardoce/nim-clickhouse)
-
-[Article Original](https://clickhouse.tech/docs/en/interfaces/third-party/client_libraries/) <!--hide-->
diff --git a/docs/fr/interfaces/third-party/gui.md b/docs/fr/interfaces/third-party/gui.md
deleted file mode 100644
index af25f86ee54..00000000000
--- a/docs/fr/interfaces/third-party/gui.md
+++ /dev/null
@@ -1,156 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 28
-toc_title: Les Interfaces Visuelles
----
-
-# Interfaces visuelles de développeurs tiers {#visual-interfaces-from-third-party-developers}
-
-## Open-Source {#open-source}
-
-### Tabix {#tabix}
-
-Interface Web pour ClickHouse dans le [Tabix](https://github.com/tabixio/tabix) projet.
-
-Caractéristique:
-
--   Fonctionne avec ClickHouse directement à partir du navigateur, sans avoir besoin d'installer un logiciel supplémentaire.
--   Éditeur de requête avec coloration syntaxique.
--   L'Auto-complétion des commandes.
--   Outils d'analyse graphique de l'exécution des requêtes.
--   Options de jeu de couleurs.
-
-[Documentation Tabix](https://tabix.io/doc/).
-
-### HouseOps {#houseops}
-
-[HouseOps](https://github.com/HouseOps/HouseOps) est une interface utilisateur / IDE pour OSX, Linux et Windows.
-
-Caractéristique:
-
--   Générateur de requêtes avec coloration syntaxique. Affichez la réponse dans une table ou une vue JSON.
--   Exporter les résultats de la requête au format CSV ou JSON.
--   Liste des processus avec des descriptions. Le mode d'écriture. Capacité à arrêter (`KILL`) processus.
--   Base de données du graphique. Affiche toutes les tables et leurs colonnes avec des informations supplémentaires.
--   Une vue rapide de la taille de la colonne.
--   La configuration du serveur.
-
-Les fonctionnalités suivantes sont prévues pour le développement:
-
--   Gestion de base de données.
--   La gestion des utilisateurs.
--   En temps réel l'analyse des données.
--   Surveillance de Cluster.
--   La gestion de Cluster.
--   Suivi des tables répliquées et Kafka.
-
-### Phare {#lighthouse}
-
-[Phare](https://github.com/VKCOM/lighthouse) est une interface web légère pour ClickHouse.
-
-Caractéristique:
-
--   Liste de Table avec filtrage et métadonnées.
--   Aperçu de la Table avec filtrage et tri.
--   Les requêtes en lecture seule exécution.
-
-### Redash {#redash}
-
-[Redash](https://github.com/getredash/redash) est une plate-forme pour la visualisation des données.
-
-Prise en charge de plusieurs sources de données, y compris ClickHouse, Redash peut joindre les résultats des requêtes provenant de différentes sources de données dans un ensemble de données final.
-
-Caractéristique:
-
--   Puissant éditeur de requêtes.
--   Explorateur de base de données.
--   Des outils de visualisation qui vous permettent de représenter des données sous différentes formes.
-
-### DBeaver {#dbeaver}
-
-[DBeaver](https://dbeaver.io/) - client de base de données de bureau universel avec support ClickHouse.
-
-Caractéristique:
-
--   Développement de requêtes avec mise en évidence de la syntaxe et complétion automatique.
--   Liste de Table avec filtres et recherche de métadonnées.
--   Aperçu des données de la Table.
--   Recherche en texte intégral.
-
-### clickhouse-cli {#clickhouse-cli}
-
-[clickhouse-cli](https://github.com/hatarist/clickhouse-cli) est un client de ligne de commande alternatif pour ClickHouse, écrit en Python 3.
-
-Caractéristique:
-
--   Complétion.
--   Coloration syntaxique pour les requêtes et la sortie de données.
--   Support Pager pour la sortie de données.
--   Commandes personnalisées de type PostgreSQL.
-
-### clickhouse-flamegraph {#clickhouse-flamegraph}
-
-[clickhouse-flamegraph](https://github.com/Slach/clickhouse-flamegraph) est un outil spécialisé pour visualiser la `system.trace_log` comme [flamegraph](http://www.brendangregg.com/flamegraphs.html).
-
-### clickhouse-plantuml {#clickhouse-plantuml}
-
-[cickhouse-plantuml](https://pypi.org/project/clickhouse-plantuml/) est un script à générer [PlantUML](https://plantuml.com/) schéma des schémas des tableaux.
-
-## Commercial {#commercial}
-
-### DataGrip {#datagrip}
-
-[DataGrip](https://www.jetbrains.com/datagrip/) est un IDE de base de données de JetBrains avec un support dédié pour ClickHouse. Il est également intégré dans D'autres outils basés sur IntelliJ: PyCharm, IntelliJ IDEA, GoLand, PhpStorm et autres.
-
-Caractéristique:
-
--   Achèvement du code très rapide.
--   Mise en évidence de la syntaxe ClickHouse.
--   Prise en charge des fonctionnalités spécifiques à ClickHouse, par exemple, les colonnes imbriquées, les moteurs de table.
--   Éditeur De Données.
--   Refactoring.
--   Recherche et Navigation.
-
-### Yandex DataLens {#yandex-datalens}
-
-[Yandex DataLens](https://cloud.yandex.ru/services/datalens) est un service de visualisation et d'analyse de données.
-
-Caractéristique:
-
--   Large gamme de visualisations disponibles, des graphiques à barres simples aux tableaux de bord complexes.
--   Les tableaux de bord pourraient être rendus publics.
--   Prise en charge de plusieurs sources de données, y compris ClickHouse.
--   Stockage de données matérialisées basé sur ClickHouse.
-
-DataLens est [disponible gratuitement](https://cloud.yandex.com/docs/datalens/pricing) pour les projets à faible charge, même pour un usage commercial.
-
--   [Documentation DataLens](https://cloud.yandex.com/docs/datalens/).
--   [Tutoriel](https://cloud.yandex.com/docs/solutions/datalens/data-from-ch-visualization) sur la visualisation des données à partir d'une base de données ClickHouse.
-
-### Logiciel Holistics {#holistics-software}
-
-[Holistics](https://www.holistics.io/) est une plate-forme de données à pile complète et un outil de business intelligence.
-
-Caractéristique:
-
--   E-mail automatisé, Slack et Google Sheet horaires de rapports.
--   Éditeur SQL avec visualisations, contrôle de version, auto-complétion, composants de requête réutilisables et filtres dynamiques.
--   Analyse intégrée des rapports et des tableaux de bord via iframe.
--   Préparation des données et capacités ETL.
--   Prise en charge de la modélisation des données SQL pour la cartographie relationnelle des données.
-
-### Looker {#looker}
-
-[Looker](https://looker.com) est une plate-forme de données et un outil de business intelligence avec prise en charge de plus de 50 dialectes de base de données, y compris ClickHouse. Looker est disponible en tant que plate-forme SaaS et auto-hébergé. Les utilisateurs peuvent utiliser Looker via le navigateur pour explorer les données, créer des visualisations et des tableaux de bord, planifier des rapports et partager leurs idées avec des collègues. Looker fournit un riche ensemble d'outils pour intégrer ces fonctionnalités dans d'autres applications, et une API
-pour intégrer les données avec d'autres applications.
-
-Caractéristique:
-
--   Développement facile et agile en utilisant LookML, un langage qui prend en charge curated
-    [La Modélisation Des Données](https://looker.com/platform/data-modeling) pour soutenir les auteurs et les utilisateurs finaux.
--   Intégration de flux de travail puissante via Looker [Actions De Données](https://looker.com/platform/actions).
-
-[Comment configurer ClickHouse dans Looker.](https://docs.looker.com/setup-and-management/database-config/clickhouse)
-
-[Article Original](https://clickhouse.tech/docs/en/interfaces/third-party/gui/) <!--hide-->
diff --git a/docs/fr/interfaces/third-party/index.md b/docs/fr/interfaces/third-party/index.md
deleted file mode 100644
index fd721a39c3e..00000000000
--- a/docs/fr/interfaces/third-party/index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: tiers
-toc_priority: 24
----
-
-
diff --git a/docs/fr/interfaces/third-party/integrations.md b/docs/fr/interfaces/third-party/integrations.md
deleted file mode 100644
index 1b74a49dc89..00000000000
--- a/docs/fr/interfaces/third-party/integrations.md
+++ /dev/null
@@ -1,110 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 27
-toc_title: "Int\xE9gration"
----
-
-# Bibliothèques d'intégration de développeurs tiers {#integration-libraries-from-third-party-developers}
-
-!!! warning "Avertissement"
-    Yandex ne **pas** maintenir les outils et les bibliothèques énumérés ci-dessous et n'ont pas fait de tests approfondis pour assurer leur qualité.
-
-## Produits D'Infrastructure {#infrastructure-products}
-
--   Systèmes de gestion de bases de données relationnelles
-    -   [MySQL](https://www.mysql.com)
-        -   [mysql2ch](https://github.com/long2ice/mysql2ch)
-        -   [ProxySQL](https://github.com/sysown/proxysql/wiki/ClickHouse-Support)
-        -   [clickhouse-mysql-lecteur de données](https://github.com/Altinity/clickhouse-mysql-data-reader)
-        -   [horgh-réplicateur](https://github.com/larsnovikov/horgh-replicator)
-    -   [PostgreSQL](https://www.postgresql.org)
-        -   [clickhousedb_fdw](https://github.com/Percona-Lab/clickhousedb_fdw)
-        -   [infi.clickhouse_fdw](https://github.com/Infinidat/infi.clickhouse_fdw) (utiliser [infi.clickhouse_orm](https://github.com/Infinidat/infi.clickhouse_orm))
-        -   [pg2ch](https://github.com/mkabilov/pg2ch)
-        -   [clickhouse_fdw](https://github.com/adjust/clickhouse_fdw)
-    -   [MSSQL](https://en.wikipedia.org/wiki/Microsoft_SQL_Server)
-        -   [ClickHouseMigrator](https://github.com/zlzforever/ClickHouseMigrator)
--   Files d'attente de messages
-    -   [Kafka](https://kafka.apache.org)
-        -   [clickhouse_sinker](https://github.com/housepower/clickhouse_sinker) (utiliser [Allez client](https://github.com/ClickHouse/clickhouse-go/))
-        -   [stream-loader-clickhouse](https://github.com/adform/stream-loader)
--   Traitement de flux
-    -   [Flink](https://flink.apache.org)
-        -   [flink-clickhouse-évier](https://github.com/ivi-ru/flink-clickhouse-sink)
--   Objet de stockages
-    -   [S3](https://en.wikipedia.org/wiki/Amazon_S3)
-        -   [clickhouse-sauvegarde](https://github.com/AlexAkulov/clickhouse-backup)
--   Orchestration de conteneur
-    -   [Kubernetes](https://kubernetes.io)
-        -   [clickhouse-opérateur](https://github.com/Altinity/clickhouse-operator)
--   Gestion de la Configuration
-    -   [marionnette](https://puppet.com)
-        -   [innogames / clickhouse](https://forge.puppet.com/innogames/clickhouse)
-        -   [mfedotov / clickhouse](https://forge.puppet.com/mfedotov/clickhouse)
--   Surveiller
-    -   [Graphite](https://graphiteapp.org)
-        -   [graphouse](https://github.com/yandex/graphouse)
-        -   [carbone-clickhouse](https://github.com/lomik/carbon-clickhouse) +
-        -   [graphite-clickhouse](https://github.com/lomik/graphite-clickhouse)
-        -   [graphite-CH-optimizer](https://github.com/innogames/graphite-ch-optimizer) - optimise les partitions calées dans [\* GraphiteMergeTree](../../engines/table-engines/mergetree-family/graphitemergetree.md#graphitemergetree) si les règles de [configuration de cumul](../../engines/table-engines/mergetree-family/graphitemergetree.md#rollup-configuration) pourrait être appliquée
-    -   [Grafana](https://grafana.com/)
-        -   [clickhouse-grafana](https://github.com/Vertamedia/clickhouse-grafana)
-    -   [Prometheus](https://prometheus.io/)
-        -   [clickhouse_exporter](https://github.com/f1yegor/clickhouse_exporter)
-        -   [PromHouse](https://github.com/Percona-Lab/PromHouse)
-        -   [clickhouse_exporter](https://github.com/hot-wifi/clickhouse_exporter) (utiliser [Allez client](https://github.com/kshvakov/clickhouse/))
-    -   [Nagios](https://www.nagios.org/)
-        -   [check_clickhouse](https://github.com/exogroup/check_clickhouse/)
-        -   [check_clickhouse.py](https://github.com/innogames/igmonplugins/blob/master/src/check_clickhouse.py)
-    -   [Zabbix](https://www.zabbix.com)
-        -   [clickhouse-Zabbix-modèle](https://github.com/Altinity/clickhouse-zabbix-template)
-    -   [Sematext](https://sematext.com/)
-        -   [intégration de clickhouse](https://github.com/sematext/sematext-agent-integrations/tree/master/clickhouse)
--   Journalisation
-    -   [rsyslog](https://www.rsyslog.com/)
-        -   [omclickhouse](https://www.rsyslog.com/doc/master/configuration/modules/omclickhouse.html)
-    -   [fluentd](https://www.fluentd.org)
-        -   [maison de bois](https://github.com/flant/loghouse) (pour [Kubernetes](https://kubernetes.io))
-    -   [logagent](https://www.sematext.com/logagent)
-        -   [sortie logagent-plugin-clickhouse](https://sematext.com/docs/logagent/output-plugin-clickhouse/)
--   Geo
-    -   [MaxMind](https://dev.maxmind.com/geoip/)
-        -   [clickhouse-maxmind-geoip](https://github.com/AlexeyKupershtokh/clickhouse-maxmind-geoip)
-
-## Écosystèmes De Langage De Programmation {#programming-language-ecosystems}
-
--   Python
-    -   [SQLAlchemy](https://www.sqlalchemy.org)
-        -   [sqlalchemy-clickhouse](https://github.com/cloudflare/sqlalchemy-clickhouse) (utiliser [infi.clickhouse_orm](https://github.com/Infinidat/infi.clickhouse_orm))
-    -   [Panda](https://pandas.pydata.org)
-        -   [pandahouse](https://github.com/kszucs/pandahouse)
--   PHP
-    -   [Doctrine](https://www.doctrine-project.org/)
-        -   [dbal-clickhouse](https://packagist.org/packages/friendsofdoctrine/dbal-clickhouse)
--   R
-    -   [dplyr](https://db.rstudio.com/dplyr/)
-        -   [RClickHouse](https://github.com/IMSMWU/RClickHouse) (utiliser [clickhouse-cpp](https://github.com/artpaul/clickhouse-cpp))
--   Java
-    -   [Hadoop](http://hadoop.apache.org)
-        -   [clickhouse-HDFS-chargeur](https://github.com/jaykelin/clickhouse-hdfs-loader) (utiliser [JDBC](../../sql-reference/table-functions/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.Client](https://github.com/DarkWanderer/ClickHouse.Client)
-        -   [ClickHouse.Net](https://github.com/ilyabreev/ClickHouse.Net)
-        -   [ClickHouse.Net.Les Migrations](https://github.com/ilyabreev/ClickHouse.Net.Migrations)
--   Elixir
-    -   [Ecto](https://github.com/elixir-ecto/ecto)
-        -   [clickhouse_ecto](https://github.com/appodeal/clickhouse_ecto)
--   Ruby
-    -   [Ruby on Rails](https://rubyonrails.org/)
-        -   [activecube](https://github.com/bitquery/activecube)
-        -   [ActiveRecord](https://github.com/PNixx/clickhouse-activerecord)
-    -   [GraphQL](https://github.com/graphql)
-        -   [activecube-graphql](https://github.com/bitquery/activecube-graphql)
-
-[Article Original](https://clickhouse.tech/docs/en/interfaces/third-party/integrations/) <!--hide-->
diff --git a/docs/fr/interfaces/third-party/proxy.md b/docs/fr/interfaces/third-party/proxy.md
deleted file mode 100644
index 0283cc7fbe6..00000000000
--- a/docs/fr/interfaces/third-party/proxy.md
+++ /dev/null
@@ -1,46 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 29
-toc_title: Proxy
----
-
-# Serveurs Proxy de développeurs tiers {#proxy-servers-from-third-party-developers}
-
-## chproxy {#chproxy}
-
-[chproxy](https://github.com/Vertamedia/chproxy), est un proxy HTTP et un équilibreur de charge pour la base de données ClickHouse.
-
-Caractéristique:
-
--   Routage par utilisateur et mise en cache des réponses.
--   Limites flexibles.
--   Renouvellement automatique du certificat SSL.
-
-Mis en œuvre dans Go.
-
-## KittenHouse {#kittenhouse}
-
-[KittenHouse](https://github.com/VKCOM/kittenhouse) est conçu pour être un proxy local entre ClickHouse et serveur d'applications dans le cas où il est impossible ou gênant d'insérer des données en mémoire tampon du côté de votre application.
-
-Caractéristique:
-
--   En mémoire et sur disque de données en mémoire tampon.
--   Routage par table.
--   Équilibrage de charge et vérification de la santé.
-
-Mis en œuvre dans Go.
-
-## ClickHouse-Vrac {#clickhouse-bulk}
-
-[ClickHouse-Vrac](https://github.com/nikepan/clickhouse-bulk) est un collecteur simple D'insertion de ClickHouse.
-
-Caractéristique:
-
--   Groupez les demandes et envoyez-les par seuil ou intervalle.
--   Plusieurs serveurs distants.
--   L'authentification de base.
-
-Mis en œuvre dans Go.
-
-[Article Original](https://clickhouse.tech/docs/en/interfaces/third-party/proxy/) <!--hide-->
diff --git a/docs/fr/introduction/adopters.md b/docs/fr/introduction/adopters.md
deleted file mode 100644
index e970c61955c..00000000000
--- a/docs/fr/introduction/adopters.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 8
-toc_title: Adoptant
----
-
-# Clickhouse Adopteurs {#clickhouse-adopters}
-
-!!! warning "Avertissement"
-    La liste suivante des entreprises utilisant ClickHouse et leurs histoires de réussite est assemblé à partir de sources publiques, pourrait donc différer de la réalité actuelle. Nous vous serions reconnaissants si vous partager l'histoire de l'adoption de ClickHouse dans votre entreprise et [ajouter à la liste](https://github.com/ClickHouse/ClickHouse/edit/master/docs/en/introduction/adopters.md), mais assurez-vous que vous n'aurez aucun problème de NDA en le faisant. Fournir des mises à jour avec des publications d'autres entreprises est également utile.
-
-| Entreprise                                                                                      | Industrie                           | Cas d'utilisation            | La Taille De Cluster                                            | (Onu)Taille Des Données Compressées<abbr title="of single replica"><sup>\*</sup></abbr> | Référence                                                                                                                                                                                                                        |
-|-------------------------------------------------------------------------------------------------|-------------------------------------|------------------------------|-----------------------------------------------------------------|-----------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| <a href="https://2gis.ru" class="favicon">2gis</a>                                              | Cartographie                        | Surveiller                   | —                                                               | —                                                                                       | [Parler en russe, juillet 2019](https://youtu.be/58sPkXfq6nw)                                                                                                                                                                    |
-| <a href="https://alohabrowser.com/" class="favicon">Aloha Browser</a>                           | Mobile App                          | Navigateur backend           | —                                                               | —                                                                                       | [Diapositives en russe, mai 2019](https://github.com/yandex/clickhouse-presentations/blob/master/meetup22/aloha.pdf)                                                                                                             |
-| <a href="https://amadeus.com/" class="favicon">Amadeus</a>                                      | Voyage                              | Analytics                    | —                                                               | —                                                                                       | [Communiqué De Presse, Avril 2018](https://www.altinity.com/blog/2018/4/5/amadeus-technologies-launches-investment-and-insights-tool-based-on-machine-learning-and-strategy-algorithms)                                          |
-| <a href="https://www.appsflyer.com" class="favicon">Appsflyer</a>                               | Mobile analytics                    | Produit principal            | —                                                               | —                                                                                       | [Parler en russe, juillet 2019](https://www.youtube.com/watch?v=M3wbRlcpBbY)                                                                                                                                                     |
-| <a href="https://arenadata.tech/" class="favicon">ArenaData</a>                                 | Plate-Forme De Données              | Produit principal            | —                                                               | —                                                                                       | [Diapositives en russe, décembre 2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup38/indexes.pdf)                                                                                                  |
-| <a href="https://badoo.com" class="favicon">Badoo</a>                                           | Rencontres                          | Timeseries                   | —                                                               | —                                                                                       | [Diapositives en russe, décembre 2019](https://presentations.clickhouse.tech/meetup38/forecast.pdf)                                                                                                                              |
-| <a href="https://www.benocs.com/" class="favicon">Benocs</a>                                    | Télémétrie et analyse de réseau     | Produit Principal            | —                                                               | —                                                                                       | [Diapositives en anglais, octobre 2017](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup9/lpm.pdf)                                                                                                      |
-| <a href="https://www.bloomberg.com/" class="favicon">Bloomberg</a>                              | Les Finances, Les Médias            | Surveiller                   | 102 serveurs                                                    | —                                                                                       | [Diapositives, Mai 2018](https://www.slideshare.net/Altinity/http-analytics-for-6m-requests-per-second-using-clickhouse-by-alexander-bocharov)                                                                                   |
-| <a href="https://bloxy.info" class="favicon">Bloxy</a>                                          | Blockchain                          | Analytics                    | —                                                               | —                                                                                       | [Diapositives en russe, août 2018](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup17/4_bloxy.pptx)                                                                                                     |
-| <a href="https://www.chinatelecomglobal.com/" class="favicon">Dataliance pour China Telecom</a> | Télécommunication                   | Analytics                    | —                                                               | —                                                                                       | [Diapositives en chinois, janvier 2018](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup12/telecom.pdf)                                                                                                 |
-| <a href="https://carto.com/" class="favicon">CARTO</a>                                          | Business Intelligence               | GEO analytics                | —                                                               | —                                                                                       | [Traitement géospatial avec ClickHouse](https://carto.com/blog/geospatial-processing-with-clickhouse/)                                                                                                                           |
-| <a href="http://public.web.cern.ch/public/" class="favicon">CERN</a>                            | Recherche                           | Expérience                   | —                                                               | —                                                                                       | [Communiqué De Presse, avril 2012](https://www.yandex.com/company/press_center/press_releases/2012/2012-04-10/)                                                                                                                  |
-| <a href="http://cisco.com/" class="favicon">Cisco</a>                                           | Réseau                              | L'analyse de trafic          | —                                                               | —                                                                                       | [Lightning talk, octobre 2019](https://youtu.be/-hI1vDR2oPY?t=5057)                                                                                                                                                              |
-| <a href="https://www.citadelsecurities.com/" class="favicon">Citadel Securities</a>             | Finance                             | —                            | —                                                               | —                                                                                       | [Contribution, Mars 2019](https://github.com/ClickHouse/ClickHouse/pull/4774)                                                                                                                                                    |
-| <a href="https://city-mobil.ru" class="favicon">Citymobil</a>                                   | Taxi                                | Analytics                    | —                                                               | —                                                                                       | [Billet de Blog en russe, mars 2020](https://habr.com/en/company/citymobil/blog/490660/)                                                                                                                                         |
-| <a href="https://contentsquare.com" class="favicon">ContentSquare</a>                           | Web analytics                       | Produit principal            | —                                                               | —                                                                                       | [Billet de Blog, novembre 2018](http://souslecapot.net/2018/11/21/patrick-chatain-vp-engineering-chez-contentsquare-penser-davantage-amelioration-continue-que-revolution-constante/)                                            |
-| <a href="https://cloudflare.com" class="favicon">Cloudflare</a>                                 | CDN                                 | L'analyse de trafic          | 36 serveurs                                                     | —                                                                                       | [Billet de Blog, mai 2017](https://blog.cloudflare.com/how-cloudflare-analyzes-1m-dns-queries-per-second/), [Billet de Blog, mars 2018](https://blog.cloudflare.com/http-analytics-for-6m-requests-per-second-using-clickhouse/) |
-| <a href="https://coru.net/" class="favicon">Corunet</a>                                         | Analytics                           | Produit principal            | —                                                               | —                                                                                       | [Diapositives en anglais, avril 2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup21/predictive_models.pdf)                                                                                         |
-| <a href="https://www.creditx.com" class="favicon">CraiditX 氪信</a>                             | Les finances de l'IA                | Analyse                      | —                                                               | —                                                                                       | [Diapositives en anglais, novembre 2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup33/udf.pptx)                                                                                                   |
-| <a href="https://www.criteo.com/" class="favicon">Criteo</a>                                    | Détail                              | Produit principal            | —                                                               | —                                                                                       | [Diapositives en anglais, octobre 2018](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup18/3_storetail.pptx)                                                                                            |
-| <a href="https://db.com" class="favicon">Deutsche Bank</a>                                      | Finance                             | BI Analytics                 | —                                                               | —                                                                                       | [Diapositives en anglais, octobre 2019](https://bigdatadays.ru/wp-content/uploads/2019/10/D2-H3-3_Yakunin-Goihburg.pdf)                                                                                                          |
-| <a href="https://www.diva-e.com" class="favicon">Diva-e</a>                                     | Conseil Digital                     | Produit Principal            | —                                                               | —                                                                                       | [Diapositives en anglais, septembre 2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup29/ClickHouse-MeetUp-Unusual-Applications-sd-2019-09-17.pdf)                                                  |
-| <a href="https://www.exness.com" class="favicon">Exness</a>                                     | Trading                             | Métriques, Journalisation    | —                                                               | —                                                                                       | [Parler en russe, mai 2019](https://youtu.be/_rpU-TvSfZ8?t=3215)                                                                                                                                                                 |
-| <a href="https://geniee.co.jp" class="favicon">Geniee</a>                                       | Réseau publicitaire                 | Produit principal            | —                                                               | —                                                                                       | [Billet de Blog en japonais, juillet 2017](https://tech.geniee.co.jp/entry/2017/07/20/160100)                                                                                                                                    |
-| <a href="https://www.huya.com/" class="favicon">HUYA</a>                                        | Le Streaming Vidéo                  | Analytics                    | —                                                               | —                                                                                       | [Diapositives en chinois, octobre 2018](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup19/7.%20ClickHouse万亿数据分析实践%20李本旺(sundy-li)%20虎牙.pdf)                                               |
-| <a href="https://www.idealista.com" class="favicon">Idealista</a>                               | Immobilier                          | Analytics                    | —                                                               | —                                                                                       | [Billet de Blog en anglais, avril 2019](https://clickhouse.tech/blog/en/clickhouse-meetup-in-madrid-on-april-2-2019)                                                                                                           |
-| <a href="https://www.infovista.com/" class="favicon">Infovista</a>                              | Réseau                              | Analytics                    | —                                                               | —                                                                                       | [Diapositives en anglais, octobre 2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup30/infovista.pdf)                                                                                               |
-| <a href="https://www.innogames.com" class="favicon">InnoGames</a>                               | Jeu                                 | Métriques, Journalisation    | —                                                               | —                                                                                       | [Diapositives en russe, septembre 2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup28/graphite_and_clickHouse.pdf)                                                                                 |
-| <a href="https://integros.com" class="favicon">Integros</a>                                     | Plate-forme pour les services vidéo | Analytics                    | —                                                               | —                                                                                       | [Diapositives en russe, mai 2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup22/strategies.pdf)                                                                                                    |
-| <a href="https://www.kodiakdata.com/" class="favicon">Données Kodiak</a>                        | Nuage                               | Produit principal            | —                                                               | —                                                                                       | [Diapositives en Engish, avril 2018](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup13/kodiak_data.pdf)                                                                                                |
-| <a href="https://kontur.ru" class="favicon">Kontur</a>                                          | Le Développement De Logiciels       | Métrique                     | —                                                               | —                                                                                       | [Parler en russe, novembre 2018](https://www.youtube.com/watch?v=U4u4Bd0FtrY)                                                                                                                                                    |
-| <a href="https://lifestreet.com/" class="favicon">LifeStreet</a>                                | Réseau publicitaire                 | Produit principal            | 75 serveurs (3 répliques)                                       | 5.27 FRP                                                                                | [Billet de Blog en russe, février 2017](https://habr.com/en/post/322620/)                                                                                                                                                        |
-| <a href="https://mcs.mail.ru/" class="favicon">Mail.ru Solutions Cloud</a>                      | Les services de Cloud               | Produit principal            | —                                                               | —                                                                                       | [Article en russe](https://mcs.mail.ru/help/db-create/clickhouse#)                                                                                                                                                               |
-| <a href="https://www.messagebird.com" class="favicon">MessageBird</a>                           | Télécommunication                   | Statistique                  | —                                                               | —                                                                                       | [Diapositives en anglais, novembre 2018](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup20/messagebird.pdf)                                                                                            |
-| <a href="https://www.mgid.com/" class="favicon">MGID</a>                                        | Réseau publicitaire                 | Web-analytics                | —                                                               | —                                                                                       | [Billet de Blog en russe, avril 2020](http://gs-studio.com/news-about-it/32777----clickhouse---c)                                                                                                                                |
-| <a href="https://www.oneapm.com/" class="favicon">OneAPM</a>                                    | Monitorings et analyse des données  | Produit principal            | —                                                               | —                                                                                       | [Diapositives en chinois, octobre 2018](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup19/8.%20clickhouse在OneAPM的应用%20杜龙.pdf)                                                                    |
-| <a href="http://www.pragma-innovation.fr/" class="favicon">Pragma Innovation</a>                | Télémétrie et analyse Big Data      | Produit principal            | —                                                               | —                                                                                       | [Diapositives en anglais, octobre 2018](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup18/4_pragma_innovation.pdf)                                                                                     |
-| <a href="https://www.qingcloud.com/" class="favicon">QINGCLOUD</a>                              | Les services de Cloud               | Produit principal            | —                                                               | —                                                                                       | [Diapositives en chinois, octobre 2018](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup19/4.%20Cloud%20%2B%20TSDB%20for%20ClickHouse%20张健%20QingCloud.pdf)                                           |
-| <a href="https://qrator.net" class="favicon">Qrator</a>                                         | Protection DDoS                     | Produit principal            | —                                                               | —                                                                                       | [Billet De Blog, Mars 2019](https://blog.qrator.net/en/clickhouse-ddos-mitigation_37/)                                                                                                                                           |
-| <a href="https://www.percent.cn/" class="favicon">Percent 百分点</a>                            | Analytics                           | Produit Principal            | —                                                               | —                                                                                       | [Diapositives en chinois, juin 2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup24/4.%20ClickHouse万亿数据双中心的设计与实践%20.pdf)                                                               |
-| <a href="https://rambler.ru" class="favicon">Rambler</a>                                        | Services Internet                   | Analytics                    | —                                                               | —                                                                                       | [Parler en russe, avril 2018](https://medium.com/@ramblertop/разработка-api-clickhouse-для-рамблер-топ-100-f4c7e56f3141)                                                                                                         |
-| <a href="https://www.tencent.com" class="favicon">Tencent</a>                                   | Messagerie                          | Journalisation               | —                                                               | —                                                                                       | [Parler en chinois, novembre 2019](https://youtu.be/T-iVQRuw-QY?t=5050)                                                                                                                                                          |
-| <a href="https://trafficstars.com/" class="favicon">Traffic Stars</a>                           | Réseau publicitaire                 | —                            | —                                                               | —                                                                                       | [Diapositives en russe, mai 2018](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup15/lightning/ninja.pdf)                                                                                               |
-| <a href="https://www.s7.ru" class="favicon">S7 Airlines</a>                                     | Avion                               | Métriques, Journalisation    | —                                                               | —                                                                                       | [Parler en russe, mars 2019](https://www.youtube.com/watch?v=nwG68klRpPg&t=15s)                                                                                                                                                  |
-| <a href="https://www.semrush.com/" class="favicon">SEMrush</a>                                  | Marketing                           | Produit principal            | —                                                               | —                                                                                       | [Diapositives en russe, août 2018](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup17/5_semrush.pdf)                                                                                                    |
-| <a href="https://www.scireum.de/" class="favicon">scireum GmbH</a>                              | Ecommerce                           | Produit principal            | —                                                               | —                                                                                       | [Présentation en allemand, février 2020](https://www.youtube.com/watch?v=7QWAn5RbyR4)                                                                                                                                            |
-| <a href="https://sentry.io/" class="favicon">Sentry</a>                                         | Développeur de logiciels            | Backend pour le produit      | —                                                               | —                                                                                       | [Billet de Blog en anglais, mai 2019](https://blog.sentry.io/2019/05/16/introducing-snuba-sentrys-new-search-infrastructure)                                                                                                     |
-| <a href="http://www.sgk.gov.tr/wps/portal/sgk/tr" class="favicon">SGK</a>                       | Gouvernement Sécurité Sociale       | Analytics                    | —                                                               | —                                                                                       | [Diapositives en anglais, novembre 2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup35/ClickHouse%20Meetup-Ramazan%20POLAT.pdf)                                                                    |
-| <a href="https://seo.do/" class="favicon">seo.do</a>                                            | Analytics                           | Produit principal            | —                                                               | —                                                                                       | [Diapositives en anglais, novembre 2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup35/CH%20Presentation-%20Metehan%20Çetinkaya.pdf)                                                               |
-| <a href="http://english.sina.com/index.html" class="favicon">Sina</a>                           | Nouvelles                           | —                            | —                                                               | —                                                                                       | [Diapositives en chinois, octobre 2018](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup19/6.%20ClickHouse最佳实践%20高鹏_新浪.pdf)                                                                     |
-| <a href="https://smi2.ru/" class="favicon">SMI2</a>                                             | Nouvelles                           | Analytics                    | —                                                               | —                                                                                       | [Billet de Blog en russe, novembre 2017](https://habr.com/ru/company/smi2/blog/314558/)                                                                                                                                          |
-| <a href="https://www.splunk.com/" class="favicon">Splunk</a>                                    | Business Analytics                  | Produit principal            | —                                                               | —                                                                                       | [Diapositives en anglais, janvier 2018](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup12/splunk.pdf)                                                                                                  |
-| <a href="https://www.spotify.com" class="favicon">Spotify</a>                                   | Musical                             | Expérimentation              | —                                                               | —                                                                                       | [Diapositives, Juillet 2018](https://www.slideshare.net/glebus/using-clickhouse-for-experimentation-104247173)                                                                                                                   |
-| <a href="https://www.tencent.com" class="favicon">Tencent</a>                                   | Big Data                            | Le traitement des données    | —                                                               | —                                                                                       | [Diapositives en chinois, octobre 2018](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup19/5.%20ClickHouse大数据集群应用_李俊飞腾讯网媒事业部.pdf)                                                      |
-| <a href="https://www.uber.com" class="favicon">Uber</a>                                         | Taxi                                | Journalisation               | —                                                               | —                                                                                       | [Diapositives, Février 2020](https://presentations.clickhouse.tech/meetup40/uber.pdf)                                                                                                                                            |
-| <a href="https://vk.com" class="favicon">VKontakte</a>                                          | Réseau Social                       | Statistiques, Journalisation | —                                                               | —                                                                                       | [Diapositives en russe, août 2018](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup17/3_vk.pdf)                                                                                                         |
-| <a href="https://wisebits.com/" class="favicon">Wisebits</a>                                    | Solutions informatiques             | Analytics                    | —                                                               | —                                                                                       | [Diapositives en russe, mai 2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup22/strategies.pdf)                                                                                                    |
-| <a href="http://www.xiaoxintech.cn/" class="favicon">Xiaoxin Tech</a>                           | Éducation                           | But commun                   | —                                                               | —                                                                                       | [Diapositives en anglais, novembre 2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup33/sync-clickhouse-with-mysql-mongodb.pptx)                                                                    |
-| <a href="https://www.ximalaya.com/" class="favicon">Ximalaya</a>                                | Partage Audio                       | OLAP                         | —                                                               | —                                                                                       | [Diapositives en anglais, novembre 2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup33/ximalaya.pdf)                                                                                               |
-| <a href="https://cloud.yandex.ru/services/managed-clickhouse" class="favicon">Yandex Cloud</a>  | Le Cloud Public                     | Produit principal            | —                                                               | —                                                                                       | [Parler en russe, décembre 2019](https://www.youtube.com/watch?v=pgnak9e_E0o)                                                                                                                                                    |
-| <a href="https://cloud.yandex.ru/services/datalens" class="favicon">Yandex DataLens</a>         | Business Intelligence               | Produit principal            | —                                                               | —                                                                                       | [Diapositives en russe, décembre 2019](https://presentations.clickhouse.tech/meetup38/datalens.pdf)                                                                                                                              |
-| <a href="https://market.yandex.ru/" class="favicon">Yandex Market</a>                           | Ecommerce                           | Métriques, Journalisation    | —                                                               | —                                                                                       | [Parler en russe, janvier 2019](https://youtu.be/_l1qP0DyBcA?t=478)                                                                                                                                                              |
-| <a href="https://metrica.yandex.com" class="favicon">Yandex Metrica</a>                         | Web analytics                       | Produit principal            | 360 serveurs dans un cluster, 1862 serveurs dans un département | 66,41 FRP / 5,68 FRP                                                                    | [Diapositives, Février 2020](https://presentations.clickhouse.tech/meetup40/introduction/#13)                                                                                                                                    |
-| <a href="https://htc-cs.ru/" class="favicon">ЦВТ</a>                                            | Le Développement De Logiciels       | Métriques, Journalisation    | —                                                               | —                                                                                       | [Billet de Blog, mars 2019, en russe](https://vc.ru/dev/62715-kak-my-stroili-monitoring-na-prometheus-clickhouse-i-elk)                                                                                                          |
-| <a href="https://mkb.ru/" class="favicon">МКБ</a>                                               | Banque                              | Surveillance du système Web  | —                                                               | —                                                                                       | [Diapositives en russe, septembre 2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup28/mkb.pdf)                                                                                                     |
-| <a href="https://jinshuju.net" class="favicon">Jinshuju 金数据</a>                              | BI Analytics                        | Produit principal            | —                                                               | —                                                                                       | [Diapositives en chinois, octobre 2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup24/3.%20金数据数据架构调整方案Public.pdf)                                                                       |
-| <a href="https://www.instana.com" class="favicon">Instana</a>                                   | Plate-forme APM                     | Produit principal            | —                                                               | —                                                                                       | [Après Twitter](https://twitter.com/mieldonkers/status/1248884119158882304)                                                                                                                                                      |
-| <a href="https://wargaming.com/en/" class="favicon">Wargaming</a>                               | Jeu                                 |                              | —                                                               | —                                                                                       | [Entrevue](https://habr.com/en/post/496954/)                                                                                                                                                                                     |
-| <a href="https://crazypanda.ru/en/" class="favicon">Crazypanda</a>                              | Jeu                                 |                              | —                                                               | —                                                                                       | Session en direct sur clickhouse meetup                                                                                                                                                                                          |
-| <a href="https://fun.co/rp" class="favicon">FunCorp</a>                                         | Jeu                                 |                              | —                                                               | —                                                                                       | [Article](https://www.altinity.com/blog/migrating-from-redshift-to-clickhouse)                                                                                                                                                   |
-
-[Article Original](https://clickhouse.tech/docs/en/introduction/adopters/) <!--hide-->
diff --git a/docs/fr/introduction/distinctive-features.md b/docs/fr/introduction/distinctive-features.md
deleted file mode 100644
index 9d01d245c4e..00000000000
--- a/docs/fr/introduction/distinctive-features.md
+++ /dev/null
@@ -1,77 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 4
-toc_title: "particularit\xE9"
----
-
-# Caractéristiques distinctives de ClickHouse {#distinctive-features-of-clickhouse}
-
-## Vrai SGBD orienté colonne {#true-column-oriented-dbms}
-
-Dans un vrai SGBD orienté colonne, aucune donnée supplémentaire n'est stockée avec les valeurs. Entre autres choses, cela signifie que les valeurs de longueur constante doivent être prises en charge, pour éviter de stocker leur longueur “number” à côté de ces valeurs. Par exemple, un milliard de valeurs de type UInt8 devrait consommer environ 1 Go non compressé, ou cela affecte fortement l'utilisation du processeur. Il est essentiel de stocker des données de manière compacte (sans “garbage”) même lorsqu'il n'est pas compressé, puisque la vitesse de décompression (utilisation du processeur) dépend principalement du volume de données non compressées.
-
-Il est à noter car il existe des systèmes qui peuvent stocker des valeurs de différentes colonnes séparément, mais qui ne peuvent pas traiter efficacement les requêtes analytiques en raison de leur optimisation pour d'autres scénarios. Les exemples sont HBase, BigTable, Cassandra et HyperTable. Dans ces systèmes, vous obtiendriez un débit d'environ cent mille lignes par seconde, mais pas des centaines de millions de lignes par seconde.
-
-Il est également intéressant de noter que ClickHouse est un système de gestion de base de données, pas une seule base de données. ClickHouse permet de créer des tables et des bases de données en cours d'exécution, de charger des données et d'exécuter des requêtes sans reconfigurer et redémarrer le serveur.
-
-## Compression De Données {#data-compression}
-
-Certains SGBD orientés colonne (InfiniDB CE et MonetDB) n'utilisent pas la compression de données. Cependant, la compression des données joue un rôle clé dans la réalisation d'excellentes performances.
-
-## Stockage de données sur disque {#disk-storage-of-data}
-
-Garder les données physiquement triées par clé primaire permet d'extraire des données pour ses valeurs spécifiques ou plages de valeurs avec une faible latence, moins de quelques dizaines de millisecondes. Certains SGBD orientés colonne (tels que SAP HANA et Google PowerDrill) ne peuvent fonctionner qu'en RAM. Cette approche encourage l'allocation d'un budget matériel plus important que ce qui est nécessaire pour l'analyse en temps réel. ClickHouse est conçu pour fonctionner sur des disques durs réguliers, ce qui signifie que le coût par Go de stockage de données est faible, mais SSD et RAM supplémentaire sont également entièrement utilisés si disponible.
-
-## Traitement parallèle sur plusieurs cœurs {#parallel-processing-on-multiple-cores}
-
-Les grandes requêtes sont parallélisées naturellement, en prenant toutes les ressources nécessaires disponibles sur le serveur actuel.
-
-## Traitement distribué sur plusieurs serveurs {#distributed-processing-on-multiple-servers}
-
-Presque aucun des SGBD en colonnes mentionnés ci-dessus ne prend en charge le traitement des requêtes distribuées.
-Dans ClickHouse, les données peuvent résider sur différents fragments. Chaque fragment peut être un groupe de répliques utilisées pour la tolérance aux pannes. Tous les fragments sont utilisés pour exécuter une requête en parallèle, de façon transparente pour l'utilisateur.
-
-## Prise en charge SQL {#sql-support}
-
-ClickHouse prend en charge un langage de requête déclarative basé sur SQL qui est identique à la norme SQL dans de nombreux cas.
-Les requêtes prises en charge incluent les clauses GROUP BY, ORDER BY, les sous-requêtes in FROM, IN et JOIN, ainsi que les sous-requêtes scalaires.
-Les sous-requêtes dépendantes et les fonctions de fenêtre ne sont pas prises en charge.
-
-## Moteur Vectoriel {#vector-engine}
-
-Les données ne sont pas seulement stockées par des colonnes, mais sont traitées par des vecteurs (parties de colonnes), ce qui permet d'atteindre une efficacité élevée du processeur.
-
-## Données en temps réel des Mises à jour {#real-time-data-updates}
-
-ClickHouse prend en charge les tables avec une clé primaire. Pour effectuer rapidement des requêtes sur la plage de la clé primaire, les données sont triées progressivement à l'aide de l'arborescence de fusion. Pour cette raison, les données peuvent être continuellement ajoutées à la table. Pas de verrouillage lorsque de nouvelles données sont ingérés.
-
-## Index {#index}
-
-Avoir une donnée physiquement triée par clé primaire permet d'extraire des données pour ses valeurs spécifiques ou plages de valeurs avec une faible latence, moins de quelques dizaines de millisecondes.
-
-## Convient pour les requêtes en ligne {#suitable-for-online-queries}
-
-Faible latence signifie que les requêtes peuvent être traitées sans délai et sans essayer de préparer une réponse à l'avance, au même moment pendant le chargement de la page de l'interface utilisateur. En d'autres termes, en ligne.
-
-## Prise en charge des calculs approximatifs {#support-for-approximated-calculations}
-
-ClickHouse offre différentes façons d'échanger la précision pour la performance:
-
-1.  Fonctions d'agrégation pour le calcul approximatif du nombre de valeurs distinctes, de médianes et de quantiles.
-2.  L'exécution d'une requête basée sur une partie (échantillon) de données et obtenir un pseudo résultat. Dans ce cas, proportionnellement, moins de données sont récupérées à partir du disque.
-3.  L'exécution d'une agrégation pour un nombre limité de clés aléatoires, au lieu de toutes les clés. Sous certaines conditions pour la distribution des clés dans les données, cela fournit un résultat raisonnablement précis tout en utilisant moins de ressources.
-
-## Prise en charge de la réplication et de l'intégrité des données {#data-replication-and-data-integrity-support}
-
-ClickHouse utilise la réplication multi-maître asynchrone. Après avoir été écrit dans n'importe quelle réplique disponible, toutes les répliques restantes récupèrent leur copie en arrière-plan. Le système conserve des données identiques sur différentes répliques. La récupération après la plupart des échecs est effectuée automatiquement ou semi-automatiquement dans les cas complexes.
-
-Pour plus d'informations, consultez la section [Réplication des données](../engines/table-engines/mergetree-family/replication.md).
-
-## Caractéristiques qui peuvent être considérées comme des inconvénients {#clickhouse-features-that-can-be-considered-disadvantages}
-
-1.  Pas de transactions à part entière.
-2.  Manque de capacité à modifier ou supprimer des données déjà insérées avec un taux élevé et une faible latence. Des suppressions et des mises à jour par lots sont disponibles pour nettoyer ou modifier les données, par exemple pour [GDPR](https://gdpr-info.eu).
-3.  L'index clairsemé rend ClickHouse pas si approprié pour les requêtes ponctuelles récupérant des lignes simples par leurs clés.
-
-[Article Original](https://clickhouse.tech/docs/en/introduction/distinctive_features/) <!--hide-->
diff --git a/docs/fr/introduction/history.md b/docs/fr/introduction/history.md
deleted file mode 100644
index 8bf1400d7f7..00000000000
--- a/docs/fr/introduction/history.md
+++ /dev/null
@@ -1,56 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 7
-toc_title: Histoire
----
-
-# Histoire De ClickHouse {#clickhouse-history}
-
-ClickHouse a été développé initialement au pouvoir [Yandex.Metrica](https://metrica.yandex.com/), [la deuxième plus grande plateforme d'analyse dans le monde](http://w3techs.com/technologies/overview/traffic_analysis/all) et continue à être le composant de base de ce système. Avec plus de 13 Billions d'enregistrements dans la base de données et plus de 20 milliards d'événements par jour, ClickHouse permet de générer des rapports personnalisés à la volée directement à partir de données non agrégées. Cet article couvre brièvement les objectifs de ClickHouse dans les premiers stades de son développement.
-
-Yandex.Metrica construit des rapports personnalisés à la volée en fonction des hits et des sessions, avec des segments arbitraires définis par l'utilisateur. Faisant souvent requiert la construction d'agrégats complexes, tels que le nombre d'utilisateurs uniques. De nouvelles données pour la création d'un rapport arrivent en temps réel.
-
-En avril 2014, Yandex.Metrica suivait environ 12 milliards d'événements (pages vues et clics) par jour. Tous ces événements doivent être stockés à créer des rapports personnalisés. Une seule requête peut exiger de la numérisation de millions de lignes en quelques centaines de millisecondes, ou des centaines de millions de lignes en quelques secondes.
-
-## Utilisation dans Yandex.Metrica et autres Services Yandex {#usage-in-yandex-metrica-and-other-yandex-services}
-
-ClickHouse sert à des fins multiples dans Yandex.Metrica.
-Sa tâche principale est de créer des rapports en mode en ligne en utilisant des données non agrégées. Il utilise un cluster de 374 serveurs qui stockent plus de 20,3 billions de lignes dans la base de données. Le volume de données compressées est d'environ 2 PB, sans tenir compte des doublons et des répliques. Le volume de données non compressées (au format TSV) serait d'environ 17 PB.
-
-ClickHouse joue également un rôle clé dans les processus suivants:
-
--   Stockage des données pour la relecture de Session de Yandex.Metrica.
--   Traitement des données intermédiaires.
--   Création de rapports globaux avec Analytics.
--   Exécution de requêtes pour le débogage du Yandex.Moteur Metrica.
--   Analyse des journaux de L'API et de l'interface utilisateur.
-
-De nos jours, il existe plusieurs dizaines d'installations ClickHouse dans D'autres services et départements Yandex: recherche verticale, E-commerce, Publicité, business analytics, développement mobile, Services personnels et autres.
-
-## Données agrégées et non agrégées {#aggregated-and-non-aggregated-data}
-
-Il y a une opinion répandue que pour calculer efficacement les statistiques, vous devez agréger les données car cela réduit le volume de données.
-
-Mais l'agrégation de données est livré avec beaucoup de limitations:
-
--   Vous devez disposer d'une liste prédéfinie des rapports requis.
--   L'utilisateur ne peut pas créer de rapports personnalisés.
--   Lors de l'agrégation sur un grand nombre de clés distinctes, le volume de données est à peine réduit, l'agrégation est donc inutile.
--   Pour un grand nombre de rapports, il y a trop de variations d'agrégation (explosion combinatoire).
--   Lors de l'agrégation de clés avec une cardinalité élevée (telles que les URL), le volume de données n'est pas réduit de beaucoup (moins de deux fois).
--   Pour cette raison, le volume de données avec l'agrégation peut augmenter au lieu de diminuer.
--   Les utilisateurs ne voient pas tous les rapports que nous générons pour eux. Une grande partie de ces calculs est inutile.
--   L'intégrité logique des données peut être violée pour diverses agrégations.
-
-Si nous n'agrégeons rien et travaillons avec des données non agrégées, cela pourrait réduire le volume des calculs.
-
-Cependant, avec l'agrégation, une partie importante du travail est déconnectée et achevée relativement calmement. En revanche, les calculs en ligne nécessitent un calcul aussi rapide que possible, car l'utilisateur attend le résultat.
-
-Yandex.Metrica dispose d'un système spécialisé d'agrégation des données appelé Metrage, qui a été utilisé pour la majorité des rapports.
-À partir de 2009, Yandex.Metrica a également utilisé une base de données OLAP spécialisée pour les données non agrégées appelée OLAPServer, qui était auparavant utilisée pour le générateur de rapports.
-OLAPServer a bien fonctionné pour les données non agrégées, mais il avait de nombreuses restrictions qui ne lui permettaient pas d'être utilisé pour tous les rapports comme souhaité. Ceux-ci comprenaient le manque de prise en charge des types de données (uniquement des nombres) et l'incapacité de mettre à jour progressivement les données en temps réel (cela ne pouvait être fait qu'en réécrivant les données quotidiennement). OLAPServer n'est pas un SGBD, mais une base de données spécialisée.
-
-L'objectif initial de ClickHouse était de supprimer les limites D'OLAPServer et de résoudre le problème du travail avec des données non agrégées pour tous les rapports, mais au fil des ans, il est devenu un système de gestion de base de données polyvalent adapté à un large éventail de tâches analytiques.
-
-[Article Original](https://clickhouse.tech/docs/en/introduction/history/) <!--hide-->
diff --git a/docs/fr/introduction/index.md b/docs/fr/introduction/index.md
deleted file mode 100644
index e0496b30f00..00000000000
--- a/docs/fr/introduction/index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: Introduction
-toc_priority: 1
----
-
-
diff --git a/docs/fr/introduction/performance.md b/docs/fr/introduction/performance.md
deleted file mode 100644
index 30d521e11cd..00000000000
--- a/docs/fr/introduction/performance.md
+++ /dev/null
@@ -1,32 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 6
-toc_title: Performance
----
-
-# Performance {#performance}
-
-Selon les résultats des tests internes chez Yandex, ClickHouse affiche les meilleures performances (à la fois le débit le plus élevé pour les requêtes longues et la latence la plus faible pour les requêtes courtes) pour des scénarios d'exploitation comparables parmi les systèmes de sa classe disponibles pour les tests. Vous pouvez afficher les résultats du test sur un [page séparée](https://clickhouse.tech/benchmark/dbms/).
-
-De nombreux points de repère indépendants sont arrivés à des conclusions similaires. Ils ne sont pas difficiles à trouver en utilisant une recherche sur internet, ou vous pouvez voir [notre petite collection de liens](https://clickhouse.tech/#independent-benchmarks).
-
-## Débit pour une seule grande requête {#throughput-for-a-single-large-query}
-
-Le débit peut être mesuré en lignes par seconde ou en mégaoctets par seconde. Si les données sont placées dans le cache de page, une requête pas trop complexe est traitée sur du matériel moderne à une vitesse d'environ 2-10 GB / s de données non compressées sur un seul serveur (pour les cas les plus simples, la vitesse peut atteindre 30 GB/s). Si les données ne sont pas placées dans le cache de page, la vitesse dépend du sous-système de disque et du taux de compression des données. Par exemple, si le sous-système de disque permet de lire des données à 400 Mo/s et que le taux de compression des données est de 3, la vitesse devrait être d'environ 1,2 Go/s. Pour obtenir la vitesse en lignes par seconde, divisez la vitesse en octets par seconde par la taille totale des colonnes utilisées dans la requête. Par exemple, si 10 octets de colonnes sont extraites, la vitesse devrait être d'environ 100 à 200 millions de lignes par seconde.
-
-La vitesse de traitement augmente presque linéairement pour le traitement distribué, mais seulement si le nombre de lignes résultant de l'agrégation ou du tri n'est pas trop important.
-
-## Latence Lors Du Traitement Des Requêtes Courtes {#latency-when-processing-short-queries}
-
-Si une requête utilise une clé primaire et ne sélectionne pas trop de colonnes et de lignes à traiter (des centaines de milliers), Vous pouvez vous attendre à moins de 50 millisecondes de latence (un seul chiffre de millisecondes dans le meilleur des cas) si les données sont placées dans le cache de page. Sinon, la latence est principalement dominée par le nombre de recherches. Si vous utilisez des lecteurs de disque rotatifs, pour un système qui n'est pas surchargé, la latence peut être estimée avec cette formule: `seek time (10 ms) * count of columns queried * count of data parts`.
-
-## Débit lors du traitement d'une grande quantité de requêtes courtes {#throughput-when-processing-a-large-quantity-of-short-queries}
-
-Dans les mêmes conditions, ClickHouse peut traiter plusieurs centaines de requêtes par seconde sur un seul serveur (jusqu'à plusieurs milliers dans le meilleur des cas). Étant donné que ce scénario n'est pas typique pour les SGBD analytiques, nous vous recommandons d'attendre un maximum de 100 requêtes par seconde.
-
-## Performances Lors De L'Insertion De Données {#performance-when-inserting-data}
-
-Nous vous recommandons d'insérer des données dans des paquets d'au moins 1000 lignes, ou pas plus qu'une seule demande par seconde. Lors de l'insertion dans une table MergeTree à partir d'un dump séparé par des tabulations, la vitesse d'insertion peut être de 50 à 200 Mo/s. Si les lignes insérées ont une taille d'environ 1 KO, La vitesse sera de 50 000 à 200 000 lignes par seconde. Si les lignes sont petites, les performances peuvent être plus élevées en lignes par seconde (sur les données du système de bannière -`>` 500 000 lignes par seconde; sur les données de Graphite -`>` 1 000 000 lignes par seconde). Pour améliorer les performances, vous pouvez effectuer plusieurs requêtes D'insertion en parallèle, qui s'adaptent linéairement.
-
-[Article Original](https://clickhouse.tech/docs/en/introduction/performance/) <!--hide-->
diff --git a/docs/fr/operations/access-rights.md b/docs/fr/operations/access-rights.md
deleted file mode 100644
index c5bf9f2b695..00000000000
--- a/docs/fr/operations/access-rights.md
+++ /dev/null
@@ -1,143 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 48
-toc_title: "Le Contr\xF4le d'acc\xE8s et de Gestion de Compte"
----
-
-# Le Contrôle d'accès et de Gestion de Compte {#access-control}
-
-Clickhouse prend en charge la gestion du contrôle d'accès basée sur [RBAC](https://en.wikipedia.org/wiki/Role-based_access_control) approche.
-
-Entités d'accès ClickHouse:
-- [Compte d'utilisateur](#user-account-management)
-- [Rôle](#role-management)
-- [La Ligne Politique](#row-policy-management)
-- [Les Paramètres De Profil](#settings-profiles-management)
-- [Quota](#quotas-management)
-
-Vous pouvez configurer des entités d'accès à l'aide de:
-
--   Flux de travail piloté par SQL.
-
-    Vous avez besoin de [permettre](#enabling-access-control) cette fonctionnalité.
-
--   Serveur [les fichiers de configuration](configuration-files.md) `users.xml` et `config.xml`.
-
-Nous vous recommandons D'utiliser un workflow piloté par SQL. Les deux méthodes de configuration fonctionnent simultanément, donc si vous utilisez les fichiers de configuration du serveur pour gérer les comptes et les droits d'accès, vous pouvez passer doucement au flux de travail piloté par SQL.
-
-!!! note "Avertissement"
-    Vous ne pouvez pas gérer la même entité d'accès par les deux méthodes de configuration simultanément.
-
-## Utilisation {#access-control-usage}
-
-Par défaut, le serveur ClickHouse fournit le compte utilisateur `default` ce qui n'est pas autorisé à utiliser le contrôle D'accès piloté par SQL et la gestion de compte, mais a tous les droits et autorisations. Le `default` compte d'utilisateur est utilisé dans tous les cas, lorsque l'utilisateur n'est pas défini, par exemple, lors de la connexion du client ou dans les requêtes distribuées. Dans le traitement des requêtes distribuées, un compte utilisateur par défaut est utilisé si la configuration du serveur ou du cluster ne spécifie pas [d'utilisateur et mot de passe](../engines/table-engines/special/distributed.md) propriété.
-
-Si vous commencez simplement à utiliser ClickHouse, vous pouvez utiliser le scénario suivant:
-
-1.  [Permettre](#enabling-access-control) Contrôle D'accès piloté par SQL et gestion de compte pour le `default` utilisateur.
-2.  Connexion en vertu de la `default` compte d'utilisateur et de créer tous les utilisateurs. N'oubliez pas de créer un compte d'administrateur (`GRANT ALL ON *.* WITH GRANT OPTION TO admin_user_account`).
-3.  [Restreindre les autorisations](settings/permissions-for-queries.md#permissions_for_queries) pour l' `default` utilisateur et désactiver le contrôle D'accès piloté par SQL et la gestion des comptes pour elle.
-
-### Propriétés de la Solution actuelle {#access-control-properties}
-
--   Vous pouvez accorder des autorisations pour les bases de données et les tables même si elles n'existent pas.
--   Si une table a été supprimée, tous les privilèges correspondant à cette table ne sont pas révoqués. Ainsi, si une nouvelle table est créée plus tard avec le même nom, tous les privilèges redeviennent réels. Pour révoquer les privilèges correspondant à la table supprimée, vous devez effectuer, par exemple, l' `REVOKE ALL PRIVILEGES ON db.table FROM ALL` requête.
--   Il n'y a pas de paramètres de durée de vie pour les privilèges.
-
-## Compte d'utilisateur {#user-account-management}
-
-Un compte d'utilisateur est une entité qui permet d'autoriser quelqu'un à ClickHouse. Un compte utilisateur contient:
-
--   Informations d'Identification.
--   [Privilège](../sql-reference/statements/grant.md#grant-privileges) qui définissent l'étendue des requêtes que l'utilisateur peut effectuer.
--   Hôtes à partir desquels la connexion au serveur ClickHouse est autorisée.
--   Rôles accordés et par défaut.
--   Paramètres avec leurs contraintes qui s'appliquent par défaut lors de la connexion de l'utilisateur.
--   Profils de paramètres assignés.
-
-Des privilèges à un compte d'utilisateur peuvent être accordés par [GRANT](../sql-reference/statements/grant.md) requête ou en attribuant [rôle](#role-management). Pour révoquer les privilèges d'un utilisateur, ClickHouse fournit [REVOKE](../sql-reference/statements/revoke.md) requête. Pour lister les privilèges d'un utilisateur, utilisez - [SHOW GRANTS](../sql-reference/statements/show.md#show-grants-statement) déclaration.
-
-Gestion des requêtes:
-
--   [CREATE USER](../sql-reference/statements/create.md#create-user-statement)
--   [ALTER USER](../sql-reference/statements/alter.md#alter-user-statement)
--   [DROP USER](../sql-reference/statements/misc.md#drop-user-statement)
--   [SHOW CREATE USER](../sql-reference/statements/show.md#show-create-user-statement)
-
-### Paramètres Application {#access-control-settings-applying}
-
-Les paramètres peuvent être définis de différentes manières: pour un compte utilisateur, dans ses profils de rôles et de paramètres accordés. Lors d'une connexion utilisateur, si un paramètre est défini dans différentes entités d'accès, la valeur et les contraintes de ce paramètre sont appliquées par les priorités suivantes (de plus haut à plus bas):
-
-1.  Paramètre de compte utilisateur.
-2.  Les paramètres de rôles par défaut du compte d'utilisateur. Si un paramètre est défini dans certains rôles, l'ordre de la mise en application n'est pas défini.
-3.  Les paramètres dans les profils de paramètres attribués à un utilisateur ou à ses rôles par défaut. Si un paramètre est défini dans certains profils, l'ordre d'application des paramètres n'est pas défini.
-4.  Paramètres appliqués à l'ensemble du serveur par défaut [profil par défaut](server-configuration-parameters/settings.md#default-profile).
-
-## Rôle {#role-management}
-
-Le rôle est un conteneur pour l'accès des entités qui peuvent être accordées à un compte d'utilisateur.
-
-Rôle contient:
-
--   [Privilège](../sql-reference/statements/grant.md#grant-privileges)
--   Paramètres et contraintes
--   Liste des rôles attribués
-
-Gestion des requêtes:
-
--   [CREATE ROLE](../sql-reference/statements/create.md#create-role-statement)
--   [ALTER ROLE](../sql-reference/statements/alter.md#alter-role-statement)
--   [DROP ROLE](../sql-reference/statements/misc.md#drop-role-statement)
--   [SET ROLE](../sql-reference/statements/misc.md#set-role-statement)
--   [SET DEFAULT ROLE](../sql-reference/statements/misc.md#set-default-role-statement)
--   [SHOW CREATE ROLE](../sql-reference/statements/show.md#show-create-role-statement)
-
-Les privilèges d'un rôle peuvent être accordés par [GRANT](../sql-reference/statements/grant.md) requête. Pour révoquer les privilèges D'un rôle ClickHouse fournit [REVOKE](../sql-reference/statements/revoke.md) requête.
-
-## La Ligne Politique {#row-policy-management}
-
-La stratégie de ligne est un filtre qui définit les lignes disponibles pour un utilisateur ou pour un rôle. La stratégie de ligne contient des filtres pour une table spécifique et une liste de rôles et / ou d'utilisateurs qui doivent utiliser cette stratégie de ligne.
-
-Gestion des requêtes:
-
--   [CREATE ROW POLICY](../sql-reference/statements/create.md#create-row-policy-statement)
--   [ALTER ROW POLICY](../sql-reference/statements/alter.md#alter-row-policy-statement)
--   [DROP ROW POLICY](../sql-reference/statements/misc.md#drop-row-policy-statement)
--   [SHOW CREATE ROW POLICY](../sql-reference/statements/show.md#show-create-row-policy-statement)
-
-## Les Paramètres De Profil {#settings-profiles-management}
-
-Paramètres profil est une collection de [paramètre](settings/index.md). Le profil paramètres contient les paramètres et les contraintes, ainsi que la liste des rôles et/ou des utilisateurs auxquels ce quota est appliqué.
-
-Gestion des requêtes:
-
--   [CREATE SETTINGS PROFILE](../sql-reference/statements/create.md#create-settings-profile-statement)
--   [ALTER SETTINGS PROFILE](../sql-reference/statements/alter.md#alter-settings-profile-statement)
--   [DROP SETTINGS PROFILE](../sql-reference/statements/misc.md#drop-settings-profile-statement)
--   [SHOW CREATE SETTINGS PROFILE](../sql-reference/statements/show.md#show-create-settings-profile-statement)
-
-## Quota {#quotas-management}
-
-Le Quota limite l'utilisation des ressources. Voir [Quota](quotas.md).
-
-Quota contient un ensemble de limites pour certaines durées, et la liste des rôles et/ou des utilisateurs qui devrait utiliser ce quota.
-
-Gestion des requêtes:
-
--   [CREATE QUOTA](../sql-reference/statements/create.md#create-quota-statement)
--   [ALTER QUOTA](../sql-reference/statements/alter.md#alter-quota-statement)
--   [DROP QUOTA](../sql-reference/statements/misc.md#drop-quota-statement)
--   [SHOW CREATE QUOTA](../sql-reference/statements/show.md#show-create-quota-statement)
-
-## Activation du contrôle D'accès piloté par SQL et de la gestion de Compte {#enabling-access-control}
-
--   Configurez un répertoire pour le stockage des configurations.
-
-    Clickhouse stocke les configurations d'entité d'accès dans le dossier défini dans [access_control_path](server-configuration-parameters/settings.md#access_control_path) paramètre de configuration du serveur.
-
--   Activez le contrôle D'accès piloté par SQL et la gestion de compte pour au moins un compte d'utilisateur.
-
-    Par défaut, le contrôle D'accès piloté par SQL et la gestion des comptes sont activés pour tous les utilisateurs. Vous devez configurer au moins un utilisateur dans le `users.xml` fichier de configuration et affecter 1 au [access_management](settings/settings-users.md#access_management-user-setting) paramètre.
-
-[Article Original](https://clickhouse.tech/docs/en/operations/access_rights/) <!--hide-->
diff --git a/docs/fr/operations/backup.md b/docs/fr/operations/backup.md
deleted file mode 100644
index 953a96a04eb..00000000000
--- a/docs/fr/operations/backup.md
+++ /dev/null
@@ -1,41 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 49
-toc_title: "La Sauvegarde Des Donn\xE9es"
----
-
-# La Sauvegarde Des Données {#data-backup}
-
-Alors [réplication](../engines/table-engines/mergetree-family/replication.md) provides protection from hardware failures, it does not protect against human errors: accidental deletion of data, deletion of the wrong table or a table on the wrong cluster, and software bugs that result in incorrect data processing or data corruption. In many cases mistakes like these will affect all replicas. ClickHouse has built-in safeguards to prevent some types of mistakes — for example, by default [vous ne pouvez pas simplement supprimer des tables avec un moteur de type MergeTree contenant plus de 50 Go de données](server-configuration-parameters/settings.md#max-table-size-to-drop). Toutefois, ces garanties ne couvrent pas tous les cas possibles et peuvent être contournés.
-
-Afin d'atténuer efficacement les erreurs humaines possibles, vous devez préparer soigneusement une stratégie de sauvegarde et de restauration de vos données **préalablement**.
-
-Chaque entreprise a différentes ressources disponibles et les exigences de l'entreprise, donc il n'y a pas de solution universelle pour les sauvegardes et restaurations ClickHouse qui s'adaptera à toutes les situations. Ce qui fonctionne pour un gigaoctet de données ne fonctionnera probablement pas pour des dizaines de pétaoctets. Il existe une variété d'approches possibles avec leurs propres avantages et inconvénients, qui sera discuté ci-dessous. C'est une bonne idée d'utiliser plusieurs approches au lieu d'un seul, afin de compenser leurs lacunes.
-
-!!! note "Note"
-    Gardez à l'esprit que si vous avez sauvegardé quelque chose et que vous n'avez jamais essayé de le restaurer, il est probable que la restauration ne fonctionnera pas correctement lorsque vous en avez réellement besoin (ou du moins cela prendra plus de temps que ce que les entreprises peuvent tolérer). Donc, quelle que soit l'approche de sauvegarde que vous choisissez, assurez-vous d'automatiser le processus de restauration et de le pratiquer sur un cluster clickhouse de rechange régulièrement.
-
-## Dupliquer Les Données Sources Ailleurs {#duplicating-source-data-somewhere-else}
-
-Souvent, les données qui sont ingérées dans ClickHouse sont livrées via une sorte de file d'attente persistante, telle que [Apache Kafka](https://kafka.apache.org). Dans ce cas, il est possible de configurer un ensemble supplémentaire d'abonnés qui liront le même flux de données pendant qu'il est écrit dans ClickHouse et le stockeront dans un stockage à froid quelque part. La plupart des entreprises ont déjà un stockage à froid recommandé par défaut, qui pourrait être un magasin d'objets ou un système de fichiers distribué comme [HDFS](https://hadoop.apache.org/docs/stable/hadoop-project-dist/hadoop-hdfs/HdfsDesign.html).
-
-## Instantanés Du Système De Fichiers {#filesystem-snapshots}
-
-Certains systèmes de fichiers locaux fournissent des fonctionnalités d'instantané (par exemple, [ZFS](https://en.wikipedia.org/wiki/ZFS)), mais ils pourraient ne pas être le meilleur choix pour servir les requêtes actives. Une solution possible consiste à créer des répliques supplémentaires avec ce type de système de fichiers et à les exclure du [Distribué](../engines/table-engines/special/distributed.md) les tables qui sont utilisés pour `SELECT` requête. Les instantanés sur ces répliques seront hors de portée des requêtes qui modifient les données. En prime, ces répliques pourraient avoir des configurations matérielles spéciales avec plus de disques attachés par serveur, ce qui serait rentable.
-
-## clickhouse-copieur {#clickhouse-copier}
-
-[clickhouse-copieur](utilities/clickhouse-copier.md) est un outil polyvalent qui a été initialement créé pour re-shard petaoctet - sized tables. Il peut également être utilisé à des fins de sauvegarde et de restauration car il copie de manière fiable les données entre les tables ClickHouse et les clusters.
-
-Pour de plus petits volumes de données, un simple `INSERT INTO ... SELECT ...` les tables distantes peuvent également fonctionner.
-
-## Manipulations avec des pièces {#manipulations-with-parts}
-
-ClickHouse permet d'utiliser le `ALTER TABLE ... FREEZE PARTITION ...` requête pour créer une copie locale des partitions de table. Ceci est implémenté en utilisant des liens durs vers le `/var/lib/clickhouse/shadow/` dossier, donc il ne consomme généralement pas d'espace disque supplémentaire pour les anciennes données. Les copies créées des fichiers ne sont pas gérées par clickhouse server, vous pouvez donc les laisser là: vous aurez une sauvegarde simple qui ne nécessite aucun système externe supplémentaire, mais elle sera toujours sujette à des problèmes matériels. Pour cette raison, il est préférable de les copier à distance vers un autre emplacement, puis de supprimer les copies locales. Les systèmes de fichiers distribués et les magasins d'objets sont toujours une bonne option pour cela, mais les serveurs de fichiers attachés normaux avec une capacité suffisante peuvent également fonctionner (dans ce cas, le transfert se fera via le système de fichiers réseau ou peut-être [rsync](https://en.wikipedia.org/wiki/Rsync)).
-
-Pour plus d'informations sur les requêtes liées aux manipulations de [Modifier la documentation](../sql-reference/statements/alter.md#alter_manipulations-with-partitions).
-
-Un outil tiers est disponible pour automatiser cette approche: [clickhouse-sauvegarde](https://github.com/AlexAkulov/clickhouse-backup).
-
-[Article Original](https://clickhouse.tech/docs/en/operations/backup/) <!--hide-->
diff --git a/docs/fr/operations/configuration-files.md b/docs/fr/operations/configuration-files.md
deleted file mode 100644
index 8ecb1ed0bb0..00000000000
--- a/docs/fr/operations/configuration-files.md
+++ /dev/null
@@ -1,57 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 50
-toc_title: Fichiers De Configuration
----
-
-# Fichiers De Configuration {#configuration_files}
-
-ClickHouse prend en charge la gestion de la configuration multi-fichiers. Le fichier de configuration du serveur principal est `/etc/clickhouse-server/config.xml`. Les autres fichiers doivent être dans le `/etc/clickhouse-server/config.d` répertoire.
-
-!!! note "Note"
-    Tous les fichiers de configuration doivent être au format XML. Aussi, ils doivent avoir le même élément racine, généralement `<yandex>`.
-
-Certains paramètres spécifiés dans le fichier de configuration principal peuvent être remplacés dans d'autres fichiers de configuration. Le `replace` ou `remove` les attributs peuvent être spécifiés pour les éléments de ces fichiers de configuration.
-
-Si ni l'un ni l'autre n'est spécifié, il combine le contenu des éléments de manière récursive, remplaçant les valeurs des enfants en double.
-
-Si `replace` est spécifié, il remplace l'élément entier par celui spécifié.
-
-Si `remove` est spécifié, il supprime l'élément.
-
-La configuration peut également définir “substitutions”. Si un élément a le `incl` attribut, la substitution correspondante du fichier sera utilisée comme valeur. Par défaut, le chemin d'accès au fichier avec des substitutions est `/etc/metrika.xml`. Ceci peut être changé dans le [include_from](server-configuration-parameters/settings.md#server_configuration_parameters-include_from) élément dans la configuration du serveur. Les valeurs de substitution sont spécifiées dans `/yandex/substitution_name` les éléments de ce fichier. Si une substitution spécifiée dans `incl` n'existe pas, il est enregistré dans le journal. Pour empêcher ClickHouse de consigner les substitutions manquantes, spécifiez `optional="true"` attribut (par exemple, les paramètres de [macro](server-configuration-parameters/settings.md)).
-
-Les Substitutions peuvent également être effectuées à partir de ZooKeeper. Pour ce faire, spécifiez l'attribut `from_zk = "/path/to/node"`. La valeur de l'élément est remplacé par le contenu du noeud au `/path/to/node` dans ZooKeeper. Vous pouvez également placer un sous-arbre XML entier sur le nœud ZooKeeper et il sera entièrement inséré dans l'élément source.
-
-Le `config.xml` le fichier peut spécifier une configuration distincte avec les paramètres utilisateur, les profils et les quotas. Le chemin relatif à cette configuration est défini dans `users_config` élément. Par défaut, il est `users.xml`. Si `users_config` est omis, les paramètres utilisateur, les profils et les quotas sont `config.xml`.
-
-La configuration des utilisateurs peut être divisée en fichiers séparés similaires à `config.xml` et `config.d/`.
-Nom du répertoire est défini comme `users_config` sans `.xml` postfix concaténé avec `.d`.
-Répertoire `users.d` est utilisé par défaut, comme `users_config` par défaut `users.xml`.
-Par exemple, vous pouvez avoir séparé fichier de configuration pour chaque utilisateur comme ceci:
-
-``` bash
-$ cat /etc/clickhouse-server/users.d/alice.xml
-```
-
-``` xml
-<yandex>
-    <users>
-      <alice>
-          <profile>analytics</profile>
-            <networks>
-                  <ip>::/0</ip>
-            </networks>
-          <password_sha256_hex>...</password_sha256_hex>
-          <quota>analytics</quota>
-      </alice>
-    </users>
-</yandex>
-```
-
-Pour chaque fichier de configuration, le serveur génère également `file-preprocessed.xml` les fichiers lors du démarrage. Ces fichiers contiennent toutes les remplacements et des remplacements, et ils sont destinés à l'usage informatif. Si des substitutions ZooKeeper ont été utilisées dans les fichiers de configuration mais que ZooKeeper n'est pas disponible au démarrage du serveur, le serveur charge la configuration à partir du fichier prétraité.
-
-Le serveur suit les changements dans les fichiers de configuration, ainsi que les fichiers et les nœuds ZooKeeper utilisés lors des substitutions et des remplacements, et recharge les paramètres pour les utilisateurs et les clusters à la volée. Cela signifie que vous pouvez modifier le cluster, les utilisateurs et leurs paramètres sans redémarrer le serveur.
-
-[Article Original](https://clickhouse.tech/docs/en/operations/configuration_files/) <!--hide-->
diff --git a/docs/fr/operations/index.md b/docs/fr/operations/index.md
deleted file mode 100644
index 23f98bdaed2..00000000000
--- a/docs/fr/operations/index.md
+++ /dev/null
@@ -1,28 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: "Op\xE9rations"
-toc_priority: 41
-toc_title: Introduction
----
-
-# Opérations {#operations}
-
-Le manuel d'exploitation de ClickHouse comprend les principales sections suivantes:
-
--   [Exigence](requirements.md)
--   [Surveiller](monitoring.md)
--   [Dépannage](troubleshooting.md)
--   [Recommandations D'Utilisation](tips.md)
--   [Procédure De Mise À Jour](update.md)
--   [Les Droits D'Accès](access-rights.md)
--   [La Sauvegarde Des Données](backup.md)
--   [Fichiers De Configuration](configuration-files.md)
--   [Quota](quotas.md)
--   [Les Tables Système](system-tables.md)
--   [Paramètres De Configuration Du Serveur](server-configuration-parameters/index.md)
--   [Comment Tester Votre Matériel Avec ClickHouse](performance-test.md)
--   [Paramètre](settings/index.md)
--   [Utilitaire](utilities/index.md)
-
-{## [Article Original](https://clickhouse.tech/docs/en/operations/) ##}
diff --git a/docs/fr/operations/monitoring.md b/docs/fr/operations/monitoring.md
deleted file mode 100644
index 91aee4bc1f8..00000000000
--- a/docs/fr/operations/monitoring.md
+++ /dev/null
@@ -1,46 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 45
-toc_title: Surveiller
----
-
-# Surveiller {#monitoring}
-
-Vous pouvez surveiller:
-
--   L'utilisation des ressources matérielles.
--   Statistiques du serveur ClickHouse.
-
-## L'Utilisation Des Ressources {#resource-utilization}
-
-ClickHouse ne surveille pas l'état des ressources matérielles par lui-même.
-
-Il est fortement recommandé de configurer la surveillance de:
-
--   Charge et température sur les processeurs.
-
-    Vous pouvez utiliser [dmesg](https://en.wikipedia.org/wiki/Dmesg), [turbostat](https://www.linux.org/docs/man8/turbostat.html) ou d'autres instruments.
-
--   Utilisation du système de stockage, de la RAM et du réseau.
-
-## Métriques Du Serveur ClickHouse {#clickhouse-server-metrics}
-
-Clickhouse server a des instruments embarqués pour la surveillance de l'auto-état.
-
-Pour suivre les événements du serveur, utilisez les journaux du serveur. Voir la [enregistreur](server-configuration-parameters/settings.md#server_configuration_parameters-logger) section du fichier de configuration.
-
-Clickhouse recueille:
-
--   Différentes mesures de la façon dont le serveur utilise les ressources de calcul.
--   Statistiques communes sur le traitement des requêtes.
-
-Vous pouvez trouver des mesures dans le [système.métrique](../operations/system-tables.md#system_tables-metrics), [système.événement](../operations/system-tables.md#system_tables-events), et [système.asynchronous_metrics](../operations/system-tables.md#system_tables-asynchronous_metrics) table.
-
-Vous pouvez configurer ClickHouse pour exporter des métriques vers [Graphite](https://github.com/graphite-project). Voir la [Graphite section](server-configuration-parameters/settings.md#server_configuration_parameters-graphite) dans le fichier de configuration du serveur ClickHouse. Avant de configurer l'exportation des métriques, vous devez configurer Graphite en suivant leur [guide](https://graphite.readthedocs.io/en/latest/install.html).
-
-Vous pouvez configurer ClickHouse pour exporter des métriques vers [Prometheus](https://prometheus.io). Voir la [Prometheus section](server-configuration-parameters/settings.md#server_configuration_parameters-prometheus) dans le fichier de configuration du serveur ClickHouse. Avant de configurer l'exportation des métriques, vous devez configurer Prometheus en suivant leur [guide](https://prometheus.io/docs/prometheus/latest/installation/).
-
-De plus, vous pouvez surveiller la disponibilité du serveur via L'API HTTP. Envoyer la `HTTP GET` demande à `/ping`. Si le serveur est disponible, il répond avec `200 OK`.
-
-Pour surveiller les serveurs dans une configuration de cluster, vous devez [max_replica_delay_for_distributed_queries](settings/settings.md#settings-max_replica_delay_for_distributed_queries) paramètre et utiliser la ressource HTTP `/replicas_status`. Une demande de `/replicas_status` retourner `200 OK` si la réplique est disponible et n'est pas retardé derrière les autres réplicas. Si une réplique est retardée, elle revient `503 HTTP_SERVICE_UNAVAILABLE` avec des informations sur l'écart.
diff --git a/docs/fr/operations/optimizing-performance/index.md b/docs/fr/operations/optimizing-performance/index.md
deleted file mode 100644
index 3877d558eca..00000000000
--- a/docs/fr/operations/optimizing-performance/index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: Optimisation Des Performances
-toc_priority: 52
----
-
-
diff --git a/docs/fr/operations/optimizing-performance/sampling-query-profiler.md b/docs/fr/operations/optimizing-performance/sampling-query-profiler.md
deleted file mode 100644
index eb2cdf7f12c..00000000000
--- a/docs/fr/operations/optimizing-performance/sampling-query-profiler.md
+++ /dev/null
@@ -1,64 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 54
-toc_title: "Profilage De Requ\xEAte"
----
-
-# Échantillonnage Du Profileur De Requête {#sampling-query-profiler}
-
-ClickHouse exécute un profileur d'échantillonnage qui permet d'analyser l'exécution des requêtes. En utilisant profiler, vous pouvez trouver des routines de code source qui ont utilisé le plus fréquemment lors de l'exécution de la requête. Vous pouvez suivre le temps CPU et le temps d'horloge murale passé, y compris le temps d'inactivité.
-
-Utilisation du générateur de profils:
-
--   Installation de la [trace_log](../server-configuration-parameters/settings.md#server_configuration_parameters-trace_log) la section de la configuration du serveur.
-
-    Cette section configure le [trace_log](../../operations/system-tables.md#system_tables-trace_log) tableau système contenant les résultats du fonctionnement du profileur. Il est configuré par défaut. Rappelez-vous que les données de ce tableau est valable que pour un serveur en cours d'exécution. Après le redémarrage du serveur, ClickHouse ne nettoie pas la table et toute l'adresse de mémoire virtuelle stockée peut devenir invalide.
-
--   Installation de la [query_profiler_cpu_time_period_ns](../settings/settings.md#query_profiler_cpu_time_period_ns) ou [query_profiler_real_time_period_ns](../settings/settings.md#query_profiler_real_time_period_ns) paramètre. Les deux paramètres peuvent être utilisés simultanément.
-
-    Ces paramètres vous permettent de configurer les minuteries du profileur. Comme il s'agit des paramètres de session, vous pouvez obtenir une fréquence d'échantillonnage différente pour l'ensemble du serveur, les utilisateurs individuels ou les profils d'utilisateurs, pour votre session interactive et pour chaque requête individuelle.
-
-La fréquence d'échantillonnage par défaut est d'un échantillon par seconde et le processeur et les minuteries réelles sont activés. Cette fréquence permet de collecter suffisamment d'informations sur le cluster ClickHouse. En même temps, en travaillant avec cette fréquence, profiler n'affecte pas les performances du serveur ClickHouse. Si vous avez besoin de profiler chaque requête individuelle, essayez d'utiliser une fréquence d'échantillonnage plus élevée.
-
-Pour analyser les `trace_log` système de table:
-
--   Installer le `clickhouse-common-static-dbg` paquet. Voir [Installer à partir de paquets DEB](../../getting-started/install.md#install-from-deb-packages).
-
--   Autoriser les fonctions d'introspection par [allow_introspection_functions](../settings/settings.md#settings-allow_introspection_functions) paramètre.
-
-    Pour des raisons de sécurité, les fonctions d'introspection sont désactivées par défaut.
-
--   L'utilisation de la `addressToLine`, `addressToSymbol` et `demangle` [fonctions d'introspection](../../sql-reference/functions/introspection.md) pour obtenir les noms de fonctions et leurs positions dans le code ClickHouse. Pour obtenir un profil pour une requête, vous devez agréger les données du `trace_log` table. Vous pouvez agréger des données par des fonctions individuelles ou par l'ensemble des traces de la pile.
-
-Si vous avez besoin de visualiser `trace_log` info, essayez [flamegraph](../../interfaces/third-party/gui/#clickhouse-flamegraph) et [speedscope](https://github.com/laplab/clickhouse-speedscope).
-
-## Exemple {#example}
-
-Dans cet exemple, nous:
-
--   Filtrage `trace_log` données par un identifiant de requête et la date actuelle.
-
--   Agrégation par trace de pile.
-
--   En utilisant les fonctions d'introspection, nous obtiendrons un rapport de:
-
-    -   Noms des symboles et des fonctions de code source correspondantes.
-    -   Emplacements de code Source de ces fonctions.
-
-<!-- -->
-
-``` sql
-SELECT
-    count(),
-    arrayStringConcat(arrayMap(x -> concat(demangle(addressToSymbol(x)), '\n    ', addressToLine(x)), trace), '\n') AS sym
-FROM system.trace_log
-WHERE (query_id = 'ebca3574-ad0a-400a-9cbc-dca382f5998c') AND (event_date = today())
-GROUP BY trace
-ORDER BY count() DESC
-LIMIT 10
-```
-
-``` text
-{% include "examples/sampling_query_profiler_result.txt" %}
-```
diff --git a/docs/fr/operations/performance-test.md b/docs/fr/operations/performance-test.md
deleted file mode 100644
index 7940b957642..00000000000
--- a/docs/fr/operations/performance-test.md
+++ /dev/null
@@ -1,82 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 54
-toc_title: "Tester Le Mat\xE9riel"
----
-
-# Comment tester votre matériel avec ClickHouse {#how-to-test-your-hardware-with-clickhouse}
-
-Avec cette instruction, vous pouvez exécuter le test de performance clickhouse de base sur n'importe quel serveur sans installation de paquets ClickHouse.
-
-1.  Aller à “commits” page: https://github.com/ClickHouse/ClickHouse/commits/master
-
-2.  Cliquez sur la première coche verte ou croix rouge avec vert “ClickHouse Build Check” et cliquez sur le “Details” lien de proximité “ClickHouse Build Check”. Il n'y a pas un tel lien dans certains commits, par exemple des commits avec de la documentation. Dans ce cas, choisissez le commit le plus proche ayant ce lien.
-
-3.  Copiez le lien à “clickhouse” binaire pour amd64 ou aarch64.
-
-4.  ssh sur le serveur et le télécharger avec wget:
-
-<!-- -->
-
-      # For amd64:
-      wget https://clickhouse-builds.s3.yandex.net/0/00ba767f5d2a929394ea3be193b1f79074a1c4bc/1578163263_binary/clickhouse
-      # For aarch64:
-      wget https://clickhouse-builds.s3.yandex.net/0/00ba767f5d2a929394ea3be193b1f79074a1c4bc/1578161264_binary/clickhouse
-      # Then do:
-      chmod a+x clickhouse
-
-1.  Télécharger configs:
-
-<!-- -->
-
-      wget https://raw.githubusercontent.com/ClickHouse/ClickHouse/master/programs/server/config.xml
-      wget https://raw.githubusercontent.com/ClickHouse/ClickHouse/master/programs/server/users.xml
-      mkdir config.d
-      wget https://raw.githubusercontent.com/ClickHouse/ClickHouse/master/programs/server/config.d/path.xml -O config.d/path.xml
-      wget https://raw.githubusercontent.com/ClickHouse/ClickHouse/master/programs/server/config.d/log_to_console.xml -O config.d/log_to_console.xml
-
-1.  Télécharger des fichiers de référence:
-
-<!-- -->
-
-      wget https://raw.githubusercontent.com/ClickHouse/ClickHouse/master/benchmark/clickhouse/benchmark-new.sh
-      chmod a+x benchmark-new.sh
-      wget https://raw.githubusercontent.com/ClickHouse/ClickHouse/master/benchmark/clickhouse/queries.sql
-
-1.  Télécharger les données de test selon le [Yandex.Metrica dataset](../getting-started/example-datasets/metrica.md) instruction (“hits” tableau contenant 100 millions de lignes).
-
-<!-- -->
-
-      wget https://datasets.clickhouse.tech/hits/partitions/hits_100m_obfuscated_v1.tar.xz
-      tar xvf hits_100m_obfuscated_v1.tar.xz -C .
-      mv hits_100m_obfuscated_v1/* .
-
-1.  Exécuter le serveur:
-
-<!-- -->
-
-      ./clickhouse server
-
-1.  Vérifiez les données: ssh au serveur dans un autre terminal
-
-<!-- -->
-
-      ./clickhouse client --query "SELECT count() FROM hits_100m_obfuscated"
-      100000000
-
-1.  Modifier le benchmark-new.sh, changement `clickhouse-client` de `./clickhouse client` et d'ajouter `–-max_memory_usage 100000000000` paramètre.
-
-<!-- -->
-
-      mcedit benchmark-new.sh
-
-1.  Exécutez le test:
-
-<!-- -->
-
-      ./benchmark-new.sh hits_100m_obfuscated
-
-1.  Envoyez les numéros et les informations sur votre configuration matérielle à clickhouse-feedback@yandex-team.com
-
-Tous les résultats sont publiés ici: https://clickhouse.tech/de référence/de matériel/
diff --git a/docs/fr/operations/quotas.md b/docs/fr/operations/quotas.md
deleted file mode 100644
index ae15c774eaf..00000000000
--- a/docs/fr/operations/quotas.md
+++ /dev/null
@@ -1,112 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 51
-toc_title: Quota
----
-
-# Quota {#quotas}
-
-Les Quotas permettent de limiter l'utilisation des ressources au cours d'une période de temps ou de suivre l'utilisation des ressources.
-Les Quotas sont configurés dans la configuration utilisateur, qui est généralement ‘users.xml’.
-
-Le système dispose également d'une fonctionnalité pour limiter la complexité d'une seule requête. Voir la section “Restrictions on query complexity”).
-
-Contrairement aux restrictions de complexité des requêtes, les quotas:
-
--   Placez des restrictions sur un ensemble de requêtes qui peuvent être exécutées sur une période de temps, au lieu de limiter une seule requête.
--   Compte des ressources dépensées sur tous les serveurs distants pour le traitement des requêtes distribuées.
-
-Regardons la section de la ‘users.xml’ fichier qui définit les quotas.
-
-``` xml
-<!-- Quotas -->
-<quotas>
-    <!-- Quota name. -->
-    <default>
-        <!-- Restrictions for a time period. You can set many intervals with different restrictions. -->
-        <interval>
-            <!-- Length of the interval. -->
-            <duration>3600</duration>
-
-            <!-- Unlimited. Just collect data for the specified time interval. -->
-            <queries>0</queries>
-            <errors>0</errors>
-            <result_rows>0</result_rows>
-            <read_rows>0</read_rows>
-            <execution_time>0</execution_time>
-        </interval>
-    </default>
-```
-
-Par défaut, le quota suit la consommation de ressources pour chaque heure, sans limiter l'utilisation.
-La consommation de ressources calculé pour chaque intervalle est sortie dans le journal du serveur après chaque demande.
-
-``` xml
-<statbox>
-    <!-- Restrictions for a time period. You can set many intervals with different restrictions. -->
-    <interval>
-        <!-- Length of the interval. -->
-        <duration>3600</duration>
-
-        <queries>1000</queries>
-        <errors>100</errors>
-        <result_rows>1000000000</result_rows>
-        <read_rows>100000000000</read_rows>
-        <execution_time>900</execution_time>
-    </interval>
-
-    <interval>
-        <duration>86400</duration>
-
-        <queries>10000</queries>
-        <errors>1000</errors>
-        <result_rows>5000000000</result_rows>
-        <read_rows>500000000000</read_rows>
-        <execution_time>7200</execution_time>
-    </interval>
-</statbox>
-```
-
-Pour l' ‘statbox’ quota, restrictions sont fixées pour toutes les heures et pour toutes les 24 heures (86 400 secondes). L'intervalle de temps est compté, à partir d'un moment fixe défini par l'implémentation. En d'autres termes, l'intervalle de 24 heures ne commence pas nécessairement à minuit.
-
-Lorsque l'intervalle se termine, toutes les valeurs collectées sont effacées. Pour l'heure suivante, le calcul du quota recommence.
-
-Voici les montants qui peuvent être restreint:
-
-`queries` – The total number of requests.
-
-`errors` – The number of queries that threw an exception.
-
-`result_rows` – The total number of rows given as a result.
-
-`read_rows` – The total number of source rows read from tables for running the query on all remote servers.
-
-`execution_time` – The total query execution time, in seconds (wall time).
-
-Si la limite est dépassée pendant au moins un intervalle de temps, une exception est levée avec un texte indiquant quelle restriction a été dépassée, pour quel intervalle et quand le nouvel intervalle commence (lorsque les requêtes peuvent être envoyées à nouveau).
-
-Les Quotas peuvent utiliser le “quota key” fonctionnalité de rapport sur les ressources pour plusieurs clés indépendamment. Voici un exemple de ce:
-
-``` xml
-<!-- For the global reports designer. -->
-<web_global>
-    <!-- keyed – The quota_key "key" is passed in the query parameter,
-            and the quota is tracked separately for each key value.
-        For example, you can pass a Yandex.Metrica username as the key,
-            so the quota will be counted separately for each username.
-        Using keys makes sense only if quota_key is transmitted by the program, not by a user.
-
-        You can also write <keyed_by_ip />, so the IP address is used as the quota key.
-        (But keep in mind that users can change the IPv6 address fairly easily.)
-    -->
-    <keyed />
-```
-
-Le quota est attribué aux utilisateurs dans le ‘users’ section de la configuration. Voir la section “Access rights”.
-
-Pour le traitement des requêtes distribuées, les montants accumulés sont stockés sur le serveur demandeur. Donc, si l'utilisateur se rend sur un autre serveur, le quota y sera “start over”.
-
-Lorsque le serveur est redémarré, les quotas sont réinitialisés.
-
-[Article Original](https://clickhouse.tech/docs/en/operations/quotas/) <!--hide-->
diff --git a/docs/fr/operations/requirements.md b/docs/fr/operations/requirements.md
deleted file mode 100644
index 1d79f3fcf82..00000000000
--- a/docs/fr/operations/requirements.md
+++ /dev/null
@@ -1,61 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 44
-toc_title: Exigence
----
-
-# Exigence {#requirements}
-
-## CPU {#cpu}
-
-Pour l'installation à partir de paquets deb prédéfinis, utilisez un processeur avec l'architecture x86_64 et la prise en charge des instructions SSE 4.2. Pour exécuter ClickHouse avec des processeurs qui ne prennent pas en charge SSE 4.2 ou qui ont une architecture AArch64 ou PowerPC64LE, vous devez créer ClickHouse à partir de sources.
-
-ClickHouse implémente le traitement parallèle des données et utilise toutes les ressources matérielles disponibles. Lors du choix d'un processeur, tenez compte du fait que ClickHouse fonctionne plus efficacement dans les configurations avec un grand nombre de cœurs mais une fréquence d'horloge plus faible que dans les configurations avec moins de cœurs et une fréquence d'horloge plus élevée. Par exemple, 16 cœurs avec 2600 MHz est préférable à 8 cœurs avec 3600 MHz.
-
-Il est recommandé d'utiliser **Turbo Boost** et **la technologie hyper-threading** technologie. Il améliore considérablement les performances avec une charge de travail typique.
-
-## RAM {#ram}
-
-Nous vous recommandons d'utiliser un minimum de 4 Go de RAM pour effectuer des requêtes non triviales. Le serveur ClickHouse peut fonctionner avec une quantité beaucoup plus petite de RAM, mais il nécessite de la mémoire pour traiter les requêtes.
-
-Le volume de RAM requis dépend de:
-
--   La complexité des requêtes.
--   La quantité de données traitées dans les requêtes.
-
-Pour calculer le volume de RAM requis, vous devez estimer la taille des données temporaires pour [GROUP BY](../sql-reference/statements/select/group-by.md#select-group-by-clause), [DISTINCT](../sql-reference/statements/select/distinct.md#select-distinct), [JOIN](../sql-reference/statements/select/join.md#select-join) et d'autres opérations que vous utilisez.
-
-ClickHouse peut utiliser la mémoire externe pour les données temporaires. Voir [Groupe par dans la mémoire externe](../sql-reference/statements/select/group-by.md#select-group-by-in-external-memory) pour plus de détails.
-
-## Fichier D'Échange {#swap-file}
-
-Désactiver le fichier d'échange pour les environnements de production.
-
-## Sous-Système De Stockage {#storage-subsystem}
-
-Vous devez avoir 2 Go d'espace disque libre pour installer ClickHouse.
-
-Le volume de stockage requis pour vos données doit être calculé séparément. L'évaluation devrait inclure:
-
--   Estimation du volume de données.
-
-    Vous pouvez prendre un échantillon des données et obtenir la taille moyenne d'une ligne. Ensuite, multipliez la valeur par le nombre de lignes que vous souhaitez stocker.
-
--   Le coefficient de compression des données.
-
-    Pour estimer le coefficient de compression des données, chargez un échantillon de vos données dans ClickHouse et comparez la taille réelle des données avec la taille de la table stockée. Par exemple, les données de flux de clics sont généralement compressées de 6 à 10 fois.
-
-Pour calculer le volume final de données à stocker, appliquez le coefficient de compression au volume de données estimé. Si vous prévoyez de stocker des données dans plusieurs répliques, puis multipliez le volume estimé par le nombre de réplicas.
-
-## Réseau {#network}
-
-Si possible, utilisez des réseaux de classe 10G ou supérieure.
-
-La bande passante du réseau est essentielle pour traiter les requêtes distribuées avec une grande quantité de données intermédiaires. En outre, la vitesse du réseau affecte les processus de réplication.
-
-## Logiciel {#software}
-
-ClickHouse est développé principalement pour la famille de systèmes D'exploitation Linux. La distribution Linux recommandée est Ubuntu. Le `tzdata` paquet doit être installé dans le système.
-
-ClickHouse peut également fonctionner dans d'autres familles de systèmes d'exploitation. Voir les détails dans le [Prise en main](../getting-started/index.md) section de la documentation.
diff --git a/docs/fr/operations/server-configuration-parameters/index.md b/docs/fr/operations/server-configuration-parameters/index.md
deleted file mode 100644
index 0ecfb4a44cc..00000000000
--- a/docs/fr/operations/server-configuration-parameters/index.md
+++ /dev/null
@@ -1,19 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: "Param\xE8tres De Configuration Du Serveur"
-toc_priority: 54
-toc_title: Introduction
----
-
-# Paramètres De Configuration Du Serveur {#server-settings}
-
-Cette section contient des descriptions des paramètres du serveur qui ne peuvent pas être modifiés au niveau de la session ou de la requête.
-
-Ces paramètres sont stockés dans la `config.xml` fichier sur le serveur ClickHouse.
-
-D'autres paramètres sont décrits dans le “[Paramètre](../settings/index.md#session-settings-intro)” section.
-
-Avant d'étudier les paramètres, lire la [Fichiers de Configuration](../configuration-files.md#configuration_files) section et notez l'utilisation de substitutions (le `incl` et `optional` attribut).
-
-[Article Original](https://clickhouse.tech/docs/en/operations/server_configuration_parameters/) <!--hide-->
diff --git a/docs/fr/operations/server-configuration-parameters/settings.md b/docs/fr/operations/server-configuration-parameters/settings.md
deleted file mode 100644
index af83f3f5ed7..00000000000
--- a/docs/fr/operations/server-configuration-parameters/settings.md
+++ /dev/null
@@ -1,906 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 57
-toc_title: "Les Param\xE8tres Du Serveur"
----
-
-# Les Paramètres Du Serveur {#server-settings}
-
-## builtin_dictionaries_reload_interval {#builtin-dictionaries-reload-interval}
-
-L'intervalle en secondes avant de recharger les dictionnaires intégrés.
-
-Clickhouse recharge les dictionnaires intégrés toutes les X secondes. Cela permet d'éditer des dictionnaires “on the fly” sans redémarrer le serveur.
-
-Valeur par défaut: 3600.
-
-**Exemple**
-
-``` xml
-<builtin_dictionaries_reload_interval>3600</builtin_dictionaries_reload_interval>
-```
-
-## compression {#server-settings-compression}
-
-Paramètres de compression de données pour [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md)-tables de moteur.
-
-!!! warning "Avertissement"
-    Ne l'utilisez pas si vous venez de commencer à utiliser ClickHouse.
-
-Modèle de Configuration:
-
-``` xml
-<compression>
-    <case>
-      <min_part_size>...</min_part_size>
-      <min_part_size_ratio>...</min_part_size_ratio>
-      <method>...</method>
-    </case>
-    ...
-</compression>
-```
-
-`<case>` Fields:
-
--   `min_part_size` – The minimum size of a data part.
--   `min_part_size_ratio` – The ratio of the data part size to the table size.
--   `method` – Compression method. Acceptable values: `lz4` ou `zstd`.
-
-Vous pouvez configurer plusieurs `<case>` section.
-
-Actions lorsque les conditions sont remplies:
-
--   Si une partie de données correspond à un ensemble de conditions, ClickHouse utilise la méthode de compression spécifiée.
--   Si une partie de données correspond à plusieurs ensembles de conditions, ClickHouse utilise le premier ensemble de conditions correspondant.
-
-Si aucune condition n'est remplie pour une partie de données, ClickHouse utilise `lz4` compression.
-
-**Exemple**
-
-``` xml
-<compression incl="clickhouse_compression">
-    <case>
-        <min_part_size>10000000000</min_part_size>
-        <min_part_size_ratio>0.01</min_part_size_ratio>
-        <method>zstd</method>
-    </case>
-</compression>
-```
-
-## default_database {#default-database}
-
-La base de données par défaut.
-
-Pour obtenir une liste de bases de données, utilisez la [SHOW DATABASES](../../sql-reference/statements/show.md#show-databases) requête.
-
-**Exemple**
-
-``` xml
-<default_database>default</default_database>
-```
-
-## default_profile {#default-profile}
-
-Profil des paramètres par défaut.
-
-Les paramètres des profils sont situés dans le fichier spécifié dans le paramètre `user_config`.
-
-**Exemple**
-
-``` xml
-<default_profile>default</default_profile>
-```
-
-## dictionaries_config {#server_configuration_parameters-dictionaries_config}
-
-Chemin d'accès au fichier de configuration des dictionnaires externes.
-
-Chemin:
-
--   Spécifiez le chemin absolu ou le chemin relatif au fichier de configuration du serveur.
--   Le chemin peut contenir des caractères génériques \* et ?.
-
-Voir aussi “[Dictionnaires externes](../../sql-reference/dictionaries/external-dictionaries/external-dicts.md)”.
-
-**Exemple**
-
-``` xml
-<dictionaries_config>*_dictionary.xml</dictionaries_config>
-```
-
-## dictionaries_lazy_load {#server_configuration_parameters-dictionaries_lazy_load}
-
-Chargement paresseux des dictionnaires.
-
-Si `true` chaque dictionnaire est créé lors de la première utilisation. Si la création du dictionnaire a échoué, la fonction qui utilisait le dictionnaire lève une exception.
-
-Si `false`, tous les dictionnaires sont créés lorsque le serveur démarre, et si il y a une erreur, le serveur s'arrête.
-
-La valeur par défaut est `true`.
-
-**Exemple**
-
-``` xml
-<dictionaries_lazy_load>true</dictionaries_lazy_load>
-```
-
-## format_schema_path {#server_configuration_parameters-format_schema_path}
-
-Le chemin d'accès au répertoire avec des régimes pour l'entrée de données, tels que les schémas pour l' [CapnProto](../../interfaces/formats.md#capnproto) format.
-
-**Exemple**
-
-``` xml
-  <!-- Directory containing schema files for various input formats. -->
-  <format_schema_path>format_schemas/</format_schema_path>
-```
-
-## graphite {#server_configuration_parameters-graphite}
-
-Envoi de données à [Graphite](https://github.com/graphite-project).
-
-Paramètre:
-
--   host – The Graphite server.
--   port – The port on the Graphite server.
--   interval – The interval for sending, in seconds.
--   timeout – The timeout for sending data, in seconds.
--   root_path – Prefix for keys.
--   metrics – Sending data from the [système.métrique](../../operations/system-tables.md#system_tables-metrics) table.
--   events – Sending deltas data accumulated for the time period from the [système.événement](../../operations/system-tables.md#system_tables-events) table.
--   events_cumulative – Sending cumulative data from the [système.événement](../../operations/system-tables.md#system_tables-events) table.
--   asynchronous_metrics – Sending data from the [système.asynchronous_metrics](../../operations/system-tables.md#system_tables-asynchronous_metrics) table.
-
-Vous pouvez configurer plusieurs `<graphite>` clause. Par exemple, vous pouvez l'utiliser pour envoyer des données différentes à différents intervalles.
-
-**Exemple**
-
-``` xml
-<graphite>
-    <host>localhost</host>
-    <port>42000</port>
-    <timeout>0.1</timeout>
-    <interval>60</interval>
-    <root_path>one_min</root_path>
-    <metrics>true</metrics>
-    <events>true</events>
-    <events_cumulative>false</events_cumulative>
-    <asynchronous_metrics>true</asynchronous_metrics>
-</graphite>
-```
-
-## graphite_rollup {#server_configuration_parameters-graphite-rollup}
-
-Paramètres pour l'amincissement des données pour le Graphite.
-
-Pour plus de détails, voir [GraphiteMergeTree](../../engines/table-engines/mergetree-family/graphitemergetree.md).
-
-**Exemple**
-
-``` xml
-<graphite_rollup_example>
-    <default>
-        <function>max</function>
-        <retention>
-            <age>0</age>
-            <precision>60</precision>
-        </retention>
-        <retention>
-            <age>3600</age>
-            <precision>300</precision>
-        </retention>
-        <retention>
-            <age>86400</age>
-            <precision>3600</precision>
-        </retention>
-    </default>
-</graphite_rollup_example>
-```
-
-## http_port/https_port {#http-porthttps-port}
-
-Port de connexion au serveur via HTTP(S).
-
-Si `https_port` est spécifié, [openSSL](#server_configuration_parameters-openssl) doit être configuré.
-
-Si `http_port` est spécifié, la configuration OpenSSL est ignorée même si elle est définie.
-
-**Exemple**
-
-``` xml
-<https_port>9999</https_port>
-```
-
-## http_server_default_response {#server_configuration_parameters-http_server_default_response}
-
-Page affichée par défaut lorsque vous accédez au serveur HTTP(S) ClickHouse.
-La valeur par défaut est “Ok.” (avec un saut de ligne à la fin)
-
-**Exemple**
-
-Ouvrir `https://tabix.io/` lors de l'accès à `http://localhost: http_port`.
-
-``` xml
-<http_server_default_response>
-  <![CDATA[<html ng-app="SMI2"><head><base href="http://ui.tabix.io/"></head><body><div ui-view="" class="content-ui"></div><script src="http://loader.tabix.io/master.js"></script></body></html>]]>
-</http_server_default_response>
-```
-
-## include_from {#server_configuration_parameters-include_from}
-
-Le chemin d'accès au fichier avec des substitutions.
-
-Pour plus d'informations, consultez la section “[Fichiers de Configuration](../configuration-files.md#configuration_files)”.
-
-**Exemple**
-
-``` xml
-<include_from>/etc/metrica.xml</include_from>
-```
-
-## interserver_http_port {#interserver-http-port}
-
-Port pour l'échange de données entre les serveurs ClickHouse.
-
-**Exemple**
-
-``` xml
-<interserver_http_port>9009</interserver_http_port>
-```
-
-## interserver_http_host {#interserver-http-host}
-
-Le nom d'hôte qui peut être utilisé par d'autres serveurs pour accéder à ce serveur.
-
-Si elle est omise, elle est définie de la même manière que `hostname-f` commande.
-
-Utile pour rompre avec une interface réseau spécifique.
-
-**Exemple**
-
-``` xml
-<interserver_http_host>example.yandex.ru</interserver_http_host>
-```
-
-## interserver_http_credentials {#server-settings-interserver-http-credentials}
-
-Le nom d'utilisateur et le mot de passe utilisés pour [réplication](../../engines/table-engines/mergetree-family/replication.md) avec les moteurs \* répliqués. Ces informations d'identification sont utilisées uniquement pour la communication entre les répliques et ne sont pas liées aux informations d'identification des clients ClickHouse. Le serveur vérifie ces informations d'identification pour la connexion de répliques et utilise les mêmes informations d'identification lors de la connexion à d'autres répliques. Donc, ces informations d'identification doivent être identiques pour tous les réplicas dans un cluster.
-Par défaut, l'authentification n'est pas utilisé.
-
-Cette section contient les paramètres suivants:
-
--   `user` — username.
--   `password` — password.
-
-**Exemple**
-
-``` xml
-<interserver_http_credentials>
-    <user>admin</user>
-    <password>222</password>
-</interserver_http_credentials>
-```
-
-## keep_alive_timeout {#keep-alive-timeout}
-
-Le nombre de secondes que ClickHouse attend pour les demandes entrantes avant de fermer la connexion. Par défaut est de 3 secondes.
-
-**Exemple**
-
-``` xml
-<keep_alive_timeout>3</keep_alive_timeout>
-```
-
-## listen_host {#server_configuration_parameters-listen_host}
-
-Restriction sur les hôtes dont les demandes peuvent provenir. Si vous voulez que le serveur réponde à tous, spécifiez `::`.
-
-Exemple:
-
-``` xml
-<listen_host>::1</listen_host>
-<listen_host>127.0.0.1</listen_host>
-```
-
-## enregistreur {#server_configuration_parameters-logger}
-
-Paramètres de journalisation.
-
-Touches:
-
--   level – Logging level. Acceptable values: `trace`, `debug`, `information`, `warning`, `error`.
--   log – The log file. Contains all the entries according to `level`.
--   errorlog – Error log file.
--   size – Size of the file. Applies to `log`et`errorlog`. Une fois que le fichier atteint `size`, Archives ClickHouse et le renomme, et crée un nouveau fichier journal à sa place.
--   count – The number of archived log files that ClickHouse stores.
-
-**Exemple**
-
-``` xml
-<logger>
-    <level>trace</level>
-    <log>/var/log/clickhouse-server/clickhouse-server.log</log>
-    <errorlog>/var/log/clickhouse-server/clickhouse-server.err.log</errorlog>
-    <size>1000M</size>
-    <count>10</count>
-</logger>
-```
-
-L'écriture dans le syslog est également prise en charge. Exemple de Config:
-
-``` xml
-<logger>
-    <use_syslog>1</use_syslog>
-    <syslog>
-        <address>syslog.remote:10514</address>
-        <hostname>myhost.local</hostname>
-        <facility>LOG_LOCAL6</facility>
-        <format>syslog</format>
-    </syslog>
-</logger>
-```
-
-Touches:
-
--   use_syslog — Required setting if you want to write to the syslog.
--   address — The host\[:port\] of syslogd. If omitted, the local daemon is used.
--   hostname — Optional. The name of the host that logs are sent from.
--   facility — [Le mot clé syslog facility](https://en.wikipedia.org/wiki/Syslog#Facility) en majuscules avec la “LOG_” préfixe: (`LOG_USER`, `LOG_DAEMON`, `LOG_LOCAL3` et ainsi de suite).
-    Valeur par défaut: `LOG_USER` si `address` est spécifié, `LOG_DAEMON otherwise.`
--   format – Message format. Possible values: `bsd` et `syslog.`
-
-## macro {#macros}
-
-Substitutions de paramètres pour les tables répliquées.
-
-Peut être omis si les tables répliquées ne sont pas utilisées.
-
-Pour plus d'informations, consultez la section “[Création de tables répliquées](../../engines/table-engines/mergetree-family/replication.md)”.
-
-**Exemple**
-
-``` xml
-<macros incl="macros" optional="true" />
-```
-
-## mark_cache_size {#server-mark-cache-size}
-
-Taille approximative (en octets) du cache des marques utilisées par les [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md) famille.
-
-Le cache est partagé pour le serveur et la mémoire est allouée au besoin. La taille du cache doit être d'au moins 5368709120.
-
-**Exemple**
-
-``` xml
-<mark_cache_size>5368709120</mark_cache_size>
-```
-
-## max_concurrent_queries {#max-concurrent-queries}
-
-Nombre maximal de demandes traitées simultanément.
-
-**Exemple**
-
-``` xml
-<max_concurrent_queries>100</max_concurrent_queries>
-```
-
-## max_connections {#max-connections}
-
-Le nombre maximal de connexions entrantes.
-
-**Exemple**
-
-``` xml
-<max_connections>4096</max_connections>
-```
-
-## max_open_files {#max-open-files}
-
-Le nombre maximal de fichiers ouverts.
-
-Par défaut: `maximum`.
-
-Nous vous recommandons d'utiliser cette option sous Mac OS X depuis le `getrlimit()` la fonction renvoie une valeur incorrecte.
-
-**Exemple**
-
-``` xml
-<max_open_files>262144</max_open_files>
-```
-
-## max_table_size_to_drop {#max-table-size-to-drop}
-
-Restriction sur la suppression de tables.
-
-Si la taille d'un [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md) table dépasse `max_table_size_to_drop` (en octets), vous ne pouvez pas le supprimer à l'aide d'une requête DROP.
-
-Si vous devez toujours supprimer la table sans redémarrer le serveur ClickHouse, créez le `<clickhouse-path>/flags/force_drop_table` fichier et exécutez la requête DROP.
-
-Valeur par défaut: 50 Go.
-
-La valeur 0 signifie que vous pouvez supprimer toutes les tables sans aucune restriction.
-
-**Exemple**
-
-``` xml
-<max_table_size_to_drop>0</max_table_size_to_drop>
-```
-
-## merge_tree {#server_configuration_parameters-merge_tree}
-
-Réglage fin des tables dans le [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md).
-
-Pour plus d'informations, consultez MergeTreeSettings.h fichier d'en-tête.
-
-**Exemple**
-
-``` xml
-<merge_tree>
-    <max_suspicious_broken_parts>5</max_suspicious_broken_parts>
-</merge_tree>
-```
-
-## openSSL {#server_configuration_parameters-openssl}
-
-Configuration client/serveur SSL.
-
-Le Support pour SSL est fourni par le `libpoco` bibliothèque. L'interface est décrite dans le fichier [SSLManager.h](https://github.com/ClickHouse-Extras/poco/blob/master/NetSSL_OpenSSL/include/Poco/Net/SSLManager.h)
-
-Clés pour les paramètres Serveur/client:
-
--   privateKeyFile – The path to the file with the secret key of the PEM certificate. The file may contain a key and certificate at the same time.
--   certificateFile – The path to the client/server certificate file in PEM format. You can omit it if `privateKeyFile` contient le certificat.
--   caConfig – The path to the file or directory that contains trusted root certificates.
--   verificationMode – The method for checking the node's certificates. Details are in the description of the [Cadre](https://github.com/ClickHouse-Extras/poco/blob/master/NetSSL_OpenSSL/include/Poco/Net/Context.h) classe. Valeurs possibles: `none`, `relaxed`, `strict`, `once`.
--   verificationDepth – The maximum length of the verification chain. Verification will fail if the certificate chain length exceeds the set value.
--   loadDefaultCAFile – Indicates that built-in CA certificates for OpenSSL will be used. Acceptable values: `true`, `false`. \|
--   cipherList – Supported OpenSSL encryptions. For example: `ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH`.
--   cacheSessions – Enables or disables caching sessions. Must be used in combination with `sessionIdContext`. Les valeurs acceptables: `true`, `false`.
--   sessionIdContext – A unique set of random characters that the server appends to each generated identifier. The length of the string must not exceed `SSL_MAX_SSL_SESSION_ID_LENGTH`. Ce paramètre est toujours recommandé car il permet d'éviter les problèmes à la fois si le serveur met en cache la session et si le client demande la mise en cache. Valeur par défaut: `${application.name}`.
--   sessionCacheSize – The maximum number of sessions that the server caches. Default value: 1024\*20. 0 – Unlimited sessions.
--   sessionTimeout – Time for caching the session on the server.
--   extendedVerification – Automatically extended verification of certificates after the session ends. Acceptable values: `true`, `false`.
--   requireTLSv1 – Require a TLSv1 connection. Acceptable values: `true`, `false`.
--   requireTLSv1_1 – Require a TLSv1.1 connection. Acceptable values: `true`, `false`.
--   requireTLSv1 – Require a TLSv1.2 connection. Acceptable values: `true`, `false`.
--   fips – Activates OpenSSL FIPS mode. Supported if the library's OpenSSL version supports FIPS.
--   privateKeyPassphraseHandler – Class (PrivateKeyPassphraseHandler subclass) that requests the passphrase for accessing the private key. For example: `<privateKeyPassphraseHandler>`, `<name>KeyFileHandler</name>`, `<options><password>test</password></options>`, `</privateKeyPassphraseHandler>`.
--   invalidCertificateHandler – Class (a subclass of CertificateHandler) for verifying invalid certificates. For example: `<invalidCertificateHandler> <name>ConsoleCertificateHandler</name> </invalidCertificateHandler>` .
--   disableProtocols – Protocols that are not allowed to use.
--   preferServerCiphers – Preferred server ciphers on the client.
-
-**Exemple de paramètres:**
-
-``` xml
-<openSSL>
-    <server>
-        <!-- openssl req -subj "/CN=localhost" -new -newkey rsa:2048 -days 365 -nodes -x509 -keyout /etc/clickhouse-server/server.key -out /etc/clickhouse-server/server.crt -->
-        <certificateFile>/etc/clickhouse-server/server.crt</certificateFile>
-        <privateKeyFile>/etc/clickhouse-server/server.key</privateKeyFile>
-        <!-- openssl dhparam -out /etc/clickhouse-server/dhparam.pem 4096 -->
-        <dhParamsFile>/etc/clickhouse-server/dhparam.pem</dhParamsFile>
-        <verificationMode>none</verificationMode>
-        <loadDefaultCAFile>true</loadDefaultCAFile>
-        <cacheSessions>true</cacheSessions>
-        <disableProtocols>sslv2,sslv3</disableProtocols>
-        <preferServerCiphers>true</preferServerCiphers>
-    </server>
-    <client>
-        <loadDefaultCAFile>true</loadDefaultCAFile>
-        <cacheSessions>true</cacheSessions>
-        <disableProtocols>sslv2,sslv3</disableProtocols>
-        <preferServerCiphers>true</preferServerCiphers>
-        <!-- Use for self-signed: <verificationMode>none</verificationMode> -->
-        <invalidCertificateHandler>
-            <!-- Use for self-signed: <name>AcceptCertificateHandler</name> -->
-            <name>RejectCertificateHandler</name>
-        </invalidCertificateHandler>
-    </client>
-</openSSL>
-```
-
-## part_log {#server_configuration_parameters-part-log}
-
-Journalisation des événements associés à [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md). Par exemple, ajouter ou fusionner des données. Vous pouvez utiliser le journal pour simuler des algorithmes de fusion et comparer leurs caractéristiques. Vous pouvez visualiser le processus de fusion.
-
-Les requêtes sont enregistrées dans le [système.part_log](../../operations/system-tables.md#system_tables-part-log) table, pas dans un fichier séparé. Vous pouvez configurer le nom de cette table dans le `table` paramètre (voir ci-dessous).
-
-Utilisez les paramètres suivants pour configurer la journalisation:
-
--   `database` – Name of the database.
--   `table` – Name of the system table.
--   `partition_by` – Sets a [partitionnement personnalisé clé](../../engines/table-engines/mergetree-family/custom-partitioning-key.md).
--   `flush_interval_milliseconds` – Interval for flushing data from the buffer in memory to the table.
-
-**Exemple**
-
-``` xml
-<part_log>
-    <database>system</database>
-    <table>part_log</table>
-    <partition_by>toMonday(event_date)</partition_by>
-    <flush_interval_milliseconds>7500</flush_interval_milliseconds>
-</part_log>
-```
-
-## chemin {#server_configuration_parameters-path}
-
-Chemin d'accès au répertoire contenant des données.
-
-!!! note "Note"
-    La barre oblique de fin est obligatoire.
-
-**Exemple**
-
-``` xml
-<path>/var/lib/clickhouse/</path>
-```
-
-## prometheus {#server_configuration_parameters-prometheus}
-
-Exposer les données de métriques pour le raclage à partir [Prometheus](https://prometheus.io).
-
-Paramètre:
-
--   `endpoint` – HTTP endpoint for scraping metrics by prometheus server. Start from ‘/’.
--   `port` – Port for `endpoint`.
--   `metrics` – Flag that sets to expose metrics from the [système.métrique](../system-tables.md#system_tables-metrics) table.
--   `events` – Flag that sets to expose metrics from the [système.événement](../system-tables.md#system_tables-events) table.
--   `asynchronous_metrics` – Flag that sets to expose current metrics values from the [système.asynchronous_metrics](../system-tables.md#system_tables-asynchronous_metrics) table.
-
-**Exemple**
-
-``` xml
- <prometheus>
-        <endpoint>/metrics</endpoint>
-        <port>8001</port>
-        <metrics>true</metrics>
-        <events>true</events>
-        <asynchronous_metrics>true</asynchronous_metrics>
-    </prometheus>
-```
-
-## query_log {#server_configuration_parameters-query-log}
-
-Réglage de la journalisation des requêtes reçues avec [log_queries=1](../settings/settings.md) paramètre.
-
-Les requêtes sont enregistrées dans le [système.query_log](../../operations/system-tables.md#system_tables-query_log) table, pas dans un fichier séparé. Vous pouvez modifier le nom de la table dans le `table` paramètre (voir ci-dessous).
-
-Utilisez les paramètres suivants pour configurer la journalisation:
-
--   `database` – Name of the database.
--   `table` – Name of the system table the queries will be logged in.
--   `partition_by` – Sets a [partitionnement personnalisé clé](../../engines/table-engines/mergetree-family/custom-partitioning-key.md) pour une table.
--   `flush_interval_milliseconds` – Interval for flushing data from the buffer in memory to the table.
-
-Si la table n'existe pas, ClickHouse la créera. Si la structure du journal des requêtes a été modifiée lors de la mise à jour du serveur ClickHouse, la table avec l'ancienne structure est renommée et une nouvelle table est créée automatiquement.
-
-**Exemple**
-
-``` xml
-<query_log>
-    <database>system</database>
-    <table>query_log</table>
-    <partition_by>toMonday(event_date)</partition_by>
-    <flush_interval_milliseconds>7500</flush_interval_milliseconds>
-</query_log>
-```
-
-## query_thread_log {#server_configuration_parameters-query-thread-log}
-
-Réglage de la journalisation des threads de requêtes reçues avec [log_query_threads=1](../settings/settings.md#settings-log-query-threads) paramètre.
-
-Les requêtes sont enregistrées dans le [système.query_thread_log](../../operations/system-tables.md#system_tables-query-thread-log) table, pas dans un fichier séparé. Vous pouvez modifier le nom de la table dans le `table` paramètre (voir ci-dessous).
-
-Utilisez les paramètres suivants pour configurer la journalisation:
-
--   `database` – Name of the database.
--   `table` – Name of the system table the queries will be logged in.
--   `partition_by` – Sets a [partitionnement personnalisé clé](../../engines/table-engines/mergetree-family/custom-partitioning-key.md) pour un système de tableau.
--   `flush_interval_milliseconds` – Interval for flushing data from the buffer in memory to the table.
-
-Si la table n'existe pas, ClickHouse la créera. Si la structure du journal des threads de requête a été modifiée lors de la mise à jour du serveur ClickHouse, la table avec l'ancienne structure est renommée et une nouvelle table est créée automatiquement.
-
-**Exemple**
-
-``` xml
-<query_thread_log>
-    <database>system</database>
-    <table>query_thread_log</table>
-    <partition_by>toMonday(event_date)</partition_by>
-    <flush_interval_milliseconds>7500</flush_interval_milliseconds>
-</query_thread_log>
-```
-
-## trace_log {#server_configuration_parameters-trace_log}
-
-Paramètres pour le [trace_log](../../operations/system-tables.md#system_tables-trace_log) opération de table de système.
-
-Paramètre:
-
--   `database` — Database for storing a table.
--   `table` — Table name.
--   `partition_by` — [Partitionnement personnalisé clé](../../engines/table-engines/mergetree-family/custom-partitioning-key.md) pour un système de tableau.
--   `flush_interval_milliseconds` — Interval for flushing data from the buffer in memory to the table.
-
-Le fichier de configuration du serveur par défaut `config.xml` contient la section Paramètres suivante:
-
-``` xml
-<trace_log>
-    <database>system</database>
-    <table>trace_log</table>
-    <partition_by>toYYYYMM(event_date)</partition_by>
-    <flush_interval_milliseconds>7500</flush_interval_milliseconds>
-</trace_log>
-```
-
-## query_masking_rules {#query-masking-rules}
-
-Règles basées sur Regexp, qui seront appliquées aux requêtes ainsi qu'à tous les messages de journal avant de les stocker dans les journaux du serveur,
-`system.query_log`, `system.text_log`, `system.processes` table, et dans les journaux envoyés au client. Qui permet à la prévention de
-fuite de données sensibles à partir de requêtes SQL (comme les noms, e-mails,
-identificateurs ou numéros de carte de crédit) aux journaux.
-
-**Exemple**
-
-``` xml
-<query_masking_rules>
-    <rule>
-        <name>hide SSN</name>
-        <regexp>(^|\D)\d{3}-\d{2}-\d{4}($|\D)</regexp>
-        <replace>000-00-0000</replace>
-    </rule>
-</query_masking_rules>
-```
-
-Config champs:
-- `name` - nom de la règle (facultatif)
-- `regexp` - Expression régulière compatible RE2 (obligatoire)
-- `replace` - chaîne de substitution pour les données sensibles (facultatif, par défaut - six astérisques)
-
-Les règles de masquage sont appliquées à l'ensemble de la requête (pour éviter les fuites de données sensibles provenant de requêtes malformées / Non analysables).
-
-`system.events` table ont compteur `QueryMaskingRulesMatch` qui ont un nombre global de requête de masquage des règles de correspondances.
-
-Pour les requêtes distribuées chaque serveur doivent être configurés séparément, sinon, les sous-requêtes transmises à d'autres
-les nœuds seront stockés sans masquage.
-
-## remote_servers {#server-settings-remote-servers}
-
-Configuration des clusters utilisés par le [Distribué](../../engines/table-engines/special/distributed.md) moteur de table et par le `cluster` table de fonction.
-
-**Exemple**
-
-``` xml
-<remote_servers incl="clickhouse_remote_servers" />
-```
-
-Pour la valeur de l' `incl` attribut, voir la section “[Fichiers de Configuration](../configuration-files.md#configuration_files)”.
-
-**Voir Aussi**
-
--   [skip_unavailable_shards](../settings/settings.md#settings-skip_unavailable_shards)
-
-## fuseau {#server_configuration_parameters-timezone}
-
-Le fuseau horaire du serveur.
-
-Spécifié comme identifiant IANA pour le fuseau horaire UTC ou l'emplacement géographique (par exemple, Afrique / Abidjan).
-
-Le fuseau horaire est nécessaire pour les conversions entre les formats String et DateTime lorsque les champs DateTime sont sortis au format texte (imprimés à l'écran ou dans un fichier) et lors de L'obtention de DateTime à partir d'une chaîne. En outre, le fuseau horaire est utilisé dans les fonctions qui fonctionnent avec l'heure et la date si elles ne reçoivent pas le fuseau horaire dans les paramètres d'entrée.
-
-**Exemple**
-
-``` xml
-<timezone>Europe/Moscow</timezone>
-```
-
-## tcp_port {#server_configuration_parameters-tcp_port}
-
-Port pour communiquer avec les clients via le protocole TCP.
-
-**Exemple**
-
-``` xml
-<tcp_port>9000</tcp_port>
-```
-
-## tcp_port_secure {#server_configuration_parameters-tcp_port_secure}
-
-Port TCP pour une communication sécurisée avec les clients. Utilisez le avec [OpenSSL](#server_configuration_parameters-openssl) paramètre.
-
-**Valeurs possibles**
-
-Entier positif.
-
-**Valeur par défaut**
-
-``` xml
-<tcp_port_secure>9440</tcp_port_secure>
-```
-
-## mysql_port {#server_configuration_parameters-mysql_port}
-
-Port pour communiquer avec les clients via le protocole MySQL.
-
-**Valeurs possibles**
-
-Entier positif.
-
-Exemple
-
-``` xml
-<mysql_port>9004</mysql_port>
-```
-
-## tmp_path {#server-settings-tmp_path}
-
-Chemin d'accès aux données temporaires pour le traitement des requêtes volumineuses.
-
-!!! note "Note"
-    La barre oblique de fin est obligatoire.
-
-**Exemple**
-
-``` xml
-<tmp_path>/var/lib/clickhouse/tmp/</tmp_path>
-```
-
-## tmp_policy {#server-settings-tmp-policy}
-
-La politique de [`storage_configuration`](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-multiple-volumes) pour stocker des fichiers temporaires.
-Si cela n'est pas [`tmp_path`](#server-settings-tmp_path) est utilisé, sinon elle est ignorée.
-
-!!! note "Note"
-    - `move_factor` est ignoré
-- `keep_free_space_bytes` est ignoré
-- `max_data_part_size_bytes` est ignoré
-- vous devez avoir exactement un volume dans cette politique
-
-## uncompressed_cache_size {#server-settings-uncompressed_cache_size}
-
-Taille du Cache (en octets) pour les données non compressées utilisées par les [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md).
-
-Il y a un cache partagé pour le serveur. La mémoire est allouée à la demande. Le cache est utilisé si l'option [use_uncompressed_cache](../settings/settings.md#setting-use_uncompressed_cache) est activé.
-
-Le cache non compressé est avantageux pour les requêtes très courtes dans des cas individuels.
-
-**Exemple**
-
-``` xml
-<uncompressed_cache_size>8589934592</uncompressed_cache_size>
-```
-
-## user_files_path {#server_configuration_parameters-user_files_path}
-
-Le répertoire avec les fichiers utilisateur. Utilisé dans la fonction de table [fichier()](../../sql-reference/table-functions/file.md).
-
-**Exemple**
-
-``` xml
-<user_files_path>/var/lib/clickhouse/user_files/</user_files_path>
-```
-
-## users_config {#users-config}
-
-Chemin d'accès au fichier qui contient:
-
--   Les configurations de l'utilisateur.
--   Les droits d'accès.
--   Les paramètres des profils.
--   Les paramètres de Quota.
-
-**Exemple**
-
-``` xml
-<users_config>users.xml</users_config>
-```
-
-## zookeeper {#server-settings_zookeeper}
-
-Contient des paramètres qui permettent à ClickHouse d'interagir avec [ZooKeeper](http://zookeeper.apache.org/) cluster.
-
-ClickHouse utilise ZooKeeper pour stocker les métadonnées des répliques lors de l'utilisation de tables répliquées. Si les tables répliquées ne sont pas utilisées, cette section de paramètres peut être omise.
-
-Cette section contient les paramètres suivants:
-
--   `node` — ZooKeeper endpoint. You can set multiple endpoints.
-
-    Exemple:
-
-<!-- -->
-
-``` xml
-    <node index="1">
-        <host>example_host</host>
-        <port>2181</port>
-    </node>
-```
-
-      The `index` attribute specifies the node order when trying to connect to the ZooKeeper cluster.
-
--   `session_timeout` — Maximum timeout for the client session in milliseconds.
--   `root` — The [znode](http://zookeeper.apache.org/doc/r3.5.5/zookeeperOver.html#Nodes+and+ephemeral+nodes) qui est utilisé comme racine pour les znodes utilisés par le serveur ClickHouse. Facultatif.
--   `identity` — User and password, that can be required by ZooKeeper to give access to requested znodes. Optional.
-
-**Exemple de configuration**
-
-``` xml
-<zookeeper>
-    <node>
-        <host>example1</host>
-        <port>2181</port>
-    </node>
-    <node>
-        <host>example2</host>
-        <port>2181</port>
-    </node>
-    <session_timeout_ms>30000</session_timeout_ms>
-    <operation_timeout_ms>10000</operation_timeout_ms>
-    <!-- Optional. Chroot suffix. Should exist. -->
-    <root>/path/to/zookeeper/node</root>
-    <!-- Optional. Zookeeper digest ACL string. -->
-    <identity>user:password</identity>
-</zookeeper>
-```
-
-**Voir Aussi**
-
--   [Réplication](../../engines/table-engines/mergetree-family/replication.md)
--   [Guide du programmeur ZooKeeper](http://zookeeper.apache.org/doc/current/zookeeperProgrammers.html)
-
-## use_minimalistic_part_header_in_zookeeper {#server-settings-use_minimalistic_part_header_in_zookeeper}
-
-Méthode de stockage pour les en-têtes de partie de données dans ZooKeeper.
-
-Ce paramètre s'applique uniquement à l' `MergeTree` famille. Il peut être spécifié:
-
--   À l'échelle mondiale dans le [merge_tree](#server_configuration_parameters-merge_tree) la section de la `config.xml` fichier.
-
-    ClickHouse utilise le paramètre pour toutes les tables du serveur. Vous pouvez modifier le réglage à tout moment. Les tables existantes changent de comportement lorsque le paramètre change.
-
--   Pour chaque table.
-
-    Lors de la création d'un tableau, indiquer la [moteur de réglage](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-creating-a-table). Le comportement d'une table existante avec ce paramètre ne change pas, même si le paramètre global des changements.
-
-**Valeurs possibles**
-
--   0 — Functionality is turned off.
--   1 — Functionality is turned on.
-
-Si `use_minimalistic_part_header_in_zookeeper = 1`, puis [répliqué](../../engines/table-engines/mergetree-family/replication.md) les tables stockent les en-têtes des parties de données de manière compacte à l'aide `znode`. Si la table contient plusieurs colonnes, cette méthode de stockage réduit considérablement le volume des données stockées dans Zookeeper.
-
-!!! attention "Attention"
-    Après l'application de `use_minimalistic_part_header_in_zookeeper = 1`, vous ne pouvez pas rétrograder le serveur ClickHouse vers une version qui ne prend pas en charge ce paramètre. Soyez prudent lors de la mise à niveau de ClickHouse sur les serveurs d'un cluster. Ne mettez pas à niveau tous les serveurs à la fois. Il est plus sûr de tester de nouvelles versions de ClickHouse dans un environnement de test, ou sur quelques serveurs d'un cluster.
-
-      Data part headers already stored with this setting can't be restored to their previous (non-compact) representation.
-
-**Valeur par défaut:** 0.
-
-## disable_internal_dns_cache {#server-settings-disable-internal-dns-cache}
-
-Désactive le cache DNS interne. Recommandé pour l'utilisation de ClickHouse dans les systèmes
-avec des infrastructures en constante évolution telles que Kubernetes.
-
-**Valeur par défaut:** 0.
-
-## dns_cache_update_period {#server-settings-dns-cache-update-period}
-
-La période de mise à jour des adresses IP stockées dans le cache DNS interne de ClickHouse (en secondes).
-La mise à jour est effectuée de manière asynchrone, dans un thread système séparé.
-
-**Valeur par défaut**: 15.
-
-## access_control_path {#access_control_path}
-
-Chemin d'accès à un dossier dans lequel un serveur clickhouse stocke les configurations utilisateur et rôle créées par les commandes SQL.
-
-Valeur par défaut: `/var/lib/clickhouse/access/`.
-
-**Voir aussi**
-
--   [Le Contrôle d'accès et de Gestion de Compte](../access-rights.md#access-control)
-
-[Article Original](https://clickhouse.tech/docs/en/operations/server_configuration_parameters/settings/) <!--hide-->
diff --git a/docs/fr/operations/settings/constraints-on-settings.md b/docs/fr/operations/settings/constraints-on-settings.md
deleted file mode 100644
index b9c34841da1..00000000000
--- a/docs/fr/operations/settings/constraints-on-settings.md
+++ /dev/null
@@ -1,75 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 62
-toc_title: "Contraintes sur les param\xE8tres"
----
-
-# Contraintes sur les paramètres {#constraints-on-settings}
-
-Les contraintes sur les paramètres peuvent être définis dans le `profiles` la section de la `user.xml` fichier de configuration et interdire aux utilisateurs de modifier certains `SET` requête.
-Les contraintes sont définies comme suit:
-
-``` xml
-<profiles>
-  <user_name>
-    <constraints>
-      <setting_name_1>
-        <min>lower_boundary</min>
-      </setting_name_1>
-      <setting_name_2>
-        <max>upper_boundary</max>
-      </setting_name_2>
-      <setting_name_3>
-        <min>lower_boundary</min>
-        <max>upper_boundary</max>
-      </setting_name_3>
-      <setting_name_4>
-        <readonly/>
-      </setting_name_4>
-    </constraints>
-  </user_name>
-</profiles>
-```
-
-Si l'utilisateur tente de violer les contraintes une exception est levée et le réglage n'est pas modifié.
-Trois types de contraintes sont pris en charge: `min`, `max`, `readonly`. Le `min` et `max` les contraintes spécifient les limites supérieure et inférieure pour un paramètre numérique et peuvent être utilisées en combinaison. Le `readonly` contrainte spécifie que l'utilisateur ne peut pas modifier le paramètre correspondant à tous.
-
-**Exemple:** Laisser `users.xml` comprend des lignes:
-
-``` xml
-<profiles>
-  <default>
-    <max_memory_usage>10000000000</max_memory_usage>
-    <force_index_by_date>0</force_index_by_date>
-    ...
-    <constraints>
-      <max_memory_usage>
-        <min>5000000000</min>
-        <max>20000000000</max>
-      </max_memory_usage>
-      <force_index_by_date>
-        <readonly/>
-      </force_index_by_date>
-    </constraints>
-  </default>
-</profiles>
-```
-
-Les requêtes suivantes toutes les exceptions throw:
-
-``` sql
-SET max_memory_usage=20000000001;
-SET max_memory_usage=4999999999;
-SET force_index_by_date=1;
-```
-
-``` text
-Code: 452, e.displayText() = DB::Exception: Setting max_memory_usage should not be greater than 20000000000.
-Code: 452, e.displayText() = DB::Exception: Setting max_memory_usage should not be less than 5000000000.
-Code: 452, e.displayText() = DB::Exception: Setting force_index_by_date should not be changed.
-```
-
-**Note:** le `default` le profil a une manipulation particulière: toutes les contraintes définies pour `default` le profil devient les contraintes par défaut, de sorte qu'ils restreignent tous les utilisateurs jusqu'à ce qu'ils soient explicitement remplacés pour ces utilisateurs.
-
-[Article Original](https://clickhouse.tech/docs/en/operations/settings/constraints_on_settings/) <!--hide-->
diff --git a/docs/fr/operations/settings/index.md b/docs/fr/operations/settings/index.md
deleted file mode 100644
index 0c81a2487c4..00000000000
--- a/docs/fr/operations/settings/index.md
+++ /dev/null
@@ -1,33 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: "Param\xE8tre"
-toc_priority: 55
-toc_title: Introduction
----
-
-# Paramètre {#session-settings-intro}
-
-Il existe plusieurs façons d'effectuer tous les paramètres décrits dans cette section de la documentation.
-
-Les paramètres sont configurés en couches, de sorte que chaque couche suivante redéfinit les paramètres précédents.
-
-Façons de configurer les paramètres, par ordre de priorité:
-
--   Paramètres dans l' `users.xml` fichier de configuration du serveur.
-
-    Situé dans l'élément `<profiles>`.
-
--   Les paramètres de la Session.
-
-    Envoyer `SET setting=value` depuis le client de la console ClickHouse en mode interactif.
-    De même, vous pouvez utiliser des sessions ClickHouse dans le protocole HTTP. Pour ce faire, vous devez spécifier le `session_id` Paramètre HTTP.
-
--   Les paramètres de requête.
-
-    -   Lorsque vous démarrez le client clickhouse console en mode non interactif, définissez le paramètre startup `--setting=value`.
-    -   Lors de l'utilisation de L'API HTTP, passez les paramètres CGI (`URL?setting_1=value&setting_2=value...`).
-
-Les paramètres qui ne peuvent être effectués que dans le fichier de configuration du serveur ne sont pas couverts dans cette section.
-
-[Article Original](https://clickhouse.tech/docs/en/operations/settings/) <!--hide-->
diff --git a/docs/fr/operations/settings/permissions-for-queries.md b/docs/fr/operations/settings/permissions-for-queries.md
deleted file mode 100644
index afab946adb3..00000000000
--- a/docs/fr/operations/settings/permissions-for-queries.md
+++ /dev/null
@@ -1,61 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 58
-toc_title: "Autorisations pour les requ\xEAtes"
----
-
-# Autorisations pour les requêtes {#permissions_for_queries}
-
-Les requêtes dans ClickHouse peuvent être divisées en plusieurs types:
-
-1.  Lire les requêtes de données: `SELECT`, `SHOW`, `DESCRIBE`, `EXISTS`.
-2.  Écrire des requêtes de données: `INSERT`, `OPTIMIZE`.
-3.  Modifier les paramètres requête: `SET`, `USE`.
-4.  [DDL](https://en.wikipedia.org/wiki/Data_definition_language) requête: `CREATE`, `ALTER`, `RENAME`, `ATTACH`, `DETACH`, `DROP` `TRUNCATE`.
-5.  `KILL QUERY`.
-
-Les paramètres suivants règlent les autorisations utilisateur selon le type de requête:
-
--   [ReadOnly](#settings_readonly) — Restricts permissions for all types of queries except DDL queries.
--   [allow_ddl](#settings_allow_ddl) — Restricts permissions for DDL queries.
-
-`KILL QUERY` peut être réalisée avec tous les paramètres.
-
-## ReadOnly {#settings_readonly}
-
-Restreint les autorisations pour lire des données, écrire des données et modifier les requêtes de paramètres.
-
-Voyez comment les requêtes sont divisées en types [surtout](#permissions_for_queries).
-
-Valeurs possibles:
-
--   0 — All queries are allowed.
--   1 — Only read data queries are allowed.
--   2 — Read data and change settings queries are allowed.
-
-Après le réglage de `readonly = 1` l'utilisateur ne peut pas changer `readonly` et `allow_ddl` les paramètres de la session en cours.
-
-Lors de l'utilisation de la `GET` méthode dans le [Interface HTTP](../../interfaces/http.md), `readonly = 1` est définie automatiquement. Pour modifier les données, utilisez `POST` méthode.
-
-Paramètre `readonly = 1` interdire à l'utilisateur de modifier tous les paramètres. Il y a un moyen d'interdire à l'utilisateur
-de modifier uniquement des paramètres spécifiques, pour plus de détails, voir [contraintes sur les paramètres](constraints-on-settings.md).
-
-Valeur par défaut: 0
-
-## allow_ddl {#settings_allow_ddl}
-
-Permet ou interdit [DDL](https://en.wikipedia.org/wiki/Data_definition_language) requête.
-
-Voyez comment les requêtes sont divisées en types [surtout](#permissions_for_queries).
-
-Valeurs possibles:
-
--   0 — DDL queries are not allowed.
--   1 — DDL queries are allowed.
-
-Vous ne pouvez pas exécuter `SET allow_ddl = 1` si `allow_ddl = 0` pour la session en cours.
-
-Valeur par défaut: 1
-
-[Article Original](https://clickhouse.tech/docs/en/operations/settings/permissions_for_queries/) <!--hide-->
diff --git a/docs/fr/operations/settings/query-complexity.md b/docs/fr/operations/settings/query-complexity.md
deleted file mode 100644
index bdeb3e35242..00000000000
--- a/docs/fr/operations/settings/query-complexity.md
+++ /dev/null
@@ -1,301 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 59
-toc_title: "Restrictions sur la complexit\xE9 des requ\xEAtes"
----
-
-# Restrictions sur la complexité des requêtes {#restrictions-on-query-complexity}
-
-Les Restrictions sur la complexité des requêtes font partie des paramètres.
-Ils sont utilisés pour fournir une exécution plus sûre à partir de l'interface utilisateur.
-Presque toutes les restrictions ne s'appliquent qu'à `SELECT`. Pour le traitement des requêtes distribuées, des restrictions sont appliquées sur chaque serveur séparément.
-
-ClickHouse vérifie les restrictions pour les parties de données, pas pour chaque ligne. Cela signifie que vous pouvez dépasser la valeur de restriction de la taille de la partie données.
-
-Restrictions sur l' “maximum amount of something” peut prendre la valeur 0, ce qui signifie “unrestricted”.
-La plupart des restrictions ont également un ‘overflow_mode’ paramètre signification que faire lorsque la limite est dépassée.
-Il peut prendre deux valeurs: `throw` ou `break`. Les Restrictions sur l'agrégation (group_by_overflow_mode) ont également la valeur `any`.
-
-`throw` – Throw an exception (default).
-
-`break` – Stop executing the query and return the partial result, as if the source data ran out.
-
-`any (only for group_by_overflow_mode)` – Continuing aggregation for the keys that got into the set, but don't add new keys to the set.
-
-## max_memory_usage {#settings_max_memory_usage}
-
-La quantité maximale de RAM à utiliser pour exécuter une requête sur un seul serveur.
-
-Dans le fichier de configuration par défaut, le maximum est de 10 Go.
-
-Le réglage ne tient pas compte du volume de mémoire disponible ou du volume total de mémoire sur la machine.
-La restriction s'applique à une seule requête au sein d'un seul serveur.
-Vous pouvez utiliser `SHOW PROCESSLIST` pour vérifier la consommation de mémoire pour chaque requête.
-En outre, la consommation de mémoire maximale est suivie pour chaque requête et écrite dans le journal.
-
-L'utilisation de la mémoire n'est pas surveillée pour les membres de certaines fonctions d'agrégation.
-
-L'utilisation de la mémoire n'est pas totalement suivies pour les états des fonctions d'agrégation `min`, `max`, `any`, `anyLast`, `argMin`, `argMax` de `String` et `Array` argument.
-
-La consommation de mémoire est également limitée par les paramètres `max_memory_usage_for_user` et `max_memory_usage_for_all_queries`.
-
-## max_memory_usage_for_user {#max-memory-usage-for-user}
-
-Quantité maximale de RAM à utiliser pour exécuter les requêtes d'un utilisateur sur un seul serveur.
-
-Les valeurs par défaut sont définies dans [Paramètre.h](https://github.com/ClickHouse/ClickHouse/blob/master/src/Core/Settings.h#L288). Par défaut, le montant n'est pas limité (`max_memory_usage_for_user = 0`).
-
-Voir aussi la description de [max_memory_usage](#settings_max_memory_usage).
-
-## max_memory_usage_for_all_queries {#max-memory-usage-for-all-queries}
-
-La quantité maximale de RAM à utiliser pour exécuter toutes les requêtes sur un seul serveur.
-
-Les valeurs par défaut sont définies dans [Paramètre.h](https://github.com/ClickHouse/ClickHouse/blob/master/src/Core/Settings.h#L289). Par défaut, le montant n'est pas limité (`max_memory_usage_for_all_queries = 0`).
-
-Voir aussi la description de [max_memory_usage](#settings_max_memory_usage).
-
-## max_rows_to_read {#max-rows-to-read}
-
-Les restrictions suivantes peut être vérifiée sur chaque bloc (au lieu de sur chaque ligne). Autrement dit, les restrictions peuvent être brisées un peu.
-Lors de l'exécution d'une requête dans plusieurs threads, les restrictions suivantes s'appliquent à chaque thread séparément.
-
-Un nombre maximum de lignes pouvant être lues à partir d'un tableau lors de l'exécution d'une requête.
-
-## max_bytes_to_read {#max-bytes-to-read}
-
-Nombre maximal d'octets (données non compressées) pouvant être lus à partir d'une table lors de l'exécution d'une requête.
-
-## read_overflow_mode {#read-overflow-mode}
-
-Que faire lorsque le volume de lecture de données dépasse l'une des limites: ‘throw’ ou ‘break’. Par défaut, les jeter.
-
-## max_rows_to_group_by {#settings-max-rows-to-group-by}
-
-Un nombre maximum de clés uniques reçues de l'agrégation. Ce paramètre permet de limiter la consommation de mémoire lors de l'agrégation.
-
-## group_by_overflow_mode {#group-by-overflow-mode}
-
-Que faire lorsque le nombre de clés uniques pour l'agrégation dépasse la limite: ‘throw’, ‘break’, ou ‘any’. Par défaut, les jeter.
-À l'aide de la ‘any’ valeur vous permet d'exécuter une approximation de GROUP BY. La qualité de cette approximation dépend de la nature statistique des données.
-
-## max_bytes_before_external_group_by {#settings-max_bytes_before_external_group_by}
-
-Active ou désactive l'exécution de `GROUP BY` clauses dans la mémoire externe. Voir [Groupe par dans la mémoire externe](../../sql-reference/statements/select/group-by.md#select-group-by-in-external-memory).
-
-Valeurs possibles:
-
--   Volume maximal de RAM (en octets) pouvant être utilisé par le [GROUP BY](../../sql-reference/statements/select/group-by.md#select-group-by-clause) opération.
--   0 — `GROUP BY` dans la mémoire externe désactivé.
-
-Valeur par défaut: 0.
-
-## max_rows_to_sort {#max-rows-to-sort}
-
-Un nombre maximum de lignes avant le tri. Cela vous permet de limiter la consommation de mémoire lors du tri.
-
-## max_bytes_to_sort {#max-bytes-to-sort}
-
-Un nombre maximal d'octets avant le tri.
-
-## sort_overflow_mode {#sort-overflow-mode}
-
-Que faire si le nombre de lignes reçues avant le tri dépasse l'une des limites: ‘throw’ ou ‘break’. Par défaut, les jeter.
-
-## max_result_rows {#setting-max_result_rows}
-
-Limite sur le nombre de lignes dans le résultat. Également vérifié pour les sous-requêtes, et sur des serveurs distants lors de l'exécution de parties d'une requête distribuée.
-
-## max_result_bytes {#max-result-bytes}
-
-Limite sur le nombre d'octets dans le résultat. Le même que le réglage précédent.
-
-## result_overflow_mode {#result-overflow-mode}
-
-Que faire si le volume du résultat dépasse l'une des limites: ‘throw’ ou ‘break’. Par défaut, les jeter.
-
-Utiliser ‘break’ est similaire à L'utilisation de LIMIT. `Break` interrompt l'exécution seulement au niveau du bloc. Cela signifie que la quantité de lignes renvoyées est supérieure à [max_result_rows](#setting-max_result_rows) multiples de [max_block_size](settings.md#setting-max_block_size) et dépend de l' [max_threads](settings.md#settings-max_threads).
-
-Exemple:
-
-``` sql
-SET max_threads = 3, max_block_size = 3333;
-SET max_result_rows = 3334, result_overflow_mode = 'break';
-
-SELECT *
-FROM numbers_mt(100000)
-FORMAT Null;
-```
-
-Résultat:
-
-``` text
-6666 rows in set. ...
-```
-
-## max_execution_time {#max-execution-time}
-
-Durée maximale d'exécution de la requête en secondes.
-Pour le moment, il n'est pas vérifié pour l'une des étapes de tri, ni lors de la fusion et de la finalisation des fonctions d'agrégat.
-
-## timeout_overflow_mode {#timeout-overflow-mode}
-
-Que faire si la requête est exécutée plus de ‘max_execution_time’: ‘throw’ ou ‘break’. Par défaut, les jeter.
-
-## min_execution_speed {#min-execution-speed}
-
-Vitesse d'exécution minimale en lignes par seconde. Vérifié sur chaque bloc de données quand ‘timeout_before_checking_execution_speed’ expirer. Si la vitesse d'exécution est inférieure, une exception est levée.
-
-## min_execution_speed_bytes {#min-execution-speed-bytes}
-
-Un nombre minimum d'exécution d'octets par seconde. Vérifié sur chaque bloc de données quand ‘timeout_before_checking_execution_speed’ expirer. Si la vitesse d'exécution est inférieure, une exception est levée.
-
-## max_execution_speed {#max-execution-speed}
-
-Un nombre maximal d'exécution de lignes par seconde. Vérifié sur chaque bloc de données quand ‘timeout_before_checking_execution_speed’ expirer. Si la vitesse d'exécution est élevée, la vitesse d'exécution sera réduit.
-
-## max_execution_speed_bytes {#max-execution-speed-bytes}
-
-Un nombre maximal d'exécution d'octets par seconde. Vérifié sur chaque bloc de données quand ‘timeout_before_checking_execution_speed’ expirer. Si la vitesse d'exécution est élevée, la vitesse d'exécution sera réduit.
-
-## timeout_before_checking_execution_speed {#timeout-before-checking-execution-speed}
-
-Vérifie que la vitesse d'exécution n'est pas trop lent (pas moins de ‘min_execution_speed’), après l'expiration du temps spécifié en secondes.
-
-## max_columns_to_read {#max-columns-to-read}
-
-Nombre maximal de colonnes pouvant être lues à partir d'une table dans une seule requête. Si une requête nécessite la lecture d'un plus grand nombre de colonnes, il lève une exception.
-
-## max_temporary_columns {#max-temporary-columns}
-
-Nombre maximal de colonnes temporaires qui doivent être conservées en RAM en même temps lors de l'exécution d'une requête, y compris les colonnes constantes. S'il y a plus de colonnes temporaires que cela, il lève une exception.
-
-## max_temporary_non_const_columns {#max-temporary-non-const-columns}
-
-La même chose que ‘max_temporary_columns’ mais sans compter constante colonnes.
-Notez que les colonnes constantes sont formées assez souvent lors de l'exécution d'une requête, mais elles nécessitent environ zéro ressource informatique.
-
-## max_subquery_depth {#max-subquery-depth}
-
-Profondeur maximale de sous-requêtes. Si les sous-requêtes sont plus profondes, une exception est levée. Par défaut, 100.
-
-## max_pipeline_depth {#max-pipeline-depth}
-
-Profondeur maximale du pipeline. Correspond au nombre de transformations que chaque bloc de données lors du traitement des requêtes. Compté dans les limites d'un seul serveur. Si la profondeur du pipeline est supérieure, une exception est levée. Par défaut, 1000.
-
-## max_ast_depth {#max-ast-depth}
-
-Profondeur maximale d'une requête arbre syntaxique. En cas de dépassement, une exception est levée.
-À ce moment, il n'est pas vérifié pendant l'analyse, mais seulement après l'analyse de la requête. Autrement dit, un arbre syntaxique trop profond peut être créé pendant l'analyse, mais la requête échouera. Par défaut, 1000.
-
-## max_ast_elements {#max-ast-elements}
-
-Un nombre maximal d'éléments dans une requête arbre syntaxique. En cas de dépassement, une exception est levée.
-De la même manière que le paramètre précédent, il est vérifié qu'après l'analyse de la requête. Par défaut, 50 000.
-
-## max_rows_in_set {#max-rows-in-set}
-
-Nombre maximal de lignes pour un ensemble de données dans la clause in créée à partir d'une sous-requête.
-
-## max_bytes_in_set {#max-bytes-in-set}
-
-Nombre maximal d'octets (données non compressées) utilisés par un ensemble de la clause in créé à partir d'une sous-requête.
-
-## set_overflow_mode {#set-overflow-mode}
-
-Que faire lorsque la quantité de données dépasse l'une des limites: ‘throw’ ou ‘break’. Par défaut, les jeter.
-
-## max_rows_in_distinct {#max-rows-in-distinct}
-
-Un nombre maximum de lignes différentes lors de L'utilisation de DISTINCT.
-
-## max_bytes_in_distinct {#max-bytes-in-distinct}
-
-Nombre maximal d'octets utilisés par une table de hachage lors de L'utilisation de DISTINCT.
-
-## distinct_overflow_mode {#distinct-overflow-mode}
-
-Que faire lorsque la quantité de données dépasse l'une des limites: ‘throw’ ou ‘break’. Par défaut, les jeter.
-
-## max_rows_to_transfer {#max-rows-to-transfer}
-
-Nombre maximal de lignes pouvant être transmises à un serveur distant ou enregistrées dans une table temporaire lors de L'utilisation de GLOBAL IN.
-
-## max_bytes_to_transfer {#max-bytes-to-transfer}
-
-Nombre maximal d'octets (données non compressées) pouvant être transmis à un serveur distant ou enregistrés dans une table temporaire lors de L'utilisation de GLOBAL IN.
-
-## transfer_overflow_mode {#transfer-overflow-mode}
-
-Que faire lorsque la quantité de données dépasse l'une des limites: ‘throw’ ou ‘break’. Par défaut, les jeter.
-
-## max_rows_in_join {#settings-max_rows_in_join}
-
-Limite le nombre de lignes dans la table de hachage utilisée lors de la jonction de tables.
-
-Ce réglage s'applique à [SELECT … JOIN](../../sql-reference/statements/select/join.md#select-join) les opérations et les [Rejoindre](../../engines/table-engines/special/join.md) tableau moteur.
-
-Si une requête contient plusieurs jointures, ClickHouse vérifie ce paramètre pour chaque résultat intermédiaire.
-
-ClickHouse peut procéder à différentes actions lorsque la limite est atteinte. L'utilisation de la [join_overflow_mode](#settings-join_overflow_mode) réglage pour choisir l'action.
-
-Valeurs possibles:
-
--   Entier positif.
--   0 — Unlimited number of rows.
-
-Valeur par défaut: 0.
-
-## max_bytes_in_join {#settings-max_bytes_in_join}
-
-Limite la taille en octets de la table de hachage utilisée lors de l'assemblage de tables.
-
-Ce réglage s'applique à [SELECT … JOIN](../../sql-reference/statements/select/join.md#select-join) les opérations et les [Rejoindre le moteur de table](../../engines/table-engines/special/join.md).
-
-Si la requête contient des jointures, ClickHouse vérifie ce paramètre pour chaque résultat intermédiaire.
-
-ClickHouse peut procéder à différentes actions lorsque la limite est atteinte. Utiliser [join_overflow_mode](#settings-join_overflow_mode) paramètres pour choisir l'action.
-
-Valeurs possibles:
-
--   Entier positif.
--   0 — Memory control is disabled.
-
-Valeur par défaut: 0.
-
-## join_overflow_mode {#settings-join_overflow_mode}
-
-Définit l'action que ClickHouse effectue lorsque l'une des limites de jointure suivantes est atteinte:
-
--   [max_bytes_in_join](#settings-max_bytes_in_join)
--   [max_rows_in_join](#settings-max_rows_in_join)
-
-Valeurs possibles:
-
--   `THROW` — ClickHouse throws an exception and breaks operation.
--   `BREAK` — ClickHouse breaks operation and doesn't throw an exception.
-
-Valeur par défaut: `THROW`.
-
-**Voir Aussi**
-
--   [Clause de JOINTURE](../../sql-reference/statements/select/join.md#select-join)
--   [Rejoindre le moteur de table](../../engines/table-engines/special/join.md)
-
-## max_partitions_per_insert_block {#max-partitions-per-insert-block}
-
-Limite le nombre maximal de partitions dans un seul bloc inséré.
-
--   Entier positif.
--   0 — Unlimited number of partitions.
-
-Valeur par défaut: 100.
-
-**Détail**
-
-Lors de l'insertion de données, ClickHouse calcule le nombre de partitions dans le bloc inséré. Si le nombre de partitions est plus que `max_partitions_per_insert_block`, ClickHouse lève une exception avec le texte suivant:
-
-> “Too many partitions for single INSERT block (more than” + toString (max_parts) + “). The limit is controlled by ‘max_partitions_per_insert_block’ setting. A large number of partitions is a common misconception. It will lead to severe negative performance impact, including slow server startup, slow INSERT queries and slow SELECT queries. Recommended total number of partitions for a table is under 1000..10000. Please note, that partitioning is not intended to speed up SELECT queries (ORDER BY key is sufficient to make range queries fast). Partitions are intended for data manipulation (DROP PARTITION, etc).”
-
-[Article Original](https://clickhouse.tech/docs/en/operations/settings/query_complexity/) <!--hide-->
diff --git a/docs/fr/operations/settings/settings-profiles.md b/docs/fr/operations/settings/settings-profiles.md
deleted file mode 100644
index 2a0338e7873..00000000000
--- a/docs/fr/operations/settings/settings-profiles.md
+++ /dev/null
@@ -1,81 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 61
-toc_title: "Les Param\xE8tres Des Profils"
----
-
-# Les Paramètres Des Profils {#settings-profiles}
-
-Un profil de paramètres est une collection de paramètres regroupés sous le même nom.
-
-!!! note "Information"
-    Clickhouse prend également en charge [Flux de travail piloté par SQL](../access-rights.md#access-control) pour gérer les profils de paramètres. Nous vous conseillons de l'utiliser.
-
-Un profil peut avoir n'importe quel nom. Le profil peut avoir n'importe quel nom. Vous pouvez spécifier le même profil pour différents utilisateurs. La chose la plus importante que vous pouvez écrire dans les paramètres de profil `readonly=1` qui assure un accès en lecture seule.
-
-Paramètres les profils peuvent hériter les uns des autres. Pour utiliser l'héritage, indiquer un ou plusieurs `profile` paramètres avant les autres paramètres répertoriés dans le profil. Dans le cas où un paramètre est défini dans les différents profils, les dernières définie est utilisée.
-
-Pour appliquer tous les paramètres d'un profil, définissez `profile` paramètre.
-
-Exemple:
-
-Installer le `web` profil.
-
-``` sql
-SET profile = 'web'
-```
-
-Les profils de paramètres sont déclarés dans le fichier de configuration utilisateur. Ce n'est généralement `users.xml`.
-
-Exemple:
-
-``` xml
-<!-- Settings profiles -->
-<profiles>
-    <!-- Default settings -->
-    <default>
-        <!-- The maximum number of threads when running a single query. -->
-        <max_threads>8</max_threads>
-    </default>
-
-    <!-- Settings for quries from the user interface -->
-    <web>
-        <max_rows_to_read>1000000000</max_rows_to_read>
-        <max_bytes_to_read>100000000000</max_bytes_to_read>
-
-        <max_rows_to_group_by>1000000</max_rows_to_group_by>
-        <group_by_overflow_mode>any</group_by_overflow_mode>
-
-        <max_rows_to_sort>1000000</max_rows_to_sort>
-        <max_bytes_to_sort>1000000000</max_bytes_to_sort>
-
-        <max_result_rows>100000</max_result_rows>
-        <max_result_bytes>100000000</max_result_bytes>
-        <result_overflow_mode>break</result_overflow_mode>
-
-        <max_execution_time>600</max_execution_time>
-        <min_execution_speed>1000000</min_execution_speed>
-        <timeout_before_checking_execution_speed>15</timeout_before_checking_execution_speed>
-
-        <max_columns_to_read>25</max_columns_to_read>
-        <max_temporary_columns>100</max_temporary_columns>
-        <max_temporary_non_const_columns>50</max_temporary_non_const_columns>
-
-        <max_subquery_depth>2</max_subquery_depth>
-        <max_pipeline_depth>25</max_pipeline_depth>
-        <max_ast_depth>50</max_ast_depth>
-        <max_ast_elements>100</max_ast_elements>
-
-        <readonly>1</readonly>
-    </web>
-</profiles>
-```
-
-L'exemple spécifie deux profils: `default` et `web`.
-
-Le `default` profil a un but particulier: il doit toujours être présent et est appliquée lors du démarrage du serveur. En d'autres termes, l' `default` profil contient les paramètres par défaut.
-
-Le `web` profil est un profil régulier qui peut être défini à l'aide `SET` requête ou en utilisant un paramètre URL dans une requête HTTP.
-
-[Article Original](https://clickhouse.tech/docs/en/operations/settings/settings_profiles/) <!--hide-->
diff --git a/docs/fr/operations/settings/settings-users.md b/docs/fr/operations/settings/settings-users.md
deleted file mode 100644
index d33b8f1335b..00000000000
--- a/docs/fr/operations/settings/settings-users.md
+++ /dev/null
@@ -1,164 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 63
-toc_title: "Les Param\xE8tres De L'Utilisateur"
----
-
-# Les Paramètres De L'Utilisateur {#user-settings}
-
-Le `users` la section de la `user.xml` le fichier de configuration contient les paramètres utilisateur.
-
-!!! note "Information"
-    Clickhouse prend également en charge [Flux de travail piloté par SQL](../access-rights.md#access-control) pour gérer les utilisateurs. Nous vous conseillons de l'utiliser.
-
-La Structure de la `users` section:
-
-``` xml
-<users>
-    <!-- If user name was not specified, 'default' user is used. -->
-    <user_name>
-        <password></password>
-        <!-- Or -->
-        <password_sha256_hex></password_sha256_hex>
-
-        <access_management>0|1</access_management>
-
-        <networks incl="networks" replace="replace">
-        </networks>
-
-        <profile>profile_name</profile>
-
-        <quota>default</quota>
-
-        <databases>
-            <database_name>
-                <table_name>
-                    <filter>expression</filter>
-                <table_name>
-            </database_name>
-        </databases>
-    </user_name>
-    <!-- Other users settings -->
-</users>
-```
-
-### nom_utilisateur/mot de passe {#user-namepassword}
-
-Le mot de passe peut être spécifié en texte clair ou en SHA256 (format hexadécimal).
-
--   Pour attribuer un mot de passe en clair (**pas recommandé**), la placer dans un `password` élément.
-
-    Exemple, `<password>qwerty</password>`. Le mot de passe peut être laissé en blanc.
-
-<a id="password_sha256_hex"></a>
-
--   Pour attribuer un mot de passe à l'aide de son hachage SHA256, placez-le dans un `password_sha256_hex` élément.
-
-    Exemple, `<password_sha256_hex>65e84be33532fb784c48129675f9eff3a682b27168c0ea744b2cf58ee02337c5</password_sha256_hex>`.
-
-    Exemple de génération d'un mot de passe à partir du shell:
-
-          PASSWORD=$(base64 < /dev/urandom | head -c8); echo "$PASSWORD"; echo -n "$PASSWORD" | sha256sum | tr -d '-'
-
-    La première ligne du résultat est le mot de passe. La deuxième ligne est le hachage SHA256 correspondant.
-
-<a id="password_double_sha1_hex"></a>
-
--   Pour la compatibilité avec les clients MySQL, le mot de passe peut être spécifié dans le hachage double SHA1. Le placer dans `password_double_sha1_hex` élément.
-
-    Exemple, `<password_double_sha1_hex>08b4a0f1de6ad37da17359e592c8d74788a83eb0</password_double_sha1_hex>`.
-
-    Exemple de génération d'un mot de passe à partir du shell:
-
-          PASSWORD=$(base64 < /dev/urandom | head -c8); echo "$PASSWORD"; echo -n "$PASSWORD" | sha1sum | tr -d '-' | xxd -r -p | sha1sum | tr -d '-'
-
-    La première ligne du résultat est le mot de passe. La deuxième ligne est le double hachage SHA1 correspondant.
-
-### access_management {#access_management-user-setting}
-
-Ce paramètre active de désactive l'utilisation de SQL-driven [le contrôle d'accès et de gestion de compte](../access-rights.md#access-control) pour l'utilisateur.
-
-Valeurs possibles:
-
--   0 — Disabled.
--   1 — Enabled.
-
-Valeur par défaut: 0.
-
-### nom_utilisateur / réseaux {#user-namenetworks}
-
-Liste des réseaux à partir desquels L'utilisateur peut se connecter au serveur ClickHouse.
-
-Chaque élément de la liste peut avoir l'une des formes suivantes:
-
--   `<ip>` — IP address or network mask.
-
-    Exemple: `213.180.204.3`, `10.0.0.1/8`, `10.0.0.1/255.255.255.0`, `2a02:6b8::3`, `2a02:6b8::3/64`, `2a02:6b8::3/ffff:ffff:ffff:ffff::`.
-
--   `<host>` — Hostname.
-
-    Exemple: `example01.host.ru`.
-
-    Pour vérifier l'accès, une requête DNS est effectuée et toutes les adresses IP renvoyées sont comparées à l'adresse homologue.
-
--   `<host_regexp>` — Regular expression for hostnames.
-
-    Exemple, `^example\d\d-\d\d-\d\.host\.ru$`
-
-    Pour vérifier l'accès, un [Requête DNS PTR](https://en.wikipedia.org/wiki/Reverse_DNS_lookup) est effectuée pour l'adresse homologue, puis l'expression rationnelle spécifiée est appliquée. Ensuite, une autre requête DNS est effectuée pour les résultats de la requête PTR et toutes les adresses reçues sont comparées à l'adresse homologue. Nous recommandons fortement que regexp se termine avec $.
-
-Tous les résultats des requêtes DNS sont mis en cache jusqu'au redémarrage du serveur.
-
-**Exemple**
-
-Pour ouvrir l'accès de l'utilisateur à partir de n'importe quel réseau, spécifiez:
-
-``` xml
-<ip>::/0</ip>
-```
-
-!!! warning "Avertissement"
-    Il n'est pas sûr d'ouvrir l'accès à partir de n'importe quel réseau, sauf si vous avez un pare-feu correctement configuré ou si le serveur n'est pas directement connecté à Internet.
-
-Pour ouvrir l'accès uniquement à partir de localhost, spécifier:
-
-``` xml
-<ip>::1</ip>
-<ip>127.0.0.1</ip>
-```
-
-### nom_utilisateur / profil {#user-nameprofile}
-
-Vous pouvez attribuer un profil des paramètres pour l'utilisateur. Les profils de paramètres sont configurés dans une section distincte du `users.xml` fichier. Pour plus d'informations, voir [Profils des paramètres](settings-profiles.md).
-
-### nom_utilisateur / quota {#user-namequota}
-
-Les Quotas vous permettent de suivre ou de limiter l'utilisation des ressources sur une période donnée. Les Quotas sont configurés dans le `quotas`
-la section de la `users.xml` fichier de configuration.
-
-Vous pouvez attribuer un jeu de quotas à l'utilisateur. Pour une description détaillée de la configuration des quotas, voir [Quota](../quotas.md#quotas).
-
-### nom_utilisateur/bases de données {#user-namedatabases}
-
-Dans cette section, vous pouvez limiter les lignes renvoyées par ClickHouse pour `SELECT` requêtes faites par l'utilisateur actuel, implémentant ainsi la sécurité de base au niveau de la ligne.
-
-**Exemple**
-
-La configuration suivante force cet utilisateur `user1` ne peut voir les lignes de `table1` comme le résultat de `SELECT` requêtes, où la valeur de la `id` le champ est 1000.
-
-``` xml
-<user1>
-    <databases>
-        <database_name>
-            <table1>
-                <filter>id = 1000</filter>
-            </table1>
-        </database_name>
-    </databases>
-</user1>
-```
-
-Le `filter` peut être n'importe quelle expression résultant en un [UInt8](../../sql-reference/data-types/int-uint.md)-le type de la valeur. Il contient généralement des comparaisons et des opérateurs logiques. Les lignes de `database_name.table1` où filtrer les résultats à 0 ne sont pas retournés pour cet utilisateur. Le filtrage est incompatible avec `PREWHERE` opérations et désactive `WHERE→PREWHERE` optimisation.
-
-[Article Original](https://clickhouse.tech/docs/en/operations/settings/settings_users/) <!--hide-->
diff --git a/docs/fr/operations/settings/settings.md b/docs/fr/operations/settings/settings.md
deleted file mode 100644
index 208e4ab1eae..00000000000
--- a/docs/fr/operations/settings/settings.md
+++ /dev/null
@@ -1,1254 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
----
-
-# Paramètre {#settings}
-
-## distributed_product_mode {#distributed-product-mode}
-
-Modifie le comportement de [distribués sous-requêtes](../../sql-reference/operators/in.md).
-
-ClickHouse applies this setting when the query contains the product of distributed tables, i.e. when the query for a distributed table contains a non-GLOBAL subquery for the distributed table.
-
-Restriction:
-
--   Uniquement appliqué pour les sous-requêtes IN et JOIN.
--   Uniquement si la section FROM utilise une table distribuée contenant plus d'un fragment.
--   Si la sous-requête concerne un distribué tableau contenant plus d'un fragment.
--   Pas utilisé pour une table [distant](../../sql-reference/table-functions/remote.md) fonction.
-
-Valeurs possibles:
-
--   `deny` — Default value. Prohibits using these types of subqueries (returns the “Double-distributed in/JOIN subqueries is denied” exception).
--   `local` — Replaces the database and table in the subquery with local ones for the destination server (shard), leaving the normal `IN`/`JOIN.`
--   `global` — Replaces the `IN`/`JOIN` requête avec `GLOBAL IN`/`GLOBAL JOIN.`
--   `allow` — Allows the use of these types of subqueries.
-
-## enable_optimize_predicate_expression {#enable-optimize-predicate-expression}
-
-Active la poussée du prédicat `SELECT` requête.
-
-Prédicat pushdown peut réduire considérablement le trafic réseau pour les requêtes distribuées.
-
-Valeurs possibles:
-
--   0 — Disabled.
--   1 — Enabled.
-
-Valeur par défaut: 1.
-
-Utilisation
-
-Considérez les requêtes suivantes:
-
-1.  `SELECT count() FROM test_table WHERE date = '2018-10-10'`
-2.  `SELECT count() FROM (SELECT * FROM test_table) WHERE date = '2018-10-10'`
-
-Si `enable_optimize_predicate_expression = 1`, alors le temps d'exécution de ces requêtes est égal car ClickHouse s'applique `WHERE` à la sous-requête lors du traitement.
-
-Si `enable_optimize_predicate_expression = 0` puis le temps d'exécution de la deuxième requête est beaucoup plus long, parce que le `WHERE` la clause s'applique à toutes les données après la sous-requête des finitions.
-
-## fallback_to_stale_replicas_for_distributed_queries {#settings-fallback_to_stale_replicas_for_distributed_queries}
-
-Force une requête à un réplica obsolète si les données mises à jour ne sont pas disponibles. Voir [Réplication](../../engines/table-engines/mergetree-family/replication.md).
-
-ClickHouse sélectionne le plus pertinent parmi les répliques obsolètes de la table.
-
-Utilisé lors de l'exécution `SELECT` à partir d'une table distribuée qui pointe vers des tables répliquées.
-
-Par défaut, 1 (activé).
-
-## force_index_by_date {#settings-force_index_by_date}
-
-Désactive l'exécution de la requête si l'index ne peut pas être utilisé par jour.
-
-Fonctionne avec les tables de la famille MergeTree.
-
-Si `force_index_by_date=1`, Clickhouse vérifie si la requête a une condition de clé de date qui peut être utilisée pour restreindre les plages de données. S'il n'y a pas de condition appropriée, il lève une exception. Cependant, il ne vérifie pas si la condition réduit la quantité de données à lire. Par exemple, la condition `Date != ' 2000-01-01 '` est acceptable même lorsqu'il correspond à toutes les données de la table (c'est-à-dire que l'exécution de la requête nécessite une analyse complète). Pour plus d'informations sur les plages de données dans les tables MergeTree, voir [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md).
-
-## force_primary_key {#force-primary-key}
-
-Désactive l'exécution de la requête si l'indexation par la clé primaire n'est pas possible.
-
-Fonctionne avec les tables de la famille MergeTree.
-
-Si `force_primary_key=1`, Clickhouse vérifie si la requête a une condition de clé primaire qui peut être utilisée pour restreindre les plages de données. S'il n'y a pas de condition appropriée, il lève une exception. Cependant, il ne vérifie pas si la condition réduit la quantité de données à lire. Pour plus d'informations sur les plages de données dans les tables MergeTree, voir [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md).
-
-## format_schema {#format-schema}
-
-Ce paramètre est utile lorsque vous utilisez des formats nécessitant une définition de schéma, tels que [Cap'n Proto](https://capnproto.org/) ou [Protobuf](https://developers.google.com/protocol-buffers/). La valeur dépend du format.
-
-## fsync_metadata {#fsync-metadata}
-
-Active ou désactive [fsync](http://pubs.opengroup.org/onlinepubs/9699919799/functions/fsync.html) lors de l'écriture `.sql` fichier. Activé par défaut.
-
-Il est logique de le désactiver si le serveur a des millions de tables minuscules qui sont constamment créées et détruites.
-
-## enable_http_compression {#settings-enable_http_compression}
-
-Active ou désactive la compression de données dans la réponse à une requête HTTP.
-
-Pour plus d'informations, lire l' [Description de L'interface HTTP](../../interfaces/http.md).
-
-Valeurs possibles:
-
--   0 — Disabled.
--   1 — Enabled.
-
-Valeur par défaut: 0.
-
-## http_zlib_compression_level {#settings-http_zlib_compression_level}
-
-Définit le niveau de compression des données dans la réponse à une requête HTTP si [enable_http_compression = 1](#settings-enable_http_compression).
-
-Valeurs possibles: nombres de 1 à 9.
-
-Valeur par défaut: 3.
-
-## http_native_compression_disable_checksumming_on_decompress {#settings-http_native_compression_disable_checksumming_on_decompress}
-
-Active ou désactive la vérification de la somme de contrôle lors de la décompression des données HTTP POST du client. Utilisé uniquement pour le format de compression natif ClickHouse (non utilisé avec `gzip` ou `deflate`).
-
-Pour plus d'informations, lire l' [Description de L'interface HTTP](../../interfaces/http.md).
-
-Valeurs possibles:
-
--   0 — Disabled.
--   1 — Enabled.
-
-Valeur par défaut: 0.
-
-## send_progress_in_http_headers {#settings-send_progress_in_http_headers}
-
-Active ou désactive `X-ClickHouse-Progress` - Têtes de réponse HTTP dans `clickhouse-server` réponse.
-
-Pour plus d'informations, lire l' [Description de L'interface HTTP](../../interfaces/http.md).
-
-Valeurs possibles:
-
--   0 — Disabled.
--   1 — Enabled.
-
-Valeur par défaut: 0.
-
-## max_http_get_redirects {#setting-max_http_get_redirects}
-
-Limite le nombre maximal de sauts de redirection HTTP GET pour [URL](../../engines/table-engines/special/url.md)-tables de moteur. Le paramètre s'applique aux deux types de tables: celles créées par [CREATE TABLE](../../sql-reference/statements/create.md#create-table-query) requête et par la [URL](../../sql-reference/table-functions/url.md) table de fonction.
-
-Valeurs possibles:
-
--   Tout nombre entier positif de houblon.
--   0 — No hops allowed.
-
-Valeur par défaut: 0.
-
-## input_format_allow_errors_num {#settings-input_format_allow_errors_num}
-
-Définit le nombre maximal d'erreurs acceptables lors de la lecture à partir de formats de texte (CSV, TSV, etc.).
-
-La valeur par défaut est de 0.
-
-Toujours le coupler avec `input_format_allow_errors_ratio`.
-
-Si une erreur s'est produite lors de la lecture de lignes mais que le compteur d'erreurs est toujours inférieur à `input_format_allow_errors_num`, ClickHouse ignore la ligne et passe à la suivante.
-
-Si les deux `input_format_allow_errors_num` et `input_format_allow_errors_ratio` sont dépassés, ClickHouse lève une exception.
-
-## input_format_allow_errors_ratio {#settings-input_format_allow_errors_ratio}
-
-Définit le pourcentage maximal d'erreurs autorisées lors de la lecture à partir de formats de texte (CSV, TSV, etc.).
-Le pourcentage d'erreurs est défini comme un nombre à virgule flottante compris entre 0 et 1.
-
-La valeur par défaut est de 0.
-
-Toujours le coupler avec `input_format_allow_errors_num`.
-
-Si une erreur s'est produite lors de la lecture de lignes mais que le compteur d'erreurs est toujours inférieur à `input_format_allow_errors_ratio`, ClickHouse ignore la ligne et passe à la suivante.
-
-Si les deux `input_format_allow_errors_num` et `input_format_allow_errors_ratio` sont dépassés, ClickHouse lève une exception.
-
-## input_format_values_interpret_expressions {#settings-input_format_values_interpret_expressions}
-
-Active ou désactive L'analyseur SQL complet si l'analyseur de flux rapide ne peut pas analyser les données. Ce paramètre est utilisé uniquement pour la [Valeur](../../interfaces/formats.md#data-format-values) format lors de l'insertion des données. Pour plus d'informations sur l'analyse syntaxique, consultez [Syntaxe](../../sql-reference/syntax.md) section.
-
-Valeurs possibles:
-
--   0 — Disabled.
-
-    Dans ce cas, vous devez fournir des données formatées. Voir la [Format](../../interfaces/formats.md) section.
-
--   1 — Enabled.
-
-    Dans ce cas, vous pouvez utiliser une expression SQL en tant que valeur, mais l'insertion de données est beaucoup plus lente de cette façon. Si vous insérez uniquement des données formatées, ClickHouse se comporte comme si la valeur de réglage était 0.
-
-Valeur par défaut: 1.
-
-Exemple D'utilisation
-
-Insérez le [DateTime](../../sql-reference/data-types/datetime.md) tapez valeur avec les différents paramètres.
-
-``` sql
-SET input_format_values_interpret_expressions = 0;
-INSERT INTO datetime_t VALUES (now())
-```
-
-``` text
-Exception on client:
-Code: 27. DB::Exception: Cannot parse input: expected ) before: now()): (at row 1)
-```
-
-``` sql
-SET input_format_values_interpret_expressions = 1;
-INSERT INTO datetime_t VALUES (now())
-```
-
-``` text
-Ok.
-```
-
-La dernière requête est équivalente à la suivante:
-
-``` sql
-SET input_format_values_interpret_expressions = 0;
-INSERT INTO datetime_t SELECT now()
-```
-
-``` text
-Ok.
-```
-
-## input_format_values_deduce_templates_of_expressions {#settings-input_format_values_deduce_templates_of_expressions}
-
-Active ou désactive la déduction de modèle pour les expressions SQL dans [Valeur](../../interfaces/formats.md#data-format-values) format. Il permet d'analyser et d'interpréter des expressions dans `Values` beaucoup plus rapide si les expressions dans des lignes consécutives ont la même structure. ClickHouse tente de déduire le modèle d'une expression, d'analyser les lignes suivantes à l'aide de ce modèle et d'évaluer l'expression sur un lot de lignes analysées avec succès.
-
-Valeurs possibles:
-
--   0 — Disabled.
--   1 — Enabled.
-
-Valeur par défaut: 1.
-
-Pour la requête suivante:
-
-``` sql
-INSERT INTO test VALUES (lower('Hello')), (lower('world')), (lower('INSERT')), (upper('Values')), ...
-```
-
--   Si `input_format_values_interpret_expressions=1` et `format_values_deduce_templates_of_expressions=0`, les expressions sont interprétées séparément pour chaque ligne (c'est très lent pour un grand nombre de lignes).
--   Si `input_format_values_interpret_expressions=0` et `format_values_deduce_templates_of_expressions=1`, les expressions des première, deuxième et troisième lignes sont analysées à l'aide de template `lower(String)` et interprété ensemble, l'expression dans la quatrième ligne est analysée avec un autre modèle (`upper(String)`).
--   Si `input_format_values_interpret_expressions=1` et `format_values_deduce_templates_of_expressions=1`, le même que dans le cas précédent, mais permet également d'interpréter les expressions séparément s'il n'est pas possible de déduire le modèle.
-
-## input_format_values_accurate_types_of_literals {#settings-input-format-values-accurate-types-of-literals}
-
-Ce paramètre est utilisé uniquement lorsque `input_format_values_deduce_templates_of_expressions = 1`. Il peut arriver que les expressions pour une colonne aient la même structure, mais contiennent des littéraux numériques de types différents, par exemple
-
-``` sql
-(..., abs(0), ...),             -- UInt64 literal
-(..., abs(3.141592654), ...),   -- Float64 literal
-(..., abs(-1), ...),            -- Int64 literal
-```
-
-Valeurs possibles:
-
--   0 — Disabled.
-
-    In this case, ClickHouse may use a more general type for some literals (e.g., `Float64` ou `Int64` plutôt `UInt64` pour `42`), mais cela peut causer des problèmes de débordement et de précision.
-
--   1 — Enabled.
-
-    Dans ce cas, ClickHouse vérifie le type réel de littéral et utilise un modèle d'expression du type correspondant. Dans certains cas, cela peut considérablement ralentir l'évaluation de l'expression dans `Values`.
-
-Valeur par défaut: 1.
-
-## input_format_defaults_for_omitted_fields {#session_settings-input_format_defaults_for_omitted_fields}
-
-Lors de l'exécution de `INSERT` requêtes, remplacez les valeurs de colonne d'entrée omises par les valeurs par défaut des colonnes respectives. Cette option s'applique uniquement aux [JSONEachRow](../../interfaces/formats.md#jsoneachrow), [CSV](../../interfaces/formats.md#csv) et [TabSeparated](../../interfaces/formats.md#tabseparated) format.
-
-!!! note "Note"
-    Lorsque cette option est activée, les métadonnées de table étendues sont envoyées du serveur au client. Il consomme des ressources informatiques supplémentaires sur le serveur et peut réduire les performances.
-
-Valeurs possibles:
-
--   0 — Disabled.
--   1 — Enabled.
-
-Valeur par défaut: 1.
-
-## input_format_tsv_empty_as_default {#settings-input-format-tsv-empty-as-default}
-
-Lorsque cette option est activée, remplacez les champs de saisie vides dans TSV par des valeurs par défaut. Pour les expressions par défaut complexes `input_format_defaults_for_omitted_fields` doit être activé en trop.
-
-Désactivé par défaut.
-
-## input_format_null_as_default {#settings-input-format-null-as-default}
-
-Active ou désactive l'utilisation des valeurs par défaut si les données `NULL` mais le type de données de la colonne correspondante dans pas `Nullable(T)` (pour les formats de saisie de texte).
-
-## input_format_skip_unknown_fields {#settings-input-format-skip-unknown-fields}
-
-Active ou désactive le saut d'insertion de données supplémentaires.
-
-Lors de l'écriture de données, ClickHouse lève une exception si les données d'entrée contiennent des colonnes qui n'existent pas dans la table cible. Si le saut est activé, ClickHouse n'insère pas de données supplémentaires et ne lance pas d'exception.
-
-Formats pris en charge:
-
--   [JSONEachRow](../../interfaces/formats.md#jsoneachrow)
--   [CSVWithNames](../../interfaces/formats.md#csvwithnames)
--   [TabSeparatedWithNames](../../interfaces/formats.md#tabseparatedwithnames)
--   [TSKV](../../interfaces/formats.md#tskv)
-
-Valeurs possibles:
-
--   0 — Disabled.
--   1 — Enabled.
-
-Valeur par défaut: 0.
-
-## input_format_import_nested_json {#settings-input_format_import_nested_json}
-
-Active ou désactive l'insertion de données JSON avec des objets imbriqués.
-
-Formats pris en charge:
-
--   [JSONEachRow](../../interfaces/formats.md#jsoneachrow)
-
-Valeurs possibles:
-
--   0 — Disabled.
--   1 — Enabled.
-
-Valeur par défaut: 0.
-
-Voir aussi:
-
--   [Utilisation de Structures imbriquées](../../interfaces/formats.md#jsoneachrow-nested) avec l' `JSONEachRow` format.
-
-## input_format_with_names_use_header {#settings-input-format-with-names-use-header}
-
-Active ou désactive la vérification de l'ordre des colonnes lors de l'insertion de données.
-
-Pour améliorer les performances d'insertion, nous vous recommandons de désactiver cette vérification si vous êtes sûr que l'ordre des colonnes des données d'entrée est le même que dans la table cible.
-
-Formats pris en charge:
-
--   [CSVWithNames](../../interfaces/formats.md#csvwithnames)
--   [TabSeparatedWithNames](../../interfaces/formats.md#tabseparatedwithnames)
-
-Valeurs possibles:
-
--   0 — Disabled.
--   1 — Enabled.
-
-Valeur par défaut: 1.
-
-## date_time_input_format {#settings-date_time_input_format}
-
-Permet de choisir un analyseur de la représentation textuelle de la date et de l'heure.
-
-Le réglage ne s'applique pas à [fonctions date et heure](../../sql-reference/functions/date-time-functions.md).
-
-Valeurs possibles:
-
--   `'best_effort'` — Enables extended parsing.
-
-    ClickHouse peut analyser la base `YYYY-MM-DD HH:MM:SS` format et tous [ISO 8601](https://en.wikipedia.org/wiki/ISO_8601) formats de date et heure. Exemple, `'2018-06-08T01:02:03.000Z'`.
-
--   `'basic'` — Use basic parser.
-
-    ClickHouse ne peut analyser que la base `YYYY-MM-DD HH:MM:SS` format. Exemple, `'2019-08-20 10:18:56'`.
-
-Valeur par défaut: `'basic'`.
-
-Voir aussi:
-
--   [Type de données DateTime.](../../sql-reference/data-types/datetime.md)
--   [Fonctions pour travailler avec des dates et des heures.](../../sql-reference/functions/date-time-functions.md)
-
-## join_default_strictness {#settings-join_default_strictness}
-
-Définit la rigueur par défaut pour [JOIN clauses](../../sql-reference/statements/select/join.md#select-join).
-
-Valeurs possibles:
-
--   `ALL` — If the right table has several matching rows, ClickHouse creates a [Produit cartésien](https://en.wikipedia.org/wiki/Cartesian_product) à partir des lignes correspondantes. C'est normal `JOIN` comportement de SQL standard.
--   `ANY` — If the right table has several matching rows, only the first one found is joined. If the right table has only one matching row, the results of `ANY` et `ALL` sont les mêmes.
--   `ASOF` — For joining sequences with an uncertain match.
--   `Empty string` — If `ALL` ou `ANY` n'est pas spécifié dans la requête, ClickHouse lève une exception.
-
-Valeur par défaut: `ALL`.
-
-## join_any_take_last_row {#settings-join_any_take_last_row}
-
-Modifie le comportement des opérations de jointure avec `ANY` rigueur.
-
-!!! warning "Attention"
-    Ce paramètre s'applique uniquement pour `JOIN` opérations avec [Rejoindre](../../engines/table-engines/special/join.md) le moteur de tables.
-
-Valeurs possibles:
-
--   0 — If the right table has more than one matching row, only the first one found is joined.
--   1 — If the right table has more than one matching row, only the last one found is joined.
-
-Valeur par défaut: 0.
-
-Voir aussi:
-
--   [Clause de JOINTURE](../../sql-reference/statements/select/join.md#select-join)
--   [Rejoindre le moteur de table](../../engines/table-engines/special/join.md)
--   [join_default_strictness](#settings-join_default_strictness)
-
-## join_use_nulls {#join_use_nulls}
-
-Définit le type de [JOIN](../../sql-reference/statements/select/join.md) comportement. Lors de la fusion de tables, des cellules vides peuvent apparaître. ClickHouse les remplit différemment en fonction de ce paramètre.
-
-Valeurs possibles:
-
--   0 — The empty cells are filled with the default value of the corresponding field type.
--   1 — `JOIN` se comporte de la même manière que dans SQL standard. Le type du champ correspondant est converti en [Nullable](../../sql-reference/data-types/nullable.md#data_type-nullable) et les cellules vides sont remplis avec [NULL](../../sql-reference/syntax.md).
-
-Valeur par défaut: 0.
-
-## max_block_size {#setting-max_block_size}
-
-Dans ClickHouse, les données sont traitées par Blocs (Ensembles de parties de colonne). Les cycles de traitement internes pour un seul bloc sont assez efficaces, mais il y a des dépenses notables sur chaque bloc. Le `max_block_size` le paramètre est une recommandation pour la taille du bloc (dans un nombre de lignes) à charger à partir des tables. La taille du bloc ne doit pas être trop petite, de sorte que les dépenses sur chaque bloc sont toujours perceptibles, mais pas trop grande pour que la requête avec limite qui est terminée après le premier bloc soit traitée rapidement. L'objectif est d'éviter de consommer trop de mémoire lors de l'extraction d'un grand nombre de colonnes dans plusieurs threads et de préserver au moins certains localité de cache.
-
-Valeur par défaut: de 65 536.
-
-Les blocs de la taille de `max_block_size` ne sont pas toujours chargées de la table. Si il est évident que moins de données doivent être récupérées, un bloc plus petit est traitée.
-
-## preferred_block_size_bytes {#preferred-block-size-bytes}
-
-Utilisé dans le même but que `max_block_size`, mais il définit la taille de bloc recommandée en octets en l'adaptant au nombre de lignes dans le bloc.
-Cependant, la taille du bloc ne peut pas être supérieure à `max_block_size` rangée.
-Par défaut: 1 000 000. Cela ne fonctionne que lors de la lecture des moteurs MergeTree.
-
-## merge_tree_min_rows_for_concurrent_read {#setting-merge-tree-min-rows-for-concurrent-read}
-
-Si le nombre de lignes à lire à partir d'un fichier d'un [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md) table dépasse `merge_tree_min_rows_for_concurrent_read` ensuite, ClickHouse essaie d'effectuer une lecture simultanée de ce fichier sur plusieurs threads.
-
-Valeurs possibles:
-
--   Tout nombre entier positif.
-
-Valeur par défaut: 163840.
-
-## merge_tree_min_bytes_for_concurrent_read {#setting-merge-tree-min-bytes-for-concurrent-read}
-
-Si le nombre d'octets à lire à partir d'un fichier d'un [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md)- table de moteur dépasse `merge_tree_min_bytes_for_concurrent_read` puis ClickHouse essaie de lire simultanément à partir de ce fichier dans plusieurs threads.
-
-Valeur Possible:
-
--   Tout nombre entier positif.
-
-Valeur par défaut: 251658240.
-
-## merge_tree_min_rows_for_seek {#setting-merge-tree-min-rows-for-seek}
-
-Si la distance entre deux blocs de données à lire dans un fichier est inférieure à `merge_tree_min_rows_for_seek` lignes, puis ClickHouse ne cherche pas à travers le fichier mais lit les données séquentiellement.
-
-Valeurs possibles:
-
--   Tout nombre entier positif.
-
-Valeur par défaut: 0.
-
-## merge_tree_min_bytes_for_seek {#setting-merge-tree-min-bytes-for-seek}
-
-Si la distance entre deux blocs de données à lire dans un fichier est inférieure à `merge_tree_min_bytes_for_seek` octets, puis ClickHouse lit séquentiellement une plage de fichier qui contient les deux blocs, évitant ainsi la recherche supplémentaire.
-
-Valeurs possibles:
-
--   Tout nombre entier positif.
-
-Valeur par défaut: 0.
-
-## merge_tree_coarse_index_granularité {#setting-merge-tree-coarse-index-granularity}
-
-Lors de la recherche de données, ClickHouse vérifie les marques de données dans le fichier d'index. Si ClickHouse trouve que les clés requises sont dans une certaine plage, il divise cette plage en `merge_tree_coarse_index_granularity` subranges et recherche les clés requises récursivement.
-
-Valeurs possibles:
-
--   Tout entier pair positif.
-
-Valeur par défaut: 8.
-
-## merge_tree_max_rows_to_use_cache {#setting-merge-tree-max-rows-to-use-cache}
-
-Si ClickHouse devrait lire plus de `merge_tree_max_rows_to_use_cache` lignes dans une requête, il n'utilise pas le cache des blocs non compressés.
-
-Le cache des blocs non compressés stocke les données extraites pour les requêtes. ClickHouse utilise ce cache pour accélérer les réponses aux petites requêtes répétées. Ce paramètre protège le cache contre le saccage par les requêtes qui lisent une grande quantité de données. Le [uncompressed_cache_size](../server-configuration-parameters/settings.md#server-settings-uncompressed_cache_size) le paramètre serveur définit la taille du cache des blocs non compressés.
-
-Valeurs possibles:
-
--   Tout nombre entier positif.
-
-Default value: 128 ✕ 8192.
-
-## merge_tree_max_bytes_to_use_cache {#setting-merge-tree-max-bytes-to-use-cache}
-
-Si ClickHouse devrait lire plus de `merge_tree_max_bytes_to_use_cache` octets dans une requête, il n'utilise pas le cache de non compressé blocs.
-
-Le cache des blocs non compressés stocke les données extraites pour les requêtes. ClickHouse utilise ce cache pour accélérer les réponses aux petites requêtes répétées. Ce paramètre protège le cache contre le saccage par les requêtes qui lisent une grande quantité de données. Le [uncompressed_cache_size](../server-configuration-parameters/settings.md#server-settings-uncompressed_cache_size) le paramètre serveur définit la taille du cache des blocs non compressés.
-
-Valeur Possible:
-
--   Tout nombre entier positif.
-
-Valeur par défaut: 2013265920.
-
-## min_bytes_to_use_direct_io {#settings-min-bytes-to-use-direct-io}
-
-Volume de données minimum requis pour utiliser l'accès direct aux E/S sur le disque de stockage.
-
-ClickHouse utilise ce paramètre lors de la lecture de données à partir de tables. Si le volume total de stockage de toutes les données à lire dépasse `min_bytes_to_use_direct_io` octets, puis ClickHouse lit les données du disque de stockage avec le `O_DIRECT` option.
-
-Valeurs possibles:
-
--   0 — Direct I/O is disabled.
--   Entier positif.
-
-Valeur par défaut: 0.
-
-## log_queries {#settings-log-queries}
-
-Configuration de la journalisation des requêtes.
-
-Les requêtes envoyées à ClickHouse avec cette configuration sont enregistrées selon les règles du [query_log](../server-configuration-parameters/settings.md#server_configuration_parameters-query-log) paramètre de configuration du serveur.
-
-Exemple:
-
-``` text
-log_queries=1
-```
-
-## log_queries_min_type {#settings-log-queries-min-type}
-
-`query_log` type minimal à enregistrer.
-
-Valeurs possibles:
-- `QUERY_START` (`=1`)
-- `QUERY_FINISH` (`=2`)
-- `EXCEPTION_BEFORE_START` (`=3`)
-- `EXCEPTION_WHILE_PROCESSING` (`=4`)
-
-Valeur par défaut: `QUERY_START`.
-
-Peut être utilisé pour limiter le nombre de entiries va va `query_log`, dites que vous êtes intéressant que dans les erreurs, alors vous pouvez utiliser `EXCEPTION_WHILE_PROCESSING`:
-
-``` text
-log_queries_min_type='EXCEPTION_WHILE_PROCESSING'
-```
-
-## log_query_threads {#settings-log-query-threads}
-
-Configuration de la journalisation des threads de requête.
-
-Les threads de requêtes exécutés par ClickHouse avec cette configuration sont journalisés selon les règles du [query_thread_log](../server-configuration-parameters/settings.md#server_configuration_parameters-query-thread-log) paramètre de configuration du serveur.
-
-Exemple:
-
-``` text
-log_query_threads=1
-```
-
-## max_insert_block_size {#settings-max_insert_block_size}
-
-La taille des blocs à former pour l'insertion dans une table.
-Ce paramètre s'applique uniquement dans les cas où le serveur formes les blocs.
-Par exemple, pour une insertion via L'interface HTTP, le serveur analyse le format de données et forme des blocs de la taille spécifiée.
-Mais lors de l'utilisation de clickhouse-client, le client analyse les données ‘max_insert_block_size’ le réglage sur le serveur n'affecte pas la taille des blocs insérés.
-Le paramètre n'a pas non plus de but lors de L'utilisation D'INSERT SELECT, car les données sont insérées à l'aide des mêmes blocs qui sont formés après SELECT.
-
-Valeur par défaut: 1 048 576 octets.
-
-La valeur par défaut est légèrement supérieure à `max_block_size`. La raison en est que certains moteurs de table (`*MergeTree`) former une partie de données sur le disque pour chaque bloc inséré, qui est une entité assez grande. Pareillement, `*MergeTree` les tables trient les données lors de l'insertion et une taille de bloc suffisamment grande permet de trier plus de données dans la RAM.
-
-## min_insert_block_size_rows {#min-insert-block-size-rows}
-
-Définit le nombre minimum de lignes dans le bloc qui peut être inséré dans un tableau par un `INSERT` requête. Les blocs de plus petite taille sont écrasés en plus gros.
-
-Valeurs possibles:
-
--   Entier positif.
--   0 — Squashing disabled.
-
-Valeur par défaut: 1048576.
-
-## min_insert_block_size_bytes {#min-insert-block-size-bytes}
-
-Définit le nombre minimal d'octets dans le bloc qui peut être inséré dans un tableau par un `INSERT` requête. Les blocs de plus petite taille sont écrasés en plus gros.
-
-Valeurs possibles:
-
--   Entier positif.
--   0 — Squashing disabled.
-
-Valeur par défaut: 268435456.
-
-## max_replica_delay_for_distributed_queries {#settings-max_replica_delay_for_distributed_queries}
-
-Désactive les répliques en retard pour les requêtes distribuées. Voir [Réplication](../../engines/table-engines/mergetree-family/replication.md).
-
-Définit le temps en secondes. Si une réplique accuse plus de retard que la valeur définie, cette réplique n'est pas utilisée.
-
-Valeur par défaut: 300.
-
-Utilisé lors de l'exécution `SELECT` à partir d'une table distribuée qui pointe vers des tables répliquées.
-
-## max_threads {#settings-max_threads}
-
-Nombre maximal de threads de traitement des requêtes, à l'exclusion des threads de récupération de données à partir de serveurs distants (voir ‘max_distributed_connections’ paramètre).
-
-Ce paramètre s'applique aux threads qui effectuent les mêmes étapes du pipeline de traitement des requêtes en parallèle.
-Par exemple, lors de la lecture d'une table, s'il est possible d'évaluer des expressions avec des fonctions, filtrer avec WHERE et pré-agréger pour GROUP BY en parallèle en utilisant au moins ‘max_threads’ nombre de threads, puis ‘max_threads’ sont utilisés.
-
-Valeur par défaut: nombre de cœurs de processeur physiques.
-
-Si moins d'une requête SELECT est normalement exécutée sur un serveur à la fois, définissez ce paramètre sur une valeur légèrement inférieure au nombre réel de cœurs de processeur.
-
-Pour les requêtes qui sont terminées rapidement en raison d'une limite, vous pouvez définir une valeur inférieure ‘max_threads’. Par exemple, si le nombre d'entrées se trouvent dans chaque bloc et max_threads = 8, 8 blocs sont récupérées, même s'il aurait été suffisante pour lire un seul.
-
-Le plus petit de la `max_threads` valeur, moins la mémoire est consommée.
-
-## max_insert_threads {#settings-max-insert-threads}
-
-Nombre maximal de threads à exécuter `INSERT SELECT` requête.
-
-Valeurs possibles:
-
--   0 (or 1) — `INSERT SELECT` pas d'exécution parallèle.
--   Entier positif. Plus grand que 1.
-
-Valeur par défaut: 0.
-
-Parallèle `INSERT SELECT` n'a d'effet que si l' `SELECT` une partie est exécutée en parallèle, voir [max_threads](#settings-max_threads) paramètre.
-Des valeurs plus élevées conduiront à une utilisation de la mémoire plus élevée.
-
-## max_compress_block_size {#max-compress-block-size}
-
-La taille maximale des blocs de données non compressées avant la compression pour l'écriture dans une table. Par défaut, 1 048 576 (1 MiB). Si la taille est réduite, le taux de compression est considérablement réduit, la vitesse de compression et de décompression augmente légèrement en raison de la localisation du cache, et la consommation de mémoire est réduite. Il n'y aucune raison de modifier ce paramètre.
-
-Ne confondez pas les blocs pour la compression (un morceau de mémoire constitué d'octets) avec des blocs pour le traitement des requêtes (Un ensemble de lignes d'une table).
-
-## min_compress_block_size {#min-compress-block-size}
-
-Pour [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md)" table. Afin de réduire la latence lors du traitement des requêtes, un bloc est compressé lors de l'écriture de la marque suivante si sa taille est au moins ‘min_compress_block_size’. Par défaut, 65 536.
-
-La taille réelle du bloc, si les données non compressées sont inférieures à ‘max_compress_block_size’ pas moins de cette valeur et pas moins que le volume de données pour une marque.
-
-Regardons un exemple. Supposons que ‘index_granularity’ a 8192 lors de la création de la table.
-
-Nous écrivons une colonne de type UInt32 (4 octets par valeur). Lors de l'écriture de 8192 lignes, le total sera de 32 KO de données. Puisque min_compress_block_size = 65 536, un bloc compressé sera formé pour toutes les deux marques.
-
-Nous écrivons une colonne URL avec le type de chaîne (taille moyenne de 60 octets par valeur). Lors de l'écriture de 8192 lignes, la moyenne sera légèrement inférieure à 500 Ko de données. Comme il s'agit de plus de 65 536, un bloc compressé sera formé pour chaque marque. Dans ce cas, lors de la lecture de données du disque dans la plage d'une seule marque, les données supplémentaires ne seront pas décompressées.
-
-Il n'y aucune raison de modifier ce paramètre.
-
-## max_query_size {#settings-max_query_size}
-
-La partie maximale d'une requête qui peut être prise en RAM pour l'analyse avec L'analyseur SQL.
-La requête INSERT contient également des données pour INSERT qui sont traitées par un analyseur de flux séparé (qui consomme O (1) RAM), qui n'est pas inclus dans cette restriction.
-
-Valeur par défaut: 256 Ko.
-
-## interactive_delay {#interactive-delay}
-
-Intervalle en microsecondes pour vérifier si l'exécution de la requête a été annulée et envoyer la progression.
-
-Valeur par défaut: 100 000 (vérifie l'Annulation et envoie la progression dix fois par seconde).
-
-## connect_timeout, receive_timeout, send_timeout {#connect-timeout-receive-timeout-send-timeout}
-
-Délais d'attente en secondes sur le socket utilisé pour communiquer avec le client.
-
-Valeur par défaut: 10, 300, 300.
-
-## cancel_http_readonly_queries_on_client_close {#cancel-http-readonly-queries-on-client-close}
-
-Cancels HTTP read-only queries (e.g. SELECT) when a client closes the connection without waiting for the response.
-
-Valeur par défaut: 0
-
-## poll_interval {#poll-interval}
-
-Verrouillez une boucle d'attente pendant le nombre de secondes spécifié.
-
-Valeur par défaut: 10.
-
-## max_distributed_connections {#max-distributed-connections}
-
-Nombre maximal de connexions simultanées avec des serveurs distants pour le traitement distribué d'une seule requête vers une seule table distribuée. Nous vous recommandons de définir une valeur au moins égale au nombre de serveurs dans le cluster.
-
-Valeur par défaut: 1024.
-
-Les paramètres suivants ne sont utilisés que lors de la création de tables distribuées (et lors du lancement d'un serveur), il n'y a donc aucune raison de les modifier lors de l'exécution.
-
-## distributed_connections_pool_size {#distributed-connections-pool-size}
-
-Nombre maximal de connexions simultanées avec des serveurs distants pour le traitement distribué de toutes les requêtes vers une seule table distribuée. Nous vous recommandons de définir une valeur au moins égale au nombre de serveurs dans le cluster.
-
-Valeur par défaut: 1024.
-
-## connect_timeout_with_failover_ms {#connect-timeout-with-failover-ms}
-
-Délai d'attente en millisecondes pour la connexion à un serveur distant pour un moteur de table distribué, si ‘shard’ et ‘replica’ les sections sont utilisées dans la définition du cluster.
-En cas d'échec, plusieurs tentatives sont faites pour se connecter à diverses répliques.
-
-Valeur par défaut: 50.
-
-## connections_with_failover_max_tries {#connections-with-failover-max-tries}
-
-Nombre maximal de tentatives de connexion avec chaque réplique pour le moteur de table distribué.
-
-Valeur par défaut: 3.
-
-## extrême {#extremes}
-
-Indique s'il faut compter les valeurs extrêmes (les minimums et les maximums dans les colonnes d'un résultat de requête). Accepte 0 ou 1. Par défaut, 0 (désactivé).
-Pour plus d'informations, consultez la section “Extreme values”.
-
-## use_uncompressed_cache {#setting-use_uncompressed_cache}
-
-Indique s'il faut utiliser un cache de blocs non compressés. Accepte 0 ou 1. Par défaut, 0 (désactivé).
-L'utilisation du cache non compressé (uniquement pour les tables de la famille MergeTree) peut réduire considérablement la latence et augmenter le débit lorsque vous travaillez avec un grand nombre de requêtes courtes. Activez ce paramètre pour les utilisateurs qui envoient des requêtes courtes fréquentes. Faites également attention à la [uncompressed_cache_size](../server-configuration-parameters/settings.md#server-settings-uncompressed_cache_size) configuration parameter (only set in the config file) – the size of uncompressed cache blocks. By default, it is 8 GiB. The uncompressed cache is filled in as needed and the least-used data is automatically deleted.
-
-Pour les requêtes qui lisent au moins un volume de données assez important (un million de lignes ou plus), le cache non compressé est désactivé automatiquement pour économiser de l'espace pour les requêtes vraiment petites. Cela signifie que vous pouvez garder la ‘use_uncompressed_cache’ toujours la valeur 1.
-
-## replace_running_query {#replace-running-query}
-
-Lors de l'utilisation de L'interface HTTP, le ‘query_id’ le paramètre peut être passé. C'est n'importe quelle chaîne qui sert d'Identificateur de requête.
-Si une requête d'un utilisateur avec le même ‘query_id’ il existe déjà à ce moment, le comportement dépend de la ‘replace_running_query’ paramètre.
-
-`0` (default) – Throw an exception (don't allow the query to run if a query with the same ‘query_id’ est déjà en cours d'exécution).
-
-`1` – Cancel the old query and start running the new one.
-
-Yandex.Metrica utilise ce paramètre défini sur 1 pour implémenter des suggestions de conditions de segmentation. Après avoir entré le caractère suivant, si l'ancienne requête n'est pas encore terminée, elle doit être annulée.
-
-## stream_flush_interval_ms {#stream-flush-interval-ms}
-
-Fonctionne pour les tables avec des flux dans le cas d'une expiration, ou lorsqu'un thread génère [max_insert_block_size](#settings-max_insert_block_size) rangée.
-
-La valeur par défaut est 7500.
-
-Plus la valeur est petite, plus les données sont vidées dans la table. Régler la valeur trop faible entraîne de mauvaises performances.
-
-## équilibrage {#settings-load_balancing}
-
-Spécifie l'algorithme de sélection des réplicas utilisé pour le traitement des requêtes distribuées.
-
-ClickHouse prend en charge les algorithmes suivants de choix des répliques:
-
--   [Aléatoire](#load_balancing-random) (par défaut)
--   [Nom d'hôte le plus proche](#load_balancing-nearest_hostname)
--   [Afin](#load_balancing-in_order)
--   [Premier ou aléatoire](#load_balancing-first_or_random)
-
-### Aléatoire (par défaut) {#load_balancing-random}
-
-``` sql
-load_balancing = random
-```
-
-Le nombre d'erreurs est compté pour chaque réplique. La requête est envoyée au réplica avec le moins d'erreurs, et s'il y en a plusieurs, à n'importe qui d'entre eux.
-Inconvénients: la proximité du serveur n'est pas prise en compte; si les répliques ont des données différentes, vous obtiendrez également des données différentes.
-
-### Nom D'Hôte Le Plus Proche {#load_balancing-nearest_hostname}
-
-``` sql
-load_balancing = nearest_hostname
-```
-
-The number of errors is counted for each replica. Every 5 minutes, the number of errors is integrally divided by 2. Thus, the number of errors is calculated for a recent time with exponential smoothing. If there is one replica with a minimal number of errors (i.e. errors occurred recently on the other replicas), the query is sent to it. If there are multiple replicas with the same minimal number of errors, the query is sent to the replica with a hostname that is most similar to the server's hostname in the config file (for the number of different characters in identical positions, up to the minimum length of both hostnames).
-
-Par exemple, exemple01-01-1 et example01-01-2.yandex.ru sont différents dans une position, tandis que l'exemple01-01-1 et l'exemple01-02-2 diffèrent dans deux endroits.
-Cette méthode peut sembler primitive, mais elle ne nécessite pas de données externes sur la topologie du réseau, et elle ne compare pas les adresses IP, ce qui serait compliqué pour nos adresses IPv6.
-
-Ainsi, s'il existe des répliques équivalentes, la plus proche par son nom est préférée.
-Nous pouvons également supposer que lors de l'envoi d'une requête au même serveur, en l'absence d'Échecs, une requête distribuée ira également aux mêmes serveurs. Ainsi, même si des données différentes sont placées sur les répliques, la requête retournera principalement les mêmes résultats.
-
-### Afin {#load_balancing-in_order}
-
-``` sql
-load_balancing = in_order
-```
-
-Répliques avec le même nombre d'erreurs sont accessibles dans le même ordre qu'ils sont définis dans la configuration.
-Cette méthode est appropriée lorsque vous savez exactement quelle réplique est préférable.
-
-### Premier ou aléatoire {#load_balancing-first_or_random}
-
-``` sql
-load_balancing = first_or_random
-```
-
-Cet algorithme choisit la première réplique de l'ensemble ou une réplique aléatoire si la première n'est pas disponible. Il est efficace dans les configurations de topologie de réplication croisée, mais inutile dans d'autres configurations.
-
-Le `first_or_random` algorithme résout le problème de la `in_order` algorithme. Avec `in_order`, si une réplique tombe en panne, la suivante obtient une double charge tandis que les répliques restantes gèrent la quantité habituelle de trafic. Lors de l'utilisation de la `first_or_random` algorithme, la charge est répartie uniformément entre les répliques qui sont encore disponibles.
-
-## prefer_localhost_replica {#settings-prefer-localhost-replica}
-
-Active / désactive préférable d'utiliser le réplica localhost lors du traitement des requêtes distribuées.
-
-Valeurs possibles:
-
--   1 — ClickHouse always sends a query to the localhost replica if it exists.
--   0 — ClickHouse uses the balancing strategy specified by the [équilibrage](#settings-load_balancing) paramètre.
-
-Valeur par défaut: 1.
-
-!!! warning "Avertissement"
-    Désactivez ce paramètre si vous utilisez [max_parallel_replicas](#settings-max_parallel_replicas).
-
-## totals_mode {#totals-mode}
-
-Comment calculer les totaux lorsque HAVING est présent, ainsi que lorsque max_rows_to_group_by et group_by_overflow_mode = ‘any’ sont présents.
-Voir la section “WITH TOTALS modifier”.
-
-## totals_auto_threshold {#totals-auto-threshold}
-
-Le seuil de `totals_mode = 'auto'`.
-Voir la section “WITH TOTALS modifier”.
-
-## max_parallel_replicas {#settings-max_parallel_replicas}
-
-Nombre maximal de répliques pour chaque fragment lors de l'exécution d'une requête.
-Par souci de cohérence (pour obtenir différentes parties du même partage de données), Cette option ne fonctionne que lorsque la clé d'échantillonnage est définie.
-Le retard de réplique n'est pas contrôlé.
-
-## compiler {#compile}
-
-Activer la compilation des requêtes. Par défaut, 0 (désactivé).
-
-La compilation n'est utilisée que pour une partie du pipeline de traitement des requêtes: pour la première étape de l'agrégation (GROUP BY).
-Si cette partie du pipeline a été compilée, la requête peut s'exécuter plus rapidement en raison du déploiement de cycles courts et des appels de fonction d'agrégation intégrés. L'amélioration maximale des performances (jusqu'à quatre fois plus rapide dans de rares cas) est observée pour les requêtes avec plusieurs fonctions d'agrégat simples. Typiquement, le gain de performance est insignifiant. Dans de très rares cas, il peut ralentir l'exécution de la requête.
-
-## min_count_to_compile {#min-count-to-compile}
-
-Combien de fois utiliser potentiellement un morceau de code compilé avant d'exécuter la compilation. Par défaut, 3.
-For testing, the value can be set to 0: compilation runs synchronously and the query waits for the end of the compilation process before continuing execution. For all other cases, use values ​​starting with 1. Compilation normally takes about 5-10 seconds.
-Si la valeur est 1 ou plus, la compilation se produit de manière asynchrone dans un thread séparé. Le résultat sera utilisé dès qu'il sera prêt, y compris les requêtes en cours d'exécution.
-
-Le code compilé est requis pour chaque combinaison différente de fonctions d'agrégat utilisées dans la requête et le type de clés dans la clause GROUP BY.
-The results of the compilation are saved in the build directory in the form of .so files. There is no restriction on the number of compilation results since they don't use very much space. Old results will be used after server restarts, except in the case of a server upgrade – in this case, the old results are deleted.
-
-## output_format_json_quote_64bit_integers {#session_settings-output_format_json_quote_64bit_integers}
-
-Si la valeur est true, les entiers apparaissent entre guillemets lors de l'utilisation des formats JSON\* Int64 et UInt64 (pour la compatibilité avec la plupart des implémentations JavaScript); sinon, les entiers sont sortis sans les guillemets.
-
-## format_csv_delimiter {#settings-format_csv_delimiter}
-
-Caractère interprété comme un délimiteur dans les données CSV. Par défaut, le délimiteur est `,`.
-
-## input_format_csv_unquoted_null_literal_as_null {#settings-input_format_csv_unquoted_null_literal_as_null}
-
-Pour le format D'entrée CSV active ou désactive l'analyse des `NULL` comme littéral (synonyme de `\N`).
-
-## output_format_csv_crlf_end_of_line {#settings-output-format-csv-crlf-end-of-line}
-
-Utilisez le séparateur de ligne de style DOS/Windows (CRLF) en CSV au lieu du style Unix (LF).
-
-## output_format_tsv_crlf_end_of_line {#settings-output-format-tsv-crlf-end-of-line}
-
-Utilisez le séparateur de ligne de style DOC/Windows (CRLF) dans TSV au lieu du style Unix (LF).
-
-## insert_quorum {#settings-insert_quorum}
-
-Active les Écritures de quorum.
-
--   Si `insert_quorum < 2`, les Écritures de quorum sont désactivées.
--   Si `insert_quorum >= 2`, les Écritures de quorum sont activées.
-
-Valeur par défaut: 0.
-
-Quorum écrit
-
-`INSERT` ne réussit que lorsque ClickHouse parvient à écrire correctement les données `insert_quorum` des répliques au cours de la `insert_quorum_timeout`. Si, pour une raison quelconque, le nombre de répliques avec succès écrit n'atteint pas le `insert_quorum`, l'écriture est considérée comme ayant échoué et ClickHouse supprimera le bloc inséré de toutes les répliques où les données ont déjà été écrites.
-
-Toutes les répliques du quorum sont cohérentes, c'est-à-dire qu'elles contiennent des données de toutes les `INSERT` requête. Le `INSERT` la séquence est linéarisé.
-
-Lors de la lecture des données écrites à partir du `insert_quorum`, vous pouvez utiliser le [select_sequential_consistency](#settings-select_sequential_consistency) option.
-
-Clickhouse génère une exception
-
--   Si le nombre de répliques au moment de la requête est inférieure à la `insert_quorum`.
--   Lors d'une tentative d'écriture de données lorsque le bloc précédent n'a pas encore été inséré dans le `insert_quorum` des répliques. Cette situation peut se produire si l'utilisateur tente d'effectuer une `INSERT` avant le précédent avec le `insert_quorum` est terminé.
-
-Voir aussi:
-
--   [insert_quorum_timeout](#settings-insert_quorum_timeout)
--   [select_sequential_consistency](#settings-select_sequential_consistency)
-
-## insert_quorum_timeout {#settings-insert_quorum_timeout}
-
-Ecrire dans quorum timeout en secondes. Si le délai d'attente est passé et qu'aucune écriture n'a encore eu lieu, ClickHouse génère une exception et le client doit répéter la requête pour écrire le même bloc dans le même réplica ou tout autre réplica.
-
-Valeur par défaut: 60 secondes.
-
-Voir aussi:
-
--   [insert_quorum](#settings-insert_quorum)
--   [select_sequential_consistency](#settings-select_sequential_consistency)
-
-## select_sequential_consistency {#settings-select_sequential_consistency}
-
-Active ou désactive la cohérence séquentielle pour `SELECT` requête:
-
-Valeurs possibles:
-
--   0 — Disabled.
--   1 — Enabled.
-
-Valeur par défaut: 0.
-
-Utilisation
-
-Lorsque la cohérence séquentielle est activée, ClickHouse permet au client d'exécuter `SELECT` requête uniquement pour les répliques qui contiennent des données de toutes les `INSERT` requêtes exécutées avec `insert_quorum`. Si le client fait référence à une réplique partielle, ClickHouse génère une exception. La requête SELECT n'inclut pas les données qui n'ont pas encore été écrites dans le quorum des répliques.
-
-Voir aussi:
-
--   [insert_quorum](#settings-insert_quorum)
--   [insert_quorum_timeout](#settings-insert_quorum_timeout)
-
-## insert_deduplicate {#settings-insert-deduplicate}
-
-Active ou désactive la déduplication des blocs `INSERT` (Répliqués\* les tableaux).
-
-Valeurs possibles:
-
--   0 — Disabled.
--   1 — Enabled.
-
-Valeur par défaut: 1.
-
-Par défaut, les blocs insérés dans les tables répliquées `INSERT` déclaration sont dédupliquées (voir [Réplication Des Données](../../engines/table-engines/mergetree-family/replication.md)).
-
-## déduplicate_blocks_in_dependent_materialized_views {#settings-deduplicate-blocks-in-dependent-materialized-views}
-
-Active ou désactive la vérification de déduplication des vues matérialisées qui reçoivent des données à partir de tables\* répliquées.
-
-Valeurs possibles:
-
-      0 — Disabled.
-      1 — Enabled.
-
-Valeur par défaut: 0.
-
-Utilisation
-
-Par défaut, la déduplication n'est pas effectuée pour les vues matérialisées mais en amont, dans la table source.
-Si un bloc inséré est ignoré en raison de la déduplication dans la table source, il n'y aura pas d'insertion dans les vues matérialisées attachées. Ce comportement existe pour permettre l'insertion de données hautement agrégées dans des vues matérialisées, dans les cas où les blocs insérés sont les mêmes après l'agrégation de vues matérialisées mais dérivés de différentes insertions dans la table source.
-Dans le même temps, ce comportement “breaks” `INSERT` idempotence. Si un `INSERT` dans la table principale a été un succès et `INSERT` into a materialized view failed (e.g. because of communication failure with Zookeeper) a client will get an error and can retry the operation. However, the materialized view won't receive the second insert because it will be discarded by deduplication in the main (source) table. The setting `deduplicate_blocks_in_dependent_materialized_views` permet de changer ce comportement. Lors d'une nouvelle tentative, une vue matérialisée recevra l'insertion répétée et effectuera une vérification de déduplication par elle-même,
-ignorant le résultat de la vérification pour la table source, et insérera des lignes perdues en raison de la première défaillance.
-
-## max_network_bytes {#settings-max-network-bytes}
-
-Limite le volume de données (en octets) qui est reçu ou transmis sur le réseau lors de l'exécution d'une requête. Ce paramètre s'applique à chaque individu requête.
-
-Valeurs possibles:
-
--   Entier positif.
--   0 — Data volume control is disabled.
-
-Valeur par défaut: 0.
-
-## max_network_bandwidth {#settings-max-network-bandwidth}
-
-Limite la vitesse de l'échange de données sur le réseau en octets par seconde. Ce paramètre s'applique à toutes les requêtes.
-
-Valeurs possibles:
-
--   Entier positif.
--   0 — Bandwidth control is disabled.
-
-Valeur par défaut: 0.
-
-## max_network_bandwidth_for_user {#settings-max-network-bandwidth-for-user}
-
-Limite la vitesse de l'échange de données sur le réseau en octets par seconde. Ce paramètre s'applique à toutes les requêtes exécutées simultanément par un seul utilisateur.
-
-Valeurs possibles:
-
--   Entier positif.
--   0 — Control of the data speed is disabled.
-
-Valeur par défaut: 0.
-
-## max_network_bandwidth_for_all_users {#settings-max-network-bandwidth-for-all-users}
-
-Limite la vitesse à laquelle les données sont échangées sur le réseau en octets par seconde. Ce paramètre s'applique à toutes les requêtes exécutées simultanément sur le serveur.
-
-Valeurs possibles:
-
--   Entier positif.
--   0 — Control of the data speed is disabled.
-
-Valeur par défaut: 0.
-
-## count_distinct_implementation {#settings-count_distinct_implementation}
-
-Spécifie de l' `uniq*` les fonctions doivent être utilisées pour [COUNT(DISTINCT …)](../../sql-reference/aggregate-functions/reference.md#agg_function-count) construction.
-
-Valeurs possibles:
-
--   [uniq](../../sql-reference/aggregate-functions/reference.md#agg_function-uniq)
--   [uniqcombiné](../../sql-reference/aggregate-functions/reference.md#agg_function-uniqcombined)
--   [uniqCombined64](../../sql-reference/aggregate-functions/reference.md#agg_function-uniqcombined64)
--   [uniqHLL12](../../sql-reference/aggregate-functions/reference.md#agg_function-uniqhll12)
--   [uniqExact](../../sql-reference/aggregate-functions/reference.md#agg_function-uniqexact)
-
-Valeur par défaut: `uniqExact`.
-
-## skip_unavailable_shards {#settings-skip_unavailable_shards}
-
-Active ou désactive le saut silencieux des fragments indisponibles.
-
-Tesson est considéré comme indisponible si toutes ses répliques ne sont pas disponibles. Une réplique n'est pas disponible dans les cas suivants:
-
--   ClickHouse ne peut pas se connecter à la réplique pour une raison quelconque.
-
-    Lors de la connexion à une réplique, ClickHouse effectue plusieurs tentatives. Si toutes ces tentatives échouent, la réplique est considéré comme indisponible.
-
--   La réplique ne peut pas être résolue via le DNS.
-
-    Si le nom d'hôte du réplica ne peut pas être résolu via DNS, il peut indiquer les situations suivantes:
-
-    -   L'hôte de la réplique n'a pas d'enregistrement DNS. Il peut se produire dans les systèmes avec DNS dynamique, par exemple, [Kubernetes](https://kubernetes.io), où les nœuds peuvent être insolubles pendant les temps d'arrêt, et ce n'est pas une erreur.
-
-    -   Erreur de Configuration. Le fichier de configuration ClickHouse contient un mauvais nom d'hôte.
-
-Valeurs possibles:
-
--   1 — skipping enabled.
-
-    Si un fragment n'est pas disponible, ClickHouse renvoie un résultat basé sur des données partielles et ne signale pas les problèmes de disponibilité des nœuds.
-
--   0 — skipping disabled.
-
-    Si un fragment n'est pas disponible, ClickHouse lève une exception.
-
-Valeur par défaut: 0.
-
-## optimize_skip_unused_shards {#settings-optimize_skip_unused_shards}
-
-Active ou désactive le saut des fragments inutilisés pour les requêtes SELECT qui ont la condition de clé de sharding dans PREWHERE/WHERE (suppose que les données sont distribuées par la clé de sharding, sinon ne rien faire).
-
-Valeur par défaut: 0
-
-## force_optimize_skip_unused_shards {#settings-force_optimize_skip_unused_shards}
-
-Active ou désactive l'exécution de la requête si [`optimize_skip_unused_shards`](#settings-optimize_skip_unused_shards) activé et sauter des fragments inutilisés n'est pas possible. Si le saut n'est pas possible et le paramètre est activé, une exception sera levée.
-
-Valeurs possibles:
-
--   0 - Désactivé (ne jette)
--   1-Désactiver l'exécution de la requête uniquement si la table a une clé de sharding
--   2-Désactiver l'exécution de la requête quelle que soit la clé de sharding est définie pour la table
-
-Valeur par défaut: 0
-
-## optimize_throw_if_noop {#setting-optimize_throw_if_noop}
-
-Active ou désactive le lancement d'une exception si [OPTIMIZE](../../sql-reference/statements/misc.md#misc_operations-optimize) la requête n'a pas effectué de fusion.
-
-Par défaut, `OPTIMIZE` retourne avec succès même s'il n'a rien fait. Ce paramètre vous permet de différencier ces situations et d'obtenir la raison dans un message d'exception.
-
-Valeurs possibles:
-
--   1 — Throwing an exception is enabled.
--   0 — Throwing an exception is disabled.
-
-Valeur par défaut: 0.
-
-## distributed_replica_error_half_life {#settings-distributed_replica_error_half_life}
-
--   Type: secondes
--   Valeur par défaut: 60 secondes
-
-Contrôle la vitesse à laquelle les erreurs dans les tables distribuées sont mises à zéro. Si une réplique est indisponible pendant un certain temps, accumule 5 erreurs et distributed_replica_error_half_life est défini sur 1 seconde, la réplique est considérée comme normale 3 secondes après la dernière erreur.
-
-Voir aussi:
-
--   [Tableau moteur Distribués](../../engines/table-engines/special/distributed.md)
--   [distributed_replica_error_cap](#settings-distributed_replica_error_cap)
-
-## distributed_replica_error_cap {#settings-distributed_replica_error_cap}
-
--   Type: unsigned int
--   Valeur par défaut: 1000
-
-Le nombre d'erreurs de chaque réplique est plafonné à cette valeur, empêchant une seule réplique d'accumuler trop d'erreurs.
-
-Voir aussi:
-
--   [Tableau moteur Distribués](../../engines/table-engines/special/distributed.md)
--   [distributed_replica_error_half_life](#settings-distributed_replica_error_half_life)
-
-## distributed_directory_monitor_sleep_time_ms {#distributed_directory_monitor_sleep_time_ms}
-
-Intervalle de Base pour le [Distribué](../../engines/table-engines/special/distributed.md) tableau moteur à envoyer des données. L'intervalle réel augmente de façon exponentielle en cas d'erreurs.
-
-Valeurs possibles:
-
--   Un nombre entier positif de millisecondes.
-
-Valeur par défaut: 100 millisecondes.
-
-## distributed_directory_monitor_max_sleep_time_ms {#distributed_directory_monitor_max_sleep_time_ms}
-
-Intervalle maximal pour le [Distribué](../../engines/table-engines/special/distributed.md) tableau moteur à envoyer des données. Limite la croissance exponentielle de l'intervalle défini dans [distributed_directory_monitor_sleep_time_ms](#distributed_directory_monitor_sleep_time_ms) paramètre.
-
-Valeurs possibles:
-
--   Un nombre entier positif de millisecondes.
-
-Valeur par défaut: 30000 millisecondes (30 secondes).
-
-## distributed_directory_monitor_batch_inserts {#distributed_directory_monitor_batch_inserts}
-
-Active / désactive l'envoi des données insérées par lots.
-
-Lorsque l'envoi par lots est activé, le [Distribué](../../engines/table-engines/special/distributed.md) tableau moteur essaie d'envoyer plusieurs fichiers de données insérées dans une seule opération au lieu de les envoyer séparément. L'envoi par lots améliore les performances du cluster en utilisant mieux les ressources du serveur et du réseau.
-
-Valeurs possibles:
-
--   1 — Enabled.
--   0 — Disabled.
-
-Valeur par défaut: 0.
-
-## os_thread_priority {#setting-os-thread-priority}
-
-Définit la priorité ([beau](https://en.wikipedia.org/wiki/Nice_(Unix))) pour les threads qui exécutent des requêtes. Le planificateur du système d'exploitation considère cette priorité lors du choix du prochain thread à exécuter sur chaque noyau CPU disponible.
-
-!!! warning "Avertissement"
-    Pour utiliser ce paramètre, vous devez définir l' `CAP_SYS_NICE` capacité. Le `clickhouse-server` paquet configure lors de l'installation. Certains environnements virtuels ne vous permettent pas de définir `CAP_SYS_NICE` capacité. Dans ce cas, `clickhouse-server` affiche un message à ce sujet au début.
-
-Valeurs possibles:
-
--   Vous pouvez définir des valeurs dans la gamme `[-20, 19]`.
-
-Des valeurs plus faibles signifient une priorité plus élevée. Les discussions avec des bas `nice` les valeurs de priorité sont effectués plus fréquemment que les discussions avec des valeurs élevées. Les valeurs élevées sont préférables pour les requêtes non interactives de longue durée, car elles leur permettent d'abandonner rapidement des ressources au profit de requêtes interactives courtes lorsqu'elles arrivent.
-
-Valeur par défaut: 0.
-
-## query_profiler_real_time_period_ns {#query_profiler_real_time_period_ns}
-
-Définit la période pour une horloge réelle de la [requête profiler](../../operations/optimizing-performance/sampling-query-profiler.md). La vraie minuterie d'horloge compte le temps d'horloge murale.
-
-Valeurs possibles:
-
--   Nombre entier positif, en nanosecondes.
-
-    Valeurs recommandées:
-
-            - 10000000 (100 times a second) nanoseconds and less for single queries.
-            - 1000000000 (once a second) for cluster-wide profiling.
-
--   0 pour éteindre la minuterie.
-
-Type: [UInt64](../../sql-reference/data-types/int-uint.md).
-
-Valeur par défaut: 1000000000 nanosecondes (une fois par seconde).
-
-Voir aussi:
-
--   Système de table [trace_log](../../operations/system-tables.md#system_tables-trace_log)
-
-## query_profiler_cpu_time_period_ns {#query_profiler_cpu_time_period_ns}
-
-Définit la période pour une minuterie D'horloge CPU du [requête profiler](../../operations/optimizing-performance/sampling-query-profiler.md). Cette minuterie ne compte que le temps CPU.
-
-Valeurs possibles:
-
--   Un nombre entier positif de nanosecondes.
-
-    Valeurs recommandées:
-
-            - 10000000 (100 times a second) nanoseconds and more for single queries.
-            - 1000000000 (once a second) for cluster-wide profiling.
-
--   0 pour éteindre la minuterie.
-
-Type: [UInt64](../../sql-reference/data-types/int-uint.md).
-
-Valeur par défaut: 1000000000 nanosecondes.
-
-Voir aussi:
-
--   Système de table [trace_log](../../operations/system-tables.md#system_tables-trace_log)
-
-## allow_introspection_functions {#settings-allow_introspection_functions}
-
-Active des désactive [obscures fonctions](../../sql-reference/functions/introspection.md) pour le profilage de requête.
-
-Valeurs possibles:
-
--   1 — Introspection functions enabled.
--   0 — Introspection functions disabled.
-
-Valeur par défaut: 0.
-
-**Voir Aussi**
-
--   [Échantillonnage Du Profileur De Requête](../optimizing-performance/sampling-query-profiler.md)
--   Système de table [trace_log](../../operations/system-tables.md#system_tables-trace_log)
-
-## input_format_parallel_parsing {#input-format-parallel-parsing}
-
--   Type: bool
--   Valeur par défaut: True
-
-Activer l'analyse parallèle des formats de données en préservant l'ordre. Pris en charge uniquement pour les formats TSV, TKSV, CSV et jsoneachrow.
-
-## min_chunk_bytes_for_parallel_parsing {#min-chunk-bytes-for-parallel-parsing}
-
--   Type: unsigned int
--   Valeur par défaut: 1 MiB
-
-La taille minimale du bloc en octets, que chaque thread analysera en parallèle.
-
-## output_format_avro_codec {#settings-output_format_avro_codec}
-
-Définit le codec de compression utilisé pour le fichier Avro de sortie.
-
-Type: string
-
-Valeurs possibles:
-
--   `null` — No compression
--   `deflate` — Compress with Deflate (zlib)
--   `snappy` — Compress with [Hargneux](https://google.github.io/snappy/)
-
-Valeur par défaut: `snappy` (si disponible) ou `deflate`.
-
-## output_format_avro_sync_interval {#settings-output_format_avro_sync_interval}
-
-Définit la taille minimale des données (en octets) entre les marqueurs de synchronisation pour le fichier Avro de sortie.
-
-Type: unsigned int
-
-Valeurs possibles: 32 (32 octets) - 1073741824 (1 GiB)
-
-Valeur par défaut: 32768 (32 Ko)
-
-## format_avro_schema_registry_url {#settings-format_avro_schema_registry_url}
-
-Définit L'URL de Registre de schéma Confluent à utiliser avec [AvroConfluent](../../interfaces/formats.md#data-format-avro-confluent) format
-
-Type: URL
-
-Valeur par défaut: vide
-
-## background_pool_size {#background_pool_size}
-
-Définit le nombre de threads effectuant des opérations d'arrière-plan dans les moteurs de table (par exemple, fusionne dans [Moteur MergeTree](../../engines/table-engines/mergetree-family/index.md) table). Ce paramètre est appliqué au démarrage du serveur ClickHouse et ne peut pas être modifié dans une session utilisateur. En ajustant ce paramètre, vous gérez la charge du processeur et du disque. Une taille de pool plus petite utilise moins de ressources CPU et disque, mais les processus d'arrière-plan avancent plus lentement, ce qui pourrait éventuellement avoir un impact sur les performances des requêtes.
-
-Valeurs possibles:
-
--   Tout nombre entier positif.
-
-Valeur par défaut: 16.
-
-[Article Original](https://clickhouse.tech/docs/en/operations/settings/settings/) <!-- hide -->
diff --git a/docs/fr/operations/system-tables.md b/docs/fr/operations/system-tables.md
deleted file mode 100644
index bf875892478..00000000000
--- a/docs/fr/operations/system-tables.md
+++ /dev/null
@@ -1,1168 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 52
-toc_title: "Les Tables Syst\xE8me"
----
-
-# Les Tables Système {#system-tables}
-
-Les tables système sont utilisées pour implémenter une partie des fonctionnalités du système et pour fournir un accès à des informations sur le fonctionnement du système.
-Vous ne pouvez pas supprimer une table système (mais vous pouvez effectuer un détachement).
-Les tables système n'ont pas de fichiers avec des données sur le disque ou de fichiers avec des métadonnées. Le serveur crée toutes les tables système au démarrage.
-Les tables système sont en lecture seule.
-Ils sont situés dans la ‘system’ la base de données.
-
-## système.asynchronous_metrics {#system_tables-asynchronous_metrics}
-
-Contient des mesures qui sont calculées périodiquement en arrière-plan. Par exemple, la quantité de RAM utilisée.
-
-Colonne:
-
--   `metric` ([Chaîne](../sql-reference/data-types/string.md)) — Metric name.
--   `value` ([Float64](../sql-reference/data-types/float.md)) — Metric value.
-
-**Exemple**
-
-``` sql
-SELECT * FROM system.asynchronous_metrics LIMIT 10
-```
-
-``` text
-┌─metric──────────────────────────────────┬──────value─┐
-│ jemalloc.background_thread.run_interval │          0 │
-│ jemalloc.background_thread.num_runs     │          0 │
-│ jemalloc.background_thread.num_threads  │          0 │
-│ jemalloc.retained                       │  422551552 │
-│ jemalloc.mapped                         │ 1682989056 │
-│ jemalloc.resident                       │ 1656446976 │
-│ jemalloc.metadata_thp                   │          0 │
-│ jemalloc.metadata                       │   10226856 │
-│ UncompressedCacheCells                  │          0 │
-│ MarkCacheFiles                          │          0 │
-└─────────────────────────────────────────┴────────────┘
-```
-
-**Voir Aussi**
-
--   [Surveiller](monitoring.md) — Base concepts of ClickHouse monitoring.
--   [système.métrique](#system_tables-metrics) — Contains instantly calculated metrics.
--   [système.événement](#system_tables-events) — Contains a number of events that have occurred.
--   [système.metric_log](#system_tables-metric_log) — Contains a history of metrics values from tables `system.metrics` и `system.events`.
-
-## système.cluster {#system-clusters}
-
-Contient des informations sur les clusters disponibles dans le fichier de configuration et les serveurs en eux.
-
-Colonne:
-
--   `cluster` (String) — The cluster name.
--   `shard_num` (UInt32) — The shard number in the cluster, starting from 1.
--   `shard_weight` (UInt32) — The relative weight of the shard when writing data.
--   `replica_num` (UInt32) — The replica number in the shard, starting from 1.
--   `host_name` (String) — The host name, as specified in the config.
--   `host_address` (String) — The host IP address obtained from DNS.
--   `port` (UInt16) — The port to use for connecting to the server.
--   `user` (String) — The name of the user for connecting to the server.
--   `errors_count` (UInt32) - nombre de fois que cet hôte n'a pas atteint le réplica.
--   `estimated_recovery_time` (UInt32) - secondes restantes jusqu'à ce que le nombre d'erreurs de réplique soit remis à zéro et qu'il soit considéré comme revenu à la normale.
-
-Veuillez noter que `errors_count` est mise à jour une fois par requête à la grappe, mais `estimated_recovery_time` est recalculé sur-demande. Il pourrait donc y avoir un cas de non-zéro `errors_count` et zéro `estimated_recovery_time`, cette requête suivante sera nulle `errors_count` et essayez d'utiliser des répliques comme si elle ne comporte pas d'erreurs.
-
-**Voir aussi**
-
--   [Tableau moteur Distribués](../engines/table-engines/special/distributed.md)
--   [paramètre distributed_replica_error_cap](settings/settings.md#settings-distributed_replica_error_cap)
--   [paramètre distributed_replica_error_half_life](settings/settings.md#settings-distributed_replica_error_half_life)
-
-## système.colonne {#system-columns}
-
-Contient des informations sur les colonnes de toutes les tables.
-
-Vous pouvez utiliser ce tableau pour obtenir des informations similaires à l' [DESCRIBE TABLE](../sql-reference/statements/misc.md#misc-describe-table) requête, mais pour plusieurs tables à la fois.
-
-Le `system.columns` le tableau contient les colonnes suivantes (la colonne type est indiqué entre parenthèses):
-
--   `database` (String) — Database name.
--   `table` (String) — Table name.
--   `name` (String) — Column name.
--   `type` (String) — Column type.
--   `default_kind` (String) — Expression type (`DEFAULT`, `MATERIALIZED`, `ALIAS`) pour la valeur par défaut, ou une chaîne vide si elle n'est pas définie.
--   `default_expression` (String) — Expression for the default value, or an empty string if it is not defined.
--   `data_compressed_bytes` (UInt64) — The size of compressed data, in bytes.
--   `data_uncompressed_bytes` (UInt64) — The size of decompressed data, in bytes.
--   `marks_bytes` (UInt64) — The size of marks, in bytes.
--   `comment` (String) — Comment on the column, or an empty string if it is not defined.
--   `is_in_partition_key` (UInt8) — Flag that indicates whether the column is in the partition expression.
--   `is_in_sorting_key` (UInt8) — Flag that indicates whether the column is in the sorting key expression.
--   `is_in_primary_key` (UInt8) — Flag that indicates whether the column is in the primary key expression.
--   `is_in_sampling_key` (UInt8) — Flag that indicates whether the column is in the sampling key expression.
-
-## système.contributeur {#system-contributors}
-
-Contient des informations sur les donateurs. Tous les constributors dans un ordre aléatoire. L'ordre est aléatoire au moment de l'exécution de la requête.
-
-Colonne:
-
--   `name` (String) — Contributor (author) name from git log.
-
-**Exemple**
-
-``` sql
-SELECT * FROM system.contributors LIMIT 10
-```
-
-``` text
-┌─name─────────────┐
-│ Olga Khvostikova │
-│ Max Vetrov       │
-│ LiuYangkuan      │
-│ svladykin        │
-│ zamulla          │
-│ Šimon Podlipský  │
-│ BayoNet          │
-│ Ilya Khomutov    │
-│ Amy Krishnevsky  │
-│ Loud_Scream      │
-└──────────────────┘
-```
-
-Trouver vous-même dans le tableau, utilisez une requête:
-
-``` sql
-SELECT * FROM system.contributors WHERE name='Olga Khvostikova'
-```
-
-``` text
-┌─name─────────────┐
-│ Olga Khvostikova │
-└──────────────────┘
-```
-
-## système.les bases de données {#system-databases}
-
-Cette table contient une seule colonne de chaîne appelée ‘name’ – the name of a database.
-Chaque base de données que le serveur connaît a une entrée correspondante dans la table.
-Cette table système est utilisée pour implémenter `SHOW DATABASES` requête.
-
-## système.detached_parts {#system_tables-detached_parts}
-
-Contient des informations sur les pièces détachées de [MergeTree](../engines/table-engines/mergetree-family/mergetree.md) table. Le `reason` colonne spécifie pourquoi la pièce a été détachée. Pour les pièces détachées par l'utilisateur, la raison est vide. De telles pièces peuvent être attachées avec [ALTER TABLE ATTACH PARTITION\|PART](../sql-reference/statements/alter.md#alter_attach-partition) commande. Pour la description des autres colonnes, voir [système.partie](#system_tables-parts). Si le nom de pièce n'est pas valide, les valeurs de certaines colonnes peuvent être `NULL`. Ces pièces peuvent être supprimés avec [ALTER TABLE DROP DETACHED PART](../sql-reference/statements/alter.md#alter_drop-detached).
-
-## système.dictionnaire {#system_tables-dictionaries}
-
-Contient des informations sur [dictionnaires externes](../sql-reference/dictionaries/external-dictionaries/external-dicts.md).
-
-Colonne:
-
--   `database` ([Chaîne](../sql-reference/data-types/string.md)) — Name of the database containing the dictionary created by DDL query. Empty string for other dictionaries.
--   `name` ([Chaîne](../sql-reference/data-types/string.md)) — [Nom du dictionnaire](../sql-reference/dictionaries/external-dictionaries/external-dicts-dict.md).
--   `status` ([Enum8](../sql-reference/data-types/enum.md)) — Dictionary status. Possible values:
-    -   `NOT_LOADED` — Dictionary was not loaded because it was not used.
-    -   `LOADED` — Dictionary loaded successfully.
-    -   `FAILED` — Unable to load the dictionary as a result of an error.
-    -   `LOADING` — Dictionary is loading now.
-    -   `LOADED_AND_RELOADING` — Dictionary is loaded successfully, and is being reloaded right now (frequent reasons: [SYSTEM RELOAD DICTIONARY](../sql-reference/statements/system.md#query_language-system-reload-dictionary) requête, délai d'attente, configuration du dictionnaire a changé).
-    -   `FAILED_AND_RELOADING` — Could not load the dictionary as a result of an error and is loading now.
--   `origin` ([Chaîne](../sql-reference/data-types/string.md)) — Path to the configuration file that describes the dictionary.
--   `type` ([Chaîne](../sql-reference/data-types/string.md)) — Type of a dictionary allocation. [Stockage des dictionnaires en mémoire](../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md).
--   `key` — [Type de clé](../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md#ext_dict_structure-key): Touche Numérique ([UInt64](../sql-reference/data-types/int-uint.md#uint-ranges)) or Сomposite key ([Chaîne](../sql-reference/data-types/string.md)) — form “(type 1, type 2, …, type n)”.
--   `attribute.names` ([Tableau](../sql-reference/data-types/array.md)([Chaîne](../sql-reference/data-types/string.md))) — Array of [les noms d'attribut](../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md#ext_dict_structure-attributes) fournis par le dictionnaire.
--   `attribute.types` ([Tableau](../sql-reference/data-types/array.md)([Chaîne](../sql-reference/data-types/string.md))) — Corresponding array of [les types d'attribut](../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md#ext_dict_structure-attributes) qui sont fournis par le dictionnaire.
--   `bytes_allocated` ([UInt64](../sql-reference/data-types/int-uint.md#uint-ranges)) — Amount of RAM allocated for the dictionary.
--   `query_count` ([UInt64](../sql-reference/data-types/int-uint.md#uint-ranges)) — Number of queries since the dictionary was loaded or since the last successful reboot.
--   `hit_rate` ([Float64](../sql-reference/data-types/float.md)) — For cache dictionaries, the percentage of uses for which the value was in the cache.
--   `element_count` ([UInt64](../sql-reference/data-types/int-uint.md#uint-ranges)) — Number of items stored in the dictionary.
--   `load_factor` ([Float64](../sql-reference/data-types/float.md)) — Percentage filled in the dictionary (for a hashed dictionary, the percentage filled in the hash table).
--   `source` ([Chaîne](../sql-reference/data-types/string.md)) — Text describing the [source de données](../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md) pour le dictionnaire.
--   `lifetime_min` ([UInt64](../sql-reference/data-types/int-uint.md#uint-ranges)) — Minimum [vie](../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md) du dictionnaire en mémoire, après quoi ClickHouse tente de recharger le dictionnaire (si `invalidate_query` est définie, alors que si elle a changé). Réglez en quelques secondes.
--   `lifetime_max` ([UInt64](../sql-reference/data-types/int-uint.md#uint-ranges)) — Maximum [vie](../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md) du dictionnaire en mémoire, après quoi ClickHouse tente de recharger le dictionnaire (si `invalidate_query` est définie, alors que si elle a changé). Réglez en quelques secondes.
--   `loading_start_time` ([DateTime](../sql-reference/data-types/datetime.md)) — Start time for loading the dictionary.
--   `last_successful_update_time` ([DateTime](../sql-reference/data-types/datetime.md)) — End time for loading or updating the dictionary. Helps to monitor some troubles with external sources and investigate causes.
--   `loading_duration` ([Float32](../sql-reference/data-types/float.md)) — Duration of a dictionary loading.
--   `last_exception` ([Chaîne](../sql-reference/data-types/string.md)) — Text of the error that occurs when creating or reloading the dictionary if the dictionary couldn't be created.
-
-**Exemple**
-
-Configurez le dictionnaire.
-
-``` sql
-CREATE DICTIONARY dictdb.dict
-(
-    `key` Int64 DEFAULT -1,
-    `value_default` String DEFAULT 'world',
-    `value_expression` String DEFAULT 'xxx' EXPRESSION 'toString(127 * 172)'
-)
-PRIMARY KEY key
-SOURCE(CLICKHOUSE(HOST 'localhost' PORT 9000 USER 'default' TABLE 'dicttbl' DB 'dictdb'))
-LIFETIME(MIN 0 MAX 1)
-LAYOUT(FLAT())
-```
-
-Assurez-vous que le dictionnaire est chargé.
-
-``` sql
-SELECT * FROM system.dictionaries
-```
-
-``` text
-┌─database─┬─name─┬─status─┬─origin──────┬─type─┬─key────┬─attribute.names──────────────────────┬─attribute.types─────┬─bytes_allocated─┬─query_count─┬─hit_rate─┬─element_count─┬───────────load_factor─┬─source─────────────────────┬─lifetime_min─┬─lifetime_max─┬──loading_start_time─┌──last_successful_update_time─┬──────loading_duration─┬─last_exception─┐
-│ dictdb   │ dict │ LOADED │ dictdb.dict │ Flat │ UInt64 │ ['value_default','value_expression'] │ ['String','String'] │           74032 │           0 │        1 │             1 │ 0.0004887585532746823 │ ClickHouse: dictdb.dicttbl │            0 │            1 │ 2020-03-04 04:17:34 │   2020-03-04 04:30:34        │                 0.002 │                │
-└──────────┴──────┴────────┴─────────────┴──────┴────────┴──────────────────────────────────────┴─────────────────────┴─────────────────┴─────────────┴──────────┴───────────────┴───────────────────────┴────────────────────────────┴──────────────┴──────────────┴─────────────────────┴──────────────────────────────┘───────────────────────┴────────────────┘
-```
-
-## système.événement {#system_tables-events}
-
-Contient des informations sur le nombre d'événements survenus dans le système. Par exemple, dans le tableau, vous pouvez trouver combien `SELECT` les requêtes ont été traitées depuis le démarrage du serveur ClickHouse.
-
-Colonne:
-
--   `event` ([Chaîne](../sql-reference/data-types/string.md)) — Event name.
--   `value` ([UInt64](../sql-reference/data-types/int-uint.md)) — Number of events occurred.
--   `description` ([Chaîne](../sql-reference/data-types/string.md)) — Event description.
-
-**Exemple**
-
-``` sql
-SELECT * FROM system.events LIMIT 5
-```
-
-``` text
-┌─event─────────────────────────────────┬─value─┬─description────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
-│ Query                                 │    12 │ Number of queries to be interpreted and potentially executed. Does not include queries that failed to parse or were rejected due to AST size limits, quota limits or limits on the number of simultaneously running queries. May include internal queries initiated by ClickHouse itself. Does not count subqueries.                  │
-│ SelectQuery                           │     8 │ Same as Query, but only for SELECT queries.                                                                                                                                                                                                                │
-│ FileOpen                              │    73 │ Number of files opened.                                                                                                                                                                                                                                    │
-│ ReadBufferFromFileDescriptorRead      │   155 │ Number of reads (read/pread) from a file descriptor. Does not include sockets.                                                                                                                                                                             │
-│ ReadBufferFromFileDescriptorReadBytes │  9931 │ Number of bytes read from file descriptors. If the file is compressed, this will show the compressed data size.                                                                                                                                              │
-└───────────────────────────────────────┴───────┴────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
-```
-
-**Voir Aussi**
-
--   [système.asynchronous_metrics](#system_tables-asynchronous_metrics) — Contains periodically calculated metrics.
--   [système.métrique](#system_tables-metrics) — Contains instantly calculated metrics.
--   [système.metric_log](#system_tables-metric_log) — Contains a history of metrics values from tables `system.metrics` и `system.events`.
--   [Surveiller](monitoring.md) — Base concepts of ClickHouse monitoring.
-
-## système.fonction {#system-functions}
-
-Contient des informations sur les fonctions normales et agrégées.
-
-Colonne:
-
--   `name`(`String`) – The name of the function.
--   `is_aggregate`(`UInt8`) — Whether the function is aggregate.
-
-## système.graphite_retentions {#system-graphite-retentions}
-
-Contient des informations sur les paramètres [graphite_rollup](server-configuration-parameters/settings.md#server_configuration_parameters-graphite) qui sont utilisés dans les tableaux avec [\* GraphiteMergeTree](../engines/table-engines/mergetree-family/graphitemergetree.md) moteur.
-
-Colonne:
-
--   `config_name` (Chaîne) - `graphite_rollup` nom du paramètre.
--   `regexp` (Chaîne) - un modèle pour le nom de la métrique.
--   `function` (Chaîne) - le nom de la fonction d'agrégation.
--   `age` (UInt64) - l'âge minimum des données en secondes.
--   `precision` (UInt64) - comment définir précisément l'âge des données en secondes.
--   `priority` (UInt16) - priorité de motif.
--   `is_default` (UInt8) - indique si le motif est la valeur par défaut.
--   `Tables.database` (Array (String)) - tableau de noms de tables de base de données qui utilisent `config_name` paramètre.
--   `Tables.table` (Array (String)) - tableau de noms de tables qui utilisent `config_name` paramètre.
-
-## système.fusionner {#system-merges}
-
-Contient des informations sur les fusions et les mutations de pièces actuellement en cours pour les tables de la famille MergeTree.
-
-Colonne:
-
--   `database` (String) — The name of the database the table is in.
--   `table` (String) — Table name.
--   `elapsed` (Float64) — The time elapsed (in seconds) since the merge started.
--   `progress` (Float64) — The percentage of completed work from 0 to 1.
--   `num_parts` (UInt64) — The number of pieces to be merged.
--   `result_part_name` (String) — The name of the part that will be formed as the result of merging.
--   `is_mutation` (UInt8) - 1 si ce processus est une mutation partielle.
--   `total_size_bytes_compressed` (UInt64) — The total size of the compressed data in the merged chunks.
--   `total_size_marks` (UInt64) — The total number of marks in the merged parts.
--   `bytes_read_uncompressed` (UInt64) — Number of bytes read, uncompressed.
--   `rows_read` (UInt64) — Number of rows read.
--   `bytes_written_uncompressed` (UInt64) — Number of bytes written, uncompressed.
--   `rows_written` (UInt64) — Number of rows written.
-
-## système.métrique {#system_tables-metrics}
-
-Contient des mesures qui peuvent être calculées instantanément, ou ont une valeur actuelle. Par exemple, le nombre de requêtes traitées ou en cours réplique de retard. Ce tableau est toujours à jour.
-
-Colonne:
-
--   `metric` ([Chaîne](../sql-reference/data-types/string.md)) — Metric name.
--   `value` ([Int64](../sql-reference/data-types/int-uint.md)) — Metric value.
--   `description` ([Chaîne](../sql-reference/data-types/string.md)) — Metric description.
-
-La liste des mesures que vous pouvez trouver dans le [src / Common / CurrentMetrics.rpc](https://github.com/ClickHouse/ClickHouse/blob/master/src/Common/CurrentMetrics.cpp) fichier source de ClickHouse.
-
-**Exemple**
-
-``` sql
-SELECT * FROM system.metrics LIMIT 10
-```
-
-``` text
-┌─metric─────────────────────┬─value─┬─description──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
-│ Query                      │     1 │ Number of executing queries                                                                                                                                                                      │
-│ Merge                      │     0 │ Number of executing background merges                                                                                                                                                            │
-│ PartMutation               │     0 │ Number of mutations (ALTER DELETE/UPDATE)                                                                                                                                                        │
-│ ReplicatedFetch            │     0 │ Number of data parts being fetched from replicas                                                                                                                                                │
-│ ReplicatedSend             │     0 │ Number of data parts being sent to replicas                                                                                                                                                      │
-│ ReplicatedChecks           │     0 │ Number of data parts checking for consistency                                                                                                                                                    │
-│ BackgroundPoolTask         │     0 │ Number of active tasks in BackgroundProcessingPool (merges, mutations, fetches, or replication queue bookkeeping)                                                                                │
-│ BackgroundSchedulePoolTask │     0 │ Number of active tasks in BackgroundSchedulePool. This pool is used for periodic ReplicatedMergeTree tasks, like cleaning old data parts, altering data parts, replica re-initialization, etc.   │
-│ DiskSpaceReservedForMerge  │     0 │ Disk space reserved for currently running background merges. It is slightly more than the total size of currently merging parts.                                                                     │
-│ DistributedSend            │     0 │ Number of connections to remote servers sending data that was INSERTed into Distributed tables. Both synchronous and asynchronous mode.                                                          │
-└────────────────────────────┴───────┴──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
-```
-
-**Voir Aussi**
-
--   [système.asynchronous_metrics](#system_tables-asynchronous_metrics) — Contains periodically calculated metrics.
--   [système.événement](#system_tables-events) — Contains a number of events that occurred.
--   [système.metric_log](#system_tables-metric_log) — Contains a history of metrics values from tables `system.metrics` и `system.events`.
--   [Surveiller](monitoring.md) — Base concepts of ClickHouse monitoring.
-
-## système.metric_log {#system_tables-metric_log}
-
-Contient l'historique des valeurs de métriques des tables `system.metrics` et `system.events` périodiquement vidé sur le disque.
-Pour activer la collection d'historique des métriques `system.metric_log`, créer `/etc/clickhouse-server/config.d/metric_log.xml` avec le contenu suivant:
-
-``` xml
-<yandex>
-    <metric_log>
-        <database>system</database>
-        <table>metric_log</table>
-        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
-        <collect_interval_milliseconds>1000</collect_interval_milliseconds>
-    </metric_log>
-</yandex>
-```
-
-**Exemple**
-
-``` sql
-SELECT * FROM system.metric_log LIMIT 1 FORMAT Vertical;
-```
-
-``` text
-Row 1:
-──────
-event_date:                                                 2020-02-18
-event_time:                                                 2020-02-18 07:15:33
-milliseconds:                                               554
-ProfileEvent_Query:                                         0
-ProfileEvent_SelectQuery:                                   0
-ProfileEvent_InsertQuery:                                   0
-ProfileEvent_FileOpen:                                      0
-ProfileEvent_Seek:                                          0
-ProfileEvent_ReadBufferFromFileDescriptorRead:              1
-ProfileEvent_ReadBufferFromFileDescriptorReadFailed:        0
-ProfileEvent_ReadBufferFromFileDescriptorReadBytes:         0
-ProfileEvent_WriteBufferFromFileDescriptorWrite:            1
-ProfileEvent_WriteBufferFromFileDescriptorWriteFailed:      0
-ProfileEvent_WriteBufferFromFileDescriptorWriteBytes:       56
-...
-CurrentMetric_Query:                                        0
-CurrentMetric_Merge:                                        0
-CurrentMetric_PartMutation:                                 0
-CurrentMetric_ReplicatedFetch:                              0
-CurrentMetric_ReplicatedSend:                               0
-CurrentMetric_ReplicatedChecks:                             0
-...
-```
-
-**Voir aussi**
-
--   [système.asynchronous_metrics](#system_tables-asynchronous_metrics) — Contains periodically calculated metrics.
--   [système.événement](#system_tables-events) — Contains a number of events that occurred.
--   [système.métrique](#system_tables-metrics) — Contains instantly calculated metrics.
--   [Surveiller](monitoring.md) — Base concepts of ClickHouse monitoring.
-
-## système.nombre {#system-numbers}
-
-Cette table contient une seule colonne UInt64 nommée ‘number’ qui contient presque tous les nombres naturels à partir de zéro.
-Vous pouvez utiliser cette table pour les tests, ou si vous avez besoin de faire une recherche de force brute.
-Les lectures de cette table ne sont pas parallélisées.
-
-## système.numbers_mt {#system-numbers-mt}
-
-Le même que ‘system.numbers’ mais les lectures sont parallélisées. Les nombres peuvent être retournés dans n'importe quel ordre.
-Utilisé pour les tests.
-
-## système.un {#system-one}
-
-Cette table contient une seule ligne avec un ‘dummy’ Colonne UInt8 contenant la valeur 0.
-Cette table est utilisée si une requête SELECT ne spécifie pas la clause FROM.
-Ceci est similaire à la table double trouvée dans d'autres SGBD.
-
-## système.partie {#system_tables-parts}
-
-Contient des informations sur les parties de [MergeTree](../engines/table-engines/mergetree-family/mergetree.md) table.
-
-Chaque ligne décrit une partie des données.
-
-Colonne:
-
--   `partition` (String) – The partition name. To learn what a partition is, see the description of the [ALTER](../sql-reference/statements/alter.md#query_language_queries_alter) requête.
-
-    Format:
-
-    -   `YYYYMM` pour le partitionnement automatique par mois.
-    -   `any_string` lors du partitionnement manuel.
-
--   `name` (`String`) – Name of the data part.
-
--   `active` (`UInt8`) – Flag that indicates whether the data part is active. If a data part is active, it's used in a table. Otherwise, it's deleted. Inactive data parts remain after merging.
-
--   `marks` (`UInt64`) – The number of marks. To get the approximate number of rows in a data part, multiply `marks` par la granularité d'index (généralement 8192) (cet indice ne fonctionne pas pour la granularité adaptative).
-
--   `rows` (`UInt64`) – The number of rows.
-
--   `bytes_on_disk` (`UInt64`) – Total size of all the data part files in bytes.
-
--   `data_compressed_bytes` (`UInt64`) – Total size of compressed data in the data part. All the auxiliary files (for example, files with marks) are not included.
-
--   `data_uncompressed_bytes` (`UInt64`) – Total size of uncompressed data in the data part. All the auxiliary files (for example, files with marks) are not included.
-
--   `marks_bytes` (`UInt64`) – The size of the file with marks.
-
--   `modification_time` (`DateTime`) – The time the directory with the data part was modified. This usually corresponds to the time of data part creation.\|
-
--   `remove_time` (`DateTime`) – The time when the data part became inactive.
-
--   `refcount` (`UInt32`) – The number of places where the data part is used. A value greater than 2 indicates that the data part is used in queries or merges.
-
--   `min_date` (`Date`) – The minimum value of the date key in the data part.
-
--   `max_date` (`Date`) – The maximum value of the date key in the data part.
-
--   `min_time` (`DateTime`) – The minimum value of the date and time key in the data part.
-
--   `max_time`(`DateTime`) – The maximum value of the date and time key in the data part.
-
--   `partition_id` (`String`) – ID of the partition.
-
--   `min_block_number` (`UInt64`) – The minimum number of data parts that make up the current part after merging.
-
--   `max_block_number` (`UInt64`) – The maximum number of data parts that make up the current part after merging.
-
--   `level` (`UInt32`) – Depth of the merge tree. Zero means that the current part was created by insert rather than by merging other parts.
-
--   `data_version` (`UInt64`) – Number that is used to determine which mutations should be applied to the data part (mutations with a version higher than `data_version`).
-
--   `primary_key_bytes_in_memory` (`UInt64`) – The amount of memory (in bytes) used by primary key values.
-
--   `primary_key_bytes_in_memory_allocated` (`UInt64`) – The amount of memory (in bytes) reserved for primary key values.
-
--   `is_frozen` (`UInt8`) – Flag that shows that a partition data backup exists. 1, the backup exists. 0, the backup doesn't exist. For more details, see [FREEZE PARTITION](../sql-reference/statements/alter.md#alter_freeze-partition)
-
--   `database` (`String`) – Name of the database.
-
--   `table` (`String`) – Name of the table.
-
--   `engine` (`String`) – Name of the table engine without parameters.
-
--   `path` (`String`) – Absolute path to the folder with data part files.
-
--   `disk` (`String`) – Name of a disk that stores the data part.
-
--   `hash_of_all_files` (`String`) – [sipHash128](../sql-reference/functions/hash-functions.md#hash_functions-siphash128) de fichiers compressés.
-
--   `hash_of_uncompressed_files` (`String`) – [sipHash128](../sql-reference/functions/hash-functions.md#hash_functions-siphash128) de fichiers non compressés (fichiers avec des marques, fichier d'index, etc.).
-
--   `uncompressed_hash_of_compressed_files` (`String`) – [sipHash128](../sql-reference/functions/hash-functions.md#hash_functions-siphash128) des données dans les fichiers compressés comme s'ils étaient non compressé.
-
--   `bytes` (`UInt64`) – Alias for `bytes_on_disk`.
-
--   `marks_size` (`UInt64`) – Alias for `marks_bytes`.
-
-## système.part_log {#system_tables-part-log}
-
-Le `system.part_log` la table est créée uniquement si [part_log](server-configuration-parameters/settings.md#server_configuration_parameters-part-log) serveur paramètre est spécifié.
-
-Ce tableau contient des informations sur les événements survenus avec [les parties de données](../engines/table-engines/mergetree-family/custom-partitioning-key.md) dans le [MergeTree](../engines/table-engines/mergetree-family/mergetree.md) table de famille, telles que l'ajout ou la fusion de données.
-
-Le `system.part_log` le tableau contient les colonnes suivantes:
-
--   `event_type` (Enum) — Type of the event that occurred with the data part. Can have one of the following values:
-    -   `NEW_PART` — Inserting of a new data part.
-    -   `MERGE_PARTS` — Merging of data parts.
-    -   `DOWNLOAD_PART` — Downloading a data part.
-    -   `REMOVE_PART` — Removing or detaching a data part using [DETACH PARTITION](../sql-reference/statements/alter.md#alter_detach-partition).
-    -   `MUTATE_PART` — Mutating of a data part.
-    -   `MOVE_PART` — Moving the data part from the one disk to another one.
--   `event_date` (Date) — Event date.
--   `event_time` (DateTime) — Event time.
--   `duration_ms` (UInt64) — Duration.
--   `database` (String) — Name of the database the data part is in.
--   `table` (String) — Name of the table the data part is in.
--   `part_name` (String) — Name of the data part.
--   `partition_id` (String) — ID of the partition that the data part was inserted to. The column takes the ‘all’ si le partitionnement est par `tuple()`.
--   `rows` (UInt64) — The number of rows in the data part.
--   `size_in_bytes` (UInt64) — Size of the data part in bytes.
--   `merged_from` (Array(String)) — An array of names of the parts which the current part was made up from (after the merge).
--   `bytes_uncompressed` (UInt64) — Size of uncompressed bytes.
--   `read_rows` (UInt64) — The number of rows was read during the merge.
--   `read_bytes` (UInt64) — The number of bytes was read during the merge.
--   `error` (UInt16) — The code number of the occurred error.
--   `exception` (String) — Text message of the occurred error.
-
-Le `system.part_log` la table est créée après la première insertion de données `MergeTree` table.
-
-## système.processus {#system_tables-processes}
-
-Cette table système est utilisée pour implémenter `SHOW PROCESSLIST` requête.
-
-Colonne:
-
--   `user` (String) – The user who made the query. Keep in mind that for distributed processing, queries are sent to remote servers under the `default` utilisateur. Le champ contient le nom d'utilisateur pour une requête spécifique, pas pour une requête que cette requête lancée.
--   `address` (String) – The IP address the request was made from. The same for distributed processing. To track where a distributed query was originally made from, look at `system.processes` sur le serveur du demandeur de requête.
--   `elapsed` (Float64) – The time in seconds since request execution started.
--   `rows_read` (UInt64) – The number of rows read from the table. For distributed processing, on the requestor server, this is the total for all remote servers.
--   `bytes_read` (UInt64) – The number of uncompressed bytes read from the table. For distributed processing, on the requestor server, this is the total for all remote servers.
--   `total_rows_approx` (UInt64) – The approximation of the total number of rows that should be read. For distributed processing, on the requestor server, this is the total for all remote servers. It can be updated during request processing, when new sources to process become known.
--   `memory_usage` (UInt64) – Amount of RAM the request uses. It might not include some types of dedicated memory. See the [max_memory_usage](../operations/settings/query-complexity.md#settings_max_memory_usage) paramètre.
--   `query` (String) – The query text. For `INSERT` il n'inclut pas les données à insérer.
--   `query_id` (String) – Query ID, if defined.
-
-## système.text_log {#system_tables-text_log}
-
-Contient des entrées de journalisation. Niveau de journalisation qui va à cette table peut être limité `text_log.level` paramètre de serveur.
-
-Colonne:
-
--   `event_date` (`Date`) - Date de l'entrée.
--   `event_time` (`DateTime`) - Temps de l'entrée.
--   `microseconds` (`UInt32`) - Microsecondes de l'entrée.
--   `thread_name` (String) — Name of the thread from which the logging was done.
--   `thread_id` (UInt64) — OS thread ID.
--   `level` (`Enum8`) - Niveau d'entrée.
-    -   `'Fatal' = 1`
-    -   `'Critical' = 2`
-    -   `'Error' = 3`
-    -   `'Warning' = 4`
-    -   `'Notice' = 5`
-    -   `'Information' = 6`
-    -   `'Debug' = 7`
-    -   `'Trace' = 8`
--   `query_id` (`String`)- ID de la requête.
--   `logger_name` (`LowCardinality(String)`) - Name of the logger (i.e. `DDLWorker`)
--   `message` (`String`) - Le message lui-même.
--   `revision` (`UInt32`)- Révision ClickHouse.
--   `source_file` (`LowCardinality(String)`)- Fichier Source à partir duquel la journalisation a été effectuée.
--   `source_line` (`UInt64`)- Ligne Source à partir de laquelle la journalisation a été effectuée.
-
-## système.query_log {#system_tables-query_log}
-
-Contient des informations sur l'exécution de requêtes. Pour chaque requête, vous pouvez voir l'Heure de début du traitement, la durée du traitement, les messages d'erreur et d'autres informations.
-
-!!! note "Note"
-    Le tableau ne contient pas les données d'entrée pour `INSERT` requête.
-
-Clickhouse crée cette table uniquement si [query_log](server-configuration-parameters/settings.md#server_configuration_parameters-query-log) serveur paramètre est spécifié. Ce paramètre définit les règles de journalisation, tels que l'intervalle d'enregistrement ou le nom de la table, la requête sera connecté.
-
-Pour activer la journalisation des requêtes, définissez [log_queries](settings/settings.md#settings-log-queries) paramètre 1. Pour plus de détails, voir le [Paramètre](settings/settings.md) section.
-
-Le `system.query_log` table enregistre deux types de requêtes:
-
-1.  Requêtes initiales qui ont été exécutées directement par le client.
-2.  Requêtes enfants initiées par d'autres requêtes (pour l'exécution de requêtes distribuées). Pour ces types de requêtes, des informations sur les requêtes parentes sont affichées dans `initial_*` colonne.
-
-Colonne:
-
--   `type` (`Enum8`) — Type of event that occurred when executing the query. Values:
-    -   `'QueryStart' = 1` — Successful start of query execution.
-    -   `'QueryFinish' = 2` — Successful end of query execution.
-    -   `'ExceptionBeforeStart' = 3` — Exception before the start of query execution.
-    -   `'ExceptionWhileProcessing' = 4` — Exception during the query execution.
--   `event_date` (Date) — Query starting date.
--   `event_time` (DateTime) — Query starting time.
--   `query_start_time` (DateTime) — Start time of query execution.
--   `query_duration_ms` (UInt64) — Duration of query execution.
--   `read_rows` (UInt64) — Number of read rows.
--   `read_bytes` (UInt64) — Number of read bytes.
--   `written_rows` (UInt64) — For `INSERT` des requêtes, le nombre de lignes. Pour les autres requêtes, la valeur de la colonne est 0.
--   `written_bytes` (UInt64) — For `INSERT` des requêtes, le nombre d'octets écrits. Pour les autres requêtes, la valeur de la colonne est 0.
--   `result_rows` (UInt64) — Number of rows in the result.
--   `result_bytes` (UInt64) — Number of bytes in the result.
--   `memory_usage` (UInt64) — Memory consumption by the query.
--   `query` (String) — Query string.
--   `exception` (String) — Exception message.
--   `stack_trace` (String) — Stack trace (a list of methods called before the error occurred). An empty string, if the query is completed successfully.
--   `is_initial_query` (UInt8) — Query type. Possible values:
-    -   1 — Query was initiated by the client.
-    -   0 — Query was initiated by another query for distributed query execution.
--   `user` (String) — Name of the user who initiated the current query.
--   `query_id` (String) — ID of the query.
--   `address` (IPv6) — IP address that was used to make the query.
--   `port` (UInt16) — The client port that was used to make the query.
--   `initial_user` (String) — Name of the user who ran the initial query (for distributed query execution).
--   `initial_query_id` (String) — ID of the initial query (for distributed query execution).
--   `initial_address` (IPv6) — IP address that the parent query was launched from.
--   `initial_port` (UInt16) — The client port that was used to make the parent query.
--   `interface` (UInt8) — Interface that the query was initiated from. Possible values:
-    -   1 — TCP.
-    -   2 — HTTP.
--   `os_user` (String) — OS's username who runs [clickhouse-client](../interfaces/cli.md).
--   `client_hostname` (String) — Hostname of the client machine where the [clickhouse-client](../interfaces/cli.md) ou un autre client TCP est exécuté.
--   `client_name` (String) — The [clickhouse-client](../interfaces/cli.md) ou un autre nom de client TCP.
--   `client_revision` (UInt32) — Revision of the [clickhouse-client](../interfaces/cli.md) ou un autre client TCP.
--   `client_version_major` (UInt32) — Major version of the [clickhouse-client](../interfaces/cli.md) ou un autre client TCP.
--   `client_version_minor` (UInt32) — Minor version of the [clickhouse-client](../interfaces/cli.md) ou un autre client TCP.
--   `client_version_patch` (UInt32) — Patch component of the [clickhouse-client](../interfaces/cli.md) ou une autre version du client TCP.
--   `http_method` (UInt8) — HTTP method that initiated the query. Possible values:
-    -   0 — The query was launched from the TCP interface.
-    -   1 — `GET` la méthode a été utilisée.
-    -   2 — `POST` la méthode a été utilisée.
--   `http_user_agent` (String) — The `UserAgent` en-tête passé dans la requête HTTP.
--   `quota_key` (String) — The “quota key” spécifié dans le [quota](quotas.md) (voir `keyed`).
--   `revision` (UInt32) — ClickHouse revision.
--   `thread_numbers` (Array(UInt32)) — Number of threads that are participating in query execution.
--   `ProfileEvents.Names` (Array(String)) — Counters that measure different metrics. The description of them could be found in the table [système.événement](#system_tables-events)
--   `ProfileEvents.Values` (Array(UInt64)) — Values of metrics that are listed in the `ProfileEvents.Names` colonne.
--   `Settings.Names` (Array(String)) — Names of settings that were changed when the client ran the query. To enable logging changes to settings, set the `log_query_settings` paramètre 1.
--   `Settings.Values` (Array(String)) — Values of settings that are listed in the `Settings.Names` colonne.
-
-Chaque requête crée une ou deux lignes dans le `query_log` le tableau, en fonction de l'état de la requête:
-
-1.  Si l'exécution de la requête est réussie, deux événements de type 1 et 2 sont créés (voir `type` colonne).
-2.  Si une erreur s'est produite pendant le traitement de la requête, deux événements avec les types 1 et 4 sont créés.
-3.  Si une erreur s'est produite avant le lancement de la requête, un seul événement de type 3 est créé.
-
-Par défaut, les journaux sont ajoutés à la table à des intervalles de 7,5 secondes. Vous pouvez définir cet intervalle dans la [query_log](server-configuration-parameters/settings.md#server_configuration_parameters-query-log) configuration du serveur (voir `flush_interval_milliseconds` paramètre). Pour vider les journaux de force du tampon mémoire dans la table, utilisez le `SYSTEM FLUSH LOGS` requête.
-
-Lorsque la table est supprimée manuellement, il sera automatiquement créé à la volée. Notez que tous les précédents journaux seront supprimés.
-
-!!! note "Note"
-    La période de stockage des journaux est illimitée. Les journaux ne sont pas automatiquement supprimés de la table. Vous devez organiser vous-même la suppression des journaux obsolètes.
-
-Vous pouvez spécifier une clé de partitionnement arbitraire pour `system.query_log` la table dans le [query_log](server-configuration-parameters/settings.md#server_configuration_parameters-query-log) configuration du serveur (voir `partition_by` paramètre).
-
-## système.query_thread_log {#system_tables-query-thread-log}
-
-La table contient des informations sur chaque thread d'exécution de requête.
-
-Clickhouse crée cette table uniquement si [query_thread_log](server-configuration-parameters/settings.md#server_configuration_parameters-query-thread-log) serveur paramètre est spécifié. Ce paramètre définit les règles de journalisation, tels que l'intervalle d'enregistrement ou le nom de la table, la requête sera connecté.
-
-Pour activer la journalisation des requêtes, définissez [log_query_threads](settings/settings.md#settings-log-query-threads) paramètre 1. Pour plus de détails, voir le [Paramètre](settings/settings.md) section.
-
-Colonne:
-
--   `event_date` (Date) — the date when the thread has finished execution of the query.
--   `event_time` (DateTime) — the date and time when the thread has finished execution of the query.
--   `query_start_time` (DateTime) — Start time of query execution.
--   `query_duration_ms` (UInt64) — Duration of query execution.
--   `read_rows` (UInt64) — Number of read rows.
--   `read_bytes` (UInt64) — Number of read bytes.
--   `written_rows` (UInt64) — For `INSERT` des requêtes, le nombre de lignes. Pour les autres requêtes, la valeur de la colonne est 0.
--   `written_bytes` (UInt64) — For `INSERT` des requêtes, le nombre d'octets écrits. Pour les autres requêtes, la valeur de la colonne est 0.
--   `memory_usage` (Int64) — The difference between the amount of allocated and freed memory in context of this thread.
--   `peak_memory_usage` (Int64) — The maximum difference between the amount of allocated and freed memory in context of this thread.
--   `thread_name` (String) — Name of the thread.
--   `thread_number` (UInt32) — Internal thread ID.
--   `os_thread_id` (Int32) — OS thread ID.
--   `master_thread_id` (UInt64) — OS initial ID of initial thread.
--   `query` (String) — Query string.
--   `is_initial_query` (UInt8) — Query type. Possible values:
-    -   1 — Query was initiated by the client.
-    -   0 — Query was initiated by another query for distributed query execution.
--   `user` (String) — Name of the user who initiated the current query.
--   `query_id` (String) — ID of the query.
--   `address` (IPv6) — IP address that was used to make the query.
--   `port` (UInt16) — The client port that was used to make the query.
--   `initial_user` (String) — Name of the user who ran the initial query (for distributed query execution).
--   `initial_query_id` (String) — ID of the initial query (for distributed query execution).
--   `initial_address` (IPv6) — IP address that the parent query was launched from.
--   `initial_port` (UInt16) — The client port that was used to make the parent query.
--   `interface` (UInt8) — Interface that the query was initiated from. Possible values:
-    -   1 — TCP.
-    -   2 — HTTP.
--   `os_user` (String) — OS's username who runs [clickhouse-client](../interfaces/cli.md).
--   `client_hostname` (String) — Hostname of the client machine where the [clickhouse-client](../interfaces/cli.md) ou un autre client TCP est exécuté.
--   `client_name` (String) — The [clickhouse-client](../interfaces/cli.md) ou un autre nom de client TCP.
--   `client_revision` (UInt32) — Revision of the [clickhouse-client](../interfaces/cli.md) ou un autre client TCP.
--   `client_version_major` (UInt32) — Major version of the [clickhouse-client](../interfaces/cli.md) ou un autre client TCP.
--   `client_version_minor` (UInt32) — Minor version of the [clickhouse-client](../interfaces/cli.md) ou un autre client TCP.
--   `client_version_patch` (UInt32) — Patch component of the [clickhouse-client](../interfaces/cli.md) ou une autre version du client TCP.
--   `http_method` (UInt8) — HTTP method that initiated the query. Possible values:
-    -   0 — The query was launched from the TCP interface.
-    -   1 — `GET` la méthode a été utilisée.
-    -   2 — `POST` la méthode a été utilisée.
--   `http_user_agent` (String) — The `UserAgent` en-tête passé dans la requête HTTP.
--   `quota_key` (String) — The “quota key” spécifié dans le [quota](quotas.md) (voir `keyed`).
--   `revision` (UInt32) — ClickHouse revision.
--   `ProfileEvents.Names` (Array(String)) — Counters that measure different metrics for this thread. The description of them could be found in the table [système.événement](#system_tables-events)
--   `ProfileEvents.Values` (Array(UInt64)) — Values of metrics for this thread that are listed in the `ProfileEvents.Names` colonne.
-
-Par défaut, les journaux sont ajoutés à la table à des intervalles de 7,5 secondes. Vous pouvez définir cet intervalle dans la [query_thread_log](server-configuration-parameters/settings.md#server_configuration_parameters-query-thread-log) configuration du serveur (voir `flush_interval_milliseconds` paramètre). Pour vider les journaux de force du tampon mémoire dans la table, utilisez le `SYSTEM FLUSH LOGS` requête.
-
-Lorsque la table est supprimée manuellement, il sera automatiquement créé à la volée. Notez que tous les précédents journaux seront supprimés.
-
-!!! note "Note"
-    La période de stockage des journaux est illimitée. Les journaux ne sont pas automatiquement supprimés de la table. Vous devez organiser vous-même la suppression des journaux obsolètes.
-
-Vous pouvez spécifier une clé de partitionnement arbitraire pour `system.query_thread_log` la table dans le [query_thread_log](server-configuration-parameters/settings.md#server_configuration_parameters-query-thread-log) configuration du serveur (voir `partition_by` paramètre).
-
-## système.trace_log {#system_tables-trace_log}
-
-Contient des traces de pile collectées par le profileur de requête d'échantillonnage.
-
-Clickhouse crée cette table lorsque le [trace_log](server-configuration-parameters/settings.md#server_configuration_parameters-trace_log) la section de configuration du serveur est définie. Aussi l' [query_profiler_real_time_period_ns](settings/settings.md#query_profiler_real_time_period_ns) et [query_profiler_cpu_time_period_ns](settings/settings.md#query_profiler_cpu_time_period_ns) paramètres doivent être définis.
-
-Pour analyser les journaux, utilisez `addressToLine`, `addressToSymbol` et `demangle` fonctions d'introspection.
-
-Colonne:
-
--   `event_date` ([Date](../sql-reference/data-types/date.md)) — Date of sampling moment.
-
--   `event_time` ([DateTime](../sql-reference/data-types/datetime.md)) — Timestamp of the sampling moment.
-
--   `timestamp_ns` ([UInt64](../sql-reference/data-types/int-uint.md)) — Timestamp of the sampling moment in nanoseconds.
-
--   `revision` ([UInt32](../sql-reference/data-types/int-uint.md)) — ClickHouse server build revision.
-
-    Lors de la connexion au serveur par `clickhouse-client`, vous voyez la chaîne similaire à `Connected to ClickHouse server version 19.18.1 revision 54429.`. Ce champ contient le `revision` mais pas le `version` d'un serveur.
-
--   `timer_type` ([Enum8](../sql-reference/data-types/enum.md)) — Timer type:
-
-    -   `Real` représente l'horloge murale.
-    -   `CPU` représente le temps CPU.
-
--   `thread_number` ([UInt32](../sql-reference/data-types/int-uint.md)) — Thread identifier.
-
--   `query_id` ([Chaîne](../sql-reference/data-types/string.md)) — Query identifier that can be used to get details about a query that was running from the [query_log](#system_tables-query_log) système de table.
-
--   `trace` ([Tableau (UInt64)](../sql-reference/data-types/array.md)) — Stack trace at the moment of sampling. Each element is a virtual memory address inside ClickHouse server process.
-
-**Exemple**
-
-``` sql
-SELECT * FROM system.trace_log LIMIT 1 \G
-```
-
-``` text
-Row 1:
-──────
-event_date:    2019-11-15
-event_time:    2019-11-15 15:09:38
-revision:      54428
-timer_type:    Real
-thread_number: 48
-query_id:      acc4d61f-5bd1-4a3e-bc91-2180be37c915
-trace:         [94222141367858,94222152240175,94222152325351,94222152329944,94222152330796,94222151449980,94222144088167,94222151682763,94222144088167,94222151682763,94222144088167,94222144058283,94222144059248,94222091840750,94222091842302,94222091831228,94222189631488,140509950166747,140509942945935]
-```
-
-## système.réplique {#system_tables-replicas}
-
-Contient des informations et l'état des tables répliquées résidant sur le serveur local.
-Ce tableau peut être utilisé pour la surveillance. La table contient une ligne pour chaque Répliqué\* table.
-
-Exemple:
-
-``` sql
-SELECT *
-FROM system.replicas
-WHERE table = 'visits'
-FORMAT Vertical
-```
-
-``` text
-Row 1:
-──────
-database:                   merge
-table:                      visits
-engine:                     ReplicatedCollapsingMergeTree
-is_leader:                  1
-can_become_leader:          1
-is_readonly:                0
-is_session_expired:         0
-future_parts:               1
-parts_to_check:             0
-zookeeper_path:             /clickhouse/tables/01-06/visits
-replica_name:               example01-06-1.yandex.ru
-replica_path:               /clickhouse/tables/01-06/visits/replicas/example01-06-1.yandex.ru
-columns_version:            9
-queue_size:                 1
-inserts_in_queue:           0
-merges_in_queue:            1
-part_mutations_in_queue:    0
-queue_oldest_time:          2020-02-20 08:34:30
-inserts_oldest_time:        1970-01-01 00:00:00
-merges_oldest_time:         2020-02-20 08:34:30
-part_mutations_oldest_time: 1970-01-01 00:00:00
-oldest_part_to_get:
-oldest_part_to_merge_to:    20200220_20284_20840_7
-oldest_part_to_mutate_to:
-log_max_index:              596273
-log_pointer:                596274
-last_queue_update:          2020-02-20 08:34:32
-absolute_delay:             0
-total_replicas:             2
-active_replicas:            2
-```
-
-Colonne:
-
--   `database` (`String`) - Nom de base de données
--   `table` (`String`)- Nom de la Table
--   `engine` (`String`)- Nom du moteur de Table
--   `is_leader` (`UInt8`) - Si la réplique est le chef de file.
-    Une seule réplique à la fois peut être le leader. Le leader est responsable de la sélection des fusions d'arrière-plan à effectuer.
-    Notez que les Écritures peuvent être effectuées sur n'importe quel réplica disponible et ayant une session dans ZK, qu'il s'agisse d'un leader.
--   `can_become_leader` (`UInt8`)- Si la réplique peut être élue en tant que leader.
--   `is_readonly` (`UInt8`) - Si la réplique est en mode lecture seule.
-    Ce mode est activé si la configuration n'a pas de sections avec ZooKeeper, si une erreur inconnue s'est produite lors de la réinitialisation des sessions dans ZooKeeper et lors de la réinitialisation des sessions dans ZooKeeper.
--   `is_session_expired` (`UInt8`)- la session avec ZooKeeper a expiré. Fondamentalement le même que `is_readonly`.
--   `future_parts` (`UInt32`)- Le nombre de parties de données qui apparaîtront à la suite D'insertions ou de fusions qui n'ont pas encore été effectuées.
--   `parts_to_check` (`UInt32`) - Le nombre de parties des données dans la file d'attente pour la vérification. Une pièce est placée dans la file d'attente de vérification s'il y a un soupçon qu'elle pourrait être endommagée.
--   `zookeeper_path` (`String`)- Chemin d'accès aux données de la table dans ZooKeeper.
--   `replica_name` (`String`) - Réplique nom de la Gardienne. Différentes répliques d'une même table ont des noms différents.
--   `replica_path` (`String`)- Chemin vers les données de réplique dans ZooKeeper. La même chose que la concaténation ‘zookeeper_path/replicas/replica_path’.
--   `columns_version` (`Int32`)- Numéro de Version de la structure de la table. Indique combien de fois ALTER a été effectué. Si les répliques ont des versions différentes, cela signifie que certaines répliques n'ont pas encore Toutes les modifications.
--   `queue_size` (`UInt32`),- La taille de la file d'attente pour les opérations en attente d'être exécuté. Les opérations comprennent l'insertion de blocs de données, les fusions et certaines autres actions. Il coïncide généralement avec `future_parts`.
--   `inserts_in_queue` (`UInt32`) - Nombre d'insertions de blocs de données qui doivent être faits. Les Insertions sont généralement répliquées assez rapidement. Si ce nombre est grand, cela signifie que quelque chose est faux.
--   `merges_in_queue` (`UInt32`) - Le nombre de fusions en attente d'être fait. Parfois, les fusions sont longues, donc cette valeur peut être supérieure à zéro pendant une longue période.
--   `part_mutations_in_queue` (`UInt32`) - Le nombre de mutations en attente d'être fait.
--   `queue_oldest_time` (`DateTime`) - Si `queue_size` supérieur à 0, indique quand l'opération la plus ancienne a été ajoutée à la file d'attente.
--   `inserts_oldest_time` (`DateTime`) - Voir `queue_oldest_time`
--   `merges_oldest_time` (`DateTime`) - Voir `queue_oldest_time`
--   `part_mutations_oldest_time` (`DateTime`) - Voir `queue_oldest_time`
-
-Les 4 colonnes suivantes ont une valeur non nulle uniquement lorsqu'il y a une session active avec ZK.
-
--   `log_max_index` (`UInt64`) - Maximum nombre d'entrées dans le journal de l'activité générale.
--   `log_pointer` (`UInt64`)- Numéro d'entrée Maximum dans le journal de l'activité générale que le réplica a copié dans sa file d'attente d'exécution, plus un. Si `log_pointer` est beaucoup plus petite que `log_max_index` quelque chose ne va pas.
--   `last_queue_update` (`DateTime`) - Lorsque la file d'attente a été mise à jour la dernière fois.
--   `absolute_delay` (`UInt64`)- Combien de décalage en secondes la réplique actuelle A.
--   `total_replicas` (`UInt8`) - Le nombre total de répliques connues de ce tableau.
--   `active_replicas` (`UInt8`) - Le nombre de répliques de cette table qui ont une session dans ZooKeeper (c'est-à-dire le nombre de répliques fonctionnelles).
-
-Si vous demandez toutes les colonnes, la table peut fonctionner un peu lentement, car plusieurs lectures de ZooKeeper sont faites pour chaque ligne.
-Si vous ne demandez pas les 4 dernières colonnes (log_max_index, log_pointer, total_replicas, active_replicas), la table fonctionne rapidement.
-
-Par exemple, vous pouvez vérifier que tout fonctionne correctement comme ceci:
-
-``` sql
-SELECT
-    database,
-    table,
-    is_leader,
-    is_readonly,
-    is_session_expired,
-    future_parts,
-    parts_to_check,
-    columns_version,
-    queue_size,
-    inserts_in_queue,
-    merges_in_queue,
-    log_max_index,
-    log_pointer,
-    total_replicas,
-    active_replicas
-FROM system.replicas
-WHERE
-       is_readonly
-    OR is_session_expired
-    OR future_parts > 20
-    OR parts_to_check > 10
-    OR queue_size > 20
-    OR inserts_in_queue > 10
-    OR log_max_index - log_pointer > 10
-    OR total_replicas < 2
-    OR active_replicas < total_replicas
-```
-
-Si cette requête ne retourne rien, cela signifie que tout va bien.
-
-## système.paramètre {#system-tables-system-settings}
-
-Contient des informations sur les paramètres de session pour l'utilisateur actuel.
-
-Colonne:
-
--   `name` ([Chaîne](../sql-reference/data-types/string.md)) — Setting name.
--   `value` ([Chaîne](../sql-reference/data-types/string.md)) — Setting value.
--   `changed` ([UInt8](../sql-reference/data-types/int-uint.md#uint-ranges)) — Shows whether a setting is changed from its default value.
--   `description` ([Chaîne](../sql-reference/data-types/string.md)) — Short setting description.
--   `min` ([Nullable](../sql-reference/data-types/nullable.md)([Chaîne](../sql-reference/data-types/string.md))) — Minimum value of the setting, if any is set via [contraintes](settings/constraints-on-settings.md#constraints-on-settings). Si le réglage n'a pas de valeur minimale, contient [NULL](../sql-reference/syntax.md#null-literal).
--   `max` ([Nullable](../sql-reference/data-types/nullable.md)([Chaîne](../sql-reference/data-types/string.md))) — Maximum value of the setting, if any is set via [contraintes](settings/constraints-on-settings.md#constraints-on-settings). Si le réglage n'a pas de valeur maximale, contient [NULL](../sql-reference/syntax.md#null-literal).
--   `readonly` ([UInt8](../sql-reference/data-types/int-uint.md#uint-ranges)) — Shows whether the current user can change the setting:
-    -   `0` — Current user can change the setting.
-    -   `1` — Current user can't change the setting.
-
-**Exemple**
-
-L'exemple suivant montre comment obtenir des informations sur les paramètres dont le nom contient `min_i`.
-
-``` sql
-SELECT *
-FROM system.settings
-WHERE name LIKE '%min_i%'
-```
-
-``` text
-┌─name────────────────────────────────────────┬─value─────┬─changed─┬─description───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┬─min──┬─max──┬─readonly─┐
-│ min_insert_block_size_rows                  │ 1048576   │       0 │ Squash blocks passed to INSERT query to specified size in rows, if blocks are not big enough.                                                                         │ ᴺᵁᴸᴸ │ ᴺᵁᴸᴸ │        0 │
-│ min_insert_block_size_bytes                 │ 268435456 │       0 │ Squash blocks passed to INSERT query to specified size in bytes, if blocks are not big enough.                                                                        │ ᴺᵁᴸᴸ │ ᴺᵁᴸᴸ │        0 │
-│ read_backoff_min_interval_between_events_ms │ 1000      │       0 │ Settings to reduce the number of threads in case of slow reads. Do not pay attention to the event, if the previous one has passed less than a certain amount of time. │ ᴺᵁᴸᴸ │ ᴺᵁᴸᴸ │        0 │
-└─────────────────────────────────────────────┴───────────┴─────────┴───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┴──────┴──────┴──────────┘
-```
-
-À l'aide de `WHERE changed` peut être utile, par exemple, lorsque vous voulez vérifier:
-
--   Indique si les paramètres des fichiers de configuration sont chargés correctement et sont utilisés.
--   Paramètres modifiés dans la session en cours.
-
-<!-- -->
-
-``` sql
-SELECT * FROM system.settings WHERE changed AND name='load_balancing'
-```
-
-**Voir aussi**
-
--   [Paramètre](settings/index.md#session-settings-intro)
--   [Autorisations pour les requêtes](settings/permissions-for-queries.md#settings_readonly)
--   [Contraintes sur les paramètres](settings/constraints-on-settings.md)
-
-## système.tableau_moteurs {#system.table_engines}
-
-``` text
-┌─name───────────────────┬─value───────┐
-│ max_threads            │ 8           │
-│ use_uncompressed_cache │ 0           │
-│ load_balancing         │ random      │
-│ max_memory_usage       │ 10000000000 │
-└────────────────────────┴─────────────┘
-```
-
-## système.merge_tree_settings {#system-merge_tree_settings}
-
-Contient des informations sur les paramètres pour `MergeTree` table.
-
-Colonne:
-
--   `name` (String) — Setting name.
--   `value` (String) — Setting value.
--   `description` (String) — Setting description.
--   `type` (String) — Setting type (implementation specific string value).
--   `changed` (UInt8) — Whether the setting was explicitly defined in the config or explicitly changed.
-
-## système.tableau_moteurs {#system-table-engines}
-
-Contient une description des moteurs de table pris en charge par le serveur et leurs informations de support de fonctionnalité.
-
-Ce tableau contient les colonnes suivantes (le type de colonne est indiqué entre parenthèses):
-
--   `name` (String) — The name of table engine.
--   `supports_settings` (UInt8) — Flag that indicates if table engine supports `SETTINGS` clause.
--   `supports_skipping_indices` (UInt8) — Flag that indicates if table engine supports [sauter les indices](../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-data_skipping-indexes).
--   `supports_ttl` (UInt8) — Flag that indicates if table engine supports [TTL](../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-ttl).
--   `supports_sort_order` (UInt8) — Flag that indicates if table engine supports clauses `PARTITION_BY`, `PRIMARY_KEY`, `ORDER_BY` et `SAMPLE_BY`.
--   `supports_replication` (UInt8) — Flag that indicates if table engine supports [réplication des données](../engines/table-engines/mergetree-family/replication.md).
--   `supports_duduplication` (UInt8) — Flag that indicates if table engine supports data deduplication.
-
-Exemple:
-
-``` sql
-SELECT *
-FROM system.table_engines
-WHERE name in ('Kafka', 'MergeTree', 'ReplicatedCollapsingMergeTree')
-```
-
-``` text
-┌─name──────────────────────────┬─supports_settings─┬─supports_skipping_indices─┬─supports_sort_order─┬─supports_ttl─┬─supports_replication─┬─supports_deduplication─┐
-│ Kafka                         │                 1 │                         0 │                   0 │            0 │                    0 │                      0 │
-│ MergeTree                     │                 1 │                         1 │                   1 │            1 │                    0 │                      0 │
-│ ReplicatedCollapsingMergeTree │                 1 │                         1 │                   1 │            1 │                    1 │                      1 │
-└───────────────────────────────┴───────────────────┴───────────────────────────┴─────────────────────┴──────────────┴──────────────────────┴────────────────────────┘
-```
-
-**Voir aussi**
-
--   Famille MergeTree [les clauses de requête](../engines/table-engines/mergetree-family/mergetree.md#mergetree-query-clauses)
--   Kafka [paramètre](../engines/table-engines/integrations/kafka.md#table_engine-kafka-creating-a-table)
--   Rejoindre [paramètre](../engines/table-engines/special/join.md#join-limitations-and-settings)
-
-## système.table {#system-tables}
-
-Contient les métadonnées de chaque table que le serveur connaît. Les tableaux détachés ne sont pas représentés dans `system.tables`.
-
-Ce tableau contient les colonnes suivantes (le type de colonne est indiqué entre parenthèses):
-
--   `database` (String) — The name of the database the table is in.
-
--   `name` (String) — Table name.
-
--   `engine` (String) — Table engine name (without parameters).
-
--   `is_temporary` (UInt8) - indicateur qui indique si la table est temporaire.
-
--   `data_path` (Chaîne) - chemin d'accès aux données de la table dans le système de fichiers.
-
--   `metadata_path` (Chaîne) - chemin d'accès aux métadonnées de la table dans le système de fichiers.
-
--   `metadata_modification_time` (DateTime) - Heure de la dernière modification des métadonnées de la table.
-
--   `dependencies_database` (Array (String)) - dépendances de base de données.
-
--   `dependencies_table` (Array (String)) - dépendances de Table ([MaterializedView](../engines/table-engines/special/materializedview.md) tables basées sur le tableau actuel).
-
--   `create_table_query` (Chaîne) - la requête qui a été utilisée pour créer la table.
-
--   `engine_full` (Chaîne) - paramètres du moteur de table.
-
--   `partition_key` (String) - l'expression de clé de partition spécifiée dans le tableau.
-
--   `sorting_key` (String) - l'expression de clé de tri spécifiée dans la table.
-
--   `primary_key` (String) - l'expression de clé primaire spécifiée dans la table.
-
--   `sampling_key` (String) - l'expression de clé d'échantillonnage spécifiée dans la table.
-
--   `storage_policy` (String) - La politique de stockage:
-
-    -   [MergeTree](../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-multiple-volumes)
-    -   [Distribué](../engines/table-engines/special/distributed.md#distributed)
-
--   `total_rows` (Nullable (UInt64)) - nombre Total de lignes, s'il est possible de déterminer rapidement le nombre exact de lignes dans la table, sinon `Null` (y compris underying `Buffer` table).
-
--   `total_bytes` (Nullable (UInt64)) - nombre Total d'octets, s'il est possible de déterminer rapidement le nombre exact d'octets pour la table sur le stockage, sinon `Null` (**ne pas** comprend tout de stockage sous-jacent).
-
-    -   If the table stores data on disk, returns used space on disk (i.e. compressed).
-    -   Si la table stocke des données en mémoire, renvoie un nombre approximatif d'octets utilisés en mémoire.
-
-Le `system.tables` le tableau est utilisé dans `SHOW TABLES` implémentation de requête.
-
-## système.zookeeper {#system-zookeeper}
-
-La table n'existe pas si ZooKeeper n'est pas configuré. Permet de lire les données du cluster Zookeeper défini dans la configuration.
-La requête doit avoir un ‘path’ condition d'égalité dans la clause WHERE. C'est le chemin dans ZooKeeper pour les enfants pour lesquels vous souhaitez obtenir des données.
-
-Requête `SELECT * FROM system.zookeeper WHERE path = '/clickhouse'` données de sortie pour tous les enfants `/clickhouse` nœud.
-Pour générer des données pour tous les nœuds racine, écrivez path = ‘/’.
-Si le chemin d'accès spécifié dans ‘path’ n'existe pas, une exception sera levée.
-
-Colonne:
-
--   `name` (String) — The name of the node.
--   `path` (String) — The path to the node.
--   `value` (String) — Node value.
--   `dataLength` (Int32) — Size of the value.
--   `numChildren` (Int32) — Number of descendants.
--   `czxid` (Int64) — ID of the transaction that created the node.
--   `mzxid` (Int64) — ID of the transaction that last changed the node.
--   `pzxid` (Int64) — ID of the transaction that last deleted or added descendants.
--   `ctime` (DateTime) — Time of node creation.
--   `mtime` (DateTime) — Time of the last modification of the node.
--   `version` (Int32) — Node version: the number of times the node was changed.
--   `cversion` (Int32) — Number of added or removed descendants.
--   `aversion` (Int32) — Number of changes to the ACL.
--   `ephemeralOwner` (Int64) — For ephemeral nodes, the ID of the session that owns this node.
-
-Exemple:
-
-``` sql
-SELECT *
-FROM system.zookeeper
-WHERE path = '/clickhouse/tables/01-08/visits/replicas'
-FORMAT Vertical
-```
-
-``` text
-Row 1:
-──────
-name:           example01-08-1.yandex.ru
-value:
-czxid:          932998691229
-mzxid:          932998691229
-ctime:          2015-03-27 16:49:51
-mtime:          2015-03-27 16:49:51
-version:        0
-cversion:       47
-aversion:       0
-ephemeralOwner: 0
-dataLength:     0
-numChildren:    7
-pzxid:          987021031383
-path:           /clickhouse/tables/01-08/visits/replicas
-
-Row 2:
-──────
-name:           example01-08-2.yandex.ru
-value:
-czxid:          933002738135
-mzxid:          933002738135
-ctime:          2015-03-27 16:57:01
-mtime:          2015-03-27 16:57:01
-version:        0
-cversion:       37
-aversion:       0
-ephemeralOwner: 0
-dataLength:     0
-numChildren:    7
-pzxid:          987021252247
-path:           /clickhouse/tables/01-08/visits/replicas
-```
-
-## système.mutation {#system_tables-mutations}
-
-Le tableau contient des informations sur [mutation](../sql-reference/statements/alter.md#alter-mutations) des tables MergeTree et leur progression. Chaque commande de mutation est représentée par une seule ligne. Le tableau comporte les colonnes suivantes:
-
-**base de données**, **table** - Le nom de la base de données et de la table à laquelle la mutation a été appliquée.
-
-**mutation_id** - Le numéro d'identification de la mutation. Pour les tables répliquées ces ID correspondent aux noms znode dans le `<table_path_in_zookeeper>/mutations/` répertoire de la Gardienne. Pour les tables non compliquées, Les Id correspondent aux noms de fichiers dans le répertoire de données de la table.
-
-**commande** - La chaîne de commande mutation (la partie de la requête après `ALTER TABLE [db.]table`).
-
-**create_time** - Quand cette commande de mutation a été soumise pour exécution.
-
-**block_numbers.partition_id**, **block_numbers.nombre** - Une colonne imbriquée. Pour les mutations de tables répliquées, il contient un enregistrement pour chaque partition: l'ID de partition et le numéro de bloc acquis par la mutation (dans chaque partition, seules les parties contenant des blocs avec des nombres inférieurs au numéro de bloc acquis par la mutation dans cette partition seront mutées). Dans les tables non répliquées, les numéros de bloc de toutes les partitions forment une seule séquence. Cela signifie que pour les mutations de tables non répliquées, la colonne contiendra un enregistrement avec un seul numéro de bloc acquis par la mutation.
-
-**parts_to_do** - Le nombre de parties de données qui doivent être mutées pour que la mutation se termine.
-
-**_done** - La mutation est faite? Notez que même si `parts_to_do = 0` il est possible qu'une mutation d'une table répliquée ne soit pas encore effectuée en raison d'un INSERT de longue durée qui créera une nouvelle partie de données qui devra être mutée.
-
-S'il y avait des problèmes avec la mutation de certaines parties, les colonnes suivantes contiennent des informations supplémentaires:
-
-**latest_failed_part** - Le nom de la partie la plus récente qui n'a pas pu être mutée.
-
-**latest_fail_time** - Le temps de la partie la plus récente mutation de l'échec.
-
-**latest_fail_reason** - Le message d'exception qui a provoqué l'échec de la mutation de pièce la plus récente.
-
-## système.disque {#system_tables-disks}
-
-Contient des informations sur les disques définis dans [configuration du serveur](../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-multiple-volumes_configure).
-
-Colonne:
-
--   `name` ([Chaîne](../sql-reference/data-types/string.md)) — Name of a disk in the server configuration.
--   `path` ([Chaîne](../sql-reference/data-types/string.md)) — Path to the mount point in the file system.
--   `free_space` ([UInt64](../sql-reference/data-types/int-uint.md)) — Free space on disk in bytes.
--   `total_space` ([UInt64](../sql-reference/data-types/int-uint.md)) — Disk volume in bytes.
--   `keep_free_space` ([UInt64](../sql-reference/data-types/int-uint.md)) — Amount of disk space that should stay free on disk in bytes. Defined in the `keep_free_space_bytes` paramètre de configuration du disque.
-
-## système.storage_policies {#system_tables-storage_policies}
-
-Contient des informations sur les stratégies de stockage et les volumes définis [configuration du serveur](../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-multiple-volumes_configure).
-
-Colonne:
-
--   `policy_name` ([Chaîne](../sql-reference/data-types/string.md)) — Name of the storage policy.
--   `volume_name` ([Chaîne](../sql-reference/data-types/string.md)) — Volume name defined in the storage policy.
--   `volume_priority` ([UInt64](../sql-reference/data-types/int-uint.md)) — Volume order number in the configuration.
--   `disks` ([Tableau(String)](../sql-reference/data-types/array.md)) — Disk names, defined in the storage policy.
--   `max_data_part_size` ([UInt64](../sql-reference/data-types/int-uint.md)) — Maximum size of a data part that can be stored on volume disks (0 — no limit).
--   `move_factor` ([Float64](../sql-reference/data-types/float.md)) — Ratio of free disk space. When the ratio exceeds the value of configuration parameter, ClickHouse start to move data to the next volume in order.
-
-Si la stratégie de stockage contient plus d'un volume, les informations pour chaque volume sont stockées dans la ligne individuelle de la table.
-
-[Article Original](https://clickhouse.tech/docs/en/operations/system_tables/) <!--hide-->
diff --git a/docs/fr/operations/tips.md b/docs/fr/operations/tips.md
deleted file mode 100644
index dc963e5e27a..00000000000
--- a/docs/fr/operations/tips.md
+++ /dev/null
@@ -1,251 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 58
-toc_title: Recommandations D'Utilisation
----
-
-# Recommandations D'Utilisation {#usage-recommendations}
-
-## Gouverneur de mise à L'échelle du processeur {#cpu-scaling-governor}
-
-Utilisez toujours la `performance` mise à l'échelle gouverneur. Le `on-demand` gouverneur de mise à l'échelle fonctionne bien pire avec une demande constamment élevée.
-
-``` bash
-$ echo 'performance' | sudo tee /sys/devices/system/cpu/cpu*/cpufreq/scaling_governor
-```
-
-## CPU Limitations {#cpu-limitations}
-
-Les processeurs peuvent surchauffer. Utiliser `dmesg` pour voir si la fréquence D'horloge du processeur était limitée en raison de la surchauffe.
-La restriction peut également être définie en externe au niveau du centre de données. Vous pouvez utiliser `turbostat` à surveiller sous une charge.
-
-## RAM {#ram}
-
-Pour de petites quantités de données (jusqu'à ~200 GO en mode compressé), il est préférable d'utiliser autant de mémoire que le volume de données.
-Pour de grandes quantités de données et lors du traitement de requêtes interactives (en ligne), vous devez utiliser une quantité raisonnable de RAM (128 Go ou plus) afin que le sous-ensemble de données chaudes s'intègre dans le cache des pages.
-Même pour des volumes de données d'environ 50 To par serveur, l'utilisation de 128 Go de RAM améliore considérablement les performances des requêtes par rapport à 64 Go.
-
-Ne désactivez pas de surcharge. Valeur `cat /proc/sys/vm/overcommit_memory` devrait être 0 ou 1. Exécuter
-
-``` bash
-$ echo 0 | sudo tee /proc/sys/vm/overcommit_memory
-```
-
-## Huge Pages {#huge-pages}
-
-Toujours désactiver les pages énormes transparentes. Il interfère avec les allocateurs de mémoire, ce qui entraîne une dégradation significative des performances.
-
-``` bash
-$ echo 'never' | sudo tee /sys/kernel/mm/transparent_hugepage/enabled
-```
-
-Utiliser `perf top` pour regarder le temps passé dans le noyau pour la gestion de la mémoire.
-Les pages énormes permanentes n'ont pas non plus besoin d'être allouées.
-
-## Sous-Système De Stockage {#storage-subsystem}
-
-Si votre budget vous permet D'utiliser SSD, utilisez SSD.
-Sinon, utilisez un disque dur. Disques durs SATA 7200 RPM fera l'affaire.
-
-Donner la préférence à un grand nombre de serveurs avec des disques durs locaux sur un plus petit nombre de serveurs avec un disque attaché étagères.
-Mais pour stocker des archives avec des requêtes rares, les étagères fonctionneront.
-
-## RAID {#raid}
-
-Lorsque vous utilisez le disque dur, vous pouvez combiner leur RAID-10, RAID-5, RAID-6 ou RAID-50.
-Pour Linux, le RAID logiciel est meilleur (avec `mdadm`). Nous ne recommandons pas d'utiliser LVM.
-Lors de la création de RAID-10, sélectionnez `far` disposition.
-Si votre budget le permet, choisissez RAID-10.
-
-Si vous avez plus de 4 disques, Utilisez RAID-6 (préféré) ou RAID-50, au lieu de RAID-5.
-Lorsque vous utilisez RAID-5, RAID-6 ou RAID-50, augmentez toujours stripe_cache_size, car la valeur par défaut n'est généralement pas le meilleur choix.
-
-``` bash
-$ echo 4096 | sudo tee /sys/block/md2/md/stripe_cache_size
-```
-
-Calculez le nombre exact à partir du nombre de périphériques et de la taille du bloc, en utilisant la formule: `2 * num_devices * chunk_size_in_bytes / 4096`.
-
-Une taille de bloc de 1024 KO est suffisante pour toutes les configurations RAID.
-Ne définissez jamais la taille du bloc trop petite ou trop grande.
-
-Vous pouvez utiliser RAID-0 sur SSD.
-Quelle que soit L'utilisation du RAID, utilisez toujours la réplication pour la sécurité des données.
-
-Activer NCQ avec une longue file d'attente. Pour HDD, choisissez le planificateur CFQ, et pour SSD, choisissez noop. Ne pas réduire le ‘readahead’ paramètre.
-Pour le disque dur, activez le cache d'écriture.
-
-## Système De Fichiers {#file-system}
-
-Ext4 est l'option la plus fiable. Définir les options de montage `noatime, nobarrier`.
-XFS est également adapté, mais il n'a pas été aussi soigneusement testé avec ClickHouse.
-La plupart des autres systèmes de fichiers devraient également fonctionner correctement. Les systèmes de fichiers avec allocation retardée fonctionnent mieux.
-
-## Le Noyau Linux {#linux-kernel}
-
-N'utilisez pas un noyau Linux obsolète.
-
-## Réseau {#network}
-
-Si vous utilisez IPv6, augmenter la taille du cache.
-Le noyau Linux avant 3.2 avait une multitude de problèmes avec l'implémentation D'IPv6.
-
-Utilisez au moins un réseau de 10 Go, si possible. 1 Go fonctionnera également, mais ce sera bien pire pour patcher des répliques avec des dizaines de téraoctets de données, ou pour traiter des requêtes distribuées avec une grande quantité de données intermédiaires.
-
-## ZooKeeper {#zookeeper}
-
-Vous utilisez probablement déjà ZooKeeper à d'autres fins. Vous pouvez utiliser la même installation de ZooKeeper, si elle n'est pas déjà surchargée.
-
-It's best to use a fresh version of ZooKeeper – 3.4.9 or later. The version in stable Linux distributions may be outdated.
-
-Vous ne devez jamais utiliser de scripts écrits manuellement pour transférer des données entre différents clusters ZooKeeper, car le résultat sera incorrect pour les nœuds séquentiels. Ne jamais utiliser de l' “zkcopy” utilitaire pour la même raison: https://github.com/ksprojects/zkcopy/issues/15
-
-Si vous souhaitez diviser un cluster Zookeeper existant en deux, le bon moyen est d'augmenter le nombre de ses répliques, puis de le reconfigurer en deux clusters indépendants.
-
-N'exécutez pas ZooKeeper sur les mêmes serveurs que ClickHouse. Parce que ZooKeeper est très sensible à la latence et ClickHouse peut utiliser toutes les ressources système disponibles.
-
-Avec les paramètres par défaut, ZooKeeper est une bombe à retardement:
-
-> Le serveur ZooKeeper ne supprime pas les fichiers des anciens snapshots et journaux lors de l'utilisation de la configuration par défaut (voir autopurge), et c'est la responsabilité de l'opérateur.
-
-Cette bombe doit être désamorcée.
-
-La configuration ZooKeeper (3.5.1) ci-dessous est utilisée dans le Yandex.Environnement de production Metrica au 20 mai 2017:
-
-zoo.cfg:
-
-``` bash
-# http://hadoop.apache.org/zookeeper/docs/current/zookeeperAdmin.html
-
-# The number of milliseconds of each tick
-tickTime=2000
-# The number of ticks that the initial
-# synchronization phase can take
-initLimit=30000
-# The number of ticks that can pass between
-# sending a request and getting an acknowledgement
-syncLimit=10
-
-maxClientCnxns=2000
-
-maxSessionTimeout=60000000
-# the directory where the snapshot is stored.
-dataDir=/opt/zookeeper/{{ '{{' }} cluster['name'] {{ '}}' }}/data
-# Place the dataLogDir to a separate physical disc for better performance
-dataLogDir=/opt/zookeeper/{{ '{{' }} cluster['name'] {{ '}}' }}/logs
-
-autopurge.snapRetainCount=10
-autopurge.purgeInterval=1
-
-
-# To avoid seeks ZooKeeper allocates space in the transaction log file in
-# blocks of preAllocSize kilobytes. The default block size is 64M. One reason
-# for changing the size of the blocks is to reduce the block size if snapshots
-# are taken more often. (Also, see snapCount).
-preAllocSize=131072
-
-# Clients can submit requests faster than ZooKeeper can process them,
-# especially if there are a lot of clients. To prevent ZooKeeper from running
-# out of memory due to queued requests, ZooKeeper will throttle clients so that
-# there is no more than globalOutstandingLimit outstanding requests in the
-# system. The default limit is 1,000.ZooKeeper logs transactions to a
-# transaction log. After snapCount transactions are written to a log file a
-# snapshot is started and a new transaction log file is started. The default
-# snapCount is 10,000.
-snapCount=3000000
-
-# If this option is defined, requests will be will logged to a trace file named
-# traceFile.year.month.day.
-#traceFile=
-
-# Leader accepts client connections. Default value is "yes". The leader machine
-# coordinates updates. For higher update throughput at thes slight expense of
-# read throughput the leader can be configured to not accept clients and focus
-# on coordination.
-leaderServes=yes
-
-standaloneEnabled=false
-dynamicConfigFile=/etc/zookeeper-{{ '{{' }} cluster['name'] {{ '}}' }}/conf/zoo.cfg.dynamic
-```
-
-Version de Java:
-
-``` text
-Java(TM) SE Runtime Environment (build 1.8.0_25-b17)
-Java HotSpot(TM) 64-Bit Server VM (build 25.25-b02, mixed mode)
-```
-
-Les paramètres de la JVM:
-
-``` bash
-NAME=zookeeper-{{ '{{' }} cluster['name'] {{ '}}' }}
-ZOOCFGDIR=/etc/$NAME/conf
-
-# TODO this is really ugly
-# How to find out, which jars are needed?
-# seems, that log4j requires the log4j.properties file to be in the classpath
-CLASSPATH="$ZOOCFGDIR:/usr/build/classes:/usr/build/lib/*.jar:/usr/share/zookeeper/zookeeper-3.5.1-metrika.jar:/usr/share/zookeeper/slf4j-log4j12-1.7.5.jar:/usr/share/zookeeper/slf4j-api-1.7.5.jar:/usr/share/zookeeper/servlet-api-2.5-20081211.jar:/usr/share/zookeeper/netty-3.7.0.Final.jar:/usr/share/zookeeper/log4j-1.2.16.jar:/usr/share/zookeeper/jline-2.11.jar:/usr/share/zookeeper/jetty-util-6.1.26.jar:/usr/share/zookeeper/jetty-6.1.26.jar:/usr/share/zookeeper/javacc.jar:/usr/share/zookeeper/jackson-mapper-asl-1.9.11.jar:/usr/share/zookeeper/jackson-core-asl-1.9.11.jar:/usr/share/zookeeper/commons-cli-1.2.jar:/usr/src/java/lib/*.jar:/usr/etc/zookeeper"
-
-ZOOCFG="$ZOOCFGDIR/zoo.cfg"
-ZOO_LOG_DIR=/var/log/$NAME
-USER=zookeeper
-GROUP=zookeeper
-PIDDIR=/var/run/$NAME
-PIDFILE=$PIDDIR/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-JAVA=/usr/bin/java
-ZOOMAIN="org.apache.zookeeper.server.quorum.QuorumPeerMain"
-ZOO_LOG4J_PROP="INFO,ROLLINGFILE"
-JMXLOCALONLY=false
-JAVA_OPTS="-Xms{{ '{{' }} cluster.get('xms','128M') {{ '}}' }} \
-    -Xmx{{ '{{' }} cluster.get('xmx','1G') {{ '}}' }} \
-    -Xloggc:/var/log/$NAME/zookeeper-gc.log \
-    -XX:+UseGCLogFileRotation \
-    -XX:NumberOfGCLogFiles=16 \
-    -XX:GCLogFileSize=16M \
-    -verbose:gc \
-    -XX:+PrintGCTimeStamps \
-    -XX:+PrintGCDateStamps \
-    -XX:+PrintGCDetails
-    -XX:+PrintTenuringDistribution \
-    -XX:+PrintGCApplicationStoppedTime \
-    -XX:+PrintGCApplicationConcurrentTime \
-    -XX:+PrintSafepointStatistics \
-    -XX:+UseParNewGC \
-    -XX:+UseConcMarkSweepGC \
--XX:+CMSParallelRemarkEnabled"
-```
-
-Sel init:
-
-``` text
-description "zookeeper-{{ '{{' }} cluster['name'] {{ '}}' }} centralized coordination service"
-
-start on runlevel [2345]
-stop on runlevel [!2345]
-
-respawn
-
-limit nofile 8192 8192
-
-pre-start script
-    [ -r "/etc/zookeeper-{{ '{{' }} cluster['name'] {{ '}}' }}/conf/environment" ] || exit 0
-    . /etc/zookeeper-{{ '{{' }} cluster['name'] {{ '}}' }}/conf/environment
-    [ -d $ZOO_LOG_DIR ] || mkdir -p $ZOO_LOG_DIR
-    chown $USER:$GROUP $ZOO_LOG_DIR
-end script
-
-script
-    . /etc/zookeeper-{{ '{{' }} cluster['name'] {{ '}}' }}/conf/environment
-    [ -r /etc/default/zookeeper ] && . /etc/default/zookeeper
-    if [ -z "$JMXDISABLE" ]; then
-        JAVA_OPTS="$JAVA_OPTS -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.local.only=$JMXLOCALONLY"
-    fi
-    exec start-stop-daemon --start -c $USER --exec $JAVA --name zookeeper-{{ '{{' }} cluster['name'] {{ '}}' }} \
-        -- -cp $CLASSPATH $JAVA_OPTS -Dzookeeper.log.dir=${ZOO_LOG_DIR} \
-        -Dzookeeper.root.logger=${ZOO_LOG4J_PROP} $ZOOMAIN $ZOOCFG
-end script
-```
-
-{## [Article Original](https://clickhouse.tech/docs/en/operations/tips/) ##}
diff --git a/docs/fr/operations/troubleshooting.md b/docs/fr/operations/troubleshooting.md
deleted file mode 100644
index f7d3153a4d8..00000000000
--- a/docs/fr/operations/troubleshooting.md
+++ /dev/null
@@ -1,146 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 46
-toc_title: "D\xE9pannage"
----
-
-# Dépannage {#troubleshooting}
-
--   [Installation](#troubleshooting-installation-errors)
--   [Connexion au serveur](#troubleshooting-accepts-no-connections)
--   [Traitement des requêtes](#troubleshooting-does-not-process-queries)
--   [Efficacité du traitement des requêtes](#troubleshooting-too-slow)
-
-## Installation {#troubleshooting-installation-errors}
-
-### Vous ne pouvez pas obtenir de paquets deb à partir du référentiel ClickHouse avec Apt-get {#you-cannot-get-deb-packages-from-clickhouse-repository-with-apt-get}
-
--   Vérifiez les paramètres du pare-feu.
--   Si vous ne pouvez pas accéder au référentiel pour quelque raison que ce soit, téléchargez les packages comme décrit dans [Prise en main](../getting-started/index.md) article et les installer manuellement en utilisant le `sudo dpkg -i <packages>` commande. Vous aurez aussi besoin d' `tzdata` paquet.
-
-## Connexion au Serveur {#troubleshooting-accepts-no-connections}
-
-Problèmes possibles:
-
--   Le serveur n'est pas en cours d'exécution.
--   Paramètres de configuration inattendus ou incorrects.
-
-### Le Serveur N'Est Pas En Cours D'Exécution {#server-is-not-running}
-
-**Vérifiez si le serveur est runnnig**
-
-Commande:
-
-``` bash
-$ sudo service clickhouse-server status
-```
-
-Si le serveur n'est pas en cours d'exécution, démarrez-le avec la commande:
-
-``` bash
-$ sudo service clickhouse-server start
-```
-
-**Vérifier les journaux**
-
-Le journal principal de `clickhouse-server` est dans `/var/log/clickhouse-server/clickhouse-server.log` par défaut.
-
-Si le serveur a démarré avec succès, vous devriez voir les chaînes:
-
--   `<Information> Application: starting up.` — Server started.
--   `<Information> Application: Ready for connections.` — Server is running and ready for connections.
-
-Si `clickhouse-server` démarrage a échoué avec une erreur de configuration, vous devriez voir la `<Error>` chaîne avec une description de l'erreur. Exemple:
-
-``` text
-2019.01.11 15:23:25.549505 [ 45 ] {} <Error> ExternalDictionaries: Failed reloading 'event2id' external dictionary: Poco::Exception. Code: 1000, e.code() = 111, e.displayText() = Connection refused, e.what() = Connection refused
-```
-
-Si vous ne voyez pas d'erreur à la fin du fichier, parcourez le fichier entier à partir de la chaîne:
-
-``` text
-<Information> Application: starting up.
-```
-
-Si vous essayez de démarrer une deuxième instance de `clickhouse-server` sur le serveur, vous voyez le journal suivant:
-
-``` text
-2019.01.11 15:25:11.151730 [ 1 ] {} <Information> : Starting ClickHouse 19.1.0 with revision 54413
-2019.01.11 15:25:11.154578 [ 1 ] {} <Information> Application: starting up
-2019.01.11 15:25:11.156361 [ 1 ] {} <Information> StatusFile: Status file ./status already exists - unclean restart. Contents:
-PID: 8510
-Started at: 2019-01-11 15:24:23
-Revision: 54413
-
-2019.01.11 15:25:11.156673 [ 1 ] {} <Error> Application: DB::Exception: Cannot lock file ./status. Another server instance in same directory is already running.
-2019.01.11 15:25:11.156682 [ 1 ] {} <Information> Application: shutting down
-2019.01.11 15:25:11.156686 [ 1 ] {} <Debug> Application: Uninitializing subsystem: Logging Subsystem
-2019.01.11 15:25:11.156716 [ 2 ] {} <Information> BaseDaemon: Stop SignalListener thread
-```
-
-**Voir système.d les journaux**
-
-Si vous ne trouvez aucune information utile dans `clickhouse-server` journaux ou il n'y a pas de journaux, vous pouvez afficher `system.d` journaux à l'aide de la commande:
-
-``` bash
-$ sudo journalctl -u clickhouse-server
-```
-
-**Démarrer clickhouse-server en mode interactif**
-
-``` bash
-$ sudo -u clickhouse /usr/bin/clickhouse-server --config-file /etc/clickhouse-server/config.xml
-```
-
-Cette commande démarre le serveur en tant qu'application interactive avec les paramètres standard du script de démarrage automatique. Dans ce mode `clickhouse-server` imprime tous les messages d'événement dans la console.
-
-### Paramètres De Configuration {#configuration-parameters}
-
-Vérifier:
-
--   Le panneau paramètres.
-
-    Si vous exécutez ClickHouse dans Docker dans un réseau IPv6, assurez-vous que `network=host` est définie.
-
--   Paramètres du point de terminaison.
-
-    Vérifier [listen_host](server-configuration-parameters/settings.md#server_configuration_parameters-listen_host) et [tcp_port](server-configuration-parameters/settings.md#server_configuration_parameters-tcp_port) paramètre.
-
-    Clickhouse server accepte les connexions localhost uniquement par défaut.
-
--   Paramètres du protocole HTTP.
-
-    Vérifiez les paramètres de protocole pour L'API HTTP.
-
--   Paramètres de connexion sécurisés.
-
-    Vérifier:
-
-    -   Le [tcp_port_secure](server-configuration-parameters/settings.md#server_configuration_parameters-tcp_port_secure) paramètre.
-    -   Paramètres pour [SSL sertificates](server-configuration-parameters/settings.md#server_configuration_parameters-openssl).
-
-    Utilisez les paramètres appropriés lors de la connexion. Par exemple, l'utilisation de la `port_secure` paramètre avec `clickhouse_client`.
-
--   Les paramètres de l'utilisateur.
-
-    Vous utilisez peut-être un mauvais nom d'utilisateur ou mot de passe.
-
-## Traitement Des Requêtes {#troubleshooting-does-not-process-queries}
-
-Si ClickHouse ne peut pas traiter la requête, il envoie une description d'erreur au client. Dans le `clickhouse-client` vous obtenez une description de l'erreur dans la console. Si vous utilisez L'interface HTTP, ClickHouse envoie la description de l'erreur dans le corps de la réponse. Exemple:
-
-``` bash
-$ curl 'http://localhost:8123/' --data-binary "SELECT a"
-Code: 47, e.displayText() = DB::Exception: Unknown identifier: a. Note that there are no tables (FROM clause) in your query, context: required_names: 'a' source_tables: table_aliases: private_aliases: column_aliases: public_columns: 'a' masked_columns: array_join_columns: source_columns: , e.what() = DB::Exception
-```
-
-Si vous commencez à `clickhouse-client` avec l' `stack-trace` paramètre, ClickHouse renvoie la trace de la pile du serveur avec la description d'une erreur.
-
-Vous pouvez voir un message sur une connexion rompue. Dans ce cas, vous pouvez répéter la requête. Si la connexion se rompt chaque fois que vous effectuez la requête, vérifiez les journaux du serveur pour détecter les erreurs.
-
-## Efficacité du traitement des requêtes {#troubleshooting-too-slow}
-
-Si vous voyez que ClickHouse fonctionne trop lentement, vous devez profiler la charge sur les ressources du serveur et le réseau pour vos requêtes.
-
-Vous pouvez utiliser l'utilitaire clickhouse-benchmark pour profiler les requêtes. Il indique le nombre de requêtes traitées par seconde, le nombre de lignes traitées par seconde, et les percentiles de temps de traitement des requêtes.
diff --git a/docs/fr/operations/update.md b/docs/fr/operations/update.md
deleted file mode 100644
index e1bfe57b0a3..00000000000
--- a/docs/fr/operations/update.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 47
-toc_title: "Mise \xC0 Jour De ClickHouse"
----
-
-# Mise À Jour De ClickHouse {#clickhouse-update}
-
-Si ClickHouse a été installé à partir de paquets deb, exécutez les commandes suivantes sur le serveur:
-
-``` bash
-$ sudo apt-get update
-$ sudo apt-get install clickhouse-client clickhouse-server
-$ sudo service clickhouse-server restart
-```
-
-Si vous avez installé ClickHouse en utilisant autre chose que les paquets deb recommandés, utilisez la méthode de mise à jour appropriée.
-
-ClickHouse ne prend pas en charge une mise à jour distribuée. L'opération doit être effectuée consécutivement sur chaque serveur séparé. Ne pas mettre à jour tous les serveurs d'un cluster simultanément, ou le cluster sera indisponible pendant un certain temps.
diff --git a/docs/fr/operations/utilities/clickhouse-benchmark.md b/docs/fr/operations/utilities/clickhouse-benchmark.md
deleted file mode 100644
index 975cb09814e..00000000000
--- a/docs/fr/operations/utilities/clickhouse-benchmark.md
+++ /dev/null
@@ -1,156 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 61
-toc_title: clickhouse-benchmark
----
-
-# clickhouse-benchmark {#clickhouse-benchmark}
-
-Se connecte à un serveur ClickHouse et envoie à plusieurs reprises des requêtes spécifiées.
-
-Syntaxe:
-
-``` bash
-$ echo "single query" | clickhouse-benchmark [keys]
-```
-
-ou
-
-``` bash
-$ clickhouse-benchmark [keys] <<< "single query"
-```
-
-Si vous souhaitez envoyer un ensemble de requêtes, créez un fichier texte et placez chaque requête sur la chaîne individuelle de ce fichier. Exemple:
-
-``` sql
-SELECT * FROM system.numbers LIMIT 10000000
-SELECT 1
-```
-
-Ensuite, passez ce fichier à une entrée standard de `clickhouse-benchmark`.
-
-``` bash
-clickhouse-benchmark [keys] < queries_file
-```
-
-## Touches {#clickhouse-benchmark-keys}
-
--   `-c N`, `--concurrency=N` — Number of queries that `clickhouse-benchmark` envoie simultanément. Valeur par défaut: 1.
--   `-d N`, `--delay=N` — Interval in seconds between intermediate reports (set 0 to disable reports). Default value: 1.
--   `-h WORD`, `--host=WORD` — Server host. Default value: `localhost`. Pour l' [mode de comparaison](#clickhouse-benchmark-comparison-mode) vous pouvez utiliser plusieurs `-h` touches.
--   `-p N`, `--port=N` — Server port. Default value: 9000. For the [mode de comparaison](#clickhouse-benchmark-comparison-mode) vous pouvez utiliser plusieurs `-p` touches.
--   `-i N`, `--iterations=N` — Total number of queries. Default value: 0.
--   `-r`, `--randomize` — Random order of queries execution if there is more then one input query.
--   `-s`, `--secure` — Using TLS connection.
--   `-t N`, `--timelimit=N` — Time limit in seconds. `clickhouse-benchmark` arrête d'envoyer des requêtes lorsque le délai spécifié est atteint. Valeur par défaut: 0 (limite de temps désactivée).
--   `--confidence=N` — Level of confidence for T-test. Possible values: 0 (80%), 1 (90%), 2 (95%), 3 (98%), 4 (99%), 5 (99.5%). Default value: 5. In the [mode de comparaison](#clickhouse-benchmark-comparison-mode) `clickhouse-benchmark` effectue les [Test T de L'étudiant indépendant à deux échantillons](https://en.wikipedia.org/wiki/Student%27s_t-test#Independent_two-sample_t-test) tester pour déterminer si les deux distributions ne sont pas différentes avec le niveau de confiance sélectionné.
--   `--cumulative` — Printing cumulative data instead of data per interval.
--   `--database=DATABASE_NAME` — ClickHouse database name. Default value: `default`.
--   `--json=FILEPATH` — JSON output. When the key is set, `clickhouse-benchmark` génère un rapport dans le fichier JSON spécifié.
--   `--user=USERNAME` — ClickHouse user name. Default value: `default`.
--   `--password=PSWD` — ClickHouse user password. Default value: empty string.
--   `--stacktrace` — Stack traces output. When the key is set, `clickhouse-bencmark` affiche les traces d'exceptions de la pile.
--   `--stage=WORD` — Query processing stage at server. ClickHouse stops query processing and returns answer to `clickhouse-benchmark` à l'étape spécifiée. Valeurs possibles: `complete`, `fetch_columns`, `with_mergeable_state`. Valeur par défaut: `complete`.
--   `--help` — Shows the help message.
-
-Si vous voulez appliquer des [paramètre](../../operations/settings/index.md) pour les requêtes, les passer comme une clé `--<session setting name>= SETTING_VALUE`. Exemple, `--max_memory_usage=1048576`.
-
-## Sortie {#clickhouse-benchmark-output}
-
-Par défaut, `clickhouse-benchmark` les rapports de chaque `--delay` intervalle.
-
-Exemple de rapport:
-
-``` text
-Queries executed: 10.
-
-localhost:9000, queries 10, QPS: 6.772, RPS: 67904487.440, MiB/s: 518.070, result RPS: 67721584.984, result MiB/s: 516.675.
-
-0.000%      0.145 sec.
-10.000%     0.146 sec.
-20.000%     0.146 sec.
-30.000%     0.146 sec.
-40.000%     0.147 sec.
-50.000%     0.148 sec.
-60.000%     0.148 sec.
-70.000%     0.148 sec.
-80.000%     0.149 sec.
-90.000%     0.150 sec.
-95.000%     0.150 sec.
-99.000%     0.150 sec.
-99.900%     0.150 sec.
-99.990%     0.150 sec.
-```
-
-Dans le rapport, vous pouvez trouver:
-
--   Nombre de requêtes dans le `Queries executed:` champ.
-
--   Le statut de chaîne de caractères contenant (dans l'ordre):
-
-    -   Point de terminaison du serveur ClickHouse.
-    -   Nombre de requêtes traitées.
-    -   QPS: QPS: combien de requêtes serveur effectuées par seconde pendant une période spécifiée dans le `--delay` argument.
-    -   RPS: combien de lignes le serveur a lues par seconde pendant une période spécifiée dans `--delay` argument.
-    -   MiB/ s: combien de mebibytes serveur lus par seconde pendant une période spécifiée dans le `--delay` argument.
-    -   résultat RPS: combien de lignes placées par le serveur au résultat d'une requête par seconde pendant une période spécifiée dans le `--delay` argument.
-    -   MiB / s de résultat. combien de mibibytes placés par le serveur au résultat d'une requête par seconde pendant une période spécifiée dans `--delay` argument.
-
--   Percentiles du temps d'exécution des requêtes.
-
-## Mode De Comparaison {#clickhouse-benchmark-comparison-mode}
-
-`clickhouse-benchmark` peut comparer les performances pour deux serveurs clickhouse en cours d'exécution.
-
-Pour utiliser le mode de comparaison, spécifiez les points de terminaison des deux serveurs par deux paires de `--host`, `--port` touches. Clés appariées ensemble par position dans la liste des arguments, la première `--host` est assorti avec le premier `--port` et ainsi de suite. `clickhouse-benchmark` établit les connexions aux serveurs, puis envoie des requêtes. Chaque requête adressée à un serveur sélectionné au hasard. Les résultats sont présentés pour chaque serveur séparément.
-
-## Exemple {#clickhouse-benchmark-example}
-
-``` bash
-$ echo "SELECT * FROM system.numbers LIMIT 10000000 OFFSET 10000000" | clickhouse-benchmark -i 10
-```
-
-``` text
-Loaded 1 queries.
-
-Queries executed: 6.
-
-localhost:9000, queries 6, QPS: 6.153, RPS: 123398340.957, MiB/s: 941.455, result RPS: 61532982.200, result MiB/s: 469.459.
-
-0.000%      0.159 sec.
-10.000%     0.159 sec.
-20.000%     0.159 sec.
-30.000%     0.160 sec.
-40.000%     0.160 sec.
-50.000%     0.162 sec.
-60.000%     0.164 sec.
-70.000%     0.165 sec.
-80.000%     0.166 sec.
-90.000%     0.166 sec.
-95.000%     0.167 sec.
-99.000%     0.167 sec.
-99.900%     0.167 sec.
-99.990%     0.167 sec.
-
-
-
-Queries executed: 10.
-
-localhost:9000, queries 10, QPS: 6.082, RPS: 121959604.568, MiB/s: 930.478, result RPS: 60815551.642, result MiB/s: 463.986.
-
-0.000%      0.159 sec.
-10.000%     0.159 sec.
-20.000%     0.160 sec.
-30.000%     0.163 sec.
-40.000%     0.164 sec.
-50.000%     0.165 sec.
-60.000%     0.166 sec.
-70.000%     0.166 sec.
-80.000%     0.167 sec.
-90.000%     0.167 sec.
-95.000%     0.170 sec.
-99.000%     0.172 sec.
-99.900%     0.172 sec.
-99.990%     0.172 sec.
-```
diff --git a/docs/fr/operations/utilities/clickhouse-copier.md b/docs/fr/operations/utilities/clickhouse-copier.md
deleted file mode 100644
index da96c41e8f2..00000000000
--- a/docs/fr/operations/utilities/clickhouse-copier.md
+++ /dev/null
@@ -1,176 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 59
-toc_title: clickhouse-copieur
----
-
-# clickhouse-copieur {#clickhouse-copier}
-
-Copie les données des tables d'un cluster vers des tables d'un autre cluster (ou du même cluster).
-
-Vous pouvez exécuter plusieurs `clickhouse-copier` instances sur différents serveurs pour effectuer le même travail. ZooKeeper est utilisé pour synchroniser les processus.
-
-Après le démarrage de, `clickhouse-copier`:
-
--   Se connecte à ZooKeeper et reçoit:
-
-    -   La copie de tâches.
-    -   L'état de la copie d'emplois.
-
--   Il effectue les travaux.
-
-    Chaque processus en cours choisit le “closest” eclat du cluster source et copie les données dans le cluster de destination, la refragmentation les données si nécessaire.
-
-`clickhouse-copier` suit les changements dans ZooKeeper et les applique à la volée.
-
-Pour réduire le trafic réseau, nous vous recommandons de `clickhouse-copier` sur le même serveur où se trouvent les données source.
-
-## Course Clickhouse-copieur {#running-clickhouse-copier}
-
-L'utilitaire doit être exécuté manuellement:
-
-``` bash
-$ clickhouse-copier copier --daemon --config zookeeper.xml --task-path /task/path --base-dir /path/to/dir
-```
-
-Paramètre:
-
--   `daemon` — Starts `clickhouse-copier` en mode démon.
--   `config` — The path to the `zookeeper.xml` fichier avec les paramètres pour la connexion à la Gardienne.
--   `task-path` — The path to the ZooKeeper node. This node is used for syncing `clickhouse-copier` processus et stockage des tâches. Les tâches sont stockées dans `$task-path/description`.
--   `task-file` — Optional path to file with task configuration for initial upload to ZooKeeper.
--   `task-upload-force` — Force upload `task-file` même si le nœud existe déjà.
--   `base-dir` — The path to logs and auxiliary files. When it starts, `clickhouse-copier` crée `clickhouse-copier_YYYYMMHHSS_<PID>` les sous-répertoires `$base-dir`. Si ce paramètre est omis, les répertoires sont créés dans le répertoire où `clickhouse-copier` a été lancé.
-
-## Format de Zookeeper.XML {#format-of-zookeeper-xml}
-
-``` xml
-<yandex>
-    <logger>
-        <level>trace</level>
-        <size>100M</size>
-        <count>3</count>
-    </logger>
-
-    <zookeeper>
-        <node index="1">
-            <host>127.0.0.1</host>
-            <port>2181</port>
-        </node>
-    </zookeeper>
-</yandex>
-```
-
-## Configuration des tâches de copie {#configuration-of-copying-tasks}
-
-``` xml
-<yandex>
-    <!-- Configuration of clusters as in an ordinary server config -->
-    <remote_servers>
-        <source_cluster>
-            <shard>
-                <internal_replication>false</internal_replication>
-                    <replica>
-                        <host>127.0.0.1</host>
-                        <port>9000</port>
-                    </replica>
-            </shard>
-            ...
-        </source_cluster>
-
-        <destination_cluster>
-        ...
-        </destination_cluster>
-    </remote_servers>
-
-    <!-- How many simultaneously active workers are possible. If you run more workers superfluous workers will sleep. -->
-    <max_workers>2</max_workers>
-
-    <!-- Setting used to fetch (pull) data from source cluster tables -->
-    <settings_pull>
-        <readonly>1</readonly>
-    </settings_pull>
-
-    <!-- Setting used to insert (push) data to destination cluster tables -->
-    <settings_push>
-        <readonly>0</readonly>
-    </settings_push>
-
-    <!-- Common setting for fetch (pull) and insert (push) operations. Also, copier process context uses it.
-         They are overlaid by <settings_pull/> and <settings_push/> respectively. -->
-    <settings>
-        <connect_timeout>3</connect_timeout>
-        <!-- Sync insert is set forcibly, leave it here just in case. -->
-        <insert_distributed_sync>1</insert_distributed_sync>
-    </settings>
-
-    <!-- Copying tasks description.
-         You could specify several table task in the same task description (in the same ZooKeeper node), they will be performed
-         sequentially.
-    -->
-    <tables>
-        <!-- A table task, copies one table. -->
-        <table_hits>
-            <!-- Source cluster name (from <remote_servers/> section) and tables in it that should be copied -->
-            <cluster_pull>source_cluster</cluster_pull>
-            <database_pull>test</database_pull>
-            <table_pull>hits</table_pull>
-
-            <!-- Destination cluster name and tables in which the data should be inserted -->
-            <cluster_push>destination_cluster</cluster_push>
-            <database_push>test</database_push>
-            <table_push>hits2</table_push>
-
-            <!-- Engine of destination tables.
-                 If destination tables have not be created, workers create them using columns definition from source tables and engine
-                 definition from here.
-
-                 NOTE: If the first worker starts insert data and detects that destination partition is not empty then the partition will
-                 be dropped and refilled, take it into account if you already have some data in destination tables. You could directly
-                 specify partitions that should be copied in <enabled_partitions/>, they should be in quoted format like partition column of
-                 system.parts table.
-            -->
-            <engine>
-            ENGINE=ReplicatedMergeTree('/clickhouse/tables/{cluster}/{shard}/hits2', '{replica}')
-            PARTITION BY toMonday(date)
-            ORDER BY (CounterID, EventDate)
-            </engine>
-
-            <!-- Sharding key used to insert data to destination cluster -->
-            <sharding_key>jumpConsistentHash(intHash64(UserID), 2)</sharding_key>
-
-            <!-- Optional expression that filter data while pull them from source servers -->
-            <where_condition>CounterID != 0</where_condition>
-
-            <!-- This section specifies partitions that should be copied, other partition will be ignored.
-                 Partition names should have the same format as
-                 partition column of system.parts table (i.e. a quoted text).
-                 Since partition key of source and destination cluster could be different,
-                 these partition names specify destination partitions.
-
-                 NOTE: In spite of this section is optional (if it is not specified, all partitions will be copied),
-                 it is strictly recommended to specify them explicitly.
-                 If you already have some ready partitions on destination cluster they
-                 will be removed at the start of the copying since they will be interpeted
-                 as unfinished data from the previous copying!!!
-            -->
-            <enabled_partitions>
-                <partition>'2018-02-26'</partition>
-                <partition>'2018-03-05'</partition>
-                ...
-            </enabled_partitions>
-        </table_hits>
-
-        <!-- Next table to copy. It is not copied until previous table is copying. -->
-        </table_visits>
-        ...
-        </table_visits>
-        ...
-    </tables>
-</yandex>
-```
-
-`clickhouse-copier` suit les changements dans `/task/path/description` et les applique à la volée. Par exemple, si vous modifiez la valeur de `max_workers`, le nombre de processus exécutant des tâches changera également.
-
-[Article Original](https://clickhouse.tech/docs/en/operations/utils/clickhouse-copier/) <!--hide-->
diff --git a/docs/fr/operations/utilities/clickhouse-local.md b/docs/fr/operations/utilities/clickhouse-local.md
deleted file mode 100644
index 5dfac0d89ca..00000000000
--- a/docs/fr/operations/utilities/clickhouse-local.md
+++ /dev/null
@@ -1,81 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 60
-toc_title: clickhouse-local
----
-
-# clickhouse-local {#clickhouse-local}
-
-Le `clickhouse-local` programme vous permet d'effectuer un traitement rapide sur les fichiers locaux, sans avoir à déployer et configurer le serveur ClickHouse.
-
-Accepte les données qui représentent des tables et les interroge en utilisant [Clickhouse dialecte SQL](../../sql-reference/index.md).
-
-`clickhouse-local` utilise le même noyau que clickhouse server, de sorte qu'il prend en charge la plupart des fonctionnalités et le même ensemble de formats et de moteurs de table.
-
-Par défaut `clickhouse-local` n'a pas accès aux données sur le même hôte, mais il prend en charge le chargement de la configuration du serveur à l'aide `--config-file` argument.
-
-!!! warning "Avertissement"
-    Il n'est pas recommandé de charger la configuration du serveur de production dans `clickhouse-local` parce que les données peuvent être endommagées en cas d'erreur humaine.
-
-## Utilisation {#usage}
-
-Utilisation de base:
-
-``` bash
-$ clickhouse-local --structure "table_structure" --input-format "format_of_incoming_data" -q "query"
-```
-
-Argument:
-
--   `-S`, `--structure` — table structure for input data.
--   `-if`, `--input-format` — input format, `TSV` par défaut.
--   `-f`, `--file` — path to data, `stdin` par défaut.
--   `-q` `--query` — queries to execute with `;` comme délimiteur.
--   `-N`, `--table` — table name where to put output data, `table` par défaut.
--   `-of`, `--format`, `--output-format` — output format, `TSV` par défaut.
--   `--stacktrace` — whether to dump debug output in case of exception.
--   `--verbose` — more details on query execution.
--   `-s` — disables `stderr` journalisation.
--   `--config-file` — path to configuration file in same format as for ClickHouse server, by default the configuration empty.
--   `--help` — arguments references for `clickhouse-local`.
-
-Il existe également des arguments pour chaque variable de configuration de ClickHouse qui sont plus couramment utilisés à la place de `--config-file`.
-
-## Exemple {#examples}
-
-``` bash
-$ echo -e "1,2\n3,4" | clickhouse-local -S "a Int64, b Int64" -if "CSV" -q "SELECT * FROM table"
-Read 2 rows, 32.00 B in 0.000 sec., 5182 rows/sec., 80.97 KiB/sec.
-1   2
-3   4
-```
-
-Exemple précédent est le même que:
-
-``` bash
-$ echo -e "1,2\n3,4" | clickhouse-local -q "CREATE TABLE table (a Int64, b Int64) ENGINE = File(CSV, stdin); SELECT a, b FROM table; DROP TABLE table"
-Read 2 rows, 32.00 B in 0.000 sec., 4987 rows/sec., 77.93 KiB/sec.
-1   2
-3   4
-```
-
-Maintenant, nous allons sortie utilisateur de mémoire pour chaque utilisateur Unix:
-
-``` bash
-$ ps aux | tail -n +2 | awk '{ printf("%s\t%s\n", $1, $4) }' | clickhouse-local -S "user String, mem Float64" -q "SELECT user, round(sum(mem), 2) as memTotal FROM table GROUP BY user ORDER BY memTotal DESC FORMAT Pretty"
-```
-
-``` text
-Read 186 rows, 4.15 KiB in 0.035 sec., 5302 rows/sec., 118.34 KiB/sec.
-┏━━━━━━━━━━┳━━━━━━━━━━┓
-┃ user     ┃ memTotal ┃
-┡━━━━━━━━━━╇━━━━━━━━━━┩
-│ bayonet  │    113.5 │
-├──────────┼──────────┤
-│ root     │      8.8 │
-├──────────┼──────────┤
-...
-```
-
-[Article Original](https://clickhouse.tech/docs/en/operations/utils/clickhouse-local/) <!--hide-->
diff --git a/docs/fr/operations/utilities/index.md b/docs/fr/operations/utilities/index.md
deleted file mode 100644
index 51a250bb996..00000000000
--- a/docs/fr/operations/utilities/index.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: Utilitaire
-toc_priority: 56
-toc_title: "Aper\xE7u"
----
-
-# Clickhouse Utilitaire {#clickhouse-utility}
-
--   [clickhouse-local](clickhouse-local.md) — Allows running SQL queries on data without stopping the ClickHouse server, similar to how `awk` ne ce.
--   [clickhouse-copieur](clickhouse-copier.md) — Copies (and reshards) data from one cluster to another cluster.
--   [clickhouse-benchmark](clickhouse-benchmark.md) — Loads server with the custom queries and settings.
-
-[Article Original](https://clickhouse.tech/docs/en/operations/utils/) <!--hide-->
diff --git a/docs/fr/sql-reference/aggregate-functions/combinators.md b/docs/fr/sql-reference/aggregate-functions/combinators.md
deleted file mode 100644
index 1aabd34051b..00000000000
--- a/docs/fr/sql-reference/aggregate-functions/combinators.md
+++ /dev/null
@@ -1,245 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 37
-toc_title: Combinators
----
-
-# Combinateurs De Fonction D'Agrégat {#aggregate_functions_combinators}
-
-Le nom d'une fonction d'agrégat peut avoir un suffixe ajouté. Cela change la façon dont la fonction d'agrégation fonctionne.
-
-## -Si {#agg-functions-combinator-if}
-
-The suffix -If can be appended to the name of any aggregate function. In this case, the aggregate function accepts an extra argument – a condition (Uint8 type). The aggregate function processes only the rows that trigger the condition. If the condition was not triggered even once, it returns a default value (usually zeros or empty strings).
-
-Exemple: `sumIf(column, cond)`, `countIf(cond)`, `avgIf(x, cond)`, `quantilesTimingIf(level1, level2)(x, cond)`, `argMinIf(arg, val, cond)` et ainsi de suite.
-
-Avec les fonctions d'agrégat conditionnel, vous pouvez calculer des agrégats pour plusieurs conditions à la fois, sans utiliser de sous-requêtes et `JOIN`s. Par exemple, dans Yandex.Metrica, les fonctions d'agrégat conditionnel sont utilisées pour implémenter la fonctionnalité de comparaison de segment.
-
-## -Tableau {#agg-functions-combinator-array}
-
-Le Tableau suffixe peut être ajouté à toute fonction d'agrégation. Dans ce cas, la fonction d'agrégation des arguments de la ‘Array(T)’ type (tableaux) au lieu de ‘T’ tapez les arguments. Si la fonction aggregate accepte plusieurs arguments, il doit s'agir de tableaux de longueurs égales. Lors du traitement des tableaux, la fonction d'agrégation fonctionne comme la fonction d'agrégation d'origine sur tous les éléments du tableau.
-
-Exemple 1: `sumArray(arr)` - Totalise tous les éléments de tous ‘arr’ tableau. Dans cet exemple, il aurait pu être écrit plus simplement: `sum(arraySum(arr))`.
-
-Exemple 2: `uniqArray(arr)` – Counts the number of unique elements in all ‘arr’ tableau. Cela pourrait être fait d'une manière plus facile: `uniq(arrayJoin(arr))` mais ce n'est pas toujours possible d'ajouter des ‘arrayJoin’ pour une requête.
-
-\- Si et-tableau peut être combiné. Cependant, ‘Array’ doit venir en premier, puis ‘If’. Exemple: `uniqArrayIf(arr, cond)`, `quantilesTimingArrayIf(level1, level2)(arr, cond)`. En raison de cet ordre, le ‘cond’ argument ne sera pas un tableau.
-
-## -État {#agg-functions-combinator-state}
-
-Si vous appliquez ce combinateur, la fonction d'agrégation ne renvoie pas la valeur résultante (par exemple le nombre de valeurs uniques pour [uniq](reference.md#agg_function-uniq) la fonction), mais un état intermédiaire de l'agrégation (pour `uniq`, c'est la table de hachage pour calculer le nombre de valeurs uniques). C'est un `AggregateFunction(...)` qui peuvent être utilisés pour un traitement ultérieur ou stockés dans un tableau pour terminer l'agrégation plus tard.
-
-Pour travailler avec ces états, utilisez:
-
--   [AggregatingMergeTree](../../engines/table-engines/mergetree-family/aggregatingmergetree.md) tableau moteur.
--   [finalizeAggregation](../../sql-reference/functions/other-functions.md#function-finalizeaggregation) fonction.
--   [runningAccumulate](../../sql-reference/functions/other-functions.md#function-runningaccumulate) fonction.
--   [-Fusionner](#aggregate_functions_combinators-merge) combinator.
--   [-MergeState](#aggregate_functions_combinators-mergestate) combinator.
-
-## -Fusionner {#aggregate_functions_combinators-merge}
-
-Si vous appliquez ce combinateur, la fonction d'agrégation prend l'état d'agrégation intermédiaire comme argument, combine les États pour terminer l'agrégation et renvoie la valeur résultante.
-
-## -MergeState {#aggregate_functions_combinators-mergestate}
-
-Fusionne les États d'agrégation intermédiaires de la même manière que le combinateur-Merge. Cependant, il ne renvoie pas la valeur résultante, mais un État d'agrégation intermédiaire, similaire au combinateur-State.
-
-## - ForEach {#agg-functions-combinator-foreach}
-
-Convertit une fonction d'agrégation pour les tables en une fonction d'agrégation pour les tableaux qui agrège les éléments de tableau correspondants et renvoie un tableau de résultats. Exemple, `sumForEach` pour les tableaux `[1, 2]`, `[3, 4, 5]`et`[6, 7]`renvoie le résultat `[10, 13, 5]` après avoir additionné les éléments de tableau correspondants.
-
-## - OrDefault {#agg-functions-combinator-ordefault}
-
-Modifie le comportement d'une fonction d'agrégat.
-
-Si une fonction d'agrégation n'a pas de valeurs d'entrée, avec ce combinateur, elle renvoie la valeur par défaut pour son type de données de retour. S'applique aux fonctions d'agrégation qui peuvent prendre des données d'entrée vides.
-
-`-OrDefault` peut être utilisé avec d'autres combinators.
-
-**Syntaxe**
-
-``` sql
-<aggFunction>OrDefault(x)
-```
-
-**Paramètre**
-
--   `x` — Aggregate function parameters.
-
-**Valeurs renvoyées**
-
-Renvoie la valeur par défaut du type de retour d'une fonction d'agrégation s'il n'y a rien à agréger.
-
-Le Type dépend de la fonction d'agrégation utilisée.
-
-**Exemple**
-
-Requête:
-
-``` sql
-SELECT avg(number), avgOrDefault(number) FROM numbers(0)
-```
-
-Résultat:
-
-``` text
-┌─avg(number)─┬─avgOrDefault(number)─┐
-│         nan │                    0 │
-└─────────────┴──────────────────────┘
-```
-
-Également `-OrDefault` peut être utilisé avec un autre combinateur. Il est utile lorsque la fonction d'agrégation n'accepte pas l'entrée vide.
-
-Requête:
-
-``` sql
-SELECT avgOrDefaultIf(x, x > 10)
-FROM
-(
-    SELECT toDecimal32(1.23, 2) AS x
-)
-```
-
-Résultat:
-
-``` text
-┌─avgOrDefaultIf(x, greater(x, 10))─┐
-│                              0.00 │
-└───────────────────────────────────┘
-```
-
-## - OrNull {#agg-functions-combinator-ornull}
-
-Modifie le comportement d'une fonction d'agrégat.
-
-Ce combinateur convertit un résultat d'une fonction d'agrégation à l' [Nullable](../data-types/nullable.md) type de données. Si la fonction d'agrégation n'a pas de valeurs à calculer elle renvoie [NULL](../syntax.md#null-literal).
-
-`-OrNull` peut être utilisé avec d'autres combinators.
-
-**Syntaxe**
-
-``` sql
-<aggFunction>OrNull(x)
-```
-
-**Paramètre**
-
--   `x` — Aggregate function parameters.
-
-**Valeurs renvoyées**
-
--   Le résultat de la fonction d'agrégat, converti en `Nullable` type de données.
--   `NULL` si il n'y a rien à s'agréger.
-
-Type: `Nullable(aggregate function return type)`.
-
-**Exemple**
-
-Ajouter `-orNull` à la fin de la fonction d'agrégation.
-
-Requête:
-
-``` sql
-SELECT sumOrNull(number), toTypeName(sumOrNull(number)) FROM numbers(10) WHERE number > 10
-```
-
-Résultat:
-
-``` text
-┌─sumOrNull(number)─┬─toTypeName(sumOrNull(number))─┐
-│              ᴺᵁᴸᴸ │ Nullable(UInt64)              │
-└───────────────────┴───────────────────────────────┘
-```
-
-Également `-OrNull` peut être utilisé avec un autre combinateur. Il est utile lorsque la fonction d'agrégation n'accepte pas l'entrée vide.
-
-Requête:
-
-``` sql
-SELECT avgOrNullIf(x, x > 10)
-FROM
-(
-    SELECT toDecimal32(1.23, 2) AS x
-)
-```
-
-Résultat:
-
-``` text
-┌─avgOrNullIf(x, greater(x, 10))─┐
-│                           ᴺᵁᴸᴸ │
-└────────────────────────────────┘
-```
-
-## -Resample {#agg-functions-combinator-resample}
-
-Permet de diviser les données en groupes, puis séparément agrège les données de ces groupes. Les groupes sont créés en divisant les valeurs d'une colonne en intervalles.
-
-``` sql
-<aggFunction>Resample(start, end, step)(<aggFunction_params>, resampling_key)
-```
-
-**Paramètre**
-
--   `start` — Starting value of the whole required interval for `resampling_key` valeur.
--   `stop` — Ending value of the whole required interval for `resampling_key` valeur. L'ensemble de l'intervalle ne comprend pas les `stop` valeur `[start, stop)`.
--   `step` — Step for separating the whole interval into subintervals. The `aggFunction` est exécuté sur chacun de ces sous-intervalles indépendamment.
--   `resampling_key` — Column whose values are used for separating data into intervals.
--   `aggFunction_params` — `aggFunction` paramètre.
-
-**Valeurs renvoyées**
-
--   Tableau de `aggFunction` les résultats pour chaque subinterval.
-
-**Exemple**
-
-Envisager l' `people` le tableau avec les données suivantes:
-
-``` text
-┌─name───┬─age─┬─wage─┐
-│ John   │  16 │   10 │
-│ Alice  │  30 │   15 │
-│ Mary   │  35 │    8 │
-│ Evelyn │  48 │ 11.5 │
-│ David  │  62 │  9.9 │
-│ Brian  │  60 │   16 │
-└────────┴─────┴──────┘
-```
-
-Obtenons les noms des personnes dont l'âge se trouve dans les intervalles de `[30,60)` et `[60,75)`. Puisque nous utilisons la représentation entière pour l'âge, nous obtenons des âges dans le `[30, 59]` et `[60,74]` intervalle.
-
-Pour agréger des noms dans un tableau, nous utilisons [grouperay](reference.md#agg_function-grouparray) fonction d'agrégation. Il faut un argument. Dans notre cas, c'est l' `name` colonne. Le `groupArrayResample` fonction devrait utiliser le `age` colonne pour agréger les noms par âge. Pour définir les intervalles requis, nous passons le `30, 75, 30` des arguments dans la `groupArrayResample` fonction.
-
-``` sql
-SELECT groupArrayResample(30, 75, 30)(name, age) FROM people
-```
-
-``` text
-┌─groupArrayResample(30, 75, 30)(name, age)─────┐
-│ [['Alice','Mary','Evelyn'],['David','Brian']] │
-└───────────────────────────────────────────────┘
-```
-
-Considérez les résultats.
-
-`Jonh` est hors de l'échantillon parce qu'il est trop jeune. D'autres personnes sont distribués selon les intervalles d'âge.
-
-Maintenant, nous allons compter le nombre total de personnes et leur salaire moyen dans les intervalles d'âge.
-
-``` sql
-SELECT
-    countResample(30, 75, 30)(name, age) AS amount,
-    avgResample(30, 75, 30)(wage, age) AS avg_wage
-FROM people
-```
-
-``` text
-┌─amount─┬─avg_wage──────────────────┐
-│ [3,2]  │ [11.5,12.949999809265137] │
-└────────┴───────────────────────────┘
-```
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/agg_functions/combinators/) <!--hide-->
diff --git a/docs/fr/sql-reference/aggregate-functions/index.md b/docs/fr/sql-reference/aggregate-functions/index.md
deleted file mode 100644
index 4f4e3f057ae..00000000000
--- a/docs/fr/sql-reference/aggregate-functions/index.md
+++ /dev/null
@@ -1,62 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: "Les Fonctions D'Agr\xE9gation"
-toc_priority: 33
-toc_title: Introduction
----
-
-# Les Fonctions D'Agrégation {#aggregate-functions}
-
-Les fonctions d'agrégation fonctionnent dans le [normal](http://www.sql-tutorial.com/sql-aggregate-functions-sql-tutorial) comme prévu par les experts de la base de données.
-
-Clickhouse prend également en charge:
-
--   [Fonctions d'agrégat paramétriques](parametric-functions.md#aggregate_functions_parametric) qui acceptent d'autres paramètres en plus des colonnes.
--   [Combinators](combinators.md#aggregate_functions_combinators), qui modifient le comportement des fonctions d'agrégation.
-
-## Le Traitement NULL {#null-processing}
-
-Au cours de l'agrégation, tous les `NULL`s sont ignorés.
-
-**Exemple:**
-
-Considérez ce tableau:
-
-``` text
-┌─x─┬────y─┐
-│ 1 │    2 │
-│ 2 │ ᴺᵁᴸᴸ │
-│ 3 │    2 │
-│ 3 │    3 │
-│ 3 │ ᴺᵁᴸᴸ │
-└───┴──────┘
-```
-
-Disons que vous devez totaliser les valeurs dans le `y` colonne:
-
-``` sql
-SELECT sum(y) FROM t_null_big
-```
-
-    ┌─sum(y)─┐
-    │      7 │
-    └────────┘
-
-Le `sum` la fonction d'interprète `NULL` comme `0`. En particulier, cela signifie que si la fonction reçoit en entrée d'une sélection où toutes les valeurs sont `NULL`, alors le résultat sera `0`, pas `NULL`.
-
-Maintenant, vous pouvez utiliser le `groupArray` fonction pour créer un tableau à partir `y` colonne:
-
-``` sql
-SELECT groupArray(y) FROM t_null_big
-```
-
-``` text
-┌─groupArray(y)─┐
-│ [2,2,3]       │
-└───────────────┘
-```
-
-`groupArray` ne comprend pas `NULL` dans le tableau résultant.
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/agg_functions/) <!--hide-->
diff --git a/docs/fr/sql-reference/aggregate-functions/parametric-functions.md b/docs/fr/sql-reference/aggregate-functions/parametric-functions.md
deleted file mode 100644
index ed00ad7a0a3..00000000000
--- a/docs/fr/sql-reference/aggregate-functions/parametric-functions.md
+++ /dev/null
@@ -1,499 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 38
-toc_title: "Param\xE9trique"
----
-
-# Fonctions D'Agrégat Paramétriques {#aggregate_functions_parametric}
-
-Some aggregate functions can accept not only argument columns (used for compression), but a set of parameters – constants for initialization. The syntax is two pairs of brackets instead of one. The first is for parameters, and the second is for arguments.
-
-## histogramme {#histogram}
-
-Calcule un histogramme adaptatif. Cela ne garantit pas des résultats précis.
-
-``` sql
-histogram(number_of_bins)(values)
-```
-
-Les fonctions utilise [Un Algorithme D'Arbre De Décision Parallèle En Continu](http://jmlr.org/papers/volume11/ben-haim10a/ben-haim10a.pdf). Les bordures des bacs d'histogramme sont ajustées au fur et à mesure que de nouvelles données entrent dans une fonction. Dans le cas courant, les largeurs des bacs ne sont pas égales.
-
-**Paramètre**
-
-`number_of_bins` — Upper limit for the number of bins in the histogram. The function automatically calculates the number of bins. It tries to reach the specified number of bins, but if it fails, it uses fewer bins.
-`values` — [Expression](../syntax.md#syntax-expressions) résultant en valeurs d'entrée.
-
-**Valeurs renvoyées**
-
--   [Tableau](../../sql-reference/data-types/array.md) de [Tuple](../../sql-reference/data-types/tuple.md) de le format suivant:
-
-        ```
-        [(lower_1, upper_1, height_1), ... (lower_N, upper_N, height_N)]
-        ```
-
-        - `lower` — Lower bound of the bin.
-        - `upper` — Upper bound of the bin.
-        - `height` — Calculated height of the bin.
-
-**Exemple**
-
-``` sql
-SELECT histogram(5)(number + 1)
-FROM (
-    SELECT *
-    FROM system.numbers
-    LIMIT 20
-)
-```
-
-``` text
-┌─histogram(5)(plus(number, 1))───────────────────────────────────────────┐
-│ [(1,4.5,4),(4.5,8.5,4),(8.5,12.75,4.125),(12.75,17,4.625),(17,20,3.25)] │
-└─────────────────────────────────────────────────────────────────────────┘
-```
-
-Vous pouvez visualiser un histogramme avec la [bar](../../sql-reference/functions/other-functions.md#function-bar) fonction, par exemple:
-
-``` sql
-WITH histogram(5)(rand() % 100) AS hist
-SELECT
-    arrayJoin(hist).3 AS height,
-    bar(height, 0, 6, 5) AS bar
-FROM
-(
-    SELECT *
-    FROM system.numbers
-    LIMIT 20
-)
-```
-
-``` text
-┌─height─┬─bar───┐
-│  2.125 │ █▋    │
-│   3.25 │ ██▌   │
-│  5.625 │ ████▏ │
-│  5.625 │ ████▏ │
-│  3.375 │ ██▌   │
-└────────┴───────┘
-```
-
-Dans ce cas, vous devez vous rappeler que vous ne connaissez pas les frontières de la corbeille d'histogramme.
-
-## sequenceMatch(pattern)(timestamp, cond1, cond2, …) {#function-sequencematch}
-
-Vérifie si la séquence contient une chaîne d'événements qui correspond au modèle.
-
-``` sql
-sequenceMatch(pattern)(timestamp, cond1, cond2, ...)
-```
-
-!!! warning "Avertissement"
-    Les événements qui se produisent à la même seconde peuvent se situer dans la séquence dans un ordre indéfini affectant le résultat.
-
-**Paramètre**
-
--   `pattern` — Pattern string. See [Syntaxe du motif](#sequence-function-pattern-syntax).
-
--   `timestamp` — Column considered to contain time data. Typical data types are `Date` et `DateTime`. Vous pouvez également utiliser les prises en charge [UInt](../../sql-reference/data-types/int-uint.md) types de données.
-
--   `cond1`, `cond2` — Conditions that describe the chain of events. Data type: `UInt8`. Vous pouvez passer jusqu'à 32 arguments de condition. La fonction ne prend en compte que les événements décrits dans ces conditions. Si la séquence contient des données qui ne sont pas décrites dans une condition, la fonction les ignore.
-
-**Valeurs renvoyées**
-
--   1, si le profil correspond.
--   0, si le motif ne correspond pas.
-
-Type: `UInt8`.
-
-<a name="sequence-function-pattern-syntax"></a>
-**Syntaxe du motif**
-
--   `(?N)` — Matches the condition argument at position `N`. Les Conditions sont numérotées dans le `[1, 32]` gamme. Exemple, `(?1)` correspond à l'argument passé au `cond1` paramètre.
-
--   `.*` — Matches any number of events. You don't need conditional arguments to match this element of the pattern.
-
--   `(?t operator value)` — Sets the time in seconds that should separate two events. For example, pattern `(?1)(?t>1800)(?2)` correspond à des événements qui se produisent plus de 1800 secondes les uns des autres. Un nombre arbitraire d'événements peut se trouver entre ces événements. Vous pouvez utiliser l' `>=`, `>`, `<`, `<=` opérateur.
-
-**Exemple**
-
-Considérer les données dans le `t` table:
-
-``` text
-┌─time─┬─number─┐
-│    1 │      1 │
-│    2 │      3 │
-│    3 │      2 │
-└──────┴────────┘
-```
-
-Effectuer la requête:
-
-``` sql
-SELECT sequenceMatch('(?1)(?2)')(time, number = 1, number = 2) FROM t
-```
-
-``` text
-┌─sequenceMatch('(?1)(?2)')(time, equals(number, 1), equals(number, 2))─┐
-│                                                                     1 │
-└───────────────────────────────────────────────────────────────────────┘
-```
-
-La fonction a trouvé la chaîne d'événements où le numéro 2 suit le numéro 1. Il a sauté le numéro 3 entre eux, car le nombre n'est pas décrit comme un événement. Si nous voulons prendre ce nombre en compte lors de la recherche de l'événement de la chaîne donnée dans l'exemple, nous devrions en faire une condition.
-
-``` sql
-SELECT sequenceMatch('(?1)(?2)')(time, number = 1, number = 2, number = 3) FROM t
-```
-
-``` text
-┌─sequenceMatch('(?1)(?2)')(time, equals(number, 1), equals(number, 2), equals(number, 3))─┐
-│                                                                                        0 │
-└──────────────────────────────────────────────────────────────────────────────────────────┘
-```
-
-Dans ce cas, la fonction n'a pas pu trouver la chaîne d'événements correspondant au modèle, car l'événement pour le numéro 3 s'est produit entre 1 et 2. Si dans le même cas nous vérifions la condition pour le numéro 4, la séquence correspondrait au motif.
-
-``` sql
-SELECT sequenceMatch('(?1)(?2)')(time, number = 1, number = 2, number = 4) FROM t
-```
-
-``` text
-┌─sequenceMatch('(?1)(?2)')(time, equals(number, 1), equals(number, 2), equals(number, 4))─┐
-│                                                                                        1 │
-└──────────────────────────────────────────────────────────────────────────────────────────┘
-```
-
-**Voir Aussi**
-
--   [sequenceCount](#function-sequencecount)
-
-## sequenceCount(pattern)(time, cond1, cond2, …) {#function-sequencecount}
-
-Compte le nombre de chaînes d'événements correspondant au motif. La fonction recherche les chaînes d'événements qui ne se chevauchent pas. Il commence à rechercher la chaîne suivante après que la chaîne actuelle est appariée.
-
-!!! warning "Avertissement"
-    Les événements qui se produisent à la même seconde peuvent se situer dans la séquence dans un ordre indéfini affectant le résultat.
-
-``` sql
-sequenceCount(pattern)(timestamp, cond1, cond2, ...)
-```
-
-**Paramètre**
-
--   `pattern` — Pattern string. See [Syntaxe du motif](#sequence-function-pattern-syntax).
-
--   `timestamp` — Column considered to contain time data. Typical data types are `Date` et `DateTime`. Vous pouvez également utiliser les prises en charge [UInt](../../sql-reference/data-types/int-uint.md) types de données.
-
--   `cond1`, `cond2` — Conditions that describe the chain of events. Data type: `UInt8`. Vous pouvez passer jusqu'à 32 arguments de condition. La fonction ne prend en compte que les événements décrits dans ces conditions. Si la séquence contient des données qui ne sont pas décrites dans une condition, la fonction les ignore.
-
-**Valeurs renvoyées**
-
--   Nombre de chaînes d'événements qui ne se chevauchent pas et qui sont mises en correspondance.
-
-Type: `UInt64`.
-
-**Exemple**
-
-Considérer les données dans le `t` table:
-
-``` text
-┌─time─┬─number─┐
-│    1 │      1 │
-│    2 │      3 │
-│    3 │      2 │
-│    4 │      1 │
-│    5 │      3 │
-│    6 │      2 │
-└──────┴────────┘
-```
-
-Comptez combien de fois le nombre 2 se produit après le nombre 1 avec n'importe quelle quantité d'autres nombres entre eux:
-
-``` sql
-SELECT sequenceCount('(?1).*(?2)')(time, number = 1, number = 2) FROM t
-```
-
-``` text
-┌─sequenceCount('(?1).*(?2)')(time, equals(number, 1), equals(number, 2))─┐
-│                                                                       2 │
-└─────────────────────────────────────────────────────────────────────────┘
-```
-
-**Voir Aussi**
-
--   [sequenceMatch](#function-sequencematch)
-
-## fenêtrefunnel {#windowfunnel}
-
-Recherche les chaînes d'événements dans une fenêtre de temps coulissante et calcule le nombre maximum d'événements qui se sont produits à partir de la chaîne.
-
-La fonction fonctionne selon l'algorithme:
-
--   La fonction recherche les données qui déclenchent la première condition de la chaîne et définit le compteur d'événements sur 1. C'est le moment où la fenêtre coulissante commence.
-
--   Si les événements de la chaîne se produisent séquentiellement dans la fenêtre, le compteur est incrémenté. Si la séquence d'événements est perturbée, le compteur n'est pas incrémenté.
-
--   Si les données ont plusieurs chaînes d'événements à différents points d'achèvement, la fonction affichera uniquement la taille de la chaîne la plus longue.
-
-**Syntaxe**
-
-``` sql
-windowFunnel(window, [mode])(timestamp, cond1, cond2, ..., condN)
-```
-
-**Paramètre**
-
--   `window` — Length of the sliding window in seconds.
--   `mode` - C'est un argument facultatif.
-    -   `'strict'` - Lorsque le `'strict'` est défini, le windowFunnel() applique des conditions uniquement pour les valeurs uniques.
--   `timestamp` — Name of the column containing the timestamp. Data types supported: [Date](../../sql-reference/data-types/date.md), [DateTime](../../sql-reference/data-types/datetime.md#data_type-datetime) et d'autres types entiers non signés (notez que même si timestamp prend en charge le `UInt64` type, sa valeur ne peut pas dépasser le maximum Int64, qui est 2^63 - 1).
--   `cond` — Conditions or data describing the chain of events. [UInt8](../../sql-reference/data-types/int-uint.md).
-
-**Valeur renvoyée**
-
-Nombre maximal de conditions déclenchées consécutives de la chaîne dans la fenêtre de temps de glissement.
-Toutes les chaînes de la sélection sont analysés.
-
-Type: `Integer`.
-
-**Exemple**
-
-Déterminer si une période de temps est suffisant pour l'utilisateur de sélectionner un téléphone et d'acheter deux fois dans la boutique en ligne.
-
-Définissez la chaîne d'événements suivante:
-
-1.  L'utilisateur s'est connecté à son compte sur le magasin (`eventID = 1003`).
-2.  L'utilisateur recherche un téléphone (`eventID = 1007, product = 'phone'`).
-3.  Toute commande de l'utilisateur (`eventID = 1009`).
-4.  L'Utilisateur a fait la commande à nouveau (`eventID = 1010`).
-
-Table d'entrée:
-
-``` text
-┌─event_date─┬─user_id─┬───────────timestamp─┬─eventID─┬─product─┐
-│ 2019-01-28 │       1 │ 2019-01-29 10:00:00 │    1003 │ phone   │
-└────────────┴─────────┴─────────────────────┴─────────┴─────────┘
-┌─event_date─┬─user_id─┬───────────timestamp─┬─eventID─┬─product─┐
-│ 2019-01-31 │       1 │ 2019-01-31 09:00:00 │    1007 │ phone   │
-└────────────┴─────────┴─────────────────────┴─────────┴─────────┘
-┌─event_date─┬─user_id─┬───────────timestamp─┬─eventID─┬─product─┐
-│ 2019-01-30 │       1 │ 2019-01-30 08:00:00 │    1009 │ phone   │
-└────────────┴─────────┴─────────────────────┴─────────┴─────────┘
-┌─event_date─┬─user_id─┬───────────timestamp─┬─eventID─┬─product─┐
-│ 2019-02-01 │       1 │ 2019-02-01 08:00:00 │    1010 │ phone   │
-└────────────┴─────────┴─────────────────────┴─────────┴─────────┘
-```
-
-Savoir dans quelle mesure l'utilisateur `user_id` pourrait passer à travers la chaîne dans une période en Janvier-Février de 2019.
-
-Requête:
-
-``` sql
-SELECT
-    level,
-    count() AS c
-FROM
-(
-    SELECT
-        user_id,
-        windowFunnel(6048000000000000)(timestamp, eventID = 1003, eventID = 1009, eventID = 1007, eventID = 1010) AS level
-    FROM trend
-    WHERE (event_date >= '2019-01-01') AND (event_date <= '2019-02-02')
-    GROUP BY user_id
-)
-GROUP BY level
-ORDER BY level ASC
-```
-
-Résultat:
-
-``` text
-┌─level─┬─c─┐
-│     4 │ 1 │
-└───────┴───┘
-```
-
-## rétention {#retention}
-
-La fonction prend comme arguments un ensemble de conditions de 1 à 32 arguments de type `UInt8` qui indiquent si une certaine condition est remplie pour l'événement.
-Toute condition peut être spécifiée comme argument (comme dans [WHERE](../../sql-reference/statements/select/where.md#select-where)).
-
-Les conditions, à l'exception de la première, s'appliquent par paires: le résultat de la seconde sera vrai si la première et la deuxième sont remplies, le troisième si la première et la fird sont vraies, etc.
-
-**Syntaxe**
-
-``` sql
-retention(cond1, cond2, ..., cond32);
-```
-
-**Paramètre**
-
--   `cond` — an expression that returns a `UInt8` résultat (1 ou 0).
-
-**Valeur renvoyée**
-
-Le tableau de 1 ou 0.
-
--   1 — condition was met for the event.
--   0 — condition wasn't met for the event.
-
-Type: `UInt8`.
-
-**Exemple**
-
-Prenons un exemple de calcul de la `retention` fonction pour déterminer le trafic du site.
-
-**1.** Сreate a table to illustrate an example.
-
-``` sql
-CREATE TABLE retention_test(date Date, uid Int32) ENGINE = Memory;
-
-INSERT INTO retention_test SELECT '2020-01-01', number FROM numbers(5);
-INSERT INTO retention_test SELECT '2020-01-02', number FROM numbers(10);
-INSERT INTO retention_test SELECT '2020-01-03', number FROM numbers(15);
-```
-
-Table d'entrée:
-
-Requête:
-
-``` sql
-SELECT * FROM retention_test
-```
-
-Résultat:
-
-``` text
-┌───────date─┬─uid─┐
-│ 2020-01-01 │   0 │
-│ 2020-01-01 │   1 │
-│ 2020-01-01 │   2 │
-│ 2020-01-01 │   3 │
-│ 2020-01-01 │   4 │
-└────────────┴─────┘
-┌───────date─┬─uid─┐
-│ 2020-01-02 │   0 │
-│ 2020-01-02 │   1 │
-│ 2020-01-02 │   2 │
-│ 2020-01-02 │   3 │
-│ 2020-01-02 │   4 │
-│ 2020-01-02 │   5 │
-│ 2020-01-02 │   6 │
-│ 2020-01-02 │   7 │
-│ 2020-01-02 │   8 │
-│ 2020-01-02 │   9 │
-└────────────┴─────┘
-┌───────date─┬─uid─┐
-│ 2020-01-03 │   0 │
-│ 2020-01-03 │   1 │
-│ 2020-01-03 │   2 │
-│ 2020-01-03 │   3 │
-│ 2020-01-03 │   4 │
-│ 2020-01-03 │   5 │
-│ 2020-01-03 │   6 │
-│ 2020-01-03 │   7 │
-│ 2020-01-03 │   8 │
-│ 2020-01-03 │   9 │
-│ 2020-01-03 │  10 │
-│ 2020-01-03 │  11 │
-│ 2020-01-03 │  12 │
-│ 2020-01-03 │  13 │
-│ 2020-01-03 │  14 │
-└────────────┴─────┘
-```
-
-**2.** Grouper les utilisateurs par ID unique `uid` à l'aide de la `retention` fonction.
-
-Requête:
-
-``` sql
-SELECT
-    uid,
-    retention(date = '2020-01-01', date = '2020-01-02', date = '2020-01-03') AS r
-FROM retention_test
-WHERE date IN ('2020-01-01', '2020-01-02', '2020-01-03')
-GROUP BY uid
-ORDER BY uid ASC
-```
-
-Résultat:
-
-``` text
-┌─uid─┬─r───────┐
-│   0 │ [1,1,1] │
-│   1 │ [1,1,1] │
-│   2 │ [1,1,1] │
-│   3 │ [1,1,1] │
-│   4 │ [1,1,1] │
-│   5 │ [0,0,0] │
-│   6 │ [0,0,0] │
-│   7 │ [0,0,0] │
-│   8 │ [0,0,0] │
-│   9 │ [0,0,0] │
-│  10 │ [0,0,0] │
-│  11 │ [0,0,0] │
-│  12 │ [0,0,0] │
-│  13 │ [0,0,0] │
-│  14 │ [0,0,0] │
-└─────┴─────────┘
-```
-
-**3.** Calculer le nombre total de visites par jour.
-
-Requête:
-
-``` sql
-SELECT
-    sum(r[1]) AS r1,
-    sum(r[2]) AS r2,
-    sum(r[3]) AS r3
-FROM
-(
-    SELECT
-        uid,
-        retention(date = '2020-01-01', date = '2020-01-02', date = '2020-01-03') AS r
-    FROM retention_test
-    WHERE date IN ('2020-01-01', '2020-01-02', '2020-01-03')
-    GROUP BY uid
-)
-```
-
-Résultat:
-
-``` text
-┌─r1─┬─r2─┬─r3─┐
-│  5 │  5 │  5 │
-└────┴────┴────┘
-```
-
-Où:
-
--   `r1`- le nombre de visiteurs uniques qui ont visité le site au cours du 2020-01-01 (le `cond1` condition).
--   `r2`- le nombre de visiteurs uniques qui ont visité le site au cours d'une période donnée entre 2020-01-01 et 2020-01-02 (`cond1` et `cond2` condition).
--   `r3`- le nombre de visiteurs uniques qui ont visité le site au cours d'une période donnée entre 2020-01-01 et 2020-01-03 (`cond1` et `cond3` condition).
-
-## uniqUpTo (N) (x) {#uniquptonx}
-
-Calculates the number of different argument values ​​if it is less than or equal to N. If the number of different argument values is greater than N, it returns N + 1.
-
-Recommandé pour une utilisation avec de petites Ns, jusqu'à 10. La valeur maximale de N est de 100.
-
-Pour l'état d'une fonction d'agrégation, il utilise la quantité de mémoire égale à 1 + N \* de la taille d'une valeur d'octets.
-Pour les chaînes, il stocke un hachage non cryptographique de 8 octets. Soit le calcul est approchée pour les chaînes.
-
-La fonction fonctionne également pour plusieurs arguments.
-
-Cela fonctionne aussi vite que possible, sauf dans les cas où une grande valeur N est utilisée et le nombre de valeurs uniques est légèrement inférieur à N.
-
-Exemple d'utilisation:
-
-``` text
-Problem: Generate a report that shows only keywords that produced at least 5 unique users.
-Solution: Write in the GROUP BY query SearchPhrase HAVING uniqUpTo(4)(UserID) >= 5
-```
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/agg_functions/parametric_functions/) <!--hide-->
-
-## sumMapFiltered(keys_to_keep) (clés, valeurs) {#summapfilteredkeys-to-keepkeys-values}
-
-Même comportement que [sumMap](reference.md#agg_functions-summap) sauf qu'un tableau de clés est passé en paramètre. Cela peut être particulièrement utile lorsque vous travaillez avec une forte cardinalité de touches.
diff --git a/docs/fr/sql-reference/aggregate-functions/reference.md b/docs/fr/sql-reference/aggregate-functions/reference.md
deleted file mode 100644
index 37d150a6f68..00000000000
--- a/docs/fr/sql-reference/aggregate-functions/reference.md
+++ /dev/null
@@ -1,1914 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 36
-toc_title: "R\xE9f\xE9rence"
----
-
-# Référence De La Fonction Agrégée {#aggregate-functions-reference}
-
-## compter {#agg_function-count}
-
-Compte le nombre de lignes ou de valeurs non NULL.
-
-ClickHouse prend en charge les syntaxes suivantes pour `count`:
-- `count(expr)` ou `COUNT(DISTINCT expr)`.
-- `count()` ou `COUNT(*)`. Le `count()` la syntaxe est spécifique à ClickHouse.
-
-**Paramètre**
-
-La fonction peut prendre:
-
--   Zéro des paramètres.
--   Un [expression](../syntax.md#syntax-expressions).
-
-**Valeur renvoyée**
-
--   Si la fonction est appelée sans paramètres, il compte le nombre de lignes.
--   Si l' [expression](../syntax.md#syntax-expressions) est passé, alors la fonction compte combien de fois cette expression retournée not null. Si l'expression renvoie un [Nullable](../../sql-reference/data-types/nullable.md)- tapez la valeur, puis le résultat de `count` séjours pas `Nullable`. La fonction renvoie 0 si l'expression est retournée `NULL` pour toutes les lignes.
-
-Dans les deux cas le type de la valeur renvoyée est [UInt64](../../sql-reference/data-types/int-uint.md).
-
-**Détail**
-
-Clickhouse soutient le `COUNT(DISTINCT ...)` syntaxe. Le comportement de cette construction dépend de la [count_distinct_implementation](../../operations/settings/settings.md#settings-count_distinct_implementation) paramètre. Il définit lequel des [uniq\*](#agg_function-uniq) fonctions est utilisée pour effectuer l'opération. La valeur par défaut est la [uniqExact](#agg_function-uniqexact) fonction.
-
-Le `SELECT count() FROM table` la requête n'est pas optimisé, car le nombre d'entrées dans la table n'est pas stockée séparément. Il choisit une petite colonne de la table et compte le nombre de valeurs qu'il contient.
-
-**Exemple**
-
-Exemple 1:
-
-``` sql
-SELECT count() FROM t
-```
-
-``` text
-┌─count()─┐
-│       5 │
-└─────────┘
-```
-
-Exemple 2:
-
-``` sql
-SELECT name, value FROM system.settings WHERE name = 'count_distinct_implementation'
-```
-
-``` text
-┌─name──────────────────────────┬─value─────┐
-│ count_distinct_implementation │ uniqExact │
-└───────────────────────────────┴───────────┘
-```
-
-``` sql
-SELECT count(DISTINCT num) FROM t
-```
-
-``` text
-┌─uniqExact(num)─┐
-│              3 │
-└────────────────┘
-```
-
-Cet exemple montre que `count(DISTINCT num)` est effectuée par le `uniqExact` en fonction de l' `count_distinct_implementation` valeur de réglage.
-
-## tout(x) {#agg_function-any}
-
-Sélectionne la première valeur rencontrée.
-La requête peut être exécutée dans n'importe quel ordre, et même dans un ordre différent à chaque fois, de sorte que le résultat de cette fonction est indéterminée.
-Pour obtenir un résultat déterminé, vous pouvez utiliser le ‘min’ ou ‘max’ fonction au lieu de ‘any’.
-
-Dans certains cas, vous pouvez compter sur l'ordre de l'exécution. Cela s'applique aux cas où SELECT provient d'une sous-requête qui utilise ORDER BY.
-
-Lorsqu'un `SELECT` la requête a l' `GROUP BY` ou au moins une fonction d'agrégat, ClickHouse (contrairement à MySQL) exige que toutes les expressions du `SELECT`, `HAVING`, et `ORDER BY` clauses être calculée à partir de clés ou de fonctions d'agrégation. En d'autres termes, chaque colonne sélectionnée dans la table doit être utilisée soit dans les clés, soit dans les fonctions d'agrégation. Pour obtenir un comportement comme dans MySQL, vous pouvez mettre les autres colonnes dans le `any` fonction d'agrégation.
-
-## anyHeavy (x) {#anyheavyx}
-
-Sélectionne une valeur fréquente à l'aide [poids lourds](http://www.cs.umd.edu/~samir/498/karp.pdf) algorithme. S'il y a une valeur qui se produit plus de la moitié des cas dans chacun des threads d'exécution de la requête, cette valeur est renvoyée. Normalement, le résultat est non déterministe.
-
-``` sql
-anyHeavy(column)
-```
-
-**Argument**
-
--   `column` – The column name.
-
-**Exemple**
-
-Prendre la [OnTime](../../getting-started/example-datasets/ontime.md) ensemble de données et sélectionnez n'importe quelle valeur `AirlineID` colonne.
-
-``` sql
-SELECT anyHeavy(AirlineID) AS res
-FROM ontime
-```
-
-``` text
-┌───res─┐
-│ 19690 │
-└───────┘
-```
-
-## anyLast (x) {#anylastx}
-
-Sélectionne la dernière valeur rencontrés.
-Le résultat est tout aussi indéterminé que pour le `any` fonction.
-
-## groupBitAnd {#groupbitand}
-
-S'applique au niveau du BIT `AND` pour les séries de nombres.
-
-``` sql
-groupBitAnd(expr)
-```
-
-**Paramètre**
-
-`expr` – An expression that results in `UInt*` type.
-
-**Valeur de retour**
-
-La valeur de la `UInt*` type.
-
-**Exemple**
-
-Des données de Test:
-
-``` text
-binary     decimal
-00101100 = 44
-00011100 = 28
-00001101 = 13
-01010101 = 85
-```
-
-Requête:
-
-``` sql
-SELECT groupBitAnd(num) FROM t
-```
-
-Où `num` est la colonne avec les données de test.
-
-Résultat:
-
-``` text
-binary     decimal
-00000100 = 4
-```
-
-## groupBitOr {#groupbitor}
-
-S'applique au niveau du BIT `OR` pour les séries de nombres.
-
-``` sql
-groupBitOr(expr)
-```
-
-**Paramètre**
-
-`expr` – An expression that results in `UInt*` type.
-
-**Valeur de retour**
-
-La valeur de la `UInt*` type.
-
-**Exemple**
-
-Des données de Test:
-
-``` text
-binary     decimal
-00101100 = 44
-00011100 = 28
-00001101 = 13
-01010101 = 85
-```
-
-Requête:
-
-``` sql
-SELECT groupBitOr(num) FROM t
-```
-
-Où `num` est la colonne avec les données de test.
-
-Résultat:
-
-``` text
-binary     decimal
-01111101 = 125
-```
-
-## groupBitXor {#groupbitxor}
-
-S'applique au niveau du BIT `XOR` pour les séries de nombres.
-
-``` sql
-groupBitXor(expr)
-```
-
-**Paramètre**
-
-`expr` – An expression that results in `UInt*` type.
-
-**Valeur de retour**
-
-La valeur de la `UInt*` type.
-
-**Exemple**
-
-Des données de Test:
-
-``` text
-binary     decimal
-00101100 = 44
-00011100 = 28
-00001101 = 13
-01010101 = 85
-```
-
-Requête:
-
-``` sql
-SELECT groupBitXor(num) FROM t
-```
-
-Où `num` est la colonne avec les données de test.
-
-Résultat:
-
-``` text
-binary     decimal
-01101000 = 104
-```
-
-## groupBitmap {#groupbitmap}
-
-Calculs Bitmap ou agrégés à partir d'une colonne entière non signée, retour cardinalité de type UInt64, si Ajouter suffixe-State, puis retour [objet bitmap](../../sql-reference/functions/bitmap-functions.md).
-
-``` sql
-groupBitmap(expr)
-```
-
-**Paramètre**
-
-`expr` – An expression that results in `UInt*` type.
-
-**Valeur de retour**
-
-La valeur de la `UInt64` type.
-
-**Exemple**
-
-Des données de Test:
-
-``` text
-UserID
-1
-1
-2
-3
-```
-
-Requête:
-
-``` sql
-SELECT groupBitmap(UserID) as num FROM t
-```
-
-Résultat:
-
-``` text
-num
-3
-```
-
-## min (x) {#agg_function-min}
-
-Calcule le minimum.
-
-## max (x) {#agg_function-max}
-
-Calcule le maximum.
-
-## argMin (arg, val) {#agg-function-argmin}
-
-Calcule la ‘arg’ valeur pour un minimum ‘val’ valeur. S'il y a plusieurs valeurs différentes de ‘arg’ pour des valeurs minimales de ‘val’ la première de ces valeurs rencontrées est de sortie.
-
-**Exemple:**
-
-``` text
-┌─user─────┬─salary─┐
-│ director │   5000 │
-│ manager  │   3000 │
-│ worker   │   1000 │
-└──────────┴────────┘
-```
-
-``` sql
-SELECT argMin(user, salary) FROM salary
-```
-
-``` text
-┌─argMin(user, salary)─┐
-│ worker               │
-└──────────────────────┘
-```
-
-## argMax(arg, val) {#agg-function-argmax}
-
-Calcule la ‘arg’ valeur pour un maximum ‘val’ valeur. S'il y a plusieurs valeurs différentes de ‘arg’ pour les valeurs maximales de ‘val’ la première de ces valeurs rencontrées est de sortie.
-
-## sum(x) {#agg_function-sum}
-
-Calcule la somme.
-Ne fonctionne que pour les numéros.
-
-## sumWithOverflow (x) {#sumwithoverflowx}
-
-Calcule la somme des nombres, en utilisant le même type de données pour le résultat que pour les paramètres d'entrée. Si la somme dépasse la valeur maximale pour ce type de données, la fonction renvoie une erreur.
-
-Ne fonctionne que pour les numéros.
-
-## sumMap(clé, valeur), sumMap(Tuple(clé, valeur)) {#agg_functions-summap}
-
-Les totaux de la ‘value’ tableau selon les clés spécifiés dans le ‘key’ tableau.
-Le passage du tuple des tableaux de clés et de valeurs est synonyme du passage de deux tableaux de clés et de valeurs.
-Le nombre d'éléments dans ‘key’ et ‘value’ doit être identique pour chaque ligne totalisée.
-Returns a tuple of two arrays: keys in sorted order, and values ​​summed for the corresponding keys.
-
-Exemple:
-
-``` sql
-CREATE TABLE sum_map(
-    date Date,
-    timeslot DateTime,
-    statusMap Nested(
-        status UInt16,
-        requests UInt64
-    ),
-    statusMapTuple Tuple(Array(Int32), Array(Int32))
-) ENGINE = Log;
-INSERT INTO sum_map VALUES
-    ('2000-01-01', '2000-01-01 00:00:00', [1, 2, 3], [10, 10, 10], ([1, 2, 3], [10, 10, 10])),
-    ('2000-01-01', '2000-01-01 00:00:00', [3, 4, 5], [10, 10, 10], ([3, 4, 5], [10, 10, 10])),
-    ('2000-01-01', '2000-01-01 00:01:00', [4, 5, 6], [10, 10, 10], ([4, 5, 6], [10, 10, 10])),
-    ('2000-01-01', '2000-01-01 00:01:00', [6, 7, 8], [10, 10, 10], ([6, 7, 8], [10, 10, 10]));
-
-SELECT
-    timeslot,
-    sumMap(statusMap.status, statusMap.requests),
-    sumMap(statusMapTuple)
-FROM sum_map
-GROUP BY timeslot
-```
-
-``` text
-┌────────────timeslot─┬─sumMap(statusMap.status, statusMap.requests)─┬─sumMap(statusMapTuple)─────────┐
-│ 2000-01-01 00:00:00 │ ([1,2,3,4,5],[10,10,20,10,10])               │ ([1,2,3,4,5],[10,10,20,10,10]) │
-│ 2000-01-01 00:01:00 │ ([4,5,6,7,8],[10,10,20,10,10])               │ ([4,5,6,7,8],[10,10,20,10,10]) │
-└─────────────────────┴──────────────────────────────────────────────┴────────────────────────────────┘
-```
-
-## skewPop {#skewpop}
-
-Calcule la [asymétrie](https://en.wikipedia.org/wiki/Skewness) d'une séquence.
-
-``` sql
-skewPop(expr)
-```
-
-**Paramètre**
-
-`expr` — [Expression](../syntax.md#syntax-expressions) retour d'un nombre.
-
-**Valeur renvoyée**
-
-The skewness of the given distribution. Type — [Float64](../../sql-reference/data-types/float.md)
-
-**Exemple**
-
-``` sql
-SELECT skewPop(value) FROM series_with_value_column
-```
-
-## skewSamp {#skewsamp}
-
-Calcule la [asymétrie de l'échantillon](https://en.wikipedia.org/wiki/Skewness) d'une séquence.
-
-Il représente une estimation non biaisée de l'asymétrie d'une variable aléatoire si les valeurs passées forme de son échantillon.
-
-``` sql
-skewSamp(expr)
-```
-
-**Paramètre**
-
-`expr` — [Expression](../syntax.md#syntax-expressions) retour d'un nombre.
-
-**Valeur renvoyée**
-
-The skewness of the given distribution. Type — [Float64](../../sql-reference/data-types/float.md). Si `n <= 1` (`n` est la taille de l'échantillon), alors la fonction renvoie `nan`.
-
-**Exemple**
-
-``` sql
-SELECT skewSamp(value) FROM series_with_value_column
-```
-
-## kurtPop {#kurtpop}
-
-Calcule la [kurtosis](https://en.wikipedia.org/wiki/Kurtosis) d'une séquence.
-
-``` sql
-kurtPop(expr)
-```
-
-**Paramètre**
-
-`expr` — [Expression](../syntax.md#syntax-expressions) retour d'un nombre.
-
-**Valeur renvoyée**
-
-The kurtosis of the given distribution. Type — [Float64](../../sql-reference/data-types/float.md)
-
-**Exemple**
-
-``` sql
-SELECT kurtPop(value) FROM series_with_value_column
-```
-
-## kurtSamp {#kurtsamp}
-
-Calcule la [l'échantillon le coefficient d'aplatissement](https://en.wikipedia.org/wiki/Kurtosis) d'une séquence.
-
-Il représente une estimation non biaisée de la kurtose d'une variable aléatoire si les valeurs passées forment son échantillon.
-
-``` sql
-kurtSamp(expr)
-```
-
-**Paramètre**
-
-`expr` — [Expression](../syntax.md#syntax-expressions) retour d'un nombre.
-
-**Valeur renvoyée**
-
-The kurtosis of the given distribution. Type — [Float64](../../sql-reference/data-types/float.md). Si `n <= 1` (`n` la taille de l'échantillon), alors la fonction renvoie `nan`.
-
-**Exemple**
-
-``` sql
-SELECT kurtSamp(value) FROM series_with_value_column
-```
-
-## avg (x) {#agg_function-avg}
-
-Calcule la moyenne.
-Ne fonctionne que pour les numéros.
-Le résultat est toujours Float64.
-
-## avgWeighted {#avgweighted}
-
-Calcule la [moyenne arithmétique pondérée](https://en.wikipedia.org/wiki/Weighted_arithmetic_mean).
-
-**Syntaxe**
-
-``` sql
-avgWeighted(x, weight)
-```
-
-**Paramètre**
-
--   `x` — Values. [Entier](../data-types/int-uint.md) ou [virgule flottante](../data-types/float.md).
--   `weight` — Weights of the values. [Entier](../data-types/int-uint.md) ou [virgule flottante](../data-types/float.md).
-
-Type de `x` et `weight` doit être le même.
-
-**Valeur renvoyée**
-
--   Moyenne pondérée.
--   `NaN`. Si tous les poids sont égaux à 0.
-
-Type: [Float64](../data-types/float.md).
-
-**Exemple**
-
-Requête:
-
-``` sql
-SELECT avgWeighted(x, w)
-FROM values('x Int8, w Int8', (4, 1), (1, 0), (10, 2))
-```
-
-Résultat:
-
-``` text
-┌─avgWeighted(x, weight)─┐
-│                      8 │
-└────────────────────────┘
-```
-
-## uniq {#agg_function-uniq}
-
-Calcule le nombre approximatif des différentes valeurs de l'argument.
-
-``` sql
-uniq(x[, ...])
-```
-
-**Paramètre**
-
-La fonction prend un nombre variable de paramètres. Les paramètres peuvent être `Tuple`, `Array`, `Date`, `DateTime`, `String` ou des types numériques.
-
-**Valeur renvoyée**
-
--   A [UInt64](../../sql-reference/data-types/int-uint.md)numéro de type.
-
-**Détails de mise en œuvre**
-
-Fonction:
-
--   Calcule un hachage pour tous les paramètres de l'agrégat, puis l'utilise dans les calculs.
-
--   Utilise un algorithme d'échantillonnage adaptatif. Pour l'état de calcul, La fonction utilise un échantillon de valeurs de hachage d'éléments jusqu'à 65536.
-
-        This algorithm is very accurate and very efficient on the CPU. When the query contains several of these functions, using `uniq` is almost as fast as using other aggregate functions.
-
--   Fournit le résultat de manière déterministe (cela ne dépend pas de l'ordre de traitement de la requête).
-
-Nous vous recommandons d'utiliser cette fonction dans presque tous les scénarios.
-
-**Voir Aussi**
-
--   [uniqcombiné](#agg_function-uniqcombined)
--   [uniqCombined64](#agg_function-uniqcombined64)
--   [uniqHLL12](#agg_function-uniqhll12)
--   [uniqExact](#agg_function-uniqexact)
-
-## uniqcombiné {#agg_function-uniqcombined}
-
-Calcule le nombre approximatif de différentes valeurs d'argument.
-
-``` sql
-uniqCombined(HLL_precision)(x[, ...])
-```
-
-Le `uniqCombined` la fonction est un bon choix pour calculer le nombre de valeurs différentes.
-
-**Paramètre**
-
-La fonction prend un nombre variable de paramètres. Les paramètres peuvent être `Tuple`, `Array`, `Date`, `DateTime`, `String` ou des types numériques.
-
-`HLL_precision` est le logarithme en base 2 du nombre de cellules dans [HyperLogLog](https://en.wikipedia.org/wiki/HyperLogLog). Facultatif, vous pouvez utiliser la fonction comme `uniqCombined(x[, ...])`. La valeur par défaut pour `HLL_precision` est 17, qui est effectivement 96 Ko d'espace(2 ^ 17 cellules, 6 bits chacune).
-
-**Valeur renvoyée**
-
--   Nombre [UInt64](../../sql-reference/data-types/int-uint.md)numéro de type.
-
-**Détails de mise en œuvre**
-
-Fonction:
-
--   Calcule un hachage (hachage 64 bits pour `String` et 32 bits sinon) pour tous les paramètres dans l'agrégat, puis l'utilise dans les calculs.
-
--   Utilise une combinaison de trois algorithmes: tableau, table de hachage et HyperLogLog avec une table de correction d'erreur.
-
-        For a small number of distinct elements, an array is used. When the set size is larger, a hash table is used. For a larger number of elements, HyperLogLog is used, which will occupy a fixed amount of memory.
-
--   Fournit le résultat de manière déterministe (cela ne dépend pas de l'ordre de traitement de la requête).
-
-!!! note "Note"
-    Comme il utilise le hachage 32 bits pour non-`String` type, le résultat aura une erreur très élevée pour les cardinalités significativement plus grandes que `UINT_MAX` (erreur va augmenter rapidement après quelques dizaines de milliards de valeurs distinctes), donc dans ce cas, vous devez utiliser [uniqCombined64](#agg_function-uniqcombined64)
-
-Par rapport à la [uniq](#agg_function-uniq) la fonction, la `uniqCombined`:
-
--   Consomme plusieurs fois moins de mémoire.
--   Calcule avec plusieurs fois plus de précision.
--   A généralement des performances légèrement inférieures. Dans certains scénarios, `uniqCombined` peut faire mieux que `uniq` par exemple, avec des requêtes distribuées qui transmettent un grand nombre d'agrégation des états sur le réseau.
-
-**Voir Aussi**
-
--   [uniq](#agg_function-uniq)
--   [uniqCombined64](#agg_function-uniqcombined64)
--   [uniqHLL12](#agg_function-uniqhll12)
--   [uniqExact](#agg_function-uniqexact)
-
-## uniqCombined64 {#agg_function-uniqcombined64}
-
-Même que [uniqcombiné](#agg_function-uniqcombined), mais utilise le hachage 64 bits pour tous les types de données.
-
-## uniqHLL12 {#agg_function-uniqhll12}
-
-Calcule le nombre approximatif de différentes valeurs d'argument, en utilisant [HyperLogLog](https://en.wikipedia.org/wiki/HyperLogLog) algorithme.
-
-``` sql
-uniqHLL12(x[, ...])
-```
-
-**Paramètre**
-
-La fonction prend un nombre variable de paramètres. Les paramètres peuvent être `Tuple`, `Array`, `Date`, `DateTime`, `String` ou des types numériques.
-
-**Valeur renvoyée**
-
--   A [UInt64](../../sql-reference/data-types/int-uint.md)numéro de type.
-
-**Détails de mise en œuvre**
-
-Fonction:
-
--   Calcule un hachage pour tous les paramètres de l'agrégat, puis l'utilise dans les calculs.
-
--   Utilise L'algorithme HyperLogLog pour approximer le nombre de valeurs d'argument différentes.
-
-        212 5-bit cells are used. The size of the state is slightly more than 2.5 KB. The result is not very accurate (up to ~10% error) for small data sets (<10K elements). However, the result is fairly accurate for high-cardinality data sets (10K-100M), with a maximum error of ~1.6%. Starting from 100M, the estimation error increases, and the function will return very inaccurate results for data sets with extremely high cardinality (1B+ elements).
-
--   Fournit le résultat déterminé (il ne dépend pas de l'ordre de traitement de la requête).
-
-Nous ne recommandons pas d'utiliser cette fonction. Dans la plupart des cas, l'utilisation de la [uniq](#agg_function-uniq) ou [uniqcombiné](#agg_function-uniqcombined) fonction.
-
-**Voir Aussi**
-
--   [uniq](#agg_function-uniq)
--   [uniqcombiné](#agg_function-uniqcombined)
--   [uniqExact](#agg_function-uniqexact)
-
-## uniqExact {#agg_function-uniqexact}
-
-Calcule le nombre exact de différentes valeurs d'argument.
-
-``` sql
-uniqExact(x[, ...])
-```
-
-L'utilisation de la `uniqExact` fonction si vous avez absolument besoin d'un résultat exact. Sinon l'utilisation de la [uniq](#agg_function-uniq) fonction.
-
-Le `uniqExact` la fonction utilise plus de mémoire que `uniq` parce que la taille de l'état a surabondance de croissance que le nombre de valeurs différentes augmente.
-
-**Paramètre**
-
-La fonction prend un nombre variable de paramètres. Les paramètres peuvent être `Tuple`, `Array`, `Date`, `DateTime`, `String` ou des types numériques.
-
-**Voir Aussi**
-
--   [uniq](#agg_function-uniq)
--   [uniqcombiné](#agg_function-uniqcombined)
--   [uniqHLL12](#agg_function-uniqhll12)
-
-## groupArray(x), groupArray (max_size) (x) {#agg_function-grouparray}
-
-Crée un tableau de valeurs de l'argument.
-Les valeurs peuvent être ajoutées au tableau dans une (indéterminée) de commande.
-
-La deuxième version (avec le `max_size` paramètre) limite la taille du tableau résultant à `max_size` élément.
-Exemple, `groupArray (1) (x)` est équivalent à `[any (x)]`.
-
-Dans certains cas, vous pouvez toujours compter sur l'ordre de l'exécution. Cela s'applique aux cas où `SELECT` provient d'une sous-requête qui utilise `ORDER BY`.
-
-## groupeparrayinsertat {#grouparrayinsertat}
-
-Insère une valeur dans le tableau à la position spécifiée.
-
-**Syntaxe**
-
-``` sql
-groupArrayInsertAt(default_x, size)(x, pos);
-```
-
-Si dans une requête plusieurs valeurs sont insérées dans la même position, la fonction se comporte de la manière suivante:
-
--   Si une requête est exécutée dans un seul thread, la première des valeurs insérées est utilisée.
--   Si une requête est exécutée dans plusieurs threads, le résultat est indéterminé l'une des valeurs insérées.
-
-**Paramètre**
-
--   `x` — Value to be inserted. [Expression](../syntax.md#syntax-expressions) résultant dans l'un des [types de données pris en charge](../../sql-reference/data-types/index.md).
--   `pos` — Position at which the specified element `x` doit être inséré. L'indice de numérotation dans le tableau commence à partir de zéro. [UInt32](../../sql-reference/data-types/int-uint.md#uint-ranges).
--   `default_x`— Default value for substituting in empty positions. Optional parameter. [Expression](../syntax.md#syntax-expressions) résultant dans le type de données configuré pour le `x` paramètre. Si `default_x` n'est pas définie, la [les valeurs par défaut](../../sql-reference/statements/create.md#create-default-values) sont utilisés.
--   `size`— Length of the resulting array. Optional parameter. When using this parameter, the default value `default_x` doit être spécifié. [UInt32](../../sql-reference/data-types/int-uint.md#uint-ranges).
-
-**Valeur renvoyée**
-
--   Tableau avec des valeurs insérées.
-
-Type: [Tableau](../../sql-reference/data-types/array.md#data-type-array).
-
-**Exemple**
-
-Requête:
-
-``` sql
-SELECT groupArrayInsertAt(toString(number), number * 2) FROM numbers(5);
-```
-
-Résultat:
-
-``` text
-┌─groupArrayInsertAt(toString(number), multiply(number, 2))─┐
-│ ['0','','1','','2','','3','','4']                         │
-└───────────────────────────────────────────────────────────┘
-```
-
-Requête:
-
-``` sql
-SELECT groupArrayInsertAt('-')(toString(number), number * 2) FROM numbers(5);
-```
-
-Résultat:
-
-``` text
-┌─groupArrayInsertAt('-')(toString(number), multiply(number, 2))─┐
-│ ['0','-','1','-','2','-','3','-','4']                          │
-└────────────────────────────────────────────────────────────────┘
-```
-
-Requête:
-
-``` sql
-SELECT groupArrayInsertAt('-', 5)(toString(number), number * 2) FROM numbers(5);
-```
-
-Résultat:
-
-``` text
-┌─groupArrayInsertAt('-', 5)(toString(number), multiply(number, 2))─┐
-│ ['0','-','1','-','2']                                             │
-└───────────────────────────────────────────────────────────────────┘
-```
-
-Insertion multi-thread d'éléments dans une position.
-
-Requête:
-
-``` sql
-SELECT groupArrayInsertAt(number, 0) FROM numbers_mt(10) SETTINGS max_block_size = 1;
-```
-
-Comme un résultat de cette requête, vous obtenez entier aléatoire dans le `[0,9]` gamme. Exemple:
-
-``` text
-┌─groupArrayInsertAt(number, 0)─┐
-│ [7]                           │
-└───────────────────────────────┘
-```
-
-## groupeparraymovingsum {#agg_function-grouparraymovingsum}
-
-Calcule la somme mobile des valeurs d'entrée.
-
-``` sql
-groupArrayMovingSum(numbers_for_summing)
-groupArrayMovingSum(window_size)(numbers_for_summing)
-```
-
-La fonction peut prendre la taille de la fenêtre comme paramètre. Si spécifié, la fonction prend la taille de la fenêtre égal au nombre de lignes dans la colonne.
-
-**Paramètre**
-
--   `numbers_for_summing` — [Expression](../syntax.md#syntax-expressions) résultant en une valeur de type de données Numérique.
--   `window_size` — Size of the calculation window.
-
-**Valeurs renvoyées**
-
--   Tableau de la même taille et de même type que les données d'entrée.
-
-**Exemple**
-
-La table d'échantillon:
-
-``` sql
-CREATE TABLE t
-(
-    `int` UInt8,
-    `float` Float32,
-    `dec` Decimal32(2)
-)
-ENGINE = TinyLog
-```
-
-``` text
-┌─int─┬─float─┬──dec─┐
-│   1 │   1.1 │ 1.10 │
-│   2 │   2.2 │ 2.20 │
-│   4 │   4.4 │ 4.40 │
-│   7 │  7.77 │ 7.77 │
-└─────┴───────┴──────┘
-```
-
-Requête:
-
-``` sql
-SELECT
-    groupArrayMovingSum(int) AS I,
-    groupArrayMovingSum(float) AS F,
-    groupArrayMovingSum(dec) AS D
-FROM t
-```
-
-``` text
-┌─I──────────┬─F───────────────────────────────┬─D──────────────────────┐
-│ [1,3,7,14] │ [1.1,3.3000002,7.7000003,15.47] │ [1.10,3.30,7.70,15.47] │
-└────────────┴─────────────────────────────────┴────────────────────────┘
-```
-
-``` sql
-SELECT
-    groupArrayMovingSum(2)(int) AS I,
-    groupArrayMovingSum(2)(float) AS F,
-    groupArrayMovingSum(2)(dec) AS D
-FROM t
-```
-
-``` text
-┌─I──────────┬─F───────────────────────────────┬─D──────────────────────┐
-│ [1,3,6,11] │ [1.1,3.3000002,6.6000004,12.17] │ [1.10,3.30,6.60,12.17] │
-└────────────┴─────────────────────────────────┴────────────────────────┘
-```
-
-## groupArrayMovingAvg {#agg_function-grouparraymovingavg}
-
-Calcule la moyenne mobile des valeurs d'entrée.
-
-``` sql
-groupArrayMovingAvg(numbers_for_summing)
-groupArrayMovingAvg(window_size)(numbers_for_summing)
-```
-
-La fonction peut prendre la taille de la fenêtre comme paramètre. Si spécifié, la fonction prend la taille de la fenêtre égal au nombre de lignes dans la colonne.
-
-**Paramètre**
-
--   `numbers_for_summing` — [Expression](../syntax.md#syntax-expressions) résultant en une valeur de type de données Numérique.
--   `window_size` — Size of the calculation window.
-
-**Valeurs renvoyées**
-
--   Tableau de la même taille et de même type que les données d'entrée.
-
-La fonction utilise [l'arrondi vers zéro](https://en.wikipedia.org/wiki/Rounding#Rounding_towards_zero). Il tronque les décimales insignifiantes pour le type de données résultant.
-
-**Exemple**
-
-La table d'échantillon `b`:
-
-``` sql
-CREATE TABLE t
-(
-    `int` UInt8,
-    `float` Float32,
-    `dec` Decimal32(2)
-)
-ENGINE = TinyLog
-```
-
-``` text
-┌─int─┬─float─┬──dec─┐
-│   1 │   1.1 │ 1.10 │
-│   2 │   2.2 │ 2.20 │
-│   4 │   4.4 │ 4.40 │
-│   7 │  7.77 │ 7.77 │
-└─────┴───────┴──────┘
-```
-
-Requête:
-
-``` sql
-SELECT
-    groupArrayMovingAvg(int) AS I,
-    groupArrayMovingAvg(float) AS F,
-    groupArrayMovingAvg(dec) AS D
-FROM t
-```
-
-``` text
-┌─I─────────┬─F───────────────────────────────────┬─D─────────────────────┐
-│ [0,0,1,3] │ [0.275,0.82500005,1.9250001,3.8675] │ [0.27,0.82,1.92,3.86] │
-└───────────┴─────────────────────────────────────┴───────────────────────┘
-```
-
-``` sql
-SELECT
-    groupArrayMovingAvg(2)(int) AS I,
-    groupArrayMovingAvg(2)(float) AS F,
-    groupArrayMovingAvg(2)(dec) AS D
-FROM t
-```
-
-``` text
-┌─I─────────┬─F────────────────────────────────┬─D─────────────────────┐
-│ [0,1,3,5] │ [0.55,1.6500001,3.3000002,6.085] │ [0.55,1.65,3.30,6.08] │
-└───────────┴──────────────────────────────────┴───────────────────────┘
-```
-
-## groupUniqArray(x), groupUniqArray (max_size) (x) {#groupuniqarrayx-groupuniqarraymax-sizex}
-
-Crée un tableau à partir de différentes valeurs d'argument. La consommation de mémoire est la même que pour la `uniqExact` fonction.
-
-La deuxième version (avec le `max_size` paramètre) limite la taille du tableau résultant à `max_size` élément.
-Exemple, `groupUniqArray(1)(x)` est équivalent à `[any(x)]`.
-
-## quantile {#quantile}
-
-Calcule une approximation [quantile](https://en.wikipedia.org/wiki/Quantile) des données numériques de la séquence.
-
-Cette fonction s'applique [réservoir d'échantillonnage](https://en.wikipedia.org/wiki/Reservoir_sampling) avec une taille de réservoir jusqu'à 8192 et un générateur de nombres aléatoires pour l'échantillonnage. Le résultat est non-déterministe. Pour obtenir un quantile exact, Utilisez le [quantileExact](#quantileexact) fonction.
-
-Lorsque vous utilisez plusieurs `quantile*` fonctionne avec différents niveaux dans une requête, les états internes ne sont pas combinées (qui est, la requête fonctionne moins efficacement qu'il le pouvait). Dans ce cas, utilisez la [les quantiles](#quantiles) fonction.
-
-**Syntaxe**
-
-``` sql
-quantile(level)(expr)
-```
-
-Alias: `median`.
-
-**Paramètre**
-
--   `level` — Level of quantile. Optional parameter. Constant floating-point number from 0 to 1. We recommend using a `level` la valeur dans la plage de `[0.01, 0.99]`. Valeur par défaut: 0.5. À `level=0.5` la fonction calcule [médian](https://en.wikipedia.org/wiki/Median).
--   `expr` — Expression over the column values resulting in numeric [types de données](../../sql-reference/data-types/index.md#data_types), [Date](../../sql-reference/data-types/date.md) ou [DateTime](../../sql-reference/data-types/datetime.md).
-
-**Valeur renvoyée**
-
--   Approximative de quantiles de niveau spécifié.
-
-Type:
-
--   [Float64](../../sql-reference/data-types/float.md) pour l'entrée de type de données numériques.
--   [Date](../../sql-reference/data-types/date.md) si les valeurs d'entrée ont le `Date` type.
--   [DateTime](../../sql-reference/data-types/datetime.md) si les valeurs d'entrée ont le `DateTime` type.
-
-**Exemple**
-
-Table d'entrée:
-
-``` text
-┌─val─┐
-│   1 │
-│   1 │
-│   2 │
-│   3 │
-└─────┘
-```
-
-Requête:
-
-``` sql
-SELECT quantile(val) FROM t
-```
-
-Résultat:
-
-``` text
-┌─quantile(val)─┐
-│           1.5 │
-└───────────────┘
-```
-
-**Voir Aussi**
-
--   [médian](#median)
--   [les quantiles](#quantiles)
-
-## quantileDeterministic {#quantiledeterministic}
-
-Calcule une approximation [quantile](https://en.wikipedia.org/wiki/Quantile) des données numériques de la séquence.
-
-Cette fonction s'applique [réservoir d'échantillonnage](https://en.wikipedia.org/wiki/Reservoir_sampling) avec une taille de réservoir jusqu'à 8192 et un algorithme déterministe d'échantillonnage. Le résultat est déterministe. Pour obtenir un quantile exact, Utilisez le [quantileExact](#quantileexact) fonction.
-
-Lorsque vous utilisez plusieurs `quantile*` fonctionne avec différents niveaux dans une requête, les états internes ne sont pas combinées (qui est, la requête fonctionne moins efficacement qu'il le pouvait). Dans ce cas, utilisez la [les quantiles](#quantiles) fonction.
-
-**Syntaxe**
-
-``` sql
-quantileDeterministic(level)(expr, determinator)
-```
-
-Alias: `medianDeterministic`.
-
-**Paramètre**
-
--   `level` — Level of quantile. Optional parameter. Constant floating-point number from 0 to 1. We recommend using a `level` la valeur dans la plage de `[0.01, 0.99]`. Valeur par défaut: 0.5. À `level=0.5` la fonction calcule [médian](https://en.wikipedia.org/wiki/Median).
--   `expr` — Expression over the column values resulting in numeric [types de données](../../sql-reference/data-types/index.md#data_types), [Date](../../sql-reference/data-types/date.md) ou [DateTime](../../sql-reference/data-types/datetime.md).
--   `determinator` — Number whose hash is used instead of a random number generator in the reservoir sampling algorithm to make the result of sampling deterministic. As a determinator you can use any deterministic positive number, for example, a user id or an event id. If the same determinator value occures too often, the function works incorrectly.
-
-**Valeur renvoyée**
-
--   Approximative de quantiles de niveau spécifié.
-
-Type:
-
--   [Float64](../../sql-reference/data-types/float.md) pour l'entrée de type de données numériques.
--   [Date](../../sql-reference/data-types/date.md) si les valeurs d'entrée ont le `Date` type.
--   [DateTime](../../sql-reference/data-types/datetime.md) si les valeurs d'entrée ont le `DateTime` type.
-
-**Exemple**
-
-Table d'entrée:
-
-``` text
-┌─val─┐
-│   1 │
-│   1 │
-│   2 │
-│   3 │
-└─────┘
-```
-
-Requête:
-
-``` sql
-SELECT quantileDeterministic(val, 1) FROM t
-```
-
-Résultat:
-
-``` text
-┌─quantileDeterministic(val, 1)─┐
-│                           1.5 │
-└───────────────────────────────┘
-```
-
-**Voir Aussi**
-
--   [médian](#median)
--   [les quantiles](#quantiles)
-
-## quantileExact {#quantileexact}
-
-Exactement calcule l' [quantile](https://en.wikipedia.org/wiki/Quantile) des données numériques de la séquence.
-
-To get exact value, all the passed values ​​are combined into an array, which is then partially sorted. Therefore, the function consumes `O(n)` de mémoire, où `n` est un nombre de valeurs qui ont été passées. Cependant, pour un petit nombre de valeurs, la fonction est très efficace.
-
-Lorsque vous utilisez plusieurs `quantile*` fonctionne avec différents niveaux dans une requête, les états internes ne sont pas combinées (qui est, la requête fonctionne moins efficacement qu'il le pouvait). Dans ce cas, utilisez la [les quantiles](#quantiles) fonction.
-
-**Syntaxe**
-
-``` sql
-quantileExact(level)(expr)
-```
-
-Alias: `medianExact`.
-
-**Paramètre**
-
--   `level` — Level of quantile. Optional parameter. Constant floating-point number from 0 to 1. We recommend using a `level` la valeur dans la plage de `[0.01, 0.99]`. Valeur par défaut: 0.5. À `level=0.5` la fonction calcule [médian](https://en.wikipedia.org/wiki/Median).
--   `expr` — Expression over the column values resulting in numeric [types de données](../../sql-reference/data-types/index.md#data_types), [Date](../../sql-reference/data-types/date.md) ou [DateTime](../../sql-reference/data-types/datetime.md).
-
-**Valeur renvoyée**
-
--   Quantiles de niveau spécifié.
-
-Type:
-
--   [Float64](../../sql-reference/data-types/float.md) pour l'entrée de type de données numériques.
--   [Date](../../sql-reference/data-types/date.md) si les valeurs d'entrée ont le `Date` type.
--   [DateTime](../../sql-reference/data-types/datetime.md) si les valeurs d'entrée ont le `DateTime` type.
-
-**Exemple**
-
-Requête:
-
-``` sql
-SELECT quantileExact(number) FROM numbers(10)
-```
-
-Résultat:
-
-``` text
-┌─quantileExact(number)─┐
-│                     5 │
-└───────────────────────┘
-```
-
-**Voir Aussi**
-
--   [médian](#median)
--   [les quantiles](#quantiles)
-
-## quantileExactWeighted {#quantileexactweighted}
-
-Exactement calcule l' [quantile](https://en.wikipedia.org/wiki/Quantile) d'une séquence de données numériques, en tenant compte du poids de chaque élément.
-
-To get exact value, all the passed values ​​are combined into an array, which is then partially sorted. Each value is counted with its weight, as if it is present `weight` times. A hash table is used in the algorithm. Because of this, if the passed values ​​are frequently repeated, the function consumes less RAM than [quantileExact](#quantileexact). Vous pouvez utiliser cette fonction au lieu de `quantileExact` et spécifiez le poids 1.
-
-Lorsque vous utilisez plusieurs `quantile*` fonctionne avec différents niveaux dans une requête, les états internes ne sont pas combinées (qui est, la requête fonctionne moins efficacement qu'il le pouvait). Dans ce cas, utilisez la [les quantiles](#quantiles) fonction.
-
-**Syntaxe**
-
-``` sql
-quantileExactWeighted(level)(expr, weight)
-```
-
-Alias: `medianExactWeighted`.
-
-**Paramètre**
-
--   `level` — Level of quantile. Optional parameter. Constant floating-point number from 0 to 1. We recommend using a `level` la valeur dans la plage de `[0.01, 0.99]`. Valeur par défaut: 0.5. À `level=0.5` la fonction calcule [médian](https://en.wikipedia.org/wiki/Median).
--   `expr` — Expression over the column values resulting in numeric [types de données](../../sql-reference/data-types/index.md#data_types), [Date](../../sql-reference/data-types/date.md) ou [DateTime](../../sql-reference/data-types/datetime.md).
--   `weight` — Column with weights of sequence members. Weight is a number of value occurrences.
-
-**Valeur renvoyée**
-
--   Quantiles de niveau spécifié.
-
-Type:
-
--   [Float64](../../sql-reference/data-types/float.md) pour l'entrée de type de données numériques.
--   [Date](../../sql-reference/data-types/date.md) si les valeurs d'entrée ont le `Date` type.
--   [DateTime](../../sql-reference/data-types/datetime.md) si les valeurs d'entrée ont le `DateTime` type.
-
-**Exemple**
-
-Table d'entrée:
-
-``` text
-┌─n─┬─val─┐
-│ 0 │   3 │
-│ 1 │   2 │
-│ 2 │   1 │
-│ 5 │   4 │
-└───┴─────┘
-```
-
-Requête:
-
-``` sql
-SELECT quantileExactWeighted(n, val) FROM t
-```
-
-Résultat:
-
-``` text
-┌─quantileExactWeighted(n, val)─┐
-│                             1 │
-└───────────────────────────────┘
-```
-
-**Voir Aussi**
-
--   [médian](#median)
--   [les quantiles](#quantiles)
-
-## quantileTiming {#quantiletiming}
-
-Avec la précision déterminée calcule le [quantile](https://en.wikipedia.org/wiki/Quantile) des données numériques de la séquence.
-
-Le résultat est déterministe (il ne dépend pas de l'ordre de traitement de la requête). La fonction est optimisée pour travailler avec des séquences qui décrivent des distributions comme les temps de chargement des pages web ou les temps de réponse du backend.
-
-Lorsque vous utilisez plusieurs `quantile*` fonctionne avec différents niveaux dans une requête, les états internes ne sont pas combinées (qui est, la requête fonctionne moins efficacement qu'il le pouvait). Dans ce cas, utilisez la [les quantiles](#quantiles) fonction.
-
-**Syntaxe**
-
-``` sql
-quantileTiming(level)(expr)
-```
-
-Alias: `medianTiming`.
-
-**Paramètre**
-
--   `level` — Level of quantile. Optional parameter. Constant floating-point number from 0 to 1. We recommend using a `level` la valeur dans la plage de `[0.01, 0.99]`. Valeur par défaut: 0.5. À `level=0.5` la fonction calcule [médian](https://en.wikipedia.org/wiki/Median).
-
--   `expr` — [Expression](../syntax.md#syntax-expressions) sur une colonne Valeurs renvoyant un [Flottant\*](../../sql-reference/data-types/float.md)numéro de type.
-
-        - If negative values are passed to the function, the behavior is undefined.
-        - If the value is greater than 30,000 (a page loading time of more than 30 seconds), it is assumed to be 30,000.
-
-**Exactitude**
-
-Le calcul est précis si:
-
--   Le nombre Total de valeurs ne dépasse pas 5670.
--   Le nombre Total de valeurs dépasse 5670, mais le temps de chargement de la page est inférieur à 1024ms.
-
-Sinon, le résultat du calcul est arrondi au plus proche multiple de 16 ms.
-
-!!! note "Note"
-    Pour calculer les quantiles de temps de chargement de page, cette fonction est plus efficace et précise que [quantile](#quantile).
-
-**Valeur renvoyée**
-
--   Quantiles de niveau spécifié.
-
-Type: `Float32`.
-
-!!! note "Note"
-    Si aucune valeur n'est transmise à la fonction (lors de l'utilisation de `quantileTimingIf`), [Nan](../../sql-reference/data-types/float.md#data_type-float-nan-inf) est retourné. Le but est de différencier ces cas de cas qui aboutissent à zéro. Voir [Clause ORDER BY](../statements/select/order-by.md#select-order-by) pour des notes sur le tri `NaN` valeur.
-
-**Exemple**
-
-Table d'entrée:
-
-``` text
-┌─response_time─┐
-│            72 │
-│           112 │
-│           126 │
-│           145 │
-│           104 │
-│           242 │
-│           313 │
-│           168 │
-│           108 │
-└───────────────┘
-```
-
-Requête:
-
-``` sql
-SELECT quantileTiming(response_time) FROM t
-```
-
-Résultat:
-
-``` text
-┌─quantileTiming(response_time)─┐
-│                           126 │
-└───────────────────────────────┘
-```
-
-**Voir Aussi**
-
--   [médian](#median)
--   [les quantiles](#quantiles)
-
-## quantileTimingWeighted {#quantiletimingweighted}
-
-Avec la précision déterminée calcule le [quantile](https://en.wikipedia.org/wiki/Quantile) d'une séquence de données numériques en fonction du poids de chaque élément de séquence.
-
-Le résultat est déterministe (il ne dépend pas de l'ordre de traitement de la requête). La fonction est optimisée pour travailler avec des séquences qui décrivent des distributions comme les temps de chargement des pages web ou les temps de réponse du backend.
-
-Lorsque vous utilisez plusieurs `quantile*` fonctionne avec différents niveaux dans une requête, les états internes ne sont pas combinées (qui est, la requête fonctionne moins efficacement qu'il le pouvait). Dans ce cas, utilisez la [les quantiles](#quantiles) fonction.
-
-**Syntaxe**
-
-``` sql
-quantileTimingWeighted(level)(expr, weight)
-```
-
-Alias: `medianTimingWeighted`.
-
-**Paramètre**
-
--   `level` — Level of quantile. Optional parameter. Constant floating-point number from 0 to 1. We recommend using a `level` la valeur dans la plage de `[0.01, 0.99]`. Valeur par défaut: 0.5. À `level=0.5` la fonction calcule [médian](https://en.wikipedia.org/wiki/Median).
-
--   `expr` — [Expression](../syntax.md#syntax-expressions) sur une colonne Valeurs renvoyant un [Flottant\*](../../sql-reference/data-types/float.md)numéro de type.
-
-        - If negative values are passed to the function, the behavior is undefined.
-        - If the value is greater than 30,000 (a page loading time of more than 30 seconds), it is assumed to be 30,000.
-
--   `weight` — Column with weights of sequence elements. Weight is a number of value occurrences.
-
-**Exactitude**
-
-Le calcul est précis si:
-
--   Le nombre Total de valeurs ne dépasse pas 5670.
--   Le nombre Total de valeurs dépasse 5670, mais le temps de chargement de la page est inférieur à 1024ms.
-
-Sinon, le résultat du calcul est arrondi au plus proche multiple de 16 ms.
-
-!!! note "Note"
-    Pour calculer les quantiles de temps de chargement de page, cette fonction est plus efficace et précise que [quantile](#quantile).
-
-**Valeur renvoyée**
-
--   Quantiles de niveau spécifié.
-
-Type: `Float32`.
-
-!!! note "Note"
-    Si aucune valeur n'est transmise à la fonction (lors de l'utilisation de `quantileTimingIf`), [Nan](../../sql-reference/data-types/float.md#data_type-float-nan-inf) est retourné. Le but est de différencier ces cas de cas qui aboutissent à zéro. Voir [Clause ORDER BY](../statements/select/order-by.md#select-order-by) pour des notes sur le tri `NaN` valeur.
-
-**Exemple**
-
-Table d'entrée:
-
-``` text
-┌─response_time─┬─weight─┐
-│            68 │      1 │
-│           104 │      2 │
-│           112 │      3 │
-│           126 │      2 │
-│           138 │      1 │
-│           162 │      1 │
-└───────────────┴────────┘
-```
-
-Requête:
-
-``` sql
-SELECT quantileTimingWeighted(response_time, weight) FROM t
-```
-
-Résultat:
-
-``` text
-┌─quantileTimingWeighted(response_time, weight)─┐
-│                                           112 │
-└───────────────────────────────────────────────┘
-```
-
-**Voir Aussi**
-
--   [médian](#median)
--   [les quantiles](#quantiles)
-
-## quantileTDigest {#quantiletdigest}
-
-Calcule une approximation [quantile](https://en.wikipedia.org/wiki/Quantile) d'une séquence de données numériques utilisant [t-digest](https://github.com/tdunning/t-digest/blob/master/docs/t-digest-paper/histo.pdf) algorithme.
-
-L'erreur maximale est de 1%. La consommation de mémoire est `log(n)`, où `n` est un certain nombre de valeurs. Le résultat dépend de l'ordre d'exécution de la requête et n'est pas déterministe.
-
-La performance de la fonction est inférieure à la performance de [quantile](#quantile) ou [quantileTiming](#quantiletiming). En termes de rapport entre la taille de L'état et la précision, cette fonction est bien meilleure que `quantile`.
-
-Lorsque vous utilisez plusieurs `quantile*` fonctionne avec différents niveaux dans une requête, les états internes ne sont pas combinées (qui est, la requête fonctionne moins efficacement qu'il le pouvait). Dans ce cas, utilisez la [les quantiles](#quantiles) fonction.
-
-**Syntaxe**
-
-``` sql
-quantileTDigest(level)(expr)
-```
-
-Alias: `medianTDigest`.
-
-**Paramètre**
-
--   `level` — Level of quantile. Optional parameter. Constant floating-point number from 0 to 1. We recommend using a `level` la valeur dans la plage de `[0.01, 0.99]`. Valeur par défaut: 0.5. À `level=0.5` la fonction calcule [médian](https://en.wikipedia.org/wiki/Median).
--   `expr` — Expression over the column values resulting in numeric [types de données](../../sql-reference/data-types/index.md#data_types), [Date](../../sql-reference/data-types/date.md) ou [DateTime](../../sql-reference/data-types/datetime.md).
-
-**Valeur renvoyée**
-
--   Approximative de quantiles de niveau spécifié.
-
-Type:
-
--   [Float64](../../sql-reference/data-types/float.md) pour l'entrée de type de données numériques.
--   [Date](../../sql-reference/data-types/date.md) si les valeurs d'entrée ont le `Date` type.
--   [DateTime](../../sql-reference/data-types/datetime.md) si les valeurs d'entrée ont le `DateTime` type.
-
-**Exemple**
-
-Requête:
-
-``` sql
-SELECT quantileTDigest(number) FROM numbers(10)
-```
-
-Résultat:
-
-``` text
-┌─quantileTDigest(number)─┐
-│                     4.5 │
-└─────────────────────────┘
-```
-
-**Voir Aussi**
-
--   [médian](#median)
--   [les quantiles](#quantiles)
-
-## quantileTDigestWeighted {#quantiletdigestweighted}
-
-Calcule une approximation [quantile](https://en.wikipedia.org/wiki/Quantile) d'une séquence de données numériques utilisant [t-digest](https://github.com/tdunning/t-digest/blob/master/docs/t-digest-paper/histo.pdf) algorithme. La fonction prend en compte le poids de chaque séquence de membre. L'erreur maximale est de 1%. La consommation de mémoire est `log(n)`, où `n` est un certain nombre de valeurs.
-
-La performance de la fonction est inférieure à la performance de [quantile](#quantile) ou [quantileTiming](#quantiletiming). En termes de rapport entre la taille de L'état et la précision, cette fonction est bien meilleure que `quantile`.
-
-Le résultat dépend de l'ordre d'exécution de la requête et n'est pas déterministe.
-
-Lorsque vous utilisez plusieurs `quantile*` fonctionne avec différents niveaux dans une requête, les états internes ne sont pas combinées (qui est, la requête fonctionne moins efficacement qu'il le pouvait). Dans ce cas, utilisez la [les quantiles](#quantiles) fonction.
-
-**Syntaxe**
-
-``` sql
-quantileTDigest(level)(expr)
-```
-
-Alias: `medianTDigest`.
-
-**Paramètre**
-
--   `level` — Level of quantile. Optional parameter. Constant floating-point number from 0 to 1. We recommend using a `level` la valeur dans la plage de `[0.01, 0.99]`. Valeur par défaut: 0.5. À `level=0.5` la fonction calcule [médian](https://en.wikipedia.org/wiki/Median).
--   `expr` — Expression over the column values resulting in numeric [types de données](../../sql-reference/data-types/index.md#data_types), [Date](../../sql-reference/data-types/date.md) ou [DateTime](../../sql-reference/data-types/datetime.md).
--   `weight` — Column with weights of sequence elements. Weight is a number of value occurrences.
-
-**Valeur renvoyée**
-
--   Approximative de quantiles de niveau spécifié.
-
-Type:
-
--   [Float64](../../sql-reference/data-types/float.md) pour l'entrée de type de données numériques.
--   [Date](../../sql-reference/data-types/date.md) si les valeurs d'entrée ont le `Date` type.
--   [DateTime](../../sql-reference/data-types/datetime.md) si les valeurs d'entrée ont le `DateTime` type.
-
-**Exemple**
-
-Requête:
-
-``` sql
-SELECT quantileTDigestWeighted(number, 1) FROM numbers(10)
-```
-
-Résultat:
-
-``` text
-┌─quantileTDigestWeighted(number, 1)─┐
-│                                4.5 │
-└────────────────────────────────────┘
-```
-
-**Voir Aussi**
-
--   [médian](#median)
--   [les quantiles](#quantiles)
-
-## médian {#median}
-
-Le `median*` les fonctions sont les Alias pour le correspondant `quantile*` fonction. Ils calculent la médiane d'un échantillon de données numériques.
-
-Fonction:
-
--   `median` — Alias for [quantile](#quantile).
--   `medianDeterministic` — Alias for [quantileDeterministic](#quantiledeterministic).
--   `medianExact` — Alias for [quantileExact](#quantileexact).
--   `medianExactWeighted` — Alias for [quantileExactWeighted](#quantileexactweighted).
--   `medianTiming` — Alias for [quantileTiming](#quantiletiming).
--   `medianTimingWeighted` — Alias for [quantileTimingWeighted](#quantiletimingweighted).
--   `medianTDigest` — Alias for [quantileTDigest](#quantiletdigest).
--   `medianTDigestWeighted` — Alias for [quantileTDigestWeighted](#quantiletdigestweighted).
-
-**Exemple**
-
-Table d'entrée:
-
-``` text
-┌─val─┐
-│   1 │
-│   1 │
-│   2 │
-│   3 │
-└─────┘
-```
-
-Requête:
-
-``` sql
-SELECT medianDeterministic(val, 1) FROM t
-```
-
-Résultat:
-
-``` text
-┌─medianDeterministic(val, 1)─┐
-│                         1.5 │
-└─────────────────────────────┘
-```
-
-## quantiles(level1, level2, …)(x) {#quantiles}
-
-Toutes les fonctions quantiles ont également des fonctions quantiles correspondantes: `quantiles`, `quantilesDeterministic`, `quantilesTiming`, `quantilesTimingWeighted`, `quantilesExact`, `quantilesExactWeighted`, `quantilesTDigest`. Ces fonctions calculent tous les quantiles des niveaux listés en une seule passe et renvoient un tableau des valeurs résultantes.
-
-## varSamp (x) {#varsampx}
-
-Calcule le montant `Σ((x - x̅)^2) / (n - 1)`, où `n` est la taille de l'échantillon et `x̅`est la valeur moyenne de `x`.
-
-Il représente une estimation non biaisée de la variance d'une variable aléatoire si les valeurs passées forment son échantillon.
-
-Retourner `Float64`. Lorsque `n <= 1`, retourner `+∞`.
-
-!!! note "Note"
-    Cette fonction utilise un algorithme numériquement instable. Si vous avez besoin d' [stabilité numérique](https://en.wikipedia.org/wiki/Numerical_stability) dans les calculs, utiliser le `varSampStable` fonction. Il fonctionne plus lentement, mais fournit une erreur de calcul inférieure.
-
-## varPop (x) {#varpopx}
-
-Calcule le montant `Σ((x - x̅)^2) / n`, où `n` est la taille de l'échantillon et `x̅`est la valeur moyenne de `x`.
-
-En d'autres termes, dispersion pour un ensemble de valeurs. Retourner `Float64`.
-
-!!! note "Note"
-    Cette fonction utilise un algorithme numériquement instable. Si vous avez besoin d' [stabilité numérique](https://en.wikipedia.org/wiki/Numerical_stability) dans les calculs, utiliser le `varPopStable` fonction. Il fonctionne plus lentement, mais fournit une erreur de calcul inférieure.
-
-## stddevSamp (x) {#stddevsampx}
-
-Le résultat est égal à la racine carrée de `varSamp(x)`.
-
-!!! note "Note"
-    Cette fonction utilise un algorithme numériquement instable. Si vous avez besoin d' [stabilité numérique](https://en.wikipedia.org/wiki/Numerical_stability) dans les calculs, utiliser le `stddevSampStable` fonction. Il fonctionne plus lentement, mais fournit une erreur de calcul inférieure.
-
-## stddevPop (x) {#stddevpopx}
-
-Le résultat est égal à la racine carrée de `varPop(x)`.
-
-!!! note "Note"
-    Cette fonction utilise un algorithme numériquement instable. Si vous avez besoin d' [stabilité numérique](https://en.wikipedia.org/wiki/Numerical_stability) dans les calculs, utiliser le `stddevPopStable` fonction. Il fonctionne plus lentement, mais fournit une erreur de calcul inférieure.
-
-## topK (N) (x) {#topknx}
-
-Renvoie un tableau des valeurs approximativement les plus fréquentes dans la colonne spécifiée. Le tableau est trié par ordre décroissant de fréquence approximative des valeurs (et non par les valeurs elles-mêmes).
-
-Met en œuvre la [Gain De Place Filtré](http://www.l2f.inesc-id.pt/~fmmb/wiki/uploads/Work/misnis.ref0a.pdf) algorithme d'analyse de TopK, basé sur l'algorithme de réduction et de combinaison de [Économie D'Espace Parallèle](https://arxiv.org/pdf/1401.0702.pdf).
-
-``` sql
-topK(N)(column)
-```
-
-Cette fonction ne fournit pas un résultat garanti. Dans certaines situations, des erreurs peuvent se produire et renvoyer des valeurs fréquentes qui ne sont pas les valeurs les plus fréquentes.
-
-Nous vous recommandons d'utiliser l' `N < 10` valeur; performance est réduite avec grand `N` valeur. Valeur maximale de `N = 65536`.
-
-**Paramètre**
-
--   ‘N’ est le nombre d'éléments de retour.
-
-Si le paramètre est omis, la valeur par défaut 10 est utilisé.
-
-**Argument**
-
--   ' x ' – The value to calculate frequency.
-
-**Exemple**
-
-Prendre la [OnTime](../../getting-started/example-datasets/ontime.md) ensemble de données et sélectionnez les trois valeurs les plus fréquentes `AirlineID` colonne.
-
-``` sql
-SELECT topK(3)(AirlineID) AS res
-FROM ontime
-```
-
-``` text
-┌─res─────────────────┐
-│ [19393,19790,19805] │
-└─────────────────────┘
-```
-
-## topKWeighted {#topkweighted}
-
-Semblable à `topK` mais prend un argument de type entier - `weight`. Chaque valeur est comptabilisée `weight` les temps de calcul de fréquence.
-
-**Syntaxe**
-
-``` sql
-topKWeighted(N)(x, weight)
-```
-
-**Paramètre**
-
--   `N` — The number of elements to return.
-
-**Argument**
-
--   `x` – The value.
--   `weight` — The weight. [UInt8](../../sql-reference/data-types/int-uint.md).
-
-**Valeur renvoyée**
-
-Renvoie un tableau des valeurs avec la somme approximative maximale des poids.
-
-**Exemple**
-
-Requête:
-
-``` sql
-SELECT topKWeighted(10)(number, number) FROM numbers(1000)
-```
-
-Résultat:
-
-``` text
-┌─topKWeighted(10)(number, number)──────────┐
-│ [999,998,997,996,995,994,993,992,991,990] │
-└───────────────────────────────────────────┘
-```
-
-## covarSamp(x, y) {#covarsampx-y}
-
-Calcule la valeur de `Σ((x - x̅)(y - y̅)) / (n - 1)`.
-
-Renvoie Float64. Lorsque `n <= 1`, returns +∞.
-
-!!! note "Note"
-    Cette fonction utilise un algorithme numériquement instable. Si vous avez besoin d' [stabilité numérique](https://en.wikipedia.org/wiki/Numerical_stability) dans les calculs, utiliser le `covarSampStable` fonction. Il fonctionne plus lentement, mais fournit une erreur de calcul inférieure.
-
-## covarPop (x, y) {#covarpopx-y}
-
-Calcule la valeur de `Σ((x - x̅)(y - y̅)) / n`.
-
-!!! note "Note"
-    Cette fonction utilise un algorithme numériquement instable. Si vous avez besoin d' [stabilité numérique](https://en.wikipedia.org/wiki/Numerical_stability) dans les calculs, utiliser le `covarPopStable` fonction. Cela fonctionne plus lentement mais fournit une erreur de calcul inférieure.
-
-## corr (x, y) {#corrx-y}
-
-Calcule le coefficient de corrélation de Pearson: `Σ((x - x̅)(y - y̅)) / sqrt(Σ((x - x̅)^2) * Σ((y - y̅)^2))`.
-
-!!! note "Note"
-    Cette fonction utilise un algorithme numériquement instable. Si vous avez besoin d' [stabilité numérique](https://en.wikipedia.org/wiki/Numerical_stability) dans les calculs, utiliser le `corrStable` fonction. Il fonctionne plus lentement, mais fournit une erreur de calcul inférieure.
-
-## categoricalInformationValue {#categoricalinformationvalue}
-
-Calcule la valeur de `(P(tag = 1) - P(tag = 0))(log(P(tag = 1)) - log(P(tag = 0)))` pour chaque catégorie.
-
-``` sql
-categoricalInformationValue(category1, category2, ..., tag)
-```
-
-Le résultat indique comment une caractéristique discrète (catégorique) `[category1, category2, ...]` contribuer à un modèle d'apprentissage qui prédit la valeur de `tag`.
-
-## simplelineearregression {#simplelinearregression}
-
-Effectue une régression linéaire simple (unidimensionnelle).
-
-``` sql
-simpleLinearRegression(x, y)
-```
-
-Paramètre:
-
--   `x` — Column with dependent variable values.
--   `y` — Column with explanatory variable values.
-
-Valeurs renvoyées:
-
-Constant `(a, b)` de la ligne `y = a*x + b`.
-
-**Exemple**
-
-``` sql
-SELECT arrayReduce('simpleLinearRegression', [0, 1, 2, 3], [0, 1, 2, 3])
-```
-
-``` text
-┌─arrayReduce('simpleLinearRegression', [0, 1, 2, 3], [0, 1, 2, 3])─┐
-│ (1,0)                                                             │
-└───────────────────────────────────────────────────────────────────┘
-```
-
-``` sql
-SELECT arrayReduce('simpleLinearRegression', [0, 1, 2, 3], [3, 4, 5, 6])
-```
-
-``` text
-┌─arrayReduce('simpleLinearRegression', [0, 1, 2, 3], [3, 4, 5, 6])─┐
-│ (1,3)                                                             │
-└───────────────────────────────────────────────────────────────────┘
-```
-
-## stochasticLinearRegression {#agg_functions-stochasticlinearregression}
-
-Cette fonction implémente la régression linéaire stochastique. Il prend en charge les paramètres personnalisés pour le taux d'apprentissage, le coefficient de régularisation L2, la taille de mini-lot et a peu de méthodes pour mettre à jour les poids ([Adam](https://en.wikipedia.org/wiki/Stochastic_gradient_descent#Adam) (utilisé par défaut), [simple SGD](https://en.wikipedia.org/wiki/Stochastic_gradient_descent), [Élan](https://en.wikipedia.org/wiki/Stochastic_gradient_descent#Momentum), [Nesterov](https://mipt.ru/upload/medialibrary/d7e/41-91.pdf)).
-
-### Paramètre {#agg_functions-stochasticlinearregression-parameters}
-
-Il y a 4 paramètres personnalisables. Ils sont passés à la fonction séquentiellement, mais il n'est pas nécessaire de passer tous les quatre-les valeurs par défaut seront utilisées, mais un bon modèle nécessite un réglage des paramètres.
-
-``` text
-stochasticLinearRegression(1.0, 1.0, 10, 'SGD')
-```
-
-1.  `learning rate` est le coefficient sur la longueur de l'étape, lorsque l'étape de descente de gradient est effectuée. Un taux d'apprentissage trop élevé peut entraîner des poids infinis du modèle. Par défaut est `0.00001`.
-2.  `l2 regularization coefficient` ce qui peut aider à éviter le surajustement. Par défaut est `0.1`.
-3.  `mini-batch size` définit le nombre d'éléments, dont les gradients seront calculés et additionnés pour effectuer une étape de descente de gradient. La descente stochastique Pure utilise un élément, mais avoir de petits lots (environ 10 éléments) rend les étapes de gradient plus stables. Par défaut est `15`.
-4.  `method for updating weights` ils sont: `Adam` (par défaut), `SGD`, `Momentum`, `Nesterov`. `Momentum` et `Nesterov` nécessitent un peu plus de calculs et de mémoire, mais ils sont utiles en termes de vitesse de convergence et de stabilité des méthodes de gradient stochastique.
-
-### Utilisation {#agg_functions-stochasticlinearregression-usage}
-
-`stochasticLinearRegression` est utilisé en deux étapes: ajustement du modèle et prédiction sur de nouvelles données. Afin de correspondre le modèle et l'enregistrer son état pour utilisation ultérieure nous utilisons `-State` combinator, qui enregistre essentiellement l'état (poids du modèle, etc.).
-Pour prédire nous utilisons la fonction [evalMLMethod](../functions/machine-learning-functions.md#machine_learning_methods-evalmlmethod) qui prend un état comme un argument ainsi que des fonctionnalités à prévoir sur.
-
-<a name="stochasticlinearregression-usage-fitting"></a>
-
-**1.** Raccord
-
-Une telle requête peut être utilisé.
-
-``` sql
-CREATE TABLE IF NOT EXISTS train_data
-(
-    param1 Float64,
-    param2 Float64,
-    target Float64
-) ENGINE = Memory;
-
-CREATE TABLE your_model ENGINE = Memory AS SELECT
-stochasticLinearRegressionState(0.1, 0.0, 5, 'SGD')(target, param1, param2)
-AS state FROM train_data;
-```
-
-Ici, nous devons également insérer des données dans `train_data` table. Le nombre de paramètres n'est pas fixe, il dépend uniquement du nombre d'arguments, passés dans `linearRegressionState`. Ils doivent tous être des valeurs numériques.
-Notez que la colonne avec la valeur cible (que nous aimerions apprendre à prédire) est insérée comme premier argument.
-
-**2.** Prédire
-
-Après avoir enregistré un État dans la table, nous pouvons l'utiliser plusieurs fois pour la prédiction, ou même fusionner avec d'autres États et créer de nouveaux modèles encore meilleurs.
-
-``` sql
-WITH (SELECT state FROM your_model) AS model SELECT
-evalMLMethod(model, param1, param2) FROM test_data
-```
-
-La requête renvoie une colonne de valeurs prédites. Notez que le premier argument de `evalMLMethod` être `AggregateFunctionState` objet, sont ensuite des colonnes de fonctionnalités.
-
-`test_data` est un tableau comme `train_data` mais peut ne pas contenir de valeur cible.
-
-### Note {#agg_functions-stochasticlinearregression-notes}
-
-1.  Pour fusionner deux modèles l'utilisateur peut créer une telle requête:
-    `sql  SELECT state1 + state2 FROM your_models`
-    où `your_models` le tableau contient les deux modèles. Cette requête renvoie la nouvelle `AggregateFunctionState` objet.
-
-2.  L'utilisateur peut récupérer les poids du modèle pour ses propres fins, sans enregistrer le modèle, si aucune `-State` combinator est utilisé.
-    `sql  SELECT stochasticLinearRegression(0.01)(target, param1, param2) FROM train_data`
-    Une telle requête s'adaptera au Modèle et retournera ses poids-d'abord sont des poids, qui correspondent aux paramètres du modèle, le dernier est un biais. Ainsi, dans l'exemple ci-dessus, la requête renvoie une colonne avec 3 valeurs.
-
-**Voir Aussi**
-
--   [stochasticLogisticRegression](#agg_functions-stochasticlogisticregression)
--   [Différence entre les régressions linéaires et logistiques](https://stackoverflow.com/questions/12146914/what-is-the-difference-between-linear-regression-and-logistic-regression)
-
-## stochasticLogisticRegression {#agg_functions-stochasticlogisticregression}
-
-Cette fonction implémente la régression logistique stochastique. Il peut être utilisé pour le problème de classification binaire, prend en charge les mêmes paramètres personnalisés que stochasticLinearRegression et fonctionne de la même manière.
-
-### Paramètre {#agg_functions-stochasticlogisticregression-parameters}
-
-Les paramètres sont exactement les mêmes que dans stochasticLinearRegression:
-`learning rate`, `l2 regularization coefficient`, `mini-batch size`, `method for updating weights`.
-Pour plus d'informations, voir [paramètre](#agg_functions-stochasticlinearregression-parameters).
-
-``` text
-stochasticLogisticRegression(1.0, 1.0, 10, 'SGD')
-```
-
-1.  Raccord
-
-<!-- -->
-
-    See the `Fitting` section in the [stochasticLinearRegression](#stochasticlinearregression-usage-fitting) description.
-
-    Predicted labels have to be in \[-1, 1\].
-
-1.  Prédire
-
-<!-- -->
-
-    Using saved state we can predict probability of object having label `1`.
-
-    ``` sql
-    WITH (SELECT state FROM your_model) AS model SELECT
-    evalMLMethod(model, param1, param2) FROM test_data
-    ```
-
-    The query will return a column of probabilities. Note that first argument of `evalMLMethod` is `AggregateFunctionState` object, next are columns of features.
-
-    We can also set a bound of probability, which assigns elements to different labels.
-
-    ``` sql
-    SELECT ans < 1.1 AND ans > 0.5 FROM
-    (WITH (SELECT state FROM your_model) AS model SELECT
-    evalMLMethod(model, param1, param2) AS ans FROM test_data)
-    ```
-
-    Then the result will be labels.
-
-    `test_data` is a table like `train_data` but may not contain target value.
-
-**Voir Aussi**
-
--   [stochasticLinearRegression](#agg_functions-stochasticlinearregression)
--   [Différence entre les régressions linéaires et logistiques.](https://stackoverflow.com/questions/12146914/what-is-the-difference-between-linear-regression-and-logistic-regression)
-
-## groupBitmapAnd {#groupbitmapand}
-
-Calculs le et d'une colonne bitmap, retour cardinalité de type UInt64, si Ajouter suffixe-État, puis retour [objet bitmap](../../sql-reference/functions/bitmap-functions.md).
-
-``` sql
-groupBitmapAnd(expr)
-```
-
-**Paramètre**
-
-`expr` – An expression that results in `AggregateFunction(groupBitmap, UInt*)` type.
-
-**Valeur de retour**
-
-La valeur de la `UInt64` type.
-
-**Exemple**
-
-``` sql
-DROP TABLE IF EXISTS bitmap_column_expr_test2;
-CREATE TABLE bitmap_column_expr_test2
-(
-    tag_id String,
-    z AggregateFunction(groupBitmap, UInt32)
-)
-ENGINE = MergeTree
-ORDER BY tag_id;
-
-INSERT INTO bitmap_column_expr_test2 VALUES ('tag1', bitmapBuild(cast([1,2,3,4,5,6,7,8,9,10] as Array(UInt32))));
-INSERT INTO bitmap_column_expr_test2 VALUES ('tag2', bitmapBuild(cast([6,7,8,9,10,11,12,13,14,15] as Array(UInt32))));
-INSERT INTO bitmap_column_expr_test2 VALUES ('tag3', bitmapBuild(cast([2,4,6,8,10,12] as Array(UInt32))));
-
-SELECT groupBitmapAnd(z) FROM bitmap_column_expr_test2 WHERE like(tag_id, 'tag%');
-┌─groupBitmapAnd(z)─┐
-│               3   │
-└───────────────────┘
-
-SELECT arraySort(bitmapToArray(groupBitmapAndState(z))) FROM bitmap_column_expr_test2 WHERE like(tag_id, 'tag%');
-┌─arraySort(bitmapToArray(groupBitmapAndState(z)))─┐
-│ [6,8,10]                                         │
-└──────────────────────────────────────────────────┘
-```
-
-## groupBitmapOr {#groupbitmapor}
-
-Calculs le ou d'une colonne bitmap, retour cardinalité de type UInt64, si Ajouter suffixe-État, puis retour [objet bitmap](../../sql-reference/functions/bitmap-functions.md). C'est l'équivalent de `groupBitmapMerge`.
-
-``` sql
-groupBitmapOr(expr)
-```
-
-**Paramètre**
-
-`expr` – An expression that results in `AggregateFunction(groupBitmap, UInt*)` type.
-
-**Valeur de retour**
-
-La valeur de la `UInt64` type.
-
-**Exemple**
-
-``` sql
-DROP TABLE IF EXISTS bitmap_column_expr_test2;
-CREATE TABLE bitmap_column_expr_test2
-(
-    tag_id String,
-    z AggregateFunction(groupBitmap, UInt32)
-)
-ENGINE = MergeTree
-ORDER BY tag_id;
-
-INSERT INTO bitmap_column_expr_test2 VALUES ('tag1', bitmapBuild(cast([1,2,3,4,5,6,7,8,9,10] as Array(UInt32))));
-INSERT INTO bitmap_column_expr_test2 VALUES ('tag2', bitmapBuild(cast([6,7,8,9,10,11,12,13,14,15] as Array(UInt32))));
-INSERT INTO bitmap_column_expr_test2 VALUES ('tag3', bitmapBuild(cast([2,4,6,8,10,12] as Array(UInt32))));
-
-SELECT groupBitmapOr(z) FROM bitmap_column_expr_test2 WHERE like(tag_id, 'tag%');
-┌─groupBitmapOr(z)─┐
-│             15   │
-└──────────────────┘
-
-SELECT arraySort(bitmapToArray(groupBitmapOrState(z))) FROM bitmap_column_expr_test2 WHERE like(tag_id, 'tag%');
-┌─arraySort(bitmapToArray(groupBitmapOrState(z)))─┐
-│ [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15]           │
-└─────────────────────────────────────────────────┘
-```
-
-## groupBitmapXor {#groupbitmapxor}
-
-Calculs le XOR d'une colonne bitmap, retour cardinalité de type UInt64, si Ajouter suffixe-État, puis retour [objet bitmap](../../sql-reference/functions/bitmap-functions.md).
-
-``` sql
-groupBitmapOr(expr)
-```
-
-**Paramètre**
-
-`expr` – An expression that results in `AggregateFunction(groupBitmap, UInt*)` type.
-
-**Valeur de retour**
-
-La valeur de la `UInt64` type.
-
-**Exemple**
-
-``` sql
-DROP TABLE IF EXISTS bitmap_column_expr_test2;
-CREATE TABLE bitmap_column_expr_test2
-(
-    tag_id String,
-    z AggregateFunction(groupBitmap, UInt32)
-)
-ENGINE = MergeTree
-ORDER BY tag_id;
-
-INSERT INTO bitmap_column_expr_test2 VALUES ('tag1', bitmapBuild(cast([1,2,3,4,5,6,7,8,9,10] as Array(UInt32))));
-INSERT INTO bitmap_column_expr_test2 VALUES ('tag2', bitmapBuild(cast([6,7,8,9,10,11,12,13,14,15] as Array(UInt32))));
-INSERT INTO bitmap_column_expr_test2 VALUES ('tag3', bitmapBuild(cast([2,4,6,8,10,12] as Array(UInt32))));
-
-SELECT groupBitmapXor(z) FROM bitmap_column_expr_test2 WHERE like(tag_id, 'tag%');
-┌─groupBitmapXor(z)─┐
-│              10   │
-└───────────────────┘
-
-SELECT arraySort(bitmapToArray(groupBitmapXorState(z))) FROM bitmap_column_expr_test2 WHERE like(tag_id, 'tag%');
-┌─arraySort(bitmapToArray(groupBitmapXorState(z)))─┐
-│ [1,3,5,6,8,10,11,13,14,15]                       │
-└──────────────────────────────────────────────────┘
-```
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/agg_functions/reference/) <!--hide-->
diff --git a/docs/fr/sql-reference/ansi.md b/docs/fr/sql-reference/ansi.md
deleted file mode 100644
index 9fd4ed428a2..00000000000
--- a/docs/fr/sql-reference/ansi.md
+++ /dev/null
@@ -1,180 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: ad252bbb4f7e2899c448eb42ecc39ff195c8faa1
-toc_priority: 40
-toc_title: "La Compatibilit\xE9 ANSI"
----
-
-# Compatibilité ANSI SQL du dialecte CLICKHOUSE SQL {#ansi-sql-compatibility-of-clickhouse-sql-dialect}
-
-!!! note "Note"
-    Cet article s'appuie sur le tableau 38, “Feature taxonomy and definition for mandatory features”, Annex F of ISO/IEC CD 9075-2:2013.
-
-## Différences de comportement {#differences-in-behaviour}
-
-Le tableau suivant répertorie les cas où la fonctionnalité de requête fonctionne dans ClickHouse, mais ne se comporte pas comme spécifié dans ANSI SQL.
-
-| Feature ID | Nom De La Fonctionnalité                        | Différence                                                                                                                            |
-|------------|-------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------|
-| E011       | Types de données numériques                     | Le littéral numérique avec période est interprété comme approximatif (`Float64`) au lieu de exact (`Decimal`)                         |
-| E051-05    | Les éléments sélectionnés peuvent être renommés | Les renommages d'élément ont une portée de visibilité plus large que le simple résultat de sélection                                  |
-| E141-01    | Contraintes non nulles                          | `NOT NULL` est implicite pour les colonnes de table par défaut                                                                        |
-| E011-04    | Opérateurs arithmétiques                        | Clickhouse déborde au lieu de l'arithmétique vérifiée et modifie le type de données de résultat en fonction des règles personnalisées |
-
-## Fonction D'État {#feature-status}
-
-| Feature ID | Nom De La Fonctionnalité                                                                                                                                    | Statut                     | Commentaire                                                                                                                                                                                                           |
-|------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| **E011**   | **Types de données numériques**                                                                                                                             | **Partiel**{.text-warning} |                                                                                                                                                                                                                       |
-| E011-01    | Types de données INTEGER et SMALLINT                                                                                                                        | Oui {.text-success}         |                                                                                                                                                                                                                       |
-| E011-02    | Types de données réel, double précision et flottant types de données                                                                                        | Partiel {.text-warning}     | `FLOAT(<binary_precision>)`, `REAL` et `DOUBLE PRECISION` ne sont pas pris en charge                                                                                                                                  |
-| E011-03    | Types de données décimales et numériques                                                                                                                    | Partiel {.text-warning}     | Seulement `DECIMAL(p,s)` est pris en charge, pas `NUMERIC`                                                                                                                                                            |
-| E011-04    | Opérateurs arithmétiques                                                                                                                                    | Oui {.text-success}         |                                                                                                                                                                                                                       |
-| E011-05    | Comparaison numérique                                                                                                                                       | Oui {.text-success}         |                                                                                                                                                                                                                       |
-| E011-06    | Casting implicite parmi les types de données numériques                                                                                                     | Aucun {.text-danger}        | ANSI SQL permet la distribution implicite arbitraire entre les types numériques, tandis que ClickHouse repose sur des fonctions ayant plusieurs surcharges au lieu de la distribution implicite                       |
-| **E021**   | **Types de chaînes de caractères**                                                                                                                          | **Partiel**{.text-warning} |                                                                                                                                                                                                                       |
-| E021-01    | Type de données CARACTÈRE                                                                                                                                   | Aucun {.text-danger}        |                                                                                                                                                                                                                       |
-| E021-02    | TYPE DE DONNÉES variable de caractère                                                                                                                       | Aucun {.text-danger}        | `String` se comporte de la même manière, mais sans limite de longueur entre parenthèses                                                                                                                               |
-| E021-03    | Littéraux de caractères                                                                                                                                     | Partiel {.text-warning}     | Aucune concaténation automatique de littéraux consécutifs et prise en charge du jeu de caractères                                                                                                                     |
-| E021-04    | Fonction CHARACTER_LENGTH                                                                                                                                  | Partiel {.text-warning}     | Aucun `USING` clause                                                                                                                                                                                                  |
-| E021-05    | Fonction OCTET_LENGTH                                                                                                                                      | Aucun {.text-danger}        | `LENGTH` se comporte de la même façon                                                                                                                                                                                 |
-| E021-06    | SUBSTRING                                                                                                                                                   | Partiel {.text-warning}     | Pas de support pour `SIMILAR` et `ESCAPE` clauses, pas de `SUBSTRING_REGEX` variante                                                                                                                                  |
-| E021-07    | Concaténation de caractères                                                                                                                                 | Partiel {.text-warning}     | Aucun `COLLATE` clause                                                                                                                                                                                                |
-| E021-08    | Fonctions supérieures et inférieures                                                                                                                        | Oui {.text-success}         |                                                                                                                                                                                                                       |
-| E021-09    | La fonction TRIM                                                                                                                                            | Oui {.text-success}         |                                                                                                                                                                                                                       |
-| E021-10    | Conversion implicite entre les types de chaînes de caractères de longueur fixe et de longueur variable                                                      | Aucun {.text-danger}        | ANSI SQL permet la distribution implicite arbitraire entre les types de chaîne, tandis que ClickHouse repose sur des fonctions ayant plusieurs surcharges au lieu de la distribution implicite                        |
-| E021-11    | La POSITION de la fonction                                                                                                                                  | Partiel {.text-warning}     | Pas de support pour `IN` et `USING` clauses, pas de `POSITION_REGEX` variante                                                                                                                                         |
-| E021-12    | Comparaison de caractères                                                                                                                                   | Oui {.text-success}         |                                                                                                                                                                                                                       |
-| **E031**   | **Identificateur**                                                                                                                                          | **Partiel**{.text-warning} |                                                                                                                                                                                                                       |
-| E031-01    | Identificateurs délimités                                                                                                                                   | Partiel {.text-warning}     | Le support littéral Unicode est limité                                                                                                                                                                                |
-| E031-02    | Identificateurs minuscules                                                                                                                                  | Oui {.text-success}         |                                                                                                                                                                                                                       |
-| E031-03    | Fuite de soulignement                                                                                                                                       | Oui {.text-success}         |                                                                                                                                                                                                                       |
-| **E051**   | **Spécification de requête de base**                                                                                                                        | **Partiel**{.text-warning} |                                                                                                                                                                                                                       |
-| E051-01    | SELECT DISTINCT                                                                                                                                             | Oui {.text-success}         |                                                                                                                                                                                                                       |
-| E051-02    | Groupe par clause                                                                                                                                           | Oui {.text-success}         |                                                                                                                                                                                                                       |
-| E051-04    | GROUP BY peut contenir des colonnes `<select list>`                                                                                                         | Oui {.text-success}         |                                                                                                                                                                                                                       |
-| E051-05    | Les éléments sélectionnés peuvent être renommés                                                                                                             | Oui {.text-success}         |                                                                                                                                                                                                                       |
-| E051-06    | Clause HAVING                                                                                                                                               | Oui {.text-success}         |                                                                                                                                                                                                                       |
-| E051-07    | Qualifié \* dans la liste select                                                                                                                            | Oui {.text-success}         |                                                                                                                                                                                                                       |
-| E051-08    | Nom de corrélation dans la clause FROM                                                                                                                      | Oui {.text-success}         |                                                                                                                                                                                                                       |
-| E051-09    | Renommer les colonnes de la clause FROM                                                                                                                     | Aucun {.text-danger}        |                                                                                                                                                                                                                       |
-| **E061**   | **Prédicats de base et conditions de recherche**                                                                                                            | **Partiel**{.text-warning} |                                                                                                                                                                                                                       |
-| E061-01    | Prédicat de comparaison                                                                                                                                     | Oui {.text-success}         |                                                                                                                                                                                                                       |
-| E061-02    | Entre prédicat                                                                                                                                              | Partiel {.text-warning}     | Aucun `SYMMETRIC` et `ASYMMETRIC` clause                                                                                                                                                                              |
-| E061-03    | Dans le prédicat avec la liste des valeurs                                                                                                                  | Oui {.text-success}         |                                                                                                                                                                                                                       |
-| E061-04    | Comme prédicat                                                                                                                                              | Oui {.text-success}         |                                                                                                                                                                                                                       |
-| E061-05    | Comme prédicat: clause D'échappement                                                                                                                        | Aucun {.text-danger}        |                                                                                                                                                                                                                       |
-| E061-06    | Prédicat NULL                                                                                                                                               | Oui {.text-success}         |                                                                                                                                                                                                                       |
-| E061-07    | Prédicat de comparaison quantifié                                                                                                                           | Aucun {.text-danger}        |                                                                                                                                                                                                                       |
-| E061-08    | Existe prédicat                                                                                                                                             | Aucun {.text-danger}        |                                                                                                                                                                                                                       |
-| E061-09    | Sous-requêtes dans le prédicat de comparaison                                                                                                               | Oui {.text-success}         |                                                                                                                                                                                                                       |
-| E061-11    | Sous-requêtes dans dans le prédicat                                                                                                                         | Oui {.text-success}         |                                                                                                                                                                                                                       |
-| E061-12    | Sous-requêtes dans le prédicat de comparaison quantifiée                                                                                                    | Aucun {.text-danger}        |                                                                                                                                                                                                                       |
-| E061-13    | Sous-requêtes corrélées                                                                                                                                     | Aucun {.text-danger}        |                                                                                                                                                                                                                       |
-| E061-14    | Condition de recherche                                                                                                                                      | Oui {.text-success}         |                                                                                                                                                                                                                       |
-| **E071**   | **Expressions de requête de base**                                                                                                                          | **Partiel**{.text-warning} |                                                                                                                                                                                                                       |
-| E071-01    | Opérateur de table distinct UNION                                                                                                                           | Aucun {.text-danger}        |                                                                                                                                                                                                                       |
-| E071-02    | Opérateur de table UNION ALL                                                                                                                                | Oui {.text-success}         |                                                                                                                                                                                                                       |
-| E071-03    | Sauf opérateur de table DISTINCT                                                                                                                            | Aucun {.text-danger}        |                                                                                                                                                                                                                       |
-| E071-05    | Les colonnes combinées via les opérateurs de table n'ont pas besoin d'avoir exactement le même type de données                                              | Oui {.text-success}         |                                                                                                                                                                                                                       |
-| E071-06    | Tableau des opérateurs dans les sous-requêtes                                                                                                               | Oui {.text-success}         |                                                                                                                                                                                                                       |
-| **E081**   | **Les privilèges de base**                                                                                                                                  | **Partiel**{.text-warning} | Les travaux en cours                                                                                                                                                                                                  |
-| **E091**   | **Les fonctions de jeu**                                                                                                                                    | **Oui**{.text-success}     |                                                                                                                                                                                                                       |
-| E091-01    | AVG                                                                                                                                                         | Oui {.text-success}         |                                                                                                                                                                                                                       |
-| E091-02    | COUNT                                                                                                                                                       | Oui {.text-success}         |                                                                                                                                                                                                                       |
-| E091-03    | MAX                                                                                                                                                         | Oui {.text-success}         |                                                                                                                                                                                                                       |
-| E091-04    | MIN                                                                                                                                                         | Oui {.text-success}         |                                                                                                                                                                                                                       |
-| E091-05    | SUM                                                                                                                                                         | Oui {.text-success}         |                                                                                                                                                                                                                       |
-| E091-06    | TOUS les quantificateurs                                                                                                                                    | Aucun {.text-danger}        |                                                                                                                                                                                                                       |
-| E091-07    | Quantificateur DISTINCT                                                                                                                                     | Partiel {.text-warning}     | Toutes les fonctions d'agrégation ne sont pas prises en charge                                                                                                                                                        |
-| **E101**   | **Manipulation des données de base**                                                                                                                        | **Partiel**{.text-warning} |                                                                                                                                                                                                                       |
-| E101-01    | Insérer une déclaration                                                                                                                                     | Oui {.text-success}         | Remarque: la clé primaire dans ClickHouse n'implique pas `UNIQUE` contrainte                                                                                                                                          |
-| E101-03    | Déclaration de mise à jour recherchée                                                                                                                       | Aucun {.text-danger}        | Il y a un `ALTER UPDATE` déclaration pour la modification des données de lot                                                                                                                                          |
-| E101-04    | Requête de suppression recherchée                                                                                                                           | Aucun {.text-danger}        | Il y a un `ALTER DELETE` déclaration pour la suppression de données par lots                                                                                                                                          |
-| **E111**   | **Instruction SELECT à une ligne**                                                                                                                          | **Aucun**{.text-danger}    |                                                                                                                                                                                                                       |
-| **E121**   | **Prise en charge du curseur de base**                                                                                                                      | **Aucun**{.text-danger}    |                                                                                                                                                                                                                       |
-| E121-01    | DECLARE CURSOR                                                                                                                                              | Aucun {.text-danger}        |                                                                                                                                                                                                                       |
-| E121-02    | Les colonnes ORDER BY n'ont pas besoin d'être dans la liste select                                                                                          | Aucun {.text-danger}        |                                                                                                                                                                                                                       |
-| E121-03    | Expressions de valeur dans la clause ORDER BY                                                                                                               | Aucun {.text-danger}        |                                                                                                                                                                                                                       |
-| E121-04    | Instruction OPEN                                                                                                                                            | Aucun {.text-danger}        |                                                                                                                                                                                                                       |
-| E121-06    | Déclaration de mise à jour positionnée                                                                                                                      | Aucun {.text-danger}        |                                                                                                                                                                                                                       |
-| E121-07    | Instruction de suppression positionnée                                                                                                                      | Aucun {.text-danger}        |                                                                                                                                                                                                                       |
-| E121-08    | Déclaration de fermeture                                                                                                                                    | Aucun {.text-danger}        |                                                                                                                                                                                                                       |
-| E121-10    | Instruction FETCH: implicite suivant                                                                                                                        | Aucun {.text-danger}        |                                                                                                                                                                                                                       |
-| E121-17    | Avec curseurs HOLD                                                                                                                                          | Aucun {.text-danger}        |                                                                                                                                                                                                                       |
-| **E131**   | **Support de valeur Null (nulls au lieu de valeurs)**                                                                                                       | **Partiel**{.text-warning} | Certaines restrictions s'appliquent                                                                                                                                                                                   |
-| **E141**   | **Contraintes d'intégrité de base**                                                                                                                         | **Partiel**{.text-warning} |                                                                                                                                                                                                                       |
-| E141-01    | Contraintes non nulles                                                                                                                                      | Oui {.text-success}         | Note: `NOT NULL` est implicite pour les colonnes de table par défaut                                                                                                                                                  |
-| E141-02    | Contrainte UNIQUE de colonnes non nulles                                                                                                                    | Aucun {.text-danger}        |                                                                                                                                                                                                                       |
-| E141-03    | Contraintes de clé primaire                                                                                                                                 | Aucun {.text-danger}        |                                                                                                                                                                                                                       |
-| E141-04    | Contrainte de clé étrangère de base avec la valeur par défaut NO ACTION Pour l'action de suppression référentielle et l'action de mise à jour référentielle | Aucun {.text-danger}        |                                                                                                                                                                                                                       |
-| E141-06    | Vérifier la contrainte                                                                                                                                      | Oui {.text-success}         |                                                                                                                                                                                                                       |
-| E141-07    | Colonne par défaut                                                                                                                                          | Oui {.text-success}         |                                                                                                                                                                                                                       |
-| E141-08    | Non NULL déduit sur la clé primaire                                                                                                                         | Oui {.text-success}         |                                                                                                                                                                                                                       |
-| E141-10    | Les noms dans une clé étrangère peut être spécifié dans n'importe quel ordre                                                                                | Aucun {.text-danger}        |                                                                                                                                                                                                                       |
-| **E151**   | **Support de Transaction**                                                                                                                                  | **Aucun**{.text-danger}    |                                                                                                                                                                                                                       |
-| E151-01    | COMMIT déclaration                                                                                                                                          | Aucun {.text-danger}        |                                                                                                                                                                                                                       |
-| E151-02    | Déclaration de restauration                                                                                                                                 | Aucun {.text-danger}        |                                                                                                                                                                                                                       |
-| **E152**   | **Instruction de transaction set de base**                                                                                                                  | **Aucun**{.text-danger}    |                                                                                                                                                                                                                       |
-| E152-01    | SET TRANSACTION statement: clause sérialisable de niveau D'isolement                                                                                        | Aucun {.text-danger}        |                                                                                                                                                                                                                       |
-| E152-02    | SET TRANSACTION statement: clauses en lecture seule et en lecture écriture                                                                                  | Aucun {.text-danger}        |                                                                                                                                                                                                                       |
-| **E153**   | **Requêtes pouvant être mises à jour avec des sous requêtes**                                                                                               | **Aucun**{.text-danger}    |                                                                                                                                                                                                                       |
-| **E161**   | **Commentaires SQL en utilisant le premier Double moins**                                                                                                   | **Oui**{.text-success}     |                                                                                                                                                                                                                       |
-| **E171**   | **Support SQLSTATE**                                                                                                                                        | **Aucun**{.text-danger}    |                                                                                                                                                                                                                       |
-| **E182**   | **Liaison du langage hôte**                                                                                                                                 | **Aucun**{.text-danger}    |                                                                                                                                                                                                                       |
-| **F031**   | **Manipulation de schéma de base**                                                                                                                          | **Partiel**{.text-warning} |                                                                                                                                                                                                                       |
-| F031-01    | Instruction CREATE TABLE pour créer des tables de base persistantes                                                                                         | Partiel {.text-warning}     | Aucun `SYSTEM VERSIONING`, `ON COMMIT`, `GLOBAL`, `LOCAL`, `PRESERVE`, `DELETE`, `REF IS`, `WITH OPTIONS`, `UNDER`, `LIKE`, `PERIOD FOR` clauses et aucun support pour les types de données résolus par l'utilisateur |
-| F031-02    | Instruction créer une vue                                                                                                                                   | Partiel {.text-warning}     | Aucun `RECURSIVE`, `CHECK`, `UNDER`, `WITH OPTIONS` clauses et aucun support pour les types de données résolus par l'utilisateur                                                                                      |
-| F031-03    | Déclaration de subvention                                                                                                                                   | Oui {.text-success}         |                                                                                                                                                                                                                       |
-| F031-04    | ALTER TABLE statement: ajouter une clause de colonne                                                                                                        | Partiel {.text-warning}     | Pas de support pour `GENERATED` clause et période de temps du système                                                                                                                                                 |
-| F031-13    | Instruction DROP TABLE: clause RESTRICT                                                                                                                     | Aucun {.text-danger}        |                                                                                                                                                                                                                       |
-| F031-16    | Instruction DROP VIEW: clause RESTRICT                                                                                                                      | Aucun {.text-danger}        |                                                                                                                                                                                                                       |
-| F031-19    | REVOKE statement: clause RESTRICT                                                                                                                           | Aucun {.text-danger}        |                                                                                                                                                                                                                       |
-| **F041**   | **Table jointe de base**                                                                                                                                    | **Partiel**{.text-warning} |                                                                                                                                                                                                                       |
-| F041-01    | INNER join (mais pas nécessairement le mot-clé INNER)                                                                                                       | Oui {.text-success}         |                                                                                                                                                                                                                       |
-| F041-02    | INTÉRIEURE mot-clé                                                                                                                                          | Oui {.text-success}         |                                                                                                                                                                                                                       |
-| F041-03    | LEFT OUTER JOIN                                                                                                                                             | Oui {.text-success}         |                                                                                                                                                                                                                       |
-| F041-04    | RIGHT OUTER JOIN                                                                                                                                            | Oui {.text-success}         |                                                                                                                                                                                                                       |
-| F041-05    | Les jointures externes peuvent être imbriqués                                                                                                               | Oui {.text-success}         |                                                                                                                                                                                                                       |
-| F041-07    | La table intérieure dans une jointure extérieure gauche ou droite peut également être utilisée dans une jointure intérieure                                 | Oui {.text-success}         |                                                                                                                                                                                                                       |
-| F041-08    | Tous les opérateurs de comparaison sont pris en charge (plutôt que juste =)                                                                                 | Aucun {.text-danger}        |                                                                                                                                                                                                                       |
-| **F051**   | **Date et heure de base**                                                                                                                                   | **Partiel**{.text-warning} |                                                                                                                                                                                                                       |
-| F051-01    | Type de données de DATE (y compris la prise en charge du littéral de DATE)                                                                                  | Partiel {.text-warning}     | Aucun littéral                                                                                                                                                                                                        |
-| F051-02    | TYPE DE DONNÉES DE TEMPS (y compris la prise en charge du littéral de temps) avec une précision de secondes fractionnaires d'au moins 0                     | Aucun {.text-danger}        |                                                                                                                                                                                                                       |
-| F051-03    | Type de données D'horodatage (y compris la prise en charge du littéral D'horodatage) avec une précision de secondes fractionnaires d'au moins 0 et 6        | Aucun {.text-danger}        | `DateTime64` temps fournit des fonctionnalités similaires                                                                                                                                                             |
-| F051-04    | Prédicat de comparaison sur les types de données DATE, heure et horodatage                                                                                  | Partiel {.text-warning}     | Un seul type de données disponible                                                                                                                                                                                    |
-| F051-05    | Distribution explicite entre les types datetime et les types de chaînes de caractères                                                                       | Oui {.text-success}         |                                                                                                                                                                                                                       |
-| F051-06    | CURRENT_DATE                                                                                                                                               | Aucun {.text-danger}        | `today()` est similaire                                                                                                                                                                                               |
-| F051-07    | LOCALTIME                                                                                                                                                   | Aucun {.text-danger}        | `now()` est similaire                                                                                                                                                                                                 |
-| F051-08    | LOCALTIMESTAMP                                                                                                                                              | Aucun {.text-danger}        |                                                                                                                                                                                                                       |
-| **F081**   | **UNION et sauf dans les vues**                                                                                                                             | **Partiel**{.text-warning} |                                                                                                                                                                                                                       |
-| **F131**   | **Groupées des opérations**                                                                                                                                 | **Partiel**{.text-warning} |                                                                                                                                                                                                                       |
-| F131-01    | WHERE, GROUP BY et ayant des clauses prises en charge dans les requêtes avec des vues groupées                                                              | Oui {.text-success}         |                                                                                                                                                                                                                       |
-| F131-02    | Plusieurs tables prises en charge dans les requêtes avec des vues groupées                                                                                  | Oui {.text-success}         |                                                                                                                                                                                                                       |
-| F131-03    | Définir les fonctions prises en charge dans les requêtes groupées vues                                                                                      | Oui {.text-success}         |                                                                                                                                                                                                                       |
-| F131-04    | Sous requêtes avec des clauses GROUP BY et HAVING et des vues groupées                                                                                      | Oui {.text-success}         |                                                                                                                                                                                                                       |
-| F131-05    | Sélectionnez une seule ligne avec des clauses GROUP BY et HAVING et des vues groupées                                                                       | Aucun {.text-danger}        |                                                                                                                                                                                                                       |
-| **F181**   | **Support de module Multiple**                                                                                                                              | **Aucun**{.text-danger}    |                                                                                                                                                                                                                       |
-| **F201**   | **Fonction de distribution**                                                                                                                                | **Oui**{.text-success}     |                                                                                                                                                                                                                       |
-| **F221**   | **Valeurs par défaut explicites**                                                                                                                           | **Aucun**{.text-danger}    |                                                                                                                                                                                                                       |
-| **F261**   | **Expression de cas**                                                                                                                                       | **Oui**{.text-success}     |                                                                                                                                                                                                                       |
-| F261-01    | Cas Simple                                                                                                                                                  | Oui {.text-success}         |                                                                                                                                                                                                                       |
-| F261-02    | Cas recherché                                                                                                                                               | Oui {.text-success}         |                                                                                                                                                                                                                       |
-| F261-03    | NULLIF                                                                                                                                                      | Oui {.text-success}         |                                                                                                                                                                                                                       |
-| F261-04    | COALESCE                                                                                                                                                    | Oui {.text-success}         |                                                                                                                                                                                                                       |
-| **F311**   | **Déclaration de définition de schéma**                                                                                                                     | **Partiel**{.text-warning} |                                                                                                                                                                                                                       |
-| F311-01    | CREATE SCHEMA                                                                                                                                               | Aucun {.text-danger}        |                                                                                                                                                                                                                       |
-| F311-02    | Créer une TABLE pour les tables de base persistantes                                                                                                        | Oui {.text-success}         |                                                                                                                                                                                                                       |
-| F311-03    | CREATE VIEW                                                                                                                                                 | Oui {.text-success}         |                                                                                                                                                                                                                       |
-| F311-04    | CREATE VIEW: WITH CHECK OPTION                                                                                                                              | Aucun {.text-danger}        |                                                                                                                                                                                                                       |
-| F311-05    | Déclaration de subvention                                                                                                                                   | Oui {.text-success}         |                                                                                                                                                                                                                       |
-| **F471**   | **Valeurs de sous-requête scalaire**                                                                                                                        | **Oui**{.text-success}     |                                                                                                                                                                                                                       |
-| **F481**   | **Prédicat null étendu**                                                                                                                                    | **Oui**{.text-success}     |                                                                                                                                                                                                                       |
-| **F812**   | **Base de repérage**                                                                                                                                        | **Aucun**{.text-danger}    |                                                                                                                                                                                                                       |
-| **T321**   | **Routines SQL-invoked de base**                                                                                                                            | **Aucun**{.text-danger}    |                                                                                                                                                                                                                       |
-| T321-01    | Fonctions définies par l'utilisateur sans surcharge                                                                                                         | Aucun {.text-danger}        |                                                                                                                                                                                                                       |
-| T321-02    | Procédures stockées définies par l'utilisateur sans surcharge                                                                                               | Aucun {.text-danger}        |                                                                                                                                                                                                                       |
-| T321-03    | L'invocation de la fonction                                                                                                                                 | Aucun {.text-danger}        |                                                                                                                                                                                                                       |
-| T321-04    | L'instruction d'APPEL de                                                                                                                                    | Aucun {.text-danger}        |                                                                                                                                                                                                                       |
-| T321-05    | Déclaration de retour                                                                                                                                       | Aucun {.text-danger}        |                                                                                                                                                                                                                       |
-| **T631**   | **Dans le prédicat avec un élément de liste**                                                                                                               | **Oui**{.text-success}     |                                                                                                                                                                                                                       |
diff --git a/docs/fr/sql-reference/data-types/aggregatefunction.md b/docs/fr/sql-reference/data-types/aggregatefunction.md
deleted file mode 100644
index 18874cd3cb7..00000000000
--- a/docs/fr/sql-reference/data-types/aggregatefunction.md
+++ /dev/null
@@ -1,70 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 52
-toc_title: AggregateFunction (nom, types_of_arguments...)
----
-
-# AggregateFunction(name, types_of_arguments…) {#data-type-aggregatefunction}
-
-Aggregate functions can have an implementation-defined intermediate state that can be serialized to an AggregateFunction(…) data type and stored in a table, usually, by means of [une vue matérialisée](../../sql-reference/statements/create.md#create-view). La manière courante de produire un État de fonction d'agrégat est d'appeler la fonction d'agrégat avec le `-State` suffixe. Pour obtenir le résultat final de l'agrégation dans l'avenir, vous devez utiliser la même fonction d'agrégation avec la `-Merge`suffixe.
-
-`AggregateFunction` — parametric data type.
-
-**Paramètre**
-
--   Nom de la fonction d'agrégation.
-
-        If the function is parametric, specify its parameters too.
-
--   Types des arguments de la fonction d'agrégation.
-
-**Exemple**
-
-``` sql
-CREATE TABLE t
-(
-    column1 AggregateFunction(uniq, UInt64),
-    column2 AggregateFunction(anyIf, String, UInt8),
-    column3 AggregateFunction(quantiles(0.5, 0.9), UInt64)
-) ENGINE = ...
-```
-
-[uniq](../../sql-reference/aggregate-functions/reference.md#agg_function-uniq), anyIf ([tout](../../sql-reference/aggregate-functions/reference.md#agg_function-any)+[Si](../../sql-reference/aggregate-functions/combinators.md#agg-functions-combinator-if)) et [les quantiles](../../sql-reference/aggregate-functions/reference.md) les fonctions d'agrégation sont-elles prises en charge dans ClickHouse.
-
-## Utilisation {#usage}
-
-### Insertion De Données {#data-insertion}
-
-Pour insérer des données, utilisez `INSERT SELECT` avec le regroupement d' `-State`- fonction.
-
-**Exemples de fonction**
-
-``` sql
-uniqState(UserID)
-quantilesState(0.5, 0.9)(SendTiming)
-```
-
-Contrairement aux fonctions correspondantes `uniq` et `quantiles`, `-State`- les fonctions renvoient l'état, au lieu de la valeur finale. En d'autres termes, ils renvoient une valeur de `AggregateFunction` type.
-
-Dans les résultats de `SELECT` requête, les valeurs de `AggregateFunction` type ont une représentation binaire spécifique à l'implémentation pour tous les formats de sortie ClickHouse. Si les données de vidage dans, par exemple, `TabSeparated` format avec `SELECT` requête, puis ce vidage peut être chargé en utilisant `INSERT` requête.
-
-### Sélection De Données {#data-selection}
-
-Lors de la sélection des données `AggregatingMergeTree` table, utilisez `GROUP BY` et les mêmes fonctions d'agrégat que lors de l'insertion de données, mais en utilisant `-Merge`suffixe.
-
-Une fonction d'agrégation avec `-Merge` suffixe prend un ensemble d'états, les combine, et renvoie le résultat complet de l'agrégation de données.
-
-Par exemple, les deux requêtes suivantes retournent le même résultat:
-
-``` sql
-SELECT uniq(UserID) FROM table
-
-SELECT uniqMerge(state) FROM (SELECT uniqState(UserID) AS state FROM table GROUP BY RegionID)
-```
-
-## Exemple D'Utilisation {#usage-example}
-
-Voir [AggregatingMergeTree](../../engines/table-engines/mergetree-family/aggregatingmergetree.md) Description du moteur.
-
-[Article Original](https://clickhouse.tech/docs/en/data_types/nested_data_structures/aggregatefunction/) <!--hide-->
diff --git a/docs/fr/sql-reference/data-types/array.md b/docs/fr/sql-reference/data-types/array.md
deleted file mode 100644
index 41772cab177..00000000000
--- a/docs/fr/sql-reference/data-types/array.md
+++ /dev/null
@@ -1,77 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 51
-toc_title: Array(T)
----
-
-# Array(t) {#data-type-array}
-
-Un tableau de `T`les éléments de type. `T` peut être n'importe quel type de données, y compris un tableau.
-
-## La création d'un Tableau {#creating-an-array}
-
-Vous pouvez utiliser une fonction pour créer un tableau:
-
-``` sql
-array(T)
-```
-
-Vous pouvez également utiliser des crochets.
-
-``` sql
-[]
-```
-
-Exemple de création d'un tableau:
-
-``` sql
-SELECT array(1, 2) AS x, toTypeName(x)
-```
-
-``` text
-┌─x─────┬─toTypeName(array(1, 2))─┐
-│ [1,2] │ Array(UInt8)            │
-└───────┴─────────────────────────┘
-```
-
-``` sql
-SELECT [1, 2] AS x, toTypeName(x)
-```
-
-``` text
-┌─x─────┬─toTypeName([1, 2])─┐
-│ [1,2] │ Array(UInt8)       │
-└───────┴────────────────────┘
-```
-
-## Utilisation de Types de données {#working-with-data-types}
-
-Lors de la création d'un tableau à la volée, ClickHouse définit automatiquement le type d'argument comme le type de données le plus étroit pouvant stocker tous les arguments listés. S'il y a des [Nullable](nullable.md#data_type-nullable) ou littéral [NULL](../../sql-reference/syntax.md#null-literal) les valeurs, le type d'un élément de tableau devient également [Nullable](nullable.md).
-
-Si ClickHouse n'a pas pu déterminer le type de données, il génère une exception. Par exemple, cela se produit lorsque vous essayez de créer un tableau avec des chaînes et des nombres simultanément (`SELECT array(1, 'a')`).
-
-Exemples de détection automatique de type de données:
-
-``` sql
-SELECT array(1, 2, NULL) AS x, toTypeName(x)
-```
-
-``` text
-┌─x──────────┬─toTypeName(array(1, 2, NULL))─┐
-│ [1,2,NULL] │ Array(Nullable(UInt8))        │
-└────────────┴───────────────────────────────┘
-```
-
-Si vous essayez de créer un tableau de types de données incompatibles, ClickHouse lève une exception:
-
-``` sql
-SELECT array(1, 'a')
-```
-
-``` text
-Received exception from server (version 1.1.54388):
-Code: 386. DB::Exception: Received from localhost:9000, 127.0.0.1. DB::Exception: There is no supertype for types UInt8, String because some of them are String/FixedString and some of them are not.
-```
-
-[Article Original](https://clickhouse.tech/docs/en/data_types/array/) <!--hide-->
diff --git a/docs/fr/sql-reference/data-types/boolean.md b/docs/fr/sql-reference/data-types/boolean.md
deleted file mode 100644
index aeb84cf1cc1..00000000000
--- a/docs/fr/sql-reference/data-types/boolean.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 43
-toc_title: "Bool\xE9en"
----
-
-# Les Valeurs Booléennes {#boolean-values}
-
-Il n'y a pas de type distinct pour les valeurs booléennes. Utilisez le type UInt8, limité aux valeurs 0 ou 1.
-
-[Article Original](https://clickhouse.tech/docs/en/data_types/boolean/) <!--hide-->
diff --git a/docs/fr/sql-reference/data-types/date.md b/docs/fr/sql-reference/data-types/date.md
deleted file mode 100644
index 698639f1d2f..00000000000
--- a/docs/fr/sql-reference/data-types/date.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 47
-toc_title: Date
----
-
-# Date {#date}
-
-Date. Stocké en deux octets comme le nombre de jours depuis 1970-01-01 (non signé). Permet de stocker des valeurs juste après le début de L'époque Unix jusqu'au seuil supérieur défini par une constante au stade de la compilation (actuellement, c'est jusqu'à l'année 2106, mais l'année finale entièrement prise en charge est 2105).
-
-La valeur de date est stockée sans le fuseau horaire.
-
-[Article Original](https://clickhouse.tech/docs/en/data_types/date/) <!--hide-->
diff --git a/docs/fr/sql-reference/data-types/datetime.md b/docs/fr/sql-reference/data-types/datetime.md
deleted file mode 100644
index 915270e4d2b..00000000000
--- a/docs/fr/sql-reference/data-types/datetime.md
+++ /dev/null
@@ -1,129 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 48
-toc_title: DateTime
----
-
-# Datetime {#data_type-datetime}
-
-Permet de stocker un instant dans le temps, qui peut être exprimé comme une date de calendrier et une heure d'une journée.
-
-Syntaxe:
-
-``` sql
-DateTime([timezone])
-```
-
-Plage de valeurs prise en charge: \[1970-01-01 00:00:00, 2105-12-31 23:59:59\].
-
-Résolution: 1 seconde.
-
-## Utilisation Remarques {#usage-remarks}
-
-Le point dans le temps est enregistré en tant que [Le timestamp Unix](https://en.wikipedia.org/wiki/Unix_time), quel que soit le fuseau horaire ou l'heure d'été. En outre, l' `DateTime` type peut stocker le fuseau horaire qui est le même pour la colonne entière, qui affecte la façon dont les valeurs de la `DateTime` les valeurs de type sont affichées au format texte et comment les valeurs spécifiées en tant que chaînes sont analysées (‘2020-01-01 05:00:01’). Le fuseau horaire n'est pas stocké dans les lignes de la table (ou dans resultset), mais est stocké dans les métadonnées de la colonne.
-Une liste des fuseaux horaires pris en charge peut être trouvée dans le [Base de données de fuseau horaire IANA](https://www.iana.org/time-zones).
-Le `tzdata` paquet, contenant [Base de données de fuseau horaire IANA](https://www.iana.org/time-zones), doit être installé dans le système. L'utilisation de la `timedatectl list-timezones` commande pour lister les fuseaux horaires connus par un système local.
-
-Vous pouvez définir explicitement un fuseau horaire `DateTime`- tapez des colonnes lors de la création d'une table. Si le fuseau horaire n'est pas défini, ClickHouse utilise la valeur [fuseau](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone) paramètre dans les paramètres du serveur ou les paramètres du système d'exploitation au moment du démarrage du serveur ClickHouse.
-
-Le [clickhouse-client](../../interfaces/cli.md) applique le fuseau horaire du serveur par défaut si un fuseau horaire n'est pas explicitement défini lors de l'initialisation du type de données. Pour utiliser le fuseau horaire du client, exécutez `clickhouse-client` avec l' `--use_client_time_zone` paramètre.
-
-Clickhouse affiche les valeurs dans `YYYY-MM-DD hh:mm:ss` format de texte par défaut. Vous pouvez modifier la sortie avec le [formatDateTime](../../sql-reference/functions/date-time-functions.md#formatdatetime) fonction.
-
-Lorsque vous insérez des données dans ClickHouse, vous pouvez utiliser différents formats de chaînes de date et d'heure, en fonction de la valeur du [date_time_input_format](../../operations/settings/settings.md#settings-date_time_input_format) paramètre.
-
-## Exemple {#examples}
-
-**1.** Création d'une table avec un `DateTime`- tapez la colonne et insérez des données dedans:
-
-``` sql
-CREATE TABLE dt
-(
-    `timestamp` DateTime('Europe/Moscow'),
-    `event_id` UInt8
-)
-ENGINE = TinyLog;
-```
-
-``` sql
-INSERT INTO dt Values (1546300800, 1), ('2019-01-01 00:00:00', 2);
-```
-
-``` sql
-SELECT * FROM dt;
-```
-
-``` text
-┌───────────timestamp─┬─event_id─┐
-│ 2019-01-01 03:00:00 │        1 │
-│ 2019-01-01 00:00:00 │        2 │
-└─────────────────────┴──────────┘
-```
-
--   Lors de l'insertion de datetime en tant qu'entier, il est traité comme un horodatage Unix (UTC). `1546300800` représenter `'2019-01-01 00:00:00'` L'UTC. Cependant, comme `timestamp` la colonne a `Europe/Moscow` (UTC+3) fuseau horaire spécifié, lors de la sortie en tant que chaîne, la valeur sera affichée comme `'2019-01-01 03:00:00'`
--   Lors de l'insertion d'une valeur de chaîne en tant que datetime, elle est traitée comme étant dans le fuseau horaire de la colonne. `'2019-01-01 00:00:00'` sera considérée comme étant en `Europe/Moscow` fuseau horaire et enregistré sous `1546290000`.
-
-**2.** Le filtrage sur `DateTime` valeur
-
-``` sql
-SELECT * FROM dt WHERE timestamp = toDateTime('2019-01-01 00:00:00', 'Europe/Moscow')
-```
-
-``` text
-┌───────────timestamp─┬─event_id─┐
-│ 2019-01-01 00:00:00 │        2 │
-└─────────────────────┴──────────┘
-```
-
-`DateTime` les valeurs de colonne peuvent être filtrées à l'aide d'une `WHERE` prédicat. Elle sera convertie `DateTime` automatiquement:
-
-``` sql
-SELECT * FROM dt WHERE timestamp = '2019-01-01 00:00:00'
-```
-
-``` text
-┌───────────timestamp─┬─event_id─┐
-│ 2019-01-01 03:00:00 │        1 │
-└─────────────────────┴──────────┘
-```
-
-**3.** Obtenir un fuseau horaire pour un `DateTime`colonne de type:
-
-``` sql
-SELECT toDateTime(now(), 'Europe/Moscow') AS column, toTypeName(column) AS x
-```
-
-``` text
-┌──────────────column─┬─x─────────────────────────┐
-│ 2019-10-16 04:12:04 │ DateTime('Europe/Moscow') │
-└─────────────────────┴───────────────────────────┘
-```
-
-**4.** Conversion de fuseau horaire
-
-``` sql
-SELECT
-toDateTime(timestamp, 'Europe/London') as lon_time,
-toDateTime(timestamp, 'Europe/Moscow') as mos_time
-FROM dt
-```
-
-``` text
-┌───────────lon_time──┬────────────mos_time─┐
-│ 2019-01-01 00:00:00 │ 2019-01-01 03:00:00 │
-│ 2018-12-31 21:00:00 │ 2019-01-01 00:00:00 │
-└─────────────────────┴─────────────────────┘
-```
-
-## Voir Aussi {#see-also}
-
--   [Fonctions de conversion de Type](../../sql-reference/functions/type-conversion-functions.md)
--   [Fonctions pour travailler avec des dates et des heures](../../sql-reference/functions/date-time-functions.md)
--   [Fonctions pour travailler avec des tableaux](../../sql-reference/functions/array-functions.md)
--   [Le `date_time_input_format` paramètre](../../operations/settings/settings.md#settings-date_time_input_format)
--   [Le `timezone` paramètre de configuration du serveur](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone)
--   [Opérateurs pour travailler avec des dates et des heures](../../sql-reference/operators/index.md#operators-datetime)
--   [Le `Date` type de données](date.md)
-
-[Article Original](https://clickhouse.tech/docs/en/data_types/datetime/) <!--hide-->
diff --git a/docs/fr/sql-reference/data-types/datetime64.md b/docs/fr/sql-reference/data-types/datetime64.md
deleted file mode 100644
index 027891c595d..00000000000
--- a/docs/fr/sql-reference/data-types/datetime64.md
+++ /dev/null
@@ -1,104 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 49
-toc_title: DateTime64
----
-
-# Datetime64 {#data_type-datetime64}
-
-Permet de stocker un instant dans le temps, qui peut être exprimé comme une date de calendrier et une heure d'un jour, avec une précision de sous-seconde définie
-
-Tick taille (précision): 10<sup>-précision</sup> deuxième
-
-Syntaxe:
-
-``` sql
-DateTime64(precision, [timezone])
-```
-
-En interne, stocke les données comme un certain nombre de ‘ticks’ depuis le début de l'époque (1970-01-01 00: 00: 00 UTC) comme Int64. La résolution des tiques est déterminée par le paramètre de précision. En outre, l' `DateTime64` type peut stocker le fuseau horaire qui est le même pour la colonne entière, qui affecte la façon dont les valeurs de la `DateTime64` les valeurs de type sont affichées au format texte et comment les valeurs spécifiées en tant que chaînes sont analysées (‘2020-01-01 05:00:01.000’). Le fuseau horaire n'est pas stocké dans les lignes de la table (ou dans resultset), mais est stocké dans les métadonnées de la colonne. Voir les détails dans [DateTime](datetime.md).
-
-## Exemple {#examples}
-
-**1.** Création d'une table avec `DateTime64`- tapez la colonne et insérez des données dedans:
-
-``` sql
-CREATE TABLE dt
-(
-    `timestamp` DateTime64(3, 'Europe/Moscow'),
-    `event_id` UInt8
-)
-ENGINE = TinyLog
-```
-
-``` sql
-INSERT INTO dt Values (1546300800000, 1), ('2019-01-01 00:00:00', 2)
-```
-
-``` sql
-SELECT * FROM dt
-```
-
-``` text
-┌───────────────timestamp─┬─event_id─┐
-│ 2019-01-01 03:00:00.000 │        1 │
-│ 2019-01-01 00:00:00.000 │        2 │
-└─────────────────────────┴──────────┘
-```
-
--   Lors de l'insertion de datetime en tant qu'entier, il est traité comme un horodatage Unix (UTC) mis à l'échelle de manière appropriée. `1546300800000` (avec précision 3) représente `'2019-01-01 00:00:00'` L'UTC. Cependant, comme `timestamp` la colonne a `Europe/Moscow` (UTC+3) fuseau horaire spécifié, lors de la sortie sous forme de chaîne, la valeur sera affichée comme `'2019-01-01 03:00:00'`
--   Lors de l'insertion d'une valeur de chaîne en tant que datetime, elle est traitée comme étant dans le fuseau horaire de la colonne. `'2019-01-01 00:00:00'` sera considérée comme étant en `Europe/Moscow` fuseau horaire et stocké comme `1546290000000`.
-
-**2.** Le filtrage sur `DateTime64` valeur
-
-``` sql
-SELECT * FROM dt WHERE timestamp = toDateTime64('2019-01-01 00:00:00', 3, 'Europe/Moscow')
-```
-
-``` text
-┌───────────────timestamp─┬─event_id─┐
-│ 2019-01-01 00:00:00.000 │        2 │
-└─────────────────────────┴──────────┘
-```
-
-Contrairement `DateTime`, `DateTime64` les valeurs ne sont pas converties depuis `String` automatiquement
-
-**3.** Obtenir un fuseau horaire pour un `DateTime64`-le type de la valeur:
-
-``` sql
-SELECT toDateTime64(now(), 3, 'Europe/Moscow') AS column, toTypeName(column) AS x
-```
-
-``` text
-┌──────────────────column─┬─x──────────────────────────────┐
-│ 2019-10-16 04:12:04.000 │ DateTime64(3, 'Europe/Moscow') │
-└─────────────────────────┴────────────────────────────────┘
-```
-
-**4.** Conversion de fuseau horaire
-
-``` sql
-SELECT
-toDateTime64(timestamp, 3, 'Europe/London') as lon_time,
-toDateTime64(timestamp, 3, 'Europe/Moscow') as mos_time
-FROM dt
-```
-
-``` text
-┌───────────────lon_time──┬────────────────mos_time─┐
-│ 2019-01-01 00:00:00.000 │ 2019-01-01 03:00:00.000 │
-│ 2018-12-31 21:00:00.000 │ 2019-01-01 00:00:00.000 │
-└─────────────────────────┴─────────────────────────┘
-```
-
-## Voir Aussi {#see-also}
-
--   [Fonctions de conversion de Type](../../sql-reference/functions/type-conversion-functions.md)
--   [Fonctions pour travailler avec des dates et des heures](../../sql-reference/functions/date-time-functions.md)
--   [Fonctions pour travailler avec des tableaux](../../sql-reference/functions/array-functions.md)
--   [Le `date_time_input_format` paramètre](../../operations/settings/settings.md#settings-date_time_input_format)
--   [Le `timezone` paramètre de configuration du serveur](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone)
--   [Opérateurs pour travailler avec des dates et des heures](../../sql-reference/operators/index.md#operators-datetime)
--   [`Date` type de données](date.md)
--   [`DateTime` type de données](datetime.md)
diff --git a/docs/fr/sql-reference/data-types/decimal.md b/docs/fr/sql-reference/data-types/decimal.md
deleted file mode 100644
index 171bc1cf6dd..00000000000
--- a/docs/fr/sql-reference/data-types/decimal.md
+++ /dev/null
@@ -1,109 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 42
-toc_title: "D\xE9cimal"
----
-
-# Décimal (P, S), Décimal32 (S), Décimal64 (S), Décimal128 (S) {#decimalp-s-decimal32s-decimal64s-decimal128s}
-
-Nombres à points fixes signés qui conservent la précision pendant les opérations d'addition, de soustraction et de multiplication. Pour la division, les chiffres les moins significatifs sont ignorés (non arrondis).
-
-## Paramètre {#parameters}
-
--   P-précision. Plage valide: \[1: 38 \]. Détermine le nombre de chiffres décimaux nombre peut avoir (fraction y compris).
--   S - échelle. Plage valide: \[0: P \]. Détermine le nombre de chiffres décimaux fraction peut avoir.
-
-En fonction de P Paramètre Valeur décimal (P, S) est un synonyme de:
-- P à partir de \[ 1: 9\] - Pour Décimal32 (S)
-- P à partir de \[10: 18\] - pour Décimal64 (S)
-- P à partir de \[19: 38\] - pour Décimal128 (S)
-
-## Plages De Valeurs Décimales {#decimal-value-ranges}
-
--   Décimal32 (S) - ( -1 \* 10^(9 - S), 1 \* 10^(9-S) )
--   Décimal64 (S) - ( -1 \* 10^(18 - S), 1 \* 10^(18-S) )
--   Décimal128 (S) - ( -1 \* 10^(38 - S), 1 \* 10^(38-S) )
-
-Par exemple, Decimal32(4) peut contenir des nombres de -99999.9999 à 99999.9999 avec 0,0001 étape.
-
-## Représentation Interne {#internal-representation}
-
-En interne, les données sont représentées comme des entiers signés normaux avec une largeur de bit respective. Les plages de valeurs réelles qui peuvent être stockées en mémoire sont un peu plus grandes que celles spécifiées ci-dessus, qui sont vérifiées uniquement lors de la conversion à partir d'une chaîne.
-
-Parce que les processeurs modernes ne prennent pas en charge les entiers 128 bits nativement, les opérations sur Decimal128 sont émulées. Pour cette raison, Decimal128 fonctionne significativement plus lentement que Decimal32 / Decimal64.
-
-## Opérations et type de résultat {#operations-and-result-type}
-
-Les opérations binaires sur le résultat décimal dans le type de résultat plus large (avec n'importe quel ordre d'arguments).
-
--   `Decimal64(S1) <op> Decimal32(S2) -> Decimal64(S)`
--   `Decimal128(S1) <op> Decimal32(S2) -> Decimal128(S)`
--   `Decimal128(S1) <op> Decimal64(S2) -> Decimal128(S)`
-
-Règles pour l'échelle:
-
--   ajouter, soustraire: S = max (S1, S2).
--   multuply: S = S1 + S2.
--   diviser: S = S1.
-
-Pour des opérations similaires entre décimal et entier, le résultat est Décimal de la même taille qu'un argument.
-
-Les opérations entre Decimal et Float32 / Float64 ne sont pas définies. Si vous en avez besoin, vous pouvez explicitement lancer l'un des arguments en utilisant les builtins toDecimal32, toDecimal64, toDecimal128 ou toFloat32, toFloat64. Gardez à l'esprit que le résultat perdra de la précision et que la conversion de type est une opération coûteuse en calcul.
-
-Certaines fonctions sur le résultat de retour décimal comme Float64 (par exemple, var ou stddev). Les calculs intermédiaires peuvent toujours être effectués en décimal, ce qui peut conduire à des résultats différents entre les entrées Float64 et Decimal avec les mêmes valeurs.
-
-## Contrôles De Débordement {#overflow-checks}
-
-Pendant les calculs sur Décimal, des débordements entiers peuvent se produire. Les chiffres excessifs dans une fraction sont éliminés (non arrondis). Les chiffres excessifs dans la partie entière conduiront à une exception.
-
-``` sql
-SELECT toDecimal32(2, 4) AS x, x / 3
-```
-
-``` text
-┌──────x─┬─divide(toDecimal32(2, 4), 3)─┐
-│ 2.0000 │                       0.6666 │
-└────────┴──────────────────────────────┘
-```
-
-``` sql
-SELECT toDecimal32(4.2, 8) AS x, x * x
-```
-
-``` text
-DB::Exception: Scale is out of bounds.
-```
-
-``` sql
-SELECT toDecimal32(4.2, 8) AS x, 6 * x
-```
-
-``` text
-DB::Exception: Decimal math overflow.
-```
-
-Les contrôles de débordement entraînent un ralentissement des opérations. S'il est connu que les débordements ne sont pas possibles, il est logique de désactiver les contrôles en utilisant `decimal_check_overflow` paramètre. Lorsque des contrôles sont désactivés et le débordement se produit, le résultat sera faux:
-
-``` sql
-SET decimal_check_overflow = 0;
-SELECT toDecimal32(4.2, 8) AS x, 6 * x
-```
-
-``` text
-┌──────────x─┬─multiply(6, toDecimal32(4.2, 8))─┐
-│ 4.20000000 │                     -17.74967296 │
-└────────────┴──────────────────────────────────┘
-```
-
-Les contrôles de débordement se produisent non seulement sur les opérations arithmétiques mais aussi sur la comparaison de valeurs:
-
-``` sql
-SELECT toDecimal32(1, 8) < 100
-```
-
-``` text
-DB::Exception: Can't compare.
-```
-
-[Article Original](https://clickhouse.tech/docs/en/data_types/decimal/) <!--hide-->
diff --git a/docs/fr/sql-reference/data-types/domains/index.md b/docs/fr/sql-reference/data-types/domains/index.md
deleted file mode 100644
index 7e11f9a8a68..00000000000
--- a/docs/fr/sql-reference/data-types/domains/index.md
+++ /dev/null
@@ -1,33 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: Domaine
-toc_priority: 56
-toc_title: "Aper\xE7u"
----
-
-# Domaine {#domains}
-
-Les domaines sont des types spéciaux qui ajoutent des fonctionnalités supplémentaires au sommet du type de base existant, mais en laissant le format on-wire et on-disc du type de données sous-jacent intact. À l'heure actuelle, ClickHouse ne prend pas en charge les domaines définis par l'utilisateur.
-
-Vous pouvez utiliser des domaines partout type de base correspondant peut être utilisé, par exemple:
-
--   Créer une colonne d'un type de domaine
--   Valeurs de lecture / écriture depuis / vers la colonne de domaine
--   L'utiliser comme un indice si un type de base peut être utilisée comme un indice
--   Fonctions d'appel avec des valeurs de colonne de domaine
-
-### Fonctionnalités supplémentaires des domaines {#extra-features-of-domains}
-
--   Nom de type de colonne explicite dans `SHOW CREATE TABLE` ou `DESCRIBE TABLE`
--   Entrée du format convivial avec `INSERT INTO domain_table(domain_column) VALUES(...)`
--   Sortie au format convivial pour `SELECT domain_column FROM domain_table`
--   Chargement de données à partir d'une source externe dans un format convivial: `INSERT INTO domain_table FORMAT CSV ...`
-
-### Limitation {#limitations}
-
--   Impossible de convertir la colonne d'index du type de base en type de domaine via `ALTER TABLE`.
--   Impossible de convertir implicitement des valeurs de chaîne en valeurs de domaine lors de l'insertion de données d'une autre colonne ou table.
--   Le domaine n'ajoute aucune contrainte sur les valeurs stockées.
-
-[Article Original](https://clickhouse.tech/docs/en/data_types/domains/overview) <!--hide-->
diff --git a/docs/fr/sql-reference/data-types/domains/ipv4.md b/docs/fr/sql-reference/data-types/domains/ipv4.md
deleted file mode 100644
index 12895992e77..00000000000
--- a/docs/fr/sql-reference/data-types/domains/ipv4.md
+++ /dev/null
@@ -1,84 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 59
-toc_title: IPv4
----
-
-## IPv4 {#ipv4}
-
-`IPv4` est un domaine basé sur `UInt32` tapez et sert de remplacement typé pour stocker des valeurs IPv4. Il fournit un stockage compact avec le format d'entrée-sortie convivial et les informations de type de colonne sur l'inspection.
-
-### Utilisation De Base {#basic-usage}
-
-``` sql
-CREATE TABLE hits (url String, from IPv4) ENGINE = MergeTree() ORDER BY url;
-
-DESCRIBE TABLE hits;
-```
-
-``` text
-┌─name─┬─type───┬─default_type─┬─default_expression─┬─comment─┬─codec_expression─┐
-│ url  │ String │              │                    │         │                  │
-│ from │ IPv4   │              │                    │         │                  │
-└──────┴────────┴──────────────┴────────────────────┴─────────┴──────────────────┘
-```
-
-Ou vous pouvez utiliser le domaine IPv4 comme clé:
-
-``` sql
-CREATE TABLE hits (url String, from IPv4) ENGINE = MergeTree() ORDER BY from;
-```
-
-`IPv4` le domaine prend en charge le format d'entrée personnalisé en tant que chaînes IPv4:
-
-``` sql
-INSERT INTO hits (url, from) VALUES ('https://wikipedia.org', '116.253.40.133')('https://clickhouse.tech', '183.247.232.58')('https://clickhouse.tech/docs/en/', '116.106.34.242');
-
-SELECT * FROM hits;
-```
-
-``` text
-┌─url────────────────────────────────┬───────────from─┐
-│ https://clickhouse.tech/docs/en/ │ 116.106.34.242 │
-│ https://wikipedia.org              │ 116.253.40.133 │
-│ https://clickhouse.tech          │ 183.247.232.58 │
-└────────────────────────────────────┴────────────────┘
-```
-
-Les valeurs sont stockées sous forme binaire compacte:
-
-``` sql
-SELECT toTypeName(from), hex(from) FROM hits LIMIT 1;
-```
-
-``` text
-┌─toTypeName(from)─┬─hex(from)─┐
-│ IPv4             │ B7F7E83A  │
-└──────────────────┴───────────┘
-```
-
-Les valeurs de domaine ne sont pas implicitement convertibles en types autres que `UInt32`.
-Si vous voulez convertir `IPv4` valeur à une chaîne, vous devez le faire explicitement avec `IPv4NumToString()` fonction:
-
-``` sql
-SELECT toTypeName(s), IPv4NumToString(from) as s FROM hits LIMIT 1;
-```
-
-    ┌─toTypeName(IPv4NumToString(from))─┬─s──────────────┐
-    │ String                            │ 183.247.232.58 │
-    └───────────────────────────────────┴────────────────┘
-
-Ou coulé à un `UInt32` valeur:
-
-``` sql
-SELECT toTypeName(i), CAST(from as UInt32) as i FROM hits LIMIT 1;
-```
-
-``` text
-┌─toTypeName(CAST(from, 'UInt32'))─┬──────────i─┐
-│ UInt32                           │ 3086477370 │
-└──────────────────────────────────┴────────────┘
-```
-
-[Article Original](https://clickhouse.tech/docs/en/data_types/domains/ipv4) <!--hide-->
diff --git a/docs/fr/sql-reference/data-types/domains/ipv6.md b/docs/fr/sql-reference/data-types/domains/ipv6.md
deleted file mode 100644
index 77510a950cb..00000000000
--- a/docs/fr/sql-reference/data-types/domains/ipv6.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 60
-toc_title: IPv6
----
-
-## IPv6 {#ipv6}
-
-`IPv6` est un domaine basé sur `FixedString(16)` tapez et sert de remplacement typé pour stocker des valeurs IPv6. Il fournit un stockage compact avec le format d'entrée-sortie convivial et les informations de type de colonne sur l'inspection.
-
-### Utilisation De Base {#basic-usage}
-
-``` sql
-CREATE TABLE hits (url String, from IPv6) ENGINE = MergeTree() ORDER BY url;
-
-DESCRIBE TABLE hits;
-```
-
-``` text
-┌─name─┬─type───┬─default_type─┬─default_expression─┬─comment─┬─codec_expression─┐
-│ url  │ String │              │                    │         │                  │
-│ from │ IPv6   │              │                    │         │                  │
-└──────┴────────┴──────────────┴────────────────────┴─────────┴──────────────────┘
-```
-
-Ou vous pouvez utiliser `IPv6` domaine comme l'un des principaux:
-
-``` sql
-CREATE TABLE hits (url String, from IPv6) ENGINE = MergeTree() ORDER BY from;
-```
-
-`IPv6` le domaine prend en charge l'entrée personnalisée en tant que chaînes IPv6:
-
-``` sql
-INSERT INTO hits (url, from) VALUES ('https://wikipedia.org', '2a02:aa08:e000:3100::2')('https://clickhouse.tech', '2001:44c8:129:2632:33:0:252:2')('https://clickhouse.tech/docs/en/', '2a02:e980:1e::1');
-
-SELECT * FROM hits;
-```
-
-``` text
-┌─url────────────────────────────────┬─from──────────────────────────┐
-│ https://clickhouse.tech          │ 2001:44c8:129:2632:33:0:252:2 │
-│ https://clickhouse.tech/docs/en/ │ 2a02:e980:1e::1               │
-│ https://wikipedia.org              │ 2a02:aa08:e000:3100::2        │
-└────────────────────────────────────┴───────────────────────────────┘
-```
-
-Les valeurs sont stockées sous forme binaire compacte:
-
-``` sql
-SELECT toTypeName(from), hex(from) FROM hits LIMIT 1;
-```
-
-``` text
-┌─toTypeName(from)─┬─hex(from)────────────────────────┐
-│ IPv6             │ 200144C8012926320033000002520002 │
-└──────────────────┴──────────────────────────────────┘
-```
-
-Les valeurs de domaine ne sont pas implicitement convertibles en types autres que `FixedString(16)`.
-Si vous voulez convertir `IPv6` valeur à une chaîne, vous devez le faire explicitement avec `IPv6NumToString()` fonction:
-
-``` sql
-SELECT toTypeName(s), IPv6NumToString(from) as s FROM hits LIMIT 1;
-```
-
-``` text
-┌─toTypeName(IPv6NumToString(from))─┬─s─────────────────────────────┐
-│ String                            │ 2001:44c8:129:2632:33:0:252:2 │
-└───────────────────────────────────┴───────────────────────────────┘
-```
-
-Ou coulé à un `FixedString(16)` valeur:
-
-``` sql
-SELECT toTypeName(i), CAST(from as FixedString(16)) as i FROM hits LIMIT 1;
-```
-
-``` text
-┌─toTypeName(CAST(from, 'FixedString(16)'))─┬─i───────┐
-│ FixedString(16)                           │  ��� │
-└───────────────────────────────────────────┴─────────┘
-```
-
-[Article Original](https://clickhouse.tech/docs/en/data_types/domains/ipv6) <!--hide-->
diff --git a/docs/fr/sql-reference/data-types/enum.md b/docs/fr/sql-reference/data-types/enum.md
deleted file mode 100644
index b9751c1c804..00000000000
--- a/docs/fr/sql-reference/data-types/enum.md
+++ /dev/null
@@ -1,132 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 50
-toc_title: Enum
----
-
-# Enum {#enum}
-
-Type énuméré composé de valeurs nommées.
-
-Les valeurs nommées doivent être déclarées comme `'string' = integer` pair. ClickHouse ne stocke que des nombres, mais prend en charge les opérations avec les valeurs à travers leurs noms.
-
-Supports ClickHouse:
-
--   8-bit `Enum`. Il peut contenir jusqu'à 256 valeurs énumérées dans le `[-128, 127]` gamme.
--   16 bits `Enum`. Il peut contenir jusqu'à 65 536 valeurs énumérées dans le `[-32768, 32767]` gamme.
-
-Clickhouse choisit automatiquement le type de `Enum` lorsque les données sont insérées. Vous pouvez également utiliser `Enum8` ou `Enum16` types pour être sûr de la taille de stockage.
-
-## Exemples D'Utilisation {#usage-examples}
-
-Ici, nous créons une table avec une `Enum8('hello' = 1, 'world' = 2)` type de colonne:
-
-``` sql
-CREATE TABLE t_enum
-(
-    x Enum('hello' = 1, 'world' = 2)
-)
-ENGINE = TinyLog
-```
-
-Colonne `x` ne peut stocker que les valeurs répertoriées dans la définition de type: `'hello'` ou `'world'`. Si vous essayez d'enregistrer une autre valeur, ClickHouse déclenchera une exception. Taille 8 bits pour cela `Enum` est choisi automatiquement.
-
-``` sql
-INSERT INTO t_enum VALUES ('hello'), ('world'), ('hello')
-```
-
-``` text
-Ok.
-```
-
-``` sql
-INSERT INTO t_enum values('a')
-```
-
-``` text
-Exception on client:
-Code: 49. DB::Exception: Unknown element 'a' for type Enum('hello' = 1, 'world' = 2)
-```
-
-Lorsque vous interrogez des données de la table, ClickHouse affiche les valeurs de chaîne de `Enum`.
-
-``` sql
-SELECT * FROM t_enum
-```
-
-``` text
-┌─x─────┐
-│ hello │
-│ world │
-│ hello │
-└───────┘
-```
-
-Si vous avez besoin de voir les équivalents numériques des lignes, vous devez `Enum` valeur en type entier.
-
-``` sql
-SELECT CAST(x, 'Int8') FROM t_enum
-```
-
-``` text
-┌─CAST(x, 'Int8')─┐
-│               1 │
-│               2 │
-│               1 │
-└─────────────────┘
-```
-
-Pour créer une valeur d'Enum dans une requête, vous devez également utiliser `CAST`.
-
-``` sql
-SELECT toTypeName(CAST('a', 'Enum(\'a\' = 1, \'b\' = 2)'))
-```
-
-``` text
-┌─toTypeName(CAST('a', 'Enum(\'a\' = 1, \'b\' = 2)'))─┐
-│ Enum8('a' = 1, 'b' = 2)                             │
-└─────────────────────────────────────────────────────┘
-```
-
-## Règles générales et utilisation {#general-rules-and-usage}
-
-Chacune des valeurs se voit attribuer un nombre dans la plage `-128 ... 127` pour `Enum8` ou dans la gamme `-32768 ... 32767` pour `Enum16`. Toutes les chaînes et les nombres doivent être différents. Une chaîne vide est autorisé. Si ce type est spécifié (dans une définition de table), les nombres peuvent être dans un ordre arbitraire. Toutefois, l'ordre n'a pas d'importance.
-
-Ni la chaîne ni la valeur numérique dans un `Enum` peut être [NULL](../../sql-reference/syntax.md).
-
-Un `Enum` peut être contenue dans [Nullable](nullable.md) type. Donc, si vous créez une table en utilisant la requête
-
-``` sql
-CREATE TABLE t_enum_nullable
-(
-    x Nullable( Enum8('hello' = 1, 'world' = 2) )
-)
-ENGINE = TinyLog
-```
-
-il peut stocker non seulement des `'hello'` et `'world'`, mais `NULL`, ainsi.
-
-``` sql
-INSERT INTO t_enum_nullable Values('hello'),('world'),(NULL)
-```
-
-Dans la mémoire RAM, un `Enum` la colonne est stockée dans la même manière que `Int8` ou `Int16` des valeurs numériques correspondantes.
-
-Lors de la lecture sous forme de texte, ClickHouse analyse la valeur sous forme de chaîne et recherche la chaîne correspondante à partir de l'ensemble des valeurs Enum. Si elle n'est pas trouvée, une exception est levée. Lors de la lecture au format texte, la chaîne est lue et la valeur numérique correspondante est recherchée. Une exception sera levée si il n'est pas trouvé.
-Lors de l'écriture sous forme de texte, il écrit la valeur correspondante de la chaîne. Si les données de colonne contiennent des déchets (nombres qui ne proviennent pas de l'ensemble valide), une exception est levée. Lors de la lecture et de l'écriture sous forme binaire, cela fonctionne de la même manière que pour les types de données Int8 et Int16.
-La valeur implicite par défaut est la valeur avec le numéro le plus bas.
-
-Lors `ORDER BY`, `GROUP BY`, `IN`, `DISTINCT` et ainsi de suite, les Énumérations se comportent de la même façon que les nombres correspondants. Par exemple, ORDER BY les trie numériquement. Les opérateurs d'égalité et de comparaison fonctionnent de la même manière sur les énumérations que sur les valeurs numériques sous-jacentes.
-
-Les valeurs Enum ne peuvent pas être comparées aux nombres. Les Enums peuvent être comparés à une chaîne constante. Si la chaîne comparée à n'est pas une valeur valide pour L'énumération, une exception sera levée. L'opérateur est pris en charge avec l'Enum sur le côté gauche, et un ensemble de chaînes sur le côté droit. Les chaînes sont les valeurs de L'énumération correspondante.
-
-Most numeric and string operations are not defined for Enum values, e.g. adding a number to an Enum or concatenating a string to an Enum.
-Cependant, L'énumération a un naturel `toString` fonction qui renvoie sa valeur de chaîne.
-
-Les valeurs Enum sont également convertibles en types numériques en utilisant `toT` fonction, où T est un type numérique. Lorsque T correspond au type numérique sous-jacent de l'énumération, cette conversion est à coût nul.
-Le type Enum peut être modifié sans coût en utilisant ALTER, si seulement l'ensemble des valeurs est modifié. Il est possible d'ajouter et de supprimer des membres de L'énumération en utilisant ALTER (la suppression n'est sûre que si la valeur supprimée n'a jamais été utilisée dans la table). À titre de sauvegarde, la modification de la valeur numérique d'un membre Enum précédemment défini lancera une exception.
-
-En utilisant ALTER, il est possible de changer un Enum8 en Enum16 ou vice versa, tout comme changer un Int8 en Int16.
-
-[Article Original](https://clickhouse.tech/docs/en/data_types/enum/) <!--hide-->
diff --git a/docs/fr/sql-reference/data-types/fixedstring.md b/docs/fr/sql-reference/data-types/fixedstring.md
deleted file mode 100644
index 5ba09187581..00000000000
--- a/docs/fr/sql-reference/data-types/fixedstring.md
+++ /dev/null
@@ -1,63 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 45
-toc_title: FixedString (N)
----
-
-# Fixedstring {#fixedstring}
-
-Une chaîne de longueur fixe de `N` octets (ni caractères ni points de code).
-
-Pour déclarer une colonne de `FixedString` tapez, utilisez la syntaxe suivante:
-
-``` sql
-<column_name> FixedString(N)
-```
-
-Où `N` est un nombre naturel.
-
-Le `FixedString` type est efficace lorsque les données ont la longueur de précisément `N` octet. Dans tous les autres cas, il est susceptible de réduire l'efficacité.
-
-Exemples de valeurs qui peuvent être stockées efficacement dans `FixedString`-tapé colonnes:
-
--   La représentation binaire des adresses IP (`FixedString(16)` pour IPv6).
--   Language codes (ru_RU, en_US … ).
--   Currency codes (USD, RUB … ).
--   Représentation binaire des hachages (`FixedString(16)` pour MD5, `FixedString(32)` pour SHA256).
-
-Pour stocker les valeurs UUID, utilisez [UUID](uuid.md) type de données.
-
-Lors de l'insertion des données, ClickHouse:
-
--   Complète une chaîne avec des octets null si la chaîne contient moins de `N` octet.
--   Jette le `Too large value for FixedString(N)` exception si la chaîne contient plus de `N` octet.
-
-Lors de la sélection des données, ClickHouse ne supprime pas les octets nuls à la fin de la chaîne. Si vous utilisez le `WHERE` clause, vous devez ajouter des octets null manuellement pour `FixedString` valeur. L'exemple suivant illustre l'utilisation de l' `WHERE` la clause de `FixedString`.
-
-Considérons le tableau suivant avec le seul `FixedString(2)` colonne:
-
-``` text
-┌─name──┐
-│ b     │
-└───────┘
-```
-
-Requête `SELECT * FROM FixedStringTable WHERE a = 'b'` ne renvoie aucune donnée en conséquence. Nous devrions compléter le modèle de filtre avec des octets nuls.
-
-``` sql
-SELECT * FROM FixedStringTable
-WHERE a = 'b\0'
-```
-
-``` text
-┌─a─┐
-│ b │
-└───┘
-```
-
-Ce comportement diffère de MySQL pour le `CHAR` type (où les chaînes sont remplies d'espaces et les espaces sont supprimés pour la sortie).
-
-À noter que la longueur de la `FixedString(N)` la valeur est constante. Le [longueur](../../sql-reference/functions/array-functions.md#array_functions-length) la fonction renvoie `N` même si l' `FixedString(N)` la valeur est remplie uniquement avec des octets [vide](../../sql-reference/functions/string-functions.md#empty) la fonction renvoie `1` dans ce cas.
-
-[Article Original](https://clickhouse.tech/docs/en/data_types/fixedstring/) <!--hide-->
diff --git a/docs/fr/sql-reference/data-types/float.md b/docs/fr/sql-reference/data-types/float.md
deleted file mode 100644
index b269b930110..00000000000
--- a/docs/fr/sql-reference/data-types/float.md
+++ /dev/null
@@ -1,87 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 41
-toc_title: Float32, Float64
----
-
-# Float32, Float64 {#float32-float64}
-
-[Les nombres à virgule flottante](https://en.wikipedia.org/wiki/IEEE_754).
-
-Les Types sont équivalents aux types de C:
-
--   `Float32` - `float`
--   `Float64` - `double`
-
-Nous vous recommandons de stocker les données sous forme entière chaque fois que possible. Par exemple, convertissez des nombres de précision fixes en valeurs entières, telles que des montants monétaires ou des temps de chargement de page en millisecondes.
-
-## Utilisation de nombres à virgule flottante {#using-floating-point-numbers}
-
--   Calculs avec des nombres à virgule flottante peut produire une erreur d'arrondi.
-
-<!-- -->
-
-``` sql
-SELECT 1 - 0.9
-```
-
-``` text
-┌───────minus(1, 0.9)─┐
-│ 0.09999999999999998 │
-└─────────────────────┘
-```
-
--   Le résultat du calcul dépend de la méthode de calcul (le type de processeur et de l'architecture du système informatique).
--   Les calculs à virgule flottante peuvent entraîner des nombres tels que l'infini (`Inf`) et “not-a-number” (`NaN`). Cela doit être pris en compte lors du traitement des résultats de calculs.
--   Lors de l'analyse de nombres à virgule flottante à partir de texte, le résultat peut ne pas être le nombre représentable par machine le plus proche.
-
-## NaN et Inf {#data_type-float-nan-inf}
-
-Contrairement à SQL standard, ClickHouse prend en charge les catégories suivantes de nombres à virgule flottante:
-
--   `Inf` – Infinity.
-
-<!-- -->
-
-``` sql
-SELECT 0.5 / 0
-```
-
-``` text
-┌─divide(0.5, 0)─┐
-│            inf │
-└────────────────┘
-```
-
--   `-Inf` – Negative infinity.
-
-<!-- -->
-
-``` sql
-SELECT -0.5 / 0
-```
-
-``` text
-┌─divide(-0.5, 0)─┐
-│            -inf │
-└─────────────────┘
-```
-
--   `NaN` – Not a number.
-
-<!-- -->
-
-``` sql
-SELECT 0 / 0
-```
-
-``` text
-┌─divide(0, 0)─┐
-│          nan │
-└──────────────┘
-```
-
-    See the rules for `NaN` sorting in the section [ORDER BY clause](../sql_reference/statements/select/order-by.md).
-
-[Article Original](https://clickhouse.tech/docs/en/data_types/float/) <!--hide-->
diff --git a/docs/fr/sql-reference/data-types/index.md b/docs/fr/sql-reference/data-types/index.md
deleted file mode 100644
index 887e2efd69f..00000000000
--- a/docs/fr/sql-reference/data-types/index.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: "Types De Donn\xE9es"
-toc_priority: 37
-toc_title: Introduction
----
-
-# Types De Données {#data_types}
-
-ClickHouse peut stocker différents types de données dans des cellules de table.
-
-Cette section décrit les types de données pris en charge et les considérations spéciales pour les utiliser et/ou les implémenter le cas échéant.
-
-[Article Original](https://clickhouse.tech/docs/en/data_types/) <!--hide-->
diff --git a/docs/fr/sql-reference/data-types/int-uint.md b/docs/fr/sql-reference/data-types/int-uint.md
deleted file mode 100644
index 9b196c164a4..00000000000
--- a/docs/fr/sql-reference/data-types/int-uint.md
+++ /dev/null
@@ -1,26 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 40
-toc_title: UInt8, UInt16, UInt32, UInt64, Int8, Int16, Int32, Int64
----
-
-# UInt8, UInt16, UInt32, UInt64, Int8, Int16, Int32, Int64 {#uint8-uint16-uint32-uint64-int8-int16-int32-int64}
-
-Entiers de longueur fixe, avec ou sans signe.
-
-## Plages Int {#int-ranges}
-
--   Int8 - \[-128: 127\]
--   Int16 - \[-32768: 32767\]
--   Int32 - \[-2147483648: 2147483647\]
--   Int64 - \[-9223372036854775808: 9223372036854775807\]
-
-## Plages Uint {#uint-ranges}
-
--   UInt8 - \[0: 255\]
--   UInt16 - \[0: 65535\]
--   UInt32- \[0: 4294967295\]
--   UInt64- \[0: 18446744073709551615\]
-
-[Article Original](https://clickhouse.tech/docs/en/data_types/int_uint/) <!--hide-->
diff --git a/docs/fr/sql-reference/data-types/nested-data-structures/index.md b/docs/fr/sql-reference/data-types/nested-data-structures/index.md
deleted file mode 100644
index 528e0bad0cd..00000000000
--- a/docs/fr/sql-reference/data-types/nested-data-structures/index.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: "Structures De Donn\xE9es Imbriqu\xE9es"
-toc_hidden: true
-toc_priority: 54
-toc_title: "cach\xE9s"
----
-
-# Structures De Données Imbriquées {#nested-data-structures}
-
-[Article Original](https://clickhouse.tech/docs/en/data_types/nested_data_structures/) <!--hide-->
diff --git a/docs/fr/sql-reference/data-types/nested-data-structures/nested.md b/docs/fr/sql-reference/data-types/nested-data-structures/nested.md
deleted file mode 100644
index 2805780de24..00000000000
--- a/docs/fr/sql-reference/data-types/nested-data-structures/nested.md
+++ /dev/null
@@ -1,106 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 57
-toc_title: "Imbriqu\xE9e(Type1 Nom1, Nom2 Type2, ...)"
----
-
-# Nested(name1 Type1, Name2 Type2, …) {#nestedname1-type1-name2-type2}
-
-A nested data structure is like a table inside a cell. The parameters of a nested data structure – the column names and types – are specified the same way as in a [CREATE TABLE](../../../sql-reference/statements/create.md) requête. Chaque ligne de table peut correspondre à n'importe quel nombre de lignes dans une structure de données imbriquée.
-
-Exemple:
-
-``` sql
-CREATE TABLE test.visits
-(
-    CounterID UInt32,
-    StartDate Date,
-    Sign Int8,
-    IsNew UInt8,
-    VisitID UInt64,
-    UserID UInt64,
-    ...
-    Goals Nested
-    (
-        ID UInt32,
-        Serial UInt32,
-        EventTime DateTime,
-        Price Int64,
-        OrderID String,
-        CurrencyID UInt32
-    ),
-    ...
-) ENGINE = CollapsingMergeTree(StartDate, intHash32(UserID), (CounterID, StartDate, intHash32(UserID), VisitID), 8192, Sign)
-```
-
-Cet exemple déclare le `Goals` structure de données imbriquée, qui contient des données sur les conversions (objectifs atteints). Chaque ligne de la ‘visits’ table peut correspondre à zéro ou n'importe quel nombre de conversions.
-
-Un seul niveau d'imbrication est pris en charge. Les colonnes de structures imbriquées contenant des tableaux sont équivalentes à des tableaux multidimensionnels, elles ont donc un support limité (il n'y a pas de support pour stocker ces colonnes dans des tables avec le moteur MergeTree).
-
-Dans la plupart des cas, lorsque vous travaillez avec une structure de données imbriquée, ses colonnes sont spécifiées avec des noms de colonnes séparés par un point. Ces colonnes constituent un tableau de types correspondants. Tous les tableaux de colonnes d'une structure de données imbriquée unique ont la même longueur.
-
-Exemple:
-
-``` sql
-SELECT
-    Goals.ID,
-    Goals.EventTime
-FROM test.visits
-WHERE CounterID = 101500 AND length(Goals.ID) < 5
-LIMIT 10
-```
-
-``` text
-┌─Goals.ID───────────────────────┬─Goals.EventTime───────────────────────────────────────────────────────────────────────────┐
-│ [1073752,591325,591325]        │ ['2014-03-17 16:38:10','2014-03-17 16:38:48','2014-03-17 16:42:27']                       │
-│ [1073752]                      │ ['2014-03-17 00:28:25']                                                                   │
-│ [1073752]                      │ ['2014-03-17 10:46:20']                                                                   │
-│ [1073752,591325,591325,591325] │ ['2014-03-17 13:59:20','2014-03-17 22:17:55','2014-03-17 22:18:07','2014-03-17 22:18:51'] │
-│ []                             │ []                                                                                        │
-│ [1073752,591325,591325]        │ ['2014-03-17 11:37:06','2014-03-17 14:07:47','2014-03-17 14:36:21']                       │
-│ []                             │ []                                                                                        │
-│ []                             │ []                                                                                        │
-│ [591325,1073752]               │ ['2014-03-17 00:46:05','2014-03-17 00:46:05']                                             │
-│ [1073752,591325,591325,591325] │ ['2014-03-17 13:28:33','2014-03-17 13:30:26','2014-03-17 18:51:21','2014-03-17 18:51:45'] │
-└────────────────────────────────┴───────────────────────────────────────────────────────────────────────────────────────────┘
-```
-
-Il est plus facile de penser à une structure de données imbriquée comme un ensemble de plusieurs tableaux de colonnes de la même longueur.
-
-Le seul endroit où une requête SELECT peut spécifier le nom d'une structure de données imbriquée entière au lieu de colonnes individuelles est la clause de jointure de tableau. Pour plus d'informations, voir “ARRAY JOIN clause”. Exemple:
-
-``` sql
-SELECT
-    Goal.ID,
-    Goal.EventTime
-FROM test.visits
-ARRAY JOIN Goals AS Goal
-WHERE CounterID = 101500 AND length(Goals.ID) < 5
-LIMIT 10
-```
-
-``` text
-┌─Goal.ID─┬──────Goal.EventTime─┐
-│ 1073752 │ 2014-03-17 16:38:10 │
-│  591325 │ 2014-03-17 16:38:48 │
-│  591325 │ 2014-03-17 16:42:27 │
-│ 1073752 │ 2014-03-17 00:28:25 │
-│ 1073752 │ 2014-03-17 10:46:20 │
-│ 1073752 │ 2014-03-17 13:59:20 │
-│  591325 │ 2014-03-17 22:17:55 │
-│  591325 │ 2014-03-17 22:18:07 │
-│  591325 │ 2014-03-17 22:18:51 │
-│ 1073752 │ 2014-03-17 11:37:06 │
-└─────────┴─────────────────────┘
-```
-
-Vous ne pouvez pas effectuer SELECT pour une structure de données imbriquée entière. Vous ne pouvez lister explicitement que les colonnes individuelles qui en font partie.
-
-Pour une requête INSERT, vous devez passer tous les tableaux de colonnes composant d'une structure de données imbriquée séparément (comme s'il s'agissait de tableaux de colonnes individuels). Au cours de l'insertion, le système vérifie qu'ils ont la même longueur.
-
-Pour une requête DESCRIBE, les colonnes d'une structure de données imbriquée sont répertoriées séparément de la même manière.
-
-La requête ALTER pour les éléments d'une structure de données imbriquée a des limites.
-
-[Article Original](https://clickhouse.tech/docs/en/data_types/nested_data_structures/nested/) <!--hide-->
diff --git a/docs/fr/sql-reference/data-types/nullable.md b/docs/fr/sql-reference/data-types/nullable.md
deleted file mode 100644
index 6b37b571a96..00000000000
--- a/docs/fr/sql-reference/data-types/nullable.md
+++ /dev/null
@@ -1,46 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 54
-toc_title: Nullable
----
-
-# Nullable(typename) {#data_type-nullable}
-
-Permet de stocker marqueur spécial ([NULL](../../sql-reference/syntax.md)) qui dénote “missing value” aux valeurs normales autorisées par `TypeName`. Par exemple, un `Nullable(Int8)` type colonne peut stocker `Int8` type de valeurs, et les lignes qui n'ont pas de valeur magasin `NULL`.
-
-Pour un `TypeName` vous ne pouvez pas utiliser les types de données composites [Tableau](array.md) et [Tuple](tuple.md). Les types de données composites peuvent contenir `Nullable` valeurs de type, telles que `Array(Nullable(Int8))`.
-
-A `Nullable` le champ type ne peut pas être inclus dans les index de table.
-
-`NULL` est la valeur par défaut pour tout `Nullable` type, sauf indication contraire dans la configuration du serveur ClickHouse.
-
-## Caractéristiques De Stockage {#storage-features}
-
-Stocker `Nullable` valeurs de type dans une colonne de table, ClickHouse utilise un fichier séparé avec `NULL` masques en plus du fichier normal avec des valeurs. Les entrées du fichier masks permettent à ClickHouse de faire la distinction entre `NULL` et une valeur par défaut du type de données correspondant pour chaque ligne de table. En raison d'un fichier supplémentaire, `Nullable` colonne consomme de l'espace de stockage supplémentaire par rapport à une normale similaire.
-
-!!! info "Note"
-    Utiliser `Nullable` affecte presque toujours négativement les performances, gardez cela à l'esprit lors de la conception de vos bases de données.
-
-## Exemple D'Utilisation {#usage-example}
-
-``` sql
-CREATE TABLE t_null(x Int8, y Nullable(Int8)) ENGINE TinyLog
-```
-
-``` sql
-INSERT INTO t_null VALUES (1, NULL), (2, 3)
-```
-
-``` sql
-SELECT x + y FROM t_null
-```
-
-``` text
-┌─plus(x, y)─┐
-│       ᴺᵁᴸᴸ │
-│          5 │
-└────────────┘
-```
-
-[Article Original](https://clickhouse.tech/docs/en/data_types/nullable/) <!--hide-->
diff --git a/docs/fr/sql-reference/data-types/simpleaggregatefunction.md b/docs/fr/sql-reference/data-types/simpleaggregatefunction.md
deleted file mode 100644
index 81fcd67cfae..00000000000
--- a/docs/fr/sql-reference/data-types/simpleaggregatefunction.md
+++ /dev/null
@@ -1,38 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
----
-
-# SimpleAggregateFunction {#data-type-simpleaggregatefunction}
-
-`SimpleAggregateFunction(name, types_of_arguments…)` le type de données stocke la valeur actuelle de la fonction d'agrégat et ne stocke pas son état complet comme [`AggregateFunction`](aggregatefunction.md) faire. Cette optimisation peut être appliquée aux fonctions pour lesquelles la propriété suivante est conservée: le résultat de l'application d'une fonction `f` pour un ensemble de lignes `S1 UNION ALL S2` peut être obtenu en appliquant `f` pour les parties de la ligne définie séparément, puis à nouveau l'application `f` pour les résultats: `f(S1 UNION ALL S2) = f(f(S1) UNION ALL f(S2))`. Cette propriété garantit que les résultats d'agrégation partielle sont suffisants pour calculer le combiné, de sorte que nous n'avons pas à stocker et traiter de données supplémentaires.
-
-Les fonctions d'agrégation suivantes sont prises en charge:
-
--   [`any`](../../sql-reference/aggregate-functions/reference.md#agg_function-any)
--   [`anyLast`](../../sql-reference/aggregate-functions/reference.md#anylastx)
--   [`min`](../../sql-reference/aggregate-functions/reference.md#agg_function-min)
--   [`max`](../../sql-reference/aggregate-functions/reference.md#agg_function-max)
--   [`sum`](../../sql-reference/aggregate-functions/reference.md#agg_function-sum)
--   [`groupBitAnd`](../../sql-reference/aggregate-functions/reference.md#groupbitand)
--   [`groupBitOr`](../../sql-reference/aggregate-functions/reference.md#groupbitor)
--   [`groupBitXor`](../../sql-reference/aggregate-functions/reference.md#groupbitxor)
-
-Les valeurs de la `SimpleAggregateFunction(func, Type)` regarder et stockées de la même manière que `Type`, de sorte que vous n'avez pas besoin d'appliquer des fonctions avec `-Merge`/`-State` suffixe. `SimpleAggregateFunction` a de meilleures performances que `AggregateFunction` avec la même fonction d'agrégation.
-
-**Paramètre**
-
--   Nom de la fonction d'agrégation.
--   Types des arguments de la fonction d'agrégation.
-
-**Exemple**
-
-``` sql
-CREATE TABLE t
-(
-    column1 SimpleAggregateFunction(sum, UInt64),
-    column2 SimpleAggregateFunction(any, String)
-) ENGINE = ...
-```
-
-[Article Original](https://clickhouse.tech/docs/en/data_types/simpleaggregatefunction/) <!--hide-->
diff --git a/docs/fr/sql-reference/data-types/special-data-types/expression.md b/docs/fr/sql-reference/data-types/special-data-types/expression.md
deleted file mode 100644
index c3ba5e42ba1..00000000000
--- a/docs/fr/sql-reference/data-types/special-data-types/expression.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 58
-toc_title: Expression
----
-
-# Expression {#expression}
-
-Les Expressions sont utilisées pour représenter des lambdas dans des fonctions d'ordre Élevé.
-
-[Article Original](https://clickhouse.tech/docs/en/data_types/special_data_types/expression/) <!--hide-->
diff --git a/docs/fr/sql-reference/data-types/special-data-types/index.md b/docs/fr/sql-reference/data-types/special-data-types/index.md
deleted file mode 100644
index 6d292dc522e..00000000000
--- a/docs/fr/sql-reference/data-types/special-data-types/index.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: "Types De Donn\xE9es Sp\xE9ciaux"
-toc_hidden: true
-toc_priority: 55
-toc_title: "cach\xE9s"
----
-
-# Types De Données Spéciaux {#special-data-types}
-
-Les valeurs de type de données spéciales ne peuvent pas être sérialisées pour l'enregistrement dans une table ou la sortie dans les résultats de la requête, mais peuvent être utilisées comme résultat intermédiaire lors de l'exécution de la requête.
-
-[Article Original](https://clickhouse.tech/docs/en/data_types/special_data_types/) <!--hide-->
diff --git a/docs/fr/sql-reference/data-types/special-data-types/interval.md b/docs/fr/sql-reference/data-types/special-data-types/interval.md
deleted file mode 100644
index 464de8a10ab..00000000000
--- a/docs/fr/sql-reference/data-types/special-data-types/interval.md
+++ /dev/null
@@ -1,85 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 61
-toc_title: Intervalle
----
-
-# Intervalle {#data-type-interval}
-
-Famille de types de données représentant des intervalles d'heure et de date. Les types de la [INTERVAL](../../../sql-reference/operators/index.md#operator-interval) opérateur.
-
-!!! warning "Avertissement"
-    `Interval` les valeurs de type de données ne peuvent pas être stockées dans les tables.
-
-Structure:
-
--   Intervalle de temps en tant que valeur entière non signée.
--   Type de l'intervalle.
-
-Types d'intervalles pris en charge:
-
--   `SECOND`
--   `MINUTE`
--   `HOUR`
--   `DAY`
--   `WEEK`
--   `MONTH`
--   `QUARTER`
--   `YEAR`
-
-Pour chaque type d'intervalle, il existe un type de données distinct. Par exemple, l' `DAY` l'intervalle correspond au `IntervalDay` type de données:
-
-``` sql
-SELECT toTypeName(INTERVAL 4 DAY)
-```
-
-``` text
-┌─toTypeName(toIntervalDay(4))─┐
-│ IntervalDay                  │
-└──────────────────────────────┘
-```
-
-## Utilisation Remarques {#data-type-interval-usage-remarks}
-
-Vous pouvez utiliser `Interval`-tapez des valeurs dans des opérations arithmétiques avec [Date](../../../sql-reference/data-types/date.md) et [DateTime](../../../sql-reference/data-types/datetime.md)-type de valeurs. Par exemple, vous pouvez ajouter 4 jours à l'heure actuelle:
-
-``` sql
-SELECT now() as current_date_time, current_date_time + INTERVAL 4 DAY
-```
-
-``` text
-┌───current_date_time─┬─plus(now(), toIntervalDay(4))─┐
-│ 2019-10-23 10:58:45 │           2019-10-27 10:58:45 │
-└─────────────────────┴───────────────────────────────┘
-```
-
-Les intervalles avec différents types ne peuvent pas être combinés. Vous ne pouvez pas utiliser des intervalles comme `4 DAY 1 HOUR`. Spécifiez des intervalles en unités inférieures ou égales à la plus petite unité de l'intervalle, par exemple, l'intervalle `1 day and an hour` l'intervalle peut être exprimée comme `25 HOUR` ou `90000 SECOND`.
-
-Vous ne pouvez pas effectuer d'opérations arithmétiques avec `Interval`- tapez des valeurs, mais vous pouvez ajouter des intervalles de différents types par conséquent aux valeurs dans `Date` ou `DateTime` types de données. Exemple:
-
-``` sql
-SELECT now() AS current_date_time, current_date_time + INTERVAL 4 DAY + INTERVAL 3 HOUR
-```
-
-``` text
-┌───current_date_time─┬─plus(plus(now(), toIntervalDay(4)), toIntervalHour(3))─┐
-│ 2019-10-23 11:16:28 │                                    2019-10-27 14:16:28 │
-└─────────────────────┴────────────────────────────────────────────────────────┘
-```
-
-La requête suivante provoque une exception:
-
-``` sql
-select now() AS current_date_time, current_date_time + (INTERVAL 4 DAY + INTERVAL 3 HOUR)
-```
-
-``` text
-Received exception from server (version 19.14.1):
-Code: 43. DB::Exception: Received from localhost:9000. DB::Exception: Wrong argument types for function plus: if one argument is Interval, then another must be Date or DateTime..
-```
-
-## Voir Aussi {#see-also}
-
--   [INTERVAL](../../../sql-reference/operators/index.md#operator-interval) opérateur
--   [toInterval](../../../sql-reference/functions/type-conversion-functions.md#function-tointerval) type fonctions de conversion
diff --git a/docs/fr/sql-reference/data-types/special-data-types/nothing.md b/docs/fr/sql-reference/data-types/special-data-types/nothing.md
deleted file mode 100644
index 2e3d76b7207..00000000000
--- a/docs/fr/sql-reference/data-types/special-data-types/nothing.md
+++ /dev/null
@@ -1,26 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 60
-toc_title: Rien
----
-
-# Rien {#nothing}
-
-Le seul but de ce type de données est de représenter les cas où une valeur n'est pas prévu. Donc vous ne pouvez pas créer un `Nothing` type de valeur.
-
-Par exemple, littéral [NULL](../../../sql-reference/syntax.md#null-literal) a type de `Nullable(Nothing)`. Voir plus sur [Nullable](../../../sql-reference/data-types/nullable.md).
-
-Le `Nothing` type peut également être utilisé pour désigner des tableaux vides:
-
-``` sql
-SELECT toTypeName(array())
-```
-
-``` text
-┌─toTypeName(array())─┐
-│ Array(Nothing)      │
-└─────────────────────┘
-```
-
-[Article Original](https://clickhouse.tech/docs/en/data_types/special_data_types/nothing/) <!--hide-->
diff --git a/docs/fr/sql-reference/data-types/special-data-types/set.md b/docs/fr/sql-reference/data-types/special-data-types/set.md
deleted file mode 100644
index 8f50175bb6b..00000000000
--- a/docs/fr/sql-reference/data-types/special-data-types/set.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 59
-toc_title: "D\xE9finir"
----
-
-# Définir {#set}
-
-Utilisé pour la moitié droite d'un [IN](../../operators/in.md#select-in-operators) expression.
-
-[Article Original](https://clickhouse.tech/docs/en/data_types/special_data_types/set/) <!--hide-->
diff --git a/docs/fr/sql-reference/data-types/string.md b/docs/fr/sql-reference/data-types/string.md
deleted file mode 100644
index b82e1fe6c69..00000000000
--- a/docs/fr/sql-reference/data-types/string.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 44
-toc_title: "Cha\xEEne"
----
-
-# Chaîne {#string}
-
-Les chaînes d'une longueur arbitraire. La longueur n'est pas limitée. La valeur peut contenir un ensemble arbitraire d'octets, y compris des octets nuls.
-Le type de chaîne remplace les types VARCHAR, BLOB, CLOB et autres provenant d'autres SGBD.
-
-## Encodage {#encodings}
-
-ClickHouse n'a pas le concept d'encodages. Les chaînes peuvent contenir un ensemble arbitraire d'octets, qui sont stockés et sortis tels quels.
-Si vous avez besoin de stocker des textes, nous vous recommandons d'utiliser L'encodage UTF-8. À tout le moins, si votre terminal utilise UTF-8 (comme recommandé), vous pouvez lire et écrire vos valeurs sans effectuer de conversions.
-De même, certaines fonctions pour travailler avec des chaînes ont des variations distinctes qui fonctionnent sous l'hypothèse que la chaîne contient un ensemble d'octets représentant un texte codé en UTF-8.
-Par exemple, l' ‘length’ fonction calcule la longueur de la chaîne en octets, tandis que le ‘lengthUTF8’ la fonction calcule la longueur de la chaîne en points de code Unicode, en supposant que la valeur est encodée en UTF-8.
-
-[Article Original](https://clickhouse.tech/docs/en/data_types/string/) <!--hide-->
diff --git a/docs/fr/sql-reference/data-types/tuple.md b/docs/fr/sql-reference/data-types/tuple.md
deleted file mode 100644
index ab9db735181..00000000000
--- a/docs/fr/sql-reference/data-types/tuple.md
+++ /dev/null
@@ -1,52 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 53
-toc_title: Tuple (T1, T2,...)
----
-
-# Tuple(t1, T2, …) {#tuplet1-t2}
-
-Un n-uplet d'éléments, chacun ayant une personne [type](index.md#data_types).
-
-Les Tuples sont utilisés pour le regroupement temporaire de colonnes. Les colonnes peuvent être regroupées lorsqu'une expression IN est utilisée dans une requête et pour spécifier certains paramètres formels des fonctions lambda. Pour plus d'informations, voir les sections [Dans les opérateurs](../../sql-reference/operators/in.md) et [Des fonctions d'ordre supérieur](../../sql-reference/functions/higher-order-functions.md).
-
-Les Tuples peuvent être le résultat d'une requête. Dans ce cas, pour les formats de texte autres que JSON, les valeurs sont séparées par des virgules entre parenthèses. Dans les formats JSON, les tuples sont sortis sous forme de tableaux (entre crochets).
-
-## La création d'un Tuple {#creating-a-tuple}
-
-Vous pouvez utiliser une fonction pour créer un tuple:
-
-``` sql
-tuple(T1, T2, ...)
-```
-
-Exemple de création d'un tuple:
-
-``` sql
-SELECT tuple(1,'a') AS x, toTypeName(x)
-```
-
-``` text
-┌─x───────┬─toTypeName(tuple(1, 'a'))─┐
-│ (1,'a') │ Tuple(UInt8, String)      │
-└─────────┴───────────────────────────┘
-```
-
-## Utilisation de Types de données {#working-with-data-types}
-
-Lors de la création d'un tuple à la volée, ClickHouse détecte automatiquement le type de chaque argument comme le minimum des types qui peuvent stocker la valeur de l'argument. Si l'argument est [NULL](../../sql-reference/syntax.md#null-literal) le type de l'élément tuple est [Nullable](nullable.md).
-
-Exemple de détection automatique de type de données:
-
-``` sql
-SELECT tuple(1, NULL) AS x, toTypeName(x)
-```
-
-``` text
-┌─x────────┬─toTypeName(tuple(1, NULL))──────┐
-│ (1,NULL) │ Tuple(UInt8, Nullable(Nothing)) │
-└──────────┴─────────────────────────────────┘
-```
-
-[Article Original](https://clickhouse.tech/docs/en/data_types/tuple/) <!--hide-->
diff --git a/docs/fr/sql-reference/data-types/uuid.md b/docs/fr/sql-reference/data-types/uuid.md
deleted file mode 100644
index 60973a3f855..00000000000
--- a/docs/fr/sql-reference/data-types/uuid.md
+++ /dev/null
@@ -1,77 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 46
-toc_title: UUID
----
-
-# UUID {#uuid-data-type}
-
-Un identifiant unique universel (UUID) est un numéro de 16 octets utilisé pour identifier les enregistrements. Pour plus d'informations sur L'UUID, voir [Wikipedia](https://en.wikipedia.org/wiki/Universally_unique_identifier).
-
-L'exemple de valeur de type UUID est représenté ci-dessous:
-
-``` text
-61f0c404-5cb3-11e7-907b-a6006ad3dba0
-```
-
-Si vous ne spécifiez pas la valeur de la colonne UUID lors de l'insertion d'un nouvel enregistrement, la valeur UUID est remplie avec zéro:
-
-``` text
-00000000-0000-0000-0000-000000000000
-```
-
-## Comment générer {#how-to-generate}
-
-Pour générer la valeur UUID, ClickHouse fournit [generateUUIDv4](../../sql-reference/functions/uuid-functions.md) fonction.
-
-## Exemple D'Utilisation {#usage-example}
-
-**Exemple 1**
-
-Cet exemple montre la création d'une table avec la colonne de type UUID et l'insertion d'une valeur dans la table.
-
-``` sql
-CREATE TABLE t_uuid (x UUID, y String) ENGINE=TinyLog
-```
-
-``` sql
-INSERT INTO t_uuid SELECT generateUUIDv4(), 'Example 1'
-```
-
-``` sql
-SELECT * FROM t_uuid
-```
-
-``` text
-┌────────────────────────────────────x─┬─y─────────┐
-│ 417ddc5d-e556-4d27-95dd-a34d84e46a50 │ Example 1 │
-└──────────────────────────────────────┴───────────┘
-```
-
-**Exemple 2**
-
-Dans cet exemple, la valeur de la colonne UUID n'est pas spécifiée lors de l'insertion d'un nouvel enregistrement.
-
-``` sql
-INSERT INTO t_uuid (y) VALUES ('Example 2')
-```
-
-``` sql
-SELECT * FROM t_uuid
-```
-
-``` text
-┌────────────────────────────────────x─┬─y─────────┐
-│ 417ddc5d-e556-4d27-95dd-a34d84e46a50 │ Example 1 │
-│ 00000000-0000-0000-0000-000000000000 │ Example 2 │
-└──────────────────────────────────────┴───────────┘
-```
-
-## Restriction {#restrictions}
-
-Le type de données UUID ne prend en charge que les fonctions qui [Chaîne](string.md) type de données prend également en charge (par exemple, [min](../../sql-reference/aggregate-functions/reference.md#agg_function-min), [Max](../../sql-reference/aggregate-functions/reference.md#agg_function-max), et [compter](../../sql-reference/aggregate-functions/reference.md#agg_function-count)).
-
-Le type de données UUID n'est pas pris en charge par les opérations arithmétiques (par exemple, [ABS](../../sql-reference/functions/arithmetic-functions.md#arithm_func-abs)) ou des fonctions d'agrégation, comme [somme](../../sql-reference/aggregate-functions/reference.md#agg_function-sum) et [avg](../../sql-reference/aggregate-functions/reference.md#agg_function-avg).
-
-[Article Original](https://clickhouse.tech/docs/en/data_types/uuid/) <!--hide-->
diff --git a/docs/fr/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-hierarchical.md b/docs/fr/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-hierarchical.md
deleted file mode 100644
index cc238f02f3a..00000000000
--- a/docs/fr/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-hierarchical.md
+++ /dev/null
@@ -1,70 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 45
-toc_title: "Dictionnaires hi\xE9rarchiques"
----
-
-# Dictionnaires Hiérarchiques {#hierarchical-dictionaries}
-
-Clickhouse prend en charge les dictionnaires hiérarchiques avec un [touche numérique](external-dicts-dict-structure.md#ext_dict-numeric-key).
-
-Voici une structure hiérarchique:
-
-``` text
-0 (Common parent)
-│
-├── 1 (Russia)
-│   │
-│   └── 2 (Moscow)
-│       │
-│       └── 3 (Center)
-│
-└── 4 (Great Britain)
-    │
-    └── 5 (London)
-```
-
-Cette hiérarchie peut être exprimée comme la table de dictionnaire suivante.
-
-| id_région | région_parent | nom_région        |
-|------------|----------------|--------------------|
-| 1          | 0              | Russie             |
-| 2          | 1              | Moscou             |
-| 3          | 2              | Center             |
-| 4          | 0              | La Grande-Bretagne |
-| 5          | 4              | Londres            |
-
-Ce tableau contient une colonne `parent_region` qui contient la clé du parent le plus proche de l'élément.
-
-Clickhouse soutient le [hiérarchique](external-dicts-dict-structure.md#hierarchical-dict-attr) propriété pour [externe dictionnaire](index.md) attribut. Cette propriété vous permet de configurer le dictionnaire hiérarchique comme décrit ci-dessus.
-
-Le [dictGetHierarchy](../../../sql-reference/functions/ext-dict-functions.md#dictgethierarchy) la fonction vous permet d'obtenir la chaîne parent d'un élément.
-
-Pour notre exemple, la structure du dictionnaire peut être la suivante:
-
-``` xml
-<dictionary>
-    <structure>
-        <id>
-            <name>region_id</name>
-        </id>
-
-        <attribute>
-            <name>parent_region</name>
-            <type>UInt64</type>
-            <null_value>0</null_value>
-            <hierarchical>true</hierarchical>
-        </attribute>
-
-        <attribute>
-            <name>region_name</name>
-            <type>String</type>
-            <null_value></null_value>
-        </attribute>
-
-    </structure>
-</dictionary>
-```
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/dicts/external_dicts_dict_hierarchical/) <!--hide-->
diff --git a/docs/fr/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md b/docs/fr/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md
deleted file mode 100644
index 2569329fefd..00000000000
--- a/docs/fr/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md
+++ /dev/null
@@ -1,407 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 41
-toc_title: "Stockage des dictionnaires en m\xE9moire"
----
-
-# Stockage des dictionnaires en mémoire {#dicts-external-dicts-dict-layout}
-
-Il existe une variété de façons de stocker les dictionnaires en mémoire.
-
-Nous vous recommandons [plat](#flat), [haché](#dicts-external_dicts_dict_layout-hashed) et [complex_key_hashed](#complex-key-hashed). qui fournissent la vitesse de traitement optimale.
-
-La mise en cache n'est pas recommandée en raison de performances potentiellement médiocres et de difficultés à sélectionner les paramètres optimaux. En savoir plus dans la section “[cache](#cache)”.
-
-Il existe plusieurs façons d'améliorer les performances du dictionnaire:
-
--   Appelez la fonction pour travailler avec le dictionnaire après `GROUP BY`.
--   Marquer les attributs à extraire comme injectifs. Un attribut est appelé injectif si différentes valeurs d'attribut correspondent à différentes clés. Alors, quand `GROUP BY` utilise une fonction qui récupère une valeur d'attribut par la clé, cette fonction est automatiquement retirée de `GROUP BY`.
-
-ClickHouse génère une exception pour les erreurs avec les dictionnaires. Des exemples d'erreurs:
-
--   Le dictionnaire accessible n'a pas pu être chargé.
--   Erreur de la requête d'une `cached` dictionnaire.
-
-Vous pouvez afficher la liste des dictionnaires externes et leurs statuts dans le `system.dictionaries` table.
-
-La configuration ressemble à ceci:
-
-``` xml
-<yandex>
-    <dictionary>
-        ...
-        <layout>
-            <layout_type>
-                <!-- layout settings -->
-            </layout_type>
-        </layout>
-        ...
-    </dictionary>
-</yandex>
-```
-
-Correspondant [DDL-requête](../../statements/create.md#create-dictionary-query):
-
-``` sql
-CREATE DICTIONARY (...)
-...
-LAYOUT(LAYOUT_TYPE(param value)) -- layout settings
-...
-```
-
-## Façons de stocker des dictionnaires en mémoire {#ways-to-store-dictionaries-in-memory}
-
--   [plat](#flat)
--   [haché](#dicts-external_dicts_dict_layout-hashed)
--   [sparse_hashed](#dicts-external_dicts_dict_layout-sparse_hashed)
--   [cache](#cache)
--   [direct](#direct)
--   [range_hashed](#range-hashed)
--   [complex_key_hashed](#complex-key-hashed)
--   [complex_key_cache](#complex-key-cache)
--   [complex_key_direct](#complex-key-direct)
--   [ip_trie](#ip-trie)
-
-### plat {#flat}
-
-Le dictionnaire est complètement stocké en mémoire sous la forme de tableaux plats. Combien de mémoire le dictionnaire utilise-t-il? Le montant est proportionnel à la taille de la plus grande clé (dans l'espace).
-
-La clé du dictionnaire a le `UInt64` type et la valeur est limitée à 500 000. Si une clé plus grande est découverte lors de la création du dictionnaire, ClickHouse lève une exception et ne crée pas le dictionnaire.
-
-Tous les types de sources sont pris en charge. Lors de la mise à jour, les données (à partir d'un fichier ou d'une table) sont lues dans leur intégralité.
-
-Cette méthode fournit les meilleures performances parmi toutes les méthodes disponibles de stockage du dictionnaire.
-
-Exemple de Configuration:
-
-``` xml
-<layout>
-  <flat />
-</layout>
-```
-
-ou
-
-``` sql
-LAYOUT(FLAT())
-```
-
-### haché {#dicts-external_dicts_dict_layout-hashed}
-
-Le dictionnaire est entièrement stockée en mémoire sous la forme d'une table de hachage. Le dictionnaire peut contenir n'importe quel nombre d'éléments avec tous les identificateurs Dans la pratique, le nombre de clés peut atteindre des dizaines de millions d'articles.
-
-Tous les types de sources sont pris en charge. Lors de la mise à jour, les données (à partir d'un fichier ou d'une table) sont lues dans leur intégralité.
-
-Exemple de Configuration:
-
-``` xml
-<layout>
-  <hashed />
-</layout>
-```
-
-ou
-
-``` sql
-LAYOUT(HASHED())
-```
-
-### sparse_hashed {#dicts-external_dicts_dict_layout-sparse_hashed}
-
-Semblable à `hashed`, mais utilise moins de mémoire en faveur de plus D'utilisation du processeur.
-
-Exemple de Configuration:
-
-``` xml
-<layout>
-  <sparse_hashed />
-</layout>
-```
-
-``` sql
-LAYOUT(SPARSE_HASHED())
-```
-
-### complex_key_hashed {#complex-key-hashed}
-
-Ce type de stockage est pour une utilisation avec composite [touches](external-dicts-dict-structure.md). Semblable à `hashed`.
-
-Exemple de Configuration:
-
-``` xml
-<layout>
-  <complex_key_hashed />
-</layout>
-```
-
-``` sql
-LAYOUT(COMPLEX_KEY_HASHED())
-```
-
-### range_hashed {#range-hashed}
-
-Le dictionnaire est stocké en mémoire sous la forme d'une table de hachage avec un tableau ordonné de gammes et leurs valeurs correspondantes.
-
-Cette méthode de stockage fonctionne de la même manière que hachée et permet d'utiliser des plages de date / heure (Type numérique arbitraire) en plus de la clé.
-
-Exemple: Le tableau contient des réductions pour chaque annonceur dans le format:
-
-``` text
-+---------|-------------|-------------|------+
-| advertiser id | discount start date | discount end date | amount |
-+===============+=====================+===================+========+
-| 123           | 2015-01-01          | 2015-01-15        | 0.15   |
-+---------|-------------|-------------|------+
-| 123           | 2015-01-16          | 2015-01-31        | 0.25   |
-+---------|-------------|-------------|------+
-| 456           | 2015-01-01          | 2015-01-15        | 0.05   |
-+---------|-------------|-------------|------+
-```
-
-Pour utiliser un échantillon pour les plages de dates, définissez `range_min` et `range_max` éléments dans le [structure](external-dicts-dict-structure.md). Ces éléments doivent contenir des éléments `name` et`type` (si `type` n'est pas spécifié, le type par défaut sera utilisé-Date). `type` peut être n'importe quel type numérique (Date / DateTime / UInt64 / Int32 / autres).
-
-Exemple:
-
-``` xml
-<structure>
-    <id>
-        <name>Id</name>
-    </id>
-    <range_min>
-        <name>first</name>
-        <type>Date</type>
-    </range_min>
-    <range_max>
-        <name>last</name>
-        <type>Date</type>
-    </range_max>
-    ...
-```
-
-ou
-
-``` sql
-CREATE DICTIONARY somedict (
-    id UInt64,
-    first Date,
-    last Date
-)
-PRIMARY KEY id
-LAYOUT(RANGE_HASHED())
-RANGE(MIN first MAX last)
-```
-
-Pour travailler avec ces dictionnaires, vous devez passer un argument supplémentaire à l' `dictGetT` fonction, pour laquelle une plage est sélectionnée:
-
-``` sql
-dictGetT('dict_name', 'attr_name', id, date)
-```
-
-Cette fonction retourne la valeur pour l' `id`s et la plage de dates qui inclut la date passée.
-
-Détails de l'algorithme:
-
--   Si l' `id` est introuvable ou une plage n'est pas trouvé pour l' `id` il retourne la valeur par défaut pour le dictionnaire.
--   S'il y a des plages qui se chevauchent, vous pouvez en utiliser.
--   Si le délimiteur est `NULL` ou une date non valide (telle que 1900-01-01 ou 2039-01-01), la plage est laissée ouverte. La gamme peut être ouverte des deux côtés.
-
-Exemple de Configuration:
-
-``` xml
-<yandex>
-        <dictionary>
-
-                ...
-
-                <layout>
-                        <range_hashed />
-                </layout>
-
-                <structure>
-                        <id>
-                                <name>Abcdef</name>
-                        </id>
-                        <range_min>
-                                <name>StartTimeStamp</name>
-                                <type>UInt64</type>
-                        </range_min>
-                        <range_max>
-                                <name>EndTimeStamp</name>
-                                <type>UInt64</type>
-                        </range_max>
-                        <attribute>
-                                <name>XXXType</name>
-                                <type>String</type>
-                                <null_value />
-                        </attribute>
-                </structure>
-
-        </dictionary>
-</yandex>
-```
-
-ou
-
-``` sql
-CREATE DICTIONARY somedict(
-    Abcdef UInt64,
-    StartTimeStamp UInt64,
-    EndTimeStamp UInt64,
-    XXXType String DEFAULT ''
-)
-PRIMARY KEY Abcdef
-RANGE(MIN StartTimeStamp MAX EndTimeStamp)
-```
-
-### cache {#cache}
-
-Le dictionnaire est stocké dans un cache qui a un nombre fixe de cellules. Ces cellules contiennent des éléments fréquemment utilisés.
-
-Lors de la recherche d'un dictionnaire, le cache est recherché en premier. Pour chaque bloc de données, toutes les clés qui ne sont pas trouvées dans le cache ou qui sont obsolètes sont demandées à la source en utilisant `SELECT attrs... FROM db.table WHERE id IN (k1, k2, ...)`. Les données reçues sont ensuite écrites dans le cache.
-
-Pour les dictionnaires de cache, l'expiration [vie](external-dicts-dict-lifetime.md) des données dans le cache peuvent être définies. Si plus de temps que `lifetime` passé depuis le chargement des données dans une cellule, la valeur de la cellule n'est pas utilisée et elle est demandée à nouveau la prochaine fois qu'elle doit être utilisée.
-C'est la moins efficace de toutes les façons de stocker les dictionnaires. La vitesse du cache dépend fortement des paramètres corrects et que le scénario d'utilisation. Un dictionnaire de type de cache fonctionne bien uniquement lorsque les taux de réussite sont suffisamment élevés (recommandé 99% et plus). Vous pouvez afficher le taux de réussite moyen dans le `system.dictionaries` table.
-
-Pour améliorer les performances du cache, utilisez une sous-requête avec `LIMIT`, et appelez la fonction avec le dictionnaire en externe.
-
-Soutenu [source](external-dicts-dict-sources.md): MySQL, ClickHouse, exécutable, HTTP.
-
-Exemple de paramètres:
-
-``` xml
-<layout>
-    <cache>
-        <!-- The size of the cache, in number of cells. Rounded up to a power of two. -->
-        <size_in_cells>1000000000</size_in_cells>
-    </cache>
-</layout>
-```
-
-ou
-
-``` sql
-LAYOUT(CACHE(SIZE_IN_CELLS 1000000000))
-```
-
-Définissez une taille de cache suffisamment grande. Vous devez expérimenter pour sélectionner le nombre de cellules:
-
-1.  Définissez une valeur.
-2.  Exécutez les requêtes jusqu'à ce que le cache soit complètement plein.
-3.  Évaluer la consommation de mémoire en utilisant le `system.dictionaries` table.
-4.  Augmentez ou diminuez le nombre de cellules jusqu'à ce que la consommation de mémoire requise soit atteinte.
-
-!!! warning "Avertissement"
-    N'utilisez pas ClickHouse comme source, car le traitement des requêtes avec des lectures aléatoires est lent.
-
-### complex_key_cache {#complex-key-cache}
-
-Ce type de stockage est pour une utilisation avec composite [touches](external-dicts-dict-structure.md). Semblable à `cache`.
-
-### direct {#direct}
-
-Le dictionnaire n'est pas stocké dans la mémoire et va directement à la source, pendant le traitement d'une demande.
-
-La clé du dictionnaire a le `UInt64` type.
-
-Tous les types de [source](external-dicts-dict-sources.md), sauf les fichiers locaux, sont pris en charge.
-
-Exemple de Configuration:
-
-``` xml
-<layout>
-  <direct />
-</layout>
-```
-
-ou
-
-``` sql
-LAYOUT(DIRECT())
-```
-
-### complex_key_direct {#complex-key-direct}
-
-Ce type de stockage est destiné à être utilisé avec des [clés](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md) composites. Similaire à `direct`
-
-### ip_trie {#ip-trie}
-
-Ce type de stockage permet de mapper des préfixes de réseau (adresses IP) à des métadonnées telles que ASN.
-
-Exemple: la table contient les préfixes de réseau et leur correspondant en tant que numéro et Code de pays:
-
-``` text
-  +-----------|-----|------+
-  | prefix          | asn   | cca2   |
-  +=================+=======+========+
-  | 202.79.32.0/20  | 17501 | NP     |
-  +-----------|-----|------+
-  | 2620:0:870::/48 | 3856  | US     |
-  +-----------|-----|------+
-  | 2a02:6b8:1::/48 | 13238 | RU     |
-  +-----------|-----|------+
-  | 2001:db8::/32   | 65536 | ZZ     |
-  +-----------|-----|------+
-```
-
-Lorsque vous utilisez ce type de mise en page, la structure doit avoir une clé composite.
-
-Exemple:
-
-``` xml
-<structure>
-    <key>
-        <attribute>
-            <name>prefix</name>
-            <type>String</type>
-        </attribute>
-    </key>
-    <attribute>
-            <name>asn</name>
-            <type>UInt32</type>
-            <null_value />
-    </attribute>
-    <attribute>
-            <name>cca2</name>
-            <type>String</type>
-            <null_value>??</null_value>
-    </attribute>
-    ...
-</structure>
-<layout>
-    <ip_trie>
-        <access_to_key_from_attributes>true</access_to_key_from_attributes>
-    </ip_trie>
-</layout>
-```
-
-ou
-
-``` sql
-CREATE DICTIONARY somedict (
-    prefix String,
-    asn UInt32,
-    cca2 String DEFAULT '??'
-)
-PRIMARY KEY prefix
-```
-
-La clé ne doit avoir qu'un seul attribut de type chaîne contenant un préfixe IP autorisé. Les autres types ne sont pas encore pris en charge.
-
-Pour les requêtes, vous devez utiliser les mêmes fonctions (`dictGetT` avec un n-uplet) comme pour les dictionnaires avec des clés composites:
-
-``` sql
-dictGetT('dict_name', 'attr_name', tuple(ip))
-```
-
-La fonction prend soit `UInt32` pour IPv4, ou `FixedString(16)` pour IPv6:
-
-``` sql
-dictGetString('prefix', 'asn', tuple(IPv6StringToNum('2001:db8::1')))
-```
-
-Les autres types ne sont pas encore pris en charge. La fonction renvoie l'attribut du préfixe correspondant à cette adresse IP. S'il y a chevauchement des préfixes, le plus spécifique est retourné.
-
-Les données doit complètement s'intégrer dans la RAM.
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/dicts/external_dicts_dict_layout/) <!--hide-->
diff --git a/docs/fr/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md b/docs/fr/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md
deleted file mode 100644
index 8ce78919ff1..00000000000
--- a/docs/fr/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md
+++ /dev/null
@@ -1,91 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 42
-toc_title: "Mises \xC0 Jour Du Dictionnaire"
----
-
-# Mises À Jour Du Dictionnaire {#dictionary-updates}
-
-ClickHouse met périodiquement à jour les dictionnaires. L'intervalle de mise à jour pour les dictionnaires entièrement téléchargés et l'intervalle d'invalidation pour les dictionnaires `<lifetime>` tag en quelques secondes.
-
-Les mises à jour du dictionnaire (autres que le chargement pour la première utilisation) ne bloquent pas les requêtes. Lors des mises à jour, l'ancienne version d'un dictionnaire est utilisée. Si une erreur se produit pendant une mise à jour, l'erreur est écrite dans le journal du serveur et les requêtes continuent d'utiliser l'ancienne version des dictionnaires.
-
-Exemple de paramètres:
-
-``` xml
-<dictionary>
-    ...
-    <lifetime>300</lifetime>
-    ...
-</dictionary>
-```
-
-``` sql
-CREATE DICTIONARY (...)
-...
-LIFETIME(300)
-...
-```
-
-Paramètre `<lifetime>0</lifetime>` (`LIFETIME(0)`) empêche la mise à jour des dictionnaires.
-
-Vous pouvez définir un intervalle de temps pour les mises à niveau, et ClickHouse choisira un temps uniformément aléatoire dans cette plage. Ceci est nécessaire pour répartir la charge sur la source du dictionnaire lors de la mise à niveau sur un grand nombre de serveurs.
-
-Exemple de paramètres:
-
-``` xml
-<dictionary>
-    ...
-    <lifetime>
-        <min>300</min>
-        <max>360</max>
-    </lifetime>
-    ...
-</dictionary>
-```
-
-ou
-
-``` sql
-LIFETIME(MIN 300 MAX 360)
-```
-
-Si `<min>0</min>` et `<max>0</max>`, ClickHouse ne recharge pas le dictionnaire par timeout.
-Dans ce cas, ClickHouse peut recharger le dictionnaire plus tôt si le fichier de configuration du dictionnaire a été `SYSTEM RELOAD DICTIONARY` la commande a été exécutée.
-
-Lors de la mise à niveau des dictionnaires, le serveur ClickHouse applique une logique différente selon le type de [source](external-dicts-dict-sources.md):
-
-Lors de la mise à niveau des dictionnaires, le serveur ClickHouse applique une logique différente selon le type de [source](external-dicts-dict-sources.md):
-
--   Pour un fichier texte, il vérifie l'heure de la modification. Si l'heure diffère de l'heure enregistrée précédemment, le dictionnaire est mis à jour.
--   Pour les tables MyISAM, l'Heure de modification est vérifiée à l'aide d'un `SHOW TABLE STATUS` requête.
--   Les dictionnaires d'autres sources sont mis à jour à chaque fois par défaut.
-
-Pour les sources MySQL (InnoDB), ODBC et ClickHouse, vous pouvez configurer une requête qui mettra à jour les dictionnaires uniquement s'ils ont vraiment changé, plutôt que chaque fois. Pour ce faire, suivez ces étapes:
-
--   La table de dictionnaire doit avoir un champ qui change toujours lorsque les données source sont mises à jour.
--   Les paramètres de la source doivent spécifier une requête qui récupère le champ de modification. Le serveur ClickHouse interprète le résultat de la requête comme une ligne, et si cette ligne a changé par rapport à son état précédent, le dictionnaire est mis à jour. Spécifier la requête dans le `<invalidate_query>` champ dans les paramètres pour le [source](external-dicts-dict-sources.md).
-
-Exemple de paramètres:
-
-``` xml
-<dictionary>
-    ...
-    <odbc>
-      ...
-      <invalidate_query>SELECT update_time FROM dictionary_source where id = 1</invalidate_query>
-    </odbc>
-    ...
-</dictionary>
-```
-
-ou
-
-``` sql
-...
-SOURCE(ODBC(... invalidate_query 'SELECT update_time FROM dictionary_source where id = 1'))
-...
-```
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/dicts/external_dicts_dict_lifetime/) <!--hide-->
diff --git a/docs/fr/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md b/docs/fr/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md
deleted file mode 100644
index 4c608fa7188..00000000000
--- a/docs/fr/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md
+++ /dev/null
@@ -1,630 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 43
-toc_title: Sources de dictionnaires externes
----
-
-# Sources de dictionnaires externes {#dicts-external-dicts-dict-sources}
-
-Externe dictionnaire peut être connecté à partir de nombreuses sources différentes.
-
-Si dictionary est configuré à l'aide de xml-file, la configuration ressemble à ceci:
-
-``` xml
-<yandex>
-  <dictionary>
-    ...
-    <source>
-      <source_type>
-        <!-- Source configuration -->
-      </source_type>
-    </source>
-    ...
-  </dictionary>
-  ...
-</yandex>
-```
-
-En cas de [DDL-requête](../../statements/create.md#create-dictionary-query), configuration égale ressemblera à:
-
-``` sql
-CREATE DICTIONARY dict_name (...)
-...
-SOURCE(SOURCE_TYPE(param1 val1 ... paramN valN)) -- Source configuration
-...
-```
-
-La source est configurée dans le `source` section.
-
-Pour les types de source [Fichier Local](#dicts-external_dicts_dict_sources-local_file), [Fichier exécutable](#dicts-external_dicts_dict_sources-executable), [HTTP(S)](#dicts-external_dicts_dict_sources-http), [ClickHouse](#dicts-external_dicts_dict_sources-clickhouse)
-les paramètres optionnels sont disponibles:
-
-``` xml
-<source>
-  <file>
-    <path>/opt/dictionaries/os.tsv</path>
-    <format>TabSeparated</format>
-  </file>
-  <settings>
-      <format_csv_allow_single_quotes>0</format_csv_allow_single_quotes>
-  </settings>
-</source>
-```
-
-ou
-
-``` sql
-SOURCE(FILE(path '/opt/dictionaries/os.tsv' format 'TabSeparated'))
-SETTINGS(format_csv_allow_single_quotes = 0)
-```
-
-Les Types de sources (`source_type`):
-
--   [Fichier Local](#dicts-external_dicts_dict_sources-local_file)
--   [Fichier exécutable](#dicts-external_dicts_dict_sources-executable)
--   [HTTP(S)](#dicts-external_dicts_dict_sources-http)
--   DBMS
-    -   [ODBC](#dicts-external_dicts_dict_sources-odbc)
-    -   [MySQL](#dicts-external_dicts_dict_sources-mysql)
-    -   [ClickHouse](#dicts-external_dicts_dict_sources-clickhouse)
-    -   [MongoDB](#dicts-external_dicts_dict_sources-mongodb)
-    -   [Redis](#dicts-external_dicts_dict_sources-redis)
-
-## Fichier Local {#dicts-external_dicts_dict_sources-local_file}
-
-Exemple de paramètres:
-
-``` xml
-<source>
-  <file>
-    <path>/opt/dictionaries/os.tsv</path>
-    <format>TabSeparated</format>
-  </file>
-</source>
-```
-
-ou
-
-``` sql
-SOURCE(FILE(path '/opt/dictionaries/os.tsv' format 'TabSeparated'))
-```
-
-Définition des champs:
-
--   `path` – The absolute path to the file.
--   `format` – The file format. All the formats described in “[Format](../../../interfaces/formats.md#formats)” sont pris en charge.
-
-## Fichier Exécutable {#dicts-external_dicts_dict_sources-executable}
-
-Travailler avec des fichiers exécutables en dépend [comment le dictionnaire est stocké dans la mémoire](external-dicts-dict-layout.md). Si le dictionnaire est stocké en utilisant `cache` et `complex_key_cache`, Clickhouse demande les clés nécessaires en envoyant une requête au STDIN du fichier exécutable. Sinon, ClickHouse démarre le fichier exécutable et traite sa sortie comme des données de dictionnaire.
-
-Exemple de paramètres:
-
-``` xml
-<source>
-    <executable>
-        <command>cat /opt/dictionaries/os.tsv</command>
-        <format>TabSeparated</format>
-    </executable>
-</source>
-```
-
-ou
-
-``` sql
-SOURCE(EXECUTABLE(command 'cat /opt/dictionaries/os.tsv' format 'TabSeparated'))
-```
-
-Définition des champs:
-
--   `command` – The absolute path to the executable file, or the file name (if the program directory is written to `PATH`).
--   `format` – The file format. All the formats described in “[Format](../../../interfaces/formats.md#formats)” sont pris en charge.
-
-## Http(s) {#dicts-external_dicts_dict_sources-http}
-
-Travailler avec un serveur HTTP (S) dépend de [comment le dictionnaire est stocké dans la mémoire](external-dicts-dict-layout.md). Si le dictionnaire est stocké en utilisant `cache` et `complex_key_cache`, Clickhouse demande les clés nécessaires en envoyant une demande via le `POST` méthode.
-
-Exemple de paramètres:
-
-``` xml
-<source>
-    <http>
-        <url>http://[::1]/os.tsv</url>
-        <format>TabSeparated</format>
-        <credentials>
-            <user>user</user>
-            <password>password</password>
-        </credentials>
-        <headers>
-            <header>
-                <name>API-KEY</name>
-                <value>key</value>
-            </header>
-        </headers>
-    </http>
-</source>
-```
-
-ou
-
-``` sql
-SOURCE(HTTP(
-    url 'http://[::1]/os.tsv'
-    format 'TabSeparated'
-    credentials(user 'user' password 'password')
-    headers(header(name 'API-KEY' value 'key'))
-))
-```
-
-Pour que ClickHouse accède à une ressource HTTPS, vous devez [configurer openSSL](../../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-openssl) dans la configuration du serveur.
-
-Définition des champs:
-
--   `url` – The source URL.
--   `format` – The file format. All the formats described in “[Format](../../../interfaces/formats.md#formats)” sont pris en charge.
--   `credentials` – Basic HTTP authentication. Optional parameter.
-    -   `user` – Username required for the authentication.
-    -   `password` – Password required for the authentication.
--   `headers` – All custom HTTP headers entries used for the HTTP request. Optional parameter.
-    -   `header` – Single HTTP header entry.
-    -   `name` – Identifiant name used for the header send on the request.
-    -   `value` – Value set for a specific identifiant name.
-
-## ODBC {#dicts-external_dicts_dict_sources-odbc}
-
-Vous pouvez utiliser cette méthode pour connecter n'importe quelle base de données dotée d'un pilote ODBC.
-
-Exemple de paramètres:
-
-``` xml
-<source>
-    <odbc>
-        <db>DatabaseName</db>
-        <table>ShemaName.TableName</table>
-        <connection_string>DSN=some_parameters</connection_string>
-        <invalidate_query>SQL_QUERY</invalidate_query>
-    </odbc>
-</source>
-```
-
-ou
-
-``` sql
-SOURCE(ODBC(
-    db 'DatabaseName'
-    table 'SchemaName.TableName'
-    connection_string 'DSN=some_parameters'
-    invalidate_query 'SQL_QUERY'
-))
-```
-
-Définition des champs:
-
--   `db` – Name of the database. Omit it if the database name is set in the `<connection_string>` paramètre.
--   `table` – Name of the table and schema if exists.
--   `connection_string` – Connection string.
--   `invalidate_query` – Query for checking the dictionary status. Optional parameter. Read more in the section [Mise à jour des dictionnaires](external-dicts-dict-lifetime.md).
-
-ClickHouse reçoit des symboles de citation D'ODBC-driver et cite tous les paramètres des requêtes au pilote, il est donc nécessaire de définir le nom de la table en conséquence sur le cas du nom de la table dans la base de données.
-
-Si vous avez des problèmes avec des encodages lors de l'utilisation d'Oracle, consultez le [FAQ](../../../faq/general.md#oracle-odbc-encodings) article.
-
-### Vulnérabilité connue de la fonctionnalité du dictionnaire ODBC {#known-vulnerability-of-the-odbc-dictionary-functionality}
-
-!!! attention "Attention"
-    Lors de la connexion à la base de données via le paramètre de connexion du pilote ODBC `Servername` peut être substitué. Dans ce cas, les valeurs de `USERNAME` et `PASSWORD` de `odbc.ini` sont envoyés au serveur distant et peuvent être compromis.
-
-**Exemple d'utilisation non sécurisée**
-
-Configurons unixODBC pour PostgreSQL. Le contenu de `/etc/odbc.ini`:
-
-``` text
-[gregtest]
-Driver = /usr/lib/psqlodbca.so
-Servername = localhost
-PORT = 5432
-DATABASE = test_db
-#OPTION = 3
-USERNAME = test
-PASSWORD = test
-```
-
-Si vous faites alors une requête telle que
-
-``` sql
-SELECT * FROM odbc('DSN=gregtest;Servername=some-server.com', 'test_db');
-```
-
-Le pilote ODBC enverra des valeurs de `USERNAME` et `PASSWORD` de `odbc.ini` de `some-server.com`.
-
-### Exemple de connexion Postgresql {#example-of-connecting-postgresql}
-
-Ubuntu OS.
-
-Installation d'unixODBC et du pilote ODBC pour PostgreSQL:
-
-``` bash
-$ sudo apt-get install -y unixodbc odbcinst odbc-postgresql
-```
-
-Configuration `/etc/odbc.ini` (ou `~/.odbc.ini`):
-
-``` text
-    [DEFAULT]
-    Driver = myconnection
-
-    [myconnection]
-    Description         = PostgreSQL connection to my_db
-    Driver              = PostgreSQL Unicode
-    Database            = my_db
-    Servername          = 127.0.0.1
-    UserName            = username
-    Password            = password
-    Port                = 5432
-    Protocol            = 9.3
-    ReadOnly            = No
-    RowVersioning       = No
-    ShowSystemTables    = No
-    ConnSettings        =
-```
-
-La configuration du dictionnaire dans ClickHouse:
-
-``` xml
-<yandex>
-    <dictionary>
-        <name>table_name</name>
-        <source>
-            <odbc>
-                <!-- You can specify the following parameters in connection_string: -->
-                <!-- DSN=myconnection;UID=username;PWD=password;HOST=127.0.0.1;PORT=5432;DATABASE=my_db -->
-                <connection_string>DSN=myconnection</connection_string>
-                <table>postgresql_table</table>
-            </odbc>
-        </source>
-        <lifetime>
-            <min>300</min>
-            <max>360</max>
-        </lifetime>
-        <layout>
-            <hashed/>
-        </layout>
-        <structure>
-            <id>
-                <name>id</name>
-            </id>
-            <attribute>
-                <name>some_column</name>
-                <type>UInt64</type>
-                <null_value>0</null_value>
-            </attribute>
-        </structure>
-    </dictionary>
-</yandex>
-```
-
-ou
-
-``` sql
-CREATE DICTIONARY table_name (
-    id UInt64,
-    some_column UInt64 DEFAULT 0
-)
-PRIMARY KEY id
-SOURCE(ODBC(connection_string 'DSN=myconnection' table 'postgresql_table'))
-LAYOUT(HASHED())
-LIFETIME(MIN 300 MAX 360)
-```
-
-Vous devrez peut-être modifier `odbc.ini` pour spécifier le chemin d'accès complet à la bibliothèque avec le conducteur `DRIVER=/usr/local/lib/psqlodbcw.so`.
-
-### Exemple de connexion à MS SQL Server {#example-of-connecting-ms-sql-server}
-
-Ubuntu OS.
-
-Installation du pilote: :
-
-``` bash
-$ sudo apt-get install tdsodbc freetds-bin sqsh
-```
-
-Configuration du pilote:
-
-``` bash
-    $ cat /etc/freetds/freetds.conf
-    ...
-
-    [MSSQL]
-    host = 192.168.56.101
-    port = 1433
-    tds version = 7.0
-    client charset = UTF-8
-
-    $ cat /etc/odbcinst.ini
-    ...
-
-    [FreeTDS]
-    Description     = FreeTDS
-    Driver          = /usr/lib/x86_64-linux-gnu/odbc/libtdsodbc.so
-    Setup           = /usr/lib/x86_64-linux-gnu/odbc/libtdsS.so
-    FileUsage       = 1
-    UsageCount      = 5
-
-    $ cat ~/.odbc.ini
-    ...
-
-    [MSSQL]
-    Description     = FreeTDS
-    Driver          = FreeTDS
-    Servername      = MSSQL
-    Database        = test
-    UID             = test
-    PWD             = test
-    Port            = 1433
-```
-
-Configuration du dictionnaire dans ClickHouse:
-
-``` xml
-<yandex>
-    <dictionary>
-        <name>test</name>
-        <source>
-            <odbc>
-                <table>dict</table>
-                <connection_string>DSN=MSSQL;UID=test;PWD=test</connection_string>
-            </odbc>
-        </source>
-
-        <lifetime>
-            <min>300</min>
-            <max>360</max>
-        </lifetime>
-
-        <layout>
-            <flat />
-        </layout>
-
-        <structure>
-            <id>
-                <name>k</name>
-            </id>
-            <attribute>
-                <name>s</name>
-                <type>String</type>
-                <null_value></null_value>
-            </attribute>
-        </structure>
-    </dictionary>
-</yandex>
-```
-
-ou
-
-``` sql
-CREATE DICTIONARY test (
-    k UInt64,
-    s String DEFAULT ''
-)
-PRIMARY KEY k
-SOURCE(ODBC(table 'dict' connection_string 'DSN=MSSQL;UID=test;PWD=test'))
-LAYOUT(FLAT())
-LIFETIME(MIN 300 MAX 360)
-```
-
-## DBMS {#dbms}
-
-### Mysql {#dicts-external_dicts_dict_sources-mysql}
-
-Exemple de paramètres:
-
-``` xml
-<source>
-  <mysql>
-      <port>3306</port>
-      <user>clickhouse</user>
-      <password>qwerty</password>
-      <replica>
-          <host>example01-1</host>
-          <priority>1</priority>
-      </replica>
-      <replica>
-          <host>example01-2</host>
-          <priority>1</priority>
-      </replica>
-      <db>db_name</db>
-      <table>table_name</table>
-      <where>id=10</where>
-      <invalidate_query>SQL_QUERY</invalidate_query>
-  </mysql>
-</source>
-```
-
-ou
-
-``` sql
-SOURCE(MYSQL(
-    port 3306
-    user 'clickhouse'
-    password 'qwerty'
-    replica(host 'example01-1' priority 1)
-    replica(host 'example01-2' priority 1)
-    db 'db_name'
-    table 'table_name'
-    where 'id=10'
-    invalidate_query 'SQL_QUERY'
-))
-```
-
-Définition des champs:
-
--   `port` – The port on the MySQL server. You can specify it for all replicas, or for each one individually (inside `<replica>`).
-
--   `user` – Name of the MySQL user. You can specify it for all replicas, or for each one individually (inside `<replica>`).
-
--   `password` – Password of the MySQL user. You can specify it for all replicas, or for each one individually (inside `<replica>`).
-
--   `replica` – Section of replica configurations. There can be multiple sections.
-
-        - `replica/host` – The MySQL host.
-        - `replica/priority` – The replica priority. When attempting to connect, ClickHouse traverses the replicas in order of priority. The lower the number, the higher the priority.
-
--   `db` – Name of the database.
-
--   `table` – Name of the table.
-
--   `where` – The selection criteria. The syntax for conditions is the same as for `WHERE` clause dans MySQL, par exemple, `id > 10 AND id < 20`. Paramètre facultatif.
-
--   `invalidate_query` – Query for checking the dictionary status. Optional parameter. Read more in the section [Mise à jour des dictionnaires](external-dicts-dict-lifetime.md).
-
-MySQL peut être connecté sur un hôte local via des sockets. Pour ce faire, définissez `host` et `socket`.
-
-Exemple de paramètres:
-
-``` xml
-<source>
-  <mysql>
-      <host>localhost</host>
-      <socket>/path/to/socket/file.sock</socket>
-      <user>clickhouse</user>
-      <password>qwerty</password>
-      <db>db_name</db>
-      <table>table_name</table>
-      <where>id=10</where>
-      <invalidate_query>SQL_QUERY</invalidate_query>
-  </mysql>
-</source>
-```
-
-ou
-
-``` sql
-SOURCE(MYSQL(
-    host 'localhost'
-    socket '/path/to/socket/file.sock'
-    user 'clickhouse'
-    password 'qwerty'
-    db 'db_name'
-    table 'table_name'
-    where 'id=10'
-    invalidate_query 'SQL_QUERY'
-))
-```
-
-### ClickHouse {#dicts-external_dicts_dict_sources-clickhouse}
-
-Exemple de paramètres:
-
-``` xml
-<source>
-    <clickhouse>
-        <host>example01-01-1</host>
-        <port>9000</port>
-        <user>default</user>
-        <password></password>
-        <db>default</db>
-        <table>ids</table>
-        <where>id=10</where>
-    </clickhouse>
-</source>
-```
-
-ou
-
-``` sql
-SOURCE(CLICKHOUSE(
-    host 'example01-01-1'
-    port 9000
-    user 'default'
-    password ''
-    db 'default'
-    table 'ids'
-    where 'id=10'
-))
-```
-
-Définition des champs:
-
--   `host` – The ClickHouse host. If it is a local host, the query is processed without any network activity. To improve fault tolerance, you can create a [Distribué](../../../engines/table-engines/special/distributed.md) table et entrez-le dans les configurations suivantes.
--   `port` – The port on the ClickHouse server.
--   `user` – Name of the ClickHouse user.
--   `password` – Password of the ClickHouse user.
--   `db` – Name of the database.
--   `table` – Name of the table.
--   `where` – The selection criteria. May be omitted.
--   `invalidate_query` – Query for checking the dictionary status. Optional parameter. Read more in the section [Mise à jour des dictionnaires](external-dicts-dict-lifetime.md).
-
-### Mongodb {#dicts-external_dicts_dict_sources-mongodb}
-
-Exemple de paramètres:
-
-``` xml
-<source>
-    <mongodb>
-        <host>localhost</host>
-        <port>27017</port>
-        <user></user>
-        <password></password>
-        <db>test</db>
-        <collection>dictionary_source</collection>
-    </mongodb>
-</source>
-```
-
-ou
-
-``` sql
-SOURCE(MONGO(
-    host 'localhost'
-    port 27017
-    user ''
-    password ''
-    db 'test'
-    collection 'dictionary_source'
-))
-```
-
-Définition des champs:
-
--   `host` – The MongoDB host.
--   `port` – The port on the MongoDB server.
--   `user` – Name of the MongoDB user.
--   `password` – Password of the MongoDB user.
--   `db` – Name of the database.
--   `collection` – Name of the collection.
-
-### Redis {#dicts-external_dicts_dict_sources-redis}
-
-Exemple de paramètres:
-
-``` xml
-<source>
-    <redis>
-        <host>localhost</host>
-        <port>6379</port>
-        <storage_type>simple</storage_type>
-        <db_index>0</db_index>
-    </redis>
-</source>
-```
-
-ou
-
-``` sql
-SOURCE(REDIS(
-    host 'localhost'
-    port 6379
-    storage_type 'simple'
-    db_index 0
-))
-```
-
-Définition des champs:
-
--   `host` – The Redis host.
--   `port` – The port on the Redis server.
--   `storage_type` – The structure of internal Redis storage using for work with keys. `simple` est pour les sources simples et pour les sources à clé unique hachées, `hash_map` est pour les sources hachées avec deux clés. Les sources À Distance et les sources de cache à clé complexe ne sont pas prises en charge. Peut être omis, la valeur par défaut est `simple`.
--   `db_index` – The specific numeric index of Redis logical database. May be omitted, default value is 0.
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/dicts/external_dicts_dict_sources/) <!--hide-->
diff --git a/docs/fr/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md b/docs/fr/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md
deleted file mode 100644
index 1b9215baf06..00000000000
--- a/docs/fr/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md
+++ /dev/null
@@ -1,175 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 44
-toc_title: "Cl\xE9 et champs du dictionnaire"
----
-
-# Clé et champs du dictionnaire {#dictionary-key-and-fields}
-
-Le `<structure>` la clause décrit la clé du dictionnaire et les champs disponibles pour les requêtes.
-
-Description XML:
-
-``` xml
-<dictionary>
-    <structure>
-        <id>
-            <name>Id</name>
-        </id>
-
-        <attribute>
-            <!-- Attribute parameters -->
-        </attribute>
-
-        ...
-
-    </structure>
-</dictionary>
-```
-
-Les attributs sont décrits dans les éléments:
-
--   `<id>` — [La colonne de la clé](external-dicts-dict-structure.md#ext_dict_structure-key).
--   `<attribute>` — [Colonne de données](external-dicts-dict-structure.md#ext_dict_structure-attributes). Il peut y avoir un certain nombre d'attributs.
-
-Requête DDL:
-
-``` sql
-CREATE DICTIONARY dict_name (
-    Id UInt64,
-    -- attributes
-)
-PRIMARY KEY Id
-...
-```
-
-Les attributs sont décrits dans le corps de la requête:
-
--   `PRIMARY KEY` — [La colonne de la clé](external-dicts-dict-structure.md#ext_dict_structure-key)
--   `AttrName AttrType` — [Colonne de données](external-dicts-dict-structure.md#ext_dict_structure-attributes). Il peut y avoir un certain nombre d'attributs.
-
-## Clé {#ext_dict_structure-key}
-
-ClickHouse prend en charge les types de clés suivants:
-
--   Touche numérique. `UInt64`. Défini dans le `<id>` tag ou en utilisant `PRIMARY KEY` mot.
--   Clé Composite. Ensemble de valeurs de types différents. Défini dans la balise `<key>` ou `PRIMARY KEY` mot.
-
-Une structure xml peut contenir `<id>` ou `<key>`. DDL-requête doit contenir unique `PRIMARY KEY`.
-
-!!! warning "Avertissement"
-    Vous ne devez pas décrire clé comme un attribut.
-
-### Touche Numérique {#ext_dict-numeric-key}
-
-Type: `UInt64`.
-
-Exemple de Configuration:
-
-``` xml
-<id>
-    <name>Id</name>
-</id>
-```
-
-Champs de Configuration:
-
--   `name` – The name of the column with keys.
-
-Pour DDL-requête:
-
-``` sql
-CREATE DICTIONARY (
-    Id UInt64,
-    ...
-)
-PRIMARY KEY Id
-...
-```
-
--   `PRIMARY KEY` – The name of the column with keys.
-
-### Clé Composite {#composite-key}
-
-La clé peut être un `tuple` de tous les types de champs. Le [disposition](external-dicts-dict-layout.md) dans ce cas, doit être `complex_key_hashed` ou `complex_key_cache`.
-
-!!! tip "Conseil"
-    Une clé composite peut être constitué d'un seul élément. Cela permet d'utiliser une chaîne comme clé, par exemple.
-
-La structure de clé est définie dans l'élément `<key>`. Les principaux champs sont spécifiés dans le même format que le dictionnaire [attribut](external-dicts-dict-structure.md). Exemple:
-
-``` xml
-<structure>
-    <key>
-        <attribute>
-            <name>field1</name>
-            <type>String</type>
-        </attribute>
-        <attribute>
-            <name>field2</name>
-            <type>UInt32</type>
-        </attribute>
-        ...
-    </key>
-...
-```
-
-ou
-
-``` sql
-CREATE DICTIONARY (
-    field1 String,
-    field2 String
-    ...
-)
-PRIMARY KEY field1, field2
-...
-```
-
-Pour une requête à l' `dictGet*` fonction, un tuple est passé comme clé. Exemple: `dictGetString('dict_name', 'attr_name', tuple('string for field1', num_for_field2))`.
-
-## Attribut {#ext_dict_structure-attributes}
-
-Exemple de Configuration:
-
-``` xml
-<structure>
-    ...
-    <attribute>
-        <name>Name</name>
-        <type>ClickHouseDataType</type>
-        <null_value></null_value>
-        <expression>rand64()</expression>
-        <hierarchical>true</hierarchical>
-        <injective>true</injective>
-        <is_object_id>true</is_object_id>
-    </attribute>
-</structure>
-```
-
-ou
-
-``` sql
-CREATE DICTIONARY somename (
-    Name ClickHouseDataType DEFAULT '' EXPRESSION rand64() HIERARCHICAL INJECTIVE IS_OBJECT_ID
-)
-```
-
-Champs de Configuration:
-
-| Balise                                               | Description                                                                                                                                                                                                                                                                                                                                                                      | Requis |
-|------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------|
-| `name`                                               | Nom de la colonne.                                                                                                                                                                                                                                                                                                                                                               | Oui    |
-| `type`                                               | Type de données ClickHouse.<br/>ClickHouse tente de convertir la valeur du dictionnaire vers le type de données spécifié. Par exemple, pour MySQL, le champ peut être `TEXT`, `VARCHAR`, ou `BLOB` dans la table source MySQL, mais il peut être téléchargé comme `String` à ClickHouse.<br/>[Nullable](../../../sql-reference/data-types/nullable.md) n'est pas pris en charge. | Oui    |
-| `null_value`                                         | Valeur par défaut pour un élément inexistant.<br/>Dans l'exemple, c'est une chaîne vide. Vous ne pouvez pas utiliser `NULL` dans ce domaine.                                                                                                                                                                                                                                     | Oui    |
-| `expression`                                         | [Expression](../../syntax.md#syntax-expressions) que ClickHouse s'exécute sur la valeur.<br/>L'expression peut être un nom de colonne dans la base de données SQL distante. Ainsi, vous pouvez l'utiliser pour créer un alias pour la colonne à distance.<br/><br/>Valeur par défaut: aucune expression.                                                                         | Aucun  |
-| <a name="hierarchical-dict-attr"></a> `hierarchical` | Si `true`, l'attribut contient la valeur d'un parent clé de la clé actuelle. Voir [Dictionnaires Hiérarchiques](external-dicts-dict-hierarchical.md).<br/><br/>Valeur par défaut: `false`.                                                                                                                                                                                       | Aucun  |
-| `injective`                                          | Indicateur qui indique si le `id -> attribute` l'image est [injective](https://en.wikipedia.org/wiki/Injective_function).<br/>Si `true`, ClickHouse peut automatiquement placer après le `GROUP BY` clause les requêtes aux dictionnaires avec injection. Habituellement, il réduit considérablement le montant de ces demandes.<br/><br/>Valeur par défaut: `false`.            | Aucun  |
-| `is_object_id`                                       | Indicateur qui indique si la requête est exécutée pour un document MongoDB par `ObjectID`.<br/><br/>Valeur par défaut: `false`.                                                                                                                                                                                                                                                  | Aucun  |
-
-## Voir Aussi {#see-also}
-
--   [Fonctions pour travailler avec des dictionnaires externes](../../../sql-reference/functions/ext-dict-functions.md).
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/dicts/external_dicts_dict_structure/) <!--hide-->
diff --git a/docs/fr/sql-reference/dictionaries/external-dictionaries/external-dicts-dict.md b/docs/fr/sql-reference/dictionaries/external-dictionaries/external-dicts-dict.md
deleted file mode 100644
index 3bb8884df2f..00000000000
--- a/docs/fr/sql-reference/dictionaries/external-dictionaries/external-dicts-dict.md
+++ /dev/null
@@ -1,53 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 40
-toc_title: Configuration D'un dictionnaire externe
----
-
-# Configuration D'un dictionnaire externe {#dicts-external-dicts-dict}
-
-Si dictionary est configuré à l'aide d'un fichier xml, than dictionary configuration a la structure suivante:
-
-``` xml
-<dictionary>
-    <name>dict_name</name>
-
-    <structure>
-      <!-- Complex key configuration -->
-    </structure>
-
-    <source>
-      <!-- Source configuration -->
-    </source>
-
-    <layout>
-      <!-- Memory layout configuration -->
-    </layout>
-
-    <lifetime>
-      <!-- Lifetime of dictionary in memory -->
-    </lifetime>
-</dictionary>
-```
-
-Correspondant [DDL-requête](../../statements/create.md#create-dictionary-query) a la structure suivante:
-
-``` sql
-CREATE DICTIONARY dict_name
-(
-    ... -- attributes
-)
-PRIMARY KEY ... -- complex or single key configuration
-SOURCE(...) -- Source configuration
-LAYOUT(...) -- Memory layout configuration
-LIFETIME(...) -- Lifetime of dictionary in memory
-```
-
--   `name` – The identifier that can be used to access the dictionary. Use the characters `[a-zA-Z0-9_\-]`.
--   [source](external-dicts-dict-sources.md) — Source of the dictionary.
--   [disposition](external-dicts-dict-layout.md) — Dictionary layout in memory.
--   [structure](external-dicts-dict-structure.md) — Structure of the dictionary . A key and attributes that can be retrieved by this key.
--   [vie](external-dicts-dict-lifetime.md) — Frequency of dictionary updates.
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/dicts/external_dicts_dict/) <!--hide-->
diff --git a/docs/fr/sql-reference/dictionaries/external-dictionaries/external-dicts.md b/docs/fr/sql-reference/dictionaries/external-dictionaries/external-dicts.md
deleted file mode 100644
index d68b7a7f112..00000000000
--- a/docs/fr/sql-reference/dictionaries/external-dictionaries/external-dicts.md
+++ /dev/null
@@ -1,62 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 39
-toc_title: "Description G\xE9n\xE9rale"
----
-
-# Dictionnaires Externes {#dicts-external-dicts}
-
-Vous pouvez ajouter vos propres dictionnaires à partir de diverses sources de données. La source de données d'un dictionnaire peut être un texte local ou un fichier exécutable, une ressource HTTP(S) ou un autre SGBD. Pour plus d'informations, voir “[Sources pour les dictionnaires externes](external-dicts-dict-sources.md)”.
-
-ClickHouse:
-
--   Stocke entièrement ou partiellement les dictionnaires en RAM.
--   Met à jour périodiquement les dictionnaires et charge dynamiquement les valeurs manquantes. En d'autres mots, les dictionnaires peuvent être chargés dynamiquement.
--   Permet de créer des dictionnaires externes avec des fichiers xml ou [Les requêtes DDL](../../statements/create.md#create-dictionary-query).
-
-La configuration des dictionnaires externes peut être située dans un ou plusieurs fichiers xml. Le chemin d'accès à la configuration spécifiée dans le [dictionaries_config](../../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-dictionaries_config) paramètre.
-
-Les dictionnaires peuvent être chargés au démarrage du serveur ou à la première utilisation, en fonction [dictionaries_lazy_load](../../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-dictionaries_lazy_load) paramètre.
-
-Le [dictionnaire](../../../operations/system-tables.md#system_tables-dictionaries) la table système contient des informations sur les dictionnaires configurés sur le serveur. Pour chaque dictionnaire, vous pouvez y trouver:
-
--   Statut du dictionnaire.
--   Paramètres de Configuration.
--   Des métriques telles que la quantité de RAM allouée pour le dictionnaire ou un certain nombre de requêtes depuis que le dictionnaire a été chargé avec succès.
-
-Le fichier de configuration du dictionnaire a le format suivant:
-
-``` xml
-<yandex>
-    <comment>An optional element with any content. Ignored by the ClickHouse server.</comment>
-
-    <!--Optional element. File name with substitutions-->
-    <include_from>/etc/metrika.xml</include_from>
-
-
-    <dictionary>
-        <!-- Dictionary configuration. -->
-        <!-- There can be any number of <dictionary> sections in the configuration file. -->
-    </dictionary>
-
-</yandex>
-```
-
-Vous pouvez [configurer](external-dicts-dict.md) le nombre de dictionnaires dans le même fichier.
-
-[Requêtes DDL pour les dictionnaires](../../statements/create.md#create-dictionary-query) ne nécessite aucun enregistrement supplémentaire dans la configuration du serveur. Ils permettent de travailler avec des dictionnaires en tant qu'entités de première classe, comme des tables ou des vues.
-
-!!! attention "Attention"
-    Vous pouvez convertir les valeurs pour un petit dictionnaire en le décrivant dans un `SELECT` requête (voir la [transformer](../../../sql-reference/functions/other-functions.md) fonction). Cette fonctionnalité n'est pas liée aux dictionnaires externes.
-
-## Voir Aussi {#ext-dicts-see-also}
-
--   [Configuration D'un dictionnaire externe](external-dicts-dict.md)
--   [Stockage des dictionnaires en mémoire](external-dicts-dict-layout.md)
--   [Mises À Jour Du Dictionnaire](external-dicts-dict-lifetime.md)
--   [Sources de dictionnaires externes](external-dicts-dict-sources.md)
--   [Clé et champs du dictionnaire](external-dicts-dict-structure.md)
--   [Fonctions pour travailler avec des dictionnaires externes](../../../sql-reference/functions/ext-dict-functions.md)
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/dicts/external_dicts/) <!--hide-->
diff --git a/docs/fr/sql-reference/dictionaries/external-dictionaries/index.md b/docs/fr/sql-reference/dictionaries/external-dictionaries/index.md
deleted file mode 100644
index 109220205dd..00000000000
--- a/docs/fr/sql-reference/dictionaries/external-dictionaries/index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: Dictionnaires Externes
-toc_priority: 37
----
-
-
diff --git a/docs/fr/sql-reference/dictionaries/index.md b/docs/fr/sql-reference/dictionaries/index.md
deleted file mode 100644
index 3ec31085cc5..00000000000
--- a/docs/fr/sql-reference/dictionaries/index.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: Dictionnaire
-toc_priority: 35
-toc_title: Introduction
----
-
-# Dictionnaire {#dictionaries}
-
-Un dictionnaire est une cartographie (`key -> attributes`) qui est pratique pour différents types de listes de référence.
-
-ClickHouse prend en charge des fonctions spéciales pour travailler avec des dictionnaires qui peuvent être utilisés dans les requêtes. Il est plus facile et plus efficace d'utiliser des dictionnaires avec des fonctions que par une `JOIN` avec des tableaux de référence.
-
-[NULL](../../sql-reference/syntax.md#null-literal) les valeurs ne peuvent pas être stockées dans un dictionnaire.
-
-Supports ClickHouse:
-
--   [Construit-dans les dictionnaires](internal-dicts.md#internal_dicts) avec un [ensemble de fonctions](../../sql-reference/functions/ym-dict-functions.md).
--   [Plug-in (externe) dictionnaires](external-dictionaries/external-dicts.md#dicts-external-dicts) avec un [ensemble de fonctions](../../sql-reference/functions/ext-dict-functions.md).
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/dicts/) <!--hide-->
diff --git a/docs/fr/sql-reference/dictionaries/internal-dicts.md b/docs/fr/sql-reference/dictionaries/internal-dicts.md
deleted file mode 100644
index 607936031a1..00000000000
--- a/docs/fr/sql-reference/dictionaries/internal-dicts.md
+++ /dev/null
@@ -1,55 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 39
-toc_title: Dictionnaires Internes
----
-
-# Dictionnaires Internes {#internal_dicts}
-
-ClickHouse contient une fonction intégrée pour travailler avec une géobase.
-
-Cela vous permet de:
-
--   Utilisez L'ID d'une région pour obtenir son nom dans la langue souhaitée.
--   Utilisez L'ID d'une région pour obtenir L'ID d'une ville, d'une région, d'un district fédéral, d'un pays ou d'un continent.
--   Vérifiez si une région fait partie d'une autre région.
--   Obtenez une chaîne de régions parentes.
-
-Toutes les fonctions prennent en charge “translocality,” la capacité d'utiliser simultanément différentes perspectives sur la propriété de la région. Pour plus d'informations, consultez la section “Functions for working with Yandex.Metrica dictionaries”.
-
-Les dictionnaires internes sont désactivés dans le package par défaut.
-Pour les activer, décommentez les paramètres `path_to_regions_hierarchy_file` et `path_to_regions_names_files` dans le fichier de configuration du serveur.
-
-La géobase est chargée à partir de fichiers texte.
-
-Place de la `regions_hierarchy*.txt` les fichiers dans le `path_to_regions_hierarchy_file` répertoire. Ce paramètre de configuration doit contenir le chemin `regions_hierarchy.txt` fichier (la hiérarchie régionale par défaut), et les autres fichiers (`regions_hierarchy_ua.txt`) doit être situé dans le même répertoire.
-
-Mettre le `regions_names_*.txt` les fichiers dans le `path_to_regions_names_files` répertoire.
-
-Vous pouvez également créer ces fichiers vous-même. Le format de fichier est le suivant:
-
-`regions_hierarchy*.txt`: TabSeparated (pas d'en-tête), colonnes:
-
--   région de l'ID (`UInt32`)
--   ID de région parent (`UInt32`)
--   type de région (`UInt8`): 1-continent, 3-pays, 4-district fédéral, 5-région, 6-ville; les autres types n'ont pas de valeurs
--   population (`UInt32`) — optional column
-
-`regions_names_*.txt`: TabSeparated (pas d'en-tête), colonnes:
-
--   région de l'ID (`UInt32`)
--   nom de la région (`String`) — Can't contain tabs or line feeds, even escaped ones.
-
-Un tableau plat est utilisé pour stocker dans la RAM. Pour cette raison, les ID ne devraient pas dépasser un million.
-
-Les dictionnaires peuvent être mis à jour sans redémarrer le serveur. Cependant, l'ensemble des dictionnaires n'est pas mis à jour.
-Pour les mises à jour, les temps de modification du fichier sont vérifiés. Si un fichier a été modifié, le dictionnaire est mis à jour.
-L'intervalle de vérification des modifications est configuré dans le `builtin_dictionaries_reload_interval` paramètre.
-Les mises à jour du dictionnaire (autres que le chargement lors de la première utilisation) ne bloquent pas les requêtes. Lors des mises à jour, les requêtes utilisent les anciennes versions des dictionnaires. Si une erreur se produit pendant une mise à jour, l'erreur est écrite dans le journal du serveur et les requêtes continuent d'utiliser l'ancienne version des dictionnaires.
-
-Nous vous recommandons de mettre à jour périodiquement les dictionnaires avec la géobase. Lors d'une mise à jour, générez de nouveaux fichiers et écrivez-les dans un emplacement séparé. Lorsque tout est prêt, renommez - les en fichiers utilisés par le serveur.
-
-Il existe également des fonctions pour travailler avec les identifiants du système d'exploitation et Yandex.Moteurs de recherche Metrica, mais ils ne devraient pas être utilisés.
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/dicts/internal_dicts/) <!--hide-->
diff --git a/docs/fr/sql-reference/functions/arithmetic-functions.md b/docs/fr/sql-reference/functions/arithmetic-functions.md
deleted file mode 100644
index c35fb104236..00000000000
--- a/docs/fr/sql-reference/functions/arithmetic-functions.md
+++ /dev/null
@@ -1,87 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 35
-toc_title: "Arithm\xE9tique"
----
-
-# Fonctions Arithmétiques {#arithmetic-functions}
-
-Pour toutes les fonctions arithmétiques, le type de résultat est calculé comme le plus petit type de nombre dans lequel le résultat correspond, s'il existe un tel type. Le minimum est pris simultanément sur la base du nombre de bits, s'il est signé, et s'il flotte. S'il n'y a pas assez de bits, le type de bits le plus élevé est pris.
-
-Exemple:
-
-``` sql
-SELECT toTypeName(0), toTypeName(0 + 0), toTypeName(0 + 0 + 0), toTypeName(0 + 0 + 0 + 0)
-```
-
-``` text
-┌─toTypeName(0)─┬─toTypeName(plus(0, 0))─┬─toTypeName(plus(plus(0, 0), 0))─┬─toTypeName(plus(plus(plus(0, 0), 0), 0))─┐
-│ UInt8         │ UInt16                 │ UInt32                          │ UInt64                                   │
-└───────────────┴────────────────────────┴─────────────────────────────────┴──────────────────────────────────────────┘
-```
-
-Les fonctions arithmétiques fonctionnent pour n'importe quelle paire de types de UInt8, UInt16, UInt32, UInt64, Int8, Int16, Int32, Int64, Float32 ou Float64.
-
-Le débordement est produit de la même manière qu'en C++.
-
-## plus (A, B), opérateur a + b {#plusa-b-a-b-operator}
-
-Calcule la somme des nombres.
-Vous pouvez également ajouter des nombres entiers avec une date ou la date et l'heure. Dans le cas d'une date, Ajouter un entier signifie ajouter le nombre de jours correspondant. Pour une date avec l'heure, cela signifie ajouter le nombre de secondes correspondant.
-
-## moins (A, B), opérateur a - b {#minusa-b-a-b-operator}
-
-Calcule la différence. Le résultat est toujours signé.
-
-You can also calculate integer numbers from a date or date with time. The idea is the same – see above for ‘plus’.
-
-## la multiplication(a, b), a \* et b \* de l'opérateur {#multiplya-b-a-b-operator}
-
-Calcule le produit des nombres.
-
-## diviser (A, B), opérateur a / b {#dividea-b-a-b-operator}
-
-Calcule le quotient des nombres. Le type de résultat est toujours un type à virgule flottante.
-Il n'est pas de division entière. Pour la division entière, utilisez le ‘intDiv’ fonction.
-En divisant par zéro vous obtenez ‘inf’, ‘-inf’, ou ‘nan’.
-
-## intDiv (a, b) {#intdiva-b}
-
-Calcule le quotient des nombres. Divise en entiers, arrondi vers le bas (par la valeur absolue).
-Une exception est levée en divisant par zéro ou en divisant un nombre négatif minimal par moins un.
-
-## intDivOrZero(a, b) {#intdivorzeroa-b}
-
-Diffère de ‘intDiv’ en ce sens qu'il renvoie zéro en divisant par zéro ou en divisant un nombre négatif minimal par moins un.
-
-## opérateur modulo(A, B), A % B {#moduloa-b-a-b-operator}
-
-Calcule le reste après la division.
-Si les arguments sont des nombres à virgule flottante, ils sont pré-convertis en entiers en supprimant la partie décimale.
-Le reste est pris dans le même sens qu'en C++. La division tronquée est utilisée pour les nombres négatifs.
-Une exception est levée en divisant par zéro ou en divisant un nombre négatif minimal par moins un.
-
-## moduloOrZero (a, b) {#moduloorzeroa-b}
-
-Diffère de ‘modulo’ en ce sens qu'il renvoie zéro lorsque le diviseur est nul.
-
-## annuler (a), - un opérateur {#negatea-a-operator}
-
-Calcule un nombre avec le signe inverse. Le résultat est toujours signé.
-
-## abs(un) {#arithm_func-abs}
-
-Calcule la valeur absolue d'un nombre (un). Autrement dit, si un \< 0, Il renvoie-A. pour les types non signés, il ne fait rien. Pour les types entiers signés, il renvoie un nombre non signé.
-
-## pgcd(a, b) {#gcda-b}
-
-Renvoie le plus grand diviseur commun des nombres.
-Une exception est levée en divisant par zéro ou en divisant un nombre négatif minimal par moins un.
-
-## ppcm(a, b) {#lcma-b}
-
-Renvoie le multiple le moins commun des nombres.
-Une exception est levée en divisant par zéro ou en divisant un nombre négatif minimal par moins un.
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/functions/arithmetic_functions/) <!--hide-->
diff --git a/docs/fr/sql-reference/functions/array-functions.md b/docs/fr/sql-reference/functions/array-functions.md
deleted file mode 100644
index 40568841372..00000000000
--- a/docs/fr/sql-reference/functions/array-functions.md
+++ /dev/null
@@ -1,1061 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 46
-toc_title: Travailler avec des tableaux
----
-
-# Fonctions pour travailler avec des tableaux {#functions-for-working-with-arrays}
-
-## vide {#function-empty}
-
-Retourne 1 pour un tableau vide, ou 0 pour un non-vide.
-Le type de résultat est UInt8.
-La fonction fonctionne également pour les chaînes.
-
-## notEmpty {#function-notempty}
-
-Retourne 0 pour un tableau vide, ou 1 pour un non-vide.
-Le type de résultat est UInt8.
-La fonction fonctionne également pour les chaînes.
-
-## longueur {#array_functions-length}
-
-Retourne le nombre d'éléments dans le tableau.
-Le type de résultat est UInt64.
-La fonction fonctionne également pour les chaînes.
-
-## emptyArrayUInt8, emptyArrayUInt16, emptyArrayUInt32, emptyArrayUInt64 {#emptyarrayuint8-emptyarrayuint16-emptyarrayuint32-emptyarrayuint64}
-
-## emptyArrayInt8, emptyArrayInt16, emptyArrayInt32, emptyArrayInt64 {#emptyarrayint8-emptyarrayint16-emptyarrayint32-emptyarrayint64}
-
-## emptyArrayFloat32, emptyArrayFloat64 {#emptyarrayfloat32-emptyarrayfloat64}
-
-## emptyArrayDate, emptyArrayDateTime {#emptyarraydate-emptyarraydatetime}
-
-## emptyArrayString {#emptyarraystring}
-
-Accepte zéro argument et renvoie un tableau vide du type approprié.
-
-## emptyArrayToSingle {#emptyarraytosingle}
-
-Accepte un tableau vide et renvoie un élément de tableau qui est égal à la valeur par défaut.
-
-## plage (fin), Plage(début, fin \[, étape\]) {#rangeend-rangestart-end-step}
-
-Retourne un tableau de nombres du début à la fin-1 par étape.
-Si l'argument `start` n'est pas spécifié, la valeur par défaut est 0.
-Si l'argument `step` n'est pas spécifié, la valeur par défaut est 1.
-Il se comporte presque comme pythonic `range`. Mais la différence est que tous les types d'arguments doivent être `UInt` nombre.
-Juste au cas où, une exception est levée si des tableaux d'une longueur totale de plus de 100 000 000 d'éléments sont créés dans un bloc de données.
-
-## array(x1, …), operator \[x1, …\] {#arrayx1-operator-x1}
-
-Crée un tableau à partir des arguments de la fonction.
-Les arguments doivent être des constantes et avoir des types qui ont le plus petit type commun. Au moins un argument doit être passé, sinon il n'est pas clair quel type de tableau créer. Qui est, vous ne pouvez pas utiliser cette fonction pour créer un tableau vide (pour ce faire, utilisez la ‘emptyArray\*’ la fonction décrite ci-dessus).
-Retourne un ‘Array(T)’ type de résultat, où ‘T’ est le plus petit type commun parmi les arguments passés.
-
-## arrayConcat {#arrayconcat}
-
-Combine des tableaux passés comme arguments.
-
-``` sql
-arrayConcat(arrays)
-```
-
-**Paramètre**
-
--   `arrays` – Arbitrary number of arguments of [Tableau](../../sql-reference/data-types/array.md) type.
-    **Exemple**
-
-<!-- -->
-
-``` sql
-SELECT arrayConcat([1, 2], [3, 4], [5, 6]) AS res
-```
-
-``` text
-┌─res───────────┐
-│ [1,2,3,4,5,6] │
-└───────────────┘
-```
-
-## arrayElement(arr, n), opérateur arr\[n\] {#arrayelementarr-n-operator-arrn}
-
-Récupérer l'élément avec l'index `n` à partir du tableau `arr`. `n` doit être n'importe quel type entier.
-Les index dans un tableau commencent à partir d'un.
-Les index négatifs sont pris en charge. Dans ce cas, il sélectionne l'élément correspondant numérotées à partir de la fin. Exemple, `arr[-1]` est le dernier élément du tableau.
-
-Si l'index est en dehors des limites d'un tableau, il renvoie une valeur (0 pour les nombres, une chaîne vide pour les cordes, etc.), sauf pour le cas avec un tableau non constant et un index constant 0 (dans ce cas, il y aura une erreur `Array indices are 1-based`).
-
-## a (arr, elem) {#hasarr-elem}
-
-Vérifie si le ‘arr’ tableau a la ‘elem’ élément.
-Retourne 0 si l'élément n'est pas dans le tableau, ou 1 si elle l'est.
-
-`NULL` est traitée comme une valeur.
-
-``` sql
-SELECT has([1, 2, NULL], NULL)
-```
-
-``` text
-┌─has([1, 2, NULL], NULL)─┐
-│                       1 │
-└─────────────────────────┘
-```
-
-## hasAll {#hasall}
-
-Vérifie si un tableau est un sous-ensemble de l'autre.
-
-``` sql
-hasAll(set, subset)
-```
-
-**Paramètre**
-
--   `set` – Array of any type with a set of elements.
--   `subset` – Array of any type with elements that should be tested to be a subset of `set`.
-
-**Les valeurs de retour**
-
--   `1`, si `set` contient tous les éléments de `subset`.
--   `0`, autrement.
-
-**Propriétés particulières**
-
--   Un tableau vide est un sous-ensemble d'un tableau quelconque.
--   `Null` traitée comme une valeur.
--   Ordre des valeurs dans les deux tableaux n'a pas d'importance.
-
-**Exemple**
-
-`SELECT hasAll([], [])` retours 1.
-
-`SELECT hasAll([1, Null], [Null])` retours 1.
-
-`SELECT hasAll([1.0, 2, 3, 4], [1, 3])` retours 1.
-
-`SELECT hasAll(['a', 'b'], ['a'])` retours 1.
-
-`SELECT hasAll([1], ['a'])` renvoie 0.
-
-`SELECT hasAll([[1, 2], [3, 4]], [[1, 2], [3, 5]])` renvoie 0.
-
-## hasAny {#hasany}
-
-Vérifie si deux tableaux ont une intersection par certains éléments.
-
-``` sql
-hasAny(array1, array2)
-```
-
-**Paramètre**
-
--   `array1` – Array of any type with a set of elements.
--   `array2` – Array of any type with a set of elements.
-
-**Les valeurs de retour**
-
--   `1`, si `array1` et `array2` avoir un élément similaire au moins.
--   `0`, autrement.
-
-**Propriétés particulières**
-
--   `Null` traitée comme une valeur.
--   Ordre des valeurs dans les deux tableaux n'a pas d'importance.
-
-**Exemple**
-
-`SELECT hasAny([1], [])` retourner `0`.
-
-`SELECT hasAny([Null], [Null, 1])` retourner `1`.
-
-`SELECT hasAny([-128, 1., 512], [1])` retourner `1`.
-
-`SELECT hasAny([[1, 2], [3, 4]], ['a', 'c'])` retourner `0`.
-
-`SELECT hasAll([[1, 2], [3, 4]], [[1, 2], [1, 2]])` retourner `1`.
-
-## indexOf (arr, x) {#indexofarr-x}
-
-Renvoie l'index de la première ‘x’ élément (à partir de 1) s'il est dans le tableau, ou 0 s'il ne l'est pas.
-
-Exemple:
-
-``` sql
-SELECT indexOf([1, 3, NULL, NULL], NULL)
-```
-
-``` text
-┌─indexOf([1, 3, NULL, NULL], NULL)─┐
-│                                 3 │
-└───────────────────────────────────┘
-```
-
-Ensemble d'éléments de `NULL` sont traités comme des valeurs normales.
-
-## countEqual (arr, x) {#countequalarr-x}
-
-Renvoie le nombre d'éléments dans le tableau égal à X. équivalent à arrayCount (elem - \> elem = x, arr).
-
-`NULL` les éléments sont traités comme des valeurs distinctes.
-
-Exemple:
-
-``` sql
-SELECT countEqual([1, 2, NULL, NULL], NULL)
-```
-
-``` text
-┌─countEqual([1, 2, NULL, NULL], NULL)─┐
-│                                    2 │
-└──────────────────────────────────────┘
-```
-
-## arrayEnumerate (arr) {#array_functions-arrayenumerate}
-
-Returns the array \[1, 2, 3, …, length (arr) \]
-
-Cette fonction est normalement utilisée avec ARRAY JOIN. Il permet de compter quelque chose une seule fois pour chaque tableau après l'application de la jointure de tableau. Exemple:
-
-``` sql
-SELECT
-    count() AS Reaches,
-    countIf(num = 1) AS Hits
-FROM test.hits
-ARRAY JOIN
-    GoalsReached,
-    arrayEnumerate(GoalsReached) AS num
-WHERE CounterID = 160656
-LIMIT 10
-```
-
-``` text
-┌─Reaches─┬──Hits─┐
-│   95606 │ 31406 │
-└─────────┴───────┘
-```
-
-Dans cet exemple, Reaches est le nombre de conversions (les chaînes reçues après l'application de la jointure de tableau), et Hits est le nombre de pages vues (chaînes avant la jointure de tableau). Dans ce cas particulier, vous pouvez obtenir le même résultat dans une voie plus facile:
-
-``` sql
-SELECT
-    sum(length(GoalsReached)) AS Reaches,
-    count() AS Hits
-FROM test.hits
-WHERE (CounterID = 160656) AND notEmpty(GoalsReached)
-```
-
-``` text
-┌─Reaches─┬──Hits─┐
-│   95606 │ 31406 │
-└─────────┴───────┘
-```
-
-Cette fonction peut également être utilisée dans les fonctions d'ordre supérieur. Par exemple, vous pouvez l'utiliser pour obtenir les indices de tableau pour les éléments qui correspondent à une condition.
-
-## arrayEnumerateUniq(arr, …) {#arrayenumerateuniqarr}
-
-Renvoie un tableau de la même taille que le tableau source, indiquant pour chaque élément Quelle est sa position parmi les éléments de même valeur.
-Par exemple: arrayEnumerateUniq(\[10, 20, 10, 30\]) = \[1, 1, 2, 1\].
-
-Cette fonction est utile lors de L'utilisation de la jointure de tableau et de l'agrégation d'éléments de tableau.
-Exemple:
-
-``` sql
-SELECT
-    Goals.ID AS GoalID,
-    sum(Sign) AS Reaches,
-    sumIf(Sign, num = 1) AS Visits
-FROM test.visits
-ARRAY JOIN
-    Goals,
-    arrayEnumerateUniq(Goals.ID) AS num
-WHERE CounterID = 160656
-GROUP BY GoalID
-ORDER BY Reaches DESC
-LIMIT 10
-```
-
-``` text
-┌──GoalID─┬─Reaches─┬─Visits─┐
-│   53225 │    3214 │   1097 │
-│ 2825062 │    3188 │   1097 │
-│   56600 │    2803 │    488 │
-│ 1989037 │    2401 │    365 │
-│ 2830064 │    2396 │    910 │
-│ 1113562 │    2372 │    373 │
-│ 3270895 │    2262 │    812 │
-│ 1084657 │    2262 │    345 │
-│   56599 │    2260 │    799 │
-│ 3271094 │    2256 │    812 │
-└─────────┴─────────┴────────┘
-```
-
-Dans cet exemple, chaque ID d'objectif a un calcul du nombre de conversions (chaque élément de la structure de données imbriquées objectifs est un objectif atteint, que nous appelons une conversion) et le nombre de sessions. Sans array JOIN, nous aurions compté le nombre de sessions comme sum(signe). Mais dans ce cas particulier, les lignes ont été multipliées par la structure des objectifs imbriqués, donc pour compter chaque session une fois après cela, nous appliquons une condition à la valeur de arrayEnumerateUniq(Goals.ID) fonction.
-
-La fonction arrayEnumerateUniq peut prendre plusieurs tableaux de la même taille que les arguments. Dans ce cas, l'unicité est considérée pour les tuples d'éléments dans les mêmes positions dans tous les tableaux.
-
-``` sql
-SELECT arrayEnumerateUniq([1, 1, 1, 2, 2, 2], [1, 1, 2, 1, 1, 2]) AS res
-```
-
-``` text
-┌─res───────────┐
-│ [1,2,1,1,2,1] │
-└───────────────┘
-```
-
-Ceci est nécessaire lors de L'utilisation de Array JOIN avec une structure de données imbriquée et une agrégation supplémentaire entre plusieurs éléments de cette structure.
-
-## arrayPopBack {#arraypopback}
-
-Supprime le dernier élément du tableau.
-
-``` sql
-arrayPopBack(array)
-```
-
-**Paramètre**
-
--   `array` – Array.
-
-**Exemple**
-
-``` sql
-SELECT arrayPopBack([1, 2, 3]) AS res
-```
-
-``` text
-┌─res───┐
-│ [1,2] │
-└───────┘
-```
-
-## arrayPopFront {#arraypopfront}
-
-Supprime le premier élément de la matrice.
-
-``` sql
-arrayPopFront(array)
-```
-
-**Paramètre**
-
--   `array` – Array.
-
-**Exemple**
-
-``` sql
-SELECT arrayPopFront([1, 2, 3]) AS res
-```
-
-``` text
-┌─res───┐
-│ [2,3] │
-└───────┘
-```
-
-## arrayPushBack {#arraypushback}
-
-Ajoute un élément à la fin du tableau.
-
-``` sql
-arrayPushBack(array, single_value)
-```
-
-**Paramètre**
-
--   `array` – Array.
--   `single_value` – A single value. Only numbers can be added to an array with numbers, and only strings can be added to an array of strings. When adding numbers, ClickHouse automatically sets the `single_value` type pour le type de données du tableau. Pour plus d'informations sur les types de données dans ClickHouse, voir “[Types de données](../../sql-reference/data-types/index.md#data_types)”. Peut être `NULL`. La fonction ajoute un `NULL` tableau, et le type d'éléments de tableau convertit en `Nullable`.
-
-**Exemple**
-
-``` sql
-SELECT arrayPushBack(['a'], 'b') AS res
-```
-
-``` text
-┌─res───────┐
-│ ['a','b'] │
-└───────────┘
-```
-
-## arrayPushFront {#arraypushfront}
-
-Ajoute un élément au début du tableau.
-
-``` sql
-arrayPushFront(array, single_value)
-```
-
-**Paramètre**
-
--   `array` – Array.
--   `single_value` – A single value. Only numbers can be added to an array with numbers, and only strings can be added to an array of strings. When adding numbers, ClickHouse automatically sets the `single_value` type pour le type de données du tableau. Pour plus d'informations sur les types de données dans ClickHouse, voir “[Types de données](../../sql-reference/data-types/index.md#data_types)”. Peut être `NULL`. La fonction ajoute un `NULL` tableau, et le type d'éléments de tableau convertit en `Nullable`.
-
-**Exemple**
-
-``` sql
-SELECT arrayPushFront(['b'], 'a') AS res
-```
-
-``` text
-┌─res───────┐
-│ ['a','b'] │
-└───────────┘
-```
-
-## arrayResize {#arrayresize}
-
-Les changements de la longueur du tableau.
-
-``` sql
-arrayResize(array, size[, extender])
-```
-
-**Paramètre:**
-
--   `array` — Array.
--   `size` — Required length of the array.
-    -   Si `size` est inférieure à la taille d'origine du tableau, le tableau est tronqué à partir de la droite.
--   Si `size` est plus grande que la taille initiale du tableau, le tableau est étendu vers la droite avec `extender` valeurs ou valeurs par défaut pour le type de données des éléments du tableau.
--   `extender` — Value for extending an array. Can be `NULL`.
-
-**Valeur renvoyée:**
-
-Un tableau de longueur `size`.
-
-**Exemples d'appels**
-
-``` sql
-SELECT arrayResize([1], 3)
-```
-
-``` text
-┌─arrayResize([1], 3)─┐
-│ [1,0,0]             │
-└─────────────────────┘
-```
-
-``` sql
-SELECT arrayResize([1], 3, NULL)
-```
-
-``` text
-┌─arrayResize([1], 3, NULL)─┐
-│ [1,NULL,NULL]             │
-└───────────────────────────┘
-```
-
-## arraySlice {#arrayslice}
-
-Retourne une tranche du tableau.
-
-``` sql
-arraySlice(array, offset[, length])
-```
-
-**Paramètre**
-
--   `array` – Array of data.
--   `offset` – Indent from the edge of the array. A positive value indicates an offset on the left, and a negative value is an indent on the right. Numbering of the array items begins with 1.
--   `length` - La longueur de la nécessaire tranche. Si vous spécifiez une valeur négative, la fonction renvoie un ouvert tranche `[offset, array_length - length)`. Si vous omettez la valeur, la fonction renvoie la tranche `[offset, the_end_of_array]`.
-
-**Exemple**
-
-``` sql
-SELECT arraySlice([1, 2, NULL, 4, 5], 2, 3) AS res
-```
-
-``` text
-┌─res────────┐
-│ [2,NULL,4] │
-└────────────┘
-```
-
-Éléments de tableau définis sur `NULL` sont traités comme des valeurs normales.
-
-## arraySort(\[func,\] arr, …) {#array_functions-sort}
-
-Trie les éléments de la `arr` tableau dans l'ordre croissant. Si l' `func` fonction est spécifiée, l'ordre de tri est déterminé par le résultat de la `func` fonction appliquée aux éléments du tableau. Si `func` accepte plusieurs arguments, le `arraySort` la fonction est passé plusieurs tableaux que les arguments de `func` correspond à. Des exemples détaillés sont présentés à la fin de `arraySort` Description.
-
-Exemple de tri de valeurs entières:
-
-``` sql
-SELECT arraySort([1, 3, 3, 0]);
-```
-
-``` text
-┌─arraySort([1, 3, 3, 0])─┐
-│ [0,1,3,3]               │
-└─────────────────────────┘
-```
-
-Exemple de tri des valeurs de chaîne:
-
-``` sql
-SELECT arraySort(['hello', 'world', '!']);
-```
-
-``` text
-┌─arraySort(['hello', 'world', '!'])─┐
-│ ['!','hello','world']              │
-└────────────────────────────────────┘
-```
-
-Considérez l'ordre de tri suivant pour le `NULL`, `NaN` et `Inf` valeur:
-
-``` sql
-SELECT arraySort([1, nan, 2, NULL, 3, nan, -4, NULL, inf, -inf]);
-```
-
-``` text
-┌─arraySort([1, nan, 2, NULL, 3, nan, -4, NULL, inf, -inf])─┐
-│ [-inf,-4,1,2,3,inf,nan,nan,NULL,NULL]                     │
-└───────────────────────────────────────────────────────────┘
-```
-
--   `-Inf` les valeurs sont d'abord dans le tableau.
--   `NULL` les valeurs sont les derniers dans le tableau.
--   `NaN` les valeurs sont juste avant `NULL`.
--   `Inf` les valeurs sont juste avant `NaN`.
-
-Notez que `arraySort` est un [fonction d'ordre supérieur](higher-order-functions.md). Vous pouvez passer d'une fonction lambda comme premier argument. Dans ce cas, l'ordre de classement est déterminé par le résultat de la fonction lambda appliquée aux éléments de la matrice.
-
-Considérons l'exemple suivant:
-
-``` sql
-SELECT arraySort((x) -> -x, [1, 2, 3]) as res;
-```
-
-``` text
-┌─res─────┐
-│ [3,2,1] │
-└─────────┘
-```
-
-For each element of the source array, the lambda function returns the sorting key, that is, \[1 –\> -1, 2 –\> -2, 3 –\> -3\]. Since the `arraySort` fonction trie les touches dans l'ordre croissant, le résultat est \[3, 2, 1\]. Ainsi, l' `(x) –> -x` fonction lambda définit le [l'ordre décroissant](#array_functions-reverse-sort) dans un tri.
-
-La fonction lambda peut accepter plusieurs arguments. Dans ce cas, vous avez besoin de passer l' `arraySort` fonction plusieurs tableaux de longueur identique à laquelle correspondront les arguments de la fonction lambda. Le tableau résultant sera composé d'éléments du premier tableau d'entrée; les éléments du(des) Tableau (s) d'entrée suivant (s) spécifient les clés de tri. Exemple:
-
-``` sql
-SELECT arraySort((x, y) -> y, ['hello', 'world'], [2, 1]) as res;
-```
-
-``` text
-┌─res────────────────┐
-│ ['world', 'hello'] │
-└────────────────────┘
-```
-
-Ici, les éléments qui sont passés dans le deuxième tableau (\[2, 1\]) définissent une clé de tri pour l'élément correspondant à partir du tableau source (\[‘hello’, ‘world’\]), qui est, \[‘hello’ –\> 2, ‘world’ –\> 1\]. Since the lambda function doesn't use `x`, les valeurs réelles du tableau source n'affectent pas l'ordre dans le résultat. Si, ‘hello’ sera le deuxième élément du résultat, et ‘world’ sera le premier.
-
-D'autres exemples sont présentés ci-dessous.
-
-``` sql
-SELECT arraySort((x, y) -> y, [0, 1, 2], ['c', 'b', 'a']) as res;
-```
-
-``` text
-┌─res─────┐
-│ [2,1,0] │
-└─────────┘
-```
-
-``` sql
-SELECT arraySort((x, y) -> -y, [0, 1, 2], [1, 2, 3]) as res;
-```
-
-``` text
-┌─res─────┐
-│ [2,1,0] │
-└─────────┘
-```
-
-!!! note "Note"
-    Pour améliorer l'efficacité du tri, de la [Transformation schwartzienne](https://en.wikipedia.org/wiki/Schwartzian_transform) est utilisée.
-
-## arrayReverseSort(\[func,\] arr, …) {#array_functions-reverse-sort}
-
-Trie les éléments de la `arr` tableau dans l'ordre décroissant. Si l' `func` la fonction est spécifiée, `arr` est trié en fonction du résultat de la `func` fonction appliquée aux éléments du tableau, puis le tableau trié est inversé. Si `func` accepte plusieurs arguments, le `arrayReverseSort` la fonction est passé plusieurs tableaux que les arguments de `func` correspond à. Des exemples détaillés sont présentés à la fin de `arrayReverseSort` Description.
-
-Exemple de tri de valeurs entières:
-
-``` sql
-SELECT arrayReverseSort([1, 3, 3, 0]);
-```
-
-``` text
-┌─arrayReverseSort([1, 3, 3, 0])─┐
-│ [3,3,1,0]                      │
-└────────────────────────────────┘
-```
-
-Exemple de tri des valeurs de chaîne:
-
-``` sql
-SELECT arrayReverseSort(['hello', 'world', '!']);
-```
-
-``` text
-┌─arrayReverseSort(['hello', 'world', '!'])─┐
-│ ['world','hello','!']                     │
-└───────────────────────────────────────────┘
-```
-
-Considérez l'ordre de tri suivant pour le `NULL`, `NaN` et `Inf` valeur:
-
-``` sql
-SELECT arrayReverseSort([1, nan, 2, NULL, 3, nan, -4, NULL, inf, -inf]) as res;
-```
-
-``` text
-┌─res───────────────────────────────────┐
-│ [inf,3,2,1,-4,-inf,nan,nan,NULL,NULL] │
-└───────────────────────────────────────┘
-```
-
--   `Inf` les valeurs sont d'abord dans le tableau.
--   `NULL` les valeurs sont les derniers dans le tableau.
--   `NaN` les valeurs sont juste avant `NULL`.
--   `-Inf` les valeurs sont juste avant `NaN`.
-
-Notez que l' `arrayReverseSort` est un [fonction d'ordre supérieur](higher-order-functions.md). Vous pouvez passer d'une fonction lambda comme premier argument. Exemple est montré ci-dessous.
-
-``` sql
-SELECT arrayReverseSort((x) -> -x, [1, 2, 3]) as res;
-```
-
-``` text
-┌─res─────┐
-│ [1,2,3] │
-└─────────┘
-```
-
-Le tableau est trié de la façon suivante:
-
-1.  Dans un premier temps, le tableau source (\[1, 2, 3\]) est trié en fonction du résultat de la fonction lambda appliquée aux éléments du tableau. Le résultat est un tableau \[3, 2, 1\].
-2.  Tableau qui est obtenu à l'étape précédente, est renversé. Donc, le résultat final est \[1, 2, 3\].
-
-La fonction lambda peut accepter plusieurs arguments. Dans ce cas, vous avez besoin de passer l' `arrayReverseSort` fonction plusieurs tableaux de longueur identique à laquelle correspondront les arguments de la fonction lambda. Le tableau résultant sera composé d'éléments du premier tableau d'entrée; les éléments du(des) Tableau (s) d'entrée suivant (s) spécifient les clés de tri. Exemple:
-
-``` sql
-SELECT arrayReverseSort((x, y) -> y, ['hello', 'world'], [2, 1]) as res;
-```
-
-``` text
-┌─res───────────────┐
-│ ['hello','world'] │
-└───────────────────┘
-```
-
-Dans cet exemple, le tableau est trié de la façon suivante:
-
-1.  Au début, le tableau source (\[‘hello’, ‘world’\]) est triée selon le résultat de la fonction lambda appliquée aux éléments de tableaux. Les éléments qui sont passés dans le deuxième tableau (\[2, 1\]), définissent les clés de tri pour les éléments correspondants du tableau source. Le résultat est un tableau \[‘world’, ‘hello’\].
-2.  Tableau trié lors de l'étape précédente, est renversé. Donc, le résultat final est \[‘hello’, ‘world’\].
-
-D'autres exemples sont présentés ci-dessous.
-
-``` sql
-SELECT arrayReverseSort((x, y) -> y, [4, 3, 5], ['a', 'b', 'c']) AS res;
-```
-
-``` text
-┌─res─────┐
-│ [5,3,4] │
-└─────────┘
-```
-
-``` sql
-SELECT arrayReverseSort((x, y) -> -y, [4, 3, 5], [1, 2, 3]) AS res;
-```
-
-``` text
-┌─res─────┐
-│ [4,3,5] │
-└─────────┘
-```
-
-## arrayUniq(arr, …) {#arrayuniqarr}
-
-Si un argument est passé, il compte le nombre de différents éléments dans le tableau.
-Si plusieurs arguments sont passés, il compte le nombre de tuples différents d'éléments aux positions correspondantes dans plusieurs tableaux.
-
-Si vous souhaitez obtenir une liste des éléments dans un tableau, vous pouvez utiliser arrayReduce(‘groupUniqArray’, arr).
-
-## arrayJoin (arr) {#array-functions-join}
-
-Une fonction spéciale. Voir la section [“ArrayJoin function”](array-join.md#functions_arrayjoin).
-
-## tableaudifférence {#arraydifference}
-
-Calcule la différence entre les éléments de tableau adjacents. Renvoie un tableau où le premier élément sera 0, le second est la différence entre `a[1] - a[0]`, etc. The type of elements in the resulting array is determined by the type inference rules for subtraction (e.g. `UInt8` - `UInt8` = `Int16`).
-
-**Syntaxe**
-
-``` sql
-arrayDifference(array)
-```
-
-**Paramètre**
-
--   `array` – [Tableau](https://clickhouse.tech/docs/en/data_types/array/).
-
-**Valeurs renvoyées**
-
-Renvoie un tableau de différences entre les éléments adjacents.
-
-Type: [UInt\*](https://clickhouse.tech/docs/en/data_types/int_uint/#uint-ranges), [Int\*](https://clickhouse.tech/docs/en/data_types/int_uint/#int-ranges), [Flottant\*](https://clickhouse.tech/docs/en/data_types/float/).
-
-**Exemple**
-
-Requête:
-
-``` sql
-SELECT arrayDifference([1, 2, 3, 4])
-```
-
-Résultat:
-
-``` text
-┌─arrayDifference([1, 2, 3, 4])─┐
-│ [0,1,1,1]                     │
-└───────────────────────────────┘
-```
-
-Exemple de débordement dû au type de résultat Int64:
-
-Requête:
-
-``` sql
-SELECT arrayDifference([0, 10000000000000000000])
-```
-
-Résultat:
-
-``` text
-┌─arrayDifference([0, 10000000000000000000])─┐
-│ [0,-8446744073709551616]                   │
-└────────────────────────────────────────────┘
-```
-
-## arrayDistinct {#arraydistinct}
-
-Prend un tableau, retourne un tableau contenant les différents éléments seulement.
-
-**Syntaxe**
-
-``` sql
-arrayDistinct(array)
-```
-
-**Paramètre**
-
--   `array` – [Tableau](https://clickhouse.tech/docs/en/data_types/array/).
-
-**Valeurs renvoyées**
-
-Retourne un tableau contenant les éléments distincts.
-
-**Exemple**
-
-Requête:
-
-``` sql
-SELECT arrayDistinct([1, 2, 2, 3, 1])
-```
-
-Résultat:
-
-``` text
-┌─arrayDistinct([1, 2, 2, 3, 1])─┐
-│ [1,2,3]                        │
-└────────────────────────────────┘
-```
-
-## arrayEnumerateDense(arr) {#array_functions-arrayenumeratedense}
-
-Renvoie un tableau de la même taille que le tableau source, indiquant où chaque élément apparaît en premier dans le tableau source.
-
-Exemple:
-
-``` sql
-SELECT arrayEnumerateDense([10, 20, 10, 30])
-```
-
-``` text
-┌─arrayEnumerateDense([10, 20, 10, 30])─┐
-│ [1,2,1,3]                             │
-└───────────────────────────────────────┘
-```
-
-## arrayIntersect (arr) {#array-functions-arrayintersect}
-
-Prend plusieurs tableaux, retourne un tableau avec des éléments présents dans tous les tableaux source. L'ordre des éléments dans le tableau résultant est le même que dans le premier tableau.
-
-Exemple:
-
-``` sql
-SELECT
-    arrayIntersect([1, 2], [1, 3], [2, 3]) AS no_intersect,
-    arrayIntersect([1, 2], [1, 3], [1, 4]) AS intersect
-```
-
-``` text
-┌─no_intersect─┬─intersect─┐
-│ []           │ [1]       │
-└──────────────┴───────────┘
-```
-
-## arrayReduce {#arrayreduce}
-
-Applique une fonction d'agrégation aux éléments du tableau et renvoie son résultat. Le nom de la fonction d'agrégation est passé sous forme de chaîne entre guillemets simples `'max'`, `'sum'`. Lorsque vous utilisez des fonctions d'agrégat paramétriques, le paramètre est indiqué après le nom de la fonction entre parenthèses `'uniqUpTo(6)'`.
-
-**Syntaxe**
-
-``` sql
-arrayReduce(agg_func, arr1, arr2, ..., arrN)
-```
-
-**Paramètre**
-
--   `agg_func` — The name of an aggregate function which should be a constant [chaîne](../../sql-reference/data-types/string.md).
--   `arr` — Any number of [tableau](../../sql-reference/data-types/array.md) tapez les colonnes comme paramètres de la fonction d'agrégation.
-
-**Valeur renvoyée**
-
-**Exemple**
-
-``` sql
-SELECT arrayReduce('max', [1, 2, 3])
-```
-
-``` text
-┌─arrayReduce('max', [1, 2, 3])─┐
-│                             3 │
-└───────────────────────────────┘
-```
-
-Si une fonction d'agrégation prend plusieurs arguments, cette fonction doit être appliqué à plusieurs ensembles de même taille.
-
-``` sql
-SELECT arrayReduce('maxIf', [3, 5], [1, 0])
-```
-
-``` text
-┌─arrayReduce('maxIf', [3, 5], [1, 0])─┐
-│                                    3 │
-└──────────────────────────────────────┘
-```
-
-Exemple avec une fonction d'agrégat paramétrique:
-
-``` sql
-SELECT arrayReduce('uniqUpTo(3)', [1, 2, 3, 4, 5, 6, 7, 8, 9, 10])
-```
-
-``` text
-┌─arrayReduce('uniqUpTo(3)', [1, 2, 3, 4, 5, 6, 7, 8, 9, 10])─┐
-│                                                           4 │
-└─────────────────────────────────────────────────────────────┘
-```
-
-## arrayReduceInRanges {#arrayreduceinranges}
-
-Applique une fonction d'agrégation d'éléments de tableau dans des plages et retourne un tableau contenant le résultat correspondant à chaque gamme. La fonction retourne le même résultat que plusieurs `arrayReduce(agg_func, arraySlice(arr1, index, length), ...)`.
-
-**Syntaxe**
-
-``` sql
-arrayReduceInRanges(agg_func, ranges, arr1, arr2, ..., arrN)
-```
-
-**Paramètre**
-
--   `agg_func` — The name of an aggregate function which should be a constant [chaîne](../../sql-reference/data-types/string.md).
--   `ranges` — The ranges to aggretate which should be an [tableau](../../sql-reference/data-types/array.md) de [tuple](../../sql-reference/data-types/tuple.md) qui contient l'indice et la longueur de chaque plage.
--   `arr` — Any number of [tableau](../../sql-reference/data-types/array.md) tapez les colonnes comme paramètres de la fonction d'agrégation.
-
-**Valeur renvoyée**
-
-**Exemple**
-
-``` sql
-SELECT arrayReduceInRanges(
-    'sum',
-    [(1, 5), (2, 3), (3, 4), (4, 4)],
-    [1000000, 200000, 30000, 4000, 500, 60, 7]
-) AS res
-```
-
-``` text
-┌─res─────────────────────────┐
-│ [1234500,234000,34560,4567] │
-└─────────────────────────────┘
-```
-
-## arrayReverse(arr) {#arrayreverse}
-
-Retourne un tableau de la même taille que l'original tableau contenant les éléments dans l'ordre inverse.
-
-Exemple:
-
-``` sql
-SELECT arrayReverse([1, 2, 3])
-```
-
-``` text
-┌─arrayReverse([1, 2, 3])─┐
-│ [3,2,1]                 │
-└─────────────────────────┘
-```
-
-## inverse (arr) {#array-functions-reverse}
-
-Synonyme de [“arrayReverse”](#arrayreverse)
-
-## arrayFlatten {#arrayflatten}
-
-Convertit un tableau de tableaux dans un tableau associatif.
-
-Fonction:
-
--   S'applique à toute profondeur de tableaux imbriqués.
--   Ne change pas les tableaux qui sont déjà plats.
-
-Le tableau aplati contient tous les éléments de tous les tableaux source.
-
-**Syntaxe**
-
-``` sql
-flatten(array_of_arrays)
-```
-
-Alias: `flatten`.
-
-**Paramètre**
-
--   `array_of_arrays` — [Tableau](../../sql-reference/data-types/array.md) de tableaux. Exemple, `[[1,2,3], [4,5]]`.
-
-**Exemple**
-
-``` sql
-SELECT flatten([[[1]], [[2], [3]]])
-```
-
-``` text
-┌─flatten(array(array([1]), array([2], [3])))─┐
-│ [1,2,3]                                     │
-└─────────────────────────────────────────────┘
-```
-
-## arrayCompact {#arraycompact}
-
-Supprime les éléments en double consécutifs d'un tableau. L'ordre des valeurs de résultat est déterminée par l'ordre dans le tableau source.
-
-**Syntaxe**
-
-``` sql
-arrayCompact(arr)
-```
-
-**Paramètre**
-
-`arr` — The [tableau](../../sql-reference/data-types/array.md) inspecter.
-
-**Valeur renvoyée**
-
-Le tableau sans doublon.
-
-Type: `Array`.
-
-**Exemple**
-
-Requête:
-
-``` sql
-SELECT arrayCompact([1, 1, nan, nan, 2, 3, 3, 3])
-```
-
-Résultat:
-
-``` text
-┌─arrayCompact([1, 1, nan, nan, 2, 3, 3, 3])─┐
-│ [1,nan,nan,2,3]                            │
-└────────────────────────────────────────────┘
-```
-
-## arrayZip {#arrayzip}
-
-Combine plusieurs tableaux en un seul tableau. Le tableau résultant contient les éléments correspondants des tableaux source regroupés en tuples dans l'ordre des arguments listés.
-
-**Syntaxe**
-
-``` sql
-arrayZip(arr1, arr2, ..., arrN)
-```
-
-**Paramètre**
-
--   `arrN` — [Tableau](../data-types/array.md).
-
-La fonction peut prendre n'importe quel nombre de tableaux de différents types. Tous les tableaux doivent être de taille égale.
-
-**Valeur renvoyée**
-
--   Tableau avec des éléments des tableaux source regroupés en [tuple](../data-types/tuple.md). Types de données dans le tuple sont les mêmes que les types de l'entrée des tableaux et dans le même ordre que les tableaux sont passés.
-
-Type: [Tableau](../data-types/array.md).
-
-**Exemple**
-
-Requête:
-
-``` sql
-SELECT arrayZip(['a', 'b', 'c'], [5, 2, 1])
-```
-
-Résultat:
-
-``` text
-┌─arrayZip(['a', 'b', 'c'], [5, 2, 1])─┐
-│ [('a',5),('b',2),('c',1)]            │
-└──────────────────────────────────────┘
-```
-
-## arrayAUC {#arrayauc}
-
-Calculer AUC (zone sous la courbe, qui est un concept dans l'apprentissage automatique, voir plus de détails: https://en.wikipedia.org/wiki/Receiver_operating_characteristic#Area_under_the_curve).
-
-**Syntaxe**
-
-``` sql
-arrayAUC(arr_scores, arr_labels)
-```
-
-**Paramètre**
-- `arr_scores` — scores prediction model gives.
-- `arr_labels` — labels of samples, usually 1 for positive sample and 0 for negtive sample.
-
-**Valeur renvoyée**
-Renvoie la valeur AUC avec le type Float64.
-
-**Exemple**
-Requête:
-
-``` sql
-select arrayAUC([0.1, 0.4, 0.35, 0.8], [0, 0, 1, 1])
-```
-
-Résultat:
-
-``` text
-┌─arrayAUC([0.1, 0.4, 0.35, 0.8], [0, 0, 1, 1])─┐
-│                                          0.75 │
-└────────────────────────────────────────---──┘
-```
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/functions/array_functions/) <!--hide-->
diff --git a/docs/fr/sql-reference/functions/array-join.md b/docs/fr/sql-reference/functions/array-join.md
deleted file mode 100644
index 859e801994d..00000000000
--- a/docs/fr/sql-reference/functions/array-join.md
+++ /dev/null
@@ -1,37 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 61
-toc_title: arrayJoin
----
-
-# fonction arrayJoin {#functions_arrayjoin}
-
-C'est un très inhabituelle de la fonction.
-
-Les fonctions normales ne modifient pas un ensemble de lignes, mais modifient simplement les valeurs de chaque ligne (map).
-Les fonctions d'agrégation compriment un ensemble de lignes (plier ou réduire).
-Le ‘arrayJoin’ la fonction prend chaque ligne et génère un ensemble de lignes (dépliante).
-
-Cette fonction prend un tableau comme argument et propage la ligne source à plusieurs lignes pour le nombre d'éléments dans le tableau.
-Toutes les valeurs des colonnes sont simplement copiés, sauf les valeurs dans la colonne où cette fonction est appliquée; elle est remplacée par la valeur correspondante de tableau.
-
-Une requête peut utiliser plusieurs `arrayJoin` fonction. Dans ce cas, la transformation est effectuée plusieurs fois.
-
-Notez la syntaxe de jointure de tableau dans la requête SELECT, qui offre des possibilités plus larges.
-
-Exemple:
-
-``` sql
-SELECT arrayJoin([1, 2, 3] AS src) AS dst, 'Hello', src
-```
-
-``` text
-┌─dst─┬─\'Hello\'─┬─src─────┐
-│   1 │ Hello     │ [1,2,3] │
-│   2 │ Hello     │ [1,2,3] │
-│   3 │ Hello     │ [1,2,3] │
-└─────┴───────────┴─────────┘
-```
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/functions/array_join/) <!--hide-->
diff --git a/docs/fr/sql-reference/functions/bit-functions.md b/docs/fr/sql-reference/functions/bit-functions.md
deleted file mode 100644
index 7b8795815f2..00000000000
--- a/docs/fr/sql-reference/functions/bit-functions.md
+++ /dev/null
@@ -1,255 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 48
-toc_title: Bit
----
-
-# Peu De Fonctions {#bit-functions}
-
-Les fonctions Bit fonctionnent pour n'importe quelle paire de types de UInt8, UInt16, UInt32, UInt64, Int8, Int16, Int32, Int64, Float32 ou Float64.
-
-Le type de résultat est un entier avec des bits égaux aux bits maximum de ses arguments. Si au moins l'un des arguments est signé, le résultat est un signé nombre. Si un argument est un nombre à virgule flottante, Il est converti en Int64.
-
-## bitAnd (a, b) {#bitanda-b}
-
-## bitOr (a, b) {#bitora-b}
-
-## bitXor (a, b) {#bitxora-b}
-
-## bitNot (a) {#bitnota}
-
-## bitShiftLeft (A, b) {#bitshiftlefta-b}
-
-## bitShiftRight (A, b) {#bitshiftrighta-b}
-
-## bitRotateLeft (a, b) {#bitrotatelefta-b}
-
-## bitRotateRight (a, b) {#bitrotaterighta-b}
-
-## bitTest {#bittest}
-
-Prend tout entier et le convertit en [forme binaire](https://en.wikipedia.org/wiki/Binary_number) renvoie la valeur d'un bit à la position spécifiée. Le compte à rebours commence à partir de 0 de la droite vers la gauche.
-
-**Syntaxe**
-
-``` sql
-SELECT bitTest(number, index)
-```
-
-**Paramètre**
-
--   `number` – integer number.
--   `index` – position of bit.
-
-**Valeurs renvoyées**
-
-Renvoie une valeur de bit à la position spécifiée.
-
-Type: `UInt8`.
-
-**Exemple**
-
-Par exemple, le nombre 43 dans le système numérique de base-2 (binaire) est 101011.
-
-Requête:
-
-``` sql
-SELECT bitTest(43, 1)
-```
-
-Résultat:
-
-``` text
-┌─bitTest(43, 1)─┐
-│              1 │
-└────────────────┘
-```
-
-Un autre exemple:
-
-Requête:
-
-``` sql
-SELECT bitTest(43, 2)
-```
-
-Résultat:
-
-``` text
-┌─bitTest(43, 2)─┐
-│              0 │
-└────────────────┘
-```
-
-## bitTestAll {#bittestall}
-
-Renvoie le résultat de [logique de conjonction](https://en.wikipedia.org/wiki/Logical_conjunction) (Et opérateur) de tous les bits à des positions données. Le compte à rebours commence à partir de 0 de la droite vers la gauche.
-
-La conjonction pour les opérations bit à bit:
-
-0 AND 0 = 0
-
-0 AND 1 = 0
-
-1 AND 0 = 0
-
-1 AND 1 = 1
-
-**Syntaxe**
-
-``` sql
-SELECT bitTestAll(number, index1, index2, index3, index4, ...)
-```
-
-**Paramètre**
-
--   `number` – integer number.
--   `index1`, `index2`, `index3`, `index4` – positions of bit. For example, for set of positions (`index1`, `index2`, `index3`, `index4`) est vrai si et seulement si toutes ses positions sont remplies (`index1` ⋀ `index2`, ⋀ `index3` ⋀ `index4`).
-
-**Valeurs renvoyées**
-
-Retourne le résultat de la conjonction logique.
-
-Type: `UInt8`.
-
-**Exemple**
-
-Par exemple, le nombre 43 dans le système numérique de base-2 (binaire) est 101011.
-
-Requête:
-
-``` sql
-SELECT bitTestAll(43, 0, 1, 3, 5)
-```
-
-Résultat:
-
-``` text
-┌─bitTestAll(43, 0, 1, 3, 5)─┐
-│                          1 │
-└────────────────────────────┘
-```
-
-Un autre exemple:
-
-Requête:
-
-``` sql
-SELECT bitTestAll(43, 0, 1, 3, 5, 2)
-```
-
-Résultat:
-
-``` text
-┌─bitTestAll(43, 0, 1, 3, 5, 2)─┐
-│                             0 │
-└───────────────────────────────┘
-```
-
-## bitTestAny {#bittestany}
-
-Renvoie le résultat de [disjonction logique](https://en.wikipedia.org/wiki/Logical_disjunction) (Ou opérateur) de tous les bits à des positions données. Le compte à rebours commence à partir de 0 de la droite vers la gauche.
-
-La disjonction pour les opérations binaires:
-
-0 OR 0 = 0
-
-0 OR 1 = 1
-
-1 OR 0 = 1
-
-1 OR 1 = 1
-
-**Syntaxe**
-
-``` sql
-SELECT bitTestAny(number, index1, index2, index3, index4, ...)
-```
-
-**Paramètre**
-
--   `number` – integer number.
--   `index1`, `index2`, `index3`, `index4` – positions of bit.
-
-**Valeurs renvoyées**
-
-Renvoie le résultat de la disjuction logique.
-
-Type: `UInt8`.
-
-**Exemple**
-
-Par exemple, le nombre 43 dans le système numérique de base-2 (binaire) est 101011.
-
-Requête:
-
-``` sql
-SELECT bitTestAny(43, 0, 2)
-```
-
-Résultat:
-
-``` text
-┌─bitTestAny(43, 0, 2)─┐
-│                    1 │
-└──────────────────────┘
-```
-
-Un autre exemple:
-
-Requête:
-
-``` sql
-SELECT bitTestAny(43, 4, 2)
-```
-
-Résultat:
-
-``` text
-┌─bitTestAny(43, 4, 2)─┐
-│                    0 │
-└──────────────────────┘
-```
-
-## bitCount {#bitcount}
-
-Calcule le nombre de bits mis à un dans la représentation binaire d'un nombre.
-
-**Syntaxe**
-
-``` sql
-bitCount(x)
-```
-
-**Paramètre**
-
--   `x` — [Entier](../../sql-reference/data-types/int-uint.md) ou [virgule flottante](../../sql-reference/data-types/float.md) nombre. La fonction utilise la représentation de la valeur en mémoire. Il permet de financer les nombres à virgule flottante.
-
-**Valeur renvoyée**
-
--   Nombre de bits défini sur un dans le numéro d'entrée.
-
-La fonction ne convertit pas la valeur d'entrée en un type plus grand ([l'extension du signe](https://en.wikipedia.org/wiki/Sign_extension)). Ainsi, par exemple, `bitCount(toUInt8(-1)) = 8`.
-
-Type: `UInt8`.
-
-**Exemple**
-
-Prenez par exemple le numéro 333. Sa représentation binaire: 0000000101001101.
-
-Requête:
-
-``` sql
-SELECT bitCount(333)
-```
-
-Résultat:
-
-``` text
-┌─bitCount(333)─┐
-│             5 │
-└───────────────┘
-```
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/functions/bit_functions/) <!--hide-->
diff --git a/docs/fr/sql-reference/functions/bitmap-functions.md b/docs/fr/sql-reference/functions/bitmap-functions.md
deleted file mode 100644
index 15cb68ffc52..00000000000
--- a/docs/fr/sql-reference/functions/bitmap-functions.md
+++ /dev/null
@@ -1,496 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 49
-toc_title: Bitmap
----
-
-# Fonctions De Bitmap {#bitmap-functions}
-
-Les fonctions Bitmap fonctionnent pour le calcul de la valeur de L'objet de deux bitmaps, il s'agit de renvoyer un nouveau bitmap ou une cardinalité tout en utilisant le calcul de la formule, tel que and, or, xor, and not, etc.
-
-Il existe 2 types de méthodes de construction pour L'objet Bitmap. L'un doit être construit par la fonction d'agrégation groupBitmap avec-State, l'autre doit être construit par L'objet Array. Il est également de convertir L'objet Bitmap en objet tableau.
-
-RoaringBitmap est enveloppé dans une structure de données pendant le stockage réel des objets Bitmap. Lorsque la cardinalité est inférieure ou égale à 32, elle utilise Set objet. Lorsque la cardinalité est supérieure à 32, elle utilise l'objet RoaringBitmap. C'est pourquoi le stockage de faible cardinalité jeu est plus rapide.
-
-Pour plus d'informations sur RoaringBitmap, voir: [CRoaring](https://github.com/RoaringBitmap/CRoaring).
-
-## bitmapBuild {#bitmap_functions-bitmapbuild}
-
-Construire un bitmap à partir d'un tableau entier non signé.
-
-``` sql
-bitmapBuild(array)
-```
-
-**Paramètre**
-
--   `array` – unsigned integer array.
-
-**Exemple**
-
-``` sql
-SELECT bitmapBuild([1, 2, 3, 4, 5]) AS res, toTypeName(res)
-```
-
-``` text
-┌─res─┬─toTypeName(bitmapBuild([1, 2, 3, 4, 5]))─────┐
-│ 
    │ AggregateFunction(groupBitmap, UInt8)    │
-└─────┴──────────────────────────────────────────────┘
-```
-
-## bitmapToArray {#bitmaptoarray}
-
-Convertir bitmap en tableau entier.
-
-``` sql
-bitmapToArray(bitmap)
-```
-
-**Paramètre**
-
--   `bitmap` – bitmap object.
-
-**Exemple**
-
-``` sql
-SELECT bitmapToArray(bitmapBuild([1, 2, 3, 4, 5])) AS res
-```
-
-``` text
-┌─res─────────┐
-│ [1,2,3,4,5] │
-└─────────────┘
-```
-
-## bitmapSubsetInRange {#bitmap-functions-bitmapsubsetinrange}
-
-Retourne le sous-ensemble dans la plage spécifiée (n'inclut pas le range_end).
-
-``` sql
-bitmapSubsetInRange(bitmap, range_start, range_end)
-```
-
-**Paramètre**
-
--   `bitmap` – [Objet Bitmap](#bitmap_functions-bitmapbuild).
--   `range_start` – range start point. Type: [UInt32](../../sql-reference/data-types/int-uint.md).
--   `range_end` – range end point(excluded). Type: [UInt32](../../sql-reference/data-types/int-uint.md).
-
-**Exemple**
-
-``` sql
-SELECT bitmapToArray(bitmapSubsetInRange(bitmapBuild([0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,100,200,500]), toUInt32(30), toUInt32(200))) AS res
-```
-
-``` text
-┌─res───────────────┐
-│ [30,31,32,33,100] │
-└───────────────────┘
-```
-
-## bitmapSubsetLimit {#bitmapsubsetlimit}
-
-Crée un sous-ensemble de bitmap avec n éléments pris entre `range_start` et `cardinality_limit`.
-
-**Syntaxe**
-
-``` sql
-bitmapSubsetLimit(bitmap, range_start, cardinality_limit)
-```
-
-**Paramètre**
-
--   `bitmap` – [Objet Bitmap](#bitmap_functions-bitmapbuild).
--   `range_start` – The subset starting point. Type: [UInt32](../../sql-reference/data-types/int-uint.md).
--   `cardinality_limit` – The subset cardinality upper limit. Type: [UInt32](../../sql-reference/data-types/int-uint.md).
-
-**Valeur renvoyée**
-
-Ensemble.
-
-Type: `Bitmap object`.
-
-**Exemple**
-
-Requête:
-
-``` sql
-SELECT bitmapToArray(bitmapSubsetLimit(bitmapBuild([0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,100,200,500]), toUInt32(30), toUInt32(200))) AS res
-```
-
-Résultat:
-
-``` text
-┌─res───────────────────────┐
-│ [30,31,32,33,100,200,500] │
-└───────────────────────────┘
-```
-
-## bitmapContains {#bitmap_functions-bitmapcontains}
-
-Vérifie si le bitmap contient un élément.
-
-``` sql
-bitmapContains(haystack, needle)
-```
-
-**Paramètre**
-
--   `haystack` – [Objet Bitmap](#bitmap_functions-bitmapbuild) où la fonction recherche.
--   `needle` – Value that the function searches. Type: [UInt32](../../sql-reference/data-types/int-uint.md).
-
-**Valeurs renvoyées**
-
--   0 — If `haystack` ne contient pas de `needle`.
--   1 — If `haystack` contenir `needle`.
-
-Type: `UInt8`.
-
-**Exemple**
-
-``` sql
-SELECT bitmapContains(bitmapBuild([1,5,7,9]), toUInt32(9)) AS res
-```
-
-``` text
-┌─res─┐
-│  1  │
-└─────┘
-```
-
-## bitmapHasAny {#bitmaphasany}
-
-Vérifie si deux bitmaps ont une intersection par certains éléments.
-
-``` sql
-bitmapHasAny(bitmap1, bitmap2)
-```
-
-Si vous êtes sûr que `bitmap2` contient strictement un élément, envisagez d'utiliser le [bitmapContains](#bitmap_functions-bitmapcontains) fonction. Cela fonctionne plus efficacement.
-
-**Paramètre**
-
--   `bitmap*` – bitmap object.
-
-**Les valeurs de retour**
-
--   `1`, si `bitmap1` et `bitmap2` avoir un élément similaire au moins.
--   `0`, autrement.
-
-**Exemple**
-
-``` sql
-SELECT bitmapHasAny(bitmapBuild([1,2,3]),bitmapBuild([3,4,5])) AS res
-```
-
-``` text
-┌─res─┐
-│  1  │
-└─────┘
-```
-
-## bitmapHasAll {#bitmaphasall}
-
-Analogue à `hasAll(array, array)` renvoie 1 si le premier bitmap contient tous les éléments du second, 0 sinon.
-Si le deuxième argument est un bitmap vide, alors renvoie 1.
-
-``` sql
-bitmapHasAll(bitmap,bitmap)
-```
-
-**Paramètre**
-
--   `bitmap` – bitmap object.
-
-**Exemple**
-
-``` sql
-SELECT bitmapHasAll(bitmapBuild([1,2,3]),bitmapBuild([3,4,5])) AS res
-```
-
-``` text
-┌─res─┐
-│  0  │
-└─────┘
-```
-
-## bitmapCardinality {#bitmapcardinality}
-
-Retrun bitmap cardinalité de type UInt64.
-
-``` sql
-bitmapCardinality(bitmap)
-```
-
-**Paramètre**
-
--   `bitmap` – bitmap object.
-
-**Exemple**
-
-``` sql
-SELECT bitmapCardinality(bitmapBuild([1, 2, 3, 4, 5])) AS res
-```
-
-``` text
-┌─res─┐
-│   5 │
-└─────┘
-```
-
-## bitmapMin {#bitmapmin}
-
-Retrun la plus petite valeur de type UInt64 dans l'ensemble, UINT32_MAX si l'ensemble est vide.
-
-    bitmapMin(bitmap)
-
-**Paramètre**
-
--   `bitmap` – bitmap object.
-
-**Exemple**
-
-``` sql
-SELECT bitmapMin(bitmapBuild([1, 2, 3, 4, 5])) AS res
-```
-
-    ┌─res─┐
-    │   1 │
-    └─────┘
-
-## bitmapMax {#bitmapmax}
-
-Retrun la plus grande valeur de type UInt64 dans l'ensemble, 0 si l'ensemble est vide.
-
-    bitmapMax(bitmap)
-
-**Paramètre**
-
--   `bitmap` – bitmap object.
-
-**Exemple**
-
-``` sql
-SELECT bitmapMax(bitmapBuild([1, 2, 3, 4, 5])) AS res
-```
-
-    ┌─res─┐
-    │   5 │
-    └─────┘
-
-## bitmapTransform {#bitmaptransform}
-
-Transformer un tableau de valeurs d'une image à l'autre tableau de valeurs, le résultat est une nouvelle image.
-
-    bitmapTransform(bitmap, from_array, to_array)
-
-**Paramètre**
-
--   `bitmap` – bitmap object.
--   `from_array` – UInt32 array. For idx in range \[0, from_array.size()), if bitmap contains from_array\[idx\], then replace it with to_array\[idx\]. Note that the result depends on array ordering if there are common elements between from_array and to_array.
--   `to_array` – UInt32 array, its size shall be the same to from_array.
-
-**Exemple**
-
-``` sql
-SELECT bitmapToArray(bitmapTransform(bitmapBuild([1, 2, 3, 4, 5, 6, 7, 8, 9, 10]), cast([5,999,2] as Array(UInt32)), cast([2,888,20] as Array(UInt32)))) AS res
-```
-
-    ┌─res───────────────────┐
-    │ [1,3,4,6,7,8,9,10,20] │
-    └───────────────────────┘
-
-## bitmapAnd {#bitmapand}
-
-Deux bitmap et calcul, le résultat est un nouveau bitmap.
-
-``` sql
-bitmapAnd(bitmap,bitmap)
-```
-
-**Paramètre**
-
--   `bitmap` – bitmap object.
-
-**Exemple**
-
-``` sql
-SELECT bitmapToArray(bitmapAnd(bitmapBuild([1,2,3]),bitmapBuild([3,4,5]))) AS res
-```
-
-``` text
-┌─res─┐
-│ [3] │
-└─────┘
-```
-
-## bitmapOr {#bitmapor}
-
-Deux bitmap ou calcul, le résultat est un nouveau bitmap.
-
-``` sql
-bitmapOr(bitmap,bitmap)
-```
-
-**Paramètre**
-
--   `bitmap` – bitmap object.
-
-**Exemple**
-
-``` sql
-SELECT bitmapToArray(bitmapOr(bitmapBuild([1,2,3]),bitmapBuild([3,4,5]))) AS res
-```
-
-``` text
-┌─res─────────┐
-│ [1,2,3,4,5] │
-└─────────────┘
-```
-
-## bitmapXor {#bitmapxor}
-
-Deux bitmap xor calcul, le résultat est une nouvelle image.
-
-``` sql
-bitmapXor(bitmap,bitmap)
-```
-
-**Paramètre**
-
--   `bitmap` – bitmap object.
-
-**Exemple**
-
-``` sql
-SELECT bitmapToArray(bitmapXor(bitmapBuild([1,2,3]),bitmapBuild([3,4,5]))) AS res
-```
-
-``` text
-┌─res───────┐
-│ [1,2,4,5] │
-└───────────┘
-```
-
-## bitmapetnot {#bitmapandnot}
-
-Deux Bitmap andnot calcul, le résultat est un nouveau bitmap.
-
-``` sql
-bitmapAndnot(bitmap,bitmap)
-```
-
-**Paramètre**
-
--   `bitmap` – bitmap object.
-
-**Exemple**
-
-``` sql
-SELECT bitmapToArray(bitmapAndnot(bitmapBuild([1,2,3]),bitmapBuild([3,4,5]))) AS res
-```
-
-``` text
-┌─res───┐
-│ [1,2] │
-└───────┘
-```
-
-## bitmapetcardinalité {#bitmapandcardinality}
-
-Deux bitmap et calcul, retour cardinalité de type UInt64.
-
-``` sql
-bitmapAndCardinality(bitmap,bitmap)
-```
-
-**Paramètre**
-
--   `bitmap` – bitmap object.
-
-**Exemple**
-
-``` sql
-SELECT bitmapAndCardinality(bitmapBuild([1,2,3]),bitmapBuild([3,4,5])) AS res;
-```
-
-``` text
-┌─res─┐
-│   1 │
-└─────┘
-```
-
-## bitmapOrCardinality {#bitmaporcardinality}
-
-Deux bitmap ou calcul, retour cardinalité de type UInt64.
-
-``` sql
-bitmapOrCardinality(bitmap,bitmap)
-```
-
-**Paramètre**
-
--   `bitmap` – bitmap object.
-
-**Exemple**
-
-``` sql
-SELECT bitmapOrCardinality(bitmapBuild([1,2,3]),bitmapBuild([3,4,5])) AS res;
-```
-
-``` text
-┌─res─┐
-│   5 │
-└─────┘
-```
-
-## bitmapXorCardinality {#bitmapxorcardinality}
-
-Deux bitmap XOR calcul, retour cardinalité de type UInt64.
-
-``` sql
-bitmapXorCardinality(bitmap,bitmap)
-```
-
-**Paramètre**
-
--   `bitmap` – bitmap object.
-
-**Exemple**
-
-``` sql
-SELECT bitmapXorCardinality(bitmapBuild([1,2,3]),bitmapBuild([3,4,5])) AS res;
-```
-
-``` text
-┌─res─┐
-│   4 │
-└─────┘
-```
-
-## bitmapetnotcardinality {#bitmapandnotcardinality}
-
-Deux bitmap andnot calcul, retour cardinalité de type UInt64.
-
-``` sql
-bitmapAndnotCardinality(bitmap,bitmap)
-```
-
-**Paramètre**
-
--   `bitmap` – bitmap object.
-
-**Exemple**
-
-``` sql
-SELECT bitmapAndnotCardinality(bitmapBuild([1,2,3]),bitmapBuild([3,4,5])) AS res;
-```
-
-``` text
-┌─res─┐
-│   2 │
-└─────┘
-```
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/functions/bitmap_functions/) <!--hide-->
diff --git a/docs/fr/sql-reference/functions/comparison-functions.md b/docs/fr/sql-reference/functions/comparison-functions.md
deleted file mode 100644
index a5008c676fa..00000000000
--- a/docs/fr/sql-reference/functions/comparison-functions.md
+++ /dev/null
@@ -1,37 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 36
-toc_title: Comparaison
----
-
-# Fonctions De Comparaison {#comparison-functions}
-
-Les fonctions de comparaison renvoient toujours 0 ou 1 (Uint8).
-
-Les types suivants peuvent être comparés:
-
--   nombre
--   cordes et cordes fixes
--   date
--   dates avec heures
-
-au sein de chaque groupe, mais pas entre différents groupes.
-
-Par exemple, vous ne pouvez pas comparer une date avec une chaîne. Vous devez utiliser une fonction pour convertir la chaîne en une date, ou vice versa.
-
-Les chaînes sont comparées par octets. Une courte chaîne est plus petite que toutes les chaînes qui commencent par elle et qui contiennent au moins un caractère de plus.
-
-## égal, A = B et a = = b opérateur {#function-equals}
-
-## notEquals, a ! opérateur= b et a \<\> b {#function-notequals}
-
-## moins, opérateur \<  {#function-less}
-
-## de plus, \> opérateur {#function-greater}
-
-## lessOrEquals, \< = opérateur {#function-lessorequals}
-
-## greaterOrEquals, \> = opérateur {#function-greaterorequals}
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/functions/comparison_functions/) <!--hide-->
diff --git a/docs/fr/sql-reference/functions/conditional-functions.md b/docs/fr/sql-reference/functions/conditional-functions.md
deleted file mode 100644
index 3912b49aa6a..00000000000
--- a/docs/fr/sql-reference/functions/conditional-functions.md
+++ /dev/null
@@ -1,207 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 43
-toc_title: 'Conditionnel '
----
-
-# Fonctions Conditionnelles {#conditional-functions}
-
-## si {#if}
-
-Contrôle la ramification conditionnelle. Contrairement à la plupart des systèmes, ClickHouse évalue toujours les deux expressions `then` et `else`.
-
-**Syntaxe**
-
-``` sql
-SELECT if(cond, then, else)
-```
-
-Si la condition `cond` renvoie une valeur non nulle, retourne le résultat de l'expression `then` et le résultat de l'expression `else`, si présent, est ignoré. Si l' `cond` est égal à zéro ou `NULL` alors le résultat de la `then` l'expression est ignorée et le résultat de `else` expression, si elle est présente, est renvoyée.
-
-**Paramètre**
-
--   `cond` – The condition for evaluation that can be zero or not. The type is UInt8, Nullable(UInt8) or NULL.
--   `then` - L'expression à renvoyer si la condition est remplie.
--   `else` - L'expression à renvoyer si la condition n'est pas remplie.
-
-**Valeurs renvoyées**
-
-La fonction s'exécute `then` et `else` expressions et retourne son résultat, selon que la condition `cond` fini par être zéro ou pas.
-
-**Exemple**
-
-Requête:
-
-``` sql
-SELECT if(1, plus(2, 2), plus(2, 6))
-```
-
-Résultat:
-
-``` text
-┌─plus(2, 2)─┐
-│          4 │
-└────────────┘
-```
-
-Requête:
-
-``` sql
-SELECT if(0, plus(2, 2), plus(2, 6))
-```
-
-Résultat:
-
-``` text
-┌─plus(2, 6)─┐
-│          8 │
-└────────────┘
-```
-
--   `then` et `else` doit avoir le type commun le plus bas.
-
-**Exemple:**
-
-Prendre cette `LEFT_RIGHT` table:
-
-``` sql
-SELECT *
-FROM LEFT_RIGHT
-
-┌─left─┬─right─┐
-│ ᴺᵁᴸᴸ │     4 │
-│    1 │     3 │
-│    2 │     2 │
-│    3 │     1 │
-│    4 │  ᴺᵁᴸᴸ │
-└──────┴───────┘
-```
-
-La requête suivante compare `left` et `right` valeur:
-
-``` sql
-SELECT
-    left,
-    right,
-    if(left < right, 'left is smaller than right', 'right is greater or equal than left') AS is_smaller
-FROM LEFT_RIGHT
-WHERE isNotNull(left) AND isNotNull(right)
-
-┌─left─┬─right─┬─is_smaller──────────────────────────┐
-│    1 │     3 │ left is smaller than right          │
-│    2 │     2 │ right is greater or equal than left │
-│    3 │     1 │ right is greater or equal than left │
-└──────┴───────┴─────────────────────────────────────┘
-```
-
-Note: `NULL` les valeurs ne sont pas utilisés dans cet exemple, vérifier [Valeurs nulles dans les conditions](#null-values-in-conditionals) section.
-
-## Opérateur Ternaire {#ternary-operator}
-
-Il fonctionne même comme `if` fonction.
-
-Syntaxe: `cond ? then : else`
-
-Retourner `then` si l' `cond` renvoie la valeur vrai (supérieur à zéro), sinon renvoie `else`.
-
--   `cond` doit être de type de `UInt8`, et `then` et `else` doit avoir le type commun le plus bas.
-
--   `then` et `else` peut être `NULL`
-
-**Voir aussi**
-
--   [ifNotFinite](other-functions.md#ifnotfinite).
-
-## multiIf {#multiif}
-
-Permet d'écrire le [CASE](../operators/index.md#operator_case) opérateur plus compacte dans la requête.
-
-Syntaxe: `multiIf(cond_1, then_1, cond_2, then_2, ..., else)`
-
-**Paramètre:**
-
--   `cond_N` — The condition for the function to return `then_N`.
--   `then_N` — The result of the function when executed.
--   `else` — The result of the function if none of the conditions is met.
-
-La fonction accepte `2N+1` paramètre.
-
-**Valeurs renvoyées**
-
-La fonction renvoie l'une des valeurs `then_N` ou `else` selon les conditions `cond_N`.
-
-**Exemple**
-
-En utilisant à nouveau `LEFT_RIGHT` table.
-
-``` sql
-SELECT
-    left,
-    right,
-    multiIf(left < right, 'left is smaller', left > right, 'left is greater', left = right, 'Both equal', 'Null value') AS result
-FROM LEFT_RIGHT
-
-┌─left─┬─right─┬─result──────────┐
-│ ᴺᵁᴸᴸ │     4 │ Null value      │
-│    1 │     3 │ left is smaller │
-│    2 │     2 │ Both equal      │
-│    3 │     1 │ left is greater │
-│    4 │  ᴺᵁᴸᴸ │ Null value      │
-└──────┴───────┴─────────────────┘
-```
-
-## Utilisation Directe Des Résultats Conditionnels {#using-conditional-results-directly}
-
-Les conditions entraînent toujours `0`, `1` ou `NULL`. Vous pouvez donc utiliser des résultats conditionnels directement comme ceci:
-
-``` sql
-SELECT left < right AS is_small
-FROM LEFT_RIGHT
-
-┌─is_small─┐
-│     ᴺᵁᴸᴸ │
-│        1 │
-│        0 │
-│        0 │
-│     ᴺᵁᴸᴸ │
-└──────────┘
-```
-
-## Valeurs nulles dans les conditions {#null-values-in-conditionals}
-
-Lorsque `NULL` les valeurs sont impliqués dans des conditions, le résultat sera également `NULL`.
-
-``` sql
-SELECT
-    NULL < 1,
-    2 < NULL,
-    NULL < NULL,
-    NULL = NULL
-
-┌─less(NULL, 1)─┬─less(2, NULL)─┬─less(NULL, NULL)─┬─equals(NULL, NULL)─┐
-│ ᴺᵁᴸᴸ          │ ᴺᵁᴸᴸ          │ ᴺᵁᴸᴸ             │ ᴺᵁᴸᴸ               │
-└───────────────┴───────────────┴──────────────────┴────────────────────┘
-```
-
-Donc, vous devriez construire vos requêtes avec soin si les types sont `Nullable`.
-
-L'exemple suivant le démontre en omettant d'ajouter la condition égale à `multiIf`.
-
-``` sql
-SELECT
-    left,
-    right,
-    multiIf(left < right, 'left is smaller', left > right, 'right is smaller', 'Both equal') AS faulty_result
-FROM LEFT_RIGHT
-
-┌─left─┬─right─┬─faulty_result────┐
-│ ᴺᵁᴸᴸ │     4 │ Both equal       │
-│    1 │     3 │ left is smaller  │
-│    2 │     2 │ Both equal       │
-│    3 │     1 │ right is smaller │
-│    4 │  ᴺᵁᴸᴸ │ Both equal       │
-└──────┴───────┴──────────────────┘
-```
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/functions/conditional_functions/) <!--hide-->
diff --git a/docs/fr/sql-reference/functions/date-time-functions.md b/docs/fr/sql-reference/functions/date-time-functions.md
deleted file mode 100644
index d1c16b42d07..00000000000
--- a/docs/fr/sql-reference/functions/date-time-functions.md
+++ /dev/null
@@ -1,450 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 39
-toc_title: Travailler avec les Dates et les heures
----
-
-# Fonctions pour travailler avec des Dates et des heures {#functions-for-working-with-dates-and-times}
-
-Support des fuseaux horaires
-
-Toutes les fonctions pour travailler avec la date et l'heure qui ont une logique d'utilisation pour le fuseau horaire peut accepter un second fuseau horaire argument. Exemple: Asie / Ekaterinbourg. Dans ce cas, ils utilisent le fuseau horaire spécifié au lieu du fuseau horaire local (par défaut).
-
-``` sql
-SELECT
-    toDateTime('2016-06-15 23:00:00') AS time,
-    toDate(time) AS date_local,
-    toDate(time, 'Asia/Yekaterinburg') AS date_yekat,
-    toString(time, 'US/Samoa') AS time_samoa
-```
-
-``` text
-┌────────────────time─┬─date_local─┬─date_yekat─┬─time_samoa──────────┐
-│ 2016-06-15 23:00:00 │ 2016-06-15 │ 2016-06-16 │ 2016-06-15 09:00:00 │
-└─────────────────────┴────────────┴────────────┴─────────────────────┘
-```
-
-Seuls les fuseaux horaires qui diffèrent de L'UTC par un nombre entier d'heures sont pris en charge.
-
-## toTimeZone {#totimezone}
-
-Convertir l'heure ou la date et de l'heure au fuseau horaire spécifié.
-
-## toYear {#toyear}
-
-Convertit une date ou une date avec l'heure en un numéro UInt16 contenant le numéro d'année (AD).
-
-## toQuarter {#toquarter}
-
-Convertit une date ou une date avec l'heure en un numéro UInt8 contenant le numéro de trimestre.
-
-## toMonth {#tomonth}
-
-Convertit une date ou une date avec l'heure en un numéro UInt8 contenant le numéro de mois (1-12).
-
-## toDayOfYear {#todayofyear}
-
-Convertit une date ou une date avec l'heure en un numéro UInt16 contenant le numéro du jour de l'année (1-366).
-
-## toDayOfMonth {#todayofmonth}
-
-Convertit une date ou une date avec le temps à un UInt8 contenant le numéro du jour du mois (1-31).
-
-## toDayOfWeek {#todayofweek}
-
-Convertit une date ou une date avec l'heure en un numéro UInt8 contenant le numéro du jour de la semaine (lundi est 1, et dimanche est 7).
-
-## toHour {#tohour}
-
-Convertit une date avec l'heure en un nombre UInt8 contenant le numéro de l'heure dans l'Heure de 24 heures (0-23).
-This function assumes that if clocks are moved ahead, it is by one hour and occurs at 2 a.m., and if clocks are moved back, it is by one hour and occurs at 3 a.m. (which is not always true – even in Moscow the clocks were twice changed at a different time).
-
-## toMinute {#tominute}
-
-Convertit une date avec l'heure en un numéro UInt8 contenant le numéro de la minute de l'heure (0-59).
-
-## toseconde {#tosecond}
-
-Convertit une date avec l'heure en un nombre UInt8 contenant le numéro de la seconde dans la minute (0-59).
-Les secondes intercalaires ne sont pas comptabilisés.
-
-## toUnixTimestamp {#to-unix-timestamp}
-
-Pour L'argument DateTime: convertit la valeur en sa représentation numérique interne (horodatage Unix).
-For String argument: analyse datetime from string en fonction du fuseau horaire (second argument optionnel, le fuseau horaire du serveur est utilisé par défaut) et renvoie l'horodatage unix correspondant.
-Pour L'argument Date: le comportement n'est pas spécifié.
-
-**Syntaxe**
-
-``` sql
-toUnixTimestamp(datetime)
-toUnixTimestamp(str, [timezone])
-```
-
-**Valeur renvoyée**
-
--   Renvoie l'horodatage unix.
-
-Type: `UInt32`.
-
-**Exemple**
-
-Requête:
-
-``` sql
-SELECT toUnixTimestamp('2017-11-05 08:07:47', 'Asia/Tokyo') AS unix_timestamp
-```
-
-Résultat:
-
-``` text
-┌─unix_timestamp─┐
-│     1509836867 │
-└────────────────┘
-```
-
-## toStartOfYear {#tostartofyear}
-
-Arrondit une date ou une date avec l'heure jusqu'au premier jour de l'année.
-Renvoie la date.
-
-## toStartOfISOYear {#tostartofisoyear}
-
-Arrondit une date ou une date avec l'heure jusqu'au premier jour de L'année ISO.
-Renvoie la date.
-
-## toStartOfQuarter {#tostartofquarter}
-
-Arrondit une date ou une date avec l'heure jusqu'au premier jour du trimestre.
-Le premier jour du trimestre, soit le 1er janvier, 1er avril, 1er juillet ou 1er octobre.
-Renvoie la date.
-
-## toStartOfMonth {#tostartofmonth}
-
-Arrondit une date ou une date avec l'heure jusqu'au premier jour du mois.
-Renvoie la date.
-
-!!! attention "Attention"
-    Le comportement de l'analyse des dates incorrectes est spécifique à l'implémentation. ClickHouse peut renvoyer la date zéro, lancer une exception ou faire “natural” débordement.
-
-## toMonday {#tomonday}
-
-Arrondit une date ou une date avec l'heure au lundi le plus proche.
-Renvoie la date.
-
-## toStartOfWeek (t \[, mode\]) {#tostartofweektmode}
-
-Arrondit une date ou une date avec l'heure au dimanche ou au lundi le plus proche par mode.
-Renvoie la date.
-L'argument mode fonctionne exactement comme l'argument mode de toWeek(). Pour la syntaxe à argument unique, une valeur de mode de 0 est utilisée.
-
-## toStartOfDay {#tostartofday}
-
-Arrondit une date avec le temps au début de la journée.
-
-## toStartOfHour {#tostartofhour}
-
-Arrondit une date avec le temps au début de l " heure.
-
-## toStartOfMinute {#tostartofminute}
-
-Arrondit une date avec le temps au début de la minute.
-
-## toStartOfFiveMinute {#tostartoffiveminute}
-
-Arrondit à une date avec l'heure de début de l'intervalle de cinq minutes.
-
-## toStartOfTenMinutes {#tostartoftenminutes}
-
-Arrondit une date avec le temps au début de l " intervalle de dix minutes.
-
-## toStartOfFifteenMinutes {#tostartoffifteenminutes}
-
-Arrondit la date avec le temps jusqu'au début de l'intervalle de quinze minutes.
-
-## toStartOfInterval(time_or_data, intervalle x Unité \[, time_zone\]) {#tostartofintervaltime-or-data-interval-x-unit-time-zone}
-
-Ceci est une généralisation d'autres fonctions nommées `toStartOf*`. Exemple,
-`toStartOfInterval(t, INTERVAL 1 year)` renvoie la même chose que `toStartOfYear(t)`,
-`toStartOfInterval(t, INTERVAL 1 month)` renvoie la même chose que `toStartOfMonth(t)`,
-`toStartOfInterval(t, INTERVAL 1 day)` renvoie la même chose que `toStartOfDay(t)`,
-`toStartOfInterval(t, INTERVAL 15 minute)` renvoie la même chose que `toStartOfFifteenMinutes(t)` etc.
-
-## toTime {#totime}
-
-Convertit une date avec l'heure en une certaine date fixe, tout en préservant l'heure.
-
-## toRelativeYearNum {#torelativeyearnum}
-
-Convertit une date avec l'heure ou la date, le numéro de l'année, à partir d'un certain point fixe dans le passé.
-
-## toRelativeQuarterNum {#torelativequarternum}
-
-Convertit une date avec l'heure ou la date au numéro du trimestre, à partir d'un certain point fixe dans le passé.
-
-## toRelativeMonthNum {#torelativemonthnum}
-
-Convertit une date avec l'heure ou la date au numéro du mois, à partir d'un certain point fixe dans le passé.
-
-## toRelativeWeekNum {#torelativeweeknum}
-
-Convertit une date avec l'heure ou la date, le numéro de la semaine, à partir d'un certain point fixe dans le passé.
-
-## toRelativeDayNum {#torelativedaynum}
-
-Convertit une date avec l'heure ou la date au numéro du jour, à partir d'un certain point fixe dans le passé.
-
-## toRelativeHourNum {#torelativehournum}
-
-Convertit une date avec l'heure ou la date au nombre de l'heure, à partir d'un certain point fixe dans le passé.
-
-## toRelativeMinuteNum {#torelativeminutenum}
-
-Convertit une date avec l'heure ou la date au numéro de la minute, à partir d'un certain point fixe dans le passé.
-
-## toRelativeSecondNum {#torelativesecondnum}
-
-Convertit une date avec l'heure ou la date au numéro de la seconde, à partir d'un certain point fixe dans le passé.
-
-## toISOYear {#toisoyear}
-
-Convertit une date ou une date avec l'heure en un numéro UInt16 contenant le numéro D'année ISO.
-
-## toISOWeek {#toisoweek}
-
-Convertit une date ou une date avec l'heure en un numéro UInt8 contenant le numéro de semaine ISO.
-
-## toWeek (date \[, mode\]) {#toweekdatemode}
-
-Cette fonction renvoie le numéro de semaine pour date ou datetime. La forme à deux arguments de toWeek() vous permet de spécifier si la semaine commence le dimanche ou le lundi et si la valeur de retour doit être comprise entre 0 et 53 ou entre 1 et 53. Si l'argument mode est omis, le mode par défaut est 0.
-`toISOWeek()`est une fonction de compatibilité équivalente à `toWeek(date,3)`.
-Le tableau suivant décrit le fonctionnement de l'argument mode.
-
-| Mode | Premier jour de la semaine | Gamme | Week 1 is the first week …       |
-|------|----------------------------|-------|----------------------------------|
-| 0    | Dimanche                   | 0-53  | avec un dimanche cette année     |
-| 1    | Lundi                      | 0-53  | avec 4 jours ou plus cette année |
-| 2    | Dimanche                   | 1-53  | avec un dimanche cette année     |
-| 3    | Lundi                      | 1-53  | avec 4 jours ou plus cette année |
-| 4    | Dimanche                   | 0-53  | avec 4 jours ou plus cette année |
-| 5    | Lundi                      | 0-53  | avec un lundi cette année        |
-| 6    | Dimanche                   | 1-53  | avec 4 jours ou plus cette année |
-| 7    | Lundi                      | 1-53  | avec un lundi cette année        |
-| 8    | Dimanche                   | 1-53  | contient Janvier 1               |
-| 9    | Lundi                      | 1-53  | contient Janvier 1               |
-
-Pour les valeurs de mode avec une signification de “with 4 or more days this year,” les semaines sont numérotées selon ISO 8601: 1988:
-
--   Si la semaine contenant Janvier 1 A 4 jours ou plus dans la nouvelle année, il est Semaine 1.
-
--   Sinon, c'est la dernière semaine de l'année précédente, et la semaine prochaine est la semaine 1.
-
-Pour les valeurs de mode avec une signification de “contains January 1”, la semaine contient Janvier 1 est Semaine 1. Peu importe combien de jours dans la nouvelle année la semaine contenait, même si elle contenait seulement un jour.
-
-``` sql
-toWeek(date, [, mode][, Timezone])
-```
-
-**Paramètre**
-
--   `date` – Date or DateTime.
--   `mode` – Optional parameter, Range of values is \[0,9\], default is 0.
--   `Timezone` – Optional parameter, it behaves like any other conversion function.
-
-**Exemple**
-
-``` sql
-SELECT toDate('2016-12-27') AS date, toWeek(date) AS week0, toWeek(date,1) AS week1, toWeek(date,9) AS week9;
-```
-
-``` text
-┌───────date─┬─week0─┬─week1─┬─week9─┐
-│ 2016-12-27 │    52 │    52 │     1 │
-└────────────┴───────┴───────┴───────┘
-```
-
-## toYearWeek (date \[, mode\]) {#toyearweekdatemode}
-
-Retourne l'année et la semaine pour une date. L'année dans le résultat peut être différente de l'année dans l'argument date pour la première et la dernière semaine de l'année.
-
-L'argument mode fonctionne exactement comme l'argument mode de toWeek(). Pour la syntaxe à argument unique, une valeur de mode de 0 est utilisée.
-
-`toISOYear()`est une fonction de compatibilité équivalente à `intDiv(toYearWeek(date,3),100)`.
-
-**Exemple**
-
-``` sql
-SELECT toDate('2016-12-27') AS date, toYearWeek(date) AS yearWeek0, toYearWeek(date,1) AS yearWeek1, toYearWeek(date,9) AS yearWeek9;
-```
-
-``` text
-┌───────date─┬─yearWeek0─┬─yearWeek1─┬─yearWeek9─┐
-│ 2016-12-27 │    201652 │    201652 │    201701 │
-└────────────┴───────────┴───────────┴───────────┘
-```
-
-## maintenant {#now}
-
-Accepte zéro argument et renvoie l'heure actuelle à l'un des moments de l'exécution de la requête.
-Cette fonction renvoie une constante, même si la requête a pris beaucoup de temps à compléter.
-
-## aujourd' {#today}
-
-Accepte zéro argument et renvoie la date actuelle à l'un des moments de l'exécution de la requête.
-Le même que ‘toDate(now())’.
-
-## hier {#yesterday}
-
-Accepte zéro argument et renvoie la date d'hier à l'un des moments de l'exécution de la requête.
-Le même que ‘today() - 1’.
-
-## l'horaire de diffusion {#timeslot}
-
-Arrondit le temps à la demi-heure.
-Cette fonction est spécifique à Yandex.Metrica, car une demi-heure est le temps minimum pour diviser une session en deux sessions si une balise de suivi affiche les pages vues consécutives d'un seul utilisateur qui diffèrent dans le temps de strictement plus que ce montant. Cela signifie que les tuples (l'ID de balise, l'ID utilisateur et l'intervalle de temps) peuvent être utilisés pour rechercher les pages vues incluses dans la session correspondante.
-
-## toYYYYMM {#toyyyymm}
-
-Convertit une date ou une date avec l'heure en un numéro UInt32 contenant le numéro d'année et de mois (AAAA \* 100 + MM).
-
-## toYYYYMMDD {#toyyyymmdd}
-
-Convertit une date ou une date avec l'heure en un numéro UInt32 contenant le numéro d'année et de mois (AAAA \* 10000 + MM \* 100 + JJ).
-
-## toYYYYMMDDhhmmss {#toyyyymmddhhmmss}
-
-Convertit une date ou une date avec l'heure en un numéro UInt64 contenant le numéro d'année et de mois (AAAA \* 10000000000 + MM \* 100000000 + DD \* 1000000 + hh \* 10000 + mm \* 100 + ss).
-
-## addYears, addMonths, addWeeks, addDays, addHours, addMinutes, addSeconds, addQuarters {#addyears-addmonths-addweeks-adddays-addhours-addminutes-addseconds-addquarters}
-
-Fonction ajoute une date / DateTime intervalle à une Date / DateTime, puis retourner la Date / DateTime. Exemple:
-
-``` sql
-WITH
-    toDate('2018-01-01') AS date,
-    toDateTime('2018-01-01 00:00:00') AS date_time
-SELECT
-    addYears(date, 1) AS add_years_with_date,
-    addYears(date_time, 1) AS add_years_with_date_time
-```
-
-``` text
-┌─add_years_with_date─┬─add_years_with_date_time─┐
-│          2019-01-01 │      2019-01-01 00:00:00 │
-└─────────────────────┴──────────────────────────┘
-```
-
-## subtractYears, subtractMonths, subtractWeeks, subtractDays, subtractHours, subtractMinutes, subtractSeconds, subtractQuarters {#subtractyears-subtractmonths-subtractweeks-subtractdays-subtracthours-subtractminutes-subtractseconds-subtractquarters}
-
-Fonction soustrayez un intervalle de Date / DateTime à une Date / DateTime, puis renvoyez la Date / DateTime. Exemple:
-
-``` sql
-WITH
-    toDate('2019-01-01') AS date,
-    toDateTime('2019-01-01 00:00:00') AS date_time
-SELECT
-    subtractYears(date, 1) AS subtract_years_with_date,
-    subtractYears(date_time, 1) AS subtract_years_with_date_time
-```
-
-``` text
-┌─subtract_years_with_date─┬─subtract_years_with_date_time─┐
-│               2018-01-01 │           2018-01-01 00:00:00 │
-└──────────────────────────┴───────────────────────────────┘
-```
-
-## dateDiff {#datediff}
-
-Renvoie la différence entre deux valeurs Date ou DateTime.
-
-**Syntaxe**
-
-``` sql
-dateDiff('unit', startdate, enddate, [timezone])
-```
-
-**Paramètre**
-
--   `unit` — Time unit, in which the returned value is expressed. [Chaîne](../syntax.md#syntax-string-literal).
-
-        Supported values:
-
-        | unit   |
-        | ---- |
-        |second  |
-        |minute  |
-        |hour    |
-        |day     |
-        |week    |
-        |month   |
-        |quarter |
-        |year    |
-
--   `startdate` — The first time value to compare. [Date](../../sql-reference/data-types/date.md) ou [DateTime](../../sql-reference/data-types/datetime.md).
-
--   `enddate` — The second time value to compare. [Date](../../sql-reference/data-types/date.md) ou [DateTime](../../sql-reference/data-types/datetime.md).
-
--   `timezone` — Optional parameter. If specified, it is applied to both `startdate` et `enddate`. Si non spécifié, fuseaux horaires de l' `startdate` et `enddate` sont utilisés. Si elles ne sont pas identiques, le résultat n'est pas spécifié.
-
-**Valeur renvoyée**
-
-Différence entre `startdate` et `enddate` exprimé en `unit`.
-
-Type: `int`.
-
-**Exemple**
-
-Requête:
-
-``` sql
-SELECT dateDiff('hour', toDateTime('2018-01-01 22:00:00'), toDateTime('2018-01-02 23:00:00'));
-```
-
-Résultat:
-
-``` text
-┌─dateDiff('hour', toDateTime('2018-01-01 22:00:00'), toDateTime('2018-01-02 23:00:00'))─┐
-│                                                                                     25 │
-└────────────────────────────────────────────────────────────────────────────────────────┘
-```
-
-## intervalle de temps (StartTime, Duration, \[, Size\]) {#timeslotsstarttime-duration-size}
-
-Pour un intervalle de temps commençant à ‘StartTime’ et de poursuivre pour ‘Duration’ secondes, il renvoie un tableau de moments dans le temps, composé de points de cet intervalle arrondis vers le bas à la ‘Size’ en quelques secondes. ‘Size’ est un paramètre optionnel: une constante UInt32, définie sur 1800 par défaut.
-Exemple, `timeSlots(toDateTime('2012-01-01 12:20:00'), 600) = [toDateTime('2012-01-01 12:00:00'), toDateTime('2012-01-01 12:30:00')]`.
-Ceci est nécessaire pour rechercher les pages vues dans la session correspondante.
-
-## formatDateTime(Heure, Format \[, fuseau horaire\]) {#formatdatetime}
-
-Function formats a Time according given Format string. N.B.: Format is a constant expression, e.g. you can not have multiple formats for single result column.
-
-Modificateurs pris en charge pour le Format:
-(“Example” colonne affiche le résultat de formatage pour le temps `2018-01-02 22:33:44`)
-
-| Modificateur | Description                                                            | Exemple    |
-|--------------|------------------------------------------------------------------------|------------|
-| %C           | année divisée par 100 et tronquée en entier (00-99)                    | 20         |
-| %d           | jour du mois, zero-rembourré (01-31)                                   | 02         |
-| %D           | Date courte MM / JJ / AA, équivalente à %m / % d / % y                 | 01/02/18   |
-| % e          | jour du mois, rembourré dans l'espace ( 1-31)                          | 2          |
-| %F           | date courte AAAA-MM-JJ, équivalente à % Y - % m - % d                  | 2018-01-02 |
-| %H           | heure en format 24h (00-23)                                            | 22         |
-| %I           | heure en format 12h (01-12)                                            | 10         |
-| %j           | les jours de l'année (001-366)                                         | 002        |
-| %m           | mois en nombre décimal (01-12)                                         | 01         |
-| %M           | minute (00-59)                                                         | 33         |
-| %et          | caractère de nouvelle ligne (")                                        |            |
-| %p           | Désignation AM ou PM                                                   | PM         |
-| %R           | 24 heures HH:MM temps, équivalent à %H: % M                            | 22:33      |
-| %S           | deuxième (00-59)                                                       | 44         |
-| % t          | horizontal-caractère de tabulation (')                                 |            |
-| %T           | Format d'heure ISO 8601 (HH:MM:SS), équivalent à %H: % M:%S            | 22:33:44   |
-| % u          | ISO 8601 jour de la semaine comme numéro avec Lundi comme 1 (1-7)      | 2          |
-| %V           | Numéro de semaine ISO 8601 (01-53)                                     | 01         |
-| %W           | jour de la semaine comme un nombre décimal avec dimanche comme 0 (0-6) | 2          |
-| % y          | Année, deux derniers chiffres (00-99)                                  | 18         |
-| %Y           | An                                                                     | 2018       |
-| %%           | signe                                                                  | %          |
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/functions/date_time_functions/) <!--hide-->
diff --git a/docs/fr/sql-reference/functions/encoding-functions.md b/docs/fr/sql-reference/functions/encoding-functions.md
deleted file mode 100644
index 6c99ed4f32e..00000000000
--- a/docs/fr/sql-reference/functions/encoding-functions.md
+++ /dev/null
@@ -1,175 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 52
-toc_title: Encodage
----
-
-# L'Encodage Des Fonctions {#encoding-functions}
-
-## char {#char}
-
-Retourne la chaîne avec la longueur que le nombre d'arguments passés et chaque octet a la valeur de l'argument correspondant. Accepte plusieurs arguments de types numériques. Si la valeur de l'argument est hors de portée du type de données UInt8, elle est convertie en UInt8 avec arrondi et débordement possibles.
-
-**Syntaxe**
-
-``` sql
-char(number_1, [number_2, ..., number_n]);
-```
-
-**Paramètre**
-
--   `number_1, number_2, ..., number_n` — Numerical arguments interpreted as integers. Types: [Int](../../sql-reference/data-types/int-uint.md), [Flottant](../../sql-reference/data-types/float.md).
-
-**Valeur renvoyée**
-
--   une chaîne d'octets.
-
-Type: `String`.
-
-**Exemple**
-
-Requête:
-
-``` sql
-SELECT char(104.1, 101, 108.9, 108.9, 111) AS hello
-```
-
-Résultat:
-
-``` text
-┌─hello─┐
-│ hello │
-└───────┘
-```
-
-Vous pouvez construire une chaîne de codage arbitraire en passant les octets correspondants. Voici un exemple pour UTF-8:
-
-Requête:
-
-``` sql
-SELECT char(0xD0, 0xBF, 0xD1, 0x80, 0xD0, 0xB8, 0xD0, 0xB2, 0xD0, 0xB5, 0xD1, 0x82) AS hello;
-```
-
-Résultat:
-
-``` text
-┌─hello──┐
-│ привет │
-└────────┘
-```
-
-Requête:
-
-``` sql
-SELECT char(0xE4, 0xBD, 0xA0, 0xE5, 0xA5, 0xBD) AS hello;
-```
-
-Résultat:
-
-``` text
-┌─hello─┐
-│ 你好  │
-└───────┘
-```
-
-## Hex {#hex}
-
-Renvoie une chaîne contenant la représentation hexadécimale de l'argument.
-
-**Syntaxe**
-
-``` sql
-hex(arg)
-```
-
-La fonction utilise des lettres majuscules `A-F` et ne pas utiliser de préfixes (comme `0x`) ou suffixes (comme `h`).
-
-Pour les arguments entiers, il imprime des chiffres hexadécimaux (“nibbles”) du plus significatif au moins significatif (big endian ou “human readable” ordre). Il commence par l'octet non nul le plus significatif (les octets de début zéro sont omis) mais imprime toujours les deux chiffres de chaque octet même si le chiffre de début est nul.
-
-Exemple:
-
-**Exemple**
-
-Requête:
-
-``` sql
-SELECT hex(1);
-```
-
-Résultat:
-
-``` text
-01
-```
-
-Les valeurs de type `Date` et `DateTime` sont formatés comme des entiers correspondants (le nombre de jours depuis Epoch pour Date et la valeur de L'horodatage Unix pour DateTime).
-
-Pour `String` et `FixedString`, tous les octets sont simplement codés en deux nombres hexadécimaux. Zéro octets ne sont pas omis.
-
-Les valeurs des types virgule flottante et décimale sont codées comme leur représentation en mémoire. Comme nous soutenons l'architecture little endian, ils sont codés dans little endian. Zéro octets de début / fin ne sont pas omis.
-
-**Paramètre**
-
--   `arg` — A value to convert to hexadecimal. Types: [Chaîne](../../sql-reference/data-types/string.md), [UInt](../../sql-reference/data-types/int-uint.md), [Flottant](../../sql-reference/data-types/float.md), [Décimal](../../sql-reference/data-types/decimal.md), [Date](../../sql-reference/data-types/date.md) ou [DateTime](../../sql-reference/data-types/datetime.md).
-
-**Valeur renvoyée**
-
--   Une chaîne avec la représentation hexadécimale de l'argument.
-
-Type: `String`.
-
-**Exemple**
-
-Requête:
-
-``` sql
-SELECT hex(toFloat32(number)) as hex_presentation FROM numbers(15, 2);
-```
-
-Résultat:
-
-``` text
-┌─hex_presentation─┐
-│ 00007041         │
-│ 00008041         │
-└──────────────────┘
-```
-
-Requête:
-
-``` sql
-SELECT hex(toFloat64(number)) as hex_presentation FROM numbers(15, 2);
-```
-
-Résultat:
-
-``` text
-┌─hex_presentation─┐
-│ 0000000000002E40 │
-│ 0000000000003040 │
-└──────────────────┘
-```
-
-## unhex (str) {#unhexstr}
-
-Accepte une chaîne contenant un nombre quelconque de chiffres hexadécimaux, et renvoie une chaîne contenant le correspondant octets. Prend en charge les lettres majuscules et minuscules A-F. Le nombre de chiffres hexadécimaux ne doit pas être pair. S'il est impair, le dernier chiffre est interprété comme la moitié la moins significative de l'octet 00-0F. Si la chaîne d'argument contient autre chose que des chiffres hexadécimaux, un résultat défini par l'implémentation est renvoyé (une exception n'est pas levée).
-Si vous voulez convertir le résultat en un nombre, vous pouvez utiliser le ‘reverse’ et ‘reinterpretAsType’ fonction.
-
-## UUIDStringToNum (str) {#uuidstringtonumstr}
-
-Accepte une chaîne contenant 36 caractères dans le format `123e4567-e89b-12d3-a456-426655440000`, et le renvoie comme un ensemble d'octets dans un FixedString (16).
-
-## UUIDNumToString (str) {#uuidnumtostringstr}
-
-Accepte une valeur FixedString (16). Renvoie une chaîne contenant 36 caractères au format texte.
-
-## bitmaskToList(num) {#bitmasktolistnum}
-
-Accepte un entier. Renvoie une chaîne contenant la liste des puissances de deux qui totalisent le nombre source lorsqu'il est additionné. Ils sont séparés par des virgules sans espaces au format texte, dans l'ordre croissant.
-
-## bitmaskToArray(num) {#bitmasktoarraynum}
-
-Accepte un entier. Renvoie un tableau de nombres UInt64 contenant la liste des puissances de deux qui totalisent le nombre source lorsqu'il est additionné. Les numéros dans le tableau sont dans l'ordre croissant.
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/functions/encoding_functions/) <!--hide-->
diff --git a/docs/fr/sql-reference/functions/ext-dict-functions.md b/docs/fr/sql-reference/functions/ext-dict-functions.md
deleted file mode 100644
index 1cec307747d..00000000000
--- a/docs/fr/sql-reference/functions/ext-dict-functions.md
+++ /dev/null
@@ -1,205 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 58
-toc_title: Travailler avec des dictionnaires externes
----
-
-# Fonctions pour travailler avec des dictionnaires externes {#ext_dict_functions}
-
-Pour plus d'informations sur la connexion et la configuration de dictionnaires externes, voir [Dictionnaires externes](../../sql-reference/dictionaries/external-dictionaries/external-dicts.md).
-
-## dictGet {#dictget}
-
-Récupère une valeur d'un dictionnaire externe.
-
-``` sql
-dictGet('dict_name', 'attr_name', id_expr)
-dictGetOrDefault('dict_name', 'attr_name', id_expr, default_value_expr)
-```
-
-**Paramètre**
-
--   `dict_name` — Name of the dictionary. [Chaîne littérale](../syntax.md#syntax-string-literal).
--   `attr_name` — Name of the column of the dictionary. [Chaîne littérale](../syntax.md#syntax-string-literal).
--   `id_expr` — Key value. [Expression](../syntax.md#syntax-expressions) de retour d'un [UInt64](../../sql-reference/data-types/int-uint.md) ou [Tuple](../../sql-reference/data-types/tuple.md)- tapez la valeur en fonction de la configuration du dictionnaire.
--   `default_value_expr` — Value returned if the dictionary doesn't contain a row with the `id_expr` clé. [Expression](../syntax.md#syntax-expressions) renvoyer la valeur dans le type de données configuré pour `attr_name` attribut.
-
-**Valeur renvoyée**
-
--   Si ClickHouse analyse l'attribut avec succès dans le [l'attribut type de données](../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md#ext_dict_structure-attributes), les fonctions renvoient la valeur du dictionnaire de l'attribut qui correspond à `id_expr`.
-
--   Si il n'y a pas la clé, correspondant à `id_expr` dans le dictionnaire, puis:
-
-        - `dictGet` returns the content of the `<null_value>` element specified for the attribute in the dictionary configuration.
-        - `dictGetOrDefault` returns the value passed as the `default_value_expr` parameter.
-
-ClickHouse lève une exception si elle ne peut pas analyser la valeur de l'attribut ou si la valeur ne correspond pas au type de données d'attribut.
-
-**Exemple**
-
-Créer un fichier texte `ext-dict-text.csv` contenant les éléments suivants:
-
-``` text
-1,1
-2,2
-```
-
-La première colonne est `id` la deuxième colonne est `c1`.
-
-Configurer le dictionnaire externe:
-
-``` xml
-<yandex>
-    <dictionary>
-        <name>ext-dict-test</name>
-        <source>
-            <file>
-                <path>/path-to/ext-dict-test.csv</path>
-                <format>CSV</format>
-            </file>
-        </source>
-        <layout>
-            <flat />
-        </layout>
-        <structure>
-            <id>
-                <name>id</name>
-            </id>
-            <attribute>
-                <name>c1</name>
-                <type>UInt32</type>
-                <null_value></null_value>
-            </attribute>
-        </structure>
-        <lifetime>0</lifetime>
-    </dictionary>
-</yandex>
-```
-
-Effectuer la requête:
-
-``` sql
-SELECT
-    dictGetOrDefault('ext-dict-test', 'c1', number + 1, toUInt32(number * 10)) AS val,
-    toTypeName(val) AS type
-FROM system.numbers
-LIMIT 3
-```
-
-``` text
-┌─val─┬─type───┐
-│   1 │ UInt32 │
-│   2 │ UInt32 │
-│  20 │ UInt32 │
-└─────┴────────┘
-```
-
-**Voir Aussi**
-
--   [Dictionnaires Externes](../../sql-reference/dictionaries/external-dictionaries/external-dicts.md)
-
-## dictHas {#dicthas}
-
-Vérifie si une clé est présente dans un dictionnaire.
-
-``` sql
-dictHas('dict_name', id_expr)
-```
-
-**Paramètre**
-
--   `dict_name` — Name of the dictionary. [Chaîne littérale](../syntax.md#syntax-string-literal).
--   `id_expr` — Key value. [Expression](../syntax.md#syntax-expressions) de retour d'un [UInt64](../../sql-reference/data-types/int-uint.md)-le type de la valeur.
-
-**Valeur renvoyée**
-
--   0, si il n'y a pas de clé.
--   1, si il y a une clé.
-
-Type: `UInt8`.
-
-## dictGetHierarchy {#dictgethierarchy}
-
-Crée un tableau contenant tous les parents d'une clé dans le [hiérarchique dictionnaire](../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-hierarchical.md).
-
-**Syntaxe**
-
-``` sql
-dictGetHierarchy('dict_name', key)
-```
-
-**Paramètre**
-
--   `dict_name` — Name of the dictionary. [Chaîne littérale](../syntax.md#syntax-string-literal).
--   `key` — Key value. [Expression](../syntax.md#syntax-expressions) de retour d'un [UInt64](../../sql-reference/data-types/int-uint.md)-le type de la valeur.
-
-**Valeur renvoyée**
-
--   Les Parents pour la clé.
-
-Type: [Tableau (UInt64)](../../sql-reference/data-types/array.md).
-
-## dictisine {#dictisin}
-
-Vérifie l'ancêtre d'une clé à travers toute la chaîne hiérarchique dans le dictionnaire.
-
-``` sql
-dictIsIn('dict_name', child_id_expr, ancestor_id_expr)
-```
-
-**Paramètre**
-
--   `dict_name` — Name of the dictionary. [Chaîne littérale](../syntax.md#syntax-string-literal).
--   `child_id_expr` — Key to be checked. [Expression](../syntax.md#syntax-expressions) de retour d'un [UInt64](../../sql-reference/data-types/int-uint.md)-le type de la valeur.
--   `ancestor_id_expr` — Alleged ancestor of the `child_id_expr` clé. [Expression](../syntax.md#syntax-expressions) de retour d'un [UInt64](../../sql-reference/data-types/int-uint.md)-le type de la valeur.
-
-**Valeur renvoyée**
-
--   0, si `child_id_expr` n'est pas un enfant de `ancestor_id_expr`.
--   1, si `child_id_expr` est un enfant de `ancestor_id_expr` ou si `child_id_expr` est un `ancestor_id_expr`.
-
-Type: `UInt8`.
-
-## D'Autres Fonctions {#ext_dict_functions-other}
-
-ClickHouse prend en charge des fonctions spécialisées qui convertissent les valeurs d'attribut de dictionnaire en un type de données spécifique, quelle que soit la configuration du dictionnaire.
-
-Fonction:
-
--   `dictGetInt8`, `dictGetInt16`, `dictGetInt32`, `dictGetInt64`
--   `dictGetUInt8`, `dictGetUInt16`, `dictGetUInt32`, `dictGetUInt64`
--   `dictGetFloat32`, `dictGetFloat64`
--   `dictGetDate`
--   `dictGetDateTime`
--   `dictGetUUID`
--   `dictGetString`
-
-Toutes ces fonctions ont le `OrDefault` modification. Exemple, `dictGetDateOrDefault`.
-
-Syntaxe:
-
-``` sql
-dictGet[Type]('dict_name', 'attr_name', id_expr)
-dictGet[Type]OrDefault('dict_name', 'attr_name', id_expr, default_value_expr)
-```
-
-**Paramètre**
-
--   `dict_name` — Name of the dictionary. [Chaîne littérale](../syntax.md#syntax-string-literal).
--   `attr_name` — Name of the column of the dictionary. [Chaîne littérale](../syntax.md#syntax-string-literal).
--   `id_expr` — Key value. [Expression](../syntax.md#syntax-expressions) de retour d'un [UInt64](../../sql-reference/data-types/int-uint.md)-le type de la valeur.
--   `default_value_expr` — Value which is returned if the dictionary doesn't contain a row with the `id_expr` clé. [Expression](../syntax.md#syntax-expressions) renvoyer une valeur dans le type de données configuré pour `attr_name` attribut.
-
-**Valeur renvoyée**
-
--   Si ClickHouse analyse l'attribut avec succès dans le [l'attribut type de données](../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md#ext_dict_structure-attributes), les fonctions renvoient la valeur du dictionnaire de l'attribut qui correspond à `id_expr`.
-
--   Si il n'est pas demandé `id_expr` dans le dictionnaire,:
-
-        - `dictGet[Type]` returns the content of the `<null_value>` element specified for the attribute in the dictionary configuration.
-        - `dictGet[Type]OrDefault` returns the value passed as the `default_value_expr` parameter.
-
-ClickHouse lève une exception si elle ne peut pas analyser la valeur de l'attribut ou si la valeur ne correspond pas au type de données d'attribut.
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/functions/ext_dict_functions/) <!--hide-->
diff --git a/docs/fr/sql-reference/functions/functions-for-nulls.md b/docs/fr/sql-reference/functions/functions-for-nulls.md
deleted file mode 100644
index ef7be728ce7..00000000000
--- a/docs/fr/sql-reference/functions/functions-for-nulls.md
+++ /dev/null
@@ -1,312 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 63
-toc_title: Travailler avec des arguments nullables
----
-
-# Fonctions pour travailler avec des agrégats nullables {#functions-for-working-with-nullable-aggregates}
-
-## isNull {#isnull}
-
-Vérifie si l'argument est [NULL](../../sql-reference/syntax.md#null-literal).
-
-``` sql
-isNull(x)
-```
-
-**Paramètre**
-
--   `x` — A value with a non-compound data type.
-
-**Valeur renvoyée**
-
--   `1` si `x` être `NULL`.
--   `0` si `x` n'est pas `NULL`.
-
-**Exemple**
-
-Table d'entrée
-
-``` text
-┌─x─┬────y─┐
-│ 1 │ ᴺᵁᴸᴸ │
-│ 2 │    3 │
-└───┴──────┘
-```
-
-Requête
-
-``` sql
-SELECT x FROM t_null WHERE isNull(y)
-```
-
-``` text
-┌─x─┐
-│ 1 │
-└───┘
-```
-
-## isNotNull {#isnotnull}
-
-Vérifie si l'argument est [NULL](../../sql-reference/syntax.md#null-literal).
-
-``` sql
-isNotNull(x)
-```
-
-**Paramètre:**
-
--   `x` — A value with a non-compound data type.
-
-**Valeur renvoyée**
-
--   `0` si `x` être `NULL`.
--   `1` si `x` n'est pas `NULL`.
-
-**Exemple**
-
-Table d'entrée
-
-``` text
-┌─x─┬────y─┐
-│ 1 │ ᴺᵁᴸᴸ │
-│ 2 │    3 │
-└───┴──────┘
-```
-
-Requête
-
-``` sql
-SELECT x FROM t_null WHERE isNotNull(y)
-```
-
-``` text
-┌─x─┐
-│ 2 │
-└───┘
-```
-
-## fusionner {#coalesce}
-
-Vérifie de gauche à droite si `NULL` les arguments ont été passés et renvoie le premier non-`NULL` argument.
-
-``` sql
-coalesce(x,...)
-```
-
-**Paramètre:**
-
--   N'importe quel nombre de paramètres d'un type non composé. Tous les paramètres doivent être compatibles par type de données.
-
-**Valeurs renvoyées**
-
--   Le premier non-`NULL` argument.
--   `NULL` si tous les arguments sont `NULL`.
-
-**Exemple**
-
-Considérez une liste de contacts qui peuvent spécifier plusieurs façons de contacter un client.
-
-``` text
-┌─name─────┬─mail─┬─phone─────┬──icq─┐
-│ client 1 │ ᴺᵁᴸᴸ │ 123-45-67 │  123 │
-│ client 2 │ ᴺᵁᴸᴸ │ ᴺᵁᴸᴸ      │ ᴺᵁᴸᴸ │
-└──────────┴──────┴───────────┴──────┘
-```
-
-Le `mail` et `phone` les champs sont de type Chaîne de caractères, mais la `icq` le terrain est `UInt32`, de sorte qu'il doit être converti en `String`.
-
-Obtenir la première méthode de contact pour le client à partir de la liste de contacts:
-
-``` sql
-SELECT coalesce(mail, phone, CAST(icq,'Nullable(String)')) FROM aBook
-```
-
-``` text
-┌─name─────┬─coalesce(mail, phone, CAST(icq, 'Nullable(String)'))─┐
-│ client 1 │ 123-45-67                                            │
-│ client 2 │ ᴺᵁᴸᴸ                                                 │
-└──────────┴──────────────────────────────────────────────────────┘
-```
-
-## ifNull {#ifnull}
-
-Renvoie une valeur alternative si l'argument principal est `NULL`.
-
-``` sql
-ifNull(x,alt)
-```
-
-**Paramètre:**
-
--   `x` — The value to check for `NULL`.
--   `alt` — The value that the function returns if `x` être `NULL`.
-
-**Valeurs renvoyées**
-
--   Valeur `x`, si `x` n'est pas `NULL`.
--   Valeur `alt`, si `x` être `NULL`.
-
-**Exemple**
-
-``` sql
-SELECT ifNull('a', 'b')
-```
-
-``` text
-┌─ifNull('a', 'b')─┐
-│ a                │
-└──────────────────┘
-```
-
-``` sql
-SELECT ifNull(NULL, 'b')
-```
-
-``` text
-┌─ifNull(NULL, 'b')─┐
-│ b                 │
-└───────────────────┘
-```
-
-## nullIf {#nullif}
-
-Retourner `NULL` si les arguments sont égaux.
-
-``` sql
-nullIf(x, y)
-```
-
-**Paramètre:**
-
-`x`, `y` — Values for comparison. They must be compatible types, or ClickHouse will generate an exception.
-
-**Valeurs renvoyées**
-
--   `NULL` si les arguments sont égaux.
--   Le `x` valeur, si les arguments ne sont pas égaux.
-
-**Exemple**
-
-``` sql
-SELECT nullIf(1, 1)
-```
-
-``` text
-┌─nullIf(1, 1)─┐
-│         ᴺᵁᴸᴸ │
-└──────────────┘
-```
-
-``` sql
-SELECT nullIf(1, 2)
-```
-
-``` text
-┌─nullIf(1, 2)─┐
-│            1 │
-└──────────────┘
-```
-
-## assumeNotNull {#assumenotnull}
-
-Résultats dans une valeur de type [Nullable](../../sql-reference/data-types/nullable.md) pour un non- `Nullable` si la valeur n'est pas `NULL`.
-
-``` sql
-assumeNotNull(x)
-```
-
-**Paramètre:**
-
--   `x` — The original value.
-
-**Valeurs renvoyées**
-
--   La valeur d'origine du non-`Nullable` type, si elle n'est pas `NULL`.
--   La valeur par défaut pour le non-`Nullable` Tapez si la valeur d'origine était `NULL`.
-
-**Exemple**
-
-Envisager l' `t_null` table.
-
-``` sql
-SHOW CREATE TABLE t_null
-```
-
-``` text
-┌─statement─────────────────────────────────────────────────────────────────┐
-│ CREATE TABLE default.t_null ( x Int8,  y Nullable(Int8)) ENGINE = TinyLog │
-└───────────────────────────────────────────────────────────────────────────┘
-```
-
-``` text
-┌─x─┬────y─┐
-│ 1 │ ᴺᵁᴸᴸ │
-│ 2 │    3 │
-└───┴──────┘
-```
-
-Appliquer le `assumeNotNull` la fonction de la `y` colonne.
-
-``` sql
-SELECT assumeNotNull(y) FROM t_null
-```
-
-``` text
-┌─assumeNotNull(y)─┐
-│                0 │
-│                3 │
-└──────────────────┘
-```
-
-``` sql
-SELECT toTypeName(assumeNotNull(y)) FROM t_null
-```
-
-``` text
-┌─toTypeName(assumeNotNull(y))─┐
-│ Int8                         │
-│ Int8                         │
-└──────────────────────────────┘
-```
-
-## toNullable {#tonullable}
-
-Convertit le type d'argument en `Nullable`.
-
-``` sql
-toNullable(x)
-```
-
-**Paramètre:**
-
--   `x` — The value of any non-compound type.
-
-**Valeur renvoyée**
-
--   La valeur d'entrée avec un `Nullable` type.
-
-**Exemple**
-
-``` sql
-SELECT toTypeName(10)
-```
-
-``` text
-┌─toTypeName(10)─┐
-│ UInt8          │
-└────────────────┘
-```
-
-``` sql
-SELECT toTypeName(toNullable(10))
-```
-
-``` text
-┌─toTypeName(toNullable(10))─┐
-│ Nullable(UInt8)            │
-└────────────────────────────┘
-```
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/functions/functions_for_nulls/) <!--hide-->
diff --git a/docs/fr/sql-reference/functions/geo.md b/docs/fr/sql-reference/functions/geo.md
deleted file mode 100644
index a89f03c7216..00000000000
--- a/docs/fr/sql-reference/functions/geo.md
+++ /dev/null
@@ -1,510 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 62
-toc_title: "Travailler avec des coordonn\xE9es g\xE9ographiques"
----
-
-# Fonctions pour travailler avec des coordonnées géographiques {#functions-for-working-with-geographical-coordinates}
-
-## greatCircleDistance {#greatcircledistance}
-
-Calculer la distance entre deux points sur la surface de la Terre en utilisant [la formule du grand cercle](https://en.wikipedia.org/wiki/Great-circle_distance).
-
-``` sql
-greatCircleDistance(lon1Deg, lat1Deg, lon2Deg, lat2Deg)
-```
-
-**Les paramètres d'entrée**
-
--   `lon1Deg` — Longitude of the first point in degrees. Range: `[-180°, 180°]`.
--   `lat1Deg` — Latitude of the first point in degrees. Range: `[-90°, 90°]`.
--   `lon2Deg` — Longitude of the second point in degrees. Range: `[-180°, 180°]`.
--   `lat2Deg` — Latitude of the second point in degrees. Range: `[-90°, 90°]`.
-
-Les valeurs positives correspondent à la latitude nord et à la longitude Est, et les valeurs négatives à la latitude Sud et à la longitude ouest.
-
-**Valeur renvoyée**
-
-La distance entre deux points sur la surface de la Terre, en mètres.
-
-Génère une exception lorsque les valeurs des paramètres d'entrée se situent en dehors de la plage.
-
-**Exemple**
-
-``` sql
-SELECT greatCircleDistance(55.755831, 37.617673, -55.755831, -37.617673)
-```
-
-``` text
-┌─greatCircleDistance(55.755831, 37.617673, -55.755831, -37.617673)─┐
-│                                                14132374.194975413 │
-└───────────────────────────────────────────────────────────────────┘
-```
-
-## pointInEllipses {#pointinellipses}
-
-Vérifie si le point appartient à au moins une des ellipses.
-Coordonnées géométriques sont dans le système de coordonnées Cartésiennes.
-
-``` sql
-pointInEllipses(x, y, x₀, y₀, a₀, b₀,...,xₙ, yₙ, aₙ, bₙ)
-```
-
-**Les paramètres d'entrée**
-
--   `x, y` — Coordinates of a point on the plane.
--   `xᵢ, yᵢ` — Coordinates of the center of the `i`-ème points de suspension.
--   `aᵢ, bᵢ` — Axes of the `i`- e ellipse en unités de coordonnées x, Y.
-
-Les paramètres d'entrée doivent être `2+4⋅n`, où `n` est le nombre de points de suspension.
-
-**Valeurs renvoyées**
-
-`1` si le point est à l'intérieur d'au moins l'un des ellipses; `0`si elle ne l'est pas.
-
-**Exemple**
-
-``` sql
-SELECT pointInEllipses(10., 10., 10., 9.1, 1., 0.9999)
-```
-
-``` text
-┌─pointInEllipses(10., 10., 10., 9.1, 1., 0.9999)─┐
-│                                               1 │
-└─────────────────────────────────────────────────┘
-```
-
-## pointtinpolygon {#pointinpolygon}
-
-Vérifie si le point appartient au polygone sur l'avion.
-
-``` sql
-pointInPolygon((x, y), [(a, b), (c, d) ...], ...)
-```
-
-**Les valeurs d'entrée**
-
--   `(x, y)` — Coordinates of a point on the plane. Data type — [Tuple](../../sql-reference/data-types/tuple.md) — A tuple of two numbers.
--   `[(a, b), (c, d) ...]` — Polygon vertices. Data type — [Tableau](../../sql-reference/data-types/array.md). Chaque sommet est représenté par une paire de coordonnées `(a, b)`. Les sommets doivent être spécifiés dans le sens horaire ou antihoraire. Le nombre minimum de sommets est 3. Le polygone doit être constante.
--   La fonction prend également en charge les polygones avec des trous (découper des sections). Dans ce cas, ajoutez des polygones qui définissent les sections découpées en utilisant des arguments supplémentaires de la fonction. La fonction ne prend pas en charge les polygones non simplement connectés.
-
-**Valeurs renvoyées**
-
-`1` si le point est à l'intérieur du polygone, `0` si elle ne l'est pas.
-Si le point est sur la limite du polygone, la fonction peut renvoyer 0 ou 1.
-
-**Exemple**
-
-``` sql
-SELECT pointInPolygon((3., 3.), [(6, 0), (8, 4), (5, 8), (0, 2)]) AS res
-```
-
-``` text
-┌─res─┐
-│   1 │
-└─────┘
-```
-
-## geohashEncode {#geohashencode}
-
-Encode la latitude et la longitude en tant que chaîne geohash, voir (http://geohash.org/, https://en.wikipedia.org/wiki/Geohash).
-
-``` sql
-geohashEncode(longitude, latitude, [precision])
-```
-
-**Les valeurs d'entrée**
-
--   longitude longitude partie de la coordonnée que vous souhaitez encoder. Flottant dans la gamme`[-180°, 180°]`
--   latitude latitude partie de la coordonnée que vous souhaitez encoder. Flottant dans la gamme `[-90°, 90°]`
--   precision-facultatif, longueur de la chaîne codée résultante, par défaut `12`. Entier dans la gamme `[1, 12]`. Toute valeur inférieure à `1` ou supérieure à `12` silencieusement converti à `12`.
-
-**Valeurs renvoyées**
-
--   alphanumérique `String` de coordonnées codées (la version modifiée de l'alphabet de codage base32 est utilisée).
-
-**Exemple**
-
-``` sql
-SELECT geohashEncode(-5.60302734375, 42.593994140625, 0) AS res
-```
-
-``` text
-┌─res──────────┐
-│ ezs42d000000 │
-└──────────────┘
-```
-
-## geohashDecode {#geohashdecode}
-
-Décode toute chaîne codée geohash en longitude et latitude.
-
-**Les valeurs d'entrée**
-
--   chaîne codée-chaîne codée geohash.
-
-**Valeurs renvoyées**
-
--   (longitude, latitude) - 2-n-uplet de `Float64` les valeurs de longitude et de latitude.
-
-**Exemple**
-
-``` sql
-SELECT geohashDecode('ezs42') AS res
-```
-
-``` text
-┌─res─────────────────────────────┐
-│ (-5.60302734375,42.60498046875) │
-└─────────────────────────────────┘
-```
-
-## geoToH3 {#geotoh3}
-
-Retourner [H3](https://uber.github.io/h3/#/documentation/overview/introduction) point d'indice `(lon, lat)` avec une résolution spécifiée.
-
-[H3](https://uber.github.io/h3/#/documentation/overview/introduction) est un système d'indexation géographique où la surface de la Terre divisée en carreaux hexagonaux même. Ce système est hiérarchique, c'est-à-dire que chaque hexagone au niveau supérieur peut être divisé en sept, même mais plus petits, etc.
-
-Cet indice est principalement utilisé pour les emplacements de bucketing et d'autres manipulations géospatiales.
-
-**Syntaxe**
-
-``` sql
-geoToH3(lon, lat, resolution)
-```
-
-**Paramètre**
-
--   `lon` — Longitude. Type: [Float64](../../sql-reference/data-types/float.md).
--   `lat` — Latitude. Type: [Float64](../../sql-reference/data-types/float.md).
--   `resolution` — Index resolution. Range: `[0, 15]`. Type: [UInt8](../../sql-reference/data-types/int-uint.md).
-
-**Valeurs renvoyées**
-
--   Numéro d'indice hexagonal.
--   0 en cas d'erreur.
-
-Type: `UInt64`.
-
-**Exemple**
-
-Requête:
-
-``` sql
-SELECT geoToH3(37.79506683, 55.71290588, 15) as h3Index
-```
-
-Résultat:
-
-``` text
-┌────────────h3Index─┐
-│ 644325524701193974 │
-└────────────────────┘
-```
-
-## geohashesInBox {#geohashesinbox}
-
-Renvoie un tableau de chaînes codées geohash de précision donnée qui tombent à l'intérieur et croisent les limites d'une boîte donnée, essentiellement une grille 2D aplatie en tableau.
-
-**Les valeurs d'entrée**
-
--   longitude_min-longitude min, valeur flottante dans la plage `[-180°, 180°]`
--   latitude_min-latitude min, valeur flottante dans la plage `[-90°, 90°]`
--   longitude_max-longitude maximale, valeur flottante dans la plage `[-180°, 180°]`
--   latitude_max-latitude maximale, valeur flottante dans la plage `[-90°, 90°]`
--   précision - geohash précision, `UInt8` dans la gamme `[1, 12]`
-
-Veuillez noter que tous les paramètres de coordonnées doit être du même type: soit `Float32` ou `Float64`.
-
-**Valeurs renvoyées**
-
--   gamme de précision de longues chaînes de geohash-boîtes couvrant la zone, vous ne devriez pas compter sur l'ordre des éléments.
--   \[\] - tableau vide si *min* les valeurs de *latitude* et *longitude* ne sont pas moins de correspondant *Max* valeur.
-
-Veuillez noter que la fonction lancera une exception si le tableau résultant a plus de 10'000'000 éléments.
-
-**Exemple**
-
-``` sql
-SELECT geohashesInBox(24.48, 40.56, 24.785, 40.81, 4) AS thasos
-```
-
-``` text
-┌─thasos──────────────────────────────────────┐
-│ ['sx1q','sx1r','sx32','sx1w','sx1x','sx38'] │
-└─────────────────────────────────────────────┘
-```
-
-## h3GetBaseCell {#h3getbasecell}
-
-Renvoie le numéro de cellule de base de l'index.
-
-**Syntaxe**
-
-``` sql
-h3GetBaseCell(index)
-```
-
-**Paramètre**
-
--   `index` — Hexagon index number. Type: [UInt64](../../sql-reference/data-types/int-uint.md).
-
-**Valeurs renvoyées**
-
--   Numéro de cellule de base hexagonale. Type: [UInt8](../../sql-reference/data-types/int-uint.md).
-
-**Exemple**
-
-Requête:
-
-``` sql
-SELECT h3GetBaseCell(612916788725809151) as basecell
-```
-
-Résultat:
-
-``` text
-┌─basecell─┐
-│       12 │
-└──────────┘
-```
-
-## h3HexAreaM2 {#h3hexaream2}
-
-Surface hexagonale Moyenne en mètres carrés à la résolution donnée.
-
-**Syntaxe**
-
-``` sql
-h3HexAreaM2(resolution)
-```
-
-**Paramètre**
-
--   `resolution` — Index resolution. Range: `[0, 15]`. Type: [UInt8](../../sql-reference/data-types/int-uint.md).
-
-**Valeurs renvoyées**
-
--   Area in m². Type: [Float64](../../sql-reference/data-types/float.md).
-
-**Exemple**
-
-Requête:
-
-``` sql
-SELECT h3HexAreaM2(13) as area
-```
-
-Résultat:
-
-``` text
-┌─area─┐
-│ 43.9 │
-└──────┘
-```
-
-## h3IndexesAreNeighbors {#h3indexesareneighbors}
-
-Renvoie si les H3Indexes fournis sont voisins ou non.
-
-**Syntaxe**
-
-``` sql
-h3IndexesAreNeighbors(index1, index2)
-```
-
-**Paramètre**
-
--   `index1` — Hexagon index number. Type: [UInt64](../../sql-reference/data-types/int-uint.md).
--   `index2` — Hexagon index number. Type: [UInt64](../../sql-reference/data-types/int-uint.md).
-
-**Valeurs renvoyées**
-
--   Retourner `1` si les index sont voisins, `0` autrement. Type: [UInt8](../../sql-reference/data-types/int-uint.md).
-
-**Exemple**
-
-Requête:
-
-``` sql
-SELECT h3IndexesAreNeighbors(617420388351344639, 617420388352655359) AS n
-```
-
-Résultat:
-
-``` text
-┌─n─┐
-│ 1 │
-└───┘
-```
-
-## h3enfants {#h3tochildren}
-
-Retourne un tableau avec les index enfants de l'index donné.
-
-**Syntaxe**
-
-``` sql
-h3ToChildren(index, resolution)
-```
-
-**Paramètre**
-
--   `index` — Hexagon index number. Type: [UInt64](../../sql-reference/data-types/int-uint.md).
--   `resolution` — Index resolution. Range: `[0, 15]`. Type: [UInt8](../../sql-reference/data-types/int-uint.md).
-
-**Valeurs renvoyées**
-
--   Tableau avec les index H3 enfants. Tableau de type: [UInt64](../../sql-reference/data-types/int-uint.md).
-
-**Exemple**
-
-Requête:
-
-``` sql
-SELECT h3ToChildren(599405990164561919, 6) AS children
-```
-
-Résultat:
-
-``` text
-┌─children───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
-│ [603909588852408319,603909588986626047,603909589120843775,603909589255061503,603909589389279231,603909589523496959,603909589657714687] │
-└────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
-```
-
-## h3ToParent {#h3toparent}
-
-Renvoie l'index parent (plus grossier) contenant l'index donné.
-
-**Syntaxe**
-
-``` sql
-h3ToParent(index, resolution)
-```
-
-**Paramètre**
-
--   `index` — Hexagon index number. Type: [UInt64](../../sql-reference/data-types/int-uint.md).
--   `resolution` — Index resolution. Range: `[0, 15]`. Type: [UInt8](../../sql-reference/data-types/int-uint.md).
-
-**Valeurs renvoyées**
-
--   Parent H3 index. Type: [UInt64](../../sql-reference/data-types/int-uint.md).
-
-**Exemple**
-
-Requête:
-
-``` sql
-SELECT h3ToParent(599405990164561919, 3) as parent
-```
-
-Résultat:
-
-``` text
-┌─────────────parent─┐
-│ 590398848891879423 │
-└────────────────────┘
-```
-
-## h3ToString {#h3tostring}
-
-Convertit la représentation H3Index de l'index en représentation de chaîne.
-
-``` sql
-h3ToString(index)
-```
-
-**Paramètre**
-
--   `index` — Hexagon index number. Type: [UInt64](../../sql-reference/data-types/int-uint.md).
-
-**Valeurs renvoyées**
-
--   Représentation en chaîne de l'index H3. Type: [Chaîne](../../sql-reference/data-types/string.md).
-
-**Exemple**
-
-Requête:
-
-``` sql
-SELECT h3ToString(617420388352917503) as h3_string
-```
-
-Résultat:
-
-``` text
-┌─h3_string───────┐
-│ 89184926cdbffff │
-└─────────────────┘
-```
-
-## stringToH3 {#stringtoh3}
-
-Convertit la représentation de chaîne en représentation H3Index (UInt64).
-
-``` sql
-stringToH3(index_str)
-```
-
-**Paramètre**
-
--   `index_str` — String representation of the H3 index. Type: [Chaîne](../../sql-reference/data-types/string.md).
-
-**Valeurs renvoyées**
-
--   Numéro d'indice hexagonal. Renvoie 0 en cas d'erreur. Type: [UInt64](../../sql-reference/data-types/int-uint.md).
-
-**Exemple**
-
-Requête:
-
-``` sql
-SELECT stringToH3('89184926cc3ffff') as index
-```
-
-Résultat:
-
-``` text
-┌──────────────index─┐
-│ 617420388351344639 │
-└────────────────────┘
-```
-
-## h3grésolution {#h3getresolution}
-
-Retourne la résolution de l'index.
-
-**Syntaxe**
-
-``` sql
-h3GetResolution(index)
-```
-
-**Paramètre**
-
--   `index` — Hexagon index number. Type: [UInt64](../../sql-reference/data-types/int-uint.md).
-
-**Valeurs renvoyées**
-
--   L'indice de la résolution. Gamme: `[0, 15]`. Type: [UInt8](../../sql-reference/data-types/int-uint.md).
-
-**Exemple**
-
-Requête:
-
-``` sql
-SELECT h3GetResolution(617420388352917503) as res
-```
-
-Résultat:
-
-``` text
-┌─res─┐
-│   9 │
-└─────┘
-```
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/functions/geo/) <!--hide-->
diff --git a/docs/fr/sql-reference/functions/hash-functions.md b/docs/fr/sql-reference/functions/hash-functions.md
deleted file mode 100644
index 3b0f92dd4f8..00000000000
--- a/docs/fr/sql-reference/functions/hash-functions.md
+++ /dev/null
@@ -1,484 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 50
-toc_title: Hachage
----
-
-# Les Fonctions De Hachage {#hash-functions}
-
-Les fonctions de hachage peuvent être utilisées pour le brassage pseudo-aléatoire déterministe des éléments.
-
-## halfMD5 {#hash-functions-halfmd5}
-
-[Interpréter](../../sql-reference/functions/type-conversion-functions.md#type_conversion_functions-reinterpretAsString) tous les paramètres d'entrée sous forme de chaînes et calcule le [MD5](https://en.wikipedia.org/wiki/MD5) la valeur de hachage pour chacun d'eux. Puis combine les hachages, prend les 8 premiers octets du hachage de la chaîne résultante, et les interprète comme `UInt64` dans l'ordre des octets big-endian.
-
-``` sql
-halfMD5(par1, ...)
-```
-
-La fonction est relativement lente (5 millions de chaînes courtes par seconde par cœur de processeur).
-Envisager l'utilisation de la [sipHash64](#hash_functions-siphash64) la fonction la place.
-
-**Paramètre**
-
-La fonction prend un nombre variable de paramètres d'entrée. Les paramètres peuvent être tout de la [types de données pris en charge](../../sql-reference/data-types/index.md).
-
-**Valeur Renvoyée**
-
-A [UInt64](../../sql-reference/data-types/int-uint.md) valeur de hachage du type de données.
-
-**Exemple**
-
-``` sql
-SELECT halfMD5(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')) AS halfMD5hash, toTypeName(halfMD5hash) AS type
-```
-
-``` text
-┌────────halfMD5hash─┬─type───┐
-│ 186182704141653334 │ UInt64 │
-└────────────────────┴────────┘
-```
-
-## MD5 {#hash_functions-md5}
-
-Calcule le MD5 à partir d'une chaîne et renvoie L'ensemble d'octets résultant en tant que FixedString(16).
-Si vous n'avez pas besoin de MD5 en particulier, mais que vous avez besoin d'un hachage cryptographique 128 bits décent, utilisez le ‘sipHash128’ la fonction la place.
-Si vous voulez obtenir le même résultat que la sortie de l'utilitaire md5sum, utilisez lower (hex(MD5 (s))).
-
-## sipHash64 {#hash_functions-siphash64}
-
-Produit un 64 bits [SipHash](https://131002.net/siphash/) la valeur de hachage.
-
-``` sql
-sipHash64(par1,...)
-```
-
-C'est une fonction de hachage cryptographique. Il fonctionne au moins trois fois plus vite que le [MD5](#hash_functions-md5) fonction.
-
-Fonction [interpréter](../../sql-reference/functions/type-conversion-functions.md#type_conversion_functions-reinterpretAsString) tous les paramètres d'entrée sous forme de chaînes et calcule la valeur de hachage pour chacun d'eux. Puis combine les hachages par l'algorithme suivant:
-
-1.  Après avoir haché tous les paramètres d'entrée, la fonction obtient le tableau de hachages.
-2.  La fonction prend le premier et le second éléments et calcule un hachage pour le tableau d'entre eux.
-3.  Ensuite, la fonction prend la valeur de hachage, calculée à l'étape précédente, et le troisième élément du tableau de hachage initial, et calcule un hachage pour le tableau d'entre eux.
-4.  L'étape précédente est répétée pour tous les éléments restants de la période initiale de hachage tableau.
-
-**Paramètre**
-
-La fonction prend un nombre variable de paramètres d'entrée. Les paramètres peuvent être tout de la [types de données pris en charge](../../sql-reference/data-types/index.md).
-
-**Valeur Renvoyée**
-
-A [UInt64](../../sql-reference/data-types/int-uint.md) valeur de hachage du type de données.
-
-**Exemple**
-
-``` sql
-SELECT sipHash64(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')) AS SipHash, toTypeName(SipHash) AS type
-```
-
-``` text
-┌──────────────SipHash─┬─type───┐
-│ 13726873534472839665 │ UInt64 │
-└──────────────────────┴────────┘
-```
-
-## sipHash128 {#hash_functions-siphash128}
-
-Calcule SipHash à partir d'une chaîne.
-Accepte un argument de type chaîne. Renvoie FixedString (16).
-Diffère de sipHash64 en ce que l'état de pliage xor final n'est effectué que jusqu'à 128 bits.
-
-## cityHash64 {#cityhash64}
-
-Produit un 64 bits [CityHash](https://github.com/google/cityhash) la valeur de hachage.
-
-``` sql
-cityHash64(par1,...)
-```
-
-Ceci est une fonction de hachage non cryptographique rapide. Il utilise L'algorithme CityHash pour les paramètres de chaîne et la fonction de hachage rapide non cryptographique spécifique à l'implémentation pour les paramètres avec d'autres types de données. La fonction utilise le combinateur CityHash pour obtenir les résultats finaux.
-
-**Paramètre**
-
-La fonction prend un nombre variable de paramètres d'entrée. Les paramètres peuvent être tout de la [types de données pris en charge](../../sql-reference/data-types/index.md).
-
-**Valeur Renvoyée**
-
-A [UInt64](../../sql-reference/data-types/int-uint.md) valeur de hachage du type de données.
-
-**Exemple**
-
-Appelez exemple:
-
-``` sql
-SELECT cityHash64(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')) AS CityHash, toTypeName(CityHash) AS type
-```
-
-``` text
-┌─────────────CityHash─┬─type───┐
-│ 12072650598913549138 │ UInt64 │
-└──────────────────────┴────────┘
-```
-
-L'exemple suivant montre comment calculer la somme de l'ensemble de la table avec précision jusqu'à la ligne de commande:
-
-``` sql
-SELECT groupBitXor(cityHash64(*)) FROM table
-```
-
-## intHash32 {#inthash32}
-
-Calcule un code de hachage 32 bits à partir de n'importe quel type d'entier.
-C'est une fonction de hachage non cryptographique relativement rapide de qualité moyenne pour les nombres.
-
-## intHash64 {#inthash64}
-
-Calcule un code de hachage 64 bits à partir de n'importe quel type d'entier.
-Il fonctionne plus vite que intHash32. Qualité moyenne.
-
-## SHA1 {#sha1}
-
-## SHA224 {#sha224}
-
-## SHA256 {#sha256}
-
-Calcule SHA-1, SHA-224 ou SHA-256 à partir d'une chaîne et renvoie l'ensemble d'octets résultant en tant que FixedString(20), FixedString(28) ou FixedString(32).
-La fonction fonctionne assez lentement (SHA-1 traite environ 5 millions de chaînes courtes par seconde par cœur de processeur, tandis que SHA-224 et SHA-256 traitent environ 2,2 millions).
-Nous vous recommandons d'utiliser cette fonction uniquement dans les cas où vous avez besoin d'une fonction de hachage spécifique et que vous ne pouvez pas la sélectionner.
-Même dans ces cas, nous vous recommandons d'appliquer la fonction hors ligne et de pré-calculer les valeurs lors de leur insertion dans la table, au lieu de l'appliquer dans SELECTS.
-
-## URLHash(url \[, N\]) {#urlhashurl-n}
-
-Une fonction de hachage non cryptographique rapide et de qualité décente pour une chaîne obtenue à partir d'une URL en utilisant un type de normalisation.
-`URLHash(s)` – Calculates a hash from a string without one of the trailing symbols `/`,`?` ou `#` à la fin, si elle est présente.
-`URLHash(s, N)` – Calculates a hash from a string up to the N level in the URL hierarchy, without one of the trailing symbols `/`,`?` ou `#` à la fin, si elle est présente.
-Les niveaux sont les mêmes que dans URLHierarchy. Cette fonction est spécifique à Yandex.Metrica.
-
-## farmHash64 {#farmhash64}
-
-Produit un 64 bits [FarmHash](https://github.com/google/farmhash) la valeur de hachage.
-
-``` sql
-farmHash64(par1, ...)
-```
-
-La fonction utilise le `Hash64` la méthode de tous les [les méthodes disponibles](https://github.com/google/farmhash/blob/master/src/farmhash.h).
-
-**Paramètre**
-
-La fonction prend un nombre variable de paramètres d'entrée. Les paramètres peuvent être tout de la [types de données pris en charge](../../sql-reference/data-types/index.md).
-
-**Valeur Renvoyée**
-
-A [UInt64](../../sql-reference/data-types/int-uint.md) valeur de hachage du type de données.
-
-**Exemple**
-
-``` sql
-SELECT farmHash64(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')) AS FarmHash, toTypeName(FarmHash) AS type
-```
-
-``` text
-┌─────────────FarmHash─┬─type───┐
-│ 17790458267262532859 │ UInt64 │
-└──────────────────────┴────────┘
-```
-
-## javaHash {#hash_functions-javahash}
-
-Calculer [JavaHash](http://hg.openjdk.java.net/jdk8u/jdk8u/jdk/file/478a4add975b/src/share/classes/java/lang/String.java#l1452) à partir d'une chaîne. Cette fonction de hachage n'est ni rapide ni de bonne qualité. La seule raison de l'utiliser est lorsque cet algorithme est déjà utilisé dans un autre système et que vous devez calculer exactement le même résultat.
-
-**Syntaxe**
-
-``` sql
-SELECT javaHash('');
-```
-
-**Valeur renvoyée**
-
-A `Int32` valeur de hachage du type de données.
-
-**Exemple**
-
-Requête:
-
-``` sql
-SELECT javaHash('Hello, world!');
-```
-
-Résultat:
-
-``` text
-┌─javaHash('Hello, world!')─┐
-│               -1880044555 │
-└───────────────────────────┘
-```
-
-## javaHashUTF16LE {#javahashutf16le}
-
-Calculer [JavaHash](http://hg.openjdk.java.net/jdk8u/jdk8u/jdk/file/478a4add975b/src/share/classes/java/lang/String.java#l1452) à partir d'une chaîne, en supposant qu'elle contient des octets représentant une chaîne en encodage UTF-16LE.
-
-**Syntaxe**
-
-``` sql
-javaHashUTF16LE(stringUtf16le)
-```
-
-**Paramètre**
-
--   `stringUtf16le` — a string in UTF-16LE encoding.
-
-**Valeur renvoyée**
-
-A `Int32` valeur de hachage du type de données.
-
-**Exemple**
-
-Requête correcte avec une chaîne codée UTF-16LE.
-
-Requête:
-
-``` sql
-SELECT javaHashUTF16LE(convertCharset('test', 'utf-8', 'utf-16le'))
-```
-
-Résultat:
-
-``` text
-┌─javaHashUTF16LE(convertCharset('test', 'utf-8', 'utf-16le'))─┐
-│                                                      3556498 │
-└──────────────────────────────────────────────────────────────┘
-```
-
-## hiveHash {#hash-functions-hivehash}
-
-Calculer `HiveHash` à partir d'une chaîne.
-
-``` sql
-SELECT hiveHash('');
-```
-
-C'est juste [JavaHash](#hash_functions-javahash) avec le bit de signe mis à zéro. Cette fonction est utilisée dans [Apache Hive](https://en.wikipedia.org/wiki/Apache_Hive) pour les versions antérieures à la version 3.0. Cette fonction de hachage n'est ni rapide ni de bonne qualité. La seule raison de l'utiliser est lorsque cet algorithme est déjà utilisé dans un autre système et que vous devez calculer exactement le même résultat.
-
-**Valeur renvoyée**
-
-A `Int32` valeur de hachage du type de données.
-
-Type: `hiveHash`.
-
-**Exemple**
-
-Requête:
-
-``` sql
-SELECT hiveHash('Hello, world!');
-```
-
-Résultat:
-
-``` text
-┌─hiveHash('Hello, world!')─┐
-│                 267439093 │
-└───────────────────────────┘
-```
-
-## metroHash64 {#metrohash64}
-
-Produit un 64 bits [MetroHash](http://www.jandrewrogers.com/2015/05/27/metrohash/) la valeur de hachage.
-
-``` sql
-metroHash64(par1, ...)
-```
-
-**Paramètre**
-
-La fonction prend un nombre variable de paramètres d'entrée. Les paramètres peuvent être tout de la [types de données pris en charge](../../sql-reference/data-types/index.md).
-
-**Valeur Renvoyée**
-
-A [UInt64](../../sql-reference/data-types/int-uint.md) valeur de hachage du type de données.
-
-**Exemple**
-
-``` sql
-SELECT metroHash64(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')) AS MetroHash, toTypeName(MetroHash) AS type
-```
-
-``` text
-┌────────────MetroHash─┬─type───┐
-│ 14235658766382344533 │ UInt64 │
-└──────────────────────┴────────┘
-```
-
-## jumpConsistentHash {#jumpconsistenthash}
-
-Calcule JumpConsistentHash forme un UInt64.
-Accepte deux arguments: une clé de type UInt64 et le nombre de compartiments. Renvoie Int32.
-Pour plus d'informations, voir le lien: [JumpConsistentHash](https://arxiv.org/pdf/1406.2294.pdf)
-
-## murmurHash2_32, murmurHash2_64 {#murmurhash2-32-murmurhash2-64}
-
-Produit un [MurmurHash2](https://github.com/aappleby/smhasher) la valeur de hachage.
-
-``` sql
-murmurHash2_32(par1, ...)
-murmurHash2_64(par1, ...)
-```
-
-**Paramètre**
-
-Les deux fonctions prennent un nombre variable de paramètres d'entrée. Les paramètres peuvent être tout de la [types de données pris en charge](../../sql-reference/data-types/index.md).
-
-**Valeur Renvoyée**
-
--   Le `murmurHash2_32` fonction renvoie la valeur de hachage ayant le [UInt32](../../sql-reference/data-types/int-uint.md) type de données.
--   Le `murmurHash2_64` fonction renvoie la valeur de hachage ayant le [UInt64](../../sql-reference/data-types/int-uint.md) type de données.
-
-**Exemple**
-
-``` sql
-SELECT murmurHash2_64(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')) AS MurmurHash2, toTypeName(MurmurHash2) AS type
-```
-
-``` text
-┌──────────MurmurHash2─┬─type───┐
-│ 11832096901709403633 │ UInt64 │
-└──────────────────────┴────────┘
-```
-
-## gccMurmurHash {#gccmurmurhash}
-
-Calcule un 64 bits [MurmurHash2](https://github.com/aappleby/smhasher) valeur de hachage utilisant la même graine de hachage que [gcc](https://github.com/gcc-mirror/gcc/blob/41d6b10e96a1de98e90a7c0378437c3255814b16/libstdc%2B%2B-v3/include/bits/functional_hash.h#L191). Il est portable entre Clang et GCC construit.
-
-**Syntaxe**
-
-``` sql
-gccMurmurHash(par1, ...);
-```
-
-**Paramètre**
-
--   `par1, ...` — A variable number of parameters that can be any of the [types de données pris en charge](../../sql-reference/data-types/index.md#data_types).
-
-**Valeur renvoyée**
-
--   Valeur de hachage calculée.
-
-Type: [UInt64](../../sql-reference/data-types/int-uint.md).
-
-**Exemple**
-
-Requête:
-
-``` sql
-SELECT
-    gccMurmurHash(1, 2, 3) AS res1,
-    gccMurmurHash(('a', [1, 2, 3], 4, (4, ['foo', 'bar'], 1, (1, 2)))) AS res2
-```
-
-Résultat:
-
-``` text
-┌─────────────────res1─┬────────────────res2─┐
-│ 12384823029245979431 │ 1188926775431157506 │
-└──────────────────────┴─────────────────────┘
-```
-
-## murmurHash3_32, murmurHash3_64 {#murmurhash3-32-murmurhash3-64}
-
-Produit un [MurmurHash3](https://github.com/aappleby/smhasher) la valeur de hachage.
-
-``` sql
-murmurHash3_32(par1, ...)
-murmurHash3_64(par1, ...)
-```
-
-**Paramètre**
-
-Les deux fonctions prennent un nombre variable de paramètres d'entrée. Les paramètres peuvent être tout de la [types de données pris en charge](../../sql-reference/data-types/index.md).
-
-**Valeur Renvoyée**
-
--   Le `murmurHash3_32` la fonction retourne un [UInt32](../../sql-reference/data-types/int-uint.md) valeur de hachage du type de données.
--   Le `murmurHash3_64` la fonction retourne un [UInt64](../../sql-reference/data-types/int-uint.md) valeur de hachage du type de données.
-
-**Exemple**
-
-``` sql
-SELECT murmurHash3_32(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')) AS MurmurHash3, toTypeName(MurmurHash3) AS type
-```
-
-``` text
-┌─MurmurHash3─┬─type───┐
-│     2152717 │ UInt32 │
-└─────────────┴────────┘
-```
-
-## murmurHash3_128 {#murmurhash3-128}
-
-Produit de 128 bits [MurmurHash3](https://github.com/aappleby/smhasher) la valeur de hachage.
-
-``` sql
-murmurHash3_128( expr )
-```
-
-**Paramètre**
-
--   `expr` — [Expression](../syntax.md#syntax-expressions) de retour d'un [Chaîne](../../sql-reference/data-types/string.md)-le type de la valeur.
-
-**Valeur Renvoyée**
-
-A [FixedString (16)](../../sql-reference/data-types/fixedstring.md) valeur de hachage du type de données.
-
-**Exemple**
-
-``` sql
-SELECT murmurHash3_128('example_string') AS MurmurHash3, toTypeName(MurmurHash3) AS type
-```
-
-``` text
-┌─MurmurHash3──────┬─type────────────┐
-│ 6�1�4"S5KT�~~q │ FixedString(16) │
-└──────────────────┴─────────────────┘
-```
-
-## xxHash32, xxHash64 {#hash-functions-xxhash32}
-
-Calculer `xxHash` à partir d'une chaîne. Il est proposé en deux saveurs, 32 et 64 bits.
-
-``` sql
-SELECT xxHash32('');
-
-OR
-
-SELECT xxHash64('');
-```
-
-**Valeur renvoyée**
-
-A `Uint32` ou `Uint64` valeur de hachage du type de données.
-
-Type: `xxHash`.
-
-**Exemple**
-
-Requête:
-
-``` sql
-SELECT xxHash32('Hello, world!');
-```
-
-Résultat:
-
-``` text
-┌─xxHash32('Hello, world!')─┐
-│                 834093149 │
-└───────────────────────────┘
-```
-
-**Voir Aussi**
-
--   [xxHash](http://cyan4973.github.io/xxHash/).
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/functions/hash_functions/) <!--hide-->
diff --git a/docs/fr/sql-reference/functions/higher-order-functions.md b/docs/fr/sql-reference/functions/higher-order-functions.md
deleted file mode 100644
index ac24b67bb97..00000000000
--- a/docs/fr/sql-reference/functions/higher-order-functions.md
+++ /dev/null
@@ -1,264 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 57
-toc_title: "D'Ordre Sup\xE9rieur"
----
-
-# Fonctions d'ordre supérieur {#higher-order-functions}
-
-## `->` opérateur, fonction lambda (params, expr) {#operator-lambdaparams-expr-function}
-
-Allows describing a lambda function for passing to a higher-order function. The left side of the arrow has a formal parameter, which is any ID, or multiple formal parameters – any IDs in a tuple. The right side of the arrow has an expression that can use these formal parameters, as well as any table columns.
-
-Exemple: `x -> 2 * x, str -> str != Referer.`
-
-Les fonctions d'ordre supérieur ne peuvent accepter que les fonctions lambda comme argument fonctionnel.
-
-Une fonction lambda qui accepte plusieurs arguments peuvent être passés à une fonction d'ordre supérieur. Dans ce cas, la fonction d'ordre supérieur est passé plusieurs tableaux de longueur identique que ces arguments correspondent.
-
-Pour certaines fonctions, telles que [arrayCount](#higher_order_functions-array-count) ou [arraySum](#higher_order_functions-array-count) le premier argument (la fonction lambda) peut être omis. Dans ce cas, un mappage identique est supposé.
-
-Une fonction lambda ne peut pas être omise pour les fonctions suivantes:
-
--   [arrayMap](#higher_order_functions-array-map)
--   [arrayFilter](#higher_order_functions-array-filter)
--   [arrayFill](#higher_order_functions-array-fill)
--   [arrayReverseFill](#higher_order_functions-array-reverse-fill)
--   [arraySplit](#higher_order_functions-array-split)
--   [arrayReverseSplit](#higher_order_functions-array-reverse-split)
--   [arrayFirst](#higher_order_functions-array-first)
--   [arrayFirstIndex](#higher_order_functions-array-first-index)
-
-### arrayMap(func, arr1, …) {#higher_order_functions-array-map}
-
-Renvoie un tableau obtenu à partir de l'application d'origine `func` fonction à chaque élément dans le `arr` tableau.
-
-Exemple:
-
-``` sql
-SELECT arrayMap(x -> (x + 2), [1, 2, 3]) as res;
-```
-
-``` text
-┌─res─────┐
-│ [3,4,5] │
-└─────────┘
-```
-
-L'exemple suivant montre comment créer un n-uplet d'éléments de différents tableaux:
-
-``` sql
-SELECT arrayMap((x, y) -> (x, y), [1, 2, 3], [4, 5, 6]) AS res
-```
-
-``` text
-┌─res─────────────────┐
-│ [(1,4),(2,5),(3,6)] │
-└─────────────────────┘
-```
-
-Notez que le premier argument (fonction lambda) ne peut pas être omis dans le `arrayMap` fonction.
-
-### arrayFilter(func, arr1, …) {#higher_order_functions-array-filter}
-
-Renvoie un tableau contenant uniquement les éléments `arr1` pour ce qui `func` retourne autre chose que 0.
-
-Exemple:
-
-``` sql
-SELECT arrayFilter(x -> x LIKE '%World%', ['Hello', 'abc World']) AS res
-```
-
-``` text
-┌─res───────────┐
-│ ['abc World'] │
-└───────────────┘
-```
-
-``` sql
-SELECT
-    arrayFilter(
-        (i, x) -> x LIKE '%World%',
-        arrayEnumerate(arr),
-        ['Hello', 'abc World'] AS arr)
-    AS res
-```
-
-``` text
-┌─res─┐
-│ [2] │
-└─────┘
-```
-
-Notez que le premier argument (fonction lambda) ne peut pas être omis dans le `arrayFilter` fonction.
-
-### arrayFill(func, arr1, …) {#higher_order_functions-array-fill}
-
-Analyse par le biais de `arr1` du premier élément au dernier élément et remplacer `arr1[i]` par `arr1[i - 1]` si `func` renvoie 0. Le premier élément de `arr1` ne sera pas remplacé.
-
-Exemple:
-
-``` sql
-SELECT arrayFill(x -> not isNull(x), [1, null, 3, 11, 12, null, null, 5, 6, 14, null, null]) AS res
-```
-
-``` text
-┌─res──────────────────────────────┐
-│ [1,1,3,11,12,12,12,5,6,14,14,14] │
-└──────────────────────────────────┘
-```
-
-Notez que le premier argument (fonction lambda) ne peut pas être omis dans le `arrayFill` fonction.
-
-### arrayReverseFill(func, arr1, …) {#higher_order_functions-array-reverse-fill}
-
-Analyse par le biais de `arr1` du dernier élément au premier élément et remplacer `arr1[i]` par `arr1[i + 1]` si `func` renvoie 0. Le dernier élément de `arr1` ne sera pas remplacé.
-
-Exemple:
-
-``` sql
-SELECT arrayReverseFill(x -> not isNull(x), [1, null, 3, 11, 12, null, null, 5, 6, 14, null, null]) AS res
-```
-
-``` text
-┌─res────────────────────────────────┐
-│ [1,3,3,11,12,5,5,5,6,14,NULL,NULL] │
-└────────────────────────────────────┘
-```
-
-Notez que le premier argument (fonction lambda) ne peut pas être omis dans le `arrayReverseFill` fonction.
-
-### arraySplit(func, arr1, …) {#higher_order_functions-array-split}
-
-Split `arr1` en plusieurs tableaux. Lorsque `func` retourne autre chose que 0, la matrice sera de split sur le côté gauche de l'élément. Le tableau ne sera pas partagé avant le premier élément.
-
-Exemple:
-
-``` sql
-SELECT arraySplit((x, y) -> y, [1, 2, 3, 4, 5], [1, 0, 0, 1, 0]) AS res
-```
-
-``` text
-┌─res─────────────┐
-│ [[1,2,3],[4,5]] │
-└─────────────────┘
-```
-
-Notez que le premier argument (fonction lambda) ne peut pas être omis dans le `arraySplit` fonction.
-
-### arrayReverseSplit(func, arr1, …) {#higher_order_functions-array-reverse-split}
-
-Split `arr1` en plusieurs tableaux. Lorsque `func` retourne autre chose que 0, la matrice sera de split sur le côté droit de l'élément. Le tableau ne sera pas divisé après le dernier élément.
-
-Exemple:
-
-``` sql
-SELECT arrayReverseSplit((x, y) -> y, [1, 2, 3, 4, 5], [1, 0, 0, 1, 0]) AS res
-```
-
-``` text
-┌─res───────────────┐
-│ [[1],[2,3,4],[5]] │
-└───────────────────┘
-```
-
-Notez que le premier argument (fonction lambda) ne peut pas être omis dans le `arraySplit` fonction.
-
-### arrayCount(\[func,\] arr1, …) {#higher_order_functions-array-count}
-
-Renvoie le nombre d'éléments dans l'arr tableau pour lequel func renvoie autre chose que 0. Si ‘func’ n'est pas spécifié, il renvoie le nombre d'éléments non nuls dans le tableau.
-
-### arrayExists(\[func,\] arr1, …) {#arrayexistsfunc-arr1}
-
-Renvoie 1 s'il existe au moins un élément ‘arr’ pour ce qui ‘func’ retourne autre chose que 0. Sinon, il renvoie 0.
-
-### arrayAll(\[func,\] arr1, …) {#arrayallfunc-arr1}
-
-Renvoie 1 si ‘func’ retourne autre chose que 0 pour tous les éléments de ‘arr’. Sinon, il renvoie 0.
-
-### arraySum(\[func,\] arr1, …) {#higher-order-functions-array-sum}
-
-Renvoie la somme de la ‘func’ valeur. Si la fonction est omise, elle retourne la somme des éléments du tableau.
-
-### arrayFirst(func, arr1, …) {#higher_order_functions-array-first}
-
-Renvoie le premier élément du ‘arr1’ tableau pour lequel ‘func’ retourne autre chose que 0.
-
-Notez que le premier argument (fonction lambda) ne peut pas être omis dans le `arrayFirst` fonction.
-
-### arrayFirstIndex(func, arr1, …) {#higher_order_functions-array-first-index}
-
-Renvoie l'index du premier élément de la ‘arr1’ tableau pour lequel ‘func’ retourne autre chose que 0.
-
-Notez que le premier argument (fonction lambda) ne peut pas être omis dans le `arrayFirstIndex` fonction.
-
-### arrayCumSum(\[func,\] arr1, …) {#arraycumsumfunc-arr1}
-
-Retourne un tableau des sommes partielles d'éléments dans le tableau source (une somme). Si l' `func` la fonction est spécifiée, les valeurs des éléments du tableau sont convertis par cette fonction avant l'addition.
-
-Exemple:
-
-``` sql
-SELECT arrayCumSum([1, 1, 1, 1]) AS res
-```
-
-``` text
-┌─res──────────┐
-│ [1, 2, 3, 4] │
-└──────────────┘
-```
-
-### arrayCumSumNonNegative (arr) {#arraycumsumnonnegativearr}
-
-Même que `arrayCumSum`, renvoie un tableau des sommes partielles d'éléments dans le tableau source (une somme). Différent `arrayCumSum`, lorsque la valeur renvoyée contient une valeur inférieure à zéro, la valeur est remplacée par zéro et le calcul ultérieur est effectué avec des paramètres zéro. Exemple:
-
-``` sql
-SELECT arrayCumSumNonNegative([1, 1, -4, 1]) AS res
-```
-
-``` text
-┌─res───────┐
-│ [1,2,0,1] │
-└───────────┘
-```
-
-### arraySort(\[func,\] arr1, …) {#arraysortfunc-arr1}
-
-Renvoie un tableau à la suite du tri des éléments de `arr1` dans l'ordre croissant. Si l' `func` la fonction est spécifiée, l'ordre de classement est déterminé par le résultat de la fonction `func` appliquée aux éléments du tableau (tableaux)
-
-Le [Transformation schwartzienne](https://en.wikipedia.org/wiki/Schwartzian_transform) est utilisé pour améliorer l'efficacité du tri.
-
-Exemple:
-
-``` sql
-SELECT arraySort((x, y) -> y, ['hello', 'world'], [2, 1]);
-```
-
-``` text
-┌─res────────────────┐
-│ ['world', 'hello'] │
-└────────────────────┘
-```
-
-Pour plus d'informations sur la `arraySort` la méthode, voir l' [Fonctions pour travailler avec des tableaux](array-functions.md#array_functions-sort) section.
-
-### arrayReverseSort(\[func,\] arr1, …) {#arrayreversesortfunc-arr1}
-
-Renvoie un tableau à la suite du tri des éléments de `arr1` dans l'ordre décroissant. Si l' `func` la fonction est spécifiée, l'ordre de classement est déterminé par le résultat de la fonction `func` appliquée aux éléments du tableau (tableaux).
-
-Exemple:
-
-``` sql
-SELECT arrayReverseSort((x, y) -> y, ['hello', 'world'], [2, 1]) as res;
-```
-
-``` text
-┌─res───────────────┐
-│ ['hello','world'] │
-└───────────────────┘
-```
-
-Pour plus d'informations sur la `arrayReverseSort` la méthode, voir l' [Fonctions pour travailler avec des tableaux](array-functions.md#array_functions-reverse-sort) section.
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/functions/higher_order_functions/) <!--hide-->
diff --git a/docs/fr/sql-reference/functions/in-functions.md b/docs/fr/sql-reference/functions/in-functions.md
deleted file mode 100644
index ced5ef73e46..00000000000
--- a/docs/fr/sql-reference/functions/in-functions.md
+++ /dev/null
@@ -1,26 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 60
-toc_title: "Mise en \u0153uvre de L'op\xE9rateur IN"
----
-
-# Fonctions de mise en œuvre de L'opérateur IN {#functions-for-implementing-the-in-operator}
-
-## in, notin, globalIn, globalNotIn {#in-functions}
-
-Voir la section [Dans les opérateurs](../operators/in.md#select-in-operators).
-
-## tuple(x, y, …), operator (x, y, …) {#tuplex-y-operator-x-y}
-
-Une fonction qui permet de regrouper plusieurs colonnes.
-For columns with the types T1, T2, …, it returns a Tuple(T1, T2, …) type tuple containing these columns. There is no cost to execute the function.
-Les Tuples sont normalement utilisés comme valeurs intermédiaires pour un argument D'opérateurs IN, ou pour créer une liste de paramètres formels de fonctions lambda. Les Tuples ne peuvent pas être écrits sur une table.
-
-## tupleElement (tuple, n), opérateur X. N {#tupleelementtuple-n-operator-x-n}
-
-Une fonction qui permet d'obtenir une colonne à partir d'un tuple.
-‘N’ est l'index de colonne, à partir de 1. N doit être une constante. ‘N’ doit être une constante. ‘N’ doit être un entier postif strict ne dépassant pas la taille du tuple.
-Il n'y a aucun coût pour exécuter la fonction.
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/functions/in_functions/) <!--hide-->
diff --git a/docs/fr/sql-reference/functions/index.md b/docs/fr/sql-reference/functions/index.md
deleted file mode 100644
index 6e5333f68f5..00000000000
--- a/docs/fr/sql-reference/functions/index.md
+++ /dev/null
@@ -1,74 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: Fonction
-toc_priority: 32
-toc_title: Introduction
----
-
-# Fonction {#functions}
-
-Il y a au moins\* deux types de fonctions - des fonctions régulières (elles sont simplement appelées “functions”) and aggregate functions. These are completely different concepts. Regular functions work as if they are applied to each row separately (for each row, the result of the function doesn't depend on the other rows). Aggregate functions accumulate a set of values from various rows (i.e. they depend on the entire set of rows).
-
-Dans cette section, nous discutons des fonctions classiques. Pour les fonctions d'agrégation, voir la section “Aggregate functions”.
-
-\* - Il existe un troisième type de fonction ‘arrayJoin’ la fonction appartient à; les fonctions de table peuvent également être mentionnées séparément.\*
-
-## Typage Fort {#strong-typing}
-
-Contrairement à SQL standard, ClickHouse a une forte typage. En d'autres termes, il ne fait pas de conversions implicites entre les types. Chaque fonction fonctionne pour un ensemble spécifique de types. Cela signifie que vous devez parfois utiliser des fonctions de conversion de type.
-
-## Élimination Des Sous-Expressions Courantes {#common-subexpression-elimination}
-
-Toutes les expressions d'une requête qui ont le même AST (le même enregistrement ou le même résultat d'analyse syntaxique) sont considérées comme ayant des valeurs identiques. De telles expressions sont concaténées et exécutées une fois. Les sous-requêtes identiques sont également éliminées de cette façon.
-
-## Types de résultats {#types-of-results}
-
-Toutes les fonctions renvoient un seul retour comme résultat (pas plusieurs valeurs, et pas des valeurs nulles). Le type de résultat est généralement défini uniquement par les types d'arguments, pas par les valeurs. Les Exceptions sont la fonction tupleElement (l'opérateur A. N) et la fonction toFixedString.
-
-## Constant {#constants}
-
-Pour simplifier, certaines fonctions ne peuvent fonctionner qu'avec des constantes pour certains arguments. Par exemple, le bon argument de L'opérateur LIKE doit être une constante.
-Presque toutes les fonctions renvoient une constante pour des arguments constants. L'exception est les fonctions qui génèrent des nombres aléatoires.
-Le ‘now’ function renvoie des valeurs différentes pour les requêtes qui ont été exécutées à des moments différents, mais le résultat est considéré comme une constante, car la constance n'est importante que dans une seule requête.
-Une expression constante est également considérée comme une constante (par exemple, la moitié droite de L'opérateur LIKE peut être construite à partir de plusieurs constantes).
-
-Les fonctions peuvent être implémentées de différentes manières pour des arguments constants et non constants (un code différent est exécuté). Mais les résultats pour une constante et pour une colonne vraie Ne contenant que la même valeur doivent correspondre les uns aux autres.
-
-## Le Traitement NULL {#null-processing}
-
-Les fonctions ont les comportements suivants:
-
--   Si au moins l'un des arguments de la fonction est `NULL` le résultat de la fonction est également `NULL`.
--   Comportement spécial spécifié individuellement dans la description de chaque fonction. Dans le code source de ClickHouse, ces fonctions ont `UseDefaultImplementationForNulls=false`.
-
-## Constance {#constancy}
-
-Functions can't change the values of their arguments – any changes are returned as the result. Thus, the result of calculating separate functions does not depend on the order in which the functions are written in the query.
-
-## Erreur De Manipulation {#error-handling}
-
-Certaines fonctions peuvent lancer une exception si les données ne sont pas valides. Dans ce cas, la requête est annulée et un message d'erreur est retourné au client. Pour le traitement distribué, lorsqu'une exception se produit sur l'un des serveurs, les autres serveurs aussi tenté d'interrompre la requête.
-
-## Évaluation des Expressions D'Argument {#evaluation-of-argument-expressions}
-
-Dans presque tous les langages de programmation, l'un des arguments peut pas être évalué pour certains opérateurs. Ce sont généralement les opérateurs `&&`, `||`, et `?:`.
-Mais dans ClickHouse, les arguments des fonctions (opérateurs) sont toujours évalués. En effet, des parties entières de colonnes sont évaluées à la fois, au lieu de calculer chaque ligne séparément.
-
-## Exécution de fonctions pour le traitement de requêtes distribuées {#performing-functions-for-distributed-query-processing}
-
-Pour le traitement de requête distribué, autant d'étapes de traitement de requête que possible sont effectuées sur des serveurs distants, et le reste des étapes (fusion des résultats intermédiaires et tout ce qui suit) sont effectuées sur le serveur demandeur.
-
-Cela signifie que les fonctions peuvent être effectuées sur différents serveurs.
-Par exemple, dans la requête `SELECT f(sum(g(x))) FROM distributed_table GROUP BY h(y),`
-
--   si un `distributed_table` a au moins deux fragments, les fonctions ‘g’ et ‘h’ sont effectuées sur des serveurs distants, et la fonction ‘f’ est effectuée sur le serveur demandeur.
--   si un `distributed_table` a un seul fragment, tous les ‘f’, ‘g’, et ‘h’ les fonctions sont exécutées sur le serveur de ce fragment.
-
-Le résultat d'une fonction habituellement ne dépendent pas le serveur sur lequel elle est exécutée. Cependant, parfois c'est important.
-Par exemple, les fonctions qui fonctionnent avec des dictionnaires utilisent le dictionnaire qui existe sur le serveur sur lequel elles s'exécutent.
-Un autre exemple est l' `hostName` fonction, qui renvoie le nom du serveur sur lequel il s'exécute afin de `GROUP BY` par les serveurs dans un `SELECT` requête.
-
-Si une fonction dans une requête est effectuée sur le demandeur serveur, mais vous devez l'exécuter sur des serveurs distants, vous pouvez l'envelopper dans un ‘any’ fonction d'agrégation ou l'ajouter à une clé dans `GROUP BY`.
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/functions/) <!--hide-->
diff --git a/docs/fr/sql-reference/functions/introspection.md b/docs/fr/sql-reference/functions/introspection.md
deleted file mode 100644
index 91299217dc7..00000000000
--- a/docs/fr/sql-reference/functions/introspection.md
+++ /dev/null
@@ -1,310 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 65
-toc_title: Introspection
----
-
-# Fonctions D'Introspection {#introspection-functions}
-
-Vous pouvez utiliser les fonctions décrites dans ce chapitre pour introspecter [ELF](https://en.wikipedia.org/wiki/Executable_and_Linkable_Format) et [DWARF](https://en.wikipedia.org/wiki/DWARF) pour le profilage de requête.
-
-!!! warning "Avertissement"
-    Ces fonctions sont lentes et peuvent imposer des considérations de sécurité.
-
-Pour le bon fonctionnement des fonctions d'introspection:
-
--   Installer le `clickhouse-common-static-dbg` paquet.
-
--   Définir le [allow_introspection_functions](../../operations/settings/settings.md#settings-allow_introspection_functions) réglage sur 1.
-
-        For security reasons introspection functions are disabled by default.
-
-Clickhouse enregistre les rapports du profileur [trace_log](../../operations/system-tables.md#system_tables-trace_log) système de table. Assurez-vous que la table et le profileur sont correctement configurés.
-
-## addressToLine {#addresstoline}
-
-Convertit l'adresse de mémoire virtuelle dans le processus de serveur ClickHouse en nom de fichier et en numéro de ligne dans le code source de ClickHouse.
-
-Si vous utilisez des paquets clickhouse officiels, vous devez installer le `clickhouse-common-static-dbg` paquet.
-
-**Syntaxe**
-
-``` sql
-addressToLine(address_of_binary_instruction)
-```
-
-**Paramètre**
-
--   `address_of_binary_instruction` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Address of instruction in a running process.
-
-**Valeur renvoyée**
-
--   Nom de fichier du code Source et le numéro de ligne dans ce fichier délimité par deux-points.
-
-        For example, `/build/obj-x86_64-linux-gnu/../src/Common/ThreadPool.cpp:199`, where `199` is a line number.
-
--   Nom d'un binaire, si la fonction n'a pas pu trouver les informations de débogage.
-
--   Chaîne vide, si l'adresse n'est pas valide.
-
-Type: [Chaîne](../../sql-reference/data-types/string.md).
-
-**Exemple**
-
-Activation des fonctions d'introspection:
-
-``` sql
-SET allow_introspection_functions=1
-```
-
-Sélection de la première chaîne de `trace_log` système de table:
-
-``` sql
-SELECT * FROM system.trace_log LIMIT 1 \G
-```
-
-``` text
-Row 1:
-──────
-event_date:              2019-11-19
-event_time:              2019-11-19 18:57:23
-revision:                54429
-timer_type:              Real
-thread_number:           48
-query_id:                421b6855-1858-45a5-8f37-f383409d6d72
-trace:                   [140658411141617,94784174532828,94784076370703,94784076372094,94784076361020,94784175007680,140658411116251,140658403895439]
-```
-
-Le `trace` champ contient la trace de pile au moment de l'échantillonnage.
-
-Obtenir le nom de fichier du code source et le numéro de ligne pour une seule adresse:
-
-``` sql
-SELECT addressToLine(94784076370703) \G
-```
-
-``` text
-Row 1:
-──────
-addressToLine(94784076370703): /build/obj-x86_64-linux-gnu/../src/Common/ThreadPool.cpp:199
-```
-
-Application de la fonction à la trace de la pile entière:
-
-``` sql
-SELECT
-    arrayStringConcat(arrayMap(x -> addressToLine(x), trace), '\n') AS trace_source_code_lines
-FROM system.trace_log
-LIMIT 1
-\G
-```
-
-Le [arrayMap](higher-order-functions.md#higher_order_functions-array-map) permet de traiter chaque élément individuel de l' `trace` tableau par la `addressToLine` fonction. Le résultat de ce traitement que vous voyez dans l' `trace_source_code_lines` colonne de sortie.
-
-``` text
-Row 1:
-──────
-trace_source_code_lines: /lib/x86_64-linux-gnu/libpthread-2.27.so
-/usr/lib/debug/usr/bin/clickhouse
-/build/obj-x86_64-linux-gnu/../src/Common/ThreadPool.cpp:199
-/build/obj-x86_64-linux-gnu/../src/Common/ThreadPool.h:155
-/usr/include/c++/9/bits/atomic_base.h:551
-/usr/lib/debug/usr/bin/clickhouse
-/lib/x86_64-linux-gnu/libpthread-2.27.so
-/build/glibc-OTsEL5/glibc-2.27/misc/../sysdeps/unix/sysv/linux/x86_64/clone.S:97
-```
-
-## adressetosymbol {#addresstosymbol}
-
-Convertit l'adresse de mémoire virtuelle dans le processus de serveur ClickHouse en symbole à partir des fichiers d'objets ClickHouse.
-
-**Syntaxe**
-
-``` sql
-addressToSymbol(address_of_binary_instruction)
-```
-
-**Paramètre**
-
--   `address_of_binary_instruction` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Address of instruction in a running process.
-
-**Valeur renvoyée**
-
--   Symbole des fichiers D'objets ClickHouse.
--   Chaîne vide, si l'adresse n'est pas valide.
-
-Type: [Chaîne](../../sql-reference/data-types/string.md).
-
-**Exemple**
-
-Activation des fonctions d'introspection:
-
-``` sql
-SET allow_introspection_functions=1
-```
-
-Sélection de la première chaîne de `trace_log` système de table:
-
-``` sql
-SELECT * FROM system.trace_log LIMIT 1 \G
-```
-
-``` text
-Row 1:
-──────
-event_date:    2019-11-20
-event_time:    2019-11-20 16:57:59
-revision:      54429
-timer_type:    Real
-thread_number: 48
-query_id:      724028bf-f550-45aa-910d-2af6212b94ac
-trace:         [94138803686098,94138815010911,94138815096522,94138815101224,94138815102091,94138814222988,94138806823642,94138814457211,94138806823642,94138814457211,94138806823642,94138806795179,94138806796144,94138753770094,94138753771646,94138753760572,94138852407232,140399185266395,140399178045583]
-```
-
-Le `trace` champ contient la trace de pile au moment de l'échantillonnage.
-
-Obtenir un symbole pour une seule adresse:
-
-``` sql
-SELECT addressToSymbol(94138803686098) \G
-```
-
-``` text
-Row 1:
-──────
-addressToSymbol(94138803686098): _ZNK2DB24IAggregateFunctionHelperINS_20AggregateFunctionSumImmNS_24AggregateFunctionSumDataImEEEEE19addBatchSinglePlaceEmPcPPKNS_7IColumnEPNS_5ArenaE
-```
-
-Application de la fonction à la trace de la pile entière:
-
-``` sql
-SELECT
-    arrayStringConcat(arrayMap(x -> addressToSymbol(x), trace), '\n') AS trace_symbols
-FROM system.trace_log
-LIMIT 1
-\G
-```
-
-Le [arrayMap](higher-order-functions.md#higher_order_functions-array-map) permet de traiter chaque élément individuel de l' `trace` tableau par la `addressToSymbols` fonction. Le résultat de ce traitement que vous voyez dans l' `trace_symbols` colonne de sortie.
-
-``` text
-Row 1:
-──────
-trace_symbols: _ZNK2DB24IAggregateFunctionHelperINS_20AggregateFunctionSumImmNS_24AggregateFunctionSumDataImEEEEE19addBatchSinglePlaceEmPcPPKNS_7IColumnEPNS_5ArenaE
-_ZNK2DB10Aggregator21executeWithoutKeyImplERPcmPNS0_28AggregateFunctionInstructionEPNS_5ArenaE
-_ZN2DB10Aggregator14executeOnBlockESt6vectorIN3COWINS_7IColumnEE13immutable_ptrIS3_EESaIS6_EEmRNS_22AggregatedDataVariantsERS1_IPKS3_SaISC_EERS1_ISE_SaISE_EERb
-_ZN2DB10Aggregator14executeOnBlockERKNS_5BlockERNS_22AggregatedDataVariantsERSt6vectorIPKNS_7IColumnESaIS9_EERS6_ISB_SaISB_EERb
-_ZN2DB10Aggregator7executeERKSt10shared_ptrINS_17IBlockInputStreamEERNS_22AggregatedDataVariantsE
-_ZN2DB27AggregatingBlockInputStream8readImplEv
-_ZN2DB17IBlockInputStream4readEv
-_ZN2DB26ExpressionBlockInputStream8readImplEv
-_ZN2DB17IBlockInputStream4readEv
-_ZN2DB26ExpressionBlockInputStream8readImplEv
-_ZN2DB17IBlockInputStream4readEv
-_ZN2DB28AsynchronousBlockInputStream9calculateEv
-_ZNSt17_Function_handlerIFvvEZN2DB28AsynchronousBlockInputStream4nextEvEUlvE_E9_M_invokeERKSt9_Any_data
-_ZN14ThreadPoolImplI20ThreadFromGlobalPoolE6workerESt14_List_iteratorIS0_E
-_ZZN20ThreadFromGlobalPoolC4IZN14ThreadPoolImplIS_E12scheduleImplIvEET_St8functionIFvvEEiSt8optionalImEEUlvE1_JEEEOS4_DpOT0_ENKUlvE_clEv
-_ZN14ThreadPoolImplISt6threadE6workerESt14_List_iteratorIS0_E
-execute_native_thread_routine
-start_thread
-clone
-```
-
-## demangle {#demangle}
-
-Convertit un symbole que vous pouvez obtenir en utilisant le [adressetosymbol](#addresstosymbol) fonction au nom de la fonction c++.
-
-**Syntaxe**
-
-``` sql
-demangle(symbol)
-```
-
-**Paramètre**
-
--   `symbol` ([Chaîne](../../sql-reference/data-types/string.md)) — Symbol from an object file.
-
-**Valeur renvoyée**
-
--   Nom de la fonction C++.
--   Chaîne vide si un symbole n'est pas valide.
-
-Type: [Chaîne](../../sql-reference/data-types/string.md).
-
-**Exemple**
-
-Activation des fonctions d'introspection:
-
-``` sql
-SET allow_introspection_functions=1
-```
-
-Sélection de la première chaîne de `trace_log` système de table:
-
-``` sql
-SELECT * FROM system.trace_log LIMIT 1 \G
-```
-
-``` text
-Row 1:
-──────
-event_date:    2019-11-20
-event_time:    2019-11-20 16:57:59
-revision:      54429
-timer_type:    Real
-thread_number: 48
-query_id:      724028bf-f550-45aa-910d-2af6212b94ac
-trace:         [94138803686098,94138815010911,94138815096522,94138815101224,94138815102091,94138814222988,94138806823642,94138814457211,94138806823642,94138814457211,94138806823642,94138806795179,94138806796144,94138753770094,94138753771646,94138753760572,94138852407232,140399185266395,140399178045583]
-```
-
-Le `trace` champ contient la trace de pile au moment de l'échantillonnage.
-
-Obtenir un nom de fonction pour une seule adresse:
-
-``` sql
-SELECT demangle(addressToSymbol(94138803686098)) \G
-```
-
-``` text
-Row 1:
-──────
-demangle(addressToSymbol(94138803686098)): DB::IAggregateFunctionHelper<DB::AggregateFunctionSum<unsigned long, unsigned long, DB::AggregateFunctionSumData<unsigned long> > >::addBatchSinglePlace(unsigned long, char*, DB::IColumn const**, DB::Arena*) const
-```
-
-Application de la fonction à la trace de la pile entière:
-
-``` sql
-SELECT
-    arrayStringConcat(arrayMap(x -> demangle(addressToSymbol(x)), trace), '\n') AS trace_functions
-FROM system.trace_log
-LIMIT 1
-\G
-```
-
-Le [arrayMap](higher-order-functions.md#higher_order_functions-array-map) permet de traiter chaque élément individuel de l' `trace` tableau par la `demangle` fonction. Le résultat de ce traitement que vous voyez dans l' `trace_functions` colonne de sortie.
-
-``` text
-Row 1:
-──────
-trace_functions: DB::IAggregateFunctionHelper<DB::AggregateFunctionSum<unsigned long, unsigned long, DB::AggregateFunctionSumData<unsigned long> > >::addBatchSinglePlace(unsigned long, char*, DB::IColumn const**, DB::Arena*) const
-DB::Aggregator::executeWithoutKeyImpl(char*&, unsigned long, DB::Aggregator::AggregateFunctionInstruction*, DB::Arena*) const
-DB::Aggregator::executeOnBlock(std::vector<COW<DB::IColumn>::immutable_ptr<DB::IColumn>, std::allocator<COW<DB::IColumn>::immutable_ptr<DB::IColumn> > >, unsigned long, DB::AggregatedDataVariants&, std::vector<DB::IColumn const*, std::allocator<DB::IColumn const*> >&, std::vector<std::vector<DB::IColumn const*, std::allocator<DB::IColumn const*> >, std::allocator<std::vector<DB::IColumn const*, std::allocator<DB::IColumn const*> > > >&, bool&)
-DB::Aggregator::executeOnBlock(DB::Block const&, DB::AggregatedDataVariants&, std::vector<DB::IColumn const*, std::allocator<DB::IColumn const*> >&, std::vector<std::vector<DB::IColumn const*, std::allocator<DB::IColumn const*> >, std::allocator<std::vector<DB::IColumn const*, std::allocator<DB::IColumn const*> > > >&, bool&)
-DB::Aggregator::execute(std::shared_ptr<DB::IBlockInputStream> const&, DB::AggregatedDataVariants&)
-DB::AggregatingBlockInputStream::readImpl()
-DB::IBlockInputStream::read()
-DB::ExpressionBlockInputStream::readImpl()
-DB::IBlockInputStream::read()
-DB::ExpressionBlockInputStream::readImpl()
-DB::IBlockInputStream::read()
-DB::AsynchronousBlockInputStream::calculate()
-std::_Function_handler<void (), DB::AsynchronousBlockInputStream::next()::{lambda()#1}>::_M_invoke(std::_Any_data const&)
-ThreadPoolImpl<ThreadFromGlobalPool>::worker(std::_List_iterator<ThreadFromGlobalPool>)
-ThreadFromGlobalPool::ThreadFromGlobalPool<ThreadPoolImpl<ThreadFromGlobalPool>::scheduleImpl<void>(std::function<void ()>, int, std::optional<unsigned long>)::{lambda()#3}>(ThreadPoolImpl<ThreadFromGlobalPool>::scheduleImpl<void>(std::function<void ()>, int, std::optional<unsigned long>)::{lambda()#3}&&)::{lambda()#1}::operator()() const
-ThreadPoolImpl<std::thread>::worker(std::_List_iterator<std::thread>)
-execute_native_thread_routine
-start_thread
-clone
-```
diff --git a/docs/fr/sql-reference/functions/ip-address-functions.md b/docs/fr/sql-reference/functions/ip-address-functions.md
deleted file mode 100644
index 8beb40a534b..00000000000
--- a/docs/fr/sql-reference/functions/ip-address-functions.md
+++ /dev/null
@@ -1,248 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 55
-toc_title: Travailler avec des adresses IP
----
-
-# Fonctions pour travailler avec des adresses IP {#functions-for-working-with-ip-addresses}
-
-## IPv4NumToString (num) {#ipv4numtostringnum}
-
-Prend un numéro UInt32. Interprète comme une adresse IPv4 dans big endian. Renvoie une chaîne contenant l'adresse IPv4 correspondante au format A. B. C. d (Nombres séparés par des points sous forme décimale).
-
-## IPv4StringToNum (s) {#ipv4stringtonums}
-
-La fonction inverse de IPv4NumToString. Si L'adresse IPv4 a un format non valide, elle renvoie 0.
-
-## IPv4NumToStringClassC(num) {#ipv4numtostringclasscnum}
-
-Similaire à IPv4NumToString, mais en utilisant xxx au lieu du dernier octet.
-
-Exemple:
-
-``` sql
-SELECT
-    IPv4NumToStringClassC(ClientIP) AS k,
-    count() AS c
-FROM test.hits
-GROUP BY k
-ORDER BY c DESC
-LIMIT 10
-```
-
-``` text
-┌─k──────────────┬─────c─┐
-│ 83.149.9.xxx   │ 26238 │
-│ 217.118.81.xxx │ 26074 │
-│ 213.87.129.xxx │ 25481 │
-│ 83.149.8.xxx   │ 24984 │
-│ 217.118.83.xxx │ 22797 │
-│ 78.25.120.xxx  │ 22354 │
-│ 213.87.131.xxx │ 21285 │
-│ 78.25.121.xxx  │ 20887 │
-│ 188.162.65.xxx │ 19694 │
-│ 83.149.48.xxx  │ 17406 │
-└────────────────┴───────┘
-```
-
-Depuis l'utilisation de ‘xxx’ est très inhabituel, cela peut être changé à l'avenir. Nous vous recommandons de ne pas compter sur le format exact de ce fragment.
-
-### IPv6NumToString (x) {#ipv6numtostringx}
-
-Accepte une valeur FixedString (16) contenant L'adresse IPv6 au format binaire. Renvoie une chaîne contenant cette adresse au format texte.
-Les adresses IPv4 mappées IPv6 sont sorties au format:: ffff: 111.222.33.44. Exemple:
-
-``` sql
-SELECT IPv6NumToString(toFixedString(unhex('2A0206B8000000000000000000000011'), 16)) AS addr
-```
-
-``` text
-┌─addr─────────┐
-│ 2a02:6b8::11 │
-└──────────────┘
-```
-
-``` sql
-SELECT
-    IPv6NumToString(ClientIP6 AS k),
-    count() AS c
-FROM hits_all
-WHERE EventDate = today() AND substring(ClientIP6, 1, 12) != unhex('00000000000000000000FFFF')
-GROUP BY k
-ORDER BY c DESC
-LIMIT 10
-```
-
-``` text
-┌─IPv6NumToString(ClientIP6)──────────────┬─────c─┐
-│ 2a02:2168:aaa:bbbb::2                   │ 24695 │
-│ 2a02:2698:abcd:abcd:abcd:abcd:8888:5555 │ 22408 │
-│ 2a02:6b8:0:fff::ff                      │ 16389 │
-│ 2a01:4f8:111:6666::2                    │ 16016 │
-│ 2a02:2168:888:222::1                    │ 15896 │
-│ 2a01:7e00::ffff:ffff:ffff:222           │ 14774 │
-│ 2a02:8109:eee:ee:eeee:eeee:eeee:eeee    │ 14443 │
-│ 2a02:810b:8888:888:8888:8888:8888:8888  │ 14345 │
-│ 2a02:6b8:0:444:4444:4444:4444:4444      │ 14279 │
-│ 2a01:7e00::ffff:ffff:ffff:ffff          │ 13880 │
-└─────────────────────────────────────────┴───────┘
-```
-
-``` sql
-SELECT
-    IPv6NumToString(ClientIP6 AS k),
-    count() AS c
-FROM hits_all
-WHERE EventDate = today()
-GROUP BY k
-ORDER BY c DESC
-LIMIT 10
-```
-
-``` text
-┌─IPv6NumToString(ClientIP6)─┬──────c─┐
-│ ::ffff:94.26.111.111       │ 747440 │
-│ ::ffff:37.143.222.4        │ 529483 │
-│ ::ffff:5.166.111.99        │ 317707 │
-│ ::ffff:46.38.11.77         │ 263086 │
-│ ::ffff:79.105.111.111      │ 186611 │
-│ ::ffff:93.92.111.88        │ 176773 │
-│ ::ffff:84.53.111.33        │ 158709 │
-│ ::ffff:217.118.11.22       │ 154004 │
-│ ::ffff:217.118.11.33       │ 148449 │
-│ ::ffff:217.118.11.44       │ 148243 │
-└────────────────────────────┴────────┘
-```
-
-## IPv6StringToNum (s) {#ipv6stringtonums}
-
-La fonction inverse de IPv6NumToString. Si L'adresse IPv6 a un format non valide, elle renvoie une chaîne d'octets null.
-HEX peut être en majuscules ou en minuscules.
-
-## IPv4ToIPv6 (x) {#ipv4toipv6x}
-
-Prend un `UInt32` nombre. Interprète comme une adresse IPv4 dans [big endian](https://en.wikipedia.org/wiki/Endianness). Retourne un `FixedString(16)` valeur contenant l'adresse IPv6 au format binaire. Exemple:
-
-``` sql
-SELECT IPv6NumToString(IPv4ToIPv6(IPv4StringToNum('192.168.0.1'))) AS addr
-```
-
-``` text
-┌─addr───────────────┐
-│ ::ffff:192.168.0.1 │
-└────────────────────┘
-```
-
-## cutIPv6 (x, bytesToCutForIPv6, bytesToCutForIPv4) {#cutipv6x-bytestocutforipv6-bytestocutforipv4}
-
-Accepte une valeur FixedString (16) contenant L'adresse IPv6 au format binaire. Renvoie une chaîne contenant l'adresse du nombre spécifié d'octets retiré au format texte. Exemple:
-
-``` sql
-WITH
-    IPv6StringToNum('2001:0DB8:AC10:FE01:FEED:BABE:CAFE:F00D') AS ipv6,
-    IPv4ToIPv6(IPv4StringToNum('192.168.0.1')) AS ipv4
-SELECT
-    cutIPv6(ipv6, 2, 0),
-    cutIPv6(ipv4, 0, 2)
-```
-
-``` text
-┌─cutIPv6(ipv6, 2, 0)─────────────────┬─cutIPv6(ipv4, 0, 2)─┐
-│ 2001:db8:ac10:fe01:feed:babe:cafe:0 │ ::ffff:192.168.0.0  │
-└─────────────────────────────────────┴─────────────────────┘
-```
-
-## Ipv4cirtorange (ipv4, Cidr), {#ipv4cidrtorangeipv4-cidr}
-
-Accepte un IPv4 et une valeur UInt8 contenant [CIDR](https://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing). Renvoie un tuple avec deux IPv4 contenant la plage inférieure et la plage supérieure du sous-réseau.
-
-``` sql
-SELECT IPv4CIDRToRange(toIPv4('192.168.5.2'), 16)
-```
-
-``` text
-┌─IPv4CIDRToRange(toIPv4('192.168.5.2'), 16)─┐
-│ ('192.168.0.0','192.168.255.255')          │
-└────────────────────────────────────────────┘
-```
-
-## Ipv6cirtorange (ipv6, Cidr), {#ipv6cidrtorangeipv6-cidr}
-
-Accepte un IPv6 et une valeur UInt8 contenant le CIDR. Renvoie un tuple avec deux IPv6 contenant la plage inférieure et la plage supérieure du sous-réseau.
-
-``` sql
-SELECT IPv6CIDRToRange(toIPv6('2001:0db8:0000:85a3:0000:0000:ac1f:8001'), 32);
-```
-
-``` text
-┌─IPv6CIDRToRange(toIPv6('2001:0db8:0000:85a3:0000:0000:ac1f:8001'), 32)─┐
-│ ('2001:db8::','2001:db8:ffff:ffff:ffff:ffff:ffff:ffff')                │
-└────────────────────────────────────────────────────────────────────────┘
-```
-
-## toipv4 (chaîne) {#toipv4string}
-
-Un alias `IPv4StringToNum()` cela prend une forme de chaîne D'adresse IPv4 et renvoie la valeur de [IPv4](../../sql-reference/data-types/domains/ipv4.md) type, qui est binaire égal à la valeur renvoyée par `IPv4StringToNum()`.
-
-``` sql
-WITH
-    '171.225.130.45' as IPv4_string
-SELECT
-    toTypeName(IPv4StringToNum(IPv4_string)),
-    toTypeName(toIPv4(IPv4_string))
-```
-
-``` text
-┌─toTypeName(IPv4StringToNum(IPv4_string))─┬─toTypeName(toIPv4(IPv4_string))─┐
-│ UInt32                                   │ IPv4                            │
-└──────────────────────────────────────────┴─────────────────────────────────┘
-```
-
-``` sql
-WITH
-    '171.225.130.45' as IPv4_string
-SELECT
-    hex(IPv4StringToNum(IPv4_string)),
-    hex(toIPv4(IPv4_string))
-```
-
-``` text
-┌─hex(IPv4StringToNum(IPv4_string))─┬─hex(toIPv4(IPv4_string))─┐
-│ ABE1822D                          │ ABE1822D                 │
-└───────────────────────────────────┴──────────────────────────┘
-```
-
-## toipv6 (chaîne) {#toipv6string}
-
-Un alias `IPv6StringToNum()` cela prend une forme de chaîne D'adresse IPv6 et renvoie la valeur de [IPv6](../../sql-reference/data-types/domains/ipv6.md) type, qui est binaire égal à la valeur renvoyée par `IPv6StringToNum()`.
-
-``` sql
-WITH
-    '2001:438:ffff::407d:1bc1' as IPv6_string
-SELECT
-    toTypeName(IPv6StringToNum(IPv6_string)),
-    toTypeName(toIPv6(IPv6_string))
-```
-
-``` text
-┌─toTypeName(IPv6StringToNum(IPv6_string))─┬─toTypeName(toIPv6(IPv6_string))─┐
-│ FixedString(16)                          │ IPv6                            │
-└──────────────────────────────────────────┴─────────────────────────────────┘
-```
-
-``` sql
-WITH
-    '2001:438:ffff::407d:1bc1' as IPv6_string
-SELECT
-    hex(IPv6StringToNum(IPv6_string)),
-    hex(toIPv6(IPv6_string))
-```
-
-``` text
-┌─hex(IPv6StringToNum(IPv6_string))─┬─hex(toIPv6(IPv6_string))─────────┐
-│ 20010438FFFF000000000000407D1BC1  │ 20010438FFFF000000000000407D1BC1 │
-└───────────────────────────────────┴──────────────────────────────────┘
-```
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/functions/ip_address_functions/) <!--hide-->
diff --git a/docs/fr/sql-reference/functions/json-functions.md b/docs/fr/sql-reference/functions/json-functions.md
deleted file mode 100644
index 5f92c99d0f5..00000000000
--- a/docs/fr/sql-reference/functions/json-functions.md
+++ /dev/null
@@ -1,297 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 56
-toc_title: Travailler avec JSON
----
-
-# Fonctions pour travailler avec JSON {#functions-for-working-with-json}
-
-Dans Yandex.Metrica, JSON est transmis par les utilisateurs en tant que paramètres de session. Il y a quelques fonctions spéciales pour travailler avec ce JSON. (Bien que dans la plupart des cas, les JSONs soient en outre prétraités et les valeurs résultantes sont placées dans des colonnes séparées dans leur format traité.) Toutes ces fonctions sont basées sur des hypothèses fortes sur ce que le JSON peut être, mais elles essaient de faire le moins possible pour faire le travail.
-
-Les hypothèses suivantes sont apportées:
-
-1.  Le nom du champ (argument de fonction) doit être une constante.
-2.  Le nom du champ est en quelque sorte codé canoniquement dans JSON. Exemple: `visitParamHas('{"abc":"def"}', 'abc') = 1`, mais `visitParamHas('{"\\u0061\\u0062\\u0063":"def"}', 'abc') = 0`
-3.  Les champs sont recherchés à n'importe quel niveau d'imbrication, sans discrimination. S'il y a plusieurs champs correspondants, la première occurrence est utilisé.
-4.  Le JSON n'a pas de caractères d'espace en dehors des littéraux de chaîne.
-
-## visitParamHas(params, nom) {#visitparamhasparams-name}
-
-Vérifie s'il existe un champ avec ‘name’ nom.
-
-## visitParamExtractUInt(params, nom) {#visitparamextractuintparams-name}
-
-Analyse UInt64 à partir de la valeur du champ nommé ‘name’. Si c'est un champ de type chaîne, il tente d'analyser un numéro à partir du début de la chaîne. Si le champ n'existe pas, ou s'il existe mais ne contient pas de nombre, il renvoie 0.
-
-## visitParamExtractInt(params, name) {#visitparamextractintparams-name}
-
-Le même que pour Int64.
-
-## visitParamExtractFloat(params, nom) {#visitparamextractfloatparams-name}
-
-Le même que pour Float64.
-
-## visitParamExtractBool(params, nom) {#visitparamextractboolparams-name}
-
-Analyse d'une valeur vrai/faux. Le résultat est UInt8.
-
-## visitParamExtractRaw(params, nom) {#visitparamextractrawparams-name}
-
-Retourne la valeur d'un champ, y compris les séparateurs.
-
-Exemple:
-
-``` sql
-visitParamExtractRaw('{"abc":"\\n\\u0000"}', 'abc') = '"\\n\\u0000"'
-visitParamExtractRaw('{"abc":{"def":[1,2,3]}}', 'abc') = '{"def":[1,2,3]}'
-```
-
-## visitParamExtractString(params, nom) {#visitparamextractstringparams-name}
-
-Analyse la chaîne entre guillemets doubles. La valeur est sans échappement. Si l'échappement échoue, il renvoie une chaîne vide.
-
-Exemple:
-
-``` sql
-visitParamExtractString('{"abc":"\\n\\u0000"}', 'abc') = '\n\0'
-visitParamExtractString('{"abc":"\\u263a"}', 'abc') = '☺'
-visitParamExtractString('{"abc":"\\u263"}', 'abc') = ''
-visitParamExtractString('{"abc":"hello}', 'abc') = ''
-```
-
-Il n'y a actuellement aucun support pour les points de code dans le format `\uXXXX\uYYYY` qui ne proviennent pas du plan multilingue de base (ils sont convertis en CESU-8 au lieu de UTF-8).
-
-Les fonctions suivantes sont basées sur [simdjson](https://github.com/lemire/simdjson) conçu pour des exigences D'analyse JSON plus complexes. L'hypothèse 2 mentionnée ci-dessus s'applique toujours.
-
-## isValidJSON (json) {#isvalidjsonjson}
-
-Vérifie que la chaîne est un json valide.
-
-Exemple:
-
-``` sql
-SELECT isValidJSON('{"a": "hello", "b": [-100, 200.0, 300]}') = 1
-SELECT isValidJSON('not a json') = 0
-```
-
-## JSONHas(json\[, indices_or_keys\]…) {#jsonhasjson-indices-or-keys}
-
-Si la valeur existe dans le document JSON, `1` sera retourné.
-
-Si la valeur n'existe pas, `0` sera retourné.
-
-Exemple:
-
-``` sql
-SELECT JSONHas('{"a": "hello", "b": [-100, 200.0, 300]}', 'b') = 1
-SELECT JSONHas('{"a": "hello", "b": [-100, 200.0, 300]}', 'b', 4) = 0
-```
-
-`indices_or_keys` est une liste de zéro ou plusieurs arguments chacun d'entre eux peut être une chaîne ou un entier.
-
--   String = membre d'objet d'accès par clé.
--   Entier positif = accédez au n-ème membre / clé depuis le début.
--   Entier négatif = accédez au n-ème membre / clé à partir de la fin.
-
-Minimum de l'indice de l'élément est 1. Ainsi, l'élément 0 n'existe pas.
-
-Vous pouvez utiliser des entiers pour accéder à la fois aux tableaux JSON et aux objets JSON.
-
-Ainsi, par exemple:
-
-``` sql
-SELECT JSONExtractKey('{"a": "hello", "b": [-100, 200.0, 300]}', 1) = 'a'
-SELECT JSONExtractKey('{"a": "hello", "b": [-100, 200.0, 300]}', 2) = 'b'
-SELECT JSONExtractKey('{"a": "hello", "b": [-100, 200.0, 300]}', -1) = 'b'
-SELECT JSONExtractKey('{"a": "hello", "b": [-100, 200.0, 300]}', -2) = 'a'
-SELECT JSONExtractString('{"a": "hello", "b": [-100, 200.0, 300]}', 1) = 'hello'
-```
-
-## JSONLength(json\[, indices_or_keys\]…) {#jsonlengthjson-indices-or-keys}
-
-Renvoie la longueur D'un tableau JSON ou d'un objet JSON.
-
-Si la valeur n'existe pas ou a un mauvais type, `0` sera retourné.
-
-Exemple:
-
-``` sql
-SELECT JSONLength('{"a": "hello", "b": [-100, 200.0, 300]}', 'b') = 3
-SELECT JSONLength('{"a": "hello", "b": [-100, 200.0, 300]}') = 2
-```
-
-## JSONType(json\[, indices_or_keys\]…) {#jsontypejson-indices-or-keys}
-
-De retour le type d'une valeur JSON.
-
-Si la valeur n'existe pas, `Null` sera retourné.
-
-Exemple:
-
-``` sql
-SELECT JSONType('{"a": "hello", "b": [-100, 200.0, 300]}') = 'Object'
-SELECT JSONType('{"a": "hello", "b": [-100, 200.0, 300]}', 'a') = 'String'
-SELECT JSONType('{"a": "hello", "b": [-100, 200.0, 300]}', 'b') = 'Array'
-```
-
-## JSONExtractUInt(json\[, indices_or_keys\]…) {#jsonextractuintjson-indices-or-keys}
-
-## JSONExtractInt(json\[, indices_or_keys\]…) {#jsonextractintjson-indices-or-keys}
-
-## JSONExtractFloat(json\[, indices_or_keys\]…) {#jsonextractfloatjson-indices-or-keys}
-
-## JSONExtractBool(json\[, indices_or_keys\]…) {#jsonextractbooljson-indices-or-keys}
-
-Analyse un JSON et extrait une valeur. Ces fonctions sont similaires à `visitParam` fonction.
-
-Si la valeur n'existe pas ou a un mauvais type, `0` sera retourné.
-
-Exemple:
-
-``` sql
-SELECT JSONExtractInt('{"a": "hello", "b": [-100, 200.0, 300]}', 'b', 1) = -100
-SELECT JSONExtractFloat('{"a": "hello", "b": [-100, 200.0, 300]}', 'b', 2) = 200.0
-SELECT JSONExtractUInt('{"a": "hello", "b": [-100, 200.0, 300]}', 'b', -1) = 300
-```
-
-## JSONExtractString(json\[, indices_or_keys\]…) {#jsonextractstringjson-indices-or-keys}
-
-Analyse un JSON et extrait une chaîne. Cette fonction est similaire à `visitParamExtractString` fonction.
-
-Si la valeur n'existe pas ou a un mauvais type, une chaîne vide est retournée.
-
-La valeur est sans échappement. Si l'échappement échoue, il renvoie une chaîne vide.
-
-Exemple:
-
-``` sql
-SELECT JSONExtractString('{"a": "hello", "b": [-100, 200.0, 300]}', 'a') = 'hello'
-SELECT JSONExtractString('{"abc":"\\n\\u0000"}', 'abc') = '\n\0'
-SELECT JSONExtractString('{"abc":"\\u263a"}', 'abc') = '☺'
-SELECT JSONExtractString('{"abc":"\\u263"}', 'abc') = ''
-SELECT JSONExtractString('{"abc":"hello}', 'abc') = ''
-```
-
-## JSONExtract(json\[, indices_or_keys…\], Return_type) {#jsonextractjson-indices-or-keys-return-type}
-
-Analyse un JSON et extrait une valeur du type de données clickhouse donné.
-
-C'est une généralisation de la précédente `JSONExtract<type>` fonction.
-Cela signifie
-`JSONExtract(..., 'String')` retourne exactement le même que `JSONExtractString()`,
-`JSONExtract(..., 'Float64')` retourne exactement le même que `JSONExtractFloat()`.
-
-Exemple:
-
-``` sql
-SELECT JSONExtract('{"a": "hello", "b": [-100, 200.0, 300]}', 'Tuple(String, Array(Float64))') = ('hello',[-100,200,300])
-SELECT JSONExtract('{"a": "hello", "b": [-100, 200.0, 300]}', 'Tuple(b Array(Float64), a String)') = ([-100,200,300],'hello')
-SELECT JSONExtract('{"a": "hello", "b": [-100, 200.0, 300]}', 'b', 'Array(Nullable(Int8))') = [-100, NULL, NULL]
-SELECT JSONExtract('{"a": "hello", "b": [-100, 200.0, 300]}', 'b', 4, 'Nullable(Int64)') = NULL
-SELECT JSONExtract('{"passed": true}', 'passed', 'UInt8') = 1
-SELECT JSONExtract('{"day": "Thursday"}', 'day', 'Enum8(\'Sunday\' = 0, \'Monday\' = 1, \'Tuesday\' = 2, \'Wednesday\' = 3, \'Thursday\' = 4, \'Friday\' = 5, \'Saturday\' = 6)') = 'Thursday'
-SELECT JSONExtract('{"day": 5}', 'day', 'Enum8(\'Sunday\' = 0, \'Monday\' = 1, \'Tuesday\' = 2, \'Wednesday\' = 3, \'Thursday\' = 4, \'Friday\' = 5, \'Saturday\' = 6)') = 'Friday'
-```
-
-## JSONExtractKeysAndValues(json\[, indices_or_keys…\], Value_type) {#jsonextractkeysandvaluesjson-indices-or-keys-value-type}
-
-Analyse les paires clé-valeur à partir D'un JSON où les valeurs sont du type de données clickhouse donné.
-
-Exemple:
-
-``` sql
-SELECT JSONExtractKeysAndValues('{"x": {"a": 5, "b": 7, "c": 11}}', 'x', 'Int8') = [('a',5),('b',7),('c',11)]
-```
-
-## JSONExtractRaw(json\[, indices_or_keys\]…) {#jsonextractrawjson-indices-or-keys}
-
-Renvoie une partie de JSON en tant que chaîne non analysée.
-
-Si la pièce n'existe pas ou a un mauvais type, une chaîne vide est retournée.
-
-Exemple:
-
-``` sql
-SELECT JSONExtractRaw('{"a": "hello", "b": [-100, 200.0, 300]}', 'b') = '[-100, 200.0, 300]'
-```
-
-## JSONExtractArrayRaw(json\[, indices_or_keys…\]) {#jsonextractarrayrawjson-indices-or-keys}
-
-Retourne un tableau avec des éléments de tableau JSON, chacun représenté comme une chaîne non analysée.
-
-Si la pièce n'existe pas ou n'est pas de tableau, un tableau vide sera retournée.
-
-Exemple:
-
-``` sql
-SELECT JSONExtractArrayRaw('{"a": "hello", "b": [-100, 200.0, "hello"]}', 'b') = ['-100', '200.0', '"hello"']'
-```
-
-## JSONExtractKeysAndValuesRaw {#json-extract-keys-and-values-raw}
-
-Extrait les données brutes d'un objet JSON.
-
-**Syntaxe**
-
-``` sql
-JSONExtractKeysAndValuesRaw(json[, p, a, t, h])
-```
-
-**Paramètre**
-
--   `json` — [Chaîne](../data-types/string.md) avec JSON valide.
--   `p, a, t, h` — Comma-separated indices or keys that specify the path to the inner field in a nested JSON object. Each argument can be either a [chaîne](../data-types/string.md) pour obtenir le champ par la touche ou un [entier](../data-types/int-uint.md) pour obtenir le N-ème champ (indexé à partir de 1, les entiers négatifs comptent à partir de la fin). S'il n'est pas défini, le JSON entier est analysé en tant qu'objet de niveau supérieur. Paramètre facultatif.
-
-**Valeurs renvoyées**
-
--   Tableau avec `('key', 'value')` tuple. Les deux membres du tuple sont des chaînes.
--   Tableau vide si l'objet demandé n'existe pas, ou entrée JSON n'est pas valide.
-
-Type: [Tableau](../data-types/array.md)([Tuple](../data-types/tuple.md)([Chaîne](../data-types/string.md), [Chaîne](../data-types/string.md)).
-
-**Exemple**
-
-Requête:
-
-``` sql
-SELECT JSONExtractKeysAndValuesRaw('{"a": [-100, 200.0], "b":{"c": {"d": "hello", "f": "world"}}}')
-```
-
-Résultat:
-
-``` text
-┌─JSONExtractKeysAndValuesRaw('{"a": [-100, 200.0], "b":{"c": {"d": "hello", "f": "world"}}}')─┐
-│ [('a','[-100,200]'),('b','{"c":{"d":"hello","f":"world"}}')]                                 │
-└──────────────────────────────────────────────────────────────────────────────────────────────┘
-```
-
-Requête:
-
-``` sql
-SELECT JSONExtractKeysAndValuesRaw('{"a": [-100, 200.0], "b":{"c": {"d": "hello", "f": "world"}}}', 'b')
-```
-
-Résultat:
-
-``` text
-┌─JSONExtractKeysAndValuesRaw('{"a": [-100, 200.0], "b":{"c": {"d": "hello", "f": "world"}}}', 'b')─┐
-│ [('c','{"d":"hello","f":"world"}')]                                                               │
-└───────────────────────────────────────────────────────────────────────────────────────────────────┘
-```
-
-Requête:
-
-``` sql
-SELECT JSONExtractKeysAndValuesRaw('{"a": [-100, 200.0], "b":{"c": {"d": "hello", "f": "world"}}}', -1, 'c')
-```
-
-Résultat:
-
-``` text
-┌─JSONExtractKeysAndValuesRaw('{"a": [-100, 200.0], "b":{"c": {"d": "hello", "f": "world"}}}', -1, 'c')─┐
-│ [('d','"hello"'),('f','"world"')]                                                                     │
-└───────────────────────────────────────────────────────────────────────────────────────────────────────┘
-```
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/functions/json_functions/) <!--hide-->
diff --git a/docs/fr/sql-reference/functions/logical-functions.md b/docs/fr/sql-reference/functions/logical-functions.md
deleted file mode 100644
index d01d9e02088..00000000000
--- a/docs/fr/sql-reference/functions/logical-functions.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 37
-toc_title: Logique
----
-
-# Les Fonctions Logiques {#logical-functions}
-
-Les fonctions logiques acceptent tous les types numériques, mais renvoient un nombre UInt8 égal à 0 ou 1.
-
-Zéro comme argument est considéré “false,” alors que toute valeur non nulle est considérée comme “true”.
-
-## et, et opérateur {#and-and-operator}
-
-## ou, ou opérateur {#or-or-operator}
-
-## pas, pas opérateur {#not-not-operator}
-
-## xor {#xor}
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/functions/logical_functions/) <!--hide-->
diff --git a/docs/fr/sql-reference/functions/machine-learning-functions.md b/docs/fr/sql-reference/functions/machine-learning-functions.md
deleted file mode 100644
index 2212e0caa5a..00000000000
--- a/docs/fr/sql-reference/functions/machine-learning-functions.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 64
-toc_title: Fonctions D'Apprentissage Automatique
----
-
-# Fonctions D'Apprentissage Automatique {#machine-learning-functions}
-
-## evalMLMethod (prédiction) {#machine_learning_methods-evalmlmethod}
-
-Prédiction utilisant des modèles de régression ajustés utilise `evalMLMethod` fonction. Voir le lien dans la `linearRegression`.
-
-### Régression Linéaire Stochastique {#stochastic-linear-regression}
-
-Le [stochasticLinearRegression](../../sql-reference/aggregate-functions/reference.md#agg_functions-stochasticlinearregression) la fonction d'agrégat implémente une méthode de descente de gradient stochastique utilisant un modèle linéaire et une fonction de perte MSE. Utiliser `evalMLMethod` prédire sur de nouvelles données.
-
-### Régression Logistique Stochastique {#stochastic-logistic-regression}
-
-Le [stochasticLogisticRegression](../../sql-reference/aggregate-functions/reference.md#agg_functions-stochasticlogisticregression) la fonction d'agrégation implémente la méthode de descente de gradient stochastique pour le problème de classification binaire. Utiliser `evalMLMethod` prédire sur de nouvelles données.
diff --git a/docs/fr/sql-reference/functions/math-functions.md b/docs/fr/sql-reference/functions/math-functions.md
deleted file mode 100644
index f5dff150caa..00000000000
--- a/docs/fr/sql-reference/functions/math-functions.md
+++ /dev/null
@@ -1,116 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 44
-toc_title: "Math\xE9matique"
----
-
-# Fonctions Mathématiques {#mathematical-functions}
-
-Toutes les fonctions renvoient un nombre Float64. La précision du résultat est proche de la précision maximale possible, mais le résultat peut ne pas coïncider avec le nombre représentable de la machine le plus proche du nombre réel correspondant.
-
-## e() {#e}
-
-Renvoie un nombre Float64 proche du nombre E.
-
-## pi() {#pi}
-
-Returns a Float64 number that is close to the number π.
-
-## exp (x) {#expx}
-
-Accepte un argument numérique et renvoie un Float64 nombre proche de l'exposant de l'argument.
-
-## log(x), ln (x) {#logx-lnx}
-
-Accepte un argument numérique et renvoie un nombre Float64 proche du logarithme naturel de l'argument.
-
-## exp2 (x) {#exp2x}
-
-Accepte un argument numérique et renvoie un nombre Float64 proche de 2 à la puissance de X.
-
-## log2 (x) {#log2x}
-
-Accepte un argument numérique et renvoie un Float64 nombre proximité du logarithme binaire de l'argument.
-
-## exp10 (x) {#exp10x}
-
-Accepte un argument numérique et renvoie un nombre Float64 proche de 10 à la puissance de X.
-
-## log10 (x) {#log10x}
-
-Accepte un argument numérique et renvoie un nombre Float64 proche du logarithme décimal de l'argument.
-
-## sqrt (x) {#sqrtx}
-
-Accepte un argument numérique et renvoie un Float64 nombre proche de la racine carrée de l'argument.
-
-## cbrt (x) {#cbrtx}
-
-Accepte un argument numérique et renvoie un Float64 nombre proche de la racine cubique de l'argument.
-
-## erf (x) {#erfx}
-
-Si ‘x’ est non négatif, alors `erf(x / σ√2)` est la probabilité qu'une variable aléatoire ayant une distribution normale avec un écart type ‘σ’ prend la valeur qui est séparée de la valeur attendue par plus de ‘x’.
-
-Exemple (règle de trois sigma):
-
-``` sql
-SELECT erf(3 / sqrt(2))
-```
-
-``` text
-┌─erf(divide(3, sqrt(2)))─┐
-│      0.9973002039367398 │
-└─────────────────────────┘
-```
-
-## erfc (x) {#erfcx}
-
-Accepte un argument numérique et renvoie un nombre Float64 proche de 1-erf (x), mais sans perte de précision pour ‘x’ valeur.
-
-## lgamma (x) {#lgammax}
-
-Le logarithme de la fonction gamma.
-
-## tgamma (x) {#tgammax}
-
-La fonction Gamma.
-
-## sin (x) {#sinx}
-
-Sine.
-
-## cos (x) {#cosx}
-
-Cosinus.
-
-## tan (x) {#tanx}
-
-Tangente.
-
-## asin (x) {#asinx}
-
-Le sinus d'arc.
-
-## acos (x) {#acosx}
-
-Le cosinus de l'arc.
-
-## atan (x) {#atanx}
-
-L'arc tangente.
-
-## pow(x, y), la puissance(x, y) {#powx-y-powerx-y}
-
-Prend deux arguments numériques x et Y. renvoie un nombre Float64 proche de x à la puissance de Y.
-
-## intExp2 {#intexp2}
-
-Accepte un argument numérique et renvoie un nombre UInt64 proche de 2 à la puissance de X.
-
-## intExp10 {#intexp10}
-
-Accepte un argument numérique et renvoie un nombre UInt64 proche de 10 à la puissance de X.
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/functions/math_functions/) <!--hide-->
diff --git a/docs/fr/sql-reference/functions/other-functions.md b/docs/fr/sql-reference/functions/other-functions.md
deleted file mode 100644
index e5c6abedd75..00000000000
--- a/docs/fr/sql-reference/functions/other-functions.md
+++ /dev/null
@@ -1,1205 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 66
-toc_title: Autre
----
-
-# D'Autres Fonctions {#other-functions}
-
-## hôte() {#hostname}
-
-Renvoie une chaîne avec le nom de l'hôte sur lequel cette fonction a été exécutée. Pour le traitement distribué, c'est le nom du serveur distant, si la fonction est exécutée sur un serveur distant.
-
-## getMacro {#getmacro}
-
-Obtient une valeur nommée à partir [macro](../../operations/server-configuration-parameters/settings.md#macros) la section de la configuration du serveur.
-
-**Syntaxe**
-
-``` sql
-getMacro(name);
-```
-
-**Paramètre**
-
--   `name` — Name to retrieve from the `macros` section. [Chaîne](../../sql-reference/data-types/string.md#string).
-
-**Valeur renvoyée**
-
--   Valeur de la macro spécifiée.
-
-Type: [Chaîne](../../sql-reference/data-types/string.md).
-
-**Exemple**
-
-Exemple `macros` section dans le fichier de configuration du serveur:
-
-``` xml
-<macros>
-    <test>Value</test>
-</macros>
-```
-
-Requête:
-
-``` sql
-SELECT getMacro('test');
-```
-
-Résultat:
-
-``` text
-┌─getMacro('test')─┐
-│ Value            │
-└──────────────────┘
-```
-
-Une méthode alternative pour obtenir la même valeur:
-
-``` sql
-SELECT * FROM system.macros
-WHERE macro = 'test';
-```
-
-``` text
-┌─macro─┬─substitution─┐
-│ test  │ Value        │
-└───────┴──────────────┘
-```
-
-## FQDN {#fqdn}
-
-Retourne le nom de domaine pleinement qualifié.
-
-**Syntaxe**
-
-``` sql
-fqdn();
-```
-
-Cette fonction est insensible à la casse.
-
-**Valeur renvoyée**
-
--   Chaîne avec le nom de domaine complet.
-
-Type: `String`.
-
-**Exemple**
-
-Requête:
-
-``` sql
-SELECT FQDN();
-```
-
-Résultat:
-
-``` text
-┌─FQDN()──────────────────────────┐
-│ clickhouse.ru-central1.internal │
-└─────────────────────────────────┘
-```
-
-## basename {#basename}
-
-Extrait la partie finale d'une chaîne après la dernière barre oblique ou barre oblique inverse. Cette fonction est souvent utilisée pour extraire le nom de fichier d'un chemin.
-
-``` sql
-basename( expr )
-```
-
-**Paramètre**
-
--   `expr` — Expression resulting in a [Chaîne](../../sql-reference/data-types/string.md) type de valeur. Tous les antislashs doivent être échappés dans la valeur résultante.
-
-**Valeur Renvoyée**
-
-Une chaîne de caractères qui contient:
-
--   La partie finale d'une chaîne après la dernière barre oblique ou barre oblique inverse.
-
-        If the input string contains a path ending with slash or backslash, for example, `/` or `c:\`, the function returns an empty string.
-
--   La chaîne d'origine s'il n'y a pas de barres obliques ou de barres obliques inverses.
-
-**Exemple**
-
-``` sql
-SELECT 'some/long/path/to/file' AS a, basename(a)
-```
-
-``` text
-┌─a──────────────────────┬─basename('some\\long\\path\\to\\file')─┐
-│ some\long\path\to\file │ file                                   │
-└────────────────────────┴────────────────────────────────────────┘
-```
-
-``` sql
-SELECT 'some\\long\\path\\to\\file' AS a, basename(a)
-```
-
-``` text
-┌─a──────────────────────┬─basename('some\\long\\path\\to\\file')─┐
-│ some\long\path\to\file │ file                                   │
-└────────────────────────┴────────────────────────────────────────┘
-```
-
-``` sql
-SELECT 'some-file-name' AS a, basename(a)
-```
-
-``` text
-┌─a──────────────┬─basename('some-file-name')─┐
-│ some-file-name │ some-file-name             │
-└────────────────┴────────────────────────────┘
-```
-
-## visibleWidth (x) {#visiblewidthx}
-
-Calcule la largeur approximative lors de la sortie des valeurs vers la console au format texte (séparé par des tabulations).
-Cette fonction est utilisée par le système pour implémenter de jolis formats.
-
-`NULL` est représenté comme une chaîne correspondant à `NULL` dans `Pretty` format.
-
-``` sql
-SELECT visibleWidth(NULL)
-```
-
-``` text
-┌─visibleWidth(NULL)─┐
-│                  4 │
-└────────────────────┘
-```
-
-## toTypeName (x) {#totypenamex}
-
-Renvoie une chaîne contenant le nom du type de l'argument passé.
-
-Si `NULL` est passé à la fonction en entrée, puis il renvoie le `Nullable(Nothing)` type, ce qui correspond à un interne `NULL` représentation à ClickHouse.
-
-## la taille de bloc() {#function-blocksize}
-
-Récupère la taille du bloc.
-Dans ClickHouse, les requêtes sont toujours exécutées sur des blocs (ensembles de parties de colonne). Cette fonction permet d'obtenir la taille du bloc pour lequel vous l'avez appelé.
-
-## matérialiser (x) {#materializex}
-
-Transforme une constante dans une colonne contenant une seule valeur.
-Dans ClickHouse, les colonnes complètes et les constantes sont représentées différemment en mémoire. Les fonctions fonctionnent différemment pour les arguments constants et les arguments normaux (un code différent est exécuté), bien que le résultat soit presque toujours le même. Cette fonction sert à déboguer ce comportement.
-
-## ignore(…) {#ignore}
-
-Accepte tous les arguments, y compris `NULL`. Renvoie toujours 0.
-Cependant, l'argument est toujours évalué. Cela peut être utilisé pour les benchmarks.
-
-## sommeil(secondes) {#sleepseconds}
-
-Dormir ‘seconds’ secondes sur chaque bloc de données. Vous pouvez spécifier un nombre entier ou un nombre à virgule flottante.
-
-## sleepEachRow (secondes) {#sleepeachrowseconds}
-
-Dormir ‘seconds’ secondes sur chaque ligne. Vous pouvez spécifier un nombre entier ou un nombre à virgule flottante.
-
-## currentDatabase() {#currentdatabase}
-
-Retourne le nom de la base de données actuelle.
-Vous pouvez utiliser cette fonction dans les paramètres du moteur de table dans une requête CREATE TABLE où vous devez spécifier la base de données.
-
-## currentUser() {#other-function-currentuser}
-
-Renvoie la connexion de l'utilisateur actuel. La connexion de l'utilisateur, cette requête initiée, sera renvoyée en cas de requête distibuted.
-
-``` sql
-SELECT currentUser();
-```
-
-Alias: `user()`, `USER()`.
-
-**Valeurs renvoyées**
-
--   Connexion de l'utilisateur actuel.
--   Connexion de l'utilisateur qui a lancé la requête en cas de requête distribuée.
-
-Type: `String`.
-
-**Exemple**
-
-Requête:
-
-``` sql
-SELECT currentUser();
-```
-
-Résultat:
-
-``` text
-┌─currentUser()─┐
-│ default       │
-└───────────────┘
-```
-
-## isConstant {#is-constant}
-
-Vérifie si l'argument est une expression constante.
-
-A constant expression means an expression whose resulting value is known at the query analysis (i.e. before execution). For example, expressions over [littéral](../syntax.md#literals) sont des expressions constantes.
-
-La fonction est destinée au développement, au débogage et à la démonstration.
-
-**Syntaxe**
-
-``` sql
-isConstant(x)
-```
-
-**Paramètre**
-
--   `x` — Expression to check.
-
-**Valeurs renvoyées**
-
--   `1` — `x` est constante.
--   `0` — `x` est non constante.
-
-Type: [UInt8](../data-types/int-uint.md).
-
-**Exemple**
-
-Requête:
-
-``` sql
-SELECT isConstant(x + 1) FROM (SELECT 43 AS x)
-```
-
-Résultat:
-
-``` text
-┌─isConstant(plus(x, 1))─┐
-│                      1 │
-└────────────────────────┘
-```
-
-Requête:
-
-``` sql
-WITH 3.14 AS pi SELECT isConstant(cos(pi))
-```
-
-Résultat:
-
-``` text
-┌─isConstant(cos(pi))─┐
-│                   1 │
-└─────────────────────┘
-```
-
-Requête:
-
-``` sql
-SELECT isConstant(number) FROM numbers(1)
-```
-
-Résultat:
-
-``` text
-┌─isConstant(number)─┐
-│                  0 │
-└────────────────────┘
-```
-
-## isFinite (x) {#isfinitex}
-
-Accepte Float32 et Float64 et renvoie UInt8 égal à 1 si l'argument n'est pas infini et pas un NaN, sinon 0.
-
-## isInfinite (x) {#isinfinitex}
-
-Accepte Float32 et Float64 et renvoie UInt8 égal à 1 si l'argument est infini, sinon 0. Notez que 0 est retourné pour un NaN.
-
-## ifNotFinite {#ifnotfinite}
-
-Vérifie si la valeur à virgule flottante est finie.
-
-**Syntaxe**
-
-    ifNotFinite(x,y)
-
-**Paramètre**
-
--   `x` — Value to be checked for infinity. Type: [Flottant\*](../../sql-reference/data-types/float.md).
--   `y` — Fallback value. Type: [Flottant\*](../../sql-reference/data-types/float.md).
-
-**Valeur renvoyée**
-
--   `x` si `x` est finie.
--   `y` si `x` n'est pas finie.
-
-**Exemple**
-
-Requête:
-
-    SELECT 1/0 as infimum, ifNotFinite(infimum,42)
-
-Résultat:
-
-    ┌─infimum─┬─ifNotFinite(divide(1, 0), 42)─┐
-    │     inf │                            42 │
-    └─────────┴───────────────────────────────┘
-
-Vous pouvez obtenir un résultat similaire en utilisant [opérateur ternaire](conditional-functions.md#ternary-operator): `isFinite(x) ? x : y`.
-
-## isNaN (x) {#isnanx}
-
-Accepte Float32 et Float64 et renvoie UInt8 égal à 1 si l'argument est un NaN, sinon 0.
-
-## hasColumnInTable(\[‘hostname’\[, ‘username’\[, ‘password’\]\],\] ‘database’, ‘table’, ‘column’) {#hascolumnintablehostname-username-password-database-table-column}
-
-Accepte les chaînes constantes: nom de la base de données, nom de la table et nom de la colonne. Renvoie une expression constante UInt8 égale à 1 s'il y a une colonne, sinon 0. Si le paramètre hostname est défini, le test s'exécutera sur un serveur distant.
-La fonction renvoie une exception si la table n'existe pas.
-Pour les éléments imbriqués structure des données, la fonction vérifie l'existence d'une colonne. Pour la structure de données imbriquée elle-même, la fonction renvoie 0.
-
-## bar {#function-bar}
-
-Permet de construire un diagramme unicode-art.
-
-`bar(x, min, max, width)` dessine une bande avec une largeur proportionnelle à `(x - min)` et égale à `width` les caractères lors de la `x = max`.
-
-Paramètre:
-
--   `x` — Size to display.
--   `min, max` — Integer constants. The value must fit in `Int64`.
--   `width` — Constant, positive integer, can be fractional.
-
-La bande dessinée avec précision à un huitième d'un symbole.
-
-Exemple:
-
-``` sql
-SELECT
-    toHour(EventTime) AS h,
-    count() AS c,
-    bar(c, 0, 600000, 20) AS bar
-FROM test.hits
-GROUP BY h
-ORDER BY h ASC
-```
-
-``` text
-┌──h─┬──────c─┬─bar────────────────┐
-│  0 │ 292907 │ █████████▋         │
-│  1 │ 180563 │ ██████             │
-│  2 │ 114861 │ ███▋               │
-│  3 │  85069 │ ██▋                │
-│  4 │  68543 │ ██▎                │
-│  5 │  78116 │ ██▌                │
-│  6 │ 113474 │ ███▋               │
-│  7 │ 170678 │ █████▋             │
-│  8 │ 278380 │ █████████▎         │
-│  9 │ 391053 │ █████████████      │
-│ 10 │ 457681 │ ███████████████▎   │
-│ 11 │ 493667 │ ████████████████▍  │
-│ 12 │ 509641 │ ████████████████▊  │
-│ 13 │ 522947 │ █████████████████▍ │
-│ 14 │ 539954 │ █████████████████▊ │
-│ 15 │ 528460 │ █████████████████▌ │
-│ 16 │ 539201 │ █████████████████▊ │
-│ 17 │ 523539 │ █████████████████▍ │
-│ 18 │ 506467 │ ████████████████▊  │
-│ 19 │ 520915 │ █████████████████▎ │
-│ 20 │ 521665 │ █████████████████▍ │
-│ 21 │ 542078 │ ██████████████████ │
-│ 22 │ 493642 │ ████████████████▍  │
-│ 23 │ 400397 │ █████████████▎     │
-└────┴────────┴────────────────────┘
-```
-
-## transformer {#transform}
-
-Transforme une valeur en fonction explicitement définis cartographie de certains éléments à l'autre.
-Il existe deux variantes de cette fonction:
-
-### de transformation(x, array_from, array_to, par défaut) {#transformx-array-from-array-to-default}
-
-`x` – What to transform.
-
-`array_from` – Constant array of values for converting.
-
-`array_to` – Constant array of values to convert the values in ‘from’ de.
-
-`default` – Which value to use if ‘x’ n'est pas égale à une des valeurs de ‘from’.
-
-`array_from` et `array_to` – Arrays of the same size.
-
-Type:
-
-`transform(T, Array(T), Array(U), U) -> U`
-
-`T` et `U` peuvent être des types numériques, chaîne ou Date ou DateTime.
-Lorsque la même lettre est indiquée (T ou U), pour les types numériques, il se peut qu'il ne s'agisse pas de types correspondants, mais de types ayant un type commun.
-Par exemple, le premier argument peut avoir le type Int64, tandis que le second a le type Array(UInt16).
-
-Si l' ‘x’ la valeur est égale à l'un des éléments dans la ‘array_from’ tableau, elle renvoie l'élément existant (qui est numéroté de même) de la ‘array_to’ tableau. Sinon, elle renvoie ‘default’. S'il y a plusieurs éléments correspondants dans ‘array_from’ il renvoie l'un des matches.
-
-Exemple:
-
-``` sql
-SELECT
-    transform(SearchEngineID, [2, 3], ['Yandex', 'Google'], 'Other') AS title,
-    count() AS c
-FROM test.hits
-WHERE SearchEngineID != 0
-GROUP BY title
-ORDER BY c DESC
-```
-
-``` text
-┌─title─────┬──────c─┐
-│ Yandex    │ 498635 │
-│ Google    │ 229872 │
-│ Other     │ 104472 │
-└───────────┴────────┘
-```
-
-### de transformation(x, array_from, array_to) {#transformx-array-from-array-to}
-
-Diffère de la première variation en ce que le ‘default’ l'argument est omis.
-Si l' ‘x’ la valeur est égale à l'un des éléments dans la ‘array_from’ tableau, elle renvoie l'élément correspondant (qui est numéroté de même) de la ‘array_to’ tableau. Sinon, elle renvoie ‘x’.
-
-Type:
-
-`transform(T, Array(T), Array(T)) -> T`
-
-Exemple:
-
-``` sql
-SELECT
-    transform(domain(Referer), ['yandex.ru', 'google.ru', 'vk.com'], ['www.yandex', 'example.com']) AS s,
-    count() AS c
-FROM test.hits
-GROUP BY domain(Referer)
-ORDER BY count() DESC
-LIMIT 10
-```
-
-``` text
-┌─s──────────────┬───────c─┐
-│                │ 2906259 │
-│ www.yandex     │  867767 │
-│ ███████.ru     │  313599 │
-│ mail.yandex.ru │  107147 │
-│ ██████.ru      │  100355 │
-│ █████████.ru   │   65040 │
-│ news.yandex.ru │   64515 │
-│ ██████.net     │   59141 │
-│ example.com    │   57316 │
-└────────────────┴─────────┘
-```
-
-## formatReadableSize (x) {#formatreadablesizex}
-
-Accepte la taille (nombre d'octets). Renvoie une taille arrondie avec un suffixe (KiB, MiB, etc.) comme une chaîne de caractères.
-
-Exemple:
-
-``` sql
-SELECT
-    arrayJoin([1, 1024, 1024*1024, 192851925]) AS filesize_bytes,
-    formatReadableSize(filesize_bytes) AS filesize
-```
-
-``` text
-┌─filesize_bytes─┬─filesize───┐
-│              1 │ 1.00 B     │
-│           1024 │ 1.00 KiB   │
-│        1048576 │ 1.00 MiB   │
-│      192851925 │ 183.92 MiB │
-└────────────────┴────────────┘
-```
-
-## moins (a, b) {#leasta-b}
-
-Renvoie la plus petite valeur de a et b.
-
-## la plus grande(a, b) {#greatesta-b}
-
-Renvoie la plus grande valeur de a et B.
-
-## le temps de disponibilité() {#uptime}
-
-Renvoie la disponibilité du serveur en quelques secondes.
-
-## version() {#version}
-
-Renvoie la version du serveur sous forme de chaîne.
-
-## fuseau() {#timezone}
-
-Retourne le fuseau horaire du serveur.
-
-## blockNumber {#blocknumber}
-
-Renvoie le numéro de séquence du bloc de données où se trouve la ligne.
-
-## rowNumberInBlock {#function-rownumberinblock}
-
-Renvoie le numéro de séquence de la ligne dans le bloc de données. Différents blocs de données sont toujours recalculés.
-
-## rowNumberInAllBlocks() {#rownumberinallblocks}
-
-Renvoie le numéro de séquence de la ligne dans le bloc de données. Cette fonction ne prend en compte que les blocs de données affectés.
-
-## voisin {#neighbor}
-
-La fonction de fenêtre qui donne accès à une ligne à un décalage spécifié qui vient avant ou après la ligne actuelle d'une colonne donnée.
-
-**Syntaxe**
-
-``` sql
-neighbor(column, offset[, default_value])
-```
-
-Le résultat de la fonction dépend du touché des blocs de données et l'ordre des données dans le bloc.
-Si vous créez une sous-requête avec ORDER BY et appelez la fonction depuis l'extérieur de la sous-requête, vous pouvez obtenir le résultat attendu.
-
-**Paramètre**
-
--   `column` — A column name or scalar expression.
--   `offset` — The number of rows forwards or backwards from the current row of `column`. [Int64](../../sql-reference/data-types/int-uint.md).
--   `default_value` — Optional. The value to be returned if offset goes beyond the scope of the block. Type of data blocks affected.
-
-**Valeurs renvoyées**
-
--   De la valeur pour `column` dans `offset` distance de la ligne actuelle si `offset` la valeur n'est pas en dehors des limites du bloc.
--   La valeur par défaut pour `column` si `offset` la valeur est en dehors des limites du bloc. Si `default_value` est donné, alors il sera utilisé.
-
-Type: type de blocs de données affectés ou type de valeur par défaut.
-
-**Exemple**
-
-Requête:
-
-``` sql
-SELECT number, neighbor(number, 2) FROM system.numbers LIMIT 10;
-```
-
-Résultat:
-
-``` text
-┌─number─┬─neighbor(number, 2)─┐
-│      0 │                   2 │
-│      1 │                   3 │
-│      2 │                   4 │
-│      3 │                   5 │
-│      4 │                   6 │
-│      5 │                   7 │
-│      6 │                   8 │
-│      7 │                   9 │
-│      8 │                   0 │
-│      9 │                   0 │
-└────────┴─────────────────────┘
-```
-
-Requête:
-
-``` sql
-SELECT number, neighbor(number, 2, 999) FROM system.numbers LIMIT 10;
-```
-
-Résultat:
-
-``` text
-┌─number─┬─neighbor(number, 2, 999)─┐
-│      0 │                        2 │
-│      1 │                        3 │
-│      2 │                        4 │
-│      3 │                        5 │
-│      4 │                        6 │
-│      5 │                        7 │
-│      6 │                        8 │
-│      7 │                        9 │
-│      8 │                      999 │
-│      9 │                      999 │
-└────────┴──────────────────────────┘
-```
-
-Cette fonction peut être utilisée pour calculer une année à valeur métrique:
-
-Requête:
-
-``` sql
-WITH toDate('2018-01-01') AS start_date
-SELECT
-    toStartOfMonth(start_date + (number * 32)) AS month,
-    toInt32(month) % 100 AS money,
-    neighbor(money, -12) AS prev_year,
-    round(prev_year / money, 2) AS year_over_year
-FROM numbers(16)
-```
-
-Résultat:
-
-``` text
-┌──────month─┬─money─┬─prev_year─┬─year_over_year─┐
-│ 2018-01-01 │    32 │         0 │              0 │
-│ 2018-02-01 │    63 │         0 │              0 │
-│ 2018-03-01 │    91 │         0 │              0 │
-│ 2018-04-01 │    22 │         0 │              0 │
-│ 2018-05-01 │    52 │         0 │              0 │
-│ 2018-06-01 │    83 │         0 │              0 │
-│ 2018-07-01 │    13 │         0 │              0 │
-│ 2018-08-01 │    44 │         0 │              0 │
-│ 2018-09-01 │    75 │         0 │              0 │
-│ 2018-10-01 │     5 │         0 │              0 │
-│ 2018-11-01 │    36 │         0 │              0 │
-│ 2018-12-01 │    66 │         0 │              0 │
-│ 2019-01-01 │    97 │        32 │           0.33 │
-│ 2019-02-01 │    28 │        63 │           2.25 │
-│ 2019-03-01 │    56 │        91 │           1.62 │
-│ 2019-04-01 │    87 │        22 │           0.25 │
-└────────────┴───────┴───────────┴────────────────┘
-```
-
-## runningDifference(x) {#other_functions-runningdifference}
-
-Calculates the difference between successive row values ​​in the data block.
-Renvoie 0 pour la première ligne et la différence par rapport à la rangée précédente pour chaque nouvelle ligne.
-
-Le résultat de la fonction dépend du touché des blocs de données et l'ordre des données dans le bloc.
-Si vous créez une sous-requête avec ORDER BY et appelez la fonction depuis l'extérieur de la sous-requête, vous pouvez obtenir le résultat attendu.
-
-Exemple:
-
-``` sql
-SELECT
-    EventID,
-    EventTime,
-    runningDifference(EventTime) AS delta
-FROM
-(
-    SELECT
-        EventID,
-        EventTime
-    FROM events
-    WHERE EventDate = '2016-11-24'
-    ORDER BY EventTime ASC
-    LIMIT 5
-)
-```
-
-``` text
-┌─EventID─┬───────────EventTime─┬─delta─┐
-│    1106 │ 2016-11-24 00:00:04 │     0 │
-│    1107 │ 2016-11-24 00:00:05 │     1 │
-│    1108 │ 2016-11-24 00:00:05 │     0 │
-│    1109 │ 2016-11-24 00:00:09 │     4 │
-│    1110 │ 2016-11-24 00:00:10 │     1 │
-└─────────┴─────────────────────┴───────┘
-```
-
-Veuillez noter que la taille du bloc affecte le résultat. Avec chaque nouveau bloc, le `runningDifference` l'état est réinitialisé.
-
-``` sql
-SELECT
-    number,
-    runningDifference(number + 1) AS diff
-FROM numbers(100000)
-WHERE diff != 1
-```
-
-``` text
-┌─number─┬─diff─┐
-│      0 │    0 │
-└────────┴──────┘
-┌─number─┬─diff─┐
-│  65536 │    0 │
-└────────┴──────┘
-```
-
-``` sql
-set max_block_size=100000 -- default value is 65536!
-
-SELECT
-    number,
-    runningDifference(number + 1) AS diff
-FROM numbers(100000)
-WHERE diff != 1
-```
-
-``` text
-┌─number─┬─diff─┐
-│      0 │    0 │
-└────────┴──────┘
-```
-
-## runningDifferenceStartingWithFirstvalue {#runningdifferencestartingwithfirstvalue}
-
-De même que pour [runningDifference](./other-functions.md#other_functions-runningdifference) la différence est la valeur de la première ligne, est retourné à la valeur de la première ligne, et chaque rangée suivante renvoie la différence de la rangée précédente.
-
-## MACNumToString (num) {#macnumtostringnum}
-
-Accepte un numéro UInt64. Interprète comme une adresse MAC dans big endian. Renvoie une chaîne contenant l'adresse MAC correspondante au format AA:BB:CC: DD:EE: FF (Nombres séparés par deux points sous forme hexadécimale).
-
-## MACStringToNum (s) {#macstringtonums}
-
-La fonction inverse de MACNumToString. Si l'adresse MAC a un format non valide, elle renvoie 0.
-
-## MACStringToOUI (s) {#macstringtoouis}
-
-Accepte une adresse MAC au format AA:BB:CC: DD:EE: FF (Nombres séparés par deux points sous forme hexadécimale). Renvoie les trois premiers octets sous la forme D'un nombre UInt64. Si l'adresse MAC a un format non valide, elle renvoie 0.
-
-## getSizeOfEnumType {#getsizeofenumtype}
-
-Retourne le nombre de champs dans [Enum](../../sql-reference/data-types/enum.md).
-
-``` sql
-getSizeOfEnumType(value)
-```
-
-**Paramètre:**
-
--   `value` — Value of type `Enum`.
-
-**Valeurs renvoyées**
-
--   Le nombre de champs avec `Enum` les valeurs d'entrée.
--   Une exception est levée si le type n'est pas `Enum`.
-
-**Exemple**
-
-``` sql
-SELECT getSizeOfEnumType( CAST('a' AS Enum8('a' = 1, 'b' = 2) ) ) AS x
-```
-
-``` text
-┌─x─┐
-│ 2 │
-└───┘
-```
-
-## blockSerializedSize {#blockserializedsize}
-
-Retourne la taille sur le disque (sans tenir compte de la compression).
-
-``` sql
-blockSerializedSize(value[, value[, ...]])
-```
-
-**Paramètre:**
-
--   `value` — Any value.
-
-**Valeurs renvoyées**
-
--   Le nombre d'octets qui seront écrites sur le disque pour le bloc de valeurs (sans compression).
-
-**Exemple**
-
-``` sql
-SELECT blockSerializedSize(maxState(1)) as x
-```
-
-``` text
-┌─x─┐
-│ 2 │
-└───┘
-```
-
-## toColumnTypeName {#tocolumntypename}
-
-Renvoie le nom de la classe qui représente le type de données de la colonne dans la RAM.
-
-``` sql
-toColumnTypeName(value)
-```
-
-**Paramètre:**
-
--   `value` — Any type of value.
-
-**Valeurs renvoyées**
-
--   Une chaîne avec le nom de la classe utilisée pour représenter `value` type de données dans la mémoire RAM.
-
-**Exemple de la différence entre`toTypeName ' and ' toColumnTypeName`**
-
-``` sql
-SELECT toTypeName(CAST('2018-01-01 01:02:03' AS DateTime))
-```
-
-``` text
-┌─toTypeName(CAST('2018-01-01 01:02:03', 'DateTime'))─┐
-│ DateTime                                            │
-└─────────────────────────────────────────────────────┘
-```
-
-``` sql
-SELECT toColumnTypeName(CAST('2018-01-01 01:02:03' AS DateTime))
-```
-
-``` text
-┌─toColumnTypeName(CAST('2018-01-01 01:02:03', 'DateTime'))─┐
-│ Const(UInt32)                                             │
-└───────────────────────────────────────────────────────────┘
-```
-
-L'exemple montre que le `DateTime` type de données est stocké dans la mémoire comme `Const(UInt32)`.
-
-## dumpColumnStructure {#dumpcolumnstructure}
-
-Affiche une description détaillée des structures de données en RAM
-
-``` sql
-dumpColumnStructure(value)
-```
-
-**Paramètre:**
-
--   `value` — Any type of value.
-
-**Valeurs renvoyées**
-
--   Une chaîne décrivant la structure utilisée pour représenter `value` type de données dans la mémoire RAM.
-
-**Exemple**
-
-``` sql
-SELECT dumpColumnStructure(CAST('2018-01-01 01:02:03', 'DateTime'))
-```
-
-``` text
-┌─dumpColumnStructure(CAST('2018-01-01 01:02:03', 'DateTime'))─┐
-│ DateTime, Const(size = 1, UInt32(size = 1))                  │
-└──────────────────────────────────────────────────────────────┘
-```
-
-## defaultValueOfArgumentType {#defaultvalueofargumenttype}
-
-Affiche la valeur par défaut du type de données.
-
-Ne pas inclure des valeurs par défaut pour les colonnes personnalisées définies par l'utilisateur.
-
-``` sql
-defaultValueOfArgumentType(expression)
-```
-
-**Paramètre:**
-
--   `expression` — Arbitrary type of value or an expression that results in a value of an arbitrary type.
-
-**Valeurs renvoyées**
-
--   `0` pour les nombres.
--   Chaîne vide pour les chaînes.
--   `ᴺᵁᴸᴸ` pour [Nullable](../../sql-reference/data-types/nullable.md).
-
-**Exemple**
-
-``` sql
-SELECT defaultValueOfArgumentType( CAST(1 AS Int8) )
-```
-
-``` text
-┌─defaultValueOfArgumentType(CAST(1, 'Int8'))─┐
-│                                           0 │
-└─────────────────────────────────────────────┘
-```
-
-``` sql
-SELECT defaultValueOfArgumentType( CAST(1 AS Nullable(Int8) ) )
-```
-
-``` text
-┌─defaultValueOfArgumentType(CAST(1, 'Nullable(Int8)'))─┐
-│                                                  ᴺᵁᴸᴸ │
-└───────────────────────────────────────────────────────┘
-```
-
-## reproduire {#other-functions-replicate}
-
-Crée un tableau avec une seule valeur.
-
-Utilisé pour la mise en œuvre interne de [arrayJoin](array-join.md#functions_arrayjoin).
-
-``` sql
-SELECT replicate(x, arr);
-```
-
-**Paramètre:**
-
--   `arr` — Original array. ClickHouse creates a new array of the same length as the original and fills it with the value `x`.
--   `x` — The value that the resulting array will be filled with.
-
-**Valeur renvoyée**
-
-Un tableau rempli de la valeur `x`.
-
-Type: `Array`.
-
-**Exemple**
-
-Requête:
-
-``` sql
-SELECT replicate(1, ['a', 'b', 'c'])
-```
-
-Résultat:
-
-``` text
-┌─replicate(1, ['a', 'b', 'c'])─┐
-│ [1,1,1]                       │
-└───────────────────────────────┘
-```
-
-## filesystemAvailable {#filesystemavailable}
-
-Renvoie la quantité d'espace restant sur le système de fichiers où se trouvent les fichiers des bases de données. Il est toujours plus petit que l'espace libre total ([filesystemFree](#filesystemfree)) parce qu'un peu d'espace est réservé au système D'exploitation.
-
-**Syntaxe**
-
-``` sql
-filesystemAvailable()
-```
-
-**Valeur renvoyée**
-
--   La quantité d'espace restant disponible en octets.
-
-Type: [UInt64](../../sql-reference/data-types/int-uint.md).
-
-**Exemple**
-
-Requête:
-
-``` sql
-SELECT formatReadableSize(filesystemAvailable()) AS "Available space", toTypeName(filesystemAvailable()) AS "Type";
-```
-
-Résultat:
-
-``` text
-┌─Available space─┬─Type───┐
-│ 30.75 GiB       │ UInt64 │
-└─────────────────┴────────┘
-```
-
-## filesystemFree {#filesystemfree}
-
-Retourne montant total de l'espace libre sur le système de fichiers où les fichiers des bases de données. Voir aussi `filesystemAvailable`
-
-**Syntaxe**
-
-``` sql
-filesystemFree()
-```
-
-**Valeur renvoyée**
-
--   Quantité d'espace libre en octets.
-
-Type: [UInt64](../../sql-reference/data-types/int-uint.md).
-
-**Exemple**
-
-Requête:
-
-``` sql
-SELECT formatReadableSize(filesystemFree()) AS "Free space", toTypeName(filesystemFree()) AS "Type";
-```
-
-Résultat:
-
-``` text
-┌─Free space─┬─Type───┐
-│ 32.39 GiB  │ UInt64 │
-└────────────┴────────┘
-```
-
-## filesystemCapacity {#filesystemcapacity}
-
-Renvoie la capacité du système de fichiers en octets. Pour l'évaluation, la [chemin](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-path) le répertoire de données doit être configuré.
-
-**Syntaxe**
-
-``` sql
-filesystemCapacity()
-```
-
-**Valeur renvoyée**
-
--   Informations de capacité du système de fichiers en octets.
-
-Type: [UInt64](../../sql-reference/data-types/int-uint.md).
-
-**Exemple**
-
-Requête:
-
-``` sql
-SELECT formatReadableSize(filesystemCapacity()) AS "Capacity", toTypeName(filesystemCapacity()) AS "Type"
-```
-
-Résultat:
-
-``` text
-┌─Capacity──┬─Type───┐
-│ 39.32 GiB │ UInt64 │
-└───────────┴────────┘
-```
-
-## finalizeAggregation {#function-finalizeaggregation}
-
-Prend de l'état de la fonction d'agrégation. Renvoie le résultat de l'agrégation (état finalisé).
-
-## runningAccumulate {#function-runningaccumulate}
-
-Prend les membres de la fonction d'agrégation et renvoie une colonne avec des valeurs, sont le résultat de l'accumulation de ces états pour un ensemble de bloc de lignes, de la première à la ligne actuelle.
-Par exemple, prend l'état de la fonction d'agrégat (exemple runningAccumulate(uniqState(UserID))), et pour chaque ligne de bloc, retourne le résultat de la fonction d'agrégat lors de la fusion des états de toutes les lignes précédentes et de la ligne actuelle.
-Ainsi, le résultat de la fonction dépend de la partition des données aux blocs et de l'ordre des données dans le bloc.
-
-## joinGet {#joinget}
-
-La fonction vous permet d'extraire les données de la table de la même manière qu'à partir d'un [dictionnaire](../../sql-reference/dictionaries/index.md).
-
-Obtient les données de [Rejoindre](../../engines/table-engines/special/join.md#creating-a-table) tables utilisant la clé de jointure spécifiée.
-
-Ne prend en charge que les tables créées avec `ENGINE = Join(ANY, LEFT, <join_keys>)` déclaration.
-
-**Syntaxe**
-
-``` sql
-joinGet(join_storage_table_name, `value_column`, join_keys)
-```
-
-**Paramètre**
-
--   `join_storage_table_name` — an [identificateur](../syntax.md#syntax-identifiers) indique l'endroit où la recherche est effectuée. L'identificateur est recherché dans la base de données par défaut (voir paramètre `default_database` dans le fichier de config). Pour remplacer la base de données par défaut, utilisez `USE db_name` ou spécifiez la base de données et la table via le séparateur `db_name.db_table` voir l'exemple.
--   `value_column` — name of the column of the table that contains required data.
--   `join_keys` — list of keys.
-
-**Valeur renvoyée**
-
-Retourne la liste des valeurs correspond à la liste des clés.
-
-Si certain n'existe pas dans la table source alors `0` ou `null` seront renvoyés basé sur [join_use_nulls](../../operations/settings/settings.md#join_use_nulls) paramètre.
-
-Plus d'infos sur `join_use_nulls` dans [Opération de jointure](../../engines/table-engines/special/join.md).
-
-**Exemple**
-
-Table d'entrée:
-
-``` sql
-CREATE DATABASE db_test
-CREATE TABLE db_test.id_val(`id` UInt32, `val` UInt32) ENGINE = Join(ANY, LEFT, id) SETTINGS join_use_nulls = 1
-INSERT INTO db_test.id_val VALUES (1,11)(2,12)(4,13)
-```
-
-``` text
-┌─id─┬─val─┐
-│  4 │  13 │
-│  2 │  12 │
-│  1 │  11 │
-└────┴─────┘
-```
-
-Requête:
-
-``` sql
-SELECT joinGet(db_test.id_val,'val',toUInt32(number)) from numbers(4) SETTINGS join_use_nulls = 1
-```
-
-Résultat:
-
-``` text
-┌─joinGet(db_test.id_val, 'val', toUInt32(number))─┐
-│                                                0 │
-│                                               11 │
-│                                               12 │
-│                                                0 │
-└──────────────────────────────────────────────────┘
-```
-
-## modelEvaluate(model_name, …) {#function-modelevaluate}
-
-Évaluer le modèle externe.
-Accepte un nom de modèle et le modèle de l'argumentation. Renvoie Float64.
-
-## throwIf (x \[, custom_message\]) {#throwifx-custom-message}
-
-Lever une exception si l'argument est non nul.
-custom_message - est un paramètre optionnel: une chaîne constante, fournit un message d'erreur
-
-``` sql
-SELECT throwIf(number = 3, 'Too many') FROM numbers(10);
-```
-
-``` text
-↙ Progress: 0.00 rows, 0.00 B (0.00 rows/s., 0.00 B/s.) Received exception from server (version 19.14.1):
-Code: 395. DB::Exception: Received from localhost:9000. DB::Exception: Too many.
-```
-
-## identité {#identity}
-
-Renvoie la même valeur qui a été utilisée comme argument. Utilisé pour le débogage et les tests, permet d'annuler l'utilisation de l'index et d'obtenir les performances de requête d'une analyse complète. Lorsque la requête est analysée pour une utilisation possible de l'index, l'analyseur ne regarde pas à l'intérieur `identity` fonction.
-
-**Syntaxe**
-
-``` sql
-identity(x)
-```
-
-**Exemple**
-
-Requête:
-
-``` sql
-SELECT identity(42)
-```
-
-Résultat:
-
-``` text
-┌─identity(42)─┐
-│           42 │
-└──────────────┘
-```
-
-## randomPrintableASCII {#randomascii}
-
-Génère une chaîne avec un ensemble aléatoire de [ASCII](https://en.wikipedia.org/wiki/ASCII#Printable_characters) caractères imprimables.
-
-**Syntaxe**
-
-``` sql
-randomPrintableASCII(length)
-```
-
-**Paramètre**
-
--   `length` — Resulting string length. Positive integer.
-
-        If you pass `length < 0`, behavior of the function is undefined.
-
-**Valeur renvoyée**
-
--   Chaîne avec un ensemble aléatoire de [ASCII](https://en.wikipedia.org/wiki/ASCII#Printable_characters) caractères imprimables.
-
-Type: [Chaîne](../../sql-reference/data-types/string.md)
-
-**Exemple**
-
-``` sql
-SELECT number, randomPrintableASCII(30) as str, length(str) FROM system.numbers LIMIT 3
-```
-
-``` text
-┌─number─┬─str────────────────────────────┬─length(randomPrintableASCII(30))─┐
-│      0 │ SuiCOSTvC0csfABSw=UcSzp2.`rv8x │                               30 │
-│      1 │ 1Ag NlJ &RCN:*>HVPG;PE-nO"SUFD │                               30 │
-│      2 │ /"+<"wUTh:=LjJ Vm!c&hI*m#XTfzz │                               30 │
-└────────┴────────────────────────────────┴──────────────────────────────────┘
-```
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/functions/other_functions/) <!--hide-->
diff --git a/docs/fr/sql-reference/functions/random-functions.md b/docs/fr/sql-reference/functions/random-functions.md
deleted file mode 100644
index 3c4e15507bb..00000000000
--- a/docs/fr/sql-reference/functions/random-functions.md
+++ /dev/null
@@ -1,65 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 51
-toc_title: "La G\xE9n\xE9ration De Nombres Pseudo-Al\xE9atoires"
----
-
-# Fonctions pour générer des nombres Pseudo-aléatoires {#functions-for-generating-pseudo-random-numbers}
-
-Des générateurs Non cryptographiques de nombres pseudo-aléatoires sont utilisés.
-
-Toutes les fonctions acceptent zéro argument ou un argument.
-Si un argument est passé, il peut être de n'importe quel type, et sa valeur n'est utilisée pour rien.
-Le seul but de cet argument est d'empêcher l'élimination des sous-expressions courantes, de sorte que deux instances différentes de la même fonction renvoient des colonnes différentes avec des nombres aléatoires différents.
-
-## Rand {#rand}
-
-Renvoie un nombre UInt32 pseudo-aléatoire, réparti uniformément entre tous les nombres de type UInt32.
-Utilise un générateur congruentiel linéaire.
-
-## rand64 {#rand64}
-
-Renvoie un nombre UInt64 pseudo-aléatoire, réparti uniformément entre tous les nombres de type UInt64.
-Utilise un générateur congruentiel linéaire.
-
-## randConstant {#randconstant}
-
-Produit une colonne constante avec une valeur aléatoire.
-
-**Syntaxe**
-
-``` sql
-randConstant([x])
-```
-
-**Paramètre**
-
--   `x` — [Expression](../syntax.md#syntax-expressions) résultant de la [types de données pris en charge](../data-types/index.md#data_types). La valeur résultante est ignorée, mais l'expression elle-même si elle est utilisée pour contourner [élimination des sous-expressions courantes](index.md#common-subexpression-elimination) si la fonction est appelée plusieurs fois dans une seule requête. Paramètre facultatif.
-
-**Valeur renvoyée**
-
--   Nombre Pseudo-aléatoire.
-
-Type: [UInt32](../data-types/int-uint.md).
-
-**Exemple**
-
-Requête:
-
-``` sql
-SELECT rand(), rand(1), rand(number), randConstant(), randConstant(1), randConstant(number)
-FROM numbers(3)
-```
-
-Résultat:
-
-``` text
-┌─────rand()─┬────rand(1)─┬─rand(number)─┬─randConstant()─┬─randConstant(1)─┬─randConstant(number)─┐
-│ 3047369878 │ 4132449925 │   4044508545 │     2740811946 │      4229401477 │           1924032898 │
-│ 2938880146 │ 1267722397 │   4154983056 │     2740811946 │      4229401477 │           1924032898 │
-│  956619638 │ 4238287282 │   1104342490 │     2740811946 │      4229401477 │           1924032898 │
-└────────────┴────────────┴──────────────┴────────────────┴─────────────────┴──────────────────────┘
-```
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/functions/random_functions/) <!--hide-->
diff --git a/docs/fr/sql-reference/functions/rounding-functions.md b/docs/fr/sql-reference/functions/rounding-functions.md
deleted file mode 100644
index f99e6358026..00000000000
--- a/docs/fr/sql-reference/functions/rounding-functions.md
+++ /dev/null
@@ -1,190 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 45
-toc_title: Arrondi
----
-
-# Fonctions D'Arrondi {#rounding-functions}
-
-## floor(x\[, N\]) {#floorx-n}
-
-Renvoie le plus grand nombre rond inférieur ou égal à `x`. Un nombre rond est un multiple de 1 / 10N, ou le nombre le plus proche du type de données approprié si 1 / 10N n'est pas exact.
-‘N’ est une constante entière, paramètre facultatif. Par défaut, il est zéro, ce qui signifie arrondir à un entier.
-‘N’ peut être négative.
-
-Exemple: `floor(123.45, 1) = 123.4, floor(123.45, -1) = 120.`
-
-`x` est n'importe quel type numérique. Le résultat est un nombre du même type.
-Pour les arguments entiers, il est logique d'arrondir avec un négatif `N` valeur (pour non négatif `N`, la fonction ne fait rien).
-Si l'arrondi provoque un débordement (par exemple, floor(-128, -1)), un résultat spécifique à l'implémentation est renvoyé.
-
-## ceil(x\[, n\]), plafond (x\[, n\]) {#ceilx-n-ceilingx-n}
-
-Renvoie le plus petit nombre rond supérieur ou égal à `x`. Dans tous les autres sens, il est le même que le `floor` fonction (voir ci-dessus).
-
-## trunc(x \[, N\]), truncate(x \[, N\]) {#truncx-n-truncatex-n}
-
-Renvoie le nombre rond avec la plus grande valeur absolue qui a une valeur absolue inférieure ou égale à `x`‘s. In every other way, it is the same as the ’floor’ fonction (voir ci-dessus).
-
-## round(x\[, N\]) {#rounding_functions-round}
-
-Arrondit une valeur à un nombre spécifié de décimales.
-
-La fonction renvoie le nombre plus proche de l'ordre spécifié. Dans le cas où un nombre donné a une distance égale aux nombres environnants, la fonction utilise l'arrondi de banquier pour les types de nombres flottants et arrondit à partir de zéro pour les autres types de nombres.
-
-``` sql
-round(expression [, decimal_places])
-```
-
-**Paramètre:**
-
--   `expression` — A number to be rounded. Can be any [expression](../syntax.md#syntax-expressions) retour du numérique [type de données](../../sql-reference/data-types/index.md#data_types).
--   `decimal-places` — An integer value.
-    -   Si `decimal-places > 0` alors la fonction arrondit la valeur à droite du point décimal.
-    -   Si `decimal-places < 0` alors la fonction arrondit la valeur à gauche de la virgule décimale.
-    -   Si `decimal-places = 0` alors la fonction arrondit la valeur à l'entier. Dans ce cas, l'argument peut être omis.
-
-**Valeur renvoyée:**
-
-Le nombre arrondi du même type que le nombre d'entrée.
-
-### Exemple {#examples}
-
-**Exemple d'utilisation**
-
-``` sql
-SELECT number / 2 AS x, round(x) FROM system.numbers LIMIT 3
-```
-
-``` text
-┌───x─┬─round(divide(number, 2))─┐
-│   0 │                        0 │
-│ 0.5 │                        0 │
-│   1 │                        1 │
-└─────┴──────────────────────────┘
-```
-
-**Des exemples de l'arrondissement**
-
-Le résultat est arrondi au plus proche.
-
-``` text
-round(3.2, 0) = 3
-round(4.1267, 2) = 4.13
-round(22,-1) = 20
-round(467,-2) = 500
-round(-467,-2) = -500
-```
-
-Le Banquier arrondit.
-
-``` text
-round(3.5) = 4
-round(4.5) = 4
-round(3.55, 1) = 3.6
-round(3.65, 1) = 3.6
-```
-
-**Voir Aussi**
-
--   [roundBankers](#roundbankers)
-
-## roundBankers {#roundbankers}
-
-Arrondit un nombre à une position décimale spécifiée.
-
--   Si le nombre est arrondi à mi-chemin entre deux nombres, la fonction utilise l'arrondi.
-
-        Banker's rounding is a method of rounding fractional numbers. When the rounding number is halfway between two numbers, it's rounded to the nearest even digit at the specified decimal position. For example: 3.5 rounds up to 4, 2.5 rounds down to 2.
-
-        It's the default rounding method for floating point numbers defined in [IEEE 754](https://en.wikipedia.org/wiki/IEEE_754#Roundings_to_nearest). The [round](#rounding_functions-round) function performs the same rounding for floating point numbers. The `roundBankers` function also rounds integers the same way, for example, `roundBankers(45, -1) = 40`.
-
--   Dans d'autres cas, la fonction arrondit les nombres à l'entier le plus proche.
-
-À l'aide de l'arrondi, vous pouvez réduire l'effet qu'arrondir les nombres sur les résultats d'additionner ou de soustraire ces chiffres.
-
-Par exemple, les nombres de somme 1.5, 2.5, 3.5, 4.5 avec des arrondis différents:
-
--   Pas d'arrondi: 1.5 + 2.5 + 3.5 + 4.5 = 12.
--   Arrondi du banquier: 2 + 2 + 4 + 4 = 12.
--   Arrondi à l'entier le plus proche: 2 + 3 + 4 + 5 = 14.
-
-**Syntaxe**
-
-``` sql
-roundBankers(expression [, decimal_places])
-```
-
-**Paramètre**
-
--   `expression` — A number to be rounded. Can be any [expression](../syntax.md#syntax-expressions) retour du numérique [type de données](../../sql-reference/data-types/index.md#data_types).
--   `decimal-places` — Decimal places. An integer number.
-    -   `decimal-places > 0` — The function rounds the number to the given position right of the decimal point. Example: `roundBankers(3.55, 1) = 3.6`.
-    -   `decimal-places < 0` — The function rounds the number to the given position left of the decimal point. Example: `roundBankers(24.55, -1) = 20`.
-    -   `decimal-places = 0` — The function rounds the number to an integer. In this case the argument can be omitted. Example: `roundBankers(2.5) = 2`.
-
-**Valeur renvoyée**
-
-Valeur arrondie par la méthode d'arrondi du banquier.
-
-### Exemple {#examples-1}
-
-**Exemple d'utilisation**
-
-Requête:
-
-``` sql
- SELECT number / 2 AS x, roundBankers(x, 0) AS b fROM system.numbers limit 10
-```
-
-Résultat:
-
-``` text
-┌───x─┬─b─┐
-│   0 │ 0 │
-│ 0.5 │ 0 │
-│   1 │ 1 │
-│ 1.5 │ 2 │
-│   2 │ 2 │
-│ 2.5 │ 2 │
-│   3 │ 3 │
-│ 3.5 │ 4 │
-│   4 │ 4 │
-│ 4.5 │ 4 │
-└─────┴───┘
-```
-
-**Exemples d'arrondi bancaire**
-
-``` text
-roundBankers(0.4) = 0
-roundBankers(-3.5) = -4
-roundBankers(4.5) = 4
-roundBankers(3.55, 1) = 3.6
-roundBankers(3.65, 1) = 3.6
-roundBankers(10.35, 1) = 10.4
-roundBankers(10.755, 2) = 11,76
-```
-
-**Voir Aussi**
-
--   [rond](#rounding_functions-round)
-
-## roundToExp2 (num) {#roundtoexp2num}
-
-Accepte un certain nombre. Si le nombre est inférieur à un, elle renvoie 0. Sinon, il arrondit le nombre au degré le plus proche (entier non négatif) de deux.
-
-## roundDuration (num) {#rounddurationnum}
-
-Accepte un certain nombre. Si le nombre est inférieur à un, elle renvoie 0. Sinon, il arrondit le nombre vers le bas pour les nombres de l'ensemble: 1, 10, 30, 60, 120, 180, 240, 300, 600, 1200, 1800, 3600, 7200, 18000, 36000. Cette fonction est spécifique à Yandex.Metrica et utilisé pour la mise en œuvre du rapport sur la durée de la session.
-
-## roundAge (num) {#roundagenum}
-
-Accepte un certain nombre. Si le nombre est inférieur à 18, il renvoie 0. Sinon, il arrondit le nombre à un nombre de l'ensemble: 18, 25, 35, 45, 55. Cette fonction est spécifique à Yandex.Metrica et utilisé pour la mise en œuvre du rapport sur l'âge des utilisateurs.
-
-## roundDown(num, arr) {#rounddownnum-arr}
-
-Accepte un nombre et l'arrondit à un élément dans le tableau spécifié. Si la valeur est inférieure à la plus basse, la plus basse lié est retourné.
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/functions/rounding_functions/) <!--hide-->
diff --git a/docs/fr/sql-reference/functions/splitting-merging-functions.md b/docs/fr/sql-reference/functions/splitting-merging-functions.md
deleted file mode 100644
index a1260e918b0..00000000000
--- a/docs/fr/sql-reference/functions/splitting-merging-functions.md
+++ /dev/null
@@ -1,116 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 47
-toc_title: "Fractionnement et fusion de cha\xEEnes et de tableaux"
----
-
-# Fonctions pour diviser et fusionner des chaînes et des tableaux {#functions-for-splitting-and-merging-strings-and-arrays}
-
-## splitByChar (séparateur, s) {#splitbycharseparator-s}
-
-Divise une chaîne en sous-chaînes séparées par un caractère spécifique. Il utilise une chaîne constante `separator` qui composé d'un seul caractère.
-Retourne un tableau de certaines chaînes. Les sous-chaînes vides peuvent être sélectionnées si le séparateur se produit au début ou à la fin de la chaîne, ou s'il existe plusieurs séparateurs consécutifs.
-
-**Syntaxe**
-
-``` sql
-splitByChar(<separator>, <s>)
-```
-
-**Paramètre**
-
--   `separator` — The separator which should contain exactly one character. [Chaîne](../../sql-reference/data-types/string.md).
--   `s` — The string to split. [Chaîne](../../sql-reference/data-types/string.md).
-
-**Valeur renvoyée(s)**
-
-Retourne un tableau de certaines chaînes. Des sous-chaînes vides peuvent être sélectionnées lorsque:
-
--   Un séparateur se produit au début ou à la fin de la chaîne;
--   Il existe plusieurs séparateurs consécutifs;
--   La chaîne d'origine `s` est vide.
-
-Type: [Tableau](../../sql-reference/data-types/array.md) de [Chaîne](../../sql-reference/data-types/string.md).
-
-**Exemple**
-
-``` sql
-SELECT splitByChar(',', '1,2,3,abcde')
-```
-
-``` text
-┌─splitByChar(',', '1,2,3,abcde')─┐
-│ ['1','2','3','abcde']           │
-└─────────────────────────────────┘
-```
-
-## splitByString(séparateur, s) {#splitbystringseparator-s}
-
-Divise une chaîne en sous-chaînes séparées par une chaîne. Il utilise une chaîne constante `separator` de plusieurs caractères comme séparateur. Si la chaîne `separator` est vide, il va diviser la chaîne `s` dans un tableau de caractères uniques.
-
-**Syntaxe**
-
-``` sql
-splitByString(<separator>, <s>)
-```
-
-**Paramètre**
-
--   `separator` — The separator. [Chaîne](../../sql-reference/data-types/string.md).
--   `s` — The string to split. [Chaîne](../../sql-reference/data-types/string.md).
-
-**Valeur renvoyée(s)**
-
-Retourne un tableau de certaines chaînes. Des sous-chaînes vides peuvent être sélectionnées lorsque:
-
-Type: [Tableau](../../sql-reference/data-types/array.md) de [Chaîne](../../sql-reference/data-types/string.md).
-
--   Un séparateur non vide se produit au début ou à la fin de la chaîne;
--   Il existe plusieurs séparateurs consécutifs non vides;
--   La chaîne d'origine `s` est vide tandis que le séparateur n'est pas vide.
-
-**Exemple**
-
-``` sql
-SELECT splitByString(', ', '1, 2 3, 4,5, abcde')
-```
-
-``` text
-┌─splitByString(', ', '1, 2 3, 4,5, abcde')─┐
-│ ['1','2 3','4,5','abcde']                 │
-└───────────────────────────────────────────┘
-```
-
-``` sql
-SELECT splitByString('', 'abcde')
-```
-
-``` text
-┌─splitByString('', 'abcde')─┐
-│ ['a','b','c','d','e']      │
-└────────────────────────────┘
-```
-
-## arrayStringConcat(arr \[, séparateur\]) {#arraystringconcatarr-separator}
-
-Concatène les chaînes répertoriées dans le tableau avec le séparateur."séparateur" est un paramètre facultatif: une chaîne constante, définie à une chaîne vide par défaut.
-Retourne une chaîne de caractères.
-
-## alphaTokens (s) {#alphatokenss}
-
-Sélectionne des sous-chaînes d'octets consécutifs dans les plages A-z et A-Z. retourne un tableau de sous-chaînes.
-
-**Exemple**
-
-``` sql
-SELECT alphaTokens('abca1abc')
-```
-
-``` text
-┌─alphaTokens('abca1abc')─┐
-│ ['abca','abc']          │
-└─────────────────────────┘
-```
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/functions/splitting_merging_functions/) <!--hide-->
diff --git a/docs/fr/sql-reference/functions/string-functions.md b/docs/fr/sql-reference/functions/string-functions.md
deleted file mode 100644
index 1482952426c..00000000000
--- a/docs/fr/sql-reference/functions/string-functions.md
+++ /dev/null
@@ -1,489 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 40
-toc_title: "Travailler avec des cha\xEEnes"
----
-
-# Fonctions pour travailler avec des chaînes {#functions-for-working-with-strings}
-
-## vide {#empty}
-
-Renvoie 1 pour une chaîne vide ou 0 pour une chaîne non vide.
-Le type de résultat est UInt8.
-Une chaîne est considérée comme non vide si elle contient au moins un octet, même s'il s'agit d'un espace ou d'un octet nul.
-La fonction fonctionne également pour les tableaux.
-
-## notEmpty {#notempty}
-
-Renvoie 0 pour une chaîne vide ou 1 pour une chaîne non vide.
-Le type de résultat est UInt8.
-La fonction fonctionne également pour les tableaux.
-
-## longueur {#length}
-
-Renvoie la longueur d'une chaîne en octets (pas en caractères, et pas en points de code).
-Le type de résultat est UInt64.
-La fonction fonctionne également pour les tableaux.
-
-## lengthUTF8 {#lengthutf8}
-
-Renvoie la longueur d'une chaîne en points de code Unicode (pas en caractères), en supposant que la chaîne contient un ensemble d'octets qui composent le texte codé en UTF-8. Si cette hypothèse n'est pas remplie, elle renvoie un résultat (elle ne lance pas d'exception).
-Le type de résultat est UInt64.
-
-## char_length, CHAR_LENGTH {#char-length}
-
-Renvoie la longueur d'une chaîne en points de code Unicode (pas en caractères), en supposant que la chaîne contient un ensemble d'octets qui composent le texte codé en UTF-8. Si cette hypothèse n'est pas remplie, elle renvoie un résultat (elle ne lance pas d'exception).
-Le type de résultat est UInt64.
-
-## character_length, CHARACTER_LENGTH {#character-length}
-
-Renvoie la longueur d'une chaîne en points de code Unicode (pas en caractères), en supposant que la chaîne contient un ensemble d'octets qui composent le texte codé en UTF-8. Si cette hypothèse n'est pas remplie, elle renvoie un résultat (elle ne lance pas d'exception).
-Le type de résultat est UInt64.
-
-## plus bas, lcase {#lower}
-
-Convertit les symboles latins ASCII dans une chaîne en minuscules.
-
-## supérieur, ucase {#upper}
-
-Convertit les symboles latins ASCII dans une chaîne en majuscules.
-
-## lowerUTF8 {#lowerutf8}
-
-Convertit une chaîne en minuscules, en supposant que la chaîne de caractères contient un ensemble d'octets qui composent un texte UTF-8.
-Il ne détecte pas la langue. Donc, pour le turc, le résultat pourrait ne pas être exactement correct.
-Si la longueur de la séquence d'octets UTF-8 est différente pour les majuscules et les minuscules d'un point de code, le résultat peut être incorrect pour ce point de code.
-Si la chaîne contient un ensemble d'octets qui N'est pas UTF-8, le comportement n'est pas défini.
-
-## upperUTF8 {#upperutf8}
-
-Convertit une chaîne en majuscules, en supposant que la chaîne de caractères contient un ensemble d'octets qui composent un texte UTF-8.
-Il ne détecte pas la langue. Donc, pour le turc, le résultat pourrait ne pas être exactement correct.
-Si la longueur de la séquence d'octets UTF-8 est différente pour les majuscules et les minuscules d'un point de code, le résultat peut être incorrect pour ce point de code.
-Si la chaîne contient un ensemble d'octets qui N'est pas UTF-8, le comportement n'est pas défini.
-
-## isValidUTF8 {#isvalidutf8}
-
-Renvoie 1, si l'ensemble d'octets est codé en UTF-8 valide, sinon 0.
-
-## toValidUTF8 {#tovalidutf8}
-
-Remplace les caractères UTF-8 non valides par `�` (U+FFFD) caractère. Tous les caractères non valides s'exécutant dans une rangée sont réduits en un seul caractère de remplacement.
-
-``` sql
-toValidUTF8( input_string )
-```
-
-Paramètre:
-
--   input_string — Any set of bytes represented as the [Chaîne](../../sql-reference/data-types/string.md) type de données objet.
-
-Valeur renvoyée: chaîne UTF-8 valide.
-
-**Exemple**
-
-``` sql
-SELECT toValidUTF8('\x61\xF0\x80\x80\x80b')
-```
-
-``` text
-┌─toValidUTF8('a����b')─┐
-│ a�b                   │
-└───────────────────────┘
-```
-
-## répéter {#repeat}
-
-Répète une corde autant de fois que spécifié et concatène les valeurs répliquées comme une seule chaîne.
-
-**Syntaxe**
-
-``` sql
-repeat(s, n)
-```
-
-**Paramètre**
-
--   `s` — The string to repeat. [Chaîne](../../sql-reference/data-types/string.md).
--   `n` — The number of times to repeat the string. [UInt](../../sql-reference/data-types/int-uint.md).
-
-**Valeur renvoyée**
-
-La chaîne unique, qui contient la chaîne `s` répéter `n` temps. Si `n` \< 1, la fonction renvoie une chaîne vide.
-
-Type: `String`.
-
-**Exemple**
-
-Requête:
-
-``` sql
-SELECT repeat('abc', 10)
-```
-
-Résultat:
-
-``` text
-┌─repeat('abc', 10)──────────────┐
-│ abcabcabcabcabcabcabcabcabcabc │
-└────────────────────────────────┘
-```
-
-## inverser {#reverse}
-
-Inverse la chaîne (comme une séquence d'octets).
-
-## reverseUTF8 {#reverseutf8}
-
-Inverse une séquence de points de code Unicode, en supposant que la chaîne contient un ensemble d'octets représentant un texte UTF-8. Sinon, il fait autre chose (il ne lance pas d'exception).
-
-## format(pattern, s0, s1, …) {#format}
-
-Formatage du motif constant avec la chaîne listée dans les arguments. `pattern` est un modèle de format Python simplifié. Chaîne de Format contient “replacement fields” entouré par des accolades `{}`. Tout ce qui n'est pas contenu dans les accolades est considéré comme du texte littéral, qui est copié inchangé dans la sortie. Si vous devez inclure un caractère d'Accolade dans le texte littéral, il peut être échappé en doublant: `{{ '{{' }}` et `{{ '}}' }}`. Les noms de champs peuvent être des nombres (à partir de zéro) ou vides (ils sont alors traités comme des nombres de conséquence).
-
-``` sql
-SELECT format('{1} {0} {1}', 'World', 'Hello')
-```
-
-``` text
-┌─format('{1} {0} {1}', 'World', 'Hello')─┐
-│ Hello World Hello                       │
-└─────────────────────────────────────────┘
-```
-
-``` sql
-SELECT format('{} {}', 'Hello', 'World')
-```
-
-``` text
-┌─format('{} {}', 'Hello', 'World')─┐
-│ Hello World                       │
-└───────────────────────────────────┘
-```
-
-## concat {#concat}
-
-Concatène les chaînes répertoriées dans les arguments, sans séparateur.
-
-**Syntaxe**
-
-``` sql
-concat(s1, s2, ...)
-```
-
-**Paramètre**
-
-Valeurs de type String ou FixedString.
-
-**Valeurs renvoyées**
-
-Renvoie la chaîne qui résulte de la concaténation des arguments.
-
-Si l'une des valeurs d'argument est `NULL`, `concat` retourner `NULL`.
-
-**Exemple**
-
-Requête:
-
-``` sql
-SELECT concat('Hello, ', 'World!')
-```
-
-Résultat:
-
-``` text
-┌─concat('Hello, ', 'World!')─┐
-│ Hello, World!               │
-└─────────────────────────────┘
-```
-
-## concatAssumeInjective {#concatassumeinjective}
-
-Même que [concat](#concat) la différence est que vous devez vous assurer que `concat(s1, s2, ...) → sn` est injectif, il sera utilisé pour l'optimisation du groupe par.
-
-La fonction est nommée “injective” si elle renvoie toujours un résultat différent pour différentes valeurs d'arguments. En d'autres termes: des arguments différents ne donnent jamais un résultat identique.
-
-**Syntaxe**
-
-``` sql
-concatAssumeInjective(s1, s2, ...)
-```
-
-**Paramètre**
-
-Valeurs de type String ou FixedString.
-
-**Valeurs renvoyées**
-
-Renvoie la chaîne qui résulte de la concaténation des arguments.
-
-Si l'une des valeurs d'argument est `NULL`, `concatAssumeInjective` retourner `NULL`.
-
-**Exemple**
-
-Table d'entrée:
-
-``` sql
-CREATE TABLE key_val(`key1` String, `key2` String, `value` UInt32) ENGINE = TinyLog;
-INSERT INTO key_val VALUES ('Hello, ','World',1), ('Hello, ','World',2), ('Hello, ','World!',3), ('Hello',', World!',2);
-SELECT * from key_val;
-```
-
-``` text
-┌─key1────┬─key2─────┬─value─┐
-│ Hello,  │ World    │     1 │
-│ Hello,  │ World    │     2 │
-│ Hello,  │ World!   │     3 │
-│ Hello   │ , World! │     2 │
-└─────────┴──────────┴───────┘
-```
-
-Requête:
-
-``` sql
-SELECT concat(key1, key2), sum(value) FROM key_val GROUP BY concatAssumeInjective(key1, key2)
-```
-
-Résultat:
-
-``` text
-┌─concat(key1, key2)─┬─sum(value)─┐
-│ Hello, World!      │          3 │
-│ Hello, World!      │          2 │
-│ Hello, World       │          3 │
-└────────────────────┴────────────┘
-```
-
-## substring(s, offset, longueur), mid(s, offset, longueur), substr(s, offset, longueur) {#substring}
-
-Renvoie une sous-chaîne commençant par l'octet du ‘offset’ index ‘length’ octets de long. L'indexation des caractères commence à partir d'un (comme dans SQL standard). Le ‘offset’ et ‘length’ les arguments doivent être des constantes.
-
-## substringUTF8(s, offset, longueur) {#substringutf8}
-
-Le même que ‘substring’, mais pour les points de code Unicode. Fonctionne sous l'hypothèse que la chaîne contient un ensemble d'octets représentant un texte codé en UTF-8. Si cette hypothèse n'est pas remplie, elle renvoie un résultat (elle ne lance pas d'exception).
-
-## appendTrailingCharIfAbsent (s, c) {#appendtrailingcharifabsent}
-
-Si l' ‘s’ la chaîne n'est pas vide et ne contient pas ‘c’ personnage à la fin, il ajoute le ‘c’ personnage à la fin.
-
-## convertCharset(s, à partir de, à) {#convertcharset}
-
-Retourne une chaîne de caractères ‘s’ qui a été converti à partir de l'encodage dans ‘from’ pour l'encodage dans ‘to’.
-
-## base64Encode(s) {#base64encode}
-
-Encodage ‘s’ chaîne dans base64
-
-## base64Decode(s) {#base64decode}
-
-Décoder la chaîne codée en base64 ‘s’ dans la chaîne d'origine. En cas d'échec, une exception est levée.
-
-## tryBase64Decode(s) {#trybase64decode}
-
-Semblable à base64Decode, mais en cas d'erreur, une chaîne vide serait renvoyé.
-
-## endsWith (s, suffixe) {#endswith}
-
-Renvoie s'il faut se terminer par le suffixe spécifié. Retourne 1 si la chaîne se termine par le suffixe spécifié, sinon elle renvoie 0.
-
-## startsWith (STR, préfixe) {#startswith}
-
-Retourne 1 si la chaîne commence par le préfixe spécifié, sinon elle renvoie 0.
-
-``` sql
-SELECT startsWith('Spider-Man', 'Spi');
-```
-
-**Valeurs renvoyées**
-
--   1, si la chaîne commence par le préfixe spécifié.
--   0, si la chaîne ne commence pas par le préfixe spécifié.
-
-**Exemple**
-
-Requête:
-
-``` sql
-SELECT startsWith('Hello, world!', 'He');
-```
-
-Résultat:
-
-``` text
-┌─startsWith('Hello, world!', 'He')─┐
-│                                 1 │
-└───────────────────────────────────┘
-```
-
-## coupe {#trim}
-
-Supprime tous les caractères spécifiés du début ou de la fin d'une chaîne.
-Par défaut supprime toutes les occurrences consécutives d'espaces communs (caractère ASCII 32) des deux extrémités d'une chaîne.
-
-**Syntaxe**
-
-``` sql
-trim([[LEADING|TRAILING|BOTH] trim_character FROM] input_string)
-```
-
-**Paramètre**
-
--   `trim_character` — specified characters for trim. [Chaîne](../../sql-reference/data-types/string.md).
--   `input_string` — string for trim. [Chaîne](../../sql-reference/data-types/string.md).
-
-**Valeur renvoyée**
-
-Une chaîne sans caractères de début et (ou) de fin spécifiés.
-
-Type: `String`.
-
-**Exemple**
-
-Requête:
-
-``` sql
-SELECT trim(BOTH ' ()' FROM '(   Hello, world!   )')
-```
-
-Résultat:
-
-``` text
-┌─trim(BOTH ' ()' FROM '(   Hello, world!   )')─┐
-│ Hello, world!                                 │
-└───────────────────────────────────────────────┘
-```
-
-## trimLeft {#trimleft}
-
-Supprime toutes les occurrences consécutives d'espaces communs (caractère ASCII 32) depuis le début d'une chaîne. Il ne supprime pas d'autres types de caractères d'espaces (tabulation, espace sans pause, etc.).
-
-**Syntaxe**
-
-``` sql
-trimLeft(input_string)
-```
-
-Alias: `ltrim(input_string)`.
-
-**Paramètre**
-
--   `input_string` — string to trim. [Chaîne](../../sql-reference/data-types/string.md).
-
-**Valeur renvoyée**
-
-Une chaîne sans ouvrir les espaces communs.
-
-Type: `String`.
-
-**Exemple**
-
-Requête:
-
-``` sql
-SELECT trimLeft('     Hello, world!     ')
-```
-
-Résultat:
-
-``` text
-┌─trimLeft('     Hello, world!     ')─┐
-│ Hello, world!                       │
-└─────────────────────────────────────┘
-```
-
-## trimRight {#trimright}
-
-Supprime toutes les occurrences consécutives d'espaces communs (caractère ASCII 32) de la fin d'une chaîne. Il ne supprime pas d'autres types de caractères d'espaces (tabulation, espace sans pause, etc.).
-
-**Syntaxe**
-
-``` sql
-trimRight(input_string)
-```
-
-Alias: `rtrim(input_string)`.
-
-**Paramètre**
-
--   `input_string` — string to trim. [Chaîne](../../sql-reference/data-types/string.md).
-
-**Valeur renvoyée**
-
-Une chaîne sans espaces communs de fin.
-
-Type: `String`.
-
-**Exemple**
-
-Requête:
-
-``` sql
-SELECT trimRight('     Hello, world!     ')
-```
-
-Résultat:
-
-``` text
-┌─trimRight('     Hello, world!     ')─┐
-│      Hello, world!                   │
-└──────────────────────────────────────┘
-```
-
-## trimBoth {#trimboth}
-
-Supprime toutes les occurrences consécutives d'espaces communs (caractère ASCII 32) des deux extrémités d'une chaîne. Il ne supprime pas d'autres types de caractères d'espaces (tabulation, espace sans pause, etc.).
-
-**Syntaxe**
-
-``` sql
-trimBoth(input_string)
-```
-
-Alias: `trim(input_string)`.
-
-**Paramètre**
-
--   `input_string` — string to trim. [Chaîne](../../sql-reference/data-types/string.md).
-
-**Valeur renvoyée**
-
-Une chaîne sans espaces communs de début et de fin.
-
-Type: `String`.
-
-**Exemple**
-
-Requête:
-
-``` sql
-SELECT trimBoth('     Hello, world!     ')
-```
-
-Résultat:
-
-``` text
-┌─trimBoth('     Hello, world!     ')─┐
-│ Hello, world!                       │
-└─────────────────────────────────────┘
-```
-
-## CRC32 (s) {#crc32}
-
-Renvoie la somme de contrôle CRC32 d'une chaîne, en utilisant le polynôme CRC-32-IEEE 802.3 et la valeur initiale `0xffffffff` (zlib mise en œuvre).
-
-Le type de résultat est UInt32.
-
-## CRC32IEEE (s) {#crc32ieee}
-
-Renvoie la somme de contrôle CRC32 d'une chaîne, en utilisant le polynôme CRC-32-IEEE 802.3.
-
-Le type de résultat est UInt32.
-
-## CRC64 (s) {#crc64}
-
-Renvoie la somme de contrôle CRC64 d'une chaîne, en utilisant le polynôme CRC-64-ECMA.
-
-Le type de résultat est UInt64.
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/functions/string_functions/) <!--hide-->
diff --git a/docs/fr/sql-reference/functions/string-replace-functions.md b/docs/fr/sql-reference/functions/string-replace-functions.md
deleted file mode 100644
index 5389a2bc927..00000000000
--- a/docs/fr/sql-reference/functions/string-replace-functions.md
+++ /dev/null
@@ -1,94 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 42
-toc_title: "Pour remplacer dans les cha\xEEnes"
----
-
-# Fonctions de recherche et de remplacement dans les chaînes {#functions-for-searching-and-replacing-in-strings}
-
-## replaceOne(botte de foin, modèle, remplacement) {#replaceonehaystack-pattern-replacement}
-
-Remplace la première occurrence, si elle existe, ‘pattern’ sous-chaîne dans ‘haystack’ avec l' ‘replacement’ substring.
-Ci-après, ‘pattern’ et ‘replacement’ doivent être constantes.
-
-## replaceAll(botte de foin, motif, remplacement), Remplacer(botte de foin, motif, remplacement) {#replaceallhaystack-pattern-replacement-replacehaystack-pattern-replacement}
-
-Remplace toutes les occurrences du ‘pattern’ sous-chaîne dans ‘haystack’ avec l' ‘replacement’ substring.
-
-## replaceRegexpOne(botte de foin, modèle, remplacement) {#replaceregexponehaystack-pattern-replacement}
-
-Remplacement en utilisant le ‘pattern’ expression régulière. Une expression régulière re2.
-Remplace seulement la première occurrence, si elle existe.
-Un motif peut être spécifié comme ‘replacement’. Ce modèle peut inclure des substitutions `\0-\9`.
-Substitution `\0` inclut l'expression régulière entière. Substitution `\1-\9` correspond au sous-modèle numbers.To utilisez le `\` caractère dans un modèle, échappez-le en utilisant `\`.
-Aussi garder à l'esprit qu'un littéral de chaîne nécessite une évasion.
-
-Exemple 1. Conversion de la date au format américain:
-
-``` sql
-SELECT DISTINCT
-    EventDate,
-    replaceRegexpOne(toString(EventDate), '(\\d{4})-(\\d{2})-(\\d{2})', '\\2/\\3/\\1') AS res
-FROM test.hits
-LIMIT 7
-FORMAT TabSeparated
-```
-
-``` text
-2014-03-17      03/17/2014
-2014-03-18      03/18/2014
-2014-03-19      03/19/2014
-2014-03-20      03/20/2014
-2014-03-21      03/21/2014
-2014-03-22      03/22/2014
-2014-03-23      03/23/2014
-```
-
-Exemple 2. Copier une chaîne dix fois:
-
-``` sql
-SELECT replaceRegexpOne('Hello, World!', '.*', '\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0') AS res
-```
-
-``` text
-┌─res────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
-│ Hello, World!Hello, World!Hello, World!Hello, World!Hello, World!Hello, World!Hello, World!Hello, World!Hello, World!Hello, World! │
-└────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
-```
-
-## replaceRegexpAll(botte de foin, modèle, remplacement) {#replaceregexpallhaystack-pattern-replacement}
-
-Cela fait la même chose, mais remplace toutes les occurrences. Exemple:
-
-``` sql
-SELECT replaceRegexpAll('Hello, World!', '.', '\\0\\0') AS res
-```
-
-``` text
-┌─res────────────────────────┐
-│ HHeelllloo,,  WWoorrlldd!! │
-└────────────────────────────┘
-```
-
-Par exception, si une expression régulière travaillé sur un vide sous-chaîne, le remplacement n'est pas effectué plus d'une fois.
-Exemple:
-
-``` sql
-SELECT replaceRegexpAll('Hello, World!', '^', 'here: ') AS res
-```
-
-``` text
-┌─res─────────────────┐
-│ here: Hello, World! │
-└─────────────────────┘
-```
-
-## regexpQuoteMeta (s) {#regexpquotemetas}
-
-La fonction ajoute une barre oblique inverse avant certains caractères prédéfinis dans la chaîne.
-Les personnages prédéfinis: ‘0’, ‘\\’, ‘\|’, ‘(’, ‘)’, ‘^’, ‘$’, ‘.’, ‘\[’, '\]', ‘?’, '\*‘,’+‘,’{‘,’:‘,’-'.
-Cette implémentation diffère légèrement de re2:: RE2:: QuoteMeta. Il échappe à zéro octet comme \\0 au lieu de 00 et il échappe uniquement les caractères requis.
-Pour plus d'informations, voir le lien: [RE2](https://github.com/google/re2/blob/master/re2/re2.cc#L473)
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/functions/string_replace_functions/) <!--hide-->
diff --git a/docs/fr/sql-reference/functions/string-search-functions.md b/docs/fr/sql-reference/functions/string-search-functions.md
deleted file mode 100644
index 20217edd32c..00000000000
--- a/docs/fr/sql-reference/functions/string-search-functions.md
+++ /dev/null
@@ -1,379 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 41
-toc_title: "Pour Rechercher Des Cha\xEEnes"
----
-
-# Fonctions de recherche de chaînes {#functions-for-searching-strings}
-
-La recherche est sensible à la casse par défaut dans toutes ces fonctions. Il existe des variantes pour la recherche insensible à la casse.
-
-## position(botte de foin, aiguille), localiser( botte de foin, aiguille) {#position}
-
-Renvoie la position (en octets) de la sous-chaîne trouvée dans la chaîne, à partir de 1.
-
-Fonctionne sous l'hypothèse que la chaîne de caractères contient un ensemble d'octets représentant un octet texte codé. Si cette hypothèse n'est pas remplie et qu'un caractère ne peut pas être représenté à l'aide d'un seul octet, la fonction ne lance pas d'exception et renvoie un résultat inattendu. Si le caractère peut être représenté en utilisant deux octets, il utilisera deux octets et ainsi de suite.
-
-Pour une recherche insensible à la casse, utilisez la fonction [positioncaseinsensible](#positioncaseinsensitive).
-
-**Syntaxe**
-
-``` sql
-position(haystack, needle)
-```
-
-Alias: `locate(haystack, needle)`.
-
-**Paramètre**
-
--   `haystack` — string, in which substring will to be searched. [Chaîne](../syntax.md#syntax-string-literal).
--   `needle` — substring to be searched. [Chaîne](../syntax.md#syntax-string-literal).
-
-**Valeurs renvoyées**
-
--   Position de départ en octets (à partir de 1), si la sous-chaîne a été trouvée.
--   0, si la sous-chaîne n'a pas été trouvé.
-
-Type: `Integer`.
-
-**Exemple**
-
-Phrase “Hello, world!” contient un ensemble d'octets représentant un octet texte codé. La fonction renvoie un résultat attendu:
-
-Requête:
-
-``` sql
-SELECT position('Hello, world!', '!')
-```
-
-Résultat:
-
-``` text
-┌─position('Hello, world!', '!')─┐
-│                             13 │
-└────────────────────────────────┘
-```
-
-La même phrase en russe contient des caractères qui ne peuvent pas être représentés en utilisant un seul octet. La fonction renvoie un résultat inattendu (utilisation [positionUTF8](#positionutf8) fonction pour le texte codé sur plusieurs octets):
-
-Requête:
-
-``` sql
-SELECT position('Привет, мир!', '!')
-```
-
-Résultat:
-
-``` text
-┌─position('Привет, мир!', '!')─┐
-│                            21 │
-└───────────────────────────────┘
-```
-
-## positioncaseinsensible {#positioncaseinsensitive}
-
-Le même que [position](#position) renvoie la position (en octets) de la sous-chaîne trouvée dans la chaîne, à partir de 1. Utilisez la fonction pour une recherche insensible à la casse.
-
-Fonctionne sous l'hypothèse que la chaîne de caractères contient un ensemble d'octets représentant un octet texte codé. Si cette hypothèse n'est pas remplie et qu'un caractère ne peut pas être représenté à l'aide d'un seul octet, la fonction ne lance pas d'exception et renvoie un résultat inattendu. Si le caractère peut être représenté en utilisant deux octets, il utilisera deux octets et ainsi de suite.
-
-**Syntaxe**
-
-``` sql
-positionCaseInsensitive(haystack, needle)
-```
-
-**Paramètre**
-
--   `haystack` — string, in which substring will to be searched. [Chaîne](../syntax.md#syntax-string-literal).
--   `needle` — substring to be searched. [Chaîne](../syntax.md#syntax-string-literal).
-
-**Valeurs renvoyées**
-
--   Position de départ en octets (à partir de 1), si la sous-chaîne a été trouvée.
--   0, si la sous-chaîne n'a pas été trouvé.
-
-Type: `Integer`.
-
-**Exemple**
-
-Requête:
-
-``` sql
-SELECT positionCaseInsensitive('Hello, world!', 'hello')
-```
-
-Résultat:
-
-``` text
-┌─positionCaseInsensitive('Hello, world!', 'hello')─┐
-│                                                 1 │
-└───────────────────────────────────────────────────┘
-```
-
-## positionUTF8 {#positionutf8}
-
-Renvoie la position (en points Unicode) de la sous-chaîne trouvée dans la chaîne, à partir de 1.
-
-Fonctionne sous l'hypothèse que la chaîne contient un ensemble d'octets représentant un texte codé en UTF-8. Si cette hypothèse n'est pas remplie, la fonction ne lance pas d'exception et renvoie un résultat inattendu. Si le caractère peut être représenté en utilisant deux points Unicode, il en utilisera deux et ainsi de suite.
-
-Pour une recherche insensible à la casse, utilisez la fonction [positionCaseInsensitiveUTF8](#positioncaseinsensitiveutf8).
-
-**Syntaxe**
-
-``` sql
-positionUTF8(haystack, needle)
-```
-
-**Paramètre**
-
--   `haystack` — string, in which substring will to be searched. [Chaîne](../syntax.md#syntax-string-literal).
--   `needle` — substring to be searched. [Chaîne](../syntax.md#syntax-string-literal).
-
-**Valeurs renvoyées**
-
--   Position de départ dans les points Unicode (à partir de 1), si la sous-chaîne a été trouvée.
--   0, si la sous-chaîne n'a pas été trouvé.
-
-Type: `Integer`.
-
-**Exemple**
-
-Phrase “Hello, world!” en russe contient un ensemble de points Unicode représentant un texte codé à un seul point. La fonction renvoie un résultat attendu:
-
-Requête:
-
-``` sql
-SELECT positionUTF8('Привет, мир!', '!')
-```
-
-Résultat:
-
-``` text
-┌─positionUTF8('Привет, мир!', '!')─┐
-│                                12 │
-└───────────────────────────────────┘
-```
-
-Phrase “Salut, étudiante!” où le caractère `é` peut être représenté en utilisant un point (`U+00E9`) ou deux points (`U+0065U+0301`) la fonction peut être retournée un résultat inattendu:
-
-Requête pour la lettre `é` qui est représenté un point Unicode `U+00E9`:
-
-``` sql
-SELECT positionUTF8('Salut, étudiante!', '!')
-```
-
-Résultat:
-
-``` text
-┌─positionUTF8('Salut, étudiante!', '!')─┐
-│                                     17 │
-└────────────────────────────────────────┘
-```
-
-Requête pour la lettre `é` qui est représenté deux points Unicode `U+0065U+0301`:
-
-``` sql
-SELECT positionUTF8('Salut, étudiante!', '!')
-```
-
-Résultat:
-
-``` text
-┌─positionUTF8('Salut, étudiante!', '!')─┐
-│                                     18 │
-└────────────────────────────────────────┘
-```
-
-## positionCaseInsensitiveUTF8 {#positioncaseinsensitiveutf8}
-
-Le même que [positionUTF8](#positionutf8) mais est sensible à la casse. Renvoie la position (en points Unicode) de la sous-chaîne trouvée dans la chaîne, à partir de 1.
-
-Fonctionne sous l'hypothèse que la chaîne contient un ensemble d'octets représentant un texte codé en UTF-8. Si cette hypothèse n'est pas remplie, la fonction ne lance pas d'exception et renvoie un résultat inattendu. Si le caractère peut être représenté en utilisant deux points Unicode, il en utilisera deux et ainsi de suite.
-
-**Syntaxe**
-
-``` sql
-positionCaseInsensitiveUTF8(haystack, needle)
-```
-
-**Paramètre**
-
--   `haystack` — string, in which substring will to be searched. [Chaîne](../syntax.md#syntax-string-literal).
--   `needle` — substring to be searched. [Chaîne](../syntax.md#syntax-string-literal).
-
-**Valeur renvoyée**
-
--   Position de départ dans les points Unicode (à partir de 1), si la sous-chaîne a été trouvée.
--   0, si la sous-chaîne n'a pas été trouvé.
-
-Type: `Integer`.
-
-**Exemple**
-
-Requête:
-
-``` sql
-SELECT positionCaseInsensitiveUTF8('Привет, мир!', 'Мир')
-```
-
-Résultat:
-
-``` text
-┌─positionCaseInsensitiveUTF8('Привет, мир!', 'Мир')─┐
-│                                                  9 │
-└────────────────────────────────────────────────────┘
-```
-
-## multirecherchallpositions {#multisearchallpositions}
-
-Le même que [position](string-search-functions.md#position) mais les retours `Array` des positions (en octets) des sous-chaînes correspondantes trouvées dans la chaîne. Les Positions sont indexées à partir de 1.
-
-La recherche est effectuée sur des séquences d'octets sans tenir compte de l'encodage et du classement des chaînes.
-
--   Pour une recherche ASCII insensible à la casse, utilisez la fonction `multiSearchAllPositionsCaseInsensitive`.
--   Pour la recherche en UTF-8, Utilisez la fonction [multiSearchAllPositionsUTF8](#multiSearchAllPositionsUTF8).
--   Pour la recherche UTF-8 insensible à la casse, utilisez la fonction multiSearchAllPositionsCaseInsensitiveutf8.
-
-**Syntaxe**
-
-``` sql
-multiSearchAllPositions(haystack, [needle1, needle2, ..., needlen])
-```
-
-**Paramètre**
-
--   `haystack` — string, in which substring will to be searched. [Chaîne](../syntax.md#syntax-string-literal).
--   `needle` — substring to be searched. [Chaîne](../syntax.md#syntax-string-literal).
-
-**Valeurs renvoyées**
-
--   Tableau de positions de départ en octets (à partir de 1), si la sous-chaîne correspondante a été trouvée et 0 si elle n'est pas trouvée.
-
-**Exemple**
-
-Requête:
-
-``` sql
-SELECT multiSearchAllPositions('Hello, World!', ['hello', '!', 'world'])
-```
-
-Résultat:
-
-``` text
-┌─multiSearchAllPositions('Hello, World!', ['hello', '!', 'world'])─┐
-│ [0,13,0]                                                          │
-└───────────────────────────────────────────────────────────────────┘
-```
-
-## multiSearchAllPositionsUTF8 {#multiSearchAllPositionsUTF8}
-
-Voir `multiSearchAllPositions`.
-
-## multiSearchFirstPosition(botte de foin, \[aiguille<sub>1</sub>, aiguille<sub>2</sub>, …, needle<sub>et</sub>\]) {#multisearchfirstposition}
-
-Le même que `position` mais renvoie le décalage le plus à gauche de la chaîne `haystack` et qui correspond à certains des aiguilles.
-
-Pour une recherche insensible à la casse ou/et au format UTF-8, utilisez les fonctions `multiSearchFirstPositionCaseInsensitive, multiSearchFirstPositionUTF8, multiSearchFirstPositionCaseInsensitiveUTF8`.
-
-## multiSearchFirstIndex(botte de foin, \[aiguille<sub>1</sub>, aiguille<sub>2</sub>, …, needle<sub>et</sub>\]) {#multisearchfirstindexhaystack-needle1-needle2-needlen}
-
-Renvoie l'index `i` (à partir de 1) de l'aiguille trouvée la plus à gauche<sub>je</sub> dans la chaîne `haystack` et 0 sinon.
-
-Pour une recherche insensible à la casse ou/et au format UTF-8, utilisez les fonctions `multiSearchFirstIndexCaseInsensitive, multiSearchFirstIndexUTF8, multiSearchFirstIndexCaseInsensitiveUTF8`.
-
-## multiSearchAny(botte de foin, \[aiguille<sub>1</sub>, aiguille<sub>2</sub>, …, needle<sub>et</sub>\]) {#function-multisearchany}
-
-Renvoie 1, si au moins une aiguille de chaîne<sub>je</sub> correspond à la chaîne `haystack` et 0 sinon.
-
-Pour une recherche insensible à la casse ou/et au format UTF-8, utilisez les fonctions `multiSearchAnyCaseInsensitive, multiSearchAnyUTF8, multiSearchAnyCaseInsensitiveUTF8`.
-
-!!! note "Note"
-    Dans tous les `multiSearch*` fonctions le nombre d'aiguilles doit être d'au moins 2<sup>8</sup> en raison de la spécification de mise en œuvre.
-
-## match (botte de foin, motif) {#matchhaystack-pattern}
-
-Vérifie si la chaîne correspond au `pattern` expression régulière. Un `re2` expression régulière. Le [syntaxe](https://github.com/google/re2/wiki/Syntax) de la `re2` les expressions régulières sont plus limitées que la syntaxe des expressions régulières Perl.
-
-Renvoie 0 si elle ne correspond pas, ou 1 si elle correspond.
-
-Notez que le symbole antislash (`\`) est utilisé pour s'échapper dans l'expression régulière. Le même symbole est utilisé pour échapper dans les littéraux de chaîne. Donc, pour échapper au symbole dans une expression régulière, vous devez écrire deux barres obliques inverses ( \\ ) dans un littéral de chaîne.
-
-L'expression régulière travaille à la chaîne, comme si c'est un ensemble d'octets. L'expression régulière ne peut pas contenir d'octets nuls.
-Pour que les modèles recherchent des sous-chaînes dans une chaîne, il est préférable D'utiliser LIKE ou ‘position’ depuis ils travaillent beaucoup plus vite.
-
-## multiMatchAny(botte de foin, \[motif<sub>1</sub>, modèle<sub>2</sub>, …, pattern<sub>et</sub>\]) {#multimatchanyhaystack-pattern1-pattern2-patternn}
-
-Le même que `match` mais renvoie 0 si aucune des expressions régulières sont appariés et 1 si l'un des modèles les matchs. Il utilise [hyperscan](https://github.com/intel/hyperscan) bibliothèque. Pour que les modèles recherchent des sous-chaînes dans une chaîne, il est préférable d'utiliser `multiSearchAny` comme cela fonctionne beaucoup plus vite.
-
-!!! note "Note"
-    La longueur de l'un des `haystack` la chaîne doit être inférieure à 2<sup>32</sup> octets sinon l'exception est levée. Cette restriction a lieu en raison de l'API hyperscan.
-
-## multiMatchAnyIndex(botte de foin, \[motif<sub>1</sub>, modèle<sub>2</sub>, …, pattern<sub>et</sub>\]) {#multimatchanyindexhaystack-pattern1-pattern2-patternn}
-
-Le même que `multiMatchAny` mais retourne un index qui correspond à la botte de foin.
-
-## multiMatchAllIndices(botte de foin, \[motif<sub>1</sub>, modèle<sub>2</sub>, …, pattern<sub>et</sub>\]) {#multimatchallindiceshaystack-pattern1-pattern2-patternn}
-
-Le même que `multiMatchAny`, mais renvoie le tableau de tous les indices qui correspondent à la botte de foin dans n'importe quel ordre.
-
-## multiFuzzyMatchAny(botte de foin, distance, \[motif<sub>1</sub>, modèle<sub>2</sub>, …, pattern<sub>et</sub>\]) {#multifuzzymatchanyhaystack-distance-pattern1-pattern2-patternn}
-
-Le même que `multiMatchAny`, mais renvoie 1 si un motif correspond à la botte de foin dans une constante [distance d'édition](https://en.wikipedia.org/wiki/Edit_distance). Cette fonction est également en mode expérimental et peut être extrêmement lente. Pour plus d'informations, voir [documentation hyperscan](https://intel.github.io/hyperscan/dev-reference/compilation.html#approximate-matching).
-
-## multiFuzzyMatchAnyIndex(botte de foin, distance, \[motif<sub>1</sub>, modèle<sub>2</sub>, …, pattern<sub>et</sub>\]) {#multifuzzymatchanyindexhaystack-distance-pattern1-pattern2-patternn}
-
-Le même que `multiFuzzyMatchAny`, mais renvoie tout index qui correspond à la botte de foin à une distance d'édition constante.
-
-## multiFuzzyMatchAllIndices(botte de foin, distance, \[motif<sub>1</sub>, modèle<sub>2</sub>, …, pattern<sub>et</sub>\]) {#multifuzzymatchallindiceshaystack-distance-pattern1-pattern2-patternn}
-
-Le même que `multiFuzzyMatchAny`, mais renvoie le tableau de tous les indices dans n'importe quel ordre qui correspond à la botte de foin à une distance d'édition constante.
-
-!!! note "Note"
-    `multiFuzzyMatch*` les fonctions ne prennent pas en charge les expressions régulières UTF-8, et ces expressions sont traitées comme des octets en raison de la restriction hyperscan.
-
-!!! note "Note"
-    Pour désactiver toutes les fonctions qui utilisent hyperscan, utilisez le réglage `SET allow_hyperscan = 0;`.
-
-## extrait(botte de foin, motif) {#extracthaystack-pattern}
-
-Extraits d'un fragment d'une chaîne à l'aide d'une expression régulière. Si ‘haystack’ ne correspond pas à l' ‘pattern’ regex, une chaîne vide est renvoyée. Si l'expression rationnelle ne contient pas de sous-modèles, elle prend le fragment qui correspond à l'expression rationnelle entière. Sinon, il prend le fragment qui correspond au premier sous-masque.
-
-## extractAll(botte de foin, motif) {#extractallhaystack-pattern}
-
-Extrait tous les fragments d'une chaîne à l'aide d'une expression régulière. Si ‘haystack’ ne correspond pas à l' ‘pattern’ regex, une chaîne vide est renvoyée. Renvoie un tableau de chaînes composé de toutes les correspondances à l'expression rationnelle. En général, le comportement est le même que le ‘extract’ fonction (il prend le premier sous-masque, ou l'expression entière s'il n'y a pas de sous-masque).
-
-## comme (botte de foin, motif), botte de foin comme opérateur de motif {#function-like}
-
-Vérifie si une chaîne correspond à une expression régulière simple.
-L'expression régulière peut contenir les métasymboles `%` et `_`.
-
-`%` indique n'importe quelle quantité d'octets (y compris zéro caractère).
-
-`_` indique un octet.
-
-Utilisez la barre oblique inverse (`\`) pour échapper aux métasymboles. Voir la note sur l'échappement dans la description du ‘match’ fonction.
-
-Pour les expressions régulières comme `%needle%`, le code est plus optimale et fonctionne aussi vite que le `position` fonction.
-Pour d'autres expressions régulières, le code est le même que pour la ‘match’ fonction.
-
-## notLike (botte de foin, motif), botte de foin pas comme opérateur de motif {#function-notlike}
-
-La même chose que ‘like’ mais négative.
-
-## ngramDistance(botte de foin, aiguille) {#ngramdistancehaystack-needle}
-
-Calcule la distance de 4 grammes entre `haystack` et `needle`: counts the symmetric difference between two multisets of 4-grams and normalizes it by the sum of their cardinalities. Returns float number from 0 to 1 – the closer to zero, the more strings are similar to each other. If the constant `needle` ou `haystack` est plus de 32Kb, jette une exception. Si une partie de la non-constante `haystack` ou `needle` les chaînes sont plus que 32Kb, la distance est toujours un.
-
-Pour une recherche insensible à la casse ou/et au format UTF-8, utilisez les fonctions `ngramDistanceCaseInsensitive, ngramDistanceUTF8, ngramDistanceCaseInsensitiveUTF8`.
-
-## ngramSearch(botte de foin, aiguille) {#ngramsearchhaystack-needle}
-
-Même que `ngramDistance` mais calcule la différence non symétrique entre `needle` et `haystack` – the number of n-grams from needle minus the common number of n-grams normalized by the number of `needle` n-grammes. Le plus proche d'un, le plus probable `needle` est dans le `haystack`. Peut être utile pour la recherche de chaîne floue.
-
-Pour une recherche insensible à la casse ou/et au format UTF-8, utilisez les fonctions `ngramSearchCaseInsensitive, ngramSearchUTF8, ngramSearchCaseInsensitiveUTF8`.
-
-!!! note "Note"
-    For UTF-8 case we use 3-gram distance. All these are not perfectly fair n-gram distances. We use 2-byte hashes to hash n-grams and then calculate the (non-)symmetric difference between these hash tables – collisions may occur. With UTF-8 case-insensitive format we do not use fair `tolower` function – we zero the 5-th bit (starting from zero) of each codepoint byte and first bit of zeroth byte if bytes more than one – this works for Latin and mostly for all Cyrillic letters.
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/functions/string_search_functions/) <!--hide-->
diff --git a/docs/fr/sql-reference/functions/type-conversion-functions.md b/docs/fr/sql-reference/functions/type-conversion-functions.md
deleted file mode 100644
index c17b24c69dc..00000000000
--- a/docs/fr/sql-reference/functions/type-conversion-functions.md
+++ /dev/null
@@ -1,534 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 38
-toc_title: La Conversion De Type
----
-
-# Fonctions De Conversion De Type {#type-conversion-functions}
-
-## Problèmes courants des Conversions numériques {#numeric-conversion-issues}
-
-Lorsque vous convertissez une valeur d'un type de données à un autre, vous devez vous rappeler que dans le cas courant, il s'agit d'une opération dangereuse qui peut entraîner une perte de données. Une perte de données peut se produire si vous essayez d'ajuster la valeur d'un type de données plus grand à un type de données plus petit, ou si vous convertissez des valeurs entre différents types de données.
-
-ClickHouse a le [même comportement que les programmes C++ ](https://en.cppreference.com/w/cpp/language/implicit_conversion).
-
-## toInt (8/16/32/64) {#toint8163264}
-
-Convertit une valeur d'entrée en [Int](../../sql-reference/data-types/int-uint.md) type de données. Cette fonction comprend:
-
--   `toInt8(expr)` — Results in the `Int8` type de données.
--   `toInt16(expr)` — Results in the `Int16` type de données.
--   `toInt32(expr)` — Results in the `Int32` type de données.
--   `toInt64(expr)` — Results in the `Int64` type de données.
-
-**Paramètre**
-
--   `expr` — [Expression](../syntax.md#syntax-expressions) renvoyer un nombre ou une chaîne avec la représentation décimale d'un nombre. Les représentations binaires, octales et hexadécimales des nombres ne sont pas prises en charge. Les zéros principaux sont dépouillés.
-
-**Valeur renvoyée**
-
-Valeur entière dans le `Int8`, `Int16`, `Int32`, ou `Int64` type de données.
-
-Fonctions d'utilisation [l'arrondi vers zéro](https://en.wikipedia.org/wiki/Rounding#Rounding_towards_zero), ce qui signifie qu'ils tronquent des chiffres fractionnaires de nombres.
-
-Le comportement des fonctions pour le [NaN et Inf](../../sql-reference/data-types/float.md#data_type-float-nan-inf) arguments est indéfini. Rappelez-vous sur [problèmes de conversion numérique](#numeric-conversion-issues), lorsque vous utilisez les fonctions.
-
-**Exemple**
-
-``` sql
-SELECT toInt64(nan), toInt32(32), toInt16('16'), toInt8(8.8)
-```
-
-``` text
-┌─────────toInt64(nan)─┬─toInt32(32)─┬─toInt16('16')─┬─toInt8(8.8)─┐
-│ -9223372036854775808 │          32 │            16 │           8 │
-└──────────────────────┴─────────────┴───────────────┴─────────────┘
-```
-
-## toInt (8/16/32/64)OrZero {#toint8163264orzero}
-
-Il prend un argument de type String et essaie de l'analyser en Int (8 \| 16 \| 32 \| 64). En cas d'échec, renvoie 0.
-
-**Exemple**
-
-``` sql
-select toInt64OrZero('123123'), toInt8OrZero('123qwe123')
-```
-
-``` text
-┌─toInt64OrZero('123123')─┬─toInt8OrZero('123qwe123')─┐
-│                  123123 │                         0 │
-└─────────────────────────┴───────────────────────────┘
-```
-
-## toInt (8/16/32/64)OrNull {#toint8163264ornull}
-
-Il prend un argument de type String et essaie de l'analyser en Int (8 \| 16 \| 32 \| 64). En cas d'échec, renvoie NULL.
-
-**Exemple**
-
-``` sql
-select toInt64OrNull('123123'), toInt8OrNull('123qwe123')
-```
-
-``` text
-┌─toInt64OrNull('123123')─┬─toInt8OrNull('123qwe123')─┐
-│                  123123 │                      ᴺᵁᴸᴸ │
-└─────────────────────────┴───────────────────────────┘
-```
-
-## toUInt (8/16/32/64) {#touint8163264}
-
-Convertit une valeur d'entrée en [UInt](../../sql-reference/data-types/int-uint.md) type de données. Cette fonction comprend:
-
--   `toUInt8(expr)` — Results in the `UInt8` type de données.
--   `toUInt16(expr)` — Results in the `UInt16` type de données.
--   `toUInt32(expr)` — Results in the `UInt32` type de données.
--   `toUInt64(expr)` — Results in the `UInt64` type de données.
-
-**Paramètre**
-
--   `expr` — [Expression](../syntax.md#syntax-expressions) renvoyer un nombre ou une chaîne avec la représentation décimale d'un nombre. Les représentations binaires, octales et hexadécimales des nombres ne sont pas prises en charge. Les zéros principaux sont dépouillés.
-
-**Valeur renvoyée**
-
-Valeur entière dans le `UInt8`, `UInt16`, `UInt32`, ou `UInt64` type de données.
-
-Fonctions d'utilisation [l'arrondi vers zéro](https://en.wikipedia.org/wiki/Rounding#Rounding_towards_zero), ce qui signifie qu'ils tronquent des chiffres fractionnaires de nombres.
-
-Le comportement des fonctions pour les agruments négatifs et pour le [NaN et Inf](../../sql-reference/data-types/float.md#data_type-float-nan-inf) arguments est indéfini. Si vous passez une chaîne avec un nombre négatif, par exemple `'-32'`, ClickHouse soulève une exception. Rappelez-vous sur [problèmes de conversion numérique](#numeric-conversion-issues), lorsque vous utilisez les fonctions.
-
-**Exemple**
-
-``` sql
-SELECT toUInt64(nan), toUInt32(-32), toUInt16('16'), toUInt8(8.8)
-```
-
-``` text
-┌───────toUInt64(nan)─┬─toUInt32(-32)─┬─toUInt16('16')─┬─toUInt8(8.8)─┐
-│ 9223372036854775808 │    4294967264 │             16 │            8 │
-└─────────────────────┴───────────────┴────────────────┴──────────────┘
-```
-
-## toUInt (8/16/32/64)OrZero {#touint8163264orzero}
-
-## toUInt (8/16/32/64)OrNull {#touint8163264ornull}
-
-## toFloat (32/64) {#tofloat3264}
-
-## toFloat (32/64)OrZero {#tofloat3264orzero}
-
-## toFloat (32/64) OrNull {#tofloat3264ornull}
-
-## jour {#todate}
-
-## toDateOrZero {#todateorzero}
-
-## toDateOrNull {#todateornull}
-
-## toDateTime {#todatetime}
-
-## toDateTimeOrZero {#todatetimeorzero}
-
-## toDateTimeOrNull {#todatetimeornull}
-
-## toDecimal (32/64/128) {#todecimal3264128}
-
-Convertir `value` à l' [Décimal](../../sql-reference/data-types/decimal.md) type de données avec précision de `S`. Le `value` peut être un nombre ou une chaîne. Le `S` (l'échelle) paramètre spécifie le nombre de décimales.
-
--   `toDecimal32(value, S)`
--   `toDecimal64(value, S)`
--   `toDecimal128(value, S)`
-
-## toDecimal (32/64/128) OrNull {#todecimal3264128ornull}
-
-Convertit une chaîne d'entrée en [Nullable (Décimal (P, S))](../../sql-reference/data-types/decimal.md) valeur de type de données. Cette famille de fonctions comprennent:
-
--   `toDecimal32OrNull(expr, S)` — Results in `Nullable(Decimal32(S))` type de données.
--   `toDecimal64OrNull(expr, S)` — Results in `Nullable(Decimal64(S))` type de données.
--   `toDecimal128OrNull(expr, S)` — Results in `Nullable(Decimal128(S))` type de données.
-
-Ces fonctions devraient être utilisées à la place de `toDecimal*()` fonctions, si vous préférez obtenir un `NULL` la valeur au lieu d'une exception dans le cas d'une valeur d'entrée erreur d'analyse.
-
-**Paramètre**
-
--   `expr` — [Expression](../syntax.md#syntax-expressions), retourne une valeur dans l' [Chaîne](../../sql-reference/data-types/string.md) type de données. ClickHouse attend la représentation textuelle du nombre décimal. Exemple, `'1.111'`.
--   `S` — Scale, the number of decimal places in the resulting value.
-
-**Valeur renvoyée**
-
-Une valeur dans l' `Nullable(Decimal(P,S))` type de données. La valeur contient:
-
--   Numéro `S` décimales, si ClickHouse interprète la chaîne d'entrée comme un nombre.
--   `NULL` si ClickHouse ne peut pas interpréter la chaîne d'entrée comme un nombre ou si le nombre d'entrée contient plus de `S` décimale.
-
-**Exemple**
-
-``` sql
-SELECT toDecimal32OrNull(toString(-1.111), 5) AS val, toTypeName(val)
-```
-
-``` text
-┌──────val─┬─toTypeName(toDecimal32OrNull(toString(-1.111), 5))─┐
-│ -1.11100 │ Nullable(Decimal(9, 5))                            │
-└──────────┴────────────────────────────────────────────────────┘
-```
-
-``` sql
-SELECT toDecimal32OrNull(toString(-1.111), 2) AS val, toTypeName(val)
-```
-
-``` text
-┌──val─┬─toTypeName(toDecimal32OrNull(toString(-1.111), 2))─┐
-│ ᴺᵁᴸᴸ │ Nullable(Decimal(9, 2))                            │
-└──────┴────────────────────────────────────────────────────┘
-```
-
-## toDecimal (32/64/128)OrZero {#todecimal3264128orzero}
-
-Convertit une valeur d'entrée en [Decimal(P,S)](../../sql-reference/data-types/decimal.md) type de données. Cette famille de fonctions comprennent:
-
--   `toDecimal32OrZero( expr, S)` — Results in `Decimal32(S)` type de données.
--   `toDecimal64OrZero( expr, S)` — Results in `Decimal64(S)` type de données.
--   `toDecimal128OrZero( expr, S)` — Results in `Decimal128(S)` type de données.
-
-Ces fonctions devraient être utilisées à la place de `toDecimal*()` fonctions, si vous préférez obtenir un `0` la valeur au lieu d'une exception dans le cas d'une valeur d'entrée erreur d'analyse.
-
-**Paramètre**
-
--   `expr` — [Expression](../syntax.md#syntax-expressions), retourne une valeur dans l' [Chaîne](../../sql-reference/data-types/string.md) type de données. ClickHouse attend la représentation textuelle du nombre décimal. Exemple, `'1.111'`.
--   `S` — Scale, the number of decimal places in the resulting value.
-
-**Valeur renvoyée**
-
-Une valeur dans l' `Nullable(Decimal(P,S))` type de données. La valeur contient:
-
--   Numéro `S` décimales, si ClickHouse interprète la chaîne d'entrée comme un nombre.
--   0 avec `S` décimales, si ClickHouse ne peut pas interpréter la chaîne d'entrée comme un nombre ou si le nombre d'entrée contient plus de `S` décimale.
-
-**Exemple**
-
-``` sql
-SELECT toDecimal32OrZero(toString(-1.111), 5) AS val, toTypeName(val)
-```
-
-``` text
-┌──────val─┬─toTypeName(toDecimal32OrZero(toString(-1.111), 5))─┐
-│ -1.11100 │ Decimal(9, 5)                                      │
-└──────────┴────────────────────────────────────────────────────┘
-```
-
-``` sql
-SELECT toDecimal32OrZero(toString(-1.111), 2) AS val, toTypeName(val)
-```
-
-``` text
-┌──val─┬─toTypeName(toDecimal32OrZero(toString(-1.111), 2))─┐
-│ 0.00 │ Decimal(9, 2)                                      │
-└──────┴────────────────────────────────────────────────────┘
-```
-
-## toString {#tostring}
-
-Fonctions de conversion entre des nombres, des chaînes (mais pas des chaînes fixes), des dates et des dates avec des heures.
-Toutes ces fonctions acceptent un argument.
-
-Lors de la conversion vers ou à partir d'une chaîne, la valeur est formatée ou analysée en utilisant les mêmes règles que pour le format TabSeparated (et presque tous les autres formats de texte). Si la chaîne ne peut pas être analysée, une exception est levée et la demande est annulée.
-
-Lors de la conversion de dates en nombres ou vice versa, la date correspond au nombre de jours depuis le début de L'époque Unix.
-Lors de la conversion de dates avec des heures en nombres ou vice versa, la date avec l'heure correspond au nombre de secondes depuis le début de L'époque Unix.
-
-Les formats date et date-avec-heure pour les fonctions toDate/toDateTime sont définis comme suit:
-
-``` text
-YYYY-MM-DD
-YYYY-MM-DD hh:mm:ss
-```
-
-À titre d'exception, si vous convertissez des types numériques UInt32, Int32, UInt64 ou Int64 à Date, et si le nombre est supérieur ou égal à 65536, le nombre est interprété comme un horodatage Unix (et non comme le nombre de jours) et est arrondi à la date. Cela permet de prendre en charge l'occurrence commune de l'écriture ‘toDate(unix_timestamp)’, qui autrement serait une erreur et nécessiterait d'écrire le plus lourd ‘toDate(toDateTime(unix_timestamp))’.
-
-La Conversion entre une date et une date avec l'heure est effectuée de manière naturelle: en ajoutant une heure nulle ou en supprimant l'heure.
-
-La Conversion entre types numériques utilise les mêmes règles que les affectations entre différents types numériques en C++.
-
-De plus, la fonction ToString de L'argument DateTime peut prendre un deuxième argument de chaîne contenant le nom du fuseau horaire. Exemple: `Asia/Yekaterinburg` Dans ce cas, l'heure est formatée en fonction du fuseau horaire spécifié.
-
-``` sql
-SELECT
-    now() AS now_local,
-    toString(now(), 'Asia/Yekaterinburg') AS now_yekat
-```
-
-``` text
-┌───────────now_local─┬─now_yekat───────────┐
-│ 2016-06-15 00:11:21 │ 2016-06-15 02:11:21 │
-└─────────────────────┴─────────────────────┘
-```
-
-Voir aussi l' `toUnixTimestamp` fonction.
-
-## toFixedString (s, N) {#tofixedstrings-n}
-
-Convertit un argument de type String en un type FixedString (N) (une chaîne de longueur fixe N). N doit être une constante.
-Si la chaîne a moins d'octets que N, elle est complétée avec des octets null à droite. Si la chaîne a plus d'octets que N, une exception est levée.
-
-## toStringCutToZero(s) {#tostringcuttozeros}
-
-Accepte un argument String ou FixedString. Renvoie la chaîne avec le contenu tronqué au premier octet zéro trouvé.
-
-Exemple:
-
-``` sql
-SELECT toFixedString('foo', 8) AS s, toStringCutToZero(s) AS s_cut
-```
-
-``` text
-┌─s─────────────┬─s_cut─┐
-│ foo\0\0\0\0\0 │ foo   │
-└───────────────┴───────┘
-```
-
-``` sql
-SELECT toFixedString('foo\0bar', 8) AS s, toStringCutToZero(s) AS s_cut
-```
-
-``` text
-┌─s──────────┬─s_cut─┐
-│ foo\0bar\0 │ foo   │
-└────────────┴───────┘
-```
-
-## reinterpretAsUInt (8/16/32/64) {#reinterpretasuint8163264}
-
-## reinterpretAsInt (8/16/32/64) {#reinterpretasint8163264}
-
-## reinterpretAsFloat (32/64) {#reinterpretasfloat3264}
-
-## réinterprétasdate {#reinterpretasdate}
-
-## reinterpretAsDateTime {#reinterpretasdatetime}
-
-Ces fonctions acceptent une chaîne et interprètent les octets placés au début de la chaîne comme un nombre dans l'ordre de l'hôte (little endian). Si la chaîne n'est pas assez longue, les fonctions fonctionnent comme si la chaîne était remplie avec le nombre nécessaire d'octets nuls. Si la chaîne est plus longue que nécessaire, les octets supplémentaires sont ignorés. Une date est interprétée comme le nombre de jours depuis le début de l'Époque Unix, et une date avec le temps, est interprété comme le nombre de secondes écoulées depuis le début de l'Époque Unix.
-
-## reinterpretAsString {#type_conversion_functions-reinterpretAsString}
-
-Cette fonction accepte un nombre ou une date ou une date avec l'heure, et renvoie une chaîne contenant des octets représentant la valeur correspondante dans l'ordre de l'hôte (little endian). Les octets nuls sont supprimés de la fin. Par exemple, une valeur de type uint32 de 255 est une chaîne longue d'un octet.
-
-## reinterpretAsFixedString {#reinterpretasfixedstring}
-
-Cette fonction accepte un nombre ou une date ou une date avec l'heure, et renvoie une chaîne fixe contenant des octets représentant la valeur correspondante dans l'ordre de l'hôte (little endian). Les octets nuls sont supprimés de la fin. Par exemple, une valeur de type uint32 de 255 est une chaîne fixe longue d'un octet.
-
-## CAST (x, T) {#type_conversion_function-cast}
-
-Convertir ‘x’ à l' ‘t’ type de données. La syntaxe CAST (X comme t) est également prise en charge.
-
-Exemple:
-
-``` sql
-SELECT
-    '2016-06-15 23:00:00' AS timestamp,
-    CAST(timestamp AS DateTime) AS datetime,
-    CAST(timestamp AS Date) AS date,
-    CAST(timestamp, 'String') AS string,
-    CAST(timestamp, 'FixedString(22)') AS fixed_string
-```
-
-``` text
-┌─timestamp───────────┬────────────datetime─┬───────date─┬─string──────────────┬─fixed_string──────────────┐
-│ 2016-06-15 23:00:00 │ 2016-06-15 23:00:00 │ 2016-06-15 │ 2016-06-15 23:00:00 │ 2016-06-15 23:00:00\0\0\0 │
-└─────────────────────┴─────────────────────┴────────────┴─────────────────────┴───────────────────────────┘
-```
-
-La Conversion en FixedString (N) ne fonctionne que pour les arguments de type String ou FixedString (N).
-
-Type conversion en [Nullable](../../sql-reference/data-types/nullable.md) et le dos est pris en charge. Exemple:
-
-``` sql
-SELECT toTypeName(x) FROM t_null
-```
-
-``` text
-┌─toTypeName(x)─┐
-│ Int8          │
-│ Int8          │
-└───────────────┘
-```
-
-``` sql
-SELECT toTypeName(CAST(x, 'Nullable(UInt16)')) FROM t_null
-```
-
-``` text
-┌─toTypeName(CAST(x, 'Nullable(UInt16)'))─┐
-│ Nullable(UInt16)                        │
-│ Nullable(UInt16)                        │
-└─────────────────────────────────────────┘
-```
-
-## toInterval (année / trimestre / Mois / Semaine / Jour / Heure / Minute / Seconde) {#function-tointerval}
-
-Convertit un argument de type Number en [Intervalle](../../sql-reference/data-types/special-data-types/interval.md) type de données.
-
-**Syntaxe**
-
-``` sql
-toIntervalSecond(number)
-toIntervalMinute(number)
-toIntervalHour(number)
-toIntervalDay(number)
-toIntervalWeek(number)
-toIntervalMonth(number)
-toIntervalQuarter(number)
-toIntervalYear(number)
-```
-
-**Paramètre**
-
--   `number` — Duration of interval. Positive integer number.
-
-**Valeurs renvoyées**
-
--   La valeur de `Interval` type de données.
-
-**Exemple**
-
-``` sql
-WITH
-    toDate('2019-01-01') AS date,
-    INTERVAL 1 WEEK AS interval_week,
-    toIntervalWeek(1) AS interval_to_week
-SELECT
-    date + interval_week,
-    date + interval_to_week
-```
-
-``` text
-┌─plus(date, interval_week)─┬─plus(date, interval_to_week)─┐
-│                2019-01-08 │                   2019-01-08 │
-└───────────────────────────┴──────────────────────────────┘
-```
-
-## parseDateTimeBestEffort {#parsedatetimebesteffort}
-
-Convertit une date et une heure dans le [Chaîne](../../sql-reference/data-types/string.md) la représentation de [DateTime](../../sql-reference/data-types/datetime.md#data_type-datetime) type de données.
-
-La fonction d'analyse [ISO 8601](https://en.wikipedia.org/wiki/ISO_8601), [RFC 1123 - 5.2.14 RFC-822 date et heure Spécification](https://tools.ietf.org/html/rfc1123#page-55), ClickHouse et d'autres formats de date et d'heure.
-
-**Syntaxe**
-
-``` sql
-parseDateTimeBestEffort(time_string [, time_zone]);
-```
-
-**Paramètre**
-
--   `time_string` — String containing a date and time to convert. [Chaîne](../../sql-reference/data-types/string.md).
--   `time_zone` — Time zone. The function parses `time_string` selon le fuseau horaire. [Chaîne](../../sql-reference/data-types/string.md).
-
-**Formats non standard pris en charge**
-
--   Une chaîne contenant 9..10 chiffres [le timestamp unix](https://en.wikipedia.org/wiki/Unix_time).
--   Une chaîne avec une date et une heure composant: `YYYYMMDDhhmmss`, `DD/MM/YYYY hh:mm:ss`, `DD-MM-YY hh:mm`, `YYYY-MM-DD hh:mm:ss`, etc.
--   Une chaîne avec une date, mais pas de composant de temps: `YYYY`, `YYYYMM`, `YYYY*MM`, `DD/MM/YYYY`, `DD-MM-YY` etc.
--   Une chaîne avec un jour et une heure: `DD`, `DD hh`, `DD hh:mm`. Dans ce cas `YYYY-MM` sont substitués comme suit `2000-01`.
--   Une chaîne qui inclut la date et l'heure ainsi que des informations de décalage de fuseau horaire: `YYYY-MM-DD hh:mm:ss ±h:mm`, etc. Exemple, `2020-12-12 17:36:00 -5:00`.
-
-Pour tous les formats avec séparateur, la fonction analyse les noms de mois exprimés par leur nom complet ou par les trois premières lettres d'un nom de mois. Exemple: `24/DEC/18`, `24-Dec-18`, `01-September-2018`.
-
-**Valeur renvoyée**
-
--   `time_string` converti à l' `DateTime` type de données.
-
-**Exemple**
-
-Requête:
-
-``` sql
-SELECT parseDateTimeBestEffort('12/12/2020 12:12:57')
-AS parseDateTimeBestEffort;
-```
-
-Résultat:
-
-``` text
-┌─parseDateTimeBestEffort─┐
-│     2020-12-12 12:12:57 │
-└─────────────────────────┘
-```
-
-Requête:
-
-``` sql
-SELECT parseDateTimeBestEffort('Sat, 18 Aug 2018 07:22:16 GMT', 'Europe/Moscow')
-AS parseDateTimeBestEffort
-```
-
-Résultat:
-
-``` text
-┌─parseDateTimeBestEffort─┐
-│     2018-08-18 10:22:16 │
-└─────────────────────────┘
-```
-
-Requête:
-
-``` sql
-SELECT parseDateTimeBestEffort('1284101485')
-AS parseDateTimeBestEffort
-```
-
-Résultat:
-
-``` text
-┌─parseDateTimeBestEffort─┐
-│     2015-07-07 12:04:41 │
-└─────────────────────────┘
-```
-
-Requête:
-
-``` sql
-SELECT parseDateTimeBestEffort('2018-12-12 10:12:12')
-AS parseDateTimeBestEffort
-```
-
-Résultat:
-
-``` text
-┌─parseDateTimeBestEffort─┐
-│     2018-12-12 10:12:12 │
-└─────────────────────────┘
-```
-
-Requête:
-
-``` sql
-SELECT parseDateTimeBestEffort('10 20:19')
-```
-
-Résultat:
-
-``` text
-┌─parseDateTimeBestEffort('10 20:19')─┐
-│                 2000-01-10 20:19:00 │
-└─────────────────────────────────────┘
-```
-
-**Voir Aussi**
-
--   \[Annonce ISO 8601 par @xkcd\](https://xkcd.com/1179/)
--   [RFC 1123](https://tools.ietf.org/html/rfc1123)
--   [jour](#todate)
--   [toDateTime](#todatetime)
-
-## parseDateTimeBestEffortOrNull {#parsedatetimebesteffortornull}
-
-De même que pour [parseDateTimeBestEffort](#parsedatetimebesteffort) sauf qu'il renvoie null lorsqu'il rencontre un format de date qui ne peut pas être traité.
-
-## parseDateTimeBestEffortOrZero {#parsedatetimebesteffortorzero}
-
-De même que pour [parseDateTimeBestEffort](#parsedatetimebesteffort) sauf qu'il renvoie une date zéro ou une date zéro lorsqu'il rencontre un format de date qui ne peut pas être traité.
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/functions/type_conversion_functions/) <!--hide-->
diff --git a/docs/fr/sql-reference/functions/url-functions.md b/docs/fr/sql-reference/functions/url-functions.md
deleted file mode 100644
index 2bb2203a10b..00000000000
--- a/docs/fr/sql-reference/functions/url-functions.md
+++ /dev/null
@@ -1,209 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 54
-toc_title: Travailler avec des URL
----
-
-# Fonctions pour travailler avec des URL {#functions-for-working-with-urls}
-
-Toutes ces fonctions ne suivent pas la RFC. Ils sont simplifiés au maximum pour améliorer les performances.
-
-## Fonctions qui extraient des parties d'une URL {#functions-that-extract-parts-of-a-url}
-
-Si la partie pertinente n'est pas présente dans une URL, une chaîne vide est renvoyée.
-
-### protocole {#protocol}
-
-Extrait le protocole d'une URL.
-
-Examples of typical returned values: http, https, ftp, mailto, tel, magnet…
-
-### domaine {#domain}
-
-Extrait le nom d'hôte d'une URL.
-
-``` sql
-domain(url)
-```
-
-**Paramètre**
-
--   `url` — URL. Type: [Chaîne](../../sql-reference/data-types/string.md).
-
-L'URL peut être spécifiée avec ou sans schéma. Exemple:
-
-``` text
-svn+ssh://some.svn-hosting.com:80/repo/trunk
-some.svn-hosting.com:80/repo/trunk
-https://yandex.com/time/
-```
-
-Pour ces exemples, le `domain` la fonction renvoie les résultats suivants:
-
-``` text
-some.svn-hosting.com
-some.svn-hosting.com
-yandex.com
-```
-
-**Valeurs renvoyées**
-
--   Nom d'hôte. Si ClickHouse peut analyser la chaîne d'entrée en tant QU'URL.
--   Chaîne vide. Si ClickHouse ne peut pas analyser la chaîne d'entrée en tant QU'URL.
-
-Type: `String`.
-
-**Exemple**
-
-``` sql
-SELECT domain('svn+ssh://some.svn-hosting.com:80/repo/trunk')
-```
-
-``` text
-┌─domain('svn+ssh://some.svn-hosting.com:80/repo/trunk')─┐
-│ some.svn-hosting.com                                   │
-└────────────────────────────────────────────────────────┘
-```
-
-### domainWithoutWWW {#domainwithoutwww}
-
-Renvoie le domaine et ne supprime pas plus d'un ‘www.’ dès le début de celui-ci, si présent.
-
-### topLevelDomain {#topleveldomain}
-
-Extrait le domaine de premier niveau d'une URL.
-
-``` sql
-topLevelDomain(url)
-```
-
-**Paramètre**
-
--   `url` — URL. Type: [Chaîne](../../sql-reference/data-types/string.md).
-
-L'URL peut être spécifiée avec ou sans schéma. Exemple:
-
-``` text
-svn+ssh://some.svn-hosting.com:80/repo/trunk
-some.svn-hosting.com:80/repo/trunk
-https://yandex.com/time/
-```
-
-**Valeurs renvoyées**
-
--   Nom de domaine. Si ClickHouse peut analyser la chaîne d'entrée en tant QU'URL.
--   Chaîne vide. Si ClickHouse ne peut pas analyser la chaîne d'entrée en tant QU'URL.
-
-Type: `String`.
-
-**Exemple**
-
-``` sql
-SELECT topLevelDomain('svn+ssh://www.some.svn-hosting.com:80/repo/trunk')
-```
-
-``` text
-┌─topLevelDomain('svn+ssh://www.some.svn-hosting.com:80/repo/trunk')─┐
-│ com                                                                │
-└────────────────────────────────────────────────────────────────────┘
-```
-
-### firstSignificantSubdomain {#firstsignificantsubdomain}
-
-Renvoie la “first significant subdomain”. C'est un concept non standard spécifique à Yandex.Metrica. Le premier sous-domaine significatif est un domaine de deuxième niveau s'il est ‘com’, ‘net’, ‘org’, ou ‘co’. Sinon, il est un domaine de troisième niveau. Exemple, `firstSignificantSubdomain (‘https://news.yandex.ru/’) = ‘yandex’, firstSignificantSubdomain (‘https://news.yandex.com.tr/’) = ‘yandex’`. La liste des “insignificant” les domaines de deuxième niveau et d'autres détails de mise en œuvre peuvent changer à l'avenir.
-
-### cutToFirstSignificantSubdomain {#cuttofirstsignificantsubdomain}
-
-Renvoie la partie du domaine qui inclut les sous-domaines de premier niveau “first significant subdomain” (voir l'explication ci-dessus).
-
-Exemple, `cutToFirstSignificantSubdomain('https://news.yandex.com.tr/') = 'yandex.com.tr'`.
-
-### chemin {#path}
-
-Retourne le chemin d'accès. Exemple: `/top/news.html` Le chemin n'inclut pas la chaîne de requête.
-
-### pathFull {#pathfull}
-
-La même chose que ci-dessus, mais y compris la chaîne de requête et le fragment. Exemple: / top / nouvelles.le html?page = 2 # commentaires
-
-### queryString {#querystring}
-
-Retourne la chaîne de requête. Exemple: page = 1 & lr=213. query-string n'inclut pas le point d'interrogation initial, ainsi que # et tout ce qui suit #.
-
-### fragment {#fragment}
-
-Renvoie l'identificateur de fragment. fragment n'inclut pas le symbole de hachage initial.
-
-### queryStringAndFragment {#querystringandfragment}
-
-Renvoie la chaîne de requête et l'Identificateur de fragment. Exemple: page = 1 # 29390.
-
-### extractURLParameter (URL, nom) {#extracturlparameterurl-name}
-
-Renvoie la valeur de la ‘name’ paramètre dans l'URL, le cas échéant. Sinon, une chaîne vide. S'il y a beaucoup de paramètres avec ce nom, il renvoie la première occurrence. Cette fonction fonctionne en supposant que le nom du paramètre est codé dans L'URL exactement de la même manière que dans l'argument passé.
-
-### extractURLParameters (URL) {#extracturlparametersurl}
-
-Renvoie un tableau de chaînes name = value correspondant aux paramètres D'URL. Les valeurs ne sont en aucun cas décodées.
-
-### extractURLParameterNames (URL) {#extracturlparameternamesurl}
-
-Retourne un tableau de chaînes de noms correspondant aux noms des paramètres d'URL. Les valeurs ne sont en aucun cas décodées.
-
-### URLHierarchy (URL) {#urlhierarchyurl}
-
-Retourne un tableau contenant L'URL, tronquée à la fin par les symboles /,? dans le chemin et la chaîne de requête. Les caractères séparateurs consécutifs sont comptés comme un. La coupe est faite dans la position après tous les caractères de séparation consécutifs.
-
-### URLPathHierarchy (URL) {#urlpathhierarchyurl}
-
-La même chose que ci-dessus, mais sans le protocole et l'hôte dans le résultat. Le / les élément (racine) n'est pas inclus. Exemple: la fonction est utilisée pour implémenter l'arborescence des rapports de L'URL dans Yandex. Métrique.
-
-``` text
-URLPathHierarchy('https://example.com/browse/CONV-6788') =
-[
-    '/browse/',
-    '/browse/CONV-6788'
-]
-```
-
-### decodeURLComponent (URL) {#decodeurlcomponenturl}
-
-Renvoie L'URL décodée.
-Exemple:
-
-``` sql
-SELECT decodeURLComponent('http://127.0.0.1:8123/?query=SELECT%201%3B') AS DecodedURL;
-```
-
-``` text
-┌─DecodedURL─────────────────────────────┐
-│ http://127.0.0.1:8123/?query=SELECT 1; │
-└────────────────────────────────────────┘
-```
-
-## Fonctions qui suppriment une partie D'une URL {#functions-that-remove-part-of-a-url}
-
-Si L'URL n'a rien de similaire, L'URL reste inchangée.
-
-### cutWWW {#cutwww}
-
-Supprime pas plus d'une ‘www.’ depuis le début du domaine de L'URL, s'il est présent.
-
-### cutQueryString {#cutquerystring}
-
-Supprime la chaîne de requête. Le point d'interrogation est également supprimé.
-
-### cutFragment {#cutfragment}
-
-Supprime l'identificateur de fragment. Le signe est également supprimé.
-
-### couperystringandfragment {#cutquerystringandfragment}
-
-Supprime la chaîne de requête et l'Identificateur de fragment. Le point d'interrogation et le signe numérique sont également supprimés.
-
-### cutURLParameter (URL, nom) {#cuturlparameterurl-name}
-
-Supprime le ‘name’ Paramètre URL, si présent. Cette fonction fonctionne en supposant que le nom du paramètre est codé dans L'URL exactement de la même manière que dans l'argument passé.
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/functions/url_functions/) <!--hide-->
diff --git a/docs/fr/sql-reference/functions/uuid-functions.md b/docs/fr/sql-reference/functions/uuid-functions.md
deleted file mode 100644
index 9f9eb67d3e9..00000000000
--- a/docs/fr/sql-reference/functions/uuid-functions.md
+++ /dev/null
@@ -1,122 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 53
-toc_title: Travailler avec UUID
----
-
-# Fonctions pour travailler avec UUID {#functions-for-working-with-uuid}
-
-Les fonctions pour travailler avec UUID sont listées ci-dessous.
-
-## generateUUIDv4 {#uuid-function-generate}
-
-Génère le [UUID](../../sql-reference/data-types/uuid.md) de [la version 4](https://tools.ietf.org/html/rfc4122#section-4.4).
-
-``` sql
-generateUUIDv4()
-```
-
-**Valeur renvoyée**
-
-La valeur de type UUID.
-
-**Exemple d'utilisation**
-
-Cet exemple montre la création d'une table avec la colonne de type UUID et l'insertion d'une valeur dans la table.
-
-``` sql
-CREATE TABLE t_uuid (x UUID) ENGINE=TinyLog
-
-INSERT INTO t_uuid SELECT generateUUIDv4()
-
-SELECT * FROM t_uuid
-```
-
-``` text
-┌────────────────────────────────────x─┐
-│ f4bf890f-f9dc-4332-ad5c-0c18e73f28e9 │
-└──────────────────────────────────────┘
-```
-
-## toUUID (x) {#touuid-x}
-
-Convertit la valeur de type de chaîne en type UUID.
-
-``` sql
-toUUID(String)
-```
-
-**Valeur renvoyée**
-
-La valeur de type UUID.
-
-**Exemple d'utilisation**
-
-``` sql
-SELECT toUUID('61f0c404-5cb3-11e7-907b-a6006ad3dba0') AS uuid
-```
-
-``` text
-┌─────────────────────────────────uuid─┐
-│ 61f0c404-5cb3-11e7-907b-a6006ad3dba0 │
-└──────────────────────────────────────┘
-```
-
-## UUIDStringToNum {#uuidstringtonum}
-
-Accepte une chaîne contenant 36 caractères dans le format `xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx`, et le renvoie comme un ensemble d'octets dans un [FixedString (16)](../../sql-reference/data-types/fixedstring.md).
-
-``` sql
-UUIDStringToNum(String)
-```
-
-**Valeur renvoyée**
-
-FixedString (16)
-
-**Exemples d'utilisation**
-
-``` sql
-SELECT
-    '612f3c40-5d3b-217e-707b-6a546a3d7b29' AS uuid,
-    UUIDStringToNum(uuid) AS bytes
-```
-
-``` text
-┌─uuid─────────────────────────────────┬─bytes────────────┐
-│ 612f3c40-5d3b-217e-707b-6a546a3d7b29 │ a/<@];!~p{jTj={) │
-└──────────────────────────────────────┴──────────────────┘
-```
-
-## UUIDNumToString {#uuidnumtostring}
-
-Accepte un [FixedString (16)](../../sql-reference/data-types/fixedstring.md) valeur, et renvoie une chaîne contenant 36 caractères au format texte.
-
-``` sql
-UUIDNumToString(FixedString(16))
-```
-
-**Valeur renvoyée**
-
-Chaîne.
-
-**Exemple d'utilisation**
-
-``` sql
-SELECT
-    'a/<@];!~p{jTj={)' AS bytes,
-    UUIDNumToString(toFixedString(bytes, 16)) AS uuid
-```
-
-``` text
-┌─bytes────────────┬─uuid─────────────────────────────────┐
-│ a/<@];!~p{jTj={) │ 612f3c40-5d3b-217e-707b-6a546a3d7b29 │
-└──────────────────┴──────────────────────────────────────┘
-```
-
-## Voir Aussi {#see-also}
-
--   [dictGetUUID](ext-dict-functions.md#ext_dict_functions-other)
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/functions/uuid_function/) <!--hide-->
diff --git a/docs/fr/sql-reference/functions/ym-dict-functions.md b/docs/fr/sql-reference/functions/ym-dict-functions.md
deleted file mode 100644
index f1e4461e24a..00000000000
--- a/docs/fr/sql-reference/functions/ym-dict-functions.md
+++ /dev/null
@@ -1,155 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 59
-toc_title: Travailler avec Yandex.Dictionnaires Metrica
----
-
-# Fonctions pour travailler avec Yandex.Dictionnaires Metrica {#functions-for-working-with-yandex-metrica-dictionaries}
-
-Pour que les fonctions ci-dessous fonctionnent, la configuration du serveur doit spécifier les chemins et les adresses pour obtenir tous les Yandex.Dictionnaires Metrica. Les dictionnaires sont chargés au premier appel de l'une de ces fonctions. Si les listes de référence ne peuvent pas être chargées, une exception est levée.
-
-Pour plus d'informations sur la création de listes de références, consultez la section “Dictionaries”.
-
-## Plusieurs Geobases {#multiple-geobases}
-
-ClickHouse soutient le travail avec plusieurs géobases alternatives (hiérarchies régionales) simultanément, afin de soutenir diverses perspectives sur les pays auxquels appartiennent certaines régions.
-
-Le ‘clickhouse-server’ config spécifie le fichier avec l'échelon régional::`<path_to_regions_hierarchy_file>/opt/geo/regions_hierarchy.txt</path_to_regions_hierarchy_file>`
-
-Outre ce fichier, il recherche également les fichiers à proximité qui ont le symbole _ et tout suffixe ajouté au nom (avant l'extension de fichier).
-Par exemple, il trouvera également le fichier `/opt/geo/regions_hierarchy_ua.txt` si présente.
-
-`ua` est appelée la clé du dictionnaire. Pour un dictionnaire sans suffixe, la clé est une chaîne vide.
-
-Tous les dictionnaires sont rechargés dans l'exécution (une fois toutes les secondes, comme défini dans le paramètre de configuration builtin_dictionaries_reload_interval, ou une fois par heure par défaut). Cependant, la liste des dictionnaires disponibles est définie une fois, lorsque le serveur démarre.
-
-All functions for working with regions have an optional argument at the end – the dictionary key. It is referred to as the geobase.
-Exemple:
-
-``` sql
-regionToCountry(RegionID) – Uses the default dictionary: /opt/geo/regions_hierarchy.txt
-regionToCountry(RegionID, '') – Uses the default dictionary: /opt/geo/regions_hierarchy.txt
-regionToCountry(RegionID, 'ua') – Uses the dictionary for the 'ua' key: /opt/geo/regions_hierarchy_ua.txt
-```
-
-### regionToCity (id \[, geobase\]) {#regiontocityid-geobase}
-
-Accepts a UInt32 number – the region ID from the Yandex geobase. If this region is a city or part of a city, it returns the region ID for the appropriate city. Otherwise, returns 0.
-
-### regionToArea (id \[, geobase\]) {#regiontoareaid-geobase}
-
-Convertit une région en une zone (tapez 5 dans la géobase). Dans tous les autres cas, cette fonction est la même que ‘regionToCity’.
-
-``` sql
-SELECT DISTINCT regionToName(regionToArea(toUInt32(number), 'ua'))
-FROM system.numbers
-LIMIT 15
-```
-
-``` text
-┌─regionToName(regionToArea(toUInt32(number), \'ua\'))─┐
-│                                                      │
-│ Moscow and Moscow region                             │
-│ St. Petersburg and Leningrad region                  │
-│ Belgorod region                                      │
-│ Ivanovsk region                                      │
-│ Kaluga region                                        │
-│ Kostroma region                                      │
-│ Kursk region                                         │
-│ Lipetsk region                                       │
-│ Orlov region                                         │
-│ Ryazan region                                        │
-│ Smolensk region                                      │
-│ Tambov region                                        │
-│ Tver region                                          │
-│ Tula region                                          │
-└──────────────────────────────────────────────────────┘
-```
-
-### regionToDistrict(id \[, geobase\]) {#regiontodistrictid-geobase}
-
-Convertit une région en district fédéral (type 4 dans la géobase). Dans tous les autres cas, cette fonction est la même que ‘regionToCity’.
-
-``` sql
-SELECT DISTINCT regionToName(regionToDistrict(toUInt32(number), 'ua'))
-FROM system.numbers
-LIMIT 15
-```
-
-``` text
-┌─regionToName(regionToDistrict(toUInt32(number), \'ua\'))─┐
-│                                                          │
-│ Central federal district                                 │
-│ Northwest federal district                               │
-│ South federal district                                   │
-│ North Caucases federal district                          │
-│ Privolga federal district                                │
-│ Ural federal district                                    │
-│ Siberian federal district                                │
-│ Far East federal district                                │
-│ Scotland                                                 │
-│ Faroe Islands                                            │
-│ Flemish region                                           │
-│ Brussels capital region                                  │
-│ Wallonia                                                 │
-│ Federation of Bosnia and Herzegovina                     │
-└──────────────────────────────────────────────────────────┘
-```
-
-### regionToCountry (id \[, geobase\]) {#regiontocountryid-geobase}
-
-Convertit une région en un pays. Dans tous les autres cas, cette fonction est la même que ‘regionToCity’.
-Exemple: `regionToCountry(toUInt32(213)) = 225` convertit Moscou (213) en Russie (225).
-
-### regionToContinent(id \[, géobase\]) {#regiontocontinentid-geobase}
-
-Convertit une région en continent. Dans tous les autres cas, cette fonction est la même que ‘regionToCity’.
-Exemple: `regionToContinent(toUInt32(213)) = 10001` convertit Moscou (213) en Eurasie (10001).
-
-### regionToTopContinent (#regiontotopcontinent) {#regiontotopcontinent-regiontotopcontinent}
-
-Trouve le continent le plus élevé dans la hiérarchie de la région.
-
-**Syntaxe**
-
-``` sql
-regionToTopContinent(id[, geobase]);
-```
-
-**Paramètre**
-
--   `id` — Region ID from the Yandex geobase. [UInt32](../../sql-reference/data-types/int-uint.md).
--   `geobase` — Dictionary key. See [Plusieurs Geobases](#multiple-geobases). [Chaîne](../../sql-reference/data-types/string.md). Facultatif.
-
-**Valeur renvoyée**
-
--   Identifiant du continent de haut niveau (ce dernier lorsque vous grimpez dans la hiérarchie des régions).
--   0, si il n'y a aucun.
-
-Type: `UInt32`.
-
-### regionToPopulation (id \[, geobase\]) {#regiontopopulationid-geobase}
-
-Obtient la population d'une région.
-La population peut être enregistrée dans des fichiers avec la géobase. Voir la section “External dictionaries”.
-Si la population n'est pas enregistrée pour la région, elle renvoie 0.
-Dans la géobase Yandex, la population peut être enregistrée pour les régions enfants, mais pas pour les régions parentes.
-
-### regionIn(lhs, rhs \[, géobase\]) {#regioninlhs-rhs-geobase}
-
-Vérifie si un ‘lhs’ région appartient à une ‘rhs’ région. Renvoie un nombre UInt8 égal à 1 s'il appartient, Ou 0 s'il n'appartient pas.
-The relationship is reflexive – any region also belongs to itself.
-
-### regionHierarchy (id \[, geobase\]) {#regionhierarchyid-geobase}
-
-Accepts a UInt32 number – the region ID from the Yandex geobase. Returns an array of region IDs consisting of the passed region and all parents along the chain.
-Exemple: `regionHierarchy(toUInt32(213)) = [213,1,3,225,10001,10000]`.
-
-### regionToName(id \[, lang\]) {#regiontonameid-lang}
-
-Accepts a UInt32 number – the region ID from the Yandex geobase. A string with the name of the language can be passed as a second argument. Supported languages are: ru, en, ua, uk, by, kz, tr. If the second argument is omitted, the language ‘ru’ is used. If the language is not supported, an exception is thrown. Returns a string – the name of the region in the corresponding language. If the region with the specified ID doesn't exist, an empty string is returned.
-
-`ua` et `uk` les deux signifient ukrainien.
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/functions/ym_dict_functions/) <!--hide-->
diff --git a/docs/fr/sql-reference/index.md b/docs/fr/sql-reference/index.md
deleted file mode 100644
index 04e44892c05..00000000000
--- a/docs/fr/sql-reference/index.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: "R\xE9f\xE9rence SQL"
-toc_hidden: true
-toc_priority: 28
-toc_title: "cach\xE9s"
----
-
-# Référence SQL {#sql-reference}
-
-ClickHouse prend en charge les types de requêtes suivants:
-
--   [SELECT](statements/select/index.md)
--   [INSERT INTO](statements/insert-into.md)
--   [CREATE](statements/create.md)
--   [ALTER](statements/alter.md#query_language_queries_alter)
--   [Autres types de requêtes](statements/misc.md)
-
-[Article Original](https://clickhouse.tech/docs/en/sql-reference/) <!--hide-->
diff --git a/docs/fr/sql-reference/operators/in.md b/docs/fr/sql-reference/operators/in.md
deleted file mode 100644
index d87fe41a04f..00000000000
--- a/docs/fr/sql-reference/operators/in.md
+++ /dev/null
@@ -1,204 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
----
-
-### Dans les opérateurs {#select-in-operators}
-
-Le `IN`, `NOT IN`, `GLOBAL IN`, et `GLOBAL NOT IN` les opérateurs sont traitées séparément, car leur fonctionnalité est assez riche.
-
-Le côté gauche de l'opérateur, soit une seule colonne ou un tuple.
-
-Exemple:
-
-``` sql
-SELECT UserID IN (123, 456) FROM ...
-SELECT (CounterID, UserID) IN ((34, 123), (101500, 456)) FROM ...
-```
-
-Si le côté gauche est une colonne unique qui est dans l'index, et le côté droit est un ensemble de constantes, le système utilise l'index pour le traitement de la requête.
-
-Don't list too many values explicitly (i.e. millions). If a data set is large, put it in a temporary table (for example, see the section “External data for query processing”), puis utiliser une sous-requête.
-
-Le côté droit de l'opérateur peut être un ensemble d'expressions constantes, un ensemble de tuples avec des expressions constantes (illustrées dans les exemples ci-dessus), ou le nom d'une table de base de données ou une sous-requête SELECT entre parenthèses.
-
-Si le côté droit de l'opérateur est le nom d'une table (par exemple, `UserID IN users`), ceci est équivalent à la sous-requête `UserID IN (SELECT * FROM users)`. Utilisez ceci lorsque vous travaillez avec des données externes envoyées avec la requête. Par exemple, la requête peut être envoyée avec un ensemble d'ID utilisateur chargés dans le ‘users’ table temporaire, qui doit être filtrée.
-
-Si le côté droit de l'opérateur est un nom de table qui a le moteur Set (un ensemble de données préparé qui est toujours en RAM), l'ensemble de données ne sera pas créé à nouveau pour chaque requête.
-
-La sous-requête peut spécifier plusieurs colonnes pour filtrer les tuples.
-Exemple:
-
-``` sql
-SELECT (CounterID, UserID) IN (SELECT CounterID, UserID FROM ...) FROM ...
-```
-
-Les colonnes à gauche et à droite de l'opérateur doit avoir le même type.
-
-L'opérateur IN et la sous-requête peuvent se produire dans n'importe quelle partie de la requête, y compris dans les fonctions d'agrégation et les fonctions lambda.
-Exemple:
-
-``` sql
-SELECT
-    EventDate,
-    avg(UserID IN
-    (
-        SELECT UserID
-        FROM test.hits
-        WHERE EventDate = toDate('2014-03-17')
-    )) AS ratio
-FROM test.hits
-GROUP BY EventDate
-ORDER BY EventDate ASC
-```
-
-``` text
-┌──EventDate─┬────ratio─┐
-│ 2014-03-17 │        1 │
-│ 2014-03-18 │ 0.807696 │
-│ 2014-03-19 │ 0.755406 │
-│ 2014-03-20 │ 0.723218 │
-│ 2014-03-21 │ 0.697021 │
-│ 2014-03-22 │ 0.647851 │
-│ 2014-03-23 │ 0.648416 │
-└────────────┴──────────┘
-```
-
-Pour chaque jour après le 17 mars, comptez le pourcentage de pages vues par les utilisateurs qui ont visité le site le 17 mars.
-Une sous-requête dans la clause est toujours exécuter une seule fois sur un seul serveur. Il n'y a pas de sous-requêtes dépendantes.
-
-## Le Traitement NULL {#null-processing-1}
-
-Pendant le traitement de la demande, l'opérateur n'assume que le résultat d'une opération avec [NULL](../syntax.md#null-literal) est toujours égale à `0` indépendamment de savoir si `NULL` est sur le côté droit ou gauche de l'opérateur. `NULL` les valeurs ne sont incluses dans aucun jeu de données, ne correspondent pas entre elles et ne peuvent pas être comparées.
-
-Voici un exemple avec le `t_null` table:
-
-``` text
-┌─x─┬────y─┐
-│ 1 │ ᴺᵁᴸᴸ │
-│ 2 │    3 │
-└───┴──────┘
-```
-
-L'exécution de la requête `SELECT x FROM t_null WHERE y IN (NULL,3)` vous donne le résultat suivant:
-
-``` text
-┌─x─┐
-│ 2 │
-└───┘
-```
-
-Vous pouvez voir que la ligne dans laquelle `y = NULL` est jeté hors de résultats de la requête. C'est parce que ClickHouse ne peut pas décider si `NULL` est inclus dans le `(NULL,3)` ensemble, les retours `0` comme le résultat de l'opération, et `SELECT` exclut cette ligne de la sortie finale.
-
-``` sql
-SELECT y IN (NULL, 3)
-FROM t_null
-```
-
-``` text
-┌─in(y, tuple(NULL, 3))─┐
-│                     0 │
-│                     1 │
-└───────────────────────┘
-```
-
-## Sous-Requêtes Distribuées {#select-distributed-subqueries}
-
-Il y a deux options pour IN-S avec des sous-requêtes (similaires aux jointures): normal `IN` / `JOIN` et `GLOBAL IN` / `GLOBAL JOIN`. Ils diffèrent dans la façon dont ils sont exécutés pour le traitement des requêtes distribuées.
-
-!!! attention "Attention"
-    Rappelez-vous que les algorithmes décrits ci-dessous peuvent travailler différemment en fonction de la [paramètre](../../operations/settings/settings.md) `distributed_product_mode` paramètre.
-
-Lors de l'utilisation de l'IN régulier, la requête est envoyée à des serveurs distants, et chacun d'eux exécute les sous-requêtes dans le `IN` ou `JOIN` clause.
-
-Lors de l'utilisation de `GLOBAL IN` / `GLOBAL JOINs`, d'abord toutes les sous-requêtes sont exécutées pour `GLOBAL IN` / `GLOBAL JOINs`, et les résultats sont recueillis dans des tableaux temporaires. Ensuite, les tables temporaires sont envoyés à chaque serveur distant, où les requêtes sont exécutées à l'aide temporaire de données.
-
-Pour une requête non distribuée, utilisez `IN` / `JOIN`.
-
-Soyez prudent lorsque vous utilisez des sous-requêtes dans le `IN` / `JOIN` clauses pour le traitement des requêtes distribuées.
-
-Regardons quelques exemples. Supposons que chaque serveur du cluster a un **local_table**. Chaque serveur dispose également d'une **table distributed_table** table avec le **Distribué** type, qui regarde tous les serveurs du cluster.
-
-Pour une requête à l' **table distributed_table**, la requête sera envoyée à tous les serveurs distants et exécutée sur eux en utilisant le **local_table**.
-
-Par exemple, la requête
-
-``` sql
-SELECT uniq(UserID) FROM distributed_table
-```
-
-sera envoyé à tous les serveurs distants
-
-``` sql
-SELECT uniq(UserID) FROM local_table
-```
-
-et l'exécuter sur chacun d'eux en parallèle, jusqu'à ce qu'il atteigne le stade où les résultats intermédiaires peuvent être combinés. Ensuite, les résultats intermédiaires seront retournés au demandeur de serveur et de fusion, et le résultat final sera envoyé au client.
-
-Examinons maintenant une requête avec IN:
-
-``` sql
-SELECT uniq(UserID) FROM distributed_table WHERE CounterID = 101500 AND UserID IN (SELECT UserID FROM local_table WHERE CounterID = 34)
-```
-
--   Calcul de l'intersection des audiences de deux sites.
-
-Cette requête sera envoyée à tous les serveurs distants
-
-``` sql
-SELECT uniq(UserID) FROM local_table WHERE CounterID = 101500 AND UserID IN (SELECT UserID FROM local_table WHERE CounterID = 34)
-```
-
-En d'autres termes, l'ensemble de données de la clause IN sera collecté sur chaque serveur indépendamment, uniquement à travers les données stockées localement sur chacun des serveurs.
-
-Cela fonctionnera correctement et de manière optimale si vous êtes prêt pour ce cas et que vous avez réparti les données entre les serveurs de cluster de telle sorte que les données d'un seul ID utilisateur résident entièrement sur un seul serveur. Dans ce cas, toutes les données nécessaires seront disponibles localement sur chaque serveur. Sinon, le résultat sera erroné. Nous nous référons à cette variation de la requête que “local IN”.
-
-Pour corriger le fonctionnement de la requête lorsque les données sont réparties aléatoirement sur les serveurs de cluster, vous pouvez spécifier **table distributed_table** à l'intérieur d'une sous-requête. La requête ressemblerait à ceci:
-
-``` sql
-SELECT uniq(UserID) FROM distributed_table WHERE CounterID = 101500 AND UserID IN (SELECT UserID FROM distributed_table WHERE CounterID = 34)
-```
-
-Cette requête sera envoyée à tous les serveurs distants
-
-``` sql
-SELECT uniq(UserID) FROM local_table WHERE CounterID = 101500 AND UserID IN (SELECT UserID FROM distributed_table WHERE CounterID = 34)
-```
-
-La sous-requête commencera à s'exécuter sur chaque serveur distant. Étant donné que la sous-requête utilise une table distribuée, la sous-requête qui se trouve sur chaque serveur distant sera renvoyée à chaque serveur distant comme
-
-``` sql
-SELECT UserID FROM local_table WHERE CounterID = 34
-```
-
-Par exemple, si vous avez un cluster de 100 SERVEURS, l'exécution de la requête entière nécessitera 10 000 requêtes élémentaires, ce qui est généralement considéré comme inacceptable.
-
-Dans de tels cas, vous devez toujours utiliser GLOBAL IN au lieu de IN. Voyons comment cela fonctionne pour la requête
-
-``` sql
-SELECT uniq(UserID) FROM distributed_table WHERE CounterID = 101500 AND UserID GLOBAL IN (SELECT UserID FROM distributed_table WHERE CounterID = 34)
-```
-
-Le serveur demandeur exécutera la sous requête
-
-``` sql
-SELECT UserID FROM distributed_table WHERE CounterID = 34
-```
-
-et le résultat sera mis dans une table temporaire en RAM. Ensuite, la demande sera envoyée à chaque serveur distant
-
-``` sql
-SELECT uniq(UserID) FROM local_table WHERE CounterID = 101500 AND UserID GLOBAL IN _data1
-```
-
-et la table temporaire `_data1` sera envoyé à chaque serveur distant avec la requête (le nom de la table temporaire est défini par l'implémentation).
-
-Ceci est plus optimal que d'utiliser la normale dans. Cependant, gardez les points suivants à l'esprit:
-
-1.  Lors de la création d'une table temporaire, les données ne sont pas uniques. Pour réduire le volume de données transmises sur le réseau, spécifiez DISTINCT dans la sous-requête. (Vous n'avez pas besoin de le faire pour un IN normal.)
-2.  La table temporaire sera envoyé à tous les serveurs distants. La Transmission ne tient pas compte de la topologie du réseau. Par exemple, si 10 serveurs distants résident dans un centre de données très distant par rapport au serveur demandeur, les données seront envoyées 10 fois sur le canal au centre de données distant. Essayez d'éviter les grands ensembles de données lorsque vous utilisez GLOBAL IN.
-3.  Lors de la transmission de données à des serveurs distants, les restrictions sur la bande passante réseau ne sont pas configurables. Vous pourriez surcharger le réseau.
-4.  Essayez de distribuer les données entre les serveurs afin que vous n'ayez pas besoin D'utiliser GLOBAL IN sur une base régulière.
-5.  Si vous devez utiliser GLOBAL in souvent, planifiez l'emplacement du cluster ClickHouse de sorte qu'un seul groupe de répliques ne réside pas dans plus d'un centre de données avec un réseau rapide entre eux, de sorte qu'une requête puisse être traitée entièrement dans un seul centre de données.
-
-Il est également judicieux de spécifier une table locale dans le `GLOBAL IN` clause, dans le cas où cette table locale est uniquement disponible sur le serveur demandeur et que vous souhaitez utiliser les données de celui-ci sur des serveurs distants.
diff --git a/docs/fr/sql-reference/operators/index.md b/docs/fr/sql-reference/operators/index.md
deleted file mode 100644
index 1635c7eece3..00000000000
--- a/docs/fr/sql-reference/operators/index.md
+++ /dev/null
@@ -1,277 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 37
-toc_title: "Op\xE9rateur"
----
-
-# Opérateur {#operators}
-
-ClickHouse transforme les opérateurs en leurs fonctions correspondantes à l'étape d'analyse des requêtes en fonction de leur priorité, de leur priorité et de leur associativité.
-
-## Des Opérateurs D'Accès {#access-operators}
-
-`a[N]` – Access to an element of an array. The `arrayElement(a, N)` fonction.
-
-`a.N` – Access to a tuple element. The `tupleElement(a, N)` fonction.
-
-## Opérateur De Négation Numérique {#numeric-negation-operator}
-
-`-a` – The `negate (a)` fonction.
-
-## Opérateurs de Multiplication et de Division {#multiplication-and-division-operators}
-
-`a * b` – The `multiply (a, b)` fonction.
-
-`a / b` – The `divide(a, b)` fonction.
-
-`a % b` – The `modulo(a, b)` fonction.
-
-## Opérateurs d'Addition et de soustraction {#addition-and-subtraction-operators}
-
-`a + b` – The `plus(a, b)` fonction.
-
-`a - b` – The `minus(a, b)` fonction.
-
-## Opérateurs De Comparaison {#comparison-operators}
-
-`a = b` – The `equals(a, b)` fonction.
-
-`a == b` – The `equals(a, b)` fonction.
-
-`a != b` – The `notEquals(a, b)` fonction.
-
-`a <> b` – The `notEquals(a, b)` fonction.
-
-`a <= b` – The `lessOrEquals(a, b)` fonction.
-
-`a >= b` – The `greaterOrEquals(a, b)` fonction.
-
-`a < b` – The `less(a, b)` fonction.
-
-`a > b` – The `greater(a, b)` fonction.
-
-`a LIKE s` – The `like(a, b)` fonction.
-
-`a NOT LIKE s` – The `notLike(a, b)` fonction.
-
-`a BETWEEN b AND c` – The same as `a >= b AND a <= c`.
-
-`a NOT BETWEEN b AND c` – The same as `a < b OR a > c`.
-
-## Opérateurs pour travailler avec des ensembles de données {#operators-for-working-with-data-sets}
-
-*Voir [Dans les opérateurs](in.md).*
-
-`a IN ...` – The `in(a, b)` fonction.
-
-`a NOT IN ...` – The `notIn(a, b)` fonction.
-
-`a GLOBAL IN ...` – The `globalIn(a, b)` fonction.
-
-`a GLOBAL NOT IN ...` – The `globalNotIn(a, b)` fonction.
-
-## Opérateurs pour travailler avec des Dates et des heures {#operators-datetime}
-
-### EXTRACT {#operator-extract}
-
-``` sql
-EXTRACT(part FROM date);
-```
-
-Extraire des parties d'une date donnée. Par exemple, vous pouvez récupérer un mois à partir d'une date donnée, ou d'une seconde à partir d'un moment.
-
-Le `part` paramètre spécifie la partie de la date à récupérer. Les valeurs suivantes sont disponibles:
-
--   `DAY` — The day of the month. Possible values: 1–31.
--   `MONTH` — The number of a month. Possible values: 1–12.
--   `YEAR` — The year.
--   `SECOND` — The second. Possible values: 0–59.
--   `MINUTE` — The minute. Possible values: 0–59.
--   `HOUR` — The hour. Possible values: 0–23.
-
-Le `part` le paramètre est insensible à la casse.
-
-Le `date` paramètre spécifie la date ou l'heure à traiter. Soit [Date](../../sql-reference/data-types/date.md) ou [DateTime](../../sql-reference/data-types/datetime.md) le type est pris en charge.
-
-Exemple:
-
-``` sql
-SELECT EXTRACT(DAY FROM toDate('2017-06-15'));
-SELECT EXTRACT(MONTH FROM toDate('2017-06-15'));
-SELECT EXTRACT(YEAR FROM toDate('2017-06-15'));
-```
-
-Dans l'exemple suivant, nous créons un tableau et de les insérer dans une valeur avec le `DateTime` type.
-
-``` sql
-CREATE TABLE test.Orders
-(
-    OrderId UInt64,
-    OrderName String,
-    OrderDate DateTime
-)
-ENGINE = Log;
-```
-
-``` sql
-INSERT INTO test.Orders VALUES (1, 'Jarlsberg Cheese', toDateTime('2008-10-11 13:23:44'));
-```
-
-``` sql
-SELECT
-    toYear(OrderDate) AS OrderYear,
-    toMonth(OrderDate) AS OrderMonth,
-    toDayOfMonth(OrderDate) AS OrderDay,
-    toHour(OrderDate) AS OrderHour,
-    toMinute(OrderDate) AS OrderMinute,
-    toSecond(OrderDate) AS OrderSecond
-FROM test.Orders;
-```
-
-``` text
-┌─OrderYear─┬─OrderMonth─┬─OrderDay─┬─OrderHour─┬─OrderMinute─┬─OrderSecond─┐
-│      2008 │         10 │       11 │        13 │          23 │          44 │
-└───────────┴────────────┴──────────┴───────────┴─────────────┴─────────────┘
-```
-
-Vous pouvez voir plus d'exemples de [test](https://github.com/ClickHouse/ClickHouse/blob/master/tests/queries/0_stateless/00619_extract.sql).
-
-### INTERVAL {#operator-interval}
-
-Crée un [Intervalle](../../sql-reference/data-types/special-data-types/interval.md)- valeur de type qui doit être utilisée dans les opérations arithmétiques avec [Date](../../sql-reference/data-types/date.md) et [DateTime](../../sql-reference/data-types/datetime.md)-type de valeurs.
-
-Types d'intervalles:
-- `SECOND`
-- `MINUTE`
-- `HOUR`
-- `DAY`
-- `WEEK`
-- `MONTH`
-- `QUARTER`
-- `YEAR`
-
-!!! warning "Avertissement"
-    Les intervalles avec différents types ne peuvent pas être combinés. Vous ne pouvez pas utiliser des expressions comme `INTERVAL 4 DAY 1 HOUR`. Spécifiez des intervalles en unités inférieures ou égales à la plus petite unité de l'intervalle, par exemple, `INTERVAL 25 HOUR`. Vous pouvez utiliser les opérations consécutives, comme dans l'exemple ci-dessous.
-
-Exemple:
-
-``` sql
-SELECT now() AS current_date_time, current_date_time + INTERVAL 4 DAY + INTERVAL 3 HOUR
-```
-
-``` text
-┌───current_date_time─┬─plus(plus(now(), toIntervalDay(4)), toIntervalHour(3))─┐
-│ 2019-10-23 11:16:28 │                                    2019-10-27 14:16:28 │
-└─────────────────────┴────────────────────────────────────────────────────────┘
-```
-
-**Voir Aussi**
-
--   [Intervalle](../../sql-reference/data-types/special-data-types/interval.md) type de données
--   [toInterval](../../sql-reference/functions/type-conversion-functions.md#function-tointerval) type fonctions de conversion
-
-## Opérateur De Négation Logique {#logical-negation-operator}
-
-`NOT a` – The `not(a)` fonction.
-
-## Logique ET de l'Opérateur {#logical-and-operator}
-
-`a AND b` – The`and(a, b)` fonction.
-
-## Logique ou opérateur {#logical-or-operator}
-
-`a OR b` – The `or(a, b)` fonction.
-
-## Opérateur Conditionnel {#conditional-operator}
-
-`a ? b : c` – The `if(a, b, c)` fonction.
-
-Note:
-
-L'opérateur conditionnel calcule les valeurs de b et c, puis vérifie si la condition a est remplie, puis renvoie la valeur correspondante. Si `b` ou `C` est un [arrayJoin()](../../sql-reference/functions/array-join.md#functions_arrayjoin) fonction, chaque ligne sera répliquée indépendamment de la “a” condition.
-
-## Expression Conditionnelle {#operator_case}
-
-``` sql
-CASE [x]
-    WHEN a THEN b
-    [WHEN ... THEN ...]
-    [ELSE c]
-END
-```
-
-Si `x` est spécifié, alors `transform(x, [a, ...], [b, ...], c)` function is used. Otherwise – `multiIf(a, b, ..., c)`.
-
-Si il n'y a pas de `ELSE c` dans l'expression, la valeur par défaut est `NULL`.
-
-Le `transform` la fonction ne fonctionne pas avec `NULL`.
-
-## Opérateur De Concaténation {#concatenation-operator}
-
-`s1 || s2` – The `concat(s1, s2) function.`
-
-## Opérateur De Création Lambda {#lambda-creation-operator}
-
-`x -> expr` – The `lambda(x, expr) function.`
-
-Les opérateurs suivants n'ont pas de priorité puisqu'ils sont des parenthèses:
-
-## Opérateur De Création De Tableau {#array-creation-operator}
-
-`[x1, ...]` – The `array(x1, ...) function.`
-
-## Opérateur De Création De Tuple {#tuple-creation-operator}
-
-`(x1, x2, ...)` – The `tuple(x2, x2, ...) function.`
-
-## Associativité {#associativity}
-
-Tous les opérateurs binaires ont associativité gauche. Exemple, `1 + 2 + 3` est transformé à `plus(plus(1, 2), 3)`.
-Parfois, cela ne fonctionne pas de la façon que vous attendez. Exemple, `SELECT 4 > 2 > 3` résultat sera 0.
-
-Pour l'efficacité, le `and` et `or` les fonctions acceptent n'importe quel nombre d'arguments. Les chaînes de `AND` et `OR` les opérateurs se sont transformés en un seul appel de ces fonctions.
-
-## La vérification de `NULL` {#checking-for-null}
-
-Clickhouse soutient le `IS NULL` et `IS NOT NULL` opérateur.
-
-### IS NULL {#operator-is-null}
-
--   Pour [Nullable](../../sql-reference/data-types/nullable.md) type de valeurs, l' `IS NULL` opérateur retourne:
-    -   `1` si la valeur est `NULL`.
-    -   `0` autrement.
--   Pour les autres valeurs, la `IS NULL` l'opérateur renvoie toujours `0`.
-
-<!-- -->
-
-``` sql
-SELECT x+100 FROM t_null WHERE y IS NULL
-```
-
-``` text
-┌─plus(x, 100)─┐
-│          101 │
-└──────────────┘
-```
-
-### IS NOT NULL {#is-not-null}
-
--   Pour [Nullable](../../sql-reference/data-types/nullable.md) type de valeurs, l' `IS NOT NULL` opérateur retourne:
-    -   `0` si la valeur est `NULL`.
-    -   `1` autrement.
--   Pour les autres valeurs, la `IS NOT NULL` l'opérateur renvoie toujours `1`.
-
-<!-- -->
-
-``` sql
-SELECT * FROM t_null WHERE y IS NOT NULL
-```
-
-``` text
-┌─x─┬─y─┐
-│ 2 │ 3 │
-└───┴───┘
-```
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/operators/) <!--hide-->
diff --git a/docs/fr/sql-reference/statements/alter.md b/docs/fr/sql-reference/statements/alter.md
deleted file mode 100644
index 64fe21046a3..00000000000
--- a/docs/fr/sql-reference/statements/alter.md
+++ /dev/null
@@ -1,602 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 36
-toc_title: ALTER
----
-
-## ALTER {#query_language_queries_alter}
-
-Le `ALTER` la requête est prise en charge uniquement pour `*MergeTree` des tables, ainsi que `Merge`et`Distributed`. La requête a plusieurs variantes.
-
-### Manipulations De Colonne {#column-manipulations}
-
-Modification de la structure de la table.
-
-``` sql
-ALTER TABLE [db].name [ON CLUSTER cluster] ADD|DROP|CLEAR|COMMENT|MODIFY COLUMN ...
-```
-
-Dans la requête, spécifiez une liste d'une ou plusieurs actions séparées par des virgules.
-Chaque action est une opération sur une colonne.
-
-Les actions suivantes sont prises en charge:
-
--   [ADD COLUMN](#alter_add-column) — Adds a new column to the table.
--   [DROP COLUMN](#alter_drop-column) — Deletes the column.
--   [CLEAR COLUMN](#alter_clear-column) — Resets column values.
--   [COMMENT COLUMN](#alter_comment-column) — Adds a text comment to the column.
--   [MODIFY COLUMN](#alter_modify-column) — Changes column's type, default expression and TTL.
-
-Ces actions sont décrites en détail ci-dessous.
-
-#### ADD COLUMN {#alter_add-column}
-
-``` sql
-ADD COLUMN [IF NOT EXISTS] name [type] [default_expr] [codec] [AFTER name_after]
-```
-
-Ajoute une nouvelle colonne à la table spécifiée `name`, `type`, [`codec`](create.md#codecs) et `default_expr` (voir la section [Expressions par défaut](create.md#create-default-values)).
-
-Si l' `IF NOT EXISTS` la clause est incluse, la requête ne retournera pas d'erreur si la colonne existe déjà. Si vous spécifiez `AFTER name_after` (le nom d'une autre colonne), la colonne est ajoutée après celle spécifiée dans la liste des colonnes de la table. Sinon, la colonne est ajoutée à la fin de la table. Notez qu'il n'existe aucun moyen d'ajouter une colonne au début d'un tableau. Pour une chaîne d'actions, `name_after` peut être le nom d'une colonne est ajoutée dans l'une des actions précédentes.
-
-L'ajout d'une colonne modifie simplement la structure de la table, sans effectuer d'actions avec des données. Les données n'apparaissent pas sur le disque après la `ALTER`. Si les données sont manquantes pour une colonne lors de la lecture de la table, elles sont remplies avec des valeurs par défaut (en exécutant l'expression par défaut s'il y en a une, ou en utilisant des zéros ou des chaînes vides). La colonne apparaît sur le disque après la fusion des parties de données (voir [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md)).
-
-Cette approche nous permet de compléter le `ALTER` requête instantanément, sans augmenter le volume de données anciennes.
-
-Exemple:
-
-``` sql
-ALTER TABLE visits ADD COLUMN browser String AFTER user_id
-```
-
-#### DROP COLUMN {#alter_drop-column}
-
-``` sql
-DROP COLUMN [IF EXISTS] name
-```
-
-Supprime la colonne avec le nom `name`. Si l' `IF EXISTS` la clause est spécifiée, la requête ne retournera pas d'erreur si la colonne n'existe pas.
-
-Supprime les données du système de fichiers. Comme cela supprime des fichiers entiers, la requête est terminée presque instantanément.
-
-Exemple:
-
-``` sql
-ALTER TABLE visits DROP COLUMN browser
-```
-
-#### CLEAR COLUMN {#alter_clear-column}
-
-``` sql
-CLEAR COLUMN [IF EXISTS] name IN PARTITION partition_name
-```
-
-Réinitialise toutes les données dans une colonne pour une partition spécifiée. En savoir plus sur la définition du nom de la partition dans la section [Comment spécifier l'expression de partition](#alter-how-to-specify-part-expr).
-
-Si l' `IF EXISTS` la clause est spécifiée, la requête ne retournera pas d'erreur si la colonne n'existe pas.
-
-Exemple:
-
-``` sql
-ALTER TABLE visits CLEAR COLUMN browser IN PARTITION tuple()
-```
-
-#### COMMENT COLUMN {#alter_comment-column}
-
-``` sql
-COMMENT COLUMN [IF EXISTS] name 'comment'
-```
-
-Ajoute un commentaire à la colonne. Si l' `IF EXISTS` la clause est spécifiée, la requête ne retournera pas d'erreur si la colonne n'existe pas.
-
-Chaque colonne peut avoir un commentaire. Si un commentaire existe déjà pour la colonne, un nouveau commentaire remplace le précédent commentaire.
-
-Les commentaires sont stockés dans le `comment_expression` colonne renvoyée par le [DESCRIBE TABLE](misc.md#misc-describe-table) requête.
-
-Exemple:
-
-``` sql
-ALTER TABLE visits COMMENT COLUMN browser 'The table shows the browser used for accessing the site.'
-```
-
-#### MODIFY COLUMN {#alter_modify-column}
-
-``` sql
-MODIFY COLUMN [IF EXISTS] name [type] [default_expr] [TTL]
-```
-
-Cette requête modifie le `name` les propriétés de la colonne:
-
--   Type
-
--   Expression par défaut
-
--   TTL
-
-        For examples of columns TTL modifying, see [Column TTL](../engines/table_engines/mergetree_family/mergetree.md#mergetree-column-ttl).
-
-Si l' `IF EXISTS` la clause est spécifiée, la requête ne retournera pas d'erreur si la colonne n'existe pas.
-
-Lors de la modification du type, les valeurs sont converties comme si [toType](../../sql-reference/functions/type-conversion-functions.md) les fonctions ont été appliquées. Si seule l'expression par défaut est modifiée, la requête ne fait rien de complexe et est terminée presque instantanément.
-
-Exemple:
-
-``` sql
-ALTER TABLE visits MODIFY COLUMN browser Array(String)
-```
-
-Changing the column type is the only complex action – it changes the contents of files with data. For large tables, this may take a long time.
-
-Il y a plusieurs étapes de traitement:
-
--   Préparation de (nouveaux) fichiers temporaires avec des données modifiées.
--   Renommer les anciens fichiers.
--   Renommer les (nouveaux) fichiers temporaires en anciens noms.
--   Suppression des anciens fichiers.
-
-Seule la première étape prend du temps. Si il y a un échec à ce stade, les données ne sont pas modifiées.
-En cas d'échec au cours d'une des étapes successives, les données peuvent être restaurées manuellement. L'exception est si les anciens fichiers ont été supprimés du système de fichiers mais que les données des nouveaux fichiers n'ont pas été écrites sur le disque et ont été perdues.
-
-Le `ALTER` la requête de modification des colonnes est répliquée. Les instructions sont enregistrées dans ZooKeeper, puis chaque réplique les applique. Tout `ALTER` les requêtes sont exécutées dans le même ordre. La requête attend que les actions appropriées soient terminées sur les autres répliques. Cependant, une requête pour modifier des colonnes dans une table répliquée peut être interrompue, et toutes les actions seront effectuées de manière asynchrone.
-
-#### Modifier les limites de la requête {#alter-query-limitations}
-
-Le `ALTER` query vous permet de créer et de supprimer des éléments distincts (colonnes) dans des structures de données imbriquées, mais pas des structures de données imbriquées entières. Pour ajouter une structure de données imbriquée, vous pouvez ajouter des colonnes avec un nom comme `name.nested_name` et le type `Array(T)`. Une structure de données imbriquée est équivalente à plusieurs colonnes de tableau avec un nom qui a le même préfixe avant le point.
-
-Il n'y a pas de support pour supprimer des colonnes dans la clé primaire ou la clé d'échantillonnage (colonnes qui sont utilisées dans le `ENGINE` expression). La modification du type des colonnes incluses dans la clé primaire n'est possible que si cette modification n'entraîne pas la modification des données (par exemple, vous êtes autorisé à ajouter des valeurs à une énumération ou à modifier un type de `DateTime` de `UInt32`).
-
-Si l' `ALTER` la requête n'est pas suffisante pour apporter les modifications de table dont vous avez besoin, vous pouvez créer une nouvelle table, y copier les données en utilisant le [INSERT SELECT](insert-into.md#insert_query_insert-select) requête, puis changer les tables en utilisant le [RENAME](misc.md#misc_operations-rename) requête et supprimer l'ancienne table. Vous pouvez utiliser l' [clickhouse-copieur](../../operations/utilities/clickhouse-copier.md) comme une alternative à la `INSERT SELECT` requête.
-
-Le `ALTER` query bloque toutes les lectures et écritures pour la table. En d'autres termes, si une longue `SELECT` est en cours d'exécution au moment de la `ALTER` requête, la `ALTER` la requête va attendre qu'elle se termine. Dans le même temps, toutes les nouvelles requêtes à la même table attendre que ce `ALTER` est en cours d'exécution.
-
-Pour les tables qui ne stockent pas les données elles-mêmes (telles que `Merge` et `Distributed`), `ALTER` change simplement la structure de la table, et ne change pas la structure des tables subordonnées. Par exemple, lors de L'exécution de ALTER pour un `Distributed` table, vous devrez également exécuter `ALTER` pour les tables sur tous les serveurs distants.
-
-### Manipulations avec des Expressions clés {#manipulations-with-key-expressions}
-
-La commande suivante est prise en charge:
-
-``` sql
-MODIFY ORDER BY new_expression
-```
-
-Cela ne fonctionne que pour les tables du [`MergeTree`](../../engines/table-engines/mergetree-family/mergetree.md) de la famille (y compris les
-[répliqué](../../engines/table-engines/mergetree-family/replication.md) table). La commande change l'
-[clé de tri](../../engines/table-engines/mergetree-family/mergetree.md) de la table
-de `new_expression` (une expression ou un tuple d'expressions). Clé primaire reste le même.
-
-La commande est légère en ce sens qu'elle ne modifie que les métadonnées. Pour conserver la propriété cette partie de données
-les lignes sont ordonnées par l'expression de clé de tri vous ne pouvez pas ajouter d'expressions contenant des colonnes existantes
-à la clé de tri (seules les colonnes ajoutées par `ADD COLUMN` commande dans le même `ALTER` requête).
-
-### Manipulations avec des Indices de saut de données {#manipulations-with-data-skipping-indices}
-
-Cela ne fonctionne que pour les tables du [`*MergeTree`](../../engines/table-engines/mergetree-family/mergetree.md) de la famille (y compris les
-[répliqué](../../engines/table-engines/mergetree-family/replication.md) table). Les opérations suivantes
-sont disponibles:
-
--   `ALTER TABLE [db].name ADD INDEX name expression TYPE type GRANULARITY value AFTER name [AFTER name2]` - Ajoute la description de l'index aux métadonnées des tables.
-
--   `ALTER TABLE [db].name DROP INDEX name` - Supprime la description de l'index des métadonnées des tables et supprime les fichiers d'index du disque.
-
-Ces commandes sont légères dans le sens où elles ne modifient que les métadonnées ou suppriment des fichiers.
-En outre, ils sont répliqués (synchronisation des métadonnées des indices via ZooKeeper).
-
-### Manipulations avec contraintes {#manipulations-with-constraints}
-
-En voir plus sur [contraintes](create.md#constraints)
-
-Les contraintes peuvent être ajoutées ou supprimées à l'aide de la syntaxe suivante:
-
-``` sql
-ALTER TABLE [db].name ADD CONSTRAINT constraint_name CHECK expression;
-ALTER TABLE [db].name DROP CONSTRAINT constraint_name;
-```
-
-Les requêtes ajouteront ou supprimeront des métadonnées sur les contraintes de la table afin qu'elles soient traitées immédiatement.
-
-Contrainte de vérifier *ne sera pas exécuté* sur les données existantes si elle a été ajoutée.
-
-Toutes les modifications sur les tables répliquées sont diffusées sur ZooKeeper et seront donc appliquées sur d'autres répliques.
-
-### Manipulations avec des Partitions et des pièces {#alter_manipulations-with-partitions}
-
-Les opérations suivantes avec [partition](../../engines/table-engines/mergetree-family/custom-partitioning-key.md) sont disponibles:
-
--   [DETACH PARTITION](#alter_detach-partition) – Moves a partition to the `detached` répertoire et de l'oublier.
--   [DROP PARTITION](#alter_drop-partition) – Deletes a partition.
--   [ATTACH PART\|PARTITION](#alter_attach-partition) – Adds a part or partition from the `detached` répertoire à la table.
--   [ATTACH PARTITION FROM](#alter_attach-partition-from) – Copies the data partition from one table to another and adds.
--   [REPLACE PARTITION](#alter_replace-partition) - Copie la partition de données d'une table à l'autre et la remplace.
--   [MOVE PARTITION TO TABLE](#alter_move_to_table-partition)(#alter_move_to_table-partition) - déplace la partition de données d'une table à l'autre.
--   [CLEAR COLUMN IN PARTITION](#alter_clear-column-partition) - Rétablit la valeur d'une colonne spécifiée dans une partition.
--   [CLEAR INDEX IN PARTITION](#alter_clear-index-partition) - Réinitialise l'index secondaire spécifié dans une partition.
--   [FREEZE PARTITION](#alter_freeze-partition) – Creates a backup of a partition.
--   [FETCH PARTITION](#alter_fetch-partition) – Downloads a partition from another server.
--   [MOVE PARTITION\|PART](#alter_move-partition) – Move partition/data part to another disk or volume.
-
-<!-- -->
-
-#### DETACH PARTITION {#alter_detach-partition}
-
-``` sql
-ALTER TABLE table_name DETACH PARTITION partition_expr
-```
-
-Déplace toutes les données de la partition spécifiée vers `detached` répertoire. Le serveur oublie la partition de données détachée comme si elle n'existait pas. Le serveur ne connaîtra pas ces données tant que vous n'aurez pas [ATTACH](#alter_attach-partition) requête.
-
-Exemple:
-
-``` sql
-ALTER TABLE visits DETACH PARTITION 201901
-```
-
-Lisez à propos de la définition de l'expression de partition dans une section [Comment spécifier l'expression de partition](#alter-how-to-specify-part-expr).
-
-Une fois la requête exécutée, vous pouvez faire ce que vous voulez avec les données du `detached` directory — delete it from the file system, or just leave it.
-
-This query is replicated – it moves the data to the `detached` répertoire sur toutes les répliques. Notez que vous ne pouvez exécuter cette requête que sur un réplica leader. Pour savoir si une réplique est un leader, effectuez le `SELECT` requête à l' [système.réplique](../../operations/system-tables.md#system_tables-replicas) table. Alternativement, il est plus facile de faire une `DETACH` requête sur toutes les répliques - toutes les répliques lancent une exception, à l'exception de la réplique leader.
-
-#### DROP PARTITION {#alter_drop-partition}
-
-``` sql
-ALTER TABLE table_name DROP PARTITION partition_expr
-```
-
-Supprime la partition spécifiée de la table. Cette requête marque la partition comme inactive et supprime complètement les données, environ en 10 minutes.
-
-Lisez à propos de la définition de l'expression de partition dans une section [Comment spécifier l'expression de partition](#alter-how-to-specify-part-expr).
-
-The query is replicated – it deletes data on all replicas.
-
-#### DROP DETACHED PARTITION\|PART {#alter_drop-detached}
-
-``` sql
-ALTER TABLE table_name DROP DETACHED PARTITION|PART partition_expr
-```
-
-Supprime la partie spécifiée ou toutes les parties de la partition spécifiée de `detached`.
-En savoir plus sur la définition de l'expression de partition dans une section [Comment spécifier l'expression de partition](#alter-how-to-specify-part-expr).
-
-#### ATTACH PARTITION\|PART {#alter_attach-partition}
-
-``` sql
-ALTER TABLE table_name ATTACH PARTITION|PART partition_expr
-```
-
-Ajoute des données à la table à partir du `detached` répertoire. Il est possible d'ajouter des données dans une partition entière ou pour une partie distincte. Exemple:
-
-``` sql
-ALTER TABLE visits ATTACH PARTITION 201901;
-ALTER TABLE visits ATTACH PART 201901_2_2_0;
-```
-
-En savoir plus sur la définition de l'expression de partition dans une section [Comment spécifier l'expression de partition](#alter-how-to-specify-part-expr).
-
-Cette requête est répliquée. L'initiateur de réplica vérifie s'il y a des données dans le `detached` répertoire. Si des données existent, la requête vérifie son intégrité. Si tout est correct, la requête ajoute les données à la table. Tous les autres réplicas téléchargent les données de l'initiateur de réplica.
-
-Ainsi, vous pouvez mettre des données à la `detached` répertoire sur une réplique, et utilisez le `ALTER ... ATTACH` requête pour l'ajouter à la table sur tous les réplicas.
-
-#### ATTACH PARTITION FROM {#alter_attach-partition-from}
-
-``` sql
-ALTER TABLE table2 ATTACH PARTITION partition_expr FROM table1
-```
-
-Cette requête copie la partition de données du `table1` de `table2` ajoute des données de gratuit dans la `table2`. Notez que les données ne seront pas supprimées de `table1`.
-
-Pour que la requête s'exécute correctement, les conditions suivantes doivent être remplies:
-
--   Les deux tables doivent avoir la même structure.
--   Les deux tables doivent avoir la même clé de partition.
-
-#### REPLACE PARTITION {#alter_replace-partition}
-
-``` sql
-ALTER TABLE table2 REPLACE PARTITION partition_expr FROM table1
-```
-
-Cette requête copie la partition de données du `table1` de `table2` et remplace la partition existante dans le `table2`. Notez que les données ne seront pas supprimées de `table1`.
-
-Pour que la requête s'exécute correctement, les conditions suivantes doivent être remplies:
-
--   Les deux tables doivent avoir la même structure.
--   Les deux tables doivent avoir la même clé de partition.
-
-#### MOVE PARTITION TO TABLE {#alter_move_to_table-partition}
-
-``` sql
-ALTER TABLE table_source MOVE PARTITION partition_expr TO TABLE table_dest
-```
-
-Cette requête déplace la partition de données du `table_source` de `table_dest` avec la suppression des données de `table_source`.
-
-Pour que la requête s'exécute correctement, les conditions suivantes doivent être remplies:
-
--   Les deux tables doivent avoir la même structure.
--   Les deux tables doivent avoir la même clé de partition.
--   Les deux tables doivent appartenir à la même famille de moteurs. (répliqué ou non répliqué)
--   Les deux tables doivent avoir la même stratégie de stockage.
-
-#### CLEAR COLUMN IN PARTITION {#alter_clear-column-partition}
-
-``` sql
-ALTER TABLE table_name CLEAR COLUMN column_name IN PARTITION partition_expr
-```
-
-Réinitialise toutes les valeurs de la colonne spécifiée dans une partition. Si l' `DEFAULT` la clause a été déterminée lors de la création d'une table, cette requête définit la valeur de la colonne à une valeur par défaut spécifiée.
-
-Exemple:
-
-``` sql
-ALTER TABLE visits CLEAR COLUMN hour in PARTITION 201902
-```
-
-#### FREEZE PARTITION {#alter_freeze-partition}
-
-``` sql
-ALTER TABLE table_name FREEZE [PARTITION partition_expr]
-```
-
-Cette requête crée une sauvegarde locale d'une partition spécifiée. Si l' `PARTITION` la clause est omise, la requête crée la sauvegarde de toutes les partitions à la fois.
-
-!!! note "Note"
-    L'ensemble du processus de sauvegarde est effectuée sans arrêter le serveur.
-
-Notez que pour les tables de style ancien, vous pouvez spécifier le préfixe du nom de la partition (par exemple, ‘2019’)- ensuite, la requête crée la sauvegarde pour toutes les partitions correspondantes. Lisez à propos de la définition de l'expression de partition dans une section [Comment spécifier l'expression de partition](#alter-how-to-specify-part-expr).
-
-Au moment de l'exécution, pour un instantané de données, la requête crée des liens rigides vers des données de table. Les liens sont placés dans le répertoire `/var/lib/clickhouse/shadow/N/...`, où:
-
--   `/var/lib/clickhouse/` est le répertoire de travail clickhouse spécifié dans la configuration.
--   `N` est le numéro incrémental de la sauvegarde.
-
-!!! note "Note"
-    Si vous utilisez [un ensemble de disques pour le stockage des données dans une table](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-multiple-volumes), le `shadow/N` le répertoire apparaît sur chaque disque, stockant les parties de données correspondant `PARTITION` expression.
-
-La même structure de répertoires est créée à l'intérieur de la sauvegarde qu'à l'intérieur `/var/lib/clickhouse/`. La requête effectue ‘chmod’ pour tous les fichiers, interdisant d'écrire en eux.
-
-Après avoir créé la sauvegarde, vous pouvez copier les données depuis `/var/lib/clickhouse/shadow/` sur le serveur distant, puis supprimez-le du serveur local. Notez que l' `ALTER t FREEZE PARTITION` la requête n'est pas répliqué. Il crée une sauvegarde locale uniquement sur le serveur local.
-
-La requête crée une sauvegarde presque instantanément (mais elle attend d'abord que les requêtes en cours à la table correspondante se terminent).
-
-`ALTER TABLE t FREEZE PARTITION` copie uniquement les données, pas les métadonnées de la table. Faire une sauvegarde des métadonnées de la table, copiez le fichier `/var/lib/clickhouse/metadata/database/table.sql`
-
-Pour restaurer des données à partir d'une sauvegarde, procédez comme suit:
-
-1.  Créer la table si elle n'existe pas. Pour afficher la requête, utilisez la .fichier sql (remplacer `ATTACH` avec `CREATE`).
-2.  Copier les données de la `data/database/table/` répertoire à l'intérieur de la sauvegarde `/var/lib/clickhouse/data/database/table/detached/` répertoire.
-3.  Exécuter `ALTER TABLE t ATTACH PARTITION` les requêtes pour ajouter les données à une table.
-
-La restauration à partir d'une sauvegarde ne nécessite pas l'arrêt du serveur.
-
-Pour plus d'informations sur les sauvegardes et la restauration [La Sauvegarde Des Données](../../operations/backup.md) section.
-
-#### CLEAR INDEX IN PARTITION {#alter_clear-index-partition}
-
-``` sql
-ALTER TABLE table_name CLEAR INDEX index_name IN PARTITION partition_expr
-```
-
-La requête fonctionne de manière similaire à `CLEAR COLUMN` mais il remet un index au lieu d'une colonne de données.
-
-#### FETCH PARTITION {#alter_fetch-partition}
-
-``` sql
-ALTER TABLE table_name FETCH PARTITION partition_expr FROM 'path-in-zookeeper'
-```
-
-Télécharge une partition depuis un autre serveur. Cette requête ne fonctionne que pour les tables répliquées.
-
-La requête effectue les opérations suivantes:
-
-1.  Télécharge la partition à partir du fragment spécifié. Dans ‘path-in-zookeeper’ vous devez spécifier un chemin vers le fragment dans ZooKeeper.
-2.  Ensuite, la requête met les données téléchargées dans le `detached` répertoire de la `table_name` table. L'utilisation de la [ATTACH PARTITION\|PART](#alter_attach-partition) requête pour ajouter les données à la table.
-
-Exemple:
-
-``` sql
-ALTER TABLE users FETCH PARTITION 201902 FROM '/clickhouse/tables/01-01/visits';
-ALTER TABLE users ATTACH PARTITION 201902;
-```
-
-Notez que:
-
--   Le `ALTER ... FETCH PARTITION` la requête n'est pas répliqué. Il place la partition à la `detached` répertoire sur le serveur local.
--   Le `ALTER TABLE ... ATTACH` la requête est répliquée. Il ajoute les données à toutes les répliques. Les données sont ajoutées à l'une des répliques `detached` répertoire, et aux autres-des répliques voisines.
-
-Avant le téléchargement, le système vérifie si la partition existe et si la structure de la table correspond. La réplique la plus appropriée est sélectionnée automatiquement parmi les répliques saines.
-
-Bien que la requête soit appelée `ALTER TABLE`, il ne modifie pas la structure de la table et ne modifie pas immédiatement les données disponibles dans la table.
-
-#### MOVE PARTITION\|PART {#alter_move-partition}
-
-Déplace des partitions ou des parties de données vers un autre volume ou disque pour `MergeTree`-tables de moteur. Voir [Utilisation de plusieurs périphériques de bloc pour le stockage de données](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-multiple-volumes).
-
-``` sql
-ALTER TABLE table_name MOVE PARTITION|PART partition_expr TO DISK|VOLUME 'disk_name'
-```
-
-Le `ALTER TABLE t MOVE` requête:
-
--   Non répliqué, car différentes répliques peuvent avoir des stratégies de stockage différentes.
--   Renvoie une erreur si le disque ou le volume n'est pas configuré. Query renvoie également une erreur si les conditions de déplacement des données, spécifiées dans la stratégie de stockage, ne peuvent pas être appliquées.
--   Peut renvoyer une erreur dans le cas, lorsque les données à déplacer sont déjà déplacées par un processus en arrière-plan, simultané `ALTER TABLE t MOVE` requête ou à la suite de la fusion de données d'arrière-plan. Un utilisateur ne doit effectuer aucune action supplémentaire dans ce cas.
-
-Exemple:
-
-``` sql
-ALTER TABLE hits MOVE PART '20190301_14343_16206_438' TO VOLUME 'slow'
-ALTER TABLE hits MOVE PARTITION '2019-09-01' TO DISK 'fast_ssd'
-```
-
-#### Comment définir L'Expression de la Partition {#alter-how-to-specify-part-expr}
-
-Vous pouvez spécifier l'expression de partition dans `ALTER ... PARTITION` requêtes de différentes manières:
-
--   Comme une valeur de l' `partition` la colonne de la `system.parts` table. Exemple, `ALTER TABLE visits DETACH PARTITION 201901`.
--   Comme expression de la colonne de la table. Les constantes et les expressions constantes sont prises en charge. Exemple, `ALTER TABLE visits DETACH PARTITION toYYYYMM(toDate('2019-01-25'))`.
--   À l'aide de l'ID de partition. Partition ID est un identifiant de chaîne de la partition (lisible par l'homme, si possible) qui est utilisé comme noms de partitions dans le système de fichiers et dans ZooKeeper. L'ID de partition doit être spécifié dans `PARTITION ID` clause, entre guillemets simples. Exemple, `ALTER TABLE visits DETACH PARTITION ID '201901'`.
--   Dans le [ALTER ATTACH PART](#alter_attach-partition) et [DROP DETACHED PART](#alter_drop-detached) requête, pour spécifier le nom d'une partie, utilisez le littéral de chaîne avec une valeur de `name` la colonne de la [système.detached_parts](../../operations/system-tables.md#system_tables-detached_parts) table. Exemple, `ALTER TABLE visits ATTACH PART '201901_1_1_0'`.
-
-L'utilisation de guillemets lors de la spécification de la partition dépend du type d'expression de partition. Par exemple, pour la `String` type, vous devez spécifier son nom entre guillemets (`'`). Pour l' `Date` et `Int*` types aucune citation n'est nécessaire.
-
-Pour les tables de style ancien, vous pouvez spécifier la partition sous forme de nombre `201901` ou une chaîne de caractères `'201901'`. La syntaxe des tables new-style est plus stricte avec les types (similaire à l'analyseur pour le format D'entrée des valeurs).
-
-Toutes les règles ci-dessus sont aussi valables pour la [OPTIMIZE](misc.md#misc_operations-optimize) requête. Si vous devez spécifier la seule partition lors de l'optimisation d'une table non partitionnée, définissez l'expression `PARTITION tuple()`. Exemple:
-
-``` sql
-OPTIMIZE TABLE table_not_partitioned PARTITION tuple() FINAL;
-```
-
-Les exemples de `ALTER ... PARTITION` les requêtes sont démontrées dans les tests [`00502_custom_partitioning_local`](https://github.com/ClickHouse/ClickHouse/blob/master/tests/queries/0_stateless/00502_custom_partitioning_local.sql) et [`00502_custom_partitioning_replicated_zookeeper`](https://github.com/ClickHouse/ClickHouse/blob/master/tests/queries/0_stateless/00502_custom_partitioning_replicated_zookeeper.sql).
-
-### Manipulations avec Table TTL {#manipulations-with-table-ttl}
-
-Vous pouvez modifier [tableau TTL](../../engines/table-engines/mergetree-family/mergetree.md#mergetree-table-ttl) avec une demande du formulaire suivant:
-
-``` sql
-ALTER TABLE table-name MODIFY TTL ttl-expression
-```
-
-### Synchronicité des requêtes ALTER {#synchronicity-of-alter-queries}
-
-Pour les tables non réplicables, tous `ALTER` les requêtes sont exécutées simultanément. Pour les tables réplicables, la requête ajoute simplement des instructions pour les actions appropriées à `ZooKeeper` et les actions elles-mêmes sont effectuées dès que possible. Cependant, la requête peut attendre que ces actions soient terminées sur tous les réplicas.
-
-Pour `ALTER ... ATTACH|DETACH|DROP` les requêtes, vous pouvez utiliser le `replication_alter_partitions_sync` configuration pour configurer l'attente.
-Valeurs possibles: `0` – do not wait; `1` – only wait for own execution (default); `2` – wait for all.
-
-### Mutation {#alter-mutations}
-
-Les Mutations sont une variante ALTER query qui permet de modifier ou de supprimer des lignes dans une table. Contrairement à la norme `UPDATE` et `DELETE` les requêtes qui sont destinées aux changements de données de point, les mutations sont destinées aux opérations lourdes qui modifient beaucoup de lignes dans une table. Pris en charge pour le `MergeTree` famille de moteurs de table, y compris les moteurs avec support de réplication.
-
-Les tables existantes sont prêtes pour les mutations telles quelles (aucune conversion nécessaire), mais après l'application de la première mutation à une table, son format de métadonnées devient incompatible avec les versions précédentes du serveur et il devient impossible de revenir à une version précédente.
-
-Commandes actuellement disponibles:
-
-``` sql
-ALTER TABLE [db.]table DELETE WHERE filter_expr
-```
-
-Le `filter_expr` doit être de type `UInt8`. La requête supprime les lignes de la table pour lesquelles cette expression prend une valeur différente de zéro.
-
-``` sql
-ALTER TABLE [db.]table UPDATE column1 = expr1 [, ...] WHERE filter_expr
-```
-
-Le `filter_expr` doit être de type `UInt8`. Cette requête met à jour les valeurs des colonnes spécifiées en les valeurs des expressions correspondantes dans les lignes pour lesquelles `filter_expr` prend une valeur non nulle. Les valeurs sont converties en type de colonne à l'aide `CAST` opérateur. La mise à jour des colonnes utilisées dans le calcul de la clé primaire ou de la clé de partition n'est pas prise en charge.
-
-``` sql
-ALTER TABLE [db.]table MATERIALIZE INDEX name IN PARTITION partition_name
-```
-
-La requête reconstruit l'index secondaire `name` dans la partition `partition_name`.
-
-Une requête peut contenir plusieurs commandes séparées par des virgules.
-
-Pour les tables \* MergeTree, les mutations s'exécutent en réécrivant des parties de données entières. Il n'y a pas d'atomicité-les pièces sont substituées aux pièces mutées dès qu'elles sont prêtes et un `SELECT` la requête qui a commencé à s'exécuter pendant une mutation verra les données des parties qui ont déjà été mutées ainsi que les données des parties qui n'ont pas encore été mutées.
-
-Les Mutations sont totalement ordonnées par leur ordre de création et sont appliquées à chaque partie dans cet ordre. Les Mutations sont également partiellement ordonnées avec des insertions - les données insérées dans la table avant la soumission de la mutation seront mutées et les données insérées après ne seront pas mutées. Notez que les mutations ne bloquent en aucune façon les INSERTs.
-
-Une requête de mutation retourne immédiatement après l'ajout de l'entrée de mutation (dans le cas de tables répliquées à ZooKeeper, pour les tables non compliquées - au système de fichiers). La mutation elle-même s'exécute de manière asynchrone en utilisant les paramètres du profil système. Pour suivre l'avancement des mutations vous pouvez utiliser la [`system.mutations`](../../operations/system-tables.md#system_tables-mutations) table. Une mutation qui a été soumise avec succès continuera à s'exécuter même si les serveurs ClickHouse sont redémarrés. Il n'y a aucun moyen de faire reculer la mutation une fois qu'elle est soumise, mais si la mutation est bloquée pour une raison quelconque, elle peut être annulée avec le [`KILL MUTATION`](misc.md#kill-mutation) requête.
-
-Les entrées pour les mutations finies ne sont pas supprimées immédiatement (le nombre d'entrées conservées est déterminé par `finished_mutations_to_keep` le moteur de stockage de paramètre). Les anciennes entrées de mutation sont supprimées.
-
-## ALTER USER {#alter-user-statement}
-
-Changements clickhouse comptes d'utilisateurs.
-
-### Syntaxe {#alter-user-syntax}
-
-``` sql
-ALTER USER [IF EXISTS] name [ON CLUSTER cluster_name]
-    [RENAME TO new_name]
-    [IDENTIFIED [WITH {PLAINTEXT_PASSWORD|SHA256_PASSWORD|DOUBLE_SHA1_PASSWORD}] BY {'password'|'hash'}]
-    [[ADD|DROP] HOST {LOCAL | NAME 'name' | REGEXP 'name_regexp' | IP 'address' | LIKE 'pattern'} [,...] | ANY | NONE]
-    [DEFAULT ROLE role [,...] | ALL | ALL EXCEPT role [,...] ]
-    [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | PROFILE 'profile_name'] [,...]
-```
-
-### Description {#alter-user-dscr}
-
-Utiliser `ALTER USER` vous devez avoir le [ALTER USER](grant.md#grant-access-management) privilège.
-
-### Exemple {#alter-user-examples}
-
-Définir les rôles accordés par défaut:
-
-``` sql
-ALTER USER user DEFAULT ROLE role1, role2
-```
-
-Si les rôles ne sont pas précédemment accordés à un utilisateur, ClickHouse lève une exception.
-
-Définissez tous les rôles accordés à défaut:
-
-``` sql
-ALTER USER user DEFAULT ROLE ALL
-```
-
-Si un rôle seront accordés à un utilisateur dans l'avenir, il deviendra automatiquement par défaut.
-
-Définissez tous les rôles accordés sur default excepting `role1` et `role2`:
-
-``` sql
-ALTER USER user DEFAULT ROLE ALL EXCEPT role1, role2
-```
-
-## ALTER ROLE {#alter-role-statement}
-
-Les changements de rôles.
-
-### Syntaxe {#alter-role-syntax}
-
-``` sql
-ALTER ROLE [IF EXISTS] name [ON CLUSTER cluster_name]
-    [RENAME TO new_name]
-    [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | PROFILE 'profile_name'] [,...]
-```
-
-## ALTER ROW POLICY {#alter-row-policy-statement}
-
-Modifie la stratégie de ligne.
-
-### Syntaxe {#alter-row-policy-syntax}
-
-``` sql
-ALTER [ROW] POLICY [IF EXISTS] name [ON CLUSTER cluster_name] ON [database.]table
-    [RENAME TO new_name]
-    [AS {PERMISSIVE | RESTRICTIVE}]
-    [FOR SELECT]
-    [USING {condition | NONE}][,...]
-    [TO {role [,...] | ALL | ALL EXCEPT role [,...]}]
-```
-
-## ALTER QUOTA {#alter-quota-statement}
-
-Les changements de quotas.
-
-### Syntaxe {#alter-quota-syntax}
-
-``` sql
-ALTER QUOTA [IF EXISTS] name [ON CLUSTER cluster_name]
-    [RENAME TO new_name]
-    [KEYED BY {'none' | 'user name' | 'ip address' | 'client key' | 'client key or user name' | 'client key or ip address'}]
-    [FOR [RANDOMIZED] INTERVAL number {SECOND | MINUTE | HOUR | DAY | WEEK | MONTH | QUARTER | YEAR}
-        {MAX { {QUERIES | ERRORS | RESULT ROWS | RESULT BYTES | READ ROWS | READ BYTES | EXECUTION TIME} = number } [,...] |
-        NO LIMITS | TRACKING ONLY} [,...]]
-    [TO {role [,...] | ALL | ALL EXCEPT role [,...]}]
-```
-
-## ALTER SETTINGS PROFILE {#alter-settings-profile-statement}
-
-Les changements de quotas.
-
-### Syntaxe {#alter-settings-profile-syntax}
-
-``` sql
-ALTER SETTINGS PROFILE [IF EXISTS] name [ON CLUSTER cluster_name]
-    [RENAME TO new_name]
-    [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | INHERIT 'profile_name'] [,...]
-```
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/alter/) <!--hide-->
diff --git a/docs/fr/sql-reference/statements/create.md b/docs/fr/sql-reference/statements/create.md
deleted file mode 100644
index e7c8040ee6e..00000000000
--- a/docs/fr/sql-reference/statements/create.md
+++ /dev/null
@@ -1,502 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 35
-toc_title: CREATE
----
-
-# Créer des requêtes {#create-queries}
-
-## CREATE DATABASE {#query-language-create-database}
-
-Crée la base de données.
-
-``` sql
-CREATE DATABASE [IF NOT EXISTS] db_name [ON CLUSTER cluster] [ENGINE = engine(...)]
-```
-
-### Clause {#clauses}
-
--   `IF NOT EXISTS`
-    Si l' `db_name` la base de données existe déjà, alors ClickHouse ne crée pas de nouvelle base de données et:
-
-    -   Ne lance pas d'exception si la clause est spécifiée.
-    -   Lève une exception si la clause n'est pas spécifiée.
-
--   `ON CLUSTER`
-    Clickhouse crée le `db_name` base de données sur tous les serveurs d'un cluster spécifié.
-
--   `ENGINE`
-
-    -   [MySQL](../../engines/database-engines/mysql.md)
-        Vous permet de récupérer des données à partir du serveur MySQL distant.
-        Par défaut, ClickHouse utilise son propre [moteur de base de données](../../engines/database-engines/index.md).
-
-## CREATE TABLE {#create-table-query}
-
-Le `CREATE TABLE` la requête peut avoir plusieurs formes.
-
-``` sql
-CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
-(
-    name1 [type1] [DEFAULT|MATERIALIZED|ALIAS expr1] [compression_codec] [TTL expr1],
-    name2 [type2] [DEFAULT|MATERIALIZED|ALIAS expr2] [compression_codec] [TTL expr2],
-    ...
-) ENGINE = engine
-```
-
-Crée une table nommée ‘name’ dans le ‘db’ base de données ou la base de données actuelle si ‘db’ n'est pas définie, avec la structure spécifiée entre parenthèses et l' ‘engine’ moteur.
-La structure de la table est une liste de descriptions de colonnes. Si les index sont pris en charge par le moteur, ils sont indiqués comme paramètres pour le moteur de table.
-
-Une description de colonne est `name type` dans le cas le plus simple. Exemple: `RegionID UInt32`.
-Des Expressions peuvent également être définies pour les valeurs par défaut (voir ci-dessous).
-
-``` sql
-CREATE TABLE [IF NOT EXISTS] [db.]table_name AS [db2.]name2 [ENGINE = engine]
-```
-
-Crée une table avec la même structure qu'une autre table. Vous pouvez spécifier un moteur différent pour la table. Si le moteur n'est pas spécifié, le même moteur sera utilisé que pour la `db2.name2` table.
-
-``` sql
-CREATE TABLE [IF NOT EXISTS] [db.]table_name AS table_function()
-```
-
-Crée une table avec la structure et les données renvoyées par [fonction de table](../table-functions/index.md#table-functions).
-
-``` sql
-CREATE TABLE [IF NOT EXISTS] [db.]table_name ENGINE = engine AS SELECT ...
-```
-
-Crée une table avec une structure comme le résultat de l' `SELECT` une requête avec les ‘engine’ moteur, et le remplit avec des données de SELECT.
-
-Dans tous les cas, si `IF NOT EXISTS` est spécifié, la requête ne renvoie pas une erreur si la table existe déjà. Dans ce cas, la requête ne font rien.
-
-Il peut y avoir d'autres clauses après le `ENGINE` la clause dans la requête. Voir la documentation détaillée sur la façon de créer des tables dans les descriptions de [moteurs de table](../../engines/table-engines/index.md#table_engines).
-
-### Les Valeurs Par Défaut {#create-default-values}
-
-La description de colonne peut spécifier une expression pour une valeur par défaut, de l'une des manières suivantes:`DEFAULT expr`, `MATERIALIZED expr`, `ALIAS expr`.
-Exemple: `URLDomain String DEFAULT domain(URL)`.
-
-Si une expression pour la valeur par défaut n'est pas définie, les valeurs par défaut seront définies sur zéros pour les nombres, chaînes vides pour les chaînes, tableaux vides pour les tableaux et `1970-01-01` pour les dates ou zero unix timestamp pour les dates avec le temps. Les valeurs NULL ne sont pas prises en charge.
-
-Si l'expression par défaut est définie, le type de colonne est facultatif. S'il n'y a pas de type explicitement défini, le type d'expression par défaut est utilisé. Exemple: `EventDate DEFAULT toDate(EventTime)` – the ‘Date’ type sera utilisé pour la ‘EventDate’ colonne.
-
-Si le type de données et l'expression par défaut sont définis explicitement, cette expression sera convertie au type spécifié à l'aide des fonctions de conversion de type. Exemple: `Hits UInt32 DEFAULT 0` signifie la même chose que `Hits UInt32 DEFAULT toUInt32(0)`.
-
-Default expressions may be defined as an arbitrary expression from table constants and columns. When creating and changing the table structure, it checks that expressions don't contain loops. For INSERT, it checks that expressions are resolvable – that all columns they can be calculated from have been passed.
-
-`DEFAULT expr`
-
-Valeur par défaut normale. Si la requête INSERT ne spécifie pas la colonne correspondante, elle sera remplie en calculant l'expression correspondante.
-
-`MATERIALIZED expr`
-
-Expression matérialisée. Une telle colonne ne peut pas être spécifiée pour INSERT, car elle est toujours calculée.
-Pour un INSERT sans Liste de colonnes, ces colonnes ne sont pas prises en compte.
-De plus, cette colonne n'est pas substituée lors de l'utilisation d'un astérisque dans une requête SELECT. C'est pour préserver l'invariant que le dump obtenu en utilisant `SELECT *` peut être inséré dans la table en utilisant INSERT sans spécifier la liste des colonnes.
-
-`ALIAS expr`
-
-Synonyme. Une telle colonne n'est pas du tout stockée dans la table.
-Ses valeurs ne peuvent pas être insérées dans une table et elles ne sont pas substituées lors de l'utilisation d'un astérisque dans une requête SELECT.
-Il peut être utilisé dans SELECTs si l'alias est développé pendant l'analyse des requêtes.
-
-Lorsque vous utilisez la requête ALTER pour ajouter de nouvelles colonnes, les anciennes données de ces colonnes ne sont pas écrites. Au lieu de cela, lors de la lecture d'anciennes données qui n'ont pas de valeurs pour les nouvelles colonnes, les expressions sont calculées à la volée par défaut. Cependant, si l'exécution des expressions nécessite différentes colonnes qui ne sont pas indiquées dans la requête, ces colonnes seront en outre lues, mais uniquement pour les blocs de données qui en ont besoin.
-
-Si vous ajoutez une nouvelle colonne à une table mais modifiez ultérieurement son expression par défaut, les valeurs utilisées pour les anciennes données changeront (pour les données où les valeurs n'ont pas été stockées sur le disque). Notez que lors de l'exécution de fusions d'arrière-plan, les données des colonnes manquantes dans l'une des parties de fusion sont écrites dans la partie fusionnée.
-
-Il n'est pas possible de définir des valeurs par défaut pour les éléments dans les structures de données.
-
-### Contraintes {#constraints}
-
-Avec les descriptions de colonnes des contraintes peuvent être définies:
-
-``` sql
-CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
-(
-    name1 [type1] [DEFAULT|MATERIALIZED|ALIAS expr1] [compression_codec] [TTL expr1],
-    ...
-    CONSTRAINT constraint_name_1 CHECK boolean_expr_1,
-    ...
-) ENGINE = engine
-```
-
-`boolean_expr_1` pourrait par n'importe quelle expression booléenne. Si les contraintes sont définies pour la table, chacun d'eux sera vérifiée pour chaque ligne `INSERT` query. If any constraint is not satisfied — server will raise an exception with constraint name and checking expression.
-
-L'ajout d'une grande quantité de contraintes peut affecter négativement les performances de big `INSERT` requête.
-
-### Expression TTL {#ttl-expression}
-
-Définit la durée de stockage des valeurs. Peut être spécifié uniquement pour les tables mergetree-family. Pour la description détaillée, voir [TTL pour les colonnes et les tableaux](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-ttl).
-
-### Codecs De Compression De Colonne {#codecs}
-
-Par défaut, ClickHouse applique le `lz4` méthode de compression. Pour `MergeTree`- famille de moteurs Vous pouvez modifier la méthode de compression par défaut dans le [compression](../../operations/server-configuration-parameters/settings.md#server-settings-compression) section d'une configuration de serveur. Vous pouvez également définir la méthode de compression pour chaque colonne `CREATE TABLE` requête.
-
-``` sql
-CREATE TABLE codec_example
-(
-    dt Date CODEC(ZSTD),
-    ts DateTime CODEC(LZ4HC),
-    float_value Float32 CODEC(NONE),
-    double_value Float64 CODEC(LZ4HC(9))
-    value Float32 CODEC(Delta, ZSTD)
-)
-ENGINE = <Engine>
-...
-```
-
-Si un codec est spécifié, le codec par défaut ne s'applique pas. Les Codecs peuvent être combinés dans un pipeline, par exemple, `CODEC(Delta, ZSTD)`. Pour sélectionner la meilleure combinaison de codecs pour votre projet, passez des benchmarks similaires à ceux décrits dans Altinity [Nouveaux encodages pour améliorer L'efficacité du ClickHouse](https://www.altinity.com/blog/2019/7/new-encodings-to-improve-clickhouse) article.
-
-!!! warning "Avertissement"
-    Vous ne pouvez pas décompresser les fichiers de base de données ClickHouse avec des utilitaires externes tels que `lz4`. Au lieu de cela, utilisez le spécial [clickhouse-compresseur](https://github.com/ClickHouse/ClickHouse/tree/master/programs/compressor) utilitaire.
-
-La Compression est prise en charge pour les moteurs de tableau suivants:
-
--   [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md) famille. Prend en charge les codecs de compression de colonne et la sélection de la méthode de compression par défaut par [compression](../../operations/server-configuration-parameters/settings.md#server-settings-compression) paramètre.
--   [Journal](../../engines/table-engines/log-family/index.md) famille. Utilise le `lz4` méthode de compression par défaut et prend en charge les codecs de compression de colonne.
--   [Définir](../../engines/table-engines/special/set.md). Uniquement pris en charge la compression par défaut.
--   [Rejoindre](../../engines/table-engines/special/join.md). Uniquement pris en charge la compression par défaut.
-
-ClickHouse prend en charge les codecs à usage commun et les codecs spécialisés.
-
-#### Codecs Spécialisés {#create-query-specialized-codecs}
-
-Ces codecs sont conçus pour rendre la compression plus efficace en utilisant des fonctionnalités spécifiques des données. Certains de ces codecs ne compressent pas les données eux-mêmes. Au lieu de cela, ils préparent les données pour un codec à usage commun, qui les compresse mieux que sans cette préparation.
-
-Spécialisé codecs:
-
--   `Delta(delta_bytes)` — Compression approach in which raw values are replaced by the difference of two neighboring values, except for the first value that stays unchanged. Up to `delta_bytes` sont utilisés pour stocker des valeurs delta, donc `delta_bytes` est la taille maximale des valeurs brutes. Possible `delta_bytes` valeurs: 1, 2, 4, 8. La valeur par défaut pour `delta_bytes` être `sizeof(type)` si égale à 1, 2, 4 ou 8. Dans tous les autres cas, c'est 1.
--   `DoubleDelta` — Calculates delta of deltas and writes it in compact binary form. Optimal compression rates are achieved for monotonic sequences with a constant stride, such as time series data. Can be used with any fixed-width type. Implements the algorithm used in Gorilla TSDB, extending it to support 64-bit types. Uses 1 extra bit for 32-byte deltas: 5-bit prefixes instead of 4-bit prefixes. For additional information, see Compressing Time Stamps in [Gorilla: Une Base De Données De Séries Chronologiques Rapide, Évolutive Et En Mémoire](http://www.vldb.org/pvldb/vol8/p1816-teller.pdf).
--   `Gorilla` — Calculates XOR between current and previous value and writes it in compact binary form. Efficient when storing a series of floating point values that change slowly, because the best compression rate is achieved when neighboring values are binary equal. Implements the algorithm used in Gorilla TSDB, extending it to support 64-bit types. For additional information, see Compressing Values in [Gorilla: Une Base De Données De Séries Chronologiques Rapide, Évolutive Et En Mémoire](http://www.vldb.org/pvldb/vol8/p1816-teller.pdf).
--   `T64` — Compression approach that crops unused high bits of values in integer data types (including `Enum`, `Date` et `DateTime`). À chaque étape de son algorithme, le codec prend un bloc de 64 valeurs, les place dans une matrice de 64x64 bits, le transpose, recadre les bits de valeurs inutilisés et renvoie le reste sous forme de séquence. Les bits inutilisés sont les bits, qui ne diffèrent pas entre les valeurs maximum et minimum dans la partie de données entière pour laquelle la compression est utilisée.
-
-`DoubleDelta` et `Gorilla` les codecs sont utilisés dans Gorilla TSDB comme composants de son algorithme de compression. L'approche Gorilla est efficace dans les scénarios où il y a une séquence de valeurs qui changent lentement avec leurs horodatages. Les horodatages sont effectivement compressés par le `DoubleDelta` codec, et les valeurs sont effectivement comprimé par le `Gorilla` codec. Par exemple, pour obtenir une table stockée efficacement, vous pouvez la créer dans la configuration suivante:
-
-``` sql
-CREATE TABLE codec_example
-(
-    timestamp DateTime CODEC(DoubleDelta),
-    slow_values Float32 CODEC(Gorilla)
-)
-ENGINE = MergeTree()
-```
-
-#### Codecs À Usage Général {#create-query-general-purpose-codecs}
-
-Codec:
-
--   `NONE` — No compression.
--   `LZ4` — Lossless [algorithme de compression de données](https://github.com/lz4/lz4) utilisé par défaut. Applique la compression rapide LZ4.
--   `LZ4HC[(level)]` — LZ4 HC (high compression) algorithm with configurable level. Default level: 9. Setting `level <= 0` s'applique le niveau par défaut. Niveaux possibles: \[1, 12\]. Plage de niveau recommandée: \[4, 9\].
--   `ZSTD[(level)]` — [Algorithme de compression ZSTD](https://en.wikipedia.org/wiki/Zstandard) avec configurables `level`. Niveaux possibles: \[1, 22\]. Valeur par défaut: 1.
-
-Des niveaux de compression élevés sont utiles pour les scénarios asymétriques, comme compresser une fois, décompresser à plusieurs reprises. Des niveaux plus élevés signifient une meilleure compression et une utilisation plus élevée du processeur.
-
-## Les Tables Temporaires {#temporary-tables}
-
-Clickhouse prend en charge les tables temporaires qui ont les caractéristiques suivantes:
-
--   Les tables temporaires disparaissent à la fin de la session, y compris si la connexion est perdue.
--   Une table temporaire utilise uniquement le moteur de mémoire.
--   La base de données ne peut pas être spécifiée pour une table temporaire. Il est créé en dehors des bases de données.
--   Impossible de créer une table temporaire avec une requête DDL distribuée sur tous les serveurs de cluster (en utilisant `ON CLUSTER`): ce tableau n'existe que dans la session en cours.
--   Si une table temporaire a le même nom qu'une autre et qu'une requête spécifie le nom de la table sans spécifier la base de données, la table temporaire sera utilisée.
--   Pour le traitement des requêtes distribuées, les tables temporaires utilisées dans une requête sont transmises à des serveurs distants.
-
-Pour créer une table temporaire, utilisez la syntaxe suivante:
-
-``` sql
-CREATE TEMPORARY TABLE [IF NOT EXISTS] table_name
-(
-    name1 [type1] [DEFAULT|MATERIALIZED|ALIAS expr1],
-    name2 [type2] [DEFAULT|MATERIALIZED|ALIAS expr2],
-    ...
-)
-```
-
-Dans la plupart des cas, les tables temporaires ne sont pas créées manuellement, mais lors de l'utilisation de données externes pour une requête ou pour `(GLOBAL) IN`. Pour plus d'informations, consultez les sections appropriées
-
-Il est possible d'utiliser des tables avec [Moteur = mémoire](../../engines/table-engines/special/memory.md) au lieu de tables temporaires.
-
-## Requêtes DDL distribuées (sur la clause CLUSTER) {#distributed-ddl-queries-on-cluster-clause}
-
-Le `CREATE`, `DROP`, `ALTER`, et `RENAME` les requêtes prennent en charge l'exécution distribuée sur un cluster.
-Par exemple, la requête suivante crée la `all_hits` `Distributed` tableau sur chaque ordinateur hôte `cluster`:
-
-``` sql
-CREATE TABLE IF NOT EXISTS all_hits ON CLUSTER cluster (p Date, i Int32) ENGINE = Distributed(cluster, default, hits)
-```
-
-Pour exécuter ces requêtes correctement, chaque hôte doit avoir la même définition de cluster (pour simplifier la synchronisation des configs, vous pouvez utiliser des substitutions de ZooKeeper). Ils doivent également se connecter aux serveurs ZooKeeper.
-La version locale de la requête sera finalement implémentée sur chaque hôte du cluster, même si certains hôtes ne sont actuellement pas disponibles. L'ordre d'exécution des requêtes au sein d'un seul hôte est garanti.
-
-## CREATE VIEW {#create-view}
-
-``` sql
-CREATE [MATERIALIZED] VIEW [IF NOT EXISTS] [db.]table_name [TO[db.]name] [ENGINE = engine] [POPULATE] AS SELECT ...
-```
-
-Crée une vue. Il existe deux types de vues: normale et matérialisée.
-
-Les vues normales ne stockent aucune donnée, mais effectuent simplement une lecture à partir d'une autre table. En d'autres termes, une vue normale n'est rien de plus qu'une requête enregistrée. Lors de la lecture à partir d'une vue, cette requête enregistrée est utilisée comme sous-requête dans la clause FROM.
-
-Par exemple, supposons que vous avez créé une vue:
-
-``` sql
-CREATE VIEW view AS SELECT ...
-```
-
-et écrit une requête:
-
-``` sql
-SELECT a, b, c FROM view
-```
-
-Cette requête est entièrement équivalente à l'utilisation de la sous requête:
-
-``` sql
-SELECT a, b, c FROM (SELECT ...)
-```
-
-Les vues matérialisées stockent les données transformées par la requête SELECT correspondante.
-
-Lors de la création d'une vue matérialisée sans `TO [db].[table]`, you must specify ENGINE – the table engine for storing data.
-
-Lors de la création d'une vue matérialisée avec `TO [db].[table]` vous ne devez pas utiliser `POPULATE`.
-
-Une vue matérialisée est agencée comme suit: lors de l'insertion de données dans la table spécifiée dans SELECT, une partie des données insérées est convertie par cette requête SELECT, et le résultat est inséré dans la vue.
-
-Si vous spécifiez POPULATE, les données de table existantes sont insérées dans la vue lors de sa création, comme si `CREATE TABLE ... AS SELECT ...` . Sinon, la requête ne contient que les données insérées dans la table après la création de la vue. Nous ne recommandons pas D'utiliser POPULATE, car les données insérées dans la table lors de la création de la vue ne seront pas insérées dedans.
-
-A `SELECT` la requête peut contenir `DISTINCT`, `GROUP BY`, `ORDER BY`, `LIMIT`… Note that the corresponding conversions are performed independently on each block of inserted data. For example, if `GROUP BY` est définie, les données sont agrégées lors de l'insertion, mais uniquement dans un seul paquet de données insérées. Les données ne seront pas agrégées davantage. L'exception concerne l'utilisation d'un moteur qui effectue indépendamment l'agrégation de données, par exemple `SummingMergeTree`.
-
-L'exécution de `ALTER` les requêtes sur les vues matérialisées n'ont pas été complètement développées, elles pourraient donc être gênantes. Si la vue matérialisée utilise la construction `TO [db.]name` vous pouvez `DETACH` la vue, exécutez `ALTER` pour la table cible, puis `ATTACH` précédemment détaché (`DETACH`) vue.
-
-Les vues ressemblent aux tables normales. Par exemple, ils sont répertoriés dans le résultat de la `SHOW TABLES` requête.
-
-Il n'y a pas de requête séparée pour supprimer des vues. Pour supprimer une vue, utilisez `DROP TABLE`.
-
-## CREATE DICTIONARY {#create-dictionary-query}
-
-``` sql
-CREATE DICTIONARY [IF NOT EXISTS] [db.]dictionary_name [ON CLUSTER cluster]
-(
-    key1 type1  [DEFAULT|EXPRESSION expr1] [HIERARCHICAL|INJECTIVE|IS_OBJECT_ID],
-    key2 type2  [DEFAULT|EXPRESSION expr2] [HIERARCHICAL|INJECTIVE|IS_OBJECT_ID],
-    attr1 type2 [DEFAULT|EXPRESSION expr3],
-    attr2 type2 [DEFAULT|EXPRESSION expr4]
-)
-PRIMARY KEY key1, key2
-SOURCE(SOURCE_NAME([param1 value1 ... paramN valueN]))
-LAYOUT(LAYOUT_NAME([param_name param_value]))
-LIFETIME({MIN min_val MAX max_val | max_val})
-```
-
-Crée [externe dictionnaire](../../sql-reference/dictionaries/external-dictionaries/external-dicts.md) avec le [structure](../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md), [source](../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md), [disposition](../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md) et [vie](../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md).
-
-Structure de dictionnaire externe se compose d'attributs. Les attributs du dictionnaire sont spécifiés de la même manière que les colonnes du tableau. La seule propriété d'attribut requise est son type, toutes les autres propriétés peuvent avoir des valeurs par défaut.
-
-Selon le dictionnaire [disposition](../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md) un ou plusieurs attributs peuvent être spécifiés comme les clés de dictionnaire.
-
-Pour plus d'informations, voir [Dictionnaires Externes](../dictionaries/external-dictionaries/external-dicts.md) section.
-
-## CREATE USER {#create-user-statement}
-
-Crée un [compte d'utilisateur](../../operations/access-rights.md#user-account-management).
-
-### Syntaxe {#create-user-syntax}
-
-``` sql
-CREATE USER [IF NOT EXISTS | OR REPLACE] name [ON CLUSTER cluster_name]
-    [IDENTIFIED [WITH {NO_PASSWORD|PLAINTEXT_PASSWORD|SHA256_PASSWORD|SHA256_HASH|DOUBLE_SHA1_PASSWORD|DOUBLE_SHA1_HASH}] BY {'password'|'hash'}]
-    [HOST {LOCAL | NAME 'name' | REGEXP 'name_regexp' | IP 'address' | LIKE 'pattern'} [,...] | ANY | NONE]
-    [DEFAULT ROLE role [,...]]
-    [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | PROFILE 'profile_name'] [,...]
-```
-
-#### Identification {#identification}
-
-Il existe de multiples façons d'identification d'un utilisateur:
-
--   `IDENTIFIED WITH no_password`
--   `IDENTIFIED WITH plaintext_password BY 'qwerty'`
--   `IDENTIFIED WITH sha256_password BY 'qwerty'` ou `IDENTIFIED BY 'password'`
--   `IDENTIFIED WITH sha256_hash BY 'hash'`
--   `IDENTIFIED WITH double_sha1_password BY 'qwerty'`
--   `IDENTIFIED WITH double_sha1_hash BY 'hash'`
-
-#### L'Utilisateur De L'Hôte {#user-host}
-
-L'hôte utilisateur est un hôte à partir duquel une connexion au serveur ClickHouse peut être établie. Hôte peut être spécifié dans le `HOST` section de requête par les moyens suivants:
-
--   `HOST IP 'ip_address_or_subnetwork'` — User can connect to ClickHouse server only from the specified IP address or a [sous-réseau](https://en.wikipedia.org/wiki/Subnetwork). Exemple: `HOST IP '192.168.0.0/16'`, `HOST IP '2001:DB8::/32'`. Pour une utilisation en production, spécifiez uniquement `HOST IP` (adresses IP et leurs masques), depuis l'utilisation `host` et `host_regexp` peut causer une latence supplémentaire.
--   `HOST ANY` — User can connect from any location. This is default option.
--   `HOST LOCAL` — User can connect only locally.
--   `HOST NAME 'fqdn'` — User host can be specified as FQDN. For example, `HOST NAME 'mysite.com'`.
--   `HOST NAME REGEXP 'regexp'` — You can use [pcre](http://www.pcre.org/) expressions régulières lors de la spécification des hôtes utilisateur. Exemple, `HOST NAME REGEXP '.*\.mysite\.com'`.
--   `HOST LIKE 'template'` — Allows you use the [LIKE](../functions/string-search-functions.md#function-like) opérateur de filtre de l'utilisateur hôtes. Exemple, `HOST LIKE '%'` est équivalent à `HOST ANY`, `HOST LIKE '%.mysite.com'` filtre tous les hôtes dans le `mysite.com` domaine.
-
-Une autre façon de spécifier l'hôte est d'utiliser `@` syntaxe avec le nom d'utilisateur. Exemple:
-
--   `CREATE USER mira@'127.0.0.1'` — Equivalent to the `HOST IP` syntaxe.
--   `CREATE USER mira@'localhost'` — Equivalent to the `HOST LOCAL` syntaxe.
--   `CREATE USER mira@'192.168.%.%'` — Equivalent to the `HOST LIKE` syntaxe.
-
-!!! info "Avertissement"
-    Clickhouse traite `user_name@'address'` comme un nom d'utilisateur dans son ensemble. Donc, techniquement, vous pouvez créer plusieurs utilisateurs avec `user_name` et différentes constructions après `@`. Nous ne recommandons pas de le faire.
-
-### Exemple {#create-user-examples}
-
-Créer le compte d'utilisateur `mira` protégé par le mot de passe `qwerty`:
-
-``` sql
-CREATE USER mira HOST IP '127.0.0.1' IDENTIFIED WITH sha256_password BY 'qwerty'
-```
-
-`mira` devrait démarrer l'application client sur l'hôte où le serveur ClickHouse s'exécute.
-
-Créer le compte d'utilisateur `john`, attribuez-lui des rôles et définissez ces rôles par défaut:
-
-``` sql
-CREATE USER john DEFAULT ROLE role1, role2
-```
-
-Créer le compte d'utilisateur `john` et faire tous ses futurs rôles par défaut:
-
-``` sql
-ALTER USER user DEFAULT ROLE ALL
-```
-
-Quand un rôle sera attribué à `john` dans l'avenir, il deviendra automatiquement par défaut.
-
-Créer le compte d'utilisateur `john` et faire tous ses futurs rôles par défaut sauf `role1` et `role2`:
-
-``` sql
-ALTER USER john DEFAULT ROLE ALL EXCEPT role1, role2
-```
-
-## CREATE ROLE {#create-role-statement}
-
-Crée un [rôle](../../operations/access-rights.md#role-management).
-
-### Syntaxe {#create-role-syntax}
-
-``` sql
-CREATE ROLE [IF NOT EXISTS | OR REPLACE] name
-    [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | PROFILE 'profile_name'] [,...]
-```
-
-### Description {#create-role-description}
-
-Rôle est un ensemble de [privilège](grant.md#grant-privileges). Un utilisateur reçoit un rôle obtient tous les privilèges de ce rôle.
-
-Un utilisateur peut être affecté à plusieurs rôles. Les utilisateurs peuvent appliquer leurs rôles accordés dans des combinaisons arbitraires par le [SET ROLE](misc.md#set-role-statement) déclaration. La finale de la portée des privilèges est un ensemble combiné de tous les privilèges de tous les rôles. Si un utilisateur a des privilèges accordés directement à son compte d'utilisateur, ils sont également combinés avec les privilèges accordés par les rôles.
-
-L'utilisateur peut avoir des rôles par défaut qui s'appliquent à la connexion de l'utilisateur. Pour définir les rôles par défaut, utilisez [SET DEFAULT ROLE](misc.md#set-default-role-statement) - déclaration ou de la [ALTER USER](alter.md#alter-user-statement) déclaration.
-
-Pour révoquer un rôle, utilisez [REVOKE](revoke.md) déclaration.
-
-Pour supprimer le rôle, utilisez [DROP ROLE](misc.md#drop-role-statement) déclaration. Le rôle supprimé est automatiquement révoqué de tous les utilisateurs et rôles auxquels il a été accordé.
-
-### Exemple {#create-role-examples}
-
-``` sql
-CREATE ROLE accountant;
-GRANT SELECT ON db.* TO accountant;
-```
-
-Cette séquence de requêtes crée le rôle `accountant` cela a le privilège de lire les données du `accounting` la base de données.
-
-Octroi du rôle à l'utilisateur `mira`:
-
-``` sql
-GRANT accountant TO mira;
-```
-
-Une fois le rôle accordé, l'utilisateur peut l'utiliser et effectuer les requêtes autorisées. Exemple:
-
-``` sql
-SET ROLE accountant;
-SELECT * FROM db.*;
-```
-
-## CREATE ROW POLICY {#create-row-policy-statement}
-
-Crée un [filtre pour les lignes](../../operations/access-rights.md#row-policy-management) qu'un utilisateur peut lire à partir d'une table.
-
-### Syntaxe {#create-row-policy-syntax}
-
-``` sql
-CREATE [ROW] POLICY [IF NOT EXISTS | OR REPLACE] policy_name [ON CLUSTER cluster_name] ON [db.]table
-    [AS {PERMISSIVE | RESTRICTIVE}]
-    [FOR SELECT]
-    [USING condition]
-    [TO {role [,...] | ALL | ALL EXCEPT role [,...]}]
-```
-
-#### Section AS {#create-row-policy-as}
-
-À l'aide de cette section, vous pouvez créer des stratégies permissives ou restrictives.
-
-La stratégie Permissive accorde l'accès aux lignes. Les stratégies permissives qui s'appliquent à la même table sont combinées ensemble en utilisant le booléen `OR` opérateur. Les stratégies sont permissives par défaut.
-
-La politique Restrictive limite l'accès à la ligne. Les politiques restrictives qui s'appliquent à la même table sont combinées en utilisant le booléen `AND` opérateur.
-
-Les stratégies restrictives s'appliquent aux lignes qui ont passé les filtres permissifs. Si vous définissez des stratégies restrictives mais aucune politique permissive, l'utilisateur ne peut obtenir aucune ligne de la table.
-
-#### La Section DE {#create-row-policy-to}
-
-Dans la section `TO` vous pouvez donner une liste mixte de rôles et d'utilisateurs, par exemple, `CREATE ROW POLICY ... TO accountant, john@localhost`.
-
-Mot `ALL` signifie Tous les utilisateurs de ClickHouse, y compris l'utilisateur actuel. Mot `ALL EXCEPT` autoriser à exclure certains utilisateurs de la liste tous les utilisateurs, par exemple `CREATE ROW POLICY ... TO ALL EXCEPT accountant, john@localhost`
-
-### Exemple {#examples}
-
--   `CREATE ROW POLICY filter ON mydb.mytable FOR SELECT USING a<1000 TO accountant, john@localhost`
--   `CREATE ROW POLICY filter ON mydb.mytable FOR SELECT USING a<1000 TO ALL EXCEPT mira`
-
-## CREATE QUOTA {#create-quota-statement}
-
-Crée un [quota](../../operations/access-rights.md#quotas-management) qui peut être attribué à un utilisateur ou un rôle.
-
-### Syntaxe {#create-quota-syntax}
-
-``` sql
-CREATE QUOTA [IF NOT EXISTS | OR REPLACE] name [ON CLUSTER cluster_name]
-    [KEYED BY {'none' | 'user name' | 'ip address' | 'client key' | 'client key or user name' | 'client key or ip address'}]
-    [FOR [RANDOMIZED] INTERVAL number {SECOND | MINUTE | HOUR | DAY | WEEK | MONTH | QUARTER | YEAR}
-        {MAX { {QUERIES | ERRORS | RESULT ROWS | RESULT BYTES | READ ROWS | READ BYTES | EXECUTION TIME} = number } [,...] |
-         NO LIMITS | TRACKING ONLY} [,...]]
-    [TO {role [,...] | ALL | ALL EXCEPT role [,...]}]
-```
-
-### Exemple {#create-quota-example}
-
-Limiter le nombre maximum de requêtes pour l'utilisateur actuel avec 123 requêtes en 15 mois contrainte:
-
-``` sql
-CREATE QUOTA qA FOR INTERVAL 15 MONTH MAX QUERIES 123 TO CURRENT_USER
-```
-
-## CREATE SETTINGS PROFILE {#create-settings-profile-statement}
-
-Crée un [les paramètres de profil](../../operations/access-rights.md#settings-profiles-management) qui peut être attribué à un utilisateur ou un rôle.
-
-### Syntaxe {#create-settings-profile-syntax}
-
-``` sql
-CREATE SETTINGS PROFILE [IF NOT EXISTS | OR REPLACE] name [ON CLUSTER cluster_name]
-    [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | INHERIT 'profile_name'] [,...]
-```
-
-# Exemple {#create-settings-profile-syntax}
-
-Créer l' `max_memory_usage_profile` paramètres du profil avec valeur et contraintes pour `max_memory_usage` paramètre. L'affecter à `robin`:
-
-``` sql
-CREATE SETTINGS PROFILE max_memory_usage_profile SETTINGS max_memory_usage = 100000001 MIN 90000000 MAX 110000000 TO robin
-```
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/create/) <!--hide-->
diff --git a/docs/fr/sql-reference/statements/grant.md b/docs/fr/sql-reference/statements/grant.md
deleted file mode 100644
index 143c9a36e33..00000000000
--- a/docs/fr/sql-reference/statements/grant.md
+++ /dev/null
@@ -1,476 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 39
-toc_title: GRANT
----
-
-# GRANT {#grant}
-
--   Accorder [privilège](#grant-privileges) pour ClickHouse comptes d'utilisateurs ou des rôles.
--   Affecte des rôles à des comptes d'utilisateurs ou à d'autres rôles.
-
-Pour révoquer les privilèges, utilisez [REVOKE](revoke.md) déclaration. Vous pouvez également classer les privilèges accordés par le [SHOW GRANTS](show.md#show-grants-statement) déclaration.
-
-## Accorder La Syntaxe Des Privilèges {#grant-privigele-syntax}
-
-``` sql
-GRANT [ON CLUSTER cluster_name] privilege[(column_name [,...])] [,...] ON {db.table|db.*|*.*|table|*} TO {user | role | CURRENT_USER} [,...] [WITH GRANT OPTION]
-```
-
--   `privilege` — Type of privilege.
--   `role` — ClickHouse user role.
--   `user` — ClickHouse user account.
-
-Le `WITH GRANT OPTION` clause de subventions `user` ou `role` avec l'autorisation de réaliser des `GRANT` requête. Les utilisateurs peuvent accorder des privilèges de la même portée qu'ils ont et moins.
-
-## Attribution De La Syntaxe Du Rôle {#assign-role-syntax}
-
-``` sql
-GRANT [ON CLUSTER cluster_name] role [,...] TO {user | another_role | CURRENT_USER} [,...] [WITH ADMIN OPTION]
-```
-
--   `role` — ClickHouse user role.
--   `user` — ClickHouse user account.
-
-Le `WITH ADMIN OPTION` clause de jeux [ADMIN OPTION](#admin-option-privilege) privilège pour `user` ou `role`.
-
-## Utilisation {#grant-usage}
-
-Utiliser `GRANT` votre compte doit avoir le `GRANT OPTION` privilège. Vous ne pouvez accorder des privilèges que dans le cadre de vos privilèges de Compte.
-
-Par exemple, l'administrateur a accordé des privilèges `john` compte par la requête:
-
-``` sql
-GRANT SELECT(x,y) ON db.table TO john WITH GRANT OPTION
-```
-
-Cela signifie que `john` a la permission d'effectuer:
-
--   `SELECT x,y FROM db.table`.
--   `SELECT x FROM db.table`.
--   `SELECT y FROM db.table`.
-
-`john` ne pouvez pas effectuer de `SELECT z FROM db.table`. Le `SELECT * FROM db.table` aussi n'est pas disponible. En traitant cette requête, ClickHouse ne renvoie aucune donnée, même `x` et `y`. La seule exception est si une table contient uniquement `x` et `y` colonnes, dans ce cas ClickHouse renvoie toutes les données.
-
-Également `john` a l' `GRANT OPTION` privilège, de sorte qu'il peut accorder à d'autres utilisateurs avec des privilèges de la même ou de la plus petite portée.
-
-Spécification des privilèges vous pouvez utiliser asterisk (`*`) au lieu d'une table ou d'un nom de base de données. Par exemple, l' `GRANT SELECT ON db.* TO john` requête permet `john` pour effectuer la `SELECT` requête sur toutes les tables dans `db` la base de données. En outre, vous pouvez omettre le nom de la base de données. Dans ce cas, des privilèges sont accordés pour la base de données actuelle, par exemple: `GRANT SELECT ON * TO john` accorde le privilège sur toutes les tables dans la base de données actuelle, `GRANT SELECT ON mytable TO john` accorde le privilège sur le `mytable` table dans la base de données actuelle.
-
-L'accès à la `system` la base de données est toujours autorisée (puisque cette base de données est utilisée pour traiter les requêtes).
-
-Vous pouvez accorder plusieurs privilèges à plusieurs comptes dans une requête. Requête `GRANT SELECT, INSERT ON *.* TO john, robin` permet de comptes `john` et `robin` pour effectuer la `INSERT` et `SELECT` des requêtes sur toutes les tables de toutes les bases de données sur le serveur.
-
-## Privilège {#grant-privileges}
-
-Privilège est une autorisation pour effectuer un type spécifique de requêtes.
-
-Les privilèges ont une structure hiérarchique. Un ensemble de requêtes autorisées dépend de la portée des privilèges.
-
-Hiérarchie des privilèges:
-
--   [SELECT](#grant-select)
--   [INSERT](#grant-insert)
--   [ALTER](#grant-alter)
-    -   `ALTER TABLE`
-        -   `ALTER UPDATE`
-        -   `ALTER DELETE`
-        -   `ALTER COLUMN`
-            -   `ALTER ADD COLUMN`
-            -   `ALTER DROP COLUMN`
-            -   `ALTER MODIFY COLUMN`
-            -   `ALTER COMMENT COLUMN`
-            -   `ALTER CLEAR COLUMN`
-            -   `ALTER RENAME COLUMN`
-        -   `ALTER INDEX`
-            -   `ALTER ORDER BY`
-            -   `ALTER ADD INDEX`
-            -   `ALTER DROP INDEX`
-            -   `ALTER MATERIALIZE INDEX`
-            -   `ALTER CLEAR INDEX`
-        -   `ALTER CONSTRAINT`
-            -   `ALTER ADD CONSTRAINT`
-            -   `ALTER DROP CONSTRAINT`
-        -   `ALTER TTL`
-        -   `ALTER MATERIALIZE TTL`
-        -   `ALTER SETTINGS`
-        -   `ALTER MOVE PARTITION`
-        -   `ALTER FETCH PARTITION`
-        -   `ALTER FREEZE PARTITION`
-    -   `ALTER VIEW`
-        -   `ALTER VIEW REFRESH`
-        -   `ALTER VIEW MODIFY QUERY`
--   [CREATE](#grant-create)
-    -   `CREATE DATABASE`
-    -   `CREATE TABLE`
-    -   `CREATE VIEW`
-    -   `CREATE DICTIONARY`
-    -   `CREATE TEMPORARY TABLE`
--   [DROP](#grant-drop)
-    -   `DROP DATABASE`
-    -   `DROP TABLE`
-    -   `DROP VIEW`
-    -   `DROP DICTIONARY`
--   [TRUNCATE](#grant-truncate)
--   [OPTIMIZE](#grant-optimize)
--   [SHOW](#grant-show)
-    -   `SHOW DATABASES`
-    -   `SHOW TABLES`
-    -   `SHOW COLUMNS`
-    -   `SHOW DICTIONARIES`
--   [KILL QUERY](#grant-kill-query)
--   [ACCESS MANAGEMENT](#grant-access-management)
-    -   `CREATE USER`
-    -   `ALTER USER`
-    -   `DROP USER`
-    -   `CREATE ROLE`
-    -   `ALTER ROLE`
-    -   `DROP ROLE`
-    -   `CREATE ROW POLICY`
-    -   `ALTER ROW POLICY`
-    -   `DROP ROW POLICY`
-    -   `CREATE QUOTA`
-    -   `ALTER QUOTA`
-    -   `DROP QUOTA`
-    -   `CREATE SETTINGS PROFILE`
-    -   `ALTER SETTINGS PROFILE`
-    -   `DROP SETTINGS PROFILE`
-    -   `SHOW ACCESS`
-        -   `SHOW_USERS`
-        -   `SHOW_ROLES`
-        -   `SHOW_ROW_POLICIES`
-        -   `SHOW_QUOTAS`
-        -   `SHOW_SETTINGS_PROFILES`
-    -   `ROLE ADMIN`
--   [SYSTEM](#grant-system)
-    -   `SYSTEM SHUTDOWN`
-    -   `SYSTEM DROP CACHE`
-        -   `SYSTEM DROP DNS CACHE`
-        -   `SYSTEM DROP MARK CACHE`
-        -   `SYSTEM DROP UNCOMPRESSED CACHE`
-    -   `SYSTEM RELOAD`
-        -   `SYSTEM RELOAD CONFIG`
-        -   `SYSTEM RELOAD DICTIONARY`
-        -   `SYSTEM RELOAD EMBEDDED DICTIONARIES`
-    -   `SYSTEM MERGES`
-    -   `SYSTEM TTL MERGES`
-    -   `SYSTEM FETCHES`
-    -   `SYSTEM MOVES`
-    -   `SYSTEM SENDS`
-        -   `SYSTEM DISTRIBUTED SENDS`
-        -   `SYSTEM REPLICATED SENDS`
-    -   `SYSTEM REPLICATION QUEUES`
-    -   `SYSTEM SYNC REPLICA`
-    -   `SYSTEM RESTART REPLICA`
-    -   `SYSTEM FLUSH`
-        -   `SYSTEM FLUSH DISTRIBUTED`
-        -   `SYSTEM FLUSH LOGS`
--   [INTROSPECTION](#grant-introspection)
-    -   `addressToLine`
-    -   `addressToSymbol`
-    -   `demangle`
--   [SOURCES](#grant-sources)
-    -   `FILE`
-    -   `URL`
-    -   `REMOTE`
-    -   `YSQL`
-    -   `ODBC`
-    -   `JDBC`
-    -   `HDFS`
-    -   `S3`
--   [dictGet](#grant-dictget)
-
-Exemples de la façon dont cette hiérarchie est traitée:
-
--   Le `ALTER` privilège comprend tous les autres `ALTER*` privilège.
--   `ALTER CONSTRAINT` comprendre `ALTER ADD CONSTRAINT` et `ALTER DROP CONSTRAINT` privilège.
-
-Les privilèges sont appliqués à différents niveaux. Connaissant un niveau suggère la syntaxe disponible pour le privilège.
-
-Les niveaux (du plus faible au plus élevé):
-
--   `COLUMN` — Privilege can be granted for column, table, database, or globally.
--   `TABLE` — Privilege can be granted for table, database, or globally.
--   `VIEW` — Privilege can be granted for view, database, or globally.
--   `DICTIONARY` — Privilege can be granted for dictionary, database, or globally.
--   `DATABASE` — Privilege can be granted for database or globally.
--   `GLOBAL` — Privilege can be granted only globally.
--   `GROUP` — Groups privileges of different levels. When `GROUP`- le privilège de niveau est accordé, seuls les privilèges du groupe sont accordés qui correspondent à la syntaxe utilisée.
-
-Exemples de syntaxe:
-
--   `GRANT SELECT(x) ON db.table TO user`
--   `GRANT SELECT ON db.* TO user`
-
-Exemples de syntaxe refusée:
-
--   `GRANT CREATE USER(x) ON db.table TO user`
--   `GRANT CREATE USER ON db.* TO user`
-
-Le privilège spécial [ALL](#grant-all) accorde tous les privilèges à un compte d'utilisateur ou à un rôle.
-
-Par défaut, un compte d'utilisateur ou un rôle a pas de privilèges.
-
-Si un utilisateur ou un rôle ont pas de privilèges qu'il s'affiche comme [NONE](#grant-none) privilège.
-
-Certaines requêtes par leur implémentation nécessitent un ensemble de privilèges. Par exemple, pour effectuer la [RENAME](misc.md#misc_operations-rename) requête vous avez besoin des privilèges suivants: `SELECT`, `CREATE TABLE`, `INSERT` et `DROP TABLE`.
-
-### SELECT {#grant-select}
-
-Permet d'effectuer des [SELECT](select/index.md) requête.
-
-Le niveau de privilège: `COLUMN`.
-
-**Description**
-
-L'utilisateur accordé avec ce privilège peut effectuer `SELECT` requêtes sur une liste spécifiée de colonnes dans la table et la base de données spécifiées. Si l'utilisateur inclut d'autres colonnes, une requête ne renvoie aucune donnée.
-
-Considérez le privilège suivant:
-
-``` sql
-GRANT SELECT(x,y) ON db.table TO john
-```
-
-Ce privilège permet à `john` pour effectuer toute `SELECT` requête qui implique des données du `x` et/ou `y` les colonnes en `db.table`. Exemple, `SELECT x FROM db.table`. `john` ne pouvez pas effectuer de `SELECT z FROM db.table`. Le `SELECT * FROM db.table` aussi n'est pas disponible. En traitant cette requête, ClickHouse ne renvoie aucune donnée, même `x` et `y`. La seule exception est si une table contient uniquement `x` et `y` colonnes, dans ce cas ClickHouse renvoie toutes les données.
-
-### INSERT {#grant-insert}
-
-Permet d'effectuer des [INSERT](insert-into.md) requête.
-
-Le niveau de privilège: `COLUMN`.
-
-**Description**
-
-L'utilisateur accordé avec ce privilège peut effectuer `INSERT` requêtes sur une liste spécifiée de colonnes dans la table et la base de données spécifiées. Si l'utilisateur inclut d'autres colonnes, une requête n'insère aucune donnée.
-
-**Exemple**
-
-``` sql
-GRANT INSERT(x,y) ON db.table TO john
-```
-
-Le privilège accordé permet `john` pour insérer des données à l' `x` et/ou `y` les colonnes en `db.table`.
-
-### ALTER {#grant-alter}
-
-Permet d'effectuer des [ALTER](alter.md) requêtes correspondant à la hiérarchie de privilèges suivante:
-
--   `ALTER`. Niveau: `COLUMN`.
-    -   `ALTER TABLE`. Niveau: `GROUP`
-        -   `ALTER UPDATE`. Niveau: `COLUMN`. Alias: `UPDATE`
-        -   `ALTER DELETE`. Niveau: `COLUMN`. Alias: `DELETE`
-        -   `ALTER COLUMN`. Niveau: `GROUP`
-            -   `ALTER ADD COLUMN`. Niveau: `COLUMN`. Alias: `ADD COLUMN`
-            -   `ALTER DROP COLUMN`. Niveau: `COLUMN`. Alias: `DROP COLUMN`
-            -   `ALTER MODIFY COLUMN`. Niveau: `COLUMN`. Alias: `MODIFY COLUMN`
-            -   `ALTER COMMENT COLUMN`. Niveau: `COLUMN`. Alias: `COMMENT COLUMN`
-            -   `ALTER CLEAR COLUMN`. Niveau: `COLUMN`. Alias: `CLEAR COLUMN`
-            -   `ALTER RENAME COLUMN`. Niveau: `COLUMN`. Alias: `RENAME COLUMN`
-        -   `ALTER INDEX`. Niveau: `GROUP`. Alias: `INDEX`
-            -   `ALTER ORDER BY`. Niveau: `TABLE`. Alias: `ALTER MODIFY ORDER BY`, `MODIFY ORDER BY`
-            -   `ALTER ADD INDEX`. Niveau: `TABLE`. Alias: `ADD INDEX`
-            -   `ALTER DROP INDEX`. Niveau: `TABLE`. Alias: `DROP INDEX`
-            -   `ALTER MATERIALIZE INDEX`. Niveau: `TABLE`. Alias: `MATERIALIZE INDEX`
-            -   `ALTER CLEAR INDEX`. Niveau: `TABLE`. Alias: `CLEAR INDEX`
-        -   `ALTER CONSTRAINT`. Niveau: `GROUP`. Alias: `CONSTRAINT`
-            -   `ALTER ADD CONSTRAINT`. Niveau: `TABLE`. Alias: `ADD CONSTRAINT`
-            -   `ALTER DROP CONSTRAINT`. Niveau: `TABLE`. Alias: `DROP CONSTRAINT`
-        -   `ALTER TTL`. Niveau: `TABLE`. Alias: `ALTER MODIFY TTL`, `MODIFY TTL`
-        -   `ALTER MATERIALIZE TTL`. Niveau: `TABLE`. Alias: `MATERIALIZE TTL`
-        -   `ALTER SETTINGS`. Niveau: `TABLE`. Alias: `ALTER SETTING`, `ALTER MODIFY SETTING`, `MODIFY SETTING`
-        -   `ALTER MOVE PARTITION`. Niveau: `TABLE`. Alias: `ALTER MOVE PART`, `MOVE PARTITION`, `MOVE PART`
-        -   `ALTER FETCH PARTITION`. Niveau: `TABLE`. Alias: `FETCH PARTITION`
-        -   `ALTER FREEZE PARTITION`. Niveau: `TABLE`. Alias: `FREEZE PARTITION`
-    -   `ALTER VIEW` Niveau: `GROUP`
-        -   `ALTER VIEW REFRESH`. Niveau: `VIEW`. Alias: `ALTER LIVE VIEW REFRESH`, `REFRESH VIEW`
-        -   `ALTER VIEW MODIFY QUERY`. Niveau: `VIEW`. Alias: `ALTER TABLE MODIFY QUERY`
-
-Exemples de la façon dont cette hiérarchie est traitée:
-
--   Le `ALTER` privilège comprend tous les autres `ALTER*` privilège.
--   `ALTER CONSTRAINT` comprendre `ALTER ADD CONSTRAINT` et `ALTER DROP CONSTRAINT` privilège.
-
-**Note**
-
--   Le `MODIFY SETTING` privilège permet de modifier les paramètres du moteur de table. In n'affecte pas les paramètres ou les paramètres de configuration du serveur.
--   Le `ATTACH` opération a besoin de la [CREATE](#grant-create) privilège.
--   Le `DETACH` opération a besoin de la [DROP](#grant-drop) privilège.
--   Pour arrêter la mutation par le [KILL MUTATION](misc.md#kill-mutation) requête, vous devez avoir un privilège pour commencer cette mutation. Par exemple, si vous voulez arrêter l' `ALTER UPDATE` requête, vous avez besoin du `ALTER UPDATE`, `ALTER TABLE`, ou `ALTER` privilège.
-
-### CREATE {#grant-create}
-
-Permet d'effectuer des [CREATE](create.md) et [ATTACH](misc.md#attach) DDL-requêtes correspondant à la hiérarchie de privilèges suivante:
-
--   `CREATE`. Niveau: `GROUP`
-    -   `CREATE DATABASE`. Niveau: `DATABASE`
-    -   `CREATE TABLE`. Niveau: `TABLE`
-    -   `CREATE VIEW`. Niveau: `VIEW`
-    -   `CREATE DICTIONARY`. Niveau: `DICTIONARY`
-    -   `CREATE TEMPORARY TABLE`. Niveau: `GLOBAL`
-
-**Note**
-
--   Pour supprimer la table créée, l'utilisateur doit [DROP](#grant-drop).
-
-### DROP {#grant-drop}
-
-Permet d'effectuer des [DROP](misc.md#drop) et [DETACH](misc.md#detach) requêtes correspondant à la hiérarchie de privilèges suivante:
-
--   `DROP`. Niveau:
-    -   `DROP DATABASE`. Niveau: `DATABASE`
-    -   `DROP TABLE`. Niveau: `TABLE`
-    -   `DROP VIEW`. Niveau: `VIEW`
-    -   `DROP DICTIONARY`. Niveau: `DICTIONARY`
-
-### TRUNCATE {#grant-truncate}
-
-Permet d'effectuer des [TRUNCATE](misc.md#truncate-statement) requête.
-
-Le niveau de privilège: `TABLE`.
-
-### OPTIMIZE {#grant-optimize}
-
-Permet d'effectuer les [OPTIMIZE TABLE](misc.md#misc_operations-optimize) requête.
-
-Le niveau de privilège: `TABLE`.
-
-### SHOW {#grant-show}
-
-Permet d'effectuer des `SHOW`, `DESCRIBE`, `USE`, et `EXISTS` requêtes, correspondant à la hiérarchie suivante des privilèges:
-
--   `SHOW`. Niveau: `GROUP`
-    -   `SHOW DATABASES`. Niveau: `DATABASE`. Permet d'exécuter des `SHOW DATABASES`, `SHOW CREATE DATABASE`, `USE <database>` requête.
-    -   `SHOW TABLES`. Niveau: `TABLE`. Permet d'exécuter des `SHOW TABLES`, `EXISTS <table>`, `CHECK <table>` requête.
-    -   `SHOW COLUMNS`. Niveau: `COLUMN`. Permet d'exécuter des `SHOW CREATE TABLE`, `DESCRIBE` requête.
-    -   `SHOW DICTIONARIES`. Niveau: `DICTIONARY`. Permet d'exécuter des `SHOW DICTIONARIES`, `SHOW CREATE DICTIONARY`, `EXISTS <dictionary>` requête.
-
-**Note**
-
-Un utilisateur a le `SHOW` privilège s'il a un autre privilège concernant la table, le dictionnaire ou la base de données spécifiés.
-
-### KILL QUERY {#grant-kill-query}
-
-Permet d'effectuer les [KILL](misc.md#kill-query-statement) requêtes correspondant à la hiérarchie de privilèges suivante:
-
-Le niveau de privilège: `GLOBAL`.
-
-**Note**
-
-`KILL QUERY` privilège permet à un utilisateur de tuer les requêtes des autres utilisateurs.
-
-### ACCESS MANAGEMENT {#grant-access-management}
-
-Permet à un utilisateur d'effectuer des requêtes qui gèrent les utilisateurs, les rôles et les stratégies de ligne.
-
--   `ACCESS MANAGEMENT`. Niveau: `GROUP`
-    -   `CREATE USER`. Niveau: `GLOBAL`
-    -   `ALTER USER`. Niveau: `GLOBAL`
-    -   `DROP USER`. Niveau: `GLOBAL`
-    -   `CREATE ROLE`. Niveau: `GLOBAL`
-    -   `ALTER ROLE`. Niveau: `GLOBAL`
-    -   `DROP ROLE`. Niveau: `GLOBAL`
-    -   `ROLE ADMIN`. Niveau: `GLOBAL`
-    -   `CREATE ROW POLICY`. Niveau: `GLOBAL`. Alias: `CREATE POLICY`
-    -   `ALTER ROW POLICY`. Niveau: `GLOBAL`. Alias: `ALTER POLICY`
-    -   `DROP ROW POLICY`. Niveau: `GLOBAL`. Alias: `DROP POLICY`
-    -   `CREATE QUOTA`. Niveau: `GLOBAL`
-    -   `ALTER QUOTA`. Niveau: `GLOBAL`
-    -   `DROP QUOTA`. Niveau: `GLOBAL`
-    -   `CREATE SETTINGS PROFILE`. Niveau: `GLOBAL`. Alias: `CREATE PROFILE`
-    -   `ALTER SETTINGS PROFILE`. Niveau: `GLOBAL`. Alias: `ALTER PROFILE`
-    -   `DROP SETTINGS PROFILE`. Niveau: `GLOBAL`. Alias: `DROP PROFILE`
-    -   `SHOW ACCESS`. Niveau: `GROUP`
-        -   `SHOW_USERS`. Niveau: `GLOBAL`. Alias: `SHOW CREATE USER`
-        -   `SHOW_ROLES`. Niveau: `GLOBAL`. Alias: `SHOW CREATE ROLE`
-        -   `SHOW_ROW_POLICIES`. Niveau: `GLOBAL`. Alias: `SHOW POLICIES`, `SHOW CREATE ROW POLICY`, `SHOW CREATE POLICY`
-        -   `SHOW_QUOTAS`. Niveau: `GLOBAL`. Alias: `SHOW CREATE QUOTA`
-        -   `SHOW_SETTINGS_PROFILES`. Niveau: `GLOBAL`. Alias: `SHOW PROFILES`, `SHOW CREATE SETTINGS PROFILE`, `SHOW CREATE PROFILE`
-
-Le `ROLE ADMIN` le privilège permet à un utilisateur d'accorder et de révoquer tous les rôles, y compris ceux qui ne lui sont pas accordés avec l'option admin.
-
-### SYSTEM {#grant-system}
-
-Permet à un utilisateur d'effectuer la [SYSTEM](system.md) requêtes correspondant à la hiérarchie de privilèges suivante.
-
--   `SYSTEM`. Niveau: `GROUP`
-    -   `SYSTEM SHUTDOWN`. Niveau: `GLOBAL`. Alias: `SYSTEM KILL`, `SHUTDOWN`
-    -   `SYSTEM DROP CACHE`. Alias: `DROP CACHE`
-        -   `SYSTEM DROP DNS CACHE`. Niveau: `GLOBAL`. Alias: `SYSTEM DROP DNS`, `DROP DNS CACHE`, `DROP DNS`
-        -   `SYSTEM DROP MARK CACHE`. Niveau: `GLOBAL`. Alias: `SYSTEM DROP MARK`, `DROP MARK CACHE`, `DROP MARKS`
-        -   `SYSTEM DROP UNCOMPRESSED CACHE`. Niveau: `GLOBAL`. Alias: `SYSTEM DROP UNCOMPRESSED`, `DROP UNCOMPRESSED CACHE`, `DROP UNCOMPRESSED`
-    -   `SYSTEM RELOAD`. Niveau: `GROUP`
-        -   `SYSTEM RELOAD CONFIG`. Niveau: `GLOBAL`. Alias: `RELOAD CONFIG`
-        -   `SYSTEM RELOAD DICTIONARY`. Niveau: `GLOBAL`. Alias: `SYSTEM RELOAD DICTIONARIES`, `RELOAD DICTIONARY`, `RELOAD DICTIONARIES`
-        -   `SYSTEM RELOAD EMBEDDED DICTIONARIES`. Niveau: `GLOBAL`. Alias: R`ELOAD EMBEDDED DICTIONARIES`
-    -   `SYSTEM MERGES`. Niveau: `TABLE`. Alias: `SYSTEM STOP MERGES`, `SYSTEM START MERGES`, `STOP MERGES`, `START MERGES`
-    -   `SYSTEM TTL MERGES`. Niveau: `TABLE`. Alias: `SYSTEM STOP TTL MERGES`, `SYSTEM START TTL MERGES`, `STOP TTL MERGES`, `START TTL MERGES`
-    -   `SYSTEM FETCHES`. Niveau: `TABLE`. Alias: `SYSTEM STOP FETCHES`, `SYSTEM START FETCHES`, `STOP FETCHES`, `START FETCHES`
-    -   `SYSTEM MOVES`. Niveau: `TABLE`. Alias: `SYSTEM STOP MOVES`, `SYSTEM START MOVES`, `STOP MOVES`, `START MOVES`
-    -   `SYSTEM SENDS`. Niveau: `GROUP`. Alias: `SYSTEM STOP SENDS`, `SYSTEM START SENDS`, `STOP SENDS`, `START SENDS`
-        -   `SYSTEM DISTRIBUTED SENDS`. Niveau: `TABLE`. Alias: `SYSTEM STOP DISTRIBUTED SENDS`, `SYSTEM START DISTRIBUTED SENDS`, `STOP DISTRIBUTED SENDS`, `START DISTRIBUTED SENDS`
-        -   `SYSTEM REPLICATED SENDS`. Niveau: `TABLE`. Alias: `SYSTEM STOP REPLICATED SENDS`, `SYSTEM START REPLICATED SENDS`, `STOP REPLICATED SENDS`, `START REPLICATED SENDS`
-    -   `SYSTEM REPLICATION QUEUES`. Niveau: `TABLE`. Alias: `SYSTEM STOP REPLICATION QUEUES`, `SYSTEM START REPLICATION QUEUES`, `STOP REPLICATION QUEUES`, `START REPLICATION QUEUES`
-    -   `SYSTEM SYNC REPLICA`. Niveau: `TABLE`. Alias: `SYNC REPLICA`
-    -   `SYSTEM RESTART REPLICA`. Niveau: `TABLE`. Alias: `RESTART REPLICA`
-    -   `SYSTEM FLUSH`. Niveau: `GROUP`
-        -   `SYSTEM FLUSH DISTRIBUTED`. Niveau: `TABLE`. Alias: `FLUSH DISTRIBUTED`
-        -   `SYSTEM FLUSH LOGS`. Niveau: `GLOBAL`. Alias: `FLUSH LOGS`
-
-Le `SYSTEM RELOAD EMBEDDED DICTIONARIES` privilège implicitement accordé par le `SYSTEM RELOAD DICTIONARY ON *.*` privilège.
-
-### INTROSPECTION {#grant-introspection}
-
-Permet l'utilisation de [introspection](../../operations/optimizing-performance/sampling-query-profiler.md) fonction.
-
--   `INTROSPECTION`. Niveau: `GROUP`. Alias: `INTROSPECTION FUNCTIONS`
-    -   `addressToLine`. Niveau: `GLOBAL`
-    -   `addressToSymbol`. Niveau: `GLOBAL`
-    -   `demangle`. Niveau: `GLOBAL`
-
-### SOURCES {#grant-sources}
-
-Permet d'utiliser des sources de données externes. S'applique à [moteurs de table](../../engines/table-engines/index.md) et [les fonctions de table](../table-functions/index.md#table-functions).
-
--   `SOURCES`. Niveau: `GROUP`
-    -   `FILE`. Niveau: `GLOBAL`
-    -   `URL`. Niveau: `GLOBAL`
-    -   `REMOTE`. Niveau: `GLOBAL`
-    -   `YSQL`. Niveau: `GLOBAL`
-    -   `ODBC`. Niveau: `GLOBAL`
-    -   `JDBC`. Niveau: `GLOBAL`
-    -   `HDFS`. Niveau: `GLOBAL`
-    -   `S3`. Niveau: `GLOBAL`
-
-Le `SOURCES` privilège permet l'utilisation de toutes les sources. Vous pouvez également accorder un privilège pour chaque source individuellement. Pour utiliser les sources, vous avez besoin de privilèges supplémentaires.
-
-Exemple:
-
--   Pour créer une table avec [Moteur de table MySQL](../../engines/table-engines/integrations/mysql.md), vous avez besoin `CREATE TABLE (ON db.table_name)` et `MYSQL` privilège.
--   L'utilisation de la [fonction de table mysql](../table-functions/mysql.md), vous avez besoin `CREATE TEMPORARY TABLE` et `MYSQL` privilège.
-
-### dictGet {#grant-dictget}
-
--   `dictGet`. Alias: `dictHas`, `dictGetHierarchy`, `dictIsIn`
-
-Permet à un utilisateur d'exécuter [dictGet](../functions/ext-dict-functions.md#dictget), [dictHas](../functions/ext-dict-functions.md#dicthas), [dictGetHierarchy](../functions/ext-dict-functions.md#dictgethierarchy), [dictisine](../functions/ext-dict-functions.md#dictisin) fonction.
-
-Niveau de privilège: `DICTIONARY`.
-
-**Exemple**
-
--   `GRANT dictGet ON mydb.mydictionary TO john`
--   `GRANT dictGet ON mydictionary TO john`
-
-### ALL {#grant-all}
-
-Les subventions de tous les privilèges sur l'entité réglementée à un compte d'utilisateur ou un rôle.
-
-### NONE {#grant-none}
-
-N'accorde pas de privilèges.
-
-### ADMIN OPTION {#admin-option-privilege}
-
-Le `ADMIN OPTION` le privilège permet à un utilisateur d'accorder son rôle à un autre utilisateur.
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/grant/) <!--hide-->
diff --git a/docs/fr/sql-reference/statements/index.md b/docs/fr/sql-reference/statements/index.md
deleted file mode 100644
index f08d64cee39..00000000000
--- a/docs/fr/sql-reference/statements/index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: "D\xE9claration"
-toc_priority: 31
----
-
-
diff --git a/docs/fr/sql-reference/statements/insert-into.md b/docs/fr/sql-reference/statements/insert-into.md
deleted file mode 100644
index 987594bae65..00000000000
--- a/docs/fr/sql-reference/statements/insert-into.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 34
-toc_title: INSERT INTO
----
-
-## INSERT {#insert}
-
-L'ajout de données.
-
-Format de requête de base:
-
-``` sql
-INSERT INTO [db.]table [(c1, c2, c3)] VALUES (v11, v12, v13), (v21, v22, v23), ...
-```
-
-La requête peut spécifier une liste de colonnes à insérer `[(c1, c2, c3)]`. Dans ce cas, le reste des colonnes sont remplis avec:
-
--   Les valeurs calculées à partir `DEFAULT` expressions spécifiées dans la définition de la table.
--   Zéros et chaînes vides, si `DEFAULT` les expressions ne sont pas définies.
-
-Si [strict_insert_defaults=1](../../operations/settings/settings.md), les colonnes qui n'ont pas `DEFAULT` défini doit être répertorié dans la requête.
-
-Les données peuvent être transmises à L'INSERT dans n'importe quel [format](../../interfaces/formats.md#formats) soutenu par ClickHouse. Le format doit être spécifié explicitement dans la requête:
-
-``` sql
-INSERT INTO [db.]table [(c1, c2, c3)] FORMAT format_name data_set
-```
-
-For example, the following query format is identical to the basic version of INSERT … VALUES:
-
-``` sql
-INSERT INTO [db.]table [(c1, c2, c3)] FORMAT Values (v11, v12, v13), (v21, v22, v23), ...
-```
-
-ClickHouse supprime tous les espaces et un saut de ligne (s'il y en a un) avant les données. Lors de la formation d'une requête, nous recommandons de placer les données sur une nouvelle ligne après les opérateurs de requête (ceci est important si les données commencent par des espaces).
-
-Exemple:
-
-``` sql
-INSERT INTO t FORMAT TabSeparated
-11  Hello, world!
-22  Qwerty
-```
-
-Vous pouvez insérer des données séparément de la requête à l'aide du client de ligne de commande ou de L'interface HTTP. Pour plus d'informations, consultez la section “[Interface](../../interfaces/index.md#interfaces)”.
-
-### Contraintes {#constraints}
-
-Si la table a [contraintes](create.md#constraints), their expressions will be checked for each row of inserted data. If any of those constraints is not satisfied — server will raise an exception containing constraint name and expression, the query will be stopped.
-
-### Insertion des résultats de `SELECT` {#insert_query_insert-select}
-
-``` sql
-INSERT INTO [db.]table [(c1, c2, c3)] SELECT ...
-```
-
-Les colonnes sont mappées en fonction de leur position dans la clause SELECT. Cependant, leurs noms dans L'expression SELECT et la table pour INSERT peuvent différer. Si nécessaire, la coulée de type est effectuée.
-
-Aucun des formats de données à l'exception des Valeurs permettent de définir des valeurs d'expressions telles que `now()`, `1 + 2` et ainsi de suite. Le format des valeurs permet une utilisation limitée des expressions, mais ce n'est pas recommandé, car dans ce cas, un code inefficace est utilisé pour leur exécution.
-
-Les autres requêtes de modification des parties de données ne sont pas prises en charge: `UPDATE`, `DELETE`, `REPLACE`, `MERGE`, `UPSERT`, `INSERT UPDATE`.
-Cependant, vous pouvez supprimer les anciennes données en utilisant `ALTER TABLE ... DROP PARTITION`.
-
-`FORMAT` la clause doit être spécifié à la fin de la requête si `SELECT` la clause contient la fonction de table [entrée()](../table-functions/input.md).
-
-### Considérations De Performance {#performance-considerations}
-
-`INSERT` trie les données d'entrée par la clé primaire et les divise en partitions par une clé de partition. Si vous insérez des données dans plusieurs partitions à la fois, cela peut réduire considérablement les performances de l' `INSERT` requête. Pour éviter cela:
-
--   Ajoutez des données en lots assez importants, tels que 100 000 lignes à la fois.
--   Groupez les données par une clé de partition avant de les télécharger sur ClickHouse.
-
-Les performances ne diminueront pas si:
-
--   Les données sont ajoutées en temps réel.
--   Vous téléchargez des données qui sont généralement triées par heure.
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/insert_into/) <!--hide-->
diff --git a/docs/fr/sql-reference/statements/misc.md b/docs/fr/sql-reference/statements/misc.md
deleted file mode 100644
index 4631f856266..00000000000
--- a/docs/fr/sql-reference/statements/misc.md
+++ /dev/null
@@ -1,358 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 41
-toc_title: Autre
----
-
-# Diverses Requêtes {#miscellaneous-queries}
-
-## ATTACH {#attach}
-
-Cette requête est exactement la même que `CREATE`, mais
-
--   Au lieu de la parole `CREATE` il utilise le mot `ATTACH`.
--   La requête ne crée pas de données sur le disque, mais suppose que les données sont déjà aux endroits appropriés, et ajoute simplement des informations sur la table au serveur.
-    Après avoir exécuté une requête ATTACH, le serveur connaîtra l'existence de la table.
-
-Si la table a été précédemment détachée (`DETACH`), ce qui signifie que sa structure est connue, vous pouvez utiliser un raccourci sans définir la structure.
-
-``` sql
-ATTACH TABLE [IF NOT EXISTS] [db.]name [ON CLUSTER cluster]
-```
-
-Cette requête est utilisée lors du démarrage du serveur. Le serveur stocke les métadonnées de la table sous forme de fichiers avec `ATTACH` requêtes, qu'il exécute simplement au lancement (à l'exception des tables système, qui sont explicitement créées sur le serveur).
-
-## CHECK TABLE {#check-table}
-
-Vérifie si les données de la table sont corrompues.
-
-``` sql
-CHECK TABLE [db.]name
-```
-
-Le `CHECK TABLE` requête compare réelle des tailles de fichier avec les valeurs attendues qui sont stockés sur le serveur. Si le fichier tailles ne correspondent pas aux valeurs stockées, cela signifie que les données sont endommagées. Cela peut être causé, par exemple, par un plantage du système lors de l'exécution de la requête.
-
-La réponse de la requête contient `result` colonne avec une seule ligne. La ligne a une valeur de
-[Booléen](../../sql-reference/data-types/boolean.md) type:
-
--   0 - les données de la table sont corrompues.
--   1 - les données maintiennent l'intégrité.
-
-Le `CHECK TABLE` query prend en charge les moteurs de table suivants:
-
--   [Journal](../../engines/table-engines/log-family/log.md)
--   [TinyLog](../../engines/table-engines/log-family/tinylog.md)
--   [StripeLog](../../engines/table-engines/log-family/stripelog.md)
--   [Famille MergeTree](../../engines/table-engines/mergetree-family/mergetree.md)
-
-Effectué sur les tables avec un autre moteur de table provoque une exception.
-
-Les moteurs de la `*Log` la famille ne fournit pas de récupération automatique des données en cas d'échec. L'utilisation de la `CHECK TABLE` requête pour suivre la perte de données en temps opportun.
-
-Pour `MergeTree` moteurs de la famille, le `CHECK TABLE` query affiche un État de vérification pour chaque partie de données individuelle d'une table sur le serveur local.
-
-**Si les données sont corrompues**
-
-Si la table est corrompue, vous pouvez copier les données non corrompues dans une autre table. Pour ce faire:
-
-1.  Créez une nouvelle table avec la même structure que la table endommagée. Pour ce faire exécutez la requête `CREATE TABLE <new_table_name> AS <damaged_table_name>`.
-2.  Définir le [max_threads](../../operations/settings/settings.md#settings-max_threads) la valeur 1 pour traiter la requête suivante dans un seul thread. Pour ce faire, exécutez la requête `SET max_threads = 1`.
-3.  Exécuter la requête `INSERT INTO <new_table_name> SELECT * FROM <damaged_table_name>`. Cette demande copie les données non corrompues de la table endommagée vers une autre table. Seules les données avant la partie corrompue seront copiées.
-4.  Redémarrez l' `clickhouse-client` pour réinitialiser l' `max_threads` valeur.
-
-## DESCRIBE TABLE {#misc-describe-table}
-
-``` sql
-DESC|DESCRIBE TABLE [db.]table [INTO OUTFILE filename] [FORMAT format]
-```
-
-Renvoie ce qui suit `String` les colonnes de type:
-
--   `name` — Column name.
--   `type`— Column type.
--   `default_type` — Clause that is used in [expression par défaut](create.md#create-default-values) (`DEFAULT`, `MATERIALIZED` ou `ALIAS`). Column contient une chaîne vide, si l'expression par défaut n'est pas spécifiée.
--   `default_expression` — Value specified in the `DEFAULT` clause.
--   `comment_expression` — Comment text.
-
-Les structures de données imbriquées sont sorties dans “expanded” format. Chaque colonne est affichée séparément, avec le nom après un point.
-
-## DETACH {#detach}
-
-Supprime les informations sur le ‘name’ table du serveur. Le serveur cesse de connaître l'existence de la table.
-
-``` sql
-DETACH TABLE [IF EXISTS] [db.]name [ON CLUSTER cluster]
-```
-
-Cela ne supprime pas les données ou les métadonnées de la table. Lors du prochain lancement du serveur, le serveur Lira les métadonnées et découvrira à nouveau la table.
-De même, un “detached” tableau peut être re-attaché en utilisant le `ATTACH` requête (à l'exception des tables système, qui n'ont pas de stocker les métadonnées pour eux).
-
-Il n'y a pas de `DETACH DATABASE` requête.
-
-## DROP {#drop}
-
-Cette requête a deux types: `DROP DATABASE` et `DROP TABLE`.
-
-``` sql
-DROP DATABASE [IF EXISTS] db [ON CLUSTER cluster]
-```
-
-Supprime toutes les tables à l'intérieur de la ‘db’ la base de données, puis supprime le ‘db’ la base de données elle-même.
-Si `IF EXISTS` est spécifié, il ne renvoie pas d'erreur si la base de données n'existe pas.
-
-``` sql
-DROP [TEMPORARY] TABLE [IF EXISTS] [db.]name [ON CLUSTER cluster]
-```
-
-Supprime la table.
-Si `IF EXISTS` est spécifié, il ne renvoie pas d'erreur si la table n'existe pas ou si la base de données n'existe pas.
-
-    DROP DICTIONARY [IF EXISTS] [db.]name
-
-Delets le dictionnaire.
-Si `IF EXISTS` est spécifié, il ne renvoie pas d'erreur si la table n'existe pas ou si la base de données n'existe pas.
-
-## DROP USER {#drop-user-statement}
-
-Supprime un utilisateur.
-
-### Syntaxe {#drop-user-syntax}
-
-``` sql
-DROP USER [IF EXISTS] name [,...] [ON CLUSTER cluster_name]
-```
-
-## DROP ROLE {#drop-role-statement}
-
-Supprime un rôle.
-
-Le rôle supprimé est révoqué de toutes les entités où il a été accordé.
-
-### Syntaxe {#drop-role-syntax}
-
-``` sql
-DROP ROLE [IF EXISTS] name [,...] [ON CLUSTER cluster_name]
-```
-
-## DROP ROW POLICY {#drop-row-policy-statement}
-
-Supprime une stratégie de ligne.
-
-La stratégie de ligne supprimée est révoquée de toutes les entités sur lesquelles elle a été affectée.
-
-### Syntaxe {#drop-row-policy-syntax}
-
-``` sql
-DROP [ROW] POLICY [IF EXISTS] name [,...] ON [database.]table [,...] [ON CLUSTER cluster_name]
-```
-
-## DROP QUOTA {#drop-quota-statement}
-
-Supprime un quota.
-
-Le quota supprimé est révoqué de toutes les entités où il a été affecté.
-
-### Syntaxe {#drop-quota-syntax}
-
-``` sql
-DROP QUOTA [IF EXISTS] name [,...] [ON CLUSTER cluster_name]
-```
-
-## DROP SETTINGS PROFILE {#drop-settings-profile-statement}
-
-Supprime un quota.
-
-Le quota supprimé est révoqué de toutes les entités où il a été affecté.
-
-### Syntaxe {#drop-settings-profile-syntax}
-
-``` sql
-DROP [SETTINGS] PROFILE [IF EXISTS] name [,...] [ON CLUSTER cluster_name]
-```
-
-## EXISTS {#exists-statement}
-
-``` sql
-EXISTS [TEMPORARY] [TABLE|DICTIONARY] [db.]name [INTO OUTFILE filename] [FORMAT format]
-```
-
-Renvoie un seul `UInt8`- type colonne, qui contient la valeur unique `0` si la table ou base de données n'existe pas, ou `1` si la table existe dans la base de données spécifiée.
-
-## KILL QUERY {#kill-query-statement}
-
-``` sql
-KILL QUERY [ON CLUSTER cluster]
-  WHERE <where expression to SELECT FROM system.processes query>
-  [SYNC|ASYNC|TEST]
-  [FORMAT format]
-```
-
-Tente de mettre fin de force aux requêtes en cours d'exécution.
-Les requêtes à terminer sont sélectionnées dans le système.processus en utilisant les critères définis dans le `WHERE` la clause de la `KILL` requête.
-
-Exemple:
-
-``` sql
--- Forcibly terminates all queries with the specified query_id:
-KILL QUERY WHERE query_id='2-857d-4a57-9ee0-327da5d60a90'
-
--- Synchronously terminates all queries run by 'username':
-KILL QUERY WHERE user='username' SYNC
-```
-
-Les utilisateurs en lecture seule peuvent uniquement arrêter leurs propres requêtes.
-
-Par défaut, la version asynchrone des requêtes est utilisé (`ASYNC`), qui n'attend pas la confirmation que les requêtes se sont arrêtées.
-
-La version synchrone (`SYNC`) attend que toutes les requêtes d'arrêter et affiche des informations sur chaque processus s'arrête.
-La réponse contient l' `kill_status` la colonne, qui peut prendre les valeurs suivantes:
-
-1.  ‘finished’ – The query was terminated successfully.
-2.  ‘waiting’ – Waiting for the query to end after sending it a signal to terminate.
-3.  The other values ​​explain why the query can't be stopped.
-
-Une requête de test (`TEST`) vérifie uniquement les droits de l'utilisateur et affiche une liste de requêtes à arrêter.
-
-## KILL MUTATION {#kill-mutation}
-
-``` sql
-KILL MUTATION [ON CLUSTER cluster]
-  WHERE <where expression to SELECT FROM system.mutations query>
-  [TEST]
-  [FORMAT format]
-```
-
-Essaie d'annuler et supprimer [mutation](alter.md#alter-mutations) actuellement en cours d'exécution. Les Mutations à annuler sont sélectionnées parmi [`system.mutations`](../../operations/system-tables.md#system_tables-mutations) tableau à l'aide du filtre spécifié par le `WHERE` la clause de la `KILL` requête.
-
-Une requête de test (`TEST`) vérifie uniquement les droits de l'utilisateur et affiche une liste de requêtes à arrêter.
-
-Exemple:
-
-``` sql
--- Cancel and remove all mutations of the single table:
-KILL MUTATION WHERE database = 'default' AND table = 'table'
-
--- Cancel the specific mutation:
-KILL MUTATION WHERE database = 'default' AND table = 'table' AND mutation_id = 'mutation_3.txt'
-```
-
-The query is useful when a mutation is stuck and cannot finish (e.g. if some function in the mutation query throws an exception when applied to the data contained in the table).
-
-Les modifications déjà apportées par la mutation ne sont pas annulées.
-
-## OPTIMIZE {#misc_operations-optimize}
-
-``` sql
-OPTIMIZE TABLE [db.]name [ON CLUSTER cluster] [PARTITION partition | PARTITION ID 'partition_id'] [FINAL] [DEDUPLICATE]
-```
-
-Cette requête tente d'initialiser une fusion non programmée de parties de données pour les tables avec un moteur de [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md) famille.
-
-Le `OPTMIZE` la requête est également prise en charge pour [MaterializedView](../../engines/table-engines/special/materializedview.md) et la [Tampon](../../engines/table-engines/special/buffer.md) moteur. Les autres moteurs de table ne sont pas pris en charge.
-
-Lorsque `OPTIMIZE` est utilisé avec le [ReplicatedMergeTree](../../engines/table-engines/mergetree-family/replication.md) famille de moteurs de table, ClickHouse crée une tâche pour la fusion et attend l'exécution sur tous les nœuds (si le `replication_alter_partitions_sync` paramètre est activé).
-
--   Si `OPTIMIZE` n'effectue pas de fusion pour une raison quelconque, il ne notifie pas le client. Pour activer les notifications, utilisez [optimize_throw_if_noop](../../operations/settings/settings.md#setting-optimize_throw_if_noop) paramètre.
--   Si vous spécifiez un `PARTITION`, seule la partition spécifiée est optimisé. [Comment définir l'expression de la partition](alter.md#alter-how-to-specify-part-expr).
--   Si vous spécifiez `FINAL`, l'optimisation est effectuée, même lorsque toutes les données sont déjà dans une partie.
--   Si vous spécifiez `DEDUPLICATE`, alors des lignes complètement identiques seront dédupliquées (toutes les colonnes sont comparées), cela n'a de sens que pour le moteur MergeTree.
-
-!!! warning "Avertissement"
-    `OPTIMIZE` ne peut pas réparer le “Too many parts” erreur.
-
-## RENAME {#misc_operations-rename}
-
-Renomme une ou plusieurs tables.
-
-``` sql
-RENAME TABLE [db11.]name11 TO [db12.]name12, [db21.]name21 TO [db22.]name22, ... [ON CLUSTER cluster]
-```
-
-Toutes les tables sont renommées sous verrouillage global. Renommer des tables est une opération légère. Si vous avez indiqué une autre base de données après TO, la table sera déplacée vers cette base de données. Cependant, les répertoires contenant des bases de données doivent résider dans le même système de fichiers (sinon, une erreur est renvoyée).
-
-## SET {#query-set}
-
-``` sql
-SET param = value
-```
-
-Assigner `value` à l' `param` [paramètre](../../operations/settings/index.md) pour la session en cours. Vous ne pouvez pas modifier [les paramètres du serveur](../../operations/server-configuration-parameters/index.md) de cette façon.
-
-Vous pouvez également définir toutes les valeurs de certains paramètres de profil dans une seule requête.
-
-``` sql
-SET profile = 'profile-name-from-the-settings-file'
-```
-
-Pour plus d'informations, voir [Paramètre](../../operations/settings/settings.md).
-
-## SET ROLE {#set-role-statement}
-
-Active les rôles pour l'utilisateur actuel.
-
-### Syntaxe {#set-role-syntax}
-
-``` sql
-SET ROLE {DEFAULT | NONE | role [,...] | ALL | ALL EXCEPT role [,...]}
-```
-
-## SET DEFAULT ROLE {#set-default-role-statement}
-
-Définit les rôles par défaut à un utilisateur.
-
-Les rôles par défaut sont automatiquement activés lors de la connexion de l'utilisateur. Vous pouvez définir par défaut uniquement les rôles précédemment accordés. Si le rôle n'est pas accordé à un utilisateur, ClickHouse lève une exception.
-
-### Syntaxe {#set-default-role-syntax}
-
-``` sql
-SET DEFAULT ROLE {NONE | role [,...] | ALL | ALL EXCEPT role [,...]} TO {user|CURRENT_USER} [,...]
-```
-
-### Exemple {#set-default-role-examples}
-
-Définir plusieurs rôles par défaut à un utilisateur:
-
-``` sql
-SET DEFAULT ROLE role1, role2, ... TO user
-```
-
-Définissez tous les rôles accordés par défaut sur un utilisateur:
-
-``` sql
-SET DEFAULT ROLE ALL TO user
-```
-
-Purger les rôles par défaut d'un utilisateur:
-
-``` sql
-SET DEFAULT ROLE NONE TO user
-```
-
-Définissez tous les rôles accordés par défaut à l'exception de certains d'entre eux:
-
-``` sql
-SET DEFAULT ROLE ALL EXCEPT role1, role2 TO user
-```
-
-## TRUNCATE {#truncate-statement}
-
-``` sql
-TRUNCATE TABLE [IF EXISTS] [db.]name [ON CLUSTER cluster]
-```
-
-Supprime toutes les données d'une table. Lorsque la clause `IF EXISTS` est omis, la requête renvoie une erreur si la table n'existe pas.
-
-Le `TRUNCATE` la requête n'est pas prise en charge pour [Vue](../../engines/table-engines/special/view.md), [Fichier](../../engines/table-engines/special/file.md), [URL](../../engines/table-engines/special/url.md) et [NULL](../../engines/table-engines/special/null.md) table des moteurs.
-
-## USE {#use}
-
-``` sql
-USE db
-```
-
-Vous permet de définir la base de données actuelle pour la session.
-La base de données actuelle est utilisée pour rechercher des tables si la base de données n'est pas explicitement définie dans la requête avec un point avant le nom de la table.
-Cette requête ne peut pas être faite lors de l'utilisation du protocole HTTP, car il n'y a pas de concept de session.
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/misc/) <!--hide-->
diff --git a/docs/fr/sql-reference/statements/revoke.md b/docs/fr/sql-reference/statements/revoke.md
deleted file mode 100644
index 6137cc30f8c..00000000000
--- a/docs/fr/sql-reference/statements/revoke.md
+++ /dev/null
@@ -1,50 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 40
-toc_title: REVOKE
----
-
-# REVOKE {#revoke}
-
-Révoque les privilèges des utilisateurs ou rôles.
-
-## Syntaxe {#revoke-syntax}
-
-**Révocation des privilèges des utilisateurs**
-
-``` sql
-REVOKE [ON CLUSTER cluster_name] privilege[(column_name [,...])] [,...] ON {db.table|db.*|*.*|table|*} FROM {user | CURRENT_USER} [,...] | ALL | ALL EXCEPT {user | CURRENT_USER} [,...]
-```
-
-**Révocation des rôles des utilisateurs**
-
-``` sql
-REVOKE [ON CLUSTER cluster_name] [ADMIN OPTION FOR] role [,...] FROM {user | role | CURRENT_USER} [,...] | ALL | ALL EXCEPT {user_name | role_name | CURRENT_USER} [,...]
-```
-
-## Description {#revoke-description}
-
-Pour révoquer certains privilèges, vous pouvez utiliser un privilège de portée plus large que vous envisagez de révoquer. Par exemple, si un utilisateur a la `SELECT (x,y)` privilège, administrateur peut effectuer `REVOKE SELECT(x,y) ...`, ou `REVOKE SELECT * ...` ou même `REVOKE ALL PRIVILEGES ...` requête de révoquer ce privilège.
-
-### Révocations Partielles {#partial-revokes-dscr}
-
-Vous pouvez révoquer une partie d'un privilège. Par exemple, si un utilisateur a la `SELECT *.*` Privilège vous pouvez révoquer un privilège pour lire les données d'une table ou d'une base de données.
-
-## Exemple {#revoke-example}
-
-Subvention de l' `john` compte utilisateur avec le privilège de sélectionner parmi toutes les bases de données `accounts` un:
-
-``` sql
-GRANT SELECT ON *.* TO john;
-REVOKE SELECT ON accounts.* FROM john;
-```
-
-Subvention de l' `mira` compte utilisateur avec le privilège de sélectionner parmi toutes les colonnes `accounts.staff` tableau à l'exception de la `wage` un.
-
-``` sql
-GRANT SELECT ON accounts.staff TO mira;
-REVOKE SELECT(wage) ON accounts.staff FROM mira;
-```
-
-{## [Article Original](https://clickhouse.tech/docs/en/operations/settings/settings/) ##}
diff --git a/docs/fr/sql-reference/statements/select/array-join.md b/docs/fr/sql-reference/statements/select/array-join.md
deleted file mode 100644
index 07b27d5d16c..00000000000
--- a/docs/fr/sql-reference/statements/select/array-join.md
+++ /dev/null
@@ -1,282 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
----
-
-# Clause de jointure de tableau {#select-array-join-clause}
-
-C'est une opération courante pour les tables qui contiennent une colonne de tableau pour produire une nouvelle table qui a une colonne avec chaque élément de tableau individuel de cette colonne initiale, tandis que les valeurs des autres colonnes sont dupliquées. C'est le cas de fond de ce `ARRAY JOIN` la clause le fait.
-
-Son nom vient du fait qu'il peut être regardé comme l'exécution de `JOIN` avec un tableau ou une structure de données imbriquée. L'intention est similaire à la [arrayJoin](../../functions/array-join.md#functions_arrayjoin) fonction, mais la fonctionnalité de la clause est plus large.
-
-Syntaxe:
-
-``` sql
-SELECT <expr_list>
-FROM <left_subquery>
-[LEFT] ARRAY JOIN <array>
-[WHERE|PREWHERE <expr>]
-...
-```
-
-Vous ne pouvez en spécifier qu'un `ARRAY JOIN` la clause dans un `SELECT` requête.
-
-Types pris en charge de `ARRAY JOIN` sont énumérés ci-dessous:
-
--   `ARRAY JOIN` - Dans le cas de base, les tableaux vides ne sont pas inclus dans le résultat de `JOIN`.
--   `LEFT ARRAY JOIN` - Le résultat de `JOIN` contient des lignes avec des tableaux vides. La valeur d'un tableau vide est définie sur la valeur par défaut pour le type d'élément de tableau (généralement 0, chaîne vide ou NULL).
-
-## Exemples de jointure de tableau de base {#basic-array-join-examples}
-
-Les exemples ci-dessous illustrent l'utilisation de la `ARRAY JOIN` et `LEFT ARRAY JOIN` clause. Créons une table avec un [Tableau](../../../sql-reference/data-types/array.md) tapez colonne et insérez des valeurs dedans:
-
-``` sql
-CREATE TABLE arrays_test
-(
-    s String,
-    arr Array(UInt8)
-) ENGINE = Memory;
-
-INSERT INTO arrays_test
-VALUES ('Hello', [1,2]), ('World', [3,4,5]), ('Goodbye', []);
-```
-
-``` text
-┌─s───────────┬─arr─────┐
-│ Hello       │ [1,2]   │
-│ World       │ [3,4,5] │
-│ Goodbye     │ []      │
-└─────────────┴─────────┘
-```
-
-L'exemple ci-dessous utilise la `ARRAY JOIN` clause:
-
-``` sql
-SELECT s, arr
-FROM arrays_test
-ARRAY JOIN arr;
-```
-
-``` text
-┌─s─────┬─arr─┐
-│ Hello │   1 │
-│ Hello │   2 │
-│ World │   3 │
-│ World │   4 │
-│ World │   5 │
-└───────┴─────┘
-```
-
-L'exemple suivant utilise l' `LEFT ARRAY JOIN` clause:
-
-``` sql
-SELECT s, arr
-FROM arrays_test
-LEFT ARRAY JOIN arr;
-```
-
-``` text
-┌─s───────────┬─arr─┐
-│ Hello       │   1 │
-│ Hello       │   2 │
-│ World       │   3 │
-│ World       │   4 │
-│ World       │   5 │
-│ Goodbye     │   0 │
-└─────────────┴─────┘
-```
-
-## À L'Aide D'Alias {#using-aliases}
-
-Un alias peut être spécifié pour un tableau `ARRAY JOIN` clause. Dans ce cas, un élément de tableau peut être consulté par ce pseudonyme, mais le tableau lui-même est accessible par le nom d'origine. Exemple:
-
-``` sql
-SELECT s, arr, a
-FROM arrays_test
-ARRAY JOIN arr AS a;
-```
-
-``` text
-┌─s─────┬─arr─────┬─a─┐
-│ Hello │ [1,2]   │ 1 │
-│ Hello │ [1,2]   │ 2 │
-│ World │ [3,4,5] │ 3 │
-│ World │ [3,4,5] │ 4 │
-│ World │ [3,4,5] │ 5 │
-└───────┴─────────┴───┘
-```
-
-En utilisant des alias, vous pouvez effectuer `ARRAY JOIN` avec un groupe externe. Exemple:
-
-``` sql
-SELECT s, arr_external
-FROM arrays_test
-ARRAY JOIN [1, 2, 3] AS arr_external;
-```
-
-``` text
-┌─s───────────┬─arr_external─┐
-│ Hello       │            1 │
-│ Hello       │            2 │
-│ Hello       │            3 │
-│ World       │            1 │
-│ World       │            2 │
-│ World       │            3 │
-│ Goodbye     │            1 │
-│ Goodbye     │            2 │
-│ Goodbye     │            3 │
-└─────────────┴──────────────┘
-```
-
-Plusieurs tableaux peuvent être séparés par des virgules `ARRAY JOIN` clause. Dans ce cas, `JOIN` est effectuée avec eux simultanément (la somme directe, pas le produit cartésien). Notez que tous les tableaux doivent avoir la même taille. Exemple:
-
-``` sql
-SELECT s, arr, a, num, mapped
-FROM arrays_test
-ARRAY JOIN arr AS a, arrayEnumerate(arr) AS num, arrayMap(x -> x + 1, arr) AS mapped;
-```
-
-``` text
-┌─s─────┬─arr─────┬─a─┬─num─┬─mapped─┐
-│ Hello │ [1,2]   │ 1 │   1 │      2 │
-│ Hello │ [1,2]   │ 2 │   2 │      3 │
-│ World │ [3,4,5] │ 3 │   1 │      4 │
-│ World │ [3,4,5] │ 4 │   2 │      5 │
-│ World │ [3,4,5] │ 5 │   3 │      6 │
-└───────┴─────────┴───┴─────┴────────┘
-```
-
-L'exemple ci-dessous utilise la [arrayEnumerate](../../../sql-reference/functions/array-functions.md#array_functions-arrayenumerate) fonction:
-
-``` sql
-SELECT s, arr, a, num, arrayEnumerate(arr)
-FROM arrays_test
-ARRAY JOIN arr AS a, arrayEnumerate(arr) AS num;
-```
-
-``` text
-┌─s─────┬─arr─────┬─a─┬─num─┬─arrayEnumerate(arr)─┐
-│ Hello │ [1,2]   │ 1 │   1 │ [1,2]               │
-│ Hello │ [1,2]   │ 2 │   2 │ [1,2]               │
-│ World │ [3,4,5] │ 3 │   1 │ [1,2,3]             │
-│ World │ [3,4,5] │ 4 │   2 │ [1,2,3]             │
-│ World │ [3,4,5] │ 5 │   3 │ [1,2,3]             │
-└───────┴─────────┴───┴─────┴─────────────────────┘
-```
-
-## Jointure de tableau avec la Structure de données imbriquée {#array-join-with-nested-data-structure}
-
-`ARRAY JOIN` fonctionne également avec [structures de données imbriquées](../../../sql-reference/data-types/nested-data-structures/nested.md):
-
-``` sql
-CREATE TABLE nested_test
-(
-    s String,
-    nest Nested(
-    x UInt8,
-    y UInt32)
-) ENGINE = Memory;
-
-INSERT INTO nested_test
-VALUES ('Hello', [1,2], [10,20]), ('World', [3,4,5], [30,40,50]), ('Goodbye', [], []);
-```
-
-``` text
-┌─s───────┬─nest.x──┬─nest.y─────┐
-│ Hello   │ [1,2]   │ [10,20]    │
-│ World   │ [3,4,5] │ [30,40,50] │
-│ Goodbye │ []      │ []         │
-└─────────┴─────────┴────────────┘
-```
-
-``` sql
-SELECT s, `nest.x`, `nest.y`
-FROM nested_test
-ARRAY JOIN nest;
-```
-
-``` text
-┌─s─────┬─nest.x─┬─nest.y─┐
-│ Hello │      1 │     10 │
-│ Hello │      2 │     20 │
-│ World │      3 │     30 │
-│ World │      4 │     40 │
-│ World │      5 │     50 │
-└───────┴────────┴────────┘
-```
-
-Lorsque vous spécifiez des noms de structures de données imbriquées dans `ARRAY JOIN` le sens est le même que `ARRAY JOIN` avec tous les éléments du tableau qui la compose. Des exemples sont énumérés ci-dessous:
-
-``` sql
-SELECT s, `nest.x`, `nest.y`
-FROM nested_test
-ARRAY JOIN `nest.x`, `nest.y`;
-```
-
-``` text
-┌─s─────┬─nest.x─┬─nest.y─┐
-│ Hello │      1 │     10 │
-│ Hello │      2 │     20 │
-│ World │      3 │     30 │
-│ World │      4 │     40 │
-│ World │      5 │     50 │
-└───────┴────────┴────────┘
-```
-
-Cette variation a également du sens:
-
-``` sql
-SELECT s, `nest.x`, `nest.y`
-FROM nested_test
-ARRAY JOIN `nest.x`;
-```
-
-``` text
-┌─s─────┬─nest.x─┬─nest.y─────┐
-│ Hello │      1 │ [10,20]    │
-│ Hello │      2 │ [10,20]    │
-│ World │      3 │ [30,40,50] │
-│ World │      4 │ [30,40,50] │
-│ World │      5 │ [30,40,50] │
-└───────┴────────┴────────────┘
-```
-
-Un alias peut être utilisé pour une structure de données imbriquée, afin de sélectionner `JOIN` le résultat ou le tableau source. Exemple:
-
-``` sql
-SELECT s, `n.x`, `n.y`, `nest.x`, `nest.y`
-FROM nested_test
-ARRAY JOIN nest AS n;
-```
-
-``` text
-┌─s─────┬─n.x─┬─n.y─┬─nest.x──┬─nest.y─────┐
-│ Hello │   1 │  10 │ [1,2]   │ [10,20]    │
-│ Hello │   2 │  20 │ [1,2]   │ [10,20]    │
-│ World │   3 │  30 │ [3,4,5] │ [30,40,50] │
-│ World │   4 │  40 │ [3,4,5] │ [30,40,50] │
-│ World │   5 │  50 │ [3,4,5] │ [30,40,50] │
-└───────┴─────┴─────┴─────────┴────────────┘
-```
-
-Exemple d'utilisation de l' [arrayEnumerate](../../../sql-reference/functions/array-functions.md#array_functions-arrayenumerate) fonction:
-
-``` sql
-SELECT s, `n.x`, `n.y`, `nest.x`, `nest.y`, num
-FROM nested_test
-ARRAY JOIN nest AS n, arrayEnumerate(`nest.x`) AS num;
-```
-
-``` text
-┌─s─────┬─n.x─┬─n.y─┬─nest.x──┬─nest.y─────┬─num─┐
-│ Hello │   1 │  10 │ [1,2]   │ [10,20]    │   1 │
-│ Hello │   2 │  20 │ [1,2]   │ [10,20]    │   2 │
-│ World │   3 │  30 │ [3,4,5] │ [30,40,50] │   1 │
-│ World │   4 │  40 │ [3,4,5] │ [30,40,50] │   2 │
-│ World │   5 │  50 │ [3,4,5] │ [30,40,50] │   3 │
-└───────┴─────┴─────┴─────────┴────────────┴─────┘
-```
-
-## Détails De Mise En Œuvre {#implementation-details}
-
-L'ordre d'exécution de la requête est optimisé lors de l'exécution `ARRAY JOIN`. Bien `ARRAY JOIN` doit toujours être spécifié avant l' [WHERE](where.md)/[PREWHERE](prewhere.md) dans une requête, techniquement, ils peuvent être exécutés dans n'importe quel ordre, sauf résultat de `ARRAY JOIN` est utilisé pour le filtrage. L'ordre de traitement est contrôlée par l'optimiseur de requête.
diff --git a/docs/fr/sql-reference/statements/select/distinct.md b/docs/fr/sql-reference/statements/select/distinct.md
deleted file mode 100644
index 94552018c98..00000000000
--- a/docs/fr/sql-reference/statements/select/distinct.md
+++ /dev/null
@@ -1,63 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
----
-
-# La Clause DISTINCT {#select-distinct}
-
-Si `SELECT DISTINCT` est spécifié, seules les lignes uniques restera un résultat de requête. Ainsi, une seule ligne restera hors de tous les ensembles de lignes entièrement correspondantes dans le résultat.
-
-## Le Traitement Null {#null-processing}
-
-`DISTINCT` fonctionne avec [NULL](../../syntax.md#null-literal) comme si `NULL` ont une valeur spécifique, et `NULL==NULL`. En d'autres termes, dans le `DISTINCT` résultats, différentes combinaisons avec `NULL` une fois seulement. Elle diffère de `NULL` traitement dans la plupart des autres contextes.
-
-## Alternative {#alternatives}
-
-Il est possible d'obtenir le même résultat en appliquant [GROUP BY](group-by.md) sur le même ensemble de valeurs, comme spécifié comme `SELECT` clause, sans utiliser de fonctions d'agrégation. Mais il y a peu de différences de `GROUP BY` approche:
-
--   `DISTINCT` peut être utilisé avec d' `GROUP BY`.
--   Lorsque [ORDER BY](order-by.md) est omis et [LIMIT](limit.md) est définie, la requête s'arrête immédiatement après le nombre de lignes différentes, a été lu.
--   Les blocs de données sont produits au fur et à mesure qu'ils sont traités, sans attendre que la requête entière se termine.
-
-## Limitation {#limitations}
-
-`DISTINCT` n'est pas pris en charge si `SELECT` a au moins une colonne de tableau.
-
-## Exemple {#examples}
-
-Clickhouse prend en charge l'utilisation du `DISTINCT` et `ORDER BY` clauses pour différentes colonnes dans une requête. Le `DISTINCT` la clause est exécutée avant la `ORDER BY` clause.
-
-Exemple de table:
-
-``` text
-┌─a─┬─b─┐
-│ 2 │ 1 │
-│ 1 │ 2 │
-│ 3 │ 3 │
-│ 2 │ 4 │
-└───┴───┘
-```
-
-Lors de la sélection de données avec le `SELECT DISTINCT a FROM t1 ORDER BY b ASC` requête, nous obtenons le résultat suivant:
-
-``` text
-┌─a─┐
-│ 2 │
-│ 1 │
-│ 3 │
-└───┘
-```
-
-Si nous changeons la direction de tri `SELECT DISTINCT a FROM t1 ORDER BY b DESC`, nous obtenons le résultat suivant:
-
-``` text
-┌─a─┐
-│ 3 │
-│ 1 │
-│ 2 │
-└───┘
-```
-
-Rangée `2, 4` a été coupé avant de les trier.
-
-Prenez en compte cette spécificité d'implémentation lors de la programmation des requêtes.
diff --git a/docs/fr/sql-reference/statements/select/format.md b/docs/fr/sql-reference/statements/select/format.md
deleted file mode 100644
index a88bb7831ba..00000000000
--- a/docs/fr/sql-reference/statements/select/format.md
+++ /dev/null
@@ -1,18 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
----
-
-# FORMAT de la Clause {#format-clause}
-
-Clickhouse prend en charge une large gamme de [formats de sérialisation](../../../interfaces/formats.md) qui peut être utilisé sur les résultats de la requête entre autres choses. Il existe plusieurs façons de choisir un format pour `SELECT` de sortie, l'un d'eux est de spécifier `FORMAT format` à la fin de la requête pour obtenir les données résultantes dans tout format spécifique.
-
-Un format spécifique peut être utilisé pour des raisons de commodité, d'intégration avec d'autres systèmes ou d'amélioration des performances.
-
-## Format Par Défaut {#default-format}
-
-Si l' `FORMAT` la clause est omise, le format par défaut est utilisé, ce qui dépend à la fois des paramètres et de l'interface utilisée pour accéder au serveur ClickHouse. Pour l' [Interface HTTP](../../../interfaces/http.md) et la [client de ligne de commande](../../../interfaces/cli.md) en mode batch, le format par défaut est `TabSeparated`. Pour le client de ligne de commande en mode interactif, le format par défaut est `PrettyCompact` (il produit des tables compactes lisibles par l'homme).
-
-## Détails De Mise En Œuvre {#implementation-details}
-
-Lors de l'utilisation du client de ligne de commande, les données sont toujours transmises sur le réseau dans un format efficace interne (`Native`). Le client interprète indépendamment le `FORMAT` clause de la requête et formate les données elles-mêmes (soulageant ainsi le réseau et le serveur de la charge supplémentaire).
diff --git a/docs/fr/sql-reference/statements/select/from.md b/docs/fr/sql-reference/statements/select/from.md
deleted file mode 100644
index 964ffdd13fb..00000000000
--- a/docs/fr/sql-reference/statements/select/from.md
+++ /dev/null
@@ -1,44 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
----
-
-# De la Clause {#select-from}
-
-Le `FROM` clause spécifie la source à partir de laquelle lire les données:
-
--   [Table](../../../engines/table-engines/index.md)
--   [Sous-requête](index.md) {##TODO: meilleur lien ##}
--   [Fonction de Table](../../table-functions/index.md#table-functions)
-
-[JOIN](join.md) et [ARRAY JOIN](array-join.md) les clauses peuvent également être utilisées pour étendre la fonctionnalité de la `FROM` clause.
-
-Subquery est un autre `SELECT` requête qui peut être spécifié entre parenthèses à l'intérieur `FROM` clause.
-
-`FROM` la clause peut contenir plusieurs sources de données, séparées par des virgules, ce qui équivaut à effectuer [CROSS JOIN](join.md) sur eux.
-
-## Modificateur FINAL {#select-from-final}
-
-Lorsque `FINAL` est spécifié, ClickHouse fusionne complètement les données avant de renvoyer le résultat et effectue ainsi toutes les transformations de données qui se produisent lors des fusions pour le moteur de table donné.
-
-Il est applicable lors de la sélection de données à partir de tables qui utilisent [MergeTree](../../../engines/table-engines/mergetree-family/mergetree.md)-la famille de moteurs (à l'exception de `GraphiteMergeTree`). Également pris en charge pour:
-
--   [Répliqué](../../../engines/table-engines/mergetree-family/replication.md) les versions de `MergeTree` moteur.
--   [Vue](../../../engines/table-engines/special/view.md), [Tampon](../../../engines/table-engines/special/buffer.md), [Distribué](../../../engines/table-engines/special/distributed.md), et [MaterializedView](../../../engines/table-engines/special/materializedview.md) moteurs qui fonctionnent sur d'autres moteurs, à condition qu'ils aient été créés sur `MergeTree`-tables de moteur.
-
-### Inconvénient {#drawbacks}
-
-Requêtes qui utilisent `FINAL` sont exécutés pas aussi vite que les requêtes similaires qui ne le font pas, car:
-
--   La requête est exécutée dans un seul thread et les données sont fusionnées lors de l'exécution de la requête.
--   Les requêtes avec `FINAL` lire les colonnes de clé primaire en plus des colonnes spécifiées dans la requête.
-
-**Dans la plupart des cas, évitez d'utiliser `FINAL`.** L'approche commune consiste à utiliser différentes requêtes qui supposent les processus d'arrière-plan du `MergeTree` le moteur n'est pas encore arrivé et y faire face en appliquant l'agrégation (par exemple, pour éliminer les doublons). {##TODO: exemples ##}
-
-## Détails De Mise En Œuvre {#implementation-details}
-
-Si l' `FROM` la clause est omise, les données seront lues à partir `system.one` table.
-Le `system.one` table contient exactement une ligne (cette table remplit le même but que la table double trouvée dans d'autres SGBD).
-
-Pour exécuter une requête, toutes les colonnes mentionnées dans la requête sont extraites de la table appropriée. Toutes les colonnes non nécessaires pour la requête externe sont rejetées des sous-requêtes.
-Si une requête ne répertorie aucune colonne (par exemple, `SELECT count() FROM t`), une colonne est extraite de la table de toute façon (la plus petite est préférée), afin de calculer le nombre de lignes.
diff --git a/docs/fr/sql-reference/statements/select/group-by.md b/docs/fr/sql-reference/statements/select/group-by.md
deleted file mode 100644
index 9d1b5c276d5..00000000000
--- a/docs/fr/sql-reference/statements/select/group-by.md
+++ /dev/null
@@ -1,132 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
----
-
-# Clause GROUP BY {#select-group-by-clause}
-
-`GROUP BY` la clause change le `SELECT` requête dans un mode d'agrégation, qui fonctionne comme suit:
-
--   `GROUP BY` clause contient une liste des expressions (ou une seule expression, qui est considéré comme la liste de longueur). Cette liste agit comme un “grouping key”, tandis que chaque expression individuelle sera appelée “key expressions”.
--   Toutes les expressions dans le [SELECT](index.md), [HAVING](having.md), et [ORDER BY](order-by.md) clause **devoir** être calculé sur la base d'expressions clés **ou** sur [les fonctions d'agrégation](../../../sql-reference/aggregate-functions/index.md) sur les expressions non-clés (y compris les colonnes simples). En d'autres termes, chaque colonne sélectionnée dans la table doit être utilisée soit dans une expression de clé, soit dans une fonction d'agrégat, mais pas les deux.
--   Résultat de l'agrégation de `SELECT` la requête contiendra autant de lignes qu'il y avait des valeurs uniques de “grouping key” dans la table source. Habituellement, cela réduit considérablement le nombre de lignes, souvent par ordre de grandeur, mais pas nécessairement: le nombre de lignes reste le même si tous “grouping key” les valeurs sont distinctes.
-
-!!! note "Note"
-    Il existe un moyen supplémentaire d'exécuter l'agrégation sur une table. Si une requête ne contient que des colonnes de table à l'intérieur des fonctions `GROUP BY clause` peut être omis, et l'agrégation par un ensemble vide de touches est supposé. Ces interrogations renvoient toujours exactement une ligne.
-
-## Le Traitement NULL {#null-processing}
-
-Pour le regroupement, ClickHouse interprète [NULL](../../syntax.md#null-literal) comme une valeur, et `NULL==NULL`. Elle diffère de `NULL` traitement dans la plupart des autres contextes.
-
-Voici un exemple pour montrer ce que cela signifie.
-
-Supposons que vous avez cette table:
-
-``` text
-┌─x─┬────y─┐
-│ 1 │    2 │
-│ 2 │ ᴺᵁᴸᴸ │
-│ 3 │    2 │
-│ 3 │    3 │
-│ 3 │ ᴺᵁᴸᴸ │
-└───┴──────┘
-```
-
-Requête `SELECT sum(x), y FROM t_null_big GROUP BY y` résultats dans:
-
-``` text
-┌─sum(x)─┬────y─┐
-│      4 │    2 │
-│      3 │    3 │
-│      5 │ ᴺᵁᴸᴸ │
-└────────┴──────┘
-```
-
-Vous pouvez voir que `GROUP BY` pour `y = NULL` résumer `x` comme si `NULL` a cette valeur.
-
-Si vous passez plusieurs clés `GROUP BY` le résultat vous donnera toutes les combinaisons de la sélection, comme si `NULL` ont une valeur spécifique.
-
-## Avec modificateur de totaux {#with-totals-modifier}
-
-Si l' `WITH TOTALS` modificateur est spécifié, une autre ligne sera calculée. Cette ligne aura des colonnes clés contenant des valeurs par défaut (zéros ou lignes vides), et des colonnes de fonctions d'agrégat avec les valeurs calculées sur toutes les lignes (le “total” valeur).
-
-Cette ligne supplémentaire est uniquement produite en `JSON*`, `TabSeparated*`, et `Pretty*` formats, séparément des autres lignes:
-
--   Dans `JSON*` formats, cette ligne est sortie en tant que distinct ‘totals’ champ.
--   Dans `TabSeparated*` formats, la ligne vient après le résultat principal, précédé par une ligne vide (après les autres données).
--   Dans `Pretty*` formats, la ligne est sortie comme une table séparée après le résultat principal.
--   Dans les autres formats, il n'est pas disponible.
-
-`WITH TOTALS` peut être exécuté de différentes manières lorsqu'il est présent. Le comportement dépend de l' ‘totals_mode’ paramètre.
-
-### Configuration Du Traitement Des Totaux {#configuring-totals-processing}
-
-Par défaut, `totals_mode = 'before_having'`. Dans ce cas, ‘totals’ est calculé sur toutes les lignes, y compris celles qui ne passent pas par `max_rows_to_group_by`.
-
-Les autres alternatives incluent uniquement les lignes qui passent à travers avoir dans ‘totals’, et se comporter différemment avec le réglage `max_rows_to_group_by` et `group_by_overflow_mode = 'any'`.
-
-`after_having_exclusive` – Don't include rows that didn't pass through `max_rows_to_group_by`. En d'autres termes, ‘totals’ aura moins ou le même nombre de lignes que si `max_rows_to_group_by` ont été omis.
-
-`after_having_inclusive` – Include all the rows that didn't pass through ‘max_rows_to_group_by’ dans ‘totals’. En d'autres termes, ‘totals’ aura plus ou le même nombre de lignes que si `max_rows_to_group_by` ont été omis.
-
-`after_having_auto` – Count the number of rows that passed through HAVING. If it is more than a certain amount (by default, 50%), include all the rows that didn't pass through ‘max_rows_to_group_by’ dans ‘totals’. Sinon, ne pas les inclure.
-
-`totals_auto_threshold` – By default, 0.5. The coefficient for `after_having_auto`.
-
-Si `max_rows_to_group_by` et `group_by_overflow_mode = 'any'` ne sont pas utilisés, toutes les variations de `after_having` sont les mêmes, et vous pouvez utiliser l'un d'eux (par exemple, `after_having_auto`).
-
-Vous pouvez utiliser avec les totaux dans les sous-requêtes, y compris les sous-requêtes dans la clause JOIN (dans ce cas, les valeurs totales respectives sont combinées).
-
-## Exemple {#examples}
-
-Exemple:
-
-``` sql
-SELECT
-    count(),
-    median(FetchTiming > 60 ? 60 : FetchTiming),
-    count() - sum(Refresh)
-FROM hits
-```
-
-Cependant, contrairement au SQL standard, si la table n'a pas de lignes (soit il n'y en a pas du tout, soit il n'y en a pas après avoir utilisé WHERE to filter), un résultat vide est renvoyé, et non le résultat d'une des lignes contenant les valeurs initiales des fonctions d'agrégat.
-
-Contrairement à MySQL (et conforme à SQL standard), vous ne pouvez pas obtenir une valeur d'une colonne qui n'est pas dans une fonction clé ou agrégée (sauf les expressions constantes). Pour contourner ce problème, vous pouvez utiliser le ‘any’ fonction d'agrégation (récupère la première valeur rencontrée) ou ‘min/max’.
-
-Exemple:
-
-``` sql
-SELECT
-    domainWithoutWWW(URL) AS domain,
-    count(),
-    any(Title) AS title -- getting the first occurred page header for each domain.
-FROM hits
-GROUP BY domain
-```
-
-Pour chaque valeur de clé différente rencontrée, GROUP BY calcule un ensemble de valeurs de fonction d'agrégation.
-
-GROUP BY n'est pas pris en charge pour les colonnes de tableau.
-
-Une constante ne peut pas être spécifiée comme arguments pour les fonctions d'agrégation. Exemple: somme(1). Au lieu de cela, vous pouvez vous débarrasser de la constante. Exemple: `count()`.
-
-## Détails De Mise En Œuvre {#implementation-details}
-
-L'agrégation est l'une des caractéristiques les plus importantes d'un SGBD orienté colonne, et donc son implémentation est l'une des parties les plus optimisées de ClickHouse. Par défaut, l'agrégation se fait en mémoire à l'aide d'une table de hachage. Il a plus de 40 spécialisations qui sont choisies automatiquement en fonction de “grouping key” types de données.
-
-### Groupe par dans la mémoire externe {#select-group-by-in-external-memory}
-
-Vous pouvez activer le dumping des données temporaires sur le disque pour limiter l'utilisation de la mémoire pendant `GROUP BY`.
-Le [max_bytes_before_external_group_by](../../../operations/settings/settings.md#settings-max_bytes_before_external_group_by) réglage détermine le seuil de consommation de RAM pour le dumping `GROUP BY` données temporaires dans le système de fichiers. Si elle est définie sur 0 (valeur par défaut), elle est désactivée.
-
-Lors de l'utilisation de `max_bytes_before_external_group_by`, nous vous recommandons de définir `max_memory_usage` environ deux fois plus élevé. Ceci est nécessaire car il y a deux étapes à l'agrégation: la lecture des données et la formation des données intermédiaires (1) et la fusion des données intermédiaires (2). Le Dumping des données dans le système de fichiers ne peut se produire qu'au cours de l'étape 1. Si les données temporaires n'ont pas été vidées, l'étape 2 peut nécessiter jusqu'à la même quantité de mémoire qu'à l'étape 1.
-
-Par exemple, si [max_memory_usage](../../../operations/settings/settings.md#settings_max_memory_usage) a été défini sur 10000000000 et que vous souhaitez utiliser l'agrégation externe, il est logique de définir `max_bytes_before_external_group_by` à 10000000000, et `max_memory_usage` à 20000000000. Lorsque l'agrégation externe est déclenchée (s'il y a eu au moins un vidage de données temporaires), la consommation maximale de RAM n'est que légèrement supérieure à `max_bytes_before_external_group_by`.
-
-Avec le traitement des requêtes distribuées, l'agrégation externe est effectuée sur des serveurs distants. Pour que le serveur demandeur n'utilise qu'une petite quantité de RAM, définissez `distributed_aggregation_memory_efficient` 1.
-
-Lors de la fusion de données vidées sur le disque, ainsi que lors de la fusion des résultats de serveurs distants lorsque `distributed_aggregation_memory_efficient` paramètre est activé, consomme jusqu'à `1/256 * the_number_of_threads` à partir de la quantité totale de mémoire RAM.
-
-Lorsque l'agrégation externe est activée, s'il y a moins de `max_bytes_before_external_group_by` of data (i.e. data was not flushed), the query runs just as fast as without external aggregation. If any temporary data was flushed, the run time will be several times longer (approximately three times).
-
-Si vous avez un [ORDER BY](order-by.md) avec un [LIMIT](limit.md) après `GROUP BY` puis la quantité de RAM dépend de la quantité de données dans `LIMIT`, pas dans l'ensemble de la table. Mais si l' `ORDER BY` n'a pas `LIMIT`, n'oubliez pas d'activer externe de tri (`max_bytes_before_external_sort`).
diff --git a/docs/fr/sql-reference/statements/select/having.md b/docs/fr/sql-reference/statements/select/having.md
deleted file mode 100644
index 9425830c3d4..00000000000
--- a/docs/fr/sql-reference/statements/select/having.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
----
-
-# Clause HAVING {#having-clause}
-
-Permet de filtrer les résultats d'agrégation produits par [GROUP BY](group-by.md). Il est similaire à la [WHERE](where.md) la clause, mais la différence est que `WHERE` est effectuée avant l'agrégation, tandis que `HAVING` est effectué d'après elle.
-
-Il est possible de référencer les résultats d'agrégation à partir de `SELECT` la clause dans `HAVING` clause par leur alias. Alternativement, `HAVING` clause peut filtrer sur les résultats d'agrégats supplémentaires qui ne sont pas retournés dans les résultats de la requête.
-
-## Limitation {#limitations}
-
-`HAVING` ne peut pas être utilisé si le regroupement n'est pas effectuée. Utiliser `WHERE` plutôt.
diff --git a/docs/fr/sql-reference/statements/select/index.md b/docs/fr/sql-reference/statements/select/index.md
deleted file mode 100644
index 1d53ae80eb4..00000000000
--- a/docs/fr/sql-reference/statements/select/index.md
+++ /dev/null
@@ -1,158 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 33
-toc_title: SELECT
----
-
-# Sélectionnez la syntaxe des requêtes {#select-queries-syntax}
-
-`SELECT` effectue la récupération des données.
-
-``` sql
-[WITH expr_list|(subquery)]
-SELECT [DISTINCT] expr_list
-[FROM [db.]table | (subquery) | table_function] [FINAL]
-[SAMPLE sample_coeff]
-[ARRAY JOIN ...]
-[GLOBAL] [ANY|ALL|ASOF] [INNER|LEFT|RIGHT|FULL|CROSS] [OUTER|SEMI|ANTI] JOIN (subquery)|table (ON <expr_list>)|(USING <column_list>)
-[PREWHERE expr]
-[WHERE expr]
-[GROUP BY expr_list] [WITH TOTALS]
-[HAVING expr]
-[ORDER BY expr_list] [WITH FILL] [FROM expr] [TO expr] [STEP expr] 
-[LIMIT [offset_value, ]n BY columns]
-[LIMIT [n, ]m] [WITH TIES]
-[UNION ALL ...]
-[INTO OUTFILE filename]
-[FORMAT format]
-```
-
-Toutes les clauses sont facultatives, à l'exception de la liste d'expressions requise immédiatement après `SELECT` qui est abordée plus en détail [dessous](#select-clause).
-
-Spécificités de chaque clause facultative, sont couverts dans des sections distinctes, qui sont énumérés dans le même ordre qu'elles sont exécutées:
-
--   [AVEC la clause](with.md)
--   [La clause DISTINCT](distinct.md)
--   [De la clause](from.md)
--   [Exemple de clause](sample.md)
--   [Clause de JOINTURE](join.md)
--   [Clause PREWHERE](prewhere.md)
--   [Clause where](where.md)
--   [Groupe par clause](group-by.md)
--   [Limite par clause](limit-by.md)
--   [Clause HAVING](having.md)
--   [Clause SELECT](#select-clause)
--   [Clause LIMIT](limit.md)
--   [Clause UNION ALL](union.md)
-
-## Clause SELECT {#select-clause}
-
-[Expression](../../syntax.md#syntax-expressions) spécifié dans le `SELECT` clause sont calculés après toutes les opérations dans les clauses décrites ci-dessus sont terminés. Ces expressions fonctionnent comme si elles s'appliquaient à des lignes séparées dans le résultat. Si les expressions dans le `SELECT` la clause contient des fonctions d'agrégation, puis clickhouse traite les fonctions d'agrégation et les expressions utilisées [GROUP BY](group-by.md) agrégation.
-
-Si vous souhaitez inclure toutes les colonnes dans le résultat, utilisez l'astérisque (`*`) symbole. Exemple, `SELECT * FROM ...`.
-
-Pour correspondre à certaines colonnes dans le résultat avec un [re2](https://en.wikipedia.org/wiki/RE2_(software)) expression régulière, vous pouvez utiliser le `COLUMNS` expression.
-
-``` sql
-COLUMNS('regexp')
-```
-
-Par exemple, considérez le tableau:
-
-``` sql
-CREATE TABLE default.col_names (aa Int8, ab Int8, bc Int8) ENGINE = TinyLog
-```
-
-La requête suivante sélectionne les données de toutes les colonnes contenant les `a` symbole dans leur nom.
-
-``` sql
-SELECT COLUMNS('a') FROM col_names
-```
-
-``` text
-┌─aa─┬─ab─┐
-│  1 │  1 │
-└────┴────┘
-```
-
-Les colonnes sélectionnées sont retournés pas dans l'ordre alphabétique.
-
-Vous pouvez utiliser plusieurs `COLUMNS` expressions dans une requête et leur appliquer des fonctions.
-
-Exemple:
-
-``` sql
-SELECT COLUMNS('a'), COLUMNS('c'), toTypeName(COLUMNS('c')) FROM col_names
-```
-
-``` text
-┌─aa─┬─ab─┬─bc─┬─toTypeName(bc)─┐
-│  1 │  1 │  1 │ Int8           │
-└────┴────┴────┴────────────────┘
-```
-
-Chaque colonne renvoyée par le `COLUMNS` expression est passée à la fonction en tant qu'argument séparé. Vous pouvez également passer d'autres arguments à la fonction si elle les supporte. Soyez prudent lorsque vous utilisez des fonctions. Si une fonction ne prend pas en charge le nombre d'arguments que vous lui avez transmis, ClickHouse lève une exception.
-
-Exemple:
-
-``` sql
-SELECT COLUMNS('a') + COLUMNS('c') FROM col_names
-```
-
-``` text
-Received exception from server (version 19.14.1):
-Code: 42. DB::Exception: Received from localhost:9000. DB::Exception: Number of arguments for function plus doesn't match: passed 3, should be 2.
-```
-
-Dans cet exemple, `COLUMNS('a')` retourne deux colonnes: `aa` et `ab`. `COLUMNS('c')` renvoie la `bc` colonne. Le `+` l'opérateur ne peut pas s'appliquer à 3 arguments, donc ClickHouse lève une exception avec le message pertinent.
-
-Colonnes qui correspondent à la `COLUMNS` l'expression peut avoir différents types de données. Si `COLUMNS` ne correspond à aucune colonne et est la seule expression dans `SELECT`, ClickHouse lance une exception.
-
-### Astérisque {#asterisk}
-
-Vous pouvez mettre un astérisque dans quelque partie de la requête au lieu d'une expression. Lorsque la requête est analysée, l'astérisque est étendu à une liste de toutes les colonnes `MATERIALIZED` et `ALIAS` colonne). Il n'y a que quelques cas où l'utilisation d'un astérisque est justifiée:
-
--   Lors de la création d'un vidage de table.
--   Pour les tables contenant seulement quelques colonnes, comme les tables système.
--   Pour obtenir des informations sur ce que sont les colonnes dans une table. Dans ce cas, la valeur `LIMIT 1`. Mais il est préférable d'utiliser la `DESC TABLE` requête.
--   Quand il y a une forte filtration sur un petit nombre de colonnes en utilisant `PREWHERE`.
--   Dans les sous-requêtes (puisque les colonnes qui ne sont pas nécessaires pour la requête externe sont exclues des sous-requêtes).
-
-Dans tous les autres cas, nous ne recommandons pas d'utiliser l'astérisque, car il ne vous donne que les inconvénients d'un SGBD colonnaire au lieu des avantages. En d'autres termes, l'utilisation de l'astérisque n'est pas recommandée.
-
-### Les Valeurs Extrêmes {#extreme-values}
-
-En plus des résultats, vous pouvez également obtenir des valeurs minimales et maximales pour les colonnes de résultats. Pour ce faire, définissez la **extrême** réglage sur 1. Les Minimums et les maximums sont calculés pour les types numériques, les dates et les dates avec des heures. Pour les autres colonnes, les valeurs par défaut sont sorties.
-
-An extra two rows are calculated – the minimums and maximums, respectively. These extra two rows are output in `JSON*`, `TabSeparated*`, et `Pretty*` [format](../../../interfaces/formats.md), séparés des autres lignes. Ils ne sont pas Produits pour d'autres formats.
-
-Dans `JSON*` formats, les valeurs extrêmes sont sorties dans un ‘extremes’ champ. Dans `TabSeparated*` formats, la ligne vient après le résultat principal, et après ‘totals’ si elle est présente. Elle est précédée par une ligne vide (après les autres données). Dans `Pretty*` formats, la ligne est sortie comme une table séparée après le résultat principal, et après `totals` si elle est présente.
-
-Les valeurs extrêmes sont calculées pour les lignes avant `LIMIT` mais après `LIMIT BY`. Cependant, lors de l'utilisation de `LIMIT offset, size`, les lignes avant de les `offset` sont inclus dans `extremes`. Dans les requêtes de flux, le résultat peut également inclure un petit nombre de lignes qui ont traversé `LIMIT`.
-
-### Note {#notes}
-
-Vous pouvez utiliser des synonymes (`AS` alias) dans n'importe quelle partie d'une requête.
-
-Le `GROUP BY` et `ORDER BY` les clauses ne supportent pas les arguments positionnels. Cela contredit MySQL, mais est conforme à SQL standard. Exemple, `GROUP BY 1, 2` will be interpreted as grouping by constants (i.e. aggregation of all rows into one).
-
-## Détails De Mise En Œuvre {#implementation-details}
-
-Si la requête omet le `DISTINCT`, `GROUP BY` et `ORDER BY` les clauses et les `IN` et `JOIN` sous-requêtes, la requête sera complètement traitée en flux, en utilisant O (1) quantité de RAM. Sinon, la requête peut consommer beaucoup de RAM si les restrictions appropriées ne sont pas spécifiées:
-
--   `max_memory_usage`
--   `max_rows_to_group_by`
--   `max_rows_to_sort`
--   `max_rows_in_distinct`
--   `max_bytes_in_distinct`
--   `max_rows_in_set`
--   `max_bytes_in_set`
--   `max_rows_in_join`
--   `max_bytes_in_join`
--   `max_bytes_before_external_sort`
--   `max_bytes_before_external_group_by`
-
-Pour plus d'informations, consultez la section “Settings”. Il est possible d'utiliser le tri externe (sauvegarde des tables temporaires sur un disque) et l'agrégation externe.
-
-{## [Article Original](https://clickhouse.tech/docs/en/sql-reference/statements/select/) ##}
diff --git a/docs/fr/sql-reference/statements/select/into-outfile.md b/docs/fr/sql-reference/statements/select/into-outfile.md
deleted file mode 100644
index 0150de7cb97..00000000000
--- a/docs/fr/sql-reference/statements/select/into-outfile.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
----
-
-# Dans OUTFILE Clause {#into-outfile-clause}
-
-Ajouter l' `INTO OUTFILE filename` clause (où filename est un littéral de chaîne) pour `SELECT query` pour rediriger sa sortie vers le fichier spécifié côté client.
-
-## Détails De Mise En Œuvre {#implementation-details}
-
--   Cette fonctionnalité est disponible dans les [client de ligne de commande](../../../interfaces/cli.md) et [clickhouse-local](../../../operations/utilities/clickhouse-local.md). Ainsi, une requête envoyée par [Interface HTTP](../../../interfaces/http.md) va échouer.
--   La requête échouera si un fichier portant le même nom existe déjà.
--   Défaut [le format de sortie](../../../interfaces/formats.md) être `TabSeparated` (comme dans le mode batch client en ligne de commande).
diff --git a/docs/fr/sql-reference/statements/select/join.md b/docs/fr/sql-reference/statements/select/join.md
deleted file mode 100644
index 4233a120674..00000000000
--- a/docs/fr/sql-reference/statements/select/join.md
+++ /dev/null
@@ -1,187 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
----
-
-# Clause de JOINTURE {#select-join}
-
-Join produit une nouvelle table en combinant des colonnes d'une ou plusieurs tables en utilisant des valeurs communes à chacune. C'est une opération courante dans les bases de données avec support SQL, ce qui correspond à [l'algèbre relationnelle](https://en.wikipedia.org/wiki/Relational_algebra#Joins_and_join-like_operators) rejoindre. Le cas particulier d'une jointure de table est souvent appelé “self-join”.
-
-Syntaxe:
-
-``` sql
-SELECT <expr_list>
-FROM <left_table>
-[GLOBAL] [INNER|LEFT|RIGHT|FULL|CROSS] [OUTER|SEMI|ANTI|ANY|ASOF] JOIN <right_table>
-(ON <expr_list>)|(USING <column_list>) ...
-```
-
-Les Expressions de `ON` clause et colonnes de `USING` clause sont appelés “join keys”. Sauf indication contraire, joindre un produit [Produit cartésien](https://en.wikipedia.org/wiki/Cartesian_product) des lignes, avec correspondance “join keys”, ce qui pourrait produire des résultats avec beaucoup plus de lignes que les tables source.
-
-## Types de jointure pris en charge {#select-join-types}
-
-Tous les standard [SQL JOIN](https://en.wikipedia.org/wiki/Join_(SQL)) les types sont pris en charge:
-
--   `INNER JOIN`, seules les lignes correspondantes sont retournés.
--   `LEFT OUTER JOIN`, les lignes non correspondantes de la table de gauche sont retournées en plus des lignes correspondantes.
--   `RIGHT OUTER JOIN`, les lignes non correspondantes de la table de gauche sont retournées en plus des lignes correspondantes.
--   `FULL OUTER JOIN`, les lignes non correspondantes des deux tables sont renvoyées en plus des lignes correspondantes.
--   `CROSS JOIN`, produit le produit cartésien des tables entières, “join keys” être **pas** défini.
-
-`JOIN` sans type spécifié implique `INNER`. Mot `OUTER` peut les oublier. Syntaxe Alternative pour `CROSS JOIN` spécifie plusieurs tables dans [De la clause](from.md) séparés par des virgules.
-
-Autres types de jointure disponibles dans ClickHouse:
-
--   `LEFT SEMI JOIN` et `RIGHT SEMI JOIN` une liste blanche sur “join keys”, sans produire un produit cartésien.
--   `LEFT ANTI JOIN` et `RIGHT ANTI JOIN` une liste noire sur “join keys”, sans produire un produit cartésien.
--   `LEFT ANY JOIN`, `RIGHT ANY JOIN` et `INNER ANY JOIN`, partially (for opposite side of `LEFT` and `RIGHT`) or completely (for `INNER` and `FULL`) disables the cartesian product for standard `JOIN` types.
--   `ASOF JOIN` et `LEFT ASOF JOIN`, joining sequences with a non-exact match. `ASOF JOIN` usage is described below.
-
-## Setting {#join-settings}
-
-!!! note "Note"
-    La valeur de rigueur par défaut peut être remplacée à l'aide [join_default_strictness](../../../operations/settings/settings.md#settings-join_default_strictness) paramètre.
-
-### ASOF joindre L'utilisation {#asof-join-usage}
-
-`ASOF JOIN` est utile lorsque vous devez joindre des enregistrements qui n'ont pas de correspondance exacte.
-
-Tables pour `ASOF JOIN` doit avoir une colonne de séquence ordonnée. Cette colonne ne peut pas être seule dans une table et doit être l'un des types de données: `UInt32`, `UInt64`, `Float32`, `Float64`, `Date`, et `DateTime`.
-
-Syntaxe `ASOF JOIN ... ON`:
-
-``` sql
-SELECT expressions_list
-FROM table_1
-ASOF LEFT JOIN table_2
-ON equi_cond AND closest_match_cond
-```
-
-Vous pouvez utiliser n'importe quel nombre de conditions d'égalité et exactement une condition de correspondance la plus proche. Exemple, `SELECT count() FROM table_1 ASOF LEFT JOIN table_2 ON table_1.a == table_2.b AND table_2.t <= table_1.t`.
-
-Conditions prises en charge pour la correspondance la plus proche: `>`, `>=`, `<`, `<=`.
-
-Syntaxe `ASOF JOIN ... USING`:
-
-``` sql
-SELECT expressions_list
-FROM table_1
-ASOF JOIN table_2
-USING (equi_column1, ... equi_columnN, asof_column)
-```
-
-`ASOF JOIN` utiliser `equi_columnX` pour rejoindre sur l'égalité et `asof_column` pour rejoindre le match le plus proche avec le `table_1.asof_column >= table_2.asof_column` condition. Le `asof_column` colonne toujours la dernière dans le `USING` clause.
-
-Par exemple, considérez les tableaux suivants:
-
-         table_1                           table_2
-      event   | ev_time | user_id       event   | ev_time | user_id
-    ----------|---------|----------   ----------|---------|----------
-                  ...                               ...
-    event_1_1 |  12:00  |  42         event_2_1 |  11:59  |   42
-                  ...                 event_2_2 |  12:30  |   42
-    event_1_2 |  13:00  |  42         event_2_3 |  13:00  |   42
-                  ...                               ...
-
-`ASOF JOIN` peut prendre la date d'un événement utilisateur de `table_1` et trouver un événement dans `table_2` où le timestamp est plus proche de l'horodatage de l'événement à partir de `table_1` correspondant à la condition de correspondance la plus proche. Les valeurs d'horodatage égales sont les plus proches si elles sont disponibles. Ici, l' `user_id` la colonne peut être utilisée pour joindre sur l'égalité et le `ev_time` la colonne peut être utilisée pour se joindre à la correspondance la plus proche. Dans notre exemple, `event_1_1` peut être jointe à `event_2_1` et `event_1_2` peut être jointe à `event_2_3`, mais `event_2_2` ne peut pas être rejoint.
-
-!!! note "Note"
-    `ASOF` jointure est **pas** pris en charge dans le [Rejoindre](../../../engines/table-engines/special/join.md) tableau moteur.
-
-## Jointure Distribuée {#global-join}
-
-Il existe deux façons d'exécuter join impliquant des tables distribuées:
-
--   Lors de l'utilisation normale `JOIN` la requête est envoyée aux serveurs distants. Les sous-requêtes sont exécutées sur chacune d'elles afin de créer la bonne table, et la jointure est effectuée avec cette table. En d'autres termes, la table de droite est formée sur chaque serveur séparément.
--   Lors de l'utilisation de `GLOBAL ... JOIN`, d'abord le serveur demandeur exécute une sous-requête pour calculer la bonne table. Cette table temporaire est transmise à chaque serveur distant, et les requêtes sont exécutées sur eux en utilisant les données temporaires qui ont été transmises.
-
-Soyez prudent lorsque vous utilisez `GLOBAL`. Pour plus d'informations, voir le [Sous-requêtes distribuées](../../operators/in.md#select-distributed-subqueries) section.
-
-## Recommandations D'Utilisation {#usage-recommendations}
-
-### Traitement des cellules vides ou nulles {#processing-of-empty-or-null-cells}
-
-Lors de la jonction de tables, les cellules vides peuvent apparaître. Paramètre [join_use_nulls](../../../operations/settings/settings.md#join_use_nulls) définir comment clickhouse remplit ces cellules.
-
-Si l' `JOIN` les touches sont [Nullable](../../data-types/nullable.md) champs, les lignes où au moins une des clés a la valeur [NULL](../../../sql-reference/syntax.md#null-literal) ne sont pas jointes.
-
-### Syntaxe {#syntax}
-
-Les colonnes spécifiées dans `USING` doit avoir les mêmes noms dans les deux sous-requêtes, et les autres colonnes doivent être nommées différemment. Vous pouvez utiliser des alias pour les noms des colonnes dans les sous-requêtes.
-
-Le `USING` clause spécifie une ou plusieurs colonnes de jointure, qui établit l'égalité de ces colonnes. La liste des colonnes est définie sans crochets. Les conditions de jointure plus complexes ne sont pas prises en charge.
-
-### Limitations De Syntaxe {#syntax-limitations}
-
-Pour plusieurs `JOIN` clauses dans un seul `SELECT` requête:
-
--   Prendre toutes les colonnes via `*` n'est disponible que si les tables sont jointes, pas les sous-requêtes.
--   Le `PREWHERE` la clause n'est pas disponible.
-
-Pour `ON`, `WHERE`, et `GROUP BY` clause:
-
--   Les expressions arbitraires ne peuvent pas être utilisées dans `ON`, `WHERE`, et `GROUP BY` mais vous pouvez définir une expression dans un `SELECT` clause et ensuite l'utiliser dans ces clauses via un alias.
-
-### Performance {#performance}
-
-Lors de l'exécution d'un `JOIN`, il n'y a pas d'optimisation de la commande d'exécution par rapport aux autres stades de la requête. La jointure (une recherche dans la table de droite) est exécutée avant de filtrer `WHERE` et avant l'agrégation.
-
-Chaque fois qu'une requête est exécutée avec la même `JOIN`, la sous-requête est exécutée à nouveau car le résultat n'est pas mis en cache. Pour éviter cela, utilisez la spéciale [Rejoindre](../../../engines/table-engines/special/join.md) table engine, qui est un tableau préparé pour l'assemblage qui est toujours en RAM.
-
-Dans certains cas, il est plus efficace d'utiliser [IN](../../operators/in.md) plutôt `JOIN`.
-
-Si vous avez besoin d'un `JOIN` pour se joindre à des tables de dimension (ce sont des tables relativement petites qui contiennent des propriétés de dimension, telles que des noms pour des campagnes publicitaires), un `JOIN` peut-être pas très pratique en raison du fait que la bonne table est ré-accédée pour chaque requête. Pour de tels cas, il y a un “external dictionaries” la fonctionnalité que vous devez utiliser à la place de `JOIN`. Pour plus d'informations, voir le [Dictionnaires externes](../../dictionaries/external-dictionaries/external-dicts.md) section.
-
-### Limitations De Mémoire {#memory-limitations}
-
-Par défaut, ClickHouse utilise [jointure de hachage](https://en.wikipedia.org/wiki/Hash_join) algorithme. ClickHouse prend le `<right_table>` et crée une table de hachage pour cela dans la RAM. Après un certain seuil de consommation de mémoire, ClickHouse revient à fusionner l'algorithme de jointure.
-
-Si vous devez restreindre la consommation de mémoire de l'opération join utilisez les paramètres suivants:
-
--   [max_rows_in_join](../../../operations/settings/query-complexity.md#settings-max_rows_in_join) — Limits number of rows in the hash table.
--   [max_bytes_in_join](../../../operations/settings/query-complexity.md#settings-max_bytes_in_join) — Limits size of the hash table.
-
-Lorsque l'une de ces limites est atteinte, ClickHouse agit comme [join_overflow_mode](../../../operations/settings/query-complexity.md#settings-join_overflow_mode) réglage des instructions.
-
-## Exemple {#examples}
-
-Exemple:
-
-``` sql
-SELECT
-    CounterID,
-    hits,
-    visits
-FROM
-(
-    SELECT
-        CounterID,
-        count() AS hits
-    FROM test.hits
-    GROUP BY CounterID
-) ANY LEFT JOIN
-(
-    SELECT
-        CounterID,
-        sum(Sign) AS visits
-    FROM test.visits
-    GROUP BY CounterID
-) USING CounterID
-ORDER BY hits DESC
-LIMIT 10
-```
-
-``` text
-┌─CounterID─┬───hits─┬─visits─┐
-│   1143050 │ 523264 │  13665 │
-│    731962 │ 475698 │ 102716 │
-│    722545 │ 337212 │ 108187 │
-│    722889 │ 252197 │  10547 │
-│   2237260 │ 196036 │   9522 │
-│  23057320 │ 147211 │   7689 │
-│    722818 │  90109 │  17847 │
-│     48221 │  85379 │   4652 │
-│  19762435 │  77807 │   7026 │
-│    722884 │  77492 │  11056 │
-└───────────┴────────┴────────┘
-```
diff --git a/docs/fr/sql-reference/statements/select/limit-by.md b/docs/fr/sql-reference/statements/select/limit-by.md
deleted file mode 100644
index 4d1bd766ef1..00000000000
--- a/docs/fr/sql-reference/statements/select/limit-by.md
+++ /dev/null
@@ -1,71 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
----
-
-# Limite par Clause {#limit-by-clause}
-
-Une requête avec l' `LIMIT n BY expressions` la clause sélectionne le premier `n` lignes pour chaque valeur distincte de `expressions`. La clé pour `LIMIT BY` peut contenir n'importe quel nombre de [expression](../../syntax.md#syntax-expressions).
-
-ClickHouse prend en charge les variantes de syntaxe suivantes:
-
--   `LIMIT [offset_value, ]n BY expressions`
--   `LIMIT n OFFSET offset_value BY expressions`
-
-Pendant le traitement de la requête, ClickHouse sélectionne les données classées par clé de tri. La clé de tri est définie explicitement à l'aide [ORDER BY](order-by.md) clause ou implicitement en tant que propriété du moteur de table. Puis clickhouse s'applique `LIMIT n BY expressions` et renvoie le premier `n` lignes pour chaque combinaison distincte de `expressions`. Si `OFFSET` est spécifié, puis pour chaque bloc de données qui appartient à une combinaison particulière de `expressions`, Clickhouse saute `offset_value` nombre de lignes depuis le début du bloc et renvoie un maximum de `n` les lignes en conséquence. Si `offset_value` est plus grand que le nombre de lignes dans le bloc de données, ClickHouse renvoie zéro lignes du bloc.
-
-!!! note "Note"
-    `LIMIT BY` n'est pas liée à [LIMIT](limit.md). Ils peuvent tous deux être utilisés dans la même requête.
-
-## Exemple {#examples}
-
-Exemple de table:
-
-``` sql
-CREATE TABLE limit_by(id Int, val Int) ENGINE = Memory;
-INSERT INTO limit_by VALUES (1, 10), (1, 11), (1, 12), (2, 20), (2, 21);
-```
-
-Requête:
-
-``` sql
-SELECT * FROM limit_by ORDER BY id, val LIMIT 2 BY id
-```
-
-``` text
-┌─id─┬─val─┐
-│  1 │  10 │
-│  1 │  11 │
-│  2 │  20 │
-│  2 │  21 │
-└────┴─────┘
-```
-
-``` sql
-SELECT * FROM limit_by ORDER BY id, val LIMIT 1, 2 BY id
-```
-
-``` text
-┌─id─┬─val─┐
-│  1 │  11 │
-│  1 │  12 │
-│  2 │  21 │
-└────┴─────┘
-```
-
-Le `SELECT * FROM limit_by ORDER BY id, val LIMIT 2 OFFSET 1 BY id` requête renvoie le même résultat.
-
-La requête suivante renvoie les 5 principaux référents pour chaque `domain, device_type` paire avec un maximum de 100 lignes au total (`LIMIT n BY + LIMIT`).
-
-``` sql
-SELECT
-    domainWithoutWWW(URL) AS domain,
-    domainWithoutWWW(REFERRER_URL) AS referrer,
-    device_type,
-    count() cnt
-FROM hits
-GROUP BY domain, referrer, device_type
-ORDER BY cnt DESC
-LIMIT 5 BY domain, device_type
-LIMIT 100
-```
diff --git a/docs/fr/sql-reference/statements/select/limit.md b/docs/fr/sql-reference/statements/select/limit.md
deleted file mode 100644
index 69334c32cc9..00000000000
--- a/docs/fr/sql-reference/statements/select/limit.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
----
-
-# Clause LIMIT {#limit-clause}
-
-`LIMIT m` permet de sélectionner la première `m` lignes du résultat.
-
-`LIMIT n, m` permet de sélectionner le `m` lignes du résultat après avoir sauté le premier `n` rangée. Le `LIMIT m OFFSET n` la syntaxe est équivalente.
-
-`n` et `m` doivent être des entiers non négatifs.
-
-Si il n'y a pas de [ORDER BY](order-by.md) clause qui trie explicitement les résultats, le choix des lignes pour le résultat peut être arbitraire et non déterministe.
diff --git a/docs/fr/sql-reference/statements/select/order-by.md b/docs/fr/sql-reference/statements/select/order-by.md
deleted file mode 100644
index 2a4ef58d7ad..00000000000
--- a/docs/fr/sql-reference/statements/select/order-by.md
+++ /dev/null
@@ -1,72 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
----
-
-# Clause ORDER BY {#select-order-by}
-
-Le `ORDER BY` clause contient une liste des expressions, qui peuvent être attribuées avec `DESC` (décroissant) ou `ASC` modificateur (ascendant) qui détermine la direction de tri. Si la direction n'est pas spécifié, `ASC` est supposé, donc il est généralement omis. La direction de tri s'applique à une seule expression, pas à la liste entière. Exemple: `ORDER BY Visits DESC, SearchPhrase`
-
-Les lignes qui ont des valeurs identiques pour la liste des expressions de tri sont sorties dans un ordre arbitraire, qui peut également être non déterministe (différent à chaque fois).
-Si la clause ORDER BY est omise, l'ordre des lignes est également indéfini et peut également être non déterministe.
-
-## Tri des valeurs spéciales {#sorting-of-special-values}
-
-Il existe deux approches pour `NaN` et `NULL` ordre de tri:
-
--   Par défaut ou avec le `NULLS LAST` modificateur: d'abord les valeurs, puis `NaN`, puis `NULL`.
--   Avec l' `NULLS FIRST` modificateur: première `NULL`, puis `NaN` puis d'autres valeurs.
-
-### Exemple {#example}
-
-Pour la table
-
-``` text
-┌─x─┬────y─┐
-│ 1 │ ᴺᵁᴸᴸ │
-│ 2 │    2 │
-│ 1 │  nan │
-│ 2 │    2 │
-│ 3 │    4 │
-│ 5 │    6 │
-│ 6 │  nan │
-│ 7 │ ᴺᵁᴸᴸ │
-│ 6 │    7 │
-│ 8 │    9 │
-└───┴──────┘
-```
-
-Exécuter la requête `SELECT * FROM t_null_nan ORDER BY y NULLS FIRST` obtenir:
-
-``` text
-┌─x─┬────y─┐
-│ 1 │ ᴺᵁᴸᴸ │
-│ 7 │ ᴺᵁᴸᴸ │
-│ 1 │  nan │
-│ 6 │  nan │
-│ 2 │    2 │
-│ 2 │    2 │
-│ 3 │    4 │
-│ 5 │    6 │
-│ 6 │    7 │
-│ 8 │    9 │
-└───┴──────┘
-```
-
-Lorsque les nombres à virgule flottante sont triés, les Nan sont séparés des autres valeurs. Quel que soit l'ordre de tri, NaNs viennent à la fin. En d'autres termes, pour le Tri ascendant, ils sont placés comme s'ils étaient plus grands que tous les autres nombres, tandis que pour le Tri descendant, ils sont placés comme s'ils étaient plus petits que les autres.
-
-## Classement De Soutien {#collation-support}
-
-Pour le tri par valeurs de chaîne, vous pouvez spécifier le classement (comparaison). Exemple: `ORDER BY SearchPhrase COLLATE 'tr'` - pour le tri par mot-clé dans l'ordre croissant, en utilisant l'alphabet turc, insensible à la casse, en supposant que les chaînes sont encodées en UTF-8. COLLATE peut être spécifié ou non pour chaque expression dans L'ordre par indépendamment. Si ASC ou DESC est spécifié, COLLATE est spécifié après. Lors de L'utilisation de COLLATE, le tri est toujours insensible à la casse.
-
-Nous recommandons uniquement D'utiliser COLLATE pour le tri final d'un petit nombre de lignes, car le tri avec COLLATE est moins efficace que le tri normal par octets.
-
-## Détails De Mise En Œuvre {#implementation-details}
-
-Moins de RAM est utilisé si un assez petit [LIMIT](limit.md) est précisée en plus `ORDER BY`. Sinon, la quantité de mémoire dépensée est proportionnelle au volume de données à trier. Pour le traitement des requêtes distribuées, si [GROUP BY](group-by.md) est omis, le tri est partiellement effectué sur les serveurs distants et les résultats sont fusionnés Sur le serveur demandeur. Cela signifie que pour le tri distribué, le volume de données à trier peut être supérieur à la quantité de mémoire sur un seul serveur.
-
-S'il N'y a pas assez de RAM, il est possible d'effectuer un tri dans la mémoire externe (création de fichiers temporaires sur un disque). Utilisez le paramètre `max_bytes_before_external_sort` pour ce but. S'il est défini sur 0 (par défaut), le tri externe est désactivé. Si elle est activée, lorsque le volume de données à trier atteint le nombre spécifié d'octets, les données collectées sont triés et déposés dans un fichier temporaire. Une fois toutes les données lues, tous les fichiers triés sont fusionnés et les résultats sont générés. Les fichiers sont écrits dans le `/var/lib/clickhouse/tmp/` dans la configuration (par défaut, mais vous pouvez `tmp_path` paramètre pour modifier ce paramètre).
-
-L'exécution d'une requête peut utiliser plus de mémoire que `max_bytes_before_external_sort`. Pour cette raison, ce paramètre doit avoir une valeur significativement inférieure à `max_memory_usage`. Par exemple, si votre serveur dispose de 128 Go de RAM et que vous devez exécuter une seule requête, définissez `max_memory_usage` à 100 Go, et `max_bytes_before_external_sort` à 80 Go.
-
-Le tri externe fonctionne beaucoup moins efficacement que le tri dans la RAM.
diff --git a/docs/fr/sql-reference/statements/select/prewhere.md b/docs/fr/sql-reference/statements/select/prewhere.md
deleted file mode 100644
index 2c825d050f4..00000000000
--- a/docs/fr/sql-reference/statements/select/prewhere.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
----
-
-# Clause PREWHERE {#prewhere-clause}
-
-Prewhere est une optimisation pour appliquer le filtrage plus efficacement. Il est activé par défaut, même si `PREWHERE` la clause n'est pas explicitement spécifié. Il fonctionne en déplaçant automatiquement une partie de [WHERE](where.md) condition à prewhere étape. Le rôle de `PREWHERE` la clause est seulement pour contrôler cette optimisation si vous pensez que vous savez comment le faire mieux que par défaut.
-
-Avec l'optimisation prewhere, au début, seules les colonnes nécessaires à l'exécution de l'expression prewhere sont lues. Ensuite, les autres colonnes sont lues qui sont nécessaires pour exécuter le reste de la requête, mais seulement les blocs où l'expression prewhere est “true” au moins pour certaines lignes. S'il y a beaucoup de blocs où prewhere expression est “false” pour toutes les lignes et prewhere a besoin de moins de colonnes que les autres parties de la requête, cela permet souvent de lire beaucoup moins de données à partir du disque pour l'exécution de la requête.
-
-## Contrôle Manuel De Prewhere {#controlling-prewhere-manually}
-
-La clause a le même sens que la `WHERE` clause. La différence est dans laquelle les données sont lues à partir de la table. Quand à commander manuellement `PREWHERE` pour les conditions de filtration qui sont utilisées par une minorité des colonnes de la requête, mais qui fournissent une filtration de données forte. Cela réduit le volume de données à lire.
-
-Une requête peut spécifier simultanément `PREWHERE` et `WHERE`. Dans ce cas, `PREWHERE` précéder `WHERE`.
-
-Si l' `optimize_move_to_prewhere` le paramètre est défini sur 0, heuristiques pour déplacer automatiquement des parties d'expressions `WHERE` de `PREWHERE` sont désactivés.
-
-## Limitation {#limitations}
-
-`PREWHERE` est uniquement pris en charge par les tables `*MergeTree` famille.
diff --git a/docs/fr/sql-reference/statements/select/sample.md b/docs/fr/sql-reference/statements/select/sample.md
deleted file mode 100644
index b2ddc060a19..00000000000
--- a/docs/fr/sql-reference/statements/select/sample.md
+++ /dev/null
@@ -1,113 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
----
-
-# Exemple de Clause {#select-sample-clause}
-
-Le `SAMPLE` clause permet approchée `SELECT` le traitement de la requête.
-
-Lorsque l'échantillonnage de données est activé, la requête n'est pas effectuée sur toutes les données, mais uniquement sur une certaine fraction de données (échantillon). Par exemple, si vous avez besoin de calculer des statistiques pour toutes les visites, il suffit d'exécuter la requête sur le 1/10 de la fraction de toutes les visites, puis multiplier le résultat par 10.
-
-Le traitement approximatif des requêtes peut être utile dans les cas suivants:
-
--   Lorsque vous avez des exigences de synchronisation strictes (comme \<100ms), mais que vous ne pouvez pas justifier le coût des ressources matérielles supplémentaires pour y répondre.
--   Lorsque vos données brutes ne sont pas précises, l'approximation ne dégrade pas sensiblement la qualité.
--   Les exigences commerciales ciblent des résultats approximatifs (pour la rentabilité, ou pour commercialiser des résultats exacts aux utilisateurs premium).
-
-!!! note "Note"
-    Vous ne pouvez utiliser l'échantillonnage qu'avec les tables [MergeTree](../../../engines/table-engines/mergetree-family/mergetree.md) famille, et seulement si l'expression d'échantillonnage a été spécifiée lors de la création de la table (voir [Moteur MergeTree](../../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-creating-a-table)).
-
-Les caractéristiques de l'échantillonnage des données sont énumérées ci-dessous:
-
--   L'échantillonnage de données est un mécanisme déterministe. Le résultat de la même `SELECT .. SAMPLE` la requête est toujours le même.
--   L'échantillonnage fonctionne de manière cohérente pour différentes tables. Pour les tables avec une seule clé d'échantillonnage, un échantillon avec le même coefficient sélectionne toujours le même sous-ensemble de données possibles. Par exemple, un exemple d'ID utilisateur prend des lignes avec le même sous-ensemble de tous les ID utilisateur possibles de différentes tables. Cela signifie que vous pouvez utiliser l'exemple dans les sous-requêtes dans la [IN](../../operators/in.md) clause. En outre, vous pouvez joindre des échantillons en utilisant le [JOIN](join.md) clause.
--   L'échantillonnage permet de lire moins de données à partir d'un disque. Notez que vous devez spécifier l'échantillonnage clé correctement. Pour plus d'informations, voir [Création d'une Table MergeTree](../../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-creating-a-table).
-
-Pour l' `SAMPLE` clause la syntaxe suivante est prise en charge:
-
-| SAMPLE Clause Syntax | Description                                                                                                                                                                                                                                                                 |
-|----------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `SAMPLE k`           | Ici `k` est le nombre de 0 à 1.</br>La requête est exécutée sur `k` fraction des données. Exemple, `SAMPLE 0.1` exécute la requête sur 10% des données. [Lire plus](#select-sample-k)                                                                                       |
-| `SAMPLE n`           | Ici `n` est un entier suffisamment grand.</br>La requête est exécutée sur un échantillon d'au moins `n` lignes (mais pas significativement plus que cela). Exemple, `SAMPLE 10000000` exécute la requête sur un minimum de 10 000 000 lignes. [Lire plus](#select-sample-n) |
-| `SAMPLE k OFFSET m`  | Ici `k` et `m` sont les nombres de 0 à 1.</br>La requête est exécutée sur un échantillon de `k` fraction des données. Les données utilisées pour l'échantillon est compensée par `m` fraction. [Lire plus](#select-sample-offset)                                           |
-
-## SAMPLE K {#select-sample-k}
-
-Ici `k` est le nombre de 0 à 1 (les notations fractionnaires et décimales sont prises en charge). Exemple, `SAMPLE 1/2` ou `SAMPLE 0.5`.
-
-Dans un `SAMPLE k` clause, l'échantillon est prélevé à partir de la `k` fraction des données. L'exemple est illustré ci-dessous:
-
-``` sql
-SELECT
-    Title,
-    count() * 10 AS PageViews
-FROM hits_distributed
-SAMPLE 0.1
-WHERE
-    CounterID = 34
-GROUP BY Title
-ORDER BY PageViews DESC LIMIT 1000
-```
-
-Dans cet exemple, la requête est exécutée sur un échantillon de 0,1 (10%) de données. Les valeurs des fonctions d'agrégat ne sont pas corrigées automatiquement, donc pour obtenir un résultat approximatif, la valeur `count()` est multiplié manuellement par 10.
-
-## SAMPLE N {#select-sample-n}
-
-Ici `n` est un entier suffisamment grand. Exemple, `SAMPLE 10000000`.
-
-Dans ce cas, la requête est exécutée sur un échantillon d'au moins `n` lignes (mais pas significativement plus que cela). Exemple, `SAMPLE 10000000` exécute la requête sur un minimum de 10 000 000 lignes.
-
-Puisque l'unité minimale pour la lecture des données est un granule (sa taille est définie par le `index_granularity` de réglage), il est logique de définir un échantillon beaucoup plus grand que la taille du granule.
-
-Lors de l'utilisation de la `SAMPLE n` clause, vous ne savez pas quel pourcentage relatif de données a été traité. Donc, vous ne connaissez pas le coefficient par lequel les fonctions agrégées doivent être multipliées. L'utilisation de la `_sample_factor` colonne virtuelle pour obtenir le résultat approximatif.
-
-Le `_sample_factor` colonne contient des coefficients relatifs qui sont calculés dynamiquement. Cette colonne est créée automatiquement lorsque vous [créer](../../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-creating-a-table) une table avec la clé d'échantillonnage spécifiée. Les exemples d'utilisation de la `_sample_factor` colonne sont indiqués ci-dessous.
-
-Considérons la table `visits` qui contient des statistiques sur les visites de site. Le premier exemple montre comment calculer le nombre de pages vues:
-
-``` sql
-SELECT sum(PageViews * _sample_factor)
-FROM visits
-SAMPLE 10000000
-```
-
-L'exemple suivant montre comment calculer le nombre total de visites:
-
-``` sql
-SELECT sum(_sample_factor)
-FROM visits
-SAMPLE 10000000
-```
-
-L'exemple ci-dessous montre comment calculer la durée moyenne de la session. Notez que vous n'avez pas besoin d'utiliser le coefficient relatif pour calculer les valeurs moyennes.
-
-``` sql
-SELECT avg(Duration)
-FROM visits
-SAMPLE 10000000
-```
-
-## SAMPLE K OFFSET M {#select-sample-offset}
-
-Ici `k` et `m` sont des nombres de 0 à 1. Des exemples sont présentés ci-dessous.
-
-**Exemple 1**
-
-``` sql
-SAMPLE 1/10
-```
-
-Dans cet exemple, l'échantillon représente 1 / 10e de toutes les données:
-
-`[++------------]`
-
-**Exemple 2**
-
-``` sql
-SAMPLE 1/10 OFFSET 1/2
-```
-
-Ici, un échantillon de 10% est prélevé à partir de la seconde moitié des données.
-
-`[------++------]`
diff --git a/docs/fr/sql-reference/statements/select/union.md b/docs/fr/sql-reference/statements/select/union.md
deleted file mode 100644
index 9ae65ebcf72..00000000000
--- a/docs/fr/sql-reference/statements/select/union.md
+++ /dev/null
@@ -1,35 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
----
-
-# Clause UNION ALL {#union-clause}
-
-Vous pouvez utiliser `UNION ALL` à combiner `SELECT` requêtes en étendant leurs résultats. Exemple:
-
-``` sql
-SELECT CounterID, 1 AS table, toInt64(count()) AS c
-    FROM test.hits
-    GROUP BY CounterID
-
-UNION ALL
-
-SELECT CounterID, 2 AS table, sum(Sign) AS c
-    FROM test.visits
-    GROUP BY CounterID
-    HAVING c > 0
-```
-
-Les colonnes de résultat sont appariées par leur index (ordre intérieur `SELECT`). Si les noms de colonne ne correspondent pas, les noms du résultat final sont tirés de la première requête.
-
-La coulée de Type est effectuée pour les syndicats. Par exemple, si deux requêtes combinées ont le même champ avec non-`Nullable` et `Nullable` types d'un type compatible, la `UNION ALL` a un `Nullable` type de champ.
-
-Requêtes qui font partie de `UNION ALL` ne peut pas être placée entre parenthèses. [ORDER BY](order-by.md) et [LIMIT](limit.md) sont appliqués à des requêtes séparées, pas au résultat final. Si vous devez appliquer une conversion au résultat final, vous pouvez mettre toutes les requêtes avec `UNION ALL` dans une sous-requête dans la [FROM](from.md) clause.
-
-## Limitation {#limitations}
-
-Seulement `UNION ALL` est pris en charge. Régulier `UNION` (`UNION DISTINCT`) n'est pas pris en charge. Si vous avez besoin d' `UNION DISTINCT`, vous pouvez écrire `SELECT DISTINCT` à partir d'une sous-requête contenant `UNION ALL`.
-
-## Détails De Mise En Œuvre {#implementation-details}
-
-Requêtes qui font partie de `UNION ALL` peuvent être exécutées simultanément, et leurs résultats peuvent être mélangés ensemble.
diff --git a/docs/fr/sql-reference/statements/select/where.md b/docs/fr/sql-reference/statements/select/where.md
deleted file mode 100644
index a4d7bc5e87a..00000000000
--- a/docs/fr/sql-reference/statements/select/where.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
----
-
-# Clause where {#select-where}
-
-`WHERE` clause permet de filtrer les données en provenance de [FROM](from.md) la clause de `SELECT`.
-
-Si il y a un `WHERE` , il doit contenir une expression avec la `UInt8` type. C'est généralement une expression avec comparaison et opérateurs logiques. Les lignes où cette expression est évaluée à 0 sont exclues des transformations ou des résultats ultérieurs.
-
-`WHERE` expression est évaluée sur la possibilité d'utiliser des index et l'élagage de partition, si le moteur de table sous-jacent le prend en charge.
-
-!!! note "Note"
-    Il y a une optimisation de filtrage appelée [prewhere](prewhere.md).
diff --git a/docs/fr/sql-reference/statements/select/with.md b/docs/fr/sql-reference/statements/select/with.md
deleted file mode 100644
index a42aedf460b..00000000000
--- a/docs/fr/sql-reference/statements/select/with.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
----
-
-# AVEC la Clause {#with-clause}
-
-Cette section prend en charge les Expressions de Table courantes ([CTE](https://en.wikipedia.org/wiki/Hierarchical_and_recursive_queries_in_SQL)), de sorte que les résultats de `WITH` la clause peut être utilisé à l'intérieur `SELECT` clause.
-
-## Limitation {#limitations}
-
-1.  Les requêtes récursives ne sont pas prises en charge.
-2.  Lorsque la sous-requête est utilisée à l'intérieur avec section, son résultat doit être scalaire avec exactement une ligne.
-3.  Les résultats d'Expression ne sont pas disponibles dans les sous-requêtes.
-
-## Exemple {#examples}
-
-**Exemple 1:** Utilisation d'une expression constante comme “variable”
-
-``` sql
-WITH '2019-08-01 15:23:00' as ts_upper_bound
-SELECT *
-FROM hits
-WHERE
-    EventDate = toDate(ts_upper_bound) AND
-    EventTime <= ts_upper_bound
-```
-
-**Exemple 2:** De les expulser, somme(octets) résultat de l'expression de clause SELECT de la liste de colonnes
-
-``` sql
-WITH sum(bytes) as s
-SELECT
-    formatReadableSize(s),
-    table
-FROM system.parts
-GROUP BY table
-ORDER BY s
-```
-
-**Exemple 3:** Utilisation des résultats de la sous-requête scalaire
-
-``` sql
-/* this example would return TOP 10 of most huge tables */
-WITH
-    (
-        SELECT sum(bytes)
-        FROM system.parts
-        WHERE active
-    ) AS total_disk_usage
-SELECT
-    (sum(bytes) / total_disk_usage) * 100 AS table_disk_usage,
-    table
-FROM system.parts
-GROUP BY table
-ORDER BY table_disk_usage DESC
-LIMIT 10
-```
-
-**Exemple 4:** Réutilisation de l'expression dans la sous-requête
-
-Comme solution de contournement pour la limitation actuelle de l'utilisation de l'expression dans les sous-requêtes, Vous pouvez la dupliquer.
-
-``` sql
-WITH ['hello'] AS hello
-SELECT
-    hello,
-    *
-FROM
-(
-    WITH ['hello'] AS hello
-    SELECT hello
-)
-```
-
-``` text
-┌─hello─────┬─hello─────┐
-│ ['hello'] │ ['hello'] │
-└───────────┴───────────┘
-```
diff --git a/docs/fr/sql-reference/statements/show.md b/docs/fr/sql-reference/statements/show.md
deleted file mode 100644
index 129c6e30d1c..00000000000
--- a/docs/fr/sql-reference/statements/show.md
+++ /dev/null
@@ -1,169 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 38
-toc_title: SHOW
----
-
-# Afficher les requêtes {#show-queries}
-
-## SHOW CREATE TABLE {#show-create-table}
-
-``` sql
-SHOW CREATE [TEMPORARY] [TABLE|DICTIONARY] [db.]table [INTO OUTFILE filename] [FORMAT format]
-```
-
-Renvoie un seul `String`-type ‘statement’ column, which contains a single value – the `CREATE` requête utilisée pour créer l'objet spécifié.
-
-## SHOW DATABASES {#show-databases}
-
-``` sql
-SHOW DATABASES [INTO OUTFILE filename] [FORMAT format]
-```
-
-Imprime une liste de toutes les bases de données.
-Cette requête est identique à `SELECT name FROM system.databases [INTO OUTFILE filename] [FORMAT format]`.
-
-## SHOW PROCESSLIST {#show-processlist}
-
-``` sql
-SHOW PROCESSLIST [INTO OUTFILE filename] [FORMAT format]
-```
-
-Sorties le contenu de la [système.processus](../../operations/system-tables.md#system_tables-processes) table, qui contient une liste de requêtes en cours de traitement en ce moment, à l'exception `SHOW PROCESSLIST` requête.
-
-Le `SELECT * FROM system.processes` requête renvoie des données sur toutes les requêtes en cours.
-
-Astuce (exécuter dans la console):
-
-``` bash
-$ watch -n1 "clickhouse-client --query='SHOW PROCESSLIST'"
-```
-
-## SHOW TABLES {#show-tables}
-
-Affiche une liste de tableaux.
-
-``` sql
-SHOW [TEMPORARY] TABLES [{FROM | IN} <db>] [LIKE '<pattern>' | WHERE expr] [LIMIT <N>] [INTO OUTFILE <filename>] [FORMAT <format>]
-```
-
-Si l' `FROM` la clause n'est pas spécifié, la requête renvoie la liste des tables de la base de données actuelle.
-
-Vous pouvez obtenir les mêmes résultats que l' `SHOW TABLES` requête de la façon suivante:
-
-``` sql
-SELECT name FROM system.tables WHERE database = <db> [AND name LIKE <pattern>] [LIMIT <N>] [INTO OUTFILE <filename>] [FORMAT <format>]
-```
-
-**Exemple**
-
-La requête suivante sélectionne les deux premières lignes de la liste des tables `system` base de données, dont les noms contiennent `co`.
-
-``` sql
-SHOW TABLES FROM system LIKE '%co%' LIMIT 2
-```
-
-``` text
-┌─name───────────────────────────┐
-│ aggregate_function_combinators │
-│ collations                     │
-└────────────────────────────────┘
-```
-
-## SHOW DICTIONARIES {#show-dictionaries}
-
-Affiche une liste de [dictionnaires externes](../../sql-reference/dictionaries/external-dictionaries/external-dicts.md).
-
-``` sql
-SHOW DICTIONARIES [FROM <db>] [LIKE '<pattern>'] [LIMIT <N>] [INTO OUTFILE <filename>] [FORMAT <format>]
-```
-
-Si l' `FROM` la clause n'est pas spécifié, la requête retourne la liste des dictionnaires de la base de données actuelle.
-
-Vous pouvez obtenir les mêmes résultats que l' `SHOW DICTIONARIES` requête de la façon suivante:
-
-``` sql
-SELECT name FROM system.dictionaries WHERE database = <db> [AND name LIKE <pattern>] [LIMIT <N>] [INTO OUTFILE <filename>] [FORMAT <format>]
-```
-
-**Exemple**
-
-La requête suivante sélectionne les deux premières lignes de la liste des tables `system` base de données, dont les noms contiennent `reg`.
-
-``` sql
-SHOW DICTIONARIES FROM db LIKE '%reg%' LIMIT 2
-```
-
-``` text
-┌─name─────────┐
-│ regions      │
-│ region_names │
-└──────────────┘
-```
-
-## SHOW GRANTS {#show-grants-statement}
-
-Montre les privilèges d'un utilisateur.
-
-### Syntaxe {#show-grants-syntax}
-
-``` sql
-SHOW GRANTS [FOR user]
-```
-
-Si l'utilisateur n'est pas spécifié, la requête renvoie les privilèges de l'utilisateur actuel.
-
-## SHOW CREATE USER {#show-create-user-statement}
-
-Affiche les paramètres qui ont été utilisés [la création d'un utilisateur](create.md#create-user-statement).
-
-`SHOW CREATE USER` ne produit pas de mots de passe utilisateur.
-
-### Syntaxe {#show-create-user-syntax}
-
-``` sql
-SHOW CREATE USER [name | CURRENT_USER]
-```
-
-## SHOW CREATE ROLE {#show-create-role-statement}
-
-Affiche les paramètres qui ont été utilisés [la création de rôle](create.md#create-role-statement)
-
-### Syntaxe {#show-create-role-syntax}
-
-``` sql
-SHOW CREATE ROLE name
-```
-
-## SHOW CREATE ROW POLICY {#show-create-row-policy-statement}
-
-Affiche les paramètres qui ont été utilisés [création de stratégie de ligne](create.md#create-row-policy-statement)
-
-### Syntaxe {#show-create-row-policy-syntax}
-
-``` sql
-SHOW CREATE [ROW] POLICY name ON [database.]table
-```
-
-## SHOW CREATE QUOTA {#show-create-quota-statement}
-
-Affiche les paramètres qui ont été utilisés [quota de création](create.md#create-quota-statement)
-
-### Syntaxe {#show-create-row-policy-syntax}
-
-``` sql
-SHOW CREATE QUOTA [name | CURRENT]
-```
-
-## SHOW CREATE SETTINGS PROFILE {#show-create-settings-profile-statement}
-
-Affiche les paramètres qui ont été utilisés [configuration création de profil](create.md#create-settings-profile-statement)
-
-### Syntaxe {#show-create-row-policy-syntax}
-
-``` sql
-SHOW CREATE [SETTINGS] PROFILE name
-```
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/show/) <!--hide-->
diff --git a/docs/fr/sql-reference/statements/system.md b/docs/fr/sql-reference/statements/system.md
deleted file mode 100644
index e8c9ed85cbc..00000000000
--- a/docs/fr/sql-reference/statements/system.md
+++ /dev/null
@@ -1,113 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 37
-toc_title: SYSTEM
----
-
-# SYSTÈME de Requêtes {#query-language-system}
-
--   [RELOAD DICTIONARIES](#query_language-system-reload-dictionaries)
--   [RELOAD DICTIONARY](#query_language-system-reload-dictionary)
--   [DROP DNS CACHE](#query_language-system-drop-dns-cache)
--   [DROP MARK CACHE](#query_language-system-drop-mark-cache)
--   [FLUSH LOGS](#query_language-system-flush_logs)
--   [RELOAD CONFIG](#query_language-system-reload-config)
--   [SHUTDOWN](#query_language-system-shutdown)
--   [KILL](#query_language-system-kill)
--   [STOP DISTRIBUTED SENDS](#query_language-system-stop-distributed-sends)
--   [FLUSH DISTRIBUTED](#query_language-system-flush-distributed)
--   [START DISTRIBUTED SENDS](#query_language-system-start-distributed-sends)
--   [STOP MERGES](#query_language-system-stop-merges)
--   [START MERGES](#query_language-system-start-merges)
-
-## RELOAD DICTIONARIES {#query_language-system-reload-dictionaries}
-
-Recharge tous les dictionnaires qui ont déjà été chargés avec succès.
-Par défaut, les dictionnaires sont chargés paresseusement (voir [dictionaries_lazy_load](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-dictionaries_lazy_load)), donc au lieu d'être chargés automatiquement au démarrage, ils sont initialisés lors du premier accès via la fonction dictGet ou sélectionnez dans les tables avec ENGINE = Dictionary . Le `SYSTEM RELOAD DICTIONARIES` query recharge ces dictionnaires (chargés).
-Retourne toujours `Ok.` quel que soit le résultat de la mise à jour du dictionnaire.
-
-## Recharger le dictionnaire Dictionary_name {#query_language-system-reload-dictionary}
-
-Recharge complètement un dictionnaire `dictionary_name`, quel que soit l'état du dictionnaire (LOADED / NOT_LOADED / FAILED).
-Retourne toujours `Ok.` quel que soit le résultat de la mise à jour du dictionnaire.
-L'état du dictionnaire peut être vérifié en interrogeant le `system.dictionaries` table.
-
-``` sql
-SELECT name, status FROM system.dictionaries;
-```
-
-## DROP DNS CACHE {#query_language-system-drop-dns-cache}
-
-Réinitialise le cache DNS interne de ClickHouse. Parfois (pour les anciennes versions de ClickHouse), il est nécessaire d'utiliser cette commande lors de la modification de l'infrastructure (modification de l'adresse IP d'un autre serveur ClickHouse ou du serveur utilisé par les dictionnaires).
-
-Pour une gestion du cache plus pratique (automatique), voir paramètres disable_internal_dns_cache, dns_cache_update_period.
-
-## DROP MARK CACHE {#query_language-system-drop-mark-cache}
-
-Réinitialise le cache de marque. Utilisé dans le développement de ClickHouse et des tests de performance.
-
-## FLUSH LOGS {#query_language-system-flush_logs}
-
-Flushes buffers of log messages to system tables (e.g. system.query_log). Allows you to not wait 7.5 seconds when debugging.
-
-## RELOAD CONFIG {#query_language-system-reload-config}
-
-Recharge la configuration de ClickHouse. Utilisé lorsque la configuration est stockée dans ZooKeeeper.
-
-## SHUTDOWN {#query_language-system-shutdown}
-
-Normalement ferme ClickHouse (comme `service clickhouse-server stop` / `kill {$pid_clickhouse-server}`)
-
-## KILL {#query_language-system-kill}
-
-Annule le processus de ClickHouse (comme `kill -9 {$ pid_clickhouse-server}`)
-
-## Gestion Des Tables Distribuées {#query-language-system-distributed}
-
-ClickHouse peut gérer [distribué](../../engines/table-engines/special/distributed.md) table. Lorsqu'un utilisateur insère des données dans ces tables, ClickHouse crée d'abord une file d'attente des données qui doivent être envoyées aux nœuds de cluster, puis l'envoie de manière asynchrone. Vous pouvez gérer le traitement des files d'attente avec [STOP DISTRIBUTED SENDS](#query_language-system-stop-distributed-sends), [FLUSH DISTRIBUTED](#query_language-system-flush-distributed), et [START DISTRIBUTED SENDS](#query_language-system-start-distributed-sends) requête. Vous pouvez également insérer de manière synchrone des données distribuées avec `insert_distributed_sync` paramètre.
-
-### STOP DISTRIBUTED SENDS {#query_language-system-stop-distributed-sends}
-
-Désactive la distribution de données en arrière-plan lors de l'insertion de données dans des tables distribuées.
-
-``` sql
-SYSTEM STOP DISTRIBUTED SENDS [db.]<distributed_table_name>
-```
-
-### FLUSH DISTRIBUTED {#query_language-system-flush-distributed}
-
-Force ClickHouse à envoyer des données aux nœuds de cluster de manière synchrone. Si des nœuds ne sont pas disponibles, ClickHouse lève une exception et arrête l'exécution de la requête. Vous pouvez réessayer la requête jusqu'à ce qu'elle réussisse, ce qui se produira lorsque tous les nœuds seront de nouveau en ligne.
-
-``` sql
-SYSTEM FLUSH DISTRIBUTED [db.]<distributed_table_name>
-```
-
-### START DISTRIBUTED SENDS {#query_language-system-start-distributed-sends}
-
-Active la distribution de données en arrière-plan lors de l'insertion de données dans des tables distribuées.
-
-``` sql
-SYSTEM START DISTRIBUTED SENDS [db.]<distributed_table_name>
-```
-
-### STOP MERGES {#query_language-system-stop-merges}
-
-Offre la possibilité d'arrêter les fusions d'arrière-plan pour les tables de la famille MergeTree:
-
-``` sql
-SYSTEM STOP MERGES [[db.]merge_tree_family_table_name]
-```
-
-!!! note "Note"
-    `DETACH / ATTACH` table va commencer les fusions d'arrière-plan pour la table même dans le cas où les fusions ont été arrêtées pour toutes les tables MergeTree auparavant.
-
-### START MERGES {#query_language-system-start-merges}
-
-Offre la possibilité de démarrer des fusions en arrière-plan pour les tables de la famille MergeTree:
-
-``` sql
-SYSTEM START MERGES [[db.]merge_tree_family_table_name]
-```
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/system/) <!--hide-->
diff --git a/docs/fr/sql-reference/syntax.md b/docs/fr/sql-reference/syntax.md
deleted file mode 100644
index b8b24c9bbb5..00000000000
--- a/docs/fr/sql-reference/syntax.md
+++ /dev/null
@@ -1,187 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 31
-toc_title: Syntaxe
----
-
-# Syntaxe {#syntax}
-
-Il existe deux types d'analyseurs dans le système: L'analyseur SQL complet (un analyseur de descente récursif) et l'analyseur de format de données (un analyseur de flux rapide).
-Dans tous les cas à l'exception de la `INSERT` requête, seul L'analyseur SQL complet est utilisé.
-Le `INSERT` requête utilise les deux analyseurs:
-
-``` sql
-INSERT INTO t VALUES (1, 'Hello, world'), (2, 'abc'), (3, 'def')
-```
-
-Le `INSERT INTO t VALUES` fragment est analysé par l'analyseur complet, et les données `(1, 'Hello, world'), (2, 'abc'), (3, 'def')` est analysé par l'analyseur de flux rapide. Vous pouvez également activer l'analyseur complet pour les données à l'aide de la [input_format_values_interpret_expressions](../operations/settings/settings.md#settings-input_format_values_interpret_expressions) paramètre. Lorsque `input_format_values_interpret_expressions = 1`, ClickHouse essaie d'abord d'analyser les valeurs avec l'analyseur de flux rapide. S'il échoue, ClickHouse essaie d'utiliser l'analyseur complet pour les données, en le traitant comme un SQL [expression](#syntax-expressions).
-
-Les données peuvent avoir n'importe quel format. Lorsqu'une requête est reçue, le serveur calcule pas plus que [max_query_size](../operations/settings/settings.md#settings-max_query_size) octets de la requête en RAM (par défaut, 1 Mo), et le reste est analysé en flux.
-Il permet d'éviter les problèmes avec de grandes `INSERT` requête.
-
-Lors de l'utilisation de la `Values` format dans un `INSERT` de la requête, il peut sembler que les données sont analysées de même que les expressions dans un `SELECT` requête, mais ce n'est pas vrai. Le `Values` le format est beaucoup plus limitée.
-
-Le reste de cet article couvre l'analyseur complet. Pour plus d'informations sur les analyseurs de format, consultez [Format](../interfaces/formats.md) section.
-
-## Espace {#spaces}
-
-Il peut y avoir n'importe quel nombre de symboles d'espace entre les constructions syntaxiques (y compris le début et la fin d'une requête). Les symboles d'espace incluent l'espace, l'onglet, le saut de ligne, Le CR et le flux de formulaire.
-
-## Commentaire {#comments}
-
-ClickHouse prend en charge les commentaires de style SQL et de style C.
-Les commentaires de style SQL commencent par `--` et continuer jusqu'à la fin de la ligne, un espace après `--` peut être omis.
-C-style sont de `/*` de `*/`et peut être multiligne, les espaces ne sont pas requis non plus.
-
-## Mot {#syntax-keywords}
-
-Les mots clés sont insensibles à la casse lorsqu'ils correspondent à:
-
--   La norme SQL. Exemple, `SELECT`, `select` et `SeLeCt` sont toutes valides.
--   Implémentation dans certains SGBD populaires (MySQL ou Postgres). Exemple, `DateTime` est le même que `datetime`.
-
-Si le nom du type de données est sensible à la casse peut être vérifié `system.data_type_families` table.
-
-Contrairement à SQL standard, tous les autres mots clés (y compris les noms de fonctions) sont **sensible à la casse**.
-
-Mots-clés ne sont pas réservés; ils sont traités comme tels que dans le contexte correspondant. Si vous utilisez [identificateur](#syntax-identifiers) avec le même nom que les mots-clés, placez-les entre guillemets doubles ou backticks. Par exemple, la requête `SELECT "FROM" FROM table_name` est valide si la table `table_name` a colonne avec le nom de `"FROM"`.
-
-## Identificateur {#syntax-identifiers}
-
-Les identificateurs sont:
-
--   Noms de Cluster, de base de données, de table, de partition et de colonne.
--   Fonction.
--   Types de données.
--   [Expression des alias](#syntax-expression_aliases).
-
-Les identificateurs peuvent être cités ou non cités. Ce dernier est préféré.
-
-Non identificateurs doivent correspondre à l'expression régulière `^[a-zA-Z_][0-9a-zA-Z_]*$` et ne peut pas être égale à [mot](#syntax-keywords). Exemple: `x, _1, X_y__Z123_.`
-
-Si vous souhaitez utiliser les identifiants de la même manière que les mots-clés ou si vous souhaitez utiliser d'autres symboles dans les identifiants, citez-le en utilisant des guillemets doubles ou des backticks, par exemple, `"id"`, `` `id` ``.
-
-## Littéral {#literals}
-
-Il y a numérique, chaîne de caractères, composé, et `NULL` littéral.
-
-### Numérique {#numeric}
-
-Littéral numérique tente d'être analysé:
-
--   Tout d'abord, comme un nombre signé 64 bits, en utilisant le [strtoull](https://en.cppreference.com/w/cpp/string/byte/strtoul) fonction.
--   En cas d'échec, en tant que nombre non signé 64 bits, [strtoll](https://en.cppreference.com/w/cpp/string/byte/strtol) fonction.
--   En cas d'échec, en tant que nombre à virgule flottante [strtod](https://en.cppreference.com/w/cpp/string/byte/strtof) fonction.
--   Sinon, elle renvoie une erreur.
-
-La valeur littérale a le plus petit type dans lequel la valeur correspond.
-Par exemple, 1 est analysé comme `UInt8`, mais 256 est analysé comme `UInt16`. Pour plus d'informations, voir [Types de données](../sql-reference/data-types/index.md).
-
-Exemple: `1`, `18446744073709551615`, `0xDEADBEEF`, `01`, `0.1`, `1e100`, `-1e-100`, `inf`, `nan`.
-
-### Chaîne {#syntax-string-literal}
-
-Seuls les littéraux de chaîne entre guillemets simples sont pris en charge. Le clos de caractères barre oblique inverse échappé. Les séquences d'échappement suivantes ont une valeur spéciale correspondante: `\b`, `\f`, `\r`, `\n`, `\t`, `\0`, `\a`, `\v`, `\xHH`. Dans tous les autres cas, des séquences d'échappement au format `\c`, où `c` est un caractère, sont convertis à `c`. Cela signifie que vous pouvez utiliser les séquences `\'`et`\\`. La valeur aurez l' [Chaîne](../sql-reference/data-types/string.md) type.
-
-Dans les littéraux de chaîne, vous devez vous échapper d'au moins `'` et `\`. Les guillemets simples peuvent être échappés avec le guillemet simple, littéraux `'It\'s'` et `'It''s'` sont égaux.
-
-### Composé {#compound}
-
-Les tableaux sont construits avec des crochets `[1, 2, 3]`. Nuples sont construits avec des supports ronds `(1, 'Hello, world!', 2)`.
-Techniquement, ce ne sont pas des littéraux, mais des expressions avec l'opérateur de création de tableau et l'opérateur de création de tuple, respectivement.
-Un tableau doit être composé d'au moins un élément, et un tuple doit avoir au moins deux éléments.
-Il y a un cas distinct lorsque les tuples apparaissent dans le `IN` clause de a `SELECT` requête. Les résultats de la requête peuvent inclure des tuples, mais les tuples ne peuvent pas être enregistrés dans une base de données (à l'exception des tables avec [Mémoire](../engines/table-engines/special/memory.md) moteur).
-
-### NULL {#null-literal}
-
-Indique que la valeur est manquante.
-
-Afin de stocker `NULL` dans un champ de table, il doit être de la [Nullable](../sql-reference/data-types/nullable.md) type.
-
-Selon le format de données (entrée ou sortie), `NULL` peut avoir une représentation différente. Pour plus d'informations, consultez la documentation de [formats de données](../interfaces/formats.md#formats).
-
-Il y a beaucoup de nuances au traitement `NULL`. Par exemple, si au moins l'un des arguments d'une opération de comparaison est `NULL` le résultat de cette opération est également `NULL`. Il en va de même pour la multiplication, l'addition et d'autres opérations. Pour plus d'informations, lisez la documentation pour chaque opération.
-
-Dans les requêtes, vous pouvez vérifier `NULL` à l'aide de la [IS NULL](operators/index.md#operator-is-null) et [IS NOT NULL](operators/index.md) opérateurs et les fonctions connexes `isNull` et `isNotNull`.
-
-## Fonction {#functions}
-
-Les appels de fonction sont écrits comme un identifiant avec une liste d'arguments (éventuellement vide) entre parenthèses. Contrairement à SQL standard, les crochets sont requis, même pour une liste d'arguments vide. Exemple: `now()`.
-Il existe des fonctions régulières et agrégées (voir la section “Aggregate functions”). Certaines fonctions d'agrégat peut contenir deux listes d'arguments entre parenthèses. Exemple: `quantile (0.9) (x)`. Ces fonctions d'agrégation sont appelés “parametric” fonctions, et les arguments dans la première liste sont appelés “parameters”. La syntaxe des fonctions d'agrégation sans paramètres est la même que pour les fonctions régulières.
-
-## Opérateur {#operators}
-
-Les opérateurs sont convertis en leurs fonctions correspondantes lors de l'analyse des requêtes, en tenant compte de leur priorité et de leur associativité.
-Par exemple, l'expression `1 + 2 * 3 + 4` est transformé à `plus(plus(1, multiply(2, 3)), 4)`.
-
-## Types de données et moteurs de Table de base de données {#data_types-and-database-table-engines}
-
-Types de données et moteurs de table dans `CREATE` les requêtes sont écrites de la même manière que les identifiants ou les fonctions. En d'autres termes, ils peuvent ou ne peuvent pas contenir une liste d'arguments entre parenthèses. Pour plus d'informations, voir les sections “Data types,” “Table engines,” et “CREATE”.
-
-## Expression Des Alias {#syntax-expression_aliases}
-
-Un alias est un nom défini par l'utilisateur pour l'expression dans une requête.
-
-``` sql
-expr AS alias
-```
-
--   `AS` — The keyword for defining aliases. You can define the alias for a table name or a column name in a `SELECT` clause sans utiliser le `AS` mot.
-
-        For example, `SELECT table_name_alias.column_name FROM table_name table_name_alias`.
-
-        In the [CAST](sql_reference/functions/type_conversion_functions.md#type_conversion_function-cast) function, the `AS` keyword has another meaning. See the description of the function.
-
--   `expr` — Any expression supported by ClickHouse.
-
-        For example, `SELECT column_name * 2 AS double FROM some_table`.
-
--   `alias` — Name for `expr`. Les alias doivent être conformes à la [identificateur](#syntax-identifiers) syntaxe.
-
-        For example, `SELECT "table t".column_name FROM table_name AS "table t"`.
-
-### Notes sur l'Utilisation de la {#notes-on-usage}
-
-Les alias sont globaux pour une requête ou d'une sous-requête, vous pouvez définir un alias dans n'importe quelle partie d'une requête de toute expression. Exemple, `SELECT (1 AS n) + 2, n`.
-
-Les alias ne sont pas visibles dans les sous-requêtes et entre les sous-requêtes. Par exemple, lors de l'exécution de la requête `SELECT (SELECT sum(b.a) + num FROM b) - a.a AS num FROM a` Clickhouse génère l'exception `Unknown identifier: num`.
-
-Si un alias est défini pour les colonnes de `SELECT` la clause d'une sous-requête, ces colonnes sont visibles dans la requête externe. Exemple, `SELECT n + m FROM (SELECT 1 AS n, 2 AS m)`.
-
-Soyez prudent avec les Alias qui sont les mêmes que les noms de colonnes ou de tables. Considérons l'exemple suivant:
-
-``` sql
-CREATE TABLE t
-(
-    a Int,
-    b Int
-)
-ENGINE = TinyLog()
-```
-
-``` sql
-SELECT
-    argMax(a, b),
-    sum(b) AS b
-FROM t
-```
-
-``` text
-Received exception from server (version 18.14.17):
-Code: 184. DB::Exception: Received from localhost:9000, 127.0.0.1. DB::Exception: Aggregate function sum(b) is found inside another aggregate function in query.
-```
-
-Dans cet exemple, nous avons déclaré table `t` avec la colonne `b`. Ensuite, lors de la sélection des données, nous avons défini le `sum(b) AS b` alias. Comme les alias sont globaux, ClickHouse a substitué le littéral `b` dans l'expression `argMax(a, b)` avec l'expression `sum(b)`. Cette substitution a provoqué l'exception.
-
-## Astérisque {#asterisk}
-
-Dans un `SELECT` requête, un astérisque peut remplacer l'expression. Pour plus d'informations, consultez la section “SELECT”.
-
-## Expression {#syntax-expressions}
-
-Une expression est une fonction, un identifiant, un littéral, une application d'un opérateur, une expression entre parenthèses, une sous-requête ou un astérisque. Il peut également contenir un alias.
-Une liste des expressions est une ou plusieurs expressions séparées par des virgules.
-Les fonctions et les opérateurs, à leur tour, peuvent avoir des expressions comme arguments.
-
-[Article Original](https://clickhouse.tech/docs/en/sql_reference/syntax/) <!--hide-->
diff --git a/docs/fr/sql-reference/table-functions/file.md b/docs/fr/sql-reference/table-functions/file.md
deleted file mode 100644
index a58821d021d..00000000000
--- a/docs/fr/sql-reference/table-functions/file.md
+++ /dev/null
@@ -1,121 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 37
-toc_title: fichier
----
-
-# fichier {#file}
-
-Crée un tableau à partir d'un fichier. Cette fonction de table est similaire à [URL](url.md) et [hdfs](hdfs.md) ceux.
-
-``` sql
-file(path, format, structure)
-```
-
-**Les paramètres d'entrée**
-
--   `path` — The relative path to the file from [user_files_path](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-user_files_path). Chemin d'accès à la prise en charge des fichiers suivant les globs en mode Lecture seule: `*`, `?`, `{abc,def}` et `{N..M}` où `N`, `M` — numbers, \``'abc', 'def'` — strings.
--   `format` — The [format](../../interfaces/formats.md#formats) de le fichier.
--   `structure` — Structure of the table. Format `'column1_name column1_type, column2_name column2_type, ...'`.
-
-**Valeur renvoyée**
-
-Une table avec la structure spécifiée pour lire ou écrire des données dans le fichier spécifié.
-
-**Exemple**
-
-Paramètre `user_files_path` et le contenu du fichier `test.csv`:
-
-``` bash
-$ grep user_files_path /etc/clickhouse-server/config.xml
-    <user_files_path>/var/lib/clickhouse/user_files/</user_files_path>
-
-$ cat /var/lib/clickhouse/user_files/test.csv
-    1,2,3
-    3,2,1
-    78,43,45
-```
-
-Table de`test.csv` et la sélection des deux premières lignes de ce:
-
-``` sql
-SELECT *
-FROM file('test.csv', 'CSV', 'column1 UInt32, column2 UInt32, column3 UInt32')
-LIMIT 2
-```
-
-``` text
-┌─column1─┬─column2─┬─column3─┐
-│       1 │       2 │       3 │
-│       3 │       2 │       1 │
-└─────────┴─────────┴─────────┘
-```
-
-``` sql
--- getting the first 10 lines of a table that contains 3 columns of UInt32 type from a CSV file
-SELECT * FROM file('test.csv', 'CSV', 'column1 UInt32, column2 UInt32, column3 UInt32') LIMIT 10
-```
-
-**Globs dans le chemin**
-
-Plusieurs composants de chemin peuvent avoir des globs. Pour être traité, le fichier doit exister et correspondre à l'ensemble du modèle de chemin (pas seulement le suffixe ou le préfixe).
-
--   `*` — Substitutes any number of any characters except `/` y compris la chaîne vide.
--   `?` — Substitutes any single character.
--   `{some_string,another_string,yet_another_one}` — Substitutes any of strings `'some_string', 'another_string', 'yet_another_one'`.
--   `{N..M}` — Substitutes any number in range from N to M including both borders.
-
-Les Constructions avec `{}` sont similaires à l' [fonction de table à distance](../../sql-reference/table-functions/remote.md)).
-
-**Exemple**
-
-1.  Supposons que nous ayons plusieurs fichiers avec les chemins relatifs suivants:
-
--   ‘some_dir/some_file_1’
--   ‘some_dir/some_file_2’
--   ‘some_dir/some_file_3’
--   ‘another_dir/some_file_1’
--   ‘another_dir/some_file_2’
--   ‘another_dir/some_file_3’
-
-1.  Interroger la quantité de lignes dans ces fichiers:
-
-<!-- -->
-
-``` sql
-SELECT count(*)
-FROM file('{some,another}_dir/some_file_{1..3}', 'TSV', 'name String, value UInt32')
-```
-
-1.  Requête de la quantité de lignes dans tous les fichiers de ces deux répertoires:
-
-<!-- -->
-
-``` sql
-SELECT count(*)
-FROM file('{some,another}_dir/*', 'TSV', 'name String, value UInt32')
-```
-
-!!! warning "Avertissement"
-    Si votre liste de fichiers contient des plages de nombres avec des zéros en tête, utilisez la construction avec des accolades pour chaque chiffre séparément ou utilisez `?`.
-
-**Exemple**
-
-Interroger les données des fichiers nommés `file000`, `file001`, … , `file999`:
-
-``` sql
-SELECT count(*)
-FROM file('big_dir/file{0..9}{0..9}{0..9}', 'CSV', 'name String, value UInt32')
-```
-
-## Les Colonnes Virtuelles {#virtual-columns}
-
--   `_path` — Path to the file.
--   `_file` — Name of the file.
-
-**Voir Aussi**
-
--   [Les colonnes virtuelles](https://clickhouse.tech/docs/en/operations/table_engines/#table_engines-virtual_columns)
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/table_functions/file/) <!--hide-->
diff --git a/docs/fr/sql-reference/table-functions/generate.md b/docs/fr/sql-reference/table-functions/generate.md
deleted file mode 100644
index 1f7eeddd0e1..00000000000
--- a/docs/fr/sql-reference/table-functions/generate.md
+++ /dev/null
@@ -1,44 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 47
-toc_title: generateRandom
----
-
-# generateRandom {#generaterandom}
-
-Génère des données aléatoires avec un schéma donné.
-Permet de remplir des tables de test avec des données.
-Prend en charge tous les types de données qui peuvent être stockés dans la table sauf `LowCardinality` et `AggregateFunction`.
-
-``` sql
-generateRandom('name TypeName[, name TypeName]...', [, 'random_seed'[, 'max_string_length'[, 'max_array_length']]]);
-```
-
-**Paramètre**
-
--   `name` — Name of corresponding column.
--   `TypeName` — Type of corresponding column.
--   `max_array_length` — Maximum array length for all generated arrays. Defaults to `10`.
--   `max_string_length` — Maximum string length for all generated strings. Defaults to `10`.
--   `random_seed` — Specify random seed manually to produce stable results. If NULL — seed is randomly generated.
-
-**Valeur Renvoyée**
-
-Un objet de table avec le schéma demandé.
-
-## Exemple D'Utilisation {#usage-example}
-
-``` sql
-SELECT * FROM generateRandom('a Array(Int8), d Decimal32(4), c Tuple(DateTime64(3), UUID)', 1, 10, 2) LIMIT 3;
-```
-
-``` text
-┌─a────────┬────────────d─┬─c──────────────────────────────────────────────────────────────────┐
-│ [77]     │ -124167.6723 │ ('2061-04-17 21:59:44.573','3f72f405-ec3e-13c8-44ca-66ef335f7835') │
-│ [32,110] │ -141397.7312 │ ('1979-02-09 03:43:48.526','982486d1-5a5d-a308-e525-7bd8b80ffa73') │
-│ [68]     │  -67417.0770 │ ('2080-03-12 14:17:31.269','110425e5-413f-10a6-05ba-fa6b3e929f15') │
-└──────────┴──────────────┴────────────────────────────────────────────────────────────────────┘
-```
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/table_functions/generate/) <!--hide-->
diff --git a/docs/fr/sql-reference/table-functions/hdfs.md b/docs/fr/sql-reference/table-functions/hdfs.md
deleted file mode 100644
index 51b742d8018..00000000000
--- a/docs/fr/sql-reference/table-functions/hdfs.md
+++ /dev/null
@@ -1,104 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 45
-toc_title: hdfs
----
-
-# hdfs {#hdfs}
-
-Crée une table à partir de fichiers dans HDFS. Cette fonction de table est similaire à [URL](url.md) et [fichier](file.md) ceux.
-
-``` sql
-hdfs(URI, format, structure)
-```
-
-**Les paramètres d'entrée**
-
--   `URI` — The relative URI to the file in HDFS. Path to file support following globs in readonly mode: `*`, `?`, `{abc,def}` et `{N..M}` où `N`, `M` — numbers, \``'abc', 'def'` — strings.
--   `format` — The [format](../../interfaces/formats.md#formats) de le fichier.
--   `structure` — Structure of the table. Format `'column1_name column1_type, column2_name column2_type, ...'`.
-
-**Valeur renvoyée**
-
-Une table avec la structure spécifiée pour lire ou écrire des données dans le fichier spécifié.
-
-**Exemple**
-
-Table de `hdfs://hdfs1:9000/test` et la sélection des deux premières lignes de ce:
-
-``` sql
-SELECT *
-FROM hdfs('hdfs://hdfs1:9000/test', 'TSV', 'column1 UInt32, column2 UInt32, column3 UInt32')
-LIMIT 2
-```
-
-``` text
-┌─column1─┬─column2─┬─column3─┐
-│       1 │       2 │       3 │
-│       3 │       2 │       1 │
-└─────────┴─────────┴─────────┘
-```
-
-**Globs dans le chemin**
-
-Plusieurs composants de chemin peuvent avoir des globs. Pour être traité, le fichier doit exister et correspondre à l'ensemble du modèle de chemin (pas seulement le suffixe ou le préfixe).
-
--   `*` — Substitutes any number of any characters except `/` y compris la chaîne vide.
--   `?` — Substitutes any single character.
--   `{some_string,another_string,yet_another_one}` — Substitutes any of strings `'some_string', 'another_string', 'yet_another_one'`.
--   `{N..M}` — Substitutes any number in range from N to M including both borders.
-
-Les Constructions avec `{}` sont similaires à l' [fonction de table à distance](../../sql-reference/table-functions/remote.md)).
-
-**Exemple**
-
-1.  Supposons que nous ayons plusieurs fichiers avec les URI suivants sur HDFS:
-
--   ‘hdfs://hdfs1:9000/some_dir/some_file_1’
--   ‘hdfs://hdfs1:9000/some_dir/some_file_2’
--   ‘hdfs://hdfs1:9000/some_dir/some_file_3’
--   ‘hdfs://hdfs1:9000/another_dir/some_file_1’
--   ‘hdfs://hdfs1:9000/another_dir/some_file_2’
--   ‘hdfs://hdfs1:9000/another_dir/some_file_3’
-
-1.  Interroger la quantité de lignes dans ces fichiers:
-
-<!-- -->
-
-``` sql
-SELECT count(*)
-FROM hdfs('hdfs://hdfs1:9000/{some,another}_dir/some_file_{1..3}', 'TSV', 'name String, value UInt32')
-```
-
-1.  Requête de la quantité de lignes dans tous les fichiers de ces deux répertoires:
-
-<!-- -->
-
-``` sql
-SELECT count(*)
-FROM hdfs('hdfs://hdfs1:9000/{some,another}_dir/*', 'TSV', 'name String, value UInt32')
-```
-
-!!! warning "Avertissement"
-    Si votre liste de fichiers contient des plages de nombres avec des zéros en tête, utilisez la construction avec des accolades pour chaque chiffre séparément ou utilisez `?`.
-
-**Exemple**
-
-Interroger les données des fichiers nommés `file000`, `file001`, … , `file999`:
-
-``` sql
-SELECT count(*)
-FROM hdfs('hdfs://hdfs1:9000/big_dir/file{0..9}{0..9}{0..9}', 'CSV', 'name String, value UInt32')
-```
-
-## Les Colonnes Virtuelles {#virtual-columns}
-
--   `_path` — Path to the file.
--   `_file` — Name of the file.
-
-**Voir Aussi**
-
--   [Les colonnes virtuelles](https://clickhouse.tech/docs/en/operations/table_engines/#table_engines-virtual_columns)
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/table_functions/hdfs/) <!--hide-->
diff --git a/docs/fr/sql-reference/table-functions/index.md b/docs/fr/sql-reference/table-functions/index.md
deleted file mode 100644
index 89a8200e385..00000000000
--- a/docs/fr/sql-reference/table-functions/index.md
+++ /dev/null
@@ -1,38 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: Les Fonctions De Table
-toc_priority: 34
-toc_title: Introduction
----
-
-# Les Fonctions De Table {#table-functions}
-
-Les fonctions de Table sont des méthodes pour construire des tables.
-
-Vous pouvez utiliser les fonctions de table dans:
-
--   [FROM](../statements/select/from.md) la clause de la `SELECT` requête.
-
-        The method for creating a temporary table that is available only in the current query. The table is deleted when the query finishes.
-
--   [Créer une TABLE en tant que \< table_function ()\>](../statements/create.md#create-table-query) requête.
-
-        It's one of the methods of creating a table.
-
-!!! warning "Avertissement"
-    Vous ne pouvez pas utiliser les fonctions de table si [allow_ddl](../../operations/settings/permissions-for-queries.md#settings_allow_ddl) paramètre est désactivé.
-
-| Fonction              | Description                                                                                                                         |
-|-----------------------|-------------------------------------------------------------------------------------------------------------------------------------|
-| [fichier](file.md)    | Crée un [Fichier](../../engines/table-engines/special/file.md)-moteur de table.                                                     |
-| [fusionner](merge.md) | Crée un [Fusionner](../../engines/table-engines/special/merge.md)-moteur de table.                                                  |
-| [nombre](numbers.md)  | Crée une table avec une seule colonne remplie de nombres entiers.                                                                   |
-| [distant](remote.md)  | Vous permet d'accéder à des serveurs distants sans [Distribué](../../engines/table-engines/special/distributed.md)-moteur de table. |
-| [URL](url.md)         | Crée un [URL](../../engines/table-engines/special/url.md)-moteur de table.                                                          |
-| [mysql](mysql.md)     | Crée un [MySQL](../../engines/table-engines/integrations/mysql.md)-moteur de table.                                                 |
-| [jdbc](jdbc.md)       | Crée un [JDBC](../../engines/table-engines/integrations/jdbc.md)-moteur de table.                                                   |
-| [ODBC](odbc.md)       | Crée un [ODBC](../../engines/table-engines/integrations/odbc.md)-moteur de table.                                                   |
-| [hdfs](hdfs.md)       | Crée un [HDFS](../../engines/table-engines/integrations/hdfs.md)-moteur de table.                                                   |
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/table_functions/) <!--hide-->
diff --git a/docs/fr/sql-reference/table-functions/input.md b/docs/fr/sql-reference/table-functions/input.md
deleted file mode 100644
index 21e0eacb5c1..00000000000
--- a/docs/fr/sql-reference/table-functions/input.md
+++ /dev/null
@@ -1,47 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 46
-toc_title: "entr\xE9e"
----
-
-# entrée {#input}
-
-`input(structure)` - fonction de table qui permet effectivement convertir et insérer des données envoyées à la
-serveur avec une structure donnée à la table avec une autre structure.
-
-`structure` - structure de données envoyées au serveur dans le format suivant `'column1_name column1_type, column2_name column2_type, ...'`.
-Exemple, `'id UInt32, name String'`.
-
-Cette fonction peut être utilisée uniquement dans `INSERT SELECT` requête et une seule fois mais se comporte autrement comme une fonction de table ordinaire
-(par exemple, il peut être utilisé dans la sous-requête, etc.).
-
-Les données peuvent être envoyées de quelque manière que ce soit comme pour ordinaire `INSERT` requête et passé dans tout disponible [format](../../interfaces/formats.md#formats)
-qui doit être spécifié à la fin de la requête (contrairement à l'ordinaire `INSERT SELECT`).
-
-La caractéristique principale de cette fonction est que lorsque le serveur reçoit des données du client il les convertit simultanément
-selon la liste des expressions dans le `SELECT` clause et insère dans la table cible. Table temporaire
-avec toutes les données transférées n'est pas créé.
-
-**Exemple**
-
--   Laissez le `test` le tableau a la structure suivante `(a String, b String)`
-    et les données `data.csv` a une structure différente `(col1 String, col2 Date, col3 Int32)`. Requête pour insérer
-    les données de l' `data.csv` dans le `test` table avec conversion simultanée ressemble à ceci:
-
-<!-- -->
-
-``` bash
-$ cat data.csv | clickhouse-client --query="INSERT INTO test SELECT lower(col1), col3 * col3 FROM input('col1 String, col2 Date, col3 Int32') FORMAT CSV";
-```
-
--   Si `data.csv` contient les données de la même structure `test_structure` comme la table `test` puis ces deux requêtes sont égales:
-
-<!-- -->
-
-``` bash
-$ cat data.csv | clickhouse-client --query="INSERT INTO test FORMAT CSV"
-$ cat data.csv | clickhouse-client --query="INSERT INTO test SELECT * FROM input('test_structure') FORMAT CSV"
-```
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/table_functions/input/) <!--hide-->
diff --git a/docs/fr/sql-reference/table-functions/jdbc.md b/docs/fr/sql-reference/table-functions/jdbc.md
deleted file mode 100644
index 76dea0e0930..00000000000
--- a/docs/fr/sql-reference/table-functions/jdbc.md
+++ /dev/null
@@ -1,29 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 43
-toc_title: jdbc
----
-
-# jdbc {#table-function-jdbc}
-
-`jdbc(jdbc_connection_uri, schema, table)` - retourne la table qui est connectée via le pilote JDBC.
-
-Ce tableau fonction nécessite séparé `clickhouse-jdbc-bridge` programme en cours d'exécution.
-Il prend en charge les types Nullable (basé sur DDL de la table distante qui est interrogée).
-
-**Exemple**
-
-``` sql
-SELECT * FROM jdbc('jdbc:mysql://localhost:3306/?user=root&password=root', 'schema', 'table')
-```
-
-``` sql
-SELECT * FROM jdbc('mysql://localhost:3306/?user=root&password=root', 'schema', 'table')
-```
-
-``` sql
-SELECT * FROM jdbc('datasource://mysql-local', 'schema', 'table')
-```
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/table_functions/jdbc/) <!--hide-->
diff --git a/docs/fr/sql-reference/table-functions/merge.md b/docs/fr/sql-reference/table-functions/merge.md
deleted file mode 100644
index 1ec264b06bd..00000000000
--- a/docs/fr/sql-reference/table-functions/merge.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 38
-toc_title: fusionner
----
-
-# fusionner {#merge}
-
-`merge(db_name, 'tables_regexp')` – Creates a temporary Merge table. For more information, see the section “Table engines, Merge”.
-
-La structure de la table est tirée de la première table rencontrée qui correspond à l'expression régulière.
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/table_functions/merge/) <!--hide-->
diff --git a/docs/fr/sql-reference/table-functions/mysql.md b/docs/fr/sql-reference/table-functions/mysql.md
deleted file mode 100644
index 295456914f0..00000000000
--- a/docs/fr/sql-reference/table-functions/mysql.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 42
-toc_title: mysql
----
-
-# mysql {#mysql}
-
-Permettre `SELECT` requêtes à effectuer sur des données stockées sur un serveur MySQL distant.
-
-``` sql
-mysql('host:port', 'database', 'table', 'user', 'password'[, replace_query, 'on_duplicate_clause']);
-```
-
-**Paramètre**
-
--   `host:port` — MySQL server address.
-
--   `database` — Remote database name.
-
--   `table` — Remote table name.
-
--   `user` — MySQL user.
-
--   `password` — User password.
-
--   `replace_query` — Flag that converts `INSERT INTO` les requêtes de `REPLACE INTO`. Si `replace_query=1` la requête est remplacé.
-
--   `on_duplicate_clause` — The `ON DUPLICATE KEY on_duplicate_clause` expression qui est ajoutée à la `INSERT` requête.
-
-        Example: `INSERT INTO t (c1,c2) VALUES ('a', 2) ON DUPLICATE KEY UPDATE c2 = c2 + 1`, where `on_duplicate_clause` is `UPDATE c2 = c2 + 1`. See the MySQL documentation to find which `on_duplicate_clause` you can use with the `ON DUPLICATE KEY` clause.
-
-        To specify `on_duplicate_clause` you need to pass `0` to the `replace_query` parameter. If you simultaneously pass `replace_query = 1` and `on_duplicate_clause`, ClickHouse generates an exception.
-
-Simple `WHERE` des clauses telles que `=, !=, >, >=, <, <=` sont actuellement exécutés sur le serveur MySQL.
-
-Le reste des conditions et le `LIMIT` les contraintes d'échantillonnage sont exécutées dans ClickHouse uniquement après la fin de la requête à MySQL.
-
-**Valeur Renvoyée**
-
-Un objet table avec les mêmes colonnes que la table MySQL d'origine.
-
-## Exemple D'Utilisation {#usage-example}
-
-Table dans MySQL:
-
-``` text
-mysql> CREATE TABLE `test`.`test` (
-    ->   `int_id` INT NOT NULL AUTO_INCREMENT,
-    ->   `int_nullable` INT NULL DEFAULT NULL,
-    ->   `float` FLOAT NOT NULL,
-    ->   `float_nullable` FLOAT NULL DEFAULT NULL,
-    ->   PRIMARY KEY (`int_id`));
-Query OK, 0 rows affected (0,09 sec)
-
-mysql> insert into test (`int_id`, `float`) VALUES (1,2);
-Query OK, 1 row affected (0,00 sec)
-
-mysql> select * from test;
-+------+----------+-----+----------+
-| int_id | int_nullable | float | float_nullable |
-+------+----------+-----+----------+
-|      1 |         NULL |     2 |           NULL |
-+------+----------+-----+----------+
-1 row in set (0,00 sec)
-```
-
-Sélection des données de ClickHouse:
-
-``` sql
-SELECT * FROM mysql('localhost:3306', 'test', 'test', 'bayonet', '123')
-```
-
-``` text
-┌─int_id─┬─int_nullable─┬─float─┬─float_nullable─┐
-│      1 │         ᴺᵁᴸᴸ │     2 │           ᴺᵁᴸᴸ │
-└────────┴──────────────┴───────┴────────────────┘
-```
-
-## Voir Aussi {#see-also}
-
--   [Le ‘MySQL’ tableau moteur](../../engines/table-engines/integrations/mysql.md)
--   [Utilisation de MySQL comme source de dictionnaire externe](../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md#dicts-external_dicts_dict_sources-mysql)
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/table_functions/mysql/) <!--hide-->
diff --git a/docs/fr/sql-reference/table-functions/numbers.md b/docs/fr/sql-reference/table-functions/numbers.md
deleted file mode 100644
index 50a5ad61002..00000000000
--- a/docs/fr/sql-reference/table-functions/numbers.md
+++ /dev/null
@@ -1,30 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 39
-toc_title: nombre
----
-
-# nombre {#numbers}
-
-`numbers(N)` – Returns a table with the single ‘number’ colonne (UInt64) qui contient des entiers de 0 à n-1.
-`numbers(N, M)` - Retourne un tableau avec le seul ‘number’ colonne (UInt64) qui contient des entiers de N À (N + M-1).
-
-Similaire à la `system.numbers` table, il peut être utilisé pour tester et générer des valeurs successives, `numbers(N, M)` plus efficace que `system.numbers`.
-
-Les requêtes suivantes sont équivalentes:
-
-``` sql
-SELECT * FROM numbers(10);
-SELECT * FROM numbers(0, 10);
-SELECT * FROM system.numbers LIMIT 10;
-```
-
-Exemple:
-
-``` sql
--- Generate a sequence of dates from 2010-01-01 to 2010-12-31
-select toDate('2010-01-01') + number as d FROM numbers(365);
-```
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/table_functions/numbers/) <!--hide-->
diff --git a/docs/fr/sql-reference/table-functions/odbc.md b/docs/fr/sql-reference/table-functions/odbc.md
deleted file mode 100644
index aae636a5eb2..00000000000
--- a/docs/fr/sql-reference/table-functions/odbc.md
+++ /dev/null
@@ -1,108 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 44
-toc_title: ODBC
----
-
-# ODBC {#table-functions-odbc}
-
-Renvoie la table connectée via [ODBC](https://en.wikipedia.org/wiki/Open_Database_Connectivity).
-
-``` sql
-odbc(connection_settings, external_database, external_table)
-```
-
-Paramètre:
-
--   `connection_settings` — Name of the section with connection settings in the `odbc.ini` fichier.
--   `external_database` — Name of a database in an external DBMS.
--   `external_table` — Name of a table in the `external_database`.
-
-Pour implémenter en toute sécurité les connexions ODBC, ClickHouse utilise un programme distinct `clickhouse-odbc-bridge`. Si le pilote ODBC est chargé directement depuis `clickhouse-server`, les problèmes de pilote peuvent planter le serveur ClickHouse. Clickhouse démarre automatiquement `clickhouse-odbc-bridge` lorsque cela est nécessaire. Le programme ODBC bridge est installé à partir du même package que `clickhouse-server`.
-
-Les champs avec l' `NULL` les valeurs de la table externe sont converties en valeurs par défaut pour le type de données de base. Par exemple, si un champ de table MySQL distant a `INT NULL` type il est converti en 0 (la valeur par défaut pour ClickHouse `Int32` type de données).
-
-## Exemple D'Utilisation {#usage-example}
-
-**Obtenir des données de L'installation MySQL locale via ODBC**
-
-Cet exemple est vérifié pour Ubuntu Linux 18.04 et MySQL server 5.7.
-
-Assurez-vous que unixODBC et MySQL Connector sont installés.
-
-Par défaut (si installé à partir de paquets), ClickHouse démarre en tant qu'utilisateur `clickhouse`. Ainsi, vous devez créer et configurer cet utilisateur dans le serveur MySQL.
-
-``` bash
-$ sudo mysql
-```
-
-``` sql
-mysql> CREATE USER 'clickhouse'@'localhost' IDENTIFIED BY 'clickhouse';
-mysql> GRANT ALL PRIVILEGES ON *.* TO 'clickhouse'@'clickhouse' WITH GRANT OPTION;
-```
-
-Puis configurez la connexion dans `/etc/odbc.ini`.
-
-``` bash
-$ cat /etc/odbc.ini
-[mysqlconn]
-DRIVER = /usr/local/lib/libmyodbc5w.so
-SERVER = 127.0.0.1
-PORT = 3306
-DATABASE = test
-USERNAME = clickhouse
-PASSWORD = clickhouse
-```
-
-Vous pouvez vérifier la connexion en utilisant le `isql` utilitaire de l'installation unixODBC.
-
-``` bash
-$ isql -v mysqlconn
-+-------------------------+
-| Connected!                            |
-|                                       |
-...
-```
-
-Table dans MySQL:
-
-``` text
-mysql> CREATE TABLE `test`.`test` (
-    ->   `int_id` INT NOT NULL AUTO_INCREMENT,
-    ->   `int_nullable` INT NULL DEFAULT NULL,
-    ->   `float` FLOAT NOT NULL,
-    ->   `float_nullable` FLOAT NULL DEFAULT NULL,
-    ->   PRIMARY KEY (`int_id`));
-Query OK, 0 rows affected (0,09 sec)
-
-mysql> insert into test (`int_id`, `float`) VALUES (1,2);
-Query OK, 1 row affected (0,00 sec)
-
-mysql> select * from test;
-+------+----------+-----+----------+
-| int_id | int_nullable | float | float_nullable |
-+------+----------+-----+----------+
-|      1 |         NULL |     2 |           NULL |
-+------+----------+-----+----------+
-1 row in set (0,00 sec)
-```
-
-Récupération des données de la table MySQL dans ClickHouse:
-
-``` sql
-SELECT * FROM odbc('DSN=mysqlconn', 'test', 'test')
-```
-
-``` text
-┌─int_id─┬─int_nullable─┬─float─┬─float_nullable─┐
-│      1 │            0 │     2 │              0 │
-└────────┴──────────────┴───────┴────────────────┘
-```
-
-## Voir Aussi {#see-also}
-
--   [Dictionnaires externes ODBC](../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md#dicts-external_dicts_dict_sources-odbc)
--   [Moteur de table ODBC](../../engines/table-engines/integrations/odbc.md).
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/table_functions/jdbc/) <!--hide-->
diff --git a/docs/fr/sql-reference/table-functions/remote.md b/docs/fr/sql-reference/table-functions/remote.md
deleted file mode 100644
index 380a9986116..00000000000
--- a/docs/fr/sql-reference/table-functions/remote.md
+++ /dev/null
@@ -1,85 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 40
-toc_title: distant
----
-
-# à distance, remoteSecure {#remote-remotesecure}
-
-Vous permet d'accéder à des serveurs distants sans `Distributed` table.
-
-Signature:
-
-``` sql
-remote('addresses_expr', db, table[, 'user'[, 'password']])
-remote('addresses_expr', db.table[, 'user'[, 'password']])
-remoteSecure('addresses_expr', db, table[, 'user'[, 'password']])
-remoteSecure('addresses_expr', db.table[, 'user'[, 'password']])
-```
-
-`addresses_expr` – An expression that generates addresses of remote servers. This may be just one server address. The server address is `host:port` ou juste `host`. L'hôte peut être spécifié comme nom de serveur ou l'adresse IPv4 ou IPv6. Une adresse IPv6 est indiquée entre crochets. Le port est le port TCP sur le serveur distant. Si le port est omis, il utilise `tcp_port` à partir du fichier de configuration du serveur (par défaut, 9000).
-
-!!! important "Important"
-    Le port est requis pour une adresse IPv6.
-
-Exemple:
-
-``` text
-example01-01-1
-example01-01-1:9000
-localhost
-127.0.0.1
-[::]:9000
-[2a02:6b8:0:1111::11]:9000
-```
-
-Plusieurs adresses séparées par des virgules. Dans ce cas, ClickHouse utilisera le traitement distribué, donc il enverra la requête à toutes les adresses spécifiées (comme les fragments avec des données différentes).
-
-Exemple:
-
-``` text
-example01-01-1,example01-02-1
-```
-
-Une partie de l'expression peut être spécifiée entre crochets. L'exemple précédent peut être écrite comme suit:
-
-``` text
-example01-0{1,2}-1
-```
-
-Les accolades peuvent contenir une plage de Nombres séparés par deux points (entiers non négatifs). Dans ce cas, la gamme est étendue à un ensemble de valeurs qui génèrent fragment d'adresses. Si le premier nombre commence par zéro, les valeurs sont formées avec le même alignement zéro. L'exemple précédent peut être écrite comme suit:
-
-``` text
-example01-{01..02}-1
-```
-
-Si vous avez plusieurs paires d'accolades, il génère le produit direct des ensembles correspondants.
-
-Les adresses et les parties d'adresses entre crochets peuvent être séparées par le symbole de tuyau (\|). Dans ce cas, les ensembles correspondants de adresses sont interprétés comme des répliques, et la requête sera envoyée à la première sain réplique. Cependant, les répliques sont itérées dans l'ordre actuellement défini dans [équilibrage](../../operations/settings/settings.md) paramètre.
-
-Exemple:
-
-``` text
-example01-{01..02}-{1|2}
-```
-
-Cet exemple spécifie deux fragments qui ont chacun deux répliques.
-
-Le nombre d'adresses générées est limitée par une constante. En ce moment, c'est 1000 adresses.
-
-À l'aide de la `remote` la fonction de table est moins optimale que la création d'un `Distributed` table, car dans ce cas, la connexion au serveur est rétablie pour chaque requête. En outre, si des noms d'hôte, les noms sont résolus, et les erreurs ne sont pas comptés lors de travail avec diverses répliques. Lors du traitement d'un grand nombre de requêtes, créez toujours `Distributed` table à l'avance, et ne pas utiliser la `remote` table de fonction.
-
-Le `remote` table de fonction peut être utile dans les cas suivants:
-
--   Accès à un serveur spécifique pour la comparaison de données, le débogage et les tests.
--   Requêtes entre différents clusters ClickHouse à des fins de recherche.
--   Demandes distribuées peu fréquentes qui sont faites manuellement.
--   Distribué demandes où l'ensemble des serveurs est redéfinie à chaque fois.
-
-Si l'utilisateur n'est pas spécifié, `default` est utilisée.
-Si le mot de passe n'est spécifié, un mot de passe vide est utilisé.
-
-`remoteSecure` - la même chose que `remote` but with secured connection. Default port — [tcp_port_secure](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-tcp_port_secure) de config ou 9440.
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/table_functions/remote/) <!--hide-->
diff --git a/docs/fr/sql-reference/table-functions/url.md b/docs/fr/sql-reference/table-functions/url.md
deleted file mode 100644
index 1df5cf55526..00000000000
--- a/docs/fr/sql-reference/table-functions/url.md
+++ /dev/null
@@ -1,26 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 41
-toc_title: URL
----
-
-# URL {#url}
-
-`url(URL, format, structure)` - retourne une table créée à partir du `URL` avec le
-`format` et `structure`.
-
-URL-adresse du serveur HTTP ou HTTPS, qui peut accepter `GET` et/ou `POST` demande.
-
-format - [format](../../interfaces/formats.md#formats) des données.
-
-structure - structure de table dans `'UserID UInt64, Name String'` format. Détermine les noms et les types de colonnes.
-
-**Exemple**
-
-``` sql
--- getting the first 3 lines of a table that contains columns of String and UInt32 type from HTTP-server which answers in CSV format.
-SELECT * FROM url('http://127.0.0.1:12345/', CSV, 'column1 String, column2 UInt32') LIMIT 3
-```
-
-[Article Original](https://clickhouse.tech/docs/en/query_language/table_functions/url/) <!--hide-->
diff --git a/docs/fr/whats-new/changelog/2017.md b/docs/fr/whats-new/changelog/2017.md
deleted file mode 120000
index d581cbbb422..00000000000
--- a/docs/fr/whats-new/changelog/2017.md
+++ /dev/null
@@ -1 +0,0 @@
-../../../en/whats-new/changelog/2017.md
\ No newline at end of file
diff --git a/docs/fr/whats-new/changelog/2018.md b/docs/fr/whats-new/changelog/2018.md
deleted file mode 120000
index 22874fcae85..00000000000
--- a/docs/fr/whats-new/changelog/2018.md
+++ /dev/null
@@ -1 +0,0 @@
-../../../en/whats-new/changelog/2018.md
\ No newline at end of file
diff --git a/docs/fr/whats-new/changelog/2019.md b/docs/fr/whats-new/changelog/2019.md
deleted file mode 120000
index 0f3f095f8a1..00000000000
--- a/docs/fr/whats-new/changelog/2019.md
+++ /dev/null
@@ -1 +0,0 @@
-../../../en/whats-new/changelog/2019.md
\ No newline at end of file
diff --git a/docs/fr/whats-new/changelog/index.md b/docs/fr/whats-new/changelog/index.md
deleted file mode 120000
index 5461b93ec8c..00000000000
--- a/docs/fr/whats-new/changelog/index.md
+++ /dev/null
@@ -1 +0,0 @@
-../../../en/whats-new/changelog/index.md
\ No newline at end of file
diff --git a/docs/fr/whats-new/index.md b/docs/fr/whats-new/index.md
deleted file mode 100644
index 51a77da8ef4..00000000000
--- a/docs/fr/whats-new/index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: Ce qui est Nouveau
-toc_priority: 72
----
-
-
diff --git a/docs/fr/whats-new/roadmap.md b/docs/fr/whats-new/roadmap.md
deleted file mode 100644
index 87d64208f67..00000000000
--- a/docs/fr/whats-new/roadmap.md
+++ /dev/null
@@ -1,19 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 74
-toc_title: Feuille de route
----
-
-# Feuille de route {#roadmap}
-
-## Q1 2020 {#q1-2020}
-
--   Contrôle d'accès par rôle
-
-## Q2 2020 {#q2-2020}
-
--   Intégration avec les services d'authentification externes
--   Pools de ressources pour une répartition plus précise de la capacité du cluster entre les utilisateurs
-
-{## [Article Original](https://clickhouse.tech/docs/en/roadmap/) ##}
diff --git a/docs/fr/whats-new/security-changelog.md b/docs/fr/whats-new/security-changelog.md
deleted file mode 100644
index 6046ef96bb2..00000000000
--- a/docs/fr/whats-new/security-changelog.md
+++ /dev/null
@@ -1,76 +0,0 @@
----
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_priority: 76
-toc_title: "S\xE9curit\xE9 Changelog"
----
-
-## Correction dans la version 19.14.3.3 de ClickHouse, 2019-09-10 {#fixed-in-clickhouse-release-19-14-3-3-2019-09-10}
-
-### CVE-2019-15024 {#cve-2019-15024}
-
-Аn attacker that has write access to ZooKeeper and who ican run a custom server available from the network where ClickHouse runs, can create a custom-built malicious server that will act as a ClickHouse replica and register it in ZooKeeper. When another replica will fetch data part from the malicious replica, it can force clickhouse-server to write to arbitrary path on filesystem.
-
-Crédits: Eldar Zaitov de L'équipe de sécurité de L'Information Yandex
-
-### CVE-2019-16535 {#cve-2019-16535}
-
-Аn OOB read, OOB write and integer underflow in decompression algorithms can be used to achieve RCE or DoS via native protocol.
-
-Crédits: Eldar Zaitov de L'équipe de sécurité de L'Information Yandex
-
-### CVE-2019-16536 {#cve-2019-16536}
-
-Le débordement de pile menant à DoS peut être déclenché par un client authentifié malveillant.
-
-Crédits: Eldar Zaitov de L'équipe de sécurité de L'Information Yandex
-
-## Correction de la version 19.13.6.1 de ClickHouse, 2019-09-20 {#fixed-in-clickhouse-release-19-13-6-1-2019-09-20}
-
-### CVE-2019-18657 {#cve-2019-18657}
-
-Fonction de Table `url` la vulnérabilité avait-elle permis à l'attaquant d'injecter des en-têtes HTTP arbitraires dans la requête.
-
-Crédit: [Nikita Tikhomirov](https://github.com/NSTikhomirov)
-
-## Correction dans la version ClickHouse 18.12.13, 2018-09-10 {#fixed-in-clickhouse-release-18-12-13-2018-09-10}
-
-### CVE-2018-14672 {#cve-2018-14672}
-
-Les fonctions de chargement des modèles CatBoost permettaient de parcourir les chemins et de lire des fichiers arbitraires via des messages d'erreur.
-
-Crédits: Andrey Krasichkov de L'équipe de sécurité de L'Information Yandex
-
-## Correction dans la version 18.10.3 de ClickHouse, 2018-08-13 {#fixed-in-clickhouse-release-18-10-3-2018-08-13}
-
-### CVE-2018-14671 {#cve-2018-14671}
-
-unixODBC a permis de charger des objets partagés arbitraires à partir du système de fichiers, ce qui a conduit à une vulnérabilité D'exécution de Code À Distance.
-
-Crédits: Andrey Krasichkov et Evgeny Sidorov de Yandex Information Security Team
-
-## Correction dans la version 1.1.54388 de ClickHouse, 2018-06-28 {#fixed-in-clickhouse-release-1-1-54388-2018-06-28}
-
-### CVE-2018-14668 {#cve-2018-14668}
-
-“remote” la fonction de table a permis des symboles arbitraires dans “user”, “password” et “default_database” champs qui ont conduit à des attaques de falsification de requêtes inter-protocoles.
-
-Crédits: Andrey Krasichkov de L'équipe de sécurité de L'Information Yandex
-
-## Correction dans la version 1.1.54390 de ClickHouse, 2018-07-06 {#fixed-in-clickhouse-release-1-1-54390-2018-07-06}
-
-### CVE-2018-14669 {#cve-2018-14669}
-
-Clickhouse client MySQL avait “LOAD DATA LOCAL INFILE” fonctionnalité activée permettant à une base de données MySQL malveillante de lire des fichiers arbitraires à partir du serveur clickhouse connecté.
-
-Crédits: Andrey Krasichkov et Evgeny Sidorov de Yandex Information Security Team
-
-## Correction dans la version 1.1.54131 de ClickHouse, 2017-01-10 {#fixed-in-clickhouse-release-1-1-54131-2017-01-10}
-
-### CVE-2018-14670 {#cve-2018-14670}
-
-Configuration incorrecte dans le paquet deb pourrait conduire à l'utilisation non autorisée de la base de données.
-
-Crédits: National Cyber Security Centre (NCSC)
-
-{## [Article Original](https://clickhouse.tech/docs/en/security_changelog/) ##}
diff --git a/docs/ja/commercial/cloud.md b/docs/ja/commercial/cloud.md
index 403b34d198c..84f58e46cdb 100644
--- a/docs/ja/commercial/cloud.md
+++ b/docs/ja/commercial/cloud.md
@@ -20,4 +20,16 @@ toc_title: "\u30AF\u30E9\u30A6\u30C9"
 -   暗号化と分離
 -   自動メンテナンス
 
+## Alibaba Cloud {#alibaba-cloud}
+
+ClickHouseのためのAlibaba Cloudの管理サービス [中国サイト](https://www.aliyun.com/product/clickhouse) (2021年5月に国際サイトで利用可能になります) 次の主な機能を提供します:
+
+-   Alibaba Cloud Apsara分散システムをベースにした信頼性の高いクラウドディスクストレージエンジン
+-   手動でのデータ移行を必要とせずに、オン・デマンドで容量を拡張
+-   シングル・ノード、シングル・レプリカ、マルチ・ノード、マルチ・レプリカ・アーキテクチャをサポートし、ホット・データとコールド・データの階層化をサポート
+-   アクセスホワイトリスト、OneKey Recovery、マルチレイヤーネットワークセキュリティ保護、クラウドディスク暗号化をサポート
+-   クラウドログシステム、データベース、およびデータアプリケーションツールとのシームレスな統合
+-   組み込み型の監視およびデータベース管理プラットフォーム
+-   プロフェッショナルデータベースエキスパートによるテクニカル・サポートとサービス
+
 {## [元の記事](https://clickhouse.tech/docs/en/commercial/cloud/) ##}
diff --git a/docs/ja/sql-reference/aggregate-functions/reference.md b/docs/ja/sql-reference/aggregate-functions/reference.md
index 465f36179da..c66e9b54746 100644
--- a/docs/ja/sql-reference/aggregate-functions/reference.md
+++ b/docs/ja/sql-reference/aggregate-functions/reference.md
@@ -624,7 +624,7 @@ uniqHLL12(x[, ...])
 
 -   HyperLogLogアルゴリズムを使用して、異なる引数値の数を近似します。
 
-        212 5-bit cells are used. The size of the state is slightly more than 2.5 KB. The result is not very accurate (up to ~10% error) for small data sets (<10K elements). However, the result is fairly accurate for high-cardinality data sets (10K-100M), with a maximum error of ~1.6%. Starting from 100M, the estimation error increases, and the function will return very inaccurate results for data sets with extremely high cardinality (1B+ elements).
+        2^12 5-bit cells are used. The size of the state is slightly more than 2.5 KB. The result is not very accurate (up to ~10% error) for small data sets (<10K elements). However, the result is fairly accurate for high-cardinality data sets (10K-100M), with a maximum error of ~1.6%. Starting from 100M, the estimation error increases, and the function will return very inaccurate results for data sets with extremely high cardinality (1B+ elements).
 
 -   決定的な結果を提供します(クエリ処理順序に依存しません)。
 
diff --git a/docs/ja/sql-reference/functions/bitmap-functions.md b/docs/ja/sql-reference/functions/bitmap-functions.md
index cc57e762610..de3ce938444 100644
--- a/docs/ja/sql-reference/functions/bitmap-functions.md
+++ b/docs/ja/sql-reference/functions/bitmap-functions.md
@@ -35,7 +35,7 @@ SELECT bitmapBuild([1, 2, 3, 4, 5]) AS res, toTypeName(res)
 
 ``` text
 ┌─res─┬─toTypeName(bitmapBuild([1, 2, 3, 4, 5]))─────┐
-│ 
    │ AggregateFunction(groupBitmap, UInt8)    │
+│     │ AggregateFunction(groupBitmap, UInt8)        │
 └─────┴──────────────────────────────────────────────┘
 ```
 
diff --git a/docs/ja/sql-reference/functions/hash-functions.md b/docs/ja/sql-reference/functions/hash-functions.md
index d48e6846bb4..a98ae60690d 100644
--- a/docs/ja/sql-reference/functions/hash-functions.md
+++ b/docs/ja/sql-reference/functions/hash-functions.md
@@ -434,13 +434,13 @@ A [FixedString(16)](../../sql-reference/data-types/fixedstring.md) データ型
 **例**
 
 ``` sql
-SELECT murmurHash3_128('example_string') AS MurmurHash3, toTypeName(MurmurHash3) AS type
+SELECT hex(murmurHash3_128('example_string')) AS MurmurHash3, toTypeName(MurmurHash3) AS type;
 ```
 
 ``` text
-┌─MurmurHash3──────┬─type────────────┐
-│ 6�1�4"S5KT�~~q │ FixedString(16) │
-└──────────────────┴─────────────────┘
+┌─MurmurHash3──────────────────────┬─type───┐
+│ 368A1A311CB7342253354B548E7E7E71 │ String │
+└──────────────────────────────────┴────────┘
 ```
 
 ## xxHash32,xxHash64 {#hash-functions-xxhash32}
diff --git a/docs/ru/commercial/cloud.md b/docs/ru/commercial/cloud.md
index 4f57592b4c7..e00fc3be673 100644
--- a/docs/ru/commercial/cloud.md
+++ b/docs/ru/commercial/cloud.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 1
-toc_title: "\u041f\u043e\u0441\u0442\u0430\u0432\u0449\u0438\u043a\u0438\u0020\u043e\u0431\u043b\u0430\u0447\u043d\u044b\u0445\u0020\u0443\u0441\u043b\u0443\u0433\u0020\u0043\u006c\u0069\u0063\u006b\u0048\u006f\u0075\u0073\u0065"
+toc_title: "Поставщики облачных услуг ClickHouse"
 ---
 
 # Поставщики облачных услуг ClickHouse {#clickhouse-cloud-service-providers}
@@ -29,4 +29,30 @@ toc_title: "\u041f\u043e\u0441\u0442\u0430\u0432\u0449\u0438\u043a\u0438\u0020\u
 -   cross-az масштабирование для повышения производительности и обеспечения высокой доступности
 -   встроенный мониторинг и редактор SQL-запросов
 
-{## [Оригинальная статья](https://clickhouse.tech/docs/ru/commercial/cloud/) ##}
+## Alibaba Cloud {#alibaba-cloud}
+
+Управляемый облачный сервис Alibaba для ClickHouse: [китайская площадка](https://www.aliyun.com/product/clickhouse), будет доступен на международной площадке в мае 2021 года. Сервис предоставляет следующие возможности:
+
+-   надежный сервер для облачного хранилища на основе распределенной системы [Alibaba Cloud Apsara](https://www.alibabacloud.com/product/apsara-stack);
+-   расширяемая по запросу емкость, без переноса данных вручную;
+-   поддержка одноузловой и многоузловой архитектуры, архитектуры с одной или несколькими репликами, а также многоуровневого хранения cold и hot data;
+-   поддержка прав доступа, one-key восстановления, многоуровневая защита сети, шифрование облачного диска;
+-   полная интеграция с облачными системами логирования, базами данных и инструментами обработки данных;
+-   встроенная платформа для мониторинга и управления базами данных;
+-   техническая поддержка от экспертов по работе с базами данных.
+
+## SberCloud {#sbercloud}
+
+[Облачная платформа SberCloud.Advanced](https://sbercloud.ru/ru/advanced):
+
+-   предоставляет более 50 высокотехнологичных сервисов;
+-   позволяет быстро создавать и эффективно управлять ИТ-инфраструктурой, приложениями и интернет-сервисами;
+-   радикально минимизирует ресурсы, требуемые для работы корпоративных ИТ-систем;
+-   в разы сокращает время вывода новых продуктов на рынок.
+
+SberCloud.Advanced предоставляет [MapReduce Service (MRS)](https://docs.sbercloud.ru/mrs/ug/topics/ug__clickhouse.html) — надежную, безопасную и простую в использовании платформу корпоративного уровня для хранения, обработки и анализа больших данных. MRS позволяет быстро создавать и управлять кластерами ClickHouse.
+
+-   Инстанс ClickHouse состоит из трех узлов ZooKeeper и нескольких узлов ClickHouse. Выделенный режим реплики используется для обеспечения высокой надежности двойных копий данных.
+-   MRS предлагает возможности гибкого масштабирования при быстром росте сервисов в сценариях, когда емкости кластерного хранилища или вычислительных ресурсов процессора недостаточно. MRS в один клик предоставляет инструмент для балансировки данных при расширении узлов ClickHouse в кластере. Вы можете определить режим и время балансировки данных на основе характеристик сервиса, чтобы обеспечить доступность сервиса.
+-   MRS использует архитектуру развертывания высокой доступности на основе Elastic Load Balance (ELB) — сервиса для автоматического распределения трафика на несколько внутренних узлов. Благодаря ELB, данные записываются в локальные таблицы и считываются из распределенных таблиц на разных узлах. Такая архитектура повышает отказоустойчивость кластера и гарантирует высокую доступность приложений.
+
diff --git a/docs/ru/commercial/index.md b/docs/ru/commercial/index.md
index c6c440c17e8..66b1b125823 100644
--- a/docs/ru/commercial/index.md
+++ b/docs/ru/commercial/index.md
@@ -1,9 +1,7 @@
 ---
-toc_folder_title: "\u041A\u043E\u043C\u043C\u0435\u0440\u0447\u0435\u0441\u043A\u0438\
-  \u0435 \u0443\u0441\u043B\u0443\u0433\u0438"
+toc_folder_title: "Коммерческие услуги"
 toc_priority: 70
-toc_title: "\u041A\u043E\u043C\u043C\u0435\u0440\u0447\u0435\u0441\u043A\u0438\u0435\
-  \ \u0443\u0441\u043B\u0443\u0433\u0438"
+toc_title: "Коммерческие услуги"
 ---
 
 # Коммерческие услуги {#clickhouse-commercial-services}
diff --git a/docs/ru/development/architecture.md b/docs/ru/development/architecture.md
index de8fba1bc4b..d2cfc44b711 100644
--- a/docs/ru/development/architecture.md
+++ b/docs/ru/development/architecture.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 62
-toc_title: "\u041e\u0431\u0437\u043e\u0440\u0020\u0430\u0440\u0445\u0438\u0442\u0435\u043a\u0442\u0443\u0440\u044b\u0020\u0043\u006c\u0069\u0063\u006b\u0048\u006f\u0075\u0073\u0065"
+toc_title: "Обзор архитектуры ClickHouse"
 ---
 
 # Обзор архитектуры ClickHouse {#overview-of-clickhouse-architecture}
@@ -27,7 +27,7 @@ ClickHouse - полноценная колоночная СУБД. Данные
 
 `IColumn` предоставляет методы для общих реляционных преобразований данных, но они не отвечают всем потребностям. Например, `ColumnUInt64` не имеет метода для вычисления суммы двух столбцов, а `ColumnString` не имеет метода для запуска поиска по подстроке. Эти бесчисленные процедуры реализованы вне `IColumn`.
 
-Различные функции на колонках могут быть реализованы обобщенным, неэффективным путем, используя `IColumn` методы для извлечения значений `Field`, или специальным путем, используя знания о внутреннем распределение данных в памяти в конкретной реализации `IColumn`. Для этого функции приводятся к конкретному типу `IColumn` и работают напрямую с его внутренним представлением. Например, в `ColumnUInt64` есть метод getData, который возвращает ссылку на внутренний массив, чтение и заполнение которого, выполняется отдельной процедурой напрямую. Фактически, мы имеем "дырявую абстракции", обеспечивающие эффективные специализации различных процедур.
+Различные функции на колонках могут быть реализованы обобщенным, неэффективным путем, используя `IColumn` методы для извлечения значений `Field`, или специальным путем, используя знания о внутреннем распределение данных в памяти в конкретной реализации `IColumn`. Для этого функции приводятся к конкретному типу `IColumn` и работают напрямую с его внутренним представлением. Например, в `ColumnUInt64` есть метод `getData`, который возвращает ссылку на внутренний массив, чтение и заполнение которого, выполняется отдельной процедурой напрямую. Фактически, мы имеем "дырявые абстракции", обеспечивающие эффективные специализации различных процедур.
 
 ## Типы данных (Data Types) {#data_types}
 
@@ -42,7 +42,7 @@ ClickHouse - полноценная колоночная СУБД. Данные
 
 ## Блоки (Block) {#block}
 
-`Block` это контейнер, который представляет фрагмент (chunk) таблицы в памяти. Это набор троек - `(IColumn, IDataType, имя колонки)`. В процессе выполнения запроса, данные обрабатываются `Block`ами. Если у нас есть `Block`, значит у нас есть данные (в объекте `IColumn`), информация о типе (в `IDataType`), которая говорит нам, как работать с колонкой, и имя колонки (оригинальное имя колонки таблицы или служебное имя, присвоенное для получения промежуточных результатов вычислений).
+`Block` это контейнер, который представляет фрагмент (chunk) таблицы в памяти. Это набор троек - `(IColumn, IDataType, имя колонки)`. В процессе выполнения запроса, данные обрабатываются `Block`-ами. Если у нас есть `Block`, значит у нас есть данные (в объекте `IColumn`), информация о типе (в `IDataType`), которая говорит нам, как работать с колонкой, и имя колонки (оригинальное имя колонки таблицы или служебное имя, присвоенное для получения промежуточных результатов вычислений).
 
 При вычислении некоторой функции на колонках в блоке мы добавляем еще одну колонку с результатами в блок, не трогая колонки аргументов функции, потому что операции иммутабельные. Позже ненужные колонки могут быть удалены из блока, но не модифицированы. Это удобно для устранения общих подвыражений.
 
@@ -58,7 +58,7 @@ ClickHouse - полноценная колоночная СУБД. Данные
 2. Реализацию форматов данных. Например, при выводе данных в терминал в формате `Pretty`, вы создаете выходной поток блоков, который форматирует поступающие в него блоки.
 3. Трансформацию данных. Допустим, у вас есть `IBlockInputStream` и вы хотите создать отфильтрованный поток. Вы создаете `FilterBlockInputStream` и инициализируете его вашим потоком. Затем вы тянете (pull) блоки из `FilterBlockInputStream`, а он тянет блоки исходного потока, фильтрует их и возвращает отфильтрованные блоки вам. Таким образом построены конвейеры выполнения запросов.
 
-Имеются и более сложные трансформации. Например, когда вы тянете блоки из `AggregatingBlockInputStream`, он считывает все данные из своего источника, агрегирует их, и возвращает поток агрегированных данных вам. Другой пример: конструктор `UnionBlockInputStream` принимает множество источников входных данных и число потоков. Такой `Stream` работает в несколько потоков и читает данные источников параллельно. 
+Имеются и более сложные трансформации. Например, когда вы тянете блоки из `AggregatingBlockInputStream`, он считывает все данные из своего источника, агрегирует их, и возвращает поток агрегированных данных вам. Другой пример: конструктор `UnionBlockInputStream` принимает множество источников входных данных и число потоков. Такой `Stream` работает в несколько потоков и читает данные источников параллельно.
 
 > Потоки блоков используют «втягивающий» (pull) подход к управлению потоком выполнения: когда вы вытягиваете блок из первого потока, он, следовательно, вытягивает необходимые блоки из вложенных потоков, так и работает весь конвейер выполнения. Ни «pull» ни «push» не имеют явного преимущества, потому что поток управления неявный, и это ограничивает в реализации различных функций, таких как одновременное выполнение нескольких запросов (слияние нескольких конвейеров вместе). Это ограничение можно преодолеть с помощью сопрограмм (coroutines) или просто запуском дополнительных потоков, которые ждут друг друга. У нас может быть больше возможностей, если мы сделаем поток управления явным: если мы локализуем логику для передачи данных из одной расчетной единицы в другую вне этих расчетных единиц. Читайте эту [статью](http://journal.stuffwithstuff.com/2013/01/13/iteration-inside-and-out/) для углубленного изучения.
 
@@ -110,9 +110,9 @@ ClickHouse - полноценная колоночная СУБД. Данные
 > Генераторы парсеров не используются по историческим причинам.
 
 ## Интерпретаторы {#interpreters}
- 
+
 Интерпретаторы отвечают за создание конвейера выполнения запроса из `AST`. Есть простые интерпретаторы, такие как `InterpreterExistsQuery` и `InterpreterDropQuery` или более сложный `InterpreterSelectQuery`. Конвейер выполнения запроса представляет собой комбинацию входных и выходных потоков блоков. Например, результатом интерпретации `SELECT` запроса является `IBlockInputStream` для чтения результирующего набора данных; результат интерпретации `INSERT` запроса - это `IBlockOutputStream`, для записи данных, предназначенных для вставки; результат интерпретации `INSERT SELECT` запроса - это `IBlockInputStream`, который возвращает пустой результирующий набор при первом чтении, но копирует данные из `SELECT` к `INSERT`.
- 
+
 `InterpreterSelectQuery` использует `ExpressionAnalyzer` и `ExpressionActions` механизмы для анализа запросов и преобразований. Именно здесь выполняется большинство оптимизаций запросов на основе правил. `ExpressionAnalyzer` написан довольно грязно и должен быть переписан: различные преобразования запросов и оптимизации должны быть извлечены в отдельные классы, чтобы позволить модульные преобразования или запросы.
 
 ## Функции {#functions}
@@ -162,9 +162,9 @@ ClickHouse имеет сильную типизацию, поэтому нет 
 
 Сервера в кластере в основном независимы. Вы можете создать `Распределенную` (`Distributed`) таблицу на одном или всех серверах в кластере. Такая таблица сама по себе не хранит данные - она только предоставляет возможность "просмотра" всех локальных таблиц на нескольких узлах кластера. При выполнении `SELECT` распределенная таблица переписывает запрос, выбирает удаленные узлы в соответствии с настройками балансировки нагрузки и отправляет им запрос. Распределенная таблица просит удаленные сервера обработать запрос до той стадии, когда промежуточные результаты с разных серверов могут быть объединены. Затем он получает промежуточные результаты и объединяет их. Распределенная таблица пытается возложить как можно больше работы на удаленные серверы и сократить объем промежуточных данных, передаваемых по сети.
 
-Ситуация усложняется, при использовании подзапросы в случае IN или JOIN, когда каждый из них использует таблицу `Distributed`. Есть разные стратегии для выполнения таких запросов.
+Ситуация усложняется, при использовании подзапросов в случае `IN` или `JOIN`, когда каждый из них использует таблицу `Distributed`. Есть разные стратегии для выполнения таких запросов.
 
-Глобального плана выполнения распределенных запросов не существует. Каждый узел имеет собственный локальный план для своей части работы. У нас есть простое однонаправленное выполнение распределенных запросов: мы отправляем запросы на удаленные узлы и затем объединяем результаты. Но это невозможно для сложных запросов GROUP BY высокой кардинальности или запросов с большим числом временных данных в JOIN: в таких случаях нам необходимо перераспределить («reshuffle») данные между серверами, что требует дополнительной координации. ClickHouse не поддерживает выполнение запросов такого рода, и нам нужно работать над этим.
+Глобального плана выполнения распределенных запросов не существует. Каждый узел имеет собственный локальный план для своей части работы. У нас есть простое однонаправленное выполнение распределенных запросов: мы отправляем запросы на удаленные узлы и затем объединяем результаты. Но это невозможно для сложных запросов `GROUP BY` высокой кардинальности или запросов с большим числом временных данных в `JOIN`: в таких случаях нам необходимо перераспределить («reshuffle») данные между серверами, что требует дополнительной координации. ClickHouse не поддерживает выполнение запросов такого рода, и нам нужно работать над этим.
 
 ## Merge Tree {#merge-tree}
 
@@ -190,7 +190,7 @@ ClickHouse имеет сильную типизацию, поэтому нет 
 
 Репликация использует асинхронную multi-master схему. Вы можете вставить данные в любую реплику, которая имеет открытую сессию в `ZooKeeper`, и данные реплицируются на все другие реплики асинхронно. Поскольку ClickHouse не поддерживает UPDATE, репликация исключает конфликты (conflict-free replication). Поскольку подтверждение вставок кворумом не реализовано, только что вставленные данные могут быть потеряны в случае сбоя одного узла.
 
-Метаданные для репликации хранятся в `ZooKeeper`. Существует журнал репликации, в котором перечислены действия, которые необходимо выполнить. Среди этих действий: получить часть (get the part); объединить части (merge parts); удалить партицию (drop a partition) и так далее. Каждая реплика копирует журнал репликации в свою очередь, а затем выполняет действия из очереди. Например, при вставке в журнале создается действие «получить часть» (get the part), и каждая реплика загружает эту часть. Слияния координируются между репликами, чтобы получить идентичные до байта результаты. Все части объединяются одинаково на всех репликах. Одна из реплик-лидеров инициирует новое слияние кусков первой и записывает действия «слияния частей» в журнал. Несколько реплик (или все) могут быть лидерами одновременно. Реплике можно запретить быть лидером с помощью `merge_tree` настройки `replicated_can_become_leader`. 
+Метаданные для репликации хранятся в `ZooKeeper`. Существует журнал репликации, в котором перечислены действия, которые необходимо выполнить. Среди этих действий: получить часть (get the part); объединить части (merge parts); удалить партицию (drop a partition) и так далее. Каждая реплика копирует журнал репликации в свою очередь, а затем выполняет действия из очереди. Например, при вставке в журнале создается действие «получить часть» (get the part), и каждая реплика загружает эту часть. Слияния координируются между репликами, чтобы получить идентичные до байта результаты. Все части объединяются одинаково на всех репликах. Одна из реплик-лидеров инициирует новое слияние кусков первой и записывает действия «слияния частей» в журнал. Несколько реплик (или все) могут быть лидерами одновременно. Реплике можно запретить быть лидером с помощью `merge_tree` настройки `replicated_can_become_leader`.
 
 Репликация является физической: между узлами передаются только сжатые части, а не запросы. Слияния обрабатываются на каждой реплике независимо, в большинстве случаев, чтобы снизить затраты на сеть, во избежание усиления роли сети. Крупные объединенные части отправляются по сети только в случае значительной задержки репликации.
 
diff --git a/docs/ru/development/browse-code.md b/docs/ru/development/browse-code.md
index ac17cf0e6f5..3f6de574abe 100644
--- a/docs/ru/development/browse-code.md
+++ b/docs/ru/development/browse-code.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 71
-toc_title: "\u041d\u0430\u0432\u0438\u0433\u0430\u0446\u0438\u044f\u0020\u043f\u043e\u0020\u043a\u043e\u0434\u0443\u0020\u0043\u006c\u0069\u0063\u006b\u0048\u006f\u0075\u0073\u0065"
+toc_title: "Навигация по коду ClickHouse"
 ---
 
 
diff --git a/docs/ru/development/contrib.md b/docs/ru/development/contrib.md
index 05367267e41..f3310836ba9 100644
--- a/docs/ru/development/contrib.md
+++ b/docs/ru/development/contrib.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 70
-toc_title: "\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u043c\u044b\u0435\u0020\u0441\u0442\u043e\u0440\u043e\u043d\u043d\u0438\u0435\u0020\u0431\u0438\u0431\u043b\u0438\u043e\u0442\u0435\u043a\u0438"
+toc_title: "Используемые сторонние библиотеки"
 ---
 
 
diff --git a/docs/ru/development/developer-instruction.md b/docs/ru/development/developer-instruction.md
index 7d88c97fe46..66bbb9030cf 100644
--- a/docs/ru/development/developer-instruction.md
+++ b/docs/ru/development/developer-instruction.md
@@ -1,21 +1,21 @@
 ---
 toc_priority: 61
-toc_title: "\u0418\u043d\u0441\u0442\u0440\u0443\u043a\u0446\u0438\u044f\u0020\u0434\u043b\u044f\u0020\u0440\u0430\u0437\u0440\u0430\u0431\u043e\u0442\u0447\u0438\u043a\u043e\u0432"
+toc_title: "Инструкция для разработчиков"
 ---
 
 # Инструкция для разработчиков
 
 Сборка ClickHouse поддерживается на Linux, FreeBSD, Mac OS X.
 
-# Если вы используете Windows {#esli-vy-ispolzuete-windows}
+## Если вы используете Windows {#esli-vy-ispolzuete-windows}
 
 Если вы используете Windows, вам потребуется создать виртуальную машину с Ubuntu. Для работы с виртуальной машиной, установите VirtualBox. Скачать Ubuntu можно на сайте: https://www.ubuntu.com/#download Создайте виртуальную машину из полученного образа. Выделите для неё не менее 4 GB оперативной памяти. Для запуска терминала в Ubuntu, найдите в меню программу со словом terminal (gnome-terminal, konsole или что-то в этом роде) или нажмите Ctrl+Alt+T.
 
-# Если вы используете 32-битную систему {#esli-vy-ispolzuete-32-bitnuiu-sistemu}
+## Если вы используете 32-битную систему {#esli-vy-ispolzuete-32-bitnuiu-sistemu}
 
 ClickHouse не работает и не собирается на 32-битных системах. Получите доступ к 64-битной системе и продолжайте.
 
-# Создание репозитория на GitHub {#sozdanie-repozitoriia-na-github}
+## Создание репозитория на GitHub {#sozdanie-repozitoriia-na-github}
 
 Для работы с репозиторием ClickHouse, вам потребуется аккаунт на GitHub. Наверное, он у вас уже есть.
 
@@ -34,7 +34,7 @@ ClickHouse не работает и не собирается на 32-битны
 
 Подробное руководство по использованию Git: https://git-scm.com/book/ru/v2
 
-# Клонирование репозитория на рабочую машину {#klonirovanie-repozitoriia-na-rabochuiu-mashinu}
+## Клонирование репозитория на рабочую машину {#klonirovanie-repozitoriia-na-rabochuiu-mashinu}
 
 Затем вам потребуется загрузить исходники для работы на свой компьютер. Это называется «клонирование репозитория», потому что создаёт на вашем компьютере локальную копию репозитория, с которой вы будете работать.
 
@@ -78,7 +78,7 @@ ClickHouse не работает и не собирается на 32-битны
 
 После этого, вы сможете добавлять в свой репозиторий обновления из репозитория Яндекса с помощью команды `git pull upstream master`.
 
-## Работа с сабмодулями Git {#rabota-s-sabmoduliami-git}
+### Работа с сабмодулями Git {#rabota-s-sabmoduliami-git}
 
 Работа с сабмодулями git может быть достаточно болезненной. Следующие команды позволят содержать их в порядке:
 
@@ -110,7 +110,7 @@ The next commands would help you to reset all submodules to the initial state (!
     git submodule foreach git submodule foreach git reset --hard
     git submodule foreach git submodule foreach git clean -xfd
 
-# Система сборки {#sistema-sborki}
+## Система сборки {#sistema-sborki}
 
 ClickHouse использует систему сборки CMake и Ninja.
 
@@ -130,11 +130,11 @@ Ninja - система запуска сборочных задач.
 
 Проверьте версию CMake: `cmake --version`. Если версия меньше 3.3, то установите новую версию с сайта https://cmake.org/download/
 
-# Необязательные внешние библиотеки {#neobiazatelnye-vneshnie-biblioteki}
+## Необязательные внешние библиотеки {#neobiazatelnye-vneshnie-biblioteki}
 
 ClickHouse использует для сборки некоторое количество внешних библиотек. Но ни одну из них не требуется отдельно устанавливать, так как они собираются вместе с ClickHouse, из исходников, которые расположены в submodules. Посмотреть набор этих библиотек можно в директории contrib.
 
-# Компилятор C++ {#kompiliator-c}
+## Компилятор C++ {#kompiliator-c}
 
 В качестве компилятора C++ поддерживается GCC начиная с версии 9 или Clang начиная с версии 8.
 
@@ -148,7 +148,7 @@ ClickHouse использует для сборки некоторое коли
 
 Если вы решили использовать Clang, вы также можете установить `libc++` и `lld`, если вы знаете, что это такое. При желании, установите `ccache`.
 
-# Процесс сборки {#protsess-sborki}
+## Процесс сборки {#protsess-sborki}
 
 Теперь вы готовы к сборке ClickHouse. Для размещения собранных файлов, рекомендуется создать отдельную директорию build внутри директории ClickHouse:
 
@@ -206,7 +206,7 @@ Mac OS X:
 
     ls -l programs/clickhouse
 
-# Запуск собранной версии ClickHouse {#zapusk-sobrannoi-versii-clickhouse}
+## Запуск собранной версии ClickHouse {#zapusk-sobrannoi-versii-clickhouse}
 
 Для запуска сервера из под текущего пользователя, с выводом логов в терминал и с использованием примеров конфигурационных файлов, расположенных в исходниках, перейдите в директорию `ClickHouse/programs/server/` (эта директория находится не в директории build) и выполните:
 
@@ -233,7 +233,7 @@ Mac OS X:
     sudo service clickhouse-server stop
     sudo -u clickhouse ClickHouse/build/programs/clickhouse server --config-file /etc/clickhouse-server/config.xml
 
-# Среда разработки {#sreda-razrabotki}
+## Среда разработки {#sreda-razrabotki}
 
 Если вы не знаете, какую среду разработки использовать, то рекомендуется использовать CLion. CLion является платным ПО, но его можно использовать бесплатно в течение пробного периода. Также он бесплатен для учащихся. CLion можно использовать как под Linux, так и под Mac OS X.
 
@@ -243,7 +243,7 @@ Mac OS X:
 
 На всякий случай заметим, что CLion самостоятельно создаёт свою build директорию, самостоятельно выбирает тип сборки debug по-умолчанию, для конфигурации использует встроенную в CLion версию CMake вместо установленного вами, а для запуска задач использует make вместо ninja. Это нормально, просто имейте это ввиду, чтобы не возникало путаницы.
 
-# Написание кода {#napisanie-koda}
+## Написание кода {#napisanie-koda}
 
 Описание архитектуры ClickHouse: https://clickhouse.tech/docs/ru/development/architecture/
 
@@ -253,7 +253,7 @@ Mac OS X:
 
 Список задач: https://github.com/ClickHouse/ClickHouse/issues?q=is%3Aopen+is%3Aissue+label%3A%22easy+task%22
 
-# Тестовые данные {#testovye-dannye}
+## Тестовые данные {#testovye-dannye}
 
 Разработка ClickHouse часто требует загрузки реалистичных наборов данных. Особенно это важно для тестирования производительности. Специально для вас мы подготовили набор данных, представляющий собой анонимизированные данные Яндекс.Метрики. Загрузка этих данных потребует ещё 3 GB места на диске. Для выполнения большинства задач разработки, загружать эти данные не обязательно.
 
@@ -274,7 +274,7 @@ Mac OS X:
     clickhouse-client --max_insert_block_size 100000 --query "INSERT INTO test.hits FORMAT TSV" < hits_v1.tsv
     clickhouse-client --max_insert_block_size 100000 --query "INSERT INTO test.visits FORMAT TSV" < visits_v1.tsv
 
-# Создание Pull Request {#sozdanie-pull-request}
+## Создание Pull Request {#sozdanie-pull-request}
 
 Откройте свой форк репозитория в интерфейсе GitHub. Если вы вели разработку в бранче, выберите этот бранч. На странице будет доступна кнопка «Pull request». По сути, это означает «создать заявку на принятие моих изменений в основной репозиторий».
 
diff --git a/docs/ru/development/style.md b/docs/ru/development/style.md
index 1b211259bbb..f08ecc3c4c7 100644
--- a/docs/ru/development/style.md
+++ b/docs/ru/development/style.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 68
-toc_title: "\u041a\u0430\u043a\u0020\u043f\u0438\u0441\u0430\u0442\u044c\u0020\u043a\u043e\u0434\u0020\u043d\u0430\u0020\u0043\u002b\u002b"
+toc_title: "Как писать код на C++"
 ---
 
 
@@ -911,4 +911,3 @@ function(
       size_t limit)
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/development/style/) <!--hide-->
diff --git a/docs/ru/engines/database-engines/atomic.md b/docs/ru/engines/database-engines/atomic.md
new file mode 100644
index 00000000000..8c75be3d93b
--- /dev/null
+++ b/docs/ru/engines/database-engines/atomic.md
@@ -0,0 +1,54 @@
+---
+toc_priority: 32
+toc_title: Atomic
+---
+
+# Atomic {#atomic}
+
+Поддерживает неблокирующие запросы [DROP TABLE](#drop-detach-table) и [RENAME TABLE](#rename-table) и атомарные запросы [EXCHANGE TABLES t1 AND t](#exchange-tables). Движок `Atomic` используется по умолчанию.
+
+## Создание БД {#creating-a-database}
+
+``` sql
+    CREATE DATABASE test[ ENGINE = Atomic];
+```
+
+## Особенности и рекомендации {#specifics-and-recommendations}
+
+### UUID {#table-uuid}
+
+Каждая таблица в базе данных `Atomic` имеет уникальный [UUID](../../sql-reference/data-types/uuid.md) и хранит данные в папке `/clickhouse_path/store/xxx/xxxyyyyy-yyyy-yyyy-yyyy-yyyyyyyyyyyy/`, где `xxxyyyyy-yyyy-yyyy-yyyy-yyyyyyyyyyyy` - это UUID таблицы.
+Обычно UUID генерируется автоматически, но пользователь также может явно указать UUID в момент создания таблицы (однако это не рекомендуется). Для отображения UUID в запросе `SHOW CREATE` вы можете использовать настройку [show_table_uuid_in_table_create_query_if_not_nil](../../operations/settings/settings.md#show_table_uuid_in_table_create_query_if_not_nil). Результат выполнения в таком случае будет иметь вид:
+
+```sql
+CREATE TABLE name UUID '28f1c61c-2970-457a-bffe-454156ddcfef' (n UInt64) ENGINE = ...;
+```
+### RENAME TABLE {#rename-table}
+
+Запросы `RENAME` выполняются без изменения UUID и перемещения табличных данных. Эти запросы не ожидают завершения использующих таблицу запросов и будут выполнены мгновенно. 
+
+### DROP/DETACH TABLE {#drop-detach-table}
+
+При выполнении запроса `DROP TABLE` никакие данные не удаляются. Таблица помечается как удаленная, метаданные перемещаются в папку `/clickhouse_path/metadata_dropped/` и база данных уведомляет фоновый поток. Задержка перед окончательным удалением данных задается настройкой [database_atomic_delay_before_drop_table_sec](../../operations/server-configuration-parameters/settings.md#database_atomic_delay_before_drop_table_sec).
+Вы можете задать синхронный режим, определяя модификатор `SYNC`. Используйте для этого настройку [database_atomic_wait_for_drop_and_detach_synchronously](../../operations/settings/settings.md#database_atomic_wait_for_drop_and_detach_synchronously). В этом случае запрос `DROP` ждет завершения `SELECT`, `INSERT` и других запросов, которые используют таблицу. Таблица будет фактически удалена, когда она не будет использоваться.
+
+### EXCHANGE TABLES {#exchange-tables}
+
+Запрос `EXCHANGE` меняет местами две таблицы атомарно. Вместо неатомарной операции:
+
+```sql
+RENAME TABLE new_table TO tmp, old_table TO new_table, tmp TO old_table;
+```
+вы можете использовать один атомарный запрос:
+
+``` sql
+EXCHANGE TABLES new_table AND old_table;
+```
+
+### ReplicatedMergeTree in Atomic Database {#replicatedmergetree-in-atomic-database}
+
+Для таблиц [ReplicatedMergeTree](../table-engines/mergetree-family/replication.md#table_engines-replication) рекомендуется не указывать параметры движка - путь в ZooKeeper и имя реплики. В этом случае будут использоваться параметры конфигурации: [default_replica_path](../../operations/server-configuration-parameters/settings.md#default_replica_path) и [default_replica_name](../../operations/server-configuration-parameters/settings.md#default_replica_name). Если вы хотите определить параметры движка явно, рекомендуется использовать макрос {uuid}. Это удобно, так как автоматически генерируются уникальные пути для каждой таблицы в ZooKeeper.
+
+## Смотрите также
+
+-   Системная таблица [system.databases](../../operations/system-tables/databases.md).
diff --git a/docs/ru/engines/database-engines/index.md b/docs/ru/engines/database-engines/index.md
index 4dfe766f066..d4fad8f43a9 100644
--- a/docs/ru/engines/database-engines/index.md
+++ b/docs/ru/engines/database-engines/index.md
@@ -1,14 +1,14 @@
 ---
-toc_folder_title: "\u0414\u0432\u0438\u0436\u043a\u0438\u0020\u0431\u0430\u0437\u0020\u0434\u0430\u043d\u043d\u044b\u0445"
+toc_folder_title: "Движки баз данных"
 toc_priority: 27
-toc_title: "\u0412\u0432\u0435\u0434\u0435\u043d\u0438\u0435"
+toc_title: "Введение"
 ---
 
-# Движки баз данных {#dvizhki-baz-dannykh}
+# Движки баз данных {#database-engines}
 
 Движки баз данных обеспечивают работу с таблицами.
 
-По умолчанию ClickHouse использует собственный движок баз данных, который поддерживает конфигурируемые [движки таблиц](../../engines/database-engines/index.md) и [диалект SQL](../../engines/database-engines/index.md).
+По умолчанию ClickHouse использует движок [Atomic](../../engines/database-engines/atomic.md). Он поддерживает конфигурируемые [движки таблиц](../../engines/table-engines/index.md) и [диалект SQL](../../sql-reference/syntax.md).
 
 Также можно использовать следующие движки баз данных:
 
@@ -18,4 +18,5 @@ toc_title: "\u0412\u0432\u0435\u0434\u0435\u043d\u0438\u0435"
 
 -   [Lazy](../../engines/database-engines/lazy.md)
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/database_engines/) <!--hide-->
+-   [PostgreSQL](../../engines/database-engines/postgresql.md)
+
diff --git a/docs/ru/engines/database-engines/lazy.md b/docs/ru/engines/database-engines/lazy.md
index c01aae0284e..140a67be761 100644
--- a/docs/ru/engines/database-engines/lazy.md
+++ b/docs/ru/engines/database-engines/lazy.md
@@ -15,4 +15,3 @@ toc_title: Lazy
 CREATE DATABASE testlazy ENGINE = Lazy(expiration_time_in_seconds);
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/database_engines/lazy/) <!--hide-->
diff --git a/docs/ru/engines/database-engines/materialize-mysql.md b/docs/ru/engines/database-engines/materialize-mysql.md
index 3022542e294..2067dfecca0 100644
--- a/docs/ru/engines/database-engines/materialize-mysql.md
+++ b/docs/ru/engines/database-engines/materialize-mysql.md
@@ -157,4 +157,3 @@ SELECT * FROM mysql.test;
 └───┴─────┴──────┘
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/engines/database-engines/materialize-mysql/) <!--hide-->
diff --git a/docs/ru/engines/database-engines/postgresql.md b/docs/ru/engines/database-engines/postgresql.md
new file mode 100644
index 00000000000..c11dab6f1aa
--- /dev/null
+++ b/docs/ru/engines/database-engines/postgresql.md
@@ -0,0 +1,138 @@
+---
+toc_priority: 35
+toc_title: PostgreSQL
+---
+
+# PostgreSQL {#postgresql}
+
+Позволяет подключаться к БД на удаленном сервере [PostgreSQL](https://www.postgresql.org). Поддерживает операции чтения и записи (запросы `SELECT` и `INSERT`) для обмена данными между ClickHouse и PostgreSQL.
+
+Позволяет в реальном времени получать от удаленного сервера PostgreSQL информацию о таблицах БД и их структуре с помощью запросов `SHOW TABLES` и `DESCRIBE TABLE`.
+
+Поддерживает операции изменения структуры таблиц (`ALTER TABLE ... ADD|DROP COLUMN`). Если параметр `use_table_cache` (см. ниже раздел Параметры движка) установлен в значение `1`, структура таблицы кешируется, и изменения в структуре не отслеживаются, но будут обновлены, если выполнить команды `DETACH` и `ATTACH`.
+
+## Создание БД {#creating-a-database}
+
+``` sql
+CREATE DATABASE test_database 
+ENGINE = PostgreSQL('host:port', 'database', 'user', 'password'[, `use_table_cache`]);
+```
+
+**Параметры движка**
+
+-   `host:port` — адрес сервера PostgreSQL.
+-   `database` — имя удаленной БД.
+-   `user` — пользователь PostgreSQL.
+-   `password` — пароль пользователя.
+-   `use_table_cache` —  определяет кеширование структуры таблиц БД. Необязательный параметр. Значение по умолчанию: `0`.
+
+## Поддерживаемые типы данных {#data_types-support}
+
+| PostgerSQL       | ClickHouse                                                   |
+|------------------|--------------------------------------------------------------|
+| DATE             | [Date](../../sql-reference/data-types/date.md)               |
+| TIMESTAMP        | [DateTime](../../sql-reference/data-types/datetime.md)       |
+| REAL             | [Float32](../../sql-reference/data-types/float.md)           |
+| DOUBLE           | [Float64](../../sql-reference/data-types/float.md)           |
+| DECIMAL, NUMERIC | [Decimal](../../sql-reference/data-types/decimal.md)       |
+| SMALLINT         | [Int16](../../sql-reference/data-types/int-uint.md)          |
+| INTEGER          | [Int32](../../sql-reference/data-types/int-uint.md)          |
+| BIGINT           | [Int64](../../sql-reference/data-types/int-uint.md)          |
+| SERIAL           | [UInt32](../../sql-reference/data-types/int-uint.md)         |
+| BIGSERIAL        | [UInt64](../../sql-reference/data-types/int-uint.md)         |
+| TEXT, CHAR       | [String](../../sql-reference/data-types/string.md)           |
+| INTEGER          | Nullable([Int32](../../sql-reference/data-types/int-uint.md))|
+| ARRAY            | [Array](../../sql-reference/data-types/array.md)             |
+ 
+
+## Примеры использования {#examples-of-use}
+
+Обмен данными между БД ClickHouse и сервером PostgreSQL:
+
+``` sql
+CREATE DATABASE test_database 
+ENGINE = PostgreSQL('postgres1:5432', 'test_database', 'postgres', 'mysecretpassword', 1);
+```
+
+``` sql
+SHOW DATABASES;
+```
+
+``` text
+┌─name──────────┐
+│ default       │
+│ test_database │
+│ system        │
+└───────────────┘
+```
+
+``` sql
+SHOW TABLES FROM test_database;
+```
+
+``` text
+┌─name───────┐
+│ test_table │
+└────────────┘
+```
+
+Чтение данных из таблицы PostgreSQL:
+
+``` sql
+SELECT * FROM test_database.test_table;
+```
+
+``` text
+┌─id─┬─value─┐
+│  1 │     2 │
+└────┴───────┘
+```
+
+Запись данных в таблицу PostgreSQL:
+
+``` sql
+INSERT INTO test_database.test_table VALUES (3,4);
+SELECT * FROM test_database.test_table;
+```
+
+``` text
+┌─int_id─┬─value─┐
+│      1 │     2 │
+│      3 │     4 │
+└────────┴───────┘
+```
+
+Пусть структура таблицы была изменена в PostgreSQL: 
+
+``` sql
+postgre> ALTER TABLE test_table ADD COLUMN data Text
+```
+
+Поскольку при создании БД параметр `use_table_cache` был установлен в значение `1`, структура таблицы в ClickHouse была кеширована и поэтому не изменилась:
+
+``` sql
+DESCRIBE TABLE test_database.test_table;
+```
+``` text
+┌─name───┬─type──────────────┐
+│ id     │ Nullable(Integer) │
+│ value  │ Nullable(Integer) │
+└────────┴───────────────────┘
+```
+
+После того как таблицу «отцепили» и затем снова «прицепили», структура обновилась:
+
+``` sql
+DETACH TABLE test_database.test_table;
+ATTACH TABLE test_database.test_table;
+DESCRIBE TABLE test_database.test_table;
+```
+``` text
+┌─name───┬─type──────────────┐
+│ id     │ Nullable(Integer) │
+│ value  │ Nullable(Integer) │
+│ data   │ Nullable(String)  │
+└────────┴───────────────────┘
+```
+
+[Оригинальная статья](https://clickhouse.tech/docs/ru/database-engines/postgresql/) <!--hide-->
diff --git a/docs/ru/engines/index.md b/docs/ru/engines/index.md
index 28ccc8bcfe6..fe41ada8fb6 100644
--- a/docs/ru/engines/index.md
+++ b/docs/ru/engines/index.md
@@ -1,5 +1,5 @@
 ---
-toc_folder_title: "\u0045\u006e\u0067\u0069\u006e\u0065\u0073"
+toc_folder_title: "Engines"
 toc_hidden: true
 toc_priority: 25
 toc_title: hidden
diff --git a/docs/ru/engines/table-engines/index.md b/docs/ru/engines/table-engines/index.md
index 740588c50a4..b17b2124250 100644
--- a/docs/ru/engines/table-engines/index.md
+++ b/docs/ru/engines/table-engines/index.md
@@ -1,7 +1,7 @@
 ---
-toc_folder_title: "\u0414\u0432\u0438\u0436\u043a\u0438\u0020\u0442\u0430\u0431\u043b\u0438\u0446"
+toc_folder_title: "Движки таблиц"
 toc_priority: 26
-toc_title: "\u0412\u0432\u0435\u0434\u0435\u043d\u0438\u0435"
+toc_title: "Введение"
 ---
 
 
@@ -16,7 +16,7 @@ toc_title: "\u0412\u0432\u0435\u0434\u0435\u043d\u0438\u0435"
 -   Возможно ли многопоточное выполнение запроса.
 -   Параметры репликации данных.
 
-## Семейства движков {#semeistva-dvizhkov}
+## Семейства движков {#engine-families}
 
 ### MergeTree {#mergetree}
 
@@ -42,7 +42,7 @@ toc_title: "\u0412\u0432\u0435\u0434\u0435\u043d\u0438\u0435"
 -   [StripeLog](log-family/stripelog.md#stripelog)
 -   [Log](log-family/log.md#log)
 
-### Движки для интеграции {#dvizhki-dlia-integratsii}
+### Движки для интеграции {#integration-engines}
 
 Движки для связи с другими системами хранения и обработки данных.
 
@@ -52,9 +52,22 @@ toc_title: "\u0412\u0432\u0435\u0434\u0435\u043d\u0438\u0435"
 -   [MySQL](integrations/mysql.md#mysql)
 -   [ODBC](integrations/odbc.md#table-engine-odbc)
 -   [JDBC](integrations/jdbc.md#table-engine-jdbc)
+-   [S3](integrations/s3.md#table-engine-s3)
 
 ### Специальные движки {#spetsialnye-dvizhki}
 
+-   [ODBC](../../engines/table-engines/integrations/odbc.md)
+-   [JDBC](../../engines/table-engines/integrations/jdbc.md)
+-   [MySQL](../../engines/table-engines/integrations/mysql.md)
+-   [MongoDB](../../engines/table-engines/integrations/mongodb.md)
+-   [HDFS](../../engines/table-engines/integrations/hdfs.md)
+-   [Kafka](../../engines/table-engines/integrations/kafka.md)
+-   [EmbeddedRocksDB](../../engines/table-engines/integrations/embedded-rocksdb.md)
+-   [RabbitMQ](../../engines/table-engines/integrations/rabbitmq.md)
+-   [PostgreSQL](../../engines/table-engines/integrations/postgresql.md)
+
+### Специальные движки {#special-engines}
+
 Движки семейства:
 
 -   [Distributed](special/distributed.md#distributed)
@@ -79,5 +92,3 @@ toc_title: "\u0412\u0432\u0435\u0434\u0435\u043d\u0438\u0435"
 Чтобы получить данные из виртуального столбца, необходимо указать его название в запросе `SELECT`. `SELECT *` не отображает данные из виртуальных столбцов.
 
 При создании таблицы со столбцом, имя которого совпадает с именем одного из виртуальных столбцов таблицы, виртуальный столбец становится недоступным. Не делайте так. Чтобы помочь избежать конфликтов, имена виртуальных столбцов обычно предваряются подчеркиванием.
-
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/table_engines/) <!--hide-->
diff --git a/docs/ru/engines/table-engines/integrations/embedded-rocksdb.md b/docs/ru/engines/table-engines/integrations/embedded-rocksdb.md
index 9b68bcfc770..5a7909f63b2 100644
--- a/docs/ru/engines/table-engines/integrations/embedded-rocksdb.md
+++ b/docs/ru/engines/table-engines/integrations/embedded-rocksdb.md
@@ -1,5 +1,5 @@
 ---
-toc_priority: 6
+toc_priority: 9
 toc_title: EmbeddedRocksDB
 ---
 
@@ -41,4 +41,3 @@ ENGINE = EmbeddedRocksDB
 PRIMARY KEY key;
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/table_engines/embedded-rocksdb/) <!--hide-->
\ No newline at end of file
diff --git a/docs/ru/engines/table-engines/integrations/hdfs.md b/docs/ru/engines/table-engines/integrations/hdfs.md
index bd8e760fce4..b56bbfc0788 100644
--- a/docs/ru/engines/table-engines/integrations/hdfs.md
+++ b/docs/ru/engines/table-engines/integrations/hdfs.md
@@ -1,5 +1,5 @@
 ---
-toc_priority: 4
+toc_priority: 6
 toc_title: HDFS
 ---
 
@@ -102,16 +102,103 @@ CREATE TABLE table_with_asterisk (name String, value UInt32) ENGINE = HDFS('hdfs
 Создадим таблицу с именами `file000`, `file001`, … , `file999`:
 
 ``` sql
-CREARE TABLE big_table (name String, value UInt32) ENGINE = HDFS('hdfs://hdfs1:9000/big_dir/file{0..9}{0..9}{0..9}', 'CSV')
+CREATE TABLE big_table (name String, value UInt32) ENGINE = HDFS('hdfs://hdfs1:9000/big_dir/file{0..9}{0..9}{0..9}', 'CSV')
 ```
+## Конфигурация {#configuration}
+
+Похоже на GraphiteMergeTree, движок HDFS поддерживает расширенную конфигурацию с использованием файла конфигурации ClickHouse. Есть два раздела конфигурации которые вы можете использовать: глобальный (`hdfs`) и на уровне пользователя (`hdfs_*`). Глобальные настройки применяются первыми, и затем применяется конфигурация уровня пользователя (если она указана).
+
+``` xml
+  <!-- Глобальные настройки для движка HDFS -->
+  <hdfs>
+	<hadoop_kerberos_keytab>/tmp/keytab/clickhouse.keytab</hadoop_kerberos_keytab>
+	<hadoop_kerberos_principal>clickuser@TEST.CLICKHOUSE.TECH</hadoop_kerberos_principal>
+	<hadoop_security_authentication>kerberos</hadoop_security_authentication>
+  </hdfs>
+
+  <!-- Конфигурация специфичная для пользователя "root" -->
+  <hdfs_root>
+	<hadoop_kerberos_principal>root@TEST.CLICKHOUSE.TECH</hadoop_kerberos_principal>
+  </hdfs_root>
+```
+
+### Список возможных опций конфигурации со значениями по умолчанию
+#### Поддерживаемые из libhdfs3
+
+
+| **параметр**                                          | **по умолчанию**        |
+| rpc\_client\_connect\_tcpnodelay                      | true                    |
+| dfs\_client\_read\_shortcircuit                       | true                    |
+| output\_replace-datanode-on-failure                   | true                    |
+| input\_notretry-another-node                          | false                   |
+| input\_localread\_mappedfile                          | true                    |
+| dfs\_client\_use\_legacy\_blockreader\_local          | false                   |
+| rpc\_client\_ping\_interval                           | 10  * 1000              |
+| rpc\_client\_connect\_timeout                         | 600 * 1000              |
+| rpc\_client\_read\_timeout                            | 3600 * 1000             |
+| rpc\_client\_write\_timeout                           | 3600 * 1000             |
+| rpc\_client\_socekt\_linger\_timeout                  | -1                      |
+| rpc\_client\_connect\_retry                           | 10                      |
+| rpc\_client\_timeout                                  | 3600 * 1000             |
+| dfs\_default\_replica                                 | 3                       |
+| input\_connect\_timeout                               | 600 * 1000              |
+| input\_read\_timeout                                  | 3600 * 1000             |
+| input\_write\_timeout                                 | 3600 * 1000             |
+| input\_localread\_default\_buffersize                 | 1 * 1024 * 1024         |
+| dfs\_prefetchsize                                     | 10                      |
+| input\_read\_getblockinfo\_retry                      | 3                       |
+| input\_localread\_blockinfo\_cachesize                | 1000                    |
+| input\_read\_max\_retry                               | 60                      |
+| output\_default\_chunksize                            | 512                     |
+| output\_default\_packetsize                           | 64 * 1024               |
+| output\_default\_write\_retry                         | 10                      |
+| output\_connect\_timeout                              | 600 * 1000              |
+| output\_read\_timeout                                 | 3600 * 1000             |
+| output\_write\_timeout                                | 3600 * 1000             |
+| output\_close\_timeout                                | 3600 * 1000             |
+| output\_packetpool\_size                              | 1024                    |
+| output\_heeartbeat\_interval                          | 10 * 1000               |
+| dfs\_client\_failover\_max\_attempts                  | 15                      |
+| dfs\_client\_read\_shortcircuit\_streams\_cache\_size | 256                     |
+| dfs\_client\_socketcache\_expiryMsec                  | 3000                    |
+| dfs\_client\_socketcache\_capacity                    | 16                      |
+| dfs\_default\_blocksize                               | 64 * 1024 * 1024        |
+| dfs\_default\_uri                                     | "hdfs://localhost:9000" |
+| hadoop\_security\_authentication                      | "simple"                |
+| hadoop\_security\_kerberos\_ticket\_cache\_path       | ""                      |
+| dfs\_client\_log\_severity                            | "INFO"                  |
+| dfs\_domain\_socket\_path                             | ""                      |
+
+
+[Руководство по конфигурации HDFS](https://hawq.apache.org/docs/userguide/2.3.0.0-incubating/reference/HDFSConfigurationParameterReference.html) поможет обьяснить назначения некоторых параметров.
+
+
+#### Расширенные параметры для ClickHouse {#clickhouse-extras}
+
+| **параметр**                                          | **по умолчанию**        |
+|hadoop\_kerberos\_keytab                               | ""                      |
+|hadoop\_kerberos\_principal                            | ""                      |
+|hadoop\_kerberos\_kinit\_command                       | kinit                   |
+
+#### Ограничения {#limitations}
+  * hadoop\_security\_kerberos\_ticket\_cache\_path могут быть определены только на глобальном уровне
+
+## Поддержика Kerberos {#kerberos-support}
+
+Если hadoop\_security\_authentication параметр имеет значение 'kerberos', ClickHouse аутентифицируется с помощью Kerberos.
+[Расширенные параметры](#clickhouse-extras) и hadoop\_security\_kerberos\_ticket\_cache\_path помогают сделать это.
+Обратите внимание что из-за ограничений libhdfs3 поддерживается только устаревший метод аутентификации,
+коммуникация с узлами данных не защищена SASL (HADOOP\_SECURE\_DN\_USER надежный показатель такого
+подхода к безопасности). Используйте tests/integration/test\_storage\_kerberized\_hdfs/hdfs_configs/bootstrap.sh для примера настроек.
+
+Если hadoop\_kerberos\_keytab, hadoop\_kerberos\_principal или hadoop\_kerberos\_kinit\_command указаны в настройках, kinit будет вызван. hadoop\_kerberos\_keytab и hadoop\_kerberos\_principal обязательны в этом случае. Необходимо также будет установить kinit и файлы конфигурации krb5.
 
 ## Виртуальные столбцы {#virtualnye-stolbtsy}
 
 -   `_path` — Путь к файлу.
 -   `_file` — Имя файла.
 
-**Смотрите также**
+**См. также**
 
--   [Виртуальные столбцы](index.md#table_engines-virtual_columns)
+-   [Виртуальные колонки](../../../engines/table-engines/index.md#table_engines-virtual_columns)
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/table_engines/hdfs/) <!--hide-->
diff --git a/docs/ru/engines/table-engines/integrations/index.md b/docs/ru/engines/table-engines/integrations/index.md
index db7e527442e..cb217270129 100644
--- a/docs/ru/engines/table-engines/integrations/index.md
+++ b/docs/ru/engines/table-engines/integrations/index.md
@@ -1,5 +1,5 @@
 ---
-toc_folder_title: "\u0414\u0432\u0438\u0436\u043a\u0438\u0020\u0442\u0430\u0431\u043b\u0438\u0446\u0020\u0434\u043b\u044f\u0020\u0438\u043d\u0442\u0435\u0433\u0440\u0430\u0446\u0438\u0438"
+toc_folder_title: "Движки таблиц для интеграции"
 toc_priority: 30
 ---
 
@@ -14,8 +14,9 @@ toc_priority: 30
 -   [MySQL](../../../engines/table-engines/integrations/mysql.md)
 -   [MongoDB](../../../engines/table-engines/integrations/mongodb.md)
 -   [HDFS](../../../engines/table-engines/integrations/hdfs.md)
+-   [S3](../../../engines/table-engines/integrations/s3.md)
 -   [Kafka](../../../engines/table-engines/integrations/kafka.md)
 -   [EmbeddedRocksDB](../../../engines/table-engines/integrations/embedded-rocksdb.md)
 -   [RabbitMQ](../../../engines/table-engines/integrations/rabbitmq.md)
+-   [PostgreSQL](../../../engines/table-engines/integrations/postgresql.md)
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/engines/table-engines/integrations/) <!--hide-->
diff --git a/docs/ru/engines/table-engines/integrations/jdbc.md b/docs/ru/engines/table-engines/integrations/jdbc.md
index d7d438e0633..fd7411a258e 100644
--- a/docs/ru/engines/table-engines/integrations/jdbc.md
+++ b/docs/ru/engines/table-engines/integrations/jdbc.md
@@ -1,5 +1,5 @@
 ---
-toc_priority: 2
+toc_priority: 3
 toc_title: JDBC
 ---
 
@@ -89,4 +89,3 @@ FROM jdbc_table
 
 -   [Табличная функция JDBC](../../../engines/table-engines/integrations/jdbc.md).
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/table_engines/jdbc/) <!--hide-->
diff --git a/docs/ru/engines/table-engines/integrations/kafka.md b/docs/ru/engines/table-engines/integrations/kafka.md
index 940fee2452b..19e2850dd51 100644
--- a/docs/ru/engines/table-engines/integrations/kafka.md
+++ b/docs/ru/engines/table-engines/integrations/kafka.md
@@ -1,5 +1,5 @@
 ---
-toc_priority: 5
+toc_priority: 8
 toc_title: Kafka
 ---
 
@@ -31,21 +31,26 @@ SETTINGS
     [kafka_schema = '',]
     [kafka_num_consumers = N,]
     [kafka_skip_broken_messages = N]
+    [kafka_commit_every_batch = 0,]
+    [kafka_thread_per_consumer = 0]
 ```
 
 Обязательные параметры:
 
--   `kafka_broker_list` – перечень брокеров, разделенный запятыми (`localhost:9092`).
--   `kafka_topic_list` – перечень необходимых топиков Kafka.
--   `kafka_group_name` – группа потребителя Kafka. Отступы для чтения отслеживаются для каждой группы отдельно. Если необходимо, чтобы сообщения не повторялись на кластере, используйте везде одно имя группы.
--   `kafka_format` – формат сообщений. Названия форматов должны быть теми же, что можно использовать в секции `FORMAT`, например, `JSONEachRow`. Подробнее читайте в разделе [Форматы](../../../interfaces/formats.md).
+-   `kafka_broker_list` — перечень брокеров, разделенный запятыми (`localhost:9092`).
+-   `kafka_topic_list` — перечень необходимых топиков Kafka.
+-   `kafka_group_name` — группа потребителя Kafka. Отступы для чтения отслеживаются для каждой группы отдельно. Если необходимо, чтобы сообщения не повторялись на кластере, используйте везде одно имя группы.
+-   `kafka_format` — формат сообщений. Названия форматов должны быть теми же, что можно использовать в секции `FORMAT`, например, `JSONEachRow`. Подробнее читайте в разделе [Форматы](../../../interfaces/formats.md).
 
 Опциональные параметры:
 
--   `kafka_row_delimiter` – символ-разделитель записей (строк), которым завершается сообщение.
--   `kafka_schema` – опциональный параметр, необходимый, если используется формат, требующий определения схемы. Например, [Cap’n Proto](https://capnproto.org/) требует путь к файлу со схемой и название корневого объекта `schema.capnp:Message`.
--   `kafka_num_consumers` – количество потребителей (consumer) на таблицу. По умолчанию: `1`. Укажите больше потребителей, если пропускная способность одного потребителя недостаточна. Общее число потребителей не должно превышать количество партиций в топике, так как на одну партицию может быть назначено не более одного потребителя.
--   `kafka_skip_broken_messages` – максимальное количество некорректных сообщений в блоке. Если `kafka_skip_broken_messages = N`, то движок отбрасывает `N` сообщений Кафки, которые не получилось обработать. Одно сообщение в точности соответствует одной записи (строке). Значение по умолчанию – 0.
+-   `kafka_row_delimiter` — символ-разделитель записей (строк), которым завершается сообщение.
+-   `kafka_schema` — опциональный параметр, необходимый, если используется формат, требующий определения схемы. Например, [Cap’n Proto](https://capnproto.org/) требует путь к файлу со схемой и название корневого объекта `schema.capnp:Message`.
+-   `kafka_num_consumers` — количество потребителей (consumer) на таблицу. По умолчанию: `1`. Укажите больше потребителей, если пропускная способность одного потребителя недостаточна. Общее число потребителей не должно превышать количество партиций в топике, так как на одну партицию может быть назначено не более одного потребителя.
+-   `kafka_max_block_size` — максимальный размер пачек (в сообщениях) для poll (по умолчанию `max_block_size`).
+-   `kafka_skip_broken_messages` — максимальное количество некорректных сообщений в блоке. Если `kafka_skip_broken_messages = N`, то движок отбрасывает `N` сообщений Кафки, которые не получилось обработать. Одно сообщение в точности соответствует одной записи (строке). Значение по умолчанию – 0.
+-   `kafka_commit_every_batch` — включает или отключает режим записи каждой принятой и обработанной пачки по отдельности вместо единой записи целого блока (по умолчанию `0`).
+-   `kafka_thread_per_consumer` — включает или отключает предоставление отдельного потока каждому потребителю (по умолчанию `0`). При включенном режиме каждый потребитель сбрасывает данные независимо и параллельно, при отключённом — строки с данными от нескольких потребителей собираются в один блок.
 
 Примеры
 
@@ -188,4 +193,3 @@ ClickHouse может поддерживать учетные данные Kerbe
 -   [Виртуальные столбцы](index.md#table_engines-virtual_columns)
 -   [background_schedule_pool_size](../../../operations/settings/settings.md#background_schedule_pool_size)
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/table_engines/kafka/) <!--hide-->
diff --git a/docs/ru/engines/table-engines/integrations/mongodb.md b/docs/ru/engines/table-engines/integrations/mongodb.md
index 0765b3909de..97f903bdf89 100644
--- a/docs/ru/engines/table-engines/integrations/mongodb.md
+++ b/docs/ru/engines/table-engines/integrations/mongodb.md
@@ -1,5 +1,5 @@
 ---
-toc_priority: 7
+toc_priority: 5
 toc_title: MongoDB
 ---
 
@@ -54,4 +54,4 @@ SELECT COUNT() FROM mongo_table;
 └─────────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/ru/operations/table_engines/integrations/mongodb/) <!--hide-->
+[Original article](https://clickhouse.tech/docs/ru/engines/table-engines/integrations/mongodb/) <!--hide-->
diff --git a/docs/ru/engines/table-engines/integrations/mysql.md b/docs/ru/engines/table-engines/integrations/mysql.md
index 3370e9b06d0..5011c8a93c6 100644
--- a/docs/ru/engines/table-engines/integrations/mysql.md
+++ b/docs/ru/engines/table-engines/integrations/mysql.md
@@ -1,5 +1,5 @@
 ---
-toc_priority: 3
+toc_priority: 4
 toc_title: MySQL
 ---
 
@@ -18,12 +18,13 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
 ) ENGINE = MySQL('host:port', 'database', 'table', 'user', 'password'[, replace_query, 'on_duplicate_clause']);
 ```
 
-Смотрите подробное описание запроса [CREATE TABLE](../../../engines/table-engines/integrations/mysql.md#create-table-query).
+Смотрите подробное описание запроса [CREATE TABLE](../../../sql-reference/statements/create/table.md#create-table-query).
 
 Структура таблицы может отличаться от исходной структуры таблицы MySQL:
 
 -   Имена столбцов должны быть такими же, как в исходной таблице MySQL, но вы можете использовать только некоторые из этих столбцов и в любом порядке.
--   Типы столбцов могут отличаться от типов в исходной таблице MySQL. ClickHouse пытается [приводить](../../../engines/table-engines/integrations/mysql.md#type_conversion_function-cast) значения к типам данных ClickHouse.
+-   Типы столбцов могут отличаться от типов в исходной таблице MySQL. ClickHouse пытается [приводить](../../../sql-reference/functions/type-conversion-functions.md#type_conversion_function-cast) значения к типам данных ClickHouse.
+-   Настройка `external_table_functions_use_nulls` определяет как обрабатывать Nullable столбцы. По умолчанию 1, если 0 - табличная функция не будет делать nullable столбцы и будет вместо null выставлять значения по умолчанию для скалярного типа. Это также применимо для null значений внутри массивов.
 
 **Параметры движка**
 
@@ -100,4 +101,3 @@ SELECT * FROM mysql_table
 -   [Табличная функция ‘mysql’](../../../engines/table-engines/integrations/mysql.md)
 -   [Использование MySQL в качестве источника для внешнего словаря](../../../engines/table-engines/integrations/mysql.md#dicts-external_dicts_dict_sources-mysql)
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/table_engines/mysql/) <!--hide-->
diff --git a/docs/ru/engines/table-engines/integrations/odbc.md b/docs/ru/engines/table-engines/integrations/odbc.md
index 97317d647c8..669977ff531 100644
--- a/docs/ru/engines/table-engines/integrations/odbc.md
+++ b/docs/ru/engines/table-engines/integrations/odbc.md
@@ -1,5 +1,5 @@
 ---
-toc_priority: 1
+toc_priority: 2
 toc_title: ODBC
 ---
 
@@ -29,6 +29,7 @@ ENGINE = ODBC(connection_settings, external_database, external_table)
 
 -   Имена столбцов должны быть такими же, как в исходной таблице, но вы можете использовать только некоторые из этих столбцов и в любом порядке.
 -   Типы столбцов могут отличаться от типов аналогичных столбцов в исходной таблице. ClickHouse пытается [приводить](../../../engines/table-engines/integrations/odbc.md#type_conversion_function-cast) значения к типам данных ClickHouse.
+-   Настройка `external_table_functions_use_nulls` определяет как обрабатывать Nullable столбцы. По умолчанию 1, если 0 - табличная функция не будет делать nullable столбцы и будет вместо null выставлять значения по умолчанию для скалярного типа. Это также применимо для null значений внутри массивов.
 
 **Параметры движка**
 
@@ -127,4 +128,3 @@ SELECT * FROM odbc_t
 -   [Внешние словари ODBC](../../../engines/table-engines/integrations/odbc.md#dicts-external_dicts_dict_sources-odbc)
 -   [Табличная функция odbc](../../../engines/table-engines/integrations/odbc.md)
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/table_engines/odbc/) <!--hide-->
diff --git a/docs/ru/engines/table-engines/integrations/postgresql.md b/docs/ru/engines/table-engines/integrations/postgresql.md
new file mode 100644
index 00000000000..cb8e38ae5c9
--- /dev/null
+++ b/docs/ru/engines/table-engines/integrations/postgresql.md
@@ -0,0 +1,145 @@
+---
+toc_priority: 11
+toc_title: PostgreSQL
+---
+
+#PostgreSQL {#postgresql}
+
+Движок PostgreSQL позволяет выполнять запросы `SELECT` и `INSERT` для таблиц на удаленном сервере PostgreSQL.
+
+## Создание таблицы {#creating-a-table}
+
+``` sql
+CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
+(
+    name1 [type1] [DEFAULT|MATERIALIZED|ALIAS expr1] [TTL expr1],
+    name2 [type2] [DEFAULT|MATERIALIZED|ALIAS expr2] [TTL expr2],
+    ...
+) ENGINE = PostgreSQL('host:port', 'database', 'table', 'user', 'password'[, `schema`]);
+```
+
+Смотрите подробное описание запроса [CREATE TABLE](../../../sql-reference/statements/create/table.md#create-table-query).
+
+Структура таблицы может отличаться от исходной структуры таблицы PostgreSQL:
+
+-   Имена столбцов должны быть такими же, как в исходной таблице PostgreSQL, но вы можете использовать только некоторые из этих столбцов и в любом порядке.
+-   Типы столбцов могут отличаться от типов в исходной таблице PostgreSQL. ClickHouse пытается [приводить](../../../sql-reference/functions/type-conversion-functions.md#type_conversion_function-cast) values to the ClickHouse data types.
+-   Настройка `external_table_functions_use_nulls` определяет как обрабатывать Nullable столбцы. По умолчанию 1, если 0 - табличная функция не будет делать nullable столбцы и будет вместо null выставлять значения по умолчанию для скалярного типа. Это также применимо для null значений внутри массивов.
+
+**Параметры движка**
+
+-   `host:port` — адрес сервера PostgreSQL.
+-   `database` — Имя базы данных на сервере PostgreSQL.
+-   `table` — Имя таблицы.
+-   `user` — Имя пользователя PostgreSQL.
+-   `password` — Пароль пользователя PostgreSQL.
+-   `schema` — имя схемы, если не используется схема по умолчанию. Необязательный аргумент. 
+
+## Особенности реализации {#implementation-details}
+
+Запросы `SELECT` на стороне PostgreSQL выполняются как `COPY (SELECT ...) TO STDOUT` внутри транзакции PostgreSQL только на чтение с коммитом после каждого запроса `SELECT`.
+
+Простые условия для `WHERE`, такие как `=`, `!=`, `>`, `>=`, `<`, `<=` и `IN`, исполняются на стороне PostgreSQL сервера.
+
+Все операции объединения, аггрегации, сортировки, условия `IN [ array ]` и ограничения `LIMIT` выполняются на стороне ClickHouse только после того, как запрос к PostgreSQL закончился.
+
+Запросы `INSERT` на стороне PostgreSQL выполняются как `COPY "table_name" (field1, field2, ... fieldN) FROM STDIN` внутри PostgreSQL транзакции с автоматическим коммитом после каждого запроса `INSERT`.
+
+PostgreSQL массивы конвертируются в массивы ClickHouse.
+
+!!! info "Внимание"
+    Будьте внимательны, в PostgreSQL массивы, созданные как `type_name[]`, являются многомерными и могут содержать в себе разное количество измерений в разных строках одной таблицы. Внутри ClickHouse допустимы только многомерные массивы с одинаковым кол-вом измерений во всех строках таблицы.
+
+При использовании словаря PostgreSQL поддерживается приоритет реплик. Чем больше номер реплики, тем ниже ее приоритет. Наивысший приоритет у реплики с номером `0`.  
+
+В примере ниже реплика `example01-1` имеет более высокий приоритет:
+
+```xml
+<postgresql>
+    <port>5432</port>
+    <user>clickhouse</user>
+    <password>qwerty</password>
+    <replica>
+        <host>example01-1</host>
+        <priority>1</priority>
+    </replica>
+    <replica>
+        <host>example01-2</host>
+        <priority>2</priority>
+    </replica>
+    <db>db_name</db>
+    <table>table_name</table>
+    <where>id=10</where>
+    <invalidate_query>SQL_QUERY</invalidate_query>
+</postgresql>
+</source>
+```
+
+## Пример использования {#usage-example}
+
+Таблица в PostgreSQL:
+
+``` text
+postgres=# CREATE TABLE "public"."test" (
+"int_id" SERIAL,
+"int_nullable" INT NULL DEFAULT NULL,
+"float" FLOAT NOT NULL,
+"str" VARCHAR(100) NOT NULL DEFAULT '',
+"float_nullable" FLOAT NULL DEFAULT NULL,
+PRIMARY KEY (int_id));
+
+CREATE TABLE
+
+postgres=# INSERT INTO test (int_id, str, "float") VALUES (1,'test',2);
+INSERT 0 1
+
+postgresql> SELECT * FROM test;
+  int_id | int_nullable | float | str  | float_nullable
+ --------+--------------+-------+------+----------------
+       1 |              |     2 | test |
+ (1 row)
+```
+
+Таблица в ClickHouse, получение данных из PostgreSQL таблицы, созданной выше:
+
+``` sql
+CREATE TABLE default.postgresql_table
+(
+    `float_nullable` Nullable(Float32),
+    `str` String,
+    `int_id` Int32
+)
+ENGINE = PostgreSQL('localhost:5432', 'public', 'test', 'postges_user', 'postgres_password');
+```
+
+``` sql
+SELECT * FROM postgresql_table WHERE str IN ('test'); 
+```
+
+``` text
+┌─float_nullable─┬─str──┬─int_id─┐
+│           ᴺᵁᴸᴸ │ test │      1 │
+└────────────────┴──────┴────────┘
+```
+
+Using Non-default Schema:
+
+```text
+postgres=# CREATE SCHEMA "nice.schema";
+
+postgres=# CREATE TABLE "nice.schema"."nice.table" (a integer);
+
+postgres=# INSERT INTO "nice.schema"."nice.table" SELECT i FROM generate_series(0, 99) as t(i)
+```
+
+```sql
+CREATE TABLE pg_table_schema_with_dots (a UInt32)
+        ENGINE PostgreSQL('localhost:5432', 'clickhouse', 'nice.table', 'postgrsql_user', 'password', 'nice.schema');
+```
+
+**См. также** 
+
+-   [Табличная функция `postgresql`](../../../sql-reference/table-functions/postgresql.md)
+-   [Использование PostgreSQL в качестве источника для внешнего словаря](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md#dicts-external_dicts_dict_sources-postgresql)
+
+[Оригинальная статья](https://clickhouse.tech/docs/ru/engines/table-engines/integrations/postgresql/) <!--hide-->
diff --git a/docs/ru/engines/table-engines/integrations/rabbitmq.md b/docs/ru/engines/table-engines/integrations/rabbitmq.md
index f55163c1988..ef8a58c4c82 100644
--- a/docs/ru/engines/table-engines/integrations/rabbitmq.md
+++ b/docs/ru/engines/table-engines/integrations/rabbitmq.md
@@ -155,3 +155,4 @@ Example:
 -   `_redelivered` - флаг `redelivered`. (Не равно нулю, если есть возможность, что сообщение было получено более, чем одним каналом.)
 -   `_message_id` - значение поля `messageID` полученного сообщения. Данное поле непусто, если указано в параметрах при отправке сообщения.
 -   `_timestamp` - значение поля `timestamp` полученного сообщения. Данное поле непусто, если указано в параметрах при отправке сообщения.
+
diff --git a/docs/ru/engines/table-engines/integrations/s3.md b/docs/ru/engines/table-engines/integrations/s3.md
new file mode 100644
index 00000000000..216db98077c
--- /dev/null
+++ b/docs/ru/engines/table-engines/integrations/s3.md
@@ -0,0 +1,146 @@
+---
+toc_priority: 4
+toc_title: S3
+---
+
+# Движок таблиц S3 {#table-engine-s3}
+
+Этот движок обеспечивает интеграцию с экосистемой [Amazon S3](https://aws.amazon.com/s3/). Он похож на движок [HDFS](../../../engines/table-engines/special/file.md#table_engines-hdfs), но обеспечивает специфические для S3 возможности.
+
+## Создание таблицы {#creating-a-table}
+
+``` sql
+CREATE TABLE s3_engine_table (name String, value UInt32) 
+ENGINE = S3(path, [aws_access_key_id, aws_secret_access_key,] format, structure, [compression])
+```
+
+**Параметры движка**
+
+-   `path` — URL-адрес бакета с указанием пути к файлу. Поддерживает следующие подстановочные знаки в режиме "только чтение": `*`, `?`, `{abc,def}` и `{N..M}` где `N`, `M` — числа, `'abc'`, `'def'` — строки. Подробнее смотри [ниже](#wildcards-in-path).
+-   `format` — [формат](../../../interfaces/formats.md#formats) файла.
+-   `structure` — структура таблицы в формате `'column1_name column1_type, column2_name column2_type, ...'`.
+-   `compression` — тип сжатия. Возможные значения: `none`, `gzip/gz`, `brotli/br`, `xz/LZMA`, `zstd/zst`. Необязательный параметр. Если не указано, то тип сжатия определяется автоматически по расширению файла. 
+
+**Пример**
+
+``` sql
+CREATE TABLE s3_engine_table (name String, value UInt32) 
+ENGINE = S3('https://storage.yandexcloud.net/my-test-bucket-768/test-data.csv.gz', 'CSV', 'name String, value UInt32', 'gzip');
+INSERT INTO s3_engine_table VALUES ('one', 1), ('two', 2), ('three', 3);
+SELECT * FROM s3_engine_table LIMIT 2;
+```
+
+``` text
+┌─name─┬─value─┐
+│ one  │     1 │
+│ two  │     2 │
+└──────┴───────┘
+```
+
+## Виртуальные столбцы {#virtual-columns}
+
+-   `_path` — путь к файлу.
+-   `_file` — имя файла.
+
+Подробнее про виртуальные столбцы можно прочитать [здесь](../../../engines/table-engines/index.md#table_engines-virtual_columns).
+
+## Детали реализации {#implementation-details}
+
+-   Чтение и запись могут быть параллельными.
+-   Не поддерживаются:
+    -   запросы `ALTER` и `SELECT...SAMPLE`,
+    -   индексы,
+    -   репликация.
+
+## Символы подстановки  {#wildcards-in-path}
+
+Аргумент `path` может указывать на несколько файлов, используя подстановочные знаки. Для обработки файл должен существовать и соответствовать всему шаблону пути. Список файлов определяется во время выполнения запроса `SELECT` (не в момент выполнения запроса `CREATE`).
+
+-   `*` — заменяет любое количество любых символов, кроме `/`, включая пустую строку.
+-   `?` — заменяет любые одиночные символы.
+-   `{some_string, another_string, yet_another_one}` — заменяет любые строки `'some_string', 'another_string', 'yet_another_one'`.
+-   `{N..M}` — заменяет любое число от N до M, включая обе границы. N и M могут иметь ведущие нули, например `000..078`.
+
+Конструкции с `{}` аналогичны функции [remote](../../../sql-reference/table-functions/remote.md).
+
+## Настройки движка S3 {#s3-settings}
+
+Перед выполнением запроса или в конфигурационном файле могут быть установлены следующие настройки: 
+
+-   `s3_max_single_part_upload_size` — максимальный размер объекта для загрузки с использованием однокомпонентной загрузки в S3. Значение по умолчанию — `64 Mб`. 
+-   `s3_min_upload_part_size` — минимальный размер объекта для загрузки при многокомпонентной загрузке в [S3 Multipart upload](https://docs.aws.amazon.com/AmazonS3/latest/dev/uploadobjusingmpu.html). Значение по умолчанию — `512 Mб`.
+-   `s3_max_redirects` — максимальное количество разрешенных переадресаций S3. Значение по умолчанию — `10`. 
+
+Соображение безопасности: если злонамеренный пользователь попробует указать произвольные URL-адреса S3, параметр `s3_max_redirects` должен быть установлен в ноль, чтобы избежать атак [SSRF] (https://en.wikipedia.org/wiki/Server-side_request_forgery). Как альтернатива, в конфигурации сервера должен быть указан `remote_host_filter`.
+
+## Настройки точки приема запроса {#endpoint-settings}
+
+Для точки приема запроса (которая соответствует точному префиксу URL-адреса) в конфигурационном файле могут быть заданы следующие настройки:
+
+Обязательная настройка:
+-   `endpoint` — указывает префикс точки приема запроса. 
+
+Необязательные настройки:
+-   `access_key_id` и `secret_access_key` — указывают учетные данные для использования с данной точкой приема запроса.
+-   `use_environment_credentials` — если `true`, S3-клиент будет пытаться получить учетные данные из переменных среды и метаданных Amazon EC2 для данной точки приема запроса. Значение по умолчанию - `false`.
+-   `header` — добавляет указанный HTTP-заголовок к запросу на заданную точку приема запроса. Может быть определен несколько раз.
+-   `server_side_encryption_customer_key_base64` — устанавливает необходимые заголовки для доступа к объектам S3 с шифрованием SSE-C. 
+
+**Пример**
+
+``` xml
+<s3>
+    <endpoint-name>
+        <endpoint>https://storage.yandexcloud.net/my-test-bucket-768/</endpoint>
+        <!-- <access_key_id>ACCESS_KEY_ID</access_key_id> -->
+        <!-- <secret_access_key>SECRET_ACCESS_KEY</secret_access_key> -->
+        <!-- <use_environment_credentials>false</use_environment_credentials> -->
+        <!-- <header>Authorization: Bearer SOME-TOKEN</header> -->
+        <!-- <server_side_encryption_customer_key_base64>BASE64-ENCODED-KEY</server_side_encryption_customer_key_base64> -->
+    </endpoint-name>
+</s3>
+```
+
+## Примеры использования {#usage-examples}
+
+Предположим, у нас есть несколько файлов в формате TSV со следующими URL-адресами в HDFS:
+
+-   'https://storage.yandexcloud.net/my-test-bucket-768/some_prefix/some_file_1.csv'
+-   'https://storage.yandexcloud.net/my-test-bucket-768/some_prefix/some_file_2.csv'
+-   'https://storage.yandexcloud.net/my-test-bucket-768/some_prefix/some_file_3.csv'
+-   'https://storage.yandexcloud.net/my-test-bucket-768/another_prefix/some_file_1.csv'
+-   'https://storage.yandexcloud.net/my-test-bucket-768/another_prefix/some_file_2.csv'
+-   'https://storage.yandexcloud.net/my-test-bucket-768/another_prefix/some_file_3.csv'
+
+1. Существует несколько способов создать таблицу, включающую в себя все шесть файлов:
+
+``` sql
+CREATE TABLE table_with_range (name String, value UInt32) 
+ENGINE = S3('https://storage.yandexcloud.net/my-test-bucket-768/{some,another}_prefix/some_file_{1..3}', 'CSV');
+```
+
+2. Другой способ:
+
+``` sql
+CREATE TABLE table_with_question_mark (name String, value UInt32) 
+ENGINE = S3('https://storage.yandexcloud.net/my-test-bucket-768/{some,another}_prefix/some_file_?', 'CSV');
+```
+
+3. Таблица содержит все файлы в обоих каталогах (все файлы должны соответствовать формату и схеме, описанным в запросе):
+
+``` sql
+CREATE TABLE table_with_asterisk (name String, value UInt32) 
+ENGINE = S3('https://storage.yandexcloud.net/my-test-bucket-768/{some,another}_prefix/*', 'CSV');
+```
+
+Если список файлов содержит диапазоны чисел с ведущими нулями, используйте конструкцию с фигурными скобками для каждой цифры отдельно или используйте `?`.
+
+4. Создание таблицы из файлов с именами `file-000.csv`, `file-001.csv`, … , `file-999.csv`:
+
+``` sql
+CREATE TABLE big_table (name String, value UInt32) 
+ENGINE = S3('https://storage.yandexcloud.net/my-test-bucket-768/big_prefix/file-{000..999}.csv', 'CSV');
+```
+**Смотрите также**
+
+-  [Табличная функция S3](../../../sql-reference/table-functions/s3.md)
diff --git a/docs/ru/engines/table-engines/log-family/index.md b/docs/ru/engines/table-engines/log-family/index.md
index 7c6d2f81d7c..7737eac2f43 100644
--- a/docs/ru/engines/table-engines/log-family/index.md
+++ b/docs/ru/engines/table-engines/log-family/index.md
@@ -1,6 +1,6 @@
 ---
-toc_folder_title: "\u0421\u0435\u043c\u0435\u0439\u0441\u0442\u0432\u043e\u0020\u004c\u006f\u0067"
-toc_title: "\u0412\u0432\u0435\u0434\u0435\u043d\u0438\u0435"
+toc_folder_title: "Семейство Log"
+toc_title: "Введение"
 toc_priority: 29
 ---
 
@@ -42,4 +42,3 @@ toc_priority: 29
 
 Движки `Log` и `StripeLog` поддерживают параллельное чтение. При чтении данных, ClickHouse использует множество потоков. Каждый поток обрабатывает отдельный блок данных. Движок `Log` сохраняет каждый столбец таблицы в отдельном файле. Движок `StripeLog` хранит все данные в одном файле. Таким образом, движок `StripeLog` использует меньше дескрипторов в операционной системе, а движок `Log` обеспечивает более эффективное считывание данных.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/table_engines/log_family/) <!--hide-->
diff --git a/docs/ru/engines/table-engines/log-family/log.md b/docs/ru/engines/table-engines/log-family/log.md
index fad331454c7..6c5bf2221f8 100644
--- a/docs/ru/engines/table-engines/log-family/log.md
+++ b/docs/ru/engines/table-engines/log-family/log.md
@@ -11,4 +11,3 @@ toc_title: Log
 При конкурентном доступе к данным, чтения могут выполняться одновременно, а записи блокируют чтения и друг друга.
 Движок Log не поддерживает индексы. Также, если при записи в таблицу произошёл сбой, то таблица станет битой, и чтения из неё будут возвращать ошибку. Движок Log подходит для временных данных, write-once таблиц, а также для тестовых и демонстрационных целей.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/table_engines/log/) <!--hide-->
diff --git a/docs/ru/engines/table-engines/log-family/stripelog.md b/docs/ru/engines/table-engines/log-family/stripelog.md
index e505aae4c52..2f4b228f894 100644
--- a/docs/ru/engines/table-engines/log-family/stripelog.md
+++ b/docs/ru/engines/table-engines/log-family/stripelog.md
@@ -90,4 +90,3 @@ SELECT * FROM stripe_log_table ORDER BY timestamp
 └─────────────────────┴──────────────┴────────────────────────────┘
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/table_engines/stripelog/) <!--hide-->
diff --git a/docs/ru/engines/table-engines/log-family/tinylog.md b/docs/ru/engines/table-engines/log-family/tinylog.md
index d5c24d41ca4..721355d8702 100644
--- a/docs/ru/engines/table-engines/log-family/tinylog.md
+++ b/docs/ru/engines/table-engines/log-family/tinylog.md
@@ -11,4 +11,3 @@ toc_title: TinyLog
 
 Запросы выполняются в один поток. То есть, этот движок предназначен для сравнительно маленьких таблиц (до 1 000 000 строк). Этот движок таблиц имеет смысл использовать в том случае, когда у вас есть много маленьких таблиц, так как он проще, чем движок [Log](log.md) (требуется открывать меньше файлов).
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/table_engines/tinylog/) <!--hide-->
diff --git a/docs/ru/engines/table-engines/mergetree-family/aggregatingmergetree.md b/docs/ru/engines/table-engines/mergetree-family/aggregatingmergetree.md
index 99b4ec06765..6e01cc2bcac 100644
--- a/docs/ru/engines/table-engines/mergetree-family/aggregatingmergetree.md
+++ b/docs/ru/engines/table-engines/mergetree-family/aggregatingmergetree.md
@@ -97,4 +97,3 @@ GROUP BY StartDate
 ORDER BY StartDate;
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/table_engines/aggregatingmergetree/) <!--hide-->
diff --git a/docs/ru/engines/table-engines/mergetree-family/collapsingmergetree.md b/docs/ru/engines/table-engines/mergetree-family/collapsingmergetree.md
index 8ea3a5a7c92..424fcbb5873 100644
--- a/docs/ru/engines/table-engines/mergetree-family/collapsingmergetree.md
+++ b/docs/ru/engines/table-engines/mergetree-family/collapsingmergetree.md
@@ -304,4 +304,3 @@ select * FROM UAct
 └─────────────────────┴───────────┴──────────┴──────┘
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/table_engines/collapsingmergetree/) <!--hide-->
diff --git a/docs/ru/engines/table-engines/mergetree-family/custom-partitioning-key.md b/docs/ru/engines/table-engines/mergetree-family/custom-partitioning-key.md
index 2d26528d964..9a09618e508 100644
--- a/docs/ru/engines/table-engines/mergetree-family/custom-partitioning-key.md
+++ b/docs/ru/engines/table-engines/mergetree-family/custom-partitioning-key.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 32
-toc_title: "\u041f\u0440\u043e\u0438\u0437\u0432\u043e\u043b\u044c\u043d\u044b\u0439\u0020\u043a\u043b\u044e\u0447\u0020\u043f\u0430\u0440\u0442\u0438\u0446\u0438\u043e\u043d\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f"
+toc_title: "Произвольный ключ партиционирования"
 ---
 
 
@@ -129,4 +129,3 @@ drwxr-xr-x 2 clickhouse clickhouse 4096 Feb  1 16:48 detached
 
 ClickHouse позволяет производить различные манипуляции с кусками: удалять, копировать из одной таблицы в другую или создавать их резервные копии. Подробнее см. в разделе [Манипуляции с партициями и кусками](../../../engines/table-engines/mergetree-family/custom-partitioning-key.md#alter_manipulations-with-partitions).
 
-[Оригинальная статья:](https://clickhouse.tech/docs/ru/operations/table_engines/custom_partitioning_key/) <!--hide-->
diff --git a/docs/ru/engines/table-engines/mergetree-family/graphitemergetree.md b/docs/ru/engines/table-engines/mergetree-family/graphitemergetree.md
index e47c9127711..f3e915a413b 100644
--- a/docs/ru/engines/table-engines/mergetree-family/graphitemergetree.md
+++ b/docs/ru/engines/table-engines/mergetree-family/graphitemergetree.md
@@ -171,4 +171,3 @@ default
 </graphite_rollup>
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/table_engines/graphitemergetree/) <!--hide-->
diff --git a/docs/ru/engines/table-engines/mergetree-family/index.md b/docs/ru/engines/table-engines/mergetree-family/index.md
index abdfdd77d7f..e184e51c406 100644
--- a/docs/ru/engines/table-engines/mergetree-family/index.md
+++ b/docs/ru/engines/table-engines/mergetree-family/index.md
@@ -1,5 +1,5 @@
 ---
 toc_folder_title: MergeTree Family
 toc_priority: 28
-toc_title: "\u0412\u0432\u0435\u0434\u0435\u043d\u0438\u0435"
+toc_title: "Введение"
 ---
diff --git a/docs/ru/engines/table-engines/mergetree-family/mergetree.md b/docs/ru/engines/table-engines/mergetree-family/mergetree.md
index 6fc566b7c31..b8bd259167a 100644
--- a/docs/ru/engines/table-engines/mergetree-family/mergetree.md
+++ b/docs/ru/engines/table-engines/mergetree-family/mergetree.md
@@ -56,13 +56,13 @@ ORDER BY expr
 
     ClickHouse использует ключ сортировки в качестве первичного ключа, если первичный ключ не задан в секции `PRIMARY KEY`.
 
-    Чтобы отключить сортировку, используйте синтаксис `ORDER BY tuple()`. Смотрите [выбор первичного ключа](#vybor-pervichnogo-kliucha).    
+    Чтобы отключить сортировку, используйте синтаксис `ORDER BY tuple()`. Смотрите [выбор первичного ключа](#primary-keys-and-indexes-in-queries).    
 
 -   `PARTITION BY` — [ключ партиционирования](custom-partitioning-key.md). Необязательный параметр.
 
     Для партиционирования по месяцам используйте выражение `toYYYYMM(date_column)`, где `date_column` — столбец с датой типа [Date](../../../engines/table-engines/mergetree-family/mergetree.md). В этом случае имена партиций имеют формат `"YYYYMM"`.
 
--   `PRIMARY KEY` — первичный ключ, если он [отличается от ключа сортировки](#pervichnyi-kliuch-otlichnyi-ot-kliucha-sortirovki). Необязательный параметр.
+-   `PRIMARY KEY` — первичный ключ, если он [отличается от ключа сортировки](#choosing-a-primary-key-that-differs-from-the-sorting-key). Необязательный параметр.
     
     По умолчанию первичный ключ совпадает с ключом сортировки (который задаётся секцией `ORDER BY`.) Поэтому в большинстве случаев секцию `PRIMARY KEY` отдельно указывать не нужно.
 
@@ -188,7 +188,7 @@ ClickHouse не требует уникального первичного кл
 
 При сортировке с использованием выражения `ORDER BY` для значений `NULL` всегда работает принцип [NULLS_LAST](../../../sql-reference/statements/select/order-by.md#sorting-of-special-values).
 
-### Выбор первичного ключа {#vybor-pervichnogo-kliucha}
+### Выбор первичного ключа {#selecting-the-primary-key}
 
 Количество столбцов в первичном ключе не ограничено явным образом. В зависимости от структуры данных в первичный ключ можно включать больше или меньше столбцов. Это может:
 
@@ -217,7 +217,7 @@ ClickHouse не требует уникального первичного кл
 
 
 
-### Первичный ключ, отличный от ключа сортировки {#pervichnyi-kliuch-otlichnyi-ot-kliucha-sortirovki}
+### Первичный ключ, отличный от ключа сортировки {#choosing-a-primary-key-that-differs-from-the-sorting-key}
 
 Существует возможность задать первичный ключ (выражение, значения которого будут записаны в индексный файл для
 каждой засечки), отличный от ключа сортировки (выражение, по которому будут упорядочены строки в кусках
@@ -236,7 +236,7 @@ ClickHouse не требует уникального первичного кл
 
 [ALTER ключа сортировки](../../../engines/table-engines/mergetree-family/mergetree.md) — лёгкая операция, так как при одновременном добавлении нового столбца в таблицу и ключ сортировки не нужно изменять данные кусков (они остаются упорядоченными и по новому выражению ключа).
 
-### Использование индексов и партиций в запросах {#ispolzovanie-indeksov-i-partitsii-v-zaprosakh}
+### Использование индексов и партиций в запросах {#use-of-indexes-and-partitions-in-queries}
 
 Для запросов `SELECT` ClickHouse анализирует возможность использования индекса. Индекс может использоваться, если в секции `WHERE/PREWHERE`, в качестве одного из элементов конъюнкции, или целиком, есть выражение, представляющее операции сравнения на равенства, неравенства, а также `IN` или `LIKE` с фиксированным префиксом, над столбцами или выражениями, входящими в первичный ключ или ключ партиционирования, либо над некоторыми частично монотонными функциями от этих столбцов, а также логические связки над такими выражениями.
 
@@ -270,7 +270,7 @@ SELECT count() FROM table WHERE CounterID = 34 OR URL LIKE '%upyachka%'
 
 Ключ партиционирования по месяцам обеспечивает чтение только тех блоков данных, которые содержат даты из нужного диапазона. При этом блок данных может содержать данные за многие даты (до целого месяца). В пределах одного блока данные упорядочены по первичному ключу, который может не содержать дату в качестве первого столбца. В связи с этим, при использовании запроса с указанием условия только на дату, но не на префикс первичного ключа, будет читаться данных больше, чем за одну дату.
 
-### Использование индекса для частично-монотонных первичных ключей {#ispolzovanie-indeksa-dlia-chastichno-monotonnykh-pervichnykh-kliuchei}
+### Использование индекса для частично-монотонных первичных ключей {#use-of-index-for-partially-monotonic-primary-keys}
 
 Рассмотрим, например, дни месяца. Они образуют последовательность [монотонную](https://ru.wikipedia.org/wiki/Монотонная_последовательность) в течение одного месяца, но не монотонную на более длительных периодах. Это частично-монотонная последовательность. Если пользователь создаёт таблицу с частично-монотонным первичным ключом, ClickHouse как обычно создаёт разреженный индекс. Когда пользователь выбирает данные из такого рода таблиц, ClickHouse анализирует условия запроса. Если пользователь хочет получить данные между двумя метками индекса, и обе эти метки находятся внутри одного месяца, ClickHouse может использовать индекс в данном конкретном случае, поскольку он может рассчитать расстояние между параметрами запроса и индексными метками.
 
@@ -312,7 +312,7 @@ SELECT count() FROM table WHERE s < 'z'
 SELECT count() FROM table WHERE u64 * i32 == 10 AND u64 * length(s) >= 1234
 ```
 
-#### Доступные индексы {#dostupnye-indeksy}
+#### Доступные индексы {#available-types-of-indices}
 
 -   `minmax` — Хранит минимум и максимум выражения (если выражение - `tuple`, то для каждого элемента `tuple`), используя их для пропуска блоков аналогично первичному ключу.
 
@@ -375,7 +375,7 @@ INDEX b (u64 * length(str), i32 + f64 * 100, date, str) TYPE set(100) GRANULARIT
     -   `s != 1`
     -   `NOT startsWith(s, 'test')`
 
-## Конкурентный доступ к данным {#konkurentnyi-dostup-k-dannym}
+## Конкурентный доступ к данным {#concurrent-data-access}
 
 Для конкурентного доступа к таблице используется мультиверсионность. То есть, при одновременном чтении и обновлении таблицы, данные будут читаться из набора кусочков, актуального на момент запроса. Длинных блокировок нет. Вставки никак не мешают чтениям.
 
@@ -517,7 +517,7 @@ CREATE TABLE table_for_aggregation
     y Int
 )
 ENGINE = MergeTree
-ORDER BY k1, k2
+ORDER BY (k1, k2)
 TTL d + INTERVAL 1 MONTH GROUP BY k1, k2 SET x = max(x), y = min(y);
 ```
 
@@ -531,13 +531,13 @@ TTL d + INTERVAL 1 MONTH GROUP BY k1, k2 SET x = max(x), y = min(y);
 
 ## Хранение данных таблицы на нескольких блочных устройствах {#table_engine-mergetree-multiple-volumes}
 
-### Введение {#vvedenie}
+### Введение {#introduction}
 
 Движки таблиц семейства `MergeTree` могут хранить данные на нескольких блочных устройствах. Это может оказаться полезным, например, при неявном разделении данных одной таблицы на «горячие» и «холодные». Наиболее свежая часть занимает малый объём и запрашивается регулярно, а большой хвост исторических данных запрашивается редко. При наличии в системе нескольких дисков, «горячая» часть данных может быть размещена на быстрых дисках (например, на NVMe SSD или в памяти), а холодная на более медленных (например, HDD).
 
 Минимальной перемещаемой единицей для `MergeTree` является кусок данных (data part). Данные одного куска могут находится только на одном диске. Куски могут перемещаться между дисками в фоне, согласно пользовательским настройкам, а также с помощью запросов [ALTER](../../../engines/table-engines/mergetree-family/mergetree.md#alter_move-partition).
 
-### Термины {#terminy}
+### Термины {#terms}
 
 -   Диск — примонтированное в файловой системе блочное устройство.
 -   Диск по умолчанию — диск, на котором находится путь, указанный в конфигурационной настройке сервера [path](../../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-path).
@@ -689,7 +689,7 @@ SETTINGS storage_policy = 'moving_from_ssd_to_hdd'
 
 Количество потоков для фоновых перемещений кусков между дисками можно изменить с помощью настройки [background_move_pool_size](../../../operations/settings/settings.md#background_move_pool_size)
 
-### Особенности работы {#osobennosti-raboty}
+### Особенности работы {#details}
 
 В таблицах `MergeTree` данные попадают на диск несколькими способами:
 
@@ -712,4 +712,97 @@ SETTINGS storage_policy = 'moving_from_ssd_to_hdd'
 
 После выполнения фоновых слияний или мутаций старые куски не удаляются сразу, а через некоторое время (табличная настройка `old_parts_lifetime`). Также они не перемещаются на другие тома или диски, поэтому до момента удаления они продолжают учитываться при подсчёте занятого дискового пространства.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/engines/table-engines/mergetree-family/mergetree/) <!--hide-->
+## Использование сервиса S3 для хранения данных {#table_engine-mergetree-s3}
+
+Таблицы семейства `MergeTree` могут хранить данные в сервисе [S3](https://aws.amazon.com/s3/) при использовании диска типа `s3`.
+
+Конфигурация:
+
+``` xml
+<storage_configuration>
+    ...
+    <disks>
+        <s3>
+            <type>s3</type>
+            <endpoint>https://storage.yandexcloud.net/my-bucket/root-path/</endpoint>
+            <access_key_id>your_access_key_id</access_key_id>
+            <secret_access_key>your_secret_access_key</secret_access_key>
+            <proxy>
+                <uri>http://proxy1</uri>
+                <uri>http://proxy2</uri>
+            </proxy>
+            <connect_timeout_ms>10000</connect_timeout_ms>
+            <request_timeout_ms>5000</request_timeout_ms>
+            <retry_attempts>10</retry_attempts>
+            <min_bytes_for_seek>1000</min_bytes_for_seek>
+            <metadata_path>/var/lib/clickhouse/disks/s3/</metadata_path>
+            <cache_enabled>true</cache_enabled>
+            <cache_path>/var/lib/clickhouse/disks/s3/cache/</cache_path>
+            <skip_access_check>false</skip_access_check>
+        </s3>
+    </disks>
+    ...
+</storage_configuration>
+```
+
+Обязательные параметры:
+
+-   `endpoint` — URL точки приема запроса на стороне S3 в [форматах](https://docs.aws.amazon.com/AmazonS3/latest/userguide/VirtualHosting.html) `path` или `virtual hosted`. URL точки должен содержать бакет и путь к корневой директории на сервере, где хранятся данные.
+-   `access_key_id` — id ключа доступа к S3. 
+-   `secret_access_key` — секретный ключ доступа к S3.
+
+Необязательные параметры:   
+
+-   `use_environment_credentials` — признак, нужно ли считывать учетные данные AWS из сетевого окружения, а также из переменных окружения `AWS_ACCESS_KEY_ID`, `AWS_SECRET_ACCESS_KEY` и `AWS_SESSION_TOKEN`, если они есть. Значение по умолчанию: `false`.
+-   `use_insecure_imds_request` — признак, нужно ли использовать менее безопасное соединение при выполнении запроса к IMDS при получении учётных данных из метаданных Amazon EC2. Значение по умолчанию: `false`.
+-   `proxy` — конфигурация прокси-сервера для конечной точки S3. Каждый элемент `uri` внутри блока `proxy` должен содержать URL прокси-сервера. 
+-   `connect_timeout_ms` — таймаут подключения к сокету в миллисекундах. Значение по умолчанию: 10 секунд. 
+-   `request_timeout_ms` — таймаут выполнения запроса в миллисекундах. Значение по умолчанию: 5 секунд. 
+-   `retry_attempts` — число попыток выполнения запроса в случае возникновения ошибки. Значение по умолчанию: `10`. 
+-   `min_bytes_for_seek` — минимальное количество байтов, которые используются для операций поиска вместо последовательного чтения. Значение по умолчанию: 1 МБайт. 
+-   `metadata_path` — путь к локальному файловому хранилищу для хранения файлов с метаданными для S3. Значение по умолчанию: `/var/lib/clickhouse/disks/<disk_name>/`. 
+-   `cache_enabled` — признак, разрешено ли хранение кэша засечек и файлов индекса в локальной файловой системе. Значение по умолчанию: `true`. 
+-   `cache_path` — путь в локальной файловой системе, где будут храниться кэш засечек и файлы индекса. Значение по умолчанию: `/var/lib/clickhouse/disks/<disk_name>/cache/`. 
+-   `skip_access_check` — признак, выполнять ли проверку доступов при запуске диска. Если установлено значение `true`, то проверка не выполняется. Значение по умолчанию: `false`.
+
+
+Диск S3 может быть сконфигурирован как `main` или `cold`:
+
+``` xml
+<storage_configuration>
+    ...
+    <disks>
+        <s3>
+            <type>s3</type>
+            <endpoint>https://storage.yandexcloud.net/my-bucket/root-path/</endpoint>
+            <access_key_id>your_access_key_id</access_key_id>
+            <secret_access_key>your_secret_access_key</secret_access_key>
+        </s3>
+    </disks>
+    <policies>
+        <s3_main>
+            <volumes>
+                <main>
+                    <disk>s3</disk>
+                </main>
+            </volumes>
+        </s3_main>
+        <s3_cold>
+            <volumes>
+                <main>
+                    <disk>default</disk>
+                </main>
+                <external>
+                    <disk>s3</disk>
+                </external>
+            </volumes>
+            <move_factor>0.2</move_factor>
+        </s3_cold>
+    </policies>
+    ...
+</storage_configuration>
+```
+
+Если диск сконфигурирован как `cold`, данные будут переноситься в S3 при срабатывании правил TTL или когда свободное место на локальном диске станет меньше порогового значения, которое определяется как `move_factor * disk_size`. 
+
+
diff --git a/docs/ru/engines/table-engines/mergetree-family/replacingmergetree.md b/docs/ru/engines/table-engines/mergetree-family/replacingmergetree.md
index a4e47b161ad..ec0b339e8c9 100644
--- a/docs/ru/engines/table-engines/mergetree-family/replacingmergetree.md
+++ b/docs/ru/engines/table-engines/mergetree-family/replacingmergetree.md
@@ -66,4 +66,3 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
 
 </details>
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/table_engines/replacingmergetree/) <!--hide-->
diff --git a/docs/ru/engines/table-engines/mergetree-family/replication.md b/docs/ru/engines/table-engines/mergetree-family/replication.md
index a8a308b104f..848adbee4da 100644
--- a/docs/ru/engines/table-engines/mergetree-family/replication.md
+++ b/docs/ru/engines/table-engines/mergetree-family/replication.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 31
-toc_title: "\u0420\u0435\u043f\u043b\u0438\u043a\u0430\u0446\u0438\u044f\u0020\u0434\u0430\u043d\u043d\u044b\u0445"
+toc_title: "Репликация данных"
 ---
 
 # Репликация данных {#table_engines-replication}
@@ -251,4 +251,3 @@ $ sudo -u clickhouse touch /var/lib/clickhouse/flags/force_restore_data
 -   [background_schedule_pool_size](../../../operations/settings/settings.md#background_schedule_pool_size)
 -   [execute_merges_on_single_replica_time_threshold](../../../operations/settings/settings.md#execute-merges-on-single-replica-time-threshold)
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/table_engines/replication/) <!--hide-->
diff --git a/docs/ru/engines/table-engines/mergetree-family/summingmergetree.md b/docs/ru/engines/table-engines/mergetree-family/summingmergetree.md
index 7b9c11adc2e..adb40037319 100644
--- a/docs/ru/engines/table-engines/mergetree-family/summingmergetree.md
+++ b/docs/ru/engines/table-engines/mergetree-family/summingmergetree.md
@@ -136,4 +136,3 @@ ClickHouse может слить куски данных таким образо
 
 Для вложенной структуры данных не нужно указывать её столбцы в кортеже столбцов для суммирования.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/table_engines/summingmergetree/) <!--hide-->
diff --git a/docs/ru/engines/table-engines/mergetree-family/versionedcollapsingmergetree.md b/docs/ru/engines/table-engines/mergetree-family/versionedcollapsingmergetree.md
index 2adb8cc0d77..61688b1f00f 100644
--- a/docs/ru/engines/table-engines/mergetree-family/versionedcollapsingmergetree.md
+++ b/docs/ru/engines/table-engines/mergetree-family/versionedcollapsingmergetree.md
@@ -233,4 +233,3 @@ SELECT * FROM UAct FINAL
 
 Это очень неэффективный способ выбора данных. Не используйте его для больших таблиц.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/table_engines/versionedcollapsingmergetree/) <!--hide-->
diff --git a/docs/ru/engines/table-engines/special/buffer.md b/docs/ru/engines/table-engines/special/buffer.md
index 75ce12f50fa..ba865b72b78 100644
--- a/docs/ru/engines/table-engines/special/buffer.md
+++ b/docs/ru/engines/table-engines/special/buffer.md
@@ -66,4 +66,3 @@ CREATE TABLE merge.hits_buffer AS merge.hits ENGINE = Buffer(merge, hits, 16, 10
 
 Заметим, что даже для таблиц типа Buffer не имеет смысла вставлять данные по одной строке, так как таким образом будет достигнута скорость всего лишь в несколько тысяч строк в секунду, тогда как при вставке более крупными блоками, достижимо более миллиона строк в секунду (смотрите раздел [«Производительность»](../../../introduction/performance/).
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/table_engines/buffer/) <!--hide-->
diff --git a/docs/ru/engines/table-engines/special/dictionary.md b/docs/ru/engines/table-engines/special/dictionary.md
index 048da157b2d..243fd5395c0 100644
--- a/docs/ru/engines/table-engines/special/dictionary.md
+++ b/docs/ru/engines/table-engines/special/dictionary.md
@@ -90,4 +90,3 @@ select * from products limit 1;
 └───────────────┴─────────────────┘
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/table_engines/dictionary/) <!--hide-->
diff --git a/docs/ru/engines/table-engines/special/distributed.md b/docs/ru/engines/table-engines/special/distributed.md
index 7ab0b916337..86eef35ebbc 100644
--- a/docs/ru/engines/table-engines/special/distributed.md
+++ b/docs/ru/engines/table-engines/special/distributed.md
@@ -136,4 +136,3 @@ logs - имя кластера в конфигурационном файле с
 
 При выставлении опции max_parallel_replicas выполнение запроса распараллеливается по всем репликам внутри одного шарда. Подробнее смотрите раздел [max_parallel_replicas](../../../operations/settings/settings.md#settings-max_parallel_replicas).
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/table_engines/distributed/) <!--hide-->
diff --git a/docs/ru/engines/table-engines/special/external-data.md b/docs/ru/engines/table-engines/special/external-data.md
index 7e383c0c12d..29075837aba 100644
--- a/docs/ru/engines/table-engines/special/external-data.md
+++ b/docs/ru/engines/table-engines/special/external-data.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 45
-toc_title: "\u0412\u043d\u0435\u0448\u043d\u0438\u0435\u0020\u0434\u0430\u043d\u043d\u044b\u0435\u0020\u0434\u043b\u044f\u0020\u043e\u0431\u0440\u0430\u0431\u043e\u0442\u043a\u0438\u0020\u0437\u0430\u043f\u0440\u043e\u0441\u0430"
+toc_title: "Внешние данные для обработки запроса"
 ---
 
 # Внешние данные для обработки запроса {#vneshnie-dannye-dlia-obrabotki-zaprosa}
@@ -65,4 +65,3 @@ $ curl -F 'passwd=@passwd.tsv;' 'http://localhost:8123/?query=SELECT+shell,+coun
 
 При распределённой обработке запроса, временные таблицы передаются на все удалённые серверы.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/table_engines/external_data/) <!--hide-->
diff --git a/docs/ru/engines/table-engines/special/file.md b/docs/ru/engines/table-engines/special/file.md
index 6a55ef31732..6f1c723d2a7 100644
--- a/docs/ru/engines/table-engines/special/file.md
+++ b/docs/ru/engines/table-engines/special/file.md
@@ -63,7 +63,7 @@ SELECT * FROM file_engine_table
 
 ## Использование движка в Clickhouse-local {#ispolzovanie-dvizhka-v-clickhouse-local}
 
-В [clickhouse-local](../../../engines/table-engines/special/file.md) движок в качестве параметра принимает не только формат, но и путь к файлу. В том числе можно указать стандартные потоки ввода/вывода цифровым или буквенным обозначением `0` или `stdin`, `1` или `stdout`.
+В [clickhouse-local](../../../engines/table-engines/special/file.md) движок в качестве параметра принимает не только формат, но и путь к файлу. В том числе можно указать стандартные потоки ввода/вывода цифровым или буквенным обозначением `0` или `stdin`, `1` или `stdout`. Можно записывать и читать сжатые файлы. Для этого нужно задать дополнительный параметр движка или расширение файла (`gz`, `br` или `xz`).
 
 **Пример:**
 
@@ -81,4 +81,3 @@ $ echo -e "1,2\n3,4" | clickhouse-local -q "CREATE TABLE table (a Int64, b Int64
     -   индексы;
     -   репликация.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/table_engines/file/) <!--hide-->
diff --git a/docs/ru/engines/table-engines/special/index.md b/docs/ru/engines/table-engines/special/index.md
index 0d86461dd2d..231bf2979ed 100644
--- a/docs/ru/engines/table-engines/special/index.md
+++ b/docs/ru/engines/table-engines/special/index.md
@@ -1,5 +1,5 @@
 ---
-toc_folder_title: "\u0421\u043f\u0435\u0446\u0438\u0430\u043b\u044c\u043d\u044b\u0435\u0020\u0434\u0432\u0438\u0436\u043a\u0438\u0020\u0442\u0430\u0431\u043b\u0438\u0446"
+toc_folder_title: "Специальные движки таблиц"
 toc_priority: 31
 ---
 
@@ -13,4 +13,3 @@ toc_priority: 31
 
 Остальные движки таблиц уникальны по своему назначению и еще не сгруппированы в семейства, поэтому они помещены в эту специальную категорию.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/engines/table-engines/special/) <!--hide-->
diff --git a/docs/ru/engines/table-engines/special/join.md b/docs/ru/engines/table-engines/special/join.md
index 8cb7acd91e1..ef27ac3f10f 100644
--- a/docs/ru/engines/table-engines/special/join.md
+++ b/docs/ru/engines/table-engines/special/join.md
@@ -107,4 +107,3 @@ SELECT joinGet('id_val_join', 'val', toUInt32(1))
 
 При аварийном перезапуске сервера блок данных на диске может быть потерян или повреждён. В последнем случае, может потребоваться вручную удалить файл с повреждёнными данными.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/table_engines/join/) <!--hide-->
diff --git a/docs/ru/engines/table-engines/special/materializedview.md b/docs/ru/engines/table-engines/special/materializedview.md
index 1281d1db9ab..6b82f95df92 100644
--- a/docs/ru/engines/table-engines/special/materializedview.md
+++ b/docs/ru/engines/table-engines/special/materializedview.md
@@ -7,4 +7,3 @@ toc_title: MaterializedView
 
 Используется для реализации материализованных представлений (подробнее см. запрос [CREATE TABLE](../../../sql-reference/statements/create/table.md#create-table-query)). Для хранения данных, использует другой движок, который был указан при создании представления. При чтении из таблицы, просто использует этот движок.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/table_engines/materializedview/) <!--hide-->
diff --git a/docs/ru/engines/table-engines/special/memory.md b/docs/ru/engines/table-engines/special/memory.md
index 9ca189ef3b2..5a242238a02 100644
--- a/docs/ru/engines/table-engines/special/memory.md
+++ b/docs/ru/engines/table-engines/special/memory.md
@@ -14,4 +14,3 @@ toc_title: Memory
 
 Движок Memory используется системой для временных таблиц - внешних данных запроса (смотрите раздел «Внешние данные для обработки запроса»), для реализации `GLOBAL IN` (смотрите раздел «Операторы IN»).
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/table_engines/memory/) <!--hide-->
diff --git a/docs/ru/engines/table-engines/special/merge.md b/docs/ru/engines/table-engines/special/merge.md
index 656aa7cfd6b..714b087c201 100644
--- a/docs/ru/engines/table-engines/special/merge.md
+++ b/docs/ru/engines/table-engines/special/merge.md
@@ -65,4 +65,3 @@ FROM WatchLog
 
 -   [Виртуальные столбцы](index.md#table_engines-virtual_columns)
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/table_engines/merge/) <!--hide-->
diff --git a/docs/ru/engines/table-engines/special/null.md b/docs/ru/engines/table-engines/special/null.md
index 2c3af1ce11e..05f5c88bacb 100644
--- a/docs/ru/engines/table-engines/special/null.md
+++ b/docs/ru/engines/table-engines/special/null.md
@@ -7,4 +7,3 @@ toc_title: 'Null'
 
 Тем не менее, есть возможность создать материализованное представление над таблицей типа Null. Тогда данные, записываемые в таблицу, будут попадать в представление.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/table_engines/null/) <!--hide-->
diff --git a/docs/ru/engines/table-engines/special/set.md b/docs/ru/engines/table-engines/special/set.md
index 14b7f123a34..ced9abf55dc 100644
--- a/docs/ru/engines/table-engines/special/set.md
+++ b/docs/ru/engines/table-engines/special/set.md
@@ -20,4 +20,3 @@ toc_title: Set
 
 -   [persistent](../../../operations/settings/settings.md#persistent)
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/table_engines/set/) <!--hide-->
diff --git a/docs/ru/engines/table-engines/special/url.md b/docs/ru/engines/table-engines/special/url.md
index cdb5afddf75..b8fcd27204f 100644
--- a/docs/ru/engines/table-engines/special/url.md
+++ b/docs/ru/engines/table-engines/special/url.md
@@ -77,4 +77,3 @@ SELECT * FROM url_engine_table
     -   индексы;
     -   репликация.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/table_engines/url/) <!--hide-->
diff --git a/docs/ru/engines/table-engines/special/view.md b/docs/ru/engines/table-engines/special/view.md
index 18813a55da2..45aeb55cd85 100644
--- a/docs/ru/engines/table-engines/special/view.md
+++ b/docs/ru/engines/table-engines/special/view.md
@@ -7,4 +7,3 @@ toc_title: View
 
 Используется для реализации представлений (подробнее см. запрос `CREATE VIEW`). Не хранит данные, а хранит только указанный запрос `SELECT`. При чтении из таблицы, выполняет его (с удалением из запроса всех ненужных столбцов).
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/table_engines/view/) <!--hide-->
diff --git a/docs/ru/faq/general/columnar-database.md b/docs/ru/faq/general/columnar-database.md
new file mode 100644
index 00000000000..f38e46cfe93
--- /dev/null
+++ b/docs/ru/faq/general/columnar-database.md
@@ -0,0 +1,25 @@
+---
+title: Что такое столбцовая база данных?
+toc_hidden: true
+toc_priority: 101
+---
+
+# Что такое столбцовая (колоночная) база данных? {#what-is-a-columnar-database}
+
+В столбцовой БД данные каждого столбца хранятся отдельно (независимо) от других столбцов. Такой принцип хранения позволяет при выполнении запроса считывать с диска данные только тех столбцов, которые непосредственно участвуют в этом запросе. Обратная сторона такого принципа хранения заключается в том, что выполнение операций над строками становится более затратным. ClickHouse — типичный пример столбцовой СУБД.
+
+Ключевые преимущества столбцовой СУБД: 
+
+- выполнение запросов над отдельными столбцами таблицы, а не над всей таблицей сразу;
+- агрегация запросов на больших объемах данных;
+- сжатие данных в столбцах.
+
+Ниже — иллюстрация того, как извлекаются данные для отчетов при использовании обычной строковой СУБД и столбцовой СУБД:
+
+**Стандартная строковая СУБД**
+![Стандартная строковая СУБД](https://clickhouse.tech/docs/en/images/row-oriented.gif#)
+
+**Столбцовая СУБД**
+![Столбцовая СУБД](https://clickhouse.tech/docs/en/images/column-oriented.gif#)
+
+Для аналитических приложений столбцовые СУБД предпочтительнее, так как в них можно хранить много столбцов в таблице просто на всякий случай, и это не будет сказываться на скорости чтения данных. Столбцовые СУБД предназначены для обработки и хранения больших данных. Они прекрасно масштабируются при помощи распределенных кластеров на относительно недорогих серверах — для увеличения производительности. В ClickHouse для этого используются [распределенные](../../engines/table-engines/special/distributed.md) и [реплицированные](../../engines/table-engines/mergetree-family/replication.md) таблицы.
diff --git a/docs/ru/faq/general/dbms-naming.md b/docs/ru/faq/general/dbms-naming.md
new file mode 100644
index 00000000000..2611daeffcc
--- /dev/null
+++ b/docs/ru/faq/general/dbms-naming.md
@@ -0,0 +1,17 @@
+---
+title: "Что означает название ClickHouse?"
+toc_hidden: true
+toc_priority: 10
+---
+
+# Что означает название ClickHouse? {#what-does-clickhouse-mean}
+
+Это комбинация терминов **Click**stream и Data ware**House**. Название пришло из Яндекс.Метрики, для которой первоначально был разработан ClickHouse — там он использовался для хранения истории визитов пользователей на сайты и всех пользовательских действий — "кликов". Кстати, ClickHouse по-прежнему выполняет эту функцию. Узнать об этом больше можно на странице [истории ClickHouse](../../introduction/history.md).
+
+Поскольку название составное, использовать его нужно следующим образом:
+
+-   единственно правильный способ написания — Click**H**ouse — с заглавной буквой H;
+-   если нужно сокращеннное название, используйте **CH**. Исторически сложилось, что в Китае также популярно сокращение CK — в основном, из-за того, что это название использовалось в одном из первых обсуждений ClickHouse на китайском языке.
+
+!!! info "Забавный факт"
+    Спустя годы после того, как ClickHouse получил свое название, принцип комбинирования двух слов, каждое из которых имеет подходящий смысл, был признан лучшим способом назвать базу данных в [исследовании Andy Pavlo](https://www.cs.cmu.edu/~pavlo/blog/2020/03/on-naming-a-database-management-system.html), Associate Professor of Databases в Carnegie Mellon University. ClickHouse разделил награду "за лучшее название СУБД" с Postgres.
diff --git a/docs/ru/faq/general/index.md b/docs/ru/faq/general/index.md
index cf0f8451450..cf105eaf8bb 100644
--- a/docs/ru/faq/general/index.md
+++ b/docs/ru/faq/general/index.md
@@ -1,25 +1,24 @@
 ---
-title: General questions about ClickHouse
+title: Общие вопросы о ClickHouse
 toc_hidden_folder: true
 toc_priority: 1
 toc_title: Общие вопросы
 ---
 
-# Общие вопросы о ClickHouse {#obshchie-voprosy}
+# Общие вопросы о ClickHouse {#general-questions}
 
 Вопросы:
 
--   Что такое ClickHouse?
--   Почему ClickHouse такой быстрый?
--   Кто пользуется ClickHouse?
--   Что обозначает название “ClickHouse”?
--   Что значит “Не тормозит”?
--   Что такое OLAP?
--   Что такое колоночная база данных?
+-   [Что такое ClickHouse?](../../index.md#what-is-clickhouse)
+-   [Почему ClickHouse такой быстрый?](why-clickhouse-is-so-fast.md)
+-   [Кто пользуется ClickHouse?](who-is-using-clickhouse.md)
+-   [Что обозначает название ClickHouse?](dbms-naming.md)
+-   [Как фраза “Не тормозит” осталась на всех футболках?](ne-tormozit.md)
+-   [Что такое OLAP?](olap.md)
+-   [Что такое столбцовая база данных?](columnar-database.md)
 -   [Почему бы не использовать системы типа MapReduce?](mapreduce.md)
 
 !!! info "Если вы не нашли то, что искали:"
-    Загляните в другие категории F.A.Q. или поищите в других разделах документации, ориентируйтесь по оглавлению слева.
-
-{## [Original article](https://clickhouse.tech/docs/ru/faq/general/) ##}
+    Загляните в другие категории F.A.Q. или поищите в остальных разделах документации, ориентируясь по оглавлению слева.
 
+[Original article](https://clickhouse.tech/docs/ru/faq/general/) <!--hide-->
diff --git a/docs/ru/faq/general/mapreduce.md b/docs/ru/faq/general/mapreduce.md
index 645391493c3..8a524c9f680 100644
--- a/docs/ru/faq/general/mapreduce.md
+++ b/docs/ru/faq/general/mapreduce.md
@@ -4,13 +4,10 @@ toc_hidden: true
 toc_priority: 110
 ---
 
-## Почему бы не использовать системы типа MapReduce? {#pochemu-by-ne-ispolzovat-sistemy-tipa-mapreduce}
+# Почему бы не использовать системы типа MapReduce? {#why-not-use-something-like-mapreduce}
 
-Системами типа MapReduce будем называть системы распределённых вычислений, в которых операция reduce сделана на основе распределённой сортировки. Наиболее распространённым opensource решением данного класса является [Apache Hadoop](http://hadoop.apache.org). Яндекс использует собственное решение — YT. 
+Системами типа MapReduce будем называть системы распределённых вычислений, в которых операция свёртки реализована на основе распределённой сортировки. Наиболее распространённое решение с открытым кодом в данном классе — [Apache Hadoop](http://hadoop.apache.org). Яндекс пользуется собственным решением — YT. 
 
-Такие системы не подходят для онлайн запросов в силу слишком большой latency. То есть, не могут быть использованы в качестве бэкенда для веб-интерфейса.
-Такие системы не подходят для обновления данных в реальном времени.
-Распределённая сортировка не является оптимальным способом выполнения операции reduce, если результат выполнения операции и все промежуточные результаты, при их наличии, помещаются в оперативку на одном сервере, как обычно бывает в запросах, выполняющихся в режиме онлайн. В таком случае, оптимальным способом выполнения операции reduce является хэш-таблица. Частым способом оптимизации map-reduce задач является предагрегация (частичный reduce) с использованием хэш-таблицы в оперативной памяти. Эта оптимизация делается пользователем в ручном режиме.
-Распределённая сортировка является основной причиной тормозов при выполнении несложных map-reduce задач.
+Такие системы не подходят для онлайн запросов в силу слишком большой задержки. То есть не могут быть использованы в качестве бэкенда для веб-интерфейса. Также эти системы не подходят для обновления данных в реальном времени. Распределённая сортировка является не оптимальным способом для выполнения операции свёртки в случае запросов, выполняющихся в режиме онлайн, потому что результат выполнения операции и все промежуточные результаты (если такие есть) помещаются в оперативную память на одном сервере. В таком случае оптимальным способом выполнения операции свёртки является хеш-таблица. Частым способом оптимизации "map-reduce" задач является предагрегация (частичная свёртка) с использованием хеш-таблицы в оперативной памяти. Пользователь делает эту оптимизацию в ручном режиме. Распределённая сортировка — основная причина тормозов при выполнении несложных задач типа "map-reduce".
 
-Большинство реализаций MapReduce позволяют выполнять произвольный код на кластере. Но для OLAP задач лучше подходит декларативный язык запросов, который позволяет быстро проводить исследования. Для примера, для Hadoop существует Hive и Pig. Также смотрите Cloudera Impala, Shark (устаревший) для Spark, а также Spark SQL, Presto, Apache Drill. Впрочем, производительность при выполнении таких задач является сильно неоптимальной по сравнению со специализированными системами, а сравнительно высокая latency не позволяет использовать эти системы в качестве бэкенда для веб-интерфейса.
+Большинство реализаций MapReduce позволяют выполнять произвольный код на кластере. Но для OLAP-задач лучше подходит декларативный язык запросов, который позволяет быстро проводить исследования. Например, для Hadoop существуют Hive и Pig. Также посмотрите на Cloudera Impala, Shark (устаревший) для Spark, а также Spark SQL, Presto, Apache Drill. Впрочем, производительность при выполнении таких задач очень неоптимальная, если сравнивать со специализированными системами, а относительно высокая задержка не позволяет использовать эти системы в качестве бэкенда для веб-интерфейса.
diff --git a/docs/ru/faq/general/ne-tormozit.md b/docs/ru/faq/general/ne-tormozit.md
new file mode 100644
index 00000000000..1230e34c475
--- /dev/null
+++ b/docs/ru/faq/general/ne-tormozit.md
@@ -0,0 +1,25 @@
+---
+title: "What does “не тормозит” mean?"
+toc_hidden: true
+toc_priority: 11
+---
+
+# Что значит “Не тормозит”? {#what-does-ne-tormozit-mean}
+
+Обычно этот вопрос возникает, когда люди видят официальные футболки ClickHouse. На них большими буквами написано **“ClickHouse не тормозит”**.
+
+До того, как код ClickHouse стал открытым, его разрабатывали как собственную систему хранения данных в крупнейшей российской ИТ-компании [Яндекс](https://yandex.com/company/). Поэтому оригинальный слоган написан по-русски. После выхода версии с открытым исходным кодом мы впервые выпустили некоторое количество таких футболок для мероприятий в России, и просто оставили прежний слоган. 
+
+Когда мы решили отправить партию этих футболок на мероприятия вне России, мы пробовали подобрать подходящий английский слоган. К сожалению, мы так и не смогли придумать достаточно точный и выразительный перевод, ведь на русском этот слоган звучит очень ёмко и при этом довольно элегантно. К тому же, существовало ограничение по количеству символов на футболках. В итоге мы решили оставить русский вариант даже для международных событий. И это стало прекрасным решением, потому что люди по всему миру приятно удивлялись, когда видели фразу и интересовались, что же там написано.
+
+Итак, как же объяснить эту фразу на английском? Вот несколько вариантов: 
+
+-   Если переводить буквально, то получится что-то подобное: *“ClickHouse doesn’t press the brake pedal”*.
+-   Если же вы хотите максимально сохранить том смысл, который вкладывает в эту фразу человек из ИТ-сферы, то будет примерно следующее: *“If your larger system lags, it’s not because it uses ClickHouse”*. 
+-   Более короткие, но не такие точные версии: *“ClickHouse is not slow”*, *“ClickHouse doesn’t lag”* или просто *“ClickHouse is fast”*.
+
+Если вы не видели наших футболок, посмотрите видео о ClickHouse. Например, вот это:
+
+![iframe](https://www.youtube.com/embed/bSyQahMVZ7w)
+
+P.S. Эти футболки не продаются, а распространяются бесплатно на большинстве митапов [ClickHouse](https://clickhouse.tech/#meet), обычно в награду за самые интересные вопросы или другие виды активного участия.
diff --git a/docs/ru/faq/general/olap.md b/docs/ru/faq/general/olap.md
new file mode 100644
index 00000000000..9dce0ffbdf7
--- /dev/null
+++ b/docs/ru/faq/general/olap.md
@@ -0,0 +1,39 @@
+---
+title: Что такое OLAP?
+toc_hidden: true
+toc_priority: 100
+---
+
+# Что такое OLAP? {#what-is-olap}
+
+[OLAP](https://ru.wikipedia.org/wiki/OLAP) (OnLine Analytical Processing) переводится как обработка данных в реальном времени. Это широкий термин, который можно рассмотреть с двух сторон: с технической и с точки зрения бизнеса. Для самого общего понимания можно просто прочитать его с конца:
+
+**Processing**
+    Обрабатываются некие исходные данные…
+
+**Analytical**
+:   … чтобы получить какие-то аналитические отчеты или новые знания…
+
+**OnLine**
+:   … в реальном времени, практически без задержек на обработку.
+
+## OLAP с точки зрения бизнеса {#olap-from-the-business-perspective}
+
+В последние годы бизнес-сообщество стало осознавать ценность данных. Компании, которые принимают решения вслепую, чаще всего отстают от конкурентов. Управление бизнесом на основе данных, которое применяется успешными компаниями, побуждает собирать все данные, которые могут быть полезны в будущем для принятия бизнес-решений, а также подбирать механизмы, чтобы своевременно эти данные анализировать. Именно для этого и нужны СУБД с OLAP. 
+
+С точки зрения бизнеса, OLAP позволяет компаниям постоянно планировать, анализировать и оценивать операционную деятельность, чтобы повышать её эффективность, уменьшать затраты и как следствие — увеличивать долю рынка. Это можно делать как в собственной системе, так и в облачной (SaaS), в веб или мобильных аналитических приложениях, CRM-системах и т.д. Технология OLAP используется во многих приложениях BI (Business Intelligence — бизнес-аналитика).
+
+ClickHouse — это СУБД с OLAP, которая часто используется для поддержки SaaS-решений для анализа данных в различных предметных областях. Но поскольку некоторые компании все еще не слишком охотно размещают свои данные в облаке (у сторонних провайдеров), ClickHouse может быть развернут и на собственных серверах заказчика.
+
+## OLAP с технической точки зрения {#olap-from-the-technical-perspective}
+
+Все СУБД можно разделить на две группы: OLAP (**аналитическая** обработка в реальном времени) и OLTP (обработка **транзакций** в реальном времени). OLAP используются для построения отчетов на основе больших объемов накопленных исторических данных, но эти отчеты обновляются не слишком часто. OLTP обычно применяются для обработки непрерывных потоков операций (транзакций), каждая из которых изменяет состояние данных.
+
+На практике OLAP и OLTP — это не строго разделённые категории, а скорее спектр возможностей. Большинство СУБД специализируются на каком-то одном виде обработки данных, но имеют инструменты и для выполнения других операций, когда это необходимо. Из-за такой специализации часто приходится использовать несколько СУБД и интегрировать их между собой. Это вполне реальная и решаемая задача, но, как известно, чем больше систем, тем выше расходы на их содержание. Поэтому в последние годы становятся популярны гибридные СУБД — HTAP (**Hybrid Transactional/Analytical Processing**), которые одинаково эффективно выполняют оба вида операций по обработке данных.
+
+Даже если СУБД сначала развивались исключительно как OLAP или как OLTP, разработчики постепенно двигаются в сторону HTAP, чтобы сохранять конкурентоспособность. И ClickHouse не исключение. Изначально он создавался как [OLAP СУБД с максимальной производительностью](../../faq/general/why-clickhouse-is-so-fast.md), и на сегодняшний день в нем нет полноценной поддержки обработки тразакций, но уже реализованы некоторые возможности, такие как постоянная скорость чтения/записи данных и мутации при изменении/удалении данных.
+
+Принципиальное "разделение труда" между OLAP и OLTP СУБД сохраняется:
+
+-   Чтобы эффективно строить аналитические отчеты, нужно уметь обрабатывать колонки по отдельности, поэтому большинство OLAP СУБД — [столбцовые](../../faq/general/columnar-database.md).
+-   Хранение данных по столбцам снижает скорость выполнения операций над строками (таких как добавление или изменение данных) пропорционально числу столбцов, а это число может быть огромным для систем, ориентированных на сбор разнообразных детальных данных о событиях. Поэтому большинство OLTP систем используют строковые СУБД.
diff --git a/docs/ru/faq/general/who-is-using-clickhouse.md b/docs/ru/faq/general/who-is-using-clickhouse.md
new file mode 100644
index 00000000000..02a4d198deb
--- /dev/null
+++ b/docs/ru/faq/general/who-is-using-clickhouse.md
@@ -0,0 +1,19 @@
+---
+title: Кто пользуется ClickHouse?
+toc_hidden: true
+toc_priority: 9
+---
+
+# Кто пользуется ClickHouse? {#who-is-using-clickhouse}
+
+Так как CH является продуктом с открытым исходным кодом, на этот вопрос не так просто ответить. Вы не должны сообщать кому-либо о том, что вы начали пользоваться ClickHouse, достаточно взять исходный код или предкомпилированный установочный пакет. Не нужно подписывать контракт, а [лицензия Apache 2.0](https://github.com/ClickHouse/ClickHouse/blob/master/LICENSE) позволяет распространять ПО без ограничений.
+
+Кроме того, стек используемых технологий часто не раскрывается из-за NDA. Некоторые компании рассматривают технологии, которыми пользуются, как своё конкурентное преимущество, даже если это продукты с открытым исходным кодом. Такие компании не позволяют сотрудникам рассказывать о том, с каким ПО они работают, или требуют согласовывать это с PR-отделом.
+
+Итак, как же узнать, кто пользуется ClickHouse?
+
+Один из способов — **поспрашивать в своем окружении**. В разговорах люди более охотно делятся тем, какие технологии внедрены в их компаниях, какие задачи решаются с их помощью, могут назвать характеристики аппаратного обеспечения, объемы данных и т.д. Мы регулярно разговариваем с пользователями во время [митапов ClickHouse](https://www.youtube.com/channel/UChtmrD-dsdpspr42P_PyRAw/playlists) по всему миру и слышали о более чем 1000 компаний, которые пользуются ClickHouse. К сожалению, мы не можем раскрывать подробности, потому что по умолчанию считаем такие истории защищенными NDA, чтобы избежать любых возможных проблем. Вы можете прийти на любой из наших будущих митапов и самостоятельно поговорить с другими пользователями. Мы анонсируем события по разным каналам, например, вы можете подписаться на [наш Twitter](http://twitter.com/ClickHouseDB/).
+
+Второй способ узнать — посмотреть, что компании **говорят публично** о том, как именно они пользуются ClickHouse. Это более существенная информация, потому что ее можно найти в публикациях в блогах, видеозаписях разговоров, презентациях и т.д. Мы собираем ссылки на такие материалы на своей странице **[Пользователи ClickHouse](../../introduction/adopters.md)**. Будем рады, если вы поделитесь историей вашей компании или ссылками по теме (но всегда помните о том, что не стоит нарушать NDA).
+
+В числе пользователей есть множество очень крупных компаний, знакомых вам, таких как Bloomberg, Cisco, China Telecom, Tencent или Uber, но на самом деле это далеко не полный перечень. К примеру, если вы возьмете [список Forbes крупнейших ИТ-компаний в 2020](https://www.forbes.com/sites/hanktucker/2020/05/13/worlds-largest-technology-companies-2020-apple-stays-on-top-zoom-and-uber-debut/), то увидите, что более половины из этих компаний так или иначе пользуются ClickHouse. Также необходимо упомянуть Яндекс — компанию, которая открыла исходный код ClickHouse в 2016 году и является одной из самых крупных ИТ-компаний в Европе.
diff --git a/docs/ru/faq/general/why-clickhouse-is-so-fast.md b/docs/ru/faq/general/why-clickhouse-is-so-fast.md
new file mode 100644
index 00000000000..694488b40a9
--- /dev/null
+++ b/docs/ru/faq/general/why-clickhouse-is-so-fast.md
@@ -0,0 +1,63 @@
+---
+title: Почему ClickHouse так быстро работает?
+toc_hidden: true
+toc_priority: 8
+---
+
+#  Почему ClickHouse так быстро работает? {#why-clickhouse-is-so-fast}
+
+Производительность изначально заложена в архитектуре ClickHouse. Высокая скорость выполнения запросов была и остается самым важным критерием, который учитывается при разработке. Но мы обращаем внимание и на другие характеристики, такие как удобство использования, масштабируемость, безопасность. Всё это делает ClickHouse настоящей промышленной разработкой. 
+
+Сначала ClickHouse создавался как прототип, который должен был отлично справляться с одной единственной задачей — отбирать и агрегировать данные с максимальной скоростью. Это необходимо, чтобы создать обычный аналитический отчет, и именно это делает стандартный запрос [GROUP BY](../../sql-reference/statements/select/group-by.md). Для решения такой задачи команда разработки ClickHouse приняла несколько архитектурных решений: 
+
+Столбцовое хранение данных
+:   Исходные данные часто содержат сотни или даже тысячи столбцов, в то время как для конкретного отчета нужны только несколько из них. Система не должна читать ненужные столбцы, поскольку операции чтения данных с диска — самые дорогостоящие.
+
+Индексы
+:   ClickHouse хранит структуры данных в оперативной памяти, что позволяет считывать не только нужные столбцы, но и нужные диапазоны строк для этих столбцов.
+
+Сжатие данных
+:   Различные способы хранения смежных значений в столбце позволяют достигать более высокой степени сжатия данных (по сравнению с обычными строковыми СУБД), т.к. в смежных строках значения часто бывают одинаковыми или близкими. В дополнение к универсальному сжатию ClickHouse поддерживает [специализированные кодеки](../../sql-reference/statements/create/table.md#create-query-specialized-codecs), которые позволяют еще больше уменьшить объемы хранимых данных. 
+
+Векторные запросы
+:   ClickHouse не только хранит, но и обрабатывает данные в столбцах. Это приводит к лучшей утилизации кеша процессора и позволяет использовать инструкции [SIMD](https://en.wikipedia.org/wiki/SIMD).
+
+Масштабируемость
+:   ClickHouse может задействовать все доступные мощности процессоров и объемы дисков, чтобы выполнить даже одиночный запрос. Не только на отдельном сервере, но и в целом кластере.
+
+Похожие техники используют и многие другие СУБД. **Внимание к мельчайшим деталям** — вот что на самом деле выделяет ClickHouse. Большинство языков программирования поддерживают большинство распространенных алгоритмов и структур данных, но как правило, они бывают слишком универсальными, чтобы быть по-настоящему эффективными. Мы рассматриваем каждую задачу как тонкий инструмент со множеством настроек, вместо того чтобы просто взять какую-то случайную реализацию. Например, если вам нужна хеш-таблица, вот несколько ключевых вопросов, которые нужно продумать:
+
+-   Какую хеш-функцию выбрать?
+-   Каким способом разрешать коллизии: [открытая адресация](https://en.wikipedia.org/wiki/Open_addressing) или [метод цепочек](https://en.wikipedia.org/wiki/Hash_table#Separate_chaining)?
+-   Как хранить данные в памяти: ключи и значения в одном массиве или в отдельных? Будут ли там храниться маленькие или большие значения?
+-   Фактор заполнения: когда и как менять размер таблицы? Как перемещать значения при изменении размера?
+-   Будут ли значения удаляться и если да, то какой алгоритм сработает лучше?
+-   Понадобится ли быстрое зондирование с использованием битовых масок, встроенное хранение строковых ключей, поддержка неперемещаемых значений, предварительная выборка и пакетная обработка?
+
+Хеш-таблица — ключевая структура данных для реализации `GROUP BY`, и ClickHouse автоматически выбирает одну из [более 30 вариаций](https://github.com/ClickHouse/ClickHouse/blob/master/src/Interpreters/Aggregator.h) для каждого специфического запроса.
+
+Для алгоритмов сортировки, например, следует продумать следующие вопросы:
+
+-   Что будет сортироваться: массив чисел, кортежей, строк или структур?
+-   Доступны ли все данные в оперативной памяти?
+-   Нужна ли стабильная сортировка?
+-   Нужна ли полная сортировка? Может быть, будет достаточно частичной или выборочной сортировки?
+-   Как сравнивать данные?
+-   Не являются ли данные частично отсортированными?
+
+Алгоритмы, основанные на характеристиках рабочих данных, обычно дают лучшие результаты, чем их более универсальные аналоги. Если заранее неизвестно, с какими данными придется работать, ClickHouse будет в процессе выполнения пробовать различные реализации и в итоге выберет оптимальный вариант. Например, рекомендуем прочитать [статью о том, как в ClickHouse реализуется распаковка LZ4](https://habr.com/en/company/yandex/blog/457612/). 
+
+Ну и последнее, но тем не менее важное условие: команда ClickHouse постоянно отслеживает в интернете сообщения пользователей о найденных ими удачных реализациях, алгоритмах или структурах данных, анализирует и пробует новые идеи. Иногда в этом потоке сообщений попадаются действительно ценные предложения.
+
+!!! info "Советы о том, как создать собственную высокопроизводительную систему"
+
+
+    -   При проектировании системы обращайте внимание на мельчайшие детали реализации.
+    -   Учитывайте возможности аппаратного обеспечения.
+    -   Выбирайте структуры и представления данных исходя из требований конкретной задачи.
+    -   Для особых случаев разрабатывайте специализированные решения.
+    -   Пробуйте новые алгоритмы, о которых вы вчера прочитали в интернете. Ищите возможности для совершенствования.
+    -   Выбирайте алгоритмы динамически, в процессе выполнения, на основе статистики.
+    -   Ориентируйтесь на показатели, собранные при работе с реальными данными.
+    -   Проверяйте производительность в процессе CI.
+    -   Измеряйте и анализируйте всё, что только возможно.
diff --git a/docs/ru/faq/index.md b/docs/ru/faq/index.md
index 611e604bc8e..08deec5f7ce 100644
--- a/docs/ru/faq/index.md
+++ b/docs/ru/faq/index.md
@@ -4,14 +4,42 @@ toc_hidden: true
 toc_priority: 76
 ---
 
-# Содержание F.A.Q. {#soderzhanie}
+# ClickHouse F.A.Q. {#clickhouse-f-a-q}
 
-В этом разделе документации собрали вопросы о ClickHouse, которые задают чаще всего.
+В этом разделе документации собраны ответы на вопросы о ClickHouse, которые задают чаще всего.
 
 Категории:
 
--   **[Общие вопросы](../faq/general/index.md)** 
--   **[Применение](../faq/use-cases/index.md)**
--   **[Операции](../faq/operations/index.md)**  
--   **[Интеграция](../faq/integration/index.md)**
+-   **[Общие вопросы](general/index.md)** 
+    -   [Что такое ClickHouse?](../index.md#what-is-clickhouse)
+    -   [Почему ClickHouse такой быстрый?](general/why-clickhouse-is-so-fast.md)
+    -   [Кто пользуется ClickHouse?](general/who-is-using-clickhouse.md)
+    -   [Что обозначает название ClickHouse?](general/dbms-naming.md)
+    -   [Как фраза “Не тормозит” осталась на всех футболках?](general/ne-tormozit.md)
+    -   [Что такое OLAP?](general/olap.md)
+    -   [Что такое столбцовая база данных?](general/columnar-database.md)
+    -   [Почему бы не использовать системы типа MapReduce?](general/mapreduce.md)
+-   **[Применение](use-cases/index.md)**
+    -   [Можно ли использовать ClickHouse как БД временных рядов?](use-cases/time-series.md)
+    -   [Можно ли использовать ClickHouse для хранения данных вида "ключ-значение"?](use-cases/key-value.md)
+-   **[Операции](operations/index.md)**  
+    -   [Какую версию ClickHouse использовать?](operations/production.md)
+    -   [Возможно ли удалить старые записи из таблицы ClickHouse?](operations/delete-old-data.md)
+-   **[Интеграция](integration/index.md)**
+    -   [Как экспортировать данные из ClickHouse в файл?](integration/file-export.md)
+    -   [Как импортировать JSON в ClickHouse?](integration/json-import.md)
+    -   [Что делать, если у меня проблема с кодировками при использовании Oracle через ODBC?](integration/oracle-odbc.md)
 
+{## TODO
+Question candidates:
+- How to choose a primary key?
+- How to add a column in ClickHouse?
+- Too many parts
+- How to filter ClickHouse table by an array column contents?
+- How to insert all rows from one table to another of identical structure?
+- How to kill a process (query) in ClickHouse?
+- How to implement pivot (like in pandas)?
+- How to remove the default ClickHouse user through users.d?
+- Importing MySQL dump to Clickhouse
+- Window function workarounds (row\_number, lag/lead, running diff/sum/average)
+##}
diff --git a/docs/ru/faq/integration/file-export.md b/docs/ru/faq/integration/file-export.md
index d21ffbd3349..b9a54dc0766 100644
--- a/docs/ru/faq/integration/file-export.md
+++ b/docs/ru/faq/integration/file-export.md
@@ -1,27 +1,27 @@
 ---
-title: How do I export data from ClickHouse to a file?
+title: Как экспортировать данные из ClickHouse в файл?
 toc_hidden: true
 toc_priority: 10
 ---
 
-## Как экспортировать данные из ClickHouse в файл? {#how-to-export-to-file-rus}
+# Как экспортировать данные из ClickHouse в файл? {#how-to-export-to-file-rus}
 
-### Секция INTO OUTFILE {#sektsiia-into-outfile-rus}
+## Секция INTO OUTFILE {#using-into-outfile-clause}
 
-Добавьте секцию [INTO OUTFILE](../../sql-reference/statements/select/into-outfile.md#into-outfile-clause) к своему запросу.
+Добавьте к своему запросу секцию [INTO OUTFILE](../../sql-reference/statements/select/into-outfile.md#into-outfile-clause).
 
 Например:
 
 ``` sql
-SELECT * FROM table INTO OUTFILE 'file'
+SELECT * FROM table INTO OUTFILE 'file';
 ```
 
-По умолчанию, для выдачи данных ClickHouse использует формат [TabSeparated](../../interfaces/formats.md#tabseparated). Чтобы выбрать [формат данных](../../interfaces/formats.md), используйте секцию [FORMAT](../../sql-reference/statements/select/format.md#format-clause).
+По умолчанию при выдаче данных ClickHouse использует формат [TabSeparated](../../interfaces/formats.md#tabseparated). Чтобы выбрать другой [формат данных](../../interfaces/formats.md), используйте секцию [FORMAT](../../sql-reference/statements/select/format.md#format-clause).
 
 Например:
 
 ``` sql
-SELECT * FROM table INTO OUTFILE 'file' FORMAT CSV
+SELECT * FROM table INTO OUTFILE 'file' FORMAT CSV;
 ```
 
 ## Таблица с движком File {#using-a-file-engine-table}
diff --git a/docs/ru/faq/integration/index.md b/docs/ru/faq/integration/index.md
index 59fd84a8139..fdb9039d066 100644
--- a/docs/ru/faq/integration/index.md
+++ b/docs/ru/faq/integration/index.md
@@ -1,19 +1,19 @@
 ---
-title: Questions about integrating ClickHouse and other systems
+title: Интеграция ClickHouse с другими системами
 toc_hidden_folder: true
 toc_priority: 4
 toc_title: Интеграция
 ---
 
-# Вопросы об интеграции ClickHouse с другими системами {#question-about-integrating-clickhouse-and-other-systems-rus}
+# Интеграция ClickHouse с другими системами {#question-about-integrating-clickhouse-and-other-systems-rus}
 
 Вопросы:
 
 -   [Как экспортировать данные из ClickHouse в файл?](file-export.md)
--   Как импортировать JSON в ClickHouse?
+-   [Как импортировать JSON в ClickHouse?](json-import.md)
 -   [Что делать, если у меня проблема с кодировками при использовании Oracle через ODBC?](oracle-odbc.md)
 
 !!! info "Если вы не нашли то, что искали"
     Загляните в другие подразделы F.A.Q. или поищите в остальных разделах документации, ориентируйтесь по оглавлению слева.
 
-{## [Original article](https://clickhouse.tech/docs/ru/faq/integration/) ##}
+[Original article](https://clickhouse.tech/docs/ru/faq/integration/)
diff --git a/docs/ru/faq/integration/json-import.md b/docs/ru/faq/integration/json-import.md
new file mode 100644
index 00000000000..17911dd1ef8
--- /dev/null
+++ b/docs/ru/faq/integration/json-import.md
@@ -0,0 +1,33 @@
+---
+title: Как импортировать JSON в ClickHouse?
+toc_hidden: true
+toc_priority: 11
+---
+
+# Как импортировать JSON в ClickHouse? {#how-to-import-json-into-clickhouse}
+
+ClickHouse поддерживает широкий спектр [входных и выходных форматов данных](../../interfaces/formats.md). Среди них есть множество вариаций JSON, но чаще всего для импорта данных используют [JSONEachRow](../../interfaces/formats.md#jsoneachrow): один JSON-объект в строке, каждый объект с новой строки.
+
+## Примеры {#examples}
+
+С помощью [HTTP-интерфейса](../../interfaces/http.md):
+
+``` bash
+$ echo '{"foo":"bar"}' | curl 'http://localhost:8123/?query=INSERT%20INTO%20test%20FORMAT%20JSONEachRow' --data-binary @-
+```
+
+При помощи [интефейса CLI](../../interfaces/cli.md):
+
+``` bash
+$ echo '{"foo":"bar"}'  | clickhouse-client ---query="INSERT INTO test FORMAT JSONEachRow"
+```
+
+Чтобы не вставлять данные вручную, используйте одну из [готовых библиотек](../../interfaces/index.md).
+
+## Полезные настройки {#useful-settings}
+
+-   `input_format_skip_unknown_fields` позволяет импортировать JSON, даже если он содержит дополнительные поля, которых нет в таблице (отбрасывая лишние поля).
+-   `input_format_import_nested_json` позволяет импортировать вложенные JSON-объекты в столбцы типа [Nested](../../sql-reference/data-types/nested-data-structures/nested.md).
+
+!!! note "Примечание"
+    В HTTP-интерфейсе настройки передаются через параметры `GET` запроса, в `CLI` interface — как дополнительные аргументы командной строки, начинающиеся с `--`.
diff --git a/docs/ru/faq/integration/oracle-odbc.md b/docs/ru/faq/integration/oracle-odbc.md
index f41f1ae7fc1..1997cdcc1d2 100644
--- a/docs/ru/faq/integration/oracle-odbc.md
+++ b/docs/ru/faq/integration/oracle-odbc.md
@@ -1,10 +1,10 @@
 ---
-title: What if I have a problem with encodings when using Oracle via ODBC?
+title: Что делать, если у меня проблема с кодировками при использовании Oracle через ODBC?
 toc_hidden: true
 toc_priority: 20
 ---
 
-## Что делать, если у меня проблема с кодировками при использовании Oracle через ODBC? {#oracle-odbc-encodings-rus}
+# Что делать, если у меня проблема с кодировками при использовании Oracle через ODBC? {#oracle-odbc-encodings}
 
 Если вы используете Oracle через драйвер ODBC в качестве источника внешних словарей, необходимо задать правильное значение для переменной окружения `NLS_LANG` в `/etc/default/clickhouse`. Подробнее читайте в [Oracle NLS_LANG FAQ](https://www.oracle.com/technetwork/products/globalization/nls-lang-099431.html).
 
diff --git a/docs/ru/faq/operations/delete-old-data.md b/docs/ru/faq/operations/delete-old-data.md
new file mode 100644
index 00000000000..7870f9b3bfe
--- /dev/null
+++ b/docs/ru/faq/operations/delete-old-data.md
@@ -0,0 +1,42 @@
+---
+title: Возможно ли удалить старые записи из таблицы ClickHouse?
+toc_hidden: true
+toc_priority: 20
+---
+
+# Возможно ли удалить старые записи из таблицы ClickHouse? {#is-it-possible-to-delete-old-records-from-a-clickhouse-table}
+
+Если отвечать коротко, то да. В ClickHouse есть множество механизмов, которые позволяют освобождать место на диске, удаляя старые данные. Каждый механизм подходит для разных сценариев.
+
+## TTL {#ttl}
+
+ClickHouse позволяет автоматически удалять данные при выполнении некоторых условий. Эти условия задаются как выражение, вычисляемое на основе значений любых столбцов, обычно это просто разница между текущим моментом времени и значением какого-то столбца, содержащего дату и время.
+
+Ключевое преимущество такого подхода в том, что не нужно использовать внешнюю систему, чтобы запустить процесс — когда заданы условия TTL, удаление данных выполняется автоматически в фоновом режиме.
+
+!!! note "Note"
+    TTL можно использовать не только для перемещения в [/dev/null](https://en.wikipedia.org/wiki/Null_device), но еще и между дисками, например, с SSD на HDD.
+
+[Подробнее о конфигурировании TTL](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-ttl).
+
+## ALTER DELETE {#alter-delete}
+
+ClickHouse не удаляет данные в реальном времени, как СУБД [OLTP](https://en.wikipedia.org/wiki/Online_transaction_processing). Больше всего на такое удаление похожи мутации. Они выполняются с помощью запросов `ALTER ... DELETE` или `ALTER ... UPDATE`. В отличие от обычных запросов `DELETE` и `UPDATE`, мутации выполняются асинхронно, в пакетном режиме, не в реальном времени. В остальном после слов `ALTER TABLE` синтаксис обычных запросов и мутаций одинаковый.
+
+`ALTER DELETE` можно использовать для гибкого удаления устаревших данных. Если вам нужно делать это регулярно, единственный недостаток такого подхода будет заключаться в том, что потребуется внешняя система для запуска запроса. Кроме того, могут возникнуть некоторые проблемы с производительностью, поскольку мутации перезаписывают целые куски данных если в них содержится хотя бы одна строка, которую нужно удалить.
+
+Это самый распространенный подход к тому, чтобы обеспечить соблюдение принципов [GDPR](https://gdpr-info.eu) в вашей системе на ClickHouse.
+
+Подробнее смотрите в разделе [Мутации](../../sql-reference/statements/alter/index.md#alter-mutations).
+
+## DROP PARTITION {#drop-partition}
+
+Запрос `ALTER TABLE ... DROP PARTITION` позволяет эффективно удалять целые партиции. Этот способ не такой гибкий, важно правильно сконфигурировать партиции при создании таблицы, но он подходит для достаточно широкого спектра типовых задач. Как и для мутаций, для регулярного запуска таких запросов нужна внешняя система.
+
+Подробнее смотрите в разделе [Манипулирование с партициями и кусками](../../sql-reference/statements/alter/partition.md#alter_drop-partition).
+
+## TRUNCATE {#truncate}
+
+Это достаточно радикальный способ, он удаляет все данные в таблице, но хорошо подходит для отдельных случаевх.
+
+Подробнее смотрите в разделе об [удалении партиций](../../sql-reference/statements/alter/partition.md#alter_drop-partition).
diff --git a/docs/ru/faq/operations/index.md b/docs/ru/faq/operations/index.md
index 98a04213fb7..723ae2d10d3 100644
--- a/docs/ru/faq/operations/index.md
+++ b/docs/ru/faq/operations/index.md
@@ -1,18 +1,18 @@
 ---
-title: Question about operating ClickHouse servers and clusters
+title: Вопросы о производительности серверов и кластеров ClickHouse
 toc_hidden_folder: true
 toc_priority: 3
 toc_title: Операции
 ---
 
-# Вопросы о производительности серверов и кластеров ClickHouse {#voprosy-ob-operating-clickhouse-servers-and-clusters}
+# Вопросы о производительности серверов и кластеров ClickHouse {#question-about-operating-clickhouse-servers-and-clusters}
 
 Вопросы:
 
--   Which ClickHouse version to use in production?
--   Is it possible to delete old records from a ClickHouse table?
+-   [Какую версию ClickHouse использовать?](production.md)
+-   [Возможно ли удалить старые записи из таблицы ClickHouse?](delete-old-data.md)
 
-    !!! info "Don’t see what you were looking for?"
-        Check out [other F.A.Q. categories](../../faq/index.md) or browse around main documentation articles found in the left sidebar.
+!!! info "Если вы не нашли то, что искали"
+    Загляните в другие подразделы F.A.Q. или поищите в остальных разделах документации, ориентируйтесь по оглавлению слева.
 
-    {## [Original article](https://clickhouse.tech/docs/en/faq/production/) ##}
+[Original article](https://clickhouse.tech/docs/en/faq/operations/)
diff --git a/docs/ru/faq/operations/production.md b/docs/ru/faq/operations/production.md
new file mode 100644
index 00000000000..a82a7f5e888
--- /dev/null
+++ b/docs/ru/faq/operations/production.md
@@ -0,0 +1,70 @@
+---
+title: Какую версию ClickHouse использовать?
+toc_hidden: true
+toc_priority: 10
+---
+
+# Какую версию ClickHouse использовать? {#which-clickhouse-version-to-use-in-production}
+
+Во-первых, давайте обсудим, почему возникает этот вопрос. Есть две основные причины:
+
+1.  ClickHouse развивается достаточно быстро, и обычно мы выпускаем более 10 стабильных релизов в год. Так что есть из чего выбрать, а это не всегда просто. 
+2.  Некоторые пользователи не хотят тратить время на анализ того, какая версия лучше подходит для их задач, и просто хотят получить совет от эксперта.
+
+Вторая причина более весомая, так что начнем с нее, а затем рассмотрим, какие бывают релизы ClickHouse.
+
+## Какую версию ClickHouse вы посоветуете? {#which-clickhouse-version-do-you-recommend}
+
+Казалось бы, самый удобный вариант — нанять консультанта или довериться эксперту, и делегировать ему ответственность за вашу систему. Вы устанавливаете ту версию ClickHouse, которую вам рекомендовали, и теперь если что-то пойдет не так — это уже не ваша вина. На самом деле это не так. Никто не может знать лучше вас, что происходит в вашей системе. 
+
+Как же правильно выбрать версию ClickHouse, на которую стоит обновиться? Или как выбрать версию, с которой следует начать, если вы только внедряете ClickHouse? Во-первых, мы рекомендуем позаботиться о создании **реалистичной тестовой среды** (pre-production). В идеальном мире это была бы полная копия рабочей среды, но чаще всего такое решение оказывается слишком дорогостоящим.
+
+Чтобы тестовая среда была достаточно надежной, но не слишком дорогостоящей, учитывайте следующие моменты:
+
+-   В тестовой среде нужно выполнять набор запросов, максимально близкий к тому, который будет выполняться в реальной среде:
+    -   Не используйте тестовую среду в режиме "только для чтения", работая с каким-то статичным набором данных.
+    -   Не используйте её в режиме "только для записи", проверяя лишь копирование данных, без построения типовых отчетов.
+    -   Не очищайте её, удаляя все данные подчистую вместо тестирования рабочих схем миграции.
+-   Выполняйте реальные запросы на выборке из реальных рабочих данных. Постарайтесь подготовить репрезентативную выборку, на которой запрос `SELECT` будет возвращать адекватные результаты. Если регламенты безопасности не позволяют использовать реальные данные за пределами защищенной рабочей среды, используйте обфускацию. 
+-   Убедитесь, что тестовая среда находится под контролем тех же систем мониторинга и оповещения, что и рабочая. 
+-   Если ваша рабочая среда распределена между разными дата-центрами и регионами, тестовая среда должна быть такой же.
+-   Если в рабочей среде используются сложные инструменты типа репликации, распределённых таблиц или каскадных материализованных представлений, тестовая среда должна быть сконфигурирована так же.
+-   Обычно в тестовой среде стараются использовать то же количество серверов и виртуальных машин, что и в рабочей, но делают их меньшего объема. Либо наоборот, используют существенно меньшее число серверов и ВМ, но тех же объемов. Первый вариант скорее позволит обнаружить проблемы, связанные с работой сети, а второй вариант более прост в управлении.
+
+Второе направление — **автоматизированное тестирование**. Не думайте, что если какой-то запрос отработал успешно один раз, так будет всегда. Считается приемлемым выполнять некоторые юнит-тесты, используя "заглушки" вместо запросов к СУБД. Но вы должны проводить достаточное количество автотестов, где запросы выполняются в реальном ClickHouse, чтобы убедиться, что все важные задачи отрабатывают должным образом.
+
+В продолжение этой темы, вы можете поделиться вашими автотестами и передать их [в открытую тестовую среду ClickHouse](https://github.com/ClickHouse/ClickHouse/tree/master/tests), которая используется для постоянного развития нашей СУБД. Вам придётся потратить немного времени и сил, чтобы научиться [составлять и выполнять тесты](../../development/tests.md), а также чтобы перенести ваши тесты на эту платформу. Наградой за это станет уверенность в том, что новые стабильные релизы ClickHouse будут корректно работать на ваших задачах. Это гораздо лучше, чем тратить время на то, чтобы вновь отлавливать прежние ошибки в новых версиях, а затем ждать, пока их исправят и включат эти исправления в очередной релиз. Некоторые компании уже включили в корпоративные регламенты необходимость передачи своих тестов в ClickHouse, прежде всего стоит упомянуть [правило Beyonce](https://www.oreilly.com/library/view/software-engineering-at/9781492082781/ch01.html#policies_that_scale_well), действующее в Google.
+
+После того, как вы подготовили тестовую среду и инфраструктуру, выбор версии ClickHouse упрощается:
+
+1.  Проверяйте новые релизы ClickHouse с помощью подготовленных автотестов. Вы можете проверять не только стабильные релизы, но и тестовые, хотя работать с такими релизами не рекомендуется.
+2.  Если новый релиз ClickHouse успешно прошел ваши автотесты, внедряйте его в тестовой среде и проверяйте работоспособность всех ваших задач.
+3.  Сообщайте обо всех обнаруженных проблемах в [ClickHouse GitHub Issues](https://github.com/ClickHouse/ClickHouse/issues).
+4.  Если никаких серьезных проблем не было выявлено, можно установить новый релиз ClickHouse в рабочую среду. Чтобы еще больше снизить риски, вы можете внедрить специальные техники поэтапного перехода на новые релизы, такие как [canary releases](https://martinfowler.com/bliki/CanaryRelease.html) или [green-blue deployments](https://martinfowler.com/bliki/BlueGreenDeployment.html).
+
+Как вы уже поняли, ClickHouse не требует какого-то особенного подхода — описанные выше правила широко используются для любых элементов инфраструктуры, если нужно обеспечить ее надежность и если компании серьезно подходят к вопросам стабильности своих систем.
+
+## Какой вид релиза ClickHouse выбрать? {#how-to-choose-between-clickhouse-releases}
+
+Если вы заглянете в раздел, где публикуются установочные пакеты ClickHouse, вы увидите там следующие виды пакетов:
+
+1.  `testing`
+2.  `prestable`
+3.  `stable`
+4.  `lts` (long-term support)
+
+Как уже упоминалось выше, тестовые релизы (`testing`) стоит использовать для раннего обнаружения ошибок, в рабочей среде мы не рекомендуем использовать такие релизы, поскольку они еще не протестированы так же тщательно, как остальные.
+
+Подготовительные (`prestable`) — это релизы-кандидаты, которые с большой вероятностью скоро будут доведены до стабильного состояния. Вы можете использовать их в тестовой среде и сообщать нам об обнаруженных ошибках.
+
+В рабочей среде мы рекомендуем использвать либо стабильный релиз (`stable`), либо релиз с долговременной поддержкой (`lts`). Если вы выбираете между этими двуми видами релизов, примите во внимание следующее:
+
+-   По умолчанию мы рекомендуем релизы `stable`. Новый стабильный релиз выпускается примерно раз в месяц, что открывает доступ к новым функциям. Три последних стабильных релиза находятся на поддержке — это означает, что в них интегрируются исправленные ошибки и доработки.
+-   Релизы `lts` выпускаются дважды в год и находятся на поддержке в течение года с момента выхода. Они более предочтительны в следующих случаях:
+    -   ваши корпоративные регламенты запрещают частые обновления или использование любых релизов, кроме LTS;
+    -   вы используете ClickHouse в продуктах, которые не задействуют сложные инструменты ClickHouse, или у вас не хватает ресурсов для частого их обновления.
+
+Часто компании, которые изначально ориентировались на релизы `lts`, позднее переходят на `stable`, поскольку хотят быстрее получать доступ к новым возможностям.
+
+!!! warning "Важно"
+    Мы всегда стремимся поддерживать совместимость релизов, но иногда это правило нарушается, и какие-то отдельные возможности в новых релизах становятся недоступны. Перед обновлением ClickHouse обязательно изучите [журнал изменений](../../whats-new/changelog/index.md), чтобы убедиться, что в нем нет объявлений о нарушении обратной совместимости.
diff --git a/docs/ru/faq/use-cases/index.md b/docs/ru/faq/use-cases/index.md
index 6e7f2b36fe0..3507d69ad7c 100644
--- a/docs/ru/faq/use-cases/index.md
+++ b/docs/ru/faq/use-cases/index.md
@@ -1,14 +1,13 @@
 ---
-title: Questions about ClickHouse use cases
+title: Вопросы о применении ClickHouse
 toc_hidden_folder: true
 toc_priority: 2
 toc_title: Применение
 ---
 
-# Вопросы о применении ClickHouse {#voprosy-o-primenenii}
+# Вопросы о применении ClickHouse {#questions-about-clickhouse-use-cases}
 
 Вопросы:
 
--   Can I use ClickHouse as a time-series database?
--   Can I use ClickHouse as a key-value storage?
-
+-   [Можно ли использовать ClickHouse как БД временных рядов?](time-series.md)
+-   [Можно ли использовать ClickHouse для хранения данных вида "ключ-значение"?](key-value.md)
\ No newline at end of file
diff --git a/docs/ru/faq/use-cases/key-value.md b/docs/ru/faq/use-cases/key-value.md
new file mode 100644
index 00000000000..4daa9773f84
--- /dev/null
+++ b/docs/ru/faq/use-cases/key-value.md
@@ -0,0 +1,19 @@
+---
+title: Можно ли использовать ClickHouse для хранения данных вида "ключ-значение"?
+toc_hidden: true
+toc_priority: 101
+---
+
+# Можно ли использовать ClickHouse для хранения данных вида "ключ-значение"? {#can-i-use-clickhouse-as-a-key-value-storage}
+
+Если отвечать коротко, то **"нет"**. Операции над данными вида "ключ-значение" занимают одну из верхних позиций в списке ситуаций, когда категорически **не стоит**{.text-danger} использовать ClickHouse. Это [OLAP](../../faq/general/olap.md) СУБД, в то время как есть много специализированных СУБД для данных вида "ключ-значение".
+
+Тем не менее, в некоторых ситуациях имеет смысл использовать ClickHouse для запросов над данными вида "ключ-значение". Чаще всего это относится к системам с относительно невысокой нагрузкой, в которых основной объем операций относится к аналитической обработке данных и отлично подходит для ClickHouse. Однако в них есть некий второстепенный процесс, в котором нужно обрабатывать данные вида "ключ-значение", при этом процесс не требует слишком высокой производительности и не имеет строгих ограничений по задержкам выполнения запросов. Если у вас нет ограничений по бюджету, вы можете использовать для таких операций вспомогательную базу данных "ключ-значение", но это увеличит расходы на обслуживание еще одной СУБД (мониторинг, бэкапы и т.д.). 
+
+Если вы все же решите не следовать рекомендациям и использовать ClickHouse для работы с данными вида "ключ-значение", вот несколько советов:
+
+-   Главная причина, по которой точечный запрос в ClickHouse становится ресурсозатратным — это разреженный индекс для первичного ключа в [таблице семейства MergeTree](../../engines/table-engines/mergetree-family/mergetree.md). Этот индекс не может обращаться напрямую к каждой строке данных, вместо этого он обращается к каждой N-ой строке, а затем сканирует соседние строки вплоть до указанной, обрабатывая по пути лишние данные. При обработке данных вида "ключ-значение" может быть полезно уменьшить значение N при помощи настройки `index_granularity`.
+
+-   ClickHouse хранит столбцы в отдельных файлах, поэтому чтобы собрать одну полную строку, ему приходится обрабатывать все эти файлы. Их количество растет линейно в зависимости от количества столбцов, поэтому при обработке данных вида "ключ-значение" стоит избегать использования множества столбцов и поместить все нужные данные в один столбец с типом `String` в формате JSON, Protobuf или другом подходящем формате.
+
+-   Подумайте об использовании табличного движка [Join](../../engines/table-engines/special/join.md) вместо обычных таблиц `MergeTree` и функции [joinGet](../../sql-reference/functions/other-functions.md#joinget) для получения данных. В этом случае производительность выполнения запросов может быть выше, но могут появиться проблемы с надежностью и удобством. Пример такого использования описан [здесь](https://github.com/ClickHouse/ClickHouse/blob/master/tests/queries/0_stateless/00800_versatile_storage_join.sql#L49-L51).
diff --git a/docs/ru/faq/use-cases/time-series.md b/docs/ru/faq/use-cases/time-series.md
new file mode 100644
index 00000000000..ea56660cc10
--- /dev/null
+++ b/docs/ru/faq/use-cases/time-series.md
@@ -0,0 +1,15 @@
+---
+title: Можно ли использовать ClickHouse как базу данных временных рядов?
+toc_hidden: true
+toc_priority: 101
+---
+
+# Можно ли использовать ClickHouse как базу данных временных рядов? {#can-i-use-clickhouse-as-a-time-series-database}
+
+ClickHouse — это универсальное решение для [OLAP](../../faq/general/olap.md) операций, в то время как существует много специализированных СУБД временных рядов. Однако [высокая скорость выполнения запросов](../../faq/general/why-clickhouse-is-so-fast.md) позволяет CLickHouse во многих случаях "побеждать" специализированные аналоги. В подтверждение этому есть много [примеров](https://medium.com/@AltinityDB/clickhouse-for-time-series-scalability-benchmarks-e181132a895b) с конкретными показателями производительности, так что мы не будем останавливаться на этом подробно. Лучше рассмотрим те возможности ClickHouse, которые стоит использовать.
+
+Во-первых, есть **[специальные кодеки](../../sql-reference/statements/create/table.md#create-query-specialized-codecs)**, которые составляют типичные временные ряды. Это могут быть либо стандартные алгоритмы, такие как `DoubleDelta` или `Gorilla`, либо специфические для ClickHouse, например `T64`.
+
+Во-вторых, запросы по временным рядам часто затрагивают только недавние данные, не старше одного дня или недели. Имеет смысл использовать серверы, где есть как быстрые диски nVME/SSD, так и более медленные, но ёмкие HDD диски. С помощью [TTL](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-multiple-volumes) можно сконфигурировать таблицы так, чтобы свежие данные хранились на быстрых дисках, а по мере устаревания перемещались на медленные диски. Для архивных данных можно также настроить сворачивание или даже удаление, если это необходимо.
+
+Несмотря на то, что работа с "сырыми" данными противоречит философии ClickHouse, если нужно соответствовать очень жестким требованиям по скорости обработки данных, вы можете использовать [материализованные представления](../../sql-reference/statements/create/view.md).
diff --git a/docs/ru/getting-started/example-datasets/amplab-benchmark.md b/docs/ru/getting-started/example-datasets/amplab-benchmark.md
index bc59672ab26..8a75852aad9 100644
--- a/docs/ru/getting-started/example-datasets/amplab-benchmark.md
+++ b/docs/ru/getting-started/example-datasets/amplab-benchmark.md
@@ -125,4 +125,3 @@ ORDER BY totalRevenue DESC
 LIMIT 1
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/getting_started/example_datasets/amplab_benchmark/) <!--hide-->
diff --git a/docs/ru/getting-started/example-datasets/brown-benchmark.md b/docs/ru/getting-started/example-datasets/brown-benchmark.md
new file mode 100644
index 00000000000..f1aad06b743
--- /dev/null
+++ b/docs/ru/getting-started/example-datasets/brown-benchmark.md
@@ -0,0 +1,415 @@
+---
+toc_priority: 20
+toc_title: Brown University Benchmark
+---
+
+# Brown University Benchmark
+
+`MgBench` — это аналитический тест производительности для данных журнала событий, сгенерированных машиной. Бенчмарк разработан [Andrew Crotty](http://cs.brown.edu/people/acrotty/).
+
+Скачать данные:
+```
+wget https://datasets.clickhouse.tech/mgbench{1..3}.csv.xz
+```
+
+Распаковать данные:
+```
+xz -v -d mgbench{1..3}.csv.xz
+```
+
+Создание таблиц:
+```
+CREATE DATABASE mgbench;
+
+
+CREATE TABLE mgbench.logs1 (
+  log_time      DateTime,
+  machine_name  LowCardinality(String),
+  machine_group LowCardinality(String),
+  cpu_idle      Nullable(Float32),
+  cpu_nice      Nullable(Float32),
+  cpu_system    Nullable(Float32),
+  cpu_user      Nullable(Float32),
+  cpu_wio       Nullable(Float32),
+  disk_free     Nullable(Float32),
+  disk_total    Nullable(Float32),
+  part_max_used Nullable(Float32),
+  load_fifteen  Nullable(Float32),
+  load_five     Nullable(Float32),
+  load_one      Nullable(Float32),
+  mem_buffers   Nullable(Float32),
+  mem_cached    Nullable(Float32),
+  mem_free      Nullable(Float32),
+  mem_shared    Nullable(Float32),
+  swap_free     Nullable(Float32),
+  bytes_in      Nullable(Float32),
+  bytes_out     Nullable(Float32)
+)
+ENGINE = MergeTree()
+ORDER BY (machine_group, machine_name, log_time);
+
+
+CREATE TABLE mgbench.logs2 (
+  log_time    DateTime,
+  client_ip   IPv4,
+  request     String,
+  status_code UInt16,
+  object_size UInt64
+)
+ENGINE = MergeTree()
+ORDER BY log_time;
+
+
+CREATE TABLE mgbench.logs3 (
+  log_time     DateTime64,
+  device_id    FixedString(15),
+  device_name  LowCardinality(String),
+  device_type  LowCardinality(String),
+  device_floor UInt8,
+  event_type   LowCardinality(String),
+  event_unit   FixedString(1),
+  event_value  Nullable(Float32)
+)
+ENGINE = MergeTree()
+ORDER BY (event_type, log_time);
+```
+
+Вставка данных:
+
+```
+clickhouse-client --query "INSERT INTO mgbench.logs1 FORMAT CSVWithNames" < mgbench1.csv
+clickhouse-client --query "INSERT INTO mgbench.logs2 FORMAT CSVWithNames" < mgbench2.csv
+clickhouse-client --query "INSERT INTO mgbench.logs3 FORMAT CSVWithNames" < mgbench3.csv
+```
+
+Запуск тестов производительности:
+```
+-- Q1.1: What is the CPU/network utilization for each web server since midnight?
+
+SELECT machine_name,
+       MIN(cpu) AS cpu_min,
+       MAX(cpu) AS cpu_max,
+       AVG(cpu) AS cpu_avg,
+       MIN(net_in) AS net_in_min,
+       MAX(net_in) AS net_in_max,
+       AVG(net_in) AS net_in_avg,
+       MIN(net_out) AS net_out_min,
+       MAX(net_out) AS net_out_max,
+       AVG(net_out) AS net_out_avg
+FROM (
+  SELECT machine_name,
+         COALESCE(cpu_user, 0.0) AS cpu,
+         COALESCE(bytes_in, 0.0) AS net_in,
+         COALESCE(bytes_out, 0.0) AS net_out
+  FROM logs1
+  WHERE machine_name IN ('anansi','aragog','urd')
+    AND log_time >= TIMESTAMP '2017-01-11 00:00:00'
+) AS r
+GROUP BY machine_name;
+
+
+-- Q1.2: Which computer lab machines have been offline in the past day?
+
+SELECT machine_name,
+       log_time
+FROM logs1
+WHERE (machine_name LIKE 'cslab%' OR
+       machine_name LIKE 'mslab%')
+  AND load_one IS NULL
+  AND log_time >= TIMESTAMP '2017-01-10 00:00:00'
+ORDER BY machine_name,
+         log_time;
+
+
+-- Q1.3: What are the hourly average metrics during the past 10 days for a specific workstation?
+
+SELECT dt,
+       hr,
+       AVG(load_fifteen) AS load_fifteen_avg,
+       AVG(load_five) AS load_five_avg,
+       AVG(load_one) AS load_one_avg,
+       AVG(mem_free) AS mem_free_avg,
+       AVG(swap_free) AS swap_free_avg
+FROM (
+  SELECT CAST(log_time AS DATE) AS dt,
+         EXTRACT(HOUR FROM log_time) AS hr,
+         load_fifteen,
+         load_five,
+         load_one,
+         mem_free,
+         swap_free
+  FROM logs1
+  WHERE machine_name = 'babbage'
+    AND load_fifteen IS NOT NULL
+    AND load_five IS NOT NULL
+    AND load_one IS NOT NULL
+    AND mem_free IS NOT NULL
+    AND swap_free IS NOT NULL
+    AND log_time >= TIMESTAMP '2017-01-01 00:00:00'
+) AS r
+GROUP BY dt,
+         hr
+ORDER BY dt,
+         hr;
+
+
+-- Q1.4: Over 1 month, how often was each server blocked on disk I/O?
+
+SELECT machine_name,
+       COUNT(*) AS spikes
+FROM logs1
+WHERE machine_group = 'Servers'
+  AND cpu_wio > 0.99
+  AND log_time >= TIMESTAMP '2016-12-01 00:00:00'
+  AND log_time < TIMESTAMP '2017-01-01 00:00:00'
+GROUP BY machine_name
+ORDER BY spikes DESC
+LIMIT 10;
+
+
+-- Q1.5: Which externally reachable VMs have run low on memory?
+
+SELECT machine_name,
+       dt,
+       MIN(mem_free) AS mem_free_min
+FROM (
+  SELECT machine_name,
+         CAST(log_time AS DATE) AS dt,
+         mem_free
+  FROM logs1
+  WHERE machine_group = 'DMZ'
+    AND mem_free IS NOT NULL
+) AS r
+GROUP BY machine_name,
+         dt
+HAVING MIN(mem_free) < 10000
+ORDER BY machine_name,
+         dt;
+
+
+-- Q1.6: What is the total hourly network traffic across all file servers?
+
+SELECT dt,
+       hr,
+       SUM(net_in) AS net_in_sum,
+       SUM(net_out) AS net_out_sum,
+       SUM(net_in) + SUM(net_out) AS both_sum
+FROM (
+  SELECT CAST(log_time AS DATE) AS dt,
+         EXTRACT(HOUR FROM log_time) AS hr,
+         COALESCE(bytes_in, 0.0) / 1000000000.0 AS net_in,
+         COALESCE(bytes_out, 0.0) / 1000000000.0 AS net_out
+  FROM logs1
+  WHERE machine_name IN ('allsorts','andes','bigred','blackjack','bonbon',
+      'cadbury','chiclets','cotton','crows','dove','fireball','hearts','huey',
+      'lindt','milkduds','milkyway','mnm','necco','nerds','orbit','peeps',
+      'poprocks','razzles','runts','smarties','smuggler','spree','stride',
+      'tootsie','trident','wrigley','york')
+) AS r
+GROUP BY dt,
+         hr
+ORDER BY both_sum DESC
+LIMIT 10;
+
+
+-- Q2.1: Which requests have caused server errors within the past 2 weeks?
+
+SELECT *
+FROM logs2
+WHERE status_code >= 500
+  AND log_time >= TIMESTAMP '2012-12-18 00:00:00'
+ORDER BY log_time;
+
+
+-- Q2.2: During a specific 2-week period, was the user password file leaked?
+
+SELECT *
+FROM logs2
+WHERE status_code >= 200
+  AND status_code < 300
+  AND request LIKE '%/etc/passwd%'
+  AND log_time >= TIMESTAMP '2012-05-06 00:00:00'
+  AND log_time < TIMESTAMP '2012-05-20 00:00:00';
+
+
+-- Q2.3: What was the average path depth for top-level requests in the past month?
+
+SELECT top_level,
+       AVG(LENGTH(request) - LENGTH(REPLACE(request, '/', ''))) AS depth_avg
+FROM (
+  SELECT SUBSTRING(request FROM 1 FOR len) AS top_level,
+         request
+  FROM (
+    SELECT POSITION(SUBSTRING(request FROM 2), '/') AS len,
+           request
+    FROM logs2
+    WHERE status_code >= 200
+      AND status_code < 300
+      AND log_time >= TIMESTAMP '2012-12-01 00:00:00'
+  ) AS r
+  WHERE len > 0
+) AS s
+WHERE top_level IN ('/about','/courses','/degrees','/events',
+                    '/grad','/industry','/news','/people',
+                    '/publications','/research','/teaching','/ugrad')
+GROUP BY top_level
+ORDER BY top_level;
+
+
+-- Q2.4: During the last 3 months, which clients have made an excessive number of requests?
+
+SELECT client_ip,
+       COUNT(*) AS num_requests
+FROM logs2
+WHERE log_time >= TIMESTAMP '2012-10-01 00:00:00'
+GROUP BY client_ip
+HAVING COUNT(*) >= 100000
+ORDER BY num_requests DESC;
+
+
+-- Q2.5: What are the daily unique visitors?
+
+SELECT dt,
+       COUNT(DISTINCT client_ip)
+FROM (
+  SELECT CAST(log_time AS DATE) AS dt,
+         client_ip
+  FROM logs2
+) AS r
+GROUP BY dt
+ORDER BY dt;
+
+
+-- Q2.6: What are the average and maximum data transfer rates (Gbps)?
+
+SELECT AVG(transfer) / 125000000.0 AS transfer_avg,
+       MAX(transfer) / 125000000.0 AS transfer_max
+FROM (
+  SELECT log_time,
+         SUM(object_size) AS transfer
+  FROM logs2
+  GROUP BY log_time
+) AS r;
+
+
+-- Q3.1: Did the indoor temperature reach freezing over the weekend?
+
+SELECT *
+FROM logs3
+WHERE event_type = 'temperature'
+  AND event_value <= 32.0
+  AND log_time >= '2019-11-29 17:00:00.000';
+
+
+-- Q3.4: Over the past 6 months, how frequently were each door opened?
+
+SELECT device_name,
+       device_floor,
+       COUNT(*) AS ct
+FROM logs3
+WHERE event_type = 'door_open'
+  AND log_time >= '2019-06-01 00:00:00.000'
+GROUP BY device_name,
+         device_floor
+ORDER BY ct DESC;
+
+
+-- Q3.5: Where in the building do large temperature variations occur in winter and summer?
+
+WITH temperature AS (
+  SELECT dt,
+         device_name,
+         device_type,
+         device_floor
+  FROM (
+    SELECT dt,
+           hr,
+           device_name,
+           device_type,
+           device_floor,
+           AVG(event_value) AS temperature_hourly_avg
+    FROM (
+      SELECT CAST(log_time AS DATE) AS dt,
+             EXTRACT(HOUR FROM log_time) AS hr,
+             device_name,
+             device_type,
+             device_floor,
+             event_value
+      FROM logs3
+      WHERE event_type = 'temperature'
+    ) AS r
+    GROUP BY dt,
+             hr,
+             device_name,
+             device_type,
+             device_floor
+  ) AS s
+  GROUP BY dt,
+           device_name,
+           device_type,
+           device_floor
+  HAVING MAX(temperature_hourly_avg) - MIN(temperature_hourly_avg) >= 25.0
+)
+SELECT DISTINCT device_name,
+       device_type,
+       device_floor,
+       'WINTER'
+FROM temperature
+WHERE dt >= DATE '2018-12-01'
+  AND dt < DATE '2019-03-01'
+UNION
+SELECT DISTINCT device_name,
+       device_type,
+       device_floor,
+       'SUMMER'
+FROM temperature
+WHERE dt >= DATE '2019-06-01'
+  AND dt < DATE '2019-09-01';
+
+
+-- Q3.6: For each device category, what are the monthly power consumption metrics?
+
+SELECT yr,
+       mo,
+       SUM(coffee_hourly_avg) AS coffee_monthly_sum,
+       AVG(coffee_hourly_avg) AS coffee_monthly_avg,
+       SUM(printer_hourly_avg) AS printer_monthly_sum,
+       AVG(printer_hourly_avg) AS printer_monthly_avg,
+       SUM(projector_hourly_avg) AS projector_monthly_sum,
+       AVG(projector_hourly_avg) AS projector_monthly_avg,
+       SUM(vending_hourly_avg) AS vending_monthly_sum,
+       AVG(vending_hourly_avg) AS vending_monthly_avg
+FROM (
+  SELECT dt,
+         yr,
+         mo,
+         hr,
+         AVG(coffee) AS coffee_hourly_avg,
+         AVG(printer) AS printer_hourly_avg,
+         AVG(projector) AS projector_hourly_avg,
+         AVG(vending) AS vending_hourly_avg
+  FROM (
+    SELECT CAST(log_time AS DATE) AS dt,
+           EXTRACT(YEAR FROM log_time) AS yr,
+           EXTRACT(MONTH FROM log_time) AS mo,
+           EXTRACT(HOUR FROM log_time) AS hr,
+           CASE WHEN device_name LIKE 'coffee%' THEN event_value END AS coffee,
+           CASE WHEN device_name LIKE 'printer%' THEN event_value END AS printer,
+           CASE WHEN device_name LIKE 'projector%' THEN event_value END AS projector,
+           CASE WHEN device_name LIKE 'vending%' THEN event_value END AS vending
+    FROM logs3
+    WHERE device_type = 'meter'
+  ) AS r
+  GROUP BY dt,
+           yr,
+           mo,
+           hr
+) AS s
+GROUP BY yr,
+         mo
+ORDER BY yr,
+         mo;
+```
+
+Данные также доступны для работы с интерактивными запросами через [Playground](https://gh-api.clickhouse.tech/play?user=play), [пример](https://gh-api.clickhouse.tech/play?user=play#U0VMRUNUIG1hY2hpbmVfbmFtZSwKICAgICAgIE1JTihjcHUpIEFTIGNwdV9taW4sCiAgICAgICBNQVgoY3B1KSBBUyBjcHVfbWF4LAogICAgICAgQVZHKGNwdSkgQVMgY3B1X2F2ZywKICAgICAgIE1JTihuZXRfaW4pIEFTIG5ldF9pbl9taW4sCiAgICAgICBNQVgobmV0X2luKSBBUyBuZXRfaW5fbWF4LAogICAgICAgQVZHKG5ldF9pbikgQVMgbmV0X2luX2F2ZywKICAgICAgIE1JTihuZXRfb3V0KSBBUyBuZXRfb3V0X21pbiwKICAgICAgIE1BWChuZXRfb3V0KSBBUyBuZXRfb3V0X21heCwKICAgICAgIEFWRyhuZXRfb3V0KSBBUyBuZXRfb3V0X2F2ZwpGUk9NICgKICBTRUxFQ1QgbWFjaGluZV9uYW1lLAogICAgICAgICBDT0FMRVNDRShjcHVfdXNlciwgMC4wKSBBUyBjcHUsCiAgICAgICAgIENPQUxFU0NFKGJ5dGVzX2luLCAwLjApIEFTIG5ldF9pbiwKICAgICAgICAgQ09BTEVTQ0UoYnl0ZXNfb3V0LCAwLjApIEFTIG5ldF9vdXQKICBGUk9NIG1nYmVuY2gubG9nczEKICBXSEVSRSBtYWNoaW5lX25hbWUgSU4gKCdhbmFuc2knLCdhcmFnb2cnLCd1cmQnKQogICAgQU5EIGxvZ190aW1lID49IFRJTUVTVEFNUCAnMjAxNy0wMS0xMSAwMDowMDowMCcKKSBBUyByCkdST1VQIEJZIG1hY2hpbmVfbmFtZQ==).
+
diff --git a/docs/ru/getting-started/example-datasets/cell-towers.md b/docs/ru/getting-started/example-datasets/cell-towers.md
new file mode 100644
index 00000000000..a5524248019
--- /dev/null
+++ b/docs/ru/getting-started/example-datasets/cell-towers.md
@@ -0,0 +1,128 @@
+---
+toc_priority: 21
+toc_title: Вышки сотовой связи
+---
+
+# Вышки сотовой связи {#cell-towers}
+
+Источник этого набора данных (dataset) - самая большая в мире открытая база данных о сотовых вышках - [OpenCellid](https://www.opencellid.org/). К 2021-му году здесь накопилось более, чем 40 миллионов записей о сотовых вышках (GSM, LTE, UMTS, и т.д.) по всему миру с их географическими координатами и метаданными (код страны, сети, и т.д.).
+
+OpenCelliD Project имеет лицензию Creative Commons Attribution-ShareAlike 4.0 International License, и мы распространяем снэпшот набора данных по условиям этой же лицензии. После авторизации можно загрузить последнюю версию набора данных.
+
+## Как получить набор данных {#get-the-dataset}
+
+1. Загрузите снэпшот набора данных за февраль 2021 [отсюда](https://datasets.clickhouse.tech/cell_towers.csv.xz) (729 MB).
+
+2. Если нужно, проверьте полноту и целостность при помощи команды:
+
+```
+md5sum cell_towers.csv.xz
+8cf986f4a0d9f12c6f384a0e9192c908  cell_towers.csv.xz
+```
+
+3. Распакуйте набор данных при помощи команды:
+
+```
+xz -d cell_towers.csv.xz
+```
+
+4. Создайте таблицу:
+
+```
+CREATE TABLE cell_towers
+(
+    radio Enum8('' = 0, 'CDMA' = 1, 'GSM' = 2, 'LTE' = 3, 'NR' = 4, 'UMTS' = 5),
+    mcc UInt16,
+    net UInt16,
+    area UInt16,
+    cell UInt64,
+    unit Int16,
+    lon Float64,
+    lat Float64,
+    range UInt32,
+    samples UInt32,
+    changeable UInt8,
+    created DateTime,
+    updated DateTime,
+    averageSignal UInt8
+)
+ENGINE = MergeTree ORDER BY (radio, mcc, net, created);
+```
+
+5. Вставьте данные:
+```
+clickhouse-client --query "INSERT INTO cell_towers FORMAT CSVWithNames" < cell_towers.csv
+```
+
+## Примеры {#examples}
+
+1. Количество вышек по типам:
+
+```
+SELECT radio, count() AS c FROM cell_towers GROUP BY radio ORDER BY c DESC
+
+┌─radio─┬────────c─┐
+│ UMTS  │ 20686487 │
+│ LTE   │ 12101148 │
+│ GSM   │  9931312 │
+│ CDMA  │   556344 │
+│ NR    │      867 │
+└───────┴──────────┘
+
+5 rows in set. Elapsed: 0.011 sec. Processed 43.28 million rows, 43.28 MB (3.83 billion rows/s., 3.83 GB/s.)
+```
+
+2. Количество вышек по [мобильному коду страны (MCC)](https://ru.wikipedia.org/wiki/Mobile_Country_Code):
+
+```
+SELECT mcc, count() FROM cell_towers GROUP BY mcc ORDER BY count() DESC LIMIT 10
+
+┌─mcc─┬─count()─┐
+│ 310 │ 5024650 │
+│ 262 │ 2622423 │
+│ 250 │ 1953176 │
+│ 208 │ 1891187 │
+│ 724 │ 1836150 │
+│ 404 │ 1729151 │
+│ 234 │ 1618924 │
+│ 510 │ 1353998 │
+│ 440 │ 1343355 │
+│ 311 │ 1332798 │
+└─────┴─────────┘
+
+10 rows in set. Elapsed: 0.019 sec. Processed 43.28 million rows, 86.55 MB (2.33 billion rows/s., 4.65 GB/s.)
+```
+
+Можно увидеть, что по количеству вышек лидируют следующие страны: США, Германия, Россия.
+
+Вы также можете создать [внешний словарь](../../sql-reference/dictionaries/external-dictionaries/external-dicts.md) в ClickHouse для того, чтобы расшифровать эти значения.
+
+## Пример использования {#use-case}
+
+Рассмотрим применение функции `pointInPolygon`.
+
+1. Создаем таблицу, в которой будем хранить многоугольники:
+
+```
+CREATE TEMPORARY TABLE moscow (polygon Array(Tuple(Float64, Float64)));
+```
+
+2. Очертания Москвы выглядят приблизительно так ("Новая Москва" в них не включена):
+
+```
+INSERT INTO moscow VALUES ([(37.84172564285271, 55.78000432402266), (37.8381207618713, 55.775874525970494), (37.83979446823122, 55.775626746008065), (37.84243326983639, 55.77446586811748), (37.84262672750849, 55.771974101091104), (37.84153238623039, 55.77114545193181), (37.841124690460184, 55.76722010265554), (37.84239076983644, 55.76654891107098), (37.842283558197025, 55.76258709833121), (37.8421759312134, 55.758073999993734), (37.84198330422974, 55.75381499999371), (37.8416827275085, 55.749277102484484), (37.84157576190186, 55.74794544108413), (37.83897929098507, 55.74525257875241), (37.83739676451868, 55.74404373042019), (37.838732481460525, 55.74298009816793), (37.841183997352545, 55.743060321833575), (37.84097476190185, 55.73938799999373), (37.84048155819702, 55.73570799999372), (37.840095812164286, 55.73228210777237), (37.83983814285274, 55.73080491981639), (37.83846476321406, 55.729799917464675), (37.83835745269769, 55.72919751082619), (37.838636380279524, 55.72859509486539), (37.8395161005249, 55.727705075632784), (37.83897964285276, 55.722727886185154), (37.83862557539366, 55.72034817326636), (37.83559735744853, 55.71944437307499), (37.835370708803126, 55.71831419154461), (37.83738169402022, 55.71765218986692), (37.83823396494291, 55.71691750159089), (37.838056931213345, 55.71547311301385), (37.836812846557606, 55.71221445615604), (37.83522525396725, 55.709331054395555), (37.83269301586908, 55.70953687463627), (37.829667367706236, 55.70903403789297), (37.83311126588435, 55.70552351822608), (37.83058993121339, 55.70041317726053), (37.82983872750851, 55.69883771404813), (37.82934501586913, 55.69718947487017), (37.828926414016685, 55.69504441658371), (37.82876530422971, 55.69287499999378), (37.82894754100031, 55.690759754047335), (37.827697554878185, 55.68951421135665), (37.82447346292115, 55.68965045405069), (37.83136543914793, 55.68322046195302), (37.833554015869154, 55.67814012759211), (37.83544184655761, 55.67295011628339), (37.837480388885474, 55.6672498719639), (37.838960677246064, 55.66316274139358), (37.83926093121332, 55.66046999999383), (37.839025050262435, 55.65869897264431), (37.83670784390257, 55.65794084879904), (37.835656529083245, 55.65694309303843), (37.83704060449217, 55.65689306460552), (37.83696819873806, 55.65550363526252), (37.83760389616388, 55.65487847246661), (37.83687972750851, 55.65356745541324), (37.83515216004943, 55.65155951234079), (37.83312418518067, 55.64979413590619), (37.82801726983639, 55.64640836412121), (37.820614174591, 55.64164525405531), (37.818908190475426, 55.6421883258084), (37.81717543386075, 55.64112490388471), (37.81690987037274, 55.63916106913107), (37.815099354492155, 55.637925371757085), (37.808769150787356, 55.633798276884455), (37.80100123544311, 55.62873670012244), (37.79598013491824, 55.62554336109055), (37.78634567724606, 55.62033499605651), (37.78334147619623, 55.618768681480326), (37.77746201055901, 55.619855533402706), (37.77527329626457, 55.61909966711279), (37.77801986242668, 55.618770300976294), (37.778212973541216, 55.617257701952106), (37.77784818518065, 55.61574504433011), (37.77016867724609, 55.61148576294007), (37.760191219573976, 55.60599579539028), (37.75338926983641, 55.60227892751446), (37.746329965606634, 55.59920577639331), (37.73939925396728, 55.59631430313617), (37.73273665739439, 55.5935318803559), (37.7299954450912, 55.59350760316188), (37.7268679946899, 55.59469840523759), (37.72626726983634, 55.59229549697373), (37.7262673598022, 55.59081598950582), (37.71897193121335, 55.5877595845419), (37.70871550793456, 55.58393177431724), (37.700497489410374, 55.580917323756644), (37.69204305026244, 55.57778089778455), (37.68544477378839, 55.57815154690915), (37.68391050793454, 55.57472945079756), (37.678803592590306, 55.57328235936491), (37.6743402539673, 55.57255251445782), (37.66813862698363, 55.57216388774464), (37.617927457672096, 55.57505691895805), (37.60443099999999, 55.5757737568051), (37.599683515869145, 55.57749105910326), (37.59754177842709, 55.57796291823627), (37.59625834786988, 55.57906686095235), (37.59501783265684, 55.57746616444403), (37.593090671936025, 55.57671634534502), (37.587018007904, 55.577944600233785), (37.578692203704804, 55.57982895000019), (37.57327546607398, 55.58116294118248), (37.57385012109279, 55.581550362779), (37.57399562266922, 55.5820107079112), (37.5735356072979, 55.58226289171689), (37.57290393054962, 55.582393529795155), (37.57037722355653, 55.581919415056234), (37.5592298306885, 55.584471614867844), (37.54189249206543, 55.58867650795186), (37.5297256269836, 55.59158133551745), (37.517837865081766, 55.59443656218868), (37.51200186508174, 55.59635625174229), (37.506808949737554, 55.59907823904434), (37.49820432275389, 55.6062944994944), (37.494406071441674, 55.60967103463367), (37.494760001358024, 55.61066689753365), (37.49397137107085, 55.61220931698269), (37.49016528606031, 55.613417718449064), (37.48773249206542, 55.61530616333343), (37.47921386508177, 55.622640129112334), (37.470652153442394, 55.62993723476164), (37.46273446298218, 55.6368075123157), (37.46350692265317, 55.64068225239439), (37.46050283203121, 55.640794546982576), (37.457627470916734, 55.64118904154646), (37.450718034393326, 55.64690488145138), (37.44239252645875, 55.65397824729769), (37.434587576721185, 55.66053543155961), (37.43582144975277, 55.661693766520735), (37.43576786245721, 55.662755031737014), (37.430982915344174, 55.664610641628116), (37.428547447097685, 55.66778515273695), (37.42945134592044, 55.668633314343566), (37.42859571562949, 55.66948145750025), (37.4262836402282, 55.670813882451405), (37.418709037048295, 55.6811141674414), (37.41922139651101, 55.68235377885389), (37.419218771842885, 55.68359335082235), (37.417196501327446, 55.684375235224735), (37.41607020370478, 55.68540557585352), (37.415640857147146, 55.68686637150793), (37.414632153442334, 55.68903015131686), (37.413344899475064, 55.690896881757396), (37.41171432275391, 55.69264232162232), (37.40948282275393, 55.69455101638112), (37.40703674603271, 55.69638690385348), (37.39607169577025, 55.70451821283731), (37.38952706878662, 55.70942491932811), (37.387778313491815, 55.71149057784176), (37.39049275399779, 55.71419814298992), (37.385557272491454, 55.7155489617061), (37.38388335714726, 55.71849856042102), (37.378368238098155, 55.7292763261685), (37.37763597123337, 55.730845879211614), (37.37890062088197, 55.73167906388319), (37.37750451918789, 55.734703664681774), (37.375610832015965, 55.734851959522246), (37.3723813571472, 55.74105626086403), (37.37014935714723, 55.746115620904355), (37.36944173016362, 55.750883999993725), (37.36975304365541, 55.76335905525834), (37.37244070571134, 55.76432079697595), (37.3724259757175, 55.76636979670426), (37.369922155757884, 55.76735417953104), (37.369892695770275, 55.76823419316575), (37.370214730163575, 55.782312184391266), (37.370493611114505, 55.78436801120489), (37.37120164550783, 55.78596427165359), (37.37284851456452, 55.7874378183096), (37.37608325135799, 55.7886695054807), (37.3764587460632, 55.78947647305964), (37.37530000265506, 55.79146512926804), (37.38235915344241, 55.79899647809345), (37.384344043655396, 55.80113596939471), (37.38594269577028, 55.80322699999366), (37.38711208598329, 55.804919036911976), (37.3880239841309, 55.806610999993666), (37.38928977249147, 55.81001864976979), (37.39038389947512, 55.81348641242801), (37.39235781481933, 55.81983538336746), (37.393709457672124, 55.82417822811877), (37.394685720901464, 55.82792275755836), (37.39557615344238, 55.830447148154136), (37.39844478226658, 55.83167107969975), (37.40019761214057, 55.83151823557964), (37.400398790382326, 55.83264967594742), (37.39659544313046, 55.83322180909622), (37.39667059524539, 55.83402792148566), (37.39682089947515, 55.83638877400216), (37.39643489154053, 55.83861656112751), (37.3955338994751, 55.84072348043264), (37.392680272491454, 55.84502158126453), (37.39241188227847, 55.84659117913199), (37.392529730163616, 55.84816071336481), (37.39486835714723, 55.85288092980303), (37.39873052645878, 55.859893456073635), (37.40272161111449, 55.86441833633205), (37.40697072750854, 55.867579567544375), (37.410007082016016, 55.868369880337), (37.4120992989502, 55.86920843741314), (37.412668021163924, 55.87055369615854), (37.41482461111453, 55.87170587948249), (37.41862266137694, 55.873183961039565), (37.42413732540892, 55.874879126654704), (37.4312182698669, 55.875614937236705), (37.43111093783558, 55.8762723478417), (37.43332105622856, 55.87706546369396), (37.43385747619623, 55.87790681284802), (37.441303050262405, 55.88027084462084), (37.44747234260555, 55.87942070143253), (37.44716141796871, 55.88072960917233), (37.44769797085568, 55.88121221323979), (37.45204320500181, 55.882080694420715), (37.45673176190186, 55.882346110794586), (37.463383999999984, 55.88252729504517), (37.46682797486874, 55.88294937719063), (37.470014457672086, 55.88361266759345), (37.47751410450743, 55.88546991372396), (37.47860317658232, 55.88534929207307), (37.48165826025772, 55.882563306475106), (37.48316434442331, 55.8815803226785), (37.483831555817645, 55.882427612793315), (37.483182967125686, 55.88372791409729), (37.483092277908824, 55.88495581062434), (37.4855716508179, 55.8875561994203), (37.486440636245746, 55.887827444039566), (37.49014203439328, 55.88897899871799), (37.493210285705544, 55.890208937135604), (37.497512451065035, 55.891342397444696), (37.49780744510645, 55.89174030252967), (37.49940333499519, 55.89239745507079), (37.50018383334346, 55.89339220941865), (37.52421672750851, 55.903869074155224), (37.52977457672118, 55.90564076517974), (37.53503220370484, 55.90661661218259), (37.54042858064267, 55.90714113744566), (37.54320461007303, 55.905645048442985), (37.545686966066306, 55.906608607018505), (37.54743976120755, 55.90788552162358), (37.55796999999999, 55.90901557907218), (37.572711542327866, 55.91059395704873), (37.57942799999998, 55.91073854155573), (37.58502865872187, 55.91009969268444), (37.58739968913264, 55.90794809960554), (37.59131567193598, 55.908713267595054), (37.612687423278814, 55.902866854295375), (37.62348079629517, 55.90041967242986), (37.635797880950896, 55.898141151686396), (37.649487626983664, 55.89639275532968), (37.65619302513125, 55.89572360207488), (37.66294133862307, 55.895295577183965), (37.66874564418033, 55.89505457604897), (37.67375601586915, 55.89254677027454), (37.67744661901856, 55.8947775867987), (37.688347, 55.89450045676125), (37.69480554232789, 55.89422926332761), (37.70107096560668, 55.89322256101114), (37.705962965606716, 55.891763491662616), (37.711885134918205, 55.889110234998974), (37.71682005026245, 55.886577568759876), (37.7199315476074, 55.88458159806678), (37.72234560316464, 55.882281005794134), (37.72364385977171, 55.8809452036196), (37.725371142837474, 55.8809722706006), (37.727870902099546, 55.88037213862385), (37.73394330422971, 55.877941504088696), (37.745339592590376, 55.87208120378722), (37.75525267724611, 55.86703807949492), (37.76919976190188, 55.859821640197474), (37.827835219574, 55.82962968399116), (37.83341438888553, 55.82575289922351), (37.83652584655761, 55.82188784027888), (37.83809213491821, 55.81612575504693), (37.83605359521481, 55.81460347077685), (37.83632178569025, 55.81276696067908), (37.838623105812026, 55.811486181656385), (37.83912198147584, 55.807329380532785), (37.839079078033414, 55.80510270463816), (37.83965844708251, 55.79940712529036), (37.840581150787344, 55.79131399999368), (37.84172564285271, 55.78000432402266)]);
+```
+
+3. Проверяем, сколько сотовых вышек находится в Москве:
+
+```
+SELECT count() FROM cell_towers WHERE pointInPolygon((lon, lat), (SELECT * FROM moscow))
+
+┌─count()─┐
+│  310463 │
+└─────────┘
+
+1 rows in set. Elapsed: 0.067 sec. Processed 43.28 million rows, 692.42 MB (645.83 million rows/s., 10.33 GB/s.)
+```
+
+Вы можете протестировать другие запросы с помощью интерактивного ресурса [Playground](https://gh-api.clickhouse.tech/play?user=play). Например, [вот так](https://gh-api.clickhouse.tech/play?user=play#U0VMRUNUIG1jYywgY291bnQoKSBGUk9NIGNlbGxfdG93ZXJzIEdST1VQIEJZIG1jYyBPUkRFUiBCWSBjb3VudCgpIERFU0M=). Однако, обратите внимание, что здесь нельзя создавать временные таблицы.
diff --git a/docs/ru/getting-started/example-datasets/criteo.md b/docs/ru/getting-started/example-datasets/criteo.md
index 7a58da5b695..bfa428a0e1c 100644
--- a/docs/ru/getting-started/example-datasets/criteo.md
+++ b/docs/ru/getting-started/example-datasets/criteo.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 18
-toc_title: "\u0422\u0435\u0440\u0430\u0431\u0430\u0439\u0442\u0020\u043b\u043e\u0433\u043e\u0432\u0020\u043a\u043b\u0438\u043a\u043e\u0432\u0020\u043e\u0442\u0020\u0043\u0072\u0069\u0074\u0065\u006f"
+toc_title: "Терабайт логов кликов от Criteo"
 ---
 
 # Терабайт логов кликов от Criteo {#terabait-logov-klikov-ot-criteo}
@@ -76,4 +76,3 @@ INSERT INTO criteo SELECT date, clicked, int1, int2, int3, int4, int5, int6, int
 DROP TABLE criteo_log;
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/getting_started/example_datasets/criteo/) <!--hide-->
diff --git a/docs/ru/getting-started/example-datasets/index.md b/docs/ru/getting-started/example-datasets/index.md
index eff944a7980..756b3a75dee 100644
--- a/docs/ru/getting-started/example-datasets/index.md
+++ b/docs/ru/getting-started/example-datasets/index.md
@@ -1,7 +1,7 @@
 ---
-toc_folder_title: "\u0422\u0435\u0441\u0442\u043e\u0432\u044b\u0435\u0020\u043c\u0430\u0441\u0441\u0438\u0432\u044b\u0020\u0434\u0430\u043d\u043d\u044b\u0445"
+toc_folder_title: "Тестовые массивы данных"
 toc_priority: 14
-toc_title: "\u0412\u0432\u0435\u0434\u0435\u043d\u0438\u0435"
+toc_title: "Введение"
 ---
 
 # Тестовые массивы данных {#testovye-massivy-dannykh}
@@ -16,5 +16,5 @@ toc_title: "\u0412\u0432\u0435\u0434\u0435\u043d\u0438\u0435"
 -   [AMPLab Big Data Benchmark](amplab-benchmark.md)
 -   [Данные о такси в Нью-Йорке](nyc-taxi.md)
 -   [OnTime](ontime.md)
+-   [Вышки сотовой связи](../../getting-started/example-datasets/cell-towers.md)
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/getting_started/example_datasets) <!--hide-->
diff --git a/docs/ru/getting-started/example-datasets/metrica.md b/docs/ru/getting-started/example-datasets/metrica.md
index 3246eb5178c..7deacdb836c 100644
--- a/docs/ru/getting-started/example-datasets/metrica.md
+++ b/docs/ru/getting-started/example-datasets/metrica.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 15
-toc_title: "\u0410\u043d\u043e\u043d\u0438\u043c\u0438\u0437\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u044b\u0435\u0020\u0434\u0430\u043d\u043d\u044b\u0435\u0020\u042f\u043d\u0434\u0435\u043a\u0441\u002e\u041c\u0435\u0442\u0440\u0438\u043a\u0438"
+toc_title: "Анонимизированные данные Яндекс.Метрики"
 ---
 
 # Анонимизированные данные Яндекс.Метрики {#anonimizirovannye-dannye-iandeks-metriki}
diff --git a/docs/ru/getting-started/example-datasets/nyc-taxi.md b/docs/ru/getting-started/example-datasets/nyc-taxi.md
index a4472751a99..38a60ed1b2d 100644
--- a/docs/ru/getting-started/example-datasets/nyc-taxi.md
+++ b/docs/ru/getting-started/example-datasets/nyc-taxi.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 20
-toc_title: "\u0414\u0430\u043d\u043d\u044b\u0435\u0020\u043e\u0020\u0442\u0430\u043a\u0441\u0438\u0020\u0432\u0020\u041d\u044c\u044e\u002d\u0419\u043e\u0440\u043a\u0435"
+toc_title: "Данные о такси в Нью-Йорке"
 ---
 
 # Данные о такси в Нью-Йорке {#dannye-o-taksi-v-niu-iorke}
@@ -390,4 +390,3 @@ Q4: 0.072 sec.
 | 3        | 0.212 | 0.438 | 0.733 | 1.241 |
 | 140      | 0.028 | 0.043 | 0.051 | 0.072 |
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/getting_started/example_datasets/nyc_taxi/) <!--hide-->
diff --git a/docs/ru/getting-started/example-datasets/ontime.md b/docs/ru/getting-started/example-datasets/ontime.md
index 41a1c0d3142..be5b1cd1b70 100644
--- a/docs/ru/getting-started/example-datasets/ontime.md
+++ b/docs/ru/getting-started/example-datasets/ontime.md
@@ -407,4 +407,3 @@ LIMIT 10;
 -   https://www.percona.com/blog/2016/01/07/apache-spark-with-air-ontime-performance-data/
 -   http://nickmakos.blogspot.ru/2012/08/analyzing-air-traffic-performance-with.html
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/getting_started/example_datasets/ontime/) <!--hide-->
diff --git a/docs/ru/getting-started/example-datasets/recipes.md b/docs/ru/getting-started/example-datasets/recipes.md
new file mode 100644
index 00000000000..75e385150e8
--- /dev/null
+++ b/docs/ru/getting-started/example-datasets/recipes.md
@@ -0,0 +1,342 @@
+---
+toc_priority: 16
+toc_title: Набор данных кулинарных рецептов
+---
+
+# Набор данных кулинарных рецептов
+
+Набор данных кулинарных рецептов от RecipeNLG доступен для загрузки [здесь](https://recipenlg.cs.put.poznan.pl/dataset). Он содержит 2.2 миллиона рецептов, а его размер чуть меньше 1 ГБ.
+
+## Загрузите и распакуйте набор данных
+
+1. Перейдите на страницу загрузки [https://recipenlg.cs.put.poznan.pl/dataset](https://recipenlg.cs.put.poznan.pl/dataset).
+1. Примите Правила и условия и скачайте zip-архив с набором данных.
+1. Распакуйте zip-архив и вы получите файл `full_dataset.csv`.
+
+## Создайте таблицу
+
+Запустите клиент ClickHouse и выполните следующий запрос для создания таблицы `recipes`:
+
+``` sql
+CREATE TABLE recipes
+(
+    title String,
+    ingredients Array(String),
+    directions Array(String),
+    link String,
+    source LowCardinality(String),
+    NER Array(String)
+) ENGINE = MergeTree ORDER BY title;
+```
+
+## Добавьте данные в таблицу
+
+Чтобы добавить данные из файла `full_dataset.csv` в таблицу `recipes`, выполните команду:
+
+``` bash
+clickhouse-client --query "
+    INSERT INTO recipes
+    SELECT
+        title,
+        JSONExtract(ingredients, 'Array(String)'),
+        JSONExtract(directions, 'Array(String)'),
+        link,
+        source,
+        JSONExtract(NER, 'Array(String)')
+    FROM input('num UInt32, title String, ingredients String, directions String, link String, source LowCardinality(String), NER String')
+    FORMAT CSVWithNames
+" --input_format_with_names_use_header 0 --format_csv_allow_single_quote 0 --input_format_allow_errors_num 10 < full_dataset.csv
+```
+
+Это один из примеров анализа пользовательских CSV-файлов с применением специальных настроек.
+
+Пояснение:
+-   набор данных представлен в формате CSV и требует некоторой предварительной обработки при вставке. Для предварительной обработки используется табличная функция [input](../../sql-reference/table-functions/input.md);
+-   структура CSV-файла задается в аргументе табличной функции `input`;
+-   поле `num` (номер строки) не нужно — оно считывается из файла, но игнорируется;
+-   при загрузке используется `FORMAT CSVWithNames`, но заголовок в CSV будет проигнорирован (параметром командной строки `--input_format_with_names_use_header 0`), поскольку заголовок не содержит имени первого поля;
+-   в файле CSV для разделения строк используются только двойные кавычки. Но некоторые строки не заключены в двойные кавычки, и чтобы одинарная кавычка не рассматривалась как заключающая, используется параметр `--format_csv_allow_single_quote 0`;
+-   некоторые строки из CSV не могут быть считаны корректно, поскольку они начинаются с символов`\M/`, тогда как в CSV начинаться с обратной косой черты могут только символы `\N`, которые распознаются как `NULL` в SQL. Поэтому используется параметр `--input_format_allow_errors_num 10`, разрешающий пропустить до десяти некорректных записей;
+-   массивы `ingredients`, `directions` и `NER` представлены в необычном виде: они сериализуются в строку формата JSON, а затем помещаются в CSV — тогда они могут считываться и обрабатываться как обычные строки (`String`). Чтобы преобразовать строку в массив, используется функция [JSONExtract](../../sql-reference/functions/json-functions.md).
+
+## Проверьте добавленные данные
+
+Чтобы проверить добавленные данные, подсчитайте количество строк в таблице:
+
+Запрос:
+
+``` sql
+SELECT count() FROM recipes;
+```
+
+Результат:
+
+``` text
+┌─count()─┐
+│ 2231141 │
+└─────────┘
+```
+
+## Примеры запросов
+
+### Самые упоминаемые ингридиенты в рецептах:
+
+В этом примере вы узнаете, как развернуть массив в набор строк с помощью функции  [arrayJoin](../../sql-reference/functions/array-join.md).
+
+Запрос:
+
+``` sql
+SELECT
+    arrayJoin(NER) AS k,
+    count() AS c
+FROM recipes
+GROUP BY k
+ORDER BY c DESC
+LIMIT 50
+```
+
+Результат:
+
+``` text
+┌─k────────────────────┬──────c─┐
+│ salt                 │ 890741 │
+│ sugar                │ 620027 │
+│ butter               │ 493823 │
+│ flour                │ 466110 │
+│ eggs                 │ 401276 │
+│ onion                │ 372469 │
+│ garlic               │ 358364 │
+│ milk                 │ 346769 │
+│ water                │ 326092 │
+│ vanilla              │ 270381 │
+│ olive oil            │ 197877 │
+│ pepper               │ 179305 │
+│ brown sugar          │ 174447 │
+│ tomatoes             │ 163933 │
+│ egg                  │ 160507 │
+│ baking powder        │ 148277 │
+│ lemon juice          │ 146414 │
+│ Salt                 │ 122557 │
+│ cinnamon             │ 117927 │
+│ sour cream           │ 116682 │
+│ cream cheese         │ 114423 │
+│ margarine            │ 112742 │
+│ celery               │ 112676 │
+│ baking soda          │ 110690 │
+│ parsley              │ 102151 │
+│ chicken              │ 101505 │
+│ onions               │  98903 │
+│ vegetable oil        │  91395 │
+│ oil                  │  85600 │
+│ mayonnaise           │  84822 │
+│ pecans               │  79741 │
+│ nuts                 │  78471 │
+│ potatoes             │  75820 │
+│ carrots              │  75458 │
+│ pineapple            │  74345 │
+│ soy sauce            │  70355 │
+│ black pepper         │  69064 │
+│ thyme                │  68429 │
+│ mustard              │  65948 │
+│ chicken broth        │  65112 │
+│ bacon                │  64956 │
+│ honey                │  64626 │
+│ oregano              │  64077 │
+│ ground beef          │  64068 │
+│ unsalted butter      │  63848 │
+│ mushrooms            │  61465 │
+│ Worcestershire sauce │  59328 │
+│ cornstarch           │  58476 │
+│ green pepper         │  58388 │
+│ Cheddar cheese       │  58354 │
+└──────────────────────┴────────┘
+
+50 rows in set. Elapsed: 0.112 sec. Processed 2.23 million rows, 361.57 MB (19.99 million rows/s., 3.24 GB/s.)
+```
+
+### Самые сложные рецепты с клубникой
+
+Запрос:
+
+``` sql
+SELECT
+    title,
+    length(NER),
+    length(directions)
+FROM recipes
+WHERE has(NER, 'strawberry')
+ORDER BY length(directions) DESC
+LIMIT 10;
+```
+
+Результат:
+
+``` text
+┌─title────────────────────────────────────────────────────────────┬─length(NER)─┬─length(directions)─┐
+│ Chocolate-Strawberry-Orange Wedding Cake                         │          24 │                126 │
+│ Strawberry Cream Cheese Crumble Tart                             │          19 │                 47 │
+│ Charlotte-Style Ice Cream                                        │          11 │                 45 │
+│ Sinfully Good a Million Layers Chocolate Layer Cake, With Strawb │          31 │                 45 │
+│ Sweetened Berries With Elderflower Sherbet                       │          24 │                 44 │
+│ Chocolate-Strawberry Mousse Cake                                 │          15 │                 42 │
+│ Rhubarb Charlotte with Strawberries and Rum                      │          20 │                 42 │
+│ Chef Joey's Strawberry Vanilla Tart                              │           7 │                 37 │
+│ Old-Fashioned Ice Cream Sundae Cake                              │          17 │                 37 │
+│ Watermelon Cake                                                  │          16 │                 36 │
+└──────────────────────────────────────────────────────────────────┴─────────────┴────────────────────┘
+
+10 rows in set. Elapsed: 0.215 sec. Processed 2.23 million rows, 1.48 GB (10.35 million rows/s., 6.86 GB/s.)
+```
+
+В этом примере используется функция [has](../../sql-reference/functions/array-functions.md#hasarr-elem) для проверки вхождения элемента в массив, а также сортировка по количеству шагов (`length(directions)`).
+
+Существует свадебный торт, который требует целых 126 шагов для производства! Рассмотрим эти шаги:
+
+Запрос:
+
+``` sql
+SELECT arrayJoin(directions)
+FROM recipes
+WHERE title = 'Chocolate-Strawberry-Orange Wedding Cake';
+```
+
+Результат:
+
+``` text
+┌─arrayJoin(directions)───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
+│ Position 1 rack in center and 1 rack in bottom third of oven and preheat to 350F.                                                                                           │
+│ Butter one 5-inch-diameter cake pan with 2-inch-high sides, one 8-inch-diameter cake pan with 2-inch-high sides and one 12-inch-diameter cake pan with 2-inch-high sides.   │
+│ Dust pans with flour; line bottoms with parchment.                                                                                                                          │
+│ Combine 1/3 cup orange juice and 2 ounces unsweetened chocolate in heavy small saucepan.                                                                                    │
+│ Stir mixture over medium-low heat until chocolate melts.                                                                                                                    │
+│ Remove from heat.                                                                                                                                                           │
+│ Gradually mix in 1 2/3 cups orange juice.                                                                                                                                   │
+│ Sift 3 cups flour, 2/3 cup cocoa, 2 teaspoons baking soda, 1 teaspoon salt and 1/2 teaspoon baking powder into medium bowl.                                                 │
+│ using electric mixer, beat 1 cup (2 sticks) butter and 3 cups sugar in large bowl until blended (mixture will look grainy).                                                 │
+│ Add 4 eggs, 1 at a time, beating to blend after each.                                                                                                                       │
+│ Beat in 1 tablespoon orange peel and 1 tablespoon vanilla extract.                                                                                                          │
+│ Add dry ingredients alternately with orange juice mixture in 3 additions each, beating well after each addition.                                                            │
+│ Mix in 1 cup chocolate chips.                                                                                                                                               │
+│ Transfer 1 cup plus 2 tablespoons batter to prepared 5-inch pan, 3 cups batter to prepared 8-inch pan and remaining batter (about 6 cups) to 12-inch pan.                   │
+│ Place 5-inch and 8-inch pans on center rack of oven.                                                                                                                        │
+│ Place 12-inch pan on lower rack of oven.                                                                                                                                    │
+│ Bake cakes until tester inserted into center comes out clean, about 35 minutes.                                                                                             │
+│ Transfer cakes in pans to racks and cool completely.                                                                                                                        │
+│ Mark 4-inch diameter circle on one 6-inch-diameter cardboard cake round.                                                                                                    │
+│ Cut out marked circle.                                                                                                                                                      │
+│ Mark 7-inch-diameter circle on one 8-inch-diameter cardboard cake round.                                                                                                    │
+│ Cut out marked circle.                                                                                                                                                      │
+│ Mark 11-inch-diameter circle on one 12-inch-diameter cardboard cake round.                                                                                                  │
+│ Cut out marked circle.                                                                                                                                                      │
+│ Cut around sides of 5-inch-cake to loosen.                                                                                                                                  │
+│ Place 4-inch cardboard over pan.                                                                                                                                            │
+│ Hold cardboard and pan together; turn cake out onto cardboard.                                                                                                              │
+│ Peel off parchment.Wrap cakes on its cardboard in foil.                                                                                                                     │
+│ Repeat turning out, peeling off parchment and wrapping cakes in foil, using 7-inch cardboard for 8-inch cake and 11-inch cardboard for 12-inch cake.                        │
+│ Using remaining ingredients, make 1 more batch of cake batter and bake 3 more cake layers as described above.                                                               │
+│ Cool cakes in pans.                                                                                                                                                         │
+│ Cover cakes in pans tightly with foil.                                                                                                                                      │
+│ (Can be prepared ahead.                                                                                                                                                     │
+│ Let stand at room temperature up to 1 day or double-wrap all cake layers and freeze up to 1 week.                                                                           │
+│ Bring cake layers to room temperature before using.)                                                                                                                        │
+│ Place first 12-inch cake on its cardboard on work surface.                                                                                                                  │
+│ Spread 2 3/4 cups ganache over top of cake and all the way to edge.                                                                                                         │
+│ Spread 2/3 cup jam over ganache, leaving 1/2-inch chocolate border at edge.                                                                                                 │
+│ Drop 1 3/4 cups white chocolate frosting by spoonfuls over jam.                                                                                                             │
+│ Gently spread frosting over jam, leaving 1/2-inch chocolate border at edge.                                                                                                 │
+│ Rub some cocoa powder over second 12-inch cardboard.                                                                                                                        │
+│ Cut around sides of second 12-inch cake to loosen.                                                                                                                          │
+│ Place cardboard, cocoa side down, over pan.                                                                                                                                 │
+│ Turn cake out onto cardboard.                                                                                                                                               │
+│ Peel off parchment.                                                                                                                                                         │
+│ Carefully slide cake off cardboard and onto filling on first 12-inch cake.                                                                                                  │
+│ Refrigerate.                                                                                                                                                                │
+│ Place first 8-inch cake on its cardboard on work surface.                                                                                                                   │
+│ Spread 1 cup ganache over top all the way to edge.                                                                                                                          │
+│ Spread 1/4 cup jam over, leaving 1/2-inch chocolate border at edge.                                                                                                         │
+│ Drop 1 cup white chocolate frosting by spoonfuls over jam.                                                                                                                  │
+│ Gently spread frosting over jam, leaving 1/2-inch chocolate border at edge.                                                                                                 │
+│ Rub some cocoa over second 8-inch cardboard.                                                                                                                                │
+│ Cut around sides of second 8-inch cake to loosen.                                                                                                                           │
+│ Place cardboard, cocoa side down, over pan.                                                                                                                                 │
+│ Turn cake out onto cardboard.                                                                                                                                               │
+│ Peel off parchment.                                                                                                                                                         │
+│ Slide cake off cardboard and onto filling on first 8-inch cake.                                                                                                             │
+│ Refrigerate.                                                                                                                                                                │
+│ Place first 5-inch cake on its cardboard on work surface.                                                                                                                   │
+│ Spread 1/2 cup ganache over top of cake and all the way to edge.                                                                                                            │
+│ Spread 2 tablespoons jam over, leaving 1/2-inch chocolate border at edge.                                                                                                   │
+│ Drop 1/3 cup white chocolate frosting by spoonfuls over jam.                                                                                                                │
+│ Gently spread frosting over jam, leaving 1/2-inch chocolate border at edge.                                                                                                 │
+│ Rub cocoa over second 6-inch cardboard.                                                                                                                                     │
+│ Cut around sides of second 5-inch cake to loosen.                                                                                                                           │
+│ Place cardboard, cocoa side down, over pan.                                                                                                                                 │
+│ Turn cake out onto cardboard.                                                                                                                                               │
+│ Peel off parchment.                                                                                                                                                         │
+│ Slide cake off cardboard and onto filling on first 5-inch cake.                                                                                                             │
+│ Chill all cakes 1 hour to set filling.                                                                                                                                      │
+│ Place 12-inch tiered cake on its cardboard on revolving cake stand.                                                                                                         │
+│ Spread 2 2/3 cups frosting over top and sides of cake as a first coat.                                                                                                      │
+│ Refrigerate cake.                                                                                                                                                           │
+│ Place 8-inch tiered cake on its cardboard on cake stand.                                                                                                                    │
+│ Spread 1 1/4 cups frosting over top and sides of cake as a first coat.                                                                                                      │
+│ Refrigerate cake.                                                                                                                                                           │
+│ Place 5-inch tiered cake on its cardboard on cake stand.                                                                                                                    │
+│ Spread 3/4 cup frosting over top and sides of cake as a first coat.                                                                                                         │
+│ Refrigerate all cakes until first coats of frosting set, about 1 hour.                                                                                                      │
+│ (Cakes can be made to this point up to 1 day ahead; cover and keep refrigerate.)                                                                                            │
+│ Prepare second batch of frosting, using remaining frosting ingredients and following directions for first batch.                                                            │
+│ Spoon 2 cups frosting into pastry bag fitted with small star tip.                                                                                                           │
+│ Place 12-inch cake on its cardboard on large flat platter.                                                                                                                  │
+│ Place platter on cake stand.                                                                                                                                                │
+│ Using icing spatula, spread 2 1/2 cups frosting over top and sides of cake; smooth top.                                                                                     │
+│ Using filled pastry bag, pipe decorative border around top edge of cake.                                                                                                    │
+│ Refrigerate cake on platter.                                                                                                                                                │
+│ Place 8-inch cake on its cardboard on cake stand.                                                                                                                           │
+│ Using icing spatula, spread 1 1/2 cups frosting over top and sides of cake; smooth top.                                                                                     │
+│ Using pastry bag, pipe decorative border around top edge of cake.                                                                                                           │
+│ Refrigerate cake on its cardboard.                                                                                                                                          │
+│ Place 5-inch cake on its cardboard on cake stand.                                                                                                                           │
+│ Using icing spatula, spread 3/4 cup frosting over top and sides of cake; smooth top.                                                                                        │
+│ Using pastry bag, pipe decorative border around top edge of cake, spooning more frosting into bag if necessary.                                                             │
+│ Refrigerate cake on its cardboard.                                                                                                                                          │
+│ Keep all cakes refrigerated until frosting sets, about 2 hours.                                                                                                             │
+│ (Can be prepared 2 days ahead.                                                                                                                                              │
+│ Cover loosely; keep refrigerated.)                                                                                                                                          │
+│ Place 12-inch cake on platter on work surface.                                                                                                                              │
+│ Press 1 wooden dowel straight down into and completely through center of cake.                                                                                              │
+│ Mark dowel 1/4 inch above top of frosting.                                                                                                                                  │
+│ Remove dowel and cut with serrated knife at marked point.                                                                                                                   │
+│ Cut 4 more dowels to same length.                                                                                                                                           │
+│ Press 1 cut dowel back into center of cake.                                                                                                                                 │
+│ Press remaining 4 cut dowels into cake, positioning 3 1/2 inches inward from cake edges and spacing evenly.                                                                 │
+│ Place 8-inch cake on its cardboard on work surface.                                                                                                                         │
+│ Press 1 dowel straight down into and completely through center of cake.                                                                                                     │
+│ Mark dowel 1/4 inch above top of frosting.                                                                                                                                  │
+│ Remove dowel and cut with serrated knife at marked point.                                                                                                                   │
+│ Cut 3 more dowels to same length.                                                                                                                                           │
+│ Press 1 cut dowel back into center of cake.                                                                                                                                 │
+│ Press remaining 3 cut dowels into cake, positioning 2 1/2 inches inward from edges and spacing evenly.                                                                      │
+│ Using large metal spatula as aid, place 8-inch cake on its cardboard atop dowels in 12-inch cake, centering carefully.                                                      │
+│ Gently place 5-inch cake on its cardboard atop dowels in 8-inch cake, centering carefully.                                                                                  │
+│ Using citrus stripper, cut long strips of orange peel from oranges.                                                                                                         │
+│ Cut strips into long segments.                                                                                                                                              │
+│ To make orange peel coils, wrap peel segment around handle of wooden spoon; gently slide peel off handle so that peel keeps coiled shape.                                   │
+│ Garnish cake with orange peel coils, ivy or mint sprigs, and some berries.                                                                                                  │
+│ (Assembled cake can be made up to 8 hours ahead.                                                                                                                            │
+│ Let stand at cool room temperature.)                                                                                                                                        │
+│ Remove top and middle cake tiers.                                                                                                                                           │
+│ Remove dowels from cakes.                                                                                                                                                   │
+│ Cut top and middle cakes into slices.                                                                                                                                       │
+│ To cut 12-inch cake: Starting 3 inches inward from edge and inserting knife straight down, cut through from top to bottom to make 6-inch-diameter circle in center of cake. │
+│ Cut outer portion of cake into slices; cut inner portion into slices and serve with strawberries.                                                                           │
+└─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
+
+126 rows in set. Elapsed: 0.011 sec. Processed 8.19 thousand rows, 5.34 MB (737.75 thousand rows/s., 480.59 MB/s.)
+```
+
+### Online Playground
+
+Этот набор данных доступен в [Online Playground](https://gh-api.clickhouse.tech/play?user=play#U0VMRUNUCiAgICBhcnJheUpvaW4oTkVSKSBBUyBrLAogICAgY291bnQoKSBBUyBjCkZST00gcmVjaXBlcwpHUk9VUCBCWSBrCk9SREVSIEJZIGMgREVTQwpMSU1JVCA1MA==).
+
+[Оригинальная статья](https://clickhouse.tech/docs/ru/getting-started/example-datasets/recipes/) <!--hide-->
diff --git a/docs/ru/getting-started/example-datasets/wikistat.md b/docs/ru/getting-started/example-datasets/wikistat.md
index c5a877ff8fd..f224c24e6ac 100644
--- a/docs/ru/getting-started/example-datasets/wikistat.md
+++ b/docs/ru/getting-started/example-datasets/wikistat.md
@@ -30,4 +30,3 @@ $ cat links.txt | while read link; do wget http://dumps.wikimedia.org/other/page
 $ ls -1 /opt/wikistat/ | grep gz | while read i; do echo $i; gzip -cd /opt/wikistat/$i | ./wikistat-loader --time="$(echo -n $i | sed -r 's/pagecounts-([0-9]{4})([0-9]{2})([0-9]{2})-([0-9]{2})([0-9]{2})([0-9]{2})\.gz/\1-\2-\3 \4-00-00/')" | clickhouse-client --query="INSERT INTO wikistat FORMAT TabSeparated"; done
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/getting_started/example_datasets/wikistat/) <!--hide-->
diff --git a/docs/ru/getting-started/index.md b/docs/ru/getting-started/index.md
index ab72ce4a1d2..599cb8b9434 100644
--- a/docs/ru/getting-started/index.md
+++ b/docs/ru/getting-started/index.md
@@ -1,5 +1,5 @@
 ---
-toc_folder_title: "\u041d\u0430\u0447\u0430\u043b\u043e\u0020\u0440\u0430\u0431\u043e\u0442\u044b"
+toc_folder_title: "Начало работы"
 toc_hidden: true
 toc_priority: 8
 toc_title: hidden
@@ -14,4 +14,3 @@ toc_title: hidden
 -   [Пройти подробное руководство для начинающих](tutorial.md)
 -   [Поэкспериментировать с тестовыми наборами данных](example-datasets/ontime.md)
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/getting_started/) <!--hide-->
diff --git a/docs/ru/getting-started/install.md b/docs/ru/getting-started/install.md
index 04efe77712b..4ae27a910ea 100644
--- a/docs/ru/getting-started/install.md
+++ b/docs/ru/getting-started/install.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 11
-toc_title: "\u0423\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0430"
+toc_title: "Установка"
 ---
 
 # Установка {#ustanovka}
@@ -173,4 +173,3 @@ SELECT 1
 
 Для дальнейших экспериментов можно попробовать загрузить один из тестовых наборов данных или пройти [пошаговое руководство для начинающих](https://clickhouse.tech/tutorial.html).
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/getting_started/install/) <!--hide-->
diff --git a/docs/ru/getting-started/playground.md b/docs/ru/getting-started/playground.md
index 86a5cd5272c..b51a9b2b436 100644
--- a/docs/ru/getting-started/playground.md
+++ b/docs/ru/getting-started/playground.md
@@ -36,10 +36,10 @@ ClickHouse Playground дает возможность поработать с  [
 - запрещены INSERT запросы
 
 Также установлены следующие опции:
-- [max_result_bytes=10485760](../operations/settings/query_complexity/#max-result-bytes)
-- [max_result_rows=2000](../operations/settings/query_complexity/#setting-max_result_rows)
-- [result_overflow_mode=break](../operations/settings/query_complexity/#result-overflow-mode)
-- [max_execution_time=60000](../operations/settings/query_complexity/#max-execution-time)
+- [max_result_bytes=10485760](../operations/settings/query-complexity.md#max-result-bytes)
+- [max_result_rows=2000](../operations/settings/query-complexity.md#setting-max_result_rows)
+- [result_overflow_mode=break](../operations/settings/query-complexity.md#result-overflow-mode)
+- [max_execution_time=60000](../operations/settings/query-complexity.md#max-execution-time)
 
 ## Примеры {#examples}
 
diff --git a/docs/ru/getting-started/tutorial.md b/docs/ru/getting-started/tutorial.md
index f5455ba2b9a..68b3e4dbae7 100644
--- a/docs/ru/getting-started/tutorial.md
+++ b/docs/ru/getting-started/tutorial.md
@@ -644,7 +644,7 @@ If there are no replicas at the moment on replicated table creation, a new first
 
 ``` sql
 CREATE TABLE tutorial.hits_replica (...)
-ENGINE = ReplcatedMergeTree(
+ENGINE = ReplicatedMergeTree(
     '/clickhouse_perftest/tables/{shard}/hits',
     '{replica}'
 )
diff --git a/docs/ru/guides/apply-catboost-model.md b/docs/ru/guides/apply-catboost-model.md
index 026b4d9d75e..db2be63692f 100644
--- a/docs/ru/guides/apply-catboost-model.md
+++ b/docs/ru/guides/apply-catboost-model.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 41
-toc_title: "\u041f\u0440\u0438\u043c\u0435\u043d\u0435\u043d\u0438\u0435\u0020\u043c\u043e\u0434\u0435\u043b\u0438\u0020\u0043\u0061\u0074\u0042\u006f\u006f\u0073\u0074\u0020\u0432\u0020\u0043\u006c\u0069\u0063\u006b\u0048\u006f\u0075\u0073\u0065"
+toc_title: "Применение модели CatBoost в ClickHouse"
 ---
 
 # Применение модели CatBoost в ClickHouse {#applying-catboost-model-in-clickhouse}
@@ -158,7 +158,9 @@ FROM amazon_train
 <catboost_dynamic_library_path>/home/catboost/data/libcatboostmodel.so</catboost_dynamic_library_path>
 <models_config>/home/catboost/models/*_model.xml</models_config>
 ```
-
+!!! note "Примечание"
+    Вы можете позднее изменить путь к конфигурации модели CatBoost без перезагрузки сервера.
+    
 ## 4. Запустите вывод модели из SQL {#run-model-inference}
 
 Для тестирования модели запустите клиент ClickHouse `$ clickhouse client`.
diff --git a/docs/ru/guides/index.md b/docs/ru/guides/index.md
index 2c38de275a7..5b305a6a135 100644
--- a/docs/ru/guides/index.md
+++ b/docs/ru/guides/index.md
@@ -1,7 +1,7 @@
 ---
-toc_folder_title: "\u0420\u0443\u043A\u043E\u0432\u043E\u0434\u0441\u0442\u0432\u0430"
+toc_folder_title: "Руководства"
 toc_priority: 38
-toc_title: "\u041E\u0431\u0437\u043E\u0440"
+toc_title: "Обзор"
 ---
 
 # Руководства {#rukovodstva}
diff --git a/docs/ru/index.md b/docs/ru/index.md
index 7c129f9d113..e16f2afed82 100644
--- a/docs/ru/index.md
+++ b/docs/ru/index.md
@@ -1,9 +1,9 @@
 ---
 toc_priority: 0
-toc_title: "\u041E\u0431\u0437\u043E\u0440"
+toc_title: "Обзор"
 ---
 
-# Что такое ClickHouse {#chto-takoe-clickhouse}
+# Что такое ClickHouse {#what-is-clickhouse}
 
 ClickHouse - столбцовая система управления базами данных (СУБД) для онлайн обработки аналитических запросов (OLAP).
 
@@ -97,4 +97,3 @@ ClickHouse - столбцовая система управления базам
 
 Стоит заметить, что для эффективности по CPU требуется, чтобы язык запросов был декларативным (SQL, MDX) или хотя бы векторным (J, K). То есть, чтобы запрос содержал циклы только в неявном виде, открывая возможности для оптимизации.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/) <!--hide-->
diff --git a/docs/ru/interfaces/cli.md b/docs/ru/interfaces/cli.md
index b1d8c4f0732..277b73a6d36 100644
--- a/docs/ru/interfaces/cli.md
+++ b/docs/ru/interfaces/cli.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 17
-toc_title: "\u041a\u043b\u0438\u0435\u043d\u0442\u0020\u043a\u043e\u043c\u0430\u043d\u0434\u043d\u043e\u0439\u0020\u0441\u0442\u0440\u043e\u043a\u0438"
+toc_title: "Клиент командной строки"
 ---
 
 # Клиент командной строки {#klient-komandnoi-stroki}
@@ -121,6 +121,7 @@ $ clickhouse-client --param_tbl="numbers" --param_db="system" --param_col="numbe
 -   `--user, -u` — имя пользователя, по умолчанию — ‘default’.
 -   `--password` — пароль, по умолчанию — пустая строка.
 -   `--query, -q` — запрос для выполнения, при использовании в неинтерактивном режиме.
+-   `--queries-file, -qf` - путь к файлу с запросами для выполнения. Необходимо указать только одну из опций: `query` или `queries-file`.
 -   `--database, -d` — выбрать текущую БД. Без указания значение берется из настроек сервера (по умолчанию — БД ‘default’).
 -   `--multiline, -m` — если указано — разрешить многострочные запросы, не отправлять запрос по нажатию Enter.
 -   `--multiquery, -n` — если указано — разрешить выполнять несколько запросов, разделённых точкой с запятой.
@@ -130,6 +131,7 @@ $ clickhouse-client --param_tbl="numbers" --param_db="system" --param_col="numbe
 -   `--stacktrace` — если указано, в случае исключения, выводить также его стек-трейс.
 -   `--config-file` — имя конфигурационного файла.
 -   `--secure` — если указано, будет использован безопасный канал.
+-   `--history_file` - путь к файлу с историей команд.
 -   `--param_<name>` — значение параметра для [запроса с параметрами](#cli-queries-with-parameters).
 
 Начиная с версии 20.5, в `clickhouse-client` есть автоматическая подсветка синтаксиса (включена всегда).
@@ -153,4 +155,3 @@ $ clickhouse-client --param_tbl="numbers" --param_db="system" --param_col="numbe
 </config>
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/interfaces/cli/) <!--hide-->
diff --git a/docs/ru/interfaces/cpp.md b/docs/ru/interfaces/cpp.md
index 264b4f82500..f0691453fe6 100644
--- a/docs/ru/interfaces/cpp.md
+++ b/docs/ru/interfaces/cpp.md
@@ -1,10 +1,9 @@
 ---
 toc_priority: 24
-toc_title: "\u0043\u002b\u002b\u0020\u043a\u043b\u0438\u0435\u043d\u0442\u0441\u043a\u0430\u044f\u0020\u0431\u0438\u0431\u043b\u0438\u043e\u0442\u0435\u043a\u0430"
+toc_title: "C++ клиентская библиотека"
 ---
 
 # C++ клиентская библиотека {#c-klientskaia-biblioteka}
 
 См. README в репозитории [clickhouse-cpp](https://github.com/ClickHouse/clickhouse-cpp).
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/interfaces/cpp/) <!--hide-->
diff --git a/docs/ru/interfaces/formats.md b/docs/ru/interfaces/formats.md
index 98426b489e8..f67997b58d6 100644
--- a/docs/ru/interfaces/formats.md
+++ b/docs/ru/interfaces/formats.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 21
-toc_title: "\u0424\u043e\u0440\u043c\u0430\u0442\u044b\u0020\u0432\u0445\u043e\u0434\u043d\u044b\u0445\u0020\u0438\u0020\u0432\u044b\u0445\u043e\u0434\u043d\u044b\u0445\u0020\u0434\u0430\u043d\u043d\u044b\u0445"
+toc_title: "Форматы входных и выходных данных"
 ---
 
 # Форматы входных и выходных данных {#formats}
@@ -49,7 +49,7 @@ ClickHouse может принимать (`INSERT`) и отдавать (`SELECT
 | [Parquet](#data-format-parquet)                                                         | ✔     | ✔      |
 | [Arrow](#data-format-arrow)                                                             | ✔     | ✔      |
 | [ArrowStream](#data-format-arrow-stream)                                                | ✔     | ✔      |
-| [ORC](#data-format-orc)                                                                 | ✔     | ✗      |
+| [ORC](#data-format-orc)                                                                 | ✔     | ✔      |
 | [RowBinary](#rowbinary)                                                                 | ✔     | ✔      |
 | [RowBinaryWithNamesAndTypes](#rowbinarywithnamesandtypes)                               | ✔     | ✔      |
 | [Native](#native)                                                                       | ✔     | ✔      |
@@ -1173,7 +1173,7 @@ ClickHouse поддерживает настраиваемую точность
 
 Неподдержанные типы данных Parquet: `DATE32`, `TIME32`, `FIXED_SIZE_BINARY`, `JSON`, `UUID`, `ENUM`.
 
-Типы данных столбцов в ClickHouse могут отличаться от типов данных соответствующих полей файла в формате Parquet. При вставке данных, ClickHouse интерпретирует типы данных в соответствии с таблицей выше, а затем [приводит](../query_language/functions/type_conversion_functions/#type_conversion_function-cast) данные к тому типу, который установлен для столбца таблицы.
+Типы данных столбцов в ClickHouse могут отличаться от типов данных соответствующих полей файла в формате Parquet. При вставке данных, ClickHouse интерпретирует типы данных в соответствии с таблицей выше, а затем [приводит](../sql-reference/functions/type-conversion-functions/#type_conversion_function-cast) данные к тому типу, который установлен для столбца таблицы.
 
 ### Вставка и выборка данных {#vstavka-i-vyborka-dannykh}
 
@@ -1203,45 +1203,53 @@ $ clickhouse-client --query="SELECT * FROM {some_table} FORMAT Parquet" > {some_
 
 ## ORC {#data-format-orc}
 
-[Apache ORC](https://orc.apache.org/) - это column-oriented формат данных, распространённый в экосистеме Hadoop. Вы можете только вставлять данные этого формата в ClickHouse.
+[Apache ORC](https://orc.apache.org/) — это столбцовый формат данных, распространенный в экосистеме [Hadoop](https://hadoop.apache.org/).
 
 ### Соответствие типов данных {#sootvetstvie-tipov-dannykh-1}
 
-Таблица показывает поддержанные типы данных и их соответствие [типам данных](../sql-reference/data-types/index.md) ClickHouse для запросов `INSERT`.
+Таблица ниже содержит поддерживаемые типы данных и их соответствие [типам данных](../sql-reference/data-types/index.md) ClickHouse для запросов `INSERT` и `SELECT`.
 
-| Тип данных ORC (`INSERT`) | Тип данных ClickHouse                               |
-|---------------------------|-----------------------------------------------------|
-| `UINT8`, `BOOL`           | [UInt8](../sql-reference/data-types/int-uint.md)    |
-| `INT8`                    | [Int8](../sql-reference/data-types/int-uint.md)     |
-| `UINT16`                  | [UInt16](../sql-reference/data-types/int-uint.md)   |
-| `INT16`                   | [Int16](../sql-reference/data-types/int-uint.md)    |
-| `UINT32`                  | [UInt32](../sql-reference/data-types/int-uint.md)   |
-| `INT32`                   | [Int32](../sql-reference/data-types/int-uint.md)    |
-| `UINT64`                  | [UInt64](../sql-reference/data-types/int-uint.md)   |
-| `INT64`                   | [Int64](../sql-reference/data-types/int-uint.md)    |
-| `FLOAT`, `HALF_FLOAT`     | [Float32](../sql-reference/data-types/float.md)     |
-| `DOUBLE`                  | [Float64](../sql-reference/data-types/float.md)     |
-| `DATE32`                  | [Date](../sql-reference/data-types/date.md)         |
-| `DATE64`, `TIMESTAMP`     | [DateTime](../sql-reference/data-types/datetime.md) |
-| `STRING`, `BINARY`        | [String](../sql-reference/data-types/string.md)     |
-| `DECIMAL`                 | [Decimal](../sql-reference/data-types/decimal.md)   |
+| Тип данных ORC (`INSERT`) | Тип данных ClickHouse                               | Тип данных ORC (`SELECT`) |
+|---------------------------|-----------------------------------------------------|---------------------------|
+| `UINT8`, `BOOL`           | [UInt8](../sql-reference/data-types/int-uint.md)    | `UINT8`                   |
+| `INT8`                    | [Int8](../sql-reference/data-types/int-uint.md)     | `INT8`                    |
+| `UINT16`                  | [UInt16](../sql-reference/data-types/int-uint.md)   | `UINT16`                  |
+| `INT16`                   | [Int16](../sql-reference/data-types/int-uint.md)    | `INT16`                   |
+| `UINT32`                  | [UInt32](../sql-reference/data-types/int-uint.md)   | `UINT32`                  |
+| `INT32`                   | [Int32](../sql-reference/data-types/int-uint.md)    | `INT32`                   |
+| `UINT64`                  | [UInt64](../sql-reference/data-types/int-uint.md)   | `UINT64`                  |
+| `INT64`                   | [Int64](../sql-reference/data-types/int-uint.md)    | `INT64`                   |
+| `FLOAT`, `HALF_FLOAT`     | [Float32](../sql-reference/data-types/float.md)     | `FLOAT`                   |
+| `DOUBLE`                  | [Float64](../sql-reference/data-types/float.md)     | `DOUBLE`                  |
+| `DATE32`                  | [Date](../sql-reference/data-types/date.md)         | `DATE32`                  |
+| `DATE64`, `TIMESTAMP`     | [DateTime](../sql-reference/data-types/datetime.md) | `TIMESTAMP`               |
+| `STRING`, `BINARY`        | [String](../sql-reference/data-types/string.md)     | `BINARY`                  |
+| `DECIMAL`                 | [Decimal](../sql-reference/data-types/decimal.md)   | `DECIMAL`                 |
+| `-`                       | [Array](../sql-reference/data-types/array.md)       | `LIST`                    |
 
-ClickHouse поддерживает настраиваемую точность для формата `Decimal`. При обработке запроса `INSERT`, ClickHouse обрабатывает тип данных Parquet `DECIMAL` как `Decimal128`.
+ClickHouse поддерживает настраиваемую точность для формата `Decimal`. При обработке запроса `INSERT`, ClickHouse обрабатывает тип данных ORC `DECIMAL` как `Decimal128`.
 
-Неподдержанные типы данных ORC: `DATE32`, `TIME32`, `FIXED_SIZE_BINARY`, `JSON`, `UUID`, `ENUM`.
+Неподдерживаемые типы данных ORC: `TIME32`, `FIXED_SIZE_BINARY`, `JSON`, `UUID`, `ENUM`.
 
-Типы данных столбцов в таблицах ClickHouse могут отличаться от типов данных для соответствующих полей ORC. При вставке данных, ClickHouse интерпретирует типы данных ORC согласно таблице соответствия, а затем [приводит](../query_language/functions/type_conversion_functions/#type_conversion_function-cast) данные к типу, установленному для столбца таблицы ClickHouse.
+Типы данных столбцов в таблицах ClickHouse могут отличаться от типов данных для соответствующих полей ORC. При вставке данных ClickHouse интерпретирует типы данных ORC согласно таблице соответствия, а затем [приводит](../sql-reference/functions/type-conversion-functions/#type_conversion_function-cast) данные к типу, установленному для столбца таблицы ClickHouse.
 
 ### Вставка данных {#vstavka-dannykh-1}
 
-Данные ORC можно вставить в таблицу ClickHouse командой:
+Чтобы вставить в ClickHouse данные из файла в формате ORC, используйте команду следующего вида:
 
 ``` bash
 $ cat filename.orc | clickhouse-client --query="INSERT INTO some_table FORMAT ORC"
 ```
 
-Для обмена данных с Hadoop можно использовать [движок таблиц HDFS](../engines/table-engines/integrations/hdfs.md).
+### Вывод данных {#vyvod-dannykh-1}
 
+Чтобы получить данные из таблицы ClickHouse и сохранить их в файл формата ORC, используйте команду следующего вида:
+
+``` bash
+$ clickhouse-client --query="SELECT * FROM {some_table} FORMAT ORC" > {filename.orc}
+```
+
+Для обмена данных с экосистемой Hadoop вы можете использовать [движок таблиц HDFS](../engines/table-engines/integrations/hdfs.md).
 
 ## LineAsString {#lineasstring}
 
@@ -1268,7 +1276,7 @@ SELECT * FROM line_as_string;
 
 ## Regexp {#data-format-regexp}
 
-Каждая строка импортируемых данных разбирается в соответствии с регулярным выражением. 
+Каждая строка импортируемых данных разбирается в соответствии с регулярным выражением.
 
 При работе с форматом `Regexp` можно использовать следующие параметры:
 
@@ -1279,15 +1287,15 @@ SELECT * FROM line_as_string;
     - Escaped (как в [TSV](#tabseparated))
     - Quoted (как в [Values](#data-format-values))
     - Raw (данные импортируются как есть, без сериализации)
-- `format_regexp_skip_unmatched` — [UInt8](../sql-reference/data-types/int-uint.md). Признак, будет ли генерироваться исключение в случае, если импортируемые данные не соответствуют регулярному выражению `format_regexp`. Может принимать значение `0` или `1`. 
+- `format_regexp_skip_unmatched` — [UInt8](../sql-reference/data-types/int-uint.md). Признак, будет ли генерироваться исключение в случае, если импортируемые данные не соответствуют регулярному выражению `format_regexp`. Может принимать значение `0` или `1`.
 
-**Использование** 
+**Использование**
 
-Регулярное выражение (шаблон) из параметра `format_regexp` применяется к каждой строке импортируемых данных. Количество частей в шаблоне (подшаблонов) должно соответствовать количеству колонок в импортируемых данных. 
+Регулярное выражение (шаблон) из параметра `format_regexp` применяется к каждой строке импортируемых данных. Количество частей в шаблоне (подшаблонов) должно соответствовать количеству колонок в импортируемых данных.
 
-Строки импортируемых данных должны разделяться символом новой строки `'\n'` или символами `"\r\n"` (перенос строки в формате DOS). 
+Строки импортируемых данных должны разделяться символом новой строки `'\n'` или символами `"\r\n"` (перенос строки в формате DOS).
 
-Данные, выделенные по подшаблонам, интерпретируются в соответствии с типом, указанным в параметре `format_regexp_escaping_rule`. 
+Данные, выделенные по подшаблонам, интерпретируются в соответствии с типом, указанным в параметре `format_regexp_escaping_rule`.
 
 Если строка импортируемых данных не соответствует регулярному выражению и параметр `format_regexp_skip_unmatched` равен 1, строка просто игнорируется. Если же параметр `format_regexp_skip_unmatched` равен 0, генерируется исключение.
 
@@ -1390,4 +1398,3 @@ $ clickhouse-client --query "SELECT * FROM {some_table} FORMAT RawBLOB" | md5sum
 f9725a22f9191e064120d718e26862a9  -
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/interfaces/formats/) <!--hide-->
diff --git a/docs/ru/interfaces/http.md b/docs/ru/interfaces/http.md
index 096fb6c05bc..9e553c12dc0 100644
--- a/docs/ru/interfaces/http.md
+++ b/docs/ru/interfaces/http.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 19
-toc_title: "\u0048\u0054\u0054\u0050\u002d\u0438\u043d\u0442\u0435\u0440\u0444\u0435\u0439\u0441"
+toc_title: "HTTP-интерфейс"
 ---
 
 # HTTP-интерфейс {#http-interface}
@@ -149,28 +149,48 @@ $ echo 'DROP TABLE t' | curl 'http://localhost:8123/' --data-binary @-
 
 Для запросов, которые не возвращают таблицу с данными, в случае успеха, выдаётся пустое тело ответа.
 
-Вы можете использовать внутренний формат сжатия Clickhouse при передаче данных. Формат сжатых данных нестандартный, и вам придётся использовать для работы с ним специальную программу `clickhouse-compressor` (устанавливается вместе с пакетом `clickhouse-client`). Для повышения эффективности вставки данных можно отключить проверку контрольной суммы на стороне сервера с помощью настройки[http_native_compression_disable_checksumming_on_decompress](../operations/settings/settings.md#settings-http_native_compression_disable_checksumming_on_decompress).
 
-Если вы указали `compress = 1` в URL, то сервер сжимает данные, которые он отправляет.
-Если вы указали `decompress = 1` в URL, сервер распаковывает те данные, которые вы передаёте методом `POST`.
+## Сжатие {#compression}
 
-Также, можно использовать [HTTP compression](https://en.wikipedia.org/wiki/HTTP_compression). Для отправки сжатого запроса `POST`, добавьте заголовок `Content-Encoding: compression_method`. Чтобы ClickHouse сжимал ответ, добавьте заголовок `Accept-Encoding: compression_method`. ClickHouse поддерживает следующие [методы сжатия](https://en.wikipedia.org/wiki/HTTP_compression#Content-Encoding_tokens): `gzip`, `br`, and `deflate`. Чтобы включить HTTP compression, используйте настройку ClickHouse [enable_http_compression](../operations/settings/settings.md#settings-enable_http_compression). Уровень сжатия данных для всех методов сжатия можно настроить с помощью настройки [http_zlib_compression_level](#settings-http_zlib_compression_level).
+Сжатие можно использовать для уменьшения трафика по сети при передаче большого количества данных, а также для создания сразу сжатых дампов.
 
-Это может быть использовано для уменьшения трафика по сети при передаче большого количества данных, а также для создания сразу сжатых дампов.
+Вы можете использовать внутренний формат сжатия Clickhouse при передаче данных. Формат сжатых данных нестандартный, и вам придётся использовать для работы с ним специальную программу `clickhouse-compressor`. Она устанавливается вместе с пакетом `clickhouse-client`. Для повышения эффективности вставки данных можно отключить проверку контрольной суммы на стороне сервера с помощью настройки [http_native_compression_disable_checksumming_on_decompress](../operations/settings/settings.md#settings-http_native_compression_disable_checksumming_on_decompress).
 
-Примеры отправки данных со сжатием:
+Если вы указали `compress=1` в URL, то сервер сжимает данные, которые он отправляет. Если вы указали `decompress=1` в URL, сервер распаковывает те данные, которые вы передаёте методом `POST`.
 
-``` bash
-$ #Отправка данных на сервер:
-$ curl -vsS "http://localhost:8123/?enable_http_compression=1" -d 'SELECT number FROM system.numbers LIMIT 10' -H 'Accept-Encoding: gzip'
+Также можно использовать [сжатие HTTP](https://en.wikipedia.org/wiki/HTTP_compression). ClickHouse поддерживает следующие [методы сжатия](https://en.wikipedia.org/wiki/HTTP_compression#Content-Encoding_tokens): 
 
-$ #Отправка данных клиенту:
-$ echo "SELECT 1" | gzip -c | curl -sS --data-binary @- -H 'Content-Encoding: gzip' 'http://localhost:8123/'
-```
+- `gzip`
+- `br`
+- `deflate`
+- `xz`
+
+Для отправки сжатого запроса `POST`, добавьте заголовок `Content-Encoding: compression_method`. 
+Чтобы ClickHouse сжимал ответ, разрешите сжатие настройкой [enable_http_compression](../operations/settings/settings.md#settings-enable_http_compression) и добавьте заголовок `Accept-Encoding: compression_method`. Уровень сжатия данных для всех методов сжатия можно задать с помощью настройки [http_zlib_compression_level](../operations/settings/settings.md#settings-http_zlib_compression_level).
 
 !!! note "Примечание"
     Некоторые HTTP-клиенты могут по умолчанию распаковывать данные (`gzip` и `deflate`) с сервера в фоновом режиме и вы можете получить распакованные данные, даже если правильно используете настройки сжатия.
 
+**Примеры**
+
+``` bash
+# Отправка сжатых данных на сервер
+$ echo "SELECT 1" | gzip -c | \
+  curl -sS --data-binary @- -H 'Content-Encoding: gzip' 'http://localhost:8123/'
+```
+
+``` bash
+# Получение сжатых данных с сервера
+$ curl -vsS "http://localhost:8123/?enable_http_compression=1" \
+    -H 'Accept-Encoding: gzip' --output result.gz -d 'SELECT number FROM system.numbers LIMIT 3'
+$ zcat result.gz
+0
+1
+2
+```
+
+## База данных по умолчанию {#default-database}
+
 Вы можете использовать параметр URL `database` или заголовок `X-ClickHouse-Database`, чтобы указать БД по умолчанию.
 
 ``` bash
@@ -615,4 +635,3 @@ $ curl -vv -H 'XXX:xxx' 'http://localhost:8123/get_relative_path_static_handler'
 * Connection #0 to host localhost left intact
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/interfaces/http_interface/) <!--hide-->
diff --git a/docs/ru/interfaces/index.md b/docs/ru/interfaces/index.md
index ea381c46206..12e8853823e 100644
--- a/docs/ru/interfaces/index.md
+++ b/docs/ru/interfaces/index.md
@@ -1,7 +1,7 @@
 ---
-toc_folder_title: "\u0418\u043D\u0442\u0435\u0440\u0444\u0435\u0439\u0441\u044B"
+toc_folder_title: "Интерфейсы"
 toc_priority: 14
-toc_title: "\u0412\u0432\u0435\u0434\u0435\u043D\u0438\u0435"
+toc_title: "Введение"
 ---
 
 # Интерфейсы {#interfaces}
@@ -24,4 +24,3 @@ ClickHouse предоставляет два сетевых интерфейса
 -   [Библиотеки для интеграции](third-party/integrations.md);
 -   [Визуальные интерфейсы](third-party/gui.md).
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/interfaces/) <!--hide-->
diff --git a/docs/ru/interfaces/jdbc.md b/docs/ru/interfaces/jdbc.md
index 196dba64933..30270322f7a 100644
--- a/docs/ru/interfaces/jdbc.md
+++ b/docs/ru/interfaces/jdbc.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 22
-toc_title: "\u004a\u0044\u0042\u0043\u002d\u0434\u0440\u0430\u0439\u0432\u0435\u0440"
+toc_title: "JDBC-драйвер"
 ---
 
 # JDBC-драйвер {#jdbc-draiver}
@@ -10,4 +10,3 @@ toc_title: "\u004a\u0044\u0042\u0043\u002d\u0434\u0440\u0430\u0439\u0432\u0435\u
     -   [ClickHouse-Native-JDBC](https://github.com/housepower/ClickHouse-Native-JDBC)
     -   [clickhouse4j](https://github.com/blynkkk/clickhouse4j)
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/interfaces/jdbc/) <!--hide-->
diff --git a/docs/ru/interfaces/mysql.md b/docs/ru/interfaces/mysql.md
index fa0003e0bea..925b1113109 100644
--- a/docs/ru/interfaces/mysql.md
+++ b/docs/ru/interfaces/mysql.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 20
-toc_title: "\u004d\u0079\u0053\u0051\u004c\u002d\u0438\u043d\u0442\u0435\u0440\u0444\u0435\u0439\u0441"
+toc_title: "MySQL-интерфейс"
 ---
 
 # MySQL-интерфейс {#mysql-interface}
diff --git a/docs/ru/interfaces/odbc.md b/docs/ru/interfaces/odbc.md
index 728c4bd6979..22153865298 100644
--- a/docs/ru/interfaces/odbc.md
+++ b/docs/ru/interfaces/odbc.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 23
-toc_title: "\u004f\u0044\u0042\u0043\u002d\u0434\u0440\u0430\u0439\u0432\u0435\u0440"
+toc_title: "ODBC-драйвер"
 ---
 
 
@@ -8,4 +8,3 @@ toc_title: "\u004f\u0044\u0042\u0043\u002d\u0434\u0440\u0430\u0439\u0432\u0435\u
 
 -   [Официальный драйвер](https://github.com/ClickHouse/clickhouse-odbc).
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/interfaces/odbc/) <!--hide-->
diff --git a/docs/ru/interfaces/tcp.md b/docs/ru/interfaces/tcp.md
index d89646f15b7..5261e1eafef 100644
--- a/docs/ru/interfaces/tcp.md
+++ b/docs/ru/interfaces/tcp.md
@@ -1,10 +1,9 @@
 ---
 toc_priority: 18
-toc_title: "\u0420\u043e\u0434\u043d\u043e\u0439\u0020\u0438\u043d\u0442\u0435\u0440\u0444\u0435\u0439\u0441\u0020\u0028\u0054\u0043\u0050\u0029"
+toc_title: "Родной интерфейс (TCP)"
 ---
 
 # Родной интерфейс (TCP) {#rodnoi-interfeis-tcp}
 
 Нативный протокол используется в [клиенте командной строки](cli.md), для взаимодействия между серверами во время обработки распределенных запросов, а также в других программах на C++. К сожалению, у родного протокола ClickHouse пока нет формальной спецификации, но в нем можно разобраться с использованием исходного кода ClickHouse (начиная с [примерно этого места](https://github.com/ClickHouse/ClickHouse/tree/master/src/Client)) и/или путем перехвата и анализа TCP трафика.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/interfaces/tcp/) <!--hide-->
diff --git a/docs/ru/interfaces/third-party/client-libraries.md b/docs/ru/interfaces/third-party/client-libraries.md
index 26e05b02509..411475f0aaa 100644
--- a/docs/ru/interfaces/third-party/client-libraries.md
+++ b/docs/ru/interfaces/third-party/client-libraries.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 26
-toc_title: "\u041a\u043b\u0438\u0435\u043d\u0442\u0441\u043a\u0438\u0435\u0020\u0431\u0438\u0431\u043b\u0438\u043e\u0442\u0435\u043a\u0438\u0020\u043e\u0442\u0020\u0441\u0442\u043e\u0440\u043e\u043d\u043d\u0438\u0445\u0020\u0440\u0430\u0437\u0440\u0430\u0431\u043e\u0442\u0447\u0438\u043a\u043e\u0432"
+toc_title: "Клиентские библиотеки от сторонних разработчиков"
 ---
 
 # Клиентские библиотеки от сторонних разработчиков {#klientskie-biblioteki-ot-storonnikh-razrabotchikov}
@@ -22,6 +22,7 @@ toc_title: "\u041a\u043b\u0438\u0435\u043d\u0442\u0441\u043a\u0438\u0435\u0020\u
     -   [seva-code/php-click-house-client](https://packagist.org/packages/seva-code/php-click-house-client)
     -   [SeasClick C++ client](https://github.com/SeasX/SeasClick)
     -   [glushkovds/phpclickhouse-laravel](https://packagist.org/packages/glushkovds/phpclickhouse-laravel)
+    -   [kolya7k ClickHouse PHP extension](https://github.com//kolya7k/clickhouse-php)
 -   Go
     -   [clickhouse](https://github.com/kshvakov/clickhouse/)
     -   [go-clickhouse](https://github.com/roistat/go-clickhouse)
@@ -57,4 +58,3 @@ toc_title: "\u041a\u043b\u0438\u0435\u043d\u0442\u0441\u043a\u0438\u0435\u0020\u
 -   Nim
     -   [nim-clickhouse](https://github.com/leonardoce/nim-clickhouse)
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/interfaces/third-party/client_libraries/) <!--hide-->
diff --git a/docs/ru/interfaces/third-party/gui.md b/docs/ru/interfaces/third-party/gui.md
index 1fabdb8a31c..156f7130bc5 100644
--- a/docs/ru/interfaces/third-party/gui.md
+++ b/docs/ru/interfaces/third-party/gui.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 28
-toc_title: "\u0412\u0438\u0437\u0443\u0430\u043b\u044c\u043d\u044b\u0435\u0020\u0438\u043d\u0442\u0435\u0440\u0444\u0435\u0439\u0441\u044b\u0020\u043e\u0442\u0020\u0441\u0442\u043e\u0440\u043e\u043d\u043d\u0438\u0445\u0020\u0440\u0430\u0437\u0440\u0430\u0431\u043e\u0442\u0447\u0438\u043a\u043e\u0432"
+toc_title: "Визуальные интерфейсы от сторонних разработчиков"
 ---
 
 
@@ -103,7 +103,11 @@ toc_title: "\u0412\u0438\u0437\u0443\u0430\u043b\u044c\u043d\u044b\u0435\u0020\u
 
 [xeus-clickhouse](https://github.com/wangfenjin/xeus-clickhouse) — это ядро Jupyter для ClickHouse, которое поддерживает запрос ClickHouse-данных с использованием SQL в Jupyter.
 
-## Коммерческие {#kommercheskie}
+### MindsDB Studio {#mindsdb}
+
+[MindsDB](https://mindsdb.com/) — это продукт с открытым исходным кодом, реализующий слой искусственного интеллекта (Artificial Intelligence, AI) для различных СУБД, в том числе для ClickHouse. MindsDB облегчает процессы создания, обучения и развертывания современных моделей машинного обучения. Графический пользовательский интерфейс MindsDB Studio позволяет обучать новые модели на основе данных в БД, интерпретировать сделанные моделями прогнозы, выявлять потенциальные ошибки в данных, визуализировать и оценивать достоверность моделей с помощью функции Explainable AI, так чтобы вы могли быстрее адаптировать и настраивать ваши модели машинного обучения.
+
+## Коммерческие {#commercial}
 
 ### DataGrip {#datagrip}
 
@@ -146,7 +150,6 @@ toc_title: "\u0412\u0438\u0437\u0443\u0430\u043b\u044c\u043d\u044b\u0435\u0020\u
 -   Подготовка данных и возможности ETL.
 -   Моделирование данных с помощью SQL для их реляционного отображения.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/interfaces/third-party/gui/) <!--hide-->
 
 ### Looker {#looker}
 
@@ -163,4 +166,19 @@ toc_title: "\u0412\u0438\u0437\u0443\u0430\u043b\u044c\u043d\u044b\u0435\u0020\u
 
 [Как сконфигурировать ClickHouse в Looker.](https://docs.looker.com/setup-and-management/database-config/clickhouse)
 
-[Original article](https://clickhouse.tech/docs/ru/interfaces/third-party/gui/) <!--hide-->
+### SeekTable {#seektable}
+
+[SeekTable](https://www.seektable.com) — это аналитический инструмент для самостоятельного анализа и обработки данных бизнес-аналитики. Он доступен как в виде облачного сервиса, так и в виде локальной версии. Отчеты из SeekTable могут быть встроены в любое веб-приложение.
+
+Основные возможности:
+
+-   Удобный конструктор отчетов.
+-   Гибкая настройка отчетов SQL и создание запросов для специфичных отчетов.
+-   Интегрируется с ClickHouse, используя собственную точку приема запроса TCP/IP или интерфейс HTTP(S) (два разных драйвера).
+-   Поддерживает всю мощь диалекта ClickHouse SQL для построения запросов по различным измерениям и показателям.
+-   [WEB-API](https://www.seektable.com/help/web-api-integration) для автоматизированной генерации отчетов.
+-   Процесс разработки отчетов поддерживает [резервное копирование/восстановление данных](https://www.seektable.com/help/self-hosted-backup-restore); конфигурация моделей данных (кубов) / отчетов представляет собой удобочитаемый XML-файл, который может храниться в системе контроля версий.
+
+SeekTable [бесплатен](https://www.seektable.com/help/cloud-pricing) для личного/индивидуального использования.
+
+[Как сконфигурировать подключение ClickHouse в SeekTable.](https://www.seektable.com/help/clickhouse-pivot-table)
diff --git a/docs/ru/interfaces/third-party/index.md b/docs/ru/interfaces/third-party/index.md
index a57169df73b..bbf5a237000 100644
--- a/docs/ru/interfaces/third-party/index.md
+++ b/docs/ru/interfaces/third-party/index.md
@@ -1,5 +1,5 @@
 ---
-toc_folder_title: "\u0421\u0442\u043e\u0440\u043e\u043d\u043d\u0438\u0435\u0020\u0438\u043d\u0442\u0435\u0440\u0444\u0435\u0439\u0441\u044b"
+toc_folder_title: "Сторонние интерфейсы"
 toc_priority: 24
 ---
 
@@ -15,4 +15,3 @@ toc_priority: 24
 !!! note "Примечание"
     С ClickHouse работают также универсальные инструменты, поддерживающие общий API, такие как [ODBC](../../interfaces/odbc.md) или [JDBC](../../interfaces/jdbc.md).
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/interfaces/third-party/) <!--hide-->
diff --git a/docs/ru/interfaces/third-party/integrations.md b/docs/ru/interfaces/third-party/integrations.md
index 60d6181ab3f..198e9d6be76 100644
--- a/docs/ru/interfaces/third-party/integrations.md
+++ b/docs/ru/interfaces/third-party/integrations.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 27
-toc_title: "\u0411\u0438\u0431\u043b\u0438\u043e\u0442\u0435\u043a\u0438\u0020\u0434\u043b\u044f\u0020\u0438\u043d\u0442\u0435\u0433\u0440\u0430\u0446\u0438\u0438\u0020\u043e\u0442\u0020\u0441\u0442\u043e\u0440\u043e\u043d\u043d\u0438\u0445\u0020\u0440\u0430\u0437\u0440\u0430\u0431\u043e\u0442\u0447\u0438\u043a\u043e\u0432"
+toc_title: "Библиотеки для интеграции от сторонних разработчиков"
 ---
 
 # Библиотеки для интеграции от сторонних разработчиков {#biblioteki-dlia-integratsii-ot-storonnikh-razrabotchikov}
@@ -69,6 +69,9 @@ toc_title: "\u0411\u0438\u0431\u043b\u0438\u043e\u0442\u0435\u043a\u0438\u0020\u
 -   Гео
     -   [MaxMind](https://dev.maxmind.com/geoip/)
         -   [clickhouse-maxmind-geoip](https://github.com/AlexeyKupershtokh/clickhouse-maxmind-geoip)
+-   AutoML
+    -   [MindsDB](https://mindsdb.com/)
+        -   [MindsDB](https://github.com/mindsdb/mindsdb) - Слой предиктивной аналитики и искусственного интеллекта для СУБД ClickHouse.
 
 ## Экосистемы вокруг языков программирования {#ekosistemy-vokrug-iazykov-programmirovaniia}
 
@@ -105,4 +108,3 @@ toc_title: "\u0411\u0438\u0431\u043b\u0438\u043e\u0442\u0435\u043a\u0438\u0020\u
     -   [GraphQL](https://github.com/graphql)
         -   [activecube-graphql](https://github.com/bitquery/activecube-graphql)
         
-[Оригинальная статья](https://clickhouse.tech/docs/ru/interfaces/third-party/integrations/) <!--hide-->
diff --git a/docs/ru/interfaces/third-party/proxy.md b/docs/ru/interfaces/third-party/proxy.md
index fc66ecde293..6d85c960c0e 100644
--- a/docs/ru/interfaces/third-party/proxy.md
+++ b/docs/ru/interfaces/third-party/proxy.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 29
-toc_title: "\u041f\u0440\u043e\u043a\u0441\u0438\u002d\u0441\u0435\u0440\u0432\u0435\u0440\u044b\u0020\u043e\u0442\u0020\u0441\u0442\u043e\u0440\u043e\u043d\u043d\u0438\u0445\u0020\u0440\u0430\u0437\u0440\u0430\u0431\u043e\u0442\u0447\u0438\u043a\u043e\u0432"
+toc_title: "Прокси-серверы от сторонних разработчиков"
 ---
 
 # Прокси-серверы от сторонних разработчиков {#proksi-servery-ot-storonnikh-razrabotchikov}
@@ -41,4 +41,3 @@ toc_title: "\u041f\u0440\u043e\u043a\u0441\u0438\u002d\u0441\u0435\u0440\u0432\u
 
 Реализован на Go.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/interfaces/third-party/proxy/) <!--hide-->
diff --git a/docs/ru/introduction/distinctive-features.md b/docs/ru/introduction/distinctive-features.md
index 4eeeef4a443..dedb1412dbf 100644
--- a/docs/ru/introduction/distinctive-features.md
+++ b/docs/ru/introduction/distinctive-features.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 4
-toc_title: "\u041e\u0442\u043b\u0438\u0447\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0435\u0020\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e\u0441\u0442\u0438\u0020\u0043\u006c\u0069\u0063\u006b\u0048\u006f\u0075\u0073\u0065"
+toc_title: "Отличительные возможности ClickHouse"
 ---
 
 # Отличительные возможности ClickHouse {#otlichitelnye-vozmozhnosti-clickhouse}
@@ -73,4 +73,3 @@ ClickHouse предоставляет различные способы разм
 3.  Разреженный индекс делает ClickHouse плохо пригодным для точечных чтений одиночных строк по своим
     ключам.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/introduction/distinctive_features/) <!--hide-->
diff --git a/docs/ru/introduction/history.md b/docs/ru/introduction/history.md
index ab740954bbe..dc4aa935c27 100644
--- a/docs/ru/introduction/history.md
+++ b/docs/ru/introduction/history.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 7
-toc_title: "\u0418\u0441\u0442\u043e\u0440\u0438\u044f\u0020\u0043\u006c\u0069\u0063\u006b\u0048\u006f\u0075\u0073\u0065"
+toc_title: "История ClickHouse"
 ---
 
 
@@ -52,4 +52,3 @@ OLAPServer хорошо подходил для неагрегированных
 
 Чтобы снять ограничения OLAPServer-а и решить задачу работы с неагрегированными данными для всех отчётов, разработана СУБД ClickHouse.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/introduction/ya_metrika_task/) <!--hide-->
diff --git a/docs/ru/introduction/index.md b/docs/ru/introduction/index.md
index 28a8e10e15b..99f8aad0531 100644
--- a/docs/ru/introduction/index.md
+++ b/docs/ru/introduction/index.md
@@ -1,6 +1,4 @@
 ---
-toc_folder_title: "\u0412\u0432\u0435\u0434\u0435\u043D\u0438\u0435"
+toc_folder_title: "Введение"
 toc_priority: 1
 ---
-
-
diff --git a/docs/ru/introduction/info.md b/docs/ru/introduction/info.md
index a9398b8c9cd..a5e7efffc7e 100644
--- a/docs/ru/introduction/info.md
+++ b/docs/ru/introduction/info.md
@@ -9,4 +9,3 @@ toc_priority: 100
 -   Адрес электронной почты: <a class="feedback-email"></a>
 -   Телефон: <a href="tel:+74957806510">+7-495-780-6510</a>
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/introduction/info/) <!--hide-->
diff --git a/docs/ru/introduction/performance.md b/docs/ru/introduction/performance.md
index c449e76a6ea..eec1dcf4d0a 100644
--- a/docs/ru/introduction/performance.md
+++ b/docs/ru/introduction/performance.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 6
-toc_title: "\u041f\u0440\u043e\u0438\u0437\u0432\u043e\u0434\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0441\u0442\u044c"
+toc_title: "Производительность"
 ---
 
 # Производительность {#proizvoditelnost}
@@ -27,4 +27,3 @@ toc_title: "\u041f\u0440\u043e\u0438\u0437\u0432\u043e\u0434\u0438\u0442\u0435\u
 
 Данные рекомендуется вставлять пачками не менее 1000 строк или не более одного запроса в секунду. При вставке в таблицу типа MergeTree из tab-separated дампа, скорость вставки будет в районе 50-200 МБ/сек. Если вставляются строчки размером около 1 КБ, то скорость будет в районе 50 000 - 200 000 строчек в секунду. Если строчки маленькие - производительность в строчках в секунду будет выше (на данных БК - `>` 500 000 строк в секунду, на данных Graphite - `>` 1 000 000 строк в секунду). Для увеличения производительности, можно производить несколько запросов INSERT параллельно - при этом производительность растёт линейно.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/introduction/performance/) <!--hide-->
diff --git a/docs/ru/operations/access-rights.md b/docs/ru/operations/access-rights.md
index 00e55da7a82..a0ad7664131 100644
--- a/docs/ru/operations/access-rights.md
+++ b/docs/ru/operations/access-rights.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 48
-toc_title: "\u0423\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435\u0020\u0434\u043e\u0441\u0442\u0443\u043f\u043e\u043c"
+toc_title: "Управление доступом"
 ---
 
 # Управление доступом {#access-control}
@@ -146,4 +146,3 @@ ClickHouse поддерживает управление доступом на 
     По умолчанию управление доступом на основе SQL выключено для всех пользователей. Вам необходимо настроить хотя бы одного пользователя в файле конфигурации `users.xml` и присвоить значение 1 параметру [access_management](settings/settings-users.md#access_management-user-setting).
 
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/access_rights/) <!--hide-->
diff --git a/docs/ru/operations/backup.md b/docs/ru/operations/backup.md
index 165b54d9b62..ed0adeb5e6f 100644
--- a/docs/ru/operations/backup.md
+++ b/docs/ru/operations/backup.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 49
-toc_title: "\u0420\u0435\u0437\u0435\u0440\u0432\u043d\u043e\u0435\u0020\u043a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435\u0020\u0434\u0430\u043d\u043d\u044b\u0445"
+toc_title: "Резервное копирование данных"
 ---
 
 # Резервное копирование данных {#rezervnoe-kopirovanie-dannykh}
@@ -36,4 +36,3 @@ ClickHouse позволяет использовать запрос `ALTER TABLE
 
 Для автоматизации этого подхода доступен инструмент от сторонних разработчиков: [clickhouse-backup](https://github.com/AlexAkulov/clickhouse-backup).
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/backup/) <!--hide-->
diff --git a/docs/ru/operations/caches.md b/docs/ru/operations/caches.md
new file mode 100644
index 00000000000..a0b71d1782a
--- /dev/null
+++ b/docs/ru/operations/caches.md
@@ -0,0 +1,28 @@
+---
+toc_priority: 65
+toc_title: Кеши
+---
+
+# Типы кеша {#cache-types}
+
+При выполнении запросов ClickHouse использует различные типы кеша.
+
+Основные типы кеша:
+
+- `mark_cache` — кеш засечек, используемых движками таблиц семейства [MergeTree](../engines/table-engines/mergetree-family/mergetree.md).
+- `uncompressed_cache` — кеш несжатых данных, используемых движками таблиц семейства [MergeTree](../engines/table-engines/mergetree-family/mergetree.md).
+
+Дополнительные типы кеша:
+
+- DNS-кеш.
+- Кеш данных формата [regexp](../interfaces/formats.md#data-format-regexp).
+- Кеш скомпилированных выражений.
+- Кеш схем формата [Avro](../interfaces/formats.md#data-format-avro).
+- Кеш данных в [словарях](../sql-reference/dictionaries/index.md).
+
+Непрямое использование:
+
+- Кеш страницы ОС.
+
+Чтобы очистить кеш, используйте выражение [SYSTEM DROP ... CACHE](../sql-reference/statements/system.md).
+
diff --git a/docs/ru/operations/configuration-files.md b/docs/ru/operations/configuration-files.md
index a4cc9182427..11a01d1e6d2 100644
--- a/docs/ru/operations/configuration-files.md
+++ b/docs/ru/operations/configuration-files.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 50
-toc_title: "\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u043e\u043d\u043d\u044b\u0435\u0020\u0444\u0430\u0439\u043b\u044b"
+toc_title: "Конфигурационные файлы"
 ---
 
 
@@ -52,4 +52,3 @@ $ cat /etc/clickhouse-server/users.d/alice.xml
 
 Сервер следит за изменениями конфигурационных файлов, а также файлов и ZooKeeper-узлов, которые были использованы при выполнении подстановок и переопределений, и перезагружает настройки пользователей и кластеров на лету. То есть, можно изменять кластера, пользователей и их настройки без перезапуска сервера.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/configuration_files/) <!--hide-->
diff --git a/docs/ru/operations/external-authenticators/index.md b/docs/ru/operations/external-authenticators/index.md
new file mode 100644
index 00000000000..c2ed9750562
--- /dev/null
+++ b/docs/ru/operations/external-authenticators/index.md
@@ -0,0 +1,16 @@
+---
+toc_folder_title: "\u0412\u043d\u0435\u0448\u043d\u0438\u0435\u0020\u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440\u044b\u0020\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439\u0020\u0438\u0020\u043a\u0430\u0442\u0430\u043b\u043e\u0433\u0438"
+toc_priority: 48
+toc_title: "\u0412\u0432\u0435\u0434\u0435\u043d\u0438\u0435"
+---
+
+# Внешние аутентификаторы пользователей и каталоги {#external-authenticators}
+
+ClickHouse поддерживает аутентификацию и управление пользователями при помощи внешних сервисов.
+
+Поддерживаются следующие внешние аутентификаторы и каталоги:
+
+- [LDAP](./ldap.md#external-authenticators-ldap) [аутентификатор](./ldap.md#ldap-external-authenticator) и [каталог](./ldap.md#ldap-external-user-directory)
+- Kerberos [аутентификатор](./kerberos.md#external-authenticators-kerberos)
+
+[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/external-authenticators/index/) <!--hide-->
diff --git a/docs/ru/operations/external-authenticators/kerberos.md b/docs/ru/operations/external-authenticators/kerberos.md
new file mode 100644
index 00000000000..b90714d14fd
--- /dev/null
+++ b/docs/ru/operations/external-authenticators/kerberos.md
@@ -0,0 +1,118 @@
+# Kerberos {#external-authenticators-kerberos}
+
+ClickHouse предоставляет возможность аутентификации существующих (и правильно сконфигурированных) пользователей с использованием Kerberos.
+
+В настоящее время возможно использование Kerberos только как внешнего аутентификатора, то есть для аутентификации уже существующих пользователей с помощью Kerberos. Пользователи, настроенные для Kerberos-аутентификации, могут работать с ClickHouse только через HTTP-интерфейс, причём сами клиенты должны иметь возможность аутентификации с использованием механизма GSS-SPNEGO.
+
+
+!!! info "!!!"
+    Для Kerberos-аутентификации необходимо предварительно корректно настроить Kerberos на стороне клиента, на сервере и в конфигурационных файлах самого ClickHouse. Ниже описана лишь конфигурация ClickHouse.
+
+
+## Настройка Kerberos в ClickHouse {#enabling-kerberos-in-clickhouse}
+
+Для того, чтобы задействовать Kerberos-аутентификацию в ClickHouse, в первую очередь необходимо добавить одну-единственную секцию `kerberos` в `config.xml`.
+
+В секции могут быть указаны дополнительные параметры:
+
+- `principal` &mdash; задаёт имя принципала (canonical service principal name, SPN), используемое при авторизации ClickHouse на Kerberos-сервере.
+  - Это опциональный параметр, при его отсутствии будет использовано стандартное имя.
+
+- `realm` &mdash; обеспечивает фильтрацию по реалм (realm). Пользователям, чей реалм не совпадает с указанным, будет отказано в аутентификации.
+  - Это опциональный параметр, при его отсутствии фильтр по реалм применяться не будет.
+
+Примеры, как должен выглядеть файл `config.xml`:
+
+```xml
+<yandex>
+    <!- ... -->
+    <kerberos />
+</yandex>
+```
+
+Или, с указанием принципала:
+
+```xml
+<yandex>
+    <!- ... -->
+    <kerberos>
+        <principal>HTTP/clickhouse.example.com@EXAMPLE.COM</principal>
+    </kerberos>
+</yandex>
+```
+
+Или, с фильтрацией по реалм:
+
+```xml
+<yandex>
+    <!- ... -->
+    <kerberos>
+        <realm>EXAMPLE.COM</realm>
+    </kerberos>
+</yandex>
+```
+
+!!! Warning "Важно"
+    В конфигурационном файле не могут быть указаны одновременно оба параметра. В противном случае, аутентификация с помощью Kerberos будет недоступна для всех пользователей.
+
+!!! Warning "Важно"
+    В конфигурационном файле может быть не более одной секции `kerberos`. В противном случае, аутентификация с помощью Kerberos будет отключена для всех пользователей.  
+
+
+## Аутентификация пользователей с помощью Kerberos {#kerberos-as-an-external-authenticator-for-existing-users}
+
+Уже существующие пользователи могут воспользоваться аутентификацией с помощью Kerberos. Однако, Kerberos-аутентификация возможна только при использовании HTTP-интерфейса.
+
+Имя принципала (principal name) обычно имеет вид:
+
+- *primary/instance@REALM*
+
+Для успешной аутентификации необходимо, чтобы *primary* совпало с именем пользователя ClickHouse, настроенного для использования Kerberos.
+
+### Настройка Kerberos в `users.xml` {#enabling-kerberos-in-users-xml}
+
+Для того, чтобы пользователь имел возможность производить аутентификацию с помощью Kerberos, достаточно включить секцию `kerberos` в описание пользователя в `users.xml` (например, вместо секции `password` или аналогичной ей).
+
+В секции могут быть указаны дополнительные параметры:
+
+- `realm` &mdash; обеспечивает фильтрацию по реалм (realm): аутентификация будет возможна только при совпадении реалм клиента с указанным.
+  - Этот параметр является опциональным, при его отсутствии фильтрация применяться не будет.
+
+Пример, как выглядит конфигурация Kerberos в `users.xml`:
+
+```xml
+<yandex>
+    <!- ... -->
+    <users>
+        <!- ... -->
+        <my_user>
+            <!- ... -->
+            <kerberos>
+                <realm>EXAMPLE.COM</realm>
+            </kerberos>
+        </my_user>
+    </users>
+</yandex>
+```
+
+
+!!! Warning "Важно"
+    Если пользователь настроен для Kerberos-аутентификации, другие виды уатентификации будут для него недоступны. Если наряду с `kerberos` в определении пользователя будет указан какой-либо другой способ аутентификации, ClickHouse завершит работу.
+
+!!! info ""
+    Ещё раз отметим, что кроме `users.xml`, необходимо также включить Kerberos в `config.xml`.
+
+### Настройка Kerberos через SQL {#enabling-kerberos-using-sql}
+
+Пользователей, использующих Kerberos-аутентификацию, можно создать не только с помощью изменения конфигурационных файлов.
+Если SQL-ориентированное управление доступом включено в ClickHouse, можно также создать пользователя, работающего через Kerberos, с помощью SQL.
+
+```sql
+CREATE USER my_user IDENTIFIED WITH kerberos REALM 'EXAMPLE.COM'
+```
+
+Или, без фильтрации по реалм:
+
+```sql
+CREATE USER my_user IDENTIFIED WITH kerberos
+```
diff --git a/docs/ru/operations/external-authenticators/ldap.md b/docs/ru/operations/external-authenticators/ldap.md
new file mode 100644
index 00000000000..312020000ea
--- /dev/null
+++ b/docs/ru/operations/external-authenticators/ldap.md
@@ -0,0 +1,148 @@
+# LDAP {#external-authenticators-ldap} 
+
+Для аутентификации пользователей ClickHouse можно использовать сервер LDAP. Существуют два подхода:
+
+- Использовать LDAP как внешний аутентификатор для существующих пользователей, которые определены в `users.xml`, или в локальных параметрах управления доступом.
+- Использовать LDAP как внешний пользовательский каталог и разрешить аутентификацию локально неопределенных пользователей, если они есть на LDAP сервере.
+
+Для обоих подходов необходимо определить внутреннее имя LDAP сервера в конфигурации ClickHouse, чтобы другие параметры конфигурации могли ссылаться на это имя.
+
+## Определение LDAP сервера {#ldap-server-definition}
+
+Чтобы определить LDAP сервер, необходимо добавить секцию `ldap_servers` в `config.xml`.
+
+**Пример**
+
+```xml
+<yandex>
+    <!- ... -->
+    <ldap_servers>
+        <my_ldap_server>
+            <host>localhost</host>
+            <port>636</port>
+            <bind_dn>uid={user_name},ou=users,dc=example,dc=com</bind_dn>
+            <verification_cooldown>300</verification_cooldown>
+            <enable_tls>yes</enable_tls>
+            <tls_minimum_protocol_version>tls1.2</tls_minimum_protocol_version>
+            <tls_require_cert>demand</tls_require_cert>
+            <tls_cert_file>/path/to/tls_cert_file</tls_cert_file>
+            <tls_key_file>/path/to/tls_key_file</tls_key_file>
+            <tls_ca_cert_file>/path/to/tls_ca_cert_file</tls_ca_cert_file>
+            <tls_ca_cert_dir>/path/to/tls_ca_cert_dir</tls_ca_cert_dir>
+            <tls_cipher_suite>ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:AES256-GCM-SHA384</tls_cipher_suite>
+        </my_ldap_server>
+    </ldap_servers>
+</yandex>
+```
+
+Обратите внимание, что можно определить несколько LDAP серверов внутри секции `ldap_servers`, используя различные имена.
+
+**Параметры**
+
+- `host` — имя хоста сервера LDAP или его IP. Этот параметр обязательный и не может быть пустым.
+- `port` — порт сервера LDAP. Если настройка `enable_tls` равна `true`, то по умолчанию используется порт `636`, иначе — порт `389`.
+- `bind_dn` — шаблон для создания DN для привязки.
+    - При формировании DN все подстроки `{user_name}` в шаблоне будут заменяться на фактическое имя пользователя при каждой попытке аутентификации.
+- `verification_cooldown` — промежуток времени (в секундах) после успешной попытки привязки, в течение которого пользователь будет считаться аутентифицированным и сможет выполнять запросы без повторного обращения к серверам LDAP.
+    - Чтобы отключить кеширование и заставить обращаться к серверу LDAP для каждого запроса аутентификации, укажите `0` (значение по умолчанию). 
+- `enable_tls` — флаг, включающий использование защищенного соединения с сервером LDAP.
+    - Укажите `no` для использования текстового протокола `ldap://` (не рекомендовано).
+    - Укажите `yes` для обращения к LDAP по протоколу SSL/TLS `ldaps://` (рекомендовано, используется по умолчанию).
+    - Укажите `starttls` для использования устаревшего протокола StartTLS (текстовый `ldap://` протокол, модернизированный до TLS).
+- `tls_minimum_protocol_version` — минимальная версия протокола SSL/TLS.
+    - Возможные значения: `ssl2`, `ssl3`, `tls1.0`, `tls1.1`, `tls1.2` (по-умолчанию).
+- `tls_require_cert` —  поведение при проверке сертификата SSL/TLS.
+    - Возможные значения: `never`, `allow`, `try`, `demand` (по-умолчанию).
+- `tls_cert_file` — путь к файлу сертификата.
+- `tls_key_file` — путь к файлу ключа сертификата.
+- `tls_ca_cert_file` — путь к файлу ЦС (certification authority) сертификата.
+- `tls_ca_cert_dir` — путь к каталогу, содержащему сертификаты ЦС. 
+- `tls_cipher_suite` — разрешенный набор шифров (в нотации OpenSSL).
+
+## Внешний аутентификатор LDAP {#ldap-external-authenticator}
+
+Удаленный сервер LDAP можно использовать для верификации паролей локально определенных пользователей (пользователей, которые определены в `users.xml` или в локальных параметрах управления доступом). Для этого укажите имя определенного ранее сервера LDAP вместо `password` или другой аналогичной секции в настройках пользователя.
+
+При каждой попытке авторизации ClickHouse пытается "привязаться" к DN, указанному в [определении LDAP сервера](#ldap-server-definition), используя параметр `bind_dn` и предоставленные реквизиты для входа. Если попытка оказалась успешной, пользователь считается аутентифицированным. Обычно это называют методом "простой привязки".
+
+**Пример**
+
+```xml
+<yandex>
+    <!- ... -->
+    <users>
+        <!- ... -->
+        <my_user>
+            <!- ... -->
+            <ldap>
+                <server>my_ldap_server</server>
+            </ldap>
+        </my_user>
+    </users>
+</yandex>
+```
+
+Обратите внимание, что пользователь `my_user` ссылается на `my_ldap_server`. Этот LDAP сервер должен быть настроен в основном файле `config.xml`, как это было описано ранее.
+
+При включенном SQL-ориентированном [управлении доступом](../access-rights.md#access-control) пользователи, аутентифицированные LDAP серверами, могут также быть созданы запросом [CREATE USER](../../sql-reference/statements/create/user.md#create-user-statement).
+
+Запрос:
+
+```sql
+CREATE USER my_user IDENTIFIED WITH ldap SERVER 'my_ldap_server';
+```
+
+## Внешний пользовательский каталог LDAP {#ldap-external-user-directory}
+
+В дополнение к локально определенным пользователям, удаленный LDAP сервер может служить источником определения пользователей. Для этого укажите имя определенного ранее сервера LDAP (см. [Определение LDAP сервера](#ldap-server-definition)) в секции `ldap` внутри секции `users_directories` файла `config.xml`.
+
+При каждой попытке аутентификации ClickHouse пытается локально найти определение пользователя и аутентифицировать его как обычно. Если пользователь не находится локально, ClickHouse предполагает, что он определяется во внешнем LDAP каталоге и пытается "привязаться" к DN, указанному на LDAP сервере, используя предоставленные реквизиты для входа. Если попытка оказалась успешной, пользователь считается существующим и  аутентифицированным. Пользователю присваиваются роли из списка, указанного в секции `roles`. Кроме того, если настроена секция `role_mapping`, то выполняется LDAP поиск, а его результаты преобразуются в имена ролей и присваиваются пользователям. Все это работает при условии, что SQL-ориентированное [управлением доступом](../access-rights.md#access-control) включено, а роли созданы запросом [CREATE ROLE](../../sql-reference/statements/create/role.md#create-role-statement).
+
+**Пример**
+
+В `config.xml`.
+
+```xml
+<yandex>
+    <!- ... -->
+    <user_directories>
+        <!- ... -->
+        <ldap>
+            <server>my_ldap_server</server>
+            <roles>
+                <my_local_role1 />
+                <my_local_role2 />
+            </roles>
+            <role_mapping>
+                <base_dn>ou=groups,dc=example,dc=com</base_dn>
+                <scope>subtree</scope>
+                <search_filter>(&amp;(objectClass=groupOfNames)(member={bind_dn}))</search_filter>
+                <attribute>cn</attribute>
+                <prefix>clickhouse_</prefix>
+            </role_mapping>
+        </ldap>
+    </user_directories>
+</yandex>
+```
+
+Обратите внимание, что `my_ldap_server`, указанный в секции `ldap` внутри секции `user_directories`, должен быть настроен в файле `config.xml`, как это было описано ранее. (см. [Определение LDAP сервера](#ldap-server-definition)).
+
+**Параметры**
+
+- `server` — имя одного из серверов LDAP, определенных в секции `ldap_servers` в файле конфигурации (см.выше). Этот параметр обязательный и не может быть пустым.
+- `roles` — секция со списком локально определенных ролей, которые будут присвоены каждому пользователю, полученному от сервера LDAP.
+    - Если роли не указаны ни здесь, ни в секции `role_mapping` (см. ниже), пользователь после аутентификации не сможет выполнять никаких действий.
+- `role_mapping` — секция c параметрами LDAP поиска и правилами отображения.
+    - При аутентификации пользователя, пока еще связанного с LDAP, производится LDAP поиск с помощью `search_filter` и имени этого пользователя. Для каждой записи, найденной в ходе поиска, выделяется значение указанного атрибута. У каждого атрибута, имеющего указанный префикс, этот префикс удаляется, а остальная часть значения становится именем локальной роли, определенной в ClickHouse, причем предполагается, что эта роль была ранее создана запросом [CREATE ROLE](../../sql-reference/statements/create/role.md#create-role-statement) до этого.
+    - Внутри одной секции `ldap` может быть несколько секций `role_mapping`. Все они будут применены.
+        - `base_dn` — шаблон, который используется для создания базового DN для LDAP поиска.
+           - При формировании DN все подстроки `{user_name}` и `{bind_dn}` в шаблоне будут заменяться на фактическое имя пользователя и DN привязки соответственно при каждом LDAP поиске.
+        - `scope` — Область LDAP поиска.
+            - Возможные значения: `base`, `one_level`, `children`, `subtree` (по умолчанию).
+        - `search_filter` — шаблон, который используется для создания фильтра для каждого LDAP поиска.
+            - при формировании фильтра все подстроки `{user_name}`, `{bind_dn}` и `{base_dn}` в шаблоне будут заменяться на фактическое имя пользователя, DN привязки и базовый DN соответственно при каждом LDAP поиске.
+            - Обратите внимание, что специальные символы должны быть правильно экранированы в XML.
+        - `attribute` — имя атрибута, значение которого будет возвращаться LDAP поиском.
+        - `prefix` — префикс, который, как предполагается, будет находиться перед началом каждой строки в исходном списке строк, возвращаемых LDAP поиском. Префикс будет удален из исходных строк, а сами они будут рассматриваться как имена локальных ролей. По умолчанию: пустая строка. 
+
+[Оригинальная статья](https://clickhouse.tech/docs/en/operations/external-authenticators/ldap) <!--hide-->
diff --git a/docs/ru/operations/index.md b/docs/ru/operations/index.md
index 74a1d135967..88212e6804f 100644
--- a/docs/ru/operations/index.md
+++ b/docs/ru/operations/index.md
@@ -1,7 +1,7 @@
 ---
-toc_folder_title: "\u042d\u043a\u0441\u043f\u043b\u0443\u0430\u0442\u0430\u0446\u0438\u044f"
+toc_folder_title: "Эксплуатация"
 toc_priority: 41
-toc_title: "\u042d\u043a\u0441\u043f\u043b\u0443\u0430\u0442\u0430\u0446\u0438\u044f"
+toc_title: "Эксплуатация"
 ---
 
 # Эксплуатация {#operations}
@@ -23,4 +23,3 @@ toc_title: "\u042d\u043a\u0441\u043f\u043b\u0443\u0430\u0442\u0430\u0446\u0438\u
 - [Настройки](settings/index.md#settings)
 - [Утилиты](utilities/index.md)
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/) <!--hide-->
diff --git a/docs/ru/operations/monitoring.md b/docs/ru/operations/monitoring.md
index 52d0b5ecc8a..da51d27ded2 100644
--- a/docs/ru/operations/monitoring.md
+++ b/docs/ru/operations/monitoring.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 45
-toc_title: "\u041c\u043e\u043d\u0438\u0442\u043e\u0440\u0438\u043d\u0433"
+toc_title: "Мониторинг"
 ---
 
 # Мониторинг {#monitoring}
@@ -43,4 +43,3 @@ ClickHouse собирает:
 
 Для мониторинга серверов в кластерной конфигурации необходимо установить параметр [max_replica_delay_for_distributed_queries](settings/settings.md#settings-max_replica_delay_for_distributed_queries) и использовать HTTP ресурс `/replicas_status`. Если реплика доступна и не отстаёт от других реплик, то запрос к `/replicas_status` возвращает `200 OK`. Если реплика отстаёт, то запрос возвращает `503 HTTP_SERVICE_UNAVAILABLE`, включая информацию о размере отставания.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/system_tables/monitoring) <!--hide-->
diff --git a/docs/ru/operations/opentelemetry.md b/docs/ru/operations/opentelemetry.md
new file mode 100644
index 00000000000..073e7c67e9c
--- /dev/null
+++ b/docs/ru/operations/opentelemetry.md
@@ -0,0 +1,36 @@
+---
+toc_priority: 62
+toc_title: Поддержка OpenTelemetry
+---
+
+# [экспериментально] Поддержка OpenTelemetry
+
+ClickHouse поддерживает [OpenTelemetry](https://opentelemetry.io/) — открытый стандарт для сбора трассировок и метрик из распределенного приложения. 
+
+!!! warning "Предупреждение"
+Поддержка стандарта экспериментальная и будет со временем меняться.
+
+## Обеспечение поддержки контекста трассировки в ClickHouse
+
+ClickHouse принимает контекстную информацию трассировки через HTTP заголовок `tracecontext`, как описано в [рекомендации W3C](https://www.w3.org/TR/trace-context/). Также он принимает контекстную информацию через нативный протокол, который используется для связи между серверами ClickHouse или между клиентом и сервером. Для ручного тестирования стандартный заголовок `tracecontext`, содержащий контекст трассировки, может быть передан в `clickhouse-client` через флаги: `--opentelemetry-traceparent` и `--opentelemetry-tracestate`.
+
+Если входящий контекст трассировки не указан, ClickHouse может начать трассировку с вероятностью, задаваемой настройкой [opentelemetry_start_trace_probability](../operations/settings/settings.md#opentelemetry-start-trace-probability).
+
+## Распространение контекста трассировки
+
+Контекст трассировки распространяется на нижестоящие сервисы в следующих случаях:
+
+* При использовании запросов к удаленным серверам ClickHouse, например, при использовании движка таблиц [Distributed](../engines/table-engines/special/distributed.md).
+
+* При использовании табличной функции [url](../sql-reference/table-functions/url.md). Информация контекста трассировки передается в HTTP заголовки.
+
+## Как ClickHouse выполняет трассировку
+
+ClickHouse создает `trace spans` для каждого запроса и некоторых этапов выполнения запроса, таких как планирование запросов или распределенные запросы.
+
+Чтобы анализировать информацию трассировки, ее следует экспортировать в систему мониторинга, поддерживающую OpenTelemetry, такую как [Jaeger](https://jaegertracing.io/) или [Prometheus](https://prometheus.io/). ClickHouse не зависит от конкретной системы мониторинга, вместо этого предоставляя данные трассировки только через системную таблицу. Информация о диапазоне трассировки в OpenTelemetry, [требуемая стандартом](https://github.com/open-telemetry/opentelemetry-specification/blob/master/specification/overview.md#span), хранится в системной таблице [system.opentelemetry_span_log](../operations/system-tables/opentelemetry_span_log.md).
+
+Таблица должна быть включена в конфигурации сервера, смотрите элемент `opentelemetry_span_log` в файле конфигурации `config.xml`. По умолчанию таблица включена всегда.
+
+Теги или атрибуты сохраняются в виде двух параллельных массивов, содержащих ключи и значения. Для работы с ними используйте [ARRAY JOIN](../sql-reference/statements/select/array-join.md).
+
diff --git a/docs/ru/operations/quotas.md b/docs/ru/operations/quotas.md
index 92533eef0c1..78966492f25 100644
--- a/docs/ru/operations/quotas.md
+++ b/docs/ru/operations/quotas.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 51
-toc_title: "\u041a\u0432\u043e\u0442\u044b"
+toc_title: "Квоты"
 ---
 
 # Квоты {#quotas}
@@ -29,6 +29,8 @@ toc_title: "\u041a\u0432\u043e\u0442\u044b"
 
             <!-- Без ограничений. Просто считать соответствующие данные за указанный интервал. -->
             <queries>0</queries>
+            <query_selects>0</query_selects>
+            <query_inserts>0</query_inserts>
             <errors>0</errors>
             <result_rows>0</result_rows>
             <read_rows>0</read_rows>
@@ -48,6 +50,8 @@ toc_title: "\u041a\u0432\u043e\u0442\u044b"
         <duration>3600</duration>
 
         <queries>1000</queries>
+        <query_selects>100</query_selects>
+        <query_inserts>100</query_inserts>
         <errors>100</errors>
         <result_rows>1000000000</result_rows>
         <read_rows>100000000000</read_rows>
@@ -58,6 +62,8 @@ toc_title: "\u041a\u0432\u043e\u0442\u044b"
         <duration>86400</duration>
 
         <queries>10000</queries>
+        <query_selects>10000</query_selects>
+        <query_inserts>10000</query_inserts>
         <errors>1000</errors>
         <result_rows>5000000000</result_rows>
         <read_rows>500000000000</read_rows>
@@ -74,6 +80,10 @@ toc_title: "\u041a\u0432\u043e\u0442\u044b"
 
 `queries` - общее количество запросов;
 
+`query_selects` – общее количество запросов `SELECT`.
+
+`query_inserts` – общее количество запросов `INSERT`.
+
 `errors` - количество запросов, при выполнении которых было выкинуто исключение;
 
 `result_rows` - суммарное количество строк, отданных в виде результата;
@@ -107,4 +117,3 @@ toc_title: "\u041a\u0432\u043e\u0442\u044b"
 
 При перезапуске сервера, квоты сбрасываются.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/quotas/) <!--hide-->
diff --git a/docs/ru/operations/requirements.md b/docs/ru/operations/requirements.md
index 36a7dd30b34..6567dcc9695 100644
--- a/docs/ru/operations/requirements.md
+++ b/docs/ru/operations/requirements.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 44
-toc_title: "\u0422\u0440\u0435\u0431\u043e\u0432\u0430\u043d\u0438\u044f"
+toc_title: "Требования"
 ---
 
 # Требования {#trebovaniia}
diff --git a/docs/ru/operations/server-configuration-parameters/index.md b/docs/ru/operations/server-configuration-parameters/index.md
index a691fe69fef..503c5d32163 100644
--- a/docs/ru/operations/server-configuration-parameters/index.md
+++ b/docs/ru/operations/server-configuration-parameters/index.md
@@ -1,7 +1,7 @@
 ---
-toc_folder_title: "\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u043e\u043d\u043d\u044b\u0435\u0020\u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b\u0020\u0441\u0435\u0440\u0432\u0435\u0440\u0430"
+toc_folder_title: "Конфигурационные параметры сервера"
 toc_priority: 54
-toc_title: "\u0412\u0432\u0435\u0434\u0435\u043d\u0438\u0435"
+toc_title: "Введение"
 ---
 
 # Конфигурационные параметры сервера {#server-settings}
@@ -14,4 +14,3 @@ toc_title: "\u0412\u0432\u0435\u0434\u0435\u043d\u0438\u0435"
 
 Перед изучением настроек ознакомьтесь с разделом [Конфигурационные файлы](../configuration-files.md#configuration_files), обратите внимание на использование подстановок (атрибуты `incl` и `optional`).
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/server_configuration_parameters/) <!--hide-->
diff --git a/docs/ru/operations/server-configuration-parameters/settings.md b/docs/ru/operations/server-configuration-parameters/settings.md
index 15ab13836e3..be9e2deab74 100644
--- a/docs/ru/operations/server-configuration-parameters/settings.md
+++ b/docs/ru/operations/server-configuration-parameters/settings.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 57
-toc_title: "\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u043e\u043d\u043d\u044b\u0435\u0020\u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b\u0020\u0441\u0435\u0440\u0432\u0435\u0440\u0430"
+toc_title: "Конфигурационные параметры сервера"
 ---
 
 # Конфигурационные параметры сервера {#server-configuration-parameters-reference}
@@ -101,6 +101,12 @@ ClickHouse проверяет условия для `min_part_size` и `min_part
 </core_dump> 
 ```
 
+## database_atomic_delay_before_drop_table_sec {#database_atomic_delay_before_drop_table_sec}
+
+Устанавливает задержку перед удалением табличных данных, в секундах. Если запрос имеет идентификатор `SYNC`, эта настройка игнорируется.
+
+Значение по умолчанию: `480` (8 минут).
+
 ## default\_database {#default-database}
 
 База данных по умолчанию.
@@ -285,7 +291,7 @@ ClickHouse проверяет условия для `min_part_size` и `min_part
 
 ## interserver_http_host {#interserver-http-host}
 
-Имя хоста, которое могут использовать другие серверы для обращения к этому.
+Имя хоста, которое могут использовать другие серверы для обращения к этому хосту.
 
 Если не указано, то определяется аналогично команде `hostname -f`.
 
@@ -297,11 +303,36 @@ ClickHouse проверяет условия для `min_part_size` и `min_part
 <interserver_http_host>example.yandex.ru</interserver_http_host>
 ```
 
+## interserver_https_port {#interserver-https-port}
+
+Порт для обмена данными между репликами ClickHouse по протоколу `HTTPS`.
+
+**Пример**
+
+``` xml
+<interserver_https_port>9010</interserver_https_port>
+```
+
+## interserver_https_host {#interserver-https-host}
+
+Имя хоста, которое могут использовать другие реплики для обращения к нему по протоколу `HTTPS`.
+
+**Пример**
+
+``` xml
+<interserver_https_host>example.yandex.ru</interserver_https_host>
+```
+
+
+
 ## interserver_http_credentials {#server-settings-interserver-http-credentials}
 
 Имя пользователя и пароль, использующиеся для аутентификации при [репликации](../../operations/server-configuration-parameters/settings.md) движками Replicated\*. Это имя пользователя и пароль используются только для взаимодействия между репликами кластера и никак не связаны с аутентификацией клиентов ClickHouse. Сервер проверяет совпадение имени и пароля для соединяющихся с ним реплик, а также использует это же имя и пароль для соединения с другими репликами. Соответственно, эти имя и пароль должны быть прописаны одинаковыми для всех реплик кластера.
 По умолчанию аутентификация не используется.
 
+!!! note "Примечание"
+    Эти учетные данные являются общими для обмена данными по протоколам `HTTP` и `HTTPS`.
+
 Раздел содержит следующие параметры:
 
 -   `user` — имя пользователя.
@@ -481,7 +512,15 @@ ClickHouse проверяет условия для `min_part_size` и `min_part
 
 ## max_concurrent_queries {#max-concurrent-queries}
 
-Максимальное количество одновременно обрабатываемых запросов.
+Определяет максимальное количество одновременно обрабатываемых запросов, связанных с таблицей семейства `MergeTree`. Запросы также могут быть ограничены настройками: [max_concurrent_queries_for_all_users](#max-concurrent-queries-for-all-users), [min_marks_to_honor_max_concurrent_queries](#min-marks-to-honor-max-concurrent-queries).
+
+!!! info "Примечание"
+	Параметры этих настроек могут быть изменены во время выполнения запросов и вступят в силу немедленно. Запросы, которые уже запущены, выполнятся без изменений. 
+
+Возможные значения:
+
+-   Положительное целое число.
+-   0 — выключена.
 
 **Пример**
 
@@ -509,6 +548,21 @@ ClickHouse проверяет условия для `min_part_size` и `min_part
 
 -   [max_concurrent_queries](#max-concurrent-queries)
 
+## min_marks_to_honor_max_concurrent_queries {#min-marks-to-honor-max-concurrent-queries}
+
+Определяет минимальное количество засечек, считываемых запросом для применения настройки [max_concurrent_queries](#max-concurrent-queries).
+
+Возможные значения:
+
+-   Положительное целое число.
+-   0 — выключена.
+
+**Пример**
+
+``` xml
+<min_marks_to_honor_max_concurrent_queries>10</min_marks_to_honor_max_concurrent_queries>
+```
+
 ## max_connections {#max-connections}
 
 Максимальное количество входящих соединений.
@@ -1159,5 +1213,3 @@ ClickHouse использует ZooKeeper для хранения метадан
         </roles>
 </ldap>
 ```
-
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/server_configuration_parameters/settings/) <!--hide-->
diff --git a/docs/ru/operations/settings/constraints-on-settings.md b/docs/ru/operations/settings/constraints-on-settings.md
index b23be22958c..754d6cbba8a 100644
--- a/docs/ru/operations/settings/constraints-on-settings.md
+++ b/docs/ru/operations/settings/constraints-on-settings.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 62
-toc_title: "\u041e\u0433\u0440\u0430\u043d\u0438\u0447\u0435\u043d\u0438\u044f\u0020\u043d\u0430\u0020\u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u0435\u0020\u043d\u0430\u0441\u0442\u0440\u043e\u0435\u043a"
+toc_title: "Ограничения на изменение настроек"
 ---
 
 # Ограничения на изменение настроек {#constraints-on-settings}
@@ -71,4 +71,3 @@ Code: 452, e.displayText() = DB::Exception: Setting force_index_by_date should n
 
 **Примечание:** профиль с именем `default` обрабатывается специальным образом: все ограничения на изменение настроек из этого профиля становятся дефолтными и влияют на всех пользователей, кроме тех, где эти ограничения явно переопределены.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/settings/constraints_on_settings/) <!--hide-->
diff --git a/docs/ru/operations/settings/index.md b/docs/ru/operations/settings/index.md
index 2ef1d4730a3..050df975b47 100644
--- a/docs/ru/operations/settings/index.md
+++ b/docs/ru/operations/settings/index.md
@@ -54,4 +54,3 @@ SELECT getSetting('custom_a');
 
 -   [Конфигурационные параметры сервера](../../operations/server-configuration-parameters/settings.md)
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/settings/) <!--hide-->
diff --git a/docs/ru/operations/settings/merge-tree-settings.md b/docs/ru/operations/settings/merge-tree-settings.md
index bfc0b0a2644..f9093d379e3 100644
--- a/docs/ru/operations/settings/merge-tree-settings.md
+++ b/docs/ru/operations/settings/merge-tree-settings.md
@@ -55,6 +55,26 @@ Eсли число кусков в партиции превышает знач
 
 ClickHouse искусственно выполняет `INSERT` дольше (добавляет ‘sleep’), чтобы фоновый механизм слияния успевал слиять куски быстрее, чем они добавляются.
 
+## inactive_parts_to_throw_insert {#inactive-parts-to-throw-insert}
+
+Если число неактивных кусков в партиции превышает значение `inactive_parts_to_throw_insert`, `INSERT` прерывается с исключением «Too many inactive parts (N). Parts cleaning are processing significantly slower than inserts».
+
+Возможные значения:
+
+-   Положительное целое число.
+
+Значение по умолчанию: 0 (не ограничено).
+
+## inactive_parts_to_delay_insert {#inactive-parts-to-delay-insert}
+
+Если число неактивных кусков в партиции больше или равно значению `inactive_parts_to_delay_insert`, `INSERT` искусственно замедляется. Это полезно, когда сервер не может быстро очистить неактивные куски.
+
+Возможные значения:
+
+-   Положительное целое число.
+
+Значение по умолчанию: 0 (не ограничено).
+
 ## max_delay_to_insert {#max-delay-to-insert}
 
 Величина в секундах, которая используется для расчета задержки `INSERT`, если число кусков в партиции превышает значение [parts_to_delay_insert](#parts-to-delay-insert).
diff --git a/docs/ru/operations/settings/permissions-for-queries.md b/docs/ru/operations/settings/permissions-for-queries.md
index ae896dac77c..8cd5a2570ca 100644
--- a/docs/ru/operations/settings/permissions-for-queries.md
+++ b/docs/ru/operations/settings/permissions-for-queries.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 58
-toc_title: "\u0420\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u0438\u044f\u0020\u0434\u043b\u044f\u0020\u0437\u0430\u043f\u0440\u043e\u0441\u043e\u0432"
+toc_title: "Разрешения для запросов"
 ---
 
 # Разрешения для запросов {#permissions_for_queries}
@@ -59,4 +59,3 @@ toc_title: "\u0420\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u0438\u044f\u0020\u
 
 1
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/settings/permissions_for_queries/) <!--hide-->
diff --git a/docs/ru/operations/settings/query-complexity.md b/docs/ru/operations/settings/query-complexity.md
index b0eac5d96e7..c2e00302d18 100644
--- a/docs/ru/operations/settings/query-complexity.md
+++ b/docs/ru/operations/settings/query-complexity.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 59
-toc_title: "\u041e\u0433\u0440\u0430\u043d\u0438\u0447\u0435\u043d\u0438\u044f\u0020\u043d\u0430\u0020\u0441\u043b\u043e\u0436\u043d\u043e\u0441\u0442\u044c\u0020\u0437\u0430\u043f\u0440\u043e\u0441\u0430"
+toc_title: "Ограничения на сложность запроса"
 ---
 
 # Ограничения на сложность запроса {#restrictions-on-query-complexity}
@@ -314,4 +314,3 @@ FORMAT Null;
 
 > «Too many partitions for single INSERT block (more than» + toString(max_parts) + «). The limit is controlled by ‘max_partitions_per_insert_block’ setting. Large number of partitions is a common misconception. It will lead to severe negative performance impact, including slow server startup, slow INSERT queries and slow SELECT queries. Recommended total number of partitions for a table is under 1000..10000. Please note, that partitioning is not intended to speed up SELECT queries (ORDER BY key is sufficient to make range queries fast). Partitions are intended for data manipulation (DROP PARTITION, etc).»
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/settings/query_complexity/) <!--hide-->
diff --git a/docs/ru/operations/settings/settings-profiles.md b/docs/ru/operations/settings/settings-profiles.md
index 10feda01850..d3b3d29db94 100644
--- a/docs/ru/operations/settings/settings-profiles.md
+++ b/docs/ru/operations/settings/settings-profiles.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 61
-toc_title: "\u041f\u0440\u043e\u0444\u0438\u043b\u0438\u0020\u043d\u0430\u0441\u0442\u0440\u043e\u0435\u043a"
+toc_title: "Профили настроек"
 ---
 
 # Профили настроек {#settings-profiles}
@@ -77,4 +77,3 @@ SET profile = 'web'
 
 Профиль `web` — обычный профиль, который может быть установлен с помощью запроса `SET` или параметра URL при запросе по HTTP.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/settings/settings_profiles/) <!--hide-->
diff --git a/docs/ru/operations/settings/settings-users.md b/docs/ru/operations/settings/settings-users.md
index 2069922d0ea..6a10e518817 100644
--- a/docs/ru/operations/settings/settings-users.md
+++ b/docs/ru/operations/settings/settings-users.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 63
-toc_title: "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438\u0020\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439"
+toc_title: "Настройки пользователей"
 ---
 
 # Настройки пользователей {#nastroiki-polzovatelei}
@@ -162,4 +162,3 @@ toc_title: "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438\u0020\u043f\u
 
 Элемент `filter` содержать любое выражение, возвращающее значение типа [UInt8](../../sql-reference/data-types/int-uint.md). Обычно он содержит сравнения и логические операторы. Строки `database_name.table1`, для которых фильтр возвращает 0 не выдаются пользователю. Фильтрация несовместима с операциями `PREWHERE` и отключает оптимизацию `WHERE→PREWHERE`.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/settings/settings_users/) <!--hide-->
diff --git a/docs/ru/operations/settings/settings.md b/docs/ru/operations/settings/settings.md
index 7322b6c9184..7acdd65051b 100644
--- a/docs/ru/operations/settings/settings.md
+++ b/docs/ru/operations/settings/settings.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 60
-toc_title: "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438"
+toc_title: "Настройки"
 ---
 
 # Настройки {#settings}
@@ -134,7 +134,7 @@ ClickHouse применяет настройку в тех случаях, ко
 
 ## max_http_get_redirects {#setting-max_http_get_redirects}
 
-Ограничивает максимальное количество переходов по редиректам в таблицах с движком [URL](../../engines/table-engines/special/url.md) при выполнении HTTP запросов методом GET. Настройка применяется для обоих типов таблиц: созданных запросом [CREATE TABLE](../../sql_reference/create/#create-table-query) и с помощью табличной функции [url](../../sql-reference/table-functions/url.md).
+Ограничивает максимальное количество переходов по редиректам в таблицах с движком [URL](../../engines/table-engines/special/url.md) при выполнении HTTP запросов методом GET. Настройка применяется для обоих типов таблиц: созданных запросом [CREATE TABLE](../../sql-reference/statements/create/table.md#create-table-query) и с помощью табличной функции [url](../../sql-reference/table-functions/url.md).
 
 Возможные значения:
 
@@ -306,7 +306,7 @@ INSERT INTO test VALUES (lower('Hello')), (lower('world')), (lower('INSERT')), (
 CREATE TABLE table_with_enum_column_for_tsv_insert (Id Int32,Value Enum('first' = 1, 'second' = 2)) ENGINE=Memory();
 ```
 
-При включенной настройке `input_format_tsv_enum_as_number`:  
+При включенной настройке `input_format_tsv_enum_as_number`:
 
 ```sql
 SET input_format_tsv_enum_as_number = 1;
@@ -556,7 +556,7 @@ ClickHouse может парсить только базовый формат `Y
 
 Возможные значения:
 
--   0 — Устаревшее поведение отключено. 
+-   0 — Устаревшее поведение отключено.
 -   1 — Устаревшее поведение включено.
 
 Значение по умолчанию: 0.
@@ -759,6 +759,38 @@ log_queries_min_type='EXCEPTION_WHILE_PROCESSING'
 log_query_threads=1
 ```
 
+## log_comment {#settings-log-comment}
+
+Задаёт значение поля `log_comment` таблицы [system.query_log](../system-tables/query_log.md) и текст комментария в логе сервера.
+
+Может быть использована для улучшения читабельности логов сервера. Кроме того, помогает быстро выделить связанные с тестом запросы из `system.query_log` после запуска [clickhouse-test](../../development/tests.md).
+
+Возможные значения:
+
+-   Любая строка не длиннее [max_query_size](#settings-max_query_size). При превышении длины сервер сгенерирует исключение.
+
+Значение по умолчанию: пустая строка.
+
+**Пример**
+
+Запрос:
+
+``` sql
+SET log_comment = 'log_comment test', log_queries = 1;
+SELECT 1;
+SYSTEM FLUSH LOGS;
+SELECT type, query FROM system.query_log WHERE log_comment = 'log_comment test' AND event_date >= yesterday() ORDER BY event_time DESC LIMIT 2;
+```
+
+Результат:
+
+``` text
+┌─type────────┬─query─────┐
+│ QueryStart  │ SELECT 1; │
+│ QueryFinish │ SELECT 1; │
+└─────────────┴───────────┘
+```
+
 ## max_insert_block_size {#settings-max_insert_block_size}
 
 Формировать блоки указанного размера, при вставке в таблицу.
@@ -1087,8 +1119,23 @@ load_balancing = round_robin
 ## max_parallel_replicas {#settings-max_parallel_replicas}
 
 Максимальное количество используемых реплик каждого шарда при выполнении запроса.
-Для консистентности (чтобы получить разные части одного и того же разбиения), эта опция работает только при заданном ключе сэмплирования.
-Отставание реплик не контролируется.
+
+Возможные значения:
+
+-   Целое положительное число.
+
+**Дополнительная информация**
+
+Эта настройка полезна для реплицируемых таблиц с ключом сэмплирования. Запрос может обрабатываться быстрее, если он выполняется на нескольких серверах параллельно. Однако производительность обработки запроса, наоборот, может упасть в следующих ситуациях:
+
+- Позиция ключа сэмплирования в ключе партиционирования не позволяет выполнять эффективное сканирование.
+- Добавление ключа сэмплирования в таблицу делает фильтрацию по другим столбцам менее эффективной.
+- Ключ сэмплирования является выражением, которое сложно вычисляется.
+- У распределения сетевых задержек в кластере длинный «хвост», из-за чего при параллельных запросах к нескольким серверам увеличивается среднее время задержки.
+
+!!! warning "Предупреждение"
+    Параллельное выполнение запроса может привести к неверному результату, если в запросе есть объединение или подзапросы и при этом таблицы не удовлетворяют определенным требованиям. Подробности смотрите в разделе [Распределенные подзапросы и max_parallel_replicas](../../sql-reference/operators/in.md#max_parallel_replica-subqueries).
+
 
 ## compile {#compile}
 
@@ -1236,7 +1283,7 @@ SELECT area/period FROM account_orders FORMAT JSON;
 CREATE TABLE table_with_enum_column_for_csv_insert (Id Int32,Value Enum('first' = 1, 'second' = 2)) ENGINE=Memory();
 ```
 
-При включенной настройке `input_format_csv_enum_as_number`:  
+При включенной настройке `input_format_csv_enum_as_number`:
 
 ```sql
 SET input_format_csv_enum_as_number = 1;
@@ -1731,7 +1778,7 @@ ClickHouse генерирует исключение
 
 Включает или отключает режим синхронного добавления данных в распределенные таблицы (таблицы с движком [Distributed](../../engines/table-engines/special/distributed.md#distributed)).
 
-По умолчанию ClickHouse вставляет данные в распределённую таблицу в асинхронном режиме. Если `insert_distributed_sync=1`, то данные вставляются сихронно, а запрос `INSERT` считается выполненным успешно, когда данные записаны на все шарды (по крайней мере на одну реплику для каждого шарда, если `internal_replication = true`).  
+По умолчанию ClickHouse вставляет данные в распределённую таблицу в асинхронном режиме. Если `insert_distributed_sync=1`, то данные вставляются сихронно, а запрос `INSERT` считается выполненным успешно, когда данные записаны на все шарды (по крайней мере на одну реплику для каждого шарда, если `internal_replication = true`).
 
 Возможные значения:
 
@@ -1744,6 +1791,67 @@ ClickHouse генерирует исключение
 
 -   [Движок Distributed](../../engines/table-engines/special/distributed.md#distributed)
 -   [Управление распределёнными таблицами](../../sql-reference/statements/system.md#query-language-system-distributed)
+
+## insert_distributed_one_random_shard {#insert_distributed_one_random_shard}
+
+Включает или отключает режим вставки данных в [Distributed](../../engines/table-engines/special/distributed.md#distributed)) таблицу в случайный шард при отсутствии ключ шардирования.
+
+По умолчанию при вставке данных в `Distributed` таблицу с несколькими шардами и при отсутствии ключа шардирования сервер ClickHouse будет отклонять любой запрос на вставку данных. Когда `insert_distributed_one_random_shard = 1`, вставки принимаются, а данные записываются в случайный шард.
+
+Возможные значения:
+
+-   0 — если у таблицы несколько шардов, но ключ шардирования отсутствует, вставка данных отклоняется.
+-   1 — если ключ шардирования отсутствует, то вставка данных осуществляется в случайный шард среди всех доступных шардов.
+
+Значение по умолчанию: `0`.
+
+## insert_shard_id {#insert_shard_id}
+
+Если не `0`, указывает, в какой шард [Distributed](../../engines/table-engines/special/distributed.md#distributed) таблицы данные будут вставлены синхронно.
+
+Если значение настройки `insert_shard_id` указано неверно, сервер выдаст ошибку.
+
+Узнать количество шардов `shard_num` на кластере `requested_cluster` можно из конфигурации сервера, либо используя запрос:
+
+``` sql
+SELECT uniq(shard_num) FROM system.clusters WHERE cluster = 'requested_cluster';
+```
+
+Возможные значения:
+
+-   0 — выключено.
+-   Любое число от `1` до `shards_num` соответствующей [Distributed](../../engines/table-engines/special/distributed.md#distributed) таблицы.
+
+Значение по умолчанию: `0`.
+
+**Пример**
+
+Запрос:
+
+```sql
+CREATE TABLE x AS system.numbers ENGINE = MergeTree ORDER BY number;
+CREATE TABLE x_dist AS x ENGINE = Distributed('test_cluster_two_shards_localhost', currentDatabase(), x);
+INSERT INTO x_dist SELECT * FROM numbers(5) SETTINGS insert_shard_id = 1;
+SELECT * FROM x_dist ORDER BY number ASC;
+```
+
+Результат:
+
+``` text
+┌─number─┐
+│      0 │
+│      0 │
+│      1 │
+│      1 │
+│      2 │
+│      2 │
+│      3 │
+│      3 │
+│      4 │
+│      4 │
+└────────┘
+```
+
 ## validate_polygons {#validate_polygons}
 
 Включает или отключает генерирование исключения в функции [pointInPolygon](../../sql-reference/functions/geo/index.md#pointinpolygon), если многоугольник самопересекающийся или самокасающийся.
@@ -1937,6 +2045,21 @@ SELECT idx, i FROM null_in WHERE i IN (1, NULL) SETTINGS transform_null_in = 1;
 
 Значение по умолчанию: 16.
 
+## background_message_broker_schedule_pool_size {#background_message_broker_schedule_pool_size}
+
+Задает количество потоков для фонового потокового вывода сообщений. Настройка применяется при запуске сервера ClickHouse и не может быть изменена в пользовательском сеансе.
+
+Допустимые значения:
+
+-   Положительное целое число.
+
+Значение по умолчанию: 16.
+
+**Смотрите также**
+
+-   Движок [Kafka](../../engines/table-engines/integrations/kafka.md#kafka).
+-   Движок [RabbitMQ](../../engines/table-engines/integrations/rabbitmq.md#rabbitmq-engine).
+
 ## format_avro_schema_registry_url {#format_avro_schema_registry_url}
 
 Задает URL реестра схем [Confluent](https://docs.confluent.io/current/schema-registry/index.html) для использования с форматом [AvroConfluent](../../interfaces/formats.md#data-format-avro-confluent).
@@ -2052,11 +2175,11 @@ SELECT * FROM a;
 
 ## ttl_only_drop_parts {#ttl_only_drop_parts}
 
-Для таблиц [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md) включает или отключает  возможность полного удаления кусков данных, в которых все записи устарели. 
+Для таблиц [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md) включает или отключает  возможность полного удаления кусков данных, в которых все записи устарели.
 
-Когда настройка `ttl_only_drop_parts` отключена (т.е. по умолчанию), сервер лишь удаляет устаревшие записи в соответствии с их временем жизни (TTL). 
+Когда настройка `ttl_only_drop_parts` отключена (т.е. по умолчанию), сервер лишь удаляет устаревшие записи в соответствии с их временем жизни (TTL).
 
-Когда настройка `ttl_only_drop_parts` включена, сервер целиком удаляет куски данных, в которых все записи устарели. 
+Когда настройка `ttl_only_drop_parts` включена, сервер целиком удаляет куски данных, в которых все записи устарели.
 
 Удаление целых кусков данных вместо удаления отдельных записей позволяет устанавливать меньший таймаут `merge_with_ttl_timeout` и уменьшает нагрузку на сервер, что способствует росту производительности.
 
@@ -2067,18 +2190,18 @@ SELECT * FROM a;
 
 Значение по умолчанию: `0`.
 
-**См. также** 
+**См. также**
 
 -   [Секции и настройки запроса CREATE TABLE](../../engines/table-engines/mergetree-family/mergetree.md#mergetree-query-clauses) (настройка `merge_with_ttl_timeout`)
 -   [Table TTL](../../engines/table-engines/mergetree-family/mergetree.md#mergetree-table-ttl)
 
 ## output_format_pretty_max_value_width {#output_format_pretty_max_value_width}
 
-Ограничивает длину значения, выводимого в формате [Pretty](../../interfaces/formats.md#pretty). Если значение длиннее указанного количества символов, оно обрезается. 
+Ограничивает длину значения, выводимого в формате [Pretty](../../interfaces/formats.md#pretty). Если значение длиннее указанного количества символов, оно обрезается.
 
 Возможные значения:
 
--   Положительное целое число. 
+-   Положительное целое число.
 -   0 — значение обрезается полностью.
 
 Значение по умолчанию: `10000` символов.
@@ -2227,17 +2350,17 @@ SELECT * FROM system.events WHERE event='QueryMemoryLimitExceeded';
 
 Включает или отключает сохранение типа `Nullable` для аргумента функции [CAST](../../sql-reference/functions/type-conversion-functions.md#type_conversion_function-cast).
 
-Если настройка включена, то когда в функцию `CAST` передается аргумент с типом `Nullable`, функция возвращает результат, также преобразованный к типу `Nullable`. 
-Если настройка отключена, то функция `CAST` всегда возвращает результат строго указанного типа.  
+Если настройка включена, то когда в функцию `CAST` передается аргумент с типом `Nullable`, функция возвращает результат, также преобразованный к типу `Nullable`.
+Если настройка отключена, то функция `CAST` всегда возвращает результат строго указанного типа.
 
 Возможные значения:
 
 -  0 — функция `CAST` преобразует аргумент строго к указанному типу.
--  1 — если аргумент имеет тип `Nullable`, то функция `CAST` преобразует его к типу `Nullable` для указанного типа. 
+-  1 — если аргумент имеет тип `Nullable`, то функция `CAST` преобразует его к типу `Nullable` для указанного типа.
 
 Значение по умолчанию: `0`.
 
-**Примеры** 
+**Примеры**
 
 Запрос возвращает аргумент, преобразованный строго к указанному типу:
 
@@ -2269,9 +2392,9 @@ SELECT CAST(toNullable(toInt32(0)) AS Int32) as x, toTypeName(x);
 └───┴───────────────────────────────────────────────────┘
 ```
 
-**См. также** 
+**См. также**
 
--   Функция [CAST](../../sql-reference/functions/type-conversion-functions.md#type_conversion_function-cast) 
+-   Функция [CAST](../../sql-reference/functions/type-conversion-functions.md#type_conversion_function-cast)
 
 ## persistent {#persistent}
 
@@ -2349,7 +2472,7 @@ SELECT number FROM numbers(3) FORMAT JSONEachRow;
 [
 {"number":"0"},
 {"number":"1"},
-{"number":"2"}                                                                                                                                                                                  
+{"number":"2"}
 ]
 ```
 
@@ -2537,4 +2660,101 @@ SELECT * FROM test2;
 
 Обратите внимание на то, что эта настройка влияет на поведение [материализованных представлений](../../sql-reference/statements/create/view.md#materialized) и БД [MaterializeMySQL](../../engines/database-engines/materialize-mysql.md).
 
+## engine_file_empty_if_not_exists {#engine-file-empty_if-not-exists}
+
+Включает или отключает возможность выполнять запрос `SELECT` к таблице на движке [File](../../engines/table-engines/special/file.md), не содержащей файл.
+
+Возможные значения:
+- 0 — запрос `SELECT` генерирует исключение.
+- 1 — запрос `SELECT` возвращает пустой результат.
+
+Значение по умолчанию: `0`.
+
+## engine_file_truncate_on_insert {#engine-file-truncate-on-insert}
+
+Включает или выключает удаление данных из таблицы до вставки в таблицу на движке [File](../../engines/table-engines/special/file.md).
+
+Возможные значения:
+- 0 — запрос `INSERT` добавляет данные в конец файла после существующих.
+- 1 — `INSERT` удаляет имеющиеся в файле данные и замещает их новыми.
+
+Значение по умолчанию: `0`. 
+
+## allow_experimental_geo_types {#allow-experimental-geo-types}
+
+Разрешает использование экспериментальных типов данных для работы с [географическими структурами](../../sql-reference/data-types/geo.md).
+
+Возможные значения:
+-   0 — использование типов данных для работы с географическими структурами не поддерживается.
+-   1 — использование типов данных для работы с географическими структурами поддерживается.
+
+Значение по умолчанию: `0`.
+
+## database_atomic_wait_for_drop_and_detach_synchronously {#database_atomic_wait_for_drop_and_detach_synchronously}
+
+Добавляет модификатор `SYNC` ко всем запросам `DROP` и `DETACH`. 
+
+Возможные значения:
+
+-   0 — Запросы будут выполняться с задержкой.
+-   1 — Запросы будут выполняться без задержки.
+
+Значение по умолчанию: `0`.
+
+## show_table_uuid_in_table_create_query_if_not_nil {#show_table_uuid_in_table_create_query_if_not_nil}
+
+Устанавливает отображение запроса `SHOW TABLE`.
+
+Возможные значения:
+
+-   0 — Запрос будет отображаться без UUID таблицы.
+-   1 — Запрос будет отображаться с UUID таблицы.
+
+Значение по умолчанию: `0`.
+
+## allow_experimental_live_view {#allow-experimental-live-view}
+
+Включает экспериментальную возможность использования [LIVE-представлений](../../sql-reference/statements/create/view.md#live-view).
+
+Возможные значения:
+- 0 — живые представления не поддерживаются.
+- 1 — живые представления поддерживаются.
+
+Значение по умолчанию: `0`.
+
+## live_view_heartbeat_interval {#live-view-heartbeat-interval}
+
+Задает интервал в секундах для периодической проверки существования [LIVE VIEW](../../sql-reference/statements/create/view.md#live-view).
+
+Значение по умолчанию: `15`.
+
+## max_live_view_insert_blocks_before_refresh {#max-live-view-insert-blocks-before-refresh}
+
+Задает наибольшее число вставок, после которых запрос на формирование [LIVE VIEW](../../sql-reference/statements/create/view.md#live-view) исполняется снова.
+
+Значение по умолчанию: `64`.
+
+## temporary_live_view_timeout {#temporary-live-view-timeout}
+
+Задает время в секундах, после которого [LIVE VIEW](../../sql-reference/statements/create/view.md#live-view) удаляется.
+
+Значение по умолчанию: `5`.
+
+## periodic_live_view_refresh {#periodic-live-view-refresh}
+
+Задает время в секундах, по истечении которого [LIVE VIEW](../../sql-reference/statements/create/view.md#live-view) с установленным автообновлением обновляется.
+
+Значение по умолчанию: `60`.
+
+## check_query_single_value_result {#check_query_single_value_result}
+
+Определяет уровень детализации результата для запросов [CHECK TABLE](../../sql-reference/statements/check-table.md#checking-mergetree-tables) для таблиц семейства `MergeTree`.
+
+Возможные значения:
+
+-   0 — запрос возвращает статус каждого куска данных таблицы.
+-   1 — запрос возвращает статус таблицы в целом.
+
+Значение по умолчанию: `0`.
+
 [Оригинальная статья](https://clickhouse.tech/docs/ru/operations/settings/settings/) <!--hide-->
diff --git a/docs/ru/operations/system-tables/asynchronous_metric_log.md b/docs/ru/operations/system-tables/asynchronous_metric_log.md
index 2fe617e48af..979b63f0cc8 100644
--- a/docs/ru/operations/system-tables/asynchronous_metric_log.md
+++ b/docs/ru/operations/system-tables/asynchronous_metric_log.md
@@ -34,4 +34,3 @@ SELECT * FROM system.asynchronous_metric_log LIMIT 10
 - [system.asynchronous_metrics](#system_tables-asynchronous_metrics) — Содержит метрики, которые периодически вычисляются в фоновом режиме. 
 - [system.metric_log](#system_tables-metric_log) — таблица фиксирующая историю значений метрик из `system.metrics` и `system.events`.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/system_tables/asynchronous_metric_log) <!--hide-->
diff --git a/docs/ru/operations/system-tables/asynchronous_metrics.md b/docs/ru/operations/system-tables/asynchronous_metrics.md
index 5ff010bc79f..9d12a119c43 100644
--- a/docs/ru/operations/system-tables/asynchronous_metrics.md
+++ b/docs/ru/operations/system-tables/asynchronous_metrics.md
@@ -35,5 +35,4 @@ SELECT * FROM system.asynchronous_metrics LIMIT 10
 -   [system.events](#system_tables-events) — таблица с количеством произошедших событий.
 -   [system.metric_log](#system_tables-metric_log) — таблица фиксирующая историю значений метрик из `system.metrics` и `system.events`.
 
- [Оригинальная статья](https://clickhouse.tech/docs/ru/operations/system_tables/asynchronous_metrics) <!--hide-->
  
\ No newline at end of file
diff --git a/docs/ru/operations/system-tables/clusters.md b/docs/ru/operations/system-tables/clusters.md
index 9cf84ea5f02..ddc6849b44d 100644
--- a/docs/ru/operations/system-tables/clusters.md
+++ b/docs/ru/operations/system-tables/clusters.md
@@ -13,4 +13,3 @@
 -   `port` (UInt16) — порт, на который обращаться для соединения с сервером.
 -   `user` (String) — имя пользователя, которого использовать для соединения с сервером.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/system_tables/clusters) <!--hide-->
diff --git a/docs/ru/operations/system-tables/columns.md b/docs/ru/operations/system-tables/columns.md
index 8cb9408e7d8..b8a0aef2299 100644
--- a/docs/ru/operations/system-tables/columns.md
+++ b/docs/ru/operations/system-tables/columns.md
@@ -4,7 +4,9 @@
 
 С помощью этой таблицы можно получить информацию аналогично запросу [DESCRIBE TABLE](../../sql-reference/statements/misc.md#misc-describe-table), но для многих таблиц сразу.
 
-Таблица `system.columns` содержит столбцы (тип столбца указан в скобках):
+Колонки [временных таблиц](../../sql-reference/statements/create/table.md#temporary-tables) содержатся в `system.columns` только в тех сессиях, в которых эти таблицы были созданы. Поле `database` у таких колонок пустое. 
+
+Cтолбцы:
 
 -   `database` ([String](../../sql-reference/data-types/string.md)) — имя базы данных.
 -   `table` ([String](../../sql-reference/data-types/string.md)) — имя таблицы.
@@ -23,4 +25,46 @@
 -   `is_in_sampling_key` ([UInt8](../../sql-reference/data-types/int-uint.md)) — флаг, показывающий включение столбца в ключ выборки.
 -   `compression_codec` ([String](../../sql-reference/data-types/string.md)) — имя кодека сжатия.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/system_tables/columns) <!--hide-->
+**Пример**
+
+```sql
+SELECT * FROM system.columns LIMIT 2 FORMAT Vertical;
+```
+
+```text
+Row 1:
+──────
+database:                system
+table:                   aggregate_function_combinators
+name:                    name
+type:                    String
+default_kind:            
+default_expression:      
+data_compressed_bytes:   0
+data_uncompressed_bytes: 0
+marks_bytes:             0
+comment:                 
+is_in_partition_key:     0
+is_in_sorting_key:       0
+is_in_primary_key:       0
+is_in_sampling_key:      0
+compression_codec:       
+
+Row 2:
+──────
+database:                system
+table:                   aggregate_function_combinators
+name:                    is_internal
+type:                    UInt8
+default_kind:            
+default_expression:      
+data_compressed_bytes:   0
+data_uncompressed_bytes: 0
+marks_bytes:             0
+comment:                 
+is_in_partition_key:     0
+is_in_sorting_key:       0
+is_in_primary_key:       0
+is_in_sampling_key:      0
+compression_codec:       
+```
diff --git a/docs/ru/operations/system-tables/contributors.md b/docs/ru/operations/system-tables/contributors.md
index 64c9a863bc3..6e11219e044 100644
--- a/docs/ru/operations/system-tables/contributors.md
+++ b/docs/ru/operations/system-tables/contributors.md
@@ -39,4 +39,3 @@ SELECT * FROM system.contributors WHERE name='Olga Khvostikova'
 └──────────────────┘
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/system_tables/contributors) <!--hide-->
diff --git a/docs/ru/operations/system-tables/current-roles.md b/docs/ru/operations/system-tables/current-roles.md
index a948b7b1e97..42ed4260fde 100644
--- a/docs/ru/operations/system-tables/current-roles.md
+++ b/docs/ru/operations/system-tables/current-roles.md
@@ -8,4 +8,3 @@
  - `with_admin_option` ([UInt8](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Флаг, который показывает, обладает ли `current_role` роль привилегией `ADMIN OPTION`.
  - `is_default` ([UInt8](../../sql-reference/data-types/int-uint.md#uint-ranges)) —  Флаг, который показывает, является ли `current_role` ролью по умолчанию. 
 
- [Оригинальная статья](https://clickhouse.tech/docs/ru/operations/system_tables/current-roles) <!--hide-->
diff --git a/docs/ru/operations/system-tables/data_type_families.md b/docs/ru/operations/system-tables/data_type_families.md
index d8d0b5e1074..ba4e5e64ec3 100644
--- a/docs/ru/operations/system-tables/data_type_families.md
+++ b/docs/ru/operations/system-tables/data_type_families.md
@@ -1,6 +1,6 @@
 # system.data_type_families {#system_tables-data_type_families}
 
-Содержит информацию о поддерживаемых [типах данных](../../sql-reference/data-types/).
+Содержит информацию о поддерживаемых [типах данных](../../sql-reference/data-types/index.md).
 
 Столбцы:
 
@@ -33,4 +33,3 @@ SELECT * FROM system.data_type_families WHERE alias_to = 'String'
 
 -   [Синтаксис](../../sql-reference/syntax.md) — поддерживаемый SQL синтаксис.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/system_tables/data_type_families) <!--hide-->
diff --git a/docs/ru/operations/system-tables/databases.md b/docs/ru/operations/system-tables/databases.md
index 00a4b543717..026f49c0d5d 100644
--- a/docs/ru/operations/system-tables/databases.md
+++ b/docs/ru/operations/system-tables/databases.md
@@ -4,4 +4,3 @@
 Для каждой базы данных, о которой знает сервер, будет присутствовать соответствующая запись в таблице.
 Эта системная таблица используется для реализации запроса `SHOW DATABASES`.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/system_tables/databases) <!--hide-->
\ No newline at end of file
diff --git a/docs/ru/operations/system-tables/detached_parts.md b/docs/ru/operations/system-tables/detached_parts.md
index c59daa3985c..7abed6500aa 100644
--- a/docs/ru/operations/system-tables/detached_parts.md
+++ b/docs/ru/operations/system-tables/detached_parts.md
@@ -1,7 +1,6 @@
 # system.detached_parts {#system_tables-detached_parts}
 
 Содержит информацию об отсоединённых кусках таблиц семейства [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md). Столбец `reason` содержит причину, по которой кусок был отсоединён. Для кусов, отсоединённых пользователем, `reason` содержит пустую строку.
-Такие куски могут быть присоединены с помощью [ALTER TABLE ATTACH PARTITION\|PART](../../sql_reference/alter/#alter_attach-partition). Остальные столбцы описаны в [system.parts](#system_tables-parts).
-Если имя куска некорректно, значения некоторых столбцов могут быть `NULL`. Такие куски могут быть удалены с помощью [ALTER TABLE DROP DETACHED PART](../../sql_reference/alter/#alter_drop-detached).
+Такие куски могут быть присоединены с помощью [ALTER TABLE ATTACH PARTITION|PART](../../sql-reference/statements/alter/index.md#alter_attach-partition). Остальные столбцы описаны в [system.parts](#system_tables-parts).
+Если имя куска некорректно, значения некоторых столбцов могут быть `NULL`. Такие куски могут быть удалены с помощью [ALTER TABLE DROP DETACHED PART](../../sql-reference/statements/alter/index.md#alter_drop-detached).
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/system_tables/detached_parts) <!--hide-->
diff --git a/docs/ru/operations/system-tables/dictionaries.md b/docs/ru/operations/system-tables/dictionaries.md
index cd1a4acab72..6a49904aae9 100644
--- a/docs/ru/operations/system-tables/dictionaries.md
+++ b/docs/ru/operations/system-tables/dictionaries.md
@@ -59,4 +59,3 @@ SELECT * FROM system.dictionaries
 └──────────┴──────┴────────┴─────────────┴──────┴────────┴──────────────────────────────────────┴─────────────────────┴─────────────────┴─────────────┴──────────┴───────────────┴───────────────────────┴────────────────────────────┴──────────────┴──────────────┴─────────────────────┴──────────────────────────────┘───────────────────────┴────────────────┘
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/system_tables/dictionaries) <!--hide-->
\ No newline at end of file
diff --git a/docs/ru/operations/system-tables/disks.md b/docs/ru/operations/system-tables/disks.md
index 2832e7a1a32..186dfbd7819 100644
--- a/docs/ru/operations/system-tables/disks.md
+++ b/docs/ru/operations/system-tables/disks.md
@@ -10,4 +10,3 @@ Cодержит информацию о дисках, заданных в [ко
 -   `total_space` ([UInt64](../../sql-reference/data-types/int-uint.md)) — объём диска в байтах.
 -   `keep_free_space` ([UInt64](../../sql-reference/data-types/int-uint.md)) — место, которое должно остаться свободным на диске в байтах. Задаётся значением параметра `keep_free_space_bytes` конфигурации дисков.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/system_tables/disks) <!--hide-->
diff --git a/docs/ru/operations/system-tables/distributed_ddl_queue.md b/docs/ru/operations/system-tables/distributed_ddl_queue.md
index 058ed06f639..99d92574a0b 100644
--- a/docs/ru/operations/system-tables/distributed_ddl_queue.md
+++ b/docs/ru/operations/system-tables/distributed_ddl_queue.md
@@ -14,7 +14,7 @@
 -   `initiator` ([String](../../sql-reference/data-types/string.md)) — узел, выполнивший запрос.
 -   `query_start_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — время начала запроса.
 -   `query_finish_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — время окончания запроса.
--   `query_duration_ms` ([UInt64](../../sql-reference/data-types/datetime64.md)) — продолжительность выполнения запроса (в миллисекундах).
+-   `query_duration_ms` ([UInt64](../../sql-reference/data-types/int-uint.md)) — продолжительность выполнения запроса (в миллисекундах).
 -   `exception_code` ([Enum8](../../sql-reference/data-types/enum.md)) — код исключения из [ZooKeeper](../../operations/tips.md#zookeeper).
 
 **Пример**
@@ -61,5 +61,4 @@ exception_code:    ZOK
 2 rows in set. Elapsed: 0.025 sec.
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/system_tables/distributed_ddl_queuedistributed_ddl_queue.md) <!--hide-->
  
\ No newline at end of file
diff --git a/docs/ru/operations/system-tables/distribution_queue.md b/docs/ru/operations/system-tables/distribution_queue.md
index 18346b34e04..5b811ab2be8 100644
--- a/docs/ru/operations/system-tables/distribution_queue.md
+++ b/docs/ru/operations/system-tables/distribution_queue.md
@@ -43,4 +43,3 @@ last_exception:
 
 -   [Движок таблиц Distributed](../../engines/table-engines/special/distributed.md)
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/system_tables/distribution_queue) <!--hide-->
diff --git a/docs/ru/operations/system-tables/enabled-roles.md b/docs/ru/operations/system-tables/enabled-roles.md
index cd3b0846718..a3f5ba179b3 100644
--- a/docs/ru/operations/system-tables/enabled-roles.md
+++ b/docs/ru/operations/system-tables/enabled-roles.md
@@ -9,4 +9,3 @@
 - `is_current` ([UInt8](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Флаг, который показывает, является ли `enabled_role` текущей ролью текущего пользователя. 
 - `is_default` ([UInt8](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Флаг, который показывает, является ли `enabled_role` ролью по умолчанию.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/system_tables/enabled-roles) <!--hide-->
\ No newline at end of file
diff --git a/docs/ru/operations/system-tables/events.md b/docs/ru/operations/system-tables/events.md
index 0a48617bb5c..c05be74eea6 100644
--- a/docs/ru/operations/system-tables/events.md
+++ b/docs/ru/operations/system-tables/events.md
@@ -31,4 +31,3 @@ SELECT * FROM system.events LIMIT 5
 -   [system.metric_log](#system_tables-metric_log) — таблица фиксирующая историю значений метрик из `system.metrics` и `system.events`.
 -   [Мониторинг](../../operations/monitoring.md) — основы мониторинга в ClickHouse.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/system_tables/events) <!--hide-->
diff --git a/docs/ru/operations/system-tables/functions.md b/docs/ru/operations/system-tables/functions.md
index c51adb2c109..de752e2018c 100644
--- a/docs/ru/operations/system-tables/functions.md
+++ b/docs/ru/operations/system-tables/functions.md
@@ -7,4 +7,3 @@
 -   `name` (`String`) – Имя функции.
 -   `is_aggregate` (`UInt8`) – Признак, является ли функция агрегатной.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/system_tables/functions) <!--hide-->
diff --git a/docs/ru/operations/system-tables/grants.md b/docs/ru/operations/system-tables/grants.md
index 58d8a9e1e06..76a014f62dd 100644
--- a/docs/ru/operations/system-tables/grants.md
+++ b/docs/ru/operations/system-tables/grants.md
@@ -21,4 +21,3 @@
 
 -    `grant_option` ([UInt8](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Разрешение предоставлено с опцией `WITH GRANT OPTION`, подробнее см. [GRANT](../../sql-reference/statements/grant.md#grant-privigele-syntax).
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/system_tables/grants) <!--hide-->
diff --git a/docs/ru/operations/system-tables/graphite_retentions.md b/docs/ru/operations/system-tables/graphite_retentions.md
index 66fca7ba299..1098a29aac6 100644
--- a/docs/ru/operations/system-tables/graphite_retentions.md
+++ b/docs/ru/operations/system-tables/graphite_retentions.md
@@ -14,4 +14,3 @@
 -   `Tables.database` (Array(String)) - Массив имён баз данных таблиц, использующих параметр `config_name`.
 -   `Tables.table` (Array(String)) - Массив имён таблиц, использующих параметр `config_name`.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/system_tables/graphite_retentions) <!--hide-->
diff --git a/docs/ru/operations/system-tables/index.md b/docs/ru/operations/system-tables/index.md
index 93ea1c92068..fce93f33a27 100644
--- a/docs/ru/operations/system-tables/index.md
+++ b/docs/ru/operations/system-tables/index.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 52
-toc_title: "\u0421\u0438\u0441\u0442\u0435\u043c\u043d\u044b\u0435\u0020\u0442\u0430\u0431\u043b\u0438\u0446\u044b"
+toc_title: "Системные таблицы"
 ---
 
 # Системные таблицы {#system-tables}
@@ -9,25 +9,54 @@ toc_title: "\u0421\u0438\u0441\u0442\u0435\u043c\u043d\u044b\u0435\u0020\u0442\u
 
 Системные таблицы содержат информацию о:
 
--   Состоянии сервера, процессов и окружении.
--   Внутренних процессах сервера.
+-   состоянии сервера, процессов и окружении.
+-   внутренних процессах сервера.
 
 Системные таблицы:
 
--   Находятся в базе данных `system`.
--   Доступны только для чтения данных.
--   Не могут быть удалены или изменены, но их можно отсоединить.
+-   находятся в базе данных `system`.
+-   доступны только для чтения данных.
+-   не могут быть удалены или изменены, но их можно отсоединить.
 
-Системные таблицы `metric_log`, `query_log`, `query_thread_log`, `trace_log` системные таблицы хранят данные в файловой системе. Остальные системные таблицы хранят свои данные в оперативной памяти. Сервер ClickHouse создает такие системные таблицы при запуске.
+Большинство системных таблиц хранят свои данные в оперативной памяти. Сервер ClickHouse создает эти системные таблицы при старте.
+
+В отличие от других системных таблиц, таблицы с системными логами [metric_log](../../operations/system-tables/metric_log.md), [query_log](../../operations/system-tables/query_log.md), [query_thread_log](../../operations/system-tables/query_thread_log.md), [trace_log](../../operations/system-tables/trace_log.md), [part_log](../../operations/system-tables/part_log.md), [crash_log](../../operations/system-tables/crash-log.md) и [text_log](../../operations/system-tables/text_log.md) используют движок таблиц [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md) и по умолчанию хранят свои данные в файловой системе. Если удалить таблицу из файловой системы, сервер ClickHouse снова создаст пустую таблицу во время следующей записи данных. Если схема системной таблицы изменилась в новом релизе, то ClickHouse переименует текущую таблицу и создаст новую.
+
+Таблицы с системными логами `log` можно настроить, создав конфигурационный файл с тем же именем, что и таблица в разделе `/etc/clickhouse-server/config.d/`, или указав соответствующие элементы в `/etc/clickhouse-server/config.xml`. Настраиваться могут следующие элементы:
+
+-   `database` — база данных, к которой принадлежит системная таблица. Эта опция на текущий момент устарела. Все системные таблицы находятся в базе данных `system`.
+-   `table` — таблица для добавления данных.
+-   `partition_by` — [ключ партиционирования](../../engines/table-engines/mergetree-family/custom-partitioning-key.md).
+-   `ttl` — [время жизни](../../sql-reference/statements/alter/ttl.md) записей в таблице.
+-   `flush_interval_milliseconds` — интервал сброса данных на диск, в миллисекундах.
+-   `engine` — полное имя движка (начиная с `ENGINE =` ) с параметрами. Эта опция противоречит `partition_by` и `ttl`. Если указать оба параметра вместе, сервер вернет ошибку и завершит работу.
+
+Пример:
+
+```xml
+<yandex>
+    <query_log>
+        <database>system</database>
+        <table>query_log</table>
+        <partition_by>toYYYYMM(event_date)</partition_by>
+        <ttl>event_date + INTERVAL 30 DAY DELETE</ttl>
+        <!--
+        <engine>ENGINE = MergeTree PARTITION BY toYYYYMM(event_date) ORDER BY (event_date, event_time) SETTINGS index_granularity = 1024</engine>
+        -->
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+    </query_log>
+</yandex>
+```
+
+По умолчанию размер таблицы не ограничен. Управлять размером таблицы можно используя [TTL](../../sql-reference/statements/alter/ttl.md#manipuliatsii-s-ttl-tablitsy) для удаления устаревших записей журнала. Также вы можете использовать функцию партиционирования для таблиц `MergeTree`.
 
 ### Источники системных показателей 
 
 Для сбора системных показателей сервер ClickHouse использует:
 
--   Возможности `CAP_NET_ADMIN`.
+-   возможности `CAP_NET_ADMIN`.
 -   [procfs](https://ru.wikipedia.org/wiki/Procfs) (только Linux).
 
-**procfs**
 
 Если для сервера ClickHouse не включено `CAP_NET_ADMIN`, он пытается обратиться к `ProcfsMetricsProvider`. `ProcfsMetricsProvider` позволяет собирать системные показатели для каждого запроса (для CPU и I/O).
 
@@ -41,4 +70,3 @@ toc_title: "\u0421\u0438\u0441\u0442\u0435\u043c\u043d\u044b\u0435\u0020\u0442\u
 -   `OSReadBytes`
 -   `OSWriteBytes`
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/system-tables/) <!--hide-->
diff --git a/docs/ru/operations/system-tables/licenses.md b/docs/ru/operations/system-tables/licenses.md
index a6a49d5e0be..598da1e72ee 100644
--- a/docs/ru/operations/system-tables/licenses.md
+++ b/docs/ru/operations/system-tables/licenses.md
@@ -36,4 +36,3 @@ SELECT library_name, license_type, license_path FROM system.licenses LIMIT 15
 
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/system_tables/licenses) <!--hide-->
diff --git a/docs/ru/operations/system-tables/merges.md b/docs/ru/operations/system-tables/merges.md
index 021a95981e6..f48f0d1ac27 100644
--- a/docs/ru/operations/system-tables/merges.md
+++ b/docs/ru/operations/system-tables/merges.md
@@ -18,4 +18,3 @@
 -   `bytes_written_uncompressed UInt64` — Количество записанных байт, несжатых.
 -   `rows_written UInt64` — Количество записанных строк.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/system_tables/merges) <!--hide-->
diff --git a/docs/ru/operations/system-tables/metric_log.md b/docs/ru/operations/system-tables/metric_log.md
index 2458c93da59..5160b32927b 100644
--- a/docs/ru/operations/system-tables/metric_log.md
+++ b/docs/ru/operations/system-tables/metric_log.md
@@ -48,4 +48,3 @@ CurrentMetric_ReplicatedChecks:                             0
 -   [system.metrics](#system_tables-metrics) — таблица с мгновенно вычисляемыми метриками.
 -   [Мониторинг](../../operations/monitoring.md) — основы мониторинга в ClickHouse.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/system_tables/metric_log) <!--hide-->
diff --git a/docs/ru/operations/system-tables/metrics.md b/docs/ru/operations/system-tables/metrics.md
index db4016687d6..13d5fbc750a 100644
--- a/docs/ru/operations/system-tables/metrics.md
+++ b/docs/ru/operations/system-tables/metrics.md
@@ -38,4 +38,3 @@ SELECT * FROM system.metrics LIMIT 10
 -   [system.metric_log](#system_tables-metric_log) — таблица фиксирующая историю значений метрик из `system.metrics` и `system.events`.
 -   [Мониторинг](../../operations/monitoring.md) — основы мониторинга в ClickHouse.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/system_tables/metrics) <!--hide-->
diff --git a/docs/ru/operations/system-tables/mutations.md b/docs/ru/operations/system-tables/mutations.md
index 044677030ba..4370ab593e7 100644
--- a/docs/ru/operations/system-tables/mutations.md
+++ b/docs/ru/operations/system-tables/mutations.md
@@ -45,4 +45,3 @@
 -   [Движок MergeTree](../../engines/table-engines/mergetree-family/mergetree.md)
 -   [Репликация данных](../../engines/table-engines/mergetree-family/replication.md) (семейство ReplicatedMergeTree)
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/system_tables/mutations) <!--hide-->
diff --git a/docs/ru/operations/system-tables/numbers.md b/docs/ru/operations/system-tables/numbers.md
index 02192184aa1..0be4a4ce05d 100644
--- a/docs/ru/operations/system-tables/numbers.md
+++ b/docs/ru/operations/system-tables/numbers.md
@@ -4,4 +4,3 @@
 Эту таблицу можно использовать для тестов, а также если вам нужно сделать перебор.
 Чтения из этой таблицы не распараллеливаются.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/system_tables/numbers) <!--hide-->
diff --git a/docs/ru/operations/system-tables/numbers_mt.md b/docs/ru/operations/system-tables/numbers_mt.md
index 12409d831a1..d66c4515ddb 100644
--- a/docs/ru/operations/system-tables/numbers_mt.md
+++ b/docs/ru/operations/system-tables/numbers_mt.md
@@ -3,4 +3,3 @@
 То же самое, что и [system.numbers](../../operations/system-tables/numbers.md), но чтение распараллеливается. Числа могут возвращаться в произвольном порядке.
 Используется для тестов.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/system_tables/numbers_mt) <!--hide-->
diff --git a/docs/ru/operations/system-tables/one.md b/docs/ru/operations/system-tables/one.md
index 4231277ffe4..5cb297f06d4 100644
--- a/docs/ru/operations/system-tables/one.md
+++ b/docs/ru/operations/system-tables/one.md
@@ -4,4 +4,3 @@
 Эта таблица используется, если в `SELECT` запросе не указана секция `FROM`.
 То есть, это - аналог таблицы `DUAL`, которую можно найти в других СУБД.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/system_tables/one) <!--hide-->
diff --git a/docs/ru/operations/system-tables/opentelemetry_span_log.md b/docs/ru/operations/system-tables/opentelemetry_span_log.md
index 96555064b0e..c421a602300 100644
--- a/docs/ru/operations/system-tables/opentelemetry_span_log.md
+++ b/docs/ru/operations/system-tables/opentelemetry_span_log.md
@@ -46,4 +46,3 @@ attribute.names:  []
 attribute.values: []
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/system_tables/opentelemetry_span_log) <!--hide-->
diff --git a/docs/ru/operations/system-tables/part_log.md b/docs/ru/operations/system-tables/part_log.md
index bba4fda6135..a8d892f3b67 100644
--- a/docs/ru/operations/system-tables/part_log.md
+++ b/docs/ru/operations/system-tables/part_log.md
@@ -16,6 +16,7 @@
     -   `MOVE_PART` — перемещение куска между дисками.
 -   `event_date` ([Date](../../sql-reference/data-types/date.md)) — дата события.
 -   `event_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — время события.
+-   `event_time_microseconds` ([DateTime64](../../sql-reference/data-types/datetime64.md)) — время события с точностью до микросекунд.
 -   `duration_ms` ([UInt64](../../sql-reference/data-types/int-uint.md)) — длительность.
 -   `database` ([String](../../sql-reference/data-types/string.md)) — имя базы данных, в которой находится кусок.
 -   `table` ([String](../../sql-reference/data-types/string.md)) — имя таблицы, в которой находится кусок.
@@ -47,6 +48,7 @@ query_id:                      983ad9c7-28d5-4ae1-844e-603116b7de31
 event_type:                    NewPart
 event_date:                    2021-02-02
 event_time:                    2021-02-02 11:14:28
+event_time_microseconds:                    2021-02-02 11:14:28.861919
 duration_ms:                   35
 database:                      default
 table:                         log_mt_2
@@ -64,4 +66,3 @@ error:                         0
 exception:                   
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/system_tables/part_log) <!--hide-->
diff --git a/docs/ru/operations/system-tables/parts.md b/docs/ru/operations/system-tables/parts.md
index 950e652332d..1c7f0ad2e9a 100644
--- a/docs/ru/operations/system-tables/parts.md
+++ b/docs/ru/operations/system-tables/parts.md
@@ -155,4 +155,3 @@ move_ttl_info.max:                     []
 -   [Движок MergeTree](../../engines/table-engines/mergetree-family/mergetree.md)
 -   [TTL для столбцов и таблиц](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-ttl)
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/system_tables/parts) <!--hide-->
diff --git a/docs/ru/operations/system-tables/parts_columns.md b/docs/ru/operations/system-tables/parts_columns.md
index db4d453e8f1..5640929d810 100644
--- a/docs/ru/operations/system-tables/parts_columns.md
+++ b/docs/ru/operations/system-tables/parts_columns.md
@@ -145,4 +145,3 @@ column_marks_bytes:                    48
 
 -   [Движок MergeTree](../../engines/table-engines/mergetree-family/mergetree.md)
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/operations/system_tables/parts_columns) <!--hide-->
diff --git a/docs/ru/operations/system-tables/processes.md b/docs/ru/operations/system-tables/processes.md
index c9216e162b3..682b174c483 100644
--- a/docs/ru/operations/system-tables/processes.md
+++ b/docs/ru/operations/system-tables/processes.md
@@ -14,4 +14,3 @@
 -   `query` (String) – текст запроса. Для запросов `INSERT` не содержит встаявляемые данные.
 -   `query_id` (String) – идентификатор запроса, если был задан.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/system_tables/processes) <!--hide-->
diff --git a/docs/ru/operations/system-tables/query_log.md b/docs/ru/operations/system-tables/query_log.md
index 39f685288d8..d3872e1ef18 100644
--- a/docs/ru/operations/system-tables/query_log.md
+++ b/docs/ru/operations/system-tables/query_log.md
@@ -44,9 +44,15 @@ ClickHouse не удаляет данные из таблица автомати
 -   `result_rows` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — количество строк в результате запроса `SELECT` или количество строк в запросе `INSERT`.
 -   `result_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — объём RAM в байтах, использованный для хранения результата запроса.
 -   `memory_usage` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — потребление RAM запросом.
+-   `current_database` ([String](../../sql-reference/data-types/string.md)) — имя текущей базы данных.
 -   `query` ([String](../../sql-reference/data-types/string.md)) — текст запроса.
+-   `normalized_query_hash` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — идентичная хэш-сумма без значений литералов для аналогичных запросов.
+-   `query_kind` ([LowCardinality(String)](../../sql-reference/data-types/lowcardinality.md)) — тип запроса.
+-   `databases` ([Array](../../sql-reference/data-types/array.md)([LowCardinality(String)](../../sql-reference/data-types/lowcardinality.md))) — имена баз данных, присутствующих в запросе.
+-   `tables` ([Array](../../sql-reference/data-types/array.md)([LowCardinality(String)](../../sql-reference/data-types/lowcardinality.md))) — имена таблиц, присутствующих в запросе.
+-   `columns` ([Array](../../sql-reference/data-types/array.md)([LowCardinality(String)](../../sql-reference/data-types/lowcardinality.md))) — имена столбцов, присутствующих в запросе.
+-   `exception_code` ([Int32](../../sql-reference/data-types/int-uint.md)) — код исключения.
 -   `exception` ([String](../../sql-reference/data-types/string.md)) — сообщение исключения, если запрос завершился по исключению.
--   `exception_code` ([Int32](../../sql-reference/data-types/int-uint.md)) — код исключения. 
 -   `stack_trace` ([String](../../sql-reference/data-types/string.md)) — [stack trace](https://en.wikipedia.org/wiki/Stack_trace). Пустая строка, если запрос успешно завершен.
 -   `is_initial_query` ([UInt8](../../sql-reference/data-types/int-uint.md)) — вид запроса. Возможные значения:
     -   1 — запрос был инициирован клиентом.
@@ -74,68 +80,97 @@ ClickHouse не удаляет данные из таблица автомати
     -   1 — `GET`.
     -   2 — `POST`.
 -   `http_user_agent` ([String](../../sql-reference/data-types/string.md)) — HTTP заголовок `UserAgent`.
--   `quota_key` ([String](../../sql-reference/data-types/string.md)) — «ключ квоты» из настроек [квот](quotas.md) (см. `keyed`).
+-   `http_referer` ([String](../../sql-reference/data-types/string.md)) — HTTP заголовок `Referer` (содержит полный или частичный адрес страницы, с которой был выполнен запрос).
+-   `forwarded_for` ([String](../../sql-reference/data-types/string.md)) — HTTP заголовок `X-Forwarded-For`.
+-   `quota_key` ([String](../../sql-reference/data-types/string.md)) — `ключ квоты` из настроек [квот](quotas.md) (см. `keyed`).
 -   `revision` ([UInt32](../../sql-reference/data-types/int-uint.md)) — ревизия ClickHouse.
--   `thread_numbers` ([Array(UInt32)](../../sql-reference/data-types/array.md)) — количество потоков, участвующих в обработке запросов.
+-   `log_comment` ([String](../../sql-reference/data-types/string.md)) — комментарий к записи в логе. Представляет собой произвольную строку, длина которой должна быть не больше, чем [max_query_size](../../operations/settings/settings.md#settings-max_query_size). Если нет комментария, то пустая строка.
+-   `thread_ids` ([Array(UInt64)](../../sql-reference/data-types/array.md)) — идентификаторы потоков, участвующих в обработке запросов.
 -   `ProfileEvents.Names` ([Array(String)](../../sql-reference/data-types/array.md)) — счетчики для изменения различных метрик. Описание метрик можно получить из таблицы [system.events](#system_tables-events)(#system_tables-events
 -   `ProfileEvents.Values` ([Array(UInt64)](../../sql-reference/data-types/array.md)) — метрики, перечисленные в столбце `ProfileEvents.Names`.
 -   `Settings.Names` ([Array(String)](../../sql-reference/data-types/array.md)) — имена настроек, которые меняются, когда клиент выполняет запрос. Чтобы разрешить логирование изменений настроек, установите параметр `log_query_settings` равным 1.
 -   `Settings.Values` ([Array(String)](../../sql-reference/data-types/array.md)) — значения настроек, которые перечислены в столбце `Settings.Names`.
+-   `used_aggregate_functions` ([Array(String)](../../sql-reference/data-types/array.md)) — канонические имена `агрегатных функций`, использованных при выполнении запроса.
+-   `used_aggregate_function_combinators` ([Array(String)](../../sql-reference/data-types/array.md)) — канонические имена `комбинаторов агрегатных функций`, использованных при выполнении запроса.
+-   `used_database_engines` ([Array(String)](../../sql-reference/data-types/array.md)) — канонические имена `движков баз данных`, использованных при выполнении запроса.
+-   `used_data_type_families` ([Array(String)](../../sql-reference/data-types/array.md)) — канонические имена `семейств типов данных`, использованных при выполнении запроса.
+-   `used_dictionaries` ([Array(String)](../../sql-reference/data-types/array.md)) — канонические имена `источников словарей`, использованных при выполнении запроса.
+-   `used_formats` ([Array(String)](../../sql-reference/data-types/array.md)) — канонические имена `форматов`, использованных при выполнении запроса.
+-   `used_functions` ([Array(String)](../../sql-reference/data-types/array.md)) — канонические имена `функций`, использованных при выполнении запроса.
+-   `used_storages` ([Array(String)](../../sql-reference/data-types/array.md)) — канонические имена `движков таблиц`, использованных при выполнении запроса.
+-   `used_table_functions` ([Array(String)](../../sql-reference/data-types/array.md)) — канонические имена `табличных функций`, использованных при выполнении запроса.
 
 **Пример**
 
 ``` sql
-SELECT * FROM system.query_log LIMIT 1 \G
+SELECT * FROM system.query_log WHERE type = 'QueryFinish' AND (query LIKE '%toDate(\'2000-12-05\')%') ORDER BY query_start_time DESC LIMIT 1 FORMAT Vertical;
 ```
 
 ``` text
 Row 1:
 ──────
-type:                          QueryStart
-event_date:                    2020-09-11
-event_time:                    2020-09-11 10:08:17
-event_time_microseconds:       2020-09-11 10:08:17.063321
-query_start_time:              2020-09-11 10:08:17
-query_start_time_microseconds: 2020-09-11 10:08:17.063321
-query_duration_ms:             0
-read_rows:                     0
-read_bytes:                    0
-written_rows:                  0
-written_bytes:                 0
-result_rows:                   0
-result_bytes:                  0
-memory_usage:                  0
-current_database:              default
-query:                         INSERT INTO test1 VALUES
-exception_code:                0
-exception:                     
-stack_trace:                   
-is_initial_query:              1
-user:                          default
-query_id:                      50a320fd-85a8-49b8-8761-98a86bcbacef
-address:                       ::ffff:127.0.0.1
-port:                          33452
-initial_user:                  default
-initial_query_id:              50a320fd-85a8-49b8-8761-98a86bcbacef
-initial_address:               ::ffff:127.0.0.1
-initial_port:                  33452
-interface:                     1
-os_user:                       bharatnc
-client_hostname:               tower
-client_name:                   ClickHouse 
-client_revision:               54437
-client_version_major:          20
-client_version_minor:          7
-client_version_patch:          2
-http_method:                   0
-http_user_agent:               
-quota_key:                     
-revision:                      54440
-thread_ids:                    []
-ProfileEvents.Names:           []
-ProfileEvents.Values:          []
-Settings.Names:                ['use_uncompressed_cache','load_balancing','log_queries','max_memory_usage','allow_introspection_functions']
-Settings.Values:               ['0','random','1','10000000000','1']
+type:                                QueryFinish
+event_date:                          2021-03-18
+event_time:                          2021-03-18 20:54:18
+event_time_microseconds:             2021-03-18 20:54:18.676686
+query_start_time:                    2021-03-18 20:54:18
+query_start_time_microseconds:       2021-03-18 20:54:18.673934
+query_duration_ms:                   2
+read_rows:                           100
+read_bytes:                          800
+written_rows:                        0
+written_bytes:                       0
+result_rows:                         2
+result_bytes:                        4858
+memory_usage:                        0
+current_database:                    default
+query:                               SELECT uniqArray([1, 1, 2]), SUBSTRING('Hello, world', 7, 5), flatten([[[BIT_AND(123)]], [[mod(3, 2)], [CAST('1' AS INTEGER)]]]), week(toDate('2000-12-05')), CAST(arrayJoin([NULL, NULL]) AS Nullable(TEXT)), avgOrDefaultIf(number, number % 2), sumOrNull(number), toTypeName(sumOrNull(number)), countIf(toDate('2000-12-05') + number as d, toDayOfYear(d) % 2) FROM numbers(100)
+normalized_query_hash:               17858008518552525706
+query_kind:                          Select
+databases:                           ['_table_function']
+tables:                              ['_table_function.numbers']
+columns:                             ['_table_function.numbers.number']
+exception_code:                      0
+exception:
+stack_trace:
+is_initial_query:                    1
+user:                                default
+query_id:                            58f3d392-0fa0-4663-ae1d-29917a1a9c9c
+address:                             ::ffff:127.0.0.1
+port:                                37486
+initial_user:                        default
+initial_query_id:                    58f3d392-0fa0-4663-ae1d-29917a1a9c9c
+initial_address:                     ::ffff:127.0.0.1
+initial_port:                        37486
+interface:                           1
+os_user:                             sevirov
+client_hostname:                     clickhouse.ru-central1.internal
+client_name:                         ClickHouse
+client_revision:                     54447
+client_version_major:                21
+client_version_minor:                4
+client_version_patch:                1
+http_method:                         0
+http_user_agent:
+http_referer:
+forwarded_for:
+quota_key:
+revision:                            54449
+log_comment:
+thread_ids:                          [587,11939]
+ProfileEvents.Names:                 ['Query','SelectQuery','ReadCompressedBytes','CompressedReadBufferBlocks','CompressedReadBufferBytes','IOBufferAllocs','IOBufferAllocBytes','ArenaAllocChunks','ArenaAllocBytes','FunctionExecute','TableFunctionExecute','NetworkSendElapsedMicroseconds','SelectedRows','SelectedBytes','ContextLock','RWLockAcquiredReadLocks','RealTimeMicroseconds','UserTimeMicroseconds','SystemTimeMicroseconds','SoftPageFaults','OSCPUVirtualTimeMicroseconds','OSWriteBytes']
+ProfileEvents.Values:                [1,1,36,1,10,2,1048680,1,4096,36,1,110,100,800,77,1,3137,1476,1101,8,2577,8192]
+Settings.Names:                      ['load_balancing','max_memory_usage']
+Settings.Values:                     ['random','10000000000']
+used_aggregate_functions:            ['groupBitAnd','avg','sum','count','uniq']
+used_aggregate_function_combinators: ['OrDefault','If','OrNull','Array']
+used_database_engines:               []
+used_data_type_families:             ['String','Array','Int32','Nullable']
+used_dictionaries:                   []
+used_formats:                        []
+used_functions:                      ['toWeek','CAST','arrayFlatten','toTypeName','toDayOfYear','addDays','array','toDate','modulo','substring','plus']
+used_storages:                       []
+used_table_functions:                ['numbers']
 ```
 
 **Смотрите также**
@@ -143,4 +178,3 @@ Settings.Values:               ['0','random','1','10000000000','1']
 -   [system.query_thread_log](../../operations/system-tables/query_thread_log.md#system_tables-query_thread_log) — в этой таблице содержится информация о цепочке каждого выполненного запроса.
 
 [Оригинальная статья](https://clickhouse.tech/docs/ru/operations/system_tables/query_log) <!--hide-->
-
diff --git a/docs/ru/operations/system-tables/query_thread_log.md b/docs/ru/operations/system-tables/query_thread_log.md
index 052baf98035..0292a321524 100644
--- a/docs/ru/operations/system-tables/query_thread_log.md
+++ b/docs/ru/operations/system-tables/query_thread_log.md
@@ -114,4 +114,3 @@ ProfileEvents.Values:          [1,1,11,11,591,148,3,71,29,6533808,1,11,72,18,47,
 
 - [system.query_log](../../operations/system-tables/query_log.md#system_tables-query_log) — описание системной таблицы `query_log`, которая содержит общую информацию о выполненных запросах.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/system_tables/query_thread_log) <!--hide-->
diff --git a/docs/ru/operations/system-tables/quota_limits.md b/docs/ru/operations/system-tables/quota_limits.md
index a9ab87055d4..4103391cfd6 100644
--- a/docs/ru/operations/system-tables/quota_limits.md
+++ b/docs/ru/operations/system-tables/quota_limits.md
@@ -4,17 +4,17 @@
 
 Столбцы:
 
--   `quota_name` ([String](../../sql-reference/data-types/string.md)) — Имя квоты.
--   `duration` ([UInt32](../../sql-reference/data-types/int-uint.md)) — Длина временного интервала для расчета потребления ресурсов, в секундах. 
--   `is_randomized_interval` ([UInt8](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Логическое значение. Оно показывает, является ли интервал рандомизированным. Интервал всегда начинается в одно и то же время, если он не рандомизирован. Например, интервал в 1 минуту всегда начинается с целого числа минут (то есть он может начинаться в 11:20:00, но никогда не начинается в 11:20:01), интервал в один день всегда начинается в полночь UTC. Если интервал рандомизирован, то самый первый интервал начинается в произвольное время, а последующие интервалы начинаются один за другим. Значения:
-    -   `0` — Интервал рандомизирован.
-    -   `1` — Интервал не рандомизирован.
--   `max_queries` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — Максимальное число запросов.
--   `max_errors` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — Максимальное количество ошибок.
--   `max_result_rows` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — Максимальное количество строк результата.
--   `max_result_bytes` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — Максимальный объем оперативной памяти в байтах, используемый для хранения результата запроса.
--   `max_read_rows` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — Максимальное количество строк, считываемых из всех таблиц и табличных функций, участвующих в запросе.
--   `max_read_bytes` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — Максимальное количество байтов, считываемых из всех таблиц и табличных функций, участвующих в запросе.
--   `max_execution_time` ([Nullable](../../sql-reference/data-types/nullable.md)([Float64](../../sql-reference/data-types/float.md))) — Максимальное время выполнения запроса, в секундах.
-
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/system_tables/quota_limits) <!--hide-->
+-   `quota_name` ([String](../../sql-reference/data-types/string.md)) — имя квоты.
+-   `duration` ([UInt32](../../sql-reference/data-types/int-uint.md)) — длина временного интервала для расчета потребления ресурсов, в секундах. 
+-   `is_randomized_interval` ([UInt8](../../sql-reference/data-types/int-uint.md#uint-ranges)) — логическое значение. Оно показывает, является ли интервал рандомизированным. Интервал всегда начинается в одно и то же время, если он не рандомизирован. Например, интервал в 1 минуту всегда начинается с целого числа минут (то есть он может начинаться в 11:20:00, но никогда не начинается в 11:20:01), интервал в один день всегда начинается в полночь UTC. Если интервал рандомизирован, то самый первый интервал начинается в произвольное время, а последующие интервалы начинаются один за другим. Значения:
+    -   `0` — интервал рандомизирован.
+    -   `1` — интервал не рандомизирован.
+-   `max_queries` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — максимальное число запросов.
+- `max_query_selects` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — максимальное число запросов `SELECT`.
+- `max_query_inserts` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — максимальное число запросов `INSERT`.
+-   `max_errors` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — максимальное количество ошибок.
+-   `max_result_rows` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — максимальное количество строк результата.
+-   `max_result_bytes` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — максимальный объем оперативной памяти в байтах, используемый для хранения результата запроса.
+-   `max_read_rows` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — максимальное количество строк, считываемых из всех таблиц и табличных функций, участвующих в запросе.
+-   `max_read_bytes` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — максимальное количество байтов, считываемых из всех таблиц и табличных функций, участвующих в запросе.
+-   `max_execution_time` ([Nullable](../../sql-reference/data-types/nullable.md)([Float64](../../sql-reference/data-types/float.md))) — максимальное время выполнения запроса, в секундах.
\ No newline at end of file
diff --git a/docs/ru/operations/system-tables/quota_usage.md b/docs/ru/operations/system-tables/quota_usage.md
index cea3c4b2daa..19e9397ebaa 100644
--- a/docs/ru/operations/system-tables/quota_usage.md
+++ b/docs/ru/operations/system-tables/quota_usage.md
@@ -4,28 +4,28 @@
 
 Столбцы:
 
--   `quota_name` ([String](../../sql-reference/data-types/string.md)) — Имя квоты.
--   `quota_key`([String](../../sql-reference/data-types/string.md)) — Значение ключа. Например, если keys = `ip_address`, `quota_key` может иметь значение '192.168.1.1'.
--   `start_time`([Nullable](../../sql-reference/data-types/nullable.md)([DateTime](../../sql-reference/data-types/datetime.md))) — Время начала расчета потребления ресурсов.
--   `end_time`([Nullable](../../sql-reference/data-types/nullable.md)([DateTime](../../sql-reference/data-types/datetime.md))) — Время окончания расчета потребления ресурс
--   `duration` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — Длина временного интервала для расчета потребления ресурсов, в секундах.
--   `queries` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — Общее количество запросов на этом интервале.
--   `max_queries` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — Максимальное количество запросов.
--   `errors` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — Число запросов, вызвавших ошибки.
--   `max_errors` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — Максимальное число ошибок.
--   `result_rows` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — Общее количество строк результата.
--   `max_result_rows` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — Максимальное количество строк результата.
--   `result_bytes` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — Объем оперативной памяти в байтах, используемый для хранения результата запроса.
--   `max_result_bytes` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — Максимальный объем оперативной памяти, используемый для хранения результата запроса, в байтах.
--   `read_rows` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — Общее число исходных строк, считываемых из таблиц для выполнения запроса на всех удаленных серверах.
--   `max_read_rows` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — Максимальное количество строк, считываемых из всех таблиц и табличных функций, участвующих в запросах.
--   `read_bytes` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — Общее количество байт, считанных из всех таблиц и табличных функций, участвующих в запросах.
--   `max_read_bytes` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — Максимальное количество байт, считываемых из всех таблиц и табличных функций.
--   `execution_time` ([Nullable](../../sql-reference/data-types/nullable.md)([Float64](../../sql-reference/data-types/float.md))) — Общее время выполнения запроса, в секундах.
--   `max_execution_time` ([Nullable](../../sql-reference/data-types/nullable.md)([Float64](../../sql-reference/data-types/float.md))) — Максимальное время выполнения запроса.
+-   `quota_name` ([String](../../sql-reference/data-types/string.md)) — имя квоты.
+-   `quota_key`([String](../../sql-reference/data-types/string.md)) — значение ключа. Например, если keys = `ip_address`, `quota_key` может иметь значение '192.168.1.1'.
+-   `start_time`([Nullable](../../sql-reference/data-types/nullable.md)([DateTime](../../sql-reference/data-types/datetime.md))) — время начала расчета потребления ресурсов.
+-   `end_time`([Nullable](../../sql-reference/data-types/nullable.md)([DateTime](../../sql-reference/data-types/datetime.md))) — время окончания расчета потребления ресурс
+-   `duration` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — длина временного интервала для расчета потребления ресурсов, в секундах.
+-   `queries` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — общее количество запросов на этом интервале.
+-   `query_selects` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — общее количество запросов `SELECT` на этом интервале.
+-   `query_inserts` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — общее количество запросов `INSERT` на этом интервале.
+-   `max_queries` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — максимальное количество запросов.
+-   `errors` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — число запросов, вызвавших ошибки.
+-   `max_errors` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — максимальное число ошибок.
+-   `result_rows` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — общее количество строк результата.
+-   `max_result_rows` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — максимальное количество строк результата.
+-   `result_bytes` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — объем оперативной памяти в байтах, используемый для хранения результата запроса.
+-   `max_result_bytes` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — максимальный объем оперативной памяти, используемый для хранения результата запроса, в байтах.
+-   `read_rows` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — общее число исходных строк, считываемых из таблиц для выполнения запроса на всех удаленных серверах.
+-   `max_read_rows` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — максимальное количество строк, считываемых из всех таблиц и табличных функций, участвующих в запросах.
+-   `read_bytes` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — общее количество байт, считанных из всех таблиц и табличных функций, участвующих в запросах.
+-   `max_read_bytes` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — максимальное количество байт, считываемых из всех таблиц и табличных функций.
+-   `execution_time` ([Nullable](../../sql-reference/data-types/nullable.md)([Float64](../../sql-reference/data-types/float.md))) — общее время выполнения запроса, в секундах.
+-   `max_execution_time` ([Nullable](../../sql-reference/data-types/nullable.md)([Float64](../../sql-reference/data-types/float.md))) — максимальное время выполнения запроса.
 
 ## Смотрите также {#see-also}
 
--   [SHOW QUOTA](../../sql-reference/statements/show.md#show-quota-statement)
-
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/system_tables/quota_usage) <!--hide-->
+-   [SHOW QUOTA](../../sql-reference/statements/show.md#show-quota-statement)
\ No newline at end of file
diff --git a/docs/ru/operations/system-tables/quotas.md b/docs/ru/operations/system-tables/quotas.md
index 15bb41a85bf..fe6b78cc44b 100644
--- a/docs/ru/operations/system-tables/quotas.md
+++ b/docs/ru/operations/system-tables/quotas.md
@@ -25,5 +25,4 @@
 
 -   [SHOW QUOTAS](../../sql-reference/statements/show.md#show-quotas-statement)
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/system_tables/quotas) <!--hide-->
 
diff --git a/docs/ru/operations/system-tables/quotas_usage.md b/docs/ru/operations/system-tables/quotas_usage.md
index 9d6d339c434..fe066e38add 100644
--- a/docs/ru/operations/system-tables/quotas_usage.md
+++ b/docs/ru/operations/system-tables/quotas_usage.md
@@ -4,29 +4,31 @@
 
 Столбцы:
 
--   `quota_name` ([String](../../sql-reference/data-types/string.md)) — Имя квоты.
--   `quota_key` ([String](../../sql-reference/data-types/string.md)) — Ключ квоты.
--   `is_current` ([UInt8](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Квота используется для текущего пользователя.
--   `start_time` ([Nullable](../../sql-reference/data-types/nullable.md)([DateTime](../../sql-reference/data-types/datetime.md)))) — Время начала расчета потребления ресурсов.
--   `end_time` ([Nullable](../../sql-reference/data-types/nullable.md)([DateTime](../../sql-reference/data-types/datetime.md)))) — Время окончания расчета потребления ресурсов.
--   `duration` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt32](../../sql-reference/data-types/int-uint.md))) — Длина временного интервала для расчета потребления ресурсов, в секундах.
--   `queries` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — Общее количество запросов на этом интервале.
--   `max_queries` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — Максимальное число запросов.
--   `errors` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — Число запросов, вызвавших ошибки.
--   `max_errors` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — Максимальное число ошибок.
--   `result_rows` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — The total number of rows given as a result.
--   `max_result_rows` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — Maximum of source rows read from tables.
--   `result_bytes` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — Объем оперативной памяти в байтах, используемый для хранения результата запроса.
--   `max_result_bytes` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — Максимальный объем оперативной памяти, используемый для хранения результата запроса, в байтах.
--   `read_rows` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — Общее число исходных строк, считываемых из таблиц для выполнения запроса на всех удаленных серверах.
--   `max_read_rows` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — Максимальное количество строк, считываемых из всех таблиц и табличных функций, участвующих в запросах.
--   `read_bytes` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — Общее количество байт, считанных из всех таблиц и табличных функций, участвующих в запросах.
--   `max_read_bytes` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — Максимальное количество байт, считываемых из всех таблиц и табличных функций.
--   `execution_time` ([Nullable](../../sql-reference/data-types/nullable.md)([Float64](../../sql-reference/data-types/float.md))) — Общее время выполнения запроса, в секундах.
--   `max_execution_time` ([Nullable](../../sql-reference/data-types/nullable.md)([Float64](../../sql-reference/data-types/float.md))) — Максимальное время выполнения запроса.
+-   `quota_name` ([String](../../sql-reference/data-types/string.md)) — имя квоты.
+-   `quota_key` ([String](../../sql-reference/data-types/string.md)) — ключ квоты.
+-   `is_current` ([UInt8](../../sql-reference/data-types/int-uint.md#uint-ranges)) — квота используется для текущего пользователя.
+-   `start_time` ([Nullable](../../sql-reference/data-types/nullable.md)([DateTime](../../sql-reference/data-types/datetime.md)))) — время начала расчета потребления ресурсов.
+-   `end_time` ([Nullable](../../sql-reference/data-types/nullable.md)([DateTime](../../sql-reference/data-types/datetime.md)))) — время окончания расчета потребления ресурсов.
+-   `duration` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt32](../../sql-reference/data-types/int-uint.md))) — длина временного интервала для расчета потребления ресурсов, в секундах.
+-   `queries` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — общее количество запросов на этом интервале.
+-   `max_queries` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — максимальное число запросов.
+-   `query_selects` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — общее количество запросов `SELECT` на этом интервале.
+-   `max_query_selects` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — максимальное количество запросов `SELECT` на этом интервале.
+-   `query_inserts` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — общее количество запросов `INSERT` на этом интервале.
+-   `max_query_inserts` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — максимальное количество запросов `INSERT` на этом интервале.
+-   `errors` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — число запросов, вызвавших ошибки.
+-   `max_errors` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — максимальное число ошибок.
+-   `result_rows` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — общее количество строк, приведенных в результате.
+-   `max_result_rows` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — максимальное количество исходных строк, считываемых из таблиц.
+-   `result_bytes` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — объем оперативной памяти в байтах, используемый для хранения результата запроса.
+-   `max_result_bytes` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — максимальный объем оперативной памяти, используемый для хранения результата запроса, в байтах.
+-   `read_rows` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — общее число исходных строк, считываемых из таблиц для выполнения запроса на всех удаленных серверах.
+-   `max_read_rows` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — максимальное количество строк, считываемых из всех таблиц и табличных функций, участвующих в запросах.
+-   `read_bytes` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — общее количество байт, считанных из всех таблиц и табличных функций, участвующих в запросах.
+-   `max_read_bytes` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — максимальное количество байт, считываемых из всех таблиц и табличных функций.
+-   `execution_time` ([Nullable](../../sql-reference/data-types/nullable.md)([Float64](../../sql-reference/data-types/float.md))) — общее время выполнения запроса, в секундах.
+-   `max_execution_time` ([Nullable](../../sql-reference/data-types/nullable.md)([Float64](../../sql-reference/data-types/float.md))) — максимальное время выполнения запроса.
 
 ## Смотрите также {#see-also}
 
--   [SHOW QUOTA](../../sql-reference/statements/show.md#show-quota-statement)
-
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/system_tables/quotas_usage) <!--hide-->
+-   [SHOW QUOTA](../../sql-reference/statements/show.md#show-quota-statement)
\ No newline at end of file
diff --git a/docs/ru/operations/system-tables/replicas.md b/docs/ru/operations/system-tables/replicas.md
index 8d4eb60c56a..7879ee707a4 100644
--- a/docs/ru/operations/system-tables/replicas.md
+++ b/docs/ru/operations/system-tables/replicas.md
@@ -120,5 +120,4 @@ WHERE
 
 Если этот запрос ничего не возвращает - значит всё хорошо.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/system_tables/replicas) <!--hide-->
 
diff --git a/docs/ru/operations/system-tables/replicated_fetches.md b/docs/ru/operations/system-tables/replicated_fetches.md
index 94584f390ee..31d5a5cfe08 100644
--- a/docs/ru/operations/system-tables/replicated_fetches.md
+++ b/docs/ru/operations/system-tables/replicated_fetches.md
@@ -67,4 +67,3 @@ thread_id:                   54
 
 -   [Управление таблицами ReplicatedMergeTree](../../sql-reference/statements/system/#query-language-system-replicated)
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/operations/system_tables/replicated_fetches) <!--hide-->
diff --git a/docs/ru/operations/system-tables/replication_queue.md b/docs/ru/operations/system-tables/replication_queue.md
index 47f64aea55d..56e8c695a21 100644
--- a/docs/ru/operations/system-tables/replication_queue.md
+++ b/docs/ru/operations/system-tables/replication_queue.md
@@ -70,12 +70,11 @@ num_tries:              36
 last_exception:         Code: 226, e.displayText() = DB::Exception: Marks file '/opt/clickhouse/data/merge/visits_v2/tmp_fetch_20201130_121373_121384_2/CounterID.mrk' doesn't exist (version 20.8.7.15 (official build))
 last_attempt_time:      2020-12-08 17:35:54
 num_postponed:          0
-postpone_reason:        
+postpone_reason:
 last_postpone_time:     1970-01-01 03:00:00
 ```
 
 **Смотрите также**
 
--   [Управление таблицами ReplicatedMergeTree](../../sql-reference/statements/system.md/#query-language-system-replicated)
+-   [Управление таблицами ReplicatedMergeTree](../../sql-reference/statements/system.md#query-language-system-replicated)
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/system_tables/replication_queue) <!--hide-->
diff --git a/docs/ru/operations/system-tables/role-grants.md b/docs/ru/operations/system-tables/role-grants.md
index f014af1fe3d..2c80a597857 100644
--- a/docs/ru/operations/system-tables/role-grants.md
+++ b/docs/ru/operations/system-tables/role-grants.md
@@ -14,4 +14,3 @@
     -   1 — Роль обладает привилегией `ADMIN OPTION`.
     -   0 — Роль не обладает привилегией `ADMIN OPTION`. 
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/system_tables/role-grants) <!--hide-->
\ No newline at end of file
diff --git a/docs/ru/operations/system-tables/roles.md b/docs/ru/operations/system-tables/roles.md
index 1b548e85be2..c2b94214012 100644
--- a/docs/ru/operations/system-tables/roles.md
+++ b/docs/ru/operations/system-tables/roles.md
@@ -14,4 +14,3 @@
 
 -   [SHOW ROLES](../../sql-reference/statements/show.md#show-roles-statement)
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/system_tables/roles) <!--hide-->
diff --git a/docs/ru/operations/system-tables/row_policies.md b/docs/ru/operations/system-tables/row_policies.md
index 7d0a490f01c..f1e84a201cb 100644
--- a/docs/ru/operations/system-tables/row_policies.md
+++ b/docs/ru/operations/system-tables/row_policies.md
@@ -31,4 +31,3 @@
 
 -   [SHOW POLICIES](../../sql-reference/statements/show.md#show-policies-statement)
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/system_tables/row_policies) <!--hide-->
diff --git a/docs/ru/operations/system-tables/settings.md b/docs/ru/operations/system-tables/settings.md
index c1ada37131c..c9d63d336b6 100644
--- a/docs/ru/operations/system-tables/settings.md
+++ b/docs/ru/operations/system-tables/settings.md
@@ -48,5 +48,5 @@ SELECT * FROM system.settings WHERE changed AND name='load_balancing'
 -   [Настройки](../settings/index.md#settings)
 -   [Разрешения для запросов](../settings/permissions-for-queries.md#settings_readonly)
 -   [Ограничения для значений настроек](../settings/constraints-on-settings.md)
+-   Выражение [SHOW SETTINGS](../../sql-reference/statements/show.md#show-settings)
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/system_tables/settings) <!--hide-->
diff --git a/docs/ru/operations/system-tables/settings_profile_elements.md b/docs/ru/operations/system-tables/settings_profile_elements.md
index cd801468e21..8a1461c6bb0 100644
--- a/docs/ru/operations/system-tables/settings_profile_elements.md
+++ b/docs/ru/operations/system-tables/settings_profile_elements.md
@@ -27,4 +27,3 @@
 
 -    `inherit_profile` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — Родительский профиль для данного профиля настроек. `NULL` если не задано. Профиль настроек может наследовать все значения и ограничения настроек (`min`, `max`, `readonly`) от своего родительского профиля.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/system_tables/settings_profile_elements) <!--hide-->
diff --git a/docs/ru/operations/system-tables/settings_profiles.md b/docs/ru/operations/system-tables/settings_profiles.md
index e1401553a4a..f8101fb0cb7 100644
--- a/docs/ru/operations/system-tables/settings_profiles.md
+++ b/docs/ru/operations/system-tables/settings_profiles.md
@@ -21,4 +21,3 @@
 
 -   [SHOW PROFILES](../../sql-reference/statements/show.md#show-profiles-statement)
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/system_tables/settings_profiles) <!--hide-->
diff --git a/docs/ru/operations/system-tables/stack_trace.md b/docs/ru/operations/system-tables/stack_trace.md
index 0689e15c35c..58d0a1c4b6a 100644
--- a/docs/ru/operations/system-tables/stack_trace.md
+++ b/docs/ru/operations/system-tables/stack_trace.md
@@ -85,4 +85,3 @@ res:       /lib/x86_64-linux-gnu/libc-2.27.so
 -   [arrayMap](../../sql-reference/functions/array-functions.md#array-map) — Описание и пример использования функции `arrayMap`.
 -   [arrayFilter](../../sql-reference/functions/array-functions.md#array-filter) — Описание и пример использования функции `arrayFilter`.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/system_tables/stack_trace) <!--hide-->
diff --git a/docs/ru/operations/system-tables/storage_policies.md b/docs/ru/operations/system-tables/storage_policies.md
index e62266af131..b2005d5f31e 100644
--- a/docs/ru/operations/system-tables/storage_policies.md
+++ b/docs/ru/operations/system-tables/storage_policies.md
@@ -14,4 +14,3 @@
 
 Если политика хранения содержит несколько томов, то каждому тому соответствует отдельная запись в таблице.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/system_tables/storage_policies) <!--hide-->
diff --git a/docs/ru/operations/system-tables/table_engines.md b/docs/ru/operations/system-tables/table_engines.md
index eb198475e43..b6f6d3decc2 100644
--- a/docs/ru/operations/system-tables/table_engines.md
+++ b/docs/ru/operations/system-tables/table_engines.md
@@ -6,8 +6,8 @@
 
 -   `name` (String) — имя движка.
 -   `supports_settings` (UInt8) — флаг, показывающий поддержку секции `SETTINGS`.
--   `supports_skipping_indices` (UInt8) — флаг, показывающий поддержку [индексов пропуска данных](table_engines/mergetree/#table_engine-mergetree-data_skipping-indexes).
--   `supports_ttl` (UInt8) — флаг, показывающий поддержку [TTL](table_engines/mergetree/#table_engine-mergetree-ttl).
+-   `supports_skipping_indices` (UInt8) — флаг, показывающий поддержку [индексов пропуска данных](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-data_skipping-indexes).
+-   `supports_ttl` (UInt8) — флаг, показывающий поддержку [TTL](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-ttl).
 -   `supports_sort_order` (UInt8) — флаг, показывающий поддержку секций `PARTITION_BY`, `PRIMARY_KEY`, `ORDER_BY` и `SAMPLE_BY`.
 -   `supports_replication` (UInt8) — флаг, показывающий поддержку [репликации](../../engines/table-engines/mergetree-family/replication.md).
 -   `supports_deduplication` (UInt8) — флаг, показывающий наличие в движке дедупликации данных.
@@ -34,4 +34,3 @@ WHERE name in ('Kafka', 'MergeTree', 'ReplicatedCollapsingMergeTree')
 -   [Настройки](../../engines/table-engines/integrations/kafka.md#table_engine-kafka-creating-a-table) Kafka
 -   [Настройки](../../engines/table-engines/special/join.md#join-limitations-and-settings) Join
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/system_tables/table_engines) <!--hide-->
diff --git a/docs/ru/operations/system-tables/tables.md b/docs/ru/operations/system-tables/tables.md
index 52de10871b2..11bb6a9eda2 100644
--- a/docs/ru/operations/system-tables/tables.md
+++ b/docs/ru/operations/system-tables/tables.md
@@ -1,40 +1,94 @@
 # system.tables {#system-tables}
 
-Содержит метаданные каждой таблицы, о которой знает сервер. Отсоединённые таблицы не отображаются в `system.tables`.
+Содержит метаданные каждой таблицы, о которой знает сервер. 
 
-Эта таблица содержит следующие столбцы (тип столбца показан в скобках):
+Отсоединённые таблицы ([DETACH](../../sql-reference/statements/detach.md)) не отображаются в `system.tables`.
 
--   `database String` — имя базы данных, в которой находится таблица.
--   `name` (String) — имя таблицы.
--   `engine` (String) — движок таблицы (без параметров).
--   `is_temporary` (UInt8) — флаг, указывающий на то, временная это таблица или нет.
--   `data_path` (String) — путь к данным таблицы в файловой системе.
--   `metadata_path` (String) — путь к табличным метаданным в файловой системе.
--   `metadata_modification_time` (DateTime) — время последней модификации табличных метаданных.
--   `dependencies_database` (Array(String)) — зависимости базы данных.
--   `dependencies_table` (Array(String)) — табличные зависимости (таблицы [MaterializedView](../../engines/table-engines/special/materializedview.md), созданные на базе текущей таблицы).
--   `create_table_query` (String) — запрос, которым создавалась таблица.
--   `engine_full` (String) — параметры табличного движка.
--   `partition_key` (String) — ключ партиционирования таблицы.
--   `sorting_key` (String) — ключ сортировки таблицы.
--   `primary_key` (String) - первичный ключ таблицы.
--   `sampling_key` (String) — ключ сэмплирования таблицы.
--   `storage_policy` (String) - политика хранения данных:
+Информация о [временных таблицах](../../sql-reference/statements/create/table.md#temporary-tables) содержится в `system.tables` только в тех сессиях, в которых эти таблицы были созданы. Поле `database` у таких таблиц пустое, а флаг `is_temporary` включен. 
+
+Столбцы:
+
+-   `database` ([String](../../sql-reference/data-types/string.md)) — имя базы данных, в которой находится таблица.
+-   `name` ([String](../../sql-reference/data-types/string.md)) — имя таблицы.
+-   `engine` ([String](../../sql-reference/data-types/string.md)) — движок таблицы (без параметров).
+-   `is_temporary` ([UInt8](../../sql-reference/data-types/int-uint.md)) — флаг, указывающий на то, временная это таблица или нет.
+-   `data_path` ([String](../../sql-reference/data-types/string.md)) — путь к данным таблицы в файловой системе.
+-   `metadata_path` ([String](../../sql-reference/data-types/string.md)) — путь к табличным метаданным в файловой системе.
+-   `metadata_modification_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — время последней модификации табличных метаданных.
+-   `dependencies_database` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) — зависимости базы данных.
+-   `dependencies_table` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) — табличные зависимости (таблицы [MaterializedView](../../engines/table-engines/special/materializedview.md), созданные на базе текущей таблицы).
+-   `create_table_query` ([String](../../sql-reference/data-types/string.md)) — запрос, при помощи которого создавалась таблица.
+-   `engine_full` ([String](../../sql-reference/data-types/string.md)) — параметры табличного движка.
+-   `partition_key` ([String](../../sql-reference/data-types/string.md)) — ключ партиционирования таблицы.
+-   `sorting_key` ([String](../../sql-reference/data-types/string.md)) — ключ сортировки таблицы.
+-   `primary_key` ([String](../../sql-reference/data-types/string.md)) - первичный ключ таблицы.
+-   `sampling_key` ([String](../../sql-reference/data-types/string.md)) — ключ сэмплирования таблицы.
+-   `storage_policy` ([String](../../sql-reference/data-types/string.md)) - политика хранения данных:
 
     -   [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-multiple-volumes)
     -   [Distributed](../../engines/table-engines/special/distributed.md#distributed)
 
--   `total_rows` (Nullable(UInt64)) - общее количество строк, если есть возможность быстро определить точное количество строк в таблице, в противном случае `Null` (включая базовую таблицу `Buffer`).
+-   `total_rows` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) - общее количество строк, если есть возможность быстро определить точное количество строк в таблице, в противном случае `NULL` (включая базовую таблицу `Buffer`).
 
--   `total_bytes` (Nullable(UInt64)) - общее количество байт, если можно быстро определить точное количество байт для таблицы на накопителе, в противном случае `Null` (**не включает** в себя никакого базового хранилища).
+-   `total_bytes` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) - общее количество байт, если можно быстро определить точное количество байт для таблицы на накопителе, в противном случае `NULL` (не включает в себя никакого базового хранилища).
 
     -   Если таблица хранит данные на диске, возвращает используемое пространство на диске (т. е. сжатое).
     -   Если таблица хранит данные в памяти, возвращает приблизительное количество используемых байт в памяти.
 
--   `lifetime_rows` (Nullable(UInt64)) - общее количество строк, добавленных оператором `INSERT` с момента запуска сервера (только для таблиц `Buffer`).
+-   `lifetime_rows` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) - общее количество строк, добавленных оператором `INSERT` с момента запуска сервера (только для таблиц `Buffer`).
 
--   `lifetime_bytes` (Nullable(UInt64)) - общее количество байт, добавленных оператором `INSERT` с момента запуска сервера (только для таблиц `Buffer`).
+-   `lifetime_bytes` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) - общее количество байт, добавленных оператором `INSERT` с момента запуска сервера (только для таблиц `Buffer`).
 
 Таблица `system.tables` используется при выполнении запроса `SHOW TABLES`.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/system_tables/tables) <!--hide-->
+**Пример**
+
+```sql
+SELECT * FROM system.tables LIMIT 2 FORMAT Vertical;
+```
+
+```text
+Row 1:
+──────
+database:                   system
+name:                       aggregate_function_combinators
+uuid:                       00000000-0000-0000-0000-000000000000
+engine:                     SystemAggregateFunctionCombinators
+is_temporary:               0
+data_paths:                 []
+metadata_path:              /var/lib/clickhouse/metadata/system/aggregate_function_combinators.sql
+metadata_modification_time: 1970-01-01 03:00:00
+dependencies_database:      []
+dependencies_table:         []
+create_table_query:         
+engine_full:                
+partition_key:              
+sorting_key:                
+primary_key:                
+sampling_key:               
+storage_policy:             
+total_rows:                 ᴺᵁᴸᴸ
+total_bytes:                ᴺᵁᴸᴸ
+
+Row 2:
+──────
+database:                   system
+name:                       asynchronous_metrics
+uuid:                       00000000-0000-0000-0000-000000000000
+engine:                     SystemAsynchronousMetrics
+is_temporary:               0
+data_paths:                 []
+metadata_path:              /var/lib/clickhouse/metadata/system/asynchronous_metrics.sql
+metadata_modification_time: 1970-01-01 03:00:00
+dependencies_database:      []
+dependencies_table:         []
+create_table_query:         
+engine_full:                
+partition_key:              
+sorting_key:                
+primary_key:                
+sampling_key:               
+storage_policy:             
+total_rows:                 ᴺᵁᴸᴸ
+total_bytes:                ᴺᵁᴸᴸ
+```
diff --git a/docs/ru/operations/system-tables/text_log.md b/docs/ru/operations/system-tables/text_log.md
index 141c3680c07..97c6ef9e2cd 100644
--- a/docs/ru/operations/system-tables/text_log.md
+++ b/docs/ru/operations/system-tables/text_log.md
@@ -50,4 +50,3 @@ source_file:             /ClickHouse/src/Interpreters/DNSCacheUpdater.cpp; void
 source_line:             45
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/system_tables/text_log) <!--hide-->
diff --git a/docs/ru/operations/system-tables/trace_log.md b/docs/ru/operations/system-tables/trace_log.md
index 3f0a16199d5..3d22e4eabfd 100644
--- a/docs/ru/operations/system-tables/trace_log.md
+++ b/docs/ru/operations/system-tables/trace_log.md
@@ -12,7 +12,7 @@ ClickHouse создает эту таблицу когда утсановлен
 
 -   `event_time`([DateTime](../../sql-reference/data-types/datetime.md)) — дата и время в момент снятия экземпляра стэка адресов вызова.
 
--   `event_time_microseconds` ([DateTime](../../sql-reference/data-types/datetime.md)) — дата и время в момент снятия экземпляра стэка адресов вызова с точностью до микросекунд.
+-   `event_time_microseconds` ([DateTime64](../../sql-reference/data-types/datetime64.md)) — дата и время в момент снятия экземпляра стэка адресов вызова с точностью до микросекунд.
 
 -   `revision`([UInt32](../../sql-reference/data-types/int-uint.md)) — ревизия сборки сервера ClickHouse.
 
@@ -50,4 +50,3 @@ trace:                   [371912858,371912789,371798468,371799717,371801313,3717
 size:                    5244400
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/system_tables/trace_log) <!--hide-->
diff --git a/docs/ru/operations/system-tables/users.md b/docs/ru/operations/system-tables/users.md
index c12b91f445f..2a523ae4a9a 100644
--- a/docs/ru/operations/system-tables/users.md
+++ b/docs/ru/operations/system-tables/users.md
@@ -31,4 +31,3 @@
 
 -   [SHOW USERS](../../sql-reference/statements/show.md#show-users-statement)
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/system_tables/users) <!--hide-->
diff --git a/docs/ru/operations/system-tables/zookeeper.md b/docs/ru/operations/system-tables/zookeeper.md
index 9a2b781d8f3..a6ce62a9d4e 100644
--- a/docs/ru/operations/system-tables/zookeeper.md
+++ b/docs/ru/operations/system-tables/zookeeper.md
@@ -69,4 +69,3 @@ pzxid:          987021252247
 path:           /clickhouse/tables/01-08/visits/replicas
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/system_tables/zookeeper) <!--hide-->
diff --git a/docs/ru/operations/tips.md b/docs/ru/operations/tips.md
index 40035309c03..4535767e8e0 100644
--- a/docs/ru/operations/tips.md
+++ b/docs/ru/operations/tips.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 58
-toc_title: "\u0421\u043e\u0432\u0435\u0442\u044b\u0020\u043f\u043e\u0020\u044d\u043a\u0441\u043f\u043b\u0443\u0430\u0442\u0430\u0446\u0438\u0438"
+toc_title: "Советы по эксплуатации"
 ---
 
 # Советы по эксплуатации {#sovety-po-ekspluatatsii}
@@ -246,4 +246,3 @@ script
 end script
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/tips/) <!--hide-->
diff --git a/docs/ru/operations/troubleshooting.md b/docs/ru/operations/troubleshooting.md
index 3df2a1dd46c..5882bc36f9e 100644
--- a/docs/ru/operations/troubleshooting.md
+++ b/docs/ru/operations/troubleshooting.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 46
-toc_title: "\u0423\u0441\u0442\u0440\u0430\u043d\u0435\u043d\u0438\u0435\u0020\u043d\u0435\u0438\u0441\u043f\u0440\u0430\u0432\u043d\u043e\u0441\u0442\u0435\u0439"
+toc_title: "Устранение неисправностей"
 ---
 
 # Устранение неисправностей {#ustranenie-neispravnostei}
diff --git a/docs/ru/operations/update.md b/docs/ru/operations/update.md
index c74b28b3fd7..a3e87b52ede 100644
--- a/docs/ru/operations/update.md
+++ b/docs/ru/operations/update.md
@@ -1,9 +1,9 @@
 ---
 toc_priority: 47
-toc_title: "\u041e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0435\u0020\u0043\u006c\u0069\u0063\u006b\u0048\u006f\u0075\u0073\u0065"
+toc_title: "Обновление ClickHouse"
 ---
 
-# Обновление ClickHouse {#obnovlenie-clickhouse}
+# Обновление ClickHouse {#clickhouse-upgrade}
 
 Если ClickHouse установлен с помощью deb-пакетов, выполните следующие команды на сервере:
 
@@ -15,4 +15,17 @@ $ sudo service clickhouse-server restart
 
 Если ClickHouse установлен не из рекомендуемых deb-пакетов, используйте соответствующий метод обновления.
 
-ClickHouse не поддерживает распределенное обновление. Операция должна выполняться последовательно на каждом отдельном сервере. Не обновляйте все серверы в кластере одновременно, иначе кластер становится недоступным в течение некоторого времени.
+!!! note "Примечание"
+    Вы можете обновить сразу несколько серверов, кроме случая, когда все реплики одного шарда отключены.
+
+Обновление ClickHouse до определенной версии:
+
+**Пример**
+
+`xx.yy.a.b` — это номер текущей стабильной версии. Последнюю стабильную версию можно узнать [здесь](https://github.com/ClickHouse/ClickHouse/releases)
+
+```bash
+$ sudo apt-get update
+$ sudo apt-get install clickhouse-server=xx.yy.a.b clickhouse-client=xx.yy.a.b clickhouse-common-static=xx.yy.a.b
+$ sudo service clickhouse-server restart
+```
diff --git a/docs/ru/operations/utilities/clickhouse-benchmark.md b/docs/ru/operations/utilities/clickhouse-benchmark.md
index 2a883cf3bb5..b4769b17818 100644
--- a/docs/ru/operations/utilities/clickhouse-benchmark.md
+++ b/docs/ru/operations/utilities/clickhouse-benchmark.md
@@ -160,4 +160,3 @@ localhost:9000, queries 10, QPS: 6.082, RPS: 121959604.568, MiB/s: 930.478, resu
 99.990%     0.172 sec.
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/utilities/clickhouse-benchmark.md)
diff --git a/docs/ru/operations/utilities/clickhouse-copier.md b/docs/ru/operations/utilities/clickhouse-copier.md
index 243ad7f379b..aa4fd68f8e8 100644
--- a/docs/ru/operations/utilities/clickhouse-copier.md
+++ b/docs/ru/operations/utilities/clickhouse-copier.md
@@ -181,4 +181,3 @@ $ clickhouse-copier --daemon --config zookeeper.xml --task-path /task/path --bas
 
 `clickhouse-copier` отслеживает изменения `/task/path/description` и применяет их «на лету». Если вы поменяете, например, значение `max_workers`, то количество процессов, выполняющих задания, также изменится.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/utils/clickhouse-copier/) <!--hide-->
diff --git a/docs/ru/operations/utilities/clickhouse-local.md b/docs/ru/operations/utilities/clickhouse-local.md
index 2b5c9b119e2..682dc0b5ace 100644
--- a/docs/ru/operations/utilities/clickhouse-local.md
+++ b/docs/ru/operations/utilities/clickhouse-local.md
@@ -14,14 +14,15 @@ toc_title: clickhouse-local
 !!! warning "Warning"
     Мы не рекомендуем подключать серверную конфигурацию к `clickhouse-local`, поскольку данные можно легко повредить неосторожными действиями.
 
-Для временных данных по умолчанию создается специальный каталог. Если вы хотите обойти это действие, каталог данных можно указать с помощью опции `-- --path`.
+Для временных данных по умолчанию создается специальный каталог. 
 
-## Вызов программы {#vyzov-programmy}
+## Вызов программы {#usage}
 
 Основной формат вызова:
 
 ``` bash
-$ clickhouse-local --structure "table_structure" --input-format "format_of_incoming_data" -q "query"
+$ clickhouse-local --structure "table_structure" --input-format "format_of_incoming_data" \
+    --query "query"
 ```
 
 Ключи команды:
@@ -30,15 +31,23 @@ $ clickhouse-local --structure "table_structure" --input-format "format_of_incom
 -   `-if`, `--input-format` — формат входящих данных. По умолчанию — `TSV`.
 -   `-f`, `--file` — путь к файлу с данными. По умолчанию — `stdin`.
 -   `-q`, `--query` — запросы на выполнение. Разделитель запросов — `;`.
+-   `-qf`, `--queries-file` - путь к файлу с запросами для выполнения. Необходимо задать либо параметр `query`, либо `queries-file`.
 -   `-N`, `--table` — имя таблицы, в которую будут помещены входящие данные. По умолчанию - `table`.
 -   `-of`, `--format`, `--output-format` — формат выходных данных. По умолчанию — `TSV`.
+-   `-d`, `--database` — база данных по умолчанию. Если не указано, используется значение `_local`.
 -   `--stacktrace` — вывод отладочной информации при исключениях.
+-   `--echo` — перед выполнением  запрос выводится в консоль. 
 -   `--verbose` — подробный вывод при выполнении запроса.
--   `-s` — отключает вывод системных логов в `stderr`.
--   `--config-file` — путь к файлу конфигурации. По умолчанию `clickhouse-local` запускается с пустой конфигурацией. Конфигурационный файл имеет тот же формат, что и для сервера ClickHouse и в нём можно использовать все конфигурационные параметры сервера. Обычно подключение конфигурации не требуется, если требуется установить отдельный параметр, то это можно сделать ключом с именем параметра.
+-   `--logger.console` — логирование действий в консоль.
+-   `--logger.log` — логирование действий в файл с указанным именем.
+-   `--logger.level` — уровень логирования.
+-   `--ignore-error` — не прекращать обработку если запрос выдал ошибку.
+-   `-c`, `--config-file` — путь к файлу конфигурации. По умолчанию `clickhouse-local` запускается с пустой конфигурацией. Конфигурационный файл имеет тот же формат, что и для сервера ClickHouse, и в нём можно использовать все конфигурационные параметры сервера. Обычно подключение конфигурации не требуется; если требуется установить отдельный параметр, то это можно сделать ключом с именем параметра.
+-   `--no-system-tables` — запуск без использования системных таблиц.
 -   `--help` — вывод справочной информации о `clickhouse-local`.
+-   `-V`, `--version` — вывод текущей версии и выход.
 
-## Примеры вызова {#primery-vyzova}
+## Примеры вызова {#examples}
 
 ``` bash
 $ echo -e "1,2\n3,4" | clickhouse-local --structure "a Int64, b Int64" \
@@ -76,7 +85,9 @@ $ clickhouse-local --query "
 1	2
 ```
 
-А теперь давайте выведем на экран объём оперативной памяти, занимаемой пользователями (Unix):
+Объём оперативной памяти, занимаемой процессами, которые запустил пользователь (Unix):
+
+Запрос:
 
 ``` bash
 $ ps aux | tail -n +2 | awk '{ printf("%s\t%s\n", $1, $4) }' \
@@ -85,6 +96,8 @@ $ ps aux | tail -n +2 | awk '{ printf("%s\t%s\n", $1, $4) }' \
             FROM table GROUP BY user ORDER BY memTotal DESC FORMAT Pretty"
 ```
 
+Результат:
+
 ``` text
 Read 186 rows, 4.15 KiB in 0.035 sec., 5302 rows/sec., 118.34 KiB/sec.
 ┏━━━━━━━━━━┳━━━━━━━━━━┓
@@ -97,4 +110,3 @@ Read 186 rows, 4.15 KiB in 0.035 sec., 5302 rows/sec., 118.34 KiB/sec.
 ...
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/utils/clickhouse-local/) <!--hide-->
diff --git a/docs/ru/operations/utilities/index.md b/docs/ru/operations/utilities/index.md
index 5b55ebd798d..fa257fb4b1a 100644
--- a/docs/ru/operations/utilities/index.md
+++ b/docs/ru/operations/utilities/index.md
@@ -1,7 +1,7 @@
 ---
-toc_folder_title: "\u0423\u0442\u0438\u043b\u0438\u0442\u044b"
+toc_folder_title: "Утилиты"
 toc_priority: 56
-toc_title: "\u041e\u0431\u0437\u043e\u0440"
+toc_title: "Обзор"
 ---
 
 # Утилиты ClickHouse {#utility-clickhouse}
@@ -9,4 +9,3 @@ toc_title: "\u041e\u0431\u0437\u043e\u0440"
 -   [clickhouse-local](clickhouse-local.md)
 -   [clickhouse-copier](clickhouse-copier.md) - копирует (и перешардирует) данные с одного кластера на другой.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/utils/) <!--hide-->
diff --git a/docs/ru/sql-reference/aggregate-functions/combinators.md b/docs/ru/sql-reference/aggregate-functions/combinators.md
index 592c61f87ff..74f9d1c1c05 100644
--- a/docs/ru/sql-reference/aggregate-functions/combinators.md
+++ b/docs/ru/sql-reference/aggregate-functions/combinators.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 37
-toc_title: "\u041a\u043e\u043c\u0431\u0438\u043d\u0430\u0442\u043e\u0440\u044b\u0020\u0430\u0433\u0440\u0435\u0433\u0430\u0442\u043d\u044b\u0445\u0020\u0444\u0443\u043d\u043a\u0446\u0438\u0439"
+toc_title: "Комбинаторы агрегатных функций"
 ---
 
 
@@ -27,6 +27,40 @@ toc_title: "\u041a\u043e\u043c\u0431\u0438\u043d\u0430\u0442\u043e\u0440\u044b\u
 
 Комбинаторы -If и -Array можно сочетать. При этом, должен сначала идти Array, а потом If. Примеры: `uniqArrayIf(arr, cond)`, `quantilesTimingArrayIf(level1, level2)(arr, cond)`. Из-за такого порядка получается, что аргумент cond не должен быть массивом.
 
+## -SimpleState {#agg-functions-combinator-simplestate}
+
+При использовании этого комбинатора агрегатная функция возвращает то же значение, но типа [SimpleAggregateFunction(...)](../../sql-reference/data-types/simpleaggregatefunction.md). Текущее значение функции может храниться в таблице для последующей работы с таблицами семейства [AggregatingMergeTree](../../engines/table-engines/mergetree-family/aggregatingmergetree.md).
+
+**Синтаксис**
+
+``` sql
+<aggFunction>SimpleState(x)
+```
+
+**Аргументы**
+
+-   `x` — параметры агрегатной функции.
+
+**Возвращаемое значение**
+
+Значение агрегатной функции типа `SimpleAggregateFunction(...)`.
+
+**Пример**
+
+Запрос:
+
+``` sql
+WITH anySimpleState(number) AS c SELECT toTypeName(c), c FROM numbers(1);
+```
+
+Результат:
+
+``` text
+┌─toTypeName(c)────────────────────────┬─c─┐
+│ SimpleAggregateFunction(any, UInt64) │ 0 │
+└──────────────────────────────────────┴───┘
+```
+
 ## -State {#state}
 
 В случае применения этого комбинатора, агрегатная функция возвращает не готовое значение (например, в случае функции [uniq](reference/uniq.md#agg_function-uniq) — количество уникальных значений), а промежуточное состояние агрегации (например, в случае функции `uniq` — хэш-таблицу для расчёта количества уникальных значений), которое имеет тип `AggregateFunction(...)` и может использоваться для дальнейшей обработки или может быть сохранено в таблицу для последующей доагрегации.
@@ -70,9 +104,9 @@ toc_title: "\u041a\u043e\u043c\u0431\u0438\u043d\u0430\u0442\u043e\u0440\u044b\u
 <aggFunction>OrDefault(x)
 ```
 
-**Параметры**
+**Аргументы**
 
-- `x` — Параметры агрегатной функции.
+-   `x` — аргументы агрегатной функции.
 
 **Возращаемые зачения**
 
@@ -131,14 +165,14 @@ FROM
 <aggFunction>OrNull(x)
 ```
 
-**Параметры**
+**Аргументы**
 
-- `x` — Параметры агрегатной функции.
+-   `x` — аргументы агрегатной функции.
 
 **Возвращаемые значения**
 
-- Результат агрегатной функции, преобразованный в тип данных `Nullable`.
-- `NULL`, если у агрегатной функции нет входных данных.
+-   Результат агрегатной функции, преобразованный в тип данных `Nullable`.
+-   `NULL`, если у агрегатной функции нет входных данных.
 
 Тип: `Nullable(aggregate function return type)`.
 
@@ -188,7 +222,7 @@ FROM
 <aggFunction>Resample(start, end, step)(<aggFunction_params>, resampling_key)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `start` — начальное значение для интервала значений `resampling_key`.
 -   `stop` — конечное значение для интервала значений `resampling_key`. Интервал не включает значение `stop` (`[start, stop)`).
@@ -247,5 +281,3 @@ FROM people
 │ [3,2]  │ [11.5,12.949999809265137] │
 └────────┴───────────────────────────┘
 ```
-
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/agg_functions/combinators/) <!--hide-->
diff --git a/docs/ru/sql-reference/aggregate-functions/index.md b/docs/ru/sql-reference/aggregate-functions/index.md
index 4a7768f587f..7afb6a374a7 100644
--- a/docs/ru/sql-reference/aggregate-functions/index.md
+++ b/docs/ru/sql-reference/aggregate-functions/index.md
@@ -1,8 +1,7 @@
 ---
-toc_folder_title: "\u0410\u0433\u0440\u0435\u0433\u0430\u0442\u043D\u044B\u0435 \u0444\
-  \u0443\u043D\u043A\u0446\u0438\u0438"
+toc_folder_title: "Агрегатные функции"
 toc_priority: 33
-toc_title: "\u0412\u0432\u0435\u0434\u0435\u043D\u0438\u0435"
+toc_title: "Введение"
 ---
 
 # Агрегатные функции {#aggregate-functions}
@@ -58,4 +57,3 @@ SELECT groupArray(y) FROM t_null_big
 
 `groupArray` не включает `NULL` в результирующий массив.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/aggregate-functions/) <!--hide-->
diff --git a/docs/ru/sql-reference/aggregate-functions/parametric-functions.md b/docs/ru/sql-reference/aggregate-functions/parametric-functions.md
index f20acaa45c3..e5162b63b88 100644
--- a/docs/ru/sql-reference/aggregate-functions/parametric-functions.md
+++ b/docs/ru/sql-reference/aggregate-functions/parametric-functions.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 38
-toc_title: "\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0438\u0447\u0435\u0441\u043a\u0438\u0435\u0020\u0430\u0433\u0440\u0435\u0433\u0430\u0442\u043d\u044b\u0435\u0020\u0444\u0443\u043d\u043a\u0446\u0438\u0438"
+toc_title: "Параметрические агрегатные функции"
 ---
 
 # Параметрические агрегатные функции {#aggregate_functions_parametric}
@@ -11,14 +11,19 @@ toc_title: "\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0438\u0447\u0435\u
 
 Рассчитывает адаптивную гистограмму. Не гарантирует точного результата.
 
-    histogram(number_of_bins)(values)
+``` sql
+histogram(number_of_bins)(values)
+```
 
 Функция использует [A Streaming Parallel Decision Tree Algorithm](http://jmlr.org/papers/volume11/ben-haim10a/ben-haim10a.pdf). Границы столбцов устанавливаются по мере поступления новых данных в функцию. В общем случае столбцы имею разную ширину.
 
+**Аргументы**
+
+`values` — [выражение](../syntax.md#syntax-expressions), предоставляющее входные значения.
+
 **Параметры**
 
 `number_of_bins` — максимальное количество корзин в гистограмме. Функция автоматически вычисляет количество корзин. Она пытается получить указанное количество корзин, но если не получилось, то в результате корзин будет меньше.
-`values` — [выражение](../syntax.md#syntax-expressions), предоставляющее входные значения.
 
 **Возвращаемые значения**
 
@@ -87,14 +92,16 @@ sequenceMatch(pattern)(timestamp, cond1, cond2, ...)
 !!! warning "Предупреждение"
     События, произошедшие в одну и ту же секунду, располагаются в последовательности в неопределенном порядке, что может повлиять на результат работы функции.
 
-**Параметры**
-
--   `pattern` — строка с шаблоном. Смотрите [Синтаксис шаблонов](#sequence-function-pattern-syntax).
+**Аргументы**
 
 -   `timestamp` — столбец, содержащий метки времени. Типичный тип данных столбца — `Date` или `DateTime`. Также можно использовать любой из поддержанных типов данных [UInt](../../sql-reference/aggregate-functions/parametric-functions.md).
 
 -   `cond1`, `cond2` — условия, описывающие цепочку событий. Тип данных — `UInt8`. Можно использовать до 32 условий. Функция учитывает только те события, которые указаны в условиях. Функция пропускает данные из последовательности, если они не описаны ни в одном из условий.
 
+**Параметры**
+
+-   `pattern` — строка с шаблоном. Смотрите [Синтаксис шаблонов](#sequence-function-pattern-syntax).
+
 **Возвращаемые значения**
 
 -   1, если цепочка событий, соответствующая шаблону найдена.
@@ -174,14 +181,16 @@ SELECT sequenceMatch('(?1)(?2)')(time, number = 1, number = 2, number = 4) FROM
 sequenceCount(pattern)(timestamp, cond1, cond2, ...)
 ```
 
-**Параметры**
-
--   `pattern` — строка с шаблоном. Смотрите [Синтаксис шаблонов](#sequence-function-pattern-syntax).
+**Аргументы**
 
 -   `timestamp` — столбец, содержащий метки времени. Типичный тип данных столбца — `Date` или `DateTime`. Также можно использовать любой из поддержанных типов данных [UInt](../../sql-reference/aggregate-functions/parametric-functions.md).
 
 -   `cond1`, `cond2` — условия, описывающие цепочку событий. Тип данных — `UInt8`. Можно использовать до 32 условий. Функция учитывает только те события, которые указаны в условиях. Функция пропускает данные из последовательности, если они не описаны ни в одном из условий.
 
+**Параметры**
+
+-   `pattern` — строка с шаблоном. Смотрите [Синтаксис шаблонов](#sequence-function-pattern-syntax).
+
 **Возвращаемое значение**
 
 -   Число непересекающихся цепочек событий, соответствущих шаблону.
@@ -234,15 +243,21 @@ SELECT sequenceCount('(?1).*(?2)')(time, number = 1, number = 2) FROM t
 **Синтаксис**
 
 ``` sql
-windowFunnel(window, [mode])(timestamp, cond1, cond2, ..., condN)
+windowFunnel(window, [mode, [mode, ... ]])(timestamp, cond1, cond2, ..., condN)
 ```
 
+**Аргументы**
+
+-   `timestamp` — имя столбца, содержащего временные отметки. [Date](../../sql-reference/aggregate-functions/parametric-functions.md), [DateTime](../../sql-reference/aggregate-functions/parametric-functions.md#data_type-datetime) и другие параметры с типом `Integer`. В случае хранения меток времени в столбцах с типом `UInt64`, максимально допустимое значение соответствует ограничению для типа `Int64`, т.е. равно `2^63-1`.
+-   `cond` — условия или данные, описывающие цепочку событий. [UInt8](../../sql-reference/aggregate-functions/parametric-functions.md).
+
 **Параметры**
 
--   `window` — ширина скользящего окна по времени в секундах. [UInt](../../sql-reference/aggregate-functions/parametric-functions.md).
--   `mode` - необязательный параметр. Если установлено значение `'strict'`, то функция `windowFunnel()` применяет условия только для уникальных значений.
--   `timestamp` — имя столбца, содержащего временные отметки. [Date](../../sql-reference/aggregate-functions/parametric-functions.md), [DateTime](../../sql-reference/aggregate-functions/parametric-functions.md#data_type-datetime) и другие параметры с типом `Integer`. В случае хранения меток времени в столбцах с типом `UInt64`, максимально допустимое значение соответствует ограничению для типа `Int64`, т.е. равно `2^63-1`.
--   `cond` — условия или данные, описывающие цепочку событий. [UInt8](../../sql-reference/aggregate-functions/parametric-functions.md).
+-   `window` — ширина скользящего окна по времени. Единица измерения зависит от `timestamp` и может варьироваться. Должно соблюдаться условие `timestamp события cond2 <= timestamp события cond1 + window`.
+-   `mode` — необязательный параметр. Может быть установленно несколько значений одновременно.
+    -   `'strict'` — не учитывать подряд идущие повторяющиеся события.
+    -   `'strict_order'` — запрещает посторонние события в искомой последовательности. Например, при поиске цепочки `A->B->C` в `A->B->D->C` поиск будет остановлен на `D` и функция вернет 2.
+    -   `'strict_increase'` — условия прменяются только для событий со строго возрастающими временными метками.
 
 **Возвращаемое значение**
 
@@ -306,7 +321,7 @@ ORDER BY level ASC
 
 Функция принимает набор (от 1 до 32) логических условий, как в [WHERE](../../sql-reference/statements/select/where.md#select-where), и применяет их к заданному набору данных.
 
-Условия, кроме первого, применяются попарно: результат второго будет истинным, если истинно первое и второе, третьего - если истинно первое и третье и т. д.
+Условия, кроме первого, применяются попарно: результат второго будет истинным, если истинно первое и второе, третьего - если истинно первое и третье и т.д.
 
 **Синтаксис**
 
@@ -314,7 +329,7 @@ ORDER BY level ASC
 retention(cond1, cond2, ..., cond32)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `cond` — вычисляемое условие или выражение, которое возвращает `UInt8` результат (1/0).
 
@@ -481,4 +496,3 @@ FROM
 Решение: пишем в запросе GROUP BY SearchPhrase HAVING uniqUpTo(4)(UserID) >= 5
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/agg_functions/parametric_functions/) <!--hide-->
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/any.md b/docs/ru/sql-reference/aggregate-functions/reference/any.md
index 38c412813ab..6142b9a2092 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/any.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/any.md
@@ -12,4 +12,3 @@ toc_priority: 6
 
 При наличии в запросе `SELECT` секции `GROUP BY` или хотя бы одной агрегатной функции, ClickHouse (в отличие от, например, MySQL) требует, чтобы все выражения в секциях `SELECT`, `HAVING`, `ORDER BY` вычислялись из ключей или из агрегатных функций. То есть, каждый выбираемый из таблицы столбец, должен использоваться либо в ключах, либо внутри агрегатных функций. Чтобы получить поведение, как в MySQL, вы можете поместить остальные столбцы в агрегатную функцию `any`.
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/any/) <!--hide-->
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/anyheavy.md b/docs/ru/sql-reference/aggregate-functions/reference/anyheavy.md
index 19fda7f64b7..bb7a01a47f3 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/anyheavy.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/anyheavy.md
@@ -29,4 +29,3 @@ FROM ontime
 └───────┘
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/anyheavy/) <!--hide-->
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/anylast.md b/docs/ru/sql-reference/aggregate-functions/reference/anylast.md
index da68c926d43..7be380461f7 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/anylast.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/anylast.md
@@ -7,4 +7,3 @@ toc_priority: 104
 Выбирает последнее попавшееся значение.
 Результат так же недетерминирован, как и для функции [any](../../../sql-reference/aggregate-functions/reference/any.md).
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/anylast/) <!--hide-->
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/argmax.md b/docs/ru/sql-reference/aggregate-functions/reference/argmax.md
index f44e65831a9..edad26ee232 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/argmax.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/argmax.md
@@ -20,20 +20,20 @@ argMax(arg, val)
 argMax(tuple(arg, val))
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `arg` — аргумент.
 -   `val` — значение.
 
 **Возвращаемое значение**
 
--   Значение `arg`, соответствующее максимальному значению `val`.
+-   значение `arg`, соответствующее максимальному значению `val`.
 
 Тип: соответствует типу `arg`. 
 
 Если передан кортеж:
 
--   Кортеж `(arg, val)` c максимальным значением `val` и соответствующим ему `arg`.
+-   кортеж `(arg, val)` c максимальным значением `val` и соответствующим ему `arg`.
 
 Тип: [Tuple](../../../sql-reference/data-types/tuple.md).
 
@@ -52,15 +52,14 @@ argMax(tuple(arg, val))
 Запрос:
 
 ``` sql
-SELECT argMax(user, salary), argMax(tuple(user, salary)) FROM salary;
+SELECT argMax(user, salary), argMax(tuple(user, salary), salary), argMax(tuple(user, salary)) FROM salary;
 ```
 
 Результат:
 
 ``` text
-┌─argMax(user, salary)─┬─argMax(tuple(user, salary))─┐
-│ director             │ ('director',5000)           │
-└──────────────────────┴─────────────────────────────┘
+┌─argMax(user, salary)─┬─argMax(tuple(user, salary), salary)─┬─argMax(tuple(user, salary))─┐
+│ director             │ ('director',5000)                   │ ('director',5000)           │
+└──────────────────────┴─────────────────────────────────────┴─────────────────────────────┘
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/aggregate-functions/reference/argmax/) <!--hide-->
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/argmin.md b/docs/ru/sql-reference/aggregate-functions/reference/argmin.md
index 8c25b79f92a..dc54c424fb3 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/argmin.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/argmin.md
@@ -20,7 +20,7 @@ argMin(arg, val)
 argMin(tuple(arg, val))
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `arg` — аргумент.
 -   `val` — значение.
@@ -63,4 +63,3 @@ SELECT argMin(user, salary), argMin(tuple(user, salary)) FROM salary;
 └──────────────────────┴─────────────────────────────┘
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/aggregate-functions/reference/argmin/) <!--hide-->
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/avg.md b/docs/ru/sql-reference/aggregate-functions/reference/avg.md
index b0bee64ec66..c5e1dec14e0 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/avg.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/avg.md
@@ -4,8 +4,60 @@ toc_priority: 5
 
 # avg {#agg_function-avg}
 
-Вычисляет среднее.
-Работает только для чисел.
-Результат всегда Float64.
+Вычисляет среднее арифметическое.
+
+**Синтаксис**
+
+``` sql
+avg(x)
+```
+
+**Аргументы**
+
+-   `x` — входное значение типа [Integer](../../../sql-reference/data-types/int-uint.md), [Float](../../../sql-reference/data-types/float.md) или [Decimal](../../../sql-reference/data-types/decimal.md).
+
+**Возвращаемое значение**
+
+-   среднее арифметическое, всегда типа [Float64](../../../sql-reference/data-types/float.md).
+-   `NaN`, если входное значение `x` — пустое.
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT avg(x) FROM values('x Int8', 0, 1, 2, 3, 4, 5);
+```
+
+Результат:
+
+``` text
+┌─avg(x)─┐
+│    2.5 │
+└────────┘
+```
+
+**Пример**
+
+Создайте временную таблицу:
+
+Запрос:
+
+``` sql
+CREATE table test (t UInt8) ENGINE = Memory;
+```
+
+Выполните запрос:
+
+``` sql
+SELECT avg(t) FROM test;
+```
+
+Результат:
+
+``` text
+┌─avg(x)─┐
+│    nan │
+└────────┘
+```
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/avg/) <!--hide-->
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/avgweighted.md b/docs/ru/sql-reference/aggregate-functions/reference/avgweighted.md
index 72e6ca5c88c..291abbfa3fb 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/avgweighted.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/avgweighted.md
@@ -12,10 +12,10 @@ toc_priority: 107
 avgWeighted(x, weight)
 ```
 
-**Параметры**
+**Аргументы**
 
--   `x` — Значения. [Целые числа](../../../sql-reference/data-types/int-uint.md) или [числа с плавающей запятой](../../../sql-reference/data-types/float.md).
--   `weight` — Веса отдельных значений. [Целые числа](../../../sql-reference/data-types/int-uint.md) или [числа с плавающей запятой](../../../sql-reference/data-types/float.md).
+-   `x` — значения. [Целые числа](../../../sql-reference/data-types/int-uint.md) или [числа с плавающей запятой](../../../sql-reference/data-types/float.md).
+-   `weight` — веса отдельных значений. [Целые числа](../../../sql-reference/data-types/int-uint.md) или [числа с плавающей запятой](../../../sql-reference/data-types/float.md).
 
 Типы параметров должны совпадать.
 
@@ -43,4 +43,3 @@ FROM values('x Int8, w Int8', (4, 1), (1, 0), (10, 2))
 └────────────────────────┘
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/avgweighted/) <!--hide-->
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/corr.md b/docs/ru/sql-reference/aggregate-functions/reference/corr.md
index 6d631241f6a..7522dcebd0b 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/corr.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/corr.md
@@ -11,4 +11,3 @@ toc_priority: 107
 !!! note "Примечание"
     Функция использует вычислительно неустойчивый алгоритм. Если для ваших расчётов необходима [вычислительная устойчивость](https://ru.wikipedia.org/wiki/Вычислительная_устойчивость), используйте функцию `corrStable`. Она работает медленнее, но обеспечивает меньшую вычислительную ошибку.
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/corr/) <!--hide-->
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/count.md b/docs/ru/sql-reference/aggregate-functions/reference/count.md
index d99c3b2aeb2..06cf66bd8bd 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/count.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/count.md
@@ -4,14 +4,14 @@ toc_priority: 1
 
 # count {#agg_function-count}
 
-Вычисляет количество строк или не NULL значений .
+Вычисляет количество строк или не NULL значений.
 
 ClickHouse поддерживает следующие виды синтаксиса для `count`:
 
 -   `count(expr)` или `COUNT(DISTINCT expr)`.
 -   `count()` или `COUNT(*)`. Синтаксис `count()` специфичен для ClickHouse.
 
-**Параметры**
+**Аргументы**
 
 Функция может принимать:
 
@@ -21,7 +21,7 @@ ClickHouse поддерживает следующие виды синтакси
 **Возвращаемое значение**
 
 -   Если функция вызывается без параметров, она вычисляет количество строк.
--   Если передаётся [выражение](../../syntax.md#syntax-expressions) , то функция вычисляет количество раз, когда выражение возвращает не NULL. Если выражение возвращает значение типа [Nullable](../../../sql-reference/data-types/nullable.md), то результат `count` не становится `Nullable`. Функция возвращает 0, если выражение возвращает `NULL` для всех строк.
+-   Если передаётся [выражение](../../syntax.md#syntax-expressions), то функция подсчитывает количество раз, когда выражение не равно NULL. Если выражение имеет тип [Nullable](../../../sql-reference/data-types/nullable.md), то результат `count` не становится `Nullable`. Функция возвращает 0, если выражение равно `NULL` для всех строк.
 
 В обоих случаях тип возвращаемого значения [UInt64](../../../sql-reference/data-types/int-uint.md).
 
@@ -69,4 +69,3 @@ SELECT count(DISTINCT num) FROM t
 
 Этот пример показывает, что `count(DISTINCT num)` выполняется с помощью функции `uniqExact` в соответствии со значением настройки `count_distinct_implementation`.
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/count/) <!--hide-->
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/covarpop.md b/docs/ru/sql-reference/aggregate-functions/reference/covarpop.md
index e30b19924f9..1438fefbd8e 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/covarpop.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/covarpop.md
@@ -11,4 +11,3 @@ toc_priority: 36
 !!! note "Примечание"
     Функция использует вычислительно неустойчивый алгоритм. Если для ваших расчётов необходима [вычислительная устойчивость](https://ru.wikipedia.org/wiki/Вычислительная_устойчивость), используйте функцию `covarPopStable`. Она работает медленнее, но обеспечивает меньшую вычислительную ошибку.
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/covarpop/) <!--hide-->
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/covarsamp.md b/docs/ru/sql-reference/aggregate-functions/reference/covarsamp.md
index 7fa9a1d3f2c..b4cea16f4c0 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/covarsamp.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/covarsamp.md
@@ -13,4 +13,3 @@ toc_priority: 37
 !!! note "Примечание"
     Функция использует вычислительно неустойчивый алгоритм. Если для ваших расчётов необходима [вычислительная устойчивость](https://ru.wikipedia.org/wiki/Вычислительная_устойчивость), используйте функцию `covarSampStable`. Она работает медленнее, но обеспечивает меньшую вычислительную ошибку.
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/covarsamp/) <!--hide-->
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/deltasum.md b/docs/ru/sql-reference/aggregate-functions/reference/deltasum.md
new file mode 100644
index 00000000000..b025a248f3c
--- /dev/null
+++ b/docs/ru/sql-reference/aggregate-functions/reference/deltasum.md
@@ -0,0 +1,69 @@
+---
+toc_priority: 141
+---
+
+# deltaSum {#agg_functions-deltasum}
+
+Суммирует арифметическую разницу между последовательными строками. Если разница отрицательна — она будет проигнорирована.
+
+**Синтаксис**
+
+``` sql
+deltaSum(value)
+```
+
+**Аргументы**
+
+-   `value` — входные значения, должны быть типа [Integer](../../data-types/int-uint.md) или [Float](../../data-types/float.md).
+
+**Возвращаемое значение**
+
+-   накопленная арифметическая разница, типа `Integer` или `Float`.
+
+**Примеры**
+
+Запрос:
+
+``` sql
+SELECT deltaSum(arrayJoin([1, 2, 3]));
+```
+
+Результат:
+
+``` text
+┌─deltaSum(arrayJoin([1, 2, 3]))─┐
+│                              2 │
+└────────────────────────────────┘
+```
+
+Запрос:
+
+``` sql
+SELECT deltaSum(arrayJoin([1, 2, 3, 0, 3, 4, 2, 3]));
+```
+
+Результат:
+
+``` text
+┌─deltaSum(arrayJoin([1, 2, 3, 0, 3, 4, 2, 3]))─┐
+│                                             7 │
+└───────────────────────────────────────────────┘
+```
+
+Запрос:
+
+``` sql
+SELECT deltaSum(arrayJoin([2.25, 3, 4.5]));
+```
+
+Результат:
+
+``` text
+┌─deltaSum(arrayJoin([2.25, 3, 4.5]))─┐
+│                                2.25 │
+└─────────────────────────────────────┘
+```
+
+## Смотрите также {#see-also}
+
+-   [runningDifference](../../functions/other-functions.md#runningdifferencex)
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/grouparray.md b/docs/ru/sql-reference/aggregate-functions/reference/grouparray.md
index 7640795fc51..370190dbb3c 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/grouparray.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/grouparray.md
@@ -14,4 +14,3 @@ toc_priority: 110
 
 В некоторых случаях, вы всё же можете рассчитывать на порядок выполнения запроса. Это — случаи, когда `SELECT` идёт из подзапроса, в котором используется `ORDER BY`.
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/grouparray/) <!--hide-->
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/grouparrayinsertat.md b/docs/ru/sql-reference/aggregate-functions/reference/grouparrayinsertat.md
index 5c73bccc2bb..f91d4f19675 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/grouparrayinsertat.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/grouparrayinsertat.md
@@ -9,24 +9,24 @@ toc_priority: 112
 **Синтаксис**
 
 ```sql
-groupArrayInsertAt(default_x, size)(x, pos);
+groupArrayInsertAt(default_x, size)(x, pos)
 ```
 
 Если запрос вставляет вставляется несколько значений в одну и ту же позицию, то функция ведет себя следующим образом:
 
-- Если запрос выполняется в одном потоке, то используется первое из вставляемых значений.
-- Если запрос выполняется в нескольких потоках, то в результирующем массиве может оказаться любое из вставляемых значений.
+-   Если запрос выполняется в одном потоке, то используется первое из вставляемых значений.
+-   Если запрос выполняется в нескольких потоках, то в результирующем массиве может оказаться любое из вставляемых значений.
 
-**Параметры**
+**Аргументы**
 
-- `x` — Значение, которое будет вставлено. [Выражение](../../syntax.md#syntax-expressions), возвращающее значение одного из [поддерживаемых типов данных](../../../sql-reference/data-types/index.md#data_types).
-- `pos` — Позиция, в которую вставляется заданный элемент `x`. Нумерация индексов в массиве начинается с нуля. [UInt32](../../../sql-reference/data-types/int-uint.md#uint8-uint16-uint32-uint64-int8-int16-int32-int64).
-- `default_x` — Значение по умолчанию для подстановки на пустые позиции. Опциональный параметр. [Выражение](../../syntax.md#syntax-expressions), возвращающее значение с типом параметра `x`. Если `default_x` не определен, используются [значения по умолчанию](../../../sql-reference/statements/create/table.md#create-default-values).
-- `size`— Длина результирующего массива. Опциональный параметр. При использовании этого параметра должно быть указано значение по умолчанию `default_x`. [UInt32](../../../sql-reference/data-types/int-uint.md#uint-ranges).
+-   `x` — значение, которое будет вставлено. [Выражение](../../syntax.md#syntax-expressions), возвращающее значение одного из [поддерживаемых типов данных](../../../sql-reference/data-types/index.md#data_types).
+-   `pos` — позиция, в которую вставляется заданный элемент `x`. Нумерация индексов в массиве начинается с нуля. [UInt32](../../../sql-reference/data-types/int-uint.md#uint8-uint16-uint32-uint64-int8-int16-int32-int64).
+-   `default_x` — значение по умолчанию для подстановки на пустые позиции. Опциональный параметр. [Выражение](../../syntax.md#syntax-expressions), возвращающее значение с типом параметра `x`. Если `default_x` не определен, используются [значения по умолчанию](../../../sql-reference/statements/create/table.md#create-default-values).
+-   `size` — длина результирующего массива. Опциональный параметр. При использовании этого параметра должно быть указано значение по умолчанию `default_x`. [UInt32](../../../sql-reference/data-types/int-uint.md#uint-ranges).
 
 **Возвращаемое значение**
 
-- Массив со вставленными значениями.
+-   Массив со вставленными значениями.
 
 Тип: [Array](../../../sql-reference/data-types/array.md#data-type-array).
 
@@ -90,4 +90,3 @@ SELECT groupArrayInsertAt(number, 0) FROM numbers_mt(10) SETTINGS max_block_size
 └───────────────────────────────┘
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/grouparrayinsertat/) <!--hide-->
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/grouparraymovingavg.md b/docs/ru/sql-reference/aggregate-functions/reference/grouparraymovingavg.md
index 6307189c440..5930e8b8484 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/grouparraymovingavg.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/grouparraymovingavg.md
@@ -6,12 +6,14 @@ toc_priority: 114
 
 Вычисляет скользящее среднее для входных значений.
 
-    groupArrayMovingAvg(numbers_for_summing)
-    groupArrayMovingAvg(window_size)(numbers_for_summing)
+``` sql
+groupArrayMovingAvg(numbers_for_summing)
+groupArrayMovingAvg(window_size)(numbers_for_summing)
+```
 
 Функция может принимать размер окна в качестве параметра. Если окно не указано, то функция использует размер окна, равный количеству строк в столбце.
 
-**Параметры**
+**Аргументы**
 
 -   `numbers_for_summing` — [выражение](../../syntax.md#syntax-expressions), возвращающее значение числового типа.
 -   `window_size` — размер окна.
@@ -75,4 +77,3 @@ FROM t
 └───────────┴──────────────────────────────────┴───────────────────────┘
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/grouparraymovingavg/) <!--hide-->
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/grouparraymovingsum.md b/docs/ru/sql-reference/aggregate-functions/reference/grouparraymovingsum.md
index c95f1b0b0eb..feaef8e79d8 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/grouparraymovingsum.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/grouparraymovingsum.md
@@ -13,7 +13,7 @@ groupArrayMovingSum(window_size)(numbers_for_summing)
 
 Функция может принимать размер окна в качестве параметра. Если окно не указано, то функция использует размер окна, равный количеству строк в столбце.
 
-**Параметры**
+**Аргументы**
 
 -   `numbers_for_summing` — [выражение](../../syntax.md#syntax-expressions), возвращающее значение числового типа.
 -   `window_size` — размер окна.
@@ -75,4 +75,3 @@ FROM t
 └────────────┴─────────────────────────────────┴────────────────────────┘
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/grouparraymovingsum/) <!--hide-->
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/grouparraysample.md b/docs/ru/sql-reference/aggregate-functions/reference/grouparraysample.md
index 4c2dafe1a3c..1d58b3397ab 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/grouparraysample.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/grouparraysample.md
@@ -12,7 +12,7 @@ toc_priority: 114
 groupArraySample(max_size[, seed])(x)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `max_size` — максимальное количество элементов в возвращаемом массиве. [UInt64](../../data-types/int-uint.md).
 -   `seed` — состояние генератора случайных чисел. Необязательный параметр. [UInt64](../../data-types/int-uint.md). Значение по умолчанию: `123456`.
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/groupbitand.md b/docs/ru/sql-reference/aggregate-functions/reference/groupbitand.md
index 03aff64fecf..b4b862d5716 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/groupbitand.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/groupbitand.md
@@ -10,7 +10,7 @@ toc_priority: 125
 groupBitAnd(expr)
 ```
 
-**Параметры**
+**Аргументы**
 
 `expr` – выражение, результат которого имеет тип данных `UInt*`.
 
@@ -45,4 +45,3 @@ binary     decimal
 00000100 = 4
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/groupbitand/) <!--hide-->
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/groupbitmap.md b/docs/ru/sql-reference/aggregate-functions/reference/groupbitmap.md
index a4be18b75ec..4012d3e052e 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/groupbitmap.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/groupbitmap.md
@@ -10,7 +10,7 @@ Bitmap или агрегатные вычисления для столбца с
 groupBitmap(expr)
 ```
 
-**Параметры**
+**Аргументы**
 
 `expr` – выражение, результат которого имеет тип данных `UInt*`.
 
@@ -43,4 +43,3 @@ num
 3
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/groupbitmap/) <!--hide-->
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/groupbitor.md b/docs/ru/sql-reference/aggregate-functions/reference/groupbitor.md
index e1afced014f..6967b26e722 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/groupbitor.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/groupbitor.md
@@ -10,7 +10,7 @@ toc_priority: 126
 groupBitOr(expr)
 ```
 
-**Параметры**
+**Аргументы**
 
 `expr` – выражение, результат которого имеет тип данных `UInt*`.
 
@@ -45,4 +45,3 @@ binary     decimal
 01111101 = 125
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/groupbitor/) <!--hide-->
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/groupbitxor.md b/docs/ru/sql-reference/aggregate-functions/reference/groupbitxor.md
index a80f86b2a5f..ca565d5a027 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/groupbitxor.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/groupbitxor.md
@@ -10,7 +10,7 @@ toc_priority: 127
 groupBitXor(expr)
 ```
 
-**Параметры**
+**Аргументы**
 
 `expr` – выражение, результат которого имеет тип данных `UInt*`.
 
@@ -45,4 +45,3 @@ binary     decimal
 01101000 = 104
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/groupbitxor/) <!--hide-->
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/groupuniqarray.md b/docs/ru/sql-reference/aggregate-functions/reference/groupuniqarray.md
index cecc63aef22..7d64b13a203 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/groupuniqarray.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/groupuniqarray.md
@@ -10,4 +10,3 @@ toc_priority: 111
 
 Функция `groupUniqArray(max_size)(x)` ограничивает размер результирующего массива до `max_size` элементов. Например, `groupUniqArray(1)(x)` равнозначно `[any(x)]`.
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/groupuniqarray/) <!--hide-->
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/index.md b/docs/ru/sql-reference/aggregate-functions/reference/index.md
index 4c0060581fd..1af07623ade 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/index.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/index.md
@@ -1,5 +1,5 @@
 ---
-toc_folder_title: "\u0421\u043f\u0440\u0430\u0432\u043e\u0447\u043d\u0438\u043a"
+toc_folder_title: "Справочник"
 toc_priority: 36
 toc_hidden: true
 ---
@@ -65,4 +65,3 @@ toc_hidden: true
 -   [stochasticLinearRegression](../../../sql-reference/aggregate-functions/reference/stochasticlinearregression.md)
 -   [stochasticLogisticRegression](../../../sql-reference/aggregate-functions/reference/stochasticlogisticregression.md)
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/aggregate-functions/reference) <!--hide-->
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/initializeAggregation.md b/docs/ru/sql-reference/aggregate-functions/reference/initializeAggregation.md
index a2e3764193e..3565115d8de 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/initializeAggregation.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/initializeAggregation.md
@@ -10,10 +10,10 @@ toc_priority: 150
 **Синтаксис**
 
 ``` sql
-initializeAggregation (aggregate_function, column_1, column_2);
+initializeAggregation (aggregate_function, column_1, column_2)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `aggregate_function` — название функции агрегации, состояние которой нужно создать. [String](../../../sql-reference/data-types/string.md#string).
 -   `column_n` — столбец, который передается в функцию агрегации как аргумент. [String](../../../sql-reference/data-types/string.md#string).
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/kurtpop.md b/docs/ru/sql-reference/aggregate-functions/reference/kurtpop.md
index a00dae51ed6..1a1198b2beb 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/kurtpop.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/kurtpop.md
@@ -10,9 +10,9 @@ toc_priority: 153
 kurtPop(expr)
 ```
 
-**Параметры**
+**Аргументы**
 
-`expr` — [Выражение](../../syntax.md#syntax-expressions), возвращающее число.
+`expr` — [выражение](../../syntax.md#syntax-expressions), возвращающее число.
 
 **Возвращаемое значение**
 
@@ -21,7 +21,6 @@ kurtPop(expr)
 **Пример**
 
 ``` sql
-SELECT kurtPop(value) FROM series_with_value_column
+SELECT kurtPop(value) FROM series_with_value_column;
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/kurtpop/) <!--hide-->
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/kurtsamp.md b/docs/ru/sql-reference/aggregate-functions/reference/kurtsamp.md
index 379d74ec0c3..50b48d11b18 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/kurtsamp.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/kurtsamp.md
@@ -12,9 +12,9 @@ toc_priority: 154
 kurtSamp(expr)
 ```
 
-**Параметры**
+**Аргументы**
 
-`expr` — [Выражение](../../syntax.md#syntax-expressions), возвращающее число.
+`expr` — [выражение](../../syntax.md#syntax-expressions), возвращающее число.
 
 **Возвращаемое значение**
 
@@ -23,7 +23,6 @@ kurtSamp(expr)
 **Пример**
 
 ``` sql
-SELECT kurtSamp(value) FROM series_with_value_column
+SELECT kurtSamp(value) FROM series_with_value_column;
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/kurtsamp/) <!--hide-->
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/mannwhitneyutest.md b/docs/ru/sql-reference/aggregate-functions/reference/mannwhitneyutest.md
index a4647ecfb34..9d02bee8622 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/mannwhitneyutest.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/mannwhitneyutest.md
@@ -17,16 +17,18 @@ mannWhitneyUTest[(alternative[, continuity_correction])](sample_data, sample_ind
 Проверяется нулевая гипотеза, что генеральные совокупности стохастически равны. Наряду с двусторонней гипотезой могут быть проверены и односторонние.
 Для применения U-критерия Манна — Уитни закон распределения генеральных совокупностей не обязан быть нормальным.
 
+**Аргументы**
+
+-   `sample_data` — данные выборок. [Integer](../../../sql-reference/data-types/int-uint.md), [Float](../../../sql-reference/data-types/float.md) или [Decimal](../../../sql-reference/data-types/decimal.md).
+-   `sample_index` — индексы выборок. [Integer](../../../sql-reference/data-types/int-uint.md).
+
 **Параметры**
 
 -   `alternative` — альтернативная гипотеза. (Необязательный параметр, по умолчанию: `'two-sided'`.) [String](../../../sql-reference/data-types/string.md).
     -   `'two-sided'`;
     -   `'greater'`;
     -   `'less'`.
--   `continuity_correction` - если не 0, то при вычислении p-значения применяется коррекция непрерывности. (Необязательный параметр, по умолчанию: 1.) [UInt64](../../../sql-reference/data-types/int-uint.md).
--   `sample_data` — данные выборок. [Integer](../../../sql-reference/data-types/int-uint.md), [Float](../../../sql-reference/data-types/float.md) or [Decimal](../../../sql-reference/data-types/decimal.md).
--   `sample_index` — индексы выборок. [Integer](../../../sql-reference/data-types/int-uint.md).
-
+-   `continuity_correction` — если не 0, то при вычислении p-значения применяется коррекция непрерывности. (Необязательный параметр, по умолчанию: 1.) [UInt64](../../../sql-reference/data-types/int-uint.md).
 
 **Возвращаемые значения**
 
@@ -69,4 +71,3 @@ SELECT mannWhitneyUTest('greater')(sample_data, sample_index) FROM mww_ttest;
 
 -   [U-критерий Манна — Уитни](https://ru.wikipedia.org/wiki/U-%D0%BA%D1%80%D0%B8%D1%82%D0%B5%D1%80%D0%B8%D0%B9_%D0%9C%D0%B0%D0%BD%D0%BD%D0%B0_%E2%80%94_%D0%A3%D0%B8%D1%82%D0%BD%D0%B8)
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/aggregate-functions/reference/mannwhitneyutest/) <!--hide-->
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/max.md b/docs/ru/sql-reference/aggregate-functions/reference/max.md
index 4ee577471ea..4f61ecd051d 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/max.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/max.md
@@ -6,4 +6,3 @@ toc_priority: 3
 
 Вычисляет максимум.
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/max/) <!--hide-->
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/median.md b/docs/ru/sql-reference/aggregate-functions/reference/median.md
index 803b2309665..a208c21dd21 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/median.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/median.md
@@ -40,4 +40,3 @@ SELECT medianDeterministic(val, 1) FROM t
 └─────────────────────────────┘
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/median/) <!--hide-->
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/min.md b/docs/ru/sql-reference/aggregate-functions/reference/min.md
index 7b56de3aed4..16dd577e790 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/min.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/min.md
@@ -6,4 +6,3 @@ toc_priority: 2
 
 Вычисляет минимум.
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/min/) <!--hide-->
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/quantile.md b/docs/ru/sql-reference/aggregate-functions/reference/quantile.md
index 10fec16ab94..10862e38e00 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/quantile.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/quantile.md
@@ -18,10 +18,10 @@ quantile(level)(expr)
 
 Алиас: `median`.
 
-**Параметры**
+**Аргументы**
 
--   `level` — Уровень квантили. Опционально. Константное значение с плавающей запятой от 0 до 1. Мы рекомендуем использовать значение `level` из диапазона `[0.01, 0.99]`. Значение по умолчанию: 0.5. При `level=0.5` функция вычисляет [медиану](https://ru.wikipedia.org/wiki/Медиана_(статистика)).
--   `expr` — Выражение над значениями столбца, которое возвращает данные [числовых типов](../../../sql-reference/data-types/index.md#data_types) или типов [Date](../../../sql-reference/data-types/date.md), [DateTime](../../../sql-reference/data-types/datetime.md).
+-   `level` — уровень квантили. Опционально. Константное значение с плавающей запятой от 0 до 1. Мы рекомендуем использовать значение `level` из диапазона `[0.01, 0.99]`. Значение по умолчанию: 0.5. При `level=0.5` функция вычисляет [медиану](https://ru.wikipedia.org/wiki/Медиана_(статистика)).
+-   `expr` — выражение, зависящее от значений столбцов, возвращающее данные [числовых типов](../../../sql-reference/data-types/index.md#data_types) или типов [Date](../../../sql-reference/data-types/date.md), [DateTime](../../../sql-reference/data-types/datetime.md).
 
 **Возвращаемое значение**
 
@@ -65,4 +65,3 @@ SELECT quantile(val) FROM t
 -   [median](../../../sql-reference/aggregate-functions/reference/median.md#median)
 -   [quantiles](../../../sql-reference/aggregate-functions/reference/quantiles.md#quantiles)
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/quantile/) <!--hide-->
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/quantiledeterministic.md b/docs/ru/sql-reference/aggregate-functions/reference/quantiledeterministic.md
index fdbcda821f6..ec308ea239b 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/quantiledeterministic.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/quantiledeterministic.md
@@ -18,11 +18,11 @@ quantileDeterministic(level)(expr, determinator)
 
 Алиас: `medianDeterministic`.
 
-**Параметры**
+**Аргументы**
 
--   `level` — Уровень квантили. Опционально. Константное значение с плавающей запятой от 0 до 1. Мы рекомендуем использовать значение `level` из диапазона `[0.01, 0.99]`. Значение по умолчанию: 0.5. При `level=0.5` функция вычисляет [медиану](https://ru.wikipedia.org/wiki/Медиана_(статистика)).
--   `expr` — Выражение над значениями столбца, которое возвращает данные [числовых типов](../../../sql-reference/data-types/index.md#data_types) или типов [Date](../../../sql-reference/data-types/date.md), [DateTime](../../../sql-reference/data-types/datetime.md).
--   `determinator` — Число, хэш которого используется при сэмплировании в алгоритме reservoir sampling, чтобы сделать результат детерминированным. В качестве детерминатора можно использовать любое определённое положительное число, например, идентификатор пользователя или события. Если одно и то же значение детерминатора попадается в выборке слишком часто, то функция выдаёт некорректный результат.
+-   `level` — уровень квантили. Опционально. Константное значение с плавающей запятой от 0 до 1. Мы рекомендуем использовать значение `level` из диапазона `[0.01, 0.99]`. Значение по умолчанию: 0.5. При `level=0.5` функция вычисляет [медиану](https://ru.wikipedia.org/wiki/Медиана_(статистика)).
+-   `expr` — выражение, зависящее от значений столбцов, возвращающее данные [числовых типов](../../../sql-reference/data-types/index.md#data_types) или типов [Date](../../../sql-reference/data-types/date.md), [DateTime](../../../sql-reference/data-types/datetime.md).
+-   `determinator` — число, хэш которого используется при сэмплировании в алгоритме «Reservoir sampling», чтобы сделать результат детерминированным. В качестве значения можно использовать любое определённое положительное число, например, идентификатор пользователя или события. Если одно и то же значение попадается в выборке слишком часто, то функция выдаёт некорректный результат.
 
 **Возвращаемое значение**
 
@@ -65,4 +65,3 @@ SELECT quantileDeterministic(val, 1) FROM t
 -   [median](../../../sql-reference/aggregate-functions/reference/median.md#median)
 -   [quantiles](../../../sql-reference/aggregate-functions/reference/quantiles.md#quantiles)
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/qurntiledeterministic/) <!--hide-->
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/quantileexact.md b/docs/ru/sql-reference/aggregate-functions/reference/quantileexact.md
index 4ee815a94fb..82ebae1c14e 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/quantileexact.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/quantileexact.md
@@ -18,10 +18,11 @@ quantileExact(level)(expr)
 
 Алиас: `medianExact`.
 
-**Параметры**
+**Аргументы**
+
+-   `level` — уровень квантили. Опционально. Константное значение с плавающей запятой от 0 до 1. Мы рекомендуем использовать значение `level` из диапазона `[0.01, 0.99]`. Значение по умолчанию: 0.5. При `level=0.5` функция вычисляет [медиану](https://ru.wikipedia.org/wiki/Медиана_(статистика)).
+-   `expr` — выражение, зависящее от значений столбцов, возвращающее данные [числовых типов](../../../sql-reference/data-types/index.md#data_types) или типов [Date](../../../sql-reference/data-types/date.md), [DateTime](../../../sql-reference/data-types/datetime.md).
 
--   `level` — Уровень квантили. Опционально. Константное значение с плавающей запятой от 0 до 1. Мы рекомендуем использовать значение `level` из диапазона `[0.01, 0.99]`. Значение по умолчанию: 0.5. При `level=0.5` функция вычисляет [медиану](https://ru.wikipedia.org/wiki/Медиана_(статистика)).
--   `expr` — Выражение над значениями столбца, которое возвращает данные [числовых типов](../../../sql-reference/data-types/index.md#data_types) или типов [Date](../../../sql-reference/data-types/date.md), [DateTime](../../../sql-reference/data-types/datetime.md).
 
 **Возвращаемое значение**
 
@@ -77,10 +78,11 @@ quantileExact(level)(expr)
 
 Алиас: `medianExactLow`.
 
-**Параметры**
+**Аргументы**
+
+-   `level` — уровень квантили. Опциональный параметр. Константное занчение с плавающей запятой от 0 до 1. Мы рекомендуем использовать значение `level` из диапазона `[0.01, 0.99]`. Значение по умолчанию: 0.5. При `level=0.5` функция вычисляет [медиану](https://en.wikipedia.org/wiki/Median).
+-   `expr` — выражение, зависящее от значений столбцов, возвращающее данные [числовых типов](../../../sql-reference/data-types/index.md#data_types), [Date](../../../sql-reference/data-types/date.md) или [DateTime](../../../sql-reference/data-types/datetime.md).
 
--   `level` —  Уровень квантили. Опциональный параметр. Константное занчение с плавающей запятой от 0 до 1. Мы рекомендуем использовать значение `level` из диапазона `[0.01, 0.99]`. Значение по умолчанию: 0.5. При `level=0.5` функция вычисляет [медиану](https://en.wikipedia.org/wiki/Median).
--   `expr` — Выражение над значениями столбца, которое возвращает данные [числовых типов](../../../sql-reference/data-types/index.md#data_types), [Date](../../../sql-reference/data-types/date.md) или [DateTime](../../../sql-reference/data-types/datetime.md).
 
 **Возвращаемое значение**
 
@@ -127,10 +129,11 @@ quantileExactHigh(level)(expr)
 
 Алиас: `medianExactHigh`.
 
-**Параметры**
+**Аргументы**
+
+-   `level` — уровень квантили. Опциональный параметр. Константное занчение с плавающей запятой от 0 до 1. Мы рекомендуем использовать значение `level` из диапазона `[0.01, 0.99]`. Значение по умолчанию: 0.5. При `level=0.5` функция вычисляет [медиану](https://en.wikipedia.org/wiki/Median).
+-   `expr` — выражение, зависящее от значений столбцов, возвращающее данные [числовых типов](../../../sql-reference/data-types/index.md#data_types), [Date](../../../sql-reference/data-types/date.md) или [DateTime](../../../sql-reference/data-types/datetime.md).
 
--   `level` — Уровень квантили. Опциональный параметр. Константное занчение с плавающей запятой от 0 до 1. Мы рекомендуем использовать значение `level` из диапазона `[0.01, 0.99]`. Значение по умолчанию: 0.5. При `level=0.5` функция вычисляет [медиану](https://en.wikipedia.org/wiki/Median).
--   `expr` — Выражение над значениями столбца, которое возвращает данные [числовых типов](../../../sql-reference/data-types/index.md#data_types), [Date](../../../sql-reference/data-types/date.md) или [DateTime](../../../sql-reference/data-types/datetime.md).
 
 **Возвращаемое значение**
 
@@ -163,4 +166,3 @@ SELECT quantileExactHigh(number) FROM numbers(10)
 -   [median](../../../sql-reference/aggregate-functions/reference/median.md#median)
 -   [quantiles](../../../sql-reference/aggregate-functions/reference/quantiles.md#quantiles)
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/quantileexact/) <!--hide-->
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/quantileexactweighted.md b/docs/ru/sql-reference/aggregate-functions/reference/quantileexactweighted.md
index f6982d4566f..3746c328470 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/quantileexactweighted.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/quantileexactweighted.md
@@ -18,11 +18,11 @@ quantileExactWeighted(level)(expr, weight)
 
 Алиас: `medianExactWeighted`.
 
-**Параметры**
+**Аргументы**
 
--   `level` — Уровень квантили. Опционально. Константное значение с плавающей запятой от 0 до 1. Мы рекомендуем использовать значение `level` из диапазона `[0.01, 0.99]`. Значение по умолчанию: 0.5. При `level=0.5` функция вычисляет [медиану](https://ru.wikipedia.org/wiki/Медиана_(статистика)).
--   `expr` — Выражение над значениями столбца, которое возвращает данные [числовых типов](../../../sql-reference/data-types/index.md#data_types) или типов [Date](../../../sql-reference/data-types/date.md), [DateTime](../../../sql-reference/data-types/datetime.md).
--   `weight` — Столбец с весам элементов последовательности. Вес — это количество повторений элемента в последовательности.
+-   `level` — уровень квантили. Опционально. Константное значение с плавающей запятой от 0 до 1. Мы рекомендуем использовать значение `level` из диапазона `[0.01, 0.99]`. Значение по умолчанию: 0.5. При `level=0.5` функция вычисляет [медиану](https://ru.wikipedia.org/wiki/Медиана_(статистика)).
+-   `expr` — выражение, зависящее от значений столбцов, возвращающее данные [числовых типов](../../../sql-reference/data-types/index.md#data_types) или типов [Date](../../../sql-reference/data-types/date.md), [DateTime](../../../sql-reference/data-types/datetime.md).
+-   `weight` — столбец с весам элементов последовательности. Вес — это количество повторений элемента в последовательности.
 
 **Возвращаемое значение**
 
@@ -66,4 +66,3 @@ SELECT quantileExactWeighted(n, val) FROM t
 -   [median](../../../sql-reference/aggregate-functions/reference/median.md#median)
 -   [quantiles](../../../sql-reference/aggregate-functions/reference/quantiles.md#quantiles)
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/quantileexactweited/) <!--hide-->
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/quantiles.md b/docs/ru/sql-reference/aggregate-functions/reference/quantiles.md
index 82e806b67fa..671cbc1fc4d 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/quantiles.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/quantiles.md
@@ -8,4 +8,3 @@ Syntax: `quantiles(level1, level2, …)(x)`
 
 All the quantile functions also have corresponding quantiles functions: `quantiles`, `quantilesDeterministic`, `quantilesTiming`, `quantilesTimingWeighted`, `quantilesExact`, `quantilesExactWeighted`, `quantilesTDigest`. These functions calculate all the quantiles of the listed levels in one pass, and return an array of the resulting values.
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/quantiles/) <!--hide-->
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/quantiletdigest.md b/docs/ru/sql-reference/aggregate-functions/reference/quantiletdigest.md
index f372e308e73..130ff7566ba 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/quantiletdigest.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/quantiletdigest.md
@@ -20,10 +20,10 @@ quantileTDigest(level)(expr)
 
 Алиас: `medianTDigest`.
 
-**Параметры**
+**Аргументы**
 
--   `level` — Уровень квантили. Опционально. Константное значение с плавающей запятой от 0 до 1. Мы рекомендуем использовать значение `level` из диапазона `[0.01, 0.99]`. Значение по умолчанию: 0.5. При `level=0.5` функция вычисляет [медиану](https://ru.wikipedia.org/wiki/Медиана_(статистика)).
--   `expr` — Выражение над значениями столбца, которое возвращает данные [числовых типов](../../../sql-reference/data-types/index.md#data_types) или типов [Date](../../../sql-reference/data-types/date.md), [DateTime](../../../sql-reference/data-types/datetime.md).
+-   `level` — уровень квантили. Опционально. Константное значение с плавающей запятой от 0 до 1. Мы рекомендуем использовать значение `level` из диапазона `[0.01, 0.99]`. Значение по умолчанию: 0.5. При `level=0.5` функция вычисляет [медиану](https://ru.wikipedia.org/wiki/Медиана_(статистика)).
+-   `expr` — выражение, зависящее от значений столбцов, возвращающее данные [числовых типов](../../../sql-reference/data-types/index.md#data_types) или типов [Date](../../../sql-reference/data-types/date.md), [DateTime](../../../sql-reference/data-types/datetime.md).
 
 **Возвращаемое значение**
 
@@ -56,4 +56,3 @@ SELECT quantileTDigest(number) FROM numbers(10)
 -   [median](../../../sql-reference/aggregate-functions/reference/median.md#median)
 -   [quantiles](../../../sql-reference/aggregate-functions/reference/quantiles.md#quantiles)
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/qurntiledigest/) <!--hide-->
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/quantiletdigestweighted.md b/docs/ru/sql-reference/aggregate-functions/reference/quantiletdigestweighted.md
index b6dd846967b..f7239be0ba5 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/quantiletdigestweighted.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/quantiletdigestweighted.md
@@ -20,11 +20,11 @@ quantileTDigestWeighted(level)(expr, weight)
 
 Алиас: `medianTDigest`.
 
-**Параметры**
+**Аргументы**
 
--   `level` — Уровень квантили. Опционально. Константное значение с плавающей запятой от 0 до 1. Мы рекомендуем использовать значение `level` из диапазона `[0.01, 0.99]`. Значение по умолчанию: 0.5. При `level=0.5` функция вычисляет [медиану](https://ru.wikipedia.org/wiki/Медиана_(статистика)).
--   `expr` — Выражение над значениями столбца, которое возвращает данные [числовых типов](../../../sql-reference/data-types/index.md#data_types) или типов [Date](../../../sql-reference/data-types/date.md), [DateTime](../../../sql-reference/data-types/datetime.md).
--   `weight` — Столбец с весам элементов последовательности. Вес — это количество повторений элемента в последовательности.
+-   `level` — уровень квантили. Опционально. Константное значение с плавающей запятой от 0 до 1. Мы рекомендуем использовать значение `level` из диапазона `[0.01, 0.99]`. Значение по умолчанию: 0.5. При `level=0.5` функция вычисляет [медиану](https://ru.wikipedia.org/wiki/Медиана_(статистика)).
+-   `expr` — выражение, зависящее от значений столбцов, возвращающее данные [числовых типов](../../../sql-reference/data-types/index.md#data_types) или типов [Date](../../../sql-reference/data-types/date.md), [DateTime](../../../sql-reference/data-types/datetime.md).
+-   `weight` — столбец с весам элементов последовательности. Вес — это количество повторений элемента в последовательности.
 
 **Возвращаемое значение**
 
@@ -57,4 +57,3 @@ SELECT quantileTDigestWeighted(number, 1) FROM numbers(10)
 -   [median](../../../sql-reference/aggregate-functions/reference/median.md#median)
 -   [quantiles](../../../sql-reference/aggregate-functions/reference/quantiles.md#quantiles)
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/quantiledigestweighted/) <!--hide-->
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/quantiletiming.md b/docs/ru/sql-reference/aggregate-functions/reference/quantiletiming.md
index 32e5e6ce31b..03d448a5d63 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/quantiletiming.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/quantiletiming.md
@@ -18,11 +18,11 @@ quantileTiming(level)(expr)
 
 Алиас: `medianTiming`.
 
-**Параметры**
+**Аргументы**
 
--   `level` — Уровень квантили. Опционально. Константное значение с плавающей запятой от 0 до 1. Мы рекомендуем использовать значение `level` из диапазона `[0.01, 0.99]`. Значение по умолчанию: 0.5. При `level=0.5` функция вычисляет [медиану](https://ru.wikipedia.org/wiki/Медиана_(статистика)).
+-   `level` — уровень квантили. Опционально. Константное значение с плавающей запятой от 0 до 1. Мы рекомендуем использовать значение `level` из диапазона `[0.01, 0.99]`. Значение по умолчанию: 0.5. При `level=0.5` функция вычисляет [медиану](https://ru.wikipedia.org/wiki/Медиана_(статистика)).
 
--   `expr` — [Выражение](../../syntax.md#syntax-expressions) над значения столбца, которые возвращают данные типа [Float\*](../../../sql-reference/data-types/float.md).
+-   `expr` — [выражение](../../syntax.md#syntax-expressions), зависящее от значений столбцов, возвращающее данные типа [Float\*](../../../sql-reference/data-types/float.md).
 
         - Если в функцию передать отрицательные значения, то её поведение не определено.
         - Если значение больше, чем 30 000 (например, время загрузки страницы превышает 30 секунд), то оно приравнивается к 30 000.
@@ -85,4 +85,3 @@ SELECT quantileTiming(response_time) FROM t
 -   [median](../../../sql-reference/aggregate-functions/reference/median.md#median)
 -   [quantiles](../../../sql-reference/aggregate-functions/reference/quantiles.md#quantiles)
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/quantiletiming/) <!--hide-->
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/quantiletimingweighted.md b/docs/ru/sql-reference/aggregate-functions/reference/quantiletimingweighted.md
index 4a7fcc666d5..a50e09668ab 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/quantiletimingweighted.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/quantiletimingweighted.md
@@ -18,16 +18,16 @@ quantileTimingWeighted(level)(expr, weight)
 
 Алиас: `medianTimingWeighted`.
 
-**Параметры**
+**Аргументы**
 
--   `level` — Уровень квантили. Опционально. Константное значение с плавающей запятой от 0 до 1. Мы рекомендуем использовать значение `level` из диапазона `[0.01, 0.99]`. Значение по умолчанию: 0.5. При `level=0.5` функция вычисляет [медиану](https://ru.wikipedia.org/wiki/Медиана_(статистика)).
+-   `level` — уровень квантили. Опционально. Константное значение с плавающей запятой от 0 до 1. Мы рекомендуем использовать значение `level` из диапазона `[0.01, 0.99]`. Значение по умолчанию: 0.5. При `level=0.5` функция вычисляет [медиану](https://ru.wikipedia.org/wiki/Медиана_(статистика)).
 
--   `expr` — [Выражение](../../syntax.md#syntax-expressions) над значения столбца, которые возвращают данные типа [Float\*](../../../sql-reference/data-types/float.md).
+-   `expr` — [выражение](../../syntax.md#syntax-expressions), зависящее от значений столбцов, возвращающее данные типа [Float\*](../../../sql-reference/data-types/float.md).
 
         - Если в функцию передать отрицательные значения, то её поведение не определено.
         - Если значение больше, чем 30 000 (например, время загрузки страницы превышает 30 секунд), то оно приравнивается к 30 000.
 
--   `weight` — Столбец с весам элементов последовательности. Вес — это количество повторений элемента в последовательности.
+-   `weight` — столбец с весам элементов последовательности. Вес — это количество повторений элемента в последовательности.
 
 **Точность**
 
@@ -84,4 +84,3 @@ SELECT quantileTimingWeighted(response_time, weight) FROM t
 -   [median](../../../sql-reference/aggregate-functions/reference/median.md#median)
 -   [quantiles](../../../sql-reference/aggregate-functions/reference/quantiles.md#quantiles)
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/quantiletiming weighted/) <!--hide-->
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/rankCorr.md b/docs/ru/sql-reference/aggregate-functions/reference/rankCorr.md
index 48a19e87c52..c98e7b88bcf 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/rankCorr.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/rankCorr.md
@@ -8,10 +8,10 @@
 rankCorr(x, y)
 ```
 
-**Параметры**
+**Аргументы**
 
--   `x` — Произвольное значение. [Float32](../../../sql-reference/data-types/float.md#float32-float64) или [Float64](../../../sql-reference/data-types/float.md#float32-float64).
--   `y` — Произвольное значение. [Float32](../../../sql-reference/data-types/float.md#float32-float64) или [Float64](../../../sql-reference/data-types/float.md#float32-float64).
+-   `x` — произвольное значение. [Float32](../../../sql-reference/data-types/float.md#float32-float64) или [Float64](../../../sql-reference/data-types/float.md#float32-float64).
+-   `y` — произвольное значение. [Float32](../../../sql-reference/data-types/float.md#float32-float64) или [Float64](../../../sql-reference/data-types/float.md#float32-float64).
 
 **Возвращаемое значение**
 
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/simplelinearregression.md b/docs/ru/sql-reference/aggregate-functions/reference/simplelinearregression.md
index 370b1bde8d2..f634e553738 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/simplelinearregression.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/simplelinearregression.md
@@ -41,4 +41,3 @@ SELECT arrayReduce('simpleLinearRegression', [0, 1, 2, 3], [3, 4, 5, 6])
 └───────────────────────────────────────────────────────────────────┘
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/simplelinearregression/) <!--hide-->
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/skewpop.md b/docs/ru/sql-reference/aggregate-functions/reference/skewpop.md
index a6dee5dc5ef..ed4a95696f2 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/skewpop.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/skewpop.md
@@ -10,9 +10,9 @@ toc_priority: 150
 skewPop(expr)
 ```
 
-**Параметры**
+**Аргументы**
 
-`expr` — [Выражение](../../syntax.md#syntax-expressions), возвращающее число.
+`expr` — [выражение](../../syntax.md#syntax-expressions), возвращающее число.
 
 **Возвращаемое значение**
 
@@ -21,7 +21,6 @@ skewPop(expr)
 **Пример**
 
 ``` sql
-SELECT skewPop(value) FROM series_with_value_column
+SELECT skewPop(value) FROM series_with_value_column;
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/skewpop/) <!--hide-->
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/skewsamp.md b/docs/ru/sql-reference/aggregate-functions/reference/skewsamp.md
index 171eb5e304a..213d26e4647 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/skewsamp.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/skewsamp.md
@@ -12,9 +12,9 @@ toc_priority: 151
 skewSamp(expr)
 ```
 
-**Параметры**
+**Аргументы**
 
-`expr` — [Выражение](../../syntax.md#syntax-expressions), возвращающее число.
+`expr` — [выражение](../../syntax.md#syntax-expressions), возвращающее число.
 
 **Возвращаемое значение**
 
@@ -23,7 +23,6 @@ skewSamp(expr)
 **Пример**
 
 ``` sql
-SELECT skewSamp(value) FROM series_with_value_column
+SELECT skewSamp(value) FROM series_with_value_column;
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/skewsamp/) <!--hide-->
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/stddevpop.md b/docs/ru/sql-reference/aggregate-functions/reference/stddevpop.md
index ada8b8884cd..66d63147586 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/stddevpop.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/stddevpop.md
@@ -9,4 +9,3 @@ toc_priority: 30
 !!! note "Примечание"
     Функция использует вычислительно неустойчивый алгоритм. Если для ваших расчётов необходима [вычислительная устойчивость](https://ru.wikipedia.org/wiki/Вычислительная_устойчивость), используйте функцию `stddevPopStable`. Она работает медленнее, но обеспечивает меньшую вычислительную ошибку.
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/stddevpop/) <!--hide-->
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/stddevsamp.md b/docs/ru/sql-reference/aggregate-functions/reference/stddevsamp.md
index 952b6bcde68..5fbf438e894 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/stddevsamp.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/stddevsamp.md
@@ -9,4 +9,3 @@ toc_priority: 31
 !!! note "Примечание"
     Функция использует вычислительно неустойчивый алгоритм. Если для ваших расчётов необходима [вычислительная устойчивость](https://ru.wikipedia.org/wiki/Вычислительная_устойчивость), используйте функцию `stddevSampStable`. Она работает медленнее, но обеспечивает меньшую вычислительную ошибку.
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/stddevsamp/) <!--hide-->
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/stochasticlinearregression.md b/docs/ru/sql-reference/aggregate-functions/reference/stochasticlinearregression.md
index 0b268e9ea1b..6da0f6caacd 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/stochasticlinearregression.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/stochasticlinearregression.md
@@ -86,4 +86,3 @@ evalMLMethod(model, param1, param2) FROM test_data
 -   [stochasticLogisticRegression](../../../sql-reference/aggregate-functions/reference/stochasticlinearregression.md#agg_functions-stochasticlogisticregression)
 -   [Отличие линейной от логистической регрессии.](https://stackoverflow.com/questions/12146914/what-is-the-difference-between-linear-regression-and-logistic-regression)
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/stochasticlinearregression/) <!--hide-->
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/stochasticlogisticregression.md b/docs/ru/sql-reference/aggregate-functions/reference/stochasticlogisticregression.md
index 01d3a0797bd..67454aa2c1b 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/stochasticlogisticregression.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/stochasticlogisticregression.md
@@ -54,4 +54,3 @@ stochasticLogisticRegression(1.0, 1.0, 10, 'SGD')
 -   [stochasticLinearRegression](../../../sql-reference/aggregate-functions/reference/stochasticlinearregression.md#agg_functions-stochasticlinearregression)
 -   [Отличие линейной от логистической регрессии](https://moredez.ru/q/51225972/)
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/stochasticlogisticregression/) <!--hide-->
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/studentttest.md b/docs/ru/sql-reference/aggregate-functions/reference/studentttest.md
index 77378de95d1..16daddfbecf 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/studentttest.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/studentttest.md
@@ -16,7 +16,7 @@ studentTTest(sample_data, sample_index)
 Значения выборок берутся из столбца `sample_data`. Если  `sample_index` равно 0, то значение из этой строки принадлежит первой выборке. Во всех остальных случаях значение принадлежит второй выборке.
 Проверяется нулевая гипотеза, что средние значения генеральных совокупностей совпадают. Для применения t-критерия Стьюдента распределение в генеральных совокупностях должно быть нормальным и дисперсии должны совпадать.
 
-**Параметры**
+**Аргументы**
 
 -   `sample_data` — данные выборок. [Integer](../../../sql-reference/data-types/int-uint.md), [Float](../../../sql-reference/data-types/float.md) or [Decimal](../../../sql-reference/data-types/decimal.md).
 -   `sample_index` — индексы выборок. [Integer](../../../sql-reference/data-types/int-uint.md).
@@ -63,4 +63,3 @@ SELECT studentTTest(sample_data, sample_index) FROM student_ttest;
 -   [t-критерий Стьюдента](https://ru.wikipedia.org/wiki/T-%D0%BA%D1%80%D0%B8%D1%82%D0%B5%D1%80%D0%B8%D0%B9_%D0%A1%D1%82%D1%8C%D1%8E%D0%B4%D0%B5%D0%BD%D1%82%D0%B0)
 -   [welchTTest](welchttest.md#welchttest)
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/aggregate-functions/reference/studentttest/) <!--hide-->
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/sum.md b/docs/ru/sql-reference/aggregate-functions/reference/sum.md
index 5fa769f3479..487313c006b 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/sum.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/sum.md
@@ -7,4 +7,3 @@ toc_priority: 4
 Вычисляет сумму.
 Работает только для чисел.
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/sum/) <!--hide-->
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/summap.md b/docs/ru/sql-reference/aggregate-functions/reference/summap.md
index 460fc078893..3cfe4c26fcc 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/summap.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/summap.md
@@ -42,4 +42,3 @@ GROUP BY timeslot
 └─────────────────────┴──────────────────────────────────────────────┴────────────────────────────────┘
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/summap/) <!--hide-->
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/sumwithoverflow.md b/docs/ru/sql-reference/aggregate-functions/reference/sumwithoverflow.md
index 845adc510f2..1e1962babbe 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/sumwithoverflow.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/sumwithoverflow.md
@@ -8,4 +8,3 @@ toc_priority: 140
 
 Работает только для чисел.
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/sumwithoverflow/) <!--hide-->
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/topk.md b/docs/ru/sql-reference/aggregate-functions/reference/topk.md
index 6aefd38bf34..4d6a8b46c2c 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/topk.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/topk.md
@@ -18,8 +18,8 @@ topK(N)(column)
 
 **Аргументы**
 
--   ‘N’ - Количество значений.
--   ‘x’ – Столбец.
+-   `N` – количество значений.
+-   `x` – столбец.
 
 **Пример**
 
@@ -36,4 +36,3 @@ FROM ontime
 └─────────────────────┘
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/topk/) <!--hide-->
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/topkweighted.md b/docs/ru/sql-reference/aggregate-functions/reference/topkweighted.md
index 20bd3ee85ff..840f9c553f5 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/topkweighted.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/topkweighted.md
@@ -12,13 +12,13 @@ toc_priority: 109
 topKWeighted(N)(x, weight)
 ```
 
-**Параметры**
+**Аргументы**
 
--   `N` — Количество элементов для выдачи.
+-   `N` — количество элементов для выдачи.
 
 **Аргументы**
 
--   `x` – значение.
+-   `x` — значение.
 -   `weight` — вес. [UInt8](../../../sql-reference/data-types/int-uint.md).
 
 **Возвращаемое значение**
@@ -41,4 +41,3 @@ SELECT topKWeighted(10)(number, number) FROM numbers(1000)
 └───────────────────────────────────────────┘
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/topkweighted/) <!--hide-->
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/uniq.md b/docs/ru/sql-reference/aggregate-functions/reference/uniq.md
index f5f3f198139..01bb8bea45a 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/uniq.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/uniq.md
@@ -10,7 +10,7 @@ toc_priority: 190
 uniq(x[, ...])
 ```
 
-**Параметры**
+**Аргументы**
 
 Функция принимает переменное число входных параметров. Параметры могут быть числовых типов, а также `Tuple`, `Array`, `Date`, `DateTime`, `String`.
 
@@ -39,4 +39,3 @@ uniq(x[, ...])
 -   [uniqHLL12](../../../sql-reference/aggregate-functions/reference/uniqhll12.md#agg_function-uniqhll12)
 -   [uniqExact](../../../sql-reference/aggregate-functions/reference/uniqexact.md#agg_function-uniqexact)
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/uniq/) <!--hide-->
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/uniqcombined.md b/docs/ru/sql-reference/aggregate-functions/reference/uniqcombined.md
index 751dc1a8c98..3009beb994b 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/uniqcombined.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/uniqcombined.md
@@ -12,7 +12,7 @@ uniqCombined(HLL_precision)(x[, ...])
 
 Функция `uniqCombined` — это хороший выбор для вычисления количества различных значений.
 
-**Параметры**
+**Аргументы**
 
 Функция принимает переменное число входных параметров. Параметры могут быть числовых типов, а также `Tuple`, `Array`, `Date`, `DateTime`, `String`.
 
@@ -50,4 +50,3 @@ uniqCombined(HLL_precision)(x[, ...])
 -   [uniqHLL12](../../../sql-reference/aggregate-functions/reference/uniqhll12.md#agg_function-uniqhll12)
 -   [uniqExact](../../../sql-reference/aggregate-functions/reference/uniqexact.md#agg_function-uniqexact)
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/uniqcombined/) <!--hide-->
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/uniqcombined64.md b/docs/ru/sql-reference/aggregate-functions/reference/uniqcombined64.md
index 5db27fb301d..6fde16b4b0c 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/uniqcombined64.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/uniqcombined64.md
@@ -6,4 +6,3 @@ toc_priority: 193
 
 Использует 64-битный хэш для всех типов, в отличие от [uniqCombined](../../../sql-reference/aggregate-functions/reference/uniqcombined.md#agg_function-uniqcombined).
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/uniqcombined64/) <!--hide-->
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/uniqexact.md b/docs/ru/sql-reference/aggregate-functions/reference/uniqexact.md
index 3dd22b2b4bc..613558ba887 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/uniqexact.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/uniqexact.md
@@ -14,7 +14,7 @@ uniqExact(x[, ...])
 
 Функция `uniqExact` расходует больше оперативной памяти, чем функция `uniq`, так как размер состояния неограниченно растёт по мере роста количества различных значений.
 
-**Параметры**
+**Аргументы**
 
 Функция принимает переменное число входных параметров. Параметры могут быть числовых типов, а также `Tuple`, `Array`, `Date`, `DateTime`, `String`.
 
@@ -24,4 +24,3 @@ uniqExact(x[, ...])
 -   [uniqCombined](../../../sql-reference/aggregate-functions/reference/uniq.md#agg_function-uniqcombined)
 -   [uniqHLL12](../../../sql-reference/aggregate-functions/reference/uniq.md#agg_function-uniqhll12)
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/uniqexact/) <!--hide-->
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/uniqhll12.md b/docs/ru/sql-reference/aggregate-functions/reference/uniqhll12.md
index 09e52ac6833..7a421d419ae 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/uniqhll12.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/uniqhll12.md
@@ -10,7 +10,7 @@ toc_priority: 194
 uniqHLL12(x[, ...])
 ```
 
-**Параметры**
+**Аргументы**
 
 Функция принимает переменное число входных параметров. Параметры могут быть числовых типов, а также `Tuple`, `Array`, `Date`, `DateTime`, `String`.
 
@@ -26,7 +26,7 @@ uniqHLL12(x[, ...])
 
 -   Использует алгоритм HyperLogLog для аппроксимации числа различных значений аргументов.
 
-        Используется 212 5-битовых ячеек. Размер состояния чуть больше 2.5 КБ. Результат не точный (ошибка до ~10%) для небольших множеств (<10K элементов). Однако для множеств большой кардинальности (10K - 100M) результат довольно точен (ошибка до ~1.6%). Начиная с 100M ошибка оценки будет только расти и для множеств огромной кардинальности (1B+ элементов) функция возвращает результат с очень большой неточностью.
+        Используется 2^12 5-битовых ячеек. Размер состояния чуть больше 2.5 КБ. Результат не точный (ошибка до ~10%) для небольших множеств (<10K элементов). Однако для множеств большой кардинальности (10K - 100M) результат довольно точен (ошибка до ~1.6%). Начиная с 100M ошибка оценки будет только расти и для множеств огромной кардинальности (1B+ элементов) функция возвращает результат с очень большой неточностью.
 
 -   Результат детерминирован (не зависит от порядка выполнения запроса).
 
@@ -38,4 +38,3 @@ uniqHLL12(x[, ...])
 -   [uniqExact](../../../sql-reference/aggregate-functions/reference/uniqexact.md#agg_function-uniqexact)
 
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/uniqhll12/) <!--hide-->
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/varpop.md b/docs/ru/sql-reference/aggregate-functions/reference/varpop.md
index 9615e03673b..0a78b3cbb76 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/varpop.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/varpop.md
@@ -11,4 +11,3 @@ toc_priority: 32
 !!! note "Примечание"
     Функция использует вычислительно неустойчивый алгоритм. Если для ваших расчётов необходима [вычислительная устойчивость](https://ru.wikipedia.org/wiki/Вычислительная_устойчивость), используйте функцию `varPopStable`. Она работает медленнее, но обеспечивает меньшую вычислительную ошибку.
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/varpop/) <!--hide-->
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/varsamp.md b/docs/ru/sql-reference/aggregate-functions/reference/varsamp.md
index 31aaac68e7b..e18b858b7e2 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/varsamp.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/varsamp.md
@@ -13,4 +13,3 @@ toc_priority: 33
 !!! note "Примечание"
     Функция использует вычислительно неустойчивый алгоритм. Если для ваших расчётов необходима [вычислительная устойчивость](https://ru.wikipedia.org/wiki/Вычислительная_устойчивость), используйте функцию `varSampStable`. Она работает медленнее, но обеспечиват меньшую вычислительную ошибку.
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/vasamp/) <!--hide-->
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/welchttest.md b/docs/ru/sql-reference/aggregate-functions/reference/welchttest.md
index 16c122d1b49..594a609d89e 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/welchttest.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/welchttest.md
@@ -16,7 +16,7 @@ welchTTest(sample_data, sample_index)
 Значения выборок берутся из столбца `sample_data`. Если  `sample_index` равно 0, то значение из этой строки принадлежит первой выборке. Во всех остальных случаях значение принадлежит второй выборке.
 Проверяется нулевая гипотеза, что средние значения генеральных совокупностей совпадают. Для применения t-критерия Уэлча распределение в генеральных совокупностях должно быть нормальным. Дисперсии могут не совпадать.
 
-**Параметры**
+**Аргументы**
 
 -   `sample_data` — данные выборок. [Integer](../../../sql-reference/data-types/int-uint.md), [Float](../../../sql-reference/data-types/float.md) or [Decimal](../../../sql-reference/data-types/decimal.md).
 -   `sample_index` — индексы выборок. [Integer](../../../sql-reference/data-types/int-uint.md).
@@ -63,4 +63,3 @@ SELECT welchTTest(sample_data, sample_index) FROM welch_ttest;
 -   [t-критерий Уэлча](https://ru.wikipedia.org/wiki/T-%D0%BA%D1%80%D0%B8%D1%82%D0%B5%D1%80%D0%B8%D0%B9_%D0%A3%D1%8D%D0%BB%D1%87%D0%B0)
 -   [studentTTest](studentttest.md#studentttest)
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/aggregate-functions/reference/welchTTest/) <!--hide-->
diff --git a/docs/ru/sql-reference/data-types/aggregatefunction.md b/docs/ru/sql-reference/data-types/aggregatefunction.md
index 018d38d825e..6ca6879cf6c 100644
--- a/docs/ru/sql-reference/data-types/aggregatefunction.md
+++ b/docs/ru/sql-reference/data-types/aggregatefunction.md
@@ -65,4 +65,3 @@ SELECT uniqMerge(state) FROM (SELECT uniqState(UserID) AS state FROM table GROUP
 
 Смотрите в описании движка [AggregatingMergeTree](../../sql-reference/data-types/aggregatefunction.md).
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/data_types/nested_data_structures/aggregatefunction/) <!--hide-->
diff --git a/docs/ru/sql-reference/data-types/array.md b/docs/ru/sql-reference/data-types/array.md
index 86a23ed041b..30952d6e126 100644
--- a/docs/ru/sql-reference/data-types/array.md
+++ b/docs/ru/sql-reference/data-types/array.md
@@ -76,4 +76,3 @@ Received exception from server (version 1.1.54388):
 Code: 386. DB::Exception: Received from localhost:9000, 127.0.0.1. DB::Exception: There is no supertype for types UInt8, String because some of them are String/FixedString and some of them are not.
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/data_types/array/) <!--hide-->
diff --git a/docs/ru/sql-reference/data-types/boolean.md b/docs/ru/sql-reference/data-types/boolean.md
index bb0cd50c739..dff35777ff9 100644
--- a/docs/ru/sql-reference/data-types/boolean.md
+++ b/docs/ru/sql-reference/data-types/boolean.md
@@ -1,10 +1,9 @@
 ---
 toc_priority: 43
-toc_title: "\u0411\u0443\u043b\u0435\u0432\u044b\u0020\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f"
+toc_title: "Булевы значения"
 ---
 
 # Булевы значения {#bulevy-znacheniia}
 
 Отдельного типа для булевых значений нет. Для них используется тип UInt8, в котором используются только значения 0 и 1.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/data_types/boolean/) <!--hide-->
diff --git a/docs/ru/sql-reference/data-types/date.md b/docs/ru/sql-reference/data-types/date.md
index 490bc5c28b4..50508de96a3 100644
--- a/docs/ru/sql-reference/data-types/date.md
+++ b/docs/ru/sql-reference/data-types/date.md
@@ -44,4 +44,3 @@ SELECT * FROM dt;
 -   [Тип данных `DateTime`](../../sql-reference/data-types/datetime.md)
 
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/data_types/date/) <!--hide-->
diff --git a/docs/ru/sql-reference/data-types/datetime.md b/docs/ru/sql-reference/data-types/datetime.md
index ffdf83e5bd0..ebd780d0d7d 100644
--- a/docs/ru/sql-reference/data-types/datetime.md
+++ b/docs/ru/sql-reference/data-types/datetime.md
@@ -126,4 +126,3 @@ FROM dt
 -   [Тип данных `Date`](date.md)
 -   [Тип данных `DateTime64`](datetime64.md)
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/data_types/datetime/) <!--hide-->
diff --git a/docs/ru/sql-reference/data-types/datetime64.md b/docs/ru/sql-reference/data-types/datetime64.md
index 6576bf9dc0d..3a08da75bb7 100644
--- a/docs/ru/sql-reference/data-types/datetime64.md
+++ b/docs/ru/sql-reference/data-types/datetime64.md
@@ -7,9 +7,9 @@ toc_title: DateTime64
 
 Позволяет хранить момент времени, который может быть представлен как календарная дата и время, с заданной суб-секундной точностью.
 
-Размер тика/точность: 10<sup>-precision</sup> секунд, где precision - целочисленный параметр типа.
+Размер тика (точность, precision): 10<sup>-precision</sup> секунд, где precision - целочисленный параметр.
 
-Синтаксис:
+**Синтаксис:**
 
 ``` sql
 DateTime64(precision, [timezone])
@@ -17,9 +17,11 @@ DateTime64(precision, [timezone])
 
 Данные хранятся в виде количества ‘тиков’, прошедших с момента начала эпохи (1970-01-01 00:00:00 UTC), в Int64. Размер тика определяется параметром precision. Дополнительно, тип `DateTime64` позволяет хранить часовой пояс, единый для всей колонки, который влияет на то, как будут отображаться значения типа `DateTime64` в текстовом виде и как будут парситься значения заданные в виде строк (‘2020-01-01 05:00:01.000’). Часовой пояс не хранится в строках таблицы (выборки), а хранится в метаданных колонки. Подробнее см. [DateTime](datetime.md).
 
-## Пример {#primer}
+Поддерживаются значения от 1 января 1925 г. и до 31 декабря 2283 г.
 
-**1.** Создание таблицы с столбцом типа `DateTime64` и вставка данных в неё:
+## Примеры {#examples}
+
+1. Создание таблицы со столбцом типа `DateTime64` и вставка данных в неё:
 
 ``` sql
 CREATE TABLE dt
@@ -27,15 +29,15 @@ CREATE TABLE dt
     `timestamp` DateTime64(3, 'Europe/Moscow'),
     `event_id` UInt8
 )
-ENGINE = TinyLog
+ENGINE = TinyLog;
 ```
 
 ``` sql
-INSERT INTO dt Values (1546300800000, 1), ('2019-01-01 00:00:00', 2)
+INSERT INTO dt Values (1546300800000, 1), ('2019-01-01 00:00:00', 2);
 ```
 
 ``` sql
-SELECT * FROM dt
+SELECT * FROM dt;
 ```
 
 ``` text
@@ -46,12 +48,12 @@ SELECT * FROM dt
 ```
 
 -   При вставке даты-времени как числа (аналогично ‘Unix timestamp’), время трактуется как UTC. Unix timestamp `1546300800` в часовом поясе `Europe/London (UTC+0)` представляет время `'2019-01-01 00:00:00'`. Однако, столбец `timestamp` имеет тип `DateTime('Europe/Moscow (UTC+3)')`, так что при выводе в виде строки время отобразится как `2019-01-01 03:00:00`.
--   При вставке даты-времени в виде строки, время трактуется соответственно часовому поясу установленному для колонки. `'2019-01-01 00:00:00'` трактуется как время по Москве (и в базу сохраняется `'2018-12-31 21:00:00'` в виде Unix Timestamp)
+-   При вставке даты-времени в виде строки, время трактуется соответственно часовому поясу установленному для колонки. `'2019-01-01 00:00:00'` трактуется как время по Москве (и в базу сохраняется `'2018-12-31 21:00:00'` в виде Unix Timestamp).
 
-**2.** Фильтрация по значениям даты-времени
+2. Фильтрация по значениям даты и времени
 
 ``` sql
-SELECT * FROM dt WHERE timestamp = toDateTime64('2019-01-01 00:00:00', 3, 'Europe/Moscow')
+SELECT * FROM dt WHERE timestamp = toDateTime64('2019-01-01 00:00:00', 3, 'Europe/Moscow');
 ```
 
 ``` text
@@ -60,12 +62,12 @@ SELECT * FROM dt WHERE timestamp = toDateTime64('2019-01-01 00:00:00', 3, 'Europ
 └─────────────────────────┴──────────┘
 ```
 
-В отличие от типа `DateTime`, `DateTime64` не конвертируется из строк автоматически
+В отличие от типа `DateTime`, `DateTime64` не конвертируется из строк автоматически.
 
-**3.** Получение часового пояса для значения типа `DateTime64`:
+3. Получение часового пояса для значения типа `DateTime64`:
 
 ``` sql
-SELECT toDateTime64(now(), 3, 'Europe/Moscow') AS column, toTypeName(column) AS x
+SELECT toDateTime64(now(), 3, 'Europe/Moscow') AS column, toTypeName(column) AS x;
 ```
 
 ``` text
@@ -74,13 +76,13 @@ SELECT toDateTime64(now(), 3, 'Europe/Moscow') AS column, toTypeName(column) AS
 └─────────────────────────┴────────────────────────────────┘
 ```
 
-**4.** Конвертация часовых поясов
+4. Конвертация часовых поясов
 
 ``` sql
 SELECT
 toDateTime64(timestamp, 3, 'Europe/London') as lon_time,
 toDateTime64(timestamp, 3, 'Europe/Moscow') as mos_time
-FROM dt
+FROM dt;
 ```
 
 ``` text
@@ -90,7 +92,7 @@ FROM dt
 └─────────────────────────┴─────────────────────────┘
 ```
 
-## See Also {#see-also}
+**See Also**
 
 -   [Функции преобразования типов](../../sql-reference/functions/type-conversion-functions.md)
 -   [Функции для работы с датой и временем](../../sql-reference/functions/date-time-functions.md)
diff --git a/docs/ru/sql-reference/data-types/decimal.md b/docs/ru/sql-reference/data-types/decimal.md
index bdcd3c767b9..8524e8ea132 100644
--- a/docs/ru/sql-reference/data-types/decimal.md
+++ b/docs/ru/sql-reference/data-types/decimal.md
@@ -112,4 +112,3 @@ DB::Exception: Can't compare.
 -   [countDigits](../../sql-reference/functions/other-functions.md#count-digits)
 
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/data_types/decimal/) <!--hide-->
diff --git a/docs/ru/sql-reference/data-types/domains/index.md b/docs/ru/sql-reference/data-types/domains/index.md
index 4449469b1bc..35f8149112f 100644
--- a/docs/ru/sql-reference/data-types/domains/index.md
+++ b/docs/ru/sql-reference/data-types/domains/index.md
@@ -1,6 +1,6 @@
 ---
-toc_folder_title: "\u0414\u043e\u043c\u0435\u043d\u044b"
-toc_title_title: "\u041e\u0431\u0437\u043e\u0440"
+toc_folder_title: "Домены"
+toc_title_title: "Обзор"
 toc_priority: 56
 ---
 
@@ -30,4 +30,3 @@ toc_priority: 56
 -   Невозможно неявно преобразовывать строковые значение в значения с доменным типом данных при вставке данных из другого столбца или таблицы.
 -   Домен не добавляет ограничения на хранимые значения.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/data_types/domains/overview) <!--hide-->
diff --git a/docs/ru/sql-reference/data-types/domains/ipv4.md b/docs/ru/sql-reference/data-types/domains/ipv4.md
index 57d6f12ab17..af5f8261fae 100644
--- a/docs/ru/sql-reference/data-types/domains/ipv4.md
+++ b/docs/ru/sql-reference/data-types/domains/ipv4.md
@@ -81,4 +81,3 @@ SELECT toTypeName(i), CAST(from AS UInt32) AS i FROM hits LIMIT 1;
 └──────────────────────────────────┴────────────┘
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/data_types/domains/ipv4) <!--hide-->
diff --git a/docs/ru/sql-reference/data-types/domains/ipv6.md b/docs/ru/sql-reference/data-types/domains/ipv6.md
index 04c5fd0d491..5b3c17feceb 100644
--- a/docs/ru/sql-reference/data-types/domains/ipv6.md
+++ b/docs/ru/sql-reference/data-types/domains/ipv6.md
@@ -81,4 +81,3 @@ SELECT toTypeName(i), CAST(from AS FixedString(16)) AS i FROM hits LIMIT 1;
 └───────────────────────────────────────────┴─────────┘
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/data_types/domains/ipv6) <!--hide-->
diff --git a/docs/ru/sql-reference/data-types/enum.md b/docs/ru/sql-reference/data-types/enum.md
index b86d15c19a8..95c053bed2c 100644
--- a/docs/ru/sql-reference/data-types/enum.md
+++ b/docs/ru/sql-reference/data-types/enum.md
@@ -126,4 +126,3 @@ INSERT INTO t_enum_nullable Values('hello'),('world'),(NULL)
 
 При ALTER, есть возможность поменять Enum8 на Enum16 и обратно - так же, как можно поменять Int8 на Int16.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/data_types/enum/) <!--hide-->
diff --git a/docs/ru/sql-reference/data-types/fixedstring.md b/docs/ru/sql-reference/data-types/fixedstring.md
index 21115418e30..ef73dadaddf 100644
--- a/docs/ru/sql-reference/data-types/fixedstring.md
+++ b/docs/ru/sql-reference/data-types/fixedstring.md
@@ -58,4 +58,3 @@ WHERE a = 'b\0'
 
 Обратите внимание, что длина значения `FixedString(N)` постоянна. Функция [length](../../sql-reference/data-types/fixedstring.md#array_functions-length) возвращает `N` даже если значение `FixedString(N)` заполнено только нулевыми байтами, однако функция [empty](../../sql-reference/data-types/fixedstring.md#empty) в этом же случае возвращает `1`.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/data_types/fixedstring/) <!--hide-->
diff --git a/docs/ru/sql-reference/data-types/float.md b/docs/ru/sql-reference/data-types/float.md
index 0e861f170b7..89ac00ab62f 100644
--- a/docs/ru/sql-reference/data-types/float.md
+++ b/docs/ru/sql-reference/data-types/float.md
@@ -89,4 +89,3 @@ SELECT 0 / 0
 
 Смотрите правила сортировки `NaN` в разделе [Секция ORDER BY ](../../sql-reference/statements/select/order-by.md).
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/data_types/float/) <!--hide-->
diff --git a/docs/ru/sql-reference/data-types/geo.md b/docs/ru/sql-reference/data-types/geo.md
new file mode 100644
index 00000000000..23b47f38d05
--- /dev/null
+++ b/docs/ru/sql-reference/data-types/geo.md
@@ -0,0 +1,105 @@
+---
+toc_priority: 62
+toc_title: Географические структуры
+---
+
+# Типы данных для работы с географическими структурами {#geo-data-types}
+
+ClickHouse поддерживает типы данных для отображения географических объектов — точек (местоположений), территорий и т.п.
+
+!!! warning "Предупреждение"
+    Сейчас использование типов данных для работы с географическими структурами является экспериментальной возможностью. Чтобы использовать эти типы данных, включите настройку `allow_experimental_geo_types = 1`.
+
+**См. также**
+- [Хранение географических структур данных](https://ru.wikipedia.org/wiki/GeoJSON).
+- Настройка [allow_experimental_geo_types](../../operations/settings/settings.md#allow-experimental-geo-types).
+
+## Point {#point-data-type}
+
+Тип `Point` (точка) определяется парой координат X и Y и хранится в виде кортежа [Tuple](tuple.md)([Float64](float.md), [Float64](float.md)).
+
+**Пример**
+
+Запрос:
+
+```sql
+SET allow_experimental_geo_types = 1;
+CREATE TABLE geo_point (p Point) ENGINE = Memory();
+INSERT INTO geo_point VALUES((10, 10));
+SELECT p, toTypeName(p) FROM geo_point;
+```
+Результат: 
+
+``` text
+┌─p─────┬─toTypeName(p)─┐
+│ (10,10) │ Point         │
+└───────┴───────────────┘
+```
+
+## Ring {#ring-data-type}
+
+Тип `Ring` описывает простой многоугольник без внутренних областей (дыр) и хранится в виде массива точек: [Array](array.md)([Point](#point-data-type)).
+
+**Пример**
+
+Запрос:
+
+```sql
+SET allow_experimental_geo_types = 1;
+CREATE TABLE geo_ring (r Ring) ENGINE = Memory();
+INSERT INTO geo_ring VALUES([(0, 0), (10, 0), (10, 10), (0, 10)]);
+SELECT r, toTypeName(r) FROM geo_ring;
+```
+Результат: 
+
+``` text
+┌─r─────────────────────────────┬─toTypeName(r)─┐
+│ [(0,0),(10,0),(10,10),(0,10)] │ Ring          │
+└───────────────────────────────┴───────────────┘
+```
+
+## Polygon {#polygon-data-type}
+
+Тип `Polygon` описывает многоугольник с внутренними областями (дырами) и хранится в виде массива: [Array](array.md)([Ring](#ring-data-type)). Первый элемент массива описывает внешний многоугольник (контур), а остальные элементы описывают дыры.
+
+**Пример**
+
+Запись в этой таблице описывает многоугольник с одной дырой:
+
+```sql
+SET allow_experimental_geo_types = 1;
+CREATE TABLE geo_polygon (pg Polygon) ENGINE = Memory();
+INSERT INTO geo_polygon VALUES([[(20, 20), (50, 20), (50, 50), (20, 50)], [(30, 30), (50, 50), (50, 30)]]);
+SELECT pg, toTypeName(pg) FROM geo_polygon;
+```
+
+Результат: 
+
+``` text
+┌─pg────────────────────────────────────────────────────────────┬─toTypeName(pg)─┐
+│ [[(20,20),(50,20),(50,50),(20,50)],[(30,30),(50,50),(50,30)]] │ Polygon        │
+└───────────────────────────────────────────────────────────────┴────────────────┘
+```
+
+## MultiPolygon {#multipolygon-data-type}
+
+Тип `MultiPolygon` описывает элемент, состоящий из нескольких простых многоугольников (полигональную сетку). Он хранится в виде массива многоугольников: [Array](array.md)([Polygon](#polygon-data-type)). 
+
+**Пример**
+
+Запись в этой таблице описывает элемент, состоящий из двух многоугольников — первый без дыр, а второй с одной дырой:
+
+```sql
+SET allow_experimental_geo_types = 1;
+CREATE TABLE geo_multipolygon (mpg MultiPolygon) ENGINE = Memory();
+INSERT INTO geo_multipolygon VALUES([[[(0, 0), (10, 0), (10, 10), (0, 10)]], [[(20, 20), (50, 20), (50, 50), (20, 50)],[(30, 30), (50, 50), (50, 30)]]]);
+SELECT mpg, toTypeName(mpg) FROM geo_multipolygon;
+```
+Result: 
+
+``` text
+┌─mpg─────────────────────────────────────────────────────────────────────────────────────────────┬─toTypeName(mpg)─┐
+│ [[[(0,0),(10,0),(10,10),(0,10)]],[[(20,20),(50,20),(50,50),(20,50)],[(30,30),(50,50),(50,30)]]] │ MultiPolygon    │
+└─────────────────────────────────────────────────────────────────────────────────────────────────┴─────────────────┘
+```
+
diff --git a/docs/ru/sql-reference/data-types/index.md b/docs/ru/sql-reference/data-types/index.md
index 7a5618f4c5d..2b29ee1bc19 100644
--- a/docs/ru/sql-reference/data-types/index.md
+++ b/docs/ru/sql-reference/data-types/index.md
@@ -1,7 +1,7 @@
 ---
-toc_folder_title: "\u0422\u0438\u043F\u044B \u0434\u0430\u043D\u043D\u044B\u0445"
+toc_folder_title: "Типы данных"
 toc_priority: 37
-toc_title: "\u0412\u0432\u0435\u0434\u0435\u043D\u0438\u0435"
+toc_title: "Введение"
 ---
 
 # Типы данных {#data_types}
@@ -11,4 +11,3 @@ ClickHouse может сохранять в ячейках таблиц данн
 Зависимость имен типов данных от регистра можно проверить в системной таблице [system.data_type_families](../../operations/system-tables/data_type_families.md#system_tables-data_type_families).
 
 Раздел содержит описания поддерживаемых типов данных и специфику их использования и/или реализации, если таковые имеются.
-[Оригинальная статья](https://clickhouse.tech/docs/ru/data_types/) <!--hide-->
diff --git a/docs/ru/sql-reference/data-types/int-uint.md b/docs/ru/sql-reference/data-types/int-uint.md
index d3c342e467a..c026f5fc4a5 100644
--- a/docs/ru/sql-reference/data-types/int-uint.md
+++ b/docs/ru/sql-reference/data-types/int-uint.md
@@ -35,4 +35,3 @@ toc_title: UInt8, UInt16, UInt32, UInt64, Int8, Int16, Int32, Int64
 
 `UInt128` пока не реализован.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/data_types/int_uint/) <!--hide-->
diff --git a/docs/ru/sql-reference/data-types/lowcardinality.md b/docs/ru/sql-reference/data-types/lowcardinality.md
index d94cedd29ce..fe9118b1e14 100644
--- a/docs/ru/sql-reference/data-types/lowcardinality.md
+++ b/docs/ru/sql-reference/data-types/lowcardinality.md
@@ -23,7 +23,7 @@ LowCardinality(data_type)
 
 Эффективность использования типа данных `LowCarditality` зависит от разнообразия данных. Если словарь содержит менее 10 000 различных значений, ClickHouse в основном показывает более высокую эффективность чтения и хранения данных. Если же словарь содержит более 100 000 различных значений, ClickHouse может работать хуже, чем при использовании обычных типов данных.
 
-При работе со строками, использование `LowCardinality` вместо [Enum](enum.md). `LowCardinality` обеспечивает большую гибкость в использовании и часто показывает такую же или более высокую эффективность.
+При работе со строками, использование `LowCardinality` вместо [Enum](enum.md) обеспечивает большую гибкость в использовании и часто показывает такую же или более высокую эффективность.
 
 ## Пример
 
@@ -58,4 +58,3 @@ ORDER BY id
 - [Reducing Clickhouse Storage Cost with the Low Cardinality Type – Lessons from an Instana Engineer](https://www.instana.com/blog/reducing-clickhouse-storage-cost-with-the-low-cardinality-type-lessons-from-an-instana-engineer/).
 - [String Optimization (video presentation in Russian)](https://youtu.be/rqf-ILRgBdY?list=PL0Z2YDlm0b3iwXCpEFiOOYmwXzVmjJfEt). [Slides in English](https://github.com/yandex/clickhouse-presentations/raw/master/meetup19/string_optimization.pdf).
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/data-types/lowcardinality/) <!--hide-->
diff --git a/docs/ru/sql-reference/data-types/multiword-types.md b/docs/ru/sql-reference/data-types/multiword-types.md
index 559755ef989..0a8afff448d 100644
--- a/docs/ru/sql-reference/data-types/multiword-types.md
+++ b/docs/ru/sql-reference/data-types/multiword-types.md
@@ -26,4 +26,3 @@ toc_title: Составные типы
 | BINARY LARGE OBJECT                 | [String](../../sql-reference/data-types/string.md)        |
 | BINARY VARYING                      | [String](../../sql-reference/data-types/string.md)        |
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/data-types/multiword-types/) <!--hide-->
diff --git a/docs/ru/sql-reference/data-types/nested-data-structures/index.md b/docs/ru/sql-reference/data-types/nested-data-structures/index.md
index d53cabc6652..78262347bac 100644
--- a/docs/ru/sql-reference/data-types/nested-data-structures/index.md
+++ b/docs/ru/sql-reference/data-types/nested-data-structures/index.md
@@ -1,5 +1,5 @@
 ---
-toc_folder_title: "\u0412\u043b\u043e\u0436\u0435\u043d\u043d\u044b\u0435\u0020\u0441\u0442\u0440\u0443\u043a\u0442\u0443\u0440\u044b\u0020\u0434\u0430\u043d\u043d\u044b\u0445"
+toc_folder_title: "Вложенные структуры данных"
 toc_hidden: true
 toc_priority: 54
 toc_title: hidden
@@ -7,4 +7,3 @@ toc_title: hidden
 
 # Вложенные структуры данных {#vlozhennye-struktury-dannykh}
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/data_types/nested_data_structures/) <!--hide-->
diff --git a/docs/ru/sql-reference/data-types/nested-data-structures/nested.md b/docs/ru/sql-reference/data-types/nested-data-structures/nested.md
index 0e43383b283..199d141a191 100644
--- a/docs/ru/sql-reference/data-types/nested-data-structures/nested.md
+++ b/docs/ru/sql-reference/data-types/nested-data-structures/nested.md
@@ -96,4 +96,3 @@ LIMIT 10
 
 Работоспособность запроса ALTER для элементов вложенных структур данных, является сильно ограниченной.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/data_types/nested_data_structures/nested/) <!--hide-->
diff --git a/docs/ru/sql-reference/data-types/nullable.md b/docs/ru/sql-reference/data-types/nullable.md
index 71e1f7a37a0..3f33c4b2540 100644
--- a/docs/ru/sql-reference/data-types/nullable.md
+++ b/docs/ru/sql-reference/data-types/nullable.md
@@ -48,4 +48,3 @@ SELECT x + y from t_null
 └────────────┘
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/data_types/nullable/) <!--hide-->
diff --git a/docs/ru/sql-reference/data-types/simpleaggregatefunction.md b/docs/ru/sql-reference/data-types/simpleaggregatefunction.md
index 52f0412a177..7b81c577762 100644
--- a/docs/ru/sql-reference/data-types/simpleaggregatefunction.md
+++ b/docs/ru/sql-reference/data-types/simpleaggregatefunction.md
@@ -1,8 +1,11 @@
-# SimpleAggregateFunction {#data-type-simpleaggregatefunction}
+# SimpleAggregateFunction(func, type) {#data-type-simpleaggregatefunction}
 
-`SimpleAggregateFunction(name, types_of_arguments…)` data type stores current value of the aggregate function, and does not store its full state as [`AggregateFunction`](../../sql-reference/data-types/aggregatefunction.md) does. This optimization can be applied to functions for which the following property holds: the result of applying a function `f` to a row set `S1 UNION ALL S2` can be obtained by applying `f` to parts of the row set separately, and then again applying `f` to the results: `f(S1 UNION ALL S2) = f(f(S1) UNION ALL f(S2))`. This property guarantees that partial aggregation results are enough to compute the combined one, so we don’t have to store and process any extra data.
+Хранит только текущее значение агрегатной функции и не сохраняет ее полное состояние, как это делает [`AggregateFunction`](../../sql-reference/data-types/aggregatefunction.md). Такая оптимизация может быть применена к функциям, которые обладают следующим свойством: результат выполнения функции `f` к набору строк `S1 UNION ALL S2` может быть получен путем выполнения `f` к отдельным частям набора строк,
+а затем повторного выполнения `f` к результатам: `f(S1 UNION ALL S2) = f(f(S1) UNION ALL f(S2))`. Это свойство гарантирует, что результатов частичной агрегации достаточно для вычисления комбинированной, поэтому хранить и обрабатывать какие-либо дополнительные данные не требуется.
 
-The following aggregate functions are supported:
+Чтобы получить промежуточное значение, обычно используются агрегатные функции с суффиксом [-SimpleState](../../sql-reference/aggregate-functions/combinators.md#agg-functions-combinator-simplestate).
+
+Поддерживаются следующие агрегатные функции:
 
 -   [`any`](../../sql-reference/aggregate-functions/reference/any.md#agg_function-any)
 -   [`anyLast`](../../sql-reference/aggregate-functions/reference/anylast.md#anylastx)
@@ -14,23 +17,26 @@ The following aggregate functions are supported:
 -   [`groupBitOr`](../../sql-reference/aggregate-functions/reference/groupbitor.md#groupbitor)
 -   [`groupBitXor`](../../sql-reference/aggregate-functions/reference/groupbitxor.md#groupbitxor)
 -   [`groupArrayArray`](../../sql-reference/aggregate-functions/reference/grouparray.md#agg_function-grouparray)
--   [`groupUniqArrayArray`](../../sql-reference/aggregate-functions/reference/groupuniqarray.md#groupuniqarray)
+-   [`groupUniqArrayArray`](../../sql-reference/aggregate-functions/reference/groupuniqarray.md)
+-   [`sumMap`](../../sql-reference/aggregate-functions/reference/summap.md#agg_functions-summap)
+-   [`minMap`](../../sql-reference/aggregate-functions/reference/minmap.md#agg_functions-minmap)
+-   [`maxMap`](../../sql-reference/aggregate-functions/reference/maxmap.md#agg_functions-maxmap)
+-   [`argMin`](../../sql-reference/aggregate-functions/reference/argmin.md)
+-   [`argMax`](../../sql-reference/aggregate-functions/reference/argmax.md)
 
-Values of the `SimpleAggregateFunction(func, Type)` look and stored the same way as `Type`, so you do not need to apply functions with `-Merge`/`-State` suffixes. `SimpleAggregateFunction` has better performance than `AggregateFunction` with same aggregation function.
+!!! note "Примечание"
+    Значения `SimpleAggregateFunction(func, Type)` отображаются и хранятся так же, как и `Type`, поэтому комбинаторы [-Merge](../../sql-reference/aggregate-functions/combinators.md#aggregate_functions_combinators-merge) и [-State](../../sql-reference/aggregate-functions/combinators.md#agg-functions-combinator-state) не требуются.
 
-**Parameters**
+    `SimpleAggregateFunction` имеет лучшую производительность, чем `AggregateFunction` с той же агрегатной функцией.
 
--   Name of the aggregate function.
--   Types of the aggregate function arguments.
+**Параметры**
 
-**Example**
+-   `func` — имя агрегатной функции.
+-   `type` — типы аргументов агрегатной функции.
+
+**Пример**
 
 ``` sql
-CREATE TABLE t
-(
-    column1 SimpleAggregateFunction(sum, UInt64),
-    column2 SimpleAggregateFunction(any, String)
-) ENGINE = ...
+CREATE TABLE simple (id UInt64, val SimpleAggregateFunction(sum, Double)) ENGINE=AggregatingMergeTree ORDER BY id;
 ```
 
-[Original article](https://clickhouse.tech/docs/en/data_types/simpleaggregatefunction/) <!--hide-->
diff --git a/docs/ru/sql-reference/data-types/special-data-types/expression.md b/docs/ru/sql-reference/data-types/special-data-types/expression.md
index 718fcc886a6..f11f66a40c7 100644
--- a/docs/ru/sql-reference/data-types/special-data-types/expression.md
+++ b/docs/ru/sql-reference/data-types/special-data-types/expression.md
@@ -7,4 +7,3 @@ toc_title: Expression
 
 Используется для представления лямбда-выражений в функциях высшего порядка.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/data_types/special_data_types/expression/) <!--hide-->
diff --git a/docs/ru/sql-reference/data-types/special-data-types/index.md b/docs/ru/sql-reference/data-types/special-data-types/index.md
index 29c057472ea..823a84e2e43 100644
--- a/docs/ru/sql-reference/data-types/special-data-types/index.md
+++ b/docs/ru/sql-reference/data-types/special-data-types/index.md
@@ -1,5 +1,5 @@
 ---
-toc_folder_title: "\u0421\u043b\u0443\u0436\u0435\u0431\u043d\u044b\u0435\u0020\u0442\u0438\u043f\u044b\u0020\u0434\u0430\u043d\u043d\u044b\u0445"
+toc_folder_title: "Служебные типы данных"
 toc_hidden: true
 toc_priority: 55
 toc_title: hidden
@@ -9,4 +9,3 @@ toc_title: hidden
 
 Значения служебных типов данных не могут сохраняться в таблицу и выводиться в качестве результата, а возникают как промежуточный результат выполнения запроса.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/data_types/special_data_types/) <!--hide-->
diff --git a/docs/ru/sql-reference/data-types/special-data-types/nothing.md b/docs/ru/sql-reference/data-types/special-data-types/nothing.md
index c6a9cb868d8..30d425461e1 100644
--- a/docs/ru/sql-reference/data-types/special-data-types/nothing.md
+++ b/docs/ru/sql-reference/data-types/special-data-types/nothing.md
@@ -19,4 +19,3 @@ SELECT toTypeName(Array())
 └─────────────────────┘
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/data_types/special_data_types/nothing/) <!--hide-->
diff --git a/docs/ru/sql-reference/data-types/special-data-types/set.md b/docs/ru/sql-reference/data-types/special-data-types/set.md
index 4c2f4ed2c66..5867df3c947 100644
--- a/docs/ru/sql-reference/data-types/special-data-types/set.md
+++ b/docs/ru/sql-reference/data-types/special-data-types/set.md
@@ -7,4 +7,3 @@ toc_title: Set
 
 Используется для представления правой части выражения IN.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/data_types/special_data_types/set/) <!--hide-->
diff --git a/docs/ru/sql-reference/data-types/string.md b/docs/ru/sql-reference/data-types/string.md
index 6a07f7e51de..9470f523629 100644
--- a/docs/ru/sql-reference/data-types/string.md
+++ b/docs/ru/sql-reference/data-types/string.md
@@ -17,4 +17,3 @@ toc_title: String
 Также, некоторые функции по работе со строками, имеют отдельные варианты, которые работают при допущении, что строка содержит набор байт, представляющий текст в кодировке UTF-8.
 Например, функция length вычисляет длину строки в байтах, а функция lengthUTF8 - длину строки в кодовых точках Unicode, при допущении, что значение в кодировке UTF-8.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/data_types/string/) <!--hide-->
diff --git a/docs/ru/sql-reference/data-types/tuple.md b/docs/ru/sql-reference/data-types/tuple.md
index e2a1450b47f..702b5962f7b 100644
--- a/docs/ru/sql-reference/data-types/tuple.md
+++ b/docs/ru/sql-reference/data-types/tuple.md
@@ -47,4 +47,3 @@ SELECT tuple(1,NULL) AS x, toTypeName(x)
 └──────────┴─────────────────────────────────┘
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/data_types/tuple/) <!--hide-->
diff --git a/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-hierarchical.md b/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-hierarchical.md
index 350e391dbed..da8492e7cc0 100644
--- a/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-hierarchical.md
+++ b/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-hierarchical.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 45
-toc_title: "\u0418\u0435\u0440\u0430\u0440\u0445\u0438\u0447\u0435\u0441\u043a\u0438\u0435\u0020\u0441\u043b\u043e\u0432\u0430\u0440\u0438"
+toc_title: "Иерархические словари"
 ---
 
 # Иерархические словари {#ierarkhicheskie-slovari}
@@ -65,4 +65,3 @@ ClickHouse поддерживает свойство [hierarchical](external-dic
 </dictionary>
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/dicts/external_dicts_dict_hierarchical/) <!--hide-->
diff --git a/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md b/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md
index f6b8b670563..285982565c2 100644
--- a/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md
+++ b/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 41
-toc_title: "\u0425\u0440\u0430\u043d\u0435\u043d\u0438\u0435\u0020\u0441\u043b\u043e\u0432\u0430\u0440\u0435\u0439\u0020\u0432\u0020\u043f\u0430\u043c\u044f\u0442\u0438"
+toc_title: "Хранение словарей в памяти"
 ---
 
 # Хранение словарей в памяти {#dicts-external-dicts-dict-layout}
@@ -318,8 +318,6 @@ LAYOUT(CACHE(SIZE_IN_CELLS 1000000000))
         <write_buffer_size>1048576</write_buffer_size>
         <!-- Path where cache file will be stored. -->
         <path>/var/lib/clickhouse/clickhouse_dictionaries/test_dict</path>
-        <!-- Max number on stored keys in the cache. Rounded up to a power of two. -->
-        <max_stored_keys>1048576</max_stored_keys>
     </ssd_cache>
 </layout>
 ```
@@ -327,8 +325,8 @@ LAYOUT(CACHE(SIZE_IN_CELLS 1000000000))
 или
 
 ``` sql
-LAYOUT(CACHE(BLOCK_SIZE 4096 FILE_SIZE 16777216 READ_BUFFER_SIZE 1048576
-    PATH /var/lib/clickhouse/clickhouse_dictionaries/test_dict MAX_STORED_KEYS 1048576))
+LAYOUT(SSD_CACHE(BLOCK_SIZE 4096 FILE_SIZE 16777216 READ_BUFFER_SIZE 1048576
+    PATH /var/lib/clickhouse/clickhouse_dictionaries/test_dict))
 ```
 
 ### complex_key_ssd_cache {#complex-key-ssd-cache}
@@ -443,4 +441,3 @@ dictGetString('prefix', 'asn', tuple(IPv6StringToNum('2001:db8::1')))
 
 Данные должны полностью помещаться в оперативной памяти.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/dicts/external_dicts_dict_layout/) <!--hide-->
diff --git a/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md b/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md
index ec0fb8e0ee5..9589353649d 100644
--- a/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md
+++ b/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 42
-toc_title: "\u041e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0435\u0020\u0441\u043b\u043e\u0432\u0430\u0440\u0435\u0439"
+toc_title: "Обновление словарей"
 ---
 
 # Обновление словарей {#obnovlenie-slovarei}
@@ -28,7 +28,7 @@ LIFETIME(300)
 ...
 ```
 
-Настройка `<lifetime>0</lifetime>` запрещает обновление словарей.
+Настройка `<lifetime>0</lifetime>` (`LIFETIME(0)`) запрещает обновление словарей.
 
 Можно задать интервал, внутри которого ClickHouse равномерно-случайно выберет время для обновления. Это необходимо для распределения нагрузки на источник словаря при обновлении на большом количестве серверов.
 
@@ -51,16 +51,19 @@ LIFETIME(300)
 LIFETIME(MIN 300 MAX 360)
 ```
 
+Если `<min>0</min>` и `<max>0</max>`, ClickHouse не перегружает словарь по истечению времени.
+В этм случае, ClickHouse может перезагрузить данные словаря если изменился XML файл с конфигурацией словаря или если была выполнена команда `SYSTEM RELOAD DICTIONARY`.
+
 При обновлении словарей сервер ClickHouse применяет различную логику в зависимости от типа [источника](external-dicts-dict-sources.md):
 
-> -   У текстового файла проверяется время модификации. Если время изменилось по отношению к запомненному ранее, то словарь обновляется.
-> -   Для MySQL источника, время модификации проверяется запросом `SHOW TABLE STATUS` (для MySQL 8 необходимо отключить кеширование мета-информации в MySQL `set global information_schema_stats_expiry=0`.
-> -   Словари из других источников по умолчанию обновляются каждый раз.
+-   У текстового файла проверяется время модификации. Если время изменилось по отношению к запомненному ранее, то словарь обновляется.
+-   Для MySQL источника, время модификации проверяется запросом `SHOW TABLE STATUS` (для MySQL 8 необходимо отключить кеширование мета-информации в MySQL `set global information_schema_stats_expiry=0`.
+-   Словари из других источников по умолчанию обновляются каждый раз.
 
-Для других источников (ODBC, ClickHouse и т.д.) можно настроить запрос, который позволит обновлять словари только в случае их фактического изменения, а не каждый раз. Чтобы это сделать необходимо выполнить следующие условия/действия:
+Для других источников (ODBC, PostgreSQL, ClickHouse и т.д.) можно настроить запрос, который позволит обновлять словари только в случае их фактического изменения, а не каждый раз. Чтобы это сделать необходимо выполнить следующие условия/действия:
 
-> -   В таблице словаря должно быть поле, которое гарантированно изменяется при обновлении данных в источнике.
-> -   В настройках источника указывается запрос, который получает изменяющееся поле. Результат запроса сервер ClickHouse интерпретирует как строку и если эта строка изменилась по отношению к предыдущему состоянию, то словарь обновляется. Запрос следует указывать в поле `<invalidate_query>` настроек [источника](external-dicts-dict-sources.md).
+-   В таблице словаря должно быть поле, которое гарантированно изменяется при обновлении данных в источнике.
+-   В настройках источника указывается запрос, который получает изменяющееся поле. Результат запроса сервер ClickHouse интерпретирует как строку и если эта строка изменилась по отношению к предыдущему состоянию, то словарь обновляется. Запрос следует указывать в поле `<invalidate_query>` настроек [источника](external-dicts-dict-sources.md).
 
 Пример настройки:
 
@@ -83,4 +86,3 @@ SOURCE(ODBC(... invalidate_query 'SELECT update_time FROM dictionary_source wher
 ...
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/dicts/external_dicts_dict_lifetime/) <!--hide-->
diff --git a/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md b/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md
index 3bb11b638b2..a7999470330 100644
--- a/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md
+++ b/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 43
-toc_title: "\u0418\u0441\u0442\u043e\u0447\u043d\u0438\u043a\u0438\u0020\u0432\u043d\u0435\u0448\u043d\u0438\u0445\u0020\u0441\u043b\u043e\u0432\u0430\u0440\u0435\u0439"
+toc_title: "Источники внешних словарей"
 ---
 
 # Источники внешних словарей {#dicts-external-dicts-dict-sources}
@@ -65,9 +65,11 @@ SETTINGS(format_csv_allow_single_quotes = 0)
 -   СУБД:
     -   [ODBC](#dicts-external_dicts_dict_sources-odbc)
     -   [MySQL](#dicts-external_dicts_dict_sources-mysql)
+    -   [PostgreSQL](#dicts-external_dicts_dict_sources-postgresql)
     -   [ClickHouse](#dicts-external_dicts_dict_sources-clickhouse)
     -   [MongoDB](#dicts-external_dicts_dict_sources-mongodb)
     -   [Redis](#dicts-external_dicts_dict_sources-redis)
+    -   [PostgreSQL](#dicts-external_dicts_dict_sources-postgresql)      
 
 ## Локальный файл {#dicts-external_dicts_dict_sources-local_file}
 
@@ -313,6 +315,7 @@ PRIMARY KEY id
 SOURCE(ODBC(connection_string 'DSN=myconnection' table 'postgresql_table'))
 LAYOUT(HASHED())
 LIFETIME(MIN 300 MAX 360)
+```
 
 Может понадобиться в `odbc.ini` указать полный путь до библиотеки с драйвером `DRIVER=/usr/local/lib/psqlodbcw.so`.
 
@@ -320,15 +323,15 @@ LIFETIME(MIN 300 MAX 360)
 
 ОС Ubuntu.
 
-Установка драйвера: :
+Установка драйвера:
 
 ```bash
 $ sudo apt-get install tdsodbc freetds-bin sqsh
 ```
 
-Настройка драйвера: :
+Настройка драйвера:
 
-``` bash
+```bash
     $ cat /etc/freetds/freetds.conf
     ...
 
@@ -338,8 +341,11 @@ $ sudo apt-get install tdsodbc freetds-bin sqsh
     tds version = 7.0
     client charset = UTF-8
 
+    # тестирование TDS соединения
+    $ sqsh -S MSSQL -D database -U user -P password
+
+
     $ cat /etc/odbcinst.ini
-    ...
 
     [FreeTDS]
     Description     = FreeTDS
@@ -348,8 +354,8 @@ $ sudo apt-get install tdsodbc freetds-bin sqsh
     FileUsage       = 1
     UsageCount      = 5
 
-    $ cat ~/.odbc.ini
-    ...
+    $ cat /etc/odbc.ini
+    # $ cat ~/.odbc.ini # если вы вошли из под пользователя из под которого запущен ClickHouse
 
     [MSSQL]
     Description     = FreeTDS
@@ -359,8 +365,15 @@ $ sudo apt-get install tdsodbc freetds-bin sqsh
     UID             = test
     PWD             = test
     Port            = 1433
+
+
+    # (не обязательно) тест ODBC соединения (используйте isql поставляемый вместе с [unixodbc](https://packages.debian.org/sid/unixodbc)-package)
+    $ isql -v MSSQL "user" "password"
 ```
 
+Примечание:
+- чтобы определить самую раннюю версию TDS, которая поддерживается определенной версией SQL Server, обратитесь к документации продукта или посмотрите на [MS-TDS Product Behavior](https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-tds/135d0ebe-5c4c-4a94-99bf-1811eccb9f4a)
+
 Настройка словаря в ClickHouse:
 
 ``` xml
@@ -572,7 +585,7 @@ SOURCE(CLICKHOUSE(
 или
 
 ``` sql
-SOURCE(MONGO(
+SOURCE(MONGODB(
     host 'localhost'
     port 27017
     user ''
@@ -624,4 +637,92 @@ SOURCE(REDIS(
 -   `storage_type` – способ хранения ключей. Необходимо использовать `simple` для источников с одним столбцом ключей, `hash_map` – для источников с двумя столбцами ключей. Источники с более, чем двумя столбцами ключей, не поддерживаются. Может отсутствовать, значение по умолчанию `simple`.
 -   `db_index` – номер базы данных. Может отсутствовать, значение по умолчанию 0.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/dicts/external_dicts_dict_sources/) <!--hide-->
+### Cassandra {#dicts-external_dicts_dict_sources-cassandra}
+
+Пример настройки:
+
+``` xml
+<source>
+    <cassandra>
+        <host>localhost</host>
+        <port>9042</port>
+        <user>username</user>
+        <password>qwerty123</password>
+        <keyspase>database_name</keyspase>
+        <column_family>table_name</column_family>
+        <allow_filering>1</allow_filering>
+        <partition_key_prefix>1</partition_key_prefix>
+        <consistency>One</consistency>
+        <where>"SomeColumn" = 42</where>
+        <max_threads>8</max_threads>
+    </cassandra>
+</source>
+```
+
+Поля настройки:
+- `host` – Имя хоста с установленной Cassandra или разделенный через запятую список хостов.
+- `port` – Порт на серверах Cassandra. Если не указан, используется значение по умолчанию 9042.
+- `user` – Имя пользователя  для соединения с Cassandra.
+- `password` – Пароль для соединения с Cassandra.
+- `keyspace` – Имя keyspace (база данных).
+- `column_family` – Имя семейства столбцов (таблица).
+- `allow_filering` – Флаг, разрешающий или не разрешающий потенциально дорогостоящие условия на кластеризации ключевых столбцов. Значение по умолчанию 1.
+- `partition_key_prefix` – Количество партиций ключевых столбцов в первичном ключе таблицы Cassandra.
+Необходимо для составления ключей словаря. Порядок ключевых столбцов в определении словеря должен быть таким же как в Cassandra.
+Значение по умолчанию 1 (первый ключевой столбец это ключ партицирования, остальные ключевые столбцы - ключи кластеризации).
+- `consistency` – Уровень консистентности. Возмодные значения: `One`, `Two`, `Three`,
+  `All`, `EachQuorum`, `Quorum`, `LocalQuorum`, `LocalOne`, `Serial`, `LocalSerial`. Значение по умолчанию `One`.
+- `where` – Опциональный критерий выборки.
+- `max_threads` – Максимальное кол-во тредов для загрузки данных из нескольких партиций в словарь.
+
+### PosgreSQL {#dicts-external_dicts_dict_sources-postgresql}
+
+Пример настройки:
+
+``` xml
+<source>
+  <postgresql>
+      <port>5432</port>
+      <user>clickhouse</user>
+      <password>qwerty</password>
+      <db>db_name</db>
+      <table>table_name</table>
+      <where>id=10</where>
+      <invalidate_query>SQL_QUERY</invalidate_query>
+  </postgresql>
+</source>
+```
+
+или
+
+``` sql
+SOURCE(POSTGRESQL(
+    port 5432
+    host 'postgresql-hostname'
+    user 'postgres_user'
+    password 'postgres_password'
+    db 'db_name'
+    table 'table_name'
+    replica(host 'example01-1' port 5432 priority 1)
+    replica(host 'example01-2' port 5432 priority 2)
+    where 'id=10'
+    invalidate_query 'SQL_QUERY'
+))
+```
+
+Setting fields:
+
+-   `host` – Хост для соединения с PostgreSQL. Вы можете указать его для всех реплик или задать индивидуально для каждой релпики (внутри `<replica>`).
+-   `port` – Порт для соединения с PostgreSQL. Вы можете указать его для всех реплик или задать индивидуально для каждой релпики (внутри `<replica>`).
+-   `user` – Имя пользователя для соединения с PostgreSQL. Вы можете указать его для всех реплик или задать индивидуально для каждой релпики (внутри `<replica>`).
+-   `password` – Пароль для пользователя PostgreSQL.
+-   `replica` – Section of replica configurations. There can be multiple sections.
+    - `replica/host` – хост PostgreSQL.
+    - `replica/port` – порт PostgreSQL .
+    - `replica/priority` – Приоритет реплики. Во время попытки соединения, ClickHouse будет перебирать реплики в порядке приоритет. Меньшее значение означает более высокий приоритет.
+-   `db` – Имя базы данных.
+-   `table` – Имя таблицы.
+-   `where` – Условие выборки. Синтаксис для условий такой же как для `WHERE` выражения в PostgreSQL, для примера, `id > 10 AND id < 20`. Необязательный параметр.
+-   `invalidate_query` – Запрос для проверки условия загрузки словаря. Необязательный параметр. Читайте больше в разделе [Обновление словарей](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md).
+
+
diff --git a/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md b/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md
index bf87ce61b9e..609ee225ce2 100644
--- a/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md
+++ b/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md
@@ -1,9 +1,9 @@
 ---
 toc_priority: 44
-toc_title: "\u041a\u043b\u044e\u0447\u0020\u0438\u0020\u043f\u043e\u043b\u044f\u0020\u0441\u043b\u043e\u0432\u0430\u0440\u044f"
+toc_title: "Ключ и поля словаря"
 ---
 
-# Ключ и поля словаря {#kliuch-i-polia-slovaria}
+# Ключ и поля словаря {#dictionary-key-and-fields}
 
 Секция `<structure>` описывает ключ словаря и поля, доступные для запросов.
 
@@ -88,7 +88,7 @@ PRIMARY KEY Id
 
 -   `PRIMARY KEY` – имя столбца с ключами.
 
-### Составной ключ {#sostavnoi-kliuch}
+### Составной ключ {#composite-key}
 
 Ключом может быть кортеж (`tuple`) из полей произвольных типов. В этом случае [layout](external-dicts-dict-layout.md) должен быть `complex_key_hashed` или `complex_key_cache`.
 
@@ -159,14 +159,12 @@ CREATE DICTIONARY somename (
 | Тег                                                  | Описание                                                                                                                                                                                                                                                                                                                                                      | Обязательный |
 |------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------|
 | `name`                                               | Имя столбца.                                                                                                                                                                                                                                                                                                                                                  | Да           |
-| `type`                                               | Тип данных ClickHouse.<br/>ClickHouse пытается привести значение из словаря к заданному типу данных. Например, в случае MySQL, в таблице-источнике поле может быть `TEXT`, `VARCHAR`, `BLOB`, но загружено может быть как `String`. [Nullable](../../../sql-reference/data-types/nullable.md) не поддерживается. | Да           |
-| `null_value`                                         | Значение по умолчанию для несуществующего элемента.<br/>В примере это пустая строка. Нельзя указать значение `NULL`.                                                                                                                                                                                                                                          | Да           |
+| `type`                                               | Тип данных ClickHouse.<br/>ClickHouse пытается привести значение из словаря к заданному типу данных. Например, в случае MySQL, в таблице-источнике поле может быть `TEXT`, `VARCHAR`, `BLOB`, но загружено может быть как `String`. <br/>[Nullable](../../../sql-reference/data-types/nullable.md) в настоящее время поддерживается для словарей [Flat](external-dicts-dict-layout.md#flat), [Hashed](external-dicts-dict-layout.md#dicts-external_dicts_dict_layout-hashed), [ComplexKeyHashed](external-dicts-dict-layout.md#complex-key-hashed), [Direct](external-dicts-dict-layout.md#direct), [ComplexKeyDirect](external-dicts-dict-layout.md#complex-key-direct), [RangeHashed](external-dicts-dict-layout.md#range-hashed), [Polygon](external-dicts-dict-polygon.md). Для словарей [Cache](external-dicts-dict-layout.md#cache), [ComplexKeyCache](external-dicts-dict-layout.md#complex-key-cache), [SSDCache](external-dicts-dict-layout.md#ssd-cache), [SSDComplexKeyCache](external-dicts-dict-layout.md#complex-key-ssd-cache) и [IPTrie](external-dicts-dict-layout.md#ip-trie) `Nullable`-типы не поддерживаются. | Да           |
+| `null_value`                                         | Значение по умолчанию для несуществующего элемента.<br/>В примере это пустая строка. Значение [NULL](../../syntax.md#null-literal) можно указывать только для типов `Nullable` (см. предыдущую строку с описанием типов).                                                                                                                                                                                                                                          | Да           |
 | `expression`                                         | [Выражение](../../syntax.md#syntax-expressions), которое ClickHouse выполняет со значением.<br/>Выражением может быть имя столбца в удаленной SQL базе. Таким образом, вы можете использовать его для создания псевдонима удаленного столбца.<br/><br/>Значение по умолчанию: нет выражения.                                                                  | Нет          |
-| <a name="hierarchical-dict-attr"></a> `hierarchical` | Если `true`, то атрибут содержит ключ предка для текущего элемента. Смотрите [Иерархические словари](external-dicts-dict-hierarchical.md).<br/><br/>Default value: `false`.                                                                                                                                                                                   | No           |
+| <a name="hierarchical-dict-attr"></a> `hierarchical` | Если `true`, то атрибут содержит ключ предка для текущего элемента. Смотрите [Иерархические словари](external-dicts-dict-hierarchical.md).<br/><br/>Значение по умолчанию: `false`.                                                                                                                                                                                   | Нет           |
 | `is_object_id`                                       | Признак того, что запрос выполняется к документу MongoDB по `ObjectID`.<br/><br/>Значение по умолчанию: `false`.                                                                                                                                                                                                                                              | Нет          |
 
-## Смотрите также {#smotrite-takzhe}
+**Смотрите также**
 
 -   [Функции для работы с внешними словарями](../../../sql-reference/functions/ext-dict-functions.md).
-
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/dicts/external_dicts_dict_structure/) <!--hide-->
diff --git a/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts-dict.md b/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts-dict.md
index ff18f906926..4dc74200093 100644
--- a/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts-dict.md
+++ b/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts-dict.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 40
-toc_title: "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430\u0020\u0432\u043d\u0435\u0448\u043d\u0435\u0433\u043e\u0020\u0441\u043b\u043e\u0432\u0430\u0440\u044f"
+toc_title: "Настройка внешнего словаря"
 ---
 
 # Настройка внешнего словаря {#dicts-external-dicts-dict}
@@ -48,4 +48,3 @@ LIFETIME(...) -- Lifetime of dictionary in memory
 -   [structure](external-dicts-dict-structure.md) — Структура словаря. Ключ и атрибуты, которые можно получить по ключу.
 -   [lifetime](external-dicts-dict-lifetime.md) — Периодичность обновления словарей.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/dicts/external_dicts_dict/) <!--hide-->
diff --git a/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts.md b/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts.md
index c18af68c15e..04ef24b68c5 100644
--- a/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts.md
+++ b/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 39
-toc_title: "\u0412\u043d\u0435\u0448\u043d\u0438\u0435\u0020\u0441\u043b\u043e\u0432\u0430\u0440\u0438"
+toc_title: "Внешние словари"
 ---
 
 
@@ -61,4 +61,3 @@ ClickHouse:
 -   [Ключ и поля словаря](external-dicts-dict-structure.md)
 -   [Функции для работы с внешними словарями](../../../sql-reference/functions/ext-dict-functions.md)
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/dicts/external_dicts/) <!--hide-->
diff --git a/docs/ru/sql-reference/dictionaries/external-dictionaries/index.md b/docs/ru/sql-reference/dictionaries/external-dictionaries/index.md
index b448858b1fa..c0d954d6976 100644
--- a/docs/ru/sql-reference/dictionaries/external-dictionaries/index.md
+++ b/docs/ru/sql-reference/dictionaries/external-dictionaries/index.md
@@ -1,5 +1,5 @@
 ---
-toc_folder_title: "\u0412\u043d\u0435\u0448\u043d\u0438\u0435\u0020\u0441\u043b\u043e\u0432\u0430\u0440\u0438"
+toc_folder_title: "Внешние словари"
 toc_priority: 37
 ---
 
diff --git a/docs/ru/sql-reference/dictionaries/index.md b/docs/ru/sql-reference/dictionaries/index.md
index 5a4119b4dd5..59c7518d0c5 100644
--- a/docs/ru/sql-reference/dictionaries/index.md
+++ b/docs/ru/sql-reference/dictionaries/index.md
@@ -1,7 +1,7 @@
 ---
-toc_folder_title: "\u0421\u043b\u043e\u0432\u0430\u0440\u0438"
+toc_folder_title: "Словари"
 toc_priority: 35
-toc_title: "\u0412\u0432\u0435\u0434\u0435\u043d\u0438\u0435"
+toc_title: "Введение"
 ---
 
 # Словари {#slovari}
@@ -10,11 +10,8 @@ toc_title: "\u0412\u0432\u0435\u0434\u0435\u043d\u0438\u0435"
 
 ClickHouse поддерживает специальные функции для работы со словарями, которые можно использовать в запросах. Проще и эффективнее использовать словари с помощью функций, чем `JOIN` с таблицами-справочниками.
 
-В словаре нельзя хранить значения [NULL](../../sql-reference/syntax.md#null-literal).
-
 ClickHouse поддерживает:
 
 -   [Встроенные словари](internal-dicts.md#internal_dicts) со специфическим [набором функций](../../sql-reference/dictionaries/external-dictionaries/index.md).
 -   [Подключаемые (внешние) словари](external-dictionaries/external-dicts.md#dicts-external-dicts) с [набором функций](../../sql-reference/dictionaries/external-dictionaries/index.md).
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/dicts/) <!--hide-->
diff --git a/docs/ru/sql-reference/dictionaries/internal-dicts.md b/docs/ru/sql-reference/dictionaries/internal-dicts.md
index d8103efa6ae..34e407ceacd 100644
--- a/docs/ru/sql-reference/dictionaries/internal-dicts.md
+++ b/docs/ru/sql-reference/dictionaries/internal-dicts.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 39
-toc_title: "\u0412\u0441\u0442\u0440\u043e\u0435\u043d\u043d\u044b\u0435\u0020\u0441\u043b\u043e\u0432\u0430\u0440\u0438"
+toc_title: "Встроенные словари"
 ---
 
 # Встроенные словари {#internal_dicts}
@@ -50,4 +50,3 @@ ClickHouse содержит встроенную возможность рабо
 
 Также имеются функции для работы с идентификаторами операционных систем и поисковых систем Яндекс.Метрики, пользоваться которыми не нужно.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/dicts/internal_dicts/) <!--hide-->
diff --git a/docs/ru/sql-reference/distributed-ddl.md b/docs/ru/sql-reference/distributed-ddl.md
index 275709320f6..e03ecb893bc 100644
--- a/docs/ru/sql-reference/distributed-ddl.md
+++ b/docs/ru/sql-reference/distributed-ddl.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 32
-toc_title: "\u0420\u0430\u0441\u043f\u0440\u0435\u0434\u0435\u043b\u0435\u043d\u043d\u044b\u0435\u0020\u0044\u0044\u004c\u0020\u0437\u0430\u043f\u0440\u043e\u0441\u044b\u000a"
+toc_title: "Распределенные DDL запросы"
 ---
 
 # Распределенные DDL запросы (секция ON CLUSTER) {#raspredelennye-ddl-zaprosy-sektsiia-on-cluster}
@@ -15,5 +15,4 @@ CREATE TABLE IF NOT EXISTS all_hits ON CLUSTER cluster (p Date, i Int32) ENGINE
 Для корректного выполнения таких запросов необходимо на каждом хосте иметь одинаковое определение кластера (для упрощения синхронизации конфигов можете использовать подстановки из ZooKeeper). Также необходимо подключение к ZooKeeper серверам.
 Локальная версия запроса в конечном итоге будет выполнена на каждом хосте кластера, даже если некоторые хосты в данный момент не доступны. Гарантируется упорядоченность выполнения запросов в рамках одного хоста.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/distributed-ddl) 
 <!--hide-->
\ No newline at end of file
diff --git a/docs/ru/sql-reference/functions/arithmetic-functions.md b/docs/ru/sql-reference/functions/arithmetic-functions.md
index 16c3e8fd8f0..f587b7b5b5d 100644
--- a/docs/ru/sql-reference/functions/arithmetic-functions.md
+++ b/docs/ru/sql-reference/functions/arithmetic-functions.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 34
-toc_title: "\u0410\u0440\u0438\u0444\u043c\u0435\u0442\u0438\u0447\u0435\u0441\u043a\u0438\u0435\u0020\u0444\u0443\u043d\u043a\u0446\u0438\u0438"
+toc_title: "Арифметические функции"
 ---
 
 # Арифметические функции {#arifmeticheskie-funktsii}
@@ -83,4 +83,3 @@ SELECT toTypeName(0), toTypeName(0 + 0), toTypeName(0 + 0 + 0), toTypeName(0 + 0
 Вычисляет наименьшее общее кратное чисел.
 При делении на ноль или при делении минимального отрицательного числа на минус единицу, кидается исключение.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/functions/arithmetic_functions/) <!--hide-->
diff --git a/docs/ru/sql-reference/functions/array-functions.md b/docs/ru/sql-reference/functions/array-functions.md
index 80057e6f0e0..560795506a0 100644
--- a/docs/ru/sql-reference/functions/array-functions.md
+++ b/docs/ru/sql-reference/functions/array-functions.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 35
-toc_title: "\u041c\u0430\u0441\u0441\u0438\u0432\u044b"
+toc_title: "Массивы"
 ---
 
 # Массивы {#functions-for-working-with-arrays}
@@ -58,7 +58,7 @@ toc_title: "\u041c\u0430\u0441\u0441\u0438\u0432\u044b"
 arrayConcat(arrays)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `arrays` – произвольное количество элементов типа [Array](../../sql-reference/functions/array-functions.md)
     **Пример**
@@ -108,7 +108,7 @@ SELECT has([1, 2, NULL], NULL)
 hasAll(set, subset)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `set` – массив любого типа с набором элементов.
 -   `subset` – массив любого типа со значениями, которые проверяются на вхождение в `set`.
@@ -146,7 +146,7 @@ hasAll(set, subset)
 hasAny(array1, array2)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `array1` – массив любого типа с набором элементов.
 -   `array2` – массив любого типа с набором элементов.
@@ -320,21 +320,21 @@ SELECT arrayEnumerateUniq([1, 1, 1, 2, 2, 2], [1, 1, 2, 1, 1, 2]) AS res
 arrayPopBack(array)
 ```
 
-**Параметры**
+**Аргументы**
 
--   `array` - Массив.
+-   `array` – массив.
 
 **Пример**
 
 ``` sql
-SELECT arrayPopBack([1, 2, 3]) AS res
+SELECT arrayPopBack([1, 2, 3]) AS res;
 ```
 
-text
-
-    ┌─res───┐
-    │ [1,2] │
-    └───────┘
+``` text
+┌─res───┐
+│ [1,2] │
+└───────┘
+```
 
 ## arrayPopFront {#arraypopfront}
 
@@ -344,14 +344,14 @@ text
 arrayPopFront(array)
 ```
 
-**Параметры**
+**Аргументы**
 
--   `array` - Массив.
+-   `array` – массив.
 
 **Пример**
 
 ``` sql
-SELECT arrayPopFront([1, 2, 3]) AS res
+SELECT arrayPopFront([1, 2, 3]) AS res;
 ```
 
 ``` text
@@ -368,15 +368,15 @@ SELECT arrayPopFront([1, 2, 3]) AS res
 arrayPushBack(array, single_value)
 ```
 
-**Параметры**
+**Аргументы**
 
--   `array` - Массив.
--   `single_value` - Одиночное значение. В массив с числам можно добавить только числа, в массив со строками только строки. При добавлении чисел ClickHouse автоматически приводит тип `single_value` к типу данных массива. Подробнее о типах данных в ClickHouse читайте в разделе «[Типы данных](../../sql-reference/functions/array-functions.md#data_types)». Может быть равно `NULL`. Функция добавит элемент `NULL` в массив, а тип элементов массива преобразует в `Nullable`.
+-   `array` – массив.
+-   `single_value` – значение добавляемого элемента. В массив с числам можно добавить только числа, в массив со строками только строки. При добавлении чисел ClickHouse автоматически приводит тип `single_value` к типу данных массива. Подробнее о типах данных в ClickHouse читайте в разделе «[Типы данных](../../sql-reference/functions/array-functions.md#data_types)». Может быть равно `NULL`, в этом случае функция добавит элемент `NULL` в массив, а тип элементов массива преобразует в `Nullable`.
 
 **Пример**
 
 ``` sql
-SELECT arrayPushBack(['a'], 'b') AS res
+SELECT arrayPushBack(['a'], 'b') AS res;
 ```
 
 ``` text
@@ -393,15 +393,15 @@ SELECT arrayPushBack(['a'], 'b') AS res
 arrayPushFront(array, single_value)
 ```
 
-**Параметры**
+**Аргументы**
 
--   `array` - Массив.
--   `single_value` - Одиночное значение. В массив с числам можно добавить только числа, в массив со строками только строки. При добавлении чисел ClickHouse автоматически приводит тип `single_value` к типу данных массива. Подробнее о типах данных в ClickHouse читайте в разделе «[Типы данных](../../sql-reference/functions/array-functions.md#data_types)». Может быть равно `NULL`. Функция добавит элемент `NULL` в массив, а тип элементов массива преобразует в `Nullable`.
+-   `array` – массив.
+-   `single_value` – значение добавляемого элемента. В массив с числам можно добавить только числа, в массив со строками только строки. При добавлении чисел ClickHouse автоматически приводит тип `single_value` к типу данных массива. Подробнее о типах данных в ClickHouse читайте в разделе «[Типы данных](../../sql-reference/functions/array-functions.md#data_types)». Может быть равно `NULL`, в этом случае функция добавит элемент `NULL` в массив, а тип элементов массива преобразует в `Nullable`.
 
 **Пример**
 
 ``` sql
-SELECT arrayPushFront(['b'], 'a') AS res
+SELECT arrayPushFront(['b'], 'a') AS res;
 ```
 
 ``` text
@@ -418,7 +418,7 @@ SELECT arrayPushFront(['b'], 'a') AS res
 arrayResize(array, size[, extender])
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `array` — массив.
 -   `size` — необходимая длина массива.
@@ -433,7 +433,7 @@ arrayResize(array, size[, extender])
 **Примеры вызовов**
 
 ``` sql
-SELECT arrayResize([1], 3)
+SELECT arrayResize([1], 3);
 ```
 
 ``` text
@@ -443,7 +443,7 @@ SELECT arrayResize([1], 3)
 ```
 
 ``` sql
-SELECT arrayResize([1], 3, NULL)
+SELECT arrayResize([1], 3, NULL);
 ```
 
 ``` text
@@ -460,16 +460,16 @@ SELECT arrayResize([1], 3, NULL)
 arraySlice(array, offset[, length])
 ```
 
-**Параметры**
+**Аргументы**
 
--   `array` - Массив данных.
--   `offset` - Отступ от края массива. Положительное значение - отступ слева, отрицательное значение - отступ справа. Отсчет элементов массива начинается с 1.
--   `length` - Длина необходимого среза. Если указать отрицательное значение, то функция вернёт открытый срез `[offset, array_length - length)`. Если не указать значение, то функция вернёт срез `[offset, the_end_of_array]`.
+-   `array` – массив данных.
+-   `offset` – отступ от края массива. Положительное значение - отступ слева, отрицательное значение - отступ справа. Отсчет элементов массива начинается с 1.
+-   `length` – длина необходимого среза. Если указать отрицательное значение, то функция вернёт открытый срез `[offset, array_length - length)`. Если не указать значение, то функция вернёт срез `[offset, the_end_of_array]`.
 
 **Пример**
 
 ``` sql
-SELECT arraySlice([1, 2, NULL, 4, 5], 2, 3) AS res
+SELECT arraySlice([1, 2, NULL, 4, 5], 2, 3) AS res;
 ```
 
 ``` text
@@ -702,9 +702,9 @@ SELECT arrayReverseSort((x, y) -> -y, [4, 3, 5], [1, 2, 3]) AS res;
 arrayDifference(array)
 ```
 
-**Параметры**
+**Аргументы**
 
--   `array` – [Массив](https://clickhouse.tech/docs/ru/data_types/array/).
+-   `array` – [массив](https://clickhouse.tech/docs/ru/data_types/array/).
 
 **Возвращаемое значение**
 
@@ -715,10 +715,10 @@ arrayDifference(array)
 Запрос:
 
 ``` sql
-SELECT arrayDifference([1, 2, 3, 4])
+SELECT arrayDifference([1, 2, 3, 4]);
 ```
 
-Ответ:
+Результат:
 
 ``` text
 ┌─arrayDifference([1, 2, 3, 4])─┐
@@ -731,10 +731,10 @@ SELECT arrayDifference([1, 2, 3, 4])
 Запрос:
 
 ``` sql
-SELECT arrayDifference([0, 10000000000000000000])
+SELECT arrayDifference([0, 10000000000000000000]);
 ```
 
-Ответ:
+Результат:
 
 ``` text
 ┌─arrayDifference([0, 10000000000000000000])─┐
@@ -752,9 +752,9 @@ SELECT arrayDifference([0, 10000000000000000000])
 arrayDistinct(array)
 ```
 
-**Параметры**
+**Аргументы**
 
--   `array` – [Массив](https://clickhouse.tech/docs/ru/data_types/array/).
+-   `array` – [массив](https://clickhouse.tech/docs/ru/data_types/array/).
 
 **Возвращаемое значение**
 
@@ -765,7 +765,7 @@ arrayDistinct(array)
 Запрос:
 
 ``` sql
-SELECT arrayDistinct([1, 2, 2, 3, 1])
+SELECT arrayDistinct([1, 2, 2, 3, 1]);
 ```
 
 Ответ:
@@ -820,7 +820,7 @@ SELECT
 arrayReduce(agg_func, arr1, arr2, ..., arrN)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `agg_func` — Имя агрегатной функции, которая должна быть константой [string](../../sql-reference/data-types/string.md).
 -   `arr` — Любое количество столбцов типа [array](../../sql-reference/data-types/array.md) в качестве параметров агрегатной функции.
@@ -832,10 +832,10 @@ arrayReduce(agg_func, arr1, arr2, ..., arrN)
 Запрос:
 
 ```sql
-SELECT arrayReduce('max', [1, 2, 3])
+SELECT arrayReduce('max', [1, 2, 3]);
 ```
 
-Ответ:
+Результат:
 
 ```text
 ┌─arrayReduce('max', [1, 2, 3])─┐
@@ -850,10 +850,10 @@ SELECT arrayReduce('max', [1, 2, 3])
 Запрос:
 
 ```sql
-SELECT arrayReduce('maxIf', [3, 5], [1, 0])
+SELECT arrayReduce('maxIf', [3, 5], [1, 0]);
 ```
 
-Ответ:
+Результат:
 
 ```text
 ┌─arrayReduce('maxIf', [3, 5], [1, 0])─┐
@@ -866,10 +866,10 @@ SELECT arrayReduce('maxIf', [3, 5], [1, 0])
 Запрос:
 
 ```sql
-SELECT arrayReduce('uniqUpTo(3)', [1, 2, 3, 4, 5, 6, 7, 8, 9, 10])
+SELECT arrayReduce('uniqUpTo(3)', [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
 ```
 
-Ответ:
+Результат:
 
 ```text
 ┌─arrayReduce('uniqUpTo(3)', [1, 2, 3, 4, 5, 6, 7, 8, 9, 10])─┐
@@ -887,15 +887,15 @@ SELECT arrayReduce('uniqUpTo(3)', [1, 2, 3, 4, 5, 6, 7, 8, 9, 10])
 arrayReduceInRanges(agg_func, ranges, arr1, arr2, ..., arrN)
 ```
 
-**Параметры**
+**Аргументы**
 
--   `agg_func` — Имя агрегатной функции, которая должна быть [строковой](../../sql-reference/data-types/string.md) константой.
--   `ranges` — Диапазоны для агрегирования, которые должны быть [массивом](../../sql-reference/data-types/array.md) of [кортежей](../../sql-reference/data-types/tuple.md) который содержит индекс и длину каждого диапазона.
--   `arr` — Любое количество столбцов типа [Array](../../sql-reference/data-types/array.md) в качестве параметров агрегатной функции.
+-   `agg_func` — имя агрегатной функции, которая должна быть [строковой](../../sql-reference/data-types/string.md) константой.
+-   `ranges` — диапазоны для агрегирования, которые должны быть [массивом](../../sql-reference/data-types/array.md) of [кортежей](../../sql-reference/data-types/tuple.md) содержащих индекс и длину каждого диапазона.
+-   `arr` — любое количество столбцов типа [Array](../../sql-reference/data-types/array.md) в качестве параметров агрегатной функции.
 
 **Возвращаемое значение**
 
-- Массив, содержащий результаты агрегатной функции для указанных диапазонов.
+-   Массив, содержащий результаты агрегатной функции для указанных диапазонов.
 
 Тип: [Array](../../sql-reference/data-types/array.md).
 
@@ -911,7 +911,7 @@ SELECT arrayReduceInRanges(
 ) AS res
 ```
 
-Ответ:
+Результат:
 
 ```text
 ┌─res─────────────────────────┐
@@ -958,14 +958,14 @@ flatten(array_of_arrays)
 
 Синоним: `flatten`.
 
-**Параметры**
+**Аргументы**
 
--   `array_of_arrays` — [Массив](../../sql-reference/functions/array-functions.md) массивов. Например, `[[1,2,3], [4,5]]`.
+-   `array_of_arrays` — [массив](../../sql-reference/functions/array-functions.md) массивов. Например, `[[1,2,3], [4,5]]`.
 
 **Примеры**
 
 ``` sql
-SELECT flatten([[[1]], [[2], [3]]])
+SELECT flatten([[[1]], [[2], [3]]]);
 ```
 
 ``` text
@@ -984,9 +984,9 @@ SELECT flatten([[[1]], [[2], [3]]])
 arrayCompact(arr)
 ```
 
-**Параметры**
+**Аргументы**
 
-`arr` — [Массив](../../sql-reference/functions/array-functions.md) для обхода.
+`arr` — [массив](../../sql-reference/functions/array-functions.md) для обхода.
 
 **Возвращаемое значение**
 
@@ -999,10 +999,10 @@ arrayCompact(arr)
 Запрос:
 
 ``` sql
-SELECT arrayCompact([1, 1, nan, nan, 2, 3, 3, 3])
+SELECT arrayCompact([1, 1, nan, nan, 2, 3, 3, 3]);
 ```
 
-Ответ:
+Результат:
 
 ``` text
 ┌─arrayCompact([1, 1, nan, nan, 2, 3, 3, 3])─┐
@@ -1020,9 +1020,9 @@ SELECT arrayCompact([1, 1, nan, nan, 2, 3, 3, 3])
 arrayZip(arr1, arr2, ..., arrN)
 ```
 
-**Параметры**
+**Аргументы**
 
--   `arrN` — [Массив](../data-types/array.md).
+-   `arrN` — [массив](../data-types/array.md).
 
 Функция принимает любое количество массивов, которые могут быть различных типов. Все массивы должны иметь одинаковую длину.
 
@@ -1037,10 +1037,10 @@ arrayZip(arr1, arr2, ..., arrN)
 Запрос:
 
 ``` sql
-SELECT arrayZip(['a', 'b', 'c'], [5, 2, 1])
+SELECT arrayZip(['a', 'b', 'c'], [5, 2, 1]);
 ```
 
-Ответ:
+Результат:
 
 ``` text
 ┌─arrayZip(['a', 'b', 'c'], [5, 2, 1])─┐
@@ -1067,7 +1067,7 @@ SELECT arrayMap(x -> (x + 2), [1, 2, 3]) as res;
 Следующий пример показывает, как создать кортежи из элементов разных массивов:
 
 ``` sql
-SELECT arrayMap((x, y) -> (x, y), [1, 2, 3], [4, 5, 6]) AS res
+SELECT arrayMap((x, y) -> (x, y), [1, 2, 3], [4, 5, 6]) AS res;
 ```
 
 ``` text
@@ -1111,6 +1111,78 @@ SELECT
 
 Функция `arrayFilter` является [функцией высшего порядка](../../sql-reference/functions/index.md#higher-order-functions) — в качестве первого аргумента ей нужно передать лямбда-функцию, и этот аргумент не может быть опущен.
 
+## arrayFill(func, arr1, …) {#array-fill}
+
+Перебирает `arr1` от первого элемента к последнему и заменяет `arr1[i]` на `arr1[i - 1]`, если `func` вернула 0. Первый элемент `arr1` остаётся неизменным.
+
+Примеры:
+
+``` sql
+SELECT arrayFill(x -> not isNull(x), [1, null, 3, 11, 12, null, null, 5, 6, 14, null, null]) AS res
+```
+
+``` text
+┌─res──────────────────────────────┐
+│ [1,1,3,11,12,12,12,5,6,14,14,14] │
+└──────────────────────────────────┘
+```
+
+Функция `arrayFill` является [функцией высшего порядка](../../sql-reference/functions/index.md#higher-order-functions) — в качестве первого аргумента ей нужно передать лямбда-функцию, и этот аргумент не может быть опущен.
+
+## arrayReverseFill(func, arr1, …) {#array-reverse-fill}
+
+Перебирает `arr1` от последнего элемента к первому и заменяет `arr1[i]` на `arr1[i + 1]`, если `func` вернула 0. Последний элемент `arr1` остаётся неизменным.
+
+Примеры:
+
+``` sql
+SELECT arrayReverseFill(x -> not isNull(x), [1, null, 3, 11, 12, null, null, 5, 6, 14, null, null]) AS res
+```
+
+``` text
+┌─res────────────────────────────────┐
+│ [1,3,3,11,12,5,5,5,6,14,NULL,NULL] │
+└────────────────────────────────────┘
+```
+
+Функция `arrayReverseFill` является [функцией высшего порядка](../../sql-reference/functions/index.md#higher-order-functions) — в качестве первого аргумента ей нужно передать лямбда-функцию, и этот аргумент не может быть опущен.
+
+## arraySplit(func, arr1, …) {#array-split}
+
+Разделяет массив `arr1` на несколько. Если `func` возвращает не 0, то массив разделяется, а элемент помещается в левую часть. Массив не разбивается по первому элементу.
+
+Примеры:
+
+``` sql
+SELECT arraySplit((x, y) -> y, [1, 2, 3, 4, 5], [1, 0, 0, 1, 0]) AS res
+```
+
+``` text
+┌─res─────────────┐
+│ [[1,2,3],[4,5]] │
+└─────────────────┘
+```
+
+Функция `arraySplit` является [функцией высшего порядка](../../sql-reference/functions/index.md#higher-order-functions) — в качестве первого аргумента ей нужно передать лямбда-функцию, и этот аргумент не может быть опущен.
+
+## arrayReverseSplit(func, arr1, …) {#array-reverse-split}
+
+Разделяет массив `arr1` на несколько. Если `func` возвращает не 0, то массив разделяется, а элемент помещается в правую часть. Массив не разбивается по последнему элементу.
+
+Примеры:
+
+``` sql
+SELECT arrayReverseSplit((x, y) -> y, [1, 2, 3, 4, 5], [1, 0, 0, 1, 0]) AS res
+```
+
+``` text
+┌─res───────────────┐
+│ [[1],[2,3,4],[5]] │
+└───────────────────┘
+```
+
+Функция `arrayReverseSplit` является [функцией высшего порядка](../../sql-reference/functions/index.md#higher-order-functions) — в качестве первого аргумента ей нужно передать лямбда-функцию, и этот аргумент не может быть опущен.
+
 ## arrayExists(\[func,\] arr1, …) {#arrayexistsfunc-arr1}
 
 Возвращает 1, если существует хотя бы один элемент массива `arr`, для которого функция func возвращает не 0. Иначе возвращает 0.
@@ -1137,7 +1209,7 @@ SELECT
 
 ## arrayMin {#array-min}
 
-Возвращает значение минимального элемента в исходном массиве. 
+Возвращает значение минимального элемента в исходном массиве.
 
 Если передана функция `func`, возвращается минимум из элементов массива, преобразованных этой функцией.
 
@@ -1149,7 +1221,7 @@ SELECT
 arrayMin([func,] arr)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `func` — функция. [Expression](../../sql-reference/data-types/special-data-types/expression.md).
 -   `arr` — массив. [Array](../../sql-reference/data-types/array.md).
@@ -1192,7 +1264,7 @@ SELECT arrayMin(x -> (-x), [1, 2, 4]) AS res;
 
 ## arrayMax {#array-max}
 
-Возвращает значение максимального элемента в исходном массиве. 
+Возвращает значение максимального элемента в исходном массиве.
 
 Если передана функция `func`, возвращается максимум из элементов массива, преобразованных этой функцией.
 
@@ -1204,7 +1276,7 @@ SELECT arrayMin(x -> (-x), [1, 2, 4]) AS res;
 arrayMax([func,] arr)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `func` — функция. [Expression](../../sql-reference/data-types/special-data-types/expression.md).
 -   `arr` — массив. [Array](../../sql-reference/data-types/array.md).
@@ -1247,7 +1319,7 @@ SELECT arrayMax(x -> (-x), [1, 2, 4]) AS res;
 
 ## arraySum {#array-sum}
 
-Возвращает сумму элементов в исходном массиве. 
+Возвращает сумму элементов в исходном массиве.
 
 Если передана функция `func`, возвращается сумма элементов массива, преобразованных этой функцией.
 
@@ -1259,10 +1331,10 @@ SELECT arrayMax(x -> (-x), [1, 2, 4]) AS res;
 arraySum([func,] arr)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `func` — функция. [Expression](../../sql-reference/data-types/special-data-types/expression.md).
--   `arr` — массив. [Array](../../sql-reference/data-types/array.md).   
+-   `arr` — массив. [Array](../../sql-reference/data-types/array.md).
 
 **Возвращаемое значение**
 
@@ -1302,7 +1374,7 @@ SELECT arraySum(x -> x*x, [2, 3]) AS res;
 
 ## arrayAvg {#array-avg}
 
-Возвращает среднее значение элементов в исходном массиве. 
+Возвращает среднее значение элементов в исходном массиве.
 
 Если передана функция `func`, возвращается среднее значение элементов массива, преобразованных этой функцией.
 
@@ -1314,10 +1386,10 @@ SELECT arraySum(x -> x*x, [2, 3]) AS res;
 arrayAvg([func,] arr)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `func` — функция. [Expression](../../sql-reference/data-types/special-data-types/expression.md).
--   `arr` — массив. [Array](../../sql-reference/data-types/array.md).   
+-   `arr` — массив. [Array](../../sql-reference/data-types/array.md).
 
 **Возвращаемое значение**
 
@@ -1355,6 +1427,52 @@ SELECT arrayAvg(x -> (x * x), [2, 4]) AS res;
 └─────┘
 ```
 
+**Синтаксис**
+
+``` sql
+arraySum(arr)
+```
+
+**Возвращаемое значение**
+
+-   Число.
+
+Тип: [Int](../../sql-reference/data-types/int-uint.md) или [Float](../../sql-reference/data-types/float.md).
+
+**Аргументы**
+
+-   `arr` — [массив](../../sql-reference/data-types/array.md).
+
+**Примеры**
+
+Запрос:
+
+```sql
+SELECT arraySum([2,3]) AS res;
+```
+
+Результат:
+
+``` text
+┌─res─┐
+│   5 │
+└─────┘
+```
+
+Запрос:
+
+``` sql
+SELECT arraySum(x -> x*x, [2, 3]) AS res;
+```
+
+Результат:
+
+``` text
+┌─res─┐
+│  13 │
+└─────┘
+```
+
 ## arrayCumSum(\[func,\] arr1, …) {#arraycumsumfunc-arr1}
 
 Возвращает массив из частичных сумм элементов исходного массива (сумма с накоплением). Если указана функция `func`, то значения элементов массива преобразуются этой функцией перед суммированием.
@@ -1383,7 +1501,8 @@ SELECT arrayCumSum([1, 1, 1, 1]) AS res
 arrayAUC(arr_scores, arr_labels)
 ```
 
-**Параметры**
+**Аргументы**
+
 - `arr_scores` — оценка, которую дает модель предсказания.
 - `arr_labels` — ярлыки выборок, обычно 1 для содержательных выборок и 0 для бессодержательных выборок.
 
@@ -1398,10 +1517,10 @@ arrayAUC(arr_scores, arr_labels)
 Запрос:
 
 ``` sql
-select arrayAUC([0.1, 0.4, 0.35, 0.8], [0, 0, 1, 1])
+SELECT arrayAUC([0.1, 0.4, 0.35, 0.8], [0, 0, 1, 1]);
 ```
 
-Ответ:
+Результат:
 
 ``` text
 ┌─arrayAUC([0.1, 0.4, 0.35, 0.8], [0, 0, 1, 1])─┐
@@ -1409,4 +1528,3 @@ select arrayAUC([0.1, 0.4, 0.35, 0.8], [0, 0, 1, 1])
 └────────────────────────────────────────---──┘
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/functions/array_functions/) <!--hide-->
diff --git a/docs/ru/sql-reference/functions/array-join.md b/docs/ru/sql-reference/functions/array-join.md
index 2ed3d25fa92..3e3cf5c4011 100644
--- a/docs/ru/sql-reference/functions/array-join.md
+++ b/docs/ru/sql-reference/functions/array-join.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 61
-toc_title: "\u0424\u0443\u043d\u043a\u0446\u0438\u044f\u0020\u0041\u0072\u0072\u0061\u0079\u004a\u006f\u0069\u006e"
+toc_title: "Функция ArrayJoin"
 ---
 
 # Функция ArrayJoin {#functions_arrayjoin}
@@ -32,4 +32,3 @@ SELECT arrayJoin([1, 2, 3] AS src) AS dst, 'Hello', src
 └─────┴───────────┴─────────┘
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/functions/array_join/) <!--hide-->
diff --git a/docs/ru/sql-reference/functions/bit-functions.md b/docs/ru/sql-reference/functions/bit-functions.md
index 8c7808437a5..a5124e67235 100644
--- a/docs/ru/sql-reference/functions/bit-functions.md
+++ b/docs/ru/sql-reference/functions/bit-functions.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 48
-toc_title: "\u0411\u0438\u0442\u043e\u0432\u044b\u0435\u0020\u0444\u0443\u043d\u043a\u0446\u0438\u0438"
+toc_title: "Битовые функции"
 ---
 
 # Битовые функции {#bitovye-funktsii}
@@ -31,10 +31,10 @@ toc_title: "\u0411\u0438\u0442\u043e\u0432\u044b\u0435\u0020\u0444\u0443\u043d\u
 SELECT bitTest(number, index)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `number` – целое число.
--   `index` – position of bit.
+-   `index` – позиция бита.
 
 **Возвращаемое значение**
 
@@ -49,10 +49,10 @@ SELECT bitTest(number, index)
 Запрос:
 
 ``` sql
-SELECT bitTest(43, 1)
+SELECT bitTest(43, 1);
 ```
 
-Ответ:
+Результат:
 
 ``` text
 ┌─bitTest(43, 1)─┐
@@ -65,10 +65,10 @@ SELECT bitTest(43, 1)
 Запрос:
 
 ``` sql
-SELECT bitTest(43, 2)
+SELECT bitTest(43, 2);
 ```
 
-Ответ:
+Результат:
 
 ``` text
 ┌─bitTest(43, 2)─┐
@@ -93,7 +93,7 @@ SELECT bitTest(43, 2)
 SELECT bitTestAll(number, index1, index2, index3, index4, ...)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `number` – целое число.
 -   `index1`, `index2`, `index3`, `index4` – позиция бита. Например, конъюнкция для набора позиций `index1`, `index2`, `index3`, `index4` является истинной, если все его позиции истинны `index1` ⋀ `index2` ⋀ `index3` ⋀ `index4`.
@@ -111,10 +111,10 @@ SELECT bitTestAll(number, index1, index2, index3, index4, ...)
 Запрос:
 
 ``` sql
-SELECT bitTestAll(43, 0, 1, 3, 5)
+SELECT bitTestAll(43, 0, 1, 3, 5);
 ```
 
-Ответ:
+Результат:
 
 ``` text
 ┌─bitTestAll(43, 0, 1, 3, 5)─┐
@@ -127,10 +127,10 @@ SELECT bitTestAll(43, 0, 1, 3, 5)
 Запрос:
 
 ``` sql
-SELECT bitTestAll(43, 0, 1, 3, 5, 2)
+SELECT bitTestAll(43, 0, 1, 3, 5, 2);
 ```
 
-Ответ:
+Результат:
 
 ``` text
 ┌─bitTestAll(43, 0, 1, 3, 5, 2)─┐
@@ -155,7 +155,7 @@ SELECT bitTestAll(43, 0, 1, 3, 5, 2)
 SELECT bitTestAny(number, index1, index2, index3, index4, ...)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `number` – целое число.
 -   `index1`, `index2`, `index3`, `index4` – позиции бита.
@@ -173,10 +173,10 @@ SELECT bitTestAny(number, index1, index2, index3, index4, ...)
 Запрос:
 
 ``` sql
-SELECT bitTestAny(43, 0, 2)
+SELECT bitTestAny(43, 0, 2);
 ```
 
-Ответ:
+Результат:
 
 ``` text
 ┌─bitTestAny(43, 0, 2)─┐
@@ -189,10 +189,10 @@ SELECT bitTestAny(43, 0, 2)
 Запрос:
 
 ``` sql
-SELECT bitTestAny(43, 4, 2)
+SELECT bitTestAny(43, 4, 2);
 ```
 
-Ответ:
+Результат:
 
 ``` text
 ┌─bitTestAny(43, 4, 2)─┐
@@ -210,9 +210,9 @@ SELECT bitTestAny(43, 4, 2)
 bitCount(x)
 ```
 
-**Параметры**
+**Аргументы**
 
--   `x` — [Целое число](../../sql-reference/functions/bit-functions.md) или [число с плавающей запятой](../../sql-reference/functions/bit-functions.md). Функция использует представление числа в памяти, что позволяет поддержать числа с плавающей запятой.
+-   `x` — [целое число](../../sql-reference/functions/bit-functions.md) или [число с плавающей запятой](../../sql-reference/functions/bit-functions.md). Функция использует представление числа в памяти, что позволяет поддержать числа с плавающей запятой.
 
 **Возвращаемое значение**
 
@@ -229,7 +229,7 @@ bitCount(x)
 Запрос:
 
 ``` sql
-SELECT bitCount(333)
+SELECT bitCount(333);
 ```
 
 Результат:
@@ -240,4 +240,53 @@ SELECT bitCount(333)
 └───────────────┘
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/functions/bit_functions/) <!--hide-->
+## bitHammingDistance {#bithammingdistance}
+
+Возвращает [расстояние Хэмминга](https://ru.wikipedia.org/wiki/%D0%A0%D0%B0%D1%81%D1%81%D1%82%D0%BE%D1%8F%D0%BD%D0%B8%D0%B5_%D0%A5%D1%8D%D0%BC%D0%BC%D0%B8%D0%BD%D0%B3%D0%B0) между битовыми представлениями двух целых чисел. Может быть использовано с функциями [SimHash](../../sql-reference/functions/hash-functions.md#ngramsimhash) для проверки двух строк на схожесть. Чем меньше расстояние, тем больше вероятность, что строки совпадают.
+
+**Синтаксис**
+
+``` sql
+bitHammingDistance(int1, int2)
+```
+
+**Аргументы**
+
+-   `int1` — первое целое число. [Int64](../../sql-reference/data-types/int-uint.md).
+-   `int2` — второе целое число. [Int64](../../sql-reference/data-types/int-uint.md).
+
+**Возвращаемое значение**
+
+-   Расстояние Хэмминга. 
+
+Тип: [UInt8](../../sql-reference/data-types/int-uint.md).
+
+**Примеры**
+
+Запрос:
+
+``` sql
+SELECT bitHammingDistance(111, 121);
+```
+
+Результат:
+
+``` text
+┌─bitHammingDistance(111, 121)─┐
+│                            3 │
+└──────────────────────────────┘
+```
+
+Используя [SimHash](../../sql-reference/functions/hash-functions.md#ngramsimhash):
+
+``` sql
+SELECT bitHammingDistance(ngramSimHash('cat ate rat'), ngramSimHash('rat ate cat'));
+```
+
+Результат:
+
+``` text
+┌─bitHammingDistance(ngramSimHash('cat ate rat'), ngramSimHash('rat ate cat'))─┐
+│                                                                            5 │
+└──────────────────────────────────────────────────────────────────────────────┘
+```
diff --git a/docs/ru/sql-reference/functions/bitmap-functions.md b/docs/ru/sql-reference/functions/bitmap-functions.md
index b21ddea94e4..3da729664d0 100644
--- a/docs/ru/sql-reference/functions/bitmap-functions.md
+++ b/docs/ru/sql-reference/functions/bitmap-functions.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 49
-toc_title: "\u0424\u0443\u043d\u043a\u0446\u0438\u0438\u0020\u0434\u043b\u044f\u0020\u0431\u0438\u0442\u043c\u0430\u043f\u043e\u0432"
+toc_title: "Функции для битмапов"
 ---
 
 # Функции для битовых масок {#bitmap-functions}
@@ -13,19 +13,19 @@ toc_title: "\u0424\u0443\u043d\u043a\u0446\u0438\u0438\u0020\u0434\u043b\u044f\u
 bitmapBuild(array)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `array` – массив типа `UInt*`.
 
 **Пример**
 
 ``` sql
-SELECT bitmapBuild([1, 2, 3, 4, 5]) AS res, toTypeName(res)
+SELECT bitmapBuild([1, 2, 3, 4, 5]) AS res, toTypeName(res);
 ```
 
 ``` text
 ┌─res─┬─toTypeName(bitmapBuild([1, 2, 3, 4, 5]))─────┐
-│ 
    │ AggregateFunction(groupBitmap, UInt8)    │
+│     │ AggregateFunction(groupBitmap, UInt8)        │
 └─────┴──────────────────────────────────────────────┘
 ```
 
@@ -37,14 +37,14 @@ SELECT bitmapBuild([1, 2, 3, 4, 5]) AS res, toTypeName(res)
 bitmapToArray(bitmap)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `bitmap` – битовый массив.
 
 **Пример**
 
 ``` sql
-SELECT bitmapToArray(bitmapBuild([1, 2, 3, 4, 5])) AS res
+SELECT bitmapToArray(bitmapBuild([1, 2, 3, 4, 5])) AS res;
 ```
 
 ``` text
@@ -63,11 +63,11 @@ SELECT bitmapToArray(bitmapBuild([1, 2, 3, 4, 5])) AS res
 bitmapSubsetLimit(bitmap, range_start, cardinality_limit)
 ```
 
-**Параметры**
+**Аргументы**
 
--   `bitmap` – Битмап. [Bitmap object](#bitmap_functions-bitmapbuild).
+-   `bitmap` – битмап. [Bitmap object](#bitmap_functions-bitmapbuild).
 
--   `range_start` – Начальная точка подмножества. [UInt32](../../sql-reference/functions/bitmap-functions.md#bitmap-functions).
+-   `range_start` – начальная точка подмножества. [UInt32](../../sql-reference/functions/bitmap-functions.md#bitmap-functions).
 -   `cardinality_limit` – Верхний предел подмножества. [UInt32](../../sql-reference/functions/bitmap-functions.md#bitmap-functions).
 
 **Возвращаемое значение**
@@ -81,10 +81,10 @@ bitmapSubsetLimit(bitmap, range_start, cardinality_limit)
 Запрос:
 
 ``` sql
-SELECT bitmapToArray(bitmapSubsetLimit(bitmapBuild([0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,100,200,500]), toUInt32(30), toUInt32(200))) AS res
+SELECT bitmapToArray(bitmapSubsetLimit(bitmapBuild([0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,100,200,500]), toUInt32(30), toUInt32(200))) AS res;
 ```
 
-Ответ:
+Результат:
 
 ``` text
 ┌─res───────────────────────┐
@@ -100,12 +100,11 @@ SELECT bitmapToArray(bitmapSubsetLimit(bitmapBuild([0,1,2,3,4,5,6,7,8,9,10,11,12
 bitmapContains(haystack, needle)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `haystack` – [объект Bitmap](#bitmap_functions-bitmapbuild), в котором функция ищет значение.
 -   `needle` – значение, которое функция ищет. Тип — [UInt32](../../sql-reference/data-types/int-uint.md).
 
-
 **Возвращаемые значения**
 
 -   0 — если в `haystack` нет `needle`.
@@ -116,7 +115,7 @@ bitmapContains(haystack, needle)
 **Пример**
 
 ``` sql
-SELECT bitmapContains(bitmapBuild([1,5,7,9]), toUInt32(9)) AS res
+SELECT bitmapContains(bitmapBuild([1,5,7,9]), toUInt32(9)) AS res;
 ```
 
 ``` text
@@ -135,7 +134,7 @@ bitmapHasAny(bitmap1, bitmap2)
 
 Если вы уверены, что `bitmap2` содержит строго один элемент, используйте функцию [bitmapContains](#bitmap_functions-bitmapcontains). Она работает эффективнее.
 
-**Параметры**
+**Аргументы**
 
 -   `bitmap*` – массив любого типа с набором элементов.
 
@@ -147,7 +146,7 @@ bitmapHasAny(bitmap1, bitmap2)
 **Пример**
 
 ``` sql
-SELECT bitmapHasAny(bitmapBuild([1,2,3]),bitmapBuild([3,4,5])) AS res
+SELECT bitmapHasAny(bitmapBuild([1,2,3]),bitmapBuild([3,4,5])) AS res;
 ```
 
 ``` text
@@ -165,14 +164,14 @@ SELECT bitmapHasAny(bitmapBuild([1,2,3]),bitmapBuild([3,4,5])) AS res
 bitmapHasAll(bitmap,bitmap)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `bitmap` – битовый массив.
 
 **Пример**
 
 ``` sql
-SELECT bitmapHasAll(bitmapBuild([1,2,3]),bitmapBuild([3,4,5])) AS res
+SELECT bitmapHasAll(bitmapBuild([1,2,3]),bitmapBuild([3,4,5])) AS res;
 ```
 
 ``` text
@@ -189,14 +188,14 @@ SELECT bitmapHasAll(bitmapBuild([1,2,3]),bitmapBuild([3,4,5])) AS res
 bitmapAnd(bitmap,bitmap)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `bitmap` – битовый массив.
 
 **Пример**
 
 ``` sql
-SELECT bitmapToArray(bitmapAnd(bitmapBuild([1,2,3]),bitmapBuild([3,4,5]))) AS res
+SELECT bitmapToArray(bitmapAnd(bitmapBuild([1,2,3]),bitmapBuild([3,4,5]))) AS res;
 ```
 
 ``` text
@@ -213,14 +212,14 @@ SELECT bitmapToArray(bitmapAnd(bitmapBuild([1,2,3]),bitmapBuild([3,4,5]))) AS re
 bitmapOr(bitmap,bitmap)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `bitmap` – битовый массив.
 
 **Пример**
 
 ``` sql
-SELECT bitmapToArray(bitmapOr(bitmapBuild([1,2,3]),bitmapBuild([3,4,5]))) AS res
+SELECT bitmapToArray(bitmapOr(bitmapBuild([1,2,3]),bitmapBuild([3,4,5]))) AS res;
 ```
 
 ``` text
@@ -237,14 +236,14 @@ SELECT bitmapToArray(bitmapOr(bitmapBuild([1,2,3]),bitmapBuild([3,4,5]))) AS res
 bitmapXor(bitmap,bitmap)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `bitmap` – битовый массив.
 
 **Пример**
 
 ``` sql
-SELECT bitmapToArray(bitmapXor(bitmapBuild([1,2,3]),bitmapBuild([3,4,5]))) AS res
+SELECT bitmapToArray(bitmapXor(bitmapBuild([1,2,3]),bitmapBuild([3,4,5]))) AS res;
 ```
 
 ``` text
@@ -261,14 +260,14 @@ SELECT bitmapToArray(bitmapXor(bitmapBuild([1,2,3]),bitmapBuild([3,4,5]))) AS re
 bitmapAndnot(bitmap,bitmap)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `bitmap` – битовый массив.
 
 **Пример**
 
 ``` sql
-SELECT bitmapToArray(bitmapAndnot(bitmapBuild([1,2,3]),bitmapBuild([3,4,5]))) AS res
+SELECT bitmapToArray(bitmapAndnot(bitmapBuild([1,2,3]),bitmapBuild([3,4,5]))) AS res;
 ```
 
 ``` text
@@ -285,14 +284,14 @@ SELECT bitmapToArray(bitmapAndnot(bitmapBuild([1,2,3]),bitmapBuild([3,4,5]))) AS
 bitmapCardinality(bitmap)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `bitmap` – битовый массив.
 
 **Пример**
 
 ``` sql
-SELECT bitmapCardinality(bitmapBuild([1, 2, 3, 4, 5])) AS res
+SELECT bitmapCardinality(bitmapBuild([1, 2, 3, 4, 5])) AS res;
 ```
 
 ``` text
@@ -309,7 +308,7 @@ SELECT bitmapCardinality(bitmapBuild([1, 2, 3, 4, 5])) AS res
 bitmapAndCardinality(bitmap,bitmap)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `bitmap` – битовый массив.
 
@@ -333,7 +332,7 @@ SELECT bitmapAndCardinality(bitmapBuild([1,2,3]),bitmapBuild([3,4,5])) AS res;
 bitmapOrCardinality(bitmap,bitmap)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `bitmap` – битовый массив.
 
@@ -357,7 +356,7 @@ SELECT bitmapOrCardinality(bitmapBuild([1,2,3]),bitmapBuild([3,4,5])) AS res;
 bitmapXorCardinality(bitmap,bitmap)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `bitmap` – битовый массив.
 
@@ -381,7 +380,7 @@ SELECT bitmapXorCardinality(bitmapBuild([1,2,3]),bitmapBuild([3,4,5])) AS res;
 bitmapAndnotCardinality(bitmap,bitmap)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `bitmap` – битовый массив.
 
@@ -397,4 +396,3 @@ SELECT bitmapAndnotCardinality(bitmapBuild([1,2,3]),bitmapBuild([3,4,5])) AS res
 └─────┘
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/functions/bitmap_functions/) <!--hide-->
diff --git a/docs/ru/sql-reference/functions/comparison-functions.md b/docs/ru/sql-reference/functions/comparison-functions.md
index a98c97ec96c..b7301bde275 100644
--- a/docs/ru/sql-reference/functions/comparison-functions.md
+++ b/docs/ru/sql-reference/functions/comparison-functions.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 36
-toc_title: "\u0424\u0443\u043d\u043a\u0446\u0438\u0438\u0020\u0441\u0440\u0430\u0432\u043d\u0435\u043d\u0438\u044f"
+toc_title: "Функции сравнения"
 ---
 
 # Функции сравнения {#funktsii-sravneniia}
@@ -34,4 +34,3 @@ toc_title: "\u0424\u0443\u043d\u043a\u0446\u0438\u0438\u0020\u0441\u0440\u0430\u
 
 ## greaterOrEquals, оператор `>=` {#function-greaterorequals}
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/functions/comparison_functions/) <!--hide-->
diff --git a/docs/ru/sql-reference/functions/conditional-functions.md b/docs/ru/sql-reference/functions/conditional-functions.md
index 83268b68959..b191937df51 100644
--- a/docs/ru/sql-reference/functions/conditional-functions.md
+++ b/docs/ru/sql-reference/functions/conditional-functions.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 43
-toc_title: "\u0423\u0441\u043b\u043e\u0432\u043d\u044b\u0435\u0020\u0444\u0443\u043d\u043a\u0446\u0438\u0438"
+toc_title: "Условные функции"
 ---
 
 # Условные функции {#uslovnye-funktsii}
@@ -17,11 +17,11 @@ SELECT if(cond, then, else)
 
 Если условие `cond` не равно нулю, то возвращается результат выражения `then`. Если условие `cond` равно нулю или является NULL, то результат выражения `then` пропускается и возвращается результат выражения `else`.
 
-**Параметры**
+**Аргументы**
 
--   `cond` – Условие, которое может быть равно 0 или нет. Может быть [UInt8](../../sql-reference/functions/conditional-functions.md) или `NULL`.
--   `then` - Возвращается результат выражения, если условие `cond` истинно.
--   `else` - Возвращается результат выражения, если условие `cond` ложно.
+-   `cond` – проверяемое условие. Может быть [UInt8](../../sql-reference/functions/conditional-functions.md) или `NULL`.
+-   `then` – возвращается результат выражения, если условие `cond` истинно.
+-   `else` – возвращается результат выражения, если условие `cond` ложно.
 
 **Возвращаемые значения**
 
@@ -32,10 +32,10 @@ SELECT if(cond, then, else)
 Запрос:
 
 ``` sql
-SELECT if(1, plus(2, 2), plus(2, 6))
+SELECT if(1, plus(2, 2), plus(2, 6));
 ```
 
-Ответ:
+Результат:
 
 ``` text
 ┌─plus(2, 2)─┐
@@ -46,10 +46,10 @@ SELECT if(1, plus(2, 2), plus(2, 6))
 Запрос:
 
 ``` sql
-SELECT if(0, plus(2, 2), plus(2, 6))
+SELECT if(0, plus(2, 2), plus(2, 6));
 ```
 
-Ответ:
+Результат:
 
 ``` text
 ┌─plus(2, 6)─┐
@@ -79,11 +79,11 @@ SELECT if(0, plus(2, 2), plus(2, 6))
 
     multiIf(cond_1, then_1, cond_2, then_2...else)
 
-**Параметры**
+**Аргументы**
 
--   `cond_N` — Условие, при выполнении которого функция вернёт `then_N`.
--   `then_N` — Результат функции при выполнении.
--   `else` — Результат функции, если ни одно из условий не выполнено.
+-   `cond_N` — условие, при выполнении которого функция вернёт `then_N`.
+-   `then_N` — результат функции при выполнении.
+-   `else` — результат функции, если ни одно из условий не выполнено.
 
 Функция принимает `2N+1` параметров.
 
@@ -111,4 +111,3 @@ SELECT if(0, plus(2, 2), plus(2, 6))
 └────────────────────────────────────────────┘
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/functions/conditional_functions/) <!--hide-->
diff --git a/docs/ru/sql-reference/functions/date-time-functions.md b/docs/ru/sql-reference/functions/date-time-functions.md
index 31482cde77f..0adccbe888b 100644
--- a/docs/ru/sql-reference/functions/date-time-functions.md
+++ b/docs/ru/sql-reference/functions/date-time-functions.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 39
-toc_title: "\u0424\u0443\u043d\u043a\u0446\u0438\u0438\u0020\u0434\u043b\u044f\u0020\u0440\u0430\u0431\u043e\u0442\u044b\u0020\u0441\u0020\u0434\u0430\u0442\u0430\u043c\u0438\u0020\u0438\u0020\u0432\u0440\u0435\u043c\u0435\u043d\u0435\u043c"
+toc_title: "Функции для работы с датами и временем"
 ---
 
 # Функции для работы с датами и временем {#funktsii-dlia-raboty-s-datami-i-vremenem}
@@ -23,8 +23,6 @@ SELECT
 └─────────────────────┴────────────┴────────────┴─────────────────────┘
 ```
 
-Поддерживаются только часовые пояса, отличающиеся от UTC на целое число часов.
-
 ## toTimeZone {#totimezone}
 
 Переводит дату или дату-с-временем в указанный часовой пояс. Часовой пояс (таймзона) это атрибут типов Date/DateTime, внутреннее значение (количество секунд) поля таблицы или колонки результата не изменяется, изменяется тип поля и автоматически его текстовое отображение.
@@ -63,40 +61,58 @@ int32samoa: 1546300800
 
 Переводит дату или дату-с-временем в число типа UInt16, содержащее номер года (AD).
 
+Синоним: `YEAR`.
+
 ## toQuarter {#toquarter}
 
 Переводит дату или дату-с-временем в число типа UInt8, содержащее номер квартала.
 
+Синоним: `QUARTER`.
+
 ## toMonth {#tomonth}
 
 Переводит дату или дату-с-временем в число типа UInt8, содержащее номер месяца (1-12).
 
+Синоним: `MONTH`.
+
 ## toDayOfYear {#todayofyear}
 
 Переводит дату или дату-с-временем в число типа UInt16, содержащее номер дня года (1-366).
 
+Синоним: `DAYOFYEAR`.
+
 ## toDayOfMonth {#todayofmonth}
 
 Переводит дату или дату-с-временем в число типа UInt8, содержащее номер дня в месяце (1-31).
 
+Синонимы: `DAYOFMONTH`, `DAY`.
+
 ## toDayOfWeek {#todayofweek}
 
 Переводит дату или дату-с-временем в число типа UInt8, содержащее номер дня в неделе (понедельник - 1, воскресенье - 7).
 
+Синоним: `DAYOFWEEK`.
+
 ## toHour {#tohour}
 
 Переводит дату-с-временем в число типа UInt8, содержащее номер часа в сутках (0-23).
 Функция исходит из допущения, что перевод стрелок вперёд, если осуществляется, то на час, в два часа ночи, а перевод стрелок назад, если осуществляется, то на час, в три часа ночи (что, в общем, не верно - даже в Москве два раза перевод стрелок был осуществлён в другое время).
 
+Синоним: `HOUR`.
+
 ## toMinute {#tominute}
 
 Переводит дату-с-временем в число типа UInt8, содержащее номер минуты в часе (0-59).
 
+Синоним: `MINUTE`.
+
 ## toSecond {#tosecond}
 
 Переводит дату-с-временем в число типа UInt8, содержащее номер секунды в минуте (0-59).
 Секунды координации не учитываются.
 
+Синоним: `SECOND`.
+
 ## toUnixTimestamp {#to-unix-timestamp}
 
 Переводит дату-с-временем в число типа UInt32 -- Unix Timestamp (https://en.wikipedia.org/wiki/Unix_time).
@@ -120,7 +136,7 @@ toUnixTimestamp(str, [timezone])
 Запрос:
 
 ``` sql
-SELECT toUnixTimestamp('2017-11-05 08:07:47', 'Asia/Tokyo') AS unix_timestamp
+SELECT toUnixTimestamp('2017-11-05 08:07:47', 'Asia/Tokyo') AS unix_timestamp;
 ```
 
 Результат:
@@ -146,6 +162,7 @@ SELECT toUnixTimestamp('2017-11-05 08:07:47', 'Asia/Tokyo') AS unix_timestamp
 ```sql
 SELECT toStartOfISOYear(toDate('2017-01-01')) AS ISOYear20170101;
 ```
+
 ```text
 ┌─ISOYear20170101─┐
 │      2016-01-04 │
@@ -199,14 +216,14 @@ SELECT toStartOfISOYear(toDate('2017-01-01')) AS ISOYear20170101;
 toStartOfSecond(value[, timezone])
 ```
 
-**Параметры**
+**Аргументы**
 
--   `value` — Дата и время. [DateTime64](../data-types/datetime64.md).
--   `timezone` — [Часовой пояс](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone) для возвращаемого значения (необязательно). Если параметр не задан, используется часовой пояс параметра `value`. [String](../data-types/string.md). 
+-   `value` — дата и время. [DateTime64](../data-types/datetime64.md).
+-   `timezone` — [часовой пояс](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone) для возвращаемого значения (необязательно). Если параметр не задан, используется часовой пояс параметра `value`. [String](../data-types/string.md). 
 
 **Возвращаемое значение**
 
-- Входное значение с отсеченными долями секунды.
+-   Входное значение с отсеченными долями секунды.
 
 Тип: [DateTime64](../data-types/datetime64.md).
 
@@ -240,9 +257,9 @@ WITH toDateTime64('2020-01-01 10:20:30.999', 3) AS dt64 SELECT toStartOfSecond(d
 └────────────────────────────────────────┘
 ```
 
-**См. также**
+**Смотрите также**
 
-- Часовая зона сервера, конфигурационный параметр [timezone](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone).
+-   Часовая зона сервера, конфигурационный параметр [timezone](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone).
 
 
 ## toStartOfFiveMinute {#tostartoffiveminute}
@@ -305,7 +322,9 @@ WITH toDateTime64('2020-01-01 10:20:30.999', 3) AS dt64 SELECT toStartOfSecond(d
 
 Переводит дату-с-временем или дату в число типа UInt16, содержащее номер ISO года. ISO год отличается от обычного года, потому что в соответствии с [ISO 8601:1988](https://en.wikipedia.org/wiki/ISO_8601) ISO год начинается необязательно первого января.
 
-Пример:
+**Пример**
+
+Запрос:
 
 ```sql
 SELECT
@@ -313,6 +332,9 @@ SELECT
     toYear(date),
     toISOYear(date)
 ```
+
+Результат:
+
 ```text
 ┌───────date─┬─toYear(toDate('2017-01-01'))─┬─toISOYear(toDate('2017-01-01'))─┐
 │ 2017-01-01 │                         2017 │                            2016 │
@@ -326,12 +348,18 @@ SELECT
 
 1 Января 2017 г. - воскресение, т.е. первая ISO неделя 2017 года началась в понедельник 2 января, поэтому 1 января 2017 это последняя неделя 2016 года.
 
+**Пример**
+
+Запрос:
+
 ```sql
 SELECT
     toISOWeek(toDate('2017-01-01')) AS ISOWeek20170101,
     toISOWeek(toDate('2017-01-02')) AS ISOWeek20170102
 ```
 
+Результат:
+
 ```text
 ┌─ISOWeek20170101─┬─ISOWeek20170102─┐
 │              52 │               1 │
@@ -368,10 +396,14 @@ SELECT
 
 **Пример**
 
+Запрос:
+
 ```sql
 SELECT toDate('2016-12-27') AS date, toWeek(date) AS week0, toWeek(date,1) AS week1, toWeek(date,9) AS week9;
 ```
 
+Результат:
+
 ```text
 ┌───────date─┬─week0─┬─week1─┬─week9─┐
 │ 2016-12-27 │    52 │    52 │     1 │
@@ -387,10 +419,14 @@ SELECT toDate('2016-12-27') AS date, toWeek(date) AS week0, toWeek(date,1) AS we
 
 **Пример**
 
+Запрос:
+
 ```sql
 SELECT toDate('2016-12-27') AS date, toYearWeek(date) AS yearWeek0, toYearWeek(date,1) AS yearWeek1, toYearWeek(date,9) AS yearWeek9;
 ```
 
+Результат:
+
 ```text
 ┌───────date─┬─yearWeek0─┬─yearWeek1─┬─yearWeek9─┐
 │ 2016-12-27 │    201652 │    201652 │    201701 │
@@ -409,9 +445,9 @@ date_trunc(unit, value[, timezone])
 
 Синоним: `dateTrunc`. 
 
-**Параметры**
+**Аргументы**
 
--   `unit` — Название части даты или времени. [String](../syntax.md#syntax-string-literal).
+-   `unit` — единица измерения времени, в которой задана отсекаемая часть. [String Literal](../syntax.md#syntax-string-literal).
     Возможные значения:
 
     - `second`
@@ -423,8 +459,8 @@ date_trunc(unit, value[, timezone])
     - `quarter`
     - `year`
 
--   `value` — Дата и время. [DateTime](../../sql-reference/data-types/datetime.md) или [DateTime64](../../sql-reference/data-types/datetime64.md).
--   `timezone` — [Часовой пояс](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone) для возвращаемого значения (необязательно). Если параметр не задан, используется часовой пояс параметра `value`. [String](../../sql-reference/data-types/string.md)
+-   `value` — дата и время. [DateTime](../../sql-reference/data-types/datetime.md) или [DateTime64](../../sql-reference/data-types/datetime64.md).
+-   `timezone` — [часовой пояс](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone) для возвращаемого значения (необязательно). Если параметр не задан, используется часовой пояс параметра `value`. [String](../../sql-reference/data-types/string.md)
 
 **Возвращаемое значение**
 
@@ -462,10 +498,267 @@ SELECT now(), date_trunc('hour', now(), 'Europe/Moscow');
 └─────────────────────┴────────────────────────────────────────────┘
 ```
 
-**См. также**
+**Смотрите также**
 
 -   [toStartOfInterval](#tostartofintervaltime-or-data-interval-x-unit-time-zone)
 
+## date\_add {#date_add}
+
+Добавляет интервал времени или даты к указанной дате или дате со временем.
+
+**Синтаксис** 
+
+``` sql
+date_add(unit, value, date)
+```
+
+Синонимы: `dateAdd`, `DATE_ADD`.
+
+**Аргументы**
+
+-   `unit` — единица измерения времени, в которой задан интервал для добавления. [String](../../sql-reference/data-types/string.md).
+    Возможные значения:
+
+    - `second`
+    - `minute`
+    - `hour`
+    - `day`
+    - `week`
+    - `month`
+    - `quarter`
+    - `year`
+	
+-   `value` — значение интервала для добавления. [Int](../../sql-reference/data-types/int-uint.md).
+-   `date` — дата или дата со временем, к которой добавляется `value`. [Date](../../sql-reference/data-types/date.md) или [DateTime](../../sql-reference/data-types/datetime.md).
+
+**Возвращаемое значение**
+
+Дата или дата со временем, полученная в результате добавления `value`, выраженного в `unit`, к `date`.
+
+Тип: [Date](../../sql-reference/data-types/date.md) или [DateTime](../../sql-reference/data-types/datetime.md).
+
+**Пример**
+
+Запрос:
+
+```sql
+SELECT date_add(YEAR, 3, toDate('2018-01-01'));
+```
+
+Результат:
+
+```text
+┌─plus(toDate('2018-01-01'), toIntervalYear(3))─┐
+│                                    2021-01-01 │
+└───────────────────────────────────────────────┘
+```
+
+## date\_diff {#date_diff}
+
+Вычисляет разницу между двумя значениями дат или дат со временем.
+
+**Синтаксис**
+
+``` sql
+date_diff('unit', startdate, enddate, [timezone])
+```
+
+Синонимы: `dateDiff`, `DATE_DIFF`.
+
+**Аргументы**
+
+-   `unit` — единица измерения времени, в которой будет выражено возвращаемое значение функции. [String](../../sql-reference/data-types/string.md).
+    Возможные значения:
+
+    - `second`
+    - `minute`
+    - `hour`
+    - `day`
+    - `week`
+    - `month`
+    - `quarter`
+    - `year`
+
+-   `startdate` — первая дата или дата со временем, которая вычитается из `enddate`. [Date](../../sql-reference/data-types/date.md) или [DateTime](../../sql-reference/data-types/datetime.md).
+
+-   `enddate` — вторая дата или дата со временем, из которой вычитается `startdate`. [Date](../../sql-reference/data-types/date.md) или [DateTime](../../sql-reference/data-types/datetime.md).
+
+-   `timezone` — [часовой пояс](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone) (необязательно). Если этот аргумент указан, то он применяется как для `startdate`, так и для `enddate`. Если этот аргумент не указан, то используются часовые пояса аргументов `startdate` и `enddate`. Если часовые пояса аргументов `startdate` и `enddate` не совпадают, то результат не определен. [String](../../sql-reference/data-types/string.md).
+
+**Возвращаемое значение**
+
+Разница между `enddate` и `startdate`, выраженная в `unit`.
+
+Тип: [Int](../../sql-reference/data-types/int-uint.md).
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT dateDiff('hour', toDateTime('2018-01-01 22:00:00'), toDateTime('2018-01-02 23:00:00'));
+```
+
+Результат:
+
+``` text
+┌─dateDiff('hour', toDateTime('2018-01-01 22:00:00'), toDateTime('2018-01-02 23:00:00'))─┐
+│                                                                                     25 │
+└────────────────────────────────────────────────────────────────────────────────────────┘
+```
+
+## date\_sub {#date_sub}
+
+Вычитает интервал времени или даты из указанной даты или даты со временем.
+
+**Синтаксис**
+
+``` sql
+date_sub(unit, value, date)
+```
+
+Синонимы: `dateSub`, `DATE_SUB`.
+
+**Аргументы**
+
+-   `unit` — единица измерения времени, в которой задан интервал для вычитания. [String](../../sql-reference/data-types/string.md).
+    Возможные значения:
+
+    - `second`
+    - `minute`
+    - `hour`
+    - `day`
+    - `week`
+    - `month`
+    - `quarter`
+    - `year`
+
+-   `value` — значение интервала для вычитания. [Int](../../sql-reference/data-types/int-uint.md).
+-   `date` — дата или дата со временем, из которой вычитается `value`. [Date](../../sql-reference/data-types/date.md) или [DateTime](../../sql-reference/data-types/datetime.md).
+
+**Возвращаемое значение**
+
+Дата или дата со временем, полученная в результате вычитания `value`, выраженного в `unit`, из `date`.
+
+Тип: [Date](../../sql-reference/data-types/date.md) или [DateTime](../../sql-reference/data-types/datetime.md).
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT date_sub(YEAR, 3, toDate('2018-01-01'));
+```
+
+Результат:
+
+``` text
+┌─minus(toDate('2018-01-01'), toIntervalYear(3))─┐
+│                                     2015-01-01 │
+└────────────────────────────────────────────────┘
+```
+
+## timestamp\_add {#timestamp_add}
+
+Добавляет интервал времени к указанной дате или дате со временем.
+
+**Синтаксис** 
+
+``` sql
+timestamp_add(date, INTERVAL value unit)
+```
+
+Синонимы: `timeStampAdd`, `TIMESTAMP_ADD`. 
+
+**Аргументы**
+    
+-   `date` — дата или дата со временем. [Date](../../sql-reference/data-types/date.md) или [DateTime](../../sql-reference/data-types/datetime.md).
+-   `value` — значение интервала для добавления. [Int](../../sql-reference/data-types/int-uint.md).
+-   `unit` — единица измерения времени, в которой задан интервал для добавления. [String](../../sql-reference/data-types/string.md).
+    Возможные значения:
+
+    - `second`
+    - `minute`
+    - `hour`
+    - `day`
+    - `week`
+    - `month`
+    - `quarter`
+    - `year`
+
+**Возвращаемое значение**
+
+Дата или дата со временем, полученная в результате добавления `value`, выраженного в `unit`, к `date`.
+
+Тип: [Date](../../sql-reference/data-types/date.md) или [DateTime](../../sql-reference/data-types/datetime.md).
+    
+**Пример**
+
+Запрос:
+
+```sql
+select timestamp_add(toDate('2018-01-01'), INTERVAL 3 MONTH);
+```
+
+Результат:
+
+```text
+┌─plus(toDate('2018-01-01'), toIntervalMonth(3))─┐
+│                                     2018-04-01 │
+└────────────────────────────────────────────────┘
+```
+
+## timestamp\_sub {#timestamp_sub}
+
+Вычитает интервал времени из указанной даты или даты со временем.
+
+**Синтакис** 
+
+``` sql
+timestamp_sub(unit, value, date)
+```
+
+Синонимы: `timeStampSub`, `TIMESTAMP_SUB`. 
+
+**Аргументы**
+
+-   `unit` — единица измерения времени, в которой задан интервал для вычитания. [String](../../sql-reference/data-types/string.md).
+    Возможные значения:
+
+    - `second`
+    - `minute`
+    - `hour`
+    - `day`
+    - `week`
+    - `month`
+    - `quarter`
+    - `year`
+	
+-   `value` — значение интервала для вычитания. [Int](../../sql-reference/data-types/int-uint.md).   
+-   `date` — дата или дата со временем. [Date](../../sql-reference/data-types/date.md) или [DateTime](../../sql-reference/data-types/datetime.md).
+
+**Возвращаемое значение**
+
+Дата или дата со временем, полученная в результате вычитания `value`, выраженного в `unit`, из `date`.
+
+Тип: [Date](../../sql-reference/data-types/date.md) или [DateTime](../../sql-reference/data-types/datetime.md).
+
+**Пример**
+
+Запрос:
+
+```sql
+select timestamp_sub(MONTH, 5, toDateTime('2018-12-18 01:02:03'));
+```
+
+Результат:
+
+```text
+┌─minus(toDateTime('2018-12-18 01:02:03'), toIntervalMonth(5))─┐
+│                                          2018-07-18 01:02:03 │
+└──────────────────────────────────────────────────────────────┘
+```
+
 ## now {#now}
 
 Возвращает текущую дату и время. 
@@ -478,7 +771,7 @@ now([timezone])
 
 **Параметры**
 
--   `timezone` — [часовой пояс](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone) для возвращаемого значения (необязательно). [String](../../sql-reference/data-types/string.md)
+-   `timezone` — [часовой пояс](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone) для возвращаемого значения (необязательно). [String](../../sql-reference/data-types/string.md).
 
 **Возвращаемое значение**
 
@@ -518,68 +811,13 @@ SELECT now('Europe/Moscow');
 
 ## today {#today}
 
-Принимает ноль аргументов и возвращает текущую дату на один из моментов выполнения запроса.
+Возвращает текущую дату на момент выполнения запроса. Функция не требует аргументов.
 То же самое, что toDate(now())
 
 ## yesterday {#yesterday}
 
-Принимает ноль аргументов и возвращает вчерашнюю дату на один из моментов выполнения запроса.
-Делает то же самое, что today() - 1.
-
-## dateDiff {#datediff}
-
-Вычисляет разницу между двумя значениями дат с временем.
-
-**Синтаксис**
-
-``` sql
-dateDiff('unit', startdate, enddate, [timezone])
-```
-
-**Параметры**
-
--   `unit` — Единица измерения времени, в которой будет вычислена разница между `startdate` и `enddate`. [String](../syntax.md#syntax-string-literal).
-
-        Поддерживаемые значения:
-
-        | unit   |
-        | ------ |
-        |second  |
-        |minute  |
-        |hour    |
-        |day     |
-        |week    |
-        |month   |
-        |quarter |
-        |year    |
-
--   `startdate` — Первая дата. [Date](../../sql-reference/functions/date-time-functions.md) или [DateTime](../../sql-reference/functions/date-time-functions.md).
-
--   `enddate` — Вторая дата. [Date](../../sql-reference/functions/date-time-functions.md) или [DateTime](../../sql-reference/functions/date-time-functions.md).
-
--   `timezone` — Опциональный параметр. Если определен, применяется к обоим значениям: `startdate` и `enddate`. Если не определен, используются часовые пояса `startdate` и `enddate`. Если часовые пояса не совпадают, вернется неожидаемый результат.
-
-**Возвращаемое значение**
-
-Разница между `startdate` и `enddate`, выраженная в `unit`.
-
-Тип: `int`.
-
-**Пример**
-
-Запрос:
-
-``` sql
-SELECT dateDiff('hour', toDateTime('2018-01-01 22:00:00'), toDateTime('2018-01-02 23:00:00'));
-```
-
-Ответ:
-
-``` text
-┌─dateDiff('hour', toDateTime('2018-01-01 22:00:00'), toDateTime('2018-01-02 23:00:00'))─┐
-│                                                                                     25 │
-└────────────────────────────────────────────────────────────────────────────────────────┘
-```
+Возвращает вчерашнюю дату на момент выполнения запроса.
+Делает то же самое, что today() - 1. Функция не требует аргументов.
 
 ## timeSlot {#timeslot}
 
@@ -620,6 +858,7 @@ formatDateTime(Time, Format\[, Timezone\])
 Возвращает значение времени и даты в определенном вами формате.
 
 **Поля подстановки**
+
 Используйте поля подстановки для того, чтобы определить шаблон для выводимой строки. В колонке «Пример» результат работы функции для времени `2018-01-02 22:33:44`.
 
 | Поле        | Описание                                                             | Пример     |
@@ -627,7 +866,7 @@ formatDateTime(Time, Format\[, Timezone\])
 | %C          | номер года, поделённый на 100 (00-99)                                | 20         |
 | %d          | день месяца, с ведущим нулём (01-31)                                 | 02         |
 | %D          | короткая запись %m/%d/%y                                             | 01/02/18   |
-| %e          | день месяца, с ведущим пробелом ( 1-31)                              | 2          |
+| %e          | день месяца, с ведущим пробелом ( 1-31)                              | &nbsp; 2   |
 | %F          | короткая запись %Y-%m-%d                                             | 2018-01-02 |
 | %G          | четырехзначный формат вывода ISO-года, который основывается на особом подсчете номера недели согласно [стандарту ISO 8601](https://ru.wikipedia.org/wiki/ISO_8601), обычно используется вместе с %V   | 2018       |
 | %g          | двузначный формат вывода года по стандарту ISO 8601                  | 18         |
@@ -638,6 +877,7 @@ formatDateTime(Time, Format\[, Timezone\])
 | %M          | минуты, с ведущим нулём (00-59)                                      | 33         |
 | %n          | символ переноса строки (‘’)                                          |            |
 | %p          | обозначения AM или PM                                                | PM         |
+| %Q          | квартал (1-4)                                                        | 1          |
 | %R          | короткая запись %H:%M                                                | 22:33      |
 | %S          | секунды, с ведущими нулями (00-59)                                   | 44         |
 | %t          | символ табуляции (’)                                                 |            |
@@ -654,10 +894,10 @@ formatDateTime(Time, Format\[, Timezone\])
 Запрос:
 
 ``` sql
-SELECT formatDateTime(toDate('2010-01-04'), '%g')
+SELECT formatDateTime(toDate('2010-01-04'), '%g');
 ```
 
-Ответ:
+Результат:
 
 ```
 ┌─formatDateTime(toDate('2010-01-04'), '%g')─┐
@@ -665,4 +905,42 @@ SELECT formatDateTime(toDate('2010-01-04'), '%g')
 └────────────────────────────────────────────┘
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/functions/date_time_functions/) <!--hide-->
+## FROM\_UNIXTIME {#fromunixtime}
+
+Функция преобразует Unix timestamp в календарную дату и время. 
+
+**Примеры**
+
+Если указан только один аргумент типа [Integer](../../sql-reference/data-types/int-uint.md), то функция действует так же, как [toDateTime](../../sql-reference/functions/type-conversion-functions.md#todatetime), и возвращает тип [DateTime](../../sql-reference/data-types/datetime.md).
+
+Запрос:
+
+```sql
+SELECT FROM_UNIXTIME(423543535);
+```
+
+Результат:
+
+```text
+┌─FROM_UNIXTIME(423543535)─┐
+│      1983-06-04 10:58:55 │
+└──────────────────────────┘
+```
+
+В случае, когда есть два аргумента: первый типа [Integer](../../sql-reference/data-types/int-uint.md) или [DateTime](../../sql-reference/data-types/datetime.md), а второй является строкой постоянного формата — функция работает также, как [formatDateTime](#formatdatetime), и возвращает значение типа [String](../../sql-reference/data-types/string.md#string).
+
+
+Запрос:
+
+```sql
+SELECT FROM_UNIXTIME(1234334543, '%Y-%m-%d %R:%S') AS DateTime;
+```
+
+Результат:
+
+```text
+┌─DateTime────────────┐
+│ 2009-02-11 14:42:23 │
+└─────────────────────┘
+```
+
diff --git a/docs/ru/sql-reference/functions/encoding-functions.md b/docs/ru/sql-reference/functions/encoding-functions.md
index 6f1c2aad6cb..f4fa21ba46a 100644
--- a/docs/ru/sql-reference/functions/encoding-functions.md
+++ b/docs/ru/sql-reference/functions/encoding-functions.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 52
-toc_title: "\u0424\u0443\u043d\u043a\u0446\u0438\u0438\u0020\u043a\u043e\u0434\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f"
+toc_title: "Функции кодирования"
 ---
 
 # Функции кодирования {#funktsii-kodirovaniia}
@@ -15,13 +15,13 @@ toc_title: "\u0424\u0443\u043d\u043a\u0446\u0438\u0438\u0020\u043a\u043e\u0434\u
 char(number_1, [number_2, ..., number_n]);
 ```
 
-**Параметры**
+**Аргументы**
 
--   `number_1, number_2, ..., number_n` — Числовые аргументы, которые интерпретируются как целые числа. Типы: [Int](../../sql-reference/functions/encoding-functions.md), [Float](../../sql-reference/functions/encoding-functions.md).
+-   `number_1, number_2, ..., number_n` — числовые аргументы, которые интерпретируются как целые числа. Типы: [Int](../../sql-reference/functions/encoding-functions.md), [Float](../../sql-reference/functions/encoding-functions.md).
 
 **Возвращаемое значение**
 
--   строка из соответствующих байт.
+-   Строка из соответствующих байт.
 
 Тип: `String`.
 
@@ -30,10 +30,10 @@ char(number_1, [number_2, ..., number_n]);
 Запрос:
 
 ``` sql
-SELECT char(104.1, 101, 108.9, 108.9, 111) AS hello
+SELECT char(104.1, 101, 108.9, 108.9, 111) AS hello;
 ```
 
-Ответ:
+Результат:
 
 ``` text
 ┌─hello─┐
@@ -49,7 +49,7 @@ SELECT char(104.1, 101, 108.9, 108.9, 111) AS hello
 SELECT char(0xD0, 0xBF, 0xD1, 0x80, 0xD0, 0xB8, 0xD0, 0xB2, 0xD0, 0xB5, 0xD1, 0x82) AS hello;
 ```
 
-Ответ:
+Результат:
 
 ``` text
 ┌─hello──┐
@@ -63,7 +63,7 @@ SELECT char(0xD0, 0xBF, 0xD1, 0x80, 0xD0, 0xB8, 0xD0, 0xB2, 0xD0, 0xB5, 0xD1, 0x
 SELECT char(0xE4, 0xBD, 0xA0, 0xE5, 0xA5, 0xBD) AS hello;
 ```
 
-Ответ:
+Результат:
 
 ``` text
 ┌─hello─┐
@@ -75,6 +75,8 @@ SELECT char(0xE4, 0xBD, 0xA0, 0xE5, 0xA5, 0xBD) AS hello;
 
 Returns a string containing the argument’s hexadecimal representation.
 
+Синоним: `HEX`.
+
 **Syntax**
 
 ``` sql
@@ -170,4 +172,3 @@ If you want to convert the result to a number, you can use the ‘reverse’ and
 
 Принимает целое число. Возвращает массив чисел типа UInt64, содержащий степени двойки, в сумме дающих исходное число; числа в массиве идут по возрастанию.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/functions/encoding_functions/) <!--hide-->
diff --git a/docs/ru/sql-reference/functions/encryption-functions.md b/docs/ru/sql-reference/functions/encryption-functions.md
index f1f6516d453..844f9cc3197 100644
--- a/docs/ru/sql-reference/functions/encryption-functions.md
+++ b/docs/ru/sql-reference/functions/encryption-functions.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 67
-toc_title: "\u0424\u0443\u043d\u043a\u0446\u0438\u0438 \u0434\u043b\u044f \u0448\u0438\u0444\u0440\u043e\u0432\u0430\u043d\u0438\u044f"
+toc_title: "Функции для шифрования"
 ---
 
 # Функции шифрования {#encryption-functions}
@@ -11,7 +11,7 @@ toc_title: "\u0424\u0443\u043d\u043a\u0446\u0438\u0438 \u0434\u043b\u044f \u0448
 
 Длина инициализирующего вектора всегда 16 байт (лишнии байты игнорируются). 
 
-Обратите внимание, что эти функции работают медленно.
+Обратите внимание, что до версии Clickhouse 21.1 эти функции работали медленно.
 
 ## encrypt {#encrypt}
 
@@ -31,7 +31,7 @@ toc_title: "\u0424\u0443\u043d\u043a\u0446\u0438\u0438 \u0434\u043b\u044f \u0448
 encrypt('mode', 'plaintext', 'key' [, iv, aad])
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `mode` — режим шифрования. [String](../../sql-reference/data-types/string.md#string).
 -   `plaintext` — текст, который будет зашифрован. [String](../../sql-reference/data-types/string.md#string).
@@ -41,7 +41,7 @@ encrypt('mode', 'plaintext', 'key' [, iv, aad])
 
 **Возвращаемое значение**
 
--   Зашифрованная строка. [String](../../sql-reference/data-types/string.md#string).
+-   Бинарная зашифрованная строка. [String](../../sql-reference/data-types/string.md#string).
 
 **Примеры**
 
@@ -52,57 +52,38 @@ encrypt('mode', 'plaintext', 'key' [, iv, aad])
 ``` sql
 CREATE TABLE encryption_test
 (
-    input String,
-    key String DEFAULT unhex('fb9958e2e897ef3fdb49067b51a24af645b3626eed2f9ea1dc7fd4dd71b7e38f9a68db2a3184f952382c783785f9d77bf923577108a88adaacae5c141b1576b0'),
-    iv String DEFAULT unhex('8CA3554377DFF8A369BC50A89780DD85'),
-    key32 String DEFAULT substring(key, 1, 32),
-    key24 String DEFAULT substring(key, 1, 24),
-    key16 String DEFAULT substring(key, 1, 16)
-) Engine = Memory;
+    `comment` String,
+    `secret` String
+)
+ENGINE = Memory;
 ```
 
-Вставим эти данные:
+Вставим некоторые данные (замечание: не храните ключи или инициализирующие векторы в базе данных, так как это компрометирует всю концепцию шифрования), также хранение "подсказок" небезопасно и используется только для наглядности: 
 
 Запрос:
 
 ``` sql
-INSERT INTO encryption_test (input) VALUES (''), ('text'), ('What Is ClickHouse?');
+INSERT INTO encryption_test VALUES('aes-256-cfb128 no IV', encrypt('aes-256-cfb128', 'Secret', '12345678910121314151617181920212')),\
+('aes-256-cfb128 no IV, different key', encrypt('aes-256-cfb128', 'Secret', 'keykeykeykeykeykeykeykeykeykeyke')),\
+('aes-256-cfb128 with IV', encrypt('aes-256-cfb128', 'Secret', '12345678910121314151617181920212', 'iviviviviviviviv')),\
+('aes-256-cbc no IV', encrypt('aes-256-cbc', 'Secret', '12345678910121314151617181920212'));
 ```
 
-Пример без `iv`:
-
 Запрос:
 
 ``` sql
-SELECT 'aes-128-ecb' AS mode, hex(encrypt(mode, input, key16)) FROM encryption_test;
+SELECT comment, hex(secret) FROM encryption_test;
 ```
 
 Результат:
 
 ``` text
-┌─mode────────┬─hex(encrypt('aes-128-ecb', input, key16))────────────────────────┐
-│ aes-128-ecb │ 4603E6862B0D94BBEC68E0B0DF51D60F                                 │
-│ aes-128-ecb │ 3004851B86D3F3950672DE7085D27C03                                 │
-│ aes-128-ecb │ E807F8C8D40A11F65076361AFC7D8B68D8658C5FAA6457985CAA380F16B3F7E4 │
-└─────────────┴──────────────────────────────────────────────────────────────────┘
-```
-
-Пример с `iv`:
-
-Запрос:
-
-``` sql
-SELECT 'aes-256-ctr' AS mode, hex(encrypt(mode, input, key32, iv)) FROM encryption_test;
-```
-
-Результат:
-
-``` text
-┌─mode────────┬─hex(encrypt('aes-256-ctr', input, key32, iv))─┐
-│ aes-256-ctr │                                               │
-│ aes-256-ctr │ 7FB039F7                                      │
-│ aes-256-ctr │ 5CBD20F7ABD3AC41FCAA1A5C0E119E2B325949        │
-└─────────────┴───────────────────────────────────────────────┘
+┌─comment─────────────────────────────┬─hex(secret)──────────────────────┐
+│ aes-256-cfb128 no IV                │ B4972BDC4459                     │
+│ aes-256-cfb128 no IV, different key │ 2FF57C092DC9                     │
+│ aes-256-cfb128 with IV              │ 5E6CB398F653                     │
+│ aes-256-cbc no IV                   │ 1BC0629A92450D9E73A00E7D02CF4142 │
+└─────────────────────────────────────┴──────────────────────────────────┘
 ```
 
 Пример в режиме `-gcm`:
@@ -110,41 +91,27 @@ SELECT 'aes-256-ctr' AS mode, hex(encrypt(mode, input, key32, iv)) FROM encrypti
 Запрос:
 
 ``` sql
-SELECT 'aes-256-gcm' AS mode, hex(encrypt(mode, input, key32, iv)) FROM encryption_test;
+INSERT INTO encryption_test VALUES('aes-256-gcm', encrypt('aes-256-gcm', 'Secret', '12345678910121314151617181920212', 'iviviviviviviviv')), \
+('aes-256-gcm with AAD', encrypt('aes-256-gcm', 'Secret', '12345678910121314151617181920212', 'iviviviviviviviv', 'aad'));
+
+SELECT comment, hex(secret) FROM encryption_test WHERE comment LIKE '%gcm%';
 ```
 
 Результат:
 
 ``` text
-┌─mode────────┬─hex(encrypt('aes-256-gcm', input, key32, iv))──────────────────────────┐
-│ aes-256-gcm │ E99DBEBC01F021758352D7FBD9039EFA                                       │
-│ aes-256-gcm │ 8742CE3A7B0595B281C712600D274CA881F47414                               │
-│ aes-256-gcm │ A44FD73ACEB1A64BDE2D03808A2576EDBB60764CC6982DB9AF2C33C893D91B00C60DC5 │
-└─────────────┴────────────────────────────────────────────────────────────────────────┘
-```
-
-Пример в режиме `-gcm` и с `aad`:
-
-Запрос:
-
-``` sql
-SELECT 'aes-192-gcm' AS mode, hex(encrypt(mode, input, key24, iv, 'AAD')) FROM encryption_test;
-```
-
-Результат:
-
-``` text
-┌─mode────────┬─hex(encrypt('aes-192-gcm', input, key24, iv, 'AAD'))───────────────────┐
-│ aes-192-gcm │ 04C13E4B1D62481ED22B3644595CB5DB                                       │
-│ aes-192-gcm │ 9A6CF0FD2B329B04EAD18301818F016DF8F77447                               │
-│ aes-192-gcm │ B961E9FD9B940EBAD7ADDA75C9F198A40797A5EA1722D542890CC976E21113BBB8A7AA │
-└─────────────┴────────────────────────────────────────────────────────────────────────┘
+┌─comment──────────────┬─hex(secret)──────────────────────────────────┐
+│ aes-256-gcm          │ A8A3CCBC6426CFEEB60E4EAE03D3E94204C1B09E0254 │
+│ aes-256-gcm with AAD │ A8A3CCBC6426D9A1017A0A932322F1852260A4AD6837 │
+└──────────────────────┴──────────────────────────────────────────────┘
 ```
 
 ## aes_encrypt_mysql {#aes_encrypt_mysql}
 
 Совместима с шифрованием myqsl, результат может быть расшифрован функцией [AES_DECRYPT](https://dev.mysql.com/doc/refman/8.0/en/encryption-functions.html#function_aes-decrypt).
 
+При одинаковых входящих значениях зашифрованный текст будет совпадать с результатом, возвращаемым функцией `encrypt`. Однако если `key` или `iv` длиннее, чем должны быть, `aes_encrypt_mysql` будет работать аналогично функции `aes_encrypt` в MySQL: свернет ключ и проигнорирует лишнюю часть `iv`.
+
 Функция поддерживает шифрофание данных следующими режимами:
 
 -   aes-128-ecb, aes-192-ecb, aes-256-ecb
@@ -156,86 +123,104 @@ SELECT 'aes-192-gcm' AS mode, hex(encrypt(mode, input, key24, iv, 'AAD')) FROM e
 
 **Синтаксис**
 
-```sql
+``` sql
 aes_encrypt_mysql('mode', 'plaintext', 'key' [, iv])
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `mode` — режим шифрования. [String](../../sql-reference/data-types/string.md#string).
 -   `plaintext` — текст, который будет зашифрован. [String](../../sql-reference/data-types/string.md#string).
--   `key` — ключ шифрования. [String](../../sql-reference/data-types/string.md#string).
--   `iv` — инициализирующий вектор. Необязателен. [String](../../sql-reference/data-types/string.md#string).
+-   `key` — ключ шифрования. Если ключ длиннее, чем требует режим шифрования, производится специфичная для MySQL свертка ключа. [String](../../sql-reference/data-types/string.md#string).
+-   `iv` — инициализирующий вектор. Необязателен, учитываются только первые 16 байтов. [String](../../sql-reference/data-types/string.md#string).
 
 **Возвращаемое значение**
 
--   Зашифрованная строка. [String](../../sql-reference/data-types/string.md#string).
+-   Бинарная зашифрованная строка. [String](../../sql-reference/data-types/string.md#string).
 
 **Примеры**
 
-Создадим такую таблицу:
+При одинаковых входящих значениях результаты шифрования у функций `encrypt` и `aes_encrypt_mysql`  совпадают.
 
 Запрос:
 
 ``` sql
-CREATE TABLE encryption_test
-(
-    input String,
-    key String DEFAULT unhex('fb9958e2e897ef3fdb49067b51a24af645b3626eed2f9ea1dc7fd4dd71b7e38f9a68db2a3184f952382c783785f9d77bf923577108a88adaacae5c141b1576b0'),
-    iv String DEFAULT unhex('8CA3554377DFF8A369BC50A89780DD85'),
-    key32 String DEFAULT substring(key, 1, 32),
-    key24 String DEFAULT substring(key, 1, 24),
-    key16 String DEFAULT substring(key, 1, 16)
-) Engine = Memory;
-```
-
-Вставим эти данные:
-
-Запрос:
-
-``` sql
-INSERT INTO encryption_test (input) VALUES (''), ('text'), ('What Is ClickHouse?');
-```
-
-Пример без `iv`:
-
-Запрос:
-
-``` sql
-SELECT 'aes-128-cbc' AS mode, hex(aes_encrypt_mysql(mode, input, key32)) FROM encryption_test;
+SELECT encrypt('aes-256-cfb128', 'Secret', '12345678910121314151617181920212', 'iviviviviviviviv') = aes_encrypt_mysql('aes-256-cfb128', 'Secret', '12345678910121314151617181920212', 'iviviviviviviviv') AS ciphertexts_equal;
 ```
 
 Результат:
 
 ``` text
-┌─mode────────┬─hex(aes_encrypt_mysql('aes-128-cbc', input, key32))──────────────┐
-│ aes-128-cbc │ FEA8CFDE6EE2C6E7A2CC6ADDC9F62C83                                 │
-│ aes-128-cbc │ 78B16CD4BE107660156124C5FEE6454A                                 │
-│ aes-128-cbc │ 67C0B119D96F18E2823968D42871B3D179221B1E7EE642D628341C2B29BA2E18 │
-└─────────────┴──────────────────────────────────────────────────────────────────┘
+┌─ciphertexts_equal─┐
+│                 1 │
+└───────────────────┘
 ```
 
-Пример с `iv`:
+Функция `encrypt` генерирует исключение, если `key` или `iv` длиннее чем нужно:
 
 Запрос:
 
 ``` sql
-SELECT 'aes-256-cfb128' AS mode, hex(aes_encrypt_mysql(mode, input, key32, iv)) FROM encryption_test;
+SELECT encrypt('aes-256-cfb128', 'Secret', '123456789101213141516171819202122', 'iviviviviviviviv123');
 ```
 
 Результат:
 
 ``` text
-┌─mode───────────┬─hex(aes_encrypt_mysql('aes-256-cfb128', input, key32, iv))─┐
-│ aes-256-cfb128 │                                                            │
-│ aes-256-cfb128 │ 7FB039F7                                                   │
-│ aes-256-cfb128 │ 5CBD20F7ABD3AC41FCAA1A5C0E119E2BB5174F                     │
-└────────────────┴────────────────────────────────────────────────────────────┘
+Received exception from server (version 21.1.2):
+Code: 36. DB::Exception: Received from localhost:9000. DB::Exception: Invalid key size: 33 expected 32: While processing encrypt('aes-256-cfb128', 'Secret', '123456789101213141516171819202122', 'iviviviviviviviv123'). 
+```
+
+Однако функция `aes_encrypt_mysql` в аналогичном случае возвращает результат, который может быть обработан MySQL:
+
+Запрос:
+
+``` sql
+SELECT hex(aes_encrypt_mysql('aes-256-cfb128', 'Secret', '123456789101213141516171819202122', 'iviviviviviviviv123')) AS ciphertext;
+```
+
+Результат:
+
+```text
+┌─ciphertext───┐
+│ 24E9E4966469 │
+└──────────────┘
+```
+
+Если передать `iv` еще длиннее, результат останется таким же:
+
+Запрос:
+
+``` sql
+SELECT hex(aes_encrypt_mysql('aes-256-cfb128', 'Secret', '123456789101213141516171819202122', 'iviviviviviviviv123456')) AS ciphertext
+```
+
+Результат:
+
+``` text
+┌─ciphertext───┐
+│ 24E9E4966469 │
+└──────────────┘
+```
+
+Это совпадает с результатом, возвращаемым MySQL при таких же входящих значениях:
+
+``` sql
+mysql> SET  block_encryption_mode='aes-256-cfb128';
+Query OK, 0 rows affected (0.00 sec)
+
+mysql> SELECT aes_encrypt('Secret', '123456789101213141516171819202122', 'iviviviviviviviv123456') as ciphertext;
++------------------------+
+| ciphertext             |
++------------------------+
+| 0x24E9E4966469         |
++------------------------+
+1 row in set (0.00 sec)
 ```
 
 ## decrypt {#decrypt}
 
-Функция поддерживает расшифровку данных следующими режимами:
+Функция расшифровывает зашифрованный текст и может работать в следующих режимах:
 
 -   aes-128-ecb, aes-192-ecb, aes-256-ecb
 -   aes-128-cbc, aes-192-cbc, aes-256-cbc
@@ -247,17 +232,17 @@ SELECT 'aes-256-cfb128' AS mode, hex(aes_encrypt_mysql(mode, input, key32, iv))
 
 **Синтаксис**
 
-```sql
+``` sql
 decrypt('mode', 'ciphertext', 'key' [, iv, aad])
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `mode` — режим шифрования. [String](../../sql-reference/data-types/string.md#string).
 -   `ciphertext` — зашифрованный текст, который будет расшифрован. [String](../../sql-reference/data-types/string.md#string).
 -   `key` — ключ шифрования. [String](../../sql-reference/data-types/string.md#string).
 -   `iv` — инициализирующий вектор. Обязателен для `-gcm` режимов, для остальных режимов опциональный. [String](../../sql-reference/data-types/string.md#string).
--   `aad` —  дополнительные аутентифицированные данные. Текст не будет расшифрован, если это значение неверно. Работает только с `-gcm` режимами. Для остальных вызовет исключение. [String](../../sql-reference/data-types/string.md#string).
+-   `aad` — дополнительные аутентифицированные данные. Текст не будет расшифрован, если это значение неверно. Работает только с `-gcm` режимами. Для остальных вызовет исключение. [String](../../sql-reference/data-types/string.md#string).
 
 **Возвращаемое значение**
 
@@ -265,52 +250,58 @@ decrypt('mode', 'ciphertext', 'key' [, iv, aad])
 
 **Примеры**
 
-Создадим такую таблицу:
+Рассмотрим таблицу из примера для функции [encrypt](#encrypt).
 
 Запрос:
 
 ``` sql
-CREATE TABLE encryption_test
-(
-    input String,
-    key String DEFAULT unhex('fb9958e2e897ef3fdb49067b51a24af645b3626eed2f9ea1dc7fd4dd71b7e38f9a68db2a3184f952382c783785f9d77bf923577108a88adaacae5c141b1576b0'),
-    iv String DEFAULT unhex('8CA3554377DFF8A369BC50A89780DD85'),
-    key32 String DEFAULT substring(key, 1, 32),
-    key24 String DEFAULT substring(key, 1, 24),
-    key16 String DEFAULT substring(key, 1, 16)
-) Engine = Memory;
-```
-
-Вставим эти данные:
-
-Запрос:
-
-``` sql
-INSERT INTO encryption_test (input) VALUES (''), ('text'), ('What Is ClickHouse?');
-```
-
-Запрос:
-
-``` sql
-
-SELECT 'aes-128-ecb' AS mode, decrypt(mode, encrypt(mode, input, key16), key16) FROM encryption_test;
+SELECT comment, hex(secret) FROM encryption_test;
 ```
 
 Результат:
 
-```text
-┌─mode────────┬─decrypt('aes-128-ecb', encrypt('aes-128-ecb', input, key16), key16)─┐
-│ aes-128-ecb │                                                                     │
-│ aes-128-ecb │ text                                                                │
-│ aes-128-ecb │ What Is ClickHouse?                                                 │
-└─────────────┴─────────────────────────────────────────────────────────────────────┘
+``` text
+┌─comment──────────────┬─hex(secret)──────────────────────────────────┐
+│ aes-256-gcm          │ A8A3CCBC6426CFEEB60E4EAE03D3E94204C1B09E0254 │
+│ aes-256-gcm with AAD │ A8A3CCBC6426D9A1017A0A932322F1852260A4AD6837 │
+└──────────────────────┴──────────────────────────────────────────────┘
+┌─comment─────────────────────────────┬─hex(secret)──────────────────────┐
+│ aes-256-cfb128 no IV                │ B4972BDC4459                     │
+│ aes-256-cfb128 no IV, different key │ 2FF57C092DC9                     │
+│ aes-256-cfb128 with IV              │ 5E6CB398F653                     │
+│ aes-256-cbc no IV                   │ 1BC0629A92450D9E73A00E7D02CF4142 │
+└─────────────────────────────────────┴──────────────────────────────────┘
 ```
 
+Теперь попытаемся расшифровать эти данные:
+
+Запрос:
+
+``` sql
+SELECT comment, decrypt('aes-256-cfb128', secret, '12345678910121314151617181920212') as plaintext FROM encryption_test;
+```
+
+Результат:
+
+``` text
+┌─comment─────────────────────────────┬─plaintext─┐
+│ aes-256-cfb128 no IV                │ Secret    │
+│ aes-256-cfb128 no IV, different key │ �4�
+                                           �         │
+│ aes-256-cfb128 with IV              │ ���6�~        │
+ │aes-256-cbc no IV                   │ �2*4�h3c�4w��@
+└─────────────────────────────────────┴───────────┘
+```
+
+Обратите внимание, что только часть данных была расшифрована верно. Оставшаяся часть расшифрована некорректно, так как при шифровании использовались другие значения `mode`, `key`, или `iv`.
+
 ## aes_decrypt_mysql {#aes_decrypt_mysql}
 
 Совместима с шифрованием myqsl и может расшифровать данные, зашифрованные функцией [AES_ENCRYPT](https://dev.mysql.com/doc/refman/8.0/en/encryption-functions.html#function_aes-encrypt). 
 
-Функция поддерживает расшифровку данных следующими режимами:
+При одинаковых входящих значениях расшифрованный текст будет совпадать с результатом, возвращаемым функцией `decrypt`. Однако если `key` или `iv` длиннее, чем должны быть, `aes_decrypt_mysql` будет работать аналогично функции `aes_decrypt` в MySQL: свернет ключ и проигнорирует лишнюю часть `iv`.
+
+Функция поддерживает расшифровку данных в следующих режимах:
 
 -   aes-128-ecb, aes-192-ecb, aes-256-ecb
 -   aes-128-cbc, aes-192-cbc, aes-256-cbc
@@ -321,62 +312,50 @@ SELECT 'aes-128-ecb' AS mode, decrypt(mode, encrypt(mode, input, key16), key16)
 
 **Синтаксис**
 
-```sql
+``` sql
 aes_decrypt_mysql('mode', 'ciphertext', 'key' [, iv])
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `mode` — режим шифрования. [String](../../sql-reference/data-types/string.md#string).
 -   `ciphertext` — зашифрованный текст, который будет расшифрован. [String](../../sql-reference/data-types/string.md#string).
 -   `key` — ключ шифрования. [String](../../sql-reference/data-types/string.md#string).
 -   `iv` — инициализирующий вектор. Необязателен. [String](../../sql-reference/data-types/string.md#string).
 
-
 **Возвращаемое значение**
 
 -   Расшифрованная строка. [String](../../sql-reference/data-types/string.md#string).
 
 **Примеры**
 
-Создадим такую таблицу:
+Расшифруем данные, которые до этого были зашифрованы в MySQL:
 
-Запрос:
 
 ``` sql
-CREATE TABLE encryption_test
-(
-    input String,
-    key String DEFAULT unhex('fb9958e2e897ef3fdb49067b51a24af645b3626eed2f9ea1dc7fd4dd71b7e38f9a68db2a3184f952382c783785f9d77bf923577108a88adaacae5c141b1576b0'),
-    iv String DEFAULT unhex('8CA3554377DFF8A369BC50A89780DD85'),
-    key32 String DEFAULT substring(key, 1, 32),
-    key24 String DEFAULT substring(key, 1, 24),
-    key16 String DEFAULT substring(key, 1, 16)
-) Engine = Memory;
-```
+mysql> SET  block_encryption_mode='aes-256-cfb128';
+Query OK, 0 rows affected (0.00 sec)
 
-Вставим эти данные:
-
-Запрос:
-
-``` sql
-INSERT INTO encryption_test (input) VALUES (''), ('text'), ('What Is ClickHouse?');
+mysql> SELECT aes_encrypt('Secret', '123456789101213141516171819202122', 'iviviviviviviviv123456') as ciphertext;
++------------------------+
+| ciphertext             |
++------------------------+
+| 0x24E9E4966469         |
++------------------------+
+1 row in set (0.00 sec)
 ```
 
 Запрос:
 
 ``` sql
-SELECT 'aes-128-cbc' AS mode, aes_decrypt_mysql(mode, aes_encrypt_mysql(mode, input, key), key) FROM encryption_test;
+SELECT aes_decrypt_mysql('aes-256-cfb128', unhex('24E9E4966469'), '123456789101213141516171819202122', 'iviviviviviviviv123456') AS plaintext;
 ```
 
 Результат:
 
 ``` text
-┌─mode────────┬─aes_decrypt_mysql('aes-128-cbc', aes_encrypt_mysql('aes-128-cbc', input, key), key)─┐
-│ aes-128-cbc │                                                                                     │
-│ aes-128-cbc │ text                                                                                │
-│ aes-128-cbc │ What Is ClickHouse?                                                                 │
-└─────────────┴─────────────────────────────────────────────────────────────────────────────────────┘
+┌─plaintext─┐
+│ Secret    │
+└───────────┘
 ```
-
 [Original article](https://clickhouse.tech/docs/ru/sql-reference/functions/encryption_functions/) <!--hide-->
diff --git a/docs/ru/sql-reference/functions/ext-dict-functions.md b/docs/ru/sql-reference/functions/ext-dict-functions.md
index 6054ed141d4..919f8ebe276 100644
--- a/docs/ru/sql-reference/functions/ext-dict-functions.md
+++ b/docs/ru/sql-reference/functions/ext-dict-functions.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 58
-toc_title: "\u0424\u0443\u043d\u043a\u0446\u0438\u0438\u0020\u0434\u043b\u044f\u0020\u0440\u0430\u0431\u043e\u0442\u044b\u0020\u0441\u0020\u0432\u043d\u0435\u0448\u043d\u0438\u043c\u0438\u0020\u0441\u043b\u043e\u0432\u0430\u0440\u044f\u043c\u0438"
+toc_title: "Функции для работы с внешними словарями"
 ---
 
 # Функции для работы с внешними словарями {#ext_dict_functions}
@@ -16,7 +16,7 @@ dictGet('dict_name', 'attr_name', id_expr)
 dictGetOrDefault('dict_name', 'attr_name', id_expr, default_value_expr)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `dict_name` — имя словаря. [Строковый литерал](../syntax.md#syntax-string-literal).
 -   `attr_name` — имя столбца словаря. [Строковый литерал](../syntax.md#syntax-string-literal).
@@ -105,7 +105,7 @@ LIMIT 3
 dictHas('dict_name', id)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `dict_name` — имя словаря. [Строковый литерал](../syntax.md#syntax-string-literal).
 -   `id_expr` — значение ключа словаря. [Выражение](../syntax.md#syntax-expressions), возвращающее значение типа [UInt64](../../sql-reference/functions/ext-dict-functions.md) или [Tuple](../../sql-reference/functions/ext-dict-functions.md) в зависимости от конфигурации словаря.
@@ -127,7 +127,7 @@ dictHas('dict_name', id)
 dictGetHierarchy('dict_name', key)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `dict_name` — имя словаря. [Строковый литерал](../syntax.md#syntax-string-literal).
 -   `key` — значение ключа. [Выражение](../syntax.md#syntax-expressions), возвращающее значение типа [UInt64](../../sql-reference/functions/ext-dict-functions.md).
@@ -144,7 +144,7 @@ Type: [Array(UInt64)](../../sql-reference/functions/ext-dict-functions.md).
 
 `dictIsIn ('dict_name', child_id_expr, ancestor_id_expr)`
 
-**Параметры**
+**Аргументы**
 
 -   `dict_name` — имя словаря. [Строковый литерал](../syntax.md#syntax-string-literal).
 -   `child_id_expr` — ключ для проверки. [Выражение](../syntax.md#syntax-expressions), возвращающее значение типа [UInt64](../../sql-reference/functions/ext-dict-functions.md).
@@ -180,12 +180,12 @@ dictGet[Type]('dict_name', 'attr_name', id_expr)
 dictGet[Type]OrDefault('dict_name', 'attr_name', id_expr, default_value_expr)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `dict_name` — имя словаря. [Строковый литерал](../syntax.md#syntax-string-literal).
 -   `attr_name` — имя столбца словаря. [Строковый литерал](../syntax.md#syntax-string-literal).
 -   `id_expr` — значение ключа словаря. [Выражение](../syntax.md#syntax-expressions), возвращающее значение типа [UInt64](../../sql-reference/functions/ext-dict-functions.md) или [Tuple](../../sql-reference/functions/ext-dict-functions.md) в зависимости от конфигурации словаря.
--   `default_value_expr` — значение, возвращаемое в том случае, когда словарь не содержит строки с заданным ключом `id_expr`. [Выражение](../syntax.md#syntax-expressions) возвращающее значение с типом данных, сконфигурированным для атрибута `attr_name`.
+-   `default_value_expr` — значение, возвращаемое в том случае, когда словарь не содержит строки с заданным ключом `id_expr`. [Выражение](../syntax.md#syntax-expressions), возвращающее значение с типом данных, сконфигурированным для атрибута `attr_name`.
 
 **Возвращаемое значение**
 
@@ -198,4 +198,3 @@ dictGet[Type]OrDefault('dict_name', 'attr_name', id_expr, default_value_expr)
 
 Если значение атрибута не удалось обработать или оно не соответствует типу данных атрибута, то ClickHouse генерирует исключение.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/functions/ext_dict_functions/) <!--hide-->
diff --git a/docs/ru/sql-reference/functions/files.md b/docs/ru/sql-reference/functions/files.md
new file mode 100644
index 00000000000..9cb659375b9
--- /dev/null
+++ b/docs/ru/sql-reference/functions/files.md
@@ -0,0 +1,33 @@
+---
+toc_priority: 43
+toc_title: "Функции для работы с файлами"
+---
+
+# Функции для работы с файлами {#funktsii-dlia-raboty-s-failami}
+
+## file {#file}
+
+Читает файл как строку. Содержимое файла не разбирается (не парсится) и записывается в указанную колонку в виде единой строки.
+
+**Синтаксис**
+
+``` sql
+file(path)
+```
+
+**Аргументы**
+
+-   `path` — относительный путь до файла от [user_files_path](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-user_files_path). Путь к файлу может включать следующие символы подстановки и шаблоны: `*`, `?`, `{abc,def}` и `{N..M}`, где `N`, `M` — числа, `'abc', 'def'` — строки.
+
+**Примеры**
+
+Вставка данных из файлов a.txt и b.txt в таблицу в виде строк:
+
+``` sql
+INSERT INTO table SELECT file('a.txt'), file('b.txt');
+```
+
+**Смотрите также**
+
+-   [user_files_path](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-user_files_path)
+-   [file](../table-functions/file.md)
diff --git a/docs/ru/sql-reference/functions/functions-for-nulls.md b/docs/ru/sql-reference/functions/functions-for-nulls.md
index 17da1ea9194..365dba75da7 100644
--- a/docs/ru/sql-reference/functions/functions-for-nulls.md
+++ b/docs/ru/sql-reference/functions/functions-for-nulls.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 63
-toc_title: "\u0424\u0443\u043d\u043a\u0446\u0438\u0438\u0020\u0434\u043b\u044f\u0020\u0440\u0430\u0431\u043e\u0442\u044b\u0020\u0441\u0020\u004e\u0075\u006c\u006c\u0061\u0062\u006c\u0065\u002d\u0430\u0440\u0433\u0443\u043c\u0435\u043d\u0442\u0430\u043c\u0438"
+toc_title: "Функции для работы с Nullable-аргументами"
 ---
 
 # Функции для работы с Nullable-аргументами {#funktsii-dlia-raboty-s-nullable-argumentami}
@@ -13,7 +13,9 @@ toc_title: "\u0424\u0443\u043d\u043a\u0446\u0438\u0438\u0020\u0434\u043b\u044f\u
 isNull(x)
 ```
 
-**Параметры**
+Синоним: `ISNULL`.
+
+**Аргументы**
 
 -   `x` — значение с не составным типом данных.
 
@@ -36,7 +38,7 @@ isNull(x)
 Запрос
 
 ``` sql
-SELECT x FROM t_null WHERE isNull(y)
+SELECT x FROM t_null WHERE isNull(y);
 ```
 
 ``` text
@@ -53,7 +55,7 @@ SELECT x FROM t_null WHERE isNull(y)
 isNotNull(x)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `x` — значение с не составным типом данных.
 
@@ -76,7 +78,7 @@ isNotNull(x)
 Запрос
 
 ``` sql
-SELECT x FROM t_null WHERE isNotNull(y)
+SELECT x FROM t_null WHERE isNotNull(y);
 ```
 
 ``` text
@@ -93,7 +95,7 @@ SELECT x FROM t_null WHERE isNotNull(y)
 coalesce(x,...)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   Произвольное количество параметров не составного типа. Все параметры должны быть совместимы по типу данных.
 
@@ -118,7 +120,7 @@ coalesce(x,...)
 Получим из адресной книги первый доступный способ связаться с клиентом:
 
 ``` sql
-SELECT coalesce(mail, phone, CAST(icq,'Nullable(String)')) FROM aBook
+SELECT coalesce(mail, phone, CAST(icq,'Nullable(String)')) FROM aBook;
 ```
 
 ``` text
@@ -136,7 +138,7 @@ SELECT coalesce(mail, phone, CAST(icq,'Nullable(String)')) FROM aBook
 ifNull(x,alt)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `x` — значение для проверки на `NULL`,
 -   `alt` — значение, которое функция вернёт, если `x` — `NULL`.
@@ -149,7 +151,7 @@ ifNull(x,alt)
 **Пример**
 
 ``` sql
-SELECT ifNull('a', 'b')
+SELECT ifNull('a', 'b');
 ```
 
 ``` text
@@ -159,7 +161,7 @@ SELECT ifNull('a', 'b')
 ```
 
 ``` sql
-SELECT ifNull(NULL, 'b')
+SELECT ifNull(NULL, 'b');
 ```
 
 ``` text
@@ -176,7 +178,7 @@ SELECT ifNull(NULL, 'b')
 nullIf(x, y)
 ```
 
-**Параметры**
+**Аргументы**
 
 `x`, `y` — значения для сравнивания. Они должны быть совместимых типов, иначе ClickHouse сгенерирует исключение.
 
@@ -188,7 +190,7 @@ nullIf(x, y)
 **Пример**
 
 ``` sql
-SELECT nullIf(1, 1)
+SELECT nullIf(1, 1);
 ```
 
 ``` text
@@ -198,7 +200,7 @@ SELECT nullIf(1, 1)
 ```
 
 ``` sql
-SELECT nullIf(1, 2)
+SELECT nullIf(1, 2);
 ```
 
 ``` text
@@ -215,7 +217,7 @@ SELECT nullIf(1, 2)
 assumeNotNull(x)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `x` — исходное значение.
 
@@ -229,7 +231,7 @@ assumeNotNull(x)
 Рассмотрим таблицу `t_null`.
 
 ``` sql
-SHOW CREATE TABLE t_null
+SHOW CREATE TABLE t_null;
 ```
 
 ``` text
@@ -248,7 +250,7 @@ SHOW CREATE TABLE t_null
 Применим функцию `assumeNotNull` к столбцу `y`.
 
 ``` sql
-SELECT assumeNotNull(y) FROM t_null
+SELECT assumeNotNull(y) FROM t_null;
 ```
 
 ``` text
@@ -259,7 +261,7 @@ SELECT assumeNotNull(y) FROM t_null
 ```
 
 ``` sql
-SELECT toTypeName(assumeNotNull(y)) FROM t_null
+SELECT toTypeName(assumeNotNull(y)) FROM t_null;
 ```
 
 ``` text
@@ -277,7 +279,7 @@ SELECT toTypeName(assumeNotNull(y)) FROM t_null
 toNullable(x)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `x` — значение произвольного не составного типа.
 
@@ -288,7 +290,7 @@ toNullable(x)
 **Пример**
 
 ``` sql
-SELECT toTypeName(10)
+SELECT toTypeName(10);
 ```
 
 ``` text
@@ -298,7 +300,7 @@ SELECT toTypeName(10)
 ```
 
 ``` sql
-SELECT toTypeName(toNullable(10))
+SELECT toTypeName(toNullable(10));
 ```
 
 ``` text
@@ -307,4 +309,3 @@ SELECT toTypeName(toNullable(10))
 └────────────────────────────┘
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/functions/functions_for_nulls/) <!--hide-->
diff --git a/docs/ru/sql-reference/functions/geo/coordinates.md b/docs/ru/sql-reference/functions/geo/coordinates.md
index 1931a9b932f..2605dc7a82f 100644
--- a/docs/ru/sql-reference/functions/geo/coordinates.md
+++ b/docs/ru/sql-reference/functions/geo/coordinates.md
@@ -1,5 +1,5 @@
 ---
-toc_title: "\u0424\u0443\u043d\u043a\u0446\u0438\u0438\u0020\u0434\u043b\u044f\u0020\u0440\u0430\u0431\u043e\u0442\u044b\u0020\u0441\u0020\u0433\u0435\u043e\u0433\u0440\u0430\u0444\u0438\u0447\u0435\u0441\u043a\u0438\u043c\u0438\u0020\u043a\u043e\u043e\u0440\u0434\u0438\u043d\u0430\u0442\u0430\u043c\u0438"
+toc_title: "Функции для работы с географическими координатами"
 toc_priority: 62
 ---
 
@@ -133,4 +133,3 @@ SELECT pointInPolygon((3., 3.), [(6, 0), (8, 4), (5, 8), (0, 2)]) AS res
 └─────┘
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/functions/geo/coordinates) <!--hide-->
diff --git a/docs/ru/sql-reference/functions/geo/geohash.md b/docs/ru/sql-reference/functions/geo/geohash.md
index 38c64f11b10..0992b620e60 100644
--- a/docs/ru/sql-reference/functions/geo/geohash.md
+++ b/docs/ru/sql-reference/functions/geo/geohash.md
@@ -1,5 +1,5 @@
 ---
-toc_title: "\u0424\u0443\u043d\u043a\u0446\u0438\u0438\u0020\u0434\u043b\u044f\u0020\u0440\u0430\u0431\u043e\u0442\u044b\u0020\u0441\u0020\u0441\u0438\u0441\u0442\u0435\u043c\u043e\u0439\u0020\u0047\u0065\u006f\u0068\u0061\u0073\u0068"
+toc_title: "Функции для работы с системой Geohash"
 ---
 
 # Функции для работы с системой Geohash {#geohash}
@@ -29,7 +29,7 @@ geohashEncode(longitude, latitude, [precision])
 **Пример**
 
 ``` sql
-SELECT geohashEncode(-5.60302734375, 42.593994140625, 0) AS res
+SELECT geohashEncode(-5.60302734375, 42.593994140625, 0) AS res;
 ```
 
 ``` text
@@ -57,7 +57,7 @@ geohashDecode(geohash_string)
 **Пример**
 
 ``` sql
-SELECT geohashDecode('ezs42') AS res
+SELECT geohashDecode('ezs42') AS res;
 ```
 
 ``` text
@@ -76,13 +76,13 @@ SELECT geohashDecode('ezs42') AS res
 geohashesInBox(longitude_min, latitude_min, longitude_max, latitude_max, precision)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `longitude_min` — минимальная долгота. Диапазон возможных значений: `[-180°, 180°]`. Тип данных: [Float](../../../sql-reference/data-types/float.md)).
--   `latitude_min` - минимальная широта. Диапазон возможных значений: `[-90°, 90°]`. Тип данных: [Float](../../../sql-reference/data-types/float.md).
--   `longitude_max` - максимальная долгота. Диапазон возможных значений: `[-180°, 180°]`. Тип данных: [Float](../../../sql-reference/data-types/float.md).
--   `latitude_max` - максимальная широта. Диапазон возможных значений: `[-90°, 90°]`. Тип данных: [Float](../../../sql-reference/data-types/float.md).
--   `precision` - точность geohash. Диапазон возможных значений: `[1, 12]`. Тип данных: [UInt8](../../../sql-reference/data-types/int-uint.md).
+-   `latitude_min` — минимальная широта. Диапазон возможных значений: `[-90°, 90°]`. Тип данных: [Float](../../../sql-reference/data-types/float.md).
+-   `longitude_max` — максимальная долгота. Диапазон возможных значений: `[-180°, 180°]`. Тип данных: [Float](../../../sql-reference/data-types/float.md).
+-   `latitude_max` — максимальная широта. Диапазон возможных значений: `[-90°, 90°]`. Тип данных: [Float](../../../sql-reference/data-types/float.md).
+-   `precision` — точность geohash. Диапазон возможных значений: `[1, 12]`. Тип данных: [UInt8](../../../sql-reference/data-types/int-uint.md).
 
 !!! info "Замечание"
     Все передаваемые координаты должны быть одного и того же типа: либо `Float32`, либо `Float64`.
@@ -102,8 +102,9 @@ geohashesInBox(longitude_min, latitude_min, longitude_max, latitude_max, precisi
 Запрос:
 
 ``` sql
-SELECT geohashesInBox(24.48, 40.56, 24.785, 40.81, 4) AS thasos
+SELECT geohashesInBox(24.48, 40.56, 24.785, 40.81, 4) AS thasos;
 ```
+
 Результат:
 
 ``` text
@@ -112,4 +113,3 @@ SELECT geohashesInBox(24.48, 40.56, 24.785, 40.81, 4) AS thasos
 └─────────────────────────────────────────────┘
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/functions/geo/geohash) <!--hide-->
diff --git a/docs/ru/sql-reference/functions/geo/h3.md b/docs/ru/sql-reference/functions/geo/h3.md
index 69d06b5dfa6..27a512a9931 100644
--- a/docs/ru/sql-reference/functions/geo/h3.md
+++ b/docs/ru/sql-reference/functions/geo/h3.md
@@ -1,5 +1,5 @@
 ---
-toc_title: "\u0424\u0443\u043d\u043a\u0446\u0438\u0438\u0020\u0434\u043b\u044f\u0020\u0440\u0430\u0431\u043e\u0442\u044b\u0020\u0441\u0020\u0438\u043d\u0434\u0435\u043a\u0441\u0430\u043c\u0438\u0020\u0048\u0033"
+toc_title: "Функции для работы с индексами H3"
 ---
 
 # Функции для работы с индексами H3 {#h3index}
@@ -38,8 +38,9 @@ h3IsValid(h3index)
 Запрос:
 
 ``` sql
-SELECT h3IsValid(630814730351855103) as h3IsValid
+SELECT h3IsValid(630814730351855103) as h3IsValid;
 ```
+
 Результат:
 
 ``` text
@@ -74,8 +75,9 @@ h3GetResolution(h3index)
 Запрос:
 
 ``` sql
-SELECT h3GetResolution(639821929606596015) as resolution
+SELECT h3GetResolution(639821929606596015) as resolution;
 ```
+
 Результат:
 
 ``` text
@@ -107,8 +109,9 @@ h3EdgeAngle(resolution)
 Запрос:
 
 ``` sql
-SELECT h3EdgeAngle(10) as edgeAngle
+SELECT h3EdgeAngle(10) as edgeAngle;
 ```
+
 Результат:
 
 ``` text
@@ -140,8 +143,9 @@ h3EdgeLengthM(resolution)
 Запрос:
 
 ``` sql
-SELECT h3EdgeLengthM(15) as edgeLengthM
+SELECT h3EdgeLengthM(15) as edgeLengthM;
 ```
+
 Результат:
 
 ``` text
@@ -160,7 +164,7 @@ SELECT h3EdgeLengthM(15) as edgeLengthM
 geoToH3(lon, lat, resolution)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `lon` — географическая долгота. Тип данных — [Float64](../../../sql-reference/data-types/float.md).
 -   `lat` — географическая широта. Тип данных — [Float64](../../../sql-reference/data-types/float.md).
@@ -178,10 +182,10 @@ geoToH3(lon, lat, resolution)
 Запрос:
 
 ``` sql
-SELECT geoToH3(37.79506683, 55.71290588, 15) as h3Index
+SELECT geoToH3(37.79506683, 55.71290588, 15) as h3Index;
 ```
 
-Ответ:
+Результат:
 
 ``` text
 ┌────────────h3Index─┐
@@ -199,7 +203,7 @@ SELECT geoToH3(37.79506683, 55.71290588, 15) as h3Index
 h3kRing(h3index, k)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `h3index` — идентификатор шестигранника. Тип данных: [UInt64](../../../sql-reference/data-types/int-uint.md).
 -   `k` — радиус. Тип данных: [целое число](../../../sql-reference/data-types/int-uint.md)
@@ -215,8 +219,9 @@ h3kRing(h3index, k)
 Запрос:
 
 ``` sql
-SELECT arrayJoin(h3kRing(644325529233966508, 1)) AS h3index
+SELECT arrayJoin(h3kRing(644325529233966508, 1)) AS h3index;
 ```
+
 Результат:
 
 ``` text
@@ -311,7 +316,7 @@ SELECT h3HexAreaM2(13) as area;
 h3IndexesAreNeighbors(index1, index2)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `index1` — индекс шестиугольной ячейки. Тип: [UInt64](../../../sql-reference/data-types/int-uint.md).
 -   `index2` — индекс шестиугольной ячейки. Тип: [UInt64](../../../sql-reference/data-types/int-uint.md).
@@ -349,7 +354,7 @@ SELECT h3IndexesAreNeighbors(617420388351344639, 617420388352655359) AS n;
 h3ToChildren(index, resolution)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `index` — индекс шестиугольной ячейки. Тип: [UInt64](../../../sql-reference/data-types/int-uint.md).
 -   `resolution` — разрешение. Диапазон: `[0, 15]`. Тип: [UInt8](../../../sql-reference/data-types/int-uint.md).
@@ -386,7 +391,7 @@ SELECT h3ToChildren(599405990164561919, 6) AS children;
 h3ToParent(index, resolution)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `index` — индекс шестиугольной ячейки. Тип: [UInt64](../../../sql-reference/data-types/int-uint.md).
 -   `resolution` — разрешение. Диапазон: `[0, 15]`. Тип: [UInt8](../../../sql-reference/data-types/int-uint.md).
@@ -520,4 +525,3 @@ SELECT h3GetResolution(617420388352917503) as res;
 └─────┘
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/functions/geo/h3) <!--hide-->
diff --git a/docs/ru/sql-reference/functions/geo/index.md b/docs/ru/sql-reference/functions/geo/index.md
index cedaafaa31d..4d3bdfcd468 100644
--- a/docs/ru/sql-reference/functions/geo/index.md
+++ b/docs/ru/sql-reference/functions/geo/index.md
@@ -1,8 +1,7 @@
 ---
 toc_priority: 62
-toc_folder_title: "\u0413\u0435\u043e\u002d\u0434\u0430\u043d\u043d\u044b\u0435"
+toc_folder_title: "Гео-данные"
 toc_title: hidden
 ---
 
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/functions/geo/) <!--hide-->
diff --git a/docs/ru/sql-reference/functions/hash-functions.md b/docs/ru/sql-reference/functions/hash-functions.md
index f7820889ea9..07c741e0588 100644
--- a/docs/ru/sql-reference/functions/hash-functions.md
+++ b/docs/ru/sql-reference/functions/hash-functions.md
@@ -1,12 +1,14 @@
 ---
 toc_priority: 50
-toc_title: "\u0424\u0443\u043d\u043a\u0446\u0438\u0438\u0020\u0445\u044d\u0448\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f"
+toc_title: "Функции хэширования"
 ---
 
 # Функции хэширования {#funktsii-kheshirovaniia}
 
 Функции хэширования могут использоваться для детерминированного псевдослучайного разбрасывания элементов.
 
+Simhash – это хеш-функция, которая для близких значений возвращает близкий хеш.
+
 ## halfMD5 {#hash-functions-halfmd5}
 
 [Интерпретирует](../../sql-reference/functions/hash-functions.md#type_conversion_functions-reinterpretAsString) все входные параметры как строки и вычисляет хэш [MD5](https://ru.wikipedia.org/wiki/MD5) для каждой из них. Затем объединяет хэши, берет первые 8 байт хэша результирующей строки и интерпретирует их как значение типа `UInt64` с big-endian порядком байтов.
@@ -18,9 +20,9 @@ halfMD5(par1, ...)
 Функция относительно медленная (5 миллионов коротких строк в секунду на ядро процессора).
 По возможности, используйте функцию [sipHash64](#hash_functions-siphash64) вместо неё.
 
-**Параметры**
+**Аргументы**
 
-Функция принимает переменное число входных параметров. Параметры могут быть любого [поддерживаемого типа данных](../../sql-reference/functions/hash-functions.md).
+Функция принимает переменное число входных параметров. Аргументы могут быть любого [поддерживаемого типа данных](../../sql-reference/functions/hash-functions.md).
 
 **Возвращаемое значение**
 
@@ -29,7 +31,7 @@ halfMD5(par1, ...)
 **Пример**
 
 ``` sql
-SELECT halfMD5(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')) AS halfMD5hash, toTypeName(halfMD5hash) AS type
+SELECT halfMD5(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')) AS halfMD5hash, toTypeName(halfMD5hash) AS type;
 ```
 
 ``` text
@@ -61,9 +63,9 @@ sipHash64(par1,...)
 3.  Затем функция принимает хэш-значение, вычисленное на предыдущем шаге, и третий элемент исходного хэш-массива, и вычисляет хэш для массива из них.
 4.  Предыдущий шаг повторяется для всех остальных элементов исходного хэш-массива.
 
-**Параметры**
+**Аргументы**
 
-Функция принимает переменное число входных параметров. Параметры могут быть любого [поддерживаемого типа данных](../../sql-reference/functions/hash-functions.md).
+Функция принимает переменное число входных параметров. Аргументы могут быть любого [поддерживаемого типа данных](../../sql-reference/functions/hash-functions.md).
 
 **Возвращаемое значение**
 
@@ -72,7 +74,7 @@ sipHash64(par1,...)
 **Пример**
 
 ``` sql
-SELECT sipHash64(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')) AS SipHash, toTypeName(SipHash) AS type
+SELECT sipHash64(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')) AS SipHash, toTypeName(SipHash) AS type;
 ```
 
 ``` text
@@ -97,9 +99,9 @@ cityHash64(par1,...)
 
 Это не криптографическая хэш-функция. Она использует CityHash алгоритм для строковых параметров и зависящую от реализации быструю некриптографическую хэш-функцию для параметров с другими типами данных. Функция использует комбинатор CityHash для получения конечных результатов.
 
-**Параметры**
+**Аргументы**
 
-Функция принимает переменное число входных параметров. Параметры могут быть любого [поддерживаемого типа данных](../../sql-reference/functions/hash-functions.md).
+Функция принимает переменное число входных параметров. Аргументы могут быть любого [поддерживаемого типа данных](../../sql-reference/functions/hash-functions.md).
 
 **Возвращаемое значение**
 
@@ -110,7 +112,7 @@ cityHash64(par1,...)
 Пример вызова:
 
 ``` sql
-SELECT cityHash64(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')) AS CityHash, toTypeName(CityHash) AS type
+SELECT cityHash64(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')) AS CityHash, toTypeName(CityHash) AS type;
 ```
 
 ``` text
@@ -166,9 +168,9 @@ farmHash64(par1, ...)
 
 Эти функции используют методы `Fingerprint64` и `Hash64` из всех [доступных методов](https://github.com/google/farmhash/blob/master/src/farmhash.h).
 
-**Параметры**
+**Аргументы**
 
-Функция принимает переменное число входных параметров. Параметры могут быть любого [поддерживаемого типа данных](../../sql-reference/functions/hash-functions.md).
+Функция принимает переменное число входных параметров. Аргументы могут быть любого [поддерживаемого типа данных](../../sql-reference/functions/hash-functions.md).
 
 **Возвращаемое значение**
 
@@ -177,7 +179,7 @@ farmHash64(par1, ...)
 **Пример**
 
 ``` sql
-SELECT farmHash64(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')) AS FarmHash, toTypeName(FarmHash) AS type
+SELECT farmHash64(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')) AS FarmHash, toTypeName(FarmHash) AS type;
 ```
 
 ``` text
@@ -191,7 +193,7 @@ SELECT farmHash64(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:0
 Вычисляет [JavaHash](http://hg.openjdk.java.net/jdk8u/jdk8u/jdk/file/478a4add975b/src/share/classes/java/lang/String.java#l1452) от строки. `JavaHash` не отличается ни скоростью, ни качеством, поэтому эту функцию следует считать устаревшей. Используйте эту функцию, если вам необходимо получить значение хэша по такому же алгоритму.
 
 ``` sql
-SELECT javaHash('');
+SELECT javaHash('')
 ```
 
 **Возвращаемое значение**
@@ -208,7 +210,7 @@ SELECT javaHash('');
 SELECT javaHash('Hello, world!');
 ```
 
-Ответ:
+Результат:
 
 ``` text
 ┌─javaHash('Hello, world!')─┐
@@ -226,7 +228,7 @@ SELECT javaHash('Hello, world!');
 javaHashUTF16LE(stringUtf16le)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `stringUtf16le` — строка в `UTF-16LE`.
 
@@ -243,10 +245,10 @@ javaHashUTF16LE(stringUtf16le)
 Запрос:
 
 ``` sql
-SELECT javaHashUTF16LE(convertCharset('test', 'utf-8', 'utf-16le'))
+SELECT javaHashUTF16LE(convertCharset('test', 'utf-8', 'utf-16le'));
 ```
 
-Ответ:
+Результат:
 
 ``` text
 ┌─javaHashUTF16LE(convertCharset('test', 'utf-8', 'utf-16le'))─┐
@@ -259,7 +261,7 @@ SELECT javaHashUTF16LE(convertCharset('test', 'utf-8', 'utf-16le'))
 Вычисляет `HiveHash` от строки.
 
 ``` sql
-SELECT hiveHash('');
+SELECT hiveHash('')
 ```
 
 `HiveHash` — это результат [JavaHash](#hash_functions-javahash) с обнулённым битом знака числа. Функция используется в [Apache Hive](https://en.wikipedia.org/wiki/Apache_Hive) вплоть до версии 3.0.
@@ -278,7 +280,7 @@ SELECT hiveHash('');
 SELECT hiveHash('Hello, world!');
 ```
 
-Ответ:
+Результат:
 
 ``` text
 ┌─hiveHash('Hello, world!')─┐
@@ -294,9 +296,9 @@ SELECT hiveHash('Hello, world!');
 metroHash64(par1, ...)
 ```
 
-**Параметры**
+**Аргументы**
 
-Функция принимает переменное число входных параметров. Параметры могут быть любого [поддерживаемого типа данных](../../sql-reference/functions/hash-functions.md).
+Функция принимает переменное число входных параметров. Аргументы могут быть любого [поддерживаемого типа данных](../../sql-reference/functions/hash-functions.md).
 
 **Возвращаемое значение**
 
@@ -305,7 +307,7 @@ metroHash64(par1, ...)
 **Пример**
 
 ``` sql
-SELECT metroHash64(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')) AS MetroHash, toTypeName(MetroHash) AS type
+SELECT metroHash64(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')) AS MetroHash, toTypeName(MetroHash) AS type;
 ```
 
 ``` text
@@ -329,9 +331,9 @@ murmurHash2_32(par1, ...)
 murmurHash2_64(par1, ...)
 ```
 
-**Параметры**
+**Аргументы**
 
-Обе функции принимают переменное число входных параметров. Параметры могут быть любого [поддерживаемого типа данных](../../sql-reference/functions/hash-functions.md).
+Обе функции принимают переменное число входных параметров. Аргументы могут быть любого [поддерживаемого типа данных](../../sql-reference/functions/hash-functions.md).
 
 **Возвращаемое значение**
 
@@ -341,7 +343,7 @@ murmurHash2_64(par1, ...)
 **Пример**
 
 ``` sql
-SELECT murmurHash2_64(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')) AS MurmurHash2, toTypeName(MurmurHash2) AS type
+SELECT murmurHash2_64(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')) AS MurmurHash2, toTypeName(MurmurHash2) AS type;
 ```
 
 ``` text
@@ -360,9 +362,9 @@ SELECT murmurHash2_64(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:
 gccMurmurHash(par1, ...);
 ```
 
-**Параметры**
+**Аргументы**
 
--   `par1, ...` — Переменное число параметров. Каждый параметр может быть любого из [поддерживаемых типов данных](../../sql-reference/data-types/index.md).
+-   `par1, ...` — переменное число параметров. Каждый параметр может быть любого из [поддерживаемых типов данных](../../sql-reference/data-types/index.md).
 
 **Возвращаемое значение**
 
@@ -397,9 +399,9 @@ murmurHash3_32(par1, ...)
 murmurHash3_64(par1, ...)
 ```
 
-**Параметры**
+**Аргументы**
 
-Обе функции принимают переменное число входных параметров. Параметры могут быть любого [поддерживаемого типа данных](../../sql-reference/functions/hash-functions.md).
+Обе функции принимают переменное число входных параметров. Аргументы могут быть любого [поддерживаемого типа данных](../../sql-reference/functions/hash-functions.md).
 
 **Возвращаемое значение**
 
@@ -409,7 +411,7 @@ murmurHash3_64(par1, ...)
 **Пример**
 
 ``` sql
-SELECT murmurHash3_32(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')) AS MurmurHash3, toTypeName(MurmurHash3) AS type
+SELECT murmurHash3_32(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')) AS MurmurHash3, toTypeName(MurmurHash3) AS type;
 ```
 
 ``` text
@@ -426,9 +428,9 @@ SELECT murmurHash3_32(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:
 murmurHash3_128( expr )
 ```
 
-**Параметры**
+**Аргументы**
 
--   `expr` — [выражение](../syntax.md#syntax-expressions) возвращающее значение типа[String](../../sql-reference/functions/hash-functions.md).
+-   `expr` — [выражение](../syntax.md#syntax-expressions), возвращающее значение типа [String](../../sql-reference/functions/hash-functions.md).
 
 **Возвращаемое значение**
 
@@ -437,13 +439,13 @@ murmurHash3_128( expr )
 **Пример**
 
 ``` sql
-SELECT murmurHash3_128('example_string') AS MurmurHash3, toTypeName(MurmurHash3) AS type
+SELECT hex(murmurHash3_128('example_string')) AS MurmurHash3, toTypeName(MurmurHash3) AS type;
 ```
 
 ``` text
-┌─MurmurHash3──────┬─type────────────┐
-│ 6�1�4"S5KT�~~q │ FixedString(16) │
-└──────────────────┴─────────────────┘
+┌─MurmurHash3──────────────────────┬─type───┐
+│ 368A1A311CB7342253354B548E7E7E71 │ String │
+└──────────────────────────────────┴────────┘
 ```
 
 ## xxHash32, xxHash64 {#hash-functions-xxhash32-xxhash64}
@@ -451,11 +453,11 @@ SELECT murmurHash3_128('example_string') AS MurmurHash3, toTypeName(MurmurHash3)
 Вычисляет `xxHash` от строки. Предлагается в двух вариантах: 32 и 64 бита.
 
 ``` sql
-SELECT xxHash32('');
+SELECT xxHash32('')
 
 OR
 
-SELECT xxHash64('');
+SELECT xxHash64('')
 ```
 
 **Возвращаемое значение**
@@ -472,7 +474,7 @@ SELECT xxHash64('');
 SELECT xxHash32('Hello, world!');
 ```
 
-Ответ:
+Результат:
 
 ``` text
 ┌─xxHash32('Hello, world!')─┐
@@ -484,4 +486,937 @@ SELECT xxHash32('Hello, world!');
 
 -   [xxHash](http://cyan4973.github.io/xxHash/).
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/functions/hash_functions/) <!--hide-->
+## ngramSimHash {#ngramsimhash}
+
+Выделяет из ASCII строки отрезки (n-граммы) размером `ngramsize` символов и возвращает n-граммовый `simhash`. Функция регистрозависимая.
+
+Может быть использована для проверки двух строк на схожесть вместе с функцией [bitHammingDistance](../../sql-reference/functions/bit-functions.md#bithammingdistance). Чем меньше [расстояние Хэмминга](https://ru.wikipedia.org/wiki/%D0%A0%D0%B0%D1%81%D1%81%D1%82%D0%BE%D1%8F%D0%BD%D0%B8%D0%B5_%D0%A5%D1%8D%D0%BC%D0%BC%D0%B8%D0%BD%D0%B3%D0%B0) между результатом вычисления `simhash` двух строк, тем больше вероятность, что строки совпадают.
+
+**Синтаксис**
+
+``` sql
+ngramSimHash(string[, ngramsize])
+```
+
+**Аргументы**
+
+-   `string` — строка. [String](../../sql-reference/data-types/string.md).
+-   `ngramsize` — размер n-грамм. Необязательный. Возможные значения: любое число от `1` до `25`. Значение по умолчанию: `3`. [UInt8](../../sql-reference/data-types/int-uint.md).
+
+**Возвращаемое значение**
+
+-   Значение хеш-функции от строки.
+
+Тип: [UInt64](../../sql-reference/data-types/int-uint.md).
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT ngramSimHash('ClickHouse') AS Hash;
+```
+
+Результат:
+
+``` text
+┌───────Hash─┐
+│ 1627567969 │
+└────────────┘
+```
+
+## ngramSimHashCaseInsensitive {#ngramsimhashcaseinsensitive}
+
+Выделяет из ASCII строки отрезки (n-граммы) размером `ngramsize` символов и возвращает n-граммовый `simhash`. Функция регистро**не**зависимая.
+
+Может быть использована для проверки двух строк на схожесть вместе с функцией [bitHammingDistance](../../sql-reference/functions/bit-functions.md#bithammingdistance). Чем меньше [расстояние Хэмминга](https://ru.wikipedia.org/wiki/%D0%A0%D0%B0%D1%81%D1%81%D1%82%D0%BE%D1%8F%D0%BD%D0%B8%D0%B5_%D0%A5%D1%8D%D0%BC%D0%BC%D0%B8%D0%BD%D0%B3%D0%B0) между результатом вычисления `simhash` двух строк, тем больше вероятность, что строки совпадают.
+
+**Синтаксис**
+
+``` sql
+ngramSimHashCaseInsensitive(string[, ngramsize])
+```
+
+**Аргументы**
+
+-   `string` — строка. [String](../../sql-reference/data-types/string.md).
+-   `ngramsize` — размер n-грамм. Необязательный. Возможные значения: любое число от `1` до `25`. Значение по умолчанию: `3`. [UInt8](../../sql-reference/data-types/int-uint.md).
+
+**Возвращаемое значение**
+
+-   Значение хеш-функции от строки.
+
+Тип: [UInt64](../../sql-reference/data-types/int-uint.md).
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT ngramSimHashCaseInsensitive('ClickHouse') AS Hash;
+```
+
+Результат:
+
+``` text
+┌──────Hash─┐
+│ 562180645 │
+└───────────┘
+```
+
+## ngramSimHashUTF8 {#ngramsimhashutf8}
+
+Выделяет из UTF-8 строки отрезки (n-граммы) размером `ngramsize` символов и возвращает n-граммовый `simhash`. Функция регистрозависимая.
+
+Может быть использована для проверки двух строк на схожесть вместе с функцией [bitHammingDistance](../../sql-reference/functions/bit-functions.md#bithammingdistance). Чем меньше [расстояние Хэмминга](https://ru.wikipedia.org/wiki/%D0%A0%D0%B0%D1%81%D1%81%D1%82%D0%BE%D1%8F%D0%BD%D0%B8%D0%B5_%D0%A5%D1%8D%D0%BC%D0%BC%D0%B8%D0%BD%D0%B3%D0%B0) между результатом вычисления `simhash` двух строк, тем больше вероятность, что строки совпадают.
+
+**Синтаксис**
+
+``` sql
+ngramSimHashUTF8(string[, ngramsize])
+```
+
+**Аргументы**
+
+-   `string` — строка. [String](../../sql-reference/data-types/string.md).
+-   `ngramsize` — размер n-грамм. Необязательный. Возможные значения: любое число от `1` до `25`. Значение по умолчанию: `3`. [UInt8](../../sql-reference/data-types/int-uint.md).
+
+**Возвращаемое значение**
+
+-   Значение хеш-функции от строки.
+
+Тип: [UInt64](../../sql-reference/data-types/int-uint.md).
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT ngramSimHashUTF8('ClickHouse') AS Hash;
+```
+
+Результат:
+
+``` text
+┌───────Hash─┐
+│ 1628157797 │
+└────────────┘
+```
+
+## ngramSimHashCaseInsensitiveUTF8 {#ngramsimhashcaseinsensitiveutf8}
+
+Выделяет из UTF-8 строки отрезки (n-граммы) размером `ngramsize` символов и возвращает n-граммовый `simhash`. Функция регистро**не**зависимая.
+
+Может быть использована для проверки двух строк на схожесть вместе с функцией [bitHammingDistance](../../sql-reference/functions/bit-functions.md#bithammingdistance). Чем меньше [расстояние Хэмминга](https://ru.wikipedia.org/wiki/%D0%A0%D0%B0%D1%81%D1%81%D1%82%D0%BE%D1%8F%D0%BD%D0%B8%D0%B5_%D0%A5%D1%8D%D0%BC%D0%BC%D0%B8%D0%BD%D0%B3%D0%B0) между результатом вычисления `simhash` двух строк, тем больше вероятность, что строки совпадают.
+
+**Синтаксис**
+
+``` sql
+ngramSimHashCaseInsensitiveUTF8(string[, ngramsize])
+```
+
+**Аргументы**
+
+-   `string` — строка. [String](../../sql-reference/data-types/string.md).
+-   `ngramsize` — размер n-грамм. Необязательный. Возможные значения: любое число от `1` до `25`. Значение по умолчанию: `3`. [UInt8](../../sql-reference/data-types/int-uint.md).
+
+**Возвращаемое значение**
+
+-   Значение хеш-функции от строки.
+
+Тип: [UInt64](../../sql-reference/data-types/int-uint.md).
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT ngramSimHashCaseInsensitiveUTF8('ClickHouse') AS Hash;
+```
+
+Результат:
+
+``` text
+┌───────Hash─┐
+│ 1636742693 │
+└────────────┘
+```
+
+## wordShingleSimHash {#wordshinglesimhash}
+
+Выделяет из ASCII строки отрезки (шинглы) из `shinglesize` слов и возвращает шингловый `simhash`. Функция регистрозависимая.
+
+Может быть использована для проверки двух строк на схожесть вместе с функцией [bitHammingDistance](../../sql-reference/functions/bit-functions.md#bithammingdistance). Чем меньше [расстояние Хэмминга](https://ru.wikipedia.org/wiki/%D0%A0%D0%B0%D1%81%D1%81%D1%82%D0%BE%D1%8F%D0%BD%D0%B8%D0%B5_%D0%A5%D1%8D%D0%BC%D0%BC%D0%B8%D0%BD%D0%B3%D0%B0) между результатом вычисления `simhash` двух строк, тем больше вероятность, что строки совпадают.
+
+**Синтаксис**
+
+``` sql
+wordShingleSimHash(string[, shinglesize])
+```
+
+**Аргументы**
+
+-   `string` — строка. [String](../../sql-reference/data-types/string.md).
+-   `shinglesize` — размер словесных шинглов. Необязательный. Возможные значения: любое число от `1` до `25`. Значение по умолчанию: `3`. [UInt8](../../sql-reference/data-types/int-uint.md).
+
+**Возвращаемое значение**
+
+-   Значение хеш-функции от строки.
+
+Тип: [UInt64](../../sql-reference/data-types/int-uint.md).
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT wordShingleSimHash('ClickHouse® is a column-oriented database management system (DBMS) for online analytical processing of queries (OLAP).') AS Hash;
+```
+
+Результат:
+
+``` text
+┌───────Hash─┐
+│ 2328277067 │
+└────────────┘
+```
+
+## wordShingleSimHashCaseInsensitive {#wordshinglesimhashcaseinsensitive}
+
+Выделяет из ASCII строки отрезки (шинглы) из `shinglesize` слов и возвращает шингловый `simhash`. Функция регистро**не**зависимая.
+
+Может быть использована для проверки двух строк на схожесть вместе с функцией [bitHammingDistance](../../sql-reference/functions/bit-functions.md#bithammingdistance). Чем меньше [расстояние Хэмминга](https://ru.wikipedia.org/wiki/%D0%A0%D0%B0%D1%81%D1%81%D1%82%D0%BE%D1%8F%D0%BD%D0%B8%D0%B5_%D0%A5%D1%8D%D0%BC%D0%BC%D0%B8%D0%BD%D0%B3%D0%B0) между результатом вычисления `simhash` двух строк, тем больше вероятность, что строки совпадают.
+
+**Синтаксис**
+
+``` sql
+wordShingleSimHashCaseInsensitive(string[, shinglesize])
+```
+
+**Аргументы**
+
+-   `string` — строка. [String](../../sql-reference/data-types/string.md).
+-   `shinglesize` — размер словесных шинглов. Необязательный. Возможные значения: любое число от `1` до `25`. Значение по умолчанию: `3`. [UInt8](../../sql-reference/data-types/int-uint.md).
+
+**Возвращаемое значение**
+
+-   Значение хеш-функции от строки.
+
+Тип: [UInt64](../../sql-reference/data-types/int-uint.md).
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT wordShingleSimHashCaseInsensitive('ClickHouse® is a column-oriented database management system (DBMS) for online analytical processing of queries (OLAP).') AS Hash;
+```
+
+Результат:
+
+``` text
+┌───────Hash─┐
+│ 2194812424 │
+└────────────┘
+```
+
+## wordShingleSimHashUTF8 {#wordshinglesimhashutf8}
+
+Выделяет из UTF-8 строки отрезки (шинглы) из `shinglesize` слов и возвращает шингловый `simhash`. Функция регистрозависимая.
+
+Может быть использована для проверки двух строк на схожесть вместе с функцией [bitHammingDistance](../../sql-reference/functions/bit-functions.md#bithammingdistance). Чем меньше [расстояние Хэмминга](https://ru.wikipedia.org/wiki/%D0%A0%D0%B0%D1%81%D1%81%D1%82%D0%BE%D1%8F%D0%BD%D0%B8%D0%B5_%D0%A5%D1%8D%D0%BC%D0%BC%D0%B8%D0%BD%D0%B3%D0%B0) между результатом вычисления `simhash` двух строк, тем больше вероятность, что строки совпадают.
+
+**Синтаксис**
+
+``` sql
+wordShingleSimHashUTF8(string[, shinglesize])
+```
+
+**Аргументы**
+
+-   `string` — строка. [String](../../sql-reference/data-types/string.md).
+-   `shinglesize` — размер словесных шинглов. Необязательный. Возможные значения: любое число от `1` до `25`. Значение по умолчанию: `3`. [UInt8](../../sql-reference/data-types/int-uint.md).
+
+**Возвращаемое значение**
+
+-   Значение хеш-функции от строки.
+
+Тип: [UInt64](../../sql-reference/data-types/int-uint.md).
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT wordShingleSimHashUTF8('ClickHouse® is a column-oriented database management system (DBMS) for online analytical processing of queries (OLAP).') AS Hash;
+```
+
+Результат:
+
+``` text
+┌───────Hash─┐
+│ 2328277067 │
+└────────────┘
+```
+
+## wordShingleSimHashCaseInsensitiveUTF8 {#wordshinglesimhashcaseinsensitiveutf8}
+
+Выделяет из UTF-8 строки отрезки (шинглы) из `shinglesize` слов и возвращает шингловый `simhash`. Функция регистро**не**зависимая.
+
+Может быть использована для проверки двух строк на схожесть вместе с функцией [bitHammingDistance](../../sql-reference/functions/bit-functions.md#bithammingdistance). Чем меньше [расстояние Хэмминга](https://ru.wikipedia.org/wiki/%D0%A0%D0%B0%D1%81%D1%81%D1%82%D0%BE%D1%8F%D0%BD%D0%B8%D0%B5_%D0%A5%D1%8D%D0%BC%D0%BC%D0%B8%D0%BD%D0%B3%D0%B0) между результатом вычисления `simhash` двух строк, тем больше вероятность, что строки совпадают.
+
+**Синтаксис**
+
+``` sql
+wordShingleSimHashCaseInsensitiveUTF8(string[, shinglesize])
+```
+
+**Аргументы**
+
+-   `string` — строка. [String](../../sql-reference/data-types/string.md).
+-   `shinglesize` — размер словесных шинглов. Необязательный. Возможные значения: любое число от `1` до `25`. Значение по умолчанию: `3`. [UInt8](../../sql-reference/data-types/int-uint.md).
+
+**Возвращаемое значение**
+
+-   Значение хеш-функции от строки.
+
+Тип: [UInt64](../../sql-reference/data-types/int-uint.md).
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT wordShingleSimHashCaseInsensitiveUTF8('ClickHouse® is a column-oriented database management system (DBMS) for online analytical processing of queries (OLAP).') AS Hash;
+```
+
+Результат:
+
+``` text
+┌───────Hash─┐
+│ 2194812424 │
+└────────────┘
+```
+
+## ngramMinHash {#ngramminhash}
+
+Выделяет из ASCII строки отрезки (n-граммы) размером `ngramsize` символов и вычисляет хеш для каждой n-граммы. Использует `hashnum` минимальных хешей, чтобы вычислить минимальный хеш, и `hashnum` максимальных хешей, чтобы вычислить максимальный хеш. Возвращает кортеж из этих хешей. Функция регистрозависимая.
+
+Может быть использована для проверки двух строк на схожесть вместе с функцией [tupleHammingDistance](../../sql-reference/functions/tuple-functions.md#tuplehammingdistance). Если для двух строк минимальные или максимальные хеши одинаковы, мы считаем, что эти строки совпадают.
+
+**Синтаксис**
+
+``` sql
+ngramMinHash(string[, ngramsize, hashnum])
+```
+
+**Аргументы**
+
+-   `string` — строка. [String](../../sql-reference/data-types/string.md).
+-   `ngramsize` — размер n-грамм. Необязательный. Возможные значения: любое число от `1` до `25`. Значение по умолчанию: `3`. [UInt8](../../sql-reference/data-types/int-uint.md).
+-   `hashnum` — количество минимальных и максимальных хешей, которое используется при вычислении результата. Необязательный. Возможные значения: любое число от `1` до `25`. Значение по умолчанию: `6`. [UInt8](../../sql-reference/data-types/int-uint.md).
+
+**Возвращаемое значение**
+
+-   Кортеж с двумя хешами — минимальным и максимальным.
+
+Тип: [Tuple](../../sql-reference/data-types/tuple.md)([UInt64](../../sql-reference/data-types/int-uint.md), [UInt64](../../sql-reference/data-types/int-uint.md)).
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT ngramMinHash('ClickHouse') AS Tuple;
+```
+
+Результат:
+
+``` text
+┌─Tuple──────────────────────────────────────┐
+│ (18333312859352735453,9054248444481805918) │
+└────────────────────────────────────────────┘
+```
+
+## ngramMinHashCaseInsensitive {#ngramminhashcaseinsensitive}
+
+Выделяет из ASCII строки отрезки (n-граммы) размером `ngramsize` символов и вычисляет хеш для каждой n-граммы. Использует `hashnum` минимальных хешей, чтобы вычислить минимальный хеш, и `hashnum` максимальных хешей, чтобы вычислить максимальный хеш. Возвращает кортеж из этих хешей. Функция регистро**не**зависимая.
+
+Может быть использована для проверки двух строк на схожесть вместе с функцией [tupleHammingDistance](../../sql-reference/functions/tuple-functions.md#tuplehammingdistance). Если для двух строк минимальные или максимальные хеши одинаковы, мы считаем, что эти строки совпадают.
+
+**Синтаксис**
+
+``` sql
+ngramMinHashCaseInsensitive(string[, ngramsize, hashnum])
+```
+
+**Аргументы**
+
+-   `string` — строка. [String](../../sql-reference/data-types/string.md).
+-   `ngramsize` — размер n-грамм. Необязательный. Возможные значения: любое число от `1` до `25`. Значение по умолчанию: `3`. [UInt8](../../sql-reference/data-types/int-uint.md).
+-   `hashnum` — количество минимальных и максимальных хешей, которое используется при вычислении результата. Необязательный. Возможные значения: любое число от `1` до `25`. Значение по умолчанию: `6`. [UInt8](../../sql-reference/data-types/int-uint.md).
+
+**Возвращаемое значение**
+
+-   Кортеж с двумя хешами — минимальным и максимальным.
+
+Тип: [Tuple](../../sql-reference/data-types/tuple.md)([UInt64](../../sql-reference/data-types/int-uint.md), [UInt64](../../sql-reference/data-types/int-uint.md)).
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT ngramMinHashCaseInsensitive('ClickHouse') AS Tuple;
+```
+
+Результат:
+
+``` text
+┌─Tuple──────────────────────────────────────┐
+│ (2106263556442004574,13203602793651726206) │
+└────────────────────────────────────────────┘
+```
+
+## ngramMinHashUTF8 {#ngramminhashutf8}
+
+Выделяет из UTF-8 строки отрезки (n-граммы) размером `ngramsize` символов и вычисляет хеш для каждой n-граммы. Использует `hashnum` минимальных хешей, чтобы вычислить минимальный хеш, и `hashnum` максимальных хешей, чтобы вычислить максимальный хеш. Возвращает кортеж из этих хешей. Функция регистрозависимая.
+
+Может быть использована для проверки двух строк на схожесть вместе с функцией [tupleHammingDistance](../../sql-reference/functions/tuple-functions.md#tuplehammingdistance). Если для двух строк минимальные или максимальные хеши одинаковы, мы считаем, что эти строки совпадают.
+
+**Синтаксис**
+``` sql
+ngramMinHashUTF8(string[, ngramsize, hashnum])
+```
+
+**Аргументы**
+
+-   `string` — строка. [String](../../sql-reference/data-types/string.md).
+-   `ngramsize` — размер n-грамм. Необязательный. Возможные значения: любое число от `1` до `25`. Значение по умолчанию: `3`. [UInt8](../../sql-reference/data-types/int-uint.md).
+-   `hashnum` — количество минимальных и максимальных хешей, которое используется при вычислении результата. Необязательный. Возможные значения: любое число от `1` до `25`. Значение по умолчанию: `6`. [UInt8](../../sql-reference/data-types/int-uint.md).
+
+**Возвращаемое значение**
+
+-   Кортеж с двумя хешами — минимальным и максимальным.
+
+Тип: [Tuple](../../sql-reference/data-types/tuple.md)([UInt64](../../sql-reference/data-types/int-uint.md), [UInt64](../../sql-reference/data-types/int-uint.md)).
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT ngramMinHashUTF8('ClickHouse') AS Tuple;
+```
+
+Результат:
+
+``` text
+┌─Tuple──────────────────────────────────────┐
+│ (18333312859352735453,6742163577938632877) │
+└────────────────────────────────────────────┘
+```
+
+## ngramMinHashCaseInsensitiveUTF8 {#ngramminhashcaseinsensitiveutf8}
+
+Выделяет из UTF-8 строки отрезки (n-граммы) размером `ngramsize` символов и вычисляет хеш для каждой n-граммы. Использует `hashnum` минимальных хешей, чтобы вычислить минимальный хеш, и `hashnum` максимальных хешей, чтобы вычислить максимальный хеш. Возвращает кортеж из этих хешей. Функция регистро**не**зависимая.
+
+Может быть использована для проверки двух строк на схожесть вместе с функцией [tupleHammingDistance](../../sql-reference/functions/tuple-functions.md#tuplehammingdistance). Если для двух строк минимальные или максимальные хеши одинаковы, мы считаем, что эти строки совпадают.
+
+**Синтаксис**
+
+``` sql
+ngramMinHashCaseInsensitiveUTF8(string [, ngramsize, hashnum])
+```
+
+**Аргументы**
+
+-   `string` — строка. [String](../../sql-reference/data-types/string.md).
+-   `ngramsize` — размер n-грамм. Необязательный. Возможные значения: любое число от `1` до `25`. Значение по умолчанию: `3`. [UInt8](../../sql-reference/data-types/int-uint.md).
+-   `hashnum` — количество минимальных и максимальных хешей, которое используется при вычислении результата. Необязательный. Возможные значения: любое число от `1` до `25`. Значение по умолчанию: `6`. [UInt8](../../sql-reference/data-types/int-uint.md).
+
+**Возвращаемое значение**
+
+-   Кортеж с двумя хешами — минимальным и максимальным.
+
+Тип: [Tuple](../../sql-reference/data-types/tuple.md)([UInt64](../../sql-reference/data-types/int-uint.md), [UInt64](../../sql-reference/data-types/int-uint.md)).
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT ngramMinHashCaseInsensitiveUTF8('ClickHouse') AS Tuple;
+```
+
+Результат:
+
+``` text
+┌─Tuple───────────────────────────────────────┐
+│ (12493625717655877135,13203602793651726206) │
+└─────────────────────────────────────────────┘
+```
+
+## ngramMinHashArg {#ngramminhasharg}
+
+Выделяет из ASCII строки отрезки (n-граммы) размером `ngramsize` символов и возвращает n-граммы с минимальным и максимальным хешами, вычисленными функцией [ngramMinHash](#ngramminhash) с теми же входными данными. Функция регистрозависимая.
+
+**Синтаксис**
+
+``` sql
+ngramMinHashArg(string[, ngramsize, hashnum])
+```
+
+**Аргументы**
+
+-   `string` — строка. [String](../../sql-reference/data-types/string.md).
+-   `ngramsize` — размер n-грамм. Необязательный. Возможные значения: любое число от `1` до `25`. Значение по умолчанию: `3`. [UInt8](../../sql-reference/data-types/int-uint.md).
+-   `hashnum` — количество минимальных и максимальных хешей, которое используется при вычислении результата. Необязательный. Возможные значения: любое число от `1` до `25`. Значение по умолчанию: `6`. [UInt8](../../sql-reference/data-types/int-uint.md).
+
+**Возвращаемое значение**
+
+-   Кортеж из двух кортежей, каждый из которых состоит из `hashnum` n-грамм.
+
+Тип: [Tuple](../../sql-reference/data-types/tuple.md)([Tuple](../../sql-reference/data-types/tuple.md)([String](../../sql-reference/data-types/string.md)), [Tuple](../../sql-reference/data-types/tuple.md)([String](../../sql-reference/data-types/string.md))).
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT ngramMinHashArg('ClickHouse') AS Tuple;
+```
+
+Результат:
+
+``` text
+┌─Tuple─────────────────────────────────────────────────────────────────────────┐
+│ (('ous','ick','lic','Hou','kHo','use'),('Hou','lic','ick','ous','ckH','Cli')) │
+└───────────────────────────────────────────────────────────────────────────────┘
+```
+
+## ngramMinHashArgCaseInsensitive {#ngramminhashargcaseinsensitive}
+
+Выделяет из ASCII строки отрезки (n-граммы) размером `ngramsize` символов и возвращает n-граммы с минимальным и максимальным хешами, вычисленными функцией [ngramMinHashCaseInsensitive](#ngramminhashcaseinsensitive) с теми же входными данными. Функция регистро**не**зависимая.
+
+**Синтаксис**
+
+``` sql
+ngramMinHashArgCaseInsensitive(string[, ngramsize, hashnum])
+```
+
+**Аргументы**
+
+-   `string` — строка. [String](../../sql-reference/data-types/string.md).
+-   `ngramsize` — размер n-грамм. Необязательный. Возможные значения: любое число от `1` до `25`. Значение по умолчанию: `3`. [UInt8](../../sql-reference/data-types/int-uint.md).
+-   `hashnum` — количество минимальных и максимальных хешей, которое используется при вычислении результата. Необязательный. Возможные значения: любое число от `1` до `25`. Значение по умолчанию: `6`. [UInt8](../../sql-reference/data-types/int-uint.md).
+
+**Возвращаемое значение**
+
+-   Кортеж из двух кортежей, каждый из которых состоит из `hashnum` n-грамм.
+
+Тип: [Tuple](../../sql-reference/data-types/tuple.md)([Tuple](../../sql-reference/data-types/tuple.md)([String](../../sql-reference/data-types/string.md)), [Tuple](../../sql-reference/data-types/tuple.md)([String](../../sql-reference/data-types/string.md))).
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT ngramMinHashArgCaseInsensitive('ClickHouse') AS Tuple;
+```
+
+Результат:
+
+``` text
+┌─Tuple─────────────────────────────────────────────────────────────────────────┐
+│ (('ous','ick','lic','kHo','use','Cli'),('kHo','lic','ick','ous','ckH','Hou')) │
+└───────────────────────────────────────────────────────────────────────────────┘
+```
+
+## ngramMinHashArgUTF8 {#ngramminhashargutf8}
+
+Выделяет из UTF-8 строки отрезки (n-граммы) размером `ngramsize` символов и возвращает n-граммы с минимальным и максимальным хешами, вычисленными функцией [ngramMinHashUTF8](#ngramminhashutf8) с теми же входными данными. Функция регистрозависимая.
+
+**Синтаксис**
+
+``` sql
+ngramMinHashArgUTF8(string[, ngramsize, hashnum])
+```
+
+**Аргументы**
+
+-   `string` — строка. [String](../../sql-reference/data-types/string.md).
+-   `ngramsize` — размер n-грамм. Необязательный. Возможные значения: любое число от `1` до `25`. Значение по умолчанию: `3`. [UInt8](../../sql-reference/data-types/int-uint.md).
+-   `hashnum` — количество минимальных и максимальных хешей, которое используется при вычислении результата. Необязательный. Возможные значения: любое число от `1` до `25`. Значение по умолчанию: `6`. [UInt8](../../sql-reference/data-types/int-uint.md).
+
+**Возвращаемое значение**
+
+-   Кортеж из двух кортежей, каждый из которых состоит из `hashnum` n-грамм.
+
+Тип: [Tuple](../../sql-reference/data-types/tuple.md)([Tuple](../../sql-reference/data-types/tuple.md)([String](../../sql-reference/data-types/string.md)), [Tuple](../../sql-reference/data-types/tuple.md)([String](../../sql-reference/data-types/string.md))).
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT ngramMinHashArgUTF8('ClickHouse') AS Tuple;
+```
+
+Результат:
+
+``` text
+┌─Tuple─────────────────────────────────────────────────────────────────────────┐
+│ (('ous','ick','lic','Hou','kHo','use'),('kHo','Hou','lic','ick','ous','ckH')) │
+└───────────────────────────────────────────────────────────────────────────────┘
+```
+
+## ngramMinHashArgCaseInsensitiveUTF8 {#ngramminhashargcaseinsensitiveutf8}
+
+Выделяет из UTF-8 строки отрезки (n-граммы) размером `ngramsize` символов и возвращает n-граммы с минимальным и максимальным хешами, вычисленными функцией [ngramMinHashCaseInsensitiveUTF8](#ngramminhashcaseinsensitiveutf8) с теми же входными данными. Функция регистро**не**зависимая.
+
+**Синтаксис**
+
+``` sql
+ngramMinHashArgCaseInsensitiveUTF8(string[, ngramsize, hashnum])
+```
+
+**Аргументы**
+
+-   `string` — строка. [String](../../sql-reference/data-types/string.md).
+-   `ngramsize` — размер n-грамм. Необязательный. Возможные значения: любое число от `1` до `25`. Значение по умолчанию: `3`. [UInt8](../../sql-reference/data-types/int-uint.md).
+-   `hashnum` — количество минимальных и максимальных хешей, которое используется при вычислении результата. Необязательный. Возможные значения: любое число от `1` до `25`. Значение по умолчанию: `6`. [UInt8](../../sql-reference/data-types/int-uint.md).
+
+**Возвращаемое значение**
+
+-   Кортеж из двух кортежей, каждый из которых состоит из `hashnum` n-грамм.
+
+Тип: [Tuple](../../sql-reference/data-types/tuple.md)([Tuple](../../sql-reference/data-types/tuple.md)([String](../../sql-reference/data-types/string.md)), [Tuple](../../sql-reference/data-types/tuple.md)([String](../../sql-reference/data-types/string.md))).
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT ngramMinHashArgCaseInsensitiveUTF8('ClickHouse') AS Tuple;
+```
+
+Результат:
+
+``` text
+┌─Tuple─────────────────────────────────────────────────────────────────────────┐
+│ (('ckH','ous','ick','lic','kHo','use'),('kHo','lic','ick','ous','ckH','Hou')) │
+└───────────────────────────────────────────────────────────────────────────────┘
+```
+
+## wordShingleMinHash {#wordshingleminhash}
+
+Выделяет из ASCII строки отрезки (шинглы) из `shinglesize` слов и вычисляет хеш для каждого шингла. Использует `hashnum` минимальных хешей, чтобы вычислить минимальный хеш, и `hashnum` максимальных хешей, чтобы вычислить максимальный хеш. Возвращает кортеж из этих хешей. Функция регистрозависимая.
+
+Может быть использована для проверки двух строк на схожесть вместе с функцией [tupleHammingDistance](../../sql-reference/functions/tuple-functions.md#tuplehammingdistance). Если для двух строк минимальные или максимальные хеши одинаковы, мы считаем, что эти строки совпадают.
+
+**Синтаксис**
+
+``` sql
+wordShingleMinHash(string[, shinglesize, hashnum])
+```
+
+**Аргументы**
+
+-   `string` — строка. [String](../../sql-reference/data-types/string.md).
+-   `shinglesize` — размер словесных шинглов. Необязательный. Возможные значения: любое число от `1` до `25`. Значение по умолчанию: `3`. [UInt8](../../sql-reference/data-types/int-uint.md).
+-   `hashnum` — количество минимальных и максимальных хешей, которое используется при вычислении результата. Необязательный. Возможные значения: любое число от `1` до `25`. Значение по умолчанию: `6`. [UInt8](../../sql-reference/data-types/int-uint.md).
+
+**Возвращаемое значение**
+
+-   Кортеж с двумя хешами — минимальным и максимальным.
+
+Тип: [Tuple](../../sql-reference/data-types/tuple.md)([UInt64](../../sql-reference/data-types/int-uint.md), [UInt64](../../sql-reference/data-types/int-uint.md)).
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT wordShingleMinHash('ClickHouse® is a column-oriented database management system (DBMS) for online analytical processing of queries (OLAP).') AS Tuple;
+```
+
+Результат:
+
+``` text
+┌─Tuple──────────────────────────────────────┐
+│ (16452112859864147620,5844417301642981317) │
+└────────────────────────────────────────────┘
+```
+
+## wordShingleMinHashCaseInsensitive {#wordshingleminhashcaseinsensitive}
+
+Выделяет из ASCII строки отрезки (шинглы) из `shinglesize` слов и вычисляет хеш для каждого шингла. Использует `hashnum` минимальных хешей, чтобы вычислить минимальный хеш, и `hashnum` максимальных хешей, чтобы вычислить максимальный хеш. Возвращает кортеж из этих хешей. Функция регистро**не**зависимая.
+
+Может быть использована для проверки двух строк на схожесть вместе с функцией [tupleHammingDistance](../../sql-reference/functions/tuple-functions.md#tuplehammingdistance). Если для двух строк минимальные или максимальные хеши одинаковы, мы считаем, что эти строки совпадают.
+
+**Синтаксис**
+
+``` sql
+wordShingleMinHashCaseInsensitive(string[, shinglesize, hashnum])
+```
+
+**Аргументы**
+
+-   `string` — строка. [String](../../sql-reference/data-types/string.md).
+-   `shinglesize` — размер словесных шинглов. Необязательный. Возможные значения: любое число от `1` до `25`. Значение по умолчанию: `3`. [UInt8](../../sql-reference/data-types/int-uint.md).
+-   `hashnum` — количество минимальных и максимальных хешей, которое используется при вычислении результата. Необязательный. Возможные значения: любое число от `1` до `25`. Значение по умолчанию: `6`. [UInt8](../../sql-reference/data-types/int-uint.md).
+
+**Возвращаемое значение**
+
+-   Кортеж с двумя хешами — минимальным и максимальным.
+
+Тип: [Tuple](../../sql-reference/data-types/tuple.md)([UInt64](../../sql-reference/data-types/int-uint.md), [UInt64](../../sql-reference/data-types/int-uint.md)).
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT wordShingleMinHashCaseInsensitive('ClickHouse® is a column-oriented database management system (DBMS) for online analytical processing of queries (OLAP).') AS Tuple;
+```
+
+Результат:
+
+``` text
+┌─Tuple─────────────────────────────────────┐
+│ (3065874883688416519,1634050779997673240) │
+└───────────────────────────────────────────┘
+```
+
+## wordShingleMinHashUTF8 {#wordshingleminhashutf8}
+
+Выделяет из UTF-8 строки отрезки (шинглы) из `shinglesize` слов и вычисляет хеш для каждого шингла. Использует `hashnum` минимальных хешей, чтобы вычислить минимальный хеш, и `hashnum` максимальных хешей, чтобы вычислить максимальный хеш. Возвращает кортеж из этих хешей. Функция регистрозависимая.
+
+Может быть использована для проверки двух строк на схожесть вместе с функцией [tupleHammingDistance](../../sql-reference/functions/tuple-functions.md#tuplehammingdistance). Если для двух строк минимальные или максимальные хеши одинаковы, мы считаем, что эти строки совпадают.
+
+**Синтаксис**
+
+``` sql
+wordShingleMinHashUTF8(string[, shinglesize, hashnum])
+```
+
+**Аргументы**
+
+-   `string` — строка. [String](../../sql-reference/data-types/string.md).
+-   `shinglesize` — размер словесных шинглов. Необязательный. Возможные значения: любое число от `1` до `25`. Значение по умолчанию: `3`. [UInt8](../../sql-reference/data-types/int-uint.md).
+-   `hashnum` — количество минимальных и максимальных хешей, которое используется при вычислении результата. Необязательный. Возможные значения: любое число от `1` до `25`. Значение по умолчанию: `6`. [UInt8](../../sql-reference/data-types/int-uint.md).
+
+**Возвращаемое значение**
+
+-   Кортеж с двумя хешами — минимальным и максимальным.
+
+Тип: [Tuple](../../sql-reference/data-types/tuple.md)([UInt64](../../sql-reference/data-types/int-uint.md), [UInt64](../../sql-reference/data-types/int-uint.md)).
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT wordShingleMinHashUTF8('ClickHouse® is a column-oriented database management system (DBMS) for online analytical processing of queries (OLAP).') AS Tuple;
+```
+
+Результат:
+
+``` text
+┌─Tuple──────────────────────────────────────┐
+│ (16452112859864147620,5844417301642981317) │
+└────────────────────────────────────────────┘
+```
+
+## wordShingleMinHashCaseInsensitiveUTF8 {#wordshingleminhashcaseinsensitiveutf8}
+
+Выделяет из UTF-8 строки отрезки (шинглы) из `shinglesize` слов и вычисляет хеш для каждого шингла. Использует `hashnum` минимальных хешей, чтобы вычислить минимальный хеш, и `hashnum` максимальных хешей, чтобы вычислить максимальный хеш. Возвращает кортеж из этих хешей. Функция регистро**не**зависимая.
+
+Может быть использована для проверки двух строк на схожесть вместе с функцией [tupleHammingDistance](../../sql-reference/functions/tuple-functions.md#tuplehammingdistance). Если для двух строк минимальные или максимальные хеши одинаковы, мы считаем, что эти строки совпадают.
+
+**Синтаксис**
+
+``` sql
+wordShingleMinHashCaseInsensitiveUTF8(string[, shinglesize, hashnum])
+```
+
+**Аргументы**
+
+-   `string` — строка. [String](../../sql-reference/data-types/string.md).
+-   `shinglesize` — размер словесных шинглов. Необязательный. Возможные значения: любое число от `1` до `25`. Значение по умолчанию: `3`. [UInt8](../../sql-reference/data-types/int-uint.md).
+-   `hashnum` — количество минимальных и максимальных хешей, которое используется при вычислении результата. Необязательный. Возможные значения: любое число от `1` до `25`. Значение по умолчанию: `6`. [UInt8](../../sql-reference/data-types/int-uint.md).
+
+**Возвращаемое значение**
+
+-   Кортеж с двумя хешами — минимальным и максимальным.
+
+Тип: [Tuple](../../sql-reference/data-types/tuple.md)([UInt64](../../sql-reference/data-types/int-uint.md), [UInt64](../../sql-reference/data-types/int-uint.md)).
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT wordShingleMinHashCaseInsensitiveUTF8('ClickHouse® is a column-oriented database management system (DBMS) for online analytical processing of queries (OLAP).') AS Tuple;
+```
+
+Результат:
+
+``` text
+┌─Tuple─────────────────────────────────────┐
+│ (3065874883688416519,1634050779997673240) │
+└───────────────────────────────────────────┘
+```
+
+## wordShingleMinHashArg {#wordshingleminhasharg}
+
+Выделяет из ASCII строки отрезки (шинглы) из `shinglesize` слов и возвращает шинглы с минимальным и максимальным хешами, вычисленными функцией [wordshingleMinHash](#wordshingleminhash) с теми же входными данными. Функция регистрозависимая.
+
+**Синтаксис**
+
+``` sql
+wordShingleMinHashArg(string[, shinglesize, hashnum])
+```
+
+**Аргументы**
+
+-   `string` — строка. [String](../../sql-reference/data-types/string.md).
+-   `shinglesize` — размер словесных шинглов. Необязательный. Возможные значения: любое число от `1` до `25`. Значение по умолчанию: `3`. [UInt8](../../sql-reference/data-types/int-uint.md).
+-   `hashnum` — количество минимальных и максимальных хешей, которое используется при вычислении результата. Необязательный. Возможные значения: любое число от `1` до `25`. Значение по умолчанию: `6`. [UInt8](../../sql-reference/data-types/int-uint.md).
+
+**Возвращаемое значение**
+
+-   Кортеж из двух кортежей, каждый из которых состоит из `hashnum` шинглов.
+
+Тип: [Tuple](../../sql-reference/data-types/tuple.md)([Tuple](../../sql-reference/data-types/tuple.md)([String](../../sql-reference/data-types/string.md)), [Tuple](../../sql-reference/data-types/tuple.md)([String](../../sql-reference/data-types/string.md))).
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT wordShingleMinHashArg('ClickHouse® is a column-oriented database management system (DBMS) for online analytical processing of queries (OLAP).', 1, 3) AS Tuple;
+```
+
+Результат:
+
+``` text
+┌─Tuple─────────────────────────────────────────────────────────────────┐
+│ (('OLAP','database','analytical'),('online','oriented','processing')) │
+└───────────────────────────────────────────────────────────────────────┘
+```
+
+## wordShingleMinHashArgCaseInsensitive {#wordshingleminhashargcaseinsensitive}
+
+Выделяет из ASCII строки отрезки (шинглы) из `shinglesize` слов и возвращает шинглы с минимальным и максимальным хешами, вычисленными функцией [wordShingleMinHashCaseInsensitive](#wordshingleminhashcaseinsensitive) с теми же входными данными. Функция регистро**не**зависимая.
+
+**Синтаксис**
+
+``` sql
+wordShingleMinHashArgCaseInsensitive(string[, shinglesize, hashnum])
+```
+
+**Аргументы**
+
+-   `string` — строка. [String](../../sql-reference/data-types/string.md).
+-   `shinglesize` — размер словесных шинглов. Необязательный. Возможные значения: любое число от `1` до `25`. Значение по умолчанию: `3`. [UInt8](../../sql-reference/data-types/int-uint.md).
+-   `hashnum` — количество минимальных и максимальных хешей, которое используется при вычислении результата. Необязательный. Возможные значения: любое число от `1` до `25`. Значение по умолчанию: `6`. [UInt8](../../sql-reference/data-types/int-uint.md).
+
+**Возвращаемое значение**
+
+-   Кортеж из двух кортежей, каждый из которых состоит из `hashnum` шинглов.
+
+Тип: [Tuple](../../sql-reference/data-types/tuple.md)([Tuple](../../sql-reference/data-types/tuple.md)([String](../../sql-reference/data-types/string.md)), [Tuple](../../sql-reference/data-types/tuple.md)([String](../../sql-reference/data-types/string.md))).
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT wordShingleMinHashArgCaseInsensitive('ClickHouse® is a column-oriented database management system (DBMS) for online analytical processing of queries (OLAP).', 1, 3) AS Tuple;
+```
+
+Результат:
+
+``` text
+┌─Tuple──────────────────────────────────────────────────────────────────┐
+│ (('queries','database','analytical'),('oriented','processing','DBMS')) │
+└────────────────────────────────────────────────────────────────────────┘
+```
+
+## wordShingleMinHashArgUTF8 {#wordshingleminhashargutf8}
+
+Выделяет из UTF-8 строки отрезки (шинглы) из `shinglesize` слов и возвращает шинглы с минимальным и максимальным хешами, вычисленными функцией [wordShingleMinHashUTF8](#wordshingleminhashutf8) с теми же входными данными. Функция регистрозависимая.
+
+**Синтаксис**
+
+``` sql
+wordShingleMinHashArgUTF8(string[, shinglesize, hashnum])
+```
+
+**Аргументы**
+
+-   `string` — строка. [String](../../sql-reference/data-types/string.md).
+-   `shinglesize` — размер словесных шинглов. Необязательный. Возможные значения: любое число от `1` до `25`. Значение по умолчанию: `3`. [UInt8](../../sql-reference/data-types/int-uint.md).
+-   `hashnum` — количество минимальных и максимальных хешей, которое используется при вычислении результата. Необязательный. Возможные значения: любое число от `1` до `25`. Значение по умолчанию: `6`. [UInt8](../../sql-reference/data-types/int-uint.md).
+
+**Возвращаемое значение**
+
+-   Кортеж из двух кортежей, каждый из которых состоит из `hashnum` шинглов.
+
+Тип: [Tuple](../../sql-reference/data-types/tuple.md)([Tuple](../../sql-reference/data-types/tuple.md)([String](../../sql-reference/data-types/string.md)), [Tuple](../../sql-reference/data-types/tuple.md)([String](../../sql-reference/data-types/string.md))).
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT wordShingleMinHashArgUTF8('ClickHouse® is a column-oriented database management system (DBMS) for online analytical processing of queries (OLAP).', 1, 3) AS Tuple;
+```
+
+Результат:
+
+``` text
+┌─Tuple─────────────────────────────────────────────────────────────────┐
+│ (('OLAP','database','analytical'),('online','oriented','processing')) │
+└───────────────────────────────────────────────────────────────────────┘
+```
+
+## wordShingleMinHashArgCaseInsensitiveUTF8 {#wordshingleminhashargcaseinsensitiveutf8}
+
+Выделяет из UTF-8 строки отрезки (шинглы) из `shinglesize` слов и возвращает шинглы с минимальным и максимальным хешами, вычисленными функцией [wordShingleMinHashCaseInsensitiveUTF8](#wordshingleminhashcaseinsensitiveutf8) с теми же входными данными. Функция регистро**не**зависимая.
+
+**Синтаксис**
+
+``` sql
+wordShingleMinHashArgCaseInsensitiveUTF8(string[, shinglesize, hashnum])
+```
+
+**Аргументы**
+
+-   `string` — строка. [String](../../sql-reference/data-types/string.md).
+-   `shinglesize` — размер словесных шинглов. Необязательный. Возможные значения: любое число от `1` до `25`. Значение по умолчанию: `3`. [UInt8](../../sql-reference/data-types/int-uint.md).
+-   `hashnum` — количество минимальных и максимальных хешей, которое используется при вычислении результата. Необязательный. Возможные значения: любое число от `1` до `25`. Значение по умолчанию: `6`. [UInt8](../../sql-reference/data-types/int-uint.md).
+
+**Возвращаемое значение**
+
+-   Кортеж из двух кортежей, каждый из которых состоит из `hashnum` шинглов.
+
+Тип: [Tuple](../../sql-reference/data-types/tuple.md)([Tuple](../../sql-reference/data-types/tuple.md)([String](../../sql-reference/data-types/string.md)), [Tuple](../../sql-reference/data-types/tuple.md)([String](../../sql-reference/data-types/string.md))).
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT wordShingleMinHashArgCaseInsensitiveUTF8('ClickHouse® is a column-oriented database management system (DBMS) for online analytical processing of queries (OLAP).', 1, 3) AS Tuple;
+```
+
+Результат:
+
+``` text
+┌─Tuple──────────────────────────────────────────────────────────────────┐
+│ (('queries','database','analytical'),('oriented','processing','DBMS')) │
+└────────────────────────────────────────────────────────────────────────┘
+```
diff --git a/docs/ru/sql-reference/functions/in-functions.md b/docs/ru/sql-reference/functions/in-functions.md
index b732f67303b..2bdb71d5f93 100644
--- a/docs/ru/sql-reference/functions/in-functions.md
+++ b/docs/ru/sql-reference/functions/in-functions.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 60
-toc_title: "\u0424\u0443\u043d\u043a\u0446\u0438\u0438\u0020\u0434\u043b\u044f\u0020\u0440\u0435\u0430\u043b\u0438\u0437\u0430\u0446\u0438\u0438\u0020\u043e\u043f\u0435\u0440\u0430\u0442\u043e\u0440\u0430\u0020\u0049\u004e"
+toc_title: "Функции для реализации оператора IN"
 ---
 
 # Функции для реализации оператора IN {#funktsii-dlia-realizatsii-operatora-in}
@@ -9,4 +9,3 @@ toc_title: "\u0424\u0443\u043d\u043a\u0446\u0438\u0438\u0020\u0434\u043b\u044f\u
 
 Смотрите раздел [Операторы IN](../operators/in.md#select-in-operators).
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/functions/in_functions/) <!--hide-->
diff --git a/docs/ru/sql-reference/functions/index.md b/docs/ru/sql-reference/functions/index.md
index 25d3b6de067..1eefd4d9f73 100644
--- a/docs/ru/sql-reference/functions/index.md
+++ b/docs/ru/sql-reference/functions/index.md
@@ -1,7 +1,7 @@
 ---
-toc_folder_title: "\u0424\u0443\u043d\u043a\u0446\u0438\u0438"
+toc_folder_title: "Функции"
 toc_priority: 32
-toc_title: "\u0412\u0432\u0435\u0434\u0435\u043d\u0438\u0435"
+toc_title: "Введение"
 ---
 
 # Функции {#funktsii}
@@ -82,4 +82,3 @@ str -> str != Referer
 
 Если функция в запросе выполняется на сервере-инициаторе запроса, а вам нужно, чтобы она выполнялась на удалённых серверах, вы можете обернуть её в агрегатную функцию any или добавить в ключ в `GROUP BY`.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/functions/) <!--hide-->
diff --git a/docs/ru/sql-reference/functions/introspection.md b/docs/ru/sql-reference/functions/introspection.md
index 00dd660bc16..cb2bcdb787f 100644
--- a/docs/ru/sql-reference/functions/introspection.md
+++ b/docs/ru/sql-reference/functions/introspection.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 65
-toc_title: "\u0424\u0443\u043d\u043a\u0446\u0438\u0438\u0020\u0438\u043d\u0442\u0440\u043e\u0441\u043f\u0435\u043a\u0446\u0438\u0438"
+toc_title: "Функции интроспекции"
 ---
 
 # Функции интроспекции {#introspection-functions}
@@ -32,7 +32,7 @@ ClickHouse сохраняет отчеты профилировщика в [жу
 addressToLine(address_of_binary_instruction)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `address_of_binary_instruction` ([Тип UInt64](../../sql-reference/functions/introspection.md))- Адрес инструкции в запущенном процессе.
 
@@ -53,13 +53,13 @@ addressToLine(address_of_binary_instruction)
 Включение функций самоанализа:
 
 ``` sql
-SET allow_introspection_functions=1
+SET allow_introspection_functions=1;
 ```
 
 Выбор первой строки из списка `trace_log` системная таблица:
 
 ``` sql
-SELECT * FROM system.trace_log LIMIT 1 \G
+SELECT * FROM system.trace_log LIMIT 1 \G;
 ```
 
 ``` text
@@ -79,7 +79,7 @@ trace:                   [140658411141617,94784174532828,94784076370703,94784076
 Получение имени файла исходного кода и номера строки для одного адреса:
 
 ``` sql
-SELECT addressToLine(94784076370703) \G
+SELECT addressToLine(94784076370703) \G;
 ```
 
 ``` text
@@ -123,9 +123,9 @@ trace_source_code_lines: /lib/x86_64-linux-gnu/libpthread-2.27.so
 addressToSymbol(address_of_binary_instruction)
 ```
 
-**Параметры**
+**Аргументы**
 
--   `address_of_binary_instruction` ([Тип uint64](../../sql-reference/functions/introspection.md)) — Адрес инструкции в запущенном процессе.
+-   `address_of_binary_instruction` ([Тип uint64](../../sql-reference/functions/introspection.md)) — адрес инструкции в запущенном процессе.
 
 **Возвращаемое значение**
 
@@ -139,13 +139,13 @@ addressToSymbol(address_of_binary_instruction)
 Включение функций самоанализа:
 
 ``` sql
-SET allow_introspection_functions=1
+SET allow_introspection_functions=1;
 ```
 
 Выбор первой строки из списка `trace_log` системная таблица:
 
 ``` sql
-SELECT * FROM system.trace_log LIMIT 1 \G
+SELECT * FROM system.trace_log LIMIT 1 \G;
 ```
 
 ``` text
@@ -165,7 +165,7 @@ trace:         [94138803686098,94138815010911,94138815096522,94138815101224,9413
 Получение символа для одного адреса:
 
 ``` sql
-SELECT addressToSymbol(94138803686098) \G
+SELECT addressToSymbol(94138803686098) \G;
 ```
 
 ``` text
@@ -220,9 +220,9 @@ clone
 demangle(symbol)
 ```
 
-**Параметры**
+**Аргументы**
 
--   `symbol` ([Строка](../../sql-reference/functions/introspection.md)) - Символ из объектного файла.
+-   `symbol` ([Строка](../../sql-reference/functions/introspection.md)) - символ из объектного файла.
 
 **Возвращаемое значение**
 
@@ -236,13 +236,13 @@ demangle(symbol)
 Включение функций самоанализа:
 
 ``` sql
-SET allow_introspection_functions=1
+SET allow_introspection_functions=1;
 ```
 
 Выбор первой строки из списка `trace_log` системная таблица:
 
 ``` sql
-SELECT * FROM system.trace_log LIMIT 1 \G
+SELECT * FROM system.trace_log LIMIT 1 \G;
 ```
 
 ``` text
@@ -262,7 +262,7 @@ trace:         [94138803686098,94138815010911,94138815096522,94138815101224,9413
 Получение имени функции для одного адреса:
 
 ``` sql
-SELECT demangle(addressToSymbol(94138803686098)) \G
+SELECT demangle(addressToSymbol(94138803686098)) \G;
 ```
 
 ``` text
@@ -336,6 +336,7 @@ SELECT tid();
 │  3878 │
 └───────┘
 ```
+
 ## logTrace {#logtrace}
 
  Выводит сообщение в лог сервера для каждого [Block](https://clickhouse.tech/docs/ru/development/architecture/#block).
@@ -346,7 +347,7 @@ SELECT tid();
 logTrace('message')
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `message` — сообщение, которое отправляется в серверный лог. [String](../../sql-reference/data-types/string.md#string).
 
@@ -354,7 +355,7 @@ logTrace('message')
 
 -   Всегда возвращает 0.
 
-**Example**
+**Пример**
 
 Запрос:
 
@@ -370,4 +371,4 @@ SELECT logTrace('logTrace message');
 └──────────────────────────────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/query_language/functions/introspection/) <!--hide-->
\ No newline at end of file
+[Original article](https://clickhouse.tech/docs/en/query_language/functions/introspection/) <!--hide-->
diff --git a/docs/ru/sql-reference/functions/ip-address-functions.md b/docs/ru/sql-reference/functions/ip-address-functions.md
index 52f0a92bc9f..d7f6d2f7618 100644
--- a/docs/ru/sql-reference/functions/ip-address-functions.md
+++ b/docs/ru/sql-reference/functions/ip-address-functions.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 55
-toc_title: "\u0424\u0443\u043d\u043a\u0446\u0438\u0438\u0020\u0434\u043b\u044f\u0020\u0440\u0430\u0431\u043e\u0442\u044b\u0020\u0441\u0020\u0049\u0050\u002d\u0430\u0434\u0440\u0435\u0441\u0430\u043c\u0438"
+toc_title: "Функции для работы с IP-адресами"
 ---
 
 # Функции для работы с IP-адресами {#funktsii-dlia-raboty-s-ip-adresami}
@@ -9,10 +9,14 @@ toc_title: "\u0424\u0443\u043d\u043a\u0446\u0438\u0438\u0020\u0434\u043b\u044f\u
 
 Принимает число типа UInt32. Интерпретирует его, как IPv4-адрес в big endian. Возвращает строку, содержащую соответствующий IPv4-адрес в формате A.B.C.D (числа в десятичной форме через точки).
 
+Синоним: `INET_NTOA`.
+
 ## IPv4StringToNum(s) {#ipv4stringtonums}
 
 Функция, обратная к IPv4NumToString. Если IPv4 адрес в неправильном формате, то возвращает 0.
 
+Синоним: `INET_ATON`.
+
 ## IPv4NumToStringClassC(num) {#ipv4numtostringclasscnum}
 
 Похоже на IPv4NumToString, но вместо последнего октета используется xxx.
@@ -49,7 +53,11 @@ LIMIT 10
 ### IPv6NumToString(x) {#ipv6numtostringx}
 
 Принимает значение типа FixedString(16), содержащее IPv6-адрес в бинарном виде. Возвращает строку, содержащую этот адрес в текстовом виде.
-IPv6-mapped IPv4 адреса выводится в формате ::ffff:111.222.33.44. Примеры:
+IPv6-mapped IPv4 адреса выводится в формате ::ffff:111.222.33.44. 
+
+Примеры: `INET6_NTOA`.
+
+Примеры:
 
 ``` sql
 SELECT IPv6NumToString(toFixedString(unhex('2A0206B8000000000000000000000011'), 16)) AS addr
@@ -113,17 +121,60 @@ LIMIT 10
 └────────────────────────────┴────────┘
 ```
 
-## IPv6StringToNum(s) {#ipv6stringtonums}
+## IPv6StringToNum {#ipv6stringtonums}
+
+Функция, обратная к [IPv6NumToString](#ipv6numtostringx). Если IPv6 адрес передан в неправильном формате, то возвращает строку из нулевых байт.
+
+Если IP адрес является корректным IPv4 адресом, функция возвращает его IPv6 эквивалент.
 
-Функция, обратная к IPv6NumToString. Если IPv6 адрес в неправильном формате, то возвращает строку из нулевых байт.
 HEX может быть в любом регистре.
 
+Синоним: `INET6_ATON`.
+
+**Синтаксис**
+
+``` sql
+IPv6StringToNum(string)
+```
+
+**Аргумент** 
+
+-   `string` — IP адрес. [String](../../sql-reference/data-types/string.md).
+
+**Возвращаемое значение**
+
+-   Адрес IPv6 в двоичном представлении.
+
+Тип: [FixedString(16)](../../sql-reference/data-types/fixedstring.md).
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT addr, cutIPv6(IPv6StringToNum(addr), 0, 0) FROM (SELECT ['notaddress', '127.0.0.1', '1111::ffff'] AS addr) ARRAY JOIN addr;
+```
+
+Результат:
+
+``` text
+┌─addr───────┬─cutIPv6(IPv6StringToNum(addr), 0, 0)─┐
+│ notaddress │ ::                                   │
+│ 127.0.0.1  │ ::ffff:127.0.0.1                     │
+│ 1111::ffff │ 1111::ffff                           │
+└────────────┴──────────────────────────────────────┘
+```
+
+**Смотрите также**
+
+-   [cutIPv6](#cutipv6x-bytestocutforipv6-bytestocutforipv4).
+
 ## IPv4ToIPv6(x) {#ipv4toipv6x}
 
 Принимает число типа `UInt32`. Интерпретирует его, как IPv4-адрес в [big endian](https://en.wikipedia.org/wiki/Endianness). Возвращает значение `FixedString(16)`, содержащее адрес IPv6 в двоичном формате. Примеры:
 
 ``` sql
-SELECT IPv6NumToString(IPv4ToIPv6(IPv4StringToNum('192.168.0.1'))) AS addr
+SELECT IPv6NumToString(IPv4ToIPv6(IPv4StringToNum('192.168.0.1'))) AS addr;
 ```
 
 ``` text
@@ -156,7 +207,7 @@ SELECT
 Принимает на вход IPv4 и значение `UInt8`, содержащее [CIDR](https://ru.wikipedia.org/wiki/Бесклассовая_адресация). Возвращает кортеж с двумя IPv4, содержащими нижний и более высокий диапазон подсети.
 
 ``` sql
-SELECT IPv4CIDRToRange(toIPv4('192.168.5.2'), 16)
+SELECT IPv4CIDRToRange(toIPv4('192.168.5.2'), 16);
 ```
 
 ``` text
@@ -170,7 +221,7 @@ SELECT IPv4CIDRToRange(toIPv4('192.168.5.2'), 16)
 Принимает на вход IPv6 и значение `UInt8`, содержащее CIDR. Возвращает кортеж с двумя IPv6, содержащими нижний и более высокий диапазон подсети.
 
 ``` sql
-SELECT IPv6CIDRToRange(toIPv6('2001:0db8:0000:85a3:0000:0000:ac1f:8001'), 32)
+SELECT IPv6CIDRToRange(toIPv6('2001:0db8:0000:85a3:0000:0000:ac1f:8001'), 32);
 ```
 
 ``` text
@@ -211,38 +262,62 @@ SELECT
 └───────────────────────────────────┴──────────────────────────┘
 ```
 
-## toIPv6(string) {#toipv6string}
+## toIPv6 {#toipv6string}
 
-Псевдоним функции `IPv6StringToNum()` которая принимает строку с адресом IPv6 и возвращает значение типа [IPv6](../../sql-reference/functions/ip-address-functions.md), которое равно значению, возвращаемому функцией `IPv6StringToNum()`.
+Приводит строку с адресом в формате IPv6 к типу [IPv6](../../sql-reference/data-types/domains/ipv6.md). Возвращает пустое значение, если входящая строка не является корректным IP адресом.
+Похоже на функцию [IPv6StringToNum](#ipv6stringtonums), которая представляет адрес IPv6 в двоичном виде.
 
-``` sql
-WITH
-    '2001:438:ffff::407d:1bc1' as IPv6_string
-SELECT
-    toTypeName(IPv6StringToNum(IPv6_string)),
-    toTypeName(toIPv6(IPv6_string))
+Если входящая строка содержит корректный IPv4 адрес, функция возвращает его IPv6 эквивалент.
+
+**Синтаксис**
+
+```sql
+toIPv6(string)
 ```
 
-``` text
-┌─toTypeName(IPv6StringToNum(IPv6_string))─┬─toTypeName(toIPv6(IPv6_string))─┐
-│ FixedString(16)                          │ IPv6                            │
-└──────────────────────────────────────────┴─────────────────────────────────┘
-```
+**Аргумент**
+
+-   `string` — IP адрес. [String](../../sql-reference/data-types/string.md)
+
+**Возвращаемое значение**
+
+-   IP адрес. 
+
+Тип: [IPv6](../../sql-reference/data-types/domains/ipv6.md).
+
+**Примеры**
+
+Запрос:
 
 ``` sql
-WITH
-    '2001:438:ffff::407d:1bc1' as IPv6_string
+WITH '2001:438:ffff::407d:1bc1' AS IPv6_string
 SELECT
     hex(IPv6StringToNum(IPv6_string)),
-    hex(toIPv6(IPv6_string))
+    hex(toIPv6(IPv6_string));
 ```
 
+Результат:
+
 ``` text
 ┌─hex(IPv6StringToNum(IPv6_string))─┬─hex(toIPv6(IPv6_string))─────────┐
 │ 20010438FFFF000000000000407D1BC1  │ 20010438FFFF000000000000407D1BC1 │
 └───────────────────────────────────┴──────────────────────────────────┘
 ```
 
+Запрос:
+
+``` sql
+SELECT toIPv6('127.0.0.1');
+```
+
+Результат:
+
+``` text
+┌─toIPv6('127.0.0.1')─┐
+│ ::ffff:127.0.0.1    │
+└─────────────────────┘
+```
+
 ## isIPv4String {#isipv4string}
 
 Определяет, является ли строка адресом IPv4 или нет. Также вернет `0`, если `string` — адрес IPv6.
@@ -253,7 +328,7 @@ SELECT
 isIPv4String(string)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `string` — IP адрес. [String](../../sql-reference/data-types/string.md).
 
@@ -268,7 +343,7 @@ isIPv4String(string)
 Запрос:
 
 ```sql
-SELECT addr, isIPv4String(addr) FROM ( SELECT ['0.0.0.0', '127.0.0.1', '::ffff:127.0.0.1'] AS addr ) ARRAY JOIN addr
+SELECT addr, isIPv4String(addr) FROM ( SELECT ['0.0.0.0', '127.0.0.1', '::ffff:127.0.0.1'] AS addr ) ARRAY JOIN addr;
 ```
 
 Результат:
@@ -291,7 +366,7 @@ SELECT addr, isIPv4String(addr) FROM ( SELECT ['0.0.0.0', '127.0.0.1', '::ffff:1
 isIPv6String(string)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `string` — IP адрес. [String](../../sql-reference/data-types/string.md).
 
@@ -306,7 +381,7 @@ isIPv6String(string)
 Запрос:
 
 ``` sql
-SELECT addr, isIPv6String(addr) FROM ( SELECT ['::', '1111::ffff', '::ffff:127.0.0.1', '127.0.0.1'] AS addr ) ARRAY JOIN addr
+SELECT addr, isIPv6String(addr) FROM ( SELECT ['::', '1111::ffff', '::ffff:127.0.0.1', '127.0.0.1'] AS addr ) ARRAY JOIN addr;
 ```
 
 Результат:
@@ -320,4 +395,54 @@ SELECT addr, isIPv6String(addr) FROM ( SELECT ['::', '1111::ffff', '::ffff:127.0
 └──────────────────┴────────────────────┘
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/functions/ip_address_functions/) <!--hide-->
+## isIPAddressInRange {#isipaddressinrange}
+
+Проверяет попадает ли IP адрес в интервал, заданный в [CIDR](https://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing) нотации.
+
+**Syntax**
+
+``` sql
+isIPAddressInRange(address, prefix)
+```
+Функция принимает IPv4 или IPv6 адрес виде строки. Возвращает `0`, если версия адреса и интервала не совпадают.
+
+**Аргументы**
+
+-   `address` — IPv4 или IPv6 адрес. [String](../../sql-reference/data-types/string.md).
+-   `prefix` — IPv4 или IPv6 подсеть, заданная в CIDR нотации. [String](../../sql-reference/data-types/string.md).
+
+**Возвращаемое значение**
+
+-   `1` или `0`.
+
+Тип: [UInt8](../../sql-reference/data-types/int-uint.md).
+
+**Примеры**
+
+Запрос:
+
+``` sql
+SELECT isIPAddressInRange('127.0.0.1', '127.0.0.0/8')
+```
+
+Результат:
+
+``` text
+┌─isIPAddressInRange('127.0.0.1', '127.0.0.0/8')─┐
+│                                              1 │
+└────────────────────────────────────────────────┘
+```
+
+Запрос:
+
+``` sql
+SELECT isIPAddressInRange('127.0.0.1', 'ffff::/16')
+```
+
+Результат:
+
+``` text
+┌─isIPAddressInRange('127.0.0.1', 'ffff::/16')─┐
+│                                            0 │
+└──────────────────────────────────────────────┘
+```
diff --git a/docs/ru/sql-reference/functions/json-functions.md b/docs/ru/sql-reference/functions/json-functions.md
index 69b8f8f98f5..4de487c03ad 100644
--- a/docs/ru/sql-reference/functions/json-functions.md
+++ b/docs/ru/sql-reference/functions/json-functions.md
@@ -16,51 +16,65 @@ toc_title: JSON
 
 ## visitParamHas(params, name) {#visitparamhasparams-name}
 
-Проверить наличие поля с именем name.
+Проверяет наличие поля с именем `name`.
+
+Алиас: `simpleJSONHas`.
 
 ## visitParamExtractUInt(params, name) {#visitparamextractuintparams-name}
 
-Распарсить UInt64 из значения поля с именем name. Если поле строковое - попытаться распарсить число из начала строки. Если такого поля нет, или если оно есть, но содержит не число, то вернуть 0.
+Пытается выделить число типа UInt64 из значения поля с именем `name`. Если поле строковое, пытается выделить число из начала строки. Если такого поля нет, или если оно есть, но содержит не число, то возвращает 0.
+
+Алиас: `simpleJSONExtractUInt`.
 
 ## visitParamExtractInt(params, name) {#visitparamextractintparams-name}
 
 Аналогично для Int64.
 
+Алиас: `simpleJSONExtractInt`.
+
 ## visitParamExtractFloat(params, name) {#visitparamextractfloatparams-name}
 
 Аналогично для Float64.
 
+Алиас: `simpleJSONExtractFloat`.
+
 ## visitParamExtractBool(params, name) {#visitparamextractboolparams-name}
 
-Распарсить значение true/false. Результат - UInt8.
+Пытается выделить значение true/false. Результат — UInt8.
+
+Алиас: `simpleJSONExtractBool`.
 
 ## visitParamExtractRaw(params, name) {#visitparamextractrawparams-name}
 
-Вернуть значение поля, включая разделители.
+Возвращает значение поля, включая разделители.
+
+Алиас: `simpleJSONExtractRaw`.
 
 Примеры:
 
 ``` sql
-visitParamExtractRaw('{"abc":"\\n\\u0000"}', 'abc') = '"\\n\\u0000"'
-visitParamExtractRaw('{"abc":{"def":[1,2,3]}}', 'abc') = '{"def":[1,2,3]}'
+visitParamExtractRaw('{"abc":"\\n\\u0000"}', 'abc') = '"\\n\\u0000"';
+visitParamExtractRaw('{"abc":{"def":[1,2,3]}}', 'abc') = '{"def":[1,2,3]}';
 ```
 
 ## visitParamExtractString(params, name) {#visitparamextractstringparams-name}
 
-Распарсить строку в двойных кавычках. У значения убирается экранирование. Если убрать экранированные символы не удалось, то возвращается пустая строка.
+Разбирает строку в двойных кавычках. У значения убирается экранирование. Если убрать экранированные символы не удалось, то возвращается пустая строка.
+
+Алиас: `simpleJSONExtractString`.
 
 Примеры:
 
 ``` sql
-visitParamExtractString('{"abc":"\\n\\u0000"}', 'abc') = '\n\0'
-visitParamExtractString('{"abc":"\\u263a"}', 'abc') = '☺'
-visitParamExtractString('{"abc":"\\u263"}', 'abc') = ''
-visitParamExtractString('{"abc":"hello}', 'abc') = ''
+visitParamExtractString('{"abc":"\\n\\u0000"}', 'abc') = '\n\0';
+visitParamExtractString('{"abc":"\\u263a"}', 'abc') = '☺';
+visitParamExtractString('{"abc":"\\u263"}', 'abc') = '';
+visitParamExtractString('{"abc":"hello}', 'abc') = '';
 ```
 
-На данный момент, не поддерживаются записанные в формате `\uXXXX\uYYYY` кодовые точки не из basic multilingual plane (они переводятся не в UTF-8, а в CESU-8).
+На данный момент не поддерживаются записанные в формате `\uXXXX\uYYYY` кодовые точки не из basic multilingual plane (они переводятся не в UTF-8, а в CESU-8).
 
-Следующие функции используют [simdjson](https://github.com/lemire/simdjson) который разработан под более сложные требования для разбора JSON. Упомянутое выше предположение 2 по-прежнему применимо.
+Следующие функции используют [simdjson](https://github.com/lemire/simdjson), который разработан под более сложные требования для разбора JSON. Упомянутое выше допущение 2 по-прежнему применимо.
 
 ## isValidJSON(json) {#isvalidjsonjson}
 
@@ -211,7 +225,7 @@ SELECT JSONExtractKeysAndValues('{"x": {"a": 5, "b": 7, "c": 11}}', 'x', 'Int8')
 Пример:
 
 ``` sql
-SELECT JSONExtractRaw('{"a": "hello", "b": [-100, 200.0, 300]}', 'b') = '[-100, 200.0, 300]'
+SELECT JSONExtractRaw('{"a": "hello", "b": [-100, 200.0, 300]}', 'b') = '[-100, 200.0, 300]';
 ```
 
 ## JSONExtractArrayRaw(json\[, indices_or_keys\]…) {#jsonextractarrayrawjson-indices-or-keys}
@@ -223,7 +237,7 @@ SELECT JSONExtractRaw('{"a": "hello", "b": [-100, 200.0, 300]}', 'b') = '[-100,
 Пример:
 
 ``` sql
-SELECT JSONExtractArrayRaw('{"a": "hello", "b": [-100, 200.0, "hello"]}', 'b') = ['-100', '200.0', '"hello"']'
+SELECT JSONExtractArrayRaw('{"a": "hello", "b": [-100, 200.0, "hello"]}', 'b') = ['-100', '200.0', '"hello"']';
 ```
 
 ## JSONExtractKeysAndValuesRaw {#json-extract-keys-and-values-raw}
@@ -236,29 +250,28 @@ SELECT JSONExtractArrayRaw('{"a": "hello", "b": [-100, 200.0, "hello"]}', 'b') =
 JSONExtractKeysAndValuesRaw(json[, p, a, t, h])
 ```
 
-**Параметры**
+**Аргументы**
 
-- `json` — [Строка](../data-types/string.md), содержащая валидный JSON.
-- `p, a, t, h` — Индексы или ключи, разделенные запятыми, которые указывают путь к внутреннему полю во вложенном объекте JSON. Каждый аргумент может быть либо [строкой](../data-types/string.md) для получения поля по ключу, либо [целым числом](../data-types/int-uint.md) для получения N-го поля (индексирование начинается с 1, отрицательные числа используются для отсчета с конца). Если параметр не задан, весь JSON парсится как объект верхнего уровня. Необязательный параметр.
+-   `json` — [строка](../data-types/string.md), содержащая валидный JSON.
+-   `p, a, t, h` — индексы или ключи, разделенные запятыми, которые указывают путь к внутреннему полю во вложенном объекте JSON. Каждый аргумент может быть либо [строкой](../data-types/string.md) для получения поля по ключу, либо [целым числом](../data-types/int-uint.md) для получения N-го поля (индексирование начинается с 1, отрицательные числа используются для отсчета с конца). Если параметр не задан, весь JSON парсится как объект верхнего уровня. Необязательный параметр.
 
 **Возвращаемые значения**
 
-- Массив с кортежами `('key', 'value')`. Члены кортежа — строки.
+-   Массив с кортежами `('key', 'value')`. Члены кортежа — строки.
 
-- Пустой массив, если заданный объект не существует или входные данные не валидный JSON.
+-   Пустой массив, если заданный объект не существует или входные данные не валидный JSON.
 
-Тип: Type: [Array](../data-types/array.md)([Tuple](../data-types/tuple.md)([String](../data-types/string.md), [String](../data-types/string.md)).
-.
+Тип: [Array](../data-types/array.md)([Tuple](../data-types/tuple.md)([String](../data-types/string.md), [String](../data-types/string.md)).
 
 **Примеры**
 
 Запрос:
 
 ``` sql
-SELECT JSONExtractKeysAndValuesRaw('{"a": [-100, 200.0], "b":{"c": {"d": "hello", "f": "world"}}}')
+SELECT JSONExtractKeysAndValuesRaw('{"a": [-100, 200.0], "b":{"c": {"d": "hello", "f": "world"}}}');
 ```
 
-Ответ:
+Результат:
 
 ``` text
 ┌─JSONExtractKeysAndValuesRaw('{"a": [-100, 200.0], "b":{"c": {"d": "hello", "f": "world"}}}')─┐
@@ -269,10 +282,10 @@ SELECT JSONExtractKeysAndValuesRaw('{"a": [-100, 200.0], "b":{"c": {"d": "hello"
 Запрос:
 
 ``` sql
-SELECT JSONExtractKeysAndValuesRaw('{"a": [-100, 200.0], "b":{"c": {"d": "hello", "f": "world"}}}', 'b')
+SELECT JSONExtractKeysAndValuesRaw('{"a": [-100, 200.0], "b":{"c": {"d": "hello", "f": "world"}}}', 'b');
 ```
 
-Ответ:
+Результат:
 
 ``` text
 ┌─JSONExtractKeysAndValuesRaw('{"a": [-100, 200.0], "b":{"c": {"d": "hello", "f": "world"}}}', 'b')─┐
@@ -283,15 +296,13 @@ SELECT JSONExtractKeysAndValuesRaw('{"a": [-100, 200.0], "b":{"c": {"d": "hello"
 Запрос:
 
 ``` sql
-SELECT JSONExtractKeysAndValuesRaw('{"a": [-100, 200.0], "b":{"c": {"d": "hello", "f": "world"}}}', -1, 'c')
+SELECT JSONExtractKeysAndValuesRaw('{"a": [-100, 200.0], "b":{"c": {"d": "hello", "f": "world"}}}', -1, 'c');
 ```
 
-Ответ:
+Результат:
 
 ``` text
 ┌─JSONExtractKeysAndValuesRaw('{"a": [-100, 200.0], "b":{"c": {"d": "hello", "f": "world"}}}', -1, 'c')─┐
 │ [('d','"hello"'),('f','"world"')]                                                                     │
 └───────────────────────────────────────────────────────────────────────────────────────────────────────┘
 ```
-
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/functions/json_functions/) <!--hide-->
diff --git a/docs/ru/sql-reference/functions/logical-functions.md b/docs/ru/sql-reference/functions/logical-functions.md
index 9b1ee6a66a7..8566657d2eb 100644
--- a/docs/ru/sql-reference/functions/logical-functions.md
+++ b/docs/ru/sql-reference/functions/logical-functions.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 37
-toc_title: "\u041b\u043e\u0433\u0438\u0447\u0435\u0441\u043a\u0438\u0435\u0020\u0444\u0443\u043d\u043a\u0446\u0438\u0438"
+toc_title: "Логические функции"
 ---
 
 # Логические функции {#logicheskie-funktsii}
@@ -17,4 +17,3 @@ toc_title: "\u041b\u043e\u0433\u0438\u0447\u0435\u0441\u043a\u0438\u0435\u0020\u
 
 ## xor {#xor}
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/functions/logical_functions/) <!--hide-->
diff --git a/docs/ru/sql-reference/functions/machine-learning-functions.md b/docs/ru/sql-reference/functions/machine-learning-functions.md
index 2ffdfd05613..a1716eed6c2 100644
--- a/docs/ru/sql-reference/functions/machine-learning-functions.md
+++ b/docs/ru/sql-reference/functions/machine-learning-functions.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 64
-toc_title: "\u0424\u0443\u043d\u043a\u0446\u0438\u0438\u0020\u043c\u0430\u0448\u0438\u043d\u043d\u043e\u0433\u043e\u0020\u043e\u0431\u0443\u0447\u0435\u043d\u0438\u044f"
+toc_title: "Функции машинного обучения"
 ---
 
 # Функции машинного обучения {#funktsii-mashinnogo-obucheniia}
@@ -27,7 +27,7 @@ toc_title: "\u0424\u0443\u043d\u043a\u0446\u0438\u0438\u0020\u043c\u0430\u0448\u
 bayesAB(distribution_name, higher_is_better, variant_names, x, y)
 ```
 
-**Параметры** 
+**Аргументы** 
 
 -   `distribution_name` — вероятностное распределение. [String](../../sql-reference/data-types/string.md). Возможные значения:
 
@@ -36,14 +36,14 @@ bayesAB(distribution_name, higher_is_better, variant_names, x, y)
 
 -   `higher_is_better` — способ определения предпочтений. [Boolean](../../sql-reference/data-types/boolean.md). Возможные значения:
 
-    -    `0` - чем меньше значение, тем лучше
-    -    `1` - чем больше значение, тем лучше
+    -    `0` — чем меньше значение, тем лучше
+    -    `1` — чем больше значение, тем лучше
 
--   `variant_names` - массив, содержащий названия вариантов. [Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md)).
+-   `variant_names` — массив, содержащий названия вариантов. [Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md)).
 
--   `x` - массив, содержащий число проведенных тестов (испытаний) для каждого варианта. [Array](../../sql-reference/data-types/array.md)([Float64](../../sql-reference/data-types/float.md)).
+-   `x` — массив, содержащий число проведенных тестов (испытаний) для каждого варианта. [Array](../../sql-reference/data-types/array.md)([Float64](../../sql-reference/data-types/float.md)).
 
--   `y` - массив, содержащий число успешных тестов (испытаний) для каждого варианта. [Array](../../sql-reference/data-types/array.md)([Float64](../../sql-reference/data-types/float.md)).
+-   `y` — массив, содержащий число успешных тестов (испытаний) для каждого варианта. [Array](../../sql-reference/data-types/array.md)([Float64](../../sql-reference/data-types/float.md)).
 
 !!! note "Замечание"
     Все три массива должны иметь одинаковый размер. Все значения `x` и `y` должны быть неотрицательными числами (константами). Значение `y` не может превышать соответствующее значение `x`.
@@ -51,8 +51,8 @@ bayesAB(distribution_name, higher_is_better, variant_names, x, y)
 **Возвращаемые значения**
 
 Для каждого варианта рассчитываются:
--   `beats_control` - вероятность, что данный вариант превосходит контрольный в долгосрочной перспективе
--   `to_be_best` - вероятность, что данный вариант является лучшим в долгосрочной перспективе
+-   `beats_control` — вероятность, что данный вариант превосходит контрольный в долгосрочной перспективе
+-   `to_be_best` — вероятность, что данный вариант является лучшим в долгосрочной перспективе
 
 Тип: JSON.
 
diff --git a/docs/ru/sql-reference/functions/math-functions.md b/docs/ru/sql-reference/functions/math-functions.md
index 2e57aca6a0a..da075e922cd 100644
--- a/docs/ru/sql-reference/functions/math-functions.md
+++ b/docs/ru/sql-reference/functions/math-functions.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 44
-toc_title: "\u041c\u0430\u0442\u0435\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u0438\u0435\u0020\u0444\u0443\u043d\u043a\u0446\u0438\u0438"
+toc_title: "Математические функции"
 ---
 
 # Математические функции {#matematicheskie-funktsii}
@@ -54,7 +54,7 @@ toc_title: "\u041c\u0430\u0442\u0435\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u
 Пример (правило трёх сигм):
 
 ``` sql
-SELECT erf(3 / sqrt(2))
+SELECT erf(3 / sqrt(2));
 ```
 
 ``` text
@@ -113,7 +113,7 @@ SELECT erf(3 / sqrt(2))
 cosh(x)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `x` — угол в радианах. Значения из интервала: `-∞ < x < +∞`. [Float64](../../sql-reference/data-types/float.md#float32-float64).
 
@@ -149,7 +149,7 @@ SELECT cosh(0);
 acosh(x)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `x` — гиперболический косинус угла. Значения из интервала: `1 <= x < +∞`. [Float64](../../sql-reference/data-types/float.md#float32-float64).
 
@@ -189,7 +189,7 @@ SELECT acosh(1);
 sinh(x)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `x` — угол в радианах. Значения из интервала: `-∞ < x < +∞`. [Float64](../../sql-reference/data-types/float.md#float32-float64).
 
@@ -225,7 +225,7 @@ SELECT sinh(0);
 asinh(x)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `x` — гиперболический синус угла. Значения из интервала: `-∞ < x < +∞`. [Float64](../../sql-reference/data-types/float.md#float32-float64).
 
@@ -265,7 +265,7 @@ SELECT asinh(0);
 atanh(x)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `x` — гиперболический тангенс угла. Значения из интервала: `–1 < x < 1`. [Float64](../../sql-reference/data-types/float.md#float32-float64).
 
@@ -301,7 +301,7 @@ SELECT atanh(0);
 atan2(y, x)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `y` — координата y точки, в которую проведена линия. [Float64](../../sql-reference/data-types/float.md#float32-float64).
 -   `x` — координата х точки, в которую проведена линия. [Float64](../../sql-reference/data-types/float.md#float32-float64).
@@ -338,7 +338,7 @@ SELECT atan2(1, 1);
 hypot(x, y)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `x` — первый катет прямоугольного треугольника. [Float64](../../sql-reference/data-types/float.md#float32-float64).
 -   `y` — второй катет прямоугольного треугольника. [Float64](../../sql-reference/data-types/float.md#float32-float64).
@@ -375,7 +375,7 @@ SELECT hypot(1, 1);
 log1p(x)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `x` — значения из интервала: `-1 < x < +∞`. [Float64](../../sql-reference/data-types/float.md#float32-float64).
 
@@ -405,4 +405,66 @@ SELECT log1p(0);
 
 -   [log(x)](../../sql-reference/functions/math-functions.md#logx)
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/functions/math_functions/) <!--hide-->
+## sign(x) {#signx}
+
+Возвращает знак действительного числа.
+
+**Синтаксис**
+
+``` sql
+sign(x)
+```
+
+**Аргумент**
+
+-   `x` — Значения от  `-∞` до `+∞`. Любой числовой тип, поддерживаемый ClickHouse.
+
+**Возвращаемое значение**
+
+- -1 если `x < 0`
+-  0 если `x = 0`
+-  1 если `x > 0`
+
+**Примеры**
+
+Результат sign() для нуля:
+
+``` sql
+SELECT sign(0);
+```
+Результат:
+
+``` text
+┌─sign(0)─┐
+│       0 │
+└─────────┘
+```
+
+Результат sign() для положительного аргумента:
+
+``` sql
+SELECT sign(1);
+```
+
+Результат:
+
+``` text
+┌─sign(1)─┐
+│       1 │
+└─────────┘
+```
+
+Результат sign() для отрицательного аргумента:
+
+``` sql
+SELECT sign(-1);
+```
+
+Результат:
+
+``` text
+┌─sign(-1)─┐
+│       -1 │
+└──────────┘
+```
+
diff --git a/docs/ru/sql-reference/functions/other-functions.md b/docs/ru/sql-reference/functions/other-functions.md
index a738ba755b1..84bbc6af968 100644
--- a/docs/ru/sql-reference/functions/other-functions.md
+++ b/docs/ru/sql-reference/functions/other-functions.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 66
-toc_title: "\u041f\u0440\u043e\u0447\u0438\u0435\u0020\u0444\u0443\u043d\u043a\u0446\u0438\u0438"
+toc_title: "Прочие функции"
 ---
 
 # Прочие функции {#other-functions}
@@ -16,16 +16,16 @@ toc_title: "\u041f\u0440\u043e\u0447\u0438\u0435\u0020\u0444\u0443\u043d\u043a\u
 **Синтаксис** 
 
 ```sql
-getMacro(name);
+getMacro(name)
 ```
 
-**Параметры**
+**Аргументы**
 
-- `name` — Имя, которое необходимо получить из секции `macros`. [String](../../sql-reference/data-types/string.md#string).
+-   `name` — имя, которое необходимо получить из секции `macros`. [String](../../sql-reference/data-types/string.md#string).
 
 **Возвращаемое значение**
 
-- Значение по указанному имени.
+-   Значение по указанному имени.
 
 Тип: [String](../../sql-reference/data-types/string.md).
 
@@ -66,7 +66,6 @@ WHERE macro = 'test'
 └───────┴──────────────┘
 ```
 
-
 ## FQDN {#fqdn}
 
 Возвращает полное имя домена.
@@ -74,7 +73,7 @@ WHERE macro = 'test'
 **Синтаксис**
 
 ``` sql
-fqdn();
+fqdn()
 ```
 
 Эта функция регистронезависимая.
@@ -93,7 +92,7 @@ fqdn();
 SELECT FQDN();
 ```
 
-Ответ:
+Результат:
 
 ``` text
 ┌─FQDN()──────────────────────────┐
@@ -109,9 +108,9 @@ SELECT FQDN();
 basename( expr )
 ```
 
-**Параметры**
+**Аргументы**
 
--   `expr` — Выражение, возвращающее значение типа [String](../../sql-reference/functions/other-functions.md). В результирующем значении все бэкслэши должны быть экранированы.
+-   `expr` — выражение, возвращающее значение типа [String](../../sql-reference/functions/other-functions.md). В результирующем значении все бэкслэши должны быть экранированы.
 
 **Возвращаемое значение**
 
@@ -126,7 +125,7 @@ basename( expr )
 **Пример**
 
 ``` sql
-SELECT 'some/long/path/to/file' AS a, basename(a)
+SELECT 'some/long/path/to/file' AS a, basename(a);
 ```
 
 ``` text
@@ -136,7 +135,7 @@ SELECT 'some/long/path/to/file' AS a, basename(a)
 ```
 
 ``` sql
-SELECT 'some\\long\\path\\to\\file' AS a, basename(a)
+SELECT 'some\\long\\path\\to\\file' AS a, basename(a);
 ```
 
 ``` text
@@ -146,7 +145,7 @@ SELECT 'some\\long\\path\\to\\file' AS a, basename(a)
 ```
 
 ``` sql
-SELECT 'some-file-name' AS a, basename(a)
+SELECT 'some-file-name' AS a, basename(a);
 ```
 
 ``` text
@@ -193,7 +192,7 @@ SELECT visibleWidth(NULL)
 byteSize(argument [, ...])
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `argument` — значение.
 
@@ -246,7 +245,7 @@ INSERT INTO test VALUES(1, 8, 16, 32, 64,  -8, -16, -32, -64, 32.32, 64.64);
 SELECT key, byteSize(u8) AS `byteSize(UInt8)`, byteSize(u16) AS `byteSize(UInt16)`, byteSize(u32) AS `byteSize(UInt32)`, byteSize(u64) AS `byteSize(UInt64)`, byteSize(i8) AS `byteSize(Int8)`, byteSize(i16) AS `byteSize(Int16)`, byteSize(i32) AS `byteSize(Int32)`, byteSize(i64) AS `byteSize(Int64)`, byteSize(f32) AS `byteSize(Float32)`, byteSize(f64) AS `byteSize(Float64)` FROM test ORDER BY key ASC FORMAT Vertical;
 ```
 
-Result:
+Результат:
 
 ``` text
 Row 1:
@@ -324,7 +323,7 @@ SELECT currentUser();
 SELECT currentUser();
 ```
 
-Ответ:
+Результат:
 
 ``` text
 ┌─currentUser()─┐
@@ -346,14 +345,14 @@ SELECT currentUser();
 isConstant(x)
 ```
 
-**Параметры**
+**Аргументы**
 
-- `x` — Выражение для проверки.
+- `x` — выражение для проверки.
 
 **Возвращаемые значения**
 
-- `1` — Выражение `x` является константным.
-- `0` — Выражение `x` не является константным.
+- `1` — выражение `x` является константным.
+- `0` — выражение `x` не является константным.
 
 Тип: [UInt8](../data-types/int-uint.md).
 
@@ -362,7 +361,7 @@ isConstant(x)
 Запрос:
 
 ```sql
-SELECT isConstant(x + 1) FROM (SELECT 43 AS x)
+SELECT isConstant(x + 1) FROM (SELECT 43 AS x);
 ```
 
 Результат:
@@ -376,7 +375,7 @@ SELECT isConstant(x + 1) FROM (SELECT 43 AS x)
 Запрос:
 
 ```sql
-WITH 3.14 AS pi SELECT isConstant(cos(pi))
+WITH 3.14 AS pi SELECT isConstant(cos(pi));
 ```
 
 Результат:
@@ -413,10 +412,10 @@ SELECT isConstant(number) FROM numbers(1)
 
     ifNotFinite(x,y)
 
-**Параметры**
+**Аргументы**
 
--   `x` — Значение, которое нужно проверить на бесконечность. Тип: [Float\*](../../sql-reference/functions/other-functions.md).
--   `y` — Запасное значение. Тип: [Float\*](../../sql-reference/functions/other-functions.md).
+-   `x` — значение, которое нужно проверить на бесконечность. Тип: [Float\*](../../sql-reference/functions/other-functions.md).
+-   `y` — запасное значение. Тип: [Float\*](../../sql-reference/functions/other-functions.md).
 
 **Возвращаемые значения**
 
@@ -458,7 +457,7 @@ SELECT isConstant(number) FROM numbers(1)
 
 `bar(x, min, max, width)` рисует полосу ширины пропорциональной `(x - min)` и равной `width` символов при `x = max`.
 
-Параметры:
+Аргументы:
 
 -   `x` — Величина для отображения.
 -   `min, max` — Целочисленные константы, значение должно помещаться в `Int64`.
@@ -659,7 +658,7 @@ SELECT
 
 ## neighbor {#neighbor}
 
-Функция позволяет получить доступ к значению в колонке `column`, находящемуся на смещении `offset` относительно текущей строки. Является частичной реализацией [оконных функций](https://en.wikipedia.org/wiki/SQL_window_function) `LEAD()` и `LAG()`.
+Функция позволяет получить доступ к значению в столбце `column`, находящемуся на смещении `offset` относительно текущей строки. Является частичной реализацией [оконных функций](https://en.wikipedia.org/wiki/SQL_window_function) `LEAD()` и `LAG()`.
 
 **Синтаксис**
 
@@ -667,13 +666,19 @@ SELECT
 neighbor(column, offset[, default_value])
 ```
 
-Результат функции зависит от затронутых блоков данных и порядка данных в блоке. Если сделать подзапрос с ORDER BY и вызывать функцию извне подзапроса, можно будет получить ожидаемый результат.
+Результат функции зависит от затронутых блоков данных и порядка данных в блоке.
 
-**Параметры**
+!!! warning "Предупреждение"
+    Функция может получить доступ к значению в столбце соседней строки только внутри обрабатываемого в данный момент блока данных.
 
--   `column` — Имя столбца или скалярное выражение.
--   `offset` - Смещение от текущей строки `column`. [Int64](../../sql-reference/functions/other-functions.md).
--   `default_value` - Опциональный параметр. Значение, которое будет возвращено, если смещение выходит за пределы блока данных.
+Порядок строк, используемый при вычислении функции `neighbor`, может отличаться от порядка строк, возвращаемых пользователю.
+Чтобы этого не случилось, вы можете сделать подзапрос с [ORDER BY](../../sql-reference/statements/select/order-by.md) и вызвать функцию извне подзапроса.
+
+**Аргументы**
+
+-   `column` — имя столбца или скалярное выражение.
+-   `offset` — смещение от текущей строки `column`. [Int64](../../sql-reference/functions/other-functions.md).
+-   `default_value` — опциональный параметр. Значение, которое будет возвращено, если смещение выходит за пределы блока данных.
 
 **Возвращаемое значение**
 
@@ -690,7 +695,7 @@ neighbor(column, offset[, default_value])
 SELECT number, neighbor(number, 2) FROM system.numbers LIMIT 10;
 ```
 
-Ответ:
+Результат:
 
 ``` text
 ┌─number─┬─neighbor(number, 2)─┐
@@ -713,7 +718,7 @@ SELECT number, neighbor(number, 2) FROM system.numbers LIMIT 10;
 SELECT number, neighbor(number, 2, 999) FROM system.numbers LIMIT 10;
 ```
 
-Ответ:
+Результат:
 
 ``` text
 ┌─number─┬─neighbor(number, 2, 999)─┐
@@ -744,7 +749,7 @@ SELECT
 FROM numbers(16)
 ```
 
-Ответ:
+Результат:
 
 ``` text
 ┌──────month─┬─money─┬─prev_year─┬─year_over_year─┐
@@ -767,13 +772,18 @@ FROM numbers(16)
 └────────────┴───────┴───────────┴────────────────┘
 ```
 
-## runningDifference(x) {#runningdifferencex}
+## runningDifference(x) {#other_functions-runningdifference}
 
 Считает разницу между последовательными значениями строк в блоке данных.
 Возвращает 0 для первой строки и разницу с предыдущей строкой для каждой последующей строки.
 
+!!! warning "Предупреждение"
+    Функция может взять значение предыдущей строки только внутри текущего обработанного блока данных.
+
 Результат функции зависит от затронутых блоков данных и порядка данных в блоке.
-Если сделать подзапрос с ORDER BY и вызывать функцию извне подзапроса, можно будет получить ожидаемый результат.
+
+Порядок строк, используемый при вычислении функции `runningDifference`, может отличаться от порядка строк, возвращаемых пользователю.
+Чтобы этого не случилось, вы можете сделать подзапрос с [ORDER BY](../../sql-reference/statements/select/order-by.md) и вызвать функцию извне подзапроса.
 
 Пример:
 
@@ -839,7 +849,64 @@ WHERE diff != 1
 
 ## runningDifferenceStartingWithFirstValue {#runningdifferencestartingwithfirstvalue}
 
-То же, что и \[runningDifference\] (./other_functions.md # other_functions-runningdifference), но в первой строке возвращается значение первой строки, а не ноль.
+То же, что и [runningDifference](./other-functions.md#other_functions-runningdifference), но в первой строке возвращается значение первой строки, а не ноль.
+
+## runningConcurrency {#runningconcurrency}
+
+Подсчитывает количество одновременно идущих событий.
+У каждого события есть время начала и время окончания. Считается, что время начала включено в событие, а время окончания исключено из него. Столбцы со временем начала и окончания событий должны иметь одинаковый тип данных. 
+Функция подсчитывает количество событий, происходящих одновременно на момент начала каждого из событий в выборке. 
+
+!!! warning "Предупреждение"
+    События должны быть отсортированы по возрастанию времени начала. Если это требование нарушено, то функция вызывает исключение.
+    Каждый блок данных обрабатывается независимо. Если события из разных блоков данных накладываются по времени, они не могут быть корректно обработаны.
+
+**Синтаксис**
+
+``` sql
+runningConcurrency(start, end)
+```
+
+**Аргументы**
+
+-   `start` — Столбец с временем начала событий. [Date](../../sql-reference/data-types/date.md), [DateTime](../../sql-reference/data-types/datetime.md) или [DateTime64](../../sql-reference/data-types/datetime64.md).
+-   `end` — Столбец с временем окончания событий.  [Date](../../sql-reference/data-types/date.md), [DateTime](../../sql-reference/data-types/datetime.md) или [DateTime64](../../sql-reference/data-types/datetime64.md).
+
+**Возвращаемое значение**
+
+-   Количество одновременно идущих событий на момент начала каждого события.
+
+Тип: [UInt32](../../sql-reference/data-types/int-uint.md)
+
+**Пример**
+
+Рассмотрим таблицу:
+
+``` text
+┌──────start─┬────────end─┐
+│ 2021-03-03 │ 2021-03-11 │
+│ 2021-03-06 │ 2021-03-12 │
+│ 2021-03-07 │ 2021-03-08 │
+│ 2021-03-11 │ 2021-03-12 │
+└────────────┴────────────┘
+```
+
+Запрос:
+
+``` sql
+SELECT start, runningConcurrency(start, end) FROM example_table;
+```
+
+Результат:
+
+``` text
+┌──────start─┬─runningConcurrency(start, end)─┐
+│ 2021-03-03 │                              1 │
+│ 2021-03-06 │                              2 │
+│ 2021-03-07 │                              3 │
+│ 2021-03-11 │                              2 │
+└────────────┴────────────────────────────────┘
+```
 
 ## MACNumToString(num) {#macnumtostringnum}
 
@@ -861,9 +928,9 @@ WHERE diff != 1
 getSizeOfEnumType(value)
 ```
 
-**Параметры**
+**Аргументы**
 
--   `value` — Значение типа `Enum`.
+-   `value` — значение типа `Enum`.
 
 **Возвращаемые значения**
 
@@ -890,9 +957,9 @@ SELECT getSizeOfEnumType( CAST('a' AS Enum8('a' = 1, 'b' = 2) ) ) AS x
 blockSerializedSize(value[, value[, ...]])
 ```
 
-**Параметры**
+**Аргументы**
 
--   `value` — Значение произвольного типа.
+-   `value` — значение произвольного типа.
 
 **Возвращаемые значения**
 
@@ -922,9 +989,9 @@ SELECT blockSerializedSize(maxState(1)) as x
 toColumnTypeName(value)
 ```
 
-**Параметры**
+**Аргументы**
 
--   `value` — Значение произвольного типа.
+-   `value` — значение произвольного типа.
 
 **Возвращаемые значения**
 
@@ -962,9 +1029,9 @@ SELECT toColumnTypeName(CAST('2018-01-01 01:02:03' AS DateTime))
 dumpColumnStructure(value)
 ```
 
-**Параметры**
+**Аргументы**
 
--   `value` — Значение произвольного типа.
+-   `value` — значение произвольного типа.
 
 **Возвращаемые значения**
 
@@ -992,9 +1059,9 @@ SELECT dumpColumnStructure(CAST('2018-01-01 01:02:03', 'DateTime'))
 defaultValueOfArgumentType(expression)
 ```
 
-**Параметры**
+**Аргументы**
 
--   `expression` — Значение произвольного типа или выражение, результатом которого является значение произвольного типа.
+-   `expression` — значение произвольного типа или выражение, результатом которого является значение произвольного типа.
 
 **Возвращаемые значения**
 
@@ -1034,7 +1101,7 @@ SELECT defaultValueOfArgumentType( CAST(1 AS Nullable(Int8) ) )
 defaultValueOfTypeName(type)
 ```
 
-**Параметры:**
+**Аргументы**
 
 -   `type` — тип данных.
 
@@ -1066,6 +1133,111 @@ SELECT defaultValueOfTypeName('Nullable(Int8)')
 └──────────────────────────────────────────┘
 ```
 
+## indexHint {#indexhint}
+Возвращает все данные из диапазона, в который попадают данные, соответствующие указанному выражению.
+Переданное выражение не будет вычислено. Выбор диапазона производится по индексу.
+Индекс в ClickHouse разреженный, при чтении диапазона в ответ попадают «лишние» соседние данные.
+
+**Синтаксис**
+
+```sql
+SELECT * FROM table WHERE indexHint(<expression>)
+```
+
+**Возвращаемое значение**
+
+Возвращает диапазон индекса, в котором выполняется заданное условие.
+
+Тип: [Uint8](https://clickhouse.yandex/docs/ru/data_types/int_uint/#diapazony-uint).
+
+**Пример**
+
+Рассмотрим пример с использованием тестовых данных таблицы [ontime](../../getting-started/example-datasets/ontime.md).
+
+Исходная таблица:
+
+```sql
+SELECT count() FROM ontime
+```
+
+```text
+┌─count()─┐
+│ 4276457 │
+└─────────┘
+```
+
+В таблице есть индексы по полям `(FlightDate, (Year, FlightDate))`.
+
+Выполним выборку по дате, где индекс не используется.
+
+Запрос:
+
+```sql
+SELECT FlightDate AS k, count() FROM ontime GROUP BY k ORDER BY k
+```
+
+ClickHouse обработал всю таблицу (`Processed 4.28 million rows`).
+
+Результат:
+
+```text
+┌──────────k─┬─count()─┐
+│ 2017-01-01 │   13970 │
+│ 2017-01-02 │   15882 │
+........................
+│ 2017-09-28 │   16411 │
+│ 2017-09-29 │   16384 │
+│ 2017-09-30 │   12520 │
+└────────────┴─────────┘
+```
+
+Для подключения индекса выбираем конкретную дату.
+
+Запрос:
+
+```sql
+SELECT FlightDate AS k, count() FROM ontime WHERE k = '2017-09-15' GROUP BY k ORDER BY k
+```
+
+При использовании индекса ClickHouse обработал значительно меньшее количество строк (`Processed 32.74 thousand rows`).
+
+Результат:
+
+```text
+┌──────────k─┬─count()─┐
+│ 2017-09-15 │   16428 │
+└────────────┴─────────┘
+```
+
+Передадим в функцию `indexHint` выражение `k = '2017-09-15'`.
+
+Запрос:
+
+```sql
+SELECT
+    FlightDate AS k,
+    count()
+FROM ontime
+WHERE indexHint(k = '2017-09-15')
+GROUP BY k
+ORDER BY k ASC
+```
+
+ClickHouse применил индекс по аналогии с примером выше (`Processed 32.74 thousand rows`).
+Выражение `k = '2017-09-15'` не используется при формировании результата.
+Функция `indexHint` позволяет увидеть соседние данные.
+
+Результат:
+
+```text
+┌──────────k─┬─count()─┐
+│ 2017-09-14 │    7071 │
+│ 2017-09-15 │   16428 │
+│ 2017-09-16 │    1077 │
+│ 2017-09-30 │    8167 │
+└────────────┴─────────┘
+```
+
 ## replicate {#other-functions-replicate}
 
 Создает массив, заполненный одним значением.
@@ -1076,10 +1248,10 @@ SELECT defaultValueOfTypeName('Nullable(Int8)')
 SELECT replicate(x, arr);
 ```
 
-**Параметры**
+**Аргументы**
 
--   `arr` — Исходный массив. ClickHouse создаёт новый массив такой же длины как исходный и заполняет его значением `x`.
--   `x` — Значение, которым будет заполнен результирующий массив.
+-   `arr` — исходный массив. ClickHouse создаёт новый массив такой же длины как исходный и заполняет его значением `x`.
+-   `x` — значение, которым будет заполнен результирующий массив.
 
 **Возвращаемое значение**
 
@@ -1159,7 +1331,7 @@ filesystemFree()
 SELECT formatReadableSize(filesystemFree()) AS "Free space", toTypeName(filesystemFree()) AS "Type";
 ```
 
-Ответ:
+Результат:
 
 ``` text
 ┌─Free space─┬─Type───┐
@@ -1191,7 +1363,7 @@ filesystemCapacity()
 SELECT formatReadableSize(filesystemCapacity()) AS "Capacity", toTypeName(filesystemCapacity()) AS "Type"
 ```
 
-Ответ:
+Результат:
 
 ``` text
 ┌─Capacity──┬─Type───┐
@@ -1209,7 +1381,7 @@ SELECT formatReadableSize(filesystemCapacity()) AS "Capacity", toTypeName(filesy
 finalizeAggregation(state)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `state` — состояние агрегатной функции. [AggregateFunction](../../sql-reference/data-types/aggregatefunction.md#data-type-aggregatefunction).
 
@@ -1310,17 +1482,17 @@ FROM numbers(10);
 **Синтаксис**
 
 ```sql
-runningAccumulate(agg_state[, grouping]);
+runningAccumulate(agg_state[, grouping])
 ```
 
-**Параметры**
+**Аргументы**
 
-- `agg_state` — Состояние агрегатной функции. [AggregateFunction](../../sql-reference/data-types/aggregatefunction.md#data-type-aggregatefunction).
-- `grouping` — Ключ группировки. Опциональный параметр. Состояние функции обнуляется, если значение `grouping` меняется. Параметр может быть любого [поддерживаемого типа данных](../../sql-reference/data-types/index.md), для которого определен оператор равенства.
+-   `agg_state` — состояние агрегатной функции. [AggregateFunction](../../sql-reference/data-types/aggregatefunction.md#data-type-aggregatefunction).
+-   `grouping` — ключ группировки. Опциональный параметр. Состояние функции обнуляется, если значение `grouping` меняется. Параметр может быть любого [поддерживаемого типа данных](../../sql-reference/data-types/index.md), для которого определен оператор равенства.
 
 **Возвращаемое значение**
 
-- Каждая результирующая строка содержит результат агрегатной функции, накопленный для всех входных строк от 0 до текущей позиции. `runningAccumulate` обнуляет состояния для каждого нового блока данных или при изменении значения `grouping`.
+-   Каждая результирующая строка содержит результат агрегатной функции, накопленный для всех входных строк от 0 до текущей позиции. `runningAccumulate` обнуляет состояния для каждого нового блока данных или при изменении значения `grouping`.
 
 Тип зависит от используемой агрегатной функции.
 
@@ -1419,7 +1591,7 @@ FROM
 joinGet(join_storage_table_name, `value_column`, join_keys)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `join_storage_table_name` — [идентификатор](../syntax.md#syntax-identifiers), который указывает, откуда производится выборка данных. Поиск по идентификатору осуществляется в базе данных по умолчанию (см. конфигурацию `default_database`). Чтобы переопределить базу данных по умолчанию, используйте команду `USE db_name`, или укажите базу данных и таблицу через разделитель `db_name.db_table`, см. пример.
 -   `value_column` — столбец, из которого нужно произвести выборку данных.
@@ -1524,9 +1696,9 @@ SELECT identity(42)
 randomPrintableASCII(length)
 ```
 
-**Параметры**
+**Аргументы**
 
--   `length` — Длина результирующей строки. Положительное целое число.
+-   `length` — длина результирующей строки. Положительное целое число.
 
         Если передать `length < 0`, то поведение функции не определено.
 
@@ -1560,7 +1732,7 @@ SELECT number, randomPrintableASCII(30) as str, length(str) FROM system.numbers
 randomString(length)
 ```
 
-**Параметры** 
+**Аргументы** 
 
 -   `length` — длина строки. Положительное целое число.
 
@@ -1608,11 +1780,11 @@ len: 30
 randomFixedString(length);
 ```
 
-**Параметры**
+**Аргументы**
 
--   `length` — Длина строки в байтах. [UInt64](../../sql-reference/data-types/int-uint.md).
+-   `length` — длина строки в байтах. [UInt64](../../sql-reference/data-types/int-uint.md).
 
-**Returned value(s)**
+**Возвращаемое значение**
 
 -   Строка, заполненная случайными байтами.
 
@@ -1642,12 +1814,12 @@ SELECT randomFixedString(13) as rnd, toTypeName(rnd)
 **Синтаксис**
 
 ``` sql
-randomStringUTF8(length);
+randomStringUTF8(length)
 ```
 
-**Параметры**
+**Аргументы**
 
--   `length` — Длина итоговой строки в кодовых точках. [UInt64](../../sql-reference/data-types/int-uint.md).
+-   `length` — длина итоговой строки в кодовых точках. [UInt64](../../sql-reference/data-types/int-uint.md).
 
 **Возвращаемое значение**
 
@@ -1679,7 +1851,7 @@ SELECT randomStringUTF8(13)
 **Синтаксис** 
 
 ```sql
-getSetting('custom_setting');    
+getSetting('custom_setting')
 ```
 
 **Параметр** 
@@ -1717,7 +1889,7 @@ SELECT getSetting('custom_a');
 isDecimalOverflow(d, [p])
 ```
 
-**Параметры** 
+**Аргументы** 
 
 -   `d` — число. [Decimal](../../sql-reference/data-types/decimal.md).
 -   `p` — точность. Необязательный параметр. Если опущен, используется исходная точность первого аргумента. Использование этого параметра может быть полезно для извлечения данных в другую СУБД или файл. [UInt8](../../sql-reference/data-types/int-uint.md#uint-ranges). 
@@ -1754,7 +1926,7 @@ SELECT isDecimalOverflow(toDecimal32(1000000000, 0), 9),
 countDigits(x)
 ```
 
-**Параметры** 
+**Аргументы** 
 
 -   `x` — [целое](../../sql-reference/data-types/int-uint.md#uint8-uint16-uint32-uint64-int8-int16-int32-int64) или [дробное](../../sql-reference/data-types/decimal.md) число.
 
@@ -1813,7 +1985,7 @@ UNSUPPORTED_METHOD
 tcpPort()
 ```
 
-**Параметры**
+**Аргументы**
 
 -   Нет.
 
@@ -1843,4 +2015,3 @@ SELECT tcpPort();
 
 -   [tcp_port](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-tcp_port)
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/functions/other_functions/) <!--hide-->
diff --git a/docs/ru/sql-reference/functions/random-functions.md b/docs/ru/sql-reference/functions/random-functions.md
index f3889504fa6..bbf0affb081 100644
--- a/docs/ru/sql-reference/functions/random-functions.md
+++ b/docs/ru/sql-reference/functions/random-functions.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 51
-toc_title: "\u0424\u0443\u043d\u043a\u0446\u0438\u0438\u0020\u0433\u0435\u043d\u0435\u0440\u0430\u0446\u0438\u0438\u0020\u043f\u0441\u0435\u0432\u0434\u043e\u0441\u043b\u0443\u0447\u0430\u0439\u043d\u044b\u0445\u0020\u0447\u0438\u0441\u0435\u043b"
+toc_title: "Функции генерации псевдослучайных чисел"
 ---
 
 # Функции генерации псевдослучайных чисел {#functions-for-generating-pseudo-random-numbers}
@@ -31,9 +31,9 @@ toc_title: "\u0424\u0443\u043d\u043a\u0446\u0438\u0438\u0020\u0433\u0435\u043d\u
 randConstant([x])
 ```
 
-**Параметры**
+**Аргументы**
 
--   `x` — [Выражение](../syntax.md#syntax-expressions), возвращающее значение одного из [поддерживаемых типов данных](../data-types/index.md#data_types). Значение используется, чтобы избежать [склейки одинаковых выражений](index.md#common-subexpression-elimination), если функция вызывается несколько раз в одном запросе. Необязательный параметр.
+-   `x` — [выражение](../syntax.md#syntax-expressions), возвращающее значение одного из [поддерживаемых типов данных](../data-types/index.md#data_types). Значение используется, чтобы избежать [склейки одинаковых выражений](index.md#common-subexpression-elimination), если функция вызывается несколько раз в одном запросе. Необязательный параметр.
 
 **Возвращаемое значение**
 
@@ -79,7 +79,7 @@ fuzzBits([s], [prob])
 ```
 Инвертирует каждый бит `s` с вероятностью `prob`.
 
-**Параметры**
+**Аргументы**
 
 - `s` — `String` or `FixedString`
 - `prob` — constant `Float32/64`
@@ -107,4 +107,3 @@ FROM numbers(3)
 └───────────────────────────────────────┘
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/functions/random_functions/) <!--hide-->
diff --git a/docs/ru/sql-reference/functions/rounding-functions.md b/docs/ru/sql-reference/functions/rounding-functions.md
index 78033160396..276f85bf6b7 100644
--- a/docs/ru/sql-reference/functions/rounding-functions.md
+++ b/docs/ru/sql-reference/functions/rounding-functions.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 45
-toc_title: "\u0424\u0443\u043d\u043a\u0446\u0438\u0438\u0020\u043e\u043a\u0440\u0443\u0433\u043b\u0435\u043d\u0438\u044f"
+toc_title: "Функции округления"
 ---
 
 # Функции округления {#funktsii-okrugleniia}
@@ -33,10 +33,10 @@ N может быть отрицательным.
 round(expression [, decimal_places])
 ```
 
-**Параметры:**
+**Аргументы**
 
--   `expression` — Число для округления. Может быть любым [выражением](../syntax.md#syntax-expressions), возвращающим числовой [тип данных](../../sql-reference/functions/rounding-functions.md#data_types).
--   `decimal-places` — Целое значение.
+-   `expression` — число для округления. Может быть любым [выражением](../syntax.md#syntax-expressions), возвращающим числовой [тип данных](../../sql-reference/functions/rounding-functions.md#data_types).
+-   `decimal-places` — целое значение.
     -   Если `decimal-places > 0`, то функция округляет значение справа от запятой.
     -   Если `decimal-places < 0` то функция округляет значение слева от запятой.
     -   Если `decimal-places = 0`, то функция округляет значение до целого. В этом случае аргумент можно опустить.
@@ -112,13 +112,13 @@ round(3.65, 1) = 3.6
 roundBankers(expression [, decimal_places])
 ```
 
-**Параметры**
+**Аргументы**
 
--   `expression` — Число для округления. Может быть любым [выражением](../syntax.md#syntax-expressions), возвращающим числовой [тип данных](../../sql-reference/functions/rounding-functions.md#data_types).
--   `decimal-places` — Десятичный разряд. Целое число.
-    -   `decimal-places > 0` — Функция округляет значение выражения до ближайшего чётного числа на соответствующей позиции справа от запятой. Например, `roundBankers(3.55, 1) = 3.6`.
-    -   `decimal-places < 0` — Функция округляет значение выражения до ближайшего чётного числа на соответствующей позиции слева от запятой. Например, `roundBankers(24.55, -1) = 20`.
-    -   `decimal-places = 0` — Функция округляет значение до целого. В этом случае аргумент можно не передавать. Например, `roundBankers(2.5) = 2`.
+-   `expression` — число для округления. Может быть любым [выражением](../syntax.md#syntax-expressions), возвращающим числовой [тип данных](../../sql-reference/functions/rounding-functions.md#data_types).
+-   `decimal-places` — десятичный разряд. Целое число.
+    -   `decimal-places > 0` — функция округляет значение выражения до ближайшего чётного числа на соответствующей позиции справа от запятой. Например, `roundBankers(3.55, 1) = 3.6`.
+    -   `decimal-places < 0` — функция округляет значение выражения до ближайшего чётного числа на соответствующей позиции слева от запятой. Например, `roundBankers(24.55, -1) = 20`.
+    -   `decimal-places = 0` — функция округляет значение до целого. В этом случае аргумент можно не передавать. Например, `roundBankers(2.5) = 2`.
 
 **Возвращаемое значение**
 
@@ -177,4 +177,3 @@ roundBankers(10.755, 2) = 11,76
 
 Принимает число. Если число меньше 18 - возвращает 0. Иначе округляет число вниз до чисел из набора: 18, 25, 35, 45, 55. Эта функция специфична для Яндекс.Метрики и предназначена для реализации отчёта по возрасту посетителей.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/functions/rounding_functions/) <!--hide-->
diff --git a/docs/ru/sql-reference/functions/splitting-merging-functions.md b/docs/ru/sql-reference/functions/splitting-merging-functions.md
index d451eabc407..b8d04982b91 100644
--- a/docs/ru/sql-reference/functions/splitting-merging-functions.md
+++ b/docs/ru/sql-reference/functions/splitting-merging-functions.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 47
-toc_title: "\u0424\u0443\u043d\u043a\u0446\u0438\u0438\u0020\u0440\u0430\u0437\u0431\u0438\u0435\u043d\u0438\u044f\u0020\u0438\u0020\u0441\u043b\u0438\u044f\u043d\u0438\u044f\u0020\u0441\u0442\u0440\u043e\u043a\u0020\u0438\u0020\u043c\u0430\u0441\u0441\u0438\u0432\u043e\u0432"
+toc_title: "Функции разбиения и слияния строк и массивов"
 ---
 
 # Функции разбиения и слияния строк и массивов {#funktsii-razbieniia-i-sliianiia-strok-i-massivov}
@@ -17,10 +17,10 @@ separator должен быть константной строкой из ро
 splitByChar(<separator>, <s>)
 ```
 
-**Параметры**
+**Аргументы**
 
--   `separator` — Разделитель, состоящий из одного символа. [String](../../sql-reference/data-types/string.md).
--   `s` — Разбиваемая строка. [String](../../sql-reference/data-types/string.md).
+-   `separator` — разделитель, состоящий из одного символа. [String](../../sql-reference/data-types/string.md).
+-   `s` — разбиваемая строка. [String](../../sql-reference/data-types/string.md).
 
 **Возвращаемые значения**
 
@@ -54,10 +54,10 @@ SELECT splitByChar(',', '1,2,3,abcde')
 splitByString(separator, s)
 ```
 
-**Параметры**
+**Аргументы**
 
--   `separator` — Разделитель. [String](../../sql-reference/data-types/string.md).
--   `s` — Разбиваемая строка. [String](../../sql-reference/data-types/string.md).
+-   `separator` — разделитель. [String](../../sql-reference/data-types/string.md).
+-   `s` — разбиваемая строка. [String](../../sql-reference/data-types/string.md).
 
 **Возвращаемые значения**
 
@@ -67,7 +67,7 @@ splitByString(separator, s)
 -   Задано несколько последовательных разделителей;
 -   Исходная строка `s` пуста.
 
-Type: [Array](../../sql-reference/data-types/array.md) of [String](../../sql-reference/data-types/string.md).
+Тип: [Array](../../sql-reference/data-types/array.md) of [String](../../sql-reference/data-types/string.md).
 
 **Примеры**
 
@@ -115,4 +115,3 @@ SELECT alphaTokens('abca1abc')
 └─────────────────────────┘
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/functions/splitting_merging_functions/) <!--hide-->
diff --git a/docs/ru/sql-reference/functions/string-functions.md b/docs/ru/sql-reference/functions/string-functions.md
index 236583c211a..04af599c09a 100644
--- a/docs/ru/sql-reference/functions/string-functions.md
+++ b/docs/ru/sql-reference/functions/string-functions.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 40
-toc_title: "\u0424\u0443\u043d\u043a\u0446\u0438\u0438\u0020\u0434\u043b\u044f\u0020\u0440\u0430\u0431\u043e\u0442\u044b\u0020\u0441\u043e\u0020\u0441\u0442\u0440\u043e\u043a\u0430\u043c\u0438"
+toc_title: "Функции для работы со строками"
 ---
 
 # Функции для работы со строками {#funktsii-dlia-raboty-so-strokami}
@@ -70,19 +70,19 @@ toc_title: "\u0424\u0443\u043d\u043a\u0446\u0438\u0438\u0020\u0434\u043b\u044f\u
 Заменяет некорректные символы UTF-8 на символ `�` (U+FFFD). Все идущие подряд некорректные символы схлопываются в один заменяющий символ.
 
 ``` sql
-toValidUTF8( input_string )
+toValidUTF8(input_string)
 ```
 
-Параметры:
+**Аргументы**
 
--   input_string — произвольный набор байтов, представленный как объект типа [String](../../sql-reference/functions/string-functions.md).
+-   `input_string` — произвольный набор байтов, представленный как объект типа [String](../../sql-reference/functions/string-functions.md).
 
 Возвращаемое значение: Корректная строка UTF-8.
 
 **Пример**
 
 ``` sql
-SELECT toValidUTF8('\x61\xF0\x80\x80\x80b')
+SELECT toValidUTF8('\x61\xF0\x80\x80\x80b');
 ```
 
 ``` text
@@ -95,16 +95,18 @@ SELECT toValidUTF8('\x61\xF0\x80\x80\x80b')
 
 Повторяет строку определенное количество раз и объединяет повторяемые значения в одну строку.
 
+Синоним: `REPEAT`.
+
 **Синтаксис**
 
 ``` sql
 repeat(s, n)
 ```
 
-**Параметры**
+**Аргументы**
 
--   `s` — Строка для повторения. [String](../../sql-reference/functions/string-functions.md).
--   `n` — Количество повторов. [UInt](../../sql-reference/functions/string-functions.md).
+-   `s` — строка для повторения. [String](../../sql-reference/functions/string-functions.md).
+-   `n` — количество повторов. [UInt](../../sql-reference/functions/string-functions.md).
 
 **Возвращаемое значение**
 
@@ -117,10 +119,10 @@ repeat(s, n)
 Запрос:
 
 ``` sql
-SELECT repeat('abc', 10)
+SELECT repeat('abc', 10);
 ```
 
-Ответ:
+Результат:
 
 ``` text
 ┌─repeat('abc', 10)──────────────┐
@@ -170,7 +172,7 @@ SELECT format('{} {}', 'Hello', 'World')
 concat(s1, s2, ...)
 ```
 
-**Параметры**
+**Аргументы**
 
 Значения типа String или FixedString.
 
@@ -185,10 +187,10 @@ concat(s1, s2, ...)
 Запрос:
 
 ``` sql
-SELECT concat('Hello, ', 'World!')
+SELECT concat('Hello, ', 'World!');
 ```
 
-Ответ:
+Результат:
 
 ``` text
 ┌─concat('Hello, ', 'World!')─┐
@@ -208,7 +210,7 @@ SELECT concat('Hello, ', 'World!')
 concatAssumeInjective(s1, s2, ...)
 ```
 
-**Параметры**
+**Аргументы**
 
 Значения типа String или FixedString.
 
@@ -240,10 +242,10 @@ SELECT * from key_val
 Запрос:
 
 ``` sql
-SELECT concat(key1, key2), sum(value) FROM key_val GROUP BY (key1, key2)
+SELECT concat(key1, key2), sum(value) FROM key_val GROUP BY (key1, key2);
 ```
 
-Ответ:
+Результат:
 
 ``` text
 ┌─concat(key1, key2)─┬─sum(value)─┐
@@ -273,10 +275,14 @@ SELECT concat(key1, key2), sum(value) FROM key_val GROUP BY (key1, key2)
 
 Производит кодирование строки s в base64-представление.
 
+Синоним: `TO_BASE64`.
+
 ## base64Decode(s) {#base64decode}
 
 Декодирует base64-представление s в исходную строку. При невозможности декодирования выбрасывает исключение
 
+Синоним: `FROM_BASE64`.
+
 ## tryBase64Decode(s) {#trybase64decode}
 
 Функционал аналогичен base64Decode, но при невозможности декодирования возвращает пустую строку.
@@ -306,7 +312,7 @@ SELECT startsWith('Spider-Man', 'Spi');
 SELECT startsWith('Hello, world!', 'He');
 ```
 
-Ответ:
+Результат:
 
 ``` text
 ┌─startsWith('Hello, world!', 'He')─┐
@@ -325,7 +331,7 @@ SELECT startsWith('Hello, world!', 'He');
 trim([[LEADING|TRAILING|BOTH] trim_character FROM] input_string)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `trim_character` — один или несколько символов, подлежащие удалению. [String](../../sql-reference/functions/string-functions.md).
 -   `input_string` — строка для обрезки. [String](../../sql-reference/functions/string-functions.md).
@@ -341,10 +347,10 @@ trim([[LEADING|TRAILING|BOTH] trim_character FROM] input_string)
 Запрос:
 
 ``` sql
-SELECT trim(BOTH ' ()' FROM '(   Hello, world!   )')
+SELECT trim(BOTH ' ()' FROM '(   Hello, world!   )');
 ```
 
-Ответ:
+Результат:
 
 ``` text
 ┌─trim(BOTH ' ()' FROM '(   Hello, world!   )')─┐
@@ -364,7 +370,7 @@ trimLeft(input_string)
 
 Алиас: `ltrim(input_string)`.
 
-**Параметры**
+**Аргументы**
 
 -   `input_string` — строка для обрезки. [String](../../sql-reference/functions/string-functions.md).
 
@@ -379,10 +385,10 @@ trimLeft(input_string)
 Запрос:
 
 ``` sql
-SELECT trimLeft('     Hello, world!     ')
+SELECT trimLeft('     Hello, world!     ');
 ```
 
-Ответ:
+Результат:
 
 ``` text
 ┌─trimLeft('     Hello, world!     ')─┐
@@ -402,7 +408,7 @@ trimRight(input_string)
 
 Алиас: `rtrim(input_string)`.
 
-**Параметры**
+**Аргументы**
 
 -   `input_string` — строка для обрезки. [String](../../sql-reference/functions/string-functions.md).
 
@@ -417,10 +423,10 @@ trimRight(input_string)
 Запрос:
 
 ``` sql
-SELECT trimRight('     Hello, world!     ')
+SELECT trimRight('     Hello, world!     ');
 ```
 
-Ответ:
+Результат:
 
 ``` text
 ┌─trimRight('     Hello, world!     ')─┐
@@ -440,7 +446,7 @@ trimBoth(input_string)
 
 Алиас: `trim(input_string)`.
 
-**Параметры**
+**Аргументы**
 
 -   `input_string` — строка для обрезки. [String](../../sql-reference/functions/string-functions.md).
 
@@ -455,10 +461,10 @@ trimBoth(input_string)
 Запрос:
 
 ``` sql
-SELECT trimBoth('     Hello, world!     ')
+SELECT trimBoth('     Hello, world!     ');
 ```
 
-Ответ:
+Результат:
 
 ``` text
 ┌─trimBoth('     Hello, world!     ')─┐
@@ -488,14 +494,15 @@ SELECT trimBoth('     Hello, world!     ')
 
 Заменяет литералы, последовательности литералов и сложные псевдонимы заполнителями.
 
-**Синтаксис** 
+**Синтаксис**
+
 ``` sql
 normalizeQuery(x)
 ```
 
-**Параметры** 
+**Аргументы** 
 
--   `x` — Последовательность символов. [String](../../sql-reference/data-types/string.md).
+-   `x` — последовательность символов. [String](../../sql-reference/data-types/string.md).
 
 **Возвращаемое значение**
 
@@ -529,9 +536,9 @@ SELECT normalizeQuery('[1, 2, 3, x]') AS query;
 normalizedQueryHash(x)
 ```
 
-**Параметры** 
+**Аргументы** 
 
--   `x` — Последовательность символов. [String](../../sql-reference/data-types/string.md).
+-   `x` — последовательность символов. [String](../../sql-reference/data-types/string.md).
 
 **Возвращаемое значение**
 
@@ -567,7 +574,7 @@ SELECT normalizedQueryHash('SELECT 1 AS `xyz`') != normalizedQueryHash('SELECT 1
 encodeXMLComponent(x)
 ```
 
-**Параметры** 
+**Аргументы** 
 
 -   `x` — последовательность символов. [String](../../sql-reference/data-types/string.md).
 
@@ -597,7 +604,6 @@ Hello, &quot;world&quot;!
 &apos;foo&apos;
 ```
 
-
 ## decodeXMLComponent {#decode-xml-component}
 
 Заменяет символами предопределенные мнемоники XML: `&quot;` `&amp;` `&apos;` `&gt;` `&lt;`
@@ -609,7 +615,7 @@ Hello, &quot;world&quot;!
 decodeXMLComponent(x)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `x` — последовательность символов. [String](../../sql-reference/data-types/string.md).
 
@@ -639,4 +645,66 @@ SELECT decodeXMLComponent('&lt; &#x3A3; &gt;');
 
 -   [Мнемоники в HTML](https://ru.wikipedia.org/wiki/%D0%9C%D0%BD%D0%B5%D0%BC%D0%BE%D0%BD%D0%B8%D0%BA%D0%B8_%D0%B2_HTML)
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/functions/string_functions/) <!--hide-->
+
+
+## extractTextFromHTML {#extracttextfromhtml}
+
+Функция для извлечения текста из HTML или XHTML.
+Она не соответствует всем HTML, XML или XHTML стандартам на 100%, но ее реализация достаточно точная и быстрая. Правила обработки следующие:
+
+1. Комментарии удаляются. Пример: `<!-- test -->`. Комментарий должен оканчиваться символами `-->`. Вложенные комментарии недопустимы.
+Примечание: конструкции наподобие `<!-->` и `<!--->` не являются допустимыми комментариями в HTML, но они будут удалены согласно другим правилам.
+2. Содержимое CDATA вставляется дословно. Примечание: формат CDATA специфичен для XML/XHTML. Но он обрабатывается всегда по принципу "наилучшего возможного результата".
+3. Элементы `script` и `style` удаляются вместе со всем содержимым. Примечание: предполагается, что закрывающий тег не может появиться внутри содержимого. Например, в JS строковый литерал должен быть экранирован как `"<\/script>"`.
+Примечание: комментарии и CDATA возможны внутри `script` или `style` - тогда закрывающие теги не ищутся внутри CDATA. Пример: `<script><![CDATA[</script>]]></script>`. Но они ищутся внутри комментариев. Иногда возникают сложные случаи: `<script>var x = "<!--"; </script> var y = "-->"; alert(x + y);</script>`
+Примечание: `script` и `style` могут быть названиями пространств имен XML - тогда они не обрабатываются как обычные элементы `script` или `style`. Пример: `<script:a>Hello</script:a>`.
+Примечание: пробелы возможны после имени закрывающего тега: `</script >`, но не перед ним: `< / script>`.
+4. Другие теги или элементы, подобные тегам, удаляются, а их внутреннее содержимое остается. Пример: `<a>.</a>`
+Примечание: ожидается, что такой HTML является недопустимым: `<a test=">"></a>`
+Примечание: функция также удаляет подобные тегам элементы: `<>`, `<!>`, и т. д.
+Примечание: если встречается тег без завершающего символа `>`, то удаляется этот тег и весь следующий за ним текст: `<hello `
+5. Мнемоники HTML и XML не декодируются. Они должны быть обработаны отдельной функцией.
+6. Пробелы в тексте удаляются и добавляются по следующим правилам:
+- Пробелы в начале и в конце извлеченного текста удаляются.
+- Несколько пробелов подряд заменяются одним пробелом.
+- Если текст разделен другими удаляемыми элементами и в этом месте нет пробела, он добавляется.
+- Это может привести к появлению неестественного написания, например: `Hello<b>world</b>`, `Hello<!-- -->world` — в HTML нет пробелов, но функция вставляет их. Также следует учитывать такие варианты написания: `Hello<p>world</p>`, `Hello<br>world`. Подобные результаты выполнения функции могут использоваться для анализа данных, например, для преобразования HTML-текста в набор используемых слов.
+7. Также обратите внимание, что правильная обработка пробелов требует поддержки `<pre></pre>` и свойств CSS `display` и `white-space`.
+
+**Синтаксис**
+
+``` sql
+extractTextFromHTML(x)
+```
+
+**Аргументы**
+
+-   `x` — текст для обработки. [String](../../sql-reference/data-types/string.md). 
+
+**Возвращаемое значение**
+
+-   Извлеченный текст.
+
+Тип: [String](../../sql-reference/data-types/string.md).
+
+**Пример**
+
+Первый пример содержит несколько тегов и комментарий. На этом примере также видно, как обрабатываются пробелы.
+Второй пример показывает обработку `CDATA` и тега `script`.
+В третьем примере текст выделяется из полного HTML ответа, полученного с помощью функции [url](../../sql-reference/table-functions/url.md).
+
+Запрос:
+
+``` sql
+SELECT extractTextFromHTML(' <p> A text <i>with</i><b>tags</b>. <!-- comments --> </p> ');
+SELECT extractTextFromHTML('<![CDATA[The content within <b>CDATA</b>]]> <script>alert("Script");</script>');
+SELECT extractTextFromHTML(html) FROM url('http://www.donothingfor2minutes.com/', RawBLOB, 'html String');
+```
+
+Результат:
+
+``` text
+A text with tags .
+The content within <b>CDATA</b>
+Do Nothing for 2 Minutes 2:00 &nbsp;
+```
diff --git a/docs/ru/sql-reference/functions/string-replace-functions.md b/docs/ru/sql-reference/functions/string-replace-functions.md
index f334d6804f9..9426e8685b0 100644
--- a/docs/ru/sql-reference/functions/string-replace-functions.md
+++ b/docs/ru/sql-reference/functions/string-replace-functions.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 42
-toc_title: "\u0424\u0443\u043d\u043a\u0446\u0438\u0438\u0020\u043f\u043e\u0438\u0441\u043a\u0430\u0020\u0438\u0020\u0437\u0430\u043c\u0435\u043d\u044b\u0020\u0432\u0020\u0441\u0442\u0440\u043e\u043a\u0430\u0445"
+toc_title: "Функции поиска и замены в строках"
 ---
 
 # Функции поиска и замены в строках {#funktsii-poiska-i-zameny-v-strokakh}
@@ -83,4 +83,3 @@ SELECT replaceRegexpAll('Hello, World!', '^', 'here: ') AS res
 └─────────────────────┘
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/functions/string_replace_functions/) <!--hide-->
diff --git a/docs/ru/sql-reference/functions/string-search-functions.md b/docs/ru/sql-reference/functions/string-search-functions.md
index b7193da6f33..2417a1c6ffd 100644
--- a/docs/ru/sql-reference/functions/string-search-functions.md
+++ b/docs/ru/sql-reference/functions/string-search-functions.md
@@ -1,13 +1,13 @@
 ---
 toc_priority: 41
-toc_title: "\u0424\u0443\u043d\u043a\u0446\u0438\u0438\u0020\u043f\u043e\u0438\u0441\u043a\u0430\u0020\u0432\u0020\u0441\u0442\u0440\u043e\u043a\u0430\u0445"
+toc_title: "Функции поиска в строках"
 ---
 
 # Функции поиска в строках {#funktsii-poiska-v-strokakh}
 
 Во всех функциях, поиск регистрозависимый по умолчанию. Существуют варианты функций для регистронезависимого поиска.
 
-## position(haystack, needle) {#position}
+## position(haystack, needle), locate(haystack, needle) {#position}
 
 Поиск подстроки `needle` в строке `haystack`.
 
@@ -21,13 +21,20 @@ toc_title: "\u0424\u0443\u043d\u043a\u0446\u0438\u0438\u0020\u043f\u043e\u0438\u
 position(haystack, needle[, start_pos])
 ```
 
+``` sql
+position(needle IN haystack)
+``` 
+
 Алиас: `locate(haystack, needle[, start_pos])`.
 
-**Параметры**
+!!! note "Примечание"
+    Синтаксис `position(needle IN haystack)` обеспечивает совместимость с SQL, функция работает так же, как `position(haystack, needle)`.
+
+**Аргументы**
 
 -   `haystack` — строка, по которой выполняется поиск. [Строка](../syntax.md#syntax-string-literal).
 -   `needle` — подстрока, которую необходимо найти. [Строка](../syntax.md#syntax-string-literal).
--   `start_pos` – Опциональный параметр, позиция символа в строке, с которого начинается поиск. [UInt](../../sql-reference/data-types/int-uint.md)
+-   `start_pos` — опциональный параметр, позиция символа в строке, с которого начинается поиск. [UInt](../../sql-reference/data-types/int-uint.md).
 
 **Возвращаемые значения**
 
@@ -43,10 +50,10 @@ position(haystack, needle[, start_pos])
 Запрос:
 
 ``` sql
-SELECT position('Hello, world!', '!')
+SELECT position('Hello, world!', '!');
 ```
 
-Ответ:
+Результат:
 
 ``` text
 ┌─position('Hello, world!', '!')─┐
@@ -59,10 +66,10 @@ SELECT position('Hello, world!', '!')
 Запрос:
 
 ``` sql
-SELECT position('Привет, мир!', '!')
+SELECT position('Привет, мир!', '!');
 ```
 
-Ответ:
+Результат:
 
 ``` text
 ┌─position('Привет, мир!', '!')─┐
@@ -70,6 +77,36 @@ SELECT position('Привет, мир!', '!')
 └───────────────────────────────┘
 ```
 
+**Примеры работы функции с синтаксисом POSITION(needle IN haystack)**
+
+Запрос:
+
+```sql
+SELECT 1 = position('абв' IN 'абв');
+```
+
+Результат:
+
+```text
+┌─equals(1, position('абв', 'абв'))─┐
+│                                 1 │
+└───────────────────────────────────┘
+```
+
+Запрос: 
+
+```sql
+SELECT 0 = position('абв' IN '');
+```
+
+Результат:
+
+```text
+┌─equals(0, position('', 'абв'))─┐
+│                              1 │
+└────────────────────────────────┘
+```
+
 ## positionCaseInsensitive {#positioncaseinsensitive}
 
 Такая же, как и [position](#position), но работает без учета регистра. Возвращает позицию в байтах найденной подстроки в строке, начиная с 1.
@@ -82,11 +119,11 @@ SELECT position('Привет, мир!', '!')
 positionCaseInsensitive(haystack, needle[, start_pos])
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `haystack` — строка, по которой выполняется поиск. [Строка](../syntax.md#syntax-string-literal).
 -   `needle` — подстрока, которую необходимо найти. [Строка](../syntax.md#syntax-string-literal).
--   `start_pos` – Опциональный параметр, позиция символа в строке, с которого начинается поиск. [UInt](../../sql-reference/data-types/int-uint.md)
+-   `start_pos` — опциональный параметр, позиция символа в строке, с которого начинается поиск. [UInt](../../sql-reference/data-types/int-uint.md).
 
 **Возвращаемые значения**
 
@@ -100,10 +137,10 @@ positionCaseInsensitive(haystack, needle[, start_pos])
 Запрос:
 
 ``` sql
-SELECT positionCaseInsensitive('Hello, world!', 'hello')
+SELECT positionCaseInsensitive('Hello, world!', 'hello');
 ```
 
-Ответ:
+Результат:
 
 ``` text
 ┌─positionCaseInsensitive('Hello, world!', 'hello')─┐
@@ -125,11 +162,11 @@ SELECT positionCaseInsensitive('Hello, world!', 'hello')
 positionUTF8(haystack, needle[, start_pos])
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `haystack` — строка, по которой выполняется поиск. [Строка](../syntax.md#syntax-string-literal).
 -   `needle` — подстрока, которую необходимо найти. [Строка](../syntax.md#syntax-string-literal).
--   `start_pos` – Опциональный параметр, позиция символа в строке, с которого начинается поиск. [UInt](../../sql-reference/data-types/int-uint.md)
+-   `start_pos` — опциональный параметр, позиция символа в строке, с которого начинается поиск. [UInt](../../sql-reference/data-types/int-uint.md).
 
 **Возвращаемые значения**
 
@@ -145,10 +182,10 @@ positionUTF8(haystack, needle[, start_pos])
 Запрос:
 
 ``` sql
-SELECT positionUTF8('Привет, мир!', '!')
+SELECT positionUTF8('Привет, мир!', '!');
 ```
 
-Ответ:
+Результат:
 
 ``` text
 ┌─positionUTF8('Привет, мир!', '!')─┐
@@ -161,7 +198,7 @@ SELECT positionUTF8('Привет, мир!', '!')
 Запрос для символа `é`, который представлен одной кодовой точкой `U+00E9`:
 
 ``` sql
-SELECT positionUTF8('Salut, étudiante!', '!')
+SELECT positionUTF8('Salut, étudiante!', '!');
 ```
 
 Result:
@@ -175,10 +212,10 @@ Result:
 Запрос для символа `é`, который представлен двумя кодовыми точками `U+0065U+0301`:
 
 ``` sql
-SELECT positionUTF8('Salut, étudiante!', '!')
+SELECT positionUTF8('Salut, étudiante!', '!');
 ```
 
-Ответ:
+Результат:
 
 ``` text
 ┌─positionUTF8('Salut, étudiante!', '!')─┐
@@ -198,11 +235,11 @@ SELECT positionUTF8('Salut, étudiante!', '!')
 positionCaseInsensitiveUTF8(haystack, needle[, start_pos])
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `haystack` — строка, по которой выполняется поиск. [Строка](../syntax.md#syntax-string-literal).
 -   `needle` — подстрока, которую необходимо найти. [Строка](../syntax.md#syntax-string-literal).
--   `start_pos` – Опциональный параметр, позиция символа в строке, с которого начинается поиск. [UInt](../../sql-reference/data-types/int-uint.md)
+-   `start_pos` — опциональный параметр, позиция символа в строке, с которого начинается поиск. [UInt](../../sql-reference/data-types/int-uint.md).
 
 **Возвращаемые значения**
 
@@ -216,10 +253,10 @@ positionCaseInsensitiveUTF8(haystack, needle[, start_pos])
 Запрос:
 
 ``` sql
-SELECT positionCaseInsensitiveUTF8('Привет, мир!', 'Мир')
+SELECT positionCaseInsensitiveUTF8('Привет, мир!', 'Мир');
 ```
 
-Ответ:
+Результат:
 
 ``` text
 ┌─positionCaseInsensitiveUTF8('Привет, мир!', 'Мир')─┐
@@ -257,7 +294,7 @@ multiSearchAllPositions(haystack, [needle1, needle2, ..., needlen])
 Query:
 
 ``` sql
-SELECT multiSearchAllPositions('Hello, World!', ['hello', '!', 'world'])
+SELECT multiSearchAllPositions('Hello, World!', ['hello', '!', 'world']);
 ```
 
 Result:
@@ -357,7 +394,7 @@ Result:
 extractAllGroupsHorizontal(haystack, pattern)
 ```
 
-**Параметры** 
+**Аргументы** 
 
 -   `haystack` — строка для разбора. Тип: [String](../../sql-reference/data-types/string.md).
 -   `pattern` — регулярное выражение, построенное по синтаксическим правилам [re2](https://github.com/google/re2/wiki/Syntax). Выражение должно содержать группы, заключенные в круглые скобки. Если выражение не содержит групп, генерируется исключение. Тип: [String](../../sql-reference/data-types/string.md). 
@@ -373,7 +410,7 @@ extractAllGroupsHorizontal(haystack, pattern)
 Запрос:
 
 ``` sql
-SELECT extractAllGroupsHorizontal('abc=111, def=222, ghi=333', '("[^"]+"|\\w+)=("[^"]+"|\\w+)')
+SELECT extractAllGroupsHorizontal('abc=111, def=222, ghi=333', '("[^"]+"|\\w+)=("[^"]+"|\\w+)');
 ```
 
 Результат:
@@ -384,8 +421,9 @@ SELECT extractAllGroupsHorizontal('abc=111, def=222, ghi=333', '("[^"]+"|\\w+)=(
 └──────────────────────────────────────────────────────────────────────────────────────────┘
 ```
 
-**См. также**
--   функция [extractAllGroupsVertical](#extractallgroups-vertical)
+**Смотрите также**
+
+-   Функция [extractAllGroupsVertical](#extractallgroups-vertical)
 
 ## extractAllGroupsVertical {#extractallgroups-vertical}
 
@@ -397,7 +435,7 @@ SELECT extractAllGroupsHorizontal('abc=111, def=222, ghi=333', '("[^"]+"|\\w+)=(
 extractAllGroupsVertical(haystack, pattern)
 ```
 
-**Параметры** 
+**Аргументы** 
 
 -   `haystack` — строка для разбора. Тип: [String](../../sql-reference/data-types/string.md).
 -   `pattern` — регулярное выражение, построенное по синтаксическим правилам [re2](https://github.com/google/re2/wiki/Syntax). Выражение должно содержать группы, заключенные в круглые скобки. Если выражение не содержит групп, генерируется исключение. Тип: [String](../../sql-reference/data-types/string.md).
@@ -413,7 +451,7 @@ extractAllGroupsVertical(haystack, pattern)
 Запрос:
 
 ``` sql
-SELECT extractAllGroupsVertical('abc=111, def=222, ghi=333', '("[^"]+"|\\w+)=("[^"]+"|\\w+)')
+SELECT extractAllGroupsVertical('abc=111, def=222, ghi=333', '("[^"]+"|\\w+)=("[^"]+"|\\w+)');
 ```
 
 Результат:
@@ -424,8 +462,9 @@ SELECT extractAllGroupsVertical('abc=111, def=222, ghi=333', '("[^"]+"|\\w+)=("[
 └────────────────────────────────────────────────────────────────────────────────────────┘
 ```
 
-**См. также**
--   функция [extractAllGroupsHorizontal](#extractallgroups-horizontal)
+**Смотрите также**
+
+-   Функция [extractAllGroupsHorizontal](#extractallgroups-horizontal)
 
 ## like(haystack, pattern), оператор haystack LIKE pattern {#function-like}
 
@@ -455,10 +494,10 @@ SELECT extractAllGroupsVertical('abc=111, def=222, ghi=333', '("[^"]+"|\\w+)=("[
 ilike(haystack, pattern)
 ```
 
-**Параметры**
+**Аргументы**
 
--   `haystack` — Входная строка. [String](../../sql-reference/syntax.md#syntax-string-literal).
--   `pattern` — Если `pattern` не содержит процента или нижнего подчеркивания, тогда `pattern` представляет саму строку. Нижнее подчеркивание (`_`) в `pattern` обозначает любой отдельный символ. Знак процента (`%`) соответствует последовательности из любого количества символов: от нуля и более.
+-   `haystack` — входная строка. [String](../../sql-reference/syntax.md#syntax-string-literal).
+-   `pattern` — если `pattern` не содержит процента или нижнего подчеркивания, тогда `pattern` представляет саму строку. Нижнее подчеркивание (`_`) в `pattern` обозначает любой отдельный символ. Знак процента (`%`) соответствует последовательности из любого количества символов: от нуля и более.
 
 Некоторые примеры `pattern`:
 
@@ -490,7 +529,7 @@ ilike(haystack, pattern)
 Запрос:
 
 ``` sql
-SELECT * FROM Months WHERE ilike(name, '%j%')
+SELECT * FROM Months WHERE ilike(name, '%j%');
 ```
 
 Результат:
@@ -530,7 +569,7 @@ SELECT * FROM Months WHERE ilike(name, '%j%')
 countMatches(haystack, pattern)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `haystack` — строка, по которой выполняется поиск. [String](../../sql-reference/syntax.md#syntax-string-literal).
 -   `pattern` — регулярное выражение, построенное по синтаксическим правилам [re2](https://github.com/google/re2/wiki/Syntax). [String](../../sql-reference/data-types/string.md).
@@ -583,11 +622,11 @@ SELECT countMatches('aaaa', 'aa');
 countSubstrings(haystack, needle[, start_pos])
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `haystack` — строка, в которой ведется поиск. [String](../../sql-reference/syntax.md#syntax-string-literal).
 -   `needle` — искомая подстрока. [String](../../sql-reference/syntax.md#syntax-string-literal).
--   `start_pos` – позиция первого символа в строке, с которого начнется поиск. Необязательный параметр. [UInt](../../sql-reference/data-types/int-uint.md).
+-   `start_pos` — позиция первого символа в строке, с которого начнется поиск. Необязательный параметр. [UInt](../../sql-reference/data-types/int-uint.md).
 
 **Возвращаемые значения**
 
@@ -649,11 +688,11 @@ SELECT countSubstrings('abc___abc', 'abc', 4);
 countSubstringsCaseInsensitive(haystack, needle[, start_pos])
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `haystack` — строка, в которой ведется поиск. [String](../../sql-reference/syntax.md#syntax-string-literal).
 -   `needle` — искомая подстрока. [String](../../sql-reference/syntax.md#syntax-string-literal).
--   `start_pos` – позиция первого символа в строке, с которого начнется поиск. Необязательный параметр. [UInt](../../sql-reference/data-types/int-uint.md).
+-   `start_pos` — позиция первого символа в строке, с которого начнется поиск. Необязательный параметр. [UInt](../../sql-reference/data-types/int-uint.md).
 
 **Возвращаемые значения**
 
@@ -715,11 +754,11 @@ SELECT countSubstringsCaseInsensitive('abC___abC', 'aBc', 2);
 SELECT countSubstringsCaseInsensitiveUTF8(haystack, needle[, start_pos])
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `haystack` — строка, в которой ведется поиск. [String](../../sql-reference/syntax.md#syntax-string-literal).
 -   `needle` — искомая подстрока. [String](../../sql-reference/syntax.md#syntax-string-literal).
--   `start_pos` – позиция первого символа в строке, с которого начнется поиск. Необязательный параметр. [UInt](../../sql-reference/data-types/int-uint.md).
+-   `start_pos` — позиция первого символа в строке, с которого начнется поиск. Необязательный параметр. [UInt](../../sql-reference/data-types/int-uint.md).
 
 **Возвращаемые значения**
 
@@ -756,5 +795,3 @@ SELECT countSubstringsCaseInsensitiveUTF8('аБв__АбВ__абв', 'Абв');
 │                                                          3 │
 └────────────────────────────────────────────────────────────┘
 ```
-
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/functions/string_search_functions/) <!--hide-->
diff --git a/docs/ru/sql-reference/functions/tuple-functions.md b/docs/ru/sql-reference/functions/tuple-functions.md
index f88886ec6f1..381743a450b 100644
--- a/docs/ru/sql-reference/functions/tuple-functions.md
+++ b/docs/ru/sql-reference/functions/tuple-functions.md
@@ -45,9 +45,9 @@ untuple(x)
 
 Чтобы пропустить некоторые столбцы в результате запроса, вы можете использовать выражение `EXCEPT`.
 
-**Параметры**
+**Аргументы**
 
--   `x` - функция `tuple`, столбец или кортеж элементов. [Tuple](../../sql-reference/data-types/tuple.md).
+-   `x` — функция `tuple`, столбец или кортеж элементов. [Tuple](../../sql-reference/data-types/tuple.md).
 
 **Возвращаемое значение**
 
@@ -111,4 +111,55 @@ SELECT untuple((* EXCEPT (v2, v3),)) FROM kv;
 
 -   [Tuple](../../sql-reference/data-types/tuple.md)
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/functions/tuple-functions/) <!--hide-->
+## tupleHammingDistance {#tuplehammingdistance}
+
+Возвращает [расстояние Хэмминга](https://ru.wikipedia.org/wiki/%D0%A0%D0%B0%D1%81%D1%81%D1%82%D0%BE%D1%8F%D0%BD%D0%B8%D0%B5_%D0%A5%D1%8D%D0%BC%D0%BC%D0%B8%D0%BD%D0%B3%D0%B0) между двумя кортежами одинакового размера.
+
+**Синтаксис**
+
+``` sql
+tupleHammingDistance(tuple1, tuple2)
+```
+
+**Аргументы**
+
+-   `tuple1` — первый кортеж. [Tuple](../../sql-reference/data-types/tuple.md).
+-   `tuple2` — второй кортеж. [Tuple](../../sql-reference/data-types/tuple.md).
+
+Кортежи должны иметь одинаковый размер и тип элементов.
+
+**Возвращаемое значение**
+
+-   Расстояние Хэмминга.
+
+Тип: [UInt8](../../sql-reference/data-types/int-uint.md).
+
+**Примеры**
+
+Запрос:
+
+``` sql
+SELECT tupleHammingDistance((1, 2, 3), (3, 2, 1)) AS HammingDistance;
+```
+
+Результат:
+
+``` text
+┌─HammingDistance─┐
+│               2 │
+└─────────────────┘
+```
+
+Может быть использовано с функциями [MinHash](../../sql-reference/functions/hash-functions.md#ngramminhash) для проверки строк на совпадение:
+
+``` sql
+SELECT tupleHammingDistance(wordShingleMinHash(string), wordShingleMinHashCaseInsensitive(string)) as HammingDistance FROM (SELECT 'Clickhouse is a column-oriented database management system for online analytical processing of queries.' AS string);
+```
+
+Результат:
+
+``` text
+┌─HammingDistance─┐
+│               2 │
+└─────────────────┘
+```
diff --git a/docs/ru/sql-reference/functions/tuple-map-functions.md b/docs/ru/sql-reference/functions/tuple-map-functions.md
index a36613280a1..c385dbd8f87 100644
--- a/docs/ru/sql-reference/functions/tuple-map-functions.md
+++ b/docs/ru/sql-reference/functions/tuple-map-functions.md
@@ -15,7 +15,7 @@ toc_title: Работа с контейнерами map
 map(key1, value1[, key2, value2, ...])
 ```
 
-**Параметры** 
+**Аргументы** 
 
 -   `key` — ключ. [String](../../sql-reference/data-types/string.md) или [Integer](../../sql-reference/data-types/int-uint.md).
 -   `value` — значение. [String](../../sql-reference/data-types/string.md), [Integer](../../sql-reference/data-types/int-uint.md) или [Array](../../sql-reference/data-types/array.md).
@@ -62,9 +62,10 @@ SELECT a['key2'] FROM table_map;
 └─────────────────────────┘
 ```
 
-**См. также** 
+**Смотрите также** 
 
 -   тип данных [Map(key, value)](../../sql-reference/data-types/map.md)
+
 ## mapAdd {#function-mapadd}
 
 Собирает все ключи и суммирует соответствующие значения.
@@ -75,7 +76,7 @@ SELECT a['key2'] FROM table_map;
 mapAdd(Tuple(Array, Array), Tuple(Array, Array) [, ...])
 ```
 
-**Параметры** 
+**Аргументы** 
 
 Аргументами являются [кортежи](../../sql-reference/data-types/tuple.md#tuplet1-t2) из двух [массивов](../../sql-reference/data-types/array.md#data-type-array), где элементы в первом массиве представляют ключи, а второй массив содержит значения для каждого ключа.
 Все массивы ключей должны иметь один и тот же тип, а все массивы значений должны содержать элементы, которые можно приводить к одному типу ([Int64](../../sql-reference/data-types/int-uint.md#int-ranges), [UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges) или [Float64](../../sql-reference/data-types/float.md#float32-float64)).
@@ -111,7 +112,7 @@ SELECT mapAdd(([toUInt8(1), 2], [1, 1]), ([toUInt8(1), 2], [1, 1])) as res, toTy
 mapSubtract(Tuple(Array, Array), Tuple(Array, Array) [, ...])
 ```
 
-**Параметры** 
+**Аргументы**
 
 Аргументами являются [кортежи](../../sql-reference/data-types/tuple.md#tuplet1-t2) из двух [массивов](../../sql-reference/data-types/array.md#data-type-array), где элементы в первом массиве представляют ключи, а второй массив содержит значения для каждого ключа.
 Все массивы ключей должны иметь один и тот же тип, а все массивы значений должны содержать элементы, которые можно приводить к одному типу ([Int64](../../sql-reference/data-types/int-uint.md#int-ranges), [UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges) или [Float64](../../sql-reference/data-types/float.md#float32-float64)).
@@ -151,10 +152,10 @@ mapPopulateSeries(keys, values[, max])
 
 Количество элементов в `keys` и `values` должно быть одинаковым для каждой строки.
 
-**Параметры**
+**Аргументы**
 
--   `keys` — Массив ключей [Array](../../sql-reference/data-types/array.md#data-type-array)([Int](../../sql-reference/data-types/int-uint.md#int-ranges)).
--   `values` — Массив значений. [Array](../../sql-reference/data-types/array.md#data-type-array)([Int](../../sql-reference/data-types/int-uint.md#int-ranges)).
+-   `keys` — массив ключей [Array](../../sql-reference/data-types/array.md#data-type-array)([Int](../../sql-reference/data-types/int-uint.md#int-ranges)).
+-   `values` — массив значений. [Array](../../sql-reference/data-types/array.md#data-type-array)([Int](../../sql-reference/data-types/int-uint.md#int-ranges)).
 
 **Возвращаемое значение**
 
@@ -176,4 +177,128 @@ select mapPopulateSeries([1,2,4], [11,22,44], 5) as res, toTypeName(res) as type
 └──────────────────────────────┴───────────────────────────────────┘
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/query_language/functions/tuple-map-functions/) <!--hide-->
+## mapContains {#mapcontains}
+
+Определяет, содержит ли контейнер `map` ключ `key`.
+
+**Синтаксис**
+
+``` sql
+mapContains(map, key)
+```
+
+**Аргументы** 
+
+-   `map` — контейнер Map. [Map](../../sql-reference/data-types/map.md).
+-   `key` — ключ. Тип соответстует типу ключей параметра  `map`.
+
+**Возвращаемое значение**
+
+-   `1` если `map` включает `key`, иначе `0`.
+
+Тип: [UInt8](../../sql-reference/data-types/int-uint.md).
+
+**Пример**
+
+Запрос:
+
+```sql
+CREATE TABLE test (a Map(String,String)) ENGINE = Memory;
+
+INSERT INTO test VALUES ({'name':'eleven','age':'11'}), ({'number':'twelve','position':'6.0'});
+
+SELECT mapContains(a, 'name') FROM test;
+
+```
+
+Результат:
+
+```text
+┌─mapContains(a, 'name')─┐
+│                      1 │
+│                      0 │
+└────────────────────────┘
+```
+
+## mapKeys {#mapkeys}
+
+Возвращает все ключи контейнера `map`.
+
+**Синтаксис**
+
+```sql
+mapKeys(map)
+```
+
+**Аргументы**
+
+-   `map` — контейнер Map. [Map](../../sql-reference/data-types/map.md).
+
+**Возвращаемое значение**
+
+-   Массив со всеми ключами контейнера `map`.
+
+Тип: [Array](../../sql-reference/data-types/array.md).
+
+**Пример**
+
+Запрос:
+
+```sql
+CREATE TABLE test (a Map(String,String)) ENGINE = Memory;
+
+INSERT INTO test VALUES ({'name':'eleven','age':'11'}), ({'number':'twelve','position':'6.0'});
+
+SELECT mapKeys(a) FROM test;
+```
+
+Результат:
+
+```text
+┌─mapKeys(a)────────────┐
+│ ['name','age']        │
+│ ['number','position'] │
+└───────────────────────┘
+```
+
+## mapValues {#mapvalues}
+
+Возвращает все значения контейнера `map`.
+
+**Синтаксис**
+
+```sql
+mapKeys(map)
+```
+
+**Аргументы**
+
+-   `map` — контейнер Map. [Map](../../sql-reference/data-types/map.md).
+
+**Возвращаемое значение**
+
+-   Массив со всеми значениями контейнера `map`.
+
+Тип: [Array](../../sql-reference/data-types/array.md).
+
+**Примеры**
+
+Запрос:
+
+```sql
+CREATE TABLE test (a Map(String,String)) ENGINE = Memory;
+
+INSERT INTO test VALUES ({'name':'eleven','age':'11'}), ({'number':'twelve','position':'6.0'});
+
+SELECT mapValues(a) FROM test;
+```
+
+Результат:
+
+```text
+┌─mapValues(a)─────┐
+│ ['eleven','11']  │
+│ ['twelve','6.0'] │
+└──────────────────┘
+```
+
diff --git a/docs/ru/sql-reference/functions/type-conversion-functions.md b/docs/ru/sql-reference/functions/type-conversion-functions.md
index 4a314bd22d8..fc1dd15f8e3 100644
--- a/docs/ru/sql-reference/functions/type-conversion-functions.md
+++ b/docs/ru/sql-reference/functions/type-conversion-functions.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 38
-toc_title: "\u0424\u0443\u043d\u043a\u0446\u0438\u0438\u0020\u043f\u0440\u0435\u043e\u0431\u0440\u0430\u0437\u043e\u0432\u0430\u043d\u0438\u044f\u0020\u0442\u0438\u043f\u043e\u0432"
+toc_title: "Функции преобразования типов"
 ---
 
 # Функции преобразования типов {#funktsii-preobrazovaniia-tipov}
@@ -22,7 +22,7 @@ toc_title: "\u0424\u0443\u043d\u043a\u0446\u0438\u0438\u0020\u043f\u0440\u0435\u
 -   `toInt128(expr)` — возвращает значение типа `Int128`.
 -   `toInt256(expr)` — возвращает значение типа `Int256`.
 
-**Параметры**
+**Аргументы**
 
 -   `expr` — [выражение](../syntax.md#syntax-expressions) возвращающее число или строку с десятичным представление числа. Бинарное, восьмеричное и шестнадцатеричное представление числа не поддержаны. Ведущие нули обрезаются.
 
@@ -36,10 +36,14 @@ toc_title: "\u0424\u0443\u043d\u043a\u0446\u0438\u0438\u0020\u043f\u0440\u0435\u
 
 **Пример**
 
+Запрос:
+
 ``` sql
-SELECT toInt64(nan), toInt32(32), toInt16('16'), toInt8(8.8)
+SELECT toInt64(nan), toInt32(32), toInt16('16'), toInt8(8.8);
 ```
 
+Результат:
+
 ``` text
 ┌─────────toInt64(nan)─┬─toInt32(32)─┬─toInt16('16')─┬─toInt8(8.8)─┐
 │ -9223372036854775808 │          32 │            16 │           8 │
@@ -52,10 +56,14 @@ SELECT toInt64(nan), toInt32(32), toInt16('16'), toInt8(8.8)
 
 **Пример**
 
+Запрос:
+
 ``` sql
-select toInt64OrZero('123123'), toInt8OrZero('123qwe123')
+SELECT toInt64OrZero('123123'), toInt8OrZero('123qwe123');
 ```
 
+Результат:
+
 ``` text
 ┌─toInt64OrZero('123123')─┬─toInt8OrZero('123qwe123')─┐
 │                  123123 │                         0 │
@@ -68,10 +76,14 @@ select toInt64OrZero('123123'), toInt8OrZero('123qwe123')
 
 **Пример**
 
+Запрос:
+
 ``` sql
-select toInt64OrNull('123123'), toInt8OrNull('123qwe123')
+SELECT toInt64OrNull('123123'), toInt8OrNull('123qwe123');
 ```
 
+Результат:
+
 ``` text
 ┌─toInt64OrNull('123123')─┬─toInt8OrNull('123qwe123')─┐
 │                  123123 │                      ᴺᵁᴸᴸ │
@@ -88,7 +100,7 @@ select toInt64OrNull('123123'), toInt8OrNull('123qwe123')
 -   `toUInt64(expr)` — возвращает значение типа `UInt64`.
 -   `toUInt256(expr)` — возвращает значение типа `UInt256`.
 
-**Параметры**
+**Аргументы**
 
 -   `expr` — [выражение](../syntax.md#syntax-expressions) возвращающее число или строку с десятичным представление числа. Бинарное, восьмеричное и шестнадцатеричное представление числа не поддержаны. Ведущие нули обрезаются.
 
@@ -102,10 +114,14 @@ select toInt64OrNull('123123'), toInt8OrNull('123qwe123')
 
 **Пример**
 
+Запрос:
+
 ``` sql
-SELECT toUInt64(nan), toUInt32(-32), toUInt16('16'), toUInt8(8.8)
+SELECT toUInt64(nan), toUInt32(-32), toUInt16('16'), toUInt8(8.8);
 ```
 
+Результат:
+
 ``` text
 ┌───────toUInt64(nan)─┬─toUInt32(-32)─┬─toUInt16('16')─┬─toUInt8(8.8)─┐
 │ 9223372036854775808 │    4294967264 │             16 │            8 │
@@ -124,6 +140,8 @@ SELECT toUInt64(nan), toUInt32(-32), toUInt16('16'), toUInt8(8.8)
 
 ## toDate {#todate}
 
+Cиноним: `DATE`.
+
 ## toDateOrZero {#todateorzero}
 
 ## toDateOrNull {#todateornull}
@@ -154,7 +172,7 @@ SELECT toUInt64(nan), toUInt32(-32), toUInt16('16'), toUInt8(8.8)
 
 Эти функции следует использовать вместо функций `toDecimal*()`, если при ошибке обработки входного значения вы хотите получать `NULL` вместо исключения.
 
-**Параметры**
+**Аргументы**
 
 -   `expr` — [выражение](../syntax.md#syntax-expressions), возвращающее значение типа [String](../../sql-reference/functions/type-conversion-functions.md). ClickHouse ожидает текстовое представление десятичного числа. Например, `'1.111'`.
 -   `S` — количество десятичных знаков в результирующем значении.
@@ -168,20 +186,28 @@ SELECT toUInt64(nan), toUInt32(-32), toUInt16('16'), toUInt8(8.8)
 
 **Примеры**
 
+Запрос:
+
 ``` sql
-SELECT toDecimal32OrNull(toString(-1.111), 5) AS val, toTypeName(val)
+SELECT toDecimal32OrNull(toString(-1.111), 5) AS val, toTypeName(val);
 ```
 
+Результат:
+
 ``` text
 ┌──────val─┬─toTypeName(toDecimal32OrNull(toString(-1.111), 5))─┐
 │ -1.11100 │ Nullable(Decimal(9, 5))                            │
 └──────────┴────────────────────────────────────────────────────┘
 ```
 
+Запрос:
+
 ``` sql
-SELECT toDecimal32OrNull(toString(-1.111), 2) AS val, toTypeName(val)
+SELECT toDecimal32OrNull(toString(-1.111), 2) AS val, toTypeName(val);
 ```
 
+Результат:
+
 ``` text
 ┌──val─┬─toTypeName(toDecimal32OrNull(toString(-1.111), 2))─┐
 │ ᴺᵁᴸᴸ │ Nullable(Decimal(9, 2))                            │
@@ -199,7 +225,7 @@ SELECT toDecimal32OrNull(toString(-1.111), 2) AS val, toTypeName(val)
 
 Эти функции следует использовать вместо функций `toDecimal*()`, если при ошибке обработки входного значения вы хотите получать `0` вместо исключения.
 
-**Параметры**
+**Аргументы**
 
 -   `expr` — [выражение](../syntax.md#syntax-expressions), возвращающее значение типа [String](../../sql-reference/functions/type-conversion-functions.md). ClickHouse ожидает текстовое представление десятичного числа. Например, `'1.111'`.
 -   `S` — количество десятичных знаков в результирующем значении.
@@ -213,20 +239,28 @@ SELECT toDecimal32OrNull(toString(-1.111), 2) AS val, toTypeName(val)
 
 **Пример**
 
+Запрос:
+
 ``` sql
-SELECT toDecimal32OrZero(toString(-1.111), 5) AS val, toTypeName(val)
+SELECT toDecimal32OrZero(toString(-1.111), 5) AS val, toTypeName(val);
 ```
 
+Результат:
+
 ``` text
 ┌──────val─┬─toTypeName(toDecimal32OrZero(toString(-1.111), 5))─┐
 │ -1.11100 │ Decimal(9, 5)                                      │
 └──────────┴────────────────────────────────────────────────────┘
 ```
 
+Запрос:
+
 ``` sql
-SELECT toDecimal32OrZero(toString(-1.111), 2) AS val, toTypeName(val)
+SELECT toDecimal32OrZero(toString(-1.111), 2) AS val, toTypeName(val);
 ```
 
+Результат:
+
 ``` text
 ┌──val─┬─toTypeName(toDecimal32OrZero(toString(-1.111), 2))─┐
 │ 0.00 │ Decimal(9, 2)                                      │
@@ -258,12 +292,18 @@ YYYY-MM-DD hh:mm:ss
 
 Дополнительно, функция toString от аргумента типа DateTime может принимать второй аргумент String - имя тайм-зоны. Пример: `Asia/Yekaterinburg` В этом случае, форматирование времени производится согласно указанной тайм-зоне.
 
+**Пример**
+
+Запрос:
+
 ``` sql
 SELECT
     now() AS now_local,
-    toString(now(), 'Asia/Yekaterinburg') AS now_yekat
+    toString(now(), 'Asia/Yekaterinburg') AS now_yekat;
 ```
 
+Результат:
+
 ``` text
 ┌───────────now_local─┬─now_yekat───────────┐
 │ 2016-06-15 00:11:21 │ 2016-06-15 02:11:21 │
@@ -281,22 +321,30 @@ SELECT
 
 Принимает аргумент типа String или FixedString. Возвращает String, вырезая содержимое строки до первого найденного нулевого байта.
 
-Пример:
+**Примеры**
+
+Запрос:
 
 ``` sql
-SELECT toFixedString('foo', 8) AS s, toStringCutToZero(s) AS s_cut
+SELECT toFixedString('foo', 8) AS s, toStringCutToZero(s) AS s_cut;
 ```
 
+Результат:
+
 ``` text
 ┌─s─────────────┬─s_cut─┐
 │ foo\0\0\0\0\0 │ foo   │
 └───────────────┴───────┘
 ```
 
+Запрос:
+
 ``` sql
-SELECT toFixedString('foo\0bar', 8) AS s, toStringCutToZero(s) AS s_cut
+SELECT toFixedString('foo\0bar', 8) AS s, toStringCutToZero(s) AS s_cut;
 ```
 
+Результат:
+
 ``` text
 ┌─s──────────┬─s_cut─┐
 │ foo\0bar\0 │ foo   │
@@ -329,7 +377,7 @@ SELECT toFixedString('foo\0bar', 8) AS s, toStringCutToZero(s) AS s_cut
 reinterpretAsUUID(fixed_string)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `fixed_string` — cтрока с big-endian порядком байтов. [FixedString](../../sql-reference/data-types/fixedstring.md#fixedstring).
 
@@ -344,7 +392,7 @@ reinterpretAsUUID(fixed_string)
 Запрос:
 
 ``` sql
-SELECT reinterpretAsUUID(reverse(unhex('000102030405060708090a0b0c0d0e0f')))
+SELECT reinterpretAsUUID(reverse(unhex('000102030405060708090a0b0c0d0e0f')));
 ```
 
 Результат:
@@ -375,12 +423,53 @@ SELECT uuid = uuid2;
 └─────────────────────┘
 ```
 
+## reinterpret(x, T) {#type_conversion_function-reinterpret}
+
+Использует туже самую исходную последовательность байт в памяти для значения `x` и переинтерпретирует ее как конечный тип данных
+
+Запрос:
+```sql
+SELECT reinterpret(toInt8(-1), 'UInt8') as int_to_uint,
+    reinterpret(toInt8(1), 'Float32') as int_to_float,
+    reinterpret('1', 'UInt32') as string_to_int;
+```
+
+Результат:
+
+```
+┌─int_to_uint─┬─int_to_float─┬─string_to_int─┐
+│         255 │        1e-45 │            49 │
+└─────────────┴──────────────┴───────────────┘
+```
+
 ## CAST(x, T) {#type_conversion_function-cast}
 
-Преобразует x в тип данных t.
-Поддерживается также синтаксис CAST(x AS t).
+Преобразует входное значение `x` в указанный тип данных `T`. В отличии от функции `reinterpret` использует внешнее представление значения `x`.
 
-Пример:
+Поддерживается также синтаксис `CAST(x AS t)`.
+
+Обратите внимание, что если значение `x` не может быть преобразовано к типу `T`, возникает переполнение. Например, `CAST(-1, 'UInt8')` возвращает 255.
+
+**Примеры**
+
+Запрос:
+
+```sql
+SELECT
+    cast(toInt8(-1), 'UInt8') AS cast_int_to_uint,
+    cast(toInt8(1), 'Float32') AS cast_int_to_float,
+    cast('1', 'UInt32') AS cast_string_to_int
+```
+
+Результат:
+
+```
+┌─cast_int_to_uint─┬─cast_int_to_float─┬─cast_string_to_int─┐
+│              255 │                 1 │                  1 │
+└──────────────────┴───────────────────┴────────────────────┘
+```
+
+Запрос:
 
 ``` sql
 SELECT
@@ -388,9 +477,11 @@ SELECT
     CAST(timestamp AS DateTime) AS datetime,
     CAST(timestamp AS Date) AS date,
     CAST(timestamp, 'String') AS string,
-    CAST(timestamp, 'FixedString(22)') AS fixed_string
+    CAST(timestamp, 'FixedString(22)') AS fixed_string;
 ```
 
+Результат:
+
 ``` text
 ┌─timestamp───────────┬────────────datetime─┬───────date─┬─string──────────────┬─fixed_string──────────────┐
 │ 2016-06-15 23:00:00 │ 2016-06-15 23:00:00 │ 2016-06-15 │ 2016-06-15 23:00:00 │ 2016-06-15 23:00:00\0\0\0 │
@@ -399,12 +490,18 @@ SELECT
 
 Преобразование в FixedString(N) работает только для аргументов типа String или FixedString(N).
 
-Поддержано преобразование к типу [Nullable](../../sql-reference/functions/type-conversion-functions.md) и обратно. Пример:
+Поддержано преобразование к типу [Nullable](../../sql-reference/functions/type-conversion-functions.md) и обратно. 
+
+**Примеры**
+
+Запрос:
 
 ``` sql
-SELECT toTypeName(x) FROM t_null
+SELECT toTypeName(x) FROM t_null;
 ```
 
+Результат:
+
 ``` text
 ┌─toTypeName(x)─┐
 │ Int8          │
@@ -412,10 +509,14 @@ SELECT toTypeName(x) FROM t_null
 └───────────────┘
 ```
 
+Запрос:
+
 ``` sql
-SELECT toTypeName(CAST(x, 'Nullable(UInt16)')) FROM t_null
+SELECT toTypeName(CAST(x, 'Nullable(UInt16)')) FROM t_null;
 ```
 
+Результат:
+
 ``` text
 ┌─toTypeName(CAST(x, 'Nullable(UInt16)'))─┐
 │ Nullable(UInt16)                        │
@@ -423,10 +524,98 @@ SELECT toTypeName(CAST(x, 'Nullable(UInt16)')) FROM t_null
 └─────────────────────────────────────────┘
 ```
 
-**См. также**
+**Смотрите также**
 
 -   Настройка [cast_keep_nullable](../../operations/settings/settings.md#cast_keep_nullable)
 
+## accurateCast(x, T) {#type_conversion_function-accurate-cast}
+
+Преобразует входное значение `x` в указанный тип данных `T`.
+
+В отличие от функции [cast(x, T)](#type_conversion_function-cast), `accurateCast` не допускает переполнения при преобразовании числовых типов. Например, `accurateCast(-1, 'UInt8')` вызовет исключение.
+
+**Примеры**
+
+Запрос:
+
+``` sql
+SELECT cast(-1, 'UInt8') as uint8; 
+```
+
+Результат:
+
+``` text
+┌─uint8─┐
+│   255 │
+└───────┘
+```
+
+Запрос:
+
+```sql
+SELECT accurateCast(-1, 'UInt8') as uint8;
+```
+
+Результат:
+
+``` text
+Code: 70. DB::Exception: Received from localhost:9000. DB::Exception: Value in column Int8 cannot be safely converted into type UInt8: While processing accurateCast(-1, 'UInt8') AS uint8.
+```
+
+## accurateCastOrNull(x, T) {#type_conversion_function-accurate-cast_or_null}
+
+Преобразует входное значение `x` в указанный тип данных `T`.
+
+Всегда возвращает тип [Nullable](../../sql-reference/data-types/nullable.md). Если исходное значение не может быть преобразовано к целевому типу, возвращает [NULL](../../sql-reference/syntax.md#null-literal).
+
+**Синтаксис**
+
+```sql
+accurateCastOrNull(x, T)
+```
+
+**Аргументы**
+
+-   `x` — входное значение.
+-   `T` — имя возвращаемого типа данных.
+
+**Возвращаемое значение**
+
+-   Значение, преобразованное в указанный тип `T`.
+
+**Примеры**
+
+Запрос:
+
+``` sql
+SELECT toTypeName(accurateCastOrNull(5, 'UInt8'));
+```
+
+Результат:
+
+``` text
+┌─toTypeName(accurateCastOrNull(5, 'UInt8'))─┐
+│ Nullable(UInt8)                            │
+└────────────────────────────────────────────┘
+```
+
+Запрос:
+
+``` sql
+SELECT
+    accurateCastOrNull(-1, 'UInt8') as uint8,
+    accurateCastOrNull(128, 'Int8') as int8,
+    accurateCastOrNull('Test', 'FixedString(2)') as fixed_string;
+```
+
+Результат:
+
+``` text
+┌─uint8─┬─int8─┬─fixed_string─┐
+│  ᴺᵁᴸᴸ │ ᴺᵁᴸᴸ │ ᴺᵁᴸᴸ         │
+└───────┴──────┴──────────────┘
+```
+
 ## toInterval(Year\|Quarter\|Month\|Week\|Day\|Hour\|Minute\|Second) {#function-tointerval}
 
 Приводит аргумент из числового типа данных к типу данных [IntervalType](../../sql-reference/data-types/special-data-types/interval.md).
@@ -444,7 +633,7 @@ toIntervalQuarter(number)
 toIntervalYear(number)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `number` — длительность интервала. Положительное целое число.
 
@@ -454,6 +643,8 @@ toIntervalYear(number)
 
 **Пример**
 
+Запрос:
+
 ``` sql
 WITH
     toDate('2019-01-01') AS date,
@@ -461,9 +652,11 @@ WITH
     toIntervalWeek(1) AS interval_to_week
 SELECT
     date + interval_week,
-    date + interval_to_week
+    date + interval_to_week;
 ```
 
+Результат:
+
 ``` text
 ┌─plus(date, interval_week)─┬─plus(date, interval_to_week)─┐
 │                2019-01-08 │                   2019-01-08 │
@@ -471,6 +664,7 @@ SELECT
 ```
 
 ## parseDateTimeBestEffort {#parsedatetimebesteffort}
+## parseDateTime32BestEffort {#parsedatetime32besteffort}
 
 Преобразует дату и время в [строковом](../../sql-reference/functions/type-conversion-functions.md) представлении к типу данных [DateTime](../../sql-reference/functions/type-conversion-functions.md#data_type-datetime).
 
@@ -479,10 +673,10 @@ SELECT
 **Синтаксис**
 
 ``` sql
-parseDateTimeBestEffort(time_string[, time_zone]);
+parseDateTimeBestEffort(time_string[, time_zone])
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `time_string` — строка, содержащая дату и время для преобразования. [String](../../sql-reference/functions/type-conversion-functions.md).
 -   `time_zone` — часовой пояс. Функция анализирует `time_string` в соответствии с заданным часовым поясом. [String](../../sql-reference/functions/type-conversion-functions.md).
@@ -522,7 +716,7 @@ AS parseDateTimeBestEffort;
 
 ``` sql
 SELECT parseDateTimeBestEffort('Sat, 18 Aug 2018 07:22:16 GMT', 'Europe/Moscow')
-AS parseDateTimeBestEffort
+AS parseDateTimeBestEffort;
 ```
 
 Результат:
@@ -537,7 +731,7 @@ AS parseDateTimeBestEffort
 
 ``` sql
 SELECT parseDateTimeBestEffort('1284101485')
-AS parseDateTimeBestEffort
+AS parseDateTimeBestEffort;
 ```
 
 Результат:
@@ -552,7 +746,7 @@ AS parseDateTimeBestEffort
 
 ``` sql
 SELECT parseDateTimeBestEffort('2018-12-12 10:12:12')
-AS parseDateTimeBestEffort
+AS parseDateTimeBestEffort;
 ```
 
 Результат:
@@ -566,7 +760,7 @@ AS parseDateTimeBestEffort
 Запрос:
 
 ``` sql
-SELECT parseDateTimeBestEffort('10 20:19')
+SELECT parseDateTimeBestEffort('10 20:19');
 ```
 
 Результат:
@@ -577,7 +771,7 @@ SELECT parseDateTimeBestEffort('10 20:19')
 └─────────────────────────────────────┘
 ```
 
-**См. также**
+**Смотрите также**
 
 -   [Информация о формате ISO 8601 от @xkcd](https://xkcd.com/1179/)
 -   [RFC 1123](https://tools.ietf.org/html/rfc1123)
@@ -591,10 +785,10 @@ SELECT parseDateTimeBestEffort('10 20:19')
 **Синтаксис**
 
 ``` sql
-parseDateTimeBestEffortUS(time_string [, time_zone]);
+parseDateTimeBestEffortUS(time_string [, time_zone])
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `time_string` — строка, содержащая дату и время для преобразования. [String](../../sql-reference/data-types/string.md).
 -   `time_zone` — часовой пояс. Функция анализирует `time_string` в соответствии с часовым поясом. [String](../../sql-reference/data-types/string.md).
@@ -620,7 +814,7 @@ SELECT parseDateTimeBestEffortUS('09/12/2020 12:12:57')
 AS parseDateTimeBestEffortUS;
 ```
 
-Ответ:
+Результат:
 
 ``` text
 ┌─parseDateTimeBestEffortUS─┐
@@ -635,7 +829,7 @@ SELECT parseDateTimeBestEffortUS('09-12-2020 12:12:57')
 AS parseDateTimeBestEffortUS;
 ```
 
-Ответ:
+Результат:
 
 ``` text
 ┌─parseDateTimeBestEffortUS─┐
@@ -650,7 +844,7 @@ SELECT parseDateTimeBestEffortUS('09.12.2020 12:12:57')
 AS parseDateTimeBestEffortUS;
 ```
 
-Ответ:
+Результат:
 
 ``` text
 ┌─parseDateTimeBestEffortUS─┐
@@ -658,9 +852,282 @@ AS parseDateTimeBestEffortUS;
 └─────────────────────────——┘
 ```
 
-## toUnixTimestamp64Milli
-## toUnixTimestamp64Micro
-## toUnixTimestamp64Nano
+## parseDateTimeBestEffortOrNull {#parsedatetimebesteffortornull}
+## parseDateTime32BestEffortOrNull {#parsedatetime32besteffortornull}
+
+Работает также как [parseDateTimeBestEffort](#parsedatetimebesteffort), но возвращает `NULL` когда получает формат даты который не может быть обработан.
+
+## parseDateTimeBestEffortOrZero {#parsedatetimebesteffortorzero}
+## parseDateTime32BestEffortOrZero {#parsedatetime32besteffortorzero}
+
+Работает также как [parseDateTimeBestEffort](#parsedatetimebesteffort), но возвращает нулевую дату или нулевую дату и время когда получает формат даты который не может быть обработан.
+
+## parseDateTimeBestEffortUSOrNull {#parsedatetimebesteffortusornull}
+
+Работает аналогично функции [parseDateTimeBestEffortUS](#parsedatetimebesteffortUS), но в отличие от нее возвращает `NULL`, если входная строка не может быть преобразована в тип данных [DateTime](../../sql-reference/data-types/datetime.md).
+
+**Синтаксис**
+
+``` sql
+parseDateTimeBestEffortUSOrNull(time_string[, time_zone])
+```
+
+**Аргументы**
+
+-   `time_string` — строка, содержащая дату или дату со временем для преобразования. Дата должна быть в американском формате (`MM/DD/YYYY` и т.д.). [String](../../sql-reference/data-types/string.md).
+-   `time_zone` — [часовой пояс](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone). Функция анализирует `time_string` в соответствии с заданным часовым поясом. Опциональный параметр. [String](../../sql-reference/data-types/string.md).
+
+**Поддерживаемые нестандартные форматы**
+
+-   Строка в формате [unix timestamp](https://en.wikipedia.org/wiki/Unix_time), содержащая 9-10 цифр.
+-   Строка, содержащая дату и время: `YYYYMMDDhhmmss`, `MM/DD/YYYY hh:mm:ss`, `MM-DD-YY hh:mm`, `YYYY-MM-DD hh:mm:ss` и т.д.
+-   Строка, содержащая дату без времени: `YYYY`, `YYYYMM`, `YYYY*MM`, `MM/DD/YYYY`, `MM-DD-YY` и т.д.
+-   Строка, содержащая день и время: `DD`, `DD hh`, `DD hh:mm`. В этом случае `YYYY-MM` заменяется на `2000-01`.
+-   Строка, содержащая дату и время, а также информацию о часовом поясе: `YYYY-MM-DD hh:mm:ss ±h:mm` и т.д. Например, `2020-12-12 17:36:00 -5:00`.
+
+**Возвращаемые значения**
+
+-   `time_string`, преобразованная в тип данных `DateTime`.
+-   `NULL`, если входная строка не может быть преобразована в тип данных `DateTime`.
+
+**Примеры**
+
+Запрос:
+
+``` sql
+SELECT parseDateTimeBestEffortUSOrNull('02/10/2021 21:12:57') AS parseDateTimeBestEffortUSOrNull;
+```
+
+Результат:
+
+``` text
+┌─parseDateTimeBestEffortUSOrNull─┐
+│             2021-02-10 21:12:57 │
+└─────────────────────────────────┘
+```
+
+Запрос:
+
+``` sql
+SELECT parseDateTimeBestEffortUSOrNull('02-10-2021 21:12:57 GMT', 'Europe/Moscow') AS parseDateTimeBestEffortUSOrNull;
+```
+
+Результат:
+
+``` text
+┌─parseDateTimeBestEffortUSOrNull─┐
+│             2021-02-11 00:12:57 │
+└─────────────────────────────────┘
+```
+
+Запрос:
+
+``` sql
+SELECT parseDateTimeBestEffortUSOrNull('02.10.2021') AS parseDateTimeBestEffortUSOrNull;
+```
+
+Результат:
+
+``` text
+┌─parseDateTimeBestEffortUSOrNull─┐
+│             2021-02-10 00:00:00 │
+└─────────────────────────────────┘
+```
+
+Запрос:
+
+``` sql
+SELECT parseDateTimeBestEffortUSOrNull('10.2021') AS parseDateTimeBestEffortUSOrNull;
+```
+
+Результат:
+
+``` text
+┌─parseDateTimeBestEffortUSOrNull─┐
+│                            ᴺᵁᴸᴸ │
+└─────────────────────────────────┘
+```
+
+## parseDateTimeBestEffortUSOrZero {#parsedatetimebesteffortusorzero}
+
+Работает аналогично функции [parseDateTimeBestEffortUS](#parsedatetimebesteffortUS), но в отличие от нее возвращает нулевую дату (`1970-01-01`) или нулевую дату со временем (`1970-01-01 00:00:00`), если входная строка не может быть преобразована в тип данных [DateTime](../../sql-reference/data-types/datetime.md).
+
+**Синтаксис**
+
+``` sql
+parseDateTimeBestEffortUSOrZero(time_string[, time_zone])
+```
+
+**Аргументы**
+
+-   `time_string` — строка, содержащая дату или дату со временем для преобразования. Дата должна быть в американском формате (`MM/DD/YYYY` и т.д.). [String](../../sql-reference/data-types/string.md).
+-   `time_zone` — [часовой пояс](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone). Функция анализирует `time_string` в соответствии с заданным часовым поясом. Опциональный параметр. [String](../../sql-reference/data-types/string.md).
+
+**Поддерживаемые нестандартные форматы**
+
+-   Строка в формате [unix timestamp](https://en.wikipedia.org/wiki/Unix_time), содержащая 9-10 цифр.
+-   Строка, содержащая дату и время: `YYYYMMDDhhmmss`, `MM/DD/YYYY hh:mm:ss`, `MM-DD-YY hh:mm`, `YYYY-MM-DD hh:mm:ss` и т.д.
+-   Строка, содержащая дату без времени: `YYYY`, `YYYYMM`, `YYYY*MM`, `MM/DD/YYYY`, `MM-DD-YY` и т.д.
+-   Строка, содержащая день и время: `DD`, `DD hh`, `DD hh:mm`. В этом случае `YYYY-MM` заменяется на `2000-01`.
+-   Строка, содержащая дату и время, а также информацию о часовом поясе: `YYYY-MM-DD hh:mm:ss ±h:mm` и т.д. Например, `2020-12-12 17:36:00 -5:00`.
+
+**Возвращаемые значения**
+
+-   `time_string`, преобразованная в тип данных `DateTime`.
+-   Нулевая дата или нулевая дата со временем, если входная строка не может быть преобразована в тип данных `DateTime`.
+
+**Примеры**
+
+Запрос:
+
+``` sql
+SELECT parseDateTimeBestEffortUSOrZero('02/10/2021 21:12:57') AS parseDateTimeBestEffortUSOrZero;
+```
+
+Результат:
+
+``` text
+┌─parseDateTimeBestEffortUSOrZero─┐
+│             2021-02-10 21:12:57 │
+└─────────────────────────────────┘
+```
+
+Запрос:
+
+``` sql
+SELECT parseDateTimeBestEffortUSOrZero('02-10-2021 21:12:57 GMT', 'Europe/Moscow') AS parseDateTimeBestEffortUSOrZero;
+```
+
+Результат:
+
+``` text
+┌─parseDateTimeBestEffortUSOrZero─┐
+│             2021-02-11 00:12:57 │
+└─────────────────────────────────┘
+```
+
+Запрос:
+
+``` sql
+SELECT parseDateTimeBestEffortUSOrZero('02.10.2021') AS parseDateTimeBestEffortUSOrZero;
+```
+
+Результат:
+
+``` text
+┌─parseDateTimeBestEffortUSOrZero─┐
+│             2021-02-10 00:00:00 │
+└─────────────────────────────────┘
+```
+
+Запрос:
+
+``` sql
+SELECT parseDateTimeBestEffortUSOrZero('02.2021') AS parseDateTimeBestEffortUSOrZero;
+```
+
+Результат:
+
+``` text
+┌─parseDateTimeBestEffortUSOrZero─┐
+│             1970-01-01 00:00:00 │
+└─────────────────────────────────┘
+```
+
+## parseDateTime64BestEffort {#parsedatetime64besteffort}
+
+Работает также как функция [parseDateTimeBestEffort](#parsedatetimebesteffort) но также понимамет милисекунды и микросекунды и возвращает `DateTime64(3)` или `DateTime64(6)` типы данных в зависимости от заданной точности.
+
+**Syntax**
+
+``` sql
+parseDateTime64BestEffort(time_string [, precision [, time_zone]])
+```
+
+**Parameters**
+
+-   `time_string` — String containing a date or date with time to convert. [String](../../sql-reference/data-types/string.md).
+-   `precision` — `3` for milliseconds, `6` for microseconds. Default `3`. Optional [UInt8](../../sql-reference/data-types/int-uint.md).
+-   `time_zone` — [Timezone](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone). The function parses `time_string` according to the timezone. Optional. [String](../../sql-reference/data-types/string.md).
+
+**Примеры**
+
+Запрос:
+
+```sql
+SELECT parseDateTime64BestEffort('2021-01-01') AS a, toTypeName(a) AS t
+UNION ALL
+SELECT parseDateTime64BestEffort('2021-01-01 01:01:00.12346') AS a, toTypeName(a) AS t
+UNION ALL
+SELECT parseDateTime64BestEffort('2021-01-01 01:01:00.12346',6) AS a, toTypeName(a) AS t
+UNION ALL
+SELECT parseDateTime64BestEffort('2021-01-01 01:01:00.12346',3,'Europe/Moscow') AS a, toTypeName(a) AS t
+FORMAT PrettyCompactMonoBlcok
+```
+
+Результат:
+
+```
+┌──────────────────────────a─┬─t──────────────────────────────┐
+│ 2021-01-01 01:01:00.123000 │ DateTime64(3)                  │
+│ 2021-01-01 00:00:00.000000 │ DateTime64(3)                  │
+│ 2021-01-01 01:01:00.123460 │ DateTime64(6)                  │
+│ 2020-12-31 22:01:00.123000 │ DateTime64(3, 'Europe/Moscow') │
+└────────────────────────────┴────────────────────────────────┘
+```
+
+## parseDateTime64BestEffortOrNull {#parsedatetime32besteffortornull}
+
+Работает также как функция [parseDateTime64BestEffort](#parsedatetime64besteffort) но возвращает `NULL` когда встречает формат даты который не может обработать.
+
+## parseDateTime64BestEffortOrZero {#parsedatetime64besteffortorzero}
+
+Работает также как функция [parseDateTime64BestEffort](#parsedatetimebesteffort) но возвращает "нулевую" дату и время когда встречает формат даты который не может обработать.
+
+
+## toLowCardinality {#tolowcardinality}
+
+Преобразует входные данные в версию [LowCardianlity](../data-types/lowcardinality.md) того же типа данных.
+
+Чтобы преобразовать данные из типа `LowCardinality`, используйте функцию [CAST](#type_conversion_function-cast). Например, `CAST(x as String)`.
+
+**Синтаксис**
+
+```sql
+toLowCardinality(expr)
+```
+
+**Аргументы**
+
+-   `expr` — [выражение](../syntax.md#syntax-expressions), которое в результате преобразуется в один из [поддерживаемых типов данных](../data-types/index.md#data_types).
+
+**Возвращаемое значение**
+
+-   Результат преобразования `expr`.
+
+Тип: `LowCardinality(expr_result_type)`
+
+**Пример**
+
+Запрос:
+
+```sql
+SELECT toLowCardinality('1');
+```
+
+Результат:
+
+```text
+┌─toLowCardinality('1')─┐
+│ 1                     │
+└───────────────────────┘
+```
+
+## toUnixTimestamp64Milli {#tounixtimestamp64milli}
+
+## toUnixTimestamp64Micro {#tounixtimestamp64micro}
+
+## toUnixTimestamp64Nano {#tounixtimestamp64nano}
 
 Преобразует значение `DateTime64` в значение `Int64` с фиксированной точностью менее одной секунды. 
 Входное значение округляется соответствующим образом вверх или вниз в зависимости от его точности. Обратите внимание, что возвращаемое значение - это временная метка в UTC, а не в часовом поясе `DateTime64`.
@@ -671,7 +1138,7 @@ AS parseDateTimeBestEffortUS;
 toUnixTimestamp64Milli(value)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `value` — значение `DateTime64` с любой точностью.
 
@@ -685,10 +1152,10 @@ toUnixTimestamp64Milli(value)
 
 ``` sql
 WITH toDateTime64('2019-09-16 19:20:12.345678910', 6) AS dt64
-SELECT toUnixTimestamp64Milli(dt64)
+SELECT toUnixTimestamp64Milli(dt64);
 ```
 
-Ответ:
+Результат:
 
 ``` text
 ┌─toUnixTimestamp64Milli(dt64)─┐
@@ -700,10 +1167,10 @@ SELECT toUnixTimestamp64Milli(dt64)
 
 ``` sql
 WITH toDateTime64('2019-09-16 19:20:12.345678910', 6) AS dt64
-SELECT toUnixTimestamp64Nano(dt64)
+SELECT toUnixTimestamp64Nano(dt64);
 ```
 
-Ответ:
+Результат:
 
 ``` text
 ┌─toUnixTimestamp64Nano(dt64)─┐
@@ -711,9 +1178,11 @@ SELECT toUnixTimestamp64Nano(dt64)
 └─────────────────────────────┘
 ```
 
-## fromUnixTimestamp64Milli
-## fromUnixTimestamp64Micro
-## fromUnixTimestamp64Nano
+## fromUnixTimestamp64Milli {#fromunixtimestamp64milli}
+
+## fromUnixTimestamp64Micro {#fromunixtimestamp64micro}
+
+## fromUnixTimestamp64Nano {#fromunixtimestamp64nano}
 
 Преобразует значение `Int64` в значение `DateTime64` с фиксированной точностью менее одной секунды и дополнительным часовым поясом. Входное значение округляется соответствующим образом вверх или вниз в зависимости от его точности. Обратите внимание, что входное значение обрабатывается как метка времени UTC, а не метка времени в заданном (или неявном) часовом поясе.
 
@@ -723,7 +1192,7 @@ SELECT toUnixTimestamp64Nano(dt64)
 fromUnixTimestamp64Milli(value [, ti])
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `value` — значение типы `Int64` с любой точностью.
 -   `timezone` — (не обязательный параметр) часовой пояс в формате `String` для возвращаемого результата.
@@ -738,10 +1207,10 @@ fromUnixTimestamp64Milli(value [, ti])
 
 ``` sql
 WITH CAST(1234567891011, 'Int64') AS i64
-SELECT fromUnixTimestamp64Milli(i64, 'UTC')
+SELECT fromUnixTimestamp64Milli(i64, 'UTC');
 ```
 
-Ответ:
+Результат:
 
 ``` text
 ┌─fromUnixTimestamp64Milli(i64, 'UTC')─┐
@@ -749,45 +1218,6 @@ SELECT fromUnixTimestamp64Milli(i64, 'UTC')
 └──────────────────────────────────────┘
 ```
 
-## toLowCardinality {#tolowcardinality}
-
-Преобразует входные данные в версию [LowCardianlity](../data-types/lowcardinality.md) того же типа данных.
-
-Чтобы преобразовать данные из типа `LowCardinality`, используйте функцию [CAST](#type_conversion_function-cast). Например, `CAST(x as String)`.
-
-**Синтаксис**
-
-```sql
-toLowCardinality(expr)
-```
-
-**Параметры**
-
-- `expr` — [Выражение](../syntax.md#syntax-expressions), которое в результате преобразуется в один из [поддерживаемых типов данных](../data-types/index.md#data_types).
-
-
-**Возвращаемое значение**
-
-- Результат преобразования `expr`.
-
-Тип: `LowCardinality(expr_result_type)`
-
-**Example**
-
-Запрос:
-
-```sql
-SELECT toLowCardinality('1')
-```
-
-Результат:
-
-```text
-┌─toLowCardinality('1')─┐
-│ 1                     │
-└───────────────────────┘
-```
-
 ## formatRow {#formatrow}
 
 Преобразует произвольные выражения в строку заданного формата.
@@ -798,10 +1228,10 @@ SELECT toLowCardinality('1')
 formatRow(format, x, y, ...)
 ```
 
-**Параметры**
+**Аргументы**
 
--   `format` — Текстовый формат. Например, [CSV](../../interfaces/formats.md#csv), [TSV](../../interfaces/formats.md#tabseparated).
--   `x`,`y`, ... — Выражения.
+-   `format` — текстовый формат. Например, [CSV](../../interfaces/formats.md#csv), [TSV](../../interfaces/formats.md#tabseparated).
+-   `x`,`y`, ... — выражения.
 
 **Возвращаемое значение**
 
@@ -813,10 +1243,10 @@ formatRow(format, x, y, ...)
 
 ``` sql
 SELECT formatRow('CSV', number, 'good')
-FROM numbers(3)
+FROM numbers(3);
 ```
 
-Ответ:
+Результат:
 
 ``` text
 ┌─formatRow('CSV', number, 'good')─┐
@@ -839,10 +1269,10 @@ FROM numbers(3)
 formatRowNoNewline(format, x, y, ...)
 ```
 
-**Параметры**
+**Аргументы**
 
--   `format` — Текстовый формат. Например, [CSV](../../interfaces/formats.md#csv), [TSV](../../interfaces/formats.md#tabseparated).
--   `x`,`y`, ... — Выражения.
+-   `format` — текстовый формат. Например, [CSV](../../interfaces/formats.md#csv), [TSV](../../interfaces/formats.md#tabseparated).
+-   `x`,`y`, ... — выражения.
 
 **Возвращаемое значение**
 
@@ -854,10 +1284,10 @@ formatRowNoNewline(format, x, y, ...)
 
 ``` sql
 SELECT formatRowNoNewline('CSV', number, 'good')
-FROM numbers(3)
+FROM numbers(3);
 ```
 
-Ответ:
+Результат:
 
 ``` text
 ┌─formatRowNoNewline('CSV', number, 'good')─┐
@@ -867,4 +1297,3 @@ FROM numbers(3)
 └───────────────────────────────────────────┘
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/functions/type_conversion_functions/) <!--hide-->
diff --git a/docs/ru/sql-reference/functions/url-functions.md b/docs/ru/sql-reference/functions/url-functions.md
index 7541e16bed4..bdf9beeabf5 100644
--- a/docs/ru/sql-reference/functions/url-functions.md
+++ b/docs/ru/sql-reference/functions/url-functions.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 54
-toc_title: "\u0424\u0443\u043d\u043a\u0446\u0438\u0438\u0020\u0434\u043b\u044f\u0020\u0440\u0430\u0431\u043e\u0442\u044b\u0020\u0441\u0020\u0055\u0052\u004c"
+toc_title: "Функции для работы с URL"
 ---
 
 # Функции для работы с URL {#funktsii-dlia-raboty-s-url}
@@ -23,7 +23,7 @@ toc_title: "\u0424\u0443\u043d\u043a\u0446\u0438\u0438\u0020\u0434\u043b\u044f\u
 domain(url)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `url` — URL. Тип — [String](../../sql-reference/functions/url-functions.md).
 
@@ -53,7 +53,7 @@ yandex.com
 **Пример**
 
 ``` sql
-SELECT domain('svn+ssh://some.svn-hosting.com:80/repo/trunk')
+SELECT domain('svn+ssh://some.svn-hosting.com:80/repo/trunk');
 ```
 
 ``` text
@@ -74,7 +74,7 @@ SELECT domain('svn+ssh://some.svn-hosting.com:80/repo/trunk')
 topLevelDomain(url)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `url` — URL. Тип — [String](../../sql-reference/functions/url-functions.md).
 
@@ -96,7 +96,7 @@ https://yandex.com/time/
 **Пример**
 
 ``` sql
-SELECT topLevelDomain('svn+ssh://www.some.svn-hosting.com:80/repo/trunk')
+SELECT topLevelDomain('svn+ssh://www.some.svn-hosting.com:80/repo/trunk');
 ```
 
 ``` text
@@ -138,7 +138,7 @@ SELECT topLevelDomain('svn+ssh://www.some.svn-hosting.com:80/repo/trunk')
 cutToFirstSignificantSubdomain(URL, TLD)
 ```
 
-**Parameters**
+**Аргументы**
 
 -   `URL` — URL. [String](../../sql-reference/data-types/string.md).
 -   `TLD` — имя пользовательского списка доменов верхнего уровня. [String](../../sql-reference/data-types/string.md).
@@ -192,7 +192,7 @@ SELECT cutToFirstSignificantSubdomainCustom('bar.foo.there-is-no-such-domain', '
 cutToFirstSignificantSubdomainCustomWithWWW(URL, TLD)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `URL` — URL. [String](../../sql-reference/data-types/string.md).
 -   `TLD` — имя пользовательского списка доменов верхнего уровня. [String](../../sql-reference/data-types/string.md).
@@ -246,7 +246,7 @@ SELECT cutToFirstSignificantSubdomainCustomWithWWW('www.foo', 'public_suffix_lis
 firstSignificantSubdomainCustom(URL, TLD)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `URL` — URL. [String](../../sql-reference/data-types/string.md).
 -   `TLD` — имя пользовательского списка доменов верхнего уровня. [String](../../sql-reference/data-types/string.md).
@@ -355,7 +355,7 @@ SELECT decodeURLComponent('http://127.0.0.1:8123/?query=SELECT%201%3B') AS Decod
 netloc(URL)
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `url` — URL. Тип — [String](../../sql-reference/data-types/string.md).
 
@@ -405,4 +405,3 @@ SELECT netloc('http://paul@www.example.com:80/');
 
 Удаляет параметр URL с именем name, если такой есть. Функция работает при допущении, что имя параметра закодировано в URL в точности таким же образом, что и в переданном аргументе.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/functions/url_functions/) <!--hide-->
diff --git a/docs/ru/sql-reference/functions/uuid-functions.md b/docs/ru/sql-reference/functions/uuid-functions.md
index 6082fcaa712..f0017adbc8b 100644
--- a/docs/ru/sql-reference/functions/uuid-functions.md
+++ b/docs/ru/sql-reference/functions/uuid-functions.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 53
-toc_title: "\u0424\u0443\u043d\u043a\u0446\u0438\u0438\u0020\u0434\u043b\u044f\u0020\u0440\u0430\u0431\u043e\u0442\u044b\u0020\u0441\u0020\u0055\u0055\u0049\u0044"
+toc_title: "Функции для работы с UUID"
 ---
 
 # Функции для работы с UUID {#funktsii-dlia-raboty-s-uuid}
diff --git a/docs/ru/sql-reference/functions/ym-dict-functions.md b/docs/ru/sql-reference/functions/ym-dict-functions.md
index c3b04e4ab66..d4bbe2eb709 100644
--- a/docs/ru/sql-reference/functions/ym-dict-functions.md
+++ b/docs/ru/sql-reference/functions/ym-dict-functions.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 59
-toc_title: "\u0424\u0443\u043d\u043a\u0446\u0438\u0438\u0020\u0434\u043b\u044f\u0020\u0440\u0430\u0431\u043e\u0442\u044b\u0020\u0441\u043e\u0020\u0441\u043b\u043e\u0432\u0430\u0440\u044f\u043c\u0438\u0020\u042f\u043d\u0434\u0435\u043a\u0441\u002e\u041c\u0435\u0442\u0440\u0438\u043a\u0438"
+toc_title: "Функции для работы со словарями Яндекс.Метрики"
 ---
 
 # Функции для работы со словарями Яндекс.Метрики {#ym-dict-functions}
@@ -113,13 +113,13 @@ LIMIT 15
 **Синтаксис**
 
 ``` sql
-regionToTopContinent(id[, geobase]);
+regionToTopContinent(id[, geobase])
 ```
 
-**Параметры**
+**Аргументы**
 
--   `id` — Идентификатор региона из геобазы Яндекса. [UInt32](../../sql-reference/functions/ym-dict-functions.md).
--   `geobase` — Ключ словаря. Смотрите [Множественные геобазы](#multiple-geobases). [String](../../sql-reference/functions/ym-dict-functions.md). Опциональный параметр.
+-   `id` — идентификатор региона из геобазы Яндекса. [UInt32](../../sql-reference/functions/ym-dict-functions.md).
+-   `geobase` — ключ словаря. Смотрите [Множественные геобазы](#multiple-geobases). [String](../../sql-reference/functions/ym-dict-functions.md). Опциональный параметр.
 
 **Возвращаемое значение**
 
@@ -151,4 +151,3 @@ regionToTopContinent(id[, geobase]);
 
 `ua` и `uk` обозначают одно и то же - украинский язык.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/functions/ym_dict_functions/) <!--hide-->
diff --git a/docs/ru/sql-reference/index.md b/docs/ru/sql-reference/index.md
index f59232ee047..62d6a9cecde 100644
--- a/docs/ru/sql-reference/index.md
+++ b/docs/ru/sql-reference/index.md
@@ -1,5 +1,5 @@
 ---
-toc_folder_title: "\u0421\u043F\u0440\u0430\u0432\u043A\u0430 \u043F\u043E SQL"
+toc_folder_title: "Справка по SQL"
 toc_hidden: true
 toc_priority: 28
 toc_title: hidden
@@ -13,4 +13,3 @@ toc_title: hidden
 -   [ALTER](statements/alter/index.md#query_language_queries_alter)
 -   [Прочие виды запросов](statements/misc.md)
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/) <!--hide-->
diff --git a/docs/ru/sql-reference/operators/in.md b/docs/ru/sql-reference/operators/in.md
index 4c1290df166..b092dd365bf 100644
--- a/docs/ru/sql-reference/operators/in.md
+++ b/docs/ru/sql-reference/operators/in.md
@@ -13,10 +13,28 @@ SELECT (CounterID, UserID) IN ((34, 123), (101500, 456)) FROM ...
 
 Если слева стоит один столбец, входящий в индекс, а справа - множество констант, то при выполнении запроса, система воспользуется индексом.
 
-Не перечисляйте слишком большое количество значений (миллионы) явно. Если множество большое - лучше загрузить его во временную таблицу (например, смотрите раздел «Внешние данные для обработки запроса»), и затем воспользоваться подзапросом.
+Не перечисляйте слишком большое количество значений (миллионы) явно. Если множество большое - лучше загрузить его во временную таблицу (например, смотрите раздел [Внешние данные для обработки запроса](../../engines/table-engines/special/external-data.md)), и затем воспользоваться подзапросом.
 
 В качестве правой части оператора может быть множество константных выражений, множество кортежей с константными выражениями (показано в примерах выше), а также имя таблицы или подзапрос SELECT в скобках.
 
+Если типы данных в левой и правой частях подзапроса `IN` различаются, ClickHouse преобразует значение в левой части к типу данных из правой части. Преобразование выполняется по аналогии с функцией [accurateCastOrNull](../functions/type-conversion-functions.md#type_conversion_function-accurate-cast_or_null), т.е. тип данных становится [Nullable](../../sql-reference/data-types/nullable.md), а если преобразование не может быть выполнено, возвращается значение [NULL](../../sql-reference/syntax.md#null-literal).
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT '1' IN (SELECT 1);
+```
+
+Результат:
+
+``` text
+┌─in('1', _subquery49)─┐
+│                    1 │
+└──────────────────────┘
+```
+
 Если в качестве правой части оператора указано имя таблицы (например, `UserID IN users`), то это эквивалентно подзапросу `UserID IN (SELECT * FROM users)`. Это используется при работе с внешними данными, отправляемым вместе с запросом. Например, вместе с запросом может быть отправлено множество идентификаторов посетителей, загруженное во временную таблицу users, по которому следует выполнить фильтрацию.
 
 Если в качестве правой части оператора, указано имя таблицы, имеющий движок Set (подготовленное множество, постоянно находящееся в оперативке), то множество не будет создаваться заново при каждом запросе.
@@ -197,3 +215,25 @@ SELECT uniq(UserID) FROM local_table WHERE CounterID = 101500 AND UserID GLOBAL
 5.  Если в GLOBAL IN есть частая необходимость, то спланируйте размещение кластера ClickHouse таким образом, чтобы в каждом дата-центре была хотя бы одна реплика каждого шарда, и среди них была быстрая сеть - чтобы запрос целиком можно было бы выполнить, передавая данные в пределах одного дата-центра.
 
 В секции `GLOBAL IN` также имеет смысл указывать локальную таблицу - в случае, если эта локальная таблица есть только на сервере-инициаторе запроса, и вы хотите воспользоваться данными из неё на удалённых серверах.
+
+### Распределенные подзапросы и max_parallel_replicas {#max_parallel_replica-subqueries}
+
+Когда настройка max_parallel_replicas больше чем 1, распределенные запросы преобразуются. Например, следующий запрос:
+
+```sql
+SELECT CounterID, count() FROM distributed_table_1 WHERE UserID IN (SELECT UserID FROM local_table_2 WHERE CounterID < 100)
+SETTINGS max_parallel_replicas=3
+```
+
+преобразуются на каждом сервере в
+
+```sql
+SELECT CounterID, count() FROM local_table_1 WHERE UserID IN (SELECT UserID FROM local_table_2 WHERE CounterID < 100)
+SETTINGS parallel_replicas_count=3, parallel_replicas_offset=M
+```
+
+где M значение между 1 и 3 зависящее от того на какой реплике выполняется локальный запрос. Эти параметры влияют на каждую таблицу семейства MergeTree в запросе и имеют тот же эффект, что и применение `SAMPLE 1/3 OFFSET (M-1)/3` для каждой таблицы.
+
+Поэтому применение настройки max_parallel_replicas даст корректные результаты если обе таблицы имеют одинаковую схему репликации и семплированы по UserID выражению от UserID. В частности, если local_table_2 не имеет семплирующего ключа, будут получены неверные результаты. Тоже правило применяется для JOIN.
+
+Один из способов избежать этого, если local_table_2 не удовлетворяет требованиям, использовать `GLOBAL IN` или `GLOBAL JOIN`.
diff --git a/docs/ru/sql-reference/operators/index.md b/docs/ru/sql-reference/operators/index.md
index 1eddfc4dcaf..b7cacaf7a03 100644
--- a/docs/ru/sql-reference/operators/index.md
+++ b/docs/ru/sql-reference/operators/index.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 38
-toc_title: "\u041e\u043f\u0435\u0440\u0430\u0442\u043e\u0440\u044b"
+toc_title: "Операторы"
 ---
 
 # Операторы {#operatory}
@@ -297,4 +297,3 @@ SELECT * FROM t_null WHERE y IS NOT NULL
 └───┴───┘
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/operators/) <!--hide-->
diff --git a/docs/ru/sql-reference/statements/alter/column.md b/docs/ru/sql-reference/statements/alter/column.md
index 7a394e2f684..158ab2e7385 100644
--- a/docs/ru/sql-reference/statements/alter/column.md
+++ b/docs/ru/sql-reference/statements/alter/column.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 37
-toc_title: "\u041c\u0430\u043d\u0438\u043f\u0443\u043b\u044f\u0446\u0438\u0438\u0020\u0441\u043e\u0020\u0441\u0442\u043e\u043b\u0431\u0446\u0430\u043c\u0438"
+toc_title: "Манипуляции со столбцами"
 ---
 
 # Манипуляции со столбцами {#manipuliatsii-so-stolbtsami}
@@ -13,6 +13,7 @@ toc_title: "\u041c\u0430\u043d\u0438\u043f\u0443\u043b\u044f\u0446\u0438\u0438\u
 -   [COMMENT COLUMN](#alter_comment-column) — добавляет комментарий к столбцу;
 -   [MODIFY COLUMN](#alter_modify-column) — изменяет тип столбца, выражение для значения по умолчанию и TTL.
 -   [MODIFY COLUMN REMOVE](#modify-remove) — удаляет какое-либо из свойств столбца.
+-   [RENAME COLUMN](#alter_rename-column) — переименовывает существующий столбец.
 
 Подробное описание для каждого действия приведено ниже.
 
@@ -62,6 +63,9 @@ DROP COLUMN [IF EXISTS] name
 
 Запрос удаляет данные из файловой системы. Так как это представляет собой удаление целых файлов, запрос выполняется почти мгновенно.
 
+!!! warning "Предупреждение"
+    Вы не можете удалить столбец, используемый в [материализованном представлениии](../../../sql-reference/statements/create/view.md#materialized). В противном случае будет ошибка.
+
 Пример:
 
 ``` sql
@@ -116,7 +120,7 @@ MODIFY COLUMN [IF EXISTS] name [type] [default_expr] [TTL] [AFTER name_after | F
 
 -   TTL
 
-        Примеры изменения TTL столбца смотрите в разделе [TTL столбца](ttl.md#mergetree-column-ttl).
+        Примеры изменения TTL столбца смотрите в разделе [TTL столбца](../../../engines/table-engines/mergetree-family/mergetree.md#mergetree-column-ttl).
 
 Если указано `IF EXISTS`, запрос не возвращает ошибку, если столбца не существует.
 
@@ -154,10 +158,26 @@ ALTER TABLE table_name MODIFY column_name REMOVE property;
 ALTER TABLE table_with_ttl MODIFY COLUMN column_ttl REMOVE TTL;
 ```
 
-## Смотрите также
+**Смотрите также**
 
 - [REMOVE TTL](ttl.md).
 
+## RENAME COLUMN {#alter_rename-column}
+
+Переименовывает существующий столбец.
+
+Синтаксис:
+
+```sql
+ALTER TABLE table_name RENAME COLUMN column_name TO new_column_name
+```
+
+**Пример**
+
+```sql
+ALTER TABLE table_with_ttl RENAME COLUMN column_ttl TO column_ttl_new;
+```
+
 ## Ограничения запроса ALTER {#ogranicheniia-zaprosa-alter}
 
 Запрос `ALTER` позволяет создавать и удалять отдельные элементы (столбцы) вложенных структур данных, но не вложенные структуры данных целиком. Для добавления вложенной структуры данных, вы можете добавить столбцы с именем вида `name.nested_name` и типом `Array(T)` - вложенная структура данных полностью эквивалентна нескольким столбцам-массивам с именем, имеющим одинаковый префикс до точки.
@@ -170,4 +190,3 @@ ALTER TABLE table_with_ttl MODIFY COLUMN column_ttl REMOVE TTL;
 
 Для таблиц, которые не хранят данные самостоятельно (типа [Merge](../../../sql-reference/statements/alter/index.md) и [Distributed](../../../sql-reference/statements/alter/index.md)), `ALTER` всего лишь меняет структуру таблицы, но не меняет структуру подчинённых таблиц. Для примера, при ALTER-е таблицы типа `Distributed`, вам также потребуется выполнить запрос `ALTER` для таблиц на всех удалённых серверах.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/alter/column/) <!--hide-->
diff --git a/docs/ru/sql-reference/statements/alter/constraint.md b/docs/ru/sql-reference/statements/alter/constraint.md
index e26db208493..452bf649415 100644
--- a/docs/ru/sql-reference/statements/alter/constraint.md
+++ b/docs/ru/sql-reference/statements/alter/constraint.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 43
-toc_title: "\u041c\u0430\u043d\u0438\u043f\u0443\u043b\u044f\u0446\u0438\u0438\u0020\u0441\u0020\u043e\u0433\u0440\u0430\u043d\u0438\u0447\u0435\u043d\u0438\u044f\u043c\u0438"
+toc_title: "Манипуляции с ограничениями"
 ---
 
 # Манипуляции с ограничениями (constraints) {#manipuliatsii-s-ogranicheniiami-constraints}
@@ -20,4 +20,3 @@ ALTER TABLE [db].name DROP CONSTRAINT constraint_name;
 
 Запрос на изменение ограничений для Replicated таблиц реплицируется, сохраняя новые метаданные в ZooKeeper и применяя изменения на всех репликах.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/alter/constraint/) <!--hide-->
\ No newline at end of file
diff --git a/docs/ru/sql-reference/statements/alter/delete.md b/docs/ru/sql-reference/statements/alter/delete.md
index ee5f03d9d95..70a411dab83 100644
--- a/docs/ru/sql-reference/statements/alter/delete.md
+++ b/docs/ru/sql-reference/statements/alter/delete.md
@@ -26,4 +26,3 @@ ALTER TABLE [db.]table [ON CLUSTER cluster] DELETE WHERE filter_expr
 -   [Синхронность запросов ALTER](../../../sql-reference/statements/alter/index.md#synchronicity-of-alter-queries)
 -   [mutations_sync](../../../operations/settings/settings.md#mutations_sync) setting
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/alter/delete/) <!--hide-->
\ No newline at end of file
diff --git a/docs/ru/sql-reference/statements/alter/index.md b/docs/ru/sql-reference/statements/alter/index.md
index 830c4a5745b..648fb7e7c5c 100644
--- a/docs/ru/sql-reference/statements/alter/index.md
+++ b/docs/ru/sql-reference/statements/alter/index.md
@@ -69,4 +69,3 @@ ALTER TABLE [db.]table MATERIALIZE INDEX name IN PARTITION partition_name
 
 Для запросов `ALTER TABLE ... UPDATE|DELETE` синхронность выполнения определяется настройкой [mutations_sync](../../../operations/settings/settings.md#mutations_sync). 
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/alter/index/) <!--hide-->
\ No newline at end of file
diff --git a/docs/ru/sql-reference/statements/alter/index/index.md b/docs/ru/sql-reference/statements/alter/index/index.md
index 2cadbbe065e..862def5cc04 100644
--- a/docs/ru/sql-reference/statements/alter/index/index.md
+++ b/docs/ru/sql-reference/statements/alter/index/index.md
@@ -1,7 +1,7 @@
 ---
 toc_hidden_folder: true
 toc_priority: 42
-toc_title: "\u041c\u0430\u043d\u0438\u043f\u0443\u043b\u044f\u0446\u0438\u0438\u0020\u0441\u0020\u0438\u043d\u0434\u0435\u043a\u0441\u0430\u043c\u0438"
+toc_title: "Манипуляции с индексами"
 ---
 
 # Манипуляции с индексами {#manipuliatsii-s-indeksami}
@@ -21,4 +21,3 @@ ALTER TABLE [db].name DROP INDEX name
 
 Запрос на изменение индексов реплицируется, сохраняя новые метаданные в ZooKeeper и применяя изменения на всех репликах.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/alter/index/index/) <!--hide-->
\ No newline at end of file
diff --git a/docs/ru/sql-reference/statements/alter/order-by.md b/docs/ru/sql-reference/statements/alter/order-by.md
index 32c0e382445..f0a9bfe3730 100644
--- a/docs/ru/sql-reference/statements/alter/order-by.md
+++ b/docs/ru/sql-reference/statements/alter/order-by.md
@@ -19,4 +19,3 @@ MODIFY ORDER BY new_expression
 сортировки, разрешено добавлять в ключ только новые столбцы (т.е. столбцы, добавляемые командой `ADD COLUMN`
 в том же запросе `ALTER`), у которых нет выражения по умолчанию.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/alter/order-by/) <!--hide-->
\ No newline at end of file
diff --git a/docs/ru/sql-reference/statements/alter/partition.md b/docs/ru/sql-reference/statements/alter/partition.md
index 8776c70c89e..3e7b069b066 100644
--- a/docs/ru/sql-reference/statements/alter/partition.md
+++ b/docs/ru/sql-reference/statements/alter/partition.md
@@ -306,4 +306,3 @@ OPTIMIZE TABLE table_not_partitioned PARTITION tuple() FINAL;
 
 Примеры запросов `ALTER ... PARTITION` можно посмотреть в тестах: [`00502_custom_partitioning_local`](https://github.com/ClickHouse/ClickHouse/blob/master/tests/queries/0_stateless/00502_custom_partitioning_local.sql) и [`00502_custom_partitioning_replicated_zookeeper`](https://github.com/ClickHouse/ClickHouse/blob/master/tests/queries/0_stateless/00502_custom_partitioning_replicated_zookeeper.sql).
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/alter/partition/) <!--hide-->
diff --git a/docs/ru/sql-reference/statements/alter/quota.md b/docs/ru/sql-reference/statements/alter/quota.md
index 0bdac1381da..2c73b8dace3 100644
--- a/docs/ru/sql-reference/statements/alter/quota.md
+++ b/docs/ru/sql-reference/statements/alter/quota.md
@@ -14,14 +14,14 @@ ALTER QUOTA [IF EXISTS] name [ON CLUSTER cluster_name]
     [RENAME TO new_name]
     [KEYED BY {user_name | ip_address | client_key | client_key,user_name | client_key,ip_address} | NOT KEYED]
     [FOR [RANDOMIZED] INTERVAL number {second | minute | hour | day | week | month | quarter | year}
-        {MAX { {queries | errors | result_rows | result_bytes | read_rows | read_bytes | execution_time} = number } [,...] |
+        {MAX { {queries | query_selects | query_inserts | errors | result_rows | result_bytes | read_rows | read_bytes | execution_time} = number } [,...] |
         NO LIMITS | TRACKING ONLY} [,...]]
     [TO {role [,...] | ALL | ALL EXCEPT role [,...]}]
 ```
 
 Ключи `user_name`, `ip_address`, `client_key`, `client_key, user_name` и `client_key, ip_address` соответствуют полям таблицы [system.quotas](../../../operations/system-tables/quotas.md).
 
-Параметры `queries`, `errors`, `result_rows`, `result_bytes`, `read_rows`, `read_bytes`, `execution_time` соответствуют полям таблицы [system.quotas_usage](../../../operations/system-tables/quotas_usage.md).
+Параметры `queries`, `query_selects`, `query_inserts`, `errors`, `result_rows`, `result_bytes`, `read_rows`, `read_bytes`, `execution_time` соответствуют полям таблицы [system.quotas_usage](../../../operations/system-tables/quotas_usage.md).
 
 В секции `ON CLUSTER` можно указать кластеры, на которых создается квота, см. [Распределенные DDL запросы](../../../sql-reference/distributed-ddl.md).
 
@@ -37,6 +37,4 @@ ALTER QUOTA IF EXISTS qA FOR INTERVAL 15 month MAX queries = 123 TO CURRENT_USER
 
 ``` sql
 ALTER QUOTA IF EXISTS qB FOR INTERVAL 30 minute MAX execution_time = 0.5, FOR INTERVAL 5 quarter MAX queries = 321, errors = 10 TO default;
-```
-
-[Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/alter/quota/) <!--hide-->
+```
\ No newline at end of file
diff --git a/docs/ru/sql-reference/statements/alter/role.md b/docs/ru/sql-reference/statements/alter/role.md
index 69f7c5828c5..e9ce62c58d5 100644
--- a/docs/ru/sql-reference/statements/alter/role.md
+++ b/docs/ru/sql-reference/statements/alter/role.md
@@ -15,4 +15,3 @@ ALTER ROLE [IF EXISTS] name1 [ON CLUSTER cluster_name1] [RENAME TO new_name1]
     [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | PROFILE 'profile_name'] [,...]
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/alter/role/) <!--hide-->
diff --git a/docs/ru/sql-reference/statements/alter/row-policy.md b/docs/ru/sql-reference/statements/alter/row-policy.md
index e2d23cda3ff..cff4d4e497a 100644
--- a/docs/ru/sql-reference/statements/alter/row-policy.md
+++ b/docs/ru/sql-reference/statements/alter/row-policy.md
@@ -18,4 +18,3 @@ ALTER [ROW] POLICY [IF EXISTS] name1 [ON CLUSTER cluster_name1] ON [database1.]t
     [TO {role [,...] | ALL | ALL EXCEPT role [,...]}]
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/alter/row-policy/) <!--hide-->
\ No newline at end of file
diff --git a/docs/ru/sql-reference/statements/alter/settings-profile.md b/docs/ru/sql-reference/statements/alter/settings-profile.md
index 54502901837..9b8646919ca 100644
--- a/docs/ru/sql-reference/statements/alter/settings-profile.md
+++ b/docs/ru/sql-reference/statements/alter/settings-profile.md
@@ -15,4 +15,3 @@ ALTER SETTINGS PROFILE [IF EXISTS] TO name1 [ON CLUSTER cluster_name1] [RENAME T
     [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | INHERIT 'profile_name'] [,...]
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/alter/settings-profile) <!--hide-->
\ No newline at end of file
diff --git a/docs/ru/sql-reference/statements/alter/ttl.md b/docs/ru/sql-reference/statements/alter/ttl.md
index 5721ec9cf27..2a2d10b69de 100644
--- a/docs/ru/sql-reference/statements/alter/ttl.md
+++ b/docs/ru/sql-reference/statements/alter/ttl.md
@@ -18,7 +18,7 @@ ALTER TABLE table-name MODIFY TTL ttl-expression
 Удалить табличный TTL можно запросом следующего вида:
 
 ```sql
-ALTER TABLE table_name REMOVE TTL 
+ALTER TABLE table_name REMOVE TTL
 ```
 
 **Пример**
@@ -64,7 +64,7 @@ ALTER TABLE table_with_ttl REMOVE TTL;
 
 Заново вставляем удаленную строку и снова принудительно запускаем очистку по `TTL` с помощью `OPTIMIZE`:
 
-```sql 
+```sql
 INSERT INTO table_with_ttl VALUES (now() - INTERVAL 4 MONTH, 2, 'username2');
 OPTIMIZE TABLE table_with_ttl FINAL;
 SELECT * FROM table_with_ttl;
@@ -81,6 +81,5 @@ SELECT * FROM table_with_ttl;
 
 ### Смотрите также
 
-- Подробнее о [свойстве TTL](../../../engines/table-engines/mergetree-family/mergetree#table_engine-mergetree-ttl).
-
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/alter/ttl/) <!--hide-->
+- Подробнее о [свойстве TTL](../../../engines/table-engines/mergetree-family/mergetree.md#mergetree-column-ttl).
+- Изменить столбец [с TTL](../../../sql-reference/statements/alter/column.md#alter_modify-column).
\ No newline at end of file
diff --git a/docs/ru/sql-reference/statements/alter/update.md b/docs/ru/sql-reference/statements/alter/update.md
index e3d6725419a..206412d4be9 100644
--- a/docs/ru/sql-reference/statements/alter/update.md
+++ b/docs/ru/sql-reference/statements/alter/update.md
@@ -26,4 +26,3 @@ ALTER TABLE [db.]table UPDATE column1 = expr1 [, ...] WHERE filter_expr
 -   [Синхронность запросов ALTER](../../../sql-reference/statements/alter/index.md#synchronicity-of-alter-queries)
 -   [mutations_sync](../../../operations/settings/settings.md#mutations_sync) setting
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/alter/update/) <!--hide-->
\ No newline at end of file
diff --git a/docs/ru/sql-reference/statements/alter/user.md b/docs/ru/sql-reference/statements/alter/user.md
index 41574f74200..53d090f8eab 100644
--- a/docs/ru/sql-reference/statements/alter/user.md
+++ b/docs/ru/sql-reference/statements/alter/user.md
@@ -12,10 +12,10 @@ toc_title: USER
 ``` sql
 ALTER USER [IF EXISTS] name1 [ON CLUSTER cluster_name1] [RENAME TO new_name1] 
         [, name2 [ON CLUSTER cluster_name2] [RENAME TO new_name2] ...]
-    [IDENTIFIED [WITH {PLAINTEXT_PASSWORD|SHA256_PASSWORD|DOUBLE_SHA1_PASSWORD}] BY {'password'|'hash'}]
-    [[ADD|DROP] HOST {LOCAL | NAME 'name' | REGEXP 'name_regexp' | IP 'address' | LIKE 'pattern'} [,...] | ANY | NONE]
+    [NOT IDENTIFIED | IDENTIFIED {[WITH {no_password | plaintext_password | sha256_password | sha256_hash | double_sha1_password | double_sha1_hash}] BY {'password' | 'hash'}} | {WITH ldap SERVER 'server_name'} | {WITH kerberos [REALM 'realm']}]
+    [[ADD | DROP] HOST {LOCAL | NAME 'name' | REGEXP 'name_regexp' | IP 'address' | LIKE 'pattern'} [,...] | ANY | NONE]
     [DEFAULT ROLE role [,...] | ALL | ALL EXCEPT role [,...] ]
-    [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | PROFILE 'profile_name'] [,...]
+    [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY | WRITABLE] | PROFILE 'profile_name'] [,...]
 ```  
 
 Для выполнения `ALTER USER` необходима привилегия [ALTER USER](../grant.md#grant-access-management).
@@ -44,4 +44,3 @@ ALTER USER user DEFAULT ROLE ALL
 ALTER USER user DEFAULT ROLE ALL EXCEPT role1, role2
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/alter/user/) <!--hide-->
\ No newline at end of file
diff --git a/docs/ru/sql-reference/statements/attach.md b/docs/ru/sql-reference/statements/attach.md
index 259ab893e63..b135507b818 100644
--- a/docs/ru/sql-reference/statements/attach.md
+++ b/docs/ru/sql-reference/statements/attach.md
@@ -5,19 +5,55 @@ toc_title: ATTACH
 
 # ATTACH Statement {#attach}
 
-Запрос полностью аналогичен запросу `CREATE`, но:
+Выполняет подключение таблицы, например, при перемещении базы данных на другой сервер. 
 
--   вместо слова `CREATE` используется слово `ATTACH`;
--   запрос не создаёт данные на диске, а предполагает, что данные уже лежат в соответствующих местах, и всего лишь добавляет информацию о таблице на сервер. После выполнения запроса `ATTACH` сервер будет знать о существовании таблицы.
+Запрос не создаёт данные на диске, а предполагает, что данные уже лежат в соответствующих местах, и всего лишь добавляет информацию о таблице на сервер. После выполнения запроса `ATTACH` сервер будет знать о существовании таблицы.
 
-Если таблица перед этим была отсоединена (`DETACH`), т.е. её структура известна, можно использовать сокращенную форму записи без определения структуры.
+Если таблица перед этим была отключена при помощи ([DETACH](../../sql-reference/statements/detach.md)), т.е. её структура известна, можно использовать сокращенную форму записи без определения структуры.
+
+## Варианты синтаксиса {#syntax-forms}
+### Присоединение существующей таблицы {#attach-existing-table}
 
 ``` sql
 ATTACH TABLE [IF NOT EXISTS] [db.]name [ON CLUSTER cluster]
 ```
 
-Этот запрос используется при старте сервера. Сервер хранит метаданные таблиц в виде файлов с запросами `ATTACH`, которые он просто исполняет при запуске (за исключением системных таблиц, которые явно создаются на сервере).
+Этот запрос используется при старте сервера. Сервер хранит метаданные таблиц в виде файлов с запросами `ATTACH`, которые он просто исполняет при запуске (за исключением некоторых системных таблиц, которые явно создаются на сервере).
 
+Если таблица была отключена перманентно, она не будет подключена обратно во время старта сервера, так что нужно явно использовать запрос `ATTACH`, чтобы подключить ее.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/statements/attach/) <!--hide-->
+### Создание новой таблицы и присоединение данных {#create-new-table-and-attach-data}
 
+**С указанием пути к табличным данным**
+
+```sql
+ATTACH TABLE name FROM 'path/to/data/' (col1 Type1, ...)
+```
+
+Cоздает новую таблицу с указанной структурой и присоединяет табличные данные из соответствующего каталога в `user_files`.
+
+**Пример**
+
+Запрос:
+
+```sql
+DROP TABLE IF EXISTS test;
+INSERT INTO TABLE FUNCTION file('01188_attach/test/data.TSV', 'TSV', 's String, n UInt8') VALUES ('test', 42);
+ATTACH TABLE test FROM '01188_attach/test' (s String, n UInt8) ENGINE = File(TSV);
+SELECT * FROM test;
+```
+Результат:
+
+```sql
+┌─s────┬──n─┐
+│ test │ 42 │
+└──────┴────┘
+```
+
+**С указанием UUID таблицы** (Только для баз данных `Atomic`)
+
+```sql
+ATTACH TABLE name UUID '<uuid>' (col1 Type1, ...)
+```
+
+Cоздает новую таблицу с указанной структурой и присоединяет данные из таблицы с указанным UUID.
diff --git a/docs/ru/sql-reference/statements/check-table.md b/docs/ru/sql-reference/statements/check-table.md
index 3dc135d87c6..9592c1a5bc2 100644
--- a/docs/ru/sql-reference/statements/check-table.md
+++ b/docs/ru/sql-reference/statements/check-table.md
@@ -29,9 +29,36 @@ CHECK TABLE [db.]name
 
 В движках `*Log` не предусмотрено автоматическое восстановление данных после сбоя. Используйте запрос `CHECK TABLE`, чтобы своевременно выявлять повреждение данных.
 
-Для движков из семейства `MergeTree` запрос `CHECK TABLE` показывает статус проверки для каждого отдельного куска данных таблицы на локальном сервере.
+## Проверка таблиц семейства MergeTree {#checking-mergetree-tables}
 
-**Что делать, если данные повреждены**
+Для таблиц семейства `MergeTree` если [check_query_single_value_result](../../operations/settings/settings.md#check_query_single_value_result) = 0, запрос `CHECK TABLE` возвращает статус каждого куска данных таблицы на локальном сервере. 
+
+```sql
+SET check_query_single_value_result = 0;
+CHECK TABLE test_table;
+```
+
+```text
+┌─part_path─┬─is_passed─┬─message─┐
+│ all_1_4_1 │         1 │         │
+│ all_1_4_2 │         1 │         │
+└───────────┴───────────┴─────────┘
+```
+
+Если `check_query_single_value_result` = 0, запрос `CHECK TABLE` возвращает статус таблицы в целом.
+
+```sql
+SET check_query_single_value_result = 1;
+CHECK TABLE test_table;
+```
+
+```text
+┌─result─┐
+│      1 │
+└────────┘
+```
+
+## Что делать, если данные повреждены {#if-data-is-corrupted}
 
 В этом случае можно скопировать оставшиеся неповрежденные данные в другую таблицу. Для этого:
 
@@ -41,4 +68,3 @@ CHECK TABLE [db.]name
 4.  Перезапустите `clickhouse-client`, чтобы вернуть предыдущее значение параметра `max_threads`.
 
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/statements/check-table/) <!--hide-->
\ No newline at end of file
diff --git a/docs/ru/sql-reference/statements/create/database.md b/docs/ru/sql-reference/statements/create/database.md
index e6c561f8e0b..7d19f3e8f17 100644
--- a/docs/ru/sql-reference/statements/create/database.md
+++ b/docs/ru/sql-reference/statements/create/database.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 35
-toc_title: "\u0411\u0430\u0437\u0430\u0020\u0434\u0430\u043d\u043d\u044b\u0445"
+toc_title: "База данных"
 ---
 
 # CREATE DATABASE {#query-language-create-database}
@@ -31,5 +31,4 @@ CREATE DATABASE [IF NOT EXISTS] db_name [ON CLUSTER cluster] [ENGINE = engine(..
 
         По умолчанию ClickHouse использует собственный движок баз данных.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/statements/create/database) 
 <!--hide-->
diff --git a/docs/ru/sql-reference/statements/create/dictionary.md b/docs/ru/sql-reference/statements/create/dictionary.md
index 3134a89483b..a41b2cb9ad5 100644
--- a/docs/ru/sql-reference/statements/create/dictionary.md
+++ b/docs/ru/sql-reference/statements/create/dictionary.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 38
-toc_title: "\u0421\u043b\u043e\u0432\u0430\u0440\u044c"
+toc_title: "Словарь"
 ---
 
 # CREATE DICTIONARY {#create-dictionary-query}
@@ -27,5 +27,4 @@ LIFETIME({MIN min_val MAX max_val | max_val})
 
 Смотрите [Внешние словари](../../../sql-reference/dictionaries/external-dictionaries/external-dicts.md).
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/statements/create/dictionary)
 <!--hide-->
\ No newline at end of file
diff --git a/docs/ru/sql-reference/statements/create/index.md b/docs/ru/sql-reference/statements/create/index.md
index 28ddce2afe3..dfa5c28fff7 100644
--- a/docs/ru/sql-reference/statements/create/index.md
+++ b/docs/ru/sql-reference/statements/create/index.md
@@ -1,7 +1,7 @@
 ---
 toc_folder_title: CREATE
 toc_priority: 34
-toc_title: "\u041e\u0431\u0437\u043e\u0440"
+toc_title: "Обзор"
 ---
 
 # Запросы CREATE {#create-queries}
@@ -18,4 +18,3 @@ toc_title: "\u041e\u0431\u0437\u043e\u0440"
 -   [QUOTA](../../../sql-reference/statements/create/quota.md)
 -   [SETTINGS PROFILE](../../../sql-reference/statements/create/settings-profile.md)
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/sql-reference/statements/create/) <!--hide-->
diff --git a/docs/ru/sql-reference/statements/create/quota.md b/docs/ru/sql-reference/statements/create/quota.md
index 65762071ea2..38957ed8c6d 100644
--- a/docs/ru/sql-reference/statements/create/quota.md
+++ b/docs/ru/sql-reference/statements/create/quota.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 42
-toc_title: "\u041a\u0432\u043e\u0442\u0430"
+toc_title: "Квота"
 ---
 
 # CREATE QUOTA {#create-quota-statement}
@@ -13,13 +13,13 @@ toc_title: "\u041a\u0432\u043e\u0442\u0430"
 CREATE QUOTA [IF NOT EXISTS | OR REPLACE] name [ON CLUSTER cluster_name]
     [KEYED BY {user_name | ip_address | client_key | client_key, user_name | client_key, ip_address} | NOT KEYED]
     [FOR [RANDOMIZED] INTERVAL number {second | minute | hour | day | week | month | quarter | year}
-        {MAX { {queries | errors | result_rows | result_bytes | read_rows | read_bytes | execution_time} = number } [,...] |
+        {MAX { {queries | query_selects | query_inserts | errors | result_rows | result_bytes | read_rows | read_bytes | execution_time} = number } [,...] |
          NO LIMITS | TRACKING ONLY} [,...]]
     [TO {role [,...] | ALL | ALL EXCEPT role [,...]}]
 ```
 Ключи `user_name`, `ip_address`, `client_key`, `client_key, user_name` и `client_key, ip_address` соответствуют полям таблицы [system.quotas](../../../operations/system-tables/quotas.md).
 
-Параметры `queries`, `errors`, `result_rows`, `result_bytes`, `read_rows`, `read_bytes`, `execution_time` соответствуют полям таблицы [system.quotas_usage](../../../operations/system-tables/quotas_usage.md).
+Параметры `queries`, `query_selects`, `query_inserts`, `errors`, `result_rows`, `result_bytes`, `read_rows`, `read_bytes`, `execution_time` соответствуют полям таблицы [system.quotas_usage](../../../operations/system-tables/quotas_usage.md).
 
 В секции `ON CLUSTER` можно указать кластеры, на которых создается квота, см. [Распределенные DDL запросы](../../../sql-reference/distributed-ddl.md).
 
@@ -35,7 +35,4 @@ CREATE QUOTA qA FOR INTERVAL 15 month MAX queries = 123 TO CURRENT_USER;
 
 ``` sql
 CREATE QUOTA qB FOR INTERVAL 30 minute MAX execution_time = 0.5, FOR INTERVAL 5 quarter MAX queries = 321, errors = 10 TO default;
-```
-
-[Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/statements/create/quota) 
-<!--hide-->
\ No newline at end of file
+```
\ No newline at end of file
diff --git a/docs/ru/sql-reference/statements/create/role.md b/docs/ru/sql-reference/statements/create/role.md
index 521117c0e89..16450b41126 100644
--- a/docs/ru/sql-reference/statements/create/role.md
+++ b/docs/ru/sql-reference/statements/create/role.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 40
-toc_title: "\u0420\u043e\u043b\u044c"
+toc_title: "Роль"
 ---
 
 # CREATE ROLE {#create-role-statement}
@@ -46,5 +46,4 @@ SET ROLE accountant;
 SELECT * FROM db.*;
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/statements/create/role) 
 <!--hide-->
\ No newline at end of file
diff --git a/docs/ru/sql-reference/statements/create/row-policy.md b/docs/ru/sql-reference/statements/create/row-policy.md
index e79a19d4cbe..6fe1dc45815 100644
--- a/docs/ru/sql-reference/statements/create/row-policy.md
+++ b/docs/ru/sql-reference/statements/create/row-policy.md
@@ -1,11 +1,11 @@
 ---
 toc_priority: 41
-toc_title: "\u041f\u043e\u043b\u0438\u0442\u0438\u043a\u0430\u0020\u0434\u043e\u0441\u0442\u0443\u043f\u0430"
+toc_title: "Политика доступа"
 ---
 
 # CREATE ROW POLICY {#create-row-policy-statement}
 
-Создает [фильтры для строк](../../../operations/access-rights.md#row-policy-management), которые пользователь может прочесть из таблицы.
+Создает [политики доступа к строкам](../../../operations/access-rights.md#row-policy-management), т.е. фильтры, которые определяют, какие строки пользователь может читать из таблицы.
 
 Синтаксис:
 
@@ -13,34 +13,74 @@ toc_title: "\u041f\u043e\u043b\u0438\u0442\u0438\u043a\u0430\u0020\u0434\u043e\u
 CREATE [ROW] POLICY [IF NOT EXISTS | OR REPLACE] policy_name1 [ON CLUSTER cluster_name1] ON [db1.]table1 
         [, policy_name2 [ON CLUSTER cluster_name2] ON [db2.]table2 ...] 
     [AS {PERMISSIVE | RESTRICTIVE}]
-    [FOR SELECT]
-    [USING condition]
+    [FOR SELECT] USING condition
     [TO {role [,...] | ALL | ALL EXCEPT role [,...]}]
 ```
 
-Секция `ON CLUSTER` позволяет создавать фильтры для строк на кластере, см. [Распределенные DDL запросы](../../../sql-reference/distributed-ddl.md).
+## Секция USING {#create-row-policy-using}
 
-## Секция AS {#create-row-policy-as}
-
-С помощью данной секции можно создать политику разрешения или ограничения.
-
-Политика разрешения предоставляет доступ к строкам. Разрешительные политики, которые применяются к одной таблице, объединяются с помощью логического оператора `OR`. Политики являются разрешительными по умолчанию.
-
-Политика ограничения запрещает доступ к строкам. Ограничительные политики, которые применяются к одной таблице, объединяются логическим оператором `AND`.
-
-Ограничительные политики применяются к строкам, прошедшим фильтр разрешительной политики. Если вы не зададите разрешительные политики, пользователь не сможет обращаться ни к каким строкам из таблицы.
+Секция `USING` указывает условие для фильтрации строк. Пользователь может видеть строку, если это условие, вычисленное для строки, дает ненулевой результат.
 
 ## Секция TO {#create-row-policy-to}
 
-В секции `TO` вы можете перечислить как роли, так и пользователей. Например, `CREATE ROW POLICY ... TO accountant, john@localhost`.
+В секции `TO` перечисляются пользователи и роли, для которых должна действовать политика. Например, `CREATE ROW POLICY ... TO accountant, john@localhost`.
 
 Ключевым словом `ALL` обозначаются все пользователи, включая текущего. Ключевые слова `ALL EXCEPT` позволяют исключить пользователей из списка всех пользователей. Например, `CREATE ROW POLICY ... TO ALL EXCEPT accountant, john@localhost`
 
+!!! note "Note"
+    Если для таблицы не задано ни одной политики доступа к строкам, то любой пользователь может выполнить команду SELECT и получить все строки таблицы. Если определить хотя бы одну политику для таблицы, до доступ к строкам будет управляться этими политиками, причем для всех пользователей (даже для тех, для кого политики не определялись). Например, следующая политика
+
+    `CREATE ROW POLICY pol1 ON mydb.table1 USING b=1 TO mira, peter`
+
+    запретит пользователям `mira` и `peter` видеть строки с `b != 1`, и еще запретит всем остальным пользователям (например, пользователю `paul`) видеть какие-либо строки вообще из таблицы `mydb.table1`.
+    
+    Если это нежелательно, такое поведение можно исправить, определив дополнительную политику:
+
+    `CREATE ROW POLICY pol2 ON mydb.table1 USING 1 TO ALL EXCEPT mira, peter`
+
+## Секция AS {#create-row-policy-as}
+
+Может быть одновременно активно более одной политики для одной и той же таблицы и одного и того же пользователя. Поэтому нам нужен способ комбинировать политики.
+
+По умолчанию политики комбинируются с использованием логического оператора `OR`. Например, политики:
+
+``` sql
+CREATE ROW POLICY pol1 ON mydb.table1 USING b=1 TO mira, peter
+CREATE ROW POLICY pol2 ON mydb.table1 USING c=2 TO peter, antonio
+```
+
+разрешат пользователю с именем `peter` видеть строки, для которых будет верно `b=1` или `c=2`.
+
+Секция `AS` указывает, как политики должны комбинироваться с другими политиками. Политики могут быть или разрешительными (`PERMISSIVE`), или ограничительными (`RESTRICTIVE`). По умолчанию политики создаются разрешительными (`PERMISSIVE`); такие политики комбинируются с использованием логического оператора `OR`.
+
+Ограничительные (`RESTRICTIVE`) политики комбинируются с использованием логического оператора `AND`.
+
+Общая формула выглядит так:
+
+```
+строка_видима = (одна или больше permissive-политик дала ненулевой результат проверки условия) И
+                (все restrictive-политики дали ненулевой результат проверки условия)
+```
+
+Например, политики
+
+``` sql
+CREATE ROW POLICY pol1 ON mydb.table1 USING b=1 TO mira, peter
+CREATE ROW POLICY pol2 ON mydb.table1 USING c=2 AS RESTRICTIVE TO peter, antonio
+```
+
+разрешат пользователю с именем `peter` видеть только те строки, для которых будет одновременно `b=1` и `c=2`.
+
+## Секция ON CLUSTER {#create-row-policy-on-cluster}
+
+Секция `ON CLUSTER` позволяет создавать политики на кластере, см. [Распределенные DDL запросы](../../../sql-reference/distributed-ddl.md).
+
 ## Примеры
 
-`CREATE ROW POLICY filter ON mydb.mytable FOR SELECT USING a<1000 TO accountant, john@localhost`
+`CREATE ROW POLICY filter1 ON mydb.mytable USING a<1000 TO accountant, john@localhost`
 
-`CREATE ROW POLICY filter ON mydb.mytable FOR SELECT USING a<1000 TO ALL EXCEPT mira`
+`CREATE ROW POLICY filter2 ON mydb.mytable USING a<1000 AND b=5 TO ALL EXCEPT mira`
+
+`CREATE ROW POLICY filter3 ON mydb.mytable USING 1 TO admin`
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/statements/create/row-policy) 
 <!--hide-->
\ No newline at end of file
diff --git a/docs/ru/sql-reference/statements/create/settings-profile.md b/docs/ru/sql-reference/statements/create/settings-profile.md
index 643f9d92eac..522caf04c80 100644
--- a/docs/ru/sql-reference/statements/create/settings-profile.md
+++ b/docs/ru/sql-reference/statements/create/settings-profile.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 43
-toc_title: "\u041f\u0440\u043e\u0444\u0438\u043b\u044c\u0020\u043d\u0430\u0441\u0442\u0440\u043e\u0435\u043a"
+toc_title: "Профиль настроек"
 ---
 
 # CREATE SETTINGS PROFILE {#create-settings-profile-statement}
@@ -25,5 +25,4 @@ CREATE SETTINGS PROFILE [IF NOT EXISTS | OR REPLACE] TO name1 [ON CLUSTER cluste
 CREATE SETTINGS PROFILE max_memory_usage_profile SETTINGS max_memory_usage = 100000001 MIN 90000000 MAX 110000000 TO robin
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/statements/create/settings-profile) 
 <!--hide-->
\ No newline at end of file
diff --git a/docs/ru/sql-reference/statements/create/table.md b/docs/ru/sql-reference/statements/create/table.md
index 9f582042a36..1ccd0a600f3 100644
--- a/docs/ru/sql-reference/statements/create/table.md
+++ b/docs/ru/sql-reference/statements/create/table.md
@@ -1,11 +1,15 @@
 ---
 toc_priority: 36
-toc_title: "\u0422\u0430\u0431\u043b\u0438\u0446\u0430"
+toc_title: "Таблица"
 ---
 
 # CREATE TABLE {#create-table-query}
 
-Запрос `CREATE TABLE` может иметь несколько форм.
+Запрос `CREATE TABLE` может иметь несколько форм, которые используются в зависимости от контекста и решаемых задач.
+
+По умолчанию таблицы создаются на текущем сервере. Распределенные DDL запросы создаются с помощью секции `ON CLUSTER`, которая [описана отдельно](../../../sql-reference/distributed-ddl.md).
+## Варианты синтаксиса {#syntax-forms}
+### С описанием структуры {#with-explicit-schema}
 
 ``` sql
 CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
@@ -23,28 +27,51 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
 Также могут быть указаны выражения для значений по умолчанию - смотрите ниже.
 
 При необходимости можно указать [первичный ключ](#primary-key) с одним или несколькими ключевыми выражениями.
+
+### Со структурой, аналогичной другой таблице {#with-a-schema-similar-to-other-table}
+
 ``` sql
 CREATE TABLE [IF NOT EXISTS] [db.]table_name AS [db2.]name2 [ENGINE = engine]
 ```
 
 Создаёт таблицу с такой же структурой, как другая таблица. Можно указать другой движок для таблицы. Если движок не указан, то будет выбран такой же движок, как у таблицы `db2.name2`.
 
+### Из табличной функции {#from-a-table-function}
+
 ``` sql
 CREATE TABLE [IF NOT EXISTS] [db.]table_name AS table_function()
 ```
+Создаёт таблицу с такой же структурой и данными, как результат соответствующей табличной функции. Созданная таблица будет работать так же, как и указанная табличная функция.
 
-Создаёт таблицу с такой же структурой и данными, как результат соответствующей табличной функцией.
+### Из запроса SELECT {#from-select-query}
 
 ``` sql
-CREATE TABLE [IF NOT EXISTS] [db.]table_name ENGINE = engine AS SELECT ...
+CREATE TABLE [IF NOT EXISTS] [db.]table_name[(name1 [type1], name2 [type2], ...)] ENGINE = engine AS SELECT ...
 ```
 
-Создаёт таблицу со структурой, как результат запроса `SELECT`, с движком engine, и заполняет её данными из SELECT-а.
+Создаёт таблицу со структурой, как результат запроса `SELECT`, с движком `engine`, и заполняет её данными из `SELECT`. Также вы можете явно задать описание столбцов.
 
-Во всех случаях, если указано `IF NOT EXISTS`, то запрос не будет возвращать ошибку, если таблица уже существует. В этом случае, запрос будет ничего не делать.
+Если таблица уже существует и указано `IF NOT EXISTS`, то запрос ничего не делает.
 
 После секции `ENGINE` в запросе могут использоваться и другие секции в зависимости от движка. Подробную документацию по созданию таблиц смотрите в описаниях [движков таблиц](../../../engines/table-engines/index.md#table_engines).
 
+**Пример**
+
+Запрос:
+
+``` sql
+CREATE TABLE t1 (x String) ENGINE = Memory AS SELECT 1;
+SELECT x, toTypeName(x) FROM t1;
+```
+
+Результат:
+
+```text
+┌─x─┬─toTypeName(x)─┐
+│ 1 │ String        │
+└───┴───────────────┘
+```
+
 ## Модификатор NULL или NOT NULL {#null-modifiers}
 
 Модификатор `NULL` или `NOT NULL`, указанный после типа данных в определении столбца, позволяет или не позволяет типу данных быть [Nullable](../../../sql-reference/data-types/nullable.md#data_type-nullable). 
@@ -53,7 +80,7 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name ENGINE = engine AS SELECT ...
 
 Смотрите также настройку [data_type_default_nullable](../../../operations/settings/settings.md#data_type_default_nullable).
 
-### Значения по умолчанию {#create-default-values}
+## Значения по умолчанию {#create-default-values}
 
 В описании столбца, может быть указано выражение для значения по умолчанию, одного из следующих видов:
 `DEFAULT expr`, `MATERIALIZED expr`, `ALIAS expr`.
@@ -67,16 +94,22 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name ENGINE = engine AS SELECT ...
 
 В качестве выражения для умолчания, может быть указано произвольное выражение от констант и столбцов таблицы. При создании и изменении структуры таблицы, проверяется, что выражения не содержат циклов. При INSERT-е проверяется разрешимость выражений - что все столбцы, из которых их можно вычислить, переданы.
 
+### DEFAULT {#default}
+
 `DEFAULT expr`
 
 Обычное значение по умолчанию. Если в запросе INSERT не указан соответствующий столбец, то он будет заполнен путём вычисления соответствующего выражения.
 
+### MATERIALIZED {#materialized}
+
 `MATERIALIZED expr`
 
 Материализованное выражение. Такой столбец не может быть указан при INSERT, то есть, он всегда вычисляется.
 При INSERT без указания списка столбцов, такие столбцы не рассматриваются.
 Также этот столбец не подставляется при использовании звёздочки в запросе SELECT. Это необходимо, чтобы сохранить инвариант, что дамп, полученный путём `SELECT *`, можно вставить обратно в таблицу INSERT-ом без указания списка столбцов.
 
+### ALIAS {#alias}
+
 `ALIAS expr`
 
 Синоним. Такой столбец вообще не хранится в таблице.
@@ -118,7 +151,7 @@ PRIMARY KEY(expr1[, expr2,...]);
 !!! warning "Предупреждение"
     Вы не можете сочетать оба способа в одном запросе.
 
-### Ограничения (constraints) {#constraints}
+## Ограничения {#constraints}
 
 Наряду с объявлением столбцов можно объявить ограничения на значения в столбцах таблицы:
 
@@ -136,11 +169,11 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
 
 Добавление большого числа ограничений может негативно повлиять на производительность `INSERT` запросов.
 
-### Выражение для TTL {#vyrazhenie-dlia-ttl}
+## Выражение для TTL {#vyrazhenie-dlia-ttl}
 
 Определяет время хранения значений. Может быть указано только для таблиц семейства MergeTree. Подробнее смотрите в [TTL для столбцов и таблиц](../../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-ttl).
 
-### Кодеки сжатия столбцов {#codecs}
+## Кодеки сжатия столбцов {#codecs}
 
 По умолчанию, ClickHouse применяет к столбцу метод сжатия, определённый в [конфигурации сервера](../../../operations/server-configuration-parameters/settings.md). Кроме этого, можно задать метод сжатия для каждого отдельного столбца в запросе `CREATE TABLE`.
 
@@ -182,7 +215,18 @@ ALTER TABLE codec_example MODIFY COLUMN float_value CODEC(Default);
 
 ClickHouse поддерживает кодеки общего назначения и специализированные кодеки.
 
-#### Специализированные кодеки {#create-query-specialized-codecs}
+### Кодеки общего назначения {#create-query-common-purpose-codecs}
+
+Кодеки:
+
+-   `NONE` — без сжатия.
+-   `LZ4` — [алгоритм сжатия без потерь](https://github.com/lz4/lz4) используемый по умолчанию. Применяет быстрое сжатие LZ4.
+-   `LZ4HC[(level)]` — алгоритм LZ4 HC (high compression) с настраиваемым уровнем сжатия. Уровень по умолчанию — 9. Настройка `level <= 0` устанавливает уровень сжания по умолчанию. Возможные уровни сжатия: \[1, 12\]. Рекомендуемый диапазон уровней: \[4, 9\].
+-   `ZSTD[(level)]` — [алгоритм сжатия ZSTD](https://en.wikipedia.org/wiki/Zstandard) с настраиваемым уровнем сжатия `level`. Возможные уровни сжатия: \[1, 22\]. Уровень сжатия по умолчанию: 1.
+
+Высокие уровни сжатия полезны для ассимметричных сценариев, подобных «один раз сжал, много раз распаковал». Они подразумевают лучшее сжатие, но большее использование CPU.
+
+### Специализированные кодеки {#create-query-specialized-codecs}
 
 Эти кодеки разработаны для того, чтобы, используя особенности данных сделать сжатие более эффективным. Некоторые из этих кодеков не сжимают данные самостоятельно. Они готовят данные для кодеков общего назначения, которые сжимают подготовленные данные эффективнее, чем неподготовленные.
 
@@ -203,19 +247,7 @@ CREATE TABLE codec_example
 )
 ENGINE = MergeTree()
 ```
-
-#### Кодеки общего назначения {#create-query-common-purpose-codecs}
-
-Кодеки:
-
--   `NONE` — без сжатия.
--   `LZ4` — [алгоритм сжатия без потерь](https://github.com/lz4/lz4) используемый по умолчанию. Применяет быстрое сжатие LZ4.
--   `LZ4HC[(level)]` — алгоритм LZ4 HC (high compression) с настраиваемым уровнем сжатия. Уровень по умолчанию — 9. Настройка `level <= 0` устанавливает уровень сжания по умолчанию. Возможные уровни сжатия: \[1, 12\]. Рекомендуемый диапазон уровней: \[4, 9\].
--   `ZSTD[(level)]` — [алгоритм сжатия ZSTD](https://en.wikipedia.org/wiki/Zstandard) с настраиваемым уровнем сжатия `level`. Возможные уровни сжатия: \[1, 22\]. Уровень сжатия по умолчанию: 1.
-
-Высокие уровни сжатия полезны для ассимметричных сценариев, подобных «один раз сжал, много раз распаковал». Высокие уровни сжатия подразумеваю лучшее сжатие, но большее использование CPU.
-
-## Временные таблицы {#vremennye-tablitsy}
+## Временные таблицы {#temporary-tables}
 
 ClickHouse поддерживает временные таблицы со следующими характеристиками:
 
@@ -241,7 +273,77 @@ CREATE TEMPORARY TABLE [IF NOT EXISTS] table_name
 
 Вместо временных можно использовать обычные таблицы с [ENGINE = Memory](../../../engines/table-engines/special/memory.md).
 
+## REPLACE TABLE {#replace-table-query}
 
+Запрос `REPLACE` позволяет частично изменить таблицу (структуру или данные).
+
+!!!note "Замечание"
+    Такие запросы поддерживаются только движком БД [Atomic](../../../engines/database-engines/atomic.md).
+
+Чтобы удалить часть данных из таблицы, вы можете создать новую таблицу, добавить в нее данные из старой таблицы, которые вы хотите оставить (отобрав их с помощью запроса `SELECT`), затем удалить старую таблицу и переименовать новую таблицу так как старую:
+
+```sql
+CREATE TABLE myNewTable AS myOldTable;
+INSERT INTO myNewTable SELECT * FROM myOldTable WHERE CounterID <12345;
+DROP TABLE myOldTable;
+RENAME TABLE myNewTable TO myOldTable;
+```
+
+Вместо перечисленных выше операций можно использовать один запрос:
+
+```sql
+REPLACE TABLE myOldTable SELECT * FROM myOldTable WHERE CounterID <12345;
+```
+
+### Синтаксис
+
+{CREATE [OR REPLACE]|REPLACE} TABLE [db.]table_name
+
+Для данного запроса можно использовать любые варианты синтаксиса запроса `CREATE`. Запрос `REPLACE` для несуществующей таблицы вызовет ошибку.
+
+### Примеры:
+
+Рассмотрим таблицу:
+
+```sql
+CREATE DATABASE base ENGINE = Atomic;
+CREATE OR REPLACE TABLE base.t1 (n UInt64, s String) ENGINE = MergeTree ORDER BY n;
+INSERT INTO base.t1 VALUES (1, 'test');
+SELECT * FROM base.t1;
+```
+
+```text
+┌─n─┬─s────┐
+│ 1 │ test │
+└───┴──────┘
+```
+
+Используем запрос `REPLACE` для удаления всех данных:
+
+```sql
+CREATE OR REPLACE TABLE base.t1 (n UInt64, s Nullable(String)) ENGINE = MergeTree ORDER BY n;
+INSERT INTO base.t1 VALUES (2, null);
+SELECT * FROM base.t1;
+```
+
+```text
+┌─n─┬─s──┐
+│ 2 │ \N │
+└───┴────┘
+```
+
+Используем запрос `REPLACE` для изменения структуры таблицы:
+
+```sql
+REPLACE TABLE base.t1 (n UInt64) ENGINE = MergeTree ORDER BY n;
+INSERT INTO base.t1 VALUES (3);
+SELECT * FROM base.t1;
+```
+
+```text
+┌─n─┐
+│ 3 │
+└───┘
+```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/statements/create/table) 
 <!--hide-->
diff --git a/docs/ru/sql-reference/statements/create/user.md b/docs/ru/sql-reference/statements/create/user.md
index bcc9768eb43..a487d1ac593 100644
--- a/docs/ru/sql-reference/statements/create/user.md
+++ b/docs/ru/sql-reference/statements/create/user.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 39
-toc_title: "\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c"
+toc_title: "Пользователь"
 ---
 
 # CREATE USER {#create-user-statement}
@@ -9,15 +9,17 @@ toc_title: "\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u
 
 Синтаксис:
 
-```sql
+``` sql
 CREATE USER [IF NOT EXISTS | OR REPLACE] name1 [ON CLUSTER cluster_name1] 
         [, name2 [ON CLUSTER cluster_name2] ...]
-    [IDENTIFIED [WITH {NO_PASSWORD|PLAINTEXT_PASSWORD|SHA256_PASSWORD|SHA256_HASH|DOUBLE_SHA1_PASSWORD|DOUBLE_SHA1_HASH}] BY {'password'|'hash'}]
+    [NOT IDENTIFIED | IDENTIFIED {[WITH {no_password | plaintext_password | sha256_password | sha256_hash | double_sha1_password | double_sha1_hash}] BY {'password' | 'hash'}} | {WITH ldap SERVER 'server_name'} | {WITH kerberos [REALM 'realm']}]
     [HOST {LOCAL | NAME 'name' | REGEXP 'name_regexp' | IP 'address' | LIKE 'pattern'} [,...] | ANY | NONE]
     [DEFAULT ROLE role [,...]]
-    [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | PROFILE 'profile_name'] [,...]
+    [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY | WRITABLE] | PROFILE 'profile_name'] [,...]
 ```
 
+`ON CLUSTER` позволяет создавать пользователей в кластере, см. [Распределенные DDL](../../../sql-reference/distributed-ddl.md).
+
 ## Идентификация
 
 Существует несколько способов идентификации пользователя:
@@ -28,6 +30,8 @@ CREATE USER [IF NOT EXISTS | OR REPLACE] name1 [ON CLUSTER cluster_name1]
 - `IDENTIFIED WITH sha256_hash BY 'hash'`
 - `IDENTIFIED WITH double_sha1_password BY 'qwerty'`
 - `IDENTIFIED WITH double_sha1_hash BY 'hash'`
+- `IDENTIFIED WITH ldap SERVER 'server_name'`
+- `IDENTIFIED WITH kerberos` or `IDENTIFIED WITH kerberos REALM 'realm'`
 
 ## Пользовательский хост
 
@@ -81,5 +85,4 @@ CREATE USER user DEFAULT ROLE ALL
 CREATE USER john DEFAULT ROLE ALL EXCEPT role1, role2
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/statements/create/user) 
 <!--hide-->
\ No newline at end of file
diff --git a/docs/ru/sql-reference/statements/create/view.md b/docs/ru/sql-reference/statements/create/view.md
index f4b91b5ae17..4e34b5e3b6e 100644
--- a/docs/ru/sql-reference/statements/create/view.md
+++ b/docs/ru/sql-reference/statements/create/view.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 37
-toc_title: "\u041f\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u0435"
+toc_title: "Представление"
 ---
 
 # CREATE VIEW {#create-view}
@@ -13,7 +13,7 @@ toc_title: "\u041f\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u
 CREATE [OR REPLACE] VIEW [IF NOT EXISTS] [db.]table_name [ON CLUSTER] AS SELECT ...
 ```
 
-Обычные представления не хранят никаких данных, они выполняют чтение данных из другой таблицы при каждом доступе. Другими словами, обычное представление - это не что иное, как сохраненный запрос. При чтении данных из представления этот сохраненный запрос используется как подзапрос в секции [FROM](../../../sql-reference/statements/select/from.md).
+Обычные представления не хранят никаких данных, они выполняют чтение данных из другой таблицы при каждом доступе. Другими словами, обычное представление — это не что иное, как сохраненный запрос. При чтении данных из представления этот сохраненный запрос используется как подзапрос в секции [FROM](../../../sql-reference/statements/select/from.md).
 
 Для примера, пусть вы создали представление:
 
@@ -43,12 +43,12 @@ CREATE MATERIALIZED VIEW [IF NOT EXISTS] [db.]table_name [ON CLUSTER] [TO[db.]na
 
 При создании материализованного представления без использования `TO [db].[table]`, нужно обязательно указать `ENGINE` - движок таблицы для хранения данных.
 
-При создании материализованного представления с испольованием `TO [db].[table]`, нельзя указывать `POPULATE`
+При создании материализованного представления с испольованием `TO [db].[table]`, нельзя указывать `POPULATE`.
 
 Материализованное представление устроено следующим образом: при вставке данных в таблицу, указанную в SELECT-е, кусок вставляемых данных преобразуется этим запросом SELECT, и полученный результат вставляется в представление.
 
 !!! important "Важно"
-    Материализованные представлени в ClickHouse больше похожи на `after insert` триггеры. Если в запросе материализованного представления есть агрегирование, оно применяется только к вставляемому блоку записей. Любые изменения существующих данных исходной таблицы (например обновление, удаление, удаление раздела и т.д.) не изменяют материализованное представление.
+    Материализованные представления в ClickHouse больше похожи на `after insert` триггеры. Если в запросе материализованного представления есть агрегирование, оно применяется только к вставляемому блоку записей. Любые изменения существующих данных исходной таблицы (например обновление, удаление, удаление раздела и т.д.) не изменяют материализованное представление.
 
 Если указано `POPULATE`, то при создании представления, в него будут вставлены имеющиеся данные таблицы, как если бы был сделан запрос `CREATE TABLE ... AS SELECT ...` . Иначе, представление будет содержать только данные, вставляемые в таблицу после создания представления. Не рекомендуется использовать POPULATE, так как вставляемые в таблицу данные во время создания представления, не попадут в него.
 
@@ -56,10 +56,177 @@ CREATE MATERIALIZED VIEW [IF NOT EXISTS] [db.]table_name [ON CLUSTER] [TO[db.]na
 
 Недоработано выполнение запросов `ALTER` над материализованными представлениями, поэтому они могут быть неудобными для использования. Если материализованное представление использует конструкцию `TO [db.]name`, то можно выполнить `DETACH` представления, `ALTER` для целевой таблицы и последующий `ATTACH` ранее отсоединенного (`DETACH`) представления.
 
-Обратите внимание, что работа материлизованного представления находится под влиянием настройки [optimize_on_insert](../../../operations/settings/settings.md#optimize-on-insert). Перед вставкой данных в таблицу происходит их слияние.
+Обратите внимание, что работа материализованного представления находится под влиянием настройки [optimize_on_insert](../../../operations/settings/settings.md#optimize-on-insert). Перед вставкой данных в таблицу происходит их слияние.
  
 Представления выглядят так же, как обычные таблицы. Например, они перечисляются в результате запроса `SHOW TABLES`.
 
-Отсутствует отдельный запрос для удаления представлений. Чтобы удалить представление, следует использовать `DROP TABLE`.
+Чтобы удалить представление, следует использовать [DROP VIEW](../../../sql-reference/statements/drop.md#drop-view). Впрочем, `DROP TABLE` тоже работает для представлений.
+
+## LIVE-представления {#live-view}
+
+!!! important "Важно"
+   Представления `LIVE VIEW` являются экспериментальной возможностью. Их использование может повлечь потерю совместимости в будущих версиях. 
+   Чтобы использовать `LIVE VIEW` и запросы `WATCH`, включите настройку [allow_experimental_live_view](../../../operations/settings/settings.md#allow-experimental-live-view). 
+
+```sql
+CREATE LIVE VIEW [IF NOT EXISTS] [db.]table_name [WITH [TIMEOUT [value_in_sec] [AND]] [REFRESH [value_in_sec]]] AS SELECT ...
+```
+`LIVE VIEW` хранит результат запроса [SELECT](../../../sql-reference/statements/select/index.md), указанного при создании, и обновляется сразу же при изменении этого результата. Конечный результат запроса и промежуточные данные, из которых формируется результат, хранятся в оперативной памяти, и это обеспечивает высокую скорость обработки для повторяющихся запросов. LIVE-представления могут отправлять push-уведомления при изменении результата исходного запроса `SELECT`. Для этого используйте запрос [WATCH](../../../sql-reference/statements/watch.md).
+
+Изменение `LIVE VIEW` запускается при вставке данных в таблицу, указанную в исходном запросе `SELECT`.
+
+LIVE-представления работают по тому же принципу, что и распределенные таблицы. Но вместо объединения отдельных частей данных с разных серверов, LIVE-представления объединяют уже имеющийся результат с новыми данными. Если в исходном запросе LIVE-представления есть вложенный подзапрос, его результаты не кешируются, в кеше хранится только результат основного запроса.
+
+!!! info "Ограничения"
+    - [Табличные функции](../../../sql-reference/table-functions/index.md) в основном запросе не поддерживаются.
+    - Таблицы, не поддерживающие изменение с помощью запроса `INSERT`, такие как [словари](../../../sql-reference/dictionaries/index.md) и [системные таблицы](../../../operations/system-tables/index.md), а также [нормальные представления](#normal) или [материализованные представления](#materialized), не запускают обновление LIVE-представления.
+    - В LIVE-представлениях могут использоваться только такие запросы, которые объединяют результаты по старым и новым данным. LIVE-представления не работают с запросами, требующими полного пересчета данных или агрегирования с сохранением состояния.
+    - `LIVE VIEW` не работает для реплицируемых и распределенных таблиц, добавление данных в которые происходит на разных узлах.
+    - `LIVE VIEW` не обновляется, если в исходном запросе используются несколько таблиц.
+
+    В случаях, когда `LIVE VIEW` не обновляется автоматически, чтобы обновлять его принудительно с заданной периодичностью, используйте [WITH REFRESH](#live-view-with-refresh).
+
+### Отслеживание изменений {#live-view-monitoring}
+
+Для отслеживания изменений LIVE-представления используйте запрос [WATCH](../../../sql-reference/statements/watch.md).
+
+
+**Пример:**
+
+```sql
+CREATE TABLE mt (x Int8) Engine = MergeTree ORDER BY x;
+CREATE LIVE VIEW lv AS SELECT sum(x) FROM mt;
+```
+Отслеживаем изменения LIVE-представления при вставке данных в исходную таблицу.
+
+```sql
+WATCH lv;
+```
+
+```bash
+┌─sum(x)─┬─_version─┐
+│      1 │        1 │
+└────────┴──────────┘
+┌─sum(x)─┬─_version─┐
+│      2 │        2 │
+└────────┴──────────┘
+┌─sum(x)─┬─_version─┐
+│      6 │        3 │
+└────────┴──────────┘
+...
+```
+
+```sql
+INSERT INTO mt VALUES (1);
+INSERT INTO mt VALUES (2);
+INSERT INTO mt VALUES (3);
+```
+
+Для получения списка изменений используйте ключевое слово [EVENTS](../../../sql-reference/statements/watch.md#events-clause).
+
+
+```sql
+WATCH lv EVENTS;
+```
+
+```bash
+┌─version─┐
+│       1 │
+└─────────┘
+┌─version─┐
+│       2 │
+└─────────┘
+┌─version─┐
+│       3 │
+└─────────┘
+...
+```
+
+Для работы с LIVE-представлениями, как и с любыми другими, можно использовать запросы [SELECT](../../../sql-reference/statements/select/index.md). Если результат запроса кеширован, он будет возвращен немедленно, без обращения к исходным таблицам представления.
+
+```sql
+SELECT * FROM [db.]live_view WHERE ...
+```
+
+### Принудительное обновление {#live-view-alter-refresh}
+
+Чтобы принудительно обновить LIVE-представление, используйте запрос `ALTER LIVE VIEW [db.]table_name REFRESH`.
+
+### Секция WITH TIMEOUT {#live-view-with-timeout}
+
+LIVE-представление, созданное с параметром `WITH TIMEOUT`, будет автоматически удалено через определенное количество секунд с момента предыдущего запроса [WATCH](../../../sql-reference/statements/watch.md), примененного к данному LIVE-представлению. 
+
+```sql
+CREATE LIVE VIEW [db.]table_name WITH TIMEOUT [value_in_sec] AS SELECT ...
+```
+
+Если временной промежуток не указан, используется значение настройки [temporary_live_view_timeout](../../../operations/settings/settings.md#temporary-live-view-timeout).
+
+**Пример:**
+
+```sql
+CREATE TABLE mt (x Int8) Engine = MergeTree ORDER BY x;
+CREATE LIVE VIEW lv WITH TIMEOUT 15 AS SELECT sum(x) FROM mt;
+```
+
+### Секция WITH REFRESH {#live-view-with-refresh}
+
+LIVE-представление, созданное с параметром `WITH REFRESH`, будет автоматически обновляться через указанные промежутки времени, начиная с момента последнего обновления.
+
+```sql
+CREATE LIVE VIEW [db.]table_name WITH REFRESH [value_in_sec] AS SELECT ...
+```
+
+Если значение временного промежутка не задано, используется значение [periodic_live_view_refresh](../../../operations/settings/settings.md#periodic-live-view-refresh).
+
+**Пример:**
+
+```sql
+CREATE LIVE VIEW lv WITH REFRESH 5 AS SELECT now();
+WATCH lv;
+```
+
+```bash
+┌───────────────now()─┬─_version─┐
+│ 2021-02-21 08:47:05 │        1 │
+└─────────────────────┴──────────┘
+┌───────────────now()─┬─_version─┐
+│ 2021-02-21 08:47:10 │        2 │
+└─────────────────────┴──────────┘
+┌───────────────now()─┬─_version─┐
+│ 2021-02-21 08:47:15 │        3 │
+└─────────────────────┴──────────┘
+```
+
+Параметры `WITH TIMEOUT` и `WITH REFRESH` можно сочетать с помощью `AND`. 
+
+```sql
+CREATE LIVE VIEW [db.]table_name WITH TIMEOUT [value_in_sec] AND REFRESH [value_in_sec] AS SELECT ...
+```
+
+**Пример:**
+
+```sql
+CREATE LIVE VIEW lv WITH TIMEOUT 15 AND REFRESH 5 AS SELECT now();
+```
+
+По истечении 15 секунд представление будет автоматически удалено, если нет активного запроса `WATCH`.
+
+```sql
+WATCH lv;
+```
+
+```
+Code: 60. DB::Exception: Received from localhost:9000. DB::Exception: Table default.lv doesn't exist.. 
+```
+
+### Использование {#live-view-usage}
+
+Наиболее частые случаи использования `LIVE-VIEW`:
+
+- Получение push-уведомлений об изменениях данных без дополнительных периодических запросов.
+- Кеширование результатов часто используемых запросов для получения их без задержки.
+- Отслеживание изменений таблицы для запуска других запросов `SELECT`.
+- Отслеживание показателей из системных таблиц с помощью периодических обновлений.
 
 [Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/statements/create/view) <!--hide-->
diff --git a/docs/ru/sql-reference/statements/describe-table.md b/docs/ru/sql-reference/statements/describe-table.md
index 64ed61de232..c66dbb66521 100644
--- a/docs/ru/sql-reference/statements/describe-table.md
+++ b/docs/ru/sql-reference/statements/describe-table.md
@@ -21,4 +21,3 @@ DESC|DESCRIBE TABLE [db.]table [INTO OUTFILE filename] [FORMAT format]
 
 Вложенные структуры данных выводятся в «развёрнутом» виде. То есть, каждый столбец - по отдельности, с именем через точку.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/statements/describe-table/) <!--hide-->
diff --git a/docs/ru/sql-reference/statements/detach.md b/docs/ru/sql-reference/statements/detach.md
index 00d0a4b20c6..d707acd7ccf 100644
--- a/docs/ru/sql-reference/statements/detach.md
+++ b/docs/ru/sql-reference/statements/detach.md
@@ -5,15 +5,65 @@ toc_title: DETACH
 
 # DETACH {#detach-statement}
 
-Удаляет из сервера информацию о таблице name. Сервер перестаёт знать о существовании таблицы.
+Заставляет сервер "забыть" о существовании таблицы или материализованного представления.
+
+Синтаксис:
 
 ``` sql
-DETACH TABLE [IF EXISTS] [db.]name [ON CLUSTER cluster]
+DETACH TABLE|VIEW [IF EXISTS] [db.]name [PERMANENTLY] [ON CLUSTER cluster]
 ```
 
-Но ни данные, ни метаданные таблицы не удаляются. При следующем запуске сервера, сервер прочитает метаданные и снова узнает о таблице.
-Также, «отцепленную» таблицу можно прицепить заново запросом `ATTACH` (за исключением системных таблиц, для которых метаданные не хранятся).
+Но ни данные, ни метаданные таблицы или материализованного представления не удаляются. При следующем запуске сервера, если не было использовано `PERMANENTLY`, сервер прочитает метаданные и снова узнает о таблице/представлении. Если таблица или представление были отключены перманентно, сервер не подключит их обратно автоматически.
 
-Запроса `DETACH DATABASE` нет.
+Независимо от того, каким способом таблица была отключена, ее можно подключить обратно с помощью запроса [ATTACH](../../sql-reference/statements/attach.md). Системные log таблицы также могут быть подключены обратно (к примеру `query_log`, `text_log` и др.) Другие системные таблицы не могут быть подключены обратно, но на следующем запуске сервер снова "вспомнит" об этих таблицах.
+
+`ATTACH MATERIALIZED VIEW` не может быть использован с кратким синтаксисом (без `SELECT`), но можно подключить представление с помощью запроса `ATTACH TABLE`.
+
+Обратите внимание, что нельзя перманентно отключить таблицу, которая уже временно отключена. Для этого ее сначала надо подключить обратно, а затем снова отключить перманентно.
+
+Также нельзя использовать [DROP](../../sql-reference/statements/drop.md#drop-table) с отключенной таблицей или создавать таблицу с помощью [CREATE TABLE](../../sql-reference/statements/create/table.md) с таким же именем, как у отключенной таблицы. Еще нельзя заменить отключенную таблицу другой с помощью запроса [RENAME TABLE](../../sql-reference/statements/rename.md).
+
+**Пример**
+
+Создание таблицы:
+
+Запрос:
+
+``` sql
+CREATE TABLE test ENGINE = Log AS SELECT * FROM numbers(10);
+SELECT * FROM test;
+```
+
+Результат:
+
+``` text
+┌─number─┐
+│      0 │
+│      1 │
+│      2 │
+│      3 │
+│      4 │
+│      5 │
+│      6 │
+│      7 │
+│      8 │
+│      9 │
+└────────┘
+```
+
+Отключение таблицы:
+
+Запрос:
+
+``` sql
+DETACH TABLE test;
+SELECT * FROM test;
+```
+
+Результат:
+
+``` text
+Received exception from server (version 21.4.1):
+Code: 60. DB::Exception: Received from localhost:9000. DB::Exception: Table default.test doesn't exist.
+```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/statements/detach/) <!--hide-->
diff --git a/docs/ru/sql-reference/statements/drop.md b/docs/ru/sql-reference/statements/drop.md
index 514a92db91f..118f8eb923a 100644
--- a/docs/ru/sql-reference/statements/drop.md
+++ b/docs/ru/sql-reference/statements/drop.md
@@ -97,4 +97,3 @@ DROP [SETTINGS] PROFILE [IF EXISTS] name [,...] [ON CLUSTER cluster_name]
 DROP VIEW [IF EXISTS] [db.]name [ON CLUSTER cluster]
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/statements/drop/) <!--hide-->
\ No newline at end of file
diff --git a/docs/ru/sql-reference/statements/exists.md b/docs/ru/sql-reference/statements/exists.md
index 0b2fd69273c..d4f1f707e79 100644
--- a/docs/ru/sql-reference/statements/exists.md
+++ b/docs/ru/sql-reference/statements/exists.md
@@ -12,4 +12,3 @@ EXISTS [TEMPORARY] TABLE [db.]name [INTO OUTFILE filename] [FORMAT format]
 Возвращает один столбец типа `UInt8`, содержащий одно значение - `0`, если таблицы или БД не существует и `1`, если таблица в указанной БД существует.
 
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/statements/exists/) <!--hide-->
\ No newline at end of file
diff --git a/docs/ru/sql-reference/statements/grant.md b/docs/ru/sql-reference/statements/grant.md
index d38e2ea38a0..093e6eb3b93 100644
--- a/docs/ru/sql-reference/statements/grant.md
+++ b/docs/ru/sql-reference/statements/grant.md
@@ -93,7 +93,7 @@ GRANT SELECT(x,y) ON db.table TO john WITH GRANT OPTION
             - `ALTER ADD CONSTRAINT`
             - `ALTER DROP CONSTRAINT`
         - `ALTER TTL`
-        - `ALTER MATERIALIZE TTL`
+            - `ALTER MATERIALIZE TTL`
         - `ALTER SETTINGS`
         - `ALTER MOVE PARTITION`
         - `ALTER FETCH PARTITION`
@@ -104,9 +104,9 @@ GRANT SELECT(x,y) ON db.table TO john WITH GRANT OPTION
 - [CREATE](#grant-create)
     - `CREATE DATABASE`
     - `CREATE TABLE`
+        - `CREATE TEMPORARY TABLE`
     - `CREATE VIEW`
     - `CREATE DICTIONARY`
-    - `CREATE TEMPORARY TABLE`
 - [DROP](#grant-drop)
     - `DROP DATABASE`
     - `DROP TABLE`
@@ -152,7 +152,7 @@ GRANT SELECT(x,y) ON db.table TO john WITH GRANT OPTION
     - `SYSTEM RELOAD`
         - `SYSTEM RELOAD CONFIG`
         - `SYSTEM RELOAD DICTIONARY`
-        - `SYSTEM RELOAD EMBEDDED DICTIONARIES`
+            - `SYSTEM RELOAD EMBEDDED DICTIONARIES`
     - `SYSTEM MERGES`
     - `SYSTEM TTL MERGES`
     - `SYSTEM FETCHES`
@@ -279,7 +279,7 @@ GRANT INSERT(x,y) ON db.table TO john
             - `ALTER ADD CONSTRAINT`. Уровень: `TABLE`. Алиасы: `ADD CONSTRAINT`
             - `ALTER DROP CONSTRAINT`. Уровень: `TABLE`. Алиасы: `DROP CONSTRAINT`
         - `ALTER TTL`. Уровень: `TABLE`. Алиасы: `ALTER MODIFY TTL`, `MODIFY TTL`
-        - `ALTER MATERIALIZE TTL`. Уровень: `TABLE`. Алиасы: `MATERIALIZE TTL`
+            - `ALTER MATERIALIZE TTL`. Уровень: `TABLE`. Алиасы: `MATERIALIZE TTL`
         - `ALTER SETTINGS`. Уровень: `TABLE`. Алиасы: `ALTER SETTING`, `ALTER MODIFY SETTING`, `MODIFY SETTING`
         - `ALTER MOVE PARTITION`. Уровень: `TABLE`. Алиасы: `ALTER MOVE PART`, `MOVE PARTITION`, `MOVE PART`
         - `ALTER FETCH PARTITION`. Уровень: `TABLE`. Алиасы: `FETCH PARTITION`
@@ -307,9 +307,9 @@ GRANT INSERT(x,y) ON db.table TO john
 - `CREATE`. Уровень: `GROUP`
     - `CREATE DATABASE`. Уровень: `DATABASE`
     - `CREATE TABLE`. Уровень: `TABLE`
+        - `CREATE TEMPORARY TABLE`. Уровень: `GLOBAL`
     - `CREATE VIEW`. Уровень: `VIEW`
     - `CREATE DICTIONARY`. Уровень: `DICTIONARY`
-    - `CREATE TEMPORARY TABLE`. Уровень: `GLOBAL`
 
 **Дополнительно**
 
@@ -407,7 +407,7 @@ GRANT INSERT(x,y) ON db.table TO john
     - `SYSTEM RELOAD`. Уровень: `GROUP`
         - `SYSTEM RELOAD CONFIG`. Уровень: `GLOBAL`. Алиасы: `RELOAD CONFIG`
         - `SYSTEM RELOAD DICTIONARY`. Уровень: `GLOBAL`. Алиасы: `SYSTEM RELOAD DICTIONARIES`, `RELOAD DICTIONARY`, `RELOAD DICTIONARIES`
-        - `SYSTEM RELOAD EMBEDDED DICTIONARIES`. Уровень: `GLOBAL`. Алиасы: `RELOAD EMBEDDED DICTIONARIES`
+            - `SYSTEM RELOAD EMBEDDED DICTIONARIES`. Уровень: `GLOBAL`. Алиасы: `RELOAD EMBEDDED DICTIONARIES`
     - `SYSTEM MERGES`. Уровень: `TABLE`. Алиасы: `SYSTEM STOP MERGES`, `SYSTEM START MERGES`, `STOP MERGES`, `START MERGES`
     - `SYSTEM TTL MERGES`. Уровень: `TABLE`. Алиасы: `SYSTEM STOP TTL MERGES`, `SYSTEM START TTL MERGES`, `STOP TTL MERGES`, `START TTL MERGES`
     - `SYSTEM FETCHES`. Уровень: `TABLE`. Алиасы: `SYSTEM STOP FETCHES`, `SYSTEM START FETCHES`, `STOP FETCHES`, `START FETCHES`
@@ -483,4 +483,3 @@ GRANT INSERT(x,y) ON db.table TO john
 
 Привилегия `ADMIN OPTION` разрешает пользователю назначать свои роли другому пользователю.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/statements/grant/) <!--hide-->
diff --git a/docs/ru/sql-reference/statements/index.md b/docs/ru/sql-reference/statements/index.md
index c7862015e64..5e72aa7cca0 100644
--- a/docs/ru/sql-reference/statements/index.md
+++ b/docs/ru/sql-reference/statements/index.md
@@ -1,5 +1,5 @@
 ---
-toc_folder_title: "\u0412\u044B\u0440\u0430\u0436\u0435\u043D\u0438\u044F"
+toc_folder_title: "Выражения"
 toc_priority: 31
 ---
 
diff --git a/docs/ru/sql-reference/statements/insert-into.md b/docs/ru/sql-reference/statements/insert-into.md
index 0ad85ed0166..bbd330962cf 100644
--- a/docs/ru/sql-reference/statements/insert-into.md
+++ b/docs/ru/sql-reference/statements/insert-into.md
@@ -119,4 +119,3 @@ INSERT INTO [db.]table [(c1, c2, c3)] SELECT ...
 -   Данные поступают в режиме реального времени.
 -   Вы загружаете данные, которые как правило отсортированы по времени.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/insert_into/) <!--hide-->
diff --git a/docs/ru/sql-reference/statements/kill.md b/docs/ru/sql-reference/statements/kill.md
index e2556a7f782..6981d630dd8 100644
--- a/docs/ru/sql-reference/statements/kill.md
+++ b/docs/ru/sql-reference/statements/kill.md
@@ -70,4 +70,3 @@ KILL MUTATION WHERE database = 'default' AND table = 'table' AND mutation_id = '
 Данные, уже изменённые мутацией, остаются в таблице (отката на старую версию данных не происходит).
 
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/statements/kill/) <!--hide-->
\ No newline at end of file
diff --git a/docs/ru/sql-reference/statements/misc.md b/docs/ru/sql-reference/statements/misc.md
index e9ceece8b2c..cedf52b7a34 100644
--- a/docs/ru/sql-reference/statements/misc.md
+++ b/docs/ru/sql-reference/statements/misc.md
@@ -19,4 +19,3 @@ toc_priority: 41
 -   [TRUNCATE](../../sql-reference/statements/truncate.md)
 -   [USE](../../sql-reference/statements/use.md)
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/statements/misc/) <!--hide-->
\ No newline at end of file
diff --git a/docs/ru/sql-reference/statements/optimize.md b/docs/ru/sql-reference/statements/optimize.md
index 9b94c31a8f7..e1a9d613537 100644
--- a/docs/ru/sql-reference/statements/optimize.md
+++ b/docs/ru/sql-reference/statements/optimize.md
@@ -5,21 +5,83 @@ toc_title: OPTIMIZE
 
 # OPTIMIZE {#misc_operations-optimize}
 
-``` sql
-OPTIMIZE TABLE [db.]name [ON CLUSTER cluster] [PARTITION partition | PARTITION ID 'partition_id'] [FINAL] [DEDUPLICATE]
-```
-
-Запрос пытается запустить внеплановый мёрж кусков данных для таблиц семейства [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md). Другие движки таблиц не поддерживаются.
-
-Если `OPTIMIZE` применяется к таблицам семейства [ReplicatedMergeTree](../../engines/table-engines/mergetree-family/replication.md), ClickHouse создаёт задачу на мёрж и ожидает её исполнения на всех узлах (если активирована настройка `replication_alter_partitions_sync`).
-
--   Если `OPTIMIZE` не выполняет мёрж по любой причине, ClickHouse не оповещает об этом клиента. Чтобы включить оповещения, используйте настройку [optimize_throw_if_noop](../../operations/settings/settings.md#setting-optimize_throw_if_noop).
--   Если указать `PARTITION`, то оптимизация выполняется только для указанной партиции. [Как задавать имя партиции в запросах](alter/index.md#alter-how-to-specify-part-expr).
--   Если указать `FINAL`, то оптимизация выполняется даже в том случае, если все данные уже лежат в одном куске.
--   Если указать `DEDUPLICATE`, то произойдет схлопывание полностью одинаковых строк (сравниваются значения во всех колонках), имеет смысл только для движка MergeTree.
+Запрос пытается запустить внеплановое слияние кусков данных для таблиц.
 
 !!! warning "Внимание"
-    Запрос `OPTIMIZE` не может устранить причину появления ошибки «Too many parts».
+    `OPTIMIZE` не устраняет причину появления ошибки `Too many parts`.
 
-    
-[Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/statements/optimize/) <!--hide-->
\ No newline at end of file
+**Синтаксис**
+
+``` sql
+OPTIMIZE TABLE [db.]name [ON CLUSTER cluster] [PARTITION partition | PARTITION ID 'partition_id'] [FINAL] [DEDUPLICATE [BY expression]]
+```
+
+Может применяться к таблицам семейства [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md), [MaterializedView](../../engines/table-engines/special/materializedview.md) и [Buffer](../../engines/table-engines/special/buffer.md). Другие движки таблиц не поддерживаются.
+
+Если запрос `OPTIMIZE` применяется к таблицам семейства [ReplicatedMergeTree](../../engines/table-engines/mergetree-family/replication.md), ClickHouse создаёт задачу на слияние и ожидает её исполнения на всех узлах (если активирована настройка `replication_alter_partitions_sync`).
+
+-   По умолчанию, если запросу `OPTIMIZE` не удалось выполнить слияние, то
+ClickHouse не оповещает клиента. Чтобы включить оповещения, используйте настройку [optimize_throw_if_noop](../../operations/settings/settings.md#setting-optimize_throw_if_noop).
+-   Если указать `PARTITION`, то оптимизация выполняется только для указанной партиции. [Как задавать имя партиции в запросах](alter/index.md#alter-how-to-specify-part-expr).
+-   Если указать `FINAL`, то оптимизация выполняется даже в том случае, если все данные уже лежат в одном куске данных. Кроме того, слияние является принудительным, даже если выполняются параллельные слияния.
+-   Если указать `DEDUPLICATE`, то произойдет схлопывание полностью одинаковых строк (сравниваются значения во всех столбцах), имеет смысл только для движка MergeTree.
+
+## Выражение BY {#by-expression}
+
+Чтобы выполнить дедупликацию по произвольному набору столбцов, вы можете явно указать список столбцов или использовать любую комбинацию подстановки [`*`](../../sql-reference/statements/select/index.md#asterisk), выражений [`COLUMNS`](../../sql-reference/statements/select/index.md#columns-expression) и [`EXCEPT`](../../sql-reference/statements/select/index.md#except-modifier).
+
+ Список столбцов для дедупликации должен включать все столбцы, указанные в условиях сортировки (первичный ключ и ключ сортировки), а также в условиях партиционирования (ключ партиционирования).
+
+ !!! note "Примечание"
+    Обратите внимание, что символ подстановки `*` обрабатывается так же, как и в запросах `SELECT`: столбцы `MATERIALIZED` и `ALIAS` не включаются в результат.
+    Если указать пустой список или выражение, которое возвращает пустой список, или дедуплицировать столбец по псевдониму (`ALIAS`), то сервер вернет ошибку.
+
+
+**Примеры**
+
+Рассмотрим таблицу:
+
+``` sql
+CREATE TABLE example (
+    primary_key Int32,
+    secondary_key Int32,
+    value UInt32,
+    partition_key UInt32,
+    materialized_value UInt32 MATERIALIZED 12345,
+    aliased_value UInt32 ALIAS 2,
+    PRIMARY KEY primary_key
+) ENGINE=MergeTree
+PARTITION BY partition_key;
+```
+
+Прежний способ дедупликации, когда учитываются все столбцы. Строка удаляется только в том случае, если все значения во всех столбцах равны соответствующим значениям в предыдущей строке.
+
+``` sql
+OPTIMIZE TABLE example FINAL DEDUPLICATE;
+```
+
+Дедупликация по всем столбцам, кроме `ALIAS` и `MATERIALIZED`: `primary_key`, `secondary_key`, `value`, `partition_key` и `materialized_value`.
+
+
+``` sql
+OPTIMIZE TABLE example FINAL DEDUPLICATE BY *;
+```
+
+Дедупликация по всем столбцам, кроме `ALIAS`, `MATERIALIZED` и `materialized_value`: столбцы `primary_key`, `secondary_key`, `value` и `partition_key`.
+
+
+``` sql
+OPTIMIZE TABLE example FINAL DEDUPLICATE BY * EXCEPT materialized_value;
+```
+
+Дедупликация по столбцам `primary_key`, `secondary_key` и `partition_key`.
+
+``` sql
+OPTIMIZE TABLE example FINAL DEDUPLICATE BY primary_key, secondary_key, partition_key;
+```
+
+Дедупликация по любому столбцу, соответствующему регулярному выражению: столбцам `primary_key`, `secondary_key` и `partition_key`.
+
+``` sql
+OPTIMIZE TABLE example FINAL DEDUPLICATE BY COLUMNS('.*_key');
+```
diff --git a/docs/ru/sql-reference/statements/rename.md b/docs/ru/sql-reference/statements/rename.md
index 94bf3c682a1..192426dbafa 100644
--- a/docs/ru/sql-reference/statements/rename.md
+++ b/docs/ru/sql-reference/statements/rename.md
@@ -3,8 +3,16 @@ toc_priority: 48
 toc_title: RENAME
 ---
 
-# RENAME {#misc_operations-rename}
+# RENAME Statement {#misc_operations-rename}
 
+## RENAME DATABASE {#misc_operations-rename_database}
+Переименование базы данных
+
+```
+RENAME DATABASE atomic_database1 TO atomic_database2 [ON CLUSTER cluster]
+```
+
+## RENAME TABLE {#misc_operations-rename_table}
 Переименовывает одну или несколько таблиц.
 
 ``` sql
@@ -12,6 +20,3 @@ RENAME TABLE [db11.]name11 TO [db12.]name12, [db21.]name21 TO [db22.]name22, ...
 ```
 
 Переименовывание таблицы является лёгкой операцией. Если вы указали после `TO` другую базу данных, то таблица будет перенесена в эту базу данных. При этом, директории с базами данных должны быть расположены в одной файловой системе (иначе возвращается ошибка). В случае переименования нескольких таблиц в одном запросе — это неатомарная операция,  может выполнится частично, запросы в других сессиях могут получить ошибку `Table ... doesn't exist...`.
-
-
-[Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/statements/rename/) <!--hide-->
diff --git a/docs/ru/sql-reference/statements/revoke.md b/docs/ru/sql-reference/statements/revoke.md
index 339746b8591..a3a282d6e5c 100644
--- a/docs/ru/sql-reference/statements/revoke.md
+++ b/docs/ru/sql-reference/statements/revoke.md
@@ -45,4 +45,3 @@ GRANT SELECT ON accounts.staff TO mira;
 REVOKE SELECT(wage) ON accounts.staff FROM mira;
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/operations/settings/settings/) <!-- hide -->
diff --git a/docs/ru/sql-reference/statements/select/all.md b/docs/ru/sql-reference/statements/select/all.md
new file mode 100644
index 00000000000..d36a23ca54e
--- /dev/null
+++ b/docs/ru/sql-reference/statements/select/all.md
@@ -0,0 +1,21 @@
+---
+toc_title: ALL
+---
+
+# Секция ALL {#select-all}
+
+Если в таблице несколько совпадающих строк, то `ALL` возвращает все из них. Поведение запроса `SELECT ALL` точно такое же, как и `SELECT` без аргумента `DISTINCT`. Если указаны оба аргумента: `ALL` и `DISTINCT`, функция вернет исключение.
+
+
+`ALL` может быть указан внутри агрегатной функции, например, результат выполнения запроса:
+
+```sql
+SELECT sum(ALL number) FROM numbers(10);
+```
+
+равен результату выполнения запроса:
+
+```sql
+SELECT sum(number) FROM numbers(10);
+```
+
diff --git a/docs/ru/sql-reference/statements/select/index.md b/docs/ru/sql-reference/statements/select/index.md
index b0b6e80d7be..886952ea5cf 100644
--- a/docs/ru/sql-reference/statements/select/index.md
+++ b/docs/ru/sql-reference/statements/select/index.md
@@ -1,8 +1,8 @@
 ---
-title: "\u0421\u0438\u043d\u0442\u0430\u043a\u0441\u0438\u0441\u0020\u0437\u0430\u043f\u0440\u043e\u0441\u043e\u0432\u0020\u0053\u0045\u004c\u0045\u0043\u0054"
+title: "Синтаксис запросов SELECT"
 toc_folder_title: SELECT
 toc_priority: 32
-toc_title: "\u041e\u0431\u0437\u043e\u0440"
+toc_title: "Обзор"
 ---
 
 # Синтаксис запросов SELECT {#select-queries-syntax}
@@ -280,4 +280,3 @@ SELECT * REPLACE(i + 1 AS i) EXCEPT (j) APPLY(sum) from columns_transformers;
 SELECT * FROM some_table SETTINGS optimize_read_in_order=1, cast_keep_nullable=1;
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/statements/select/)<!--hide-->
diff --git a/docs/ru/sql-reference/statements/select/join.md b/docs/ru/sql-reference/statements/select/join.md
index c5548d74156..4bd883c87ff 100644
--- a/docs/ru/sql-reference/statements/select/join.md
+++ b/docs/ru/sql-reference/statements/select/join.md
@@ -102,7 +102,7 @@ USING (equi_column1, ... equi_columnN, asof_column)
 -   При использовании обычного `JOIN` , запрос отправляется на удалённые серверы. На каждом из них выполняются подзапросы для формирования «правой» таблицы, и с этой таблицей выполняется соединение. То есть, «правая» таблица формируется на каждом сервере отдельно.
 -   При использовании `GLOBAL ... JOIN`, сначала сервер-инициатор запроса запускает подзапрос для вычисления правой таблицы. Эта временная таблица передаётся на каждый удалённый сервер, и на них выполняются запросы с использованием переданных временных данных.
 
-Будьте аккуратны при использовании `GLOBAL`. За дополнительной информацией обращайтесь в раздел [Распределенные подзапросы](#select-distributed-subqueries).
+Будьте аккуратны при использовании `GLOBAL`. За дополнительной информацией обращайтесь в раздел [Распределенные подзапросы](../../../sql-reference/operators/in.md#select-distributed-subqueries).
 
 ## Рекомендации по использованию {#usage-recommendations}
 
diff --git a/docs/ru/sql-reference/statements/select/order-by.md b/docs/ru/sql-reference/statements/select/order-by.md
index f8b838cbd15..9ddec923701 100644
--- a/docs/ru/sql-reference/statements/select/order-by.md
+++ b/docs/ru/sql-reference/statements/select/order-by.md
@@ -473,4 +473,3 @@ SELECT * FROM test_fetch ORDER BY a OFFSET 3 ROW FETCH FIRST 3 ROWS WITH TIES;
 └───┴───┘
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/statements/select/order-by/) <!--hide-->
diff --git a/docs/ru/sql-reference/statements/select/union.md b/docs/ru/sql-reference/statements/select/union.md
index 8f1dc11c802..de8a9b0e4ea 100644
--- a/docs/ru/sql-reference/statements/select/union.md
+++ b/docs/ru/sql-reference/statements/select/union.md
@@ -78,4 +78,3 @@ SELECT 1 UNION SELECT 2 UNION SELECT 3 UNION SELECT 2;
 
 Запросы, которые являются частью `UNION/UNION ALL/UNION DISTINCT`, выполняются параллельно, и их результаты могут быть смешаны вместе.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/statements/select/union/) <!-- hide -->
diff --git a/docs/ru/sql-reference/statements/select/with.md b/docs/ru/sql-reference/statements/select/with.md
index 328b28c27ef..7e09d94770a 100644
--- a/docs/ru/sql-reference/statements/select/with.md
+++ b/docs/ru/sql-reference/statements/select/with.md
@@ -67,4 +67,3 @@ WITH test1 AS (SELECT i + 1, j + 1 FROM test1)
 SELECT * FROM test1;
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/sql-reference/statements/select/with/) <!--hide-->
diff --git a/docs/ru/sql-reference/statements/set-role.md b/docs/ru/sql-reference/statements/set-role.md
index ccbef41aa9b..b21a9ec8319 100644
--- a/docs/ru/sql-reference/statements/set-role.md
+++ b/docs/ru/sql-reference/statements/set-role.md
@@ -54,4 +54,3 @@ SET DEFAULT ROLE ALL EXCEPT role1, role2 TO user
 ```
 
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/statements/set-role/) <!--hide-->
\ No newline at end of file
diff --git a/docs/ru/sql-reference/statements/set.md b/docs/ru/sql-reference/statements/set.md
index b60dfcf8324..fa96c3c2a1b 100644
--- a/docs/ru/sql-reference/statements/set.md
+++ b/docs/ru/sql-reference/statements/set.md
@@ -19,4 +19,3 @@ SET profile = 'profile-name-from-the-settings-file'
 
 Подробности смотрите в разделе [Настройки](../../operations/settings/settings.md).
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/statements/set/) <!--hide-->
\ No newline at end of file
diff --git a/docs/ru/sql-reference/statements/show.md b/docs/ru/sql-reference/statements/show.md
index 56528f28c65..6d39bab4990 100644
--- a/docs/ru/sql-reference/statements/show.md
+++ b/docs/ru/sql-reference/statements/show.md
@@ -362,4 +362,68 @@ SHOW [CURRENT] QUOTA
 SHOW ACCESS
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/show/) <!--hide-->
+## SHOW SETTINGS {#show-settings}
+
+Возвращает список системных настроек и их значений. Использует данные из таблицы [system.settings](../../operations/system-tables/settings.md).
+
+**Синтаксис**
+
+```sql
+SHOW [CHANGED] SETTINGS LIKE|ILIKE <name>
+```
+
+**Секции**
+
+При использовании `LIKE|ILIKE` можно задавать шаблон для имени настройки. Этот шаблон может содержать символы подстановки, такие как `%` или `_`. При использовании `LIKE` шаблон чувствителен к регистру, а при использовании `ILIKE` — не чувствителен.
+
+Если используется `CHANGED`, запрос вернет только те настройки, значения которых были изменены, т.е. отличны от значений по умолчанию.
+
+**Примеры**
+
+Запрос с использованием `LIKE`:
+
+```sql
+SHOW SETTINGS LIKE 'send_timeout';
+```
+Результат:
+
+```text
+┌─name─────────┬─type────┬─value─┐
+│ send_timeout │ Seconds │ 300   │
+└──────────────┴─────────┴───────┘
+```
+
+Запрос с использованием `ILIKE`:
+
+```sql
+SHOW SETTINGS ILIKE '%CONNECT_timeout%'
+```
+
+Результат:
+
+```text
+┌─name────────────────────────────────────┬─type─────────┬─value─┐
+│ connect_timeout                         │ Seconds      │ 10    │
+│ connect_timeout_with_failover_ms        │ Milliseconds │ 50    │
+│ connect_timeout_with_failover_secure_ms │ Milliseconds │ 100   │
+└─────────────────────────────────────────┴──────────────┴───────┘
+```
+
+Запрос с использованием `CHANGED`:
+
+```sql
+SHOW CHANGED SETTINGS ILIKE '%MEMORY%'
+```
+
+Результат:
+
+```text
+┌─name─────────────┬─type───┬─value───────┐
+│ max_memory_usage │ UInt64 │ 10000000000 │
+└──────────────────┴────────┴─────────────┘
+```
+
+**См. также**
+
+-   Таблица [system.settings](../../operations/system-tables/settings.md)
+
diff --git a/docs/ru/sql-reference/statements/system.md b/docs/ru/sql-reference/statements/system.md
index a6a6c5047af..ab68033d4f3 100644
--- a/docs/ru/sql-reference/statements/system.md
+++ b/docs/ru/sql-reference/statements/system.md
@@ -265,4 +265,3 @@ SYSTEM RESTART REPLICA [db.]replicated_merge_tree_family_table_name
 ### RESTART REPLICAS {#query_language-system-restart-replicas}
 Реинициализация состояния Zookeeper сессий для всех `ReplicatedMergeTree` таблиц, сравнивает текущее состояние с тем что хранится в Zookeeper как источник правды и добавляет задачи Zookeeper очередь если необходимо
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/system/) <!--hide-->
diff --git a/docs/ru/sql-reference/statements/truncate.md b/docs/ru/sql-reference/statements/truncate.md
index 4909d349658..b23d96d5b08 100644
--- a/docs/ru/sql-reference/statements/truncate.md
+++ b/docs/ru/sql-reference/statements/truncate.md
@@ -14,4 +14,3 @@ TRUNCATE TABLE [IF EXISTS] [db.]name [ON CLUSTER cluster]
 Запрос `TRUNCATE` не поддерживается для следующих движков: [View](../../engines/table-engines/special/view.md), [File](../../engines/table-engines/special/file.md), [URL](../../engines/table-engines/special/url.md) и [Null](../../engines/table-engines/special/null.md).
 
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/statements/truncate/) <!--hide-->
\ No newline at end of file
diff --git a/docs/ru/sql-reference/statements/use.md b/docs/ru/sql-reference/statements/use.md
index c84329ea5ff..0d40870c23a 100644
--- a/docs/ru/sql-reference/statements/use.md
+++ b/docs/ru/sql-reference/statements/use.md
@@ -13,4 +13,3 @@ USE db
 Текущая база данных используется для поиска таблиц, если база данных не указана в запросе явно через точку перед именем таблицы.
 При использовании HTTP протокола запрос не может быть выполнен, так как понятия сессии не существует.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/statements/use/) <!--hide-->
\ No newline at end of file
diff --git a/docs/ru/sql-reference/statements/watch.md b/docs/ru/sql-reference/statements/watch.md
new file mode 100644
index 00000000000..ef5b2f80584
--- /dev/null
+++ b/docs/ru/sql-reference/statements/watch.md
@@ -0,0 +1,106 @@
+---
+toc_priority: 53
+toc_title: WATCH
+---
+
+# Запрос WATCH {#watch}
+
+!!! important "Важно"
+    Это экспериментальная функция. Она может повлечь потерю совместимости в будущих версиях.
+    Чтобы использовать `LIVE VIEW` и запросы `WATCH`, включите настройку `set allow_experimental_live_view = 1`. 
+
+**Синтаксис**
+
+``` sql
+WATCH [db.]live_view [EVENTS] [LIMIT n] [FORMAT format]
+```
+
+Запрос `WATCH` постоянно возвращает содержимое [LIVE-представления](./create/view.md#live-view). Если параметр `LIMIT` не был задан, запрос `WATCH` будет непрерывно обновлять содержимое [LIVE-представления](./create/view.md#live-view).
+
+```sql
+WATCH [db.]live_view;
+```
+## Виртуальные столбцы {#watch-virtual-columns}
+
+Виртуальный столбец `_version` в результате запроса обозначает версию данного результата.
+
+**Пример:**
+
+```sql
+CREATE LIVE VIEW lv WITH REFRESH 5 AS SELECT now();
+WATCH lv;
+```
+
+```bash
+┌───────────────now()─┬─_version─┐
+│ 2021-02-21 09:17:21 │        1 │
+└─────────────────────┴──────────┘
+┌───────────────now()─┬─_version─┐
+│ 2021-02-21 09:17:26 │        2 │
+└─────────────────────┴──────────┘
+┌───────────────now()─┬─_version─┐
+│ 2021-02-21 09:17:31 │        3 │
+└─────────────────────┴──────────┘
+...
+```
+
+По умолчанию запрашиваемые данные возвращаются клиенту, однако в сочетании с запросом [INSERT INTO](../../sql-reference/statements/insert-into.md) они могут быть перенаправлены для вставки в другую таблицу.
+
+**Пример:**
+
+```sql
+INSERT INTO [db.]table WATCH [db.]live_view ...
+```
+
+## Секция EVENTS {#events-clause}
+
+С помощью параметра `EVENTS` можно получить компактную форму результата запроса `WATCH`. Вместо полного результата вы получаете номер последней версии результата.
+
+```sql
+WATCH [db.]live_view EVENTS;
+```
+
+**Пример:**
+
+```sql
+CREATE LIVE VIEW lv WITH REFRESH 5 AS SELECT now();
+WATCH lv EVENTS;
+```
+
+```bash
+┌─version─┐
+│       1 │
+└─────────┘
+┌─version─┐
+│       2 │
+└─────────┘
+...
+```
+
+## Секция LIMIT {#limit-clause}
+
+Параметр `LIMIT n` задает количество обновлений запроса `WATCH`, после которого отслеживание прекращается. По умолчанию это число не задано, поэтому запрос будет выполняться постоянно. Значение `LIMIT 0` означает, что запрос `WATCH` вернет единственный актуальный результат запроса и прекратит отслеживание.
+
+```sql
+WATCH [db.]live_view LIMIT 1;
+```
+
+**Пример:**
+
+```sql
+CREATE LIVE VIEW lv WITH REFRESH 5 AS SELECT now();
+WATCH lv EVENTS LIMIT 1;
+```
+
+```bash
+┌─version─┐
+│       1 │
+└─────────┘
+```
+
+## Секция FORMAT {#format-clause}
+
+Параметр `FORMAT` работает аналогично одноименному параметру запроса [SELECT](../../sql-reference/statements/select/format.md#format-clause).
+
+!!! info "Примечание"
+    При отслеживании [LIVE VIEW](./create/view.md#live-view) через интерфейс HTTP следует использовать формат [JSONEachRowWithProgress](../../interfaces/formats.md#jsoneachrowwithprogress). Постоянные сообщения об изменениях будут добавлены в поток вывода для поддержания активности долговременного HTTP-соединения до тех пор, пока результат запроса изменяется. Проомежуток времени между сообщениями об изменениях управляется настройкой[live_view_heartbeat_interval](./create/view.md#live-view-settings).
diff --git a/docs/ru/sql-reference/syntax.md b/docs/ru/sql-reference/syntax.md
index ca73d3a137e..6a923fd6b58 100644
--- a/docs/ru/sql-reference/syntax.md
+++ b/docs/ru/sql-reference/syntax.md
@@ -1,6 +1,6 @@
 ---
 toc_priority: 31
-toc_title: "\u0421\u0438\u043d\u0442\u0430\u043a\u0441\u0438\u0441"
+toc_title: "Синтаксис"
 ---
 
 # Синтаксис {#sintaksis}
@@ -181,4 +181,3 @@ Code: 184. DB::Exception: Received from localhost:9000, 127.0.0.1. DB::Exception
 Список выражений - одно выражение или несколько выражений через запятую.
 Функции и операторы, в свою очередь, в качестве аргументов, могут иметь произвольные выражения.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/syntax/) <!--hide-->
diff --git a/docs/ru/sql-reference/table-functions/file.md b/docs/ru/sql-reference/table-functions/file.md
index d3e6e106125..1d8604528be 100644
--- a/docs/ru/sql-reference/table-functions/file.md
+++ b/docs/ru/sql-reference/table-functions/file.md
@@ -5,23 +5,27 @@ toc_title: file
 
 # file {#file}
 
-Создаёт таблицу из файла. Данная табличная функция похожа на табличные функции [file](file.md) и [hdfs](hdfs.md).
+Создаёт таблицу из файла. Данная табличная функция похожа на табличные функции [url](../../sql-reference/table-functions/url.md) и [hdfs](../../sql-reference/table-functions/hdfs.md).
+
+Функция `file` может использоваться в запросах `SELECT` и `INSERT` при работе с движком таблиц [File](../../engines/table-engines/special/file.md).
+
+**Синтаксис**
 
 ``` sql
 file(path, format, structure)
 ```
 
-**Входные параметры**
+**Параметры**
 
--   `path` — относительный путь до файла от [user_files_path](../../sql-reference/table-functions/file.md#server_configuration_parameters-user_files_path). Путь к файлу поддерживает следующие шаблоны в режиме доступа только для чтения `*`, `?`, `{abc,def}` и `{N..M}`, где `N`, `M` — числа, \``'abc', 'def'` — строки.
+-   `path` — относительный путь до файла от [user_files_path](../../sql-reference/table-functions/file.md#server_configuration_parameters-user_files_path). Путь к файлу поддерживает следующие шаблоны в режиме доступа только для чтения `*`, `?`, `{abc,def}` и `{N..M}`, где `N`, `M` — числа, `'abc', 'def'` — строки.
 -   `format` — [формат](../../interfaces/formats.md#formats) файла.
--   `structure` — структура таблицы. Формат `'colunmn1_name column1_ype, column2_name column2_type, ...'`.
+-   `structure` — структура таблицы. Формат: `'colunmn1_name column1_ype, column2_name column2_type, ...'`.
 
 **Возвращаемое значение**
 
 Таблица с указанной структурой, предназначенная для чтения или записи данных в указанном файле.
 
-**Пример**
+**Примеры**
 
 Настройка `user_files_path` и содержимое файла `test.csv`:
 
@@ -35,12 +39,10 @@ $ cat /var/lib/clickhouse/user_files/test.csv
     78,43,45
 ```
 
-Таблица из `test.csv` и выборка первых двух строк из неё:
+Получение данных из таблицы в файле `test.csv` и выборка первых двух строк из неё:
 
 ``` sql
-SELECT *
-FROM file('test.csv', 'CSV', 'column1 UInt32, column2 UInt32, column3 UInt32')
-LIMIT 2
+SELECT * FROM file('test.csv', 'CSV', 'column1 UInt32, column2 UInt32, column3 UInt32') LIMIT 2;
 ```
 
 ``` text
@@ -50,45 +52,61 @@ LIMIT 2
 └─────────┴─────────┴─────────┘
 ```
 
-Шаблоны могут содержаться в нескольких компонентах пути. Обрабатываются только существующие файлы, название которых целиком удовлетворяет шаблону (не только суффиксом или префиксом).
+Получение первых 10 строк таблицы, содержащей 3 столбца типа [UInt32](../../sql-reference/data-types/int-uint.md), из CSV-файла:
 
--   `*` — Заменяет любое количество любых символов кроме `/`, включая отсутствие символов.
--   `?` — Заменяет ровно один любой символ.
--   `{some_string,another_string,yet_another_one}` — Заменяет любую из строк `'some_string', 'another_string', 'yet_another_one'`.
--   `{N..M}` — Заменяет любое число в интервале от `N` до `M` включительно (может содержать ведущие нули).
+``` sql
+SELECT * FROM file('test.csv', 'CSV', 'column1 UInt32, column2 UInt32, column3 UInt32') LIMIT 10;
+```
+
+Вставка данных из файла в таблицу:
+
+``` sql
+INSERT INTO FUNCTION file('test.csv', 'CSV', 'column1 UInt32, column2 UInt32, column3 UInt32') VALUES (1, 2, 3), (3, 2, 1);
+SELECT * FROM file('test.csv', 'CSV', 'column1 UInt32, column2 UInt32, column3 UInt32');
+```
+
+``` text
+┌─column1─┬─column2─┬─column3─┐
+│       1 │       2 │       3 │
+│       3 │       2 │       1 │
+└─────────┴─────────┴─────────┘
+```
+
+## Шаблоны поиска в компонентах пути {#globs-in-path}
+
+При описании пути к файлу могут использоваться шаблоны поиска. Обрабатываются только те файлы, у которых путь и название соответствуют шаблону полностью (а не только префикс или суффикс).
+
+-   `*` — заменяет любое количество любых символов кроме `/`, включая отсутствие символов.
+-   `?` — заменяет ровно один любой символ.
+-   `{some_string,another_string,yet_another_one}` — заменяет любую из строк `'some_string', 'another_string', 'yet_another_one'`.
+-   `{N..M}` — заменяет любое число в интервале от `N` до `M` включительно (может содержать ведущие нули).
 
 Конструкция с `{}` аналогична табличной функции [remote](remote.md).
 
 **Пример**
 
-1.  Предположим у нас есть несколько файлов со следующими относительными путями:
+Предположим, у нас есть несколько файлов со следующими относительными путями:
 
--   ‘some_dir/some_file_1’
--   ‘some_dir/some_file_2’
--   ‘some_dir/some_file_3’
--   ‘another_dir/some_file_1’
--   ‘another_dir/some_file_2’
--   ‘another_dir/some_file_3’
+-   'some_dir/some_file_1'
+-   'some_dir/some_file_2'
+-   'some_dir/some_file_3'
+-   'another_dir/some_file_1'
+-   'another_dir/some_file_2'
+-   'another_dir/some_file_3'
 
-1.  Запросим количество строк в этих файлах:
-
-<!-- -->
+Запросим количество строк в этих файлах:
 
 ``` sql
-SELECT count(*)
-FROM file('{some,another}_dir/some_file_{1..3}', 'TSV', 'name String, value UInt32')
+SELECT count(*) FROM file('{some,another}_dir/some_file_{1..3}', 'TSV', 'name String, value UInt32');
 ```
 
-1.  Запросим количество строк во всех файлах этих двух директорий:
-
-<!-- -->
+Запросим количество строк во всех файлах этих двух директорий:
 
 ``` sql
-SELECT count(*)
-FROM file('{some,another}_dir/*', 'TSV', 'name String, value UInt32')
+SELECT count(*) FROM file('{some,another}_dir/*', 'TSV', 'name String, value UInt32');
 ```
 
-!!! warning "Warning"
+!!! warning "Предупреждение"
     Если ваш список файлов содержит интервал с ведущими нулями, используйте конструкцию с фигурными скобками для каждой цифры по отдельности или используйте `?`.
 
 **Пример**
@@ -96,17 +114,15 @@ FROM file('{some,another}_dir/*', 'TSV', 'name String, value UInt32')
 Запрос данных из файлов с именами `file000`, `file001`, … , `file999`:
 
 ``` sql
-SELECT count(*)
-FROM file('big_dir/file{0..9}{0..9}{0..9}', 'CSV', 'name String, value UInt32')
+SELECT count(*) FROM file('big_dir/file{0..9}{0..9}{0..9}', 'CSV', 'name String, value UInt32');
 ```
 
 ## Виртуальные столбцы {#virtualnye-stolbtsy}
 
--   `_path` — Путь к файлу.
--   `_file` — Имя файла.
+-   `_path` — путь к файлу.
+-   `_file` — имя файла.
 
 **Смотрите также**
 
 -   [Виртуальные столбцы](index.md#table_engines-virtual_columns)
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/table_functions/file/) <!--hide-->
diff --git a/docs/ru/sql-reference/table-functions/generate.md b/docs/ru/sql-reference/table-functions/generate.md
index 47b7e43bc86..6dd88b622fc 100644
--- a/docs/ru/sql-reference/table-functions/generate.md
+++ b/docs/ru/sql-reference/table-functions/generate.md
@@ -10,10 +10,11 @@ toc_title: generateRandom
 Поддерживает все типы данных, которые могут храниться в таблице, за исключением `LowCardinality` и `AggregateFunction`.
 
 ``` sql
-generateRandom('name TypeName[, name TypeName]...', [, 'random_seed'[, 'max_string_length'[, 'max_array_length']]]);
+generateRandom('name TypeName[, name TypeName]...', [, 'random_seed'[, 'max_string_length'[, 'max_array_length']]])
 ```
 
-**Входные параметры**
+**Аргументы**
+
 - `name` — название соответствующего столбца.
 - `TypeName` — тип соответствующего столбца.
 - `max_array_length` — максимальная длина массива для всех сгенерированных массивов. По умолчанию `10`.
@@ -38,4 +39,3 @@ SELECT * FROM generateRandom('a Array(Int8), d Decimal32(4), c Tuple(DateTime64(
 └──────────┴──────────────┴────────────────────────────────────────────────────────────────────┘
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/table_functions/generate/) <!--hide-->
diff --git a/docs/ru/sql-reference/table-functions/hdfs.md b/docs/ru/sql-reference/table-functions/hdfs.md
index 6edd70b7b1b..56aaeae487c 100644
--- a/docs/ru/sql-reference/table-functions/hdfs.md
+++ b/docs/ru/sql-reference/table-functions/hdfs.md
@@ -61,4 +61,3 @@ LIMIT 2
 
 -   [Виртуальные столбцы](index.md#table_engines-virtual_columns)
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/table_functions/hdfs/) <!--hide-->
diff --git a/docs/ru/sql-reference/table-functions/index.md b/docs/ru/sql-reference/table-functions/index.md
index 83225d54e60..fcd428df5d1 100644
--- a/docs/ru/sql-reference/table-functions/index.md
+++ b/docs/ru/sql-reference/table-functions/index.md
@@ -1,8 +1,7 @@
 ---
-toc_folder_title: "\u0422\u0430\u0431\u043B\u0438\u0447\u043D\u044B\u0435 \u0444\u0443\
-  \u043D\u043A\u0446\u0438\u0438"
+toc_folder_title: "Табличные функции"
 toc_priority: 34
-toc_title: "\u0412\u0432\u0435\u0434\u0435\u043D\u0438\u0435"
+toc_title: "Введение"
 ---
 
 # Табличные функции {#table-functions}
@@ -33,5 +32,6 @@ toc_title: "\u0412\u0432\u0435\u0434\u0435\u043D\u0438\u0435"
 | [jdbc](jdbc.md)       | Создаёт таблицу с дижком [JDBC](../../engines/table-engines/integrations/jdbc.md).                                                        |
 | [odbc](odbc.md)       | Создаёт таблицу с движком [ODBC](../../engines/table-engines/integrations/odbc.md).                                                       |
 | [hdfs](hdfs.md)       | Создаёт таблицу с движком [HDFS](../../engines/table-engines/integrations/hdfs.md).                                                       |
+| [s3](s3.md)           | Создаёт таблицу с движком [S3](../../engines/table-engines/integrations/s3.md).                                                       |
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/table_functions/) <!--hide-->
+[Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/table-functions/) <!--hide-->
diff --git a/docs/ru/sql-reference/table-functions/input.md b/docs/ru/sql-reference/table-functions/input.md
index 96cf7515d52..0f5f621a247 100644
--- a/docs/ru/sql-reference/table-functions/input.md
+++ b/docs/ru/sql-reference/table-functions/input.md
@@ -43,4 +43,3 @@ $ cat data.csv | clickhouse-client --query="INSERT INTO test FORMAT CSV"
 $ cat data.csv | clickhouse-client --query="INSERT INTO test SELECT * FROM input('test_structure') FORMAT CSV"
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/table_functions/input/) <!--hide-->
diff --git a/docs/ru/sql-reference/table-functions/jdbc.md b/docs/ru/sql-reference/table-functions/jdbc.md
index d388262606f..4fc237f940d 100644
--- a/docs/ru/sql-reference/table-functions/jdbc.md
+++ b/docs/ru/sql-reference/table-functions/jdbc.md
@@ -24,4 +24,3 @@ SELECT * FROM jdbc('mysql://localhost:3306/?user=root&password=root', 'schema',
 SELECT * FROM jdbc('datasource://mysql-local', 'schema', 'table')
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/table_functions/jdbc/) <!--hide-->
diff --git a/docs/ru/sql-reference/table-functions/merge.md b/docs/ru/sql-reference/table-functions/merge.md
index 0822fdfe535..5b33f458468 100644
--- a/docs/ru/sql-reference/table-functions/merge.md
+++ b/docs/ru/sql-reference/table-functions/merge.md
@@ -9,4 +9,3 @@ toc_title: merge
 
 Структура таблицы берётся из первой попавшейся таблицы, подходящей под регулярное выражение.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/table_functions/merge/) <!--hide-->
diff --git a/docs/ru/sql-reference/table-functions/mysql.md b/docs/ru/sql-reference/table-functions/mysql.md
index 21841eee67a..665f1058ba2 100644
--- a/docs/ru/sql-reference/table-functions/mysql.md
+++ b/docs/ru/sql-reference/table-functions/mysql.md
@@ -5,13 +5,15 @@ toc_title: mysql
 
 # mysql {#mysql}
 
-Позволяет выполнять запросы `SELECT` над данными, хранящимися на удалённом MySQL сервере.
+Позволяет выполнять запросы `SELECT` и `INSERT` над данными, хранящимися на удалённом MySQL сервере.
+
+**Синтаксис**
 
 ``` sql
-mysql('host:port', 'database', 'table', 'user', 'password'[, replace_query, 'on_duplicate_clause']);
+mysql('host:port', 'database', 'table', 'user', 'password'[, replace_query, 'on_duplicate_clause'])
 ```
 
-**Параметры**
+**Аргументы**
 
 -   `host:port` — адрес сервера MySQL.
 
@@ -23,13 +25,14 @@ mysql('host:port', 'database', 'table', 'user', 'password'[, replace_query, 'on_
 
 -   `password` — пароль пользователя.
 
--   `replace_query` — флаг, отвечающий за преобразование запросов `INSERT INTO` в `REPLACE INTO`. Если `replace_query=1`, то запрос заменяется.
+-   `replace_query` — флаг, отвечающий за преобразование запросов `INSERT INTO` в `REPLACE INTO`. Возможные значения:
+    - `0` - выполняется запрос `INSERT INTO`.
+    - `1` - выполняется запрос `REPLACE INTO`.
 
--   `on_duplicate_clause` — выражение `ON DUPLICATE KEY on_duplicate_clause`, добавляемое в запрос `INSERT`.
+-   `on_duplicate_clause` — выражение `ON DUPLICATE KEY on_duplicate_clause`, добавляемое в запрос `INSERT`. Может быть передано только с помощью  `replace_query = 0` (если вы одновременно передадите `replace_query = 1` и `on_duplicate_clause`, будет сгенерировано исключение). 
 
-        Пример: `INSERT INTO t (c1,c2) VALUES ('a', 2) ON DUPLICATE KEY UPDATE c2 = c2 + 1`, где `on_duplicate_clause` это `UPDATE c2 = c2 + 1`. Чтобы узнать какие `on_duplicate_clause` можно использовать с секцией `ON DUPLICATE KEY`  обратитесь к документации MySQL.
-
-        Чтобы указать `'on_duplicate_clause'` необходимо передать `0` в параметр `replace_query`. Если одновременно передать `replace_query = 1` и `'on_duplicate_clause'`, то ClickHouse сгенерирует исключение.
+        Пример: `INSERT INTO t (c1,c2) VALUES ('a', 2) ON DUPLICATE KEY UPDATE c2 = c2 + 1`, где `on_duplicate_clause` это `UPDATE c2 = c2 + 1`. 
+        Выражения, которые могут использоваться в качестве `on_duplicate_clause` в секции `ON DUPLICATE KEY`, можно посмотреть в документации по [MySQL](http://www.mysql.ru/docs/).
 
 Простые условия `WHERE` такие как `=, !=, >, >=, <, =` выполняются на стороне сервера MySQL.
 
@@ -39,46 +42,58 @@ mysql('host:port', 'database', 'table', 'user', 'password'[, replace_query, 'on_
 
 Объект таблицы с теми же столбцами, что и в исходной таблице MySQL.
 
-## Пример использования {#primer-ispolzovaniia}
+!!! note "Примечание"
+    Чтобы отличить табличную функцию `mysql (...)` в запросе `INSERT` от имени таблицы со списком столбцов, используйте ключевые слова `FUNCTION` или `TABLE FUNCTION`. См. примеры ниже.
+
+**Примеры**
 
 Таблица в MySQL:
 
 ``` text
 mysql> CREATE TABLE `test`.`test` (
     ->   `int_id` INT NOT NULL AUTO_INCREMENT,
-    ->   `int_nullable` INT NULL DEFAULT NULL,
     ->   `float` FLOAT NOT NULL,
-    ->   `float_nullable` FLOAT NULL DEFAULT NULL,
     ->   PRIMARY KEY (`int_id`));
-Query OK, 0 rows affected (0,09 sec)
 
-mysql> insert into test (`int_id`, `float`) VALUES (1,2);
-Query OK, 1 row affected (0,00 sec)
+mysql> INSERT INTO test (`int_id`, `float`) VALUES (1,2);
 
-mysql> select * from test;
-+--------+--------------+-------+----------------+
-| int_id | int_nullable | float | float_nullable |
-+--------+--------------+-------+----------------+
-|      1 |         NULL |     2 |           NULL |
-+--------+--------------+-------+----------------+
-1 row in set (0,00 sec)
+mysql> SELECT * FROM test;
++--------+-------+
+| int_id | float |
++--------+-------+
+|      1 |     2 |
++--------+-------+
 ```
 
 Получение данных в ClickHouse:
 
 ``` sql
-SELECT * FROM mysql('localhost:3306', 'test', 'test', 'bayonet', '123')
+SELECT * FROM mysql('localhost:3306', 'test', 'test', 'bayonet', '123');
 ```
 
 ``` text
-┌─int_id─┬─int_nullable─┬─float─┬─float_nullable─┐
-│      1 │         ᴺᵁᴸᴸ │     2 │           ᴺᵁᴸᴸ │
-└────────┴──────────────┴───────┴────────────────┘
+┌─int_id─┬─float─┐
+│      1 │     2 │
+└────────┴───────┘
 ```
 
-## Смотрите также {#smotrite-takzhe}
+Замена и вставка:
+
+```sql
+INSERT INTO FUNCTION mysql('localhost:3306', 'test', 'test', 'bayonet', '123', 1) (int_id, float) VALUES (1, 3);
+INSERT INTO TABLE FUNCTION mysql('localhost:3306', 'test', 'test', 'bayonet', '123', 0, 'UPDATE int_id = int_id + 1') (int_id, float) VALUES (1, 4);
+SELECT * FROM mysql('localhost:3306', 'test', 'test', 'bayonet', '123');
+```
+
+``` text
+┌─int_id─┬─float─┐
+│      1 │     3 │
+│      2 │     4 │
+└────────┴───────┘
+```
+
+**Смотрите также** 
 
 -   [Движок таблиц ‘MySQL’](../../sql-reference/table-functions/mysql.md)
 -   [Использование MySQL как источника данных для внешнего словаря](../../sql-reference/table-functions/mysql.md#dicts-external_dicts_dict_sources-mysql)
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/table_functions/mysql/) <!--hide-->
diff --git a/docs/ru/sql-reference/table-functions/numbers.md b/docs/ru/sql-reference/table-functions/numbers.md
index 005f400e082..71f63078415 100644
--- a/docs/ru/sql-reference/table-functions/numbers.md
+++ b/docs/ru/sql-reference/table-functions/numbers.md
@@ -25,4 +25,3 @@ SELECT * FROM system.numbers LIMIT 10;
 select toDate('2010-01-01') + number as d FROM numbers(365);
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/table_functions/numbers/) <!--hide-->
diff --git a/docs/ru/sql-reference/table-functions/odbc.md b/docs/ru/sql-reference/table-functions/odbc.md
index 19203123840..557e7d2a15b 100644
--- a/docs/ru/sql-reference/table-functions/odbc.md
+++ b/docs/ru/sql-reference/table-functions/odbc.md
@@ -103,4 +103,3 @@ SELECT * FROM odbc('DSN=mysqlconn', 'test', 'test')
 -   [Внешние словари ODBC](../../sql-reference/table-functions/odbc.md#dicts-external_dicts_dict_sources-odbc)
 -   [Движок таблиц ODBC](../../sql-reference/table-functions/odbc.md).
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/table_functions/jdbc/) <!--hide-->
diff --git a/docs/ru/sql-reference/table-functions/postgresql.md b/docs/ru/sql-reference/table-functions/postgresql.md
new file mode 100644
index 00000000000..2d8afe28f1e
--- /dev/null
+++ b/docs/ru/sql-reference/table-functions/postgresql.md
@@ -0,0 +1,120 @@
+---
+toc_priority: 42
+toc_title: postgresql
+---
+
+# postgresql {#postgresql}
+
+Позволяет выполнять запросы `SELECT` и `INSERT` над таблицами удаленной БД PostgreSQL.
+
+**Синтаксис**
+
+``` sql
+postgresql('host:port', 'database', 'table', 'user', 'password'[, `schema`])
+```
+
+**Аргументы**
+
+-   `host:port` — адрес сервера PostgreSQL.
+-   `database` — имя базы данных на удалённом сервере.
+-   `table` — имя таблицы на удалённом сервере.
+-   `user` — пользователь PostgreSQL.
+-   `password` — пароль пользователя.
+-   `schema` — имя схемы, если не используется схема по умолчанию. Необязательный аргумент. 
+
+**Возвращаемое значение**
+
+Таблица с теми же столбцами, что и в исходной таблице PostgreSQL.
+
+!!! info "Примечание"
+    В запросах `INSERT` для того чтобы отличить табличную функцию `postgresql(...)` от таблицы со списком имен столбцов вы должны указывать ключевые слова `FUNCTION` или `TABLE FUNCTION`. См. примеры ниже.
+
+## Особенности реализации {#implementation-details}
+
+Запросы `SELECT` на стороне PostgreSQL выполняются как `COPY (SELECT ...) TO STDOUT` внутри транзакции PostgreSQL только на чтение  с коммитом после каждого запроса `SELECT`.
+
+Простые условия для `WHERE` такие как `=`, `!=`, `>`, `>=`, `<`, `<=` и `IN` исполняются на стороне PostgreSQL сервера.
+
+Все операции объединения, аггрегации, сортировки, условия `IN [ array ]` и ограничения `LIMIT` выполняются на стороне ClickHouse только после того как запрос к PostgreSQL закончился.
+
+Запросы `INSERT` на стороне PostgreSQL выполняются как `COPY "table_name" (field1, field2, ... fieldN) FROM STDIN` внутри PostgreSQL транзакции с автоматическим коммитом после каждого запроса `INSERT`.
+
+PostgreSQL массивы конвертируются в массивы ClickHouse.
+
+!!! info "Примечание"
+    Будьте внимательны, в PostgreSQL массивы, созданные как `type_name[]`, являются многомерными и могут содержать в себе разное количество измерений в разных строках одной таблицы. Внутри ClickHouse допустипы только многомерные массивы с одинаковым кол-вом измерений во всех строках таблицы.
+
+При использовании словаря PostgreSQL поддерживается приоритет реплик. Чем больше номер реплики, тем ниже ее приоритет. Наивысший приоритет у реплики с номером `0`.    
+
+**Примеры**
+
+Таблица в PostgreSQL:
+
+``` text
+postgres=# CREATE TABLE "public"."test" (
+"int_id" SERIAL,
+"int_nullable" INT NULL DEFAULT NULL,
+"float" FLOAT NOT NULL,
+"str" VARCHAR(100) NOT NULL DEFAULT '',
+"float_nullable" FLOAT NULL DEFAULT NULL,
+PRIMARY KEY (int_id));
+
+CREATE TABLE
+
+postgres=# INSERT INTO test (int_id, str, "float") VALUES (1,'test',2);
+INSERT 0 1
+
+postgresql> SELECT * FROM test;
+  int_id | int_nullable | float | str  | float_nullable
+ --------+--------------+-------+------+----------------
+       1 |              |     2 | test |
+ (1 row)
+```
+
+Получение данных в ClickHouse:
+
+```sql
+SELECT * FROM postgresql('localhost:5432', 'test', 'test', 'postgresql_user', 'password') WHERE str IN ('test'); 
+```
+
+``` text
+┌─int_id─┬─int_nullable─┬─float─┬─str──┬─float_nullable─┐
+│      1 │         ᴺᵁᴸᴸ │     2 │ test │           ᴺᵁᴸᴸ │
+└────────┴──────────────┴───────┴──────┴────────────────┘
+```
+
+Вставка данных:
+
+```sql
+INSERT INTO TABLE FUNCTION postgresql('localhost:5432', 'test', 'test', 'postgrsql_user', 'password') (int_id, float) VALUES (2, 3);
+SELECT * FROM postgresql('localhost:5432', 'test', 'test', 'postgresql_user', 'password');
+```
+
+``` text
+┌─int_id─┬─int_nullable─┬─float─┬─str──┬─float_nullable─┐
+│      1 │         ᴺᵁᴸᴸ │     2 │ test │           ᴺᵁᴸᴸ │
+│      2 │         ᴺᵁᴸᴸ │     3 │      │           ᴺᵁᴸᴸ │
+└────────┴──────────────┴───────┴──────┴────────────────┘
+```
+
+Using Non-default Schema:
+
+```text
+postgres=# CREATE SCHEMA "nice.schema";
+
+postgres=# CREATE TABLE "nice.schema"."nice.table" (a integer);
+
+postgres=# INSERT INTO "nice.schema"."nice.table" SELECT i FROM generate_series(0, 99) as t(i)
+```
+
+```sql
+CREATE TABLE pg_table_schema_with_dots (a UInt32)
+        ENGINE PostgreSQL('localhost:5432', 'clickhouse', 'nice.table', 'postgrsql_user', 'password', 'nice.schema');
+```
+
+**См. также**
+
+-   [Движок таблиц PostgreSQL](../../sql-reference/table-functions/postgresql.md)
+-   [Использование PostgreSQL как источника данных для внешнего словаря](../../sql-reference/table-functions/postgresql.md#dicts-external_dicts_dict_sources-postgresql)
+
+[Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/table-functions/postgresql/) <!--hide-->
diff --git a/docs/ru/sql-reference/table-functions/remote.md b/docs/ru/sql-reference/table-functions/remote.md
index 901317a805d..00179abb207 100644
--- a/docs/ru/sql-reference/table-functions/remote.md
+++ b/docs/ru/sql-reference/table-functions/remote.md
@@ -5,9 +5,11 @@ toc_title: remote
 
 # remote, remoteSecure {#remote-remotesecure}
 
-Позволяет обратиться к удалённым серверам без создания таблицы типа `Distributed`.
+Позволяет обратиться к удалённым серверам без создания таблицы типа [Distributed](../../engines/table-engines/special/distributed.md). Функция `remoteSecure` работает аналогично `remote`, но использует защищенное соединение.
 
-Сигнатуры:
+Обе функции могут использоваться в запросах `SELECT` и `INSERT`.
+
+**Синтаксис**
 
 ``` sql
 remote('addresses_expr', db, table[, 'user'[, 'password']])
@@ -16,12 +18,40 @@ remoteSecure('addresses_expr', db, table[, 'user'[, 'password']])
 remoteSecure('addresses_expr', db.table[, 'user'[, 'password']])
 ```
 
-`addresses_expr` - выражение, генерирующее адреса удалённых серверов. Это может быть просто один адрес сервера. Адрес сервера - это `хост:порт`, или только `хост`. Хост может быть указан в виде имени сервера, или в виде IPv4 или IPv6 адреса. IPv6 адрес указывается в квадратных скобках. Порт - TCP-порт удалённого сервера. Если порт не указан, используется `tcp_port` из конфигурационного файла сервера (по умолчанию - 9000).
+**Параметры**
+
+- `addresses_expr` — выражение, генерирующее адреса удалённых серверов. Это может быть просто один адрес сервера. Адрес сервера — это `host:port` или только `host`.
+
+    Вместо параметра `host` может быть указано имя сервера или его адрес в формате IPv4 или IPv6. IPv6 адрес указывается в квадратных скобках.
+	
+	`port` — TCP-порт удалённого сервера. Если порт не указан, используется [tcp_port](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-tcp_port) из конфигурационного файла сервера, к которому обратились через функцию `remote` (по умолчанию - 9000), и [tcp_port_secure](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-tcp_port_secure), к которому обратились через функцию `remoteSecure` (по умолчанию — 9440).
 
-!!! important "Важно"
     С IPv6-адресом обязательно нужно указывать порт.
 
-Примеры:
+    Тип: [String](../../sql-reference/data-types/string.md).
+
+- `db` — имя базы данных. Тип: [String](../../sql-reference/data-types/string.md).
+- `table` — имя таблицы. Тип: [String](../../sql-reference/data-types/string.md).
+- `user` — имя пользователя. Если пользователь не указан, то по умолчанию `default`. Тип: [String](../../sql-reference/data-types/string.md).
+- `password` — пароль. Если пароль не указан, то используется пустой пароль. Тип: [String](../../sql-reference/data-types/string.md).
+- `sharding_key` — ключ шардирования для поддержки распределения данных между узлами. Например: `insert into remote('127.0.0.1:9000,127.0.0.2', db, table, 'default', rand())`. Тип: [UInt32](../../sql-reference/data-types/int-uint.md).
+
+**Возвращаемое значение**
+
+Набор данных с удаленных серверов.
+
+**Использование**
+
+Использование табличной функции `remote` менее оптимально, чем создание таблицы типа `Distributed`, так как в этом случае соединения с серверами устанавливаются заново при каждом запросе. Если указываются имена серверов, то приходится также выполнять поиск сервера по имени. Кроме того, не ведётся сквозной подсчёт ошибок при работе с разными репликами. При обработке большого количества запросов всегда создавайте таблицу типа `Distributed`, использовать табличную функцию `remote` в таких случаях не рекомендуется.
+
+Табличная функция `remote` может быть полезна в следующих случаях:
+
+-   Обращение на конкретный сервер для сравнения данных, отладки и тестирования.
+-   Запросы между разными кластерами ClickHouse для исследований.
+-   Нечастые распределённые запросы, задаваемые вручную.
+-   Распределённые запросы, где набор серверов определяется каждый раз заново.
+
+**Адреса**
 
 ``` text
 example01-01-1
@@ -32,9 +62,7 @@ localhost
 [2a02:6b8:0:1111::11]:9000
 ```
 
-Адреса можно указать через запятую, в этом случае ClickHouse обработает запрос как распределённый, т.е. отправит его по всем указанным адресам как на шарды с разными данными.
-
-Пример:
+Адреса можно указать через запятую. В этом случае ClickHouse обработает запрос как распределённый, т.е. отправит его по всем указанным адресам как на шарды с разными данными. Пример:
 
 ``` text
 example01-01-1,example01-02-1
@@ -46,38 +74,35 @@ example01-01-1,example01-02-1
 example01-0{1,2}-1
 ```
 
-В фигурных скобках может быть указан диапазон (неотрицательных целых) чисел через две точки. В этом случае, диапазон раскрывается в множество значений, генерирующих адреса шардов. Если запись первого числа начинается с нуля, то значения формируются с таким же выравниванием нулями. Предыдущий пример может быть записан следующим образом:
+В фигурных скобках может быть указан диапазон (неотрицательных целых) чисел через две точки. В этом случае диапазон раскрывается в множество значений, генерирующих адреса шардов. Если запись первого числа начинается с нуля, то значения формируются с таким же выравниванием нулями. Предыдущий пример может быть записан следующим образом:
 
 ``` text
 example01-{01..02}-1
 ```
 
-При наличии нескольких пар фигурных скобок, генерируется прямое произведение соответствующих множеств.
+При наличии нескольких пар фигурных скобок генерируется прямое произведение соответствующих множеств.
 
-Адреса или их фрагменты в фигурных скобках можно указать через символ \|. В этом случае, соответствующие множества адресов понимаются как реплики - запрос будет отправлен на первую живую реплику. При этом, реплики перебираются в порядке, согласно текущей настройке [load_balancing](../../operations/settings/settings.md).
-
-Пример:
+Адреса или их фрагменты в фигурных скобках можно указать через символ \|. В этом случае соответствующие множества адресов понимаются как реплики — запрос будет отправлен на первую живую реплику. При этом реплики перебираются в порядке, согласно текущей настройке [load_balancing](../../operations/settings/settings.md#settings-load_balancing). В этом примере указаны два шарда, в каждом из которых имеются две реплики:
 
 ``` text
 example01-{01..02}-{1|2}
 ```
 
-В этом примере указано два шарда, в каждом из которых имеется две реплики.
+Количество генерируемых адресов ограничено константой. Сейчас это 1000 адресов.
 
-Количество генерируемых адресов ограничено константой - сейчас это 1000 штук.
+**Примеры**
 
-Использование табличной функции `remote` менее оптимально, чем создание таблицы типа `Distributed`, так как в этом случае, соединения с серверами устанавливаются заново при каждом запросе, в случае задания имён хостов, делается резолвинг имён, а также не ведётся подсчёт ошибок при работе с разными репликами. При обработке большого количества запросов, всегда создавайте `Distributed` таблицу заранее, не используйте табличную функцию `remote`.
+Выборка данных с удаленного сервера:
 
-Табличная функция `remote` может быть полезна для следующих случаях:
+``` sql
+SELECT * FROM remote('127.0.0.1', db.remote_engine_table) LIMIT 3;
+```
 
--   обращение на конкретный сервер в целях сравнения данных, отладки и тестирования;
--   запросы между разными кластерами ClickHouse в целях исследований;
--   нечастых распределённых запросов, задаваемых вручную;
--   распределённых запросов, где набор серверов определяется каждый раз заново.
+Вставка данных с удаленного сервера в таблицу:
 
-Если пользователь не задан,то используется `default`.
-Если пароль не задан, то используется пустой пароль.
+``` sql
+CREATE TABLE remote_table (name String, value UInt32) ENGINE=Memory;
+INSERT INTO FUNCTION remote('127.0.0.1', currentDatabase(), 'remote_table') VALUES ('test', 42);
+SELECT * FROM remote_table;
+```
 
-`remoteSecure` - аналогично функции `remote`, но с соединением по шифрованному каналу. Порт по умолчанию - `tcp_port_secure` из конфига или 9440.
-
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/table_functions/remote/) <!--hide-->
diff --git a/docs/ru/sql-reference/table-functions/s3.md b/docs/ru/sql-reference/table-functions/s3.md
new file mode 100644
index 00000000000..e062e59c67c
--- /dev/null
+++ b/docs/ru/sql-reference/table-functions/s3.md
@@ -0,0 +1,141 @@
+---
+toc_priority: 45
+toc_title: s3
+---
+
+# Табличная Функция S3 {#s3-table-function}
+
+Предоставляет табличный интерфейс для выбора/вставки файлов в [Amazon S3](https://aws.amazon.com/s3/). Эта табличная функция похожа на [hdfs](../../sql-reference/table-functions/hdfs.md), но обеспечивает специфические для S3 возможности.
+
+**Синтаксис**
+
+``` sql
+s3(path, [aws_access_key_id, aws_secret_access_key,] format, structure, [compression])
+```
+
+**Aргументы**
+
+-   `path` — URL-адрес бакета с указанием пути к файлу. Поддерживает следующие подстановочные знаки в режиме "только чтение": `*, ?, {abc,def} и {N..M}` где `N, M` — числа, `'abc', 'def'` — строки. Подробнее смотри [здесь](../../engines/table-engines/integrations/s3.md#wildcards-in-path).
+-   `format` — [формат](../../interfaces/formats.md#formats) файла.
+-   `structure` — cтруктура таблицы. Формат `'column1_name column1_type, column2_name column2_type, ...'`.
+-   `compression` — автоматически обнаруживает сжатие по расширению файла. Возможные значения: `none`, `gzip/gz`, `brotli/br`, `xz/LZMA`, `zstd/zst`. Необязательный параметр. 
+
+**Возвращаемые значения**
+
+Таблица с указанной структурой для чтения или записи данных в указанный файл.
+
+**Примеры**
+
+Создание таблицы из файла S3 `https://storage.yandexcloud.net/my-test-bucket-768/data.csv` и выбор первых трех столбцов из нее:
+
+Запрос:
+
+``` sql
+SELECT *
+FROM s3('https://storage.yandexcloud.net/my-test-bucket-768/data.csv', 'CSV', 'column1 UInt32, column2 UInt32, column3 UInt32')
+LIMIT 2;
+```
+
+Результат:
+
+``` text
+┌─column1─┬─column2─┬─column3─┐
+│       1 │       2 │       3 │
+│       3 │       2 │       1 │
+└─────────┴─────────┴─────────┘
+```
+
+То же самое, но файл со сжатием `gzip`:
+
+Запрос:
+
+``` sql
+SELECT * 
+FROM s3('https://storage.yandexcloud.net/my-test-bucket-768/data.csv.gz', 'CSV', 'column1 UInt32, column2 UInt32, column3 UInt32', 'gzip') 
+LIMIT 2;
+```
+
+Результат:
+
+``` text
+┌─column1─┬─column2─┬─column3─┐
+│       1 │       2 │       3 │
+│       3 │       2 │       1 │
+└─────────┴─────────┴─────────┘
+```
+
+## Примеры использования {#usage-examples}
+
+Предположим, у нас есть несколько файлов со следующими URI на S3:
+
+-   'https://storage.yandexcloud.net/my-test-bucket-768/some_prefix/some_file_1.csv'
+-   'https://storage.yandexcloud.net/my-test-bucket-768/some_prefix/some_file_2.csv'
+-   'https://storage.yandexcloud.net/my-test-bucket-768/some_prefix/some_file_3.csv'
+-   'https://storage.yandexcloud.net/my-test-bucket-768/some_prefix/some_file_4.csv'
+-   'https://storage.yandexcloud.net/my-test-bucket-768/another_prefix/some_file_1.csv'
+-   'https://storage.yandexcloud.net/my-test-bucket-768/another_prefix/some_file_2.csv'
+-   'https://storage.yandexcloud.net/my-test-bucket-768/another_prefix/some_file_3.csv'
+-   'https://storage.yandexcloud.net/my-test-bucket-768/another_prefix/some_file_4.csv'
+
+Подсчитаем количество строк в файлах, заканчивающихся цифрами от 1 до 3:
+
+``` sql
+SELECT count(*)
+FROM s3('https://storage.yandexcloud.net/my-test-bucket-768/{some,another}_prefix/some_file_{1..3}.csv', 'CSV', 'name String, value UInt32');
+```
+
+``` text
+┌─count()─┐
+│      18 │
+└─────────┘
+```
+
+Подсчитаем общее количество строк во всех файлах этих двух каталогов:
+
+``` sql
+SELECT count(*)
+FROM s3('https://storage.yandexcloud.net/my-test-bucket-768/{some,another}_prefix/*', 'CSV', 'name String, value UInt32');
+```
+
+``` text
+┌─count()─┐
+│      24 │
+└─────────┘
+```
+
+!!! warning "Warning"
+    Если список файлов содержит диапазоны чисел с ведущими нулями, используйте конструкцию с фигурными скобками для каждой цифры отдельно или используйте `?`.
+
+Подсчитаем общее количество строк в файлах с именами `file-000.csv`, `file-001.csv`, … , `file-999.csv`:
+
+``` sql
+SELECT count(*)
+FROM s3('https://storage.yandexcloud.net/my-test-bucket-768/big_prefix/file-{000..999}.csv', 'CSV', 'name String, value UInt32');
+```
+
+``` text
+┌─count()─┐
+│      12 │
+└─────────┘
+```
+
+Запишем данные в файл `test-data.csv.gz`:
+
+``` sql
+INSERT INTO s3('https://storage.yandexcloud.net/my-test-bucket-768/test-data.csv.gz', 'CSV', 'name String, value UInt32', 'gzip')
+VALUES ('test-data', 1), ('test-data-2', 2);
+```
+
+Запишем данные из существующей таблицы в файл `test-data.csv.gz`:
+
+``` sql
+INSERT INTO s3('https://storage.yandexcloud.net/my-test-bucket-768/test-data.csv.gz', 'CSV', 'name String, value UInt32', 'gzip')
+SELECT name, value FROM existing_table;
+```
+
+**Смотрите также**
+
+-  [Движок таблиц S3](../../engines/table-engines/integrations/s3.md)
+
+[Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/table-functions/s3/) <!--hide-->
+
diff --git a/docs/ru/sql-reference/table-functions/url.md b/docs/ru/sql-reference/table-functions/url.md
index 0cd7c24c663..a41a1f53cde 100644
--- a/docs/ru/sql-reference/table-functions/url.md
+++ b/docs/ru/sql-reference/table-functions/url.md
@@ -5,21 +5,39 @@ toc_title: url
 
 # url {#url}
 
-`url(URL, format, structure)` - возвращает таблицу со столбцами, указанными в
-`structure`, созданную из данных находящихся по `URL` в формате `format`.
+Функция `url` берет данные по указанному адресу `URL` и создает из них таблицу указанной структуры со столбцами указанного формата.
 
-URL - адрес, по которому сервер принимает `GET` и/или `POST` запросы по
-протоколу HTTP или HTTPS.
+Функция `url` может быть использована в запросах `SELECT` и `INSERT` с таблицами на движке [URL](../../engines/table-engines/special/url.md).
 
-format - [формат](../../interfaces/formats.md#formats) данных.
-
-structure - структура таблицы в форме `'UserID UInt64, Name String'`. Определяет имена и типы столбцов.
-
-**Пример**
+**Синтаксис**
 
 ``` sql
--- получение 3-х строк таблицы, состоящей из двух колонк типа String и UInt32 от сервера, отдающего данные в формате CSV
-SELECT * FROM url('http://127.0.0.1:12345/', CSV, 'column1 String, column2 UInt32') LIMIT 3
+url(URL, format, structure)
+```
+
+**Параметры**
+
+- `URL` — HTTP или HTTPS-адрес сервера, который может принимать запросы `GET` или `POST` (для запросов `SELECT` или `INSERT` соответственно). Тип: [String](../../sql-reference/data-types/string.md).
+- `format` — [формат](../../interfaces/formats.md#formats) данных. Тип: [String](../../sql-reference/data-types/string.md).
+- `structure` — структура таблицы в формате `'UserID UInt64, Name String'`. Определяет имена и типы столбцов. Тип: [String](../../sql-reference/data-types/string.md).
+
+**Возвращаемое значение**
+
+Таблица с указанными форматом и структурой, а также с данными, полученными из указанного адреса `URL`.
+
+**Примеры**
+
+Получение с HTTP-сервера первых 3 строк таблицы с данными в формате [CSV](../../interfaces/formats.md#csv), содержащей столбцы типа [String](../../sql-reference/data-types/string.md) и [UInt32](../../sql-reference/data-types/int-uint.md).
+
+``` sql
+SELECT * FROM url('http://127.0.0.1:12345/', CSV, 'column1 String, column2 UInt32') LIMIT 3;
+```
+
+Вставка данных в таблицу:
+
+``` sql
+CREATE TABLE test_table (column1 String, column2 UInt32) ENGINE=Memory;
+INSERT INTO FUNCTION url('http://127.0.0.1:8123/?query=INSERT+INTO+test_table+FORMAT+CSV', 'CSV', 'column1 String, column2 UInt32') VALUES ('http interface', 42);
+SELECT * FROM test_table;
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/table_functions/url/) <!--hide-->
diff --git a/docs/ru/sql-reference/table-functions/view.md b/docs/ru/sql-reference/table-functions/view.md
index 8a97253d048..bfd0a891179 100644
--- a/docs/ru/sql-reference/table-functions/view.md
+++ b/docs/ru/sql-reference/table-functions/view.md
@@ -8,7 +8,7 @@
 view(subquery)
 ```
 
-**Входные параметры**
+**Аргументы**
 
 -   `subquery` — запрос `SELECT`.
 
@@ -32,7 +32,7 @@ view(subquery)
 Запрос:
 
 ``` sql
-SELECT * FROM view(SELECT name FROM months)
+SELECT * FROM view(SELECT name FROM months);
 ```
 
 Результат:
@@ -49,14 +49,15 @@ SELECT * FROM view(SELECT name FROM months)
 Вы можете использовать функцию `view` как параметр табличных функций [remote](https://clickhouse.tech/docs/ru/sql-reference/table-functions/remote/#remote-remotesecure) и [cluster](https://clickhouse.tech/docs/ru/sql-reference/table-functions/cluster/#cluster-clusterallreplicas):
 
 ``` sql
-SELECT * FROM remote(`127.0.0.1`, view(SELECT a, b, c FROM table_name))
+SELECT * FROM remote(`127.0.0.1`, view(SELECT a, b, c FROM table_name));
 ```
 
 ``` sql
-SELECT * FROM cluster(`cluster_name`, view(SELECT a, b, c FROM table_name))
+SELECT * FROM cluster(`cluster_name`, view(SELECT a, b, c FROM table_name));
 ```
 
 **Смотрите также**
 
 -   [view](https://clickhouse.tech/docs/ru/engines/table-engines/special/view/#table_engines-view)
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/table_functions/view/) <!--hide-->
\ No newline at end of file
+
+[Оригинальная статья](https://clickhouse.tech/docs/en/sql-reference/table-functions/view/) <!--hide-->
diff --git a/docs/ru/whats-new/extended-roadmap.md b/docs/ru/whats-new/extended-roadmap.md
deleted file mode 120000
index 471ca0aefaa..00000000000
--- a/docs/ru/whats-new/extended-roadmap.md
+++ /dev/null
@@ -1 +0,0 @@
-roadmap.md
\ No newline at end of file
diff --git a/docs/ru/whats-new/extended-roadmap.md b/docs/ru/whats-new/extended-roadmap.md
new file mode 100644
index 00000000000..7b317d424f1
--- /dev/null
+++ b/docs/ru/whats-new/extended-roadmap.md
@@ -0,0 +1,9 @@
+---
+toc_priority: 74
+toc_title: Roadmap
+---
+
+# Планы развития {#roadmap}
+
+Планы развития на 2021 год опубликованы для обсуждения [здесь](https://github.com/ClickHouse/ClickHouse/issues/17623).
+
diff --git a/docs/ru/whats-new/index.md b/docs/ru/whats-new/index.md
index b8ba6133454..d8a26423813 100644
--- a/docs/ru/whats-new/index.md
+++ b/docs/ru/whats-new/index.md
@@ -1,6 +1,8 @@
 ---
-toc_folder_title: "\u0427\u0442\u043E \u043D\u043E\u0432\u043E\u0433\u043E?"
+toc_folder_title: "Что нового?"
 toc_priority: 82
 ---
 
+# Что нового в ClickHouse?
 
+Планы развития вкратце изложены [здесь](extended-roadmap.md), а новости по предыдущим релизам подробно описаны в [журнале изменений](changelog/index.md).
diff --git a/docs/ru/whats-new/roadmap.md b/docs/ru/whats-new/roadmap.md
deleted file mode 120000
index 2c383b2ad5d..00000000000
--- a/docs/ru/whats-new/roadmap.md
+++ /dev/null
@@ -1 +0,0 @@
-../../en/whats-new/roadmap.md
\ No newline at end of file
diff --git a/docs/ru/whats-new/security-changelog.md b/docs/ru/whats-new/security-changelog.md
index 1f46535833d..e3d26e772c4 100644
--- a/docs/ru/whats-new/security-changelog.md
+++ b/docs/ru/whats-new/security-changelog.md
@@ -73,4 +73,3 @@ unixODBC позволял указать путь для подключения
 
 Обнаружено благодаря: the UK’s National Cyber Security Centre (NCSC)
 
-{## [Оригинальная статья](https://clickhouse.tech/docs/ru/security_changelog/) ##}
diff --git a/docs/tools/.gitignore b/docs/tools/.gitignore
new file mode 100644
index 00000000000..443cee8638c
--- /dev/null
+++ b/docs/tools/.gitignore
@@ -0,0 +1,3 @@
+build
+__pycache__
+*.pyc
diff --git a/docs/tools/README.md b/docs/tools/README.md
index 3c8862f1079..0a6c41d8089 100644
--- a/docs/tools/README.md
+++ b/docs/tools/README.md
@@ -51,5 +51,5 @@ The easiest way to see the result is to use `--livereload=8888` argument of buil
 
 At the moment there’s no easy way to do just that, but you can consider:
 
--   To hit the “Watch” button on top of GitHub web interface to know as early as possible, even during pull request. Alternative to this is `#github-activity` channel of [public ClickHouse Slack](https://join.slack.com/t/clickhousedb/shared_invite/enQtOTUzMjM4ODQwNTc5LWJmMjE3Yjc2YmI1ZDBlZmI4ZTc3OWY3ZTIwYTljYzY4MzBlODM3YzBjZTc1YmYyODRlZTJkYTgzYzBiNTA2Yjk).
+-   To hit the “Watch” button on top of GitHub web interface to know as early as possible, even during pull request. Alternative to this is `#github-activity` channel of [public ClickHouse Slack](https://join.slack.com/t/clickhousedb/shared_invite/zt-nwwakmk4-xOJ6cdy0sJC3It8j348~IA).
 -   Some search engines allow to subscribe on specific website changes via email and you can opt-in for that for https://clickhouse.tech.
diff --git a/docs/tools/build.py b/docs/tools/build.py
index dfb9661c326..5a1f10268ab 100755
--- a/docs/tools/build.py
+++ b/docs/tools/build.py
@@ -65,8 +65,6 @@ def build_for_lang(lang, args):
         languages = {
             'en': 'English',
             'zh': '中文',
-            'es': 'Español',
-            'fr': 'Français',
             'ru': 'Русский',
             'ja': '日本語'
         }
@@ -74,8 +72,6 @@ def build_for_lang(lang, args):
         site_names = {
             'en': 'ClickHouse %s Documentation',
             'zh': 'ClickHouse文档 %s',
-            'es': 'Documentación de ClickHouse %s',
-            'fr': 'Documentation ClickHouse %s',
             'ru': 'Документация ClickHouse %s',
             'ja': 'ClickHouseドキュメント %s'
         }
@@ -183,7 +179,7 @@ if __name__ == '__main__':
     website_dir = os.path.join(src_dir, 'website')
 
     arg_parser = argparse.ArgumentParser()
-    arg_parser.add_argument('--lang', default='en,es,fr,ru,zh,ja')
+    arg_parser.add_argument('--lang', default='en,ru,zh,ja')
     arg_parser.add_argument('--blog-lang', default='en,ru')
     arg_parser.add_argument('--docs-dir', default='.')
     arg_parser.add_argument('--theme-dir', default=website_dir)
diff --git a/docs/tools/make_links.sh b/docs/tools/make_links.sh
index 743d4eebf16..801086178bf 100755
--- a/docs/tools/make_links.sh
+++ b/docs/tools/make_links.sh
@@ -8,7 +8,7 @@ BASE_DIR=$(dirname $(readlink -f $0))
 function do_make_links()
 {
     set -x
-    langs=(en es zh fr ru ja tr fa)
+    langs=(en zh ru ja)
     src_file="$1"
     for lang in "${langs[@]}"
     do
diff --git a/docs/tools/output.md b/docs/tools/output.md
deleted file mode 100644
index 91ec6e75999..00000000000
--- a/docs/tools/output.md
+++ /dev/null
@@ -1,204 +0,0 @@
-# What is ClickHouse? {#what-is-clickhouse}
-
-ClickHouse is a column-oriented database management system (DBMS) for
-online analytical processing of queries (OLAP).
-
-In a “normal” row-oriented DBMS, data is stored in this order:
-
-    Row   WatchID       JavaEnable   Title                GoodEvent   EventTime
-    ----- ------------- ------------ -------------------- ----------- ---------------------
-    #0   89354350662   1            Investor Relations   1           2016-05-18 05:19:20
-    #1   90329509958   0            Contact us           1           2016-05-18 08:10:20
-    #2   89953706054   1            Mission              1           2016-05-18 07:38:00
-    #N   ...           ...          ...                  ...         ...
-
-In other words, all the values related to a row are physically stored
-next to each other.
-
-Examples of a row-oriented DBMS are MySQL, Postgres, and MS SQL Server.
-{: .grey }
-
-In a column-oriented DBMS, data is stored like this:
-
-    Row:          #0                   #1                   #2                   #N
-    ------------- --------------------- --------------------- --------------------- -----
-    WatchID:      89354350662           90329509958           89953706054           ...
-    JavaEnable:   1                     0                     1                     ...
-    Title:        Investor Relations    Contact us            Mission               ...
-    GoodEvent:    1                     1                     1                     ...
-    EventTime:    2016-05-18 05:19:20   2016-05-18 08:10:20   2016-05-18 07:38:00   ...
-
-These examples only show the order that data is arranged in. The values
-from different columns are stored separately, and data from the same
-column is stored together.
-
-Examples of a column-oriented DBMS: Vertica, Paraccel (Actian Matrix and
-Amazon Redshift), Sybase IQ, Exasol, Infobright, InfiniDB, MonetDB
-(VectorWise and Actian Vector), LucidDB, SAP HANA, Google Dremel, Google
-PowerDrill, Druid, and kdb+. {: .grey }
-
-Different orders for storing data are better suited to different
-scenarios. The data access scenario refers to what queries are made, how
-often, and in what proportion; how much data is read for each type of
-query – rows, columns, and bytes; the relationship between reading and
-updating data; the working size of the data and how locally it is used;
-whether transactions are used, and how isolated they are; requirements
-for data replication and logical integrity; requirements for latency and
-throughput for each type of query, and so on.
-
-The higher the load on the system, the more important it is to customize
-the system set up to match the requirements of the usage scenario, and
-the more fine grained this customization becomes. There is no system
-that is equally well-suited to significantly different scenarios. If a
-system is adaptable to a wide set of scenarios, under a high load, the
-system will handle all the scenarios equally poorly, or will work well
-for just one or few of possible scenarios.
-
-## Key Properties of the OLAP scenario {#key-properties-of-the-olap-scenario}
-
--   The vast majority of requests are for read access.
--   Data is updated in fairly large batches (\> 1000 rows), not by
-    single rows; or it is not updated at all.
--   Data is added to the DB but is not modified.
--   For reads, quite a large number of rows are extracted from the DB,
-    but only a small subset of columns.
--   Tables are “wide,” meaning they contain a large number of columns.
--   Queries are relatively rare (usually hundreds of queries per server
-    or less per second).
--   For simple queries, latencies around 50 ms are allowed.
--   Column values are fairly small: numbers and short strings (for
-    example, 60 bytes per URL).
--   Requires high throughput when processing a single query (up to
-    billions of rows per second per server).
--   Transactions are not necessary.
--   Low requirements for data consistency.
--   There is one large table per query. All tables are small, except for
-    one.
--   A query result is significantly smaller than the source data. In
-    other words, data is filtered or aggregated, so the result fits in a
-    single server’s RAM.
-
-It is easy to see that the OLAP scenario is very different from other
-popular scenarios (such as OLTP or Key-Value access). So it doesn’t make
-sense to try to use OLTP or a Key-Value DB for processing analytical
-queries if you want to get decent performance. For example, if you try
-to use MongoDB or Redis for analytics, you will get very poor
-performance compared to OLAP databases.
-
-## Why Column-Oriented Databases Work Better in the OLAP Scenario {#why-column-oriented-databases-work-better-in-the-olap-scenario}
-
-Column-oriented databases are better suited to OLAP scenarios: they are
-at least 100 times faster in processing most queries. The reasons are
-explained in detail below, but the fact is easier to demonstrate
-visually:
-
-**Row-oriented DBMS**
-
-![Row-oriented](images/row_oriented.gif#)
-
-**Column-oriented DBMS**
-
-![Column-oriented](images/column_oriented.gif#)
-
-See the difference?
-
-### Input/output {#inputoutput}
-
-1.  For an analytical query, only a small number of table columns need
-    to be read. In a column-oriented database, you can read just the
-    data you need. For example, if you need 5 columns out of 100, you
-    can expect a 20-fold reduction in I/O.
-2.  Since data is read in packets, it is easier to compress. Data in
-    columns is also easier to compress. This further reduces the I/O
-    volume.
-3.  Due to the reduced I/O, more data fits in the system cache.
-
-For example, the query “count the number of records for each advertising
-platform” requires reading one “advertising platform ID” column, which
-takes up 1 byte uncompressed. If most of the traffic was not from
-advertising platforms, you can expect at least 10-fold compression of
-this column. When using a quick compression algorithm, data
-decompression is possible at a speed of at least several gigabytes of
-uncompressed data per second. In other words, this query can be
-processed at a speed of approximately several billion rows per second on
-a single server. This speed is actually achieved in practice.
-
-<details markdown="1">
-
-<summary>Example</summary>
-
-      $ clickhouse-client
-      ClickHouse client version 0.0.52053.
-      Connecting to localhost:9000.
-      Connected to ClickHouse server version 0.0.52053.
-
-      :) SELECT CounterID, count() FROM hits GROUP BY CounterID ORDER BY count() DESC LIMIT 20
-
-      SELECT
-      CounterID,
-      count()
-      FROM hits
-      GROUP BY CounterID
-      ORDER BY count() DESC
-      LIMIT 20
-
-      ┌─CounterID─┬──count()─┐
-      │    114208 │ 56057344 │
-      │    115080 │ 51619590 │
-      │      3228 │ 44658301 │
-      │     38230 │ 42045932 │
-      │    145263 │ 42042158 │
-      │     91244 │ 38297270 │
-      │    154139 │ 26647572 │
-      │    150748 │ 24112755 │
-      │    242232 │ 21302571 │
-      │    338158 │ 13507087 │
-      │     62180 │ 12229491 │
-      │     82264 │ 12187441 │
-      │    232261 │ 12148031 │
-      │    146272 │ 11438516 │
-      │    168777 │ 11403636 │
-      │   4120072 │ 11227824 │
-      │  10938808 │ 10519739 │
-      │     74088 │  9047015 │
-      │    115079 │  8837972 │
-      │    337234 │  8205961 │
-      └───────────┴──────────┘
-
-      20 rows in set. Elapsed: 0.153 sec. Processed 1.00 billion rows, 4.00 GB (6.53 billion rows/s., 26.10 GB/s.)
-
-      :)
-
-</details>
-
-### CPU {#cpu}
-
-Since executing a query requires processing a large number of rows, it
-helps to dispatch all operations for entire vectors instead of for
-separate rows, or to implement the query engine so that there is almost
-no dispatching cost. If you don’t do this, with any half-decent disk
-subsystem, the query interpreter inevitably stalls the CPU. It makes
-sense to both store data in columns and process it, when possible, by
-columns.
-
-There are two ways to do this:
-
-1.  A vector engine. All operations are written for vectors, instead of
-    for separate values. This means you don’t need to call operations
-    very often, and dispatching costs are negligible. Operation code
-    contains an optimized internal cycle.
-
-2.  Code generation. The code generated for the query has all the
-    indirect calls in it.
-
-This is not done in “normal” databases, because it doesn’t make sense
-when running simple queries. However, there are exceptions. For example,
-MemSQL uses code generation to reduce latency when processing SQL
-queries. (For comparison, analytical DBMSs require optimization of
-throughput, not latency.)
-
-Note that for CPU efficiency, the query language must be declarative
-(SQL or MDX), or at least a vector (J, K). The query should only contain
-implicit loops, allowing for optimization.
-
-[Original article](https://clickhouse.tech/docs/en/) <!--hide-->
diff --git a/docs/tools/requirements.txt b/docs/tools/requirements.txt
index 4106100bfa3..85f9dc2a9dd 100644
--- a/docs/tools/requirements.txt
+++ b/docs/tools/requirements.txt
@@ -10,7 +10,7 @@ cssmin==0.2.0
 future==0.18.2
 htmlmin==0.1.12
 idna==2.10
-Jinja2==2.11.2
+Jinja2>=2.11.3
 jinja2-highlight==0.6.1
 jsmin==2.2.2
 livereload==2.6.2
@@ -23,10 +23,9 @@ nltk==3.5
 nose==1.3.7
 protobuf==3.14.0
 numpy==1.19.2
-Pygments==2.5.2
 pymdown-extensions==8.0
 python-slugify==4.0.1
-PyYAML==5.3.1
+PyYAML==5.4.1
 repackage==0.7.3
 requests==2.24.0
 singledispatch==3.4.0.3
@@ -36,3 +35,4 @@ termcolor==1.1.0
 tornado==6.1
 Unidecode==1.1.1
 urllib3==1.25.10
+Pygments>=2.7.4
diff --git a/docs/tools/single_page.py b/docs/tools/single_page.py
index 05d50e768e2..a1e650d3ad3 100644
--- a/docs/tools/single_page.py
+++ b/docs/tools/single_page.py
@@ -24,55 +24,78 @@ def recursive_values(item):
         yield item
 
 
+anchor_not_allowed_chars = re.compile(r'[^\w\-]')
+def generate_anchor_from_path(path):
+    return re.sub(anchor_not_allowed_chars, '-', path)
+
+absolute_link = re.compile(r'^https?://')
+
+
+def replace_link(match, path):
+    title = match.group(1)
+    link = match.group(2)
+
+    # Not a relative link
+    if re.search(absolute_link, link):
+        return match.group(0)
+
+    if link.endswith('/'):
+        link = link[0:-1] + '.md'
+
+    return '{}(#{})'.format(title, generate_anchor_from_path(os.path.normpath(os.path.join(os.path.dirname(path), link))))
+
+
+# Concatenates Markdown files to a single file.
 def concatenate(lang, docs_path, single_page_file, nav):
     lang_path = os.path.join(docs_path, lang)
-    az_re = re.compile(r'[a-z]')
 
     proj_config = f'{docs_path}/toc_{lang}.yml'
     if os.path.exists(proj_config):
         with open(proj_config) as cfg_file:
             nav = yaml.full_load(cfg_file.read())['nav']
+
     files_to_concatenate = list(recursive_values(nav))
     files_count = len(files_to_concatenate)
     logging.info(f'{files_count} files will be concatenated into single md-file for {lang}.')
     logging.debug('Concatenating: ' + ', '.join(files_to_concatenate))
     assert files_count > 0, f'Empty single-page for {lang}'
 
+    link_regexp = re.compile(r'(\[[^\]]+\])\(([^)#]+)(?:#[^\)]+)?\)')
+
     for path in files_to_concatenate:
-        if path.endswith('introduction/info.md'):
-            continue
         try:
             with open(os.path.join(lang_path, path)) as f:
-                anchors = set()
-                tmp_path = path.replace('/index.md', '/').replace('.md', '/')
-                prefixes = ['', '../', '../../', '../../../']
-                parts = tmp_path.split('/')
-                anchors.add(parts[-2] + '/')
-                anchors.add('/'.join(parts[1:]))
-
-                for part in parts[0:-2] if len(parts) > 2 else parts:
-                    for prefix in prefixes:
-                        anchor = prefix + tmp_path
-                        if anchor:
-                            anchors.add(anchor)
-                            anchors.add('../' + anchor)
-                            anchors.add('../../' + anchor)
-                    tmp_path = tmp_path.replace(part, '..')
-
-                for anchor in anchors:
-                    if re.search(az_re, anchor):
-                        single_page_file.write('<a name="%s"></a>' % anchor)
-
-                single_page_file.write('\n')
+                # Insert a horizontal ruler. Then insert an anchor that we will link to. Its name will be a path to the .md file.
+                single_page_file.write('\n______\n<a name="%s"></a>\n' % generate_anchor_from_path(path))
 
                 in_metadata = False
-                for l in f:
-                    if l.startswith('---'):
+                for line in f:
+                    # Skip YAML metadata.
+                    if line == '---\n':
                         in_metadata = not in_metadata
-                    if l.startswith('#'):
-                        l = '#' + l
+                        continue
+
                     if not in_metadata:
-                        single_page_file.write(l)
+                        # Increase the level of headers.
+                        if line.startswith('#'):
+                            line = '#' + line
+
+                        # Replace links within the docs.
+
+                        if re.search(link_regexp, line):
+                            line = re.sub(
+                                link_regexp,
+                                lambda match: replace_link(match, path),
+                                line)
+
+                            # If failed to replace the relative link, print to log
+                            if '../' in line:
+                                logging.info('Failed to resolve relative link:')
+                                logging.info(path)
+                                logging.info(line)
+
+                        single_page_file.write(line)
+
         except IOError as e:
             logging.warning(str(e))
 
@@ -86,7 +109,8 @@ def build_single_page_version(lang, args, nav, cfg):
     extra['single_page'] = True
     extra['is_amp'] = False
 
-    with util.autoremoved_file(os.path.join(args.docs_dir, lang, 'single.md')) as single_md:
+    single_md_path = os.path.join(args.docs_dir, lang, 'single.md')
+    with open(single_md_path, 'w') as single_md:
         concatenate(lang, args.docs_dir, single_md, nav)
 
         with util.temp_dir() as site_temp:
@@ -123,11 +147,14 @@ def build_single_page_version(lang, args, nav, cfg):
 
                     single_page_index_html = os.path.join(single_page_output_path, 'index.html')
                     single_page_content_js = os.path.join(single_page_output_path, 'content.js')
+
                     with open(single_page_index_html, 'r') as f:
                         sp_prefix, sp_js, sp_suffix = f.read().split('<!-- BREAK -->')
+
                     with open(single_page_index_html, 'w') as f:
                         f.write(sp_prefix)
                         f.write(sp_suffix)
+
                     with open(single_page_content_js, 'w') as f:
                         if args.minify:
                             import jsmin
@@ -151,6 +178,7 @@ def build_single_page_version(lang, args, nav, cfg):
                     js_in = ' '.join(website.get_js_in(args))
                     subprocess.check_call(f'cat {css_in} > {test_dir}/css/base.css', shell=True)
                     subprocess.check_call(f'cat {js_in} > {test_dir}/js/base.js', shell=True)
+
                     if args.save_raw_single_page:
                         shutil.copytree(test_dir, args.save_raw_single_page)
 
@@ -194,3 +222,7 @@ def build_single_page_version(lang, args, nav, cfg):
                         subprocess.check_call(' '.join(create_pdf_command), shell=True)
 
         logging.info(f'Finished building single page version for {lang}')
+        
+        if os.path.exists(single_md_path):
+            os.unlink(single_md_path)
+            
\ No newline at end of file
diff --git a/docs/tools/test.py b/docs/tools/test.py
index 7d11157c986..00d1d47137f 100755
--- a/docs/tools/test.py
+++ b/docs/tools/test.py
@@ -68,17 +68,17 @@ def test_single_page(input_path, lang):
             f,
             features='html.parser'
         )
+
         anchor_points = set()
+
         duplicate_anchor_points = 0
         links_to_nowhere = 0
+
         for tag in soup.find_all():
             for anchor_point in [tag.attrs.get('name'), tag.attrs.get('id')]:
                 if anchor_point:
-                    if anchor_point in anchor_points:
-                        duplicate_anchor_points += 1
-                        logging.info('Duplicate anchor point: %s' % anchor_point)
-                    else:
-                        anchor_points.add(anchor_point)
+                    anchor_points.add(anchor_point)
+
         for tag in soup.find_all():
             href = tag.attrs.get('href')
             if href and href.startswith('#') and href != '#':
@@ -87,11 +87,8 @@ def test_single_page(input_path, lang):
                     logging.info("Tag %s", tag)
                     logging.info('Link to nowhere: %s' % href)
 
-        if duplicate_anchor_points:
-            logging.warning('Found %d duplicate anchor points' % duplicate_anchor_points)
-
         if links_to_nowhere:
-            if lang == 'en' or lang == 'ru':  # TODO: check all languages again
+            if lang == 'en' or lang == 'ru':
                 logging.error(f'Found {links_to_nowhere} links to nowhere in {lang}')
                 sys.exit(1)
             else:
diff --git a/docs/tools/translate/add_meta_flag.py b/docs/tools/translate/add_meta_flag.py
deleted file mode 100755
index d87aa044faf..00000000000
--- a/docs/tools/translate/add_meta_flag.py
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env python3
-
-import sys
-
-import util
-
-if __name__ == '__main__':
-    flag_name = sys.argv[1]
-    path = sys.argv[2]
-    meta, content = util.read_md_file(path)
-    meta[flag_name] = True
-    util.write_md_file(path, meta, content)
diff --git a/docs/tools/translate/babel-mapping.ini b/docs/tools/translate/babel-mapping.ini
deleted file mode 100644
index 6a9a3e5c073..00000000000
--- a/docs/tools/translate/babel-mapping.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[python: **.py]
-[jinja2: **/templates/**.html]
-extensions=jinja2.ext.i18n,jinja2.ext.autoescape,jinja2.ext.with_
diff --git a/docs/tools/translate/filter.py b/docs/tools/translate/filter.py
deleted file mode 100755
index 61e1104d345..00000000000
--- a/docs/tools/translate/filter.py
+++ /dev/null
@@ -1,199 +0,0 @@
-#!/usr/bin/env python3
-
-import os
-import sys
-import json.decoder
-
-import pandocfilters
-import slugify
-
-import translate
-import util
-
-
-is_debug = os.environ.get('DEBUG') is not None
-
-filename = os.getenv('INPUT')
-
-
-def debug(*args):
-    if is_debug:
-        print(*args, file=sys.stderr)
-
-
-def process_buffer(buffer, new_value, item=None, is_header=False):
-    if buffer:
-        text = ''.join(buffer)
-
-        try:
-            translated_text = translate.translate(text)
-        except TypeError:
-            translated_text = text
-        except json.decoder.JSONDecodeError as e:
-            print('Failed to translate', str(e), file=sys.stderr)
-            sys.exit(1)
-
-        debug(f'Translate: "{text}" -> "{translated_text}"')
-
-        if text and text[0].isupper() and not translated_text[0].isupper():
-            translated_text = translated_text[0].upper() + translated_text[1:]
-
-        if text.startswith(' ') and not translated_text.startswith(' '):
-            translated_text = ' ' + translated_text
-
-        if text.endswith(' ') and not translated_text.endswith(' '):
-            translated_text = translated_text + ' '
-
-        if is_header and translated_text.endswith('.'):
-            translated_text = translated_text.rstrip('.')
-
-        title_case = is_header and translate.default_target_language == 'en' and text[0].isupper()
-        title_case_whitelist = {
-            'a', 'an', 'the', 'and', 'or', 'that',
-            'of', 'on', 'for', 'from', 'with', 'to', 'in'
-        }
-        is_first_iteration = True
-        for token in translated_text.split(' '):
-            if title_case and token.isascii() and not token.isupper():
-                if len(token) > 1 and token.lower() not in title_case_whitelist:
-                    token = token[0].upper() + token[1:]
-                elif not is_first_iteration:
-                    token = token.lower()
-            is_first_iteration = False
-
-            new_value.append(pandocfilters.Str(token))
-            new_value.append(pandocfilters.Space())
-
-        if item is None and len(new_value):
-            new_value.pop(len(new_value) - 1)
-        else:
-            new_value[-1] = item
-    elif item:
-        new_value.append(item)
-
-
-def process_sentence(value, is_header=False):
-    new_value = []
-    buffer = []
-    for item in value:
-        if isinstance(item, list):
-            new_value.append([process_sentence(subitem, is_header) for subitem in item])
-            continue
-        elif isinstance(item, dict):
-            t = item.get('t')
-            c = item.get('c')
-            if t == 'Str':
-                buffer.append(c)
-            elif t == 'Space':
-                buffer.append(' ')
-            elif t == 'DoubleQuote':
-                buffer.append('"')
-            else:
-                process_buffer(buffer, new_value, item, is_header)
-                buffer = []
-        else:
-            new_value.append(item)
-    process_buffer(buffer, new_value, is_header=is_header)
-    return new_value
-
-
-def translate_filter(key, value, _format, _):
-    if key not in ['Space', 'Str']:
-        debug(key, value)
-    try:
-        cls = getattr(pandocfilters, key)
-    except AttributeError:
-        return
-
-    if key == 'Para' and value:
-        marker = value[0].get('c')
-        if isinstance(marker, str) and marker.startswith('!!!') and len(value) > 2:
-            # Admonition case
-            if marker != '!!!':
-                # Lost space after !!! case
-                value.insert(1, pandocfilters.Str(marker[3:]))
-                value.insert(1, pandocfilters.Space())
-                value[0]['c'] = '!!!'
-            admonition_value = []
-            remaining_para_value = []
-            in_admonition = True
-            break_value = [pandocfilters.LineBreak(), pandocfilters.Str(' ' * 4)]
-            for item in value:
-                if in_admonition:
-                    if item.get('t') == 'SoftBreak':
-                        in_admonition = False
-                    else:
-                        admonition_value.append(item)
-                else:
-                    if item.get('t') == 'SoftBreak':
-                        remaining_para_value += break_value
-                    else:
-                        remaining_para_value.append(item)
-
-            if admonition_value[-1].get('t') == 'Quoted':
-                text = process_sentence(admonition_value[-1]['c'][-1])
-                text[0]['c'] = '"' + text[0]['c']
-                text[-1]['c'] = text[-1]['c'] + '"'
-                admonition_value.pop(-1)
-                admonition_value += text
-            else:
-                text = admonition_value[-1].get('c')
-                if text:
-                    text = translate.translate(text[0].upper() + text[1:])
-                    admonition_value.append(pandocfilters.Space())
-                    admonition_value.append(pandocfilters.Str(f'"{text}"'))
-
-            return cls(admonition_value + break_value + process_sentence(remaining_para_value))
-        else:
-            return cls(process_sentence(value))
-    elif key == 'Plain' or key == 'Strong' or key == 'Emph':
-        return cls(process_sentence(value))
-    elif key == 'Link':
-        try:
-            # Plain links case
-            if value[2][0] == value[1][0].get('c'):
-                return pandocfilters.Str(value[2][0])
-        except IndexError:
-            pass
-
-        value[1] = process_sentence(value[1])
-        href = value[2][0]
-        if not (href.startswith('http') or href.startswith('#')):
-            anchor = None
-            attempts = 10
-            if '#' in href:
-                href, anchor = href.split('#', 1)
-            if href.endswith('.md') and not href.startswith('/'):
-                parts = [part for part in os.environ['INPUT'].split('/') if len(part) == 2]
-                lang = parts[-1]
-                script_path = os.path.dirname(__file__)
-                base_path = os.path.abspath(f'{script_path}/../../{lang}')
-                href = os.path.join(
-                    os.path.relpath(base_path, os.path.dirname(os.environ['INPUT'])),
-                    os.path.relpath(href, base_path)
-                )
-            if anchor:
-                href = f'{href}#{anchor}'
-            value[2][0] = href
-        return cls(*value)
-    elif key == 'Header':
-        if value[1][0].islower() and '_' not in value[1][0]:  # Preserve some manually specified anchors
-            value[1][0] = slugify.slugify(value[1][0], separator='-', word_boundary=True, save_order=True)
-
-        # TODO: title case header in en
-        value[2] = process_sentence(value[2], is_header=True)
-        return cls(*value)
-    elif key == 'SoftBreak':
-        return pandocfilters.LineBreak()
-
-    return
-
-
-if __name__ == "__main__":
-    os.environ['INPUT'] = os.path.abspath(os.environ['INPUT'])
-    pwd = os.path.dirname(filename or '.')
-    if pwd:
-        with util.cd(pwd):
-            pandocfilters.toJSONFilter(translate_filter)
-    else:
-        pandocfilters.toJSONFilter(translate_filter)
diff --git a/docs/tools/translate/normalize-markdown.sh b/docs/tools/translate/normalize-markdown.sh
deleted file mode 100755
index 7850fa34b1d..00000000000
--- a/docs/tools/translate/normalize-markdown.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-# Usage: normalize-en-markdown.sh <path>
-set -e
-BASE_DIR=$(dirname $(readlink -f $0))
-TEMP_FILE=$(mktemp)
-trap 'rm -f -- "${TEMP_FILE}"' INT TERM HUP EXIT
-INPUT="$1"
-if [[ ! -L "${INPUT}" ]]
-then
-    export INPUT
-    cat "${INPUT}" > "${TEMP_FILE}"
-    "${BASE_DIR}/translate.sh" "en" "${TEMP_FILE}" "${INPUT}"
-fi
diff --git a/docs/tools/translate/remove_machine_translated_meta.py b/docs/tools/translate/remove_machine_translated_meta.py
deleted file mode 100755
index 26cfde97f1e..00000000000
--- a/docs/tools/translate/remove_machine_translated_meta.py
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env python3
-import os
-import sys
-sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..'))
-import convert_toc
-import util
-
-
-if __name__ == '__main__':
-    path = sys.argv[1][2:]
-    convert_toc.init_redirects()
-    try:
-        path = convert_toc.redirects[path]
-    except KeyError:
-        pass
-    meta, content = util.read_md_file(path)
-    if 'machine_translated' in meta:
-        del meta['machine_translated']
-    if 'machine_translated_rev' in meta:
-        del meta['machine_translated_rev']
-    util.write_md_file(path, meta, content)
diff --git a/docs/tools/translate/replace-with-translation.sh b/docs/tools/translate/replace-with-translation.sh
deleted file mode 100755
index 922ac65a921..00000000000
--- a/docs/tools/translate/replace-with-translation.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-# Usage: replace-with-translation.sh <target_language> <path>
-set -e
-BASE_DIR=$(dirname $(readlink -f $0))
-TEMP_FILE=$(mktemp)
-trap 'rm -f -- "${TEMP_FILE}"' INT TERM HUP EXIT
-TARGET_LANGUAGE="$1"
-export INPUT="$2"
-cat "${INPUT}" > "${TEMP_FILE}"
-if [[ ! -z $SLEEP ]]
-then
-    sleep $[ ( $RANDOM % 20 )  + 1 ]s
-fi
-rm -f "${INPUT}"
-mkdir -p $(dirname "${INPUT}") || true
-YANDEX=1 "${BASE_DIR}/translate.sh" "${TARGET_LANGUAGE}" "${TEMP_FILE}" "${INPUT}"
-git add "${INPUT}"
diff --git a/docs/tools/translate/requirements.txt b/docs/tools/translate/requirements.txt
deleted file mode 100644
index 1bbd119b823..00000000000
--- a/docs/tools/translate/requirements.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Babel==2.8.0
-certifi==2020.6.20
-chardet==3.0.4
-googletrans==3.0.0
-idna==2.10
-Jinja2==2.11.2
-pandocfilters==1.4.2
-python-slugify==4.0.1
-PyYAML==5.3.1
-requests==2.24.0
-text-unidecode==1.3
-urllib3==1.25.10
diff --git a/docs/tools/translate/split_meta.py b/docs/tools/translate/split_meta.py
deleted file mode 100755
index b38b93e10b4..00000000000
--- a/docs/tools/translate/split_meta.py
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/env python3
-import os
-import subprocess
-import sys
-
-import translate
-import util
-
-
-if __name__ == '__main__':
-    path = sys.argv[1]
-    content_path = f'{path}.content'
-    meta_path = f'{path}.meta'
-    meta, content = util.read_md_file(path)
-    
-    target_language = os.getenv('TARGET_LANGUAGE')
-    if target_language is not None and target_language != 'en':
-        rev = subprocess.check_output(
-            'git rev-parse HEAD', shell=True
-        ).decode('utf-8').strip()
-        meta['machine_translated'] = True
-        meta['machine_translated_rev'] = rev
-        title = meta.get('toc_title')
-        if title:
-            meta['toc_title'] = translate.translate(title, target_language)
-        folder_title = meta.get('toc_folder_title')
-        if folder_title:
-            meta['toc_folder_title'] = translate.translate(folder_title, target_language)
-        if 'en_copy' in meta:
-            del meta['en_copy']
-    
-    with open(content_path, 'w') as f:
-        print(content, file=f)
-
-    util.write_md_file(meta_path, meta, '')
diff --git a/docs/tools/translate/translate.py b/docs/tools/translate/translate.py
deleted file mode 100755
index 605ff78f424..00000000000
--- a/docs/tools/translate/translate.py
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/usr/bin/env python3
-
-import os
-import random
-import re
-import sys
-import time
-import urllib.parse
-
-import googletrans
-import requests
-import yaml
-
-
-translator = googletrans.Translator()
-default_target_language = os.environ.get('TARGET_LANGUAGE', 'ru')
-curly_braces_re = re.compile('({[^}]+})')
-
-is_yandex = os.environ.get('YANDEX') is not None
-
-
-def translate_impl(text, target_language=None):
-    target_language = target_language or default_target_language
-    if target_language == 'en':
-        return text
-    elif is_yandex:
-        text = text.replace('‘', '\'')
-        text = text.replace('’', '\'')
-        has_alpha = any([char.isalpha() for char in text])
-        if text.isascii() and has_alpha and not text.isupper():
-            text = urllib.parse.quote(text)
-            url = f'http://translate.yandex.net/api/v1/tr.json/translate?srv=docs&lang=en-{target_language}&text={text}'
-            result = requests.get(url).json()
-            if result.get('code') == 200:
-                return result['text'][0]
-            else:
-                result = str(result)
-                print(f'Failed to translate "{text}": {result}', file=sys.stderr)
-                sys.exit(1)
-        else:
-            return text
-    else:
-        time.sleep(random.random())
-        return translator.translate(text, target_language).text
-
-
-def translate(text, target_language=None):
-    return "".join(
-        [
-            part
-            if part.startswith("{") and part.endswith("}")
-            else translate_impl(part, target_language=target_language)
-            for part in re.split(curly_braces_re, text)
-        ]
-    )
-
-
-def translate_po():
-    import babel.messages.pofile
-    base_dir = os.path.join(os.path.dirname(__file__), '..', '..', '..', 'website', 'locale')
-    for lang in ['en', 'zh', 'es', 'fr', 'ru', 'ja']:
-        po_path = os.path.join(base_dir, lang, 'LC_MESSAGES', 'messages.po')
-        with open(po_path, 'r') as f:
-            po_file = babel.messages.pofile.read_po(f, locale=lang, domain='messages')
-        for item in po_file:
-            if not item.string:
-                global is_yandex
-                is_yandex = True
-                item.string = translate(item.id, lang)
-        with open(po_path, 'wb') as f:
-            babel.messages.pofile.write_po(f, po_file)
-
-
-if __name__ == '__main__':
-    target_language = sys.argv[1]
-    if target_language == 'po':
-        translate_po()
-    else:
-        result = translate_toc(yaml.full_load(sys.stdin.read())['nav'], sys.argv[1])
-        print(yaml.dump({'nav': result}))
diff --git a/docs/tools/translate/translate.sh b/docs/tools/translate/translate.sh
deleted file mode 100755
index 1acf645eb81..00000000000
--- a/docs/tools/translate/translate.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env bash
-# Usage: translate.sh <target_language> <input> <output>
-set -e
-BASE_DIR=$(dirname $(readlink -f $0))
-OUTPUT=${3:-/dev/stdout}
-export TARGET_LANGUAGE="$1"
-export DEBUG
-TEMP_FILE=$(mktemp)
-export INPUT_PATH="$2"
-INPUT_META="${INPUT_PATH}.meta"
-INPUT_CONTENT="${INPUT_PATH}.content"
-
-trap 'rm -f -- "${TEMP_FILE}" "${INPUT_META}" "${INPUT_CONTENT}"' INT TERM HUP EXIT
-source "${BASE_DIR}/venv/bin/activate"
-
-${BASE_DIR}/split_meta.py "${INPUT_PATH}"
-
-pandoc "${INPUT_CONTENT}" --filter "${BASE_DIR}/filter.py" -o "${TEMP_FILE}" \
-    -f "markdown-space_in_atx_header" -t "markdown_strict+pipe_tables+markdown_attribute+all_symbols_escapable+backtick_code_blocks+autolink_bare_uris-link_attributes+markdown_attribute+mmd_link_attributes-raw_attribute+header_attributes-grid_tables+definition_lists" \
-    --atx-headers --wrap=none --columns=99999 --tab-stop=4
-perl -pi -e 's/{\\#\\#/{##/g' "${TEMP_FILE}"
-perl -pi -e 's/\\#\\#}/##}/g' "${TEMP_FILE}"
-perl -pi -e 's/ *$//gg' "${TEMP_FILE}"
-if [[ "${TARGET_LANGUAGE}" == "ru" ]]
-then
-    perl -pi -e 's/“/«/gg' "${TEMP_FILE}"
-    perl -pi -e 's/”/»/gg' "${TEMP_FILE}"
-fi
-cat "${INPUT_META}" "${TEMP_FILE}" > "${OUTPUT}"
diff --git a/docs/tools/translate/typograph_ru.py b/docs/tools/translate/typograph_ru.py
deleted file mode 100644
index 2d970cf2a2e..00000000000
--- a/docs/tools/translate/typograph_ru.py
+++ /dev/null
@@ -1,45 +0,0 @@
-import requests
-
-class TypographError(Exception):
-    pass
-
-
-def typograph(text):
-    text = text.replace('&', '&amp;')
-    text = text.replace('<', '&lt;')
-    text = text.replace('>', '&gt;')
-    template = f'''<?xml version="1.0" encoding="UTF-8"?>
-    <soap:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-        xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
-    <soap:Body>
-    <ProcessText xmlns="http://typograf.artlebedev.ru/webservices/">
-    <text>{text}</text>
-         <entityType>3</entityType>
-         <useBr>0</useBr>
-         <useP>0</useP>
-         <maxNobr>0</maxNobr>
-    </ProcessText>
-    </soap:Body>
-    </soap:Envelope>
-    '''
-    result = requests.post(
-        url='http://typograf.artlebedev.ru/webservices/typograf.asmx',
-        data=template.encode('utf-8'),
-        headers={
-            'Content-Type': 'text/xml',
-            'SOAPAction': 'http://typograf.artlebedev.ru/webservices/ProcessText'
-        }
-    )
-    if result.ok and 'ProcessTextResult' in result.text:
-        result_text = result.text.split('<ProcessTextResult>')[1].split('</ProcessTextResult>')[0].rstrip()
-        result_text = result_text.replace('&amp;', '&')
-        result_text = result_text.replace('&lt;', '<')
-        result_text = result_text.replace('&gt;', '>')
-        return result_text
-    else:
-        raise TypographError(result.text)
-
-
-if __name__ == '__main__':
-    import sys
-    print((typograph(sys.stdin.read())))
diff --git a/docs/tools/translate/update-all-machine-translated.sh b/docs/tools/translate/update-all-machine-translated.sh
deleted file mode 100755
index fae2aae787f..00000000000
--- a/docs/tools/translate/update-all-machine-translated.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-BASE_DIR=$(dirname $(readlink -f $0))
-
-function translate() {
-    set -x
-    LANGUAGE=$1
-    DOCS_ROOT="${BASE_DIR}/../../"
-    REV="$(git rev-parse HEAD)"
-    for FILENAME in $(find "${DOCS_ROOT}${LANGUAGE}" -name "*.md" -type f)
-    do
-        HAS_MT_TAG=$(grep -c "machine_translated: true" "${FILENAME}")
-        IS_UP_TO_DATE=$(grep -c "machine_translated_rev: \"${REV}\"" "${FILENAME}")
-        if [ "${HAS_MT_TAG}" -eq "1" ] && [ "${IS_UP_TO_DATE}" -eq "0" ]
-        then
-            set -e
-            EN_FILENAME=${FILENAME/\/${LANGUAGE}\///en/}
-            rm "${FILENAME}" || true
-            cp "${EN_FILENAME}" "${FILENAME}"
-            DEBUG=1 SLEEP=1 ${BASE_DIR}/replace-with-translation.sh ${LANGUAGE} "${FILENAME}"
-            set +e
-        fi
-    done
-}
-export BASE_DIR
-export -f translate
-parallel translate ::: es fr zh ja fa tr
diff --git a/docs/tools/translate/update-po.sh b/docs/tools/translate/update-po.sh
deleted file mode 100755
index f2f4039bcb8..00000000000
--- a/docs/tools/translate/update-po.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-# Usage: update-po.sh
-set -ex
-BASE_DIR=$(dirname $(readlink -f $0))
-WEBSITE_DIR="${BASE_DIR}/../../../website"
-LOCALE_DIR="${WEBSITE_DIR}/locale"
-MESSAGES_POT="${LOCALE_DIR}/messages.pot"
-BABEL_INI="${BASE_DIR}/babel-mapping.ini"
-LANGS="en zh es fr ru ja tr fa"
-source "${BASE_DIR}/venv/bin/activate"
-cd "${WEBSITE_DIR}"
-pybabel extract "." -o "${MESSAGES_POT}" -F "${BABEL_INI}"
-for L in ${LANGS}
-do
-    pybabel update -d locale -l "${L}" -i "${MESSAGES_POT}" || \
-    pybabel init -d locale -l "${L}" -i "${MESSAGES_POT}"
-done
-python3 "${BASE_DIR}/translate.py" po
-for L in ${LANGS}
-do
-    pybabel compile -d locale -l "${L}"
-done
diff --git a/docs/tools/translate/util.py b/docs/tools/translate/util.py
deleted file mode 120000
index 7f16d68497e..00000000000
--- a/docs/tools/translate/util.py
+++ /dev/null
@@ -1 +0,0 @@
-../util.py
\ No newline at end of file
diff --git a/docs/tools/util.py b/docs/tools/util.py
index b840dc1168a..25961561f99 100644
--- a/docs/tools/util.py
+++ b/docs/tools/util.py
@@ -22,15 +22,6 @@ def temp_dir():
         shutil.rmtree(path)
 
 
-@contextlib.contextmanager
-def autoremoved_file(path):
-    try:
-        with open(path, 'w') as handle:
-            yield handle
-    finally:
-        os.unlink(path)
-
-
 @contextlib.contextmanager
 def cd(new_cwd):
     old_cwd = os.getcwd()
diff --git a/docs/zh/commercial/cloud.md b/docs/zh/commercial/cloud.md
index 9cca8776d14..c74ffa93e9a 100644
--- a/docs/zh/commercial/cloud.md
+++ b/docs/zh/commercial/cloud.md
@@ -29,6 +29,18 @@ toc_title: 云
 -   跨可用区扩展以实现性能和高可用性
 -   内置监控和SQL查询编辑器
 
+## 阿里云 {#alibaba-cloud}
+
+阿里云的 ClickHouse 托管服务 [中国站](https://www.aliyun.com/product/clickhouse) (国际站于2021年5月初开放) 提供以下主要功能：
+
+-   基于阿里飞天分布式系统的高可靠云盘存储引擎
+-   按需扩容，无需手动进行数据搬迁
+-   支持单节点、单副本、多节点、多副本多种架构，支持冷热数据分层
+-   支持访问白名单和一键恢复，多层网络安全防护，云盘加密
+-   与云上日志系统、数据库、数据应用工具无缝集成
+-   内置监控和数据库管理平台
+-   专业的数据库专家技术支持和服务
+
 ## 腾讯云 {#tencent-cloud}
 
 [腾讯云的 ClickHouse 托管服务](https://cloud.tencent.com/product/cdwch)提供以下主要功能：
diff --git a/docs/zh/engines/table-engines/mergetree-family/replication.md b/docs/zh/engines/table-engines/mergetree-family/replication.md
index 07ef255d6bb..a4d03e8da36 100644
--- a/docs/zh/engines/table-engines/mergetree-family/replication.md
+++ b/docs/zh/engines/table-engines/mergetree-family/replication.md
@@ -47,7 +47,7 @@
 
 如果配置文件中没有设置 ZooKeeper ，则无法创建复制表，并且任何现有的复制表都将变为只读。
 
-`SELECT` 查询并不需要借助 ZooKeeper ，复本并不影响 `SELECT` 的性能，查询复制表与非复制表速度是一样的。查询分布式表时，ClickHouse的处理方式可通过设置 [max_replica_delay_for_distributed_queries](../../../operations/settings/settings.md#settings-max_replica_delay_for_distributed_queries) 和 [fallback_to_stale_replicas_for_distributed_queries](../../../operations/settings/settings.md) 修改。
+`SELECT` 查询并不需要借助 ZooKeeper ，副本并不影响 `SELECT` 的性能，查询复制表与非复制表速度是一样的。查询分布式表时，ClickHouse的处理方式可通过设置 [max_replica_delay_for_distributed_queries](../../../operations/settings/settings.md#settings-max_replica_delay_for_distributed_queries) 和 [fallback_to_stale_replicas_for_distributed_queries](../../../operations/settings/settings.md) 修改。
 
 对于每个 `INSERT` 语句，会通过几个事务将十来个记录添加到 ZooKeeper。（确切地说，这是针对每个插入的数据块; 每个 INSERT 语句的每 `max_insert_block_size = 1048576` 行和最后剩余的都各算作一个块。）相比非复制表，写 zk 会导致 `INSERT` 的延迟略长一些。但只要你按照建议每秒不超过一个 `INSERT` 地批量插入数据，不会有任何问题。一个 ZooKeeper 集群能给整个 ClickHouse 集群支撑协调每秒几百个 `INSERT`。数据插入的吞吐量（每秒的行数）可以跟不用复制的数据一样高。
 
diff --git a/docs/zh/faq/terms_translation_zh.md b/docs/zh/faq/terms_translation_zh.md
new file mode 100644
index 00000000000..d252b4e293e
--- /dev/null
+++ b/docs/zh/faq/terms_translation_zh.md
@@ -0,0 +1,38 @@
+# 术语翻译约定
+本文档用来维护从英文翻译成中文的术语集。
+
+
+
+## 保持英文，不译
+Parquet
+
+## 英文   <->         中文
+Integer             整数
+floating-point      浮点数
+Fitting             拟合
+Decimal             定点数
+Tuple               元组
+function            函数
+array               数组/阵列
+hash                哈希/散列
+Parameters          参数
+Arguments           参数
+
+
+##
+1. 对于array的翻译，保持初始翻译 数组/阵列 不变。
+
+2. 对于倒装句。翻译时非直译，会调整语序。
+比如, groupArrayInsertAt 翻译中
+
+``` text
+-   `x` — [Expression] resulting in one of the [supported data types].
+```
+
+``` text
+`x` — 生成所[支持的数据类型](数据)的[表达式]。
+```
+
+3. See also         参见
+
+
diff --git a/docs/zh/getting-started/index.md b/docs/zh/getting-started/index.md
index fdffca954f7..c5ec7ded932 100644
--- a/docs/zh/getting-started/index.md
+++ b/docs/zh/getting-started/index.md
@@ -1,7 +1,5 @@
 ---
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: "\u5BFC\u8A00"
+toc_folder_title: 快速上手
 toc_priority: 2
 ---
 
@@ -9,7 +7,7 @@ toc_priority: 2
 
 如果您是ClickHouse的新手，并希望亲身体验它的性能。
 
-首先需要进行 [环境安装与部署](install.md).
+首先需要完成 [安装与部署](install.md).
 
 之后，您可以通过教程与示例数据完成自己的入门第一步：
 
diff --git a/docs/zh/guides/apply-catboost-model.md b/docs/zh/guides/apply-catboost-model.md
index 5e374751052..9002e5cf005 100644
--- a/docs/zh/guides/apply-catboost-model.md
+++ b/docs/zh/guides/apply-catboost-model.md
@@ -238,6 +238,6 @@ FROM
 ```
 
 !!! note "注"
-    查看函数说明 [avg()](../sql-reference/aggregate-functions/reference.md#agg_function-avg) 和 [log()](../sql-reference/functions/math-functions.md) 。
+    查看函数说明 [avg()](../sql-reference/aggregate-functions/reference/avg.md#agg_function-avg) 和 [log()](../sql-reference/functions/math-functions.md) 。
 
 [原始文章](https://clickhouse.tech/docs/en/guides/apply_catboost_model/) <!--hide-->
diff --git a/docs/zh/interfaces/index.md b/docs/zh/interfaces/index.md
index b678adc765a..4bc14539896 100644
--- a/docs/zh/interfaces/index.md
+++ b/docs/zh/interfaces/index.md
@@ -1,5 +1,5 @@
 ---
-toc_folder_title: Interfaces
+toc_folder_title: 接口
 toc_priority: 14
 toc_title: 客户端
 ---
diff --git a/docs/zh/introduction/distinctive-features.md b/docs/zh/introduction/distinctive-features.md
index e9a506f2481..f74c98a0c1d 100644
--- a/docs/zh/introduction/distinctive-features.md
+++ b/docs/zh/introduction/distinctive-features.md
@@ -17,7 +17,7 @@ toc_title: ClickHouse的特性
 
 在一些列式数据库管理系统中(例如：InfiniDB CE 和 MonetDB) 并没有使用数据压缩。但是, 若想达到比较优异的性能，数据压缩确实起到了至关重要的作用。
 
-除了在磁盘空间和CPU消耗之间进行不同权衡的高效通用压缩编解码器之外，ClickHouse还提供针对特定类型数据的[专用编解码器](../sql-reference/statements/create/table.md#create-query-specialized-codecs)，这使得ClickHouse能够与更小的数据库(如时间序列数据库)竞争并超越它们。
+除了在磁盘空间和CPU消耗之间进行不同权衡的高效通用压缩编解码器之外，ClickHouse还提供针对特定类型数据的[专用编解码器](../sql-reference/statements/create.md#create-query-specialized-codecs)，这使得ClickHouse能够与更小的数据库(如时间序列数据库)竞争并超越它们。
 
 ## 数据的磁盘存储 {#shu-ju-de-ci-pan-cun-chu}
 
diff --git a/docs/zh/introduction/index.md b/docs/zh/introduction/index.md
index 3b9deddd5cc..64466809d18 100644
--- a/docs/zh/introduction/index.md
+++ b/docs/zh/introduction/index.md
@@ -1,7 +1,5 @@
 ---
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: "\u5BFC\u8A00"
+toc_folder_title: 简介
 toc_priority: 1
 ---
 
diff --git a/docs/zh/operations/settings/query-complexity.md b/docs/zh/operations/settings/query-complexity.md
index 1e7dc82f7e1..680d5e001e0 100644
--- a/docs/zh/operations/settings/query-complexity.md
+++ b/docs/zh/operations/settings/query-complexity.md
@@ -45,7 +45,7 @@ Restrictions on the «maximum amount of something» can take the value 0, which
 
 用于在单个服务器上运行用户查询的最大RAM量。
 
-默认值定义在 [设置。h](https://github.com/ClickHouse/ClickHouse/blob/master/src/Interpreters/Settings.h#L244). 默认情况下，金额不受限制 (`max_memory_usage_for_user = 0`).
+默认值定义在 [Settings.h](https://github.com/ClickHouse/ClickHouse/blob/master/src/Interpreters/Settings.h#L244). 默认情况下，数额不受限制 (`max_memory_usage_for_user = 0`).
 
 另请参阅说明 [max_memory_usage](#settings_max_memory_usage).
 
@@ -53,7 +53,7 @@ Restrictions on the «maximum amount of something» can take the value 0, which
 
 用于在单个服务器上运行所有查询的最大RAM数量。
 
-默认值定义在 [设置。h](https://github.com/ClickHouse/ClickHouse/blob/master/src/Interpreters/Settings.h#L245). 默认情况下，金额不受限制 (`max_memory_usage_for_all_queries = 0`).
+默认值定义在 [Settings.h](https://github.com/ClickHouse/ClickHouse/blob/master/src/Interpreters/Settings.h#L245). 默认情况下，数额不受限制 (`max_memory_usage_for_all_queries = 0`).
 
 另请参阅说明 [max_memory_usage](#settings_max_memory_usage).
 
diff --git a/docs/zh/operations/settings/settings.md b/docs/zh/operations/settings/settings.md
index 64625c19c6a..720b822ce29 100644
--- a/docs/zh/operations/settings/settings.md
+++ b/docs/zh/operations/settings/settings.md
@@ -988,15 +988,15 @@ ClickHouse生成异常
 
 ## count_distinct_implementation {#settings-count_distinct_implementation}
 
-指定其中的 `uniq*` 函数应用于执行 [COUNT(DISTINCT …)](../../sql-reference/aggregate-functions/reference.md#agg_function-count) 建筑。
+指定其中的 `uniq*` 函数应用于执行 [COUNT(DISTINCT …)](../../sql-reference/aggregate-functions/reference/count.md#agg_function-count) 建筑。
 
 可能的值:
 
--   [uniq](../../sql-reference/aggregate-functions/reference.md#agg_function-uniq)
--   [uniqCombined](../../sql-reference/aggregate-functions/reference.md#agg_function-uniqcombined)
--   [uniqCombined64](../../sql-reference/aggregate-functions/reference.md#agg_function-uniqcombined64)
--   [uniqHLL12](../../sql-reference/aggregate-functions/reference.md#agg_function-uniqhll12)
--   [uniqExact](../../sql-reference/aggregate-functions/reference.md#agg_function-uniqexact)
+-   [uniq](../../sql-reference/aggregate-functions/reference/uniq.md#agg_function-uniq)
+-   [uniqCombined](../../sql-reference/aggregate-functions/reference/uniqcombined.md#agg_function-uniqcombined)
+-   [uniqCombined64](../../sql-reference/aggregate-functions/reference/uniqcombined64.md#agg_function-uniqcombined64)
+-   [uniqHLL12](../../sql-reference/aggregate-functions/reference/uniqhll12.md#agg_function-uniqhll12)
+-   [uniqExact](../../sql-reference/aggregate-functions/reference/uniqexact.md#agg_function-uniqexact)
 
 默认值: `uniqExact`.
 
diff --git a/docs/zh/operations/system-tables/query_log.md b/docs/zh/operations/system-tables/query_log.md
index 6d8d7a39699..aa954fc4845 100644
--- a/docs/zh/operations/system-tables/query_log.md
+++ b/docs/zh/operations/system-tables/query_log.md
@@ -5,86 +5,87 @@ machine_translated_rev: 5decc73b5dc60054f19087d3690c4eb99446a6c3
 
 # system.query_log {#system_tables-query_log}
 
-包含有关已执行查询的信息，例如，开始时间、处理持续时间、错误消息。
+包含已执行查询的相关信息，例如：开始时间、处理持续时间、错误消息。
 
 !!! note "注"
     此表不包含以下内容的摄取数据 `INSERT` 查询。
 
-您可以更改查询日志记录的设置 [query_log](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-query-log) 服务器配置部分。
+您可以更改query_log的设置，在服务器配置的 [query_log](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-query-log) 部分。
 
-您可以通过设置禁用查询日志记录 [log_queries=0](../../operations/settings/settings.md#settings-log-queries). 我们不建议关闭日志记录，因为此表中的信息对于解决问题很重要。
+您可以通过设置 [log_queries=0](../../operations/settings/settings.md#settings-log-queries)来禁用query_log. 我们不建议关闭此日志，因为此表中的信息对于解决问题很重要。
 
-数据的冲洗周期设置在 `flush_interval_milliseconds` 的参数 [query_log](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-query-log) 服务器设置部分。 要强制冲洗，请使用 [SYSTEM FLUSH LOGS](../../sql-reference/statements/system.md#query_language-system-flush_logs) 查询。
+数据刷新的周期可通过 `flush_interval_milliseconds` 参数来设置 [query_log](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-query-log) 。 要强制刷新，请使用 [SYSTEM FLUSH LOGS](../../sql-reference/statements/system.md#query_language-system-flush_logs)。
 
-ClickHouse不会自动从表中删除数据。 看 [导言](../../operations/system-tables/index.md#system-tables-introduction) 欲了解更多详情。
+ClickHouse不会自动从表中删除数据。更多详情请看 [introduction](../../operations/system-tables/index.md#system-tables-introduction) 。
 
-该 `system.query_log` 表注册两种查询:
+`system.query_log` 表注册两种查询:
 
 1.  客户端直接运行的初始查询。
 2.  由其他查询启动的子查询（用于分布式查询执行）。 对于这些类型的查询，有关父查询的信息显示在 `initial_*` 列。
 
-每个查询创建一个或两个行中 `query_log` 表，这取决于状态（见 `type` 列）的查询:
+每个查询在`query_log` 表中创建一或两行记录，这取决于查询的状态（见 `type` 列）:
 
-1.  如果查询执行成功，则两行具有 `QueryStart` 和 `QueryFinish` 创建类型。
-2.  如果在查询处理过程中发生错误，两个事件与 `QueryStart` 和 `ExceptionWhileProcessing` 创建类型。
-3.  如果在启动查询之前发生错误，则单个事件具有 `ExceptionBeforeStart` 创建类型。
+1.  如果查询执行成功，会创建type分别为`QueryStart` 和 `QueryFinish` 的两行记录。
+2.  如果在查询处理过程中发生错误，会创建type分别为`QueryStart` 和 `ExceptionWhileProcessing` 的两行记录。
+3.  如果在启动查询之前发生错误，则创建一行type为`ExceptionBeforeStart` 的记录。
 
 列:
 
--   `type` ([枚举8](../../sql-reference/data-types/enum.md)) — Type of an event that occurred when executing the query. Values:
-    -   `'QueryStart' = 1` — Successful start of query execution.
-    -   `'QueryFinish' = 2` — Successful end of query execution.
-    -   `'ExceptionBeforeStart' = 3` — Exception before the start of query execution.
-    -   `'ExceptionWhileProcessing' = 4` — Exception during the query execution.
--   `event_date` ([日期](../../sql-reference/data-types/date.md)) — Query starting date.
--   `event_time` ([日期时间](../../sql-reference/data-types/datetime.md)) — Query starting time.
--   `query_start_time` ([日期时间](../../sql-reference/data-types/datetime.md)) — Start time of query execution.
--   `query_duration_ms` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Duration of query execution in milliseconds.
--   `read_rows` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Total number or rows read from all tables and table functions participated in query. It includes usual subqueries, subqueries for `IN` 和 `JOIN`. 对于分布式查询 `read_rows` 包括在所有副本上读取的行总数。 每个副本发送它的 `read_rows` 值，并且查询的服务器-发起方汇总所有接收到的和本地的值。 缓存卷不会影响此值。
--   `read_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Total number or bytes read from all tables and table functions participated in query. It includes usual subqueries, subqueries for `IN` 和 `JOIN`. 对于分布式查询 `read_bytes` 包括在所有副本上读取的行总数。 每个副本发送它的 `read_bytes` 值，并且查询的服务器-发起方汇总所有接收到的和本地的值。 缓存卷不会影响此值。
--   `written_rows` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — For `INSERT` 查询，写入的行数。 对于其他查询，列值为0。
--   `written_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — For `INSERT` 查询时，写入的字节数。 对于其他查询，列值为0。
--   `result_rows` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Number of rows in a result of the `SELECT` 查询，或者在一些行 `INSERT` 查询。
--   `result_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — RAM volume in bytes used to store a query result.
--   `memory_usage` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Memory consumption by the query.
--   `query` ([字符串](../../sql-reference/data-types/string.md)) — Query string.
--   `exception` ([字符串](../../sql-reference/data-types/string.md)) — Exception message.
--   `exception_code` ([Int32](../../sql-reference/data-types/int-uint.md)) — Code of an exception.
--   `stack_trace` ([字符串](../../sql-reference/data-types/string.md)) — [堆栈跟踪](https://en.wikipedia.org/wiki/Stack_trace). 如果查询成功完成，则为空字符串。
--   `is_initial_query` ([UInt8](../../sql-reference/data-types/int-uint.md)) — Query type. Possible values:
-    -   1 — Query was initiated by the client.
-    -   0 — Query was initiated by another query as part of distributed query execution.
--   `user` ([字符串](../../sql-reference/data-types/string.md)) — Name of the user who initiated the current query.
--   `query_id` ([字符串](../../sql-reference/data-types/string.md)) — ID of the query.
--   `address` ([IPv6](../../sql-reference/data-types/domains/ipv6.md)) — IP address that was used to make the query.
--   `port` ([UInt16](../../sql-reference/data-types/int-uint.md)) — The client port that was used to make the query.
--   `initial_user` ([字符串](../../sql-reference/data-types/string.md)) — Name of the user who ran the initial query (for distributed query execution).
--   `initial_query_id` ([字符串](../../sql-reference/data-types/string.md)) — ID of the initial query (for distributed query execution).
--   `initial_address` ([IPv6](../../sql-reference/data-types/domains/ipv6.md)) — IP address that the parent query was launched from.
--   `initial_port` ([UInt16](../../sql-reference/data-types/int-uint.md)) — The client port that was used to make the parent query.
--   `interface` ([UInt8](../../sql-reference/data-types/int-uint.md)) — Interface that the query was initiated from. Possible values:
+-   `type` ([Enum8](../../sql-reference/data-types/enum.md)) — 执行查询时的事件类型. 值:
+    -   `'QueryStart' = 1` — 查询成功启动.
+    -   `'QueryFinish' = 2` — 查询成功完成.
+    -   `'ExceptionBeforeStart' = 3` — 查询执行前有异常.
+    -   `'ExceptionWhileProcessing' = 4` — 查询执行期间有异常.
+-   `event_date` ([Date](../../sql-reference/data-types/date.md)) — 查询开始日期.
+-   `event_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — 查询开始时间.
+-   `event_time_microseconds` ([DateTime64](../../sql-reference/data-types/datetime64.md)) — 查询开始时间（毫秒精度）.
+-   `query_start_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — 查询执行的开始时间.
+-   `query_start_time_microseconds` (DateTime64) — 查询执行的开始时间（毫秒精度）.
+-   `query_duration_ms` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — 查询消耗的时间（毫秒）.
+-   `read_rows` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — 从参与了查询的所有表和表函数读取的总行数. 包括：普通的子查询,  `IN` 和 `JOIN`的子查询. 对于分布式查询 `read_rows` 包括在所有副本上读取的行总数。 每个副本发送它的 `read_rows` 值，并且查询的服务器-发起方汇总所有接收到的和本地的值。 缓存卷不会影响此值。
+-   `read_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — 从参与了查询的所有表和表函数读取的总字节数. 包括：普通的子查询,  `IN` 和 `JOIN`的子查询. 对于分布式查询 `read_bytes` 包括在所有副本上读取的字节总数。 每个副本发送它的 `read_bytes` 值，并且查询的服务器-发起方汇总所有接收到的和本地的值。 缓存卷不会影响此值。
+-   `written_rows` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — 对于 `INSERT` 查询，为写入的行数。 对于其他查询，值为0。
+-   `written_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — 对于 `INSERT` 查询时，为写入的字节数。 对于其他查询，值为0。
+-   `result_rows` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — `SELECT` 查询结果的行数，或`INSERT` 的行数。
+-   `result_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — 存储查询结果的RAM量.
+-   `memory_usage` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — 查询使用的内存.
+-   `query` ([String](../../sql-reference/data-types/string.md)) — 查询语句.
+-   `exception` ([String](../../sql-reference/data-types/string.md)) — 异常信息.
+-   `exception_code` ([Int32](../../sql-reference/data-types/int-uint.md)) — 异常码.
+-   `stack_trace` ([String](../../sql-reference/data-types/string.md)) — [Stack Trace](https://en.wikipedia.org/wiki/Stack_trace). 如果查询成功完成，则为空字符串。
+-   `is_initial_query` ([UInt8](../../sql-reference/data-types/int-uint.md)) — 查询类型. 可能的值:
+    -   1 — 客户端发起的查询.
+    -   0 — 由另一个查询发起的，作为分布式查询的一部分.
+-   `user` ([String](../../sql-reference/data-types/string.md)) — 发起查询的用户.
+-   `query_id` ([String](../../sql-reference/data-types/string.md)) — 查询ID.
+-   `address` ([IPv6](../../sql-reference/data-types/domains/ipv6.md)) — 发起查询的客户端IP地址.
+-   `port` ([UInt16](../../sql-reference/data-types/int-uint.md)) — 发起查询的客户端端口.
+-   `initial_user` ([String](../../sql-reference/data-types/string.md)) — 初始查询的用户名（用于分布式查询执行）.
+-   `initial_query_id` ([String](../../sql-reference/data-types/string.md)) — 运行初始查询的ID（用于分布式查询执行）.
+-   `initial_address` ([IPv6](../../sql-reference/data-types/domains/ipv6.md)) — 运行父查询的IP地址.
+-   `initial_port` ([UInt16](../../sql-reference/data-types/int-uint.md)) — 发起父查询的客户端端口.
+-   `interface` ([UInt8](../../sql-reference/data-types/int-uint.md)) — 发起查询的接口. 可能的值:
     -   1 — TCP.
     -   2 — HTTP.
--   `os_user` ([字符串](../../sql-reference/data-types/string.md)) — Operating system username who runs [ﾂ环板clientｮﾂ嘉ｯﾂ偲](../../interfaces/cli.md).
--   `client_hostname` ([字符串](../../sql-reference/data-types/string.md)) — Hostname of the client machine where the [ﾂ环板clientｮﾂ嘉ｯﾂ偲](../../interfaces/cli.md) 或者运行另一个TCP客户端。
--   `client_name` ([字符串](../../sql-reference/data-types/string.md)) — The [ﾂ环板clientｮﾂ嘉ｯﾂ偲](../../interfaces/cli.md) 或另一个TCP客户端名称。
--   `client_revision` ([UInt32](../../sql-reference/data-types/int-uint.md)) — Revision of the [ﾂ环板clientｮﾂ嘉ｯﾂ偲](../../interfaces/cli.md) 或另一个TCP客户端。
--   `client_version_major` ([UInt32](../../sql-reference/data-types/int-uint.md)) — Major version of the [ﾂ环板clientｮﾂ嘉ｯﾂ偲](../../interfaces/cli.md) 或另一个TCP客户端。
--   `client_version_minor` ([UInt32](../../sql-reference/data-types/int-uint.md)) — Minor version of the [ﾂ环板clientｮﾂ嘉ｯﾂ偲](../../interfaces/cli.md) 或另一个TCP客户端。
--   `client_version_patch` ([UInt32](../../sql-reference/data-types/int-uint.md)) — Patch component of the [ﾂ环板clientｮﾂ嘉ｯﾂ偲](../../interfaces/cli.md) 或另一个TCP客户端版本。
--   `http_method` (UInt8) — HTTP method that initiated the query. Possible values:
-    -   0 — The query was launched from the TCP interface.
-    -   1 — `GET` 方法被使用。
-    -   2 — `POST` 方法被使用。
--   `http_user_agent` ([字符串](../../sql-reference/data-types/string.md)) — The `UserAgent` http请求中传递的标头。
--   `quota_key` ([字符串](../../sql-reference/data-types/string.md)) — The “quota key” 在指定 [配额](../../operations/quotas.md) 设置（见 `keyed`).
+-   `os_user` ([String](../../sql-reference/data-types/string.md)) — 运行 [clickhouse-client](../../interfaces/cli.md)的操作系统用户名.
+-   `client_hostname` ([String](../../sql-reference/data-types/string.md)) — 运行[clickhouse-client](../../interfaces/cli.md) 或其他TCP客户端的机器的主机名。
+-   `client_name` ([String](../../sql-reference/data-types/string.md)) — [clickhouse-client](../../interfaces/cli.md) 或其他TCP客户端的名称。
+-   `client_revision` ([UInt32](../../sql-reference/data-types/int-uint.md)) — [clickhouse-client](../../interfaces/cli.md) 或其他TCP客户端的Revision。
+-   `client_version_major` ([UInt32](../../sql-reference/data-types/int-uint.md)) — [clickhouse-client](../../interfaces/cli.md) 或其他TCP客户端的Major version。
+-   `client_version_minor` ([UInt32](../../sql-reference/data-types/int-uint.md)) — [clickhouse-client](../../interfaces/cli.md) 或其他TCP客户端的Minor version。
+-   `client_version_patch` ([UInt32](../../sql-reference/data-types/int-uint.md)) — [clickhouse-client](../../interfaces/cli.md) 或其他TCP客户端的Patch component。
+-   `http_method` (UInt8) — 发起查询的HTTP方法. 可能值:
+    -   0 — TCP接口的查询.
+    -   1 — `GET` 
+    -   2 — `POST`
+-   `http_user_agent` ([String](../../sql-reference/data-types/string.md)) — The `UserAgent` The UserAgent header passed in the HTTP request。
+-   `quota_key` ([String](../../sql-reference/data-types/string.md)) — 在[quotas](../../operations/quotas.md) 配置里设置的“quota key” （见 `keyed`).
 -   `revision` ([UInt32](../../sql-reference/data-types/int-uint.md)) — ClickHouse revision.
--   `thread_numbers` ([数组(UInt32)](../../sql-reference/data-types/array.md)) — Number of threads that are participating in query execution.
--   `ProfileEvents.Names` ([数组（字符串)](../../sql-reference/data-types/array.md)) — Counters that measure different metrics. The description of them could be found in the table [系统。活动](../../operations/system-tables/events.md#system_tables-events)
--   `ProfileEvents.Values` ([数组(UInt64)](../../sql-reference/data-types/array.md)) — Values of metrics that are listed in the `ProfileEvents.Names` 列。
--   `Settings.Names` ([数组（字符串)](../../sql-reference/data-types/array.md)) — Names of settings that were changed when the client ran the query. To enable logging changes to settings, set the `log_query_settings` 参数为1。
--   `Settings.Values` ([数组（字符串)](../../sql-reference/data-types/array.md)) — Values of settings that are listed in the `Settings.Names` 列。
-
+-   `thread_numbers` ([Array(UInt32)](../../sql-reference/data-types/array.md)) — 参与查询的线程数.
+-   `ProfileEvents.Names` ([Array（String)](../../sql-reference/data-types/array.md)) — 衡量不同指标的计数器。 可以在[system.events](../../operations/system-tables/events.md#system_tables-events)中找到它们的描述。
+-   `ProfileEvents.Values` ([Array(UInt64)](../../sql-reference/data-types/array.md)) — `ProfileEvents.Names` 列中列出的指标的值。
+-   `Settings.Names` ([Array（String)](../../sql-reference/data-types/array.md)) — 客户端运行查询时更改的设置的名称。 要启用对设置的日志记录更改，请将log_query_settings参数设置为1。
+-   `Settings.Values` ([Array（String)](../../sql-reference/data-types/array.md)) — `Settings.Names` 列中列出的设置的值。
 **示例**
 
 ``` sql
@@ -140,4 +141,4 @@ Settings.Values:      ['0','random','1','10000000000']
 
 **另请参阅**
 
--   [system.query_thread_log](../../operations/system-tables/query_thread_log.md#system_tables-query_thread_log) — This table contains information about each query execution thread.
+-   [system.query_thread_log](../../operations/system-tables/query_thread_log.md#system_tables-query_thread_log) — 这个表包含了每个查询执行线程的信息
diff --git a/docs/zh/operations/tips.md b/docs/zh/operations/tips.md
index 511e8a22644..6b46dbb5285 100644
--- a/docs/zh/operations/tips.md
+++ b/docs/zh/operations/tips.md
@@ -1,24 +1,8 @@
 # 使用建议 {#usage-recommendations}
 
-## CPU {#cpu}
+## CPU频率调节器 {#cpu-scaling-governor}
 
-必须支持SSE4.2指令集。 现代处理器（自2008年以来）支持它。
-
-选择处理器时，与较少的内核和较高的时钟速率相比，更喜欢大量内核和稍慢的时钟速率。
-例如，具有2600MHz的16核心比具有3600MHz的8核心更好。
-
-## 超线程 {#hyper-threading}
-
-不要禁用超线程。 它有助于某些查询，但不适用于其他查询。
-
-## 超频 {#turbo-boost}
-
-强烈推荐超频(turbo-boost)。 它显着提高了典型负载的性能。
-您可以使用 `turbostat` 要查看负载下的CPU的实际时钟速率。
-
-## CPU缩放调控器 {#cpu-scaling-governor}
-
-始终使用 `performance` 缩放调控器。 该 `on-demand` 随着需求的不断增加，缩放调节器的工作要糟糕得多。
+始终使用 `performance` 频率调节器。  `on-demand` 频率调节器在持续高需求的情况下，效果更差。
 
 ``` bash
 echo 'performance' | sudo tee /sys/devices/system/cpu/cpu*/cpufreq/scaling_governor
@@ -26,68 +10,70 @@ echo 'performance' | sudo tee /sys/devices/system/cpu/cpu*/cpufreq/scaling_gover
 
 ## CPU限制 {#cpu-limitations}
 
-处理器可能会过热。 使用 `dmesg` 看看CPU的时钟速率是否由于过热而受到限制。
-此限制也可以在数据中心级别的外部设置。 您可以使用 `turbostat` 在负载下监视它。
+处理器可能会过热。 使用 `dmesg` 查看CPU的时钟速率是否由于过热而受到限制。
+该限制也可以在数据中心级别外部设置。 您可以使用 `turbostat` 在负载下对其进行监控。
 
 ## RAM {#ram}
 
-对于少量数据（高达-200GB压缩），最好使用与数据量一样多的内存。
-对于大量数据和处理交互式（在线）查询时，应使用合理数量的RAM（128GB或更多），以便热数据子集适合页面缓存。
-即使对于每台服务器约50TB的数据量，使用128GB的RAM与64GB相比显着提高了查询性能。
+对于少量数据（压缩后约200GB），最好使用与数据量一样多的内存。
+对于大量数据，以及在处理交互式（在线）查询时，应使用合理数量的RAM（128GB或更多），以便热数据子集适合页面缓存。
+即使对于每台服务器约50TB的数据量，与64GB相比，使用128GB的RAM也可以显着提高查询性能。
 
-## 交换文件 {#swap-file}
+不要禁用 overcommit。`cat /proc/sys/vm/overcommit_memory` 的值应该为0或1。运行
 
-始终禁用交换文件。 不这样做的唯一原因是，如果您使用的ClickHouse在您的个人笔记本电脑。
+``` bash
+$ echo 0 | sudo tee /proc/sys/vm/overcommit_memory
+```
 
 ## 大页(Huge Pages) {#huge-pages}
 
-始终禁用透明大页(transparent huge pages)。 它会干扰内存分alloc，从而导致显着的性能下降。
+始终禁用透明大页(transparent huge pages)。 它会干扰内存分配器，从而导致显着的性能下降。
 
 ``` bash
 echo 'never' | sudo tee /sys/kernel/mm/transparent_hugepage/enabled
 ```
 
-使用 `perf top` 观察内核中用于内存管理的时间。
+使用 `perf top` 来查看内核在内存管理上花费的时间。
 永久大页(permanent huge pages)也不需要被分配。
 
-## 存储系统 {#storage-subsystem}
+## 存储子系统 {#storage-subsystem}
 
 如果您的预算允许您使用SSD，请使用SSD。
 如果没有，请使用硬盘。 SATA硬盘7200转就行了。
 
-优先选择带有本地硬盘驱动器的大量服务器，而不是带有附加磁盘架的小量服务器。
-但是对于存储具有罕见查询的档案，货架将起作用。
+优先选择许多带有本地硬盘驱动器的服务器，而不是少量带有附加磁盘架的服务器。
+但是对于存储极少查询的档案，架子可以使用。
 
 ## RAID {#raid}
 
 当使用硬盘，你可以结合他们的RAID-10，RAID-5，RAID-6或RAID-50。
-对于Linux，软件RAID更好（与 `mdadm`). 我们不建议使用LVM。
+对于Linux，软件RAID更好（使用 `mdadm`). 我们不建议使用LVM。
 当创建RAID-10，选择 `far` 布局。
 如果您的预算允许，请选择RAID-10。
 
-如果您有超过4个磁盘，请使用RAID-6（首选）或RAID-50，而不是RAID-5。
+如果您有4个以上的磁盘，请使用RAID-6（首选）或RAID-50，而不是RAID-5。
 当使用RAID-5、RAID-6或RAID-50时，始终增加stripe_cache_size，因为默认值通常不是最佳选择。
 
 ``` bash
 echo 4096 | sudo tee /sys/block/md2/md/stripe_cache_size
 ```
 
-使用以下公式，从设备数量和块大小计算确切数量: `2 * num_devices * chunk_size_in_bytes / 4096`.
+使用以下公式从设备数量和块大小中计算出确切的数量: `2 * num_devices * chunk_size_in_bytes / 4096`。
 
-1025KB的块大小足以满足所有RAID配置。
+1024KB的块大小足以满足所有RAID配置。
 切勿将块大小设置得太小或太大。
 
 您可以在SSD上使用RAID-0。
-无论使用何种RAID，始终使用复制来保证数据安全。
+无论使用哪种RAID，始终使用复制来保证数据安全。
 
-使用长队列启用NCQ。 对于HDD，选择CFQ调度程序，对于SSD，选择noop。 不要减少 ‘readahead’ 设置。
+启用有长队列的NCQ。 对于HDD，选择CFQ调度程序，对于SSD，选择noop。 不要减少 ‘readahead’ 设置。
 对于HDD，启用写入缓存。
 
 ## 文件系统 {#file-system}
 
 Ext4是最可靠的选择。 设置挂载选项 `noatime, nobarrier`.
-XFS也是合适的，但它还没有经过ClickHouse的彻底测试。
-大多数其他文件系统也应该正常工作。 具有延迟分配的文件系统工作得更好。
+XFS也是合适的，但它还没有经过ClickHouse的全面测试。
+大多数其他文件系统也应该可以正常工作。 具有延迟分配的文件系统工作得更好。
 
 ## Linux内核 {#linux-kernel}
 
@@ -95,26 +81,43 @@ XFS也是合适的，但它还没有经过ClickHouse的彻底测试。
 
 ## 网络 {#network}
 
-如果您使用的是IPv6，请增加路由缓存的大小。
-3.2之前的Linux内核在IPv6实现方面遇到了许多问题。
+如果使用的是IPv6，请增加路由缓存的大小。
+3.2之前的Linux内核在IPv6实现方面存在许多问题。
 
-如果可能的话，至少使用一个10GB的网络。 1Gb也可以工作，但对于使用数十tb的数据修补副本或处理具有大量中间数据的分布式查询，情况会更糟。
+如果可能的话，至少使用10GB的网络。1GB也可以工作，但对于使用数十TB的数据修补副本或处理具有大量中间数据的分布式查询，情况会更糟。
+
+## 虚拟机监视器(Hypervisor)配置
+
+如果您使用的是OpenStack，请在nova.conf中设置
+```
+cpu_mode=host-passthrough
+```
+。
+
+如果您使用的是libvirt，请在XML配置中设置
+```
+<cpu mode='host-passthrough'/>
+```
+。
+
+这对于ClickHouse能够通过 `cpuid` 指令获取正确的信息非常重要。
+否则，当在旧的CPU型号上运行虚拟机监视器时，可能会导致 `Illegal instruction` 崩溃。
 
 ## Zookeeper {#zookeeper}
 
-您可能已经将ZooKeeper用于其他目的。 您可以使用相同的zookeeper安装，如果它还没有超载。
+您可能已经将ZooKeeper用于其他目的。 如果它还没有超载，您可以使用相同的zookeeper。
 
-最好使用新版本的 Zookeeper – 3.4.9 或之后的版本. 稳定 Liunx 发行版中的 Zookeeper 版本可能是落后的。
+最好使用新版本的Zookeeper – 3.4.9 或更高的版本. 稳定的Liunx发行版中的Zookeeper版本可能已过时。
 
-你永远不该使用自己手写的脚本在不同的 Zookeeper 集群之间转移数据, 这可能会导致序列节点的数据不正确。出于同样的原因，永远不要使用 zkcopy 工具: https://github.com/ksprojects/zkcopy/issues/15
+你永远不要使用手动编写的脚本在不同的Zookeeper集群之间传输数据, 这可能会导致序列节点的数据不正确。出于相同的原因，永远不要使用 zkcopy 工具: https://github.com/ksprojects/zkcopy/issues/15
 
-如果要将现有ZooKeeper集群分为两个，正确的方法是增加其副本的数量，然后将其重新配置为两个独立的集群。
+如果要将现有的ZooKeeper集群分为两个，正确的方法是增加其副本的数量，然后将其重新配置为两个独立的集群。
 
-不要在与ClickHouse相同的服务器上运行ZooKeeper。 因为ZooKeeper对延迟非常敏感，而ClickHouse可能会占用所有可用的系统资源。
+不要在ClickHouse所在的服务器上运行ZooKeeper。 因为ZooKeeper对延迟非常敏感，而ClickHouse可能会占用所有可用的系统资源。
 
 默认设置下，ZooKeeper 就像是一个定时炸弹:
 
-当使用默认配置时，ZooKeeper服务不会从旧快照和日志中删除文件（请参阅autopurge），这是操作员的责任。
+当使用默认配置时，ZooKeeper服务器不会从旧的快照和日志中删除文件（请参阅autopurge），这是操作员的责任。
 
 必须拆除炸弹。
 
@@ -222,7 +225,7 @@ JAVA_OPTS="-Xms{{ '{{' }} cluster.get('xms','128M') {{ '}}' }} \
 -XX:+CMSParallelRemarkEnabled"
 ```
 
-Salt init:
+初始化:
 
     description "zookeeper-{{ '{{' }} cluster['name'] {{ '}}' }} centralized coordination service"
 
diff --git a/docs/zh/sql-reference/aggregate-functions/combinators.md b/docs/zh/sql-reference/aggregate-functions/combinators.md
index c458097a5fb..6d1cd9c775c 100644
--- a/docs/zh/sql-reference/aggregate-functions/combinators.md
+++ b/docs/zh/sql-reference/aggregate-functions/combinators.md
@@ -27,7 +27,7 @@ toc_title: 聚合函数组合器
 
 ## -State {#agg-functions-combinator-state}
 
-如果应用此combinator，则聚合函数不会返回结果值（例如唯一值的数量 [uniq](reference.md#agg_function-uniq) 函数），但是返回聚合的中间状态（对于 `uniq`，返回的是计算唯一值的数量的哈希表）。 这是一个 `AggregateFunction(...)` 可用于进一步处理或存储在表中以完成稍后的聚合。
+如果应用此combinator，则聚合函数不会返回结果值（例如唯一值的数量 [uniq](./reference/uniq.md#agg_function-uniq) 函数），但是返回聚合的中间状态（对于 `uniq`，返回的是计算唯一值的数量的哈希表）。 这是一个 `AggregateFunction(...)` 可用于进一步处理或存储在表中以完成稍后的聚合。
 
 要使用这些状态，请使用:
 
@@ -209,7 +209,7 @@ FROM
 
 让我们得到的人的名字，他们的年龄在于的时间间隔 `[30,60)` 和 `[60,75)`。 由于我们使用整数表示的年龄，我们得到的年龄 `[30, 59]` 和 `[60,74]` 间隔。
 
-要在数组中聚合名称，我们使用 [groupArray](reference.md#agg_function-grouparray) 聚合函数。 这需要一个参数。 在我们的例子中，它是 `name` 列。 `groupArrayResample` 函数应该使用 `age` 按年龄聚合名称， 要定义所需的时间间隔，我们传入 `30, 75, 30` 参数给 `groupArrayResample` 函数。
+要在数组中聚合名称，我们使用 [groupArray](./reference/grouparray.md#agg_function-grouparray) 聚合函数。 这需要一个参数。 在我们的例子中，它是 `name` 列。 `groupArrayResample` 函数应该使用 `age` 按年龄聚合名称， 要定义所需的时间间隔，我们传入 `30, 75, 30` 参数给 `groupArrayResample` 函数。
 
 ``` sql
 SELECT groupArrayResample(30, 75, 30)(name, age) FROM people
diff --git a/docs/zh/sql-reference/aggregate-functions/parametric-functions.md b/docs/zh/sql-reference/aggregate-functions/parametric-functions.md
index d151bbc3957..be9166e5737 100644
--- a/docs/zh/sql-reference/aggregate-functions/parametric-functions.md
+++ b/docs/zh/sql-reference/aggregate-functions/parametric-functions.md
@@ -493,6 +493,6 @@ FROM
 
 ## sumMapFiltered(keys_to_keep)(keys, values) {#summapfilteredkeys-to-keepkeys-values}
 
-和 [sumMap](reference.md#agg_functions-summap) 基本一致， 除了一个键数组作为参数传递。这在使用高基数key时尤其有用。
+和 [sumMap](./reference/summap.md#agg_functions-summap) 基本一致， 除了一个键数组作为参数传递。这在使用高基数key时尤其有用。
 
 [原始文章](https://clickhouse.tech/docs/en/query_language/agg_functions/parametric_functions/) <!--hide-->
diff --git a/docs/zh/sql-reference/aggregate-functions/reference.md b/docs/zh/sql-reference/aggregate-functions/reference.md
deleted file mode 100644
index 3a224886a00..00000000000
--- a/docs/zh/sql-reference/aggregate-functions/reference.md
+++ /dev/null
@@ -1,1912 +0,0 @@
----
-toc_priority: 36
-toc_title: 参考手册
----
-
-# 参考手册 {#aggregate-functions-reference}
-
-## count {#agg_function-count}
-
-计数行数或非空值。
-
-ClickHouse支持以下语法 `count`:
-- `count(expr)` 或 `COUNT(DISTINCT expr)`.
-- `count()` 或 `COUNT(*)`. 该 `count()` 语法是ClickHouse特定的。
-
-**参数**
-
-该功能可以采取:
-
--   零参数。
--   一 [表达式](../syntax.md#syntax-expressions).
-
-**返回值**
-
--   如果没有参数调用函数，它会计算行数。
--   如果 [表达式](../syntax.md#syntax-expressions) 被传递，则该函数计数此表达式返回的次数非null。 如果表达式返回 [可为空](../../sql-reference/data-types/nullable.md)-键入值，然后结果 `count` 保持不 `Nullable`. 如果返回表达式，则该函数返回0 `NULL` 对于所有的行。
-
-在这两种情况下，返回值的类型为 [UInt64](../../sql-reference/data-types/int-uint.md).
-
-**详细信息**
-
-ClickHouse支持 `COUNT(DISTINCT ...)` 语法 这种结构的行为取决于 [count_distinct_implementation](../../operations/settings/settings.md#settings-count_distinct_implementation) 设置。 它定义了其中的 [uniq\*](#agg_function-uniq) 函数用于执行操作。 默认值为 [uniqExact](#agg_function-uniqexact) 功能。
-
-该 `SELECT count() FROM table` 查询未被优化，因为表中的条目数没有单独存储。 它从表中选择一个小列并计算其中的值数。
-
-**例**
-
-示例1:
-
-``` sql
-SELECT count() FROM t
-```
-
-``` text
-┌─count()─┐
-│       5 │
-└─────────┘
-```
-
-示例2:
-
-``` sql
-SELECT name, value FROM system.settings WHERE name = 'count_distinct_implementation'
-```
-
-``` text
-┌─name──────────────────────────┬─value─────┐
-│ count_distinct_implementation │ uniqExact │
-└───────────────────────────────┴───────────┘
-```
-
-``` sql
-SELECT count(DISTINCT num) FROM t
-```
-
-``` text
-┌─uniqExact(num)─┐
-│              3 │
-└────────────────┘
-```
-
-这个例子表明 `count(DISTINCT num)` 由执行 `uniqExact` 根据功能 `count_distinct_implementation` 设定值。
-
-## any(x) {#agg_function-any}
-
-选择第一个遇到的值。
-查询可以以任何顺序执行，甚至每次都以不同的顺序执行，因此此函数的结果是不确定的。
-要获得确定的结果，您可以使用 ‘min’ 或 ‘max’ 功能，而不是 ‘any’.
-
-在某些情况下，可以依靠执行的顺序。 这适用于SELECT来自使用ORDER BY的子查询的情况。
-
-当一个 `SELECT` 查询具有 `GROUP BY` 子句或至少一个聚合函数，ClickHouse（相对于MySQL）要求在所有表达式 `SELECT`, `HAVING`，和 `ORDER BY` 子句可以从键或聚合函数计算。 换句话说，从表中选择的每个列必须在键或聚合函数内使用。 要获得像MySQL这样的行为，您可以将其他列放在 `any` 聚合函数。
-
-## anyHeavy(x) {#anyheavyx}
-
-使用选择一个频繁出现的值 [重打者](http://www.cs.umd.edu/~samir/498/karp.pdf) 算法。 如果某个值在查询的每个执行线程中出现的情况超过一半，则返回此值。 通常情况下，结果是不确定的。
-
-``` sql
-anyHeavy(column)
-```
-
-**参数**
-
--   `column` – The column name.
-
-**示例**
-
-就拿 [时间](../../getting-started/example-datasets/ontime.md) 数据集，并选择在任何频繁出现的值 `AirlineID` 列。
-
-``` sql
-SELECT anyHeavy(AirlineID) AS res
-FROM ontime
-```
-
-``` text
-┌───res─┐
-│ 19690 │
-└───────┘
-```
-
-## anyLast(x) {#anylastx}
-
-选择遇到的最后一个值。
-其结果是一样不确定的 `any` 功能。
-
-## groupBitAnd {#groupbitand}
-
-按位应用 `AND` 对于一系列的数字。
-
-``` sql
-groupBitAnd(expr)
-```
-
-**参数**
-
-`expr` – An expression that results in `UInt*` 类型。
-
-**返回值**
-
-的价值 `UInt*` 类型。
-
-**示例**
-
-测试数据:
-
-``` text
-binary     decimal
-00101100 = 44
-00011100 = 28
-00001101 = 13
-01010101 = 85
-```
-
-查询:
-
-``` sql
-SELECT groupBitAnd(num) FROM t
-```
-
-哪里 `num` 是包含测试数据的列。
-
-结果:
-
-``` text
-binary     decimal
-00000100 = 4
-```
-
-## groupBitOr {#groupbitor}
-
-按位应用 `OR` 对于一系列的数字。
-
-``` sql
-groupBitOr(expr)
-```
-
-**参数**
-
-`expr` – An expression that results in `UInt*` 类型。
-
-**返回值**
-
-的价值 `UInt*` 类型。
-
-**示例**
-
-测试数据:
-
-``` text
-binary     decimal
-00101100 = 44
-00011100 = 28
-00001101 = 13
-01010101 = 85
-```
-
-查询:
-
-``` sql
-SELECT groupBitOr(num) FROM t
-```
-
-哪里 `num` 是包含测试数据的列。
-
-结果:
-
-``` text
-binary     decimal
-01111101 = 125
-```
-
-## groupBitXor {#groupbitxor}
-
-按位应用 `XOR` 对于一系列的数字。
-
-``` sql
-groupBitXor(expr)
-```
-
-**参数**
-
-`expr` – An expression that results in `UInt*` 类型。
-
-**返回值**
-
-的价值 `UInt*` 类型。
-
-**示例**
-
-测试数据:
-
-``` text
-binary     decimal
-00101100 = 44
-00011100 = 28
-00001101 = 13
-01010101 = 85
-```
-
-查询:
-
-``` sql
-SELECT groupBitXor(num) FROM t
-```
-
-哪里 `num` 是包含测试数据的列。
-
-结果:
-
-``` text
-binary     decimal
-01101000 = 104
-```
-
-## groupBitmap {#groupbitmap}
-
-从无符号整数列的位图或聚合计算，返回UInt64类型的基数，如果添加后缀状态，则返回 [位图对象](../../sql-reference/functions/bitmap-functions.md).
-
-``` sql
-groupBitmap(expr)
-```
-
-**参数**
-
-`expr` – An expression that results in `UInt*` 类型。
-
-**返回值**
-
-的价值 `UInt64` 类型。
-
-**示例**
-
-测试数据:
-
-``` text
-UserID
-1
-1
-2
-3
-```
-
-查询:
-
-``` sql
-SELECT groupBitmap(UserID) as num FROM t
-```
-
-结果:
-
-``` text
-num
-3
-```
-
-## min(x) {#agg_function-min}
-
-计算最小值。
-
-## max(x) {#agg_function-max}
-
-计算最大值。
-
-## argMin(arg,val) {#agg-function-argmin}
-
-计算 ‘arg’ 最小值的值 ‘val’ 价值。 如果有几个不同的值 ‘arg’ 对于最小值 ‘val’，遇到的第一个值是输出。
-
-**示例:**
-
-``` text
-┌─user─────┬─salary─┐
-│ director │   5000 │
-│ manager  │   3000 │
-│ worker   │   1000 │
-└──────────┴────────┘
-```
-
-``` sql
-SELECT argMin(user, salary) FROM salary
-```
-
-``` text
-┌─argMin(user, salary)─┐
-│ worker               │
-└──────────────────────┘
-```
-
-## argMax(arg,val) {#agg-function-argmax}
-
-计算 ‘arg’ 最大值 ‘val’ 价值。 如果有几个不同的值 ‘arg’ 对于最大值 ‘val’，遇到的第一个值是输出。
-
-## sum(x) {#agg_function-sum}
-
-计算总和。
-只适用于数字。
-
-## sumWithOverflow(x) {#sumwithoverflowx}
-
-使用与输入参数相同的数据类型计算数字的总和。 如果总和超过此数据类型的最大值，则函数返回错误。
-
-只适用于数字。
-
-## sumMap(key,value),sumMap(Tuple(key,value)) {#agg_functions-summap}
-
-总计 ‘value’ 数组根据在指定的键 ‘key’ 阵列。
-传递键和值数组的元组与传递两个键和值数组是同义的。
-元素的数量 ‘key’ 和 ‘value’ 总计的每一行必须相同。
-返回两个数组的一个二元组： key是排好序的，value是对应key的求和。
-
-示例:
-
-``` sql
-CREATE TABLE sum_map(
-    date Date,
-    timeslot DateTime,
-    statusMap Nested(
-        status UInt16,
-        requests UInt64
-    ),
-    statusMapTuple Tuple(Array(Int32), Array(Int32))
-) ENGINE = Log;
-INSERT INTO sum_map VALUES
-    ('2000-01-01', '2000-01-01 00:00:00', [1, 2, 3], [10, 10, 10], ([1, 2, 3], [10, 10, 10])),
-    ('2000-01-01', '2000-01-01 00:00:00', [3, 4, 5], [10, 10, 10], ([3, 4, 5], [10, 10, 10])),
-    ('2000-01-01', '2000-01-01 00:01:00', [4, 5, 6], [10, 10, 10], ([4, 5, 6], [10, 10, 10])),
-    ('2000-01-01', '2000-01-01 00:01:00', [6, 7, 8], [10, 10, 10], ([6, 7, 8], [10, 10, 10]));
-
-SELECT
-    timeslot,
-    sumMap(statusMap.status, statusMap.requests),
-    sumMap(statusMapTuple)
-FROM sum_map
-GROUP BY timeslot
-```
-
-``` text
-┌────────────timeslot─┬─sumMap(statusMap.status, statusMap.requests)─┬─sumMap(statusMapTuple)─────────┐
-│ 2000-01-01 00:00:00 │ ([1,2,3,4,5],[10,10,20,10,10])               │ ([1,2,3,4,5],[10,10,20,10,10]) │
-│ 2000-01-01 00:01:00 │ ([4,5,6,7,8],[10,10,20,10,10])               │ ([4,5,6,7,8],[10,10,20,10,10]) │
-└─────────────────────┴──────────────────────────────────────────────┴────────────────────────────────┘
-```
-
-## skewPop {#skewpop}
-
-计算的序列[偏度](https://en.wikipedia.org/wiki/Skewness)。
-
-``` sql
-skewPop(expr)
-```
-
-**参数**
-
-`expr` — [表达式](../syntax.md#syntax-expressions) 返回一个数字。
-
-**返回值**
-
-给定序列的偏度。类型 — [Float64](../../sql-reference/data-types/float.md)
-
-**示例**
-
-``` sql
-SELECT skewPop(value) FROM series_with_value_column
-```
-
-## skewSamp {#skewsamp}
-
-计算 [样品偏度](https://en.wikipedia.org/wiki/Skewness) 的序列。
-
-它表示随机变量的偏度的无偏估计，如果传递的值形成其样本。
-
-``` sql
-skewSamp(expr)
-```
-
-**参数**
-
-`expr` — [表达式](../syntax.md#syntax-expressions) 返回一个数字。
-
-**返回值**
-
-给定序列的偏度。 类型 — [Float64](../../sql-reference/data-types/float.md). 如果 `n <= 1` (`n` 是样本的大小），则该函数返回 `nan`.
-
-**示例**
-
-``` sql
-SELECT skewSamp(value) FROM series_with_value_column
-```
-
-## kurtPop {#kurtpop}
-
-计算 [峰度](https://en.wikipedia.org/wiki/Kurtosis) 的序列。
-
-``` sql
-kurtPop(expr)
-```
-
-**参数**
-
-`expr` — [表达式](../syntax.md#syntax-expressions) 返回一个数字。
-
-**返回值**
-
-给定序列的峰度。 类型 — [Float64](../../sql-reference/data-types/float.md)
-
-**示例**
-
-``` sql
-SELECT kurtPop(value) FROM series_with_value_column
-```
-
-## kurtSamp {#kurtsamp}
-
-计算 [峰度样本](https://en.wikipedia.org/wiki/Kurtosis) 的序列。
-
-它表示随机变量峰度的无偏估计，如果传递的值形成其样本。
-
-``` sql
-kurtSamp(expr)
-```
-
-**参数**
-
-`expr` — [表达式](../syntax.md#syntax-expressions) 返回一个数字。
-
-**返回值**
-
-给定序列的峰度。类型 — [Float64](../../sql-reference/data-types/float.md). 如果 `n <= 1` (`n` 是样本的大小），则该函数返回 `nan`.
-
-**示例**
-
-``` sql
-SELECT kurtSamp(value) FROM series_with_value_column
-```
-
-## avg(x) {#agg_function-avg}
-
-计算平均值。
-只适用于数字。
-结果总是Float64。
-
-## avgWeighted {#avgweighted}
-
-计算 [加权算术平均值](https://en.wikipedia.org/wiki/Weighted_arithmetic_mean).
-
-**语法**
-
-``` sql
-avgWeighted(x, weight)
-```
-
-**参数**
-
--   `x` — 值。 [整数](../data-types/int-uint.md) 或 [浮点](../data-types/float.md).
--   `weight` — 值的加权。 [整数](../data-types/int-uint.md) 或 [浮点](../data-types/float.md).
-
-`x` 和 `weight` 的类型一定是一样的
-
-**返回值**
-
--   加权平均值。
--   `NaN`. 如果所有的权重都等于0。
-
-类型: [Float64](../data-types/float.md).
-
-**示例**
-
-查询:
-
-``` sql
-SELECT avgWeighted(x, w)
-FROM values('x Int8, w Int8', (4, 1), (1, 0), (10, 2))
-```
-
-结果:
-
-``` text
-┌─avgWeighted(x, weight)─┐
-│                      8 │
-└────────────────────────┘
-```
-
-## uniq {#agg_function-uniq}
-
-计算参数的不同值的近似数量。
-
-``` sql
-uniq(x[, ...])
-```
-
-**参数**
-
-该函数采用可变数量的参数。 参数可以是 `Tuple`, `Array`, `Date`, `DateTime`, `String`，或数字类型。
-
-**返回值**
-
--   A [UInt64](../../sql-reference/data-types/int-uint.md)-键入号码。
-
-**实现细节**
-
-功能:
-
--   计算聚合中所有参数的哈希值，然后在计算中使用它。
-
--   使用自适应采样算法。 对于计算状态，该函数使用最多65536个元素哈希值的样本。
-
-        这个算法是非常精确的，并且对于CPU来说非常高效。如果查询包含一些这样的函数，那和其他聚合函数相比 `uniq` 将是几乎一样快。
-
--   确定性地提供结果（它不依赖于查询处理顺序）。
-
-我们建议在几乎所有情况下使用此功能。
-
-**另请参阅**
-
--   [uniqCombined](#agg_function-uniqcombined)
--   [uniqCombined64](#agg_function-uniqcombined64)
--   [uniqHLL12](#agg_function-uniqhll12)
--   [uniqExact](#agg_function-uniqexact)
-
-## uniqCombined {#agg_function-uniqcombined}
-
-计算不同参数值的近似数量。
-
-``` sql
-uniqCombined(HLL_precision)(x[, ...])
-```
-
-该 `uniqCombined` 函数是计算不同数值数量的不错选择。
-
-**参数**
-
-该函数采用可变数量的参数。 参数可以是 `Tuple`, `Array`, `Date`, `DateTime`, `String`，或数字类型。
-
-`HLL_precision` 是以2为底的单元格数的对数 [HyperLogLog](https://en.wikipedia.org/wiki/HyperLogLog). 可选，您可以将该函数用作 `uniqCombined(x[, ...])`. 默认值 `HLL_precision` 是17，这是有效的96KiB的空间（2^17个单元，每个6比特）。
-
-**返回值**
-
--   一个[UInt64](../../sql-reference/data-types/int-uint.md)类型的数字。
-
-**实现细节**
-
-功能:
-
--   计算散列（64位散列 `String` 否则32位）对于聚合中的所有参数，然后在计算中使用它。
-
--   使用三种算法的组合：数组、哈希表和包含错误修正表的HyperLogLog。
-
-        少量的不同的值，使用数组。 值再多一些，使用哈希表。对于大量的数据来说，使用HyperLogLog，HyperLogLog占用一个固定的内存空间。
-
--   确定性地提供结果（它不依赖于查询处理顺序）。
-
-!!! note "注"
-    因为它使用32位散列非-`String` 类型，结果将有非常高的误差基数显着大于 `UINT_MAX` （错误将在几百亿不同值之后迅速提高），因此在这种情况下，您应该使用 [uniqCombined64](#agg_function-uniqcombined64)
-
-相比于 [uniq](#agg_function-uniq) 功能，该 `uniqCombined`:
-
--   消耗少几倍的内存。
--   计算精度高出几倍。
--   通常具有略低的性能。 在某些情况下, `uniqCombined` 可以表现得比 `uniq` 好，例如，使用通过网络传输大量聚合状态的分布式查询。
-
-**另请参阅**
-
--   [uniq](#agg_function-uniq)
--   [uniqCombined64](#agg_function-uniqcombined64)
--   [uniqHLL12](#agg_function-uniqhll12)
--   [uniqExact](#agg_function-uniqexact)
-
-## uniqCombined64 {#agg_function-uniqcombined64}
-
-和 [uniqCombined](#agg_function-uniqcombined)，但对所有数据类型使用64位哈希。
-
-## uniqHLL12 {#agg_function-uniqhll12}
-
-计算不同参数值的近似数量，使用 [HyperLogLog](https://en.wikipedia.org/wiki/HyperLogLog) 算法。
-
-``` sql
-uniqHLL12(x[, ...])
-```
-
-**参数**
-
-该函数采用可变数量的参数。 参数可以是 `Tuple`, `Array`, `Date`, `DateTime`, `String`，或数字类型。
-
-**返回值**
-
--   A [UInt64](../../sql-reference/data-types/int-uint.md)-键入号码。
-
-**实现细节**
-
-功能:
-
--   计算聚合中所有参数的哈希值，然后在计算中使用它。
-
--   使用HyperLogLog算法来近似不同参数值的数量。
-
-        212 5-bit cells are used. The size of the state is slightly more than 2.5 KB. The result is not very accurate (up to ~10% error) for small data sets (<10K elements). However, the result is fairly accurate for high-cardinality data sets (10K-100M), with a maximum error of ~1.6%. Starting from 100M, the estimation error increases, and the function will return very inaccurate results for data sets with extremely high cardinality (1B+ elements).
-
--   提供确定结果（它不依赖于查询处理顺序）。
-
-我们不建议使用此功能。 在大多数情况下，使用 [uniq](#agg_function-uniq) 或 [uniqCombined](#agg_function-uniqcombined) 功能。
-
-**另请参阅**
-
--   [uniq](#agg_function-uniq)
--   [uniqCombined](#agg_function-uniqcombined)
--   [uniqExact](#agg_function-uniqexact)
-
-## uniqExact {#agg_function-uniqexact}
-
-计算不同参数值的准确数目。
-
-``` sql
-uniqExact(x[, ...])
-```
-
-如果你绝对需要一个确切的结果，使用 `uniqExact` 功能。 否则使用 [uniq](#agg_function-uniq) 功能。
-
-`uniqExact` 比 `uniq` 使用更多的内存，因为状态的大小随着不同值的数量的增加而无界增长。
-
-**参数**
-
-该函数采用可变数量的参数。 参数可以是 `Tuple`, `Array`, `Date`, `DateTime`, `String`，或数字类型。
-
-**另请参阅**
-
--   [uniq](#agg_function-uniq)
--   [uniqCombined](#agg_function-uniqcombined)
--   [uniqHLL12](#agg_function-uniqhll12)
-
-## groupArray(x), groupArray(max_size)(x) {#agg_function-grouparray}
-
-创建参数值的数组。
-值可以按任何（不确定）顺序添加到数组中。
-
-第二个版本（与 `max_size` 参数）将结果数组的大小限制为 `max_size` 元素。
-例如, `groupArray (1) (x)` 相当于 `[any (x)]`.
-
-在某些情况下，您仍然可以依靠执行的顺序。 这适用于以下情况 `SELECT` 来自使用 `ORDER BY`.
-
-## groupArrayInsertAt {#grouparrayinsertat}
-
-在指定位置向数组中插入一个值。
-
-**语法**
-
-``` sql
-groupArrayInsertAt(default_x, size)(x, pos);
-```
-
-如果在一个查询中将多个值插入到同一位置，则该函数的行为方式如下:
-
--   如果在单个线程中执行查询，则使用第一个插入的值。
--   如果在多个线程中执行查询，则结果值是未确定的插入值之一。
-
-**参数**
-
--   `x` — 被插入的值。[表达式](../syntax.md#syntax-expressions) 导致的一个 [支持的数据类型](../../sql-reference/data-types/index.md).
--   `pos` — `x` 将被插入的位置。 数组中的索引编号从零开始。 [UInt32](../../sql-reference/data-types/int-uint.md#uint-ranges).
--   `default_x`— 如果代入值为空，则使用默认值。可选参数。[表达式](../syntax.md#syntax-expressions) 为 `x` 数据类型的数据。 如果 `default_x` 未定义，则 [默认值](../../sql-reference/statements/create.md#create-default-values) 被使用。
--   `size`— 结果数组的长度。可选参数。如果使用该参数，`default_x` 必须指定。 [UInt32](../../sql-reference/data-types/int-uint.md#uint-ranges).
-
-**返回值**
-
--   具有插入值的数组。
-
-类型: [阵列](../../sql-reference/data-types/array.md#data-type-array).
-
-**示例**
-
-查询:
-
-``` sql
-SELECT groupArrayInsertAt(toString(number), number * 2) FROM numbers(5);
-```
-
-结果:
-
-``` text
-┌─groupArrayInsertAt(toString(number), multiply(number, 2))─┐
-│ ['0','','1','','2','','3','','4']                         │
-└───────────────────────────────────────────────────────────┘
-```
-
-查询:
-
-``` sql
-SELECT groupArrayInsertAt('-')(toString(number), number * 2) FROM numbers(5);
-```
-
-结果:
-
-``` text
-┌─groupArrayInsertAt('-')(toString(number), multiply(number, 2))─┐
-│ ['0','-','1','-','2','-','3','-','4']                          │
-└────────────────────────────────────────────────────────────────┘
-```
-
-查询:
-
-``` sql
-SELECT groupArrayInsertAt('-', 5)(toString(number), number * 2) FROM numbers(5);
-```
-
-结果:
-
-``` text
-┌─groupArrayInsertAt('-', 5)(toString(number), multiply(number, 2))─┐
-│ ['0','-','1','-','2']                                             │
-└───────────────────────────────────────────────────────────────────┘
-```
-
-在一个位置多线程插入数据。
-
-查询:
-
-``` sql
-SELECT groupArrayInsertAt(number, 0) FROM numbers_mt(10) SETTINGS max_block_size = 1;
-```
-
-作为这个查询的结果，你会得到随机整数 `[0,9]` 范围。 例如:
-
-``` text
-┌─groupArrayInsertAt(number, 0)─┐
-│ [7]                           │
-└───────────────────────────────┘
-```
-
-## groupArrayMovingSum {#agg_function-grouparraymovingsum}
-
-计算输入值的移动和。
-
-``` sql
-groupArrayMovingSum(numbers_for_summing)
-groupArrayMovingSum(window_size)(numbers_for_summing)
-```
-
-该函数可以将窗口大小作为参数。 如果未指定，则该函数的窗口大小等于列中的行数。
-
-**参数**
-
--   `numbers_for_summing` — [表达式](../syntax.md#syntax-expressions) 为数值数据类型值。
--   `window_size` — 窗口大小。
-
-**返回值**
-
--   与输入数据大小和类型相同的数组。
-
-**示例**
-
-样品表:
-
-``` sql
-CREATE TABLE t
-(
-    `int` UInt8,
-    `float` Float32,
-    `dec` Decimal32(2)
-)
-ENGINE = TinyLog
-```
-
-``` text
-┌─int─┬─float─┬──dec─┐
-│   1 │   1.1 │ 1.10 │
-│   2 │   2.2 │ 2.20 │
-│   4 │   4.4 │ 4.40 │
-│   7 │  7.77 │ 7.77 │
-└─────┴───────┴──────┘
-```
-
-查询:
-
-``` sql
-SELECT
-    groupArrayMovingSum(int) AS I,
-    groupArrayMovingSum(float) AS F,
-    groupArrayMovingSum(dec) AS D
-FROM t
-```
-
-``` text
-┌─I──────────┬─F───────────────────────────────┬─D──────────────────────┐
-│ [1,3,7,14] │ [1.1,3.3000002,7.7000003,15.47] │ [1.10,3.30,7.70,15.47] │
-└────────────┴─────────────────────────────────┴────────────────────────┘
-```
-
-``` sql
-SELECT
-    groupArrayMovingSum(2)(int) AS I,
-    groupArrayMovingSum(2)(float) AS F,
-    groupArrayMovingSum(2)(dec) AS D
-FROM t
-```
-
-``` text
-┌─I──────────┬─F───────────────────────────────┬─D──────────────────────┐
-│ [1,3,6,11] │ [1.1,3.3000002,6.6000004,12.17] │ [1.10,3.30,6.60,12.17] │
-└────────────┴─────────────────────────────────┴────────────────────────┘
-```
-
-## groupArrayMovingAvg {#agg_function-grouparraymovingavg}
-
-计算输入值的移动平均值。
-
-``` sql
-groupArrayMovingAvg(numbers_for_summing)
-groupArrayMovingAvg(window_size)(numbers_for_summing)
-```
-
-该函数可以将窗口大小作为参数。 如果未指定，则该函数的窗口大小等于列中的行数。
-
-**参数**
-
--   `numbers_for_summing` — [表达式](../syntax.md#syntax-expressions) 生成数值数据类型值。
--   `window_size` — 窗口大小。
-
-**返回值**
-
--   与输入数据大小和类型相同的数组。
-
-该函数使用 [四舍五入到零](https://en.wikipedia.org/wiki/Rounding#Rounding_towards_zero). 它截断无意义的小数位来保证结果的数据类型。
-
-**示例**
-
-样品表 `b`:
-
-``` sql
-CREATE TABLE t
-(
-    `int` UInt8,
-    `float` Float32,
-    `dec` Decimal32(2)
-)
-ENGINE = TinyLog
-```
-
-``` text
-┌─int─┬─float─┬──dec─┐
-│   1 │   1.1 │ 1.10 │
-│   2 │   2.2 │ 2.20 │
-│   4 │   4.4 │ 4.40 │
-│   7 │  7.77 │ 7.77 │
-└─────┴───────┴──────┘
-```
-
-查询:
-
-``` sql
-SELECT
-    groupArrayMovingAvg(int) AS I,
-    groupArrayMovingAvg(float) AS F,
-    groupArrayMovingAvg(dec) AS D
-FROM t
-```
-
-``` text
-┌─I─────────┬─F───────────────────────────────────┬─D─────────────────────┐
-│ [0,0,1,3] │ [0.275,0.82500005,1.9250001,3.8675] │ [0.27,0.82,1.92,3.86] │
-└───────────┴─────────────────────────────────────┴───────────────────────┘
-```
-
-``` sql
-SELECT
-    groupArrayMovingAvg(2)(int) AS I,
-    groupArrayMovingAvg(2)(float) AS F,
-    groupArrayMovingAvg(2)(dec) AS D
-FROM t
-```
-
-``` text
-┌─I─────────┬─F────────────────────────────────┬─D─────────────────────┐
-│ [0,1,3,5] │ [0.55,1.6500001,3.3000002,6.085] │ [0.55,1.65,3.30,6.08] │
-└───────────┴──────────────────────────────────┴───────────────────────┘
-```
-
-## groupUniqArray(x), groupUniqArray(max_size)(x) {#groupuniqarrayx-groupuniqarraymax-sizex}
-
-从不同的参数值创建一个数组。 内存消耗是一样的 `uniqExact` 功能。
-
-第二个版本（`max_size` 参数）将结果数组的大小限制为 `max_size` 元素。
-例如, `groupUniqArray(1)(x)` 相当于 `[any(x)]`.
-
-## quantile {#quantile}
-
-计算数字序列的近似[分位数](https://en.wikipedia.org/wiki/Quantile)。
-
-此功能适用 [水塘抽样(](https://en.wikipedia.org/wiki/Reservoir_sampling)，使用储存器最大到8192和随机数发生器进行采样。 结果是非确定性的。 要获得精确的分位数，请使用 [quantileExact](#quantileexact) 功能。
-
-当在一个查询中使用多个不同层次的 `quantile*` 时，内部状态不会被组合（即查询的工作效率低于组合情况）。在这种情况下，使用[分位数](#quantiles)功能。
-
-**语法**
-
-``` sql
-quantile(level)(expr)
-```
-
-别名: `median`.
-
-**参数**
-
--   `level` — 分位数层次。可选参数。 从0到1的一个float类型的常量。 我们推荐 `level` 值的范围为 `[0.01, 0.99]`. 默认值：0.5。 在 `level=0.5` 该函数计算 [中位数](https://en.wikipedia.org/wiki/Median).
--   `expr` — 求职表达式，类型为：数值[数据类型](../../sql-reference/data-types/index.md#data_types),[日期](../../sql-reference/data-types/date.md)数据类型或[时间](../../sql-reference/data-types/datetime.md)数据类型。
-
-**返回值**
-
--   指定层次的近似分位数。
-
-类型:
-
--   [Float64](../../sql-reference/data-types/float.md) 对于数字数据类型输入。
--   [日期](../../sql-reference/data-types/date.md) 如果输入值具有 `Date` 类型。
--   [日期时间](../../sql-reference/data-types/datetime.md) 如果输入值具有 `DateTime` 类型。
-
-**示例**
-
-输入表:
-
-``` text
-┌─val─┐
-│   1 │
-│   1 │
-│   2 │
-│   3 │
-└─────┘
-```
-
-查询:
-
-``` sql
-SELECT quantile(val) FROM t
-```
-
-结果:
-
-``` text
-┌─quantile(val)─┐
-│           1.5 │
-└───────────────┘
-```
-
-**另请参阅**
-
--   [中位数](#median)
--   [分位数](#quantiles)
-
-## quantileDeterministic {#quantiledeterministic}
-
-计算数字序列的近似[分位数](https://en.wikipedia.org/wiki/Quantile)。
-
-此功能适用 [水塘抽样(](https://en.wikipedia.org/wiki/Reservoir_sampling)，使用储存器最大到8192和随机数发生器进行采样。 结果是非确定性的。 要获得精确的分位数，请使用 [quantileExact](#quantileexact) 功能。
-
-当在一个查询中使用多个不同层次的 `quantile*` 时，内部状态不会被组合（即查询的工作效率低于组合情况）。在这种情况下，使用[分位数](#quantiles)功能。
-
-**语法**
-
-``` sql
-quantileDeterministic(level)(expr, determinator)
-```
-
-别名: `medianDeterministic`.
-
-**参数**
-
--   `level` — 分位数层次。可选参数。 从0到1的一个float类型的常量。 我们推荐 `level` 值的范围为 `[0.01, 0.99]`. 默认值：0.5。 在 `level=0.5` 该函数计算 [中位数](https://en.wikipedia.org/wiki/Median).
--   `expr` — 求职表达式，类型为：数值[数据类型](../../sql-reference/data-types/index.md#data_types),[日期](../../sql-reference/data-types/date.md)数据类型或[时间](../../sql-reference/data-types/datetime.md)数据类型。
--   `determinator` — 一个数字，其hash被用来代替在水塘抽样中随机生成的数字，这样可以保证取样的确定性。你可以使用用户ID或者事件ID等任何正数，但是如果相同的 `determinator` 出现多次，那结果很可能不正确。
-
-**返回值**
-
--   指定层次的近似分位数。
-
-类型:
-
--   [Float64](../../sql-reference/data-types/float.md) 对于数字数据类型输入。
--   [日期](../../sql-reference/data-types/date.md) 如果输入值具有 `Date` 类型。
--   [日期时间](../../sql-reference/data-types/datetime.md) 如果输入值具有 `DateTime` 类型。
-
-**示例**
-
-输入表:
-
-``` text
-┌─val─┐
-│   1 │
-│   1 │
-│   2 │
-│   3 │
-└─────┘
-```
-
-查询:
-
-``` sql
-SELECT quantileDeterministic(val, 1) FROM t
-```
-
-结果:
-
-``` text
-┌─quantileDeterministic(val, 1)─┐
-│                           1.5 │
-└───────────────────────────────┘
-```
-
-**另请参阅**
-
--   [中位数](#median)
--   [分位数](#quantiles)
-
-## quantileExact {#quantileexact}
-
-准确计算数字序列的[分位数](https://en.wikipedia.org/wiki/Quantile)。
-
-为了准确计算，所有输入的数据被合并为一个数组，并且部分的排序。因此该函数需要 `O(n)` 的内存，n为输入数据的个数。但是对于少量数据来说，该函数还是非常有效的。
-
-当在一个查询中使用多个不同层次的 `quantile*` 时，内部状态不会被组合（即查询的工作效率低于组合情况）。在这种情况下，使用[分位数](#quantiles)功能。
-
-**语法**
-
-``` sql
-quantileExact(level)(expr)
-```
-
-别名: `medianExact`.
-
-**参数**
-
--   `level` — 分位数层次。可选参数。 从0到1的一个float类型的常量。 我们推荐 `level` 值的范围为 `[0.01, 0.99]`. 默认值：0.5。 在 `level=0.5` 该函数计算 [中位数](https://en.wikipedia.org/wiki/Median).
--   `expr` — 求职表达式，类型为：数值[数据类型](../../sql-reference/data-types/index.md#data_types),[日期](../../sql-reference/data-types/date.md)数据类型或[时间](../../sql-reference/data-types/datetime.md)数据类型。
-
-**返回值**
-
--   指定层次的分位数。
-
-类型:
-
--   [Float64](../../sql-reference/data-types/float.md) 对于数字数据类型输入。
--   [日期](../../sql-reference/data-types/date.md) 如果输入值具有 `Date` 类型。
--   [日期时间](../../sql-reference/data-types/datetime.md) 如果输入值具有 `DateTime` 类型。
-
-**示例**
-
-查询:
-
-``` sql
-SELECT quantileExact(number) FROM numbers(10)
-```
-
-结果:
-
-``` text
-┌─quantileExact(number)─┐
-│                     5 │
-└───────────────────────┘
-```
-
-**另请参阅**
-
--   [中位数](#median)
--   [分位数](#quantiles)
-
-## quantileExactWeighted {#quantileexactweighted}
-
-考虑到每个元素的权重，然后准确计算数值序列的[分位数](https://en.wikipedia.org/wiki/Quantile)。
-
-为了准确计算，所有输入的数据被合并为一个数组，并且部分的排序。每个输入值需要根据 `weight` 计算求和。该算法使用哈希表。正因为如此，在数据重复较多的时候使用的内存是少于[quantileExact](#quantileexact)的。 您可以使用此函数代替 `quantileExact` 并指定重量1。
-
-当在一个查询中使用多个不同层次的 `quantile*` 时，内部状态不会被组合（即查询的工作效率低于组合情况）。在这种情况下，使用[分位数](#quantiles)功能。
-
-**语法**
-
-``` sql
-quantileExactWeighted(level)(expr, weight)
-```
-
-别名: `medianExactWeighted`.
-
-**参数**
-
--   `level` — 分位数层次。可选参数。 从0到1的一个float类型的常量。 我们推荐 `level` 值的范围为 `[0.01, 0.99]`. 默认值：0.5。 在 `level=0.5` 该函数计算 [中位数](https://en.wikipedia.org/wiki/Median).
--   `expr` — 求职表达式，类型为：数值[数据类型](../../sql-reference/data-types/index.md#data_types),[日期](../../sql-reference/data-types/date.md)数据类型或[时间](../../sql-reference/data-types/datetime.md)数据类型。
--   `weight` — 权重序列。 权重是一个数据出现的数值。
-
-**返回值**
-
--   指定层次的分位数。
-
-类型:
-
--   [Float64](../../sql-reference/data-types/float.md) 对于数字数据类型输入。
--   [日期](../../sql-reference/data-types/date.md) 如果输入值具有 `Date` 类型。
--   [日期时间](../../sql-reference/data-types/datetime.md) 如果输入值具有 `DateTime` 类型。
-
-**示例**
-
-输入表:
-
-``` text
-┌─n─┬─val─┐
-│ 0 │   3 │
-│ 1 │   2 │
-│ 2 │   1 │
-│ 5 │   4 │
-└───┴─────┘
-```
-
-查询:
-
-``` sql
-SELECT quantileExactWeighted(n, val) FROM t
-```
-
-结果:
-
-``` text
-┌─quantileExactWeighted(n, val)─┐
-│                             1 │
-└───────────────────────────────┘
-```
-
-**另请参阅**
-
--   [中位数](#median)
--   [分位数](#quantiles)
-
-## quantileTiming {#quantiletiming}
-
-使用确定的精度计算数字数据序列的[分位数](https://en.wikipedia.org/wiki/Quantile)。
-
-结果是确定性的（它不依赖于查询处理顺序）。 该函数针对描述加载网页时间或后端响应时间等分布的序列进行了优化。
-
-当在一个查询中使用多个不同层次的 `quantile*` 时，内部状态不会被组合（即查询的工作效率低于组合情况）。在这种情况下，使用[分位数](#quantiles)功能。
-
-**语法**
-
-``` sql
-quantileTiming(level)(expr)
-```
-
-别名: `medianTiming`.
-
-**参数**
-
--   `level` — 分位数层次。可选参数。 从0到1的一个float类型的常量。 我们推荐 `level` 值的范围为 `[0.01, 0.99]`. 默认值：0.5。 在 `level=0.5` 该函数计算 [中位数](https://en.wikipedia.org/wiki/Median).
-
--   `expr` — [表达式](../syntax.md#syntax-expressions)，返回 [浮动\*](../../sql-reference/data-types/float.md)类型数据。
-
-        - 如果输入负值，那结果是不可预期的。
-        - 如果输入值大于30000（页面加载时间大于30s），那我们假设为30000。
-
-**精度**
-
-计算是准确的，如果:
-
--   值的总数不超过5670。
--   总数值超过5670，但页面加载时间小于1024ms。
-
-否则，计算结果将四舍五入到16毫秒的最接近倍数。
-
-!!! note "注"
-    对于计算页面加载时间分位数，此函数比 [分位数](#quantile)更有效和准确。
-
-**返回值**
-
--   指定层次的分位数。
-
-类型: `Float32`.
-
-!!! note "注"
-    如果没有值传递给函数（当使用 `quantileTimingIf`), [NaN](../../sql-reference/data-types/float.md#data_type-float-nan-inf) 被返回。 这样做的目的是将这些案例与导致零的案例区分开来。 看 [ORDER BY clause](../statements/select/order-by.md#select-order-by) 对于 `NaN` 值排序注意事项。
-
-**示例**
-
-输入表:
-
-``` text
-┌─response_time─┐
-│            72 │
-│           112 │
-│           126 │
-│           145 │
-│           104 │
-│           242 │
-│           313 │
-│           168 │
-│           108 │
-└───────────────┘
-```
-
-查询:
-
-``` sql
-SELECT quantileTiming(response_time) FROM t
-```
-
-结果:
-
-``` text
-┌─quantileTiming(response_time)─┐
-│                           126 │
-└───────────────────────────────┘
-```
-
-**另请参阅**
-
--   [中位数](#median)
--   [分位数](#quantiles)
-
-## quantileTimingWeighted {#quantiletimingweighted}
-
-根据每个序列成员的权重，使用确定的精度计算数字序列的[分位数](https://en.wikipedia.org/wiki/Quantile)。
-
-结果是确定性的（它不依赖于查询处理顺序）。 该函数针对描述加载网页时间或后端响应时间等分布的序列进行了优化。
-
-当在一个查询中使用多个不同层次的 `quantile*` 时，内部状态不会被组合（即查询的工作效率低于组合情况）。在这种情况下，使用[分位数](#quantiles)功能。
-
-**语法**
-
-``` sql
-quantileTimingWeighted(level)(expr, weight)
-```
-
-别名: `medianTimingWeighted`.
-
-**参数**
-
--   `level` — 分位数层次。可选参数。 从0到1的一个float类型的常量。 我们推荐 `level` 值的范围为 `[0.01, 0.99]`. 默认值：0.5。 在 `level=0.5` 该函数计算 [中位数](https://en.wikipedia.org/wiki/Median).
-
--   `expr` — [表达式](../syntax.md#syntax-expressions)，返回 [浮动\*](../../sql-reference/data-types/float.md)类型数据。
-
-        - 如果输入负值，那结果是不可预期的。
-        - 如果输入值大于30000（页面加载时间大于30s），那我们假设为30000。
-
--   `weight` — 权重序列。 权重是一个数据出现的数值。
-
-**精度**
-
-计算是准确的，如果:
-
--   值的总数不超过5670。
--   总数值超过5670，但页面加载时间小于1024ms。
-
-否则，计算结果将四舍五入到16毫秒的最接近倍数。
-
-!!! note "注"
-    对于计算页面加载时间分位数，此函数比 [分位数](#quantile)更高效和准确。
-
-**返回值**
-
--   指定层次的分位数。
-
-类型: `Float32`.
-
-!!! note "注"
-    如果没有值传递给函数（当使用 `quantileTimingIf`), [NaN](../../sql-reference/data-types/float.md#data_type-float-nan-inf) 被返回。 这样做的目的是将这些案例与导致零的案例区分开来。看 [ORDER BY clause](../statements/select/order-by.md#select-order-by) 对于 `NaN` 值排序注意事项。
-
-**示例**
-
-输入表:
-
-``` text
-┌─response_time─┬─weight─┐
-│            68 │      1 │
-│           104 │      2 │
-│           112 │      3 │
-│           126 │      2 │
-│           138 │      1 │
-│           162 │      1 │
-└───────────────┴────────┘
-```
-
-查询:
-
-``` sql
-SELECT quantileTimingWeighted(response_time, weight) FROM t
-```
-
-结果:
-
-``` text
-┌─quantileTimingWeighted(response_time, weight)─┐
-│                                           112 │
-└───────────────────────────────────────────────┘
-```
-
-**另请参阅**
-
--   [中位数](#median)
--   [分位数](#quantiles)
-
-## quantileTDigest {#quantiletdigest}
-
-使用[t-digest](https://github.com/tdunning/t-digest/blob/master/docs/t-digest-paper/histo.pdf) 算法计算近似[分位数](https://en.wikipedia.org/wiki/Quantile)。
-
-最大误差为1%。 内存消耗 `log(n)`，这里 `n` 是值的个数。 结果取决于运行查询的顺序，并且是不确定的。
-
-该功能的性能低于性能 [分位数](#quantile) 或 [时间分位](#quantiletiming). 在状态大小与精度的比率方面，这个函数比 `quantile`更优秀。
-
-当在一个查询中使用多个不同层次的 `quantile*` 时，内部状态不会被组合（即查询的工作效率低于组合情况）。在这种情况下，使用[分位数](#quantiles)功能。
-
-**语法**
-
-``` sql
-quantileTDigest(level)(expr)
-```
-
-别名: `medianTDigest`.
-
-**参数**
-
--   `level` — 分位数层次。可选参数。 从0到1的一个float类型的常量。 我们推荐 `level` 值的范围为 `[0.01, 0.99]`. 默认值：0.5。 在 `level=0.5` 该函数计算 [中位数](https://en.wikipedia.org/wiki/Median).
--   `expr` — 求职表达式，类型为：数值[数据类型](../../sql-reference/data-types/index.md#data_types),[日期](../../sql-reference/data-types/date.md)数据类型或[时间](../../sql-reference/data-types/datetime.md)数据类型。
-
-**回值**
-
--   指定层次的分位数。
-
-类型:
-
--   [Float64](../../sql-reference/data-types/float.md) 对于数字数据类型输入。
--   [日期](../../sql-reference/data-types/date.md) 如果输入值具有 `Date` 类型。
--   [日期时间](../../sql-reference/data-types/datetime.md) 如果输入值具有 `DateTime` 类型。
-
-**示例**
-
-查询:
-
-``` sql
-SELECT quantileTDigest(number) FROM numbers(10)
-```
-
-结果:
-
-``` text
-┌─quantileTDigest(number)─┐
-│                     4.5 │
-└─────────────────────────┘
-```
-
-**另请参阅**
-
--   [中位数](#median)
--   [分位数](#quantiles)
-
-## quantileTDigestWeighted {#quantiletdigestweighted}
-
-使用[t-digest](https://github.com/tdunning/t-digest/blob/master/docs/t-digest-paper/histo.pdf) 算法计算近似[分位数](https://en.wikipedia.org/wiki/Quantile)。 该函数考虑了每个序列成员的权重。最大误差为1%。 内存消耗 `log(n)`，这里 `n` 是值的个数。
-
-该功能的性能低于性能 [分位数](#quantile) 或 [时间分位](#quantiletiming). 在状态大小与精度的比率方面，这个函数比 `quantile`更优秀。
-
-结果取决于运行查询的顺序，并且是不确定的。
-
-当在一个查询中使用多个不同层次的 `quantile*` 时，内部状态不会被组合（即查询的工作效率低于组合情况）。在这种情况下，使用[分位数](#quantiles)功能
-
-**语法**
-
-``` sql
-quantileTDigest(level)(expr)
-```
-
-别名: `medianTDigest`.
-
-**参数**
-
--   `level` — 分位数层次。可选参数。 从0到1的一个float类型的常量。 我们推荐 `level` 值的范围为 `[0.01, 0.99]`. 默认值：0.5。 在 `level=0.5` 该函数计算 [中位数](https://en.wikipedia.org/wiki/Median).
--   `expr` — 求职表达式，类型为：数值[数据类型](../../sql-reference/data-types/index.md#data_types),[日期](../../sql-reference/data-types/date.md)数据类型或[时间](../../sql-reference/data-types/datetime.md)数据类型。
--   `weight` — 权重序列。 权重是一个数据出现的数值。
-
-**返回值**
-
--   指定层次的分位数。
-
-类型:
-
--   [Float64](../../sql-reference/data-types/float.md) 对于数字数据类型输入。
--   [日期](../../sql-reference/data-types/date.md) 如果输入值具有 `Date` 类型。
--   [日期时间](../../sql-reference/data-types/datetime.md) 如果输入值具有 `DateTime` 类型。
-
-**示例**
-
-查询:
-
-``` sql
-SELECT quantileTDigestWeighted(number, 1) FROM numbers(10)
-```
-
-结果:
-
-``` text
-┌─quantileTDigestWeighted(number, 1)─┐
-│                                4.5 │
-└────────────────────────────────────┘
-```
-
-**另请参阅**
-
--   [中位数](#median)
--   [分位数](#quantiles)
-
-## median {#median}
-
-`median*` 函数是 `quantile*` 函数的别名。 它们计算数字数据样本的中位数。
-
-函数:
-
--   `median` — [quantile](#quantile)别名。
--   `medianDeterministic` — [quantileDeterministic](#quantiledeterministic)别名。
--   `medianExact` — [quantileExact](#quantileexact)别名。
--   `medianExactWeighted` — [quantileExactWeighted](#quantileexactweighted)别名。
--   `medianTiming` — [quantileTiming](#quantiletiming)别名。
--   `medianTimingWeighted` — [quantileTimingWeighted](#quantiletimingweighted)别名。
--   `medianTDigest` — [quantileTDigest](#quantiletdigest)别名。
--   `medianTDigestWeighted` — [quantileTDigestWeighted](#quantiletdigestweighted)别名。
-
-**示例**
-
-输入表:
-
-``` text
-┌─val─┐
-│   1 │
-│   1 │
-│   2 │
-│   3 │
-└─────┘
-```
-
-查询:
-
-``` sql
-SELECT medianDeterministic(val, 1) FROM t
-```
-
-结果:
-
-``` text
-┌─medianDeterministic(val, 1)─┐
-│                         1.5 │
-└─────────────────────────────┘
-```
-
-## quantiles(level1, level2, …)(x) {#quantiles}
-
-所有分位数函数也有相应的函数: `quantiles`, `quantilesDeterministic`, `quantilesTiming`, `quantilesTimingWeighted`, `quantilesExact`, `quantilesExactWeighted`, `quantilesTDigest`。这些函数一次计算所列层次的所有分位数，并返回结果值的数组。
-
-## varSamp(x) {#varsampx}
-
-计算 `Σ((x - x̅)^2) / (n - 1)`，这里 `n` 是样本大小， `x̅`是`x`的平均值。
-
-它表示随机变量的方差的无偏估计，如果传递的值形成其样本。
-
-返回 `Float64`. 当 `n <= 1`，返回 `+∞`.
-
-!!! note "注"
-    该函数使用数值不稳定的算法。 如果你需要 [数值稳定性](https://en.wikipedia.org/wiki/Numerical_stability) 在计算中，使用 `varSampStable` 功能。 它的工作速度较慢，但提供较低的计算错误。
-
-## varPop(x) {#varpopx}
-
-计算 `Σ((x - x̅)^2) / n`，这里 `n` 是样本大小， `x̅`是`x`的平均值。
-
-换句话说，计算一组数据的离差。 返回 `Float64`。
-
-!!! note "注"
-    该函数使用数值不稳定的算法。 如果你需要 [数值稳定性](https://en.wikipedia.org/wiki/Numerical_stability) 在计算中，使用 `varPopStable` 功能。 它的工作速度较慢，但提供较低的计算错误。
-
-## stddevSamp(x) {#stddevsampx}
-
-结果等于平方根 `varSamp(x)`。
-
-!!! note "注"
-    该函数使用数值不稳定的算法。 如果你需要 [数值稳定性](https://en.wikipedia.org/wiki/Numerical_stability) 在计算中，使用 `stddevSampStable` 功能。 它的工作速度较慢，但提供较低的计算错误。
-
-## stddevPop(x) {#stddevpopx}
-
-结果等于平方根 `varPop(x)`。
-
-!!! note "注"
-    该函数使用数值不稳定的算法。 如果你需要 [数值稳定性](https://en.wikipedia.org/wiki/Numerical_stability) 在计算中，使用 `stddevPopStable` 功能。 它的工作速度较慢，但提供较低的计算错误。
-
-## topK(N)(x) {#topknx}
-
-返回指定列中近似最常见值的数组。 生成的数组按值的近似频率降序排序（而不是值本身）。
-
-实现了[过滤节省空间](http://www.l2f.inesc-id.pt/~fmmb/wiki/uploads/Work/misnis.ref0a.pdf)算法， 使用基于reduce-and-combine的算法，借鉴[并行节省空间](https://arxiv.org/pdf/1401.0702.pdf).
-
-``` sql
-topK(N)(column)
-```
-
-此函数不提供保证的结果。 在某些情况下，可能会发生错误，并且可能会返回不是最高频的值。
-
-我们建议使用 `N < 10` 值，`N` 值越大，性能越低。最大值 `N = 65536`。
-
-**参数**
-
--   ‘N’ 是要返回的元素数。
-
-如果省略该参数，则使用默认值10。
-
-**参数**
-
--   ' x ' – 计算的频率值。
-
-**示例**
-
-就拿 [OnTime](../../getting-started/example-datasets/ontime.md) 数据集来说，选择`AirlineID` 列中出现最频繁的三个。
-
-``` sql
-SELECT topK(3)(AirlineID) AS res
-FROM ontime
-```
-
-``` text
-┌─res─────────────────┐
-│ [19393,19790,19805] │
-└─────────────────────┘
-```
-
-## topKWeighted {#topkweighted}
-
-类似于 `topK` 但需要一个整数类型的附加参数 - `weight`. 每个输入都被记入 `weight` 次频率计算。
-
-**语法**
-
-``` sql
-topKWeighted(N)(x, weight)
-```
-
-**参数**
-
--   `N` — 返回值个数。
-
-**参数**
-
--   `x` – 输入值。
--   `weight` — 权重。 [UInt8](../../sql-reference/data-types/int-uint.md)类型。
-
-**返回值**
-
-返回具有最大近似权重总和的值数组。
-
-**示例**
-
-查询:
-
-``` sql
-SELECT topKWeighted(10)(number, number) FROM numbers(1000)
-```
-
-结果:
-
-``` text
-┌─topKWeighted(10)(number, number)──────────┐
-│ [999,998,997,996,995,994,993,992,991,990] │
-└───────────────────────────────────────────┘
-```
-
-## covarSamp(x,y) {#covarsampx-y}
-
-计算 `Σ((x - x̅)(y - y̅)) / (n - 1)`。
-
-返回Float64。 当 `n <= 1`, returns +∞。
-
-!!! note "注"
-    该函数使用数值不稳定的算法。 如果你需要 [数值稳定性](https://en.wikipedia.org/wiki/Numerical_stability) 在计算中，使用 `covarSampStable` 功能。 它的工作速度较慢，但提供较低的计算错误。
-
-## covarPop(x,y) {#covarpopx-y}
-
-计算 `Σ((x - x̅)(y - y̅)) / n`。
-
-!!! note "注"
-    该函数使用数值不稳定的算法。 如果你需要 [数值稳定性](https://en.wikipedia.org/wiki/Numerical_stability) 在计算中，使用 `covarPopStable` 功能。 它的工作速度较慢，但提供了较低的计算错误。
-
-## corr(x,y) {#corrx-y}
-
-计算Pearson相关系数: `Σ((x - x̅)(y - y̅)) / sqrt(Σ((x - x̅)^2) * Σ((y - y̅)^2))`。
-
-!!! note "注"
-    该函数使用数值不稳定的算法。 如果你需要 [数值稳定性](https://en.wikipedia.org/wiki/Numerical_stability) 在计算中，使用 `corrStable` 功能。 它的工作速度较慢，但提供较低的计算错误。
-
-## categoricalInformationValue {#categoricalinformationvalue}
-
-对于每个类别计算 `(P(tag = 1) - P(tag = 0))(log(P(tag = 1)) - log(P(tag = 0)))` 。
-
-``` sql
-categoricalInformationValue(category1, category2, ..., tag)
-```
-
-结果指示离散（分类）要素如何使用 `[category1, category2, ...]` 有助于使用学习模型预测`tag`的值。
-
-## simpleLinearRegression {#simplelinearregression}
-
-执行简单（一维）线性回归。
-
-``` sql
-simpleLinearRegression(x, y)
-```
-
-参数:
-
--   `x` — x轴。
--   `y` — y轴。
-
-返回值:
-
-符合`y = a*x + b`的常量 `(a, b)` 。
-
-**例**
-
-``` sql
-SELECT arrayReduce('simpleLinearRegression', [0, 1, 2, 3], [0, 1, 2, 3])
-```
-
-``` text
-┌─arrayReduce('simpleLinearRegression', [0, 1, 2, 3], [0, 1, 2, 3])─┐
-│ (1,0)                                                             │
-└───────────────────────────────────────────────────────────────────┘
-```
-
-``` sql
-SELECT arrayReduce('simpleLinearRegression', [0, 1, 2, 3], [3, 4, 5, 6])
-```
-
-``` text
-┌─arrayReduce('simpleLinearRegression', [0, 1, 2, 3], [3, 4, 5, 6])─┐
-│ (1,3)                                                             │
-└───────────────────────────────────────────────────────────────────┘
-```
-
-## stochasticLinearRegression {#agg_functions-stochasticlinearregression}
-
-该函数实现随机线性回归。 它支持自定义参数的学习率、L2正则化系数、微批，并且具有少量更新权重的方法（[Adam](https://en.wikipedia.org/wiki/Stochastic_gradient_descent#Adam) （默认）， [simple SGD](https://en.wikipedia.org/wiki/Stochastic_gradient_descent)， [Momentum](https://en.wikipedia.org/wiki/Stochastic_gradient_descent#Momentum)， [Nesterov](https://mipt.ru/upload/medialibrary/d7e/41-91.pdf)）。
-
-### 参数 {#agg_functions-stochasticlinearregression-parameters}
-
-有4个可自定义的参数。 它们按顺序传递给函数，但是没有必要传递所有四个默认值将被使用，但是好的模型需要一些参数调整。
-
-``` text
-stochasticLinearRegression(1.0, 1.0, 10, 'SGD')
-```
-
-1.  `learning rate` 当执行梯度下降步骤时，步长上的系数。 过大的学习率可能会导致模型的权重无限大。 默认值为 `0.00001`.
-2.  `l2 regularization coefficient` 这可能有助于防止过度拟合。 默认值为 `0.1`.
-3.  `mini-batch size` 设置元素的数量，这些元素将被计算和求和以执行梯度下降的一个步骤。 纯随机下降使用一个元素，但是具有小批量（约10个元素）使梯度步骤更稳定。 默认值为 `15`.
-4.  `method for updating weights` 他们是: `Adam` （默认情况下), `SGD`, `Momentum`, `Nesterov`. `Momentum` 和 `Nesterov` 需要更多的计算和内存，但是它们恰好在收敛速度和随机梯度方法的稳定性方面是有用的。
-
-### 用法 {#agg_functions-stochasticlinearregression-usage}
-
-`stochasticLinearRegression` 用于两个步骤：拟合模型和预测新数据。 为了拟合模型并保存其状态以供以后使用，我们使用 `-State` combinator，它基本上保存了状态（模型权重等）。
-为了预测我们使用函数 [evalMLMethod](../functions/machine-learning-functions.md#machine_learning_methods-evalmlmethod)，这需要一个状态作为参数以及特征来预测。
-
-<a name="stochasticlinearregression-usage-fitting"></a>
-
-**1.** 安装
-
-可以使用这种查询。
-
-``` sql
-CREATE TABLE IF NOT EXISTS train_data
-(
-    param1 Float64,
-    param2 Float64,
-    target Float64
-) ENGINE = Memory;
-
-CREATE TABLE your_model ENGINE = Memory AS SELECT
-stochasticLinearRegressionState(0.1, 0.0, 5, 'SGD')(target, param1, param2)
-AS state FROM train_data;
-```
-
-在这里，我们还需要将数据插入到 `train_data` 桌子 参数的数量不是固定的，它只取决于参数的数量，传递到 `linearRegressionState`. 它们都必须是数值。
-请注意，带有目标值的列（我们想要学习预测）被插入作为第一个参数。
-
-**2.** 预测
-
-在将状态保存到表中之后，我们可以多次使用它进行预测，甚至与其他状态合并并创建新的更好的模型。
-
-``` sql
-WITH (SELECT state FROM your_model) AS model SELECT
-evalMLMethod(model, param1, param2) FROM test_data
-```
-
-查询将返回一列预测值。 请注意，第一个参数 `evalMLMethod` 是 `AggregateFunctionState` 对象，接下来是要素列。
-
-`test_data` 是一个像表 `train_data` 但可能不包含目标值。
-
-### 注 {#agg_functions-stochasticlinearregression-notes}
-
-1.  要合并两个模型，用户可以创建这样的查询:
-    `sql  SELECT state1 + state2 FROM your_models`
-    哪里 `your_models` 表包含这两个模型。 此查询将返回new `AggregateFunctionState` 对象。
-
-2.  如果没有，用户可以获取创建的模型的权重用于自己的目的，而不保存模型 `-State` 使用combinator。
-    `sql  SELECT stochasticLinearRegression(0.01)(target, param1, param2) FROM train_data`
-    这种查询将拟合模型并返回其权重-首先是权重，它对应于模型的参数，最后一个是偏差。 所以在上面的例子中，查询将返回一个具有3个值的列。
-
-**另请参阅**
-
--   [stochasticLogisticRegression](#agg_functions-stochasticlogisticregression)
--   [线性回归和逻辑回归之间的区别](https://stackoverflow.com/questions/12146914/what-is-the-difference-between-linear-regression-and-logistic-regression)
-
-## stochasticLogisticRegression {#agg_functions-stochasticlogisticregression}
-
-该函数实现随机逻辑回归。 它可以用于二进制分类问题，支持与stochasticLinearRegression相同的自定义参数，并以相同的方式工作。
-
-### 参数 {#agg_functions-stochasticlogisticregression-parameters}
-
-参数与stochasticLinearRegression中的参数完全相同:
-`learning rate`, `l2 regularization coefficient`, `mini-batch size`, `method for updating weights`.
-欲了解更多信息，请参阅 [参数](#agg_functions-stochasticlinearregression-parameters).
-
-``` text
-stochasticLogisticRegression(1.0, 1.0, 10, 'SGD')
-```
-
-**1.** 安装
-
-<!-- -->
-
-    参考stochasticLinearRegression相关文档
-
-    预测标签的取值范围为[-1, 1]
-
-**2.** 预测
-
-<!-- -->
-
-    使用已经保存的state我们可以预测标签为 `1` 的对象的概率。
-
-    ``` sql
-    WITH (SELECT state FROM your_model) AS model SELECT
-    evalMLMethod(model, param1, param2) FROM test_data
-    ```
-
-    查询结果返回一个列的概率。注意 `evalMLMethod` 的第一个参数是 `AggregateFunctionState` 对象，接下来的参数是列的特性。
-
-    我们也可以设置概率的范围， 这样需要给元素指定不同的标签。
-
-    ``` sql
-    SELECT ans < 1.1 AND ans > 0.5 FROM
-    (WITH (SELECT state FROM your_model) AS model SELECT
-    evalMLMethod(model, param1, param2) AS ans FROM test_data)
-    ```
-
-    结果是标签。
-
-    `test_data` 是一个像 `train_data` 一样的表，但是不包含目标值。
-
-**另请参阅**
-
--   [随机指标线上回归](#agg_functions-stochasticlinearregression)
--   [线性回归和逻辑回归之间的差异](https://stackoverflow.com/questions/12146914/what-is-the-difference-between-linear-regression-and-logistic-regression)
-
-## groupBitmapAnd {#groupbitmapand}
-
-计算位图列的AND，返回UInt64类型的基数，如果添加后缀状态，则返回 [位图对象](../../sql-reference/functions/bitmap-functions.md).
-
-``` sql
-groupBitmapAnd(expr)
-```
-
-**参数**
-
-`expr` – An expression that results in `AggregateFunction(groupBitmap, UInt*)` 类型。
-
-**返回值**
-
-的价值 `UInt64` 类型。
-
-**示例**
-
-``` sql
-DROP TABLE IF EXISTS bitmap_column_expr_test2;
-CREATE TABLE bitmap_column_expr_test2
-(
-    tag_id String,
-    z AggregateFunction(groupBitmap, UInt32)
-)
-ENGINE = MergeTree
-ORDER BY tag_id;
-
-INSERT INTO bitmap_column_expr_test2 VALUES ('tag1', bitmapBuild(cast([1,2,3,4,5,6,7,8,9,10] as Array(UInt32))));
-INSERT INTO bitmap_column_expr_test2 VALUES ('tag2', bitmapBuild(cast([6,7,8,9,10,11,12,13,14,15] as Array(UInt32))));
-INSERT INTO bitmap_column_expr_test2 VALUES ('tag3', bitmapBuild(cast([2,4,6,8,10,12] as Array(UInt32))));
-
-SELECT groupBitmapAnd(z) FROM bitmap_column_expr_test2 WHERE like(tag_id, 'tag%');
-┌─groupBitmapAnd(z)─┐
-│               3   │
-└───────────────────┘
-
-SELECT arraySort(bitmapToArray(groupBitmapAndState(z))) FROM bitmap_column_expr_test2 WHERE like(tag_id, 'tag%');
-┌─arraySort(bitmapToArray(groupBitmapAndState(z)))─┐
-│ [6,8,10]                                         │
-└──────────────────────────────────────────────────┘
-```
-
-## groupBitmapOr {#groupbitmapor}
-
-计算位图列的OR，返回UInt64类型的基数，如果添加后缀状态，则返回 [位图对象](../../sql-reference/functions/bitmap-functions.md). 这相当于 `groupBitmapMerge`.
-
-``` sql
-groupBitmapOr(expr)
-```
-
-**参数**
-
-`expr` – An expression that results in `AggregateFunction(groupBitmap, UInt*)` 类型。
-
-**返回值**
-
-的价值 `UInt64` 类型。
-
-**示例**
-
-``` sql
-DROP TABLE IF EXISTS bitmap_column_expr_test2;
-CREATE TABLE bitmap_column_expr_test2
-(
-    tag_id String,
-    z AggregateFunction(groupBitmap, UInt32)
-)
-ENGINE = MergeTree
-ORDER BY tag_id;
-
-INSERT INTO bitmap_column_expr_test2 VALUES ('tag1', bitmapBuild(cast([1,2,3,4,5,6,7,8,9,10] as Array(UInt32))));
-INSERT INTO bitmap_column_expr_test2 VALUES ('tag2', bitmapBuild(cast([6,7,8,9,10,11,12,13,14,15] as Array(UInt32))));
-INSERT INTO bitmap_column_expr_test2 VALUES ('tag3', bitmapBuild(cast([2,4,6,8,10,12] as Array(UInt32))));
-
-SELECT groupBitmapOr(z) FROM bitmap_column_expr_test2 WHERE like(tag_id, 'tag%');
-┌─groupBitmapOr(z)─┐
-│             15   │
-└──────────────────┘
-
-SELECT arraySort(bitmapToArray(groupBitmapOrState(z))) FROM bitmap_column_expr_test2 WHERE like(tag_id, 'tag%');
-┌─arraySort(bitmapToArray(groupBitmapOrState(z)))─┐
-│ [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15]           │
-└─────────────────────────────────────────────────┘
-```
-
-## groupBitmapXor {#groupbitmapxor}
-
-计算位图列的XOR，返回UInt64类型的基数，如果添加后缀状态，则返回 [位图对象](../../sql-reference/functions/bitmap-functions.md).
-
-``` sql
-groupBitmapOr(expr)
-```
-
-**参数**
-
-`expr` – An expression that results in `AggregateFunction(groupBitmap, UInt*)` 类型。
-
-**返回值**
-
-的价值 `UInt64` 类型。
-
-**示例**
-
-``` sql
-DROP TABLE IF EXISTS bitmap_column_expr_test2;
-CREATE TABLE bitmap_column_expr_test2
-(
-    tag_id String,
-    z AggregateFunction(groupBitmap, UInt32)
-)
-ENGINE = MergeTree
-ORDER BY tag_id;
-
-INSERT INTO bitmap_column_expr_test2 VALUES ('tag1', bitmapBuild(cast([1,2,3,4,5,6,7,8,9,10] as Array(UInt32))));
-INSERT INTO bitmap_column_expr_test2 VALUES ('tag2', bitmapBuild(cast([6,7,8,9,10,11,12,13,14,15] as Array(UInt32))));
-INSERT INTO bitmap_column_expr_test2 VALUES ('tag3', bitmapBuild(cast([2,4,6,8,10,12] as Array(UInt32))));
-
-SELECT groupBitmapXor(z) FROM bitmap_column_expr_test2 WHERE like(tag_id, 'tag%');
-┌─groupBitmapXor(z)─┐
-│              10   │
-└───────────────────┘
-
-SELECT arraySort(bitmapToArray(groupBitmapXorState(z))) FROM bitmap_column_expr_test2 WHERE like(tag_id, 'tag%');
-┌─arraySort(bitmapToArray(groupBitmapXorState(z)))─┐
-│ [1,3,5,6,8,10,11,13,14,15]                       │
-└──────────────────────────────────────────────────┘
-```
-
-[原始文章](https://clickhouse.tech/docs/en/query_language/agg_functions/reference/) <!--hide-->
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/any.md b/docs/zh/sql-reference/aggregate-functions/reference/any.md
new file mode 100644
index 00000000000..205ff1c1944
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/any.md
@@ -0,0 +1,13 @@
+---
+toc_priority: 6
+---
+
+# any {#agg_function-any}
+
+选择第一个遇到的值。
+查询可以以任何顺序执行，甚至每次都以不同的顺序执行，因此此函数的结果是不确定的。
+要获得确定的结果，您可以使用 ‘min’ 或 ‘max’ 功能，而不是 ‘any’.
+
+在某些情况下，可以依靠执行的顺序。 这适用于SELECT来自使用ORDER BY的子查询的情况。
+
+当一个 `SELECT` 查询具有 `GROUP BY` 子句或至少一个聚合函数，ClickHouse（相对于MySQL）要求在所有表达式 `SELECT`, `HAVING`，和 `ORDER BY` 子句可以从键或聚合函数计算。 换句话说，从表中选择的每个列必须在键或聚合函数内使用。 要获得像MySQL这样的行为，您可以将其他列放在 `any` 聚合函数。
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/anyheavy.md b/docs/zh/sql-reference/aggregate-functions/reference/anyheavy.md
new file mode 100644
index 00000000000..b67be9e48cf
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/anyheavy.md
@@ -0,0 +1,34 @@
+---
+toc_priority: 103
+---
+
+# anyHeavy {#anyheavyx}
+
+选择一个频繁出现的值，使用[heavy hitters](http://www.cs.umd.edu/~samir/498/karp.pdf) 算法。 如果某个值在查询的每个执行线程中出现的情况超过一半，则返回此值。 通常情况下，结果是不确定的。
+
+``` sql
+anyHeavy(column)
+```
+
+**参数**
+
+-   `column` – The column name。
+
+**示例**
+
+使用 [OnTime](../../../getting-started/example-datasets/ontime.md) 数据集，并选择在 `AirlineID` 列任何频繁出现的值。
+
+查询:
+
+``` sql
+SELECT anyHeavy(AirlineID) AS res
+FROM ontime;
+```
+
+结果:
+
+``` text
+┌───res─┐
+│ 19690 │
+└───────┘
+```
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/anylast.md b/docs/zh/sql-reference/aggregate-functions/reference/anylast.md
new file mode 100644
index 00000000000..e6792e0e449
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/anylast.md
@@ -0,0 +1,9 @@
+---
+toc_priority: 104
+---
+
+## anyLast {#anylastx}
+
+选择遇到的最后一个值。
+其结果和[any](../../../sql-reference/aggregate-functions/reference/any.md) 函数一样是不确定的 。
+ 
\ No newline at end of file
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/argmax.md b/docs/zh/sql-reference/aggregate-functions/reference/argmax.md
new file mode 100644
index 00000000000..9d90590b2f1
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/argmax.md
@@ -0,0 +1,64 @@
+---
+toc_priority: 106
+---
+
+# argMax {#agg-function-argmax}
+
+计算 `val` 最大值对应的 `arg` 值。 如果 `val` 最大值存在几个不同的 `arg` 值，输出遇到的第一个值。
+
+这个函数的Tuple版本将返回 `val` 最大值对应的元组。本函数适合和 `SimpleAggregateFunction` 搭配使用。
+
+**语法**
+
+``` sql
+argMax(arg, val)
+```
+
+或
+
+``` sql
+argMax(tuple(arg, val))
+```
+
+**参数**
+
+-   `arg` — Argument.
+-   `val` — Value.
+
+**返回值**
+
+-   `val` 最大值对应的 `arg` 值。
+
+类型: 匹配 `arg` 类型。
+
+对于输入中的元组:
+
+-   元组 `(arg, val)`, 其中 `val` 最大值，`arg` 是对应的值。
+
+类型: [元组](../../../sql-reference/data-types/tuple.md)。
+
+**示例**
+
+输入表:
+
+``` text
+┌─user─────┬─salary─┐
+│ director │   5000 │
+│ manager  │   3000 │
+│ worker   │   1000 │
+└──────────┴────────┘
+```
+
+查询:
+
+``` sql
+SELECT argMax(user, salary), argMax(tuple(user, salary), salary), argMax(tuple(user, salary)) FROM salary;
+```
+
+结果:
+
+``` text
+┌─argMax(user, salary)─┬─argMax(tuple(user, salary), salary)─┬─argMax(tuple(user, salary))─┐
+│ director             │ ('director',5000)                   │ ('director',5000)           │
+└──────────────────────┴─────────────────────────────────────┴─────────────────────────────┘
+```
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/argmin.md b/docs/zh/sql-reference/aggregate-functions/reference/argmin.md
new file mode 100644
index 00000000000..0dd4625ac0d
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/argmin.md
@@ -0,0 +1,37 @@
+---
+toc_priority: 105
+---
+
+# argMin {#agg-function-argmin}
+
+语法: `argMin(arg, val)` 或 `argMin(tuple(arg, val))`
+
+计算 `val` 最小值对应的 `arg` 值。 如果 `val` 最小值存在几个不同的 `arg` 值，输出遇到的第一个(`arg`)值。
+
+这个函数的Tuple版本将返回 `val` 最小值对应的tuple。本函数适合和`SimpleAggregateFunction`搭配使用。
+
+**示例:**
+
+输入表:
+
+``` text
+┌─user─────┬─salary─┐
+│ director │   5000 │
+│ manager  │   3000 │
+│ worker   │   1000 │
+└──────────┴────────┘
+```
+
+查询:
+
+``` sql
+SELECT argMin(user, salary), argMin(tuple(user, salary)) FROM salary;
+```
+
+结果:
+
+``` text
+┌─argMin(user, salary)─┬─argMin(tuple(user, salary))─┐
+│ worker               │ ('worker',1000)             │
+└──────────────────────┴─────────────────────────────┘
+```
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/avg.md b/docs/zh/sql-reference/aggregate-functions/reference/avg.md
new file mode 100644
index 00000000000..739654adc1c
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/avg.md
@@ -0,0 +1,64 @@
+---
+toc_priority: 5
+---
+
+# avg {#agg_function-avg}
+
+计算算术平均值。
+
+**语法**
+
+``` sql
+avg(x)
+```
+
+**参数**
+
+-   `x` — 输入值, 必须是 [Integer](../../../sql-reference/data-types/int-uint.md), [Float](../../../sql-reference/data-types/float.md), 或 [Decimal](../../../sql-reference/data-types/decimal.md)。
+
+**返回值**
+
+-   算术平均值，总是 [Float64](../../../sql-reference/data-types/float.md) 类型。
+-   输入参数 `x` 为空时返回 `NaN` 。
+
+**示例**
+
+查询:
+
+``` sql
+SELECT avg(x) FROM values('x Int8', 0, 1, 2, 3, 4, 5);
+```
+
+结果:
+
+``` text
+┌─avg(x)─┐
+│    2.5 │
+└────────┘
+```
+
+**示例**
+
+创建一个临时表:
+
+查询:
+
+``` sql
+CREATE table test (t UInt8) ENGINE = Memory;
+```
+
+获取算术平均值:
+
+查询:
+
+```
+SELECT avg(t) FROM test;
+```
+
+结果:
+
+``` text
+┌─avg(x)─┐
+│    nan │
+└────────┘
+```
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/avgweighted.md b/docs/zh/sql-reference/aggregate-functions/reference/avgweighted.md
new file mode 100644
index 00000000000..9b732f57b4a
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/avgweighted.md
@@ -0,0 +1,84 @@
+---
+toc_priority: 107
+---
+
+# avgWeighted {#avgweighted}
+
+
+计算 [加权算术平均值](https://en.wikipedia.org/wiki/Weighted_arithmetic_mean)。
+
+**语法**
+
+``` sql
+avgWeighted(x, weight)
+```
+
+**参数**
+
+-   `x` — 值。 
+-   `weight` — 值的加权。 
+
+`x` 和 `weight` 的类型必须是
+[整数](../../../sql-reference/data-types/int-uint.md), 或
+[浮点数](../../../sql-reference/data-types/float.md), 或
+[定点数](../../../sql-reference/data-types/decimal.md),
+但是可以不一样。
+
+**返回值**
+
+-   `NaN`。 如果所有的权重都等于0 或所提供的权重参数是空。
+-   加权平均值。 其他。
+
+类型: 总是[Float64](../../../sql-reference/data-types/float.md).
+
+**示例**
+
+查询:
+
+``` sql
+SELECT avgWeighted(x, w)
+FROM values('x Int8, w Int8', (4, 1), (1, 0), (10, 2))
+```
+
+结果:
+
+``` text
+┌─avgWeighted(x, weight)─┐
+│                      8 │
+└────────────────────────┘
+```
+
+
+**示例**
+
+查询:
+
+``` sql
+SELECT avgWeighted(x, w)
+FROM values('x Int8, w Int8', (0, 0), (1, 0), (10, 0))
+```
+
+结果:
+
+``` text
+┌─avgWeighted(x, weight)─┐
+│                    nan │
+└────────────────────────┘
+```
+
+**示例**
+
+查询:
+
+``` sql
+CREATE table test (t UInt8) ENGINE = Memory;
+SELECT avgWeighted(t) FROM test
+```
+
+结果:
+
+``` text
+┌─avgWeighted(x, weight)─┐
+│                    nan │
+└────────────────────────┘
+```
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/categoricalinformationvalue.md b/docs/zh/sql-reference/aggregate-functions/reference/categoricalinformationvalue.md
new file mode 100644
index 00000000000..1970e76c2fd
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/categoricalinformationvalue.md
@@ -0,0 +1,13 @@
+---
+toc_priority: 250
+---
+
+# categoricalInformationValue {#categoricalinformationvalue}
+
+对于每个类别计算 `(P(tag = 1) - P(tag = 0))(log(P(tag = 1)) - log(P(tag = 0)))` 。
+
+``` sql
+categoricalInformationValue(category1, category2, ..., tag)
+```
+
+结果指示离散（分类）要素如何使用 `[category1, category2, ...]` 有助于使用学习模型预测`tag`的值。
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/corr.md b/docs/zh/sql-reference/aggregate-functions/reference/corr.md
new file mode 100644
index 00000000000..5ab49f75023
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/corr.md
@@ -0,0 +1,15 @@
+---
+toc_priority: 107
+---
+
+# corr {#corrx-y}
+
+**语法**
+``` sql
+`corr(x, y)`
+```
+
+计算Pearson相关系数: `Σ((x - x̅)(y - y̅)) / sqrt(Σ((x - x̅)^2) * Σ((y - y̅)^2))`。
+
+!!! note "注"
+该函数使用数值不稳定的算法。 如果你需要 [数值稳定性](https://en.wikipedia.org/wiki/Numerical_stability) 在计算中，使用 `corrStable` 函数。 它的工作速度较慢，但提供较低的计算错误。
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/count.md b/docs/zh/sql-reference/aggregate-functions/reference/count.md
new file mode 100644
index 00000000000..fc528980bfa
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/count.md
@@ -0,0 +1,70 @@
+---
+toc_priority: 1
+---
+
+# count {#agg_function-count}
+
+
+计数行数或非空值。
+
+ClickHouse支持以下 `count` 语法:
+- `count(expr)` 或 `COUNT(DISTINCT expr)`。
+- `count()` 或 `COUNT(*)`. 该 `count()` 语法是ClickHouse特定的。
+
+**参数**
+
+该函数可以采取:
+
+-   零参数。
+-   一个 [表达式](../../../sql-reference/syntax.md#syntax-expressions)。
+
+**返回值**
+
+-   如果没有参数调用函数，它会计算行数。
+-   如果 [表达式](../../../sql-reference/syntax.md#syntax-expressions) 被传递，则该函数计数此表达式返回非null的次数。 如果表达式返回 [可为空](../../../sql-reference/data-types/nullable.md)类型的值，`count`的结果仍然不 `Nullable`。 如果表达式对于所有的行都返回 `NULL` ，则该函数返回 0 。
+
+在这两种情况下，返回值的类型为 [UInt64](../../../sql-reference/data-types/int-uint.md)。
+
+**详细信息**
+
+ClickHouse支持 `COUNT(DISTINCT ...)` 语法，这种结构的行为取决于 [count_distinct_implementation](../../../operations/settings/settings.md#settings-count_distinct_implementation) 设置。 它定义了用于执行该操作的 [uniq\*](../../../sql-reference/aggregate-functions/reference/uniq.md#agg_function-uniq)函数。 默认值是 [uniqExact](../../../sql-reference/aggregate-functions/reference/uniqexact.md#agg_function-uniqexact)函数。
+
+`SELECT count() FROM table` 这个查询未被优化，因为表中的条目数没有单独存储。 它从表中选择一个小列并计算其值的个数。
+
+**示例**
+
+示例1:
+
+``` sql
+SELECT count() FROM t
+```
+
+``` text
+┌─count()─┐
+│       5 │
+└─────────┘
+```
+
+示例2:
+
+``` sql
+SELECT name, value FROM system.settings WHERE name = 'count_distinct_implementation'
+```
+
+``` text
+┌─name──────────────────────────┬─value─────┐
+│ count_distinct_implementation │ uniqExact │
+└───────────────────────────────┴───────────┘
+```
+
+``` sql
+SELECT count(DISTINCT num) FROM t
+```
+
+``` text
+┌─uniqExact(num)─┐
+│              3 │
+└────────────────┘
+```
+
+这个例子表明 `count(DISTINCT num)` 是通过 `count_distinct_implementation` 的设定值 `uniqExact` 函数来执行的。
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/covarpop.md b/docs/zh/sql-reference/aggregate-functions/reference/covarpop.md
new file mode 100644
index 00000000000..c6f43c6b9e9
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/covarpop.md
@@ -0,0 +1,15 @@
+---
+toc_priority: 36
+---
+
+# covarPop {#covarpop}
+
+**语法**
+``` sql
+covarPop(x, y)
+```
+
+计算 `Σ((x - x̅)(y - y̅)) / n` 的值。
+
+!!! note "注"
+该函数使用数值不稳定的算法。 如果你需要 [数值稳定性](https://en.wikipedia.org/wiki/Numerical_stability) 在计算中，使用 `covarPopStable` 函数。 它的工作速度较慢，但提供了较低的计算错误。
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/covarsamp.md b/docs/zh/sql-reference/aggregate-functions/reference/covarsamp.md
new file mode 100644
index 00000000000..5ef5104504b
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/covarsamp.md
@@ -0,0 +1,17 @@
+---
+toc_priority: 37
+---
+
+# covarSamp {#covarsamp}
+
+**语法**
+``` sql
+covarSamp(x, y)
+```
+
+计算 `Σ((x - x̅)(y - y̅)) / (n - 1)` 的值。
+
+返回Float64。 当 `n <= 1`, 返回 +∞。
+
+!!! note "注"
+该函数使用数值不稳定的算法。 如果你需要 [数值稳定性](https://en.wikipedia.org/wiki/Numerical_stability) 在计算中，使用 `covarSampStable` 函数。 它的工作速度较慢，但提供较低的计算错误。
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/deltasum.md b/docs/zh/sql-reference/aggregate-functions/reference/deltasum.md
new file mode 100644
index 00000000000..e439263bf78
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/deltasum.md
@@ -0,0 +1,69 @@
+---
+toc_priority: 141
+---
+
+# deltaSum {#agg_functions-deltasum}
+
+计算连续行之间的差值和。如果差值为负，则忽略。
+
+**语法**
+
+``` sql
+deltaSum(value)
+```
+
+**参数**
+
+-   `value` — 必须是 [整型](../../data-types/int-uint.md) 或者 [浮点型](../../data-types/float.md) 。
+
+**返回值**
+
+- `Integer` or `Float` 型的算术差值和。
+
+**示例**
+
+查询:
+
+``` sql
+SELECT deltaSum(arrayJoin([1, 2, 3]));
+```
+
+结果:
+
+``` text
+┌─deltaSum(arrayJoin([1, 2, 3]))─┐
+│                              2 │
+└────────────────────────────────┘
+```
+
+查询:
+
+``` sql
+SELECT deltaSum(arrayJoin([1, 2, 3, 0, 3, 4, 2, 3]));
+```
+
+结果:
+
+``` text
+┌─deltaSum(arrayJoin([1, 2, 3, 0, 3, 4, 2, 3]))─┐
+│                                             7 │
+└───────────────────────────────────────────────┘
+```
+
+查询:
+
+``` sql
+SELECT deltaSum(arrayJoin([2.25, 3, 4.5]));
+```
+
+结果:
+
+``` text
+┌─deltaSum(arrayJoin([2.25, 3, 4.5]))─┐
+│                                2.25 │
+└─────────────────────────────────────┘
+```
+
+**参见**
+
+-   [runningDifference](../../functions/other-functions.md#other_functions-runningdifference)
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/grouparray.md b/docs/zh/sql-reference/aggregate-functions/reference/grouparray.md
new file mode 100644
index 00000000000..0a8f1cd326d
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/grouparray.md
@@ -0,0 +1,20 @@
+---
+toc_priority: 110
+---
+
+# groupArray {#agg_function-grouparray}
+
+**语法**
+``` sql
+groupArray(x)
+或
+groupArray(max_size)(x)
+```
+
+创建参数值的数组。
+值可以按任何（不确定）顺序添加到数组中。
+
+第二个版本（带有 `max_size` 参数）将结果数组的大小限制为 `max_size` 个元素。
+例如, `groupArray (1) (x)` 相当于 `[any (x)]` 。
+
+在某些情况下，您仍然可以依赖执行顺序。这适用于SELECT(查询)来自使用了 `ORDER BY` 子查询的情况。
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/grouparrayinsertat.md b/docs/zh/sql-reference/aggregate-functions/reference/grouparrayinsertat.md
new file mode 100644
index 00000000000..3a50b24fd7f
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/grouparrayinsertat.md
@@ -0,0 +1,91 @@
+---
+toc_priority: 112
+---
+
+# groupArrayInsertAt {#grouparrayinsertat}
+
+在指定位置向数组中插入一个值。
+
+**语法**
+
+``` sql
+groupArrayInsertAt(default_x, size)(x, pos);
+```
+
+如果在一个查询中将多个值插入到同一位置，则该函数的行为方式如下:
+
+-   如果在单个线程中执行查询，则使用第一个插入的值。
+-   如果在多个线程中执行查询，则结果值是未确定的插入值之一。
+
+**参数**
+
+-   `x` — 要插入的值。生成所[支持的数据类型](../../../sql-reference/data-types/index.md)(数据)的[表达式](../../../sql-reference/syntax.md#syntax-expressions)。
+-   `pos` — 指定元素 `x` 将被插入的位置。 数组中的索引编号从零开始。 [UInt32](../../../sql-reference/data-types/int-uint.md#uint-ranges).
+-   `default_x` — 在空位置替换的默认值。可选参数。生成 `x` 数据类型 (数据) 的[表达式](../../../sql-reference/syntax.md#syntax-expressions)。  如果 `default_x` 未定义，则 [默认值](../../../sql-reference/statements/create.md#create-default-values) 被使用。
+-   `size`— 结果数组的长度。可选参数。如果使用该参数，必须指定默认值 `default_x` 。 [UInt32](../../../sql-reference/data-types/int-uint.md#uint-ranges)。
+
+**返回值**
+
+-   具有插入值的数组。
+
+类型: [阵列](../../../sql-reference/data-types/array.md#data-type-array)。
+
+**示例**
+
+查询:
+
+``` sql
+SELECT groupArrayInsertAt(toString(number), number * 2) FROM numbers(5);
+```
+
+结果:
+
+``` text
+┌─groupArrayInsertAt(toString(number), multiply(number, 2))─┐
+│ ['0','','1','','2','','3','','4']                         │
+└───────────────────────────────────────────────────────────┘
+```
+
+查询:
+
+``` sql
+SELECT groupArrayInsertAt('-')(toString(number), number * 2) FROM numbers(5);
+```
+
+结果:
+
+``` text
+┌─groupArrayInsertAt('-')(toString(number), multiply(number, 2))─┐
+│ ['0','-','1','-','2','-','3','-','4']                          │
+└────────────────────────────────────────────────────────────────┘
+```
+
+查询:
+
+``` sql
+SELECT groupArrayInsertAt('-', 5)(toString(number), number * 2) FROM numbers(5);
+```
+
+结果:
+
+``` text
+┌─groupArrayInsertAt('-', 5)(toString(number), multiply(number, 2))─┐
+│ ['0','-','1','-','2']                                             │
+└───────────────────────────────────────────────────────────────────┘
+```
+
+在一个位置多线程插入数据。
+
+查询:
+
+``` sql
+SELECT groupArrayInsertAt(number, 0) FROM numbers_mt(10) SETTINGS max_block_size = 1;
+```
+
+作为这个查询的结果，你会得到 `[0,9]` 范围的随机整数。 例如:
+
+``` text
+┌─groupArrayInsertAt(number, 0)─┐
+│ [7]                           │
+└───────────────────────────────┘
+```
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/grouparraymovingavg.md b/docs/zh/sql-reference/aggregate-functions/reference/grouparraymovingavg.md
new file mode 100644
index 00000000000..8cdfc302b39
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/grouparraymovingavg.md
@@ -0,0 +1,85 @@
+---
+toc_priority: 114
+---
+
+# groupArrayMovingAvg {#agg_function-grouparraymovingavg}
+
+计算输入值的移动平均值。
+
+**语法**
+
+``` sql
+groupArrayMovingAvg(numbers_for_summing)
+groupArrayMovingAvg(window_size)(numbers_for_summing)
+```
+
+该函数可以将窗口大小作为参数。 如果未指定，则该函数的窗口大小等于列中的行数。
+
+**参数**
+
+-   `numbers_for_summing` — [表达式](../../../sql-reference/syntax.md#syntax-expressions) 生成数值数据类型值。
+-   `window_size` — 窗口大小。
+
+**返回值**
+
+-   与输入数据大小相同的数组。
+
+对于输入数据类型是[Integer](../../../sql-reference/data-types/int-uint.md),
+和[floating-point](../../../sql-reference/data-types/float.md),
+对应的返回值类型是 `Float64` 。
+对于输入数据类型是[Decimal](../../../sql-reference/data-types/decimal.md) 返回值类型是 `Decimal128` 。
+
+该函数对于 `Decimal128` 使用 [四舍五入到零](https://en.wikipedia.org/wiki/Rounding#Rounding_towards_zero). 它截断无意义的小数位来保证结果的数据类型。
+
+**示例**
+
+样表 `t`:
+
+``` sql
+CREATE TABLE t
+(
+    `int` UInt8,
+    `float` Float32,
+    `dec` Decimal32(2)
+)
+ENGINE = TinyLog
+```
+
+``` text
+┌─int─┬─float─┬──dec─┐
+│   1 │   1.1 │ 1.10 │
+│   2 │   2.2 │ 2.20 │
+│   4 │   4.4 │ 4.40 │
+│   7 │  7.77 │ 7.77 │
+└─────┴───────┴──────┘
+```
+
+查询:
+
+``` sql
+SELECT
+    groupArrayMovingAvg(int) AS I,
+    groupArrayMovingAvg(float) AS F,
+    groupArrayMovingAvg(dec) AS D
+FROM t
+```
+
+``` text
+┌─I────────────────────┬─F─────────────────────────────────────────────────────────────────────────────┬─D─────────────────────┐
+│ [0.25,0.75,1.75,3.5] │ [0.2750000059604645,0.8250000178813934,1.9250000417232513,3.8499999940395355] │ [0.27,0.82,1.92,3.86] │
+└──────────────────────┴───────────────────────────────────────────────────────────────────────────────┴───────────────────────┘
+```
+
+``` sql
+SELECT
+    groupArrayMovingAvg(2)(int) AS I,
+    groupArrayMovingAvg(2)(float) AS F,
+    groupArrayMovingAvg(2)(dec) AS D
+FROM t
+```
+
+``` text
+┌─I───────────────┬─F───────────────────────────────────────────────────────────────────────────┬─D─────────────────────┐
+│ [0.5,1.5,3,5.5] │ [0.550000011920929,1.6500000357627869,3.3000000715255737,6.049999952316284] │ [0.55,1.65,3.30,6.08] │
+└─────────────────┴─────────────────────────────────────────────────────────────────────────────┴───────────────────────┘
+```
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/grouparraymovingsum.md b/docs/zh/sql-reference/aggregate-functions/reference/grouparraymovingsum.md
new file mode 100644
index 00000000000..d58d848e7ac
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/grouparraymovingsum.md
@@ -0,0 +1,81 @@
+---
+toc_priority: 113
+---
+
+# groupArrayMovingSum {#agg_function-grouparraymovingsum}
+
+
+计算输入值的移动和。
+
+**语法**
+
+``` sql
+groupArrayMovingSum(numbers_for_summing)
+groupArrayMovingSum(window_size)(numbers_for_summing)
+```
+
+该函数可以将窗口大小作为参数。 如果未指定，则该函数的窗口大小等于列中的行数。
+
+**参数**
+
+-   `numbers_for_summing` — [表达式](../../../sql-reference/syntax.md#syntax-expressions) 生成数值数据类型值。
+-   `window_size` — 窗口大小。
+
+**返回值**
+
+-   与输入数据大小相同的数组。
+对于输入数据类型是[Decimal](../../../sql-reference/data-types/decimal.md) 数组元素类型是 `Decimal128` 。
+对于其他的数值类型, 获取其对应的 `NearestFieldType` 。
+
+**示例**
+
+样表:
+
+``` sql
+CREATE TABLE t
+(
+    `int` UInt8,
+    `float` Float32,
+    `dec` Decimal32(2)
+)
+ENGINE = TinyLog
+```
+
+``` text
+┌─int─┬─float─┬──dec─┐
+│   1 │   1.1 │ 1.10 │
+│   2 │   2.2 │ 2.20 │
+│   4 │   4.4 │ 4.40 │
+│   7 │  7.77 │ 7.77 │
+└─────┴───────┴──────┘
+```
+
+查询:
+
+``` sql
+SELECT
+    groupArrayMovingSum(int) AS I,
+    groupArrayMovingSum(float) AS F,
+    groupArrayMovingSum(dec) AS D
+FROM t
+```
+
+``` text
+┌─I──────────┬─F───────────────────────────────┬─D──────────────────────┐
+│ [1,3,7,14] │ [1.1,3.3000002,7.7000003,15.47] │ [1.10,3.30,7.70,15.47] │
+└────────────┴─────────────────────────────────┴────────────────────────┘
+```
+
+``` sql
+SELECT
+    groupArrayMovingSum(2)(int) AS I,
+    groupArrayMovingSum(2)(float) AS F,
+    groupArrayMovingSum(2)(dec) AS D
+FROM t
+```
+
+``` text
+┌─I──────────┬─F───────────────────────────────┬─D──────────────────────┐
+│ [1,3,6,11] │ [1.1,3.3000002,6.6000004,12.17] │ [1.10,3.30,6.60,12.17] │
+└────────────┴─────────────────────────────────┴────────────────────────┘
+```
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/grouparraysample.md b/docs/zh/sql-reference/aggregate-functions/reference/grouparraysample.md
new file mode 100644
index 00000000000..529b63a2316
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/grouparraysample.md
@@ -0,0 +1,82 @@
+---
+toc_priority: 114
+---
+
+# groupArraySample {#grouparraysample}
+
+构建一个参数值的采样数组。
+结果数组的大小限制为 `max_size` 个元素。参数值被随机选择并添加到数组中。
+
+**语法**
+
+``` sql
+groupArraySample(max_size[, seed])(x)
+```
+
+**参数**
+
+-   `max_size` — 结果数组的最大长度。[UInt64](../../data-types/int-uint.md)。
+-   `seed` — 随机数发生器的种子。可选。[UInt64](../../data-types/int-uint.md)。默认值: `123456`。
+-   `x` — 参数 (列名 或者 表达式)。
+
+**返回值**
+
+-   随机选取参数 `x` (的值)组成的数组。
+
+类型: [Array](../../../sql-reference/data-types/array.md).
+
+**示例**
+
+样表 `colors`:
+
+``` text
+┌─id─┬─color──┐
+│  1 │ red    │
+│  2 │ blue   │
+│  3 │ green  │
+│  4 │ white  │
+│  5 │ orange │
+└────┴────────┘
+```
+
+使用列名做参数查询:
+
+``` sql
+SELECT groupArraySample(3)(color) as newcolors FROM colors;
+```
+
+结果:
+
+```text
+┌─newcolors──────────────────┐
+│ ['white','blue','green']   │
+└────────────────────────────┘
+```
+
+使用列名和不同的(随机数)种子查询:
+
+``` sql
+SELECT groupArraySample(3, 987654321)(color) as newcolors FROM colors;
+```
+
+结果:
+
+```text
+┌─newcolors──────────────────┐
+│ ['red','orange','green']   │
+└────────────────────────────┘
+```
+
+使用表达式做参数查询:
+
+``` sql
+SELECT groupArraySample(3)(concat('light-', color)) as newcolors FROM colors;
+```
+
+结果:
+
+```text
+┌─newcolors───────────────────────────────────┐
+│ ['light-blue','light-orange','light-green'] │
+└─────────────────────────────────────────────┘
+```
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/groupbitand.md b/docs/zh/sql-reference/aggregate-functions/reference/groupbitand.md
new file mode 100644
index 00000000000..1a8520b0f08
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/groupbitand.md
@@ -0,0 +1,48 @@
+---
+toc_priority: 125
+---
+
+# groupBitAnd {#groupbitand}
+
+对于数字序列按位应用 `AND` 。
+
+**语法**
+
+``` sql
+groupBitAnd(expr)
+```
+
+**参数**
+
+`expr` – 结果为 `UInt*` 类型的表达式。
+
+**返回值**
+
+`UInt*` 类型的值。
+
+**示例**
+
+测试数据:
+
+``` text
+binary     decimal
+00101100 = 44
+00011100 = 28
+00001101 = 13
+01010101 = 85
+```
+
+查询:
+
+``` sql
+SELECT groupBitAnd(num) FROM t
+```
+
+`num` 是包含测试数据的列。
+
+结果:
+
+``` text
+binary     decimal
+00000100 = 4
+```
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/groupbitmap.md b/docs/zh/sql-reference/aggregate-functions/reference/groupbitmap.md
new file mode 100644
index 00000000000..5e14c3a21ea
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/groupbitmap.md
@@ -0,0 +1,46 @@
+---
+toc_priority: 128
+---
+
+# groupBitmap {#groupbitmap}
+
+从无符号整数列进行位图或聚合计算，返回 `UInt64` 类型的基数，如果添加后缀 `State` ，则返回[位图对象](../../../sql-reference/functions/bitmap-functions.md)。
+
+**语法**
+
+``` sql
+groupBitmap(expr)
+```
+
+**参数**
+
+`expr` –  结果为 `UInt*` 类型的表达式。
+
+**返回值**
+
+`UInt64` 类型的值。
+
+**示例**
+
+测试数据:
+
+``` text
+UserID
+1
+1
+2
+3
+```
+
+查询:
+
+``` sql
+SELECT groupBitmap(UserID) as num FROM t
+```
+
+结果:
+
+``` text
+num
+3
+```
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/groupbitmapand.md b/docs/zh/sql-reference/aggregate-functions/reference/groupbitmapand.md
new file mode 100644
index 00000000000..bd5aa17c7ff
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/groupbitmapand.md
@@ -0,0 +1,48 @@
+---
+toc_priority: 129
+---
+
+# groupBitmapAnd {#groupbitmapand}
+
+计算位图列的 `AND` ，返回 `UInt64` 类型的基数，如果添加后缀 `State` ，则返回 [位图对象](../../../sql-reference/functions/bitmap-functions.md)。
+
+**语法**
+
+``` sql
+groupBitmapAnd(expr)
+```
+
+**参数**
+
+`expr` – 结果为 `AggregateFunction(groupBitmap, UInt*)` 类型的表达式。
+
+**返回值**
+
+`UInt64` 类型的值。
+
+**示例**
+
+``` sql
+DROP TABLE IF EXISTS bitmap_column_expr_test2;
+CREATE TABLE bitmap_column_expr_test2
+(
+    tag_id String,
+    z AggregateFunction(groupBitmap, UInt32)
+)
+ENGINE = MergeTree
+ORDER BY tag_id;
+
+INSERT INTO bitmap_column_expr_test2 VALUES ('tag1', bitmapBuild(cast([1,2,3,4,5,6,7,8,9,10] as Array(UInt32))));
+INSERT INTO bitmap_column_expr_test2 VALUES ('tag2', bitmapBuild(cast([6,7,8,9,10,11,12,13,14,15] as Array(UInt32))));
+INSERT INTO bitmap_column_expr_test2 VALUES ('tag3', bitmapBuild(cast([2,4,6,8,10,12] as Array(UInt32))));
+
+SELECT groupBitmapAnd(z) FROM bitmap_column_expr_test2 WHERE like(tag_id, 'tag%');
+┌─groupBitmapAnd(z)─┐
+│               3   │
+└───────────────────┘
+
+SELECT arraySort(bitmapToArray(groupBitmapAndState(z))) FROM bitmap_column_expr_test2 WHERE like(tag_id, 'tag%');
+┌─arraySort(bitmapToArray(groupBitmapAndState(z)))─┐
+│ [6,8,10]                                         │
+└──────────────────────────────────────────────────┘
+```
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/groupbitmapor.md b/docs/zh/sql-reference/aggregate-functions/reference/groupbitmapor.md
new file mode 100644
index 00000000000..52048083d17
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/groupbitmapor.md
@@ -0,0 +1,48 @@
+---
+toc_priority: 130
+---
+
+# groupBitmapOr {#groupbitmapor}
+
+计算位图列的 `OR` ，返回 `UInt64` 类型的基数，如果添加后缀 `State` ，则返回 [位图对象](../../../sql-reference/functions/bitmap-functions.md)。
+
+**语法**
+
+``` sql
+groupBitmapOr(expr)
+```
+
+**参数**
+
+`expr` – 结果为 `AggregateFunction(groupBitmap, UInt*)` 类型的表达式。
+
+**返回值**
+
+`UInt64` 类型的值。
+
+**示例**
+
+``` sql
+DROP TABLE IF EXISTS bitmap_column_expr_test2;
+CREATE TABLE bitmap_column_expr_test2
+(
+    tag_id String,
+    z AggregateFunction(groupBitmap, UInt32)
+)
+ENGINE = MergeTree
+ORDER BY tag_id;
+
+INSERT INTO bitmap_column_expr_test2 VALUES ('tag1', bitmapBuild(cast([1,2,3,4,5,6,7,8,9,10] as Array(UInt32))));
+INSERT INTO bitmap_column_expr_test2 VALUES ('tag2', bitmapBuild(cast([6,7,8,9,10,11,12,13,14,15] as Array(UInt32))));
+INSERT INTO bitmap_column_expr_test2 VALUES ('tag3', bitmapBuild(cast([2,4,6,8,10,12] as Array(UInt32))));
+
+SELECT groupBitmapOr(z) FROM bitmap_column_expr_test2 WHERE like(tag_id, 'tag%');
+┌─groupBitmapOr(z)─┐
+│             15   │
+└──────────────────┘
+
+SELECT arraySort(bitmapToArray(groupBitmapOrState(z))) FROM bitmap_column_expr_test2 WHERE like(tag_id, 'tag%');
+┌─arraySort(bitmapToArray(groupBitmapOrState(z)))─┐
+│ [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15]           │
+└─────────────────────────────────────────────────┘
+```
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/groupbitmapxor.md b/docs/zh/sql-reference/aggregate-functions/reference/groupbitmapxor.md
new file mode 100644
index 00000000000..d862e974418
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/groupbitmapxor.md
@@ -0,0 +1,48 @@
+---
+toc_priority: 131
+---
+
+# groupBitmapXor {#groupbitmapxor}
+
+计算位图列的 `XOR` ，返回 `UInt64` 类型的基数，如果添加后缀 `State` ，则返回 [位图对象](../../../sql-reference/functions/bitmap-functions.md)。
+
+**语法**
+
+``` sql
+groupBitmapXor(expr)
+```
+
+**参数**
+
+`expr` – 结果为 `AggregateFunction(groupBitmap, UInt*)` 类型的表达式。
+
+**返回值**
+
+`UInt64` 类型的值。
+
+**示例**
+
+``` sql
+DROP TABLE IF EXISTS bitmap_column_expr_test2;
+CREATE TABLE bitmap_column_expr_test2
+(
+    tag_id String,
+    z AggregateFunction(groupBitmap, UInt32)
+)
+ENGINE = MergeTree
+ORDER BY tag_id;
+
+INSERT INTO bitmap_column_expr_test2 VALUES ('tag1', bitmapBuild(cast([1,2,3,4,5,6,7,8,9,10] as Array(UInt32))));
+INSERT INTO bitmap_column_expr_test2 VALUES ('tag2', bitmapBuild(cast([6,7,8,9,10,11,12,13,14,15] as Array(UInt32))));
+INSERT INTO bitmap_column_expr_test2 VALUES ('tag3', bitmapBuild(cast([2,4,6,8,10,12] as Array(UInt32))));
+
+SELECT groupBitmapXor(z) FROM bitmap_column_expr_test2 WHERE like(tag_id, 'tag%');
+┌─groupBitmapXor(z)─┐
+│              10   │
+└───────────────────┘
+
+SELECT arraySort(bitmapToArray(groupBitmapXorState(z))) FROM bitmap_column_expr_test2 WHERE like(tag_id, 'tag%');
+┌─arraySort(bitmapToArray(groupBitmapXorState(z)))─┐
+│ [1,3,5,6,8,10,11,13,14,15]                       │
+└──────────────────────────────────────────────────┘
+```
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/groupbitor.md b/docs/zh/sql-reference/aggregate-functions/reference/groupbitor.md
new file mode 100644
index 00000000000..175cc8d7286
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/groupbitor.md
@@ -0,0 +1,48 @@
+---
+toc_priority: 126
+---
+
+# groupBitOr {#groupbitor}
+
+对于数字序列按位应用 `OR` 。
+
+**语法**
+
+``` sql
+groupBitOr(expr)
+```
+
+**参数**
+
+`expr` – 结果为 `UInt*` 类型的表达式。
+
+**返回值**
+
+`UInt*` 类型的值。
+
+**示例**
+
+测试数据::
+
+``` text
+binary     decimal
+00101100 = 44
+00011100 = 28
+00001101 = 13
+01010101 = 85
+```
+
+查询:
+
+``` sql
+SELECT groupBitOr(num) FROM t
+```
+
+`num` 是包含测试数据的列。
+
+结果:
+
+``` text
+binary     decimal
+01111101 = 125
+```
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/groupbitxor.md b/docs/zh/sql-reference/aggregate-functions/reference/groupbitxor.md
new file mode 100644
index 00000000000..26409f00032
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/groupbitxor.md
@@ -0,0 +1,48 @@
+---
+toc_priority: 127
+---
+
+# groupBitXor {#groupbitxor}
+
+对于数字序列按位应用 `XOR` 。
+
+**语法**
+
+``` sql
+groupBitXor(expr)
+```
+
+**参数**
+
+`expr` – 结果为 `UInt*` 类型的表达式。
+
+**返回值**
+
+`UInt*` 类型的值。
+
+**示例**
+
+测试数据:
+
+``` text
+binary     decimal
+00101100 = 44
+00011100 = 28
+00001101 = 13
+01010101 = 85
+```
+
+查询:
+
+``` sql
+SELECT groupBitXor(num) FROM t
+```
+
+`num` 是包含测试数据的列。
+
+结果:
+
+``` text
+binary     decimal
+01101000 = 104
+```
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/groupuniqarray.md b/docs/zh/sql-reference/aggregate-functions/reference/groupuniqarray.md
new file mode 100644
index 00000000000..f371361bbf6
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/groupuniqarray.md
@@ -0,0 +1,18 @@
+---
+toc_priority: 111
+---
+
+# groupUniqArray {#groupuniqarray}
+
+**语法**
+
+``` sql
+groupUniqArray(x)
+或
+groupUniqArray(max_size)(x)
+```
+
+从不同的参数值创建一个数组。 内存消耗和 [uniqExact](../../../sql-reference/aggregate-functions/reference/uniqexact.md) 函数是一样的。
+
+第二个版本（带有 `max_size` 参数）将结果数组的大小限制为 `max_size` 个元素。
+例如, `groupUniqArray(1)(x)` 相当于 `[any(x)]`.
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/index.md b/docs/zh/sql-reference/aggregate-functions/reference/index.md
new file mode 100644
index 00000000000..5070c79775e
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/index.md
@@ -0,0 +1,72 @@
+---
+toc_folder_title: Reference
+toc_priority: 36
+toc_hidden: true
+---
+
+# 聚合函数列表 {#aggregate-functions-reference}
+
+标准聚合函数:
+
+-   [count](../../../sql-reference/aggregate-functions/reference/count.md)
+-   [min](../../../sql-reference/aggregate-functions/reference/min.md)
+-   [max](../../../sql-reference/aggregate-functions/reference/max.md)
+-   [sum](../../../sql-reference/aggregate-functions/reference/sum.md)
+-   [avg](../../../sql-reference/aggregate-functions/reference/avg.md)
+-   [any](../../../sql-reference/aggregate-functions/reference/any.md)
+-   [stddevPop](../../../sql-reference/aggregate-functions/reference/stddevpop.md)
+-   [stddevSamp](../../../sql-reference/aggregate-functions/reference/stddevsamp.md)
+-   [varPop](../../../sql-reference/aggregate-functions/reference/varpop.md)
+-   [varSamp](../../../sql-reference/aggregate-functions/reference/varsamp.md)
+-   [covarPop](../../../sql-reference/aggregate-functions/reference/covarpop.md)
+-   [covarSamp](../../../sql-reference/aggregate-functions/reference/covarsamp.md)
+
+ClickHouse 特有的聚合函数:
+
+-   [anyHeavy](../../../sql-reference/aggregate-functions/reference/anyheavy.md)
+-   [anyLast](../../../sql-reference/aggregate-functions/reference/anylast.md)
+-   [argMin](../../../sql-reference/aggregate-functions/reference/argmin.md)
+-   [argMax](../../../sql-reference/aggregate-functions/reference/argmax.md)
+-   [avgWeighted](../../../sql-reference/aggregate-functions/reference/avgweighted.md)
+-   [topK](../../../sql-reference/aggregate-functions/reference/topk.md)
+-   [topKWeighted](../../../sql-reference/aggregate-functions/reference/topkweighted.md)
+-   [groupArray](../../../sql-reference/aggregate-functions/reference/grouparray.md)
+-   [groupUniqArray](../../../sql-reference/aggregate-functions/reference/groupuniqarray.md)
+-   [groupArrayInsertAt](../../../sql-reference/aggregate-functions/reference/grouparrayinsertat.md)
+-   [groupArrayMovingAvg](../../../sql-reference/aggregate-functions/reference/grouparraymovingavg.md)
+-   [groupArrayMovingSum](../../../sql-reference/aggregate-functions/reference/grouparraymovingsum.md)
+-   [groupBitAnd](../../../sql-reference/aggregate-functions/reference/groupbitand.md)
+-   [groupBitOr](../../../sql-reference/aggregate-functions/reference/groupbitor.md)
+-   [groupBitXor](../../../sql-reference/aggregate-functions/reference/groupbitxor.md)
+-   [groupBitmap](../../../sql-reference/aggregate-functions/reference/groupbitmap.md)
+-   [groupBitmapAnd](../../../sql-reference/aggregate-functions/reference/groupbitmapand.md)
+-   [groupBitmapOr](../../../sql-reference/aggregate-functions/reference/groupbitmapor.md)
+-   [groupBitmapXor](../../../sql-reference/aggregate-functions/reference/groupbitmapxor.md)
+-   [sumWithOverflow](../../../sql-reference/aggregate-functions/reference/sumwithoverflow.md)
+-   [sumMap](../../../sql-reference/aggregate-functions/reference/summap.md)
+-   [minMap](../../../sql-reference/aggregate-functions/reference/minmap.md)
+-   [maxMap](../../../sql-reference/aggregate-functions/reference/maxmap.md)
+-   [skewSamp](../../../sql-reference/aggregate-functions/reference/skewsamp.md)
+-   [skewPop](../../../sql-reference/aggregate-functions/reference/skewpop.md)
+-   [kurtSamp](../../../sql-reference/aggregate-functions/reference/kurtsamp.md)
+-   [kurtPop](../../../sql-reference/aggregate-functions/reference/kurtpop.md)
+-   [uniq](../../../sql-reference/aggregate-functions/reference/uniq.md)
+-   [uniqExact](../../../sql-reference/aggregate-functions/reference/uniqexact.md)
+-   [uniqCombined](../../../sql-reference/aggregate-functions/reference/uniqcombined.md)
+-   [uniqCombined64](../../../sql-reference/aggregate-functions/reference/uniqcombined64.md)
+-   [uniqHLL12](../../../sql-reference/aggregate-functions/reference/uniqhll12.md)
+-   [quantile](../../../sql-reference/aggregate-functions/reference/quantile.md)
+-   [quantiles](../../../sql-reference/aggregate-functions/reference/quantiles.md)
+-   [quantileExact](../../../sql-reference/aggregate-functions/reference/quantileexact.md)
+-   [quantileExactLow](../../../sql-reference/aggregate-functions/reference/quantileexact.md#quantileexactlow)
+-   [quantileExactHigh](../../../sql-reference/aggregate-functions/reference/quantileexact.md#quantileexacthigh)
+-   [quantileExactWeighted](../../../sql-reference/aggregate-functions/reference/quantileexactweighted.md)
+-   [quantileTiming](../../../sql-reference/aggregate-functions/reference/quantiletiming.md)
+-   [quantileTimingWeighted](../../../sql-reference/aggregate-functions/reference/quantiletimingweighted.md)
+-   [quantileDeterministic](../../../sql-reference/aggregate-functions/reference/quantiledeterministic.md)
+-   [quantileTDigest](../../../sql-reference/aggregate-functions/reference/quantiletdigest.md)
+-   [quantileTDigestWeighted](../../../sql-reference/aggregate-functions/reference/quantiletdigestweighted.md)
+-   [simpleLinearRegression](../../../sql-reference/aggregate-functions/reference/simplelinearregression.md)
+-   [stochasticLinearRegression](../../../sql-reference/aggregate-functions/reference/stochasticlinearregression.md)
+-   [stochasticLogisticRegression](../../../sql-reference/aggregate-functions/reference/stochasticlogisticregression.md)
+-   [categoricalInformationValue](../../../sql-reference/aggregate-functions/reference/categoricalinformationvalue.md)
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/initializeAggregation.md b/docs/zh/sql-reference/aggregate-functions/reference/initializeAggregation.md
new file mode 100644
index 00000000000..feecd7afb1f
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/initializeAggregation.md
@@ -0,0 +1,37 @@
+---
+toc_priority: 150
+---
+
+## initializeAggregation {#initializeaggregation}
+
+初始化你输入行的聚合。用于后缀是 `State` 的函数。
+用它来测试或处理 `AggregateFunction` 和 `AggregationgMergeTree` 类型的列。
+
+**语法**
+
+``` sql
+initializeAggregation (aggregate_function, column_1, column_2)
+```
+
+**参数**
+
+-   `aggregate_function` — 聚合函数名。 这个函数的状态 — 正创建的。[String](../../../sql-reference/data-types/string.md#string)。
+-   `column_n` — 将其转换为函数的参数的列。[String](../../../sql-reference/data-types/string.md#string)。
+
+**返回值**
+
+返回输入行的聚合结果。返回类型将与 `initializeAgregation` 用作第一个参数的函数的返回类型相同。
+例如，对于后缀为 `State` 的函数，返回类型将是 `AggregateFunction`。
+
+**示例**
+
+查询:
+
+```sql
+SELECT uniqMerge(state) FROM (SELECT initializeAggregation('uniqState', number % 3) AS state FROM system.numbers LIMIT 10000);
+```
+结果:
+
+┌─uniqMerge(state)─┐
+│                3 │
+└──────────────────┘
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/kurtpop.md b/docs/zh/sql-reference/aggregate-functions/reference/kurtpop.md
new file mode 100644
index 00000000000..d5b76e0c1e9
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/kurtpop.md
@@ -0,0 +1,26 @@
+---
+toc_priority: 153
+---
+
+# kurtPop {#kurtpop}
+
+计算给定序列的 [峰度](https://en.wikipedia.org/wiki/Kurtosis)。
+
+**语法**
+
+``` sql
+kurtPop(expr)
+```
+
+**参数**
+
+`expr` —  结果为数字的 [表达式](../../../sql-reference/syntax.md#syntax-expressions)。
+
+**返回值**
+
+给定分布的峰度。 类型 — [Float64](../../../sql-reference/data-types/float.md)
+
+**示例**
+
+``` sql
+SELECT kurtPop(value) FROM series_with_value_column;
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/kurtsamp.md b/docs/zh/sql-reference/aggregate-functions/reference/kurtsamp.md
new file mode 100644
index 00000000000..a38e14d0792
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/kurtsamp.md
@@ -0,0 +1,28 @@
+---
+toc_priority: 154
+---
+
+# kurtSamp {#kurtsamp}
+
+计算给定序列的 [峰度样本](https://en.wikipedia.org/wiki/Kurtosis)。
+它表示随机变量峰度的无偏估计，如果传递的值形成其样本。
+
+**语法**
+
+``` sql
+kurtSamp(expr)
+```
+
+**参数**
+
+`expr` — 结果为数字的 [表达式](../../../sql-reference/syntax.md#syntax-expressions)。
+
+**返回值**
+
+给定序列的峰度。类型 — [Float64](../../../sql-reference/data-types/float.md)。 如果 `n <= 1` (`n` 是样本的大小），则该函数返回 `nan`。
+
+**示例**
+
+``` sql
+SELECT kurtSamp(value) FROM series_with_value_column;
+```
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/mannwhitneyutest.md b/docs/zh/sql-reference/aggregate-functions/reference/mannwhitneyutest.md
new file mode 100644
index 00000000000..016a650b61b
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/mannwhitneyutest.md
@@ -0,0 +1,72 @@
+---
+toc_priority: 310
+toc_title: mannWhitneyUTest
+---
+
+# mannWhitneyUTest {#mannwhitneyutest}
+
+对两个总体的样本应用 Mann-Whitney 秩检验。
+
+**语法**
+
+``` sql
+mannWhitneyUTest[(alternative[, continuity_correction])](sample_data, sample_index)
+```
+
+两个样本的值都在 `sample_data` 列中。如果 `sample_index` 等于 0，则该行的值属于第一个总体的样本。 反之属于第二个总体的样本。
+零假设是两个总体随机相等。也可以检验单边假设。该检验不假设数据具有正态分布。
+
+**参数**
+
+-   `sample_data` — 样本数据。[Integer](../../../sql-reference/data-types/int-uint.md), [Float](../../../sql-reference/data-types/float.md) 或 [Decimal](../../../sql-reference/data-types/decimal.md)。
+-   `sample_index` — 样本索引。[Integer](../../../sql-reference/data-types/int-uint.md).
+
+**参数**
+
+-   `alternative` — 供选假设。(可选，默认值是: `'two-sided'` 。) [String](../../../sql-reference/data-types/string.md)。
+    -   `'two-sided'`;
+    -   `'greater'`;
+    -   `'less'`。
+-   `continuity_correction` — 如果不为0，那么将对p值进行正态近似的连续性修正。(可选，默认：1。) [UInt64](../../../sql-reference/data-types/int-uint.md)。
+
+**返回值**
+
+[元组](../../../sql-reference/data-types/tuple.md)，有两个元素:
+
+-   计算出U统计量。[Float64](../../../sql-reference/data-types/float.md)。
+-   计算出的p值。[Float64](../../../sql-reference/data-types/float.md)。
+
+
+**示例**
+
+输入表:
+
+``` text
+┌─sample_data─┬─sample_index─┐
+│          10 │            0 │
+│          11 │            0 │
+│          12 │            0 │
+│           1 │            1 │
+│           2 │            1 │
+│           3 │            1 │
+└─────────────┴──────────────┘
+```
+
+查询:
+
+``` sql
+SELECT mannWhitneyUTest('greater')(sample_data, sample_index) FROM mww_ttest;
+```
+
+结果:
+
+``` text
+┌─mannWhitneyUTest('greater')(sample_data, sample_index)─┐
+│ (9,0.04042779918503192)                                │
+└────────────────────────────────────────────────────────┘
+```
+
+**参见**
+
+-   [Mann–Whitney U test](https://en.wikipedia.org/wiki/Mann%E2%80%93Whitney_U_test)
+-   [Stochastic ordering](https://en.wikipedia.org/wiki/Stochastic_ordering)
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/max.md b/docs/zh/sql-reference/aggregate-functions/reference/max.md
new file mode 100644
index 00000000000..8372d5c6f85
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/max.md
@@ -0,0 +1,7 @@
+---
+toc_priority: 3
+---
+
+# max {#agg_function-max}
+
+计算最大值。
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/maxmap.md b/docs/zh/sql-reference/aggregate-functions/reference/maxmap.md
new file mode 100644
index 00000000000..4d91d1e75fd
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/maxmap.md
@@ -0,0 +1,33 @@
+---
+toc_priority: 143
+---
+
+# maxMap {#agg_functions-maxmap}
+
+**语法**
+
+```sql
+maxMap(key, value)
+ 或
+maxMap(Tuple(key, value))
+```
+
+
+根据 `key` 数组中指定的键对 `value` 数组计算最大值。
+
+传递 `key` 和 `value` 数组的元组与传递 `key` 和 `value` 的两个数组是同义的。
+要总计的每一行的 `key` 和 `value` (数组)元素的数量必须相同。
+返回两个数组组成的元组: 排好序的`key` 和对应 `key` 的 `value` 计算值(最大值)。
+
+示例:
+
+``` sql
+SELECT maxMap(a, b)
+FROM values('a Array(Int32), b Array(Int64)', ([1, 2], [2, 2]), ([2, 3], [1, 1]))
+```
+
+``` text
+┌─maxMap(a, b)──────┐
+│ ([1,2,3],[2,2,1]) │
+└───────────────────┘
+```
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/median.md b/docs/zh/sql-reference/aggregate-functions/reference/median.md
new file mode 100644
index 00000000000..83879f6cb34
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/median.md
@@ -0,0 +1,41 @@
+# median {#median}
+
+`median*` 函数是 `quantile*` 函数的别名。它们计算数字数据样本的中位数。
+
+函数:
+
+-   `median` — [quantile](#quantile)别名。
+-   `medianDeterministic` — [quantileDeterministic](#quantiledeterministic)别名。
+-   `medianExact` — [quantileExact](#quantileexact)别名。
+-   `medianExactWeighted` — [quantileExactWeighted](#quantileexactweighted)别名。
+-   `medianTiming` — [quantileTiming](#quantiletiming)别名。
+-   `medianTimingWeighted` — [quantileTimingWeighted](#quantiletimingweighted)别名。
+-   `medianTDigest` — [quantileTDigest](#quantiletdigest)别名。
+-   `medianTDigestWeighted` — [quantileTDigestWeighted](#quantiletdigestweighted)别名。
+
+**示例**
+
+输入表:
+
+``` text
+┌─val─┐
+│   1 │
+│   1 │
+│   2 │
+│   3 │
+└─────┘
+```
+
+查询:
+
+``` sql
+SELECT medianDeterministic(val, 1) FROM t
+```
+
+结果:
+
+``` text
+┌─medianDeterministic(val, 1)─┐
+│                         1.5 │
+└─────────────────────────────┘
+```
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/min.md b/docs/zh/sql-reference/aggregate-functions/reference/min.md
new file mode 100644
index 00000000000..95a4099a1b7
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/min.md
@@ -0,0 +1,7 @@
+---
+toc_priority: 2
+---
+
+## min {#agg_function-min}
+
+计算最小值。
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/minmap.md b/docs/zh/sql-reference/aggregate-functions/reference/minmap.md
new file mode 100644
index 00000000000..8e0022ac174
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/minmap.md
@@ -0,0 +1,32 @@
+---
+toc_priority: 142
+---
+
+# minMap {#agg_functions-minmap}
+
+**语法**
+
+```sql
+minMap(key, value)
+或
+minMap(Tuple(key, value))
+```
+
+根据 `key` 数组中指定的键对 `value` 数组计算最小值。
+
+传递 `key` 和 `value` 数组的元组与传递 `key` 和 `value` 的两个数组是同义的。
+要总计的每一行的 `key` 和 `value` (数组)元素的数量必须相同。
+返回两个数组组成的元组: 排好序的 `key`  和对应 `key` 的 `value` 计算值(最小值)。
+
+**示例**
+
+``` sql
+SELECT minMap(a, b)
+FROM values('a Array(Int32), b Array(Int64)', ([1, 2], [2, 2]), ([2, 3], [1, 1]))
+```
+
+``` text
+┌─minMap(a, b)──────┐
+│ ([1,2,3],[2,1,1]) │
+└───────────────────┘
+```
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/quantile.md b/docs/zh/sql-reference/aggregate-functions/reference/quantile.md
new file mode 100644
index 00000000000..4519688dc7e
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/quantile.md
@@ -0,0 +1,65 @@
+---
+toc_priority: 200
+---
+
+# quantile {#quantile}
+
+计算数字序列的近似[分位数](https://en.wikipedia.org/wiki/Quantile)。
+此函数应用[水塘抽样][reservoir sampling] (https://en.wikipedia.org/wiki/Reservoir_sampling)，使用高达8192的水塘大小和随机数发生器采样。
+结果是不确定的。要获得精确的分位数，使用 [quantileExact](../../../sql-reference/aggregate-functions/reference/quantileexact.md#quantileexact) 函数。
+当在一个查询中使用多个不同层次的 `quantile*` 时，内部状态不会被组合（即查询的工作效率低于组合情况）。在这种情况下，使用 [quantiles](../../../sql-reference/aggregate-functions/reference/quantiles.md#quantiles) 函数。
+
+**语法**
+
+``` sql
+quantile(level)(expr)
+```
+
+别名: `median`。
+
+**参数**
+
+-   `level` — 分位数层次。可选参数。从0到1的一个float类型的常量。我们推荐 `level` 值的范围为 `[0.01, 0.99]`。默认值：0.5。当 `level=0.5` 时，该函数计算 [中位数](https://en.wikipedia.org/wiki/Median)。
+-   `expr`  — 求值表达式，类型为数值类型[data types](../../../sql-reference/data-types/index.md#data_types), [Date](../../../sql-reference/data-types/date.md) 或 [DateTime](../../../sql-reference/data-types/datetime.md)。
+
+**返回值**
+
+-   指定层次的分位数。
+
+类型:
+
+-   [Float64](../../../sql-reference/data-types/float.md) 用于数字数据类型输入。
+-   [Date](../../../sql-reference/data-types/date.md) 如果输入值是 `Date` 类型。
+-   [DateTime](../../../sql-reference/data-types/datetime.md) 如果输入值是 `DateTime` 类型。
+
+**示例**
+
+输入表:
+
+``` text
+┌─val─┐
+│   1 │
+│   1 │
+│   2 │
+│   3 │
+└─────┘
+```
+
+查询:
+
+``` sql
+SELECT quantile(val) FROM t
+```
+
+结果:
+
+``` text
+┌─quantile(val)─┐
+│           1.5 │
+└───────────────┘
+```
+
+**参见**
+
+-   [中位数](../../../sql-reference/aggregate-functions/reference/median.md#median)
+-   [分位数](../../../sql-reference/aggregate-functions/reference/quantiles.md#quantiles)
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/quantiledeterministic.md b/docs/zh/sql-reference/aggregate-functions/reference/quantiledeterministic.md
new file mode 100644
index 00000000000..c6c6b0a63de
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/quantiledeterministic.md
@@ -0,0 +1,66 @@
+---
+toc_priority: 206
+---
+
+# quantileDeterministic {#quantiledeterministic}
+
+计算数字序列的近似[分位数](https://en.wikipedia.org/wiki/Quantile)。
+
+此功能适用 [水塘抽样](https://en.wikipedia.org/wiki/Reservoir_sampling)，使用储存器最大到8192和随机数发生器进行采样。 结果是非确定性的。 要获得精确的分位数，请使用 [quantileExact](../../../sql-reference/aggregate-functions/reference/quantileexact.md#quantileexact) 功能。
+
+当在一个查询中使用多个不同层次的 `quantile*` 时，内部状态不会被组合（即查询的工作效率低于组合情况）。在这种情况下，使用[quantiles](../../../sql-reference/aggregate-functions/reference/quantiles.md#quantiles)功能。
+
+**语法**
+
+``` sql
+quantileDeterministic(level)(expr, determinator)
+```
+
+别名: `medianDeterministic`。
+
+**参数**
+
+-   `level` — 分位数层次。可选参数。从0到1的一个float类型的常量。 我们推荐 `level` 值的范围为 `[0.01, 0.99]`。默认值：0.5。 当 `level=0.5`时，该函数计算 [中位数](https://en.wikipedia.org/wiki/Median)。
+-   `expr` — 求值表达式，类型为数值类型[data types](../../../sql-reference/data-types/index.md#data_types), [Date](../../../sql-reference/data-types/date.md) 或 [DateTime](../../../sql-reference/data-types/datetime.md)。
+-   `determinator` — 一个数字，其hash被用来代替在水塘抽样中随机生成的数字，这样可以保证取样的确定性。你可以使用用户ID或者事件ID等任何正数，但是如果相同的 `determinator` 出现多次，那结果很可能不正确。
+**返回值**
+
+-   指定层次的近似分位数。
+
+类型:
+
+-   [Float64](../../../sql-reference/data-types/float.md) 用于数字数据类型输入。
+-   [Date](../../../sql-reference/data-types/date.md) 如果输入值是 `Date` 类型。
+-   [DateTime](../../../sql-reference/data-types/datetime.md) 如果输入值是 `DateTime` 类型。
+
+**示例**
+
+输入表:
+
+``` text
+┌─val─┐
+│   1 │
+│   1 │
+│   2 │
+│   3 │
+└─────┘
+```
+
+查询:
+
+``` sql
+SELECT quantileDeterministic(val, 1) FROM t
+```
+
+结果:
+
+``` text
+┌─quantileDeterministic(val, 1)─┐
+│                           1.5 │
+└───────────────────────────────┘
+```
+
+**参见**
+
+-   [中位数](../../../sql-reference/aggregate-functions/reference/median.md#median)
+-   [分位数](../../../sql-reference/aggregate-functions/reference/quantiles.md#quantiles)
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/quantileexact.md b/docs/zh/sql-reference/aggregate-functions/reference/quantileexact.md
new file mode 100644
index 00000000000..a8d39c35700
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/quantileexact.md
@@ -0,0 +1,170 @@
+---
+toc_priority: 202
+---
+
+# quantileExact {#quantileexact}
+
+
+准确计算数字序列的[分位数](https://en.wikipedia.org/wiki/Quantile)。
+
+为了准确计算，所有输入的数据被合并为一个数组，并且部分的排序。因此该函数需要 `O(n)` 的内存，n为输入数据的个数。但是对于少量数据来说，该函数还是非常有效的。
+
+当在一个查询中使用多个不同层次的 `quantile*` 时，内部状态不会被组合（即查询的工作效率低于组合情况）。在这种情况下，使用 [quantiles](../../../sql-reference/aggregate-functions/reference/quantiles.md#quantiles) 函数。
+
+**语法**
+
+``` sql
+quantileExact(level)(expr)
+```
+
+别名: `medianExact`。
+
+**参数**
+
+-   `level` — 分位数层次。可选参数。从0到1的一个float类型的常量。我们推荐 `level` 值的范围为 `[0.01, 0.99]`。默认值：0.5。当 `level=0.5` 时，该函数计算[中位数](https://en.wikipedia.org/wiki/Median)。
+-   `expr` — 求值表达式，类型为数值类型[data types](../../../sql-reference/data-types/index.md#data_types), [Date](../../../sql-reference/data-types/date.md) 或 [DateTime](../../../sql-reference/data-types/datetime.md)。
+
+**返回值**
+
+-   指定层次的分位数。
+
+
+类型:
+
+-   [Float64](../../../sql-reference/data-types/float.md) 对于数字数据类型输入。
+-   [日期](../../../sql-reference/data-types/date.md) 如果输入值具有 `Date` 类型。
+-   [日期时间](../../../sql-reference/data-types/datetime.md) 如果输入值具有 `DateTime` 类型。
+
+**示例**
+
+查询:
+
+``` sql
+SELECT quantileExact(number) FROM numbers(10)
+```
+
+结果:
+
+``` text
+┌─quantileExact(number)─┐
+│                     5 │
+└───────────────────────┘
+```
+
+# quantileExactLow {#quantileexactlow}
+
+和 `quantileExact` 相似, 准确计算数字序列的[分位数](https://en.wikipedia.org/wiki/Quantile)。
+
+为了准确计算，所有输入的数据被合并为一个数组，并且全排序。这排序[算法](https://en.cppreference.com/w/cpp/algorithm/sort)的复杂度是 `O(N·log(N))`, 其中 `N = std::distance(first, last)` 比较。
+
+返回值取决于分位数级别和所选取的元素数量，即如果级别是 0.5, 函数返回偶数元素的低位中位数，奇数元素的中位数。中位数计算类似于 python 中使用的[median_low](https://docs.python.org/3/library/statistics.html#statistics.median_low)的实现。
+
+对于所有其他级别， 返回 `level * size_of_array` 值所对应的索引的元素值。
+
+例如:
+
+``` sql
+SELECT quantileExactLow(0.1)(number) FROM numbers(10)
+
+┌─quantileExactLow(0.1)(number)─┐
+│                             1 │
+└───────────────────────────────┘
+```
+
+当在一个查询中使用多个不同层次的 `quantile*` 时，内部状态不会被组合（即查询的工作效率低于组合情况）。在这种情况下，使用 [quantiles](../../../sql-reference/aggregate-functions/reference/quantiles.md#quantiles) 函数。
+
+**语法**
+
+``` sql
+quantileExactLow(level)(expr)
+```
+
+别名: `medianExactLow`。
+
+**参数**
+
+-   `level` — 分位数层次。可选参数。从0到1的一个float类型的常量。我们推荐 `level` 值的范围为 `[0.01, 0.99]`。默认值：0.5。当 `level=0.5` 时，该函数计算 [中位数](https://en.wikipedia.org/wiki/Median)。
+-   `expr` — — 求值表达式，类型为数值类型[data types](../../../sql-reference/data-types/index.md#data_types), [Date](../../../sql-reference/data-types/date.md) 或 [DateTime](../../../sql-reference/data-types/datetime.md)。
+
+**返回值**
+
+-   指定层次的分位数。
+
+类型:
+
+-   [Float64](../../../sql-reference/data-types/float.md) 用于数字数据类型输入。
+-   [Date](../../../sql-reference/data-types/date.md) 如果输入值是 `Date` 类型。
+-   [DateTime](../../../sql-reference/data-types/datetime.md) 如果输入值是 `DateTime` 类型。
+
+**示例**
+
+查询:
+
+``` sql
+SELECT quantileExactLow(number) FROM numbers(10)
+```
+
+结果:
+
+``` text
+┌─quantileExactLow(number)─┐
+│                        4 │
+└──────────────────────────┘
+```
+
+# quantileExactHigh {#quantileexacthigh}
+
+和 `quantileExact` 相似, 准确计算数字序列的[分位数](https://en.wikipedia.org/wiki/Quantile)。
+
+为了准确计算，所有输入的数据被合并为一个数组，并且全排序。这排序[算法](https://en.cppreference.com/w/cpp/algorithm/sort)的复杂度是 `O(N·log(N))`, 其中 `N = std::distance(first, last)` 比较。
+
+返回值取决于分位数级别和所选取的元素数量，即如果级别是 0.5, 函数返回偶数元素的低位中位数，奇数元素的中位数。中位数计算类似于 python 中使用的[median_high](https://docs.python.org/3/library/statistics.html#statistics.median_high)的实现。
+
+对于所有其他级别， 返回 `level * size_of_array` 值所对应的索引的元素值。
+
+这个实现与当前的 `quantileExact` 实现完全相似。
+
+当在一个查询中使用多个不同层次的 `quantile*` 时，内部状态不会被组合（即查询的工作效率低于组合情况）。在这种情况下，使用 [quantiles](../../../sql-reference/aggregate-functions/reference/quantiles.md#quantiles) 函数。
+
+**语法**
+
+``` sql
+quantileExactHigh(level)(expr)
+```
+
+别名: `medianExactHigh`。
+
+**参数**
+
+-   `level` — 分位数层次。可选参数。从0到1的一个float类型的常量。我们推荐 `level` 值的范围为 `[0.01, 0.99]`。默认值：0.5。当 `level=0.5` 时，该函数计算 [中位数](https://en.wikipedia.org/wiki/Median)。
+-   `expr` — — 求值表达式，类型为数值类型[data types](../../../sql-reference/data-types/index.md#data_types), [Date](../../../sql-reference/data-types/date.md) 或 [DateTime](../../../sql-reference/data-types/datetime.md)。
+
+**返回值**
+
+-   指定层次的分位数。
+
+类型:
+
+-   [Float64](../../../sql-reference/data-types/float.md) 用于数字数据类型输入。
+-   [Date](../../../sql-reference/data-types/date.md) 如果输入值是 `Date` 类型。
+-   [DateTime](../../../sql-reference/data-types/datetime.md) 如果输入值是 `DateTime` 类型。
+
+**示例**
+
+查询:
+
+``` sql
+SELECT quantileExactHigh(number) FROM numbers(10)
+```
+
+结果:
+
+``` text
+┌─quantileExactHigh(number)─┐
+│                         5 │
+└───────────────────────────┘
+```
+**参见**
+
+-   [中位数](../../../sql-reference/aggregate-functions/reference/median.md#median)
+-   [分位数](../../../sql-reference/aggregate-functions/reference/quantiles.md#quantiles)
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/quantileexactweighted.md b/docs/zh/sql-reference/aggregate-functions/reference/quantileexactweighted.md
new file mode 100644
index 00000000000..5211ca210f2
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/quantileexactweighted.md
@@ -0,0 +1,66 @@
+---
+toc_priority: 203
+---
+
+# quantileExactWeighted {#quantileexactweighted}
+
+考虑到每个元素的权重，然后准确计算数值序列的[分位数](https://en.wikipedia.org/wiki/Quantile)。
+
+为了准确计算，所有输入的数据被合并为一个数组，并且部分的排序。每个输入值需要根据 `weight` 计算求和。该算法使用哈希表。正因为如此，在数据重复较多的时候使用的内存是少于[quantileExact](../../../sql-reference/aggregate-functions/reference/quantileexact.md#quantileexact)的。 您可以使用此函数代替 `quantileExact` 并指定`weight`为 1 。
+
+当在一个查询中使用多个不同层次的 `quantile*` 时，内部状态不会被组合（即查询的工作效率低于组合情况）。在这种情况下，使用 [quantiles](../../../sql-reference/aggregate-functions/reference/quantiles.md#quantiles) 函数。
+
+**语法**
+
+``` sql
+quantileExactWeighted(level)(expr, weight)
+```
+
+别名: `medianExactWeighted`。
+
+**参数**
+-   `level` — 分位数层次。可选参数。从0到1的一个float类型的常量。我们推荐 `level` 值的范围为 `[0.01, 0.99]`. 默认值：0.5。当 `level=0.5` 时，该函数计算 [中位数](https://en.wikipedia.org/wiki/Median)。
+-   `expr`  — 求值表达式，类型为数值类型[data types](../../../sql-reference/data-types/index.md#data_types), [Date](../../../sql-reference/data-types/date.md) 或 [DateTime](../../../sql-reference/data-types/datetime.md)。
+-   `weight` — 权重序列。 权重是一个数据出现的数值。
+
+**返回值**
+
+-   指定层次的分位数。
+
+类型:
+
+-   [Float64](../../../sql-reference/data-types/float.md) 对于数字数据类型输入。
+-   [日期](../../../sql-reference/data-types/date.md) 如果输入值具有 `Date` 类型。
+-   [日期时间](../../../sql-reference/data-types/datetime.md) 如果输入值具有 `DateTime` 类型。
+
+**示例**
+
+输入表:
+
+``` text
+┌─n─┬─val─┐
+│ 0 │   3 │
+│ 1 │   2 │
+│ 2 │   1 │
+│ 5 │   4 │
+└───┴─────┘
+```
+
+查询:
+
+``` sql
+SELECT quantileExactWeighted(n, val) FROM t
+```
+
+结果:
+
+``` text
+┌─quantileExactWeighted(n, val)─┐
+│                             1 │
+└───────────────────────────────┘
+```
+
+**参见**
+
+-   [中位数](../../../sql-reference/aggregate-functions/reference/median.md#median)
+-   [分位数](../../../sql-reference/aggregate-functions/reference/quantiles.md#quantiles)
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/quantiles.md b/docs/zh/sql-reference/aggregate-functions/reference/quantiles.md
new file mode 100644
index 00000000000..044c4d6d24e
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/quantiles.md
@@ -0,0 +1,12 @@
+---
+toc_priority: 201
+---
+
+# quantiles {#quantiles}
+
+**语法**
+``` sql
+quantiles(level1, level2, …)(x)
+```
+
+所有分位数函数(quantile)也有相应的分位数(quantiles)函数: `quantiles`, `quantilesDeterministic`, `quantilesTiming`, `quantilesTimingWeighted`, `quantilesExact`, `quantilesExactWeighted`, `quantilesTDigest`。 这些函数一次计算所列的级别的所有分位数, 并返回结果值的数组。
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/quantiletdigest.md b/docs/zh/sql-reference/aggregate-functions/reference/quantiletdigest.md
new file mode 100644
index 00000000000..fb186da299e
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/quantiletdigest.md
@@ -0,0 +1,57 @@
+---
+toc_priority: 207
+---
+
+# quantileTDigest {#quantiletdigest}
+
+使用[t-digest](https://github.com/tdunning/t-digest/blob/master/docs/t-digest-paper/histo.pdf) 算法计算数字序列近似[分位数](https://en.wikipedia.org/wiki/Quantile)。
+
+最大误差为1%。 内存消耗为 `log(n)`，这里 `n` 是值的个数。 结果取决于运行查询的顺序，并且是不确定的。
+
+该函数的性能低于 [quantile](../../../sql-reference/aggregate-functions/reference/quantile.md#quantile) 或 [quantileTiming](../../../sql-reference/aggregate-functions/reference/quantiletiming.md#quantiletiming) 的性能。 从状态大小和精度的比值来看，这个函数比 `quantile` 更优秀。
+
+当在一个查询中使用多个不同层次的 `quantile*` 时，内部状态不会被组合（即查询的工作效率低于组合情况）。在这种情况下，使用 [quantiles](../../../sql-reference/aggregate-functions/reference/quantiles.md#quantiles) 函数。
+
+**语法**
+
+``` sql
+quantileTDigest(level)(expr)
+```
+
+别名: `medianTDigest`。
+
+**参数**
+
+-   `level` — 分位数层次。可选参数。从0到1的一个float类型的常量。我们推荐 `level` 值的范围为 `[0.01, 0.99]` 。默认值：0.5。当 `level=0.5` 时，该函数计算 [中位数](https://en.wikipedia.org/wiki/Median)。
+-   `expr`  — 求值表达式，类型为数值类型[data types](../../../sql-reference/data-types/index.md#data_types), [Date](../../../sql-reference/data-types/date.md) 或 [DateTime](../../../sql-reference/data-types/datetime.md)。
+
+**返回值**
+
+-   指定层次的分位数。
+
+类型:
+
+-   [Float64](../../../sql-reference/data-types/float.md) 用于数字数据类型输入。
+-   [Date](../../../sql-reference/data-types/date.md) 如果输入值是 `Date` 类型。
+-   [DateTime](../../../sql-reference/data-types/datetime.md) 如果输入值是 `DateTime` 类型。
+
+**示例**
+
+查询:
+
+``` sql
+SELECT quantileTDigest(number) FROM numbers(10)
+```
+
+结果:
+
+``` text
+┌─quantileTDigest(number)─┐
+│                     4.5 │
+└─────────────────────────┘
+```
+
+**参见**
+
+-   [中位数](../../../sql-reference/aggregate-functions/reference/median.md#median)
+-   [分位数](../../../sql-reference/aggregate-functions/reference/quantiles.md#quantiles)
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/quantiletdigestweighted.md b/docs/zh/sql-reference/aggregate-functions/reference/quantiletdigestweighted.md
new file mode 100644
index 00000000000..cf78c4c03bc
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/quantiletdigestweighted.md
@@ -0,0 +1,58 @@
+---
+toc_priority: 208
+---
+
+# quantileTDigestWeighted {#quantiletdigestweighted}
+
+使用[t-digest](https://github.com/tdunning/t-digest/blob/master/docs/t-digest-paper/histo.pdf) 算法计算数字序列近似[分位数](https://en.wikipedia.org/wiki/Quantile)。该函数考虑了每个序列成员的权重。最大误差为1%。 内存消耗为 `log(n)`，这里 `n` 是值的个数。
+
+该函数的性能低于 [quantile](../../../sql-reference/aggregate-functions/reference/quantile.md#quantile) 或 [quantileTiming](../../../sql-reference/aggregate-functions/reference/quantiletiming.md#quantiletiming) 的性能。 从状态大小和精度的比值来看，这个函数比 `quantile` 更优秀。
+
+结果取决于运行查询的顺序，并且是不确定的。
+
+当在一个查询中使用多个不同层次的 `quantile*` 时，内部状态不会被组合（即查询的工作效率低于组合情况）。在这种情况下，使用 [quantiles](../../../sql-reference/aggregate-functions/reference/quantiles.md#quantiles) 函数。
+
+**语法**
+
+``` sql
+quantileTDigestWeighted(level)(expr, weight)
+```
+
+别名: `medianTDigestWeighted`。
+
+**参数**
+
+-   `level` — 分位数层次。可选参数。从0到1的一个float类型的常量。我们推荐 `level` 值的范围为 `[0.01, 0.99]` 。默认值：0.5。 当 `level=0.5` 时，该函数计算 [中位数](https://en.wikipedia.org/wiki/Median)。
+-   `expr`  — 求值表达式，类型为数值类型[data types](../../../sql-reference/data-types/index.md#data_types), [Date](../../../sql-reference/data-types/date.md) 或 [DateTime](../../../sql-reference/data-types/datetime.md)。
+-   `weight` — 权重序列。 权重是一个数据出现的数值。
+
+**返回值**
+
+-   指定层次的分位数。
+
+类型:
+
+-   [Float64](../../../sql-reference/data-types/float.md) 用于数字数据类型输入。
+-   [Date](../../../sql-reference/data-types/date.md) 如果输入值是 `Date` 类型。
+-   [DateTime](../../../sql-reference/data-types/datetime.md) 如果输入值是 `DateTime` 类型。
+
+**示例**
+
+查询:
+
+``` sql
+SELECT quantileTDigestWeighted(number, 1) FROM numbers(10)
+```
+
+结果:
+
+``` text
+┌─quantileTDigestWeighted(number, 1)─┐
+│                                4.5 │
+└────────────────────────────────────┘
+```
+
+**参见**
+
+-   [中位数](../../../sql-reference/aggregate-functions/reference/median.md#median)
+-   [分位数](../../../sql-reference/aggregate-functions/reference/quantiles.md#quantiles)
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/quantiletiming.md b/docs/zh/sql-reference/aggregate-functions/reference/quantiletiming.md
new file mode 100644
index 00000000000..a193b60338a
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/quantiletiming.md
@@ -0,0 +1,86 @@
+---
+toc_priority: 204
+---
+
+# quantileTiming {#quantiletiming}
+
+使用确定的精度计算数字数据序列的[分位数](https://en.wikipedia.org/wiki/Quantile)。
+
+结果是确定性的（它不依赖于查询处理顺序）。该函数针对描述加载网页时间或后端响应时间等分布的序列进行了优化。
+
+当在一个查询中使用多个不同层次的 `quantile*` 时，内部状态不会被组合（即查询的工作效率低于组合情况）。在这种情况下，使用[quantiles](../../../sql-reference/aggregate-functions/reference/quantiles.md#quantiles)函数。
+
+**语法**
+
+``` sql
+quantileTiming(level)(expr)
+```
+
+别名: `medianTiming`。
+
+**参数**
+
+-   `level` — 分位数层次。可选参数。从0到1的一个float类型的常量。我们推荐 `level` 值的范围为 `[0.01, 0.99]` 。默认值：0.5。当 `level=0.5` 时，该函数计算 [中位数](https://en.wikipedia.org/wiki/Median)。
+-   `expr` — 求值[表达式](../../../sql-reference/syntax.md#syntax-expressions) 返回 [Float\*](../../../sql-reference/data-types/float.md) 类型数值。
+
+    - 如果输入负值，那结果是不可预期的。
+    - 如果输入值大于30000（页面加载时间大于30s），那我们假设为30000。
+
+**精度**
+
+计算是准确的，如果:
+
+
+-   值的总数不超过5670。
+-   总数值超过5670，但页面加载时间小于1024ms。
+
+否则，计算结果将四舍五入到16毫秒的最接近倍数。
+
+!!! note "注"
+    对于计算页面加载时间分位数， 此函数比[quantile](../../../sql-reference/aggregate-functions/reference/quantile.md#quantile)更有效和准确。
+
+**返回值**
+
+-   指定层次的分位数。
+
+类型: `Float32`。
+
+!!! note "注"
+如果没有值传递给函数（当使用 `quantileTimingIf`), [NaN](../../../sql-reference/data-types/float.md#data_type-float-nan-inf)被返回。 这样做的目的是将这些案例与导致零的案例区分开来。 参见 [ORDER BY clause](../../../sql-reference/statements/select/order-by.md#select-order-by) 对于 `NaN` 值排序注意事项。
+
+**示例**
+
+输入表:
+
+``` text
+┌─response_time─┐
+│            72 │
+│           112 │
+│           126 │
+│           145 │
+│           104 │
+│           242 │
+│           313 │
+│           168 │
+│           108 │
+└───────────────┘
+```
+
+查询:
+
+``` sql
+SELECT quantileTiming(response_time) FROM t
+```
+
+结果:
+
+``` text
+┌─quantileTiming(response_time)─┐
+│                           126 │
+└───────────────────────────────┘
+```
+
+**参见**
+
+-   [中位数](../../../sql-reference/aggregate-functions/reference/median.md#median)
+-   [分位数](../../../sql-reference/aggregate-functions/reference/quantiles.md#quantiles)
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/quantiletimingweighted.md b/docs/zh/sql-reference/aggregate-functions/reference/quantiletimingweighted.md
new file mode 100644
index 00000000000..7b130dbddbd
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/quantiletimingweighted.md
@@ -0,0 +1,118 @@
+---
+toc_priority: 205
+---
+
+# quantileTimingWeighted {#quantiletimingweighted}
+
+根据每个序列成员的权重，使用确定的精度计算数字序列的[分位数](https://en.wikipedia.org/wiki/Quantile)。
+
+结果是确定性的（它不依赖于查询处理顺序）。该函数针对描述加载网页时间或后端响应时间等分布的序列进行了优化。
+
+当在一个查询中使用多个不同层次的 `quantile*` 时，内部状态不会被组合（即查询的工作效率低于组合情况）。在这种情况下，使用[quantiles](../../../sql-reference/aggregate-functions/reference/quantiles.md#quantiles)功能。
+
+**语法**
+
+``` sql
+quantileTimingWeighted(level)(expr, weight)
+```
+
+别名: `medianTimingWeighted`。
+
+**参数**
+
+-   `level` — 分位数层次。可选参数。从0到1的一个float类型的常量。我们推荐 `level` 值的范围为 `[0.01, 0.99]` 。默认值：0.5。当 `level=0.5` 时，该函数计算 [中位数](https://en.wikipedia.org/wiki/Median)。
+-   `expr` — 求值[表达式](../../../sql-reference/syntax.md#syntax-expressions) 返回 [Float\*](../../../sql-reference/data-types/float.md) 类型数值。
+
+    - 如果输入负值，那结果是不可预期的。
+    - 如果输入值大于30000（页面加载时间大于30s），那我们假设为30000。
+
+-   `weight` — 权重序列。 权重是一个数据出现的数值。
+
+**精度**
+
+计算是准确的，如果:
+
+
+-   值的总数不超过5670。
+-   总数值超过5670，但页面加载时间小于1024ms。
+
+否则，计算结果将四舍五入到16毫秒的最接近倍数。
+
+!!! note "注"
+    对于计算页面加载时间分位数， 此函数比[quantile](../../../sql-reference/aggregate-functions/reference/quantile.md#quantile)更有效和准确。
+
+**返回值**
+
+-   指定层次的分位数。
+
+类型: `Float32`。
+
+!!! note "注"
+如果没有值传递给函数（当使用 `quantileTimingIf`), [NaN](../../../sql-reference/data-types/float.md#data_type-float-nan-inf)被返回。 这样做的目的是将这些案例与导致零的案例区分开来。 参见 [ORDER BY clause](../../../sql-reference/statements/select/order-by.md#select-order-by) 对于 `NaN` 值排序注意事项。
+
+**示例**
+
+输入表:
+
+``` text
+┌─response_time─┬─weight─┐
+│            68 │      1 │
+│           104 │      2 │
+│           112 │      3 │
+│           126 │      2 │
+│           138 │      1 │
+│           162 │      1 │
+└───────────────┴────────┘
+```
+
+查询:
+
+``` sql
+SELECT quantileTimingWeighted(response_time, weight) FROM t
+```
+
+结果:
+
+``` text
+┌─quantileTimingWeighted(response_time, weight)─┐
+│                                           112 │
+└───────────────────────────────────────────────┘
+```
+
+# quantilesTimingWeighted {#quantilestimingweighted}
+
+类似于 `quantileTimingWeighted` , 但接受多个分位数层次参数，并返回一个由这些分位数值组成的数组。
+
+**示例**
+
+输入表:
+
+``` text
+┌─response_time─┬─weight─┐
+│            68 │      1 │
+│           104 │      2 │
+│           112 │      3 │
+│           126 │      2 │
+│           138 │      1 │
+│           162 │      1 │
+└───────────────┴────────┘
+```
+
+查询:
+
+``` sql
+SELECT quantilesTimingWeighted(0,5, 0.99)(response_time, weight) FROM t
+```
+
+结果:
+
+``` text
+┌─quantilesTimingWeighted(0.5, 0.99)(response_time, weight)─┐
+│ [112,162]                                                 │
+└───────────────────────────────────────────────────────────┘
+```
+
+**参见**
+
+-   [中位数](../../../sql-reference/aggregate-functions/reference/median.md#median)
+-   [分位数](../../../sql-reference/aggregate-functions/reference/quantiles.md#quantiles)
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/rankCorr.md b/docs/zh/sql-reference/aggregate-functions/reference/rankCorr.md
new file mode 100644
index 00000000000..c29a43f6ca9
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/rankCorr.md
@@ -0,0 +1,53 @@
+## rankCorr {#agg_function-rankcorr}
+
+计算等级相关系数。
+
+**语法**
+
+``` sql
+rankCorr(x, y)
+```
+
+**参数**
+
+-   `x` — 任意值。[Float32](../../../sql-reference/data-types/float.md#float32-float64) 或 [Float64](../../../sql-reference/data-types/float.md#float32-float64)。
+-   `y` — 任意值。[Float32](../../../sql-reference/data-types/float.md#float32-float64) 或 [Float64](../../../sql-reference/data-types/float.md#float32-float64)。
+
+**返回值**
+
+-   Returns a rank correlation coefficient of the ranks of x and y. The value of the correlation coefficient ranges from -1 to +1. If less than two arguments are passed, the function will return an exception. The value close to +1 denotes a high linear relationship, and with an increase of one random variable, the second random variable also increases. The value close to -1 denotes a high linear relationship, and with an increase of one random variable, the second random variable decreases. The value close or equal to 0 denotes no relationship between the two random variables.
+
+类型: [Float64](../../../sql-reference/data-types/float.md#float32-float64)。  
+
+**示例**
+
+查询:
+
+``` sql
+SELECT rankCorr(number, number) FROM numbers(100);
+```
+
+结果:
+
+``` text
+┌─rankCorr(number, number)─┐
+│                        1 │
+└──────────────────────────┘
+```
+
+查询:
+
+``` sql
+SELECT roundBankers(rankCorr(exp(number), sin(number)), 3) FROM numbers(100);
+```
+
+结果:
+
+``` text
+┌─roundBankers(rankCorr(exp(number), sin(number)), 3)─┐
+│                                              -0.037 │
+└─────────────────────────────────────────────────────┘
+```
+**参见**
+
+-   斯皮尔曼等级相关系数[Spearman's rank correlation coefficient](https://en.wikipedia.org/wiki/Spearman%27s_rank_correlation_coefficient)
\ No newline at end of file
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/simplelinearregression.md b/docs/zh/sql-reference/aggregate-functions/reference/simplelinearregression.md
new file mode 100644
index 00000000000..56cb1539fc9
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/simplelinearregression.md
@@ -0,0 +1,44 @@
+---
+toc_priority: 220
+---
+
+# simpleLinearRegression {#simplelinearregression}
+
+执行简单（一维）线性回归。
+
+**语法**
+
+``` sql
+simpleLinearRegression(x, y)
+```
+
+**参数**
+
+-   `x` — x轴。
+-   `y` — y轴。
+
+**返回值**
+
+符合`y = a*x + b`的常量 `(a, b)` 。
+
+**示例**
+
+``` sql
+SELECT arrayReduce('simpleLinearRegression', [0, 1, 2, 3], [0, 1, 2, 3])
+```
+
+``` text
+┌─arrayReduce('simpleLinearRegression', [0, 1, 2, 3], [0, 1, 2, 3])─┐
+│ (1,0)                                                             │
+└───────────────────────────────────────────────────────────────────┘
+```
+
+``` sql
+SELECT arrayReduce('simpleLinearRegression', [0, 1, 2, 3], [3, 4, 5, 6])
+```
+
+``` text
+┌─arrayReduce('simpleLinearRegression', [0, 1, 2, 3], [3, 4, 5, 6])─┐
+│ (1,3)                                                             │
+└───────────────────────────────────────────────────────────────────┘
+```
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/skewpop.md b/docs/zh/sql-reference/aggregate-functions/reference/skewpop.md
new file mode 100644
index 00000000000..0771c18c2f3
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/skewpop.md
@@ -0,0 +1,27 @@
+---
+toc_priority: 150
+---
+
+# skewPop {#skewpop}
+
+计算给定序列的 [偏度] (https://en.wikipedia.org/wiki/Skewness)。
+
+**语法**
+
+``` sql
+skewPop(expr)
+```
+
+**参数**
+
+`expr` — [表达式](../../../sql-reference/syntax.md#syntax-expressions) 返回一个数字。
+
+**返回值**
+
+给定分布的偏度。类型 — [Float64](../../../sql-reference/data-types/float.md)
+
+**示例**
+
+``` sql
+SELECT skewPop(value) FROM series_with_value_column;
+```
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/skewsamp.md b/docs/zh/sql-reference/aggregate-functions/reference/skewsamp.md
new file mode 100644
index 00000000000..902d06da8e7
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/skewsamp.md
@@ -0,0 +1,29 @@
+---
+toc_priority: 151
+---
+
+# skewSamp {#skewsamp}
+
+计算给定序列的 [样本偏度] (https://en.wikipedia.org/wiki/Skewness)。
+
+如果传递的值形成其样本，它代表了一个随机变量的偏度的无偏估计。
+
+**语法**
+
+``` sql
+skewSamp(expr)
+```
+
+**参数**
+
+`expr` — [表达式](../../../sql-reference/syntax.md#syntax-expressions) 返回一个数字。
+
+**返回值**
+
+给定分布的偏度。 类型 — [Float64](../../../sql-reference/data-types/float.md)。 如果 `n <= 1` (`n` 样本的大小), 函数返回 `nan`。
+
+**示例**
+
+``` sql
+SELECT skewSamp(value) FROM series_with_value_column;
+```
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/stddevpop.md b/docs/zh/sql-reference/aggregate-functions/reference/stddevpop.md
new file mode 100644
index 00000000000..378ef4ae7e4
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/stddevpop.md
@@ -0,0 +1,10 @@
+---
+toc_priority: 30
+---
+
+# stddevPop {#stddevpop}
+
+结果等于 [varPop] (../../../sql-reference/aggregate-functions/reference/varpop.md)的平方根。
+
+!!! note "注"
+该函数使用数值不稳定的算法。 如果你需要 [数值稳定性](https://en.wikipedia.org/wiki/Numerical_stability) 在计算中，使用 `stddevPopStable` 函数。 它的工作速度较慢，但提供较低的计算错误。
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/stddevsamp.md b/docs/zh/sql-reference/aggregate-functions/reference/stddevsamp.md
new file mode 100644
index 00000000000..68a348146a9
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/stddevsamp.md
@@ -0,0 +1,10 @@
+---
+toc_priority: 31
+---
+
+# stddevSamp {#stddevsamp}
+
+结果等于 [varSamp] (../../../sql-reference/aggregate-functions/reference/varsamp.md)的平方根。
+
+!!! note "注"
+该函数使用数值不稳定的算法。 如果你需要 [数值稳定性](https://en.wikipedia.org/wiki/Numerical_stability) 在计算中，使用 `stddevSampStable` 函数。 它的工作速度较慢，但提供较低的计算错误。
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/stochasticlinearregression.md b/docs/zh/sql-reference/aggregate-functions/reference/stochasticlinearregression.md
new file mode 100644
index 00000000000..43ebd6be575
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/stochasticlinearregression.md
@@ -0,0 +1,77 @@
+---
+toc_priority: 221
+---
+
+# stochasticLinearRegression {#agg_functions-stochasticlinearregression}
+
+该函数实现随机线性回归。 它支持自定义参数的学习率、L2正则化系数、微批，并且具有少量更新权重的方法（[Adam](https://en.wikipedia.org/wiki/Stochastic_gradient_descent#Adam) （默认）， [simple SGD](https://en.wikipedia.org/wiki/Stochastic_gradient_descent)， [Momentum](https://en.wikipedia.org/wiki/Stochastic_gradient_descent#Momentum)， [Nesterov](https://mipt.ru/upload/medialibrary/d7e/41-91.pdf)）。
+
+### 参数 {#agg_functions-stochasticlinearregression-parameters}
+
+有4个可自定义的参数。它们按顺序传递给函数，但不需要传递所有四个参数——将使用默认值，然而好的模型需要一些参数调整。
+
+**语法**
+
+``` sql
+stochasticLinearRegression(1.0, 1.0, 10, 'SGD')
+```
+
+1.  `learning rate` 当执行梯度下降步骤时，步长的系数。 过大的学习率可能会导致模型的权重无限大。 默认值为 `0.00001`。
+2.  `l2 regularization coefficient` 这可能有助于防止过度拟合。 默认值为 `0.1`。
+3.  `mini-batch size` 设置元素的数量，这些元素将被计算和求和以执行梯度下降的一个步骤。纯随机下降使用一个元素，但是具有小批量（约10个元素）使梯度步骤更稳定。 默认值为 `15`。
+4.  `method for updating weights` 他们是: `Adam` (默认情况下), `SGD`, `Momentum`, `Nesterov`。`Momentum` 和 `Nesterov` 需要更多的计算和内存，但是它们恰好在收敛速度和随机梯度方法的稳定性方面是有用的。
+
+### 使用 {#agg_functions-stochasticlinearregression-usage}
+
+`stochasticLinearRegression` 用于两个步骤：拟合模型和预测新数据。 为了拟合模型并保存其状态以供以后使用，我们使用 `-State` 组合器，它基本上保存了状态（模型权重等）。
+为了预测我们使用函数 [evalMLMethod](../../../sql-reference/functions/machine-learning-functions.md#machine_learning_methods-evalmlmethod), 这需要一个状态作为参数以及特征来预测。
+
+<a name="stochasticlinearregression-usage-fitting"></a>
+
+**1.** 拟合
+
+可以使用这种查询。
+
+``` sql
+CREATE TABLE IF NOT EXISTS train_data
+(
+    param1 Float64,
+    param2 Float64,
+    target Float64
+) ENGINE = Memory;
+
+CREATE TABLE your_model ENGINE = Memory AS SELECT
+stochasticLinearRegressionState(0.1, 0.0, 5, 'SGD')(target, param1, param2)
+AS state FROM train_data;
+```
+
+在这里，我们还需要将数据插入到 `train_data` 表。参数的数量不是固定的，它只取决于传入 `linearRegressionState` 的参数数量。它们都必须是数值。
+注意，目标值(我们想学习预测的)列作为第一个参数插入。
+
+**2.** 预测
+
+在将状态保存到表中之后，我们可以多次使用它进行预测，甚至与其他状态合并，创建新的更好的模型。
+
+``` sql
+WITH (SELECT state FROM your_model) AS model SELECT
+evalMLMethod(model, param1, param2) FROM test_data
+```
+
+查询将返回一列预测值。注意，`evalMLMethod` 的第一个参数是 `AggregateFunctionState` 对象, 接下来是特征列。
+
+`test_data` 是一个类似 `train_data` 的表 但可能不包含目标值。
+
+### 注 {#agg_functions-stochasticlinearregression-notes}
+
+1.  要合并两个模型，用户可以创建这样的查询:
+    `sql  SELECT state1 + state2 FROM your_models`
+    其中 `your_models` 表包含这两个模型。此查询将返回新的 `AggregateFunctionState` 对象。
+
+2.  如果没有使用 `-State` 组合器，用户可以为自己的目的获取所创建模型的权重，而不保存模型 。
+    `sql  SELECT stochasticLinearRegression(0.01)(target, param1, param2) FROM train_data`
+    这样的查询将拟合模型，并返回其权重——首先是权重，对应模型的参数，最后一个是偏差。 所以在上面的例子中，查询将返回一个具有3个值的列。
+
+**参见**
+
+-   [随机指标逻辑回归](../../../sql-reference/aggregate-functions/reference/stochasticlogisticregression.md#agg_functions-stochasticlogisticregression)
+-   [线性回归和逻辑回归之间的差异](https://stackoverflow.com/questions/12146914/what-is-the-difference-between-linear-regression-and-logistic-regression)
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/stochasticlogisticregression.md b/docs/zh/sql-reference/aggregate-functions/reference/stochasticlogisticregression.md
new file mode 100644
index 00000000000..5ed2fb74b89
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/stochasticlogisticregression.md
@@ -0,0 +1,56 @@
+---
+toc_priority: 222
+---
+
+# stochasticLogisticRegression {#agg_functions-stochasticlogisticregression}
+
+该函数实现随机逻辑回归。 它可以用于二进制分类问题，支持与stochasticLinearRegression相同的自定义参数，并以相同的方式工作。
+
+### 参数 {#agg_functions-stochasticlogisticregression-parameters}
+
+参数与stochasticLinearRegression中的参数完全相同:
+`learning rate`, `l2 regularization coefficient`, `mini-batch size`, `method for updating weights`.
+欲了解更多信息，参见 [参数] (#agg_functions-stochasticlinearregression-parameters).
+
+**语法**
+
+``` sql
+stochasticLogisticRegression(1.0, 1.0, 10, 'SGD')
+```
+
+**1.** 拟合
+
+<!-- -->
+
+    参考[stochasticLinearRegression](#stochasticlinearregression-usage-fitting)  `拟合` 章节文档。
+
+    预测标签的取值范围为\[-1, 1\]
+
+**2.** 预测
+
+<!-- -->
+
+    使用已经保存的state我们可以预测标签为 `1` 的对象的概率。
+    ``` sql
+    WITH (SELECT state FROM your_model) AS model SELECT
+    evalMLMethod(model, param1, param2) FROM test_data
+    ```
+
+    查询结果返回一个列的概率。注意 `evalMLMethod` 的第一个参数是 `AggregateFunctionState` 对象，接下来的参数是列的特性。
+
+    我们也可以设置概率的范围， 这样需要给元素指定不同的标签。
+
+    ``` sql
+    SELECT ans < 1.1 AND ans > 0.5 FROM
+    (WITH (SELECT state FROM your_model) AS model SELECT
+    evalMLMethod(model, param1, param2) AS ans FROM test_data)
+    ```
+
+      结果是标签。
+
+    `test_data` 是一个像 `train_data` 一样的表，但是不包含目标值。
+
+**参见**
+
+-   [随机指标线性回归](../../../sql-reference/aggregate-functions/reference/stochasticlinearregression.md#agg_functions-stochasticlinearregression)
+-   [线性回归和逻辑回归之间的差异](https://stackoverflow.com/questions/12146914/what-is-the-difference-between-linear-regression-and-logistic-regression)
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/studentttest.md b/docs/zh/sql-reference/aggregate-functions/reference/studentttest.md
new file mode 100644
index 00000000000..6d84e728330
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/studentttest.md
@@ -0,0 +1,64 @@
+---
+toc_priority: 300
+toc_title: studentTTest
+---
+
+# studentTTest {#studentttest}
+
+对两个总体的样本应用t检验。
+
+**语法**
+
+``` sql
+studentTTest(sample_data, sample_index)
+```
+
+两个样本的值都在 `sample_data` 列中。如果 `sample_index` 等于 0，则该行的值属于第一个总体的样本。 反之属于第二个总体的样本。
+零假设是总体的均值相等。假设为方差相等的正态分布。
+
+**参数**
+
+-   `sample_data` — 样本数据。[Integer](../../../sql-reference/data-types/int-uint.md), [Float](../../../sql-reference/data-types/float.md) 或 [Decimal](../../../sql-reference/data-types/decimal.md)。
+-   `sample_index` — 样本索引。[Integer](../../../sql-reference/data-types/int-uint.md)。
+
+**返回值**
+
+[元组](../../../sql-reference/data-types/tuple.md)，有两个元素:
+
+-   计算出的t统计量。 [Float64](../../../sql-reference/data-types/float.md)。
+-   计算出的p值。[Float64](../../../sql-reference/data-types/float.md)。
+
+
+**示例**
+
+输入表:
+
+``` text
+┌─sample_data─┬─sample_index─┐
+│        20.3 │            0 │
+│        21.1 │            0 │
+│        21.9 │            1 │
+│        21.7 │            0 │
+│        19.9 │            1 │
+│        21.8 │            1 │
+└─────────────┴──────────────┘
+```
+
+查询:
+
+``` sql
+SELECT studentTTest(sample_data, sample_index) FROM student_ttest;
+```
+
+结果:
+
+``` text
+┌─studentTTest(sample_data, sample_index)───┐
+│ (-0.21739130434783777,0.8385421208415731) │
+└───────────────────────────────────────────┘
+```
+
+**参见**
+
+-   [Student's t-test](https://en.wikipedia.org/wiki/Student%27s_t-test)
+-   [welchTTest function](../../../sql-reference/aggregate-functions/reference/welchttest.md#welchttest)
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/sum.md b/docs/zh/sql-reference/aggregate-functions/reference/sum.md
new file mode 100644
index 00000000000..049c491d2a5
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/sum.md
@@ -0,0 +1,8 @@
+---
+toc_priority: 4
+---
+
+# sum {#agg_function-sum}
+
+计算总和。
+只适用于数字。
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/summap.md b/docs/zh/sql-reference/aggregate-functions/reference/summap.md
new file mode 100644
index 00000000000..4a92a1ea1b0
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/summap.md
@@ -0,0 +1,52 @@
+---
+toc_priority: 141
+---
+
+# sumMap {#agg_functions-summap}
+
+**语法**
+
+``` sql
+sumMap(key, value)
+或
+sumMap(Tuple(key, value))
+```
+
+根据 `key` 数组中指定的键对 `value` 数组进行求和。
+
+传递 `key` 和 `value` 数组的元组与传递 `key` 和 `value` 的两个数组是同义的。
+要总计的每一行的 `key` 和 `value` (数组)元素的数量必须相同。
+返回两个数组组成的一个元组: 排好序的 `key` 和对应 `key` 的 `value` 之和。
+
+示例:
+
+``` sql
+CREATE TABLE sum_map(
+    date Date,
+    timeslot DateTime,
+    statusMap Nested(
+        status UInt16,
+        requests UInt64
+    ),
+    statusMapTuple Tuple(Array(Int32), Array(Int32))
+) ENGINE = Log;
+INSERT INTO sum_map VALUES
+    ('2000-01-01', '2000-01-01 00:00:00', [1, 2, 3], [10, 10, 10], ([1, 2, 3], [10, 10, 10])),
+    ('2000-01-01', '2000-01-01 00:00:00', [3, 4, 5], [10, 10, 10], ([3, 4, 5], [10, 10, 10])),
+    ('2000-01-01', '2000-01-01 00:01:00', [4, 5, 6], [10, 10, 10], ([4, 5, 6], [10, 10, 10])),
+    ('2000-01-01', '2000-01-01 00:01:00', [6, 7, 8], [10, 10, 10], ([6, 7, 8], [10, 10, 10]));
+
+SELECT
+    timeslot,
+    sumMap(statusMap.status, statusMap.requests),
+    sumMap(statusMapTuple)
+FROM sum_map
+GROUP BY timeslot
+```
+
+``` text
+┌────────────timeslot─┬─sumMap(statusMap.status, statusMap.requests)─┬─sumMap(statusMapTuple)─────────┐
+│ 2000-01-01 00:00:00 │ ([1,2,3,4,5],[10,10,20,10,10])               │ ([1,2,3,4,5],[10,10,20,10,10]) │
+│ 2000-01-01 00:01:00 │ ([4,5,6,7,8],[10,10,20,10,10])               │ ([4,5,6,7,8],[10,10,20,10,10]) │
+└─────────────────────┴──────────────────────────────────────────────┴────────────────────────────────┘
+```
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/sumwithoverflow.md b/docs/zh/sql-reference/aggregate-functions/reference/sumwithoverflow.md
new file mode 100644
index 00000000000..0fd5af519da
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/sumwithoverflow.md
@@ -0,0 +1,9 @@
+---
+toc_priority: 140
+---
+
+# sumWithOverflow {#sumwithoverflowx}
+
+使用与输入参数相同的数据类型计算结果的数字总和。如果总和超过此数据类型的最大值，则使用溢出进行计算。
+
+只适用于数字。
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/topk.md b/docs/zh/sql-reference/aggregate-functions/reference/topk.md
new file mode 100644
index 00000000000..69e006d1a6c
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/topk.md
@@ -0,0 +1,43 @@
+---
+toc_priority: 108
+---
+
+# topK {#topk}
+
+返回指定列中近似最常见值的数组。 生成的数组按值的近似频率降序排序（而不是值本身）。
+
+实现了[过滤节省空间](http://www.l2f.inesc-id.pt/~fmmb/wiki/uploads/Work/misnis.ref0a.pdf)算法， 使用基于reduce-and-combine的算法，借鉴[并行节省空间](https://arxiv.org/pdf/1401.0702.pdf)。
+
+**语法**
+
+``` sql
+topK(N)(x)
+```
+此函数不提供保证的结果。 在某些情况下，可能会发生错误，并且可能会返回不是最高频的值。
+
+我们建议使用 `N < 10` 值，`N` 值越大，性能越低。最大值 `N = 65536`。
+
+**参数**
+
+-   `N` — 要返回的元素数。
+
+如果省略该参数，则使用默认值10。
+
+**参数**
+
+-   `x` – (要计算频次的)值。
+
+**示例**
+
+就拿 [OnTime](../../../getting-started/example-datasets/ontime.md) 数据集来说，选择`AirlineID` 列中出现最频繁的三个。
+
+``` sql
+SELECT topK(3)(AirlineID) AS res
+FROM ontime
+```
+
+``` text
+┌─res─────────────────┐
+│ [19393,19790,19805] │
+└─────────────────────┘
+```
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/topkweighted.md b/docs/zh/sql-reference/aggregate-functions/reference/topkweighted.md
new file mode 100644
index 00000000000..66b436f42bb
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/topkweighted.md
@@ -0,0 +1,42 @@
+---
+toc_priority: 109
+---
+
+# topKWeighted {#topkweighted}
+
+类似于 `topK`  但需要一个整数类型的附加参数 - `weight`。 每个输入都被记入 `weight` 次频率计算。
+
+**语法**
+
+``` sql
+topKWeighted(N)(x, weight)
+```
+
+**参数**
+
+-   `N` — 要返回的元素数。
+
+**参数**
+
+-   `x` – (要计算频次的)值。
+-   `weight` — 权重。 [UInt8](../../../sql-reference/data-types/int-uint.md)类型。
+
+**返回值**
+
+返回具有最大近似权重总和的值数组。
+
+**示例**
+
+查询:
+
+``` sql
+SELECT topKWeighted(10)(number, number) FROM numbers(1000)
+```
+
+结果:
+
+``` text
+┌─topKWeighted(10)(number, number)──────────┐
+│ [999,998,997,996,995,994,993,992,991,990] │
+└───────────────────────────────────────────┘
+```
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/uniq.md b/docs/zh/sql-reference/aggregate-functions/reference/uniq.md
new file mode 100644
index 00000000000..2cf020d052b
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/uniq.md
@@ -0,0 +1,42 @@
+---
+toc_priority: 190
+---
+
+# uniq {#agg_function-uniq}
+
+计算参数的不同值的近似数量。
+
+**语法**
+
+``` sql
+uniq(x[, ...])
+```
+
+**参数**
+
+该函数采用可变数量的参数。 参数可以是 `Tuple`, `Array`, `Date`, `DateTime`, `String`, 或数字类型。
+
+**返回值**
+
+-  [UInt64](../../../sql-reference/data-types/int-uint.md) 类型数值。
+
+**实现细节**
+
+功能:
+
+-   计算聚合中所有参数的哈希值，然后在计算中使用它。
+
+-   使用自适应采样算法。 对于计算状态，该函数使用最多65536个元素哈希值的样本。
+
+    这个算法是非常精确的，并且对于CPU来说非常高效。如果查询包含一些这样的函数，那和其他聚合函数相比 `uniq` 将是几乎一样快。
+
+-   确定性地提供结果（它不依赖于查询处理顺序）。
+
+我们建议在几乎所有情况下使用此功能。
+
+**参见**
+
+-   [uniqCombined](../../../sql-reference/aggregate-functions/reference/uniqcombined.md#agg_function-uniqcombined)
+-   [uniqCombined64](../../../sql-reference/aggregate-functions/reference/uniqcombined64.md#agg_function-uniqcombined64)
+-   [uniqHLL12](../../../sql-reference/aggregate-functions/reference/uniqhll12.md#agg_function-uniqhll12)
+-   [uniqExact](../../../sql-reference/aggregate-functions/reference/uniqexact.md#agg_function-uniqexact)
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/uniqcombined.md b/docs/zh/sql-reference/aggregate-functions/reference/uniqcombined.md
new file mode 100644
index 00000000000..26a681ed5af
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/uniqcombined.md
@@ -0,0 +1,52 @@
+---
+toc_priority: 192
+---
+
+# uniqCombined {#agg_function-uniqcombined}
+
+计算不同参数值的近似数量。
+
+**语法**
+``` sql
+uniqCombined(HLL_precision)(x[, ...])
+```
+该 `uniqCombined` 函数是计算不同值数量的不错选择。
+
+**参数**
+
+该函数采用可变数量的参数。 参数可以是 `Tuple`, `Array`, `Date`, `DateTime`, `String`，或数字类型。
+
+`HLL_precision` 是以2为底的单元格数的对数 [HyperLogLog](https://en.wikipedia.org/wiki/HyperLogLog)。可选，您可以将该函数用作 `uniqCombined(x[, ...])`。 `HLL_precision` 的默认值是17，这是有效的96KiB的空间（2^17个单元，每个6比特）。
+
+**返回值**
+
+-   一个[UInt64](../../../sql-reference/data-types/int-uint.md)类型的数字。
+
+**实现细节**
+
+功能:
+
+-   为聚合中的所有参数计算哈希（`String`类型用64位哈希，其他32位），然后在计算中使用它。
+
+-   使用三种算法的组合：数组、哈希表和包含错误修正表的HyperLogLog。
+
+
+    少量的不同的值，使用数组。 值再多一些，使用哈希表。对于大量的数据来说，使用HyperLogLog，HyperLogLog占用一个固定的内存空间。
+
+-   确定性地提供结果（它不依赖于查询处理顺序）。
+
+!!! note "注"
+    由于它对非 `String` 类型使用32位哈希，对于基数显著大于`UINT_MAX` ，结果将有非常高的误差(误差将在几百亿不同值之后迅速提高), 因此这种情况，你应该使用 [uniqCombined64](../../../sql-reference/aggregate-functions/reference/uniqcombined64.md#agg_function-uniqcombined64)
+
+相比于 [uniq](../../../sql-reference/aggregate-functions/reference/uniq.md#agg_function-uniq) 函数, 该 `uniqCombined`:
+
+-   消耗内存要少几倍。
+-   计算精度高出几倍。
+-   通常具有略低的性能。 在某些情况下, `uniqCombined` 可以表现得比 `uniq` 好，例如，使用通过网络传输大量聚合状态的分布式查询。
+
+**参见**
+
+-   [uniq](../../../sql-reference/aggregate-functions/reference/uniq.md#agg_function-uniq)
+-   [uniqCombined64](../../../sql-reference/aggregate-functions/reference/uniqcombined64.md#agg_function-uniqcombined64)
+-   [uniqHLL12](../../../sql-reference/aggregate-functions/reference/uniqhll12.md#agg_function-uniqhll12)
+-   [uniqExact](../../../sql-reference/aggregate-functions/reference/uniqexact.md#agg_function-uniqexact)
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/uniqcombined64.md b/docs/zh/sql-reference/aggregate-functions/reference/uniqcombined64.md
new file mode 100644
index 00000000000..3c07791450d
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/uniqcombined64.md
@@ -0,0 +1,7 @@
+---
+toc_priority: 193
+---
+
+# uniqCombined64 {#agg_function-uniqcombined64}
+
+和 [uniqCombined](../../../sql-reference/aggregate-functions/reference/uniqcombined.md#agg_function-uniqcombined)一样, 但对于所有数据类型使用64位哈希。
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/uniqexact.md b/docs/zh/sql-reference/aggregate-functions/reference/uniqexact.md
new file mode 100644
index 00000000000..bdd60ca1d30
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/uniqexact.md
@@ -0,0 +1,26 @@
+---
+toc_priority: 191
+---
+
+# uniqExact {#agg_function-uniqexact}
+
+计算不同参数值的准确数目。
+
+**语法**
+
+``` sql
+uniqExact(x[, ...])
+```
+如果你绝对需要一个确切的结果，使用 `uniqExact` 函数。 否则使用 [uniq](../../../sql-reference/aggregate-functions/reference/uniq.md#agg_function-uniq) 函数。
+
+`uniqExact` 函数比 `uniq` 使用更多的内存，因为状态的大小随着不同值的数量的增加而无界增长。
+
+**参数**
+
+该函数采用可变数量的参数。 参数可以是 `Tuple`, `Array`, `Date`, `DateTime`, `String`，或数字类型。
+
+**参见**
+
+-   [uniq](../../../sql-reference/aggregate-functions/reference/uniq.md#agg_function-uniq)
+-   [uniqCombined](../../../sql-reference/aggregate-functions/reference/uniq.md#agg_function-uniqcombined)
+-   [uniqHLL12](../../../sql-reference/aggregate-functions/reference/uniq.md#agg_function-uniqhll12)
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/uniqhll12.md b/docs/zh/sql-reference/aggregate-functions/reference/uniqhll12.md
new file mode 100644
index 00000000000..7521065b954
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/uniqhll12.md
@@ -0,0 +1,43 @@
+---
+toc_priority: 194
+---
+
+# uniqHLL12 {#agg_function-uniqhll12}
+
+计算不同参数值的近似数量，使用 [HyperLogLog](https://en.wikipedia.org/wiki/HyperLogLog) 算法。
+
+**语法**
+
+``` sql
+uniqHLL12(x[, ...])
+```
+
+**参数**
+
+该函数采用可变数量的参数。 参数可以是 `Tuple`, `Array`, `Date`, `DateTime`, `String`，或数字类型。
+
+**返回值**
+
+**返回值**
+
+-   一个[UInt64](../../../sql-reference/data-types/int-uint.md)类型的数字。
+
+**实现细节**
+
+功能:
+
+-   计算聚合中所有参数的哈希值，然后在计算中使用它。
+
+-   使用 HyperLogLog 算法来近似不同参数值的数量。
+
+        使用2^12个5比特单元。 状态的大小略大于2.5KB。 对于小数据集（<10K元素），结果不是很准确（误差高达10%）。 但是, 对于高基数数据集（10K-100M），结果相当准确，最大误差约为1.6%。Starting from 100M, the estimation error increases, and the function will return very inaccurate results for data sets with extremely high cardinality (1B+ elements).
+
+-   提供确定结果（它不依赖于查询处理顺序）。
+
+我们不建议使用此函数。 在大多数情况下, 使用 [uniq](../../../sql-reference/aggregate-functions/reference/uniq.md#agg_function-uniq) 或 [uniqCombined](../../../sql-reference/aggregate-functions/reference/uniqcombined.md#agg_function-uniqcombined) 函数。
+
+**参见**
+
+-   [uniq](../../../sql-reference/aggregate-functions/reference/uniq.md#agg_function-uniq)
+-   [uniqCombined](../../../sql-reference/aggregate-functions/reference/uniqcombined.md#agg_function-uniqcombined)
+-   [uniqExact](../../../sql-reference/aggregate-functions/reference/uniqexact.md#agg_function-uniqexact)
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/varpop.md b/docs/zh/sql-reference/aggregate-functions/reference/varpop.md
new file mode 100644
index 00000000000..4dca8efde38
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/varpop.md
@@ -0,0 +1,12 @@
+---
+toc_priority: 32
+---
+
+# varPop(x) {#varpopx}
+
+计算 `Σ((x - x̅)^2) / n`，这里 `n` 是样本大小， `x̅` 是 `x` 的平均值。
+
+换句话说，计算一组数据的离差。 返回 `Float64`。
+
+!!! note "注"
+该函数使用数值不稳定的算法。 如果你需要 [数值稳定性](https://en.wikipedia.org/wiki/Numerical_stability) 在计算中，使用 `varPopStable` 函数。 它的工作速度较慢，但提供较低的计算错误。
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/varsamp.md b/docs/zh/sql-reference/aggregate-functions/reference/varsamp.md
new file mode 100644
index 00000000000..c83ee7e24d2
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/varsamp.md
@@ -0,0 +1,15 @@
+---
+toc_priority: 33
+---
+
+# varSamp {#varsamp}
+
+计算 `Σ((x - x̅)^2) / (n - 1)`，这里 `n` 是样本大小， `x̅`是`x`的平均值。
+
+它表示随机变量的方差的无偏估计，如果传递的值形成其样本。
+
+返回 `Float64`。 当 `n <= 1`，返回 `+∞`。
+
+!!! note "注"
+该函数使用数值不稳定的算法。 如果你需要 [数值稳定性](https://en.wikipedia.org/wiki/Numerical_stability) 在计算中，使用 `varSampStable` 函数。 它的工作速度较慢，但提供较低的计算错误。
+
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/welchttest.md b/docs/zh/sql-reference/aggregate-functions/reference/welchttest.md
new file mode 100644
index 00000000000..44b8e81d4d9
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/welchttest.md
@@ -0,0 +1,62 @@
+---
+toc_priority: 301
+toc_title: welchTTest
+---
+
+# welchTTest {#welchttest}
+
+对两个总体的样本应用 Welch t检验。
+
+**语法**
+
+``` sql
+welchTTest(sample_data, sample_index)
+```
+两个样本的值都在 `sample_data` 列中。如果 `sample_index` 等于 0，则该行的值属于第一个总体的样本。 反之属于第二个总体的样本。
+零假设是群体的均值相等。假设为正态分布。总体可能具有不相等的方差。
+
+**参数**
+
+-   `sample_data` — 样本数据。[Integer](../../../sql-reference/data-types/int-uint.md), [Float](../../../sql-reference/data-types/float.md) 或 [Decimal](../../../sql-reference/data-types/decimal.md).
+-   `sample_index` — 样本索引。[Integer](../../../sql-reference/data-types/int-uint.md).
+
+**返回值**
+
+[元组](../../../sql-reference/data-types/tuple.md)，有两个元素:
+
+-   计算出的t统计量。 [Float64](../../../sql-reference/data-types/float.md)。
+-   计算出的p值。[Float64](../../../sql-reference/data-types/float.md)。
+
+**示例**
+
+输入表:
+
+``` text
+┌─sample_data─┬─sample_index─┐
+│        20.3 │            0 │
+│        22.1 │            0 │
+│        21.9 │            0 │
+│        18.9 │            1 │
+│        20.3 │            1 │
+│          19 │            1 │
+└─────────────┴──────────────┘
+```
+
+查询:
+
+``` sql
+SELECT welchTTest(sample_data, sample_index) FROM welch_ttest;
+```
+
+结果:
+
+``` text
+┌─welchTTest(sample_data, sample_index)─────┐
+│ (2.7988719532211235,0.051807360348581945) │
+└───────────────────────────────────────────┘
+```
+
+**参见**
+
+-   [Welch's t-test](https://en.wikipedia.org/wiki/Welch%27s_t-test)
+-   [studentTTest function](../../../sql-reference/aggregate-functions/reference/studentttest.md#studentttest)
diff --git a/docs/zh/sql-reference/data-types/index.md b/docs/zh/sql-reference/data-types/index.md
index 70aa976cb11..c7f5c63e357 100644
--- a/docs/zh/sql-reference/data-types/index.md
+++ b/docs/zh/sql-reference/data-types/index.md
@@ -1,5 +1,12 @@
+---
+toc_folder_title: 数据类型
+toc_priority: 37
+toc_title: 简介
+---
+
 # 数据类型 {#data_types}
 
 ClickHouse 可以在数据表中存储多种数据类型。
 
 本节描述 ClickHouse 支持的数据类型，以及使用或者实现它们时（如果有的话）的注意事项。
+你可以在系统表 [system.data_type_families](../../operations/system-tables/data_type_families.md#system_tables-data_type_families) 中检查数据类型名称是否区分大小写。
diff --git a/docs/zh/sql-reference/data-types/simpleaggregatefunction.md b/docs/zh/sql-reference/data-types/simpleaggregatefunction.md
index e827adb817e..38d7699c176 100644
--- a/docs/zh/sql-reference/data-types/simpleaggregatefunction.md
+++ b/docs/zh/sql-reference/data-types/simpleaggregatefunction.md
@@ -1,26 +1,31 @@
----
-machine_translated: true
-machine_translated_rev: 71d72c1f237f4a553fe91ba6c6c633e81a49e35b
----
-
 # SimpleAggregateFunction {#data-type-simpleaggregatefunction}
 
-`SimpleAggregateFunction(name, types_of_arguments…)` 数据类型存储聚合函数的当前值，而不将其完整状态存储为 [`AggregateFunction`](../../sql-reference/data-types/aggregatefunction.md) 有 此优化可应用于具有以下属性的函数：应用函数的结果 `f` 到行集 `S1 UNION ALL S2` 可以通过应用来获得 `f` 行的部分单独设置，然后再次应用 `f` 到结果: `f(S1 UNION ALL S2) = f(f(S1) UNION ALL f(S2))`. 此属性保证部分聚合结果足以计算组合结果，因此我们不必存储和处理任何额外的数据。
+`SimpleAggregateFunction(name, types_of_arguments…)` 数据类型存储聚合函数的当前值, 并不像 [`AggregateFunction`](../../sql-reference/data-types/aggregatefunction.md) 那样存储其全部状态。这种优化可以应用于具有以下属性函数: 将函数 `f` 应用于行集合 `S1 UNION ALL S2` 的结果，可以通过将 `f` 分别应用于行集合的部分, 然后再将 `f` 应用于结果来获得: `f(S1 UNION ALL S2) = f(f(S1) UNION ALL f(S2))`。 这个属性保证了部分聚合结果足以计算出合并的结果，所以我们不必存储和处理任何额外的数据。
 
 支持以下聚合函数:
 
--   [`any`](../../sql-reference/aggregate-functions/reference.md#agg_function-any)
--   [`anyLast`](../../sql-reference/aggregate-functions/reference.md#anylastx)
--   [`min`](../../sql-reference/aggregate-functions/reference.md#agg_function-min)
--   [`max`](../../sql-reference/aggregate-functions/reference.md#agg_function-max)
--   [`sum`](../../sql-reference/aggregate-functions/reference.md#agg_function-sum)
--   [`groupBitAnd`](../../sql-reference/aggregate-functions/reference.md#groupbitand)
--   [`groupBitOr`](../../sql-reference/aggregate-functions/reference.md#groupbitor)
--   [`groupBitXor`](../../sql-reference/aggregate-functions/reference.md#groupbitxor)
--   [`groupArrayArray`](../../sql-reference/aggregate-functions/reference.md#agg_function-grouparray)
--   [`groupUniqArrayArray`](../../sql-reference/aggregate-functions/reference.md#groupuniqarrayx-groupuniqarraymax-sizex)
+-   [`any`](../../sql-reference/aggregate-functions/reference/any.md#agg_function-any)
+-   [`anyLast`](../../sql-reference/aggregate-functions/reference/anylast.md#anylastx)
+-   [`min`](../../sql-reference/aggregate-functions/reference/min.md#agg_function-min)
+-   [`max`](../../sql-reference/aggregate-functions/reference/max.md#agg_function-max)
+-   [`sum`](../../sql-reference/aggregate-functions/reference/sum.md#agg_function-sum)
+-   [`sumWithOverflow`](../../sql-reference/aggregate-functions/reference/sumwithoverflow.md#sumwithoverflowx)
+-   [`groupBitAnd`](../../sql-reference/aggregate-functions/reference/groupbitand.md#groupbitand)
+-   [`groupBitOr`](../../sql-reference/aggregate-functions/reference/groupbitor.md#groupbitor)
+-   [`groupBitXor`](../../sql-reference/aggregate-functions/reference/groupbitxor.md#groupbitxor)
+-   [`groupArrayArray`](../../sql-reference/aggregate-functions/reference/grouparray.md#agg_function-grouparray)
+-   [`groupUniqArrayArray`](../../sql-reference/aggregate-functions/reference/groupuniqarray.md)
+-   [`sumMap`](../../sql-reference/aggregate-functions/reference/summap.md#agg_functions-summap)
+-   [`minMap`](../../sql-reference/aggregate-functions/reference/minmap.md#agg_functions-minmap)
+-   [`maxMap`](../../sql-reference/aggregate-functions/reference/maxmap.md#agg_functions-maxmap)
+-   [`argMin`](../../sql-reference/aggregate-functions/reference/argmin.md)
+-   [`argMax`](../../sql-reference/aggregate-functions/reference/argmax.md)
 
-的值 `SimpleAggregateFunction(func, Type)` 看起来和存储方式相同 `Type`，所以你不需要应用函数 `-Merge`/`-State` 后缀。 `SimpleAggregateFunction` 具有比更好的性能 `AggregateFunction` 具有相同的聚合功能。
+
+!!! note "注"
+    `SimpleAggregateFunction(func, Type)` 的值外观和存储方式于 `Type` 相同, 所以你不需要应用带有 `-Merge`/`-State` 后缀的函数。
+
+    `SimpleAggregateFunction` 的性能优于具有相同聚合函数的 `AggregateFunction` 。
 
 **参数**
 
@@ -30,11 +35,7 @@ machine_translated_rev: 71d72c1f237f4a553fe91ba6c6c633e81a49e35b
 **示例**
 
 ``` sql
-CREATE TABLE t
-(
-    column1 SimpleAggregateFunction(sum, UInt64),
-    column2 SimpleAggregateFunction(any, String)
-) ENGINE = ...
+CREATE TABLE simple (id UInt64, val SimpleAggregateFunction(sum, Double)) ENGINE=AggregatingMergeTree ORDER BY id;
 ```
 
 [原始文章](https://clickhouse.tech/docs/en/data_types/simpleaggregatefunction/) <!--hide-->
diff --git a/docs/zh/sql-reference/data-types/uuid.md b/docs/zh/sql-reference/data-types/uuid.md
index 2ff1e391e81..b454484003c 100644
--- a/docs/zh/sql-reference/data-types/uuid.md
+++ b/docs/zh/sql-reference/data-types/uuid.md
@@ -1,21 +1,19 @@
 ---
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
 toc_priority: 46
 toc_title: UUID
 ---
 
 # UUID {#uuid-data-type}
 
-通用唯一标识符(UUID)是用于标识记录的16字节数。 有关UUID的详细信息，请参阅 [维基百科](https://en.wikipedia.org/wiki/Universally_unique_identifier).
+通用唯一标识符(UUID)是一个16字节的数字，用于标识记录。有关UUID的详细信息, 参见[维基百科](https://en.wikipedia.org/wiki/Universally_unique_identifier)。
 
-UUID类型值的示例如下所示:
+UUID类型值的示例如下:
 
 ``` text
 61f0c404-5cb3-11e7-907b-a6006ad3dba0
 ```
 
-如果在插入新记录时未指定UUID列值，则UUID值将用零填充:
+如果在插入新记录时未指定UUID列的值，则UUID值将用零填充:
 
 ``` text
 00000000-0000-0000-0000-000000000000
@@ -23,13 +21,13 @@ UUID类型值的示例如下所示:
 
 ## 如何生成 {#how-to-generate}
 
-要生成UUID值，ClickHouse提供了 [generateuidv4](../../sql-reference/functions/uuid-functions.md) 功能。
+要生成UUID值，ClickHouse提供了 [generateuidv4](../../sql-reference/functions/uuid-functions.md) 函数。
 
 ## 用法示例 {#usage-example}
 
 **示例1**
 
-此示例演示如何创建具有UUID类型列的表并将值插入到表中。
+这个例子演示了创建一个具有UUID类型列的表，并在表中插入一个值。
 
 ``` sql
 CREATE TABLE t_uuid (x UUID, y String) ENGINE=TinyLog
@@ -51,7 +49,7 @@ SELECT * FROM t_uuid
 
 **示例2**
 
-在此示例中，插入新记录时未指定UUID列值。
+在这个示例中，插入新记录时未指定UUID列的值。
 
 ``` sql
 INSERT INTO t_uuid (y) VALUES ('Example 2')
@@ -70,8 +68,7 @@ SELECT * FROM t_uuid
 
 ## 限制 {#restrictions}
 
-UUID数据类型仅支持以下功能 [字符串](string.md) 数据类型也支持（例如, [min](../../sql-reference/aggregate-functions/reference.md#agg_function-min), [max](../../sql-reference/aggregate-functions/reference.md#agg_function-max)，和 [计数](../../sql-reference/aggregate-functions/reference.md#agg_function-count)).
+UUID数据类型只支持 [字符串](../../sql-reference/data-types/string.md) 数据类型也支持的函数(比如, [min](../../sql-reference/aggregate-functions/reference/min.md#agg_function-min), [max](../../sql-reference/aggregate-functions/reference/max.md#agg_function-max), 和 [count](../../sql-reference/aggregate-functions/reference/count.md#agg_function-count))。
 
-算术运算不支持UUID数据类型（例如, [abs](../../sql-reference/functions/arithmetic-functions.md#arithm_func-abs)）或聚合函数，例如 [sum](../../sql-reference/aggregate-functions/reference.md#agg_function-sum) 和 [avg](../../sql-reference/aggregate-functions/reference.md#agg_function-avg).
+算术运算不支持UUID数据类型（例如, [abs](../../sql-reference/functions/arithmetic-functions.md#arithm_func-abs)）或聚合函数，例如 [sum](../../sql-reference/aggregate-functions/reference/sum.md#agg_function-sum) 和 [avg](../../sql-reference/aggregate-functions/reference/avg.md#agg_function-avg).
 
-[原始文章](https://clickhouse.tech/docs/en/data_types/uuid/) <!--hide-->
diff --git a/docs/zh/sql-reference/functions/other-functions.md b/docs/zh/sql-reference/functions/other-functions.md
index b17a5e89332..c58c4bd1510 100644
--- a/docs/zh/sql-reference/functions/other-functions.md
+++ b/docs/zh/sql-reference/functions/other-functions.md
@@ -477,6 +477,103 @@ FROM
 
     1 rows in set. Elapsed: 0.002 sec.
 
+
+## indexHint  {#indexhint}
+输出符合索引选择范围内的所有数据，同时不实用参数中的表达式进行过滤。
+
+传递给函数的表达式参数将不会被计算，但ClickHouse使用参数中的表达式进行索引过滤。
+
+**返回值**
+
+- 1。
+
+**示例**
+
+这是一个包含[ontime](../../getting-started/example-datasets/ontime.md)测试数据集的测试表。
+
+```
+SELECT count() FROM ontime
+
+┌─count()─┐
+│ 4276457 │
+└─────────┘
+```
+
+该表使用`(FlightDate, (Year, FlightDate))`作为索引。
+
+对该表进行如下的查询：
+
+```
+:) SELECT FlightDate AS k, count() FROM ontime GROUP BY k ORDER BY k
+
+SELECT
+    FlightDate AS k,
+    count()
+FROM ontime
+GROUP BY k
+ORDER BY k ASC
+
+┌──────────k─┬─count()─┐
+│ 2017-01-01 │   13970 │
+│ 2017-01-02 │   15882 │
+........................
+│ 2017-09-28 │   16411 │
+│ 2017-09-29 │   16384 │
+│ 2017-09-30 │   12520 │
+└────────────┴─────────┘
+
+273 rows in set. Elapsed: 0.072 sec. Processed 4.28 million rows, 8.55 MB (59.00 million rows/s., 118.01 MB/s.)
+```
+
+在这个查询中，由于没有使用索引，所以ClickHouse将处理整个表的所有数据(`Processed 4.28 million rows`)。使用下面的查询尝试使用索引进行查询：
+
+```
+:) SELECT FlightDate AS k, count() FROM ontime WHERE k = '2017-09-15' GROUP BY k ORDER BY k
+
+SELECT
+    FlightDate AS k,
+    count()
+FROM ontime
+WHERE k = '2017-09-15'
+GROUP BY k
+ORDER BY k ASC
+
+┌──────────k─┬─count()─┐
+│ 2017-09-15 │   16428 │
+└────────────┴─────────┘
+
+1 rows in set. Elapsed: 0.014 sec. Processed 32.74 thousand rows, 65.49 KB (2.31 million rows/s., 4.63 MB/s.)
+```
+
+在最后一行的显示中，通过索引ClickHouse处理的行数明显减少（`Processed 32.74 thousand rows`）。
+
+现在将表达式`k = '2017-09-15'`传递给`indexHint`函数：
+
+```
+:) SELECT FlightDate AS k, count() FROM ontime WHERE indexHint(k = '2017-09-15') GROUP BY k ORDER BY k
+
+SELECT
+    FlightDate AS k,
+    count()
+FROM ontime
+WHERE indexHint(k = '2017-09-15')
+GROUP BY k
+ORDER BY k ASC
+
+┌──────────k─┬─count()─┐
+│ 2017-09-14 │    7071 │
+│ 2017-09-15 │   16428 │
+│ 2017-09-16 │    1077 │
+│ 2017-09-30 │    8167 │
+└────────────┴─────────┘
+
+4 rows in set. Elapsed: 0.004 sec. Processed 32.74 thousand rows, 65.49 KB (8.97 million rows/s., 17.94 MB/s.)
+```
+
+对于这个请求，根据ClickHouse显示ClickHouse与上一次相同的方式应用了索引（`Processed 32.74 thousand rows`）。但是，最终返回的结果集中并没有根据`k = '2017-09-15'`表达式进行过滤结果。
+
+由于ClickHouse中使用稀疏索引，因此在读取范围时（本示例中为相邻日期），"额外"的数据将包含在索引结果中。使用`indexHint`函数可以查看到它们。
+
 ## 复制 {#replicate}
 
 使用单个值填充一个数组。
diff --git a/docs/zh/sql-reference/operators/in.md b/docs/zh/sql-reference/operators/in.md
index a16b75fe555..f39bd02c309 100644
--- a/docs/zh/sql-reference/operators/in.md
+++ b/docs/zh/sql-reference/operators/in.md
@@ -18,7 +18,7 @@ SELECT (CounterID, UserID) IN ((34, 123), (101500, 456)) FROM ...
 
 如果左侧是索引中的单列，而右侧是一组常量，则系统将使用索引处理查询。
 
-Don't list too many values explicitly (i.e. millions). If a data set is large, put it in a temporary table (for example, see the section “External data for query processing”），然后使用子查询。
+请不要列举太多具体的常量 (比方说 几百万条)。如果数据集非常大，请把它放在一张临时表里（例如，参考章节[用于查询处理的外部数据](../../engines/table-engines/special/external-data.md)），然后使用子查询。
 
 运算符的右侧可以是一组常量表达式、一组带有常量表达式的元组（如上面的示例所示），或括号中的数据库表或SELECT子查询的名称。
 
diff --git a/docs/zh/sql-reference/statements/index.md b/docs/zh/sql-reference/statements/index.md
index 1c5f4e9a7ef..ab080584c66 100644
--- a/docs/zh/sql-reference/statements/index.md
+++ b/docs/zh/sql-reference/statements/index.md
@@ -1,7 +1,7 @@
 ---
 machine_translated: true
 machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: "\u53D1\u8A00"
+toc_folder_title: "\u8BED\u53E5"
 toc_priority: 31
 ---
 
diff --git a/docs/zh/sql-reference/table-functions/file.md b/docs/zh/sql-reference/table-functions/file.md
index 4d694cb6729..84fddada867 100644
--- a/docs/zh/sql-reference/table-functions/file.md
+++ b/docs/zh/sql-reference/table-functions/file.md
@@ -1,23 +1,25 @@
 ---
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
 toc_priority: 37
-toc_title: "\u6587\u4EF6"
+toc_title: file
 ---
 
-# 文件 {#file}
+# file {#file}
 
-从文件创建表。 此表函数类似于 [url](url.md) 和 [hdfs](hdfs.md) 一些的。
+从文件创建表。 此表函数类似于 [url](../../sql-reference/table-functions/url.md) 和 [hdfs](../../sql-reference/table-functions/hdfs.md)。
+
+`file` 函数可用于对[File](../../engines/table-engines/special/file.md) 表中的数据进行 `SELECT` 和 `INSERT` 查询。
+
+**语法**
 
 ``` sql
 file(path, format, structure)
 ```
 
-**输入参数**
+**参数**
 
--   `path` — The relative path to the file from [user_files_path](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-user_files_path). 只读模式下的globs后的文件支持路径: `*`, `?`, `{abc,def}` 和 `{N..M}` 哪里 `N`, `M` — numbers, \``'abc', 'def'` — strings.
--   `format` — The [格式](../../interfaces/formats.md#formats) 的文件。
--   `structure` — Structure of the table. Format `'column1_name column1_type, column2_name column2_type, ...'`.
+-   `path` — [user_files_path](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-user_files_path)中文件的相对路径。在只读模式下，文件路径支持以下通配符: `*`, `?`, `{abc,def}` 和 `{N..M}`，其中 `N`, `M` 是数字, \``'abc', 'def'` 是字符串。
+-   `format` —文件的[格式](../../interfaces/formats.md#formats)。
+-   `structure` — 表的结构。格式 `'column1_name column1_type, column2_name column2_type, ...'`。
 
 **返回值**
 
@@ -25,7 +27,7 @@ file(path, format, structure)
 
 **示例**
 
-设置 `user_files_path` 和文件的内容 `test.csv`:
+设置 `user_files_path` 和文件 `test.csv` 的内容:
 
 ``` bash
 $ grep user_files_path /etc/clickhouse-server/config.xml
@@ -37,12 +39,10 @@ $ cat /var/lib/clickhouse/user_files/test.csv
     78,43,45
 ```
 
-表从`test.csv` 并从中选择前两行:
+从 `test.csv` 中的表中获取数据，并从表中选择前两行:
 
 ``` sql
-SELECT *
-FROM file('test.csv', 'CSV', 'column1 UInt32, column2 UInt32, column3 UInt32')
-LIMIT 2
+SELECT * FROM file('test.csv', 'CSV', 'column1 UInt32, column2 UInt32, column3 UInt32') LIMIT 2;
 ```
 
 ``` text
@@ -52,25 +52,40 @@ LIMIT 2
 └─────────┴─────────┴─────────┘
 ```
 
+从CSV文件获取包含3列 [UInt32](../../sql-reference/data-types/int-uint.md) 类型的表的前10行:
+
 ``` sql
--- getting the first 10 lines of a table that contains 3 columns of UInt32 type from a CSV file
-SELECT * FROM file('test.csv', 'CSV', 'column1 UInt32, column2 UInt32, column3 UInt32') LIMIT 10
+SELECT * FROM file('test.csv', 'CSV', 'column1 UInt32, column2 UInt32, column3 UInt32') LIMIT 10;
 ```
 
-**路径中的水珠**
+将文件中的数据插入表中:
 
-多个路径组件可以具有globs。 对于正在处理的文件应该存在并匹配到整个路径模式（不仅后缀或前缀）。
+``` sql
+INSERT INTO FUNCTION file('test.csv', 'CSV', 'column1 UInt32, column2 UInt32, column3 UInt32') VALUES (1, 2, 3), (3, 2, 1);
+SELECT * FROM file('test.csv', 'CSV', 'column1 UInt32, column2 UInt32, column3 UInt32');
+```
 
--   `*` — Substitutes any number of any characters except `/` 包括空字符串。
--   `?` — Substitutes any single character.
--   `{some_string,another_string,yet_another_one}` — Substitutes any of strings `'some_string', 'another_string', 'yet_another_one'`.
--   `{N..M}` — Substitutes any number in range from N to M including both borders.
+``` text
+┌─column1─┬─column2─┬─column3─┐
+│       1 │       2 │       3 │
+│       3 │       2 │       1 │
+└─────────┴─────────┴─────────┘
+```
 
-建筑与 `{}` 类似于 [远程表功能](../../sql-reference/table-functions/remote.md)).
+**路径中的通配符**
+
+多个路径组件可以具有通配符。 对于要处理的文件必须存在并与整个路径模式匹配（不仅后缀或前缀）。
+
+-   `*` — 替换任意数量的任何字符，除了 `/` 包括空字符串。
+-   `?` — 替换任何单个字符。
+-   `{some_string,another_string,yet_another_one}` — 替换任何字符串 `'some_string', 'another_string', 'yet_another_one'`。
+-   `{N..M}` — 替换范围从N到M的任何数字（包括两个边界）。
+
+使用 `{}` 的构造类似于 [remote](../../sql-reference/table-functions/remote.md))表函数。
 
 **示例**
 
-1.  假设我们有几个具有以下相对路径的文件:
+假设我们有几个文件，这些文件具有以下相对路径:
 
 -   ‘some_dir/some_file_1’
 -   ‘some_dir/some_file_2’
@@ -79,18 +94,14 @@ SELECT * FROM file('test.csv', 'CSV', 'column1 UInt32, column2 UInt32, column3 U
 -   ‘another_dir/some_file_2’
 -   ‘another_dir/some_file_3’
 
-1.  查询这些文件中的行数:
-
-<!-- -->
+查询这些文件中的行数:
 
 ``` sql
 SELECT count(*)
 FROM file('{some,another}_dir/some_file_{1..3}', 'TSV', 'name String, value UInt32')
 ```
 
-1.  查询这两个目录的所有文件中的行数:
-
-<!-- -->
+查询这两个目录的所有文件中的行数:
 
 ``` sql
 SELECT count(*)
@@ -98,11 +109,11 @@ FROM file('{some,another}_dir/*', 'TSV', 'name String, value UInt32')
 ```
 
 !!! warning "警告"
-    如果您的文件列表包含带前导零的数字范围，请单独使用带大括号的构造或使用 `?`.
+    如果您的文件列表包含带前导零的数字范围，请对每个数字分别使用带有大括号的结构或使用 `?`。
 
 **示例**
 
-从名为 `file000`, `file001`, … , `file999`:
+从名为 `file000`, `file001`, … , `file999`的文件中查询数据:
 
 ``` sql
 SELECT count(*)
@@ -111,8 +122,8 @@ FROM file('big_dir/file{0..9}{0..9}{0..9}', 'CSV', 'name String, value UInt32')
 
 ## 虚拟列 {#virtual-columns}
 
--   `_path` — Path to the file.
--   `_file` — Name of the file.
+-   `_path` — 文件路径。
+-   `_file` — 文件名称。
 
 **另请参阅**
 
diff --git a/docs/zh/sql-reference/table-functions/generate.md b/docs/zh/sql-reference/table-functions/generate.md
index 1b535161acb..b9b02793cf3 100644
--- a/docs/zh/sql-reference/table-functions/generate.md
+++ b/docs/zh/sql-reference/table-functions/generate.md
@@ -1,15 +1,13 @@
 ---
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
 toc_priority: 47
 toc_title: generateRandom
 ---
 
 # generateRandom {#generaterandom}
 
-使用给定的模式生成随机数据。
-允许用数据填充测试表。
-支持可以存储在表中的所有数据类型，除了 `LowCardinality` 和 `AggregateFunction`.
+生成具用给定的模式的随机数据。
+允许用数据来填充测试表。
+支持所有可以存储在表中的数据类型， `LowCardinality` 和 `AggregateFunction`除外。
 
 ``` sql
 generateRandom('name TypeName[, name TypeName]...', [, 'random_seed'[, 'max_string_length'[, 'max_array_length']]]);
@@ -17,15 +15,15 @@ generateRandom('name TypeName[, name TypeName]...', [, 'random_seed'[, 'max_stri
 
 **参数**
 
--   `name` — Name of corresponding column.
--   `TypeName` — Type of corresponding column.
--   `max_array_length` — Maximum array length for all generated arrays. Defaults to `10`.
--   `max_string_length` — Maximum string length for all generated strings. Defaults to `10`.
--   `random_seed` — Specify random seed manually to produce stable results. If NULL — seed is randomly generated.
+-   `name` — 对应列的名称。
+-   `TypeName` — 对应列的类型。
+-   `max_array_length` — 生成数组的最大长度。 默认为10。
+-   `max_string_length` — 生成字符串的最大长度。 默认为10。
+-   `random_seed` — 手动指定随机种子以产生稳定的结果。 如果为NULL-种子是随机生成的。
 
 **返回值**
 
-具有请求架构的表对象。
+具有请求模式的表对象。
 
 ## 用法示例 {#usage-example}
 
diff --git a/docs/zh/sql-reference/table-functions/hdfs.md b/docs/zh/sql-reference/table-functions/hdfs.md
index 112c88450e2..715d9671dc8 100644
--- a/docs/zh/sql-reference/table-functions/hdfs.md
+++ b/docs/zh/sql-reference/table-functions/hdfs.md
@@ -1,13 +1,11 @@
 ---
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
 toc_priority: 45
 toc_title: hdfs
 ---
 
 # hdfs {#hdfs}
 
-从HDFS中的文件创建表。 此表函数类似于 [url](url.md) 和 [文件](file.md) 一些的。
+根据HDFS中的文件创建表。 该表函数类似于 [url](url.md) 和 [文件](file.md)。
 
 ``` sql
 hdfs(URI, format, structure)
@@ -15,9 +13,9 @@ hdfs(URI, format, structure)
 
 **输入参数**
 
--   `URI` — The relative URI to the file in HDFS. Path to file support following globs in readonly mode: `*`, `?`, `{abc,def}` 和 `{N..M}` 哪里 `N`, `M` — numbers, \``'abc', 'def'` — strings.
--   `format` — The [格式](../../interfaces/formats.md#formats) 的文件。
--   `structure` — Structure of the table. Format `'column1_name column1_type, column2_name column2_type, ...'`.
+-   `URI` — HDFS中文件的相对URI。 在只读模式下，文件路径支持以下通配符: `*`, `?`, `{abc,def}` 和 `{N..M}` ，其中 `N`, `M` 是数字, \``'abc', 'def'` 是字符串。
+-   `format` — 文件的[格式](../../interfaces/formats.md#formats)。
+-   `structure` — 表的结构。格式  `'column1_name column1_type, column2_name column2_type, ...'`。
 
 **返回值**
 
@@ -25,7 +23,7 @@ hdfs(URI, format, structure)
 
 **示例**
 
-表从 `hdfs://hdfs1:9000/test` 并从中选择前两行:
+表来自 `hdfs://hdfs1:9000/test` 并从中选择前两行:
 
 ``` sql
 SELECT *
@@ -40,20 +38,20 @@ LIMIT 2
 └─────────┴─────────┴─────────┘
 ```
 
-**路径中的水珠**
+**路径中的通配符**
 
-多个路径组件可以具有globs。 对于正在处理的文件应该存在并匹配到整个路径模式（不仅后缀或前缀）。
+多个路径组件可以具有通配符。 对于要处理的文件必须存在并与整个路径模式匹配（不仅后缀或前缀）。
 
--   `*` — Substitutes any number of any characters except `/` 包括空字符串。
--   `?` — Substitutes any single character.
--   `{some_string,another_string,yet_another_one}` — Substitutes any of strings `'some_string', 'another_string', 'yet_another_one'`.
--   `{N..M}` — Substitutes any number in range from N to M including both borders.
+-   `*` — 替换任意数量的任何字符，除了 `/` 包括空字符串。
+-   `?` — 替换任何单个字符。
+-   `{some_string,another_string,yet_another_one}` — 替换任何字符串 `'some_string', 'another_string', 'yet_another_one'`。
+-   `{N..M}` — 替换范围从N到M的任何数字（包括两个边界）。
 
-建筑与 `{}` 类似于 [远程表功能](../../sql-reference/table-functions/remote.md)).
+使用 `{}` 的构造类似于 [remote](../../sql-reference/table-functions/remote.md))表函数。
 
 **示例**
 
-1.  假设我们在HDFS上有几个具有以下Uri的文件:
+1.  假设我们在HDFS上有几个带有以下URI的文件:
 
 -   ‘hdfs://hdfs1:9000/some_dir/some_file_1’
 -   ‘hdfs://hdfs1:9000/some_dir/some_file_2’
@@ -62,7 +60,7 @@ LIMIT 2
 -   ‘hdfs://hdfs1:9000/another_dir/some_file_2’
 -   ‘hdfs://hdfs1:9000/another_dir/some_file_3’
 
-1.  查询这些文件中的行数:
+2.  查询这些文件中的行数:
 
 <!-- -->
 
@@ -71,7 +69,7 @@ SELECT count(*)
 FROM hdfs('hdfs://hdfs1:9000/{some,another}_dir/some_file_{1..3}', 'TSV', 'name String, value UInt32')
 ```
 
-1.  查询这两个目录的所有文件中的行数:
+3.  查询这两个目录的所有文件中的行数:
 
 <!-- -->
 
@@ -81,11 +79,11 @@ FROM hdfs('hdfs://hdfs1:9000/{some,another}_dir/*', 'TSV', 'name String, value U
 ```
 
 !!! warning "警告"
-    如果您的文件列表包含带前导零的数字范围，请单独使用带大括号的构造或使用 `?`.
+    如果您的文件列表包含带前导零的数字范围，请对每个数字分别使用带有大括号的结构或使用 `?`。
 
 **示例**
 
-从名为 `file000`, `file001`, … , `file999`:
+从名为 `file000`, `file001`, … , `file999`的文件中查询数据:
 
 ``` sql
 SELECT count(*)
@@ -94,8 +92,8 @@ FROM hdfs('hdfs://hdfs1:9000/big_dir/file{0..9}{0..9}{0..9}', 'CSV', 'name Strin
 
 ## 虚拟列 {#virtual-columns}
 
--   `_path` — Path to the file.
--   `_file` — Name of the file.
+-   `_path` — 文件路径。
+-   `_file` — 文件名称。
 
 **另请参阅**
 
diff --git a/docs/zh/sql-reference/table-functions/index.md b/docs/zh/sql-reference/table-functions/index.md
index d9eadb9c592..20a335de0fc 100644
--- a/docs/zh/sql-reference/table-functions/index.md
+++ b/docs/zh/sql-reference/table-functions/index.md
@@ -1,38 +1,36 @@
 ---
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
-toc_folder_title: "\u8868\u51FD\u6570"
+toc_folder_title: 表函数
 toc_priority: 34
 toc_title: "\u5BFC\u8A00"
 ---
 
 # 表函数 {#table-functions}
 
-表函数是构造表的方法。
+表函数是用来构造表的方法。
 
-您可以使用表函数:
+您可以在以下位置使用表函数:
 
--   [FROM](../statements/select/from.md) 《公约》条款 `SELECT` 查询。
+-    `SELECT` 查询的[FROM](../../sql-reference/statements/select/from.md)子句。
 
-        The method for creating a temporary table that is available only in the current query. The table is deleted when the query finishes.
+        创建临时表的方法，该临时表仅在当前查询中可用。当查询完成后，该临时表将被删除。
 
--   [创建表为\<table_function()\>](../statements/create.md#create-table-query) 查询。
+-   [CREATE TABLE AS \<table_function()\>](../statements/create.md#create-table-query) 查询。
 
-        It's one of the methods of creating a table.
+        这是创建表的方法之一。
 
 !!! warning "警告"
-    你不能使用表函数，如果 [allow_ddl](../../operations/settings/permissions-for-queries.md#settings_allow_ddl) 设置被禁用。
+    如果 [allow_ddl](../../operations/settings/permissions-for-queries.md#settings_allow_ddl) 设置被禁用，则不能使用表函数。
 
-| 功能               | 产品描述                                                                                               |
-|--------------------|--------------------------------------------------------------------------------------------------------|
-| [文件](file.md)    | 创建一个 [文件](../../engines/table-engines/special/file.md)-发动机表。                                |
-| [合并](merge.md)   | 创建一个 [合并](../../engines/table-engines/special/merge.md)-发动机表。                               |
-| [数字](numbers.md) | 创建一个包含整数填充的单列的表。                                                                       |
-| [远程](remote.md)  | 允许您访问远程服务器，而无需创建 [分布](../../engines/table-engines/special/distributed.md)-发动机表。 |
-| [url](url.md)      | 创建一个 [Url](../../engines/table-engines/special/url.md)-发动机表。                                  |
-| [mysql](mysql.md)  | 创建一个 [MySQL](../../engines/table-engines/integrations/mysql.md)-发动机表。                         |
-| [jdbc](jdbc.md)    | 创建一个 [JDBC](../../engines/table-engines/integrations/jdbc.md)-发动机表。                           |
-| [odbc](odbc.md)    | 创建一个 [ODBC](../../engines/table-engines/integrations/odbc.md)-发动机表。                           |
-| [hdfs](hdfs.md)    | 创建一个 [HDFS](../../engines/table-engines/integrations/hdfs.md)-发动机表。                           |
+| 函数               | 描述                                                                                               |
+|-----------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------|
+| [file](../../sql-reference/table-functions/file.md)             | 创建一个file引擎表。 |
+| [merge](../../sql-reference/table-functions/merge.md)           | 创建一个merge引擎表。 |
+| [numbers](../../sql-reference/table-functions/numbers.md)       | 创建一个单列的表，其中包含整数。 |
+| [remote](../../sql-reference/table-functions/remote.md)         | 允许您访问远程服务器，而无需创建分布式表。  |
+| [url](../../sql-reference/table-functions/url.md)               | 创建一个URL引擎表。 |
+| [mysql](../../sql-reference/table-functions/mysql.md)           | 创建一个MySQL引擎表。 |
+| [jdbc](../../sql-reference/table-functions/jdbc.md)             | 创建一个JDBC引擎表。 |
+| [odbc](../../sql-reference/table-functions/odbc.md)             | 创建一个ODBC引擎表。 |
+| [hdfs](../../sql-reference/table-functions/hdfs.md)             | 创建一个HDFS引擎表。 |
 
 [原始文章](https://clickhouse.tech/docs/en/query_language/table_functions/) <!--hide-->
diff --git a/docs/zh/sql-reference/table-functions/input.md b/docs/zh/sql-reference/table-functions/input.md
index 42b354dc935..a0215b26c8a 100644
--- a/docs/zh/sql-reference/table-functions/input.md
+++ b/docs/zh/sql-reference/table-functions/input.md
@@ -1,33 +1,29 @@
 ---
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
 toc_priority: 46
-toc_title: "\u8F93\u5165"
+toc_title: input
 ---
 
-# 输入 {#input}
+# input {#input}
 
-`input(structure)` -表功能，允许有效地转换和插入数据发送到
-服务器与给定结构的表与另一种结构。
+`input(structure)` -表函数，可以有效地将发送给服务器的数据转换为具有给定结构的数据并将其插入到具有其他结构的表中。
 
-`structure` -以下格式发送到服务器的数据结构 `'column1_name column1_type, column2_name column2_type, ...'`.
-例如, `'id UInt32, name String'`.
+`structure` -发送到服务器的数据结构的格式 `'column1_name column1_type, column2_name column2_type, ...'`。
+例如, `'id UInt32, name String'`。
 
-此功能只能用于 `INSERT SELECT` 查询，只有一次，但其他行为像普通表函数
+该函数只能在 `INSERT SELECT` 查询中使用，并且只能使用一次，但在其他方面，行为类似于普通的表函数
 （例如，它可以用于子查询等。).
 
-数据可以以任何方式像普通发送 `INSERT` 查询并传递任何可用 [格式](../../interfaces/formats.md#formats)
-必须在查询结束时指定（不像普通 `INSERT SELECT`).
+数据可以像普通 `INSERT` 查询一样发送，并以必须在查询末尾指定的任何可用[格式](../../interfaces/formats.md#formats)
+传递（与普通 `INSERT SELECT`不同)。
 
-这个功能的主要特点是，当服务器从客户端接收数据时，它同时将其转换
-根据表达式中的列表 `SELECT` 子句并插入到目标表中。 临时表
-不创建所有传输的数据。
+该函数的主要特点是，当服务器从客户端接收数据时，它会同时根据 `SELECT` 子句中的表达式列表将其转换，并插入到目标表中。 
+不会创建包含所有已传输数据的临时表。
 
 **例**
 
 -   让 `test` 表具有以下结构 `(a String, b String)`
-    和数据 `data.csv` 具有不同的结构 `(col1 String, col2 Date, col3 Int32)`. 查询插入
-    从数据 `data.csv` 进 `test` 同时转换的表如下所示:
+    并且 `data.csv` 中的数据具有不同的结构 `(col1 String, col2 Date, col3 Int32)`。
+    将数据从 `data.csv` 插入到 `test` 表中，同时进行转换的查询如下所示:
 
 <!-- -->
 
@@ -35,7 +31,7 @@ toc_title: "\u8F93\u5165"
 $ cat data.csv | clickhouse-client --query="INSERT INTO test SELECT lower(col1), col3 * col3 FROM input('col1 String, col2 Date, col3 Int32') FORMAT CSV";
 ```
 
--   如果 `data.csv` 包含相同结构的数据 `test_structure` 作为表 `test` 那么这两个查询是相等的:
+-   如果 `data.csv` 包含与表 `test` 相同结构 `test_structure` 的数据，那么这两个查询是相等的:
 
 <!-- -->
 
diff --git a/docs/zh/sql-reference/table-functions/jdbc.md b/docs/zh/sql-reference/table-functions/jdbc.md
index c1833462171..af8c82f0097 100644
--- a/docs/zh/sql-reference/table-functions/jdbc.md
+++ b/docs/zh/sql-reference/table-functions/jdbc.md
@@ -1,6 +1,4 @@
 ---
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
 toc_priority: 43
 toc_title: jdbc
 ---
@@ -9,10 +7,10 @@ toc_title: jdbc
 
 `jdbc(jdbc_connection_uri, schema, table)` -返回通过JDBC驱动程序连接的表。
 
-此表函数需要单独的 `clickhouse-jdbc-bridge` 程序正在运行。
+此表函数需要单独的 `clickhouse-jdbc-bridge` 程序才能运行。
 它支持可空类型（基于查询的远程表的DDL）。
 
-**例**
+**示例**
 
 ``` sql
 SELECT * FROM jdbc('jdbc:mysql://localhost:3306/?user=root&password=root', 'schema', 'table')
diff --git a/docs/zh/sql-reference/table-functions/merge.md b/docs/zh/sql-reference/table-functions/merge.md
index 0e94dcc4d42..410468b3d8a 100644
--- a/docs/zh/sql-reference/table-functions/merge.md
+++ b/docs/zh/sql-reference/table-functions/merge.md
@@ -1,14 +1,12 @@
 ---
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
 toc_priority: 38
-toc_title: "\u5408\u5E76"
+toc_title: merge
 ---
 
-# 合并 {#merge}
+# merge {#merge}
 
-`merge(db_name, 'tables_regexp')` – Creates a temporary Merge table. For more information, see the section “Table engines, Merge”.
+`merge(db_name, 'tables_regexp')` – 创建一个临时Merge表。 有关更多信息，请参见 “Table engines, Merge”。
 
-表结构取自与正则表达式匹配的第一个表。
+表结构取自遇到的第一个与正则表达式匹配的表。
 
 [原始文章](https://clickhouse.tech/docs/en/query_language/table_functions/merge/) <!--hide-->
diff --git a/docs/zh/sql-reference/table-functions/numbers.md b/docs/zh/sql-reference/table-functions/numbers.md
index e5f13d60791..59a57b157e0 100644
--- a/docs/zh/sql-reference/table-functions/numbers.md
+++ b/docs/zh/sql-reference/table-functions/numbers.md
@@ -1,18 +1,16 @@
 ---
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
 toc_priority: 39
-toc_title: "\u6570\u5B57"
+toc_title: numbers
 ---
 
-# 数字 {#numbers}
+# numbers {#numbers}
 
-`numbers(N)` – Returns a table with the single ‘number’ 包含从0到N-1的整数的列(UInt64)。
-`numbers(N, M)` -返回一个表与单 ‘number’ 包含从N到(N+M-1)的整数的列(UInt64)。
+`numbers(N)` – 返回一个包含单个 ‘number’ 列(UInt64)的表，其中包含从0到N-1的整数。
+`numbers(N, M)` - 返回一个包含单个 ‘number’ 列(UInt64)的表，其中包含从N到(N+M-1)的整数。
 
-类似于 `system.numbers` 表，它可以用于测试和生成连续的值, `numbers(N, M)` 比 `system.numbers`.
+类似于 `system.numbers` 表，它可以用于测试和生成连续的值, `numbers(N, M)` 比 `system.numbers`更有效。
 
-以下查询是等效的:
+以下查询是等价的:
 
 ``` sql
 SELECT * FROM numbers(10);
@@ -20,10 +18,10 @@ SELECT * FROM numbers(0, 10);
 SELECT * FROM system.numbers LIMIT 10;
 ```
 
-例:
+示例:
 
 ``` sql
--- Generate a sequence of dates from 2010-01-01 to 2010-12-31
+-- 生成2010-01-01至2010-12-31的日期序列
 select toDate('2010-01-01') + number as d FROM numbers(365);
 ```
 
diff --git a/docs/zh/sql-reference/table-functions/odbc.md b/docs/zh/sql-reference/table-functions/odbc.md
index 95fb2277474..dd2826e892f 100644
--- a/docs/zh/sql-reference/table-functions/odbc.md
+++ b/docs/zh/sql-reference/table-functions/odbc.md
@@ -1,13 +1,11 @@
 ---
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
 toc_priority: 44
 toc_title: odbc
 ---
 
 # odbc {#table-functions-odbc}
 
-返回通过连接的表 [ODBC](https://en.wikipedia.org/wiki/Open_Database_Connectivity).
+返回通过 [ODBC](https://en.wikipedia.org/wiki/Open_Database_Connectivity) 连接的表。
 
 ``` sql
 odbc(connection_settings, external_database, external_table)
@@ -15,23 +13,23 @@ odbc(connection_settings, external_database, external_table)
 
 参数:
 
--   `connection_settings` — Name of the section with connection settings in the `odbc.ini` 文件
--   `external_database` — Name of a database in an external DBMS.
--   `external_table` — Name of a table in the `external_database`.
+-   `connection_settings` — 在 `odbc.ini` 文件中连接设置的部分的名称。
+-   `external_database` — 外部DBMS的数据库名。
+-   `external_table` —  `external_database` 数据库中的表名。
 
-为了安全地实现ODBC连接，ClickHouse使用单独的程序 `clickhouse-odbc-bridge`. 如果直接从ODBC驱动程序加载 `clickhouse-server`，驱动程序问题可能会导致ClickHouse服务器崩溃。 ClickHouse自动启动 `clickhouse-odbc-bridge` 当它是必需的。 ODBC桥程序是从相同的软件包作为安装 `clickhouse-server`.
+为了安全地实现ODBC连接，ClickHouse使用单独的程序 `clickhouse-odbc-bridge`。 如果ODBC驱动程序直接从 `clickhouse-server` 加载，则驱动程序问题可能会导致ClickHouse服务器崩溃。 当需要时，ClickHouse自动启动 `clickhouse-odbc-bridge`。 ODBC桥程序是从与 `clickhouse-server` 相同的软件包安装的。
 
-与字段 `NULL` 外部表中的值将转换为基数据类型的默认值。 例如，如果远程MySQL表字段具有 `INT NULL` 键入它将转换为0（ClickHouse的默认值 `Int32` 数据类型）。
+外部表中字段包含的 `NULL` 值将转换为基本据类型的默认值。 例如，如果远程MySQL表字段包含 `INT NULL` 类型，则将被转换为0（ClickHouse`Int32` 数据类型的默认值）。
 
 ## 用法示例 {#usage-example}
 
-**通过ODBC从本地MySQL安装获取数据**
+**通过ODBC从本地安装的MySQL获取数据**
 
-此示例检查Ubuntu Linux18.04和MySQL服务器5.7。
+这个例子检查Ubuntu Linux18.04和MySQL服务器5.7。
 
-确保安装了unixODBC和MySQL连接器。
+确保已经安装了unixODBC和MySQL连接器。
 
-默认情况下（如果从软件包安装），ClickHouse以用户身份启动 `clickhouse`. 因此，您需要在MySQL服务器中创建和配置此用户。
+默认情况下（如果从软件包安装），ClickHouse以用户 `clickhouse` 启动。 因此，您需要在MySQL服务器中创建和配置此用户。
 
 ``` bash
 $ sudo mysql
@@ -42,7 +40,7 @@ mysql> CREATE USER 'clickhouse'@'localhost' IDENTIFIED BY 'clickhouse';
 mysql> GRANT ALL PRIVILEGES ON *.* TO 'clickhouse'@'clickhouse' WITH GRANT OPTION;
 ```
 
-然后配置连接 `/etc/odbc.ini`.
+然后在 `/etc/odbc.ini` 中配置连接。
 
 ``` bash
 $ cat /etc/odbc.ini
@@ -55,7 +53,7 @@ USERNAME = clickhouse
 PASSWORD = clickhouse
 ```
 
-您可以使用 `isql` unixodbc安装中的实用程序。
+您可以使用unixODBC安装的 `isql` 实用程序检查连接。
 
 ``` bash
 $ isql -v mysqlconn
diff --git a/docs/zh/sql-reference/table-functions/remote.md b/docs/zh/sql-reference/table-functions/remote.md
index b7bd494609b..cacc68c0b71 100644
--- a/docs/zh/sql-reference/table-functions/remote.md
+++ b/docs/zh/sql-reference/table-functions/remote.md
@@ -1,22 +1,52 @@
-# 远程，远程安全 {#remote-remotesecure}
+# remote, remoteSecure {#remote-remotesecure}
 
-允许您访问远程服务器，而无需创建 `Distributed` 表
+允许您访问远程服务器，而无需创建 `Distributed` 表。`remoteSecure` - 与 `remote` 相同，但是会使用加密链接。
 
-签名:
+这两个函数都可以在 `SELECT` 和 `INSERT` 查询中使用。
+
+语法:
 
 ``` sql
-remote('addresses_expr', db, table[, 'user'[, 'password']])
-remote('addresses_expr', db.table[, 'user'[, 'password']])
-remoteSecure('addresses_expr', db, table[, 'user'[, 'password']])
-remoteSecure('addresses_expr', db.table[, 'user'[, 'password']])
+remote('addresses_expr', db, table[, 'user'[, 'password'], sharding_key])
+remote('addresses_expr', db.table[, 'user'[, 'password'], sharding_key])
+remoteSecure('addresses_expr', db, table[, 'user'[, 'password'], sharding_key])
+remoteSecure('addresses_expr', db.table[, 'user'[, 'password'], sharding_key])
 ```
 
-`addresses_expr` – 代表远程服务器地址的一个表达式。可以只是单个服务器地址。 服务器地址可以是 `host:port` 或 `host`。`host` 可以指定为服务器域名，或是IPV4或IPV6地址。IPv6地址在方括号中指定。`port` 是远程服务器上的TCP端口。 如果省略端口，则使用服务器配置文件中的 `tcp_port` （默认情况为，9000）。
+**参数**
+
+- `addresses_expr` – 代表远程服务器地址的一个表达式。可以只是单个服务器地址。 服务器地址可以是 `host:port` 或 `host`。
+   
+    `host` 可以指定为服务器名称，或是IPV4或IPV6地址。IPv6地址在方括号中指定。
+   
+    `port` 是远程服务器上的TCP端口。 如果省略端口，则 `remote` 使用服务器配置文件中的 [tcp_port](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-tcp_port) （默认情况为，9000），`remoteSecure` 使用 [tcp_port_secure](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-tcp_port_secure) （默认情况为，9440）。
 
-!!! important "重要事项"
     IPv6地址需要指定端口。
+ 
+    类型: [String](../../sql-reference/data-types/string.md)。
+    
+    - `db` — 数据库名。类型: [String](../../sql-reference/data-types/string.md)。
+    - `table` — 表名。类型: [String](../../sql-reference/data-types/string.md)。
+    - `user` — 用户名。如果未指定用户，则使用 `default` 。类型: [String](../../sql-reference/data-types/string.md)。
+    - `password` — 用户密码。如果未指定密码，则使用空密码。类型: [String](../../sql-reference/data-types/string.md)。
+    - `sharding_key` — 分片键以支持在节点之间分布数据。 例如: `insert into remote('127.0.0.1:9000,127.0.0.2', db, table, 'default', rand())`。 类型: [UInt32](../../sql-reference/data-types/int-uint.md)。
+    
+    **返回值**
+    
+    来自远程服务器的数据集。
+    
+    **用法**
+    
+    使用 `remote` 表函数没有创建一个 `Distributed` 表更优，因为在这种情况下，将为每个请求重新建立服务器连接。此外，如果设置了主机名，则会解析这些名称，并且在使用各种副本时不会计入错误。 在处理大量查询时，始终优先创建 `Distributed` 表，不要使用 `remote` 表函数。
 
-例:
+    该 `remote` 表函数可以在以下情况下是有用的:
+
+    -   访问特定服务器进行数据比较、调试和测试。
+    -   在多个ClickHouse集群之间的用户研究目的的查询。
+    -   手动发出的不频繁分布式请求。
+    -   每次重新定义服务器集的分布式请求。
+    
+    **地址**
 
 ``` text
 example01-01-1
@@ -29,8 +59,6 @@ localhost
 
 多个地址可以用逗号分隔。在这种情况下，ClickHouse将使用分布式处理，因此它将将查询发送到所有指定的地址（如具有不同数据的分片）。
 
-示例:
-
 ``` text
 example01-01-1,example01-02-1
 ```
@@ -49,30 +77,28 @@ example01-{01..02}-1
 
 如果您有多对大括号，它会生成相应集合的直接乘积。
 
-大括号中的地址和部分地址可以用管道符号(\|)分隔。 在这种情况下，相应的地址集被解释为副本，并且查询将被发送到第一个正常副本。 但是，副本将按照当前[load_balancing](../../operations/settings/settings.md)设置的顺序进行迭代。
-
-示例:
+大括号中的地址和部分地址可以用管道符号(\|)分隔。 在这种情况下，相应的地址集被解释为副本，并且查询将被发送到第一个正常副本。 但是，副本将按照当前[load_balancing](../../operations/settings/settings.md)设置的顺序进行迭代。此示例指定两个分片，每个分片都有两个副本:
 
 ``` text
 example01-{01..02}-{1|2}
 ```
 
-此示例指定两个分片，每个分片都有两个副本。
-
 生成的地址数由常量限制。目前这是1000个地址。
 
-使用 `remote` 表函数没有创建一个 `Distributed` 表更优，因为在这种情况下，将为每个请求重新建立服务器连接。此外，如果设置了主机名，则会解析这些名称，并且在使用各种副本时不会计算错误。 在处理大量查询时，始终优先创建 `Distributed` 表，不要使用 `remote` 表功能。
+**示例**
 
-该 `remote` 表函数可以在以下情况下是有用的:
+从远程服务器选择数据:
 
--   访问特定服务器进行数据比较、调试和测试。
--   在多个ClickHouse集群之间的用户研究目的的查询。
--   手动发出的不频繁分布式请求。
--   每次重新定义服务器集的分布式请求。
+``` sql
+SELECT * FROM remote('127.0.0.1', db.remote_engine_table) LIMIT 3;
+```
 
-如果未指定用户, 将会使用`default`。
-如果未指定密码，则使用空密码。
+将远程服务器中的数据插入表中:
 
-`remoteSecure` - 与 `remote` 相同，但是会使用加密链接。默认端口为配置文件中的[tcp_port_secure](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-tcp_port_secure)，或9440。
+``` sql
+CREATE TABLE remote_table (name String, value UInt32) ENGINE=Memory;
+INSERT INTO FUNCTION remote('127.0.0.1', currentDatabase(), 'remote_table') VALUES ('test', 42);
+SELECT * FROM remote_table;
+```
 
 [原始文章](https://clickhouse.tech/docs/en/query_language/table_functions/remote/) <!--hide-->
diff --git a/docs/zh/sql-reference/table-functions/url.md b/docs/zh/sql-reference/table-functions/url.md
index c2efe09913a..d726cddd748 100644
--- a/docs/zh/sql-reference/table-functions/url.md
+++ b/docs/zh/sql-reference/table-functions/url.md
@@ -1,26 +1,43 @@
 ---
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
 toc_priority: 41
 toc_title: url
 ---
 
 # url {#url}
 
-`url(URL, format, structure)` -返回从创建的表 `URL` 与给定
-`format` 和 `structure`.
+`url` 函数从 `URL` 创建一个具有给定 `format` 和 `structure` 的表。
 
-URL-HTTP或HTTPS服务器地址，它可以接受 `GET` 和/或 `POST` 请求。
+`url` 函数可用于对[URL](../../engines/table-engines/special/url.md)表中的数据进行 `SELECT` 和 `INSERT` 的查询中。
 
-格式 - [格式](../../interfaces/formats.md#formats) 的数据。
+**语法**
 
-结构-表结构 `'UserID UInt64, Name String'` 格式。 确定列名称和类型。
+``` sql
+url(URL, format, structure)
+```
+
+**参数**
+
+- `URL` — HTTP或HTTPS服务器地址，它可以接受 `GET` 或 `POST` 请求 (对应于 `SELECT` 或 `INSERT` 查询)。类型: [String](../../sql-reference/data-types/string.md)。
+- `format` — 数据[格式](../../interfaces/formats.md#formats)。类型: [String](../../sql-reference/data-types/string.md)。
+- `structure` — 以 `'UserID UInt64, Name String'` 格式的表结构。确定列名和类型。 类型: [String](../../sql-reference/data-types/string.md)。
+
+**返回值**
+
+A table with the specified format and structure and with data from the defined `URL`.
 
 **示例**
 
+获取一个表的前3行，该表是从HTTP服务器获取的包含 `String` 和 [UInt32](../../sql-reference/data-types/int-uint.md) 类型的列，以[CSV](../../interfaces/formats.md#csv)格式返回。
+
 ``` sql
--- getting the first 3 lines of a table that contains columns of String and UInt32 type from HTTP-server which answers in CSV format.
-SELECT * FROM url('http://127.0.0.1:12345/', CSV, 'column1 String, column2 UInt32') LIMIT 3
+SELECT * FROM url('http://127.0.0.1:12345/', CSV, 'column1 String, column2 UInt32') LIMIT 3;
 ```
 
+将 `URL` 的数据插入到表中:
+
+``` sql
+CREATE TABLE test_table (column1 String, column2 UInt32) ENGINE=Memory;
+INSERT INTO FUNCTION url('http://127.0.0.1:8123/?query=INSERT+INTO+test_table+FORMAT+CSV', 'CSV', 'column1 String, column2 UInt32') VALUES ('http interface', 42);
+SELECT * FROM test_table;
+```
 [原始文章](https://clickhouse.tech/docs/en/query_language/table_functions/url/) <!--hide-->
diff --git a/programs/CMakeLists.txt b/programs/CMakeLists.txt
index 9adca58b55a..ad3ff84d8bf 100644
--- a/programs/CMakeLists.txt
+++ b/programs/CMakeLists.txt
@@ -33,7 +33,14 @@ option (ENABLE_CLICKHOUSE_OBFUSCATOR "Table data obfuscator (convert real data t
     ${ENABLE_CLICKHOUSE_ALL})
 
 # https://clickhouse.tech/docs/en/operations/utilities/odbc-bridge/
-option (ENABLE_CLICKHOUSE_ODBC_BRIDGE "HTTP-server working like a proxy to ODBC driver"
+if (ENABLE_ODBC)
+    option (ENABLE_CLICKHOUSE_ODBC_BRIDGE "HTTP-server working like a proxy to ODBC driver"
+        ${ENABLE_CLICKHOUSE_ALL})
+else ()
+    option (ENABLE_CLICKHOUSE_ODBC_BRIDGE "HTTP-server working like a proxy to ODBC driver" OFF)
+endif ()
+
+option (ENABLE_CLICKHOUSE_LIBRARY_BRIDGE "HTTP-server working like a proxy to Library dictionary source"
     ${ENABLE_CLICKHOUSE_ALL})
 
 # https://presentations.clickhouse.tech/matemarketing_2020/
@@ -109,6 +116,12 @@ else()
     message(STATUS "ODBC bridge mode: OFF")
 endif()
 
+if (ENABLE_CLICKHOUSE_LIBRARY_BRIDGE)
+    message(STATUS "Library bridge mode: ON")
+else()
+    message(STATUS "Library bridge mode: OFF")
+endif()
+
 if (ENABLE_CLICKHOUSE_INSTALL)
     message(STATUS "ClickHouse install: ON")
 else()
@@ -188,11 +201,16 @@ add_subdirectory (format)
 add_subdirectory (obfuscator)
 add_subdirectory (install)
 add_subdirectory (git-import)
+add_subdirectory (bash-completion)
 
 if (ENABLE_CLICKHOUSE_ODBC_BRIDGE)
     add_subdirectory (odbc-bridge)
 endif ()
 
+if (ENABLE_CLICKHOUSE_LIBRARY_BRIDGE)
+    add_subdirectory (library-bridge)
+endif ()
+
 if (CLICKHOUSE_ONE_SHARED)
     add_library(clickhouse-lib SHARED ${CLICKHOUSE_SERVER_SOURCES} ${CLICKHOUSE_CLIENT_SOURCES} ${CLICKHOUSE_LOCAL_SOURCES} ${CLICKHOUSE_BENCHMARK_SOURCES} ${CLICKHOUSE_COPIER_SOURCES} ${CLICKHOUSE_EXTRACT_FROM_CONFIG_SOURCES} ${CLICKHOUSE_COMPRESSOR_SOURCES} ${CLICKHOUSE_FORMAT_SOURCES} ${CLICKHOUSE_OBFUSCATOR_SOURCES} ${CLICKHOUSE_GIT_IMPORT_SOURCES} ${CLICKHOUSE_ODBC_BRIDGE_SOURCES})
     target_link_libraries(clickhouse-lib ${CLICKHOUSE_SERVER_LINK} ${CLICKHOUSE_CLIENT_LINK} ${CLICKHOUSE_LOCAL_LINK} ${CLICKHOUSE_BENCHMARK_LINK} ${CLICKHOUSE_COPIER_LINK} ${CLICKHOUSE_EXTRACT_FROM_CONFIG_LINK} ${CLICKHOUSE_COMPRESSOR_LINK} ${CLICKHOUSE_FORMAT_LINK} ${CLICKHOUSE_OBFUSCATOR_LINK} ${CLICKHOUSE_GIT_IMPORT_LINK} ${CLICKHOUSE_ODBC_BRIDGE_LINK})
@@ -208,6 +226,10 @@ if (CLICKHOUSE_SPLIT_BINARY)
         list (APPEND CLICKHOUSE_ALL_TARGETS clickhouse-odbc-bridge)
     endif ()
 
+    if (ENABLE_CLICKHOUSE_LIBRARY_BRIDGE)
+        list (APPEND CLICKHOUSE_ALL_TARGETS clickhouse-library-bridge)
+    endif ()
+
     set_target_properties(${CLICKHOUSE_ALL_TARGETS} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ..)
 
     add_custom_target (clickhouse-bundle ALL DEPENDS ${CLICKHOUSE_ALL_TARGETS})
@@ -325,7 +347,7 @@ else ()
 endif ()
 
 if (ENABLE_TESTS AND USE_GTEST)
-    set (CLICKHOUSE_UNIT_TESTS_TARGETS unit_tests_libcommon unit_tests_dbms)
+    set (CLICKHOUSE_UNIT_TESTS_TARGETS unit_tests_dbms)
     add_custom_target (clickhouse-tests ALL DEPENDS ${CLICKHOUSE_UNIT_TESTS_TARGETS})
     add_dependencies(clickhouse-bundle clickhouse-tests)
 endif()
diff --git a/programs/bash-completion/CMakeLists.txt b/programs/bash-completion/CMakeLists.txt
new file mode 100644
index 00000000000..d3a47f5a35e
--- /dev/null
+++ b/programs/bash-completion/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(completions)
diff --git a/programs/bash-completion/completions/CMakeLists.txt b/programs/bash-completion/completions/CMakeLists.txt
new file mode 100644
index 00000000000..d364e07ef6e
--- /dev/null
+++ b/programs/bash-completion/completions/CMakeLists.txt
@@ -0,0 +1,28 @@
+macro(configure_bash_completion)
+    set(out "/usr/share/bash-completion/completions")
+    find_program(pkg-config PKG_CONFIG_BIN)
+    if (PKG_CONFIG_BIN)
+        execute_process(
+            COMMAND ${PKG_CONFIG_BIN} --variable=completionsdir bash-completion
+            OUTPUT_VARIABLE ${out}
+            OUTPUT_STRIP_TRAILING_WHITESPACE
+        )
+    endif()
+    string(REPLACE /usr "${CMAKE_INSTALL_PREFIX}" out "${out}")
+    message(STATUS "bash_completion will be written to ${out}")
+endmacro()
+
+configure_bash_completion()
+foreach (name
+    # set of functions
+    clickhouse-bootstrap
+
+    # binaries that accept settings as command line argument
+    clickhouse-client
+    clickhouse-local
+    clickhouse-benchmark
+
+    clickhouse
+)
+    install(FILES ${name} DESTINATION ${out})
+endforeach()
diff --git a/programs/bash-completion/completions/clickhouse b/programs/bash-completion/completions/clickhouse
new file mode 100644
index 00000000000..c4b77cf3f7a
--- /dev/null
+++ b/programs/bash-completion/completions/clickhouse
@@ -0,0 +1,43 @@
+[[ -v $_CLICKHOUSE_COMPLETION_LOADED ]] || source "$(dirname "${BASH_SOURCE[0]}")/clickhouse-bootstrap"
+
+function _clickhouse_get_utils()
+{
+    local cmd=$1 && shift
+    "$cmd" --help |& awk '/^clickhouse.*args/ { print $2 }'
+}
+
+function _complete_for_clickhouse_entrypoint_bin()
+{
+    local cur prev cword words
+    eval local cmd="$( _clickhouse_quote "$1" )"
+    _clickhouse_bin_exist "$cmd" || return 0
+
+    COMPREPLY=()
+    _get_comp_words_by_ref cur prev cword words
+
+    local util="$cur"
+    # complete utils, until it will be finished
+    if [[ $cword -lt 2 ]]; then
+        COMPREPLY=( $(compgen -W "$(_clickhouse_get_utils "$cmd")" -- "$cur") )
+        return
+    fi
+    util="${words[1]}"
+
+    case "$prev" in
+        -C|--config-file|--config)
+            return
+            ;;
+        # Argh...  This looks like a bash bug...
+        # Redirections are passed to the completion function
+        # although it is managed by the shell directly...
+        '<'|'>'|'>>'|[12]'>'|[12]'>>')
+            return
+            ;;
+    esac
+
+    COMPREPLY=( $(compgen -W "$(_clickhouse_get_options "$cmd" "$util")" -- "$cur") )
+
+    return 0
+}
+
+_complete_clickhouse_generic clickhouse _complete_for_clickhouse_entrypoint_bin
diff --git a/programs/bash-completion/completions/clickhouse-benchmark b/programs/bash-completion/completions/clickhouse-benchmark
new file mode 100644
index 00000000000..13064b7417d
--- /dev/null
+++ b/programs/bash-completion/completions/clickhouse-benchmark
@@ -0,0 +1,2 @@
+[[ -v $_CLICKHOUSE_COMPLETION_LOADED ]] || source "$(dirname "${BASH_SOURCE[0]}")/clickhouse-bootstrap"
+_complete_clickhouse_generic clickhouse-benchmark
diff --git a/programs/bash-completion/completions/clickhouse-bootstrap b/programs/bash-completion/completions/clickhouse-bootstrap
new file mode 100644
index 00000000000..dc8dcd5ad8d
--- /dev/null
+++ b/programs/bash-completion/completions/clickhouse-bootstrap
@@ -0,0 +1,81 @@
+#
+# bash autocomplete, that can work with:
+# a) --help of program
+#
+# Also you may like:
+# $ bind "set completion-ignore-case on"
+# $ bind "set show-all-if-ambiguous on"
+#
+# It uses bash-completion dynamic loader.
+
+# Known to work with bash 3.* with programmable completion and extended
+# pattern matching enabled (use 'shopt -s extglob progcomp' to enable
+# these if they are not already enabled).
+shopt -s extglob
+
+export _CLICKHOUSE_COMPLETION_LOADED=1
+
+function _clickhouse_bin_exist()
+{ [ -x "$1" ] || command -v "$1" >& /dev/null; }
+
+function _clickhouse_quote()
+{
+    local quoted=${1//\'/\'\\\'\'};
+    printf "'%s'" "$quoted"
+}
+
+# Extract every option (everything that starts with "-") from the --help dialog.
+function _clickhouse_get_options()
+{
+    "$@" --help 2>&1 | awk -F '[ ,=<>]' '{ for (i=1; i <= NF; ++i) { if (substr($i, 0, 1) == "-" && length($i) > 1) print $i; } }' | sort -u
+}
+
+function _complete_for_clickhouse_generic_bin()
+{
+    local cur prev
+    eval local cmd="$( _clickhouse_quote "$1" )"
+    _clickhouse_bin_exist "$cmd" || return 0
+
+    COMPREPLY=()
+    _get_comp_words_by_ref cur prev
+
+    case "$prev" in
+        -C|--config-file|--config)
+            return
+            ;;
+        # Argh...  This looks like a bash bug...
+        # Redirections are passed to the completion function
+        # although it is managed by the shell directly...
+        '<'|'>'|'>>'|[12]'>'|[12]'>>')
+            return
+            ;;
+    esac
+
+    COMPREPLY=( $(compgen -W "$(_clickhouse_get_options "$cmd")" -- "$cur") )
+
+    return 0
+}
+
+function _complete_clickhouse_generic()
+{
+    local bin=$1 && shift
+    local f=${1:-_complete_for_clickhouse_generic_bin}
+    local o=(
+        -o default
+        -o bashdefault
+        -o nospace
+        -F "$f"
+        "$bin"
+    )
+    complete "${o[@]}"
+}
+
+function _complete_clickhouse_bootstrap_main()
+{
+    local runtime=/usr/share/bash-completion/bash_completion
+    if ! type _get_comp_words_by_ref >& /dev/null && [[ -f $runtime ]]; then
+        source $runtime
+    fi
+    type _get_comp_words_by_ref >& /dev/null || return 0
+}
+_complete_clickhouse_bootstrap_main "$@"
diff --git a/programs/bash-completion/completions/clickhouse-client b/programs/bash-completion/completions/clickhouse-client
new file mode 100644
index 00000000000..6b7899b7263
--- /dev/null
+++ b/programs/bash-completion/completions/clickhouse-client
@@ -0,0 +1,2 @@
+[[ -v $_CLICKHOUSE_COMPLETION_LOADED ]] || source "$(dirname "${BASH_SOURCE[0]}")/clickhouse-bootstrap"
+_complete_clickhouse_generic clickhouse-client
diff --git a/programs/bash-completion/completions/clickhouse-local b/programs/bash-completion/completions/clickhouse-local
new file mode 100644
index 00000000000..7b12b48c7cd
--- /dev/null
+++ b/programs/bash-completion/completions/clickhouse-local
@@ -0,0 +1,2 @@
+[[ -v $_CLICKHOUSE_COMPLETION_LOADED ]] || source "$(dirname "${BASH_SOURCE[0]}")/clickhouse-bootstrap"
+_complete_clickhouse_generic clickhouse-local
diff --git a/programs/benchmark/Benchmark.cpp b/programs/benchmark/Benchmark.cpp
index a0e2ea155ba..1d2b579db3a 100644
--- a/programs/benchmark/Benchmark.cpp
+++ b/programs/benchmark/Benchmark.cpp
@@ -95,8 +95,8 @@ public:
             comparison_info_total.emplace_back(std::make_shared<Stats>());
         }
 
-        global_context.makeGlobalContext();
-        global_context.setSettings(settings);
+        global_context->makeGlobalContext();
+        global_context->setSettings(settings);
 
         std::cerr << std::fixed << std::setprecision(3);
 
@@ -159,7 +159,7 @@ private:
     bool print_stacktrace;
     const Settings & settings;
     SharedContextHolder shared_context;
-    Context global_context;
+    ContextPtr global_context;
     QueryProcessingStage::Enum query_processing_stage;
 
     /// Don't execute new queries after timelimit or SIGINT or exception
diff --git a/programs/client/Client.cpp b/programs/client/Client.cpp
index 3c27908741c..1aec3677b41 100644
--- a/programs/client/Client.cpp
+++ b/programs/client/Client.cpp
@@ -21,7 +21,7 @@
 #include <unordered_set>
 #include <algorithm>
 #include <optional>
-#include <ext/scope_guard.h>
+#include <ext/scope_guard_safe.h>
 #include <boost/program_options.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <Poco/String.h>
@@ -65,6 +65,7 @@
 #include <Parsers/ASTSetQuery.h>
 #include <Parsers/ASTUseQuery.h>
 #include <Parsers/ASTInsertQuery.h>
+#include <Parsers/ASTSelectQuery.h>
 #include <Parsers/ASTSelectWithUnionQuery.h>
 #include <Parsers/ASTQueryWithOutput.h>
 #include <Parsers/ASTLiteral.h>
@@ -116,6 +117,34 @@ namespace ErrorCodes
 }
 
 
+static bool queryHasWithClause(const IAST * ast)
+{
+    if (const auto * select = dynamic_cast<const ASTSelectQuery *>(ast);
+        select && select->with())
+    {
+        return true;
+    }
+
+    // This full recursive walk is somewhat excessive, because most of the
+    // children are not queries, but on the other hand it will let us to avoid
+    // breakage when the AST structure changes and some new variant of query
+    // nesting is added. This function is used in fuzzer, so it's better to be
+    // defensive and avoid weird unexpected errors.
+    // clang-tidy is confused by this function: it thinks that if `select` is
+    // nullptr, `ast` is also nullptr, and complains about nullptr dereference.
+    // NOLINTNEXTLINE
+    for (const auto & child : ast->children)
+    {
+        if (queryHasWithClause(child.get()))
+        {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+
 class Client : public Poco::Util::Application
 {
 public:
@@ -162,7 +191,7 @@ private:
     bool has_vertical_output_suffix = false; /// Is \G present at the end of the query string?
 
     SharedContextHolder shared_context = Context::createShared();
-    Context context = Context::createGlobal(shared_context.get());
+    ContextPtr context = Context::createGlobal(shared_context.get());
 
     /// Buffer that reads from stdin in batch mode.
     ReadBufferFromFileDescriptor std_in {STDIN_FILENO};
@@ -245,20 +274,20 @@ private:
 
         configReadClient(config(), home_path);
 
-        context.setApplicationType(Context::ApplicationType::CLIENT);
-        context.setQueryParameters(query_parameters);
+        context->setApplicationType(Context::ApplicationType::CLIENT);
+        context->setQueryParameters(query_parameters);
 
         /// settings and limits could be specified in config file, but passed settings has higher priority
-        for (const auto & setting : context.getSettingsRef().allUnchanged())
+        for (const auto & setting : context->getSettingsRef().allUnchanged())
         {
             const auto & name = setting.getName();
             if (config().has(name))
-                context.setSetting(name, config().getString(name));
+                context->setSetting(name, config().getString(name));
         }
 
         /// Set path for format schema files
         if (config().has("format_schema_path"))
-            context.setFormatSchemaPath(Poco::Path(config().getString("format_schema_path")).toString());
+            context->setFormatSchemaPath(Poco::Path(config().getString("format_schema_path")).toString());
 
         /// Initialize query_id_formats if any
         if (config().has("query_id_formats"))
@@ -390,7 +419,7 @@ private:
         for (auto d : chineseNewYearIndicators)
         {
             /// Let's celebrate until Lantern Festival
-            if (d <= days && d + 25u >= days)
+            if (d <= days && d + 25 >= days)
                 return true;
             else if (d > days)
                 return false;
@@ -498,7 +527,10 @@ private:
         std::cerr << std::fixed << std::setprecision(3);
 
         if (is_interactive)
+        {
+            clearTerminal();
             showClientVersion();
+        }
 
         is_default_format = !config().has("vertical") && !config().has("format");
         if (config().has("vertical"))
@@ -506,15 +538,15 @@ private:
         else
             format = config().getString("format", is_interactive ? "PrettyCompact" : "TabSeparated");
 
-        format_max_block_size = config().getInt("format_max_block_size", context.getSettingsRef().max_block_size);
+        format_max_block_size = config().getInt("format_max_block_size", context->getSettingsRef().max_block_size);
 
         insert_format = "Values";
 
         /// Setting value from cmd arg overrides one from config
-        if (context.getSettingsRef().max_insert_block_size.changed)
-            insert_format_max_block_size = context.getSettingsRef().max_insert_block_size;
+        if (context->getSettingsRef().max_insert_block_size.changed)
+            insert_format_max_block_size = context->getSettingsRef().max_insert_block_size;
         else
-            insert_format_max_block_size = config().getInt("insert_format_max_block_size", context.getSettingsRef().max_insert_block_size);
+            insert_format_max_block_size = config().getInt("insert_format_max_block_size", context->getSettingsRef().max_insert_block_size);
 
         if (!is_interactive)
         {
@@ -523,7 +555,7 @@ private:
             ignore_error = config().getBool("ignore-error", false);
         }
 
-        ClientInfo & client_info = context.getClientInfo();
+        ClientInfo & client_info = context->getClientInfo();
         client_info.setInitialQuery();
         client_info.quota_key = config().getString("quota_key", "");
 
@@ -531,7 +563,7 @@ private:
 
         /// Initialize DateLUT here to avoid counting time spent here as query execution time.
         const auto local_tz = DateLUT::instance().getTimeZone();
-        if (!context.getSettingsRef().use_client_time_zone)
+        if (!context->getSettingsRef().use_client_time_zone)
         {
             const auto & time_zone = connection->getServerTimezone(connection_parameters.timeouts);
             if (!time_zone.empty())
@@ -706,7 +738,7 @@ private:
         {
             auto query_id = config().getString("query_id", "");
             if (!query_id.empty())
-                context.setCurrentQueryId(query_id);
+                context->setCurrentQueryId(query_id);
 
             nonInteractive();
 
@@ -1006,7 +1038,7 @@ private:
             {
                 Tokens tokens(this_query_begin, all_queries_end);
                 IParser::Pos token_iterator(tokens,
-                    context.getSettingsRef().max_parser_depth);
+                    context->getSettingsRef().max_parser_depth);
                 if (!token_iterator.isValid())
                 {
                     break;
@@ -1055,7 +1087,7 @@ private:
                 if (ignore_error)
                 {
                     Tokens tokens(this_query_begin, all_queries_end);
-                    IParser::Pos token_iterator(tokens, context.getSettingsRef().max_parser_depth);
+                    IParser::Pos token_iterator(tokens, context->getSettingsRef().max_parser_depth);
                     while (token_iterator->type != TokenType::Semicolon && token_iterator.isValid())
                         ++token_iterator;
                     this_query_begin = token_iterator->end;
@@ -1101,7 +1133,7 @@ private:
             // beneficial so that we see proper trailing comments in "echo" and
             // server log.
             adjustQueryEnd(this_query_end, all_queries_end,
-                context.getSettingsRef().max_parser_depth);
+                context->getSettingsRef().max_parser_depth);
 
             // full_query is the query + inline INSERT data + trailing comments
             // (the latter is our best guess for now).
@@ -1141,7 +1173,7 @@ private:
             {
                 this_query_end = insert_ast->end;
                 adjustQueryEnd(this_query_end, all_queries_end,
-                    context.getSettingsRef().max_parser_depth);
+                    context->getSettingsRef().max_parser_depth);
             }
 
             // Now we know for sure where the query ends.
@@ -1255,6 +1287,29 @@ private:
         return true;
     }
 
+    // Prints changed settings to stderr. Useful for debugging fuzzing failures.
+    void printChangedSettings() const
+    {
+        const auto & changes = context->getSettingsRef().changes();
+        if (!changes.empty())
+        {
+            fmt::print(stderr, "Changed settings: ");
+            for (size_t i = 0; i < changes.size(); ++i)
+            {
+                if (i)
+                {
+                    fmt::print(stderr, ", ");
+                }
+                fmt::print(stderr, "{} = '{}'", changes[i].name,
+                           toString(changes[i].value));
+            }
+            fmt::print(stderr, "\n");
+        }
+        else
+        {
+            fmt::print(stderr, "No changed settings.\n");
+        }
+    }
 
     /// Returns false when server is not available.
     bool processWithFuzzing(const String & text)
@@ -1317,9 +1372,14 @@ private:
 
                 auto base_after_fuzz = fuzz_base->formatForErrorMessage();
 
-                // Debug AST cloning errors.
+                // Check that the source AST didn't change after fuzzing. This
+                // helps debug AST cloning errors, where the cloned AST doesn't
+                // clone all its children, and erroneously points to some source
+                // child elements.
                 if (base_before_fuzz != base_after_fuzz)
                 {
+                    printChangedSettings();
+
                     fmt::print(stderr,
                         "Base before fuzz: {}\n"
                         "Base after fuzz: {}\n",
@@ -1334,7 +1394,7 @@ private:
 
                     fmt::print(stderr, "IAST::clone() is broken for some AST node. This is a bug. The original AST ('dump before fuzz') and its cloned copy ('dump of cloned AST') refer to the same nodes, which must never happen. This means that their parent node doesn't implement clone() correctly.");
 
-                    assert(false);
+                    exit(1);
                 }
 
                 auto fuzzed_text = ast_to_process->formatForErrorMessage();
@@ -1378,29 +1438,76 @@ private:
 
                 // Print the changed settings because they might be needed to
                 // reproduce the error.
-                const auto & changes = context.getSettingsRef().changes();
-                if (!changes.empty())
-                {
-                    fmt::print(stderr, "Changed settings: ");
-                    for (size_t i = 0; i < changes.size(); ++i)
-                    {
-                        if (i)
-                        {
-                            fmt::print(stderr, ", ");
-                        }
-                        fmt::print(stderr, "{} = '{}'", changes[i].name,
-                            toString(changes[i].value));
-                    }
-                    fmt::print(stderr, "\n");
-                }
-                else
-                {
-                    fmt::print(stderr, "No changed settings.\n");
-                }
+                printChangedSettings();
 
                 return false;
             }
 
+            // Check that after the query is formatted, we can parse it back,
+            // format again and get the same result. Unfortunately, we can't
+            // compare the ASTs, which would be more sensitive to errors. This
+            // double formatting check doesn't catch all errors, e.g. we can
+            // format query incorrectly, but to a valid SQL that we can then
+            // parse and format into the same SQL.
+            // There are some complicated cases where we can generate the SQL
+            // which we can't parse:
+            // * first argument of lambda() replaced by fuzzer with
+            //   something else, leading to constructs such as
+            //   arrayMap((min(x) + 3) -> x + 1, ....)
+            // * internals of Enum replaced, leading to:
+            //   Enum(equals(someFunction(y), 3)).
+            // And there are even the cases when we can parse the query, but
+            // it's logically incorrect and its formatting is a mess, such as
+            // when `lambda()` function gets substituted into a wrong place.
+            // To avoid dealing with these cases, run the check only for the
+            // queries we were able to successfully execute.
+            // The final caveat is that sometimes WITH queries are not executed,
+            // if they are not referenced by the main SELECT, so they can still
+            // have the aforementioned problems. Disable this check for such
+            // queries, for lack of a better solution.
+            if (!have_error && queryHasWithClause(parsed_query.get()))
+            {
+                ASTPtr parsed_formatted_query;
+                try
+                {
+                    const auto * tmp_pos = query_to_send.c_str();
+                    parsed_formatted_query = parseQuery(tmp_pos,
+                        tmp_pos + query_to_send.size(),
+                        false /* allow_multi_statements */);
+                }
+                catch (Exception & e)
+                {
+                    if (e.code() != ErrorCodes::SYNTAX_ERROR)
+                    {
+                        throw;
+                    }
+                }
+
+                if (parsed_formatted_query)
+                {
+                    const auto formatted_twice
+                        = parsed_formatted_query->formatForErrorMessage();
+
+                    if (formatted_twice != query_to_send)
+                    {
+                        fmt::print(stderr, "The query formatting is broken.\n");
+
+                        printChangedSettings();
+
+                        fmt::print(stderr, "Got the following (different) text after formatting the fuzzed query and parsing it back:\n'{}'\n, expected:\n'{}'\n",
+                            formatted_twice, query_to_send);
+                        fmt::print(stderr, "In more detail:\n");
+                        fmt::print(stderr, "AST-1:\n'{}'\n", parsed_query->dumpTree());
+                        fmt::print(stderr, "Text-1 (AST-1 formatted):\n'{}'\n", query_to_send);
+                        fmt::print(stderr, "AST-2 (Text-1 parsed):\n'{}'\n", parsed_formatted_query->dumpTree());
+                        fmt::print(stderr, "Text-2 (AST-2 formatted):\n'{}'\n", formatted_twice);
+                        fmt::print(stderr, "Text-1 must be equal to Text-2, but it is not.\n");
+
+                        exit(1);
+                    }
+                }
+            }
+
             // The server is still alive so we're going to continue fuzzing.
             // Determine what we're going to use as the starting AST.
             if (have_error)
@@ -1483,11 +1590,11 @@ private:
         if (is_interactive)
         {
             // Generate a new query_id
-            context.setCurrentQueryId("");
+            context->setCurrentQueryId("");
             for (const auto & query_id_format : query_id_formats)
             {
                 writeString(query_id_format.first, std_out);
-                writeString(fmt::format(query_id_format.second, fmt::arg("query_id", context.getCurrentQueryId())), std_out);
+                writeString(fmt::format(query_id_format.second, fmt::arg("query_id", context->getCurrentQueryId())), std_out);
                 writeChar('\n', std_out);
                 std_out.next();
             }
@@ -1503,12 +1610,12 @@ private:
         {
             /// Temporarily apply query settings to context.
             std::optional<Settings> old_settings;
-            SCOPE_EXIT({ if (old_settings) context.setSettings(*old_settings); });
+            SCOPE_EXIT_SAFE({ if (old_settings) context->setSettings(*old_settings); });
             auto apply_query_settings = [&](const IAST & settings_ast)
             {
                 if (!old_settings)
-                    old_settings.emplace(context.getSettingsRef());
-                context.applySettingsChanges(settings_ast.as<ASTSetQuery>()->changes);
+                    old_settings.emplace(context->getSettingsRef());
+                context->applySettingsChanges(settings_ast.as<ASTSetQuery>()->changes);
             };
             const auto * insert = parsed_query->as<ASTInsertQuery>();
             if (insert && insert->settings_ast)
@@ -1546,7 +1653,7 @@ private:
                     if (change.name == "profile")
                         current_profile = change.value.safeGet<String>();
                     else
-                        context.applySettingChange(change);
+                        context->applySettingChange(change);
                 }
             }
 
@@ -1618,10 +1725,10 @@ private:
                 connection->sendQuery(
                     connection_parameters.timeouts,
                     query_to_send,
-                    context.getCurrentQueryId(),
+                    context->getCurrentQueryId(),
                     query_processing_stage,
-                    &context.getSettingsRef(),
-                    &context.getClientInfo(),
+                    &context->getSettingsRef(),
+                    &context->getClientInfo(),
                     true);
 
                 sendExternalTables();
@@ -1659,10 +1766,10 @@ private:
         connection->sendQuery(
             connection_parameters.timeouts,
             query_to_send,
-            context.getCurrentQueryId(),
+            context->getCurrentQueryId(),
             query_processing_stage,
-            &context.getSettingsRef(),
-            &context.getClientInfo(),
+            &context->getSettingsRef(),
+            &context->getClientInfo(),
             true);
 
         sendExternalTables();
@@ -1685,7 +1792,7 @@ private:
         ParserQuery parser(end);
         ASTPtr res;
 
-        const auto & settings = context.getSettingsRef();
+        const auto & settings = context->getSettingsRef();
         size_t max_length = 0;
         if (!allow_multi_statements)
             max_length = settings.max_query_size;
@@ -1773,7 +1880,7 @@ private:
                 current_format = insert->format;
         }
 
-        BlockInputStreamPtr block_input = context.getInputFormat(
+        BlockInputStreamPtr block_input = context->getInputFormat(
             current_format, buf, sample, insert_format_max_block_size);
 
         if (columns_description.hasDefaults())
@@ -2097,9 +2204,9 @@ private:
 
             /// It is not clear how to write progress with parallel formatting. It may increase code complexity significantly.
             if (!need_render_progress)
-                block_out_stream = context.getOutputStreamParallelIfPossible(current_format, *out_buf, block);
+                block_out_stream = context->getOutputStreamParallelIfPossible(current_format, *out_buf, block);
             else
-                block_out_stream = context.getOutputStream(current_format, *out_buf, block);
+                block_out_stream = context->getOutputStream(current_format, *out_buf, block);
 
             block_out_stream->writePrefix();
         }
@@ -2363,6 +2470,17 @@ private:
         std::cout << DBMS_NAME << " client version " << VERSION_STRING << VERSION_OFFICIAL << "." << std::endl;
     }
 
+    static void clearTerminal()
+    {
+        /// Clear from cursor until end of screen.
+        /// It is needed if garbage is left in terminal.
+        /// Show cursor. It can be left hidden by invocation of previous programs.
+        /// A test for this feature: perl -e 'print "x"x100000'; echo -ne '\033[0;0H\033[?25l'; clickhouse-client
+        std::cout <<
+            "\033[0J"
+            "\033[?25h";
+    }
+
 public:
     void init(int argc, char ** argv)
     {
@@ -2472,7 +2590,7 @@ public:
             /** If "--password [value]" is used but the value is omitted, the bad argument exception will be thrown.
               * implicit_value is used to avoid this exception (to allow user to type just "--password")
               * Since currently boost provides no way to check if a value has been set implicitly for an option,
-              * the "\n" is used to distinguish this case because there is hardly a chance an user would use "\n"
+              * the "\n" is used to distinguish this case because there is hardly a chance a user would use "\n"
               * as the password.
               */
             ("password", po::value<std::string>()->implicit_value("\n", ""), "password")
@@ -2592,12 +2710,12 @@ public:
             }
         }
 
-        context.makeGlobalContext();
-        context.setSettings(cmd_settings);
+        context->makeGlobalContext();
+        context->setSettings(cmd_settings);
 
         /// Copy settings-related program options to config.
         /// TODO: Is this code necessary?
-        for (const auto & setting : context.getSettingsRef().all())
+        for (const auto & setting : context->getSettingsRef().all())
         {
             const auto & name = setting.getName();
             if (options.count(name))
@@ -2689,7 +2807,7 @@ public:
         {
             std::string traceparent = options["opentelemetry-traceparent"].as<std::string>();
             std::string error;
-            if (!context.getClientInfo().client_trace_context.parseTraceparentHeader(
+            if (!context->getClientInfo().client_trace_context.parseTraceparentHeader(
                 traceparent, error))
             {
                 throw Exception(ErrorCodes::BAD_ARGUMENTS,
@@ -2700,7 +2818,7 @@ public:
 
         if (options.count("opentelemetry-tracestate"))
         {
-            context.getClientInfo().client_trace_context.tracestate =
+            context->getClientInfo().client_trace_context.tracestate =
                 options["opentelemetry-tracestate"].as<std::string>();
         }
 
diff --git a/programs/client/ConnectionParameters.cpp b/programs/client/ConnectionParameters.cpp
index 19734dd5ffa..6faf43759df 100644
--- a/programs/client/ConnectionParameters.cpp
+++ b/programs/client/ConnectionParameters.cpp
@@ -7,6 +7,8 @@
 #include <IO/ConnectionTimeouts.h>
 #include <Poco/Util/AbstractConfiguration.h>
 #include <Common/Exception.h>
+#include <Common/isLocalAddress.h>
+#include <Common/DNSResolver.h>
 #include <common/setTerminalEcho.h>
 #include <ext/scope_guard.h>
 
@@ -60,7 +62,9 @@ ConnectionParameters::ConnectionParameters(const Poco::Util::AbstractConfigurati
 #endif
     }
 
-    compression = config.getBool("compression", true) ? Protocol::Compression::Enable : Protocol::Compression::Disable;
+    /// By default compression is disabled if address looks like localhost.
+    compression = config.getBool("compression", !isLocalAddress(DNSResolver::instance().resolveHost(host)))
+        ? Protocol::Compression::Enable : Protocol::Compression::Disable;
 
     timeouts = ConnectionTimeouts(
         Poco::Timespan(config.getInt("connect_timeout", DBMS_DEFAULT_CONNECT_TIMEOUT_SEC), 0),
diff --git a/programs/client/QueryFuzzer.cpp b/programs/client/QueryFuzzer.cpp
index 8d8d8daaf39..6243e2c82ec 100644
--- a/programs/client/QueryFuzzer.cpp
+++ b/programs/client/QueryFuzzer.cpp
@@ -37,34 +37,33 @@ namespace ErrorCodes
 
 Field QueryFuzzer::getRandomField(int type)
 {
+    static constexpr Int64 bad_int64_values[]
+        = {-2, -1, 0, 1, 2, 3, 7, 10, 100, 255, 256, 257, 1023, 1024,
+           1025, 65535, 65536, 65537, 1024 * 1024 - 1, 1024 * 1024,
+           1024 * 1024 + 1, INT_MIN - 1ll, INT_MIN, INT_MIN + 1,
+           INT_MAX - 1, INT_MAX, INT_MAX + 1ll, INT64_MIN, INT64_MIN + 1,
+           INT64_MAX - 1, INT64_MAX};
     switch (type)
     {
     case 0:
     {
-        static constexpr Int64 values[]
-                = {-2, -1, 0, 1, 2, 3, 7, 10, 100, 255, 256, 257, 1023, 1024,
-                   1025, 65535, 65536, 65537, 1024 * 1024 - 1, 1024 * 1024,
-                   1024 * 1024 + 1, INT64_MIN, INT64_MAX};
-        return values[fuzz_rand() % (sizeof(values) / sizeof(*values))];
+        return bad_int64_values[fuzz_rand() % (sizeof(bad_int64_values)
+                / sizeof(*bad_int64_values))];
     }
     case 1:
     {
         static constexpr float values[]
-                = {NAN, INFINITY, -INFINITY, 0., 0.0001, 0.5, 0.9999,
-                   1., 1.0001, 2., 10.0001, 100.0001, 1000.0001};
-        return values[fuzz_rand() % (sizeof(values) / sizeof(*values))];
+                = {NAN, INFINITY, -INFINITY, 0., -0., 0.0001, 0.5, 0.9999,
+                   1., 1.0001, 2., 10.0001, 100.0001, 1000.0001, 1e10, 1e20,
+                  FLT_MIN, FLT_MIN + FLT_EPSILON, FLT_MAX, FLT_MAX + FLT_EPSILON}; return values[fuzz_rand() % (sizeof(values) / sizeof(*values))];
     }
     case 2:
     {
-        static constexpr Int64 values[]
-                = {-2, -1, 0, 1, 2, 3, 7, 10, 100, 255, 256, 257, 1023, 1024,
-                   1025, 65535, 65536, 65537, 1024 * 1024 - 1, 1024 * 1024,
-                   1024 * 1024 + 1, INT64_MIN, INT64_MAX};
         static constexpr UInt64 scales[] = {0, 1, 2, 10};
         return DecimalField<Decimal64>(
-                    values[fuzz_rand() % (sizeof(values) / sizeof(*values))],
-                scales[fuzz_rand() % (sizeof(scales) / sizeof(*scales))]
-                );
+            bad_int64_values[fuzz_rand() % (sizeof(bad_int64_values)
+                / sizeof(*bad_int64_values))],
+            scales[fuzz_rand() % (sizeof(scales) / sizeof(*scales))]);
     }
     default:
         assert(false);
@@ -570,6 +569,15 @@ void QueryFuzzer::addColumnLike(const ASTPtr ast)
     }
 
     const auto name = ast->formatForErrorMessage();
+    if (name == "Null")
+    {
+        // The `Null` identifier from FORMAT Null clause. We don't quote it
+        // properly when formatting the AST, and while the resulting query
+        // technically works, it has non-standard case for Null (the standard
+        // is NULL), so it breaks the query formatting idempotence check.
+        // Just plug this particular case for now.
+        return;
+    }
     if (name.size() < 200)
     {
         column_like_map.insert({name, ast});
diff --git a/programs/client/Suggest.cpp b/programs/client/Suggest.cpp
index dfa7048349e..8d4c0fdbd5a 100644
--- a/programs/client/Suggest.cpp
+++ b/programs/client/Suggest.cpp
@@ -108,14 +108,6 @@ void Suggest::loadImpl(Connection & connection, const ConnectionTimeouts & timeo
         " UNION ALL "
         "SELECT cluster FROM system.clusters"
         " UNION ALL "
-        "SELECT name FROM system.errors"
-        " UNION ALL "
-        "SELECT event FROM system.events"
-        " UNION ALL "
-        "SELECT metric FROM system.asynchronous_metrics"
-        " UNION ALL "
-        "SELECT metric FROM system.metrics"
-        " UNION ALL "
         "SELECT macro FROM system.macros"
         " UNION ALL "
         "SELECT policy_name FROM system.storage_policies"
@@ -139,17 +131,12 @@ void Suggest::loadImpl(Connection & connection, const ConnectionTimeouts & timeo
 
     query << ") WHERE notEmpty(res)";
 
-    Settings settings;
-    /// To show all rows from:
-    /// - system.errors
-    /// - system.events
-    settings.system_events_show_zero_values = true;
-    fetch(connection, timeouts, query.str(), settings);
+    fetch(connection, timeouts, query.str());
 }
 
-void Suggest::fetch(Connection & connection, const ConnectionTimeouts & timeouts, const std::string & query, Settings & settings)
+void Suggest::fetch(Connection & connection, const ConnectionTimeouts & timeouts, const std::string & query)
 {
-    connection.sendQuery(timeouts, query, "" /* query_id */, QueryProcessingStage::Complete, &settings);
+    connection.sendQuery(timeouts, query, "" /* query_id */, QueryProcessingStage::Complete);
 
     while (true)
     {
diff --git a/programs/client/Suggest.h b/programs/client/Suggest.h
index 0049bc08ebf..03332088cbe 100644
--- a/programs/client/Suggest.h
+++ b/programs/client/Suggest.h
@@ -33,7 +33,7 @@ public:
 private:
 
     void loadImpl(Connection & connection, const ConnectionTimeouts & timeouts, size_t suggestion_limit);
-    void fetch(Connection & connection, const ConnectionTimeouts & timeouts, const std::string & query, Settings & settings);
+    void fetch(Connection & connection, const ConnectionTimeouts & timeouts, const std::string & query);
     void fillWordsFromBlock(const Block & block);
 
     /// Words are fetched asynchronously.
diff --git a/programs/config_tools.h.in b/programs/config_tools.h.in
index 7cb5a6d883a..abe9ef8c562 100644
--- a/programs/config_tools.h.in
+++ b/programs/config_tools.h.in
@@ -15,3 +15,4 @@
 #cmakedefine01 ENABLE_CLICKHOUSE_GIT_IMPORT
 #cmakedefine01 ENABLE_CLICKHOUSE_INSTALL
 #cmakedefine01 ENABLE_CLICKHOUSE_ODBC_BRIDGE
+#cmakedefine01 ENABLE_CLICKHOUSE_LIBRARY_BRIDGE
diff --git a/programs/copier/ClusterCopier.cpp b/programs/copier/ClusterCopier.cpp
index 7eea23160b2..aa9b359993e 100644
--- a/programs/copier/ClusterCopier.cpp
+++ b/programs/copier/ClusterCopier.cpp
@@ -22,7 +22,7 @@ namespace ErrorCodes
 
 void ClusterCopier::init()
 {
-    auto zookeeper = context.getZooKeeper();
+    auto zookeeper = getContext()->getZooKeeper();
 
     task_description_watch_callback = [this] (const Coordination::WatchResponse & response)
     {
@@ -39,14 +39,14 @@ void ClusterCopier::init()
     task_cluster_initial_config = task_cluster_current_config;
 
     task_cluster->loadTasks(*task_cluster_initial_config);
-    context.setClustersConfig(task_cluster_initial_config, task_cluster->clusters_prefix);
+    getContext()->setClustersConfig(task_cluster_initial_config, task_cluster->clusters_prefix);
 
     /// Set up shards and their priority
     task_cluster->random_engine.seed(task_cluster->random_device());
     for (auto & task_table : task_cluster->table_tasks)
     {
-        task_table.cluster_pull = context.getCluster(task_table.cluster_pull_name);
-        task_table.cluster_push = context.getCluster(task_table.cluster_push_name);
+        task_table.cluster_pull = getContext()->getCluster(task_table.cluster_pull_name);
+        task_table.cluster_push = getContext()->getCluster(task_table.cluster_push_name);
         task_table.initShards(task_cluster->random_engine);
     }
 
@@ -106,7 +106,7 @@ void ClusterCopier::discoverShardPartitions(const ConnectionTimeouts & timeouts,
 
         try
         {
-            type->deserializeAsTextQuoted(*column_dummy, rb, FormatSettings());
+            type->getDefaultSerialization()->deserializeTextQuoted(*column_dummy, rb, FormatSettings());
         }
         catch (Exception & e)
         {
@@ -206,7 +206,7 @@ void ClusterCopier::uploadTaskDescription(const std::string & task_path, const s
     if (task_config_str.empty())
         return;
 
-    auto zookeeper = context.getZooKeeper();
+    auto zookeeper = getContext()->getZooKeeper();
 
     zookeeper->createAncestors(local_task_description_path);
     auto code = zookeeper->tryCreate(local_task_description_path, task_config_str, zkutil::CreateMode::Persistent);
@@ -219,7 +219,7 @@ void ClusterCopier::uploadTaskDescription(const std::string & task_path, const s
 
 void ClusterCopier::reloadTaskDescription()
 {
-    auto zookeeper = context.getZooKeeper();
+    auto zookeeper = getContext()->getZooKeeper();
     task_description_watch_zookeeper = zookeeper;
 
     String task_config_str;
@@ -235,7 +235,7 @@ void ClusterCopier::reloadTaskDescription()
 
     /// Setup settings
     task_cluster->reloadSettings(*config);
-    context.setSettings(task_cluster->settings_common);
+    getContext()->setSettings(task_cluster->settings_common);
 
     task_cluster_current_config = config;
     task_description_current_stat = stat;
@@ -440,7 +440,7 @@ bool ClusterCopier::checkPartitionPieceIsDone(const TaskTable & task_table, cons
 {
     LOG_DEBUG(log, "Check that all shards processed partition {} piece {} successfully", partition_name, piece_number);
 
-    auto zookeeper = context.getZooKeeper();
+    auto zookeeper = getContext()->getZooKeeper();
 
     /// Collect all shards that contain partition piece number piece_number.
     Strings piece_status_paths;
@@ -532,7 +532,7 @@ TaskStatus ClusterCopier::tryMoveAllPiecesToDestinationTable(const TaskTable & t
 
     LOG_DEBUG(log, "Try to move {} to destination table", partition_name);
 
-    auto zookeeper = context.getZooKeeper();
+    auto zookeeper = getContext()->getZooKeeper();
 
     const auto current_partition_attach_is_active = task_table.getPartitionAttachIsActivePath(partition_name);
     const auto current_partition_attach_is_done   = task_table.getPartitionAttachIsDonePath(partition_name);
@@ -599,11 +599,13 @@ TaskStatus ClusterCopier::tryMoveAllPiecesToDestinationTable(const TaskTable & t
                                                                   toString(current_piece_number));
 
         Settings settings_push = task_cluster->settings_push;
-
-        /// It is important, ALTER ATTACH PARTITION must be done synchronously
-        /// And we will execute this ALTER query on each replica of a shard.
-        /// It is correct, because this query is idempotent.
-        settings_push.replication_alter_partitions_sync = 2;
+        ClusterExecutionMode execution_mode = ClusterExecutionMode::ON_EACH_NODE;
+        UInt64 max_successful_executions_per_shard = 0;
+        if (settings_push.replication_alter_partitions_sync == 1)
+        {
+            execution_mode = ClusterExecutionMode::ON_EACH_SHARD;
+            max_successful_executions_per_shard = 1;
+        }
 
         query_alter_ast_string += " ALTER TABLE " + getQuotedTable(original_table) +
                                   ((partition_name == "'all'") ? " ATTACH PARTITION ID " : " ATTACH PARTITION ") + partition_name +
@@ -613,14 +615,33 @@ TaskStatus ClusterCopier::tryMoveAllPiecesToDestinationTable(const TaskTable & t
 
         try
         {
-            size_t num_nodes = executeQueryOnCluster(
-                    task_table.cluster_push,
-                    query_alter_ast_string,
-                    settings_push,
-                    PoolMode::GET_MANY,
-                    ClusterExecutionMode::ON_EACH_NODE);
+            /// Try attach partition on each shard
+            UInt64 num_nodes = executeQueryOnCluster(
+                task_table.cluster_push,
+                query_alter_ast_string,
+                task_cluster->settings_push,
+                PoolMode::GET_MANY,
+                execution_mode,
+                max_successful_executions_per_shard);
 
-            LOG_INFO(log, "Number of nodes that executed ALTER query successfully : {}", toString(num_nodes));
+            if (settings_push.replication_alter_partitions_sync == 1)
+            {
+                LOG_INFO(
+                    log,
+                    "Destination tables {} have been executed alter query successfully on {} shards of {}",
+                    getQuotedTable(task_table.table_push),
+                    num_nodes,
+                    task_table.cluster_push->getShardCount());
+
+                if (num_nodes != task_table.cluster_push->getShardCount())
+                {
+                    return TaskStatus::Error;
+                }
+            }
+            else
+            {
+                LOG_INFO(log, "Number of nodes that executed ALTER query successfully : {}", toString(num_nodes));
+            }
         }
         catch (...)
         {
@@ -856,6 +877,16 @@ bool ClusterCopier::tryDropPartitionPiece(
 
 bool ClusterCopier::tryProcessTable(const ConnectionTimeouts & timeouts, TaskTable & task_table)
 {
+    /// Create destination table
+    TaskStatus task_status = TaskStatus::Error;
+
+    task_status = tryCreateDestinationTable(timeouts, task_table);
+    /// Exit if success
+    if (task_status != TaskStatus::Finished)
+    {
+        LOG_WARNING(log, "Create destination Tale Failed ");
+        return false;
+    }
     /// An heuristic: if previous shard is already done, then check next one without sleeps due to max_workers constraint
     bool previous_shard_is_instantly_finished = false;
 
@@ -932,7 +963,7 @@ bool ClusterCopier::tryProcessTable(const ConnectionTimeouts & timeouts, TaskTab
 
             /// Do not sleep if there is a sequence of already processed shards to increase startup
             bool is_unprioritized_task = !previous_shard_is_instantly_finished && shard->priority.is_remote;
-            TaskStatus task_status = TaskStatus::Error;
+            task_status = TaskStatus::Error;
             bool was_error = false;
             has_shard_to_process = true;
             for (UInt64 try_num = 0; try_num < max_shard_partition_tries; ++try_num)
@@ -1050,6 +1081,44 @@ bool ClusterCopier::tryProcessTable(const ConnectionTimeouts & timeouts, TaskTab
     return table_is_done;
 }
 
+TaskStatus ClusterCopier::tryCreateDestinationTable(const ConnectionTimeouts & timeouts, TaskTable & task_table)
+{
+    /// Try create original table (if not exists) on each shard
+
+    //TaskTable & task_table = task_shard.task_table;
+    const TaskShardPtr task_shard = task_table.all_shards.at(0);
+    /// We need to update table definitions for each part, it could be changed after ALTER
+    task_shard->current_pull_table_create_query = getCreateTableForPullShard(timeouts, *task_shard);
+    try
+    {
+        auto create_query_push_ast
+            = rewriteCreateQueryStorage(task_shard->current_pull_table_create_query, task_table.table_push, task_table.engine_push_ast);
+        auto & create = create_query_push_ast->as<ASTCreateQuery &>();
+        create.if_not_exists = true;
+        InterpreterCreateQuery::prepareOnClusterQuery(create, getContext(), task_table.cluster_push_name);
+        String query = queryToString(create_query_push_ast);
+
+        LOG_DEBUG(log, "Create destination tables. Query: {}", query);
+        UInt64 shards = executeQueryOnCluster(task_table.cluster_push, query, task_cluster->settings_push, PoolMode::GET_MANY);
+        LOG_INFO(
+            log,
+            "Destination tables {} have been created on {} shards of {}",
+            getQuotedTable(task_table.table_push),
+            shards,
+            task_table.cluster_push->getShardCount());
+        if (shards != task_table.cluster_push->getShardCount())
+        {
+            return TaskStatus::Error;
+        }
+    }
+    catch (...)
+    {
+        tryLogCurrentException(log, "Error while creating original table. Maybe we are not first.");
+    }
+
+    return TaskStatus::Finished;
+}
+
 /// Job for copying partition from particular shard.
 TaskStatus ClusterCopier::tryProcessPartitionTask(const ConnectionTimeouts & timeouts, ShardPartition & task_partition, bool is_unprioritized_task)
 {
@@ -1142,7 +1211,7 @@ TaskStatus ClusterCopier::processPartitionPieceTaskImpl(
 
     auto split_table_for_current_piece = task_shard.list_of_split_tables_on_shard[current_piece_number];
 
-    auto zookeeper = context.getZooKeeper();
+    auto zookeeper = getContext()->getZooKeeper();
 
     const String piece_is_dirty_flag_path          = partition_piece.getPartitionPieceIsDirtyPath();
     const String piece_is_dirty_cleaned_path       = partition_piece.getPartitionPieceIsCleanedPath();
@@ -1193,7 +1262,7 @@ TaskStatus ClusterCopier::processPartitionPieceTaskImpl(
 
         ParserQuery p_query(query.data() + query.size());
 
-        const auto & settings = context.getSettingsRef();
+        const auto & settings = getContext()->getSettingsRef();
         return parseQuery(p_query, query, settings.max_query_size, settings.max_parser_depth);
     };
 
@@ -1297,10 +1366,10 @@ TaskStatus ClusterCopier::processPartitionPieceTaskImpl(
         ASTPtr query_select_ast = get_select_query(split_table_for_current_piece, "count()", /*enable_splitting*/ true);
         UInt64 count;
         {
-            Context local_context = context;
+            auto local_context = Context::createCopy(context);
             // Use pull (i.e. readonly) settings, but fetch data from destination servers
-            local_context.setSettings(task_cluster->settings_pull);
-            local_context.setSetting("skip_unavailable_shards", true);
+            local_context->setSettings(task_cluster->settings_pull);
+            local_context->setSetting("skip_unavailable_shards", true);
 
             Block block = getBlockWithAllStreamData(InterpreterFactory::get(query_select_ast, local_context)->execute().getInputStream());
             count = (block) ? block.safeGetByPosition(0).column->getUInt(0) : 0;
@@ -1366,8 +1435,17 @@ TaskStatus ClusterCopier::processPartitionPieceTaskImpl(
 
         LOG_DEBUG(log, "Create destination tables. Query: {}", query);
         UInt64 shards = executeQueryOnCluster(task_table.cluster_push, query, task_cluster->settings_push, PoolMode::GET_MANY);
-        LOG_DEBUG(log, "Destination tables {} have been created on {} shards of {}",
-            getQuotedTable(task_table.table_push), shards, task_table.cluster_push->getShardCount());
+        LOG_INFO(
+            log,
+            "Destination tables {} have been created on {} shards of {}",
+            getQuotedTable(task_table.table_push),
+            shards,
+            task_table.cluster_push->getShardCount());
+
+        if (shards != task_table.cluster_push->getShardCount())
+        {
+            return TaskStatus::Error;
+        }
     }
 
     /// Do the copying
@@ -1390,7 +1468,7 @@ TaskStatus ClusterCopier::processPartitionPieceTaskImpl(
             query += "INSERT INTO " + getQuotedTable(split_table_for_current_piece) + " VALUES ";
 
             ParserQuery p_query(query.data() + query.size());
-            const auto & settings = context.getSettingsRef();
+            const auto & settings = getContext()->getSettingsRef();
             query_insert_ast = parseQuery(p_query, query, settings.max_query_size, settings.max_parser_depth);
 
             LOG_DEBUG(log, "Executing INSERT query: {}", query);
@@ -1398,18 +1476,18 @@ TaskStatus ClusterCopier::processPartitionPieceTaskImpl(
 
         try
         {
-            std::unique_ptr<Context> context_select = std::make_unique<Context>(context);
+            auto context_select = Context::createCopy(context);
             context_select->setSettings(task_cluster->settings_pull);
 
-            std::unique_ptr<Context> context_insert = std::make_unique<Context>(context);
+            auto context_insert = Context::createCopy(context);
             context_insert->setSettings(task_cluster->settings_push);
 
             /// Custom INSERT SELECT implementation
             BlockInputStreamPtr input;
             BlockOutputStreamPtr output;
             {
-                BlockIO io_select = InterpreterFactory::get(query_select_ast, *context_select)->execute();
-                BlockIO io_insert = InterpreterFactory::get(query_insert_ast, *context_insert)->execute();
+                BlockIO io_select = InterpreterFactory::get(query_select_ast, context_select)->execute();
+                BlockIO io_insert = InterpreterFactory::get(query_insert_ast, context_insert)->execute();
 
                 input = io_select.getInputStream();
                 output = io_insert.out;
@@ -1477,26 +1555,6 @@ TaskStatus ClusterCopier::processPartitionPieceTaskImpl(
 
     LOG_INFO(log, "Partition {} piece {} copied. But not moved to original destination table.", task_partition.name, toString(current_piece_number));
 
-
-    /// Try create original table (if not exists) on each shard
-    try
-    {
-        auto create_query_push_ast = rewriteCreateQueryStorage(task_shard.current_pull_table_create_query,
-                                                               task_table.table_push, task_table.engine_push_ast);
-        auto & create = create_query_push_ast->as<ASTCreateQuery &>();
-        create.if_not_exists = true;
-        InterpreterCreateQuery::prepareOnClusterQuery(create, context, task_table.cluster_push_name);
-        String query = queryToString(create_query_push_ast);
-
-        LOG_DEBUG(log, "Create destination tables. Query: {}", query);
-        UInt64 shards = executeQueryOnCluster(task_table.cluster_push, query, task_cluster->settings_push, PoolMode::GET_MANY);
-        LOG_DEBUG(log, "Destination tables {} have been created on {} shards of {}", getQuotedTable(task_table.table_push), shards, task_table.cluster_push->getShardCount());
-    }
-    catch (...)
-    {
-        tryLogCurrentException(log, "Error while creating original table. Maybe we are not first.");
-    }
-
     /// Finalize the processing, change state of current partition task (and also check is_dirty flag)
     {
         String state_finished = TaskStateWithOwner::getData(TaskState::Finished, host_id);
@@ -1523,7 +1581,7 @@ void ClusterCopier::dropAndCreateLocalTable(const ASTPtr & create_ast)
     const auto & create = create_ast->as<ASTCreateQuery &>();
     dropLocalTableIfExists({create.database, create.table});
 
-    InterpreterCreateQuery interpreter(create_ast, context);
+    InterpreterCreateQuery interpreter(create_ast, getContext());
     interpreter.execute();
 }
 
@@ -1534,37 +1592,40 @@ void ClusterCopier::dropLocalTableIfExists(const DatabaseAndTableName & table_na
     drop_ast->database = table_name.first;
     drop_ast->table = table_name.second;
 
-    InterpreterDropQuery interpreter(drop_ast, context);
+    InterpreterDropQuery interpreter(drop_ast, getContext());
     interpreter.execute();
 }
 
+void ClusterCopier::dropHelpingTablesByPieceNumber(const TaskTable & task_table, size_t current_piece_number)
+{
+    LOG_DEBUG(log, "Removing helping tables piece {}", current_piece_number);
+
+    DatabaseAndTableName original_table = task_table.table_push;
+    DatabaseAndTableName helping_table
+        = DatabaseAndTableName(original_table.first, original_table.second + "_piece_" + toString(current_piece_number));
+
+    String query = "DROP TABLE IF EXISTS " + getQuotedTable(helping_table);
+
+    const ClusterPtr & cluster_push = task_table.cluster_push;
+    Settings settings_push = task_cluster->settings_push;
+
+    LOG_DEBUG(log, "Execute distributed DROP TABLE: {}", query);
+
+    /// We have to drop partition_piece on each replica
+    UInt64 num_nodes = executeQueryOnCluster(cluster_push, query, settings_push, PoolMode::GET_MANY, ClusterExecutionMode::ON_EACH_NODE);
+
+    LOG_INFO(log, "DROP TABLE query was successfully executed on {} nodes.", toString(num_nodes));
+}
 
 void ClusterCopier::dropHelpingTables(const TaskTable & task_table)
 {
     LOG_DEBUG(log, "Removing helping tables");
     for (size_t current_piece_number = 0; current_piece_number < task_table.number_of_splits; ++current_piece_number)
     {
-        DatabaseAndTableName original_table = task_table.table_push;
-        DatabaseAndTableName helping_table = DatabaseAndTableName(original_table.first, original_table.second + "_piece_" + toString(current_piece_number));
-
-        String query = "DROP TABLE IF EXISTS " + getQuotedTable(helping_table);
-
-        const ClusterPtr & cluster_push = task_table.cluster_push;
-        Settings settings_push = task_cluster->settings_push;
-
-        LOG_DEBUG(log, "Execute distributed DROP TABLE: {}", query);
-        /// We have to drop partition_piece on each replica
-        UInt64 num_nodes = executeQueryOnCluster(
-                cluster_push, query,
-                settings_push,
-                PoolMode::GET_MANY,
-                ClusterExecutionMode::ON_EACH_NODE);
-
-        LOG_DEBUG(log, "DROP TABLE query was successfully executed on {} nodes.", toString(num_nodes));
+        dropHelpingTablesByPieceNumber(task_table, current_piece_number);
     }
 }
 
-
 void ClusterCopier::dropParticularPartitionPieceFromAllHelpingTables(const TaskTable & task_table, const String & partition_name)
 {
     LOG_DEBUG(log, "Try drop partition partition from all helping tables.");
@@ -1586,15 +1647,15 @@ void ClusterCopier::dropParticularPartitionPieceFromAllHelpingTables(const TaskT
                 PoolMode::GET_MANY,
                 ClusterExecutionMode::ON_EACH_NODE);
 
-        LOG_DEBUG(log, "DROP PARTITION query was successfully executed on {} nodes.", toString(num_nodes));
+        LOG_INFO(log, "DROP PARTITION query was successfully executed on {} nodes.", toString(num_nodes));
     }
     LOG_DEBUG(log, "All helping tables dropped partition {}", partition_name);
 }
 
 String ClusterCopier::getRemoteCreateTable(const DatabaseAndTableName & table, Connection & connection, const Settings & settings)
 {
-    Context remote_context(context);
-    remote_context.setSettings(settings);
+    auto remote_context = Context::createCopy(context);
+    remote_context->setSettings(settings);
 
     String query = "SHOW CREATE TABLE " + getQuotedTable(table);
     Block block = getBlockWithAllStreamData(std::make_shared<RemoteBlockInputStream>(
@@ -1613,7 +1674,7 @@ ASTPtr ClusterCopier::getCreateTableForPullShard(const ConnectionTimeouts & time
             task_cluster->settings_pull);
 
     ParserCreateQuery parser_create_query;
-    const auto & settings = context.getSettingsRef();
+    const auto & settings = getContext()->getSettingsRef();
     return parseQuery(parser_create_query, create_query_pull_str, settings.max_query_size, settings.max_parser_depth);
 }
 
@@ -1642,7 +1703,7 @@ void ClusterCopier::createShardInternalTables(const ConnectionTimeouts & timeout
     /// Create special cluster with single shard
     String shard_read_cluster_name = read_shard_prefix + task_table.cluster_pull_name;
     ClusterPtr cluster_pull_current_shard = task_table.cluster_pull->getClusterWithSingleShard(task_shard.indexInCluster());
-    context.setCluster(shard_read_cluster_name, cluster_pull_current_shard);
+    getContext()->setCluster(shard_read_cluster_name, cluster_pull_current_shard);
 
     auto storage_shard_ast = createASTStorageDistributed(shard_read_cluster_name, task_table.table_pull.first, task_table.table_pull.second);
 
@@ -1702,13 +1763,13 @@ std::set<String> ClusterCopier::getShardPartitions(const ConnectionTimeouts & ti
     }
 
     ParserQuery parser_query(query.data() + query.size());
-    const auto & settings = context.getSettingsRef();
+    const auto & settings = getContext()->getSettingsRef();
     ASTPtr query_ast = parseQuery(parser_query, query, settings.max_query_size, settings.max_parser_depth);
 
     LOG_DEBUG(log, "Computing destination partition set, executing query: {}", query);
 
-    Context local_context = context;
-    local_context.setSettings(task_cluster->settings_pull);
+    auto local_context = Context::createCopy(context);
+    local_context->setSettings(task_cluster->settings_pull);
     Block block = getBlockWithAllStreamData(InterpreterFactory::get(query_ast, local_context)->execute().getInputStream());
 
     if (block)
@@ -1719,7 +1780,7 @@ std::set<String> ClusterCopier::getShardPartitions(const ConnectionTimeouts & ti
         for (size_t i = 0; i < column.column->size(); ++i)
         {
             WriteBufferFromOwnString wb;
-            column.type->serializeAsTextQuoted(*column.column, i, wb, FormatSettings());
+            column.type->getDefaultSerialization()->serializeTextQuoted(*column.column, i, wb, FormatSettings());
             res.emplace(wb.str());
         }
     }
@@ -1748,11 +1809,11 @@ bool ClusterCopier::checkShardHasPartition(const ConnectionTimeouts & timeouts,
     LOG_DEBUG(log, "Checking shard {} for partition {} existence, executing query: {}", task_shard.getDescription(), partition_quoted_name, query);
 
     ParserQuery parser_query(query.data() + query.size());
-const auto & settings = context.getSettingsRef();
+    const auto & settings = getContext()->getSettingsRef();
     ASTPtr query_ast = parseQuery(parser_query, query, settings.max_query_size, settings.max_parser_depth);
 
-    Context local_context = context;
-    local_context.setSettings(task_cluster->settings_pull);
+    auto local_context = Context::createCopy(context);
+    local_context->setSettings(task_cluster->settings_pull);
     return InterpreterFactory::get(query_ast, local_context)->execute().getInputStream()->read().rows() != 0;
 }
 
@@ -1787,11 +1848,11 @@ bool ClusterCopier::checkPresentPartitionPiecesOnCurrentShard(const ConnectionTi
     LOG_DEBUG(log, "Checking shard {} for partition {} piece {} existence, executing query: {}", task_shard.getDescription(), partition_quoted_name, std::to_string(current_piece_number), query);
 
     ParserQuery parser_query(query.data() + query.size());
-    const auto & settings = context.getSettingsRef();
+    const auto & settings = getContext()->getSettingsRef();
     ASTPtr query_ast = parseQuery(parser_query, query, settings.max_query_size, settings.max_parser_depth);
 
-    Context local_context = context;
-    local_context.setSettings(task_cluster->settings_pull);
+    auto local_context = Context::createCopy(context);
+    local_context->setSettings(task_cluster->settings_pull);
     auto result = InterpreterFactory::get(query_ast, local_context)->execute().getInputStream()->read().rows();
     if (result != 0)
         LOG_DEBUG(log, "Partition {} piece number {} is PRESENT on shard {}", partition_quoted_name, std::to_string(current_piece_number), task_shard.getDescription());
@@ -1847,7 +1908,7 @@ UInt64 ClusterCopier::executeQueryOnCluster(
         /// In that case we don't have local replicas, but do it just in case
         for (UInt64 i = 0; i < num_local_replicas; ++i)
         {
-            auto interpreter = InterpreterFactory::get(query_ast, context);
+            auto interpreter = InterpreterFactory::get(query_ast, getContext());
             interpreter->execute();
 
             if (increment_and_check_exit())
@@ -1862,8 +1923,8 @@ UInt64 ClusterCopier::executeQueryOnCluster(
             auto timeouts = ConnectionTimeouts::getTCPTimeoutsWithFailover(shard_settings).getSaturated(shard_settings.max_execution_time);
             auto connections = shard.pool->getMany(timeouts, &shard_settings, pool_mode);
 
-            Context shard_context(context);
-            shard_context.setSettings(shard_settings);
+            auto shard_context = Context::createCopy(context);
+            shard_context->setSettings(shard_settings);
 
             for (auto & connection : connections)
             {
diff --git a/programs/copier/ClusterCopier.h b/programs/copier/ClusterCopier.h
index 9aff5493cf8..e875ca7df2e 100644
--- a/programs/copier/ClusterCopier.h
+++ b/programs/copier/ClusterCopier.h
@@ -12,18 +12,17 @@
 namespace DB
 {
 
-class ClusterCopier
+class ClusterCopier : WithContext
 {
 public:
     ClusterCopier(const String & task_path_,
                   const String & host_id_,
                   const String & proxy_database_name_,
-                  Context & context_)
-            :
+                  ContextPtr context_)
+            : WithContext(context_),
             task_zookeeper_path(task_path_),
             host_id(host_id_),
             working_database_name(proxy_database_name_),
-            context(context_),
             log(&Poco::Logger::get("ClusterCopier")) {}
 
     void init();
@@ -36,7 +35,7 @@ public:
     /// Compute set of partitions, assume set of partitions aren't changed during the processing
     void discoverTablePartitions(const ConnectionTimeouts & timeouts, TaskTable & task_table, UInt64 num_threads = 0);
 
-    void uploadTaskDescription(const std::string & task_path, const std::string & task_file, const bool force);
+    void uploadTaskDescription(const std::string & task_path, const std::string & task_file, bool force);
 
     void reloadTaskDescription();
 
@@ -120,15 +119,16 @@ protected:
     /// Removes MATERIALIZED and ALIAS columns from create table query
     static ASTPtr removeAliasColumnsFromCreateQuery(const ASTPtr & query_ast);
 
-    bool tryDropPartitionPiece(ShardPartition & task_partition, const size_t current_piece_number,
+    bool tryDropPartitionPiece(ShardPartition & task_partition, size_t current_piece_number,
             const zkutil::ZooKeeperPtr & zookeeper, const CleanStateClock & clean_state_clock);
 
-    static constexpr UInt64 max_table_tries = 1000;
-    static constexpr UInt64 max_shard_partition_tries = 600;
-    static constexpr UInt64 max_shard_partition_piece_tries_for_alter = 100;
+    static constexpr UInt64 max_table_tries = 3;
+    static constexpr UInt64 max_shard_partition_tries = 3;
+    static constexpr UInt64 max_shard_partition_piece_tries_for_alter = 3;
 
     bool tryProcessTable(const ConnectionTimeouts & timeouts, TaskTable & task_table);
 
+    TaskStatus tryCreateDestinationTable(const ConnectionTimeouts & timeouts, TaskTable & task_table);
     /// Job for copying partition from particular shard.
     TaskStatus tryProcessPartitionTask(const ConnectionTimeouts & timeouts,
                                        ShardPartition & task_partition,
@@ -140,7 +140,7 @@ protected:
 
     TaskStatus processPartitionPieceTaskImpl(const ConnectionTimeouts & timeouts,
                                              ShardPartition & task_partition,
-                                             const size_t current_piece_number,
+                                             size_t current_piece_number,
                                              bool is_unprioritized_task);
 
     void dropAndCreateLocalTable(const ASTPtr & create_ast);
@@ -149,6 +149,8 @@ protected:
 
     void dropHelpingTables(const TaskTable & task_table);
 
+    void dropHelpingTablesByPieceNumber(const TaskTable & task_table, size_t current_piece_number);
+
     /// Is used for usage less disk space.
     /// After all pieces were successfully moved to original destination
     /// table we can get rid of partition pieces (partitions in helping tables).
@@ -216,7 +218,6 @@ private:
 
     bool experimental_use_sample_offset{false};
 
-    Context & context;
     Poco::Logger * log;
 
     std::chrono::milliseconds default_sleep_time{1000};
diff --git a/programs/copier/ClusterCopierApp.cpp b/programs/copier/ClusterCopierApp.cpp
index e3169a49ecf..d3fff616b65 100644
--- a/programs/copier/ClusterCopierApp.cpp
+++ b/programs/copier/ClusterCopierApp.cpp
@@ -3,6 +3,7 @@
 #include <Common/TerminalSize.h>
 #include <IO/ConnectionTimeoutsContext.h>
 #include <Formats/registerFormats.h>
+#include <ext/scope_guard_safe.h>
 #include <unistd.h>
 
 
@@ -110,9 +111,9 @@ void ClusterCopierApp::mainImpl()
     LOG_INFO(log, "Starting clickhouse-copier (id {}, host_id {}, path {}, revision {})", process_id, host_id, process_path, ClickHouseRevision::getVersionRevision());
 
     SharedContextHolder shared_context = Context::createShared();
-    auto context = std::make_unique<Context>(Context::createGlobal(shared_context.get()));
+    auto context = Context::createGlobal(shared_context.get());
     context->makeGlobalContext();
-    SCOPE_EXIT(context->shutdown());
+    SCOPE_EXIT_SAFE(context->shutdown());
 
     context->setConfig(loaded_config.configuration);
     context->setApplicationType(Context::ApplicationType::LOCAL);
@@ -127,13 +128,13 @@ void ClusterCopierApp::mainImpl()
     registerFormats();
 
     static const std::string default_database = "_local";
-    DatabaseCatalog::instance().attachDatabase(default_database, std::make_shared<DatabaseMemory>(default_database, *context));
+    DatabaseCatalog::instance().attachDatabase(default_database, std::make_shared<DatabaseMemory>(default_database, context));
     context->setCurrentDatabase(default_database);
 
     /// Initialize query scope just in case.
-    CurrentThread::QueryScope query_scope(*context);
+    CurrentThread::QueryScope query_scope(context);
 
-    auto copier = std::make_unique<ClusterCopier>(task_path, host_id, default_database, *context);
+    auto copier = std::make_unique<ClusterCopier>(task_path, host_id, default_database, context);
     copier->setSafeMode(is_safe_mode);
     copier->setCopyFaultProbability(copy_fault_probability);
     copier->setMoveFaultProbability(move_fault_probability);
diff --git a/programs/copier/Internals.cpp b/programs/copier/Internals.cpp
index ea2be469945..bec612a8226 100644
--- a/programs/copier/Internals.cpp
+++ b/programs/copier/Internals.cpp
@@ -222,8 +222,8 @@ Names extractPrimaryKeyColumnNames(const ASTPtr & storage_ast)
         {
             String pk_column = primary_key_expr_list->children[i]->getColumnName();
             if (pk_column != sorting_key_column)
-                throw Exception("Primary key must be a prefix of the sorting key, but in position "
-                                + toString(i) + " its column is " + pk_column + ", not " + sorting_key_column,
+                throw Exception("Primary key must be a prefix of the sorting key, but the column in the position "
+                                + toString(i) + " is " + sorting_key_column +", not " + pk_column,
                                 ErrorCodes::BAD_ARGUMENTS);
 
             if (!primary_key_columns_set.emplace(pk_column).second)
diff --git a/programs/copier/TaskCluster.h b/programs/copier/TaskCluster.h
index 5b28f461dd8..1a50597d07f 100644
--- a/programs/copier/TaskCluster.h
+++ b/programs/copier/TaskCluster.h
@@ -98,6 +98,7 @@ inline void DB::TaskCluster::reloadSettings(const Poco::Util::AbstractConfigurat
     set_default_value(settings_pull.max_block_size, 8192UL);
     set_default_value(settings_pull.preferred_block_size_bytes, 0);
     set_default_value(settings_push.insert_distributed_timeout, 0);
+    set_default_value(settings_push.replication_alter_partitions_sync, 2);
 }
 
 }
diff --git a/programs/format/Format.cpp b/programs/format/Format.cpp
index 86a85d1d4a5..5bf19191353 100644
--- a/programs/format/Format.cpp
+++ b/programs/format/Format.cpp
@@ -1,16 +1,18 @@
+#include <functional>
 #include <iostream>
 #include <string_view>
-#include <functional>
 #include <boost/program_options.hpp>
 
 #include <IO/ReadBufferFromFileDescriptor.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteBufferFromFileDescriptor.h>
 #include <IO/WriteBufferFromOStream.h>
+#include <Parsers/ASTInsertQuery.h>
 #include <Parsers/ParserQuery.h>
-#include <Parsers/parseQuery.h>
 #include <Parsers/formatAST.h>
 #include <Parsers/obfuscateQueries.h>
+#include <Parsers/parseQuery.h>
+#include <Common/ErrorCodes.h>
 #include <Common/TerminalSize.h>
 
 #include <Interpreters/Context.h>
@@ -28,6 +30,14 @@
 #pragma GCC diagnostic ignored "-Wunused-function"
 #pragma GCC diagnostic ignored "-Wmissing-declarations"
 
+namespace DB
+{
+namespace ErrorCodes
+{
+extern const int INVALID_FORMAT_INSERT_QUERY_WITH_DATA;
+}
+}
+
 int mainEntryClickHouseFormat(int argc, char ** argv)
 {
     using namespace DB;
@@ -40,6 +50,7 @@ int mainEntryClickHouseFormat(int argc, char ** argv)
         ("quiet,q", "just check syntax, no output on success")
         ("multiquery,n", "allow multiple queries in the same file")
         ("obfuscate", "obfuscate instead of formatting")
+        ("backslash", "add a backslash at the end of each line of the formatted query")
         ("seed", po::value<std::string>(), "seed (arbitrary string) that determines the result of obfuscation")
     ;
 
@@ -60,6 +71,7 @@ int mainEntryClickHouseFormat(int argc, char ** argv)
         bool quiet = options.count("quiet");
         bool multiple = options.count("multiquery");
         bool obfuscate = options.count("obfuscate");
+        bool backslash = options.count("backslash");
 
         if (quiet && (hilite || oneline || obfuscate))
         {
@@ -90,8 +102,8 @@ int mainEntryClickHouseFormat(int argc, char ** argv)
             }
 
             SharedContextHolder shared_context = Context::createShared();
-            Context context = Context::createGlobal(shared_context.get());
-            context.makeGlobalContext();
+            auto context = Context::createGlobal(shared_context.get());
+            context->makeGlobalContext();
 
             registerFunctions();
             registerAggregateFunctions();
@@ -128,15 +140,70 @@ int mainEntryClickHouseFormat(int argc, char ** argv)
             do
             {
                 ASTPtr res = parseQueryAndMovePosition(parser, pos, end, "query", multiple, 0, DBMS_DEFAULT_MAX_PARSER_DEPTH);
+                /// For insert query with data(INSERT INTO ... VALUES ...), will lead to format fail,
+                /// should throw exception early and make exception message more readable.
+                if (const auto * insert_query = res->as<ASTInsertQuery>(); insert_query && insert_query->data)
+                {
+                    throw Exception(
+                        "Can't format ASTInsertQuery with data, since data will be lost",
+                        DB::ErrorCodes::INVALID_FORMAT_INSERT_QUERY_WITH_DATA);
+                }
                 if (!quiet)
                 {
-                    WriteBufferFromOStream res_buf(std::cout, 4096);
-                    formatAST(*res, res_buf, hilite, oneline);
-                    res_buf.next();
-                    if (multiple)
-                        std::cout << "\n;\n";
-                    std::cout << std::endl;
+                    if (!backslash)
+                    {
+                        WriteBufferFromOStream res_buf(std::cout, 4096);
+                        formatAST(*res, res_buf, hilite, oneline);
+                        res_buf.next();
+                        if (multiple)
+                            std::cout << "\n;\n";
+                        std::cout << std::endl;
+                    }
+                    /// add additional '\' at the end of each line;
+                    else
+                    {
+                        WriteBufferFromOwnString str_buf;
+                        formatAST(*res, str_buf, hilite, oneline);
+
+                        auto res_string = str_buf.str();
+                        WriteBufferFromOStream res_cout(std::cout, 4096);
+
+                        const char * s_pos= res_string.data();
+                        const char * s_end = s_pos + res_string.size();
+
+                        while (s_pos != s_end)
+                        {
+                            if (*s_pos == '\n')
+                                res_cout.write(" \\", 2);
+                            res_cout.write(*s_pos++);
+                        }
+
+                        res_cout.next();
+                        if (multiple)
+                            std::cout << " \\\n;\n";
+                        std::cout << std::endl;
+                    }
                 }
+
+                do
+                {
+                    /// skip spaces to avoid throw exception after last query
+                    while (pos != end && std::isspace(*pos))
+                        ++pos;
+
+                    /// for skip comment after the last query and to not throw exception
+                    if (end - pos > 2 && *pos == '-' && *(pos + 1) == '-')
+                    {
+                        pos += 2;
+                        /// skip until the end of the line
+                        while (pos != end && *pos != '\n')
+                            ++pos;
+                    }
+                    /// need to parse next sql
+                    else
+                        break;
+                } while (pos != end);
+
             } while (multiple && pos != end);
         }
     }
diff --git a/programs/git-import/git-import.cpp b/programs/git-import/git-import.cpp
index ae8b55e2aff..b07435dcf78 100644
--- a/programs/git-import/git-import.cpp
+++ b/programs/git-import/git-import.cpp
@@ -1064,7 +1064,7 @@ void processCommit(
 
     time_t commit_time;
     readText(commit_time, in);
-    commit.time = commit_time;
+    commit.time = LocalDateTime(commit_time);
     assertChar('\0', in);
     readNullTerminated(commit.author, in);
     std::string parent_hash;
diff --git a/programs/install/Install.cpp b/programs/install/Install.cpp
index 8404586d394..2b0f390f709 100644
--- a/programs/install/Install.cpp
+++ b/programs/install/Install.cpp
@@ -66,10 +66,14 @@ namespace ErrorCodes
     extern const int CANNOT_OPEN_FILE;
     extern const int SYSTEM_ERROR;
     extern const int NOT_ENOUGH_SPACE;
+    extern const int CANNOT_KILL;
 }
 
 }
 
+/// ANSI escape sequence for intense color in terminal.
+#define HILITE "\033[1m"
+#define END_HILITE "\033[0m"
 
 using namespace DB;
 namespace po = boost::program_options;
@@ -558,20 +562,32 @@ int mainEntryClickHouseInstall(int argc, char ** argv)
 
         bool stdin_is_a_tty = isatty(STDIN_FILENO);
         bool stdout_is_a_tty = isatty(STDOUT_FILENO);
-        bool is_interactive = stdin_is_a_tty && stdout_is_a_tty;
+
+        /// dpkg or apt installers can ask for non-interactive work explicitly.
+
+        const char * debian_frontend_var = getenv("DEBIAN_FRONTEND");
+        bool noninteractive = debian_frontend_var && debian_frontend_var == std::string_view("noninteractive");
+
+        bool is_interactive = !noninteractive && stdin_is_a_tty && stdout_is_a_tty;
+
+        /// We can ask password even if stdin is closed/redirected but /dev/tty is available.
+        bool can_ask_password = !noninteractive && stdout_is_a_tty;
 
         if (has_password_for_default_user)
         {
-            fmt::print("Password for default user is already specified. To remind or reset, see {} and {}.\n",
+            fmt::print(HILITE "Password for default user is already specified. To remind or reset, see {} and {}." END_HILITE "\n",
                        users_config_file.string(), users_d.string());
         }
-        else if (!is_interactive)
+        else if (!can_ask_password)
         {
-            fmt::print("Password for default user is empty string. See {} and {} to change it.\n",
+            fmt::print(HILITE "Password for default user is empty string. See {} and {} to change it." END_HILITE "\n",
                        users_config_file.string(), users_d.string());
         }
         else
         {
+            /// NOTE: When installing debian package with dpkg -i, stdin is not a terminal but we are still being able to enter password.
+            /// More sophisticated method with /dev/tty is used inside the `readpassphrase` function.
+
             char buf[1000] = {};
             std::string password;
             if (auto * result = readpassphrase("Enter password for default user: ", buf, sizeof(buf), 0))
@@ -599,7 +615,7 @@ int mainEntryClickHouseInstall(int argc, char ** argv)
                     "</yandex>\n";
                 out.sync();
                 out.finalize();
-                fmt::print("Password for default user is saved in file {}.\n", password_file);
+                fmt::print(HILITE "Password for default user is saved in file {}." END_HILITE "\n", password_file);
 #else
                 out << "<yandex>\n"
                     "    <users>\n"
@@ -610,12 +626,12 @@ int mainEntryClickHouseInstall(int argc, char ** argv)
                     "</yandex>\n";
                 out.sync();
                 out.finalize();
-                fmt::print("Password for default user is saved in plaintext in file {}.\n", password_file);
+                fmt::print(HILITE "Password for default user is saved in plaintext in file {}." END_HILITE "\n", password_file);
 #endif
                 has_password_for_default_user = true;
             }
             else
-                fmt::print("Password for default user is empty string. See {} and {} to change it.\n",
+                fmt::print(HILITE "Password for default user is empty string. See {} and {} to change it." END_HILITE "\n",
                            users_config_file.string(), users_d.string());
         }
 
@@ -640,7 +656,6 @@ int mainEntryClickHouseInstall(int argc, char ** argv)
                 " This is optional. Taskstats accounting will be disabled."
                 " To enable taskstats accounting you may add the required capability later manually.\"",
             "/tmp/test_setcap.sh", fs::canonical(main_bin_path).string());
-        fmt::print(" {}\n", command);
         executeScript(command);
 #endif
 
@@ -886,6 +901,27 @@ namespace
                 fmt::print("Sent kill signal.\n", pid);
             else
                 throwFromErrno("Cannot send kill signal", ErrorCodes::SYSTEM_ERROR);
+
+            /// Wait for the process (100 seconds).
+            constexpr size_t num_kill_check_tries = 1000;
+            constexpr size_t kill_check_delay_ms = 100;
+            for (size_t i = 0; i < num_kill_check_tries; ++i)
+            {
+                fmt::print("Waiting for server to be killed\n");
+                if (!isRunning(pid_file))
+                {
+                    fmt::print("Server exited\n");
+                    break;
+                }
+                sleepForMilliseconds(kill_check_delay_ms);
+            }
+
+            if (isRunning(pid_file))
+            {
+                throw Exception(ErrorCodes::CANNOT_KILL,
+                    "The server process still exists after %zu ms",
+                    num_kill_check_tries, kill_check_delay_ms);
+            }
         }
 
         return 0;
diff --git a/programs/library-bridge/CMakeLists.txt b/programs/library-bridge/CMakeLists.txt
new file mode 100644
index 00000000000..0913c6e4a9a
--- /dev/null
+++ b/programs/library-bridge/CMakeLists.txt
@@ -0,0 +1,25 @@
+set (CLICKHOUSE_LIBRARY_BRIDGE_SOURCES
+    library-bridge.cpp
+    LibraryInterface.cpp
+    LibraryBridge.cpp
+    Handlers.cpp
+    HandlerFactory.cpp
+    SharedLibraryHandler.cpp
+    SharedLibraryHandlerFactory.cpp
+)
+
+if (OS_LINUX)
+    set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-export-dynamic")
+endif ()
+
+add_executable(clickhouse-library-bridge ${CLICKHOUSE_LIBRARY_BRIDGE_SOURCES})
+
+target_link_libraries(clickhouse-library-bridge PRIVATE
+    daemon
+    dbms
+    bridge
+)
+
+set_target_properties(clickhouse-library-bridge PROPERTIES RUNTIME_OUTPUT_DIRECTORY ..)
+
+install(TARGETS clickhouse-library-bridge RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
diff --git a/programs/library-bridge/HandlerFactory.cpp b/programs/library-bridge/HandlerFactory.cpp
new file mode 100644
index 00000000000..9f53a24156f
--- /dev/null
+++ b/programs/library-bridge/HandlerFactory.cpp
@@ -0,0 +1,23 @@
+#include "HandlerFactory.h"
+
+#include <Poco/Net/HTTPServerRequest.h>
+#include <Server/HTTP/HTMLForm.h>
+#include "Handlers.h"
+
+
+namespace DB
+{
+    std::unique_ptr<HTTPRequestHandler> LibraryBridgeHandlerFactory::createRequestHandler(const HTTPServerRequest & request)
+    {
+        Poco::URI uri{request.getURI()};
+        LOG_DEBUG(log, "Request URI: {}", uri.toString());
+
+        if (uri == "/ping" && request.getMethod() == Poco::Net::HTTPRequest::HTTP_GET)
+            return std::make_unique<PingHandler>(keep_alive_timeout);
+
+        if (request.getMethod() == Poco::Net::HTTPRequest::HTTP_POST)
+            return std::make_unique<LibraryRequestHandler>(keep_alive_timeout, getContext());
+
+        return nullptr;
+    }
+}
diff --git a/programs/library-bridge/HandlerFactory.h b/programs/library-bridge/HandlerFactory.h
new file mode 100644
index 00000000000..93f0721bf01
--- /dev/null
+++ b/programs/library-bridge/HandlerFactory.h
@@ -0,0 +1,37 @@
+#pragma once
+
+#include <Interpreters/Context.h>
+#include <Server/HTTP/HTTPRequestHandlerFactory.h>
+#include <common/logger_useful.h>
+
+
+namespace DB
+{
+
+class SharedLibraryHandler;
+using SharedLibraryHandlerPtr = std::shared_ptr<SharedLibraryHandler>;
+
+/// Factory for '/ping', '/' handlers.
+class LibraryBridgeHandlerFactory : public HTTPRequestHandlerFactory, WithContext
+{
+public:
+    LibraryBridgeHandlerFactory(
+            const std::string & name_,
+            size_t keep_alive_timeout_,
+            ContextPtr context_)
+        : WithContext(context_)
+        , log(&Poco::Logger::get(name_))
+        , name(name_)
+        , keep_alive_timeout(keep_alive_timeout_)
+    {
+    }
+
+    std::unique_ptr<HTTPRequestHandler> createRequestHandler(const HTTPServerRequest & request) override;
+
+private:
+    Poco::Logger * log;
+    std::string name;
+    size_t keep_alive_timeout;
+};
+
+}
diff --git a/programs/library-bridge/Handlers.cpp b/programs/library-bridge/Handlers.cpp
new file mode 100644
index 00000000000..6a1bfbbccb7
--- /dev/null
+++ b/programs/library-bridge/Handlers.cpp
@@ -0,0 +1,288 @@
+#include "Handlers.h"
+#include "SharedLibraryHandlerFactory.h"
+
+#include <DataStreams/copyData.h>
+#include <Formats/FormatFactory.h>
+#include <Server/HTTP/WriteBufferFromHTTPServerResponse.h>
+#include <IO/WriteHelpers.h>
+#include <IO/ReadHelpers.h>
+#include <Poco/Net/HTTPServerRequest.h>
+#include <Poco/Net/HTTPServerResponse.h>
+#include <Poco/Net/HTMLForm.h>
+#include <Poco/ThreadPool.h>
+#include <Processors/Formats/InputStreamFromInputFormat.h>
+#include <Server/HTTP/HTMLForm.h>
+#include <IO/ReadBufferFromString.h>
+
+
+namespace DB
+{
+namespace
+{
+    std::shared_ptr<Block> parseColumns(std::string && column_string)
+    {
+        auto sample_block = std::make_shared<Block>();
+        auto names_and_types = NamesAndTypesList::parse(column_string);
+
+        for (const NameAndTypePair & column_data : names_and_types)
+            sample_block->insert({column_data.type, column_data.name});
+
+        return sample_block;
+    }
+
+    std::vector<uint64_t> parseIdsFromBinary(const std::string & ids_string)
+    {
+        ReadBufferFromString buf(ids_string);
+        std::vector<uint64_t> ids;
+        readVectorBinary(ids, buf);
+        return ids;
+    }
+
+    std::vector<std::string> parseNamesFromBinary(const std::string & names_string)
+    {
+        ReadBufferFromString buf(names_string);
+        std::vector<std::string> names;
+        readVectorBinary(names, buf);
+        return names;
+    }
+}
+
+
+void LibraryRequestHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse & response)
+{
+    LOG_TRACE(log, "Request URI: {}", request.getURI());
+    HTMLForm params(request);
+
+    if (!params.has("method"))
+    {
+        processError(response, "No 'method' in request URL");
+        return;
+    }
+
+    if (!params.has("dictionary_id"))
+    {
+        processError(response, "No 'dictionary_id in request URL");
+        return;
+    }
+
+    std::string method = params.get("method");
+    std::string dictionary_id = params.get("dictionary_id");
+    LOG_TRACE(log, "Library method: '{}', dictionary id: {}", method, dictionary_id);
+
+    WriteBufferFromHTTPServerResponse out(response, request.getMethod() == Poco::Net::HTTPRequest::HTTP_HEAD, keep_alive_timeout);
+
+    try
+    {
+        if (method == "libNew")
+        {
+            auto & read_buf = request.getStream();
+            params.read(read_buf);
+
+            if (!params.has("library_path"))
+            {
+                processError(response, "No 'library_path' in request URL");
+                return;
+            }
+
+            if (!params.has("library_settings"))
+            {
+                processError(response, "No 'library_settings' in request URL");
+                return;
+            }
+
+            std::string library_path = params.get("library_path");
+            const auto & settings_string = params.get("library_settings");
+            std::vector<std::string> library_settings = parseNamesFromBinary(settings_string);
+
+            /// Needed for library dictionary
+            if (!params.has("attributes_names"))
+            {
+                processError(response, "No 'attributes_names' in request URL");
+                return;
+            }
+
+            const auto & attributes_string = params.get("attributes_names");
+            std::vector<std::string> attributes_names = parseNamesFromBinary(attributes_string);
+
+            /// Needed to parse block from binary string format
+            if (!params.has("sample_block"))
+            {
+                processError(response, "No 'sample_block' in request URL");
+                return;
+            }
+            std::string sample_block_string = params.get("sample_block");
+
+            std::shared_ptr<Block> sample_block;
+            try
+            {
+                sample_block = parseColumns(std::move(sample_block_string));
+            }
+            catch (const Exception & ex)
+            {
+                processError(response, "Invalid 'sample_block' parameter in request body '" + ex.message() + "'");
+                LOG_WARNING(log, ex.getStackTraceString());
+                return;
+            }
+
+            if (!params.has("null_values"))
+            {
+                processError(response, "No 'null_values' in request URL");
+                return;
+            }
+
+            ReadBufferFromString read_block_buf(params.get("null_values"));
+            auto format = FormatFactory::instance().getInput(FORMAT, read_block_buf, *sample_block, getContext(), DEFAULT_BLOCK_SIZE);
+            auto reader = std::make_shared<InputStreamFromInputFormat>(format);
+            auto sample_block_with_nulls = reader->read();
+
+            LOG_DEBUG(log, "Dictionary sample block with null values: {}", sample_block_with_nulls.dumpStructure());
+
+            SharedLibraryHandlerFactory::instance().create(dictionary_id, library_path, library_settings, sample_block_with_nulls, attributes_names);
+            writeStringBinary("1", out);
+        }
+        else if (method == "libClone")
+        {
+            if (!params.has("from_dictionary_id"))
+            {
+                processError(response, "No 'from_dictionary_id' in request URL");
+                return;
+            }
+
+            std::string from_dictionary_id = params.get("from_dictionary_id");
+            LOG_TRACE(log, "Calling libClone from {} to {}", from_dictionary_id, dictionary_id);
+            SharedLibraryHandlerFactory::instance().clone(from_dictionary_id, dictionary_id);
+            writeStringBinary("1", out);
+        }
+        else if (method == "libDelete")
+        {
+            SharedLibraryHandlerFactory::instance().remove(dictionary_id);
+            writeStringBinary("1", out);
+        }
+        else if (method == "isModified")
+        {
+            auto library_handler = SharedLibraryHandlerFactory::instance().get(dictionary_id);
+            bool res = library_handler->isModified();
+            writeStringBinary(std::to_string(res), out);
+        }
+        else if (method == "supportsSelectiveLoad")
+        {
+            auto library_handler = SharedLibraryHandlerFactory::instance().get(dictionary_id);
+            bool res = library_handler->supportsSelectiveLoad();
+            writeStringBinary(std::to_string(res), out);
+        }
+        else if (method == "loadAll")
+        {
+            auto library_handler = SharedLibraryHandlerFactory::instance().get(dictionary_id);
+            const auto & sample_block = library_handler->getSampleBlock();
+            auto input = library_handler->loadAll();
+
+            BlockOutputStreamPtr output = FormatFactory::instance().getOutputStream(FORMAT, out, sample_block, getContext());
+            copyData(*input, *output);
+        }
+        else if (method == "loadIds")
+        {
+            params.read(request.getStream());
+
+            if (!params.has("ids"))
+            {
+                processError(response, "No 'ids' in request URL");
+                return;
+            }
+
+            std::vector<uint64_t> ids = parseIdsFromBinary(params.get("ids"));
+            auto library_handler = SharedLibraryHandlerFactory::instance().get(dictionary_id);
+            const auto & sample_block = library_handler->getSampleBlock();
+            auto input = library_handler->loadIds(ids);
+            BlockOutputStreamPtr output = FormatFactory::instance().getOutputStream(FORMAT, out, sample_block, getContext());
+            copyData(*input, *output);
+        }
+        else if (method == "loadKeys")
+        {
+            if (!params.has("requested_block_sample"))
+            {
+                processError(response, "No 'requested_block_sample' in request URL");
+                return;
+            }
+
+            std::string requested_block_string = params.get("requested_block_sample");
+
+            std::shared_ptr<Block> requested_sample_block;
+            try
+            {
+                requested_sample_block = parseColumns(std::move(requested_block_string));
+            }
+            catch (const Exception & ex)
+            {
+                processError(response, "Invalid 'requested_block' parameter in request body '" + ex.message() + "'");
+                LOG_WARNING(log, ex.getStackTraceString());
+                return;
+            }
+
+            auto & read_buf = request.getStream();
+            auto format = FormatFactory::instance().getInput(FORMAT, read_buf, *requested_sample_block, getContext(), DEFAULT_BLOCK_SIZE);
+            auto reader = std::make_shared<InputStreamFromInputFormat>(format);
+            auto block = reader->read();
+
+            auto library_handler = SharedLibraryHandlerFactory::instance().get(dictionary_id);
+            const auto & sample_block = library_handler->getSampleBlock();
+            auto input = library_handler->loadKeys(block.getColumns());
+            BlockOutputStreamPtr output = FormatFactory::instance().getOutputStream(FORMAT, out, sample_block, getContext());
+            copyData(*input, *output);
+        }
+    }
+    catch (...)
+    {
+        auto message = getCurrentExceptionMessage(true);
+        response.setStatusAndReason(Poco::Net::HTTPResponse::HTTP_INTERNAL_SERVER_ERROR, message); // can't call process_error, because of too soon response sending
+
+        try
+        {
+            writeStringBinary(message, out);
+            out.finalize();
+        }
+        catch (...)
+        {
+            tryLogCurrentException(log);
+        }
+
+        tryLogCurrentException(log);
+    }
+
+    try
+    {
+        out.finalize();
+    }
+    catch (...)
+    {
+        tryLogCurrentException(log);
+    }
+}
+
+
+void LibraryRequestHandler::processError(HTTPServerResponse & response, const std::string & message)
+{
+    response.setStatusAndReason(HTTPResponse::HTTP_INTERNAL_SERVER_ERROR);
+
+    if (!response.sent())
+        *response.send() << message << std::endl;
+
+    LOG_WARNING(log, message);
+}
+
+
+void PingHandler::handleRequest(HTTPServerRequest & /* request */, HTTPServerResponse & response)
+{
+    try
+    {
+        setResponseDefaultHeaders(response, keep_alive_timeout);
+        const char * data = "Ok.\n";
+        response.sendBuffer(data, strlen(data));
+    }
+    catch (...)
+    {
+        tryLogCurrentException("PingHandler");
+    }
+}
+
+
+}
diff --git a/programs/library-bridge/Handlers.h b/programs/library-bridge/Handlers.h
new file mode 100644
index 00000000000..dac61d3a735
--- /dev/null
+++ b/programs/library-bridge/Handlers.h
@@ -0,0 +1,59 @@
+#pragma once
+
+#include <Interpreters/Context.h>
+#include <Server/HTTP/HTTPRequestHandler.h>
+#include <common/logger_useful.h>
+#include "SharedLibraryHandler.h"
+
+
+namespace DB
+{
+
+
+/// Handler for requests to Library Dictionary Source, returns response in RowBinary format.
+/// When a library dictionary source is created, it sends libNew request to library bridge (which is started on first
+/// request to it, if it was not yet started). On this request a new sharedLibrayHandler is added to a
+/// sharedLibraryHandlerFactory by a dictionary uuid. With libNew request come: library_path, library_settings,
+/// names of dictionary attributes, sample block to parse block of null values, block of null values. Everything is
+/// passed in binary format and is urlencoded. When dictionary is cloned, a new handler is created.
+/// Each handler is unique to dictionary.
+class LibraryRequestHandler : public HTTPRequestHandler, WithContext
+{
+public:
+
+    LibraryRequestHandler(
+        size_t keep_alive_timeout_,
+        ContextPtr context_)
+        : WithContext(context_)
+        , log(&Poco::Logger::get("LibraryRequestHandler"))
+        , keep_alive_timeout(keep_alive_timeout_)
+    {
+    }
+
+    void handleRequest(HTTPServerRequest & request, HTTPServerResponse & response) override;
+
+private:
+    static constexpr inline auto FORMAT = "RowBinary";
+
+    void processError(HTTPServerResponse & response, const std::string & message);
+
+    Poco::Logger * log;
+    size_t keep_alive_timeout;
+};
+
+
+class PingHandler : public HTTPRequestHandler
+{
+public:
+    explicit PingHandler(size_t keep_alive_timeout_)
+        : keep_alive_timeout(keep_alive_timeout_)
+    {
+    }
+
+    void handleRequest(HTTPServerRequest & request, HTTPServerResponse & response) override;
+
+private:
+    const size_t keep_alive_timeout;
+};
+
+}
diff --git a/programs/library-bridge/LibraryBridge.cpp b/programs/library-bridge/LibraryBridge.cpp
new file mode 100644
index 00000000000..2e5d6041151
--- /dev/null
+++ b/programs/library-bridge/LibraryBridge.cpp
@@ -0,0 +1,17 @@
+#include "LibraryBridge.h"
+
+#pragma GCC diagnostic ignored "-Wmissing-declarations"
+int mainEntryClickHouseLibraryBridge(int argc, char ** argv)
+{
+    DB::LibraryBridge app;
+    try
+    {
+        return app.run(argc, argv);
+    }
+    catch (...)
+    {
+        std::cerr << DB::getCurrentExceptionMessage(true) << "\n";
+        auto code = DB::getCurrentExceptionCode();
+        return code ? code : 1;
+    }
+}
diff --git a/programs/library-bridge/LibraryBridge.h b/programs/library-bridge/LibraryBridge.h
new file mode 100644
index 00000000000..9f2dafb89ab
--- /dev/null
+++ b/programs/library-bridge/LibraryBridge.h
@@ -0,0 +1,26 @@
+#pragma once
+
+#include <Interpreters/Context.h>
+#include <bridge/IBridge.h>
+#include "HandlerFactory.h"
+
+
+namespace DB
+{
+
+class LibraryBridge : public IBridge
+{
+
+protected:
+    std::string bridgeName() const override
+    {
+        return "LibraryBridge";
+    }
+
+    HandlerFactoryPtr getHandlerFactoryPtr(ContextPtr context) const override
+    {
+        return std::make_shared<LibraryBridgeHandlerFactory>("LibraryRequestHandlerFactory-factory", keep_alive_timeout, context);
+    }
+};
+
+}
diff --git a/src/Dictionaries/LibraryDictionarySourceExternal.cpp b/programs/library-bridge/LibraryInterface.cpp
similarity index 55%
rename from src/Dictionaries/LibraryDictionarySourceExternal.cpp
rename to programs/library-bridge/LibraryInterface.cpp
index 2e944056283..3975368c17f 100644
--- a/src/Dictionaries/LibraryDictionarySourceExternal.cpp
+++ b/programs/library-bridge/LibraryInterface.cpp
@@ -1,4 +1,5 @@
-#include "LibraryDictionarySourceExternal.h"
+#include "LibraryInterface.h"
+
 #include <common/logger_useful.h>
 
 namespace
@@ -6,10 +7,25 @@ namespace
 const char DICT_LOGGER_NAME[] = "LibraryDictionarySourceExternal";
 }
 
-void ClickHouseLibrary::log(ClickHouseLibrary::LogLevel level, ClickHouseLibrary::CString msg)
+namespace ClickHouseLibrary
 {
-    using ClickHouseLibrary::LogLevel;
 
+std::string_view LIBRARY_CREATE_NEW_FUNC_NAME = "ClickHouseDictionary_v3_libNew";
+std::string_view LIBRARY_CLONE_FUNC_NAME = "ClickHouseDictionary_v3_libClone";
+std::string_view LIBRARY_DELETE_FUNC_NAME = "ClickHouseDictionary_v3_libDelete";
+
+std::string_view LIBRARY_DATA_NEW_FUNC_NAME = "ClickHouseDictionary_v3_dataNew";
+std::string_view LIBRARY_DATA_DELETE_FUNC_NAME = "ClickHouseDictionary_v3_dataDelete";
+
+std::string_view LIBRARY_LOAD_ALL_FUNC_NAME = "ClickHouseDictionary_v3_loadAll";
+std::string_view LIBRARY_LOAD_IDS_FUNC_NAME = "ClickHouseDictionary_v3_loadIds";
+std::string_view LIBRARY_LOAD_KEYS_FUNC_NAME = "ClickHouseDictionary_v3_loadKeys";
+
+std::string_view LIBRARY_IS_MODIFIED_FUNC_NAME = "ClickHouseDictionary_v3_isModified";
+std::string_view LIBRARY_SUPPORTS_SELECTIVE_LOAD_FUNC_NAME = "ClickHouseDictionary_v3_supportsSelectiveLoad";
+
+void log(LogLevel level, CString msg)
+{
     auto & logger = Poco::Logger::get(DICT_LOGGER_NAME);
     switch (level)
     {
@@ -47,3 +63,5 @@ void ClickHouseLibrary::log(ClickHouseLibrary::LogLevel level, ClickHouseLibrary
             break;
     }
 }
+
+}
diff --git a/programs/library-bridge/LibraryInterface.h b/programs/library-bridge/LibraryInterface.h
new file mode 100644
index 00000000000..d23de59bbb1
--- /dev/null
+++ b/programs/library-bridge/LibraryInterface.h
@@ -0,0 +1,110 @@
+#pragma once
+
+#include <cstdint>
+#include <string>
+
+#define CLICKHOUSE_DICTIONARY_LIBRARY_API 1
+
+namespace ClickHouseLibrary
+{
+using CString = const char *;
+using ColumnName = CString;
+using ColumnNames = ColumnName[];
+
+struct CStrings
+{
+    CString * data = nullptr;
+    uint64_t size = 0;
+};
+
+struct VectorUInt64
+{
+    const uint64_t * data = nullptr;
+    uint64_t size = 0;
+};
+
+struct ColumnsUInt64
+{
+    VectorUInt64 * data = nullptr;
+    uint64_t size = 0;
+};
+
+struct Field
+{
+    const void * data = nullptr;
+    uint64_t size = 0;
+};
+
+struct Row
+{
+    const Field * data = nullptr;
+    uint64_t size = 0;
+};
+
+struct Table
+{
+    const Row * data = nullptr;
+    uint64_t size = 0;
+    uint64_t error_code = 0; // 0 = ok; !0 = error, with message in error_string
+    const char * error_string = nullptr;
+};
+
+enum LogLevel
+{
+    FATAL = 1,
+    CRITICAL,
+    ERROR,
+    WARNING,
+    NOTICE,
+    INFORMATION,
+    DEBUG,
+    TRACE,
+};
+
+void log(LogLevel level, CString msg);
+
+extern std::string_view LIBRARY_CREATE_NEW_FUNC_NAME;
+extern std::string_view LIBRARY_CLONE_FUNC_NAME;
+extern std::string_view LIBRARY_DELETE_FUNC_NAME;
+
+extern std::string_view LIBRARY_DATA_NEW_FUNC_NAME;
+extern std::string_view LIBRARY_DATA_DELETE_FUNC_NAME;
+
+extern std::string_view LIBRARY_LOAD_ALL_FUNC_NAME;
+extern std::string_view LIBRARY_LOAD_IDS_FUNC_NAME;
+extern std::string_view LIBRARY_LOAD_KEYS_FUNC_NAME;
+
+extern std::string_view LIBRARY_IS_MODIFIED_FUNC_NAME;
+extern std::string_view LIBRARY_SUPPORTS_SELECTIVE_LOAD_FUNC_NAME;
+
+using LibraryContext = void *;
+
+using LibraryLoggerFunc = void (*)(LogLevel, CString /* message */);
+
+using LibrarySettings = CStrings *;
+
+using LibraryNewFunc = LibraryContext (*)(LibrarySettings, LibraryLoggerFunc);
+using LibraryCloneFunc = LibraryContext (*)(LibraryContext);
+using LibraryDeleteFunc = void (*)(LibraryContext);
+
+using LibraryData = void *;
+using LibraryDataNewFunc = LibraryData (*)(LibraryContext);
+using LibraryDataDeleteFunc = void (*)(LibraryContext, LibraryData);
+
+/// Can be safely casted into const Table * with static_cast<const ClickHouseLibrary::Table *>
+using RawClickHouseLibraryTable = void *;
+using RequestedColumnsNames = CStrings *;
+
+using LibraryLoadAllFunc = RawClickHouseLibraryTable (*)(LibraryData, LibrarySettings, RequestedColumnsNames);
+
+using RequestedIds = const VectorUInt64 *;
+using LibraryLoadIdsFunc = RawClickHouseLibraryTable (*)(LibraryData, LibrarySettings, RequestedColumnsNames, RequestedIds);
+
+using RequestedKeys = Table *;
+/// There are no requested column names for load keys func
+using LibraryLoadKeysFunc = RawClickHouseLibraryTable (*)(LibraryData, LibrarySettings, RequestedKeys);
+
+using LibraryIsModifiedFunc = bool (*)(LibraryContext, LibrarySettings);
+using LibrarySupportsSelectiveLoadFunc = bool (*)(LibraryContext, LibrarySettings);
+
+}
diff --git a/programs/library-bridge/LibraryUtils.h b/programs/library-bridge/LibraryUtils.h
new file mode 100644
index 00000000000..8ced8df1c48
--- /dev/null
+++ b/programs/library-bridge/LibraryUtils.h
@@ -0,0 +1,44 @@
+#pragma once
+
+#include <Common/StringUtils/StringUtils.h>
+#include <Core/Block.h>
+#include <ext/bit_cast.h>
+#include <ext/range.h>
+
+#include "LibraryInterface.h"
+
+
+namespace DB
+{
+
+class CStringsHolder
+{
+
+public:
+    using Container = std::vector<std::string>;
+
+    explicit CStringsHolder(const Container & strings_pass)
+    {
+        strings_holder = strings_pass;
+        strings.size = strings_holder.size();
+
+        ptr_holder = std::make_unique<ClickHouseLibrary::CString[]>(strings.size);
+        strings.data = ptr_holder.get();
+
+        size_t i = 0;
+        for (auto & str : strings_holder)
+        {
+            strings.data[i] = str.c_str();
+            ++i;
+        }
+    }
+
+    ClickHouseLibrary::CStrings strings; // will pass pointer to lib
+
+private:
+    std::unique_ptr<ClickHouseLibrary::CString[]> ptr_holder = nullptr;
+    Container strings_holder;
+};
+
+
+}
diff --git a/programs/library-bridge/SharedLibraryHandler.cpp b/programs/library-bridge/SharedLibraryHandler.cpp
new file mode 100644
index 00000000000..ab8cf2417c2
--- /dev/null
+++ b/programs/library-bridge/SharedLibraryHandler.cpp
@@ -0,0 +1,219 @@
+#include "SharedLibraryHandler.h"
+
+#include <ext/scope_guard.h>
+#include <IO/ReadHelpers.h>
+#include <common/find_symbols.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int EXTERNAL_LIBRARY_ERROR;
+    extern const int SIZES_OF_COLUMNS_DOESNT_MATCH;
+}
+
+
+SharedLibraryHandler::SharedLibraryHandler(
+    const std::string & library_path_,
+    const std::vector<std::string> & library_settings,
+    const Block & sample_block_,
+    const std::vector<std::string> & attributes_names_)
+    : library_path(library_path_)
+    , sample_block(sample_block_)
+    , attributes_names(attributes_names_)
+{
+    library = std::make_shared<SharedLibrary>(library_path, RTLD_LAZY);
+    settings_holder = std::make_shared<CStringsHolder>(CStringsHolder(library_settings));
+
+    auto lib_new = library->tryGet<ClickHouseLibrary::LibraryNewFunc>(ClickHouseLibrary::LIBRARY_CREATE_NEW_FUNC_NAME);
+
+    if (lib_new)
+        lib_data = lib_new(&settings_holder->strings, ClickHouseLibrary::log);
+    else
+        throw Exception("Method libNew failed", ErrorCodes::EXTERNAL_LIBRARY_ERROR);
+}
+
+
+SharedLibraryHandler::SharedLibraryHandler(const SharedLibraryHandler & other)
+    : library_path{other.library_path}
+    , sample_block{other.sample_block}
+    , attributes_names{other.attributes_names}
+    , library{other.library}
+    , settings_holder{other.settings_holder}
+{
+
+    auto lib_clone = library->tryGet<ClickHouseLibrary::LibraryCloneFunc>(ClickHouseLibrary::LIBRARY_CLONE_FUNC_NAME);
+
+    if (lib_clone)
+    {
+        lib_data = lib_clone(other.lib_data);
+    }
+    else
+    {
+        auto lib_new = library->tryGet<ClickHouseLibrary::LibraryNewFunc>(ClickHouseLibrary::LIBRARY_CREATE_NEW_FUNC_NAME);
+
+        if (lib_new)
+            lib_data = lib_new(&settings_holder->strings, ClickHouseLibrary::log);
+    }
+}
+
+
+SharedLibraryHandler::~SharedLibraryHandler()
+{
+    auto lib_delete = library->tryGet<ClickHouseLibrary::LibraryDeleteFunc>(ClickHouseLibrary::LIBRARY_DELETE_FUNC_NAME);
+
+    if (lib_delete)
+        lib_delete(lib_data);
+}
+
+
+bool SharedLibraryHandler::isModified()
+{
+    auto func_is_modified = library->tryGet<ClickHouseLibrary::LibraryIsModifiedFunc>(ClickHouseLibrary::LIBRARY_IS_MODIFIED_FUNC_NAME);
+
+    if (func_is_modified)
+        return func_is_modified(lib_data, &settings_holder->strings);
+
+    return true;
+}
+
+
+bool SharedLibraryHandler::supportsSelectiveLoad()
+{
+    auto func_supports_selective_load = library->tryGet<ClickHouseLibrary::LibrarySupportsSelectiveLoadFunc>(ClickHouseLibrary::LIBRARY_SUPPORTS_SELECTIVE_LOAD_FUNC_NAME);
+
+    if (func_supports_selective_load)
+        return func_supports_selective_load(lib_data, &settings_holder->strings);
+
+    return true;
+}
+
+
+BlockInputStreamPtr SharedLibraryHandler::loadAll()
+{
+    auto columns_holder = std::make_unique<ClickHouseLibrary::CString[]>(attributes_names.size());
+    ClickHouseLibrary::CStrings columns{static_cast<decltype(ClickHouseLibrary::CStrings::data)>(columns_holder.get()), attributes_names.size()};
+    for (size_t i = 0; i < attributes_names.size(); ++i)
+        columns.data[i] = attributes_names[i].c_str();
+
+    auto load_all_func = library->get<ClickHouseLibrary::LibraryLoadAllFunc>(ClickHouseLibrary::LIBRARY_LOAD_ALL_FUNC_NAME);
+    auto data_new_func = library->get<ClickHouseLibrary::LibraryDataNewFunc>(ClickHouseLibrary::LIBRARY_DATA_NEW_FUNC_NAME);
+    auto data_delete_func = library->get<ClickHouseLibrary::LibraryDataDeleteFunc>(ClickHouseLibrary::LIBRARY_DATA_DELETE_FUNC_NAME);
+
+    ClickHouseLibrary::LibraryData data_ptr = data_new_func(lib_data);
+    SCOPE_EXIT(data_delete_func(lib_data, data_ptr));
+
+    ClickHouseLibrary::RawClickHouseLibraryTable data = load_all_func(data_ptr, &settings_holder->strings, &columns);
+    auto block = dataToBlock(data);
+
+    return std::make_shared<OneBlockInputStream>(block);
+}
+
+
+BlockInputStreamPtr SharedLibraryHandler::loadIds(const std::vector<uint64_t> & ids)
+{
+    const ClickHouseLibrary::VectorUInt64 ids_data{ext::bit_cast<decltype(ClickHouseLibrary::VectorUInt64::data)>(ids.data()), ids.size()};
+
+    auto columns_holder = std::make_unique<ClickHouseLibrary::CString[]>(attributes_names.size());
+    ClickHouseLibrary::CStrings columns_pass{static_cast<decltype(ClickHouseLibrary::CStrings::data)>(columns_holder.get()), attributes_names.size()};
+
+    auto load_ids_func = library->get<ClickHouseLibrary::LibraryLoadIdsFunc>(ClickHouseLibrary::LIBRARY_LOAD_IDS_FUNC_NAME);
+    auto data_new_func = library->get<ClickHouseLibrary::LibraryDataNewFunc>(ClickHouseLibrary::LIBRARY_DATA_NEW_FUNC_NAME);
+    auto data_delete_func = library->get<ClickHouseLibrary::LibraryDataDeleteFunc>(ClickHouseLibrary::LIBRARY_DATA_DELETE_FUNC_NAME);
+
+    ClickHouseLibrary::LibraryData data_ptr = data_new_func(lib_data);
+    SCOPE_EXIT(data_delete_func(lib_data, data_ptr));
+
+    ClickHouseLibrary::RawClickHouseLibraryTable data = load_ids_func(data_ptr, &settings_holder->strings, &columns_pass, &ids_data);
+    auto block = dataToBlock(data);
+
+    return std::make_shared<OneBlockInputStream>(block);
+}
+
+
+BlockInputStreamPtr SharedLibraryHandler::loadKeys(const Columns & key_columns)
+{
+    auto holder = std::make_unique<ClickHouseLibrary::Row[]>(key_columns.size());
+    std::vector<std::unique_ptr<ClickHouseLibrary::Field[]>> column_data_holders;
+
+    for (size_t i = 0; i < key_columns.size(); ++i)
+    {
+        auto cell_holder = std::make_unique<ClickHouseLibrary::Field[]>(key_columns[i]->size());
+
+        for (size_t j = 0; j < key_columns[i]->size(); ++j)
+        {
+            auto data_ref = key_columns[i]->getDataAt(j);
+
+            cell_holder[j] = ClickHouseLibrary::Field{
+                    .data = static_cast<const void *>(data_ref.data),
+                    .size = data_ref.size};
+        }
+
+        holder[i] = ClickHouseLibrary::Row{
+                    .data = static_cast<ClickHouseLibrary::Field *>(cell_holder.get()),
+                    .size = key_columns[i]->size()};
+
+        column_data_holders.push_back(std::move(cell_holder));
+    }
+
+    ClickHouseLibrary::Table request_cols{
+            .data = static_cast<ClickHouseLibrary::Row *>(holder.get()),
+            .size = key_columns.size()};
+
+    auto load_keys_func = library->get<ClickHouseLibrary::LibraryLoadKeysFunc>(ClickHouseLibrary::LIBRARY_LOAD_KEYS_FUNC_NAME);
+    auto data_new_func = library->get<ClickHouseLibrary::LibraryDataNewFunc>(ClickHouseLibrary::LIBRARY_DATA_NEW_FUNC_NAME);
+    auto data_delete_func = library->get<ClickHouseLibrary::LibraryDataDeleteFunc>(ClickHouseLibrary::LIBRARY_DATA_DELETE_FUNC_NAME);
+
+    ClickHouseLibrary::LibraryData data_ptr = data_new_func(lib_data);
+    SCOPE_EXIT(data_delete_func(lib_data, data_ptr));
+
+    ClickHouseLibrary::RawClickHouseLibraryTable data = load_keys_func(data_ptr, &settings_holder->strings, &request_cols);
+    auto block = dataToBlock(data);
+
+    return std::make_shared<OneBlockInputStream>(block);
+}
+
+
+Block SharedLibraryHandler::dataToBlock(const ClickHouseLibrary::RawClickHouseLibraryTable data)
+{
+    if (!data)
+        throw Exception("LibraryDictionarySource: No data returned", ErrorCodes::EXTERNAL_LIBRARY_ERROR);
+
+    const auto * columns_received = static_cast<const ClickHouseLibrary::Table *>(data);
+    if (columns_received->error_code)
+        throw Exception(
+            "LibraryDictionarySource: Returned error: " + std::to_string(columns_received->error_code) + " " + (columns_received->error_string ? columns_received->error_string : ""),
+            ErrorCodes::EXTERNAL_LIBRARY_ERROR);
+
+    MutableColumns columns = sample_block.cloneEmptyColumns();
+
+    for (size_t col_n = 0; col_n < columns_received->size; ++col_n)
+    {
+        if (columns.size() != columns_received->data[col_n].size)
+            throw Exception(
+                "LibraryDictionarySource: Returned unexpected number of columns: " + std::to_string(columns_received->data[col_n].size) + ", must be " + std::to_string(columns.size()),
+                ErrorCodes::SIZES_OF_COLUMNS_DOESNT_MATCH);
+
+        for (size_t row_n = 0; row_n < columns_received->data[col_n].size; ++row_n)
+        {
+            const auto & field = columns_received->data[col_n].data[row_n];
+            if (!field.data)
+            {
+                /// sample_block contains null_value (from config) inside corresponding column
+                const auto & col = sample_block.getByPosition(row_n);
+                columns[row_n]->insertFrom(*(col.column), 0);
+            }
+            else
+            {
+                const auto & size = field.size;
+                columns[row_n]->insertData(static_cast<const char *>(field.data), size);
+            }
+        }
+    }
+
+    return sample_block.cloneWithColumns(std::move(columns));
+}
+
+}
diff --git a/programs/library-bridge/SharedLibraryHandler.h b/programs/library-bridge/SharedLibraryHandler.h
new file mode 100644
index 00000000000..5c0334ac89f
--- /dev/null
+++ b/programs/library-bridge/SharedLibraryHandler.h
@@ -0,0 +1,54 @@
+#pragma once
+
+#include <Common/SharedLibrary.h>
+#include <common/logger_useful.h>
+#include <DataStreams/OneBlockInputStream.h>
+#include "LibraryUtils.h"
+
+
+namespace DB
+{
+
+/// A class that manages all operations with library dictionary.
+/// Every library dictionary source has its own object of this class, accessed by UUID.
+class SharedLibraryHandler
+{
+
+public:
+    SharedLibraryHandler(
+        const std::string & library_path_,
+        const std::vector<std::string> & library_settings,
+        const Block & sample_block_,
+        const std::vector<std::string> & attributes_names_);
+
+    SharedLibraryHandler(const SharedLibraryHandler & other);
+
+    ~SharedLibraryHandler();
+
+    BlockInputStreamPtr loadAll();
+
+    BlockInputStreamPtr loadIds(const std::vector<uint64_t> & ids);
+
+    BlockInputStreamPtr loadKeys(const Columns & key_columns);
+
+    bool isModified();
+
+    bool supportsSelectiveLoad();
+
+    const Block & getSampleBlock() { return sample_block; }
+
+private:
+    Block dataToBlock(const ClickHouseLibrary::RawClickHouseLibraryTable data);
+
+    std::string library_path;
+    const Block sample_block;
+    std::vector<std::string> attributes_names;
+
+    SharedLibraryPtr library;
+    std::shared_ptr<CStringsHolder> settings_holder;
+    void * lib_data;
+};
+
+using SharedLibraryHandlerPtr = std::shared_ptr<SharedLibraryHandler>;
+
+}
diff --git a/programs/library-bridge/SharedLibraryHandlerFactory.cpp b/programs/library-bridge/SharedLibraryHandlerFactory.cpp
new file mode 100644
index 00000000000..05494c313c4
--- /dev/null
+++ b/programs/library-bridge/SharedLibraryHandlerFactory.cpp
@@ -0,0 +1,67 @@
+#include "SharedLibraryHandlerFactory.h"
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+SharedLibraryHandlerPtr SharedLibraryHandlerFactory::get(const std::string & dictionary_id)
+{
+    std::lock_guard lock(mutex);
+    auto library_handler = library_handlers.find(dictionary_id);
+
+    if (library_handler != library_handlers.end())
+        return library_handler->second;
+
+    return nullptr;
+}
+
+
+void SharedLibraryHandlerFactory::create(
+    const std::string & dictionary_id,
+    const std::string & library_path,
+    const std::vector<std::string> & library_settings,
+    const Block & sample_block,
+    const std::vector<std::string> & attributes_names)
+{
+    std::lock_guard lock(mutex);
+    library_handlers[dictionary_id] = std::make_shared<SharedLibraryHandler>(library_path, library_settings, sample_block, attributes_names);
+}
+
+
+void SharedLibraryHandlerFactory::clone(const std::string & from_dictionary_id, const std::string & to_dictionary_id)
+{
+    std::lock_guard lock(mutex);
+    auto from_library_handler = library_handlers.find(from_dictionary_id);
+
+    /// This is not supposed to happen as libClone is called from copy constructor of LibraryDictionarySource
+    /// object, and shared library handler of from_dictionary is removed only in its destructor.
+    /// And if for from_dictionary there was no shared library handler, it would have received and exception in
+    /// its constructor, so no libClone would be made from it.
+    if (from_library_handler == library_handlers.end())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "No shared library handler found");
+
+    /// libClone method will be called in copy constructor
+    library_handlers[to_dictionary_id] = std::make_shared<SharedLibraryHandler>(*from_library_handler->second);
+}
+
+
+void SharedLibraryHandlerFactory::remove(const std::string & dictionary_id)
+{
+    std::lock_guard lock(mutex);
+    /// libDelete is called in destructor.
+    library_handlers.erase(dictionary_id);
+}
+
+
+SharedLibraryHandlerFactory & SharedLibraryHandlerFactory::instance()
+{
+    static SharedLibraryHandlerFactory ret;
+    return ret;
+}
+
+}
diff --git a/programs/library-bridge/SharedLibraryHandlerFactory.h b/programs/library-bridge/SharedLibraryHandlerFactory.h
new file mode 100644
index 00000000000..473d90618a2
--- /dev/null
+++ b/programs/library-bridge/SharedLibraryHandlerFactory.h
@@ -0,0 +1,37 @@
+#pragma once
+
+#include "SharedLibraryHandler.h"
+#include <unordered_map>
+#include <mutex>
+
+
+namespace DB
+{
+
+/// Each library dictionary source has unique UUID. When clone() method is called, a new UUID is generated.
+/// There is a unique mapping from diciotnary UUID to sharedLibraryHandler.
+class SharedLibraryHandlerFactory final : private boost::noncopyable
+{
+public:
+    static SharedLibraryHandlerFactory & instance();
+
+    SharedLibraryHandlerPtr get(const std::string & dictionary_id);
+
+    void create(
+        const std::string & dictionary_id,
+        const std::string & library_path,
+        const std::vector<std::string> & library_settings,
+        const Block & sample_block,
+        const std::vector<std::string> & attributes_names);
+
+    void clone(const std::string & from_dictionary_id, const std::string & to_dictionary_id);
+
+    void remove(const std::string & dictionary_id);
+
+private:
+    /// map: dict_id -> sharedLibraryHandler
+    std::unordered_map<std::string, SharedLibraryHandlerPtr> library_handlers;
+    std::mutex mutex;
+};
+
+}
diff --git a/programs/library-bridge/library-bridge.cpp b/programs/library-bridge/library-bridge.cpp
new file mode 100644
index 00000000000..5fff2ffe525
--- /dev/null
+++ b/programs/library-bridge/library-bridge.cpp
@@ -0,0 +1,3 @@
+int mainEntryClickHouseLibraryBridge(int argc, char ** argv);
+int main(int argc_, char ** argv_) { return mainEntryClickHouseLibraryBridge(argc_, argv_); }
+
diff --git a/programs/local/LocalServer.cpp b/programs/local/LocalServer.cpp
index 5a8d35e204d..f680c2c2da6 100644
--- a/programs/local/LocalServer.cpp
+++ b/programs/local/LocalServer.cpp
@@ -99,9 +99,9 @@ void LocalServer::initialize(Poco::Util::Application & self)
     }
 }
 
-void LocalServer::applyCmdSettings(Context & context)
+void LocalServer::applyCmdSettings(ContextPtr context)
 {
-    context.applySettingsChanges(cmd_settings.changes());
+    context->applySettingsChanges(cmd_settings.changes());
 }
 
 /// If path is specified and not empty, will try to setup server environment and load existing metadata
@@ -176,7 +176,7 @@ void LocalServer::tryInitPath()
 }
 
 
-static void attachSystemTables(const Context & context)
+static void attachSystemTables(ContextPtr context)
 {
     DatabasePtr system_database = DatabaseCatalog::instance().tryGetDatabase(DatabaseCatalog::SYSTEM_DATABASE);
     if (!system_database)
@@ -211,7 +211,7 @@ try
     }
 
     shared_context = Context::createShared();
-    global_context = std::make_unique<Context>(Context::createGlobal(shared_context.get()));
+    global_context = Context::createGlobal(shared_context.get());
     global_context->makeGlobalContext();
     global_context->setApplicationType(Context::ApplicationType::LOCAL);
     tryInitPath();
@@ -240,7 +240,7 @@ try
 
     /// Skip networking
 
-    /// Sets external authenticators config (LDAP).
+    /// Sets external authenticators config (LDAP, Kerberos).
     global_context->setExternalAuthenticatorsConfig(config());
 
     setupUsers();
@@ -260,6 +260,11 @@ try
     if (mark_cache_size)
         global_context->setMarkCache(mark_cache_size);
 
+    /// A cache for mmapped files.
+    size_t mmap_cache_size = config().getUInt64("mmap_cache_size", 1000);   /// The choice of default is arbitrary.
+    if (mmap_cache_size)
+        global_context->setMMappedFileCache(mmap_cache_size);
+
     /// Load global settings from default_profile and system_profile.
     global_context->setDefaultProfiles(config());
 
@@ -269,9 +274,9 @@ try
       *  if such tables will not be dropped, clickhouse-server will not be able to load them due to security reasons.
       */
     std::string default_database = config().getString("default_database", "_local");
-    DatabaseCatalog::instance().attachDatabase(default_database, std::make_shared<DatabaseMemory>(default_database, *global_context));
+    DatabaseCatalog::instance().attachDatabase(default_database, std::make_shared<DatabaseMemory>(default_database, global_context));
     global_context->setCurrentDatabase(default_database);
-    applyCmdOptions(*global_context);
+    applyCmdOptions(global_context);
 
     if (config().has("path"))
     {
@@ -283,15 +288,15 @@ try
         LOG_DEBUG(log, "Loading metadata from {}", path);
         Poco::File(path + "data/").createDirectories();
         Poco::File(path + "metadata/").createDirectories();
-        loadMetadataSystem(*global_context);
-        attachSystemTables(*global_context);
-        loadMetadata(*global_context);
+        loadMetadataSystem(global_context);
+        attachSystemTables(global_context);
+        loadMetadata(global_context);
         DatabaseCatalog::instance().loadDatabases();
         LOG_DEBUG(log, "Loaded metadata.");
     }
     else if (!config().has("no-system-tables"))
     {
-        attachSystemTables(*global_context);
+        attachSystemTables(global_context);
     }
 
     processQueries();
@@ -370,13 +375,13 @@ void LocalServer::processQueries()
 
     /// we can't mutate global global_context (can lead to races, as it was already passed to some background threads)
     /// so we can't reuse it safely as a query context and need a copy here
-    auto context = Context(*global_context);
+    auto context = Context::createCopy(global_context);
 
-    context.makeSessionContext();
-    context.makeQueryContext();
+    context->makeSessionContext();
+    context->makeQueryContext();
 
-    context.setUser("default", "", Poco::Net::SocketAddress{});
-    context.setCurrentQueryId("");
+    context->setUser("default", "", Poco::Net::SocketAddress{});
+    context->setCurrentQueryId("");
     applyCmdSettings(context);
 
     /// Use the same query_id (and thread group) for all queries
@@ -613,9 +618,9 @@ void LocalServer::init(int argc, char ** argv)
     argsToConfig(arguments, config(), 100);
 }
 
-void LocalServer::applyCmdOptions(Context & context)
+void LocalServer::applyCmdOptions(ContextPtr context)
 {
-    context.setDefaultFormat(config().getString("output-format", config().getString("format", "TSV")));
+    context->setDefaultFormat(config().getString("output-format", config().getString("format", "TSV")));
     applyCmdSettings(context);
 }
 
diff --git a/programs/local/LocalServer.h b/programs/local/LocalServer.h
index 02778bd86cb..3555e8a38ad 100644
--- a/programs/local/LocalServer.h
+++ b/programs/local/LocalServer.h
@@ -36,15 +36,15 @@ private:
     std::string getInitialCreateTableQuery();
 
     void tryInitPath();
-    void applyCmdOptions(Context & context);
-    void applyCmdSettings(Context & context);
+    void applyCmdOptions(ContextPtr context);
+    void applyCmdSettings(ContextPtr context);
     void processQueries();
     void setupUsers();
     void cleanup();
 
 protected:
     SharedContextHolder shared_context;
-    std::unique_ptr<Context> global_context;
+    ContextPtr global_context;
 
     /// Settings specified via command line args
     Settings cmd_settings;
diff --git a/programs/obfuscator/Obfuscator.cpp b/programs/obfuscator/Obfuscator.cpp
index 950db4e4f05..c92eb5c6647 100644
--- a/programs/obfuscator/Obfuscator.cpp
+++ b/programs/obfuscator/Obfuscator.cpp
@@ -100,16 +100,16 @@ class IModel
 {
 public:
     /// Call train iteratively for each block to train a model.
-    virtual void train(const IColumn & column);
+    virtual void train(const IColumn & column) = 0;
 
     /// Call finalize one time after training before generating.
-    virtual void finalize();
+    virtual void finalize() = 0;
 
     /// Call generate: pass source data column to obtain a column with anonymized data as a result.
-    virtual ColumnPtr generate(const IColumn & column);
+    virtual ColumnPtr generate(const IColumn & column) = 0;
 
     /// Deterministically change seed to some other value. This can be used to generate more values than were in source.
-    virtual void updateSeed();
+    virtual void updateSeed() = 0;
 
     virtual ~IModel() = default;
 };
@@ -1129,8 +1129,8 @@ try
     }
 
     SharedContextHolder shared_context = Context::createShared();
-    Context context = Context::createGlobal(shared_context.get());
-    context.makeGlobalContext();
+    ContextPtr context = Context::createGlobal(shared_context.get());
+    context->makeGlobalContext();
 
     ReadBufferFromFileDescriptor file_in(STDIN_FILENO);
     WriteBufferFromFileDescriptor file_out(STDOUT_FILENO);
@@ -1152,7 +1152,7 @@ try
         if (!silent)
             std::cerr << "Training models\n";
 
-        BlockInputStreamPtr input = context.getInputFormat(input_format, file_in, header, max_block_size);
+        BlockInputStreamPtr input = context->getInputFormat(input_format, file_in, header, max_block_size);
 
         input->readPrefix();
         while (Block block = input->read())
@@ -1179,8 +1179,8 @@ try
 
         file_in.seek(0, SEEK_SET);
 
-        BlockInputStreamPtr input = context.getInputFormat(input_format, file_in, header, max_block_size);
-        BlockOutputStreamPtr output = context.getOutputStream(output_format, file_out, header);
+        BlockInputStreamPtr input = context->getInputFormat(input_format, file_in, header, max_block_size);
+        BlockOutputStreamPtr output = context->getOutputStreamParallelIfPossible(output_format, file_out, header);
 
         if (processed_rows + source_rows > limit)
             input = std::make_shared<LimitBlockInputStream>(input, limit - processed_rows, 0);
diff --git a/programs/odbc-bridge/CMakeLists.txt b/programs/odbc-bridge/CMakeLists.txt
index 11864354619..7b232f2b5dc 100644
--- a/programs/odbc-bridge/CMakeLists.txt
+++ b/programs/odbc-bridge/CMakeLists.txt
@@ -24,12 +24,14 @@ add_executable(clickhouse-odbc-bridge ${CLICKHOUSE_ODBC_BRIDGE_SOURCES})
 target_link_libraries(clickhouse-odbc-bridge PRIVATE
     daemon
     dbms
+    bridge
     clickhouse_parsers
-    Poco::Data
-    Poco::Data::ODBC
+    nanodbc
+    unixodbc
 )
 
 set_target_properties(clickhouse-odbc-bridge PROPERTIES RUNTIME_OUTPUT_DIRECTORY ..)
+target_compile_options (clickhouse-odbc-bridge PRIVATE -Wno-reserved-id-macro -Wno-keyword-macro)
 
 if (USE_GDB_ADD_INDEX)
     add_custom_command(TARGET clickhouse-odbc-bridge POST_BUILD COMMAND ${GDB_ADD_INDEX_EXE} ../clickhouse-odbc-bridge COMMENT "Adding .gdb-index to clickhouse-odbc-bridge" VERBATIM)
diff --git a/programs/odbc-bridge/ColumnInfoHandler.cpp b/programs/odbc-bridge/ColumnInfoHandler.cpp
index 14fa734f246..e33858583c2 100644
--- a/programs/odbc-bridge/ColumnInfoHandler.cpp
+++ b/programs/odbc-bridge/ColumnInfoHandler.cpp
@@ -2,29 +2,36 @@
 
 #if USE_ODBC
 
-#    include <DataTypes/DataTypeFactory.h>
-#    include <DataTypes/DataTypeNullable.h>
-#    include <Server/HTTP/WriteBufferFromHTTPServerResponse.h>
-#    include <IO/WriteHelpers.h>
-#    include <Parsers/ParserQueryWithOutput.h>
-#    include <Parsers/parseQuery.h>
-#    include <Poco/Data/ODBC/ODBCException.h>
-#    include <Poco/Data/ODBC/SessionImpl.h>
-#    include <Poco/Data/ODBC/Utility.h>
-#    include <Server/HTTP/HTMLForm.h>
-#    include <Poco/Net/HTTPServerRequest.h>
-#    include <Poco/Net/HTTPServerResponse.h>
-#    include <Poco/NumberParser.h>
-#    include <common/logger_useful.h>
-#    include <Common/quoteString.h>
-#    include <ext/scope_guard.h>
-#    include "getIdentifierQuote.h"
-#    include "validateODBCConnectionString.h"
+#include <DataTypes/DataTypeFactory.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <Server/HTTP/WriteBufferFromHTTPServerResponse.h>
+#include <IO/WriteHelpers.h>
+#include <Parsers/ParserQueryWithOutput.h>
+#include <Parsers/parseQuery.h>
+#include <Server/HTTP/HTMLForm.h>
+#include <Poco/Net/HTTPServerRequest.h>
+#include <Poco/Net/HTTPServerResponse.h>
+#include <Poco/NumberParser.h>
+#include <common/logger_useful.h>
+#include <Common/quoteString.h>
+#include <ext/scope_guard.h>
+#include "getIdentifierQuote.h"
+#include "validateODBCConnectionString.h"
+#include "ODBCConnectionFactory.h"
+
+#include <sql.h>
+#include <sqlext.h>
 
-#    define POCO_SQL_ODBC_CLASS Poco::Data::ODBC
 
 namespace DB
 {
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+    extern const int BAD_ARGUMENTS;
+}
+
 namespace
 {
     DataTypePtr getDataType(SQLSMALLINT type)
@@ -59,6 +66,7 @@ namespace
     }
 }
 
+
 void ODBCColumnsInfoHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse & response)
 {
     HTMLForm params(request, request.getStream());
@@ -77,88 +85,79 @@ void ODBCColumnsInfoHandler::handleRequest(HTTPServerRequest & request, HTTPServ
         process_error("No 'table' param in request URL");
         return;
     }
+
     if (!params.has("connection_string"))
     {
         process_error("No 'connection_string' in request URL");
         return;
     }
+
     std::string schema_name;
     std::string table_name = params.get("table");
     std::string connection_string = params.get("connection_string");
 
     if (params.has("schema"))
-    {
         schema_name = params.get("schema");
-        LOG_TRACE(log, "Will fetch info for table '{}'", schema_name + "." + table_name);
-    }
-    else
-        LOG_TRACE(log, "Will fetch info for table '{}'", table_name);
+
     LOG_TRACE(log, "Got connection str '{}'", connection_string);
 
     try
     {
         const bool external_table_functions_use_nulls = Poco::NumberParser::parseBool(params.get("external_table_functions_use_nulls", "false"));
 
-        POCO_SQL_ODBC_CLASS::SessionImpl session(validateODBCConnectionString(connection_string), DBMS_DEFAULT_CONNECT_TIMEOUT_SEC);
-        SQLHDBC hdbc = session.dbc().handle();
+        auto connection = ODBCConnectionFactory::instance().get(
+                validateODBCConnectionString(connection_string),
+                getContext()->getSettingsRef().odbc_bridge_connection_pool_size);
 
-        SQLHSTMT hstmt = nullptr;
+        nanodbc::catalog catalog(*connection);
+        std::string catalog_name;
 
-        if (POCO_SQL_ODBC_CLASS::Utility::isError(SQLAllocStmt(hdbc, &hstmt)))
-            throw POCO_SQL_ODBC_CLASS::ODBCException("Could not allocate connection handle.");
-
-        SCOPE_EXIT(SQLFreeStmt(hstmt, SQL_DROP));
-
-        const auto & context_settings = context.getSettingsRef();
-
-        /// TODO Why not do SQLColumns instead?
-        std::string name = schema_name.empty() ? backQuoteIfNeed(table_name) : backQuoteIfNeed(schema_name) + "." + backQuoteIfNeed(table_name);
-        WriteBufferFromOwnString buf;
-        std::string input = "SELECT * FROM " + name + " WHERE 1 = 0";
-        ParserQueryWithOutput parser(input.data() + input.size());
-        ASTPtr select = parseQuery(parser, input.data(), input.data() + input.size(), "", context_settings.max_query_size, context_settings.max_parser_depth);
-
-        IAST::FormatSettings settings(buf, true);
-        settings.always_quote_identifiers = true;
-        settings.identifier_quoting_style = getQuotingStyle(hdbc);
-        select->format(settings);
-        std::string query = buf.str();
-
-        LOG_TRACE(log, "Inferring structure with query '{}'", query);
-
-        if (POCO_SQL_ODBC_CLASS::Utility::isError(POCO_SQL_ODBC_CLASS::SQLPrepare(hstmt, reinterpret_cast<SQLCHAR *>(query.data()), query.size())))
-            throw POCO_SQL_ODBC_CLASS::DescriptorException(session.dbc());
-
-        if (POCO_SQL_ODBC_CLASS::Utility::isError(SQLExecute(hstmt)))
-            throw POCO_SQL_ODBC_CLASS::StatementException(hstmt);
-
-        SQLSMALLINT cols = 0;
-        if (POCO_SQL_ODBC_CLASS::Utility::isError(SQLNumResultCols(hstmt, &cols)))
-            throw POCO_SQL_ODBC_CLASS::StatementException(hstmt);
-
-        /// TODO cols not checked
-
-        NamesAndTypesList columns;
-        for (SQLSMALLINT ncol = 1; ncol <= cols; ++ncol)
+        /// In XDBC tables it is allowed to pass either database_name or schema_name in table definion, but not both of them.
+        /// They both are passed as 'schema' parameter in request URL, so it is not clear whether it is database_name or schema_name passed.
+        /// If it is schema_name then we know that database is added in odbc.ini. But if we have database_name as 'schema',
+        /// it is not guaranteed. For nanodbc database_name must be either in odbc.ini or passed as catalog_name.
+        auto get_columns = [&]()
         {
-            SQLSMALLINT type = 0;
-            /// TODO Why 301?
-            SQLCHAR column_name[301];
-
-            SQLSMALLINT is_nullable;
-            const auto result = POCO_SQL_ODBC_CLASS::SQLDescribeCol(hstmt, ncol, column_name, sizeof(column_name), nullptr, &type, nullptr, nullptr, &is_nullable);
-            if (POCO_SQL_ODBC_CLASS::Utility::isError(result))
-                throw POCO_SQL_ODBC_CLASS::StatementException(hstmt);
-
-            auto column_type = getDataType(type);
-            if (external_table_functions_use_nulls && is_nullable == SQL_NULLABLE)
+            nanodbc::catalog::tables tables = catalog.find_tables(table_name, /* type = */ "", /* schema = */ "", /* catalog = */ schema_name);
+            if (tables.next())
             {
-                column_type = std::make_shared<DataTypeNullable>(column_type);
+                catalog_name = tables.table_catalog();
+                LOG_TRACE(log, "Will fetch info for table '{}.{}'", catalog_name, table_name);
+                return catalog.find_columns(/* column = */ "", table_name, /* schema = */ "", catalog_name);
             }
 
-            columns.emplace_back(reinterpret_cast<char *>(column_name), std::move(column_type));
+            tables = catalog.find_tables(table_name, /* type = */ "", /* schema = */ schema_name);
+            if (tables.next())
+            {
+                catalog_name = tables.table_catalog();
+                LOG_TRACE(log, "Will fetch info for table '{}.{}.{}'", catalog_name, schema_name, table_name);
+                return catalog.find_columns(/* column = */ "", table_name, schema_name, catalog_name);
+            }
+
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Table {} not found", schema_name.empty() ? table_name : schema_name + '.' + table_name);
+        };
+
+        nanodbc::catalog::columns columns_definition = get_columns();
+
+        NamesAndTypesList columns;
+        while (columns_definition.next())
+        {
+            SQLSMALLINT type = columns_definition.sql_data_type();
+            std::string column_name = columns_definition.column_name();
+
+            bool is_nullable = columns_definition.nullable() == SQL_NULLABLE;
+
+            auto column_type = getDataType(type);
+
+            if (external_table_functions_use_nulls && is_nullable == SQL_NULLABLE)
+                column_type = std::make_shared<DataTypeNullable>(column_type);
+
+            columns.emplace_back(column_name, std::move(column_type));
         }
 
+        if (columns.empty())
+            throw Exception("Columns definition was not returned", ErrorCodes::LOGICAL_ERROR);
+
         WriteBufferFromHTTPServerResponse out(response, request.getMethod() == Poco::Net::HTTPRequest::HTTP_HEAD, keep_alive_timeout);
         try
         {
diff --git a/programs/odbc-bridge/ColumnInfoHandler.h b/programs/odbc-bridge/ColumnInfoHandler.h
index 9b5b470b31d..bc976f54aee 100644
--- a/programs/odbc-bridge/ColumnInfoHandler.h
+++ b/programs/odbc-bridge/ColumnInfoHandler.h
@@ -2,24 +2,23 @@
 
 #if USE_ODBC
 
-#    include <Interpreters/Context.h>
-#    include <Server/HTTP/HTTPRequestHandler.h>
-#    include <Common/config.h>
+#include <Interpreters/Context_fwd.h>
+#include <Interpreters/Context.h>
+#include <Server/HTTP/HTTPRequestHandler.h>
+#include <Common/config.h>
+#include <Poco/Logger.h>
 
-#    include <Poco/Logger.h>
 
-/** The structure of the table is taken from the query "SELECT * FROM table WHERE 1=0".
-  * TODO: It would be much better to utilize ODBC methods dedicated for columns description.
-  * If there is no such table, an exception is thrown.
-  */
 namespace DB
 {
 
-class ODBCColumnsInfoHandler : public HTTPRequestHandler
+class ODBCColumnsInfoHandler : public HTTPRequestHandler, WithContext
 {
 public:
-    ODBCColumnsInfoHandler(size_t keep_alive_timeout_, Context & context_)
-        : log(&Poco::Logger::get("ODBCColumnsInfoHandler")), keep_alive_timeout(keep_alive_timeout_), context(context_)
+    ODBCColumnsInfoHandler(size_t keep_alive_timeout_, ContextPtr context_)
+        : WithContext(context_)
+        , log(&Poco::Logger::get("ODBCColumnsInfoHandler"))
+        , keep_alive_timeout(keep_alive_timeout_)
     {
     }
 
@@ -28,7 +27,6 @@ public:
 private:
     Poco::Logger * log;
     size_t keep_alive_timeout;
-    Context & context;
 };
 
 }
diff --git a/programs/odbc-bridge/HandlerFactory.cpp b/programs/odbc-bridge/HandlerFactory.cpp
index 9ac48af4ace..49984453d33 100644
--- a/programs/odbc-bridge/HandlerFactory.cpp
+++ b/programs/odbc-bridge/HandlerFactory.cpp
@@ -8,7 +8,7 @@
 namespace DB
 {
 
-std::unique_ptr<HTTPRequestHandler> HandlerFactory::createRequestHandler(const HTTPServerRequest & request)
+std::unique_ptr<HTTPRequestHandler> ODBCBridgeHandlerFactory::createRequestHandler(const HTTPServerRequest & request)
 {
     Poco::URI uri{request.getURI()};
     LOG_TRACE(log, "Request URI: {}", uri.toString());
@@ -21,26 +21,26 @@ std::unique_ptr<HTTPRequestHandler> HandlerFactory::createRequestHandler(const H
 
         if (uri.getPath() == "/columns_info")
 #if USE_ODBC
-            return std::make_unique<ODBCColumnsInfoHandler>(keep_alive_timeout, context);
+            return std::make_unique<ODBCColumnsInfoHandler>(keep_alive_timeout, getContext());
 #else
             return nullptr;
 #endif
         else if (uri.getPath() == "/identifier_quote")
 #if USE_ODBC
-            return std::make_unique<IdentifierQuoteHandler>(keep_alive_timeout, context);
+            return std::make_unique<IdentifierQuoteHandler>(keep_alive_timeout, getContext());
 #else
             return nullptr;
 #endif
         else if (uri.getPath() == "/schema_allowed")
 #if USE_ODBC
-            return std::make_unique<SchemaAllowedHandler>(keep_alive_timeout, context);
+            return std::make_unique<SchemaAllowedHandler>(keep_alive_timeout, getContext());
 #else
             return nullptr;
 #endif
         else if (uri.getPath() == "/write")
-            return std::make_unique<ODBCHandler>(pool_map, keep_alive_timeout, context, "write");
+            return std::make_unique<ODBCHandler>(keep_alive_timeout, getContext(), "write");
         else
-            return std::make_unique<ODBCHandler>(pool_map, keep_alive_timeout, context, "read");
+            return std::make_unique<ODBCHandler>(keep_alive_timeout, getContext(), "read");
     }
     return nullptr;
 }
diff --git a/programs/odbc-bridge/HandlerFactory.h b/programs/odbc-bridge/HandlerFactory.h
index 5dce6f02ecd..ffbbe3670af 100644
--- a/programs/odbc-bridge/HandlerFactory.h
+++ b/programs/odbc-bridge/HandlerFactory.h
@@ -1,32 +1,28 @@
 #pragma once
 
-#include <Interpreters/Context.h>
+#include <Interpreters/Context_fwd.h>
 #include <Server/HTTP/HTTPRequestHandlerFactory.h>
 #include "ColumnInfoHandler.h"
 #include "IdentifierQuoteHandler.h"
 #include "MainHandler.h"
 #include "SchemaAllowedHandler.h"
-
 #include <Poco/Logger.h>
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunused-parameter"
-#include <Poco/Data/SessionPool.h>
-#pragma GCC diagnostic pop
-
 
 namespace DB
 {
 /** Factory for '/ping', '/', '/columns_info', '/identifier_quote', '/schema_allowed' handlers.
   * Also stores Session pools for ODBC connections
   */
-class HandlerFactory : public HTTPRequestHandlerFactory
+class ODBCBridgeHandlerFactory : public HTTPRequestHandlerFactory, WithContext
 {
 public:
-    HandlerFactory(const std::string & name_, size_t keep_alive_timeout_, Context & context_)
-        : log(&Poco::Logger::get(name_)), name(name_), keep_alive_timeout(keep_alive_timeout_), context(context_)
+    ODBCBridgeHandlerFactory(const std::string & name_, size_t keep_alive_timeout_, ContextPtr context_)
+        : WithContext(context_)
+        , log(&Poco::Logger::get(name_))
+        , name(name_)
+        , keep_alive_timeout(keep_alive_timeout_)
     {
-        pool_map = std::make_shared<ODBCHandler::PoolMap>();
     }
 
     std::unique_ptr<HTTPRequestHandler> createRequestHandler(const HTTPServerRequest & request) override;
@@ -35,7 +31,6 @@ private:
     Poco::Logger * log;
     std::string name;
     size_t keep_alive_timeout;
-    Context & context;
-    std::shared_ptr<ODBCHandler::PoolMap> pool_map;
 };
+
 }
diff --git a/programs/odbc-bridge/IdentifierQuoteHandler.cpp b/programs/odbc-bridge/IdentifierQuoteHandler.cpp
index 5060d37c479..a5a97cb8086 100644
--- a/programs/odbc-bridge/IdentifierQuoteHandler.cpp
+++ b/programs/odbc-bridge/IdentifierQuoteHandler.cpp
@@ -2,23 +2,20 @@
 
 #if USE_ODBC
 
-#    include <DataTypes/DataTypeFactory.h>
-#    include <Server/HTTP/HTMLForm.h>
-#    include <Server/HTTP/WriteBufferFromHTTPServerResponse.h>
-#    include <IO/WriteHelpers.h>
-#    include <Parsers/ParserQueryWithOutput.h>
-#    include <Parsers/parseQuery.h>
-#    include <Poco/Data/ODBC/ODBCException.h>
-#    include <Poco/Data/ODBC/SessionImpl.h>
-#    include <Poco/Data/ODBC/Utility.h>
-#    include <Poco/Net/HTTPServerRequest.h>
-#    include <Poco/Net/HTTPServerResponse.h>
-#    include <common/logger_useful.h>
-#    include <ext/scope_guard.h>
-#    include "getIdentifierQuote.h"
-#    include "validateODBCConnectionString.h"
+#include <DataTypes/DataTypeFactory.h>
+#include <Server/HTTP/HTMLForm.h>
+#include <Server/HTTP/WriteBufferFromHTTPServerResponse.h>
+#include <IO/WriteHelpers.h>
+#include <Parsers/ParserQueryWithOutput.h>
+#include <Parsers/parseQuery.h>
+#include <Poco/Net/HTTPServerRequest.h>
+#include <Poco/Net/HTTPServerResponse.h>
+#include <common/logger_useful.h>
+#include <ext/scope_guard.h>
+#include "getIdentifierQuote.h"
+#include "validateODBCConnectionString.h"
+#include "ODBCConnectionFactory.h"
 
-#    define POCO_SQL_ODBC_CLASS Poco::Data::ODBC
 
 namespace DB
 {
@@ -44,10 +41,12 @@ void IdentifierQuoteHandler::handleRequest(HTTPServerRequest & request, HTTPServ
     try
     {
         std::string connection_string = params.get("connection_string");
-        POCO_SQL_ODBC_CLASS::SessionImpl session(validateODBCConnectionString(connection_string), DBMS_DEFAULT_CONNECT_TIMEOUT_SEC);
-        SQLHDBC hdbc = session.dbc().handle();
 
-        auto identifier = getIdentifierQuote(hdbc);
+        auto connection = ODBCConnectionFactory::instance().get(
+                validateODBCConnectionString(connection_string),
+                getContext()->getSettingsRef().odbc_bridge_connection_pool_size);
+
+        auto identifier = getIdentifierQuote(*connection);
 
         WriteBufferFromHTTPServerResponse out(response, request.getMethod() == Poco::Net::HTTPRequest::HTTP_HEAD, keep_alive_timeout);
         try
diff --git a/programs/odbc-bridge/IdentifierQuoteHandler.h b/programs/odbc-bridge/IdentifierQuoteHandler.h
index dad88c72ad8..ef3806fd802 100644
--- a/programs/odbc-bridge/IdentifierQuoteHandler.h
+++ b/programs/odbc-bridge/IdentifierQuoteHandler.h
@@ -11,11 +11,13 @@
 namespace DB
 {
 
-class IdentifierQuoteHandler : public HTTPRequestHandler
+class IdentifierQuoteHandler : public HTTPRequestHandler, WithContext
 {
 public:
-    IdentifierQuoteHandler(size_t keep_alive_timeout_, Context &)
-        : log(&Poco::Logger::get("IdentifierQuoteHandler")), keep_alive_timeout(keep_alive_timeout_)
+    IdentifierQuoteHandler(size_t keep_alive_timeout_, ContextPtr context_)
+        : WithContext(context_)
+        , log(&Poco::Logger::get("IdentifierQuoteHandler"))
+        , keep_alive_timeout(keep_alive_timeout_)
     {
     }
 
diff --git a/programs/odbc-bridge/MainHandler.cpp b/programs/odbc-bridge/MainHandler.cpp
index 4fcc9deea6a..e24b51f6037 100644
--- a/programs/odbc-bridge/MainHandler.cpp
+++ b/programs/odbc-bridge/MainHandler.cpp
@@ -18,18 +18,17 @@
 #include <Processors/Formats/InputStreamFromInputFormat.h>
 #include <common/logger_useful.h>
 #include <Server/HTTP/HTMLForm.h>
+#include "ODBCConnectionFactory.h"
 
 #include <mutex>
 #include <memory>
 
+#include <nanodbc/nanodbc.h>
 
-#if USE_ODBC
-#include <Poco/Data/ODBC/SessionImpl.h>
-#define POCO_SQL_ODBC_CLASS Poco::Data::ODBC
-#endif
 
 namespace DB
 {
+
 namespace
 {
     std::unique_ptr<Block> parseColumns(std::string && column_string)
@@ -42,37 +41,6 @@ namespace
     }
 }
 
-using PocoSessionPoolConstructor = std::function<std::shared_ptr<Poco::Data::SessionPool>()>;
-/** Is used to adjust max size of default Poco thread pool. See issue #750
-  * Acquire the lock, resize pool and construct new Session.
-  */
-static std::shared_ptr<Poco::Data::SessionPool> createAndCheckResizePocoSessionPool(PocoSessionPoolConstructor pool_constr)
-{
-    static std::mutex mutex;
-
-    Poco::ThreadPool & pool = Poco::ThreadPool::defaultPool();
-
-    /// NOTE: The lock don't guarantee that external users of the pool don't change its capacity
-    std::unique_lock lock(mutex);
-
-    if (pool.available() == 0)
-        pool.addCapacity(2 * std::max(pool.capacity(), 1));
-
-    return pool_constr();
-}
-
-ODBCHandler::PoolPtr ODBCHandler::getPool(const std::string & connection_str)
-{
-    std::lock_guard lock(mutex);
-    if (!pool_map->count(connection_str))
-    {
-        pool_map->emplace(connection_str, createAndCheckResizePocoSessionPool([connection_str]
-        {
-            return std::make_shared<Poco::Data::SessionPool>("ODBC", validateODBCConnectionString(connection_str));
-        }));
-    }
-    return pool_map->at(connection_str);
-}
 
 void ODBCHandler::processError(HTTPServerResponse & response, const std::string & message)
 {
@@ -82,12 +50,14 @@ void ODBCHandler::processError(HTTPServerResponse & response, const std::string
     LOG_WARNING(log, message);
 }
 
+
 void ODBCHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse & response)
 {
     HTMLForm params(request);
+    LOG_TRACE(log, "Request URI: {}", request.getURI());
+
     if (mode == "read")
         params.read(request.getStream());
-    LOG_TRACE(log, "Request URI: {}", request.getURI());
 
     if (mode == "read" && !params.has("query"))
     {
@@ -95,11 +65,6 @@ void ODBCHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse
         return;
     }
 
-    if (!params.has("columns"))
-    {
-        processError(response, "No 'columns' in request URL");
-        return;
-    }
 
     if (!params.has("connection_string"))
     {
@@ -107,6 +72,16 @@ void ODBCHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse
         return;
     }
 
+    if (!params.has("sample_block"))
+    {
+        processError(response, "No 'sample_block' in request URL");
+        return;
+    }
+
+    std::string format = params.get("format", "RowBinary");
+    std::string connection_string = params.get("connection_string");
+    LOG_TRACE(log, "Connection string: '{}'", connection_string);
+
     UInt64 max_block_size = DEFAULT_BLOCK_SIZE;
     if (params.has("max_block_size"))
     {
@@ -119,28 +94,27 @@ void ODBCHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse
         max_block_size = parse<size_t>(max_block_size_str);
     }
 
-    std::string columns = params.get("columns");
+    std::string sample_block_string = params.get("sample_block");
     std::unique_ptr<Block> sample_block;
     try
     {
-        sample_block = parseColumns(std::move(columns));
+        sample_block = parseColumns(std::move(sample_block_string));
     }
     catch (const Exception & ex)
     {
-        processError(response, "Invalid 'columns' parameter in request body '" + ex.message() + "'");
-        LOG_WARNING(log, ex.getStackTraceString());
+        processError(response, "Invalid 'sample_block' parameter in request body '" + ex.message() + "'");
+        LOG_ERROR(log, ex.getStackTraceString());
         return;
     }
 
-    std::string format = params.get("format", "RowBinary");
-
-    std::string connection_string = params.get("connection_string");
-    LOG_TRACE(log, "Connection string: '{}'", connection_string);
-
     WriteBufferFromHTTPServerResponse out(response, request.getMethod() == Poco::Net::HTTPRequest::HTTP_HEAD, keep_alive_timeout);
 
     try
     {
+        auto connection = ODBCConnectionFactory::instance().get(
+                validateODBCConnectionString(connection_string),
+                getContext()->getSettingsRef().odbc_bridge_connection_pool_size);
+
         if (mode == "write")
         {
             if (!params.has("db_name"))
@@ -159,15 +133,12 @@ void ODBCHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse
 
             auto quoting_style = IdentifierQuotingStyle::None;
 #if USE_ODBC
-            POCO_SQL_ODBC_CLASS::SessionImpl session(validateODBCConnectionString(connection_string), DBMS_DEFAULT_CONNECT_TIMEOUT_SEC);
-            quoting_style = getQuotingStyle(session.dbc().handle());
+            quoting_style = getQuotingStyle(*connection);
 #endif
-
-            auto pool = getPool(connection_string);
             auto & read_buf = request.getStream();
-            auto input_format = FormatFactory::instance().getInput(format, read_buf, *sample_block, context, max_block_size);
+            auto input_format = FormatFactory::instance().getInput(format, read_buf, *sample_block, getContext(), max_block_size);
             auto input_stream = std::make_shared<InputStreamFromInputFormat>(input_format);
-            ODBCBlockOutputStream output_stream(pool->get(), db_name, table_name, *sample_block, quoting_style);
+            ODBCBlockOutputStream output_stream(*connection, db_name, table_name, *sample_block, getContext(), quoting_style);
             copyData(*input_stream, output_stream);
             writeStringBinary("Ok.", out);
         }
@@ -176,9 +147,8 @@ void ODBCHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse
             std::string query = params.get("query");
             LOG_TRACE(log, "Query: {}", query);
 
-            BlockOutputStreamPtr writer = FormatFactory::instance().getOutputStream(format, out, *sample_block, context);
-            auto pool = getPool(connection_string);
-            ODBCBlockInputStream inp(pool->get(), query, *sample_block, max_block_size);
+            BlockOutputStreamPtr writer = FormatFactory::instance().getOutputStreamParallelIfPossible(format, out, *sample_block, getContext());
+            ODBCBlockInputStream inp(*connection, query, *sample_block, max_block_size);
             copyData(inp, *writer);
         }
     }
diff --git a/programs/odbc-bridge/MainHandler.h b/programs/odbc-bridge/MainHandler.h
index e237ede5814..bc0fca8b9a5 100644
--- a/programs/odbc-bridge/MainHandler.h
+++ b/programs/odbc-bridge/MainHandler.h
@@ -1,14 +1,13 @@
 #pragma once
 
-#include <Interpreters/Context.h>
+#include <Interpreters/Context_fwd.h>
 #include <Server/HTTP/HTTPRequestHandler.h>
-
 #include <Poco/Logger.h>
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunused-parameter"
-#include <Poco/Data/SessionPool.h>
-#pragma GCC diagnostic pop
+
+#include <mutex>
+#include <unordered_map>
+
 
 namespace DB
 {
@@ -17,20 +16,16 @@ namespace DB
   * and also query in request body
   * response in RowBinary format
   */
-class ODBCHandler : public HTTPRequestHandler
+class ODBCHandler : public HTTPRequestHandler, WithContext
 {
 public:
-    using PoolPtr = std::shared_ptr<Poco::Data::SessionPool>;
-    using PoolMap = std::unordered_map<std::string, PoolPtr>;
-
-    ODBCHandler(std::shared_ptr<PoolMap> pool_map_,
+    ODBCHandler(
         size_t keep_alive_timeout_,
-        Context & context_,
+        ContextPtr context_,
         const String & mode_)
-        : log(&Poco::Logger::get("ODBCHandler"))
-        , pool_map(pool_map_)
+        : WithContext(context_)
+        , log(&Poco::Logger::get("ODBCHandler"))
         , keep_alive_timeout(keep_alive_timeout_)
-        , context(context_)
         , mode(mode_)
     {
     }
@@ -40,14 +35,11 @@ public:
 private:
     Poco::Logger * log;
 
-    std::shared_ptr<PoolMap> pool_map;
     size_t keep_alive_timeout;
-    Context & context;
     String mode;
 
     static inline std::mutex mutex;
 
-    PoolPtr getPool(const std::string & connection_str);
     void processError(HTTPServerResponse & response, const std::string & message);
 };
 
diff --git a/programs/odbc-bridge/ODBCBlockInputStream.cpp b/programs/odbc-bridge/ODBCBlockInputStream.cpp
index 3e2a2d0c7d4..3a73cb9f601 100644
--- a/programs/odbc-bridge/ODBCBlockInputStream.cpp
+++ b/programs/odbc-bridge/ODBCBlockInputStream.cpp
@@ -1,5 +1,7 @@
 #include "ODBCBlockInputStream.h"
 #include <vector>
+#include <IO/ReadBufferFromString.h>
+#include <DataTypes/DataTypeNullable.h>
 #include <Columns/ColumnNullable.h>
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnsNumber.h>
@@ -14,137 +16,143 @@ namespace DB
 {
 namespace ErrorCodes
 {
-    extern const int NUMBER_OF_COLUMNS_DOESNT_MATCH;
     extern const int UNKNOWN_TYPE;
 }
 
 
 ODBCBlockInputStream::ODBCBlockInputStream(
-    Poco::Data::Session && session_, const std::string & query_str, const Block & sample_block, const UInt64 max_block_size_)
-    : session{session_}
-    , statement{(this->session << query_str, Poco::Data::Keywords::now)}
-    , result{statement}
-    , iterator{result.begin()}
+    nanodbc::connection & connection_, const std::string & query_str, const Block & sample_block, const UInt64 max_block_size_)
+    : log(&Poco::Logger::get("ODBCBlockInputStream"))
     , max_block_size{max_block_size_}
-    , log(&Poco::Logger::get("ODBCBlockInputStream"))
+    , connection(connection_)
+    , query(query_str)
 {
-    if (sample_block.columns() != result.columnCount())
-        throw Exception{"RecordSet contains " + toString(result.columnCount()) + " columns while " + toString(sample_block.columns())
-                            + " expected",
-                        ErrorCodes::NUMBER_OF_COLUMNS_DOESNT_MATCH};
-
     description.init(sample_block);
-}
-
-
-namespace
-{
-    using ValueType = ExternalResultDescription::ValueType;
-
-    void insertValue(IColumn & column, const ValueType type, const Poco::Dynamic::Var & value)
-    {
-        switch (type)
-        {
-            case ValueType::vtUInt8:
-                assert_cast<ColumnUInt8 &>(column).insertValue(value.convert<UInt64>());
-                break;
-            case ValueType::vtUInt16:
-                assert_cast<ColumnUInt16 &>(column).insertValue(value.convert<UInt64>());
-                break;
-            case ValueType::vtUInt32:
-                assert_cast<ColumnUInt32 &>(column).insertValue(value.convert<UInt64>());
-                break;
-            case ValueType::vtUInt64:
-                assert_cast<ColumnUInt64 &>(column).insertValue(value.convert<UInt64>());
-                break;
-            case ValueType::vtInt8:
-                assert_cast<ColumnInt8 &>(column).insertValue(value.convert<Int64>());
-                break;
-            case ValueType::vtInt16:
-                assert_cast<ColumnInt16 &>(column).insertValue(value.convert<Int64>());
-                break;
-            case ValueType::vtInt32:
-                assert_cast<ColumnInt32 &>(column).insertValue(value.convert<Int64>());
-                break;
-            case ValueType::vtInt64:
-                assert_cast<ColumnInt64 &>(column).insertValue(value.convert<Int64>());
-                break;
-            case ValueType::vtFloat32:
-                assert_cast<ColumnFloat32 &>(column).insertValue(value.convert<Float64>());
-                break;
-            case ValueType::vtFloat64:
-                assert_cast<ColumnFloat64 &>(column).insertValue(value.convert<Float64>());
-                break;
-            case ValueType::vtString:
-                assert_cast<ColumnString &>(column).insert(value.convert<String>());
-                break;
-            case ValueType::vtDate:
-            {
-                Poco::DateTime date = value.convert<Poco::DateTime>();
-                assert_cast<ColumnUInt16 &>(column).insertValue(UInt16{LocalDate(date.year(), date.month(), date.day()).getDayNum()});
-                break;
-            }
-            case ValueType::vtDateTime:
-            {
-                Poco::DateTime datetime = value.convert<Poco::DateTime>();
-                assert_cast<ColumnUInt32 &>(column).insertValue(time_t{LocalDateTime(
-                    datetime.year(), datetime.month(), datetime.day(), datetime.hour(), datetime.minute(), datetime.second())});
-                break;
-            }
-            case ValueType::vtUUID:
-                assert_cast<ColumnUInt128 &>(column).insert(parse<UUID>(value.convert<std::string>()));
-                break;
-            default:
-                throw Exception("Unsupported value type", ErrorCodes::UNKNOWN_TYPE);
-        }
-    }
-
-    void insertDefaultValue(IColumn & column, const IColumn & sample_column) { column.insertFrom(sample_column, 0); }
+    result = execute(connection, NANODBC_TEXT(query));
 }
 
 
 Block ODBCBlockInputStream::readImpl()
 {
-    if (iterator == result.end())
-        return {};
-
-    MutableColumns columns(description.sample_block.columns());
-    for (const auto i : ext::range(0, columns.size()))
-        columns[i] = description.sample_block.getByPosition(i).column->cloneEmpty();
+    if (finished)
+        return Block();
 
+    MutableColumns columns(description.sample_block.cloneEmptyColumns());
     size_t num_rows = 0;
-    while (iterator != result.end())
+
+    while (true)
     {
-        Poco::Data::Row & row = *iterator;
-
-        for (const auto idx : ext::range(0, row.fieldCount()))
+        if (!result.next())
         {
-            /// TODO This is extremely slow.
-            const Poco::Dynamic::Var & value = row[idx];
+            finished = true;
+            break;
+        }
 
-            if (!value.isEmpty())
+        for (int idx = 0; idx < result.columns(); ++idx)
+        {
+            const auto & sample = description.sample_block.getByPosition(idx);
+
+            if (!result.is_null(idx))
             {
-                if (description.types[idx].second)
+                bool is_nullable = description.types[idx].second;
+
+                if (is_nullable)
                 {
                     ColumnNullable & column_nullable = assert_cast<ColumnNullable &>(*columns[idx]);
-                    insertValue(column_nullable.getNestedColumn(), description.types[idx].first, value);
+                    const auto & data_type = assert_cast<const DataTypeNullable &>(*sample.type);
+                    insertValue(column_nullable.getNestedColumn(), data_type.getNestedType(), description.types[idx].first, result, idx);
                     column_nullable.getNullMapData().emplace_back(0);
                 }
                 else
-                    insertValue(*columns[idx], description.types[idx].first, value);
+                {
+                    insertValue(*columns[idx], sample.type, description.types[idx].first, result, idx);
+                }
             }
             else
-                insertDefaultValue(*columns[idx], *description.sample_block.getByPosition(idx).column);
+                insertDefaultValue(*columns[idx], *sample.column);
         }
 
-        ++iterator;
-
-        ++num_rows;
-        if (num_rows == max_block_size)
+        if (++num_rows == max_block_size)
             break;
     }
 
     return description.sample_block.cloneWithColumns(std::move(columns));
 }
 
+
+void ODBCBlockInputStream::insertValue(
+        IColumn & column, const DataTypePtr data_type, const ValueType type, nanodbc::result & row, size_t idx)
+{
+    switch (type)
+    {
+        case ValueType::vtUInt8:
+            assert_cast<ColumnUInt8 &>(column).insertValue(row.get<uint16_t>(idx));
+            break;
+        case ValueType::vtUInt16:
+            assert_cast<ColumnUInt16 &>(column).insertValue(row.get<uint16_t>(idx));
+            break;
+        case ValueType::vtUInt32:
+            assert_cast<ColumnUInt32 &>(column).insertValue(row.get<uint32_t>(idx));
+            break;
+        case ValueType::vtUInt64:
+            assert_cast<ColumnUInt64 &>(column).insertValue(row.get<uint64_t>(idx));
+            break;
+        case ValueType::vtInt8:
+            assert_cast<ColumnInt8 &>(column).insertValue(row.get<int16_t>(idx));
+            break;
+        case ValueType::vtInt16:
+            assert_cast<ColumnInt16 &>(column).insertValue(row.get<int16_t>(idx));
+            break;
+        case ValueType::vtInt32:
+            assert_cast<ColumnInt32 &>(column).insertValue(row.get<int32_t>(idx));
+            break;
+        case ValueType::vtInt64:
+            assert_cast<ColumnInt64 &>(column).insertValue(row.get<int64_t>(idx));
+            break;
+        case ValueType::vtFloat32:
+            assert_cast<ColumnFloat32 &>(column).insertValue(row.get<float>(idx));
+            break;
+        case ValueType::vtFloat64:
+            assert_cast<ColumnFloat64 &>(column).insertValue(row.get<double>(idx));
+            break;
+        case ValueType::vtFixedString:[[fallthrough]];
+        case ValueType::vtString:
+            assert_cast<ColumnString &>(column).insert(row.get<std::string>(idx));
+            break;
+        case ValueType::vtUUID:
+        {
+            auto value = row.get<std::string>(idx);
+            assert_cast<ColumnUInt128 &>(column).insert(parse<UUID>(value.data(), value.size()));
+            break;
+        }
+        case ValueType::vtDate:
+            assert_cast<ColumnUInt16 &>(column).insertValue(UInt16{LocalDate{row.get<std::string>(idx)}.getDayNum()});
+            break;
+        case ValueType::vtDateTime:
+        {
+            auto value = row.get<std::string>(idx);
+            ReadBufferFromString in(value);
+            time_t time = 0;
+            readDateTimeText(time, in);
+            if (time < 0)
+                time = 0;
+            assert_cast<ColumnUInt32 &>(column).insertValue(time);
+            break;
+        }
+        case ValueType::vtDateTime64:[[fallthrough]];
+        case ValueType::vtDecimal32: [[fallthrough]];
+        case ValueType::vtDecimal64: [[fallthrough]];
+        case ValueType::vtDecimal128: [[fallthrough]];
+        case ValueType::vtDecimal256:
+        {
+            auto value = row.get<std::string>(idx);
+            ReadBufferFromString istr(value);
+            data_type->getDefaultSerialization()->deserializeWholeText(column, istr, FormatSettings{});
+            break;
+        }
+        default:
+            throw Exception("Unsupported value type", ErrorCodes::UNKNOWN_TYPE);
+    }
+}
+
 }
diff --git a/programs/odbc-bridge/ODBCBlockInputStream.h b/programs/odbc-bridge/ODBCBlockInputStream.h
index 13491e05822..bbd90ce4d6c 100644
--- a/programs/odbc-bridge/ODBCBlockInputStream.h
+++ b/programs/odbc-bridge/ODBCBlockInputStream.h
@@ -3,10 +3,8 @@
 #include <string>
 #include <Core/Block.h>
 #include <DataStreams/IBlockInputStream.h>
-#include <Poco/Data/RecordSet.h>
-#include <Poco/Data/Session.h>
-#include <Poco/Data/Statement.h>
 #include <Core/ExternalResultDescription.h>
+#include <nanodbc/nanodbc.h>
 
 
 namespace DB
@@ -15,25 +13,33 @@ namespace DB
 class ODBCBlockInputStream final : public IBlockInputStream
 {
 public:
-    ODBCBlockInputStream(
-        Poco::Data::Session && session_, const std::string & query_str, const Block & sample_block, const UInt64 max_block_size_);
+    ODBCBlockInputStream(nanodbc::connection & connection_, const std::string & query_str, const Block & sample_block, const UInt64 max_block_size_);
 
     String getName() const override { return "ODBC"; }
 
     Block getHeader() const override { return description.sample_block.cloneEmpty(); }
 
 private:
+    using QueryResult = std::shared_ptr<nanodbc::result>;
+    using ValueType = ExternalResultDescription::ValueType;
+
     Block readImpl() override;
 
-    Poco::Data::Session session;
-    Poco::Data::Statement statement;
-    Poco::Data::RecordSet result;
-    Poco::Data::RecordSet::Iterator iterator;
+    static void insertValue(IColumn & column, const DataTypePtr data_type, const ValueType type, nanodbc::result & row, size_t idx);
 
+    static void insertDefaultValue(IColumn & column, const IColumn & sample_column)
+    {
+        column.insertFrom(sample_column, 0);
+    }
+
+    Poco::Logger * log;
     const UInt64 max_block_size;
     ExternalResultDescription description;
 
-    Poco::Logger * log;
+    nanodbc::connection & connection;
+    nanodbc::result result;
+    String query;
+    bool finished = false;
 };
 
 }
diff --git a/programs/odbc-bridge/ODBCBlockOutputStream.cpp b/programs/odbc-bridge/ODBCBlockOutputStream.cpp
index 4d8b9fa6bdf..e4614204178 100644
--- a/programs/odbc-bridge/ODBCBlockOutputStream.cpp
+++ b/programs/odbc-bridge/ODBCBlockOutputStream.cpp
@@ -8,16 +8,14 @@
 #include <Parsers/ASTExpressionList.h>
 #include <Parsers/ASTIdentifier.h>
 #include "getIdentifierQuote.h"
+#include <IO/WriteHelpers.h>
+#include <IO/Operators.h>
+#include <Formats/FormatFactory.h>
 
 
 namespace DB
 {
 
-namespace ErrorCodes
-{
-    extern const int UNKNOWN_TYPE;
-}
-
 namespace
 {
     using ValueType = ExternalResultDescription::ValueType;
@@ -40,69 +38,21 @@ namespace
         return buf.str();
     }
 
-    std::string getQuestionMarks(size_t n)
-    {
-        std::string result = "(";
-        for (size_t i = 0; i < n; ++i)
-        {
-            if (i > 0)
-                result += ",";
-            result += "?";
-        }
-        return result + ")";
-    }
-
-    Poco::Dynamic::Var getVarFromField(const Field & field, const ValueType type)
-    {
-        switch (type)
-        {
-            case ValueType::vtUInt8:
-                return Poco::Dynamic::Var(static_cast<UInt64>(field.get<UInt64>())).convert<UInt64>();
-            case ValueType::vtUInt16:
-                return Poco::Dynamic::Var(static_cast<UInt64>(field.get<UInt64>())).convert<UInt64>();
-            case ValueType::vtUInt32:
-                return Poco::Dynamic::Var(static_cast<UInt64>(field.get<UInt64>())).convert<UInt64>();
-            case ValueType::vtUInt64:
-                return Poco::Dynamic::Var(field.get<UInt64>()).convert<UInt64>();
-            case ValueType::vtInt8:
-                return Poco::Dynamic::Var(static_cast<Int64>(field.get<Int64>())).convert<Int64>();
-            case ValueType::vtInt16:
-                return Poco::Dynamic::Var(static_cast<Int64>(field.get<Int64>())).convert<Int64>();
-            case ValueType::vtInt32:
-                return Poco::Dynamic::Var(static_cast<Int64>(field.get<Int64>())).convert<Int64>();
-            case ValueType::vtInt64:
-                return Poco::Dynamic::Var(field.get<Int64>()).convert<Int64>();
-            case ValueType::vtFloat32:
-                return Poco::Dynamic::Var(field.get<Float64>()).convert<Float64>();
-            case ValueType::vtFloat64:
-                return Poco::Dynamic::Var(field.get<Float64>()).convert<Float64>();
-            case ValueType::vtString:
-                return Poco::Dynamic::Var(field.get<String>()).convert<String>();
-            case ValueType::vtDate:
-                return Poco::Dynamic::Var(LocalDate(DayNum(field.get<UInt64>())).toString()).convert<String>();
-            case ValueType::vtDateTime:
-                return Poco::Dynamic::Var(std::to_string(LocalDateTime(time_t(field.get<UInt64>())))).convert<String>();
-            case ValueType::vtUUID:
-                return Poco::Dynamic::Var(UUID(field.get<UInt128>()).toUnderType().toHexString()).convert<std::string>();
-             default:
-                 throw Exception("Unsupported value type", ErrorCodes::UNKNOWN_TYPE);
-
-        }
-        __builtin_unreachable();
-    }
 }
 
-ODBCBlockOutputStream::ODBCBlockOutputStream(Poco::Data::Session && session_,
+ODBCBlockOutputStream::ODBCBlockOutputStream(nanodbc::connection & connection_,
                                              const std::string & remote_database_name_,
                                              const std::string & remote_table_name_,
                                              const Block & sample_block_,
+                                             ContextPtr local_context_,
                                              IdentifierQuotingStyle quoting_)
-    : session(session_)
+    : log(&Poco::Logger::get("ODBCBlockOutputStream"))
+    , connection(connection_)
     , db_name(remote_database_name_)
     , table_name(remote_table_name_)
     , sample_block(sample_block_)
+    , local_context(local_context_)
     , quoting(quoting_)
-    , log(&Poco::Logger::get("ODBCBlockOutputStream"))
 {
     description.init(sample_block);
 }
@@ -114,28 +64,12 @@ Block ODBCBlockOutputStream::getHeader() const
 
 void ODBCBlockOutputStream::write(const Block & block)
 {
-    ColumnsWithTypeAndName columns;
-    for (size_t i = 0; i < block.columns(); ++i)
-        columns.push_back({block.getColumns()[i], sample_block.getDataTypes()[i], sample_block.getNames()[i]});
+    WriteBufferFromOwnString values_buf;
+    auto writer = FormatFactory::instance().getOutputStream("Values", values_buf, sample_block, local_context);
+    writer->write(block);
 
-    std::vector<Poco::Dynamic::Var> row_to_insert(block.columns());
-    Poco::Data::Statement statement(session << getInsertQuery(db_name, table_name, columns, quoting) + getQuestionMarks(block.columns()));
-    for (size_t i = 0; i < block.columns(); ++i)
-        statement.addBind(Poco::Data::Keywords::use(row_to_insert[i]));
-
-    for (size_t i = 0; i < block.rows(); ++i)
-    {
-        for (size_t col_idx = 0; col_idx < block.columns(); ++col_idx)
-        {
-            Field val;
-            columns[col_idx].column->get(i, val);
-            if (val.isNull())
-                row_to_insert[col_idx] = Poco::Dynamic::Var();
-            else
-                row_to_insert[col_idx] = getVarFromField(val, description.types[col_idx].first);
-        }
-        statement.execute();
-    }
+    std::string query = getInsertQuery(db_name, table_name, block.getColumnsWithTypeAndName(), quoting) + values_buf.str();
+    execute(connection, query);
 }
 
 }
diff --git a/programs/odbc-bridge/ODBCBlockOutputStream.h b/programs/odbc-bridge/ODBCBlockOutputStream.h
index 39e1d6f77ac..0b13f7039b5 100644
--- a/programs/odbc-bridge/ODBCBlockOutputStream.h
+++ b/programs/odbc-bridge/ODBCBlockOutputStream.h
@@ -2,30 +2,41 @@
 
 #include <Core/Block.h>
 #include <DataStreams/IBlockOutputStream.h>
-#include <Poco/Data/Session.h>
 #include <Core/ExternalResultDescription.h>
 #include <Parsers/IdentifierQuotingStyle.h>
+#include <Interpreters/Context_fwd.h>
+#include <nanodbc/nanodbc.h>
+
 
 namespace DB
 {
+
 class ODBCBlockOutputStream : public IBlockOutputStream
 {
+
 public:
-    ODBCBlockOutputStream(Poco::Data::Session && session_, const std::string & remote_database_name_,
-                          const std::string & remote_table_name_, const Block & sample_block_, IdentifierQuotingStyle quoting);
+    ODBCBlockOutputStream(
+            nanodbc::connection & connection_,
+            const std::string & remote_database_name_,
+            const std::string & remote_table_name_,
+            const Block & sample_block_,
+            ContextPtr local_context_,
+            IdentifierQuotingStyle quoting);
 
     Block getHeader() const override;
     void write(const Block & block) override;
 
 private:
-    Poco::Data::Session session;
+    Poco::Logger * log;
+
+    nanodbc::connection & connection;
     std::string db_name;
     std::string table_name;
     Block sample_block;
+    ContextPtr local_context;
     IdentifierQuotingStyle quoting;
 
     ExternalResultDescription description;
-    Poco::Logger * log;
 };
 
 }
diff --git a/programs/odbc-bridge/ODBCBridge.cpp b/programs/odbc-bridge/ODBCBridge.cpp
index 8869a2639c1..0deefe46014 100644
--- a/programs/odbc-bridge/ODBCBridge.cpp
+++ b/programs/odbc-bridge/ODBCBridge.cpp
@@ -1,244 +1,4 @@
 #include "ODBCBridge.h"
-#include "HandlerFactory.h"
-
-#include <string>
-#include <errno.h>
-#include <IO/ReadHelpers.h>
-#include <boost/program_options.hpp>
-
-#if USE_ODBC
-// It doesn't make much sense to build this bridge without ODBC, but we still do this.
-#    include <Poco/Data/ODBC/Connector.h>
-#endif
-
-#include <Poco/Net/NetException.h>
-#include <Poco/String.h>
-#include <Poco/Util/HelpFormatter.h>
-#include <Common/Exception.h>
-#include <Common/StringUtils/StringUtils.h>
-#include <Common/config.h>
-#include <Formats/registerFormats.h>
-#include <common/logger_useful.h>
-#include <ext/scope_guard.h>
-#include <ext/range.h>
-#include <Common/SensitiveDataMasker.h>
-#include <Server/HTTP/HTTPServer.h>
-
-
-namespace DB
-{
-namespace ErrorCodes
-{
-    extern const int ARGUMENT_OUT_OF_BOUND;
-}
-
-namespace
-{
-    Poco::Net::SocketAddress makeSocketAddress(const std::string & host, UInt16 port, Poco::Logger * log)
-    {
-        Poco::Net::SocketAddress socket_address;
-        try
-        {
-            socket_address = Poco::Net::SocketAddress(host, port);
-        }
-        catch (const Poco::Net::DNSException & e)
-        {
-            const auto code = e.code();
-            if (code == EAI_FAMILY
-#if defined(EAI_ADDRFAMILY)
-                || code == EAI_ADDRFAMILY
-#endif
-            )
-            {
-                LOG_ERROR(log, "Cannot resolve listen_host ({}), error {}: {}. If it is an IPv6 address and your host has disabled IPv6, then consider to specify IPv4 address to listen in <listen_host> element of configuration file. Example: <listen_host>0.0.0.0</listen_host>", host, e.code(), e.message());
-            }
-
-            throw;
-        }
-        return socket_address;
-    }
-
-    Poco::Net::SocketAddress socketBindListen(Poco::Net::ServerSocket & socket, const std::string & host, UInt16 port, Poco::Logger * log)
-    {
-        auto address = makeSocketAddress(host, port, log);
-#if POCO_VERSION < 0x01080000
-        socket.bind(address, /* reuseAddress = */ true);
-#else
-        socket.bind(address, /* reuseAddress = */ true, /* reusePort = */ false);
-#endif
-
-        socket.listen(/* backlog = */ 64);
-
-        return address;
-    }
-}
-
-void ODBCBridge::handleHelp(const std::string &, const std::string &)
-{
-    Poco::Util::HelpFormatter help_formatter(options());
-    help_formatter.setCommand(commandName());
-    help_formatter.setHeader("HTTP-proxy for odbc requests");
-    help_formatter.setUsage("--http-port <port>");
-    help_formatter.format(std::cerr);
-
-    stopOptionsProcessing();
-}
-
-
-void ODBCBridge::defineOptions(Poco::Util::OptionSet & options)
-{
-    options.addOption(Poco::Util::Option("http-port", "", "port to listen").argument("http-port", true).binding("http-port"));
-    options.addOption(
-        Poco::Util::Option("listen-host", "", "hostname or address to listen, default 127.0.0.1").argument("listen-host").binding("listen-host"));
-    options.addOption(
-        Poco::Util::Option("http-timeout", "", "http timeout for socket, default 1800").argument("http-timeout").binding("http-timeout"));
-
-    options.addOption(Poco::Util::Option("max-server-connections", "", "max connections to server, default 1024")
-                          .argument("max-server-connections")
-                          .binding("max-server-connections"));
-    options.addOption(Poco::Util::Option("keep-alive-timeout", "", "keepalive timeout, default 10")
-                          .argument("keep-alive-timeout")
-                          .binding("keep-alive-timeout"));
-
-    options.addOption(Poco::Util::Option("log-level", "", "sets log level, default info").argument("log-level").binding("logger.level"));
-
-    options.addOption(
-        Poco::Util::Option("log-path", "", "log path for all logs, default console").argument("log-path").binding("logger.log"));
-
-    options.addOption(Poco::Util::Option("err-log-path", "", "err log path for all logs, default no")
-                          .argument("err-log-path")
-                          .binding("logger.errorlog"));
-
-    options.addOption(Poco::Util::Option("stdout-path", "", "stdout log path, default console")
-                          .argument("stdout-path")
-                          .binding("logger.stdout"));
-
-    options.addOption(Poco::Util::Option("stderr-path", "", "stderr log path, default console")
-                          .argument("stderr-path")
-                          .binding("logger.stderr"));
-
-    using Me = std::decay_t<decltype(*this)>;
-    options.addOption(Poco::Util::Option("help", "", "produce this help message")
-                          .binding("help")
-                          .callback(Poco::Util::OptionCallback<Me>(this, &Me::handleHelp)));
-
-    ServerApplication::defineOptions(options); // NOLINT Don't need complex BaseDaemon's .xml config
-}
-
-void ODBCBridge::initialize(Application & self)
-{
-    BaseDaemon::closeFDs();
-    is_help = config().has("help");
-
-    if (is_help)
-        return;
-
-    config().setString("logger", "ODBCBridge");
-
-    /// Redirect stdout, stderr to specified files.
-    /// Some libraries and sanitizers write to stderr in case of errors.
-    const auto stdout_path = config().getString("logger.stdout", "");
-    if (!stdout_path.empty())
-    {
-        if (!freopen(stdout_path.c_str(), "a+", stdout))
-            throw Poco::OpenFileException("Cannot attach stdout to " + stdout_path);
-
-        /// Disable buffering for stdout.
-        setbuf(stdout, nullptr);
-    }
-    const auto stderr_path = config().getString("logger.stderr", "");
-    if (!stderr_path.empty())
-    {
-        if (!freopen(stderr_path.c_str(), "a+", stderr))
-            throw Poco::OpenFileException("Cannot attach stderr to " + stderr_path);
-
-        /// Disable buffering for stderr.
-        setbuf(stderr, nullptr);
-    }
-
-    buildLoggers(config(), logger(), self.commandName());
-
-    BaseDaemon::logRevision();
-
-    log = &logger();
-    hostname = config().getString("listen-host", "127.0.0.1");
-    port = config().getUInt("http-port");
-    if (port > 0xFFFF)
-        throw Exception("Out of range 'http-port': " + std::to_string(port), ErrorCodes::ARGUMENT_OUT_OF_BOUND);
-
-    http_timeout = config().getUInt("http-timeout", DEFAULT_HTTP_READ_BUFFER_TIMEOUT);
-    max_server_connections = config().getUInt("max-server-connections", 1024);
-    keep_alive_timeout = config().getUInt("keep-alive-timeout", 10);
-
-    initializeTerminationAndSignalProcessing();
-
-#if USE_ODBC
-    // It doesn't make much sense to build this bridge without ODBC, but we
-    // still do this.
-    Poco::Data::ODBC::Connector::registerConnector();
-#endif
-
-    ServerApplication::initialize(self); // NOLINT
-}
-
-void ODBCBridge::uninitialize()
-{
-    BaseDaemon::uninitialize();
-}
-
-int ODBCBridge::main(const std::vector<std::string> & /*args*/)
-{
-    if (is_help)
-        return Application::EXIT_OK;
-
-    registerFormats();
-
-    LOG_INFO(log, "Starting up");
-    Poco::Net::ServerSocket socket;
-    auto address = socketBindListen(socket, hostname, port, log);
-    socket.setReceiveTimeout(http_timeout);
-    socket.setSendTimeout(http_timeout);
-    Poco::ThreadPool server_pool(3, max_server_connections);
-    Poco::Net::HTTPServerParams::Ptr http_params = new Poco::Net::HTTPServerParams;
-    http_params->setTimeout(http_timeout);
-    http_params->setKeepAliveTimeout(keep_alive_timeout);
-
-    auto shared_context = Context::createShared();
-    Context context(Context::createGlobal(shared_context.get()));
-    context.makeGlobalContext();
-
-    if (config().has("query_masking_rules"))
-    {
-        SensitiveDataMasker::setInstance(std::make_unique<SensitiveDataMasker>(config(), "query_masking_rules"));
-    }
-
-    auto server = HTTPServer(
-        context,
-        std::make_shared<HandlerFactory>("ODBCRequestHandlerFactory-factory", keep_alive_timeout, context),
-        server_pool,
-        socket,
-        http_params);
-    server.start();
-
-    LOG_INFO(log, "Listening http://{}", address.toString());
-
-    SCOPE_EXIT({
-        LOG_DEBUG(log, "Received termination signal.");
-        LOG_DEBUG(log, "Waiting for current connections to close.");
-        server.stop();
-        for (size_t count : ext::range(1, 6))
-        {
-            if (server.currentConnections() == 0)
-                break;
-            LOG_DEBUG(log, "Waiting for {} connections, try {}", server.currentConnections(), count);
-            std::this_thread::sleep_for(std::chrono::milliseconds(1000));
-        }
-    });
-
-    waitForTerminationRequest();
-    return Application::EXIT_OK;
-}
-}
 
 #pragma GCC diagnostic ignored "-Wmissing-declarations"
 int mainEntryClickHouseODBCBridge(int argc, char ** argv)
diff --git a/programs/odbc-bridge/ODBCBridge.h b/programs/odbc-bridge/ODBCBridge.h
index 9a0d37fa0f9..b17051dce91 100644
--- a/programs/odbc-bridge/ODBCBridge.h
+++ b/programs/odbc-bridge/ODBCBridge.h
@@ -2,38 +2,25 @@
 
 #include <Interpreters/Context.h>
 #include <Poco/Logger.h>
-#include <daemon/BaseDaemon.h>
+#include <bridge/IBridge.h>
+#include "HandlerFactory.h"
+
 
 namespace DB
 {
-/** Class represents clickhouse-odbc-bridge server, which listen
-  * incoming HTTP POST and GET requests on specified port and host.
-  * Has two handlers '/' for all incoming POST requests to ODBC driver
-  * and /ping for GET request about service status
-  */
-class ODBCBridge : public BaseDaemon
+
+class ODBCBridge : public IBridge
 {
-public:
-    void defineOptions(Poco::Util::OptionSet & options) override;
 
 protected:
-    void initialize(Application & self) override;
+    std::string bridgeName() const override
+    {
+        return "ODBCBridge";
+    }
 
-    void uninitialize() override;
-
-    int main(const std::vector<std::string> & args) override;
-
-private:
-    void handleHelp(const std::string &, const std::string &);
-
-    bool is_help;
-    std::string hostname;
-    size_t port;
-    size_t http_timeout;
-    std::string log_level;
-    size_t max_server_connections;
-    size_t keep_alive_timeout;
-
-    Poco::Logger * log;
+    HandlerFactoryPtr getHandlerFactoryPtr(ContextPtr context) const override
+    {
+        return std::make_shared<ODBCBridgeHandlerFactory>("ODBCRequestHandlerFactory-factory", keep_alive_timeout, context);
+    }
 };
 }
diff --git a/programs/odbc-bridge/ODBCConnectionFactory.h b/programs/odbc-bridge/ODBCConnectionFactory.h
new file mode 100644
index 00000000000..56961ddb2fb
--- /dev/null
+++ b/programs/odbc-bridge/ODBCConnectionFactory.h
@@ -0,0 +1,82 @@
+#pragma once
+
+#include <common/logger_useful.h>
+#include <nanodbc/nanodbc.h>
+#include <mutex>
+#include <common/BorrowedObjectPool.h>
+#include <unordered_map>
+
+
+namespace nanodbc
+{
+
+static constexpr inline auto ODBC_CONNECT_TIMEOUT = 100;
+
+using ConnectionPtr = std::shared_ptr<nanodbc::connection>;
+using Pool = BorrowedObjectPool<ConnectionPtr>;
+using PoolPtr = std::shared_ptr<Pool>;
+
+class ConnectionHolder
+{
+
+public:
+    ConnectionHolder(const std::string & connection_string_, PoolPtr pool_) : connection_string(connection_string_), pool(pool_) {}
+
+    ~ConnectionHolder()
+    {
+        if (connection)
+            pool->returnObject(std::move(connection));
+    }
+
+    nanodbc::connection & operator*()
+    {
+        if (!connection)
+        {
+            pool->borrowObject(connection, [&]()
+            {
+                return std::make_shared<nanodbc::connection>(connection_string, ODBC_CONNECT_TIMEOUT);
+            });
+        }
+
+        return *connection;
+    }
+
+private:
+    std::string connection_string;
+    PoolPtr pool;
+    ConnectionPtr connection;
+};
+
+}
+
+
+namespace DB
+{
+
+class ODBCConnectionFactory final : private boost::noncopyable
+{
+public:
+    static ODBCConnectionFactory & instance()
+    {
+        static ODBCConnectionFactory ret;
+        return ret;
+    }
+
+    nanodbc::ConnectionHolder get(const std::string & connection_string, size_t pool_size)
+    {
+        std::lock_guard lock(mutex);
+
+        if (!factory.count(connection_string))
+            factory.emplace(std::make_pair(connection_string, std::make_shared<nanodbc::Pool>(pool_size)));
+
+        return nanodbc::ConnectionHolder(connection_string, factory[connection_string]);
+    }
+
+private:
+    /// [connection_settings_string] -> [connection_pool]
+    using PoolFactory = std::unordered_map<std::string, nanodbc::PoolPtr>;
+    PoolFactory factory;
+    std::mutex mutex;
+};
+
+}
diff --git a/programs/odbc-bridge/SchemaAllowedHandler.cpp b/programs/odbc-bridge/SchemaAllowedHandler.cpp
index d4a70db61f4..4cceaee962c 100644
--- a/programs/odbc-bridge/SchemaAllowedHandler.cpp
+++ b/programs/odbc-bridge/SchemaAllowedHandler.cpp
@@ -2,33 +2,26 @@
 
 #if USE_ODBC
 
-#    include <Server/HTTP/HTMLForm.h>
-#    include <Server/HTTP/WriteBufferFromHTTPServerResponse.h>
-#    include <IO/WriteHelpers.h>
-#    include <Poco/Data/ODBC/ODBCException.h>
-#    include <Poco/Data/ODBC/SessionImpl.h>
-#    include <Poco/Data/ODBC/Utility.h>
-#    include <Poco/Net/HTTPServerRequest.h>
-#    include <Poco/Net/HTTPServerResponse.h>
-#    include <common/logger_useful.h>
-#    include "validateODBCConnectionString.h"
+#include <Server/HTTP/HTMLForm.h>
+#include <Server/HTTP/WriteBufferFromHTTPServerResponse.h>
+#include <IO/WriteHelpers.h>
+#include <Poco/Net/HTTPServerRequest.h>
+#include <Poco/Net/HTTPServerResponse.h>
+#include <common/logger_useful.h>
+#include "validateODBCConnectionString.h"
+#include "ODBCConnectionFactory.h"
+#include <sql.h>
+#include <sqlext.h>
 
-#    define POCO_SQL_ODBC_CLASS Poco::Data::ODBC
 
 namespace DB
 {
 namespace
 {
-    bool isSchemaAllowed(SQLHDBC hdbc)
+    bool isSchemaAllowed(nanodbc::connection & connection)
     {
-        SQLUINTEGER value;
-        SQLSMALLINT value_length = sizeof(value);
-        SQLRETURN r = POCO_SQL_ODBC_CLASS::SQLGetInfo(hdbc, SQL_SCHEMA_USAGE, &value, sizeof(value), &value_length);
-
-        if (POCO_SQL_ODBC_CLASS::Utility::isError(r))
-            throw POCO_SQL_ODBC_CLASS::ConnectionException(hdbc);
-
-        return value != 0;
+        uint32_t result = connection.get_info<uint32_t>(SQL_SCHEMA_USAGE);
+        return result != 0;
     }
 }
 
@@ -55,10 +48,12 @@ void SchemaAllowedHandler::handleRequest(HTTPServerRequest & request, HTTPServer
     try
     {
         std::string connection_string = params.get("connection_string");
-        POCO_SQL_ODBC_CLASS::SessionImpl session(validateODBCConnectionString(connection_string), DBMS_DEFAULT_CONNECT_TIMEOUT_SEC);
-        SQLHDBC hdbc = session.dbc().handle();
 
-        bool result = isSchemaAllowed(hdbc);
+        auto connection = ODBCConnectionFactory::instance().get(
+                validateODBCConnectionString(connection_string),
+                getContext()->getSettingsRef().odbc_bridge_connection_pool_size);
+
+        bool result = isSchemaAllowed(*connection);
 
         WriteBufferFromHTTPServerResponse out(response, request.getMethod() == Poco::Net::HTTPRequest::HTTP_HEAD, keep_alive_timeout);
         try
diff --git a/programs/odbc-bridge/SchemaAllowedHandler.h b/programs/odbc-bridge/SchemaAllowedHandler.h
index 91eddf67803..d7b922ed05b 100644
--- a/programs/odbc-bridge/SchemaAllowedHandler.h
+++ b/programs/odbc-bridge/SchemaAllowedHandler.h
@@ -1,22 +1,25 @@
 #pragma once
 
+#include <Interpreters/Context.h>
 #include <Server/HTTP/HTTPRequestHandler.h>
-
 #include <Poco/Logger.h>
 
 #if USE_ODBC
 
+
 namespace DB
 {
 
 class Context;
 
 /// This handler establishes connection to database, and retrieves whether schema is allowed.
-class SchemaAllowedHandler : public HTTPRequestHandler
+class SchemaAllowedHandler : public HTTPRequestHandler, WithContext
 {
 public:
-    SchemaAllowedHandler(size_t keep_alive_timeout_, Context &)
-        : log(&Poco::Logger::get("SchemaAllowedHandler")), keep_alive_timeout(keep_alive_timeout_)
+    SchemaAllowedHandler(size_t keep_alive_timeout_, ContextPtr context_)
+        : WithContext(context_)
+        , log(&Poco::Logger::get("SchemaAllowedHandler"))
+        , keep_alive_timeout(keep_alive_timeout_)
     {
     }
 
diff --git a/programs/odbc-bridge/getIdentifierQuote.cpp b/programs/odbc-bridge/getIdentifierQuote.cpp
index 15b3749d37d..9ccad6e6e1d 100644
--- a/programs/odbc-bridge/getIdentifierQuote.cpp
+++ b/programs/odbc-bridge/getIdentifierQuote.cpp
@@ -2,11 +2,10 @@
 
 #if USE_ODBC
 
-#    include <Poco/Data/ODBC/ODBCException.h>
-#    include <Poco/Data/ODBC/SessionImpl.h>
-#    include <Poco/Data/ODBC/Utility.h>
-
-#    define POCO_SQL_ODBC_CLASS Poco::Data::ODBC
+#include <common/logger_useful.h>
+#include <nanodbc/nanodbc.h>
+#include <sql.h>
+#include <sqlext.h>
 
 
 namespace DB
@@ -17,33 +16,27 @@ namespace ErrorCodes
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
 }
 
-std::string getIdentifierQuote(SQLHDBC hdbc)
+
+std::string getIdentifierQuote(nanodbc::connection & connection)
 {
-    std::string identifier;
-
-    SQLSMALLINT t;
-    SQLRETURN r = POCO_SQL_ODBC_CLASS::SQLGetInfo(hdbc, SQL_IDENTIFIER_QUOTE_CHAR, nullptr, 0, &t);
-
-    if (POCO_SQL_ODBC_CLASS::Utility::isError(r))
-        throw POCO_SQL_ODBC_CLASS::ConnectionException(hdbc);
-
-    if (t > 0)
+    std::string quote;
+    try
     {
-        // I have no idea, why to add '2' here, got from: contrib/poco/Data/ODBC/src/ODBCStatementImpl.cpp:60 (SQL_DRIVER_NAME)
-        identifier.resize(static_cast<std::size_t>(t) + 2);
-
-        if (POCO_SQL_ODBC_CLASS::Utility::isError(POCO_SQL_ODBC_CLASS::SQLGetInfo(
-                hdbc, SQL_IDENTIFIER_QUOTE_CHAR, &identifier[0], SQLSMALLINT((identifier.length() - 1) * sizeof(identifier[0])), &t)))
-            throw POCO_SQL_ODBC_CLASS::ConnectionException(hdbc);
-
-        identifier.resize(static_cast<std::size_t>(t));
+        quote = connection.get_info<std::string>(SQL_IDENTIFIER_QUOTE_CHAR);
     }
-    return identifier;
+    catch (...)
+    {
+        LOG_WARNING(&Poco::Logger::get("ODBCGetIdentifierQuote"), "Cannot fetch identifier quote. Default double quote is used. Reason: {}", getCurrentExceptionMessage(false));
+        return "\"";
+    }
+
+    return quote;
 }
 
-IdentifierQuotingStyle getQuotingStyle(SQLHDBC hdbc)
+
+IdentifierQuotingStyle getQuotingStyle(nanodbc::connection & connection)
 {
-    auto identifier_quote = getIdentifierQuote(hdbc);
+    auto identifier_quote = getIdentifierQuote(connection);
     if (identifier_quote.length() == 0)
         return IdentifierQuotingStyle::None;
     else if (identifier_quote[0] == '`')
diff --git a/programs/odbc-bridge/getIdentifierQuote.h b/programs/odbc-bridge/getIdentifierQuote.h
index 0fb4c3bddb1..7f7156eff82 100644
--- a/programs/odbc-bridge/getIdentifierQuote.h
+++ b/programs/odbc-bridge/getIdentifierQuote.h
@@ -2,20 +2,19 @@
 
 #if USE_ODBC
 
-#    include <Interpreters/Context.h>
-#    include <Poco/Logger.h>
-#    include <Poco/Net/HTTPRequestHandler.h>
-
-#    include <Poco/Data/ODBC/Utility.h>
-
+#include <Interpreters/Context.h>
+#include <Poco/Logger.h>
+#include <Poco/Net/HTTPRequestHandler.h>
 #include <Parsers/IdentifierQuotingStyle.h>
+#include <nanodbc/nanodbc.h>
+
 
 namespace DB
 {
 
-std::string getIdentifierQuote(SQLHDBC hdbc);
+std::string getIdentifierQuote(nanodbc::connection & connection);
 
-IdentifierQuotingStyle getQuotingStyle(SQLHDBC hdbc);
+IdentifierQuotingStyle getQuotingStyle(nanodbc::connection & connection);
 
 }
 
diff --git a/programs/server/.gitignore b/programs/server/.gitignore
index b774776e4be..ddc480e4b29 100644
--- a/programs/server/.gitignore
+++ b/programs/server/.gitignore
@@ -1,8 +1,11 @@
-/access
-/dictionaries_lib
-/flags
-/format_schemas
+/metadata
 /metadata_dropped
+/data
+/store
+/access
+/flags
+/dictionaries_lib
+/format_schemas
 /preprocessed_configs
 /shadow
 /tmp
diff --git a/programs/server/CMakeLists.txt b/programs/server/CMakeLists.txt
index 198d9081168..3a04228942b 100644
--- a/programs/server/CMakeLists.txt
+++ b/programs/server/CMakeLists.txt
@@ -19,6 +19,7 @@ set (CLICKHOUSE_SERVER_LINK
         clickhouse_storages_system
         clickhouse_table_functions
         string_utils
+        jemalloc
 
     ${LINK_RESOURCE_LIB}
 
@@ -42,11 +43,16 @@ if (OS_LINUX)
         set(RESOURCE_OBJS ${RESOURCE_OBJS} ${RESOURCE_OBJ})
 
         # https://stackoverflow.com/questions/14776463/compile-and-add-an-object-file-from-a-binary-with-cmake
-        add_custom_command(OUTPUT ${RESOURCE_OBJ}
-            COMMAND cd ${CMAKE_CURRENT_SOURCE_DIR} && ${OBJCOPY_PATH} -I binary ${OBJCOPY_ARCH_OPTIONS} ${RESOURCE_FILE} ${CMAKE_CURRENT_BINARY_DIR}/${RESOURCE_OBJ}
-            COMMAND ${OBJCOPY_PATH} --rename-section .data=.rodata,alloc,load,readonly,data,contents
-                ${CMAKE_CURRENT_BINARY_DIR}/${RESOURCE_OBJ} ${CMAKE_CURRENT_BINARY_DIR}/${RESOURCE_OBJ})
-
+        # PPC64LE fails to do this with objcopy, use ld or lld instead
+        if (ARCH_PPC64LE)
+            add_custom_command(OUTPUT ${RESOURCE_OBJ}
+                COMMAND cd ${CMAKE_CURRENT_SOURCE_DIR} && ${CMAKE_LINKER} -m elf64lppc -r -b binary -o ${CMAKE_CURRENT_BINARY_DIR}/${RESOURCE_OBJ} ${RESOURCE_FILE})
+        else()
+            add_custom_command(OUTPUT ${RESOURCE_OBJ}
+                COMMAND cd ${CMAKE_CURRENT_SOURCE_DIR} && ${OBJCOPY_PATH} -I binary ${OBJCOPY_ARCH_OPTIONS} ${RESOURCE_FILE} ${CMAKE_CURRENT_BINARY_DIR}/${RESOURCE_OBJ}
+                COMMAND ${OBJCOPY_PATH} --rename-section .data=.rodata,alloc,load,readonly,data,contents
+                    ${CMAKE_CURRENT_BINARY_DIR}/${RESOURCE_OBJ} ${CMAKE_CURRENT_BINARY_DIR}/${RESOURCE_OBJ})
+        endif()
         set_source_files_properties(${RESOURCE_OBJ} PROPERTIES EXTERNAL_OBJECT true GENERATED true)
     endforeach(RESOURCE_FILE)
 
diff --git a/programs/server/Server.cpp b/programs/server/Server.cpp
index f501e182cb7..e874122250c 100644
--- a/programs/server/Server.cpp
+++ b/programs/server/Server.cpp
@@ -47,6 +47,8 @@
 #include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/DNSCacheUpdater.h>
 #include <Interpreters/ExternalLoaderXMLConfigRepository.h>
+#include <Interpreters/InterserverCredentials.h>
+#include <Interpreters/ExpressionJIT.h>
 #include <Access/AccessControlManager.h>
 #include <Storages/StorageReplicatedMergeTree.h>
 #include <Storages/System/attachSystemTables.h>
@@ -82,6 +84,7 @@
 
 #if defined(OS_LINUX)
 #    include <sys/mman.h>
+#    include <sys/ptrace.h>
 #    include <Common/hasLinuxCapability.h>
 #endif
 
@@ -95,7 +98,11 @@
 #endif
 
 #if USE_NURAFT
-#   include <Server/NuKeeperTCPHandlerFactory.h>
+#   include <Server/KeeperTCPHandlerFactory.h>
+#endif
+
+#if USE_JEMALLOC
+#    include <jemalloc/jemalloc.h>
 #endif
 
 namespace CurrentMetrics
@@ -106,11 +113,35 @@ namespace CurrentMetrics
     extern const Metric MaxDDLEntryID;
 }
 
+#if USE_JEMALLOC
+static bool jemallocOptionEnabled(const char *name)
+{
+    bool value;
+    size_t size = sizeof(value);
+
+    if (mallctl(name, reinterpret_cast<void *>(&value), &size, /* newp= */ nullptr, /* newlen= */ 0))
+        throw Poco::SystemException("mallctl() failed");
+
+    return value;
+}
+#else
+static bool jemallocOptionEnabled(const char *) { return 0; }
+#endif
+
 
 int mainEntryClickHouseServer(int argc, char ** argv)
 {
     DB::Server app;
 
+    if (jemallocOptionEnabled("opt.background_thread"))
+    {
+        LOG_ERROR(&app.logger(),
+            "jemalloc.background_thread was requested, "
+            "however ClickHouse uses percpu_arena and background_thread most likely will not give any benefits, "
+            "and also background_thread is not compatible with ClickHouse watchdog "
+            "(that can be disabled with CLICKHOUSE_WATCHDOG_ENABLE=0)");
+    }
+
     /// Do not fork separate process from watchdog if we attached to terminal.
     /// Otherwise it breaks gdb usage.
     /// Can be overridden by environment variable (cannot use server config at this moment).
@@ -170,18 +201,24 @@ int waitServersToFinish(std::vector<DB::ProtocolServerAdapter> & servers, size_t
     const int sleep_one_ms = 100;
     int sleep_current_ms = 0;
     int current_connections = 0;
-    while (sleep_current_ms < sleep_max_ms)
+    for (;;)
     {
         current_connections = 0;
+
         for (auto & server : servers)
         {
             server.stop();
             current_connections += server.currentConnections();
         }
+
         if (!current_connections)
             break;
+
         sleep_current_ms += sleep_one_ms;
-        std::this_thread::sleep_for(std::chrono::milliseconds(sleep_one_ms));
+        if (sleep_current_ms < sleep_max_ms)
+            std::this_thread::sleep_for(std::chrono::milliseconds(sleep_one_ms));
+        else
+            break;
     }
     return current_connections;
 }
@@ -423,8 +460,7 @@ int Server::main(const std::vector<std::string> & /*args*/)
       *  settings, available functions, data types, aggregate functions, databases, ...
       */
     auto shared_context = Context::createShared();
-    auto global_context = std::make_unique<Context>(Context::createGlobal(shared_context.get()));
-    global_context_ptr = global_context.get();
+    global_context = Context::createGlobal(shared_context.get());
 
     global_context->makeGlobalContext();
     global_context->setApplicationType(Context::ApplicationType::SERVER);
@@ -480,16 +516,26 @@ int Server::main(const std::vector<std::string> & /*args*/)
         }
         else
         {
-            throw Exception(ErrorCodes::CORRUPTED_DATA,
-                "Calculated checksum of the ClickHouse binary ({0}) does not correspond"
-                " to the reference checksum stored in the binary ({1})."
-                " It may indicate one of the following:"
-                " - the file {2} was changed just after startup;"
-                " - the file {2} is damaged on disk due to faulty hardware;"
-                " - the loaded executable is damaged in memory due to faulty hardware;"
-                " - the file {2} was intentionally modified;"
-                " - logical error in code."
-                , calculated_binary_hash, stored_binary_hash, executable_path);
+            /// If program is run under debugger, ptrace will fail.
+            if (ptrace(PTRACE_TRACEME, 0, nullptr, nullptr) == -1)
+            {
+                /// Program is run under debugger. Modification of it's binary image is ok for breakpoints.
+                LOG_WARNING(log, "Server is run under debugger and its binary image is modified (most likely with breakpoints).",
+                    calculated_binary_hash);
+            }
+            else
+            {
+                throw Exception(ErrorCodes::CORRUPTED_DATA,
+                    "Calculated checksum of the ClickHouse binary ({0}) does not correspond"
+                    " to the reference checksum stored in the binary ({1})."
+                    " It may indicate one of the following:"
+                    " - the file {2} was changed just after startup;"
+                    " - the file {2} is damaged on disk due to faulty hardware;"
+                    " - the loaded executable is damaged in memory due to faulty hardware;"
+                    " - the file {2} was intentionally modified;"
+                    " - logical error in code."
+                    , calculated_binary_hash, stored_binary_hash, executable_path);
+            }
         }
     }
     else
@@ -676,16 +722,8 @@ int Server::main(const std::vector<std::string> & /*args*/)
         }
     }
 
-    if (config().has("interserver_http_credentials"))
-    {
-        String user = config().getString("interserver_http_credentials.user", "");
-        String password = config().getString("interserver_http_credentials.password", "");
-
-        if (user.empty())
-            throw Exception("Configuration parameter interserver_http_credentials user can't be empty", ErrorCodes::NO_ELEMENTS_IN_CONFIG);
-
-        global_context->setInterserverCredentials(user, password);
-    }
+    LOG_DEBUG(log, "Initiailizing interserver credentials.");
+    global_context->updateInterserverCredentials(config());
 
     if (config().has("macros"))
         global_context->setMacros(std::make_unique<Macros>(config(), "macros", log));
@@ -704,7 +742,7 @@ int Server::main(const std::vector<std::string> & /*args*/)
         config().getString("path", ""),
         std::move(main_config_zk_node_cache),
         main_config_zk_changed_event,
-        [&](ConfigurationPtr config)
+        [&](ConfigurationPtr config, bool initial_loading)
         {
             Settings::checkNoSettingNamesAtTopLevel(*config, config_path);
 
@@ -746,6 +784,7 @@ int Server::main(const std::vector<std::string> & /*args*/)
             global_context->setClustersConfig(config);
             global_context->setMacros(std::make_unique<Macros>(*config, "macros", log));
             global_context->setExternalAuthenticatorsConfig(*config);
+            global_context->setExternalModelsConfig(config);
 
             /// Setup protection to avoid accidental DROP for big tables (that are greater than 50 GB by default)
             if (config->has("max_table_size_to_drop"))
@@ -754,14 +793,20 @@ int Server::main(const std::vector<std::string> & /*args*/)
             if (config->has("max_partition_size_to_drop"))
                 global_context->setMaxPartitionSizeToDrop(config->getUInt64("max_partition_size_to_drop"));
 
-            if (config->has("zookeeper"))
-                global_context->reloadZooKeeperIfChanged(config);
+            if (!initial_loading)
+            {
+                /// We do not load ZooKeeper configuration on the first config loading
+                /// because TestKeeper server is not started yet.
+                if (config->has("zookeeper"))
+                    global_context->reloadZooKeeperIfChanged(config);
 
-            global_context->reloadAuxiliaryZooKeepersConfigIfChanged(config);
+                global_context->reloadAuxiliaryZooKeepersConfigIfChanged(config);
+            }
 
             global_context->updateStorageConfiguration(*config);
+            global_context->updateInterserverCredentials(*config);
         },
-        /* already_loaded = */ true);
+        /* already_loaded = */ false);  /// Reload it right now (initial loading)
 
     auto & access_control = global_context->getAccessControlManager();
     if (config().has("custom_settings_prefixes"))
@@ -812,10 +857,14 @@ int Server::main(const std::vector<std::string> & /*args*/)
     }
     global_context->setMarkCache(mark_cache_size);
 
+    /// A cache for mmapped files.
+    size_t mmap_cache_size = config().getUInt64("mmap_cache_size", 1000);   /// The choice of default is arbitrary.
+    if (mmap_cache_size)
+        global_context->setMMappedFileCache(mmap_cache_size);
+
 #if USE_EMBEDDED_COMPILER
     size_t compiled_expression_cache_size = config().getUInt64("compiled_expression_cache_size", 500);
-    if (compiled_expression_cache_size)
-        global_context->setCompiledExpressionCache(compiled_expression_cache_size);
+    CompiledExpressionCacheFactory::instance().init(compiled_expression_cache_size);
 #endif
 
     /// Set path for format schema files
@@ -846,15 +895,15 @@ int Server::main(const std::vector<std::string> & /*args*/)
         listen_try = true;
     }
 
-    if (config().has("test_keeper_server"))
+    if (config().has("keeper_server"))
     {
 #if USE_NURAFT
         /// Initialize test keeper RAFT. Do nothing if no nu_keeper_server in config.
-        global_context->initializeNuKeeperStorageDispatcher();
+        global_context->initializeKeeperStorageDispatcher();
         for (const auto & listen_host : listen_hosts)
         {
-            /// TCP NuKeeper
-            const char * port_name = "test_keeper_server.tcp_port";
+            /// TCP Keeper
+            const char * port_name = "keeper_server.tcp_port";
             createServer(listen_host, port_name, listen_try, [&](UInt16 port)
             {
                 Poco::Net::ServerSocket socket;
@@ -864,9 +913,29 @@ int Server::main(const std::vector<std::string> & /*args*/)
                 servers_to_start_before_tables->emplace_back(
                     port_name,
                     std::make_unique<Poco::Net::TCPServer>(
-                        new NuKeeperTCPHandlerFactory(*this), server_pool, socket, new Poco::Net::TCPServerParams));
+                        new KeeperTCPHandlerFactory(*this, false), server_pool, socket, new Poco::Net::TCPServerParams));
 
-                LOG_INFO(log, "Listening for connections to NuKeeper (tcp): {}", address.toString());
+                LOG_INFO(log, "Listening for connections to Keeper (tcp): {}", address.toString());
+            });
+
+            const char * secure_port_name = "keeper_server.tcp_port_secure";
+            createServer(listen_host, secure_port_name, listen_try, [&](UInt16 port)
+            {
+#if USE_SSL
+                Poco::Net::SecureServerSocket socket;
+                auto address = socketBindListen(socket, listen_host, port, /* secure = */ true);
+                socket.setReceiveTimeout(settings.receive_timeout);
+                socket.setSendTimeout(settings.send_timeout);
+                servers_to_start_before_tables->emplace_back(
+                    secure_port_name,
+                    std::make_unique<Poco::Net::TCPServer>(
+                        new KeeperTCPHandlerFactory(*this, true), server_pool, socket, new Poco::Net::TCPServerParams));
+                LOG_INFO(log, "Listening for connections to Keeper with secure protocol (tcp_secure): {}", address.toString());
+#else
+                UNUSED(port);
+                throw Exception{"SSL support for TCP protocol is disabled because Poco library was built without NetSSL support.",
+                    ErrorCodes::SUPPORT_IS_DISABLED};
+#endif
             });
         }
 #else
@@ -913,13 +982,15 @@ int Server::main(const std::vector<std::string> & /*args*/)
             else
                 LOG_INFO(log, "Closed connections to servers for tables.");
 
-            global_context->shutdownNuKeeperStorageDispatcher();
+            global_context->shutdownKeeperStorageDispatcher();
         }
 
+        /// Wait server pool to avoid use-after-free of destroyed context in the handlers
+        server_pool.joinAll();
+
         /** Explicitly destroy Context. It is more convenient than in destructor of Server, because logger is still available.
           * At this moment, no one could own shared part of Context.
           */
-        global_context_ptr = nullptr;
         global_context.reset();
         shared_context.reset();
         LOG_DEBUG(log, "Destroyed global context.");
@@ -933,14 +1004,14 @@ int Server::main(const std::vector<std::string> & /*args*/)
 
     try
     {
-        loadMetadataSystem(*global_context);
+        loadMetadataSystem(global_context);
         /// After attaching system databases we can initialize system log.
         global_context->initializeSystemLogs();
         auto & database_catalog = DatabaseCatalog::instance();
         /// After the system database is created, attach virtual system tables (in addition to query_log and part_log)
         attachSystemTablesServer(*database_catalog.getSystemDatabase(), has_zookeeper);
         /// Then, load remaining databases
-        loadMetadata(*global_context, default_database);
+        loadMetadata(global_context, default_database);
         database_catalog.loadDatabases();
         /// After loading validate that default database exists
         database_catalog.assertDatabaseExists(default_database);
@@ -965,7 +1036,7 @@ int Server::main(const std::vector<std::string> & /*args*/)
     ///
     /// Look at compiler-rt/lib/sanitizer_common/sanitizer_stacktrace.h
     ///
-#if USE_UNWIND && !WITH_COVERAGE && !defined(SANITIZER)
+#if USE_UNWIND && !WITH_COVERAGE && !defined(SANITIZER) && defined(__x86_64__)
     /// Profilers cannot work reliably with any other libunwind or without PHDR cache.
     if (hasPHDRCache())
     {
@@ -1002,21 +1073,14 @@ int Server::main(const std::vector<std::string> & /*args*/)
         " when two different stack unwinding methods will interfere with each other.");
 #endif
 
+#if !defined(__x86_64__)
+    LOG_INFO(log, "Query Profiler is only tested on x86_64. It also known to not work under qemu-user.");
+#endif
+
     if (!hasPHDRCache())
         LOG_INFO(log, "Query Profiler and TraceCollector are disabled because they require PHDR cache to be created"
             " (otherwise the function 'dl_iterate_phdr' is not lock free and not async-signal safe).");
 
-    if (has_zookeeper && config().has("distributed_ddl"))
-    {
-        /// DDL worker should be started after all tables were loaded
-        String ddl_zookeeper_path = config().getString("distributed_ddl.path", "/clickhouse/task_queue/ddl/");
-        int pool_size = config().getInt("distributed_ddl.pool_size", 1);
-        if (pool_size < 1)
-            throw Exception("distributed_ddl.pool_size should be greater then 0", ErrorCodes::ARGUMENT_OUT_OF_BOUND);
-        global_context->setDDLWorker(std::make_unique<DDLWorker>(pool_size, ddl_zookeeper_path, *global_context, &config(),
-                                                                 "distributed_ddl", "DDLWorker", &CurrentMetrics::MaxDDLEntryID));
-    }
-
     std::unique_ptr<DNSCacheUpdater> dns_cache_updater;
     if (config().has("disable_internal_dns_cache") && config().getInt("disable_internal_dns_cache"))
     {
@@ -1027,7 +1091,7 @@ int Server::main(const std::vector<std::string> & /*args*/)
     else
     {
         /// Initialize a watcher periodically updating DNS cache
-        dns_cache_updater = std::make_unique<DNSCacheUpdater>(*global_context, config().getInt("dns_cache_update_period", 15));
+        dns_cache_updater = std::make_unique<DNSCacheUpdater>(global_context, config().getInt("dns_cache_update_period", 15));
     }
 
 #if defined(OS_LINUX)
@@ -1059,7 +1123,7 @@ int Server::main(const std::vector<std::string> & /*args*/)
     {
         /// This object will periodically calculate some metrics.
         AsynchronousMetrics async_metrics(
-            *global_context, config().getUInt("asynchronous_metrics_update_period_s", 60), servers_to_start_before_tables, servers);
+            global_context, config().getUInt("asynchronous_metrics_update_period_s", 60), servers_to_start_before_tables, servers);
         attachSystemTablesAsync(*DatabaseCatalog::instance().getSystemDatabase(), async_metrics);
 
         for (const auto & listen_host : listen_hosts)
@@ -1275,9 +1339,6 @@ int Server::main(const std::vector<std::string> & /*args*/)
         async_metrics.start();
         global_context->enableNamedSessions();
 
-        for (auto & server : *servers)
-            server.start();
-
         {
             String level_str = config().getString("text_log.level", "");
             int level = level_str.empty() ? INT_MAX : Poco::Logger::parseLevel(level_str);
@@ -1298,6 +1359,37 @@ int Server::main(const std::vector<std::string> & /*args*/)
                 std::thread::hardware_concurrency());
         }
 
+        /// try to load dictionaries immediately, throw on error and die
+        ext::scope_guard dictionaries_xmls;
+        try
+        {
+            if (!config().getBool("dictionaries_lazy_load", true))
+            {
+                global_context->tryCreateEmbeddedDictionaries();
+                global_context->getExternalDictionariesLoader().enableAlwaysLoadEverything(true);
+            }
+            dictionaries_xmls = global_context->getExternalDictionariesLoader().addConfigRepository(
+                std::make_unique<ExternalLoaderXMLConfigRepository>(config(), "dictionaries_config"));
+        }
+        catch (...)
+        {
+            LOG_ERROR(log, "Caught exception while loading dictionaries.");
+            throw;
+        }
+
+        if (has_zookeeper && config().has("distributed_ddl"))
+        {
+            /// DDL worker should be started after all tables were loaded
+            String ddl_zookeeper_path = config().getString("distributed_ddl.path", "/clickhouse/task_queue/ddl/");
+            int pool_size = config().getInt("distributed_ddl.pool_size", 1);
+            if (pool_size < 1)
+                throw Exception("distributed_ddl.pool_size should be greater then 0", ErrorCodes::ARGUMENT_OUT_OF_BOUND);
+            global_context->setDDLWorker(std::make_unique<DDLWorker>(pool_size, ddl_zookeeper_path, global_context, &config(),
+                                                                     "distributed_ddl", "DDLWorker", &CurrentMetrics::MaxDDLEntryID));
+        }
+
+        for (auto & server : *servers)
+            server.start();
         LOG_INFO(log, "Ready for connections.");
 
         SCOPE_EXIT({
@@ -1347,26 +1439,6 @@ int Server::main(const std::vector<std::string> & /*args*/)
             }
         });
 
-        /// try to load dictionaries immediately, throw on error and die
-        ext::scope_guard dictionaries_xmls, models_xmls;
-        try
-        {
-            if (!config().getBool("dictionaries_lazy_load", true))
-            {
-                global_context->tryCreateEmbeddedDictionaries();
-                global_context->getExternalDictionariesLoader().enableAlwaysLoadEverything(true);
-            }
-            dictionaries_xmls = global_context->getExternalDictionariesLoader().addConfigRepository(
-                std::make_unique<ExternalLoaderXMLConfigRepository>(config(), "dictionaries_config"));
-            models_xmls = global_context->getExternalModelsLoader().addConfigRepository(
-                std::make_unique<ExternalLoaderXMLConfigRepository>(config(), "models_config"));
-        }
-        catch (...)
-        {
-            LOG_ERROR(log, "Caught exception while loading dictionaries.");
-            throw;
-        }
-
         std::vector<std::unique_ptr<MetricsTransmitter>> metrics_transmitters;
         for (const auto & graphite_key : DB::getMultipleKeysFromConfig(config(), "", "graphite"))
         {
diff --git a/programs/server/Server.h b/programs/server/Server.h
index fbfc26f6ee5..c698108767c 100644
--- a/programs/server/Server.h
+++ b/programs/server/Server.h
@@ -40,9 +40,9 @@ public:
         return BaseDaemon::logger();
     }
 
-    Context & context() const override
+    ContextPtr context() const override
     {
-        return *global_context_ptr;
+        return global_context;
     }
 
     bool isCancelled() const override
@@ -64,8 +64,7 @@ protected:
     std::string getDefaultCorePath() const override;
 
 private:
-    Context * global_context_ptr = nullptr;
-
+    ContextPtr global_context;
     Poco::Net::SocketAddress socketBindListen(Poco::Net::ServerSocket & socket, const std::string & host, UInt16 port, [[maybe_unused]] bool secure = false) const;
 
     using CreateServerFunc = std::function<void(UInt16)>;
diff --git a/programs/server/config.d/keeper_port.xml b/programs/server/config.d/keeper_port.xml
new file mode 120000
index 00000000000..6ebfce266fc
--- /dev/null
+++ b/programs/server/config.d/keeper_port.xml
@@ -0,0 +1 @@
+../../../tests/config/config.d/keeper_port.xml
\ No newline at end of file
diff --git a/programs/server/config.d/test_keeper_port.xml b/programs/server/config.d/test_keeper_port.xml
deleted file mode 120000
index f3f721caae0..00000000000
--- a/programs/server/config.d/test_keeper_port.xml
+++ /dev/null
@@ -1 +0,0 @@
-../../../tests/config/config.d/test_keeper_port.xml
\ No newline at end of file
diff --git a/programs/server/config.xml b/programs/server/config.xml
index ba9b8b04b05..195b6263595 100644
--- a/programs/server/config.xml
+++ b/programs/server/config.xml
@@ -7,7 +7,20 @@
 -->
 <yandex>
     <logger>
-        <!-- Possible levels: https://github.com/pocoproject/poco/blob/poco-1.9.4-release/Foundation/include/Poco/Logger.h#L105 -->
+        <!-- Possible levels [1]:
+
+          - none (turns off logging)
+          - fatal
+          - critical
+          - error
+          - warning
+          - notice
+          - information
+          - debug
+          - trace
+
+            [1]: https://github.com/pocoproject/poco/blob/poco-1.9.4-release/Foundation/include/Poco/Logger.h#L105-L114
+        -->
         <level>trace</level>
         <log>/var/log/clickhouse-server/clickhouse-server.log</log>
         <errorlog>/var/log/clickhouse-server/clickhouse-server.err.log</errorlog>
@@ -76,7 +89,7 @@
     <!-- Compatibility with PostgreSQL protocol.
          ClickHouse will pretend to be PostgreSQL for applications connecting to this port.
     -->
-    <!-- <postgresql_port>9005</postgresql_port> -->
+    <postgresql_port>9005</postgresql_port>
 
     <!-- HTTP API with TLS (HTTPS).
          You have to configure certificate to enable this interface.
@@ -298,6 +311,25 @@
     <mark_cache_size>5368709120</mark_cache_size>
 
 
+    <!-- If you enable the `min_bytes_to_use_mmap_io` setting,
+         the data in MergeTree tables can be read with mmap to avoid copying from kernel to userspace.
+         It makes sense only for large files and helps only if data reside in page cache.
+         To avoid frequent open/mmap/munmap/close calls (which are very expensive due to consequent page faults)
+         and to reuse mappings from several threads and queries,
+         the cache of mapped files is maintained. Its size is the number of mapped regions (usually equal to the number of mapped files).
+         The amount of data in mapped files can be monitored
+         in system.metrics, system.metric_log by the MMappedFiles, MMappedFileBytes metrics
+         and in system.asynchronous_metrics, system.asynchronous_metrics_log by the MMapCacheCells metric,
+         and also in system.events, system.processes, system.query_log, system.query_thread_log by the
+         CreatedReadBufferMMap, CreatedReadBufferMMapFailed, MMappedFileCacheHits, MMappedFileCacheMisses events.
+         Note that the amount of data in mapped files does not consume memory directly and is not accounted
+         in query or server memory usage - because this memory can be discarded similar to OS page cache.
+         The cache is dropped (the files are closed) automatically on removal of old parts in MergeTree,
+         also it can be dropped manually by the SYSTEM DROP MMAP CACHE query.
+      -->
+    <mmap_cache_size>1000</mmap_cache_size>
+
+
     <!-- Path to data directory, with trailing slash. -->
     <path>/var/lib/clickhouse/</path>
 
@@ -362,6 +394,27 @@
         -->
     </ldap_servers>
 
+    <!-- To enable Kerberos authentication support for HTTP requests (GSS-SPNEGO), for those users who are explicitly configured
+          to authenticate via Kerberos, define a single 'kerberos' section here.
+         Parameters:
+            principal - canonical service principal name, that will be acquired and used when accepting security contexts.
+                    This parameter is optional, if omitted, the default principal will be used.
+                    This parameter cannot be specified together with 'realm' parameter.
+            realm - a realm, that will be used to restrict authentication to only those requests whose initiator's realm matches it.
+                    This parameter is optional, if omitted, no additional filtering by realm will be applied.
+                    This parameter cannot be specified together with 'principal' parameter.
+         Example:
+            <kerberos />
+         Example:
+            <kerberos>
+                <principal>HTTP/clickhouse.example.com@EXAMPLE.COM</principal>
+            </kerberos>
+         Example:
+            <kerberos>
+                <realm>EXAMPLE.COM</realm>
+            </kerberos>
+    -->
+
     <!-- Sources to read users, roles, access rights, profiles of settings, quotas. -->
     <user_directories>
         <users_xml>
@@ -578,7 +631,7 @@
     <!-- The list of hosts allowed to use in URL-related storage engines and table functions.
         If this section is not present in configuration, all hosts are allowed.
     -->
-    <remote_url_allow_hosts>
+    <!--<remote_url_allow_hosts>-->
         <!-- Host should be specified exactly as in URL. The name is checked before DNS resolution.
             Example: "yandex.ru", "yandex.ru." and "www.yandex.ru" are different hosts.
                     If port is explicitly specified in URL, the host:port is checked as a whole.
@@ -592,7 +645,7 @@
             Regexps are not aligned: don't forget to add ^ and $. Also don't forget to escape dot (.) metacharacter
             (forgetting to do so is a common source of error).
         -->
-    </remote_url_allow_hosts>
+    <!--</remote_url_allow_hosts>-->
 
     <!-- If element has 'incl' attribute, then for it's value will be used corresponding substitution from another file.
          By default, path to file with substitutions is /etc/metrika.xml. It could be changed in config in 'include_from' element.
@@ -892,6 +945,19 @@
 
         <!-- Controls how much ON CLUSTER queries can be run simultaneously. -->
         <!-- <pool_size>1</pool_size> -->
+
+        <!--
+             Cleanup settings (active tasks will not be removed)
+        -->
+
+        <!-- Controls task TTL (default 1 week) -->
+        <!-- <task_max_lifetime>604800</task_max_lifetime> -->
+
+        <!-- Controls how often cleanup should be performed (in seconds) -->
+        <!-- <cleanup_delay_period>60</cleanup_delay_period> -->
+
+        <!-- Controls how many tasks could be in the queue -->
+        <!-- <max_tasks_in_queue>1000</max_tasks_in_queue> -->
     </distributed_ddl>
 
     <!-- Settings to fine tune MergeTree tables. See documentation in source code, in MergeTreeSettings.h -->
diff --git a/programs/server/data/.gitignore b/programs/server/data/.gitignore
deleted file mode 100644
index b9719d9d1d1..00000000000
--- a/programs/server/data/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*.txt
-*.dat
-*.idx
diff --git a/programs/server/metadata/.gitignore b/programs/server/metadata/.gitignore
deleted file mode 100644
index d1b811b7de5..00000000000
--- a/programs/server/metadata/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.sql
diff --git a/programs/server/play.html b/programs/server/play.html
index 81fc13f1f86..0c039097ce1 100644
--- a/programs/server/play.html
+++ b/programs/server/play.html
@@ -306,10 +306,10 @@
     /// Incremental request number. When response is received,
     /// if it's request number does not equal to the current request number, response will be ignored.
     /// This is to avoid race conditions.
-    var request_num = 0;
+    let request_num = 0;
 
     /// Save query in history only if it is different.
-    var previous_query = '';
+    let previous_query = '';
 
     /// Substitute the address of the server where the page is served.
     if (location.protocol != 'file:') {
@@ -317,7 +317,7 @@
     }
 
     /// Substitute user name if it's specified in the query string
-    var user_from_url = (new URL(window.location)).searchParams.get('user');
+    let user_from_url = (new URL(window.location)).searchParams.get('user');
     if (user_from_url) {
         document.getElementById('user').value = user_from_url;
     }
@@ -326,10 +326,10 @@
     {
         /// TODO: Check if URL already contains query string (append parameters).
 
-        var user = document.getElementById('user').value;
-        var password = document.getElementById('password').value;
+        let user = document.getElementById('user').value;
+        let password = document.getElementById('password').value;
 
-        var url = document.getElementById('url').value +
+        let url = document.getElementById('url').value +
             /// Ask server to allow cross-domain requests.
             '?add_http_cors_header=1' +
             '&user=' + encodeURIComponent(user) +
@@ -338,7 +338,7 @@
             /// Safety settings to prevent results that browser cannot display.
             '&max_result_rows=1000&max_result_bytes=10000000&result_overflow_mode=break';
 
-        var xhr = new XMLHttpRequest;
+        let xhr = new XMLHttpRequest;
 
         xhr.open('POST', url, true);
 
@@ -352,13 +352,13 @@
                 /// The query is saved in browser history (in state JSON object)
                 /// as well as in URL fragment identifier.
                 if (query != previous_query) {
-                    var state = {
+                    let state = {
                         query: query,
                         status: this.status,
                         response: this.response.length > 100000 ? null : this.response  /// Lower than the browser's limit.
                     };
-                    var title = "ClickHouse Query: " + query;
-                    var url = window.location.pathname + '?user=' + encodeURIComponent(user) + '#' + window.btoa(query);
+                    let title = "ClickHouse Query: " + query;
+                    let url = window.location.pathname + '?user=' + encodeURIComponent(user) + '#' + window.btoa(query);
                     if (previous_query == '') {
                         history.replaceState(state, title, url);
                     } else {
@@ -382,7 +382,7 @@
         document.getElementById('hourglass').style.display = 'none';
 
         if (status === 200) {
-            var json;
+            let json;
             try { json = JSON.parse(response); } catch (e) {}
             if (json !== undefined && json.statistics !== undefined) {
                 renderResult(json);
@@ -415,7 +415,7 @@
     function post()
     {
         ++request_num;
-        var query = document.getElementById('query').value;
+        let query = document.getElementById('query').value;
         postImpl(request_num, query);
     }
 
@@ -434,7 +434,7 @@
 
     function clear()
     {
-        var table = document.getElementById('data-table');
+        let table = document.getElementById('data-table');
         while (table.firstChild) {
             table.removeChild(table.lastChild);
         }
@@ -456,33 +456,45 @@
         //console.log(response);
         clear();
 
-        var stats = document.getElementById('stats');
+        let stats = document.getElementById('stats');
         stats.innerText = 'Elapsed: ' + response.statistics.elapsed.toFixed(3) + " sec, read " + response.statistics.rows_read + " rows.";
 
-        var thead = document.createElement('thead');
-        for (var idx in response.meta) {
-            var th = document.createElement('th');
-            var name = document.createTextNode(response.meta[idx].name);
+        let thead = document.createElement('thead');
+        for (let idx in response.meta) {
+            let th = document.createElement('th');
+            let name = document.createTextNode(response.meta[idx].name);
             th.appendChild(name);
             thead.appendChild(th);
         }
 
         /// To prevent hanging the browser, limit the number of cells in a table.
         /// It's important to have the limit on number of cells, not just rows, because tables may be wide or narrow.
-        var max_rows = 10000 / response.meta.length;
-        var row_num = 0;
+        let max_rows = 10000 / response.meta.length;
+        let row_num = 0;
 
-        var tbody = document.createElement('tbody');
-        for (var row_idx in response.data) {
-            var tr = document.createElement('tr');
-            for (var col_idx in response.data[row_idx]) {
-                var td = document.createElement('td');
-                var cell = response.data[row_idx][col_idx];
-                var is_null = (cell === null);
-                var content = document.createTextNode(is_null ? 'ᴺᵁᴸᴸ' : cell);
-                td.appendChild(content);
-                /// TODO: Execute regexp only once for each column.
-                td.className = response.meta[col_idx].type.match(/^(U?Int|Decimal|Float)/) ? 'right' : 'left';
+        let column_classes = response.meta.map(elem => elem.type.match(/^(U?Int|Decimal|Float)/) ? 'right' : 'left');
+
+        let tbody = document.createElement('tbody');
+        for (let row_idx in response.data) {
+            let tr = document.createElement('tr');
+            for (let col_idx in response.data[row_idx]) {
+                let td = document.createElement('td');
+                let cell = response.data[row_idx][col_idx];
+
+                let is_null = (cell === null);
+
+                /// Test: SELECT number, toString(number) AS str, number % 2 ? number : NULL AS nullable, range(number) AS arr, CAST((['hello', 'world'], [number, number % 2]) AS Map(String, UInt64)) AS map FROM numbers(10)
+                let text;
+                if (is_null) {
+                    text = 'ᴺᵁᴸᴸ';
+                } else if (typeof(cell) === 'object') {
+                    text = JSON.stringify(cell);
+                } else {
+                    text = cell;
+                }
+
+                td.appendChild(document.createTextNode(text));
+                td.className = column_classes[col_idx];
                 if (is_null) {
                     td.className += ' null';
                 }
@@ -496,7 +508,7 @@
             }
         }
 
-        var table = document.getElementById('data-table');
+        let table = document.getElementById('data-table');
         table.appendChild(thead);
         table.appendChild(tbody);
     }
@@ -505,7 +517,7 @@
     function renderUnparsedResult(response)
     {
         clear();
-        var data = document.getElementById('data-unparsed')
+        let data = document.getElementById('data-unparsed')
 
         if (response === '') {
             /// TODO: Fade or remove previous result when new request will be performed.
@@ -531,12 +543,12 @@
     }
 
     /// The choice of color theme is saved in browser.
-    var theme = window.localStorage.getItem('theme');
+    let theme = window.localStorage.getItem('theme');
     if (theme) {
         setColorTheme(theme);
     } else {
         /// Obtain system-level user preference
-        var media_query_list = window.matchMedia('prefers-color-scheme: dark')
+        let media_query_list = window.matchMedia('prefers-color-scheme: dark')
 
         if (media_query_list.matches) {
             /// Set without saving to localstorage
diff --git a/programs/server/users.xml b/programs/server/users.xml
index ef66891a6a0..b33dc0628d1 100644
--- a/programs/server/users.xml
+++ b/programs/server/users.xml
@@ -41,9 +41,18 @@
                  If you want to specify double SHA1, place it in 'password_double_sha1_hex' element.
                  Example: <password_double_sha1_hex>e395796d6546b1b65db9d665cd43f0e858dd4303</password_double_sha1_hex>
 
-                 If you want to specify a previously defined LDAP server (see 'ldap_servers' in main config) for authentication, place its name in 'server' element inside 'ldap' element.
+                 If you want to specify a previously defined LDAP server (see 'ldap_servers' in the main config) for authentication,
+                  place its name in 'server' element inside 'ldap' element.
                  Example: <ldap><server>my_ldap_server</server></ldap>
 
+                 If you want to authenticate the user via Kerberos (assuming Kerberos is enabled, see 'kerberos' in the main config),
+                  place 'kerberos' element instead of 'password' (and similar) elements.
+                 The name part of the canonical principal name of the initiator must match the user name for authentication to succeed.
+                 You can also place 'realm' element inside 'kerberos' element to further restrict authentication to only those requests
+                  whose initiator's realm matches it. 
+                 Example: <kerberos />
+                 Example: <kerberos><realm>EXAMPLE.COM</realm></kerberos>
+
                  How to generate decent password:
                  Execute: PASSWORD=$(base64 < /dev/urandom | head -c8); echo "$PASSWORD"; echo -n "$PASSWORD" | sha256sum | tr -d '-'
                  In first line will be password and in second - corresponding SHA256.
diff --git a/src/Access/AccessControlManager.cpp b/src/Access/AccessControlManager.cpp
index e874bda5b69..66023c1c0ea 100644
--- a/src/Access/AccessControlManager.cpp
+++ b/src/Access/AccessControlManager.cpp
@@ -361,9 +361,9 @@ void AccessControlManager::addStoragesFromMainConfig(
 }
 
 
-UUID AccessControlManager::login(const String & user_name, const String & password, const Poco::Net::IPAddress & address) const
+UUID AccessControlManager::login(const Credentials & credentials, const Poco::Net::IPAddress & address) const
 {
-    return MultipleAccessStorage::login(user_name, password, address, *external_authenticators);
+    return MultipleAccessStorage::login(credentials, address, *external_authenticators);
 }
 
 void AccessControlManager::setExternalAuthenticatorsConfig(const Poco::Util::AbstractConfiguration & config)
@@ -403,7 +403,7 @@ void AccessControlManager::checkSettingNameIsAllowed(const std::string_view & se
 
 std::shared_ptr<const ContextAccess> AccessControlManager::getContextAccess(
     const UUID & user_id,
-    const boost::container::flat_set<UUID> & current_roles,
+    const std::vector<UUID> & current_roles,
     bool use_default_roles,
     const Settings & settings,
     const String & current_database,
@@ -411,7 +411,7 @@ std::shared_ptr<const ContextAccess> AccessControlManager::getContextAccess(
 {
     ContextAccessParams params;
     params.user_id = user_id;
-    params.current_roles = current_roles;
+    params.current_roles.insert(current_roles.begin(), current_roles.end());
     params.use_default_roles = use_default_roles;
     params.current_database = current_database;
     params.readonly = settings.readonly;
@@ -444,8 +444,8 @@ std::shared_ptr<const ContextAccess> AccessControlManager::getContextAccess(cons
 
 
 std::shared_ptr<const EnabledRoles> AccessControlManager::getEnabledRoles(
-    const boost::container::flat_set<UUID> & current_roles,
-    const boost::container::flat_set<UUID> & current_roles_with_admin_option) const
+    const std::vector<UUID> & current_roles,
+    const std::vector<UUID> & current_roles_with_admin_option) const
 {
     return role_cache->getEnabledRoles(current_roles, current_roles_with_admin_option);
 }
diff --git a/src/Access/AccessControlManager.h b/src/Access/AccessControlManager.h
index 07edfd93475..789c33af1c1 100644
--- a/src/Access/AccessControlManager.h
+++ b/src/Access/AccessControlManager.h
@@ -109,12 +109,12 @@ public:
     bool isSettingNameAllowed(const std::string_view & name) const;
     void checkSettingNameIsAllowed(const std::string_view & name) const;
 
-    UUID login(const String & user_name, const String & password, const Poco::Net::IPAddress & address) const;
+    UUID login(const Credentials & credentials, const Poco::Net::IPAddress & address) const;
     void setExternalAuthenticatorsConfig(const Poco::Util::AbstractConfiguration & config);
 
     std::shared_ptr<const ContextAccess> getContextAccess(
         const UUID & user_id,
-        const boost::container::flat_set<UUID> & current_roles,
+        const std::vector<UUID> & current_roles,
         bool use_default_roles,
         const Settings & settings,
         const String & current_database,
@@ -123,8 +123,8 @@ public:
     std::shared_ptr<const ContextAccess> getContextAccess(const ContextAccessParams & params) const;
 
     std::shared_ptr<const EnabledRoles> getEnabledRoles(
-        const boost::container::flat_set<UUID> & current_roles,
-        const boost::container::flat_set<UUID> & current_roles_with_admin_option) const;
+        const std::vector<UUID> & current_roles,
+        const std::vector<UUID> & current_roles_with_admin_option) const;
 
     std::shared_ptr<const EnabledRowPolicies> getEnabledRowPolicies(
         const UUID & user_id,
diff --git a/src/Access/AccessRights.cpp b/src/Access/AccessRights.cpp
index 8ce71dd8da8..f9c1d23350d 100644
--- a/src/Access/AccessRights.cpp
+++ b/src/Access/AccessRights.cpp
@@ -7,16 +7,19 @@
 
 namespace DB
 {
+namespace ErrorCodes
+{
+    extern const int BAD_ARGUMENTS;
+}
+
 namespace
 {
-    using Kind = AccessRightsElementWithOptions::Kind;
-
     struct ProtoElement
     {
         AccessFlags access_flags;
         boost::container::small_vector<std::string_view, 3> full_name;
         bool grant_option = false;
-        Kind kind = Kind::GRANT;
+        bool is_partial_revoke = false;
 
         friend bool operator<(const ProtoElement & left, const ProtoElement & right)
         {
@@ -43,8 +46,8 @@ namespace
             if (int cmp = compare_name(left.full_name, right.full_name, 1))
                 return cmp < 0;
 
-            if (left.kind != right.kind)
-                return (left.kind == Kind::GRANT);
+            if (left.is_partial_revoke != right.is_partial_revoke)
+                return right.is_partial_revoke;
 
             if (left.grant_option != right.grant_option)
                 return right.grant_option;
@@ -55,12 +58,12 @@ namespace
             return (left.access_flags < right.access_flags);
         }
 
-        AccessRightsElementWithOptions getResult() const
+        AccessRightsElement getResult() const
         {
-            AccessRightsElementWithOptions res;
+            AccessRightsElement res;
             res.access_flags = access_flags;
             res.grant_option = grant_option;
-            res.kind = kind;
+            res.is_partial_revoke = is_partial_revoke;
             switch (full_name.size())
             {
                 case 0:
@@ -105,11 +108,11 @@ namespace
     class ProtoElements : public std::vector<ProtoElement>
     {
     public:
-        AccessRightsElementsWithOptions getResult() const
+        AccessRightsElements getResult() const
         {
             ProtoElements sorted = *this;
             boost::range::sort(sorted);
-            AccessRightsElementsWithOptions res;
+            AccessRightsElements res;
             res.reserve(sorted.size());
 
             for (size_t i = 0; i != sorted.size();)
@@ -144,7 +147,7 @@ namespace
             {
                 return (element.full_name.size() != 3) || (element.full_name[0] != start_element.full_name[0])
                     || (element.full_name[1] != start_element.full_name[1]) || (element.grant_option != start_element.grant_option)
-                    || (element.kind != start_element.kind);
+                    || (element.is_partial_revoke != start_element.is_partial_revoke);
             });
 
             return it - (begin() + start);
@@ -153,7 +156,7 @@ namespace
         /// Collects columns together to write multiple columns into one AccessRightsElement.
         /// That procedure allows to output access rights in more compact way,
         /// e.g. "SELECT(x, y)" instead of "SELECT(x), SELECT(y)".
-        void appendResultWithElementsWithDifferenceInColumnOnly(size_t start, size_t count, AccessRightsElementsWithOptions & res) const
+        void appendResultWithElementsWithDifferenceInColumnOnly(size_t start, size_t count, AccessRightsElements & res) const
         {
             const auto * pbegin = data() + start;
             const auto * pend = pbegin + count;
@@ -180,7 +183,7 @@ namespace
                 res.emplace_back();
                 auto & back = res.back();
                 back.grant_option = pbegin->grant_option;
-                back.kind = pbegin->kind;
+                back.is_partial_revoke = pbegin->is_partial_revoke;
                 back.any_database = false;
                 back.database = pbegin->full_name[0];
                 back.any_table = false;
@@ -515,10 +518,10 @@ private:
         auto grants = flags - parent_fl;
 
         if (revokes)
-            res.push_back(ProtoElement{revokes, full_name, false, Kind::REVOKE});
+            res.push_back(ProtoElement{revokes, full_name, false, true});
 
         if (grants)
-            res.push_back(ProtoElement{grants, full_name, false, Kind::GRANT});
+            res.push_back(ProtoElement{grants, full_name, false, false});
 
         if (node.children)
         {
@@ -550,16 +553,16 @@ private:
         auto grants = flags - parent_fl - grants_go;
 
         if (revokes)
-            res.push_back(ProtoElement{revokes, full_name, false, Kind::REVOKE});
+            res.push_back(ProtoElement{revokes, full_name, false, true});
 
         if (revokes_go)
-            res.push_back(ProtoElement{revokes_go, full_name, true, Kind::REVOKE});
+            res.push_back(ProtoElement{revokes_go, full_name, true, true});
 
         if (grants)
-            res.push_back(ProtoElement{grants, full_name, false, Kind::GRANT});
+            res.push_back(ProtoElement{grants, full_name, false, false});
 
         if (grants_go)
-            res.push_back(ProtoElement{grants_go, full_name, true, Kind::GRANT});
+            res.push_back(ProtoElement{grants_go, full_name, true, false});
 
         if (node && node->children)
         {
@@ -774,8 +777,10 @@ void AccessRights::grantImpl(const AccessFlags & flags, const Args &... args)
 }
 
 template <bool with_grant_option>
-void AccessRights::grantImpl(const AccessRightsElement & element)
+void AccessRights::grantImplHelper(const AccessRightsElement & element)
 {
+    assert(!element.is_partial_revoke);
+    assert(!element.grant_option || with_grant_option);
     if (element.any_database)
         grantImpl<with_grant_option>(element.access_flags);
     else if (element.any_table)
@@ -786,6 +791,24 @@ void AccessRights::grantImpl(const AccessRightsElement & element)
         grantImpl<with_grant_option>(element.access_flags, element.database, element.table, element.columns);
 }
 
+template <bool with_grant_option>
+void AccessRights::grantImpl(const AccessRightsElement & element)
+{
+    if (element.is_partial_revoke)
+        throw Exception("A partial revoke should be revoked, not granted", ErrorCodes::BAD_ARGUMENTS);
+    if constexpr (with_grant_option)
+    {
+        grantImplHelper<true>(element);
+    }
+    else
+    {
+        if (element.grant_option)
+            grantImplHelper<true>(element);
+        else
+            grantImplHelper<false>(element);
+    }
+}
+
 template <bool with_grant_option>
 void AccessRights::grantImpl(const AccessRightsElements & elements)
 {
@@ -830,8 +853,9 @@ void AccessRights::revokeImpl(const AccessFlags & flags, const Args &... args)
 }
 
 template <bool grant_option>
-void AccessRights::revokeImpl(const AccessRightsElement & element)
+void AccessRights::revokeImplHelper(const AccessRightsElement & element)
 {
+    assert(!element.grant_option || grant_option);
     if (element.any_database)
         revokeImpl<grant_option>(element.access_flags);
     else if (element.any_table)
@@ -842,6 +866,22 @@ void AccessRights::revokeImpl(const AccessRightsElement & element)
         revokeImpl<grant_option>(element.access_flags, element.database, element.table, element.columns);
 }
 
+template <bool grant_option>
+void AccessRights::revokeImpl(const AccessRightsElement & element)
+{
+    if constexpr (grant_option)
+    {
+        revokeImplHelper<true>(element);
+    }
+    else
+    {
+        if (element.grant_option)
+            revokeImplHelper<true>(element);
+        else
+            revokeImplHelper<false>(element);
+    }
+}
+
 template <bool grant_option>
 void AccessRights::revokeImpl(const AccessRightsElements & elements)
 {
@@ -868,7 +908,7 @@ void AccessRights::revokeGrantOption(const AccessRightsElement & element) { revo
 void AccessRights::revokeGrantOption(const AccessRightsElements & elements) { revokeImpl<true>(elements); }
 
 
-AccessRightsElementsWithOptions AccessRights::getElements() const
+AccessRightsElements AccessRights::getElements() const
 {
 #if 0
     logTree();
@@ -903,8 +943,9 @@ bool AccessRights::isGrantedImpl(const AccessFlags & flags, const Args &... args
 }
 
 template <bool grant_option>
-bool AccessRights::isGrantedImpl(const AccessRightsElement & element) const
+bool AccessRights::isGrantedImplHelper(const AccessRightsElement & element) const
 {
+    assert(!element.grant_option || grant_option);
     if (element.any_database)
         return isGrantedImpl<grant_option>(element.access_flags);
     else if (element.any_table)
@@ -915,6 +956,22 @@ bool AccessRights::isGrantedImpl(const AccessRightsElement & element) const
         return isGrantedImpl<grant_option>(element.access_flags, element.database, element.table, element.columns);
 }
 
+template <bool grant_option>
+bool AccessRights::isGrantedImpl(const AccessRightsElement & element) const
+{
+    if constexpr (grant_option)
+    {
+        return isGrantedImplHelper<true>(element);
+    }
+    else
+    {
+        if (element.grant_option)
+            return isGrantedImplHelper<true>(element);
+        else
+            return isGrantedImplHelper<false>(element);
+    }
+}
+
 template <bool grant_option>
 bool AccessRights::isGrantedImpl(const AccessRightsElements & elements) const
 {
diff --git a/src/Access/AccessRights.h b/src/Access/AccessRights.h
index c610795ab45..a90616ea27f 100644
--- a/src/Access/AccessRights.h
+++ b/src/Access/AccessRights.h
@@ -30,7 +30,7 @@ public:
     String toString() const;
 
     /// Returns the information about all the access granted.
-    AccessRightsElementsWithOptions getElements() const;
+    AccessRightsElements getElements() const;
 
     /// Grants access on a specified database/table/column.
     /// Does nothing if the specified access has been already granted.
@@ -119,12 +119,15 @@ private:
     template <bool with_grant_option, typename... Args>
     void grantImpl(const AccessFlags & flags, const Args &... args);
 
-    template <bool with_grant_options>
+    template <bool with_grant_option>
     void grantImpl(const AccessRightsElement & element);
 
-    template <bool with_grant_options>
+    template <bool with_grant_option>
     void grantImpl(const AccessRightsElements & elements);
 
+    template <bool with_grant_option>
+    void grantImplHelper(const AccessRightsElement & element);
+
     template <bool grant_option, typename... Args>
     void revokeImpl(const AccessFlags & flags, const Args &... args);
 
@@ -134,6 +137,9 @@ private:
     template <bool grant_option>
     void revokeImpl(const AccessRightsElements & elements);
 
+    template <bool grant_option>
+    void revokeImplHelper(const AccessRightsElement & element);
+
     template <bool grant_option, typename... Args>
     bool isGrantedImpl(const AccessFlags & flags, const Args &... args) const;
 
@@ -143,6 +149,9 @@ private:
     template <bool grant_option>
     bool isGrantedImpl(const AccessRightsElements & elements) const;
 
+    template <bool grant_option>
+    bool isGrantedImplHelper(const AccessRightsElement & element) const;
+
     void logTree() const;
 
     struct Node;
diff --git a/src/Access/AccessRightsElement.cpp b/src/Access/AccessRightsElement.cpp
index e69fb6d3b74..823019ffebd 100644
--- a/src/Access/AccessRightsElement.cpp
+++ b/src/Access/AccessRightsElement.cpp
@@ -1,169 +1,162 @@
 #include <Access/AccessRightsElement.h>
-#include <Dictionaries/IDictionary.h>
 #include <Common/quoteString.h>
-#include <boost/range/algorithm/sort.hpp>
-#include <boost/range/algorithm/unique.hpp>
-#include <boost/range/algorithm_ext/is_sorted.hpp>
 #include <boost/range/algorithm_ext/erase.hpp>
-#include <boost/range/algorithm_ext/push_back.hpp>
 
 
 namespace DB
 {
 namespace
 {
-    using Kind = AccessRightsElementWithOptions::Kind;
-
-    String formatOptions(bool grant_option, Kind kind, const String & inner_part)
+    void formatColumnNames(const Strings & columns, String & result)
     {
-        if (kind == Kind::REVOKE)
+        result += "(";
+        bool need_comma = false;
+        for (const auto & column : columns)
         {
-            if (grant_option)
-                return "REVOKE GRANT OPTION " + inner_part;
-            else
-                return "REVOKE " + inner_part;
-        }
-        else
-        {
-            if (grant_option)
-                return "GRANT " + inner_part + " WITH GRANT OPTION";
-            else
-                return "GRANT " + inner_part;
+            if (need_comma)
+                result += ", ";
+            need_comma = true;
+            result += backQuoteIfNeed(column);
         }
+        result += ")";
     }
 
-
-    String formatONClause(const String & database, bool any_database, const String & table, bool any_table)
+    void formatONClause(const String & database, bool any_database, const String & table, bool any_table, String & result)
     {
-        String msg = "ON ";
-
+        result += "ON ";
         if (any_database)
-            msg += "*.";
-        else if (!database.empty())
-            msg += backQuoteIfNeed(database) + ".";
-
-        if (any_table)
-            msg += "*";
+        {
+            result += "*.*";
+        }
         else
-            msg += backQuoteIfNeed(table);
-        return msg;
+        {
+            if (!database.empty())
+            {
+                result += backQuoteIfNeed(database);
+                result += ".";
+            }
+            if (any_table)
+                result += "*";
+            else
+                result += backQuoteIfNeed(table);
+        }
     }
 
-
-    String formatAccessFlagsWithColumns(const AccessFlags & access_flags, const Strings & columns, bool any_column)
+    void formatOptions(bool grant_option, bool is_partial_revoke, String & result)
     {
-        String columns_in_parentheses;
+        if (is_partial_revoke)
+        {
+            if (grant_option)
+                result.insert(0, "REVOKE GRANT OPTION ");
+            else
+                result.insert(0, "REVOKE ");
+        }
+        else
+        {
+            if (grant_option)
+                result.insert(0, "GRANT ").append(" WITH GRANT OPTION");
+            else
+                result.insert(0, "GRANT ");
+        }
+    }
+
+    void formatAccessFlagsWithColumns(const AccessFlags & access_flags, const Strings & columns, bool any_column, String & result)
+    {
+        String columns_as_str;
         if (!any_column)
         {
             if (columns.empty())
-                return "USAGE";
-            for (const auto & column : columns)
             {
-                columns_in_parentheses += columns_in_parentheses.empty() ? "(" : ", ";
-                columns_in_parentheses += backQuoteIfNeed(column);
+                result += "USAGE";
+                return;
             }
-            columns_in_parentheses += ")";
+            formatColumnNames(columns, columns_as_str);
         }
 
         auto keywords = access_flags.toKeywords();
         if (keywords.empty())
-            return "USAGE";
+        {
+            result += "USAGE";
+            return;
+        }
 
-        String msg;
+        bool need_comma = false;
         for (const std::string_view & keyword : keywords)
         {
-            if (!msg.empty())
-                msg += ", ";
-            msg += String{keyword} + columns_in_parentheses;
+            if (need_comma)
+                result.append(", ");
+            need_comma = true;
+            result += keyword;
+            result += columns_as_str;
         }
-        return msg;
     }
-}
 
-
-String AccessRightsElement::toString() const
-{
-    return formatAccessFlagsWithColumns(access_flags, columns, any_column) + " " + formatONClause(database, any_database, table, any_table);
-}
-
-String AccessRightsElementWithOptions::toString() const
-{
-    return formatOptions(grant_option, kind, AccessRightsElement::toString());
-}
-
-String AccessRightsElements::toString() const
-{
-    if (empty())
-        return "USAGE ON *.*";
-
-    String res;
-    String inner_part;
-
-    for (size_t i = 0; i != size(); ++i)
+    String toStringImpl(const AccessRightsElement & element, bool with_options)
     {
-        const auto & element = (*this)[i];
-
-        if (!inner_part.empty())
-            inner_part += ", ";
-        inner_part += formatAccessFlagsWithColumns(element.access_flags, element.columns, element.any_column);
-
-        bool next_element_uses_same_table = false;
-        if (i != size() - 1)
-        {
-            const auto & next_element = (*this)[i + 1];
-            if (element.sameDatabaseAndTable(next_element))
-                next_element_uses_same_table = true;
-        }
-
-        if (!next_element_uses_same_table)
-        {
-            if (!res.empty())
-                res += ", ";
-            res += inner_part + " " + formatONClause(element.database, element.any_database, element.table, element.any_table);
-            inner_part.clear();
-        }
+        String result;
+        formatAccessFlagsWithColumns(element.access_flags, element.columns, element.any_column, result);
+        result += " ";
+        formatONClause(element.database, element.any_database, element.table, element.any_table, result);
+        if (with_options)
+            formatOptions(element.grant_option, element.is_partial_revoke, result);
+        return result;
     }
 
-    return res;
-}
-
-String AccessRightsElementsWithOptions::toString() const
-{
-    if (empty())
-        return "GRANT USAGE ON *.*";
-
-    String res;
-    String inner_part;
-
-    for (size_t i = 0; i != size(); ++i)
+    String toStringImpl(const AccessRightsElements & elements, bool with_options)
     {
-        const auto & element = (*this)[i];
+        if (elements.empty())
+            return with_options ? "GRANT USAGE ON *.*" : "USAGE ON *.*";
 
-        if (!inner_part.empty())
-            inner_part += ", ";
-        inner_part += formatAccessFlagsWithColumns(element.access_flags, element.columns, element.any_column);
+        String result;
+        String part;
 
-        bool next_element_uses_same_mode_and_table = false;
-        if (i != size() - 1)
+        for (size_t i = 0; i != elements.size(); ++i)
         {
-            const auto & next_element = (*this)[i + 1];
-            if (element.sameDatabaseAndTable(next_element) && element.sameOptions(next_element))
-                next_element_uses_same_mode_and_table = true;
+            const auto & element = elements[i];
+
+            if (!part.empty())
+                part += ", ";
+            formatAccessFlagsWithColumns(element.access_flags, element.columns, element.any_column, part);
+
+            bool next_element_uses_same_table_and_options = false;
+            if (i != elements.size() - 1)
+            {
+                const auto & next_element = elements[i + 1];
+                if (element.sameDatabaseAndTable(next_element) && element.sameOptions(next_element))
+                    next_element_uses_same_table_and_options = true;
+            }
+
+            if (!next_element_uses_same_table_and_options)
+            {
+                part += " ";
+                formatONClause(element.database, element.any_database, element.table, element.any_table, part);
+                if (with_options)
+                    formatOptions(element.grant_option, element.is_partial_revoke, part);
+                if (result.empty())
+                    result = std::move(part);
+                else
+                    result.append(", ").append(part);
+                part.clear();
+            }
         }
 
-        if (!next_element_uses_same_mode_and_table)
-        {
-            if (!res.empty())
-                res += ", ";
-            res += formatOptions(
-                element.grant_option,
-                element.kind,
-                inner_part + " " + formatONClause(element.database, element.any_database, element.table, element.any_table));
-            inner_part.clear();
-        }
+        return result;
     }
+}
 
-    return res;
+
+String AccessRightsElement::toString() const { return toStringImpl(*this, true); }
+String AccessRightsElement::toStringWithoutOptions() const { return toStringImpl(*this, false); }
+String AccessRightsElements::toString() const { return toStringImpl(*this, true); }
+String AccessRightsElements::toStringWithoutOptions() const { return toStringImpl(*this, false); }
+
+void AccessRightsElements::eraseNonGrantable()
+{
+    boost::range::remove_erase_if(*this, [](AccessRightsElement & element)
+    {
+        element.eraseNonGrantable();
+        return element.empty();
+    });
 }
 
 }
diff --git a/src/Access/AccessRightsElement.h b/src/Access/AccessRightsElement.h
index 36cb64e6eba..c76f019bc61 100644
--- a/src/Access/AccessRightsElement.h
+++ b/src/Access/AccessRightsElement.h
@@ -16,6 +16,8 @@ struct AccessRightsElement
     bool any_database = true;
     bool any_table = true;
     bool any_column = true;
+    bool grant_option = false;
+    bool is_partial_revoke = false;
 
     AccessRightsElement() = default;
     AccessRightsElement(const AccessRightsElement &) = default;
@@ -73,7 +75,7 @@ struct AccessRightsElement
 
     bool empty() const { return !access_flags || (!any_column && columns.empty()); }
 
-    auto toTuple() const { return std::tie(access_flags, any_database, database, any_table, table, any_column, columns); }
+    auto toTuple() const { return std::tie(access_flags, any_database, database, any_table, table, any_column, columns, grant_option, is_partial_revoke); }
     friend bool operator==(const AccessRightsElement & left, const AccessRightsElement & right) { return left.toTuple() == right.toTuple(); }
     friend bool operator!=(const AccessRightsElement & left, const AccessRightsElement & right) { return !(left == right); }
 
@@ -83,44 +85,36 @@ struct AccessRightsElement
             && (any_table == other.any_table);
     }
 
-    bool isEmptyDatabase() const { return !any_database && database.empty(); }
-
-    /// If the database is empty, replaces it with `new_database`. Otherwise does nothing.
-    void replaceEmptyDatabase(const String & new_database);
-
-    /// Resets flags which cannot be granted.
-    void removeNonGrantableFlags();
-
-    /// Returns a human-readable representation like "SELECT, UPDATE(x, y) ON db.table".
-    String toString() const;
-};
-
-
-struct AccessRightsElementWithOptions : public AccessRightsElement
-{
-    bool grant_option = false;
-
-    enum class Kind
+    bool sameOptions(const AccessRightsElement & other) const
     {
-        GRANT,
-        REVOKE,
-    };
-    Kind kind = Kind::GRANT;
-
-    bool sameOptions(const AccessRightsElementWithOptions & other) const
-    {
-        return (grant_option == other.grant_option) && (kind == other.kind);
+        return (grant_option == other.grant_option) && (is_partial_revoke == other.is_partial_revoke);
     }
 
-    auto toTuple() const { return std::tie(access_flags, any_database, database, any_table, table, any_column, columns, grant_option, kind); }
-    friend bool operator==(const AccessRightsElementWithOptions & left, const AccessRightsElementWithOptions & right) { return left.toTuple() == right.toTuple(); }
-    friend bool operator!=(const AccessRightsElementWithOptions & left, const AccessRightsElementWithOptions & right) { return !(left == right); }
-
     /// Resets flags which cannot be granted.
-    void removeNonGrantableFlags();
+    void eraseNonGrantable()
+    {
+        if (!any_column)
+            access_flags &= AccessFlags::allFlagsGrantableOnColumnLevel();
+        else if (!any_table)
+            access_flags &= AccessFlags::allFlagsGrantableOnTableLevel();
+        else if (!any_database)
+            access_flags &= AccessFlags::allFlagsGrantableOnDatabaseLevel();
+        else
+            access_flags &= AccessFlags::allFlagsGrantableOnGlobalLevel();
+    }
+
+    bool isEmptyDatabase() const { return !any_database && database.empty(); }
+
+    /// If the database is empty, replaces it with `current_database`. Otherwise does nothing.
+    void replaceEmptyDatabase(const String & current_database)
+    {
+        if (isEmptyDatabase())
+            database = current_database;
+    }
 
     /// Returns a human-readable representation like "GRANT SELECT, UPDATE(x, y) ON db.table".
     String toString() const;
+    String toStringWithoutOptions() const;
 };
 
 
@@ -130,77 +124,29 @@ class AccessRightsElements : public std::vector<AccessRightsElement>
 public:
     bool empty() const { return std::all_of(begin(), end(), [](const AccessRightsElement & e) { return e.empty(); }); }
 
-    /// Replaces the empty database with `new_database`.
-    void replaceEmptyDatabase(const String & new_database);
+    bool sameDatabaseAndTable() const
+    {
+        return (size() < 2) || std::all_of(std::next(begin()), end(), [this](const AccessRightsElement & e) { return e.sameDatabaseAndTable(front()); });
+    }
+
+    bool sameOptions() const
+    {
+        return (size() < 2) || std::all_of(std::next(begin()), end(), [this](const AccessRightsElement & e) { return e.sameOptions(front()); });
+    }
 
     /// Resets flags which cannot be granted.
-    void removeNonGrantableFlags();
+    void eraseNonGrantable();
+
+    /// If the database is empty, replaces it with `current_database`. Otherwise does nothing.
+    void replaceEmptyDatabase(const String & current_database)
+    {
+        for (auto & element : *this)
+            element.replaceEmptyDatabase(current_database);
+    }
 
     /// Returns a human-readable representation like "GRANT SELECT, UPDATE(x, y) ON db.table".
     String toString() const;
+    String toStringWithoutOptions() const;
 };
 
-
-class AccessRightsElementsWithOptions : public std::vector<AccessRightsElementWithOptions>
-{
-public:
-    /// Replaces the empty database with `new_database`.
-    void replaceEmptyDatabase(const String & new_database);
-
-    /// Resets flags which cannot be granted.
-    void removeNonGrantableFlags();
-
-    /// Returns a human-readable representation like "GRANT SELECT, UPDATE(x, y) ON db.table".
-    String toString() const;
-};
-
-
-inline void AccessRightsElement::replaceEmptyDatabase(const String & new_database)
-{
-    if (isEmptyDatabase())
-        database = new_database;
-}
-
-inline void AccessRightsElements::replaceEmptyDatabase(const String & new_database)
-{
-    for (auto & element : *this)
-        element.replaceEmptyDatabase(new_database);
-}
-
-inline void AccessRightsElementsWithOptions::replaceEmptyDatabase(const String & new_database)
-{
-    for (auto & element : *this)
-        element.replaceEmptyDatabase(new_database);
-}
-
-inline void AccessRightsElement::removeNonGrantableFlags()
-{
-    if (!any_column)
-        access_flags &= AccessFlags::allFlagsGrantableOnColumnLevel();
-    else if (!any_table)
-        access_flags &= AccessFlags::allFlagsGrantableOnTableLevel();
-    else if (!any_database)
-        access_flags &= AccessFlags::allFlagsGrantableOnDatabaseLevel();
-    else
-        access_flags &= AccessFlags::allFlagsGrantableOnGlobalLevel();
-}
-
-inline void AccessRightsElementWithOptions::removeNonGrantableFlags()
-{
-    if (kind == Kind::GRANT)
-        AccessRightsElement::removeNonGrantableFlags();
-}
-
-inline void AccessRightsElements::removeNonGrantableFlags()
-{
-    for (auto & element : *this)
-        element.removeNonGrantableFlags();
-}
-
-inline void AccessRightsElementsWithOptions::removeNonGrantableFlags()
-{
-    for (auto & element : *this)
-        element.removeNonGrantableFlags();
-}
-
 }
diff --git a/src/Access/AccessType.h b/src/Access/AccessType.h
index 5a84aa66739..d5185b9931d 100644
--- a/src/Access/AccessType.h
+++ b/src/Access/AccessType.h
@@ -62,8 +62,8 @@ enum class AccessType
                                                                        enabled implicitly by the grant ALTER_TABLE */\
     M(ALTER_SETTINGS, "ALTER SETTING, ALTER MODIFY SETTING, MODIFY SETTING", TABLE, ALTER_TABLE) /* allows to execute ALTER MODIFY SETTING */\
     M(ALTER_MOVE_PARTITION, "ALTER MOVE PART, MOVE PARTITION, MOVE PART", TABLE, ALTER_TABLE) \
-    M(ALTER_FETCH_PARTITION, "FETCH PARTITION", TABLE, ALTER_TABLE) \
-    M(ALTER_FREEZE_PARTITION, "FREEZE PARTITION", TABLE, ALTER_TABLE) \
+    M(ALTER_FETCH_PARTITION, "ALTER FETCH PART, FETCH PARTITION", TABLE, ALTER_TABLE) \
+    M(ALTER_FREEZE_PARTITION, "FREEZE PARTITION, UNFREEZE", TABLE, ALTER_TABLE) \
     \
     M(ALTER_TABLE, "", GROUP, ALTER) \
     \
@@ -124,11 +124,13 @@ enum class AccessType
     M(SYSTEM_DROP_DNS_CACHE, "SYSTEM DROP DNS, DROP DNS CACHE, DROP DNS", GLOBAL, SYSTEM_DROP_CACHE) \
     M(SYSTEM_DROP_MARK_CACHE, "SYSTEM DROP MARK, DROP MARK CACHE, DROP MARKS", GLOBAL, SYSTEM_DROP_CACHE) \
     M(SYSTEM_DROP_UNCOMPRESSED_CACHE, "SYSTEM DROP UNCOMPRESSED, DROP UNCOMPRESSED CACHE, DROP UNCOMPRESSED", GLOBAL, SYSTEM_DROP_CACHE) \
+    M(SYSTEM_DROP_MMAP_CACHE, "SYSTEM DROP MMAP, DROP MMAP CACHE, DROP MMAP", GLOBAL, SYSTEM_DROP_CACHE) \
     M(SYSTEM_DROP_COMPILED_EXPRESSION_CACHE, "SYSTEM DROP COMPILED EXPRESSION, DROP COMPILED EXPRESSION CACHE, DROP COMPILED EXPRESSIONS", GLOBAL, SYSTEM_DROP_CACHE) \
     M(SYSTEM_DROP_CACHE, "DROP CACHE", GROUP, SYSTEM) \
     M(SYSTEM_RELOAD_CONFIG, "RELOAD CONFIG", GLOBAL, SYSTEM_RELOAD) \
     M(SYSTEM_RELOAD_SYMBOLS, "RELOAD SYMBOLS", GLOBAL, SYSTEM_RELOAD) \
     M(SYSTEM_RELOAD_DICTIONARY, "SYSTEM RELOAD DICTIONARIES, RELOAD DICTIONARY, RELOAD DICTIONARIES", GLOBAL, SYSTEM_RELOAD) \
+    M(SYSTEM_RELOAD_MODEL, "SYSTEM RELOAD MODELS, RELOAD MODEL, RELOAD MODELS", GLOBAL, SYSTEM_RELOAD) \
     M(SYSTEM_RELOAD_EMBEDDED_DICTIONARIES, "RELOAD EMBEDDED DICTIONARIES", GLOBAL, SYSTEM_RELOAD) /* implicitly enabled by the grant SYSTEM_RELOAD_DICTIONARY ON *.* */\
     M(SYSTEM_RELOAD, "", GROUP, SYSTEM) \
     M(SYSTEM_MERGES, "SYSTEM STOP MERGES, SYSTEM START MERGES, STOP_MERGES, START MERGES", TABLE, SYSTEM) \
diff --git a/src/Access/AllowedClientHosts.h b/src/Access/AllowedClientHosts.h
index 615782d75a2..a6895b120e0 100644
--- a/src/Access/AllowedClientHosts.h
+++ b/src/Access/AllowedClientHosts.h
@@ -14,7 +14,7 @@ namespace DB
 
 using Strings = std::vector<String>;
 
-/// Represents lists of hosts an user is allowed to connect to server from.
+/// Represents lists of hosts a user is allowed to connect to server from.
 class AllowedClientHosts
 {
 public:
diff --git a/src/Access/Authentication.cpp b/src/Access/Authentication.cpp
index 19c40c068b4..54d94d905ae 100644
--- a/src/Access/Authentication.cpp
+++ b/src/Access/Authentication.cpp
@@ -1,5 +1,8 @@
 #include <Access/Authentication.h>
+#include <Access/Credentials.h>
 #include <Access/ExternalAuthenticators.h>
+#include <Access/LDAPClient.h>
+#include <Access/GSSAcceptor.h>
 #include <Common/Exception.h>
 #include <Poco/SHA1Engine.h>
 
@@ -8,8 +11,8 @@ namespace DB
 {
 namespace ErrorCodes
 {
-    extern const int BAD_ARGUMENTS;
     extern const int NOT_IMPLEMENTED;
+    extern const int LOGICAL_ERROR;
 }
 
 
@@ -32,14 +35,13 @@ Authentication::Digest Authentication::getPasswordDoubleSHA1() const
             return engine.digest();
         }
 
-        case SHA256_PASSWORD:
-            throw Exception("Cannot get password double SHA1 for user with 'SHA256_PASSWORD' authentication", ErrorCodes::BAD_ARGUMENTS);
-
         case DOUBLE_SHA1_PASSWORD:
             return password_hash;
 
-        case LDAP_SERVER:
-            throw Exception("Cannot get password double SHA1 for user with 'LDAP_SERVER' authentication", ErrorCodes::BAD_ARGUMENTS);
+        case SHA256_PASSWORD:
+        case LDAP:
+        case KERBEROS:
+            throw Exception("Cannot get password double SHA1 hash for authentication type " + toString(type), ErrorCodes::LOGICAL_ERROR);
 
         case MAX_TYPE:
             break;
@@ -48,44 +50,76 @@ Authentication::Digest Authentication::getPasswordDoubleSHA1() const
 }
 
 
-bool Authentication::isCorrectPassword(const String & user_, const String & password_, const ExternalAuthenticators & external_authenticators) const
+bool Authentication::areCredentialsValid(const Credentials & credentials, const ExternalAuthenticators & external_authenticators) const
 {
-    switch (type)
+    if (!credentials.isReady())
+        return false;
+
+    if (const auto * gss_acceptor_context = dynamic_cast<const GSSAcceptorContext *>(&credentials))
     {
-        case NO_PASSWORD:
-            return true;
-
-        case PLAINTEXT_PASSWORD:
+        switch (type)
         {
-            if (password_ == std::string_view{reinterpret_cast<const char *>(password_hash.data()), password_hash.size()})
-                return true;
+            case NO_PASSWORD:
+            case PLAINTEXT_PASSWORD:
+            case SHA256_PASSWORD:
+            case DOUBLE_SHA1_PASSWORD:
+            case LDAP:
+                throw Require<BasicCredentials>("ClickHouse Basic Authentication");
 
-            // For compatibility with MySQL clients which support only native authentication plugin, SHA1 can be passed instead of password.
-            auto password_sha1 = encodeSHA1(password_hash);
-            return password_ == std::string_view{reinterpret_cast<const char *>(password_sha1.data()), password_sha1.size()};
+            case KERBEROS:
+                return external_authenticators.checkKerberosCredentials(kerberos_realm, *gss_acceptor_context);
+
+            case MAX_TYPE:
+                break;
         }
-
-        case SHA256_PASSWORD:
-            return encodeSHA256(password_) == password_hash;
-
-        case DOUBLE_SHA1_PASSWORD:
-        {
-            auto first_sha1 = encodeSHA1(password_);
-
-            /// If it was MySQL compatibility server, then first_sha1 already contains double SHA1.
-            if (first_sha1 == password_hash)
-                return true;
-
-            return encodeSHA1(first_sha1) == password_hash;
-        }
-
-        case LDAP_SERVER:
-            return external_authenticators.checkLDAPCredentials(server_name, user_, password_);
-
-        case MAX_TYPE:
-            break;
     }
-    throw Exception("Cannot check if the password is correct for authentication type " + toString(type), ErrorCodes::NOT_IMPLEMENTED);
+
+    if (const auto * basic_credentials = dynamic_cast<const BasicCredentials *>(&credentials))
+    {
+        switch (type)
+        {
+            case NO_PASSWORD:
+                return true; // N.B. even if the password is not empty!
+
+            case PLAINTEXT_PASSWORD:
+            {
+                if (basic_credentials->getPassword() == std::string_view{reinterpret_cast<const char *>(password_hash.data()), password_hash.size()})
+                    return true;
+
+                // For compatibility with MySQL clients which support only native authentication plugin, SHA1 can be passed instead of password.
+                const auto password_sha1 = encodeSHA1(password_hash);
+                return basic_credentials->getPassword() == std::string_view{reinterpret_cast<const char *>(password_sha1.data()), password_sha1.size()};
+            }
+
+            case SHA256_PASSWORD:
+                return encodeSHA256(basic_credentials->getPassword()) == password_hash;
+
+            case DOUBLE_SHA1_PASSWORD:
+            {
+                const auto first_sha1 = encodeSHA1(basic_credentials->getPassword());
+
+                /// If it was MySQL compatibility server, then first_sha1 already contains double SHA1.
+                if (first_sha1 == password_hash)
+                    return true;
+
+                return encodeSHA1(first_sha1) == password_hash;
+            }
+
+            case LDAP:
+                return external_authenticators.checkLDAPCredentials(ldap_server_name, *basic_credentials);
+
+            case KERBEROS:
+                throw Require<GSSAcceptorContext>(kerberos_realm);
+
+            case MAX_TYPE:
+                break;
+        }
+    }
+
+    if ([[maybe_unused]] const auto * always_allow_credentials = dynamic_cast<const AlwaysAllowCredentials *>(&credentials))
+        return true;
+
+    throw Exception("areCredentialsValid(): authentication type " + toString(type) + " not supported", ErrorCodes::NOT_IMPLEMENTED);
 }
 
 }
diff --git a/src/Access/Authentication.h b/src/Access/Authentication.h
index bd22b7f0ff5..54542cb504a 100644
--- a/src/Access/Authentication.h
+++ b/src/Access/Authentication.h
@@ -6,8 +6,6 @@
 #include <Poco/SHA1Engine.h>
 #include <boost/algorithm/hex.hpp>
 #include <boost/algorithm/string/case_conv.hpp>
-#include <set>
-#include <vector>
 
 
 namespace DB
@@ -20,13 +18,10 @@ namespace ErrorCodes
     extern const int NOT_IMPLEMENTED;
 }
 
+class Credentials;
 class ExternalAuthenticators;
-struct LDAPSearchParams;
-using LDAPSearchParamsList = std::vector<LDAPSearchParams>;
-using LDAPSearchResults = std::set<String>;
-using LDAPSearchResultsList = std::vector<LDAPSearchResults>;
 
-/// Authentication type and encrypted password for checking when an user logins.
+/// Authentication type and encrypted password for checking when a user logins.
 class Authentication
 {
 public:
@@ -46,7 +41,10 @@ public:
         DOUBLE_SHA1_PASSWORD,
 
         /// Password is checked by a [remote] LDAP server. Connection will be made at each authentication attempt.
-        LDAP_SERVER,
+        LDAP,
+
+        /// Kerberos authentication performed through GSS-API negotiation loop.
+        KERBEROS,
 
         MAX_TYPE,
     };
@@ -58,6 +56,18 @@ public:
         static const TypeInfo & get(Type type_);
     };
 
+    // A signaling class used to communicate requirements for credentials.
+    template <typename CredentialsType>
+    class Require : public Exception
+    {
+    public:
+        explicit Require(const String & realm_);
+        const String & getRealm() const;
+
+    private:
+        const String realm;
+    };
+
     using Digest = std::vector<uint8_t>;
 
     Authentication(Authentication::Type type_ = NO_PASSWORD) : type(type_) {}
@@ -88,14 +98,16 @@ public:
     /// Allowed to use for Type::NO_PASSWORD, Type::PLAINTEXT_PASSWORD, Type::DOUBLE_SHA1_PASSWORD.
     Digest getPasswordDoubleSHA1() const;
 
-    /// Sets an external authentication server name.
-    /// When authentication type is LDAP_SERVER, server name is expected to be the name of a preconfigured LDAP server.
-    const String & getServerName() const;
-    void setServerName(const String & server_name_);
+    /// Sets the server name for authentication type LDAP.
+    const String & getLDAPServerName() const;
+    void setLDAPServerName(const String & name);
 
-    /// Checks if the provided password is correct. Returns false if not.
-    /// User name and external authenticators are used by the specific authentication types only (e.g., LDAP_SERVER).
-    bool isCorrectPassword(const String & user_, const String & password_, const ExternalAuthenticators & external_authenticators) const;
+    /// Sets the realm name for authentication type KERBEROS.
+    const String & getKerberosRealm() const;
+    void setKerberosRealm(const String & realm);
+
+    /// Checks the credentials (passwords, readiness, etc.)
+    bool areCredentialsValid(const Credentials & credentials, const ExternalAuthenticators & external_authenticators) const;
 
     friend bool operator ==(const Authentication & lhs, const Authentication & rhs) { return (lhs.type == rhs.type) && (lhs.password_hash == rhs.password_hash); }
     friend bool operator !=(const Authentication & lhs, const Authentication & rhs) { return !(lhs == rhs); }
@@ -109,7 +121,8 @@ private:
 
     Type type = Type::NO_PASSWORD;
     Digest password_hash;
-    String server_name;
+    String ldap_server_name;
+    String kerberos_realm;
 };
 
 
@@ -144,16 +157,35 @@ inline const Authentication::TypeInfo & Authentication::TypeInfo::get(Type type_
             static const auto info = make_info("DOUBLE_SHA1_PASSWORD");
             return info;
         }
-        case LDAP_SERVER:
+        case LDAP:
         {
-            static const auto info = make_info("LDAP_SERVER");
+            static const auto info = make_info("LDAP");
             return info;
         }
-        case MAX_TYPE: break;
+        case KERBEROS:
+        {
+            static const auto info = make_info("KERBEROS");
+            return info;
+        }
+        case MAX_TYPE:
+            break;
     }
     throw Exception("Unknown authentication type: " + std::to_string(static_cast<int>(type_)), ErrorCodes::LOGICAL_ERROR);
 }
 
+template <typename CredentialsType>
+Authentication::Require<CredentialsType>::Require(const String & realm_)
+    : Exception("Credentials required", ErrorCodes::BAD_ARGUMENTS)
+    , realm(realm_)
+{
+}
+
+template <typename CredentialsType>
+const String & Authentication::Require<CredentialsType>::getRealm() const
+{
+    return realm;
+}
+
 inline String toString(Authentication::Type type_)
 {
     return Authentication::TypeInfo::get(type_).raw_name;
@@ -186,9 +218,6 @@ inline void Authentication::setPassword(const String & password_)
 {
     switch (type)
     {
-        case NO_PASSWORD:
-            throw Exception("Cannot specify password for the 'NO_PASSWORD' authentication type", ErrorCodes::LOGICAL_ERROR);
-
         case PLAINTEXT_PASSWORD:
             return setPasswordHashBinary(encodePlainText(password_));
 
@@ -198,10 +227,13 @@ inline void Authentication::setPassword(const String & password_)
         case DOUBLE_SHA1_PASSWORD:
             return setPasswordHashBinary(encodeDoubleSHA1(password_));
 
-        case LDAP_SERVER:
-            throw Exception("Cannot specify password for the 'LDAP_SERVER' authentication type", ErrorCodes::LOGICAL_ERROR);
+        case NO_PASSWORD:
+        case LDAP:
+        case KERBEROS:
+            throw Exception("Cannot specify password for authentication type " + toString(type), ErrorCodes::LOGICAL_ERROR);
 
-        case MAX_TYPE: break;
+        case MAX_TYPE:
+            break;
     }
     throw Exception("setPassword(): authentication type " + toString(type) + " not supported", ErrorCodes::NOT_IMPLEMENTED);
 }
@@ -225,8 +257,9 @@ inline void Authentication::setPasswordHashHex(const String & hash)
 
 inline String Authentication::getPasswordHashHex() const
 {
-    if (type == LDAP_SERVER)
-        throw Exception("Cannot get password of a user with the 'LDAP_SERVER' authentication type", ErrorCodes::LOGICAL_ERROR);
+    if (type == LDAP || type == KERBEROS)
+        throw Exception("Cannot get password hex hash for authentication type " + toString(type), ErrorCodes::LOGICAL_ERROR);
+
     String hex;
     hex.resize(password_hash.size() * 2);
     boost::algorithm::hex(password_hash.begin(), password_hash.end(), hex.data());
@@ -238,9 +271,6 @@ inline void Authentication::setPasswordHashBinary(const Digest & hash)
 {
     switch (type)
     {
-        case NO_PASSWORD:
-            throw Exception("Cannot specify password for the 'NO_PASSWORD' authentication type", ErrorCodes::LOGICAL_ERROR);
-
         case PLAINTEXT_PASSWORD:
         {
             password_hash = hash;
@@ -269,22 +299,35 @@ inline void Authentication::setPasswordHashBinary(const Digest & hash)
             return;
         }
 
-        case LDAP_SERVER:
-            throw Exception("Cannot specify password for the 'LDAP_SERVER' authentication type", ErrorCodes::LOGICAL_ERROR);
+        case NO_PASSWORD:
+        case LDAP:
+        case KERBEROS:
+            throw Exception("Cannot specify password binary hash for authentication type " + toString(type), ErrorCodes::LOGICAL_ERROR);
 
-        case MAX_TYPE: break;
+        case MAX_TYPE:
+            break;
     }
     throw Exception("setPasswordHashBinary(): authentication type " + toString(type) + " not supported", ErrorCodes::NOT_IMPLEMENTED);
 }
 
-inline const String & Authentication::getServerName() const
+inline const String & Authentication::getLDAPServerName() const
 {
-    return server_name;
+    return ldap_server_name;
 }
 
-inline void Authentication::setServerName(const String & server_name_)
+inline void Authentication::setLDAPServerName(const String & name)
 {
-    server_name = server_name_;
+    ldap_server_name = name;
+}
+
+inline const String & Authentication::getKerberosRealm() const
+{
+    return kerberos_realm;
+}
+
+inline void Authentication::setKerberosRealm(const String & realm)
+{
+    kerberos_realm = realm;
 }
 
 }
diff --git a/src/Access/ContextAccess.cpp b/src/Access/ContextAccess.cpp
index 494da4eaeae..0bcaef1e441 100644
--- a/src/Access/ContextAccess.cpp
+++ b/src/Access/ContextAccess.cpp
@@ -177,28 +177,18 @@ void ContextAccess::setUser(const UserPtr & user_) const
     user_name = user->getName();
     trace_log = &Poco::Logger::get("ContextAccess (" + user_name + ")");
 
-    boost::container::flat_set<UUID> current_roles, current_roles_with_admin_option;
+    std::vector<UUID> current_roles, current_roles_with_admin_option;
     if (params.use_default_roles)
     {
-        for (const UUID & id : user->granted_roles.roles)
-        {
-            if (user->default_roles.match(id))
-                current_roles.emplace(id);
-        }
+        current_roles = user->granted_roles.findGranted(user->default_roles);
+        current_roles_with_admin_option = user->granted_roles.findGrantedWithAdminOption(user->default_roles);
     }
     else
     {
-        boost::range::set_intersection(
-            params.current_roles,
-            user->granted_roles.roles,
-            std::inserter(current_roles, current_roles.end()));
+        current_roles = user->granted_roles.findGranted(params.current_roles);
+        current_roles_with_admin_option = user->granted_roles.findGrantedWithAdminOption(params.current_roles);
     }
 
-    boost::range::set_intersection(
-        current_roles,
-        user->granted_roles.roles_with_admin_option,
-        std::inserter(current_roles_with_admin_option, current_roles_with_admin_option.end()));
-
     subscription_for_roles_changes = {};
     enabled_roles = manager->getEnabledRoles(current_roles, current_roles_with_admin_option);
     subscription_for_roles_changes = enabled_roles->subscribeForChanges([this](const std::shared_ptr<const EnabledRolesInfo> & roles_info_)
@@ -331,47 +321,13 @@ std::shared_ptr<const AccessRights> ContextAccess::getAccessRightsWithImplicit()
 }
 
 
-template <bool throw_if_denied, bool grant_option>
-bool ContextAccess::checkAccessImpl(const AccessFlags & flags) const
-{
-    return checkAccessImpl2<throw_if_denied, grant_option>(flags);
-}
-
 template <bool throw_if_denied, bool grant_option, typename... Args>
-bool ContextAccess::checkAccessImpl(const AccessFlags & flags, const std::string_view & database, const Args &... args) const
-{
-    return checkAccessImpl2<throw_if_denied, grant_option>(flags, database.empty() ? params.current_database : database, args...);
-}
-
-template <bool throw_if_denied, bool grant_option>
-bool ContextAccess::checkAccessImpl(const AccessRightsElement & element) const
-{
-    if (element.any_database)
-        return checkAccessImpl<throw_if_denied, grant_option>(element.access_flags);
-    else if (element.any_table)
-        return checkAccessImpl<throw_if_denied, grant_option>(element.access_flags, element.database);
-    else if (element.any_column)
-        return checkAccessImpl<throw_if_denied, grant_option>(element.access_flags, element.database, element.table);
-    else
-        return checkAccessImpl<throw_if_denied, grant_option>(element.access_flags, element.database, element.table, element.columns);
-}
-
-template <bool throw_if_denied, bool grant_option>
-bool ContextAccess::checkAccessImpl(const AccessRightsElements & elements) const
-{
-    for (const auto & element : elements)
-        if (!checkAccessImpl<throw_if_denied, grant_option>(element))
-            return false;
-    return true;
-}
-
-template <bool throw_if_denied, bool grant_option, typename... Args>
-bool ContextAccess::checkAccessImpl2(const AccessFlags & flags, const Args &... args) const
+bool ContextAccess::checkAccessImplHelper(const AccessFlags & flags, const Args &... args) const
 {
     auto access_granted = [&]
     {
         if (trace_log)
-            LOG_TRACE(trace_log, "Access granted: {}{}", (AccessRightsElement{flags, args...}.toString()),
+            LOG_TRACE(trace_log, "Access granted: {}{}", (AccessRightsElement{flags, args...}.toStringWithoutOptions()),
                       (grant_option ? " WITH GRANT OPTION" : ""));
         return true;
     };
@@ -379,7 +335,7 @@ bool ContextAccess::checkAccessImpl2(const AccessFlags & flags, const Args &...
     auto access_denied = [&](const String & error_msg, int error_code [[maybe_unused]])
     {
         if (trace_log)
-            LOG_TRACE(trace_log, "Access denied: {}{}", (AccessRightsElement{flags, args...}.toString()),
+            LOG_TRACE(trace_log, "Access denied: {}{}", (AccessRightsElement{flags, args...}.toStringWithoutOptions()),
                       (grant_option ? " WITH GRANT OPTION" : ""));
         if constexpr (throw_if_denied)
             throw Exception(getUserName() + ": " + error_msg, error_code);
@@ -415,13 +371,13 @@ bool ContextAccess::checkAccessImpl2(const AccessFlags & flags, const Args &...
                 "Not enough privileges. "
                 "The required privileges have been granted, but without grant option. "
                 "To execute this query it's necessary to have grant "
-                    + AccessRightsElement{flags, args...}.toString() + " WITH GRANT OPTION",
+                    + AccessRightsElement{flags, args...}.toStringWithoutOptions() + " WITH GRANT OPTION",
                 ErrorCodes::ACCESS_DENIED);
         }
 
         return access_denied(
             "Not enough privileges. To execute this query it's necessary to have grant "
-                + AccessRightsElement{flags, args...}.toString() + (grant_option ? " WITH GRANT OPTION" : ""),
+                + AccessRightsElement{flags, args...}.toStringWithoutOptions() + (grant_option ? " WITH GRANT OPTION" : ""),
             ErrorCodes::ACCESS_DENIED);
     }
 
@@ -478,6 +434,56 @@ bool ContextAccess::checkAccessImpl2(const AccessFlags & flags, const Args &...
     return access_granted();
 }
 
+template <bool throw_if_denied, bool grant_option>
+bool ContextAccess::checkAccessImpl(const AccessFlags & flags) const
+{
+    return checkAccessImplHelper<throw_if_denied, grant_option>(flags);
+}
+
+template <bool throw_if_denied, bool grant_option, typename... Args>
+bool ContextAccess::checkAccessImpl(const AccessFlags & flags, const std::string_view & database, const Args &... args) const
+{
+    return checkAccessImplHelper<throw_if_denied, grant_option>(flags, database.empty() ? params.current_database : database, args...);
+}
+
+template <bool throw_if_denied, bool grant_option>
+bool ContextAccess::checkAccessImplHelper(const AccessRightsElement & element) const
+{
+    assert(!element.grant_option || grant_option);
+    if (element.any_database)
+        return checkAccessImpl<throw_if_denied, grant_option>(element.access_flags);
+    else if (element.any_table)
+        return checkAccessImpl<throw_if_denied, grant_option>(element.access_flags, element.database);
+    else if (element.any_column)
+        return checkAccessImpl<throw_if_denied, grant_option>(element.access_flags, element.database, element.table);
+    else
+        return checkAccessImpl<throw_if_denied, grant_option>(element.access_flags, element.database, element.table, element.columns);
+}
+
+template <bool throw_if_denied, bool grant_option>
+bool ContextAccess::checkAccessImpl(const AccessRightsElement & element) const
+{
+    if constexpr (grant_option)
+    {
+        return checkAccessImplHelper<throw_if_denied, true>(element);
+    }
+    else
+    {
+        if (element.grant_option)
+            return checkAccessImplHelper<throw_if_denied, true>(element);
+        else
+            return checkAccessImplHelper<throw_if_denied, false>(element);
+    }
+}
+
+template <bool throw_if_denied, bool grant_option>
+bool ContextAccess::checkAccessImpl(const AccessRightsElements & elements) const
+{
+    for (const auto & element : elements)
+        if (!checkAccessImpl<throw_if_denied, grant_option>(element))
+            return false;
+    return true;
+}
 
 bool ContextAccess::isGranted(const AccessFlags & flags) const { return checkAccessImpl<false, false>(flags); }
 bool ContextAccess::isGranted(const AccessFlags & flags, const std::string_view & database) const { return checkAccessImpl<false, false>(flags, database); }
@@ -516,44 +522,8 @@ void ContextAccess::checkGrantOption(const AccessRightsElement & element) const
 void ContextAccess::checkGrantOption(const AccessRightsElements & elements) const { checkAccessImpl<true, true>(elements); }
 
 
-template <bool throw_if_denied>
-bool ContextAccess::checkAdminOptionImpl(const UUID & role_id) const
-{
-    return checkAdminOptionImpl2<throw_if_denied>(to_array(role_id), [this](const UUID & id, size_t) { return manager->tryReadName(id); });
-}
-
-template <bool throw_if_denied>
-bool ContextAccess::checkAdminOptionImpl(const UUID & role_id, const String & role_name) const
-{
-    return checkAdminOptionImpl2<throw_if_denied>(to_array(role_id), [&role_name](const UUID &, size_t) { return std::optional<String>{role_name}; });
-}
-
-template <bool throw_if_denied>
-bool ContextAccess::checkAdminOptionImpl(const UUID & role_id, const std::unordered_map<UUID, String> & names_of_roles) const
-{
-    return checkAdminOptionImpl2<throw_if_denied>(to_array(role_id), [&names_of_roles](const UUID & id, size_t) { auto it = names_of_roles.find(id); return (it != names_of_roles.end()) ? it->second : std::optional<String>{}; });
-}
-
-template <bool throw_if_denied>
-bool ContextAccess::checkAdminOptionImpl(const std::vector<UUID> & role_ids) const
-{
-    return checkAdminOptionImpl2<throw_if_denied>(role_ids, [this](const UUID & id, size_t) { return manager->tryReadName(id); });
-}
-
-template <bool throw_if_denied>
-bool ContextAccess::checkAdminOptionImpl(const std::vector<UUID> & role_ids, const Strings & names_of_roles) const
-{
-    return checkAdminOptionImpl2<throw_if_denied>(role_ids, [&names_of_roles](const UUID &, size_t i) { return std::optional<String>{names_of_roles[i]}; });
-}
-
-template <bool throw_if_denied>
-bool ContextAccess::checkAdminOptionImpl(const std::vector<UUID> & role_ids, const std::unordered_map<UUID, String> & names_of_roles) const
-{
-    return checkAdminOptionImpl2<throw_if_denied>(role_ids, [&names_of_roles](const UUID & id, size_t) { auto it = names_of_roles.find(id); return (it != names_of_roles.end()) ? it->second : std::optional<String>{}; });
-}
-
 template <bool throw_if_denied, typename Container, typename GetNameFunction>
-bool ContextAccess::checkAdminOptionImpl2(const Container & role_ids, const GetNameFunction & get_name_function) const
+bool ContextAccess::checkAdminOptionImplHelper(const Container & role_ids, const GetNameFunction & get_name_function) const
 {
     if (!std::size(role_ids) || is_full_access)
         return true;
@@ -605,6 +575,42 @@ bool ContextAccess::checkAdminOptionImpl2(const Container & role_ids, const GetN
     return true;
 }
 
+template <bool throw_if_denied>
+bool ContextAccess::checkAdminOptionImpl(const UUID & role_id) const
+{
+    return checkAdminOptionImplHelper<throw_if_denied>(to_array(role_id), [this](const UUID & id, size_t) { return manager->tryReadName(id); });
+}
+
+template <bool throw_if_denied>
+bool ContextAccess::checkAdminOptionImpl(const UUID & role_id, const String & role_name) const
+{
+    return checkAdminOptionImplHelper<throw_if_denied>(to_array(role_id), [&role_name](const UUID &, size_t) { return std::optional<String>{role_name}; });
+}
+
+template <bool throw_if_denied>
+bool ContextAccess::checkAdminOptionImpl(const UUID & role_id, const std::unordered_map<UUID, String> & names_of_roles) const
+{
+    return checkAdminOptionImplHelper<throw_if_denied>(to_array(role_id), [&names_of_roles](const UUID & id, size_t) { auto it = names_of_roles.find(id); return (it != names_of_roles.end()) ? it->second : std::optional<String>{}; });
+}
+
+template <bool throw_if_denied>
+bool ContextAccess::checkAdminOptionImpl(const std::vector<UUID> & role_ids) const
+{
+    return checkAdminOptionImplHelper<throw_if_denied>(role_ids, [this](const UUID & id, size_t) { return manager->tryReadName(id); });
+}
+
+template <bool throw_if_denied>
+bool ContextAccess::checkAdminOptionImpl(const std::vector<UUID> & role_ids, const Strings & names_of_roles) const
+{
+    return checkAdminOptionImplHelper<throw_if_denied>(role_ids, [&names_of_roles](const UUID &, size_t i) { return std::optional<String>{names_of_roles[i]}; });
+}
+
+template <bool throw_if_denied>
+bool ContextAccess::checkAdminOptionImpl(const std::vector<UUID> & role_ids, const std::unordered_map<UUID, String> & names_of_roles) const
+{
+    return checkAdminOptionImplHelper<throw_if_denied>(role_ids, [&names_of_roles](const UUID & id, size_t) { auto it = names_of_roles.find(id); return (it != names_of_roles.end()) ? it->second : std::optional<String>{}; });
+}
+
 bool ContextAccess::hasAdminOption(const UUID & role_id) const { return checkAdminOptionImpl<false>(role_id); }
 bool ContextAccess::hasAdminOption(const UUID & role_id, const String & role_name) const { return checkAdminOptionImpl<false>(role_id, role_name); }
 bool ContextAccess::hasAdminOption(const UUID & role_id, const std::unordered_map<UUID, String> & names_of_roles) const { return checkAdminOptionImpl<false>(role_id, names_of_roles); }
diff --git a/src/Access/ContextAccess.h b/src/Access/ContextAccess.h
index 43e9f60a4c6..320c2566769 100644
--- a/src/Access/ContextAccess.h
+++ b/src/Access/ContextAccess.h
@@ -99,25 +99,6 @@ public:
     std::shared_ptr<const AccessRights> getAccessRights() const;
     std::shared_ptr<const AccessRights> getAccessRightsWithImplicit() const;
 
-    /// Checks if a specified access is granted.
-    bool isGranted(const AccessFlags & flags) const;
-    bool isGranted(const AccessFlags & flags, const std::string_view & database) const;
-    bool isGranted(const AccessFlags & flags, const std::string_view & database, const std::string_view & table) const;
-    bool isGranted(const AccessFlags & flags, const std::string_view & database, const std::string_view & table, const std::string_view & column) const;
-    bool isGranted(const AccessFlags & flags, const std::string_view & database, const std::string_view & table, const std::vector<std::string_view> & columns) const;
-    bool isGranted(const AccessFlags & flags, const std::string_view & database, const std::string_view & table, const Strings & columns) const;
-    bool isGranted(const AccessRightsElement & element) const;
-    bool isGranted(const AccessRightsElements & elements) const;
-
-    bool hasGrantOption(const AccessFlags & flags) const;
-    bool hasGrantOption(const AccessFlags & flags, const std::string_view & database) const;
-    bool hasGrantOption(const AccessFlags & flags, const std::string_view & database, const std::string_view & table) const;
-    bool hasGrantOption(const AccessFlags & flags, const std::string_view & database, const std::string_view & table, const std::string_view & column) const;
-    bool hasGrantOption(const AccessFlags & flags, const std::string_view & database, const std::string_view & table, const std::vector<std::string_view> & columns) const;
-    bool hasGrantOption(const AccessFlags & flags, const std::string_view & database, const std::string_view & table, const Strings & columns) const;
-    bool hasGrantOption(const AccessRightsElement & element) const;
-    bool hasGrantOption(const AccessRightsElements & elements) const;
-
     /// Checks if a specified access is granted, and throws an exception if not.
     /// Empty database means the current database.
     void checkAccess(const AccessFlags & flags) const;
@@ -138,6 +119,26 @@ public:
     void checkGrantOption(const AccessRightsElement & element) const;
     void checkGrantOption(const AccessRightsElements & elements) const;
 
+    /// Checks if a specified access is granted, and returns false if not.
+    /// Empty database means the current database.
+    bool isGranted(const AccessFlags & flags) const;
+    bool isGranted(const AccessFlags & flags, const std::string_view & database) const;
+    bool isGranted(const AccessFlags & flags, const std::string_view & database, const std::string_view & table) const;
+    bool isGranted(const AccessFlags & flags, const std::string_view & database, const std::string_view & table, const std::string_view & column) const;
+    bool isGranted(const AccessFlags & flags, const std::string_view & database, const std::string_view & table, const std::vector<std::string_view> & columns) const;
+    bool isGranted(const AccessFlags & flags, const std::string_view & database, const std::string_view & table, const Strings & columns) const;
+    bool isGranted(const AccessRightsElement & element) const;
+    bool isGranted(const AccessRightsElements & elements) const;
+
+    bool hasGrantOption(const AccessFlags & flags) const;
+    bool hasGrantOption(const AccessFlags & flags, const std::string_view & database) const;
+    bool hasGrantOption(const AccessFlags & flags, const std::string_view & database, const std::string_view & table) const;
+    bool hasGrantOption(const AccessFlags & flags, const std::string_view & database, const std::string_view & table, const std::string_view & column) const;
+    bool hasGrantOption(const AccessFlags & flags, const std::string_view & database, const std::string_view & table, const std::vector<std::string_view> & columns) const;
+    bool hasGrantOption(const AccessFlags & flags, const std::string_view & database, const std::string_view & table, const Strings & columns) const;
+    bool hasGrantOption(const AccessRightsElement & element) const;
+    bool hasGrantOption(const AccessRightsElements & elements) const;
+
     /// Checks if a specified role is granted with admin option, and throws an exception if not.
     void checkAdminOption(const UUID & role_id) const;
     void checkAdminOption(const UUID & role_id, const String & role_name) const;
@@ -146,6 +147,7 @@ public:
     void checkAdminOption(const std::vector<UUID> & role_ids, const Strings & names_of_roles) const;
     void checkAdminOption(const std::vector<UUID> & role_ids, const std::unordered_map<UUID, String> & names_of_roles) const;
 
+    /// Checks if a specified role is granted with admin option, and returns false if not.
     bool hasAdminOption(const UUID & role_id) const;
     bool hasAdminOption(const UUID & role_id, const String & role_name) const;
     bool hasAdminOption(const UUID & role_id, const std::unordered_map<UUID, String> & names_of_roles) const;
@@ -180,7 +182,10 @@ private:
     bool checkAccessImpl(const AccessRightsElements & elements) const;
 
     template <bool throw_if_denied, bool grant_option, typename... Args>
-    bool checkAccessImpl2(const AccessFlags & flags, const Args &... args) const;
+    bool checkAccessImplHelper(const AccessFlags & flags, const Args &... args) const;
+
+    template <bool throw_if_denied, bool grant_option>
+    bool checkAccessImplHelper(const AccessRightsElement & element) const;
 
     template <bool throw_if_denied>
     bool checkAdminOptionImpl(const UUID & role_id) const;
@@ -201,7 +206,7 @@ private:
     bool checkAdminOptionImpl(const std::vector<UUID> & role_ids, const std::unordered_map<UUID, String> & names_of_roles) const;
 
     template <bool throw_if_denied, typename Container, typename GetNameFunction>
-    bool checkAdminOptionImpl2(const Container & role_ids, const GetNameFunction & get_name_function) const;
+    bool checkAdminOptionImplHelper(const Container & role_ids, const GetNameFunction & get_name_function) const;
 
     const AccessControlManager * manager = nullptr;
     const Params params;
diff --git a/src/Access/Credentials.cpp b/src/Access/Credentials.cpp
new file mode 100644
index 00000000000..c2850ad4d4f
--- /dev/null
+++ b/src/Access/Credentials.cpp
@@ -0,0 +1,86 @@
+#include <Access/Credentials.h>
+#include <Common/Exception.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+Credentials::Credentials(const String & user_name_)
+    : user_name(user_name_)
+{
+}
+
+const String & Credentials::getUserName() const
+{
+    if (!isReady())
+        throwNotReady();
+    return user_name;
+}
+
+bool Credentials::isReady() const
+{
+    return is_ready;
+}
+
+void Credentials::throwNotReady()
+{
+    throw Exception("Credentials are not ready", ErrorCodes::LOGICAL_ERROR);
+}
+
+AlwaysAllowCredentials::AlwaysAllowCredentials()
+{
+    is_ready = true;
+}
+
+AlwaysAllowCredentials::AlwaysAllowCredentials(const String & user_name_)
+    : Credentials(user_name_)
+{
+    is_ready = true;
+}
+
+void AlwaysAllowCredentials::setUserName(const String & user_name_)
+{
+    user_name = user_name_;
+}
+
+BasicCredentials::BasicCredentials()
+{
+    is_ready = true;
+}
+
+BasicCredentials::BasicCredentials(const String & user_name_)
+    : Credentials(user_name_)
+{
+    is_ready = true;
+}
+
+BasicCredentials::BasicCredentials(const String & user_name_, const String & password_)
+    : Credentials(user_name_)
+    , password(password_)
+{
+    is_ready = true;
+}
+
+void BasicCredentials::setUserName(const String & user_name_)
+{
+    user_name = user_name_;
+}
+
+void BasicCredentials::setPassword(const String & password_)
+{
+    password = password_;
+}
+
+const String & BasicCredentials::getPassword() const
+{
+    if (!isReady())
+        throwNotReady();
+    return password;
+}
+
+}
diff --git a/src/Access/Credentials.h b/src/Access/Credentials.h
new file mode 100644
index 00000000000..5e9fd1589e0
--- /dev/null
+++ b/src/Access/Credentials.h
@@ -0,0 +1,55 @@
+#pragma once
+
+#include <common/types.h>
+#include <memory>
+
+
+namespace DB
+{
+
+class Credentials
+{
+public:
+    explicit Credentials() = default;
+    explicit Credentials(const String & user_name_);
+
+    virtual ~Credentials() = default;
+
+    const String & getUserName() const;
+    bool isReady() const;
+
+protected:
+    [[noreturn]] static void throwNotReady();
+
+protected:
+    bool is_ready = false;
+    String user_name;
+};
+
+class AlwaysAllowCredentials
+    : public Credentials
+{
+public:
+    explicit AlwaysAllowCredentials();
+    explicit AlwaysAllowCredentials(const String & user_name_);
+
+    void setUserName(const String & user_name_);
+};
+
+class BasicCredentials
+    : public Credentials
+{
+public:
+    explicit BasicCredentials();
+    explicit BasicCredentials(const String & user_name_);
+    explicit BasicCredentials(const String & user_name_, const String & password_);
+
+    void setUserName(const String & user_name_);
+    void setPassword(const String & password_);
+    const String & getPassword() const;
+
+private:
+    String password;
+};
+
+}
diff --git a/src/Access/ExternalAuthenticators.cpp b/src/Access/ExternalAuthenticators.cpp
index 6f66f4303e1..1cade973724 100644
--- a/src/Access/ExternalAuthenticators.cpp
+++ b/src/Access/ExternalAuthenticators.cpp
@@ -20,14 +20,14 @@ namespace ErrorCodes
 namespace
 {
 
-auto parseLDAPServer(const Poco::Util::AbstractConfiguration & config, const String & ldap_server_name)
+auto parseLDAPServer(const Poco::Util::AbstractConfiguration & config, const String & name)
 {
-    if (ldap_server_name.empty())
+    if (name.empty())
         throw Exception("LDAP server name cannot be empty", ErrorCodes::BAD_ARGUMENTS);
 
-    LDAPServerParams params;
+    LDAPClient::Params params;
 
-    const String ldap_server_config = "ldap_servers." + ldap_server_name;
+    const String ldap_server_config = "ldap_servers." + name;
 
     const bool has_host = config.has(ldap_server_config + ".host");
     const bool has_port = config.has(ldap_server_config + ".port");
@@ -75,11 +75,11 @@ auto parseLDAPServer(const Poco::Util::AbstractConfiguration & config, const Str
         boost::to_lower(enable_tls_lc_str);
 
         if (enable_tls_lc_str == "starttls")
-            params.enable_tls = LDAPServerParams::TLSEnable::YES_STARTTLS;
+            params.enable_tls = LDAPClient::Params::TLSEnable::YES_STARTTLS;
         else if (config.getBool(ldap_server_config + ".enable_tls"))
-            params.enable_tls = LDAPServerParams::TLSEnable::YES;
+            params.enable_tls = LDAPClient::Params::TLSEnable::YES;
         else
-            params.enable_tls = LDAPServerParams::TLSEnable::NO;
+            params.enable_tls = LDAPClient::Params::TLSEnable::NO;
     }
 
     if (has_tls_minimum_protocol_version)
@@ -88,15 +88,15 @@ auto parseLDAPServer(const Poco::Util::AbstractConfiguration & config, const Str
         boost::to_lower(tls_minimum_protocol_version_lc_str);
 
         if (tls_minimum_protocol_version_lc_str == "ssl2")
-            params.tls_minimum_protocol_version = LDAPServerParams::TLSProtocolVersion::SSL2;
+            params.tls_minimum_protocol_version = LDAPClient::Params::TLSProtocolVersion::SSL2;
         else if (tls_minimum_protocol_version_lc_str == "ssl3")
-            params.tls_minimum_protocol_version = LDAPServerParams::TLSProtocolVersion::SSL3;
+            params.tls_minimum_protocol_version = LDAPClient::Params::TLSProtocolVersion::SSL3;
         else if (tls_minimum_protocol_version_lc_str == "tls1.0")
-            params.tls_minimum_protocol_version = LDAPServerParams::TLSProtocolVersion::TLS1_0;
+            params.tls_minimum_protocol_version = LDAPClient::Params::TLSProtocolVersion::TLS1_0;
         else if (tls_minimum_protocol_version_lc_str == "tls1.1")
-            params.tls_minimum_protocol_version = LDAPServerParams::TLSProtocolVersion::TLS1_1;
+            params.tls_minimum_protocol_version = LDAPClient::Params::TLSProtocolVersion::TLS1_1;
         else if (tls_minimum_protocol_version_lc_str == "tls1.2")
-            params.tls_minimum_protocol_version = LDAPServerParams::TLSProtocolVersion::TLS1_2;
+            params.tls_minimum_protocol_version = LDAPClient::Params::TLSProtocolVersion::TLS1_2;
         else
             throw Exception("Bad value for 'tls_minimum_protocol_version' entry, allowed values are: 'ssl2', 'ssl3', 'tls1.0', 'tls1.1', 'tls1.2'", ErrorCodes::BAD_ARGUMENTS);
     }
@@ -107,13 +107,13 @@ auto parseLDAPServer(const Poco::Util::AbstractConfiguration & config, const Str
         boost::to_lower(tls_require_cert_lc_str);
 
         if (tls_require_cert_lc_str == "never")
-            params.tls_require_cert = LDAPServerParams::TLSRequireCert::NEVER;
+            params.tls_require_cert = LDAPClient::Params::TLSRequireCert::NEVER;
         else if (tls_require_cert_lc_str == "allow")
-            params.tls_require_cert = LDAPServerParams::TLSRequireCert::ALLOW;
+            params.tls_require_cert = LDAPClient::Params::TLSRequireCert::ALLOW;
         else if (tls_require_cert_lc_str == "try")
-            params.tls_require_cert = LDAPServerParams::TLSRequireCert::TRY;
+            params.tls_require_cert = LDAPClient::Params::TLSRequireCert::TRY;
         else if (tls_require_cert_lc_str == "demand")
-            params.tls_require_cert = LDAPServerParams::TLSRequireCert::DEMAND;
+            params.tls_require_cert = LDAPClient::Params::TLSRequireCert::DEMAND;
         else
             throw Exception("Bad value for 'tls_require_cert' entry, allowed values are: 'never', 'allow', 'try', 'demand'", ErrorCodes::BAD_ARGUMENTS);
     }
@@ -142,7 +142,44 @@ auto parseLDAPServer(const Poco::Util::AbstractConfiguration & config, const Str
         params.port = port;
     }
     else
-        params.port = (params.enable_tls == LDAPServerParams::TLSEnable::YES ? 636 : 389);
+        params.port = (params.enable_tls == LDAPClient::Params::TLSEnable::YES ? 636 : 389);
+
+    return params;
+}
+
+auto parseKerberosParams(const Poco::Util::AbstractConfiguration & config)
+{
+    GSSAcceptorContext::Params params;
+
+    Poco::Util::AbstractConfiguration::Keys keys;
+    config.keys("kerberos", keys);
+
+    std::size_t reealm_key_count = 0;
+    std::size_t principal_keys_count = 0;
+
+    for (auto key : keys)
+    {
+        const auto bracket_pos = key.find('[');
+        if (bracket_pos != std::string::npos)
+            key.resize(bracket_pos);
+
+        boost::algorithm::to_lower(key);
+
+        reealm_key_count += (key == "realm");
+        principal_keys_count += (key == "principal");
+    }
+
+    if (reealm_key_count > 0 && principal_keys_count > 0)
+        throw Exception("Realm and principal name cannot be specified simultaneously", ErrorCodes::BAD_ARGUMENTS);
+
+    if (reealm_key_count > 1)
+        throw Exception("Multiple realm sections are not allowed", ErrorCodes::BAD_ARGUMENTS);
+
+    if (principal_keys_count > 1)
+        throw Exception("Multiple principal sections are not allowed", ErrorCodes::BAD_ARGUMENTS);
+
+    params.realm = config.getString("kerberos.realm", "");
+    params.principal = config.getString("kerberos.principal", "");
 
     return params;
 }
@@ -152,48 +189,82 @@ auto parseLDAPServer(const Poco::Util::AbstractConfiguration & config, const Str
 void ExternalAuthenticators::reset()
 {
     std::scoped_lock lock(mutex);
-    ldap_server_params.clear();
-    ldap_server_caches.clear();
+    ldap_client_params_blueprint.clear();
+    ldap_caches.clear();
+    kerberos_params.reset();
 }
 
 void ExternalAuthenticators::setConfiguration(const Poco::Util::AbstractConfiguration & config, Poco::Logger * log)
 {
     std::scoped_lock lock(mutex);
-
     reset();
 
+    Poco::Util::AbstractConfiguration::Keys all_keys;
+    config.keys("", all_keys);
+
+    std::size_t ldap_servers_key_count = 0;
+    std::size_t kerberos_keys_count = 0;
+
+    for (auto key : all_keys)
+    {
+        const auto bracket_pos = key.find('[');
+        if (bracket_pos != std::string::npos)
+            key.resize(bracket_pos);
+
+        boost::algorithm::to_lower(key);
+
+        ldap_servers_key_count += (key == "ldap_servers");
+        kerberos_keys_count += (key == "kerberos");
+    }
+
+    if (ldap_servers_key_count > 1)
+        throw Exception("Multiple ldap_servers sections are not allowed", ErrorCodes::BAD_ARGUMENTS);
+
+    if (kerberos_keys_count > 1)
+        throw Exception("Multiple kerberos sections are not allowed", ErrorCodes::BAD_ARGUMENTS);
+
     Poco::Util::AbstractConfiguration::Keys ldap_server_names;
     config.keys("ldap_servers", ldap_server_names);
     for (const auto & ldap_server_name : ldap_server_names)
     {
         try
         {
-            ldap_server_params.insert_or_assign(ldap_server_name, parseLDAPServer(config, ldap_server_name));
+            ldap_client_params_blueprint.insert_or_assign(ldap_server_name, parseLDAPServer(config, ldap_server_name));
         }
         catch (...)
         {
             tryLogCurrentException(log, "Could not parse LDAP server " + backQuote(ldap_server_name));
         }
     }
+
+    try
+    {
+        if (kerberos_keys_count > 0)
+            kerberos_params = parseKerberosParams(config);
+    }
+    catch (...)
+    {
+        tryLogCurrentException(log, "Could not parse Kerberos section");
+    }
 }
 
-bool ExternalAuthenticators::checkLDAPCredentials(const String & server, const String & user_name, const String & password,
-    const LDAPSearchParamsList * search_params, LDAPSearchResultsList * search_results) const
+bool ExternalAuthenticators::checkLDAPCredentials(const String & server, const BasicCredentials & credentials,
+    const LDAPClient::SearchParamsList * search_params, LDAPClient::SearchResultsList * search_results) const
 {
-    std::optional<LDAPServerParams> params;
+    std::optional<LDAPClient::Params> params;
     std::size_t params_hash = 0;
 
     {
         std::scoped_lock lock(mutex);
 
         // Retrieve the server parameters.
-        const auto pit = ldap_server_params.find(server);
-        if (pit == ldap_server_params.end())
+        const auto pit = ldap_client_params_blueprint.find(server);
+        if (pit == ldap_client_params_blueprint.end())
             throw Exception("LDAP server '" + server + "' is not configured", ErrorCodes::BAD_ARGUMENTS);
 
         params = pit->second;
-        params->user = user_name;
-        params->password = password;
+        params->user = credentials.getUserName();
+        params->password = credentials.getPassword();
 
         params->combineCoreHash(params_hash);
         if (search_params)
@@ -207,12 +278,12 @@ bool ExternalAuthenticators::checkLDAPCredentials(const String & server, const S
         // Check the cache, but only if the caching is enabled at all.
         if (params->verification_cooldown > std::chrono::seconds{0})
         {
-            const auto cit = ldap_server_caches.find(server);
-            if (cit != ldap_server_caches.end())
+            const auto cit = ldap_caches.find(server);
+            if (cit != ldap_caches.end())
             {
                 auto & cache = cit->second;
 
-                const auto eit = cache.find(user_name);
+                const auto eit = cache.find(credentials.getUserName());
                 if (eit != cache.end())
                 {
                     const auto & entry = eit->second;
@@ -249,7 +320,7 @@ bool ExternalAuthenticators::checkLDAPCredentials(const String & server, const S
 
                 // Erase the cache, if empty.
                 if (cache.empty())
-                    ldap_server_caches.erase(cit);
+                    ldap_caches.erase(cit);
             }
         }
     }
@@ -264,13 +335,13 @@ bool ExternalAuthenticators::checkLDAPCredentials(const String & server, const S
         std::scoped_lock lock(mutex);
 
         // If the server was removed from the config while we were checking the password, we discard the current result.
-        const auto pit = ldap_server_params.find(server);
-        if (pit == ldap_server_params.end())
+        const auto pit = ldap_client_params_blueprint.find(server);
+        if (pit == ldap_client_params_blueprint.end())
             return false;
 
         auto new_params = pit->second;
-        new_params.user = user_name;
-        new_params.password = password;
+        new_params.user = credentials.getUserName();
+        new_params.password = credentials.getPassword();
 
         std::size_t new_params_hash = 0;
         new_params.combineCoreHash(new_params_hash);
@@ -286,7 +357,7 @@ bool ExternalAuthenticators::checkLDAPCredentials(const String & server, const S
         if (params_hash != new_params_hash)
             return false;
 
-        auto & entry = ldap_server_caches[server][user_name];
+        auto & entry = ldap_caches[server][credentials.getUserName()];
         if (entry.last_successful_authentication_timestamp < current_check_timestamp)
         {
             entry.last_successful_params_hash = params_hash;
@@ -314,4 +385,33 @@ bool ExternalAuthenticators::checkLDAPCredentials(const String & server, const S
     return result;
 }
 
+bool ExternalAuthenticators::checkKerberosCredentials(const String & realm, const GSSAcceptorContext & credentials) const
+{
+    std::scoped_lock lock(mutex);
+
+    if (!kerberos_params.has_value())
+        throw Exception("Kerberos is not enabled", ErrorCodes::BAD_ARGUMENTS);
+
+    if (!credentials.isReady())
+        return false;
+
+    if (credentials.isFailed())
+        return false;
+
+    if (!realm.empty() && realm != credentials.getRealm())
+        return false;
+
+    return true;
+}
+
+GSSAcceptorContext::Params ExternalAuthenticators::getKerberosParams() const
+{
+    std::scoped_lock lock(mutex);
+
+    if (!kerberos_params.has_value())
+        throw Exception("Kerberos is not enabled", ErrorCodes::BAD_ARGUMENTS);
+
+    return kerberos_params.value();
+}
+
 }
diff --git a/src/Access/ExternalAuthenticators.h b/src/Access/ExternalAuthenticators.h
index abcc8e8d10d..c8feea7eada 100644
--- a/src/Access/ExternalAuthenticators.h
+++ b/src/Access/ExternalAuthenticators.h
@@ -1,11 +1,14 @@
 #pragma once
 
-#include <Access/LDAPParams.h>
+#include <Access/LDAPClient.h>
+#include <Access/Credentials.h>
+#include <Access/GSSAcceptor.h>
 #include <common/types.h>
 
 #include <chrono>
 #include <map>
 #include <mutex>
+#include <optional>
 #include <unordered_map>
 
 
@@ -28,25 +31,31 @@ class ExternalAuthenticators
 public:
     void reset();
     void setConfiguration(const Poco::Util::AbstractConfiguration & config, Poco::Logger * log);
-    bool checkLDAPCredentials(const String & server, const String & user_name, const String & password,
-        const LDAPSearchParamsList * search_params = nullptr, LDAPSearchResultsList * search_results = nullptr) const;
+
+    // The name and readiness of the credentials must be verified before calling these.
+    bool checkLDAPCredentials(const String & server, const BasicCredentials & credentials,
+        const LDAPClient::SearchParamsList * search_params = nullptr, LDAPClient::SearchResultsList * search_results = nullptr) const;
+    bool checkKerberosCredentials(const String & realm, const GSSAcceptorContext & credentials) const;
+
+    GSSAcceptorContext::Params getKerberosParams() const;
 
 private:
     struct LDAPCacheEntry
     {
         std::size_t last_successful_params_hash = 0;
         std::chrono::steady_clock::time_point last_successful_authentication_timestamp;
-        LDAPSearchResultsList last_successful_search_results;
+        LDAPClient::SearchResultsList last_successful_search_results;
     };
 
-    using LDAPServerCache = std::unordered_map<String, LDAPCacheEntry>; // user name   -> cache entry
-    using LDAPServerCaches = std::map<String, LDAPServerCache>;         // server name -> cache
-    using LDAPServersParams = std::map<String, LDAPServerParams>;       // server name -> params
+    using LDAPCache = std::unordered_map<String, LDAPCacheEntry>; // user name   -> cache entry
+    using LDAPCaches = std::map<String, LDAPCache>;               // server name -> cache
+    using LDAPParams = std::map<String, LDAPClient::Params>;      // server name -> params
 
 private:
     mutable std::recursive_mutex mutex;
-    LDAPServersParams ldap_server_params;
-    mutable LDAPServerCaches ldap_server_caches;
+    LDAPParams ldap_client_params_blueprint;
+    mutable LDAPCaches ldap_caches;
+    std::optional<GSSAcceptorContext::Params> kerberos_params;
 };
 
 }
diff --git a/src/Access/GSSAcceptor.cpp b/src/Access/GSSAcceptor.cpp
new file mode 100644
index 00000000000..49b83cc883c
--- /dev/null
+++ b/src/Access/GSSAcceptor.cpp
@@ -0,0 +1,469 @@
+#include <Access/GSSAcceptor.h>
+#include <Common/Exception.h>
+#include <ext/scope_guard.h>
+
+#include <Poco/StringTokenizer.h>
+
+#include <mutex>
+#include <tuple>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int BAD_ARGUMENTS;
+    extern const int FEATURE_IS_NOT_ENABLED_AT_BUILD_TIME;
+    extern const int KERBEROS_ERROR;
+}
+
+GSSAcceptorContext::GSSAcceptorContext(const GSSAcceptorContext::Params& params_)
+    : params(params_)
+{
+}
+
+GSSAcceptorContext::~GSSAcceptorContext()
+{
+    resetHandles();
+}
+
+const String & GSSAcceptorContext::getRealm() const
+{
+    if (!isReady())
+        throwNotReady();
+    return realm;
+}
+
+bool GSSAcceptorContext::isFailed() const
+{
+    return is_failed;
+}
+
+#if USE_KRB5
+
+namespace
+{
+
+std::recursive_mutex gss_global_mutex;
+
+struct PrincipalName
+{
+    explicit PrincipalName(String principal);
+//  operator String() const;
+
+    String name;
+    std::vector<String> instances;
+    String realm;
+};
+
+PrincipalName::PrincipalName(String principal)
+{
+    const auto at_pos = principal.find('@');
+    if (at_pos != std::string::npos)
+    {
+        realm = principal.substr(at_pos + 1);
+        principal.resize(at_pos);
+    }
+
+    Poco::StringTokenizer st(principal, "/");
+    auto it = st.begin();
+    if (it != st.end())
+    {
+        name = *it;
+        instances.assign(++it, st.end());
+    }
+}
+
+/*
+PrincipalName::operator String() const
+{
+    String principal = name;
+
+    for (const auto & instance : instances)
+    {
+        principal += '/';
+        principal += instance;
+    }
+
+    principal += '@';
+    principal += realm;
+
+    return principal;
+}
+*/
+
+String bufferToString(const gss_buffer_desc & buf)
+{
+    String str;
+
+    if (buf.length > 0 && buf.value != nullptr)
+    {
+        str.assign(static_cast<char *>(buf.value), buf.length);
+        while (!str.empty() && str.back() == '\0') { str.pop_back(); }
+    }
+
+    return str;
+}
+
+String extractSpecificStatusMessages(OM_uint32 status_code, int status_type, const gss_OID & mech_type)
+{
+    std::scoped_lock lock(gss_global_mutex);
+
+    String messages;
+    OM_uint32 message_context = 0;
+
+    do
+    {
+        gss_buffer_desc status_string_buf;
+        status_string_buf.length = 0;
+        status_string_buf.value = nullptr;
+
+        SCOPE_EXIT({
+            OM_uint32 minor_status = 0;
+            [[maybe_unused]] OM_uint32 major_status = gss_release_buffer(
+                &minor_status,
+                &status_string_buf
+            );
+        });
+
+        OM_uint32 minor_status = 0;
+        [[maybe_unused]] OM_uint32 major_status = gss_display_status(
+            &minor_status,
+            status_code,
+            status_type,
+            mech_type,
+            &message_context,
+            &status_string_buf
+        );
+
+        const auto message = bufferToString(status_string_buf);
+
+        if (!message.empty())
+        {
+            if (!messages.empty())
+                messages += ", ";
+
+            messages += message;
+        }
+    } while (message_context != 0);
+
+    return messages;
+}
+
+String extractStatusMessages(OM_uint32 major_status_code, OM_uint32 minor_status_code, const gss_OID & mech_type)
+{
+    std::scoped_lock lock(gss_global_mutex);
+
+    const auto gss_messages = extractSpecificStatusMessages(major_status_code, GSS_C_GSS_CODE, mech_type);
+    const auto mech_messages = extractSpecificStatusMessages(minor_status_code, GSS_C_MECH_CODE, mech_type);
+
+    String messages;
+
+    if (!gss_messages.empty())
+        messages += "Majors: " + gss_messages;
+
+    if (!mech_messages.empty())
+    {
+        if (!messages.empty())
+            messages += "; ";
+
+        messages += "Minors: " + mech_messages;
+    }
+
+    return messages;
+}
+
+std::pair<String, String> extractNameAndRealm(const gss_name_t & name)
+{
+    std::scoped_lock lock(gss_global_mutex);
+
+    gss_buffer_desc name_buf;
+    name_buf.length = 0;
+    name_buf.value = nullptr;
+
+    SCOPE_EXIT({
+        OM_uint32 minor_status = 0;
+        [[maybe_unused]] OM_uint32 major_status = gss_release_buffer(
+            &minor_status,
+            &name_buf
+        );
+    });
+
+    OM_uint32 minor_status = 0;
+    [[maybe_unused]] OM_uint32 major_status = gss_display_name(
+        &minor_status,
+        name,
+        &name_buf,
+        nullptr
+    );
+
+    const PrincipalName principal(bufferToString(name_buf));
+    return { principal.name, principal.realm };
+}
+
+bool equalMechanisms(const String & left_str, const gss_OID & right_oid)
+{
+    std::scoped_lock lock(gss_global_mutex);
+
+    gss_buffer_desc left_buf;
+    left_buf.length = left_str.size();
+    left_buf.value = const_cast<char *>(left_str.c_str());
+
+    gss_OID left_oid = GSS_C_NO_OID;
+
+    SCOPE_EXIT({
+        if (left_oid != GSS_C_NO_OID)
+        {
+            OM_uint32 minor_status = 0;
+            [[maybe_unused]] OM_uint32 major_status = gss_release_oid(
+                &minor_status,
+                &left_oid
+            );
+            left_oid = GSS_C_NO_OID;
+        }
+    });
+
+    OM_uint32 minor_status = 0;
+    OM_uint32 major_status = gss_str_to_oid(
+        &minor_status,
+        &left_buf,
+        &left_oid
+    );
+
+    if (GSS_ERROR(major_status))
+        return false;
+
+    return gss_oid_equal(left_oid, right_oid);
+}
+
+}
+
+void GSSAcceptorContext::reset()
+{
+    is_ready = false;
+    is_failed = false;
+    user_name.clear();
+    realm.clear();
+    initHandles();
+}
+
+void GSSAcceptorContext::resetHandles() noexcept
+{
+    std::scoped_lock lock(gss_global_mutex);
+
+    if (acceptor_credentials_handle != GSS_C_NO_CREDENTIAL)
+    {
+        OM_uint32 minor_status = 0;
+        [[maybe_unused]] OM_uint32 major_status = gss_release_cred(
+            &minor_status,
+            &acceptor_credentials_handle
+        );
+        acceptor_credentials_handle = GSS_C_NO_CREDENTIAL;
+    }
+
+    if (context_handle != GSS_C_NO_CONTEXT)
+    {
+        OM_uint32 minor_status = 0;
+        [[maybe_unused]] OM_uint32 major_status = gss_delete_sec_context(
+            &minor_status,
+            &context_handle,
+            GSS_C_NO_BUFFER
+        );
+        context_handle = GSS_C_NO_CONTEXT;
+    }
+}
+
+void GSSAcceptorContext::initHandles()
+{
+    std::scoped_lock lock(gss_global_mutex);
+
+    resetHandles();
+
+    if (!params.principal.empty())
+    {
+        if (!params.realm.empty())
+            throw Exception("Realm and principal name cannot be specified simultaneously", ErrorCodes::BAD_ARGUMENTS);
+
+        gss_buffer_desc acceptor_name_buf;
+        acceptor_name_buf.length = params.principal.size();
+        acceptor_name_buf.value = const_cast<char *>(params.principal.c_str());
+
+        gss_name_t acceptor_name = GSS_C_NO_NAME;
+
+        SCOPE_EXIT({
+            if (acceptor_name != GSS_C_NO_NAME)
+            {
+                OM_uint32 minor_status = 0;
+                [[maybe_unused]] OM_uint32 major_status = gss_release_name(
+                    &minor_status,
+                    &acceptor_name
+                );
+                acceptor_name = GSS_C_NO_NAME;
+            }
+        });
+
+        OM_uint32 minor_status = 0;
+        OM_uint32 major_status = gss_import_name(
+            &minor_status,
+            &acceptor_name_buf,
+            GSS_C_NT_HOSTBASED_SERVICE,
+            &acceptor_name
+        );
+
+        if (GSS_ERROR(major_status))
+        {
+            const auto messages = extractStatusMessages(major_status, minor_status, GSS_C_NO_OID);
+            throw Exception("gss_import_name() failed" + (messages.empty() ? "" : ": " + messages), ErrorCodes::KERBEROS_ERROR);
+        }
+
+        minor_status = 0;
+        major_status = gss_acquire_cred(
+            &minor_status,
+            acceptor_name,
+            GSS_C_INDEFINITE,
+            GSS_C_NO_OID_SET,
+            GSS_C_ACCEPT,
+            &acceptor_credentials_handle,
+            nullptr,
+            nullptr
+        );
+
+        if (GSS_ERROR(major_status))
+        {
+            const auto messages = extractStatusMessages(major_status, minor_status, GSS_C_NO_OID);
+            throw Exception("gss_acquire_cred() failed" + (messages.empty() ? "" : ": " + messages), ErrorCodes::KERBEROS_ERROR);
+        }
+    }
+}
+
+String GSSAcceptorContext::processToken(const String & input_token, Poco::Logger * log)
+{
+    std::scoped_lock lock(gss_global_mutex);
+
+    String output_token;
+
+    try
+    {
+        if (is_ready || is_failed || context_handle == GSS_C_NO_CONTEXT)
+            reset();
+
+        gss_buffer_desc input_token_buf;
+        input_token_buf.length = input_token.size();
+        input_token_buf.value = const_cast<char *>(input_token.c_str());
+
+        gss_buffer_desc output_token_buf;
+        output_token_buf.length = 0;
+        output_token_buf.value = nullptr;
+
+        gss_name_t initiator_name = GSS_C_NO_NAME;
+        gss_OID mech_type = GSS_C_NO_OID;
+        OM_uint32 flags = 0;
+
+        SCOPE_EXIT({
+            if (initiator_name != GSS_C_NO_NAME)
+            {
+                OM_uint32 minor_status = 0;
+                [[maybe_unused]] OM_uint32 major_status = gss_release_name(
+                    &minor_status,
+                    &initiator_name
+                );
+                initiator_name = GSS_C_NO_NAME;
+            }
+
+            OM_uint32 minor_status = 0;
+            [[maybe_unused]] OM_uint32 major_status = gss_release_buffer(
+                &minor_status,
+                &output_token_buf
+            );
+        });
+
+        OM_uint32 minor_status = 0;
+        OM_uint32 major_status = gss_accept_sec_context(
+            &minor_status,
+            &context_handle,
+            acceptor_credentials_handle,
+            &input_token_buf,
+            GSS_C_NO_CHANNEL_BINDINGS,
+            &initiator_name,
+            &mech_type,
+            &output_token_buf,
+            &flags,
+            nullptr,
+            nullptr
+        );
+
+        if (major_status == GSS_S_COMPLETE)
+        {
+            if (!params.mechanism.empty() && !equalMechanisms(params.mechanism, mech_type))
+                throw Exception("gss_accept_sec_context() succeeded, but: the authentication mechanism is not what was expected", ErrorCodes::KERBEROS_ERROR);
+
+            if (flags & GSS_C_ANON_FLAG)
+                throw Exception("gss_accept_sec_context() succeeded, but: the initiator does not wish to be authenticated", ErrorCodes::KERBEROS_ERROR);
+
+            std::tie(user_name, realm) = extractNameAndRealm(initiator_name);
+
+            if (user_name.empty())
+                throw Exception("gss_accept_sec_context() succeeded, but: the initiator name cannot be extracted", ErrorCodes::KERBEROS_ERROR);
+
+            if (realm.empty())
+                throw Exception("gss_accept_sec_context() succeeded, but: the initiator realm cannot be extracted", ErrorCodes::KERBEROS_ERROR);
+
+            if (!params.realm.empty() && params.realm != realm)
+                throw Exception("gss_accept_sec_context() succeeded, but: the initiator realm is not what was expected (expected: " + params.realm + ", actual: " + realm + ")", ErrorCodes::KERBEROS_ERROR);
+
+            output_token = bufferToString(output_token_buf);
+
+            is_ready = true;
+            is_failed = false;
+
+            resetHandles();
+        }
+        else if (!GSS_ERROR(major_status) && (major_status & GSS_S_CONTINUE_NEEDED))
+        {
+            output_token = bufferToString(output_token_buf);
+
+            is_ready = false;
+            is_failed = false;
+        }
+        else
+        {
+            const auto messages = extractStatusMessages(major_status, minor_status, mech_type);
+            throw Exception("gss_accept_sec_context() failed" + (messages.empty() ? "" : ": " + messages), ErrorCodes::KERBEROS_ERROR);
+        }
+    }
+    catch (...)
+    {
+        tryLogCurrentException(log, "Could not process GSS token");
+
+        is_ready = true;
+        is_failed = true;
+
+        resetHandles();
+    }
+
+    return output_token;
+}
+
+#else // USE_KRB5
+
+void GSSAcceptorContext::reset()
+{
+}
+
+void GSSAcceptorContext::resetHandles() noexcept
+{
+}
+
+void GSSAcceptorContext::initHandles()
+{
+}
+
+String GSSAcceptorContext::processToken(const String &, Poco::Logger *)
+{
+    throw Exception("ClickHouse was built without GSS-API/Kerberos support", ErrorCodes::FEATURE_IS_NOT_ENABLED_AT_BUILD_TIME);
+}
+
+#endif // USE_KRB5
+
+}
diff --git a/src/Access/GSSAcceptor.h b/src/Access/GSSAcceptor.h
new file mode 100644
index 00000000000..8d207c59c01
--- /dev/null
+++ b/src/Access/GSSAcceptor.h
@@ -0,0 +1,66 @@
+#pragma once
+
+#if !defined(ARCADIA_BUILD)
+#   include "config_core.h"
+#endif
+
+#include <Access/Credentials.h>
+#include <common/types.h>
+#include <memory>
+
+#if USE_KRB5
+#   include <gssapi/gssapi.h>
+#   include <gssapi/gssapi_ext.h>
+#   define MAYBE_NORETURN
+#else
+#   define MAYBE_NORETURN [[noreturn]]
+#endif
+
+namespace Poco { class Logger; }
+
+namespace DB
+{
+
+class GSSAcceptorContext
+    : public Credentials
+{
+public:
+    struct Params
+    {
+        String mechanism = "1.2.840.113554.1.2.2"; // OID: krb5
+        String principal;
+        String realm;
+    };
+
+    explicit GSSAcceptorContext(const Params& params_);
+    virtual ~GSSAcceptorContext() override;
+
+    GSSAcceptorContext(const GSSAcceptorContext &) = delete;
+    GSSAcceptorContext(GSSAcceptorContext &&) = delete;
+    GSSAcceptorContext & operator= (const GSSAcceptorContext &) = delete;
+    GSSAcceptorContext & operator= (GSSAcceptorContext &&) = delete;
+
+    const String & getRealm() const;
+    bool isFailed() const;
+    MAYBE_NORETURN String processToken(const String & input_token, Poco::Logger * log);
+
+private:
+    void reset();
+    void resetHandles() noexcept;
+    void initHandles();
+
+private:
+    const Params params;
+
+    bool is_failed = false;
+    String realm;
+
+#if USE_KRB5
+    gss_ctx_id_t context_handle = GSS_C_NO_CONTEXT;
+    gss_cred_id_t acceptor_credentials_handle = GSS_C_NO_CREDENTIAL;
+#endif
+};
+
+}
+
+#undef MAYBE_NORETURN
diff --git a/src/Access/GrantedRoles.cpp b/src/Access/GrantedRoles.cpp
index 4d7007c4db6..7930b56e44d 100644
--- a/src/Access/GrantedRoles.cpp
+++ b/src/Access/GrantedRoles.cpp
@@ -1,37 +1,38 @@
 #include <Access/GrantedRoles.h>
+#include <Access/RolesOrUsersSet.h>
 #include <boost/range/algorithm/set_algorithm.hpp>
+#include <boost/range/algorithm_ext/erase.hpp>
 
 
 namespace DB
 {
-void GrantedRoles::grant(const UUID & role)
+void GrantedRoles::grant(const UUID & role_)
 {
-    roles.insert(role);
+    roles.insert(role_);
 }
 
 void GrantedRoles::grant(const std::vector<UUID> & roles_)
 {
-    for (const UUID & role : roles_)
-        grant(role);
+    roles.insert(roles_.begin(), roles_.end());
 }
 
-void GrantedRoles::grantWithAdminOption(const UUID & role)
+void GrantedRoles::grantWithAdminOption(const UUID & role_)
 {
-    roles.insert(role);
-    roles_with_admin_option.insert(role);
+    roles.insert(role_);
+    roles_with_admin_option.insert(role_);
 }
 
 void GrantedRoles::grantWithAdminOption(const std::vector<UUID> & roles_)
 {
-    for (const UUID & role : roles_)
-        grantWithAdminOption(role);
+    roles.insert(roles_.begin(), roles_.end());
+    roles_with_admin_option.insert(roles_.begin(), roles_.end());
 }
 
 
-void GrantedRoles::revoke(const UUID & role)
+void GrantedRoles::revoke(const UUID & role_)
 {
-    roles.erase(role);
-    roles_with_admin_option.erase(role);
+    roles.erase(role_);
+    roles_with_admin_option.erase(role_);
 }
 
 void GrantedRoles::revoke(const std::vector<UUID> & roles_)
@@ -40,9 +41,9 @@ void GrantedRoles::revoke(const std::vector<UUID> & roles_)
         revoke(role);
 }
 
-void GrantedRoles::revokeAdminOption(const UUID & role)
+void GrantedRoles::revokeAdminOption(const UUID & role_)
 {
-    roles_with_admin_option.erase(role);
+    roles_with_admin_option.erase(role_);
 }
 
 void GrantedRoles::revokeAdminOption(const std::vector<UUID> & roles_)
@@ -52,13 +53,118 @@ void GrantedRoles::revokeAdminOption(const std::vector<UUID> & roles_)
 }
 
 
-GrantedRoles::Grants GrantedRoles::getGrants() const
+bool GrantedRoles::isGranted(const UUID & role_) const
 {
-    Grants res;
-    res.grants_with_admin_option.insert(res.grants_with_admin_option.end(), roles_with_admin_option.begin(), roles_with_admin_option.end());
-    res.grants.reserve(roles.size() - roles_with_admin_option.size());
-    boost::range::set_difference(roles, roles_with_admin_option, std::back_inserter(res.grants));
+    return roles.count(role_);
+}
+
+bool GrantedRoles::isGrantedWithAdminOption(const UUID & role_) const
+{
+    return roles_with_admin_option.count(role_);
+}
+
+
+std::vector<UUID> GrantedRoles::findGranted(const std::vector<UUID> & ids) const
+{
+    std::vector<UUID> res;
+    res.reserve(ids.size());
+    for (const UUID & id : ids)
+    {
+        if (isGranted(id))
+            res.push_back(id);
+    }
     return res;
 }
 
+std::vector<UUID> GrantedRoles::findGranted(const boost::container::flat_set<UUID> & ids) const
+{
+    std::vector<UUID> res;
+    res.reserve(ids.size());
+    boost::range::set_difference(ids, roles, std::back_inserter(res));
+    return res;
+}
+
+std::vector<UUID> GrantedRoles::findGranted(const RolesOrUsersSet & ids) const
+{
+    std::vector<UUID> res;
+    for (const UUID & id : roles)
+    {
+        if (ids.match(id))
+            res.emplace_back(id);
+    }
+    return res;
+}
+
+std::vector<UUID> GrantedRoles::findGrantedWithAdminOption(const std::vector<UUID> & ids) const
+{
+    std::vector<UUID> res;
+    res.reserve(ids.size());
+    for (const UUID & id : ids)
+    {
+        if (isGrantedWithAdminOption(id))
+            res.push_back(id);
+    }
+    return res;
+}
+
+std::vector<UUID> GrantedRoles::findGrantedWithAdminOption(const boost::container::flat_set<UUID> & ids) const
+{
+    std::vector<UUID> res;
+    res.reserve(ids.size());
+    boost::range::set_difference(ids, roles_with_admin_option, std::back_inserter(res));
+    return res;
+}
+
+std::vector<UUID> GrantedRoles::findGrantedWithAdminOption(const RolesOrUsersSet & ids) const
+{
+    std::vector<UUID> res;
+    for (const UUID & id : roles_with_admin_option)
+    {
+        if (ids.match(id))
+            res.emplace_back(id);
+    }
+    return res;
+}
+
+
+GrantedRoles::Elements GrantedRoles::getElements() const
+{
+    Elements elements;
+
+    Element element;
+    element.ids.reserve(roles.size());
+    boost::range::set_difference(roles, roles_with_admin_option, std::back_inserter(element.ids));
+    if (!element.empty())
+    {
+        element.admin_option = false;
+        elements.emplace_back(std::move(element));
+    }
+
+    if (!roles_with_admin_option.empty())
+    {
+        element = {};
+        element.ids.insert(element.ids.end(), roles_with_admin_option.begin(), roles_with_admin_option.end());
+        element.admin_option = true;
+        elements.emplace_back(std::move(element));
+    }
+
+    return elements;
+}
+
+
+void GrantedRoles::makeUnion(const GrantedRoles & other)
+{
+    roles.insert(other.roles.begin(), other.roles.end());
+    roles_with_admin_option.insert(other.roles_with_admin_option.begin(), other.roles_with_admin_option.end());
+}
+
+void GrantedRoles::makeIntersection(const GrantedRoles & other)
+{
+    boost::range::remove_erase_if(roles, [&other](const UUID & id) { return other.roles.find(id) == other.roles.end(); });
+
+    boost::range::remove_erase_if(roles_with_admin_option, [&other](const UUID & id)
+    {
+        return other.roles_with_admin_option.find(id) == other.roles_with_admin_option.end();
+    });
+}
 }
diff --git a/src/Access/GrantedRoles.h b/src/Access/GrantedRoles.h
index fd091755a80..75ea56aba96 100644
--- a/src/Access/GrantedRoles.h
+++ b/src/Access/GrantedRoles.h
@@ -7,33 +7,55 @@
 
 namespace DB
 {
+struct RolesOrUsersSet;
+
 /// Roles when they are granted to a role or user.
 /// Stores both the roles themselves and the roles with admin option.
-struct GrantedRoles
+class GrantedRoles
 {
-    boost::container::flat_set<UUID> roles;
-    boost::container::flat_set<UUID> roles_with_admin_option;
-
-    void grant(const UUID & role);
+public:
+    void grant(const UUID & role_);
     void grant(const std::vector<UUID> & roles_);
-    void grantWithAdminOption(const UUID & role);
+    void grantWithAdminOption(const UUID & role_);
     void grantWithAdminOption(const std::vector<UUID> & roles_);
 
-    void revoke(const UUID & role);
+    void revoke(const UUID & role_);
     void revoke(const std::vector<UUID> & roles_);
-    void revokeAdminOption(const UUID & role);
+    void revokeAdminOption(const UUID & role_);
     void revokeAdminOption(const std::vector<UUID> & roles_);
 
-    struct Grants
+    bool isGranted(const UUID & role_) const;
+    bool isGrantedWithAdminOption(const UUID & role_) const;
+
+    const boost::container::flat_set<UUID> & getGranted() const { return roles; }
+    const boost::container::flat_set<UUID> & getGrantedWithAdminOption() const { return roles_with_admin_option; }
+
+    std::vector<UUID> findGranted(const std::vector<UUID> & ids) const;
+    std::vector<UUID> findGranted(const boost::container::flat_set<UUID> & ids) const;
+    std::vector<UUID> findGranted(const RolesOrUsersSet & ids) const;
+    std::vector<UUID> findGrantedWithAdminOption(const std::vector<UUID> & ids) const;
+    std::vector<UUID> findGrantedWithAdminOption(const boost::container::flat_set<UUID> & ids) const;
+    std::vector<UUID> findGrantedWithAdminOption(const RolesOrUsersSet & ids) const;
+
+    struct Element
     {
-        std::vector<UUID> grants;
-        std::vector<UUID> grants_with_admin_option;
+        std::vector<UUID> ids;
+        bool admin_option = false;
+        bool empty() const { return ids.empty(); }
     };
+    using Elements = std::vector<Element>;
 
     /// Retrieves the information about grants.
-    Grants getGrants() const;
+    Elements getElements() const;
+
+    void makeUnion(const GrantedRoles & other);
+    void makeIntersection(const GrantedRoles & other);
 
     friend bool operator ==(const GrantedRoles & left, const GrantedRoles & right) { return (left.roles == right.roles) && (left.roles_with_admin_option == right.roles_with_admin_option); }
     friend bool operator !=(const GrantedRoles & left, const GrantedRoles & right) { return !(left == right); }
+
+private:
+    boost::container::flat_set<UUID> roles;
+    boost::container::flat_set<UUID> roles_with_admin_option;
 };
 }
diff --git a/src/Access/IAccessStorage.cpp b/src/Access/IAccessStorage.cpp
index c68f5f55ef5..7b42abb2737 100644
--- a/src/Access/IAccessStorage.cpp
+++ b/src/Access/IAccessStorage.cpp
@@ -1,5 +1,6 @@
 #include <Access/IAccessStorage.h>
 #include <Access/User.h>
+#include <Access/Credentials.h>
 #include <Common/Exception.h>
 #include <Common/quoteString.h>
 #include <IO/WriteHelpers.h>
@@ -417,53 +418,60 @@ void IAccessStorage::notify(const Notifications & notifications)
 
 
 UUID IAccessStorage::login(
-    const String & user_name,
-    const String & password,
+    const Credentials & credentials,
     const Poco::Net::IPAddress & address,
     const ExternalAuthenticators & external_authenticators,
     bool replace_exception_with_cannot_authenticate) const
 {
     try
     {
-        return loginImpl(user_name, password, address, external_authenticators);
+        return loginImpl(credentials, address, external_authenticators);
     }
     catch (...)
     {
         if (!replace_exception_with_cannot_authenticate)
             throw;
 
-        tryLogCurrentException(getLogger(), user_name + ": Authentication failed");
-        throwCannotAuthenticate(user_name);
+        tryLogCurrentException(getLogger(), credentials.getUserName() + ": Authentication failed");
+        throwCannotAuthenticate(credentials.getUserName());
     }
 }
 
 
 UUID IAccessStorage::loginImpl(
-    const String & user_name,
-    const String & password,
+    const Credentials & credentials,
     const Poco::Net::IPAddress & address,
     const ExternalAuthenticators & external_authenticators) const
 {
-    if (auto id = find<User>(user_name))
+    if (auto id = find<User>(credentials.getUserName()))
     {
         if (auto user = tryRead<User>(*id))
         {
-            if (!isPasswordCorrectImpl(*user, password, external_authenticators))
-                throwInvalidPassword();
-
             if (!isAddressAllowedImpl(*user, address))
                 throwAddressNotAllowed(address);
 
+            if (!areCredentialsValidImpl(*user, credentials, external_authenticators))
+                throwInvalidCredentials();
+
             return *id;
         }
     }
-    throwNotFound(EntityType::USER, user_name);
+    throwNotFound(EntityType::USER, credentials.getUserName());
 }
 
 
-bool IAccessStorage::isPasswordCorrectImpl(const User & user, const String & password, const ExternalAuthenticators & external_authenticators) const
+bool IAccessStorage::areCredentialsValidImpl(
+    const User & user,
+    const Credentials & credentials,
+    const ExternalAuthenticators & external_authenticators) const
 {
-    return user.authentication.isCorrectPassword(user.getName(), password, external_authenticators);
+    if (!credentials.isReady())
+        return false;
+
+    if (credentials.getUserName() != user.getName())
+        return false;
+
+    return user.authentication.areCredentialsValid(credentials, external_authenticators);
 }
 
 
@@ -472,6 +480,7 @@ bool IAccessStorage::isAddressAllowedImpl(const User & user, const Poco::Net::IP
     return user.allowed_client_hosts.contains(address);
 }
 
+
 UUID IAccessStorage::getIDOfLoggedUser(const String & user_name) const
 {
     return getIDOfLoggedUserImpl(user_name);
@@ -578,9 +587,9 @@ void IAccessStorage::throwAddressNotAllowed(const Poco::Net::IPAddress & address
     throw Exception("Connections from " + address.toString() + " are not allowed", ErrorCodes::IP_ADDRESS_NOT_ALLOWED);
 }
 
-void IAccessStorage::throwInvalidPassword()
+void IAccessStorage::throwInvalidCredentials()
 {
-    throw Exception("Invalid password", ErrorCodes::WRONG_PASSWORD);
+    throw Exception("Invalid credentials", ErrorCodes::WRONG_PASSWORD);
 }
 
 void IAccessStorage::throwCannotAuthenticate(const String & user_name)
diff --git a/src/Access/IAccessStorage.h b/src/Access/IAccessStorage.h
index ecf6b260712..2cdd8eabf73 100644
--- a/src/Access/IAccessStorage.h
+++ b/src/Access/IAccessStorage.h
@@ -16,6 +16,7 @@ namespace Poco::Net { class IPAddress; }
 namespace DB
 {
 struct User;
+class Credentials;
 class ExternalAuthenticators;
 
 /// Contains entities, i.e. instances of classes derived from IAccessEntity.
@@ -142,11 +143,11 @@ public:
     bool hasSubscription(EntityType type) const;
     bool hasSubscription(const UUID & id) const;
 
-    /// Finds an user, check its password and returns the ID of the user.
-    /// Throws an exception if no such user or password is incorrect.
-    UUID login(const String & user_name, const String & password, const Poco::Net::IPAddress & address, const ExternalAuthenticators & external_authenticators, bool replace_exception_with_cannot_authenticate = true) const;
+    /// Finds a user, check the provided credentials and returns the ID of the user if they are valid.
+    /// Throws an exception if no such user or credentials are invalid.
+    UUID login(const Credentials & credentials, const Poco::Net::IPAddress & address, const ExternalAuthenticators & external_authenticators, bool replace_exception_with_cannot_authenticate = true) const;
 
-    /// Returns the ID of an user who has logged in (maybe on another node).
+    /// Returns the ID of a user who has logged in (maybe on another node).
     /// The function assumes that the password has been already checked somehow, so we can skip checking it now.
     UUID getIDOfLoggedUser(const String & user_name) const;
 
@@ -164,8 +165,8 @@ protected:
     virtual ext::scope_guard subscribeForChangesImpl(EntityType type, const OnChangedHandler & handler) const = 0;
     virtual bool hasSubscriptionImpl(const UUID & id) const = 0;
     virtual bool hasSubscriptionImpl(EntityType type) const = 0;
-    virtual UUID loginImpl(const String & user_name, const String & password, const Poco::Net::IPAddress & address, const ExternalAuthenticators & external_authenticators) const;
-    virtual bool isPasswordCorrectImpl(const User & user, const String & password, const ExternalAuthenticators & external_authenticators) const;
+    virtual UUID loginImpl(const Credentials & credentials, const Poco::Net::IPAddress & address, const ExternalAuthenticators & external_authenticators) const;
+    virtual bool areCredentialsValidImpl(const User & user, const Credentials & credentials, const ExternalAuthenticators & external_authenticators) const;
     virtual bool isAddressAllowedImpl(const User & user, const Poco::Net::IPAddress & address) const;
     virtual UUID getIDOfLoggedUserImpl(const String & user_name) const;
 
@@ -183,7 +184,7 @@ protected:
     [[noreturn]] void throwReadonlyCannotUpdate(EntityType type, const String & name) const;
     [[noreturn]] void throwReadonlyCannotRemove(EntityType type, const String & name) const;
     [[noreturn]] static void throwAddressNotAllowed(const Poco::Net::IPAddress & address);
-    [[noreturn]] static void throwInvalidPassword();
+    [[noreturn]] static void throwInvalidCredentials();
     [[noreturn]] static void throwCannotAuthenticate(const String & user_name);
 
     using Notification = std::tuple<OnChangedHandler, UUID, AccessEntityPtr>;
diff --git a/src/Access/LDAPAccessStorage.cpp b/src/Access/LDAPAccessStorage.cpp
index 2602422a59a..b47a9b3e041 100644
--- a/src/Access/LDAPAccessStorage.cpp
+++ b/src/Access/LDAPAccessStorage.cpp
@@ -3,6 +3,7 @@
 #include <Access/ExternalAuthenticators.h>
 #include <Access/User.h>
 #include <Access/Role.h>
+#include <Access/Credentials.h>
 #include <Access/LDAPClient.h>
 #include <Common/Exception.h>
 #include <common/logger_useful.h>
@@ -35,7 +36,7 @@ LDAPAccessStorage::LDAPAccessStorage(const String & storage_name_, AccessControl
 
 String LDAPAccessStorage::getLDAPServerName() const
 {
-    return ldap_server;
+    return ldap_server_name;
 }
 
 
@@ -53,8 +54,8 @@ void LDAPAccessStorage::setConfiguration(AccessControlManager * access_control_m
     if (!has_server)
         throw Exception("Missing 'server' field for LDAP user directory", ErrorCodes::BAD_ARGUMENTS);
 
-    const auto ldap_server_cfg = config.getString(prefix_str + "server");
-    if (ldap_server_cfg.empty())
+    const auto ldap_server_name_cfg = config.getString(prefix_str + "server");
+    if (ldap_server_name_cfg.empty())
         throw Exception("Empty 'server' field for LDAP user directory", ErrorCodes::BAD_ARGUMENTS);
 
     std::set<String> common_roles_cfg;
@@ -67,7 +68,7 @@ void LDAPAccessStorage::setConfiguration(AccessControlManager * access_control_m
         common_roles_cfg.insert(role_names.begin(), role_names.end());
     }
 
-    LDAPSearchParamsList role_search_params_cfg;
+    LDAPClient::SearchParamsList role_search_params_cfg;
     if (has_role_mapping)
     {
         Poco::Util::AbstractConfiguration::Keys all_keys;
@@ -89,17 +90,17 @@ void LDAPAccessStorage::setConfiguration(AccessControlManager * access_control_m
 
             auto scope = config.getString(rm_prefix_str + "scope", "subtree");
             boost::algorithm::to_lower(scope);
-            if (scope == "base")           rm_params.scope = LDAPSearchParams::Scope::BASE;
-            else if (scope == "one_level") rm_params.scope = LDAPSearchParams::Scope::ONE_LEVEL;
-            else if (scope == "subtree")   rm_params.scope = LDAPSearchParams::Scope::SUBTREE;
-            else if (scope == "children")  rm_params.scope = LDAPSearchParams::Scope::CHILDREN;
+            if (scope == "base")           rm_params.scope = LDAPClient::SearchParams::Scope::BASE;
+            else if (scope == "one_level") rm_params.scope = LDAPClient::SearchParams::Scope::ONE_LEVEL;
+            else if (scope == "subtree")   rm_params.scope = LDAPClient::SearchParams::Scope::SUBTREE;
+            else if (scope == "children")  rm_params.scope = LDAPClient::SearchParams::Scope::CHILDREN;
             else
                 throw Exception("Invalid value of 'scope' field in '" + key + "' section of LDAP user directory, must be one of 'base', 'one_level', 'subtree', or 'children'", ErrorCodes::BAD_ARGUMENTS);
         }
     }
 
     access_control_manager = access_control_manager_;
-    ldap_server = ldap_server_cfg;
+    ldap_server_name = ldap_server_name_cfg;
     role_search_params.swap(role_search_params_cfg);
     common_role_names.swap(common_roles_cfg);
 
@@ -186,13 +187,10 @@ void LDAPAccessStorage::applyRoleChangeNoLock(bool grant, const UUID & role_id,
             if (auto user = typeid_cast<std::shared_ptr<const User>>(entity_))
             {
                 auto changed_user = typeid_cast<std::shared_ptr<User>>(user->clone());
-                auto & granted_roles = changed_user->granted_roles.roles;
-
                 if (grant)
-                    granted_roles.insert(role_id);
+                    changed_user->granted_roles.grant(role_id);
                 else
-                    granted_roles.erase(role_id);
-
+                    changed_user->granted_roles.revoke(role_id);
                 return changed_user;
             }
             return entity_;
@@ -218,17 +216,17 @@ void LDAPAccessStorage::applyRoleChangeNoLock(bool grant, const UUID & role_id,
 }
 
 
-void LDAPAccessStorage::assignRolesNoLock(User & user, const LDAPSearchResultsList & external_roles) const
+void LDAPAccessStorage::assignRolesNoLock(User & user, const LDAPClient::SearchResultsList & external_roles) const
 {
-    const auto external_roles_hash = boost::hash<LDAPSearchResultsList>{}(external_roles);
+    const auto external_roles_hash = boost::hash<LDAPClient::SearchResultsList>{}(external_roles);
     return assignRolesNoLock(user, external_roles, external_roles_hash);
 }
 
 
-void LDAPAccessStorage::assignRolesNoLock(User & user, const LDAPSearchResultsList & external_roles, const std::size_t external_roles_hash) const
+void LDAPAccessStorage::assignRolesNoLock(User & user, const LDAPClient::SearchResultsList & external_roles, const std::size_t external_roles_hash) const
 {
     const auto & user_name = user.getName();
-    auto & granted_roles = user.granted_roles.roles;
+    auto & granted_roles = user.granted_roles;
     const auto local_role_names = mapExternalRolesNoLock(external_roles);
 
     auto grant_role = [this, &user_name, &granted_roles] (const String & role_name, const bool common)
@@ -246,7 +244,7 @@ void LDAPAccessStorage::assignRolesNoLock(User & user, const LDAPSearchResultsLi
         if (it != granted_role_ids.end())
         {
             const auto & role_id = it->second;
-            granted_roles.insert(role_id);
+            granted_roles.grant(role_id);
         }
         else
         {
@@ -255,7 +253,7 @@ void LDAPAccessStorage::assignRolesNoLock(User & user, const LDAPSearchResultsLi
     };
 
     external_role_hashes.erase(user_name);
-    granted_roles.clear();
+    granted_roles = {};
     const auto old_role_names = std::move(roles_per_users[user_name]);
 
     // Grant the common roles first.
@@ -312,10 +310,10 @@ void LDAPAccessStorage::assignRolesNoLock(User & user, const LDAPSearchResultsLi
 }
 
 
-void LDAPAccessStorage::updateAssignedRolesNoLock(const UUID & id, const String & user_name, const LDAPSearchResultsList & external_roles) const
+void LDAPAccessStorage::updateAssignedRolesNoLock(const UUID & id, const String & user_name, const LDAPClient::SearchResultsList & external_roles) const
 {
     // No need to include common_role_names in this hash each time, since they don't change.
-    const auto external_roles_hash = boost::hash<LDAPSearchResultsList>{}(external_roles);
+    const auto external_roles_hash = boost::hash<LDAPClient::SearchResultsList>{}(external_roles);
 
     // Map and grant the roles from scratch only if the list of external role has changed.
     const auto it = external_role_hashes.find(user_name);
@@ -337,7 +335,7 @@ void LDAPAccessStorage::updateAssignedRolesNoLock(const UUID & id, const String
 }
 
 
-std::set<String> LDAPAccessStorage::mapExternalRolesNoLock(const LDAPSearchResultsList & external_roles) const
+std::set<String> LDAPAccessStorage::mapExternalRolesNoLock(const LDAPClient::SearchResultsList & external_roles) const
 {
     std::set<String> role_names;
 
@@ -365,10 +363,19 @@ std::set<String> LDAPAccessStorage::mapExternalRolesNoLock(const LDAPSearchResul
 }
 
 
-bool LDAPAccessStorage::isPasswordCorrectLDAPNoLock(const String & user_name, const String & password,
-    const ExternalAuthenticators & external_authenticators, LDAPSearchResultsList & search_results) const
+bool LDAPAccessStorage::areLDAPCredentialsValidNoLock(const User & user, const Credentials & credentials,
+    const ExternalAuthenticators & external_authenticators, LDAPClient::SearchResultsList & search_results) const
 {
-    return external_authenticators.checkLDAPCredentials(ldap_server, user_name, password, &role_search_params, &search_results);
+    if (!credentials.isReady())
+        return false;
+
+    if (credentials.getUserName() != user.getName())
+        return false;
+
+    if (const auto * basic_credentials = dynamic_cast<const BasicCredentials *>(&credentials))
+        return external_authenticators.checkLDAPCredentials(ldap_server_name, *basic_credentials, &role_search_params, &search_results);
+
+    return false;
 }
 
 
@@ -383,7 +390,7 @@ String LDAPAccessStorage::getStorageParamsJSON() const
     std::scoped_lock lock(mutex);
     Poco::JSON::Object params_json;
 
-    params_json.set("server", ldap_server);
+    params_json.set("server", ldap_server_name);
 
     Poco::JSON::Array common_role_names_json;
     for (const auto & role : common_role_names)
@@ -405,10 +412,10 @@ String LDAPAccessStorage::getStorageParamsJSON() const
         String scope;
         switch (role_mapping.scope)
         {
-            case LDAPSearchParams::Scope::BASE:      scope = "base"; break;
-            case LDAPSearchParams::Scope::ONE_LEVEL: scope = "one_level"; break;
-            case LDAPSearchParams::Scope::SUBTREE:   scope = "subtree"; break;
-            case LDAPSearchParams::Scope::CHILDREN:  scope = "children"; break;
+            case LDAPClient::SearchParams::Scope::BASE:      scope = "base"; break;
+            case LDAPClient::SearchParams::Scope::ONE_LEVEL: scope = "one_level"; break;
+            case LDAPClient::SearchParams::Scope::SUBTREE:   scope = "subtree"; break;
+            case LDAPClient::SearchParams::Scope::CHILDREN:  scope = "children"; break;
         }
         role_mapping_json.set("scope", scope);
 
@@ -514,23 +521,23 @@ bool LDAPAccessStorage::hasSubscriptionImpl(EntityType type) const
     return memory_storage.hasSubscription(type);
 }
 
-UUID LDAPAccessStorage::loginImpl(const String & user_name, const String & password, const Poco::Net::IPAddress & address, const ExternalAuthenticators & external_authenticators) const
+UUID LDAPAccessStorage::loginImpl(const Credentials & credentials, const Poco::Net::IPAddress & address, const ExternalAuthenticators & external_authenticators) const
 {
     std::scoped_lock lock(mutex);
-    LDAPSearchResultsList external_roles;
-    auto id = memory_storage.find<User>(user_name);
+    LDAPClient::SearchResultsList external_roles;
+    auto id = memory_storage.find<User>(credentials.getUserName());
     if (id)
     {
         auto user = memory_storage.read<User>(*id);
 
-        if (!isPasswordCorrectLDAPNoLock(user->getName(), password, external_authenticators, external_roles))
-            throwInvalidPassword();
-
         if (!isAddressAllowedImpl(*user, address))
             throwAddressNotAllowed(address);
 
+        if (!areLDAPCredentialsValidNoLock(*user, credentials, external_authenticators, external_roles))
+            throwInvalidCredentials();
+
         // Just in case external_roles are changed. This will be no-op if they are not.
-        updateAssignedRolesNoLock(*id, user_name, external_roles);
+        updateAssignedRolesNoLock(*id, user->getName(), external_roles);
 
         return *id;
     }
@@ -538,16 +545,16 @@ UUID LDAPAccessStorage::loginImpl(const String & user_name, const String & passw
     {
         // User does not exist, so we create one, and will add it if authentication is successful.
         auto user = std::make_shared<User>();
-        user->setName(user_name);
-        user->authentication = Authentication(Authentication::Type::LDAP_SERVER);
-        user->authentication.setServerName(ldap_server);
-
-        if (!isPasswordCorrectLDAPNoLock(user->getName(), password, external_authenticators, external_roles))
-            throwInvalidPassword();
+        user->setName(credentials.getUserName());
+        user->authentication = Authentication(Authentication::Type::LDAP);
+        user->authentication.setLDAPServerName(ldap_server_name);
 
         if (!isAddressAllowedImpl(*user, address))
             throwAddressNotAllowed(address);
 
+        if (!areLDAPCredentialsValidNoLock(*user, credentials, external_authenticators, external_roles))
+            throwInvalidCredentials();
+
         assignRolesNoLock(*user, external_roles);
 
         return memory_storage.insert(user);
@@ -567,10 +574,10 @@ UUID LDAPAccessStorage::getIDOfLoggedUserImpl(const String & user_name) const
         // User does not exist, so we create one, and add it pretending that the authentication is successful.
         auto user = std::make_shared<User>();
         user->setName(user_name);
-        user->authentication = Authentication(Authentication::Type::LDAP_SERVER);
-        user->authentication.setServerName(ldap_server);
+        user->authentication = Authentication(Authentication::Type::LDAP);
+        user->authentication.setLDAPServerName(ldap_server_name);
 
-        LDAPSearchResultsList external_roles;
+        LDAPClient::SearchResultsList external_roles;
 
         // TODO: mapped external roles are not available here. Without a password we can't authenticate and retrieve roles from LDAP server.
 
diff --git a/src/Access/LDAPAccessStorage.h b/src/Access/LDAPAccessStorage.h
index b3d82d1e86b..ea0ab47c225 100644
--- a/src/Access/LDAPAccessStorage.h
+++ b/src/Access/LDAPAccessStorage.h
@@ -1,7 +1,9 @@
 #pragma once
 
 #include <Access/MemoryAccessStorage.h>
-#include <Core/Types.h>
+#include <Access/LDAPClient.h>
+#include <Access/Credentials.h>
+#include <common/types.h>
 #include <ext/scope_guard.h>
 #include <map>
 #include <mutex>
@@ -21,14 +23,10 @@ namespace Poco
 namespace DB
 {
 class AccessControlManager;
-struct LDAPSearchParams;
-using LDAPSearchParamsList = std::vector<LDAPSearchParams>;
-using LDAPSearchResults = std::set<String>;
-using LDAPSearchResultsList = std::vector<LDAPSearchResults>;
 
 /// Implementation of IAccessStorage which allows attaching users from a remote LDAP server.
 /// Currently, any user name will be treated as a name of an existing remote user,
-/// a user info entity will be created, with LDAP_SERVER authentication type.
+/// a user info entity will be created, with LDAP authentication type.
 class LDAPAccessStorage : public IAccessStorage
 {
 public:
@@ -57,7 +55,7 @@ private: // IAccessStorage implementations.
     virtual ext::scope_guard subscribeForChangesImpl(EntityType type, const OnChangedHandler & handler) const override;
     virtual bool hasSubscriptionImpl(const UUID & id) const override;
     virtual bool hasSubscriptionImpl(EntityType type) const override;
-    virtual UUID loginImpl(const String & user_name, const String & password, const Poco::Net::IPAddress & address, const ExternalAuthenticators & external_authenticators) const override;
+    virtual UUID loginImpl(const Credentials & credentials, const Poco::Net::IPAddress & address, const ExternalAuthenticators & external_authenticators) const override;
     virtual UUID getIDOfLoggedUserImpl(const String & user_name) const override;
 
 private:
@@ -65,19 +63,19 @@ private:
     void processRoleChange(const UUID & id, const AccessEntityPtr & entity);
 
     void applyRoleChangeNoLock(bool grant, const UUID & role_id, const String & role_name);
-    void assignRolesNoLock(User & user, const LDAPSearchResultsList & external_roles) const;
-    void assignRolesNoLock(User & user, const LDAPSearchResultsList & external_roles, const std::size_t external_roles_hash) const;
-    void updateAssignedRolesNoLock(const UUID & id, const String & user_name, const LDAPSearchResultsList & external_roles) const;
-    std::set<String> mapExternalRolesNoLock(const LDAPSearchResultsList & external_roles) const;
-    bool isPasswordCorrectLDAPNoLock(const String & user_name, const String & password,
-        const ExternalAuthenticators & external_authenticators, LDAPSearchResultsList & search_results) const;
+    void assignRolesNoLock(User & user, const LDAPClient::SearchResultsList & external_roles) const;
+    void assignRolesNoLock(User & user, const LDAPClient::SearchResultsList & external_roles, const std::size_t external_roles_hash) const;
+    void updateAssignedRolesNoLock(const UUID & id, const String & user_name, const LDAPClient::SearchResultsList & external_roles) const;
+    std::set<String> mapExternalRolesNoLock(const LDAPClient::SearchResultsList & external_roles) const;
+    bool areLDAPCredentialsValidNoLock(const User & user, const Credentials & credentials,
+        const ExternalAuthenticators & external_authenticators, LDAPClient::SearchResultsList & search_results) const;
 
     mutable std::recursive_mutex mutex;
     AccessControlManager * access_control_manager = nullptr;
-    String ldap_server;
-    LDAPSearchParamsList role_search_params;
+    String ldap_server_name;
+    LDAPClient::SearchParamsList role_search_params;
     std::set<String> common_role_names;                         // role name that should be granted to all users at all times
-    mutable std::map<String, std::size_t> external_role_hashes; // user name -> LDAPSearchResultsList hash (most recently retrieved and processed)
+    mutable std::map<String, std::size_t> external_role_hashes; // user name -> LDAPClient::SearchResultsList hash (most recently retrieved and processed)
     mutable std::map<String, std::set<String>> users_per_roles; // role name -> user names (...it should be granted to; may but don't have to exist for common roles)
     mutable std::map<String, std::set<String>> roles_per_users; // user name -> role names (...that should be granted to it; may but don't have to include common roles)
     mutable std::map<UUID, String> granted_role_names;          // (currently granted) role id -> its name
diff --git a/src/Access/LDAPClient.cpp b/src/Access/LDAPClient.cpp
index 41756aebb9a..5c4b7dd8d99 100644
--- a/src/Access/LDAPClient.cpp
+++ b/src/Access/LDAPClient.cpp
@@ -5,6 +5,7 @@
 
 #include <Poco/Logger.h>
 #include <boost/algorithm/string/predicate.hpp>
+#include <boost/container_hash/hash.hpp>
 
 #include <mutex>
 #include <utility>
@@ -25,7 +26,25 @@ namespace ErrorCodes
     extern const int LDAP_ERROR;
 }
 
-LDAPClient::LDAPClient(const LDAPServerParams & params_)
+void LDAPClient::SearchParams::combineHash(std::size_t & seed) const
+{
+    boost::hash_combine(seed, base_dn);
+    boost::hash_combine(seed, static_cast<int>(scope));
+    boost::hash_combine(seed, search_filter);
+    boost::hash_combine(seed, attribute);
+    boost::hash_combine(seed, prefix);
+}
+
+void LDAPClient::Params::combineCoreHash(std::size_t & seed) const
+{
+    boost::hash_combine(seed, host);
+    boost::hash_combine(seed, port);
+    boost::hash_combine(seed, bind_dn);
+    boost::hash_combine(seed, user);
+    boost::hash_combine(seed, password);
+}
+
+LDAPClient::LDAPClient(const Params & params_)
     : params(params_)
 {
 }
@@ -143,7 +162,7 @@ void LDAPClient::openConnection()
         LDAPURLDesc url;
         std::memset(&url, 0, sizeof(url));
 
-        url.lud_scheme = const_cast<char *>(params.enable_tls == LDAPServerParams::TLSEnable::YES ? "ldaps" : "ldap");
+        url.lud_scheme = const_cast<char *>(params.enable_tls == LDAPClient::Params::TLSEnable::YES ? "ldaps" : "ldap");
         url.lud_host = const_cast<char *>(params.host.c_str());
         url.lud_port = params.port;
         url.lud_scope = LDAP_SCOPE_DEFAULT;
@@ -163,8 +182,8 @@ void LDAPClient::openConnection()
         int value = 0;
         switch (params.protocol_version)
         {
-            case LDAPServerParams::ProtocolVersion::V2: value = LDAP_VERSION2; break;
-            case LDAPServerParams::ProtocolVersion::V3: value = LDAP_VERSION3; break;
+            case LDAPClient::Params::ProtocolVersion::V2: value = LDAP_VERSION2; break;
+            case LDAPClient::Params::ProtocolVersion::V3: value = LDAP_VERSION3; break;
         }
         diag(ldap_set_option(handle, LDAP_OPT_PROTOCOL_VERSION, &value));
     }
@@ -208,11 +227,11 @@ void LDAPClient::openConnection()
         int value = 0;
         switch (params.tls_minimum_protocol_version)
         {
-            case LDAPServerParams::TLSProtocolVersion::SSL2:   value = LDAP_OPT_X_TLS_PROTOCOL_SSL2;   break;
-            case LDAPServerParams::TLSProtocolVersion::SSL3:   value = LDAP_OPT_X_TLS_PROTOCOL_SSL3;   break;
-            case LDAPServerParams::TLSProtocolVersion::TLS1_0: value = LDAP_OPT_X_TLS_PROTOCOL_TLS1_0; break;
-            case LDAPServerParams::TLSProtocolVersion::TLS1_1: value = LDAP_OPT_X_TLS_PROTOCOL_TLS1_1; break;
-            case LDAPServerParams::TLSProtocolVersion::TLS1_2: value = LDAP_OPT_X_TLS_PROTOCOL_TLS1_2; break;
+            case LDAPClient::Params::TLSProtocolVersion::SSL2:   value = LDAP_OPT_X_TLS_PROTOCOL_SSL2;   break;
+            case LDAPClient::Params::TLSProtocolVersion::SSL3:   value = LDAP_OPT_X_TLS_PROTOCOL_SSL3;   break;
+            case LDAPClient::Params::TLSProtocolVersion::TLS1_0: value = LDAP_OPT_X_TLS_PROTOCOL_TLS1_0; break;
+            case LDAPClient::Params::TLSProtocolVersion::TLS1_1: value = LDAP_OPT_X_TLS_PROTOCOL_TLS1_1; break;
+            case LDAPClient::Params::TLSProtocolVersion::TLS1_2: value = LDAP_OPT_X_TLS_PROTOCOL_TLS1_2; break;
         }
         diag(ldap_set_option(handle, LDAP_OPT_X_TLS_PROTOCOL_MIN, &value));
     }
@@ -223,10 +242,10 @@ void LDAPClient::openConnection()
         int value = 0;
         switch (params.tls_require_cert)
         {
-            case LDAPServerParams::TLSRequireCert::NEVER:  value = LDAP_OPT_X_TLS_NEVER;  break;
-            case LDAPServerParams::TLSRequireCert::ALLOW:  value = LDAP_OPT_X_TLS_ALLOW;  break;
-            case LDAPServerParams::TLSRequireCert::TRY:    value = LDAP_OPT_X_TLS_TRY;    break;
-            case LDAPServerParams::TLSRequireCert::DEMAND: value = LDAP_OPT_X_TLS_DEMAND; break;
+            case LDAPClient::Params::TLSRequireCert::NEVER:  value = LDAP_OPT_X_TLS_NEVER;  break;
+            case LDAPClient::Params::TLSRequireCert::ALLOW:  value = LDAP_OPT_X_TLS_ALLOW;  break;
+            case LDAPClient::Params::TLSRequireCert::TRY:    value = LDAP_OPT_X_TLS_TRY;    break;
+            case LDAPClient::Params::TLSRequireCert::DEMAND: value = LDAP_OPT_X_TLS_DEMAND; break;
         }
         diag(ldap_set_option(handle, LDAP_OPT_X_TLS_REQUIRE_CERT, &value));
     }
@@ -264,12 +283,12 @@ void LDAPClient::openConnection()
     }
 #endif
 
-    if (params.enable_tls == LDAPServerParams::TLSEnable::YES_STARTTLS)
+    if (params.enable_tls == LDAPClient::Params::TLSEnable::YES_STARTTLS)
         diag(ldap_start_tls_s(handle, nullptr, nullptr));
 
     switch (params.sasl_mechanism)
     {
-        case LDAPServerParams::SASLMechanism::SIMPLE:
+        case LDAPClient::Params::SASLMechanism::SIMPLE:
         {
             const auto escaped_user_name = escapeForLDAP(params.user);
             const auto bind_dn = replacePlaceholders(params.bind_dn, { {"{user_name}", escaped_user_name} });
@@ -299,19 +318,19 @@ void LDAPClient::closeConnection() noexcept
     handle = nullptr;
 }
 
-LDAPSearchResults LDAPClient::search(const LDAPSearchParams & search_params)
+LDAPClient::SearchResults LDAPClient::search(const SearchParams & search_params)
 {
     std::scoped_lock lock(ldap_global_mutex);
 
-    LDAPSearchResults result;
+    SearchResults result;
 
     int scope = 0;
     switch (search_params.scope)
     {
-        case LDAPSearchParams::Scope::BASE:      scope = LDAP_SCOPE_BASE;     break;
-        case LDAPSearchParams::Scope::ONE_LEVEL: scope = LDAP_SCOPE_ONELEVEL; break;
-        case LDAPSearchParams::Scope::SUBTREE:   scope = LDAP_SCOPE_SUBTREE;  break;
-        case LDAPSearchParams::Scope::CHILDREN:  scope = LDAP_SCOPE_CHILDREN; break;
+        case SearchParams::Scope::BASE:      scope = LDAP_SCOPE_BASE;     break;
+        case SearchParams::Scope::ONE_LEVEL: scope = LDAP_SCOPE_ONELEVEL; break;
+        case SearchParams::Scope::SUBTREE:   scope = LDAP_SCOPE_SUBTREE;  break;
+        case SearchParams::Scope::CHILDREN:  scope = LDAP_SCOPE_CHILDREN; break;
     }
 
     const auto escaped_user_name = escapeForLDAP(params.user);
@@ -452,7 +471,7 @@ LDAPSearchResults LDAPClient::search(const LDAPSearchParams & search_params)
     return result;
 }
 
-bool LDAPSimpleAuthClient::authenticate(const LDAPSearchParamsList * search_params, LDAPSearchResultsList * search_results)
+bool LDAPSimpleAuthClient::authenticate(const SearchParamsList * search_params, SearchResultsList * search_results)
 {
     if (params.user.empty())
         throw Exception("LDAP authentication of a user with empty name is not allowed", ErrorCodes::BAD_ARGUMENTS);
@@ -508,12 +527,12 @@ void LDAPClient::closeConnection() noexcept
 {
 }
 
-LDAPSearchResults LDAPClient::search(const LDAPSearchParams &)
+LDAPClient::SearchResults LDAPClient::search(const SearchParams &)
 {
     throw Exception("ClickHouse was built without LDAP support", ErrorCodes::FEATURE_IS_NOT_ENABLED_AT_BUILD_TIME);
 }
 
-bool LDAPSimpleAuthClient::authenticate(const LDAPSearchParamsList *, LDAPSearchResultsList *)
+bool LDAPSimpleAuthClient::authenticate(const SearchParamsList *, SearchResultsList *)
 {
     throw Exception("ClickHouse was built without LDAP support", ErrorCodes::FEATURE_IS_NOT_ENABLED_AT_BUILD_TIME);
 }
diff --git a/src/Access/LDAPClient.h b/src/Access/LDAPClient.h
index f0ace69649b..4fc97bb957b 100644
--- a/src/Access/LDAPClient.h
+++ b/src/Access/LDAPClient.h
@@ -4,7 +4,6 @@
 #   include "config_core.h"
 #endif
 
-#include <Access/LDAPParams.h>
 #include <common/types.h>
 
 #if USE_LDAP
@@ -14,6 +13,10 @@
 #   define MAYBE_NORETURN [[noreturn]]
 #endif
 
+#include <chrono>
+#include <set>
+#include <vector>
+
 
 namespace DB
 {
@@ -21,7 +24,98 @@ namespace DB
 class LDAPClient
 {
 public:
-    explicit LDAPClient(const LDAPServerParams & params_);
+    struct SearchParams
+    {
+        enum class Scope
+        {
+            BASE,
+            ONE_LEVEL,
+            SUBTREE,
+            CHILDREN
+        };
+
+        String base_dn;
+        Scope scope = Scope::SUBTREE;
+        String search_filter;
+        String attribute = "cn";
+        String prefix;
+
+        void combineHash(std::size_t & seed) const;
+    };
+
+    using SearchParamsList = std::vector<SearchParams>;
+    using SearchResults = std::set<String>;
+    using SearchResultsList = std::vector<SearchResults>;
+
+    struct Params
+    {
+        enum class ProtocolVersion
+        {
+            V2,
+            V3
+        };
+
+        enum class TLSEnable
+        {
+            NO,
+            YES_STARTTLS,
+            YES
+        };
+
+        enum class TLSProtocolVersion
+        {
+            SSL2,
+            SSL3,
+            TLS1_0,
+            TLS1_1,
+            TLS1_2
+        };
+
+        enum class TLSRequireCert
+        {
+            NEVER,
+            ALLOW,
+            TRY,
+            DEMAND
+        };
+
+        enum class SASLMechanism
+        {
+            UNKNOWN,
+            SIMPLE
+        };
+
+        ProtocolVersion protocol_version = ProtocolVersion::V3;
+
+        String host;
+        std::uint16_t port = 636;
+
+        TLSEnable enable_tls = TLSEnable::YES;
+        TLSProtocolVersion tls_minimum_protocol_version = TLSProtocolVersion::TLS1_2;
+        TLSRequireCert tls_require_cert = TLSRequireCert::DEMAND;
+        String tls_cert_file;
+        String tls_key_file;
+        String tls_ca_cert_file;
+        String tls_ca_cert_dir;
+        String tls_cipher_suite;
+
+        SASLMechanism sasl_mechanism = SASLMechanism::SIMPLE;
+
+        String bind_dn;
+        String user;
+        String password;
+
+        std::chrono::seconds verification_cooldown{0};
+
+        std::chrono::seconds operation_timeout{40};
+        std::chrono::seconds network_timeout{30};
+        std::chrono::seconds search_timeout{20};
+        std::uint32_t search_limit = 100;
+
+        void combineCoreHash(std::size_t & seed) const;
+    };
+
+    explicit LDAPClient(const Params & params_);
     ~LDAPClient();
 
     LDAPClient(const LDAPClient &) = delete;
@@ -33,10 +127,10 @@ protected:
     MAYBE_NORETURN void diag(const int rc, String text = "");
     MAYBE_NORETURN void openConnection();
     void closeConnection() noexcept;
-    LDAPSearchResults search(const LDAPSearchParams & search_params);
+    SearchResults search(const SearchParams & search_params);
 
 protected:
-    const LDAPServerParams params;
+    const Params params;
 #if USE_LDAP
     LDAP * handle = nullptr;
 #endif
@@ -47,7 +141,7 @@ class LDAPSimpleAuthClient
 {
 public:
     using LDAPClient::LDAPClient;
-    bool authenticate(const LDAPSearchParamsList * search_params, LDAPSearchResultsList * search_results);
+    bool authenticate(const SearchParamsList * search_params, SearchResultsList * search_results);
 };
 
 }
diff --git a/src/Access/LDAPParams.h b/src/Access/LDAPParams.h
deleted file mode 100644
index 5181b2d1621..00000000000
--- a/src/Access/LDAPParams.h
+++ /dev/null
@@ -1,120 +0,0 @@
-#pragma once
-
-#include <common/types.h>
-
-#include <boost/container_hash/hash.hpp>
-
-#include <chrono>
-#include <set>
-#include <vector>
-
-
-namespace DB
-{
-
-struct LDAPSearchParams
-{
-    enum class Scope
-    {
-        BASE,
-        ONE_LEVEL,
-        SUBTREE,
-        CHILDREN
-    };
-
-    String base_dn;
-    Scope scope = Scope::SUBTREE;
-    String search_filter;
-    String attribute = "cn";
-    String prefix;
-
-    void combineHash(std::size_t & seed) const
-    {
-        boost::hash_combine(seed, base_dn);
-        boost::hash_combine(seed, static_cast<int>(scope));
-        boost::hash_combine(seed, search_filter);
-        boost::hash_combine(seed, attribute);
-        boost::hash_combine(seed, prefix);
-    }
-};
-
-using LDAPSearchParamsList = std::vector<LDAPSearchParams>;
-using LDAPSearchResults = std::set<String>;
-using LDAPSearchResultsList = std::vector<LDAPSearchResults>;
-
-struct LDAPServerParams
-{
-    enum class ProtocolVersion
-    {
-        V2,
-        V3
-    };
-
-    enum class TLSEnable
-    {
-        NO,
-        YES_STARTTLS,
-        YES
-    };
-
-    enum class TLSProtocolVersion
-    {
-        SSL2,
-        SSL3,
-        TLS1_0,
-        TLS1_1,
-        TLS1_2
-    };
-
-    enum class TLSRequireCert
-    {
-        NEVER,
-        ALLOW,
-        TRY,
-        DEMAND
-    };
-
-    enum class SASLMechanism
-    {
-        UNKNOWN,
-        SIMPLE
-    };
-
-    ProtocolVersion protocol_version = ProtocolVersion::V3;
-
-    String host;
-    std::uint16_t port = 636;
-
-    TLSEnable enable_tls = TLSEnable::YES;
-    TLSProtocolVersion tls_minimum_protocol_version = TLSProtocolVersion::TLS1_2;
-    TLSRequireCert tls_require_cert = TLSRequireCert::DEMAND;
-    String tls_cert_file;
-    String tls_key_file;
-    String tls_ca_cert_file;
-    String tls_ca_cert_dir;
-    String tls_cipher_suite;
-
-    SASLMechanism sasl_mechanism = SASLMechanism::SIMPLE;
-
-    String bind_dn;
-    String user;
-    String password;
-
-    std::chrono::seconds verification_cooldown{0};
-
-    std::chrono::seconds operation_timeout{40};
-    std::chrono::seconds network_timeout{30};
-    std::chrono::seconds search_timeout{20};
-    std::uint32_t search_limit = 100;
-
-    void combineCoreHash(std::size_t & seed) const
-    {
-        boost::hash_combine(seed, host);
-        boost::hash_combine(seed, port);
-        boost::hash_combine(seed, bind_dn);
-        boost::hash_combine(seed, user);
-        boost::hash_combine(seed, password);
-    }
-};
-
-}
diff --git a/src/Access/MultipleAccessStorage.cpp b/src/Access/MultipleAccessStorage.cpp
index a8ce3f602ed..15281d8c471 100644
--- a/src/Access/MultipleAccessStorage.cpp
+++ b/src/Access/MultipleAccessStorage.cpp
@@ -1,4 +1,5 @@
 #include <Access/MultipleAccessStorage.h>
+#include <Access/Credentials.h>
 #include <Common/Exception.h>
 #include <ext/range.h>
 #include <boost/range/adaptor/map.hpp>
@@ -382,6 +383,7 @@ void MultipleAccessStorage::updateSubscriptionsToNestedStorages(std::unique_lock
 
     /// Lock the mutex again to store added subscriptions to the nested storages.
     lock.lock();
+
     for (auto type : ext::range(EntityType::MAX))
     {
         if (!added_subscriptions[static_cast<size_t>(type)].empty())
@@ -399,25 +401,24 @@ void MultipleAccessStorage::updateSubscriptionsToNestedStorages(std::unique_lock
     }
 
     lock.unlock();
-    added_subscriptions->clear();
 }
 
 
-UUID MultipleAccessStorage::loginImpl(const String & user_name, const String & password, const Poco::Net::IPAddress & address, const ExternalAuthenticators & external_authenticators) const
+UUID MultipleAccessStorage::loginImpl(const Credentials & credentials, const Poco::Net::IPAddress & address, const ExternalAuthenticators & external_authenticators) const
 {
     auto storages = getStoragesInternal();
     for (const auto & storage : *storages)
     {
         try
         {
-            auto id = storage->login(user_name, password, address, external_authenticators, /* replace_exception_with_cannot_authenticate = */ false);
+            auto id = storage->login(credentials, address, external_authenticators, /* replace_exception_with_cannot_authenticate = */ false);
             std::lock_guard lock{mutex};
             ids_cache.set(id, storage);
             return id;
         }
         catch (...)
         {
-            if (!storage->find(EntityType::USER, user_name))
+            if (!storage->find(EntityType::USER, credentials.getUserName()))
             {
                 /// The authentication failed because there no users with such name in the `storage`
                 /// thus we can try to search in other nested storages.
@@ -426,7 +427,7 @@ UUID MultipleAccessStorage::loginImpl(const String & user_name, const String & p
             throw;
         }
     }
-    throwNotFound(EntityType::USER, user_name);
+    throwNotFound(EntityType::USER, credentials.getUserName());
 }
 
 
diff --git a/src/Access/MultipleAccessStorage.h b/src/Access/MultipleAccessStorage.h
index 8844de8c029..610bf2fadcc 100644
--- a/src/Access/MultipleAccessStorage.h
+++ b/src/Access/MultipleAccessStorage.h
@@ -48,7 +48,7 @@ protected:
     ext::scope_guard subscribeForChangesImpl(EntityType type, const OnChangedHandler & handler) const override;
     bool hasSubscriptionImpl(const UUID & id) const override;
     bool hasSubscriptionImpl(EntityType type) const override;
-    UUID loginImpl(const String & user_name, const String & password, const Poco::Net::IPAddress & address, const ExternalAuthenticators & external_authenticators) const override;
+    UUID loginImpl(const Credentials & credentials, const Poco::Net::IPAddress & address, const ExternalAuthenticators & external_authenticators) const override;
     UUID getIDOfLoggedUserImpl(const String & user_name) const override;
 
 private:
diff --git a/src/Access/RoleCache.cpp b/src/Access/RoleCache.cpp
index f386044bbf7..8fa3d51f867 100644
--- a/src/Access/RoleCache.cpp
+++ b/src/Access/RoleCache.cpp
@@ -46,10 +46,10 @@ namespace
         roles_info.access.makeUnion(role->access);
         roles_info.settings_from_enabled_roles.merge(role->settings);
 
-        for (const auto & granted_role : role->granted_roles.roles)
+        for (const auto & granted_role : role->granted_roles.getGranted())
             collectRoles(roles_info, skip_ids, get_role_function, granted_role, false, false);
 
-        for (const auto & granted_role : role->granted_roles.roles_with_admin_option)
+        for (const auto & granted_role : role->granted_roles.getGrantedWithAdminOption())
             collectRoles(roles_info, skip_ids, get_role_function, granted_role, false, true);
     }
 }
@@ -63,15 +63,15 @@ RoleCache::~RoleCache() = default;
 
 
 std::shared_ptr<const EnabledRoles>
-RoleCache::getEnabledRoles(const boost::container::flat_set<UUID> & roles, const boost::container::flat_set<UUID> & roles_with_admin_option)
+RoleCache::getEnabledRoles(const std::vector<UUID> & roles, const std::vector<UUID> & roles_with_admin_option)
 {
     /// Declared before `lock` to send notifications after the mutex will be unlocked.
     ext::scope_guard notifications;
 
     std::lock_guard lock{mutex};
     EnabledRoles::Params params;
-    params.current_roles = roles;
-    params.current_roles_with_admin_option = roles_with_admin_option;
+    params.current_roles.insert(roles.begin(), roles.end());
+    params.current_roles_with_admin_option.insert(roles_with_admin_option.begin(), roles_with_admin_option.end());
     auto it = enabled_roles.find(params);
     if (it != enabled_roles.end())
     {
diff --git a/src/Access/RoleCache.h b/src/Access/RoleCache.h
index cc6c8599f27..b3f426debcb 100644
--- a/src/Access/RoleCache.h
+++ b/src/Access/RoleCache.h
@@ -20,7 +20,8 @@ public:
     ~RoleCache();
 
     std::shared_ptr<const EnabledRoles> getEnabledRoles(
-        const boost::container::flat_set<UUID> & current_roles, const boost::container::flat_set<UUID> & current_roles_with_admin_option);
+        const std::vector<UUID> & current_roles,
+        const std::vector<UUID> & current_roles_with_admin_option);
 
 private:
     void collectEnabledRoles(ext::scope_guard & notifications);
diff --git a/src/Access/RolesOrUsersSet.cpp b/src/Access/RolesOrUsersSet.cpp
index cb0beb42700..ebd4f0f7a40 100644
--- a/src/Access/RolesOrUsersSet.cpp
+++ b/src/Access/RolesOrUsersSet.cpp
@@ -72,20 +72,20 @@ void RolesOrUsersSet::init(const ASTRolesOrUsersSet & ast, const AccessControlMa
         if (ast.id_mode)
             return parse<UUID>(name);
         assert(manager);
-        if (ast.allow_user_names && ast.allow_role_names)
+        if (ast.allow_users && ast.allow_roles)
         {
             auto id = manager->find<User>(name);
             if (id)
                 return *id;
             return manager->getID<Role>(name);
         }
-        else if (ast.allow_user_names)
+        else if (ast.allow_users)
         {
             return manager->getID<User>(name);
         }
         else
         {
-            assert(ast.allow_role_names);
+            assert(ast.allow_roles);
             return manager->getID<Role>(name);
         }
     };
@@ -106,8 +106,8 @@ void RolesOrUsersSet::init(const ASTRolesOrUsersSet & ast, const AccessControlMa
     if (!ast.except_names.empty())
     {
         except_ids.reserve(ast.except_names.size());
-        for (const String & except_name : ast.except_names)
-            except_ids.insert(name_to_id(except_name));
+        for (const String & name : ast.except_names)
+            except_ids.insert(name_to_id(name));
     }
 
     if (ast.except_current_user)
@@ -116,8 +116,8 @@ void RolesOrUsersSet::init(const ASTRolesOrUsersSet & ast, const AccessControlMa
         except_ids.insert(*current_user_id);
     }
 
-    for (const UUID & except_id : except_ids)
-        ids.erase(except_id);
+    for (const UUID & id : except_ids)
+        ids.erase(id);
 }
 
 
@@ -127,7 +127,7 @@ std::shared_ptr<ASTRolesOrUsersSet> RolesOrUsersSet::toAST() const
     ast->id_mode = true;
     ast->all = all;
 
-    if (!ids.empty())
+    if (!ids.empty() && !all)
     {
         ast->names.reserve(ids.size());
         for (const UUID & id : ids)
@@ -152,7 +152,7 @@ std::shared_ptr<ASTRolesOrUsersSet> RolesOrUsersSet::toASTWithNames(const Access
     auto ast = std::make_shared<ASTRolesOrUsersSet>();
     ast->all = all;
 
-    if (!ids.empty())
+    if (!ids.empty() && !all)
     {
         ast->names.reserve(ids.size());
         for (const UUID & id : ids)
@@ -194,44 +194,6 @@ String RolesOrUsersSet::toStringWithNames(const AccessControlManager & manager)
 }
 
 
-Strings RolesOrUsersSet::toStringsWithNames(const AccessControlManager & manager) const
-{
-    if (!all && ids.empty())
-        return {};
-
-    Strings res;
-    res.reserve(ids.size() + except_ids.size());
-
-    if (all)
-        res.emplace_back("ALL");
-    else
-    {
-        for (const UUID & id : ids)
-        {
-            auto name = manager.tryReadName(id);
-            if (name)
-                res.emplace_back(std::move(*name));
-        }
-        std::sort(res.begin(), res.end());
-    }
-
-    if (!except_ids.empty())
-    {
-        res.emplace_back("EXCEPT");
-        size_t old_size = res.size();
-        for (const UUID & id : except_ids)
-        {
-            auto name = manager.tryReadName(id);
-            if (name)
-                res.emplace_back(std::move(*name));
-        }
-        std::sort(res.begin() + old_size, res.end());
-    }
-
-    return res;
-}
-
-
 bool RolesOrUsersSet::empty() const
 {
     return ids.empty() && !all;
@@ -248,14 +210,18 @@ void RolesOrUsersSet::clear()
 
 void RolesOrUsersSet::add(const UUID & id)
 {
-    ids.insert(id);
+    if (!all)
+        ids.insert(id);
+    except_ids.erase(id);
 }
 
 
 void RolesOrUsersSet::add(const std::vector<UUID> & ids_)
 {
+    if (!all)
+        ids.insert(ids_.begin(), ids_.end());
     for (const auto & id : ids_)
-        add(id);
+        except_ids.erase(id);
 }
 
 
diff --git a/src/Access/RolesOrUsersSet.h b/src/Access/RolesOrUsersSet.h
index bae7f52a574..0d8983c2ec3 100644
--- a/src/Access/RolesOrUsersSet.h
+++ b/src/Access/RolesOrUsersSet.h
@@ -13,7 +13,8 @@ class AccessControlManager;
 
 
 /// Represents a set of users/roles like
-/// {user_name | role_name | CURRENT_USER} [,...] | NONE | ALL | ALL EXCEPT {user_name | role_name | CURRENT_USER} [,...]
+/// {user_name | role_name | CURRENT_USER | ALL | NONE} [,...]
+/// [EXCEPT {user_name | role_name | CURRENT_USER | ALL | NONE} [,...]]
 /// Similar to ASTRolesOrUsersSet, but with IDs instead of names.
 struct RolesOrUsersSet
 {
@@ -60,8 +61,8 @@ struct RolesOrUsersSet
     friend bool operator ==(const RolesOrUsersSet & lhs, const RolesOrUsersSet & rhs);
     friend bool operator !=(const RolesOrUsersSet & lhs, const RolesOrUsersSet & rhs) { return !(lhs == rhs); }
 
-    boost::container::flat_set<UUID> ids;
     bool all = false;
+    boost::container::flat_set<UUID> ids;
     boost::container::flat_set<UUID> except_ids;
 
 private:
diff --git a/src/Access/User.cpp b/src/Access/User.cpp
index f57ec7c1359..016f378e83f 100644
--- a/src/Access/User.cpp
+++ b/src/Access/User.cpp
@@ -11,7 +11,7 @@ bool User::equal(const IAccessEntity & other) const
     const auto & other_user = typeid_cast<const User &>(other);
     return (authentication == other_user.authentication) && (allowed_client_hosts == other_user.allowed_client_hosts)
         && (access == other_user.access) && (granted_roles == other_user.granted_roles) && (default_roles == other_user.default_roles)
-        && (settings == other_user.settings);
+        && (settings == other_user.settings) && (grantees == other_user.grantees);
 }
 
 }
diff --git a/src/Access/User.h b/src/Access/User.h
index 13f1e532015..5b10d953fc0 100644
--- a/src/Access/User.h
+++ b/src/Access/User.h
@@ -21,6 +21,7 @@ struct User : public IAccessEntity
     GrantedRoles granted_roles;
     RolesOrUsersSet default_roles = RolesOrUsersSet::AllTag{};
     SettingsProfileElements settings;
+    RolesOrUsersSet grantees = RolesOrUsersSet::AllTag{};
 
     bool equal(const IAccessEntity & other) const override;
     std::shared_ptr<IAccessEntity> clone() const override { return cloneImpl<User>(); }
diff --git a/src/Access/UsersConfigAccessStorage.cpp b/src/Access/UsersConfigAccessStorage.cpp
index b3f151c3030..407c3679e9f 100644
--- a/src/Access/UsersConfigAccessStorage.cpp
+++ b/src/Access/UsersConfigAccessStorage.cpp
@@ -62,14 +62,15 @@ namespace
         bool has_password_sha256_hex = config.has(user_config + ".password_sha256_hex");
         bool has_password_double_sha1_hex = config.has(user_config + ".password_double_sha1_hex");
         bool has_ldap = config.has(user_config + ".ldap");
+        bool has_kerberos = config.has(user_config + ".kerberos");
 
-        size_t num_password_fields = has_no_password + has_password_plaintext + has_password_sha256_hex + has_password_double_sha1_hex + has_ldap;
+        size_t num_password_fields = has_no_password + has_password_plaintext + has_password_sha256_hex + has_password_double_sha1_hex + has_ldap + has_kerberos;
         if (num_password_fields > 1)
-            throw Exception("More than one field of 'password', 'password_sha256_hex', 'password_double_sha1_hex', 'no_password', 'ldap' are used to specify password for user " + user_name + ". Must be only one of them.",
+            throw Exception("More than one field of 'password', 'password_sha256_hex', 'password_double_sha1_hex', 'no_password', 'ldap', 'kerberos' are used to specify password for user " + user_name + ". Must be only one of them.",
                 ErrorCodes::BAD_ARGUMENTS);
 
         if (num_password_fields < 1)
-            throw Exception("Either 'password' or 'password_sha256_hex' or 'password_double_sha1_hex' or 'no_password' or 'ldap' must be specified for user " + user_name + ".", ErrorCodes::BAD_ARGUMENTS);
+            throw Exception("Either 'password' or 'password_sha256_hex' or 'password_double_sha1_hex' or 'no_password' or 'ldap' or 'kerberos' must be specified for user " + user_name + ".", ErrorCodes::BAD_ARGUMENTS);
 
         if (has_password_plaintext)
         {
@@ -96,8 +97,15 @@ namespace
             if (ldap_server_name.empty())
                 throw Exception("LDAP server name cannot be empty for user " + user_name + ".", ErrorCodes::BAD_ARGUMENTS);
 
-            user->authentication = Authentication{Authentication::LDAP_SERVER};
-            user->authentication.setServerName(ldap_server_name);
+            user->authentication = Authentication{Authentication::LDAP};
+            user->authentication.setLDAPServerName(ldap_server_name);
+        }
+        else if (has_kerberos)
+        {
+            const auto realm = config.getString(user_config + ".kerberos.realm", "");
+
+            user->authentication = Authentication{Authentication::KERBEROS};
+            user->authentication.setKerberosRealm(realm);
         }
 
         const auto profile_name_config = user_config + ".profile";
@@ -518,7 +526,7 @@ void UsersConfigAccessStorage::load(
         preprocessed_dir,
         zkutil::ZooKeeperNodeCache(get_zookeeper_function),
         std::make_shared<Poco::Event>(),
-        [&](Poco::AutoPtr<Poco::Util::AbstractConfiguration> new_config)
+        [&](Poco::AutoPtr<Poco::Util::AbstractConfiguration> new_config, bool /*initial_loading*/)
         {
             parseFromConfig(*new_config);
             Settings::checkNoSettingNamesAtTopLevel(*new_config, users_config_path);
diff --git a/src/Access/ya.make b/src/Access/ya.make
index b4469aa3167..e8584230538 100644
--- a/src/Access/ya.make
+++ b/src/Access/ya.make
@@ -15,6 +15,7 @@ SRCS(
     AllowedClientHosts.cpp
     Authentication.cpp
     ContextAccess.cpp
+    Credentials.cpp
     DiskAccessStorage.cpp
     EnabledQuota.cpp
     EnabledRoles.cpp
@@ -22,6 +23,7 @@ SRCS(
     EnabledRowPolicies.cpp
     EnabledSettings.cpp
     ExternalAuthenticators.cpp
+    GSSAcceptor.cpp
     GrantedRoles.cpp
     IAccessEntity.cpp
     IAccessStorage.cpp
diff --git a/src/AggregateFunctions/AggregateFunctionAggThrow.cpp b/src/AggregateFunctions/AggregateFunctionAggThrow.cpp
index c699dd4f217..09e343b2dc5 100644
--- a/src/AggregateFunctions/AggregateFunctionAggThrow.cpp
+++ b/src/AggregateFunctions/AggregateFunctionAggThrow.cpp
@@ -60,6 +60,8 @@ public:
         return std::make_shared<DataTypeUInt8>();
     }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void create(AggregateDataPtr __restrict place) const override
     {
         if (std::uniform_real_distribution<>(0.0, 1.0)(thread_local_rng) <= throw_probability)
diff --git a/src/AggregateFunctions/AggregateFunctionArgMinMax.h b/src/AggregateFunctions/AggregateFunctionArgMinMax.h
index b559c1c8a7e..9efc907aed3 100644
--- a/src/AggregateFunctions/AggregateFunctionArgMinMax.h
+++ b/src/AggregateFunctions/AggregateFunctionArgMinMax.h
@@ -39,6 +39,8 @@ class AggregateFunctionArgMinMax final : public IAggregateFunctionTupleArgHelper
 private:
     const DataTypePtr & type_res;
     const DataTypePtr & type_val;
+    const SerializationPtr serialization_res;
+    const SerializationPtr serialization_val;
     bool tuple_argument;
 
     using Base = IAggregateFunctionTupleArgHelper<Data, AggregateFunctionArgMinMax<Data>, 2>;
@@ -48,6 +50,8 @@ public:
         : Base({type_res_, type_val_}, {}, tuple_argument_)
         , type_res(this->argument_types[0])
         , type_val(this->argument_types[1])
+        , serialization_res(type_res->getDefaultSerialization())
+        , serialization_val(type_val->getDefaultSerialization())
     {
         if (!type_val->isComparable())
             throw Exception(
@@ -84,14 +88,14 @@ public:
 
     void serialize(ConstAggregateDataPtr __restrict place, WriteBuffer & buf) const override
     {
-        this->data(place).result.write(buf, *type_res);
-        this->data(place).value.write(buf, *type_val);
+        this->data(place).result.write(buf, *serialization_res);
+        this->data(place).value.write(buf, *serialization_val);
     }
 
     void deserialize(AggregateDataPtr __restrict place, ReadBuffer & buf, Arena * arena) const override
     {
-        this->data(place).result.read(buf, *type_res, arena);
-        this->data(place).value.read(buf, *type_val, arena);
+        this->data(place).result.read(buf, *serialization_res, arena);
+        this->data(place).value.read(buf, *serialization_val, arena);
     }
 
     bool allocatesMemoryInArena() const override { return Data::allocatesMemoryInArena(); }
diff --git a/src/AggregateFunctions/AggregateFunctionAvg.h b/src/AggregateFunctions/AggregateFunctionAvg.h
index 7bf742294b4..8a6491d9b61 100644
--- a/src/AggregateFunctions/AggregateFunctionAvg.h
+++ b/src/AggregateFunctions/AggregateFunctionAvg.h
@@ -96,7 +96,9 @@ public:
         UInt32 num_scale_ = 0, UInt32 denom_scale_ = 0)
         : Base(argument_types_, {}), num_scale(num_scale_), denom_scale(denom_scale_) {}
 
-    DataTypePtr getReturnType() const final { return std::make_shared<DataTypeNumber<Float64>>(); }
+    DataTypePtr getReturnType() const override { return std::make_shared<DataTypeNumber<Float64>>(); }
+
+    bool allocatesMemoryInArena() const override { return false; }
 
     void NO_SANITIZE_UNDEFINED merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, Arena *) const override
     {
diff --git a/src/AggregateFunctions/AggregateFunctionBitwise.h b/src/AggregateFunctions/AggregateFunctionBitwise.h
index 3ba8e045069..b48b1960329 100644
--- a/src/AggregateFunctions/AggregateFunctionBitwise.h
+++ b/src/AggregateFunctions/AggregateFunctionBitwise.h
@@ -54,6 +54,8 @@ public:
         return std::make_shared<DataTypeNumber<T>>();
     }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const override
     {
         this->data(place).update(assert_cast<const ColumnVector<T> &>(*columns[0]).getData()[row_num]);
diff --git a/src/AggregateFunctions/AggregateFunctionBoundingRatio.h b/src/AggregateFunctions/AggregateFunctionBoundingRatio.h
index 32ae22fd573..0cfb33efc10 100644
--- a/src/AggregateFunctions/AggregateFunctionBoundingRatio.h
+++ b/src/AggregateFunctions/AggregateFunctionBoundingRatio.h
@@ -127,6 +127,8 @@ public:
         return std::make_shared<DataTypeFloat64>();
     }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void add(AggregateDataPtr __restrict place, const IColumn ** columns, const size_t row_num, Arena *) const override
     {
         /// NOTE Slightly inefficient.
diff --git a/src/AggregateFunctions/AggregateFunctionCategoricalInformationValue.h b/src/AggregateFunctions/AggregateFunctionCategoricalInformationValue.h
index ba8acb208ea..fb3e35fbcf1 100644
--- a/src/AggregateFunctions/AggregateFunctionCategoricalInformationValue.h
+++ b/src/AggregateFunctions/AggregateFunctionCategoricalInformationValue.h
@@ -33,6 +33,8 @@ public:
         return "categoricalInformationValue";
     }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void create(AggregateDataPtr __restrict place) const override
     {
         memset(place, 0, sizeOfData());
diff --git a/src/AggregateFunctions/AggregateFunctionCombinatorFactory.cpp b/src/AggregateFunctions/AggregateFunctionCombinatorFactory.cpp
index a20d355bb2f..e4ff8c134c5 100644
--- a/src/AggregateFunctions/AggregateFunctionCombinatorFactory.cpp
+++ b/src/AggregateFunctions/AggregateFunctionCombinatorFactory.cpp
@@ -13,17 +13,25 @@ namespace ErrorCodes
 
 void AggregateFunctionCombinatorFactory::registerCombinator(const AggregateFunctionCombinatorPtr & value)
 {
-    if (!dict.emplace(value->getName(), value).second)
-        throw Exception("AggregateFunctionCombinatorFactory: the name '" + value->getName() + "' is not unique",
-            ErrorCodes::LOGICAL_ERROR);
+    CombinatorPair pair{
+        .name = value->getName(),
+        .combinator_ptr = value,
+    };
+
+    /// lower_bound() cannot be used since sort order of the dict is by length of the combinator
+    /// but there are just a few combiners, so not a problem.
+    if (std::find(dict.begin(), dict.end(), pair) != dict.end())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "AggregateFunctionCombinatorFactory: the name '{}' is not unique",
+            value->getName());
+    dict.emplace(std::lower_bound(dict.begin(), dict.end(), pair), pair);
 }
 
 AggregateFunctionCombinatorPtr AggregateFunctionCombinatorFactory::tryFindSuffix(const std::string & name) const
 {
     /// O(N) is ok for just a few combinators.
     for (const auto & suffix_value : dict)
-        if (endsWith(name, suffix_value.first))
-            return suffix_value.second;
+        if (endsWith(name, suffix_value.name))
+            return suffix_value.combinator_ptr;
     return {};
 }
 
diff --git a/src/AggregateFunctions/AggregateFunctionCombinatorFactory.h b/src/AggregateFunctions/AggregateFunctionCombinatorFactory.h
index b535475d111..5f7658c16af 100644
--- a/src/AggregateFunctions/AggregateFunctionCombinatorFactory.h
+++ b/src/AggregateFunctions/AggregateFunctionCombinatorFactory.h
@@ -15,7 +15,17 @@ namespace DB
 class AggregateFunctionCombinatorFactory final: private boost::noncopyable
 {
 private:
-    using Dict = std::unordered_map<std::string, AggregateFunctionCombinatorPtr>;
+    struct CombinatorPair
+    {
+        std::string name;
+        AggregateFunctionCombinatorPtr combinator_ptr;
+
+        bool operator==(const CombinatorPair & rhs) const { return name == rhs.name; }
+        /// Sort by the length of the combinator name for proper tryFindSuffix()
+        /// for combiners with common prefix (i.e. "State" and "SimpleState").
+        bool operator<(const CombinatorPair & rhs) const { return name.length() > rhs.name.length(); }
+    };
+    using Dict = std::vector<CombinatorPair>;
     Dict dict;
 
 public:
diff --git a/src/AggregateFunctions/AggregateFunctionCount.h b/src/AggregateFunctions/AggregateFunctionCount.h
index 1b3a0acb528..71db28390af 100644
--- a/src/AggregateFunctions/AggregateFunctionCount.h
+++ b/src/AggregateFunctions/AggregateFunctionCount.h
@@ -38,6 +38,8 @@ public:
         return std::make_shared<DataTypeUInt64>();
     }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void add(AggregateDataPtr __restrict place, const IColumn **, size_t, Arena *) const override
     {
         ++data(place).count;
@@ -126,6 +128,8 @@ public:
         return std::make_shared<DataTypeUInt64>();
     }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const override
     {
         data(place).count += !assert_cast<const ColumnNullable &>(*columns[0]).isNullAt(row_num);
diff --git a/src/AggregateFunctions/AggregateFunctionDeltaSum.h b/src/AggregateFunctions/AggregateFunctionDeltaSum.h
index d5760de84ae..99406618da5 100644
--- a/src/AggregateFunctions/AggregateFunctionDeltaSum.h
+++ b/src/AggregateFunctions/AggregateFunctionDeltaSum.h
@@ -43,6 +43,8 @@ public:
 
     DataTypePtr getReturnType() const override { return std::make_shared<DataTypeNumber<T>>(); }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void NO_SANITIZE_UNDEFINED ALWAYS_INLINE add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const override
     {
         auto value = assert_cast<const ColumnVector<T> &>(*columns[0]).getData()[row_num];
diff --git a/src/AggregateFunctions/AggregateFunctionEntropy.h b/src/AggregateFunctions/AggregateFunctionEntropy.h
index 9bb1bc039c5..587f5aa3fc7 100644
--- a/src/AggregateFunctions/AggregateFunctionEntropy.h
+++ b/src/AggregateFunctions/AggregateFunctionEntropy.h
@@ -103,6 +103,8 @@ public:
         return std::make_shared<DataTypeNumber<Float64>>();
     }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const override
     {
         if constexpr (!std::is_same_v<UInt128, Value>)
diff --git a/src/AggregateFunctions/AggregateFunctionFactory.cpp b/src/AggregateFunctions/AggregateFunctionFactory.cpp
index 061077dd8fa..eec8b374424 100644
--- a/src/AggregateFunctions/AggregateFunctionFactory.cpp
+++ b/src/AggregateFunctions/AggregateFunctionFactory.cpp
@@ -106,6 +106,7 @@ AggregateFunctionPtr AggregateFunctionFactory::getImpl(
     bool has_null_arguments) const
 {
     String name = getAliasToOrName(name_param);
+    bool is_case_insensitive = false;
     Value found;
 
     /// Find by exact match.
@@ -115,9 +116,12 @@ AggregateFunctionPtr AggregateFunctionFactory::getImpl(
     }
 
     if (auto jt = case_insensitive_aggregate_functions.find(Poco::toLower(name)); jt != case_insensitive_aggregate_functions.end())
+    {
         found = jt->second;
+        is_case_insensitive = true;
+    }
 
-    const Context * query_context = nullptr;
+    ContextPtr query_context;
     if (CurrentThread::isInitialized())
         query_context = CurrentThread::get().getQueryContext();
 
@@ -126,7 +130,8 @@ AggregateFunctionPtr AggregateFunctionFactory::getImpl(
         out_properties = found.properties;
 
         if (query_context && query_context->getSettingsRef().log_queries)
-            query_context->addQueryFactoriesInfo(Context::QueryLogFactories::AggregateFunction, name);
+            query_context->addQueryFactoriesInfo(
+                    Context::QueryLogFactories::AggregateFunction, is_case_insensitive ? Poco::toLower(name) : name);
 
         /// The case when aggregate function should return NULL on NULL arguments. This case is handled in "get" method.
         if (!out_properties.returns_default_when_only_null && has_null_arguments)
diff --git a/src/AggregateFunctions/AggregateFunctionGroupArrayInsertAt.h b/src/AggregateFunctions/AggregateFunctionGroupArrayInsertAt.h
index 42005659a36..723ee7140bc 100644
--- a/src/AggregateFunctions/AggregateFunctionGroupArrayInsertAt.h
+++ b/src/AggregateFunctions/AggregateFunctionGroupArrayInsertAt.h
@@ -55,7 +55,8 @@ class AggregateFunctionGroupArrayInsertAtGeneric final
     : public IAggregateFunctionDataHelper<AggregateFunctionGroupArrayInsertAtDataGeneric, AggregateFunctionGroupArrayInsertAtGeneric>
 {
 private:
-    DataTypePtr & type;
+    DataTypePtr type;
+    SerializationPtr serialization;
     Field default_value;
     UInt64 length_to_resize = 0;    /// zero means - do not do resizing.
 
@@ -63,6 +64,7 @@ public:
     AggregateFunctionGroupArrayInsertAtGeneric(const DataTypes & arguments, const Array & params)
         : IAggregateFunctionDataHelper<AggregateFunctionGroupArrayInsertAtDataGeneric, AggregateFunctionGroupArrayInsertAtGeneric>(arguments, params)
         , type(argument_types[0])
+        , serialization(type->getDefaultSerialization())
     {
         if (!params.empty())
         {
@@ -102,6 +104,8 @@ public:
         return std::make_shared<DataTypeArray>(type);
     }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const override
     {
         /// TODO Do positions need to be 1-based for this function?
@@ -154,7 +158,7 @@ public:
             else
             {
                 writeBinary(UInt8(0), buf);
-                type->serializeBinary(elem, buf);
+                serialization->serializeBinary(elem, buf);
             }
         }
     }
@@ -175,7 +179,7 @@ public:
             UInt8 is_null = 0;
             readBinary(is_null, buf);
             if (!is_null)
-                type->deserializeBinary(arr[i], buf);
+                serialization->deserializeBinary(arr[i], buf);
         }
     }
 
diff --git a/src/AggregateFunctions/AggregateFunctionGroupBitmap.h b/src/AggregateFunctions/AggregateFunctionGroupBitmap.h
index 4628410286d..83db274752b 100644
--- a/src/AggregateFunctions/AggregateFunctionGroupBitmap.h
+++ b/src/AggregateFunctions/AggregateFunctionGroupBitmap.h
@@ -22,6 +22,8 @@ public:
 
     DataTypePtr getReturnType() const override { return std::make_shared<DataTypeNumber<T>>(); }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const override
     {
         this->data(place).rbs.add(assert_cast<const ColumnVector<T> &>(*columns[0]).getData()[row_num]);
@@ -56,6 +58,8 @@ public:
 
     DataTypePtr getReturnType() const override { return std::make_shared<DataTypeNumber<T>>(); }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const override
     {
         Data & data_lhs = this->data(place);
diff --git a/src/AggregateFunctions/AggregateFunctionGroupUniqArray.h b/src/AggregateFunctions/AggregateFunctionGroupUniqArray.h
index 435efdd2373..16911184f31 100644
--- a/src/AggregateFunctions/AggregateFunctionGroupUniqArray.h
+++ b/src/AggregateFunctions/AggregateFunctionGroupUniqArray.h
@@ -59,6 +59,8 @@ public:
         return std::make_shared<DataTypeArray>(this->argument_types[0]);
     }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const override
     {
         if (limit_num_elems && this->data(place).value.size() >= max_elems)
diff --git a/src/AggregateFunctions/AggregateFunctionHistogram.h b/src/AggregateFunctions/AggregateFunctionHistogram.h
index 76aa96ba663..c44cb61b275 100644
--- a/src/AggregateFunctions/AggregateFunctionHistogram.h
+++ b/src/AggregateFunctions/AggregateFunctionHistogram.h
@@ -332,6 +332,8 @@ public:
         return std::make_shared<DataTypeArray>(tuple);
     }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const override
     {
         auto val = assert_cast<const ColumnVector<T> &>(*columns[0]).getData()[row_num];
diff --git a/src/AggregateFunctions/AggregateFunctionMLMethod.cpp b/src/AggregateFunctions/AggregateFunctionMLMethod.cpp
index 6c5c5af2f1d..145660e881b 100644
--- a/src/AggregateFunctions/AggregateFunctionMLMethod.cpp
+++ b/src/AggregateFunctions/AggregateFunctionMLMethod.cpp
@@ -146,7 +146,7 @@ void LinearModelData::predict(
     const ColumnsWithTypeAndName & arguments,
     size_t offset,
     size_t limit,
-    const Context & context) const
+    ContextPtr context) const
 {
     gradient_computer->predict(container, arguments, offset, limit, weights, bias, context);
 }
@@ -453,7 +453,7 @@ void LogisticRegression::predict(
     size_t limit,
     const std::vector<Float64> & weights,
     Float64 bias,
-    const Context & /*context*/) const
+    ContextPtr /*context*/) const
 {
     size_t rows_num = arguments.front().column->size();
 
@@ -521,7 +521,7 @@ void LinearRegression::predict(
     size_t limit,
     const std::vector<Float64> & weights,
     Float64 bias,
-    const Context & /*context*/) const
+    ContextPtr /*context*/) const
 {
     if (weights.size() + 1 != arguments.size())
     {
diff --git a/src/AggregateFunctions/AggregateFunctionMLMethod.h b/src/AggregateFunctions/AggregateFunctionMLMethod.h
index 0c88f9d877d..6d97feb3193 100644
--- a/src/AggregateFunctions/AggregateFunctionMLMethod.h
+++ b/src/AggregateFunctions/AggregateFunctionMLMethod.h
@@ -3,10 +3,10 @@
 #include <Columns/ColumnVector.h>
 #include <Columns/ColumnsCommon.h>
 #include <Columns/ColumnsNumber.h>
-#include <Common/typeid_cast.h>
-#include <DataTypes/DataTypesNumber.h>
-#include <DataTypes/DataTypeTuple.h>
 #include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeTuple.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Common/typeid_cast.h>
 #include "IAggregateFunction.h"
 
 namespace DB
@@ -44,7 +44,7 @@ public:
         size_t limit,
         const std::vector<Float64> & weights,
         Float64 bias,
-        const Context & context) const = 0;
+        ContextPtr context) const = 0;
 };
 
 
@@ -69,7 +69,7 @@ public:
         size_t limit,
         const std::vector<Float64> & weights,
         Float64 bias,
-        const Context & context) const override;
+        ContextPtr context) const override;
 };
 
 
@@ -94,7 +94,7 @@ public:
         size_t limit,
         const std::vector<Float64> & weights,
         Float64 bias,
-        const Context & context) const override;
+        ContextPtr context) const override;
 };
 
 
@@ -264,7 +264,7 @@ public:
         const ColumnsWithTypeAndName & arguments,
         size_t offset,
         size_t limit,
-        const Context & context) const;
+        ContextPtr context) const;
 
     void returnWeights(IColumn & to) const;
 private:
@@ -323,6 +323,8 @@ public:
         return std::make_shared<DataTypeArray>(std::make_shared<DataTypeFloat64>());
     }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     /// This function is called from evalMLMethod function for correct predictValues call
     DataTypePtr getReturnTypeToPredict() const override
     {
@@ -363,7 +365,7 @@ public:
         const ColumnsWithTypeAndName & arguments,
         size_t offset,
         size_t limit,
-        const Context & context) const override
+        ContextPtr context) const override
     {
         if (arguments.size() != param_num + 1)
             throw Exception(
diff --git a/src/AggregateFunctions/AggregateFunctionMannWhitney.h b/src/AggregateFunctions/AggregateFunctionMannWhitney.h
index 1451536d519..7efdebf1639 100644
--- a/src/AggregateFunctions/AggregateFunctionMannWhitney.h
+++ b/src/AggregateFunctions/AggregateFunctionMannWhitney.h
@@ -174,6 +174,8 @@ public:
         return "mannWhitneyUTest";
     }
 
+    bool allocatesMemoryInArena() const override { return true; }
+
     DataTypePtr getReturnType() const override
     {
         DataTypes types
@@ -208,7 +210,7 @@ public:
     void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, Arena * arena) const override
     {
         auto & a = this->data(place);
-        auto & b = this->data(rhs);
+        const auto & b = this->data(rhs);
 
         a.merge(b, arena);
     }
diff --git a/src/AggregateFunctions/AggregateFunctionMaxIntersections.h b/src/AggregateFunctions/AggregateFunctionMaxIntersections.h
index d4946ad2c9d..94509a40ada 100644
--- a/src/AggregateFunctions/AggregateFunctionMaxIntersections.h
+++ b/src/AggregateFunctions/AggregateFunctionMaxIntersections.h
@@ -87,6 +87,8 @@ public:
             return std::make_shared<DataTypeNumber<PointType>>();
     }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena * arena) const override
     {
         PointType left = assert_cast<const ColumnVector<PointType> &>(*columns[0]).getData()[row_num];
diff --git a/src/AggregateFunctions/AggregateFunctionMinMaxAny.h b/src/AggregateFunctions/AggregateFunctionMinMaxAny.h
index a39d9af000b..919026a78c1 100644
--- a/src/AggregateFunctions/AggregateFunctionMinMaxAny.h
+++ b/src/AggregateFunctions/AggregateFunctionMinMaxAny.h
@@ -50,14 +50,14 @@ public:
             assert_cast<ColVecType &>(to).insertDefault();
     }
 
-    void write(WriteBuffer & buf, const IDataType & /*data_type*/) const
+    void write(WriteBuffer & buf, const ISerialization & /*serialization*/) const
     {
         writeBinary(has(), buf);
         if (has())
             writeBinary(value, buf);
     }
 
-    void read(ReadBuffer & buf, const IDataType & /*data_type*/, Arena *)
+    void read(ReadBuffer & buf, const ISerialization & /*serialization*/, Arena *)
     {
         readBinary(has_value, buf);
         if (has())
@@ -221,14 +221,14 @@ public:
             assert_cast<ColumnString &>(to).insertDefault();
     }
 
-    void write(WriteBuffer & buf, const IDataType & /*data_type*/) const
+    void write(WriteBuffer & buf, const ISerialization & /*serialization*/) const
     {
         writeBinary(size, buf);
         if (has())
             buf.write(getData(), size);
     }
 
-    void read(ReadBuffer & buf, const IDataType & /*data_type*/, Arena * arena)
+    void read(ReadBuffer & buf, const ISerialization & /*serialization*/, Arena * arena)
     {
         Int32 rhs_size;
         readBinary(rhs_size, buf);
@@ -427,24 +427,24 @@ public:
             to.insertDefault();
     }
 
-    void write(WriteBuffer & buf, const IDataType & data_type) const
+    void write(WriteBuffer & buf, const ISerialization & serialization) const
     {
         if (!value.isNull())
         {
             writeBinary(true, buf);
-            data_type.serializeBinary(value, buf);
+            serialization.serializeBinary(value, buf);
         }
         else
             writeBinary(false, buf);
     }
 
-    void read(ReadBuffer & buf, const IDataType & data_type, Arena *)
+    void read(ReadBuffer & buf, const ISerialization & serialization, Arena *)
     {
         bool is_not_null;
         readBinary(is_not_null, buf);
 
         if (is_not_null)
-            data_type.deserializeBinary(value, buf);
+            serialization.deserializeBinary(value, buf);
     }
 
     void change(const IColumn & column, size_t row_num, Arena *)
@@ -678,15 +678,15 @@ struct AggregateFunctionAnyHeavyData : Data
         return false;
     }
 
-    void write(WriteBuffer & buf, const IDataType & data_type) const
+    void write(WriteBuffer & buf, const ISerialization & serialization) const
     {
-        Data::write(buf, data_type);
+        Data::write(buf, serialization);
         writeBinary(counter, buf);
     }
 
-    void read(ReadBuffer & buf, const IDataType & data_type, Arena * arena)
+    void read(ReadBuffer & buf, const ISerialization & serialization, Arena * arena)
     {
-        Data::read(buf, data_type, arena);
+        Data::read(buf, serialization, arena);
         readBinary(counter, buf);
     }
 
@@ -698,12 +698,14 @@ template <typename Data>
 class AggregateFunctionsSingleValue final : public IAggregateFunctionDataHelper<Data, AggregateFunctionsSingleValue<Data>>
 {
 private:
-    DataTypePtr & type;
+    DataTypePtr type;
+    SerializationPtr serialization;
 
 public:
     AggregateFunctionsSingleValue(const DataTypePtr & type_)
         : IAggregateFunctionDataHelper<Data, AggregateFunctionsSingleValue<Data>>({type_}, {})
         , type(this->argument_types[0])
+        , serialization(type->getDefaultSerialization())
     {
         if (StringRef(Data::name()) == StringRef("min")
             || StringRef(Data::name()) == StringRef("max"))
@@ -733,12 +735,12 @@ public:
 
     void serialize(ConstAggregateDataPtr __restrict place, WriteBuffer & buf) const override
     {
-        this->data(place).write(buf, *type.get());
+        this->data(place).write(buf, *serialization);
     }
 
     void deserialize(AggregateDataPtr __restrict place, ReadBuffer & buf, Arena * arena) const override
     {
-        this->data(place).read(buf, *type.get(), arena);
+        this->data(place).read(buf, *serialization, arena);
     }
 
     bool allocatesMemoryInArena() const override
diff --git a/src/AggregateFunctions/AggregateFunctionNothing.h b/src/AggregateFunctions/AggregateFunctionNothing.h
index f373b3b55b0..a094c1e0fac 100644
--- a/src/AggregateFunctions/AggregateFunctionNothing.h
+++ b/src/AggregateFunctions/AggregateFunctionNothing.h
@@ -28,6 +28,8 @@ public:
         return argument_types.front();
     }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void create(AggregateDataPtr) const override
     {
     }
diff --git a/src/AggregateFunctions/AggregateFunctionOrFill.h b/src/AggregateFunctions/AggregateFunctionOrFill.h
index 93fe84a036a..4bb25e0d4de 100644
--- a/src/AggregateFunctions/AggregateFunctionOrFill.h
+++ b/src/AggregateFunctions/AggregateFunctionOrFill.h
@@ -110,7 +110,7 @@ public:
             const auto & flags = assert_cast<const ColumnUInt8 &>(*columns[if_argument_pos]).getData();
             for (size_t i = 0; i < batch_size; ++i)
             {
-                if (flags[i])
+                if (flags[i] && places[i])
                     add(places[i] + place_offset, columns, i, arena);
             }
         }
@@ -118,7 +118,8 @@ public:
         {
             nested_function->addBatch(batch_size, places, place_offset, columns, arena, if_argument_pos);
             for (size_t i = 0; i < batch_size; ++i)
-                (places[i] + place_offset)[size_of_data] = 1;
+                if (places[i])
+                    (places[i] + place_offset)[size_of_data] = 1;
         }
     }
 
diff --git a/src/AggregateFunctions/AggregateFunctionQuantile.h b/src/AggregateFunctions/AggregateFunctionQuantile.h
index edd24add736..209784361dd 100644
--- a/src/AggregateFunctions/AggregateFunctionQuantile.h
+++ b/src/AggregateFunctions/AggregateFunctionQuantile.h
@@ -103,6 +103,8 @@ public:
             return res;
     }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const override
     {
         auto value = static_cast<const ColVecType &>(*columns[0]).getData()[row_num];
diff --git a/src/AggregateFunctions/AggregateFunctionRankCorrelation.h b/src/AggregateFunctions/AggregateFunctionRankCorrelation.h
index a7e0852378c..fbba1b99ab9 100644
--- a/src/AggregateFunctions/AggregateFunctionRankCorrelation.h
+++ b/src/AggregateFunctions/AggregateFunctionRankCorrelation.h
@@ -58,6 +58,8 @@ public:
         return "rankCorr";
     }
 
+    bool allocatesMemoryInArena() const override { return true; }
+
     DataTypePtr getReturnType() const override
     {
         return std::make_shared<DataTypeNumber<Float64>>();
diff --git a/src/AggregateFunctions/AggregateFunctionRetention.h b/src/AggregateFunctions/AggregateFunctionRetention.h
index 5f0d9907280..aee74cb7324 100644
--- a/src/AggregateFunctions/AggregateFunctionRetention.h
+++ b/src/AggregateFunctions/AggregateFunctionRetention.h
@@ -94,6 +94,8 @@ public:
         return std::make_shared<DataTypeArray>(std::make_shared<DataTypeUInt8>());
     }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void add(AggregateDataPtr __restrict place, const IColumn ** columns, const size_t row_num, Arena *) const override
     {
         for (const auto i : ext::range(0, events_size))
diff --git a/src/AggregateFunctions/AggregateFunctionSequenceMatch.h b/src/AggregateFunctions/AggregateFunctionSequenceMatch.h
index 48015a6d282..2c2a4d4c75a 100644
--- a/src/AggregateFunctions/AggregateFunctionSequenceMatch.h
+++ b/src/AggregateFunctions/AggregateFunctionSequenceMatch.h
@@ -560,6 +560,8 @@ public:
 
     DataTypePtr getReturnType() const override { return std::make_shared<DataTypeUInt8>(); }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena *) const override
     {
         this->data(place).sort();
@@ -588,6 +590,8 @@ public:
 
     DataTypePtr getReturnType() const override { return std::make_shared<DataTypeUInt64>(); }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena *) const override
     {
         this->data(place).sort();
diff --git a/src/AggregateFunctions/AggregateFunctionSimpleLinearRegression.h b/src/AggregateFunctions/AggregateFunctionSimpleLinearRegression.h
index 8c029855a26..61f10895de6 100644
--- a/src/AggregateFunctions/AggregateFunctionSimpleLinearRegression.h
+++ b/src/AggregateFunctions/AggregateFunctionSimpleLinearRegression.h
@@ -168,6 +168,8 @@ public:
         );
     }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void insertResultInto(
         AggregateDataPtr place,
         IColumn & to,
diff --git a/src/AggregateFunctions/AggregateFunctionStatistics.h b/src/AggregateFunctions/AggregateFunctionStatistics.h
index 76b6e843c15..473bce1d89a 100644
--- a/src/AggregateFunctions/AggregateFunctionStatistics.h
+++ b/src/AggregateFunctions/AggregateFunctionStatistics.h
@@ -123,6 +123,8 @@ public:
         return std::make_shared<DataTypeFloat64>();
     }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const override
     {
         this->data(place).update(*columns[0], row_num);
@@ -375,6 +377,8 @@ public:
         return std::make_shared<DataTypeFloat64>();
     }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const override
     {
         this->data(place).update(*columns[0], *columns[1], row_num);
diff --git a/src/AggregateFunctions/AggregateFunctionStatisticsSimple.h b/src/AggregateFunctions/AggregateFunctionStatisticsSimple.h
index 9903e2f6eaa..a5d6bbb7dc8 100644
--- a/src/AggregateFunctions/AggregateFunctionStatisticsSimple.h
+++ b/src/AggregateFunctions/AggregateFunctionStatisticsSimple.h
@@ -121,6 +121,8 @@ public:
         return std::make_shared<DataTypeNumber<ResultType>>();
     }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const override
     {
         if constexpr (StatFunc::num_args == 2)
diff --git a/src/AggregateFunctions/AggregateFunctionSum.h b/src/AggregateFunctions/AggregateFunctionSum.h
index bd1f9fc302e..1748458f6d8 100644
--- a/src/AggregateFunctions/AggregateFunctionSum.h
+++ b/src/AggregateFunctions/AggregateFunctionSum.h
@@ -314,6 +314,8 @@ public:
             return std::make_shared<ResultDataType>();
     }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const override
     {
         const auto & column = assert_cast<const ColVecType &>(*columns[0]);
diff --git a/src/AggregateFunctions/AggregateFunctionSumCount.cpp b/src/AggregateFunctions/AggregateFunctionSumCount.cpp
new file mode 100644
index 00000000000..b979779d907
--- /dev/null
+++ b/src/AggregateFunctions/AggregateFunctionSumCount.cpp
@@ -0,0 +1,49 @@
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/AggregateFunctionSumCount.h>
+#include <AggregateFunctions/Helpers.h>
+#include <AggregateFunctions/FactoryHelpers.h>
+#include "registerAggregateFunctions.h"
+
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+}
+
+namespace
+{
+bool allowType(const DataTypePtr& type) noexcept
+{
+    const WhichDataType t(type);
+    return t.isInt() || t.isUInt() || t.isFloat() || t.isDecimal();
+}
+
+AggregateFunctionPtr createAggregateFunctionSumCount(const std::string & name, const DataTypes & argument_types, const Array & parameters)
+{
+    assertNoParameters(name, parameters);
+    assertUnary(name, argument_types);
+
+    AggregateFunctionPtr res;
+    DataTypePtr data_type = argument_types[0];
+    if (!allowType(data_type))
+        throw Exception("Illegal type " + data_type->getName() + " of argument for aggregate function " + name,
+            ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+
+    if (isDecimal(data_type))
+        res.reset(createWithDecimalType<AggregateFunctionSumCount>(
+            *data_type, argument_types, getDecimalScale(*data_type)));
+    else
+        res.reset(createWithNumericType<AggregateFunctionSumCount>(*data_type, argument_types));
+
+    return res;
+}
+
+}
+
+void registerAggregateFunctionSumCount(AggregateFunctionFactory & factory)
+{
+    factory.registerFunction("sumCount", createAggregateFunctionSumCount);
+}
+
+}
diff --git a/src/AggregateFunctions/AggregateFunctionSumCount.h b/src/AggregateFunctions/AggregateFunctionSumCount.h
new file mode 100644
index 00000000000..1026b6272ba
--- /dev/null
+++ b/src/AggregateFunctions/AggregateFunctionSumCount.h
@@ -0,0 +1,55 @@
+#pragma once
+
+#include <type_traits>
+#include <DataTypes/DataTypeTuple.h>
+#include <AggregateFunctions/AggregateFunctionAvg.h>
+
+
+namespace DB
+{
+template <typename T>
+using DecimalOrNumberDataType = std::conditional_t<IsDecimalNumber<T>, DataTypeDecimal<AvgFieldType<T>>, DataTypeNumber<AvgFieldType<T>>>;
+template <typename T>
+class AggregateFunctionSumCount final : public AggregateFunctionAvgBase<AvgFieldType<T>, UInt64, AggregateFunctionSumCount<T>>
+{
+public:
+    using Base = AggregateFunctionAvgBase<AvgFieldType<T>, UInt64, AggregateFunctionSumCount<T>>;
+
+    AggregateFunctionSumCount(const DataTypes & argument_types_, UInt32 num_scale_ = 0)
+         : Base(argument_types_, num_scale_), scale(num_scale_) {}
+
+    DataTypePtr getReturnType() const override
+    {
+        DataTypes types;
+        if constexpr (IsDecimalNumber<T>)
+            types.emplace_back(std::make_shared<DecimalOrNumberDataType<T>>(DecimalOrNumberDataType<T>::maxPrecision(), scale));
+        else
+            types.emplace_back(std::make_shared<DecimalOrNumberDataType<T>>());
+
+        types.emplace_back(std::make_shared<DataTypeUInt64>());
+
+        return std::make_shared<DataTypeTuple>(types);
+    }
+
+    void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena *) const final
+    {
+        assert_cast<DecimalOrVectorCol<AvgFieldType<T>> &>((assert_cast<ColumnTuple &>(to)).getColumn(0)).getData().push_back(
+            this->data(place).numerator);
+
+        assert_cast<ColumnUInt64 &>((assert_cast<ColumnTuple &>(to)).getColumn(1)).getData().push_back(
+            this->data(place).denominator);
+    }
+
+    void NO_SANITIZE_UNDEFINED add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const final
+    {
+        this->data(place).numerator += static_cast<const DecimalOrVectorCol<T> &>(*columns[0]).getData()[row_num];
+        ++this->data(place).denominator;
+    }
+
+    String getName() const final { return "sumCount"; }
+
+private:
+    UInt32 scale;
+};
+
+}
diff --git a/src/AggregateFunctions/AggregateFunctionSumMap.h b/src/AggregateFunctions/AggregateFunctionSumMap.h
index f6a473546f9..7819bb8752c 100644
--- a/src/AggregateFunctions/AggregateFunctionSumMap.h
+++ b/src/AggregateFunctions/AggregateFunctionSumMap.h
@@ -64,7 +64,9 @@ class AggregateFunctionMapBase : public IAggregateFunctionDataHelper<
 {
 private:
     DataTypePtr keys_type;
+    SerializationPtr keys_serialization;
     DataTypes values_types;
+    Serializations values_serializations;
 
 public:
     using Base = IAggregateFunctionDataHelper<
@@ -72,9 +74,14 @@ public:
 
     AggregateFunctionMapBase(const DataTypePtr & keys_type_,
             const DataTypes & values_types_, const DataTypes & argument_types_)
-        : Base(argument_types_, {} /* parameters */), keys_type(keys_type_),
-          values_types(values_types_)
+        : Base(argument_types_, {} /* parameters */)
+        , keys_type(keys_type_)
+        , keys_serialization(keys_type->getDefaultSerialization())
+        , values_types(values_types_)
     {
+        values_serializations.reserve(values_types.size());
+        for (const auto & type : values_types)
+            values_serializations.emplace_back(type->getDefaultSerialization());
     }
 
     DataTypePtr getReturnType() const override
@@ -118,6 +125,8 @@ public:
                 WhichDataType value_type_to_check(value_type);
 
                 /// Do not promote decimal because of implementation issues of this function design
+                /// Currently we cannot get result column type in case of decimal we cannot get decimal scale
+                /// in method void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena *) const override
                 /// If we decide to make this function more efficient we should promote decimal type during summ
                 if (value_type_to_check.isDecimal())
                     result_type = value_type_without_nullable;
@@ -131,6 +140,8 @@ public:
         return std::make_shared<DataTypeTuple>(types);
     }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     static const auto & getArgumentColumns(const IColumn**& columns)
     {
         if constexpr (tuple_argument)
@@ -246,9 +257,9 @@ public:
 
         for (const auto & elem : merged_maps)
         {
-            keys_type->serializeBinary(elem.first, buf);
+            keys_serialization->serializeBinary(elem.first, buf);
             for (size_t col = 0; col < values_types.size(); ++col)
-                values_types[col]->serializeBinary(elem.second[col], buf);
+                values_serializations[col]->serializeBinary(elem.second[col], buf);
         }
     }
 
@@ -261,12 +272,12 @@ public:
         for (size_t i = 0; i < size; ++i)
         {
             Field key;
-            keys_type->deserializeBinary(key, buf);
+            keys_serialization->deserializeBinary(key, buf);
 
             Array values;
             values.resize(values_types.size());
             for (size_t col = 0; col < values_types.size(); ++col)
-                values_types[col]->deserializeBinary(values[col], buf);
+                values_serializations[col]->deserializeBinary(values[col], buf);
 
             if constexpr (IsDecimalNumber<T>)
                 merged_maps[key.get<DecimalField<T>>()] = values;
@@ -411,7 +422,7 @@ public:
 
         for (const Field & f : keys_to_keep_)
         {
-            keys_to_keep.emplace(f.safeGet<NearestFieldType<T>>());
+            keys_to_keep.emplace(f.safeGet<T>());
         }
     }
 
diff --git a/src/AggregateFunctions/AggregateFunctionTTest.h b/src/AggregateFunctions/AggregateFunctionTTest.h
index 3c9873ebd1e..5617adf38dd 100644
--- a/src/AggregateFunctions/AggregateFunctionTTest.h
+++ b/src/AggregateFunctions/AggregateFunctionTTest.h
@@ -109,6 +109,8 @@ public:
         );
     }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const override
     {
         Float64 value = columns[0]->getFloat64(row_num);
diff --git a/src/AggregateFunctions/AggregateFunctionTopK.h b/src/AggregateFunctions/AggregateFunctionTopK.h
index 43320a96b99..dbc471687ea 100644
--- a/src/AggregateFunctions/AggregateFunctionTopK.h
+++ b/src/AggregateFunctions/AggregateFunctionTopK.h
@@ -50,6 +50,8 @@ public:
         return std::make_shared<DataTypeArray>(this->argument_types[0]);
     }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const override
     {
         auto & set = this->data(place).value;
diff --git a/src/AggregateFunctions/AggregateFunctionUniq.h b/src/AggregateFunctions/AggregateFunctionUniq.h
index 4e27922ba7c..253af6e2895 100644
--- a/src/AggregateFunctions/AggregateFunctionUniq.h
+++ b/src/AggregateFunctions/AggregateFunctionUniq.h
@@ -210,6 +210,8 @@ public:
         return std::make_shared<DataTypeUInt64>();
     }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     /// ALWAYS_INLINE is required to have better code layout for uniqHLL12 function
     void ALWAYS_INLINE add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const override
     {
@@ -265,6 +267,8 @@ public:
         return std::make_shared<DataTypeUInt64>();
     }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const override
     {
         this->data(place).set.insert(typename Data::Set::value_type(
diff --git a/src/AggregateFunctions/AggregateFunctionUniqCombined.h b/src/AggregateFunctions/AggregateFunctionUniqCombined.h
index c9327594670..31bd8021dcf 100644
--- a/src/AggregateFunctions/AggregateFunctionUniqCombined.h
+++ b/src/AggregateFunctions/AggregateFunctionUniqCombined.h
@@ -141,6 +141,8 @@ public:
         return std::make_shared<DataTypeUInt64>();
     }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const override
     {
         if constexpr (!std::is_same_v<T, String>)
@@ -211,6 +213,8 @@ public:
         return std::make_shared<DataTypeUInt64>();
     }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const override
     {
         this->data(place).set.insert(typename AggregateFunctionUniqCombinedData<UInt64, K, HashValueType>::Set::value_type(
diff --git a/src/AggregateFunctions/AggregateFunctionUniqUpTo.h b/src/AggregateFunctions/AggregateFunctionUniqUpTo.h
index d2c765137bc..853e1cb6447 100644
--- a/src/AggregateFunctions/AggregateFunctionUniqUpTo.h
+++ b/src/AggregateFunctions/AggregateFunctionUniqUpTo.h
@@ -17,7 +17,7 @@
 #include <IO/WriteHelpers.h>
 
 
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Warray-bounds"
 #endif
@@ -184,6 +184,8 @@ public:
         return std::make_shared<DataTypeUInt64>();
     }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     /// ALWAYS_INLINE is required to have better code layout for uniqUpTo function
     void ALWAYS_INLINE add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const override
     {
@@ -247,6 +249,8 @@ public:
         return std::make_shared<DataTypeUInt64>();
     }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const override
     {
         this->data(place).insert(UInt64(UniqVariadicHash<is_exact, argument_is_tuple>::apply(num_args, columns, row_num)), threshold);
@@ -276,7 +280,7 @@ public:
 
 }
 
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic pop
 #endif
 
diff --git a/src/AggregateFunctions/AggregateFunctionWindowFunnel.cpp b/src/AggregateFunctions/AggregateFunctionWindowFunnel.cpp
index 1e9f2782d95..ed732a197a1 100644
--- a/src/AggregateFunctions/AggregateFunctionWindowFunnel.cpp
+++ b/src/AggregateFunctions/AggregateFunctionWindowFunnel.cpp
@@ -6,7 +6,6 @@
 #include <DataTypes/DataTypeDateTime.h>
 
 #include <ext/range.h>
-#include "registerAggregateFunctions.h"
 
 
 namespace DB
diff --git a/src/AggregateFunctions/AggregateFunctionWindowFunnel.h b/src/AggregateFunctions/AggregateFunctionWindowFunnel.h
index c765024507e..9f399a9f25b 100644
--- a/src/AggregateFunctions/AggregateFunctionWindowFunnel.h
+++ b/src/AggregateFunctions/AggregateFunctionWindowFunnel.h
@@ -19,22 +19,13 @@ namespace ErrorCodes
     extern const int BAD_ARGUMENTS;
 }
 
-struct ComparePair final
-{
-    template <typename T1, typename T2>
-    bool operator()(const std::pair<T1, T2> & lhs, const std::pair<T1, T2> & rhs) const
-    {
-        return lhs.first == rhs.first ? lhs.second < rhs.second : lhs.first < rhs.first;
-    }
-};
-
 static constexpr auto max_events = 32;
+
 template <typename T>
 struct AggregateFunctionWindowFunnelData
 {
     using TimestampEvent = std::pair<T, UInt8>;
     using TimestampEvents = PODArrayWithStackMemory<TimestampEvent, 64>;
-    using Comparator = ComparePair;
 
     bool sorted = true;
     TimestampEvents events_list;
@@ -46,7 +37,7 @@ struct AggregateFunctionWindowFunnelData
 
     void add(T timestamp, UInt8 event)
     {
-        // Since most events should have already been sorted by timestamp.
+        /// Since most events should have already been sorted by timestamp.
         if (sorted && events_list.size() > 0)
         {
             if (events_list.back().first == timestamp)
@@ -68,7 +59,7 @@ struct AggregateFunctionWindowFunnelData
 
         /// either sort whole container or do so partially merging ranges afterwards
         if (!sorted && !other.sorted)
-            std::stable_sort(std::begin(events_list), std::end(events_list), Comparator{});
+            std::stable_sort(std::begin(events_list), std::end(events_list));
         else
         {
             const auto begin = std::begin(events_list);
@@ -76,12 +67,12 @@ struct AggregateFunctionWindowFunnelData
             const auto end = std::end(events_list);
 
             if (!sorted)
-                std::stable_sort(begin, middle, Comparator{});
+                std::stable_sort(begin, middle);
 
             if (!other.sorted)
-                std::stable_sort(middle, end, Comparator{});
+                std::stable_sort(middle, end);
 
-            std::inplace_merge(begin, middle, end, Comparator{});
+            std::inplace_merge(begin, middle, end);
         }
 
         sorted = true;
@@ -91,7 +82,7 @@ struct AggregateFunctionWindowFunnelData
     {
         if (!sorted)
         {
-            std::stable_sort(std::begin(events_list), std::end(events_list), Comparator{});
+            std::stable_sort(std::begin(events_list), std::end(events_list));
             sorted = true;
         }
     }
@@ -145,14 +136,20 @@ class AggregateFunctionWindowFunnel final
 private:
     UInt64 window;
     UInt8 events_size;
-    UInt8 strict;   // When the 'strict' is set, it applies conditions only for the not repeating values.
-    UInt8 strict_order; // When the 'strict_order' is set, it doesn't allow interventions of other events.
-                        // In the case of 'A->B->D->C', it stops finding 'A->B->C' at the 'D' and the max event level is 2.
+    /// When the 'strict' is set, it applies conditions only for the not repeating values.
+    bool strict;
 
-    // Loop through the entire events_list, update the event timestamp value
-    // The level path must be 1---2---3---...---check_events_size, find the max event level that satisfied the path in the sliding window.
-    // If found, returns the max event level, else return 0.
-    // The Algorithm complexity is O(n).
+    /// When the 'strict_order' is set, it doesn't allow interventions of other events.
+    /// In the case of 'A->B->D->C', it stops finding 'A->B->C' at the 'D' and the max event level is 2.
+    bool strict_order;
+
+    /// Applies conditions only to events with strictly increasing timestamps
+    bool strict_increase;
+
+    /// Loop through the entire events_list, update the event timestamp value
+    /// The level path must be 1---2---3---...---check_events_size, find the max event level that satisfied the path in the sliding window.
+    /// If found, returns the max event level, else return 0.
+    /// The Algorithm complexity is O(n).
     UInt8 getEventLevel(Data & data) const
     {
         if (data.size() == 0)
@@ -162,16 +159,13 @@ private:
 
         data.sort();
 
-        /// events_timestamp stores the timestamp that latest i-th level event happen within time window after previous level event.
-        /// timestamp defaults to -1, which unsigned timestamp value never meet
-        /// there may be some bugs when UInt64 type timstamp overflows Int64, but it works on most cases.
-        std::vector<Int64> events_timestamp(events_size, -1);
+        /// events_timestamp stores the timestamp of the first and previous i-th level event happen within time window
+        std::vector<std::optional<std::pair<UInt64, UInt64>>> events_timestamp(events_size);
         bool first_event = false;
         for (const auto & pair : data.events_list)
         {
             const T & timestamp = pair.first;
             const auto & event_idx = pair.second - 1;
-
             if (strict_order && event_idx == -1)
             {
                 if (first_event)
@@ -181,31 +175,39 @@ private:
             }
             else if (event_idx == 0)
             {
-                events_timestamp[0] = timestamp;
+                events_timestamp[0] = std::make_pair(timestamp, timestamp);
                 first_event = true;
             }
-            else if (strict && events_timestamp[event_idx] >= 0)
+            else if (strict && events_timestamp[event_idx].has_value())
             {
                 return event_idx + 1;
             }
-            else if (strict_order && first_event && events_timestamp[event_idx - 1] == -1)
+            else if (strict_order && first_event && !events_timestamp[event_idx - 1].has_value())
             {
                 for (size_t event = 0; event < events_timestamp.size(); ++event)
                 {
-                    if (events_timestamp[event] == -1)
+                    if (!events_timestamp[event].has_value())
                         return event;
                 }
             }
-            else if (events_timestamp[event_idx - 1] >= 0 && timestamp <= events_timestamp[event_idx - 1] + window)
+            else if (events_timestamp[event_idx - 1].has_value())
             {
-                events_timestamp[event_idx] = events_timestamp[event_idx - 1];
-                if (event_idx + 1 == events_size)
-                    return events_size;
+                auto first_timestamp = events_timestamp[event_idx - 1]->first;
+                bool time_matched = timestamp <= first_timestamp + window;
+                if (strict_increase)
+                    time_matched = time_matched && events_timestamp[event_idx - 1]->second < timestamp;
+                if (time_matched)
+                {
+                    events_timestamp[event_idx] = std::make_pair(first_timestamp, timestamp);
+                    if (event_idx + 1 == events_size)
+                        return events_size;
+                }
             }
         }
+
         for (size_t event = events_timestamp.size(); event > 0; --event)
         {
-            if (events_timestamp[event - 1] >= 0)
+            if (events_timestamp[event - 1].has_value())
                 return event;
         }
         return 0;
@@ -223,15 +225,18 @@ public:
         events_size = arguments.size() - 1;
         window = params.at(0).safeGet<UInt64>();
 
-        strict = 0;
-        strict_order = 0;
+        strict = false;
+        strict_order = false;
+        strict_increase = false;
         for (size_t i = 1; i < params.size(); ++i)
         {
             String option = params.at(i).safeGet<String>();
-            if (option.compare("strict") == 0)
-                strict = 1;
-            else if (option.compare("strict_order") == 0)
-                strict_order = 1;
+            if (option == "strict")
+                strict = true;
+            else if (option == "strict_order")
+                strict_order = true;
+            else if (option == "strict_increase")
+                strict_increase = true;
             else
                 throw Exception{"Aggregate function " + getName() + " doesn't support a parameter: " + option, ErrorCodes::BAD_ARGUMENTS};
         }
@@ -242,6 +247,8 @@ public:
         return std::make_shared<DataTypeUInt8>();
     }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     AggregateFunctionPtr getOwnNullAdapter(
         const AggregateFunctionPtr & nested_function, const DataTypes & arguments, const Array & params,
         const AggregateFunctionProperties & /*properties*/) const override
@@ -253,7 +260,7 @@ public:
     {
         bool has_event = false;
         const auto timestamp = assert_cast<const ColumnVector<T> *>(columns[0])->getData()[row_num];
-        // reverse iteration and stable sorting are needed for events that are qualified by more than one condition.
+        /// reverse iteration and stable sorting are needed for events that are qualified by more than one condition.
         for (auto i = events_size; i > 0; --i)
         {
             auto event = assert_cast<const ColumnVector<UInt8> *>(columns[i])->getData()[row_num];
diff --git a/src/AggregateFunctions/IAggregateFunction.h b/src/AggregateFunctions/IAggregateFunction.h
index d15ff4e8a78..dbb0a9f4349 100644
--- a/src/AggregateFunctions/IAggregateFunction.h
+++ b/src/AggregateFunctions/IAggregateFunction.h
@@ -1,21 +1,23 @@
 #pragma once
 
+#include <Columns/ColumnTuple.h>
+#include <Columns/ColumnsNumber.h>
+#include <Core/Block.h>
+#include <Core/ColumnNumbers.h>
+#include <Core/Field.h>
+#include <Interpreters/Context_fwd.h>
+#include <Common/Exception.h>
+#include <common/types.h>
+
 #include <cstddef>
 #include <memory>
 #include <type_traits>
 #include <vector>
 
-#include <common/types.h>
-#include <Common/Exception.h>
-#include <Core/Block.h>
-#include <Core/ColumnNumbers.h>
-#include <Core/Field.h>
-#include <Columns/ColumnTuple.h>
-#include <Columns/ColumnsNumber.h>
-
 
 namespace DB
 {
+
 namespace ErrorCodes
 {
     extern const int NOT_IMPLEMENTED;
@@ -104,7 +106,7 @@ public:
     virtual void deserialize(AggregateDataPtr __restrict place, ReadBuffer & buf, Arena * arena) const = 0;
 
     /// Returns true if a function requires Arena to handle own states (see add(), merge(), deserialize()).
-    virtual bool allocatesMemoryInArena() const { return false; }
+    virtual bool allocatesMemoryInArena() const = 0;
 
     /// Inserts results into a column. This method might modify the state (e.g.
     /// sort an array), so must be called once, from single thread. The state
@@ -122,7 +124,7 @@ public:
         const ColumnsWithTypeAndName & /*arguments*/,
         size_t /*offset*/,
         size_t /*limit*/,
-        const Context & /*context*/) const
+        ContextPtr /*context*/) const
     {
         throw Exception("Method predictValues is not supported for " + getName(), ErrorCodes::NOT_IMPLEMENTED);
     }
@@ -267,14 +269,15 @@ public:
             const auto & flags = assert_cast<const ColumnUInt8 &>(*columns[if_argument_pos]).getData();
             for (size_t i = 0; i < batch_size; ++i)
             {
-                if (flags[i])
+                if (flags[i] && places[i])
                     static_cast<const Derived *>(this)->add(places[i] + place_offset, columns, i, arena);
             }
         }
         else
         {
             for (size_t i = 0; i < batch_size; ++i)
-                static_cast<const Derived *>(this)->add(places[i] + place_offset, columns, i, arena);
+                if (places[i])
+                    static_cast<const Derived *>(this)->add(places[i] + place_offset, columns, i, arena);
         }
     }
 
@@ -349,7 +352,8 @@ public:
         {
             size_t next_offset = offsets[i];
             for (size_t j = current_offset; j < next_offset; ++j)
-                static_cast<const Derived *>(this)->add(places[i] + place_offset, columns, j, arena);
+                if (places[i])
+                    static_cast<const Derived *>(this)->add(places[i] + place_offset, columns, j, arena);
             current_offset = next_offset;
         }
     }
diff --git a/src/AggregateFunctions/QuantileExact.h b/src/AggregateFunctions/QuantileExact.h
index bc85d5c1c28..aa7b4bbe250 100644
--- a/src/AggregateFunctions/QuantileExact.h
+++ b/src/AggregateFunctions/QuantileExact.h
@@ -121,7 +121,7 @@ struct QuantileExact : QuantileExactBase<Value, QuantileExact<Value>>
 
 /// QuantileExactExclusive is equivalent to Excel PERCENTILE.EXC, R-6, SAS-4, SciPy-(0,0)
 template <typename Value>
-/// There is no virtual-like functions. So we don't inherit from QuantileExactBase.
+/// There are no virtual-like functions. So we don't inherit from QuantileExactBase.
 struct QuantileExactExclusive : public QuantileExact<Value>
 {
     using QuantileExact<Value>::array;
@@ -189,7 +189,7 @@ struct QuantileExactExclusive : public QuantileExact<Value>
 
 /// QuantileExactInclusive is equivalent to Excel PERCENTILE and PERCENTILE.INC, R-7, SciPy-(1,1)
 template <typename Value>
-/// There is no virtual-like functions. So we don't inherit from QuantileExactBase.
+/// There are no virtual-like functions. So we don't inherit from QuantileExactBase.
 struct QuantileExactInclusive : public QuantileExact<Value>
 {
     using QuantileExact<Value>::array;
diff --git a/src/AggregateFunctions/ReservoirSamplerDeterministic.h b/src/AggregateFunctions/ReservoirSamplerDeterministic.h
index 3b7817e9308..9c62160b964 100644
--- a/src/AggregateFunctions/ReservoirSamplerDeterministic.h
+++ b/src/AggregateFunctions/ReservoirSamplerDeterministic.h
@@ -13,6 +13,7 @@
 #include <Common/NaNUtils.h>
 #include <Poco/Exception.h>
 
+
 namespace DB
 {
 namespace ErrorCodes
@@ -56,7 +57,7 @@ class ReservoirSamplerDeterministic
 {
     bool good(const UInt32 hash)
     {
-        return hash == ((hash >> skip_degree) << skip_degree);
+        return !(hash & skip_mask);
     }
 
 public:
@@ -135,11 +136,8 @@ public:
             throw Poco::Exception("Cannot merge ReservoirSamplerDeterministic's with different max sample size");
         sorted = false;
 
-        if (b.skip_degree > skip_degree)
-        {
-            skip_degree = b.skip_degree;
-            thinOut();
-        }
+        if (skip_degree < b.skip_degree)
+            setSkipDegree(b.skip_degree);
 
         for (const auto & sample : b.samples)
             if (good(sample.second))
@@ -165,6 +163,11 @@ public:
         sorted = false;
     }
 
+#if !defined(__clang__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wclass-memaccess"
+#endif
+
     void write(DB::WriteBuffer & buf) const
     {
         size_t size = samples.size();
@@ -172,9 +175,26 @@ public:
         DB::writeIntBinary<size_t>(total_values, buf);
 
         for (size_t i = 0; i < size; ++i)
-            DB::writePODBinary(samples[i], buf);
+        {
+            /// There was a mistake in this function.
+            /// Instead of correctly serializing the elements,
+            ///  it was writing them with uninitialized padding.
+            /// Here we ensure that padding is zero without changing the protocol.
+            /// TODO: After implementation of "versioning aggregate function state",
+            /// change the serialization format.
+
+            Element elem;
+            memset(&elem, 0, sizeof(elem));
+            elem = samples[i];
+
+            DB::writePODBinary(elem, buf);
+        }
     }
 
+#if !defined(__clang__)
+#pragma GCC diagnostic pop
+#endif
+
 private:
     /// We allocate some memory on the stack to avoid allocations when there are many objects with a small number of elements.
     using Element = std::pair<T, UInt32>;
@@ -184,22 +204,39 @@ private:
     size_t total_values = 0;   /// How many values were inserted (regardless if they remain in sample or not).
     bool sorted = false;
     Array samples;
-    UInt8 skip_degree = 0;     /// The number N determining that we save only one per 2^N elements in average.
+
+    /// The number N determining that we store only one per 2^N elements in average.
+    UInt8 skip_degree = 0;
+
+    /// skip_mask is calculated as (2 ^ skip_degree - 1). We store an element only if (hash & skip_mask) == 0.
+    /// For example, if skip_degree==0 then skip_mask==0 means we store each element;
+    /// if skip_degree==1 then skip_mask==0b0001 means we store one per 2 elements in average;
+    /// if skip_degree==4 then skip_mask==0b1111 means we store one per 16 elements in average.
+    UInt32 skip_mask = 0;
 
     void insertImpl(const T & v, const UInt32 hash)
     {
         /// Make a room for plus one element.
         while (samples.size() >= max_sample_size)
-        {
-            ++skip_degree;
-            if (skip_degree > detail::MAX_SKIP_DEGREE)
-                throw DB::Exception{"skip_degree exceeds maximum value", DB::ErrorCodes::MEMORY_LIMIT_EXCEEDED};
-            thinOut();
-        }
+            setSkipDegree(skip_degree + 1);
 
         samples.emplace_back(v, hash);
     }
 
+    void setSkipDegree(UInt8 skip_degree_)
+    {
+        if (skip_degree_ == skip_degree)
+            return;
+        if (skip_degree_ > detail::MAX_SKIP_DEGREE)
+            throw DB::Exception{"skip_degree exceeds maximum value", DB::ErrorCodes::MEMORY_LIMIT_EXCEEDED};
+        skip_degree = skip_degree_;
+        if (skip_degree == detail::MAX_SKIP_DEGREE)
+            skip_mask = static_cast<UInt32>(-1);
+        else
+            skip_mask = (1 << skip_degree) - 1;
+        thinOut();
+    }
+
     void thinOut()
     {
         samples.resize(std::distance(samples.begin(),
diff --git a/src/AggregateFunctions/registerAggregateFunctions.cpp b/src/AggregateFunctions/registerAggregateFunctions.cpp
index ae26fdc5d40..ceba1531e03 100644
--- a/src/AggregateFunctions/registerAggregateFunctions.cpp
+++ b/src/AggregateFunctions/registerAggregateFunctions.cpp
@@ -25,6 +25,7 @@ void registerAggregateFunctionsAny(AggregateFunctionFactory &);
 void registerAggregateFunctionsStatisticsStable(AggregateFunctionFactory &);
 void registerAggregateFunctionsStatisticsSimple(AggregateFunctionFactory &);
 void registerAggregateFunctionSum(AggregateFunctionFactory &);
+void registerAggregateFunctionSumCount(AggregateFunctionFactory &);
 void registerAggregateFunctionSumMap(AggregateFunctionFactory &);
 void registerAggregateFunctionsUniq(AggregateFunctionFactory &);
 void registerAggregateFunctionUniqCombined(AggregateFunctionFactory &);
@@ -83,6 +84,7 @@ void registerAggregateFunctions()
         registerAggregateFunctionsStatisticsStable(factory);
         registerAggregateFunctionsStatisticsSimple(factory);
         registerAggregateFunctionSum(factory);
+        registerAggregateFunctionSumCount(factory);
         registerAggregateFunctionSumMap(factory);
         registerAggregateFunctionsUniq(factory);
         registerAggregateFunctionUniqCombined(factory);
diff --git a/src/AggregateFunctions/ya.make b/src/AggregateFunctions/ya.make
index 3a8f0ad9fba..64605aee659 100644
--- a/src/AggregateFunctions/ya.make
+++ b/src/AggregateFunctions/ya.make
@@ -50,6 +50,7 @@ SRCS(
     AggregateFunctionStatisticsSimple.cpp
     AggregateFunctionStudentTTest.cpp
     AggregateFunctionSum.cpp
+    AggregateFunctionSumCount.cpp
     AggregateFunctionSumMap.cpp
     AggregateFunctionTopK.cpp
     AggregateFunctionUniq.cpp
diff --git a/src/Bridge/IBridgeHelper.cpp b/src/Bridge/IBridgeHelper.cpp
new file mode 100644
index 00000000000..16886bae4fe
--- /dev/null
+++ b/src/Bridge/IBridgeHelper.cpp
@@ -0,0 +1,132 @@
+#include "IBridgeHelper.h"
+
+#include <IO/ReadWriteBufferFromHTTP.h>
+#include <IO/ReadHelpers.h>
+#include <Poco/Net/HTTPRequest.h>
+#include <Poco/Path.h>
+#include <Poco/URI.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int EXTERNAL_SERVER_IS_NOT_RESPONDING;
+}
+
+
+Poco::URI IBridgeHelper::getMainURI() const
+{
+    auto uri = createBaseURI();
+    uri.setPath(MAIN_HANDLER);
+    return uri;
+}
+
+
+Poco::URI IBridgeHelper::getPingURI() const
+{
+    auto uri = createBaseURI();
+    uri.setPath(PING_HANDLER);
+    return uri;
+}
+
+
+bool IBridgeHelper::checkBridgeIsRunning() const
+{
+    try
+    {
+        ReadWriteBufferFromHTTP buf(
+            getPingURI(), Poco::Net::HTTPRequest::HTTP_GET, {}, ConnectionTimeouts::getHTTPTimeouts(getContext()));
+        return checkString(PING_OK_ANSWER, buf);
+    }
+    catch (...)
+    {
+        return false;
+    }
+}
+
+
+void IBridgeHelper::startBridgeSync() const
+{
+    if (!checkBridgeIsRunning())
+    {
+        LOG_TRACE(getLog(), "{} is not running, will try to start it", serviceAlias());
+        startBridge(startBridgeCommand());
+        bool started = false;
+
+        uint64_t milliseconds_to_wait = 10; /// Exponential backoff
+        uint64_t counter = 0;
+
+        while (milliseconds_to_wait < 10000)
+        {
+            ++counter;
+            LOG_TRACE(getLog(), "Checking {} is running, try {}", serviceAlias(), counter);
+
+            if (checkBridgeIsRunning())
+            {
+                started = true;
+                break;
+            }
+
+            std::this_thread::sleep_for(std::chrono::milliseconds(milliseconds_to_wait));
+            milliseconds_to_wait *= 2;
+        }
+
+        if (!started)
+            throw Exception("BridgeHelper: " + serviceAlias() + " is not responding",
+                ErrorCodes::EXTERNAL_SERVER_IS_NOT_RESPONDING);
+    }
+}
+
+
+std::unique_ptr<ShellCommand> IBridgeHelper::startBridgeCommand() const
+{
+    if (startBridgeManually())
+        throw Exception(serviceAlias() + " is not running. Please, start it manually", ErrorCodes::EXTERNAL_SERVER_IS_NOT_RESPONDING);
+
+    const auto & config = getConfig();
+    /// Path to executable folder
+    Poco::Path path{config.getString("application.dir", "/usr/bin")};
+
+    std::vector<std::string> cmd_args;
+    path.setFileName(serviceFileName());
+
+    cmd_args.push_back("--http-port");
+    cmd_args.push_back(std::to_string(config.getUInt(configPrefix() + ".port", getDefaultPort())));
+    cmd_args.push_back("--listen-host");
+    cmd_args.push_back(config.getString(configPrefix() + ".listen_host", DEFAULT_HOST));
+    cmd_args.push_back("--http-timeout");
+    cmd_args.push_back(std::to_string(getHTTPTimeout().totalMicroseconds()));
+    if (config.has("logger." + configPrefix() + "_log"))
+    {
+        cmd_args.push_back("--log-path");
+        cmd_args.push_back(config.getString("logger." + configPrefix() + "_log"));
+    }
+    if (config.has("logger." + configPrefix() + "_errlog"))
+    {
+        cmd_args.push_back("--err-log-path");
+        cmd_args.push_back(config.getString("logger." + configPrefix() + "_errlog"));
+    }
+    if (config.has("logger." + configPrefix() + "_stdout"))
+    {
+        cmd_args.push_back("--stdout-path");
+        cmd_args.push_back(config.getString("logger." + configPrefix() + "_stdout"));
+    }
+    if (config.has("logger." + configPrefix() + "_stderr"))
+    {
+        cmd_args.push_back("--stderr-path");
+        cmd_args.push_back(config.getString("logger." + configPrefix() + "_stderr"));
+    }
+    if (config.has("logger." + configPrefix() + "_level"))
+    {
+        cmd_args.push_back("--log-level");
+        cmd_args.push_back(config.getString("logger." + configPrefix() + "_level"));
+    }
+
+    LOG_TRACE(getLog(), "Starting {}", serviceAlias());
+
+    return ShellCommand::executeDirect(path.toString(), cmd_args, ShellCommandDestructorStrategy(true));
+}
+
+}
diff --git a/src/Bridge/IBridgeHelper.h b/src/Bridge/IBridgeHelper.h
new file mode 100644
index 00000000000..3473e24047e
--- /dev/null
+++ b/src/Bridge/IBridgeHelper.h
@@ -0,0 +1,69 @@
+#pragma once
+
+#include <Interpreters/Context.h>
+#include <Poco/Logger.h>
+#include <Poco/Util/AbstractConfiguration.h>
+#include <Poco/Net/HTTPRequest.h>
+#include <Common/ShellCommand.h>
+#include <IO/ConnectionTimeoutsContext.h>
+#include <common/logger_useful.h>
+
+
+namespace DB
+{
+
+/// Common base class for XDBC and Library bridge helpers.
+/// Contains helper methods to check/start bridge sync.
+class IBridgeHelper: protected WithContext
+{
+
+public:
+    static constexpr inline auto DEFAULT_HOST = "127.0.0.1";
+    static constexpr inline auto PING_HANDLER = "/ping";
+    static constexpr inline auto MAIN_HANDLER = "/";
+    static constexpr inline auto DEFAULT_FORMAT = "RowBinary";
+    static constexpr inline auto PING_OK_ANSWER = "Ok.";
+
+    static const inline std::string PING_METHOD = Poco::Net::HTTPRequest::HTTP_GET;
+    static const inline std::string MAIN_METHOD = Poco::Net::HTTPRequest::HTTP_POST;
+
+    explicit IBridgeHelper(ContextPtr context_) : WithContext(context_) {}
+    virtual ~IBridgeHelper() = default;
+
+    void startBridgeSync() const;
+
+    Poco::URI getMainURI() const;
+
+    Poco::URI getPingURI() const;
+
+
+protected:
+    /// clickhouse-odbc-bridge, clickhouse-library-bridge
+    virtual String serviceAlias() const = 0;
+
+    virtual String serviceFileName() const = 0;
+
+    virtual size_t getDefaultPort() const = 0;
+
+    virtual bool startBridgeManually() const = 0;
+
+    virtual void startBridge(std::unique_ptr<ShellCommand> cmd) const = 0;
+
+    virtual String configPrefix() const = 0;
+
+    virtual const Poco::Util::AbstractConfiguration & getConfig() const = 0;
+
+    virtual Poco::Logger * getLog() const = 0;
+
+    virtual const Poco::Timespan & getHTTPTimeout() const = 0;
+
+    virtual Poco::URI createBaseURI() const = 0;
+
+
+private:
+    bool checkBridgeIsRunning() const;
+
+    std::unique_ptr<ShellCommand> startBridgeCommand() const;
+};
+
+}
diff --git a/src/Bridge/LibraryBridgeHelper.cpp b/src/Bridge/LibraryBridgeHelper.cpp
new file mode 100644
index 00000000000..3ab01e18b11
--- /dev/null
+++ b/src/Bridge/LibraryBridgeHelper.cpp
@@ -0,0 +1,182 @@
+#include "LibraryBridgeHelper.h"
+
+#include <IO/ReadHelpers.h>
+#include <DataStreams/OneBlockInputStream.h>
+#include <DataStreams/OwningBlockInputStream.h>
+#include <Dictionaries/DictionarySourceHelpers.h>
+#include <Processors/Formats/InputStreamFromInputFormat.h>
+#include <IO/WriteBufferFromOStream.h>
+#include <IO/WriteBufferFromString.h>
+#include <Formats/FormatFactory.h>
+#include <Poco/Path.h>
+#include <Poco/Util/AbstractConfiguration.h>
+#include <Common/ShellCommand.h>
+#include <common/logger_useful.h>
+#include <ext/range.h>
+#include <Core/Field.h>
+#include <Common/escapeForFileName.h>
+
+
+namespace DB
+{
+
+LibraryBridgeHelper::LibraryBridgeHelper(
+        ContextPtr context_,
+        const Block & sample_block_,
+        const Field & dictionary_id_)
+    : IBridgeHelper(context_)
+    , log(&Poco::Logger::get("LibraryBridgeHelper"))
+    , sample_block(sample_block_)
+    , config(context_->getConfigRef())
+    , http_timeout(context_->getSettingsRef().http_receive_timeout.value.totalSeconds())
+    , dictionary_id(dictionary_id_)
+{
+    bridge_port = config.getUInt("library_bridge.port", DEFAULT_PORT);
+    bridge_host = config.getString("library_bridge.host", DEFAULT_HOST);
+}
+
+
+Poco::URI LibraryBridgeHelper::createRequestURI(const String & method) const
+{
+    auto uri = getMainURI();
+    uri.addQueryParameter("dictionary_id", toString(dictionary_id));
+    uri.addQueryParameter("method", method);
+    return uri;
+}
+
+
+Poco::URI LibraryBridgeHelper::createBaseURI() const
+{
+    Poco::URI uri;
+    uri.setHost(bridge_host);
+    uri.setPort(bridge_port);
+    uri.setScheme("http");
+    return uri;
+}
+
+
+void LibraryBridgeHelper::startBridge(std::unique_ptr<ShellCommand> cmd) const
+{
+    getContext()->addBridgeCommand(std::move(cmd));
+}
+
+
+bool LibraryBridgeHelper::initLibrary(const std::string & library_path, const std::string library_settings, const std::string attributes_names)
+{
+    startBridgeSync();
+    auto uri = createRequestURI(LIB_NEW_METHOD);
+
+    /// Sample block must contain null values
+    WriteBufferFromOwnString out;
+    auto output_stream = getContext()->getOutputStream(LibraryBridgeHelper::DEFAULT_FORMAT, out, sample_block);
+    formatBlock(output_stream, sample_block);
+    auto block_string = out.str();
+
+    auto out_stream_callback = [library_path, library_settings, attributes_names, block_string, this](std::ostream & os)
+    {
+        os << "library_path=" << escapeForFileName(library_path) << "&";
+        os << "library_settings=" << escapeForFileName(library_settings) << "&";
+        os << "attributes_names=" << escapeForFileName(attributes_names) << "&";
+        os << "sample_block=" << escapeForFileName(sample_block.getNamesAndTypesList().toString()) << "&";
+        os << "null_values=" << escapeForFileName(block_string);
+    };
+    return executeRequest(uri, out_stream_callback);
+}
+
+
+bool LibraryBridgeHelper::cloneLibrary(const Field & other_dictionary_id)
+{
+    startBridgeSync();
+    auto uri = createRequestURI(LIB_CLONE_METHOD);
+    uri.addQueryParameter("from_dictionary_id", toString(other_dictionary_id));
+    return executeRequest(uri);
+}
+
+
+bool LibraryBridgeHelper::removeLibrary()
+{
+    startBridgeSync();
+    auto uri = createRequestURI(LIB_DELETE_METHOD);
+    return executeRequest(uri);
+}
+
+
+bool LibraryBridgeHelper::isModified()
+{
+    startBridgeSync();
+    auto uri = createRequestURI(IS_MODIFIED_METHOD);
+    return executeRequest(uri);
+}
+
+
+bool LibraryBridgeHelper::supportsSelectiveLoad()
+{
+    startBridgeSync();
+    auto uri = createRequestURI(SUPPORTS_SELECTIVE_LOAD_METHOD);
+    return executeRequest(uri);
+}
+
+
+BlockInputStreamPtr LibraryBridgeHelper::loadAll()
+{
+    startBridgeSync();
+    auto uri = createRequestURI(LOAD_ALL_METHOD);
+    return loadBase(uri);
+}
+
+
+BlockInputStreamPtr LibraryBridgeHelper::loadIds(const std::string ids_string)
+{
+    startBridgeSync();
+    auto uri = createRequestURI(LOAD_IDS_METHOD);
+    return loadBase(uri, [ids_string](std::ostream & os) { os << "ids=" << ids_string; });
+}
+
+
+BlockInputStreamPtr LibraryBridgeHelper::loadKeys(const Block & requested_block)
+{
+    startBridgeSync();
+    auto uri = createRequestURI(LOAD_KEYS_METHOD);
+    /// Sample block to parse block from callback
+    uri.addQueryParameter("requested_block_sample", requested_block.getNamesAndTypesList().toString());
+    ReadWriteBufferFromHTTP::OutStreamCallback out_stream_callback = [requested_block, this](std::ostream & os)
+    {
+        WriteBufferFromOStream out_buffer(os);
+        auto output_stream = getContext()->getOutputStream(LibraryBridgeHelper::DEFAULT_FORMAT, out_buffer, sample_block);
+        formatBlock(output_stream, requested_block);
+    };
+    return loadBase(uri, out_stream_callback);
+}
+
+
+bool LibraryBridgeHelper::executeRequest(const Poco::URI & uri, ReadWriteBufferFromHTTP::OutStreamCallback out_stream_callback)
+{
+    ReadWriteBufferFromHTTP buf(
+        uri,
+        Poco::Net::HTTPRequest::HTTP_POST,
+        std::move(out_stream_callback),
+        ConnectionTimeouts::getHTTPTimeouts(getContext()));
+
+    bool res;
+    readBoolText(res, buf);
+    return res;
+}
+
+
+BlockInputStreamPtr LibraryBridgeHelper::loadBase(const Poco::URI & uri, ReadWriteBufferFromHTTP::OutStreamCallback out_stream_callback)
+{
+    auto read_buf_ptr = std::make_unique<ReadWriteBufferFromHTTP>(
+        uri,
+        Poco::Net::HTTPRequest::HTTP_POST,
+        std::move(out_stream_callback),
+        ConnectionTimeouts::getHTTPTimeouts(getContext()),
+        0,
+        Poco::Net::HTTPBasicCredentials{},
+        DBMS_DEFAULT_BUFFER_SIZE,
+        ReadWriteBufferFromHTTP::HTTPHeaderEntries{});
+
+    auto input_stream = getContext()->getInputFormat(LibraryBridgeHelper::DEFAULT_FORMAT, *read_buf_ptr, sample_block, DEFAULT_BLOCK_SIZE);
+    return std::make_shared<OwningBlockInputStream<ReadWriteBufferFromHTTP>>(input_stream, std::move(read_buf_ptr));
+}
+
+}
diff --git a/src/Bridge/LibraryBridgeHelper.h b/src/Bridge/LibraryBridgeHelper.h
new file mode 100644
index 00000000000..dc3f9020e71
--- /dev/null
+++ b/src/Bridge/LibraryBridgeHelper.h
@@ -0,0 +1,86 @@
+#pragma once
+
+#include <Interpreters/Context.h>
+#include <IO/ReadWriteBufferFromHTTP.h>
+#include <Poco/Logger.h>
+#include <Poco/Net/HTTPRequest.h>
+#include <Poco/URI.h>
+#include <Bridge/IBridgeHelper.h>
+
+
+namespace DB
+{
+
+class LibraryBridgeHelper : public IBridgeHelper
+{
+
+public:
+    static constexpr inline size_t DEFAULT_PORT = 9012;
+
+    LibraryBridgeHelper(ContextPtr context_, const Block & sample_block, const Field & dictionary_id_);
+
+    bool initLibrary(const std::string & library_path, std::string library_settings, std::string attributes_names);
+
+    bool cloneLibrary(const Field & other_dictionary_id);
+
+    bool removeLibrary();
+
+    bool isModified();
+
+    bool supportsSelectiveLoad();
+
+    BlockInputStreamPtr loadAll();
+
+    BlockInputStreamPtr loadIds(std::string ids_string);
+
+    BlockInputStreamPtr loadKeys(const Block & requested_block);
+
+    BlockInputStreamPtr loadBase(const Poco::URI & uri, ReadWriteBufferFromHTTP::OutStreamCallback out_stream_callback = {});
+
+    bool executeRequest(const Poco::URI & uri, ReadWriteBufferFromHTTP::OutStreamCallback out_stream_callback = {});
+
+
+protected:
+    void startBridge(std::unique_ptr<ShellCommand> cmd) const override;
+
+    String serviceAlias() const override { return "clickhouse-library-bridge"; }
+
+    String serviceFileName() const override { return serviceAlias(); }
+
+    size_t getDefaultPort() const override { return DEFAULT_PORT; }
+
+    bool startBridgeManually() const override { return false; }
+
+    String configPrefix() const override { return "library_bridge"; }
+
+    const Poco::Util::AbstractConfiguration & getConfig() const override { return config; }
+
+    Poco::Logger * getLog() const override { return log; }
+
+    const Poco::Timespan & getHTTPTimeout() const override { return http_timeout; }
+
+    Poco::URI createBaseURI() const override;
+
+private:
+    static constexpr inline auto LIB_NEW_METHOD = "libNew";
+    static constexpr inline auto LIB_CLONE_METHOD = "libClone";
+    static constexpr inline auto LIB_DELETE_METHOD = "libDelete";
+    static constexpr inline auto LOAD_ALL_METHOD = "loadAll";
+    static constexpr inline auto LOAD_IDS_METHOD = "loadIds";
+    static constexpr inline auto LOAD_KEYS_METHOD = "loadKeys";
+    static constexpr inline auto IS_MODIFIED_METHOD = "isModified";
+    static constexpr inline auto SUPPORTS_SELECTIVE_LOAD_METHOD = "supportsSelectiveLoad";
+
+    Poco::URI createRequestURI(const String & method) const;
+
+    Poco::Logger * log;
+    const Block sample_block;
+    const Poco::Util::AbstractConfiguration & config;
+    const Poco::Timespan http_timeout;
+
+    Field dictionary_id;
+    std::string bridge_host;
+    size_t bridge_port;
+};
+
+}
diff --git a/src/Bridge/XDBCBridgeHelper.h b/src/Bridge/XDBCBridgeHelper.h
new file mode 100644
index 00000000000..a5f21e28204
--- /dev/null
+++ b/src/Bridge/XDBCBridgeHelper.h
@@ -0,0 +1,265 @@
+#pragma once
+
+#include <IO/ReadHelpers.h>
+#include <IO/ReadWriteBufferFromHTTP.h>
+#include <Interpreters/Context.h>
+#include <Access/AccessType.h>
+#include <Parsers/IdentifierQuotingStyle.h>
+#include <Poco/File.h>
+#include <Poco/Logger.h>
+#include <Poco/Net/HTTPRequest.h>
+#include <Poco/Path.h>
+#include <Poco/URI.h>
+#include <Poco/Util/AbstractConfiguration.h>
+#include <Common/ShellCommand.h>
+#include <IO/ConnectionTimeoutsContext.h>
+#include <common/logger_useful.h>
+#include <ext/range.h>
+#include <Bridge/IBridgeHelper.h>
+
+#if !defined(ARCADIA_BUILD)
+#    include <Common/config.h>
+#endif
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+}
+
+/// Class for Helpers for XDBC-bridges, provide utility methods, not main request.
+class IXDBCBridgeHelper : public IBridgeHelper
+{
+
+public:
+    explicit IXDBCBridgeHelper(ContextPtr context_) : IBridgeHelper(context_) {}
+
+    virtual std::vector<std::pair<std::string, std::string>> getURLParams(UInt64 max_block_size) const = 0;
+
+    virtual Poco::URI getColumnsInfoURI() const = 0;
+
+    virtual IdentifierQuotingStyle getIdentifierQuotingStyle() = 0;
+
+    virtual bool isSchemaAllowed() = 0;
+
+    virtual String getName() const = 0;
+};
+
+using BridgeHelperPtr = std::shared_ptr<IXDBCBridgeHelper>;
+
+
+template <typename BridgeHelperMixin>
+class XDBCBridgeHelper : public IXDBCBridgeHelper
+{
+
+public:
+    static constexpr inline auto DEFAULT_PORT = BridgeHelperMixin::DEFAULT_PORT;
+    static constexpr inline auto COL_INFO_HANDLER = "/columns_info";
+    static constexpr inline auto IDENTIFIER_QUOTE_HANDLER = "/identifier_quote";
+    static constexpr inline auto SCHEMA_ALLOWED_HANDLER = "/schema_allowed";
+
+    XDBCBridgeHelper(
+            ContextPtr global_context_,
+            const Poco::Timespan & http_timeout_,
+            const std::string & connection_string_)
+    : IXDBCBridgeHelper(global_context_)
+    , log(&Poco::Logger::get(BridgeHelperMixin::getName() + "BridgeHelper"))
+    , connection_string(connection_string_)
+    , http_timeout(http_timeout_)
+    , config(global_context_->getConfigRef())
+{
+    bridge_host = config.getString(BridgeHelperMixin::configPrefix() + ".host", DEFAULT_HOST);
+    bridge_port = config.getUInt(BridgeHelperMixin::configPrefix() + ".port", DEFAULT_PORT);
+}
+
+
+protected:
+    auto getConnectionString() const { return connection_string; }
+
+    String getName() const override { return BridgeHelperMixin::getName(); }
+
+    size_t getDefaultPort() const override { return DEFAULT_PORT; }
+
+    String serviceAlias() const override { return BridgeHelperMixin::serviceAlias(); }
+
+    /// Same for odbc and jdbc
+    String serviceFileName() const override { return "clickhouse-odbc-bridge"; }
+
+    String configPrefix() const override { return BridgeHelperMixin::configPrefix(); }
+
+    const Poco::Timespan & getHTTPTimeout() const override { return http_timeout; }
+
+    const Poco::Util::AbstractConfiguration & getConfig() const override { return config; }
+
+    Poco::Logger * getLog() const override { return log; }
+
+    bool startBridgeManually() const override { return BridgeHelperMixin::startBridgeManually(); }
+
+    Poco::URI createBaseURI() const override
+    {
+        Poco::URI uri;
+        uri.setHost(bridge_host);
+        uri.setPort(bridge_port);
+        uri.setScheme("http");
+        return uri;
+    }
+
+    void startBridge(std::unique_ptr<ShellCommand> cmd) const override
+    {
+        getContext()->addBridgeCommand(std::move(cmd));
+    }
+
+
+private:
+    using Configuration = Poco::Util::AbstractConfiguration;
+
+    Poco::Logger * log;
+    std::string connection_string;
+    const Poco::Timespan & http_timeout;
+    std::string bridge_host;
+    size_t bridge_port;
+
+    const Configuration & config;
+
+    std::optional<IdentifierQuotingStyle> quote_style;
+    std::optional<bool> is_schema_allowed;
+
+
+protected:
+    using URLParams = std::vector<std::pair<std::string, std::string>>;
+
+    Poco::URI getColumnsInfoURI() const override
+    {
+        auto uri = createBaseURI();
+        uri.setPath(COL_INFO_HANDLER);
+        return uri;
+    }
+
+    URLParams getURLParams(UInt64 max_block_size) const override
+    {
+        std::vector<std::pair<std::string, std::string>> result;
+
+        result.emplace_back("connection_string", connection_string); /// already validated
+        result.emplace_back("max_block_size", std::to_string(max_block_size));
+
+        return result;
+    }
+
+    bool isSchemaAllowed() override
+    {
+        if (!is_schema_allowed.has_value())
+        {
+            startBridgeSync();
+
+            auto uri = createBaseURI();
+            uri.setPath(SCHEMA_ALLOWED_HANDLER);
+            uri.addQueryParameter("connection_string", getConnectionString());
+
+            ReadWriteBufferFromHTTP buf(uri, Poco::Net::HTTPRequest::HTTP_POST, {}, ConnectionTimeouts::getHTTPTimeouts(getContext()));
+
+            bool res;
+            readBoolText(res, buf);
+            is_schema_allowed = res;
+        }
+
+        return *is_schema_allowed;
+    }
+
+    IdentifierQuotingStyle getIdentifierQuotingStyle() override
+    {
+        if (!quote_style.has_value())
+        {
+            startBridgeSync();
+
+            auto uri = createBaseURI();
+            uri.setPath(IDENTIFIER_QUOTE_HANDLER);
+            uri.addQueryParameter("connection_string", getConnectionString());
+
+            ReadWriteBufferFromHTTP buf(uri, Poco::Net::HTTPRequest::HTTP_POST, {}, ConnectionTimeouts::getHTTPTimeouts(getContext()));
+
+            std::string character;
+            readStringBinary(character, buf);
+            if (character.length() > 1)
+                throw Exception(
+                    "Failed to parse quoting style from '" + character + "' for service " + BridgeHelperMixin::serviceAlias(),
+                    ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+            else if (character.length() == 0)
+                quote_style = IdentifierQuotingStyle::None;
+            else if (character[0] == '`')
+                quote_style = IdentifierQuotingStyle::Backticks;
+            else if (character[0] == '"')
+                quote_style = IdentifierQuotingStyle::DoubleQuotes;
+            else
+                throw Exception("Can not map quote identifier '" + character + "' to enum value", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+        }
+
+        return *quote_style;
+    }
+};
+
+
+struct JDBCBridgeMixin
+{
+    static constexpr inline auto DEFAULT_PORT = 9019;
+
+    static String configPrefix()
+    {
+        return "jdbc_bridge";
+    }
+
+    static String serviceAlias()
+    {
+        return "clickhouse-jdbc-bridge";
+    }
+
+    static String getName()
+    {
+        return "JDBC";
+    }
+
+    static AccessType getSourceAccessType()
+    {
+        return AccessType::JDBC;
+    }
+
+    static bool startBridgeManually()
+    {
+        return true;
+    }
+};
+
+
+struct ODBCBridgeMixin
+{
+    static constexpr inline auto DEFAULT_PORT = 9018;
+
+    static String configPrefix()
+    {
+        return "odbc_bridge";
+    }
+
+    static String serviceAlias()
+    {
+        return "clickhouse-odbc-bridge";
+    }
+
+    static String getName()
+    {
+        return "ODBC";
+    }
+
+    static AccessType getSourceAccessType()
+    {
+        return AccessType::ODBC;
+    }
+
+    static bool startBridgeManually()
+    {
+        return false;
+    }
+};
+
+}
diff --git a/src/Bridge/ya.make b/src/Bridge/ya.make
new file mode 100644
index 00000000000..e900bab036e
--- /dev/null
+++ b/src/Bridge/ya.make
@@ -0,0 +1,17 @@
+# This file is generated automatically, do not edit. See 'ya.make.in' and use 'utils/generate-ya-make' to regenerate it.
+OWNER(g:clickhouse)
+
+LIBRARY()
+
+PEERDIR(
+    clickhouse/src/Common
+)
+
+
+SRCS(
+    IBridgeHelper.cpp
+    LibraryBridgeHelper.cpp
+
+)
+
+END()
diff --git a/src/Bridge/ya.make.in b/src/Bridge/ya.make.in
new file mode 100644
index 00000000000..01edf8dca82
--- /dev/null
+++ b/src/Bridge/ya.make.in
@@ -0,0 +1,14 @@
+OWNER(g:clickhouse)
+
+LIBRARY()
+
+PEERDIR(
+    clickhouse/src/Common
+)
+
+
+SRCS(
+<? find . -name '*.cpp' | grep -v -F tests | sed 's/^\.\//    /' | sort ?>
+)
+
+END()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 215a13cce1a..43f6ae8fea5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -27,6 +27,11 @@ configure_file (Common/config.h.in ${CONFIG_COMMON})
 configure_file (Common/config_version.h.in ${CONFIG_VERSION})
 configure_file (Core/config_core.h.in ${CMAKE_CURRENT_BINARY_DIR}/Core/include/config_core.h)
 
+if (USE_DEBUG_HELPERS)
+    set (INCLUDE_DEBUG_HELPERS "-I${ClickHouse_SOURCE_DIR}/base -include ${ClickHouse_SOURCE_DIR}/src/Core/iostream_debug_helpers.h")
+    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${INCLUDE_DEBUG_HELPERS}")
+endif ()
+
 if (COMPILER_GCC)
     # If we leave this optimization enabled, gcc-7 replaces a pair of SSE intrinsics (16 byte load, store) with a call to memcpy.
     # It leads to slow code. This is compiler bug. It looks like this:
@@ -101,8 +106,8 @@ endif()
 list (APPEND clickhouse_common_io_sources ${CONFIG_BUILD})
 list (APPEND clickhouse_common_io_headers ${CONFIG_VERSION} ${CONFIG_COMMON})
 
-list (APPEND dbms_sources Functions/IFunction.cpp Functions/FunctionFactory.cpp Functions/FunctionHelpers.cpp Functions/extractTimeZoneFromFunctionArguments.cpp Functions/replicate.cpp)
-list (APPEND dbms_headers Functions/IFunctionImpl.h Functions/FunctionFactory.h Functions/FunctionHelpers.h Functions/extractTimeZoneFromFunctionArguments.h Functions/replicate.h)
+list (APPEND dbms_sources Functions/IFunction.cpp Functions/FunctionFactory.cpp Functions/FunctionHelpers.cpp Functions/extractTimeZoneFromFunctionArguments.cpp Functions/replicate.cpp Functions/FunctionsLogical.cpp)
+list (APPEND dbms_headers Functions/IFunctionImpl.h Functions/FunctionFactory.h Functions/FunctionHelpers.h Functions/extractTimeZoneFromFunctionArguments.h Functions/replicate.h Functions/FunctionsLogical.h)
 
 list (APPEND dbms_sources
     AggregateFunctions/AggregateFunctionFactory.cpp
@@ -158,7 +163,11 @@ macro(add_object_library name common_path)
         list (APPEND all_modules ${name})
         add_headers_and_sources(${name} ${common_path})
         add_library(${name} SHARED ${${name}_sources} ${${name}_headers})
-        target_link_libraries (${name} PRIVATE -Wl,--unresolved-symbols=ignore-all)
+        if (OS_DARWIN)
+            target_link_libraries (${name} PRIVATE -Wl,-undefined,dynamic_lookup)
+        else()
+            target_link_libraries (${name} PRIVATE -Wl,--unresolved-symbols=ignore-all)
+        endif()
     endif ()
 endmacro()
 
@@ -168,6 +177,7 @@ add_object_library(clickhouse_core_mysql Core/MySQL)
 add_object_library(clickhouse_compression Compression)
 add_object_library(clickhouse_datastreams DataStreams)
 add_object_library(clickhouse_datatypes DataTypes)
+add_object_library(clickhouse_datatypes_serializations DataTypes/Serializations)
 add_object_library(clickhouse_databases Databases)
 add_object_library(clickhouse_databases_mysql Databases/MySQL)
 add_object_library(clickhouse_disks Disks)
@@ -180,6 +190,7 @@ add_object_library(clickhouse_storages_distributed Storages/Distributed)
 add_object_library(clickhouse_storages_mergetree Storages/MergeTree)
 add_object_library(clickhouse_storages_liveview Storages/LiveView)
 add_object_library(clickhouse_client Client)
+add_object_library(clickhouse_bridge Bridge)
 add_object_library(clickhouse_server Server)
 add_object_library(clickhouse_server_http Server/HTTP)
 add_object_library(clickhouse_formats Formats)
@@ -215,7 +226,11 @@ else()
     target_link_libraries (clickhouse_interpreters PRIVATE clickhouse_parsers_new jemalloc libdivide)
     list (APPEND all_modules dbms)
     # force all split libs to be linked
-    set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-as-needed")
+    if (OS_DARWIN)
+        set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-undefined,error")
+    else()
+        set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-as-needed")
+    endif()
 endif ()
 
 macro (dbms_target_include_directories)
@@ -316,6 +331,7 @@ if (USE_CYRUS_SASL)
 endif()
 
 if (USE_KRB5)
+    dbms_target_include_directories(SYSTEM BEFORE PRIVATE ${KRB5_INCLUDE_DIR})
     dbms_target_link_libraries(PRIVATE ${KRB5_LIBRARY})
 endif()
 
@@ -360,11 +376,9 @@ if (ZSTD_LIBRARY)
     endif ()
 endif()
 
-set (LZMA_LIBRARY liblzma)
-set (LZMA_INCLUDE_DIR ${ClickHouse_SOURCE_DIR}/contrib/xz/src/liblzma/api)
-if (LZMA_LIBRARY)
-    target_link_libraries (clickhouse_common_io PUBLIC ${LZMA_LIBRARY})
-    target_include_directories (clickhouse_common_io SYSTEM BEFORE PUBLIC ${LZMA_INCLUDE_DIR})
+if (XZ_LIBRARY)
+    target_link_libraries (clickhouse_common_io PUBLIC ${XZ_LIBRARY})
+    target_include_directories (clickhouse_common_io SYSTEM BEFORE PUBLIC ${XZ_INCLUDE_DIR})
 endif()
 
 if (USE_ICU)
@@ -456,8 +470,14 @@ if (USE_LIBPQXX)
     dbms_target_include_directories(SYSTEM BEFORE PUBLIC ${LIBPQXX_INCLUDE_DIR})
 endif()
 
+if (USE_DATASKETCHES)
+    target_include_directories (clickhouse_aggregate_functions SYSTEM BEFORE PRIVATE ${DATASKETCHES_INCLUDE_DIR})
+endif ()
+
 dbms_target_link_libraries(PRIVATE _boost_context)
 
+include (${ClickHouse_SOURCE_DIR}/cmake/add_check.cmake)
+
 if (ENABLE_TESTS AND USE_GTEST)
     macro (grep_gtest_sources BASE_DIR DST_VAR)
         # Cold match files that are not in tests/ directories
@@ -478,6 +498,20 @@ if (ENABLE_TESTS AND USE_GTEST)
         -Wno-gnu-zero-variadic-macro-arguments
     )
 
-    target_link_libraries(unit_tests_dbms PRIVATE ${GTEST_BOTH_LIBRARIES} clickhouse_functions clickhouse_aggregate_functions clickhouse_parsers dbms clickhouse_common_zookeeper string_utils)
+    target_link_libraries(unit_tests_dbms PRIVATE
+        ${GTEST_BOTH_LIBRARIES}
+        clickhouse_functions
+        clickhouse_aggregate_functions
+        clickhouse_parsers
+        clickhouse_storages_system
+        dbms
+        clickhouse_common_zookeeper
+        string_utils)
+
+    # For __udivmodti4 referenced in Core/tests/gtest_DecimalFunctions.cpp
+    if (OS_DARWIN AND COMPILER_GCC)
+        target_link_libraries(unit_tests_dbms PRIVATE gcc)
+    endif ()
+
     add_check(unit_tests_dbms)
 endif ()
diff --git a/src/Client/Connection.cpp b/src/Client/Connection.cpp
index 164b9565633..70d8109545b 100644
--- a/src/Client/Connection.cpp
+++ b/src/Client/Connection.cpp
@@ -8,10 +8,10 @@
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
 #include <IO/copyData.h>
+#include <IO/TimeoutSetter.h>
 #include <DataStreams/NativeBlockInputStream.h>
 #include <DataStreams/NativeBlockOutputStream.h>
 #include <Client/Connection.h>
-#include <Client/TimeoutSetter.h>
 #include <Common/ClickHouseRevision.h>
 #include <Common/Exception.h>
 #include <Common/NetException.h>
@@ -109,6 +109,8 @@ void Connection::connect(const ConnectionTimeouts & timeouts)
         }
 
         in = std::make_shared<ReadBufferFromPocoSocket>(*socket);
+        in->setAsyncCallback(std::move(async_callback));
+
         out = std::make_shared<WriteBufferFromPocoSocket>(*socket);
 
         connected = true;
@@ -549,6 +551,15 @@ void Connection::sendIgnoredPartUUIDs(const std::vector<UUID> & uuids)
     out->next();
 }
 
+
+void Connection::sendReadTaskResponse(const String & response)
+{
+    writeVarUInt(Protocol::Client::ReadTaskResponse, *out);
+    writeVarUInt(DBMS_CLUSTER_PROCESSING_PROTOCOL_VERSION, *out);
+    writeStringBinary(response, *out);
+    out->next();
+}
+
 void Connection::sendPreparedData(ReadBuffer & input, size_t size, const String & name)
 {
     /// NOTE 'Throttler' is not used in this method (could use, but it's not important right now).
@@ -753,15 +764,8 @@ std::optional<UInt64> Connection::checkPacket(size_t timeout_microseconds)
 }
 
 
-Packet Connection::receivePacket(std::function<void(Poco::Net::Socket &)> async_callback)
+Packet Connection::receivePacket()
 {
-    in->setAsyncCallback(std::move(async_callback));
-    SCOPE_EXIT({
-        /// disconnect() will reset "in".
-        if (in)
-            in->setAsyncCallback({});
-    });
-
     try
     {
         Packet res;
@@ -812,6 +816,9 @@ Packet Connection::receivePacket(std::function<void(Poco::Net::Socket &)> async_
                 readVectorBinary(res.part_uuids, *in);
                 return res;
 
+            case Protocol::Server::ReadTaskRequest:
+                return res;
+
             default:
                 /// In unknown state, disconnect - to not leave unsynchronised connection.
                 disconnect();
@@ -912,13 +919,13 @@ void Connection::setDescription()
 }
 
 
-std::unique_ptr<Exception> Connection::receiveException()
+std::unique_ptr<Exception> Connection::receiveException() const
 {
     return std::make_unique<Exception>(readException(*in, "Received from " + getDescription(), true /* remote */));
 }
 
 
-std::vector<String> Connection::receiveMultistringMessage(UInt64 msg_type)
+std::vector<String> Connection::receiveMultistringMessage(UInt64 msg_type) const
 {
     size_t num = Protocol::Server::stringsInMessage(msg_type);
     std::vector<String> strings(num);
@@ -928,7 +935,7 @@ std::vector<String> Connection::receiveMultistringMessage(UInt64 msg_type)
 }
 
 
-Progress Connection::receiveProgress()
+Progress Connection::receiveProgress() const
 {
     Progress progress;
     progress.read(*in, server_revision);
@@ -936,7 +943,7 @@ Progress Connection::receiveProgress()
 }
 
 
-BlockStreamProfileInfo Connection::receiveProfileInfo()
+BlockStreamProfileInfo Connection::receiveProfileInfo() const
 {
     BlockStreamProfileInfo profile_info;
     profile_info.read(*in);
diff --git a/src/Client/Connection.h b/src/Client/Connection.h
index 2d24b143d7a..6c7edfb2761 100644
--- a/src/Client/Connection.h
+++ b/src/Client/Connection.h
@@ -21,13 +21,13 @@
 #include <IO/ReadBufferFromPocoSocket.h>
 
 #include <Interpreters/TablesStatus.h>
+#include <Interpreters/Context_fwd.h>
 
 #include <Compression/ICompressionCodec.h>
 
 #include <atomic>
 #include <optional>
 
-
 namespace DB
 {
 
@@ -53,8 +53,6 @@ class Connection;
 using ConnectionPtr = std::shared_ptr<Connection>;
 using Connections = std::vector<ConnectionPtr>;
 
-using Scalars = std::map<String, Block>;
-
 
 /// Packet that could be received from server.
 struct Packet
@@ -89,9 +87,9 @@ public:
         const String & user_, const String & password_,
         const String & cluster_,
         const String & cluster_secret_,
-        const String & client_name_ = "client",
-        Protocol::Compression compression_ = Protocol::Compression::Enable,
-        Protocol::Secure secure_ = Protocol::Secure::Disable,
+        const String & client_name_,
+        Protocol::Compression compression_,
+        Protocol::Secure secure_,
         Poco::Timespan sync_request_timeout_ = Poco::Timespan(DBMS_DEFAULT_SYNC_REQUEST_TIMEOUT_SEC, 0))
         :
         host(host_), port(port_), default_database(default_database_),
@@ -112,7 +110,7 @@ public:
         setDescription();
     }
 
-    virtual ~Connection() {}
+    virtual ~Connection() = default;
 
     /// Set throttler of network traffic. One throttler could be used for multiple connections to limit total traffic.
     void setThrottler(const ThrottlerPtr & throttler_)
@@ -141,6 +139,8 @@ public:
     UInt16 getPort() const;
     const String & getDefaultDatabase() const;
 
+    Protocol::Compression getCompression() const { return compression; }
+
     /// If last flag is true, you need to call sendExternalTablesData after.
     void sendQuery(
         const ConnectionTimeouts & timeouts,
@@ -161,6 +161,8 @@ public:
     /// Send parts' uuids to excluded them from query processing
     void sendIgnoredPartUUIDs(const std::vector<UUID> & uuids);
 
+    void sendReadTaskResponse(const String &);
+
     /// Send prepared block of data (serialized and, if need, compressed), that will be read from 'input'.
     /// You could pass size of serialized/compressed block.
     void sendPreparedData(ReadBuffer & input, size_t size, const String & name = "");
@@ -175,8 +177,7 @@ public:
     std::optional<UInt64> checkPacket(size_t timeout_microseconds = 0);
 
     /// Receive packet from server.
-    /// Each time read blocks and async_callback is set, it will be called. You can poll socket inside it.
-    Packet receivePacket(std::function<void(Poco::Net::Socket &)> async_callback = {});
+    Packet receivePacket();
 
     /// If not connected yet, or if connection is broken - then connect. If cannot connect - throw an exception.
     void forceConnected(const ConnectionTimeouts & timeouts);
@@ -195,6 +196,16 @@ public:
     size_t outBytesCount() const { return out ? out->count() : 0; }
     size_t inBytesCount() const { return in ? in->count() : 0; }
 
+    Poco::Net::Socket * getSocket() { return socket.get(); }
+
+    /// Each time read from socket blocks and async_callback is set, it will be called. You can poll socket inside it.
+    void setAsyncCallback(AsyncCallback async_callback_)
+    {
+        async_callback = std::move(async_callback_);
+        if (in)
+            in->setAsyncCallback(std::move(async_callback));
+    }
+
 private:
     String host;
     UInt16 port;
@@ -262,7 +273,7 @@ private:
     class LoggerWrapper
     {
     public:
-        LoggerWrapper(Connection & parent_)
+        explicit LoggerWrapper(Connection & parent_)
             : log(nullptr), parent(parent_)
         {
         }
@@ -282,6 +293,8 @@ private:
 
     LoggerWrapper log_wrapper;
 
+    AsyncCallback async_callback = {};
+
     void connect(const ConnectionTimeouts & timeouts);
     void sendHello();
     void receiveHello();
@@ -295,10 +308,10 @@ private:
     Block receiveLogData();
     Block receiveDataImpl(BlockInputStreamPtr & stream);
 
-    std::vector<String> receiveMultistringMessage(UInt64 msg_type);
-    std::unique_ptr<Exception> receiveException();
-    Progress receiveProgress();
-    BlockStreamProfileInfo receiveProfileInfo();
+    std::vector<String> receiveMultistringMessage(UInt64 msg_type) const;
+    std::unique_ptr<Exception> receiveException() const;
+    Progress receiveProgress() const;
+    BlockStreamProfileInfo receiveProfileInfo() const;
 
     void initInputBuffers();
     void initBlockInput();
@@ -307,4 +320,20 @@ private:
     [[noreturn]] void throwUnexpectedPacket(UInt64 packet_type, const char * expected) const;
 };
 
+class AsyncCallbackSetter
+{
+public:
+    AsyncCallbackSetter(Connection * connection_, AsyncCallback async_callback) : connection(connection_)
+    {
+        connection->setAsyncCallback(std::move(async_callback));
+    }
+
+    ~AsyncCallbackSetter()
+    {
+        connection->setAsyncCallback({});
+    }
+private:
+    Connection * connection;
+};
+
 }
diff --git a/src/Client/ConnectionEstablisher.cpp b/src/Client/ConnectionEstablisher.cpp
new file mode 100644
index 00000000000..2532035fabd
--- /dev/null
+++ b/src/Client/ConnectionEstablisher.cpp
@@ -0,0 +1,239 @@
+#include <Client/ConnectionEstablisher.h>
+#include <Common/quoteString.h>
+#include <Common/ProfileEvents.h>
+
+namespace ProfileEvents
+{
+    extern const Event DistributedConnectionMissingTable;
+    extern const Event DistributedConnectionStaleReplica;
+}
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int ATTEMPT_TO_READ_AFTER_EOF;
+    extern const int NETWORK_ERROR;
+    extern const int SOCKET_TIMEOUT;
+}
+
+ConnectionEstablisher::ConnectionEstablisher(
+    IConnectionPool * pool_,
+    const ConnectionTimeouts * timeouts_,
+    const Settings * settings_,
+    Poco::Logger * log_,
+    const QualifiedTableName * table_to_check_)
+    : pool(pool_), timeouts(timeouts_), settings(settings_), log(log_), table_to_check(table_to_check_), is_finished(false)
+{
+}
+
+void ConnectionEstablisher::run(ConnectionEstablisher::TryResult & result, std::string & fail_message)
+{
+    is_finished = false;
+    SCOPE_EXIT(is_finished = true);
+    try
+    {
+        result.entry = pool->get(*timeouts, settings, /* force_connected = */ false);
+        AsyncCallbackSetter async_setter(&*result.entry, std::move(async_callback));
+
+        UInt64 server_revision = 0;
+        if (table_to_check)
+            server_revision = result.entry->getServerRevision(*timeouts);
+
+        if (!table_to_check || server_revision < DBMS_MIN_REVISION_WITH_TABLES_STATUS)
+        {
+            result.entry->forceConnected(*timeouts);
+            result.is_usable = true;
+            result.is_up_to_date = true;
+            return;
+        }
+
+        /// Only status of the remote table corresponding to the Distributed table is taken into account.
+        /// TODO: request status for joined tables also.
+        TablesStatusRequest status_request;
+        status_request.tables.emplace(*table_to_check);
+
+        TablesStatusResponse status_response = result.entry->getTablesStatus(*timeouts, status_request);
+        auto table_status_it = status_response.table_states_by_id.find(*table_to_check);
+        if (table_status_it == status_response.table_states_by_id.end())
+        {
+            const char * message_pattern = "There is no table {}.{} on server: {}";
+            fail_message = fmt::format(message_pattern, backQuote(table_to_check->database), backQuote(table_to_check->table), result.entry->getDescription());
+            LOG_WARNING(log, fail_message);
+            ProfileEvents::increment(ProfileEvents::DistributedConnectionMissingTable);
+            return;
+        }
+
+        result.is_usable = true;
+
+        UInt64 max_allowed_delay = settings ? UInt64(settings->max_replica_delay_for_distributed_queries) : 0;
+        if (!max_allowed_delay)
+        {
+            result.is_up_to_date = true;
+            return;
+        }
+
+        UInt32 delay = table_status_it->second.absolute_delay;
+
+        if (delay < max_allowed_delay)
+            result.is_up_to_date = true;
+        else
+        {
+            result.is_up_to_date = false;
+            result.staleness = delay;
+
+            LOG_TRACE(log, "Server {} has unacceptable replica delay for table {}.{}: {}", result.entry->getDescription(), table_to_check->database, table_to_check->table, delay);
+            ProfileEvents::increment(ProfileEvents::DistributedConnectionStaleReplica);
+        }
+    }
+    catch (const Exception & e)
+    {
+        if (e.code() != ErrorCodes::NETWORK_ERROR && e.code() != ErrorCodes::SOCKET_TIMEOUT
+            && e.code() != ErrorCodes::ATTEMPT_TO_READ_AFTER_EOF)
+            throw;
+
+        fail_message = getCurrentExceptionMessage(/* with_stacktrace = */ false);
+
+        if (!result.entry.isNull())
+        {
+            result.entry->disconnect();
+            result.reset();
+        }
+    }
+}
+
+#if defined(OS_LINUX)
+
+ConnectionEstablisherAsync::ConnectionEstablisherAsync(
+    IConnectionPool * pool_,
+    const ConnectionTimeouts * timeouts_,
+    const Settings * settings_,
+    Poco::Logger * log_,
+    const QualifiedTableName * table_to_check_)
+    : connection_establisher(pool_, timeouts_, settings_, log_, table_to_check_)
+{
+    epoll.add(receive_timeout.getDescriptor());
+}
+
+void ConnectionEstablisherAsync::Routine::ReadCallback::operator()(int fd, const Poco::Timespan & timeout, const std::string &)
+{
+    /// Check if it's the first time and we need to add socket fd to epoll.
+    if (connection_establisher_async.socket_fd == -1)
+    {
+        connection_establisher_async.epoll.add(fd);
+        connection_establisher_async.socket_fd = fd;
+    }
+
+    connection_establisher_async.receive_timeout.setRelative(timeout);
+    fiber = std::move(fiber).resume();
+    connection_establisher_async.receive_timeout.reset();
+}
+
+Fiber ConnectionEstablisherAsync::Routine::operator()(Fiber && sink)
+{
+    try
+    {
+        connection_establisher_async.connection_establisher.setAsyncCallback(ReadCallback{connection_establisher_async, sink});
+        connection_establisher_async.connection_establisher.run(connection_establisher_async.result, connection_establisher_async.fail_message);
+    }
+    catch (const boost::context::detail::forced_unwind &)
+    {
+        /// This exception is thrown by fiber implementation in case if fiber is being deleted but hasn't exited
+        /// It should not be caught or it will segfault.
+        /// Other exceptions must be caught
+        throw;
+    }
+    catch (...)
+    {
+        connection_establisher_async.exception = std::current_exception();
+    }
+
+    return std::move(sink);
+}
+
+std::variant<int, ConnectionEstablisher::TryResult> ConnectionEstablisherAsync::resume()
+{
+    if (!fiber_created)
+    {
+        reset();
+        fiber = boost::context::fiber(std::allocator_arg_t(), fiber_stack, Routine{*this});
+        fiber_created = true;
+    } else if (!checkReceiveTimeout())
+        return result;
+
+    fiber = std::move(fiber).resume();
+
+    if (exception)
+        std::rethrow_exception(std::move(exception));
+
+    if (connection_establisher.isFinished())
+    {
+        destroyFiber();
+        return result;
+    }
+
+    return epoll.getFileDescriptor();
+}
+
+bool ConnectionEstablisherAsync::checkReceiveTimeout()
+{
+    bool is_socket_ready = false;
+    bool is_receive_timeout_alarmed = false;
+
+    epoll_event events[2];
+    events[0].data.fd = events[1].data.fd = -1;
+    size_t ready_count = epoll.getManyReady(2, events, false);
+    for (size_t i = 0; i != ready_count; ++i)
+    {
+        if (events[i].data.fd == socket_fd)
+            is_socket_ready = true;
+        if (events[i].data.fd == receive_timeout.getDescriptor())
+            is_receive_timeout_alarmed = true;
+    }
+
+    if (is_receive_timeout_alarmed && !is_socket_ready)
+    {
+        destroyFiber();
+        /// In not async case this exception would be thrown and caught in ConnectionEstablisher::run,
+        /// but in async case we process timeout outside and cannot throw exception. So, we just save fail message.
+        fail_message = "Timeout exceeded while reading from socket (" + result.entry->getDescription() + ")";
+        epoll.remove(socket_fd);
+        resetResult();
+        return false;
+    }
+
+    return true;
+}
+
+void ConnectionEstablisherAsync::cancel()
+{
+    destroyFiber();
+    reset();
+}
+
+void ConnectionEstablisherAsync::reset()
+{
+    resetResult();
+    fail_message.clear();
+    socket_fd = -1;
+}
+
+void ConnectionEstablisherAsync::resetResult()
+{
+    if (!result.entry.isNull())
+    {
+        result.entry->disconnect();
+        result.reset();
+    }
+}
+
+void ConnectionEstablisherAsync::destroyFiber()
+{
+    Fiber to_destroy = std::move(fiber);
+    fiber_created = false;
+}
+
+#endif
+
+}
diff --git a/src/Client/ConnectionEstablisher.h b/src/Client/ConnectionEstablisher.h
new file mode 100644
index 00000000000..1096452ebce
--- /dev/null
+++ b/src/Client/ConnectionEstablisher.h
@@ -0,0 +1,131 @@
+#pragma once
+
+#include <variant>
+
+#include <Common/Epoll.h>
+#include <Common/Fiber.h>
+#include <Common/FiberStack.h>
+#include <Common/TimerDescriptor.h>
+#include <Common/PoolWithFailoverBase.h>
+#include <Client/ConnectionPool.h>
+
+namespace DB
+{
+
+/// Class for establishing connection to the replica. It supports setting up
+/// an async callback that will be called when reading from socket blocks.
+class ConnectionEstablisher
+{
+public:
+    using TryResult = PoolWithFailoverBase<IConnectionPool>::TryResult;
+
+    ConnectionEstablisher(IConnectionPool * pool_,
+                          const ConnectionTimeouts * timeouts_,
+                          const Settings * settings_,
+                          Poco::Logger * log,
+                          const QualifiedTableName * table_to_check = nullptr);
+
+    /// Establish connection and save it in result, write possible exception message in fail_message.
+    void run(TryResult & result, std::string & fail_message);
+
+    /// Set async callback that will be called when reading from socket blocks.
+    void setAsyncCallback(AsyncCallback async_callback_) { async_callback = std::move(async_callback_); }
+
+    bool isFinished() const { return is_finished; }
+
+private:
+    IConnectionPool * pool;
+    const ConnectionTimeouts * timeouts;
+    const Settings * settings;
+    Poco::Logger * log;
+    const QualifiedTableName * table_to_check;
+
+    bool is_finished;
+    AsyncCallback async_callback = {};
+
+};
+
+#if defined(OS_LINUX)
+
+/// Class for nonblocking establishing connection to the replica.
+/// It runs establishing connection process in fiber and sets special
+/// read callback which is called when reading from socket blocks.
+/// When read callback is called, socket and receive timeout are added in epoll
+/// and execution returns to the main program.
+/// So, you can poll this epoll file descriptor to determine when to resume.
+class ConnectionEstablisherAsync
+{
+public:
+    using TryResult = PoolWithFailoverBase<IConnectionPool>::TryResult;
+
+    ConnectionEstablisherAsync(IConnectionPool * pool_,
+                          const ConnectionTimeouts * timeouts_,
+                          const Settings * settings_,
+                          Poco::Logger * log_,
+                          const QualifiedTableName * table_to_check = nullptr);
+
+    /// Resume establishing connection. If the process was not finished,
+    /// return file descriptor (you can add it in epoll and poll it,
+    /// when this fd become ready, call resume again),
+    /// if the process was failed or finished, return it's result,
+    std::variant<int, TryResult> resume();
+
+    /// Cancel establishing connections. Fiber will be destroyed,
+    /// class will be set in initial stage.
+    void cancel();
+
+    TryResult getResult() const { return result; }
+
+    const std::string & getFailMessage() const { return fail_message; }
+
+private:
+    /// When epoll file descriptor is ready, check if it's an expired timeout.
+    /// Return false if receive timeout expired and socket is not ready, return true otherwise.
+    bool checkReceiveTimeout();
+
+    struct Routine
+    {
+        ConnectionEstablisherAsync & connection_establisher_async;
+
+        struct ReadCallback
+        {
+            ConnectionEstablisherAsync & connection_establisher_async;
+            Fiber & fiber;
+
+            void operator()(int fd, const Poco::Timespan & timeout, const std::string &);
+        };
+
+        Fiber operator()(Fiber && sink);
+    };
+
+    void reset();
+
+    void resetResult();
+
+    void destroyFiber();
+
+    ConnectionEstablisher connection_establisher;
+    TryResult result;
+    std::string fail_message;
+
+    Fiber fiber;
+    FiberStack fiber_stack;
+
+    /// We use timer descriptor for checking socket receive timeout.
+    TimerDescriptor receive_timeout;
+
+    /// In read callback we add socket file descriptor and timer descriptor with receive timeout
+    /// in epoll, so we can return epoll file descriptor outside for polling.
+    Epoll epoll;
+    int socket_fd = -1;
+    std::string socket_description;
+
+    /// If and exception occurred in fiber resume, we save it and rethrow.
+    std::exception_ptr exception;
+
+    bool fiber_created = false;
+};
+
+#endif
+
+}
diff --git a/src/Client/ConnectionPool.h b/src/Client/ConnectionPool.h
index 2389cc6755d..bf73e9756d2 100644
--- a/src/Client/ConnectionPool.h
+++ b/src/Client/ConnectionPool.h
@@ -26,7 +26,7 @@ public:
     using Entry = PoolBase<Connection>::Entry;
 
 public:
-    virtual ~IConnectionPool() {}
+    virtual ~IConnectionPool() = default;
 
     /// Selects the connection to work.
     /// If force_connected is false, the client must manually ensure that returned connection is good.
@@ -56,9 +56,9 @@ public:
             const String & password_,
             const String & cluster_,
             const String & cluster_secret_,
-            const String & client_name_ = "client",
-            Protocol::Compression compression_ = Protocol::Compression::Enable,
-            Protocol::Secure secure_ = Protocol::Secure::Disable,
+            const String & client_name_,
+            Protocol::Compression compression_,
+            Protocol::Secure secure_,
             Int64 priority_ = 1)
        : Base(max_connections_,
         &Poco::Logger::get("ConnectionPool (" + host_ + ":" + toString(port_) + ")")),
diff --git a/src/Client/ConnectionPoolWithFailover.cpp b/src/Client/ConnectionPoolWithFailover.cpp
index 1ca61dc8059..eff589edaa8 100644
--- a/src/Client/ConnectionPoolWithFailover.cpp
+++ b/src/Client/ConnectionPoolWithFailover.cpp
@@ -1,4 +1,5 @@
 #include <Client/ConnectionPoolWithFailover.h>
+#include <Client/ConnectionEstablisher.h>
 
 #include <Poco/Net/NetException.h>
 #include <Poco/Net/DNS.h>
@@ -12,20 +13,12 @@
 
 #include <IO/ConnectionTimeouts.h>
 
-namespace ProfileEvents
-{
-    extern const Event DistributedConnectionMissingTable;
-    extern const Event DistributedConnectionStaleReplica;
-}
 
 namespace DB
 {
 
 namespace ErrorCodes
 {
-    extern const int ATTEMPT_TO_READ_AFTER_EOF;
-    extern const int NETWORK_ERROR;
-    extern const int SOCKET_TIMEOUT;
     extern const int LOGICAL_ERROR;
 }
 
@@ -112,15 +105,20 @@ ConnectionPoolWithFailover::Status ConnectionPoolWithFailover::getStatus() const
     ConnectionPoolWithFailover::Status result;
     result.reserve(states.size());
     const time_t since_last_error_decrease = time(nullptr) - error_decrease_time;
-
+    /// Update error_count and slowdown_count in states to return actual information.
+    auto updated_states = states;
+    auto updated_error_decrease_time = error_decrease_time;
+    Base::updateErrorCounts(updated_states, updated_error_decrease_time);
     for (size_t i = 0; i < states.size(); ++i)
     {
         const auto rounds_to_zero_errors = states[i].error_count ? bitScanReverse(states[i].error_count) + 1 : 0;
-        const auto seconds_to_zero_errors = std::max(static_cast<time_t>(0), rounds_to_zero_errors * decrease_error_period - since_last_error_decrease);
+        const auto rounds_to_zero_slowdowns = states[i].slowdown_count ? bitScanReverse(states[i].slowdown_count) + 1 : 0;
+        const auto seconds_to_zero_errors = std::max(static_cast<time_t>(0), std::max(rounds_to_zero_errors, rounds_to_zero_slowdowns) * decrease_error_period - since_last_error_decrease);
 
         result.emplace_back(NestedPoolStatus{
             pools[i],
-            states[i].error_count,
+            updated_states[i].error_count,
+            updated_states[i].slowdown_count,
             std::chrono::seconds{seconds_to_zero_errors}
         });
     }
@@ -172,6 +170,43 @@ std::vector<ConnectionPoolWithFailover::TryResult> ConnectionPoolWithFailover::g
     return getManyImpl(settings, pool_mode, try_get_entry);
 }
 
+ConnectionPoolWithFailover::Base::GetPriorityFunc ConnectionPoolWithFailover::makeGetPriorityFunc(const Settings * settings)
+{
+    size_t offset = 0;
+    if (settings)
+        offset = settings->load_balancing_first_offset % nested_pools.size();
+
+    GetPriorityFunc get_priority;
+    switch (settings ? LoadBalancing(settings->load_balancing) : default_load_balancing)
+    {
+        case LoadBalancing::NEAREST_HOSTNAME:
+            get_priority = [&](size_t i) { return hostname_differences[i]; };
+            break;
+        case LoadBalancing::IN_ORDER:
+            get_priority = [](size_t i) { return i; };
+            break;
+        case LoadBalancing::RANDOM:
+            break;
+        case LoadBalancing::FIRST_OR_RANDOM:
+            get_priority = [offset](size_t i) -> size_t { return i != offset; };
+            break;
+        case LoadBalancing::ROUND_ROBIN:
+            if (last_used >= nested_pools.size())
+                last_used = 0;
+            ++last_used;
+            /* Consider nested_pools.size() equals to 5
+             * last_used = 1 -> get_priority: 0 1 2 3 4
+             * last_used = 2 -> get_priority: 5 0 1 2 3
+             * last_used = 3 -> get_priority: 5 4 0 1 2
+             * ...
+             * */
+            get_priority = [&](size_t i) { ++i; return i < last_used ? nested_pools.size() - i : i - last_used; };
+            break;
+    }
+
+    return get_priority;
+}
+
 std::vector<ConnectionPoolWithFailover::TryResult> ConnectionPoolWithFailover::getManyImpl(
         const Settings * settings,
         PoolMode pool_mode,
@@ -194,36 +229,7 @@ std::vector<ConnectionPoolWithFailover::TryResult> ConnectionPoolWithFailover::g
     else
         throw DB::Exception("Unknown pool allocation mode", DB::ErrorCodes::LOGICAL_ERROR);
 
-    size_t offset = 0;
-    if (settings)
-        offset = settings->load_balancing_first_offset % nested_pools.size();
-    GetPriorityFunc get_priority;
-    switch (settings ? LoadBalancing(settings->load_balancing) : default_load_balancing)
-    {
-    case LoadBalancing::NEAREST_HOSTNAME:
-        get_priority = [&](size_t i) { return hostname_differences[i]; };
-        break;
-    case LoadBalancing::IN_ORDER:
-        get_priority = [](size_t i) { return i; };
-        break;
-    case LoadBalancing::RANDOM:
-        break;
-    case LoadBalancing::FIRST_OR_RANDOM:
-        get_priority = [offset](size_t i) -> size_t { return i != offset; };
-        break;
-    case LoadBalancing::ROUND_ROBIN:
-        if (last_used >= nested_pools.size())
-            last_used = 0;
-        ++last_used;
-        /* Consider nested_pools.size() equals to 5
-         * last_used = 1 -> get_priority: 0 1 2 3 4
-         * last_used = 2 -> get_priority: 5 0 1 2 3
-         * last_used = 3 -> get_priority: 5 4 0 1 2
-         * ...
-         * */
-        get_priority = [&](size_t i) { ++i; return i < last_used ? nested_pools.size() - i : i - last_used; };
-        break;
-    }
+    GetPriorityFunc get_priority = makeGetPriorityFunc(settings);
 
     UInt64 max_ignored_errors = settings ? settings->distributed_replica_max_ignored_errors.value : 0;
     bool fallback_to_stale_replicas = settings ? settings->fallback_to_stale_replicas_for_distributed_queries.value : true;
@@ -241,77 +247,17 @@ ConnectionPoolWithFailover::tryGetEntry(
         const Settings * settings,
         const QualifiedTableName * table_to_check)
 {
+    ConnectionEstablisher connection_establisher(&pool, &timeouts, settings, log, table_to_check);
     TryResult result;
-    try
-    {
-        result.entry = pool.get(timeouts, settings, /* force_connected = */ false);
-
-        UInt64 server_revision = 0;
-        if (table_to_check)
-            server_revision = result.entry->getServerRevision(timeouts);
-
-        if (!table_to_check || server_revision < DBMS_MIN_REVISION_WITH_TABLES_STATUS)
-        {
-            result.entry->forceConnected(timeouts);
-            result.is_usable = true;
-            result.is_up_to_date = true;
-            return result;
-        }
-
-        /// Only status of the remote table corresponding to the Distributed table is taken into account.
-        /// TODO: request status for joined tables also.
-        TablesStatusRequest status_request;
-        status_request.tables.emplace(*table_to_check);
-
-        TablesStatusResponse status_response = result.entry->getTablesStatus(timeouts, status_request);
-        auto table_status_it = status_response.table_states_by_id.find(*table_to_check);
-        if (table_status_it == status_response.table_states_by_id.end())
-        {
-            const char * message_pattern = "There is no table {}.{} on server: {}";
-            fail_message = fmt::format(message_pattern, backQuote(table_to_check->database), backQuote(table_to_check->table), result.entry->getDescription());
-            LOG_WARNING(log, fail_message);
-            ProfileEvents::increment(ProfileEvents::DistributedConnectionMissingTable);
-
-            return result;
-        }
-
-        result.is_usable = true;
-
-        UInt64 max_allowed_delay = settings ? UInt64(settings->max_replica_delay_for_distributed_queries) : 0;
-        if (!max_allowed_delay)
-        {
-            result.is_up_to_date = true;
-            return result;
-        }
-
-        UInt32 delay = table_status_it->second.absolute_delay;
-
-        if (delay < max_allowed_delay)
-            result.is_up_to_date = true;
-        else
-        {
-            result.is_up_to_date = false;
-            result.staleness = delay;
-
-            LOG_TRACE(log, "Server {} has unacceptable replica delay for table {}.{}: {}", result.entry->getDescription(), table_to_check->database, table_to_check->table, delay);
-            ProfileEvents::increment(ProfileEvents::DistributedConnectionStaleReplica);
-        }
-    }
-    catch (const Exception & e)
-    {
-        if (e.code() != ErrorCodes::NETWORK_ERROR && e.code() != ErrorCodes::SOCKET_TIMEOUT
-            && e.code() != ErrorCodes::ATTEMPT_TO_READ_AFTER_EOF)
-            throw;
-
-        fail_message = getCurrentExceptionMessage(/* with_stacktrace = */ false);
-
-        if (!result.entry.isNull())
-        {
-            result.entry->disconnect();
-            result.reset();
-        }
-    }
+    connection_establisher.run(result, fail_message);
     return result;
 }
 
+std::vector<ConnectionPoolWithFailover::Base::ShuffledPool> ConnectionPoolWithFailover::getShuffledPools(const Settings * settings)
+{
+    GetPriorityFunc get_priority = makeGetPriorityFunc(settings);
+    UInt64 max_ignored_errors = settings ? settings->distributed_replica_max_ignored_errors.value : 0;
+    return Base::getShuffledPools(max_ignored_errors, get_priority);
+}
+
 }
diff --git a/src/Client/ConnectionPoolWithFailover.h b/src/Client/ConnectionPoolWithFailover.h
index 7d5f713f6a9..ce70c27838b 100644
--- a/src/Client/ConnectionPoolWithFailover.h
+++ b/src/Client/ConnectionPoolWithFailover.h
@@ -74,12 +74,22 @@ public:
     {
         const Base::NestedPoolPtr pool;
         size_t error_count;
+        size_t slowdown_count;
         std::chrono::seconds estimated_recovery_time;
     };
 
     using Status = std::vector<NestedPoolStatus>;
     Status getStatus() const;
 
+    std::vector<Base::ShuffledPool> getShuffledPools(const Settings * settings);
+
+    size_t getMaxErrorCup() const { return Base::max_error_cap; }
+
+    void updateSharedError(std::vector<ShuffledPool> & shuffled_pools)
+    {
+        Base::updateSharedErrorCounts(shuffled_pools);
+    }
+
 private:
     /// Get the values of relevant settings and call Base::getMany()
     std::vector<TryResult> getManyImpl(
@@ -97,6 +107,8 @@ private:
             const Settings * settings,
             const QualifiedTableName * table_to_check = nullptr);
 
+    GetPriorityFunc makeGetPriorityFunc(const Settings * settings);
+
 private:
     std::vector<size_t> hostname_differences; /// Distances from name of this host to the names of hosts of pools.
     size_t last_used = 0; /// Last used for round_robin policy.
diff --git a/src/Client/HedgedConnections.cpp b/src/Client/HedgedConnections.cpp
new file mode 100644
index 00000000000..8455ef3117e
--- /dev/null
+++ b/src/Client/HedgedConnections.cpp
@@ -0,0 +1,545 @@
+#if defined(OS_LINUX)
+
+#include <Client/HedgedConnections.h>
+#include <Common/ProfileEvents.h>
+#include <Interpreters/ClientInfo.h>
+
+namespace ProfileEvents
+{
+    extern const Event HedgedRequestsChangeReplica;
+}
+
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int MISMATCH_REPLICAS_DATA_SOURCES;
+    extern const int LOGICAL_ERROR;
+    extern const int SOCKET_TIMEOUT;
+    extern const int ALL_CONNECTION_TRIES_FAILED;
+}
+
+HedgedConnections::HedgedConnections(
+    const ConnectionPoolWithFailoverPtr & pool_,
+    const Settings & settings_,
+    const ConnectionTimeouts & timeouts_,
+    const ThrottlerPtr & throttler_,
+    PoolMode pool_mode,
+    std::shared_ptr<QualifiedTableName> table_to_check_)
+    : hedged_connections_factory(pool_, &settings_, timeouts_, table_to_check_)
+    , settings(settings_)
+    , throttler(throttler_)
+{
+    std::vector<Connection *> connections = hedged_connections_factory.getManyConnections(pool_mode);
+
+    if (connections.empty())
+        return;
+
+    offset_states.reserve(connections.size());
+    for (size_t i = 0; i != connections.size(); ++i)
+    {
+        offset_states.emplace_back();
+        offset_states[i].replicas.emplace_back(connections[i]);
+        offset_states[i].active_connection_count = 1;
+
+        ReplicaState & replica = offset_states[i].replicas.back();
+        replica.connection->setThrottler(throttler_);
+
+        epoll.add(replica.packet_receiver->getFileDescriptor());
+        fd_to_replica_location[replica.packet_receiver->getFileDescriptor()] = ReplicaLocation{i, 0};
+
+        epoll.add(replica.change_replica_timeout.getDescriptor());
+        timeout_fd_to_replica_location[replica.change_replica_timeout.getDescriptor()] = ReplicaLocation{i, 0};
+    }
+
+    active_connection_count = connections.size();
+    offsets_with_disabled_changing_replica = 0;
+    pipeline_for_new_replicas.add([throttler_](ReplicaState & replica_) { replica_.connection->setThrottler(throttler_); });
+}
+
+void HedgedConnections::Pipeline::add(std::function<void(ReplicaState & replica)> send_function)
+{
+    pipeline.push_back(send_function);
+}
+
+void HedgedConnections::Pipeline::run(ReplicaState & replica)
+{
+    for (auto & send_func : pipeline)
+        send_func(replica);
+}
+
+void HedgedConnections::sendScalarsData(Scalars & data)
+{
+    std::lock_guard lock(cancel_mutex);
+
+    if (!sent_query)
+        throw Exception("Cannot send scalars data: query not yet sent.", ErrorCodes::LOGICAL_ERROR);
+
+    auto send_scalars_data = [&data](ReplicaState & replica) { replica.connection->sendScalarsData(data); };
+
+    for (auto & offset_state : offset_states)
+        for (auto & replica : offset_state.replicas)
+            if (replica.connection)
+                send_scalars_data(replica);
+
+    pipeline_for_new_replicas.add(send_scalars_data);
+}
+
+void HedgedConnections::sendExternalTablesData(std::vector<ExternalTablesData> & data)
+{
+    std::lock_guard lock(cancel_mutex);
+
+    if (!sent_query)
+        throw Exception("Cannot send external tables data: query not yet sent.", ErrorCodes::LOGICAL_ERROR);
+
+    if (data.size() != size())
+        throw Exception("Mismatch between replicas and data sources", ErrorCodes::MISMATCH_REPLICAS_DATA_SOURCES);
+
+    auto send_external_tables_data = [&data](ReplicaState & replica) { replica.connection->sendExternalTablesData(data[0]); };
+
+    for (auto & offset_state : offset_states)
+        for (auto & replica : offset_state.replicas)
+            if (replica.connection)
+                send_external_tables_data(replica);
+
+    pipeline_for_new_replicas.add(send_external_tables_data);
+}
+
+void HedgedConnections::sendIgnoredPartUUIDs(const std::vector<UUID> & uuids)
+{
+    std::lock_guard lock(cancel_mutex);
+
+    if (sent_query)
+        throw Exception("Cannot send uuids after query is sent.", ErrorCodes::LOGICAL_ERROR);
+
+    auto send_ignored_part_uuids = [&uuids](ReplicaState & replica) { replica.connection->sendIgnoredPartUUIDs(uuids); };
+
+    for (auto & offset_state : offset_states)
+        for (auto & replica : offset_state.replicas)
+            if (replica.connection)
+                send_ignored_part_uuids(replica);
+
+    pipeline_for_new_replicas.add(send_ignored_part_uuids);
+}
+
+void HedgedConnections::sendQuery(
+    const ConnectionTimeouts & timeouts,
+    const String & query,
+    const String & query_id,
+    UInt64 stage,
+    const ClientInfo & client_info,
+    bool with_pending_data)
+{
+    std::lock_guard lock(cancel_mutex);
+
+    if (sent_query)
+        throw Exception("Query already sent.", ErrorCodes::LOGICAL_ERROR);
+
+    for (auto & offset_state : offset_states)
+    {
+        for (auto & replica : offset_state.replicas)
+        {
+            if (replica.connection->getServerRevision(timeouts) < DBMS_MIN_REVISION_WITH_CURRENT_AGGREGATION_VARIANT_SELECTION_METHOD)
+            {
+                disable_two_level_aggregation = true;
+                break;
+            }
+        }
+        if (disable_two_level_aggregation)
+            break;
+    }
+
+    if (!disable_two_level_aggregation)
+    {
+        /// Tell hedged_connections_factory to skip replicas that doesn't support two-level aggregation.
+        hedged_connections_factory.skipReplicasWithTwoLevelAggregationIncompatibility();
+    }
+
+    auto send_query = [this, timeouts, query, query_id, stage, client_info, with_pending_data](ReplicaState & replica)
+    {
+        Settings modified_settings = settings;
+
+        if (disable_two_level_aggregation)
+        {
+            /// Disable two-level aggregation due to version incompatibility.
+            modified_settings.group_by_two_level_threshold = 0;
+            modified_settings.group_by_two_level_threshold_bytes = 0;
+        }
+
+        if (offset_states.size() > 1)
+        {
+            modified_settings.parallel_replicas_count = offset_states.size();
+            modified_settings.parallel_replica_offset = fd_to_replica_location[replica.packet_receiver->getFileDescriptor()].offset;
+        }
+
+        replica.connection->sendQuery(timeouts, query, query_id, stage, &modified_settings, &client_info, with_pending_data);
+        replica.change_replica_timeout.setRelative(timeouts.receive_data_timeout);
+    };
+
+    for (auto & offset_status : offset_states)
+        for (auto & replica : offset_status.replicas)
+            send_query(replica);
+
+    pipeline_for_new_replicas.add(send_query);
+    sent_query = true;
+}
+
+void HedgedConnections::disconnect()
+{
+    std::lock_guard lock(cancel_mutex);
+
+    for (auto & offset_status : offset_states)
+        for (auto & replica : offset_status.replicas)
+            if (replica.connection)
+                finishProcessReplica(replica, true);
+
+    if (hedged_connections_factory.hasEventsInProcess())
+    {
+        if (hedged_connections_factory.numberOfProcessingReplicas() > 0)
+            epoll.remove(hedged_connections_factory.getFileDescriptor());
+
+        hedged_connections_factory.stopChoosingReplicas();
+    }
+}
+
+std::string HedgedConnections::dumpAddresses() const
+{
+    std::lock_guard lock(cancel_mutex);
+
+    std::string addresses;
+    bool is_first = true;
+
+    for (const auto & offset_state : offset_states)
+    {
+        for (const auto & replica : offset_state.replicas)
+        {
+            if (replica.connection)
+            {
+                addresses += (is_first ? "" : "; ") + replica.connection->getDescription();
+                is_first = false;
+            }
+        }
+    }
+
+    return addresses;
+}
+
+void HedgedConnections::sendCancel()
+{
+    std::lock_guard lock(cancel_mutex);
+
+    if (!sent_query || cancelled)
+        throw Exception("Cannot cancel. Either no query sent or already cancelled.", ErrorCodes::LOGICAL_ERROR);
+
+    for (auto & offset_status : offset_states)
+        for (auto & replica : offset_status.replicas)
+            if (replica.connection)
+                replica.connection->sendCancel();
+
+    cancelled = true;
+}
+
+Packet HedgedConnections::drain()
+{
+    std::lock_guard lock(cancel_mutex);
+
+    if (!cancelled)
+        throw Exception("Cannot drain connections: cancel first.", ErrorCodes::LOGICAL_ERROR);
+
+    Packet res;
+    res.type = Protocol::Server::EndOfStream;
+
+    while (!epoll.empty())
+    {
+        ReplicaLocation location = getReadyReplicaLocation();
+        Packet packet = receivePacketFromReplica(location);
+        switch (packet.type)
+        {
+            case Protocol::Server::PartUUIDs:
+            case Protocol::Server::Data:
+            case Protocol::Server::Progress:
+            case Protocol::Server::ProfileInfo:
+            case Protocol::Server::Totals:
+            case Protocol::Server::Extremes:
+            case Protocol::Server::EndOfStream:
+                break;
+
+            case Protocol::Server::Exception:
+            default:
+                /// If we receive an exception or an unknown packet, we save it.
+                res = std::move(packet);
+                break;
+        }
+    }
+
+    return res;
+}
+
+Packet HedgedConnections::receivePacket()
+{
+    std::lock_guard lock(cancel_mutex);
+    return receivePacketUnlocked({});
+}
+
+Packet HedgedConnections::receivePacketUnlocked(AsyncCallback async_callback)
+{
+    if (!sent_query)
+        throw Exception("Cannot receive packets: no query sent.", ErrorCodes::LOGICAL_ERROR);
+    if (!hasActiveConnections())
+        throw Exception("No more packets are available.", ErrorCodes::LOGICAL_ERROR);
+
+    if (epoll.empty())
+        throw Exception("No pending events in epoll.", ErrorCodes::LOGICAL_ERROR);
+
+    ReplicaLocation location = getReadyReplicaLocation(std::move(async_callback));
+    return receivePacketFromReplica(location);
+}
+
+HedgedConnections::ReplicaLocation HedgedConnections::getReadyReplicaLocation(AsyncCallback async_callback)
+{
+    /// Firstly, resume replica with the last received packet if it has pending data.
+    if (replica_with_last_received_packet)
+    {
+        ReplicaLocation location = replica_with_last_received_packet.value();
+        replica_with_last_received_packet.reset();
+        if (offset_states[location.offset].replicas[location.index].connection->hasReadPendingData() && resumePacketReceiver(location))
+            return location;
+    }
+
+    int event_fd;
+    while (true)
+    {
+        /// Get ready file descriptor from epoll and process it.
+        event_fd = getReadyFileDescriptor(async_callback);
+
+        if (event_fd == hedged_connections_factory.getFileDescriptor())
+            checkNewReplica();
+        else if (fd_to_replica_location.contains(event_fd))
+        {
+            ReplicaLocation location = fd_to_replica_location[event_fd];
+            if (resumePacketReceiver(location))
+                return location;
+        }
+        else if (timeout_fd_to_replica_location.contains(event_fd))
+        {
+            ReplicaLocation location = timeout_fd_to_replica_location[event_fd];
+            offset_states[location.offset].replicas[location.index].change_replica_timeout.reset();
+            offset_states[location.offset].replicas[location.index].is_change_replica_timeout_expired = true;
+            offset_states[location.offset].next_replica_in_process = true;
+            offsets_queue.push(location.offset);
+            ProfileEvents::increment(ProfileEvents::HedgedRequestsChangeReplica);
+            startNewReplica();
+        }
+        else
+            throw Exception("Unknown event from epoll", ErrorCodes::LOGICAL_ERROR);
+    }
+};
+
+bool HedgedConnections::resumePacketReceiver(const HedgedConnections::ReplicaLocation & location)
+{
+    ReplicaState & replica_state = offset_states[location.offset].replicas[location.index];
+    auto res = replica_state.packet_receiver->resume();
+
+    if (std::holds_alternative<Packet>(res))
+    {
+        last_received_packet = std::move(std::get<Packet>(res));
+        return true;
+    }
+    else if (std::holds_alternative<Poco::Timespan>(res))
+    {
+        finishProcessReplica(replica_state, true);
+
+        /// Check if there is no more active connections with the same offset and there is no new replica in process.
+        if (offset_states[location.offset].active_connection_count == 0 && !offset_states[location.offset].next_replica_in_process)
+            throw NetException("Receive timeout expired", ErrorCodes::SOCKET_TIMEOUT);
+    }
+
+    return false;
+}
+
+int HedgedConnections::getReadyFileDescriptor(AsyncCallback async_callback)
+{
+    epoll_event event;
+    event.data.fd = -1;
+    size_t events_count = 0;
+    bool blocking = !static_cast<bool>(async_callback);
+    while (events_count == 0)
+    {
+        events_count = epoll.getManyReady(1, &event, blocking);
+        if (!events_count && async_callback)
+            async_callback(epoll.getFileDescriptor(), 0, epoll.getDescription());
+    }
+    return event.data.fd;
+}
+
+Packet HedgedConnections::receivePacketFromReplica(const ReplicaLocation & replica_location)
+{
+    ReplicaState & replica = offset_states[replica_location.offset].replicas[replica_location.index];
+    Packet packet = std::move(last_received_packet);
+    switch (packet.type)
+    {
+        case Protocol::Server::Data:
+            /// If we received the first not empty data packet and still can change replica,
+            /// disable changing replica with this offset.
+            if (offset_states[replica_location.offset].can_change_replica && packet.block.rows() > 0)
+                disableChangingReplica(replica_location);
+            replica_with_last_received_packet = replica_location;
+            break;
+        case Protocol::Server::Progress:
+            /// Check if we have made some progress and still can change replica.
+            if (offset_states[replica_location.offset].can_change_replica && packet.progress.read_bytes > 0)
+            {
+                /// If we are allowed to change replica until the first data packet,
+                /// just restart timeout (if it hasn't expired yet). Otherwise disable changing replica with this offset.
+                if (settings.allow_changing_replica_until_first_data_packet && !replica.is_change_replica_timeout_expired)
+                    replica.change_replica_timeout.setRelative(hedged_connections_factory.getConnectionTimeouts().receive_data_timeout);
+                else
+                    disableChangingReplica(replica_location);
+            }
+            replica_with_last_received_packet = replica_location;
+            break;
+        case Protocol::Server::PartUUIDs:
+        case Protocol::Server::ProfileInfo:
+        case Protocol::Server::Totals:
+        case Protocol::Server::Extremes:
+        case Protocol::Server::Log:
+            replica_with_last_received_packet = replica_location;
+            break;
+
+        case Protocol::Server::EndOfStream:
+            /// Check case when we receive EndOfStream before first not empty data packet
+            /// or positive progress. It may happen if max_parallel_replicas > 1 and
+            /// there is no way to sample data in this query.
+            if (offset_states[replica_location.offset].can_change_replica)
+                disableChangingReplica(replica_location);
+            finishProcessReplica(replica, false);
+            break;
+
+        case Protocol::Server::Exception:
+        default:
+            /// Check case when we receive Exception before first not empty data packet
+            /// or positive progress. It may happen if max_parallel_replicas > 1 and
+            /// there is no way to sample data in this query.
+            if (offset_states[replica_location.offset].can_change_replica)
+                disableChangingReplica(replica_location);
+            finishProcessReplica(replica, true);
+            break;
+    }
+
+    return packet;
+}
+
+void HedgedConnections::disableChangingReplica(const ReplicaLocation & replica_location)
+{
+    /// Stop working with replicas, that are responsible for the same offset.
+    OffsetState & offset_state = offset_states[replica_location.offset];
+    offset_state.replicas[replica_location.index].change_replica_timeout.reset();
+    ++offsets_with_disabled_changing_replica;
+    offset_state.can_change_replica = false;
+
+    for (size_t i = 0; i != offset_state.replicas.size(); ++i)
+    {
+        if (i != replica_location.index && offset_state.replicas[i].connection)
+        {
+            offset_state.replicas[i].connection->sendCancel();
+            finishProcessReplica(offset_state.replicas[i], true);
+        }
+    }
+
+    /// If we disabled changing replica with all offsets, we need to stop choosing new replicas.
+    if (hedged_connections_factory.hasEventsInProcess() && offsets_with_disabled_changing_replica == offset_states.size())
+    {
+        if (hedged_connections_factory.numberOfProcessingReplicas() > 0)
+            epoll.remove(hedged_connections_factory.getFileDescriptor());
+        hedged_connections_factory.stopChoosingReplicas();
+    }
+}
+
+void HedgedConnections::startNewReplica()
+{
+    Connection * connection = nullptr;
+    HedgedConnectionsFactory::State state = hedged_connections_factory.startNewConnection(connection);
+
+    /// Check if we need to add hedged_connections_factory file descriptor to epoll.
+    if (state == HedgedConnectionsFactory::State::NOT_READY && hedged_connections_factory.numberOfProcessingReplicas() == 1)
+        epoll.add(hedged_connections_factory.getFileDescriptor());
+
+    processNewReplicaState(state, connection);
+}
+
+void HedgedConnections::checkNewReplica()
+{
+    Connection * connection = nullptr;
+    HedgedConnectionsFactory::State state = hedged_connections_factory.waitForReadyConnections(connection);
+
+    processNewReplicaState(state, connection);
+
+    /// Check if we don't need to listen hedged_connections_factory file descriptor in epoll anymore.
+    if (hedged_connections_factory.numberOfProcessingReplicas() == 0)
+        epoll.remove(hedged_connections_factory.getFileDescriptor());
+}
+
+void HedgedConnections::processNewReplicaState(HedgedConnectionsFactory::State state, Connection * connection)
+{
+    switch (state)
+    {
+        case HedgedConnectionsFactory::State::READY:
+        {
+            size_t offset = offsets_queue.front();
+            offsets_queue.pop();
+
+            offset_states[offset].replicas.emplace_back(connection);
+            ++offset_states[offset].active_connection_count;
+            offset_states[offset].next_replica_in_process = false;
+            ++active_connection_count;
+
+            ReplicaState & replica = offset_states[offset].replicas.back();
+            epoll.add(replica.packet_receiver->getFileDescriptor());
+            fd_to_replica_location[replica.packet_receiver->getFileDescriptor()] = ReplicaLocation{offset, offset_states[offset].replicas.size() - 1};
+            epoll.add(replica.change_replica_timeout.getDescriptor());
+            timeout_fd_to_replica_location[replica.change_replica_timeout.getDescriptor()] = ReplicaLocation{offset, offset_states[offset].replicas.size() - 1};
+
+            pipeline_for_new_replicas.run(replica);
+            break;
+        }
+        case HedgedConnectionsFactory::State::CANNOT_CHOOSE:
+        {
+            while (!offsets_queue.empty())
+            {
+                /// Check if there is no active replica with needed offsets.
+                if (offset_states[offsets_queue.front()].active_connection_count == 0)
+                    throw Exception("Cannot find enough connections to replicas", ErrorCodes::ALL_CONNECTION_TRIES_FAILED);
+                offset_states[offsets_queue.front()].next_replica_in_process = false;
+                offsets_queue.pop();
+            }
+            break;
+        }
+        case HedgedConnectionsFactory::State::NOT_READY:
+            break;
+    }
+}
+
+void HedgedConnections::finishProcessReplica(ReplicaState & replica, bool disconnect)
+{
+    /// It's important to remove file descriptor from epoll exactly before cancelling packet_receiver,
+    /// because otherwise another thread can try to receive a packet, get this file descriptor
+    /// from epoll and resume cancelled packet_receiver.
+    epoll.remove(replica.packet_receiver->getFileDescriptor());
+    epoll.remove(replica.change_replica_timeout.getDescriptor());
+
+    replica.packet_receiver->cancel();
+    replica.change_replica_timeout.reset();
+
+    --offset_states[fd_to_replica_location[replica.packet_receiver->getFileDescriptor()].offset].active_connection_count;
+    fd_to_replica_location.erase(replica.packet_receiver->getFileDescriptor());
+    timeout_fd_to_replica_location.erase(replica.change_replica_timeout.getDescriptor());
+
+    --active_connection_count;
+
+    if (disconnect)
+        replica.connection->disconnect();
+    replica.connection = nullptr;
+}
+
+}
+#endif
diff --git a/src/Client/HedgedConnections.h b/src/Client/HedgedConnections.h
new file mode 100644
index 00000000000..9f7d8837536
--- /dev/null
+++ b/src/Client/HedgedConnections.h
@@ -0,0 +1,200 @@
+#pragma once
+#if defined(OS_LINUX)
+
+#include <functional>
+#include <queue>
+#include <optional>
+
+#include <Client/HedgedConnectionsFactory.h>
+#include <Client/IConnections.h>
+#include <Client/PacketReceiver.h>
+#include <Common/FiberStack.h>
+#include <Common/Fiber.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+
+/** To receive data from multiple replicas (connections) from one shard asynchronously.
+  * The principe of Hedged Connections is used to reduce tail latency:
+  * if we don't receive data from replica and there is no progress in query execution
+  * for a long time, we try to get new replica and send query to it,
+  * without cancelling working with previous replica. This class
+  * supports all functionality that MultipleConnections has.
+  */
+class HedgedConnections : public IConnections
+{
+public:
+    using PacketReceiverPtr = std::unique_ptr<PacketReceiver>;
+    struct ReplicaState
+    {
+        explicit ReplicaState(Connection * connection_) : connection(connection_), packet_receiver(std::make_unique<PacketReceiver>(connection_))
+        {
+        }
+
+        Connection * connection = nullptr;
+        PacketReceiverPtr packet_receiver;
+        TimerDescriptor change_replica_timeout;
+        bool is_change_replica_timeout_expired = false;
+    };
+
+    struct OffsetState
+    {
+        /// Replicas with the same offset.
+        std::vector<ReplicaState> replicas;
+        /// An amount of active replicas. When can_change_replica is false,
+        /// active_connection_count is always <= 1 (because we stopped working with
+        /// other replicas with the same offset)
+        size_t active_connection_count = 0;
+        bool can_change_replica = true;
+
+        /// This flag is true when this offset is in queue for
+        /// new replicas. It's needed to process receive timeout
+        /// (throw an exception when receive timeout expired and there is no
+        /// new replica in process)
+        bool next_replica_in_process = false;
+    };
+
+    /// We process events in epoll, so we need to determine replica by it's
+    /// file descriptor. We store map fd -> replica location. To determine
+    /// where replica is, we need a replica offset
+    /// (the same as parallel_replica_offset), and index, which is needed because
+    /// we can have many replicas with same offset (when receive_data_timeout has expired).
+    struct ReplicaLocation
+    {
+        size_t offset;
+        size_t index;
+    };
+
+    HedgedConnections(const ConnectionPoolWithFailoverPtr & pool_,
+                      const Settings & settings_,
+                      const ConnectionTimeouts & timeouts_,
+                      const ThrottlerPtr & throttler,
+                      PoolMode pool_mode,
+                      std::shared_ptr<QualifiedTableName> table_to_check_ = nullptr);
+
+    void sendScalarsData(Scalars & data) override;
+
+    void sendExternalTablesData(std::vector<ExternalTablesData> & data) override;
+
+    void sendQuery(
+        const ConnectionTimeouts & timeouts,
+        const String & query,
+        const String & query_id,
+        UInt64 stage,
+        const ClientInfo & client_info,
+        bool with_pending_data) override;
+
+    void sendReadTaskResponse(const String &) override
+    {
+        throw Exception("sendReadTaskResponse in not supported with HedgedConnections", ErrorCodes::LOGICAL_ERROR);
+    }
+
+    Packet receivePacket() override;
+
+    Packet receivePacketUnlocked(AsyncCallback async_callback) override;
+
+    void disconnect() override;
+
+    void sendCancel() override;
+
+    void sendIgnoredPartUUIDs(const std::vector<UUID> & uuids) override;
+
+    Packet drain() override;
+
+    std::string dumpAddresses() const override;
+
+    size_t size() const override { return offset_states.size(); }
+
+    bool hasActiveConnections() const override { return active_connection_count > 0; }
+
+private:
+    /// If we don't receive data from replica and there is no progress in query
+    /// execution for receive_data_timeout, we are trying to get new
+    /// replica and send query to it. Beside sending query, there are some
+    /// additional actions like sendScalarsData or sendExternalTablesData and we need
+    /// to perform these actions in the same order on the new replica. So, we will
+    /// save actions with replicas in pipeline to perform them on the new replicas.
+    class Pipeline
+    {
+    public:
+        void add(std::function<void(ReplicaState &)> send_function);
+
+        void run(ReplicaState & replica);
+    private:
+        std::vector<std::function<void(ReplicaState &)>> pipeline;
+    };
+
+    Packet receivePacketFromReplica(const ReplicaLocation & replica_location);
+
+    ReplicaLocation getReadyReplicaLocation(AsyncCallback async_callback = {});
+
+    bool resumePacketReceiver(const ReplicaLocation & replica_location);
+
+    void disableChangingReplica(const ReplicaLocation & replica_location);
+
+    void startNewReplica();
+
+    void checkNewReplica();
+
+    void processNewReplicaState(HedgedConnectionsFactory::State state, Connection * connection);
+
+    void finishProcessReplica(ReplicaState & replica, bool disconnect);
+
+    int getReadyFileDescriptor(AsyncCallback async_callback = {});
+
+    HedgedConnectionsFactory hedged_connections_factory;
+
+    /// All replicas in offset_states[offset] is responsible for process query
+    /// with setting parallel_replica_offset = offset. In common situations
+    /// replica_states[offset].replicas.size() = 1 (like in MultiplexedConnections).
+    std::vector<OffsetState> offset_states;
+
+    /// Map socket file descriptor to replica location (it's offset and index in OffsetState.replicas).
+    std::unordered_map<int, ReplicaLocation> fd_to_replica_location;
+
+    /// Map receive data timeout file descriptor to replica location.
+    std::unordered_map<int, ReplicaLocation> timeout_fd_to_replica_location;
+
+    /// A queue of offsets for new replicas. When we get RECEIVE_DATA_TIMEOUT from
+    /// the replica, we push it's offset to this queue and start trying to get
+    /// new replica.
+    std::queue<int> offsets_queue;
+
+    /// The current number of valid connections to the replicas of this shard.
+    size_t active_connection_count;
+
+    /// We count offsets in which we can't change replica anymore,
+    /// it's needed to cancel choosing new replicas when we
+    /// disabled replica changing in all offsets.
+    size_t offsets_with_disabled_changing_replica;
+
+    Pipeline pipeline_for_new_replicas;
+
+    /// New replica may not support two-level aggregation due to version incompatibility.
+    /// If we didn't disabled it, we need to skip this replica.
+    bool disable_two_level_aggregation = false;
+
+    /// We will save replica with last received packet
+    /// (except cases when packet type is EndOfStream or Exception)
+    /// to resume it's packet receiver when new packet is needed.
+    std::optional<ReplicaLocation> replica_with_last_received_packet;
+
+    Packet last_received_packet;
+
+    Epoll epoll;
+    const Settings & settings;
+    ThrottlerPtr throttler;
+    bool sent_query = false;
+    bool cancelled = false;
+
+    mutable std::mutex cancel_mutex;
+};
+
+}
+#endif
diff --git a/src/Client/HedgedConnectionsFactory.cpp b/src/Client/HedgedConnectionsFactory.cpp
new file mode 100644
index 00000000000..b0c5a3d22f5
--- /dev/null
+++ b/src/Client/HedgedConnectionsFactory.cpp
@@ -0,0 +1,409 @@
+#if defined(OS_LINUX)
+
+#include <Client/HedgedConnectionsFactory.h>
+#include <Common/typeid_cast.h>
+#include <Common/ProfileEvents.h>
+
+namespace ProfileEvents
+{
+    extern const Event HedgedRequestsChangeReplica;
+}
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int ALL_CONNECTION_TRIES_FAILED;
+    extern const int ALL_REPLICAS_ARE_STALE;
+    extern const int LOGICAL_ERROR;
+}
+
+HedgedConnectionsFactory::HedgedConnectionsFactory(
+    const ConnectionPoolWithFailoverPtr & pool_,
+    const Settings * settings_,
+    const ConnectionTimeouts & timeouts_,
+    std::shared_ptr<QualifiedTableName> table_to_check_)
+    : pool(pool_), settings(settings_), timeouts(timeouts_), table_to_check(table_to_check_), log(&Poco::Logger::get("HedgedConnectionsFactory"))
+{
+    shuffled_pools = pool->getShuffledPools(settings);
+    for (size_t i = 0; i != shuffled_pools.size(); ++i)
+        replicas.emplace_back(ConnectionEstablisherAsync(shuffled_pools[i].pool, &timeouts, settings, log, table_to_check.get()));
+
+    max_tries
+        = (settings ? size_t{settings->connections_with_failover_max_tries} : size_t{DBMS_CONNECTION_POOL_WITH_FAILOVER_DEFAULT_MAX_TRIES});
+
+    fallback_to_stale_replicas = settings && settings->fallback_to_stale_replicas_for_distributed_queries;
+}
+
+HedgedConnectionsFactory::~HedgedConnectionsFactory()
+{
+    /// Stop anything that maybe in progress,
+    /// to avoid interfer with the subsequent connections.
+    ///
+    /// I.e. some replcas may be in the establishing state,
+    /// this means that hedged connection is waiting for TablesStatusResponse,
+    /// and if the connection will not be canceled,
+    /// then next user of the connection will get TablesStatusResponse,
+    /// while this is not the expected package.
+    stopChoosingReplicas();
+
+    pool->updateSharedError(shuffled_pools);
+}
+
+std::vector<Connection *> HedgedConnectionsFactory::getManyConnections(PoolMode pool_mode)
+{
+    size_t min_entries = (settings && settings->skip_unavailable_shards) ? 0 : 1;
+
+    size_t max_entries = 1;
+    switch (pool_mode)
+    {
+        case PoolMode::GET_ALL:
+        {
+            min_entries = shuffled_pools.size();
+            max_entries = shuffled_pools.size();
+            break;
+        }
+        case PoolMode::GET_ONE:
+        {
+            max_entries = 1;
+            break;
+        }
+        case PoolMode::GET_MANY:
+        {
+            max_entries = settings ? size_t(settings->max_parallel_replicas) : 1;
+            break;
+        }
+    }
+
+    std::vector<Connection *> connections;
+    connections.reserve(max_entries);
+    Connection * connection = nullptr;
+
+    /// Try to start establishing connections with max_entries replicas.
+    for (size_t i = 0; i != max_entries; ++i)
+    {
+        ++requested_connections_count;
+        State state = startNewConnectionImpl(connection);
+        if (state == State::READY)
+            connections.push_back(connection);
+        if (state == State::CANNOT_CHOOSE)
+            break;
+    }
+
+    /// Process connections until we get enough READY connections
+    /// (work asynchronously with all connections we started).
+    /// TODO: when we get GET_ALL mode we can start reading packets from ready
+    /// TODO: connection as soon as we got it, not even waiting for the others.
+    while (connections.size() < max_entries)
+    {
+        /// Set blocking = true to avoid busy-waiting here.
+        auto state = waitForReadyConnectionsImpl(/*blocking = */true, connection);
+        if (state == State::READY)
+            connections.push_back(connection);
+        else if (state == State::CANNOT_CHOOSE)
+        {
+            if (connections.size() >= min_entries)
+                break;
+
+            /// Determine the reason of not enough replicas.
+            if (!fallback_to_stale_replicas && up_to_date_count < min_entries)
+                throw Exception(
+                    "Could not find enough connections to up-to-date replicas. Got: " + std::to_string(connections.size())
+                    + ", needed: " + std::to_string(min_entries),
+                    DB::ErrorCodes::ALL_REPLICAS_ARE_STALE);
+            if (usable_count < min_entries)
+                throw NetException(
+                    "All connection tries failed. Log: \n\n" + fail_messages + "\n",
+                    DB::ErrorCodes::ALL_CONNECTION_TRIES_FAILED);
+
+            throw Exception("Unknown reason of not enough replicas.", ErrorCodes::LOGICAL_ERROR);
+        }
+    }
+
+    return connections;
+}
+
+HedgedConnectionsFactory::State HedgedConnectionsFactory::startNewConnection(Connection *& connection_out)
+{
+    ++requested_connections_count;
+    State state = startNewConnectionImpl(connection_out);
+    /// If we cannot start new connection but there are connections in epoll, return NOT_READY.
+    if (state == State::CANNOT_CHOOSE && !epoll.empty())
+        state = State::NOT_READY;
+
+    return state;
+}
+
+HedgedConnectionsFactory::State HedgedConnectionsFactory::waitForReadyConnections(Connection *& connection_out)
+{
+    return waitForReadyConnectionsImpl(false, connection_out);
+}
+
+HedgedConnectionsFactory::State HedgedConnectionsFactory::waitForReadyConnectionsImpl(bool blocking, Connection *& connection_out)
+{
+    State state = processEpollEvents(blocking, connection_out);
+    if (state != State::CANNOT_CHOOSE)
+        return state;
+
+    /// We reach this point only if there was no free up to date replica.
+    /// We will try to use usable replica.
+
+    /// Check if we are not allowed to use usable replicas or there is no even a free usable replica.
+    if (!fallback_to_stale_replicas)
+        return State::CANNOT_CHOOSE;
+
+    return setBestUsableReplica(connection_out);
+}
+
+int HedgedConnectionsFactory::getNextIndex()
+{
+    /// Check if there is no free replica.
+    if (entries_count + replicas_in_process_count + failed_pools_count >= shuffled_pools.size())
+        return -1;
+
+    /// Check if it's the first time.
+    if (last_used_index == -1)
+    {
+        last_used_index = 0;
+        return 0;
+    }
+
+    bool finish = false;
+    int next_index = last_used_index;
+    while (!finish)
+    {
+        next_index = (next_index + 1) % shuffled_pools.size();
+
+        /// Check if we can try this replica.
+        if (replicas[next_index].connection_establisher.getResult().entry.isNull()
+            && (max_tries == 0 || shuffled_pools[next_index].error_count < max_tries))
+            finish = true;
+
+        /// If we made a complete round, there is no replica to connect.
+        else if (next_index == last_used_index)
+            return -1;
+    }
+
+    last_used_index = next_index;
+    return next_index;
+}
+
+HedgedConnectionsFactory::State HedgedConnectionsFactory::startNewConnectionImpl(Connection *& connection_out)
+{
+    int index;
+    State state;
+    do
+    {
+        index = getNextIndex();
+        if (index == -1)
+            return State::CANNOT_CHOOSE;
+
+        state = resumeConnectionEstablisher(index, connection_out);
+    }
+    while (state == State::CANNOT_CHOOSE);
+
+    return state;
+}
+
+HedgedConnectionsFactory::State HedgedConnectionsFactory::processEpollEvents(bool blocking, Connection *& connection_out)
+{
+    int event_fd;
+    while (!epoll.empty())
+    {
+        event_fd = getReadyFileDescriptor(blocking);
+
+        if (event_fd == -1)
+            return State::NOT_READY;
+
+        if (fd_to_replica_index.contains(event_fd))
+        {
+            int index = fd_to_replica_index[event_fd];
+            State state = resumeConnectionEstablisher(index, connection_out);
+            if (state == State::NOT_READY)
+                continue;
+
+            /// Connection establishing not in process now, remove all
+            /// information about it from epoll.
+            removeReplicaFromEpoll(index, event_fd);
+
+            if (state == State::READY)
+                return state;
+        }
+        else if (timeout_fd_to_replica_index.contains(event_fd))
+        {
+            int index = timeout_fd_to_replica_index[event_fd];
+            replicas[index].change_replica_timeout.reset();
+            ++shuffled_pools[index].slowdown_count;
+            ProfileEvents::increment(ProfileEvents::HedgedRequestsChangeReplica);
+        }
+        else
+            throw Exception("Unknown event from epoll", ErrorCodes::LOGICAL_ERROR);
+
+        /// We reach this point only if we need to start new connection
+        /// (Special timeout expired or one of the previous connections failed).
+        /// Return only if replica is ready.
+        if (startNewConnectionImpl(connection_out) == State::READY)
+            return State::READY;
+    }
+
+    return State::CANNOT_CHOOSE;
+}
+
+int HedgedConnectionsFactory::getReadyFileDescriptor(bool blocking)
+{
+    epoll_event event;
+    event.data.fd = -1;
+    epoll.getManyReady(1, &event, blocking);
+    return event.data.fd;
+}
+
+HedgedConnectionsFactory::State HedgedConnectionsFactory::resumeConnectionEstablisher(int index, Connection *& connection_out)
+{
+    auto res = replicas[index].connection_establisher.resume();
+
+    if (std::holds_alternative<TryResult>(res))
+        return processFinishedConnection(index, std::get<TryResult>(res), connection_out);
+
+    int fd = std::get<int>(res);
+    if (!fd_to_replica_index.contains(fd))
+        addNewReplicaToEpoll(index, fd);
+
+    return State::NOT_READY;
+}
+
+HedgedConnectionsFactory::State HedgedConnectionsFactory::processFinishedConnection(int index, TryResult result, Connection *& connection_out)
+{
+    const std::string & fail_message = replicas[index].connection_establisher.getFailMessage();
+    if (!fail_message.empty())
+        fail_messages += fail_message + "\n";
+
+    if (!result.entry.isNull())
+    {
+        ++entries_count;
+
+        if (result.is_usable)
+        {
+            ++usable_count;
+            if (result.is_up_to_date)
+            {
+                ++up_to_date_count;
+                if (!skip_replicas_with_two_level_aggregation_incompatibility || !isTwoLevelAggregationIncompatible(&*result.entry))
+                {
+                    replicas[index].is_ready = true;
+                    ++ready_replicas_count;
+                    connection_out = &*result.entry;
+                    return State::READY;
+                }
+            }
+        }
+    }
+    else
+    {
+        ShuffledPool & shuffled_pool = shuffled_pools[index];
+        LOG_WARNING(
+            log, "Connection failed at try №{}, reason: {}", (shuffled_pool.error_count + 1), fail_message);
+        ProfileEvents::increment(ProfileEvents::DistributedConnectionFailTry);
+
+        shuffled_pool.error_count = std::min(pool->getMaxErrorCup(), shuffled_pool.error_count + 1);
+        shuffled_pool.slowdown_count = 0;
+
+        if (shuffled_pool.error_count >= max_tries)
+        {
+            ++failed_pools_count;
+            ProfileEvents::increment(ProfileEvents::DistributedConnectionFailAtAll);
+        }
+    }
+
+    return State::CANNOT_CHOOSE;
+}
+
+void HedgedConnectionsFactory::stopChoosingReplicas()
+{
+    for (auto & [fd, index] : fd_to_replica_index)
+    {
+        --replicas_in_process_count;
+        epoll.remove(fd);
+        replicas[index].connection_establisher.cancel();
+    }
+
+    for (auto & [timeout_fd, index] : timeout_fd_to_replica_index)
+    {
+        replicas[index].change_replica_timeout.reset();
+        epoll.remove(timeout_fd);
+    }
+
+    fd_to_replica_index.clear();
+    timeout_fd_to_replica_index.clear();
+}
+
+void HedgedConnectionsFactory::addNewReplicaToEpoll(int index, int fd)
+{
+    ++replicas_in_process_count;
+    epoll.add(fd);
+    fd_to_replica_index[fd] = index;
+
+    /// Add timeout for changing replica.
+    replicas[index].change_replica_timeout.setRelative(timeouts.hedged_connection_timeout);
+    epoll.add(replicas[index].change_replica_timeout.getDescriptor());
+    timeout_fd_to_replica_index[replicas[index].change_replica_timeout.getDescriptor()] = index;
+}
+
+void HedgedConnectionsFactory::removeReplicaFromEpoll(int index, int fd)
+{
+    --replicas_in_process_count;
+    epoll.remove(fd);
+    fd_to_replica_index.erase(fd);
+
+    replicas[index].change_replica_timeout.reset();
+    epoll.remove(replicas[index].change_replica_timeout.getDescriptor());
+    timeout_fd_to_replica_index.erase(replicas[index].change_replica_timeout.getDescriptor());
+}
+
+int HedgedConnectionsFactory::numberOfProcessingReplicas() const
+{
+    if (epoll.empty())
+        return 0;
+
+    return requested_connections_count - ready_replicas_count;
+}
+
+HedgedConnectionsFactory::State HedgedConnectionsFactory::setBestUsableReplica(Connection *& connection_out)
+{
+    std::vector<int> indexes;
+    for (size_t i = 0; i != replicas.size(); ++i)
+    {
+        /// Don't add unusable, failed replicas and replicas that are ready or in process.
+        TryResult result = replicas[i].connection_establisher.getResult();
+        if (!result.entry.isNull()
+            && result.is_usable
+            && !replicas[i].is_ready
+            && (!skip_replicas_with_two_level_aggregation_incompatibility || !isTwoLevelAggregationIncompatible(&*result.entry)))
+            indexes.push_back(i);
+    }
+
+    if (indexes.empty())
+        return State::CANNOT_CHOOSE;
+
+    /// Sort replicas by staleness.
+    std::stable_sort(
+        indexes.begin(),
+        indexes.end(),
+        [&](size_t lhs, size_t rhs)
+        {
+            return replicas[lhs].connection_establisher.getResult().staleness < replicas[rhs].connection_establisher.getResult().staleness;
+        });
+
+    replicas[indexes[0]].is_ready = true;
+    TryResult result = replicas[indexes[0]].connection_establisher.getResult();
+    connection_out = &*result.entry;
+    return State::READY;
+}
+
+bool HedgedConnectionsFactory::isTwoLevelAggregationIncompatible(Connection * connection)
+{
+    return connection->getServerRevision(timeouts) < DBMS_MIN_REVISION_WITH_CURRENT_AGGREGATION_VARIANT_SELECTION_METHOD;
+}
+
+}
+#endif
diff --git a/src/Client/HedgedConnectionsFactory.h b/src/Client/HedgedConnectionsFactory.h
new file mode 100644
index 00000000000..c5e8d493efa
--- /dev/null
+++ b/src/Client/HedgedConnectionsFactory.h
@@ -0,0 +1,158 @@
+#pragma once
+
+#if defined(OS_LINUX)
+
+#include <Common/TimerDescriptor.h>
+#include <Common/Epoll.h>
+#include <Common/FiberStack.h>
+#include <Common/Fiber.h>
+#include <Client/ConnectionEstablisher.h>
+#include <Client/ConnectionPoolWithFailover.h>
+#include <Core/Settings.h>
+#include <unordered_map>
+#include <memory>
+
+namespace DB
+{
+
+/** Class for establishing hedged connections with replicas.
+  * The process of establishing connection is divided on stages, on each stage if
+  * replica doesn't respond for a long time, we start establishing connection with
+  * the next replica, without cancelling working with previous one.
+  * It works with multiple replicas simultaneously without blocking by using epoll.
+  */
+class HedgedConnectionsFactory
+{
+public:
+    using ShuffledPool = ConnectionPoolWithFailover::Base::ShuffledPool;
+    using TryResult = PoolWithFailoverBase<IConnectionPool>::TryResult;
+
+    enum class State
+    {
+        READY,
+        NOT_READY,
+        CANNOT_CHOOSE,
+    };
+
+    struct ReplicaStatus
+    {
+        explicit ReplicaStatus(ConnectionEstablisherAsync connection_stablisher_) : connection_establisher(std::move(connection_stablisher_))
+        {
+        }
+
+        ConnectionEstablisherAsync connection_establisher;
+        TimerDescriptor change_replica_timeout;
+        bool is_ready = false;
+    };
+
+    HedgedConnectionsFactory(const ConnectionPoolWithFailoverPtr & pool_,
+                        const Settings * settings_,
+                        const ConnectionTimeouts & timeouts_,
+                        std::shared_ptr<QualifiedTableName> table_to_check_ = nullptr);
+
+    /// Create and return active connections according to pool_mode.
+    std::vector<Connection *> getManyConnections(PoolMode pool_mode);
+
+    /// Try to get connection to the new replica without blocking. Process all current events in epoll (connections, timeouts),
+    /// Returned state might be READY (connection established successfully),
+    /// NOT_READY (there are no ready events now) and CANNOT_CHOOSE (cannot produce new connection anymore).
+    /// If state is READY, replica connection will be written in connection_out.
+    State waitForReadyConnections(Connection *& connection_out);
+
+    State startNewConnection(Connection *& connection_out);
+
+    /// Stop working with all replicas that are not READY.
+    void stopChoosingReplicas();
+
+    bool hasEventsInProcess() const { return !epoll.empty(); }
+
+    int getFileDescriptor() const { return epoll.getFileDescriptor(); }
+
+    const ConnectionTimeouts & getConnectionTimeouts() const { return timeouts; }
+
+    int numberOfProcessingReplicas() const;
+
+    /// Tell Factory to not return connections with two level aggregation incompatibility.
+    void skipReplicasWithTwoLevelAggregationIncompatibility() { skip_replicas_with_two_level_aggregation_incompatibility = true; }
+
+    ~HedgedConnectionsFactory();
+
+private:
+    State waitForReadyConnectionsImpl(bool blocking, Connection *& connection_out);
+
+    /// Try to start establishing connection to the new replica. Return
+    /// the index of the new replica or -1 if cannot start new connection.
+    State startNewConnectionImpl(Connection *& connection_out);
+
+    /// Find an index of the next free replica to start connection.
+    /// Return -1 if there is no free replica.
+    int getNextIndex();
+
+    int getReadyFileDescriptor(bool blocking);
+
+    void processFailedConnection(int index, const std::string & fail_message);
+
+    State resumeConnectionEstablisher(int index, Connection *& connection_out);
+
+    State processFinishedConnection(int index, TryResult result, Connection *& connection_out);
+
+    void removeReplicaFromEpoll(int index, int fd);
+
+    void addNewReplicaToEpoll(int index, int fd);
+
+    /// Return NOT_READY state if there is no ready events, READY if replica is ready
+    /// and CANNOT_CHOOSE if there is no more events in epoll.
+    State processEpollEvents(bool blocking, Connection *& connection_out);
+
+    State setBestUsableReplica(Connection *& connection_out);
+
+    bool isTwoLevelAggregationIncompatible(Connection * connection);
+
+    const ConnectionPoolWithFailoverPtr pool;
+    const Settings * settings;
+    const ConnectionTimeouts timeouts;
+
+    std::vector<ShuffledPool> shuffled_pools;
+    std::vector<ReplicaStatus> replicas;
+
+    /// Map socket file descriptor to replica index.
+    std::unordered_map<int, int> fd_to_replica_index;
+
+    /// Map timeout for changing replica to replica index.
+    std::unordered_map<int, int> timeout_fd_to_replica_index;
+
+    /// If this flag is true, don't return connections with
+    /// two level aggregation incompatibility
+    bool skip_replicas_with_two_level_aggregation_incompatibility = false;
+
+    std::shared_ptr<QualifiedTableName> table_to_check;
+    int last_used_index = -1;
+    bool fallback_to_stale_replicas;
+    Epoll epoll;
+    Poco::Logger * log;
+    std::string fail_messages;
+
+    /// The maximum number of attempts to connect to replicas.
+    size_t max_tries;
+    /// Total number of established connections.
+    size_t entries_count = 0;
+    /// The number of established connections that are usable.
+    size_t usable_count = 0;
+    /// The number of established connections that are up to date.
+    size_t up_to_date_count = 0;
+    /// The number of failed connections (replica is considered failed after max_tries attempts to connect).
+    size_t failed_pools_count= 0;
+
+    /// The number of replicas that are in process of connection.
+    size_t replicas_in_process_count = 0;
+    /// The number of ready replicas (replica is considered ready when it's
+    /// connection returns outside).
+    size_t ready_replicas_count = 0;
+
+    /// The number of requested in startNewConnection replicas (it's needed for
+    /// checking the number of requested replicas that are still in process).
+    size_t requested_connections_count = 0;
+};
+
+}
+#endif
diff --git a/src/Client/IConnections.h b/src/Client/IConnections.h
new file mode 100644
index 00000000000..d251a5fb3ab
--- /dev/null
+++ b/src/Client/IConnections.h
@@ -0,0 +1,62 @@
+#pragma once
+
+#include <Client/Connection.h>
+
+namespace DB
+{
+
+/// Base class for working with multiple replicas (connections)
+/// from one shard within a single thread
+class IConnections : boost::noncopyable
+{
+public:
+    /// Send all scalars to replicas.
+    virtual void sendScalarsData(Scalars & data) = 0;
+    /// Send all content of external tables to replicas.
+    virtual void sendExternalTablesData(std::vector<ExternalTablesData> & data) = 0;
+
+    /// Send request to replicas.
+    virtual void sendQuery(
+        const ConnectionTimeouts & timeouts,
+        const String & query,
+        const String & query_id,
+        UInt64 stage,
+        const ClientInfo & client_info,
+        bool with_pending_data) = 0;
+
+    virtual void sendReadTaskResponse(const String &) = 0;
+
+    /// Get packet from any replica.
+    virtual Packet receivePacket() = 0;
+
+    /// Version of `receivePacket` function without locking.
+    virtual Packet receivePacketUnlocked(AsyncCallback async_callback) = 0;
+
+    /// Break all active connections.
+    virtual void disconnect() = 0;
+
+    /// Send a request to replicas to cancel the request
+    virtual void sendCancel() = 0;
+
+    /// Send parts' uuids to replicas to exclude them from query processing
+    virtual void sendIgnoredPartUUIDs(const std::vector<UUID> & uuids) = 0;
+
+    /** On each replica, read and skip all packets to EndOfStream or Exception.
+      * Returns EndOfStream if no exception has been received. Otherwise
+      * returns the last received packet of type Exception.
+      */
+    virtual Packet drain() = 0;
+
+    /// Get the replica addresses as a string.
+    virtual std::string dumpAddresses() const = 0;
+
+    /// Returns the number of replicas.
+    virtual size_t size() const = 0;
+
+    /// Check if there are any valid replicas.
+    virtual bool hasActiveConnections() const = 0;
+
+    virtual ~IConnections() = default;
+};
+
+}
diff --git a/src/Client/MultiplexedConnections.cpp b/src/Client/MultiplexedConnections.cpp
index c50dd7b6454..350beffce28 100644
--- a/src/Client/MultiplexedConnections.cpp
+++ b/src/Client/MultiplexedConnections.cpp
@@ -13,6 +13,7 @@ namespace ErrorCodes
     extern const int MISMATCH_REPLICAS_DATA_SOURCES;
     extern const int NO_AVAILABLE_REPLICA;
     extern const int TIMEOUT_EXCEEDED;
+    extern const int UNKNOWN_PACKET_FROM_SERVER;
 }
 
 
@@ -155,10 +156,19 @@ void MultiplexedConnections::sendIgnoredPartUUIDs(const std::vector<UUID> & uuid
     }
 }
 
+
+void MultiplexedConnections::sendReadTaskResponse(const String & response)
+{
+    std::lock_guard lock(cancel_mutex);
+    if (cancelled)
+        return;
+    current_connection->sendReadTaskResponse(response);
+}
+
 Packet MultiplexedConnections::receivePacket()
 {
     std::lock_guard lock(cancel_mutex);
-    Packet packet = receivePacketUnlocked();
+    Packet packet = receivePacketUnlocked({});
     return packet;
 }
 
@@ -206,10 +216,11 @@ Packet MultiplexedConnections::drain()
 
     while (hasActiveConnections())
     {
-        Packet packet = receivePacketUnlocked();
+        Packet packet = receivePacketUnlocked({});
 
         switch (packet.type)
         {
+            case Protocol::Server::ReadTaskRequest:
             case Protocol::Server::PartUUIDs:
             case Protocol::Server::Data:
             case Protocol::Server::Progress:
@@ -253,7 +264,7 @@ std::string MultiplexedConnections::dumpAddressesUnlocked() const
     return buf.str();
 }
 
-Packet MultiplexedConnections::receivePacketUnlocked(std::function<void(Poco::Net::Socket &)> async_callback)
+Packet MultiplexedConnections::receivePacketUnlocked(AsyncCallback async_callback)
 {
     if (!sent_query)
         throw Exception("Cannot receive packets: no query sent.", ErrorCodes::LOGICAL_ERROR);
@@ -265,10 +276,30 @@ Packet MultiplexedConnections::receivePacketUnlocked(std::function<void(Poco::Ne
     if (current_connection == nullptr)
         throw Exception("Logical error: no available replica", ErrorCodes::NO_AVAILABLE_REPLICA);
 
-    Packet packet = current_connection->receivePacket(std::move(async_callback));
+    Packet packet;
+    {
+        AsyncCallbackSetter async_setter(current_connection, std::move(async_callback));
+
+        try
+        {
+            packet = current_connection->receivePacket();
+        }
+        catch (Exception & e)
+        {
+            if (e.code() == ErrorCodes::UNKNOWN_PACKET_FROM_SERVER)
+            {
+                /// Exception may happen when packet is received, e.g. when got unknown packet.
+                /// In this case, invalidate replica, so that we would not read from it anymore.
+                current_connection->disconnect();
+                invalidateReplica(state);
+            }
+            throw;
+        }
+    }
 
     switch (packet.type)
     {
+        case Protocol::Server::ReadTaskRequest:
         case Protocol::Server::PartUUIDs:
         case Protocol::Server::Data:
         case Protocol::Server::Progress:
diff --git a/src/Client/MultiplexedConnections.h b/src/Client/MultiplexedConnections.h
index da0326fa6c0..f642db1c4cd 100644
--- a/src/Client/MultiplexedConnections.h
+++ b/src/Client/MultiplexedConnections.h
@@ -5,6 +5,7 @@
 #include <Client/Connection.h>
 #include <Client/ConnectionPoolWithFailover.h>
 #include <IO/ConnectionTimeouts.h>
+#include <Client/IConnections.h>
 
 namespace DB
 {
@@ -16,7 +17,7 @@ namespace DB
   *
   * The interface is almost the same as Connection.
   */
-class MultiplexedConnections final : private boost::noncopyable
+class MultiplexedConnections final : public IConnections
 {
 public:
     /// Accepts ready connection.
@@ -27,52 +28,40 @@ public:
         std::vector<IConnectionPool::Entry> && connections,
         const Settings & settings_, const ThrottlerPtr & throttler_);
 
-    /// Send all scalars to replicas.
-    void sendScalarsData(Scalars & data);
-    /// Send all content of external tables to replicas.
-    void sendExternalTablesData(std::vector<ExternalTablesData> & data);
+    void sendScalarsData(Scalars & data) override;
+    void sendExternalTablesData(std::vector<ExternalTablesData> & data) override;
 
-    /// Send request to replicas.
     void sendQuery(
         const ConnectionTimeouts & timeouts,
         const String & query,
         const String & query_id,
         UInt64 stage,
         const ClientInfo & client_info,
-        bool with_pending_data);
+        bool with_pending_data) override;
 
-    /// Get packet from any replica.
-    Packet receivePacket();
+    void sendReadTaskResponse(const String &) override;
 
-    /// Break all active connections.
-    void disconnect();
+    Packet receivePacket() override;
 
-    /// Send a request to the replica to cancel the request
-    void sendCancel();
+    void disconnect() override;
+
+    void sendCancel() override;
 
     /// Send parts' uuids to replicas to exclude them from query processing
-    void sendIgnoredPartUUIDs(const std::vector<UUID> & uuids);
+    void sendIgnoredPartUUIDs(const std::vector<UUID> & uuids) override;
 
-    /** On each replica, read and skip all packets to EndOfStream or Exception.
-      * Returns EndOfStream if no exception has been received. Otherwise
-      * returns the last received packet of type Exception.
-      */
-    Packet drain();
+    Packet drain() override;
 
-    /// Get the replica addresses as a string.
-    std::string dumpAddresses() const;
+    std::string dumpAddresses() const override;
 
-    /// Returns the number of replicas.
     /// Without locking, because sendCancel() does not change this number.
-    size_t size() const { return replica_states.size(); }
+    size_t size() const override { return replica_states.size(); }
 
-    /// Check if there are any valid replicas.
     /// Without locking, because sendCancel() does not change the state of the replicas.
-    bool hasActiveConnections() const { return active_connection_count > 0; }
+    bool hasActiveConnections() const override { return active_connection_count > 0; }
 
 private:
-    /// Internal version of `receivePacket` function without locking.
-    Packet receivePacketUnlocked(std::function<void(Poco::Net::Socket &)> async_callback = {});
+    Packet receivePacketUnlocked(AsyncCallback async_callback) override;
 
     /// Internal version of `dumpAddresses` function without locking.
     std::string dumpAddressesUnlocked() const;
diff --git a/src/Client/PacketReceiver.h b/src/Client/PacketReceiver.h
new file mode 100644
index 00000000000..2252e63a2f6
--- /dev/null
+++ b/src/Client/PacketReceiver.h
@@ -0,0 +1,161 @@
+#pragma once
+
+#if defined(OS_LINUX)
+
+#include <variant>
+
+#include <Client/IConnections.h>
+#include <Common/FiberStack.h>
+#include <Common/Fiber.h>
+#include <Common/Epoll.h>
+#include <Common/TimerDescriptor.h>
+
+namespace DB
+{
+
+/// Class for nonblocking packet receiving. It runs connection->receivePacket
+/// in fiber and sets special read callback which is called when
+/// reading from socket blocks. When read callback is called,
+/// socket and receive timeout are added in epoll and execution returns to the main program.
+/// So, you can poll this epoll file descriptor to determine when to resume
+/// packet receiving.
+class PacketReceiver
+{
+public:
+    explicit PacketReceiver(Connection * connection_) : connection(connection_)
+    {
+        epoll.add(receive_timeout.getDescriptor());
+        epoll.add(connection->getSocket()->impl()->sockfd());
+
+        fiber = boost::context::fiber(std::allocator_arg_t(), fiber_stack, Routine{*this});
+    }
+
+    /// Resume packet receiving.
+    std::variant<int, Packet, Poco::Timespan> resume()
+    {
+        /// If there is no pending data, check receive timeout.
+        if (!connection->hasReadPendingData() && !checkReceiveTimeout())
+        {
+            /// Receive timeout expired.
+            return Poco::Timespan();
+        }
+
+        /// Resume fiber.
+        fiber = std::move(fiber).resume();
+        if (exception)
+            std::rethrow_exception(std::move(exception));
+
+        if (is_read_in_process)
+            return epoll.getFileDescriptor();
+
+        /// Receiving packet was finished.
+        return std::move(packet);
+    }
+
+    void cancel()
+    {
+        Fiber to_destroy = std::move(fiber);
+        connection = nullptr;
+    }
+
+    int getFileDescriptor() const { return epoll.getFileDescriptor(); }
+
+private:
+    /// When epoll file descriptor is ready, check if it's an expired timeout.
+    /// Return false if receive timeout expired and socket is not ready, return true otherwise.
+    bool checkReceiveTimeout()
+    {
+        bool is_socket_ready = false;
+        bool is_receive_timeout_expired = false;
+
+        epoll_event events[2];
+        events[0].data.fd = events[1].data.fd = -1;
+        size_t ready_count = epoll.getManyReady(2, events, true);
+
+        for (size_t i = 0; i != ready_count; ++i)
+        {
+            if (events[i].data.fd == connection->getSocket()->impl()->sockfd())
+                is_socket_ready = true;
+            if (events[i].data.fd == receive_timeout.getDescriptor())
+                is_receive_timeout_expired = true;
+        }
+
+        if (is_receive_timeout_expired && !is_socket_ready)
+        {
+            receive_timeout.reset();
+            return false;
+        }
+
+        return true;
+    }
+
+    struct Routine
+    {
+        PacketReceiver & receiver;
+
+        struct ReadCallback
+        {
+            PacketReceiver & receiver;
+            Fiber & sink;
+
+            void operator()(int, const Poco::Timespan & timeout, const std::string &)
+            {
+                receiver.receive_timeout.setRelative(timeout);
+                receiver.is_read_in_process = true;
+                sink = std::move(sink).resume();
+                receiver.is_read_in_process = false;
+                receiver.receive_timeout.reset();
+            }
+        };
+
+        Fiber operator()(Fiber && sink)
+        {
+            try
+            {
+                while (true)
+                {
+                    {
+                        AsyncCallbackSetter async_setter(receiver.connection, ReadCallback{receiver, sink});
+                        receiver.packet = receiver.connection->receivePacket();
+                    }
+                    sink = std::move(sink).resume();
+                }
+
+            }
+            catch (const boost::context::detail::forced_unwind &)
+            {
+                /// This exception is thrown by fiber implementation in case if fiber is being deleted but hasn't exited
+                /// It should not be caught or it will segfault.
+                /// Other exceptions must be caught
+                throw;
+            }
+            catch (...)
+            {
+                receiver.exception = std::current_exception();
+            }
+
+            return std::move(sink);
+        }
+    };
+
+    Connection * connection;
+    Packet packet;
+
+    Fiber fiber;
+    FiberStack fiber_stack;
+
+    /// We use timer descriptor for checking socket receive timeout.
+    TimerDescriptor receive_timeout;
+
+    /// In read callback we add socket file descriptor and timer descriptor with receive timeout
+    /// in epoll, so we can return epoll file descriptor outside for polling.
+    Epoll epoll;
+
+    /// If and exception occurred in fiber resume, we save it and rethrow.
+    std::exception_ptr exception;
+
+    bool is_read_in_process = false;
+};
+
+}
+#endif
diff --git a/src/Client/ya.make b/src/Client/ya.make
index 87a0cea102a..4201203a8e9 100644
--- a/src/Client/ya.make
+++ b/src/Client/ya.make
@@ -11,9 +11,11 @@ PEERDIR(
 
 SRCS(
     Connection.cpp
+    ConnectionEstablisher.cpp
     ConnectionPoolWithFailover.cpp
+    HedgedConnections.cpp
+    HedgedConnectionsFactory.cpp
     MultiplexedConnections.cpp
-    TimeoutSetter.cpp
 
 )
 
diff --git a/src/Columns/ColumnAggregateFunction.cpp b/src/Columns/ColumnAggregateFunction.cpp
index d0a5e120a07..8178802f3bd 100644
--- a/src/Columns/ColumnAggregateFunction.cpp
+++ b/src/Columns/ColumnAggregateFunction.cpp
@@ -24,6 +24,7 @@ namespace ErrorCodes
     extern const int PARAMETER_OUT_OF_BOUND;
     extern const int SIZES_OF_COLUMNS_DOESNT_MATCH;
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+    extern const int NOT_IMPLEMENTED;
 }
 
 
@@ -161,7 +162,7 @@ MutableColumnPtr ColumnAggregateFunction::convertToValues(MutableColumnPtr colum
     return res;
 }
 
-MutableColumnPtr ColumnAggregateFunction::predictValues(const ColumnsWithTypeAndName & arguments, const Context & context) const
+MutableColumnPtr ColumnAggregateFunction::predictValues(const ColumnsWithTypeAndName & arguments, ContextPtr context) const
 {
     MutableColumnPtr res = func->getReturnTypeToPredict()->createColumn();
     res->reserve(data.size());
@@ -553,6 +554,11 @@ const char * ColumnAggregateFunction::deserializeAndInsertFromArena(const char *
     return read_buffer.position();
 }
 
+const char * ColumnAggregateFunction::skipSerializedInArena(const char *) const
+{
+    throw Exception("Method skipSerializedInArena is not supported for " + getName(), ErrorCodes::NOT_IMPLEMENTED);
+}
+
 void ColumnAggregateFunction::popBack(size_t n)
 {
     size_t size = data.size();
diff --git a/src/Columns/ColumnAggregateFunction.h b/src/Columns/ColumnAggregateFunction.h
index cd45cf583a0..8eb1a04b174 100644
--- a/src/Columns/ColumnAggregateFunction.h
+++ b/src/Columns/ColumnAggregateFunction.h
@@ -82,7 +82,7 @@ private:
     /// Name of the type to distinguish different aggregation states.
     String type_string;
 
-    ColumnAggregateFunction() {}
+    ColumnAggregateFunction() = default;
 
     /// Create a new column that has another column as a source.
     MutablePtr createView() const;
@@ -119,7 +119,7 @@ public:
     const char * getFamilyName() const override { return "AggregateFunction"; }
     TypeIndex getDataType() const override { return TypeIndex::AggregateFunction; }
 
-    MutableColumnPtr predictValues(const ColumnsWithTypeAndName & arguments, const Context & context) const;
+    MutableColumnPtr predictValues(const ColumnsWithTypeAndName & arguments, ContextPtr context) const;
 
     size_t size() const override
     {
@@ -155,6 +155,8 @@ public:
 
     const char * deserializeAndInsertFromArena(const char * src_arena) override;
 
+    const char * skipSerializedInArena(const char *) const override;
+
     void updateHashWithValue(size_t n, SipHash & hash) const override;
 
     void updateWeakHash32(WeakHash32 & hash) const override;
@@ -198,6 +200,11 @@ public:
         throw Exception("Method compareColumn is not supported for ColumnAggregateFunction", ErrorCodes::NOT_IMPLEMENTED);
     }
 
+    bool hasEqualValues() const override
+    {
+        throw Exception("Method hasEqualValues is not supported for ColumnAggregateFunction", ErrorCodes::NOT_IMPLEMENTED);
+    }
+
     void getPermutation(bool reverse, size_t limit, int nan_direction_hint, Permutation & res) const override;
     void updatePermutation(bool reverse, size_t limit, int, Permutation & res, EqualRanges & equal_range) const override;
 
diff --git a/src/Columns/ColumnArray.cpp b/src/Columns/ColumnArray.cpp
index e8a48672435..1b0c9f5162f 100644
--- a/src/Columns/ColumnArray.cpp
+++ b/src/Columns/ColumnArray.cpp
@@ -239,6 +239,16 @@ const char * ColumnArray::deserializeAndInsertFromArena(const char * pos)
     return pos;
 }
 
+const char * ColumnArray::skipSerializedInArena(const char * pos) const
+{
+    size_t array_size = unalignedLoad<size_t>(pos);
+    pos += sizeof(array_size);
+
+    for (size_t i = 0; i < array_size; ++i)
+        pos = getData().skipSerializedInArena(pos);
+
+    return pos;
+}
 
 void ColumnArray::updateHashWithValue(size_t n, SipHash & hash) const
 {
@@ -370,6 +380,10 @@ void ColumnArray::compareColumn(const IColumn & rhs, size_t rhs_row_num,
                                         compare_results, direction, nan_direction_hint);
 }
 
+bool ColumnArray::hasEqualValues() const
+{
+    return hasEqualValuesImpl<ColumnArray>();
+}
 
 namespace
 {
@@ -1197,7 +1211,6 @@ ColumnPtr ColumnArray::replicateTuple(const Offsets & replicate_offsets) const
         assert_cast<const ColumnArray &>(*temporary_arrays.front()).getOffsetsPtr());
 }
 
-
 void ColumnArray::gather(ColumnGathererStream & gatherer)
 {
     gatherer.gather(*this);
diff --git a/src/Columns/ColumnArray.h b/src/Columns/ColumnArray.h
index 1caaf672d49..75bd4a6dba4 100644
--- a/src/Columns/ColumnArray.h
+++ b/src/Columns/ColumnArray.h
@@ -61,6 +61,7 @@ public:
     void insertData(const char * pos, size_t length) override;
     StringRef serializeValueIntoArena(size_t n, Arena & arena, char const *& begin) const override;
     const char * deserializeAndInsertFromArena(const char * pos) override;
+    const char * skipSerializedInArena(const char * pos) const override;
     void updateHashWithValue(size_t n, SipHash & hash) const override;
     void updateWeakHash32(WeakHash32 & hash) const override;
     void updateHashFast(SipHash & hash) const override;
@@ -78,6 +79,7 @@ public:
                        PaddedPODArray<UInt64> * row_indexes, PaddedPODArray<Int8> & compare_results,
                        int direction, int nan_direction_hint) const override;
     int compareAtWithCollation(size_t n, size_t m, const IColumn & rhs_, int nan_direction_hint, const Collator & collator) const override;
+    bool hasEqualValues() const override;
     void getPermutation(bool reverse, size_t limit, int nan_direction_hint, Permutation & res) const override;
     void updatePermutation(bool reverse, size_t limit, int nan_direction_hint, Permutation & res, EqualRanges & equal_range) const override;
     void getPermutationWithCollation(const Collator & collator, bool reverse, size_t limit, int nan_direction_hint, Permutation & res) const override;
diff --git a/src/Columns/ColumnCompressed.h b/src/Columns/ColumnCompressed.h
index f6b6bf22177..3cc2c014732 100644
--- a/src/Columns/ColumnCompressed.h
+++ b/src/Columns/ColumnCompressed.h
@@ -85,6 +85,7 @@ public:
     void popBack(size_t) override { throwMustBeDecompressed(); }
     StringRef serializeValueIntoArena(size_t, Arena &, char const *&) const override { throwMustBeDecompressed(); }
     const char * deserializeAndInsertFromArena(const char *) override { throwMustBeDecompressed(); }
+    const char * skipSerializedInArena(const char *) const override { throwMustBeDecompressed(); }
     void updateHashWithValue(size_t, SipHash &) const override { throwMustBeDecompressed(); }
     void updateWeakHash32(WeakHash32 &) const override { throwMustBeDecompressed(); }
     void updateHashFast(SipHash &) const override { throwMustBeDecompressed(); }
@@ -96,6 +97,10 @@ public:
     {
         throwMustBeDecompressed();
     }
+    bool hasEqualValues() const override
+    {
+        throwMustBeDecompressed();
+    }
     void getPermutation(bool, size_t, int, Permutation &) const override { throwMustBeDecompressed(); }
     void updatePermutation(bool, size_t, int, Permutation &, EqualRanges &) const override { throwMustBeDecompressed(); }
     ColumnPtr replicate(const Offsets &) const override { throwMustBeDecompressed(); }
diff --git a/src/Columns/ColumnConst.h b/src/Columns/ColumnConst.h
index 99c997ab269..01d5b235a2b 100644
--- a/src/Columns/ColumnConst.h
+++ b/src/Columns/ColumnConst.h
@@ -163,6 +163,11 @@ public:
         return res;
     }
 
+    const char * skipSerializedInArena(const char * pos) const override
+    {
+        return data->skipSerializedInArena(pos);
+    }
+
     void updateHashWithValue(size_t, SipHash & hash) const override
     {
         data->updateHashWithValue(0, hash);
@@ -206,6 +211,8 @@ public:
                        PaddedPODArray<UInt64> * row_indexes, PaddedPODArray<Int8> & compare_results,
                        int direction, int nan_direction_hint) const override;
 
+    bool hasEqualValues() const override { return true; }
+
     MutableColumns scatter(ColumnIndex num_columns, const Selector & selector) const override;
 
     void gather(ColumnGathererStream &) override
@@ -248,7 +255,7 @@ public:
 
     /// The constant value. It is valid even if the size of the column is 0.
     template <typename T>
-    T getValue() const { return getField().safeGet<NearestFieldType<T>>(); }
+    T getValue() const { return getField().safeGet<T>(); }
 
     bool isCollationSupported() const override { return data->isCollationSupported(); }
 };
diff --git a/src/Columns/ColumnDecimal.cpp b/src/Columns/ColumnDecimal.cpp
index bad3a4c3402..ec08db274b3 100644
--- a/src/Columns/ColumnDecimal.cpp
+++ b/src/Columns/ColumnDecimal.cpp
@@ -58,6 +58,12 @@ void ColumnDecimal<T>::compareColumn(const IColumn & rhs, size_t rhs_row_num,
                                                          compare_results, direction, nan_direction_hint);
 }
 
+template <typename T>
+bool ColumnDecimal<T>::hasEqualValues() const
+{
+    return this->template hasEqualValuesImpl<ColumnDecimal<T>>();
+}
+
 template <typename T>
 StringRef ColumnDecimal<T>::serializeValueIntoArena(size_t n, Arena & arena, char const *& begin) const
 {
@@ -73,6 +79,12 @@ const char * ColumnDecimal<T>::deserializeAndInsertFromArena(const char * pos)
     return pos + sizeof(T);
 }
 
+template <typename T>
+const char * ColumnDecimal<T>::skipSerializedInArena(const char * pos) const
+{
+    return pos + sizeof(T);
+}
+
 template <typename T>
 UInt64 ColumnDecimal<T>::get64([[maybe_unused]] size_t n) const
 {
diff --git a/src/Columns/ColumnDecimal.h b/src/Columns/ColumnDecimal.h
index 5016ddca791..a4fa15c2d95 100644
--- a/src/Columns/ColumnDecimal.h
+++ b/src/Columns/ColumnDecimal.h
@@ -107,7 +107,7 @@ public:
     {
         data.resize_fill(data.size() + length);
     }
-    void insert(const Field & x) override { data.push_back(DB::get<NearestFieldType<T>>(x)); }
+    void insert(const Field & x) override { data.push_back(DB::get<T>(x)); }
     void insertRangeFrom(const IColumn & src, size_t start, size_t length) override;
 
     void popBack(size_t n) override
@@ -129,6 +129,7 @@ public:
 
     StringRef serializeValueIntoArena(size_t n, Arena & arena, char const *& begin) const override;
     const char * deserializeAndInsertFromArena(const char * pos) override;
+    const char * skipSerializedInArena(const char * pos) const override;
     void updateHashWithValue(size_t n, SipHash & hash) const override;
     void updateWeakHash32(WeakHash32 & hash) const override;
     void updateHashFast(SipHash & hash) const override;
@@ -136,6 +137,7 @@ public:
     void compareColumn(const IColumn & rhs, size_t rhs_row_num,
                        PaddedPODArray<UInt64> * row_indexes, PaddedPODArray<Int8> & compare_results,
                        int direction, int nan_direction_hint) const override;
+    bool hasEqualValues() const override;
     void getPermutation(bool reverse, size_t limit, int nan_direction_hint, IColumn::Permutation & res) const override;
     void updatePermutation(bool reverse, size_t limit, int, IColumn::Permutation & res, EqualRanges& equal_range) const override;
 
diff --git a/src/Columns/ColumnFixedString.cpp b/src/Columns/ColumnFixedString.cpp
index c4a7f923867..4d54a46c924 100644
--- a/src/Columns/ColumnFixedString.cpp
+++ b/src/Columns/ColumnFixedString.cpp
@@ -100,6 +100,11 @@ const char * ColumnFixedString::deserializeAndInsertFromArena(const char * pos)
     return pos + n;
 }
 
+const char * ColumnFixedString::skipSerializedInArena(const char * pos) const
+{
+    return pos + n;
+}
+
 void ColumnFixedString::updateHashWithValue(size_t index, SipHash & hash) const
 {
     hash.update(reinterpret_cast<const char *>(&chars[n * index]), n);
@@ -474,19 +479,4 @@ ColumnPtr ColumnFixedString::compress() const
         });
 }
 
-
-void ColumnFixedString::alignStringLength(ColumnFixedString::Chars & data, size_t n, size_t old_size)
-{
-    size_t length = data.size() - old_size;
-    if (length < n)
-    {
-        data.resize_fill(old_size + n);
-    }
-    else if (length > n)
-    {
-        data.resize_assume_reserved(old_size);
-        throw Exception("Too large value for FixedString(" + std::to_string(n) + ")", ErrorCodes::TOO_LARGE_STRING_SIZE);
-    }
-}
-
 }
diff --git a/src/Columns/ColumnFixedString.h b/src/Columns/ColumnFixedString.h
index d9f6619b2d1..5fd482aef6e 100644
--- a/src/Columns/ColumnFixedString.h
+++ b/src/Columns/ColumnFixedString.h
@@ -112,6 +112,8 @@ public:
 
     const char * deserializeAndInsertFromArena(const char * pos) override;
 
+    const char * skipSerializedInArena(const char * pos) const override;
+
     void updateHashWithValue(size_t index, SipHash & hash) const override;
 
     void updateWeakHash32(WeakHash32 & hash) const override;
@@ -132,6 +134,11 @@ public:
                                                compare_results, direction, nan_direction_hint);
     }
 
+    bool hasEqualValues() const override
+    {
+        return hasEqualValuesImpl<ColumnFixedString>();
+    }
+
     void getPermutation(bool reverse, size_t limit, int nan_direction_hint, Permutation & res) const override;
 
     void updatePermutation(bool reverse, size_t limit, int nan_direction_hint, Permutation & res, EqualRanges & equal_range) const override;
@@ -184,8 +191,6 @@ public:
     const Chars & getChars() const { return chars; }
 
     size_t getN() const { return n; }
-
-    static void alignStringLength(ColumnFixedString::Chars & data, size_t n, size_t old_size);
 };
 
 }
diff --git a/src/Columns/ColumnFunction.h b/src/Columns/ColumnFunction.h
index f97f41a8627..fa605e741aa 100644
--- a/src/Columns/ColumnFunction.h
+++ b/src/Columns/ColumnFunction.h
@@ -98,6 +98,11 @@ public:
         throw Exception("Cannot deserialize to " + getName(), ErrorCodes::NOT_IMPLEMENTED);
     }
 
+    const char * skipSerializedInArena(const char*) const override
+    {
+        throw Exception("Cannot skip serialized " + getName(), ErrorCodes::NOT_IMPLEMENTED);
+    }
+
     void updateHashWithValue(size_t, SipHash &) const override
     {
         throw Exception("updateHashWithValue is not implemented for " + getName(), ErrorCodes::NOT_IMPLEMENTED);
@@ -128,6 +133,11 @@ public:
         throw Exception("compareColumn is not implemented for " + getName(), ErrorCodes::NOT_IMPLEMENTED);
     }
 
+    bool hasEqualValues() const override
+    {
+        throw Exception("hasEqualValues is not implemented for " + getName(), ErrorCodes::NOT_IMPLEMENTED);
+    }
+
     void getPermutation(bool, size_t, int, Permutation &) const override
     {
         throw Exception("getPermutation is not implemented for " + getName(), ErrorCodes::NOT_IMPLEMENTED);
diff --git a/src/Columns/ColumnLowCardinality.cpp b/src/Columns/ColumnLowCardinality.cpp
index 8af3b240cb9..c4d7e75dd2d 100644
--- a/src/Columns/ColumnLowCardinality.cpp
+++ b/src/Columns/ColumnLowCardinality.cpp
@@ -122,7 +122,7 @@ namespace
         else if (auto * data_uint64 = getIndexesData<UInt64>(column))
             return mapUniqueIndexImpl(*data_uint64);
         else
-            throw Exception("Indexes column for getUniqueIndex must be ColumnUInt, got" + column.getName(),
+            throw Exception("Indexes column for getUniqueIndex must be ColumnUInt, got " + column.getName(),
                             ErrorCodes::LOGICAL_ERROR);
     }
 }
@@ -151,7 +151,7 @@ void ColumnLowCardinality::insertFrom(const IColumn & src, size_t n)
     const auto * low_cardinality_src = typeid_cast<const ColumnLowCardinality *>(&src);
 
     if (!low_cardinality_src)
-        throw Exception("Expected ColumnLowCardinality, got" + src.getName(), ErrorCodes::ILLEGAL_COLUMN);
+        throw Exception("Expected ColumnLowCardinality, got " + src.getName(), ErrorCodes::ILLEGAL_COLUMN);
 
     size_t position = low_cardinality_src->getIndexes().getUInt(n);
 
@@ -247,6 +247,11 @@ const char * ColumnLowCardinality::deserializeAndInsertFromArena(const char * po
     return new_pos;
 }
 
+const char * ColumnLowCardinality::skipSerializedInArena(const char * pos) const
+{
+    return getDictionary().skipSerializedInArena(pos);
+}
+
 void ColumnLowCardinality::updateWeakHash32(WeakHash32 & hash) const
 {
     auto s = size();
@@ -311,6 +316,13 @@ void ColumnLowCardinality::compareColumn(const IColumn & rhs, size_t rhs_row_num
             compare_results, direction, nan_direction_hint);
 }
 
+bool ColumnLowCardinality::hasEqualValues() const
+{
+    if (getDictionary().size() <= 1)
+        return true;
+    return getIndexes().hasEqualValues();
+}
+
 void ColumnLowCardinality::getPermutationImpl(bool reverse, size_t limit, int nan_direction_hint, Permutation & res, const Collator * collator) const
 {
     if (limit == 0)
diff --git a/src/Columns/ColumnLowCardinality.h b/src/Columns/ColumnLowCardinality.h
index a497be8847d..92bf7ff0f95 100644
--- a/src/Columns/ColumnLowCardinality.h
+++ b/src/Columns/ColumnLowCardinality.h
@@ -94,6 +94,8 @@ public:
 
     const char * deserializeAndInsertFromArena(const char * pos) override;
 
+    const char * skipSerializedInArena(const char * pos) const override;
+
     void updateHashWithValue(size_t n, SipHash & hash) const override
     {
         return getDictionary().updateHashWithValue(getIndexes().getUInt(n), hash);
@@ -126,6 +128,8 @@ public:
 
     int compareAtWithCollation(size_t n, size_t m, const IColumn & rhs, int nan_direction_hint, const Collator &) const override;
 
+    bool hasEqualValues() const override;
+
     void getPermutation(bool reverse, size_t limit, int nan_direction_hint, Permutation & res) const override;
 
     void updatePermutation(bool reverse, size_t limit, int, IColumn::Permutation & res, EqualRanges & equal_range) const override;
diff --git a/src/Columns/ColumnMap.cpp b/src/Columns/ColumnMap.cpp
index cc2640a9cf6..05c0e0458d8 100644
--- a/src/Columns/ColumnMap.cpp
+++ b/src/Columns/ColumnMap.cpp
@@ -116,6 +116,11 @@ const char * ColumnMap::deserializeAndInsertFromArena(const char * pos)
     return nested->deserializeAndInsertFromArena(pos);
 }
 
+const char * ColumnMap::skipSerializedInArena(const char * pos) const
+{
+    return nested->skipSerializedInArena(pos);
+}
+
 void ColumnMap::updateHashWithValue(size_t n, SipHash & hash) const
 {
     nested->updateHashWithValue(n, hash);
@@ -187,6 +192,11 @@ void ColumnMap::compareColumn(const IColumn & rhs, size_t rhs_row_num,
                                         compare_results, direction, nan_direction_hint);
 }
 
+bool ColumnMap::hasEqualValues() const
+{
+    return hasEqualValuesImpl<ColumnMap>();
+}
+
 void ColumnMap::getPermutation(bool reverse, size_t limit, int nan_direction_hint, Permutation & res) const
 {
     nested->getPermutation(reverse, limit, nan_direction_hint, res);
@@ -229,7 +239,21 @@ void ColumnMap::protect()
 
 void ColumnMap::getExtremes(Field & min, Field & max) const
 {
-    nested->getExtremes(min, max);
+    Field nested_min;
+    Field nested_max;
+
+    nested->getExtremes(nested_min, nested_max);
+
+    /// Convert result Array fields to Map fields because client expect min and max field to have type Map
+
+    Array nested_min_value = nested_min.get<Array>();
+    Array nested_max_value = nested_max.get<Array>();
+
+    Map map_min_value(nested_min_value.begin(), nested_min_value.end());
+    Map map_max_value(nested_max_value.begin(), nested_max_value.end());
+
+    min = std::move(map_min_value);
+    max = std::move(map_max_value);
 }
 
 void ColumnMap::forEachSubcolumn(ColumnCallback callback)
diff --git a/src/Columns/ColumnMap.h b/src/Columns/ColumnMap.h
index acae1574f4c..17f0ccc422c 100644
--- a/src/Columns/ColumnMap.h
+++ b/src/Columns/ColumnMap.h
@@ -58,6 +58,7 @@ public:
     void popBack(size_t n) override;
     StringRef serializeValueIntoArena(size_t n, Arena & arena, char const *& begin) const override;
     const char * deserializeAndInsertFromArena(const char * pos) override;
+    const char * skipSerializedInArena(const char * pos) const override;
     void updateHashWithValue(size_t n, SipHash & hash) const override;
     void updateWeakHash32(WeakHash32 & hash) const override;
     void updateHashFast(SipHash & hash) const override;
@@ -72,6 +73,7 @@ public:
     void compareColumn(const IColumn & rhs, size_t rhs_row_num,
                        PaddedPODArray<UInt64> * row_indexes, PaddedPODArray<Int8> & compare_results,
                        int direction, int nan_direction_hint) const override;
+    bool hasEqualValues() const override;
     void getExtremes(Field & min, Field & max) const override;
     void getPermutation(bool reverse, size_t limit, int nan_direction_hint, Permutation & res) const override;
     void updatePermutation(bool reverse, size_t limit, int nan_direction_hint, IColumn::Permutation & res, EqualRanges & equal_range) const override;
diff --git a/src/Columns/ColumnNullable.cpp b/src/Columns/ColumnNullable.cpp
index 4e5cc2b4cf7..1e529751437 100644
--- a/src/Columns/ColumnNullable.cpp
+++ b/src/Columns/ColumnNullable.cpp
@@ -152,6 +152,17 @@ const char * ColumnNullable::deserializeAndInsertFromArena(const char * pos)
     return pos;
 }
 
+const char * ColumnNullable::skipSerializedInArena(const char * pos) const
+{
+    UInt8 val = unalignedLoad<UInt8>(pos);
+    pos += sizeof(val);
+
+    if (val == 0)
+        return getNestedColumn().skipSerializedInArena(pos);
+
+    return pos;
+}
+
 void ColumnNullable::insertRangeFrom(const IColumn & src, size_t start, size_t length)
 {
     const ColumnNullable & nullable_col = assert_cast<const ColumnNullable &>(src);
@@ -271,6 +282,11 @@ void ColumnNullable::compareColumn(const IColumn & rhs, size_t rhs_row_num,
                                            compare_results, direction, nan_direction_hint);
 }
 
+bool ColumnNullable::hasEqualValues() const
+{
+    return hasEqualValuesImpl<ColumnNullable>();
+}
+
 void ColumnNullable::getPermutationImpl(bool reverse, size_t limit, int null_direction_hint, Permutation & res, const Collator * collator) const
 {
     /// Cannot pass limit because of unknown amount of NULLs.
diff --git a/src/Columns/ColumnNullable.h b/src/Columns/ColumnNullable.h
index 8d267de8644..963b3e1e8fa 100644
--- a/src/Columns/ColumnNullable.h
+++ b/src/Columns/ColumnNullable.h
@@ -71,6 +71,7 @@ public:
     void insertData(const char * pos, size_t length) override;
     StringRef serializeValueIntoArena(size_t n, Arena & arena, char const *& begin) const override;
     const char * deserializeAndInsertFromArena(const char * pos) override;
+    const char * skipSerializedInArena(const char * pos) const override;
     void insertRangeFrom(const IColumn & src, size_t start, size_t length) override;
     void insert(const Field & x) override;
     void insertFrom(const IColumn & src, size_t n) override;
@@ -94,6 +95,7 @@ public:
                        PaddedPODArray<UInt64> * row_indexes, PaddedPODArray<Int8> & compare_results,
                        int direction, int nan_direction_hint) const override;
     int compareAtWithCollation(size_t n, size_t m, const IColumn & rhs, int null_direction_hint, const Collator &) const override;
+    bool hasEqualValues() const override;
     void getPermutation(bool reverse, size_t limit, int null_direction_hint, Permutation & res) const override;
     void updatePermutation(bool reverse, size_t limit, int null_direction_hint, Permutation & res, EqualRanges & equal_range) const override;
     void getPermutationWithCollation(const Collator & collator, bool reverse, size_t limit, int null_direction_hint, Permutation & res) const override;
diff --git a/src/Columns/ColumnString.cpp b/src/Columns/ColumnString.cpp
index 8fd22e85e10..fcd0516d465 100644
--- a/src/Columns/ColumnString.cpp
+++ b/src/Columns/ColumnString.cpp
@@ -237,6 +237,12 @@ const char * ColumnString::deserializeAndInsertFromArena(const char * pos)
     return pos + string_size;
 }
 
+const char * ColumnString::skipSerializedInArena(const char * pos) const
+{
+    const size_t string_size = unalignedLoad<size_t>(pos);
+    pos += sizeof(string_size);
+    return pos + string_size;
+}
 
 ColumnPtr ColumnString::index(const IColumn & indexes, size_t limit) const
 {
@@ -287,6 +293,11 @@ void ColumnString::compareColumn(
                                          compare_results, direction, nan_direction_hint);
 }
 
+bool ColumnString::hasEqualValues() const
+{
+    return hasEqualValuesImpl<ColumnString>();
+}
+
 template <bool positive>
 struct ColumnString::Cmp
 {
@@ -525,7 +536,6 @@ void ColumnString::getExtremes(Field & min, Field & max) const
     get(max_idx, max);
 }
 
-
 ColumnPtr ColumnString::compress() const
 {
     size_t source_chars_size = chars.size();
diff --git a/src/Columns/ColumnString.h b/src/Columns/ColumnString.h
index 843e445d1a0..0814ebaa826 100644
--- a/src/Columns/ColumnString.h
+++ b/src/Columns/ColumnString.h
@@ -111,7 +111,7 @@ public:
     }
 
 /// Suppress gcc 7.3.1 warning: '*((void*)&<anonymous> +8)' may be used uninitialized in this function
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
 #endif
@@ -128,7 +128,7 @@ public:
         offsets.push_back(new_size);
     }
 
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic pop
 #endif
 
@@ -189,6 +189,8 @@ public:
 
     const char * deserializeAndInsertFromArena(const char * pos) override;
 
+    const char * skipSerializedInArena(const char * pos) const override;
+
     void updateHashWithValue(size_t n, SipHash & hash) const override
     {
         size_t string_size = sizeAt(n);
@@ -240,6 +242,8 @@ public:
                        PaddedPODArray<UInt64> * row_indexes, PaddedPODArray<Int8> & compare_results,
                        int direction, int nan_direction_hint) const override;
 
+    bool hasEqualValues() const override;
+
     /// Variant of compareAt for string comparison with respect of collation.
     int compareAtWithCollation(size_t n, size_t m, const IColumn & rhs_, int, const Collator & collator) const override;
 
@@ -275,7 +279,6 @@ public:
         return typeid(rhs) == typeid(ColumnString);
     }
 
-
     Chars & getChars() { return chars; }
     const Chars & getChars() const { return chars; }
 
diff --git a/src/Columns/ColumnTuple.cpp b/src/Columns/ColumnTuple.cpp
index c7c5f7b97c6..bb59d58b75d 100644
--- a/src/Columns/ColumnTuple.cpp
+++ b/src/Columns/ColumnTuple.cpp
@@ -180,6 +180,14 @@ const char * ColumnTuple::deserializeAndInsertFromArena(const char * pos)
     return pos;
 }
 
+const char * ColumnTuple::skipSerializedInArena(const char * pos) const
+{
+    for (const auto & column : columns)
+        pos = column->skipSerializedInArena(pos);
+
+    return pos;
+}
+
 void ColumnTuple::updateHashWithValue(size_t n, SipHash & hash) const
 {
     for (const auto & column : columns)
@@ -312,6 +320,11 @@ int ColumnTuple::compareAtWithCollation(size_t n, size_t m, const IColumn & rhs,
     return compareAtImpl(n, m, rhs, nan_direction_hint, &collator);
 }
 
+bool ColumnTuple::hasEqualValues() const
+{
+    return hasEqualValuesImpl<ColumnTuple>();
+}
+
 template <bool positive>
 struct ColumnTuple::Less
 {
diff --git a/src/Columns/ColumnTuple.h b/src/Columns/ColumnTuple.h
index 818b29937bd..3f5422c7719 100644
--- a/src/Columns/ColumnTuple.h
+++ b/src/Columns/ColumnTuple.h
@@ -61,6 +61,7 @@ public:
     void popBack(size_t n) override;
     StringRef serializeValueIntoArena(size_t n, Arena & arena, char const *& begin) const override;
     const char * deserializeAndInsertFromArena(const char * pos) override;
+    const char * skipSerializedInArena(const char * pos) const override;
     void updateHashWithValue(size_t n, SipHash & hash) const override;
     void updateWeakHash32(WeakHash32 & hash) const override;
     void updateHashFast(SipHash & hash) const override;
@@ -76,6 +77,7 @@ public:
                        PaddedPODArray<UInt64> * row_indexes, PaddedPODArray<Int8> & compare_results,
                        int direction, int nan_direction_hint) const override;
     int compareAtWithCollation(size_t n, size_t m, const IColumn & rhs, int nan_direction_hint, const Collator & collator) const override;
+    bool hasEqualValues() const override;
     void getExtremes(Field & min, Field & max) const override;
     void getPermutation(bool reverse, size_t limit, int nan_direction_hint, Permutation & res) const override;
     void updatePermutation(bool reverse, size_t limit, int nan_direction_hint, IColumn::Permutation & res, EqualRanges & equal_ranges) const override;
diff --git a/src/Columns/ColumnUnique.h b/src/Columns/ColumnUnique.h
index fbd3c3641b5..652487c2b09 100644
--- a/src/Columns/ColumnUnique.h
+++ b/src/Columns/ColumnUnique.h
@@ -26,6 +26,7 @@ namespace ErrorCodes
 {
     extern const int LOGICAL_ERROR;
     extern const int ILLEGAL_COLUMN;
+    extern const int NOT_IMPLEMENTED;
 }
 
 /** Stores another column with unique values
@@ -78,6 +79,7 @@ public:
     bool getBool(size_t n) const override { return getNestedColumn()->getBool(n); }
     bool isNullAt(size_t n) const override { return is_nullable && n == getNullValueIndex(); }
     StringRef serializeValueIntoArena(size_t n, Arena & arena, char const *& begin) const override;
+    const char * skipSerializedInArena(const char * pos) const override;
     void updateHashWithValue(size_t n, SipHash & hash_func) const override
     {
         return getNestedColumn()->updateHashWithValue(n, hash_func);
@@ -373,6 +375,12 @@ size_t ColumnUnique<ColumnType>::uniqueDeserializeAndInsertFromArena(const char
     return uniqueInsertData(pos, string_size - 1);
 }
 
+template <typename ColumnType>
+const char * ColumnUnique<ColumnType>::skipSerializedInArena(const char *) const
+{
+    throw Exception("Method skipSerializedInArena is not supported for " + this->getName(), ErrorCodes::NOT_IMPLEMENTED);
+}
+
 template <typename ColumnType>
 int ColumnUnique<ColumnType>::compareAt(size_t n, size_t m, const IColumn & rhs, int nan_direction_hint) const
 {
diff --git a/src/Columns/ColumnVector.cpp b/src/Columns/ColumnVector.cpp
index 19ba86c5120..a64906ba257 100644
--- a/src/Columns/ColumnVector.cpp
+++ b/src/Columns/ColumnVector.cpp
@@ -50,6 +50,12 @@ const char * ColumnVector<T>::deserializeAndInsertFromArena(const char * pos)
     return pos + sizeof(T);
 }
 
+template <typename T>
+const char * ColumnVector<T>::skipSerializedInArena(const char * pos) const
+{
+    return pos + sizeof(T);
+}
+
 template <typename T>
 void ColumnVector<T>::updateHashWithValue(size_t n, SipHash & hash) const
 {
diff --git a/src/Columns/ColumnVector.h b/src/Columns/ColumnVector.h
index f0aa4a3bab5..30ab38ed1c2 100644
--- a/src/Columns/ColumnVector.h
+++ b/src/Columns/ColumnVector.h
@@ -154,6 +154,8 @@ public:
 
     const char * deserializeAndInsertFromArena(const char * pos) override;
 
+    const char * skipSerializedInArena(const char * pos) const override;
+
     void updateHashWithValue(size_t n, SipHash & hash) const override;
 
     void updateWeakHash32(WeakHash32 & hash) const override;
@@ -205,6 +207,11 @@ public:
                                                     compare_results, direction, nan_direction_hint);
     }
 
+    bool hasEqualValues() const override
+    {
+        return this->template hasEqualValuesImpl<Self>();
+    }
+
     void getPermutation(bool reverse, size_t limit, int nan_direction_hint, IColumn::Permutation & res) const override;
 
     void updatePermutation(bool reverse, size_t limit, int nan_direction_hint, IColumn::Permutation & res, EqualRanges& equal_range) const override;
@@ -254,7 +261,7 @@ public:
 
     void insert(const Field & x) override
     {
-        data.push_back(DB::get<NearestFieldType<T>>(x));
+        data.push_back(DB::get<T>(x));
     }
 
     void insertRangeFrom(const IColumn & src, size_t start, size_t length) override;
diff --git a/src/Columns/ColumnsCommon.h b/src/Columns/ColumnsCommon.h
index 7655edffa71..71f2884bf86 100644
--- a/src/Columns/ColumnsCommon.h
+++ b/src/Columns/ColumnsCommon.h
@@ -66,7 +66,7 @@ ColumnPtr selectIndexImpl(const Column & column, const IColumn & indexes, size_t
     else if (auto * data_uint64 = detail::getIndexesData<UInt64>(indexes))
         return column.template indexImpl<UInt64>(*data_uint64, limit);
     else
-        throw Exception("Indexes column for IColumn::select must be ColumnUInt, got" + indexes.getName(),
+        throw Exception("Indexes column for IColumn::select must be ColumnUInt, got " + indexes.getName(),
                         ErrorCodes::LOGICAL_ERROR);
 }
 
diff --git a/src/Columns/IColumn.h b/src/Columns/IColumn.h
index 2b4b633f9a5..23acc81e63d 100644
--- a/src/Columns/IColumn.h
+++ b/src/Columns/IColumn.h
@@ -26,6 +26,9 @@ class ColumnGathererStream;
 class Field;
 class WeakHash32;
 
+class ISerialization;
+using SerializationPtr = std::shared_ptr<const ISerialization>;
+
 
 /*
  * Represents a set of equal ranges in previous column to perform sorting in current column.
@@ -207,6 +210,10 @@ public:
     /// Returns pointer to the position after the read data.
     virtual const char * deserializeAndInsertFromArena(const char * pos) = 0;
 
+    /// Skip previously serialized value that was serialized using IColumn::serializeValueIntoArena method.
+    /// Returns a pointer to the position after the deserialized data.
+    virtual const char * skipSerializedInArena(const char *) const = 0;
+
     /// Update state of hash function with value of n-th element.
     /// On subsequent calls of this method for sequence of column values of arbitrary types,
     ///  passed bytes to hash must identify sequence of values unambiguously.
@@ -266,6 +273,9 @@ public:
                                PaddedPODArray<UInt64> * row_indexes, PaddedPODArray<Int8> & compare_results,
                                int direction, int nan_direction_hint) const = 0;
 
+    /// Check if all elements in the column have equal values. Return true if column is empty.
+    virtual bool hasEqualValues() const = 0;
+
     /** Returns a permutation that sorts elements of this column,
       *  i.e. perm[i]-th element of source column should be i-th element of sorted column.
       * reverse - reverse ordering (acsending).
@@ -467,6 +477,9 @@ protected:
                          PaddedPODArray<UInt64> * row_indexes,
                          PaddedPODArray<Int8> & compare_results,
                          int direction, int nan_direction_hint) const;
+
+    template <typename Derived>
+    bool hasEqualValuesImpl() const;
 };
 
 using ColumnPtr = IColumn::Ptr;
diff --git a/src/Columns/IColumnDummy.h b/src/Columns/IColumnDummy.h
index 10ef692dc6a..7e1958f077e 100644
--- a/src/Columns/IColumnDummy.h
+++ b/src/Columns/IColumnDummy.h
@@ -4,6 +4,7 @@
 #include <Common/PODArray.h>
 #include <Columns/IColumn.h>
 #include <Columns/ColumnsCommon.h>
+#include <Core/Field.h>
 
 
 namespace DB
@@ -40,6 +41,8 @@ public:
     {
     }
 
+    bool hasEqualValues() const override { return true; }
+
     Field operator[](size_t) const override { throw Exception("Cannot get value from " + getName(), ErrorCodes::NOT_IMPLEMENTED); }
     void get(size_t, Field &) const override { throw Exception("Cannot get value from " + getName(), ErrorCodes::NOT_IMPLEMENTED); }
     void insert(const Field &) override { throw Exception("Cannot insert element into " + getName(), ErrorCodes::NOT_IMPLEMENTED); }
@@ -56,12 +59,20 @@ public:
 
     StringRef serializeValueIntoArena(size_t /*n*/, Arena & arena, char const *& begin) const override
     {
-        return { arena.allocContinue(0, begin), 0 };
+        /// Has to put one useless byte into Arena, because serialization into zero number of bytes is ambiguous.
+        char * res = arena.allocContinue(1, begin);
+        *res = 0;
+        return { res, 1 };
     }
 
     const char * deserializeAndInsertFromArena(const char * pos) override
     {
         ++s;
+        return pos + 1;
+    }
+
+    const char * skipSerializedInArena(const char * pos) const override
+    {
         return pos;
     }
 
diff --git a/src/Columns/IColumnImpl.h b/src/Columns/IColumnImpl.h
index d2286981ac7..a1ee6a17982 100644
--- a/src/Columns/IColumnImpl.h
+++ b/src/Columns/IColumnImpl.h
@@ -127,4 +127,16 @@ void IColumn::doCompareColumn(const Derived & rhs, size_t rhs_row_num,
     }
 }
 
+template <typename Derived>
+bool IColumn::hasEqualValuesImpl() const
+{
+    size_t num_rows = size();
+    for (size_t i = 1; i < num_rows; ++i)
+    {
+        if (compareAt(i, 0, static_cast<const Derived &>(*this), false) != 0)
+            return false;
+    }
+    return true;
+}
+
 }
diff --git a/src/Columns/IColumnUnique.h b/src/Columns/IColumnUnique.h
index 99e134675f6..5558f493b92 100644
--- a/src/Columns/IColumnUnique.h
+++ b/src/Columns/IColumnUnique.h
@@ -172,6 +172,11 @@ public:
     {
         throw Exception("Method compareColumn is not supported for ColumnUnique.", ErrorCodes::NOT_IMPLEMENTED);
     }
+
+    bool hasEqualValues() const override
+    {
+        throw Exception("Method hasEqualValues is not supported for ColumnUnique.", ErrorCodes::NOT_IMPLEMENTED);
+    }
 };
 
 using ColumnUniquePtr = IColumnUnique::ColumnUniquePtr;
diff --git a/src/Columns/tests/gtest_weak_hash_32.cpp b/src/Columns/tests/gtest_weak_hash_32.cpp
index a04bd94124c..0dabfc32b33 100644
--- a/src/Columns/tests/gtest_weak_hash_32.cpp
+++ b/src/Columns/tests/gtest_weak_hash_32.cpp
@@ -88,7 +88,6 @@ void checkColumn(
                 if (num_collisions <= max_collisions_to_print)
                 {
                     collisions_str << "Collision:\n";
-                    collisions_str << print_for_row(it->second) << '\n';
                     collisions_str << print_for_row(i) << std::endl;
                 }
 
diff --git a/src/Common/Allocator.h b/src/Common/Allocator.h
index e3c6ddf9ff4..ebfd654d558 100644
--- a/src/Common/Allocator.h
+++ b/src/Common/Allocator.h
@@ -277,7 +277,7 @@ private:
   *  GCC 4.9 mistakenly assumes that we can call `free` from a pointer to the stack.
   * In fact, the combination of conditions inside AllocatorWithStackMemory does not allow this.
   */
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wfree-nonheap-object"
 #endif
@@ -359,6 +359,6 @@ extern template class Allocator<true, false>;
 extern template class Allocator<false, true>;
 extern template class Allocator<true, true>;
 
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic pop
 #endif
diff --git a/src/Common/AllocatorWithMemoryTracking.h b/src/Common/AllocatorWithMemoryTracking.h
new file mode 100644
index 00000000000..e9597e4bf5a
--- /dev/null
+++ b/src/Common/AllocatorWithMemoryTracking.h
@@ -0,0 +1,62 @@
+#pragma once
+
+#include <stdexcept>
+#include <cstddef>
+#include <cstdlib>
+
+#include <Common/CurrentMemoryTracker.h>
+
+
+/// Implementation of std::allocator interface that tracks memory with MemoryTracker.
+/// NOTE We already plug MemoryTracker into new/delete operators. So, everything works even with default allocator.
+/// But it is enabled only if jemalloc is used (to obtain the size of the allocation on call to delete).
+/// And jemalloc is disabled for builds with sanitizers. In these cases memory was not always tracked.
+
+template <typename T>
+struct AllocatorWithMemoryTracking
+{
+    typedef T value_type;
+
+    AllocatorWithMemoryTracking() = default;
+
+    template <typename U>
+    constexpr AllocatorWithMemoryTracking(const AllocatorWithMemoryTracking<U> &) noexcept
+    {
+    }
+
+    [[nodiscard]] T * allocate(size_t n)
+    {
+        if (n > std::numeric_limits<size_t>::max() / sizeof(T))
+            throw std::bad_alloc();
+
+        size_t bytes = n * sizeof(T);
+        CurrentMemoryTracker::alloc(bytes);
+
+        T * p = static_cast<T *>(malloc(bytes));
+        if (!p)
+            throw std::bad_alloc();
+
+        return p;
+    }
+
+    void deallocate(T * p, size_t n) noexcept
+    {
+        free(p);
+
+        size_t bytes = n * sizeof(T);
+        CurrentMemoryTracker::free(bytes);
+    }
+};
+
+template <typename T, typename U>
+bool operator==(const AllocatorWithMemoryTracking <T> &, const AllocatorWithMemoryTracking <U> &)
+{
+    return true;
+}
+
+template <typename T, typename U>
+bool operator!=(const AllocatorWithMemoryTracking <T> &, const AllocatorWithMemoryTracking <U> &)
+{
+    return false;
+}
+
diff --git a/src/Common/Arena.h b/src/Common/Arena.h
index 0f4f0420c38..4d14c15197d 100644
--- a/src/Common/Arena.h
+++ b/src/Common/Arena.h
@@ -128,7 +128,7 @@ private:
     template <size_t> friend class AlignedArenaAllocator;
 
 public:
-    Arena(size_t initial_size_ = 4096, size_t growth_factor_ = 2, size_t linear_growth_threshold_ = 128 * 1024 * 1024)
+    explicit Arena(size_t initial_size_ = 4096, size_t growth_factor_ = 2, size_t linear_growth_threshold_ = 128 * 1024 * 1024)
         : growth_factor(growth_factor_), linear_growth_threshold(linear_growth_threshold_),
         head(new MemoryChunk(initial_size_, nullptr)), size_in_bytes(head->size()),
         page_size(static_cast<size_t>(::getPageSize()))
@@ -160,7 +160,7 @@ public:
             void * head_pos = head->pos;
             size_t space = head->end - head->pos;
 
-            auto res = static_cast<char *>(std::align(alignment, size, head_pos, space));
+            auto * res = static_cast<char *>(std::align(alignment, size, head_pos, space));
             if (res)
             {
                 head->pos = static_cast<char *>(head_pos);
diff --git a/src/Common/ColumnsHashing.h b/src/Common/ColumnsHashing.h
index 1ac753fbae5..b7173b25ce5 100644
--- a/src/Common/ColumnsHashing.h
+++ b/src/Common/ColumnsHashing.h
@@ -484,6 +484,20 @@ struct HashMethodKeysFixed
     std::unique_ptr<const char*[]> columns_data;
 #endif
 
+    PaddedPODArray<Key> prepared_keys;
+
+    static bool usePreparedKeys(const Sizes & key_sizes)
+    {
+        if (has_low_cardinality || has_nullable_keys || sizeof(Key) > 16)
+            return false;
+
+        for (auto size : key_sizes)
+            if (size != 1 && size != 2 && size != 4 && size != 8 && size != 16)
+                return false;
+
+        return true;
+    }
+
     HashMethodKeysFixed(const ColumnRawPtrs & key_columns, const Sizes & key_sizes_, const HashMethodContextPtr &)
         : Base(key_columns), key_sizes(std::move(key_sizes_)), keys_size(key_columns.size())
     {
@@ -505,8 +519,13 @@ struct HashMethodKeysFixed
             }
         }
 
+        if (usePreparedKeys(key_sizes))
+        {
+            packFixedBatch(keys_size, Base::getActualColumns(), key_sizes, prepared_keys);
+        }
+
 #if defined(__SSSE3__) && !defined(MEMORY_SANITIZER)
-        if constexpr (!has_low_cardinality && !has_nullable_keys && sizeof(Key) <= 16)
+        else if constexpr (!has_low_cardinality && !has_nullable_keys && sizeof(Key) <= 16)
         {
             /** The task is to "pack" multiple fixed-size fields into single larger Key.
               * Example: pack UInt8, UInt32, UInt16, UInt64 into UInt128 key:
@@ -571,6 +590,9 @@ struct HashMethodKeysFixed
                 return packFixed<Key, true>(row, keys_size, low_cardinality_keys.nested_columns, key_sizes,
                                             &low_cardinality_keys.positions, &low_cardinality_keys.position_sizes);
 
+            if (!prepared_keys.empty())
+                return prepared_keys[row];
+
 #if defined(__SSSE3__) && !defined(MEMORY_SANITIZER)
             if constexpr (!has_low_cardinality && !has_nullable_keys && sizeof(Key) <= 16)
                 return packFixedShuffle<Key>(columns_data.get(), keys_size, key_sizes.data(), row, masks.get());
@@ -578,6 +600,37 @@ struct HashMethodKeysFixed
             return packFixed<Key>(row, keys_size, Base::getActualColumns(), key_sizes);
         }
     }
+
+    static std::optional<Sizes> shuffleKeyColumns(std::vector<IColumn *> & key_columns, const Sizes & key_sizes)
+    {
+        if (!usePreparedKeys(key_sizes))
+            return {};
+
+        std::vector<IColumn *> new_columns;
+        new_columns.reserve(key_columns.size());
+
+        Sizes new_sizes;
+        auto fill_size = [&](size_t size)
+        {
+            for (size_t i = 0; i < key_sizes.size(); ++i)
+            {
+                if (key_sizes[i] == size)
+                {
+                    new_columns.push_back(key_columns[i]);
+                    new_sizes.push_back(size);
+                }
+            }
+        };
+
+        fill_size(16);
+        fill_size(8);
+        fill_size(4);
+        fill_size(2);
+        fill_size(1);
+
+        key_columns.swap(new_columns);
+        return new_sizes;
+    }
 };
 
 /** Hash by concatenating serialized key values.
diff --git a/src/Common/ConcurrentBoundedQueue.h b/src/Common/ConcurrentBoundedQueue.h
index b888d68a286..cb29efc3349 100644
--- a/src/Common/ConcurrentBoundedQueue.h
+++ b/src/Common/ConcurrentBoundedQueue.h
@@ -6,38 +6,7 @@
 #include <Poco/Mutex.h>
 #include <Poco/Semaphore.h>
 
-#include <common/types.h>
-
-
-namespace detail
-{
-    template <typename T, bool is_nothrow_move_assignable = std::is_nothrow_move_assignable_v<T>>
-    struct MoveOrCopyIfThrow;
-
-    template <typename T>
-    struct MoveOrCopyIfThrow<T, true>
-    {
-        void operator()(T && src, T & dst) const
-        {
-            dst = std::forward<T>(src);
-        }
-    };
-
-    template <typename T>
-    struct MoveOrCopyIfThrow<T, false>
-    {
-        void operator()(T && src, T & dst) const
-        {
-            dst = src;
-        }
-    };
-
-    template <typename T>
-    void moveOrCopyIfThrow(T && src, T & dst)
-    {
-        MoveOrCopyIfThrow<T>()(std::forward<T>(src), dst);
-    }
-}
+#include <common/MoveOrCopyIfThrow.h>
 
 /** A very simple thread-safe queue of limited size.
   * If you try to pop an item from an empty queue, the thread is blocked until the queue becomes nonempty.
@@ -53,8 +22,10 @@ private:
     Poco::Semaphore empty_count;
 
 public:
-    ConcurrentBoundedQueue(size_t max_fill)
-        : fill_count(0, max_fill), empty_count(max_fill, max_fill) {}
+    explicit ConcurrentBoundedQueue(size_t max_fill)
+        : fill_count(0, max_fill)
+        , empty_count(max_fill, max_fill)
+    {}
 
     void push(const T & x)
     {
diff --git a/src/Common/Config/AbstractConfigurationComparison.cpp b/src/Common/Config/AbstractConfigurationComparison.cpp
index 0e603cb1056..eb677debb02 100644
--- a/src/Common/Config/AbstractConfigurationComparison.cpp
+++ b/src/Common/Config/AbstractConfigurationComparison.cpp
@@ -1,4 +1,5 @@
 #include <Common/Config/AbstractConfigurationComparison.h>
+#include <Common/getMultipleKeysFromConfig.h>
 
 #include <unordered_set>
 #include <common/StringRef.h>
@@ -26,6 +27,27 @@ bool isSameConfiguration(const Poco::Util::AbstractConfiguration & left, const P
     return isSameConfiguration(left, String(), right, String());
 }
 
+bool isSameConfiguration(const Poco::Util::AbstractConfiguration & left, const Poco::Util::AbstractConfiguration & right, const String & key)
+{
+    return isSameConfiguration(left, key, right, key);
+}
+
+bool isSameConfigurationWithMultipleKeys(const Poco::Util::AbstractConfiguration & left, const Poco::Util::AbstractConfiguration & right, const String & root, const String & name)
+{
+    if (&left == &right)
+        return true;
+
+    auto left_multiple_keys = getMultipleKeysFromConfig(left, root, name);
+    auto right_multiple_keys = getMultipleKeysFromConfig(right, root, name);
+    if (left_multiple_keys.size() != right_multiple_keys.size())
+        return false;
+
+    for (auto & key : left_multiple_keys)
+        if (!isSameConfiguration(left, right, concatKeyAndSubKey(root, key)))
+            return false;
+
+    return true;
+}
 
 bool isSameConfiguration(const Poco::Util::AbstractConfiguration & left, const String & left_key,
                          const Poco::Util::AbstractConfiguration & right, const String & right_key)
diff --git a/src/Common/Config/AbstractConfigurationComparison.h b/src/Common/Config/AbstractConfigurationComparison.h
index f825ad4e53d..6e1d8a890bb 100644
--- a/src/Common/Config/AbstractConfigurationComparison.h
+++ b/src/Common/Config/AbstractConfigurationComparison.h
@@ -13,6 +13,22 @@ namespace DB
     bool isSameConfiguration(const Poco::Util::AbstractConfiguration & left,
                              const Poco::Util::AbstractConfiguration & right);
 
+    /// Config may have multiple keys with one name. For example:
+    /// <root>
+    ///     <some_key>...</some_key>
+    ///     <some_key>...</some_key>
+    /// </root>
+    /// Returns true if the specified subview of the two configurations contains
+    /// the same keys and values for each key with the given name.
+    bool isSameConfigurationWithMultipleKeys(const Poco::Util::AbstractConfiguration & left,
+                                             const Poco::Util::AbstractConfiguration & right,
+                                             const String & root, const String & name);
+
+    /// Returns true if the specified subview of the two configurations contains the same keys and values.
+    bool isSameConfiguration(const Poco::Util::AbstractConfiguration & left,
+                             const Poco::Util::AbstractConfiguration & right,
+                             const String & key);
+
     /// Returns true if specified subviews of the two configurations contains the same keys and values.
     bool isSameConfiguration(const Poco::Util::AbstractConfiguration & left, const String & left_key,
                              const Poco::Util::AbstractConfiguration & right, const String & right_key);
diff --git a/src/Common/Config/ConfigReloader.cpp b/src/Common/Config/ConfigReloader.cpp
index 677448e03ae..afff08e82bb 100644
--- a/src/Common/Config/ConfigReloader.cpp
+++ b/src/Common/Config/ConfigReloader.cpp
@@ -27,7 +27,7 @@ ConfigReloader::ConfigReloader(
     , updater(std::move(updater_))
 {
     if (!already_loaded)
-        reloadIfNewer(/* force = */ true, /* throw_on_error = */ true, /* fallback_to_preprocessed = */ true);
+        reloadIfNewer(/* force = */ true, /* throw_on_error = */ true, /* fallback_to_preprocessed = */ true, /* initial_loading = */ true);
 }
 
 
@@ -66,7 +66,7 @@ void ConfigReloader::run()
             if (quit)
                 return;
 
-            reloadIfNewer(zk_changed, /* throw_on_error = */ false, /* fallback_to_preprocessed = */ false);
+            reloadIfNewer(zk_changed, /* throw_on_error = */ false, /* fallback_to_preprocessed = */ false, /* initial_loading = */ false);
         }
         catch (...)
         {
@@ -76,7 +76,7 @@ void ConfigReloader::run()
     }
 }
 
-void ConfigReloader::reloadIfNewer(bool force, bool throw_on_error, bool fallback_to_preprocessed)
+void ConfigReloader::reloadIfNewer(bool force, bool throw_on_error, bool fallback_to_preprocessed, bool initial_loading)
 {
     std::lock_guard lock(reload_mutex);
 
@@ -131,7 +131,7 @@ void ConfigReloader::reloadIfNewer(bool force, bool throw_on_error, bool fallbac
 
         try
         {
-            updater(loaded_config.configuration);
+            updater(loaded_config.configuration, initial_loading);
         }
         catch (...)
         {
diff --git a/src/Common/Config/ConfigReloader.h b/src/Common/Config/ConfigReloader.h
index 489f062e2fe..2e4399d3c4e 100644
--- a/src/Common/Config/ConfigReloader.h
+++ b/src/Common/Config/ConfigReloader.h
@@ -27,7 +27,7 @@ class Context;
 class ConfigReloader
 {
 public:
-    using Updater = std::function<void(ConfigurationPtr)>;
+    using Updater = std::function<void(ConfigurationPtr, bool)>;
 
     /** include_from_path is usually /etc/metrika.xml (i.e. value of <include_from> tag)
       */
@@ -46,12 +46,12 @@ public:
     void start();
 
     /// Reload immediately. For SYSTEM RELOAD CONFIG query.
-    void reload() { reloadIfNewer(/* force */ true, /* throw_on_error */ true, /* fallback_to_preprocessed */ false); }
+    void reload() { reloadIfNewer(/* force */ true, /* throw_on_error */ true, /* fallback_to_preprocessed */ false, /* initial_loading = */ false); }
 
 private:
     void run();
 
-    void reloadIfNewer(bool force, bool throw_on_error, bool fallback_to_preprocessed);
+    void reloadIfNewer(bool force, bool throw_on_error, bool fallback_to_preprocessed, bool initial_loading);
 
     struct FileWithTimestamp;
 
diff --git a/src/Common/CurrentMetrics.cpp b/src/Common/CurrentMetrics.cpp
index 4fb2709c8e4..abbb3c71d72 100644
--- a/src/Common/CurrentMetrics.cpp
+++ b/src/Common/CurrentMetrics.cpp
@@ -52,7 +52,7 @@
     M(RWLockActiveWriters, "Number of threads holding write lock in a table RWLock.") \
     M(GlobalThread, "Number of threads in global thread pool.") \
     M(GlobalThreadActive, "Number of threads in global thread pool running a task.") \
-    M(LocalThread, "Number of threads in local thread pools. Should be similar to GlobalThreadActive.") \
+    M(LocalThread, "Number of threads in local thread pools. The threads in local thread pools are taken from the global thread pool.") \
     M(LocalThreadActive, "Number of threads in local thread pools running a task.") \
     M(DistributedFilesToInsert, "Number of pending files to process for asynchronous insertion into Distributed tables. Number of files for every shard is summed.") \
     M(TablesToDropQueueSize, "Number of dropped tables, that are waiting for background data removal.") \
@@ -66,6 +66,8 @@
     M(PartsWide, "Wide parts.") \
     M(PartsCompact, "Compact parts.") \
     M(PartsInMemory, "In-memory parts.") \
+    M(MMappedFiles, "Total number of mmapped files.") \
+    M(MMappedFileBytes, "Sum size of mmapped file regions.") \
 
 namespace CurrentMetrics
 {
diff --git a/src/Common/CurrentMetrics.h b/src/Common/CurrentMetrics.h
index eabeca7a0e9..7d63b25f0f0 100644
--- a/src/Common/CurrentMetrics.h
+++ b/src/Common/CurrentMetrics.h
@@ -100,6 +100,12 @@ namespace CurrentMetrics
             amount -= value;
         }
 
+        void add(Value value = 1)
+        {
+            what->fetch_add(value, std::memory_order_relaxed);
+            amount += value;
+        }
+
         /// Subtract value before destructor.
         void destroy()
         {
diff --git a/src/Common/CurrentThread.h b/src/Common/CurrentThread.h
index 7ab57ea7fab..069f9cf2af7 100644
--- a/src/Common/CurrentThread.h
+++ b/src/Common/CurrentThread.h
@@ -1,11 +1,12 @@
 #pragma once
 
+#include <Interpreters/Context_fwd.h>
+#include <Common/ThreadStatus.h>
+#include <common/StringRef.h>
+
 #include <memory>
 #include <string>
 
-#include <common/StringRef.h>
-#include <Common/ThreadStatus.h>
-
 
 namespace ProfileEvents
 {
@@ -18,7 +19,6 @@ class MemoryTracker;
 namespace DB
 {
 
-class Context;
 class QueryStatus;
 struct Progress;
 class InternalTextLogsQueue;
@@ -87,7 +87,7 @@ public:
     /// Initializes query with current thread as master thread in constructor, and detaches it in destructor
     struct QueryScope
     {
-        explicit QueryScope(Context & query_context);
+        explicit QueryScope(ContextPtr query_context);
         ~QueryScope();
 
         void logPeakMemoryUsage();
@@ -99,7 +99,7 @@ private:
 
     /// Sets query_context for current thread group
     /// Can by used only through QueryScope
-    static void attachQueryContext(Context & query_context);
+    static void attachQueryContext(ContextPtr query_context);
 };
 
 }
diff --git a/src/Common/Epoll.cpp b/src/Common/Epoll.cpp
new file mode 100644
index 00000000000..454c1a115f7
--- /dev/null
+++ b/src/Common/Epoll.cpp
@@ -0,0 +1,86 @@
+#if defined(OS_LINUX)
+
+#include "Epoll.h"
+#include <Common/Exception.h>
+#include <unistd.h>
+#include <common/logger_useful.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int EPOLL_ERROR;
+    extern const int LOGICAL_ERROR;
+}
+
+Epoll::Epoll() : events_count(0)
+{
+    epoll_fd = epoll_create1(0);
+    if (epoll_fd == -1)
+        throwFromErrno("Cannot open epoll descriptor", DB::ErrorCodes::EPOLL_ERROR);
+}
+
+Epoll::Epoll(Epoll && other) : epoll_fd(other.epoll_fd), events_count(other.events_count.load())
+{
+    other.epoll_fd = -1;
+}
+
+Epoll & Epoll::operator=(Epoll && other)
+{
+    epoll_fd = other.epoll_fd;
+    other.epoll_fd = -1;
+    events_count.store(other.events_count.load());
+    return *this;
+}
+
+void Epoll::add(int fd, void * ptr)
+{
+    epoll_event event;
+    event.events = EPOLLIN | EPOLLPRI;
+    if (ptr)
+        event.data.ptr = ptr;
+    else
+        event.data.fd = fd;
+
+    ++events_count;
+
+    if (epoll_ctl(epoll_fd, EPOLL_CTL_ADD, fd, &event) == -1)
+        throwFromErrno("Cannot add new descriptor to epoll", DB::ErrorCodes::EPOLL_ERROR);
+}
+
+void Epoll::remove(int fd)
+{
+    --events_count;
+
+    if (epoll_ctl(epoll_fd, EPOLL_CTL_DEL, fd, nullptr) == -1)
+        throwFromErrno("Cannot remove descriptor from epoll", DB::ErrorCodes::EPOLL_ERROR);
+}
+
+size_t Epoll::getManyReady(int max_events, epoll_event * events_out, bool blocking) const
+{
+    if (events_count == 0)
+        throw Exception("There are no events in epoll", ErrorCodes::LOGICAL_ERROR);
+
+    int ready_size;
+    int timeout = blocking ? -1 : 0;
+    do
+    {
+        ready_size = epoll_wait(epoll_fd, events_out, max_events, timeout);
+
+        if (ready_size == -1 && errno != EINTR)
+            throwFromErrno("Error in epoll_wait", DB::ErrorCodes::EPOLL_ERROR);
+    }
+    while (ready_size <= 0 && (ready_size != 0 || blocking));
+
+    return ready_size;
+}
+
+Epoll::~Epoll()
+{
+    if (epoll_fd != -1)
+        close(epoll_fd);
+}
+
+}
+#endif
diff --git a/src/Common/Epoll.h b/src/Common/Epoll.h
new file mode 100644
index 00000000000..5d9aef9ef66
--- /dev/null
+++ b/src/Common/Epoll.h
@@ -0,0 +1,54 @@
+#pragma once
+#if defined(OS_LINUX)
+
+#include <sys/epoll.h>
+#include <vector>
+#include <boost/noncopyable.hpp>
+#include <Poco/Logger.h>
+
+namespace DB
+{
+
+using AsyncCallback = std::function<void(int, const Poco::Timespan &, const std::string &)>;
+
+class Epoll
+{
+public:
+    Epoll();
+
+    Epoll(const Epoll &) = delete;
+    Epoll & operator=(const Epoll &) = delete;
+
+    Epoll & operator=(Epoll && other);
+    Epoll(Epoll && other);
+
+    /// Add new file descriptor to epoll. If ptr set to nullptr, epoll_event.data.fd = fd,
+    /// otherwise epoll_event.data.ptr = ptr.
+    void add(int fd, void * ptr = nullptr);
+
+    /// Remove file descriptor to epoll.
+    void remove(int fd);
+
+    /// Get events from epoll. Events are written in events_out, this function returns an amount of ready events.
+    /// If blocking is false and there are no ready events,
+    /// return empty vector, otherwise wait for ready events.
+    size_t getManyReady(int max_events, epoll_event * events_out, bool blocking) const;
+
+    int getFileDescriptor() const { return epoll_fd; }
+
+    int size() const { return events_count; }
+
+    bool empty() const { return events_count == 0; }
+
+    const std::string & getDescription() const { return fd_description; }
+
+    ~Epoll();
+
+private:
+    int epoll_fd;
+    std::atomic<int> events_count;
+    const std::string fd_description = "epoll";
+};
+
+}
+#endif
diff --git a/src/Common/ErrorCodes.cpp b/src/Common/ErrorCodes.cpp
index ba8741efae7..ad0463db889 100644
--- a/src/Common/ErrorCodes.cpp
+++ b/src/Common/ErrorCodes.cpp
@@ -1,4 +1,5 @@
 #include <Common/ErrorCodes.h>
+#include <chrono>
 
 /** Previously, these constants were located in one enum.
   * But in this case there is a problem: when you add a new constant, you need to recompile
@@ -538,12 +539,22 @@
     M(569, MULTIPLE_COLUMNS_SERIALIZED_TO_SAME_PROTOBUF_FIELD) \
     M(570, DATA_TYPE_INCOMPATIBLE_WITH_PROTOBUF_FIELD) \
     M(571, DATABASE_REPLICATION_FAILED) \
+    M(572, TOO_MANY_QUERY_PLAN_OPTIMIZATIONS) \
+    M(573, EPOLL_ERROR) \
+    M(574, DISTRIBUTED_TOO_MANY_PENDING_BYTES) \
+    M(575, UNKNOWN_SNAPSHOT) \
+    M(576, KERBEROS_ERROR) \
+    M(577, INVALID_SHARD_ID) \
+    M(578, INVALID_FORMAT_INSERT_QUERY_WITH_DATA) \
+    M(579, INCORRECT_PART_TYPE) \
+    M(580, CANNOT_SET_ROUNDING_MODE) \
+    M(581, TOO_LARGE_DISTRIBUTED_DEPTH) \
     \
+    M(998, POSTGRESQL_CONNECTION_FAILURE) \
     M(999, KEEPER_EXCEPTION) \
     M(1000, POCO_EXCEPTION) \
     M(1001, STD_EXCEPTION) \
     M(1002, UNKNOWN_EXCEPTION) \
-    M(1003, INVALID_SHARD_ID)
 
 /* See END */
 
@@ -551,12 +562,12 @@ namespace DB
 {
 namespace ErrorCodes
 {
-#define M(VALUE, NAME) extern const Value NAME = VALUE;
+#define M(VALUE, NAME) extern const ErrorCode NAME = VALUE;
     APPLY_FOR_ERROR_CODES(M)
 #undef M
 
-    constexpr Value END = 3000;
-    std::atomic<Value> values[END + 1]{};
+    constexpr ErrorCode END = 3000;
+    ErrorPairHolder values[END + 1]{};
 
     struct ErrorCodesNames
     {
@@ -571,12 +582,43 @@ namespace ErrorCodes
 
     std::string_view getName(ErrorCode error_code)
     {
-        if (error_code >= END)
+        if (error_code < 0 || error_code >= END)
             return std::string_view();
         return error_codes_names.names[error_code];
     }
 
     ErrorCode end() { return END + 1; }
+
+    void increment(ErrorCode error_code, bool remote, const std::string & message, const FramePointers & trace)
+    {
+        if (error_code < 0 || error_code >= end())
+        {
+            /// For everything outside the range, use END.
+            /// (end() is the pointer pass the end, while END is the last value that has an element in values array).
+            error_code = end() - 1;
+        }
+
+        values[error_code].increment(remote, message, trace);
+    }
+
+    void ErrorPairHolder::increment(bool remote, const std::string & message, const FramePointers & trace)
+    {
+        const auto now = std::chrono::system_clock::now();
+
+        std::lock_guard lock(mutex);
+
+        auto & error = remote ? value.remote : value.local;
+
+        ++error.count;
+        error.message = message;
+        error.trace = trace;
+        error.error_time_ms = std::chrono::duration_cast<std::chrono::milliseconds>(now.time_since_epoch()).count();
+    }
+    ErrorPair ErrorPairHolder::get()
+    {
+        std::lock_guard lock(mutex);
+        return value;
+    }
 }
 
 }
diff --git a/src/Common/ErrorCodes.h b/src/Common/ErrorCodes.h
index cc610c5d927..ffd0b8b8619 100644
--- a/src/Common/ErrorCodes.h
+++ b/src/Common/ErrorCodes.h
@@ -1,11 +1,12 @@
 #pragma once
 
-#include <stddef.h>
+#include <cstddef>
 #include <cstdint>
 #include <utility>
-#include <atomic>
-#include <common/types.h>
+#include <mutex>
 #include <string_view>
+#include <vector>
+#include <common/types.h>
 
 /** Allows to count number of simultaneously happening error codes.
   * See also Exception.cpp for incrementing part.
@@ -17,30 +18,51 @@ namespace DB
 namespace ErrorCodes
 {
     /// ErrorCode identifier (index in array).
-    using ErrorCode = size_t;
-    using Value = int;
+    using ErrorCode = int;
+    using Value = size_t;
+    using FramePointers = std::vector<void *>;
 
     /// Get name of error_code by identifier.
     /// Returns statically allocated string.
     std::string_view getName(ErrorCode error_code);
 
+    struct Error
+    {
+        /// Number of times Exception with this ErrorCode had been throw.
+        Value count;
+        /// Time of the last error.
+        UInt64 error_time_ms = 0;
+        /// Message for the last error.
+        std::string message;
+        /// Stacktrace for the last error.
+        FramePointers trace;
+    };
+    struct ErrorPair
+    {
+        Error local;
+        Error remote;
+    };
+
+    /// Thread-safe
+    struct ErrorPairHolder
+    {
+    public:
+        ErrorPair get();
+        void increment(bool remote, const std::string & message, const FramePointers & trace);
+
+    private:
+        ErrorPair value;
+        std::mutex mutex;
+    };
+
     /// ErrorCode identifier -> current value of error_code.
-    extern std::atomic<Value> values[];
+    extern ErrorPairHolder values[];
 
     /// Get index just after last error_code identifier.
     ErrorCode end();
 
     /// Add value for specified error_code.
-    inline void increment(ErrorCode error_code)
-    {
-        if (error_code >= end())
-        {
-            /// For everything outside the range, use END.
-            /// (end() is the pointer pass the end, while END is the last value that has an element in values array).
-            error_code = end() - 1;
-        }
-        values[error_code].fetch_add(1, std::memory_order_relaxed);
-    }
+    void increment(ErrorCode error_code, bool remote, const std::string & message, const FramePointers & trace);
 }
 
 }
diff --git a/src/Common/Exception.cpp b/src/Common/Exception.cpp
index f5a40a11d9c..dca19eea7f2 100644
--- a/src/Common/Exception.cpp
+++ b/src/Common/Exception.cpp
@@ -34,9 +34,9 @@ namespace ErrorCodes
     extern const int CANNOT_MREMAP;
 }
 
-/// Aborts the process if error code is LOGICAL_ERROR.
-/// Increments error codes statistics.
-void handle_error_code([[maybe_unused]] const std::string & msg, int code)
+/// - Aborts the process if error code is LOGICAL_ERROR.
+/// - Increments error codes statistics.
+void handle_error_code([[maybe_unused]] const std::string & msg, int code, bool remote, const Exception::FramePointers & trace)
 {
     // In debug builds and builds with sanitizers, treat LOGICAL_ERROR as an assertion failure.
     // Log the message before we fail.
@@ -47,20 +47,21 @@ void handle_error_code([[maybe_unused]] const std::string & msg, int code)
         abort();
     }
 #endif
-    ErrorCodes::increment(code);
+
+    ErrorCodes::increment(code, remote, msg, trace);
 }
 
 Exception::Exception(const std::string & msg, int code, bool remote_)
     : Poco::Exception(msg, code)
     , remote(remote_)
 {
-    handle_error_code(msg, code);
+    handle_error_code(msg, code, remote, getStackFramePointers());
 }
 
 Exception::Exception(const std::string & msg, const Exception & nested, int code)
     : Poco::Exception(msg, nested, code)
 {
-    handle_error_code(msg, code);
+    handle_error_code(msg, code, remote, getStackFramePointers());
 }
 
 Exception::Exception(CreateFromPocoTag, const Poco::Exception & exc)
@@ -101,6 +102,31 @@ std::string Exception::getStackTraceString() const
 #endif
 }
 
+Exception::FramePointers Exception::getStackFramePointers() const
+{
+    FramePointers frame_pointers;
+#ifdef STD_EXCEPTION_HAS_STACK_TRACE
+    {
+        frame_pointers.resize(get_stack_trace_size());
+        for (size_t i = 0; i < frame_pointers.size(); ++i)
+        {
+            frame_pointers[i] = get_stack_trace_frames()[i];
+        }
+    }
+#else
+    {
+        size_t stack_trace_size = trace.getSize();
+        size_t stack_trace_offset = trace.getOffset();
+        frame_pointers.reserve(stack_trace_size - stack_trace_offset);
+        for (size_t i = stack_trace_offset; i < stack_trace_size; ++i)
+        {
+            frame_pointers.push_back(trace.getFramePointers()[i]);
+        }
+    }
+#endif
+    return frame_pointers;
+}
+
 
 void throwFromErrno(const std::string & s, int code, int the_errno)
 {
@@ -124,7 +150,7 @@ void tryLogCurrentException(Poco::Logger * logger, const std::string & start_of_
     ///
     /// And in this case the exception will not be logged, so let's block the
     /// MemoryTracker until the exception will be logged.
-    MemoryTracker::LockExceptionInThread lock_memory_tracker;
+    MemoryTracker::LockExceptionInThread lock_memory_tracker(VariableContext::Global);
 
     try
     {
@@ -458,33 +484,25 @@ ExecutionStatus ExecutionStatus::fromCurrentException(const std::string & start_
     return ExecutionStatus(getCurrentExceptionCode(), msg);
 }
 
-ParsingException::ParsingException()
-{
-    Exception::message(Exception::message() + "{}");
-}
-
+ParsingException::ParsingException() = default;
 ParsingException::ParsingException(const std::string & msg, int code)
     : Exception(msg, code)
 {
-    Exception::message(Exception::message() + "{}");
 }
-
 ParsingException::ParsingException(int code, const std::string & message)
     : Exception(message, code)
 {
-    Exception::message(Exception::message() + "{}");
 }
 
-
 /// We use additional field formatted_message_ to make this method const.
 std::string ParsingException::displayText() const
 {
     try
     {
         if (line_number_ == -1)
-            formatted_message_ = fmt::format(message(), "");
+            formatted_message_ = message();
         else
-            formatted_message_ = fmt::format(message(), fmt::format(": (at row {})\n", line_number_));
+            formatted_message_ = message() + fmt::format(": (at row {})\n", line_number_);
     }
     catch (...)
     {}
diff --git a/src/Common/Exception.h b/src/Common/Exception.h
index 661d31469fe..79b4394948a 100644
--- a/src/Common/Exception.h
+++ b/src/Common/Exception.h
@@ -24,6 +24,8 @@ namespace DB
 class Exception : public Poco::Exception
 {
 public:
+    using FramePointers = std::vector<void *>;
+
     Exception() = default;
     Exception(const std::string & msg, int code, bool remote_ = false);
     Exception(const std::string & msg, const Exception & nested, int code);
@@ -66,6 +68,8 @@ public:
     bool isRemoteException() const { return remote; }
 
     std::string getStackTraceString() const;
+    /// Used for system.errors
+    FramePointers getStackFramePointers() const;
 
 private:
 #ifndef STD_EXCEPTION_HAS_STACK_TRACE
@@ -115,9 +119,7 @@ public:
     template <typename ...Args>
     ParsingException(int code, const std::string & fmt, Args&&... args)
         : Exception(fmt::format(fmt, std::forward<Args>(args)...), code)
-    {
-        Exception::message(Exception::message() + "{}");
-    }
+    {}
 
 
     std::string displayText() const
diff --git a/src/Common/FieldVisitors.cpp b/src/Common/FieldVisitors.cpp
index dae153bd8d2..62f04816032 100644
--- a/src/Common/FieldVisitors.cpp
+++ b/src/Common/FieldVisitors.cpp
@@ -180,7 +180,17 @@ String FieldVisitorToString::operator() (const Tuple & x) const
 {
     WriteBufferFromOwnString wb;
 
-    wb << '(';
+    // For single-element tuples we must use the explicit tuple() function,
+    // or they will be parsed back as plain literals.
+    if (x.size() > 1)
+    {
+        wb << '(';
+    }
+    else
+    {
+        wb << "tuple(";
+    }
+
     for (auto it = x.begin(); it != x.end(); ++it)
     {
         if (it != x.begin())
diff --git a/src/Common/FieldVisitors.h b/src/Common/FieldVisitors.h
index 954cd004e84..5adbf2b01ac 100644
--- a/src/Common/FieldVisitors.h
+++ b/src/Common/FieldVisitors.h
@@ -185,12 +185,20 @@ public:
                 /// Conversion of infinite values to integer is undefined.
                 throw Exception("Cannot convert infinite value to integer type", ErrorCodes::CANNOT_CONVERT_TYPE);
             }
+            else if (x > std::numeric_limits<T>::max() || x < std::numeric_limits<T>::lowest())
+            {
+                throw Exception("Cannot convert out of range floating point value to integer type", ErrorCodes::CANNOT_CONVERT_TYPE);
+            }
         }
 
         if constexpr (std::is_same_v<Decimal256, T>)
+        {
             return Int256(x);
+        }
         else
+        {
             return T(x);
+        }
     }
 
     T operator() (const UInt128 &) const
diff --git a/src/Common/HashTable/Hash.h b/src/Common/HashTable/Hash.h
index ef20b70917d..0abe96497bd 100644
--- a/src/Common/HashTable/Hash.h
+++ b/src/Common/HashTable/Hash.h
@@ -1,8 +1,9 @@
 #pragma once
 
 #include <common/types.h>
-#include <Common/UInt128.h>
 #include <common/unaligned.h>
+#include <common/StringRef.h>
+#include <Common/UInt128.h>
 
 #include <type_traits>
 
@@ -178,13 +179,19 @@ inline size_t DefaultHash64(std::enable_if_t<(sizeof(T) <= sizeof(UInt64)), T> k
 }
 
 template <typename T>
-inline size_t DefaultHash64(std::enable_if_t<(sizeof(T) > sizeof(UInt64)), T> key)
+static constexpr bool UseDefaultHashForBigInts =
+    std::is_same_v<T, DB::Int128>  ||
+    std::is_same_v<T, DB::UInt128> ||
+    (is_big_int_v<T> && sizeof(T) == 32);
+
+template <typename T>
+inline size_t DefaultHash64(std::enable_if_t<(sizeof(T) > sizeof(UInt64) && UseDefaultHashForBigInts<T>), T> key)
 {
     if constexpr (std::is_same_v<T, DB::Int128>)
     {
         return intHash64(static_cast<UInt64>(key) ^ static_cast<UInt64>(key >> 64));
     }
-    if constexpr (std::is_same_v<T, DB::UInt128>)
+    else if constexpr (std::is_same_v<T, DB::UInt128>)
     {
         return intHash64(key.low ^ key.high);
     }
@@ -195,6 +202,8 @@ inline size_t DefaultHash64(std::enable_if_t<(sizeof(T) > sizeof(UInt64)), T> ke
             static_cast<UInt64>(key >> 128) ^
             static_cast<UInt64>(key >> 256));
     }
+
+    assert(false);
     __builtin_unreachable();
 }
 
@@ -341,6 +350,11 @@ struct IntHash32
         }
         else if constexpr (sizeof(T) <= sizeof(UInt64))
             return intHash32<salt>(key);
+
+        assert(false);
         __builtin_unreachable();
     }
 };
+
+template <>
+struct DefaultHash<StringRef> : public StringRefHash {};
diff --git a/src/Common/HashTable/HashMap.h b/src/Common/HashTable/HashMap.h
index 99dc5414107..50324fe64c7 100644
--- a/src/Common/HashTable/HashMap.h
+++ b/src/Common/HashTable/HashMap.h
@@ -24,17 +24,26 @@ struct PairNoInit
 
     PairNoInit() {}
 
-    template <typename First_>
-    PairNoInit(First_ && first_, NoInitTag) : first(std::forward<First_>(first_))
+    template <typename FirstValue>
+    PairNoInit(FirstValue && first_, NoInitTag)
+        : first(std::forward<FirstValue>(first_))
     {
     }
 
-    template <typename First_, typename Second_>
-    PairNoInit(First_ && first_, Second_ && second_) : first(std::forward<First_>(first_)), second(std::forward<Second_>(second_))
+    template <typename FirstValue, typename SecondValue>
+    PairNoInit(FirstValue && first_, SecondValue && second_)
+        : first(std::forward<FirstValue>(first_))
+        , second(std::forward<SecondValue>(second_))
     {
     }
 };
 
+template <typename First, typename Second>
+PairNoInit<std::decay_t<First>, std::decay_t<Second>> makePairNoInit(First && first, Second && second)
+{
+    return PairNoInit<std::decay_t<First>, std::decay_t<Second>>(std::forward<First>(first), std::forward<Second>(second));
+}
+
 
 template <typename Key, typename TMapped, typename Hash, typename TState = HashTableNoState>
 struct HashMapCell
@@ -48,7 +57,7 @@ struct HashMapCell
 
     value_type value;
 
-    HashMapCell() {}
+    HashMapCell() = default;
     HashMapCell(const Key & key_, const State &) : value(key_, NoInitTag()) {}
     HashMapCell(const value_type & value_, const State &) : value(value_) {}
 
@@ -114,8 +123,39 @@ struct HashMapCell
 
     static void move(HashMapCell * /* old_location */, HashMapCell * /* new_location */) {}
 
+    template <size_t I>
+    auto & get() & {
+        if constexpr (I == 0) return value.first;
+        else if constexpr (I == 1) return value.second;
+    }
+
+    template <size_t I>
+    auto const & get() const & {
+        if constexpr (I == 0) return value.first;
+        else if constexpr (I == 1) return value.second;
+    }
+
+    template <size_t I>
+    auto && get() && {
+        if constexpr (I == 0) return std::move(value.first);
+        else if constexpr (I == 1) return std::move(value.second);
+    }
+
 };
 
+namespace std
+{
+
+    template <typename Key, typename TMapped, typename Hash, typename TState>
+    struct tuple_size<HashMapCell<Key, TMapped, Hash, TState>> : std::integral_constant<size_t, 2> { };
+
+    template <typename Key, typename TMapped, typename Hash, typename TState>
+    struct tuple_element<0, HashMapCell<Key, TMapped, Hash, TState>> { using type = Key; };
+
+    template <typename Key, typename TMapped, typename Hash, typename TState>
+    struct tuple_element<1, HashMapCell<Key, TMapped, Hash, TState>> { using type = TMapped; };
+}
+
 template <typename Key, typename TMapped, typename Hash, typename TState = HashTableNoState>
 struct HashMapCellWithSavedHash : public HashMapCell<Key, TMapped, Hash, TState>
 {
@@ -227,6 +267,19 @@ public:
     }
 };
 
+namespace std
+{
+
+    template <typename Key, typename TMapped, typename Hash, typename TState>
+    struct tuple_size<HashMapCellWithSavedHash<Key, TMapped, Hash, TState>> : std::integral_constant<size_t, 2> { };
+
+    template <typename Key, typename TMapped, typename Hash, typename TState>
+    struct tuple_element<0, HashMapCellWithSavedHash<Key, TMapped, Hash, TState>> { using type = Key; };
+
+    template <typename Key, typename TMapped, typename Hash, typename TState>
+    struct tuple_element<1, HashMapCellWithSavedHash<Key, TMapped, Hash, TState>> { using type = TMapped; };
+}
+
 
 template <
     typename Key,
diff --git a/src/Common/HashTable/LRUHashMap.h b/src/Common/HashTable/LRUHashMap.h
index 292006f2438..870fb219523 100644
--- a/src/Common/HashTable/LRUHashMap.h
+++ b/src/Common/HashTable/LRUHashMap.h
@@ -77,7 +77,7 @@ struct LRUHashMapCellNodeTraits
     static void set_previous(node * __restrict ptr, node * __restrict prev) { ptr->prev = prev; }
 };
 
-template <typename TKey, typename TValue, typename Hash, bool save_hash_in_cells>
+template <typename TKey, typename TValue, typename Disposer, typename Hash, bool save_hash_in_cells>
 class LRUHashMapImpl :
     private HashMapTable<
         TKey,
@@ -108,24 +108,33 @@ public:
         boost::intrusive::value_traits<LRUHashMapCellIntrusiveValueTraits>,
         boost::intrusive::constant_time_size<false>>;
 
+    using LookupResult = typename Base::LookupResult;
+    using ConstLookupResult = typename Base::ConstLookupResult;
+
     using iterator = typename LRUList::iterator;
     using const_iterator = typename LRUList::const_iterator;
     using reverse_iterator = typename LRUList::reverse_iterator;
     using const_reverse_iterator = typename LRUList::const_reverse_iterator;
 
-    LRUHashMapImpl(size_t max_size_, bool preallocate_max_size_in_hash_map = false)
+    explicit LRUHashMapImpl(size_t max_size_, bool preallocate_max_size_in_hash_map = false, Disposer disposer_ = Disposer())
         : Base(preallocate_max_size_in_hash_map ? max_size_ : 32)
         , max_size(max_size_)
+        , disposer(std::move(disposer_))
     {
         assert(max_size > 0);
     }
 
-    std::pair<Cell *, bool> insert(const Key & key, const Value & value)
+    ~LRUHashMapImpl()
+    {
+        clear();
+    }
+
+    std::pair<Cell *, bool> ALWAYS_INLINE insert(const Key & key, const Value & value)
     {
         return emplace(key, value);
     }
 
-    std::pair<Cell *, bool> insert(const Key & key, Value && value)
+    std::pair<Cell *, bool> ALWAYS_INLINE insert(const Key & key, Value && value)
     {
         return emplace(key, std::move(value));
     }
@@ -147,15 +156,16 @@ public:
         if (size() == max_size)
         {
             /// Erase least recently used element from front of the list
-            Cell & node = lru_list.front();
+            Cell copy_node = lru_list.front();
 
-            const Key & element_to_remove_key = node.getKey();
-            size_t key_hash = node.getHash(*this);
+            const Key & element_to_remove_key = copy_node.getKey();
 
             lru_list.pop_front();
 
-            [[maybe_unused]] bool erased = Base::erase(element_to_remove_key, key_hash);
+            [[maybe_unused]] bool erased = Base::erase(element_to_remove_key);
             assert(erased);
+
+            disposer(element_to_remove_key, copy_node.getMapped());
         }
 
         [[maybe_unused]] bool inserted;
@@ -174,46 +184,64 @@ public:
         return std::make_pair(it, true);
     }
 
-    using Base::find;
-
-    Value & get(const Key & key)
+    LookupResult ALWAYS_INLINE find(const Key & key)
     {
         auto it = Base::find(key);
-        assert(it);
 
-        Value & value = it->getMapped();
+        if (!it)
+            return nullptr;
 
         /// Put cell to the end of lru list
         lru_list.splice(lru_list.end(), lru_list, lru_list.iterator_to(*it));
 
-        return value;
+        return it;
     }
 
-    const Value & get(const Key & key) const
+    ConstLookupResult ALWAYS_INLINE find(const Key & key) const
+    {
+        return const_cast<std::decay_t<decltype(*this)> *>(this)->find(key);
+    }
+
+    Value & ALWAYS_INLINE get(const Key & key)
+    {
+        auto it = find(key);
+        assert(it);
+
+        return it->getMapped();
+    }
+
+    const Value & ALWAYS_INLINE get(const Key & key) const
     {
         return const_cast<std::decay_t<decltype(*this)> *>(this)->get(key);
     }
 
-    bool contains(const Key & key) const
+    bool ALWAYS_INLINE contains(const Key & key) const
     {
-        return Base::has(key);
+        return find(key) != nullptr;
     }
 
-    bool erase(const Key & key)
+    bool ALWAYS_INLINE erase(const Key & key)
     {
-        auto hash = Base::hash(key);
-        auto it = Base::find(key, hash);
+        auto key_hash = Base::hash(key);
+        auto it = Base::find(key, key_hash);
 
         if (!it)
             return false;
 
         lru_list.erase(lru_list.iterator_to(*it));
 
-        return Base::erase(key, hash);
+        Cell copy_node = *it;
+        Base::erase(key, key_hash);
+        disposer(copy_node.getKey(), copy_node.getMapped());
+
+        return true;
     }
 
-    void clear()
+    void ALWAYS_INLINE clear()
     {
+        for (auto & cell : lru_list)
+            disposer(cell.getKey(), cell.getMapped());
+
         lru_list.clear();
         Base::clear();
     }
@@ -222,6 +250,10 @@ public:
 
     size_t getMaxSize() const { return max_size; }
 
+    size_t getSizeInBytes() const { return Base::getBufferSizeInBytes(); }
+
+    using Base::hash;
+
     iterator begin() { return lru_list.begin(); }
     const_iterator begin() const { return lru_list.cbegin(); }
     iterator end() { return lru_list.end(); }
@@ -235,10 +267,17 @@ public:
 private:
     size_t max_size;
     LRUList lru_list;
+    Disposer disposer;
 };
 
-template <typename Key, typename Value, typename Hash = DefaultHash<Key>>
-using LRUHashMap = LRUHashMapImpl<Key, Value, Hash, false>;
+template <typename Key, typename Mapped>
+struct DefaultLRUHashMapCellDisposer
+{
+    void operator()(const Key &, const Mapped &) const {}
+};
 
-template <typename Key, typename Value, typename Hash = DefaultHash<Key>>
-using LRUHashMapWithSavedHash = LRUHashMapImpl<Key, Value, Hash, true>;
+template <typename Key, typename Value, typename Disposer = DefaultLRUHashMapCellDisposer<Key, Value>, typename Hash = DefaultHash<Key>>
+using LRUHashMap = LRUHashMapImpl<Key, Value, Disposer, Hash, false>;
+
+template <typename Key, typename Value, typename Disposer = DefaultLRUHashMapCellDisposer<Key, Value>, typename Hash = DefaultHash<Key>>
+using LRUHashMapWithSavedHash = LRUHashMapImpl<Key, Value, Disposer, Hash, true>;
diff --git a/src/Common/IPv6ToBinary.cpp b/src/Common/IPv6ToBinary.cpp
index 3c004a5a84e..a8363a46de7 100644
--- a/src/Common/IPv6ToBinary.cpp
+++ b/src/Common/IPv6ToBinary.cpp
@@ -13,8 +13,7 @@ namespace DB
 /// Result array could be indexed with all possible uint8 values without extra check.
 /// For values greater than 128 we will store same value as for 128 (all bits set).
 constexpr size_t IPV6_MASKS_COUNT = 256;
-
-using RawMaskArray = std::array<uint8_t, IPV6_BINARY_LENGTH>;
+using RawMaskArrayV6 = std::array<uint8_t, IPV6_BINARY_LENGTH>;
 
 void IPv6ToRawBinary(const Poco::Net::IPAddress & address, char * res)
 {
@@ -41,33 +40,86 @@ std::array<char, 16> IPv6ToBinary(const Poco::Net::IPAddress & address)
     return res;
 }
 
-static constexpr RawMaskArray generateBitMask(size_t prefix)
+template <typename RawMaskArrayT>
+static constexpr RawMaskArrayT generateBitMask(size_t prefix)
 {
-    if (prefix >= 128)
-        prefix = 128;
-    RawMaskArray arr{0};
+    RawMaskArrayT arr{0};
+    if (prefix >= arr.size() * 8)
+        prefix = arr.size() * 8;
     size_t i = 0;
     for (; prefix >= 8; ++i, prefix -= 8)
         arr[i] = 0xff;
     if (prefix > 0)
         arr[i++] = ~(0xff >> prefix);
-    while (i < 16)
+    while (i < arr.size())
         arr[i++] = 0x00;
     return arr;
 }
 
-static constexpr std::array<RawMaskArray, IPV6_MASKS_COUNT> generateBitMasks()
+template <typename RawMaskArrayT, size_t masksCount>
+static constexpr std::array<RawMaskArrayT, masksCount> generateBitMasks()
 {
-    std::array<RawMaskArray, IPV6_MASKS_COUNT> arr{};
-    for (size_t i = 0; i < IPV6_MASKS_COUNT; ++i)
-        arr[i] = generateBitMask(i);
+    std::array<RawMaskArrayT, masksCount> arr{};
+    for (size_t i = 0; i < masksCount; ++i)
+        arr[i] = generateBitMask<RawMaskArrayT>(i);
     return arr;
 }
 
-const uint8_t * getCIDRMaskIPv6(UInt8 prefix_len)
+const std::array<uint8_t, 16> & getCIDRMaskIPv6(UInt8 prefix_len)
 {
-    static constexpr std::array<RawMaskArray, IPV6_MASKS_COUNT> IPV6_RAW_MASK_ARRAY = generateBitMasks();
-    return IPV6_RAW_MASK_ARRAY[prefix_len].data();
+    static constexpr auto IPV6_RAW_MASK_ARRAY = generateBitMasks<RawMaskArrayV6, IPV6_MASKS_COUNT>();
+    return IPV6_RAW_MASK_ARRAY[prefix_len];
 }
 
+bool matchIPv4Subnet(UInt32 addr, UInt32 cidr_addr, UInt8 prefix)
+{
+    UInt32 mask = (prefix >= 32) ? 0xffffffffu : ~(0xffffffffu >> prefix);
+    return (addr & mask) == (cidr_addr & mask);
+}
+
+#if defined(__SSE2__)
+#include <emmintrin.h>
+
+bool matchIPv6Subnet(const uint8_t * addr, const uint8_t * cidr_addr, UInt8 prefix)
+{
+    uint16_t mask = _mm_movemask_epi8(_mm_cmpeq_epi8(
+        _mm_loadu_si128(reinterpret_cast<const __m128i *>(addr)),
+        _mm_loadu_si128(reinterpret_cast<const __m128i *>(cidr_addr))));
+    mask = ~mask;
+
+    if (mask)
+    {
+        auto offset = __builtin_ctz(mask);
+
+        if (prefix / 8 != offset)
+            return prefix / 8 < offset;
+
+        auto cmpmask = ~(0xff >> (prefix % 8));
+        return (addr[offset] & cmpmask) == (cidr_addr[offset] & cmpmask);
+    }
+    return true;
+}
+
+# else
+
+bool matchIPv6Subnet(const uint8_t * addr, const uint8_t * cidr_addr, UInt8 prefix)
+{
+    if (prefix > IPV6_BINARY_LENGTH * 8U)
+        prefix = IPV6_BINARY_LENGTH * 8U;
+
+    size_t i = 0;
+    for (; prefix >= 8; ++i, prefix -= 8)
+    {
+        if (addr[i] != cidr_addr[i])
+            return false;
+    }
+    if (prefix == 0)
+        return true;
+
+    auto mask = ~(0xff >> prefix);
+    return (addr[i] & mask) == (cidr_addr[i] & mask);
+}
+
+#endif  // __SSE2__
+
 }
diff --git a/src/Common/IPv6ToBinary.h b/src/Common/IPv6ToBinary.h
index 2e47238aeba..d766d408359 100644
--- a/src/Common/IPv6ToBinary.h
+++ b/src/Common/IPv6ToBinary.h
@@ -14,9 +14,13 @@ void IPv6ToRawBinary(const Poco::Net::IPAddress & address, char * res);
 /// Convert IP address to 16-byte array with IPv6 data (big endian). If it's an IPv4, map it to IPv6.
 std::array<char, 16> IPv6ToBinary(const Poco::Net::IPAddress & address);
 
-/// Returns pointer to 16-byte array containing mask with first `prefix_len` bits set to `1` and `128 - prefix_len` to `0`.
-/// Pointer is valid during all program execution time and doesn't require freeing.
+/// Returns a reference to 16-byte array containing mask with first `prefix_len` bits set to `1` and `128 - prefix_len` to `0`.
+/// The reference is valid during all program execution time.
 /// Values of prefix_len greater than 128 interpreted as 128 exactly.
-const uint8_t * getCIDRMaskIPv6(UInt8 prefix_len);
+const std::array<uint8_t, 16> & getCIDRMaskIPv6(UInt8 prefix_len);
+
+/// Check that address contained in CIDR range
+bool matchIPv4Subnet(UInt32 addr, UInt32 cidr_addr, UInt8 prefix);
+bool matchIPv6Subnet(const uint8_t * addr, const uint8_t * cidr_addr, UInt8 prefix);
 
 }
diff --git a/src/Common/LRUCache.h b/src/Common/LRUCache.h
index d75c8caf1fc..012ab7fe6c4 100644
--- a/src/Common/LRUCache.h
+++ b/src/Common/LRUCache.h
@@ -271,16 +271,23 @@ private:
 
     void setImpl(const Key & key, const MappedPtr & mapped, [[maybe_unused]] std::lock_guard<std::mutex> & cache_lock)
     {
-        auto res = cells.emplace(std::piecewise_construct,
+        auto [it, inserted] = cells.emplace(std::piecewise_construct,
             std::forward_as_tuple(key),
             std::forward_as_tuple());
 
-        Cell & cell = res.first->second;
-        bool inserted = res.second;
+        Cell & cell = it->second;
 
         if (inserted)
         {
-            cell.queue_iterator = queue.insert(queue.end(), key);
+            try
+            {
+                cell.queue_iterator = queue.insert(queue.end(), key);
+            }
+            catch (...)
+            {
+                cells.erase(it);
+                throw;
+            }
         }
         else
         {
diff --git a/src/Common/Macros.cpp b/src/Common/Macros.cpp
index b8e25499c0b..7882449b595 100644
--- a/src/Common/Macros.cpp
+++ b/src/Common/Macros.cpp
@@ -78,7 +78,10 @@ String Macros::expand(const String & s,
 
         /// Prefer explicit macros over implicit.
         if (it != macros.end() && !info.expand_special_macros_only)
+        {
             res += it->second;
+            info.expanded_other = true;
+        }
         else if (macro_name == "database" && !info.table_id.database_name.empty())
         {
             res += info.table_id.database_name;
diff --git a/src/Common/Macros.h b/src/Common/Macros.h
index 3082452e297..9298dbfc2d5 100644
--- a/src/Common/Macros.h
+++ b/src/Common/Macros.h
@@ -40,6 +40,7 @@ public:
         bool expanded_database = false;
         bool expanded_table = false;
         bool expanded_uuid = false;
+        bool expanded_other = false;
         bool has_unknown = false;
     };
 
diff --git a/src/Common/MemorySanitizer.h b/src/Common/MemorySanitizer.h
index 54a92ea3a19..9e34e454090 100644
--- a/src/Common/MemorySanitizer.h
+++ b/src/Common/MemorySanitizer.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <common/defines.h>
+
 #ifdef __clang__
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wreserved-id-macro"
@@ -9,14 +11,15 @@
 #define __msan_test_shadow(X, Y) (false)
 #define __msan_print_shadow(X, Y)
 #define __msan_unpoison_string(X)
-#if defined(__has_feature)
-#   if __has_feature(memory_sanitizer)
-#       undef __msan_unpoison
-#       undef __msan_test_shadow
-#       undef __msan_print_shadow
-#       undef __msan_unpoison_string
-#       include <sanitizer/msan_interface.h>
-#   endif
+
+#if defined(ch_has_feature)
+#    if ch_has_feature(memory_sanitizer)
+#        undef __msan_unpoison
+#        undef __msan_test_shadow
+#        undef __msan_print_shadow
+#        undef __msan_unpoison_string
+#        include <sanitizer/msan_interface.h>
+#    endif
 #endif
 
 #ifdef __clang__
diff --git a/src/Common/MemoryTracker.cpp b/src/Common/MemoryTracker.cpp
index a584885cf0f..60fb4d06b14 100644
--- a/src/Common/MemoryTracker.cpp
+++ b/src/Common/MemoryTracker.cpp
@@ -24,8 +24,8 @@ namespace
 ///
 /// - when it is explicitly blocked with LockExceptionInThread
 ///
-/// - to avoid std::terminate(), when stack unwinding is currently in progress
-///   in this thread.
+/// - when there are uncaught exceptions objects in the current thread
+///   (to avoid std::terminate())
 ///
 ///   NOTE: that since C++11 destructor marked with noexcept by default, and
 ///   this means that any throw from destructor (that is not marked with
diff --git a/src/Common/PODArray.h b/src/Common/PODArray.h
index 8e05dfea8b3..b1042332cfa 100644
--- a/src/Common/PODArray.h
+++ b/src/Common/PODArray.h
@@ -117,8 +117,11 @@ protected:
     template <typename ... TAllocatorParams>
     void alloc(size_t bytes, TAllocatorParams &&... allocator_params)
     {
-        c_start = c_end = reinterpret_cast<char *>(TAllocator::alloc(bytes, std::forward<TAllocatorParams>(allocator_params)...)) + pad_left;
-        c_end_of_storage = c_start + bytes - pad_right - pad_left;
+        char * allocated = reinterpret_cast<char *>(TAllocator::alloc(bytes, std::forward<TAllocatorParams>(allocator_params)...));
+
+        c_start = allocated + pad_left;
+        c_end = c_start;
+        c_end_of_storage = allocated + bytes - pad_right;
 
         if (pad_left)
             memset(c_start - ELEMENT_SIZE, 0, ELEMENT_SIZE);
@@ -147,12 +150,12 @@ protected:
 
         ptrdiff_t end_diff = c_end - c_start;
 
-        c_start = reinterpret_cast<char *>(
-                TAllocator::realloc(c_start - pad_left, allocated_bytes(), bytes, std::forward<TAllocatorParams>(allocator_params)...))
-            + pad_left;
+        char * allocated = reinterpret_cast<char *>(
+            TAllocator::realloc(c_start - pad_left, allocated_bytes(), bytes, std::forward<TAllocatorParams>(allocator_params)...));
 
+        c_start = allocated + pad_left;
         c_end = c_start + end_diff;
-        c_end_of_storage = c_start + bytes - pad_right - pad_left;
+        c_end_of_storage = allocated + bytes - pad_right;
     }
 
     bool isInitialized() const
@@ -318,11 +321,9 @@ protected:
 
     T * t_start()                      { return reinterpret_cast<T *>(this->c_start); }
     T * t_end()                        { return reinterpret_cast<T *>(this->c_end); }
-    T * t_end_of_storage()             { return reinterpret_cast<T *>(this->c_end_of_storage); }
 
     const T * t_start() const          { return reinterpret_cast<const T *>(this->c_start); }
     const T * t_end() const            { return reinterpret_cast<const T *>(this->c_end); }
-    const T * t_end_of_storage() const { return reinterpret_cast<const T *>(this->c_end_of_storage); }
 
 public:
     using value_type = T;
@@ -334,7 +335,7 @@ public:
     using const_iterator = const T *;
 
 
-    PODArray() {}
+    PODArray() = default;
 
     PODArray(size_t n)
     {
@@ -430,7 +431,7 @@ public:
     template <typename U, typename ... TAllocatorParams>
     void push_back(U && x, TAllocatorParams &&... allocator_params)
     {
-        if (unlikely(this->c_end == this->c_end_of_storage))
+        if (unlikely(this->c_end + sizeof(T) > this->c_end_of_storage))
             this->reserveForNextSize(std::forward<TAllocatorParams>(allocator_params)...);
 
         new (t_end()) T(std::forward<U>(x));
@@ -443,7 +444,7 @@ public:
     template <typename... Args>
     void emplace_back(Args &&... args)
     {
-        if (unlikely(this->c_end == this->c_end_of_storage))
+        if (unlikely(this->c_end + sizeof(T) > this->c_end_of_storage))
             this->reserveForNextSize();
 
         new (t_end()) T(std::forward<Args>(args)...);
@@ -529,6 +530,31 @@ public:
         this->c_end += bytes_to_copy;
     }
 
+    template <typename ... TAllocatorParams>
+    void insertFromItself(iterator from_begin, iterator from_end, TAllocatorParams && ... allocator_params)
+    {
+        static_assert(memcpy_can_be_used_for_assignment<std::decay_t<T>, std::decay_t<decltype(*from_begin)>>);
+
+        /// Convert iterators to indexes because reserve can invalidate iterators
+        size_t start_index = from_begin - begin();
+        size_t end_index = from_end - begin();
+        size_t copy_size = end_index - start_index;
+
+        assert(start_index <= end_index);
+
+        size_t required_capacity = this->size() + copy_size;
+        if (required_capacity > this->capacity())
+            this->reserve(roundUpToPowerOfTwoOrZero(required_capacity), std::forward<TAllocatorParams>(allocator_params)...);
+
+        size_t bytes_to_copy = this->byte_size(copy_size);
+        if (bytes_to_copy)
+        {
+            auto begin = this->c_start + this->byte_size(start_index);
+            memcpy(this->c_end, reinterpret_cast<const void *>(&*begin), bytes_to_copy);
+            this->c_end += bytes_to_copy;
+        }
+    }
+
     template <typename It1, typename It2>
     void insert_assume_reserved(It1 from_begin, It2 from_end)
     {
@@ -567,7 +593,7 @@ public:
 
             /// arr1 takes ownership of the heap memory of arr2.
             arr1.c_start = arr2.c_start;
-            arr1.c_end_of_storage = arr1.c_start + heap_allocated - arr1.pad_right;
+            arr1.c_end_of_storage = arr1.c_start + heap_allocated - arr2.pad_right - arr2.pad_left;
             arr1.c_end = arr1.c_start + this->byte_size(heap_size);
 
             /// Allocate stack space for arr2.
@@ -584,7 +610,7 @@ public:
                 dest.dealloc();
                 dest.alloc(src.allocated_bytes(), std::forward<TAllocatorParams>(allocator_params)...);
                 memcpy(dest.c_start, src.c_start, this->byte_size(src.size()));
-                dest.c_end = dest.c_start + (src.c_end - src.c_start);
+                dest.c_end = dest.c_start + this->byte_size(src.size());
 
                 src.c_start = Base::null;
                 src.c_end = Base::null;
@@ -638,8 +664,8 @@ public:
             size_t rhs_size = rhs.size();
             size_t rhs_allocated = rhs.allocated_bytes();
 
-            this->c_end_of_storage = this->c_start + rhs_allocated - Base::pad_right;
-            rhs.c_end_of_storage = rhs.c_start + lhs_allocated - Base::pad_right;
+            this->c_end_of_storage = this->c_start + rhs_allocated - Base::pad_right - Base::pad_left;
+            rhs.c_end_of_storage = rhs.c_start + lhs_allocated - Base::pad_right - Base::pad_left;
 
             this->c_end = this->c_start + this->byte_size(rhs_size);
             rhs.c_end = rhs.c_start + this->byte_size(lhs_size);
@@ -691,35 +717,59 @@ public:
         assign(from.begin(), from.end());
     }
 
-
-    bool operator== (const PODArray & other) const
+    void erase(const_iterator first, const_iterator last)
     {
-        if (this->size() != other.size())
+        iterator first_no_const = const_cast<iterator>(first);
+        iterator last_no_const = const_cast<iterator>(last);
+
+        size_t items_to_move = end() - last;
+
+        while (items_to_move != 0)
+        {
+            *first_no_const = *last_no_const;
+
+            ++first_no_const;
+            ++last_no_const;
+
+            --items_to_move;
+        }
+
+        this->c_end = reinterpret_cast<char *>(first_no_const);
+    }
+
+    void erase(const_iterator pos)
+    {
+        this->erase(pos, pos + 1);
+    }
+
+    bool operator== (const PODArray & rhs) const
+    {
+        if (this->size() != rhs.size())
             return false;
 
-        const_iterator this_it = begin();
-        const_iterator that_it = other.begin();
+        const_iterator lhs_it = begin();
+        const_iterator rhs_it = rhs.begin();
 
-        while (this_it != end())
+        while (lhs_it != end())
         {
-            if (*this_it != *that_it)
+            if (*lhs_it != *rhs_it)
                 return false;
 
-            ++this_it;
-            ++that_it;
+            ++lhs_it;
+            ++rhs_it;
         }
 
         return true;
     }
 
-    bool operator!= (const PODArray & other) const
+    bool operator!= (const PODArray & rhs) const
     {
-        return !operator==(other);
+        return !operator==(rhs);
     }
 };
 
-template <typename T, size_t initial_bytes, typename TAllocator, size_t pad_right_>
-void swap(PODArray<T, initial_bytes, TAllocator, pad_right_> & lhs, PODArray<T, initial_bytes, TAllocator, pad_right_> & rhs)
+template <typename T, size_t initial_bytes, typename TAllocator, size_t pad_right_, size_t pad_left_>
+void swap(PODArray<T, initial_bytes, TAllocator, pad_right_, pad_left_> & lhs, PODArray<T, initial_bytes, TAllocator, pad_right_, pad_left_> & rhs)
 {
     lhs.swap(rhs);
 }
diff --git a/src/Common/PoolBase.h b/src/Common/PoolBase.h
index 43f4fbff9fe..6fc5aee26dd 100644
--- a/src/Common/PoolBase.h
+++ b/src/Common/PoolBase.h
@@ -51,7 +51,7 @@ private:
       */
     struct PoolEntryHelper
     {
-        PoolEntryHelper(PooledObject & data_) : data(data_) { data.in_use = true; }
+        explicit PoolEntryHelper(PooledObject & data_) : data(data_) { data.in_use = true; }
         ~PoolEntryHelper()
         {
             std::unique_lock lock(data.pool.mutex);
@@ -69,7 +69,7 @@ public:
     public:
         friend class PoolBase<Object>;
 
-        Entry() {}    /// For deferred initialization.
+        Entry() = default;    /// For deferred initialization.
 
         /** The `Entry` object protects the resource from being used by another thread.
           * The following methods are forbidden for `rvalue`, so you can not write a similar to
@@ -99,10 +99,10 @@ public:
     private:
         std::shared_ptr<PoolEntryHelper> data;
 
-        Entry(PooledObject & object) : data(std::make_shared<PoolEntryHelper>(object)) {}
+        explicit Entry(PooledObject & object) : data(std::make_shared<PoolEntryHelper>(object)) {}
     };
 
-    virtual ~PoolBase() {}
+    virtual ~PoolBase() = default;
 
     /** Allocates the object. Wait for free object in pool for 'timeout'. With 'timeout' < 0, the timeout is infinite. */
     Entry get(Poco::Timespan::TimeDiff timeout)
diff --git a/src/Common/PoolWithFailoverBase.h b/src/Common/PoolWithFailoverBase.h
index 7779d18d969..141ac7a7e49 100644
--- a/src/Common/PoolWithFailoverBase.h
+++ b/src/Common/PoolWithFailoverBase.h
@@ -93,6 +93,19 @@ public:
         double staleness = 0.0; /// Helps choosing the "least stale" option when all replicas are stale.
     };
 
+    struct PoolState;
+
+    using PoolStates = std::vector<PoolState>;
+
+    struct ShuffledPool
+    {
+        NestedPool * pool{};
+        const PoolState * state{};
+        size_t index = 0;
+        size_t error_count = 0;
+        size_t slowdown_count = 0;
+    };
+
     /// This functor must be provided by a client. It must perform a single try that takes a connection
     /// from the provided pool and checks that it is good.
     using TryGetEntryFunc = std::function<TryResult(NestedPool & pool, std::string & fail_message)>;
@@ -113,9 +126,6 @@ public:
             const GetPriorityFunc & get_priority = GetPriorityFunc());
 
 protected:
-    struct PoolState;
-
-    using PoolStates = std::vector<PoolState>;
 
     /// Returns a single connection.
     Entry get(size_t max_ignored_errors, bool fallback_to_stale_replicas,
@@ -124,6 +134,12 @@ protected:
     /// This function returns a copy of pool states to avoid race conditions when modifying shared pool states.
     PoolStates updatePoolStates(size_t max_ignored_errors);
 
+    void updateErrorCounts(PoolStates & states, time_t & last_decrease_time) const;
+
+    std::vector<ShuffledPool> getShuffledPools(size_t max_ignored_errors, const GetPriorityFunc & get_priority);
+
+    inline void updateSharedErrorCounts(std::vector<ShuffledPool> & shuffled_pools);
+
     auto getPoolExtendedStates() const
     {
         std::lock_guard lock(pool_states_mutex);
@@ -143,6 +159,47 @@ protected:
     Poco::Logger * log;
 };
 
+
+template <typename TNestedPool>
+std::vector<typename PoolWithFailoverBase<TNestedPool>::ShuffledPool>
+PoolWithFailoverBase<TNestedPool>::getShuffledPools(
+    size_t max_ignored_errors, const PoolWithFailoverBase::GetPriorityFunc & get_priority)
+{
+    /// Update random numbers and error counts.
+    PoolStates pool_states = updatePoolStates(max_ignored_errors);
+    if (get_priority)
+    {
+        for (size_t i = 0; i < pool_states.size(); ++i)
+            pool_states[i].priority = get_priority(i);
+    }
+
+    /// Sort the pools into order in which they will be tried (based on respective PoolStates).
+    std::vector<ShuffledPool> shuffled_pools;
+    shuffled_pools.reserve(nested_pools.size());
+    for (size_t i = 0; i < nested_pools.size(); ++i)
+        shuffled_pools.push_back(ShuffledPool{nested_pools[i].get(), &pool_states[i], i, 0});
+    std::sort(
+        shuffled_pools.begin(), shuffled_pools.end(),
+        [](const ShuffledPool & lhs, const ShuffledPool & rhs)
+        {
+            return PoolState::compare(*lhs.state, *rhs.state);
+        });
+
+    return shuffled_pools;
+}
+
+template <typename TNestedPool>
+inline void PoolWithFailoverBase<TNestedPool>::updateSharedErrorCounts(std::vector<ShuffledPool> & shuffled_pools)
+{
+    std::lock_guard lock(pool_states_mutex);
+    for (const ShuffledPool & pool: shuffled_pools)
+    {
+        auto & pool_state = shared_pool_states[pool.index];
+        pool_state.error_count = std::min<UInt64>(max_error_cap, pool_state.error_count + pool.error_count);
+        pool_state.slowdown_count += pool.slowdown_count;
+    }
+}
+
 template <typename TNestedPool>
 typename TNestedPool::Entry
 PoolWithFailoverBase<TNestedPool>::get(size_t max_ignored_errors, bool fallback_to_stale_replicas,
@@ -168,33 +225,7 @@ PoolWithFailoverBase<TNestedPool>::getMany(
         const TryGetEntryFunc & try_get_entry,
         const GetPriorityFunc & get_priority)
 {
-    /// Update random numbers and error counts.
-    PoolStates pool_states = updatePoolStates(max_ignored_errors);
-    if (get_priority)
-    {
-        for (size_t i = 0; i < pool_states.size(); ++i)
-            pool_states[i].priority = get_priority(i);
-    }
-
-    struct ShuffledPool
-    {
-        NestedPool * pool{};
-        const PoolState * state{};
-        size_t index = 0;
-        size_t error_count = 0;
-    };
-
-    /// Sort the pools into order in which they will be tried (based on respective PoolStates).
-    std::vector<ShuffledPool> shuffled_pools;
-    shuffled_pools.reserve(nested_pools.size());
-    for (size_t i = 0; i < nested_pools.size(); ++i)
-        shuffled_pools.push_back(ShuffledPool{nested_pools[i].get(), &pool_states[i], i, 0});
-    std::sort(
-            shuffled_pools.begin(), shuffled_pools.end(),
-            [](const ShuffledPool & lhs, const ShuffledPool & rhs)
-            {
-                return PoolState::compare(*lhs.state, *rhs.state);
-            });
+    std::vector<ShuffledPool> shuffled_pools = getShuffledPools(max_ignored_errors, get_priority);
 
     /// We will try to get a connection from each pool until a connection is produced or max_tries is reached.
     std::vector<TryResult> try_results(shuffled_pools.size());
@@ -206,12 +237,7 @@ PoolWithFailoverBase<TNestedPool>::getMany(
     /// At exit update shared error counts with error counts occurred during this call.
     SCOPE_EXIT(
     {
-        std::lock_guard lock(pool_states_mutex);
-        for (const ShuffledPool & pool: shuffled_pools)
-        {
-            auto & pool_state = shared_pool_states[pool.index];
-            pool_state.error_count = std::min<UInt64>(max_error_cap, pool_state.error_count + pool.error_count);
-        }
+        updateSharedErrorCounts(shuffled_pools);
     });
 
     std::string fail_messages;
@@ -310,6 +336,8 @@ template <typename TNestedPool>
 struct PoolWithFailoverBase<TNestedPool>::PoolState
 {
     UInt64 error_count = 0;
+    /// The number of slowdowns that led to changing replica in HedgedRequestsFactory
+    UInt64 slowdown_count = 0;
     /// Priority from the <remote_server> configuration.
     Int64 config_priority = 1;
     /// Priority from the GetPriorityFunc.
@@ -323,8 +351,8 @@ struct PoolWithFailoverBase<TNestedPool>::PoolState
 
     static bool compare(const PoolState & lhs, const PoolState & rhs)
     {
-        return std::forward_as_tuple(lhs.error_count, lhs.config_priority, lhs.priority, lhs.random)
-             < std::forward_as_tuple(rhs.error_count, rhs.config_priority, rhs.priority, rhs.random);
+        return std::forward_as_tuple(lhs.error_count, lhs.slowdown_count, lhs.config_priority, lhs.priority, lhs.random)
+             < std::forward_as_tuple(rhs.error_count, rhs.slowdown_count, rhs.config_priority, rhs.priority, rhs.random);
     }
 
 private:
@@ -344,39 +372,7 @@ PoolWithFailoverBase<TNestedPool>::updatePoolStates(size_t max_ignored_errors)
         for (auto & state : shared_pool_states)
             state.randomize();
 
-        time_t current_time = time(nullptr);
-
-        if (last_error_decrease_time)
-        {
-            time_t delta = current_time - last_error_decrease_time;
-
-            if (delta >= 0)
-            {
-                const UInt64 MAX_BITS = sizeof(UInt64) * CHAR_BIT;
-                size_t shift_amount = MAX_BITS;
-                /// Divide error counts by 2 every decrease_error_period seconds.
-                if (decrease_error_period)
-                    shift_amount = delta / decrease_error_period;
-                /// Update time but don't do it more often than once a period.
-                /// Else if the function is called often enough, error count will never decrease.
-                if (shift_amount)
-                    last_error_decrease_time = current_time;
-
-                if (shift_amount >= MAX_BITS)
-                {
-                    for (auto & state : shared_pool_states)
-                        state.error_count = 0;
-                }
-                else if (shift_amount)
-                {
-                    for (auto & state : shared_pool_states)
-                        state.error_count >>= shift_amount;
-                }
-            }
-        }
-        else
-            last_error_decrease_time = current_time;
-
+        updateErrorCounts(shared_pool_states, last_error_decrease_time);
         result.assign(shared_pool_states.begin(), shared_pool_states.end());
     }
 
@@ -386,3 +382,46 @@ PoolWithFailoverBase<TNestedPool>::updatePoolStates(size_t max_ignored_errors)
 
     return result;
 }
+
+template <typename TNestedPool>
+void PoolWithFailoverBase<TNestedPool>::updateErrorCounts(PoolWithFailoverBase<TNestedPool>::PoolStates & states, time_t & last_decrease_time) const
+{
+    time_t current_time = time(nullptr);
+
+    if (last_decrease_time)
+    {
+        time_t delta = current_time - last_decrease_time;
+
+        if (delta >= 0)
+        {
+            const UInt64 MAX_BITS = sizeof(UInt64) * CHAR_BIT;
+            size_t shift_amount = MAX_BITS;
+            /// Divide error counts by 2 every decrease_error_period seconds.
+            if (decrease_error_period)
+                shift_amount = delta / decrease_error_period;
+            /// Update time but don't do it more often than once a period.
+            /// Else if the function is called often enough, error count will never decrease.
+            if (shift_amount)
+                last_decrease_time = current_time;
+
+            if (shift_amount >= MAX_BITS)
+            {
+                for (auto & state : states)
+                {
+                    state.error_count = 0;
+                    state.slowdown_count = 0;
+                }
+            }
+            else if (shift_amount)
+            {
+                for (auto & state : states)
+                {
+                    state.error_count >>= shift_amount;
+                    state.slowdown_count >>= shift_amount;
+                }
+            }
+        }
+    }
+    else
+        last_decrease_time = current_time;
+}
diff --git a/src/Common/ProfileEvents.cpp b/src/Common/ProfileEvents.cpp
index c459bf41352..162d6e035cc 100644
--- a/src/Common/ProfileEvents.cpp
+++ b/src/Common/ProfileEvents.cpp
@@ -32,6 +32,8 @@
     M(UncompressedCacheHits, "") \
     M(UncompressedCacheMisses, "") \
     M(UncompressedCacheWeightLost, "") \
+    M(MMappedFileCacheHits, "") \
+    M(MMappedFileCacheMisses, "") \
     M(IOBufferAllocs, "") \
     M(IOBufferAllocBytes, "") \
     M(ArenaAllocChunks, "") \
@@ -68,6 +70,9 @@
     M(DelayedInserts, "Number of times the INSERT of a block to a MergeTree table was throttled due to high number of active data parts for partition.") \
     M(RejectedInserts, "Number of times the INSERT of a block to a MergeTree table was rejected with 'Too many parts' exception due to high number of active data parts for partition.") \
     M(DelayedInsertsMilliseconds, "Total number of milliseconds spent while the INSERT of a block to a MergeTree table was throttled due to high number of active data parts for partition.") \
+    M(DistributedDelayedInserts, "Number of times the INSERT of a block to a Distributed table was throttled due to high number of pending bytes.") \
+    M(DistributedRejectedInserts, "Number of times the INSERT of a block to a Distributed table was rejected with 'Too many bytes' exception due to high number of pending bytes.") \
+    M(DistributedDelayedInsertsMilliseconds, "Total number of milliseconds spent while the INSERT of a block to a Distributed table was throttled due to high number of pending bytes.") \
     M(DuplicatedInsertedBlocks, "Number of times the INSERTed block to a ReplicatedMergeTree table was deduplicated.") \
     \
     M(ZooKeeperInit, "") \
@@ -94,6 +99,8 @@
     M(DistributedConnectionStaleReplica, "") \
     M(DistributedConnectionFailAtAll, "Total count when distributed connection fails after all retries finished") \
     \
+    M(HedgedRequestsChangeReplica, "Total count when timeout for changing replica expired in hedged requests.") \
+    \
     M(CompileFunction, "Number of times a compilation of generated LLVM code (to create fused function for complex expressions) was initiated.") \
     M(CompiledFunctionExecute, "Number of times a compiled function was executed.") \
     M(CompileExpressionsMicroseconds, "Total time spent for compilation of expressions to LLVM code.") \
@@ -139,6 +146,11 @@
     M(StorageBufferPassedTimeMaxThreshold, "") \
     M(StorageBufferPassedRowsMaxThreshold, "") \
     M(StorageBufferPassedBytesMaxThreshold, "") \
+    M(StorageBufferPassedTimeFlushThreshold, "") \
+    M(StorageBufferPassedRowsFlushThreshold, "") \
+    M(StorageBufferPassedBytesFlushThreshold, "") \
+    M(StorageBufferLayerLockReadersWaitMilliseconds, "Time for waiting for Buffer layer during reading") \
+    M(StorageBufferLayerLockWritersWaitMilliseconds, "Time for waiting free Buffer layer to write to (can be used to tune Buffer layers)") \
     \
     M(DictCacheKeysRequested, "") \
     M(DictCacheKeysRequestedMiss, "") \
diff --git a/src/Common/RemoteHostFilter.cpp b/src/Common/RemoteHostFilter.cpp
index fb6fc4e9bc3..6ea366314e1 100644
--- a/src/Common/RemoteHostFilter.cpp
+++ b/src/Common/RemoteHostFilter.cpp
@@ -42,6 +42,7 @@ void RemoteHostFilter::setValuesFromConfig(const Poco::Util::AbstractConfigurati
             else if (startsWith(key, "host"))
                 primary_hosts.insert(config.getString("remote_url_allow_hosts." + key));
         }
+        is_allow_by_default = false;
     }
 }
 
@@ -58,6 +59,6 @@ bool RemoteHostFilter::checkForDirectEntry(const std::string & str) const
         }
         return true;
     }
-    return true;
+    return is_allow_by_default;
 }
 }
diff --git a/src/Common/RemoteHostFilter.h b/src/Common/RemoteHostFilter.h
index 48d9b2bda7c..a445471a411 100644
--- a/src/Common/RemoteHostFilter.h
+++ b/src/Common/RemoteHostFilter.h
@@ -24,6 +24,7 @@ public:
     void checkHostAndPort(const std::string & host, const std::string & port) const; /// Does the same as checkURL, but for host and port.
 
 private:
+    bool is_allow_by_default = true;
     std::unordered_set<std::string> primary_hosts;      /// Allowed primary (<host>) URL from config.xml
     std::vector<std::string> regexp_hosts;              /// Allowed regexp (<hots_regexp>) URL from config.xml
 
diff --git a/src/Common/SharedLibrary.cpp b/src/Common/SharedLibrary.cpp
index 689179be7d8..37da308d5af 100644
--- a/src/Common/SharedLibrary.cpp
+++ b/src/Common/SharedLibrary.cpp
@@ -13,11 +13,11 @@ namespace ErrorCodes
     extern const int CANNOT_DLSYM;
 }
 
-SharedLibrary::SharedLibrary(const std::string & path, int flags)
+SharedLibrary::SharedLibrary(std::string_view path, int flags)
 {
-    handle = dlopen(path.c_str(), flags);
+    handle = dlopen(path.data(), flags);
     if (!handle)
-        throw Exception(std::string("Cannot dlopen: ") + dlerror(), ErrorCodes::CANNOT_DLOPEN);
+        throw Exception(ErrorCodes::CANNOT_DLOPEN, "Cannot dlopen: ({})", dlerror());
 
     updatePHDRCache();
 
@@ -31,17 +31,18 @@ SharedLibrary::~SharedLibrary()
         std::terminate();
 }
 
-void * SharedLibrary::getImpl(const std::string & name, bool no_throw)
+void * SharedLibrary::getImpl(std::string_view name, bool no_throw)
 {
     dlerror();
 
-    auto * res = dlsym(handle, name.c_str());
+    auto * res = dlsym(handle, name.data());
 
     if (char * error = dlerror())
     {
         if (no_throw)
             return nullptr;
-        throw Exception(std::string("Cannot dlsym: ") + error, ErrorCodes::CANNOT_DLSYM);
+
+        throw Exception(ErrorCodes::CANNOT_DLSYM, "Cannot dlsym: ({})", error);
     }
 
     return res;
diff --git a/src/Common/SharedLibrary.h b/src/Common/SharedLibrary.h
index 9d2b9bc7843..866e60fbd33 100644
--- a/src/Common/SharedLibrary.h
+++ b/src/Common/SharedLibrary.h
@@ -14,23 +14,24 @@ namespace DB
 class SharedLibrary : private boost::noncopyable
 {
 public:
-    explicit SharedLibrary(const std::string & path, int flags = RTLD_LAZY);
+    explicit SharedLibrary(std::string_view path, int flags = RTLD_LAZY);
 
     ~SharedLibrary();
 
     template <typename Func>
-    Func get(const std::string & name)
+    Func get(std::string_view name)
     {
         return reinterpret_cast<Func>(getImpl(name));
     }
+
     template <typename Func>
-    Func tryGet(const std::string & name)
+    Func tryGet(std::string_view name)
     {
         return reinterpret_cast<Func>(getImpl(name, true));
     }
 
 private:
-    void * getImpl(const std::string & name, bool no_throw = false);
+    void * getImpl(std::string_view name, bool no_throw = false);
 
     void * handle = nullptr;
 };
diff --git a/src/Common/ShellCommand.cpp b/src/Common/ShellCommand.cpp
index 069c7774729..6a18cb77346 100644
--- a/src/Common/ShellCommand.cpp
+++ b/src/Common/ShellCommand.cpp
@@ -2,15 +2,18 @@
 #include <sys/wait.h>
 #include <fcntl.h>
 #include <dlfcn.h>
+#include <unistd.h>
+#include <time.h>
+#include <csignal>
+
+#include <common/logger_useful.h>
+#include <common/errnoToString.h>
 #include <Common/Exception.h>
 #include <Common/ShellCommand.h>
 #include <Common/PipeFDs.h>
-#include <common/logger_useful.h>
-#include <common/errnoToString.h>
 #include <IO/WriteHelpers.h>
 #include <IO/Operators.h>
-#include <unistd.h>
-#include <csignal>
+
 
 namespace
 {
@@ -36,9 +39,9 @@ namespace ErrorCodes
     extern const int CANNOT_CREATE_CHILD_PROCESS;
 }
 
-ShellCommand::ShellCommand(pid_t pid_, int & in_fd_, int & out_fd_, int & err_fd_, bool terminate_in_destructor_)
+ShellCommand::ShellCommand(pid_t pid_, int & in_fd_, int & out_fd_, int & err_fd_, ShellCommandDestructorStrategy destructor_strategy_)
     : pid(pid_)
-    , terminate_in_destructor(terminate_in_destructor_)
+    , destructor_strategy(destructor_strategy_)
     , in(in_fd_)
     , out(out_fd_)
     , err(err_fd_)
@@ -52,14 +55,24 @@ Poco::Logger * ShellCommand::getLogger()
 
 ShellCommand::~ShellCommand()
 {
-    if (terminate_in_destructor)
+    if (wait_called)
+        return;
+
+    if (destructor_strategy.terminate_in_destructor)
     {
-        LOG_TRACE(getLogger(), "Will kill shell command pid {} with SIGTERM", pid);
-        int retcode = kill(pid, SIGTERM);
-        if (retcode != 0)
-            LOG_WARNING(getLogger(), "Cannot kill shell command pid {} errno '{}'", pid, errnoToString(retcode));
+        size_t try_wait_timeout = destructor_strategy.wait_for_normal_exit_before_termination_seconds;
+        bool process_terminated_normally = tryWaitProcessWithTimeout(try_wait_timeout);
+
+        if (!process_terminated_normally)
+        {
+            LOG_TRACE(getLogger(), "Will kill shell command pid {} with SIGTERM", pid);
+
+            int retcode = kill(pid, SIGTERM);
+            if (retcode != 0)
+                LOG_WARNING(getLogger(), "Cannot kill shell command pid {} errno '{}'", pid, errnoToString(retcode));
+        }
     }
-    else if (!wait_called)
+    else
     {
         try
         {
@@ -72,6 +85,53 @@ ShellCommand::~ShellCommand()
     }
 }
 
+bool ShellCommand::tryWaitProcessWithTimeout(size_t timeout_in_seconds)
+{
+    int status = 0;
+
+    LOG_TRACE(getLogger(), "Try wait for shell command pid ({}) with timeout ({})", pid, timeout_in_seconds);
+
+    wait_called = true;
+    struct timespec interval {.tv_sec = 1, .tv_nsec = 0};
+
+    in.close();
+    out.close();
+    err.close();
+
+    if (timeout_in_seconds == 0)
+    {
+        /// If there is no timeout before signal try to waitpid 1 time without block so we can avoid sending
+        /// signal if process is already normally terminated.
+
+        int waitpid_res = waitpid(pid, &status, WNOHANG);
+        bool process_terminated_normally = (waitpid_res == pid);
+        return process_terminated_normally;
+    }
+
+    /// If timeout is positive try waitpid without block in loop until
+    /// process is normally terminated or waitpid return error
+
+    while (timeout_in_seconds != 0)
+    {
+        int waitpid_res = waitpid(pid, &status, WNOHANG);
+        bool process_terminated_normally = (waitpid_res == pid);
+
+        if (process_terminated_normally)
+            return true;
+        else if (waitpid_res == 0)
+        {
+            --timeout_in_seconds;
+            nanosleep(&interval, nullptr);
+
+            continue;
+        }
+        else if (waitpid_res == -1 && errno != EINTR)
+            return false;
+    }
+
+    return false;
+}
+
 void ShellCommand::logCommand(const char * filename, char * const argv[])
 {
     WriteBufferFromOwnString args;
@@ -87,7 +147,10 @@ void ShellCommand::logCommand(const char * filename, char * const argv[])
 }
 
 std::unique_ptr<ShellCommand> ShellCommand::executeImpl(
-    const char * filename, char * const argv[], bool pipe_stdin_only, bool terminate_in_destructor)
+    const char * filename,
+    char * const argv[],
+    bool pipe_stdin_only,
+    ShellCommandDestructorStrategy terminate_in_destructor_strategy)
 {
     logCommand(filename, argv);
 
@@ -144,7 +207,7 @@ std::unique_ptr<ShellCommand> ShellCommand::executeImpl(
     }
 
     std::unique_ptr<ShellCommand> res(new ShellCommand(
-        pid, pipe_stdin.fds_rw[1], pipe_stdout.fds_rw[0], pipe_stderr.fds_rw[0], terminate_in_destructor));
+        pid, pipe_stdin.fds_rw[1], pipe_stdout.fds_rw[0], pipe_stderr.fds_rw[0], terminate_in_destructor_strategy));
 
     LOG_TRACE(getLogger(), "Started shell command '{}' with pid {}", filename, pid);
     return res;
@@ -152,7 +215,9 @@ std::unique_ptr<ShellCommand> ShellCommand::executeImpl(
 
 
 std::unique_ptr<ShellCommand> ShellCommand::execute(
-    const std::string & command, bool pipe_stdin_only, bool terminate_in_destructor)
+    const std::string & command,
+    bool pipe_stdin_only,
+    ShellCommandDestructorStrategy terminate_in_destructor_strategy)
 {
     /// Arguments in non-constant chunks of memory (as required for `execv`).
     /// Moreover, their copying must be done before calling `vfork`, so after `vfork` do a minimum of things.
@@ -162,12 +227,14 @@ std::unique_ptr<ShellCommand> ShellCommand::execute(
 
     char * const argv[] = { argv0.data(), argv1.data(), argv2.data(), nullptr };
 
-    return executeImpl("/bin/sh", argv, pipe_stdin_only, terminate_in_destructor);
+    return executeImpl("/bin/sh", argv, pipe_stdin_only, terminate_in_destructor_strategy);
 }
 
 
 std::unique_ptr<ShellCommand> ShellCommand::executeDirect(
-    const std::string & path, const std::vector<std::string> & arguments, bool terminate_in_destructor)
+    const std::string & path,
+    const std::vector<std::string> & arguments,
+    ShellCommandDestructorStrategy terminate_in_destructor_strategy)
 {
     size_t argv_sum_size = path.size() + 1;
     for (const auto & arg : arguments)
@@ -188,7 +255,7 @@ std::unique_ptr<ShellCommand> ShellCommand::executeDirect(
 
     argv[arguments.size() + 1] = nullptr;
 
-    return executeImpl(path.data(), argv.data(), false, terminate_in_destructor);
+    return executeImpl(path.data(), argv.data(), false, terminate_in_destructor_strategy);
 }
 
 
@@ -203,8 +270,11 @@ int ShellCommand::tryWait()
     LOG_TRACE(getLogger(), "Will wait for shell command pid {}", pid);
 
     int status = 0;
-    if (-1 == waitpid(pid, &status, 0))
-        throwFromErrno("Cannot waitpid", ErrorCodes::CANNOT_WAITPID);
+    while (waitpid(pid, &status, 0) < 0)
+    {
+        if (errno != EINTR)
+            throwFromErrno("Cannot waitpid", ErrorCodes::CANNOT_WAITPID);
+    }
 
     LOG_TRACE(getLogger(), "Wait for shell command pid {} completed with status {}", pid, status);
 
diff --git a/src/Common/ShellCommand.h b/src/Common/ShellCommand.h
index 1c681227efd..f1d808128ff 100644
--- a/src/Common/ShellCommand.h
+++ b/src/Common/ShellCommand.h
@@ -23,21 +23,38 @@ namespace DB
   * The second difference - allows to work simultaneously with stdin, and with stdout, and with stderr of running process,
   *  and also to obtain the return code and completion status.
   */
-class ShellCommand
+
+struct ShellCommandDestructorStrategy final
+{
+    explicit ShellCommandDestructorStrategy(bool terminate_in_destructor_, size_t wait_for_normal_exit_before_termination_seconds_ = 0)
+        : terminate_in_destructor(terminate_in_destructor_)
+        , wait_for_normal_exit_before_termination_seconds(wait_for_normal_exit_before_termination_seconds_)
+    {
+    }
+
+    bool terminate_in_destructor;
+
+    /// If terminate in destructor is true, command will wait until send SIGTERM signal to created process
+    size_t wait_for_normal_exit_before_termination_seconds = 0;
+};
+
+class ShellCommand final
 {
 private:
     pid_t pid;
     bool wait_called = false;
-    bool terminate_in_destructor;
+    ShellCommandDestructorStrategy destructor_strategy;
 
-    ShellCommand(pid_t pid_, int & in_fd_, int & out_fd_, int & err_fd_, bool terminate_in_destructor_);
+    ShellCommand(pid_t pid_, int & in_fd_, int & out_fd_, int & err_fd_, ShellCommandDestructorStrategy destructor_strategy_);
+
+    bool tryWaitProcessWithTimeout(size_t timeout_in_seconds);
 
     static Poco::Logger * getLogger();
 
     /// Print command name and the list of arguments to log. NOTE: No escaping of arguments is performed.
     static void logCommand(const char * filename, char * const argv[]);
 
-    static std::unique_ptr<ShellCommand> executeImpl(const char * filename, char * const argv[], bool pipe_stdin_only, bool terminate_in_destructor);
+    static std::unique_ptr<ShellCommand> executeImpl(const char * filename, char * const argv[], bool pipe_stdin_only, ShellCommandDestructorStrategy terminate_in_destructor_strategy);
 
 public:
     WriteBufferFromFile in;        /// If the command reads from stdin, do not forget to call in.close() after writing all the data there.
@@ -48,11 +65,11 @@ public:
 
     /// Run the command using /bin/sh -c.
     /// If terminate_in_destructor is true, send terminate signal in destructor and don't wait process.
-    static std::unique_ptr<ShellCommand> execute(const std::string & command, bool pipe_stdin_only = false, bool terminate_in_destructor = false);
+    static std::unique_ptr<ShellCommand> execute(const std::string & command, bool pipe_stdin_only = false, ShellCommandDestructorStrategy terminate_in_destructor_strategy = ShellCommandDestructorStrategy(false));
 
     /// Run the executable with the specified arguments. `arguments` - without argv[0].
     /// If terminate_in_destructor is true, send terminate signal in destructor and don't wait process.
-    static std::unique_ptr<ShellCommand> executeDirect(const std::string & path, const std::vector<std::string> & arguments, bool terminate_in_destructor = false);
+    static std::unique_ptr<ShellCommand> executeDirect(const std::string & path, const std::vector<std::string> & arguments, ShellCommandDestructorStrategy terminate_in_destructor_strategy = ShellCommandDestructorStrategy(false));
 
     /// Wait for the process to end, throw an exception if the code is not 0 or if the process was not completed by itself.
     void wait();
diff --git a/src/Common/StackTrace.cpp b/src/Common/StackTrace.cpp
index c4cf7f11e68..812f888b284 100644
--- a/src/Common/StackTrace.cpp
+++ b/src/Common/StackTrace.cpp
@@ -35,7 +35,7 @@ std::string signalToErrorMessage(int sig, const siginfo_t & info, const ucontext
             else
                 error << "Address: " << info.si_addr;
 
-#if defined(__x86_64__) && !defined(__FreeBSD__) && !defined(__APPLE__) && !defined(__arm__)
+#if defined(__x86_64__) && !defined(__FreeBSD__) && !defined(__APPLE__) && !defined(__arm__) && !defined(__powerpc__)
             auto err_mask = context.uc_mcontext.gregs[REG_ERR];
             if ((err_mask & 0x02))
                 error << " Access: write.";
@@ -184,8 +184,14 @@ static void * getCallerAddress(const ucontext_t & context)
 #    else
     return reinterpret_cast<void *>(context.uc_mcontext.gregs[REG_RIP]);
 #    endif
+
+#elif defined(__APPLE__) && defined(__aarch64__)
+    return reinterpret_cast<void *>(context.uc_mcontext->__ss.__pc);
+
 #elif defined(__aarch64__)
     return reinterpret_cast<void *>(context.uc_mcontext.pc);
+#elif defined(__powerpc64__)
+    return reinterpret_cast<void *>(context.uc_mcontext.gp_regs[PT_NIP]);
 #else
     return nullptr;
 #endif
diff --git a/src/Common/StackTrace.h b/src/Common/StackTrace.h
index 58660f9e4da..ef90a0d587d 100644
--- a/src/Common/StackTrace.h
+++ b/src/Common/StackTrace.h
@@ -11,7 +11,9 @@
 
 #ifdef __APPLE__
 // ucontext is not available without _XOPEN_SOURCE
-#   pragma clang diagnostic ignored "-Wreserved-id-macro"
+#   ifdef __clang__
+#       pragma clang diagnostic ignored "-Wreserved-id-macro"
+#   endif
 #   define _XOPEN_SOURCE 700
 #endif
 #include <ucontext.h>
@@ -37,8 +39,12 @@ public:
 
     static constexpr size_t capacity =
 #ifndef NDEBUG
-        /* The stacks are normally larger in debug version due to less inlining. */
-        64
+        /* The stacks are normally larger in debug version due to less inlining.
+         *
+         * NOTE: it cannot be larger then 56 right now, since otherwise it will
+         * not fit into minimal PIPE_BUF (512) in TraceCollector.
+         */
+        56
 #else
         32
 #endif
diff --git a/src/Common/SymbolIndex.cpp b/src/Common/SymbolIndex.cpp
index bd6c5d9eda0..a23184c9c0a 100644
--- a/src/Common/SymbolIndex.cpp
+++ b/src/Common/SymbolIndex.cpp
@@ -60,11 +60,11 @@ Otherwise you will get only exported symbols from program headers.
 #endif
 
 #define __msan_unpoison_string(X) // NOLINT
-#if defined(__has_feature)
-#   if __has_feature(memory_sanitizer)
-#       undef __msan_unpoison_string
-#       include <sanitizer/msan_interface.h>
-#   endif
+#if defined(ch_has_feature)
+#    if ch_has_feature(memory_sanitizer)
+#        undef __msan_unpoison_string
+#        include <sanitizer/msan_interface.h>
+#    endif
 #endif
 
 
diff --git a/src/Common/ThreadStatus.cpp b/src/Common/ThreadStatus.cpp
index 8c01ed2d46f..1493d30ea01 100644
--- a/src/Common/ThreadStatus.cpp
+++ b/src/Common/ThreadStatus.cpp
@@ -101,7 +101,8 @@ ThreadStatus::~ThreadStatus()
 
 #if !defined(ARCADIA_BUILD)
     /// It may cause segfault if query_context was destroyed, but was not detached
-    assert((!query_context && query_id.empty()) || (query_context && query_id == query_context->getCurrentQueryId()));
+    auto query_context_ptr = query_context.lock();
+    assert((!query_context_ptr && query_id.empty()) || (query_context_ptr && query_id == query_context_ptr->getCurrentQueryId()));
 #endif
 
     if (deleter)
diff --git a/src/Common/ThreadStatus.h b/src/Common/ThreadStatus.h
index dc5f09c5f3d..3b39e462fa6 100644
--- a/src/Common/ThreadStatus.h
+++ b/src/Common/ThreadStatus.h
@@ -1,20 +1,20 @@
 #pragma once
 
-#include <common/StringRef.h>
-#include <Common/ProfileEvents.h>
+#include <Core/SettingsEnums.h>
+#include <Interpreters/Context_fwd.h>
+#include <IO/Progress.h>
 #include <Common/MemoryTracker.h>
 #include <Common/OpenTelemetryTraceContext.h>
+#include <Common/ProfileEvents.h>
+#include <common/StringRef.h>
 
-#include <Core/SettingsEnums.h>
+#include <boost/noncopyable.hpp>
 
-#include <IO/Progress.h>
-
-#include <memory>
+#include <functional>
 #include <map>
+#include <memory>
 #include <mutex>
 #include <shared_mutex>
-#include <functional>
-#include <boost/noncopyable.hpp>
 
 
 namespace Poco
@@ -26,7 +26,6 @@ namespace Poco
 namespace DB
 {
 
-class Context;
 class QueryStatus;
 class ThreadStatus;
 class QueryProfilerReal;
@@ -58,8 +57,8 @@ public:
     ProfileEvents::Counters performance_counters{VariableContext::Process};
     MemoryTracker memory_tracker{VariableContext::Process};
 
-    Context * query_context = nullptr;
-    Context * global_context = nullptr;
+    ContextWeakPtr query_context;
+    ContextWeakPtr global_context;
 
     InternalTextLogsQueueWeakPtr logs_queue_ptr;
     std::function<void()> fatal_error_callback;
@@ -122,9 +121,9 @@ protected:
     std::atomic<int> thread_state{ThreadState::DetachedFromQuery};
 
     /// Is set once
-    Context * global_context = nullptr;
+    ContextWeakPtr global_context;
     /// Use it only from current thread
-    Context * query_context = nullptr;
+    ContextWeakPtr query_context;
 
     String query_id;
 
@@ -178,9 +177,9 @@ public:
         return query_id;
     }
 
-    const Context * getQueryContext() const
+    auto getQueryContext() const
     {
-        return query_context;
+        return query_context.lock();
     }
 
     /// Starts new query and create new thread group for it, current thread becomes master thread of the query
@@ -203,7 +202,7 @@ public:
 
     /// Sets query context for current master thread and its thread group
     /// NOTE: query_context have to be alive until detachQuery() is called
-    void attachQueryContext(Context & query_context);
+    void attachQueryContext(ContextPtr query_context);
 
     /// Update several ProfileEvents counters
     void updatePerformanceCounters();
diff --git a/src/Common/TimerDescriptor.cpp b/src/Common/TimerDescriptor.cpp
index f4c3ec35588..791e6380a89 100644
--- a/src/Common/TimerDescriptor.cpp
+++ b/src/Common/TimerDescriptor.cpp
@@ -27,10 +27,16 @@ TimerDescriptor::TimerDescriptor(int clockid, int flags)
         throwFromErrno("Cannot set O_NONBLOCK for timer_fd", ErrorCodes::CANNOT_FCNTL);
 }
 
+TimerDescriptor::TimerDescriptor(TimerDescriptor && other) : timer_fd(other.timer_fd)
+{
+    other.timer_fd = -1;
+}
+
 TimerDescriptor::~TimerDescriptor()
 {
     /// Do not check for result cause cannot throw exception.
-    close(timer_fd);
+    if (timer_fd != -1)
+        close(timer_fd);
 }
 
 void TimerDescriptor::reset() const
@@ -74,7 +80,7 @@ void TimerDescriptor::setRelative(const Poco::Timespan & timespan) const
     spec.it_interval.tv_nsec = 0;
     spec.it_interval.tv_sec = 0;
     spec.it_value.tv_sec = timespan.totalSeconds();
-    spec.it_value.tv_nsec = timespan.useconds();
+    spec.it_value.tv_nsec = timespan.useconds() * 1000;
 
     if (-1 == timerfd_settime(timer_fd, 0 /*relative timer */, &spec, nullptr))
         throwFromErrno("Cannot set time for timer_fd", ErrorCodes::CANNOT_SET_TIMER_PERIOD);
diff --git a/src/Common/TimerDescriptor.h b/src/Common/TimerDescriptor.h
index ddb8f2a1367..42f8eb386af 100644
--- a/src/Common/TimerDescriptor.h
+++ b/src/Common/TimerDescriptor.h
@@ -12,12 +12,12 @@ private:
     int timer_fd;
 
 public:
-    explicit TimerDescriptor(int clockid, int flags);
+    explicit TimerDescriptor(int clockid = CLOCK_MONOTONIC, int flags = 0);
     ~TimerDescriptor();
 
     TimerDescriptor(const TimerDescriptor &) = delete;
     TimerDescriptor & operator=(const TimerDescriptor &) = delete;
-    TimerDescriptor(TimerDescriptor &&) = default;
+    TimerDescriptor(TimerDescriptor && other);
     TimerDescriptor & operator=(TimerDescriptor &&) = default;
 
     int getDescriptor() const { return timer_fd; }
diff --git a/src/Common/TraceCollector.cpp b/src/Common/TraceCollector.cpp
index cbac9cd1a19..ab1845ebbd2 100644
--- a/src/Common/TraceCollector.cpp
+++ b/src/Common/TraceCollector.cpp
@@ -22,7 +22,9 @@ namespace
 {
     /// Normally query_id is a UUID (string with a fixed length) but user can provide custom query_id.
     /// Thus upper bound on query_id length should be introduced to avoid buffer overflow in signal handler.
-    constexpr size_t QUERY_ID_MAX_LEN = 1024;
+    ///
+    /// And it cannot be large, since otherwise it will not fit into PIPE_BUF.
+    constexpr size_t QUERY_ID_MAX_LEN = sizeof("00000000-0000-0000-0000-000000000000") - 1; // 36
 }
 
 LazyPipeFDs pipe;
@@ -60,10 +62,14 @@ void TraceCollector::collect(TraceType trace_type, const StackTrace & stack_trac
         8 * sizeof(char) +                     // maximum VarUInt length for string size
         QUERY_ID_MAX_LEN * sizeof(char) +      // maximum query_id length
         sizeof(UInt8) +                        // number of stack frames
-        sizeof(StackTrace::Frames) +           // collected stack trace, maximum capacity
+        sizeof(StackTrace::FramePointers) +    // collected stack trace, maximum capacity
         sizeof(TraceType) +                    // trace type
         sizeof(UInt64) +                       // thread_id
         sizeof(Int64);                         // size
+    /// Write should be atomic to avoid overlaps
+    /// (since recursive collect() is possible)
+    static_assert(buf_size < PIPE_BUF, "Only write of PIPE_BUF to pipe is atomic");
+
     char buffer[buf_size];
     WriteBufferFromFileDescriptorDiscardOnFailure out(pipe.fds_rw[1], buf_size, buffer);
 
diff --git a/src/Common/UInt128.h b/src/Common/UInt128.h
index 06fddee8dc9..be96f409673 100644
--- a/src/Common/UInt128.h
+++ b/src/Common/UInt128.h
@@ -19,7 +19,7 @@ namespace DB
 struct UInt128
 {
 /// Suppress gcc7 warnings: 'prev_key.DB::UInt128::low' may be used uninitialized in this function
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
 #endif
@@ -92,7 +92,7 @@ struct UInt128
             return static_cast<T>(low);
     }
 
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic pop
 #endif
 
@@ -150,7 +150,7 @@ struct DummyUInt256
 {
 
 /// Suppress gcc7 warnings: 'prev_key.DB::UInt256::a' may be used uninitialized in this function
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
 #endif
@@ -179,7 +179,7 @@ struct DummyUInt256
     bool operator== (const UInt64 rhs) const { return a == rhs && b == 0 && c == 0 && d == 0; }
     bool operator!= (const UInt64 rhs) const { return !operator==(rhs); }
 
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic pop
 #endif
 
diff --git a/src/Common/XDBCBridgeHelper.h b/src/Common/XDBCBridgeHelper.h
deleted file mode 100644
index 8da735c6fe3..00000000000
--- a/src/Common/XDBCBridgeHelper.h
+++ /dev/null
@@ -1,351 +0,0 @@
-#pragma once
-
-#include <IO/ReadHelpers.h>
-#include <IO/ReadWriteBufferFromHTTP.h>
-#include <Interpreters/Context.h>
-#include <Access/AccessType.h>
-#include <Parsers/IdentifierQuotingStyle.h>
-#include <Poco/File.h>
-#include <Poco/Logger.h>
-#include <Poco/Net/HTTPRequest.h>
-#include <Poco/Path.h>
-#include <Poco/URI.h>
-#include <Poco/Util/AbstractConfiguration.h>
-#include <Common/ShellCommand.h>
-#include <IO/ConnectionTimeoutsContext.h>
-#include <common/logger_useful.h>
-#include <ext/range.h>
-
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config.h>
-#endif
-
-namespace DB
-{
-namespace ErrorCodes
-{
-    extern const int EXTERNAL_SERVER_IS_NOT_RESPONDING;
-    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
-}
-
-/**
- * Class for Helpers for Xdbc-bridges, provide utility methods, not main request
- */
-class IXDBCBridgeHelper
-{
-public:
-    static constexpr inline auto DEFAULT_FORMAT = "RowBinary";
-
-    virtual std::vector<std::pair<std::string, std::string>> getURLParams(const std::string & cols, UInt64 max_block_size) const = 0;
-    virtual void startBridgeSync() const = 0;
-    virtual Poco::URI getMainURI() const = 0;
-    virtual Poco::URI getColumnsInfoURI() const = 0;
-    virtual IdentifierQuotingStyle getIdentifierQuotingStyle() = 0;
-    virtual bool isSchemaAllowed() = 0;
-    virtual String getName() const = 0;
-
-    virtual ~IXDBCBridgeHelper() = default;
-};
-
-using BridgeHelperPtr = std::shared_ptr<IXDBCBridgeHelper>;
-
-template <typename BridgeHelperMixin>
-class XDBCBridgeHelper : public IXDBCBridgeHelper
-{
-private:
-    Poco::Timespan http_timeout;
-
-    std::string connection_string;
-
-    Poco::URI ping_url;
-
-    Poco::Logger * log = &Poco::Logger::get(BridgeHelperMixin::getName() + "BridgeHelper");
-
-    std::optional<IdentifierQuotingStyle> quote_style;
-    std::optional<bool> is_schema_allowed;
-
-protected:
-    auto getConnectionString() const
-    {
-        return connection_string;
-    }
-
-public:
-    using Configuration = Poco::Util::AbstractConfiguration;
-
-    const Context & context;
-    const Configuration & config;
-
-    static constexpr inline auto DEFAULT_HOST = "127.0.0.1";
-    static constexpr inline auto DEFAULT_PORT = BridgeHelperMixin::DEFAULT_PORT;
-    static constexpr inline auto PING_HANDLER = "/ping";
-    static constexpr inline auto MAIN_HANDLER = "/";
-    static constexpr inline auto COL_INFO_HANDLER = "/columns_info";
-    static constexpr inline auto IDENTIFIER_QUOTE_HANDLER = "/identifier_quote";
-    static constexpr inline auto SCHEMA_ALLOWED_HANDLER = "/schema_allowed";
-    static constexpr inline auto PING_OK_ANSWER = "Ok.";
-
-    XDBCBridgeHelper(const Context & global_context_, const Poco::Timespan & http_timeout_, const std::string & connection_string_)
-        : http_timeout(http_timeout_), connection_string(connection_string_), context(global_context_), config(context.getConfigRef())
-    {
-        size_t bridge_port = config.getUInt(BridgeHelperMixin::configPrefix() + ".port", DEFAULT_PORT);
-        std::string bridge_host = config.getString(BridgeHelperMixin::configPrefix() + ".host", DEFAULT_HOST);
-
-        ping_url.setHost(bridge_host);
-        ping_url.setPort(bridge_port);
-        ping_url.setScheme("http");
-        ping_url.setPath(PING_HANDLER);
-    }
-
-    String getName() const override
-    {
-        return BridgeHelperMixin::getName();
-    }
-
-    IdentifierQuotingStyle getIdentifierQuotingStyle() override
-    {
-        if (!quote_style.has_value())
-        {
-            startBridgeSync();
-
-            auto uri = createBaseURI();
-            uri.setPath(IDENTIFIER_QUOTE_HANDLER);
-            uri.addQueryParameter("connection_string", getConnectionString());
-
-            ReadWriteBufferFromHTTP buf(
-                uri, Poco::Net::HTTPRequest::HTTP_POST, {}, ConnectionTimeouts::getHTTPTimeouts(context));
-            std::string character;
-            readStringBinary(character, buf);
-            if (character.length() > 1)
-                throw Exception("Failed to parse quoting style from '" + character + "' for service " + BridgeHelperMixin::serviceAlias(), ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
-            else if (character.length() == 0)
-                quote_style = IdentifierQuotingStyle::None;
-            else if (character[0] == '`')
-                quote_style = IdentifierQuotingStyle::Backticks;
-            else if (character[0] == '"')
-                quote_style = IdentifierQuotingStyle::DoubleQuotes;
-            else
-                throw Exception("Can not map quote identifier '" + character + "' to enum value", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
-        }
-
-        return *quote_style;
-    }
-
-    bool isSchemaAllowed() override
-    {
-        if (!is_schema_allowed.has_value())
-        {
-            startBridgeSync();
-
-            auto uri = createBaseURI();
-            uri.setPath(SCHEMA_ALLOWED_HANDLER);
-            uri.addQueryParameter("connection_string", getConnectionString());
-
-            ReadWriteBufferFromHTTP buf(
-                uri, Poco::Net::HTTPRequest::HTTP_POST, {}, ConnectionTimeouts::getHTTPTimeouts(context));
-
-            bool res;
-            readBoolText(res, buf);
-            is_schema_allowed = res;
-        }
-
-        return *is_schema_allowed;
-    }
-
-    /**
-     * @todo leaky abstraction - used by external API's
-     */
-    std::vector<std::pair<std::string, std::string>> getURLParams(const std::string & cols, UInt64 max_block_size) const override
-    {
-        std::vector<std::pair<std::string, std::string>> result;
-
-        result.emplace_back("connection_string", connection_string); /// already validated
-        result.emplace_back("columns", cols);
-        result.emplace_back("max_block_size", std::to_string(max_block_size));
-
-        return result;
-    }
-
-    /**
-     * Performs spawn of external daemon
-     */
-    void startBridgeSync() const override
-    {
-        if (!checkBridgeIsRunning())
-        {
-            LOG_TRACE(log, "{} is not running, will try to start it", BridgeHelperMixin::serviceAlias());
-            startBridge();
-            bool started = false;
-
-            uint64_t milliseconds_to_wait = 10; /// Exponential backoff
-            uint64_t counter = 0;
-            while (milliseconds_to_wait < 10000)
-            {
-                ++counter;
-                LOG_TRACE(log, "Checking {} is running, try {}", BridgeHelperMixin::serviceAlias(), counter);
-                if (checkBridgeIsRunning())
-                {
-                    started = true;
-                    break;
-                }
-                std::this_thread::sleep_for(std::chrono::milliseconds(milliseconds_to_wait));
-                milliseconds_to_wait *= 2;
-            }
-
-            if (!started)
-                throw Exception(BridgeHelperMixin::getName() + "BridgeHelper: " + BridgeHelperMixin::serviceAlias() + " is not responding",
-                    ErrorCodes::EXTERNAL_SERVER_IS_NOT_RESPONDING);
-        }
-    }
-
-    /**
-     * URI to fetch the data from external service
-     */
-    Poco::URI getMainURI() const override
-    {
-        auto uri = createBaseURI();
-        uri.setPath(MAIN_HANDLER);
-        return uri;
-    }
-
-    /**
-     * URI to retrieve column description from external service
-     */
-    Poco::URI getColumnsInfoURI() const override
-    {
-        auto uri = createBaseURI();
-        uri.setPath(COL_INFO_HANDLER);
-        return uri;
-    }
-
-protected:
-    Poco::URI createBaseURI() const
-    {
-        Poco::URI uri;
-        uri.setHost(ping_url.getHost());
-        uri.setPort(ping_url.getPort());
-        uri.setScheme("http");
-        return uri;
-    }
-
-private:
-    bool checkBridgeIsRunning() const
-    {
-        try
-        {
-            ReadWriteBufferFromHTTP buf(
-                ping_url, Poco::Net::HTTPRequest::HTTP_GET, {}, ConnectionTimeouts::getHTTPTimeouts(context));
-            return checkString(XDBCBridgeHelper::PING_OK_ANSWER, buf);
-        }
-        catch (...)
-        {
-            return false;
-        }
-    }
-
-    /* Contains logic for instantiation of the bridge instance */
-    void startBridge() const
-    {
-        auto cmd = BridgeHelperMixin::startBridge(config, log, http_timeout);
-        context.addXDBCBridgeCommand(std::move(cmd));
-    }
-};
-
-struct JDBCBridgeMixin
-{
-    static constexpr inline auto DEFAULT_PORT = 9019;
-    static const String configPrefix()
-    {
-        return "jdbc_bridge";
-    }
-    static const String serviceAlias()
-    {
-        return "clickhouse-jdbc-bridge";
-    }
-    static const String getName()
-    {
-        return "JDBC";
-    }
-    static AccessType getSourceAccessType()
-    {
-        return AccessType::JDBC;
-    }
-
-    static std::unique_ptr<ShellCommand> startBridge(const Poco::Util::AbstractConfiguration &, const Poco::Logger *, const Poco::Timespan &)
-    {
-        throw Exception("jdbc-bridge is not running. Please, start it manually", ErrorCodes::EXTERNAL_SERVER_IS_NOT_RESPONDING);
-    }
-};
-
-struct ODBCBridgeMixin
-{
-    static constexpr inline auto DEFAULT_PORT = 9018;
-
-    static const String configPrefix()
-    {
-        return "odbc_bridge";
-    }
-    static const String serviceAlias()
-    {
-        return "clickhouse-odbc-bridge";
-    }
-    static const String getName()
-    {
-        return "ODBC";
-    }
-    static AccessType getSourceAccessType()
-    {
-        return AccessType::ODBC;
-    }
-
-    static std::unique_ptr<ShellCommand> startBridge(
-        const Poco::Util::AbstractConfiguration & config, Poco::Logger * log, const Poco::Timespan & http_timeout)
-    {
-        /// Path to executable folder
-        Poco::Path path{config.getString("application.dir", "/usr/bin")};
-
-        std::vector<std::string> cmd_args;
-        path.setFileName("clickhouse-odbc-bridge");
-
-#if !CLICKHOUSE_SPLIT_BINARY
-        cmd_args.push_back("odbc-bridge");
-#endif
-
-        cmd_args.push_back("--http-port");
-        cmd_args.push_back(std::to_string(config.getUInt(configPrefix() + ".port", DEFAULT_PORT)));
-        cmd_args.push_back("--listen-host");
-        cmd_args.push_back(config.getString(configPrefix() + ".listen_host", XDBCBridgeHelper<ODBCBridgeMixin>::DEFAULT_HOST));
-        cmd_args.push_back("--http-timeout");
-        cmd_args.push_back(std::to_string(http_timeout.totalMicroseconds()));
-        if (config.has("logger." + configPrefix() + "_log"))
-        {
-            cmd_args.push_back("--log-path");
-            cmd_args.push_back(config.getString("logger." + configPrefix() + "_log"));
-        }
-        if (config.has("logger." + configPrefix() + "_errlog"))
-        {
-            cmd_args.push_back("--err-log-path");
-            cmd_args.push_back(config.getString("logger." + configPrefix() + "_errlog"));
-        }
-        if (config.has("logger." + configPrefix() + "_stdout"))
-        {
-            cmd_args.push_back("--stdout-path");
-            cmd_args.push_back(config.getString("logger." + configPrefix() + "_stdout"));
-        }
-        if (config.has("logger." + configPrefix() + "_stderr"))
-        {
-            cmd_args.push_back("--stderr-path");
-            cmd_args.push_back(config.getString("logger." + configPrefix() + "_stderr"));
-        }
-        if (config.has("logger." + configPrefix() + "_level"))
-        {
-            cmd_args.push_back("--log-level");
-            cmd_args.push_back(config.getString("logger." + configPrefix() + "_level"));
-        }
-
-        LOG_TRACE(log, "Starting {}", serviceAlias());
-
-        return ShellCommand::executeDirect(path.toString(), cmd_args, true);
-    }
-};
-}
diff --git a/src/Common/ZooKeeper/IKeeper.h b/src/Common/ZooKeeper/IKeeper.h
index c53ea60ec7c..2d947bb402c 100644
--- a/src/Common/ZooKeeper/IKeeper.h
+++ b/src/Common/ZooKeeper/IKeeper.h
@@ -116,6 +116,7 @@ struct Request
     virtual ~Request() = default;
     virtual String getPath() const = 0;
     virtual void addRootPath(const String & /* root_path */) {}
+    virtual size_t bytesSize() const { return 0; }
 };
 
 struct Response;
@@ -131,6 +132,7 @@ struct Response
     Response & operator=(const Response &) = default;
     virtual ~Response() = default;
     virtual void removeRootPath(const String & /* root_path */) {}
+    virtual size_t bytesSize() const { return 0; }
 };
 
 struct WatchResponse : virtual Response
@@ -140,6 +142,8 @@ struct WatchResponse : virtual Response
     String path;
 
     void removeRootPath(const String & root_path) override;
+
+    size_t bytesSize() const override { return path.size() + sizeof(type) + sizeof(state); }
 };
 
 using WatchCallback = std::function<void(const WatchResponse &)>;
@@ -154,6 +158,9 @@ struct CreateRequest : virtual Request
 
     void addRootPath(const String & root_path) override;
     String getPath() const override { return path; }
+
+    size_t bytesSize() const override { return path.size() + data.size()
+            + sizeof(is_ephemeral) + sizeof(is_sequential) + acls.size() * sizeof(ACL); }
 };
 
 struct CreateResponse : virtual Response
@@ -161,6 +168,8 @@ struct CreateResponse : virtual Response
     String path_created;
 
     void removeRootPath(const String & root_path) override;
+
+    size_t bytesSize() const override { return path_created.size(); }
 };
 
 struct RemoveRequest : virtual Request
@@ -170,6 +179,8 @@ struct RemoveRequest : virtual Request
 
     void addRootPath(const String & root_path) override;
     String getPath() const override { return path; }
+
+    size_t bytesSize() const override { return path.size() + sizeof(version); }
 };
 
 struct RemoveResponse : virtual Response
@@ -182,11 +193,15 @@ struct ExistsRequest : virtual Request
 
     void addRootPath(const String & root_path) override;
     String getPath() const override { return path; }
+
+    size_t bytesSize() const override { return path.size(); }
 };
 
 struct ExistsResponse : virtual Response
 {
     Stat stat;
+
+    size_t bytesSize() const override { return sizeof(Stat); }
 };
 
 struct GetRequest : virtual Request
@@ -195,12 +210,16 @@ struct GetRequest : virtual Request
 
     void addRootPath(const String & root_path) override;
     String getPath() const override { return path; }
+
+    size_t bytesSize() const override { return path.size(); }
 };
 
 struct GetResponse : virtual Response
 {
     String data;
     Stat stat;
+
+    size_t bytesSize() const override { return data.size() + sizeof(stat); }
 };
 
 struct SetRequest : virtual Request
@@ -211,11 +230,15 @@ struct SetRequest : virtual Request
 
     void addRootPath(const String & root_path) override;
     String getPath() const override { return path; }
+
+    size_t bytesSize() const override { return data.size() + data.size() + sizeof(version); }
 };
 
 struct SetResponse : virtual Response
 {
     Stat stat;
+
+    size_t bytesSize() const override { return sizeof(stat); }
 };
 
 struct ListRequest : virtual Request
@@ -224,12 +247,22 @@ struct ListRequest : virtual Request
 
     void addRootPath(const String & root_path) override;
     String getPath() const override { return path; }
+
+    size_t bytesSize() const override { return path.size(); }
 };
 
 struct ListResponse : virtual Response
 {
     std::vector<String> names;
     Stat stat;
+
+    size_t bytesSize() const override
+    {
+        size_t size = sizeof(stat);
+        for (const auto & name : names)
+            size += name.size();
+        return size;
+    }
 };
 
 struct CheckRequest : virtual Request
@@ -239,6 +272,8 @@ struct CheckRequest : virtual Request
 
     void addRootPath(const String & root_path) override;
     String getPath() const override { return path; }
+
+    size_t bytesSize() const override { return path.size() + sizeof(version); }
 };
 
 struct CheckResponse : virtual Response
@@ -251,6 +286,14 @@ struct MultiRequest : virtual Request
 
     void addRootPath(const String & root_path) override;
     String getPath() const override { return {}; }
+
+    size_t bytesSize() const override
+    {
+        size_t size = 0;
+        for (const auto & request : requests)
+            size += request->bytesSize();
+        return size;
+    }
 };
 
 struct MultiResponse : virtual Response
@@ -258,6 +301,14 @@ struct MultiResponse : virtual Response
     Responses responses;
 
     void removeRootPath(const String & root_path) override;
+
+    size_t bytesSize() const override
+    {
+        size_t size = 0;
+        for (const auto & response : responses)
+            size += response->bytesSize();
+        return size;
+    }
 };
 
 /// This response may be received only as an element of responses in MultiResponse.
@@ -391,6 +442,9 @@ public:
     virtual void multi(
         const Requests & requests,
         MultiCallback callback) = 0;
+
+    /// Expire session and finish all pending requests
+    virtual void finalize() = 0;
 };
 
 }
diff --git a/src/Common/ZooKeeper/TestKeeper.cpp b/src/Common/ZooKeeper/TestKeeper.cpp
index 5951164f58f..36c875fe325 100644
--- a/src/Common/ZooKeeper/TestKeeper.cpp
+++ b/src/Common/ZooKeeper/TestKeeper.cpp
@@ -421,26 +421,38 @@ std::pair<ResponsePtr, Undo> TestKeeperMultiRequest::process(TestKeeper::Contain
 
     try
     {
-        for (const auto & request : requests)
+        auto request_it = requests.begin();
+        response.error = Error::ZOK;
+        while (request_it != requests.end())
         {
-            const TestKeeperRequest & concrete_request = dynamic_cast<const TestKeeperRequest &>(*request);
+            const TestKeeperRequest & concrete_request = dynamic_cast<const TestKeeperRequest &>(**request_it);
+            ++request_it;
             auto [ cur_response, undo_action ] = concrete_request.process(container, zxid);
             response.responses.emplace_back(cur_response);
             if (cur_response->error != Error::ZOK)
             {
                 response.error = cur_response->error;
-
-                for (auto it = undo_actions.rbegin(); it != undo_actions.rend(); ++it)
-                    if (*it)
-                        (*it)();
-
-                return { std::make_shared<MultiResponse>(response), {} };
+                break;
+            }
+
+            undo_actions.emplace_back(std::move(undo_action));
+        }
+
+        if (response.error != Error::ZOK)
+        {
+            for (auto it = undo_actions.rbegin(); it != undo_actions.rend(); ++it)
+                if (*it)
+                    (*it)();
+
+            while (request_it != requests.end())
+            {
+                const TestKeeperRequest & concrete_request = dynamic_cast<const TestKeeperRequest &>(**request_it);
+                ++request_it;
+                response.responses.emplace_back(concrete_request.createResponse());
+                response.responses.back()->error = Error::ZRUNTIMEINCONSISTENCY;
             }
-            else
-                undo_actions.emplace_back(std::move(undo_action));
         }
 
-        response.error = Error::ZOK;
         return { std::make_shared<MultiResponse>(response), {} };
     }
     catch (...)
diff --git a/src/Common/ZooKeeper/TestKeeper.h b/src/Common/ZooKeeper/TestKeeper.h
index ca9f584304f..b46f98c0074 100644
--- a/src/Common/ZooKeeper/TestKeeper.h
+++ b/src/Common/ZooKeeper/TestKeeper.h
@@ -30,7 +30,7 @@ using TestKeeperRequestPtr = std::shared_ptr<TestKeeperRequest>;
   *
   * NOTE: You can add various failure modes for better testing.
   */
-class TestKeeper : public IKeeper
+class TestKeeper final : public IKeeper
 {
 public:
     TestKeeper(const String & root_path_, Poco::Timespan operation_timeout_);
@@ -83,6 +83,7 @@ public:
             const Requests & requests,
             MultiCallback callback) override;
 
+    void finalize() override;
 
     struct Node
     {
@@ -130,7 +131,6 @@ private:
 
     void pushRequest(RequestInfo && request);
 
-    void finalize();
 
     ThreadFromGlobalPool processing_thread;
 
diff --git a/src/Common/ZooKeeper/ZooKeeper.cpp b/src/Common/ZooKeeper/ZooKeeper.cpp
index a1c6eb9b481..9f59da233fc 100644
--- a/src/Common/ZooKeeper/ZooKeeper.cpp
+++ b/src/Common/ZooKeeper/ZooKeeper.cpp
@@ -44,7 +44,7 @@ static void check(Coordination::Error code, const std::string & path)
 }
 
 
-void ZooKeeper::init(const std::string & implementation_, const std::string & hosts_, const std::string & identity_,
+void ZooKeeper::init(const std::string & implementation_, const Strings & hosts_, const std::string & identity_,
                      int32_t session_timeout_ms_, int32_t operation_timeout_ms_, const std::string & chroot_)
 {
     log = &Poco::Logger::get("ZooKeeper");
@@ -60,13 +60,16 @@ void ZooKeeper::init(const std::string & implementation_, const std::string & ho
         if (hosts.empty())
             throw KeeperException("No hosts passed to ZooKeeper constructor.", Coordination::Error::ZBADARGUMENTS);
 
-        std::vector<std::string> hosts_strings;
-        splitInto<','>(hosts_strings, hosts);
         Coordination::ZooKeeper::Nodes nodes;
-        nodes.reserve(hosts_strings.size());
+        nodes.reserve(hosts.size());
+
+        Strings shuffled_hosts = hosts;
+        /// Shuffle the hosts to distribute the load among ZooKeeper nodes.
+        pcg64 generator(randomSeed());
+        std::shuffle(shuffled_hosts.begin(), shuffled_hosts.end(), generator);
 
         bool dns_error = false;
-        for (auto & host_string : hosts_strings)
+        for (auto & host_string : shuffled_hosts)
         {
             try
             {
@@ -109,9 +112,9 @@ void ZooKeeper::init(const std::string & implementation_, const std::string & ho
                 Poco::Timespan(0, operation_timeout_ms_ * 1000));
 
         if (chroot.empty())
-            LOG_TRACE(log, "Initialized, hosts: {}", hosts);
+            LOG_TRACE(log, "Initialized, hosts: {}", fmt::join(hosts, ","));
         else
-            LOG_TRACE(log, "Initialized, hosts: {}, chroot: {}", hosts, chroot);
+            LOG_TRACE(log, "Initialized, hosts: {}, chroot: {}", fmt::join(hosts, ","), chroot);
     }
     else if (implementation == "testkeeper")
     {
@@ -128,7 +131,16 @@ void ZooKeeper::init(const std::string & implementation_, const std::string & ho
         throw KeeperException("Zookeeper root doesn't exist. You should create root node " + chroot + " before start.", Coordination::Error::ZNONODE);
 }
 
-ZooKeeper::ZooKeeper(const std::string & hosts_, const std::string & identity_, int32_t session_timeout_ms_,
+ZooKeeper::ZooKeeper(const std::string & hosts_string, const std::string & identity_, int32_t session_timeout_ms_,
+                     int32_t operation_timeout_ms_, const std::string & chroot_, const std::string & implementation_)
+{
+    Strings hosts_strings;
+    splitInto<','>(hosts_strings, hosts_string);
+
+    init(implementation_, hosts_strings, identity_, session_timeout_ms_, operation_timeout_ms_, chroot_);
+}
+
+ZooKeeper::ZooKeeper(const Strings & hosts_, const std::string & identity_, int32_t session_timeout_ms_,
                      int32_t operation_timeout_ms_, const std::string & chroot_, const std::string & implementation_)
 {
     init(implementation_, hosts_, identity_, session_timeout_ms_, operation_timeout_ms_, chroot_);
@@ -141,8 +153,6 @@ struct ZooKeeperArgs
         Poco::Util::AbstractConfiguration::Keys keys;
         config.keys(config_name, keys);
 
-        std::vector<std::string> hosts_strings;
-
         session_timeout_ms = Coordination::DEFAULT_SESSION_TIMEOUT_MS;
         operation_timeout_ms = Coordination::DEFAULT_OPERATION_TIMEOUT_MS;
         implementation = "zookeeper";
@@ -150,7 +160,7 @@ struct ZooKeeperArgs
         {
             if (startsWith(key, "node"))
             {
-                hosts_strings.push_back(
+                hosts.push_back(
                         (config.getBool(config_name + "." + key + ".secure", false) ? "secure://" : "") +
                         config.getString(config_name + "." + key + ".host") + ":"
                         + config.getString(config_name + "." + key + ".port", "2181")
@@ -180,17 +190,6 @@ struct ZooKeeperArgs
                 throw KeeperException(std::string("Unknown key ") + key + " in config file", Coordination::Error::ZBADARGUMENTS);
         }
 
-        /// Shuffle the hosts to distribute the load among ZooKeeper nodes.
-        pcg64 generator(randomSeed());
-        std::shuffle(hosts_strings.begin(), hosts_strings.end(), generator);
-
-        for (auto & host : hosts_strings)
-        {
-            if (!hosts.empty())
-                hosts += ',';
-            hosts += host;
-        }
-
         if (!chroot.empty())
         {
             if (chroot.front() != '/')
@@ -200,7 +199,7 @@ struct ZooKeeperArgs
         }
     }
 
-    std::string hosts;
+    Strings hosts;
     std::string identity;
     int session_timeout_ms;
     int operation_timeout_ms;
@@ -244,6 +243,7 @@ Coordination::Error ZooKeeper::getChildrenImpl(const std::string & path, Strings
 
     auto callback = [&](const Coordination::ListResponse & response)
     {
+        SCOPE_EXIT(event.set());
         code = response.error;
         if (code == Coordination::Error::ZOK)
         {
@@ -251,7 +251,6 @@ Coordination::Error ZooKeeper::getChildrenImpl(const std::string & path, Strings
             if (stat)
                 *stat = response.stat;
         }
-        event.set();
     };
 
     impl->list(path, callback, watch_callback);
@@ -304,10 +303,10 @@ Coordination::Error ZooKeeper::createImpl(const std::string & path, const std::s
 
     auto callback = [&](const Coordination::CreateResponse & response)
     {
+        SCOPE_EXIT(event.set());
         code = response.error;
         if (code == Coordination::Error::ZOK)
             path_created = response.path_created;
-        event.set();
     };
 
     impl->create(path, data, mode & 1, mode & 2, {}, callback);  /// TODO better mode
@@ -372,9 +371,9 @@ Coordination::Error ZooKeeper::removeImpl(const std::string & path, int32_t vers
 
     auto callback = [&](const Coordination::RemoveResponse & response)
     {
+        SCOPE_EXIT(event.set());
         if (response.error != Coordination::Error::ZOK)
             code = response.error;
-        event.set();
     };
 
     impl->remove(path, version, callback);
@@ -405,10 +404,10 @@ Coordination::Error ZooKeeper::existsImpl(const std::string & path, Coordination
 
     auto callback = [&](const Coordination::ExistsResponse & response)
     {
+        SCOPE_EXIT(event.set());
         code = response.error;
         if (code == Coordination::Error::ZOK && stat)
             *stat = response.stat;
-        event.set();
     };
 
     impl->exists(path, callback, watch_callback);
@@ -437,6 +436,7 @@ Coordination::Error ZooKeeper::getImpl(const std::string & path, std::string & r
 
     auto callback = [&](const Coordination::GetResponse & response)
     {
+        SCOPE_EXIT(event.set());
         code = response.error;
         if (code == Coordination::Error::ZOK)
         {
@@ -444,7 +444,6 @@ Coordination::Error ZooKeeper::getImpl(const std::string & path, std::string & r
             if (stat)
                 *stat = response.stat;
         }
-        event.set();
     };
 
     impl->get(path, callback, watch_callback);
@@ -509,10 +508,10 @@ Coordination::Error ZooKeeper::setImpl(const std::string & path, const std::stri
 
     auto callback = [&](const Coordination::SetResponse & response)
     {
+        SCOPE_EXIT(event.set());
         code = response.error;
         if (code == Coordination::Error::ZOK && stat)
             *stat = response.stat;
-        event.set();
     };
 
     impl->set(path, data, version, callback);
@@ -559,9 +558,9 @@ Coordination::Error ZooKeeper::multiImpl(const Coordination::Requests & requests
 
     auto callback = [&](const Coordination::MultiResponse & response)
     {
+        SCOPE_EXIT(event.set());
         code = response.error;
         responses = response.responses;
-        event.set();
     };
 
     impl->multi(requests, callback);
@@ -922,6 +921,10 @@ Coordination::Error ZooKeeper::tryMultiNoThrow(const Coordination::Requests & re
     }
 }
 
+void ZooKeeper::finalize()
+{
+    impl->finalize();
+}
 
 size_t KeeperMultiException::getFailedOpIndex(Coordination::Error exception_code, const Coordination::Responses & responses)
 {
@@ -1000,4 +1003,5 @@ Coordination::RequestPtr makeCheckRequest(const std::string & path, int version)
     request->version = version;
     return request;
 }
+
 }
diff --git a/src/Common/ZooKeeper/ZooKeeper.h b/src/Common/ZooKeeper/ZooKeeper.h
index 5b37e4d6024..4a65ff070f7 100644
--- a/src/Common/ZooKeeper/ZooKeeper.h
+++ b/src/Common/ZooKeeper/ZooKeeper.h
@@ -50,7 +50,14 @@ class ZooKeeper
 public:
     using Ptr = std::shared_ptr<ZooKeeper>;
 
-    ZooKeeper(const std::string & hosts_, const std::string & identity_ = "",
+    /// hosts_string -- comma separated [secure://]host:port list
+    ZooKeeper(const std::string & hosts_string, const std::string & identity_ = "",
+              int32_t session_timeout_ms_ = Coordination::DEFAULT_SESSION_TIMEOUT_MS,
+              int32_t operation_timeout_ms_ = Coordination::DEFAULT_OPERATION_TIMEOUT_MS,
+              const std::string & chroot_ = "",
+              const std::string & implementation_ = "zookeeper");
+
+    ZooKeeper(const Strings & hosts_, const std::string & identity_ = "",
               int32_t session_timeout_ms_ = Coordination::DEFAULT_SESSION_TIMEOUT_MS,
               int32_t operation_timeout_ms_ = Coordination::DEFAULT_OPERATION_TIMEOUT_MS,
               const std::string & chroot_ = "",
@@ -247,10 +254,12 @@ public:
     /// Like the previous one but don't throw any exceptions on future.get()
     FutureMulti tryAsyncMulti(const Coordination::Requests & ops);
 
+    void finalize();
+
 private:
     friend class EphemeralNodeHolder;
 
-    void init(const std::string & implementation_, const std::string & hosts_, const std::string & identity_,
+    void init(const std::string & implementation_, const Strings & hosts_, const std::string & identity_,
               int32_t session_timeout_ms_, int32_t operation_timeout_ms_, const std::string & chroot_);
 
     /// The following methods don't throw exceptions but return error codes.
@@ -266,7 +275,7 @@ private:
 
     std::unique_ptr<Coordination::IKeeper> impl;
 
-    std::string hosts;
+    Strings hosts;
     std::string identity;
     int32_t session_timeout_ms;
     int32_t operation_timeout_ms;
diff --git a/src/Common/ZooKeeper/ZooKeeperCommon.cpp b/src/Common/ZooKeeper/ZooKeeperCommon.cpp
index 56f9de31ec8..50bdc6c77ba 100644
--- a/src/Common/ZooKeeper/ZooKeeperCommon.cpp
+++ b/src/Common/ZooKeeper/ZooKeeperCommon.cpp
@@ -455,6 +455,39 @@ ZooKeeperResponsePtr ZooKeeperCheckRequest::makeResponse() const { return std::m
 ZooKeeperResponsePtr ZooKeeperMultiRequest::makeResponse() const { return std::make_shared<ZooKeeperMultiResponse>(requests); }
 ZooKeeperResponsePtr ZooKeeperCloseRequest::makeResponse() const { return std::make_shared<ZooKeeperCloseResponse>(); }
 
+void ZooKeeperSessionIDRequest::writeImpl(WriteBuffer & out) const
+{
+    Coordination::write(internal_id, out);
+    Coordination::write(session_timeout_ms, out);
+    Coordination::write(server_id, out);
+}
+
+void ZooKeeperSessionIDRequest::readImpl(ReadBuffer & in)
+{
+    Coordination::read(internal_id, in);
+    Coordination::read(session_timeout_ms, in);
+    Coordination::read(server_id, in);
+}
+
+Coordination::ZooKeeperResponsePtr ZooKeeperSessionIDRequest::makeResponse() const
+{
+    return std::make_shared<ZooKeeperSessionIDResponse>();
+}
+
+void ZooKeeperSessionIDResponse::readImpl(ReadBuffer & in)
+{
+    Coordination::read(internal_id, in);
+    Coordination::read(session_id, in);
+    Coordination::read(server_id, in);
+}
+
+void ZooKeeperSessionIDResponse::writeImpl(WriteBuffer & out) const
+{
+    Coordination::write(internal_id, out);
+    Coordination::write(session_id, out);
+    Coordination::write(server_id, out);
+}
+
 void ZooKeeperRequestFactory::registerRequest(OpNum op_num, Creator creator)
 {
     if (!op_num_to_request.try_emplace(op_num, creator).second)
@@ -511,6 +544,7 @@ ZooKeeperRequestFactory::ZooKeeperRequestFactory()
     registerZooKeeperRequest<OpNum::List, ZooKeeperListRequest>(*this);
     registerZooKeeperRequest<OpNum::Check, ZooKeeperCheckRequest>(*this);
     registerZooKeeperRequest<OpNum::Multi, ZooKeeperMultiRequest>(*this);
+    registerZooKeeperRequest<OpNum::SessionID, ZooKeeperSessionIDRequest>(*this);
 }
 
 }
diff --git a/src/Common/ZooKeeper/ZooKeeperCommon.h b/src/Common/ZooKeeper/ZooKeeperCommon.h
index 92b1e7c9858..dd95eaa6b67 100644
--- a/src/Common/ZooKeeper/ZooKeeperCommon.h
+++ b/src/Common/ZooKeeper/ZooKeeperCommon.h
@@ -84,6 +84,8 @@ struct ZooKeeperSyncRequest final : ZooKeeperRequest
     void readImpl(ReadBuffer & in) override;
     ZooKeeperResponsePtr makeResponse() const override;
     bool isReadRequest() const override { return false; }
+
+    size_t bytesSize() const override { return ZooKeeperRequest::bytesSize() + path.size(); }
 };
 
 struct ZooKeeperSyncResponse final : ZooKeeperResponse
@@ -92,6 +94,8 @@ struct ZooKeeperSyncResponse final : ZooKeeperResponse
     void readImpl(ReadBuffer & in) override;
     void writeImpl(WriteBuffer & out) const override;
     OpNum getOpNum() const override { return OpNum::Sync; }
+
+    size_t bytesSize() const override { return path.size(); }
 };
 
 struct ZooKeeperHeartbeatResponse final : ZooKeeperResponse
@@ -128,6 +132,9 @@ struct ZooKeeperAuthRequest final : ZooKeeperRequest
 
     ZooKeeperResponsePtr makeResponse() const override;
     bool isReadRequest() const override { return false; }
+
+    size_t bytesSize() const override { return ZooKeeperRequest::bytesSize() + sizeof(xid) +
+            sizeof(type) + scheme.size() + data.size(); }
 };
 
 struct ZooKeeperAuthResponse final : ZooKeeperResponse
@@ -136,6 +143,8 @@ struct ZooKeeperAuthResponse final : ZooKeeperResponse
     void writeImpl(WriteBuffer &) const override {}
 
     OpNum getOpNum() const override { return OpNum::Auth; }
+
+    size_t bytesSize() const override { return ZooKeeperResponse::bytesSize() + sizeof(xid) + sizeof(zxid); }
 };
 
 struct ZooKeeperCloseRequest final : ZooKeeperRequest
@@ -172,6 +181,8 @@ struct ZooKeeperCreateRequest final : public CreateRequest, ZooKeeperRequest
 
     ZooKeeperResponsePtr makeResponse() const override;
     bool isReadRequest() const override { return false; }
+
+    size_t bytesSize() const override { return CreateRequest::bytesSize() + sizeof(xid) + sizeof(has_watch); }
 };
 
 struct ZooKeeperCreateResponse final : CreateResponse, ZooKeeperResponse
@@ -181,6 +192,8 @@ struct ZooKeeperCreateResponse final : CreateResponse, ZooKeeperResponse
     void writeImpl(WriteBuffer & out) const override;
 
     OpNum getOpNum() const override { return OpNum::Create; }
+
+    size_t bytesSize() const override { return CreateResponse::bytesSize() + sizeof(xid) + sizeof(zxid); }
 };
 
 struct ZooKeeperRemoveRequest final : RemoveRequest, ZooKeeperRequest
@@ -194,6 +207,8 @@ struct ZooKeeperRemoveRequest final : RemoveRequest, ZooKeeperRequest
 
     ZooKeeperResponsePtr makeResponse() const override;
     bool isReadRequest() const override { return false; }
+
+    size_t bytesSize() const override { return RemoveRequest::bytesSize() + sizeof(xid); }
 };
 
 struct ZooKeeperRemoveResponse final : RemoveResponse, ZooKeeperResponse
@@ -201,6 +216,8 @@ struct ZooKeeperRemoveResponse final : RemoveResponse, ZooKeeperResponse
     void readImpl(ReadBuffer &) override {}
     void writeImpl(WriteBuffer &) const override {}
     OpNum getOpNum() const override { return OpNum::Remove; }
+
+    size_t bytesSize() const override { return RemoveResponse::bytesSize() + sizeof(xid) + sizeof(zxid); }
 };
 
 struct ZooKeeperExistsRequest final : ExistsRequest, ZooKeeperRequest
@@ -211,6 +228,8 @@ struct ZooKeeperExistsRequest final : ExistsRequest, ZooKeeperRequest
 
     ZooKeeperResponsePtr makeResponse() const override;
     bool isReadRequest() const override { return !has_watch; }
+
+    size_t bytesSize() const override { return ExistsRequest::bytesSize() + sizeof(xid) + sizeof(has_watch); }
 };
 
 struct ZooKeeperExistsResponse final : ExistsResponse, ZooKeeperResponse
@@ -218,6 +237,8 @@ struct ZooKeeperExistsResponse final : ExistsResponse, ZooKeeperResponse
     void readImpl(ReadBuffer & in) override;
     void writeImpl(WriteBuffer & out) const override;
     OpNum getOpNum() const override { return OpNum::Exists; }
+
+    size_t bytesSize() const override { return ExistsResponse::bytesSize() + sizeof(xid) + sizeof(zxid); }
 };
 
 struct ZooKeeperGetRequest final : GetRequest, ZooKeeperRequest
@@ -228,6 +249,8 @@ struct ZooKeeperGetRequest final : GetRequest, ZooKeeperRequest
 
     ZooKeeperResponsePtr makeResponse() const override;
     bool isReadRequest() const override { return !has_watch; }
+
+    size_t bytesSize() const override { return GetRequest::bytesSize() + sizeof(xid) + sizeof(has_watch); }
 };
 
 struct ZooKeeperGetResponse final : GetResponse, ZooKeeperResponse
@@ -235,6 +258,8 @@ struct ZooKeeperGetResponse final : GetResponse, ZooKeeperResponse
     void readImpl(ReadBuffer & in) override;
     void writeImpl(WriteBuffer & out) const override;
     OpNum getOpNum() const override { return OpNum::Get; }
+
+    size_t bytesSize() const override { return GetResponse::bytesSize() + sizeof(xid) + sizeof(zxid); }
 };
 
 struct ZooKeeperSetRequest final : SetRequest, ZooKeeperRequest
@@ -247,6 +272,8 @@ struct ZooKeeperSetRequest final : SetRequest, ZooKeeperRequest
     void readImpl(ReadBuffer & in) override;
     ZooKeeperResponsePtr makeResponse() const override;
     bool isReadRequest() const override { return false; }
+
+    size_t bytesSize() const override { return SetRequest::bytesSize() + sizeof(xid); }
 };
 
 struct ZooKeeperSetResponse final : SetResponse, ZooKeeperResponse
@@ -254,6 +281,8 @@ struct ZooKeeperSetResponse final : SetResponse, ZooKeeperResponse
     void readImpl(ReadBuffer & in) override;
     void writeImpl(WriteBuffer & out) const override;
     OpNum getOpNum() const override { return OpNum::Set; }
+
+    size_t bytesSize() const override { return SetResponse::bytesSize() + sizeof(xid) + sizeof(zxid); }
 };
 
 struct ZooKeeperListRequest : ListRequest, ZooKeeperRequest
@@ -263,6 +292,8 @@ struct ZooKeeperListRequest : ListRequest, ZooKeeperRequest
     void readImpl(ReadBuffer & in) override;
     ZooKeeperResponsePtr makeResponse() const override;
     bool isReadRequest() const override { return !has_watch; }
+
+    size_t bytesSize() const override { return ListRequest::bytesSize() + sizeof(xid) + sizeof(has_watch); }
 };
 
 struct ZooKeeperSimpleListRequest final : ZooKeeperListRequest
@@ -275,6 +306,8 @@ struct ZooKeeperListResponse : ListResponse, ZooKeeperResponse
     void readImpl(ReadBuffer & in) override;
     void writeImpl(WriteBuffer & out) const override;
     OpNum getOpNum() const override { return OpNum::List; }
+
+    size_t bytesSize() const override { return ListResponse::bytesSize() + sizeof(xid) + sizeof(zxid); }
 };
 
 struct ZooKeeperSimpleListResponse final : ZooKeeperListResponse
@@ -293,6 +326,8 @@ struct ZooKeeperCheckRequest final : CheckRequest, ZooKeeperRequest
 
     ZooKeeperResponsePtr makeResponse() const override;
     bool isReadRequest() const override { return !has_watch; }
+
+    size_t bytesSize() const override { return CheckRequest::bytesSize() + sizeof(xid) + sizeof(has_watch); }
 };
 
 struct ZooKeeperCheckResponse final : CheckResponse, ZooKeeperResponse
@@ -300,6 +335,8 @@ struct ZooKeeperCheckResponse final : CheckResponse, ZooKeeperResponse
     void readImpl(ReadBuffer &) override {}
     void writeImpl(WriteBuffer &) const override {}
     OpNum getOpNum() const override { return OpNum::Check; }
+
+    size_t bytesSize() const override { return CheckResponse::bytesSize() + sizeof(xid) + sizeof(zxid); }
 };
 
 /// This response may be received only as an element of responses in MultiResponse.
@@ -309,6 +346,8 @@ struct ZooKeeperErrorResponse final : ErrorResponse, ZooKeeperResponse
     void writeImpl(WriteBuffer & out) const override;
 
     OpNum getOpNum() const override { return OpNum::Error; }
+
+    size_t bytesSize() const override { return ErrorResponse::bytesSize() + sizeof(xid) + sizeof(zxid); }
 };
 
 struct ZooKeeperMultiRequest final : MultiRequest, ZooKeeperRequest
@@ -323,6 +362,8 @@ struct ZooKeeperMultiRequest final : MultiRequest, ZooKeeperRequest
 
     ZooKeeperResponsePtr makeResponse() const override;
     bool isReadRequest() const override;
+
+    size_t bytesSize() const override { return MultiRequest::bytesSize() + sizeof(xid) + sizeof(has_watch); }
 };
 
 struct ZooKeeperMultiResponse final : MultiResponse, ZooKeeperResponse
@@ -346,6 +387,41 @@ struct ZooKeeperMultiResponse final : MultiResponse, ZooKeeperResponse
 
     void writeImpl(WriteBuffer & out) const override;
 
+    size_t bytesSize() const override { return MultiResponse::bytesSize() + sizeof(xid) + sizeof(zxid); }
+};
+
+/// Fake internal coordination (keeper) response. Never received from client
+/// and never send to client.
+struct ZooKeeperSessionIDRequest final : ZooKeeperRequest
+{
+    int64_t internal_id;
+    int64_t session_timeout_ms;
+    /// Who requested this session
+    int32_t server_id;
+
+    Coordination::OpNum getOpNum() const override { return OpNum::SessionID; }
+    String getPath() const override { return {}; }
+    void writeImpl(WriteBuffer & out) const override;
+    void readImpl(ReadBuffer & in) override;
+
+    Coordination::ZooKeeperResponsePtr makeResponse() const override;
+    bool isReadRequest() const override { return false; }
+};
+
+/// Fake internal coordination (keeper) response. Never received from client
+/// and never send to client.
+struct ZooKeeperSessionIDResponse final : ZooKeeperResponse
+{
+    int64_t internal_id;
+    int64_t session_id;
+    /// Who requested this session
+    int32_t server_id;
+
+    void readImpl(ReadBuffer & in) override;
+
+    void writeImpl(WriteBuffer & out) const override;
+
+    Coordination::OpNum getOpNum() const override { return OpNum::SessionID; }
 };
 
 class ZooKeeperRequestFactory final : private boost::noncopyable
diff --git a/src/Common/ZooKeeper/ZooKeeperConstants.cpp b/src/Common/ZooKeeper/ZooKeeperConstants.cpp
index 295094b336b..d2dde4c4cdd 100644
--- a/src/Common/ZooKeeper/ZooKeeperConstants.cpp
+++ b/src/Common/ZooKeeper/ZooKeeperConstants.cpp
@@ -21,6 +21,7 @@ static const std::unordered_set<int32_t> VALID_OPERATIONS =
     static_cast<int32_t>(OpNum::Check),
     static_cast<int32_t>(OpNum::Multi),
     static_cast<int32_t>(OpNum::Auth),
+    static_cast<int32_t>(OpNum::SessionID),
 };
 
 std::string toString(OpNum op_num)
@@ -55,6 +56,8 @@ std::string toString(OpNum op_num)
             return "Heartbeat";
         case OpNum::Auth:
             return "Auth";
+        case OpNum::SessionID:
+            return "SessionID";
     }
     int32_t raw_op = static_cast<int32_t>(op_num);
     throw Exception("Operation " + std::to_string(raw_op) + " is unknown", Error::ZUNIMPLEMENTED);
diff --git a/src/Common/ZooKeeper/ZooKeeperConstants.h b/src/Common/ZooKeeper/ZooKeeperConstants.h
index 81ca6c6a460..f91204693a0 100644
--- a/src/Common/ZooKeeper/ZooKeeperConstants.h
+++ b/src/Common/ZooKeeper/ZooKeeperConstants.h
@@ -30,6 +30,7 @@ enum class OpNum : int32_t
     Check = 13,
     Multi = 14,
     Auth = 100,
+    SessionID = 997, /// Special internal request
 };
 
 std::string toString(OpNum op_num);
diff --git a/src/Common/ZooKeeper/ZooKeeperIO.cpp b/src/Common/ZooKeeper/ZooKeeperIO.cpp
index 3f0905ea186..55448c9a109 100644
--- a/src/Common/ZooKeeper/ZooKeeperIO.cpp
+++ b/src/Common/ZooKeeper/ZooKeeperIO.cpp
@@ -3,7 +3,6 @@
 namespace Coordination
 {
 
-
 void write(size_t x, WriteBuffer & out)
 {
     x = __builtin_bswap64(x);
diff --git a/src/Common/ZooKeeper/ZooKeeperImpl.cpp b/src/Common/ZooKeeper/ZooKeeperImpl.cpp
index 2314139af69..a717052a1ba 100644
--- a/src/Common/ZooKeeper/ZooKeeperImpl.cpp
+++ b/src/Common/ZooKeeper/ZooKeeperImpl.cpp
@@ -796,8 +796,17 @@ void ZooKeeper::receiveEvent()
         /// In case we cannot read the response, we should indicate it as the error of that type
         ///  when the user cannot assume whether the request was processed or not.
         response->error = Error::ZCONNECTIONLOSS;
-        if (request_info.callback)
-            request_info.callback(*response);
+
+        try
+        {
+            if (request_info.callback)
+                request_info.callback(*response);
+        }
+        catch (...)
+        {
+            /// Throw initial exception, not exception from callback.
+            tryLogCurrentException(__PRETTY_FUNCTION__);
+        }
 
         throw;
     }
@@ -1003,6 +1012,16 @@ void ZooKeeper::pushRequest(RequestInfo && info)
     ProfileEvents::increment(ProfileEvents::ZooKeeperTransactions);
 }
 
+void ZooKeeper::executeGenericRequest(
+    const ZooKeeperRequestPtr & request,
+    ResponseCallback callback)
+{
+    RequestInfo request_info;
+    request_info.request = request;
+    request_info.callback = callback;
+
+    pushRequest(std::move(request_info));
+}
 
 void ZooKeeper::create(
     const String & path,
diff --git a/src/Common/ZooKeeper/ZooKeeperImpl.h b/src/Common/ZooKeeper/ZooKeeperImpl.h
index 71b7cd56149..2210fd98b18 100644
--- a/src/Common/ZooKeeper/ZooKeeperImpl.h
+++ b/src/Common/ZooKeeper/ZooKeeperImpl.h
@@ -88,7 +88,7 @@ using namespace DB;
 
 /** Usage scenario: look at the documentation for IKeeper class.
   */
-class ZooKeeper : public IKeeper
+class ZooKeeper final : public IKeeper
 {
 public:
     struct Node
@@ -121,6 +121,9 @@ public:
     /// Useful to check owner of ephemeral node.
     int64_t getSessionID() const override { return session_id; }
 
+    void executeGenericRequest(
+        const ZooKeeperRequestPtr & request,
+        ResponseCallback callback);
 
     /// See the documentation about semantics of these methods in IKeeper class.
 
@@ -167,6 +170,20 @@ public:
         const Requests & requests,
         MultiCallback callback) override;
 
+    /// Without forcefully invalidating (finalizing) ZooKeeper session before
+    /// establishing a new one, there was a possibility that server is using
+    /// two ZooKeeper sessions simultaneously in different parts of code.
+    /// This is strong antipattern and we always prevented it.
+
+    /// ZooKeeper is linearizeable for writes, but not linearizeable for
+    /// reads, it only maintains "sequential consistency": in every session
+    /// you observe all events in order but possibly with some delay. If you
+    /// perform write in one session, then notify different part of code and
+    /// it will do read in another session, that read may not see the
+    /// already performed write.
+
+    void finalize()  override { finalize(false, false); }
+
 private:
     String root_path;
     ACLs default_acls;
diff --git a/src/Common/formatIPv6.h b/src/Common/formatIPv6.h
index bd0c68d70f9..1cb9d3d1d81 100644
--- a/src/Common/formatIPv6.h
+++ b/src/Common/formatIPv6.h
@@ -25,7 +25,7 @@ void formatIPv6(const unsigned char * src, char *& dst, uint8_t zeroed_tail_byte
 
 /** Unsafe (no bounds-checking for src nor dst), optimized version of parsing IPv4 string.
  *
- * Parses the input string `src` and stores binary BE value into buffer pointed by `dst`,
+ * Parses the input string `src` and stores binary host-endian value into buffer pointed by `dst`,
  * which should be long enough.
  * That is "127.0.0.1" becomes 0x7f000001.
  *
@@ -63,7 +63,7 @@ inline bool parseIPv4(const char * src, unsigned char * dst)
 /** Unsafe (no bounds-checking for src nor dst), optimized version of parsing IPv6 string.
 *
 * Slightly altered implementation from http://svn.apache.org/repos/asf/apr/apr/trunk/network_io/unix/inet_pton.c
-* Parses the input string `src` and stores binary LE value into buffer pointed by `dst`,
+* Parses the input string `src` and stores binary big-endian value into buffer pointed by `dst`,
 * which should be long enough. In case of failure zeroes
 * IPV6_BINARY_LENGTH bytes of buffer pointed by `dst`.
 *
diff --git a/src/Common/formatReadable.cpp b/src/Common/formatReadable.cpp
index fc5c6c19b50..fd8ff9abd86 100644
--- a/src/Common/formatReadable.cpp
+++ b/src/Common/formatReadable.cpp
@@ -13,7 +13,10 @@ namespace DB
     }
 }
 
-static void formatReadable(double size, DB::WriteBuffer & out, int precision, const char ** units, size_t units_size, double delimiter)
+// I wanted to make this ALWAYS_INLINE to prevent flappy performance tests,
+// but GCC complains it may not be inlined.
+static void formatReadable(double size, DB::WriteBuffer & out,
+    int precision, const char ** units, size_t units_size, double delimiter)
 {
     size_t i = 0;
     for (; i + 1 < units_size && fabs(size) >= delimiter; ++i)
diff --git a/src/Common/parseRemoteDescription.cpp b/src/Common/parseRemoteDescription.cpp
index cc89af26d99..477f5e0f250 100644
--- a/src/Common/parseRemoteDescription.cpp
+++ b/src/Common/parseRemoteDescription.cpp
@@ -1,6 +1,9 @@
 #include "parseRemoteDescription.h"
 #include <Common/Exception.h>
 #include <IO/WriteHelpers.h>
+#include <IO/ReadHelpers.h>
+#include <common/logger_useful.h>
+
 
 namespace DB
 {
@@ -167,4 +170,27 @@ std::vector<String> parseRemoteDescription(const String & description, size_t l,
     return res;
 }
 
+
+std::vector<std::pair<String, uint16_t>> parseRemoteDescriptionForExternalDatabase(const String & description, size_t max_addresses, UInt16 default_port)
+{
+    auto addresses = parseRemoteDescription(description, 0, description.size(), '|', max_addresses);
+    std::vector<std::pair<String, uint16_t>> result;
+
+    for (const auto & address : addresses)
+    {
+        size_t colon = address.find(':');
+        if (colon == String::npos)
+        {
+            LOG_WARNING(&Poco::Logger::get("ParseRemoteDescription"), "Port is not found for host: {}. Using default port {}", address, default_port);
+            result.emplace_back(std::make_pair(address, default_port));
+        }
+        else
+        {
+            result.emplace_back(std::make_pair(address.substr(0, colon), DB::parseFromString<UInt16>(address.substr(colon + 1))));
+        }
+    }
+
+    return result;
+}
+
 }
diff --git a/src/Common/parseRemoteDescription.h b/src/Common/parseRemoteDescription.h
index 6ba0bb4737f..f691a57dc73 100644
--- a/src/Common/parseRemoteDescription.h
+++ b/src/Common/parseRemoteDescription.h
@@ -17,4 +17,7 @@ namespace DB
  */
 std::vector<String> parseRemoteDescription(const String & description, size_t l, size_t r, char separator, size_t max_addresses);
 
+/// Parse remote description for external database (MySQL or PostgreSQL).
+std::vector<std::pair<String, uint16_t>> parseRemoteDescriptionForExternalDatabase(const String & description, size_t max_addresses, UInt16 default_port);
+
 }
diff --git a/src/Common/tests/compact_array.cpp b/src/Common/tests/compact_array.cpp
index a63859ac712..af6257e1963 100644
--- a/src/Common/tests/compact_array.cpp
+++ b/src/Common/tests/compact_array.cpp
@@ -1,5 +1,5 @@
 /// Bug in GCC: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=59124
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Warray-bounds"
 #endif
@@ -263,6 +263,6 @@ int main()
     return 0;
 }
 
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic pop
 #endif
diff --git a/src/Common/tests/gtest_DateLUTImpl.cpp b/src/Common/tests/gtest_DateLUTImpl.cpp
new file mode 100644
index 00000000000..74fd7cb6149
--- /dev/null
+++ b/src/Common/tests/gtest_DateLUTImpl.cpp
@@ -0,0 +1,531 @@
+#include <common/DateLUT.h>
+#include <common/DateLUTImpl.h>
+
+#include <gtest/gtest.h>
+
+#include <string>
+#include <string_view>
+
+#include <cctz/time_zone.h>
+
+
+/// For the expansion of gtest macros.
+#if defined(__clang__)
+    #pragma clang diagnostic ignored "-Wused-but-marked-unused"
+#endif
+
+// All timezones present at build time and embedded into ClickHouse binary.
+extern const char * auto_time_zones[];
+
+namespace
+{
+
+cctz::civil_day YYYYMMDDToDay(unsigned value)
+{
+    return cctz::civil_day(
+        value / 10000,         // year
+        (value % 10000) / 100, // month
+        value % 100);          // day
+}
+
+std::vector<const char*> allTimezones(bool with_weird_offsets = true)
+{
+    std::vector<const char*> result;
+
+    const auto * timezone_name = auto_time_zones;
+    while (*timezone_name)
+    {
+        bool weird_offsets = (std::string_view(*timezone_name) == "Africa/Monrovia");
+
+        if (!weird_offsets || with_weird_offsets)
+            result.push_back(*timezone_name);
+        ++timezone_name;
+    }
+
+    return result;
+}
+
+struct FailuresCount
+{
+    size_t non_fatal = 0;
+    size_t fatal = 0;
+    size_t total = 0;
+};
+
+FailuresCount countFailures(const ::testing::TestResult & test_result)
+{
+    FailuresCount failures{0, 0, 0};
+    const size_t count = test_result.total_part_count();
+    for (size_t i = 0; i < count; ++i)
+    {
+        const auto & part = test_result.GetTestPartResult(i);
+        if (part.nonfatally_failed())
+        {
+            ++failures.non_fatal;
+            ++failures.total;
+        }
+        if (part.fatally_failed())
+        {
+            ++failures.fatal;
+            ++failures.total;
+        }
+    }
+
+    return failures;
+}
+
+}
+
+TEST(DateLUTTest, makeDayNumTest)
+{
+    const DateLUTImpl & lut = DateLUT::instance("UTC");
+    EXPECT_EQ(0, lut.makeDayNum(2500, 12, 25));
+    EXPECT_EQ(0, lut.makeDayNum(1924, 12, 31));
+}
+
+
+TEST(DateLUTTest, TimeValuesInMiddleOfRange)
+{
+    const DateLUTImpl & lut = DateLUT::instance("Europe/Minsk");
+    const time_t time = 1568650811; // 2019-09-16 19:20:11 (Monday)
+
+    EXPECT_EQ(lut.getTimeZone(), "Europe/Minsk");
+    EXPECT_EQ(lut.getOffsetAtStartOfEpoch(), 3600*3); // UTC-3
+
+    EXPECT_EQ(lut.toDate(time), 1568581200);
+    EXPECT_EQ(lut.toMonth(time), 9);
+    EXPECT_EQ(lut.toQuarter(time), 3);
+    EXPECT_EQ(lut.toYear(time), 2019);
+    EXPECT_EQ(lut.toDayOfMonth(time), 16);
+
+    EXPECT_EQ(lut.toFirstDayOfWeek(time), 1568581200 /*time_t*/);
+    EXPECT_EQ(lut.toFirstDayNumOfWeek(time), DayNum(18155) /*DayNum*/);
+    EXPECT_EQ(lut.toFirstDayOfMonth(time), 1567285200 /*time_t*/);
+    EXPECT_EQ(lut.toFirstDayNumOfMonth(time), DayNum(18140) /*DayNum*/);
+    EXPECT_EQ(lut.toFirstDayNumOfQuarter(time), DayNum(18078) /*DayNum*/);
+    EXPECT_EQ(lut.toFirstDayOfQuarter(time), 1561928400 /*time_t*/);
+    EXPECT_EQ(lut.toFirstDayOfYear(time), 1546290000 /*time_t*/);
+    EXPECT_EQ(lut.toFirstDayNumOfYear(time), DayNum(17897) /*DayNum*/);
+    EXPECT_EQ(lut.toFirstDayOfNextMonth(time), 1569877200 /*time_t*/);
+    EXPECT_EQ(lut.toFirstDayOfPrevMonth(time), 1564606800 /*time_t*/);
+    EXPECT_EQ(lut.daysInMonth(time), 30 /*UInt8*/);
+    EXPECT_EQ(lut.toDateAndShift(time, 10), 1569445200 /*time_t*/);
+    EXPECT_EQ(lut.toTime(time), 58811 /*time_t*/);
+    EXPECT_EQ(lut.toHour(time), 19 /*unsigned*/);
+    EXPECT_EQ(lut.toSecond(time), 11 /*unsigned*/);
+    EXPECT_EQ(lut.toMinute(time), 20 /*unsigned*/);
+    EXPECT_EQ(lut.toStartOfMinute(time), 1568650800 /*time_t*/);
+    EXPECT_EQ(lut.toStartOfFiveMinute(time), 1568650800 /*time_t*/);
+    EXPECT_EQ(lut.toStartOfFifteenMinutes(time), 1568650500 /*time_t*/);
+    EXPECT_EQ(lut.toStartOfTenMinutes(time), 1568650800 /*time_t*/);
+    EXPECT_EQ(lut.toStartOfHour(time), 1568649600 /*time_t*/);
+    EXPECT_EQ(lut.toDayNum(time), DayNum(18155) /*DayNum*/);
+    EXPECT_EQ(lut.toDayOfYear(time), 259 /*unsigned*/);
+    EXPECT_EQ(lut.toRelativeWeekNum(time), 2594 /*unsigned*/);
+    EXPECT_EQ(lut.toISOYear(time), 2019 /*unsigned*/);
+    EXPECT_EQ(lut.toFirstDayNumOfISOYear(time), DayNum(17896) /*DayNum*/);
+    EXPECT_EQ(lut.toFirstDayOfISOYear(time), 1546203600 /*time_t*/);
+    EXPECT_EQ(lut.toISOWeek(time), 38 /*unsigned*/);
+    EXPECT_EQ(lut.toRelativeMonthNum(time), 24237 /*unsigned*/);
+    EXPECT_EQ(lut.toRelativeQuarterNum(time), 8078 /*unsigned*/);
+    EXPECT_EQ(lut.toRelativeHourNum(time), 435736 /*time_t*/);
+    EXPECT_EQ(lut.toRelativeMinuteNum(time), 26144180 /*time_t*/);
+    EXPECT_EQ(lut.toStartOfMinuteInterval(time, 6), 1568650680 /*time_t*/);
+    EXPECT_EQ(lut.toStartOfSecondInterval(time, 7), 1568650811 /*time_t*/);
+    EXPECT_EQ(lut.toNumYYYYMM(time), 201909 /*UInt32*/);
+    EXPECT_EQ(lut.toNumYYYYMMDD(time), 20190916 /*UInt32*/);
+    EXPECT_EQ(lut.toNumYYYYMMDDhhmmss(time), 20190916192011 /*UInt64*/);
+    EXPECT_EQ(lut.addDays(time, 100), 1577290811 /*time_t*/);
+    EXPECT_EQ(lut.addWeeks(time, 100), 1629130811 /*time_t*/);
+    EXPECT_EQ(lut.addMonths(time, 100), 1831652411 /*time_t*/);
+    EXPECT_EQ(lut.addQuarters(time, 100), 2357655611 /*time_t*/);
+    EXPECT_EQ(lut.addYears(time, 10), 1884270011 /*time_t*/);
+    EXPECT_EQ(lut.timeToString(time), "2019-09-16 19:20:11" /*std::string*/);
+    EXPECT_EQ(lut.dateToString(time), "2019-09-16" /*std::string*/);
+}
+
+
+TEST(DateLUTTest, TimeValuesAtLeftBoderOfRange)
+{
+    const DateLUTImpl & lut = DateLUT::instance("UTC");
+    const time_t time = 0; // 1970-01-01 00:00:00 (Thursday)
+
+    EXPECT_EQ(lut.getTimeZone(), "UTC");
+
+    EXPECT_EQ(lut.toDate(time), 0);
+    EXPECT_EQ(lut.toMonth(time), 1);
+    EXPECT_EQ(lut.toQuarter(time), 1);
+    EXPECT_EQ(lut.toYear(time), 1970);
+    EXPECT_EQ(lut.toDayOfMonth(time), 1);
+
+    EXPECT_EQ(lut.toFirstDayOfWeek(time), -259200 /*time_t*/); // 1969-12-29 00:00:00
+    EXPECT_EQ(lut.toFirstDayNumOfWeek(time), ExtendedDayNum(-3) /*DayNum*/);
+    EXPECT_EQ(lut.toFirstDayOfMonth(time), 0 /*time_t*/);
+    EXPECT_EQ(lut.toFirstDayNumOfMonth(time), DayNum(0) /*DayNum*/);
+    EXPECT_EQ(lut.toFirstDayNumOfQuarter(time), DayNum(0) /*DayNum*/);
+    EXPECT_EQ(lut.toFirstDayOfQuarter(time), 0 /*time_t*/);
+    EXPECT_EQ(lut.toFirstDayOfYear(time), 0 /*time_t*/);
+    EXPECT_EQ(lut.toFirstDayNumOfYear(time), DayNum(0) /*DayNum*/);
+    EXPECT_EQ(lut.toFirstDayOfNextMonth(time), 2678400 /*time_t*/);
+    EXPECT_EQ(lut.toFirstDayOfPrevMonth(time), -2678400 /*time_t*/); // 1969-12-01 00:00:00
+    EXPECT_EQ(lut.daysInMonth(time), 31 /*UInt8*/);
+    EXPECT_EQ(lut.toDateAndShift(time, 10), 864000 /*time_t*/);
+    EXPECT_EQ(lut.toTime(time), 0 /*time_t*/);
+    EXPECT_EQ(lut.toHour(time), 0 /*unsigned*/);
+    EXPECT_EQ(lut.toSecond(time), 0 /*unsigned*/);
+    EXPECT_EQ(lut.toMinute(time), 0 /*unsigned*/);
+    EXPECT_EQ(lut.toStartOfMinute(time), 0 /*time_t*/);
+    EXPECT_EQ(lut.toStartOfFiveMinute(time), 0 /*time_t*/);
+    EXPECT_EQ(lut.toStartOfFifteenMinutes(time), 0 /*time_t*/);
+    EXPECT_EQ(lut.toStartOfTenMinutes(time), 0 /*time_t*/);
+    EXPECT_EQ(lut.toStartOfHour(time), 0 /*time_t*/);
+    EXPECT_EQ(lut.toDayNum(time), DayNum(0) /*DayNum*/);
+    EXPECT_EQ(lut.toDayOfYear(time), 1 /*unsigned*/);
+    EXPECT_EQ(lut.toRelativeWeekNum(time), 0 /*unsigned*/);
+    EXPECT_EQ(lut.toISOYear(time), 1970 /*unsigned*/);
+    EXPECT_EQ(lut.toFirstDayNumOfISOYear(time), ExtendedDayNum(-3) /*DayNum*/);
+    EXPECT_EQ(lut.toFirstDayOfISOYear(time), -259200 /*time_t*/); // 1969-12-29 00:00:00
+    EXPECT_EQ(lut.toISOWeek(time), 1 /*unsigned*/);
+    EXPECT_EQ(lut.toRelativeMonthNum(time), 23641 /*unsigned*/); // ?
+    EXPECT_EQ(lut.toRelativeQuarterNum(time), 7880 /*unsigned*/); // ?
+    EXPECT_EQ(lut.toRelativeHourNum(time), 0 /*time_t*/);
+    EXPECT_EQ(lut.toRelativeMinuteNum(time), 0 /*time_t*/);
+    EXPECT_EQ(lut.toStartOfMinuteInterval(time, 6), 0 /*time_t*/);
+    EXPECT_EQ(lut.toStartOfSecondInterval(time, 7), 0 /*time_t*/);
+    EXPECT_EQ(lut.toNumYYYYMM(time), 197001 /*UInt32*/);
+    EXPECT_EQ(lut.toNumYYYYMMDD(time), 19700101 /*UInt32*/);
+    EXPECT_EQ(lut.toNumYYYYMMDDhhmmss(time), 19700101000000 /*UInt64*/);
+    EXPECT_EQ(lut.addDays(time, 100), 8640000 /*time_t*/);
+    EXPECT_EQ(lut.addWeeks(time, 100), 60480000 /*time_t*/);
+    EXPECT_EQ(lut.addMonths(time, 100), 262828800 /*time_t*/);
+    EXPECT_EQ(lut.addQuarters(time, 100), 788918400 /*time_t*/);
+    EXPECT_EQ(lut.addYears(time, 10), 315532800 /*time_t*/);
+    EXPECT_EQ(lut.timeToString(time), "1970-01-01 00:00:00" /*std::string*/);
+    EXPECT_EQ(lut.dateToString(time), "1970-01-01" /*std::string*/);
+}
+
+TEST(DateLUTTest, TimeValuesAtRightBoderOfRangeOfOldLUT)
+{
+    // Value is at the right border of the old (small) LUT, and provides meaningful values where old LUT would provide garbage.
+    const DateLUTImpl & lut = DateLUT::instance("UTC");
+
+    const time_t time = 4294343873; // 2106-01-31T01:17:53 (Sunday)
+
+    EXPECT_EQ(lut.getTimeZone(), "UTC");
+
+    EXPECT_EQ(lut.toDate(time), 4294339200);
+    EXPECT_EQ(lut.toMonth(time), 1);
+    EXPECT_EQ(lut.toQuarter(time), 1);
+    EXPECT_EQ(lut.toYear(time), 2106);
+    EXPECT_EQ(lut.toDayOfMonth(time), 31);
+
+    EXPECT_EQ(lut.toFirstDayOfWeek(time), 4293820800 /*time_t*/);
+    EXPECT_EQ(lut.toFirstDayNumOfWeek(time), DayNum(49697));
+    EXPECT_EQ(lut.toFirstDayOfMonth(time), 4291747200 /*time_t*/); // 2016-01-01
+    EXPECT_EQ(lut.toFirstDayNumOfMonth(time), DayNum(49673));
+    EXPECT_EQ(lut.toFirstDayNumOfQuarter(time), DayNum(49673) /*DayNum*/);
+    EXPECT_EQ(lut.toFirstDayOfQuarter(time), 4291747200 /*time_t*/);
+    EXPECT_EQ(lut.toFirstDayOfYear(time), 4291747200 /*time_t*/);
+    EXPECT_EQ(lut.toFirstDayNumOfYear(time), DayNum(49673) /*DayNum*/);
+    EXPECT_EQ(lut.toFirstDayOfNextMonth(time), 4294425600 /*time_t*/); // 2106-02-01
+    EXPECT_EQ(lut.toFirstDayOfPrevMonth(time), 4289068800 /*time_t*/); // 2105-12-01
+    EXPECT_EQ(lut.daysInMonth(time), 31 /*UInt8*/);
+    EXPECT_EQ(lut.toDateAndShift(time, 10), 4295203200 /*time_t*/); // 2106-02-10
+    EXPECT_EQ(lut.toTime(time), 4673 /*time_t*/);
+    EXPECT_EQ(lut.toHour(time), 1 /*unsigned*/);
+    EXPECT_EQ(lut.toMinute(time), 17 /*unsigned*/);
+    EXPECT_EQ(lut.toSecond(time), 53 /*unsigned*/);
+    EXPECT_EQ(lut.toStartOfMinute(time), 4294343820 /*time_t*/);
+    EXPECT_EQ(lut.toStartOfFiveMinute(time), 4294343700 /*time_t*/);
+    EXPECT_EQ(lut.toStartOfFifteenMinutes(time), 4294343700 /*time_t*/);
+    EXPECT_EQ(lut.toStartOfTenMinutes(time), 4294343400 /*time_t*/);
+    EXPECT_EQ(lut.toStartOfHour(time), 4294342800 /*time_t*/);
+    EXPECT_EQ(lut.toDayNum(time), DayNum(49703) /*DayNum*/);
+    EXPECT_EQ(lut.toDayOfYear(time), 31 /*unsigned*/);
+    EXPECT_EQ(lut.toRelativeWeekNum(time), 7100 /*unsigned*/);
+    EXPECT_EQ(lut.toISOYear(time), 2106 /*unsigned*/);
+    EXPECT_EQ(lut.toFirstDayNumOfISOYear(time), DayNum(49676) /*DayNum*/); // 2106-01-04
+    EXPECT_EQ(lut.toFirstDayOfISOYear(time), 4292006400 /*time_t*/);
+    EXPECT_EQ(lut.toISOWeek(time), 4 /*unsigned*/);
+    EXPECT_EQ(lut.toRelativeMonthNum(time), 25273 /*unsigned*/);
+    EXPECT_EQ(lut.toRelativeQuarterNum(time), 8424 /*unsigned*/);
+    EXPECT_EQ(lut.toRelativeHourNum(time), 1192873 /*time_t*/);
+    EXPECT_EQ(lut.toRelativeMinuteNum(time), 71572397 /*time_t*/);
+    EXPECT_EQ(lut.toStartOfMinuteInterval(time, 6), 4294343520 /*time_t*/);
+    EXPECT_EQ(lut.toStartOfSecondInterval(time, 7), 4294343872 /*time_t*/);
+    EXPECT_EQ(lut.toNumYYYYMM(time), 210601 /*UInt32*/);
+    EXPECT_EQ(lut.toNumYYYYMMDD(time), 21060131 /*UInt32*/);
+    EXPECT_EQ(lut.toNumYYYYMMDDhhmmss(time), 21060131011753 /*UInt64*/);
+    EXPECT_EQ(lut.addDays(time, 100), 4302983873 /*time_t*/);
+    EXPECT_EQ(lut.addWeeks(time, 10), 4300391873 /*time_t*/);
+    EXPECT_EQ(lut.addMonths(time, 10), 4320523073 /*time_t*/);                 // 2106-11-30 01:17:53
+    EXPECT_EQ(lut.addQuarters(time, 10), 4373140673 /*time_t*/);               // 2108-07-31 01:17:53
+    EXPECT_EQ(lut.addYears(time, 10), 4609876673 /*time_t*/);                  // 2116-01-31 01:17:53
+
+    EXPECT_EQ(lut.timeToString(time), "2106-01-31 01:17:53" /*std::string*/);
+    EXPECT_EQ(lut.dateToString(time), "2106-01-31" /*std::string*/);
+}
+
+
+class DateLUTWithTimeZone : public ::testing::TestWithParam<const char * /* timezone name */>
+{};
+
+TEST_P(DateLUTWithTimeZone, LoadLUT)
+{
+    // There are some assumptions and assertions about TZ data made in DateLUTImpl which are verified upon loading,
+    // to make sure that those assertions are true for all timezones we are going to load all of them one by one.
+    DateLUT::instance(GetParam());
+}
+
+// Another long running test, shouldn't be run to often
+TEST_P(DateLUTWithTimeZone, VaidateTimeComponentsAroundEpoch)
+{
+    // Converting time around 1970-01-01 to hour-minute-seconds time components
+    // could be problematic.
+    const size_t max_failures_per_tz = 3;
+    const auto * timezone_name = GetParam();
+
+    const auto * test_info = ::testing::UnitTest::GetInstance()->current_test_info();
+    const DateLUTImpl & lut = DateLUT::instance(timezone_name);
+
+    for (time_t i = -856147870; i < 86400 * 10000; i += 11 * 13 * 17 * 19)
+    {
+        SCOPED_TRACE(::testing::Message()
+                << "\n\tTimezone: " << timezone_name
+                << "\n\ttimestamp: " << i
+                << "\n\t offset at start of epoch                  : " << lut.getOffsetAtStartOfEpoch()
+                << "\n\t offset_at_start_of_lut                    : " << lut.getTimeOffsetAtStartOfLUT());
+
+        EXPECT_GE(24, lut.toHour(i));
+        EXPECT_GT(60, lut.toMinute(i));
+        EXPECT_GT(60, lut.toSecond(i));
+
+        const auto current_failures = countFailures(*test_info->result());
+        if (current_failures.total > 0)
+        {
+            if (i < 0)
+                i = -1;
+        }
+
+        if (current_failures.total >= max_failures_per_tz)
+            break;
+    }
+}
+
+TEST_P(DateLUTWithTimeZone, getTimeZone)
+{
+    const auto & lut = DateLUT::instance(GetParam());
+
+    EXPECT_EQ(GetParam(), lut.getTimeZone());
+}
+
+
+// Group of tests for timezones that have or had some time ago an offset which is not multiple of 15 minutes.
+INSTANTIATE_TEST_SUITE_P(ExoticTimezones,
+    DateLUTWithTimeZone,
+    ::testing::ValuesIn(std::initializer_list<const char*>{
+            "Africa/El_Aaiun",
+            "Pacific/Apia",
+            "Pacific/Enderbury",
+            "Pacific/Fakaofo",
+            "Pacific/Kiritimati",
+    })
+);
+
+INSTANTIATE_TEST_SUITE_P(AllTimeZones,
+    DateLUTWithTimeZone,
+    ::testing::ValuesIn(allTimezones())
+);
+
+std::ostream & operator<<(std::ostream & ostr, const DateLUTImpl::Values & v)
+{
+    return ostr << "DateLUTImpl::Values{"
+            << "\n\t date              : " << v.date
+            << "\n\t year              : " << static_cast<unsigned int>(v.year)
+            << "\n\t month             : " << static_cast<unsigned int>(v.month)
+            << "\n\t day               : " << static_cast<unsigned int>(v.day_of_month)
+            << "\n\t weekday           : " << static_cast<unsigned int>(v.day_of_week)
+            << "\n\t days in month     : " << static_cast<unsigned int>(v.days_in_month)
+            << "\n\t offset change     : " << v.amount_of_offset_change()
+            << "\n\t offset change at : " << v.time_at_offset_change()
+            << "\n}";
+}
+
+struct TimeRangeParam
+{
+    const cctz::civil_second begin;
+    const cctz::civil_second end;
+    const int step_in_seconds;
+};
+
+std::ostream & operator<<(std::ostream & ostr, const TimeRangeParam & param)
+{
+    return ostr << param.begin << " : " << param.end << " step: " << param.step_in_seconds << "s";
+}
+
+class DateLUTWithTimeZoneAndTimeRange : public ::testing::TestWithParam<std::tuple<const char* /*timezone_name*/, TimeRangeParam>>
+{};
+
+// refactored test from tests/date_lut3.cpp
+TEST_P(DateLUTWithTimeZoneAndTimeRange, InRange)
+{
+    // for a time_t values in range [begin, end) to match with reference obtained from cctz:
+    // compare date and time components: year, month, day, hours, minutes, seconds, formatted time string.
+    const auto & [timezone_name, range_data] = GetParam();
+    const auto & [begin, end, step] = range_data;
+
+    const auto * test_info = ::testing::UnitTest::GetInstance()->current_test_info();
+    static const size_t max_failures_per_case = 3;
+    cctz::time_zone tz;
+    ASSERT_TRUE(cctz::load_time_zone(timezone_name, &tz));
+
+    const auto & lut = DateLUT::instance(timezone_name);
+    const auto start = cctz::convert(begin, tz).time_since_epoch().count();
+    const auto stop = cctz::convert(end, tz).time_since_epoch().count();
+
+    for (time_t expected_time_t = start; expected_time_t < stop; expected_time_t += step)
+    {
+        SCOPED_TRACE(expected_time_t);
+
+        const cctz::civil_second tz_time = cctz::convert(std::chrono::system_clock::from_time_t(expected_time_t), tz);
+
+        /// Weird offset, not supported.
+        /// Example: Africa/Monrovia has offset UTC-0:44:30 in year 1970.
+
+        auto timestamp_current_day_pre = std::chrono::system_clock::to_time_t(tz.lookup(cctz::civil_day(tz_time)).pre);
+        auto timestamp_current_day_post = std::chrono::system_clock::to_time_t(tz.lookup(cctz::civil_day(tz_time) + 1).post);
+
+        if (timestamp_current_day_pre % 900 || timestamp_current_day_post % 900)
+            continue;
+
+        /// Unsupported timezone transitions - not in 15-minute time point or to different day.
+        /// Example: America/Goose_Bay decided to go back one hour at 00:01:
+        /// $ seq 1289097900 30 1289103600 | TZ=America/Goose_Bay LC_ALL=C xargs -I{} date -d @{}
+        /// Sat Nov  6 23:59:00 ADT 2010
+        /// Sat Nov  6 23:59:30 ADT 2010
+        /// Sun Nov  7 00:00:00 ADT 2010
+        /// Sun Nov  7 00:00:30 ADT 2010
+        /// Sat Nov  6 23:01:00 AST 2010
+        /// Sat Nov  6 23:01:30 AST 2010
+
+        bool has_transition = false;
+        cctz::time_zone::civil_transition transition{};
+        if (tz.next_transition(std::chrono::system_clock::from_time_t(expected_time_t - 1), &transition)
+            && (transition.from.day() == tz_time.day() || transition.to.day() == tz_time.day()))
+        {
+            has_transition = true;
+        }
+
+        if (has_transition && (transition.from.second() != 0 || transition.from.minute() % 15 != 0))
+        {
+            /*std::cerr << "Skipping " << timezone_name << " " << tz_time
+                << " because of unsupported timezone transition from " << transition.from << " to " << transition.to
+                << " (not divisible by 15 minutes)\n";*/
+            continue;
+        }
+
+        /// Transition to previous day, but not from midnight.
+        if (has_transition && cctz::civil_day(transition.from) == cctz::civil_day(transition.to) + 1
+            && transition.from != cctz::civil_day(transition.from))
+        {
+            /*std::cerr << "Skipping " << timezone_name << " " << tz_time
+                << " because of unsupported timezone transition from " << transition.from << " to " << transition.to
+                << " (to previous day but not at midnight)\n";*/
+            continue;
+        }
+
+        /// To large transition.
+        if (has_transition
+            && std::abs(transition.from - transition.to) > 3600 * 3)
+        {
+            /*std::cerr << "Skipping " << timezone_name << " " << tz_time
+                << " because of unsupported timezone transition from " << transition.from << " to " << transition.to
+                << " (it is too large)\n";*/
+            continue;
+        }
+
+        EXPECT_EQ(tz_time.year(), lut.toYear(expected_time_t));
+        EXPECT_EQ(tz_time.month(), lut.toMonth(expected_time_t));
+        EXPECT_EQ(tz_time.day(), lut.toDayOfMonth(expected_time_t));
+        /// tm.tm_wday Sunday is 0, while for DateLUTImpl it is 7
+        EXPECT_EQ(static_cast<int>(cctz::get_weekday(tz_time)) + 1, lut.toDayOfWeek(expected_time_t));
+        EXPECT_EQ(cctz::get_yearday(tz_time), lut.toDayOfYear(expected_time_t));
+        EXPECT_EQ(tz_time.hour(), lut.toHour(expected_time_t));
+        EXPECT_EQ(tz_time.minute(), lut.toMinute(expected_time_t));
+        EXPECT_EQ(tz_time.second(), lut.toSecond(expected_time_t));
+
+        const auto time_string = cctz::format("%E4Y-%m-%d %H:%M:%S", std::chrono::system_clock::from_time_t(expected_time_t), tz);
+        EXPECT_EQ(time_string, lut.timeToString(expected_time_t));
+
+        /// It makes sense to let test execute all checks above to simplify debugging,
+        /// but once we've found a bad apple, no need to dig deeper.
+        if (countFailures(*test_info->result()).total >= max_failures_per_case)
+            break;
+    }
+}
+
+INSTANTIATE_TEST_SUITE_P(AllTimezones_Year2010,
+    DateLUTWithTimeZoneAndTimeRange,
+    ::testing::Combine(
+        ::testing::ValuesIn(allTimezones()),
+        ::testing::ValuesIn(std::initializer_list<TimeRangeParam>{
+            // Values from tests/date_lut3.cpp
+            {YYYYMMDDToDay(20101031), YYYYMMDDToDay(20101101), 10 * 15 * 60},
+            {YYYYMMDDToDay(20100328), YYYYMMDDToDay(20100330), 10 * 15 * 60}
+        }))
+);
+
+INSTANTIATE_TEST_SUITE_P(AllTimezones_Year1970_WHOLE,
+    DateLUTWithTimeZoneAndTimeRange,
+    ::testing::Combine(
+        ::testing::ValuesIn(allTimezones(false)),
+        ::testing::ValuesIn(std::initializer_list<TimeRangeParam>{
+            // Values from tests/date_lut3.cpp
+            {YYYYMMDDToDay(19700101), YYYYMMDDToDay(19701231), 10 * 3191 /*53m 11s*/},
+        }))
+);
+
+INSTANTIATE_TEST_SUITE_P(AllTimezones_Year2010_WHOLE,
+    DateLUTWithTimeZoneAndTimeRange,
+    ::testing::Combine(
+        ::testing::ValuesIn(allTimezones(false)),
+        ::testing::ValuesIn(std::initializer_list<TimeRangeParam>{
+            // Values from tests/date_lut3.cpp
+            {YYYYMMDDToDay(20100101), YYYYMMDDToDay(20101231), 10 * 3191 /*53m 11s*/},
+        }))
+);
+
+INSTANTIATE_TEST_SUITE_P(AllTimezones_Year2020_WHOLE,
+    DateLUTWithTimeZoneAndTimeRange,
+    ::testing::Combine(
+        ::testing::ValuesIn(allTimezones()),
+        ::testing::ValuesIn(std::initializer_list<TimeRangeParam>{
+            // Values from tests/date_lut3.cpp
+            {YYYYMMDDToDay(20200101), YYYYMMDDToDay(20201231), 10 * 3191 /*53m 11s*/},
+        }))
+);
+
+INSTANTIATE_TEST_SUITE_P(AllTimezones_PreEpoch,
+    DateLUTWithTimeZoneAndTimeRange,
+    ::testing::Combine(
+        ::testing::ValuesIn(allTimezones(false)),
+        ::testing::ValuesIn(std::initializer_list<TimeRangeParam>{
+            {YYYYMMDDToDay(19500101), YYYYMMDDToDay(19600101), 10 * 15 * 60},
+            {YYYYMMDDToDay(19300101), YYYYMMDDToDay(19350101), 10 * 11 * 15 * 60}
+        }))
+);
+
+INSTANTIATE_TEST_SUITE_P(AllTimezones_Year1970,
+    DateLUTWithTimeZoneAndTimeRange,
+    ::testing::Combine(
+        ::testing::ValuesIn(allTimezones(false)),
+        ::testing::ValuesIn(std::initializer_list<TimeRangeParam>{
+            {YYYYMMDDToDay(19700101), YYYYMMDDToDay(19700201), 10 * 15 * 60},
+            {YYYYMMDDToDay(19700101), YYYYMMDDToDay(19701231), 10 * 11 * 13 * 17}
+//            // 11 was chosen as a number which can't divide product of 2-combinarions of (7, 24, 60),
+//            // to reduce likelehood of hitting same hour/minute/second values for different days.
+//            // + 12 is just to make sure that last day is covered fully.
+//            {0, 0 + 11 * 3600 * 24 + 12, 11},
+        }))
+);
+
diff --git a/base/common/tests/gtest_find_symbols.cpp b/src/Common/tests/gtest_find_symbols.cpp
similarity index 100%
rename from base/common/tests/gtest_find_symbols.cpp
rename to src/Common/tests/gtest_find_symbols.cpp
diff --git a/src/Common/tests/gtest_global_context.h b/src/Common/tests/gtest_global_context.h
index b6529f09b46..30ebf1dbca9 100644
--- a/src/Common/tests/gtest_global_context.h
+++ b/src/Common/tests/gtest_global_context.h
@@ -5,14 +5,14 @@
 struct ContextHolder
 {
     DB::SharedContextHolder shared_context;
-    DB::Context context;
+    DB::ContextPtr context;
 
     ContextHolder()
         : shared_context(DB::Context::createShared())
         , context(DB::Context::createGlobal(shared_context.get()))
     {
-        context.makeGlobalContext();
-        context.setPath("./");
+        context->makeGlobalContext();
+        context->setPath("./");
     }
 
     ContextHolder(ContextHolder &&) = default;
diff --git a/src/Common/tests/gtest_json_test.cpp b/src/Common/tests/gtest_json_test.cpp
new file mode 100644
index 00000000000..726fb836030
--- /dev/null
+++ b/src/Common/tests/gtest_json_test.cpp
@@ -0,0 +1,656 @@
+#include <vector>
+#include <string>
+#include <exception>
+#include <string_view>
+#include <common/JSON.h>
+
+#include <boost/range/irange.hpp>
+#include <gtest/gtest.h>
+
+
+enum class ResultType
+{
+    Return,
+    Throw
+};
+
+struct GetStringTestRecord
+{
+    std::string_view input;
+    ResultType result_type;
+    std::string_view result;
+};
+
+TEST(JSONSuite, SimpleTest)
+{
+    using namespace std::literals;
+
+    std::vector<GetStringTestRecord> test_data =
+    {
+        { R"("name")"sv, ResultType::Return, "name"sv },
+        { R"("Вафельница Vitek WX-1102 FL")"sv, ResultType::Return, "Вафельница Vitek WX-1102 FL"sv },
+        { R"("brand")"sv, ResultType::Return, "brand"sv },
+        { R"("184509")"sv, ResultType::Return, "184509"sv },
+        { R"("category")"sv, ResultType::Return, "category"sv },
+        { R"("Все для детей/Детская техника/Vitek")"sv, ResultType::Return, "Все для детей/Детская техника/Vitek"sv },
+        { R"("variant")"sv, ResultType::Return, "variant"sv },
+        { R"("В наличии")"sv, ResultType::Return, "В наличии"sv },
+        { R"("price")"sv, ResultType::Return, "price"sv },
+        { R"("2390.00")"sv, ResultType::Return, "2390.00"sv },
+        { R"("list")"sv, ResultType::Return, "list"sv },
+        { R"("Карточка")"sv, ResultType::Return, "Карточка"sv },
+        { R"("position")"sv, ResultType::Return, "position"sv },
+        { R"("detail")"sv, ResultType::Return, "detail"sv },
+        { R"("actionField")"sv, ResultType::Return, "actionField"sv },
+        { R"("list")"sv, ResultType::Return, "list"sv },
+        { R"("http://www.techport.ru/q/?t=вафельница&sort=price&sdim=asc")"sv, ResultType::Return, "http://www.techport.ru/q/?t=вафельница&sort=price&sdim=asc"sv },
+        { R"("action")"sv, ResultType::Return, "action"sv },
+        { R"("detail")"sv, ResultType::Return, "detail"sv },
+        { R"("products")"sv, ResultType::Return, "products"sv },
+        { R"("name")"sv, ResultType::Return, "name"sv },
+        { R"("Вафельница Vitek WX-1102 FL")"sv, ResultType::Return, "Вафельница Vitek WX-1102 FL"sv },
+        { R"("id")"sv, ResultType::Return, "id"sv },
+        { R"("184509")"sv, ResultType::Return, "184509"sv },
+        { R"("price")"sv, ResultType::Return, "price"sv },
+        { R"("2390.00")"sv, ResultType::Return, "2390.00"sv },
+        { R"("brand")"sv, ResultType::Return, "brand"sv },
+        { R"("Vitek")"sv, ResultType::Return, "Vitek"sv },
+        { R"("category")"sv, ResultType::Return, "category"sv },
+        { R"("Все для детей/Детская техника/Vitek")"sv, ResultType::Return, "Все для детей/Детская техника/Vitek"sv },
+        { R"("variant")"sv, ResultType::Return, "variant"sv },
+        { R"("В наличии")"sv, ResultType::Return, "В наличии"sv },
+        { R"("ru")"sv, ResultType::Return, "ru"sv },
+        { R"("experiments")"sv, ResultType::Return, "experiments"sv },
+        { R"("lang")"sv, ResultType::Return, "lang"sv },
+        { R"("ru")"sv, ResultType::Return, "ru"sv },
+        { R"("los_portal")"sv, ResultType::Return, "los_portal"sv },
+        { R"("los_level")"sv, ResultType::Return, "los_level"sv },
+        { R"("none")"sv, ResultType::Return, "none"sv },
+        { R"("isAuthorized")"sv, ResultType::Return, "isAuthorized"sv },
+        { R"("isSubscriber")"sv, ResultType::Return, "isSubscriber"sv },
+        { R"("postType")"sv, ResultType::Return, "postType"sv },
+        { R"("Новости")"sv, ResultType::Return, "Новости"sv },
+        { R"("experiments")"sv, ResultType::Return, "experiments"sv },
+        { R"("lang")"sv, ResultType::Return, "lang"sv },
+        { R"("ru")"sv, ResultType::Return, "ru"sv },
+        { R"("los_portal")"sv, ResultType::Return, "los_portal"sv },
+        { R"("los_level")"sv, ResultType::Return, "los_level"sv },
+        { R"("none")"sv, ResultType::Return, "none"sv },
+        { R"("lang")"sv, ResultType::Return, "lang"sv },
+        { R"("ru")"sv, ResultType::Return, "ru"sv },
+        { R"("Электроплита GEFEST Брест ЭПНД 5140-01 0001")"sv, ResultType::Return, "Электроплита GEFEST Брест ЭПНД 5140-01 0001"sv },
+        { R"("price")"sv, ResultType::Return, "price"sv },
+        { R"("currencyCode")"sv, ResultType::Return, "currencyCode"sv },
+        { R"("RUB")"sv, ResultType::Return, "RUB"sv },
+        { R"("lang")"sv, ResultType::Return, "lang"sv },
+        { R"("ru")"sv, ResultType::Return, "ru"sv },
+        { R"("experiments")"sv, ResultType::Return, "experiments"sv },
+        { R"("lang")"sv, ResultType::Return, "lang"sv },
+        { R"("ru")"sv, ResultType::Return, "ru"sv },
+        { R"("los_portal")"sv, ResultType::Return, "los_portal"sv },
+        { R"("los_level")"sv, ResultType::Return, "los_level"sv },
+        { R"("none")"sv, ResultType::Return, "none"sv },
+        { R"("trash_login")"sv, ResultType::Return, "trash_login"sv },
+        { R"("novikoff")"sv, ResultType::Return, "novikoff"sv },
+        { R"("trash_cat_link")"sv, ResultType::Return, "trash_cat_link"sv },
+        { R"("progs")"sv, ResultType::Return, "progs"sv },
+        { R"("trash_parent_link")"sv, ResultType::Return, "trash_parent_link"sv },
+        { R"("content")"sv, ResultType::Return, "content"sv },
+        { R"("trash_posted_parent")"sv, ResultType::Return, "trash_posted_parent"sv },
+        { R"("content.01.2016")"sv, ResultType::Return, "content.01.2016"sv },
+        { R"("trash_posted_cat")"sv, ResultType::Return, "trash_posted_cat"sv },
+        { R"("progs.01.2016")"sv, ResultType::Return, "progs.01.2016"sv },
+        { R"("trash_virus_count")"sv, ResultType::Return, "trash_virus_count"sv },
+        { R"("trash_is_android")"sv, ResultType::Return, "trash_is_android"sv },
+        { R"("trash_is_wp8")"sv, ResultType::Return, "trash_is_wp8"sv },
+        { R"("trash_is_ios")"sv, ResultType::Return, "trash_is_ios"sv },
+        { R"("trash_posted")"sv, ResultType::Return, "trash_posted"sv },
+        { R"("01.2016")"sv, ResultType::Return, "01.2016"sv },
+        { R"("experiments")"sv, ResultType::Return, "experiments"sv },
+        { R"("lang")"sv, ResultType::Return, "lang"sv },
+        { R"("ru")"sv, ResultType::Return, "ru"sv },
+        { R"("los_portal")"sv, ResultType::Return, "los_portal"sv },
+        { R"("los_level")"sv, ResultType::Return, "los_level"sv },
+        { R"("none")"sv, ResultType::Return, "none"sv },
+        { R"("merchantId")"sv, ResultType::Return, "merchantId"sv },
+        { R"("13694_49246")"sv, ResultType::Return, "13694_49246"sv },
+        { R"("cps-source")"sv, ResultType::Return, "cps-source"sv },
+        { R"("wargaming")"sv, ResultType::Return, "wargaming"sv },
+        { R"("cps_provider")"sv, ResultType::Return, "cps_provider"sv },
+        { R"("default")"sv, ResultType::Return, "default"sv },
+        { R"("errorReason")"sv, ResultType::Return, "errorReason"sv },
+        { R"("no errors")"sv, ResultType::Return, "no errors"sv },
+        { R"("scid")"sv, ResultType::Return, "scid"sv },
+        { R"("isAuthPayment")"sv, ResultType::Return, "isAuthPayment"sv },
+        { R"("lang")"sv, ResultType::Return, "lang"sv },
+        { R"("ru")"sv, ResultType::Return, "ru"sv },
+        { R"("rubric")"sv, ResultType::Return, "rubric"sv },
+        { R"("")"sv, ResultType::Return, ""sv },
+        { R"("rubric")"sv, ResultType::Return, "rubric"sv },
+        { R"("Мир")"sv, ResultType::Return, "Мир"sv },
+        { R"("lang")"sv, ResultType::Return, "lang"sv },
+        { R"("ru")"sv, ResultType::Return, "ru"sv },
+        { R"("experiments")"sv, ResultType::Return, "experiments"sv },
+        { R"("lang")"sv, ResultType::Return, "lang"sv },
+        { R"("ru")"sv, ResultType::Return, "ru"sv },
+        { R"("los_portal")"sv, ResultType::Return, "los_portal"sv },
+        { R"("los_level")"sv, ResultType::Return, "los_level"sv },
+        { R"("none")"sv, ResultType::Return, "none"sv },
+        { R"("lang")"sv, ResultType::Return, "lang"sv },
+        { R"("ru")"sv, ResultType::Return, "ru"sv },
+        { R"("__ym")"sv, ResultType::Return, "__ym"sv },
+        { R"("ecommerce")"sv, ResultType::Return, "ecommerce"sv },
+        { R"("impressions")"sv, ResultType::Return, "impressions"sv },
+        { R"("id")"sv, ResultType::Return, "id"sv },
+        { R"("863813")"sv, ResultType::Return, "863813"sv },
+        { R"("name")"sv, ResultType::Return, "name"sv },
+        { R"("Футболка детская 3D Happy, возраст 1-2 года, трикотаж")"sv, ResultType::Return, "Футболка детская 3D Happy, возраст 1-2 года, трикотаж"sv },
+        { R"("category")"sv, ResultType::Return, "category"sv },
+        { R"("/Летние товары/Летний текстиль/")"sv, ResultType::Return, "/Летние товары/Летний текстиль/"sv },
+        { R"("variant")"sv, ResultType::Return, "variant"sv },
+        { R"("")"sv, ResultType::Return, ""sv },
+        { R"("price")"sv, ResultType::Return, "price"sv },
+        { R"("390.00")"sv, ResultType::Return, "390.00"sv },
+        { R"("list")"sv, ResultType::Return, "list"sv },
+        { R"("/retailrocket/")"sv, ResultType::Return, "/retailrocket/"sv },
+        { R"("position")"sv, ResultType::Return, "position"sv },
+        { R"("brand")"sv, ResultType::Return, "brand"sv },
+        { R"("/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/")"sv, ResultType::Return, "/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/"sv },
+        { R"("id")"sv, ResultType::Return, "id"sv },
+        { R"("863839")"sv, ResultType::Return, "863839"sv },
+        { R"("name")"sv, ResultType::Return, "name"sv },
+        { R"("Футболка детская 3D Pretty kitten, возраст 1-2 года, трикотаж")"sv, ResultType::Return, "Футболка детская 3D Pretty kitten, возраст 1-2 года, трикотаж"sv },
+        { R"("category")"sv, ResultType::Return, "category"sv },
+        { R"("/Летние товары/Летний текстиль/")"sv, ResultType::Return, "/Летние товары/Летний текстиль/"sv },
+        { R"("variant")"sv, ResultType::Return, "variant"sv },
+        { R"("")"sv, ResultType::Return, ""sv },
+        { R"("price")"sv, ResultType::Return, "price"sv },
+        { R"("390.00")"sv, ResultType::Return, "390.00"sv },
+        { R"("list")"sv, ResultType::Return, "list"sv },
+        { R"("/retailrocket/")"sv, ResultType::Return, "/retailrocket/"sv },
+        { R"("position")"sv, ResultType::Return, "position"sv },
+        { R"("brand")"sv, ResultType::Return, "brand"sv },
+        { R"("/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/")"sv, ResultType::Return, "/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/"sv },
+        { R"("id")"sv, ResultType::Return, "id"sv },
+        { R"("863847")"sv, ResultType::Return, "863847"sv },
+        { R"("name")"sv, ResultType::Return, "name"sv },
+        { R"("Футболка детская 3D Little tiger, возраст 1-2 года, трикотаж")"sv, ResultType::Return, "Футболка детская 3D Little tiger, возраст 1-2 года, трикотаж"sv },
+        { R"("category")"sv, ResultType::Return, "category"sv },
+        { R"("/Летние товары/Летний текстиль/")"sv, ResultType::Return, "/Летние товары/Летний текстиль/"sv },
+        { R"("variant")"sv, ResultType::Return, "variant"sv },
+        { R"("")"sv, ResultType::Return, ""sv },
+        { R"("price")"sv, ResultType::Return, "price"sv },
+        { R"("390.00")"sv, ResultType::Return, "390.00"sv },
+        { R"("list")"sv, ResultType::Return, "list"sv },
+        { R"("/retailrocket/")"sv, ResultType::Return, "/retailrocket/"sv },
+        { R"("position")"sv, ResultType::Return, "position"sv },
+        { R"("brand")"sv, ResultType::Return, "brand"sv },
+        { R"("/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/")"sv, ResultType::Return, "/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/"sv },
+        { R"("id")"sv, ResultType::Return, "id"sv },
+        { R"("911480")"sv, ResultType::Return, "911480"sv },
+        { R"("name")"sv, ResultType::Return, "name"sv },
+        { R"("Футболка детская 3D Puppy, возраст 1-2 года, трикотаж")"sv, ResultType::Return, "Футболка детская 3D Puppy, возраст 1-2 года, трикотаж"sv },
+        { R"("category")"sv, ResultType::Return, "category"sv },
+        { R"("/Летние товары/Летний текстиль/")"sv, ResultType::Return, "/Летние товары/Летний текстиль/"sv },
+        { R"("variant")"sv, ResultType::Return, "variant"sv },
+        { R"("")"sv, ResultType::Return, ""sv },
+        { R"("price")"sv, ResultType::Return, "price"sv },
+        { R"("390.00")"sv, ResultType::Return, "390.00"sv },
+        { R"("list")"sv, ResultType::Return, "list"sv },
+        { R"("/retailrocket/")"sv, ResultType::Return, "/retailrocket/"sv },
+        { R"("position")"sv, ResultType::Return, "position"sv },
+        { R"("brand")"sv, ResultType::Return, "brand"sv },
+        { R"("/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/")"sv, ResultType::Return, "/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/"sv },
+        { R"("id")"sv, ResultType::Return, "id"sv },
+        { R"("911484")"sv, ResultType::Return, "911484"sv },
+        { R"("name")"sv, ResultType::Return, "name"sv },
+        { R"("Футболка детская 3D Little bears, возраст 1-2 года, трикотаж")"sv, ResultType::Return, "Футболка детская 3D Little bears, возраст 1-2 года, трикотаж"sv },
+        { R"("category")"sv, ResultType::Return, "category"sv },
+        { R"("/Летние товары/Летний текстиль/")"sv, ResultType::Return, "/Летние товары/Летний текстиль/"sv },
+        { R"("variant")"sv, ResultType::Return, "variant"sv },
+        { R"("")"sv, ResultType::Return, ""sv },
+        { R"("price")"sv, ResultType::Return, "price"sv },
+        { R"("390.00")"sv, ResultType::Return, "390.00"sv },
+        { R"("list")"sv, ResultType::Return, "list"sv },
+        { R"("/retailrocket/")"sv, ResultType::Return, "/retailrocket/"sv },
+        { R"("position")"sv, ResultType::Return, "position"sv },
+        { R"("brand")"sv, ResultType::Return, "brand"sv },
+        { R"("/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/")"sv, ResultType::Return, "/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/"sv },
+        { R"("id")"sv, ResultType::Return, "id"sv },
+        { R"("911489")"sv, ResultType::Return, "911489"sv },
+        { R"("name")"sv, ResultType::Return, "name"sv },
+        { R"("Футболка детская 3D Dolphin, возраст 2-4 года, трикотаж")"sv, ResultType::Return, "Футболка детская 3D Dolphin, возраст 2-4 года, трикотаж"sv },
+        { R"("category")"sv, ResultType::Return, "category"sv },
+        { R"("/Летние товары/Летний текстиль/")"sv, ResultType::Return, "/Летние товары/Летний текстиль/"sv },
+        { R"("variant")"sv, ResultType::Return, "variant"sv },
+        { R"("")"sv, ResultType::Return, ""sv },
+        { R"("price")"sv, ResultType::Return, "price"sv },
+        { R"("390.00")"sv, ResultType::Return, "390.00"sv },
+        { R"("list")"sv, ResultType::Return, "list"sv },
+        { R"("/retailrocket/")"sv, ResultType::Return, "/retailrocket/"sv },
+        { R"("position")"sv, ResultType::Return, "position"sv },
+        { R"("brand")"sv, ResultType::Return, "brand"sv },
+        { R"("/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/")"sv, ResultType::Return, "/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/"sv },
+        { R"("id")"sv, ResultType::Return, "id"sv },
+        { R"("911496")"sv, ResultType::Return, "911496"sv },
+        { R"("name")"sv, ResultType::Return, "name"sv },
+        { R"("Футболка детская 3D Pretty, возраст 1-2 года, трикотаж")"sv, ResultType::Return, "Футболка детская 3D Pretty, возраст 1-2 года, трикотаж"sv },
+        { R"("category")"sv, ResultType::Return, "category"sv },
+        { R"("/Летние товары/Летний текстиль/")"sv, ResultType::Return, "/Летние товары/Летний текстиль/"sv },
+        { R"("variant")"sv, ResultType::Return, "variant"sv },
+        { R"("")"sv, ResultType::Return, ""sv },
+        { R"("price")"sv, ResultType::Return, "price"sv },
+        { R"("390.00")"sv, ResultType::Return, "390.00"sv },
+        { R"("list")"sv, ResultType::Return, "list"sv },
+        { R"("/retailrocket/")"sv, ResultType::Return, "/retailrocket/"sv },
+        { R"("position")"sv, ResultType::Return, "position"sv },
+        { R"("brand")"sv, ResultType::Return, "brand"sv },
+        { R"("/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/")"sv, ResultType::Return, "/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/"sv },
+        { R"("id")"sv, ResultType::Return, "id"sv },
+        { R"("911504")"sv, ResultType::Return, "911504"sv },
+        { R"("name")"sv, ResultType::Return, "name"sv },
+        { R"("Футболка детская 3D Fairytale, возраст 1-2 года, трикотаж")"sv, ResultType::Return, "Футболка детская 3D Fairytale, возраст 1-2 года, трикотаж"sv },
+        { R"("category")"sv, ResultType::Return, "category"sv },
+        { R"("/Летние товары/Летний текстиль/")"sv, ResultType::Return, "/Летние товары/Летний текстиль/"sv },
+        { R"("variant")"sv, ResultType::Return, "variant"sv },
+        { R"("")"sv, ResultType::Return, ""sv },
+        { R"("price")"sv, ResultType::Return, "price"sv },
+        { R"("390.00")"sv, ResultType::Return, "390.00"sv },
+        { R"("list")"sv, ResultType::Return, "list"sv },
+        { R"("/retailrocket/")"sv, ResultType::Return, "/retailrocket/"sv },
+        { R"("position")"sv, ResultType::Return, "position"sv },
+        { R"("brand")"sv, ResultType::Return, "brand"sv },
+        { R"("/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/")"sv, ResultType::Return, "/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/"sv },
+        { R"("id")"sv, ResultType::Return, "id"sv },
+        { R"("911508")"sv, ResultType::Return, "911508"sv },
+        { R"("name")"sv, ResultType::Return, "name"sv },
+        { R"("Футболка детская 3D Kittens, возраст 1-2 года, трикотаж")"sv, ResultType::Return, "Футболка детская 3D Kittens, возраст 1-2 года, трикотаж"sv },
+        { R"("category")"sv, ResultType::Return, "category"sv },
+        { R"("/Летние товары/Летний текстиль/")"sv, ResultType::Return, "/Летние товары/Летний текстиль/"sv },
+        { R"("variant")"sv, ResultType::Return, "variant"sv },
+        { R"("")"sv, ResultType::Return, ""sv },
+        { R"("price")"sv, ResultType::Return, "price"sv },
+        { R"("390.00")"sv, ResultType::Return, "390.00"sv },
+        { R"("list")"sv, ResultType::Return, "list"sv },
+        { R"("/retailrocket/")"sv, ResultType::Return, "/retailrocket/"sv },
+        { R"("position")"sv, ResultType::Return, "position"sv },
+        { R"("brand")"sv, ResultType::Return, "brand"sv },
+        { R"("/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/")"sv, ResultType::Return, "/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/"sv },
+        { R"("id")"sv, ResultType::Return, "id"sv },
+        { R"("911512")"sv, ResultType::Return, "911512"sv },
+        { R"("name")"sv, ResultType::Return, "name"sv },
+        { R"("Футболка детская 3D Sunshine, возраст 1-2 года, трикотаж")"sv, ResultType::Return, "Футболка детская 3D Sunshine, возраст 1-2 года, трикотаж"sv },
+        { R"("category")"sv, ResultType::Return, "category"sv },
+        { R"("/Летние товары/Летний текстиль/")"sv, ResultType::Return, "/Летние товары/Летний текстиль/"sv },
+        { R"("variant")"sv, ResultType::Return, "variant"sv },
+        { R"("")"sv, ResultType::Return, ""sv },
+        { R"("price")"sv, ResultType::Return, "price"sv },
+        { R"("390.00")"sv, ResultType::Return, "390.00"sv },
+        { R"("list")"sv, ResultType::Return, "list"sv },
+        { R"("/retailrocket/")"sv, ResultType::Return, "/retailrocket/"sv },
+        { R"("position")"sv, ResultType::Return, "position"sv },
+        { R"("brand")"sv, ResultType::Return, "brand"sv },
+        { R"("/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/")"sv, ResultType::Return, "/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/"sv },
+        { R"("id")"sv, ResultType::Return, "id"sv },
+        { R"("911516")"sv, ResultType::Return, "911516"sv },
+        { R"("name")"sv, ResultType::Return, "name"sv },
+        { R"("Футболка детская 3D Dog in bag, возраст 1-2 года, трикотаж")"sv, ResultType::Return, "Футболка детская 3D Dog in bag, возраст 1-2 года, трикотаж"sv },
+        { R"("category")"sv, ResultType::Return, "category"sv },
+        { R"("/Летние товары/Летний текстиль/")"sv, ResultType::Return, "/Летние товары/Летний текстиль/"sv },
+        { R"("variant")"sv, ResultType::Return, "variant"sv },
+        { R"("")"sv, ResultType::Return, ""sv },
+        { R"("price")"sv, ResultType::Return, "price"sv },
+        { R"("390.00")"sv, ResultType::Return, "390.00"sv },
+        { R"("list")"sv, ResultType::Return, "list"sv },
+        { R"("/retailrocket/")"sv, ResultType::Return, "/retailrocket/"sv },
+        { R"("position")"sv, ResultType::Return, "position"sv },
+        { R"("brand")"sv, ResultType::Return, "brand"sv },
+        { R"("/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/")"sv, ResultType::Return, "/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/"sv },
+        { R"("id")"sv, ResultType::Return, "id"sv },
+        { R"("911520")"sv, ResultType::Return, "911520"sv },
+        { R"("name")"sv, ResultType::Return, "name"sv },
+        { R"("Футболка детская 3D Cute puppy, возраст 1-2 года, трикотаж")"sv, ResultType::Return, "Футболка детская 3D Cute puppy, возраст 1-2 года, трикотаж"sv },
+        { R"("category")"sv, ResultType::Return, "category"sv },
+        { R"("/Летние товары/Летний текстиль/")"sv, ResultType::Return, "/Летние товары/Летний текстиль/"sv },
+        { R"("variant")"sv, ResultType::Return, "variant"sv },
+        { R"("")"sv, ResultType::Return, ""sv },
+        { R"("price")"sv, ResultType::Return, "price"sv },
+        { R"("390.00")"sv, ResultType::Return, "390.00"sv },
+        { R"("list")"sv, ResultType::Return, "list"sv },
+        { R"("/retailrocket/")"sv, ResultType::Return, "/retailrocket/"sv },
+        { R"("position")"sv, ResultType::Return, "position"sv },
+        { R"("brand")"sv, ResultType::Return, "brand"sv },
+        { R"("/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/")"sv, ResultType::Return, "/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/"sv },
+        { R"("id")"sv, ResultType::Return, "id"sv },
+        { R"("911524")"sv, ResultType::Return, "911524"sv },
+        { R"("name")"sv, ResultType::Return, "name"sv },
+        { R"("Футболка детская 3D Rabbit, возраст 1-2 года, трикотаж")"sv, ResultType::Return, "Футболка детская 3D Rabbit, возраст 1-2 года, трикотаж"sv },
+        { R"("category")"sv, ResultType::Return, "category"sv },
+        { R"("/Летние товары/Летний текстиль/")"sv, ResultType::Return, "/Летние товары/Летний текстиль/"sv },
+        { R"("variant")"sv, ResultType::Return, "variant"sv },
+        { R"("")"sv, ResultType::Return, ""sv },
+        { R"("price")"sv, ResultType::Return, "price"sv },
+        { R"("390.00")"sv, ResultType::Return, "390.00"sv },
+        { R"("list")"sv, ResultType::Return, "list"sv },
+        { R"("/retailrocket/")"sv, ResultType::Return, "/retailrocket/"sv },
+        { R"("position")"sv, ResultType::Return, "position"sv },
+        { R"("brand")"sv, ResultType::Return, "brand"sv },
+        { R"("/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/")"sv, ResultType::Return, "/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/"sv },
+        { R"("id")"sv, ResultType::Return, "id"sv },
+        { R"("911528")"sv, ResultType::Return, "911528"sv },
+        { R"("name")"sv, ResultType::Return, "name"sv },
+        { R"("Футболка детская 3D Turtle, возраст 1-2 года, трикотаж")"sv, ResultType::Return, "Футболка детская 3D Turtle, возраст 1-2 года, трикотаж"sv },
+        { R"("category")"sv, ResultType::Return, "category"sv },
+        { R"("/Летние товары/Летний текстиль/")"sv, ResultType::Return, "/Летние товары/Летний текстиль/"sv },
+        { R"("variant")"sv, ResultType::Return, "variant"sv },
+        { R"("")"sv, ResultType::Return, ""sv },
+        { R"("price")"sv, ResultType::Return, "price"sv },
+        { R"("390.00")"sv, ResultType::Return, "390.00"sv },
+        { R"("list")"sv, ResultType::Return, "list"sv },
+        { R"("/retailrocket/")"sv, ResultType::Return, "/retailrocket/"sv },
+        { R"("position")"sv, ResultType::Return, "position"sv },
+        { R"("brand")"sv, ResultType::Return, "brand"sv },
+        { R"("/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/")"sv, ResultType::Return, "/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/"sv },
+        { R"("id")"sv, ResultType::Return, "id"sv },
+        { R"("888616")"sv, ResultType::Return, "888616"sv },
+        { R"("name")"sv, ResultType::Return, "name"sv },
+        { "\"3Д Футболка мужская \\\"Collorista\\\" Светлое завтра р-р XL(52-54), 100% хлопок, трикотаж\""sv, ResultType::Return, "3Д Футболка мужская \"Collorista\" Светлое завтра р-р XL(52-54), 100% хлопок, трикотаж"sv },
+        { R"("category")"sv, ResultType::Return, "category"sv },
+        { R"("/Одежда и обувь/Мужская одежда/Футболки/")"sv, ResultType::Return, "/Одежда и обувь/Мужская одежда/Футболки/"sv },
+        { R"("variant")"sv, ResultType::Return, "variant"sv },
+        { R"("")"sv, ResultType::Return, ""sv },
+        { R"("price")"sv, ResultType::Return, "price"sv },
+        { R"("406.60")"sv, ResultType::Return, "406.60"sv },
+        { R"("list")"sv, ResultType::Return, "list"sv },
+        { R"("/retailrocket/")"sv, ResultType::Return, "/retailrocket/"sv },
+        { R"("position")"sv, ResultType::Return, "position"sv },
+        { R"("brand")"sv, ResultType::Return, "brand"sv },
+        { R"("/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/")"sv, ResultType::Return, "/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/"sv },
+        { R"("id")"sv, ResultType::Return, "id"sv },
+        { R"("913361")"sv, ResultType::Return, "913361"sv },
+        { R"("name")"sv, ResultType::Return, "name"sv },
+        { R"("3Д Футболка детская World р-р 8-10, 100% хлопок, трикотаж")"sv, ResultType::Return, "3Д Футболка детская World р-р 8-10, 100% хлопок, трикотаж"sv },
+        { R"("category")"sv, ResultType::Return, "category"sv },
+        { R"("/Летние товары/Летний текстиль/")"sv, ResultType::Return, "/Летние товары/Летний текстиль/"sv },
+        { R"("variant")"sv, ResultType::Return, "variant"sv },
+        { R"("")"sv, ResultType::Return, ""sv },
+        { R"("price")"sv, ResultType::Return, "price"sv },
+        { R"("470.00")"sv, ResultType::Return, "470.00"sv },
+        { R"("list")"sv, ResultType::Return, "list"sv },
+        { R"("/retailrocket/")"sv, ResultType::Return, "/retailrocket/"sv },
+        { R"("position")"sv, ResultType::Return, "position"sv },
+        { R"("brand")"sv, ResultType::Return, "brand"sv },
+        { R"("/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/")"sv, ResultType::Return, "/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/"sv },
+        { R"("id")"sv, ResultType::Return, "id"sv },
+        { R"("913364")"sv, ResultType::Return, "913364"sv },
+        { R"("name")"sv, ResultType::Return, "name"sv },
+        { R"("3Д Футболка детская Force р-р 8-10, 100% хлопок, трикотаж")"sv, ResultType::Return, "3Д Футболка детская Force р-р 8-10, 100% хлопок, трикотаж"sv },
+        { R"("category")"sv, ResultType::Return, "category"sv },
+        { R"("/Летние товары/Летний текстиль/")"sv, ResultType::Return, "/Летние товары/Летний текстиль/"sv },
+        { R"("variant")"sv, ResultType::Return, "variant"sv },
+        { R"("")"sv, ResultType::Return, ""sv },
+        { R"("price")"sv, ResultType::Return, "price"sv },
+        { R"("470.00")"sv, ResultType::Return, "470.00"sv },
+        { R"("list")"sv, ResultType::Return, "list"sv },
+        { R"("/retailrocket/")"sv, ResultType::Return, "/retailrocket/"sv },
+        { R"("position")"sv, ResultType::Return, "position"sv },
+        { R"("brand")"sv, ResultType::Return, "brand"sv },
+        { R"("/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/")"sv, ResultType::Return, "/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/"sv },
+        { R"("id")"sv, ResultType::Return, "id"sv },
+        { R"("913367")"sv, ResultType::Return, "913367"sv },
+        { R"("name")"sv, ResultType::Return, "name"sv },
+        { R"("3Д Футболка детская Winter tale р-р 8-10, 100% хлопок, трикотаж")"sv, ResultType::Return, "3Д Футболка детская Winter tale р-р 8-10, 100% хлопок, трикотаж"sv },
+        { R"("category")"sv, ResultType::Return, "category"sv },
+        { R"("/Летние товары/Летний текстиль/")"sv, ResultType::Return, "/Летние товары/Летний текстиль/"sv },
+        { R"("variant")"sv, ResultType::Return, "variant"sv },
+        { R"("")"sv, ResultType::Return, ""sv },
+        { R"("price")"sv, ResultType::Return, "price"sv },
+        { R"("470.00")"sv, ResultType::Return, "470.00"sv },
+        { R"("list")"sv, ResultType::Return, "list"sv },
+        { R"("/retailrocket/")"sv, ResultType::Return, "/retailrocket/"sv },
+        { R"("position")"sv, ResultType::Return, "position"sv },
+        { R"("brand")"sv, ResultType::Return, "brand"sv },
+        { R"("/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/")"sv, ResultType::Return, "/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/"sv },
+        { R"("id")"sv, ResultType::Return, "id"sv },
+        { R"("913385")"sv, ResultType::Return, "913385"sv },
+        { R"("name")"sv, ResultType::Return, "name"sv },
+        { R"("3Д Футболка детская Moonshine р-р 8-10, 100% хлопок, трикотаж")"sv, ResultType::Return, "3Д Футболка детская Moonshine р-р 8-10, 100% хлопок, трикотаж"sv },
+        { R"("category")"sv, ResultType::Return, "category"sv },
+        { R"("/Летние товары/Летний текстиль/")"sv, ResultType::Return, "/Летние товары/Летний текстиль/"sv },
+        { R"("variant")"sv, ResultType::Return, "variant"sv },
+        { R"("")"sv, ResultType::Return, ""sv },
+        { R"("price")"sv, ResultType::Return, "price"sv },
+        { R"("470.00")"sv, ResultType::Return, "470.00"sv },
+        { R"("list")"sv, ResultType::Return, "list"sv },
+        { R"("/retailrocket/")"sv, ResultType::Return, "/retailrocket/"sv },
+        { R"("position")"sv, ResultType::Return, "position"sv },
+        { R"("brand")"sv, ResultType::Return, "brand"sv },
+        { R"("/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/")"sv, ResultType::Return, "/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/"sv },
+        { R"("id")"sv, ResultType::Return, "id"sv },
+        { R"("913391")"sv, ResultType::Return, "913391"sv },
+        { R"("name")"sv, ResultType::Return, "name"sv },
+        { R"("3Д Футболка детская Shaman р-р 8-10, 100% хлопок, трикотаж")"sv, ResultType::Return, "3Д Футболка детская Shaman р-р 8-10, 100% хлопок, трикотаж"sv },
+        { R"("category")"sv, ResultType::Return, "category"sv },
+        { R"("/Летние товары/Летний текстиль/")"sv, ResultType::Return, "/Летние товары/Летний текстиль/"sv },
+        { R"("variant")"sv, ResultType::Return, "variant"sv },
+        { R"("")"sv, ResultType::Return, ""sv },
+        { R"("price")"sv, ResultType::Return, "price"sv },
+        { R"("470.00")"sv, ResultType::Return, "470.00"sv },
+        { R"("list")"sv, ResultType::Return, "list"sv },
+        { R"("/retailrocket/")"sv, ResultType::Return, "/retailrocket/"sv },
+        { R"("position")"sv, ResultType::Return, "position"sv },
+        { R"("brand")"sv, ResultType::Return, "brand"sv },
+        { R"("/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/")"sv, ResultType::Return, "/911488/futbolka-detskaya-3d-dolphin-vozrast-1-2-goda-trikotazh/"sv },
+        { R"("usertype")"sv, ResultType::Return, "usertype"sv },
+        { R"("visitor")"sv, ResultType::Return, "visitor"sv },
+        { R"("lang")"sv, ResultType::Return, "lang"sv },
+        { R"("ru")"sv, ResultType::Return, "ru"sv },
+        { R"("__ym")"sv, ResultType::Return, "__ym"sv },
+        { R"("ecommerce")"sv, ResultType::Return, "ecommerce"sv },
+        { R"("impressions")"sv, ResultType::Return, "impressions"sv },
+        { R"("experiments")"sv, ResultType::Return, "experiments"sv },
+        { R"("lang")"sv, ResultType::Return, "lang"sv },
+        { R"("ru")"sv, ResultType::Return, "ru"sv },
+        { R"("los_portal")"sv, ResultType::Return, "los_portal"sv },
+        { R"("los_level")"sv, ResultType::Return, "los_level"sv },
+        { R"("none")"sv, ResultType::Return, "none"sv },
+        { R"("experiments")"sv, ResultType::Return, "experiments"sv },
+        { R"("lang")"sv, ResultType::Return, "lang"sv },
+        { R"("ru")"sv, ResultType::Return, "ru"sv },
+        { R"("los_portal")"sv, ResultType::Return, "los_portal"sv },
+        { R"("los_level")"sv, ResultType::Return, "los_level"sv },
+        { R"("none")"sv, ResultType::Return, "none"sv },
+        { R"("experiments")"sv, ResultType::Return, "experiments"sv },
+        { R"("lang")"sv, ResultType::Return, "lang"sv },
+        { R"("ru")"sv, ResultType::Return, "ru"sv },
+        { R"("los_portal")"sv, ResultType::Return, "los_portal"sv },
+        { R"("los_level")"sv, ResultType::Return, "los_level"sv },
+        { R"("none")"sv, ResultType::Return, "none"sv },
+        { R"("experiments")"sv, ResultType::Return, "experiments"sv },
+        { R"("lang")"sv, ResultType::Return, "lang"sv },
+        { R"("ru")"sv, ResultType::Return, "ru"sv },
+        { R"("los_portal")"sv, ResultType::Return, "los_portal"sv },
+        { R"("los_level")"sv, ResultType::Return, "los_level"sv },
+        { R"("none")"sv, ResultType::Return, "none"sv },
+        { R"("experiments")"sv, ResultType::Return, "experiments"sv },
+        { R"("lang")"sv, ResultType::Return, "lang"sv },
+        { R"("ru")"sv, ResultType::Return, "ru"sv },
+        { R"("los_portal")"sv, ResultType::Return, "los_portal"sv },
+        { R"("los_level")"sv, ResultType::Return, "los_level"sv },
+        { R"("none")"sv, ResultType::Return, "none"sv },
+        { R"("__ym")"sv, ResultType::Return, "__ym"sv },
+        { R"("ecommerce")"sv, ResultType::Return, "ecommerce"sv },
+        { R"("currencyCode")"sv, ResultType::Return, "currencyCode"sv },
+        { R"("RUR")"sv, ResultType::Return, "RUR"sv },
+        { R"("impressions")"sv, ResultType::Return, "impressions"sv },
+        { R"("name")"sv, ResultType::Return, "name"sv },
+        { R"("Чайник электрический Mystery MEK-1627, белый")"sv, ResultType::Return, "Чайник электрический Mystery MEK-1627, белый"sv },
+        { R"("brand")"sv, ResultType::Return, "brand"sv },
+        { R"("Mystery")"sv, ResultType::Return, "Mystery"sv },
+        { R"("id")"sv, ResultType::Return, "id"sv },
+        { R"("187180")"sv, ResultType::Return, "187180"sv },
+        { R"("category")"sv, ResultType::Return, "category"sv },
+        { R"("Мелкая бытовая техника/Мелкие кухонные приборы/Чайники электрические/Mystery")"sv, ResultType::Return, "Мелкая бытовая техника/Мелкие кухонные приборы/Чайники электрические/Mystery"sv },
+        { R"("variant")"sv, ResultType::Return, "variant"sv },
+        { R"("В наличии")"sv, ResultType::Return, "В наличии"sv },
+        { R"("price")"sv, ResultType::Return, "price"sv },
+        { R"("1630.00")"sv, ResultType::Return, "1630.00"sv },
+        { R"("list")"sv, ResultType::Return, "list"sv },
+        { R"("Карточка")"sv, ResultType::Return, "Карточка"sv },
+        { R"("position")"sv, ResultType::Return, "position"sv },
+        { R"("detail")"sv, ResultType::Return, "detail"sv },
+        { R"("actionField")"sv, ResultType::Return, "actionField"sv },
+        { R"("list")"sv, ResultType::Return, "list"sv },
+        { "\0\""sv, ResultType::Throw, "JSON: expected \", got \0"sv },
+        { "\"/igrushki/konstruktory\0"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"/1290414/komplekt-zhenskiy-dzhemper-plusbryuki-m-254-09-malina-plustemno-siniy-\0a"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"/Творчество/Рисование/Инструменты и кра\0a"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"Строительство и ремонт/Силовая техника/Зарядные устройства для автомобильных аккумуляторов/Пуско-зарядные устр\xD0\0a"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"Строительство и ремонт/Силовая техника/Зарядные устройств\xD0\0t"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"Строительство и ремонт/Силовая техника/Зарядные устройства для автомобиль\0k"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\0t"sv, ResultType::Throw, "JSON: expected \", got \0"sv },
+        { "\"/Хозтовары/Хранение вещей и организа\xD1\0t"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"/Хозтовары/Товары для стир\0a"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"li\0a"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"/734859/samolet-radioupravlyaemyy-istrebitel-rabotaet-o\0k"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"/kosmetika-i-parfyum/parfyumeriya/mu\0t"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"/ko\0\x04"sv, ResultType::Throw, "JSON: begin >= end."sv },
+        { ""sv, ResultType::Throw, "JSON: expected \", got \0"sv },
+        { "\"/stroitelstvo-i-remont/stroit\0t"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"/stroitelstvo-i-remont/stroitelnyy-instrument/av\0k"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"/s\0a"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"/Строительство и ремонт/Строительный инструмент/Изм\0e"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"/avto/soputstvuy\0l"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"/str\0\xD0"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"Отвертка 2 в 1 \\\"TUNDRA basic\\\" 5х75 мм (+,-) \0\xFF"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"/stroitelstvo-i-remont/stroitelnyy-instrument/avtoinstrumen\0\0"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"Мелкая бытовая техника/Мелки\xD0\0\0"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"Пряжа \\\"Бамбук стрейч\\0\0\0"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"Карандаш чёрнографитны\xD0\0\xD0"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"/Творчество/Рукоделие, аппликации/Пряжа и шерсть для \xD0\0l"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"/1071547/karandash-chernografitnyy-volshebstvo-nv-kruglyy-d-7-2mm-dl-176mm-plast-tuba/\0e"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"ca\0e"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"ca\0e"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"/1165424/chipbord-vyrubnoy-dlya-skrapbukinga-malyshi-mikki-maus-disney-bebi\0t"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"/posuda/kuhonnye-prinadlezhnosti-i-i\0d"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"/Канцтовары/Ежедневники и блокн\xD0\0\0"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"/kanctovary/ezhednevniki-i-blok\0a"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"Стакан \xD0\0a"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"Набор бумаги для скрапбукинга \\\"Мои первый годик\\\": Микки Маус, Дисней бэби, 12 листов 29.5 х 29.5 см, 160\0\x80"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"c\0\0"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"Органайзер для хранения аксессуаров, \0\0"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"quantity\00"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"Сменный блок для тетрадей на кольцах А5, 160 листов клетка, офсет \xE2\x84\0="sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"/Сувениры/Ф\xD0\0 "sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"\0\""sv, ResultType::Return, "\0"sv },
+        { "\"\0\x04"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"va\0\0"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"ca\0\0"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"В \0\x04"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"/letnie-tovary/z\0\x04"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"Посудомоечная машина Ha\0="sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"Крупная бытов\0\0"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"Полочная акустическая система Magnat Needl\0\0"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"brand\00"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"\0d"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"pos\0 "sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"c\0o"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"var\0\0"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"Телевизоры и видеотехника/Всё для домашних кинотеатр\0="sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"Флеш-диск Transcend JetFlash 620 8GB (TS8GJF62\0\0"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"Табурет Мег\0\xD0"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"variant\0\x04"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"Катал\xD0\0\""sv, ResultType::Return, "Катал\xD0\0"sv },
+        { "\"К\0\0"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"Полочная акустическая система Magnat Needl\0\0"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"brand\00"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"\0d"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"pos\0 "sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"c\0o"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"17\0o"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"/igrushki/razvivayusc\0 "sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"Ключница \\\"\0 "sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"/Игр\xD1\0 "sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"/Игрушки/Игрушки для девочек/Игровые модули дл\xD1\0o"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"Крупная бытовая техника/Стиральные машины/С фронт\xD0\0o"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\0 "sv, ResultType::Throw, "JSON: expected \", got \0"sv },
+        { "\"Светодиодная лента SMD3528, 5 м. IP33, 60LED, зеленый, 4,8W/мет\xD1\0 "sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"Сантехника/Мебель для ванных комнат/Стол\0o"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\0o"sv, ResultType::Throw, "JSON: expected \", got \0"sv },
+        { "\"/igrushki/konstruktory\0 "sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"/posuda/kuhonnye-prinadlezhnosti-i-instrumenty/kuhonnye-pr\0 "sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"/1290414/komplekt-zhenskiy-dzhemper-plusbryuki-m-254-09-malina-plustemno-siniy-\0o"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"/Творчество/Рисование/Инструменты и кра\0o"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"Строительство и ремонт/Силовая техника/Зарядные устройства для автомобильных аккумуляторов/Пуско-зарядные устр\xD0\0o"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"Строительство и ремонт/Силовая техника/Зарядные устройств\xD0\0 "sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"Строительство и ремонт/Силовая техника/Зарядные устройства для автомобиль\0d"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\0 "sv, ResultType::Throw, "JSON: expected \", got \0"sv },
+        { "\"/Хозтовары/Хранение вещей и организа\xD1\0 "sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"/Хозтовары/Товары для стир\0o"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"li\0o"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"/igrushki/igrus\0d"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"/734859/samolet-radioupravlyaemyy-istrebitel-rabotaet-o\0 "sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"/kosmetika-i-parfyum/parfyumeriya/mu\00"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"/ko\0\0"sv, ResultType::Throw, "JSON: begin >= end."sv },
+        { "\"/avto/avtomobilnyy\0\0"sv, ResultType::Throw, "JSON: begin >= end."sv },
+        { "\"/stroitelstvo-i-remont/stroit\00"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"/stroitelstvo-i-remont/stroitelnyy-instrument/av\0 "sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"/s\0d"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"/Строительство и ремонт/Строительный инструмент/Изм\0o"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"/avto/soputstvuy\0\""sv, ResultType::Return, "/avto/soputstvuy\0"sv },
+        { "\"/str\0k"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"Отвертка 2 в 1 \\\"TUNDRA basic\\\" 5х75 мм (+,-) \0\xD0"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"/stroitelstvo-i-remont/stroitelnyy-instrument/avtoinstrumen\0="sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"Чайник электрический Vitesse\0="sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"Мелкая бытовая техника/Мелки\xD0\0\xD0"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"Пряжа \\\"Бамбук стрейч\\0о"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"Карандаш чёрнографитны\xD0\0k"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"/Творчество/Рукоделие, аппликации/Пряжа и шерсть для \xD0\0\""sv, ResultType::Return, "/Творчество/Рукоделие, аппликации/Пряжа и шерсть для \xD0\0"sv },
+        { "\"/1071547/karandash-chernografitnyy-volshebstvo-nv-kruglyy-d-7-2mm-dl-176mm-plast-tuba/\0o"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"ca\0o"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"/Подаро\0o"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"Средство для прочис\xD1\0o"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"i\0o"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"/p\0\""sv, ResultType::Return, "/p\0"sv },
+        { "\"/Сувениры/Магниты, н\xD0\0k"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"Дерев\xD0\0="sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"/prazdniki/svadba/svadebnaya-c\0\xD0"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"/Канцт\0d"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"/Праздники/То\xD0\0 "sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"v\0 "sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"/Косметика \xD0\0d"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"/Спорт и отдых/Настольные игры/Покер, руле\xD1\0\xD0"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"categ\0="sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"/retailr\0k"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"/retailrocket\0k"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"Ежедневник недат А5 140л кл,ляссе,обл пв\0="sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"/432809/ezhednevnik-organayzer-sredniy-s-remeshkom-na-knopke-v-oblozhke-kalkulyator-kalendar-do-\0\xD0"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"/1165424/chipbord-vyrubnoy-dlya-skrapbukinga-malyshi-mikki-maus-disney-bebi\0d"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"/posuda/kuhonnye-prinadlezhnosti-i-i\0 "sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"/Канцтовары/Ежедневники и блокн\xD0\0o"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"/kanctovary/ezhednevniki-i-blok\00"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"Стакан \xD0\0\0"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"Набор бумаги для скрапбукинга \\\"Мои первый годик\\\": Микки Маус, Дисней бэби, 12 листов 29.5 х 29.5 см, 160\0\0"sv, ResultType::Throw, "JSON: incorrect syntax (expected end of string, found end of JSON)."sv },
+        { "\"c\0\""sv, ResultType::Return, "c\0"sv },
+    };
+
+    for (auto i : boost::irange(0, 1/*00000*/))
+    {
+        static_cast<void>(i);
+
+        for (auto & r : test_data)
+        {
+            try
+            {
+                JSON j(r.input.data(), r.input.data() + r.input.size());
+
+                ASSERT_EQ(j.getString(), r.result);
+                ASSERT_EQ(r.result_type, ResultType::Return);
+            }
+            catch (const JSONException &)
+            {
+                ASSERT_EQ(r.result_type, ResultType::Throw);
+            }
+        }
+    }
+}
diff --git a/base/common/tests/local_date_time_comparison.cpp b/src/Common/tests/gtest_local_date_time_comparison.cpp
similarity index 79%
rename from base/common/tests/local_date_time_comparison.cpp
rename to src/Common/tests/gtest_local_date_time_comparison.cpp
index 5492ec31004..f75c2647100 100644
--- a/base/common/tests/local_date_time_comparison.cpp
+++ b/src/Common/tests/gtest_local_date_time_comparison.cpp
@@ -1,5 +1,6 @@
 #include <iostream>
 #include <stdexcept>
+#include <gtest/gtest.h>
 
 #include <common/LocalDateTime.h>
 
@@ -16,14 +17,13 @@ void checkComparison()
     LocalDateTime a("2018-07-18 01:02:03");
     LocalDateTime b("2018-07-18 01:02:03");
 
-    if (a != b)
-        throw std::runtime_error("Test failed");
+    EXPECT_EQ(a, b);
+    EXPECT_FALSE(a != b);
 }
 
 
-int main(int, char **)
+TEST(LocalDateTime, Comparison)
 {
     fillStackWithGarbage();
     checkComparison();
-    return 0;
 }
diff --git a/src/Common/tests/gtest_pod_array.cpp b/src/Common/tests/gtest_pod_array.cpp
index 988a3e649ba..9cc77b88195 100644
--- a/src/Common/tests/gtest_pod_array.cpp
+++ b/src/Common/tests/gtest_pod_array.cpp
@@ -33,6 +33,19 @@ TEST(Common, PODArrayInsert)
     EXPECT_EQ(str, std::string(chars.data(), chars.size()));
 }
 
+TEST(Common, PODArrayInsertFromItself)
+{
+    {
+        PaddedPODArray<UInt64> array { 1 };
+
+        for (size_t i = 0; i < 3; ++i)
+            array.insertFromItself(array.begin(), array.end());
+
+        PaddedPODArray<UInt64> expected {1,1,1,1,1,1,1,1};
+        ASSERT_EQ(array,expected);
+    }
+}
+
 TEST(Common, PODPushBackRawMany)
 {
     PODArray<char> chars;
@@ -66,3 +79,83 @@ TEST(Common, PODNoOverallocation)
 
     EXPECT_EQ(capacities, (std::vector<size_t>{4065, 8161, 16353, 32737, 65505, 131041, 262113, 524257, 1048545}));
 }
+
+template <size_t size>
+struct ItemWithSize
+{
+    char v[size] {};
+};
+
+TEST(Common, PODInsertElementSizeNotMultipleOfLeftPadding)
+{
+    using ItemWith24Size = ItemWithSize<24>;
+    PaddedPODArray<ItemWith24Size> arr1_initially_empty;
+
+    size_t items_to_insert_size = 120000;
+
+    for (size_t test = 0; test < items_to_insert_size; ++test)
+        arr1_initially_empty.emplace_back();
+
+    EXPECT_EQ(arr1_initially_empty.size(), items_to_insert_size);
+
+    PaddedPODArray<ItemWith24Size> arr2_initially_nonempty;
+
+    for (size_t test = 0; test < items_to_insert_size; ++test)
+        arr2_initially_nonempty.emplace_back();
+
+    EXPECT_EQ(arr1_initially_empty.size(), items_to_insert_size);
+}
+
+TEST(Common, PODErase)
+{
+    {
+        PaddedPODArray<UInt64> items {0,1,2,3,4,5,6,7,8,9};
+        PaddedPODArray<UInt64> expected;
+        expected = {0,1,2,3,4,5,6,7,8,9};
+
+        items.erase(items.begin(), items.begin());
+        EXPECT_EQ(items, expected);
+
+        items.erase(items.end(), items.end());
+        EXPECT_EQ(items, expected);
+    }
+    {
+        PaddedPODArray<UInt64> actual {0,1,2,3,4,5,6,7,8,9};
+        PaddedPODArray<UInt64> expected;
+
+        expected = {0,1,4,5,6,7,8,9};
+        actual.erase(actual.begin() + 2, actual.begin() + 4);
+        EXPECT_EQ(actual, expected);
+
+        expected = {0,1,4};
+        actual.erase(actual.begin() + 3, actual.end());
+        EXPECT_EQ(actual, expected);
+
+        expected = {};
+        actual.erase(actual.begin(), actual.end());
+        EXPECT_EQ(actual, expected);
+
+        for (size_t i = 0; i < 10; ++i)
+            actual.emplace_back(static_cast<UInt64>(i));
+
+        expected = {0,1,4,5,6,7,8,9};
+        actual.erase(actual.begin() + 2, actual.begin() + 4);
+        EXPECT_EQ(actual, expected);
+
+        expected = {0,1,4};
+        actual.erase(actual.begin() + 3, actual.end());
+        EXPECT_EQ(actual, expected);
+
+        expected = {};
+        actual.erase(actual.begin(), actual.end());
+        EXPECT_EQ(actual, expected);
+    }
+    {
+        PaddedPODArray<UInt64> actual {0,1,2,3,4,5,6,7,8,9};
+        PaddedPODArray<UInt64> expected;
+
+        expected = {1,2,3,4,5,6,7,8,9};
+        actual.erase(actual.begin());
+        EXPECT_EQ(actual, expected);
+    }
+}
diff --git a/base/common/tests/gtest_strong_typedef.cpp b/src/Common/tests/gtest_strong_typedef.cpp
similarity index 100%
rename from base/common/tests/gtest_strong_typedef.cpp
rename to src/Common/tests/gtest_strong_typedef.cpp
diff --git a/src/Common/tests/parallel_aggregation.cpp b/src/Common/tests/parallel_aggregation.cpp
index e39be163619..045a385671b 100644
--- a/src/Common/tests/parallel_aggregation.cpp
+++ b/src/Common/tests/parallel_aggregation.cpp
@@ -69,7 +69,7 @@ static void aggregate1(Map & map, Source::const_iterator begin, Source::const_it
         ++map[*it];
 }
 
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
 #endif
@@ -122,7 +122,7 @@ static void aggregate22(MapTwoLevel & map, Source::const_iterator begin, Source:
     }
 }
 
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic pop
 #endif
 
diff --git a/src/Common/tests/parallel_aggregation2.cpp b/src/Common/tests/parallel_aggregation2.cpp
index 1f8e598b122..e2ad36232de 100644
--- a/src/Common/tests/parallel_aggregation2.cpp
+++ b/src/Common/tests/parallel_aggregation2.cpp
@@ -62,7 +62,7 @@ struct AggregateIndependent
     }
 };
 
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
 #endif
@@ -115,7 +115,7 @@ struct AggregateIndependentWithSequentialKeysOptimization
     }
 };
 
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic pop
 #endif
 
@@ -265,7 +265,7 @@ struct Creator
     void operator()(Value &) const {}
 };
 
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
 #endif
@@ -275,7 +275,7 @@ struct Updater
     void operator()(Value & x) const { ++x; }
 };
 
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic pop
 #endif
 
diff --git a/src/Common/ya.make b/src/Common/ya.make
index 64dd628c457..d1ff04f8f0a 100644
--- a/src/Common/ya.make
+++ b/src/Common/ya.make
@@ -14,7 +14,7 @@ PEERDIR(
     clickhouse/base/common
     clickhouse/base/pcg-random
     clickhouse/base/widechar_width
-    contrib/libs/libcpuid/libcpuid
+    contrib/libs/libcpuid
     contrib/libs/openssl
     contrib/libs/poco/NetSSL_OpenSSL
     contrib/libs/re2
@@ -39,6 +39,7 @@ SRCS(
     DNSResolver.cpp
     Dwarf.cpp
     Elf.cpp
+    Epoll.cpp
     ErrorCodes.cpp
     Exception.cpp
     ExternalLoaderStatus.cpp
diff --git a/src/Common/ya.make.in b/src/Common/ya.make.in
index 210ecab6ef6..420384bb4a9 100644
--- a/src/Common/ya.make.in
+++ b/src/Common/ya.make.in
@@ -13,7 +13,7 @@ PEERDIR(
     clickhouse/base/common
     clickhouse/base/pcg-random
     clickhouse/base/widechar_width
-    contrib/libs/libcpuid/libcpuid
+    contrib/libs/libcpuid
     contrib/libs/openssl
     contrib/libs/poco/NetSSL_OpenSSL
     contrib/libs/re2
diff --git a/src/Compression/CachedCompressedReadBuffer.cpp b/src/Compression/CachedCompressedReadBuffer.cpp
index 4b4d33954a9..d511266d139 100644
--- a/src/Compression/CachedCompressedReadBuffer.cpp
+++ b/src/Compression/CachedCompressedReadBuffer.cpp
@@ -33,33 +33,27 @@ bool CachedCompressedReadBuffer::nextImpl()
 
     /// Let's check for the presence of a decompressed block in the cache, grab the ownership of this block, if it exists.
     UInt128 key = cache->hash(path, file_pos);
-    owned_cell = cache->get(key);
 
-    if (!owned_cell)
+    owned_cell = cache->getOrSet(key, [&]()
     {
-        /// If not, read it from the file.
         initInput();
         file_in->seek(file_pos, SEEK_SET);
 
-        owned_cell = std::make_shared<UncompressedCacheCell>();
+        auto cell = std::make_shared<UncompressedCacheCell>();
 
         size_t size_decompressed;
         size_t size_compressed_without_checksum;
-        owned_cell->compressed_size = readCompressedData(size_decompressed, size_compressed_without_checksum, false);
+        cell->compressed_size = readCompressedData(size_decompressed, size_compressed_without_checksum, false);
 
-        if (owned_cell->compressed_size)
+        if (cell->compressed_size)
         {
-            owned_cell->additional_bytes = codec->getAdditionalSizeAtTheEndOfBuffer();
-            owned_cell->data.resize(size_decompressed + owned_cell->additional_bytes);
-            decompress(owned_cell->data.data(), size_decompressed, size_compressed_without_checksum);
-
+            cell->additional_bytes = codec->getAdditionalSizeAtTheEndOfBuffer();
+            cell->data.resize(size_decompressed + cell->additional_bytes);
+            decompressTo(cell->data.data(), size_decompressed, size_compressed_without_checksum);
         }
 
-        /// Put data into cache.
-        /// NOTE: Even if we don't read anything (compressed_size == 0)
-        /// because we can reuse this information and don't reopen file in future
-        cache->set(key, owned_cell);
-    }
+        return cell;
+    });
 
     if (owned_cell->data.size() == 0)
         return false;
diff --git a/src/Compression/CompressedReadBuffer.cpp b/src/Compression/CompressedReadBuffer.cpp
index 6a082164231..78241ec1b69 100644
--- a/src/Compression/CompressedReadBuffer.cpp
+++ b/src/Compression/CompressedReadBuffer.cpp
@@ -21,7 +21,7 @@ bool CompressedReadBuffer::nextImpl()
     memory.resize(size_decompressed + additional_size_at_the_end_of_buffer);
     working_buffer = Buffer(memory.data(), &memory[size_decompressed]);
 
-    decompress(working_buffer.begin(), size_decompressed, size_compressed_without_checksum);
+    decompress(working_buffer, size_decompressed, size_compressed_without_checksum);
 
     return true;
 }
@@ -48,7 +48,7 @@ size_t CompressedReadBuffer::readBig(char * to, size_t n)
         /// If the decompressed block fits entirely where it needs to be copied.
         if (size_decompressed + additional_size_at_the_end_of_buffer <= n - bytes_read)
         {
-            decompress(to + bytes_read, size_decompressed, size_compressed_without_checksum);
+            decompressTo(to + bytes_read, size_decompressed, size_compressed_without_checksum);
             bytes_read += size_decompressed;
             bytes += size_decompressed;
         }
@@ -61,9 +61,9 @@ size_t CompressedReadBuffer::readBig(char * to, size_t n)
 
             memory.resize(size_decompressed + additional_size_at_the_end_of_buffer);
             working_buffer = Buffer(memory.data(), &memory[size_decompressed]);
-            pos = working_buffer.begin();
 
-            decompress(working_buffer.begin(), size_decompressed, size_compressed_without_checksum);
+            decompress(working_buffer, size_decompressed, size_compressed_without_checksum);
+            pos = working_buffer.begin();
 
             bytes_read += read(to + bytes_read, n - bytes_read);
             break;
diff --git a/src/Compression/CompressedReadBufferBase.cpp b/src/Compression/CompressedReadBufferBase.cpp
index 8f5b779e4bc..79757d6f151 100644
--- a/src/Compression/CompressedReadBufferBase.cpp
+++ b/src/Compression/CompressedReadBufferBase.cpp
@@ -184,7 +184,7 @@ size_t CompressedReadBufferBase::readCompressedData(size_t & size_decompressed,
 }
 
 
-void CompressedReadBufferBase::decompress(char * to, size_t size_decompressed, size_t size_compressed_without_checksum)
+static void readHeaderAndGetCodec(const char * compressed_buffer, size_t size_decompressed, CompressionCodecPtr & codec, bool allow_different_codecs)
 {
     ProfileEvents::increment(ProfileEvents::CompressedReadBufferBlocks);
     ProfileEvents::increment(ProfileEvents::CompressedReadBufferBytes, size_decompressed);
@@ -210,11 +210,38 @@ void CompressedReadBufferBase::decompress(char * to, size_t size_decompressed, s
                             ErrorCodes::CANNOT_DECOMPRESS);
         }
     }
+}
 
+
+void CompressedReadBufferBase::decompressTo(char * to, size_t size_decompressed, size_t size_compressed_without_checksum)
+{
+    readHeaderAndGetCodec(compressed_buffer, size_decompressed, codec, allow_different_codecs);
     codec->decompress(compressed_buffer, size_compressed_without_checksum, to);
 }
 
 
+void CompressedReadBufferBase::decompress(BufferBase::Buffer & to, size_t size_decompressed, size_t size_compressed_without_checksum)
+{
+    readHeaderAndGetCodec(compressed_buffer, size_decompressed, codec, allow_different_codecs);
+
+    if (codec->isNone())
+    {
+        /// Shortcut for NONE codec to avoid extra memcpy.
+        /// We doing it by changing the buffer `to` to point to existing uncompressed data.
+
+        UInt8 header_size = ICompressionCodec::getHeaderSize();
+        if (size_compressed_without_checksum < header_size)
+            throw Exception(ErrorCodes::CORRUPTED_DATA,
+                "Can't decompress data: the compressed data size ({}, this should include header size) is less than the header size ({})",
+                    size_compressed_without_checksum, static_cast<size_t>(header_size));
+
+        to = BufferBase::Buffer(compressed_buffer + header_size, compressed_buffer + size_compressed_without_checksum);
+    }
+    else
+        codec->decompress(compressed_buffer, size_compressed_without_checksum, to.begin());
+}
+
+
 /// 'compressed_in' could be initialized lazily, but before first call of 'readCompressedData'.
 CompressedReadBufferBase::CompressedReadBufferBase(ReadBuffer * in, bool allow_different_codecs_)
     : compressed_in(in), own_compressed_buffer(0), allow_different_codecs(allow_different_codecs_)
diff --git a/src/Compression/CompressedReadBufferBase.h b/src/Compression/CompressedReadBufferBase.h
index 60b8847f639..c1e928039ef 100644
--- a/src/Compression/CompressedReadBufferBase.h
+++ b/src/Compression/CompressedReadBufferBase.h
@@ -3,6 +3,7 @@
 #include <Common/PODArray.h>
 #include <Compression/LZ4_decompress_faster.h>
 #include <Compression/ICompressionCodec.h>
+#include <IO/BufferBase.h>
 
 
 namespace DB
@@ -37,7 +38,12 @@ protected:
     /// Returns number of compressed bytes read.
     size_t readCompressedData(size_t & size_decompressed, size_t & size_compressed_without_checksum, bool always_copy);
 
-    void decompress(char * to, size_t size_decompressed, size_t size_compressed_without_checksum);
+    /// Decompress into memory pointed by `to`
+    void decompressTo(char * to, size_t size_decompressed, size_t size_compressed_without_checksum);
+
+    /// This method can change location of `to` to avoid unnecessary copy if data is uncompressed.
+    /// It is more efficient for compression codec NONE but not suitable if you want to decompress into specific location.
+    void decompress(BufferBase::Buffer & to, size_t size_decompressed, size_t size_compressed_without_checksum);
 
 public:
     /// 'compressed_in' could be initialized lazily, but before first call of 'readCompressedData'.
diff --git a/src/Compression/CompressedReadBufferFromFile.cpp b/src/Compression/CompressedReadBufferFromFile.cpp
index 54f360f417b..e14a1784b14 100644
--- a/src/Compression/CompressedReadBufferFromFile.cpp
+++ b/src/Compression/CompressedReadBufferFromFile.cpp
@@ -31,7 +31,7 @@ bool CompressedReadBufferFromFile::nextImpl()
     memory.resize(size_decompressed + additional_size_at_the_end_of_buffer);
     working_buffer = Buffer(memory.data(), &memory[size_decompressed]);
 
-    decompress(working_buffer.begin(), size_decompressed, size_compressed_without_checksum);
+    decompress(working_buffer, size_decompressed, size_compressed_without_checksum);
 
     return true;
 }
@@ -45,9 +45,15 @@ CompressedReadBufferFromFile::CompressedReadBufferFromFile(std::unique_ptr<ReadB
 
 
 CompressedReadBufferFromFile::CompressedReadBufferFromFile(
-    const std::string & path, size_t estimated_size, size_t aio_threshold, size_t mmap_threshold, size_t buf_size, bool allow_different_codecs_)
+    const std::string & path,
+    size_t estimated_size,
+    size_t aio_threshold,
+    size_t mmap_threshold,
+    MMappedFileCache * mmap_cache,
+    size_t buf_size,
+    bool allow_different_codecs_)
     : BufferWithOwnMemory<ReadBuffer>(0)
-    , p_file_in(createReadBufferFromFileBase(path, estimated_size, aio_threshold, mmap_threshold, buf_size))
+    , p_file_in(createReadBufferFromFileBase(path, estimated_size, aio_threshold, mmap_threshold, mmap_cache, buf_size))
     , file_in(*p_file_in)
 {
     compressed_in = &file_in;
@@ -108,7 +114,7 @@ size_t CompressedReadBufferFromFile::readBig(char * to, size_t n)
         /// If the decompressed block fits entirely where it needs to be copied.
         if (size_decompressed + additional_size_at_the_end_of_buffer <= n - bytes_read)
         {
-            decompress(to + bytes_read, size_decompressed, size_compressed_without_checksum);
+            decompressTo(to + bytes_read, size_decompressed, size_compressed_without_checksum);
             bytes_read += size_decompressed;
             bytes += size_decompressed;
         }
@@ -122,9 +128,9 @@ size_t CompressedReadBufferFromFile::readBig(char * to, size_t n)
 
             memory.resize(size_decompressed + additional_size_at_the_end_of_buffer);
             working_buffer = Buffer(memory.data(), &memory[size_decompressed]);
-            pos = working_buffer.begin();
 
-            decompress(working_buffer.begin(), size_decompressed, size_compressed_without_checksum);
+            decompress(working_buffer, size_decompressed, size_compressed_without_checksum);
+            pos = working_buffer.begin();
 
             bytes_read += read(to + bytes_read, n - bytes_read);
             break;
diff --git a/src/Compression/CompressedReadBufferFromFile.h b/src/Compression/CompressedReadBufferFromFile.h
index 166b2595ef9..2ee7021b35a 100644
--- a/src/Compression/CompressedReadBufferFromFile.h
+++ b/src/Compression/CompressedReadBufferFromFile.h
@@ -9,6 +9,8 @@
 namespace DB
 {
 
+class MMappedFileCache;
+
 
 /// Unlike CompressedReadBuffer, it can do seek.
 class CompressedReadBufferFromFile : public CompressedReadBufferBase, public BufferWithOwnMemory<ReadBuffer>
@@ -31,7 +33,7 @@ public:
     CompressedReadBufferFromFile(std::unique_ptr<ReadBufferFromFileBase> buf, bool allow_different_codecs_ = false);
 
     CompressedReadBufferFromFile(
-        const std::string & path, size_t estimated_size, size_t aio_threshold, size_t mmap_threshold,
+        const std::string & path, size_t estimated_size, size_t aio_threshold, size_t mmap_threshold, MMappedFileCache * mmap_cache,
         size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE, bool allow_different_codecs_ = false);
 
     void seek(size_t offset_in_compressed_file, size_t offset_in_decompressed_block);
diff --git a/src/Compression/CompressionFactory.cpp b/src/Compression/CompressionFactory.cpp
index aacf95b1950..0ff9797aeaf 100644
--- a/src/Compression/CompressionFactory.cpp
+++ b/src/Compression/CompressionFactory.cpp
@@ -107,9 +107,9 @@ ASTPtr CompressionCodecFactory::validateCodecAndGetPreprocessedAST(const ASTPtr
                 if (column_type)
                 {
                     CompressionCodecPtr prev_codec;
-                    IDataType::StreamCallback callback = [&](const IDataType::SubstreamPath & substream_path, const IDataType & substream_type)
+                    IDataType::StreamCallbackWithType callback = [&](const ISerialization::SubstreamPath & substream_path, const IDataType & substream_type)
                     {
-                        if (IDataType::isSpecialCompressionAllowed(substream_path))
+                        if (ISerialization::isSpecialCompressionAllowed(substream_path))
                         {
                             result_codec = getImpl(codec_family_name, codec_arguments, &substream_type);
 
@@ -121,8 +121,8 @@ ASTPtr CompressionCodecFactory::validateCodecAndGetPreprocessedAST(const ASTPtr
                         }
                     };
 
-                    IDataType::SubstreamPath stream_path;
-                    column_type->enumerateStreams(callback, stream_path);
+                    ISerialization::SubstreamPath stream_path;
+                    column_type->enumerateStreams(column_type->getDefaultSerialization(), callback, stream_path);
 
                     if (!result_codec)
                         throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot find any substream with data type for type {}. It's a bug", column_type->getName());
diff --git a/src/Compression/ICompressionCodec.cpp b/src/Compression/ICompressionCodec.cpp
index dec2b633046..46a12e50828 100644
--- a/src/Compression/ICompressionCodec.cpp
+++ b/src/Compression/ICompressionCodec.cpp
@@ -98,7 +98,7 @@ UInt32 ICompressionCodec::decompress(const char * source, UInt32 source_size, ch
 
     UInt8 header_size = getHeaderSize();
     if (source_size < header_size)
-        throw Exception(ErrorCodes::CORRUPTED_DATA, "Can't decompress data: the compressed data size ({}), this should include header size) is less than the header size ({})", source_size, size_t(header_size));
+        throw Exception(ErrorCodes::CORRUPTED_DATA, "Can't decompress data: the compressed data size ({}, this should include header size) is less than the header size ({})", source_size, static_cast<size_t>(header_size));
 
     uint8_t our_method = getMethodByte();
     uint8_t method = source[0];
diff --git a/src/Compression/LZ4_decompress_faster.h b/src/Compression/LZ4_decompress_faster.h
index dd923279ebf..30a0d7acb22 100644
--- a/src/Compression/LZ4_decompress_faster.h
+++ b/src/Compression/LZ4_decompress_faster.h
@@ -95,7 +95,7 @@ struct PerformanceStatistics
 
     /// How to select method to run.
     /// -1 - automatically, based on statistics (default);
-    /// 0..3 - always choose specified method (for performance testing);
+    /// >= 0 - always choose specified method (for performance testing);
     /// -2 - choose methods in round robin fashion (for performance testing).
     ssize_t choose_method = -1;
 
diff --git a/src/Compression/tests/cached_compressed_read_buffer.cpp b/src/Compression/tests/cached_compressed_read_buffer.cpp
index ed198e36e46..94e8b356bd5 100644
--- a/src/Compression/tests/cached_compressed_read_buffer.cpp
+++ b/src/Compression/tests/cached_compressed_read_buffer.cpp
@@ -37,7 +37,7 @@ int main(int argc, char ** argv)
                 path,
                 [&]()
                 {
-                    return createReadBufferFromFileBase(path, 0, 0, 0);
+                    return createReadBufferFromFileBase(path, 0, 0, 0, nullptr);
                 },
                 &cache
             );
@@ -56,7 +56,7 @@ int main(int argc, char ** argv)
                 path,
                 [&]()
                 {
-                    return createReadBufferFromFileBase(path, 0, 0, 0);
+                    return createReadBufferFromFileBase(path, 0, 0, 0, nullptr);
                 },
                 &cache
             );
diff --git a/src/Compression/tests/gtest_compressionCodec.cpp b/src/Compression/tests/gtest_compressionCodec.cpp
index e9470536ae8..0acd15e48c3 100644
--- a/src/Compression/tests/gtest_compressionCodec.cpp
+++ b/src/Compression/tests/gtest_compressionCodec.cpp
@@ -749,7 +749,7 @@ auto RandomishGenerator = [](auto i)
 {
     using T = decltype(i);
     double sin_value = sin(static_cast<double>(i * i)) * i;
-    if (sin_value < std::numeric_limits<T>::lowest() || sin_value > std::numeric_limits<T>::max())
+    if (sin_value < std::numeric_limits<T>::lowest() || sin_value > static_cast<double>(std::numeric_limits<T>::max()))
         return T{};
     return T(sin_value);
 };
diff --git a/src/Coordination/Changelog.cpp b/src/Coordination/Changelog.cpp
new file mode 100644
index 00000000000..ba1664b23da
--- /dev/null
+++ b/src/Coordination/Changelog.cpp
@@ -0,0 +1,588 @@
+#include <Coordination/Changelog.h>
+#include <IO/WriteHelpers.h>
+#include <IO/ReadHelpers.h>
+#include <IO/ReadBufferFromFile.h>
+#include <filesystem>
+#include <boost/algorithm/string/split.hpp>
+#include <boost/algorithm/string/join.hpp>
+#include <boost/algorithm/string/trim.hpp>
+#include <Common/Exception.h>
+#include <Common/SipHash.h>
+#include <common/logger_useful.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int CHECKSUM_DOESNT_MATCH;
+    extern const int CORRUPTED_DATA;
+    extern const int UNKNOWN_FORMAT_VERSION;
+    extern const int LOGICAL_ERROR;
+}
+
+namespace
+{
+
+constexpr auto DEFAULT_PREFIX = "changelog";
+
+std::string formatChangelogPath(const std::string & prefix, const ChangelogFileDescription & name)
+{
+    std::filesystem::path path(prefix);
+    path /= std::filesystem::path(name.prefix + "_" + std::to_string(name.from_log_index) + "_" + std::to_string(name.to_log_index) + ".bin");
+    return path;
+}
+
+ChangelogFileDescription getChangelogFileDescription(const std::string & path_str)
+{
+    std::filesystem::path path(path_str);
+    std::string filename = path.stem();
+    Strings filename_parts;
+    boost::split(filename_parts, filename, boost::is_any_of("_"));
+    if (filename_parts.size() < 3)
+        throw Exception(ErrorCodes::CORRUPTED_DATA, "Invalid changelog {}", path_str);
+
+    ChangelogFileDescription result;
+    result.prefix = filename_parts[0];
+    result.from_log_index = parse<uint64_t>(filename_parts[1]);
+    result.to_log_index = parse<uint64_t>(filename_parts[2]);
+    result.path = path_str;
+    return result;
+}
+
+LogEntryPtr makeClone(const LogEntryPtr & entry)
+{
+    return cs_new<nuraft::log_entry>(entry->get_term(), nuraft::buffer::clone(entry->get_buf()), entry->get_val_type());
+}
+
+Checksum computeRecordChecksum(const ChangelogRecord & record)
+{
+    SipHash hash;
+    hash.update(record.header.version);
+    hash.update(record.header.index);
+    hash.update(record.header.term);
+    hash.update(record.header.value_type);
+    hash.update(record.header.blob_size);
+    if (record.header.blob_size != 0)
+        hash.update(reinterpret_cast<char *>(record.blob->data_begin()), record.blob->size());
+    return hash.get64();
+}
+
+}
+
+class ChangelogWriter
+{
+public:
+    ChangelogWriter(const std::string & filepath_, WriteMode mode, uint64_t start_index_)
+        : filepath(filepath_)
+        , plain_buf(filepath, DBMS_DEFAULT_BUFFER_SIZE, mode == WriteMode::Rewrite ? -1 : (O_APPEND | O_CREAT | O_WRONLY))
+        , start_index(start_index_)
+    {}
+
+
+    off_t appendRecord(ChangelogRecord && record)
+    {
+        off_t result = plain_buf.count();
+        writeIntBinary(computeRecordChecksum(record), plain_buf);
+
+        writeIntBinary(record.header.version, plain_buf);
+        writeIntBinary(record.header.index, plain_buf);
+        writeIntBinary(record.header.term, plain_buf);
+        writeIntBinary(record.header.value_type, plain_buf);
+        writeIntBinary(record.header.blob_size, plain_buf);
+
+        if (record.header.blob_size != 0)
+            plain_buf.write(reinterpret_cast<char *>(record.blob->data_begin()), record.blob->size());
+
+        entries_written++;
+
+        return result;
+    }
+
+    void truncateToLength(off_t new_length)
+    {
+        plain_buf.next();
+        plain_buf.truncate(new_length);
+        plain_buf.seek(new_length, SEEK_SET);
+    }
+
+    void flush(bool force_fsync)
+    {
+        plain_buf.next();
+        if (force_fsync)
+            plain_buf.sync();
+    }
+
+    uint64_t getEntriesWritten() const
+    {
+        return entries_written;
+    }
+
+    void setEntriesWritten(uint64_t entries_written_)
+    {
+        entries_written = entries_written_;
+    }
+
+    uint64_t getStartIndex() const
+    {
+        return start_index;
+    }
+
+    void setStartIndex(uint64_t start_index_)
+    {
+        start_index = start_index_;
+    }
+
+private:
+    std::string filepath;
+    WriteBufferFromFile plain_buf;
+    uint64_t entries_written = 0;
+    uint64_t start_index;
+};
+
+struct ChangelogReadResult
+{
+    uint64_t entries_read;
+    uint64_t first_read_index;
+    off_t last_position;
+    bool error;
+};
+
+class ChangelogReader
+{
+public:
+    explicit ChangelogReader(const std::string & filepath_)
+        : filepath(filepath_)
+        , read_buf(filepath)
+    {}
+
+    ChangelogReadResult readChangelog(IndexToLogEntry & logs, uint64_t start_log_index, IndexToOffset & index_to_offset, Poco::Logger * log)
+    {
+        uint64_t previous_index = 0;
+        ChangelogReadResult result{};
+        try
+        {
+            while (!read_buf.eof())
+            {
+                result.last_position = read_buf.count();
+                Checksum record_checksum;
+                readIntBinary(record_checksum, read_buf);
+
+                /// Initialization is required, otherwise checksums may fail
+                ChangelogRecord record;
+                readIntBinary(record.header.version, read_buf);
+                readIntBinary(record.header.index, read_buf);
+                readIntBinary(record.header.term, read_buf);
+                readIntBinary(record.header.value_type, read_buf);
+                readIntBinary(record.header.blob_size, read_buf);
+
+                if (record.header.version > CURRENT_CHANGELOG_VERSION)
+                    throw Exception(ErrorCodes::UNKNOWN_FORMAT_VERSION, "Unsupported changelog version {} on path {}", record.header.version, filepath);
+
+                if (record.header.blob_size != 0)
+                {
+                    auto buffer = nuraft::buffer::alloc(record.header.blob_size);
+                    auto * buffer_begin = reinterpret_cast<char *>(buffer->data_begin());
+                    read_buf.readStrict(buffer_begin, record.header.blob_size);
+                    record.blob = buffer;
+                }
+                else
+                    record.blob = nullptr;
+
+                if (previous_index != 0 && previous_index + 1 != record.header.index)
+                    throw Exception(ErrorCodes::CORRUPTED_DATA, "Previous log entry {}, next log entry {}, seems like some entries skipped", previous_index, record.header.index);
+
+                previous_index = record.header.index;
+
+                Checksum checksum = computeRecordChecksum(record);
+                if (checksum != record_checksum)
+                {
+                    throw Exception(ErrorCodes::CHECKSUM_DOESNT_MATCH,
+                                    "Checksums doesn't match for log {} (version {}), index {}, blob_size {}",
+                                    filepath, record.header.version, record.header.index, record.header.blob_size);
+                }
+
+                if (logs.count(record.header.index) != 0)
+                    throw Exception(ErrorCodes::CORRUPTED_DATA, "Duplicated index id {} in log {}", record.header.index, filepath);
+
+                result.entries_read += 1;
+
+                if (record.header.index < start_log_index)
+                {
+                    continue;
+                }
+
+                auto log_entry = nuraft::cs_new<nuraft::log_entry>(record.header.term, record.blob, record.header.value_type);
+                if (result.first_read_index == 0)
+                    result.first_read_index = record.header.index;
+
+                logs.emplace(record.header.index, log_entry);
+                index_to_offset[record.header.index] = result.last_position;
+                if (result.entries_read % 50000 == 0)
+                    LOG_TRACE(log, "Reading changelog from path {}, entries {}", filepath, result.entries_read);
+            }
+        }
+        catch (const Exception & ex)
+        {
+            if (ex.code() == ErrorCodes::UNKNOWN_FORMAT_VERSION)
+                throw ex;
+
+            result.error = true;
+            LOG_WARNING(log, "Cannot completely read changelog on path {}, error: {}", filepath, ex.message());
+        }
+        catch (...)
+        {
+            result.error = true;
+            tryLogCurrentException(log);
+        }
+        LOG_TRACE(log, "Totally read from changelog {} {} entries", filepath, result.entries_read);
+
+        return result;
+    }
+
+private:
+    std::string filepath;
+    ReadBufferFromFile read_buf;
+};
+
+Changelog::Changelog(
+    const std::string & changelogs_dir_,
+    uint64_t rotate_interval_,
+    bool force_sync_,
+    Poco::Logger * log_)
+    : changelogs_dir(changelogs_dir_)
+    , rotate_interval(rotate_interval_)
+    , force_sync(force_sync_)
+    , log(log_)
+{
+    namespace fs = std::filesystem;
+    if (!fs::exists(changelogs_dir))
+        fs::create_directories(changelogs_dir);
+
+    for (const auto & p : fs::directory_iterator(changelogs_dir))
+    {
+        auto file_description = getChangelogFileDescription(p.path());
+        existing_changelogs[file_description.from_log_index] = file_description;
+    }
+}
+
+void Changelog::readChangelogAndInitWriter(uint64_t last_commited_log_index, uint64_t logs_to_keep)
+{
+    uint64_t total_read = 0;
+    uint64_t entries_in_last = 0;
+    uint64_t incomplete_log_index = 0;
+    ChangelogReadResult result{};
+    uint64_t first_read_index = 0;
+
+    uint64_t start_to_read_from = last_commited_log_index;
+    if (start_to_read_from > logs_to_keep)
+        start_to_read_from -= logs_to_keep;
+    else
+        start_to_read_from = 1;
+
+    bool started = false;
+    for (const auto & [changelog_start_index, changelog_description] : existing_changelogs)
+    {
+        entries_in_last = changelog_description.to_log_index - changelog_description.from_log_index + 1;
+
+        if (changelog_description.to_log_index >= start_to_read_from)
+        {
+            if (!started)
+            {
+                if (changelog_description.from_log_index > last_commited_log_index && (changelog_description.from_log_index - last_commited_log_index) > 1)
+                {
+                    LOG_ERROR(log, "Some records was lost, last committed log index {}, smallest available log index on disk {}. Hopefully will receive missing records from leader.", last_commited_log_index, changelog_description.from_log_index);
+                    incomplete_log_index = changelog_start_index;
+                    break;
+                }
+                else if (changelog_description.from_log_index > start_to_read_from)
+                    LOG_WARNING(log, "Don't have required amount of reserved log records. Need to read from {}, smalled available log index on disk {}.", start_to_read_from, changelog_description.from_log_index);
+            }
+
+            started = true;
+
+            ChangelogReader reader(changelog_description.path);
+            result = reader.readChangelog(logs, start_to_read_from, index_to_start_pos, log);
+            if (first_read_index == 0)
+                first_read_index = result.first_read_index;
+
+            total_read += result.entries_read;
+
+            /// May happen after truncate, crash or simply unfinished log
+            if (result.entries_read < entries_in_last)
+            {
+                incomplete_log_index = changelog_start_index;
+                break;
+            }
+        }
+    }
+
+    if (first_read_index != 0)
+        start_index = first_read_index;
+    else
+        start_index = last_commited_log_index;
+
+    if (incomplete_log_index != 0)
+    {
+        auto start_remove_from = existing_changelogs.begin();
+        if (started)
+            start_remove_from = existing_changelogs.upper_bound(incomplete_log_index);
+
+        /// All subsequent logs shouldn't exist. But they may exist if we crashed after writeAt started. Remove them.
+        for (auto itr = start_remove_from; itr != existing_changelogs.end();)
+        {
+            LOG_WARNING(log, "Removing changelog {}, because it's goes after broken changelog entry", itr->second.path);
+            std::filesystem::remove(itr->second.path);
+            itr = existing_changelogs.erase(itr);
+        }
+
+        /// Continue to write into existing log
+        if (!existing_changelogs.empty())
+        {
+            auto description = existing_changelogs.rbegin()->second;
+            LOG_TRACE(log, "Continue to write into {}", description.path);
+            current_writer = std::make_unique<ChangelogWriter>(description.path, WriteMode::Append, description.from_log_index);
+            current_writer->setEntriesWritten(result.entries_read);
+
+            /// Truncate all broken entries from log
+            if (result.error)
+            {
+                LOG_WARNING(log, "Read finished with error, truncating all broken log entries");
+                current_writer->truncateToLength(result.last_position);
+            }
+        }
+    }
+
+    /// Start new log if we don't initialize writer from previous log
+    if (!current_writer)
+        rotate(start_index + total_read);
+}
+
+void Changelog::rotate(uint64_t new_start_log_index)
+{
+    /// Flush previous log
+    flush();
+
+    ChangelogFileDescription new_description;
+    new_description.prefix = DEFAULT_PREFIX;
+    new_description.from_log_index = new_start_log_index;
+    new_description.to_log_index = new_start_log_index + rotate_interval - 1;
+
+    new_description.path = formatChangelogPath(changelogs_dir, new_description);
+
+    LOG_TRACE(log, "Starting new changelog {}", new_description.path);
+    existing_changelogs[new_start_log_index] = new_description;
+    current_writer = std::make_unique<ChangelogWriter>(new_description.path, WriteMode::Rewrite, new_start_log_index);
+}
+
+ChangelogRecord Changelog::buildRecord(uint64_t index, const LogEntryPtr & log_entry)
+{
+    ChangelogRecord record;
+    record.header.version = ChangelogVersion::V0;
+    record.header.index = index;
+    record.header.term = log_entry->get_term();
+    record.header.value_type = log_entry->get_val_type();
+    auto buffer = log_entry->get_buf_ptr();
+    if (buffer)
+        record.header.blob_size = buffer->size();
+    else
+        record.header.blob_size = 0;
+
+    record.blob = buffer;
+
+    return record;
+}
+
+void Changelog::appendEntry(uint64_t index, const LogEntryPtr & log_entry)
+{
+    if (!current_writer)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Changelog must be initialized before appending records");
+
+    if (logs.empty())
+        start_index = index;
+
+    if (current_writer->getEntriesWritten() == rotate_interval)
+        rotate(index);
+
+    auto offset = current_writer->appendRecord(buildRecord(index, log_entry));
+    if (!index_to_start_pos.try_emplace(index, offset).second)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Record with index {} already exists", index);
+
+    logs[index] = makeClone(log_entry);
+}
+
+void Changelog::writeAt(uint64_t index, const LogEntryPtr & log_entry)
+{
+    if (index_to_start_pos.count(index) == 0)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot write at index {} because changelog doesn't contain it", index);
+
+    bool go_to_previous_file = index < current_writer->getStartIndex();
+    if (go_to_previous_file)
+    {
+        auto index_changelog = existing_changelogs.lower_bound(index);
+        ChangelogFileDescription description;
+        if (index_changelog->first == index)
+            description = index_changelog->second;
+        else
+            description = std::prev(index_changelog)->second;
+
+        current_writer = std::make_unique<ChangelogWriter>(description.path, WriteMode::Append, index_changelog->first);
+        current_writer->setEntriesWritten(description.to_log_index - description.from_log_index + 1);
+    }
+
+    auto entries_written = current_writer->getEntriesWritten();
+    current_writer->truncateToLength(index_to_start_pos[index]);
+
+    if (go_to_previous_file)
+    {
+        /// Remove all subsequent files
+        auto to_remove_itr = existing_changelogs.upper_bound(index);
+        for (auto itr = to_remove_itr; itr != existing_changelogs.end();)
+        {
+            std::filesystem::remove(itr->second.path);
+            itr = existing_changelogs.erase(itr);
+        }
+    }
+
+    /// Remove redundant logs from memory
+    for (uint64_t i = index; ; ++i)
+    {
+        auto log_itr = logs.find(i);
+        if (log_itr == logs.end())
+            break;
+        logs.erase(log_itr);
+        index_to_start_pos.erase(i);
+        entries_written--;
+    }
+
+    current_writer->setEntriesWritten(entries_written);
+
+    appendEntry(index, log_entry);
+}
+
+void Changelog::compact(uint64_t up_to_log_index)
+{
+    for (auto itr = existing_changelogs.begin(); itr != existing_changelogs.end();)
+    {
+        /// Remove all completely outdated changelog files
+        if (itr->second.to_log_index <= up_to_log_index)
+        {
+
+            LOG_INFO(log, "Removing changelog {} because of compaction", itr->second.path);
+            std::erase_if(index_to_start_pos, [right_index = itr->second.to_log_index] (const auto & item) { return item.first <= right_index; });
+            std::filesystem::remove(itr->second.path);
+            itr = existing_changelogs.erase(itr);
+        }
+        else /// Files are ordered, so all subsequent should exist
+            break;
+    }
+    start_index = up_to_log_index + 1;
+    std::erase_if(logs, [up_to_log_index] (const auto & item) { return item.first <= up_to_log_index; });
+}
+
+LogEntryPtr Changelog::getLastEntry() const
+{
+    static LogEntryPtr fake_entry = nuraft::cs_new<nuraft::log_entry>(0, nuraft::buffer::alloc(sizeof(uint64_t)));
+
+    uint64_t next_index = getNextEntryIndex() - 1;
+    auto entry = logs.find(next_index);
+    if (entry == logs.end())
+        return fake_entry;
+
+    return entry->second;
+}
+
+LogEntriesPtr Changelog::getLogEntriesBetween(uint64_t start, uint64_t end)
+{
+    LogEntriesPtr ret = nuraft::cs_new<std::vector<nuraft::ptr<nuraft::log_entry>>>();
+
+    ret->resize(end - start);
+    uint64_t result_pos = 0;
+    for (uint64_t i = start; i < end; ++i)
+    {
+        (*ret)[result_pos] = entryAt(i);
+        result_pos++;
+    }
+    return ret;
+}
+
+LogEntryPtr Changelog::entryAt(uint64_t index)
+{
+    nuraft::ptr<nuraft::log_entry> src = nullptr;
+    auto entry = logs.find(index);
+    if (entry == logs.end())
+        return nullptr;
+
+    src = entry->second;
+    return src;
+}
+
+nuraft::ptr<nuraft::buffer> Changelog::serializeEntriesToBuffer(uint64_t index, int32_t count)
+{
+    std::vector<nuraft::ptr<nuraft::buffer>> returned_logs;
+
+    uint64_t size_total = 0;
+    for (uint64_t i = index; i < index + count; ++i)
+    {
+        auto entry = logs.find(i);
+        if (entry == logs.end())
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Don't have log entry {}", i);
+
+        nuraft::ptr<nuraft::buffer> buf = entry->second->serialize();
+        size_total += buf->size();
+        returned_logs.push_back(buf);
+    }
+
+    nuraft::ptr<nuraft::buffer> buf_out = nuraft::buffer::alloc(sizeof(int32_t) + count * sizeof(int32_t) + size_total);
+    buf_out->pos(0);
+    buf_out->put(static_cast<int32_t>(count));
+
+    for (auto & entry : returned_logs)
+    {
+        nuraft::ptr<nuraft::buffer> & bb = entry;
+        buf_out->put(static_cast<int32_t>(bb->size()));
+        buf_out->put(*bb);
+    }
+    return buf_out;
+}
+
+void Changelog::applyEntriesFromBuffer(uint64_t index, nuraft::buffer & buffer)
+{
+    buffer.pos(0);
+    int num_logs = buffer.get_int();
+
+    for (int i = 0; i < num_logs; ++i)
+    {
+        uint64_t cur_index = index + i;
+        int buf_size = buffer.get_int();
+
+        nuraft::ptr<nuraft::buffer> buf_local = nuraft::buffer::alloc(buf_size);
+        buffer.get(buf_local);
+
+        LogEntryPtr log_entry = nuraft::log_entry::deserialize(*buf_local);
+        if (i == 0 && logs.count(cur_index))
+            writeAt(cur_index, log_entry);
+        else
+            appendEntry(cur_index, log_entry);
+    }
+}
+
+void Changelog::flush()
+{
+    if (current_writer)
+        current_writer->flush(force_sync);
+}
+
+Changelog::~Changelog()
+{
+    try
+    {
+        flush();
+    }
+    catch (...)
+    {
+        tryLogCurrentException(__PRETTY_FUNCTION__);
+    }
+}
+
+}
diff --git a/src/Coordination/Changelog.h b/src/Coordination/Changelog.h
new file mode 100644
index 00000000000..d669f56aded
--- /dev/null
+++ b/src/Coordination/Changelog.h
@@ -0,0 +1,137 @@
+#pragma once
+
+#include <libnuraft/nuraft.hxx> // Y_IGNORE
+#include <city.h>
+#include <IO/WriteBufferFromFile.h>
+#include <IO/HashingWriteBuffer.h>
+#include <Compression/CompressedWriteBuffer.h>
+#include <Disks/IDisk.h>
+
+namespace DB
+{
+
+using Checksum = UInt64;
+
+using LogEntryPtr = nuraft::ptr<nuraft::log_entry>;
+using LogEntries = std::vector<LogEntryPtr>;
+using LogEntriesPtr = nuraft::ptr<LogEntries>;
+using BufferPtr = nuraft::ptr<nuraft::buffer>;
+
+using IndexToOffset = std::unordered_map<uint64_t, off_t>;
+using IndexToLogEntry = std::unordered_map<uint64_t, LogEntryPtr>;
+
+enum class ChangelogVersion : uint8_t
+{
+    V0 = 0,
+};
+
+static constexpr auto CURRENT_CHANGELOG_VERSION = ChangelogVersion::V0;
+
+struct ChangelogRecordHeader
+{
+    ChangelogVersion version = CURRENT_CHANGELOG_VERSION;
+    uint64_t index; /// entry log number
+    uint64_t term;
+    nuraft::log_val_type value_type;
+    uint64_t blob_size;
+};
+
+/// Changelog record on disk
+struct ChangelogRecord
+{
+    ChangelogRecordHeader header;
+    nuraft::ptr<nuraft::buffer> blob;
+};
+
+/// changelog_fromindex_toindex.bin
+/// [fromindex, toindex] <- inclusive
+struct ChangelogFileDescription
+{
+    std::string prefix;
+    uint64_t from_log_index;
+    uint64_t to_log_index;
+
+    std::string path;
+};
+
+class ChangelogWriter;
+
+/// Simplest changelog with files rotation.
+/// No compression, no metadata, just entries with headers one by one
+/// Able to read broken files/entries and discard them.
+class Changelog
+{
+
+public:
+    Changelog(const std::string & changelogs_dir_, uint64_t rotate_interval_, bool force_sync_, Poco::Logger * log_);
+
+    /// Read changelog from files on changelogs_dir_ skipping all entries before from_log_index
+    /// Truncate broken entries, remove files after broken entries.
+    void readChangelogAndInitWriter(uint64_t last_commited_log_index, uint64_t logs_to_keep);
+
+    /// Add entry to log with index.
+    void appendEntry(uint64_t index, const LogEntryPtr & log_entry);
+
+    /// Write entry at index and truncate all subsequent entries.
+    void writeAt(uint64_t index, const LogEntryPtr & log_entry);
+
+    /// Remove log files with to_log_index <= up_to_log_index.
+    void compact(uint64_t up_to_log_index);
+
+    uint64_t getNextEntryIndex() const
+    {
+        return start_index + logs.size();
+    }
+
+    uint64_t getStartIndex() const
+    {
+        return start_index;
+    }
+
+    /// Last entry in log, or fake entry with term 0 if log is empty
+    LogEntryPtr getLastEntry() const;
+
+    /// Return log entries between [start, end)
+    LogEntriesPtr getLogEntriesBetween(uint64_t start_index, uint64_t end_index);
+
+    /// Return entry at position index
+    LogEntryPtr entryAt(uint64_t index);
+
+    /// Serialize entries from index into buffer
+    BufferPtr serializeEntriesToBuffer(uint64_t index, int32_t count);
+
+    /// Apply entries from buffer overriding existing entries
+    void applyEntriesFromBuffer(uint64_t index, nuraft::buffer & buffer);
+
+    /// Fsync latest log to disk and flush buffer
+    void flush();
+
+    uint64_t size() const
+    {
+        return logs.size();
+    }
+
+    /// Fsync log to disk
+    ~Changelog();
+
+private:
+    /// Pack log_entry into changelog record
+    static ChangelogRecord buildRecord(uint64_t index, const LogEntryPtr & log_entry);
+
+    /// Starts new file [new_start_log_index, new_start_log_index + rotate_interval]
+    void rotate(uint64_t new_start_log_index);
+
+private:
+    const std::string changelogs_dir;
+    const uint64_t rotate_interval;
+    const bool force_sync;
+    Poco::Logger * log;
+
+    std::map<uint64_t, ChangelogFileDescription> existing_changelogs;
+    std::unique_ptr<ChangelogWriter> current_writer;
+    IndexToOffset index_to_start_pos;
+    IndexToLogEntry logs;
+    uint64_t start_index = 0;
+};
+
+}
diff --git a/src/Coordination/CoordinationSettings.h b/src/Coordination/CoordinationSettings.h
index 441e1a5936f..7a98e3f200d 100644
--- a/src/Coordination/CoordinationSettings.h
+++ b/src/Coordination/CoordinationSettings.h
@@ -22,13 +22,19 @@ struct Settings;
     M(Milliseconds, heart_beat_interval_ms, 500, "Heartbeat interval between quorum nodes", 0) \
     M(Milliseconds, election_timeout_lower_bound_ms, 1000, "Lower bound of election timer (avoid too often leader elections)", 0) \
     M(Milliseconds, election_timeout_upper_bound_ms, 2000, "Lower bound of election timer (avoid too often leader elections)", 0) \
-    M(UInt64, reserved_log_items, 5000, "How many log items to store (don't remove during compaction)", 0) \
-    M(UInt64, snapshot_distance, 5000, "How many log items we have to collect to write new snapshot", 0) \
-    M(UInt64, max_stored_snapshots, 3, "How many snapshots we want to store", 0) \
+    M(UInt64, reserved_log_items, 100000, "How many log items to store (don't remove during compaction)", 0) \
+    M(UInt64, snapshot_distance, 100000, "How many log items we have to collect to write new snapshot", 0) \
     M(Bool, auto_forwarding, true, "Allow to forward write requests from followers to leader", 0) \
     M(Milliseconds, shutdown_timeout, 5000, "How many time we will until RAFT shutdown", 0) \
     M(Milliseconds, startup_timeout, 30000, "How many time we will until RAFT to start", 0) \
-    M(LogsLevel, raft_logs_level, LogsLevel::information, "Log internal RAFT logs into main server log level. Valid values: 'trace', 'debug', 'information', 'warning', 'error', 'fatal', 'none'", 0)
+    M(LogsLevel, raft_logs_level, LogsLevel::information, "Log internal RAFT logs into main server log level. Valid values: 'trace', 'debug', 'information', 'warning', 'error', 'fatal', 'none'", 0) \
+    M(UInt64, rotate_log_storage_interval, 100000, "How many records will be stored in one log storage file", 0) \
+    M(UInt64, snapshots_to_keep, 3, "How many compressed snapshots to keep on disk", 0) \
+    M(UInt64, stale_log_gap, 10000, "When node became stale and should receive snapshots from leader", 0) \
+    M(UInt64, fresh_log_gap, 200, "When node became fresh", 0) \
+    M(UInt64, max_requests_batch_size, 100, "Max size of batch in requests count before it will be sent to RAFT", 0) \
+    M(Bool, quorum_reads, false, "Execute read requests as writes through whole RAFT consesus with similar speed", 0) \
+    M(Bool, force_sync, true, "Call fsync on each change in RAFT changelog", 0)
 
 DECLARE_SETTINGS_TRAITS(CoordinationSettingsTraits, LIST_OF_COORDINATION_SETTINGS)
 
diff --git a/src/Coordination/InMemoryLogStore.cpp b/src/Coordination/InMemoryLogStore.cpp
index 101458891e7..b7bccdf588e 100644
--- a/src/Coordination/InMemoryLogStore.cpp
+++ b/src/Coordination/InMemoryLogStore.cpp
@@ -16,16 +16,16 @@ ptr<log_entry> makeClone(const ptr<log_entry> & entry)
 InMemoryLogStore::InMemoryLogStore()
     : start_idx(1)
 {
-    nuraft::ptr<nuraft::buffer> buf = nuraft::buffer::alloc(sizeof(size_t));
+    nuraft::ptr<nuraft::buffer> buf = nuraft::buffer::alloc(sizeof(uint64_t));
     logs[0] = nuraft::cs_new<nuraft::log_entry>(0, buf);
 }
 
-size_t InMemoryLogStore::start_index() const
+uint64_t InMemoryLogStore::start_index() const
 {
     return start_idx;
 }
 
-size_t InMemoryLogStore::next_slot() const
+uint64_t InMemoryLogStore::next_slot() const
 {
     std::lock_guard<std::mutex> l(logs_lock);
     // Exclude the dummy entry.
@@ -34,7 +34,7 @@ size_t InMemoryLogStore::next_slot() const
 
 nuraft::ptr<nuraft::log_entry> InMemoryLogStore::last_entry() const
 {
-    size_t next_idx = next_slot();
+    uint64_t next_idx = next_slot();
     std::lock_guard<std::mutex> lock(logs_lock);
     auto entry = logs.find(next_idx - 1);
     if (entry == logs.end())
@@ -43,17 +43,17 @@ nuraft::ptr<nuraft::log_entry> InMemoryLogStore::last_entry() const
     return makeClone(entry->second);
 }
 
-size_t InMemoryLogStore::append(nuraft::ptr<nuraft::log_entry> & entry)
+uint64_t InMemoryLogStore::append(nuraft::ptr<nuraft::log_entry> & entry)
 {
     ptr<log_entry> clone = makeClone(entry);
 
     std::lock_guard<std::mutex> l(logs_lock);
-    size_t idx = start_idx + logs.size() - 1;
+    uint64_t idx = start_idx + logs.size() - 1;
     logs[idx] = clone;
     return idx;
 }
 
-void InMemoryLogStore::write_at(size_t index, nuraft::ptr<nuraft::log_entry> & entry)
+void InMemoryLogStore::write_at(uint64_t index, nuraft::ptr<nuraft::log_entry> & entry)
 {
     nuraft::ptr<log_entry> clone = makeClone(entry);
 
@@ -65,19 +65,19 @@ void InMemoryLogStore::write_at(size_t index, nuraft::ptr<nuraft::log_entry> & e
     logs[index] = clone;
 }
 
-nuraft::ptr<std::vector<nuraft::ptr<nuraft::log_entry>>> InMemoryLogStore::log_entries(size_t start, size_t end)
+nuraft::ptr<std::vector<nuraft::ptr<nuraft::log_entry>>> InMemoryLogStore::log_entries(uint64_t start, uint64_t end)
 {
     nuraft::ptr<std::vector<nuraft::ptr<nuraft::log_entry>>> ret =
         nuraft::cs_new<std::vector<nuraft::ptr<nuraft::log_entry>>>();
 
     ret->resize(end - start);
-    size_t cc = 0;
-    for (size_t ii = start; ii < end; ++ii)
+    uint64_t cc = 0;
+    for (uint64_t i = start; i < end; ++i)
     {
         nuraft::ptr<nuraft::log_entry> src = nullptr;
         {
             std::lock_guard<std::mutex> l(logs_lock);
-            auto entry = logs.find(ii);
+            auto entry = logs.find(i);
             if (entry == logs.end())
             {
                 entry = logs.find(0);
@@ -90,7 +90,7 @@ nuraft::ptr<std::vector<nuraft::ptr<nuraft::log_entry>>> InMemoryLogStore::log_e
     return ret;
 }
 
-nuraft::ptr<nuraft::log_entry> InMemoryLogStore::entry_at(size_t index)
+nuraft::ptr<nuraft::log_entry> InMemoryLogStore::entry_at(uint64_t index)
 {
     nuraft::ptr<nuraft::log_entry> src = nullptr;
     {
@@ -103,9 +103,9 @@ nuraft::ptr<nuraft::log_entry> InMemoryLogStore::entry_at(size_t index)
     return makeClone(src);
 }
 
-size_t InMemoryLogStore::term_at(size_t index)
+uint64_t InMemoryLogStore::term_at(uint64_t index)
 {
-    size_t term = 0;
+    uint64_t term = 0;
     {
         std::lock_guard<std::mutex> l(logs_lock);
         auto entry = logs.find(index);
@@ -116,12 +116,12 @@ size_t InMemoryLogStore::term_at(size_t index)
     return term;
 }
 
-nuraft::ptr<nuraft::buffer> InMemoryLogStore::pack(size_t index, Int32 cnt)
+nuraft::ptr<nuraft::buffer> InMemoryLogStore::pack(uint64_t index, Int32 cnt)
 {
     std::vector<nuraft::ptr<nuraft::buffer>> returned_logs;
 
-    size_t size_total = 0;
-    for (size_t ii = index; ii < index + cnt; ++ii)
+    uint64_t uint64_total = 0;
+    for (uint64_t ii = index; ii < index + cnt; ++ii)
     {
         ptr<log_entry> le = nullptr;
         {
@@ -130,11 +130,11 @@ nuraft::ptr<nuraft::buffer> InMemoryLogStore::pack(size_t index, Int32 cnt)
         }
         assert(le.get());
         nuraft::ptr<nuraft::buffer> buf = le->serialize();
-        size_total += buf->size();
+        uint64_total += buf->size();
         returned_logs.push_back(buf);
     }
 
-    nuraft::ptr<buffer> buf_out = nuraft::buffer::alloc(sizeof(int32) + cnt * sizeof(int32) + size_total);
+    nuraft::ptr<buffer> buf_out = nuraft::buffer::alloc(sizeof(int32) + cnt * sizeof(int32) + uint64_total);
     buf_out->pos(0);
     buf_out->put(static_cast<Int32>(cnt));
 
@@ -147,14 +147,14 @@ nuraft::ptr<nuraft::buffer> InMemoryLogStore::pack(size_t index, Int32 cnt)
     return buf_out;
 }
 
-void InMemoryLogStore::apply_pack(size_t index, nuraft::buffer & pack)
+void InMemoryLogStore::apply_pack(uint64_t index, nuraft::buffer & pack)
 {
     pack.pos(0);
     Int32 num_logs = pack.get_int();
 
-    for (Int32 ii = 0; ii < num_logs; ++ii)
+    for (Int32 i = 0; i < num_logs; ++i)
     {
-        size_t cur_idx = index + ii;
+        uint64_t cur_idx = index + i;
         Int32 buf_size = pack.get_int();
 
         nuraft::ptr<nuraft::buffer> buf_local = nuraft::buffer::alloc(buf_size);
@@ -177,10 +177,10 @@ void InMemoryLogStore::apply_pack(size_t index, nuraft::buffer & pack)
     }
 }
 
-bool InMemoryLogStore::compact(size_t last_log_index)
+bool InMemoryLogStore::compact(uint64_t last_log_index)
 {
     std::lock_guard<std::mutex> l(logs_lock);
-    for (size_t ii = start_idx; ii <= last_log_index; ++ii)
+    for (uint64_t ii = start_idx; ii <= last_log_index; ++ii)
     {
         auto entry = logs.find(ii);
         if (entry != logs.end())
diff --git a/src/Coordination/InMemoryLogStore.h b/src/Coordination/InMemoryLogStore.h
index 425b056a81d..caa5e31698d 100644
--- a/src/Coordination/InMemoryLogStore.h
+++ b/src/Coordination/InMemoryLogStore.h
@@ -14,34 +14,34 @@ class InMemoryLogStore : public nuraft::log_store
 public:
     InMemoryLogStore();
 
-    size_t start_index() const override;
+    uint64_t start_index() const override;
 
-    size_t next_slot() const override;
+    uint64_t next_slot() const override;
 
     nuraft::ptr<nuraft::log_entry> last_entry() const override;
 
-    size_t append(nuraft::ptr<nuraft::log_entry> & entry) override;
+    uint64_t append(nuraft::ptr<nuraft::log_entry> & entry) override;
 
-    void write_at(size_t index, nuraft::ptr<nuraft::log_entry> & entry) override;
+    void write_at(uint64_t index, nuraft::ptr<nuraft::log_entry> & entry) override;
 
-    nuraft::ptr<std::vector<nuraft::ptr<nuraft::log_entry>>> log_entries(size_t start, size_t end) override;
+    nuraft::ptr<std::vector<nuraft::ptr<nuraft::log_entry>>> log_entries(uint64_t start, uint64_t end) override;
 
-    nuraft::ptr<nuraft::log_entry> entry_at(size_t index) override;
+    nuraft::ptr<nuraft::log_entry> entry_at(uint64_t index) override;
 
-    size_t term_at(size_t index) override;
+    uint64_t term_at(uint64_t index) override;
 
-    nuraft::ptr<nuraft::buffer> pack(size_t index, Int32 cnt) override;
+    nuraft::ptr<nuraft::buffer> pack(uint64_t index, Int32 cnt) override;
 
-    void apply_pack(size_t index, nuraft::buffer & pack) override;
+    void apply_pack(uint64_t index, nuraft::buffer & pack) override;
 
-    bool compact(size_t last_log_index) override;
+    bool compact(uint64_t last_log_index) override;
 
     bool flush() override { return true; }
 
 private:
-    std::map<size_t, nuraft::ptr<nuraft::log_entry>> logs;
+    std::map<uint64_t, nuraft::ptr<nuraft::log_entry>> logs;
     mutable std::mutex logs_lock;
-    std::atomic<size_t> start_idx;
+    std::atomic<uint64_t> start_idx;
 };
 
 }
diff --git a/src/Coordination/KeeperLogStore.cpp b/src/Coordination/KeeperLogStore.cpp
new file mode 100644
index 00000000000..3896cf9b6fd
--- /dev/null
+++ b/src/Coordination/KeeperLogStore.cpp
@@ -0,0 +1,114 @@
+#include <Coordination/KeeperLogStore.h>
+
+namespace DB
+{
+
+KeeperLogStore::KeeperLogStore(const std::string & changelogs_path, uint64_t rotate_interval_, bool force_sync_)
+    : log(&Poco::Logger::get("KeeperLogStore"))
+    , changelog(changelogs_path, rotate_interval_, force_sync_, log)
+{
+    if (force_sync_)
+        LOG_INFO(log, "force_sync enabled");
+    else
+        LOG_INFO(log, "force_sync disabled");
+}
+
+uint64_t KeeperLogStore::start_index() const
+{
+    std::lock_guard lock(changelog_lock);
+    return changelog.getStartIndex();
+}
+
+void KeeperLogStore::init(uint64_t last_commited_log_index, uint64_t logs_to_keep)
+{
+    std::lock_guard lock(changelog_lock);
+    changelog.readChangelogAndInitWriter(last_commited_log_index, logs_to_keep);
+}
+
+uint64_t KeeperLogStore::next_slot() const
+{
+    std::lock_guard lock(changelog_lock);
+    return changelog.getNextEntryIndex();
+}
+
+nuraft::ptr<nuraft::log_entry> KeeperLogStore::last_entry() const
+{
+    std::lock_guard lock(changelog_lock);
+    return changelog.getLastEntry();
+}
+
+uint64_t KeeperLogStore::append(nuraft::ptr<nuraft::log_entry> & entry)
+{
+    std::lock_guard lock(changelog_lock);
+    uint64_t idx = changelog.getNextEntryIndex();
+    changelog.appendEntry(idx, entry);
+    return idx;
+}
+
+
+void KeeperLogStore::write_at(uint64_t index, nuraft::ptr<nuraft::log_entry> & entry)
+{
+    std::lock_guard lock(changelog_lock);
+    changelog.writeAt(index, entry);
+}
+
+nuraft::ptr<std::vector<nuraft::ptr<nuraft::log_entry>>> KeeperLogStore::log_entries(uint64_t start, uint64_t end)
+{
+    std::lock_guard lock(changelog_lock);
+    return changelog.getLogEntriesBetween(start, end);
+}
+
+nuraft::ptr<nuraft::log_entry> KeeperLogStore::entry_at(uint64_t index)
+{
+    std::lock_guard lock(changelog_lock);
+    return changelog.entryAt(index);
+}
+
+uint64_t KeeperLogStore::term_at(uint64_t index)
+{
+    std::lock_guard lock(changelog_lock);
+    auto entry = changelog.entryAt(index);
+    if (entry)
+        return entry->get_term();
+    return 0;
+}
+
+nuraft::ptr<nuraft::buffer> KeeperLogStore::pack(uint64_t index, int32_t cnt)
+{
+    std::lock_guard lock(changelog_lock);
+    return changelog.serializeEntriesToBuffer(index, cnt);
+}
+
+bool KeeperLogStore::compact(uint64_t last_log_index)
+{
+    std::lock_guard lock(changelog_lock);
+    changelog.compact(last_log_index);
+    return true;
+}
+
+bool KeeperLogStore::flush()
+{
+    std::lock_guard lock(changelog_lock);
+    changelog.flush();
+    return true;
+}
+
+void KeeperLogStore::apply_pack(uint64_t index, nuraft::buffer & pack)
+{
+    std::lock_guard lock(changelog_lock);
+    changelog.applyEntriesFromBuffer(index, pack);
+}
+
+uint64_t KeeperLogStore::size() const
+{
+    std::lock_guard lock(changelog_lock);
+    return changelog.size();
+}
+
+void KeeperLogStore::end_of_append_batch(uint64_t /*start_index*/, uint64_t /*count*/)
+{
+    std::lock_guard lock(changelog_lock);
+    changelog.flush();
+}
+
+}
diff --git a/src/Coordination/KeeperLogStore.h b/src/Coordination/KeeperLogStore.h
new file mode 100644
index 00000000000..01315e6e879
--- /dev/null
+++ b/src/Coordination/KeeperLogStore.h
@@ -0,0 +1,53 @@
+#pragma once
+#include <libnuraft/log_store.hxx> // Y_IGNORE
+#include <map>
+#include <mutex>
+#include <Core/Types.h>
+#include <Coordination/Changelog.h>
+#include <common/logger_useful.h>
+
+namespace DB
+{
+
+class KeeperLogStore : public nuraft::log_store
+{
+public:
+    KeeperLogStore(const std::string & changelogs_path, uint64_t rotate_interval_, bool force_sync_);
+
+    void init(uint64_t last_commited_log_index, uint64_t logs_to_keep);
+
+    uint64_t start_index() const override;
+
+    uint64_t next_slot() const override;
+
+    nuraft::ptr<nuraft::log_entry> last_entry() const override;
+
+    uint64_t append(nuraft::ptr<nuraft::log_entry> & entry) override;
+
+    void write_at(uint64_t index, nuraft::ptr<nuraft::log_entry> & entry) override;
+
+    nuraft::ptr<std::vector<nuraft::ptr<nuraft::log_entry>>> log_entries(uint64_t start, uint64_t end) override;
+
+    nuraft::ptr<nuraft::log_entry> entry_at(uint64_t index) override;
+
+    uint64_t term_at(uint64_t index) override;
+
+    nuraft::ptr<nuraft::buffer> pack(uint64_t index, int32_t cnt) override;
+
+    void apply_pack(uint64_t index, nuraft::buffer & pack) override;
+
+    bool compact(uint64_t last_log_index) override;
+
+    bool flush() override;
+
+    uint64_t size() const;
+
+    void end_of_append_batch(uint64_t start_index, uint64_t count) override;
+
+private:
+    mutable std::mutex changelog_lock;
+    Poco::Logger * log;
+    Changelog changelog;
+};
+
+}
diff --git a/src/Coordination/KeeperServer.cpp b/src/Coordination/KeeperServer.cpp
new file mode 100644
index 00000000000..6557ad5504d
--- /dev/null
+++ b/src/Coordination/KeeperServer.cpp
@@ -0,0 +1,330 @@
+#include <Coordination/KeeperServer.h>
+
+#if !defined(ARCADIA_BUILD)
+#   include "config_core.h"
+#endif
+
+#include <Coordination/LoggerWrapper.h>
+#include <Coordination/KeeperStateMachine.h>
+#include <Coordination/KeeperStateManager.h>
+#include <Coordination/WriteBufferFromNuraftBuffer.h>
+#include <Coordination/ReadBufferFromNuraftBuffer.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <chrono>
+#include <Common/ZooKeeper/ZooKeeperIO.h>
+#include <string>
+#include <Poco/Util/Application.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int RAFT_ERROR;
+    extern const int NO_ELEMENTS_IN_CONFIG;
+    extern const int SUPPORT_IS_DISABLED;
+    extern const int LOGICAL_ERROR;
+}
+
+namespace
+{
+
+#if USE_SSL
+void setSSLParams(nuraft::asio_service::options & asio_opts)
+{
+    const Poco::Util::LayeredConfiguration & config = Poco::Util::Application::instance().config();
+    String certificate_file_property = "openSSL.server.certificateFile";
+    String private_key_file_property = "openSSL.server.privateKeyFile";
+    String root_ca_file_property = "openSSL.server.caConfig";
+
+    if (!config.has(certificate_file_property))
+        throw Exception("Server certificate file is not set.", ErrorCodes::NO_ELEMENTS_IN_CONFIG);
+
+    if (!config.has(private_key_file_property))
+        throw Exception("Server private key file is not set.", ErrorCodes::NO_ELEMENTS_IN_CONFIG);
+
+    asio_opts.enable_ssl_ = true;
+    asio_opts.server_cert_file_ = config.getString(certificate_file_property);
+    asio_opts.server_key_file_ = config.getString(private_key_file_property);
+
+    if (config.has(root_ca_file_property))
+        asio_opts.root_cert_file_ = config.getString(root_ca_file_property);
+
+    if (config.getBool("openSSL.server.loadDefaultCAFile", false))
+        asio_opts.load_default_ca_file_ = true;
+
+    if (config.getString("openSSL.server.verificationMode", "none") == "none")
+        asio_opts.skip_verification_ = true;
+}
+#endif
+
+}
+
+KeeperServer::KeeperServer(
+    int server_id_,
+    const CoordinationSettingsPtr & coordination_settings_,
+    const Poco::Util::AbstractConfiguration & config,
+    ResponsesQueue & responses_queue_,
+    SnapshotsQueue & snapshots_queue_)
+    : server_id(server_id_)
+    , coordination_settings(coordination_settings_)
+    , state_machine(nuraft::cs_new<KeeperStateMachine>(
+                        responses_queue_, snapshots_queue_,
+                        config.getString("keeper_server.snapshot_storage_path", config.getString("path", DBMS_DEFAULT_PATH) + "coordination/snapshots"),
+                        coordination_settings))
+    , state_manager(nuraft::cs_new<KeeperStateManager>(server_id, "keeper_server", config, coordination_settings))
+    , log(&Poco::Logger::get("KeeperServer"))
+{
+    if (coordination_settings->quorum_reads)
+        LOG_WARNING(log, "Quorum reads enabled, Keeper will work slower.");
+}
+
+void KeeperServer::startup()
+{
+    state_machine->init();
+
+    state_manager->loadLogStore(state_machine->last_commit_index() + 1, coordination_settings->reserved_log_items);
+
+    bool single_server = state_manager->getTotalServers() == 1;
+
+    nuraft::raft_params params;
+    if (single_server)
+    {
+        /// Don't make sense in single server mode
+        params.heart_beat_interval_ = 0;
+        params.election_timeout_lower_bound_ = 0;
+        params.election_timeout_upper_bound_ = 0;
+    }
+    else
+    {
+        params.heart_beat_interval_ = coordination_settings->heart_beat_interval_ms.totalMilliseconds();
+        params.election_timeout_lower_bound_ = coordination_settings->election_timeout_lower_bound_ms.totalMilliseconds();
+        params.election_timeout_upper_bound_ = coordination_settings->election_timeout_upper_bound_ms.totalMilliseconds();
+    }
+
+    params.reserved_log_items_ = coordination_settings->reserved_log_items;
+    params.snapshot_distance_ = coordination_settings->snapshot_distance;
+    params.stale_log_gap_ = coordination_settings->stale_log_gap;
+    params.fresh_log_gap_ = coordination_settings->fresh_log_gap;
+    params.client_req_timeout_ = coordination_settings->operation_timeout_ms.totalMilliseconds();
+    params.auto_forwarding_ = coordination_settings->auto_forwarding;
+    params.auto_forwarding_req_timeout_ = coordination_settings->operation_timeout_ms.totalMilliseconds() * 2;
+
+    params.return_method_ = nuraft::raft_params::async_handler;
+
+    nuraft::asio_service::options asio_opts{};
+    if (state_manager->isSecure())
+    {
+#if USE_SSL
+        setSSLParams(asio_opts);
+#else
+        throw Exception{"SSL support for NuRaft is disabled because ClickHouse was built without SSL support.",
+                        ErrorCodes::SUPPORT_IS_DISABLED};
+#endif
+    }
+
+    launchRaftServer(params, asio_opts);
+
+    if (!raft_instance)
+        throw Exception(ErrorCodes::RAFT_ERROR, "Cannot allocate RAFT instance");
+}
+
+void KeeperServer::launchRaftServer(
+    const nuraft::raft_params & params,
+    const nuraft::asio_service::options & asio_opts)
+{
+    nuraft::raft_server::init_options init_options;
+
+    init_options.skip_initial_election_timeout_ = state_manager->shouldStartAsFollower();
+    init_options.start_server_in_constructor_ = false;
+    init_options.raft_callback_ = [this] (nuraft::cb_func::Type type, nuraft::cb_func::Param * param)
+    {
+        return callbackFunc(type, param);
+    };
+
+    nuraft::ptr<nuraft::logger> logger = nuraft::cs_new<LoggerWrapper>("RaftInstance", coordination_settings->raft_logs_level);
+    asio_service = nuraft::cs_new<nuraft::asio_service>(asio_opts, logger);
+    asio_listener = asio_service->create_rpc_listener(state_manager->getPort(), logger);
+
+    if (!asio_listener)
+        return;
+
+    nuraft::ptr<nuraft::delayed_task_scheduler> scheduler = asio_service;
+    nuraft::ptr<nuraft::rpc_client_factory> rpc_cli_factory = asio_service;
+
+    nuraft::ptr<nuraft::state_mgr> casted_state_manager = state_manager;
+    nuraft::ptr<nuraft::state_machine> casted_state_machine = state_machine;
+
+    /// raft_server creates unique_ptr from it
+    nuraft::context * ctx = new nuraft::context(
+        casted_state_manager, casted_state_machine,
+        asio_listener, logger, rpc_cli_factory, scheduler, params);
+
+    raft_instance = nuraft::cs_new<nuraft::raft_server>(ctx, init_options);
+
+    raft_instance->start_server(init_options.skip_initial_election_timeout_);
+    asio_listener->listen(raft_instance);
+}
+
+void KeeperServer::shutdownRaftServer()
+{
+    size_t timeout = coordination_settings->shutdown_timeout.totalSeconds();
+
+    if (!raft_instance)
+    {
+        LOG_INFO(log, "RAFT doesn't start, shutdown not required");
+        return;
+    }
+
+    raft_instance->shutdown();
+    raft_instance.reset();
+
+    if (asio_listener)
+    {
+        asio_listener->stop();
+        asio_listener->shutdown();
+    }
+
+    if (asio_service)
+    {
+        asio_service->stop();
+        size_t count = 0;
+        while (asio_service->get_active_workers() != 0 && count < timeout * 100)
+        {
+            std::this_thread::sleep_for(std::chrono::milliseconds(10));
+            count++;
+        }
+    }
+
+    if (asio_service->get_active_workers() != 0)
+        LOG_WARNING(log, "Failed to shutdown RAFT server in {} seconds", timeout);
+}
+
+
+void KeeperServer::shutdown()
+{
+    state_machine->shutdownStorage();
+    state_manager->flushLogStore();
+    shutdownRaftServer();
+}
+
+namespace
+{
+
+nuraft::ptr<nuraft::buffer> getZooKeeperLogEntry(int64_t session_id, const Coordination::ZooKeeperRequestPtr & request)
+{
+    DB::WriteBufferFromNuraftBuffer buf;
+    DB::writeIntBinary(session_id, buf);
+    request->write(buf);
+    return buf.getBuffer();
+}
+
+}
+
+
+void KeeperServer::putLocalReadRequest(const KeeperStorage::RequestForSession & request_for_session)
+{
+    if (!request_for_session.request->isReadRequest())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot process non-read request locally");
+
+    state_machine->processReadRequest(request_for_session);
+}
+
+RaftAppendResult KeeperServer::putRequestBatch(const KeeperStorage::RequestsForSessions & requests_for_sessions)
+{
+
+    std::vector<nuraft::ptr<nuraft::buffer>> entries;
+    for (const auto & [session_id, request] : requests_for_sessions)
+        entries.push_back(getZooKeeperLogEntry(session_id, request));
+
+    {
+        std::lock_guard lock(append_entries_mutex);
+        return raft_instance->append_entries(entries);
+    }
+}
+
+bool KeeperServer::isLeader() const
+{
+    return raft_instance->is_leader();
+}
+
+bool KeeperServer::isLeaderAlive() const
+{
+    return raft_instance->is_leader_alive();
+}
+
+nuraft::cb_func::ReturnCode KeeperServer::callbackFunc(nuraft::cb_func::Type type, nuraft::cb_func::Param * param)
+{
+    if (initialized_flag)
+        return nuraft::cb_func::ReturnCode::Ok;
+
+    size_t last_commited = state_machine->last_commit_index();
+    size_t next_index = state_manager->getLogStore()->next_slot();
+    bool commited_store = false;
+    if (next_index < last_commited || next_index - last_commited <= 1)
+        commited_store = true;
+
+    auto set_initialized = [this] ()
+    {
+        std::unique_lock lock(initialized_mutex);
+        initialized_flag = true;
+        initialized_cv.notify_all();
+    };
+
+    switch (type)
+    {
+        case nuraft::cb_func::BecomeLeader:
+        {
+            /// We become leader and store is empty or we already committed it
+            if (commited_store || initial_batch_committed)
+                set_initialized();
+            return nuraft::cb_func::ReturnCode::Ok;
+        }
+        case nuraft::cb_func::BecomeFollower:
+        case nuraft::cb_func::GotAppendEntryReqFromLeader:
+        {
+            if (param->leaderId != -1)
+            {
+                auto leader_index = raft_instance->get_leader_committed_log_idx();
+                auto our_index = raft_instance->get_committed_log_idx();
+                /// This may happen when we start RAFT cluster from scratch.
+                /// Node first became leader, and after that some other node became leader.
+                /// BecameFresh for this node will not be called because it was already fresh
+                /// when it was leader.
+                if (leader_index < our_index + coordination_settings->fresh_log_gap)
+                    set_initialized();
+            }
+            return nuraft::cb_func::ReturnCode::Ok;
+        }
+        case nuraft::cb_func::BecomeFresh:
+        {
+            set_initialized(); /// We are fresh follower, ready to serve requests.
+            return nuraft::cb_func::ReturnCode::Ok;
+        }
+        case nuraft::cb_func::InitialBatchCommited:
+        {
+            if (param->myId == param->leaderId) /// We have committed our log store and we are leader, ready to serve requests.
+                set_initialized();
+            initial_batch_committed = true;
+            return nuraft::cb_func::ReturnCode::Ok;
+        }
+        default: /// ignore other events
+            return nuraft::cb_func::ReturnCode::Ok;
+    }
+}
+
+void KeeperServer::waitInit()
+{
+    std::unique_lock lock(initialized_mutex);
+    int64_t timeout = coordination_settings->startup_timeout.totalMilliseconds();
+    if (!initialized_cv.wait_for(lock, std::chrono::milliseconds(timeout), [&] { return initialized_flag.load(); }))
+        throw Exception(ErrorCodes::RAFT_ERROR, "Failed to wait RAFT initialization");
+}
+
+std::unordered_set<int64_t> KeeperServer::getDeadSessions()
+{
+    return state_machine->getDeadSessions();
+}
+
+}
diff --git a/src/Coordination/KeeperServer.h b/src/Coordination/KeeperServer.h
new file mode 100644
index 00000000000..11900ebb213
--- /dev/null
+++ b/src/Coordination/KeeperServer.h
@@ -0,0 +1,79 @@
+#pragma once
+
+#include <libnuraft/nuraft.hxx> // Y_IGNORE
+#include <Coordination/InMemoryLogStore.h>
+#include <Coordination/KeeperStateManager.h>
+#include <Coordination/KeeperStateMachine.h>
+#include <Coordination/KeeperStorage.h>
+#include <Coordination/CoordinationSettings.h>
+#include <unordered_map>
+#include <common/logger_useful.h>
+
+namespace DB
+{
+
+using RaftAppendResult = nuraft::ptr<nuraft::cmd_result<nuraft::ptr<nuraft::buffer>>>;
+
+class KeeperServer
+{
+private:
+    const int server_id;
+
+    CoordinationSettingsPtr coordination_settings;
+
+    nuraft::ptr<KeeperStateMachine> state_machine;
+
+    nuraft::ptr<KeeperStateManager> state_manager;
+
+    nuraft::ptr<nuraft::raft_server> raft_instance;
+    nuraft::ptr<nuraft::asio_service> asio_service;
+    nuraft::ptr<nuraft::rpc_listener> asio_listener;
+
+    std::mutex append_entries_mutex;
+
+    std::mutex initialized_mutex;
+    std::atomic<bool> initialized_flag = false;
+    std::condition_variable initialized_cv;
+    std::atomic<bool> initial_batch_committed = false;
+
+    Poco::Logger * log;
+
+    nuraft::cb_func::ReturnCode callbackFunc(nuraft::cb_func::Type type, nuraft::cb_func::Param * param);
+
+    /// Almost copy-paste from nuraft::launcher, but with separated server init and start
+    /// Allows to avoid race conditions.
+    void launchRaftServer(
+        const nuraft::raft_params & params,
+        const nuraft::asio_service::options & asio_opts);
+
+    void shutdownRaftServer();
+
+
+public:
+    KeeperServer(
+        int server_id_,
+        const CoordinationSettingsPtr & coordination_settings_,
+        const Poco::Util::AbstractConfiguration & config,
+        ResponsesQueue & responses_queue_,
+        SnapshotsQueue & snapshots_queue_);
+
+    void startup();
+
+    void putLocalReadRequest(const KeeperStorage::RequestForSession & request);
+
+    RaftAppendResult putRequestBatch(const KeeperStorage::RequestsForSessions & requests);
+
+    std::unordered_set<int64_t> getDeadSessions();
+
+    bool isLeader() const;
+
+    bool isLeaderAlive() const;
+
+    void waitInit();
+
+    void shutdown();
+
+    int getServerID() const { return server_id; }
+};
+
+}
diff --git a/src/Coordination/KeeperSnapshotManager.cpp b/src/Coordination/KeeperSnapshotManager.cpp
new file mode 100644
index 00000000000..3cfa07fb542
--- /dev/null
+++ b/src/Coordination/KeeperSnapshotManager.cpp
@@ -0,0 +1,366 @@
+#include <Coordination/KeeperSnapshotManager.h>
+#include <IO/WriteHelpers.h>
+#include <Compression/CompressedReadBuffer.h>
+#include <Compression/CompressedWriteBuffer.h>
+#include <IO/ReadHelpers.h>
+#include <Common/ZooKeeper/ZooKeeperIO.h>
+#include <Coordination/ReadBufferFromNuraftBuffer.h>
+#include <Coordination/WriteBufferFromNuraftBuffer.h>
+#include <IO/WriteBufferFromFile.h>
+#include <IO/ReadBufferFromFile.h>
+#include <IO/copyData.h>
+#include <filesystem>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int UNKNOWN_FORMAT_VERSION;
+    extern const int UNKNOWN_SNAPSHOT;
+    extern const int LOGICAL_ERROR;
+}
+
+namespace
+{
+    uint64_t getSnapshotPathUpToLogIdx(const String & snapshot_path)
+    {
+        std::filesystem::path path(snapshot_path);
+        std::string filename = path.stem();
+        Strings name_parts;
+        splitInto<'_'>(name_parts, filename);
+        return parse<uint64_t>(name_parts[1]);
+    }
+
+    std::string getSnapshotFileName(uint64_t up_to_log_idx)
+    {
+        return std::string{"snapshot_"} + std::to_string(up_to_log_idx) + ".bin";
+    }
+
+    std::string getBaseName(const String & path)
+    {
+        size_t basename_start = path.rfind('/');
+        return std::string{&path[basename_start + 1], path.length() - basename_start - 1};
+    }
+
+    String parentPath(const String & path)
+    {
+        auto rslash_pos = path.rfind('/');
+        if (rslash_pos > 0)
+            return path.substr(0, rslash_pos);
+        return "/";
+    }
+
+    void writeNode(const KeeperStorage::Node & node, WriteBuffer & out)
+    {
+        writeBinary(node.data, out);
+
+        /// Serialize ACL
+        writeBinary(node.acls.size(), out);
+        for (const auto & acl : node.acls)
+        {
+            writeBinary(acl.permissions, out);
+            writeBinary(acl.scheme, out);
+            writeBinary(acl.id, out);
+        }
+
+        writeBinary(node.is_sequental, out);
+        /// Serialize stat
+        writeBinary(node.stat.czxid, out);
+        writeBinary(node.stat.mzxid, out);
+        writeBinary(node.stat.ctime, out);
+        writeBinary(node.stat.mtime, out);
+        writeBinary(node.stat.version, out);
+        writeBinary(node.stat.cversion, out);
+        writeBinary(node.stat.aversion, out);
+        writeBinary(node.stat.ephemeralOwner, out);
+        writeBinary(node.stat.dataLength, out);
+        writeBinary(node.stat.numChildren, out);
+        writeBinary(node.stat.pzxid, out);
+
+        writeBinary(node.seq_num, out);
+    }
+
+    void readNode(KeeperStorage::Node & node, ReadBuffer & in)
+    {
+        readBinary(node.data, in);
+
+        /// Deserialize ACL
+        size_t acls_size;
+        readBinary(acls_size, in);
+        for (size_t i = 0; i < acls_size; ++i)
+        {
+            Coordination::ACL acl;
+            readBinary(acl.permissions, in);
+            readBinary(acl.scheme, in);
+            readBinary(acl.id, in);
+            node.acls.push_back(acl);
+        }
+        readBinary(node.is_sequental, in);
+
+        /// Deserialize stat
+        readBinary(node.stat.czxid, in);
+        readBinary(node.stat.mzxid, in);
+        readBinary(node.stat.ctime, in);
+        readBinary(node.stat.mtime, in);
+        readBinary(node.stat.version, in);
+        readBinary(node.stat.cversion, in);
+        readBinary(node.stat.aversion, in);
+        readBinary(node.stat.ephemeralOwner, in);
+        readBinary(node.stat.dataLength, in);
+        readBinary(node.stat.numChildren, in);
+        readBinary(node.stat.pzxid, in);
+        readBinary(node.seq_num, in);
+    }
+
+    void serializeSnapshotMetadata(const SnapshotMetadataPtr & snapshot_meta, WriteBuffer & out)
+    {
+        auto buffer = snapshot_meta->serialize();
+        writeVarUInt(buffer->size(), out);
+        out.write(reinterpret_cast<const char *>(buffer->data_begin()), buffer->size());
+    }
+
+    SnapshotMetadataPtr deserializeSnapshotMetadata(ReadBuffer & in)
+    {
+        size_t data_size;
+        readVarUInt(data_size, in);
+        auto buffer = nuraft::buffer::alloc(data_size);
+        in.readStrict(reinterpret_cast<char *>(buffer->data_begin()), data_size);
+        buffer->pos(0);
+        return SnapshotMetadata::deserialize(*buffer);
+    }
+}
+
+
+void KeeperStorageSnapshot::serialize(const KeeperStorageSnapshot & snapshot, WriteBuffer & out)
+{
+    writeBinary(static_cast<uint8_t>(snapshot.version), out);
+    serializeSnapshotMetadata(snapshot.snapshot_meta, out);
+    writeBinary(snapshot.session_id, out);
+    writeBinary(snapshot.snapshot_container_size, out);
+    size_t counter = 0;
+    for (auto it = snapshot.begin; counter < snapshot.snapshot_container_size; ++it, ++counter)
+    {
+        const auto & path = it->key;
+        const auto & node = it->value;
+        if (static_cast<size_t>(node.stat.mzxid) > snapshot.snapshot_meta->get_last_log_idx())
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Trying to serialize node with mzxid {}, but last snapshot index {}", node.stat.mzxid, snapshot.snapshot_meta->get_last_log_idx());
+
+        writeBinary(path, out);
+        writeNode(node, out);
+    }
+
+    size_t size = snapshot.session_and_timeout.size();
+    writeBinary(size, out);
+    for (const auto & [session_id, timeout] : snapshot.session_and_timeout)
+    {
+        writeBinary(session_id, out);
+        writeBinary(timeout, out);
+    }
+}
+
+SnapshotMetadataPtr KeeperStorageSnapshot::deserialize(KeeperStorage & storage, ReadBuffer & in)
+{
+    uint8_t version;
+    readBinary(version, in);
+    if (static_cast<SnapshotVersion>(version) > SnapshotVersion::V0)
+        throw Exception(ErrorCodes::UNKNOWN_FORMAT_VERSION, "Unsupported snapshot version {}", version);
+
+    SnapshotMetadataPtr result = deserializeSnapshotMetadata(in);
+    int64_t session_id;
+    readBinary(session_id, in);
+    storage.zxid = result->get_last_log_idx();
+    storage.session_id_counter = session_id;
+
+    size_t snapshot_container_size;
+    readBinary(snapshot_container_size, in);
+
+    size_t current_size = 0;
+    while (current_size < snapshot_container_size)
+    {
+        std::string path;
+        readBinary(path, in);
+        KeeperStorage::Node node;
+        readNode(node, in);
+        storage.container.insertOrReplace(path, node);
+        if (node.stat.ephemeralOwner != 0)
+            storage.ephemerals[node.stat.ephemeralOwner].insert(path);
+
+        current_size++;
+    }
+
+    for (const auto & itr : storage.container)
+    {
+        if (itr.key != "/")
+        {
+            auto parent_path = parentPath(itr.key);
+            storage.container.updateValue(parent_path, [&path = itr.key] (KeeperStorage::Node & value) { value.children.insert(getBaseName(path)); });
+        }
+    }
+
+    size_t active_sessions_size;
+    readBinary(active_sessions_size, in);
+
+    size_t current_session_size = 0;
+    while (current_session_size < active_sessions_size)
+    {
+        int64_t active_session_id, timeout;
+        readBinary(active_session_id, in);
+        readBinary(timeout, in);
+        storage.addSessionID(active_session_id, timeout);
+        current_session_size++;
+    }
+
+    return result;
+}
+
+KeeperStorageSnapshot::KeeperStorageSnapshot(KeeperStorage * storage_, uint64_t up_to_log_idx_)
+    : storage(storage_)
+    , snapshot_meta(std::make_shared<SnapshotMetadata>(up_to_log_idx_, 0, std::make_shared<nuraft::cluster_config>()))
+    , session_id(storage->session_id_counter)
+{
+    storage->enableSnapshotMode();
+    snapshot_container_size = storage->container.snapshotSize();
+    begin = storage->getSnapshotIteratorBegin();
+    session_and_timeout = storage->getActiveSessions();
+}
+
+KeeperStorageSnapshot::KeeperStorageSnapshot(KeeperStorage * storage_, const SnapshotMetadataPtr & snapshot_meta_)
+    : storage(storage_)
+    , snapshot_meta(snapshot_meta_)
+    , session_id(storage->session_id_counter)
+{
+    storage->enableSnapshotMode();
+    snapshot_container_size = storage->container.snapshotSize();
+    begin = storage->getSnapshotIteratorBegin();
+    session_and_timeout = storage->getActiveSessions();
+}
+
+KeeperStorageSnapshot::~KeeperStorageSnapshot()
+{
+    storage->disableSnapshotMode();
+}
+
+KeeperSnapshotManager::KeeperSnapshotManager(const std::string & snapshots_path_, size_t snapshots_to_keep_, size_t storage_tick_time_)
+    : snapshots_path(snapshots_path_)
+    , snapshots_to_keep(snapshots_to_keep_)
+    , storage_tick_time(storage_tick_time_)
+{
+    namespace fs = std::filesystem;
+
+    if (!fs::exists(snapshots_path))
+        fs::create_directories(snapshots_path);
+
+    for (const auto & p : fs::directory_iterator(snapshots_path))
+    {
+        if (startsWith(p.path(), "tmp_")) /// Unfinished tmp files
+        {
+            std::filesystem::remove(p);
+            continue;
+        }
+        size_t snapshot_up_to = getSnapshotPathUpToLogIdx(p.path());
+        existing_snapshots[snapshot_up_to] = p.path();
+    }
+
+    removeOutdatedSnapshotsIfNeeded();
+}
+
+
+std::string KeeperSnapshotManager::serializeSnapshotBufferToDisk(nuraft::buffer & buffer, uint64_t up_to_log_idx)
+{
+    ReadBufferFromNuraftBuffer reader(buffer);
+
+    auto snapshot_file_name = getSnapshotFileName(up_to_log_idx);
+    auto tmp_snapshot_file_name = "tmp_" + snapshot_file_name;
+    std::string tmp_snapshot_path = std::filesystem::path{snapshots_path} / tmp_snapshot_file_name;
+    std::string new_snapshot_path = std::filesystem::path{snapshots_path} / snapshot_file_name;
+
+    WriteBufferFromFile plain_buf(tmp_snapshot_path);
+    copyData(reader, plain_buf);
+    plain_buf.sync();
+
+    std::filesystem::rename(tmp_snapshot_path, new_snapshot_path);
+
+    existing_snapshots.emplace(up_to_log_idx, new_snapshot_path);
+    removeOutdatedSnapshotsIfNeeded();
+
+    return new_snapshot_path;
+}
+
+nuraft::ptr<nuraft::buffer> KeeperSnapshotManager::deserializeLatestSnapshotBufferFromDisk()
+{
+    while (!existing_snapshots.empty())
+    {
+        auto latest_itr = existing_snapshots.rbegin();
+        try
+        {
+            return deserializeSnapshotBufferFromDisk(latest_itr->first);
+        }
+        catch (const DB::Exception &)
+        {
+            std::filesystem::remove(latest_itr->second);
+            existing_snapshots.erase(latest_itr->first);
+            tryLogCurrentException(__PRETTY_FUNCTION__);
+        }
+    }
+
+    return nullptr;
+}
+
+nuraft::ptr<nuraft::buffer> KeeperSnapshotManager::deserializeSnapshotBufferFromDisk(uint64_t up_to_log_idx) const
+{
+    const std::string & snapshot_path = existing_snapshots.at(up_to_log_idx);
+    WriteBufferFromNuraftBuffer writer;
+    ReadBufferFromFile reader(snapshot_path);
+    copyData(reader, writer);
+    return writer.getBuffer();
+}
+
+nuraft::ptr<nuraft::buffer> KeeperSnapshotManager::serializeSnapshotToBuffer(const KeeperStorageSnapshot & snapshot)
+{
+    WriteBufferFromNuraftBuffer writer;
+    CompressedWriteBuffer compressed_writer(writer);
+
+    KeeperStorageSnapshot::serialize(snapshot, compressed_writer);
+    compressed_writer.finalize();
+    return writer.getBuffer();
+}
+
+SnapshotMetaAndStorage KeeperSnapshotManager::deserializeSnapshotFromBuffer(nuraft::ptr<nuraft::buffer> buffer) const
+{
+    ReadBufferFromNuraftBuffer reader(buffer);
+    CompressedReadBuffer compressed_reader(reader);
+    auto storage = std::make_unique<KeeperStorage>(storage_tick_time);
+    auto snapshot_metadata = KeeperStorageSnapshot::deserialize(*storage, compressed_reader);
+    return std::make_pair(snapshot_metadata, std::move(storage));
+}
+
+SnapshotMetaAndStorage KeeperSnapshotManager::restoreFromLatestSnapshot()
+{
+    if (existing_snapshots.empty())
+        return {};
+
+    auto buffer = deserializeLatestSnapshotBufferFromDisk();
+    if (!buffer)
+        return {};
+    return deserializeSnapshotFromBuffer(buffer);
+}
+
+void KeeperSnapshotManager::removeOutdatedSnapshotsIfNeeded()
+{
+    while (existing_snapshots.size() > snapshots_to_keep)
+        removeSnapshot(existing_snapshots.begin()->first);
+}
+
+void KeeperSnapshotManager::removeSnapshot(uint64_t log_idx)
+{
+    auto itr = existing_snapshots.find(log_idx);
+    if (itr == existing_snapshots.end())
+        throw Exception(ErrorCodes::UNKNOWN_SNAPSHOT, "Unknown snapshot with log index {}", log_idx);
+    std::filesystem::remove(itr->second);
+    existing_snapshots.erase(itr);
+
+}
+
+
+}
diff --git a/src/Coordination/KeeperSnapshotManager.h b/src/Coordination/KeeperSnapshotManager.h
new file mode 100644
index 00000000000..95d1ce831d4
--- /dev/null
+++ b/src/Coordination/KeeperSnapshotManager.h
@@ -0,0 +1,89 @@
+#pragma once
+#include <libnuraft/nuraft.hxx> // Y_IGNORE
+#include <Coordination/KeeperStorage.h>
+#include <IO/WriteBuffer.h>
+#include <IO/ReadBuffer.h>
+
+namespace DB
+{
+
+using SnapshotMetadata = nuraft::snapshot;
+using SnapshotMetadataPtr = std::shared_ptr<SnapshotMetadata>;
+
+enum SnapshotVersion : uint8_t
+{
+    V0 = 0,
+};
+
+struct KeeperStorageSnapshot
+{
+public:
+    KeeperStorageSnapshot(KeeperStorage * storage_, uint64_t up_to_log_idx_);
+
+    KeeperStorageSnapshot(KeeperStorage * storage_, const SnapshotMetadataPtr & snapshot_meta_);
+    ~KeeperStorageSnapshot();
+
+    static void serialize(const KeeperStorageSnapshot & snapshot, WriteBuffer & out);
+
+    static SnapshotMetadataPtr deserialize(KeeperStorage & storage, ReadBuffer & in);
+
+    KeeperStorage * storage;
+
+    SnapshotVersion version = SnapshotVersion::V0;
+    SnapshotMetadataPtr snapshot_meta;
+    int64_t session_id;
+    size_t snapshot_container_size;
+    KeeperStorage::Container::const_iterator begin;
+    SessionAndTimeout session_and_timeout;
+};
+
+using KeeperStorageSnapshotPtr = std::shared_ptr<KeeperStorageSnapshot>;
+using CreateSnapshotCallback = std::function<void(KeeperStorageSnapshotPtr &&)>;
+
+
+using SnapshotMetaAndStorage = std::pair<SnapshotMetadataPtr, KeeperStoragePtr>;
+
+class KeeperSnapshotManager
+{
+public:
+    KeeperSnapshotManager(const std::string & snapshots_path_, size_t snapshots_to_keep_, size_t storage_tick_time_ = 500);
+
+    SnapshotMetaAndStorage restoreFromLatestSnapshot();
+
+    static nuraft::ptr<nuraft::buffer> serializeSnapshotToBuffer(const KeeperStorageSnapshot & snapshot);
+    std::string serializeSnapshotBufferToDisk(nuraft::buffer & buffer, uint64_t up_to_log_idx);
+
+    SnapshotMetaAndStorage deserializeSnapshotFromBuffer(nuraft::ptr<nuraft::buffer> buffer) const;
+
+    nuraft::ptr<nuraft::buffer> deserializeSnapshotBufferFromDisk(uint64_t up_to_log_idx) const;
+    nuraft::ptr<nuraft::buffer> deserializeLatestSnapshotBufferFromDisk();
+
+    void removeSnapshot(uint64_t log_idx);
+
+    size_t totalSnapshots() const
+    {
+        return existing_snapshots.size();
+    }
+
+    size_t getLatestSnapshotIndex() const
+    {
+        if (!existing_snapshots.empty())
+            return existing_snapshots.rbegin()->first;
+        return 0;
+    }
+
+private:
+    void removeOutdatedSnapshotsIfNeeded();
+    const std::string snapshots_path;
+    const size_t snapshots_to_keep;
+    std::map<uint64_t, std::string> existing_snapshots;
+    size_t storage_tick_time;
+};
+
+struct CreateSnapshotTask
+{
+    KeeperStorageSnapshotPtr snapshot;
+    CreateSnapshotCallback create_snapshot;
+};
+
+}
diff --git a/src/Coordination/KeeperStateMachine.cpp b/src/Coordination/KeeperStateMachine.cpp
new file mode 100644
index 00000000000..df68b8df266
--- /dev/null
+++ b/src/Coordination/KeeperStateMachine.cpp
@@ -0,0 +1,301 @@
+#include <Coordination/KeeperStateMachine.h>
+#include <Coordination/ReadBufferFromNuraftBuffer.h>
+#include <Coordination/WriteBufferFromNuraftBuffer.h>
+#include <IO/ReadHelpers.h>
+#include <Common/ZooKeeper/ZooKeeperIO.h>
+#include <Coordination/KeeperSnapshotManager.h>
+#include <future>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+KeeperStorage::RequestForSession parseRequest(nuraft::buffer & data)
+{
+    ReadBufferFromNuraftBuffer buffer(data);
+    KeeperStorage::RequestForSession request_for_session;
+    readIntBinary(request_for_session.session_id, buffer);
+
+    int32_t length;
+    Coordination::read(length, buffer);
+
+    int32_t xid;
+    Coordination::read(xid, buffer);
+
+    Coordination::OpNum opnum;
+
+    Coordination::read(opnum, buffer);
+
+    request_for_session.request = Coordination::ZooKeeperRequestFactory::instance().get(opnum);
+    request_for_session.request->xid = xid;
+    request_for_session.request->readImpl(buffer);
+    return request_for_session;
+}
+
+KeeperStateMachine::KeeperStateMachine(ResponsesQueue & responses_queue_, SnapshotsQueue & snapshots_queue_, const std::string & snapshots_path_, const CoordinationSettingsPtr & coordination_settings_)
+    : coordination_settings(coordination_settings_)
+    , snapshot_manager(snapshots_path_, coordination_settings->snapshots_to_keep, coordination_settings->dead_session_check_period_ms.totalMicroseconds())
+    , responses_queue(responses_queue_)
+    , snapshots_queue(snapshots_queue_)
+    , last_committed_idx(0)
+    , log(&Poco::Logger::get("KeeperStateMachine"))
+{
+}
+
+void KeeperStateMachine::init()
+{
+    /// Do everything without mutexes, no other threads exist.
+    LOG_DEBUG(log, "Totally have {} snapshots", snapshot_manager.totalSnapshots());
+    bool loaded = false;
+    bool has_snapshots = snapshot_manager.totalSnapshots() != 0;
+    while (snapshot_manager.totalSnapshots() != 0)
+    {
+        uint64_t latest_log_index = snapshot_manager.getLatestSnapshotIndex();
+        LOG_DEBUG(log, "Trying to load state machine from snapshot up to log index {}", latest_log_index);
+
+        try
+        {
+            latest_snapshot_buf = snapshot_manager.deserializeSnapshotBufferFromDisk(latest_log_index);
+            std::tie(latest_snapshot_meta, storage) = snapshot_manager.deserializeSnapshotFromBuffer(latest_snapshot_buf);
+            last_committed_idx = latest_snapshot_meta->get_last_log_idx();
+            loaded = true;
+            break;
+        }
+        catch (const DB::Exception & ex)
+        {
+            LOG_WARNING(log, "Failed to load from snapshot with index {}, with error {}, will remove it from disk", latest_log_index, ex.displayText());
+            snapshot_manager.removeSnapshot(latest_log_index);
+        }
+    }
+
+    if (has_snapshots)
+    {
+        if (loaded)
+            LOG_DEBUG(log, "Loaded snapshot with last committed log index {}", last_committed_idx);
+        else
+            LOG_WARNING(log, "All snapshots broken, last committed log index {}", last_committed_idx);
+    }
+    else
+    {
+        LOG_DEBUG(log, "No existing snapshots, last committed log index {}", last_committed_idx);
+    }
+
+    if (!storage)
+        storage = std::make_unique<KeeperStorage>(coordination_settings->dead_session_check_period_ms.totalMilliseconds());
+}
+
+nuraft::ptr<nuraft::buffer> KeeperStateMachine::commit(const uint64_t log_idx, nuraft::buffer & data)
+{
+    auto request_for_session = parseRequest(data);
+    if (request_for_session.request->getOpNum() == Coordination::OpNum::SessionID)
+    {
+        const Coordination::ZooKeeperSessionIDRequest & session_id_request = dynamic_cast<const Coordination::ZooKeeperSessionIDRequest &>(*request_for_session.request);
+        int64_t session_id;
+        {
+            std::lock_guard lock(storage_lock);
+            session_id = storage->getSessionID(session_id_request.session_timeout_ms);
+        }
+        LOG_DEBUG(log, "Session ID response {} with timeout {}", session_id, session_id_request.session_timeout_ms);
+
+        std::shared_ptr<Coordination::ZooKeeperSessionIDResponse> response = std::make_shared<Coordination::ZooKeeperSessionIDResponse>();
+        response->internal_id = session_id_request.internal_id;
+        response->session_id = session_id;
+        response->server_id = session_id_request.server_id;
+
+        KeeperStorage::ResponseForSession response_for_session;
+        response_for_session.session_id = -1;
+        response_for_session.response = response;
+        responses_queue.push(response_for_session);
+    }
+    else
+    {
+        KeeperStorage::ResponsesForSessions responses_for_sessions;
+        {
+            std::lock_guard lock(storage_lock);
+            responses_for_sessions = storage->processRequest(request_for_session.request, request_for_session.session_id, log_idx);
+            for (auto & response_for_session : responses_for_sessions)
+                responses_queue.push(response_for_session);
+        }
+    }
+
+    last_committed_idx = log_idx;
+    return nullptr;
+}
+
+bool KeeperStateMachine::apply_snapshot(nuraft::snapshot & s)
+{
+    LOG_DEBUG(log, "Applying snapshot {}", s.get_last_log_idx());
+    nuraft::ptr<nuraft::buffer> latest_snapshot_ptr;
+    {
+        std::lock_guard lock(snapshots_lock);
+        if (s.get_last_log_idx() != latest_snapshot_meta->get_last_log_idx())
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Required to apply snapshot with last log index {}, but our last log index is {}",
+                            s.get_last_log_idx(), latest_snapshot_meta->get_last_log_idx());
+        latest_snapshot_ptr = latest_snapshot_buf;
+    }
+
+    {
+        std::lock_guard lock(storage_lock);
+        std::tie(latest_snapshot_meta, storage) = snapshot_manager.deserializeSnapshotFromBuffer(latest_snapshot_ptr);
+    }
+    last_committed_idx = s.get_last_log_idx();
+    return true;
+}
+
+nuraft::ptr<nuraft::snapshot> KeeperStateMachine::last_snapshot()
+{
+    /// Just return the latest snapshot.
+    std::lock_guard<std::mutex> lock(snapshots_lock);
+    return latest_snapshot_meta;
+}
+
+void KeeperStateMachine::create_snapshot(
+    nuraft::snapshot & s,
+    nuraft::async_result<bool>::handler_type & when_done)
+{
+    LOG_DEBUG(log, "Creating snapshot {}", s.get_last_log_idx());
+
+    nuraft::ptr<nuraft::buffer> snp_buf = s.serialize();
+    auto snapshot_meta_copy = nuraft::snapshot::deserialize(*snp_buf);
+    CreateSnapshotTask snapshot_task;
+    {
+        std::lock_guard lock(storage_lock);
+        snapshot_task.snapshot = std::make_shared<KeeperStorageSnapshot>(storage.get(), snapshot_meta_copy);
+    }
+
+    snapshot_task.create_snapshot = [this, when_done] (KeeperStorageSnapshotPtr && snapshot)
+    {
+        nuraft::ptr<std::exception> exception(nullptr);
+        bool ret = true;
+        try
+        {
+            {
+                std::lock_guard lock(snapshots_lock);
+                auto snapshot_buf = snapshot_manager.serializeSnapshotToBuffer(*snapshot);
+                auto result_path = snapshot_manager.serializeSnapshotBufferToDisk(*snapshot_buf, snapshot->snapshot_meta->get_last_log_idx());
+                latest_snapshot_buf = snapshot_buf;
+                latest_snapshot_meta = snapshot->snapshot_meta;
+
+                LOG_DEBUG(log, "Created persistent snapshot {} with path {}", latest_snapshot_meta->get_last_log_idx(), result_path);
+            }
+
+            {
+                /// Must do it with lock (clearing elements from list)
+                std::lock_guard lock(storage_lock);
+                storage->clearGarbageAfterSnapshot();
+                /// Destroy snapshot with lock
+                snapshot.reset();
+                LOG_TRACE(log, "Cleared garbage after snapshot");
+
+            }
+        }
+        catch (...)
+        {
+            LOG_TRACE(log, "Exception happened during snapshot");
+            tryLogCurrentException(log);
+            ret = false;
+        }
+
+        when_done(ret, exception);
+    };
+
+    LOG_DEBUG(log, "In memory snapshot {} created, queueing task to flash to disk", s.get_last_log_idx());
+    snapshots_queue.push(std::move(snapshot_task));
+}
+
+void KeeperStateMachine::save_logical_snp_obj(
+    nuraft::snapshot & s,
+    uint64_t & obj_id,
+    nuraft::buffer & data,
+    bool /*is_first_obj*/,
+    bool /*is_last_obj*/)
+{
+    LOG_DEBUG(log, "Saving snapshot {} obj_id {}", s.get_last_log_idx(), obj_id);
+
+    nuraft::ptr<nuraft::buffer> cloned_buffer;
+    nuraft::ptr<nuraft::snapshot> cloned_meta;
+    if (obj_id == 0)
+    {
+        std::lock_guard lock(storage_lock);
+        KeeperStorageSnapshot snapshot(storage.get(), s.get_last_log_idx());
+        cloned_buffer = snapshot_manager.serializeSnapshotToBuffer(snapshot);
+    }
+    else
+    {
+        cloned_buffer = nuraft::buffer::clone(data);
+    }
+
+    nuraft::ptr<nuraft::buffer> snp_buf = s.serialize();
+    cloned_meta = nuraft::snapshot::deserialize(*snp_buf);
+
+    try
+    {
+        std::lock_guard lock(snapshots_lock);
+        auto result_path = snapshot_manager.serializeSnapshotBufferToDisk(*cloned_buffer, s.get_last_log_idx());
+        latest_snapshot_buf = cloned_buffer;
+        latest_snapshot_meta = cloned_meta;
+        LOG_DEBUG(log, "Saved snapshot {} to path {}", s.get_last_log_idx(), result_path);
+        obj_id++;
+    }
+    catch (...)
+    {
+        tryLogCurrentException(log);
+    }
+}
+
+int KeeperStateMachine::read_logical_snp_obj(
+    nuraft::snapshot & s,
+    void* & /*user_snp_ctx*/,
+    uint64_t obj_id,
+    nuraft::ptr<nuraft::buffer> & data_out,
+    bool & is_last_obj)
+{
+
+    LOG_DEBUG(log, "Reading snapshot {} obj_id {}", s.get_last_log_idx(), obj_id);
+    if (obj_id == 0)
+    {
+        data_out = nuraft::buffer::alloc(sizeof(int32_t));
+        nuraft::buffer_serializer bs(data_out);
+        bs.put_i32(0);
+        is_last_obj = false;
+    }
+    else
+    {
+        std::lock_guard lock(snapshots_lock);
+        if (s.get_last_log_idx() != latest_snapshot_meta->get_last_log_idx())
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Required to apply snapshot with last log index {}, but our last log index is {}",
+                            s.get_last_log_idx(), latest_snapshot_meta->get_last_log_idx());
+        data_out = nuraft::buffer::clone(*latest_snapshot_buf);
+        is_last_obj = true;
+    }
+    return 0;
+}
+
+void KeeperStateMachine::processReadRequest(const KeeperStorage::RequestForSession & request_for_session)
+{
+    KeeperStorage::ResponsesForSessions responses;
+    {
+        std::lock_guard lock(storage_lock);
+        responses = storage->processRequest(request_for_session.request, request_for_session.session_id, std::nullopt);
+    }
+    for (const auto & response : responses)
+        responses_queue.push(response);
+}
+
+std::unordered_set<int64_t> KeeperStateMachine::getDeadSessions()
+{
+    std::lock_guard lock(storage_lock);
+    return storage->getDeadSessions();
+}
+
+void KeeperStateMachine::shutdownStorage()
+{
+    std::lock_guard lock(storage_lock);
+    storage->finalize();
+}
+
+}
diff --git a/src/Coordination/KeeperStateMachine.h b/src/Coordination/KeeperStateMachine.h
new file mode 100644
index 00000000000..8712adaf4b1
--- /dev/null
+++ b/src/Coordination/KeeperStateMachine.h
@@ -0,0 +1,89 @@
+#pragma once
+
+#include <Coordination/KeeperStorage.h>
+#include <libnuraft/nuraft.hxx> // Y_IGNORE
+#include <common/logger_useful.h>
+#include <Coordination/ThreadSafeQueue.h>
+#include <Coordination/CoordinationSettings.h>
+#include <Coordination/KeeperSnapshotManager.h>
+
+namespace DB
+{
+
+using ResponsesQueue = ThreadSafeQueue<KeeperStorage::ResponseForSession>;
+using SnapshotsQueue = ConcurrentBoundedQueue<CreateSnapshotTask>;
+
+class KeeperStateMachine : public nuraft::state_machine
+{
+public:
+    KeeperStateMachine(ResponsesQueue & responses_queue_, SnapshotsQueue & snapshots_queue_, const std::string & snapshots_path_, const CoordinationSettingsPtr & coordination_settings_);
+
+    void init();
+
+    nuraft::ptr<nuraft::buffer> pre_commit(const uint64_t /*log_idx*/, nuraft::buffer & /*data*/) override { return nullptr; }
+
+    nuraft::ptr<nuraft::buffer> commit(const uint64_t log_idx, nuraft::buffer & data) override;
+
+    void rollback(const uint64_t /*log_idx*/, nuraft::buffer & /*data*/) override {}
+
+    uint64_t last_commit_index() override { return last_committed_idx; }
+
+    bool apply_snapshot(nuraft::snapshot & s) override;
+
+    nuraft::ptr<nuraft::snapshot> last_snapshot() override;
+
+    void create_snapshot(
+        nuraft::snapshot & s,
+        nuraft::async_result<bool>::handler_type & when_done) override;
+
+    void save_logical_snp_obj(
+        nuraft::snapshot & s,
+        uint64_t & obj_id,
+        nuraft::buffer & data,
+        bool is_first_obj,
+        bool is_last_obj) override;
+
+    int read_logical_snp_obj(
+        nuraft::snapshot & s,
+        void* & user_snp_ctx,
+        uint64_t obj_id,
+        nuraft::ptr<nuraft::buffer> & data_out,
+        bool & is_last_obj) override;
+
+    KeeperStorage & getStorage()
+    {
+        return *storage;
+    }
+
+    void processReadRequest(const KeeperStorage::RequestForSession & request_for_session);
+
+    std::unordered_set<int64_t> getDeadSessions();
+
+    void shutdownStorage();
+
+private:
+
+    SnapshotMetadataPtr latest_snapshot_meta = nullptr;
+    nuraft::ptr<nuraft::buffer> latest_snapshot_buf = nullptr;
+
+    CoordinationSettingsPtr coordination_settings;
+
+    KeeperStoragePtr storage;
+
+    KeeperSnapshotManager snapshot_manager;
+
+    ResponsesQueue & responses_queue;
+
+    SnapshotsQueue & snapshots_queue;
+    /// Mutex for snapshots
+    std::mutex snapshots_lock;
+
+    /// Lock for storage
+    std::mutex storage_lock;
+
+    /// Last committed Raft log number.
+    std::atomic<uint64_t> last_committed_idx;
+    Poco::Logger * log;
+};
+
+}
diff --git a/src/Coordination/InMemoryStateManager.cpp b/src/Coordination/KeeperStateManager.cpp
similarity index 61%
rename from src/Coordination/InMemoryStateManager.cpp
rename to src/Coordination/KeeperStateManager.cpp
index 69e93578cc1..e57ae7e7c19 100644
--- a/src/Coordination/InMemoryStateManager.cpp
+++ b/src/Coordination/KeeperStateManager.cpp
@@ -1,4 +1,4 @@
-#include <Coordination/InMemoryStateManager.h>
+#include <Coordination/KeeperStateManager.h>
 #include <Common/Exception.h>
 
 namespace DB
@@ -9,36 +9,47 @@ namespace ErrorCodes
     extern const int RAFT_ERROR;
 }
 
-InMemoryStateManager::InMemoryStateManager(int server_id_, const std::string & host, int port)
+KeeperStateManager::KeeperStateManager(int server_id_, const std::string & host, int port, const std::string & logs_path)
     : my_server_id(server_id_)
     , my_port(port)
-    , log_store(nuraft::cs_new<InMemoryLogStore>())
+    , secure(false)
+    , log_store(nuraft::cs_new<KeeperLogStore>(logs_path, 5000, false))
     , cluster_config(nuraft::cs_new<nuraft::cluster_config>())
 {
     auto peer_config = nuraft::cs_new<nuraft::srv_config>(my_server_id, host + ":" + std::to_string(port));
     cluster_config->get_servers().push_back(peer_config);
 }
 
-InMemoryStateManager::InMemoryStateManager(
+KeeperStateManager::KeeperStateManager(
     int my_server_id_,
     const std::string & config_prefix,
-    const Poco::Util::AbstractConfiguration & config)
+    const Poco::Util::AbstractConfiguration & config,
+    const CoordinationSettingsPtr & coordination_settings)
     : my_server_id(my_server_id_)
-    , log_store(nuraft::cs_new<InMemoryLogStore>())
+    , secure(config.getBool(config_prefix + ".raft_configuration.secure", false))
+    , log_store(nuraft::cs_new<KeeperLogStore>(
+                    config.getString(config_prefix + ".log_storage_path", config.getString("path", DBMS_DEFAULT_PATH) + "coordination/logs"),
+                    coordination_settings->rotate_log_storage_interval, coordination_settings->force_sync))
     , cluster_config(nuraft::cs_new<nuraft::cluster_config>())
 {
+
     Poco::Util::AbstractConfiguration::Keys keys;
-    config.keys(config_prefix, keys);
+    config.keys(config_prefix + ".raft_configuration", keys);
+    total_servers = keys.size();
 
     for (const auto & server_key : keys)
     {
-        std::string full_prefix = config_prefix + "." + server_key;
+        if (!startsWith(server_key, "server"))
+            continue;
+
+        std::string full_prefix = config_prefix + ".raft_configuration." + server_key;
         int server_id = config.getInt(full_prefix + ".id");
         std::string hostname = config.getString(full_prefix + ".hostname");
         int port = config.getInt(full_prefix + ".port");
         bool can_become_leader = config.getBool(full_prefix + ".can_become_leader", true);
         int32_t priority = config.getInt(full_prefix + ".priority", 1);
         bool start_as_follower = config.getBool(full_prefix + ".start_as_follower", false);
+
         if (start_as_follower)
             start_as_follower_servers.insert(server_id);
 
@@ -52,14 +63,25 @@ InMemoryStateManager::InMemoryStateManager(
 
         cluster_config->get_servers().push_back(peer_config);
     }
+
     if (!my_server_config)
-        throw Exception(ErrorCodes::RAFT_ERROR, "Our server id {} not found in raft_configuration section");
+        throw Exception(ErrorCodes::RAFT_ERROR, "Our server id {} not found in raft_configuration section", my_server_id);
 
     if (start_as_follower_servers.size() == cluster_config->get_servers().size())
         throw Exception(ErrorCodes::RAFT_ERROR, "At least one of servers should be able to start as leader (without <start_as_follower>)");
 }
 
-void InMemoryStateManager::save_config(const nuraft::cluster_config & config)
+void KeeperStateManager::loadLogStore(uint64_t last_commited_index, uint64_t logs_to_keep)
+{
+    log_store->init(last_commited_index, logs_to_keep);
+}
+
+void KeeperStateManager::flushLogStore()
+{
+    log_store->flush();
+}
+
+void KeeperStateManager::save_config(const nuraft::cluster_config & config)
 {
     // Just keep in memory in this example.
     // Need to write to disk here, if want to make it durable.
@@ -67,7 +89,7 @@ void InMemoryStateManager::save_config(const nuraft::cluster_config & config)
     cluster_config = nuraft::cluster_config::deserialize(*buf);
 }
 
-void InMemoryStateManager::save_state(const nuraft::srv_state & state)
+void KeeperStateManager::save_state(const nuraft::srv_state & state)
 {
      // Just keep in memory in this example.
      // Need to write to disk here, if want to make it durable.
diff --git a/src/Coordination/InMemoryStateManager.h b/src/Coordination/KeeperStateManager.h
similarity index 63%
rename from src/Coordination/InMemoryStateManager.h
rename to src/Coordination/KeeperStateManager.h
index 2a5c2f00dba..cb5181760cb 100644
--- a/src/Coordination/InMemoryStateManager.h
+++ b/src/Coordination/KeeperStateManager.h
@@ -2,25 +2,32 @@
 
 #include <Core/Types.h>
 #include <string>
-#include <Coordination/InMemoryLogStore.h>
+#include <Coordination/KeeperLogStore.h>
+#include <Coordination/CoordinationSettings.h>
 #include <libnuraft/nuraft.hxx> // Y_IGNORE
 #include <Poco/Util/AbstractConfiguration.h>
 
 namespace DB
 {
 
-class InMemoryStateManager : public nuraft::state_mgr
+class KeeperStateManager : public nuraft::state_mgr
 {
 public:
-    InMemoryStateManager(
+    KeeperStateManager(
         int server_id_,
         const std::string & config_prefix,
-        const Poco::Util::AbstractConfiguration & config);
+        const Poco::Util::AbstractConfiguration & config,
+        const CoordinationSettingsPtr & coordination_settings);
 
-    InMemoryStateManager(
+    KeeperStateManager(
         int server_id_,
         const std::string & host,
-        int port);
+        int port,
+        const std::string & logs_path);
+
+    void loadLogStore(uint64_t last_commited_index, uint64_t logs_to_keep);
+
+    void flushLogStore();
 
     nuraft::ptr<nuraft::cluster_config> load_config() override { return cluster_config; }
 
@@ -45,11 +52,22 @@ public:
         return start_as_follower_servers.count(my_server_id);
     }
 
+    bool isSecure() const
+    {
+        return secure;
+    }
+
+    nuraft::ptr<KeeperLogStore> getLogStore() const { return log_store; }
+
+    uint64_t getTotalServers() const { return total_servers; }
+
 private:
     int my_server_id;
     int my_port;
+    bool secure;
+    uint64_t total_servers{0};
     std::unordered_set<int> start_as_follower_servers;
-    nuraft::ptr<InMemoryLogStore> log_store;
+    nuraft::ptr<KeeperLogStore> log_store;
     nuraft::ptr<nuraft::srv_config> my_server_config;
     nuraft::ptr<nuraft::cluster_config> cluster_config;
     nuraft::ptr<nuraft::srv_state> server_state;
diff --git a/src/Coordination/NuKeeperStorage.cpp b/src/Coordination/KeeperStorage.cpp
similarity index 61%
rename from src/Coordination/NuKeeperStorage.cpp
rename to src/Coordination/KeeperStorage.cpp
index 631f975cddc..197cc4323cf 100644
--- a/src/Coordination/NuKeeperStorage.cpp
+++ b/src/Coordination/KeeperStorage.cpp
@@ -1,4 +1,4 @@
-#include <Coordination/NuKeeperStorage.h>
+#include <Coordination/KeeperStorage.h>
 #include <Common/ZooKeeper/IKeeper.h>
 #include <Common/setThreadName.h>
 #include <mutex>
@@ -25,15 +25,15 @@ static String parentPath(const String & path)
     return "/";
 }
 
-static String baseName(const String & path)
+static std::string getBaseName(const String & path)
 {
-    auto rslash_pos = path.rfind('/');
-    return path.substr(rslash_pos + 1);
+    size_t basename_start = path.rfind('/');
+    return std::string{&path[basename_start + 1], path.length() - basename_start - 1};
 }
 
-static NuKeeperStorage::ResponsesForSessions processWatchesImpl(const String & path, NuKeeperStorage::Watches & watches, NuKeeperStorage::Watches & list_watches, Coordination::Event event_type)
+static KeeperStorage::ResponsesForSessions processWatchesImpl(const String & path, KeeperStorage::Watches & watches, KeeperStorage::Watches & list_watches, Coordination::Event event_type)
 {
-    NuKeeperStorage::ResponsesForSessions result;
+    KeeperStorage::ResponsesForSessions result;
     auto it = watches.find(path);
     if (it != watches.end())
     {
@@ -44,7 +44,7 @@ static NuKeeperStorage::ResponsesForSessions processWatchesImpl(const String & p
         watch_response->type = event_type;
         watch_response->state = Coordination::State::CONNECTED;
         for (auto watcher_session : it->second)
-            result.push_back(NuKeeperStorage::ResponseForSession{watcher_session, watch_response});
+            result.push_back(KeeperStorage::ResponseForSession{watcher_session, watch_response});
 
         watches.erase(it);
     }
@@ -60,47 +60,47 @@ static NuKeeperStorage::ResponsesForSessions processWatchesImpl(const String & p
         watch_list_response->type = Coordination::Event::CHILD;
         watch_list_response->state = Coordination::State::CONNECTED;
         for (auto watcher_session : it->second)
-            result.push_back(NuKeeperStorage::ResponseForSession{watcher_session, watch_list_response});
+            result.push_back(KeeperStorage::ResponseForSession{watcher_session, watch_list_response});
 
         list_watches.erase(it);
     }
     return result;
 }
 
-NuKeeperStorage::NuKeeperStorage(int64_t tick_time_ms)
+KeeperStorage::KeeperStorage(int64_t tick_time_ms)
     : session_expiry_queue(tick_time_ms)
 {
-    container.emplace("/", Node());
+    container.insert("/", Node());
 }
 
 using Undo = std::function<void()>;
 
-struct NuKeeperStorageRequest
+struct KeeperStorageRequest
 {
     Coordination::ZooKeeperRequestPtr zk_request;
 
-    explicit NuKeeperStorageRequest(const Coordination::ZooKeeperRequestPtr & zk_request_)
+    explicit KeeperStorageRequest(const Coordination::ZooKeeperRequestPtr & zk_request_)
         : zk_request(zk_request_)
     {}
-    virtual std::pair<Coordination::ZooKeeperResponsePtr, Undo> process(NuKeeperStorage::Container & container, NuKeeperStorage::Ephemerals & ephemerals, int64_t zxid, int64_t session_id) const = 0;
-    virtual NuKeeperStorage::ResponsesForSessions processWatches(NuKeeperStorage::Watches & /*watches*/, NuKeeperStorage::Watches & /*list_watches*/) const { return {}; }
+    virtual std::pair<Coordination::ZooKeeperResponsePtr, Undo> process(KeeperStorage::Container & container, KeeperStorage::Ephemerals & ephemerals, int64_t zxid, int64_t session_id) const = 0;
+    virtual KeeperStorage::ResponsesForSessions processWatches(KeeperStorage::Watches & /*watches*/, KeeperStorage::Watches & /*list_watches*/) const { return {}; }
 
-    virtual ~NuKeeperStorageRequest() = default;
+    virtual ~KeeperStorageRequest() = default;
 };
 
-struct NuKeeperStorageHeartbeatRequest final : public NuKeeperStorageRequest
+struct KeeperStorageHeartbeatRequest final : public KeeperStorageRequest
 {
-    using NuKeeperStorageRequest::NuKeeperStorageRequest;
-    std::pair<Coordination::ZooKeeperResponsePtr, Undo> process(NuKeeperStorage::Container & /* container */, NuKeeperStorage::Ephemerals & /* ephemerals */, int64_t /* zxid */, int64_t /* session_id */) const override
+    using KeeperStorageRequest::KeeperStorageRequest;
+    std::pair<Coordination::ZooKeeperResponsePtr, Undo> process(KeeperStorage::Container & /* container */, KeeperStorage::Ephemerals & /* ephemerals */, int64_t /* zxid */, int64_t /* session_id */) const override
     {
         return {zk_request->makeResponse(), {}};
     }
 };
 
-struct NuKeeperStorageSyncRequest final : public NuKeeperStorageRequest
+struct KeeperStorageSyncRequest final : public KeeperStorageRequest
 {
-    using NuKeeperStorageRequest::NuKeeperStorageRequest;
-    std::pair<Coordination::ZooKeeperResponsePtr, Undo> process(NuKeeperStorage::Container & /* container */, NuKeeperStorage::Ephemerals & /* ephemerals */, int64_t /* zxid */, int64_t /* session_id */) const override
+    using KeeperStorageRequest::KeeperStorageRequest;
+    std::pair<Coordination::ZooKeeperResponsePtr, Undo> process(KeeperStorage::Container & /* container */, KeeperStorage::Ephemerals & /* ephemerals */, int64_t /* zxid */, int64_t /* session_id */) const override
     {
         auto response = zk_request->makeResponse();
         dynamic_cast<Coordination::ZooKeeperSyncResponse *>(response.get())->path = dynamic_cast<Coordination::ZooKeeperSyncRequest *>(zk_request.get())->path;
@@ -108,55 +108,56 @@ struct NuKeeperStorageSyncRequest final : public NuKeeperStorageRequest
     }
 };
 
-struct NuKeeperStorageCreateRequest final : public NuKeeperStorageRequest
+struct KeeperStorageCreateRequest final : public KeeperStorageRequest
 {
-    using NuKeeperStorageRequest::NuKeeperStorageRequest;
+    using KeeperStorageRequest::KeeperStorageRequest;
 
-    NuKeeperStorage::ResponsesForSessions processWatches(NuKeeperStorage::Watches & watches, NuKeeperStorage::Watches & list_watches) const override
+    KeeperStorage::ResponsesForSessions processWatches(KeeperStorage::Watches & watches, KeeperStorage::Watches & list_watches) const override
     {
         return processWatchesImpl(zk_request->getPath(), watches, list_watches, Coordination::Event::CREATED);
     }
 
-    std::pair<Coordination::ZooKeeperResponsePtr, Undo> process(NuKeeperStorage::Container & container, NuKeeperStorage::Ephemerals & ephemerals, int64_t zxid, int64_t session_id) const override
+    std::pair<Coordination::ZooKeeperResponsePtr, Undo> process(KeeperStorage::Container & container, KeeperStorage::Ephemerals & ephemerals, int64_t zxid, int64_t session_id) const override
     {
         Coordination::ZooKeeperResponsePtr response_ptr = zk_request->makeResponse();
         Undo undo;
         Coordination::ZooKeeperCreateResponse & response = dynamic_cast<Coordination::ZooKeeperCreateResponse &>(*response_ptr);
         Coordination::ZooKeeperCreateRequest & request = dynamic_cast<Coordination::ZooKeeperCreateRequest &>(*zk_request);
 
-        if (container.count(request.path))
+        if (container.contains(request.path))
         {
             response.error = Coordination::Error::ZNODEEXISTS;
         }
         else
         {
-            auto it = container.find(parentPath(request.path));
+            auto parent_path = parentPath(request.path);
+            auto it = container.find(parent_path);
 
             if (it == container.end())
             {
                 response.error = Coordination::Error::ZNONODE;
             }
-            else if (it->second.is_ephemeral)
+            else if (it->value.stat.ephemeralOwner != 0)
             {
                 response.error = Coordination::Error::ZNOCHILDRENFOREPHEMERALS;
             }
             else
             {
-                NuKeeperStorage::Node created_node;
+                KeeperStorage::Node created_node;
                 created_node.stat.czxid = zxid;
                 created_node.stat.mzxid = zxid;
                 created_node.stat.ctime = std::chrono::system_clock::now().time_since_epoch() / std::chrono::milliseconds(1);
                 created_node.stat.mtime = created_node.stat.ctime;
                 created_node.stat.numChildren = 0;
                 created_node.stat.dataLength = request.data.length();
+                created_node.stat.ephemeralOwner = request.is_ephemeral ? session_id : 0;
                 created_node.data = request.data;
-                created_node.is_ephemeral = request.is_ephemeral;
                 created_node.is_sequental = request.is_sequential;
                 std::string path_created = request.path;
 
                 if (request.is_sequential)
                 {
-                    auto seq_num = it->second.seq_num;
+                    auto seq_num = it->value.seq_num;
 
                     std::stringstream seq_num_str;      // STYLE_CHECK_ALLOW_STD_STRING_STREAM
                     seq_num_str.exceptions(std::ios::failbit);
@@ -165,28 +166,36 @@ struct NuKeeperStorageCreateRequest final : public NuKeeperStorageRequest
                     path_created += seq_num_str.str();
                 }
 
-                /// Increment sequential number even if node is not sequential
-                ++it->second.seq_num;
+                auto child_path = getBaseName(path_created);
+                container.updateValue(parent_path, [child_path] (KeeperStorage::Node & parent)
+                {
+                    /// Increment sequential number even if node is not sequential
+                    ++parent.seq_num;
+                    parent.children.insert(child_path);
+                    ++parent.stat.cversion;
+                    ++parent.stat.numChildren;
+                });
 
                 response.path_created = path_created;
-                container.emplace(path_created, std::move(created_node));
+                container.insert(path_created, std::move(created_node));
 
                 if (request.is_ephemeral)
                     ephemerals[session_id].emplace(path_created);
 
-                undo = [&container, &ephemerals, session_id, path_created, is_ephemeral = request.is_ephemeral, parent_path = it->first]
+                undo = [&container, &ephemerals, session_id, path_created, is_ephemeral = request.is_ephemeral, parent_path, child_path]
                 {
                     container.erase(path_created);
                     if (is_ephemeral)
                         ephemerals[session_id].erase(path_created);
-                    auto & undo_parent = container.at(parent_path);
-                    --undo_parent.stat.cversion;
-                    --undo_parent.stat.numChildren;
-                    --undo_parent.seq_num;
-                };
 
-                ++it->second.stat.cversion;
-                ++it->second.stat.numChildren;
+                    container.updateValue(parent_path, [child_path] (KeeperStorage::Node & undo_parent)
+                    {
+                        --undo_parent.stat.cversion;
+                        --undo_parent.stat.numChildren;
+                        --undo_parent.seq_num;
+                        undo_parent.children.erase(child_path);
+                    });
+                };
 
                 response.error = Coordination::Error::ZOK;
             }
@@ -196,10 +205,10 @@ struct NuKeeperStorageCreateRequest final : public NuKeeperStorageRequest
     }
 };
 
-struct NuKeeperStorageGetRequest final : public NuKeeperStorageRequest
+struct KeeperStorageGetRequest final : public KeeperStorageRequest
 {
-    using NuKeeperStorageRequest::NuKeeperStorageRequest;
-    std::pair<Coordination::ZooKeeperResponsePtr, Undo> process(NuKeeperStorage::Container & container, NuKeeperStorage::Ephemerals & /* ephemerals */, int64_t /* zxid */, int64_t /* session_id */) const override
+    using KeeperStorageRequest::KeeperStorageRequest;
+    std::pair<Coordination::ZooKeeperResponsePtr, Undo> process(KeeperStorage::Container & container, KeeperStorage::Ephemerals & /* ephemerals */, int64_t /* zxid */, int64_t /* session_id */) const override
     {
         Coordination::ZooKeeperResponsePtr response_ptr = zk_request->makeResponse();
         Coordination::ZooKeeperGetResponse & response = dynamic_cast<Coordination::ZooKeeperGetResponse &>(*response_ptr);
@@ -212,8 +221,8 @@ struct NuKeeperStorageGetRequest final : public NuKeeperStorageRequest
         }
         else
         {
-            response.stat = it->second.stat;
-            response.data = it->second.data;
+            response.stat = it->value.stat;
+            response.data = it->value.data;
             response.error = Coordination::Error::ZOK;
         }
 
@@ -221,10 +230,10 @@ struct NuKeeperStorageGetRequest final : public NuKeeperStorageRequest
     }
 };
 
-struct NuKeeperStorageRemoveRequest final : public NuKeeperStorageRequest
+struct KeeperStorageRemoveRequest final : public KeeperStorageRequest
 {
-    using NuKeeperStorageRequest::NuKeeperStorageRequest;
-    std::pair<Coordination::ZooKeeperResponsePtr, Undo> process(NuKeeperStorage::Container & container, NuKeeperStorage::Ephemerals & ephemerals, int64_t /*zxid*/, int64_t session_id) const override
+    using KeeperStorageRequest::KeeperStorageRequest;
+    std::pair<Coordination::ZooKeeperResponsePtr, Undo> process(KeeperStorage::Container & container, KeeperStorage::Ephemerals & ephemerals, int64_t /*zxid*/, int64_t /*session_id*/) const override
     {
         Coordination::ZooKeeperResponsePtr response_ptr = zk_request->makeResponse();
         Coordination::ZooKeeperRemoveResponse & response = dynamic_cast<Coordination::ZooKeeperRemoveResponse &>(*response_ptr);
@@ -236,51 +245,65 @@ struct NuKeeperStorageRemoveRequest final : public NuKeeperStorageRequest
         {
             response.error = Coordination::Error::ZNONODE;
         }
-        else if (request.version != -1 && request.version != it->second.stat.version)
+        else if (request.version != -1 && request.version != it->value.stat.version)
         {
             response.error = Coordination::Error::ZBADVERSION;
         }
-        else if (it->second.stat.numChildren)
+        else if (it->value.stat.numChildren)
         {
             response.error = Coordination::Error::ZNOTEMPTY;
         }
         else
         {
-            auto prev_node = it->second;
-            if (prev_node.is_ephemeral)
-                ephemerals[session_id].erase(request.path);
+            auto prev_node = it->value;
+            if (prev_node.stat.ephemeralOwner != 0)
+            {
+                auto ephemerals_it = ephemerals.find(prev_node.stat.ephemeralOwner);
+                ephemerals_it->second.erase(request.path);
+                if (ephemerals_it->second.empty())
+                    ephemerals.erase(ephemerals_it);
+            }
+
+            auto child_basename = getBaseName(it->key);
+            container.updateValue(parentPath(request.path), [&child_basename] (KeeperStorage::Node & parent)
+            {
+                --parent.stat.numChildren;
+                ++parent.stat.cversion;
+                parent.children.erase(child_basename);
+            });
 
-            container.erase(it);
-            auto & parent = container.at(parentPath(request.path));
-            --parent.stat.numChildren;
-            ++parent.stat.cversion;
             response.error = Coordination::Error::ZOK;
 
-            undo = [prev_node, &container, &ephemerals, session_id, path = request.path]
-            {
-                if (prev_node.is_ephemeral)
-                    ephemerals[session_id].emplace(path);
+            container.erase(request.path);
 
-                container.emplace(path, prev_node);
-                auto & undo_parent = container.at(parentPath(path));
-                ++undo_parent.stat.numChildren;
-                --undo_parent.stat.cversion;
+            undo = [prev_node, &container, &ephemerals, path = request.path, child_basename]
+            {
+                if (prev_node.stat.ephemeralOwner != 0)
+                    ephemerals[prev_node.stat.ephemeralOwner].emplace(path);
+
+                container.insert(path, prev_node);
+                container.updateValue(parentPath(path), [&child_basename] (KeeperStorage::Node & parent)
+                {
+                    ++parent.stat.numChildren;
+                    --parent.stat.cversion;
+                    parent.children.insert(child_basename);
+                });
             };
         }
 
         return { response_ptr, undo };
     }
 
-    NuKeeperStorage::ResponsesForSessions processWatches(NuKeeperStorage::Watches & watches, NuKeeperStorage::Watches & list_watches) const override
+    KeeperStorage::ResponsesForSessions processWatches(KeeperStorage::Watches & watches, KeeperStorage::Watches & list_watches) const override
     {
         return processWatchesImpl(zk_request->getPath(), watches, list_watches, Coordination::Event::DELETED);
     }
 };
 
-struct NuKeeperStorageExistsRequest final : public NuKeeperStorageRequest
+struct KeeperStorageExistsRequest final : public KeeperStorageRequest
 {
-    using NuKeeperStorageRequest::NuKeeperStorageRequest;
-    std::pair<Coordination::ZooKeeperResponsePtr, Undo> process(NuKeeperStorage::Container & container, NuKeeperStorage::Ephemerals & /* ephemerals */, int64_t /*zxid*/, int64_t /* session_id */) const override
+    using KeeperStorageRequest::KeeperStorageRequest;
+    std::pair<Coordination::ZooKeeperResponsePtr, Undo> process(KeeperStorage::Container & container, KeeperStorage::Ephemerals & /* ephemerals */, int64_t /*zxid*/, int64_t /* session_id */) const override
     {
         Coordination::ZooKeeperResponsePtr response_ptr = zk_request->makeResponse();
         Coordination::ZooKeeperExistsResponse & response = dynamic_cast<Coordination::ZooKeeperExistsResponse &>(*response_ptr);
@@ -289,7 +312,7 @@ struct NuKeeperStorageExistsRequest final : public NuKeeperStorageRequest
         auto it = container.find(request.path);
         if (it != container.end())
         {
-            response.stat = it->second.stat;
+            response.stat = it->value.stat;
             response.error = Coordination::Error::ZOK;
         }
         else
@@ -301,10 +324,10 @@ struct NuKeeperStorageExistsRequest final : public NuKeeperStorageRequest
     }
 };
 
-struct NuKeeperStorageSetRequest final : public NuKeeperStorageRequest
+struct KeeperStorageSetRequest final : public KeeperStorageRequest
 {
-    using NuKeeperStorageRequest::NuKeeperStorageRequest;
-    std::pair<Coordination::ZooKeeperResponsePtr, Undo> process(NuKeeperStorage::Container & container, NuKeeperStorage::Ephemerals & /* ephemerals */, int64_t zxid, int64_t /* session_id */) const override
+    using KeeperStorageRequest::KeeperStorageRequest;
+    std::pair<Coordination::ZooKeeperResponsePtr, Undo> process(KeeperStorage::Container & container, KeeperStorage::Ephemerals & /* ephemerals */, int64_t zxid, int64_t /* session_id */) const override
     {
         Coordination::ZooKeeperResponsePtr response_ptr = zk_request->makeResponse();
         Coordination::ZooKeeperSetResponse & response = dynamic_cast<Coordination::ZooKeeperSetResponse &>(*response_ptr);
@@ -316,24 +339,35 @@ struct NuKeeperStorageSetRequest final : public NuKeeperStorageRequest
         {
             response.error = Coordination::Error::ZNONODE;
         }
-        else if (request.version == -1 || request.version == it->second.stat.version)
+        else if (request.version == -1 || request.version == it->value.stat.version)
         {
-            auto prev_node = it->second;
+            auto prev_node = it->value;
 
-            it->second.data = request.data;
-            ++it->second.stat.version;
-            it->second.stat.mzxid = zxid;
-            it->second.stat.mtime = std::chrono::system_clock::now().time_since_epoch() / std::chrono::milliseconds(1);
-            it->second.stat.dataLength = request.data.length();
-            it->second.data = request.data;
-            ++container.at(parentPath(request.path)).stat.cversion;
-            response.stat = it->second.stat;
+            auto itr = container.updateValue(request.path, [zxid, request] (KeeperStorage::Node & value)
+            {
+                value.data = request.data;
+                value.stat.version++;
+                value.stat.mzxid = zxid;
+                value.stat.mtime = std::chrono::system_clock::now().time_since_epoch() / std::chrono::milliseconds(1);
+                value.stat.dataLength = request.data.length();
+                value.data = request.data;
+            });
+
+            container.updateValue(parentPath(request.path), [] (KeeperStorage::Node & parent)
+            {
+                parent.stat.cversion++;
+            });
+
+            response.stat = itr->value.stat;
             response.error = Coordination::Error::ZOK;
 
             undo = [prev_node, &container, path = request.path]
             {
-                container.at(path) = prev_node;
-                --container.at(parentPath(path)).stat.cversion;
+                container.updateValue(path, [&prev_node] (KeeperStorage::Node & value) { value = prev_node; });
+                container.updateValue(parentPath(path), [] (KeeperStorage::Node & parent)
+                {
+                    parent.stat.cversion--;
+                });
             };
         }
         else
@@ -344,17 +378,16 @@ struct NuKeeperStorageSetRequest final : public NuKeeperStorageRequest
         return { response_ptr, undo };
     }
 
-    NuKeeperStorage::ResponsesForSessions processWatches(NuKeeperStorage::Watches & watches, NuKeeperStorage::Watches & list_watches) const override
+    KeeperStorage::ResponsesForSessions processWatches(KeeperStorage::Watches & watches, KeeperStorage::Watches & list_watches) const override
     {
         return processWatchesImpl(zk_request->getPath(), watches, list_watches, Coordination::Event::CHANGED);
     }
-
 };
 
-struct NuKeeperStorageListRequest final : public NuKeeperStorageRequest
+struct KeeperStorageListRequest final : public KeeperStorageRequest
 {
-    using NuKeeperStorageRequest::NuKeeperStorageRequest;
-    std::pair<Coordination::ZooKeeperResponsePtr, Undo> process(NuKeeperStorage::Container & container, NuKeeperStorage::Ephemerals & /* ephemerals */, int64_t /*zxid*/, int64_t /*session_id*/) const override
+    using KeeperStorageRequest::KeeperStorageRequest;
+    std::pair<Coordination::ZooKeeperResponsePtr, Undo> process(KeeperStorage::Container & container, KeeperStorage::Ephemerals & /* ephemerals */, int64_t /*zxid*/, int64_t /*session_id*/) const override
     {
         Coordination::ZooKeeperResponsePtr response_ptr = zk_request->makeResponse();
         Coordination::ZooKeeperListResponse & response = dynamic_cast<Coordination::ZooKeeperListResponse &>(*response_ptr);
@@ -370,19 +403,9 @@ struct NuKeeperStorageListRequest final : public NuKeeperStorageRequest
             if (path_prefix.empty())
                 throw DB::Exception("Logical error: path cannot be empty", ErrorCodes::LOGICAL_ERROR);
 
-            if (path_prefix.back() != '/')
-                path_prefix += '/';
+            response.names.insert(response.names.end(), it->value.children.begin(), it->value.children.end());
 
-            /// Fairly inefficient.
-            for (auto child_it = container.upper_bound(path_prefix);
-                 child_it != container.end() && startsWith(child_it->first, path_prefix);
-                ++child_it)
-            {
-                if (parentPath(child_it->first) == request.path)
-                    response.names.emplace_back(baseName(child_it->first));
-            }
-
-            response.stat = it->second.stat;
+            response.stat = it->value.stat;
             response.error = Coordination::Error::ZOK;
         }
 
@@ -390,10 +413,10 @@ struct NuKeeperStorageListRequest final : public NuKeeperStorageRequest
     }
 };
 
-struct NuKeeperStorageCheckRequest final : public NuKeeperStorageRequest
+struct KeeperStorageCheckRequest final : public KeeperStorageRequest
 {
-    using NuKeeperStorageRequest::NuKeeperStorageRequest;
-    std::pair<Coordination::ZooKeeperResponsePtr, Undo> process(NuKeeperStorage::Container & container, NuKeeperStorage::Ephemerals & /* ephemerals */, int64_t /*zxid*/, int64_t /*session_id*/) const override
+    using KeeperStorageRequest::KeeperStorageRequest;
+    std::pair<Coordination::ZooKeeperResponsePtr, Undo> process(KeeperStorage::Container & container, KeeperStorage::Ephemerals & /* ephemerals */, int64_t /*zxid*/, int64_t /*session_id*/) const override
     {
         Coordination::ZooKeeperResponsePtr response_ptr = zk_request->makeResponse();
         Coordination::ZooKeeperCheckResponse & response = dynamic_cast<Coordination::ZooKeeperCheckResponse &>(*response_ptr);
@@ -403,7 +426,7 @@ struct NuKeeperStorageCheckRequest final : public NuKeeperStorageRequest
         {
             response.error = Coordination::Error::ZNONODE;
         }
-        else if (request.version != -1 && request.version != it->second.stat.version)
+        else if (request.version != -1 && request.version != it->value.stat.version)
         {
             response.error = Coordination::Error::ZBADVERSION;
         }
@@ -416,11 +439,11 @@ struct NuKeeperStorageCheckRequest final : public NuKeeperStorageRequest
     }
 };
 
-struct NuKeeperStorageMultiRequest final : public NuKeeperStorageRequest
+struct KeeperStorageMultiRequest final : public KeeperStorageRequest
 {
-    std::vector<NuKeeperStorageRequestPtr> concrete_requests;
-    explicit NuKeeperStorageMultiRequest(const Coordination::ZooKeeperRequestPtr & zk_request_)
-        : NuKeeperStorageRequest(zk_request_)
+    std::vector<KeeperStorageRequestPtr> concrete_requests;
+    explicit KeeperStorageMultiRequest(const Coordination::ZooKeeperRequestPtr & zk_request_)
+        : KeeperStorageRequest(zk_request_)
     {
         Coordination::ZooKeeperMultiRequest & request = dynamic_cast<Coordination::ZooKeeperMultiRequest &>(*zk_request);
         concrete_requests.reserve(request.requests.size());
@@ -430,26 +453,26 @@ struct NuKeeperStorageMultiRequest final : public NuKeeperStorageRequest
             auto sub_zk_request = std::dynamic_pointer_cast<Coordination::ZooKeeperRequest>(sub_request);
             if (sub_zk_request->getOpNum() == Coordination::OpNum::Create)
             {
-                concrete_requests.push_back(std::make_shared<NuKeeperStorageCreateRequest>(sub_zk_request));
+                concrete_requests.push_back(std::make_shared<KeeperStorageCreateRequest>(sub_zk_request));
             }
             else if (sub_zk_request->getOpNum() == Coordination::OpNum::Remove)
             {
-                concrete_requests.push_back(std::make_shared<NuKeeperStorageRemoveRequest>(sub_zk_request));
+                concrete_requests.push_back(std::make_shared<KeeperStorageRemoveRequest>(sub_zk_request));
             }
             else if (sub_zk_request->getOpNum() == Coordination::OpNum::Set)
             {
-                concrete_requests.push_back(std::make_shared<NuKeeperStorageSetRequest>(sub_zk_request));
+                concrete_requests.push_back(std::make_shared<KeeperStorageSetRequest>(sub_zk_request));
             }
             else if (sub_zk_request->getOpNum() == Coordination::OpNum::Check)
             {
-                concrete_requests.push_back(std::make_shared<NuKeeperStorageCheckRequest>(sub_zk_request));
+                concrete_requests.push_back(std::make_shared<KeeperStorageCheckRequest>(sub_zk_request));
             }
             else
                 throw DB::Exception(ErrorCodes::BAD_ARGUMENTS, "Illegal command as part of multi ZooKeeper request {}", sub_zk_request->getOpNum());
         }
     }
 
-    std::pair<Coordination::ZooKeeperResponsePtr, Undo> process(NuKeeperStorage::Container & container, NuKeeperStorage::Ephemerals & ephemerals, int64_t zxid, int64_t session_id) const override
+    std::pair<Coordination::ZooKeeperResponsePtr, Undo> process(KeeperStorage::Container & container, KeeperStorage::Ephemerals & ephemerals, int64_t zxid, int64_t session_id) const override
     {
         Coordination::ZooKeeperResponsePtr response_ptr = zk_request->makeResponse();
         Coordination::ZooKeeperMultiResponse & response = dynamic_cast<Coordination::ZooKeeperMultiResponse &>(*response_ptr);
@@ -502,9 +525,9 @@ struct NuKeeperStorageMultiRequest final : public NuKeeperStorageRequest
         }
     }
 
-    NuKeeperStorage::ResponsesForSessions processWatches(NuKeeperStorage::Watches & watches, NuKeeperStorage::Watches & list_watches) const override
+    KeeperStorage::ResponsesForSessions processWatches(KeeperStorage::Watches & watches, KeeperStorage::Watches & list_watches) const override
     {
-        NuKeeperStorage::ResponsesForSessions result;
+        KeeperStorage::ResponsesForSessions result;
         for (const auto & generic_request : concrete_requests)
         {
             auto responses = generic_request->processWatches(watches, list_watches);
@@ -514,16 +537,16 @@ struct NuKeeperStorageMultiRequest final : public NuKeeperStorageRequest
     }
 };
 
-struct NuKeeperStorageCloseRequest final : public NuKeeperStorageRequest
+struct KeeperStorageCloseRequest final : public KeeperStorageRequest
 {
-    using NuKeeperStorageRequest::NuKeeperStorageRequest;
-    std::pair<Coordination::ZooKeeperResponsePtr, Undo> process(NuKeeperStorage::Container &, NuKeeperStorage::Ephemerals &, int64_t, int64_t) const override
+    using KeeperStorageRequest::KeeperStorageRequest;
+    std::pair<Coordination::ZooKeeperResponsePtr, Undo> process(KeeperStorage::Container &, KeeperStorage::Ephemerals &, int64_t, int64_t) const override
     {
         throw DB::Exception("Called process on close request", ErrorCodes::LOGICAL_ERROR);
     }
 };
 
-void NuKeeperStorage::finalize()
+void KeeperStorage::finalize()
 {
     if (finalized)
         throw DB::Exception("Testkeeper storage already finalized", ErrorCodes::LOGICAL_ERROR);
@@ -543,20 +566,20 @@ void NuKeeperStorage::finalize()
 }
 
 
-class NuKeeperWrapperFactory final : private boost::noncopyable
+class KeeperWrapperFactory final : private boost::noncopyable
 {
 
 public:
-    using Creator = std::function<NuKeeperStorageRequestPtr(const Coordination::ZooKeeperRequestPtr &)>;
+    using Creator = std::function<KeeperStorageRequestPtr(const Coordination::ZooKeeperRequestPtr &)>;
     using OpNumToRequest = std::unordered_map<Coordination::OpNum, Creator>;
 
-    static NuKeeperWrapperFactory & instance()
+    static KeeperWrapperFactory & instance()
     {
-        static NuKeeperWrapperFactory factory;
+        static KeeperWrapperFactory factory;
         return factory;
     }
 
-    NuKeeperStorageRequestPtr get(const Coordination::ZooKeeperRequestPtr & zk_request) const
+    KeeperStorageRequestPtr get(const Coordination::ZooKeeperRequestPtr & zk_request) const
     {
         auto it = op_num_to_request.find(zk_request->getOpNum());
         if (it == op_num_to_request.end())
@@ -573,37 +596,45 @@ public:
 
 private:
     OpNumToRequest op_num_to_request;
-    NuKeeperWrapperFactory();
+    KeeperWrapperFactory();
 };
 
 template<Coordination::OpNum num, typename RequestT>
-void registerNuKeeperRequestWrapper(NuKeeperWrapperFactory & factory)
+void registerKeeperRequestWrapper(KeeperWrapperFactory & factory)
 {
     factory.registerRequest(num, [] (const Coordination::ZooKeeperRequestPtr & zk_request) { return std::make_shared<RequestT>(zk_request); });
 }
 
 
-NuKeeperWrapperFactory::NuKeeperWrapperFactory()
+KeeperWrapperFactory::KeeperWrapperFactory()
 {
-    registerNuKeeperRequestWrapper<Coordination::OpNum::Heartbeat, NuKeeperStorageHeartbeatRequest>(*this);
-    registerNuKeeperRequestWrapper<Coordination::OpNum::Sync, NuKeeperStorageSyncRequest>(*this);
-    //registerNuKeeperRequestWrapper<Coordination::OpNum::Auth, NuKeeperStorageAuthRequest>(*this);
-    registerNuKeeperRequestWrapper<Coordination::OpNum::Close, NuKeeperStorageCloseRequest>(*this);
-    registerNuKeeperRequestWrapper<Coordination::OpNum::Create, NuKeeperStorageCreateRequest>(*this);
-    registerNuKeeperRequestWrapper<Coordination::OpNum::Remove, NuKeeperStorageRemoveRequest>(*this);
-    registerNuKeeperRequestWrapper<Coordination::OpNum::Exists, NuKeeperStorageExistsRequest>(*this);
-    registerNuKeeperRequestWrapper<Coordination::OpNum::Get, NuKeeperStorageGetRequest>(*this);
-    registerNuKeeperRequestWrapper<Coordination::OpNum::Set, NuKeeperStorageSetRequest>(*this);
-    registerNuKeeperRequestWrapper<Coordination::OpNum::List, NuKeeperStorageListRequest>(*this);
-    registerNuKeeperRequestWrapper<Coordination::OpNum::SimpleList, NuKeeperStorageListRequest>(*this);
-    registerNuKeeperRequestWrapper<Coordination::OpNum::Check, NuKeeperStorageCheckRequest>(*this);
-    registerNuKeeperRequestWrapper<Coordination::OpNum::Multi, NuKeeperStorageMultiRequest>(*this);
+    registerKeeperRequestWrapper<Coordination::OpNum::Heartbeat, KeeperStorageHeartbeatRequest>(*this);
+    registerKeeperRequestWrapper<Coordination::OpNum::Sync, KeeperStorageSyncRequest>(*this);
+    //registerKeeperRequestWrapper<Coordination::OpNum::Auth, KeeperStorageAuthRequest>(*this);
+    registerKeeperRequestWrapper<Coordination::OpNum::Close, KeeperStorageCloseRequest>(*this);
+    registerKeeperRequestWrapper<Coordination::OpNum::Create, KeeperStorageCreateRequest>(*this);
+    registerKeeperRequestWrapper<Coordination::OpNum::Remove, KeeperStorageRemoveRequest>(*this);
+    registerKeeperRequestWrapper<Coordination::OpNum::Exists, KeeperStorageExistsRequest>(*this);
+    registerKeeperRequestWrapper<Coordination::OpNum::Get, KeeperStorageGetRequest>(*this);
+    registerKeeperRequestWrapper<Coordination::OpNum::Set, KeeperStorageSetRequest>(*this);
+    registerKeeperRequestWrapper<Coordination::OpNum::List, KeeperStorageListRequest>(*this);
+    registerKeeperRequestWrapper<Coordination::OpNum::SimpleList, KeeperStorageListRequest>(*this);
+    registerKeeperRequestWrapper<Coordination::OpNum::Check, KeeperStorageCheckRequest>(*this);
+    registerKeeperRequestWrapper<Coordination::OpNum::Multi, KeeperStorageMultiRequest>(*this);
 }
 
 
-NuKeeperStorage::ResponsesForSessions NuKeeperStorage::processRequest(const Coordination::ZooKeeperRequestPtr & zk_request, int64_t session_id)
+KeeperStorage::ResponsesForSessions KeeperStorage::processRequest(const Coordination::ZooKeeperRequestPtr & zk_request, int64_t session_id, std::optional<int64_t> new_last_zxid)
 {
-    NuKeeperStorage::ResponsesForSessions results;
+    KeeperStorage::ResponsesForSessions results;
+    if (new_last_zxid)
+    {
+        if (zxid >= *new_last_zxid)
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Got new ZXID {} smaller or equal than current {}. It's a bug", *new_last_zxid, zxid);
+        zxid = *new_last_zxid;
+    }
+
+    session_expiry_queue.update(session_id, session_and_timeout[session_id]);
     if (zk_request->getOpNum() == Coordination::OpNum::Close)
     {
         auto it = ephemerals.find(session_id);
@@ -612,6 +643,13 @@ NuKeeperStorage::ResponsesForSessions NuKeeperStorage::processRequest(const Coor
             for (const auto & ephemeral_path : it->second)
             {
                 container.erase(ephemeral_path);
+                container.updateValue(parentPath(ephemeral_path), [&ephemeral_path] (KeeperStorage::Node & parent)
+                {
+                    --parent.stat.numChildren;
+                    ++parent.stat.cversion;
+                    parent.children.erase(getBaseName(ephemeral_path));
+                });
+
                 auto responses = processWatchesImpl(ephemeral_path, watches, list_watches, Coordination::Event::DELETED);
                 results.insert(results.end(), responses.begin(), responses.end());
             }
@@ -629,8 +667,7 @@ NuKeeperStorage::ResponsesForSessions NuKeeperStorage::processRequest(const Coor
     }
     else if (zk_request->getOpNum() == Coordination::OpNum::Heartbeat)
     {
-        session_expiry_queue.update(session_id, session_and_timeout[session_id]);
-        NuKeeperStorageRequestPtr storage_request = NuKeeperWrapperFactory::instance().get(zk_request);
+        KeeperStorageRequestPtr storage_request = KeeperWrapperFactory::instance().get(zk_request);
         auto [response, _] = storage_request->process(container, ephemerals, zxid, session_id);
         response->xid = zk_request->xid;
         response->zxid = getZXID();
@@ -639,8 +676,7 @@ NuKeeperStorage::ResponsesForSessions NuKeeperStorage::processRequest(const Coor
     }
     else
     {
-
-        NuKeeperStorageRequestPtr storage_request = NuKeeperWrapperFactory::instance().get(zk_request);
+        KeeperStorageRequestPtr storage_request = KeeperWrapperFactory::instance().get(zk_request);
         auto [response, _] = storage_request->process(container, ephemerals, zxid, session_id);
 
         if (zk_request->has_watch)
@@ -677,7 +713,7 @@ NuKeeperStorage::ResponsesForSessions NuKeeperStorage::processRequest(const Coor
 }
 
 
-void NuKeeperStorage::clearDeadWatches(int64_t session_id)
+void KeeperStorage::clearDeadWatches(int64_t session_id)
 {
     auto watches_it = sessions_and_watchers.find(session_id);
     if (watches_it != sessions_and_watchers.end())
diff --git a/src/Coordination/NuKeeperStorage.h b/src/Coordination/KeeperStorage.h
similarity index 60%
rename from src/Coordination/NuKeeperStorage.h
rename to src/Coordination/KeeperStorage.h
index 20ab1982b4e..585426a7441 100644
--- a/src/Coordination/NuKeeperStorage.h
+++ b/src/Coordination/KeeperStorage.h
@@ -5,6 +5,7 @@
 #include <Common/ConcurrentBoundedQueue.h>
 #include <Common/ZooKeeper/ZooKeeperCommon.h>
 #include <Coordination/SessionExpiryQueue.h>
+#include <Coordination/SnapshotableHashTable.h>
 #include <unordered_map>
 #include <unordered_set>
 #include <vector>
@@ -13,23 +14,27 @@ namespace DB
 {
 
 using namespace DB;
-struct NuKeeperStorageRequest;
-using NuKeeperStorageRequestPtr = std::shared_ptr<NuKeeperStorageRequest>;
+struct KeeperStorageRequest;
+using KeeperStorageRequestPtr = std::shared_ptr<KeeperStorageRequest>;
 using ResponseCallback = std::function<void(const Coordination::ZooKeeperResponsePtr &)>;
+using ChildrenSet = std::unordered_set<std::string>;
+using SessionAndTimeout = std::unordered_map<int64_t, int64_t>;
 
-class NuKeeperStorage
+struct KeeperStorageSnapshot;
+
+class KeeperStorage
 {
 public:
-    int64_t session_id_counter{0};
+    int64_t session_id_counter{1};
 
     struct Node
     {
         String data;
         Coordination::ACLs acls{};
-        bool is_ephemeral = false;
         bool is_sequental = false;
         Coordination::Stat stat{};
         int32_t seq_num = 0;
+        ChildrenSet children{};
     };
 
     struct ResponseForSession
@@ -48,10 +53,9 @@ public:
 
     using RequestsForSessions = std::vector<RequestForSession>;
 
-    using Container = std::map<std::string, Node>;
-    using Ephemerals = std::unordered_map<int64_t, std::unordered_set<String>>;
-    using SessionAndWatcher = std::unordered_map<int64_t, std::unordered_set<String>>;
-    using SessionAndTimeout = std::unordered_map<int64_t, long>;
+    using Container = SnapshotableHashTable<Node>;
+    using Ephemerals = std::unordered_map<int64_t, std::unordered_set<std::string>>;
+    using SessionAndWatcher = std::unordered_map<int64_t, std::unordered_set<std::string>>;
     using SessionIDs = std::vector<int64_t>;
 
     using Watches = std::map<String /* path, relative of root_path */, SessionIDs>;
@@ -70,13 +74,13 @@ public:
 
     void clearDeadWatches(int64_t session_id);
 
-    int64_t getZXID()
+    int64_t getZXID() const
     {
-        return zxid++;
+        return zxid;
     }
 
 public:
-    NuKeeperStorage(int64_t tick_time_ms);
+    KeeperStorage(int64_t tick_time_ms);
 
     int64_t getSessionID(int64_t session_timeout_ms)
     {
@@ -86,14 +90,47 @@ public:
         return result;
     }
 
-    ResponsesForSessions processRequest(const Coordination::ZooKeeperRequestPtr & request, int64_t session_id);
+    void addSessionID(int64_t session_id, int64_t session_timeout_ms)
+    {
+        session_and_timeout.emplace(session_id, session_timeout_ms);
+        session_expiry_queue.update(session_id, session_timeout_ms);
+    }
+
+    ResponsesForSessions processRequest(const Coordination::ZooKeeperRequestPtr & request, int64_t session_id, std::optional<int64_t> new_last_zxid);
 
     void finalize();
 
+    void enableSnapshotMode()
+    {
+        container.enableSnapshotMode();
+    }
+
+    void disableSnapshotMode()
+    {
+        container.disableSnapshotMode();
+    }
+
+    Container::const_iterator getSnapshotIteratorBegin() const
+    {
+        return container.begin();
+    }
+
+    void clearGarbageAfterSnapshot()
+    {
+        container.clearOutdatedNodes();
+    }
+
+    const SessionAndTimeout & getActiveSessions() const
+    {
+        return session_and_timeout;
+    }
+
     std::unordered_set<int64_t> getDeadSessions()
     {
         return session_expiry_queue.getExpiredSessions();
     }
 };
 
+using KeeperStoragePtr = std::unique_ptr<KeeperStorage>;
+
 }
diff --git a/src/Coordination/KeeperStorageDispatcher.cpp b/src/Coordination/KeeperStorageDispatcher.cpp
new file mode 100644
index 00000000000..fc79f5bee97
--- /dev/null
+++ b/src/Coordination/KeeperStorageDispatcher.cpp
@@ -0,0 +1,461 @@
+#include <Coordination/KeeperStorageDispatcher.h>
+#include <Common/setThreadName.h>
+#include <Common/Stopwatch.h>
+#include <Common/ZooKeeper/KeeperException.h>
+#include <future>
+#include <chrono>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+
+    extern const int LOGICAL_ERROR;
+    extern const int TIMEOUT_EXCEEDED;
+}
+
+KeeperStorageDispatcher::KeeperStorageDispatcher()
+    : coordination_settings(std::make_shared<CoordinationSettings>())
+    , log(&Poco::Logger::get("KeeperDispatcher"))
+{
+}
+
+
+void KeeperStorageDispatcher::requestThread()
+{
+    setThreadName("KeeperReqT");
+
+    /// Result of requests batch from previous iteration
+    RaftAppendResult prev_result = nullptr;
+    /// Requests from previous iteration. We store them to be able
+    /// to send errors to the client.
+    KeeperStorage::RequestsForSessions prev_batch;
+
+    while (!shutdown_called)
+    {
+        KeeperStorage::RequestForSession request;
+
+        UInt64 max_wait = UInt64(coordination_settings->operation_timeout_ms.totalMilliseconds());
+        uint64_t max_batch_size = coordination_settings->max_requests_batch_size;
+
+        /// The code below do a very simple thing: batch all write (quorum) requests into vector until
+        /// previous write batch is not finished or max_batch size achieved. The main complexity goes from
+        /// the ability to process read requests without quorum (from local state). So when we are collecting
+        /// requests into a batch we must check that the new request is not read request. Otherwise we have to
+        /// process all already accumulated write requests, wait them synchronously and only after that process
+        /// read request. So reads are some kind of "separator" for writes.
+        try
+        {
+            if (requests_queue->tryPop(request, max_wait))
+            {
+                if (shutdown_called)
+                    break;
+
+                KeeperStorage::RequestsForSessions current_batch;
+
+                bool has_read_request = false;
+
+                /// If new request is not read request or we must to process it through quorum.
+                /// Otherwise we will process it locally.
+                if (coordination_settings->quorum_reads || !request.request->isReadRequest())
+                {
+                    current_batch.emplace_back(request);
+
+                    /// Waiting until previous append will be successful, or batch is big enough
+                    /// has_result == false && get_result_code == OK means that our request still not processed.
+                    /// Sometimes NuRaft set errorcode without setting result, so we check both here.
+                    while (prev_result && (!prev_result->has_result() && prev_result->get_result_code() == nuraft::cmd_result_code::OK) && current_batch.size() <= max_batch_size)
+                    {
+                        /// Trying to get batch requests as fast as possible
+                        if (requests_queue->tryPop(request, 1))
+                        {
+                            /// Don't append read request into batch, we have to process them separately
+                            if (!coordination_settings->quorum_reads && request.request->isReadRequest())
+                            {
+                                has_read_request = true;
+                                break;
+                            }
+                            else
+                            {
+
+                                current_batch.emplace_back(request);
+                            }
+                        }
+
+                        if (shutdown_called)
+                            break;
+                    }
+                }
+                else
+                    has_read_request = true;
+
+                if (shutdown_called)
+                    break;
+
+                /// Forcefully process all previous pending requests
+                if (prev_result)
+                    forceWaitAndProcessResult(prev_result, prev_batch);
+
+                /// Process collected write requests batch
+                if (!current_batch.empty())
+                {
+                    auto result = server->putRequestBatch(current_batch);
+
+                    if (result)
+                    {
+                        if (has_read_request) /// If we will execute read request next, than we have to process result now
+                            forceWaitAndProcessResult(result, current_batch);
+                    }
+                    else
+                    {
+                        addErrorResponses(current_batch, Coordination::Error::ZRUNTIMEINCONSISTENCY);
+                        current_batch.clear();
+                    }
+
+                    prev_batch = current_batch;
+                    prev_result = result;
+                }
+
+                /// Read request always goes after write batch (last request)
+                if (has_read_request)
+                {
+                    if (server->isLeaderAlive())
+                        server->putLocalReadRequest(request);
+                    else
+                        addErrorResponses({request}, Coordination::Error::ZRUNTIMEINCONSISTENCY);
+                }
+            }
+        }
+        catch (...)
+        {
+            tryLogCurrentException(__PRETTY_FUNCTION__);
+        }
+    }
+}
+
+void KeeperStorageDispatcher::responseThread()
+{
+    setThreadName("KeeperRspT");
+    while (!shutdown_called)
+    {
+        KeeperStorage::ResponseForSession response_for_session;
+
+        UInt64 max_wait = UInt64(coordination_settings->operation_timeout_ms.totalMilliseconds());
+
+        if (responses_queue.tryPop(response_for_session, max_wait))
+        {
+            if (shutdown_called)
+                break;
+
+            try
+            {
+                 setResponse(response_for_session.session_id, response_for_session.response);
+            }
+            catch (...)
+            {
+                tryLogCurrentException(__PRETTY_FUNCTION__);
+            }
+        }
+    }
+}
+
+void KeeperStorageDispatcher::snapshotThread()
+{
+    setThreadName("KeeperSnpT");
+    while (!shutdown_called)
+    {
+        CreateSnapshotTask task;
+        snapshots_queue.pop(task);
+
+        if (shutdown_called)
+            break;
+
+        try
+        {
+            task.create_snapshot(std::move(task.snapshot));
+        }
+        catch (...)
+        {
+            tryLogCurrentException(__PRETTY_FUNCTION__);
+        }
+    }
+}
+
+void KeeperStorageDispatcher::setResponse(int64_t session_id, const Coordination::ZooKeeperResponsePtr & response)
+{
+    std::lock_guard lock(session_to_response_callback_mutex);
+    if (response->xid != Coordination::WATCH_XID && response->getOpNum() == Coordination::OpNum::SessionID)
+    {
+        const Coordination::ZooKeeperSessionIDResponse & session_id_resp = dynamic_cast<const Coordination::ZooKeeperSessionIDResponse &>(*response);
+
+        /// Nobody waits for this session id
+        if (session_id_resp.server_id != server->getServerID() || !new_session_id_response_callback.count(session_id_resp.internal_id))
+            return;
+
+        auto callback = new_session_id_response_callback[session_id_resp.internal_id];
+        callback(response);
+        new_session_id_response_callback.erase(session_id_resp.internal_id);
+    }
+    else
+    {
+        auto session_writer = session_to_response_callback.find(session_id);
+        if (session_writer == session_to_response_callback.end())
+            return;
+
+        session_writer->second(response);
+
+        /// Session closed, no more writes
+        if (response->xid != Coordination::WATCH_XID && response->getOpNum() == Coordination::OpNum::Close)
+        {
+            session_to_response_callback.erase(session_writer);
+        }
+    }
+}
+
+bool KeeperStorageDispatcher::putRequest(const Coordination::ZooKeeperRequestPtr & request, int64_t session_id)
+{
+    {
+        std::lock_guard lock(session_to_response_callback_mutex);
+        if (session_to_response_callback.count(session_id) == 0)
+            return false;
+    }
+
+    KeeperStorage::RequestForSession request_info;
+    request_info.request = request;
+    request_info.session_id = session_id;
+
+    std::lock_guard lock(push_request_mutex);
+    /// Put close requests without timeouts
+    if (request->getOpNum() == Coordination::OpNum::Close)
+        requests_queue->push(std::move(request_info));
+    else if (!requests_queue->tryPush(std::move(request_info), coordination_settings->operation_timeout_ms.totalMilliseconds()))
+        throw Exception("Cannot push request to queue within operation timeout", ErrorCodes::TIMEOUT_EXCEEDED);
+    return true;
+}
+
+void KeeperStorageDispatcher::initialize(const Poco::Util::AbstractConfiguration & config)
+{
+    LOG_DEBUG(log, "Initializing storage dispatcher");
+    int myid = config.getInt("keeper_server.server_id");
+
+    coordination_settings->loadFromConfig("keeper_server.coordination_settings", config);
+    requests_queue = std::make_unique<RequestsQueue>(coordination_settings->max_requests_batch_size);
+
+    request_thread = ThreadFromGlobalPool([this] { requestThread(); });
+    responses_thread = ThreadFromGlobalPool([this] { responseThread(); });
+    snapshot_thread = ThreadFromGlobalPool([this] { snapshotThread(); });
+
+    server = std::make_unique<KeeperServer>(myid, coordination_settings, config, responses_queue, snapshots_queue);
+    try
+    {
+        LOG_DEBUG(log, "Waiting server to initialize");
+        server->startup();
+        LOG_DEBUG(log, "Server initialized, waiting for quorum");
+
+        server->waitInit();
+        LOG_DEBUG(log, "Quorum initialized");
+    }
+    catch (...)
+    {
+        tryLogCurrentException(__PRETTY_FUNCTION__);
+        throw;
+    }
+
+
+    session_cleaner_thread = ThreadFromGlobalPool([this] { sessionCleanerTask(); });
+
+    LOG_DEBUG(log, "Dispatcher initialized");
+}
+
+void KeeperStorageDispatcher::shutdown()
+{
+    try
+    {
+        {
+            std::lock_guard lock(push_request_mutex);
+
+            if (shutdown_called)
+                return;
+
+            LOG_DEBUG(log, "Shutting down storage dispatcher");
+            shutdown_called = true;
+
+            if (session_cleaner_thread.joinable())
+                session_cleaner_thread.join();
+
+            /// FIXME not the best way to notify
+            requests_queue->push({});
+            if (request_thread.joinable())
+                request_thread.join();
+
+            responses_queue.push({});
+            if (responses_thread.joinable())
+                responses_thread.join();
+
+            snapshots_queue.push({});
+            if (snapshot_thread.joinable())
+                snapshot_thread.join();
+        }
+
+        if (server)
+            server->shutdown();
+
+        KeeperStorage::RequestForSession request_for_session;
+        while (requests_queue->tryPop(request_for_session))
+        {
+            if (request_for_session.request)
+            {
+                auto response = request_for_session.request->makeResponse();
+                response->error = Coordination::Error::ZSESSIONEXPIRED;
+                setResponse(request_for_session.session_id, response);
+            }
+            else
+            {
+                break;
+            }
+        }
+        session_to_response_callback.clear();
+    }
+    catch (...)
+    {
+        tryLogCurrentException(__PRETTY_FUNCTION__);
+    }
+
+    LOG_DEBUG(log, "Dispatcher shut down");
+}
+
+KeeperStorageDispatcher::~KeeperStorageDispatcher()
+{
+    shutdown();
+}
+
+void KeeperStorageDispatcher::registerSession(int64_t session_id, ZooKeeperResponseCallback callback)
+{
+    std::lock_guard lock(session_to_response_callback_mutex);
+    if (!session_to_response_callback.try_emplace(session_id, callback).second)
+        throw Exception(DB::ErrorCodes::LOGICAL_ERROR, "Session with id {} already registered in dispatcher", session_id);
+}
+
+void KeeperStorageDispatcher::sessionCleanerTask()
+{
+    while (true)
+    {
+        if (shutdown_called)
+            return;
+
+        try
+        {
+            if (isLeader())
+            {
+                auto dead_sessions = server->getDeadSessions();
+                for (int64_t dead_session : dead_sessions)
+                {
+                    LOG_INFO(log, "Found dead session {}, will try to close it", dead_session);
+                    Coordination::ZooKeeperRequestPtr request = Coordination::ZooKeeperRequestFactory::instance().get(Coordination::OpNum::Close);
+                    request->xid = Coordination::CLOSE_XID;
+                    KeeperStorage::RequestForSession request_info;
+                    request_info.request = request;
+                    request_info.session_id = dead_session;
+                    {
+                        std::lock_guard lock(push_request_mutex);
+                        requests_queue->push(std::move(request_info));
+                    }
+                    finishSession(dead_session);
+                    LOG_INFO(log, "Dead session close request pushed");
+                }
+            }
+        }
+        catch (...)
+        {
+            tryLogCurrentException(__PRETTY_FUNCTION__);
+        }
+
+        std::this_thread::sleep_for(std::chrono::milliseconds(coordination_settings->dead_session_check_period_ms.totalMilliseconds()));
+    }
+}
+
+void KeeperStorageDispatcher::finishSession(int64_t session_id)
+{
+    std::lock_guard lock(session_to_response_callback_mutex);
+    auto session_it = session_to_response_callback.find(session_id);
+    if (session_it != session_to_response_callback.end())
+        session_to_response_callback.erase(session_it);
+}
+
+void KeeperStorageDispatcher::addErrorResponses(const KeeperStorage::RequestsForSessions & requests_for_sessions, Coordination::Error error)
+{
+    for (const auto & [session_id, request] : requests_for_sessions)
+    {
+        KeeperStorage::ResponsesForSessions responses;
+        auto response = request->makeResponse();
+        response->xid = request->xid;
+        response->zxid = 0;
+        response->error = error;
+        responses_queue.push(DB::KeeperStorage::ResponseForSession{session_id, response});
+    }
+}
+
+void KeeperStorageDispatcher::forceWaitAndProcessResult(RaftAppendResult & result, KeeperStorage::RequestsForSessions & requests_for_sessions)
+{
+    if (!result->has_result())
+        result->get();
+
+    /// If we get some errors, than send them to clients
+    if (!result->get_accepted() || result->get_result_code() == nuraft::cmd_result_code::TIMEOUT)
+        addErrorResponses(requests_for_sessions, Coordination::Error::ZOPERATIONTIMEOUT);
+    else if (result->get_result_code() != nuraft::cmd_result_code::OK)
+        addErrorResponses(requests_for_sessions, Coordination::Error::ZRUNTIMEINCONSISTENCY);
+
+    result = nullptr;
+    requests_for_sessions.clear();
+}
+
+int64_t KeeperStorageDispatcher::getSessionID(int64_t session_timeout_ms)
+{
+    KeeperStorage::RequestForSession request_info;
+    std::shared_ptr<Coordination::ZooKeeperSessionIDRequest> request = std::make_shared<Coordination::ZooKeeperSessionIDRequest>();
+    request->internal_id = internal_session_id_counter.fetch_add(1);
+    request->session_timeout_ms = session_timeout_ms;
+    request->server_id = server->getServerID();
+
+    request_info.request = request;
+    request_info.session_id = -1;
+
+    auto promise = std::make_shared<std::promise<int64_t>>();
+    auto future = promise->get_future();
+    {
+        std::lock_guard lock(session_to_response_callback_mutex);
+        new_session_id_response_callback[request->internal_id] = [promise, internal_id = request->internal_id] (const Coordination::ZooKeeperResponsePtr & response)
+        {
+            if (response->getOpNum() != Coordination::OpNum::SessionID)
+                promise->set_exception(std::make_exception_ptr(Exception(ErrorCodes::LOGICAL_ERROR,
+                            "Incorrect response of type {} instead of SessionID response", Coordination::toString(response->getOpNum()))));
+
+            auto session_id_response = dynamic_cast<const Coordination::ZooKeeperSessionIDResponse &>(*response);
+            if (session_id_response.internal_id != internal_id)
+            {
+                promise->set_exception(std::make_exception_ptr(Exception(ErrorCodes::LOGICAL_ERROR,
+                            "Incorrect response with internal id {} instead of {}", session_id_response.internal_id, internal_id)));
+            }
+
+            if (response->error != Coordination::Error::ZOK)
+                promise->set_exception(std::make_exception_ptr(zkutil::KeeperException("SessionID request failed with error", response->error)));
+
+            promise->set_value(session_id_response.session_id);
+        };
+    }
+
+    {
+        std::lock_guard lock(push_request_mutex);
+        if (!requests_queue->tryPush(std::move(request_info), session_timeout_ms))
+            throw Exception("Cannot push session id request to queue within session timeout", ErrorCodes::TIMEOUT_EXCEEDED);
+    }
+
+    if (future.wait_for(std::chrono::milliseconds(session_timeout_ms)) != std::future_status::ready)
+        throw Exception("Cannot receive session id within session timeout", ErrorCodes::TIMEOUT_EXCEEDED);
+
+    return future.get();
+}
+
+}
diff --git a/src/Coordination/KeeperStorageDispatcher.h b/src/Coordination/KeeperStorageDispatcher.h
new file mode 100644
index 00000000000..e4cfa620e6c
--- /dev/null
+++ b/src/Coordination/KeeperStorageDispatcher.h
@@ -0,0 +1,116 @@
+#pragma once
+
+#if !defined(ARCADIA_BUILD)
+#    include <Common/config.h>
+#    include "config_core.h"
+#endif
+
+#if USE_NURAFT
+
+#include <Common/ThreadPool.h>
+#include <Common/ConcurrentBoundedQueue.h>
+#include <Poco/Util/AbstractConfiguration.h>
+#include <Common/Exception.h>
+#include <common/logger_useful.h>
+#include <functional>
+#include <Coordination/KeeperServer.h>
+#include <Coordination/CoordinationSettings.h>
+
+
+namespace DB
+{
+
+using ZooKeeperResponseCallback = std::function<void(const Coordination::ZooKeeperResponsePtr & response)>;
+
+class KeeperStorageDispatcher
+{
+
+private:
+    std::mutex push_request_mutex;
+
+    CoordinationSettingsPtr coordination_settings;
+    using RequestsQueue = ConcurrentBoundedQueue<KeeperStorage::RequestForSession>;
+    using SessionToResponseCallback = std::unordered_map<int64_t, ZooKeeperResponseCallback>;
+
+    /// Size depends on coordination settings
+    std::unique_ptr<RequestsQueue> requests_queue;
+    ResponsesQueue responses_queue;
+    SnapshotsQueue snapshots_queue{1};
+
+    std::atomic<bool> shutdown_called{false};
+
+    std::mutex session_to_response_callback_mutex;
+    /// These two maps looks similar, but serves different purposes.
+    /// The first map is subscription map for normal responses like
+    /// (get, set, list, etc.). Dispatcher determines callback for each response
+    /// using session id from this map.
+    SessionToResponseCallback session_to_response_callback;
+    /// But when client connects to the server for the first time it doesn't
+    /// have session_id. It request it from server. We give temporary
+    /// internal id for such requests just to much client with its response.
+    SessionToResponseCallback new_session_id_response_callback;
+
+    /// Reading and batching new requests from client handlers
+    ThreadFromGlobalPool request_thread;
+    /// Pushing responses to clients client handlers
+    /// using session_id.
+    ThreadFromGlobalPool responses_thread;
+    /// Cleaning old dead sessions
+    ThreadFromGlobalPool session_cleaner_thread;
+    /// Dumping new snapshots to disk
+    ThreadFromGlobalPool snapshot_thread;
+
+    /// RAFT wrapper. Most important class.
+    std::unique_ptr<KeeperServer> server;
+
+    Poco::Logger * log;
+
+    /// Counter for new session_id requests.
+    std::atomic<int64_t> internal_session_id_counter{0};
+
+private:
+    void requestThread();
+    void responseThread();
+    void sessionCleanerTask();
+    void snapshotThread();
+    void setResponse(int64_t session_id, const Coordination::ZooKeeperResponsePtr & response);
+
+    /// Add error responses for requests to responses queue.
+    /// Clears requests.
+    void addErrorResponses(const KeeperStorage::RequestsForSessions & requests_for_sessions, Coordination::Error error);
+
+    /// Forcefully wait for result and sets errors if something when wrong.
+    /// Clears both arguments
+    void forceWaitAndProcessResult(RaftAppendResult & result, KeeperStorage::RequestsForSessions & requests_for_sessions);
+
+public:
+    KeeperStorageDispatcher();
+
+    void initialize(const Poco::Util::AbstractConfiguration & config);
+
+    void shutdown();
+
+    ~KeeperStorageDispatcher();
+
+    bool putRequest(const Coordination::ZooKeeperRequestPtr & request, int64_t session_id);
+
+    bool isLeader() const
+    {
+        return server->isLeader();
+    }
+
+    bool hasLeader() const
+    {
+        return server->isLeaderAlive();
+    }
+
+    int64_t getSessionID(int64_t session_timeout_ms);
+
+    void registerSession(int64_t session_id, ZooKeeperResponseCallback callback);
+    /// Call if we don't need any responses for this session no more (session was expired)
+    void finishSession(int64_t session_id);
+};
+
+}
+
+#endif
diff --git a/src/Coordination/LoggerWrapper.h b/src/Coordination/LoggerWrapper.h
index 755b72c06cc..25a1969d2e9 100644
--- a/src/Coordination/LoggerWrapper.h
+++ b/src/Coordination/LoggerWrapper.h
@@ -9,12 +9,26 @@ namespace DB
 
 class LoggerWrapper : public nuraft::logger
 {
+private:
+
+    static inline const std::unordered_map<LogsLevel, Poco::Message::Priority> LEVELS =
+    {
+        {LogsLevel::trace, Poco::Message::Priority::PRIO_TRACE},
+        {LogsLevel::debug, Poco::Message::Priority::PRIO_DEBUG},
+        {LogsLevel::information, Poco::Message::PRIO_INFORMATION},
+        {LogsLevel::warning, Poco::Message::PRIO_WARNING},
+        {LogsLevel::error, Poco::Message::PRIO_ERROR},
+        {LogsLevel::fatal, Poco::Message::PRIO_FATAL}
+    };
+    static inline const int LEVEL_MAX = static_cast<int>(LogsLevel::trace);
+    static inline const int LEVEL_MIN = static_cast<int>(LogsLevel::none);
+
 public:
     LoggerWrapper(const std::string & name, LogsLevel level_)
         : log(&Poco::Logger::get(name))
-        , level(static_cast<int>(level_))
+        , level(level_)
     {
-        log->setLevel(level);
+        log->setLevel(static_cast<int>(LEVELS.at(level)));
     }
 
     void put_details(
@@ -24,24 +38,26 @@ public:
         size_t /* line_number */,
         const std::string & msg) override
     {
-        LOG_IMPL(log, static_cast<DB::LogsLevel>(level_), static_cast<Poco::Message::Priority>(level_), msg);
+        LogsLevel db_level = static_cast<LogsLevel>(level_);
+        LOG_IMPL(log, db_level, LEVELS.at(db_level), msg);
     }
 
     void set_level(int level_) override
     {
-        level_ = std::min(6, std::max(1, level_));
-        log->setLevel(level_);
-        level = level_;
+        level_ = std::min(LEVEL_MAX, std::max(LEVEL_MIN, level_));
+        level = static_cast<LogsLevel>(level_);
+        log->setLevel(static_cast<int>(LEVELS.at(level)));
     }
 
     int get_level() override
     {
-        return level;
+        LogsLevel lvl = level;
+        return static_cast<int>(lvl);
     }
 
 private:
     Poco::Logger * log;
-    std::atomic<int> level;
+    std::atomic<LogsLevel> level;
 };
 
 }
diff --git a/src/Coordination/NuKeeperCommon.h b/src/Coordination/NuKeeperCommon.h
deleted file mode 100644
index 14fc612093c..00000000000
--- a/src/Coordination/NuKeeperCommon.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#pragma once
-
-#include <Common/ZooKeeper/ZooKeeperCommon.h>
-
-namespace DB
-{
-
-struct NuKeeperRequest
-{
-    int64_t session_id;
-    Coordination::ZooKeeperRequestPtr request;
-};
-
-using NuKeeperRequests = std::vector<NuKeeperRequest>;
-
-struct NuKeeperResponse
-{
-    int64_t session_id;
-    Coordination::ZooKeeperRequestPtr response;
-};
-
-using NuKeeperResponses = std::vector<NuKeeperResponse>;
-
-}
diff --git a/src/Coordination/NuKeeperServer.cpp b/src/Coordination/NuKeeperServer.cpp
deleted file mode 100644
index 7464a06e86f..00000000000
--- a/src/Coordination/NuKeeperServer.cpp
+++ /dev/null
@@ -1,182 +0,0 @@
-#include <Coordination/NuKeeperServer.h>
-#include <Coordination/LoggerWrapper.h>
-#include <Coordination/NuKeeperStateMachine.h>
-#include <Coordination/InMemoryStateManager.h>
-#include <Coordination/WriteBufferFromNuraftBuffer.h>
-#include <Coordination/ReadBufferFromNuraftBuffer.h>
-#include <IO/ReadHelpers.h>
-#include <IO/WriteHelpers.h>
-#include <chrono>
-#include <Common/ZooKeeper/ZooKeeperIO.h>
-#include <string>
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int RAFT_ERROR;
-}
-
-NuKeeperServer::NuKeeperServer(
-    int server_id_,
-    const CoordinationSettingsPtr & coordination_settings_,
-    const Poco::Util::AbstractConfiguration & config,
-    ResponsesQueue & responses_queue_)
-    : server_id(server_id_)
-    , coordination_settings(coordination_settings_)
-    , state_machine(nuraft::cs_new<NuKeeperStateMachine>(responses_queue_, coordination_settings))
-    , state_manager(nuraft::cs_new<InMemoryStateManager>(server_id, "test_keeper_server.raft_configuration", config))
-    , responses_queue(responses_queue_)
-{
-}
-
-void NuKeeperServer::startup()
-{
-    nuraft::raft_params params;
-    params.heart_beat_interval_ = coordination_settings->heart_beat_interval_ms.totalMilliseconds();
-    params.election_timeout_lower_bound_ = coordination_settings->election_timeout_lower_bound_ms.totalMilliseconds();
-    params.election_timeout_upper_bound_ = coordination_settings->election_timeout_upper_bound_ms.totalMilliseconds();
-    params.reserved_log_items_ = coordination_settings->reserved_log_items;
-    params.snapshot_distance_ = coordination_settings->snapshot_distance;
-    params.client_req_timeout_ = coordination_settings->operation_timeout_ms.totalMilliseconds();
-    params.auto_forwarding_ = coordination_settings->auto_forwarding;
-    params.auto_forwarding_req_timeout_ = coordination_settings->operation_timeout_ms.totalMilliseconds() * 2;
-
-    params.return_method_ = nuraft::raft_params::blocking;
-
-    nuraft::asio_service::options asio_opts{};
-    nuraft::raft_server::init_options init_options;
-    init_options.skip_initial_election_timeout_ = state_manager->shouldStartAsFollower();
-    init_options.raft_callback_ = [this] (nuraft::cb_func::Type type, nuraft::cb_func::Param * param)
-    {
-        return callbackFunc(type, param);
-    };
-
-    raft_instance = launcher.init(
-        state_machine, state_manager, nuraft::cs_new<LoggerWrapper>("RaftInstance", coordination_settings->raft_logs_level), state_manager->getPort(),
-        asio_opts, params, init_options);
-
-    if (!raft_instance)
-        throw Exception(ErrorCodes::RAFT_ERROR, "Cannot allocate RAFT instance");
-}
-
-void NuKeeperServer::shutdown()
-{
-    state_machine->shutdownStorage();
-    if (!launcher.shutdown(coordination_settings->shutdown_timeout.totalSeconds()))
-        LOG_WARNING(&Poco::Logger::get("NuKeeperServer"), "Failed to shutdown RAFT server in {} seconds", 5);
-}
-
-namespace
-{
-
-nuraft::ptr<nuraft::buffer> getZooKeeperLogEntry(int64_t session_id, const Coordination::ZooKeeperRequestPtr & request)
-{
-    DB::WriteBufferFromNuraftBuffer buf;
-    DB::writeIntBinary(session_id, buf);
-    request->write(buf);
-    return buf.getBuffer();
-}
-
-}
-
-void NuKeeperServer::putRequest(const NuKeeperStorage::RequestForSession & request_for_session)
-{
-    auto [session_id, request] = request_for_session;
-    if (isLeaderAlive() && request->isReadRequest())
-    {
-        state_machine->processReadRequest(request_for_session);
-    }
-    else
-    {
-        std::vector<nuraft::ptr<nuraft::buffer>> entries;
-        entries.push_back(getZooKeeperLogEntry(session_id, request));
-
-        std::lock_guard lock(append_entries_mutex);
-
-        auto result = raft_instance->append_entries(entries);
-        if (!result->get_accepted())
-        {
-            NuKeeperStorage::ResponsesForSessions responses;
-            auto response = request->makeResponse();
-            response->xid = request->xid;
-            response->zxid = 0;
-            response->error = Coordination::Error::ZOPERATIONTIMEOUT;
-            responses_queue.push(DB::NuKeeperStorage::ResponseForSession{session_id, response});
-        }
-
-        if (result->get_result_code() == nuraft::cmd_result_code::TIMEOUT)
-        {
-            NuKeeperStorage::ResponsesForSessions responses;
-            auto response = request->makeResponse();
-            response->xid = request->xid;
-            response->zxid = 0;
-            response->error = Coordination::Error::ZOPERATIONTIMEOUT;
-            responses_queue.push(DB::NuKeeperStorage::ResponseForSession{session_id, response});
-        }
-        else if (result->get_result_code() != nuraft::cmd_result_code::OK)
-            throw Exception(ErrorCodes::RAFT_ERROR, "Requests result failed with code {} and message: '{}'", result->get_result_code(), result->get_result_str());
-    }
-}
-
-int64_t NuKeeperServer::getSessionID(int64_t session_timeout_ms)
-{
-    auto entry = nuraft::buffer::alloc(sizeof(int64_t));
-    /// Just special session request
-    nuraft::buffer_serializer bs(entry);
-    bs.put_i64(session_timeout_ms);
-
-    std::lock_guard lock(append_entries_mutex);
-
-    auto result = raft_instance->append_entries({entry});
-
-    if (!result->get_accepted())
-        throw Exception(ErrorCodes::RAFT_ERROR, "Cannot send session_id request to RAFT");
-
-    if (result->get_result_code() != nuraft::cmd_result_code::OK)
-        throw Exception(ErrorCodes::RAFT_ERROR, "session_id request failed to RAFT");
-
-    auto resp = result->get();
-    if (resp == nullptr)
-        throw Exception(ErrorCodes::RAFT_ERROR, "Received nullptr as session_id");
-
-    nuraft::buffer_serializer bs_resp(resp);
-    return bs_resp.get_i64();
-}
-
-bool NuKeeperServer::isLeader() const
-{
-    return raft_instance->is_leader();
-}
-
-bool NuKeeperServer::isLeaderAlive() const
-{
-    return raft_instance->is_leader_alive();
-}
-
-nuraft::cb_func::ReturnCode NuKeeperServer::callbackFunc(nuraft::cb_func::Type type, nuraft::cb_func::Param * /* param */)
-{
-    if (type == nuraft::cb_func::Type::BecomeFresh || type == nuraft::cb_func::Type::BecomeLeader)
-    {
-        std::unique_lock lock(initialized_mutex);
-        initialized_flag = true;
-        initialized_cv.notify_all();
-    }
-    return nuraft::cb_func::ReturnCode::Ok;
-}
-
-void NuKeeperServer::waitInit()
-{
-    std::unique_lock lock(initialized_mutex);
-    int64_t timeout = coordination_settings->startup_timeout.totalMilliseconds();
-    if (!initialized_cv.wait_for(lock, std::chrono::milliseconds(timeout), [&] { return initialized_flag; }))
-        throw Exception(ErrorCodes::RAFT_ERROR, "Failed to wait RAFT initialization");
-}
-
-std::unordered_set<int64_t> NuKeeperServer::getDeadSessions()
-{
-    return state_machine->getDeadSessions();
-}
-
-}
diff --git a/src/Coordination/NuKeeperServer.h b/src/Coordination/NuKeeperServer.h
deleted file mode 100644
index a8d269eb9eb..00000000000
--- a/src/Coordination/NuKeeperServer.h
+++ /dev/null
@@ -1,63 +0,0 @@
-#pragma once
-
-#include <libnuraft/nuraft.hxx> // Y_IGNORE
-#include <Coordination/InMemoryLogStore.h>
-#include <Coordination/InMemoryStateManager.h>
-#include <Coordination/NuKeeperStateMachine.h>
-#include <Coordination/NuKeeperStorage.h>
-#include <Coordination/CoordinationSettings.h>
-#include <unordered_map>
-
-namespace DB
-{
-
-class NuKeeperServer
-{
-private:
-    int server_id;
-
-    CoordinationSettingsPtr coordination_settings;
-
-    nuraft::ptr<NuKeeperStateMachine> state_machine;
-
-    nuraft::ptr<InMemoryStateManager> state_manager;
-
-    nuraft::raft_launcher launcher;
-
-    nuraft::ptr<nuraft::raft_server> raft_instance;
-
-    std::mutex append_entries_mutex;
-
-    ResponsesQueue & responses_queue;
-
-    std::mutex initialized_mutex;
-    bool initialized_flag = false;
-    std::condition_variable initialized_cv;
-
-    nuraft::cb_func::ReturnCode callbackFunc(nuraft::cb_func::Type type, nuraft::cb_func::Param * param);
-
-public:
-    NuKeeperServer(
-        int server_id_,
-        const CoordinationSettingsPtr & coordination_settings_,
-        const Poco::Util::AbstractConfiguration & config,
-        ResponsesQueue & responses_queue_);
-
-    void startup();
-
-    void putRequest(const NuKeeperStorage::RequestForSession & request);
-
-    int64_t getSessionID(int64_t session_timeout_ms);
-
-    std::unordered_set<int64_t> getDeadSessions();
-
-    bool isLeader() const;
-
-    bool isLeaderAlive() const;
-
-    void waitInit();
-
-    void shutdown();
-};
-
-}
diff --git a/src/Coordination/NuKeeperStateMachine.cpp b/src/Coordination/NuKeeperStateMachine.cpp
deleted file mode 100644
index 0061645c75c..00000000000
--- a/src/Coordination/NuKeeperStateMachine.cpp
+++ /dev/null
@@ -1,262 +0,0 @@
-#include <Coordination/NuKeeperStateMachine.h>
-#include <Coordination/ReadBufferFromNuraftBuffer.h>
-#include <Coordination/WriteBufferFromNuraftBuffer.h>
-#include <IO/ReadHelpers.h>
-#include <Common/ZooKeeper/ZooKeeperIO.h>
-#include <Coordination/NuKeeperStorageSerializer.h>
-
-namespace DB
-{
-
-NuKeeperStorage::RequestForSession parseRequest(nuraft::buffer & data)
-{
-    ReadBufferFromNuraftBuffer buffer(data);
-    NuKeeperStorage::RequestForSession request_for_session;
-    readIntBinary(request_for_session.session_id, buffer);
-
-    int32_t length;
-    Coordination::read(length, buffer);
-
-    int32_t xid;
-    Coordination::read(xid, buffer);
-
-    Coordination::OpNum opnum;
-    Coordination::read(opnum, buffer);
-
-    request_for_session.request = Coordination::ZooKeeperRequestFactory::instance().get(opnum);
-    request_for_session.request->xid = xid;
-    request_for_session.request->readImpl(buffer);
-    return request_for_session;
-}
-
-nuraft::ptr<nuraft::buffer> writeResponses(NuKeeperStorage::ResponsesForSessions & responses)
-{
-    WriteBufferFromNuraftBuffer buffer;
-    for (const auto & response_and_session : responses)
-    {
-        writeIntBinary(response_and_session.session_id, buffer);
-        response_and_session.response->write(buffer);
-    }
-    return buffer.getBuffer();
-}
-
-
-NuKeeperStateMachine::NuKeeperStateMachine(ResponsesQueue & responses_queue_, const CoordinationSettingsPtr & coordination_settings_)
-    : coordination_settings(coordination_settings_)
-    , storage(coordination_settings->dead_session_check_period_ms.totalMilliseconds())
-    , responses_queue(responses_queue_)
-    , last_committed_idx(0)
-    , log(&Poco::Logger::get("NuRaftStateMachine"))
-{
-    LOG_DEBUG(log, "Created nukeeper state machine");
-}
-
-nuraft::ptr<nuraft::buffer> NuKeeperStateMachine::commit(const size_t log_idx, nuraft::buffer & data)
-{
-    if (data.size() == sizeof(int64_t))
-    {
-        nuraft::buffer_serializer timeout_data(data);
-        int64_t session_timeout_ms = timeout_data.get_i64();
-        auto response = nuraft::buffer::alloc(sizeof(int64_t));
-        int64_t session_id;
-        nuraft::buffer_serializer bs(response);
-        {
-            std::lock_guard lock(storage_lock);
-            session_id = storage.getSessionID(session_timeout_ms);
-            bs.put_i64(session_id);
-        }
-        LOG_DEBUG(log, "Session ID response {} with timeout {}", session_id, session_timeout_ms);
-        last_committed_idx = log_idx;
-        return response;
-    }
-    else
-    {
-        auto request_for_session = parseRequest(data);
-        NuKeeperStorage::ResponsesForSessions responses_for_sessions;
-        {
-            std::lock_guard lock(storage_lock);
-            responses_for_sessions = storage.processRequest(request_for_session.request, request_for_session.session_id);
-            for (auto & response_for_session : responses_for_sessions)
-                responses_queue.push(response_for_session);
-        }
-
-        last_committed_idx = log_idx;
-        return nullptr;
-    }
-}
-
-bool NuKeeperStateMachine::apply_snapshot(nuraft::snapshot & s)
-{
-    LOG_DEBUG(log, "Applying snapshot {}", s.get_last_log_idx());
-    StorageSnapshotPtr snapshot;
-    {
-        std::lock_guard<std::mutex> lock(snapshots_lock);
-        auto entry = snapshots.find(s.get_last_log_idx());
-        if (entry == snapshots.end())
-            return false;
-        snapshot = entry->second;
-    }
-    std::lock_guard lock(storage_lock);
-    storage = snapshot->storage;
-    last_committed_idx = s.get_last_log_idx();
-    return true;
-}
-
-nuraft::ptr<nuraft::snapshot> NuKeeperStateMachine::last_snapshot()
-{
-   // Just return the latest snapshot.
-    std::lock_guard<std::mutex> lock(snapshots_lock);
-    auto entry = snapshots.rbegin();
-    if (entry == snapshots.rend())
-        return nullptr;
-
-    return entry->second->snapshot;
-}
-
-NuKeeperStateMachine::StorageSnapshotPtr NuKeeperStateMachine::createSnapshotInternal(nuraft::snapshot & s)
-{
-    nuraft::ptr<nuraft::buffer> snp_buf = s.serialize();
-    nuraft::ptr<nuraft::snapshot> ss = nuraft::snapshot::deserialize(*snp_buf);
-    std::lock_guard lock(storage_lock);
-    return std::make_shared<NuKeeperStateMachine::StorageSnapshot>(ss, storage);
-}
-
-NuKeeperStateMachine::StorageSnapshotPtr NuKeeperStateMachine::readSnapshot(nuraft::snapshot & s, nuraft::buffer & in)
-{
-    nuraft::ptr<nuraft::buffer> snp_buf = s.serialize();
-    nuraft::ptr<nuraft::snapshot> ss = nuraft::snapshot::deserialize(*snp_buf);
-    NuKeeperStorageSerializer serializer;
-
-    ReadBufferFromNuraftBuffer reader(in);
-    NuKeeperStorage new_storage(coordination_settings->dead_session_check_period_ms.totalMilliseconds());
-    serializer.deserialize(new_storage, reader);
-    return std::make_shared<StorageSnapshot>(ss, new_storage);
-}
-
-
-void NuKeeperStateMachine::writeSnapshot(const NuKeeperStateMachine::StorageSnapshotPtr & snapshot, nuraft::ptr<nuraft::buffer> & out)
-{
-    NuKeeperStorageSerializer serializer;
-
-    WriteBufferFromNuraftBuffer writer;
-    serializer.serialize(snapshot->storage, writer);
-    out = writer.getBuffer();
-}
-
-void NuKeeperStateMachine::create_snapshot(
-    nuraft::snapshot & s,
-    nuraft::async_result<bool>::handler_type & when_done)
-{
-    LOG_DEBUG(log, "Creating snapshot {}", s.get_last_log_idx());
-    auto snapshot = createSnapshotInternal(s);
-    {
-        std::lock_guard<std::mutex> lock(snapshots_lock);
-        snapshots[s.get_last_log_idx()] = snapshot;
-        size_t num = snapshots.size();
-        if (num > coordination_settings->max_stored_snapshots)
-        {
-            auto entry = snapshots.begin();
-
-            for (size_t i = 0; i < num - coordination_settings->max_stored_snapshots; ++i)
-            {
-                if (entry == snapshots.end())
-                    break;
-                entry = snapshots.erase(entry);
-            }
-        }
-
-    }
-
-    LOG_DEBUG(log, "Created snapshot {}", s.get_last_log_idx());
-    nuraft::ptr<std::exception> except(nullptr);
-    bool ret = true;
-    when_done(ret, except);
-}
-
-void NuKeeperStateMachine::save_logical_snp_obj(
-    nuraft::snapshot & s,
-    size_t & obj_id,
-    nuraft::buffer & data,
-    bool /*is_first_obj*/,
-    bool /*is_last_obj*/)
-{
-    LOG_DEBUG(log, "Saving snapshot {} obj_id {}", s.get_last_log_idx(), obj_id);
-
-    if (obj_id == 0)
-    {
-        auto new_snapshot = createSnapshotInternal(s);
-        std::lock_guard<std::mutex> lock(snapshots_lock);
-        snapshots.try_emplace(s.get_last_log_idx(), std::move(new_snapshot));
-    }
-    else
-    {
-        auto received_snapshot = readSnapshot(s, data);
-
-        std::lock_guard<std::mutex> lock(snapshots_lock);
-        snapshots[s.get_last_log_idx()] = std::move(received_snapshot);
-    }
-
-    obj_id++;
-}
-
-int NuKeeperStateMachine::read_logical_snp_obj(
-    nuraft::snapshot & s,
-    void* & /*user_snp_ctx*/,
-    ulong obj_id,
-    nuraft::ptr<nuraft::buffer> & data_out,
-    bool & is_last_obj)
-{
-
-    LOG_DEBUG(log, "Reading snapshot {} obj_id {}", s.get_last_log_idx(), obj_id);
-    StorageSnapshotPtr required_snapshot;
-    {
-        std::lock_guard<std::mutex> lock(snapshots_lock);
-        auto entry = snapshots.find(s.get_last_log_idx());
-        if (entry == snapshots.end())
-        {
-            // Snapshot doesn't exist.
-            data_out = nullptr;
-            is_last_obj = true;
-            return 0;
-        }
-        required_snapshot = entry->second;
-    }
-
-    if (obj_id == 0)
-    {
-        auto new_snapshot = createSnapshotInternal(s);
-        writeSnapshot(new_snapshot, data_out);
-        is_last_obj = false;
-    }
-    else
-    {
-        writeSnapshot(required_snapshot, data_out);
-        is_last_obj = true;
-    }
-    return 0;
-}
-
-void NuKeeperStateMachine::processReadRequest(const NuKeeperStorage::RequestForSession & request_for_session)
-{
-    NuKeeperStorage::ResponsesForSessions responses;
-    {
-        std::lock_guard lock(storage_lock);
-        responses = storage.processRequest(request_for_session.request, request_for_session.session_id);
-    }
-    for (const auto & response : responses)
-        responses_queue.push(response);
-}
-
-std::unordered_set<int64_t> NuKeeperStateMachine::getDeadSessions()
-{
-    std::lock_guard lock(storage_lock);
-    return storage.getDeadSessions();
-}
-
-void NuKeeperStateMachine::shutdownStorage()
-{
-    std::lock_guard lock(storage_lock);
-    storage.finalize();
-}
-
-}
diff --git a/src/Coordination/NuKeeperStateMachine.h b/src/Coordination/NuKeeperStateMachine.h
deleted file mode 100644
index 87748db20a5..00000000000
--- a/src/Coordination/NuKeeperStateMachine.h
+++ /dev/null
@@ -1,99 +0,0 @@
-#pragma once
-
-#include <Coordination/NuKeeperStorage.h>
-#include <libnuraft/nuraft.hxx> // Y_IGNORE
-#include <common/logger_useful.h>
-#include <Coordination/ThreadSafeQueue.h>
-#include <Coordination/CoordinationSettings.h>
-
-namespace DB
-{
-
-using ResponsesQueue = ThreadSafeQueue<NuKeeperStorage::ResponseForSession>;
-
-class NuKeeperStateMachine : public nuraft::state_machine
-{
-public:
-    NuKeeperStateMachine(ResponsesQueue & responses_queue_, const CoordinationSettingsPtr & coordination_settings_);
-
-    nuraft::ptr<nuraft::buffer> pre_commit(const size_t /*log_idx*/, nuraft::buffer & /*data*/) override { return nullptr; }
-
-    nuraft::ptr<nuraft::buffer> commit(const size_t log_idx, nuraft::buffer & data) override;
-
-    void rollback(const size_t /*log_idx*/, nuraft::buffer & /*data*/) override {}
-
-    size_t last_commit_index() override { return last_committed_idx; }
-
-    bool apply_snapshot(nuraft::snapshot & s) override;
-
-    nuraft::ptr<nuraft::snapshot> last_snapshot() override;
-
-    void create_snapshot(
-        nuraft::snapshot & s,
-        nuraft::async_result<bool>::handler_type & when_done) override;
-
-    void save_logical_snp_obj(
-        nuraft::snapshot & s,
-        size_t & obj_id,
-        nuraft::buffer & data,
-        bool is_first_obj,
-        bool is_last_obj) override;
-
-    int read_logical_snp_obj(
-        nuraft::snapshot & s,
-        void* & user_snp_ctx,
-        ulong obj_id,
-        nuraft::ptr<nuraft::buffer> & data_out,
-        bool & is_last_obj) override;
-
-    NuKeeperStorage & getStorage()
-    {
-        return storage;
-    }
-
-    void processReadRequest(const NuKeeperStorage::RequestForSession & request_for_session);
-
-    std::unordered_set<int64_t> getDeadSessions();
-
-    void shutdownStorage();
-
-private:
-    struct StorageSnapshot
-    {
-        StorageSnapshot(const nuraft::ptr<nuraft::snapshot> & s, const NuKeeperStorage & storage_)
-            : snapshot(s)
-            , storage(storage_)
-        {}
-
-        nuraft::ptr<nuraft::snapshot> snapshot;
-        NuKeeperStorage storage;
-    };
-
-    using StorageSnapshotPtr = std::shared_ptr<StorageSnapshot>;
-
-    StorageSnapshotPtr createSnapshotInternal(nuraft::snapshot & s);
-
-    StorageSnapshotPtr readSnapshot(nuraft::snapshot & s, nuraft::buffer & in);
-
-    static void writeSnapshot(const StorageSnapshotPtr & snapshot, nuraft::ptr<nuraft::buffer> & out);
-
-    CoordinationSettingsPtr coordination_settings;
-
-    NuKeeperStorage storage;
-
-    ResponsesQueue & responses_queue;
-    /// Mutex for snapshots
-    std::mutex snapshots_lock;
-
-    /// Lock for storage
-    std::mutex storage_lock;
-
-    /// Fake snapshot storage
-    std::map<uint64_t, StorageSnapshotPtr> snapshots;
-
-    /// Last committed Raft log number.
-    std::atomic<size_t> last_committed_idx;
-    Poco::Logger * log;
-};
-
-}
diff --git a/src/Coordination/NuKeeperStorageDispatcher.cpp b/src/Coordination/NuKeeperStorageDispatcher.cpp
deleted file mode 100644
index 570087757ad..00000000000
--- a/src/Coordination/NuKeeperStorageDispatcher.cpp
+++ /dev/null
@@ -1,237 +0,0 @@
-#include <Coordination/NuKeeperStorageDispatcher.h>
-#include <Common/setThreadName.h>
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-
-    extern const int LOGICAL_ERROR;
-    extern const int TIMEOUT_EXCEEDED;
-}
-
-NuKeeperStorageDispatcher::NuKeeperStorageDispatcher()
-    : coordination_settings(std::make_shared<CoordinationSettings>())
-    , log(&Poco::Logger::get("NuKeeperDispatcher"))
-{
-}
-
-void NuKeeperStorageDispatcher::requestThread()
-{
-    setThreadName("NuKeeperReqT");
-    while (!shutdown_called)
-    {
-        NuKeeperStorage::RequestForSession request;
-
-        UInt64 max_wait = UInt64(coordination_settings->operation_timeout_ms.totalMilliseconds());
-
-        if (requests_queue.tryPop(request, max_wait))
-        {
-            if (shutdown_called)
-                break;
-
-            try
-            {
-                server->putRequest(request);
-            }
-            catch (...)
-            {
-                tryLogCurrentException(__PRETTY_FUNCTION__);
-            }
-        }
-    }
-}
-
-void NuKeeperStorageDispatcher::responseThread()
-{
-    setThreadName("NuKeeperRspT");
-    while (!shutdown_called)
-    {
-        NuKeeperStorage::ResponseForSession response_for_session;
-
-        UInt64 max_wait = UInt64(coordination_settings->operation_timeout_ms.totalMilliseconds());
-
-        if (responses_queue.tryPop(response_for_session, max_wait))
-        {
-            if (shutdown_called)
-                break;
-
-            try
-            {
-                 setResponse(response_for_session.session_id, response_for_session.response);
-            }
-            catch (...)
-            {
-                tryLogCurrentException(__PRETTY_FUNCTION__);
-            }
-        }
-    }
-}
-
-void NuKeeperStorageDispatcher::setResponse(int64_t session_id, const Coordination::ZooKeeperResponsePtr & response)
-{
-    std::lock_guard lock(session_to_response_callback_mutex);
-    auto session_writer = session_to_response_callback.find(session_id);
-    if (session_writer == session_to_response_callback.end())
-        return;
-
-    session_writer->second(response);
-    /// Session closed, no more writes
-    if (response->xid != Coordination::WATCH_XID && response->getOpNum() == Coordination::OpNum::Close)
-        session_to_response_callback.erase(session_writer);
-}
-
-bool NuKeeperStorageDispatcher::putRequest(const Coordination::ZooKeeperRequestPtr & request, int64_t session_id)
-{
-    {
-        std::lock_guard lock(session_to_response_callback_mutex);
-        if (session_to_response_callback.count(session_id) == 0)
-            return false;
-    }
-
-    NuKeeperStorage::RequestForSession request_info;
-    request_info.request = request;
-    request_info.session_id = session_id;
-
-    std::lock_guard lock(push_request_mutex);
-    /// Put close requests without timeouts
-    if (request->getOpNum() == Coordination::OpNum::Close)
-        requests_queue.push(std::move(request_info));
-    else if (!requests_queue.tryPush(std::move(request_info), coordination_settings->operation_timeout_ms.totalMilliseconds()))
-        throw Exception("Cannot push request to queue within operation timeout", ErrorCodes::TIMEOUT_EXCEEDED);
-    return true;
-}
-
-void NuKeeperStorageDispatcher::initialize(const Poco::Util::AbstractConfiguration & config)
-{
-    LOG_DEBUG(log, "Initializing storage dispatcher");
-    int myid = config.getInt("test_keeper_server.server_id");
-
-    coordination_settings->loadFromConfig("test_keeper_server.coordination_settings", config);
-
-    server = std::make_unique<NuKeeperServer>(myid, coordination_settings, config, responses_queue);
-    try
-    {
-        LOG_DEBUG(log, "Waiting server to initialize");
-        server->startup();
-        LOG_DEBUG(log, "Server initialized, waiting for quorum");
-
-        server->waitInit();
-        LOG_DEBUG(log, "Quorum initialized");
-    }
-    catch (...)
-    {
-        tryLogCurrentException(__PRETTY_FUNCTION__);
-        throw;
-    }
-
-    request_thread = ThreadFromGlobalPool([this] { requestThread(); });
-    responses_thread = ThreadFromGlobalPool([this] { responseThread(); });
-    session_cleaner_thread = ThreadFromGlobalPool([this] { sessionCleanerTask(); });
-
-    LOG_DEBUG(log, "Dispatcher initialized");
-}
-
-void NuKeeperStorageDispatcher::shutdown()
-{
-    try
-    {
-        {
-            std::lock_guard lock(push_request_mutex);
-
-            if (shutdown_called)
-                return;
-
-            LOG_DEBUG(log, "Shutting down storage dispatcher");
-            shutdown_called = true;
-
-            if (session_cleaner_thread.joinable())
-                session_cleaner_thread.join();
-
-            if (request_thread.joinable())
-                request_thread.join();
-
-            if (responses_thread.joinable())
-                responses_thread.join();
-        }
-
-        if (server)
-            server->shutdown();
-
-        NuKeeperStorage::RequestForSession request_for_session;
-        while (requests_queue.tryPop(request_for_session))
-        {
-            auto response = request_for_session.request->makeResponse();
-            response->error = Coordination::Error::ZSESSIONEXPIRED;
-            setResponse(request_for_session.session_id, response);
-        }
-        session_to_response_callback.clear();
-    }
-    catch (...)
-    {
-        tryLogCurrentException(__PRETTY_FUNCTION__);
-    }
-
-    LOG_DEBUG(log, "Dispatcher shut down");
-}
-
-NuKeeperStorageDispatcher::~NuKeeperStorageDispatcher()
-{
-    shutdown();
-}
-
-void NuKeeperStorageDispatcher::registerSession(int64_t session_id, ZooKeeperResponseCallback callback)
-{
-    std::lock_guard lock(session_to_response_callback_mutex);
-    if (!session_to_response_callback.try_emplace(session_id, callback).second)
-        throw Exception(DB::ErrorCodes::LOGICAL_ERROR, "Session with id {} already registered in dispatcher", session_id);
-}
-
-void NuKeeperStorageDispatcher::sessionCleanerTask()
-{
-    while (true)
-    {
-        if (shutdown_called)
-            return;
-
-        try
-        {
-            if (isLeader())
-            {
-                auto dead_sessions = server->getDeadSessions();
-                for (int64_t dead_session : dead_sessions)
-                {
-                    LOG_INFO(log, "Found dead session {}, will try to close it", dead_session);
-                    Coordination::ZooKeeperRequestPtr request = Coordination::ZooKeeperRequestFactory::instance().get(Coordination::OpNum::Close);
-                    request->xid = Coordination::CLOSE_XID;
-                    NuKeeperStorage::RequestForSession request_info;
-                    request_info.request = request;
-                    request_info.session_id = dead_session;
-                    {
-                        std::lock_guard lock(push_request_mutex);
-                        requests_queue.push(std::move(request_info));
-                    }
-                    finishSession(dead_session);
-                    LOG_INFO(log, "Dead session close request pushed");
-                }
-            }
-        }
-        catch (...)
-        {
-            tryLogCurrentException(__PRETTY_FUNCTION__);
-        }
-
-        std::this_thread::sleep_for(std::chrono::milliseconds(coordination_settings->dead_session_check_period_ms.totalMilliseconds()));
-    }
-}
-
-void NuKeeperStorageDispatcher::finishSession(int64_t session_id)
-{
-    std::lock_guard lock(session_to_response_callback_mutex);
-    auto session_it = session_to_response_callback.find(session_id);
-    if (session_it != session_to_response_callback.end())
-        session_to_response_callback.erase(session_it);
-}
-
-}
diff --git a/src/Coordination/NuKeeperStorageDispatcher.h b/src/Coordination/NuKeeperStorageDispatcher.h
deleted file mode 100644
index 62144b92a7a..00000000000
--- a/src/Coordination/NuKeeperStorageDispatcher.h
+++ /dev/null
@@ -1,89 +0,0 @@
-#pragma once
-
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config.h>
-#    include "config_core.h"
-#endif
-
-#if USE_NURAFT
-
-#include <Common/ThreadPool.h>
-#include <Common/ConcurrentBoundedQueue.h>
-#include <Poco/Util/AbstractConfiguration.h>
-#include <Common/Exception.h>
-#include <common/logger_useful.h>
-#include <functional>
-#include <Coordination/NuKeeperServer.h>
-#include <Coordination/CoordinationSettings.h>
-
-
-namespace DB
-{
-
-using ZooKeeperResponseCallback = std::function<void(const Coordination::ZooKeeperResponsePtr & response)>;
-
-class NuKeeperStorageDispatcher
-{
-
-private:
-    std::mutex push_request_mutex;
-
-    CoordinationSettingsPtr coordination_settings;
-    using RequestsQueue = ConcurrentBoundedQueue<NuKeeperStorage::RequestForSession>;
-    RequestsQueue requests_queue{1};
-    ResponsesQueue responses_queue;
-    std::atomic<bool> shutdown_called{false};
-    using SessionToResponseCallback = std::unordered_map<int64_t, ZooKeeperResponseCallback>;
-
-    std::mutex session_to_response_callback_mutex;
-    SessionToResponseCallback session_to_response_callback;
-
-    ThreadFromGlobalPool request_thread;
-    ThreadFromGlobalPool responses_thread;
-
-    ThreadFromGlobalPool session_cleaner_thread;
-
-    std::unique_ptr<NuKeeperServer> server;
-
-    Poco::Logger * log;
-
-private:
-    void requestThread();
-    void responseThread();
-    void sessionCleanerTask();
-    void setResponse(int64_t session_id, const Coordination::ZooKeeperResponsePtr & response);
-
-public:
-    NuKeeperStorageDispatcher();
-
-    void initialize(const Poco::Util::AbstractConfiguration & config);
-
-    void shutdown();
-
-    ~NuKeeperStorageDispatcher();
-
-    bool putRequest(const Coordination::ZooKeeperRequestPtr & request, int64_t session_id);
-
-    bool isLeader() const
-    {
-        return server->isLeader();
-    }
-
-    bool hasLeader() const
-    {
-        return server->isLeaderAlive();
-    }
-
-    int64_t getSessionID(long session_timeout_ms)
-    {
-        return server->getSessionID(session_timeout_ms);
-    }
-
-    void registerSession(int64_t session_id, ZooKeeperResponseCallback callback);
-    /// Call if we don't need any responses for this session no more (session was expired)
-    void finishSession(int64_t session_id);
-};
-
-}
-
-#endif
diff --git a/src/Coordination/NuKeeperStorageSerializer.cpp b/src/Coordination/NuKeeperStorageSerializer.cpp
deleted file mode 100644
index 298df45cde0..00000000000
--- a/src/Coordination/NuKeeperStorageSerializer.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-#include <Coordination/NuKeeperStorageSerializer.h>
-#include <IO/WriteHelpers.h>
-#include <IO/ReadHelpers.h>
-#include <Common/ZooKeeper/ZooKeeperIO.h>
-
-namespace DB
-{
-
-namespace
-{
-    void writeNode(const NuKeeperStorage::Node & node, WriteBuffer & out)
-    {
-        Coordination::write(node.data, out);
-        Coordination::write(node.acls, out);
-        Coordination::write(node.is_ephemeral, out);
-        Coordination::write(node.is_sequental, out);
-        Coordination::write(node.stat, out);
-        Coordination::write(node.seq_num, out);
-    }
-
-    void readNode(NuKeeperStorage::Node & node, ReadBuffer & in)
-    {
-        Coordination::read(node.data, in);
-        Coordination::read(node.acls, in);
-        Coordination::read(node.is_ephemeral, in);
-        Coordination::read(node.is_sequental, in);
-        Coordination::read(node.stat, in);
-        Coordination::read(node.seq_num, in);
-    }
-}
-
-void NuKeeperStorageSerializer::serialize(const NuKeeperStorage & storage, WriteBuffer & out)
-{
-    Coordination::write(storage.zxid, out);
-    Coordination::write(storage.session_id_counter, out);
-    Coordination::write(storage.container.size(), out);
-    for (const auto & [path, node] : storage.container)
-    {
-        Coordination::write(path, out);
-        writeNode(node, out);
-    }
-    Coordination::write(storage.ephemerals.size(), out);
-    for (const auto & [session_id, paths] : storage.ephemerals)
-    {
-        Coordination::write(session_id, out);
-        Coordination::write(paths.size(), out);
-        for (const auto & path : paths)
-            Coordination::write(path, out);
-    }
-}
-
-void NuKeeperStorageSerializer::deserialize(NuKeeperStorage & storage, ReadBuffer & in)
-{
-    int64_t session_id_counter, zxid;
-    Coordination::read(zxid, in);
-    Coordination::read(session_id_counter, in);
-    storage.zxid = zxid;
-    storage.session_id_counter = session_id_counter;
-
-    size_t container_size;
-    Coordination::read(container_size, in);
-    while (storage.container.size() < container_size)
-    {
-        std::string path;
-        Coordination::read(path, in);
-        NuKeeperStorage::Node node;
-        readNode(node, in);
-        storage.container[path] = node;
-    }
-    size_t ephemerals_size;
-    Coordination::read(ephemerals_size, in);
-    while (storage.ephemerals.size() < ephemerals_size)
-    {
-        int64_t session_id;
-        size_t ephemerals_for_session;
-        Coordination::read(session_id, in);
-        Coordination::read(ephemerals_for_session, in);
-        while (storage.ephemerals[session_id].size() < ephemerals_for_session)
-        {
-            std::string ephemeral_path;
-            Coordination::read(ephemeral_path, in);
-            storage.ephemerals[session_id].emplace(ephemeral_path);
-        }
-    }
-}
-
-}
diff --git a/src/Coordination/NuKeeperStorageSerializer.h b/src/Coordination/NuKeeperStorageSerializer.h
deleted file mode 100644
index e54c65a739d..00000000000
--- a/src/Coordination/NuKeeperStorageSerializer.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-#include <Coordination/NuKeeperStorage.h>
-#include <IO/WriteBuffer.h>
-#include <IO/ReadBuffer.h>
-
-namespace DB
-{
-
-class NuKeeperStorageSerializer
-{
-public:
-    static void serialize(const NuKeeperStorage & storage, WriteBuffer & out);
-
-    static void deserialize(NuKeeperStorage & storage, ReadBuffer & in);
-};
-
-}
diff --git a/src/Coordination/SnapshotableHashTable.h b/src/Coordination/SnapshotableHashTable.h
new file mode 100644
index 00000000000..9987081ba87
--- /dev/null
+++ b/src/Coordination/SnapshotableHashTable.h
@@ -0,0 +1,197 @@
+#pragma once
+#include <common/StringRef.h>
+#include <unordered_map>
+#include <list>
+#include <atomic>
+
+namespace DB
+{
+
+template<typename V>
+struct ListNode
+{
+    std::string key;
+    V value;
+    bool active_in_map;
+};
+
+template <class V>
+class SnapshotableHashTable
+{
+private:
+
+    using ListElem = ListNode<V>;
+    using List = std::list<ListElem>;
+    using IndexMap = std::unordered_map<StringRef, typename List::iterator, StringRefHash>;
+
+    List list;
+    IndexMap map;
+    bool snapshot_mode{false};
+
+public:
+
+    using iterator = typename List::iterator;
+    using const_iterator = typename List::const_iterator;
+    using reverse_iterator = typename List::reverse_iterator;
+    using const_reverse_iterator = typename List::const_reverse_iterator;
+    using ValueUpdater = std::function<void(V & value)>;
+
+    bool insert(const std::string & key, const V & value)
+    {
+        auto it = map.find(key);
+        if (it == map.end())
+        {
+            ListElem elem{key, value, true};
+            auto itr = list.insert(list.end(), elem);
+            map.emplace(itr->key, itr);
+            return true;
+        }
+
+        return false;
+    }
+
+
+    void insertOrReplace(const std::string & key, const V & value)
+    {
+        auto it = map.find(key);
+        if (it == map.end())
+        {
+            ListElem elem{key, value, true};
+            auto itr = list.insert(list.end(), elem);
+            map.emplace(itr->key, itr);
+        }
+        else
+        {
+            auto list_itr = it->second;
+            if (snapshot_mode)
+            {
+                ListElem elem{key, value, true};
+                list_itr->active_in_map = false;
+                auto new_list_itr = list.insert(list.end(), elem);
+                map.erase(it);
+                map.emplace(new_list_itr->key, new_list_itr);
+            }
+            else
+            {
+                list_itr->value = value;
+            }
+        }
+    }
+
+    bool erase(const std::string & key)
+    {
+        auto it = map.find(key);
+        if (it == map.end())
+            return false;
+
+        auto list_itr = it->second;
+        if (snapshot_mode)
+        {
+            list_itr->active_in_map = false;
+            map.erase(it);
+        }
+        else
+        {
+            map.erase(it);
+            list.erase(list_itr);
+        }
+
+        return true;
+    }
+
+    bool contains(const std::string & key) const
+    {
+        return map.find(key) != map.end();
+    }
+
+    const_iterator updateValue(const std::string & key, ValueUpdater updater)
+    {
+        auto it = map.find(key);
+        assert(it != map.end());
+        if (snapshot_mode)
+        {
+            auto list_itr = it->second;
+            auto elem_copy = *(list_itr);
+            list_itr->active_in_map = false;
+            map.erase(it);
+            updater(elem_copy.value);
+            auto itr = list.insert(list.end(), elem_copy);
+            map.emplace(itr->key, itr);
+            return itr;
+        }
+        else
+        {
+            auto list_itr = it->second;
+            updater(list_itr->value);
+            return list_itr;
+        }
+    }
+
+    const_iterator find(const std::string & key) const
+    {
+        auto map_it = map.find(key);
+        if (map_it != map.end())
+            return map_it->second;
+        return list.end();
+    }
+
+    const V & getValue(const std::string & key) const
+    {
+        auto it = map.find(key);
+        assert(it != map.end());
+        return it->second->value;
+    }
+
+    void clearOutdatedNodes()
+    {
+        auto start = list.begin();
+        auto end = list.end();
+        for (auto itr = start; itr != end;)
+        {
+            if (!itr->active_in_map)
+                itr = list.erase(itr);
+            else
+                itr++;
+        }
+    }
+
+    void clear()
+    {
+        list.clear();
+        map.clear();
+    }
+
+    void enableSnapshotMode()
+    {
+        snapshot_mode = true;
+    }
+
+    void disableSnapshotMode()
+    {
+        snapshot_mode = false;
+    }
+
+    size_t size() const
+    {
+        return map.size();
+    }
+
+    size_t snapshotSize() const
+    {
+        return list.size();
+    }
+
+
+    iterator begin() { return list.begin(); }
+    const_iterator begin() const { return list.cbegin(); }
+    iterator end() { return list.end(); }
+    const_iterator end() const { return list.cend(); }
+
+    reverse_iterator rbegin() { return list.rbegin(); }
+    const_reverse_iterator rbegin() const { return list.crbegin(); }
+    reverse_iterator rend() { return list.rend(); }
+    const_reverse_iterator rend() const { return list.crend(); }
+};
+
+
+}
diff --git a/src/Coordination/SummingStateMachine.cpp b/src/Coordination/SummingStateMachine.cpp
index 0cb7a7da6c3..ae3d2b06d75 100644
--- a/src/Coordination/SummingStateMachine.cpp
+++ b/src/Coordination/SummingStateMachine.cpp
@@ -21,7 +21,7 @@ SummingStateMachine::SummingStateMachine()
 {
 }
 
-nuraft::ptr<nuraft::buffer> SummingStateMachine::commit(const size_t log_idx, nuraft::buffer & data)
+nuraft::ptr<nuraft::buffer> SummingStateMachine::commit(const uint64_t log_idx, nuraft::buffer & data)
 {
     int64_t value_to_add = deserializeValue(data);
 
@@ -84,7 +84,7 @@ void SummingStateMachine::createSnapshotInternal(nuraft::snapshot & s)
 
 void SummingStateMachine::save_logical_snp_obj(
     nuraft::snapshot & s,
-    size_t & obj_id,
+    uint64_t & obj_id,
     nuraft::buffer & data,
     bool /*is_first_obj*/,
     bool /*is_last_obj*/)
@@ -112,7 +112,7 @@ void SummingStateMachine::save_logical_snp_obj(
 int SummingStateMachine::read_logical_snp_obj(
     nuraft::snapshot & s,
     void* & /*user_snp_ctx*/,
-    size_t obj_id,
+    uint64_t obj_id,
     nuraft::ptr<nuraft::buffer> & data_out,
     bool & is_last_obj)
 {
@@ -142,7 +142,7 @@ int SummingStateMachine::read_logical_snp_obj(
     else
     {
         // Object ID > 0: second object, put actual value.
-        data_out = nuraft::buffer::alloc(sizeof(size_t));
+        data_out = nuraft::buffer::alloc(sizeof(uint64_t));
         nuraft::buffer_serializer bs(data_out);
         bs.put_u64(ctx->value);
         is_last_obj = true;
diff --git a/src/Coordination/SummingStateMachine.h b/src/Coordination/SummingStateMachine.h
index c8594ba7e8d..03572840739 100644
--- a/src/Coordination/SummingStateMachine.h
+++ b/src/Coordination/SummingStateMachine.h
@@ -15,13 +15,13 @@ class SummingStateMachine : public nuraft::state_machine
 public:
     SummingStateMachine();
 
-    nuraft::ptr<nuraft::buffer> pre_commit(const size_t /*log_idx*/, nuraft::buffer & /*data*/) override { return nullptr; }
+    nuraft::ptr<nuraft::buffer> pre_commit(const uint64_t /*log_idx*/, nuraft::buffer & /*data*/) override { return nullptr; }
 
-    nuraft::ptr<nuraft::buffer> commit(const size_t log_idx, nuraft::buffer & data) override;
+    nuraft::ptr<nuraft::buffer> commit(const uint64_t log_idx, nuraft::buffer & data) override;
 
-    void rollback(const size_t /*log_idx*/, nuraft::buffer & /*data*/) override {}
+    void rollback(const uint64_t /*log_idx*/, nuraft::buffer & /*data*/) override {}
 
-    size_t last_commit_index() override { return last_committed_idx; }
+    uint64_t last_commit_index() override { return last_committed_idx; }
 
     bool apply_snapshot(nuraft::snapshot & s) override;
 
@@ -33,7 +33,7 @@ public:
 
     void save_logical_snp_obj(
         nuraft::snapshot & s,
-        size_t & obj_id,
+        uint64_t & obj_id,
         nuraft::buffer & data,
         bool is_first_obj,
         bool is_last_obj) override;
@@ -41,7 +41,7 @@ public:
     int read_logical_snp_obj(
         nuraft::snapshot & s,
         void* & user_snp_ctx,
-        size_t obj_id,
+        uint64_t obj_id,
         nuraft::ptr<nuraft::buffer> & data_out,
         bool & is_last_obj) override;
 
diff --git a/src/Coordination/tests/gtest_for_build.cpp b/src/Coordination/tests/gtest_for_build.cpp
index ed9777350c5..515565a3b9f 100644
--- a/src/Coordination/tests/gtest_for_build.cpp
+++ b/src/Coordination/tests/gtest_for_build.cpp
@@ -6,12 +6,13 @@
 #endif
 
 #if USE_NURAFT
-
+#include <Poco/ConsoleChannel.h>
+#include <Poco/Logger.h>
 #include <Coordination/InMemoryLogStore.h>
-#include <Coordination/InMemoryStateManager.h>
-#include <Coordination/NuKeeperStorageSerializer.h>
+#include <Coordination/KeeperStateManager.h>
+#include <Coordination/KeeperSnapshotManager.h>
 #include <Coordination/SummingStateMachine.h>
-#include <Coordination/NuKeeperStateMachine.h>
+#include <Coordination/KeeperStateMachine.h>
 #include <Coordination/LoggerWrapper.h>
 #include <Coordination/WriteBufferFromNuraftBuffer.h>
 #include <Coordination/ReadBufferFromNuraftBuffer.h>
@@ -20,9 +21,37 @@
 #include <Common/ZooKeeper/ZooKeeperCommon.h>
 #include <Common/ZooKeeper/ZooKeeperIO.h>
 #include <Common/Exception.h>
+#include <common/logger_useful.h>
 #include <libnuraft/nuraft.hxx> // Y_IGNORE
 #include <thread>
+#include <Coordination/KeeperLogStore.h>
+#include <Coordination/Changelog.h>
+#include <filesystem>
 
+#include <Coordination/SnapshotableHashTable.h>
+
+namespace fs = std::filesystem;
+struct ChangelogDirTest
+{
+    std::string path;
+    bool drop;
+    explicit ChangelogDirTest(std::string path_, bool drop_ = true)
+        : path(path_)
+        , drop(drop_)
+    {
+        if (fs::exists(path))
+        {
+            EXPECT_TRUE(false) << "Path " << path << " already exists, remove it to run test";
+        }
+        fs::create_directory(path);
+    }
+
+    ~ChangelogDirTest()
+    {
+        if (fs::exists(path) && drop)
+            fs::remove_all(path);
+    }
+};
 
 TEST(CoordinationTest, BuildTest)
 {
@@ -67,14 +96,15 @@ TEST(CoordinationTest, BufferSerde)
 template <typename StateMachine>
 struct SimpliestRaftServer
 {
-    SimpliestRaftServer(int server_id_, const std::string & hostname_, int port_)
+    SimpliestRaftServer(int server_id_, const std::string & hostname_, int port_, const std::string & logs_path)
         : server_id(server_id_)
         , hostname(hostname_)
         , port(port_)
         , endpoint(hostname + ":" + std::to_string(port))
         , state_machine(nuraft::cs_new<StateMachine>())
-        , state_manager(nuraft::cs_new<DB::InMemoryStateManager>(server_id, hostname, port))
+        , state_manager(nuraft::cs_new<DB::KeeperStateManager>(server_id, hostname, port, logs_path))
     {
+        state_manager->loadLogStore(1, 0);
         nuraft::raft_params params;
         params.heart_beat_interval_ = 100;
         params.election_timeout_lower_bound_ = 200;
@@ -90,10 +120,10 @@ struct SimpliestRaftServer
 
         if (!raft_instance)
         {
-            std::cerr << "Failed to initialize launcher (see the message "
-                         "in the log file)." << std::endl;
+            std::cerr << "Failed to initialize launcher" << std::endl;
             exit(-1);
         }
+
         std::cout << "init Raft instance " << server_id;
         for (size_t ii = 0; ii < 20; ++ii)
         {
@@ -123,7 +153,7 @@ struct SimpliestRaftServer
     nuraft::ptr<StateMachine> state_machine;
 
     // State manager.
-    nuraft::ptr<nuraft::state_mgr> state_manager;
+    nuraft::ptr<DB::KeeperStateManager> state_manager;
 
     // Raft launcher.
     nuraft::raft_launcher launcher;
@@ -134,11 +164,10 @@ struct SimpliestRaftServer
 
 using SummingRaftServer = SimpliestRaftServer<DB::SummingStateMachine>;
 
-nuraft::ptr<nuraft::buffer> getLogEntry(int64_t number)
+nuraft::ptr<nuraft::buffer> getBuffer(int64_t number)
 {
     nuraft::ptr<nuraft::buffer> ret = nuraft::buffer::alloc(sizeof(number));
     nuraft::buffer_serializer bs(ret);
-    // WARNING: We don't consider endian-safety in this example.
     bs.put_raw(&number, sizeof(number));
     return ret;
 }
@@ -146,12 +175,13 @@ nuraft::ptr<nuraft::buffer> getLogEntry(int64_t number)
 
 TEST(CoordinationTest, TestSummingRaft1)
 {
-    SummingRaftServer s1(1, "localhost", 44444);
+    ChangelogDirTest test("./logs");
+    SummingRaftServer s1(1, "localhost", 44444, "./logs");
 
     /// Single node is leader
     EXPECT_EQ(s1.raft_instance->get_leader(), 1);
 
-    auto entry1 = getLogEntry(143);
+    auto entry1 = getBuffer(143);
     auto ret = s1.raft_instance->append_entries({entry1});
     EXPECT_TRUE(ret->get_accepted()) << "failed to replicate: entry 1" << ret->get_result_code();
     EXPECT_EQ(ret->get_result_code(), nuraft::cmd_result_code::OK) << "failed to replicate: entry 1" << ret->get_result_code();
@@ -167,111 +197,916 @@ TEST(CoordinationTest, TestSummingRaft1)
     s1.launcher.shutdown(5);
 }
 
-TEST(CoordinationTest, TestSummingRaft3)
+DB::LogEntryPtr getLogEntry(const std::string & s, size_t term)
 {
-    SummingRaftServer s1(1, "localhost", 44444);
-    SummingRaftServer s2(2, "localhost", 44445);
-    SummingRaftServer s3(3, "localhost", 44446);
-
-    nuraft::srv_config first_config(1, "localhost:44444");
-    auto ret1 = s2.raft_instance->add_srv(first_config);
-    if (!ret1->get_accepted())
-    {
-        std::cout << "failed to add server: "
-                  << ret1->get_result_str() << std::endl;
-        EXPECT_TRUE(false);
-    }
-
-    while (s1.raft_instance->get_leader() != 2)
-    {
-        std::cout << "Waiting s1 to join to s2 quorum\n";
-        std::this_thread::sleep_for(std::chrono::milliseconds(100));
-    }
-
-    nuraft::srv_config third_config(3, "localhost:44446");
-    auto ret3 = s2.raft_instance->add_srv(third_config);
-    if (!ret3->get_accepted())
-    {
-        std::cout << "failed to add server: "
-                  << ret3->get_result_str() << std::endl;
-        EXPECT_TRUE(false);
-    }
-
-    while (s3.raft_instance->get_leader() != 2)
-    {
-        std::cout << "Waiting s3 to join to s2 quorum\n";
-        std::this_thread::sleep_for(std::chrono::milliseconds(100));
-    }
-
-    /// S2 is leader
-    EXPECT_EQ(s1.raft_instance->get_leader(), 2);
-    EXPECT_EQ(s2.raft_instance->get_leader(), 2);
-    EXPECT_EQ(s3.raft_instance->get_leader(), 2);
-
-    std::cerr << "Starting to add entries\n";
-    auto entry = getLogEntry(1);
-    auto ret = s2.raft_instance->append_entries({entry});
-    EXPECT_TRUE(ret->get_accepted()) << "failed to replicate: entry 1" << ret->get_result_code();
-    EXPECT_EQ(ret->get_result_code(), nuraft::cmd_result_code::OK) << "failed to replicate: entry 1" << ret->get_result_code();
-
-    while (s1.state_machine->getValue() != 1)
-    {
-        std::cout << "Waiting s1 to apply entry\n";
-        std::this_thread::sleep_for(std::chrono::milliseconds(100));
-    }
-
-    while (s2.state_machine->getValue() != 1)
-    {
-        std::cout << "Waiting s2 to apply entry\n";
-        std::this_thread::sleep_for(std::chrono::milliseconds(100));
-    }
-
-    while (s3.state_machine->getValue() != 1)
-    {
-        std::cout << "Waiting s3 to apply entry\n";
-        std::this_thread::sleep_for(std::chrono::milliseconds(100));
-    }
-
-    EXPECT_EQ(s1.state_machine->getValue(), 1);
-    EXPECT_EQ(s2.state_machine->getValue(), 1);
-    EXPECT_EQ(s3.state_machine->getValue(), 1);
-
-    auto non_leader_entry = getLogEntry(3);
-    auto ret_non_leader1 = s1.raft_instance->append_entries({non_leader_entry});
-
-    EXPECT_FALSE(ret_non_leader1->get_accepted());
-
-    auto ret_non_leader3 = s3.raft_instance->append_entries({non_leader_entry});
-
-    EXPECT_FALSE(ret_non_leader3->get_accepted());
-
-    auto leader_entry = getLogEntry(77);
-    auto ret_leader = s2.raft_instance->append_entries({leader_entry});
-    EXPECT_TRUE(ret_leader->get_accepted()) << "failed to replicate: entry 78" << ret_leader->get_result_code();
-    EXPECT_EQ(ret_leader->get_result_code(), nuraft::cmd_result_code::OK) << "failed to replicate: entry 78" << ret_leader->get_result_code();
-
-    while (s1.state_machine->getValue() != 78)
-    {
-        std::cout << "Waiting s1 to apply entry\n";
-        std::this_thread::sleep_for(std::chrono::milliseconds(100));
-    }
-
-    while (s3.state_machine->getValue() != 78)
-    {
-        std::cout << "Waiting s3 to apply entry\n";
-        std::this_thread::sleep_for(std::chrono::milliseconds(100));
-    }
-
-    EXPECT_EQ(s1.state_machine->getValue(), 78);
-    EXPECT_EQ(s2.state_machine->getValue(), 78);
-    EXPECT_EQ(s3.state_machine->getValue(), 78);
-
-    s1.launcher.shutdown(5);
-    s2.launcher.shutdown(5);
-    s3.launcher.shutdown(5);
+    DB::WriteBufferFromNuraftBuffer bufwriter;
+    writeText(s, bufwriter);
+    return nuraft::cs_new<nuraft::log_entry>(term, bufwriter.getBuffer());
 }
 
-nuraft::ptr<nuraft::buffer> getZooKeeperLogEntry(int64_t session_id, const Coordination::ZooKeeperRequestPtr & request)
+TEST(CoordinationTest, ChangelogTestSimple)
+{
+    ChangelogDirTest test("./logs");
+    DB::KeeperLogStore changelog("./logs", 5, true);
+    changelog.init(1, 0);
+    auto entry = getLogEntry("hello world", 77);
+    changelog.append(entry);
+    changelog.end_of_append_batch(0, 0);
+
+    EXPECT_EQ(changelog.next_slot(), 2);
+    EXPECT_EQ(changelog.start_index(), 1);
+    EXPECT_EQ(changelog.last_entry()->get_term(), 77);
+    EXPECT_EQ(changelog.entry_at(1)->get_term(), 77);
+    EXPECT_EQ(changelog.log_entries(1, 2)->size(), 1);
+}
+
+TEST(CoordinationTest, ChangelogTestFile)
+{
+    ChangelogDirTest test("./logs");
+    DB::KeeperLogStore changelog("./logs", 5, true);
+    changelog.init(1, 0);
+    auto entry = getLogEntry("hello world", 77);
+    changelog.append(entry);
+    changelog.end_of_append_batch(0, 0);
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin"));
+    for (const auto & p : fs::directory_iterator("./logs"))
+        EXPECT_EQ(p.path(), "./logs/changelog_1_5.bin");
+
+    changelog.append(entry);
+    changelog.append(entry);
+    changelog.append(entry);
+    changelog.append(entry);
+    changelog.append(entry);
+    changelog.end_of_append_batch(0, 0);
+
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin"));
+}
+
+TEST(CoordinationTest, ChangelogReadWrite)
+{
+    ChangelogDirTest test("./logs");
+    DB::KeeperLogStore changelog("./logs", 1000, true);
+    changelog.init(1, 0);
+    for (size_t i = 0; i < 10; ++i)
+    {
+        auto entry = getLogEntry("hello world", i * 10);
+        changelog.append(entry);
+    }
+    changelog.end_of_append_batch(0, 0);
+
+    EXPECT_EQ(changelog.size(), 10);
+    DB::KeeperLogStore changelog_reader("./logs", 1000, true);
+    changelog_reader.init(1, 0);
+    EXPECT_EQ(changelog_reader.size(), 10);
+    EXPECT_EQ(changelog_reader.last_entry()->get_term(), changelog.last_entry()->get_term());
+    EXPECT_EQ(changelog_reader.start_index(), changelog.start_index());
+    EXPECT_EQ(changelog_reader.next_slot(), changelog.next_slot());
+
+    for (size_t i = 0; i < 10; ++i)
+        EXPECT_EQ(changelog_reader.entry_at(i + 1)->get_term(), changelog.entry_at(i + 1)->get_term());
+
+    auto entries_from_range_read = changelog_reader.log_entries(1, 11);
+    auto entries_from_range = changelog.log_entries(1, 11);
+    EXPECT_EQ(entries_from_range_read->size(), entries_from_range->size());
+    EXPECT_EQ(10, entries_from_range->size());
+}
+
+TEST(CoordinationTest, ChangelogWriteAt)
+{
+    ChangelogDirTest test("./logs");
+    DB::KeeperLogStore changelog("./logs", 1000, true);
+    changelog.init(1, 0);
+    for (size_t i = 0; i < 10; ++i)
+    {
+        auto entry = getLogEntry("hello world", i * 10);
+        changelog.append(entry);
+    }
+
+    changelog.end_of_append_batch(0, 0);
+    EXPECT_EQ(changelog.size(), 10);
+
+    auto entry = getLogEntry("writer", 77);
+    changelog.write_at(7, entry);
+    changelog.end_of_append_batch(0, 0);
+
+    EXPECT_EQ(changelog.size(), 7);
+    EXPECT_EQ(changelog.last_entry()->get_term(), 77);
+    EXPECT_EQ(changelog.entry_at(7)->get_term(), 77);
+    EXPECT_EQ(changelog.next_slot(), 8);
+
+    DB::KeeperLogStore changelog_reader("./logs", 1000, true);
+    changelog_reader.init(1, 0);
+
+    EXPECT_EQ(changelog_reader.size(), changelog.size());
+    EXPECT_EQ(changelog_reader.last_entry()->get_term(), changelog.last_entry()->get_term());
+    EXPECT_EQ(changelog_reader.start_index(), changelog.start_index());
+    EXPECT_EQ(changelog_reader.next_slot(), changelog.next_slot());
+}
+
+
+TEST(CoordinationTest, ChangelogTestAppendAfterRead)
+{
+    ChangelogDirTest test("./logs");
+    DB::KeeperLogStore changelog("./logs", 5, true);
+    changelog.init(1, 0);
+    for (size_t i = 0; i < 7; ++i)
+    {
+        auto entry = getLogEntry("hello world", i * 10);
+        changelog.append(entry);
+    }
+    changelog.end_of_append_batch(0, 0);
+
+    EXPECT_EQ(changelog.size(), 7);
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin"));
+
+    DB::KeeperLogStore changelog_reader("./logs", 5, true);
+    changelog_reader.init(1, 0);
+
+    EXPECT_EQ(changelog_reader.size(), 7);
+    for (size_t i = 7; i < 10; ++i)
+    {
+        auto entry = getLogEntry("hello world", i * 10);
+        changelog_reader.append(entry);
+    }
+    changelog_reader.end_of_append_batch(0, 0);
+    EXPECT_EQ(changelog_reader.size(), 10);
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin"));
+
+    size_t logs_count = 0;
+    for (const auto & _ [[maybe_unused]]: fs::directory_iterator("./logs"))
+        logs_count++;
+
+    EXPECT_EQ(logs_count, 2);
+
+    auto entry = getLogEntry("someentry", 77);
+    changelog_reader.append(entry);
+    changelog_reader.end_of_append_batch(0, 0);
+    EXPECT_EQ(changelog_reader.size(), 11);
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_11_15.bin"));
+
+    logs_count = 0;
+    for (const auto & _ [[maybe_unused]]: fs::directory_iterator("./logs"))
+        logs_count++;
+
+    EXPECT_EQ(logs_count, 3);
+}
+
+TEST(CoordinationTest, ChangelogTestCompaction)
+{
+    ChangelogDirTest test("./logs");
+    DB::KeeperLogStore changelog("./logs", 5, true);
+    changelog.init(1, 0);
+
+    for (size_t i = 0; i < 3; ++i)
+    {
+        auto entry = getLogEntry("hello world", i * 10);
+        changelog.append(entry);
+    }
+    changelog.end_of_append_batch(0, 0);
+
+    EXPECT_EQ(changelog.size(), 3);
+
+    changelog.compact(2);
+
+    EXPECT_EQ(changelog.size(), 1);
+    EXPECT_EQ(changelog.start_index(), 3);
+    EXPECT_EQ(changelog.next_slot(), 4);
+    EXPECT_EQ(changelog.last_entry()->get_term(), 20);
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin"));
+
+    auto e1 = getLogEntry("hello world", 30);
+    changelog.append(e1);
+    auto e2 = getLogEntry("hello world", 40);
+    changelog.append(e2);
+    auto e3 = getLogEntry("hello world", 50);
+    changelog.append(e3);
+    auto e4 = getLogEntry("hello world", 60);
+    changelog.append(e4);
+    changelog.end_of_append_batch(0, 0);
+
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin"));
+
+    changelog.compact(6);
+
+    EXPECT_FALSE(fs::exists("./logs/changelog_1_5.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin"));
+
+    EXPECT_EQ(changelog.size(), 1);
+    EXPECT_EQ(changelog.start_index(), 7);
+    EXPECT_EQ(changelog.next_slot(), 8);
+    EXPECT_EQ(changelog.last_entry()->get_term(), 60);
+    /// And we able to read it
+    DB::KeeperLogStore changelog_reader("./logs", 5, true);
+    changelog_reader.init(7, 0);
+    EXPECT_EQ(changelog_reader.size(), 1);
+    EXPECT_EQ(changelog_reader.start_index(), 7);
+    EXPECT_EQ(changelog_reader.next_slot(), 8);
+    EXPECT_EQ(changelog_reader.last_entry()->get_term(), 60);
+}
+
+TEST(CoordinationTest, ChangelogTestBatchOperations)
+{
+    ChangelogDirTest test("./logs");
+    DB::KeeperLogStore changelog("./logs", 100, true);
+    changelog.init(1, 0);
+    for (size_t i = 0; i < 10; ++i)
+    {
+        auto entry = getLogEntry(std::to_string(i) + "_hello_world", i * 10);
+        changelog.append(entry);
+    }
+    changelog.end_of_append_batch(0, 0);
+
+    EXPECT_EQ(changelog.size(), 10);
+
+    auto entries = changelog.pack(1, 5);
+
+    DB::KeeperLogStore apply_changelog("./logs", 100, true);
+    apply_changelog.init(1, 0);
+
+    for (size_t i = 0; i < 10; ++i)
+    {
+        EXPECT_EQ(apply_changelog.entry_at(i + 1)->get_term(), i * 10);
+    }
+    EXPECT_EQ(apply_changelog.size(), 10);
+
+    apply_changelog.apply_pack(8, *entries);
+    apply_changelog.end_of_append_batch(0, 0);
+
+    EXPECT_EQ(apply_changelog.size(), 12);
+    EXPECT_EQ(apply_changelog.start_index(), 1);
+    EXPECT_EQ(apply_changelog.next_slot(), 13);
+
+    for (size_t i = 0; i < 7; ++i)
+    {
+        EXPECT_EQ(apply_changelog.entry_at(i + 1)->get_term(), i * 10);
+    }
+
+    EXPECT_EQ(apply_changelog.entry_at(8)->get_term(), 0);
+    EXPECT_EQ(apply_changelog.entry_at(9)->get_term(), 10);
+    EXPECT_EQ(apply_changelog.entry_at(10)->get_term(), 20);
+    EXPECT_EQ(apply_changelog.entry_at(11)->get_term(), 30);
+    EXPECT_EQ(apply_changelog.entry_at(12)->get_term(), 40);
+}
+
+TEST(CoordinationTest, ChangelogTestBatchOperationsEmpty)
+{
+    ChangelogDirTest test("./logs");
+    DB::KeeperLogStore changelog("./logs", 100, true);
+    changelog.init(1, 0);
+    for (size_t i = 0; i < 10; ++i)
+    {
+        auto entry = getLogEntry(std::to_string(i) + "_hello_world", i * 10);
+        changelog.append(entry);
+    }
+    changelog.end_of_append_batch(0, 0);
+
+    EXPECT_EQ(changelog.size(), 10);
+
+    auto entries = changelog.pack(5, 5);
+
+    ChangelogDirTest test1("./logs1");
+    DB::KeeperLogStore changelog_new("./logs1", 100, true);
+    changelog_new.init(1, 0);
+    EXPECT_EQ(changelog_new.size(), 0);
+
+    changelog_new.apply_pack(5, *entries);
+    changelog_new.end_of_append_batch(0, 0);
+
+    EXPECT_EQ(changelog_new.size(), 5);
+    EXPECT_EQ(changelog_new.start_index(), 5);
+    EXPECT_EQ(changelog_new.next_slot(), 10);
+
+    for (size_t i = 4; i < 9; ++i)
+        EXPECT_EQ(changelog_new.entry_at(i + 1)->get_term(), i * 10);
+
+    auto e = getLogEntry("hello_world", 110);
+    changelog_new.append(e);
+    changelog_new.end_of_append_batch(0, 0);
+
+    EXPECT_EQ(changelog_new.size(), 6);
+    EXPECT_EQ(changelog_new.start_index(), 5);
+    EXPECT_EQ(changelog_new.next_slot(), 11);
+
+    DB::KeeperLogStore changelog_reader("./logs1", 100, true);
+    changelog_reader.init(5, 0);
+}
+
+
+TEST(CoordinationTest, ChangelogTestWriteAtPreviousFile)
+{
+    ChangelogDirTest test("./logs");
+    DB::KeeperLogStore changelog("./logs", 5, true);
+    changelog.init(1, 0);
+
+    for (size_t i = 0; i < 33; ++i)
+    {
+        auto entry = getLogEntry(std::to_string(i) + "_hello_world", i * 10);
+        changelog.append(entry);
+    }
+    changelog.end_of_append_batch(0, 0);
+
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_11_15.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_16_20.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_21_25.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_26_30.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_31_35.bin"));
+
+    EXPECT_EQ(changelog.size(), 33);
+
+    auto e1 = getLogEntry("helloworld", 5555);
+    changelog.write_at(7, e1);
+    changelog.end_of_append_batch(0, 0);
+    EXPECT_EQ(changelog.size(), 7);
+    EXPECT_EQ(changelog.start_index(), 1);
+    EXPECT_EQ(changelog.next_slot(), 8);
+    EXPECT_EQ(changelog.last_entry()->get_term(), 5555);
+
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin"));
+
+    EXPECT_FALSE(fs::exists("./logs/changelog_11_15.bin"));
+    EXPECT_FALSE(fs::exists("./logs/changelog_16_20.bin"));
+    EXPECT_FALSE(fs::exists("./logs/changelog_21_25.bin"));
+    EXPECT_FALSE(fs::exists("./logs/changelog_26_30.bin"));
+    EXPECT_FALSE(fs::exists("./logs/changelog_31_35.bin"));
+
+    DB::KeeperLogStore changelog_read("./logs", 5, true);
+    changelog_read.init(1, 0);
+    EXPECT_EQ(changelog_read.size(), 7);
+    EXPECT_EQ(changelog_read.start_index(), 1);
+    EXPECT_EQ(changelog_read.next_slot(), 8);
+    EXPECT_EQ(changelog_read.last_entry()->get_term(), 5555);
+}
+
+TEST(CoordinationTest, ChangelogTestWriteAtFileBorder)
+{
+    ChangelogDirTest test("./logs");
+    DB::KeeperLogStore changelog("./logs", 5, true);
+    changelog.init(1, 0);
+
+    for (size_t i = 0; i < 33; ++i)
+    {
+        auto entry = getLogEntry(std::to_string(i) + "_hello_world", i * 10);
+        changelog.append(entry);
+    }
+    changelog.end_of_append_batch(0, 0);
+
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_11_15.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_16_20.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_21_25.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_26_30.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_31_35.bin"));
+
+    EXPECT_EQ(changelog.size(), 33);
+
+    auto e1 = getLogEntry("helloworld", 5555);
+    changelog.write_at(11, e1);
+    changelog.end_of_append_batch(0, 0);
+    EXPECT_EQ(changelog.size(), 11);
+    EXPECT_EQ(changelog.start_index(), 1);
+    EXPECT_EQ(changelog.next_slot(), 12);
+    EXPECT_EQ(changelog.last_entry()->get_term(), 5555);
+
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_11_15.bin"));
+
+    EXPECT_FALSE(fs::exists("./logs/changelog_16_20.bin"));
+    EXPECT_FALSE(fs::exists("./logs/changelog_21_25.bin"));
+    EXPECT_FALSE(fs::exists("./logs/changelog_26_30.bin"));
+    EXPECT_FALSE(fs::exists("./logs/changelog_31_35.bin"));
+
+    DB::KeeperLogStore changelog_read("./logs", 5, true);
+    changelog_read.init(1, 0);
+    EXPECT_EQ(changelog_read.size(), 11);
+    EXPECT_EQ(changelog_read.start_index(), 1);
+    EXPECT_EQ(changelog_read.next_slot(), 12);
+    EXPECT_EQ(changelog_read.last_entry()->get_term(), 5555);
+}
+
+TEST(CoordinationTest, ChangelogTestWriteAtAllFiles)
+{
+    ChangelogDirTest test("./logs");
+    DB::KeeperLogStore changelog("./logs", 5, true);
+    changelog.init(1, 0);
+
+    for (size_t i = 0; i < 33; ++i)
+    {
+        auto entry = getLogEntry(std::to_string(i) + "_hello_world", i * 10);
+        changelog.append(entry);
+    }
+    changelog.end_of_append_batch(0, 0);
+
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_11_15.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_16_20.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_21_25.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_26_30.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_31_35.bin"));
+
+    EXPECT_EQ(changelog.size(), 33);
+
+    auto e1 = getLogEntry("helloworld", 5555);
+    changelog.write_at(1, e1);
+    changelog.end_of_append_batch(0, 0);
+    EXPECT_EQ(changelog.size(), 1);
+    EXPECT_EQ(changelog.start_index(), 1);
+    EXPECT_EQ(changelog.next_slot(), 2);
+    EXPECT_EQ(changelog.last_entry()->get_term(), 5555);
+
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin"));
+
+    EXPECT_FALSE(fs::exists("./logs/changelog_6_10.bin"));
+    EXPECT_FALSE(fs::exists("./logs/changelog_11_15.bin"));
+    EXPECT_FALSE(fs::exists("./logs/changelog_16_20.bin"));
+    EXPECT_FALSE(fs::exists("./logs/changelog_21_25.bin"));
+    EXPECT_FALSE(fs::exists("./logs/changelog_26_30.bin"));
+    EXPECT_FALSE(fs::exists("./logs/changelog_31_35.bin"));
+}
+
+TEST(CoordinationTest, ChangelogTestStartNewLogAfterRead)
+{
+    ChangelogDirTest test("./logs");
+    DB::KeeperLogStore changelog("./logs", 5, true);
+    changelog.init(1, 0);
+
+    for (size_t i = 0; i < 35; ++i)
+    {
+        auto entry = getLogEntry(std::to_string(i) + "_hello_world", i * 10);
+        changelog.append(entry);
+    }
+    changelog.end_of_append_batch(0, 0);
+    EXPECT_EQ(changelog.size(), 35);
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_11_15.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_16_20.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_21_25.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_26_30.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_31_35.bin"));
+    EXPECT_FALSE(fs::exists("./logs/changelog_36_40.bin"));
+
+
+    DB::KeeperLogStore changelog_reader("./logs", 5, true);
+    changelog_reader.init(1, 0);
+
+    auto entry = getLogEntry("36_hello_world", 360);
+    changelog_reader.append(entry);
+    changelog_reader.end_of_append_batch(0, 0);
+
+    EXPECT_EQ(changelog_reader.size(), 36);
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_11_15.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_16_20.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_21_25.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_26_30.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_31_35.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_36_40.bin"));
+}
+
+
+TEST(CoordinationTest, ChangelogTestReadAfterBrokenTruncate)
+{
+    ChangelogDirTest test("./logs");
+
+    DB::KeeperLogStore changelog("./logs", 5, true);
+    changelog.init(1, 0);
+
+    for (size_t i = 0; i < 35; ++i)
+    {
+        auto entry = getLogEntry(std::to_string(i) + "_hello_world", i * 10);
+        changelog.append(entry);
+    }
+    changelog.end_of_append_batch(0, 0);
+    EXPECT_EQ(changelog.size(), 35);
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_11_15.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_16_20.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_21_25.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_26_30.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_31_35.bin"));
+
+    DB::WriteBufferFromFile plain_buf("./logs/changelog_11_15.bin", DBMS_DEFAULT_BUFFER_SIZE, O_APPEND | O_CREAT | O_WRONLY);
+    plain_buf.truncate(0);
+
+    DB::KeeperLogStore changelog_reader("./logs", 5, true);
+    changelog_reader.init(1, 0);
+    changelog_reader.end_of_append_batch(0, 0);
+
+    EXPECT_EQ(changelog_reader.size(), 10);
+    EXPECT_EQ(changelog_reader.last_entry()->get_term(), 90);
+
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_11_15.bin"));
+
+    EXPECT_FALSE(fs::exists("./logs/changelog_16_20.bin"));
+    EXPECT_FALSE(fs::exists("./logs/changelog_21_25.bin"));
+    EXPECT_FALSE(fs::exists("./logs/changelog_26_30.bin"));
+    EXPECT_FALSE(fs::exists("./logs/changelog_31_35.bin"));
+
+    auto entry = getLogEntry("h", 7777);
+    changelog_reader.append(entry);
+    changelog_reader.end_of_append_batch(0, 0);
+    EXPECT_EQ(changelog_reader.size(), 11);
+    EXPECT_EQ(changelog_reader.last_entry()->get_term(), 7777);
+
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_11_15.bin"));
+
+    EXPECT_FALSE(fs::exists("./logs/changelog_16_20.bin"));
+    EXPECT_FALSE(fs::exists("./logs/changelog_21_25.bin"));
+    EXPECT_FALSE(fs::exists("./logs/changelog_26_30.bin"));
+    EXPECT_FALSE(fs::exists("./logs/changelog_31_35.bin"));
+
+    DB::KeeperLogStore changelog_reader2("./logs", 5, true);
+    changelog_reader2.init(1, 0);
+    EXPECT_EQ(changelog_reader2.size(), 11);
+    EXPECT_EQ(changelog_reader2.last_entry()->get_term(), 7777);
+}
+
+TEST(CoordinationTest, ChangelogTestReadAfterBrokenTruncate2)
+{
+    ChangelogDirTest test("./logs");
+
+    DB::KeeperLogStore changelog("./logs", 20, true);
+    changelog.init(1, 0);
+
+    for (size_t i = 0; i < 35; ++i)
+    {
+        auto entry = getLogEntry(std::to_string(i) + "_hello_world", (i + 44) * 10);
+        changelog.append(entry);
+    }
+    changelog.end_of_append_batch(0, 0);
+
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_20.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_21_40.bin"));
+
+    DB::WriteBufferFromFile plain_buf("./logs/changelog_1_20.bin", DBMS_DEFAULT_BUFFER_SIZE, O_APPEND | O_CREAT | O_WRONLY);
+    plain_buf.truncate(140);
+
+    DB::KeeperLogStore changelog_reader("./logs", 20, true);
+    changelog_reader.init(1, 0);
+
+    EXPECT_EQ(changelog_reader.size(), 2);
+    EXPECT_EQ(changelog_reader.last_entry()->get_term(), 450);
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_20.bin"));
+    EXPECT_FALSE(fs::exists("./logs/changelog_21_40.bin"));
+    auto entry = getLogEntry("hello_world", 7777);
+    changelog_reader.append(entry);
+    changelog_reader.end_of_append_batch(0, 0);
+    EXPECT_EQ(changelog_reader.size(), 3);
+    EXPECT_EQ(changelog_reader.last_entry()->get_term(), 7777);
+
+
+    DB::KeeperLogStore changelog_reader2("./logs", 20, true);
+    changelog_reader2.init(1, 0);
+    EXPECT_EQ(changelog_reader2.size(), 3);
+    EXPECT_EQ(changelog_reader2.last_entry()->get_term(), 7777);
+}
+
+TEST(CoordinationTest, ChangelogTestLostFiles)
+{
+    ChangelogDirTest test("./logs");
+
+    DB::KeeperLogStore changelog("./logs", 20, true);
+    changelog.init(1, 0);
+
+    for (size_t i = 0; i < 35; ++i)
+    {
+        auto entry = getLogEntry(std::to_string(i) + "_hello_world", (i + 44) * 10);
+        changelog.append(entry);
+    }
+    changelog.end_of_append_batch(0, 0);
+
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_20.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_21_40.bin"));
+
+    fs::remove("./logs/changelog_1_20.bin");
+
+    DB::KeeperLogStore changelog_reader("./logs", 20, true);
+    /// It should print error message, but still able to start
+    changelog_reader.init(5, 0);
+    EXPECT_FALSE(fs::exists("./logs/changelog_1_20.bin"));
+    EXPECT_FALSE(fs::exists("./logs/changelog_21_40.bin"));
+}
+
+TEST(CoordinationTest, SnapshotableHashMapSimple)
+{
+    DB::SnapshotableHashTable<int> hello;
+    EXPECT_TRUE(hello.insert("hello", 5));
+    EXPECT_TRUE(hello.contains("hello"));
+    EXPECT_EQ(hello.getValue("hello"), 5);
+    EXPECT_FALSE(hello.insert("hello", 145));
+    EXPECT_EQ(hello.getValue("hello"), 5);
+    hello.updateValue("hello", [](int & value) { value = 7; });
+    EXPECT_EQ(hello.getValue("hello"), 7);
+    EXPECT_EQ(hello.size(), 1);
+    EXPECT_TRUE(hello.erase("hello"));
+    EXPECT_EQ(hello.size(), 0);
+}
+
+TEST(CoordinationTest, SnapshotableHashMapTrySnapshot)
+{
+    DB::SnapshotableHashTable<int> map_snp;
+    EXPECT_TRUE(map_snp.insert("/hello", 7));
+    EXPECT_FALSE(map_snp.insert("/hello", 145));
+    map_snp.enableSnapshotMode();
+    EXPECT_FALSE(map_snp.insert("/hello", 145));
+    map_snp.updateValue("/hello", [](int & value) { value = 554; });
+    EXPECT_EQ(map_snp.getValue("/hello"), 554);
+    EXPECT_EQ(map_snp.snapshotSize(), 2);
+    EXPECT_EQ(map_snp.size(), 1);
+
+    auto itr = map_snp.begin();
+    EXPECT_EQ(itr->key, "/hello");
+    EXPECT_EQ(itr->value, 7);
+    EXPECT_EQ(itr->active_in_map, false);
+    itr = std::next(itr);
+    EXPECT_EQ(itr->key, "/hello");
+    EXPECT_EQ(itr->value, 554);
+    EXPECT_EQ(itr->active_in_map, true);
+    itr = std::next(itr);
+    EXPECT_EQ(itr, map_snp.end());
+    for (size_t i = 0; i < 5; ++i)
+    {
+        EXPECT_TRUE(map_snp.insert("/hello" + std::to_string(i), i));
+    }
+    EXPECT_EQ(map_snp.getValue("/hello3"), 3);
+
+    EXPECT_EQ(map_snp.snapshotSize(), 7);
+    EXPECT_EQ(map_snp.size(), 6);
+    itr = std::next(map_snp.begin(), 2);
+    for (size_t i = 0; i < 5; ++i)
+    {
+        EXPECT_EQ(itr->key, "/hello" + std::to_string(i));
+        EXPECT_EQ(itr->value, i);
+        EXPECT_EQ(itr->active_in_map, true);
+        itr = std::next(itr);
+    }
+
+    EXPECT_TRUE(map_snp.erase("/hello3"));
+    EXPECT_TRUE(map_snp.erase("/hello2"));
+
+    EXPECT_EQ(map_snp.snapshotSize(), 7);
+    EXPECT_EQ(map_snp.size(), 4);
+    itr = std::next(map_snp.begin(), 2);
+    for (size_t i = 0; i < 5; ++i)
+    {
+        EXPECT_EQ(itr->key, "/hello" + std::to_string(i));
+        EXPECT_EQ(itr->value, i);
+        EXPECT_EQ(itr->active_in_map, i != 3 && i != 2);
+        itr = std::next(itr);
+    }
+    map_snp.clearOutdatedNodes();
+
+    EXPECT_EQ(map_snp.snapshotSize(), 4);
+    EXPECT_EQ(map_snp.size(), 4);
+    itr = map_snp.begin();
+    EXPECT_EQ(itr->key, "/hello");
+    EXPECT_EQ(itr->value, 554);
+    EXPECT_EQ(itr->active_in_map, true);
+    itr = std::next(itr);
+    EXPECT_EQ(itr->key, "/hello0");
+    EXPECT_EQ(itr->value, 0);
+    EXPECT_EQ(itr->active_in_map, true);
+    itr = std::next(itr);
+    EXPECT_EQ(itr->key, "/hello1");
+    EXPECT_EQ(itr->value, 1);
+    EXPECT_EQ(itr->active_in_map, true);
+    itr = std::next(itr);
+    EXPECT_EQ(itr->key, "/hello4");
+    EXPECT_EQ(itr->value, 4);
+    EXPECT_EQ(itr->active_in_map, true);
+    itr = std::next(itr);
+    EXPECT_EQ(itr, map_snp.end());
+    map_snp.disableSnapshotMode();
+}
+
+void addNode(DB::KeeperStorage & storage, const std::string & path, const std::string & data, int64_t ephemeral_owner=0)
+{
+    using Node = DB::KeeperStorage::Node;
+    Node node{};
+    node.data = data;
+    node.stat.ephemeralOwner = ephemeral_owner;
+    storage.container.insertOrReplace(path, node);
+}
+
+TEST(CoordinationTest, TestStorageSnapshotSimple)
+{
+    ChangelogDirTest test("./snapshots");
+    DB::KeeperSnapshotManager manager("./snapshots", 3);
+
+    DB::KeeperStorage storage(500);
+    addNode(storage, "/hello", "world", 1);
+    addNode(storage, "/hello/somepath", "somedata", 3);
+    storage.session_id_counter = 5;
+    storage.zxid = 2;
+    storage.ephemerals[3] = {"/hello"};
+    storage.ephemerals[1] = {"/hello/somepath"};
+    storage.getSessionID(130);
+    storage.getSessionID(130);
+
+    DB::KeeperStorageSnapshot snapshot(&storage, 2);
+
+    EXPECT_EQ(snapshot.snapshot_meta->get_last_log_idx(), 2);
+    EXPECT_EQ(snapshot.session_id, 7);
+    EXPECT_EQ(snapshot.snapshot_container_size, 3);
+    EXPECT_EQ(snapshot.session_and_timeout.size(), 2);
+
+    auto buf = manager.serializeSnapshotToBuffer(snapshot);
+    manager.serializeSnapshotBufferToDisk(*buf, 2);
+    EXPECT_TRUE(fs::exists("./snapshots/snapshot_2.bin"));
+
+
+    auto debuf = manager.deserializeSnapshotBufferFromDisk(2);
+
+    auto [snapshot_meta, restored_storage] = manager.deserializeSnapshotFromBuffer(debuf);
+
+    EXPECT_EQ(restored_storage->container.size(), 3);
+    EXPECT_EQ(restored_storage->container.getValue("/").children.size(), 1);
+    EXPECT_EQ(restored_storage->container.getValue("/hello").children.size(), 1);
+    EXPECT_EQ(restored_storage->container.getValue("/hello/somepath").children.size(), 0);
+
+    EXPECT_EQ(restored_storage->container.getValue("/").data, "");
+    EXPECT_EQ(restored_storage->container.getValue("/hello").data, "world");
+    EXPECT_EQ(restored_storage->container.getValue("/hello/somepath").data, "somedata");
+    EXPECT_EQ(restored_storage->session_id_counter, 7);
+    EXPECT_EQ(restored_storage->zxid, 2);
+    EXPECT_EQ(restored_storage->ephemerals.size(), 2);
+    EXPECT_EQ(restored_storage->ephemerals[3].size(), 1);
+    EXPECT_EQ(restored_storage->ephemerals[1].size(), 1);
+    EXPECT_EQ(restored_storage->session_and_timeout.size(), 2);
+}
+
+TEST(CoordinationTest, TestStorageSnapshotMoreWrites)
+{
+    ChangelogDirTest test("./snapshots");
+    DB::KeeperSnapshotManager manager("./snapshots", 3);
+
+    DB::KeeperStorage storage(500);
+    storage.getSessionID(130);
+
+    for (size_t i = 0; i < 50; ++i)
+    {
+        addNode(storage, "/hello_" + std::to_string(i), "world_" + std::to_string(i));
+    }
+
+    DB::KeeperStorageSnapshot snapshot(&storage, 50);
+    EXPECT_EQ(snapshot.snapshot_meta->get_last_log_idx(), 50);
+    EXPECT_EQ(snapshot.snapshot_container_size, 51);
+
+    for (size_t i = 50; i < 100; ++i)
+    {
+        addNode(storage, "/hello_" + std::to_string(i), "world_" + std::to_string(i));
+    }
+
+    EXPECT_EQ(storage.container.size(), 101);
+
+    auto buf = manager.serializeSnapshotToBuffer(snapshot);
+    manager.serializeSnapshotBufferToDisk(*buf, 50);
+    EXPECT_TRUE(fs::exists("./snapshots/snapshot_50.bin"));
+
+
+    auto debuf = manager.deserializeSnapshotBufferFromDisk(50);
+    auto [meta, restored_storage] = manager.deserializeSnapshotFromBuffer(debuf);
+
+    EXPECT_EQ(restored_storage->container.size(), 51);
+    for (size_t i = 0; i < 50; ++i)
+    {
+        EXPECT_EQ(restored_storage->container.getValue("/hello_" + std::to_string(i)).data, "world_" + std::to_string(i));
+    }
+}
+
+
+TEST(CoordinationTest, TestStorageSnapshotManySnapshots)
+{
+    ChangelogDirTest test("./snapshots");
+    DB::KeeperSnapshotManager manager("./snapshots", 3);
+
+    DB::KeeperStorage storage(500);
+    storage.getSessionID(130);
+
+    for (size_t j = 1; j <= 5; ++j)
+    {
+        for (size_t i = (j - 1) * 50; i < j * 50; ++i)
+        {
+            addNode(storage, "/hello_" + std::to_string(i), "world_" + std::to_string(i));
+        }
+
+        DB::KeeperStorageSnapshot snapshot(&storage, j * 50);
+        auto buf = manager.serializeSnapshotToBuffer(snapshot);
+        manager.serializeSnapshotBufferToDisk(*buf, j * 50);
+        EXPECT_TRUE(fs::exists(std::string{"./snapshots/snapshot_"} + std::to_string(j * 50) + ".bin"));
+    }
+
+    EXPECT_FALSE(fs::exists("./snapshots/snapshot_50.bin"));
+    EXPECT_FALSE(fs::exists("./snapshots/snapshot_100.bin"));
+    EXPECT_TRUE(fs::exists("./snapshots/snapshot_150.bin"));
+    EXPECT_TRUE(fs::exists("./snapshots/snapshot_200.bin"));
+    EXPECT_TRUE(fs::exists("./snapshots/snapshot_250.bin"));
+
+
+    auto [meta, restored_storage] = manager.restoreFromLatestSnapshot();
+
+    EXPECT_EQ(restored_storage->container.size(), 251);
+
+    for (size_t i = 0; i < 250; ++i)
+    {
+        EXPECT_EQ(restored_storage->container.getValue("/hello_" + std::to_string(i)).data, "world_" + std::to_string(i));
+    }
+}
+
+TEST(CoordinationTest, TestStorageSnapshotMode)
+{
+    ChangelogDirTest test("./snapshots");
+    DB::KeeperSnapshotManager manager("./snapshots", 3);
+    DB::KeeperStorage storage(500);
+    for (size_t i = 0; i < 50; ++i)
+    {
+        addNode(storage, "/hello_" + std::to_string(i), "world_" + std::to_string(i));
+    }
+
+    {
+        DB::KeeperStorageSnapshot snapshot(&storage, 50);
+        for (size_t i = 0; i < 50; ++i)
+        {
+            addNode(storage, "/hello_" + std::to_string(i), "wlrd_" + std::to_string(i));
+        }
+        for (size_t i = 0; i < 50; ++i)
+        {
+            EXPECT_EQ(storage.container.getValue("/hello_" + std::to_string(i)).data, "wlrd_" + std::to_string(i));
+        }
+        for (size_t i = 0; i < 50; ++i)
+        {
+            if (i % 2 == 0)
+                storage.container.erase("/hello_" + std::to_string(i));
+        }
+        EXPECT_EQ(storage.container.size(), 26);
+        EXPECT_EQ(storage.container.snapshotSize(), 101);
+        auto buf = manager.serializeSnapshotToBuffer(snapshot);
+        manager.serializeSnapshotBufferToDisk(*buf, 50);
+    }
+    EXPECT_TRUE(fs::exists("./snapshots/snapshot_50.bin"));
+    EXPECT_EQ(storage.container.size(), 26);
+    storage.clearGarbageAfterSnapshot();
+    EXPECT_EQ(storage.container.snapshotSize(), 26);
+    for (size_t i = 0; i < 50; ++i)
+    {
+        if (i % 2 != 0)
+            EXPECT_EQ(storage.container.getValue("/hello_" + std::to_string(i)).data, "wlrd_" + std::to_string(i));
+        else
+            EXPECT_FALSE(storage.container.contains("/hello_" + std::to_string(i)));
+    }
+
+    auto [meta, restored_storage] = manager.restoreFromLatestSnapshot();
+
+    for (size_t i = 0; i < 50; ++i)
+    {
+        EXPECT_EQ(restored_storage->container.getValue("/hello_" + std::to_string(i)).data, "world_" + std::to_string(i));
+    }
+
+}
+
+TEST(CoordinationTest, TestStorageSnapshotBroken)
+{
+    ChangelogDirTest test("./snapshots");
+    DB::KeeperSnapshotManager manager("./snapshots", 3);
+    DB::KeeperStorage storage(500);
+    for (size_t i = 0; i < 50; ++i)
+    {
+        addNode(storage, "/hello_" + std::to_string(i), "world_" + std::to_string(i));
+    }
+    {
+        DB::KeeperStorageSnapshot snapshot(&storage, 50);
+        auto buf = manager.serializeSnapshotToBuffer(snapshot);
+        manager.serializeSnapshotBufferToDisk(*buf, 50);
+    }
+    EXPECT_TRUE(fs::exists("./snapshots/snapshot_50.bin"));
+
+    /// Let's corrupt file
+    DB::WriteBufferFromFile plain_buf("./snapshots/snapshot_50.bin", DBMS_DEFAULT_BUFFER_SIZE, O_APPEND | O_CREAT | O_WRONLY);
+    plain_buf.truncate(34);
+    plain_buf.sync();
+
+    EXPECT_THROW(manager.restoreFromLatestSnapshot(), DB::Exception);
+}
+
+nuraft::ptr<nuraft::buffer> getBufferFromZKRequest(int64_t session_id, const Coordination::ZooKeeperRequestPtr & request)
 {
     DB::WriteBufferFromNuraftBuffer buf;
     DB::writeIntBinary(session_id, buf);
@@ -279,58 +1114,198 @@ nuraft::ptr<nuraft::buffer> getZooKeeperLogEntry(int64_t session_id, const Coord
     return buf.getBuffer();
 }
 
-DB::NuKeeperStorage::ResponsesForSessions getZooKeeperResponses(nuraft::ptr<nuraft::buffer> & buffer, const Coordination::ZooKeeperRequestPtr & request)
+nuraft::ptr<nuraft::log_entry> getLogEntryFromZKRequest(size_t term, int64_t session_id, const Coordination::ZooKeeperRequestPtr & request)
 {
-    DB::NuKeeperStorage::ResponsesForSessions results;
-    DB::ReadBufferFromNuraftBuffer buf(buffer);
-    while (!buf.eof())
-    {
-        int64_t session_id;
-        DB::readIntBinary(session_id, buf);
-
-        int32_t length;
-        Coordination::XID xid;
-        int64_t zxid;
-        Coordination::Error err;
-
-        Coordination::read(length, buf);
-        Coordination::read(xid, buf);
-        Coordination::read(zxid, buf);
-        Coordination::read(err, buf);
-        auto response = request->makeResponse();
-        response->readImpl(buf);
-        results.push_back(DB::NuKeeperStorage::ResponseForSession{session_id, response});
-    }
-    return results;
+    auto buffer = getBufferFromZKRequest(session_id, request);
+    return nuraft::cs_new<nuraft::log_entry>(term, buffer);
 }
 
-TEST(CoordinationTest, TestStorageSerialization)
+void testLogAndStateMachine(Coordination::CoordinationSettingsPtr settings, uint64_t total_logs)
 {
-    DB::NuKeeperStorage storage(500);
-    storage.container["/hello"] = DB::NuKeeperStorage::Node{.data="world"};
-    storage.container["/hello/somepath"] =  DB::NuKeeperStorage::Node{.data="somedata"};
-    storage.session_id_counter = 5;
-    storage.zxid = 156;
-    storage.ephemerals[3] = {"/hello", "/"};
-    storage.ephemerals[1] = {"/hello/somepath"};
+    using namespace Coordination;
+    using namespace DB;
 
-    DB::WriteBufferFromOwnString buffer;
-    DB::NuKeeperStorageSerializer serializer;
-    serializer.serialize(storage, buffer);
-    std::string serialized = buffer.str();
-    EXPECT_NE(serialized.size(), 0);
-    DB::ReadBufferFromString read(serialized);
-    DB::NuKeeperStorage new_storage(500);
-    serializer.deserialize(new_storage, read);
+    ChangelogDirTest snapshots("./snapshots");
+    ChangelogDirTest logs("./logs");
 
-    EXPECT_EQ(new_storage.container.size(), 3);
-    EXPECT_EQ(new_storage.container["/hello"].data, "world");
-    EXPECT_EQ(new_storage.container["/hello/somepath"].data, "somedata");
-    EXPECT_EQ(new_storage.session_id_counter, 5);
-    EXPECT_EQ(new_storage.zxid, 156);
-    EXPECT_EQ(new_storage.ephemerals.size(), 2);
-    EXPECT_EQ(new_storage.ephemerals[3].size(), 2);
-    EXPECT_EQ(new_storage.ephemerals[1].size(), 1);
+    ResponsesQueue queue;
+    SnapshotsQueue snapshots_queue{1};
+    auto state_machine = std::make_shared<KeeperStateMachine>(queue, snapshots_queue, "./snapshots", settings);
+    state_machine->init();
+    DB::KeeperLogStore changelog("./logs", settings->rotate_log_storage_interval, true);
+    changelog.init(state_machine->last_commit_index() + 1, settings->reserved_log_items);
+    for (size_t i = 1; i < total_logs + 1; ++i)
+    {
+        std::shared_ptr<ZooKeeperCreateRequest> request = std::make_shared<ZooKeeperCreateRequest>();
+        request->path = "/hello_" + std::to_string(i);
+        auto entry = getLogEntryFromZKRequest(0, 1, request);
+        changelog.append(entry);
+        changelog.end_of_append_batch(0, 0);
+
+        state_machine->commit(i, changelog.entry_at(i)->get_buf());
+        bool snapshot_created = false;
+        if (i % settings->snapshot_distance == 0)
+        {
+            nuraft::snapshot s(i, 0, std::make_shared<nuraft::cluster_config>());
+            nuraft::async_result<bool>::handler_type when_done = [&snapshot_created] (bool & ret, nuraft::ptr<std::exception> &/*exception*/)
+            {
+                snapshot_created = ret;
+                std::cerr << "Snapshot finised\n";
+            };
+
+            state_machine->create_snapshot(s, when_done);
+            CreateSnapshotTask snapshot_task;
+            snapshots_queue.pop(snapshot_task);
+            snapshot_task.create_snapshot(std::move(snapshot_task.snapshot));
+        }
+        if (snapshot_created)
+        {
+            if (changelog.size() > settings->reserved_log_items)
+            {
+                changelog.compact(i - settings->reserved_log_items);
+            }
+        }
+    }
+
+    SnapshotsQueue snapshots_queue1{1};
+    auto restore_machine = std::make_shared<KeeperStateMachine>(queue, snapshots_queue1, "./snapshots", settings);
+    restore_machine->init();
+    EXPECT_EQ(restore_machine->last_commit_index(), total_logs - total_logs % settings->snapshot_distance);
+
+    DB::KeeperLogStore restore_changelog("./logs", settings->rotate_log_storage_interval, true);
+    restore_changelog.init(restore_machine->last_commit_index() + 1, settings->reserved_log_items);
+
+    EXPECT_EQ(restore_changelog.size(), std::min(settings->reserved_log_items + total_logs % settings->snapshot_distance, total_logs));
+    EXPECT_EQ(restore_changelog.next_slot(), total_logs + 1);
+    if (total_logs > settings->reserved_log_items + 1)
+        EXPECT_EQ(restore_changelog.start_index(), total_logs - total_logs % settings->snapshot_distance - settings->reserved_log_items + 1);
+    else
+        EXPECT_EQ(restore_changelog.start_index(), 1);
+
+    for (size_t i = restore_machine->last_commit_index() + 1; i < restore_changelog.next_slot(); ++i)
+    {
+        restore_machine->commit(i, changelog.entry_at(i)->get_buf());
+    }
+
+    auto & source_storage = state_machine->getStorage();
+    auto & restored_storage = restore_machine->getStorage();
+
+    EXPECT_EQ(source_storage.container.size(), restored_storage.container.size());
+    for (size_t i = 1; i < total_logs + 1; ++i)
+    {
+        auto path = "/hello_" + std::to_string(i);
+        EXPECT_EQ(source_storage.container.getValue(path).data, restored_storage.container.getValue(path).data);
+    }
+}
+
+TEST(CoordinationTest, TestStateMachineAndLogStore)
+{
+    using namespace Coordination;
+    using namespace DB;
+
+    {
+        CoordinationSettingsPtr settings = std::make_shared<CoordinationSettings>();
+        settings->snapshot_distance = 10;
+        settings->reserved_log_items = 10;
+        settings->rotate_log_storage_interval = 10;
+        testLogAndStateMachine(settings, 37);
+    }
+    {
+        CoordinationSettingsPtr settings = std::make_shared<CoordinationSettings>();
+        settings->snapshot_distance = 10;
+        settings->reserved_log_items = 10;
+        settings->rotate_log_storage_interval = 10;
+        testLogAndStateMachine(settings, 11);
+    }
+    {
+        CoordinationSettingsPtr settings = std::make_shared<CoordinationSettings>();
+        settings->snapshot_distance = 10;
+        settings->reserved_log_items = 10;
+        settings->rotate_log_storage_interval = 10;
+        testLogAndStateMachine(settings, 40);
+    }
+    {
+        CoordinationSettingsPtr settings = std::make_shared<CoordinationSettings>();
+        settings->snapshot_distance = 10;
+        settings->reserved_log_items = 20;
+        settings->rotate_log_storage_interval = 30;
+        testLogAndStateMachine(settings, 40);
+    }
+    {
+        CoordinationSettingsPtr settings = std::make_shared<CoordinationSettings>();
+        settings->snapshot_distance = 10;
+        settings->reserved_log_items = 0;
+        settings->rotate_log_storage_interval = 10;
+        testLogAndStateMachine(settings, 40);
+    }
+    {
+        CoordinationSettingsPtr settings = std::make_shared<CoordinationSettings>();
+        settings->snapshot_distance = 1;
+        settings->reserved_log_items = 1;
+        settings->rotate_log_storage_interval = 32;
+        testLogAndStateMachine(settings, 32);
+    }
+    {
+        CoordinationSettingsPtr settings = std::make_shared<CoordinationSettings>();
+        settings->snapshot_distance = 10;
+        settings->reserved_log_items = 7;
+        settings->rotate_log_storage_interval = 1;
+        testLogAndStateMachine(settings, 33);
+    }
+    {
+        CoordinationSettingsPtr settings = std::make_shared<CoordinationSettings>();
+        settings->snapshot_distance = 37;
+        settings->reserved_log_items = 1000;
+        settings->rotate_log_storage_interval = 5000;
+        testLogAndStateMachine(settings, 33);
+    }
+    {
+        CoordinationSettingsPtr settings = std::make_shared<CoordinationSettings>();
+        settings->snapshot_distance = 37;
+        settings->reserved_log_items = 1000;
+        settings->rotate_log_storage_interval = 5000;
+        testLogAndStateMachine(settings, 45);
+    }
+}
+
+TEST(CoordinationTest, TestEphemeralNodeRemove)
+{
+    using namespace Coordination;
+    using namespace DB;
+
+    ChangelogDirTest snapshots("./snapshots");
+    CoordinationSettingsPtr settings = std::make_shared<CoordinationSettings>();
+
+    ResponsesQueue queue;
+    SnapshotsQueue snapshots_queue{1};
+    auto state_machine = std::make_shared<KeeperStateMachine>(queue, snapshots_queue, "./snapshots", settings);
+    state_machine->init();
+
+    std::shared_ptr<ZooKeeperCreateRequest> request_c = std::make_shared<ZooKeeperCreateRequest>();
+    request_c->path = "/hello";
+    request_c->is_ephemeral = true;
+    auto entry_c = getLogEntryFromZKRequest(0, 1, request_c);
+    state_machine->commit(1, entry_c->get_buf());
+    const auto & storage = state_machine->getStorage();
+
+    EXPECT_EQ(storage.ephemerals.size(), 1);
+    std::shared_ptr<ZooKeeperRemoveRequest> request_d = std::make_shared<ZooKeeperRemoveRequest>();
+    request_d->path = "/hello";
+    /// Delete from other session
+    auto entry_d = getLogEntryFromZKRequest(0, 2, request_d);
+    state_machine->commit(2, entry_d->get_buf());
+
+    EXPECT_EQ(storage.ephemerals.size(), 0);
+}
+
+
+int main(int argc, char ** argv)
+{
+    Poco::AutoPtr<Poco::ConsoleChannel> channel(new Poco::ConsoleChannel(std::cerr));
+    Poco::Logger::root().setChannel(channel);
+    Poco::Logger::root().setLevel("trace");
+    testing::InitGoogleTest(&argc, argv);
+    return RUN_ALL_TESTS();
 }
 
 #endif
diff --git a/src/Core/AccurateComparison.h b/src/Core/AccurateComparison.h
index 8b2f20f0af5..1e45dbe23dc 100644
--- a/src/Core/AccurateComparison.h
+++ b/src/Core/AccurateComparison.h
@@ -177,7 +177,7 @@ inline bool_if_big_int_vs_float<TABigInt, TAFloat> equalsOpTmpl(TABigInt, TAFloa
     return false;
 }
 
-/* Final realiztions */
+/* Final implementations */
 
 
 template <typename A, typename B>
@@ -274,12 +274,14 @@ inline bool greaterOp<DB::UInt64, DB::Float32>(DB::UInt64 u, DB::Float32 f)
 template <>
 inline bool greaterOp<DB::Float64, DB::UInt128>(DB::Float64 f, DB::UInt128 u)
 {
+    /// TODO: This is wrong.
     return u.low == 0 && greaterOp(f, u.high);
 }
 
 template <>
 inline bool greaterOp<DB::UInt128, DB::Float64>(DB::UInt128 u, DB::Float64 f)
 {
+    /// TODO: This is wrong.
     return u.low != 0 || greaterOp(u.high, f);
 }
 
@@ -310,56 +312,64 @@ inline bool_if_safe_conversion<A, B> equalsOp(A a, B b)
 }
 
 template <>
-inline bool NO_SANITIZE_UNDEFINED equalsOp<DB::Float64, DB::UInt64>(DB::Float64 f, DB::UInt64 u)
+inline bool equalsOp<DB::Float64, DB::UInt64>(DB::Float64 f, DB::UInt64 u)
 {
-    return static_cast<DB::UInt64>(f) == u && f == static_cast<DB::Float64>(u);
+    /// Maximum exactly representable integer.
+    return u <= (1ULL << std::numeric_limits<DB::Float64>::digits)
+        && f == static_cast<DB::Float64>(u);
 }
 
 template <>
-inline bool NO_SANITIZE_UNDEFINED equalsOp<DB::UInt64, DB::Float64>(DB::UInt64 u, DB::Float64 f)
+inline bool equalsOp<DB::UInt64, DB::Float64>(DB::UInt64 u, DB::Float64 f)
 {
-    return u == static_cast<DB::UInt64>(f) && static_cast<DB::Float64>(u) == f;
+    return equalsOp(f, u);
 }
 
 template <>
-inline bool NO_SANITIZE_UNDEFINED equalsOp<DB::Float64, DB::Int64>(DB::Float64 f, DB::Int64 u)
+inline bool equalsOp<DB::Float64, DB::Int64>(DB::Float64 f, DB::Int64 u)
 {
-    return static_cast<DB::Int64>(f) == u && f == static_cast<DB::Float64>(u);
+    return u <= (1LL << std::numeric_limits<DB::Float64>::digits)
+        && u >= -(1LL << std::numeric_limits<DB::Float64>::digits)
+        && f == static_cast<DB::Float64>(u);
 }
 
 template <>
-inline bool NO_SANITIZE_UNDEFINED equalsOp<DB::Int64, DB::Float64>(DB::Int64 u, DB::Float64 f)
+inline bool equalsOp<DB::Int64, DB::Float64>(DB::Int64 u, DB::Float64 f)
 {
-    return u == static_cast<DB::Int64>(f) && static_cast<DB::Float64>(u) == f;
+    return equalsOp(f, u);
 }
 
 template <>
-inline bool NO_SANITIZE_UNDEFINED equalsOp<DB::Float32, DB::UInt64>(DB::Float32 f, DB::UInt64 u)
+inline bool equalsOp<DB::Float32, DB::UInt64>(DB::Float32 f, DB::UInt64 u)
 {
-    return static_cast<DB::UInt64>(f) == u && f == static_cast<DB::Float32>(u);
+    return u <= (1ULL << std::numeric_limits<DB::Float32>::digits)
+        && f == static_cast<DB::Float32>(u);
 }
 
 template <>
-inline bool NO_SANITIZE_UNDEFINED equalsOp<DB::UInt64, DB::Float32>(DB::UInt64 u, DB::Float32 f)
+inline bool equalsOp<DB::UInt64, DB::Float32>(DB::UInt64 u, DB::Float32 f)
 {
-    return u == static_cast<DB::UInt64>(f) && static_cast<DB::Float32>(u) == f;
+    return equalsOp(f, u);
 }
 
 template <>
-inline bool NO_SANITIZE_UNDEFINED equalsOp<DB::Float32, DB::Int64>(DB::Float32 f, DB::Int64 u)
+inline bool equalsOp<DB::Float32, DB::Int64>(DB::Float32 f, DB::Int64 u)
 {
-    return static_cast<DB::Int64>(f) == u && f == static_cast<DB::Float32>(u);
+    return u <= (1LL << std::numeric_limits<DB::Float32>::digits)
+        && u >= -(1LL << std::numeric_limits<DB::Float32>::digits)
+        && f == static_cast<DB::Float32>(u);
 }
 
 template <>
-inline bool NO_SANITIZE_UNDEFINED equalsOp<DB::Int64, DB::Float32>(DB::Int64 u, DB::Float32 f)
+inline bool equalsOp<DB::Int64, DB::Float32>(DB::Int64 u, DB::Float32 f)
 {
-    return u == static_cast<DB::Int64>(f) && static_cast<DB::Float32>(u) == f;
+    return equalsOp(f, u);
 }
 
 template <>
-inline bool NO_SANITIZE_UNDEFINED equalsOp<DB::UInt128, DB::Float64>(DB::UInt128 u, DB::Float64 f)
+inline bool equalsOp<DB::UInt128, DB::Float64>(DB::UInt128 u, DB::Float64 f)
 {
+    /// TODO: This is wrong.
     return u.low == 0 && equalsOp(static_cast<UInt64>(u.high), f);
 }
 
diff --git a/src/Core/Block.cpp b/src/Core/Block.cpp
index 0c9a470dc1d..0f470c10b81 100644
--- a/src/Core/Block.cpp
+++ b/src/Core/Block.cpp
@@ -484,7 +484,7 @@ DataTypes Block::getDataTypes() const
 
 
 template <typename ReturnType>
-static ReturnType checkBlockStructure(const Block & lhs, const Block & rhs, const std::string & context_description)
+static ReturnType checkBlockStructure(const Block & lhs, const Block & rhs, const std::string & context_description, bool allow_remove_constants)
 {
     auto on_error = [](const std::string & message [[maybe_unused]], int code [[maybe_unused]])
     {
@@ -515,7 +515,16 @@ static ReturnType checkBlockStructure(const Block & lhs, const Block & rhs, cons
         if (!actual.column || !expected.column)
             continue;
 
-        if (actual.column->getName() != expected.column->getName())
+        const IColumn * actual_column = actual.column.get();
+
+        /// If we allow to remove constants, and expected column is not const, then unwrap actual constant column.
+        if (allow_remove_constants && !isColumnConst(*expected.column))
+        {
+            if (const auto * column_const = typeid_cast<const ColumnConst *>(actual_column))
+                actual_column = &column_const->getDataColumn();
+        }
+
+        if (actual_column->getName() != expected.column->getName())
             return on_error("Block structure mismatch in " + context_description + " stream: different columns:\n"
                 + lhs.dumpStructure() + "\n" + rhs.dumpStructure(), ErrorCodes::LOGICAL_ERROR);
 
@@ -537,13 +546,25 @@ static ReturnType checkBlockStructure(const Block & lhs, const Block & rhs, cons
 
 bool blocksHaveEqualStructure(const Block & lhs, const Block & rhs)
 {
-    return checkBlockStructure<bool>(lhs, rhs, {});
+    return checkBlockStructure<bool>(lhs, rhs, {}, false);
 }
 
 
 void assertBlocksHaveEqualStructure(const Block & lhs, const Block & rhs, const std::string & context_description)
 {
-    checkBlockStructure<void>(lhs, rhs, context_description);
+    checkBlockStructure<void>(lhs, rhs, context_description, false);
+}
+
+
+bool isCompatibleHeader(const Block & actual, const Block & desired)
+{
+    return checkBlockStructure<bool>(actual, desired, {}, true);
+}
+
+
+void assertCompatibleHeader(const Block & actual, const Block & desired, const std::string & context_description)
+{
+    checkBlockStructure<void>(actual, desired, context_description, true);
 }
 
 
diff --git a/src/Core/Block.h b/src/Core/Block.h
index 14f4f57caed..6a94034b8fd 100644
--- a/src/Core/Block.h
+++ b/src/Core/Block.h
@@ -1,15 +1,15 @@
 #pragma once
 
-#include <vector>
-#include <list>
-#include <set>
-#include <map>
-#include <initializer_list>
-
 #include <Core/BlockInfo.h>
-#include <Core/NamesAndTypes.h>
 #include <Core/ColumnWithTypeAndName.h>
 #include <Core/ColumnsWithTypeAndName.h>
+#include <Core/NamesAndTypes.h>
+
+#include <initializer_list>
+#include <list>
+#include <map>
+#include <set>
+#include <vector>
 
 
 namespace DB
@@ -22,8 +22,6 @@ namespace DB
   * Allows to insert, remove columns in arbitrary position, to change order of columns.
   */
 
-class Context;
-
 class Block
 {
 private:
@@ -116,7 +114,7 @@ public:
     /** Get a list of column names separated by commas. */
     std::string dumpNames() const;
 
-     /** List of names, types and lengths of columns. Designed for debugging. */
+    /** List of names, types and lengths of columns. Designed for debugging. */
     std::string dumpStructure() const;
 
     /** List of column names and positions from index */
@@ -186,6 +184,12 @@ bool blocksHaveEqualStructure(const Block & lhs, const Block & rhs);
 /// Throw exception when blocks are different.
 void assertBlocksHaveEqualStructure(const Block & lhs, const Block & rhs, const std::string & context_description);
 
+/// Actual header is compatible to desired if block have equal structure except constants.
+/// It is allowed when column from actual header is constant, but in desired is not.
+/// If both columns are constant, it is checked that they have the same value.
+bool isCompatibleHeader(const Block & actual, const Block & desired);
+void assertCompatibleHeader(const Block & actual, const Block & desired, const std::string & context_description);
+
 /// Calculate difference in structure of blocks and write description into output strings. NOTE It doesn't compare values of constant columns.
 void getBlocksDifference(const Block & lhs, const Block & rhs, std::string & out_lhs_diff, std::string & out_rhs_diff);
 
diff --git a/src/Core/BlockInfo.h b/src/Core/BlockInfo.h
index c8dd1576b22..125c90b1b23 100644
--- a/src/Core/BlockInfo.h
+++ b/src/Core/BlockInfo.h
@@ -1,9 +1,10 @@
 #pragma once
 
-#include <unordered_map>
-
 #include <common/types.h>
 
+#include <unordered_map>
+#include <vector>
+
 
 namespace DB
 {
diff --git a/src/Core/DecimalFunctions.h b/src/Core/DecimalFunctions.h
index 355cf1d378a..2131a6e3c33 100644
--- a/src/Core/DecimalFunctions.h
+++ b/src/Core/DecimalFunctions.h
@@ -50,9 +50,10 @@ inline auto scaleMultiplier(UInt32 scale)
  * whole - represents whole part of decimal, can be negative or positive.
  * fractional - for fractional part of decimal, always positive.
  */
-template <typename T>
+template <typename DecimalType>
 struct DecimalComponents
 {
+    using T = typename DecimalType::NativeType;
     T whole;
     T fractional;
 };
@@ -102,10 +103,22 @@ inline DecimalType decimalFromComponentsWithMultiplier(
     if (common::mulOverflow(whole, scale_multiplier, whole_scaled))
         throw Exception("Decimal math overflow", ErrorCodes::DECIMAL_OVERFLOW);
 
-    const T value = whole_scaled + fractional_sign * (fractional % scale_multiplier);
+    T value;
+    if (common::addOverflow(whole_scaled, fractional_sign * (fractional % scale_multiplier), value))
+        throw Exception("Decimal math overflow", ErrorCodes::DECIMAL_OVERFLOW);
+
     return DecimalType(value);
 }
 
+template <typename DecimalType>
+inline DecimalType decimalFromComponentsWithMultiplier(
+        const DecimalComponents<DecimalType> & components,
+        typename DecimalType::NativeType scale_multiplier)
+{
+    return decimalFromComponentsWithMultiplier<DecimalType>(components.whole, components.fractional, scale_multiplier);
+}
+
+
 /** Make a decimal value from whole and fractional components with given scale.
  *
  * @see `decimalFromComponentsWithMultiplier` for details.
@@ -126,7 +139,7 @@ inline DecimalType decimalFromComponents(
  */
 template <typename DecimalType>
 inline DecimalType decimalFromComponents(
-        const DecimalComponents<typename DecimalType::NativeType> & components,
+        const DecimalComponents<DecimalType> & components,
         UInt32 scale)
 {
     return decimalFromComponents<DecimalType>(components.whole, components.fractional, scale);
@@ -136,7 +149,7 @@ inline DecimalType decimalFromComponents(
  * This is an optimization to reduce number of calls to scaleMultiplier on known scale.
  */
 template <typename DecimalType>
-inline DecimalComponents<typename DecimalType::NativeType> splitWithScaleMultiplier(
+inline DecimalComponents<DecimalType> splitWithScaleMultiplier(
         const DecimalType & decimal,
         typename DecimalType::NativeType scale_multiplier)
 {
@@ -151,7 +164,7 @@ inline DecimalComponents<typename DecimalType::NativeType> splitWithScaleMultipl
 
 /// Split decimal into components: whole and fractional part, @see `DecimalComponents` for details.
 template <typename DecimalType>
-inline DecimalComponents<typename DecimalType::NativeType> split(const DecimalType & decimal, UInt32 scale)
+inline DecimalComponents<DecimalType> split(const DecimalType & decimal, UInt32 scale)
 {
     if (scale == 0)
     {
diff --git a/src/Core/Defines.h b/src/Core/Defines.h
index ff033aa6183..668a60f9be8 100644
--- a/src/Core/Defines.h
+++ b/src/Core/Defines.h
@@ -11,6 +11,9 @@
 #define DBMS_DEFAULT_CONNECT_TIMEOUT_WITH_FAILOVER_SECURE_MS 100
 #define DBMS_DEFAULT_SEND_TIMEOUT_SEC 300
 #define DBMS_DEFAULT_RECEIVE_TIMEOUT_SEC 300
+/// Timeouts for hedged requests.
+#define DBMS_DEFAULT_HEDGED_CONNECTION_TIMEOUT_MS 100
+#define DBMS_DEFAULT_RECEIVE_DATA_TIMEOUT_MS 2000
 /// Timeout for synchronous request-result protocol call (like Ping or TablesStatus).
 #define DBMS_DEFAULT_SYNC_REQUEST_TIMEOUT_SEC 5
 #define DBMS_DEFAULT_POLL_INTERVAL 10
@@ -71,6 +74,9 @@
 /// Minimum revision supporting OpenTelemetry
 #define DBMS_MIN_REVISION_WITH_OPENTELEMETRY 54442
 
+
+#define DBMS_CLUSTER_PROCESSING_PROTOCOL_VERSION 1
+
 /// Minimum revision supporting interserver secret.
 #define DBMS_MIN_REVISION_WITH_INTERSERVER_SECRET 54441
 
@@ -78,8 +84,9 @@
 #define DBMS_MIN_REVISION_WITH_REFERER_IN_CLIENT_INFO 54447
 
 /// Version of ClickHouse TCP protocol. Increment it manually when you change the protocol.
-#define DBMS_TCP_PROTOCOL_VERSION 54447
+#define DBMS_TCP_PROTOCOL_VERSION 54448
 
+#define DBMS_MIN_PROTOCOL_VERSION_WITH_DISTRIBUTED_DEPTH 54448
 /// The boundary on which the blocks for asynchronous file operations should be aligned.
 #define DEFAULT_AIO_FILE_BLOCK_SIZE 4096
 
diff --git a/src/Core/ExternalTable.cpp b/src/Core/ExternalTable.cpp
index afc9fe00ef5..87945dd1ce6 100644
--- a/src/Core/ExternalTable.cpp
+++ b/src/Core/ExternalTable.cpp
@@ -31,11 +31,11 @@ namespace ErrorCodes
 }
 
 
-ExternalTableDataPtr BaseExternalTable::getData(const Context & context)
+ExternalTableDataPtr BaseExternalTable::getData(ContextPtr context)
 {
     initReadBuffer();
     initSampleBlock();
-    auto input = context.getInputFormat(format, *read_buffer, sample_block, DEFAULT_BLOCK_SIZE);
+    auto input = context->getInputFormat(format, *read_buffer, sample_block, DEFAULT_BLOCK_SIZE);
     auto stream = std::make_shared<AsynchronousBlockInputStream>(input);
 
     auto data = std::make_unique<ExternalTableData>();
@@ -127,7 +127,7 @@ ExternalTable::ExternalTable(const boost::program_options::variables_map & exter
 
 void ExternalTablesHandler::handlePart(const Poco::Net::MessageHeader & header, ReadBuffer & stream)
 {
-    const Settings & settings = context.getSettingsRef();
+    const Settings & settings = getContext()->getSettingsRef();
 
     if (settings.http_max_multipart_form_data_size)
         read_buffer = std::make_unique<LimitReadBuffer>(
@@ -152,14 +152,14 @@ void ExternalTablesHandler::handlePart(const Poco::Net::MessageHeader & header,
     else
         throw Exception("Neither structure nor types have not been provided for external table " + name + ". Use fields " + name + "_structure or " + name + "_types to do so.", ErrorCodes::BAD_ARGUMENTS);
 
-    ExternalTableDataPtr data = getData(context);
+    ExternalTableDataPtr data = getData(getContext());
 
     /// Create table
     NamesAndTypesList columns = sample_block.getNamesAndTypesList();
-    auto temporary_table = TemporaryTableHolder(context, ColumnsDescription{columns}, {});
+    auto temporary_table = TemporaryTableHolder(getContext(), ColumnsDescription{columns}, {});
     auto storage = temporary_table.getTable();
-    context.addExternalTable(data->table_name, std::move(temporary_table));
-    BlockOutputStreamPtr output = storage->write(ASTPtr(), storage->getInMemoryMetadataPtr(), context);
+    getContext()->addExternalTable(data->table_name, std::move(temporary_table));
+    BlockOutputStreamPtr output = storage->write(ASTPtr(), storage->getInMemoryMetadataPtr(), getContext());
 
     /// Write data
     data->pipe->resize(1);
diff --git a/src/Core/ExternalTable.h b/src/Core/ExternalTable.h
index aa15846d48a..fcefa3d7fe3 100644
--- a/src/Core/ExternalTable.h
+++ b/src/Core/ExternalTable.h
@@ -2,6 +2,7 @@
 
 #include <Client/Connection.h>
 #include <Core/Block.h>
+#include <Interpreters/Context_fwd.h>
 #include <IO/ReadBuffer.h>
 #include <Server/HTTP/HTMLForm.h>
 
@@ -11,30 +12,21 @@
 #include <vector>
 
 
-namespace Poco
+namespace Poco::Net
 {
-    namespace Net
-    {
-        class NameValueCollection;
-        class MessageHeader;
-    }
+class NameValueCollection;
+class MessageHeader;
 }
 
-namespace boost
+namespace boost::program_options
 {
-    namespace program_options
-    {
-        class variables_map;
-    }
+class variables_map;
 }
 
 
 namespace DB
 {
 
-class Context;
-
-
 /// The base class containing the basic information about external table and
 /// basic functions for extracting this information from text fields.
 class BaseExternalTable
@@ -56,7 +48,7 @@ public:
     virtual void initReadBuffer() {}
 
     /// Get the table data - a pair (a stream with the contents of the table, the name of the table)
-    ExternalTableDataPtr getData(const Context & context);
+    ExternalTableDataPtr getData(ContextPtr context);
 
 protected:
     /// Clear all accumulated information
@@ -88,15 +80,14 @@ public:
 /// Parsing of external table used when sending tables via http
 /// The `handlePart` function will be called for each table passed,
 /// so it's also necessary to call `clean` at the end of the `handlePart`.
-class ExternalTablesHandler : public HTMLForm::PartHandler, BaseExternalTable
+class ExternalTablesHandler : public HTMLForm::PartHandler, BaseExternalTable, WithContext
 {
 public:
-    ExternalTablesHandler(Context & context_, const Poco::Net::NameValueCollection & params_) : context(context_), params(params_) {}
+    ExternalTablesHandler(ContextPtr context_, const Poco::Net::NameValueCollection & params_) : WithContext(context_), params(params_) {}
 
     void handlePart(const Poco::Net::MessageHeader & header, ReadBuffer & stream) override;
 
 private:
-    Context & context;
     const Poco::Net::NameValueCollection & params;
 };
 
diff --git a/src/Core/Field.cpp b/src/Core/Field.cpp
index 93107d7bb2c..8aa79b0bbe1 100644
--- a/src/Core/Field.cpp
+++ b/src/Core/Field.cpp
@@ -452,7 +452,7 @@ template <> bool decimalLessOrEqual(DateTime64 x, DateTime64 y, UInt32 x_scale,
 
 inline void writeText(const Null &, WriteBuffer & buf)
 {
-    writeText(std::string("Null"), buf);
+    writeText(std::string("NULL"), buf);
 }
 
 String toString(const Field & x)
diff --git a/src/Core/Field.h b/src/Core/Field.h
index 3a52186167f..5c4c2e165ad 100644
--- a/src/Core/Field.h
+++ b/src/Core/Field.h
@@ -8,6 +8,7 @@
 
 #include <Common/Exception.h>
 #include <Common/UInt128.h>
+#include <Common/AllocatorWithMemoryTracking.h>
 #include <Core/Types.h>
 #include <Core/Defines.h>
 #include <Core/DecimalFunctions.h>
@@ -35,7 +36,7 @@ template <typename T>
 using NearestFieldType = typename NearestFieldTypeImpl<T>::Type;
 
 class Field;
-using FieldVector = std::vector<Field>;
+using FieldVector = std::vector<Field, AllocatorWithMemoryTracking<Field>>;
 
 /// Array and Tuple use the same storage type -- FieldVector, but we declare
 /// distinct types for them, so that the caller can choose whether it wants to
@@ -95,7 +96,7 @@ template <typename T> bool decimalEqual(T x, T y, UInt32 x_scale, UInt32 y_scale
 template <typename T> bool decimalLess(T x, T y, UInt32 x_scale, UInt32 y_scale);
 template <typename T> bool decimalLessOrEqual(T x, T y, UInt32 x_scale, UInt32 y_scale);
 
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
 #endif
@@ -158,7 +159,7 @@ private:
     T dec;
     UInt32 scale;
 };
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic pop
 #endif
 
@@ -399,10 +400,10 @@ public:
 
 
     template <typename T>
-    T & get();
+    NearestFieldType<std::decay_t<T>> & get();
 
     template <typename T>
-    const T & get() const
+    const auto & get() const
     {
         auto mutable_this = const_cast<std::decay_t<decltype(*this)> *>(this);
         return mutable_this->get<T>();
@@ -436,21 +437,10 @@ public:
         return true;
     }
 
-    template <typename T> T & safeGet()
-    {
-        const Types::Which requested = TypeToEnum<std::decay_t<T>>::value;
-        if (which != requested)
-            throw Exception("Bad get: has " + std::string(getTypeName()) + ", requested " + std::string(Types::toString(requested)), ErrorCodes::BAD_GET);
-        return get<T>();
-    }
+    template <typename T> auto & safeGet() const
+    { return const_cast<Field *>(this)->safeGet<T>(); }
 
-    template <typename T> const T & safeGet() const
-    {
-        const Types::Which requested = TypeToEnum<std::decay_t<T>>::value;
-        if (which != requested)
-            throw Exception("Bad get: has " + std::string(getTypeName()) + ", requested " + std::string(Types::toString(requested)), ErrorCodes::BAD_GET);
-        return get<T>();
-    }
+    template <typename T> auto & safeGet();
 
     bool operator< (const Field & rhs) const
     {
@@ -573,7 +563,7 @@ public:
         {
             case Types::Null:    return f(field.template get<Null>());
 // gcc 8.2.1
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
 #endif
@@ -593,7 +583,7 @@ public:
             case Types::Int128: return f(field.template get<Int128>());
             case Types::UInt256: return f(field.template get<UInt256>());
             case Types::Int256: return f(field.template get<Int256>());
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic pop
 #endif
         }
@@ -778,22 +768,40 @@ inline constexpr bool isInt64FieldType(Field::Types::Which t)
 
 // Field value getter with type checking in debug builds.
 template <typename T>
-T & Field::get()
+NearestFieldType<std::decay_t<T>> & Field::get()
 {
-    using ValueType = std::decay_t<T>;
+    // Before storing the value in the Field, we static_cast it to the field
+    // storage type, so here we return the value of storage type as well.
+    // Otherwise, it is easy to make a mistake of reinterpret_casting the stored
+    // value to a different and incompatible type.
+    // For example, a Float32 value is stored as Float64, and it is incorrect to
+    // return a reference to this value as Float32.
+    using StoredType = NearestFieldType<std::decay_t<T>>;
 
 #ifndef NDEBUG
     // Disregard signedness when converting between int64 types.
-    constexpr Field::Types::Which target = TypeToEnum<NearestFieldType<ValueType>>::value;
+    constexpr Field::Types::Which target = TypeToEnum<StoredType>::value;
     if (target != which
            && (!isInt64FieldType(target) || !isInt64FieldType(which)))
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Invalid Field get from type {} to type {}", Types::toString(which), Types::toString(target));
 #endif
 
-    ValueType * MAY_ALIAS ptr = reinterpret_cast<ValueType *>(&storage);
+    StoredType * MAY_ALIAS ptr = reinterpret_cast<StoredType *>(&storage);
+
     return *ptr;
 }
 
+
+template <typename T>
+auto & Field::safeGet()
+{
+    const Types::Which requested = TypeToEnum<NearestFieldType<std::decay_t<T>>>::value;
+    if (which != requested)
+        throw Exception("Bad get: has " + std::string(getTypeName()) + ", requested " + std::string(Types::toString(requested)), ErrorCodes::BAD_GET);
+    return get<T>();
+}
+
+
 template <typename T>
 T & Field::reinterpret()
 {
@@ -946,3 +954,26 @@ void writeFieldText(const Field & x, WriteBuffer & buf);
 String toString(const Field & x);
 
 }
+
+template <>
+struct fmt::formatter<DB::Field>
+{
+    constexpr auto parse(format_parse_context & ctx)
+    {
+        auto it = ctx.begin();
+        auto end = ctx.end();
+
+        /// Only support {}.
+        if (it != end && *it != '}')
+            throw format_error("invalid format");
+
+        return it;
+    }
+
+    template <typename FormatContext>
+    auto format(const DB::Field & x, FormatContext & ctx)
+    {
+        return format_to(ctx.out(), "{}", toString(x));
+    }
+};
+
diff --git a/src/Core/MySQL/Authentication.cpp b/src/Core/MySQL/Authentication.cpp
index e685ad0394d..b8dff9972c7 100644
--- a/src/Core/MySQL/Authentication.cpp
+++ b/src/Core/MySQL/Authentication.cpp
@@ -73,7 +73,7 @@ Native41::Native41(const String & password, const String & auth_plugin_data)
 }
 
 void Native41::authenticate(
-    const String & user_name, std::optional<String> auth_response, Context & context,
+    const String & user_name, std::optional<String> auth_response, ContextPtr context,
     std::shared_ptr<PacketEndpoint> packet_endpoint, bool, const Poco::Net::SocketAddress & address)
 {
     if (!auth_response)
@@ -86,15 +86,17 @@ void Native41::authenticate(
 
     if (auth_response->empty())
     {
-        context.setUser(user_name, "", address);
+        context->setUser(user_name, "", address);
         return;
     }
 
     if (auth_response->size() != Poco::SHA1Engine::DIGEST_SIZE)
-        throw Exception("Wrong size of auth response. Expected: " + std::to_string(Poco::SHA1Engine::DIGEST_SIZE) + " bytes, received: " + std::to_string(auth_response->size()) + " bytes.",
-                        ErrorCodes::UNKNOWN_EXCEPTION);
+        throw Exception(
+            "Wrong size of auth response. Expected: " + std::to_string(Poco::SHA1Engine::DIGEST_SIZE)
+                + " bytes, received: " + std::to_string(auth_response->size()) + " bytes.",
+            ErrorCodes::UNKNOWN_EXCEPTION);
 
-    auto user = context.getAccessControlManager().read<User>(user_name);
+    auto user = context->getAccessControlManager().read<User>(user_name);
 
     Poco::SHA1Engine::Digest double_sha1_value = user->authentication.getPasswordDoubleSHA1();
     assert(double_sha1_value.size() == Poco::SHA1Engine::DIGEST_SIZE);
@@ -109,7 +111,7 @@ void Native41::authenticate(
     {
         password_sha1[i] = digest[i] ^ static_cast<unsigned char>((*auth_response)[i]);
     }
-    context.setUser(user_name, password_sha1, address);
+    context->setUser(user_name, password_sha1, address);
 }
 
 #if USE_SSL
@@ -134,7 +136,7 @@ Sha256Password::Sha256Password(RSA & public_key_, RSA & private_key_, Poco::Logg
 }
 
 void Sha256Password::authenticate(
-    const String & user_name, std::optional<String> auth_response, Context & context,
+    const String & user_name, std::optional<String> auth_response, ContextPtr context,
     std::shared_ptr<PacketEndpoint> packet_endpoint, bool is_secure_connection, const Poco::Net::SocketAddress & address)
 {
     if (!auth_response)
@@ -229,7 +231,7 @@ void Sha256Password::authenticate(
         password.pop_back();
     }
 
-    context.setUser(user_name, password, address);
+    context->setUser(user_name, password, address);
 }
 
 #endif
diff --git a/src/Core/MySQL/Authentication.h b/src/Core/MySQL/Authentication.h
index e1b7c174139..5358e2da737 100644
--- a/src/Core/MySQL/Authentication.h
+++ b/src/Core/MySQL/Authentication.h
@@ -32,7 +32,7 @@ public:
     virtual String getAuthPluginData() = 0;
 
     virtual void authenticate(
-        const String & user_name, std::optional<String> auth_response, Context & context,
+        const String & user_name, std::optional<String> auth_response, ContextPtr context,
         std::shared_ptr<PacketEndpoint> packet_endpoint, bool is_secure_connection, const Poco::Net::SocketAddress & address) = 0;
 };
 
@@ -49,7 +49,7 @@ public:
     String getAuthPluginData() override { return scramble; }
 
     void authenticate(
-        const String & user_name, std::optional<String> auth_response, Context & context,
+        const String & user_name, std::optional<String> auth_response, ContextPtr context,
         std::shared_ptr<PacketEndpoint> packet_endpoint, bool /* is_secure_connection */, const Poco::Net::SocketAddress & address) override;
 
 private:
@@ -69,7 +69,7 @@ public:
     String getAuthPluginData() override { return scramble; }
 
     void authenticate(
-        const String & user_name, std::optional<String> auth_response, Context & context,
+        const String & user_name, std::optional<String> auth_response, ContextPtr context,
         std::shared_ptr<PacketEndpoint> packet_endpoint, bool is_secure_connection, const Poco::Net::SocketAddress & address) override;
 
 private:
diff --git a/src/Core/MySQL/MySQLClient.cpp b/src/Core/MySQL/MySQLClient.cpp
index e41b4128738..3650818c543 100644
--- a/src/Core/MySQL/MySQLClient.cpp
+++ b/src/Core/MySQL/MySQLClient.cpp
@@ -68,6 +68,7 @@ void MySQLClient::disconnect()
         socket->close();
     socket = nullptr;
     connected = false;
+    seq = 0;
 }
 
 /// https://dev.mysql.com/doc/internals/en/connection-phase-packets.html
diff --git a/src/Core/MySQL/MySQLReplication.cpp b/src/Core/MySQL/MySQLReplication.cpp
index 1b202c4edb4..7e3f68983be 100644
--- a/src/Core/MySQL/MySQLReplication.cpp
+++ b/src/Core/MySQL/MySQLReplication.cpp
@@ -17,6 +17,7 @@ namespace ErrorCodes
     extern const int UNKNOWN_EXCEPTION;
     extern const int LOGICAL_ERROR;
     extern const int ATTEMPT_TO_READ_AFTER_EOF;
+    extern const int CANNOT_READ_ALL_DATA;
 }
 
 namespace MySQLReplication
@@ -420,8 +421,8 @@ namespace MySQLReplication
                         UInt32 i24 = 0;
                         payload.readStrict(reinterpret_cast<char *>(&i24), 3);
 
-                        DayNum date_day_number = DateLUT::instance().makeDayNum(
-                            static_cast<int>((i24 >> 9) & 0x7fff), static_cast<int>((i24 >> 5) & 0xf), static_cast<int>(i24 & 0x1f));
+                        const DayNum date_day_number(DateLUT::instance().makeDayNum(
+                            static_cast<int>((i24 >> 9) & 0x7fff), static_cast<int>((i24 >> 5) & 0xf), static_cast<int>(i24 & 0x1f)).toUnderType());
 
                         row.push_back(Field(date_day_number.toUnderType()));
                         break;
@@ -443,7 +444,7 @@ namespace MySQLReplication
                             row.push_back(Field{UInt32(date_time)});
                         else
                         {
-                            DB::DecimalUtils::DecimalComponents<DateTime64::NativeType> components{
+                            DB::DecimalUtils::DecimalComponents<DateTime64> components{
                                 static_cast<DateTime64::NativeType>(date_time), 0};
 
                             components.fractional = fsp;
@@ -462,7 +463,7 @@ namespace MySQLReplication
                             row.push_back(Field{sec});
                         else
                         {
-                            DB::DecimalUtils::DecimalComponents<DateTime64::NativeType> components{
+                            DB::DecimalUtils::DecimalComponents<DateTime64> components{
                                 static_cast<DateTime64::NativeType>(sec), 0};
 
                             components.fractional = fsp;
@@ -740,7 +741,7 @@ namespace MySQLReplication
         switch (header)
         {
             case PACKET_EOF:
-                throw ReplicationError("Master maybe lost", ErrorCodes::UNKNOWN_EXCEPTION);
+                throw ReplicationError("Master maybe lost", ErrorCodes::CANNOT_READ_ALL_DATA);
             case PACKET_ERR:
                 ERRPacket err;
                 err.readPayloadWithUnpacked(payload);
diff --git a/src/Core/MySQL/PacketsProtocolText.cpp b/src/Core/MySQL/PacketsProtocolText.cpp
index 62efe549b33..0494a146c47 100644
--- a/src/Core/MySQL/PacketsProtocolText.cpp
+++ b/src/Core/MySQL/PacketsProtocolText.cpp
@@ -12,7 +12,7 @@ namespace MySQLProtocol
 namespace ProtocolText
 {
 
-ResultSetRow::ResultSetRow(const DataTypes & data_types, const Columns & columns_, int row_num_)
+ResultSetRow::ResultSetRow(const Serializations & serializations, const Columns & columns_, int row_num_)
     : columns(columns_), row_num(row_num_)
 {
     for (size_t i = 0; i < columns.size(); i++)
@@ -25,7 +25,7 @@ ResultSetRow::ResultSetRow(const DataTypes & data_types, const Columns & columns
         else
         {
             WriteBufferFromOwnString ostr;
-            data_types[i]->serializeAsText(*columns[i], row_num, ostr, FormatSettings());
+            serializations[i]->serializeText(*columns[i], row_num, ostr, FormatSettings());
             payload_size += getLengthEncodedStringSize(ostr.str());
             serialized.push_back(std::move(ostr.str()));
         }
diff --git a/src/Core/MySQL/PacketsProtocolText.h b/src/Core/MySQL/PacketsProtocolText.h
index b54b1c5ca19..aeeedc4dbf8 100644
--- a/src/Core/MySQL/PacketsProtocolText.h
+++ b/src/Core/MySQL/PacketsProtocolText.h
@@ -76,7 +76,7 @@ protected:
     void writePayloadImpl(WriteBuffer & buffer) const override;
 
 public:
-    ResultSetRow(const DataTypes & data_types, const Columns & columns_, int row_num_);
+    ResultSetRow(const Serializations & serializations, const Columns & columns_, int row_num_);
 };
 
 class ComFieldList : public LimitedReadPacket
diff --git a/src/Core/NamesAndTypes.cpp b/src/Core/NamesAndTypes.cpp
index e96ce1824d2..57d29c96c53 100644
--- a/src/Core/NamesAndTypes.cpp
+++ b/src/Core/NamesAndTypes.cpp
@@ -6,7 +6,6 @@
 #include <IO/WriteHelpers.h>
 #include <IO/ReadBufferFromString.h>
 #include <IO/WriteBufferFromString.h>
-#include <sparsehash/dense_hash_map>
 
 
 namespace DB
@@ -23,7 +22,9 @@ NameAndTypePair::NameAndTypePair(
     : name(name_in_storage_ + (subcolumn_name_.empty() ? "" : "." + subcolumn_name_))
     , type(subcolumn_type_)
     , type_in_storage(type_in_storage_)
-    , subcolumn_delimiter_position(name_in_storage_.size()) {}
+    , subcolumn_delimiter_position(subcolumn_name_.empty() ? std::nullopt : std::make_optional(name_in_storage_.size()))
+{
+}
 
 String NameAndTypePair::getNameInStorage() const
 {
diff --git a/src/Core/NamesAndTypes.h b/src/Core/NamesAndTypes.h
index dad031a543c..fc86c7f6a1d 100644
--- a/src/Core/NamesAndTypes.h
+++ b/src/Core/NamesAndTypes.h
@@ -63,7 +63,7 @@ using NamesAndTypes = std::vector<NameAndTypePair>;
 class NamesAndTypesList : public std::list<NameAndTypePair>
 {
 public:
-    NamesAndTypesList() {}
+    NamesAndTypesList() = default;
 
     NamesAndTypesList(std::initializer_list<NameAndTypePair> init) : std::list<NameAndTypePair>(init) {}
 
diff --git a/src/Core/PostgreSQLProtocol.h b/src/Core/PostgreSQLProtocol.h
index 471811e969b..4c41ead7a02 100644
--- a/src/Core/PostgreSQLProtocol.h
+++ b/src/Core/PostgreSQLProtocol.h
@@ -797,15 +797,15 @@ namespace PGAuthentication
 class AuthenticationMethod
 {
 protected:
-    void setPassword(
+    static void setPassword(
         const String & user_name,
         const String & password,
-        Context & context,
+        ContextPtr context,
         Messaging::MessageTransport & mt,
         const Poco::Net::SocketAddress & address)
     {
         try {
-            context.setUser(user_name, password, address);
+            context->setUser(user_name, password, address);
         }
         catch (const Exception &)
         {
@@ -819,7 +819,7 @@ protected:
 public:
     virtual void authenticate(
         const String & user_name,
-        Context & context,
+        ContextPtr context,
         Messaging::MessageTransport & mt,
         const Poco::Net::SocketAddress & address) = 0;
 
@@ -832,10 +832,13 @@ class NoPasswordAuth : public AuthenticationMethod
 {
 public:
     void authenticate(
-        const String & /* user_name */,
-        Context & /* context */,
-        Messaging::MessageTransport & /* mt */,
-        const Poco::Net::SocketAddress & /* address */) override {}
+        const String & user_name,
+        ContextPtr context,
+        Messaging::MessageTransport & mt,
+        const Poco::Net::SocketAddress & address) override
+    {
+        setPassword(user_name, "", context, mt, address);
+    }
 
     Authentication::Type getType() const override
     {
@@ -848,7 +851,7 @@ class CleartextPasswordAuth : public AuthenticationMethod
 public:
     void authenticate(
         const String & user_name,
-        Context & context,
+        ContextPtr context,
         Messaging::MessageTransport & mt,
         const Poco::Net::SocketAddress & address) override
     {
@@ -891,11 +894,11 @@ public:
 
     void authenticate(
         const String & user_name,
-        Context & context,
+        ContextPtr context,
         Messaging::MessageTransport & mt,
         const Poco::Net::SocketAddress & address)
     {
-        auto user = context.getAccessControlManager().read<User>(user_name);
+        auto user = context->getAccessControlManager().read<User>(user_name);
         Authentication::Type user_auth_type = user->authentication.getType();
 
         if (type_to_method.find(user_auth_type) != type_to_method.end())
diff --git a/src/Core/Protocol.h b/src/Core/Protocol.h
index df51a0cb61a..92e780104b5 100644
--- a/src/Core/Protocol.h
+++ b/src/Core/Protocol.h
@@ -76,8 +76,10 @@ namespace Protocol
             Log = 10,                 /// System logs of the query execution
             TableColumns = 11,        /// Columns' description for default values calculation
             PartUUIDs = 12,           /// List of unique parts ids.
-
-            MAX = PartUUIDs,
+            ReadTaskRequest = 13,     /// String (UUID) describes a request for which next task is needed
+                                      /// This is such an inverted logic, where server sends requests
+                                      /// And client returns back response
+            MAX = ReadTaskRequest,
         };
 
         /// NOTE: If the type of packet argument would be Enum, the comparison packet >= 0 && packet < 10
@@ -100,6 +102,7 @@ namespace Protocol
                 "Log",
                 "TableColumns",
                 "PartUUIDs",
+                "ReadTaskRequest"
             };
             return packet <= MAX
                 ? data[packet]
@@ -135,8 +138,9 @@ namespace Protocol
             KeepAlive = 6,           /// Keep the connection alive
             Scalar = 7,              /// A block of data (compressed or not).
             IgnoredPartUUIDs = 8,    /// List of unique parts ids to exclude from query processing
+            ReadTaskResponse = 9,     /// TODO:
 
-            MAX = IgnoredPartUUIDs,
+            MAX = ReadTaskResponse,
         };
 
         inline const char * toString(UInt64 packet)
@@ -151,6 +155,7 @@ namespace Protocol
                 "KeepAlive",
                 "Scalar",
                 "IgnoredPartUUIDs",
+                "ReadTaskResponse",
             };
             return packet <= MAX
                 ? data[packet]
diff --git a/src/Core/Settings.h b/src/Core/Settings.h
index 1de89aa6047..eaa5e2d34f8 100644
--- a/src/Core/Settings.h
+++ b/src/Core/Settings.h
@@ -55,6 +55,10 @@ class IColumn;
     M(Seconds, receive_timeout, DBMS_DEFAULT_RECEIVE_TIMEOUT_SEC, "", 0) \
     M(Seconds, send_timeout, DBMS_DEFAULT_SEND_TIMEOUT_SEC, "", 0) \
     M(Seconds, tcp_keep_alive_timeout, 0, "The time in seconds the connection needs to remain idle before TCP starts sending keepalive probes", 0) \
+    M(Milliseconds, hedged_connection_timeout_ms, DBMS_DEFAULT_HEDGED_CONNECTION_TIMEOUT_MS, "Connection timeout for establishing connection with replica for Hedged requests", 0) \
+    M(Milliseconds, receive_data_timeout_ms, DBMS_DEFAULT_RECEIVE_DATA_TIMEOUT_MS, "Connection timeout for receiving first packet of data or packet with positive progress from replica", 0) \
+    M(Bool, use_hedged_requests, false, "Use hedged requests for distributed queries", 0) \
+    M(Bool, allow_changing_replica_until_first_data_packet, false, "Allow HedgedConnections to change replica until receiving first data packet", 0) \
     M(Milliseconds, queue_max_wait_ms, 0, "The wait time in the request queue, if the number of concurrent requests exceeds the maximum.", 0) \
     M(Milliseconds, connection_pool_max_wait_ms, 0, "The wait time when the connection pool is full.", 0) \
     M(Milliseconds, replace_running_query_max_wait_ms, 5000, "The wait time for running query with the same query_id to finish when setting 'replace_running_query' is active.", 0) \
@@ -66,6 +70,7 @@ class IColumn;
     M(UInt64, connections_with_failover_max_tries, DBMS_CONNECTION_POOL_WITH_FAILOVER_DEFAULT_MAX_TRIES, "The maximum number of attempts to connect to replicas.", 0) \
     M(UInt64, s3_min_upload_part_size, 512*1024*1024, "The minimum size of part to upload during multipart upload to S3.", 0) \
     M(UInt64, s3_max_single_part_upload_size, 64*1024*1024, "The maximum size of object to upload using singlepart upload to S3.", 0) \
+    M(UInt64, s3_max_single_read_retries, 4, "The maximum number of retries during single S3 read.", 0) \
     M(UInt64, s3_max_redirects, 10, "Max number of S3 redirects hops allowed.", 0) \
     M(UInt64, s3_max_connections, 1024, "The maximum number of connections per server.", 0) \
     M(Bool, extremes, false, "Calculate minimums and maximums of the result columns. They can be output in JSON-formats.", IMPORTANT) \
@@ -74,7 +79,7 @@ class IColumn;
     M(UInt64, background_buffer_flush_schedule_pool_size, 16, "Number of threads performing background flush for tables with Buffer engine. Only has meaning at server startup.", 0) \
     M(UInt64, background_pool_size, 16, "Number of threads performing background work for tables (for example, merging in merge tree). Only has meaning at server startup.", 0) \
     M(UInt64, background_move_pool_size, 8, "Number of threads performing background moves for tables. Only has meaning at server startup.", 0) \
-    M(UInt64, background_fetches_pool_size, 3, "Number of threads performing background fetches for replicated tables. Only has meaning at server startup.", 0) \
+    M(UInt64, background_fetches_pool_size, 8, "Number of threads performing background fetches for replicated tables. Only has meaning at server startup.", 0) \
     M(UInt64, background_schedule_pool_size, 16, "Number of threads performing background tasks for replicated tables, dns cache updates. Only has meaning at server startup.", 0) \
     M(UInt64, background_message_broker_schedule_pool_size, 16, "Number of threads performing background tasks for message streaming. Only has meaning at server startup.", 0) \
     M(UInt64, background_distributed_schedule_pool_size, 16, "Number of threads performing background tasks for distributed sends. Only has meaning at server startup.", 0) \
@@ -112,7 +117,9 @@ class IColumn;
     M(UInt64, parallel_distributed_insert_select, 0, "Process distributed INSERT SELECT query in the same cluster on local tables on every shard, if 1 SELECT is executed on each shard, if 2 SELECT and INSERT is executed on each shard", 0) \
     M(UInt64, distributed_group_by_no_merge, 0, "If 1, Do not merge aggregation states from different servers for distributed query processing - in case it is for certain that there are different keys on different shards. If 2 - same as 1 but also apply ORDER BY and LIMIT stages", 0) \
     M(Bool, optimize_distributed_group_by_sharding_key, false, "Optimize GROUP BY sharding_key queries (by avoiding costly aggregation on the initiator server).", 0) \
+    M(UInt64, optimize_skip_unused_shards_limit, 1000, "Limit for number of sharding key values, turns off optimize_skip_unused_shards if the limit is reached", 0) \
     M(Bool, optimize_skip_unused_shards, false, "Assumes that data is distributed by sharding_key. Optimization to skip unused shards if SELECT query filters by sharding_key.", 0) \
+    M(Bool, optimize_skip_unused_shards_rewrite_in, true, "Rewrite IN in query for remote shards to exclude values that does not belong to the shard (requires optimize_skip_unused_shards)", 0) \
     M(Bool, allow_nondeterministic_optimize_skip_unused_shards, false, "Allow non-deterministic functions (includes dictGet) in sharding_key for optimize_skip_unused_shards", 0) \
     M(UInt64, force_optimize_skip_unused_shards, 0, "Throw an exception if unused shards cannot be skipped (1 - throw only if the table has the sharding key, 2 - always throw.", 0) \
     M(UInt64, optimize_skip_unused_shards_nesting, 0, "Same as optimize_skip_unused_shards, but accept nesting level until which it will work.", 0) \
@@ -211,14 +218,20 @@ class IColumn;
     \
     M(Bool, insert_distributed_sync, false, "If setting is enabled, insert query into distributed waits until data will be sent to all nodes in cluster.", 0) \
     M(UInt64, insert_distributed_timeout, 0, "Timeout for insert query into distributed. Setting is used only with insert_distributed_sync enabled. Zero value means no timeout.", 0) \
-    M(Int64, distributed_ddl_task_timeout, 180, "Timeout for DDL query responses from all hosts in cluster. If a ddl request has not been performed on all hosts, a response will contain a timeout error and a request will be executed in an async mode. Negative value means infinite.", 0) \
+    M(Int64, distributed_ddl_task_timeout, 180, "Timeout for DDL query responses from all hosts in cluster. If a ddl request has not been performed on all hosts, a response will contain a timeout error and a request will be executed in an async mode. Negative value means infinite. Zero means async mode.", 0) \
     M(Milliseconds, stream_flush_interval_ms, 7500, "Timeout for flushing data from streaming storages.", 0) \
     M(Milliseconds, stream_poll_timeout_ms, 500, "Timeout for polling data from/to streaming storages.", 0) \
     \
+    /** Settings for testing hedged requests */ \
+    M(Milliseconds, sleep_in_send_tables_status_ms, 0, "Time to sleep in sending tables status response in TCPHandler", 0) \
+    M(Milliseconds, sleep_in_send_data_ms, 0, "Time to sleep in sending data in TCPHandler", 0) \
+    M(UInt64, unknown_packet_in_send_data, 0, "Send unknown packet instead of data Nth data packet", 0) \
+    \
     M(Bool, insert_allow_materialized_columns, 0, "If setting is enabled, Allow materialized columns in INSERT.", 0) \
     M(Seconds, http_connection_timeout, DEFAULT_HTTP_READ_BUFFER_CONNECTION_TIMEOUT, "HTTP connection timeout.", 0) \
     M(Seconds, http_send_timeout, DEFAULT_HTTP_READ_BUFFER_TIMEOUT, "HTTP send timeout", 0) \
     M(Seconds, http_receive_timeout, DEFAULT_HTTP_READ_BUFFER_TIMEOUT, "HTTP receive timeout", 0) \
+    M(UInt64, http_max_uri_size, 1048576, "Maximum URI length of HTTP request", 0) \
     M(Bool, optimize_throw_if_noop, false, "If setting is enabled and OPTIMIZE query didn't actually assign a merge then an explanatory exception is thrown", 0) \
     M(Bool, use_index_for_in_with_subqueries, true, "Try using an index if there is a subquery or a table expression on the right side of the IN operator.", 0) \
     M(Bool, joined_subquery_requires_alias, true, "Force joined subqueries and table functions to have aliases for correct name qualification.", 0) \
@@ -231,6 +244,7 @@ class IColumn;
     M(Bool, metrics_perf_events_enabled, false, "If enabled, some of the perf events will be measured throughout queries' execution.", 0) \
     M(String, metrics_perf_events_list, "", "Comma separated list of perf metrics that will be measured throughout queries' execution. Empty means all events. See PerfEventInfo in sources for the available events.", 0) \
     M(Float, opentelemetry_start_trace_probability, 0., "Probability to start an OpenTelemetry trace for an incoming query.", 0) \
+    M(Bool, prefer_column_name_to_alias, false, "Prefer using column names instead of aliases if possible.", 0) \
     \
     \
     /** Limits during query execution are part of the settings. \
@@ -240,8 +254,6 @@ class IColumn;
       * Almost all limits apply to each stream individually. \
       */ \
     \
-    M(UInt64, limit, 0, "Limit on read rows from the most 'end' result for select query, default 0 means no limit length", 0) \
-    M(UInt64, offset, 0, "Offset on read rows from the most 'end' result for select query", 0) \
     M(UInt64, max_rows_to_read, 0, "Limit on read rows from the most 'deep' sources. That is, only in the deepest subquery. When reading from a remote server, it is only checked on a remote server.", 0) \
     M(UInt64, max_bytes_to_read, 0, "Limit on read bytes (after decompression) from the most 'deep' sources. That is, only in the deepest subquery. When reading from a remote server, it is only checked on a remote server.", 0) \
     M(OverflowMode, read_overflow_mode, OverflowMode::THROW, "What to do when the limit is exceeded.", 0) \
@@ -347,7 +359,7 @@ class IColumn;
     M(UInt64, read_in_order_two_level_merge_threshold, 100, "Minimal number of parts to read to run preliminary merge step during multithread reading in order of primary key.", 0) \
     M(Bool, low_cardinality_allow_in_native_format, true, "Use LowCardinality type in Native format. Otherwise, convert LowCardinality columns to ordinary for select query, and convert ordinary columns to required LowCardinality for insert query.", 0) \
     M(Bool, cancel_http_readonly_queries_on_client_close, false, "Cancel HTTP readonly queries when a client closes the connection without waiting for response.", 0) \
-    M(Bool, external_table_functions_use_nulls, true, "If it is set to true, external table functions will implicitly use Nullable type if needed. Otherwise NULLs will be substituted with default values. Currently supported only by 'mysql' and 'odbc' table functions.", 0) \
+    M(Bool, external_table_functions_use_nulls, true, "If it is set to true, external table functions will implicitly use Nullable type if needed. Otherwise NULLs will be substituted with default values. Currently supported only by 'mysql', 'postgresql' and 'odbc' table functions.", 0) \
     \
     M(Bool, allow_hyperscan, true, "Allow functions that use Hyperscan library. Disable to avoid potentially long compilation times and excessive resource usage.", 0) \
     M(Bool, allow_simdjson, true, "Allow using simdjson library in 'JSON*' functions if AVX2 instructions are available. If disabled rapidjson will be used.", 0) \
@@ -358,6 +370,11 @@ class IColumn;
     M(Bool, check_query_single_value_result, true, "Return check query result as single 1/0 value", 0) \
     M(Bool, allow_drop_detached, false, "Allow ALTER TABLE ... DROP DETACHED PART[ITION] ... queries", 0) \
     \
+    M(UInt64, postgresql_connection_pool_size, 16, "Connection pool size for PostgreSQL table engine and database engine.", 0) \
+    M(Int64, postgresql_connection_pool_wait_timeout, -1, "Connection pool push/pop timeout on empty pool for PostgreSQL table engine and database engine. By default it will block on empty pool.", 0) \
+    M(UInt64, glob_expansion_max_elements, 1000, "Maximum number of allowed addresses (For external storages, table functions, etc).", 0) \
+    M(UInt64, odbc_bridge_connection_pool_size, 16, "Connection pool size for each connection settings string in ODBC bridge.", 0) \
+    \
     M(Seconds, distributed_replica_error_half_life, DBMS_CONNECTION_POOL_WITH_FAILOVER_DEFAULT_DECREASE_ERROR_PERIOD, "Time period reduces replica error counter by 2 times.", 0) \
     M(UInt64, distributed_replica_error_cap, DBMS_CONNECTION_POOL_WITH_FAILOVER_MAX_ERROR_COUNT, "Max number of errors per replica, prevents piling up an incredible amount of errors if replica was offline for some time and allows it to be reconsidered in a shorter amount of time.", 0) \
     M(UInt64, distributed_replica_max_ignored_errors, 0, "Number of errors that will be ignored while choosing replicas", 0) \
@@ -409,6 +426,7 @@ class IColumn;
     M(Bool, allow_non_metadata_alters, true, "Allow to execute alters which affects not only tables metadata, but also data on disk", 0) \
     M(Bool, enable_global_with_statement, true, "Propagate WITH statements to UNION queries and all subqueries", 0) \
     M(Bool, aggregate_functions_null_for_empty, false, "Rewrite all aggregate functions in a query, adding -OrNull suffix to them", 0) \
+    M(Bool, optimize_fuse_sum_count_avg, false, "Fuse aggregate functions sum(), avg(), count() with identical arguments into one sumCount() call, if the query has at least two different functions", 0) \
     M(Bool, flatten_nested, true, "If true, columns of type Nested will be flatten to separate array columns instead of one array of tuples", 0) \
     M(Bool, asterisk_include_materialized_columns, false, "Include MATERIALIZED columns for wildcard query", 0) \
     M(Bool, asterisk_include_alias_columns, false, "Include ALIAS columns for wildcard query", 0) \
@@ -417,7 +435,7 @@ class IColumn;
     M(Bool, allow_experimental_map_type, false, "Allow data type Map", 0) \
     M(Bool, allow_experimental_window_functions, false, "Allow experimental window functions", 0) \
     M(Bool, use_antlr_parser, false, "Parse incoming queries using ANTLR-generated experimental parser", 0) \
-    M(Bool, async_socket_for_remote, true, "Asynchronously read from socket executing remote query", 0) \
+    M(Bool, async_socket_for_remote, false, "Asynchronously read from socket executing remote query", 0) \
     \
     M(Bool, optimize_rewrite_sum_if_to_count_if, true, "Rewrite sumIf() and sum(if()) function countIf() function when logically equivalent", 0) \
     M(UInt64, insert_shard_id, 0, "If non zero, when insert into a distributed table, the data will be inserted into the shard `insert_shard_id` synchronously. Possible values range from 1 to `shards_number` of corresponding distributed table", 0) \
@@ -426,7 +444,12 @@ class IColumn;
     M(Bool, engine_file_truncate_on_insert, false, "Enables or disables truncate before insert in file engine tables", 0) \
     M(Bool, allow_experimental_database_replicated, false, "Allow to create databases with Replicated engine", 0) \
     M(UInt64, database_replicated_initial_query_timeout_sec, 300, "How long initial DDL query should wait for Replicated database to precess previous DDL queue entries", 0) \
-    M(Bool, database_replicated_ddl_output, true, "Return table with query execution status as a result of DDL query", 0) \
+    M(UInt64, max_distributed_depth, 5, "Maximum distributed query depth", 0) \
+    M(Bool, database_replicated_always_detach_permanently, false, "Execute DETACH TABLE as DETACH TABLE PERMANENTLY if database engine is Replicated", 0) \
+    M(DistributedDDLOutputMode, distributed_ddl_output_mode, DistributedDDLOutputMode::THROW, "Format of distributed DDL query result", 0) \
+    M(UInt64, distributed_ddl_entry_format_version, 1, "Version of DDL entry to write into ZooKeeper", 0) \
+    M(UInt64, external_storage_max_read_rows, 0, "Limit maximum number of rows when table with external engine should flush history data. Now supported only for MySQL table engine, database engine, dictionary and MaterializeMySQL. If equal to 0, this setting is disabled", 0) \
+    M(UInt64, external_storage_max_read_bytes, 0, "Limit maximum number of bytes when table with external engine should flush history data. Now supported only for MySQL table engine, database engine, dictionary and MaterializeMySQL. If equal to 0, this setting is disabled", 0)  \
     \
     /** Obsolete settings that do nothing but left for compatibility reasons. Remove each one after half a year of obsolescence. */ \
     \
@@ -437,6 +460,15 @@ class IColumn;
     M(UnionMode, union_default_mode, UnionMode::Unspecified, "Set default Union Mode in SelectWithUnion query. Possible values: empty string, 'ALL', 'DISTINCT'. If empty, query without Union Mode will throw exception.", 0) \
     M(Bool, optimize_aggregators_of_group_by_keys, true, "Eliminates min/max/any/anyLast aggregators of GROUP BY keys in SELECT section", 0) \
     M(Bool, optimize_group_by_function_keys, true, "Eliminates functions of other keys in GROUP BY section", 0) \
+    \
+    M(Bool, query_plan_enable_optimizations, true, "Apply optimizations to query plan", 0) \
+    M(UInt64, query_plan_max_optimizations_to_apply, 10000, "Limit the total number of optimizations applied to query plan. If zero, ignored. If limit reached, throw exception", 0) \
+    M(Bool, query_plan_filter_push_down, true, "Allow to push down filter by predicate query plan step", 0) \
+    \
+    M(Bool, database_replicated_ddl_output, true, "Obsolete setting, does nothing. Will be removed after 2021-09-08", 0) \
+    M(HandleKafkaErrorMode, handle_kafka_error_mode, HandleKafkaErrorMode::DEFAULT, "How to handle errors for Kafka engine. Passible values: default, stream.", 0) \
+    M(UInt64, limit, 0, "Limit on read rows from the most 'end' result for select query, default 0 means no limit length", 0) \
+    M(UInt64, offset, 0, "Offset on read rows from the most 'end' result for select query", 0) \
 
 // End of COMMON_SETTINGS
 // Please add settings related to formats into the FORMAT_FACTORY_SETTINGS below.
@@ -509,6 +541,7 @@ class IColumn;
     M(Bool, output_format_write_statistics, true, "Write statistics about read rows, bytes, time elapsed in suitable output formats.", 0) \
     M(Bool, output_format_pretty_row_numbers, false, "Add row numbers before each row for pretty output format", 0) \
     M(Bool, insert_distributed_one_random_shard, false, "If setting is enabled, inserting into distributed table will choose a random shard to write when there is no sharding key", 0) \
+    M(Bool, cross_to_inner_join_rewrite, true, "Use inner join instead of comma/cross join if possible", 0) \
 
 
 // End of FORMAT_FACTORY_SETTINGS
@@ -528,7 +561,7 @@ struct Settings : public BaseSettings<SettingsTraits>
 {
     /// For initialization from empty initializer-list to be "value initialization", not "aggregate initialization" in C++14.
     /// http://en.cppreference.com/w/cpp/language/aggregate_initialization
-    Settings() {}
+    Settings() = default;
 
     /** Set multiple settings from "profile" (in server configuration file (users.xml), profiles contain groups of multiple settings).
      * The profile can also be set using the `set` functions, like the profile setting.
diff --git a/src/Core/SettingsEnums.cpp b/src/Core/SettingsEnums.cpp
index 2e1cf025256..26c2bd9b6af 100644
--- a/src/Core/SettingsEnums.cpp
+++ b/src/Core/SettingsEnums.cpp
@@ -102,4 +102,13 @@ IMPLEMENT_SETTING_ENUM(UnionMode, ErrorCodes::UNKNOWN_UNION,
      {"ALL",      UnionMode::ALL},
      {"DISTINCT", UnionMode::DISTINCT}})
 
+IMPLEMENT_SETTING_ENUM(DistributedDDLOutputMode, ErrorCodes::BAD_ARGUMENTS,
+    {{"none",         DistributedDDLOutputMode::NONE},
+     {"throw",    DistributedDDLOutputMode::THROW},
+     {"null_status_on_timeout", DistributedDDLOutputMode::NULL_STATUS_ON_TIMEOUT},
+     {"never_throw", DistributedDDLOutputMode::NEVER_THROW}})
+
+IMPLEMENT_SETTING_ENUM(HandleKafkaErrorMode, ErrorCodes::BAD_ARGUMENTS,
+    {{"default",      HandleKafkaErrorMode::DEFAULT},
+     {"stream",       HandleKafkaErrorMode::STREAM}})
 }
diff --git a/src/Core/SettingsEnums.h b/src/Core/SettingsEnums.h
index c2ef08135eb..f0dd10aacfb 100644
--- a/src/Core/SettingsEnums.h
+++ b/src/Core/SettingsEnums.h
@@ -138,4 +138,23 @@ enum class UnionMode
 
 DECLARE_SETTING_ENUM(UnionMode)
 
+enum class DistributedDDLOutputMode
+{
+    NONE,
+    THROW,
+    NULL_STATUS_ON_TIMEOUT,
+    NEVER_THROW,
+};
+
+DECLARE_SETTING_ENUM(DistributedDDLOutputMode)
+
+enum class HandleKafkaErrorMode
+{
+    DEFAULT = 0, // Ignore errors whit threshold.
+    STREAM, // Put errors to stream in the virtual column named ``_error.
+    /*FIXED_SYSTEM_TABLE, Put errors to in a fixed system table likey system.kafka_errors. This is not implemented now.  */
+    /*CUSTOM_SYSTEM_TABLE, Put errors to in a custom system table. This is not implemented now.  */
+};
+
+DECLARE_SETTING_ENUM(HandleKafkaErrorMode)
 }
diff --git a/src/Core/SettingsQuirks.cpp b/src/Core/SettingsQuirks.cpp
new file mode 100644
index 00000000000..3bf9047af3a
--- /dev/null
+++ b/src/Core/SettingsQuirks.cpp
@@ -0,0 +1,62 @@
+#include <Core/SettingsQuirks.h>
+#include <Core/Settings.h>
+#include <common/logger_useful.h>
+
+#ifdef __linux__
+#include <linux/version.h>
+#endif
+
+#ifdef __linux__
+/// Detect does epoll_wait with nested epoll fds works correctly.
+/// Polling nested epoll fds from epoll_wait is required for async_socket_for_remote and use_hedged_requests.
+///
+/// It may not be reliable in 5.5+ [1], that has been fixed in 5.7+ [2] or 5.6.13+.
+///
+///   [1]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=339ddb53d373
+///   [2]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=0c54a6a44bf3
+bool nestedEpollWorks(Poco::Logger * log)
+{
+    bool nested_epoll_works =
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(5, 6, 13))
+        /// the check is correct since there will be no more 5.5.x releases.
+        false
+#else
+        true
+#endif
+    ;
+
+    if (!nested_epoll_works)
+    {
+        if (log)
+            LOG_WARNING(log, "Nested epoll_wait has some issues on kernels [5.5.0, 5.6.13). You should upgrade it to avoid possible issues.");
+    }
+    return nested_epoll_works;
+}
+#else
+bool nestedEpollWorks(Poco::Logger *) { return true; }
+#endif
+
+namespace DB
+{
+
+/// Update some settings defaults to avoid some known issues.
+void applySettingsQuirks(Settings & settings, Poco::Logger * log)
+{
+    if (!nestedEpollWorks(log))
+    {
+        if (!settings.async_socket_for_remote.changed && settings.async_socket_for_remote)
+        {
+            settings.async_socket_for_remote = false;
+            if (log)
+                LOG_WARNING(log, "async_socket_for_remote has been disabled (you can explicitly enable it still)");
+        }
+        if (!settings.use_hedged_requests.changed && settings.use_hedged_requests)
+        {
+            settings.use_hedged_requests = false;
+            if (log)
+                LOG_WARNING(log, "use_hedged_requests has been disabled (you can explicitly enable it still)");
+        }
+    }
+}
+
+}
diff --git a/src/Core/SettingsQuirks.h b/src/Core/SettingsQuirks.h
new file mode 100644
index 00000000000..38def8eebf2
--- /dev/null
+++ b/src/Core/SettingsQuirks.h
@@ -0,0 +1,16 @@
+#pragma once
+
+namespace Poco
+{
+class Logger;
+}
+
+namespace DB
+{
+
+struct Settings;
+
+/// Update some settings defaults to avoid some known issues.
+void applySettingsQuirks(Settings & settings, Poco::Logger * log = nullptr);
+
+}
diff --git a/src/Core/SortCursor.h b/src/Core/SortCursor.h
index f383c3ded8e..79730e9697e 100644
--- a/src/Core/SortCursor.h
+++ b/src/Core/SortCursor.h
@@ -366,4 +366,20 @@ private:
     }
 };
 
+template <typename TLeftColumns, typename TRightColumns>
+bool less(const TLeftColumns & lhs, const TRightColumns & rhs, size_t i, size_t j, const SortDescription & descr)
+{
+    for (const auto & elem : descr)
+    {
+        size_t ind = elem.column_number;
+        int res = elem.direction * lhs[ind]->compareAt(i, j, *rhs[ind], elem.nulls_direction);
+        if (res < 0)
+            return true;
+        else if (res > 0)
+            return false;
+    }
+
+    return false;
+}
+
 }
diff --git a/src/Core/Types.h b/src/Core/Types.h
index a463455cbe1..b9ecda4a46d 100644
--- a/src/Core/Types.h
+++ b/src/Core/Types.h
@@ -15,7 +15,7 @@ namespace DB
 struct Null {};
 
 /// Ignore strange gcc warning https://gcc.gnu.org/bugzilla/show_bug.cgi?id=55776
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wshadow"
 #endif
@@ -59,7 +59,7 @@ enum class TypeIndex
     LowCardinality,
     Map,
 };
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic pop
 #endif
 
diff --git a/src/Core/config_core.h.in b/src/Core/config_core.h.in
index 666ef32efdf..e250e013913 100644
--- a/src/Core/config_core.h.in
+++ b/src/Core/config_core.h.in
@@ -14,3 +14,4 @@
 #cmakedefine01 USE_ROCKSDB
 #cmakedefine01 USE_LIBPQXX
 #cmakedefine01 USE_NURAFT
+#cmakedefine01 USE_KRB5
diff --git a/src/Core/tests/gtest_DecimalFunctions.cpp b/src/Core/tests/gtest_DecimalFunctions.cpp
index be64661176b..1069a810d64 100644
--- a/src/Core/tests/gtest_DecimalFunctions.cpp
+++ b/src/Core/tests/gtest_DecimalFunctions.cpp
@@ -14,7 +14,7 @@ struct DecimalUtilsSplitAndCombineTestParam
     Decimal64 decimal_value;
     uint8_t scale;
 
-    DecimalUtils::DecimalComponents<typename Decimal64::NativeType> components;
+    DecimalUtils::DecimalComponents<Decimal64> components;
 };
 
 std::ostream & operator << (std::ostream & ostr, const DecimalUtilsSplitAndCombineTestParam & param)
diff --git a/src/Core/ya.make b/src/Core/ya.make
index 1eae848163b..004653d060e 100644
--- a/src/Core/ya.make
+++ b/src/Core/ya.make
@@ -36,6 +36,7 @@ SRCS(
     Settings.cpp
     SettingsEnums.cpp
     SettingsFields.cpp
+    SettingsQuirks.cpp
     SortDescription.cpp
     iostream_debug_helpers.cpp
 
diff --git a/src/DataStreams/AddingDefaultBlockOutputStream.cpp b/src/DataStreams/AddingDefaultBlockOutputStream.cpp
index db1542801d6..f4d8f6954c1 100644
--- a/src/DataStreams/AddingDefaultBlockOutputStream.cpp
+++ b/src/DataStreams/AddingDefaultBlockOutputStream.cpp
@@ -10,11 +10,11 @@ AddingDefaultBlockOutputStream::AddingDefaultBlockOutputStream(
     const BlockOutputStreamPtr & output_,
     const Block & header_,
     const ColumnsDescription & columns_,
-    const Context & context_)
+    ContextPtr context_)
     : output(output_), header(header_)
 {
     auto dag = addMissingDefaults(header_, output->getHeader().getNamesAndTypesList(), columns_, context_);
-    adding_defaults_actions = std::make_shared<ExpressionActions>(std::move(dag));
+    adding_defaults_actions = std::make_shared<ExpressionActions>(std::move(dag), ExpressionActionsSettings::fromContext(context_));
 }
 
 void AddingDefaultBlockOutputStream::write(const Block & block)
diff --git a/src/DataStreams/AddingDefaultBlockOutputStream.h b/src/DataStreams/AddingDefaultBlockOutputStream.h
index 5fbbe2aed60..a8235d6623a 100644
--- a/src/DataStreams/AddingDefaultBlockOutputStream.h
+++ b/src/DataStreams/AddingDefaultBlockOutputStream.h
@@ -26,7 +26,7 @@ public:
         const BlockOutputStreamPtr & output_,
         const Block & header_,
         const ColumnsDescription & columns_,
-        const Context & context_);
+        ContextPtr context_);
 
     Block getHeader() const override { return header; }
     void write(const Block & block) override;
diff --git a/src/DataStreams/AddingDefaultsBlockInputStream.cpp b/src/DataStreams/AddingDefaultsBlockInputStream.cpp
index 4b8dcff1870..e3f0906cb03 100644
--- a/src/DataStreams/AddingDefaultsBlockInputStream.cpp
+++ b/src/DataStreams/AddingDefaultsBlockInputStream.cpp
@@ -130,7 +130,7 @@ static MutableColumnPtr mixColumns(const ColumnWithTypeAndName & col_read,
 AddingDefaultsBlockInputStream::AddingDefaultsBlockInputStream(
     const BlockInputStreamPtr & input,
     const ColumnsDescription & columns_,
-    const Context & context_)
+    ContextPtr context_)
     : columns(columns_)
     , column_defaults(columns.getDefaults())
     , context(context_)
@@ -174,7 +174,7 @@ Block AddingDefaultsBlockInputStream::readImpl()
     auto dag = evaluateMissingDefaults(evaluate_block, header.getNamesAndTypesList(), columns, context, false);
     if (dag)
     {
-        auto actions = std::make_shared<ExpressionActions>(std::move(dag));
+        auto actions = std::make_shared<ExpressionActions>(std::move(dag), ExpressionActionsSettings::fromContext(context));
         actions->execute(evaluate_block);
     }
 
diff --git a/src/DataStreams/AddingDefaultsBlockInputStream.h b/src/DataStreams/AddingDefaultsBlockInputStream.h
index b2efa5863ef..957f14caff3 100644
--- a/src/DataStreams/AddingDefaultsBlockInputStream.h
+++ b/src/DataStreams/AddingDefaultsBlockInputStream.h
@@ -7,8 +7,6 @@
 namespace DB
 {
 
-class Context;
-
 /// Adds defaults to columns using BlockDelayedDefaults bitmask attached to Block by child InputStream.
 class AddingDefaultsBlockInputStream : public IBlockInputStream
 {
@@ -16,7 +14,7 @@ public:
     AddingDefaultsBlockInputStream(
         const BlockInputStreamPtr & input,
         const ColumnsDescription & columns_,
-        const Context & context_);
+        ContextPtr context_);
 
     String getName() const override { return "AddingDefaults"; }
     Block getHeader() const override { return header; }
@@ -28,7 +26,7 @@ private:
     Block header;
     const ColumnsDescription columns;
     const ColumnDefaults column_defaults;
-    const Context & context;
+    ContextPtr context;
 };
 
 }
diff --git a/src/DataStreams/BlockIO.h b/src/DataStreams/BlockIO.h
index 91d7efac8d1..31a0e1020d2 100644
--- a/src/DataStreams/BlockIO.h
+++ b/src/DataStreams/BlockIO.h
@@ -50,7 +50,7 @@ struct BlockIO
         }
     }
 
-    void onException()
+    void onException() const
     {
         if (exception_callback)
             exception_callback();
diff --git a/src/DataStreams/CheckConstraintsBlockOutputStream.cpp b/src/DataStreams/CheckConstraintsBlockOutputStream.cpp
index a967ee28502..c4556162323 100644
--- a/src/DataStreams/CheckConstraintsBlockOutputStream.cpp
+++ b/src/DataStreams/CheckConstraintsBlockOutputStream.cpp
@@ -1,12 +1,15 @@
-#include <DataStreams/CheckConstraintsBlockOutputStream.h>
-#include <Parsers/formatAST.h>
-#include <Interpreters/ExpressionActions.h>
-#include <Columns/ColumnsCommon.h>
-#include <Columns/ColumnsNumber.h>
-#include <Columns/ColumnConst.h>
 #include <Common/assert_cast.h>
 #include <Common/quoteString.h>
 #include <Common/FieldVisitors.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/DataTypeLowCardinality.h>
+#include <Columns/ColumnsCommon.h>
+#include <Columns/ColumnsNumber.h>
+#include <Columns/ColumnConst.h>
+#include <Columns/ColumnNullable.h>
+#include <DataStreams/CheckConstraintsBlockOutputStream.h>
+#include <Parsers/formatAST.h>
+#include <Interpreters/ExpressionActions.h>
 
 
 namespace DB
@@ -15,7 +18,7 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int VIOLATED_CONSTRAINT;
-    extern const int LOGICAL_ERROR;
+    extern const int UNSUPPORTED_METHOD;
 }
 
 
@@ -24,7 +27,7 @@ CheckConstraintsBlockOutputStream::CheckConstraintsBlockOutputStream(
     const BlockOutputStreamPtr & output_,
     const Block & header_,
     const ConstraintsDescription & constraints_,
-    const Context & context_)
+    ContextPtr context_)
     : table_id(table_id_),
     output(output_),
     header(header_),
@@ -48,62 +51,75 @@ void CheckConstraintsBlockOutputStream::write(const Block & block)
 
             ColumnWithTypeAndName res_column = block_to_calculate.getByName(constraint_ptr->expr->getColumnName());
 
-            if (!isUInt8(res_column.type))
-                throw Exception(ErrorCodes::LOGICAL_ERROR, "Constraint {} does not return a value of type UInt8",
+            auto result_type = removeNullable(removeLowCardinality(res_column.type));
+
+            if (!isUInt8(result_type))
+                throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "Constraint {} does not return a value of type UInt8",
                     backQuote(constraint_ptr->name));
 
-            if (const ColumnConst * res_const = typeid_cast<const ColumnConst *>(res_column.column.get()))
-            {
-                UInt8 value = res_const->getValue<UInt64>();
+            auto result_column = res_column.column->convertToFullColumnIfConst()->convertToFullColumnIfLowCardinality();
 
-                /// Is violated.
-                if (!value)
-                {
-                    throw Exception(ErrorCodes::VIOLATED_CONSTRAINT,
-                                    "Constraint {} for table {} is violated, because it is a constant expression returning 0. "
-                                    "It is most likely an error in table definition.",
-                                    backQuote(constraint_ptr->name), table_id.getNameForLogs());
-                }
+            if (const auto * column_nullable = checkAndGetColumn<ColumnNullable>(*result_column))
+            {
+                const auto & nested_column = column_nullable->getNestedColumnPtr();
+
+                /// Check if constraint value is nullable
+                const auto & null_map = column_nullable->getNullMapColumn();
+                const PaddedPODArray<UInt8> & data = null_map.getData();
+                bool null_map_contains_null = !memoryIsZero(data.raw_data(), data.size() * sizeof(UInt8));
+
+                if (null_map_contains_null)
+                    throw Exception(
+                        ErrorCodes::VIOLATED_CONSTRAINT,
+                        "Constraint {} for table {} is violated. Expression: ({})."\
+                        "Constraint expression returns nullable column that contains null value",
+                        backQuote(constraint_ptr->name),
+                        table_id.getNameForLogs(),
+                        serializeAST(*(constraint_ptr->expr), true));
+
+                result_column = nested_column;
             }
-            else
+
+            const ColumnUInt8 & res_column_uint8 = assert_cast<const ColumnUInt8 &>(*result_column);
+
+            const UInt8 * data = res_column_uint8.getData().data();
+            size_t size = res_column_uint8.size();
+
+            /// Is violated.
+            if (!memoryIsByte(data, size, 1))
             {
-                const ColumnUInt8 & res_column_uint8 = assert_cast<const ColumnUInt8 &>(*res_column.column);
+                size_t row_idx = 0;
+                for (; row_idx < size; ++row_idx)
+                    if (data[row_idx] != 1)
+                        break;
 
-                const UInt8 * data = res_column_uint8.getData().data();
-                size_t size = res_column_uint8.size();
+                Names related_columns = constraint_expr->getRequiredColumns();
 
-                /// Is violated.
-                if (!memoryIsByte(data, size, 1))
+                bool first = true;
+                String column_values_msg;
+                constexpr size_t approx_bytes_for_col = 32;
+                column_values_msg.reserve(approx_bytes_for_col * related_columns.size());
+                for (const auto & name : related_columns)
                 {
-                    size_t row_idx = 0;
-                    for (; row_idx < size; ++row_idx)
-                        if (data[row_idx] != 1)
-                            break;
+                    const IColumn & column = *block.getByName(name).column;
+                    assert(row_idx < column.size());
 
-                    Names related_columns = constraint_expr->getRequiredColumns();
-
-                    bool first = true;
-                    String column_values_msg;
-                    constexpr size_t approx_bytes_for_col = 32;
-                    column_values_msg.reserve(approx_bytes_for_col * related_columns.size());
-                    for (const auto & name : related_columns)
-                    {
-                        const IColumn & column = *block.getByName(name).column;
-                        assert(row_idx < column.size());
-
-                        if (!first)
-                            column_values_msg.append(", ");
-                        column_values_msg.append(backQuoteIfNeed(name));
-                        column_values_msg.append(" = ");
-                        column_values_msg.append(applyVisitor(FieldVisitorToString(), column[row_idx]));
-                        first = false;
-                    }
-
-                    throw Exception(ErrorCodes::VIOLATED_CONSTRAINT,
-                                    "Constraint {} for table {} is violated at row {}. Expression: ({}). Column values: {}",
-                                    backQuote(constraint_ptr->name), table_id.getNameForLogs(), rows_written + row_idx + 1,
-                                    serializeAST(*(constraint_ptr->expr), true), column_values_msg);
+                    if (!first)
+                        column_values_msg.append(", ");
+                    column_values_msg.append(backQuoteIfNeed(name));
+                    column_values_msg.append(" = ");
+                    column_values_msg.append(applyVisitor(FieldVisitorToString(), column[row_idx]));
+                    first = false;
                 }
+
+                throw Exception(
+                    ErrorCodes::VIOLATED_CONSTRAINT,
+                    "Constraint {} for table {} is violated at row {}. Expression: ({}). Column values: {}",
+                    backQuote(constraint_ptr->name),
+                    table_id.getNameForLogs(),
+                    rows_written + row_idx + 1,
+                    serializeAST(*(constraint_ptr->expr), true),
+                    column_values_msg);
             }
         }
     }
diff --git a/src/DataStreams/CheckConstraintsBlockOutputStream.h b/src/DataStreams/CheckConstraintsBlockOutputStream.h
index a1be720f21e..0f115550eb8 100644
--- a/src/DataStreams/CheckConstraintsBlockOutputStream.h
+++ b/src/DataStreams/CheckConstraintsBlockOutputStream.h
@@ -20,7 +20,7 @@ public:
             const BlockOutputStreamPtr & output_,
             const Block & header_,
             const ConstraintsDescription & constraints_,
-            const Context & context_);
+            ContextPtr context_);
 
     Block getHeader() const override { return header; }
     void write(const Block & block) override;
diff --git a/src/DataStreams/IBlockInputStream.h b/src/DataStreams/IBlockInputStream.h
index 4e314ef2980..b077f87e8a8 100644
--- a/src/DataStreams/IBlockInputStream.h
+++ b/src/DataStreams/IBlockInputStream.h
@@ -2,9 +2,8 @@
 
 #include <Core/Block.h>
 #include <DataStreams/BlockStreamProfileInfo.h>
-#include <DataStreams/IBlockStream_fwd.h>
-#include <DataStreams/SizeLimits.h>
 #include <DataStreams/ExecutionSpeedLimits.h>
+#include <DataStreams/SizeLimits.h>
 #include <DataStreams/StreamLocalLimits.h>
 #include <IO/Progress.h>
 #include <Storages/TableLockHolder.h>
diff --git a/src/DataStreams/InputStreamFromASTInsertQuery.cpp b/src/DataStreams/InputStreamFromASTInsertQuery.cpp
index 70d69227ac0..0848d838276 100644
--- a/src/DataStreams/InputStreamFromASTInsertQuery.cpp
+++ b/src/DataStreams/InputStreamFromASTInsertQuery.cpp
@@ -24,7 +24,7 @@ InputStreamFromASTInsertQuery::InputStreamFromASTInsertQuery(
     const ASTPtr & ast,
     ReadBuffer * input_buffer_tail_part,
     const Block & header,
-    const Context & context,
+    ContextPtr context,
     const ASTPtr & input_function)
 {
     const auto * ast_insert_query = ast->as<ASTInsertQuery>();
@@ -58,9 +58,9 @@ InputStreamFromASTInsertQuery::InputStreamFromASTInsertQuery(
 
     input_buffer_contacenated = std::make_unique<ConcatReadBuffer>(buffers);
 
-    res_stream = context.getInputFormat(format, *input_buffer_contacenated, header, context.getSettings().max_insert_block_size);
+    res_stream = context->getInputFormat(format, *input_buffer_contacenated, header, context->getSettings().max_insert_block_size);
 
-    if (context.getSettingsRef().input_format_defaults_for_omitted_fields && ast_insert_query->table_id && !input_function)
+    if (context->getSettingsRef().input_format_defaults_for_omitted_fields && ast_insert_query->table_id && !input_function)
     {
         StoragePtr storage = DatabaseCatalog::instance().getTable(ast_insert_query->table_id, context);
         auto metadata_snapshot = storage->getInMemoryMetadataPtr();
diff --git a/src/DataStreams/InputStreamFromASTInsertQuery.h b/src/DataStreams/InputStreamFromASTInsertQuery.h
index d4c6443c77d..15b698a2d68 100644
--- a/src/DataStreams/InputStreamFromASTInsertQuery.h
+++ b/src/DataStreams/InputStreamFromASTInsertQuery.h
@@ -25,7 +25,7 @@ public:
         const ASTPtr & ast,
         ReadBuffer * input_buffer_tail_part,
         const Block & header,
-        const Context & context,
+        ContextPtr context,
         const ASTPtr & input_function);
 
     Block readImpl() override { return res_stream->read(); }
diff --git a/src/DataStreams/InternalTextLogsRowOutputStream.h b/src/DataStreams/InternalTextLogsRowOutputStream.h
index 0f333f70d18..8ade76b34a7 100644
--- a/src/DataStreams/InternalTextLogsRowOutputStream.h
+++ b/src/DataStreams/InternalTextLogsRowOutputStream.h
@@ -8,7 +8,7 @@ namespace DB
 
 /// Prints internal server logs
 /// Input blocks have to have the same structure as SystemLogsQueue::getSampleBlock()
-/// NOTE: IRowOutputStream does not suite well for this case
+/// NOTE: IRowOutputFormat does not suite well for this case
 class InternalTextLogsRowOutputStream : public IBlockOutputStream
 {
 public:
diff --git a/src/DataStreams/MongoDBBlockInputStream.cpp b/src/DataStreams/MongoDBBlockInputStream.cpp
index 5463d95151b..e4ddcd09ede 100644
--- a/src/DataStreams/MongoDBBlockInputStream.cpp
+++ b/src/DataStreams/MongoDBBlockInputStream.cpp
@@ -270,8 +270,8 @@ namespace
                     throw Exception{"Type mismatch, expected Timestamp, got type id = " + toString(value.type()) + " for column " + name,
                                     ErrorCodes::TYPE_MISMATCH};
 
-                assert_cast<ColumnUInt16 &>(column).getData().push_back(UInt16{DateLUT::instance().toDayNum(
-                    static_cast<const Poco::MongoDB::ConcreteElement<Poco::Timestamp> &>(value).value().epochTime())});
+                assert_cast<ColumnUInt16 &>(column).getData().push_back(static_cast<UInt16>(DateLUT::instance().toDayNum(
+                    static_cast<const Poco::MongoDB::ConcreteElement<Poco::Timestamp> &>(value).value().epochTime())));
                 break;
             }
 
diff --git a/src/DataStreams/NativeBlockInputStream.cpp b/src/DataStreams/NativeBlockInputStream.cpp
index 377f4451419..2f376f5230d 100644
--- a/src/DataStreams/NativeBlockInputStream.cpp
+++ b/src/DataStreams/NativeBlockInputStream.cpp
@@ -73,14 +73,16 @@ void NativeBlockInputStream::resetParser()
 
 void NativeBlockInputStream::readData(const IDataType & type, ColumnPtr & column, ReadBuffer & istr, size_t rows, double avg_value_size_hint)
 {
-    IDataType::DeserializeBinaryBulkSettings settings;
-    settings.getter = [&](IDataType::SubstreamPath) -> ReadBuffer * { return &istr; };
+    ISerialization::DeserializeBinaryBulkSettings settings;
+    settings.getter = [&](ISerialization::SubstreamPath) -> ReadBuffer * { return &istr; };
     settings.avg_value_size_hint = avg_value_size_hint;
     settings.position_independent_encoding = false;
 
-    IDataType::DeserializeBinaryBulkStatePtr state;
-    type.deserializeBinaryBulkStatePrefix(settings, state);
-    type.deserializeBinaryBulkWithMultipleStreams(column, rows, settings, state);
+    ISerialization::DeserializeBinaryBulkStatePtr state;
+    auto serialization = type.getDefaultSerialization();
+
+    serialization->deserializeBinaryBulkStatePrefix(settings, state);
+    serialization->deserializeBinaryBulkWithMultipleStreams(column, rows, settings, state, nullptr);
 
     if (column->size() != rows)
         throw Exception("Cannot read all data in NativeBlockInputStream. Rows read: " + toString(column->size()) + ". Rows expected: " + toString(rows) + ".",
diff --git a/src/DataStreams/NativeBlockOutputStream.cpp b/src/DataStreams/NativeBlockOutputStream.cpp
index c17d0dacc49..2a016c9a0c8 100644
--- a/src/DataStreams/NativeBlockOutputStream.cpp
+++ b/src/DataStreams/NativeBlockOutputStream.cpp
@@ -41,22 +41,24 @@ void NativeBlockOutputStream::flush()
 }
 
 
-void NativeBlockOutputStream::writeData(const IDataType & type, const ColumnPtr & column, WriteBuffer & ostr, UInt64 offset, UInt64 limit)
+static void writeData(const IDataType & type, const ColumnPtr & column, WriteBuffer & ostr, UInt64 offset, UInt64 limit)
 {
     /** If there are columns-constants - then we materialize them.
       * (Since the data type does not know how to serialize / deserialize constants.)
       */
     ColumnPtr full_column = column->convertToFullColumnIfConst();
 
-    IDataType::SerializeBinaryBulkSettings settings;
-    settings.getter = [&ostr](IDataType::SubstreamPath) -> WriteBuffer * { return &ostr; };
+    ISerialization::SerializeBinaryBulkSettings settings;
+    settings.getter = [&ostr](ISerialization::SubstreamPath) -> WriteBuffer * { return &ostr; };
     settings.position_independent_encoding = false;
     settings.low_cardinality_max_dictionary_size = 0;
 
-    IDataType::SerializeBinaryBulkStatePtr state;
-    type.serializeBinaryBulkStatePrefix(settings, state);
-    type.serializeBinaryBulkWithMultipleStreams(*full_column, offset, limit, settings, state);
-    type.serializeBinaryBulkStateSuffix(settings, state);
+    auto serialization = type.getDefaultSerialization();
+
+    ISerialization::SerializeBinaryBulkStatePtr state;
+    serialization->serializeBinaryBulkStatePrefix(settings, state);
+    serialization->serializeBinaryBulkWithMultipleStreams(*full_column, offset, limit, settings, state);
+    serialization->serializeBinaryBulkStateSuffix(settings, state);
 }
 
 
diff --git a/src/DataStreams/NativeBlockOutputStream.h b/src/DataStreams/NativeBlockOutputStream.h
index 64ccd267634..c47d7b2f1c3 100644
--- a/src/DataStreams/NativeBlockOutputStream.h
+++ b/src/DataStreams/NativeBlockOutputStream.h
@@ -30,8 +30,6 @@ public:
     void write(const Block & block) override;
     void flush() override;
 
-    static void writeData(const IDataType & type, const ColumnPtr & column, WriteBuffer & ostr, UInt64 offset, UInt64 limit);
-
     String getContentType() const override { return "application/octet-stream"; }
 
 private:
diff --git a/src/DataStreams/PostgreSQLBlockInputStream.cpp b/src/DataStreams/PostgreSQLBlockInputStream.cpp
index da6a83fb930..f4af15df011 100644
--- a/src/DataStreams/PostgreSQLBlockInputStream.cpp
+++ b/src/DataStreams/PostgreSQLBlockInputStream.cpp
@@ -28,13 +28,13 @@ namespace ErrorCodes
 }
 
 PostgreSQLBlockInputStream::PostgreSQLBlockInputStream(
-    ConnectionPtr connection_,
+    postgres::ConnectionHolderPtr connection_,
     const std::string & query_str_,
     const Block & sample_block,
     const UInt64 max_block_size_)
     : query_str(query_str_)
     , max_block_size(max_block_size_)
-    , connection(connection_)
+    , connection(std::move(connection_))
 {
     description.init(sample_block);
     for (const auto idx : ext::range(0, description.sample_block.columns()))
@@ -48,7 +48,7 @@ PostgreSQLBlockInputStream::PostgreSQLBlockInputStream(
 
 void PostgreSQLBlockInputStream::readPrefix()
 {
-    tx = std::make_unique<pqxx::read_transaction>(*connection);
+    tx = std::make_unique<pqxx::read_transaction>(connection->conn());
     stream = std::make_unique<pqxx::stream_from>(*tx, pqxx::from_query, std::string_view(query_str));
 }
 
@@ -120,8 +120,15 @@ void PostgreSQLBlockInputStream::insertValue(IColumn & column, std::string_view
     switch (type)
     {
         case ValueType::vtUInt8:
-            assert_cast<ColumnUInt8 &>(column).insertValue(pqxx::from_string<uint16_t>(value));
+        {
+            if (value == "t")
+                assert_cast<ColumnUInt8 &>(column).insertValue(1);
+            else if (value == "f")
+                assert_cast<ColumnUInt8 &>(column).insertValue(0);
+            else
+                assert_cast<ColumnUInt8 &>(column).insertValue(pqxx::from_string<uint16_t>(value));
             break;
+        }
         case ValueType::vtUInt16:
             assert_cast<ColumnUInt16 &>(column).insertValue(pqxx::from_string<uint16_t>(value));
             break;
@@ -160,8 +167,15 @@ void PostgreSQLBlockInputStream::insertValue(IColumn & column, std::string_view
             assert_cast<ColumnUInt16 &>(column).insertValue(UInt16{LocalDate{std::string(value)}.getDayNum()});
             break;
         case ValueType::vtDateTime:
-            assert_cast<ColumnUInt32 &>(column).insertValue(time_t{LocalDateTime{std::string(value)}});
+        {
+            ReadBufferFromString in(value);
+            time_t time = 0;
+            readDateTimeText(time, in);
+            if (time < 0)
+                time = 0;
+            assert_cast<ColumnUInt32 &>(column).insertValue(time);
             break;
+        }
         case ValueType::vtDateTime64:[[fallthrough]];
         case ValueType::vtDecimal32: [[fallthrough]];
         case ValueType::vtDecimal64: [[fallthrough]];
@@ -169,7 +183,7 @@ void PostgreSQLBlockInputStream::insertValue(IColumn & column, std::string_view
         case ValueType::vtDecimal256:
         {
             ReadBufferFromString istr(value);
-            data_type->deserializeAsWholeText(column, istr, FormatSettings{});
+            data_type->getDefaultSerialization()->deserializeWholeText(column, istr, FormatSettings{});
             break;
         }
         case ValueType::vtArray:
@@ -257,7 +271,13 @@ void PostgreSQLBlockInputStream::prepareArrayInfo(size_t column_idx, const DataT
     else if (which.isDate())
         parser = [](std::string & field) -> Field { return UInt16{LocalDate{field}.getDayNum()}; };
     else if (which.isDateTime())
-        parser = [](std::string & field) -> Field { return time_t{LocalDateTime{field}}; };
+        parser = [](std::string & field) -> Field
+        {
+            ReadBufferFromString in(field);
+            time_t time = 0;
+            readDateTimeText(time, in);
+            return time;
+        };
     else if (which.isDecimal32())
         parser = [nested](std::string & field) -> Field
         {
diff --git a/src/DataStreams/PostgreSQLBlockInputStream.h b/src/DataStreams/PostgreSQLBlockInputStream.h
index b88c81cca0a..b172cae5b62 100644
--- a/src/DataStreams/PostgreSQLBlockInputStream.h
+++ b/src/DataStreams/PostgreSQLBlockInputStream.h
@@ -9,18 +9,17 @@
 #include <DataStreams/IBlockInputStream.h>
 #include <Core/ExternalResultDescription.h>
 #include <Core/Field.h>
-#include <pqxx/pqxx>
+#include <Storages/PostgreSQL/PostgreSQLConnectionPool.h>
 
 
 namespace DB
 {
-using ConnectionPtr = std::shared_ptr<pqxx::connection>;
 
 class PostgreSQLBlockInputStream : public IBlockInputStream
 {
 public:
     PostgreSQLBlockInputStream(
-        ConnectionPtr connection_,
+        postgres::ConnectionHolderPtr connection_,
         const std::string & query_str,
         const Block & sample_block,
         const UInt64 max_block_size_);
@@ -47,7 +46,7 @@ private:
     const UInt64 max_block_size;
     ExternalResultDescription description;
 
-    ConnectionPtr connection;
+    postgres::ConnectionHolderPtr connection;
     std::unique_ptr<pqxx::read_transaction> tx;
     std::unique_ptr<pqxx::stream_from> stream;
 
diff --git a/src/DataStreams/PushingToViewsBlockOutputStream.cpp b/src/DataStreams/PushingToViewsBlockOutputStream.cpp
index 4d1990ffe18..16baf4377e0 100644
--- a/src/DataStreams/PushingToViewsBlockOutputStream.cpp
+++ b/src/DataStreams/PushingToViewsBlockOutputStream.cpp
@@ -26,13 +26,13 @@ namespace DB
 PushingToViewsBlockOutputStream::PushingToViewsBlockOutputStream(
     const StoragePtr & storage_,
     const StorageMetadataPtr & metadata_snapshot_,
-    const Context & context_,
+    ContextPtr context_,
     const ASTPtr & query_ptr_,
     bool no_destination)
-    : storage(storage_)
+    : WithContext(context_)
+    , storage(storage_)
     , metadata_snapshot(metadata_snapshot_)
     , log(&Poco::Logger::get("PushingToViewsBlockOutputStream"))
-    , context(context_)
     , query_ptr(query_ptr_)
 {
     checkStackSize();
@@ -42,12 +42,12 @@ PushingToViewsBlockOutputStream::PushingToViewsBlockOutputStream(
       *  but it's clear that here is not the best place for this functionality.
       */
     addTableLock(
-        storage->lockForShare(context.getInitialQueryId(), context.getSettingsRef().lock_acquire_timeout));
+        storage->lockForShare(getContext()->getInitialQueryId(), getContext()->getSettingsRef().lock_acquire_timeout));
 
     /// If the "root" table deduplicates blocks, there are no need to make deduplication for children
     /// Moreover, deduplication for AggregatingMergeTree children could produce false positives due to low size of inserting blocks
     bool disable_deduplication_for_children = false;
-    if (!context.getSettingsRef().deduplicate_blocks_in_dependent_materialized_views)
+    if (!getContext()->getSettingsRef().deduplicate_blocks_in_dependent_materialized_views)
         disable_deduplication_for_children = !no_destination && storage->supportsDeduplication();
 
     auto table_id = storage->getStorageID();
@@ -56,8 +56,8 @@ PushingToViewsBlockOutputStream::PushingToViewsBlockOutputStream(
     /// We need special context for materialized views insertions
     if (!dependencies.empty())
     {
-        select_context = std::make_unique<Context>(context);
-        insert_context = std::make_unique<Context>(context);
+        select_context = Context::createCopy(context);
+        insert_context = Context::createCopy(context);
 
         const auto & insert_settings = insert_context->getSettingsRef();
 
@@ -74,7 +74,7 @@ PushingToViewsBlockOutputStream::PushingToViewsBlockOutputStream(
 
     for (const auto & database_table : dependencies)
     {
-        auto dependent_table = DatabaseCatalog::instance().getTable(database_table, context);
+        auto dependent_table = DatabaseCatalog::instance().getTable(database_table, getContext());
         auto dependent_metadata_snapshot = dependent_table->getInMemoryMetadataPtr();
 
         ASTPtr query;
@@ -83,7 +83,7 @@ PushingToViewsBlockOutputStream::PushingToViewsBlockOutputStream(
         if (auto * materialized_view = dynamic_cast<StorageMaterializedView *>(dependent_table.get()))
         {
             addTableLock(
-                materialized_view->lockForShare(context.getInitialQueryId(), context.getSettingsRef().lock_acquire_timeout));
+                materialized_view->lockForShare(getContext()->getInitialQueryId(), getContext()->getSettingsRef().lock_acquire_timeout));
 
             StoragePtr inner_table = materialized_view->getTargetTable();
             auto inner_table_id = inner_table->getStorageID();
@@ -94,7 +94,7 @@ PushingToViewsBlockOutputStream::PushingToViewsBlockOutputStream(
             insert->table_id = inner_table_id;
 
             /// Get list of columns we get from select query.
-            auto header = InterpreterSelectQuery(query, *select_context, SelectQueryOptions().analyze())
+            auto header = InterpreterSelectQuery(query, select_context, SelectQueryOptions().analyze())
                 .getSampleBlock();
 
             /// Insert only columns returned by select.
@@ -110,16 +110,16 @@ PushingToViewsBlockOutputStream::PushingToViewsBlockOutputStream(
             insert->columns = std::move(list);
 
             ASTPtr insert_query_ptr(insert.release());
-            InterpreterInsertQuery interpreter(insert_query_ptr, *insert_context);
+            InterpreterInsertQuery interpreter(insert_query_ptr, insert_context);
             BlockIO io = interpreter.execute();
             out = io.out;
         }
         else if (dynamic_cast<const StorageLiveView *>(dependent_table.get()))
             out = std::make_shared<PushingToViewsBlockOutputStream>(
-                dependent_table, dependent_metadata_snapshot, *insert_context, ASTPtr(), true);
+                dependent_table, dependent_metadata_snapshot, insert_context, ASTPtr(), true);
         else
             out = std::make_shared<PushingToViewsBlockOutputStream>(
-                dependent_table, dependent_metadata_snapshot, *insert_context, ASTPtr());
+                dependent_table, dependent_metadata_snapshot, insert_context, ASTPtr());
 
         views.emplace_back(ViewInfo{std::move(query), database_table, std::move(out), nullptr, 0 /* elapsed_ms */});
     }
@@ -127,7 +127,7 @@ PushingToViewsBlockOutputStream::PushingToViewsBlockOutputStream(
     /// Do not push to destination table if the flag is set
     if (!no_destination)
     {
-        output = storage->write(query_ptr, storage->getInMemoryMetadataPtr(), context);
+        output = storage->write(query_ptr, storage->getInMemoryMetadataPtr(), getContext());
         replicated_output = dynamic_cast<ReplicatedMergeTreeBlockOutputStream *>(output.get());
     }
 }
@@ -155,7 +155,7 @@ void PushingToViewsBlockOutputStream::write(const Block & block)
 
     if (auto * live_view = dynamic_cast<StorageLiveView *>(storage.get()))
     {
-        StorageLiveView::writeIntoLiveView(*live_view, block, context);
+        StorageLiveView::writeIntoLiveView(*live_view, block, getContext());
     }
     else
     {
@@ -166,11 +166,11 @@ void PushingToViewsBlockOutputStream::write(const Block & block)
     }
 
     /// Don't process materialized views if this block is duplicate
-    if (!context.getSettingsRef().deduplicate_blocks_in_dependent_materialized_views && replicated_output && replicated_output->lastBlockIsDuplicate())
+    if (!getContext()->getSettingsRef().deduplicate_blocks_in_dependent_materialized_views && replicated_output && replicated_output->lastBlockIsDuplicate())
         return;
 
     // Insert data into materialized views only after successful insert into main table
-    const Settings & settings = context.getSettingsRef();
+    const Settings & settings = getContext()->getSettingsRef();
     if (settings.parallel_view_processing && views.size() > 1)
     {
         // Push to views concurrently if enabled and more than one view is attached
@@ -228,7 +228,7 @@ void PushingToViewsBlockOutputStream::writeSuffix()
 
     std::exception_ptr first_exception;
 
-    const Settings & settings = context.getSettingsRef();
+    const Settings & settings = getContext()->getSettingsRef();
     bool parallel_processing = false;
 
     /// Run writeSuffix() for views in separate thread pool.
@@ -311,7 +311,7 @@ void PushingToViewsBlockOutputStream::writeSuffix()
     UInt64 milliseconds = main_watch.elapsedMilliseconds();
     if (views.size() > 1)
     {
-        LOG_TRACE(log, "Pushing from {} to {} views took {} ms.",
+        LOG_DEBUG(log, "Pushing from {} to {} views took {} ms.",
             storage->getStorageID().getNameForLogs(), views.size(),
             milliseconds);
     }
@@ -353,10 +353,9 @@ void PushingToViewsBlockOutputStream::process(const Block & block, ViewInfo & vi
             ///  but it will contain single block (that is INSERT-ed into main table).
             /// InterpreterSelectQuery will do processing of alias columns.
 
-            Context local_context = *select_context;
-            local_context.addViewSource(
-                StorageValues::create(
-                    storage->getStorageID(), metadata_snapshot->getColumns(), block, storage->getVirtuals()));
+            auto local_context = Context::createCopy(select_context);
+            local_context->addViewSource(
+                StorageValues::create(storage->getStorageID(), metadata_snapshot->getColumns(), block, storage->getVirtuals()));
             select.emplace(view.query, local_context, SelectQueryOptions());
             in = std::make_shared<MaterializingBlockInputStream>(select->execute().getInputStream());
 
@@ -364,7 +363,7 @@ void PushingToViewsBlockOutputStream::process(const Block & block, ViewInfo & vi
             /// even when only one block is inserted into the parent table (e.g. if the query is a GROUP BY
             /// and two-level aggregation is triggered).
             in = std::make_shared<SquashingBlockInputStream>(
-                    in, context.getSettingsRef().min_insert_block_size_rows, context.getSettingsRef().min_insert_block_size_bytes);
+                    in, getContext()->getSettingsRef().min_insert_block_size_rows, getContext()->getSettingsRef().min_insert_block_size_bytes);
             in = std::make_shared<ConvertingBlockInputStream>(in, view.out->getHeader(), ConvertingBlockInputStream::MatchColumnsMode::Name);
         }
         else
diff --git a/src/DataStreams/PushingToViewsBlockOutputStream.h b/src/DataStreams/PushingToViewsBlockOutputStream.h
index 6b32607b294..2ae941efc2e 100644
--- a/src/DataStreams/PushingToViewsBlockOutputStream.h
+++ b/src/DataStreams/PushingToViewsBlockOutputStream.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include <DataStreams/IBlockOutputStream.h>
-#include <Common/Stopwatch.h>
 #include <Parsers/IAST_fwd.h>
 #include <Storages/IStorage.h>
+#include <Common/Stopwatch.h>
 
 namespace Poco
 {
@@ -14,18 +14,16 @@ namespace DB
 {
 
 class ReplicatedMergeTreeBlockOutputStream;
-class Context;
-
 
 /** Writes data to the specified table and to all dependent materialized views.
   */
-class PushingToViewsBlockOutputStream : public IBlockOutputStream
+class PushingToViewsBlockOutputStream : public IBlockOutputStream, WithContext
 {
 public:
     PushingToViewsBlockOutputStream(
         const StoragePtr & storage_,
         const StorageMetadataPtr & metadata_snapshot_,
-        const Context & context_,
+        ContextPtr context_,
         const ASTPtr & query_ptr_,
         bool no_destination = false);
 
@@ -43,7 +41,6 @@ private:
     ReplicatedMergeTreeBlockOutputStream * replicated_output = nullptr;
     Poco::Logger * log;
 
-    const Context & context;
     ASTPtr query_ptr;
     Stopwatch main_watch;
 
@@ -57,8 +54,8 @@ private:
     };
 
     std::vector<ViewInfo> views;
-    std::unique_ptr<Context> select_context;
-    std::unique_ptr<Context> insert_context;
+    ContextPtr select_context;
+    ContextPtr insert_context;
 
     void process(const Block & block, ViewInfo & view);
 };
diff --git a/src/DataStreams/RemoteBlockInputStream.cpp b/src/DataStreams/RemoteBlockInputStream.cpp
index a62f7fca0b7..c633600d37f 100644
--- a/src/DataStreams/RemoteBlockInputStream.cpp
+++ b/src/DataStreams/RemoteBlockInputStream.cpp
@@ -6,7 +6,7 @@ namespace DB
 
 RemoteBlockInputStream::RemoteBlockInputStream(
         Connection & connection,
-        const String & query_, const Block & header_, const Context & context_,
+        const String & query_, const Block & header_, ContextPtr context_,
         const ThrottlerPtr & throttler, const Scalars & scalars_, const Tables & external_tables_, QueryProcessingStage::Enum stage_)
     : query_executor(connection, query_, header_, context_, throttler, scalars_, external_tables_, stage_)
 {
@@ -15,7 +15,7 @@ RemoteBlockInputStream::RemoteBlockInputStream(
 
 RemoteBlockInputStream::RemoteBlockInputStream(
         std::vector<IConnectionPool::Entry> && connections,
-        const String & query_, const Block & header_, const Context & context_,
+        const String & query_, const Block & header_, ContextPtr context_,
         const ThrottlerPtr & throttler, const Scalars & scalars_, const Tables & external_tables_, QueryProcessingStage::Enum stage_)
     : query_executor(std::move(connections), query_, header_, context_, throttler, scalars_, external_tables_, stage_)
 {
@@ -24,7 +24,7 @@ RemoteBlockInputStream::RemoteBlockInputStream(
 
 RemoteBlockInputStream::RemoteBlockInputStream(
         const ConnectionPoolWithFailoverPtr & pool,
-        const String & query_, const Block & header_, const Context & context_,
+        const String & query_, const Block & header_, ContextPtr context_,
         const ThrottlerPtr & throttler, const Scalars & scalars_, const Tables & external_tables_, QueryProcessingStage::Enum stage_)
     : query_executor(pool, query_, header_, context_, throttler, scalars_, external_tables_, stage_)
 {
diff --git a/src/DataStreams/RemoteBlockInputStream.h b/src/DataStreams/RemoteBlockInputStream.h
index 5ef05ee99eb..b0029da91bb 100644
--- a/src/DataStreams/RemoteBlockInputStream.h
+++ b/src/DataStreams/RemoteBlockInputStream.h
@@ -25,21 +25,21 @@ public:
     /// Takes already set connection.
     RemoteBlockInputStream(
             Connection & connection,
-            const String & query_, const Block & header_, const Context & context_,
+            const String & query_, const Block & header_, ContextPtr context_,
             const ThrottlerPtr & throttler = nullptr, const Scalars & scalars_ = Scalars(), const Tables & external_tables_ = Tables(),
             QueryProcessingStage::Enum stage_ = QueryProcessingStage::Complete);
 
     /// Accepts several connections already taken from pool.
     RemoteBlockInputStream(
             std::vector<IConnectionPool::Entry> && connections,
-            const String & query_, const Block & header_, const Context & context_,
+            const String & query_, const Block & header_, ContextPtr context_,
             const ThrottlerPtr & throttler = nullptr, const Scalars & scalars_ = Scalars(), const Tables & external_tables_ = Tables(),
             QueryProcessingStage::Enum stage_ = QueryProcessingStage::Complete);
 
     /// Takes a pool and gets one or several connections from it.
     RemoteBlockInputStream(
             const ConnectionPoolWithFailoverPtr & pool,
-            const String & query_, const Block & header_, const Context & context_,
+            const String & query_, const Block & header_, ContextPtr context_,
             const ThrottlerPtr & throttler = nullptr, const Scalars & scalars_ = Scalars(), const Tables & external_tables_ = Tables(),
             QueryProcessingStage::Enum stage_ = QueryProcessingStage::Complete);
 
diff --git a/src/DataStreams/RemoteQueryExecutor.cpp b/src/DataStreams/RemoteQueryExecutor.cpp
index fc3870b3f22..0961dd41458 100644
--- a/src/DataStreams/RemoteQueryExecutor.cpp
+++ b/src/DataStreams/RemoteQueryExecutor.cpp
@@ -13,6 +13,8 @@
 #include <Interpreters/InternalTextLogsQueue.h>
 #include <IO/ConnectionTimeoutsContext.h>
 #include <Common/FiberStack.h>
+#include <Client/MultiplexedConnections.h>
+#include <Client/HedgedConnections.h>
 #include <Storages/MergeTree/MergeTreeDataPartUUID.h>
 
 namespace DB
@@ -20,61 +22,74 @@ namespace DB
 
 namespace ErrorCodes
 {
+    extern const int LOGICAL_ERROR;
     extern const int UNKNOWN_PACKET_FROM_SERVER;
     extern const int DUPLICATED_PART_UUIDS;
 }
 
 RemoteQueryExecutor::RemoteQueryExecutor(
     Connection & connection,
-    const String & query_, const Block & header_, const Context & context_,
-    ThrottlerPtr throttler, const Scalars & scalars_, const Tables & external_tables_, QueryProcessingStage::Enum stage_)
+    const String & query_, const Block & header_, ContextPtr context_,
+    ThrottlerPtr throttler, const Scalars & scalars_, const Tables & external_tables_,
+    QueryProcessingStage::Enum stage_, std::shared_ptr<TaskIterator> task_iterator_)
     : header(header_), query(query_), context(context_)
-    , scalars(scalars_), external_tables(external_tables_), stage(stage_)
+    , scalars(scalars_), external_tables(external_tables_), stage(stage_), task_iterator(task_iterator_)
 {
-    create_multiplexed_connections = [this, &connection, throttler]()
+    create_connections = [this, &connection, throttler]()
     {
-        return std::make_unique<MultiplexedConnections>(connection, context.getSettingsRef(), throttler);
+        return std::make_unique<MultiplexedConnections>(connection, context->getSettingsRef(), throttler);
     };
 }
 
 RemoteQueryExecutor::RemoteQueryExecutor(
-    std::vector<IConnectionPool::Entry> && connections,
-    const String & query_, const Block & header_, const Context & context_,
-    const ThrottlerPtr & throttler, const Scalars & scalars_, const Tables & external_tables_, QueryProcessingStage::Enum stage_)
+    std::vector<IConnectionPool::Entry> && connections_,
+    const String & query_, const Block & header_, ContextPtr context_,
+    const ThrottlerPtr & throttler, const Scalars & scalars_, const Tables & external_tables_,
+    QueryProcessingStage::Enum stage_, std::shared_ptr<TaskIterator> task_iterator_)
     : header(header_), query(query_), context(context_)
-    , scalars(scalars_), external_tables(external_tables_), stage(stage_)
+    , scalars(scalars_), external_tables(external_tables_), stage(stage_), task_iterator(task_iterator_)
 {
-    create_multiplexed_connections = [this, connections, throttler]() mutable
-    {
-        return std::make_unique<MultiplexedConnections>(
-                std::move(connections), context.getSettingsRef(), throttler);
+    create_connections = [this, connections_, throttler]() mutable {
+        return std::make_unique<MultiplexedConnections>(std::move(connections_), context->getSettingsRef(), throttler);
     };
 }
 
 RemoteQueryExecutor::RemoteQueryExecutor(
     const ConnectionPoolWithFailoverPtr & pool,
-    const String & query_, const Block & header_, const Context & context_,
-    const ThrottlerPtr & throttler, const Scalars & scalars_, const Tables & external_tables_, QueryProcessingStage::Enum stage_)
+    const String & query_, const Block & header_, ContextPtr context_,
+    const ThrottlerPtr & throttler, const Scalars & scalars_, const Tables & external_tables_,
+    QueryProcessingStage::Enum stage_, std::shared_ptr<TaskIterator> task_iterator_)
     : header(header_), query(query_), context(context_)
-    , scalars(scalars_), external_tables(external_tables_), stage(stage_)
+    , scalars(scalars_), external_tables(external_tables_), stage(stage_), task_iterator(task_iterator_)
 {
-    create_multiplexed_connections = [this, pool, throttler]()
+    create_connections = [this, pool, throttler]()->std::unique_ptr<IConnections>
     {
-        const Settings & current_settings = context.getSettingsRef();
+        const Settings & current_settings = context->getSettingsRef();
         auto timeouts = ConnectionTimeouts::getTCPTimeoutsWithFailover(current_settings);
-        std::vector<IConnectionPool::Entry> connections;
+
+#if defined(OS_LINUX)
+        if (current_settings.use_hedged_requests)
+        {
+            std::shared_ptr<QualifiedTableName> table_to_check = nullptr;
+            if (main_table)
+                table_to_check = std::make_shared<QualifiedTableName>(main_table.getQualifiedName());
+
+            return std::make_unique<HedgedConnections>(pool, current_settings, timeouts, throttler, pool_mode, table_to_check);
+        }
+#endif
+
+        std::vector<IConnectionPool::Entry> connection_entries;
         if (main_table)
         {
             auto try_results = pool->getManyChecked(timeouts, &current_settings, pool_mode, main_table.getQualifiedName());
-            connections.reserve(try_results.size());
+            connection_entries.reserve(try_results.size());
             for (auto & try_result : try_results)
-                connections.emplace_back(std::move(try_result.entry));
+                connection_entries.emplace_back(std::move(try_result.entry));
         }
         else
-            connections = pool->getMany(timeouts, &current_settings, pool_mode);
+            connection_entries = pool->getMany(timeouts, &current_settings, pool_mode);
 
-        return std::make_unique<MultiplexedConnections>(
-                std::move(connections), current_settings, throttler);
+        return std::make_unique<MultiplexedConnections>(std::move(connection_entries), current_settings, throttler);
     };
 }
 
@@ -85,7 +100,7 @@ RemoteQueryExecutor::~RemoteQueryExecutor()
       * these connections did not remain hanging in the out-of-sync state.
       */
     if (established || isQueryPending())
-        multiplexed_connections->disconnect();
+        connections->disconnect();
 }
 
 /** If we receive a block with slightly different column types, or with excessive columns,
@@ -142,10 +157,10 @@ void RemoteQueryExecutor::sendQuery()
     if (sent_query)
         return;
 
-    multiplexed_connections = create_multiplexed_connections();
+    connections = create_connections();
 
-    const auto & settings = context.getSettingsRef();
-    if (settings.skip_unavailable_shards && 0 == multiplexed_connections->size())
+    const auto & settings = context->getSettingsRef();
+    if (settings.skip_unavailable_shards && 0 == connections->size())
         return;
 
     /// Query cannot be canceled in the middle of the send query,
@@ -163,7 +178,7 @@ void RemoteQueryExecutor::sendQuery()
     was_cancelled = false;
 
     auto timeouts = ConnectionTimeouts::getTCPTimeoutsWithFailover(settings);
-    ClientInfo modified_client_info = context.getClientInfo();
+    ClientInfo modified_client_info = context->getClientInfo();
     modified_client_info.query_kind = ClientInfo::QueryKind::SECONDARY_QUERY;
     if (CurrentThread::isInitialized())
     {
@@ -173,10 +188,10 @@ void RemoteQueryExecutor::sendQuery()
     {
         std::lock_guard lock(duplicated_part_uuids_mutex);
         if (!duplicated_part_uuids.empty())
-            multiplexed_connections->sendIgnoredPartUUIDs(duplicated_part_uuids);
+            connections->sendIgnoredPartUUIDs(duplicated_part_uuids);
     }
 
-    multiplexed_connections->sendQuery(timeouts, query, query_id, stage, modified_client_info, true);
+    connections->sendQuery(timeouts, query, query_id, stage, modified_client_info, true);
 
     established = false;
     sent_query = true;
@@ -192,7 +207,7 @@ Block RemoteQueryExecutor::read()
     {
         sendQuery();
 
-        if (context.getSettingsRef().skip_unavailable_shards && (0 == multiplexed_connections->size()))
+        if (context->getSettingsRef().skip_unavailable_shards && (0 == connections->size()))
             return {};
     }
 
@@ -201,7 +216,7 @@ Block RemoteQueryExecutor::read()
         if (was_cancelled)
             return Block();
 
-        Packet packet = multiplexed_connections->receivePacket();
+        Packet packet = connections->receivePacket();
 
         if (auto block = processPacket(std::move(packet)))
             return *block;
@@ -218,7 +233,7 @@ std::variant<Block, int> RemoteQueryExecutor::read(std::unique_ptr<ReadContext>
     {
         sendQuery();
 
-        if (context.getSettingsRef().skip_unavailable_shards && (0 == multiplexed_connections->size()))
+        if (context->getSettingsRef().skip_unavailable_shards && (0 == connections->size()))
             return Block();
     }
 
@@ -228,7 +243,7 @@ std::variant<Block, int> RemoteQueryExecutor::read(std::unique_ptr<ReadContext>
         if (was_cancelled)
             return Block();
 
-        read_context = std::make_unique<ReadContext>(*multiplexed_connections);
+        read_context = std::make_unique<ReadContext>(*connections);
     }
 
     do
@@ -239,7 +254,7 @@ std::variant<Block, int> RemoteQueryExecutor::read(std::unique_ptr<ReadContext>
         if (read_context->is_read_in_progress.load(std::memory_order_relaxed))
         {
             read_context->setTimer();
-            return read_context->epoll_fd;
+            return read_context->epoll.getFileDescriptor();
         }
         else
         {
@@ -260,7 +275,7 @@ std::variant<Block, int> RemoteQueryExecutor::restartQueryWithoutDuplicatedUUIDs
 {
     /// Cancel previous query and disconnect before retry.
     cancel(read_context);
-    multiplexed_connections->disconnect();
+    connections->disconnect();
 
     /// Only resend once, otherwise throw an exception
     if (!resent_query)
@@ -284,6 +299,9 @@ std::optional<Block> RemoteQueryExecutor::processPacket(Packet packet)
 {
     switch (packet.type)
     {
+        case Protocol::Server::ReadTaskRequest:
+            processReadTaskRequest();
+            break;
         case Protocol::Server::PartUUIDs:
             if (!setPartUUIDs(packet.part_uuids))
                 got_duplicated_part_uuids = true;
@@ -300,7 +318,7 @@ std::optional<Block> RemoteQueryExecutor::processPacket(Packet packet)
             break;
 
         case Protocol::Server::EndOfStream:
-            if (!multiplexed_connections->hasActiveConnections())
+            if (!connections->hasActiveConnections())
             {
                 finished = true;
                 return Block();
@@ -342,7 +360,7 @@ std::optional<Block> RemoteQueryExecutor::processPacket(Packet packet)
             got_unknown_packet_from_replica = true;
             throw Exception(ErrorCodes::UNKNOWN_PACKET_FROM_SERVER, "Unknown packet {} from one of the following replicas: {}",
                 toString(packet.type),
-                multiplexed_connections->dumpAddresses());
+                connections->dumpAddresses());
     }
 
     return {};
@@ -350,8 +368,8 @@ std::optional<Block> RemoteQueryExecutor::processPacket(Packet packet)
 
 bool RemoteQueryExecutor::setPartUUIDs(const std::vector<UUID> & uuids)
 {
-    Context & query_context = const_cast<Context &>(context).getQueryContext();
-    auto duplicates = query_context.getPartUUIDs()->add(uuids);
+    auto query_context = context->getQueryContext();
+    auto duplicates = query_context->getPartUUIDs()->add(uuids);
 
     if (!duplicates.empty())
     {
@@ -362,6 +380,14 @@ bool RemoteQueryExecutor::setPartUUIDs(const std::vector<UUID> & uuids)
     return true;
 }
 
+void RemoteQueryExecutor::processReadTaskRequest()
+{
+    if (!task_iterator)
+        throw Exception("Distributed task iterator is not initialized", ErrorCodes::LOGICAL_ERROR);
+    auto response = (*task_iterator)();
+    connections->sendReadTaskResponse(response);
+}
+
 void RemoteQueryExecutor::finish(std::unique_ptr<ReadContext> * read_context)
 {
     /** If one of:
@@ -382,7 +408,7 @@ void RemoteQueryExecutor::finish(std::unique_ptr<ReadContext> * read_context)
     tryCancel("Cancelling query because enough data has been read", read_context);
 
     /// Get the remaining packets so that there is no out of sync in the connections to the replicas.
-    Packet packet = multiplexed_connections->drain();
+    Packet packet = connections->drain();
     switch (packet.type)
     {
         case Protocol::Server::EndOfStream:
@@ -404,7 +430,7 @@ void RemoteQueryExecutor::finish(std::unique_ptr<ReadContext> * read_context)
             got_unknown_packet_from_replica = true;
             throw Exception(ErrorCodes::UNKNOWN_PACKET_FROM_SERVER, "Unknown packet {} from one of the following replicas: {}",
                 toString(packet.type),
-                multiplexed_connections->dumpAddresses());
+                connections->dumpAddresses());
     }
 }
 
@@ -427,14 +453,14 @@ void RemoteQueryExecutor::cancel(std::unique_ptr<ReadContext> * read_context)
 
 void RemoteQueryExecutor::sendScalars()
 {
-    multiplexed_connections->sendScalarsData(scalars);
+    connections->sendScalarsData(scalars);
 }
 
 void RemoteQueryExecutor::sendExternalTables()
 {
     SelectQueryInfo query_info;
 
-    size_t count = multiplexed_connections->size();
+    size_t count = connections->size();
 
     {
         std::lock_guard lock(external_tables_mutex);
@@ -472,7 +498,7 @@ void RemoteQueryExecutor::sendExternalTables()
         }
     }
 
-    multiplexed_connections->sendExternalTablesData(external_tables_data);
+    connections->sendExternalTablesData(external_tables_data);
 }
 
 void RemoteQueryExecutor::tryCancel(const char * reason, std::unique_ptr<ReadContext> * read_context)
@@ -489,11 +515,11 @@ void RemoteQueryExecutor::tryCancel(const char * reason, std::unique_ptr<ReadCon
         if (read_context && *read_context)
             (*read_context)->cancel();
 
-        multiplexed_connections->sendCancel();
+        connections->sendCancel();
     }
 
     if (log)
-        LOG_TRACE(log, "({}) {}", multiplexed_connections->dumpAddresses(), reason);
+        LOG_TRACE(log, "({}) {}", connections->dumpAddresses(), reason);
 }
 
 bool RemoteQueryExecutor::isQueryPending() const
diff --git a/src/DataStreams/RemoteQueryExecutor.h b/src/DataStreams/RemoteQueryExecutor.h
index 6a10627b948..a9cffd9cf97 100644
--- a/src/DataStreams/RemoteQueryExecutor.h
+++ b/src/DataStreams/RemoteQueryExecutor.h
@@ -1,7 +1,8 @@
 #pragma once
 
 #include <Client/ConnectionPool.h>
-#include <Client/MultiplexedConnections.h>
+#include <Client/IConnections.h>
+#include <Client/ConnectionPoolWithFailover.h>
 #include <Storages/IStorage_fwd.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/StorageID.h>
@@ -25,6 +26,9 @@ using ProfileInfoCallback = std::function<void(const BlockStreamProfileInfo & in
 
 class RemoteQueryExecutorReadContext;
 
+/// This is the same type as StorageS3Source::IteratorWrapper
+using TaskIterator = std::function<String()>;
+
 /// This class allows one to launch queries on remote replicas of one shard and get results
 class RemoteQueryExecutor
 {
@@ -34,23 +38,23 @@ public:
     /// Takes already set connection.
     RemoteQueryExecutor(
         Connection & connection,
-        const String & query_, const Block & header_, const Context & context_,
+        const String & query_, const Block & header_, ContextPtr context_,
         ThrottlerPtr throttler_ = nullptr, const Scalars & scalars_ = Scalars(), const Tables & external_tables_ = Tables(),
-        QueryProcessingStage::Enum stage_ = QueryProcessingStage::Complete);
+        QueryProcessingStage::Enum stage_ = QueryProcessingStage::Complete, std::shared_ptr<TaskIterator> task_iterator_ = {});
 
     /// Accepts several connections already taken from pool.
     RemoteQueryExecutor(
-        std::vector<IConnectionPool::Entry> && connections,
-        const String & query_, const Block & header_, const Context & context_,
+        std::vector<IConnectionPool::Entry> && connections_,
+        const String & query_, const Block & header_, ContextPtr context_,
         const ThrottlerPtr & throttler = nullptr, const Scalars & scalars_ = Scalars(), const Tables & external_tables_ = Tables(),
-        QueryProcessingStage::Enum stage_ = QueryProcessingStage::Complete);
+        QueryProcessingStage::Enum stage_ = QueryProcessingStage::Complete, std::shared_ptr<TaskIterator> task_iterator_ = {});
 
     /// Takes a pool and gets one or several connections from it.
     RemoteQueryExecutor(
         const ConnectionPoolWithFailoverPtr & pool,
-        const String & query_, const Block & header_, const Context & context_,
+        const String & query_, const Block & header_, ContextPtr context_,
         const ThrottlerPtr & throttler = nullptr, const Scalars & scalars_ = Scalars(), const Tables & external_tables_ = Tables(),
-        QueryProcessingStage::Enum stage_ = QueryProcessingStage::Complete);
+        QueryProcessingStage::Enum stage_ = QueryProcessingStage::Complete, std::shared_ptr<TaskIterator> task_iterator_ = {});
 
     ~RemoteQueryExecutor();
 
@@ -103,12 +107,12 @@ private:
     Block totals;
     Block extremes;
 
-    std::function<std::unique_ptr<MultiplexedConnections>()> create_multiplexed_connections;
-    std::unique_ptr<MultiplexedConnections> multiplexed_connections;
+    std::function<std::unique_ptr<IConnections>()> create_connections;
+    std::unique_ptr<IConnections> connections;
 
     const String query;
-    String query_id = "";
-    Context context;
+    String query_id;
+    ContextPtr context;
 
     ProgressCallback progress_callback;
     ProfileInfoCallback profile_info_callback;
@@ -118,6 +122,8 @@ private:
     /// Temporary tables needed to be sent to remote servers
     Tables external_tables;
     QueryProcessingStage::Enum stage;
+    /// Initiator identifier for distributed task processing
+    std::shared_ptr<TaskIterator> task_iterator;
 
     /// Streams for reading from temporary tables and following sending of data
     /// to remote servers for GLOBAL-subqueries
@@ -178,6 +184,8 @@ private:
     /// Return true if duplicates found.
     bool setPartUUIDs(const std::vector<UUID> & uuids);
 
+    void processReadTaskRequest();
+
     /// Cancell query and restart it with info about duplicated UUIDs
     /// only for `allow_experimental_query_deduplication`.
     std::variant<Block, int> restartQueryWithoutDuplicatedUUIDs(std::unique_ptr<ReadContext> * read_context = nullptr);
diff --git a/src/DataStreams/RemoteQueryExecutorReadContext.cpp b/src/DataStreams/RemoteQueryExecutorReadContext.cpp
index 3cc24ad5056..46c2b6f10cb 100644
--- a/src/DataStreams/RemoteQueryExecutorReadContext.cpp
+++ b/src/DataStreams/RemoteQueryExecutorReadContext.cpp
@@ -3,7 +3,7 @@
 #include <DataStreams/RemoteQueryExecutorReadContext.h>
 #include <Common/Exception.h>
 #include <Common/NetException.h>
-#include <Client/MultiplexedConnections.h>
+#include <Client/IConnections.h>
 #include <sys/epoll.h>
 
 namespace DB
@@ -11,7 +11,7 @@ namespace DB
 
 struct RemoteQueryExecutorRoutine
 {
-    MultiplexedConnections & connections;
+    IConnections & connections;
     RemoteQueryExecutorReadContext & read_context;
 
     struct ReadCallback
@@ -19,15 +19,15 @@ struct RemoteQueryExecutorRoutine
         RemoteQueryExecutorReadContext & read_context;
         Fiber & fiber;
 
-        void operator()(Poco::Net::Socket & socket)
+        void operator()(int fd, const Poco::Timespan & timeout = 0, const std::string fd_description = "")
         {
             try
             {
-                read_context.setSocket(socket);
+                read_context.setConnectionFD(fd, timeout, fd_description);
             }
             catch (DB::Exception & e)
             {
-                e.addMessage(" while reading from socket ({})", socket.peerAddress().toString());
+                e.addMessage(" while reading from {}", fd_description);
                 throw;
             }
 
@@ -70,67 +70,45 @@ namespace ErrorCodes
     extern const int SOCKET_TIMEOUT;
 }
 
-RemoteQueryExecutorReadContext::RemoteQueryExecutorReadContext(MultiplexedConnections & connections_)
+RemoteQueryExecutorReadContext::RemoteQueryExecutorReadContext(IConnections & connections_)
     : connections(connections_)
 {
-    epoll_fd = epoll_create(2);
-    if (-1 == epoll_fd)
-        throwFromErrno("Cannot create epoll descriptor", ErrorCodes::CANNOT_OPEN_FILE);
 
     if (-1 == pipe2(pipe_fd, O_NONBLOCK))
         throwFromErrno("Cannot create pipe", ErrorCodes::CANNOT_OPEN_FILE);
 
     {
-        epoll_event socket_event;
-        socket_event.events = EPOLLIN | EPOLLPRI;
-        socket_event.data.fd = pipe_fd[0];
-
-        if (-1 == epoll_ctl(epoll_fd, EPOLL_CTL_ADD, pipe_fd[0], &socket_event))
-            throwFromErrno("Cannot add pipe descriptor to epoll", ErrorCodes::CANNOT_OPEN_FILE);
+        epoll.add(pipe_fd[0]);
     }
 
     {
-        epoll_event timer_event;
-        timer_event.events = EPOLLIN | EPOLLPRI;
-        timer_event.data.fd = timer.getDescriptor();
-
-        if (-1 == epoll_ctl(epoll_fd, EPOLL_CTL_ADD, timer_event.data.fd, &timer_event))
-            throwFromErrno("Cannot add timer descriptor to epoll", ErrorCodes::CANNOT_OPEN_FILE);
+        epoll.add(timer.getDescriptor());
     }
 
     auto routine = RemoteQueryExecutorRoutine{connections, *this};
     fiber = boost::context::fiber(std::allocator_arg_t(), stack, std::move(routine));
 }
 
-void RemoteQueryExecutorReadContext::setSocket(Poco::Net::Socket & socket)
+void RemoteQueryExecutorReadContext::setConnectionFD(int fd, const Poco::Timespan & timeout, const std::string & fd_description)
 {
-    int fd = socket.impl()->sockfd();
-    if (fd == socket_fd)
+    if (fd == connection_fd)
         return;
 
-    epoll_event socket_event;
-    socket_event.events = EPOLLIN | EPOLLPRI;
-    socket_event.data.fd = fd;
+    if (connection_fd != -1)
+        epoll.remove(connection_fd);
 
-    if (socket_fd != -1)
-    {
-        if (-1 == epoll_ctl(epoll_fd, EPOLL_CTL_DEL, socket_fd, &socket_event))
-            throwFromErrno("Cannot remove socket descriptor to epoll", ErrorCodes::CANNOT_OPEN_FILE);
-    }
+    connection_fd = fd;
+    epoll.add(connection_fd);
 
-    socket_fd = fd;
-
-    if (-1 == epoll_ctl(epoll_fd, EPOLL_CTL_ADD, socket_fd, &socket_event))
-        throwFromErrno("Cannot add socket descriptor to epoll", ErrorCodes::CANNOT_OPEN_FILE);
-
-    receive_timeout = socket.impl()->getReceiveTimeout();
+    receive_timeout = timeout;
+    connection_fd_description = fd_description;
 }
 
-bool RemoteQueryExecutorReadContext::checkTimeout() const
+bool RemoteQueryExecutorReadContext::checkTimeout(bool blocking)
 {
     try
     {
-        return checkTimeoutImpl();
+        return checkTimeoutImpl(blocking);
     }
     catch (DB::Exception & e)
     {
@@ -140,30 +118,23 @@ bool RemoteQueryExecutorReadContext::checkTimeout() const
     }
 }
 
-bool RemoteQueryExecutorReadContext::checkTimeoutImpl() const
+bool RemoteQueryExecutorReadContext::checkTimeoutImpl(bool blocking)
 {
+    /// Wait for epoll will not block if it was polled externally.
     epoll_event events[3];
     events[0].data.fd = events[1].data.fd = events[2].data.fd = -1;
 
-    /// Wait for epoll_fd will not block if it was polled externally.
-    int num_events = 0;
-    while (num_events <= 0)
-    {
-        num_events = epoll_wait(epoll_fd, events, 3, -1);
-        if (num_events == -1 && errno != EINTR)
-            throwFromErrno("Failed to epoll_wait", ErrorCodes::CANNOT_READ_FROM_SOCKET);
-    }
+    int num_events = epoll.getManyReady(3, events, blocking);
 
     bool is_socket_ready = false;
     bool is_pipe_alarmed = false;
-    bool has_timer_alarm = false;
 
     for (int i = 0; i < num_events; ++i)
     {
-        if (events[i].data.fd == socket_fd)
+        if (events[i].data.fd == connection_fd)
             is_socket_ready = true;
         if (events[i].data.fd == timer.getDescriptor())
-            has_timer_alarm = true;
+            is_timer_alarmed = true;
         if (events[i].data.fd == pipe_fd[0])
             is_pipe_alarmed = true;
     }
@@ -171,7 +142,7 @@ bool RemoteQueryExecutorReadContext::checkTimeoutImpl() const
     if (is_pipe_alarmed)
         return false;
 
-    if (has_timer_alarm && !is_socket_ready)
+    if (is_timer_alarmed && !is_socket_ready)
     {
         /// Socket receive timeout. Drain it in case or error, or it may be hide by timeout exception.
         timer.drain();
@@ -212,9 +183,24 @@ bool RemoteQueryExecutorReadContext::resumeRoutine()
 void RemoteQueryExecutorReadContext::cancel()
 {
     std::lock_guard guard(fiber_lock);
+
     /// It is safe to just destroy fiber - we are not in the process of reading from socket.
     boost::context::fiber to_destroy = std::move(fiber);
 
+    /// One should not try to wait for the current packet here in case of
+    /// timeout because this will exceed the timeout.
+    /// Anyway if the timeout is exceeded, then the connection will be shutdown
+    /// (disconnected), so it will not left in an unsynchronised state.
+    if (!is_timer_alarmed)
+    {
+        /// Wait for current pending packet, to avoid leaving connection in unsynchronised state.
+        while (is_read_in_progress.load(std::memory_order_relaxed))
+        {
+            checkTimeout(/* blocking= */ true);
+            to_destroy = std::move(to_destroy).resume();
+        }
+    }
+
     /// Send something to pipe to cancel executor waiting.
     uint64_t buf = 0;
     while (-1 == write(pipe_fd[1], &buf, sizeof(buf)))
@@ -229,9 +215,7 @@ void RemoteQueryExecutorReadContext::cancel()
 
 RemoteQueryExecutorReadContext::~RemoteQueryExecutorReadContext()
 {
-    /// socket_fd is closed by Poco::Net::Socket
-    if (epoll_fd != -1)
-        close(epoll_fd);
+    /// connection_fd is closed by Poco::Net::Socket or Epoll
     if (pipe_fd[0] != -1)
         close(pipe_fd[0]);
     if (pipe_fd[1] != -1)
diff --git a/src/DataStreams/RemoteQueryExecutorReadContext.h b/src/DataStreams/RemoteQueryExecutorReadContext.h
index 89dc2813a9a..4e935bf9c43 100644
--- a/src/DataStreams/RemoteQueryExecutorReadContext.h
+++ b/src/DataStreams/RemoteQueryExecutorReadContext.h
@@ -7,7 +7,9 @@
 #include <Common/Fiber.h>
 #include <Common/FiberStack.h>
 #include <Common/TimerDescriptor.h>
+#include <Common/Epoll.h>
 #include <Client/Connection.h>
+#include <Client/IConnections.h>
 #include <Poco/Timespan.h>
 
 namespace Poco::Net
@@ -33,26 +35,30 @@ public:
     std::mutex fiber_lock;
 
     Poco::Timespan receive_timeout;
-    MultiplexedConnections & connections;
+    IConnections & connections;
     Poco::Net::Socket * last_used_socket = nullptr;
 
     /// Here we have three descriptors we are going to wait:
-    /// * socket_fd is a descriptor of connection. It may be changed in case of reading from several replicas.
+    /// * connection_fd is a descriptor of connection. It may be changed in case of reading from several replicas.
     /// * timer is a timerfd descriptor to manually check socket timeout
     /// * pipe_fd is a pipe we use to cancel query and socket polling by executor.
-    /// We put those descriptors into our own epoll_fd which is used by external executor.
+    /// We put those descriptors into our own epoll which is used by external executor.
     TimerDescriptor timer{CLOCK_MONOTONIC, 0};
-    int socket_fd = -1;
-    int epoll_fd = -1;
+    bool is_timer_alarmed = false;
+    int connection_fd = -1;
     int pipe_fd[2] = { -1, -1 };
 
-    explicit RemoteQueryExecutorReadContext(MultiplexedConnections & connections_);
+    Epoll epoll;
+
+    std::string connection_fd_description;
+
+    explicit RemoteQueryExecutorReadContext(IConnections & connections_);
     ~RemoteQueryExecutorReadContext();
 
-    bool checkTimeout() const;
-    bool checkTimeoutImpl() const;
+    bool checkTimeout(bool blocking = false);
+    bool checkTimeoutImpl(bool blocking);
 
-    void setSocket(Poco::Net::Socket & socket);
+    void setConnectionFD(int fd, const Poco::Timespan & timeout = 0, const std::string & fd_description = "");
     void setTimer() const;
 
     bool resumeRoutine();
diff --git a/src/DataStreams/TTLAggregationAlgorithm.cpp b/src/DataStreams/TTLAggregationAlgorithm.cpp
index ebe08159c55..9a1cf45772f 100644
--- a/src/DataStreams/TTLAggregationAlgorithm.cpp
+++ b/src/DataStreams/TTLAggregationAlgorithm.cpp
@@ -28,12 +28,12 @@ TTLAggregationAlgorithm::TTLAggregationAlgorithm(
                 descr.arguments.push_back(header.getPositionByName(name));
 
     columns_for_aggregator.resize(description.aggregate_descriptions.size());
-    const Settings & settings = storage_.global_context.getSettingsRef();
+    const Settings & settings = storage_.getContext()->getSettingsRef();
 
     Aggregator::Params params(header, keys, aggregates,
         false, settings.max_rows_to_group_by, settings.group_by_overflow_mode, 0, 0,
         settings.max_bytes_before_external_group_by, settings.empty_result_for_aggregation_by_empty_set,
-        storage_.global_context.getTemporaryVolume(), settings.max_threads, settings.min_free_disk_space_for_temporary_data);
+        storage_.getContext()->getTemporaryVolume(), settings.max_threads, settings.min_free_disk_space_for_temporary_data);
 
     aggregator = std::make_unique<Aggregator>(params);
 }
diff --git a/src/DataStreams/TTLBlockInputStream.cpp b/src/DataStreams/TTLBlockInputStream.cpp
index 4f141a03475..8b31da6d2f1 100644
--- a/src/DataStreams/TTLBlockInputStream.cpp
+++ b/src/DataStreams/TTLBlockInputStream.cpp
@@ -68,8 +68,9 @@ TTLBlockInputStream::TTLBlockInputStream(
                 auto default_ast = it->second.expression->clone();
                 default_ast = addTypeConversionToAST(std::move(default_ast), column.type->getName());
 
-                auto syntax_result = TreeRewriter(storage_.global_context).analyze(default_ast, metadata_snapshot_->getColumns().getAllPhysical());
-                default_expression = ExpressionAnalyzer{default_ast, syntax_result, storage_.global_context}.getActions(true);
+                auto syntax_result
+                    = TreeRewriter(storage_.getContext()).analyze(default_ast, metadata_snapshot_->getColumns().getAllPhysical());
+                default_expression = ExpressionAnalyzer{default_ast, syntax_result, storage_.getContext()}.getActions(true);
                 default_column_name = default_ast->getColumnName();
             }
 
diff --git a/src/DataStreams/copyData.cpp b/src/DataStreams/copyData.cpp
index a0651999034..a26052778a8 100644
--- a/src/DataStreams/copyData.cpp
+++ b/src/DataStreams/copyData.cpp
@@ -49,6 +49,16 @@ void copyDataImpl(IBlockInputStream & from, IBlockOutputStream & to, TCancelCall
     to.writeSuffix();
 }
 
+void copyData(IBlockInputStream & from, IBlockOutputStream & to, const std::function<void(const Block & block)> & progress,
+              std::atomic<bool> * is_cancelled)
+{
+    auto is_cancelled_pred = [is_cancelled] ()
+    {
+        return isAtomicSet(is_cancelled);
+    };
+
+    copyDataImpl(from, to, is_cancelled_pred, progress);
+}
 
 inline void doNothing(const Block &) {}
 
diff --git a/src/DataStreams/copyData.h b/src/DataStreams/copyData.h
index f2bce8f411b..3dc90aed37d 100644
--- a/src/DataStreams/copyData.h
+++ b/src/DataStreams/copyData.h
@@ -16,6 +16,9 @@ class Block;
   */
 void copyData(IBlockInputStream & from, IBlockOutputStream & to, std::atomic<bool> * is_cancelled = nullptr);
 
+void copyData(IBlockInputStream & from, IBlockOutputStream & to, const std::function<void(const Block & block)> & progress,
+              std::atomic<bool> * is_cancelled = nullptr);
+
 void copyData(IBlockInputStream & from, IBlockOutputStream & to, const std::function<bool()> & is_cancelled);
 
 void copyData(IBlockInputStream & from, IBlockOutputStream & to, const std::function<bool()> & is_cancelled,
diff --git a/src/DataTypes/DataTypeAggregateFunction.cpp b/src/DataTypes/DataTypeAggregateFunction.cpp
index e92994ae979..7f7b01e031b 100644
--- a/src/DataTypes/DataTypeAggregateFunction.cpp
+++ b/src/DataTypes/DataTypeAggregateFunction.cpp
@@ -11,6 +11,7 @@
 
 #include <Formats/FormatSettings.h>
 #include <DataTypes/DataTypeAggregateFunction.h>
+#include <DataTypes/Serializations/SerializationAggregateFunction.h>
 #include <DataTypes/DataTypeFactory.h>
 #include <IO/WriteBufferFromString.h>
 #include <IO/Operators.h>
@@ -58,207 +59,6 @@ std::string DataTypeAggregateFunction::doGetName() const
     return stream.str();
 }
 
-void DataTypeAggregateFunction::serializeBinary(const Field & field, WriteBuffer & ostr) const
-{
-    const String & s = get<const String &>(field);
-    writeVarUInt(s.size(), ostr);
-    writeString(s, ostr);
-}
-
-void DataTypeAggregateFunction::deserializeBinary(Field & field, ReadBuffer & istr) const
-{
-    UInt64 size;
-    readVarUInt(size, istr);
-    field = String();
-    String & s = get<String &>(field);
-    s.resize(size);
-    istr.readStrict(s.data(), size);
-}
-
-void DataTypeAggregateFunction::serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr) const
-{
-    function->serialize(assert_cast<const ColumnAggregateFunction &>(column).getData()[row_num], ostr);
-}
-
-void DataTypeAggregateFunction::deserializeBinary(IColumn & column, ReadBuffer & istr) const
-{
-    ColumnAggregateFunction & column_concrete = assert_cast<ColumnAggregateFunction &>(column);
-
-    Arena & arena = column_concrete.createOrGetArena();
-    size_t size_of_state = function->sizeOfData();
-    AggregateDataPtr place = arena.alignedAlloc(size_of_state, function->alignOfData());
-
-    function->create(place);
-    try
-    {
-        function->deserialize(place, istr, &arena);
-    }
-    catch (...)
-    {
-        function->destroy(place);
-        throw;
-    }
-
-    column_concrete.getData().push_back(place);
-}
-
-void DataTypeAggregateFunction::serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, size_t offset, size_t limit) const
-{
-    const ColumnAggregateFunction & real_column = typeid_cast<const ColumnAggregateFunction &>(column);
-    const ColumnAggregateFunction::Container & vec = real_column.getData();
-
-    ColumnAggregateFunction::Container::const_iterator it = vec.begin() + offset;
-    ColumnAggregateFunction::Container::const_iterator end = limit ? it + limit : vec.end();
-
-    if (end > vec.end())
-        end = vec.end();
-
-    for (; it != end; ++it)
-        function->serialize(*it, ostr);
-}
-
-void DataTypeAggregateFunction::deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, size_t limit, double /*avg_value_size_hint*/) const
-{
-    ColumnAggregateFunction & real_column = typeid_cast<ColumnAggregateFunction &>(column);
-    ColumnAggregateFunction::Container & vec = real_column.getData();
-
-    Arena & arena = real_column.createOrGetArena();
-    real_column.set(function);
-    vec.reserve(vec.size() + limit);
-
-    size_t size_of_state = function->sizeOfData();
-    size_t align_of_state = function->alignOfData();
-
-    for (size_t i = 0; i < limit; ++i)
-    {
-        if (istr.eof())
-            break;
-
-        AggregateDataPtr place = arena.alignedAlloc(size_of_state, align_of_state);
-
-        function->create(place);
-
-        try
-        {
-            function->deserialize(place, istr, &arena);
-        }
-        catch (...)
-        {
-            function->destroy(place);
-            throw;
-        }
-
-        vec.push_back(place);
-    }
-}
-
-static String serializeToString(const AggregateFunctionPtr & function, const IColumn & column, size_t row_num)
-{
-    WriteBufferFromOwnString buffer;
-    function->serialize(assert_cast<const ColumnAggregateFunction &>(column).getData()[row_num], buffer);
-    return buffer.str();
-}
-
-static void deserializeFromString(const AggregateFunctionPtr & function, IColumn & column, const String & s)
-{
-    ColumnAggregateFunction & column_concrete = assert_cast<ColumnAggregateFunction &>(column);
-
-    Arena & arena = column_concrete.createOrGetArena();
-    size_t size_of_state = function->sizeOfData();
-    AggregateDataPtr place = arena.alignedAlloc(size_of_state, function->alignOfData());
-
-    function->create(place);
-
-    try
-    {
-        ReadBufferFromString istr(s);
-        function->deserialize(place, istr, &arena);
-    }
-    catch (...)
-    {
-        function->destroy(place);
-        throw;
-    }
-
-    column_concrete.getData().push_back(place);
-}
-
-void DataTypeAggregateFunction::serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const
-{
-    writeString(serializeToString(function, column, row_num), ostr);
-}
-
-
-void DataTypeAggregateFunction::serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const
-{
-    writeEscapedString(serializeToString(function, column, row_num), ostr);
-}
-
-
-void DataTypeAggregateFunction::deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
-{
-    String s;
-    readEscapedString(s, istr);
-    deserializeFromString(function, column, s);
-}
-
-
-void DataTypeAggregateFunction::serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const
-{
-    writeQuotedString(serializeToString(function, column, row_num), ostr);
-}
-
-
-void DataTypeAggregateFunction::deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
-{
-    String s;
-    readQuotedStringWithSQLStyle(s, istr);
-    deserializeFromString(function, column, s);
-}
-
-
-void DataTypeAggregateFunction::deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
-{
-    String s;
-    readStringUntilEOF(s, istr);
-    deserializeFromString(function, column, s);
-}
-
-
-void DataTypeAggregateFunction::serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    writeJSONString(serializeToString(function, column, row_num), ostr, settings);
-}
-
-
-void DataTypeAggregateFunction::deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
-{
-    String s;
-    readJSONString(s, istr);
-    deserializeFromString(function, column, s);
-}
-
-
-void DataTypeAggregateFunction::serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const
-{
-    writeXMLStringForTextElement(serializeToString(function, column, row_num), ostr);
-}
-
-
-void DataTypeAggregateFunction::serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const
-{
-    writeCSV(serializeToString(function, column, row_num), ostr);
-}
-
-
-void DataTypeAggregateFunction::deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
-{
-    String s;
-    readCSV(s, istr, settings.csv);
-    deserializeFromString(function, column, s);
-}
-
-
 MutableColumnPtr DataTypeAggregateFunction::createColumn() const
 {
     return ColumnAggregateFunction::create(function);
@@ -298,6 +98,11 @@ bool DataTypeAggregateFunction::equals(const IDataType & rhs) const
     return typeid(rhs) == typeid(*this) && getName() == rhs.getName();
 }
 
+SerializationPtr DataTypeAggregateFunction::doGetDefaultSerialization() const
+{
+    return std::make_shared<SerializationAggregateFunction>(function);
+}
+
 
 static DataTypePtr create(const ASTPtr & arguments)
 {
diff --git a/src/DataTypes/DataTypeAggregateFunction.h b/src/DataTypes/DataTypeAggregateFunction.h
index d07d46fd3ee..c3fea2ba727 100644
--- a/src/DataTypes/DataTypeAggregateFunction.h
+++ b/src/DataTypes/DataTypeAggregateFunction.h
@@ -39,27 +39,6 @@ public:
     DataTypePtr getReturnTypeToPredict() const { return function->getReturnTypeToPredict(); }
     DataTypes getArgumentsDataTypes() const { return argument_types; }
 
-    /// NOTE These two functions for serializing single values are incompatible with the functions below.
-    void serializeBinary(const Field & field, WriteBuffer & ostr) const override;
-    void deserializeBinary(Field & field, ReadBuffer & istr) const override;
-
-    void serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr) const override;
-    void deserializeBinary(IColumn & column, ReadBuffer & istr) const override;
-    void serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, size_t offset, size_t limit) const override;
-    void deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, size_t limit, double avg_value_size_hint) const override;
-    void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-    void serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-    void deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
-    void serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-    void deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
-    void deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
-
-    void serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-    void deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
-    void serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-    void serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-    void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
-
     MutableColumnPtr createColumn() const override;
 
     Field getDefault() const override;
@@ -69,6 +48,8 @@ public:
     bool isParametric() const override { return true; }
     bool haveSubtypes() const override { return false; }
     bool shouldAlignRightInPrettyFormats() const override { return false; }
+
+    SerializationPtr doGetDefaultSerialization() const override;
 };
 
 
diff --git a/src/DataTypes/DataTypeArray.cpp b/src/DataTypes/DataTypeArray.cpp
index 27088ab822c..bcf3a9c1f57 100644
--- a/src/DataTypes/DataTypeArray.cpp
+++ b/src/DataTypes/DataTypeArray.cpp
@@ -9,7 +9,9 @@
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeFactory.h>
-#include <DataTypes/DataTypeOneElementTuple.h>
+#include <DataTypes/Serializations/SerializationArray.h>
+#include <DataTypes/Serializations/SerializationTupleElement.h>
+#include <DataTypes/Serializations/SerializationNumber.h>
 
 #include <Parsers/IAST.h>
 
@@ -24,10 +26,7 @@ namespace DB
 
 namespace ErrorCodes
 {
-    extern const int CANNOT_READ_ALL_DATA;
-    extern const int CANNOT_READ_ARRAY_FROM_TEXT;
     extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
-    extern const int LOGICAL_ERROR;
 }
 
 
@@ -37,490 +36,6 @@ DataTypeArray::DataTypeArray(const DataTypePtr & nested_)
 }
 
 
-void DataTypeArray::serializeBinary(const Field & field, WriteBuffer & ostr) const
-{
-    const Array & a = get<const Array &>(field);
-    writeVarUInt(a.size(), ostr);
-    for (size_t i = 0; i < a.size(); ++i)
-    {
-        nested->serializeBinary(a[i], ostr);
-    }
-}
-
-
-void DataTypeArray::deserializeBinary(Field & field, ReadBuffer & istr) const
-{
-    size_t size;
-    readVarUInt(size, istr);
-    field = Array(size);
-    Array & arr = get<Array &>(field);
-    for (size_t i = 0; i < size; ++i)
-        nested->deserializeBinary(arr[i], istr);
-}
-
-
-void DataTypeArray::serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr) const
-{
-    const ColumnArray & column_array = assert_cast<const ColumnArray &>(column);
-    const ColumnArray::Offsets & offsets = column_array.getOffsets();
-
-    size_t offset = offsets[row_num - 1];
-    size_t next_offset = offsets[row_num];
-    size_t size = next_offset - offset;
-
-    writeVarUInt(size, ostr);
-
-    const IColumn & nested_column = column_array.getData();
-    for (size_t i = offset; i < next_offset; ++i)
-        nested->serializeBinary(nested_column, i, ostr);
-}
-
-
-void DataTypeArray::deserializeBinary(IColumn & column, ReadBuffer & istr) const
-{
-    ColumnArray & column_array = assert_cast<ColumnArray &>(column);
-    ColumnArray::Offsets & offsets = column_array.getOffsets();
-
-    size_t size;
-    readVarUInt(size, istr);
-
-    IColumn & nested_column = column_array.getData();
-
-    size_t i = 0;
-    try
-    {
-        for (; i < size; ++i)
-            nested->deserializeBinary(nested_column, istr);
-    }
-    catch (...)
-    {
-        if (i)
-            nested_column.popBack(i);
-        throw;
-    }
-
-    offsets.push_back(offsets.back() + size);
-}
-
-
-namespace
-{
-    void serializeArraySizesPositionIndependent(const IColumn & column, WriteBuffer & ostr, UInt64 offset, UInt64 limit)
-    {
-        const ColumnArray & column_array = typeid_cast<const ColumnArray &>(column);
-        const ColumnArray::Offsets & offset_values = column_array.getOffsets();
-        size_t size = offset_values.size();
-
-        if (!size)
-            return;
-
-        size_t end = limit && (offset + limit < size)
-            ? offset + limit
-            : size;
-
-        ColumnArray::Offset prev_offset = offset_values[offset - 1];
-        for (size_t i = offset; i < end; ++i)
-        {
-            ColumnArray::Offset current_offset = offset_values[i];
-            writeIntBinary(current_offset - prev_offset, ostr);
-            prev_offset = current_offset;
-        }
-    }
-
-    void deserializeArraySizesPositionIndependent(IColumn & column, ReadBuffer & istr, UInt64 limit)
-    {
-        ColumnArray & column_array = typeid_cast<ColumnArray &>(column);
-        ColumnArray::Offsets & offset_values = column_array.getOffsets();
-        size_t initial_size = offset_values.size();
-        offset_values.resize(initial_size + limit);
-
-        size_t i = initial_size;
-        ColumnArray::Offset current_offset = initial_size ? offset_values[initial_size - 1] : 0;
-        while (i < initial_size + limit && !istr.eof())
-        {
-            ColumnArray::Offset current_size = 0;
-            readIntBinary(current_size, istr);
-            current_offset += current_size;
-            offset_values[i] = current_offset;
-            ++i;
-        }
-
-        offset_values.resize(i);
-    }
-
-    ColumnPtr arrayOffsetsToSizes(const IColumn & column)
-    {
-        const auto & column_offsets = assert_cast<const ColumnArray::ColumnOffsets &>(column);
-        MutableColumnPtr column_sizes = column_offsets.cloneEmpty();
-
-        if (column_offsets.empty())
-            return column_sizes;
-
-        const auto & offsets_data = column_offsets.getData();
-        auto & sizes_data = assert_cast<ColumnArray::ColumnOffsets &>(*column_sizes).getData();
-
-        sizes_data.resize(offsets_data.size());
-
-        IColumn::Offset prev_offset = 0;
-        for (size_t i = 0, size = offsets_data.size(); i < size; ++i)
-        {
-            auto current_offset = offsets_data[i];
-            sizes_data[i] = current_offset - prev_offset;
-            prev_offset =  current_offset;
-        }
-
-        return column_sizes;
-    }
-
-    ColumnPtr arraySizesToOffsets(const IColumn & column)
-    {
-        const auto & column_sizes = assert_cast<const ColumnArray::ColumnOffsets &>(column);
-        MutableColumnPtr column_offsets = column_sizes.cloneEmpty();
-
-        if (column_sizes.empty())
-            return column_offsets;
-
-        const auto & sizes_data = column_sizes.getData();
-        auto & offsets_data = assert_cast<ColumnArray::ColumnOffsets &>(*column_offsets).getData();
-
-        offsets_data.resize(sizes_data.size());
-
-        IColumn::Offset prev_offset = 0;
-        for (size_t i = 0, size = sizes_data.size(); i < size; ++i)
-        {
-            prev_offset += sizes_data[i];
-            offsets_data[i] = prev_offset;
-        }
-
-        return column_offsets;
-    }
-}
-
-
-void DataTypeArray::enumerateStreamsImpl(const StreamCallback & callback, SubstreamPath & path) const
-{
-    path.push_back(Substream::ArraySizes);
-    callback(path, *this);
-    path.back() = Substream::ArrayElements;
-    nested->enumerateStreams(callback, path);
-    path.pop_back();
-}
-
-
-void DataTypeArray::serializeBinaryBulkStatePrefixImpl(
-    SerializeBinaryBulkSettings & settings,
-    SerializeBinaryBulkStatePtr & state) const
-{
-    settings.path.push_back(Substream::ArrayElements);
-    nested->serializeBinaryBulkStatePrefix(settings, state);
-    settings.path.pop_back();
-}
-
-
-void DataTypeArray::serializeBinaryBulkStateSuffixImpl(
-    SerializeBinaryBulkSettings & settings,
-    SerializeBinaryBulkStatePtr & state) const
-{
-    settings.path.push_back(Substream::ArrayElements);
-    nested->serializeBinaryBulkStateSuffix(settings, state);
-    settings.path.pop_back();
-}
-
-
-void DataTypeArray::deserializeBinaryBulkStatePrefixImpl(
-    DeserializeBinaryBulkSettings & settings,
-    DeserializeBinaryBulkStatePtr & state) const
-{
-    settings.path.push_back(Substream::ArrayElements);
-    nested->deserializeBinaryBulkStatePrefix(settings, state);
-    settings.path.pop_back();
-}
-
-
-void DataTypeArray::serializeBinaryBulkWithMultipleStreamsImpl(
-    const IColumn & column,
-    size_t offset,
-    size_t limit,
-    SerializeBinaryBulkSettings & settings,
-    SerializeBinaryBulkStatePtr & state) const
-{
-    const ColumnArray & column_array = typeid_cast<const ColumnArray &>(column);
-
-    /// First serialize array sizes.
-    settings.path.push_back(Substream::ArraySizes);
-    if (auto * stream = settings.getter(settings.path))
-    {
-        if (settings.position_independent_encoding)
-            serializeArraySizesPositionIndependent(column, *stream, offset, limit);
-        else
-            DataTypeNumber<ColumnArray::Offset>().serializeBinaryBulk(*column_array.getOffsetsPtr(), *stream, offset, limit);
-    }
-
-    /// Then serialize contents of arrays.
-    settings.path.back() = Substream::ArrayElements;
-    const ColumnArray::Offsets & offset_values = column_array.getOffsets();
-
-    if (offset > offset_values.size())
-        return;
-
-    /** offset - from which array to write.
-      * limit - how many arrays should be written, or 0, if you write everything that is.
-      * end - up to which array the recorded piece ends.
-      *
-      * nested_offset - from which element of the innards to write.
-      * nested_limit - how many elements of the innards to write, or 0, if you write everything that is.
-      */
-
-    size_t end = std::min(offset + limit, offset_values.size());
-
-    size_t nested_offset = offset ? offset_values[offset - 1] : 0;
-    size_t nested_limit = limit
-        ? offset_values[end - 1] - nested_offset
-        : 0;
-
-    if (limit == 0 || nested_limit)
-        nested->serializeBinaryBulkWithMultipleStreams(column_array.getData(), nested_offset, nested_limit, settings, state);
-    settings.path.pop_back();
-}
-
-
-void DataTypeArray::deserializeBinaryBulkWithMultipleStreamsImpl(
-    IColumn & column,
-    size_t limit,
-    DeserializeBinaryBulkSettings & settings,
-    DeserializeBinaryBulkStatePtr & state,
-    SubstreamsCache * cache) const
-{
-    ColumnArray & column_array = typeid_cast<ColumnArray &>(column);
-    settings.path.push_back(Substream::ArraySizes);
-
-    if (auto cached_column = getFromSubstreamsCache(cache, settings.path))
-    {
-        column_array.getOffsetsPtr() = arraySizesToOffsets(*cached_column);
-    }
-    else if (auto * stream = settings.getter(settings.path))
-    {
-        if (settings.position_independent_encoding)
-            deserializeArraySizesPositionIndependent(column, *stream, limit);
-        else
-            DataTypeNumber<ColumnArray::Offset>().deserializeBinaryBulk(column_array.getOffsetsColumn(), *stream, limit, 0);
-
-        addToSubstreamsCache(cache, settings.path, arrayOffsetsToSizes(column_array.getOffsetsColumn()));
-    }
-
-    settings.path.back() = Substream::ArrayElements;
-
-    ColumnArray::Offsets & offset_values = column_array.getOffsets();
-    ColumnPtr & nested_column = column_array.getDataPtr();
-
-    /// Number of values corresponding with `offset_values` must be read.
-    size_t last_offset = offset_values.back();
-    if (last_offset < nested_column->size())
-        throw Exception("Nested column is longer than last offset", ErrorCodes::LOGICAL_ERROR);
-    size_t nested_limit = last_offset - nested_column->size();
-
-    /// Adjust value size hint. Divide it to the average array size.
-    settings.avg_value_size_hint = nested_limit ? settings.avg_value_size_hint / nested_limit * offset_values.size() : 0;
-
-    nested->deserializeBinaryBulkWithMultipleStreams(nested_column, nested_limit, settings, state, cache);
-
-    settings.path.pop_back();
-
-    /// Check consistency between offsets and elements subcolumns.
-    /// But if elements column is empty - it's ok for columns of Nested types that was added by ALTER.
-    if (!nested_column->empty() && nested_column->size() != last_offset)
-        throw ParsingException("Cannot read all array values: read just " + toString(nested_column->size()) + " of " + toString(last_offset),
-            ErrorCodes::CANNOT_READ_ALL_DATA);
-}
-
-
-template <typename Writer>
-static void serializeTextImpl(const IColumn & column, size_t row_num, WriteBuffer & ostr, Writer && write_nested)
-{
-    const ColumnArray & column_array = assert_cast<const ColumnArray &>(column);
-    const ColumnArray::Offsets & offsets = column_array.getOffsets();
-
-    size_t offset = offsets[row_num - 1];
-    size_t next_offset = offsets[row_num];
-
-    const IColumn & nested_column = column_array.getData();
-
-    writeChar('[', ostr);
-    for (size_t i = offset; i < next_offset; ++i)
-    {
-        if (i != offset)
-            writeChar(',', ostr);
-        write_nested(nested_column, i);
-    }
-    writeChar(']', ostr);
-}
-
-
-template <typename Reader>
-static void deserializeTextImpl(IColumn & column, ReadBuffer & istr, Reader && read_nested, bool allow_unenclosed)
-{
-    ColumnArray & column_array = assert_cast<ColumnArray &>(column);
-    ColumnArray::Offsets & offsets = column_array.getOffsets();
-
-    IColumn & nested_column = column_array.getData();
-
-    size_t size = 0;
-
-    bool has_braces = false;
-    if (checkChar('[', istr))
-        has_braces = true;
-    else if (!allow_unenclosed)
-        throw Exception(ErrorCodes::CANNOT_READ_ARRAY_FROM_TEXT, "Array does not start with '[' character");
-
-    try
-    {
-        bool first = true;
-        while (!istr.eof() && *istr.position() != ']')
-        {
-            if (!first)
-            {
-                if (*istr.position() == ',')
-                    ++istr.position();
-                else
-                    throw ParsingException(ErrorCodes::CANNOT_READ_ARRAY_FROM_TEXT,
-                        "Cannot read array from text, expected comma or end of array, found '{}'",
-                        *istr.position());
-            }
-
-            first = false;
-
-            skipWhitespaceIfAny(istr);
-
-            if (*istr.position() == ']')
-                break;
-
-            read_nested(nested_column);
-            ++size;
-
-            skipWhitespaceIfAny(istr);
-        }
-
-        if (has_braces)
-            assertChar(']', istr);
-        else /// If array is not enclosed in braces, we read until EOF.
-            assertEOF(istr);
-    }
-    catch (...)
-    {
-        if (size)
-            nested_column.popBack(size);
-        throw;
-    }
-
-    offsets.push_back(offsets.back() + size);
-}
-
-
-void DataTypeArray::serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    serializeTextImpl(column, row_num, ostr,
-        [&](const IColumn & nested_column, size_t i)
-        {
-            nested->serializeAsTextQuoted(nested_column, i, ostr, settings);
-        });
-}
-
-
-void DataTypeArray::deserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
-{
-    deserializeTextImpl(column, istr,
-        [&](IColumn & nested_column)
-        {
-            nested->deserializeAsTextQuoted(nested_column, istr, settings);
-        }, false);
-}
-
-void DataTypeArray::serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    const ColumnArray & column_array = assert_cast<const ColumnArray &>(column);
-    const ColumnArray::Offsets & offsets = column_array.getOffsets();
-
-    size_t offset = offsets[row_num - 1];
-    size_t next_offset = offsets[row_num];
-
-    const IColumn & nested_column = column_array.getData();
-
-    writeChar('[', ostr);
-    for (size_t i = offset; i < next_offset; ++i)
-    {
-        if (i != offset)
-            writeChar(',', ostr);
-        nested->serializeAsTextJSON(nested_column, i, ostr, settings);
-    }
-    writeChar(']', ostr);
-}
-
-
-void DataTypeArray::deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
-{
-    deserializeTextImpl(column, istr,
-        [&](IColumn & nested_column)
-        {
-            nested->deserializeAsTextJSON(nested_column, istr, settings);
-        }, false);
-}
-
-
-void DataTypeArray::serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    const ColumnArray & column_array = assert_cast<const ColumnArray &>(column);
-    const ColumnArray::Offsets & offsets = column_array.getOffsets();
-
-    size_t offset = offsets[row_num - 1];
-    size_t next_offset = offsets[row_num];
-
-    const IColumn & nested_column = column_array.getData();
-
-    writeCString("<array>", ostr);
-    for (size_t i = offset; i < next_offset; ++i)
-    {
-        writeCString("<elem>", ostr);
-        nested->serializeAsTextXML(nested_column, i, ostr, settings);
-        writeCString("</elem>", ostr);
-    }
-    writeCString("</array>", ostr);
-}
-
-
-void DataTypeArray::serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    /// There is no good way to serialize an array in CSV. Therefore, we serialize it into a string, and then write the resulting string in CSV.
-    WriteBufferFromOwnString wb;
-    serializeText(column, row_num, wb, settings);
-    writeCSV(wb.str(), ostr);
-}
-
-
-void DataTypeArray::deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
-{
-    String s;
-    readCSV(s, istr, settings.csv);
-    ReadBufferFromString rb(s);
-
-    if (settings.csv.input_format_arrays_as_nested_csv)
-    {
-        deserializeTextImpl(column, rb,
-            [&](IColumn & nested_column)
-            {
-                nested->deserializeAsTextCSV(nested_column, rb, settings);
-            }, true);
-    }
-    else
-    {
-        deserializeTextImpl(column, rb,
-            [&](IColumn & nested_column)
-            {
-                nested->deserializeAsTextQuoted(nested_column, rb, settings);
-            }, true);
-    }
-}
-
-
 MutableColumnPtr DataTypeArray::createColumn() const
 {
     return ColumnArray::create(nested->createColumn(), ColumnArray::ColumnOffsets::create());
@@ -546,7 +61,7 @@ DataTypePtr DataTypeArray::tryGetSubcolumnType(const String & subcolumn_name) co
 DataTypePtr DataTypeArray::tryGetSubcolumnTypeImpl(const String & subcolumn_name, size_t level) const
 {
     if (subcolumn_name == "size" + std::to_string(level))
-        return createOneElementTuple(std::make_shared<DataTypeUInt64>(), subcolumn_name, false);
+        return std::make_shared<DataTypeUInt64>();
 
     DataTypePtr subcolumn;
     if (const auto * nested_array = typeid_cast<const DataTypeArray *>(nested.get()))
@@ -554,7 +69,10 @@ DataTypePtr DataTypeArray::tryGetSubcolumnTypeImpl(const String & subcolumn_name
     else
         subcolumn = nested->tryGetSubcolumnType(subcolumn_name);
 
-    return (subcolumn ? std::make_shared<DataTypeArray>(std::move(subcolumn)) : subcolumn);
+    if (subcolumn && subcolumn_name != MAIN_SUBCOLUMN_NAME)
+        subcolumn = std::make_shared<DataTypeArray>(std::move(subcolumn));
+
+    return subcolumn;
 }
 
 ColumnPtr DataTypeArray::getSubcolumn(const String & subcolumn_name, const IColumn & column) const
@@ -577,6 +95,32 @@ ColumnPtr DataTypeArray::getSubcolumnImpl(const String & subcolumn_name, const I
     return ColumnArray::create(subcolumn, column_array.getOffsetsPtr());
 }
 
+SerializationPtr DataTypeArray::getSubcolumnSerialization(
+    const String & subcolumn_name, const BaseSerializationGetter & base_serialization_getter) const
+{
+    return getSubcolumnSerializationImpl(subcolumn_name, base_serialization_getter, 0);
+}
+
+SerializationPtr DataTypeArray::getSubcolumnSerializationImpl(
+    const String & subcolumn_name, const BaseSerializationGetter & base_serialization_getter, size_t level) const
+{
+    if (subcolumn_name == "size" + std::to_string(level))
+        return std::make_shared<SerializationTupleElement>(base_serialization_getter(DataTypeUInt64()), subcolumn_name, false);
+
+    SerializationPtr subcolumn;
+    if (const auto * nested_array = typeid_cast<const DataTypeArray *>(nested.get()))
+        subcolumn = nested_array->getSubcolumnSerializationImpl(subcolumn_name, base_serialization_getter, level + 1);
+    else
+        subcolumn = nested->getSubcolumnSerialization(subcolumn_name, base_serialization_getter);
+
+    return std::make_shared<SerializationArray>(subcolumn);
+}
+
+SerializationPtr DataTypeArray::doGetDefaultSerialization() const
+{
+    return std::make_shared<SerializationArray>(nested->getDefaultSerialization());
+}
+
 size_t DataTypeArray::getNumberOfDimensions() const
 {
     const DataTypeArray * nested_array = typeid_cast<const DataTypeArray *>(nested.get());
diff --git a/src/DataTypes/DataTypeArray.h b/src/DataTypes/DataTypeArray.h
index 4185163e2e7..c720a15d798 100644
--- a/src/DataTypes/DataTypeArray.h
+++ b/src/DataTypes/DataTypeArray.h
@@ -1,13 +1,14 @@
 #pragma once
 
-#include <DataTypes/DataTypeWithSimpleSerialization.h>
+#include <DataTypes/IDataType.h>
+#include <DataTypes/Serializations/SerializationArray.h>
 
 
 namespace DB
 {
 
 
-class DataTypeArray final : public DataTypeWithSimpleSerialization
+class DataTypeArray final : public IDataType
 {
 private:
     /// The type of array elements.
@@ -35,56 +36,6 @@ public:
         return false;
     }
 
-    void serializeBinary(const Field & field, WriteBuffer & ostr) const override;
-    void deserializeBinary(Field & field, ReadBuffer & istr) const override;
-    void serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr) const override;
-    void deserializeBinary(IColumn & column, ReadBuffer & istr) const override;
-
-    void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-    void deserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
-
-    void serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-    void deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
-
-    void serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-
-    void serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-    void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
-
-    /** Streaming serialization of arrays is arranged in a special way:
-      * - elements placed in a row are written/read without array sizes;
-      * - the sizes are written/read in a separate stream,
-      * This is necessary, because when implementing nested structures, several arrays can have common sizes.
-      */
-
-    void enumerateStreamsImpl(const StreamCallback & callback, SubstreamPath & path) const override;
-
-    void serializeBinaryBulkStatePrefixImpl(
-            SerializeBinaryBulkSettings & settings,
-            SerializeBinaryBulkStatePtr & state) const override;
-
-    void serializeBinaryBulkStateSuffixImpl(
-            SerializeBinaryBulkSettings & settings,
-            SerializeBinaryBulkStatePtr & state) const override;
-
-    void deserializeBinaryBulkStatePrefixImpl(
-            DeserializeBinaryBulkSettings & settings,
-            DeserializeBinaryBulkStatePtr & state) const override;
-
-    void serializeBinaryBulkWithMultipleStreamsImpl(
-            const IColumn & column,
-            size_t offset,
-            size_t limit,
-            SerializeBinaryBulkSettings & settings,
-            SerializeBinaryBulkStatePtr & state) const override;
-
-    void deserializeBinaryBulkWithMultipleStreamsImpl(
-            IColumn & column,
-            size_t limit,
-            DeserializeBinaryBulkSettings & settings,
-            DeserializeBinaryBulkStatePtr & state,
-            SubstreamsCache * cache) const override;
-
     MutableColumnPtr createColumn() const override;
 
     Field getDefault() const override;
@@ -105,6 +56,10 @@ public:
 
     DataTypePtr tryGetSubcolumnType(const String & subcolumn_name) const override;
     ColumnPtr getSubcolumn(const String & subcolumn_name, const IColumn & column) const override;
+    SerializationPtr getSubcolumnSerialization(
+        const String & subcolumn_name, const BaseSerializationGetter & base_serialization_getter) const override;
+
+    SerializationPtr doGetDefaultSerialization() const override;
 
     const DataTypePtr & getNestedType() const { return nested; }
 
@@ -114,6 +69,8 @@ public:
 private:
     ColumnPtr getSubcolumnImpl(const String & subcolumn_name, const IColumn & column, size_t level) const;
     DataTypePtr tryGetSubcolumnTypeImpl(const String & subcolumn_name, size_t level) const;
+    SerializationPtr getSubcolumnSerializationImpl(
+        const String & subcolumn_name, const BaseSerializationGetter & base_serialization_getter, size_t level) const;
 };
 
 }
diff --git a/src/DataTypes/DataTypeCustom.h b/src/DataTypes/DataTypeCustom.h
index 0fa2e365990..55796e3cc7a 100644
--- a/src/DataTypes/DataTypeCustom.h
+++ b/src/DataTypes/DataTypeCustom.h
@@ -3,7 +3,7 @@
 #include <memory>
 #include <cstddef>
 #include <Core/Types.h>
-#include <DataTypes/IDataType.h>
+#include <DataTypes/Serializations/ISerialization.h>
 
 namespace DB
 {
@@ -24,106 +24,20 @@ public:
     virtual String getName() const = 0;
 };
 
-class IDataTypeCustomTextSerialization
-{
-public:
-    virtual ~IDataTypeCustomTextSerialization() {}
-
-    /** Text serialization for displaying on a terminal or saving into a text file, and the like.
-      * Without escaping or quoting.
-      */
-    virtual void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const = 0;
-
-    /** Text deserialization without quoting or escaping.
-      */
-    virtual void deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const = 0;
-
-    /** Text serialization with escaping but without quoting.
-      */
-    virtual void serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const = 0;
-    virtual void deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const = 0;
-
-    /** Text serialization as a literal that may be inserted into a query.
-      */
-    virtual void serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const = 0;
-    virtual void deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const = 0;
-
-    /** Text serialization for the CSV format.
-      */
-    virtual void serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const = 0;
-    virtual void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings &) const = 0;
-
-    /** Text serialization intended for using in JSON format.
-      */
-    virtual void serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const = 0;
-    virtual void deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const = 0;
-
-    /** Text serialization for putting into the XML format.
-      */
-    virtual void serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const = 0;
-};
-
-/** Allows to customize an existing data type by representation with custom substreams.
-  * Customized data type will be serialized/deserialized to files with different names than base type,
-  * but binary and text representation will be unchanged.
-  * E.g it can be used for reading single subcolumns of complex types.
-  */
-class IDataTypeCustomStreams
-{
-public:
-    virtual ~IDataTypeCustomStreams() = default;
-
-    virtual void enumerateStreams(
-        const IDataType::StreamCallback & callback,
-        IDataType::SubstreamPath & path) const = 0;
-
-    virtual void serializeBinaryBulkStatePrefix(
-        IDataType::SerializeBinaryBulkSettings & settings,
-        IDataType::SerializeBinaryBulkStatePtr & state) const = 0;
-
-    virtual void serializeBinaryBulkStateSuffix(
-        IDataType::SerializeBinaryBulkSettings & settings,
-        IDataType::SerializeBinaryBulkStatePtr & state) const = 0;
-
-    virtual void deserializeBinaryBulkStatePrefix(
-        IDataType::DeserializeBinaryBulkSettings & settings,
-        IDataType::DeserializeBinaryBulkStatePtr & state) const = 0;
-
-    virtual void serializeBinaryBulkWithMultipleStreams(
-        const IColumn & column,
-        size_t offset,
-        size_t limit,
-        IDataType::SerializeBinaryBulkSettings & settings,
-        IDataType::SerializeBinaryBulkStatePtr & state) const = 0;
-
-    virtual void deserializeBinaryBulkWithMultipleStreams(
-        ColumnPtr & column,
-        size_t limit,
-        IDataType::DeserializeBinaryBulkSettings & settings,
-        IDataType::DeserializeBinaryBulkStatePtr & state,
-        IDataType::SubstreamsCache * cache) const = 0;
-};
-
 using DataTypeCustomNamePtr = std::unique_ptr<const IDataTypeCustomName>;
-using DataTypeCustomTextSerializationPtr = std::unique_ptr<const IDataTypeCustomTextSerialization>;
-using DataTypeCustomStreamsPtr = std::unique_ptr<const IDataTypeCustomStreams>;
-
 
 /** Describe a data type customization
  */
 struct DataTypeCustomDesc
 {
     DataTypeCustomNamePtr name;
-    DataTypeCustomTextSerializationPtr text_serialization;
-    DataTypeCustomStreamsPtr streams;
+    SerializationPtr serialization;
 
     DataTypeCustomDesc(
         DataTypeCustomNamePtr name_,
-        DataTypeCustomTextSerializationPtr text_serialization_ = nullptr,
-        DataTypeCustomStreamsPtr streams_ = nullptr)
+        SerializationPtr serialization_ = nullptr)
     : name(std::move(name_))
-    , text_serialization(std::move(text_serialization_))
-    , streams(std::move(streams_)) {}
+    , serialization(std::move(serialization_)) {}
 };
 
 using DataTypeCustomDescPtr = std::unique_ptr<DataTypeCustomDesc>;
diff --git a/src/DataTypes/DataTypeCustomGeo.cpp b/src/DataTypes/DataTypeCustomGeo.cpp
index 73d76e7e1e8..f7d05fa3be6 100644
--- a/src/DataTypes/DataTypeCustomGeo.cpp
+++ b/src/DataTypes/DataTypeCustomGeo.cpp
@@ -1,7 +1,6 @@
-#include <Columns/ColumnTuple.h>
+#include <DataTypes/DataTypeCustomGeo.h>
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeCustom.h>
-#include <DataTypes/DataTypeCustomSimpleTextSerialization.h>
 #include <DataTypes/DataTypeFactory.h>
 #include <DataTypes/DataTypeTuple.h>
 #include <DataTypes/DataTypesNumber.h>
@@ -9,106 +8,20 @@
 namespace DB
 {
 
-namespace
-{
-
-class DataTypeCustomPointSerialization : public DataTypeCustomSimpleTextSerialization
-{
-public:
-    void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override
-    {
-        nestedDataType()->serializeAsText(column, row_num, ostr, settings);
-    }
-
-    void deserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override
-    {
-        nestedDataType()->deserializeAsWholeText(column, istr, settings);
-    }
-
-    static DataTypePtr nestedDataType()
-    {
-        static auto data_type = DataTypePtr(std::make_unique<DataTypeTuple>(
-            DataTypes({std::make_unique<DataTypeFloat64>(), std::make_unique<DataTypeFloat64>()})));
-        return data_type;
-    }
-};
-
-class DataTypeCustomRingSerialization : public DataTypeCustomSimpleTextSerialization
-{
-public:
-    void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override
-    {
-        nestedDataType()->serializeAsText(column, row_num, ostr, settings);
-    }
-
-    void deserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override
-    {
-        nestedDataType()->deserializeAsWholeText(column, istr, settings);
-    }
-
-    static DataTypePtr nestedDataType()
-    {
-        static auto data_type = DataTypePtr(std::make_unique<DataTypeArray>(DataTypeCustomPointSerialization::nestedDataType()));
-        return data_type;
-    }
-};
-
-class DataTypeCustomPolygonSerialization : public DataTypeCustomSimpleTextSerialization
-{
-public:
-    void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override
-    {
-        nestedDataType()->serializeAsText(column, row_num, ostr, settings);
-    }
-
-    void deserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override
-    {
-        nestedDataType()->deserializeAsWholeText(column, istr, settings);
-    }
-
-    static DataTypePtr nestedDataType()
-    {
-        static auto data_type = DataTypePtr(std::make_unique<DataTypeArray>(DataTypeCustomRingSerialization::nestedDataType()));
-        return data_type;
-    }
-};
-
-class DataTypeCustomMultiPolygonSerialization : public DataTypeCustomSimpleTextSerialization
-{
-public:
-    void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override
-    {
-        nestedDataType()->serializeAsText(column, row_num, ostr, settings);
-    }
-
-    void deserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override
-    {
-        nestedDataType()->deserializeAsWholeText(column, istr, settings);
-    }
-
-    static DataTypePtr nestedDataType()
-    {
-        static auto data_type = DataTypePtr(std::make_unique<DataTypeArray>(DataTypeCustomPolygonSerialization::nestedDataType()));
-        return data_type;
-    }
-};
-
-}
-
 void registerDataTypeDomainGeo(DataTypeFactory & factory)
 {
     // Custom type for point represented as its coordinates stored as Tuple(Float64, Float64)
     factory.registerSimpleDataTypeCustom("Point", []
     {
         return std::make_pair(DataTypeFactory::instance().get("Tuple(Float64, Float64)"),
-            std::make_unique<DataTypeCustomDesc>(std::make_unique<DataTypeCustomFixedName>("Point"), std::make_unique<DataTypeCustomPointSerialization>()));
+            std::make_unique<DataTypeCustomDesc>(std::make_unique<DataTypePointName>()));
     });
 
     // Custom type for simple polygon without holes stored as Array(Point)
     factory.registerSimpleDataTypeCustom("Ring", []
     {
         return std::make_pair(DataTypeFactory::instance().get("Array(Point)"),
-            std::make_unique<DataTypeCustomDesc>(std::make_unique<DataTypeCustomFixedName>("Ring"), std::make_unique<DataTypeCustomRingSerialization>()));
+            std::make_unique<DataTypeCustomDesc>(std::make_unique<DataTypeRingName>()));
     });
 
     // Custom type for polygon with holes stored as Array(Ring)
@@ -116,14 +29,14 @@ void registerDataTypeDomainGeo(DataTypeFactory & factory)
     factory.registerSimpleDataTypeCustom("Polygon", []
     {
         return std::make_pair(DataTypeFactory::instance().get("Array(Ring)"),
-            std::make_unique<DataTypeCustomDesc>(std::make_unique<DataTypeCustomFixedName>("Polygon"), std::make_unique<DataTypeCustomPolygonSerialization>()));
+            std::make_unique<DataTypeCustomDesc>(std::make_unique<DataTypePolygonName>()));
     });
 
     // Custom type for multiple polygons with holes stored as Array(Polygon)
     factory.registerSimpleDataTypeCustom("MultiPolygon", []
     {
         return std::make_pair(DataTypeFactory::instance().get("Array(Polygon)"),
-            std::make_unique<DataTypeCustomDesc>(std::make_unique<DataTypeCustomFixedName>("MultiPolygon"), std::make_unique<DataTypeCustomMultiPolygonSerialization>()));
+            std::make_unique<DataTypeCustomDesc>(std::make_unique<DataTypeMultiPolygonName>()));
     });
 }
 
diff --git a/src/DataTypes/DataTypeCustomGeo.h b/src/DataTypes/DataTypeCustomGeo.h
new file mode 100644
index 00000000000..c2a83b3e577
--- /dev/null
+++ b/src/DataTypes/DataTypeCustomGeo.h
@@ -0,0 +1,32 @@
+#pragma once
+
+#include <DataTypes/DataTypeCustom.h>
+
+namespace DB
+{
+
+class DataTypePointName : public DataTypeCustomFixedName
+{
+public:
+    DataTypePointName() : DataTypeCustomFixedName("Point") {}
+};
+
+class DataTypeRingName : public DataTypeCustomFixedName
+{
+public:
+    DataTypeRingName() : DataTypeCustomFixedName("Ring") {}
+};
+
+class DataTypePolygonName : public DataTypeCustomFixedName
+{
+public:
+    DataTypePolygonName() : DataTypeCustomFixedName("Polygon") {}
+};
+
+class DataTypeMultiPolygonName : public DataTypeCustomFixedName
+{
+public:
+    DataTypeMultiPolygonName() : DataTypeCustomFixedName("MultiPolygon") {}
+};
+
+}
diff --git a/src/DataTypes/DataTypeCustomIPv4AndIPv6.cpp b/src/DataTypes/DataTypeCustomIPv4AndIPv6.cpp
index 78a1e18679d..808aa43528e 100644
--- a/src/DataTypes/DataTypeCustomIPv4AndIPv6.cpp
+++ b/src/DataTypes/DataTypeCustomIPv4AndIPv6.cpp
@@ -1,115 +1,24 @@
-#include <Columns/ColumnsNumber.h>
-#include <Common/Exception.h>
-#include <Common/formatIPv6.h>
-#include <DataTypes/DataTypeCustomSimpleTextSerialization.h>
+#include <DataTypes/Serializations/SerializationIP.h>
 #include <DataTypes/DataTypeFactory.h>
 #include <DataTypes/DataTypeCustom.h>
-#include <Functions/FunctionsCoding.h>
 
 namespace DB
 {
 
-namespace ErrorCodes
-{
-    extern const int ILLEGAL_COLUMN;
-    extern const int CANNOT_PARSE_DOMAIN_VALUE_FROM_STRING;
-}
-
-namespace
-{
-
-class DataTypeCustomIPv4Serialization : public DataTypeCustomSimpleTextSerialization
-{
-public:
-    void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override
-    {
-        const auto * col = checkAndGetColumn<ColumnUInt32>(&column);
-        if (!col)
-        {
-            throw Exception("IPv4 type can only serialize columns of type UInt32." + column.getName(), ErrorCodes::ILLEGAL_COLUMN);
-        }
-
-        char buffer[IPV4_MAX_TEXT_LENGTH + 1] = {'\0'};
-        char * ptr = buffer;
-        formatIPv4(reinterpret_cast<const unsigned char *>(&col->getData()[row_num]), ptr);
-
-        ostr.write(buffer, strlen(buffer));
-    }
-
-    void deserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override
-    {
-        ColumnUInt32 * col = typeid_cast<ColumnUInt32 *>(&column);
-        if (!col)
-        {
-            throw Exception("IPv4 type can only deserialize columns of type UInt32." + column.getName(), ErrorCodes::ILLEGAL_COLUMN);
-        }
-
-        char buffer[IPV4_MAX_TEXT_LENGTH + 1] = {'\0'};
-        istr.read(buffer, sizeof(buffer) - 1);
-        UInt32 ipv4_value = 0;
-        if (!parseIPv4(buffer, reinterpret_cast<unsigned char *>(&ipv4_value)))
-        {
-            throw Exception("Invalid IPv4 value.", ErrorCodes::CANNOT_PARSE_DOMAIN_VALUE_FROM_STRING);
-        }
-
-        col->insert(ipv4_value);
-    }
-};
-
-class DataTypeCustomIPv6Serialization : public DataTypeCustomSimpleTextSerialization
-{
-public:
-
-    void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override
-    {
-        const auto * col = checkAndGetColumn<ColumnFixedString>(&column);
-        if (!col)
-        {
-            throw Exception("IPv6 type domain can only serialize columns of type FixedString(16)." + column.getName(), ErrorCodes::ILLEGAL_COLUMN);
-        }
-
-        char buffer[IPV6_MAX_TEXT_LENGTH + 1] = {'\0'};
-        char * ptr = buffer;
-        formatIPv6(reinterpret_cast<const unsigned char *>(col->getDataAt(row_num).data), ptr);
-
-        ostr.write(buffer, strlen(buffer));
-    }
-
-    void deserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override
-    {
-        ColumnFixedString * col = typeid_cast<ColumnFixedString *>(&column);
-        if (!col)
-        {
-            throw Exception("IPv6 type domain can only deserialize columns of type FixedString(16)." + column.getName(), ErrorCodes::ILLEGAL_COLUMN);
-        }
-
-        char buffer[IPV6_MAX_TEXT_LENGTH + 1] = {'\0'};
-        istr.read(buffer, sizeof(buffer) - 1);
-
-        std::string ipv6_value(IPV6_BINARY_LENGTH, '\0');
-        if (!parseIPv6(buffer, reinterpret_cast<unsigned char *>(ipv6_value.data())))
-        {
-            throw Exception("Invalid IPv6 value.", ErrorCodes::CANNOT_PARSE_DOMAIN_VALUE_FROM_STRING);
-        }
-
-        col->insertString(ipv6_value);
-    }
-};
-
-}
-
 void registerDataTypeDomainIPv4AndIPv6(DataTypeFactory & factory)
 {
     factory.registerSimpleDataTypeCustom("IPv4", []
     {
-        return std::make_pair(DataTypeFactory::instance().get("UInt32"),
-            std::make_unique<DataTypeCustomDesc>(std::make_unique<DataTypeCustomFixedName>("IPv4"), std::make_unique<DataTypeCustomIPv4Serialization>()));
+        auto type = DataTypeFactory::instance().get("UInt32");
+        return std::make_pair(type, std::make_unique<DataTypeCustomDesc>(
+            std::make_unique<DataTypeCustomFixedName>("IPv4"), std::make_unique<SerializationIPv4>(type->getDefaultSerialization())));
     });
 
     factory.registerSimpleDataTypeCustom("IPv6", []
     {
-        return std::make_pair(DataTypeFactory::instance().get("FixedString(16)"),
-                              std::make_unique<DataTypeCustomDesc>(std::make_unique<DataTypeCustomFixedName>("IPv6"), std::make_unique<DataTypeCustomIPv6Serialization>()));
+        auto type = DataTypeFactory::instance().get("FixedString(16)");
+        return std::make_pair(type, std::make_unique<DataTypeCustomDesc>(
+            std::make_unique<DataTypeCustomFixedName>("IPv6"), std::make_unique<SerializationIPv6>(type->getDefaultSerialization())));
     });
 
     /// MySQL, MariaDB
diff --git a/src/DataTypes/DataTypeCustomSimpleTextSerialization.cpp b/src/DataTypes/DataTypeCustomSimpleTextSerialization.cpp
deleted file mode 100644
index 5bb963de667..00000000000
--- a/src/DataTypes/DataTypeCustomSimpleTextSerialization.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-#include <DataTypes/DataTypeCustomSimpleTextSerialization.h>
-
-#include <IO/ReadBufferFromString.h>
-#include <IO/ReadHelpers.h>
-#include <IO/WriteBufferFromString.h>
-#include <IO/WriteHelpers.h>
-
-namespace
-{
-using namespace DB;
-
-String serializeToString(const DataTypeCustomSimpleTextSerialization & domain, const IColumn & column, size_t row_num, const FormatSettings & settings)
-{
-    WriteBufferFromOwnString buffer;
-    domain.serializeText(column, row_num, buffer, settings);
-
-    return buffer.str();
-}
-
-void deserializeFromString(const DataTypeCustomSimpleTextSerialization & domain, IColumn & column, const String & s, const FormatSettings & settings)
-{
-    ReadBufferFromString istr(s);
-    domain.deserializeText(column, istr, settings);
-}
-
-}
-
-namespace DB
-{
-
-void DataTypeCustomSimpleTextSerialization::deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
-{
-    String str;
-    readString(str, istr);
-    deserializeFromString(*this, column, str, settings);
-}
-
-void DataTypeCustomSimpleTextSerialization::serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    writeEscapedString(serializeToString(*this, column, row_num, settings), ostr);
-}
-
-void DataTypeCustomSimpleTextSerialization::deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
-{
-    String str;
-    readEscapedString(str, istr);
-    deserializeFromString(*this, column, str, settings);
-}
-
-void DataTypeCustomSimpleTextSerialization::serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    writeQuotedString(serializeToString(*this, column, row_num, settings), ostr);
-}
-
-void DataTypeCustomSimpleTextSerialization::deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
-{
-    String str;
-    readQuotedString(str, istr);
-    deserializeFromString(*this, column, str, settings);
-}
-
-void DataTypeCustomSimpleTextSerialization::serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    writeCSVString(serializeToString(*this, column, row_num, settings), ostr);
-}
-
-void DataTypeCustomSimpleTextSerialization::deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
-{
-    String str;
-    readCSVString(str, istr, settings.csv);
-    deserializeFromString(*this, column, str, settings);
-}
-
-void DataTypeCustomSimpleTextSerialization::serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    writeJSONString(serializeToString(*this, column, row_num, settings), ostr, settings);
-}
-
-void DataTypeCustomSimpleTextSerialization::deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
-{
-    String str;
-    readJSONString(str, istr);
-    deserializeFromString(*this, column, str, settings);
-}
-
-void DataTypeCustomSimpleTextSerialization::serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    writeXMLStringForTextElement(serializeToString(*this, column, row_num, settings), ostr);
-}
-
-}
diff --git a/src/DataTypes/DataTypeCustom_fwd.h b/src/DataTypes/DataTypeCustom_fwd.h
deleted file mode 100644
index 99c8eee9748..00000000000
--- a/src/DataTypes/DataTypeCustom_fwd.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-
-#include <memory>
-
-namespace DB
-{
-
-class IDataTypeCustomName;
-class IDataTypeCustomTextSerialization;
-class IDataTypeCustomStreams;
-struct DataTypeCustomDesc;
-
-using DataTypeCustomNamePtr = std::unique_ptr<const IDataTypeCustomName>;
-using DataTypeCustomTextSerializationPtr = std::unique_ptr<const IDataTypeCustomTextSerialization>;
-using DataTypeCustomStreamsPtr = std::unique_ptr<const IDataTypeCustomStreams>;
-using DataTypeCustomDescPtr = std::unique_ptr<DataTypeCustomDesc>;
-
-}
diff --git a/src/DataTypes/DataTypeDate.cpp b/src/DataTypes/DataTypeDate.cpp
index 192a89cc454..0df2e329702 100644
--- a/src/DataTypes/DataTypeDate.cpp
+++ b/src/DataTypes/DataTypeDate.cpp
@@ -3,6 +3,7 @@
 
 #include <Columns/ColumnsNumber.h>
 #include <DataTypes/DataTypeDate.h>
+#include <DataTypes/Serializations/SerializationDate.h>
 #include <DataTypes/DataTypeFactory.h>
 
 #include <Common/assert_cast.h>
@@ -11,79 +12,15 @@
 namespace DB
 {
 
-void DataTypeDate::serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const
-{
-    writeDateText(DayNum(assert_cast<const ColumnUInt16 &>(column).getData()[row_num]), ostr);
-}
-
-void DataTypeDate::deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
-{
-    deserializeTextEscaped(column, istr, settings);
-}
-
-void DataTypeDate::deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
-{
-    DayNum x;
-    readDateText(x, istr);
-    assert_cast<ColumnUInt16 &>(column).getData().push_back(x);
-}
-
-void DataTypeDate::serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    serializeText(column, row_num, ostr, settings);
-}
-
-void DataTypeDate::serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    writeChar('\'', ostr);
-    serializeText(column, row_num, ostr, settings);
-    writeChar('\'', ostr);
-}
-
-void DataTypeDate::deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
-{
-    DayNum x;
-    assertChar('\'', istr);
-    readDateText(x, istr);
-    assertChar('\'', istr);
-    assert_cast<ColumnUInt16 &>(column).getData().push_back(x);    /// It's important to do this at the end - for exception safety.
-}
-
-void DataTypeDate::serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    writeChar('"', ostr);
-    serializeText(column, row_num, ostr, settings);
-    writeChar('"', ostr);
-}
-
-void DataTypeDate::deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
-{
-    DayNum x;
-    assertChar('"', istr);
-    readDateText(x, istr);
-    assertChar('"', istr);
-    assert_cast<ColumnUInt16 &>(column).getData().push_back(x);
-}
-
-void DataTypeDate::serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    writeChar('"', ostr);
-    serializeText(column, row_num, ostr, settings);
-    writeChar('"', ostr);
-}
-
-void DataTypeDate::deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
-{
-    LocalDate value;
-    readCSV(value, istr);
-    assert_cast<ColumnUInt16 &>(column).getData().push_back(value.getDayNum());
-}
-
 bool DataTypeDate::equals(const IDataType & rhs) const
 {
     return typeid(rhs) == typeid(*this);
 }
 
+SerializationPtr DataTypeDate::doGetDefaultSerialization() const
+{
+    return std::make_shared<SerializationDate>();
+}
 
 void registerDataTypeDate(DataTypeFactory & factory)
 {
diff --git a/src/DataTypes/DataTypeDate.h b/src/DataTypes/DataTypeDate.h
index 496d7fe0b22..2f17207cc07 100644
--- a/src/DataTypes/DataTypeDate.h
+++ b/src/DataTypes/DataTypeDate.h
@@ -14,21 +14,13 @@ public:
     TypeIndex getTypeId() const override { return TypeIndex::Date; }
     const char * getFamilyName() const override { return family_name; }
 
-    void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-    void deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
-    void serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-    void deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
-    void serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-    void deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
-    void serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-    void deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
-    void serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-    void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
-
     bool canBeUsedAsVersion() const override { return true; }
     bool canBeInsideNullable() const override { return true; }
 
     bool equals(const IDataType & rhs) const override;
+
+protected:
+    SerializationPtr doGetDefaultSerialization() const override;
 };
 
 }
diff --git a/src/DataTypes/DataTypeDateTime.cpp b/src/DataTypes/DataTypeDateTime.cpp
index d2bbb4a1efa..820bfd70766 100644
--- a/src/DataTypes/DataTypeDateTime.cpp
+++ b/src/DataTypes/DataTypeDateTime.cpp
@@ -1,4 +1,5 @@
 #include <DataTypes/DataTypeDateTime.h>
+#include <DataTypes/Serializations/SerializationDateTime.h>
 
 #include <Columns/ColumnVector.h>
 #include <Common/assert_cast.h>
@@ -12,23 +13,6 @@
 #include <IO/parseDateTimeBestEffort.h>
 #include <Parsers/ASTLiteral.h>
 
-namespace
-{
-using namespace DB;
-inline void readText(time_t & x, ReadBuffer & istr, const FormatSettings & settings, const DateLUTImpl & time_zone, const DateLUTImpl & utc_time_zone)
-{
-    switch (settings.date_time_input_format)
-    {
-        case FormatSettings::DateTimeInputFormat::Basic:
-            readDateTimeText(x, istr, time_zone);
-            return;
-        case FormatSettings::DateTimeInputFormat::BestEffort:
-            parseDateTimeBestEffort(x, istr, time_zone, utc_time_zone);
-            return;
-    }
-}
-}
-
 namespace DB
 {
 
@@ -36,7 +20,8 @@ TimezoneMixin::TimezoneMixin(const String & time_zone_name)
     : has_explicit_time_zone(!time_zone_name.empty()),
     time_zone(DateLUT::instance(time_zone_name)),
     utc_time_zone(DateLUT::instance("UTC"))
-{}
+{
+}
 
 DataTypeDateTime::DataTypeDateTime(const String & time_zone_name)
     : TimezoneMixin(time_zone_name)
@@ -45,7 +30,8 @@ DataTypeDateTime::DataTypeDateTime(const String & time_zone_name)
 
 DataTypeDateTime::DataTypeDateTime(const TimezoneMixin & time_zone_)
     : TimezoneMixin(time_zone_)
-{}
+{
+}
 
 String DataTypeDateTime::doGetName() const
 {
@@ -57,111 +43,6 @@ String DataTypeDateTime::doGetName() const
     return out.str();
 }
 
-void DataTypeDateTime::serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    auto value = assert_cast<const ColumnType &>(column).getData()[row_num];
-    switch (settings.date_time_output_format)
-    {
-        case FormatSettings::DateTimeOutputFormat::Simple:
-            writeDateTimeText(value, ostr, time_zone);
-            return;
-        case FormatSettings::DateTimeOutputFormat::UnixTimestamp:
-            writeIntText(value, ostr);
-            return;
-        case FormatSettings::DateTimeOutputFormat::ISO:
-            writeDateTimeTextISO(value, ostr, utc_time_zone);
-            return;
-    }
-}
-
-void DataTypeDateTime::serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    serializeText(column, row_num, ostr, settings);
-}
-
-void DataTypeDateTime::deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
-{
-    deserializeTextEscaped(column, istr, settings);
-}
-
-void DataTypeDateTime::deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
-{
-    time_t x;
-    ::readText(x, istr, settings, time_zone, utc_time_zone);
-    assert_cast<ColumnType &>(column).getData().push_back(x);
-}
-
-void DataTypeDateTime::serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    writeChar('\'', ostr);
-    serializeText(column, row_num, ostr, settings);
-    writeChar('\'', ostr);
-}
-
-void DataTypeDateTime::deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
-{
-    time_t x;
-    if (checkChar('\'', istr)) /// Cases: '2017-08-31 18:36:48' or '1504193808'
-    {
-        ::readText(x, istr, settings, time_zone, utc_time_zone);
-        assertChar('\'', istr);
-    }
-    else /// Just 1504193808 or 01504193808
-    {
-        readIntText(x, istr);
-    }
-    assert_cast<ColumnType &>(column).getData().push_back(x);    /// It's important to do this at the end - for exception safety.
-}
-
-void DataTypeDateTime::serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    writeChar('"', ostr);
-    serializeText(column, row_num, ostr, settings);
-    writeChar('"', ostr);
-}
-
-void DataTypeDateTime::deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
-{
-    time_t x;
-    if (checkChar('"', istr))
-    {
-        ::readText(x, istr, settings, time_zone, utc_time_zone);
-        assertChar('"', istr);
-    }
-    else
-    {
-        readIntText(x, istr);
-    }
-    assert_cast<ColumnType &>(column).getData().push_back(x);
-}
-
-void DataTypeDateTime::serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    writeChar('"', ostr);
-    serializeText(column, row_num, ostr, settings);
-    writeChar('"', ostr);
-}
-
-void DataTypeDateTime::deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
-{
-    time_t x;
-
-    if (istr.eof())
-        throwReadAfterEOF();
-
-    char maybe_quote = *istr.position();
-
-    if (maybe_quote == '\'' || maybe_quote == '\"')
-        ++istr.position();
-
-    ::readText(x, istr, settings, time_zone, utc_time_zone);
-
-    if (maybe_quote == '\'' || maybe_quote == '\"')
-        assertChar(maybe_quote, istr);
-
-    assert_cast<ColumnType &>(column).getData().push_back(x);
-}
-
 bool DataTypeDateTime::equals(const IDataType & rhs) const
 {
     /// DateTime with different timezones are equal, because:
@@ -169,4 +50,9 @@ bool DataTypeDateTime::equals(const IDataType & rhs) const
     return typeid(rhs) == typeid(*this);
 }
 
+SerializationPtr DataTypeDateTime::doGetDefaultSerialization() const
+{
+    return std::make_shared<SerializationDateTime>(time_zone, utc_time_zone);
+}
+
 }
diff --git a/src/DataTypes/DataTypeDateTime.h b/src/DataTypes/DataTypeDateTime.h
index edec889309b..926d529a5d8 100644
--- a/src/DataTypes/DataTypeDateTime.h
+++ b/src/DataTypes/DataTypeDateTime.h
@@ -19,9 +19,12 @@ public:
     TimezoneMixin(const TimezoneMixin &) = default;
 
     const DateLUTImpl & getTimeZone() const { return time_zone; }
+    bool hasExplicitTimeZone() const { return has_explicit_time_zone; }
 
 protected:
+    /// true if time zone name was provided in data type parameters, false if it's using default time zone.
     bool has_explicit_time_zone;
+
     const DateLUTImpl & time_zone;
     const DateLUTImpl & utc_time_zone;
 };
@@ -58,21 +61,12 @@ public:
     String doGetName() const override;
     TypeIndex getTypeId() const override { return TypeIndex::DateTime; }
 
-    void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-    void deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
-    void serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-    void deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
-    void serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-    void deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
-    void serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-    void deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
-    void serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-    void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
-
     bool canBeUsedAsVersion() const override { return true; }
     bool canBeInsideNullable() const override { return true; }
 
     bool equals(const IDataType & rhs) const override;
+
+    SerializationPtr doGetDefaultSerialization() const override;
 };
 
 }
diff --git a/src/DataTypes/DataTypeDateTime64.cpp b/src/DataTypes/DataTypeDateTime64.cpp
index 17b94e871bf..eaec585b6b4 100644
--- a/src/DataTypes/DataTypeDateTime64.cpp
+++ b/src/DataTypes/DataTypeDateTime64.cpp
@@ -1,4 +1,5 @@
 #include <DataTypes/DataTypeDateTime64.h>
+#include <DataTypes/Serializations/SerializationDateTime64.h>
 
 #include <Columns/ColumnVector.h>
 #include <Common/assert_cast.h>
@@ -55,131 +56,6 @@ std::string DataTypeDateTime64::doGetName() const
     return out.str();
 }
 
-void DataTypeDateTime64::serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    auto value = assert_cast<const ColumnType &>(column).getData()[row_num];
-    switch (settings.date_time_output_format)
-    {
-        case FormatSettings::DateTimeOutputFormat::Simple:
-            writeDateTimeText(value, scale, ostr, time_zone);
-            return;
-        case FormatSettings::DateTimeOutputFormat::UnixTimestamp:
-            writeDateTimeUnixTimestamp(value, scale, ostr);
-            return;
-        case FormatSettings::DateTimeOutputFormat::ISO:
-            writeDateTimeTextISO(value, scale, ostr, utc_time_zone);
-            return;
-    }
-}
-
-void DataTypeDateTime64::deserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
-{
-    DateTime64 result = 0;
-    readDateTime64Text(result, this->getScale(), istr, time_zone);
-    assert_cast<ColumnType &>(column).getData().push_back(result);
-}
-
-void DataTypeDateTime64::deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
-{
-    deserializeTextEscaped(column, istr, settings);
-}
-
-void DataTypeDateTime64::serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    serializeText(column, row_num, ostr, settings);
-}
-
-static inline void readText(DateTime64 & x, UInt32 scale, ReadBuffer & istr, const FormatSettings & settings, const DateLUTImpl & time_zone, const DateLUTImpl & utc_time_zone)
-{
-    switch (settings.date_time_input_format)
-    {
-        case FormatSettings::DateTimeInputFormat::Basic:
-            readDateTime64Text(x, scale, istr, time_zone);
-            return;
-        case FormatSettings::DateTimeInputFormat::BestEffort:
-            parseDateTime64BestEffort(x, scale, istr, time_zone, utc_time_zone);
-            return;
-    }
-}
-
-void DataTypeDateTime64::deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
-{
-    DateTime64 x = 0;
-    readText(x, scale, istr, settings, time_zone, utc_time_zone);
-    assert_cast<ColumnType &>(column).getData().push_back(x);
-}
-
-void DataTypeDateTime64::serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    writeChar('\'', ostr);
-    serializeText(column, row_num, ostr, settings);
-    writeChar('\'', ostr);
-}
-
-void DataTypeDateTime64::deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
-{
-    DateTime64 x = 0;
-    if (checkChar('\'', istr)) /// Cases: '2017-08-31 18:36:48' or '1504193808'
-    {
-        readText(x, scale, istr, settings, time_zone, utc_time_zone);
-        assertChar('\'', istr);
-    }
-    else /// Just 1504193808 or 01504193808
-    {
-        readIntText(x, istr);
-    }
-    assert_cast<ColumnType &>(column).getData().push_back(x);    /// It's important to do this at the end - for exception safety.
-}
-
-void DataTypeDateTime64::serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    writeChar('"', ostr);
-    serializeText(column, row_num, ostr, settings);
-    writeChar('"', ostr);
-}
-
-void DataTypeDateTime64::deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
-{
-    DateTime64 x = 0;
-    if (checkChar('"', istr))
-    {
-        readText(x, scale, istr, settings, time_zone, utc_time_zone);
-        assertChar('"', istr);
-    }
-    else
-    {
-        readIntText(x, istr);
-    }
-    assert_cast<ColumnType &>(column).getData().push_back(x);
-}
-
-void DataTypeDateTime64::serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    writeChar('"', ostr);
-    serializeText(column, row_num, ostr, settings);
-    writeChar('"', ostr);
-}
-
-void DataTypeDateTime64::deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
-{
-    DateTime64 x = 0;
-
-    if (istr.eof())
-        throwReadAfterEOF();
-
-    char maybe_quote = *istr.position();
-
-    if (maybe_quote == '\'' || maybe_quote == '\"')
-        ++istr.position();
-
-    readText(x, scale, istr, settings, time_zone, utc_time_zone);
-
-    if (maybe_quote == '\'' || maybe_quote == '\"')
-        assertChar(maybe_quote, istr);
-
-    assert_cast<ColumnType &>(column).getData().push_back(x);
-}
-
 bool DataTypeDateTime64::equals(const IDataType & rhs) const
 {
     if (const auto * ptype = typeid_cast<const DataTypeDateTime64 *>(&rhs))
@@ -187,4 +63,9 @@ bool DataTypeDateTime64::equals(const IDataType & rhs) const
     return false;
 }
 
+SerializationPtr DataTypeDateTime64::doGetDefaultSerialization() const
+{
+    return std::make_shared<SerializationDateTime64>(time_zone, utc_time_zone, scale);
+}
+
 }
diff --git a/src/DataTypes/DataTypeDateTime64.h b/src/DataTypes/DataTypeDateTime64.h
index 198c3739f58..f51e0f5d047 100644
--- a/src/DataTypes/DataTypeDateTime64.h
+++ b/src/DataTypes/DataTypeDateTime64.h
@@ -31,82 +31,12 @@ public:
     std::string doGetName() const override;
     TypeIndex getTypeId() const override { return type_id; }
 
-    void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-    void deserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
-    void deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
-    void serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-    void deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
-    void serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-    void deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
-    void serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-    void deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
-    void serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-    void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
-
     bool equals(const IDataType & rhs) const override;
 
     bool canBePromoted() const override { return false; }
-};
 
-/** Tansform-type wrapper for DateTime64, applies given Transform to DateTime64 value or only to a whole part of it.
- *
- * Depending on what overloads of Transform::execute() are available, when called with DateTime64 value,
- * invokes Transform::execute() with:
- * * whole part of DateTime64 value, discarding fractional part.
- * * DateTime64 value and scale factor.
- *
- * Suitable Transfotm-types are commonly used in Date/DateTime manipulation functions,
- * and should implement static (or const) function with following signatures:
- *      R execute(UInt32 whole_value, ... , const TimeZoneImpl &)
- * OR
- *      R execute(DateTime64 value, Int64 scale_factor, ... , const TimeZoneImpl &)
- *
- * Where R and T could be arbitrary types.
-*/
-template <typename Transform>
-class TransformDateTime64 : public Transform
-{
-private:
-    // Detect if Transform::execute is const or static method
-    // with signature defined by template args (ignoring result type).
-    template<typename = void, typename... Args>
-    struct TransformHasExecuteOverload : std::false_type {};
-
-    template<typename... Args>
-    struct TransformHasExecuteOverload<std::void_t<decltype(std::declval<Transform>().execute(std::declval<Args>()...))>, Args...>
-        : std::true_type {};
-
-    template<typename... Args>
-    static constexpr bool TransformHasExecuteOverload_v = TransformHasExecuteOverload<void, Args...>::value;
-
-public:
-    static constexpr auto name = Transform::name;
-
-    using Transform::execute;
-
-    // non-explicit constructor to allow creating from scale value (or with no scale at all), indispensable in some contexts.
-    TransformDateTime64(UInt32 scale_ = 0)
-        : scale_multiplier(DecimalUtils::scaleMultiplier<DateTime64::NativeType>(scale_))
-    {}
-
-    template <typename ... Args>
-    inline auto execute(const DateTime64 & t, Args && ... args) const
-    {
-        const auto transform = static_cast<const Transform *>(this);
-
-        if constexpr (TransformHasExecuteOverload_v<DateTime64, decltype(scale_multiplier), Args...>)
-        {
-            return transform->execute(t, scale_multiplier, std::forward<Args>(args)...);
-        }
-        else
-        {
-            const auto components = DecimalUtils::splitWithScaleMultiplier(t, scale_multiplier);
-            return transform->execute(static_cast<UInt32>(components.whole), std::forward<Args>(args)...);
-        }
-    }
-
-private:
-    DateTime64::NativeType scale_multiplier = 1;
+protected:
+    SerializationPtr doGetDefaultSerialization() const override;
 };
 
 }
diff --git a/src/DataTypes/DataTypeDecimalBase.cpp b/src/DataTypes/DataTypeDecimalBase.cpp
index ab17996167c..683710b8880 100644
--- a/src/DataTypes/DataTypeDecimalBase.cpp
+++ b/src/DataTypes/DataTypeDecimalBase.cpp
@@ -19,9 +19,14 @@ namespace ErrorCodes
 {
 }
 
-
-bool decimalCheckComparisonOverflow(const Context & context) { return context.getSettingsRef().decimal_check_overflow; }
-bool decimalCheckArithmeticOverflow(const Context & context) { return context.getSettingsRef().decimal_check_overflow; }
+bool decimalCheckComparisonOverflow(ContextPtr context)
+{
+    return context->getSettingsRef().decimal_check_overflow;
+}
+bool decimalCheckArithmeticOverflow(ContextPtr context)
+{
+    return context->getSettingsRef().decimal_check_overflow;
+}
 
 template <typename T>
 Field DataTypeDecimalBase<T>::getDefault() const
@@ -35,59 +40,6 @@ MutableColumnPtr DataTypeDecimalBase<T>::createColumn() const
     return ColumnType::create(0, scale);
 }
 
-template <typename T>
-void DataTypeDecimalBase<T>::serializeBinary(const Field & field, WriteBuffer & ostr) const
-{
-    FieldType x = get<DecimalField<T>>(field);
-    writeBinary(x, ostr);
-}
-
-template <typename T>
-void DataTypeDecimalBase<T>::serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr) const
-{
-    const FieldType & x = assert_cast<const ColumnType &>(column).getElement(row_num);
-    writeBinary(x, ostr);
-}
-
-template <typename T>
-void DataTypeDecimalBase<T>::serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, size_t offset, size_t limit) const
-{
-    const typename ColumnType::Container & x = typeid_cast<const ColumnType &>(column).getData();
-
-    size_t size = x.size();
-
-    if (limit == 0 || offset + limit > size)
-        limit = size - offset;
-
-    ostr.write(reinterpret_cast<const char *>(&x[offset]), sizeof(FieldType) * limit);
-}
-
-template <typename T>
-void DataTypeDecimalBase<T>::deserializeBinary(Field & field, ReadBuffer & istr) const
-{
-    typename FieldType::NativeType x;
-    readBinary(x, istr);
-    field = DecimalField(T(x), this->scale);
-}
-
-template <typename T>
-void DataTypeDecimalBase<T>::deserializeBinary(IColumn & column, ReadBuffer & istr) const
-{
-    typename FieldType::NativeType x;
-    readBinary(x, istr);
-    assert_cast<ColumnType &>(column).getData().push_back(FieldType(x));
-}
-
-template <typename T>
-void DataTypeDecimalBase<T>::deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, size_t limit, double) const
-{
-    typename ColumnType::Container & x = typeid_cast<ColumnType &>(column).getData();
-    size_t initial_size = x.size();
-    x.resize(initial_size + limit);
-    size_t size = istr.readBig(reinterpret_cast<char*>(&x[initial_size]), sizeof(FieldType) * limit);
-    x.resize(initial_size + size / sizeof(FieldType));
-}
-
 template <typename T>
 T DataTypeDecimalBase<T>::getScaleMultiplier(UInt32 scale_)
 {
diff --git a/src/DataTypes/DataTypeDecimalBase.h b/src/DataTypes/DataTypeDecimalBase.h
index d9079166fa7..9e44310a0ff 100644
--- a/src/DataTypes/DataTypeDecimalBase.h
+++ b/src/DataTypes/DataTypeDecimalBase.h
@@ -1,12 +1,12 @@
 #pragma once
-#include <cmath>
 
 #include <Columns/ColumnDecimal.h>
 #include <Core/DecimalFunctions.h>
 #include <DataTypes/IDataType.h>
 #include <DataTypes/DataTypesNumber.h>
-#include <DataTypes/DataTypeWithSimpleSerialization.h>
+#include <Interpreters/Context_fwd.h>
 
+#include <cmath>
 #include <type_traits>
 
 
@@ -18,9 +18,8 @@ namespace ErrorCodes
     extern const int ARGUMENT_OUT_OF_BOUND;
 }
 
-class Context;
-bool decimalCheckComparisonOverflow(const Context & context);
-bool decimalCheckArithmeticOverflow(const Context & context);
+bool decimalCheckComparisonOverflow(ContextPtr context);
+bool decimalCheckArithmeticOverflow(ContextPtr context);
 
 inline UInt32 leastDecimalPrecisionFor(TypeIndex int_type)
 {
@@ -55,7 +54,7 @@ inline UInt32 leastDecimalPrecisionFor(TypeIndex int_type)
 ///     P is one of (9, 18, 38, 76); equals to the maximum precision for the biggest underlying type of operands.
 ///     S is maximum scale of operands. The allowed valuas are [0, precision]
 template <typename T>
-class DataTypeDecimalBase : public DataTypeWithSimpleSerialization
+class DataTypeDecimalBase : public IDataType
 {
     static_assert(IsDecimalNumber<T>);
 
@@ -96,14 +95,6 @@ public:
     bool canBeUsedInBooleanContext() const override { return true; }
     bool canBeInsideNullable() const override { return true; }
 
-    void serializeBinary(const Field & field, WriteBuffer & ostr) const override;
-    void serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr) const override;
-    void serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, size_t offset, size_t limit) const override;
-
-    void deserializeBinary(Field & field, ReadBuffer & istr) const override;
-    void deserializeBinary(IColumn & column, ReadBuffer & istr) const override;
-    void deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, size_t limit, double avg_value_size_hint) const override;
-
     /// Decimal specific
 
     UInt32 getPrecision() const { return precision; }
diff --git a/src/DataTypes/DataTypeEnum.cpp b/src/DataTypes/DataTypeEnum.cpp
index 043c971266c..b8b0b906cc4 100644
--- a/src/DataTypes/DataTypeEnum.cpp
+++ b/src/DataTypes/DataTypeEnum.cpp
@@ -1,6 +1,7 @@
 #include <IO/WriteBufferFromString.h>
 #include <Formats/FormatSettings.h>
 #include <DataTypes/DataTypeEnum.h>
+#include <DataTypes/Serializations/SerializationEnum.h>
 #include <DataTypes/DataTypeFactory.h>
 #include <Parsers/IAST.h>
 #include <Parsers/ASTFunction.h>
@@ -19,7 +20,6 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int BAD_TYPE_OF_FIELD;
-    extern const int SYNTAX_ERROR;
     extern const int EMPTY_DATA_PASSED;
     extern const int UNEXPECTED_AST_STRUCTURE;
     extern const int ARGUMENT_OUT_OF_BOUND;
@@ -65,203 +65,22 @@ std::string DataTypeEnum<Type>::generateName(const Values & values)
 }
 
 template <typename Type>
-void DataTypeEnum<Type>::fillMaps()
+DataTypeEnum<Type>::DataTypeEnum(const Values & values_)
+    : EnumValues<Type>(values_)
+    , type_name(generateName(this->getValues()))
 {
-    for (const auto & name_and_value : values)
-    {
-        const auto inserted_value = name_to_value_map.insert(
-            { StringRef{name_and_value.first}, name_and_value.second });
-
-        if (!inserted_value.second)
-            throw Exception{"Duplicate names in enum: '" + name_and_value.first + "' = " + toString(name_and_value.second)
-                    + " and " + toString(inserted_value.first->getMapped()),
-                ErrorCodes::SYNTAX_ERROR};
-
-        const auto inserted_name = value_to_name_map.insert(
-            { name_and_value.second, StringRef{name_and_value.first} });
-
-        if (!inserted_name.second)
-            throw Exception{"Duplicate values in enum: '" + name_and_value.first + "' = " + toString(name_and_value.second)
-                    + " and '" + toString((*inserted_name.first).first) + "'",
-                ErrorCodes::SYNTAX_ERROR};
-    }
-}
-
-template <typename Type>
-DataTypeEnum<Type>::DataTypeEnum(const Values & values_) : values{values_}
-{
-    if (values.empty())
-        throw Exception{"DataTypeEnum enumeration cannot be empty", ErrorCodes::EMPTY_DATA_PASSED};
-
-    std::sort(std::begin(values), std::end(values), [] (auto & left, auto & right)
-    {
-        return left.second < right.second;
-    });
-
-    fillMaps();
-    type_name = generateName(values);
-}
-
-template <typename Type>
-void DataTypeEnum<Type>::serializeBinary(const Field & field, WriteBuffer & ostr) const
-{
-    const FieldType x = get<NearestFieldType<FieldType>>(field);
-    writeBinary(x, ostr);
-}
-
-template <typename Type>
-void DataTypeEnum<Type>::deserializeBinary(Field & field, ReadBuffer & istr) const
-{
-    FieldType x;
-    readBinary(x, istr);
-    field = castToNearestFieldType(x);
-}
-
-template <typename Type>
-void DataTypeEnum<Type>::serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr) const
-{
-    writeBinary(assert_cast<const ColumnType &>(column).getData()[row_num], ostr);
-}
-
-template <typename Type>
-void DataTypeEnum<Type>::deserializeBinary(IColumn & column, ReadBuffer & istr) const
-{
-    typename ColumnType::ValueType x;
-    readBinary(x, istr);
-    assert_cast<ColumnType &>(column).getData().push_back(x);
-}
-
-template <typename Type>
-void DataTypeEnum<Type>::serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const
-{
-    writeString(getNameForValue(assert_cast<const ColumnType &>(column).getData()[row_num]), ostr);
-}
-
-template <typename Type>
-void DataTypeEnum<Type>::serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const
-{
-    writeEscapedString(getNameForValue(assert_cast<const ColumnType &>(column).getData()[row_num]), ostr);
-}
-
-template <typename Type>
-void DataTypeEnum<Type>::deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
-{
-    if (settings.tsv.input_format_enum_as_number)
-        assert_cast<ColumnType &>(column).getData().push_back(readValue(istr));
-    else
-    {
-        /// NOTE It would be nice to do without creating a temporary object - at least extract std::string out.
-        std::string field_name;
-        readEscapedString(field_name, istr);
-        assert_cast<ColumnType &>(column).getData().push_back(getValue(StringRef(field_name), true));
-    }
-}
-
-template <typename Type>
-void DataTypeEnum<Type>::serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const
-{
-    writeQuotedString(getNameForValue(assert_cast<const ColumnType &>(column).getData()[row_num]), ostr);
-}
-
-template <typename Type>
-void DataTypeEnum<Type>::deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
-{
-    std::string field_name;
-    readQuotedStringWithSQLStyle(field_name, istr);
-    assert_cast<ColumnType &>(column).getData().push_back(getValue(StringRef(field_name)));
-}
-
-template <typename Type>
-void DataTypeEnum<Type>::deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
-{
-    if (settings.tsv.input_format_enum_as_number)
-        assert_cast<ColumnType &>(column).getData().push_back(readValue(istr));
-    else
-    {
-        std::string field_name;
-        readString(field_name, istr);
-        assert_cast<ColumnType &>(column).getData().push_back(getValue(StringRef(field_name), true));
-    }
-}
-
-template <typename Type>
-void DataTypeEnum<Type>::serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    writeJSONString(getNameForValue(assert_cast<const ColumnType &>(column).getData()[row_num]), ostr, settings);
-}
-
-template <typename Type>
-void DataTypeEnum<Type>::serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const
-{
-    writeXMLStringForTextElement(getNameForValue(assert_cast<const ColumnType &>(column).getData()[row_num]), ostr);
-}
-
-template <typename Type>
-void DataTypeEnum<Type>::deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
-{
-    if (!istr.eof() && *istr.position() != '"')
-        assert_cast<ColumnType &>(column).getData().push_back(readValue(istr));
-    else
-    {
-        std::string field_name;
-        readJSONString(field_name, istr);
-        assert_cast<ColumnType &>(column).getData().push_back(getValue(StringRef(field_name)));
-    }
-}
-
-template <typename Type>
-void DataTypeEnum<Type>::serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const
-{
-    writeCSVString(getNameForValue(assert_cast<const ColumnType &>(column).getData()[row_num]), ostr);
-}
-
-template <typename Type>
-void DataTypeEnum<Type>::deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
-{
-    if (settings.csv.input_format_enum_as_number)
-        assert_cast<ColumnType &>(column).getData().push_back(readValue(istr));
-    else
-    {
-        std::string field_name;
-        readCSVString(field_name, istr, settings.csv);
-        assert_cast<ColumnType &>(column).getData().push_back(getValue(StringRef(field_name), true));
-    }
-}
-
-template <typename Type>
-void DataTypeEnum<Type>::serializeBinaryBulk(
-    const IColumn & column, WriteBuffer & ostr, const size_t offset, size_t limit) const
-{
-    const auto & x = typeid_cast<const ColumnType &>(column).getData();
-    const auto size = x.size();
-
-    if (limit == 0 || offset + limit > size)
-        limit = size - offset;
-
-    ostr.write(reinterpret_cast<const char *>(&x[offset]), sizeof(FieldType) * limit);
-}
-
-template <typename Type>
-void DataTypeEnum<Type>::deserializeBinaryBulk(
-    IColumn & column, ReadBuffer & istr, const size_t limit, const double /*avg_value_size_hint*/) const
-{
-    auto & x = typeid_cast<ColumnType &>(column).getData();
-    const auto initial_size = x.size();
-    x.resize(initial_size + limit);
-    const auto size = istr.readBig(reinterpret_cast<char*>(&x[initial_size]), sizeof(FieldType) * limit);
-    x.resize(initial_size + size / sizeof(FieldType));
 }
 
 template <typename Type>
 Field DataTypeEnum<Type>::getDefault() const
 {
-    return values.front().second;
+    return this->getValues().front().second;
 }
 
 template <typename Type>
 void DataTypeEnum<Type>::insertDefaultInto(IColumn & column) const
 {
-    assert_cast<ColumnType &>(column).getData().push_back(values.front().second);
+    assert_cast<ColumnType &>(column).getData().push_back(this->getValues().front().second);
 }
 
 template <typename Type>
@@ -274,7 +93,7 @@ bool DataTypeEnum<Type>::equals(const IDataType & rhs) const
 template <typename Type>
 bool DataTypeEnum<Type>::textCanContainOnlyValidUTF8() const
 {
-    for (const auto & elem : values)
+    for (const auto & elem : this->getValues())
     {
         const char * pos = elem.first.data();
         const char * end = pos + elem.first.size();
@@ -305,14 +124,14 @@ Field DataTypeEnum<Type>::castToName(const Field & value_or_name) const
 {
     if (value_or_name.getType() == Field::Types::String)
     {
-        getValue(value_or_name.get<String>()); /// Check correctness
+        this->getValue(value_or_name.get<String>()); /// Check correctness
         return value_or_name.get<String>();
     }
     else if (value_or_name.getType() == Field::Types::Int64)
     {
         Int64 value = value_or_name.get<Int64>();
         checkOverflow<Type>(value);
-        return getNameForValue(static_cast<Type>(value)).toString();
+        return this->getNameForValue(static_cast<Type>(value)).toString();
     }
     else
         throw Exception(String("DataTypeEnum: Unsupported type of field ") + value_or_name.getTypeName(), ErrorCodes::BAD_TYPE_OF_FIELD);
@@ -323,14 +142,14 @@ Field DataTypeEnum<Type>::castToValue(const Field & value_or_name) const
 {
     if (value_or_name.getType() == Field::Types::String)
     {
-        return getValue(value_or_name.get<String>());
+        return this->getValue(value_or_name.get<String>());
     }
     else if (value_or_name.getType() == Field::Types::Int64
           || value_or_name.getType() == Field::Types::UInt64)
     {
         Int64 value = value_or_name.get<Int64>();
         checkOverflow<Type>(value);
-        getNameForValue(static_cast<Type>(value)); /// Check correctness
+        this->getNameForValue(static_cast<Type>(value)); /// Check correctness
         return value;
     }
     else
@@ -341,25 +160,19 @@ Field DataTypeEnum<Type>::castToValue(const Field & value_or_name) const
 template <typename Type>
 bool DataTypeEnum<Type>::contains(const IDataType & rhs) const
 {
-    auto check = [&](const auto & value)
-    {
-        auto it = name_to_value_map.find(value.first);
-        /// If we don't have this name, than we have to be sure,
-        /// that this value exists in enum
-        if (it == name_to_value_map.end())
-            return value_to_name_map.count(value.second) > 0;
-
-        /// If we have this name, than it should have the same value
-        return it->value.second == value.second;
-    };
-
     if (const auto * rhs_enum8 = typeid_cast<const DataTypeEnum8 *>(&rhs))
-        return std::all_of(rhs_enum8->getValues().begin(), rhs_enum8->getValues().end(), check);
+        return this->containsAll(rhs_enum8->getValues());
     if (const auto * rhs_enum16 = typeid_cast<const DataTypeEnum16 *>(&rhs))
-        return std::all_of(rhs_enum16->getValues().begin(), rhs_enum16->getValues().end(), check);
+        return this->containsAll(rhs_enum16->getValues());
     return false;
 }
 
+template <typename Type>
+SerializationPtr DataTypeEnum<Type>::doGetDefaultSerialization() const
+{
+    return std::make_shared<SerializationEnum<Type>>(this->getValues());
+}
+
 
 /// Explicit instantiations.
 template class DataTypeEnum<Int8>;
@@ -405,7 +218,7 @@ static DataTypePtr createExact(const ASTPtr & arguments)
                 ErrorCodes::UNEXPECTED_AST_STRUCTURE);
 
         const String & field_name = name_literal->value.get<String>();
-        const auto value = value_literal->value.get<NearestFieldType<FieldType>>();
+        const auto value = value_literal->value.get<FieldType>();
 
         if (value > std::numeric_limits<FieldType>::max() || value < std::numeric_limits<FieldType>::min())
             throw Exception{"Value " + toString(value) + " for element '" + field_name + "' exceeds range of " + EnumName<FieldType>::value,
diff --git a/src/DataTypes/DataTypeEnum.h b/src/DataTypes/DataTypeEnum.h
index 003613edb98..57657d1d110 100644
--- a/src/DataTypes/DataTypeEnum.h
+++ b/src/DataTypes/DataTypeEnum.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <DataTypes/IDataType.h>
+#include <DataTypes/EnumValues.h>
 #include <Columns/ColumnVector.h>
 #include <Columns/ColumnConst.h>
 #include <Common/HashTable/HashMap.h>
@@ -11,12 +12,6 @@
 namespace DB
 {
 
-namespace ErrorCodes
-{
-    extern const int BAD_ARGUMENTS;
-}
-
-
 class IDataTypeEnum : public IDataType
 {
 public:
@@ -36,102 +31,37 @@ public:
 
 
 template <typename Type>
-class DataTypeEnum final : public IDataTypeEnum
+class DataTypeEnum final : public IDataTypeEnum, public EnumValues<Type>
 {
 public:
     using FieldType = Type;
     using ColumnType = ColumnVector<FieldType>;
-    using Value = std::pair<std::string, FieldType>;
-    using Values = std::vector<Value>;
-    using NameToValueMap = HashMap<StringRef, FieldType, StringRefHash>;
-    using ValueToNameMap = std::unordered_map<FieldType, StringRef>;
+    using typename EnumValues<Type>::Values;
 
     static constexpr bool is_parametric = true;
 
 private:
-    Values values;
-    NameToValueMap name_to_value_map;
-    ValueToNameMap value_to_name_map;
     std::string type_name;
-
     static std::string generateName(const Values & values);
-    void fillMaps();
 
 public:
     explicit DataTypeEnum(const Values & values_);
 
-    const Values & getValues() const { return values; }
     std::string doGetName() const override { return type_name; }
     const char * getFamilyName() const override;
 
     TypeIndex getTypeId() const override { return sizeof(FieldType) == 1 ? TypeIndex::Enum8 : TypeIndex::Enum16; }
 
-    auto findByValue(const FieldType & value) const
-    {
-        const auto it = value_to_name_map.find(value);
-        if (it == std::end(value_to_name_map))
-            throw Exception{"Unexpected value " + toString(value) + " for type " + getName(), ErrorCodes::BAD_ARGUMENTS};
-
-        return it;
-    }
-
-    const StringRef & getNameForValue(const FieldType & value) const
-    {
-        return findByValue(value)->second;
-    }
-
-    FieldType getValue(StringRef field_name, bool try_treat_as_id = false) const
-    {
-        const auto it = name_to_value_map.find(field_name);
-        if (!it)
-        {
-            /// It is used in CSV and TSV input formats. If we fail to find given string in
-            /// enum names, we will try to treat it as enum id.
-            if (try_treat_as_id)
-            {
-                FieldType x;
-                ReadBufferFromMemory tmp_buf(field_name.data, field_name.size);
-                readText(x, tmp_buf);
-                /// Check if we reached end of the tmp_buf (otherwise field_name is not a number)
-                /// and try to find it in enum ids
-                if (tmp_buf.eof() && value_to_name_map.find(x) != value_to_name_map.end())
-                    return x;
-            }
-            throw Exception{"Unknown element '" + field_name.toString() + "' for type " + getName(), ErrorCodes::BAD_ARGUMENTS};
-        }
-        return it->getMapped();
-    }
-
     FieldType readValue(ReadBuffer & istr) const
     {
         FieldType x;
         readText(x, istr);
-        return findByValue(x)->first;
+        return this->findByValue(x)->first;
     }
 
     Field castToName(const Field & value_or_name) const override;
     Field castToValue(const Field & value_or_name) const override;
 
-    void serializeBinary(const Field & field, WriteBuffer & ostr) const override;
-    void deserializeBinary(Field & field, ReadBuffer & istr) const override;
-    void serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr) const override;
-    void deserializeBinary(IColumn & column, ReadBuffer & istr) const override;
-    void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-    void serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-    void deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
-    void serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-    void deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
-    void deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
-
-    void serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-    void deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
-    void serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-    void serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-    void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
-
-    void serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, const size_t offset, size_t limit) const override;
-    void deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, const size_t limit, const double avg_value_size_hint) const override;
-
     MutableColumnPtr createColumn() const override { return ColumnType::create(); }
 
     Field getDefault() const override;
@@ -147,6 +77,8 @@ public:
     /// Enum('a' = 1, 'b' = 2) -> Enum('c' = 1, 'b' = 2, 'd' = 3) OK
     /// Enum('a' = 1, 'b' = 2) -> Enum('a' = 2, 'b' = 1) NOT OK
     bool contains(const IDataType & rhs) const;
+
+    SerializationPtr doGetDefaultSerialization() const override;
 };
 
 
diff --git a/src/DataTypes/DataTypeFactory.cpp b/src/DataTypes/DataTypeFactory.cpp
index dc3ce039dbd..c28de15565c 100644
--- a/src/DataTypes/DataTypeFactory.cpp
+++ b/src/DataTypes/DataTypeFactory.cpp
@@ -84,16 +84,7 @@ DataTypePtr DataTypeFactory::get(const String & family_name_param, const ASTPtr
         return get("LowCardinality", low_cardinality_params);
     }
 
-    DataTypePtr res = findCreatorByName(family_name)(parameters);
-
-    if (CurrentThread::isInitialized())
-    {
-        const auto * query_context = CurrentThread::get().getQueryContext();
-        if (query_context && query_context->getSettingsRef().log_queries)
-            query_context->addQueryFactoriesInfo(Context::QueryLogFactories::DataType, family_name);
-    }
-
-    return res;
+    return findCreatorByName(family_name)(parameters);
 }
 
 DataTypePtr DataTypeFactory::getCustom(DataTypeCustomDescPtr customization) const
@@ -165,10 +156,18 @@ void DataTypeFactory::registerSimpleDataTypeCustom(const String &name, SimpleCre
 
 const DataTypeFactory::Value & DataTypeFactory::findCreatorByName(const String & family_name) const
 {
+    ContextPtr query_context;
+    if (CurrentThread::isInitialized())
+        query_context = CurrentThread::get().getQueryContext();
+
     {
         DataTypesDictionary::const_iterator it = data_types.find(family_name);
         if (data_types.end() != it)
+        {
+            if (query_context && query_context->getSettingsRef().log_queries)
+                query_context->addQueryFactoriesInfo(Context::QueryLogFactories::DataType, family_name);
             return it->second;
+        }
     }
 
     String family_name_lowercase = Poco::toLower(family_name);
@@ -176,7 +175,11 @@ const DataTypeFactory::Value & DataTypeFactory::findCreatorByName(const String &
     {
         DataTypesDictionary::const_iterator it = case_insensitive_data_types.find(family_name_lowercase);
         if (case_insensitive_data_types.end() != it)
+        {
+            if (query_context && query_context->getSettingsRef().log_queries)
+                query_context->addQueryFactoriesInfo(Context::QueryLogFactories::DataType, family_name_lowercase);
             return it->second;
+        }
     }
 
     auto hints = this->getHints(family_name);
diff --git a/src/DataTypes/DataTypeFactory.h b/src/DataTypes/DataTypeFactory.h
index 618c1f51067..9fa3e30297b 100644
--- a/src/DataTypes/DataTypeFactory.h
+++ b/src/DataTypes/DataTypeFactory.h
@@ -3,7 +3,7 @@
 #include <DataTypes/IDataType.h>
 #include <Parsers/IAST_fwd.h>
 #include <Common/IFactoryWithAliases.h>
-#include <DataTypes/DataTypeCustom_fwd.h>
+#include <DataTypes/DataTypeCustom.h>
 
 
 #include <functional>
@@ -86,6 +86,5 @@ void registerDataTypeLowCardinality(DataTypeFactory & factory);
 void registerDataTypeDomainIPv4AndIPv6(DataTypeFactory & factory);
 void registerDataTypeDomainSimpleAggregateFunction(DataTypeFactory & factory);
 void registerDataTypeDomainGeo(DataTypeFactory & factory);
-void registerDataTypeOneElementTuple(DataTypeFactory & factory);
 
 }
diff --git a/src/DataTypes/DataTypeFixedString.cpp b/src/DataTypes/DataTypeFixedString.cpp
index 21cfe855169..a40592ba023 100644
--- a/src/DataTypes/DataTypeFixedString.cpp
+++ b/src/DataTypes/DataTypeFixedString.cpp
@@ -4,6 +4,7 @@
 #include <Formats/FormatSettings.h>
 #include <DataTypes/DataTypeFixedString.h>
 #include <DataTypes/DataTypeFactory.h>
+#include <DataTypes/Serializations/SerializationFixedString.h>
 
 #include <IO/WriteBuffer.h>
 #include <IO/ReadHelpers.h>
@@ -22,7 +23,6 @@ namespace DB
 
 namespace ErrorCodes
 {
-    extern const int CANNOT_READ_ALL_DATA;
     extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
     extern const int UNEXPECTED_AST_STRUCTURE;
 }
@@ -33,176 +33,6 @@ std::string DataTypeFixedString::doGetName() const
     return "FixedString(" + toString(n) + ")";
 }
 
-
-void DataTypeFixedString::serializeBinary(const Field & field, WriteBuffer & ostr) const
-{
-    const String & s = get<const String &>(field);
-    ostr.write(s.data(), std::min(s.size(), n));
-    if (s.size() < n)
-        for (size_t i = s.size(); i < n; ++i)
-            ostr.write(0);
-}
-
-
-void DataTypeFixedString::deserializeBinary(Field & field, ReadBuffer & istr) const
-{
-    field = String();
-    String & s = get<String &>(field);
-    s.resize(n);
-    istr.readStrict(s.data(), n);
-}
-
-
-void DataTypeFixedString::serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr) const
-{
-    ostr.write(reinterpret_cast<const char *>(&assert_cast<const ColumnFixedString &>(column).getChars()[n * row_num]), n);
-}
-
-
-void DataTypeFixedString::deserializeBinary(IColumn & column, ReadBuffer & istr) const
-{
-    ColumnFixedString::Chars & data = assert_cast<ColumnFixedString &>(column).getChars();
-    size_t old_size = data.size();
-    data.resize(old_size + n);
-    try
-    {
-        istr.readStrict(reinterpret_cast<char *>(data.data() + old_size), n);
-    }
-    catch (...)
-    {
-        data.resize_assume_reserved(old_size);
-        throw;
-    }
-}
-
-
-void DataTypeFixedString::serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, size_t offset, size_t limit) const
-{
-    const ColumnFixedString::Chars & data = typeid_cast<const ColumnFixedString &>(column).getChars();
-
-    size_t size = data.size() / n;
-
-    if (limit == 0 || offset + limit > size)
-        limit = size - offset;
-
-    if (limit)
-        ostr.write(reinterpret_cast<const char *>(&data[n * offset]), n * limit);
-}
-
-
-void DataTypeFixedString::deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, size_t limit, double /*avg_value_size_hint*/) const
-{
-    ColumnFixedString::Chars & data = typeid_cast<ColumnFixedString &>(column).getChars();
-
-    size_t initial_size = data.size();
-    size_t max_bytes = limit * n;
-    data.resize(initial_size + max_bytes);
-    size_t read_bytes = istr.readBig(reinterpret_cast<char *>(&data[initial_size]), max_bytes);
-
-    if (read_bytes % n != 0)
-        throw Exception("Cannot read all data of type FixedString. Bytes read:" + toString(read_bytes) + ". String size:" + toString(n) + ".",
-            ErrorCodes::CANNOT_READ_ALL_DATA);
-
-    data.resize(initial_size + read_bytes);
-}
-
-
-void DataTypeFixedString::serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const
-{
-    writeString(reinterpret_cast<const char *>(&assert_cast<const ColumnFixedString &>(column).getChars()[n * row_num]), n, ostr);
-}
-
-
-void DataTypeFixedString::serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const
-{
-    const char * pos = reinterpret_cast<const char *>(&assert_cast<const ColumnFixedString &>(column).getChars()[n * row_num]);
-    writeAnyEscapedString<'\''>(pos, pos + n, ostr);
-}
-
-
-static inline void alignStringLength(const DataTypeFixedString & type,
-                                     ColumnFixedString::Chars & data,
-                                     size_t string_start)
-{
-    ColumnFixedString::alignStringLength(data, type.getN(), string_start);
-}
-
-template <typename Reader>
-static inline void read(const DataTypeFixedString & self, IColumn & column, Reader && reader)
-{
-    ColumnFixedString::Chars & data = typeid_cast<ColumnFixedString &>(column).getChars();
-    size_t prev_size = data.size();
-    try
-    {
-        reader(data);
-        alignStringLength(self, data, prev_size);
-    }
-    catch (...)
-    {
-        data.resize_assume_reserved(prev_size);
-        throw;
-    }
-}
-
-
-void DataTypeFixedString::deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
-{
-    read(*this, column, [&istr](ColumnFixedString::Chars & data) { readEscapedStringInto(data, istr); });
-}
-
-
-void DataTypeFixedString::serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const
-{
-    const char * pos = reinterpret_cast<const char *>(&assert_cast<const ColumnFixedString &>(column).getChars()[n * row_num]);
-    writeAnyQuotedString<'\''>(pos, pos + n, ostr);
-}
-
-
-void DataTypeFixedString::deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
-{
-    read(*this, column, [&istr](ColumnFixedString::Chars & data) { readQuotedStringInto<true>(data, istr); });
-}
-
-
-void DataTypeFixedString::deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
-{
-    read(*this, column, [&istr](ColumnFixedString::Chars & data) { readStringInto(data, istr); });
-}
-
-
-void DataTypeFixedString::serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    const char * pos = reinterpret_cast<const char *>(&assert_cast<const ColumnFixedString &>(column).getChars()[n * row_num]);
-    writeJSONString(pos, pos + n, ostr, settings);
-}
-
-
-void DataTypeFixedString::deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
-{
-    read(*this, column, [&istr](ColumnFixedString::Chars & data) { readJSONStringInto(data, istr); });
-}
-
-
-void DataTypeFixedString::serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const
-{
-    const char * pos = reinterpret_cast<const char *>(&assert_cast<const ColumnFixedString &>(column).getChars()[n * row_num]);
-    writeXMLStringForTextElement(pos, pos + n, ostr);
-}
-
-
-void DataTypeFixedString::serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const
-{
-    const char * pos = reinterpret_cast<const char *>(&assert_cast<const ColumnFixedString &>(column).getChars()[n * row_num]);
-    writeCSVString(pos, pos + n, ostr);
-}
-
-
-void DataTypeFixedString::deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
-{
-    read(*this, column, [&istr, &csv = settings.csv](ColumnFixedString::Chars & data) { readCSVStringInto(data, istr, csv); });
-}
-
-
 MutableColumnPtr DataTypeFixedString::createColumn() const
 {
     return ColumnFixedString::create(n);
@@ -218,6 +48,11 @@ bool DataTypeFixedString::equals(const IDataType & rhs) const
     return typeid(rhs) == typeid(*this) && n == static_cast<const DataTypeFixedString &>(rhs).n;
 }
 
+SerializationPtr DataTypeFixedString::doGetDefaultSerialization() const
+{
+    return std::make_shared<SerializationFixedString>(n);
+}
+
 
 static DataTypePtr create(const ASTPtr & arguments)
 {
diff --git a/src/DataTypes/DataTypeFixedString.h b/src/DataTypes/DataTypeFixedString.h
index af82e4b5d11..d82ea9824f3 100644
--- a/src/DataTypes/DataTypeFixedString.h
+++ b/src/DataTypes/DataTypeFixedString.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <DataTypes/IDataType.h>
+#include <Common/PODArray_fwd.h>
 
 #define MAX_FIXEDSTRING_SIZE 0xFFFFFF
 
@@ -40,38 +41,14 @@ public:
         return n;
     }
 
-    void serializeBinary(const Field & field, WriteBuffer & ostr) const override;
-    void deserializeBinary(Field & field, ReadBuffer & istr) const override;
-    void serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr) const override;
-    void deserializeBinary(IColumn & column, ReadBuffer & istr) const override;
-
-    void serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, size_t offset, size_t limit) const override;
-    void deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, size_t limit, double avg_value_size_hint) const override;
-
-    void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-
-    void deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
-
-    void serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-    void deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
-
-    void serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-    void deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
-
-    void serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-    void deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
-
-    void serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-
-    void serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-    void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
-
     MutableColumnPtr createColumn() const override;
 
     Field getDefault() const override;
 
     bool equals(const IDataType & rhs) const override;
 
+    SerializationPtr doGetDefaultSerialization() const override;
+
     bool isParametric() const override { return true; }
     bool haveSubtypes() const override { return false; }
     bool isComparable() const override { return true; }
@@ -82,6 +59,11 @@ public:
     bool isCategorial() const override { return true; }
     bool canBeInsideNullable() const override { return true; }
     bool canBeInsideLowCardinality() const override { return true; }
+
+    /// Makes sure that the length of a newly inserted string to `chars` is equal to getN().
+    /// If the length is less than getN() the function will add zero characters up to getN().
+    /// If the length is greater than getN() the function will throw an exception.
+    void alignStringLength(PaddedPODArray<UInt8> & chars, size_t old_size) const;
 };
 
 }
diff --git a/src/DataTypes/DataTypeLowCardinality.cpp b/src/DataTypes/DataTypeLowCardinality.cpp
index 1b21b7de4bc..485083d67ee 100644
--- a/src/DataTypes/DataTypeLowCardinality.cpp
+++ b/src/DataTypes/DataTypeLowCardinality.cpp
@@ -13,6 +13,7 @@
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeDate.h>
 #include <DataTypes/DataTypeDateTime.h>
+#include <DataTypes/Serializations/SerializationLowCardinality.h>
 #include <Parsers/IAST.h>
 
 namespace DB
@@ -25,19 +26,6 @@ namespace ErrorCodes
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
 }
 
-namespace
-{
-    const ColumnLowCardinality & getColumnLowCardinality(const IColumn & column)
-    {
-        return typeid_cast<const ColumnLowCardinality &>(column);
-    }
-
-    ColumnLowCardinality & getColumnLowCardinality(IColumn & column)
-    {
-        return typeid_cast<ColumnLowCardinality &>(column);
-    }
-}
-
 DataTypeLowCardinality::DataTypeLowCardinality(DataTypePtr dictionary_type_)
         : dictionary_type(std::move(dictionary_type_))
 {
@@ -50,785 +38,6 @@ DataTypeLowCardinality::DataTypeLowCardinality(DataTypePtr dictionary_type_)
                         + dictionary_type->getName(), ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
 }
 
-void DataTypeLowCardinality::enumerateStreamsImpl(const StreamCallback & callback, SubstreamPath & path) const
-{
-    path.push_back(Substream::DictionaryKeys);
-    dictionary_type->enumerateStreams(callback, path);
-    path.back() = Substream::DictionaryIndexes;
-    callback(path, *this);
-    path.pop_back();
-}
-
-struct KeysSerializationVersion
-{
-    enum Value
-    {
-        /// Version is written at the start of <name.dict.bin>.
-        /// Dictionary is written as number N and N keys after them.
-        /// Dictionary can be shared for continuous range of granules, so some marks may point to the same position.
-        /// Shared dictionary is stored in state and is read once.
-        SharedDictionariesWithAdditionalKeys = 1,
-    };
-
-    Value value;
-
-    static void checkVersion(UInt64 version)
-    {
-        if (version != SharedDictionariesWithAdditionalKeys)
-            throw Exception("Invalid version for DataTypeLowCardinality key column.", ErrorCodes::LOGICAL_ERROR);
-    }
-
-    explicit KeysSerializationVersion(UInt64 version) : value(static_cast<Value>(version)) { checkVersion(version); }
-};
-
-/// Version is stored at the start of each granule. It's used to store indexes type and flags.
-struct IndexesSerializationType
-{
-    using SerializationType = UInt64;
-    /// Need to read dictionary if it wasn't.
-    static constexpr SerializationType NeedGlobalDictionaryBit = 1u << 8u;
-    /// Need to read additional keys. Additional keys are stored before indexes as value N and N keys after them.
-    static constexpr SerializationType HasAdditionalKeysBit = 1u << 9u;
-    /// Need to update dictionary. It means that previous granule has different dictionary.
-    static constexpr SerializationType NeedUpdateDictionary = 1u << 10u;
-
-    enum Type
-    {
-        TUInt8 = 0,
-        TUInt16,
-        TUInt32,
-        TUInt64,
-    };
-
-    Type type;
-    bool has_additional_keys;
-    bool need_global_dictionary;
-    bool need_update_dictionary;
-
-    static constexpr SerializationType resetFlags(SerializationType type)
-    {
-        return type & (~(HasAdditionalKeysBit | NeedGlobalDictionaryBit | NeedUpdateDictionary));
-    }
-
-    static void checkType(SerializationType type)
-    {
-        UInt64 value = resetFlags(type);
-        if (value <= TUInt64)
-            return;
-
-        throw Exception("Invalid type for DataTypeLowCardinality index column.", ErrorCodes::LOGICAL_ERROR);
-    }
-
-    void serialize(WriteBuffer & buffer) const
-    {
-        SerializationType val = type;
-        if (has_additional_keys)
-            val |= HasAdditionalKeysBit;
-        if (need_global_dictionary)
-            val |= NeedGlobalDictionaryBit;
-        if (need_update_dictionary)
-            val |= NeedUpdateDictionary;
-        writeIntBinary(val, buffer);
-    }
-
-    void deserialize(ReadBuffer & buffer)
-    {
-        SerializationType val;
-        readIntBinary(val, buffer);
-        checkType(val);
-        has_additional_keys = (val & HasAdditionalKeysBit) != 0;
-        need_global_dictionary = (val & NeedGlobalDictionaryBit) != 0;
-        need_update_dictionary = (val & NeedUpdateDictionary) != 0;
-        type = static_cast<Type>(resetFlags(val));
-    }
-
-    IndexesSerializationType(const IColumn & column,
-                             bool has_additional_keys_,
-                             bool need_global_dictionary_,
-                             bool enumerate_dictionaries)
-        : has_additional_keys(has_additional_keys_)
-        , need_global_dictionary(need_global_dictionary_)
-        , need_update_dictionary(enumerate_dictionaries)
-    {
-        if (typeid_cast<const ColumnUInt8 *>(&column))
-            type = TUInt8;
-        else if (typeid_cast<const ColumnUInt16 *>(&column))
-            type = TUInt16;
-        else if (typeid_cast<const ColumnUInt32 *>(&column))
-            type = TUInt32;
-        else if (typeid_cast<const ColumnUInt64 *>(&column))
-            type = TUInt64;
-        else
-            throw Exception("Invalid Indexes column for IndexesSerializationType. Expected ColumnUInt*, got "
-                            + column.getName(), ErrorCodes::LOGICAL_ERROR);
-    }
-
-    DataTypePtr getDataType() const
-    {
-        if (type == TUInt8)
-            return std::make_shared<DataTypeUInt8>();
-        if (type == TUInt16)
-            return std::make_shared<DataTypeUInt16>();
-        if (type == TUInt32)
-            return std::make_shared<DataTypeUInt32>();
-        if (type == TUInt64)
-            return std::make_shared<DataTypeUInt64>();
-
-        throw Exception("Can't create DataType from IndexesSerializationType.", ErrorCodes::LOGICAL_ERROR);
-    }
-
-    IndexesSerializationType() = default;
-};
-
-struct SerializeStateLowCardinality : public IDataType::SerializeBinaryBulkState
-{
-    KeysSerializationVersion key_version;
-    MutableColumnUniquePtr shared_dictionary;
-
-    explicit SerializeStateLowCardinality(UInt64 key_version_) : key_version(key_version_) {}
-};
-
-struct DeserializeStateLowCardinality : public IDataType::DeserializeBinaryBulkState
-{
-    KeysSerializationVersion key_version;
-    ColumnUniquePtr global_dictionary;
-
-    IndexesSerializationType index_type;
-    ColumnPtr additional_keys;
-    ColumnPtr null_map;
-    UInt64 num_pending_rows = 0;
-
-    /// If dictionary should be updated.
-    /// Can happen is some granules was skipped while reading from MergeTree.
-    /// We should store this flag in State because
-    ///   in case of long block of empty arrays we may not need read dictionary at first reading.
-    bool need_update_dictionary = false;
-
-    explicit DeserializeStateLowCardinality(UInt64 key_version_) : key_version(key_version_) {}
-};
-
-static SerializeStateLowCardinality * checkAndGetLowCardinalitySerializeState(
-    IDataType::SerializeBinaryBulkStatePtr & state)
-{
-    if (!state)
-        throw Exception("Got empty state for DataTypeLowCardinality.", ErrorCodes::LOGICAL_ERROR);
-
-    auto * low_cardinality_state = typeid_cast<SerializeStateLowCardinality *>(state.get());
-    if (!low_cardinality_state)
-    {
-        auto & state_ref = *state;
-        throw Exception("Invalid SerializeBinaryBulkState for DataTypeLowCardinality. Expected: "
-                        + demangle(typeid(SerializeStateLowCardinality).name()) + ", got "
-                        + demangle(typeid(state_ref).name()), ErrorCodes::LOGICAL_ERROR);
-    }
-
-    return low_cardinality_state;
-}
-
-static DeserializeStateLowCardinality * checkAndGetLowCardinalityDeserializeState(
-    IDataType::DeserializeBinaryBulkStatePtr & state)
-{
-    if (!state)
-        throw Exception("Got empty state for DataTypeLowCardinality.", ErrorCodes::LOGICAL_ERROR);
-
-    auto * low_cardinality_state = typeid_cast<DeserializeStateLowCardinality *>(state.get());
-    if (!low_cardinality_state)
-    {
-        auto & state_ref = *state;
-        throw Exception("Invalid DeserializeBinaryBulkState for DataTypeLowCardinality. Expected: "
-                        + demangle(typeid(DeserializeStateLowCardinality).name()) + ", got "
-                        + demangle(typeid(state_ref).name()), ErrorCodes::LOGICAL_ERROR);
-    }
-
-    return low_cardinality_state;
-}
-
-void DataTypeLowCardinality::serializeBinaryBulkStatePrefixImpl(
-    SerializeBinaryBulkSettings & settings,
-    SerializeBinaryBulkStatePtr & state) const
-{
-    settings.path.push_back(Substream::DictionaryKeys);
-    auto * stream = settings.getter(settings.path);
-    settings.path.pop_back();
-
-    if (!stream)
-        throw Exception("Got empty stream in DataTypeLowCardinality::serializeBinaryBulkStatePrefix",
-                        ErrorCodes::LOGICAL_ERROR);
-
-    /// Write version and create SerializeBinaryBulkState.
-    UInt64 key_version = KeysSerializationVersion::SharedDictionariesWithAdditionalKeys;
-
-    writeIntBinary(key_version, *stream);
-
-    state = std::make_shared<SerializeStateLowCardinality>(key_version);
-}
-
-void DataTypeLowCardinality::serializeBinaryBulkStateSuffixImpl(
-    SerializeBinaryBulkSettings & settings,
-    SerializeBinaryBulkStatePtr & state) const
-{
-    auto * low_cardinality_state = checkAndGetLowCardinalitySerializeState(state);
-    KeysSerializationVersion::checkVersion(low_cardinality_state->key_version.value);
-
-    if (low_cardinality_state->shared_dictionary && settings.low_cardinality_max_dictionary_size)
-    {
-        auto nested_column = low_cardinality_state->shared_dictionary->getNestedNotNullableColumn();
-
-        settings.path.push_back(Substream::DictionaryKeys);
-        auto * stream = settings.getter(settings.path);
-        settings.path.pop_back();
-
-        if (!stream)
-            throw Exception("Got empty stream in DataTypeLowCardinality::serializeBinaryBulkStateSuffix",
-                            ErrorCodes::LOGICAL_ERROR);
-
-        UInt64 num_keys = nested_column->size();
-        writeIntBinary(num_keys, *stream);
-        removeNullable(dictionary_type)->serializeBinaryBulk(*nested_column, *stream, 0, num_keys);
-        low_cardinality_state->shared_dictionary = nullptr;
-    }
-}
-
-void DataTypeLowCardinality::deserializeBinaryBulkStatePrefixImpl(
-    DeserializeBinaryBulkSettings & settings,
-    DeserializeBinaryBulkStatePtr & state) const
-{
-    settings.path.push_back(Substream::DictionaryKeys);
-    auto * stream = settings.getter(settings.path);
-    settings.path.pop_back();
-
-    if (!stream)
-        return;
-
-    UInt64 keys_version;
-    readIntBinary(keys_version, *stream);
-
-    state = std::make_shared<DeserializeStateLowCardinality>(keys_version);
-}
-
-namespace
-{
-    template <typename T>
-    PaddedPODArray<T> * getIndexesData(IColumn & indexes)
-    {
-        auto * column = typeid_cast<ColumnVector<T> *>(&indexes);
-        if (column)
-            return &column->getData();
-
-        return nullptr;
-    }
-
-    struct IndexMapsWithAdditionalKeys
-    {
-        MutableColumnPtr dictionary_map;
-        MutableColumnPtr additional_keys_map;
-    };
-
-    template <typename T>
-    IndexMapsWithAdditionalKeys mapIndexWithAdditionalKeysRef(PaddedPODArray<T> & index, size_t dict_size)
-    {
-        PaddedPODArray<T> copy(index.cbegin(), index.cend());
-
-        HashMap<T, T> dict_map;
-        HashMap<T, T> add_keys_map;
-
-        for (auto val : index)
-        {
-            if (val < dict_size)
-                dict_map.insert({val, dict_map.size()});
-            else
-                add_keys_map.insert({val, add_keys_map.size()});
-        }
-
-        auto dictionary_map = ColumnVector<T>::create(dict_map.size());
-        auto additional_keys_map = ColumnVector<T>::create(add_keys_map.size());
-        auto & dict_data = dictionary_map->getData();
-        auto & add_keys_data = additional_keys_map->getData();
-
-        for (auto val : dict_map)
-            dict_data[val.second] = val.first;
-
-        for (auto val : add_keys_map)
-            add_keys_data[val.second] = val.first - dict_size;
-
-        for (auto & val : index)
-            val = val < dict_size ? dict_map[val]
-                                  : add_keys_map[val] + dict_map.size();
-
-        for (size_t i = 0; i < index.size(); ++i)
-        {
-            T expected = index[i] < dict_data.size() ? dict_data[index[i]]
-                                                     : add_keys_data[index[i] - dict_data.size()] + dict_size;
-            if (expected != copy[i])
-                throw Exception("Expected " + toString(expected) + ", but got " + toString(copy[i]), ErrorCodes::LOGICAL_ERROR);
-
-        }
-
-        return {std::move(dictionary_map), std::move(additional_keys_map)};
-    }
-
-    template <typename T>
-    IndexMapsWithAdditionalKeys mapIndexWithAdditionalKeys(PaddedPODArray<T> & index, size_t dict_size)
-    {
-        T max_less_dict_size = 0;
-        T max_value = 0;
-
-        auto size = index.size();
-        if (size == 0)
-            return {ColumnVector<T>::create(), ColumnVector<T>::create()};
-
-        for (size_t i = 0; i < size; ++i)
-        {
-            auto val = index[i];
-            if (val < dict_size)
-                max_less_dict_size = std::max(max_less_dict_size, val);
-
-            max_value = std::max(max_value, val);
-        }
-
-        auto map_size = UInt64(max_less_dict_size) + 1;
-        auto overflow_map_size = max_value >= dict_size ? (UInt64(max_value - dict_size) + 1) : 0;
-        PaddedPODArray<T> map(map_size, 0);
-        PaddedPODArray<T> overflow_map(overflow_map_size, 0);
-
-        T zero_pos_value = 0;
-        T zero_pos_overflowed_value = 0;
-        UInt64 cur_pos = 0;
-        UInt64 cur_overflowed_pos = 0;
-
-        for (size_t i = 0; i < size; ++i)
-        {
-            T val = index[i];
-            if (val < dict_size)
-            {
-                if (cur_pos == 0)
-                {
-                    zero_pos_value = val;
-                    ++cur_pos;
-                }
-                else if (map[val] == 0 && val != zero_pos_value)
-                {
-                    map[val] = cur_pos;
-                    ++cur_pos;
-                }
-            }
-            else
-            {
-                T shifted_val = val - dict_size;
-                if (cur_overflowed_pos == 0)
-                {
-                    zero_pos_overflowed_value = shifted_val;
-                    ++cur_overflowed_pos;
-                }
-                else if (overflow_map[shifted_val] == 0 && shifted_val != zero_pos_overflowed_value)
-                {
-                    overflow_map[shifted_val] = cur_overflowed_pos;
-                    ++cur_overflowed_pos;
-                }
-            }
-        }
-
-        auto dictionary_map = ColumnVector<T>::create(cur_pos);
-        auto additional_keys_map = ColumnVector<T>::create(cur_overflowed_pos);
-        auto & dict_data = dictionary_map->getData();
-        auto & add_keys_data = additional_keys_map->getData();
-
-        for (size_t i = 0; i < map_size; ++i)
-            if (map[i])
-                dict_data[map[i]] = static_cast<T>(i);
-
-        for (size_t i = 0; i < overflow_map_size; ++i)
-            if (overflow_map[i])
-                add_keys_data[overflow_map[i]] = static_cast<T>(i);
-
-        if (cur_pos)
-            dict_data[0] = zero_pos_value;
-        if (cur_overflowed_pos)
-            add_keys_data[0] = zero_pos_overflowed_value;
-
-        for (size_t i = 0; i < size; ++i)
-        {
-            T & val = index[i];
-            if (val < dict_size)
-                val = map[val];
-            else
-                val = overflow_map[val - dict_size] + cur_pos;
-        }
-
-        return {std::move(dictionary_map), std::move(additional_keys_map)};
-    }
-
-    /// Update column and return map with old indexes.
-    /// Let N is the number of distinct values which are less than max_size;
-    ///     old_column - column before function call;
-    ///     new_column - column after function call:
-    /// * if old_column[i] < max_size, than
-    ///       dictionary_map[new_column[i]] = old_column[i]
-    /// * else
-    ///       additional_keys_map[new_column[i]] = old_column[i] - dict_size + N
-    IndexMapsWithAdditionalKeys mapIndexWithAdditionalKeys(IColumn & column, size_t dict_size)
-    {
-        if (auto * data_uint8 = getIndexesData<UInt8>(column))
-            return mapIndexWithAdditionalKeys(*data_uint8, dict_size);
-        else if (auto * data_uint16 = getIndexesData<UInt16>(column))
-            return mapIndexWithAdditionalKeys(*data_uint16, dict_size);
-        else if (auto * data_uint32 = getIndexesData<UInt32>(column))
-            return mapIndexWithAdditionalKeys(*data_uint32, dict_size);
-        else if (auto * data_uint64 = getIndexesData<UInt64>(column))
-            return mapIndexWithAdditionalKeys(*data_uint64, dict_size);
-        else
-            throw Exception("Indexes column for mapIndexWithAdditionalKeys must be UInt, got" + column.getName(),
-                            ErrorCodes::LOGICAL_ERROR);
-    }
-}
-
-void DataTypeLowCardinality::serializeBinaryBulkWithMultipleStreamsImpl(
-    const IColumn & column,
-    size_t offset,
-    size_t limit,
-    SerializeBinaryBulkSettings & settings,
-    SerializeBinaryBulkStatePtr & state) const
-{
-    settings.path.push_back(Substream::DictionaryKeys);
-    auto * keys_stream = settings.getter(settings.path);
-    settings.path.back() = Substream::DictionaryIndexes;
-    auto * indexes_stream = settings.getter(settings.path);
-    settings.path.pop_back();
-
-    if (!keys_stream && !indexes_stream)
-        return;
-
-    if (!keys_stream)
-        throw Exception("Got empty stream for DataTypeLowCardinality keys.", ErrorCodes::LOGICAL_ERROR);
-
-    if (!indexes_stream)
-        throw Exception("Got empty stream for DataTypeLowCardinality indexes.", ErrorCodes::LOGICAL_ERROR);
-
-    const ColumnLowCardinality & low_cardinality_column = typeid_cast<const ColumnLowCardinality &>(column);
-
-    auto * low_cardinality_state = checkAndGetLowCardinalitySerializeState(state);
-    auto & global_dictionary = low_cardinality_state->shared_dictionary;
-    KeysSerializationVersion::checkVersion(low_cardinality_state->key_version.value);
-
-    bool need_update_dictionary = global_dictionary == nullptr;
-    if (need_update_dictionary)
-        global_dictionary = createColumnUnique(*dictionary_type);
-
-    size_t max_limit = column.size() - offset;
-    limit = limit ? std::min(limit, max_limit) : max_limit;
-
-    /// Do not write anything for empty column. (May happen while writing empty arrays.)
-    if (limit == 0)
-        return;
-
-    auto sub_column = low_cardinality_column.cutAndCompact(offset, limit);
-    ColumnPtr positions = sub_column->getIndexesPtr();
-    ColumnPtr keys = sub_column->getDictionary().getNestedColumn();
-
-    if (settings.low_cardinality_max_dictionary_size)
-    {
-        /// Insert used_keys into global dictionary and update sub_index.
-        auto indexes_with_overflow = global_dictionary->uniqueInsertRangeWithOverflow(*keys, 0, keys->size(),
-                                                                                      settings.low_cardinality_max_dictionary_size);
-        size_t max_size = settings.low_cardinality_max_dictionary_size + indexes_with_overflow.overflowed_keys->size();
-        ColumnLowCardinality::Index(indexes_with_overflow.indexes->getPtr()).check(max_size);
-
-        if (global_dictionary->size() > settings.low_cardinality_max_dictionary_size)
-            throw Exception("Got dictionary with size " + toString(global_dictionary->size()) +
-                            " but max dictionary size is " + toString(settings.low_cardinality_max_dictionary_size),
-                            ErrorCodes::LOGICAL_ERROR);
-
-        positions = indexes_with_overflow.indexes->index(*positions, 0);
-        keys = std::move(indexes_with_overflow.overflowed_keys);
-
-        if (global_dictionary->size() < settings.low_cardinality_max_dictionary_size && !keys->empty())
-            throw Exception("Has additional keys, but dict size is " + toString(global_dictionary->size()) +
-                            " which is less then max dictionary size (" + toString(settings.low_cardinality_max_dictionary_size) + ")",
-                            ErrorCodes::LOGICAL_ERROR);
-    }
-
-    if (const auto * nullable_keys = checkAndGetColumn<ColumnNullable>(*keys))
-        keys = nullable_keys->getNestedColumnPtr();
-
-    bool need_additional_keys = !keys->empty();
-    bool need_dictionary = settings.low_cardinality_max_dictionary_size != 0;
-    bool need_write_dictionary = !settings.low_cardinality_use_single_dictionary_for_part
-                                 && global_dictionary->size() >= settings.low_cardinality_max_dictionary_size;
-
-    IndexesSerializationType index_version(*positions, need_additional_keys, need_dictionary, need_update_dictionary);
-    index_version.serialize(*indexes_stream);
-
-    if (need_write_dictionary)
-    {
-        const auto & nested_column = global_dictionary->getNestedNotNullableColumn();
-        UInt64 num_keys = nested_column->size();
-        writeIntBinary(num_keys, *keys_stream);
-        removeNullable(dictionary_type)->serializeBinaryBulk(*nested_column, *keys_stream, 0, num_keys);
-        low_cardinality_state->shared_dictionary = nullptr;
-    }
-
-    if (need_additional_keys)
-    {
-        UInt64 num_keys = keys->size();
-        writeIntBinary(num_keys, *indexes_stream);
-        removeNullable(dictionary_type)->serializeBinaryBulk(*keys, *indexes_stream, 0, num_keys);
-    }
-
-    UInt64 num_rows = positions->size();
-    writeIntBinary(num_rows, *indexes_stream);
-    index_version.getDataType()->serializeBinaryBulk(*positions, *indexes_stream, 0, num_rows);
-}
-
-void DataTypeLowCardinality::deserializeBinaryBulkWithMultipleStreamsImpl(
-    IColumn & column,
-    size_t limit,
-    DeserializeBinaryBulkSettings & settings,
-    DeserializeBinaryBulkStatePtr & state,
-    SubstreamsCache * /* cache */) const
-{
-    ColumnLowCardinality & low_cardinality_column = typeid_cast<ColumnLowCardinality &>(column);
-
-    settings.path.push_back(Substream::DictionaryKeys);
-    auto * keys_stream = settings.getter(settings.path);
-    settings.path.back() = Substream::DictionaryIndexes;
-    auto * indexes_stream = settings.getter(settings.path);
-    settings.path.pop_back();
-
-    if (!keys_stream && !indexes_stream)
-        return;
-
-    if (!keys_stream)
-        throw Exception("Got empty stream for DataTypeLowCardinality keys.", ErrorCodes::LOGICAL_ERROR);
-
-    if (!indexes_stream)
-        throw Exception("Got empty stream for DataTypeLowCardinality indexes.", ErrorCodes::LOGICAL_ERROR);
-
-    auto * low_cardinality_state = checkAndGetLowCardinalityDeserializeState(state);
-    KeysSerializationVersion::checkVersion(low_cardinality_state->key_version.value);
-
-    auto read_dictionary = [this, low_cardinality_state, keys_stream]()
-    {
-        UInt64 num_keys;
-        readIntBinary(num_keys, *keys_stream);
-
-        auto keys_type = removeNullable(dictionary_type);
-        auto global_dict_keys = keys_type->createColumn();
-        keys_type->deserializeBinaryBulk(*global_dict_keys, *keys_stream, num_keys, 0);
-
-        auto column_unique = createColumnUnique(*dictionary_type, std::move(global_dict_keys));
-        low_cardinality_state->global_dictionary = std::move(column_unique);
-    };
-
-    auto read_additional_keys = [this, low_cardinality_state, indexes_stream]()
-    {
-        UInt64 num_keys;
-        readIntBinary(num_keys, *indexes_stream);
-        auto keys_type = removeNullable(dictionary_type);
-        auto additional_keys = keys_type->createColumn();
-        keys_type->deserializeBinaryBulk(*additional_keys, *indexes_stream, num_keys, 0);
-        low_cardinality_state->additional_keys = std::move(additional_keys);
-
-        if (!low_cardinality_state->index_type.need_global_dictionary && dictionary_type->isNullable())
-        {
-            auto null_map = ColumnUInt8::create(num_keys, 0);
-            if (num_keys)
-                null_map->getElement(0) = 1;
-
-            low_cardinality_state->null_map = std::move(null_map);
-        }
-    };
-
-    auto read_indexes = [this, low_cardinality_state, indexes_stream, &low_cardinality_column](UInt64 num_rows)
-    {
-        auto indexes_type = low_cardinality_state->index_type.getDataType();
-        MutableColumnPtr indexes_column = indexes_type->createColumn();
-        indexes_type->deserializeBinaryBulk(*indexes_column, *indexes_stream, num_rows, 0);
-
-        auto & global_dictionary = low_cardinality_state->global_dictionary;
-        const auto & additional_keys = low_cardinality_state->additional_keys;
-
-        bool has_additional_keys = low_cardinality_state->index_type.has_additional_keys;
-        bool column_is_empty = low_cardinality_column.empty();
-
-        if (!low_cardinality_state->index_type.need_global_dictionary)
-        {
-            ColumnPtr keys_column = additional_keys;
-            if (low_cardinality_state->null_map)
-                keys_column = ColumnNullable::create(additional_keys, low_cardinality_state->null_map);
-            low_cardinality_column.insertRangeFromDictionaryEncodedColumn(*keys_column, *indexes_column);
-        }
-        else if (!has_additional_keys)
-        {
-            if (column_is_empty)
-                low_cardinality_column.setSharedDictionary(global_dictionary);
-
-            auto local_column = ColumnLowCardinality::create(global_dictionary, std::move(indexes_column));
-            low_cardinality_column.insertRangeFrom(*local_column, 0, num_rows);
-        }
-        else
-        {
-            auto maps = mapIndexWithAdditionalKeys(*indexes_column, global_dictionary->size());
-
-            ColumnLowCardinality::Index(maps.additional_keys_map->getPtr()).check(additional_keys->size());
-
-            ColumnLowCardinality::Index(indexes_column->getPtr()).check(
-                    maps.dictionary_map->size() + maps.additional_keys_map->size());
-
-            auto used_keys = IColumn::mutate(global_dictionary->getNestedColumn()->index(*maps.dictionary_map, 0));
-
-            if (!maps.additional_keys_map->empty())
-            {
-                auto used_add_keys = additional_keys->index(*maps.additional_keys_map, 0);
-
-                if (dictionary_type->isNullable())
-                {
-                    ColumnPtr null_map = ColumnUInt8::create(used_add_keys->size(), 0);
-                    used_add_keys = ColumnNullable::create(used_add_keys, null_map);
-                }
-
-                used_keys->insertRangeFrom(*used_add_keys, 0, used_add_keys->size());
-            }
-
-            low_cardinality_column.insertRangeFromDictionaryEncodedColumn(*used_keys, *indexes_column);
-        }
-    };
-
-    if (!settings.continuous_reading)
-    {
-        low_cardinality_state->num_pending_rows = 0;
-
-        /// Remember in state that some granules were skipped and we need to update dictionary.
-        low_cardinality_state->need_update_dictionary = true;
-    }
-
-    while (limit)
-    {
-        if (low_cardinality_state->num_pending_rows == 0)
-        {
-            if (indexes_stream->eof())
-                break;
-
-            auto & index_type = low_cardinality_state->index_type;
-            auto & global_dictionary = low_cardinality_state->global_dictionary;
-
-            index_type.deserialize(*indexes_stream);
-
-            bool need_update_dictionary =
-                !global_dictionary || index_type.need_update_dictionary || low_cardinality_state->need_update_dictionary;
-            if (index_type.need_global_dictionary && need_update_dictionary)
-            {
-                read_dictionary();
-                low_cardinality_state->need_update_dictionary = false;
-            }
-
-            if (low_cardinality_state->index_type.has_additional_keys)
-                read_additional_keys();
-            else
-                low_cardinality_state->additional_keys = nullptr;
-
-            readIntBinary(low_cardinality_state->num_pending_rows, *indexes_stream);
-        }
-
-        size_t num_rows_to_read = std::min<UInt64>(limit, low_cardinality_state->num_pending_rows);
-        read_indexes(num_rows_to_read);
-        limit -= num_rows_to_read;
-        low_cardinality_state->num_pending_rows -= num_rows_to_read;
-    }
-}
-
-void DataTypeLowCardinality::serializeBinary(const Field & field, WriteBuffer & ostr) const
-{
-    dictionary_type->serializeBinary(field, ostr);
-}
-void DataTypeLowCardinality::deserializeBinary(Field & field, ReadBuffer & istr) const
-{
-    dictionary_type->deserializeBinary(field, istr);
-}
-
-void DataTypeLowCardinality::serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr) const
-{
-    serializeImpl(column, row_num, &IDataType::serializeBinary, ostr);
-}
-void DataTypeLowCardinality::deserializeBinary(IColumn & column, ReadBuffer & istr) const
-{
-    deserializeImpl(column, &IDataType::deserializeBinary, istr);
-}
-
-void DataTypeLowCardinality::serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    serializeImpl(column, row_num, &IDataType::serializeAsTextEscaped, ostr, settings);
-}
-
-void DataTypeLowCardinality::deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
-{
-    deserializeImpl(column, &IDataType::deserializeAsTextEscaped, istr, settings);
-}
-
-void DataTypeLowCardinality::serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    serializeImpl(column, row_num, &IDataType::serializeAsTextQuoted, ostr, settings);
-}
-
-void DataTypeLowCardinality::deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
-{
-    deserializeImpl(column, &IDataType::deserializeAsTextQuoted, istr, settings);
-}
-
-void DataTypeLowCardinality::deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
-{
-    deserializeImpl(column, &IDataType::deserializeAsWholeText, istr, settings);
-}
-
-void DataTypeLowCardinality::serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    serializeImpl(column, row_num, &IDataType::serializeAsTextCSV, ostr, settings);
-}
-
-void DataTypeLowCardinality::deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
-{
-    deserializeImpl(column, &IDataType::deserializeAsTextCSV, istr, settings);
-}
-
-void DataTypeLowCardinality::serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    serializeImpl(column, row_num, &IDataType::serializeAsText, ostr, settings);
-}
-
-void DataTypeLowCardinality::serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    serializeImpl(column, row_num, &IDataType::serializeAsTextJSON, ostr, settings);
-}
-void DataTypeLowCardinality::deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
-{
-    deserializeImpl(column, &IDataType::deserializeAsTextJSON, istr, settings);
-}
-
-void DataTypeLowCardinality::serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    serializeImpl(column, row_num, &IDataType::serializeAsTextXML, ostr, settings);
-}
-
-template <typename... Params, typename... Args>
-void DataTypeLowCardinality::serializeImpl(
-    const IColumn & column, size_t row_num, DataTypeLowCardinality::SerializeFunctionPtr<Params...> func, Args &&... args) const
-{
-    const auto & low_cardinality_column = getColumnLowCardinality(column);
-    size_t unique_row_number = low_cardinality_column.getIndexes().getUInt(row_num);
-    (dictionary_type.get()->*func)(*low_cardinality_column.getDictionary().getNestedColumn(), unique_row_number, std::forward<Args>(args)...);
-}
-
-template <typename... Params, typename... Args>
-void DataTypeLowCardinality::deserializeImpl(
-    IColumn & column, DataTypeLowCardinality::DeserializeFunctionPtr<Params...> func, Args &&... args) const
-{
-    auto & low_cardinality_column= getColumnLowCardinality(column);
-    auto temp_column = low_cardinality_column.getDictionary().getNestedColumn()->cloneEmpty();
-
-    (dictionary_type.get()->*func)(*temp_column, std::forward<Args>(args)...);
-
-    low_cardinality_column.insertFromFullColumn(*temp_column, 0);
-}
-
 namespace
 {
     template <typename Creator>
@@ -927,6 +136,11 @@ bool DataTypeLowCardinality::equals(const IDataType & rhs) const
     return dictionary_type->equals(*low_cardinality_rhs.dictionary_type);
 }
 
+SerializationPtr DataTypeLowCardinality::doGetDefaultSerialization() const
+{
+    return std::make_shared<SerializationLowCardinality>(dictionary_type);
+}
+
 
 static DataTypePtr create(const ASTPtr & arguments)
 {
diff --git a/src/DataTypes/DataTypeLowCardinality.h b/src/DataTypes/DataTypeLowCardinality.h
index f5b6b571187..1266174c6d6 100644
--- a/src/DataTypes/DataTypeLowCardinality.h
+++ b/src/DataTypes/DataTypeLowCardinality.h
@@ -24,50 +24,6 @@ public:
     const char * getFamilyName() const override { return "LowCardinality"; }
     TypeIndex getTypeId() const override { return TypeIndex::LowCardinality; }
 
-    void enumerateStreamsImpl(const StreamCallback & callback, SubstreamPath & path) const override;
-
-    void serializeBinaryBulkStatePrefixImpl(
-            SerializeBinaryBulkSettings & settings,
-            SerializeBinaryBulkStatePtr & state) const override;
-
-    void serializeBinaryBulkStateSuffixImpl(
-            SerializeBinaryBulkSettings & settings,
-            SerializeBinaryBulkStatePtr & state) const override;
-
-    void deserializeBinaryBulkStatePrefixImpl(
-            DeserializeBinaryBulkSettings & settings,
-            DeserializeBinaryBulkStatePtr & state) const override;
-
-    void serializeBinaryBulkWithMultipleStreamsImpl(
-            const IColumn & column,
-            size_t offset,
-            size_t limit,
-            SerializeBinaryBulkSettings & settings,
-            SerializeBinaryBulkStatePtr & state) const override;
-
-    void deserializeBinaryBulkWithMultipleStreamsImpl(
-            IColumn & column,
-            size_t limit,
-            DeserializeBinaryBulkSettings & settings,
-            DeserializeBinaryBulkStatePtr & state,
-            SubstreamsCache * cache) const override;
-
-    void serializeBinary(const Field & field, WriteBuffer & ostr) const override;
-    void deserializeBinary(Field & field, ReadBuffer & istr) const override;
-    void serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr) const override;
-    void deserializeBinary(IColumn & column, ReadBuffer & istr) const override;
-    void serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override;
-    void deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
-    void serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override;
-    void deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
-    void deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
-    void serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override;
-    void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
-    void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override;
-    void serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override;
-    void deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
-    void serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override;
-
     MutableColumnPtr createColumn() const override;
 
     Field getDefault() const override;
@@ -100,6 +56,7 @@ public:
     static MutableColumnUniquePtr createColumnUnique(const IDataType & keys_type, MutableColumnPtr && keys);
 
 private:
+    SerializationPtr doGetDefaultSerialization() const override;
 
     template <typename ... Params>
     using SerializeFunctionPtr = void (IDataType::*)(const IColumn &, size_t, Params ...) const;
diff --git a/src/DataTypes/DataTypeMap.cpp b/src/DataTypes/DataTypeMap.cpp
index 9972452862f..1d580761362 100644
--- a/src/DataTypes/DataTypeMap.cpp
+++ b/src/DataTypes/DataTypeMap.cpp
@@ -7,6 +7,7 @@
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeTuple.h>
 #include <DataTypes/DataTypeFactory.h>
+#include <DataTypes/Serializations/SerializationMap.h>
 #include <Parsers/IAST.h>
 #include <Parsers/ASTNameTypePair.h>
 #include <Common/typeid_cast.h>
@@ -28,7 +29,7 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
-    extern const int CANNOT_READ_MAP_FROM_TEXT;
+    extern const int BAD_ARGUMENTS;
 }
 
 
@@ -38,6 +39,8 @@ DataTypeMap::DataTypeMap(const DataTypes & elems_)
     key_type = elems_[0];
     value_type = elems_[1];
 
+    assertKeyType();
+
     nested = std::make_shared<DataTypeArray>(
         std::make_shared<DataTypeTuple>(DataTypes{key_type, value_type}, Names{"keys", "values"}));
 }
@@ -45,7 +48,19 @@ DataTypeMap::DataTypeMap(const DataTypes & elems_)
 DataTypeMap::DataTypeMap(const DataTypePtr & key_type_, const DataTypePtr & value_type_)
     : key_type(key_type_), value_type(value_type_)
     , nested(std::make_shared<DataTypeArray>(
-        std::make_shared<DataTypeTuple>(DataTypes{key_type_, value_type_}, Names{"keys", "values"}))) {}
+        std::make_shared<DataTypeTuple>(DataTypes{key_type_, value_type_}, Names{"keys", "values"})))
+{
+    assertKeyType();
+}
+
+void DataTypeMap::assertKeyType() const
+{
+    if (!key_type->isValueRepresentedByInteger() && !isStringOrFixedString(*key_type) && !WhichDataType(key_type).isNothing())
+        throw Exception(ErrorCodes::BAD_ARGUMENTS,
+            "Type of Map key must be a type, that can be represented by integer or string,"
+            " but {} given", key_type->getName());
+}
+
 
 std::string DataTypeMap::doGetName() const
 {
@@ -60,11 +75,6 @@ static const IColumn & extractNestedColumn(const IColumn & column)
     return assert_cast<const ColumnMap &>(column).getNestedColumn();
 }
 
-static IColumn & extractNestedColumn(IColumn & column)
-{
-    return assert_cast<ColumnMap &>(column).getNestedColumn();
-}
-
 DataTypePtr DataTypeMap::tryGetSubcolumnType(const String & subcolumn_name) const
 {
     return nested->tryGetSubcolumnType(subcolumn_name);
@@ -75,265 +85,10 @@ ColumnPtr DataTypeMap::getSubcolumn(const String & subcolumn_name, const IColumn
     return nested->getSubcolumn(subcolumn_name, extractNestedColumn(column));
 }
 
-void DataTypeMap::serializeBinary(const Field & field, WriteBuffer & ostr) const
+SerializationPtr DataTypeMap::getSubcolumnSerialization(
+    const String & subcolumn_name, const BaseSerializationGetter & base_serialization_getter) const
 {
-    const auto & map = get<const Map &>(field);
-    writeVarUInt(map.size(), ostr);
-    for (const auto & elem : map)
-    {
-        const auto & tuple = elem.safeGet<const Tuple>();
-        assert(tuple.size() == 2);
-        key_type->serializeBinary(tuple[0], ostr);
-        value_type->serializeBinary(tuple[1], ostr);
-    }
-}
-
-void DataTypeMap::deserializeBinary(Field & field, ReadBuffer & istr) const
-{
-    size_t size;
-    readVarUInt(size, istr);
-    field = Map(size);
-    for (auto & elem : field.get<Map &>())
-    {
-        Tuple tuple(2);
-        key_type->deserializeBinary(tuple[0], istr);
-        value_type->deserializeBinary(tuple[1], istr);
-        elem = std::move(tuple);
-    }
-}
-
-void DataTypeMap::serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr) const
-{
-    nested->serializeBinary(extractNestedColumn(column), row_num, ostr);
-}
-
-void DataTypeMap::deserializeBinary(IColumn & column, ReadBuffer & istr) const
-{
-    nested->deserializeBinary(extractNestedColumn(column), istr);
-}
-
-
-template <typename Writer>
-void DataTypeMap::serializeTextImpl(const IColumn & column, size_t row_num, WriteBuffer & ostr, Writer && writer) const
-{
-    const auto & column_map = assert_cast<const ColumnMap &>(column);
-
-    const auto & nested_array = column_map.getNestedColumn();
-    const auto & nested_tuple = column_map.getNestedData();
-    const auto & offsets = nested_array.getOffsets();
-
-    size_t offset = offsets[row_num - 1];
-    size_t next_offset = offsets[row_num];
-
-    writeChar('{', ostr);
-    for (size_t i = offset; i < next_offset; ++i)
-    {
-        if (i != offset)
-            writeChar(',', ostr);
-        writer(key_type, nested_tuple.getColumn(0), i);
-        writeChar(':', ostr);
-        writer(value_type, nested_tuple.getColumn(1), i);
-    }
-    writeChar('}', ostr);
-}
-
-template <typename Reader>
-void DataTypeMap::deserializeTextImpl(IColumn & column, ReadBuffer & istr, bool need_safe_get_int_key, Reader && reader) const
-{
-    auto & column_map = assert_cast<ColumnMap &>(column);
-
-    auto & nested_array = column_map.getNestedColumn();
-    auto & nested_tuple = column_map.getNestedData();
-    auto & offsets = nested_array.getOffsets();
-
-    auto & key_column = nested_tuple.getColumn(0);
-    auto & value_column = nested_tuple.getColumn(1);
-
-    size_t size = 0;
-    assertChar('{', istr);
-
-    try
-    {
-        bool first = true;
-        while (!istr.eof() && *istr.position() != '}')
-        {
-            if (!first)
-            {
-                if (*istr.position() == ',')
-                    ++istr.position();
-                else
-                    throw Exception("Cannot read Map from text", ErrorCodes::CANNOT_READ_MAP_FROM_TEXT);
-            }
-
-            first = false;
-
-            skipWhitespaceIfAny(istr);
-
-            if (*istr.position() == '}')
-                break;
-
-            if (need_safe_get_int_key)
-            {
-                ReadBuffer::Position tmp = istr.position();
-                while (*tmp != ':' && *tmp != '}')
-                    ++tmp;
-                *tmp = ' ';
-                reader(key_type, key_column);
-            }
-            else
-            {
-                reader(key_type, key_column);
-                skipWhitespaceIfAny(istr);
-                assertChar(':', istr);
-            }
-
-            ++size;
-            skipWhitespaceIfAny(istr);
-            reader(value_type, value_column);
-
-            skipWhitespaceIfAny(istr);
-        }
-
-        offsets.push_back(offsets.back() + size);
-        assertChar('}', istr);
-    }
-    catch (...)
-    {
-        throw;
-    }
-}
-
-void DataTypeMap::serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    serializeTextImpl(column, row_num, ostr,
-        [&](const DataTypePtr & subcolumn_type, const IColumn & subcolumn, size_t pos)
-        {
-            subcolumn_type->serializeAsTextQuoted(subcolumn, pos, ostr, settings);
-        });
-}
-
-void DataTypeMap::deserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
-{
-    // need_safe_get_int_key is set for Integer to prevent to readIntTextUnsafe
-    bool need_safe_get_int_key = isInteger(key_type);
-
-    deserializeTextImpl(column, istr, need_safe_get_int_key,
-        [&](const DataTypePtr & subcolumn_type, IColumn & subcolumn)
-        {
-            subcolumn_type->deserializeAsTextQuoted(subcolumn, istr, settings);
-        });
-}
-
-
-void DataTypeMap::serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    serializeTextImpl(column, row_num, ostr,
-        [&](const DataTypePtr & subcolumn_type, const IColumn & subcolumn, size_t pos)
-        {
-            subcolumn_type->serializeAsTextJSON(subcolumn, pos, ostr, settings);
-        });
-}
-
-void DataTypeMap::deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
-{
-    // need_safe_get_int_key is set for Integer to prevent to readIntTextUnsafe
-    bool need_safe_get_int_key = isInteger(key_type);
-
-    deserializeTextImpl(column, istr, need_safe_get_int_key,
-        [&](const DataTypePtr & subcolumn_type, IColumn & subcolumn)
-        {
-            subcolumn_type->deserializeAsTextJSON(subcolumn, istr, settings);
-        });
-}
-
-void DataTypeMap::serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    const auto & column_map = assert_cast<const ColumnMap &>(column);
-    const auto & offsets = column_map.getNestedColumn().getOffsets();
-
-    size_t offset = offsets[row_num - 1];
-    size_t next_offset = offsets[row_num];
-
-    const auto & nested_data = column_map.getNestedData();
-
-    writeCString("<map>", ostr);
-    for (size_t i = offset; i < next_offset; ++i)
-    {
-        writeCString("<elem>", ostr);
-        writeCString("<key>", ostr);
-        key_type->serializeAsTextXML(nested_data.getColumn(0), i, ostr, settings);
-        writeCString("</key>", ostr);
-
-        writeCString("<value>", ostr);
-        value_type->serializeAsTextXML(nested_data.getColumn(1), i, ostr, settings);
-        writeCString("</value>", ostr);
-        writeCString("</elem>", ostr);
-    }
-    writeCString("</map>", ostr);
-}
-
-void DataTypeMap::serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    WriteBufferFromOwnString wb;
-    serializeText(column, row_num, wb, settings);
-    writeCSV(wb.str(), ostr);
-}
-
-void DataTypeMap::deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
-{
-    String s;
-    readCSV(s, istr, settings.csv);
-    ReadBufferFromString rb(s);
-    deserializeText(column, rb, settings);
-}
-
-
-void DataTypeMap::enumerateStreamsImpl(const StreamCallback & callback, SubstreamPath & path) const
-{
-    nested->enumerateStreams(callback, path);
-}
-
-void DataTypeMap::serializeBinaryBulkStatePrefixImpl(
-    SerializeBinaryBulkSettings & settings,
-    SerializeBinaryBulkStatePtr & state) const
-{
-    nested->serializeBinaryBulkStatePrefix(settings, state);
-}
-
-void DataTypeMap::serializeBinaryBulkStateSuffixImpl(
-    SerializeBinaryBulkSettings & settings,
-    SerializeBinaryBulkStatePtr & state) const
-{
-    nested->serializeBinaryBulkStateSuffix(settings, state);
-}
-
-void DataTypeMap::deserializeBinaryBulkStatePrefixImpl(
-    DeserializeBinaryBulkSettings & settings,
-    DeserializeBinaryBulkStatePtr & state) const
-{
-    nested->deserializeBinaryBulkStatePrefix(settings, state);
-}
-
-
-void DataTypeMap::serializeBinaryBulkWithMultipleStreamsImpl(
-    const IColumn & column,
-    size_t offset,
-    size_t limit,
-    SerializeBinaryBulkSettings & settings,
-    SerializeBinaryBulkStatePtr & state) const
-{
-    nested->serializeBinaryBulkWithMultipleStreams(extractNestedColumn(column), offset, limit, settings, state);
-}
-
-void DataTypeMap::deserializeBinaryBulkWithMultipleStreamsImpl(
-    IColumn & column,
-    size_t limit,
-    DeserializeBinaryBulkSettings & settings,
-    DeserializeBinaryBulkStatePtr & state,
-    SubstreamsCache * cache) const
-{
-    auto & column_map = assert_cast<ColumnMap &>(column);
-    nested->deserializeBinaryBulkWithMultipleStreams(column_map.getNestedColumnPtr(), limit, settings, state, cache);
+    return nested->getSubcolumnSerialization(subcolumn_name, base_serialization_getter);
 }
 
 MutableColumnPtr DataTypeMap::createColumn() const
@@ -346,6 +101,14 @@ Field DataTypeMap::getDefault() const
     return Map();
 }
 
+SerializationPtr DataTypeMap::doGetDefaultSerialization() const
+{
+    return std::make_shared<SerializationMap>(
+        key_type->getDefaultSerialization(),
+        value_type->getDefaultSerialization(),
+        nested->getDefaultSerialization());
+}
+
 bool DataTypeMap::equals(const IDataType & rhs) const
 {
     if (typeid(rhs) != typeid(*this))
diff --git a/src/DataTypes/DataTypeMap.h b/src/DataTypes/DataTypeMap.h
index 88ea44a0d5a..09b8448885a 100644
--- a/src/DataTypes/DataTypeMap.h
+++ b/src/DataTypes/DataTypeMap.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DataTypes/DataTypeWithSimpleSerialization.h>
+#include <DataTypes/IDataType.h>
 
 
 namespace DB
@@ -11,7 +11,7 @@ namespace DB
   * Serialization of type 'Map(K, V)' is similar to serialization.
   * of 'Array(Tuple(keys K, values V))' or in other words of 'Nested(keys K, valuev V)'.
   */
-class DataTypeMap final : public DataTypeWithSimpleSerialization
+class DataTypeMap final : public IDataType
 {
 private:
     DataTypePtr key_type;
@@ -34,47 +34,8 @@ public:
 
     DataTypePtr tryGetSubcolumnType(const String & subcolumn_name) const override;
     ColumnPtr getSubcolumn(const String & subcolumn_name, const IColumn & column) const override;
-
-    void serializeBinary(const Field & field, WriteBuffer & ostr) const override;
-    void deserializeBinary(Field & field, ReadBuffer & istr) const override;
-    void serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr) const override;
-    void deserializeBinary(IColumn & column, ReadBuffer & istr) const override;
-    void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-    void deserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
-    void serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-    void deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
-    void serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-
-    void serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-    void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
-
-    void enumerateStreamsImpl(const StreamCallback & callback, SubstreamPath & path) const override;
-
-    void serializeBinaryBulkStatePrefixImpl(
-           SerializeBinaryBulkSettings & settings,
-           SerializeBinaryBulkStatePtr & state) const override;
-
-    void serializeBinaryBulkStateSuffixImpl(
-           SerializeBinaryBulkSettings & settings,
-           SerializeBinaryBulkStatePtr & state) const override;
-
-    void deserializeBinaryBulkStatePrefixImpl(
-           DeserializeBinaryBulkSettings & settings,
-           DeserializeBinaryBulkStatePtr & state) const override;
-
-    void serializeBinaryBulkWithMultipleStreamsImpl(
-           const IColumn & column,
-           size_t offset,
-           size_t limit,
-           SerializeBinaryBulkSettings & settings,
-           SerializeBinaryBulkStatePtr & state) const override;
-
-    void deserializeBinaryBulkWithMultipleStreamsImpl(
-           IColumn & column,
-           size_t limit,
-           DeserializeBinaryBulkSettings & settings,
-           DeserializeBinaryBulkStatePtr & state,
-           SubstreamsCache * cache) const override;
+    SerializationPtr getSubcolumnSerialization(
+        const String & subcolumn_name, const BaseSerializationGetter & base_serialization_getter) const override;
 
     MutableColumnPtr createColumn() const override;
 
@@ -88,15 +49,12 @@ public:
     const DataTypePtr & getKeyType() const { return key_type; }
     const DataTypePtr & getValueType() const { return value_type; }
     DataTypes getKeyValueTypes() const { return {key_type, value_type}; }
-
     const DataTypePtr & getNestedType() const { return nested; }
 
-private:
-    template <typename Writer>
-    void serializeTextImpl(const IColumn & column, size_t row_num, WriteBuffer & ostr, Writer && writer) const;
+    SerializationPtr doGetDefaultSerialization() const override;
 
-    template <typename Reader>
-    void deserializeTextImpl(IColumn & column, ReadBuffer & istr, bool need_safe_get_int_key, Reader && reader) const;
+private:
+    void assertKeyType() const;
 };
 
 }
diff --git a/src/DataTypes/DataTypeNested.cpp b/src/DataTypes/DataTypeNested.cpp
index cfbfb4c1750..eba1bba5dfe 100644
--- a/src/DataTypes/DataTypeNested.cpp
+++ b/src/DataTypes/DataTypeNested.cpp
@@ -57,7 +57,7 @@ static std::pair<DataTypePtr, DataTypeCustomDescPtr> create(const ASTPtr & argum
     auto data_type = std::make_shared<DataTypeArray>(std::make_shared<DataTypeTuple>(nested_types, nested_names));
     auto custom_name = std::make_unique<DataTypeNestedCustomName>(nested_types, nested_names);
 
-    return std::make_pair(std::move(data_type), std::make_unique<DataTypeCustomDesc>(std::move(custom_name), nullptr));
+    return std::make_pair(std::move(data_type), std::make_unique<DataTypeCustomDesc>(std::move(custom_name)));
 }
 
 void registerDataTypeNested(DataTypeFactory & factory)
diff --git a/src/DataTypes/DataTypeNested.h b/src/DataTypes/DataTypeNested.h
index 9fb12ad4924..1ad06477a6e 100644
--- a/src/DataTypes/DataTypeNested.h
+++ b/src/DataTypes/DataTypeNested.h
@@ -1,7 +1,6 @@
 #pragma once
 
-#include <DataTypes/DataTypeWithSimpleSerialization.h>
-#include <DataTypes/DataTypeCustom.h>
+#include <DataTypes/IDataType.h>
 
 
 namespace DB
diff --git a/src/DataTypes/DataTypeNothing.cpp b/src/DataTypes/DataTypeNothing.cpp
index 94a7fd75071..388a65754b5 100644
--- a/src/DataTypes/DataTypeNothing.cpp
+++ b/src/DataTypes/DataTypeNothing.cpp
@@ -1,5 +1,6 @@
 #include <Common/typeid_cast.h>
 #include <DataTypes/DataTypeNothing.h>
+#include <DataTypes/Serializations/SerializationNothing.h>
 #include <DataTypes/DataTypeFactory.h>
 #include <Columns/ColumnNothing.h>
 #include <IO/ReadBuffer.h>
@@ -14,27 +15,16 @@ MutableColumnPtr DataTypeNothing::createColumn() const
     return ColumnNothing::create(0);
 }
 
-void DataTypeNothing::serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, size_t offset, size_t limit) const
-{
-    size_t size = column.size();
-
-    if (limit == 0 || offset + limit > size)
-        limit = size - offset;
-
-    for (size_t i = 0; i < limit; ++i)
-        ostr.write('0');
-}
-
-void DataTypeNothing::deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, size_t limit, double /*avg_value_size_hint*/) const
-{
-    typeid_cast<ColumnNothing &>(column).addSize(istr.tryIgnore(limit));
-}
-
 bool DataTypeNothing::equals(const IDataType & rhs) const
 {
     return typeid(rhs) == typeid(*this);
 }
 
+SerializationPtr DataTypeNothing::doGetDefaultSerialization() const
+{
+    return std::make_shared<SerializationNothing>();
+}
+
 
 void registerDataTypeNothing(DataTypeFactory & factory)
 {
diff --git a/src/DataTypes/DataTypeNothing.h b/src/DataTypes/DataTypeNothing.h
index e9421fb15e8..c7d12388de9 100644
--- a/src/DataTypes/DataTypeNothing.h
+++ b/src/DataTypes/DataTypeNothing.h
@@ -20,10 +20,6 @@ public:
 
     MutableColumnPtr createColumn() const override;
 
-    /// These methods read and write zero bytes just to allow to figure out size of column.
-    void serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, size_t offset, size_t limit) const override;
-    void deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, size_t limit, double avg_value_size_hint) const override;
-
     bool equals(const IDataType & rhs) const override;
 
     bool isParametric() const override { return false; }
@@ -31,6 +27,8 @@ public:
     bool haveMaximumSizeOfValue() const override { return true; }
     size_t getSizeOfValueInMemory() const override { return 0; }
     bool canBeInsideNullable() const override { return true; }
+
+    SerializationPtr doGetDefaultSerialization() const override;
 };
 
 }
diff --git a/src/DataTypes/DataTypeNullable.cpp b/src/DataTypes/DataTypeNullable.cpp
index 903ebeb3ddc..3820a320c6d 100644
--- a/src/DataTypes/DataTypeNullable.cpp
+++ b/src/DataTypes/DataTypeNullable.cpp
@@ -2,7 +2,8 @@
 #include <DataTypes/DataTypeNothing.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeFactory.h>
-#include <DataTypes/DataTypeOneElementTuple.h>
+#include <DataTypes/Serializations/SerializationNullable.h>
+#include <DataTypes/Serializations/SerializationTupleElement.h>
 #include <Columns/ColumnNullable.h>
 #include <Core/Field.h>
 #include <IO/ReadBuffer.h>
@@ -22,7 +23,6 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int LOGICAL_ERROR;
-    extern const int CANNOT_READ_ALL_DATA;
     extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
 }
@@ -42,450 +42,6 @@ bool DataTypeNullable::onlyNull() const
 }
 
 
-void DataTypeNullable::enumerateStreamsImpl(const StreamCallback & callback, SubstreamPath & path) const
-{
-    path.push_back(Substream::NullMap);
-    callback(path, *this);
-    path.back() = Substream::NullableElements;
-    nested_data_type->enumerateStreams(callback, path);
-    path.pop_back();
-}
-
-
-void DataTypeNullable::serializeBinaryBulkStatePrefixImpl(
-        SerializeBinaryBulkSettings & settings,
-        SerializeBinaryBulkStatePtr & state) const
-{
-    settings.path.push_back(Substream::NullableElements);
-    nested_data_type->serializeBinaryBulkStatePrefix(settings, state);
-    settings.path.pop_back();
-}
-
-
-void DataTypeNullable::serializeBinaryBulkStateSuffixImpl(
-    SerializeBinaryBulkSettings & settings,
-    SerializeBinaryBulkStatePtr & state) const
-{
-    settings.path.push_back(Substream::NullableElements);
-    nested_data_type->serializeBinaryBulkStateSuffix(settings, state);
-    settings.path.pop_back();
-}
-
-
-void DataTypeNullable::deserializeBinaryBulkStatePrefixImpl(
-    DeserializeBinaryBulkSettings & settings,
-    DeserializeBinaryBulkStatePtr & state) const
-{
-    settings.path.push_back(Substream::NullableElements);
-    nested_data_type->deserializeBinaryBulkStatePrefix(settings, state);
-    settings.path.pop_back();
-}
-
-
-void DataTypeNullable::serializeBinaryBulkWithMultipleStreamsImpl(
-    const IColumn & column,
-    size_t offset,
-    size_t limit,
-    SerializeBinaryBulkSettings & settings,
-    SerializeBinaryBulkStatePtr & state) const
-{
-    const ColumnNullable & col = assert_cast<const ColumnNullable &>(column);
-    col.checkConsistency();
-
-    /// First serialize null map.
-    settings.path.push_back(Substream::NullMap);
-    if (auto * stream = settings.getter(settings.path))
-        DataTypeUInt8().serializeBinaryBulk(col.getNullMapColumn(), *stream, offset, limit);
-
-    /// Then serialize contents of arrays.
-    settings.path.back() = Substream::NullableElements;
-    nested_data_type->serializeBinaryBulkWithMultipleStreams(col.getNestedColumn(), offset, limit, settings, state);
-    settings.path.pop_back();
-}
-
-
-void DataTypeNullable::deserializeBinaryBulkWithMultipleStreamsImpl(
-    IColumn & column,
-    size_t limit,
-    DeserializeBinaryBulkSettings & settings,
-    DeserializeBinaryBulkStatePtr & state,
-    SubstreamsCache * cache) const
-{
-    ColumnNullable & col = assert_cast<ColumnNullable &>(column);
-
-    settings.path.push_back(Substream::NullMap);
-    if (auto cached_column = getFromSubstreamsCache(cache, settings.path))
-    {
-        col.getNullMapColumnPtr() = cached_column;
-    }
-    else if (auto * stream = settings.getter(settings.path))
-    {
-        DataTypeUInt8().deserializeBinaryBulk(col.getNullMapColumn(), *stream, limit, 0);
-        addToSubstreamsCache(cache, settings.path, col.getNullMapColumnPtr());
-    }
-
-    settings.path.back() = Substream::NullableElements;
-    nested_data_type->deserializeBinaryBulkWithMultipleStreams(col.getNestedColumnPtr(), limit, settings, state, cache);
-    settings.path.pop_back();
-}
-
-
-void DataTypeNullable::serializeBinary(const Field & field, WriteBuffer & ostr) const
-{
-    if (field.isNull())
-    {
-        writeBinary(true, ostr);
-    }
-    else
-    {
-        writeBinary(false, ostr);
-        nested_data_type->serializeBinary(field, ostr);
-    }
-}
-
-void DataTypeNullable::deserializeBinary(Field & field, ReadBuffer & istr) const
-{
-    bool is_null = false;
-    readBinary(is_null, istr);
-    if (!is_null)
-    {
-        nested_data_type->deserializeBinary(field, istr);
-    }
-    else
-    {
-        field = Null();
-    }
-}
-
-void DataTypeNullable::serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr) const
-{
-    const ColumnNullable & col = assert_cast<const ColumnNullable &>(column);
-
-    bool is_null = col.isNullAt(row_num);
-    writeBinary(is_null, ostr);
-    if (!is_null)
-        nested_data_type->serializeBinary(col.getNestedColumn(), row_num, ostr);
-}
-
-/// Deserialize value into ColumnNullable.
-/// We need to insert both to nested column and to null byte map, or, in case of exception, to not insert at all.
-template <typename ReturnType = void, typename CheckForNull, typename DeserializeNested, typename std::enable_if_t<std::is_same_v<ReturnType, void>, ReturnType>* = nullptr>
-static ReturnType safeDeserialize(
-    IColumn & column, const IDataType & /*nested_data_type*/,
-    CheckForNull && check_for_null, DeserializeNested && deserialize_nested)
-{
-    ColumnNullable & col = assert_cast<ColumnNullable &>(column);
-
-    if (check_for_null())
-    {
-        col.insertDefault();
-    }
-    else
-    {
-        deserialize_nested(col.getNestedColumn());
-
-        try
-        {
-            col.getNullMapData().push_back(0);
-        }
-        catch (...)
-        {
-            col.getNestedColumn().popBack(1);
-            throw;
-        }
-    }
-}
-
-/// Deserialize value into non-nullable column. In case of NULL, insert default value and return false.
-template <typename ReturnType = void, typename CheckForNull, typename DeserializeNested, typename std::enable_if_t<std::is_same_v<ReturnType, bool>, ReturnType>* = nullptr>
-static ReturnType safeDeserialize(
-        IColumn & column, const IDataType & nested_data_type,
-        CheckForNull && check_for_null, DeserializeNested && deserialize_nested)
-{
-    assert(!dynamic_cast<ColumnNullable *>(&column));
-    assert(!dynamic_cast<const DataTypeNullable *>(&nested_data_type));
-    bool insert_default = check_for_null();
-    if (insert_default)
-        nested_data_type.insertDefaultInto(column);
-    else
-        deserialize_nested(column);
-    return !insert_default;
-}
-
-
-void DataTypeNullable::deserializeBinary(IColumn & column, ReadBuffer & istr) const
-{
-    safeDeserialize(column, *nested_data_type,
-        [&istr] { bool is_null = false; readBinary(is_null, istr); return is_null; },
-        [this, &istr] (IColumn & nested) { nested_data_type->deserializeBinary(nested, istr); });
-}
-
-
-void DataTypeNullable::serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    const ColumnNullable & col = assert_cast<const ColumnNullable &>(column);
-
-    if (col.isNullAt(row_num))
-        writeString(settings.tsv.null_representation, ostr);
-    else
-        nested_data_type->serializeAsTextEscaped(col.getNestedColumn(), row_num, ostr, settings);
-}
-
-
-void DataTypeNullable::deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
-{
-    deserializeTextEscaped<void>(column, istr, settings, nested_data_type);
-}
-
-template<typename ReturnType>
-ReturnType DataTypeNullable::deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings & settings,
-                                                    const DataTypePtr & nested_data_type)
-{
-    /// Little tricky, because we cannot discriminate null from first character.
-
-    if (istr.eof())
-        throw ParsingException("Unexpected end of stream, while parsing value of Nullable type", ErrorCodes::CANNOT_READ_ALL_DATA);
-
-    /// This is not null, surely.
-    if (*istr.position() != '\\')
-    {
-        return safeDeserialize<ReturnType>(column, *nested_data_type,
-            [] { return false; },
-            [&nested_data_type, &istr, &settings] (IColumn & nested) { nested_data_type->deserializeAsTextEscaped(nested, istr, settings); });
-    }
-    else
-    {
-        /// Now we know, that data in buffer starts with backslash.
-        ++istr.position();
-
-        if (istr.eof())
-            throw ParsingException("Unexpected end of stream, while parsing value of Nullable type, after backslash", ErrorCodes::CANNOT_READ_ALL_DATA);
-
-        return safeDeserialize<ReturnType>(column, *nested_data_type,
-            [&istr]
-            {
-                if (*istr.position() == 'N')
-                {
-                    ++istr.position();
-                    return true;
-                }
-                return false;
-            },
-            [&nested_data_type, &istr, &settings] (IColumn & nested)
-            {
-                if (istr.position() != istr.buffer().begin())
-                {
-                    /// We could step back to consume backslash again.
-                    --istr.position();
-                    nested_data_type->deserializeAsTextEscaped(nested, istr, settings);
-                }
-                else
-                {
-                    /// Otherwise, we need to place backslash back in front of istr.
-                    ReadBufferFromMemory prefix("\\", 1);
-                    ConcatReadBuffer prepended_istr(prefix, istr);
-
-                    nested_data_type->deserializeAsTextEscaped(nested, prepended_istr, settings);
-
-                    /// Synchronise cursor position in original buffer.
-
-                    if (prepended_istr.count() > 1)
-                        istr.position() = prepended_istr.position();
-                }
-            });
-    }
-}
-
-void DataTypeNullable::serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    const ColumnNullable & col = assert_cast<const ColumnNullable &>(column);
-
-    if (col.isNullAt(row_num))
-        writeCString("NULL", ostr);
-    else
-        nested_data_type->serializeAsTextQuoted(col.getNestedColumn(), row_num, ostr, settings);
-}
-
-
-void DataTypeNullable::deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
-{
-    deserializeTextQuoted<void>(column, istr, settings, nested_data_type);
-}
-
-template<typename ReturnType>
-ReturnType DataTypeNullable::deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings & settings,
-                                                   const DataTypePtr & nested_data_type)
-{
-    return safeDeserialize<ReturnType>(column, *nested_data_type,
-        [&istr]
-        {
-            return checkStringByFirstCharacterAndAssertTheRestCaseInsensitive("NULL", istr);
-        },
-        [&nested_data_type, &istr, &settings] (IColumn & nested) { nested_data_type->deserializeAsTextQuoted(nested, istr, settings); });
-}
-
-
-void DataTypeNullable::deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
-{
-    deserializeWholeText<void>(column, istr, settings, nested_data_type);
-}
-
-template <typename ReturnType>
-ReturnType DataTypeNullable::deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings,
-                                                  const DataTypePtr & nested_data_type)
-{
-    return safeDeserialize<ReturnType>(column, *nested_data_type,
-        [&istr]
-        {
-            return checkStringByFirstCharacterAndAssertTheRestCaseInsensitive("NULL", istr)
-                || checkStringByFirstCharacterAndAssertTheRest("ᴺᵁᴸᴸ", istr);
-        },
-        [&nested_data_type, &istr, &settings] (IColumn & nested) { nested_data_type->deserializeAsWholeText(nested, istr, settings); });
-}
-
-
-void DataTypeNullable::serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    const ColumnNullable & col = assert_cast<const ColumnNullable &>(column);
-
-    if (col.isNullAt(row_num))
-        writeCString("\\N", ostr);
-    else
-        nested_data_type->serializeAsTextCSV(col.getNestedColumn(), row_num, ostr, settings);
-}
-
-void DataTypeNullable::deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
-{
-    deserializeTextCSV<void>(column, istr, settings, nested_data_type);
-}
-
-template<typename ReturnType>
-ReturnType DataTypeNullable::deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings,
-                                                    const DataTypePtr & nested_data_type)
-{
-    constexpr char const * null_literal = "NULL";
-    constexpr size_t len = 4;
-    size_t null_prefix_len = 0;
-
-    auto check_for_null = [&istr, &settings, &null_prefix_len]
-    {
-        if (checkStringByFirstCharacterAndAssertTheRest("\\N", istr))
-            return true;
-        if (!settings.csv.unquoted_null_literal_as_null)
-            return false;
-
-        /// Check for unquoted NULL
-        while (!istr.eof() && null_prefix_len < len && null_literal[null_prefix_len] == *istr.position())
-        {
-            ++null_prefix_len;
-            ++istr.position();
-        }
-        if (null_prefix_len == len)
-            return true;
-
-        /// Value and "NULL" have common prefix, but value is not "NULL".
-        /// Restore previous buffer position if possible.
-        if (null_prefix_len <= istr.offset())
-        {
-            istr.position() -= null_prefix_len;
-            null_prefix_len = 0;
-        }
-        return false;
-    };
-
-    auto deserialize_nested = [&nested_data_type, &settings, &istr, &null_prefix_len] (IColumn & nested)
-    {
-        if (likely(!null_prefix_len))
-            nested_data_type->deserializeAsTextCSV(nested, istr, settings);
-        else
-        {
-            /// Previous buffer position was not restored,
-            /// so we need to prepend extracted characters (rare case)
-            ReadBufferFromMemory prepend(null_literal, null_prefix_len);
-            ConcatReadBuffer buf(prepend, istr);
-            nested_data_type->deserializeAsTextCSV(nested, buf, settings);
-
-            /// Check if all extracted characters were read by nested parser and update buffer position
-            if (null_prefix_len < buf.count())
-                istr.position() = buf.position();
-            else if (null_prefix_len > buf.count())
-            {
-                /// It can happen only if there is an unquoted string instead of a number
-                /// or if someone uses 'U' or 'L' as delimiter in CSV.
-                /// In the first case we cannot continue reading anyway. The second case seems to be unlikely.
-                if (settings.csv.delimiter == 'U' || settings.csv.delimiter == 'L')
-                    throw DB::ParsingException("Enabled setting input_format_csv_unquoted_null_literal_as_null may not work correctly "
-                                        "with format_csv_delimiter = 'U' or 'L' for large input.", ErrorCodes::CANNOT_READ_ALL_DATA);
-                WriteBufferFromOwnString parsed_value;
-                nested_data_type->serializeAsTextCSV(nested, nested.size() - 1, parsed_value, settings);
-                throw DB::ParsingException("Error while parsing \"" + std::string(null_literal, null_prefix_len)
-                                    + std::string(istr.position(), std::min(size_t{10}, istr.available())) + "\" as Nullable(" + nested_data_type->getName()
-                                    + ") at position " + std::to_string(istr.count()) + ": expected \"NULL\" or " + nested_data_type->getName()
-                                    + ", got \"" + std::string(null_literal, buf.count()) + "\", which was deserialized as \""
-                                    + parsed_value.str() + "\". It seems that input data is ill-formatted.",
-                                    ErrorCodes::CANNOT_READ_ALL_DATA);
-            }
-        }
-    };
-
-    return safeDeserialize<ReturnType>(column, *nested_data_type, check_for_null, deserialize_nested);
-}
-
-void DataTypeNullable::serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    const ColumnNullable & col = assert_cast<const ColumnNullable &>(column);
-
-    /// In simple text format (like 'Pretty' format) (these formats are suitable only for output and cannot be parsed back),
-    ///  data is printed without escaping.
-    /// It makes theoretically impossible to distinguish between NULL and some string value, regardless on how do we print NULL.
-    /// For this reason, we output NULL in a bit strange way.
-    /// This assumes UTF-8 and proper font support. This is Ok, because Pretty formats are "presentational", not for data exchange.
-
-    if (col.isNullAt(row_num))
-    {
-        if (settings.pretty.charset == FormatSettings::Pretty::Charset::UTF8)
-            writeCString("ᴺᵁᴸᴸ", ostr);
-        else
-            writeCString("NULL", ostr);
-    }
-    else
-        nested_data_type->serializeAsText(col.getNestedColumn(), row_num, ostr, settings);
-}
-
-void DataTypeNullable::serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    const ColumnNullable & col = assert_cast<const ColumnNullable &>(column);
-
-    if (col.isNullAt(row_num))
-        writeCString("null", ostr);
-    else
-        nested_data_type->serializeAsTextJSON(col.getNestedColumn(), row_num, ostr, settings);
-}
-
-void DataTypeNullable::deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
-{
-    deserializeTextJSON<void>(column, istr, settings, nested_data_type);
-}
-
-template<typename ReturnType>
-ReturnType DataTypeNullable::deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings,
-                                                    const DataTypePtr & nested_data_type)
-{
-    return safeDeserialize<ReturnType>(column, *nested_data_type,
-        [&istr] { return checkStringByFirstCharacterAndAssertTheRest("null", istr); },
-        [&nested_data_type, &istr, &settings] (IColumn & nested) { nested_data_type->deserializeAsTextJSON(nested, istr, settings); });
-}
-
-void DataTypeNullable::serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    const ColumnNullable & col = assert_cast<const ColumnNullable &>(column);
-
-    if (col.isNullAt(row_num))
-        writeCString("\\N", ostr);
-    else
-        nested_data_type->serializeAsTextXML(col.getNestedColumn(), row_num, ostr, settings);
-}
-
 MutableColumnPtr DataTypeNullable::createColumn() const
 {
     return ColumnNullable::create(nested_data_type->createColumn(), ColumnUInt8::create());
@@ -510,7 +66,7 @@ bool DataTypeNullable::equals(const IDataType & rhs) const
 DataTypePtr DataTypeNullable::tryGetSubcolumnType(const String & subcolumn_name) const
 {
     if (subcolumn_name == "null")
-        return createOneElementTuple(std::make_shared<DataTypeUInt8>(), subcolumn_name, false);
+        return std::make_shared<DataTypeUInt8>();
 
     return nested_data_type->tryGetSubcolumnType(subcolumn_name);
 }
@@ -524,6 +80,20 @@ ColumnPtr DataTypeNullable::getSubcolumn(const String & subcolumn_name, const IC
     return nested_data_type->getSubcolumn(subcolumn_name, column_nullable.getNestedColumn());
 }
 
+SerializationPtr DataTypeNullable::getSubcolumnSerialization(
+    const String & subcolumn_name, const BaseSerializationGetter & base_serialization_getter) const
+{
+    if (subcolumn_name == "null")
+        return std::make_shared<SerializationTupleElement>(base_serialization_getter(DataTypeUInt8()), subcolumn_name, false);
+
+    return nested_data_type->getSubcolumnSerialization(subcolumn_name, base_serialization_getter);
+}
+
+SerializationPtr DataTypeNullable::doGetDefaultSerialization() const
+{
+    return std::make_shared<SerializationNullable>(nested_data_type->getDefaultSerialization());
+}
+
 
 static DataTypePtr create(const ASTPtr & arguments)
 {
@@ -556,11 +126,4 @@ DataTypePtr removeNullable(const DataTypePtr & type)
     return type;
 }
 
-
-template bool DataTypeNullable::deserializeWholeText<bool>(IColumn & column, ReadBuffer & istr, const FormatSettings & settings, const DataTypePtr & nested);
-template bool DataTypeNullable::deserializeTextEscaped<bool>(IColumn & column, ReadBuffer & istr, const FormatSettings & settings, const DataTypePtr & nested);
-template bool DataTypeNullable::deserializeTextQuoted<bool>(IColumn & column, ReadBuffer & istr, const FormatSettings &, const DataTypePtr & nested);
-template bool DataTypeNullable::deserializeTextCSV<bool>(IColumn & column, ReadBuffer & istr, const FormatSettings & settings, const DataTypePtr & nested);
-template bool DataTypeNullable::deserializeTextJSON<bool>(IColumn & column, ReadBuffer & istr, const FormatSettings &, const DataTypePtr & nested);
-
 }
diff --git a/src/DataTypes/DataTypeNullable.h b/src/DataTypes/DataTypeNullable.h
index 5e71a1bee4d..1557179d072 100644
--- a/src/DataTypes/DataTypeNullable.h
+++ b/src/DataTypes/DataTypeNullable.h
@@ -18,61 +18,6 @@ public:
     const char * getFamilyName() const override { return "Nullable"; }
     TypeIndex getTypeId() const override { return TypeIndex::Nullable; }
 
-    void enumerateStreamsImpl(const StreamCallback & callback, SubstreamPath & path) const override;
-
-    void serializeBinaryBulkStatePrefixImpl(
-            SerializeBinaryBulkSettings & settings,
-            SerializeBinaryBulkStatePtr & state) const override;
-
-    void serializeBinaryBulkStateSuffixImpl(
-            SerializeBinaryBulkSettings & settings,
-            SerializeBinaryBulkStatePtr & state) const override;
-
-    void deserializeBinaryBulkStatePrefixImpl(
-            DeserializeBinaryBulkSettings & settings,
-            DeserializeBinaryBulkStatePtr & state) const override;
-
-    void serializeBinaryBulkWithMultipleStreamsImpl(
-            const IColumn & column,
-            size_t offset,
-            size_t limit,
-            SerializeBinaryBulkSettings & settings,
-            SerializeBinaryBulkStatePtr & state) const override;
-
-    void deserializeBinaryBulkWithMultipleStreamsImpl(
-            IColumn & column,
-            size_t limit,
-            DeserializeBinaryBulkSettings & settings,
-            DeserializeBinaryBulkStatePtr & state,
-            SubstreamsCache * cache) const override;
-
-    void serializeBinary(const Field & field, WriteBuffer & ostr) const override;
-    void deserializeBinary(Field & field, ReadBuffer & istr) const override;
-    void serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr) const override;
-    void deserializeBinary(IColumn & column, ReadBuffer & istr) const override;
-    void serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-    void deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
-    void serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-    void deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
-    void deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
-
-    void serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-
-    /** It is questionable, how NULL values could be represented in CSV. There are three variants:
-      * 1. \N
-      * 2. empty string (without quotes)
-      * 3. NULL
-      * We support all of them (however, second variant is supported by CSVRowInputStream, not by deserializeTextCSV).
-      * (see also input_format_defaults_for_omitted_fields and input_format_csv_unquoted_null_literal_as_null settings)
-      * In CSV, non-NULL string value, starting with \N characters, must be placed in quotes, to avoid ambiguity.
-      */
-    void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
-
-    void serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-    void deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
-    void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-    void serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-
     MutableColumnPtr createColumn() const override;
 
     Field getDefault() const override;
@@ -95,25 +40,16 @@ public:
     size_t getSizeOfValueInMemory() const override;
     bool onlyNull() const override;
     bool canBeInsideLowCardinality() const override { return nested_data_type->canBeInsideLowCardinality(); }
+
     DataTypePtr tryGetSubcolumnType(const String & subcolumn_name) const override;
     ColumnPtr getSubcolumn(const String & subcolumn_name, const IColumn & column) const override;
+    SerializationPtr getSubcolumnSerialization(
+        const String & subcolumn_name, const BaseSerializationGetter & base_serialization_getter) const override;
 
     const DataTypePtr & getNestedType() const { return nested_data_type; }
-
-    /// If ReturnType is bool, check for NULL and deserialize value into non-nullable column (and return true) or insert default value of nested type (and return false)
-    /// If ReturnType is void, deserialize Nullable(T)
-    template <typename ReturnType = bool>
-    static ReturnType deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings, const DataTypePtr & nested);
-    template <typename ReturnType = bool>
-    static ReturnType deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings & settings, const DataTypePtr & nested);
-    template <typename ReturnType = bool>
-    static ReturnType deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &, const DataTypePtr & nested);
-    template <typename ReturnType = bool>
-    static ReturnType deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings, const DataTypePtr & nested);
-    template <typename ReturnType = bool>
-    static ReturnType deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &, const DataTypePtr & nested);
-
 private:
+    SerializationPtr doGetDefaultSerialization() const override;
+
     DataTypePtr nested_data_type;
 };
 
diff --git a/src/DataTypes/DataTypeNumberBase.cpp b/src/DataTypes/DataTypeNumberBase.cpp
index ae3e6762d27..a9df7db7334 100644
--- a/src/DataTypes/DataTypeNumberBase.cpp
+++ b/src/DataTypes/DataTypeNumberBase.cpp
@@ -13,196 +13,12 @@
 namespace DB
 {
 
-template <typename T>
-void DataTypeNumberBase<T>::serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const
-{
-    writeText(assert_cast<const ColumnVector<T> &>(column).getData()[row_num], ostr);
-}
-
-template <typename T>
-void DataTypeNumberBase<T>::deserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
-{
-    T x;
-
-    if constexpr (is_integer_v<T> && is_arithmetic_v<T>)
-        readIntTextUnsafe(x, istr);
-    else
-        readText(x, istr);
-
-    assert_cast<ColumnVector<T> &>(column).getData().push_back(x);
-}
-
-template <typename T>
-static inline void writeDenormalNumber(T x, WriteBuffer & ostr)
-{
-    if constexpr (std::is_floating_point_v<T>)
-    {
-        if (std::signbit(x))
-        {
-            if (isNaN(x))
-                writeCString("-nan", ostr);
-            else
-                writeCString("-inf", ostr);
-        }
-        else
-        {
-            if (isNaN(x))
-                writeCString("nan", ostr);
-            else
-                writeCString("inf", ostr);
-        }
-    }
-    else
-    {
-        /// This function is not called for non floating point numbers.
-        (void)x;
-    }
-}
-
-
-template <typename T>
-void DataTypeNumberBase<T>::serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    auto x = assert_cast<const ColumnVector<T> &>(column).getData()[row_num];
-    bool is_finite = isFinite(x);
-
-    const bool need_quote = (is_integer_v<T> && (sizeof(T) >= 8) && settings.json.quote_64bit_integers)
-        || (settings.json.quote_denormals && !is_finite);
-
-    if (need_quote)
-        writeChar('"', ostr);
-
-    if (is_finite)
-        writeText(x, ostr);
-    else if (!settings.json.quote_denormals)
-        writeCString("null", ostr);
-    else
-        writeDenormalNumber(x, ostr);
-
-    if (need_quote)
-        writeChar('"', ostr);
-}
-
-template <typename T>
-void DataTypeNumberBase<T>::deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
-{
-    bool has_quote = false;
-    if (!istr.eof() && *istr.position() == '"')        /// We understand the number both in quotes and without.
-    {
-        has_quote = true;
-        ++istr.position();
-    }
-
-    FieldType x;
-
-    /// null
-    if (!has_quote && !istr.eof() && *istr.position() == 'n')
-    {
-        ++istr.position();
-        assertString("ull", istr);
-
-        x = NaNOrZero<T>();
-    }
-    else
-    {
-        static constexpr bool is_uint8 = std::is_same_v<T, UInt8>;
-        static constexpr bool is_int8 = std::is_same_v<T, Int8>;
-
-        if (is_uint8 || is_int8)
-        {
-            // extra conditions to parse true/false strings into 1/0
-            if (istr.eof())
-                throwReadAfterEOF();
-            if (*istr.position() == 't' || *istr.position() == 'f')
-            {
-                bool tmp = false;
-                readBoolTextWord(tmp, istr);
-                x = tmp;
-            }
-            else
-                readText(x, istr);
-        }
-        else
-        {
-            readText(x, istr);
-        }
-
-        if (has_quote)
-            assertChar('"', istr);
-    }
-
-    assert_cast<ColumnVector<T> &>(column).getData().push_back(x);
-}
-
-template <typename T>
-void DataTypeNumberBase<T>::deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
-{
-    FieldType x;
-    readCSV(x, istr);
-    assert_cast<ColumnVector<T> &>(column).getData().push_back(x);
-}
-
 template <typename T>
 Field DataTypeNumberBase<T>::getDefault() const
 {
     return NearestFieldType<FieldType>();
 }
 
-template <typename T>
-void DataTypeNumberBase<T>::serializeBinary(const Field & field, WriteBuffer & ostr) const
-{
-    /// ColumnVector<T>::ValueType is a narrower type. For example, UInt8, when the Field type is UInt64
-    typename ColumnVector<T>::ValueType x = get<NearestFieldType<FieldType>>(field);
-    writeBinary(x, ostr);
-}
-
-template <typename T>
-void DataTypeNumberBase<T>::deserializeBinary(Field & field, ReadBuffer & istr) const
-{
-    typename ColumnVector<T>::ValueType x;
-    readBinary(x, istr);
-    field = NearestFieldType<FieldType>(x);
-}
-
-template <typename T>
-void DataTypeNumberBase<T>::serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr) const
-{
-    writeBinary(assert_cast<const ColumnVector<T> &>(column).getData()[row_num], ostr);
-}
-
-template <typename T>
-void DataTypeNumberBase<T>::deserializeBinary(IColumn & column, ReadBuffer & istr) const
-{
-    typename ColumnVector<T>::ValueType x;
-    readBinary(x, istr);
-    assert_cast<ColumnVector<T> &>(column).getData().push_back(x);
-}
-
-template <typename T>
-void DataTypeNumberBase<T>::serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, size_t offset, size_t limit) const
-{
-    const typename ColumnVector<T>::Container & x = typeid_cast<const ColumnVector<T> &>(column).getData();
-
-    size_t size = x.size();
-
-    if (limit == 0 || offset + limit > size)
-        limit = size - offset;
-
-    if (limit)
-        ostr.write(reinterpret_cast<const char *>(&x[offset]), sizeof(typename ColumnVector<T>::ValueType) * limit);
-}
-
-template <typename T>
-void DataTypeNumberBase<T>::deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, size_t limit, double /*avg_value_size_hint*/) const
-{
-    typename ColumnVector<T>::Container & x = typeid_cast<ColumnVector<T> &>(column).getData();
-    size_t initial_size = x.size();
-    x.resize(initial_size + limit);
-    size_t size = istr.readBig(reinterpret_cast<char*>(&x[initial_size]), sizeof(typename ColumnVector<T>::ValueType) * limit);
-    x.resize(initial_size + size / sizeof(typename ColumnVector<T>::ValueType));
-}
-
-
 template <typename T>
 MutableColumnPtr DataTypeNumberBase<T>::createColumn() const
 {
@@ -212,13 +28,13 @@ MutableColumnPtr DataTypeNumberBase<T>::createColumn() const
 template <typename T>
 bool DataTypeNumberBase<T>::isValueRepresentedByInteger() const
 {
-    return std::is_integral_v<T>;
+    return is_integer_v<T>;
 }
 
 template <typename T>
 bool DataTypeNumberBase<T>::isValueRepresentedByUnsignedInteger() const
 {
-    return std::is_integral_v<T> && is_unsigned_v<T>;
+    return is_integer_v<T> && is_unsigned_v<T>;
 }
 
 
diff --git a/src/DataTypes/DataTypeNumberBase.h b/src/DataTypes/DataTypeNumberBase.h
index 22a70ac7277..97c3563b032 100644
--- a/src/DataTypes/DataTypeNumberBase.h
+++ b/src/DataTypes/DataTypeNumberBase.h
@@ -2,7 +2,7 @@
 
 #include <Common/UInt128.h>
 #include <DataTypes/IDataType.h>
-#include <DataTypes/DataTypeWithSimpleSerialization.h>
+#include <DataTypes/Serializations/SerializationNumber.h>
 
 
 namespace DB
@@ -14,7 +14,7 @@ class ColumnVector;
 /** Implements part of the IDataType interface, common to all numbers and for Date and DateTime.
   */
 template <typename T>
-class DataTypeNumberBase : public DataTypeWithSimpleSerialization
+class DataTypeNumberBase : public IDataType
 {
     static_assert(IsNumber<T>);
 
@@ -30,21 +30,8 @@ public:
     const char * getFamilyName() const override { return family_name; }
     TypeIndex getTypeId() const override { return type_id; }
 
-    void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-    void deserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
-    void serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override;
-    void deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
-    void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
     Field getDefault() const override;
 
-    /** Format is platform-dependent. */
-    void serializeBinary(const Field & field, WriteBuffer & ostr) const override;
-    void deserializeBinary(Field & field, ReadBuffer & istr) const override;
-    void serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr) const override;
-    void deserializeBinary(IColumn & column, ReadBuffer & istr) const override;
-    void serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, size_t offset, size_t limit) const override;
-    void deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, size_t limit, double avg_value_size_hint) const override;
-
     MutableColumnPtr createColumn() const override;
 
     bool isParametric() const override { return false; }
@@ -53,7 +40,7 @@ public:
     bool shouldAlignRightInPrettyFormats() const override
     {
         /// Just a number, without customizations. Counterexample: IPv4.
-        return !custom_text_serialization;
+        return !custom_serialization;
     }
 
     bool textCanContainOnlyValidUTF8() const override { return true; }
@@ -66,6 +53,8 @@ public:
     size_t getSizeOfValueInMemory() const override { return sizeof(T); }
     bool isCategorial() const override { return isValueRepresentedByInteger(); }
     bool canBeInsideLowCardinality() const override { return true; }
+
+    SerializationPtr doGetDefaultSerialization() const override { return std::make_shared<SerializationNumber<T>>(); }
 };
 
 /// Prevent implicit template instantiation of DataTypeNumberBase for common numeric types
diff --git a/src/DataTypes/DataTypeOneElementTuple.cpp b/src/DataTypes/DataTypeOneElementTuple.cpp
deleted file mode 100644
index a4169220362..00000000000
--- a/src/DataTypes/DataTypeOneElementTuple.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-#include <DataTypes/DataTypeOneElementTuple.h>
-#include <DataTypes/DataTypeFactory.h>
-#include <DataTypes/DataTypeCustom.h>
-#include <IO/WriteBufferFromString.h>
-#include <IO/Operators.h>
-#include <Common/quoteString.h>
-#include <Parsers/ASTNameTypePair.h>
-#include <Columns/IColumn.h>
-
-
-namespace DB
-{
-
-namespace
-{
-
-/** Custom substreams representation for single subcolumn.
-  * It serializes/deserializes column as a nested type, but in that way
-  * if it was a named tuple with one element and a given name.
-  */
-class DataTypeOneElementTupleStreams : public IDataTypeCustomStreams
-{
-private:
-    DataTypePtr nested;
-    String name;
-    bool escape_delimiter;
-
-public:
-    DataTypeOneElementTupleStreams(const DataTypePtr & nested_, const String & name_, bool escape_delimiter_)
-        : nested(nested_), name(name_), escape_delimiter(escape_delimiter_) {}
-
-    void enumerateStreams(
-        const IDataType::StreamCallback & callback,
-        IDataType::SubstreamPath & path) const override
-    {
-        addToPath(path);
-        nested->enumerateStreams(callback, path);
-        path.pop_back();
-    }
-
-    void serializeBinaryBulkStatePrefix(
-        IDataType:: SerializeBinaryBulkSettings & settings,
-        IDataType::SerializeBinaryBulkStatePtr & state) const override
-    {
-        addToPath(settings.path);
-        nested->serializeBinaryBulkStatePrefix(settings, state);
-        settings.path.pop_back();
-    }
-
-    void serializeBinaryBulkStateSuffix(
-        IDataType::SerializeBinaryBulkSettings & settings,
-        IDataType::SerializeBinaryBulkStatePtr & state) const override
-    {
-        addToPath(settings.path);
-        nested->serializeBinaryBulkStateSuffix(settings, state);
-        settings.path.pop_back();
-    }
-
-    void deserializeBinaryBulkStatePrefix(
-        IDataType::DeserializeBinaryBulkSettings & settings,
-        IDataType::DeserializeBinaryBulkStatePtr & state) const override
-    {
-        addToPath(settings.path);
-        nested->deserializeBinaryBulkStatePrefix(settings, state);
-        settings.path.pop_back();
-    }
-
-    void serializeBinaryBulkWithMultipleStreams(
-        const IColumn & column,
-        size_t offset,
-        size_t limit,
-        IDataType::SerializeBinaryBulkSettings & settings,
-        IDataType::SerializeBinaryBulkStatePtr & state) const override
-    {
-        addToPath(settings.path);
-        nested->serializeBinaryBulkWithMultipleStreams(column, offset, limit, settings, state);
-        settings.path.pop_back();
-    }
-
-    void deserializeBinaryBulkWithMultipleStreams(
-        ColumnPtr & column,
-        size_t limit,
-        IDataType::DeserializeBinaryBulkSettings & settings,
-        IDataType::DeserializeBinaryBulkStatePtr & state,
-        IDataType::SubstreamsCache * cache) const override
-    {
-        addToPath(settings.path);
-        nested->deserializeBinaryBulkWithMultipleStreams(column, limit, settings, state, cache);
-        settings.path.pop_back();
-    }
-
-private:
-    void addToPath(IDataType::SubstreamPath & path) const
-    {
-        path.push_back(IDataType::Substream::TupleElement);
-        path.back().tuple_element_name = name;
-        path.back().escape_tuple_delimiter = escape_delimiter;
-    }
-};
-
-}
-
-DataTypePtr createOneElementTuple(const DataTypePtr & type, const String & name, bool escape_delimiter)
-{
-    auto custom_desc = std::make_unique<DataTypeCustomDesc>(
-        std::make_unique<DataTypeCustomFixedName>(type->getName()),nullptr,
-        std::make_unique<DataTypeOneElementTupleStreams>(type, name, escape_delimiter));
-
-    return DataTypeFactory::instance().getCustom(std::move(custom_desc));
-}
-
-}
diff --git a/src/DataTypes/DataTypeOneElementTuple.h b/src/DataTypes/DataTypeOneElementTuple.h
deleted file mode 100644
index 03b0511ef4a..00000000000
--- a/src/DataTypes/DataTypeOneElementTuple.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma once
-
-#include <DataTypes/IDataType.h>
-
-namespace DB
-{
-
-DataTypePtr createOneElementTuple(const DataTypePtr & type, const String & name, bool escape_delimiter = true);
-
-}
diff --git a/src/DataTypes/DataTypeString.cpp b/src/DataTypes/DataTypeString.cpp
index d760df5075d..41ae578a70f 100644
--- a/src/DataTypes/DataTypeString.cpp
+++ b/src/DataTypes/DataTypeString.cpp
@@ -11,6 +11,7 @@
 #include <Formats/FormatSettings.h>
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypeFactory.h>
+#include <DataTypes/Serializations/SerializationString.h>
 
 #include <Parsers/IAST.h>
 #include <Parsers/ASTLiteral.h>
@@ -34,281 +35,6 @@ namespace ErrorCodes
     extern const int UNEXPECTED_AST_STRUCTURE;
 }
 
-
-void DataTypeString::serializeBinary(const Field & field, WriteBuffer & ostr) const
-{
-    const String & s = get<const String &>(field);
-    writeVarUInt(s.size(), ostr);
-    writeString(s, ostr);
-}
-
-
-void DataTypeString::deserializeBinary(Field & field, ReadBuffer & istr) const
-{
-    UInt64 size;
-    readVarUInt(size, istr);
-    field = String();
-    String & s = get<String &>(field);
-    s.resize(size);
-    istr.readStrict(s.data(), size);
-}
-
-
-void DataTypeString::serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr) const
-{
-    const StringRef & s = assert_cast<const ColumnString &>(column).getDataAt(row_num);
-    writeVarUInt(s.size, ostr);
-    writeString(s, ostr);
-}
-
-
-void DataTypeString::deserializeBinary(IColumn & column, ReadBuffer & istr) const
-{
-    ColumnString & column_string = assert_cast<ColumnString &>(column);
-    ColumnString::Chars & data = column_string.getChars();
-    ColumnString::Offsets & offsets = column_string.getOffsets();
-
-    UInt64 size;
-    readVarUInt(size, istr);
-
-    size_t old_chars_size = data.size();
-    size_t offset = old_chars_size + size + 1;
-    offsets.push_back(offset);
-
-    try
-    {
-        data.resize(offset);
-        istr.readStrict(reinterpret_cast<char*>(&data[offset - size - 1]), size);
-        data.back() = 0;
-    }
-    catch (...)
-    {
-        offsets.pop_back();
-        data.resize_assume_reserved(old_chars_size);
-        throw;
-    }
-}
-
-
-void DataTypeString::serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, size_t offset, size_t limit) const
-{
-    const ColumnString & column_string = typeid_cast<const ColumnString &>(column);
-    const ColumnString::Chars & data = column_string.getChars();
-    const ColumnString::Offsets & offsets = column_string.getOffsets();
-
-    size_t size = column.size();
-    if (!size)
-        return;
-
-    size_t end = limit && offset + limit < size
-        ? offset + limit
-        : size;
-
-    if (offset == 0)
-    {
-        UInt64 str_size = offsets[0] - 1;
-        writeVarUInt(str_size, ostr);
-        ostr.write(reinterpret_cast<const char *>(data.data()), str_size);
-
-        ++offset;
-    }
-
-    for (size_t i = offset; i < end; ++i)
-    {
-        UInt64 str_size = offsets[i] - offsets[i - 1] - 1;
-        writeVarUInt(str_size, ostr);
-        ostr.write(reinterpret_cast<const char *>(&data[offsets[i - 1]]), str_size);
-    }
-}
-
-
-template <int UNROLL_TIMES>
-static NO_INLINE void deserializeBinarySSE2(ColumnString::Chars & data, ColumnString::Offsets & offsets, ReadBuffer & istr, size_t limit)
-{
-    size_t offset = data.size();
-    for (size_t i = 0; i < limit; ++i)
-    {
-        if (istr.eof())
-            break;
-
-        UInt64 size;
-        readVarUInt(size, istr);
-
-        offset += size + 1;
-        offsets.push_back(offset);
-
-        data.resize(offset);
-
-        if (size)
-        {
-#ifdef __SSE2__
-            /// An optimistic branch in which more efficient copying is possible.
-            if (offset + 16 * UNROLL_TIMES <= data.capacity() && istr.position() + size + 16 * UNROLL_TIMES <= istr.buffer().end())
-            {
-                const __m128i * sse_src_pos = reinterpret_cast<const __m128i *>(istr.position());
-                const __m128i * sse_src_end = sse_src_pos + (size + (16 * UNROLL_TIMES - 1)) / 16 / UNROLL_TIMES * UNROLL_TIMES;
-                __m128i * sse_dst_pos = reinterpret_cast<__m128i *>(&data[offset - size - 1]);
-
-                while (sse_src_pos < sse_src_end)
-                {
-                    for (size_t j = 0; j < UNROLL_TIMES; ++j)
-                        _mm_storeu_si128(sse_dst_pos + j, _mm_loadu_si128(sse_src_pos + j));
-
-                    sse_src_pos += UNROLL_TIMES;
-                    sse_dst_pos += UNROLL_TIMES;
-                }
-
-                istr.position() += size;
-            }
-            else
-#endif
-            {
-                istr.readStrict(reinterpret_cast<char*>(&data[offset - size - 1]), size);
-            }
-        }
-
-        data[offset - 1] = 0;
-    }
-}
-
-
-void DataTypeString::deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, size_t limit, double avg_value_size_hint) const
-{
-    ColumnString & column_string = typeid_cast<ColumnString &>(column);
-    ColumnString::Chars & data = column_string.getChars();
-    ColumnString::Offsets & offsets = column_string.getOffsets();
-
-    double avg_chars_size = 1; /// By default reserve only for empty strings.
-
-    if (avg_value_size_hint && avg_value_size_hint > sizeof(offsets[0]))
-    {
-        /// Randomly selected.
-        constexpr auto avg_value_size_hint_reserve_multiplier = 1.2;
-
-        avg_chars_size = (avg_value_size_hint - sizeof(offsets[0])) * avg_value_size_hint_reserve_multiplier;
-    }
-
-    size_t size_to_reserve = data.size() + std::ceil(limit * avg_chars_size);
-
-    /// Never reserve for too big size.
-    if (size_to_reserve < 256 * 1024 * 1024)
-    {
-        try
-        {
-            data.reserve(size_to_reserve);
-        }
-        catch (Exception & e)
-        {
-            e.addMessage(
-                "(avg_value_size_hint = " + toString(avg_value_size_hint)
-                + ", avg_chars_size = " + toString(avg_chars_size)
-                + ", limit = " + toString(limit) + ")");
-            throw;
-        }
-    }
-
-    offsets.reserve(offsets.size() + limit);
-
-    if (avg_chars_size >= 64)
-        deserializeBinarySSE2<4>(data, offsets, istr, limit);
-    else if (avg_chars_size >= 48)
-        deserializeBinarySSE2<3>(data, offsets, istr, limit);
-    else if (avg_chars_size >= 32)
-        deserializeBinarySSE2<2>(data, offsets, istr, limit);
-    else
-        deserializeBinarySSE2<1>(data, offsets, istr, limit);
-}
-
-
-void DataTypeString::serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const
-{
-    writeString(assert_cast<const ColumnString &>(column).getDataAt(row_num), ostr);
-}
-
-
-void DataTypeString::serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const
-{
-    writeEscapedString(assert_cast<const ColumnString &>(column).getDataAt(row_num), ostr);
-}
-
-
-template <typename Reader>
-static inline void read(IColumn & column, Reader && reader)
-{
-    ColumnString & column_string = assert_cast<ColumnString &>(column);
-    ColumnString::Chars & data = column_string.getChars();
-    ColumnString::Offsets & offsets = column_string.getOffsets();
-    size_t old_chars_size = data.size();
-    size_t old_offsets_size = offsets.size();
-    try
-    {
-        reader(data);
-        data.push_back(0);
-        offsets.push_back(data.size());
-    }
-    catch (...)
-    {
-        offsets.resize_assume_reserved(old_offsets_size);
-        data.resize_assume_reserved(old_chars_size);
-        throw;
-    }
-}
-
-
-void DataTypeString::deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
-{
-    read(column, [&](ColumnString::Chars & data) { readStringInto(data, istr); });
-}
-
-
-void DataTypeString::deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
-{
-    read(column, [&](ColumnString::Chars & data) { readEscapedStringInto(data, istr); });
-}
-
-
-void DataTypeString::serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const
-{
-    writeQuotedString(assert_cast<const ColumnString &>(column).getDataAt(row_num), ostr);
-}
-
-
-void DataTypeString::deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
-{
-    read(column, [&](ColumnString::Chars & data) { readQuotedStringInto<true>(data, istr); });
-}
-
-
-void DataTypeString::serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    writeJSONString(assert_cast<const ColumnString &>(column).getDataAt(row_num), ostr, settings);
-}
-
-
-void DataTypeString::deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
-{
-    read(column, [&](ColumnString::Chars & data) { readJSONStringInto(data, istr); });
-}
-
-
-void DataTypeString::serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const
-{
-    writeXMLStringForTextElement(assert_cast<const ColumnString &>(column).getDataAt(row_num), ostr);
-}
-
-
-void DataTypeString::serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const
-{
-    writeCSVString<>(assert_cast<const ColumnString &>(column).getDataAt(row_num), ostr);
-}
-
-
-void DataTypeString::deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
-{
-    read(column, [&](ColumnString::Chars & data) { readCSVStringInto(data, istr, settings.csv); });
-}
-
-
 Field DataTypeString::getDefault() const
 {
     return String();
@@ -325,6 +51,11 @@ bool DataTypeString::equals(const IDataType & rhs) const
     return typeid(rhs) == typeid(*this);
 }
 
+SerializationPtr DataTypeString::doGetDefaultSerialization() const
+{
+    return std::make_shared<SerializationString>();
+}
+
 static DataTypePtr create(const ASTPtr & arguments)
 {
     if (arguments && !arguments->children.empty())
diff --git a/src/DataTypes/DataTypeString.h b/src/DataTypes/DataTypeString.h
index 7f8aa1fd0cf..0fc38e9c6f0 100644
--- a/src/DataTypes/DataTypeString.h
+++ b/src/DataTypes/DataTypeString.h
@@ -22,31 +22,6 @@ public:
 
     TypeIndex getTypeId() const override { return type_id; }
 
-    void serializeBinary(const Field & field, WriteBuffer & ostr) const override;
-    void deserializeBinary(Field & field, ReadBuffer & istr) const override;
-    void serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr) const override;
-    void deserializeBinary(IColumn & column, ReadBuffer & istr) const override;
-
-    void serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, size_t offset, size_t limit) const override;
-    void deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, size_t limit, double avg_value_size_hint) const override;
-
-    void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-    void deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
-
-    void serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-    void deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
-
-    void serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-    void deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
-
-    void serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-    void deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
-
-    void serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-
-    void serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-    void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
-
     MutableColumnPtr createColumn() const override;
 
     Field getDefault() const override;
@@ -61,6 +36,8 @@ public:
     bool isCategorial() const override { return true; }
     bool canBeInsideNullable() const override { return true; }
     bool canBeInsideLowCardinality() const override { return true; }
+
+    SerializationPtr doGetDefaultSerialization() const override;
 };
 
 }
diff --git a/src/DataTypes/DataTypeTuple.cpp b/src/DataTypes/DataTypeTuple.cpp
index 2261e776ea2..b30efb163ab 100644
--- a/src/DataTypes/DataTypeTuple.cpp
+++ b/src/DataTypes/DataTypeTuple.cpp
@@ -5,7 +5,9 @@
 #include <DataTypes/DataTypeTuple.h>
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeFactory.h>
-#include <DataTypes/DataTypeOneElementTuple.h>
+#include <DataTypes/Serializations/SerializationTuple.h>
+#include <DataTypes/Serializations/SerializationTupleElement.h>
+#include <DataTypes/NestedUtils.h>
 #include <Parsers/IAST.h>
 #include <Parsers/ASTNameTypePair.h>
 #include <Common/typeid_cast.h>
@@ -29,7 +31,6 @@ namespace ErrorCodes
     extern const int BAD_ARGUMENTS;
     extern const int DUPLICATE_COLUMN;
     extern const int EMPTY_DATA_PASSED;
-    extern const int LOGICAL_ERROR;
     extern const int NOT_FOUND_COLUMN_IN_BLOCK;
     extern const int ILLEGAL_COLUMN;
     extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
@@ -113,32 +114,6 @@ static inline const IColumn & extractElementColumn(const IColumn & column, size_
     return assert_cast<const ColumnTuple &>(column).getColumn(idx);
 }
 
-
-void DataTypeTuple::serializeBinary(const Field & field, WriteBuffer & ostr) const
-{
-    const auto & tuple = get<const Tuple &>(field);
-    for (const auto idx_elem : ext::enumerate(elems))
-        idx_elem.second->serializeBinary(tuple[idx_elem.first], ostr);
-}
-
-void DataTypeTuple::deserializeBinary(Field & field, ReadBuffer & istr) const
-{
-    const size_t size = elems.size();
-
-    Tuple tuple(size);
-    for (const auto i : ext::range(0, size))
-        elems[i]->deserializeBinary(tuple[i], istr);
-
-    field = tuple;
-}
-
-void DataTypeTuple::serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr) const
-{
-    for (const auto idx_elem : ext::enumerate(elems))
-        idx_elem.second->serializeBinary(extractElementColumn(column, idx_elem.first), row_num, ostr);
-}
-
-
 template <typename F>
 static void addElementSafe(const DataTypes & elems, IColumn & column, F && impl)
 {
@@ -151,7 +126,8 @@ static void addElementSafe(const DataTypes & elems, IColumn & column, F && impl)
 
         // Check that all columns now have the same size.
         size_t new_size = column.size();
-        for (auto i : ext::range(1, ext::size(elems)))
+
+        for (auto i : ext::range(0, ext::size(elems)))
         {
             const auto & element_column = extractElementColumn(column, i);
             if (element_column.size() != new_size)
@@ -168,6 +144,7 @@ static void addElementSafe(const DataTypes & elems, IColumn & column, F && impl)
         for (const auto & i : ext::range(0, ext::size(elems)))
         {
             auto & element_column = extractElementColumn(column, i);
+
             if (element_column.size() > old_size)
                 element_column.popBack(1);
         }
@@ -176,334 +153,6 @@ static void addElementSafe(const DataTypes & elems, IColumn & column, F && impl)
     }
 }
 
-
-void DataTypeTuple::deserializeBinary(IColumn & column, ReadBuffer & istr) const
-{
-    addElementSafe(elems, column, [&]
-    {
-        for (const auto & i : ext::range(0, ext::size(elems)))
-            elems[i]->deserializeBinary(extractElementColumn(column, i), istr);
-    });
-}
-
-void DataTypeTuple::serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    writeChar('(', ostr);
-    for (const auto i : ext::range(0, ext::size(elems)))
-    {
-        if (i != 0)
-            writeChar(',', ostr);
-        elems[i]->serializeAsTextQuoted(extractElementColumn(column, i), row_num, ostr, settings);
-    }
-    writeChar(')', ostr);
-}
-
-void DataTypeTuple::deserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
-{
-    const size_t size = elems.size();
-    assertChar('(', istr);
-
-    addElementSafe(elems, column, [&]
-    {
-        for (const auto i : ext::range(0, size))
-        {
-            skipWhitespaceIfAny(istr);
-            if (i != 0)
-            {
-                assertChar(',', istr);
-                skipWhitespaceIfAny(istr);
-            }
-            elems[i]->deserializeAsTextQuoted(extractElementColumn(column, i), istr, settings);
-        }
-    });
-
-    // Special format for one element tuple (1,)
-    if (1 == elems.size())
-    {
-        skipWhitespaceIfAny(istr);
-        // Allow both (1) and (1,)
-        checkChar(',', istr);
-    }
-    skipWhitespaceIfAny(istr);
-    assertChar(')', istr);
-}
-
-void DataTypeTuple::serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    if (settings.json.named_tuples_as_objects
-        && have_explicit_names)
-    {
-        writeChar('{', ostr);
-        for (const auto i : ext::range(0, ext::size(elems)))
-        {
-            if (i != 0)
-            {
-                writeChar(',', ostr);
-            }
-            writeJSONString(names[i], ostr, settings);
-            writeChar(':', ostr);
-            elems[i]->serializeAsTextJSON(extractElementColumn(column, i), row_num, ostr, settings);
-        }
-        writeChar('}', ostr);
-    }
-    else
-    {
-        writeChar('[', ostr);
-        for (const auto i : ext::range(0, ext::size(elems)))
-        {
-            if (i != 0)
-                writeChar(',', ostr);
-            elems[i]->serializeAsTextJSON(extractElementColumn(column, i), row_num, ostr, settings);
-        }
-        writeChar(']', ostr);
-    }
-}
-
-void DataTypeTuple::deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
-{
-    if (settings.json.named_tuples_as_objects
-        && have_explicit_names)
-    {
-        skipWhitespaceIfAny(istr);
-        assertChar('{', istr);
-        skipWhitespaceIfAny(istr);
-
-        addElementSafe(elems, column, [&]
-        {
-            // Require all elements but in arbitrary order.
-            for (auto i : ext::range(0, ext::size(elems)))
-            {
-                if (i > 0)
-                {
-                    skipWhitespaceIfAny(istr);
-                    assertChar(',', istr);
-                    skipWhitespaceIfAny(istr);
-                }
-
-                std::string name;
-                readDoubleQuotedString(name, istr);
-                skipWhitespaceIfAny(istr);
-                assertChar(':', istr);
-                skipWhitespaceIfAny(istr);
-
-                const size_t element_pos = getPositionByName(name);
-                auto & element_column = extractElementColumn(column, element_pos);
-                elems[element_pos]->deserializeAsTextJSON(element_column, istr, settings);
-            }
-        });
-
-        skipWhitespaceIfAny(istr);
-        assertChar('}', istr);
-    }
-    else
-    {
-        const size_t size = elems.size();
-        assertChar('[', istr);
-
-        addElementSafe(elems, column, [&]
-        {
-            for (const auto i : ext::range(0, size))
-            {
-                skipWhitespaceIfAny(istr);
-                if (i != 0)
-                {
-                    assertChar(',', istr);
-                    skipWhitespaceIfAny(istr);
-                }
-                elems[i]->deserializeAsTextJSON(extractElementColumn(column, i), istr, settings);
-            }
-        });
-
-        skipWhitespaceIfAny(istr);
-        assertChar(']', istr);
-    }
-}
-
-void DataTypeTuple::serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    writeCString("<tuple>", ostr);
-    for (const auto i : ext::range(0, ext::size(elems)))
-    {
-        writeCString("<elem>", ostr);
-        elems[i]->serializeAsTextXML(extractElementColumn(column, i), row_num, ostr, settings);
-        writeCString("</elem>", ostr);
-    }
-    writeCString("</tuple>", ostr);
-}
-
-void DataTypeTuple::serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    for (const auto i : ext::range(0, ext::size(elems)))
-    {
-        if (i != 0)
-            writeChar(',', ostr);
-        elems[i]->serializeAsTextCSV(extractElementColumn(column, i), row_num, ostr, settings);
-    }
-}
-
-void DataTypeTuple::deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
-{
-    addElementSafe(elems, column, [&]
-    {
-        const size_t size = elems.size();
-        for (const auto i : ext::range(0, size))
-        {
-            if (i != 0)
-            {
-                skipWhitespaceIfAny(istr);
-                assertChar(settings.csv.delimiter, istr);
-                skipWhitespaceIfAny(istr);
-            }
-            elems[i]->deserializeAsTextCSV(extractElementColumn(column, i), istr, settings);
-        }
-    });
-}
-
-void DataTypeTuple::enumerateStreamsImpl(const StreamCallback & callback, SubstreamPath & path) const
-{
-    path.push_back(Substream::TupleElement);
-    for (const auto i : ext::range(0, ext::size(elems)))
-    {
-        path.back().tuple_element_name = names[i];
-        elems[i]->enumerateStreams(callback, path);
-    }
-    path.pop_back();
-}
-
-struct SerializeBinaryBulkStateTuple : public IDataType::SerializeBinaryBulkState
-{
-    std::vector<IDataType::SerializeBinaryBulkStatePtr> states;
-};
-
-struct DeserializeBinaryBulkStateTuple : public IDataType::DeserializeBinaryBulkState
-{
-    std::vector<IDataType::DeserializeBinaryBulkStatePtr> states;
-};
-
-static SerializeBinaryBulkStateTuple * checkAndGetTupleSerializeState(IDataType::SerializeBinaryBulkStatePtr & state)
-{
-    if (!state)
-        throw Exception("Got empty state for DataTypeTuple.", ErrorCodes::LOGICAL_ERROR);
-
-    auto * tuple_state = typeid_cast<SerializeBinaryBulkStateTuple *>(state.get());
-    if (!tuple_state)
-    {
-        auto & state_ref = *state;
-        throw Exception("Invalid SerializeBinaryBulkState for DataTypeTuple. Expected: "
-                        + demangle(typeid(SerializeBinaryBulkStateTuple).name()) + ", got "
-                        + demangle(typeid(state_ref).name()), ErrorCodes::LOGICAL_ERROR);
-    }
-
-    return tuple_state;
-}
-
-static DeserializeBinaryBulkStateTuple * checkAndGetTupleDeserializeState(IDataType::DeserializeBinaryBulkStatePtr & state)
-{
-    if (!state)
-        throw Exception("Got empty state for DataTypeTuple.", ErrorCodes::LOGICAL_ERROR);
-
-    auto * tuple_state = typeid_cast<DeserializeBinaryBulkStateTuple *>(state.get());
-    if (!tuple_state)
-    {
-        auto & state_ref = *state;
-        throw Exception("Invalid DeserializeBinaryBulkState for DataTypeTuple. Expected: "
-                        + demangle(typeid(DeserializeBinaryBulkStateTuple).name()) + ", got "
-                        + demangle(typeid(state_ref).name()), ErrorCodes::LOGICAL_ERROR);
-    }
-
-    return tuple_state;
-}
-
-void DataTypeTuple::serializeBinaryBulkStatePrefixImpl(
-    SerializeBinaryBulkSettings & settings,
-    SerializeBinaryBulkStatePtr & state) const
-{
-    auto tuple_state = std::make_shared<SerializeBinaryBulkStateTuple>();
-    tuple_state->states.resize(elems.size());
-
-    settings.path.push_back(Substream::TupleElement);
-    for (size_t i = 0; i < elems.size(); ++i)
-    {
-        settings.path.back().tuple_element_name = names[i];
-        elems[i]->serializeBinaryBulkStatePrefix(settings, tuple_state->states[i]);
-    }
-    settings.path.pop_back();
-
-    state = std::move(tuple_state);
-}
-
-void DataTypeTuple::serializeBinaryBulkStateSuffixImpl(
-    SerializeBinaryBulkSettings & settings,
-    SerializeBinaryBulkStatePtr & state) const
-{
-    auto * tuple_state = checkAndGetTupleSerializeState(state);
-
-    settings.path.push_back(Substream::TupleElement);
-    for (size_t i = 0; i < elems.size(); ++i)
-    {
-        settings.path.back().tuple_element_name = names[i];
-        elems[i]->serializeBinaryBulkStateSuffix(settings, tuple_state->states[i]);
-    }
-    settings.path.pop_back();
-}
-
-void DataTypeTuple::deserializeBinaryBulkStatePrefixImpl(
-        DeserializeBinaryBulkSettings & settings,
-        DeserializeBinaryBulkStatePtr & state) const
-{
-    auto tuple_state = std::make_shared<DeserializeBinaryBulkStateTuple>();
-    tuple_state->states.resize(elems.size());
-
-    settings.path.push_back(Substream::TupleElement);
-    for (size_t i = 0; i < elems.size(); ++i)
-    {
-        settings.path.back().tuple_element_name = names[i];
-        elems[i]->deserializeBinaryBulkStatePrefix(settings, tuple_state->states[i]);
-    }
-    settings.path.pop_back();
-
-    state = std::move(tuple_state);
-}
-
-void DataTypeTuple::serializeBinaryBulkWithMultipleStreamsImpl(
-    const IColumn & column,
-    size_t offset,
-    size_t limit,
-    SerializeBinaryBulkSettings & settings,
-    SerializeBinaryBulkStatePtr & state) const
-{
-    auto * tuple_state = checkAndGetTupleSerializeState(state);
-
-    settings.path.push_back(Substream::TupleElement);
-    for (const auto i : ext::range(0, ext::size(elems)))
-    {
-        settings.path.back().tuple_element_name = names[i];
-        const auto & element_col = extractElementColumn(column, i);
-        elems[i]->serializeBinaryBulkWithMultipleStreams(element_col, offset, limit, settings, tuple_state->states[i]);
-    }
-    settings.path.pop_back();
-}
-
-void DataTypeTuple::deserializeBinaryBulkWithMultipleStreamsImpl(
-    IColumn & column,
-    size_t limit,
-    DeserializeBinaryBulkSettings & settings,
-    DeserializeBinaryBulkStatePtr & state,
-    SubstreamsCache * cache) const
-{
-    auto * tuple_state = checkAndGetTupleDeserializeState(state);
-    auto & column_tuple = assert_cast<ColumnTuple &>(column);
-
-    settings.path.push_back(Substream::TupleElement);
-    settings.avg_value_size_hint = 0;
-    for (const auto i : ext::range(0, ext::size(elems)))
-    {
-        settings.path.back().tuple_element_name = names[i];
-        elems[i]->deserializeBinaryBulkWithMultipleStreams(column_tuple.getColumnPtr(i), limit, settings, tuple_state->states[i], cache);
-    }
-    settings.path.pop_back();
-}
-
 MutableColumnPtr DataTypeTuple::createColumn() const
 {
     size_t size = elems.size();
@@ -587,47 +236,98 @@ size_t DataTypeTuple::getSizeOfValueInMemory() const
     return res;
 }
 
-DataTypePtr DataTypeTuple::tryGetSubcolumnType(const String & subcolumn_name) const
+template <typename OnSuccess, typename OnContinue>
+auto DataTypeTuple::getSubcolumnEntity(const String & subcolumn_name,
+    const OnSuccess & on_success, const OnContinue & on_continue) const
 {
+    using ReturnType = decltype(on_success(0));
     for (size_t i = 0; i < names.size(); ++i)
     {
         if (startsWith(subcolumn_name, names[i]))
         {
             size_t name_length = names[i].size();
-            DataTypePtr subcolumn_type;
-            if (subcolumn_name.size() == name_length)
-                subcolumn_type = elems[i];
-            else if (subcolumn_name[name_length] == '.')
-                subcolumn_type = elems[i]->tryGetSubcolumnType(subcolumn_name.substr(name_length + 1));
 
-            if (subcolumn_type)
-                return createOneElementTuple(std::move(subcolumn_type), names[i]);
+            if (subcolumn_name.size() == name_length)
+                return on_success(i);
+
+            if (subcolumn_name[name_length] == '.')
+                return on_continue(i, subcolumn_name.substr(name_length + 1));
         }
     }
 
-    return nullptr;
+    return ReturnType{};
+}
+
+DataTypePtr DataTypeTuple::tryGetSubcolumnType(const String & subcolumn_name) const
+{
+    if (subcolumn_name == MAIN_SUBCOLUMN_NAME)
+        return shared_from_this();
+
+    auto on_success = [&](size_t pos) { return elems[pos]; };
+    auto on_continue = [&](size_t pos, const String & next_subcolumn) { return elems[pos]->tryGetSubcolumnType(next_subcolumn); };
+
+    return getSubcolumnEntity(subcolumn_name, on_success, on_continue);
 }
 
 ColumnPtr DataTypeTuple::getSubcolumn(const String & subcolumn_name, const IColumn & column) const
 {
-    for (size_t i = 0; i < names.size(); ++i)
+    auto on_success = [&](size_t pos) { return extractElementColumn(column, pos).getPtr(); };
+    auto on_continue = [&](size_t pos, const String & next_subcolumn)
     {
-        if (startsWith(subcolumn_name, names[i]))
-        {
-            size_t name_length = names[i].size();
-            const auto & subcolumn = extractElementColumn(column, i);
+        return elems[pos]->getSubcolumn(next_subcolumn, extractElementColumn(column, pos));
+    };
 
-            if (subcolumn_name.size() == name_length)
-                return subcolumn.assumeMutable();
-
-            if (subcolumn_name[name_length] == '.')
-                return elems[i]->getSubcolumn(subcolumn_name.substr(name_length + 1), subcolumn);
-        }
-    }
+    if (auto subcolumn = getSubcolumnEntity(subcolumn_name, on_success, on_continue))
+        return subcolumn;
 
     throw Exception(ErrorCodes::ILLEGAL_COLUMN, "There is no subcolumn {} in type {}", subcolumn_name, getName());
 }
 
+SerializationPtr DataTypeTuple::getSubcolumnSerialization(
+    const String & subcolumn_name, const BaseSerializationGetter & base_serialization_getter) const
+{
+    auto on_success = [&](size_t pos)
+    {
+        return std::make_shared<SerializationTupleElement>(base_serialization_getter(*elems[pos]), names[pos]);
+    };
+
+    auto on_continue = [&](size_t pos, const String & next_subcolumn)
+    {
+        auto next_serialization = elems[pos]->getSubcolumnSerialization(next_subcolumn, base_serialization_getter);
+        return std::make_shared<SerializationTupleElement>(next_serialization, names[pos]);
+    };
+
+    if (auto serialization = getSubcolumnEntity(subcolumn_name, on_success, on_continue))
+        return serialization;
+
+    throw Exception(ErrorCodes::ILLEGAL_COLUMN, "There is no subcolumn {} in type {}", subcolumn_name, getName());
+}
+
+
+SerializationPtr DataTypeTuple::doGetDefaultSerialization() const
+{
+    SerializationTuple::ElementSerializations serializations(elems.size());
+    for (size_t i = 0; i < elems.size(); ++i)
+    {
+        auto serialization = elems[i]->getDefaultSerialization();
+        serializations[i] = std::make_shared<SerializationTupleElement>(serialization, names[i]);
+    }
+
+    return std::make_shared<SerializationTuple>(std::move(serializations), have_explicit_names);
+}
+
+SerializationPtr DataTypeTuple::getSerialization(const String & column_name, const StreamExistenceCallback & callback) const
+{
+    SerializationTuple::ElementSerializations serializations(elems.size());
+    for (size_t i = 0; i < elems.size(); ++i)
+    {
+        auto subcolumn_name = Nested::concatenateName(column_name, names[i]);
+        auto serializaion = elems[i]->getSerialization(subcolumn_name, callback);
+        serializations[i] = std::make_shared<SerializationTupleElement>(serializaion, names[i]);
+    }
+
+    return std::make_shared<SerializationTuple>(std::move(serializations), have_explicit_names);
+}
 
 static DataTypePtr create(const ASTPtr & arguments)
 {
diff --git a/src/DataTypes/DataTypeTuple.h b/src/DataTypes/DataTypeTuple.h
index 12ccf574c0e..e572b23f987 100644
--- a/src/DataTypes/DataTypeTuple.h
+++ b/src/DataTypes/DataTypeTuple.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DataTypes/DataTypeWithSimpleSerialization.h>
+#include <DataTypes/IDataType.h>
 
 
 namespace DB
@@ -16,7 +16,7 @@ namespace DB
   *
   * All tuples with same size and types of elements are equivalent for expressions, regardless to names of elements.
   */
-class DataTypeTuple final : public DataTypeWithSimpleSerialization
+class DataTypeTuple final : public IDataType
 {
 private:
     DataTypes elems;
@@ -37,50 +37,6 @@ public:
 
     bool canBeInsideNullable() const override { return false; }
 
-    void serializeBinary(const Field & field, WriteBuffer & ostr) const override;
-    void deserializeBinary(Field & field, ReadBuffer & istr) const override;
-    void serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr) const override;
-    void deserializeBinary(IColumn & column, ReadBuffer & istr) const override;
-    void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-    void deserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
-    void serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-    void deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
-    void serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-
-    /// Tuples in CSV format will be serialized as separate columns (that is, losing their nesting in the tuple).
-    void serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-    void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
-
-    /** Each sub-column in a tuple is serialized in separate stream.
-      */
-    void enumerateStreamsImpl(const StreamCallback & callback, SubstreamPath & path) const override;
-
-    void serializeBinaryBulkStatePrefixImpl(
-            SerializeBinaryBulkSettings & settings,
-            SerializeBinaryBulkStatePtr & state) const override;
-
-    void serializeBinaryBulkStateSuffixImpl(
-            SerializeBinaryBulkSettings & settings,
-            SerializeBinaryBulkStatePtr & state) const override;
-
-    void deserializeBinaryBulkStatePrefixImpl(
-            DeserializeBinaryBulkSettings & settings,
-            DeserializeBinaryBulkStatePtr & state) const override;
-
-    void serializeBinaryBulkWithMultipleStreamsImpl(
-            const IColumn & column,
-            size_t offset,
-            size_t limit,
-            SerializeBinaryBulkSettings & settings,
-            SerializeBinaryBulkStatePtr & state) const override;
-
-    void deserializeBinaryBulkWithMultipleStreamsImpl(
-            IColumn & column,
-            size_t limit,
-            DeserializeBinaryBulkSettings & settings,
-            DeserializeBinaryBulkStatePtr & state,
-            SubstreamsCache * cache) const override;
-
     MutableColumnPtr createColumn() const override;
 
     Field getDefault() const override;
@@ -99,6 +55,13 @@ public:
     DataTypePtr tryGetSubcolumnType(const String & subcolumn_name) const override;
     ColumnPtr getSubcolumn(const String & subcolumn_name, const IColumn & column) const override;
 
+    SerializationPtr getSerialization(const String & column_name, const StreamExistenceCallback & callback) const override;
+
+    SerializationPtr getSubcolumnSerialization(
+        const String & subcolumn_name, const BaseSerializationGetter & base_serialization_getter) const override;
+
+    SerializationPtr doGetDefaultSerialization() const override;
+
     const DataTypes & getElements() const { return elems; }
     const Strings & getElementNames() const { return names; }
 
@@ -106,6 +69,11 @@ public:
 
     bool haveExplicitNames() const { return have_explicit_names; }
     bool serializeNames() const { return serialize_names; }
+
+private:
+    template <typename OnSuccess, typename OnContinue>
+    auto getSubcolumnEntity(const String & subcolumn_name,
+        const OnSuccess & on_success, const OnContinue & on_continue) const;
 };
 
 }
diff --git a/src/DataTypes/DataTypeUUID.cpp b/src/DataTypes/DataTypeUUID.cpp
index b66cbadaef0..387ccc56a71 100644
--- a/src/DataTypes/DataTypeUUID.cpp
+++ b/src/DataTypes/DataTypeUUID.cpp
@@ -1,87 +1,20 @@
 #include <DataTypes/DataTypeUUID.h>
 #include <DataTypes/DataTypeFactory.h>
-#include <Columns/ColumnsNumber.h>
-#include <IO/WriteHelpers.h>
-#include <IO/ReadHelpers.h>
-#include <Common/assert_cast.h>
+#include <DataTypes/Serializations/SerializationUUID.h>
 
 
 namespace DB
 {
 
-void DataTypeUUID::serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const
-{
-    writeText(UUID(assert_cast<const ColumnUInt128 &>(column).getData()[row_num]), ostr);
-}
-
-void DataTypeUUID::deserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
-{
-    UUID x;
-    readText(x, istr);
-    assert_cast<ColumnUInt128 &>(column).getData().push_back(x);
-}
-
-void DataTypeUUID::deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
-{
-    deserializeText(column, istr, settings);
-}
-
-void DataTypeUUID::serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    serializeText(column, row_num, ostr, settings);
-}
-
-void DataTypeUUID::serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    writeChar('\'', ostr);
-    serializeText(column, row_num, ostr, settings);
-    writeChar('\'', ostr);
-}
-
-void DataTypeUUID::deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
-{
-    UUID x;
-    assertChar('\'', istr);
-    readText(x, istr);
-    assertChar('\'', istr);
-    assert_cast<ColumnUInt128 &>(column).getData().push_back(x);    /// It's important to do this at the end - for exception safety.
-}
-
-void DataTypeUUID::serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    writeChar('"', ostr);
-    serializeText(column, row_num, ostr, settings);
-    writeChar('"', ostr);
-}
-
-void DataTypeUUID::deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
-{
-    UUID x;
-    assertChar('"', istr);
-    readText(x, istr);
-    assertChar('"', istr);
-    assert_cast<ColumnUInt128 &>(column).getData().push_back(x);
-}
-
-void DataTypeUUID::serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    writeChar('"', ostr);
-    serializeText(column, row_num, ostr, settings);
-    writeChar('"', ostr);
-}
-
-void DataTypeUUID::deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
-{
-    UUID value;
-    readCSV(value, istr);
-    assert_cast<ColumnUInt128 &>(column).getData().push_back(value);
-}
-
 bool DataTypeUUID::equals(const IDataType & rhs) const
 {
     return typeid(rhs) == typeid(*this);
 }
 
+SerializationPtr DataTypeUUID::doGetDefaultSerialization() const
+{
+    return std::make_shared<SerializationUUID>();
+}
 
 void registerDataTypeUUID(DataTypeFactory & factory)
 {
diff --git a/src/DataTypes/DataTypeUUID.h b/src/DataTypes/DataTypeUUID.h
index de0c7c7d8cf..1546ca385a4 100644
--- a/src/DataTypes/DataTypeUUID.h
+++ b/src/DataTypes/DataTypeUUID.h
@@ -16,22 +16,13 @@ public:
 
     bool equals(const IDataType & rhs) const override;
 
-    void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-    void deserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
-    void serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-    void deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
-    void serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-    void deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
-    void serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-    void deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
-    void serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-    void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
-
     bool canBeUsedInBitOperations() const override { return true; }
     bool canBeInsideNullable() const override { return true; }
     bool canBeInsideLowCardinality() const override { return false; }
 
     bool canBePromoted() const override { return false; }
+
+    SerializationPtr doGetDefaultSerialization() const override;
 };
 
 }
diff --git a/src/DataTypes/DataTypesDecimal.cpp b/src/DataTypes/DataTypesDecimal.cpp
index 160e09d92d8..cecfcea8dac 100644
--- a/src/DataTypes/DataTypesDecimal.cpp
+++ b/src/DataTypes/DataTypesDecimal.cpp
@@ -1,4 +1,5 @@
 #include <DataTypes/DataTypesDecimal.h>
+#include <DataTypes/Serializations/SerializationDecimal.h>
 
 #include <Common/assert_cast.h>
 #include <Common/typeid_cast.h>
@@ -46,55 +47,6 @@ DataTypePtr DataTypeDecimal<T>::promoteNumericType() const
     return std::make_shared<PromotedType>(PromotedType::maxPrecision(), this->scale);
 }
 
-template <typename T>
-void DataTypeDecimal<T>::serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const
-{
-    T value = assert_cast<const ColumnType &>(column).getData()[row_num];
-    writeText(value, this->scale, ostr);
-}
-
-template <typename T>
-bool DataTypeDecimal<T>::tryReadText(T & x, ReadBuffer & istr, UInt32 precision, UInt32 scale)
-{
-    UInt32 unread_scale = scale;
-    if (!tryReadDecimalText(istr, x, precision, unread_scale))
-        return false;
-
-    if (common::mulOverflow(x.value, DecimalUtils::scaleMultiplier<T>(unread_scale), x.value))
-        return false;
-
-    return true;
-}
-
-template <typename T>
-void DataTypeDecimal<T>::readText(T & x, ReadBuffer & istr, UInt32 precision, UInt32 scale, bool csv)
-{
-    UInt32 unread_scale = scale;
-    if (csv)
-        readCSVDecimalText(istr, x, precision, unread_scale);
-    else
-        readDecimalText(istr, x, precision, unread_scale);
-
-    if (common::mulOverflow(x.value, DecimalUtils::scaleMultiplier<T>(unread_scale), x.value))
-        throw Exception("Decimal math overflow", ErrorCodes::DECIMAL_OVERFLOW);
-}
-
-template <typename T>
-void DataTypeDecimal<T>::deserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
-{
-    T x;
-    readText(x, istr);
-    assert_cast<ColumnType &>(column).getData().push_back(x);
-}
-
-template <typename T>
-void DataTypeDecimal<T>::deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
-{
-    T x;
-    readText(x, istr, true);
-    assert_cast<ColumnType &>(column).getData().push_back(x);
-}
-
 template <typename T>
 T DataTypeDecimal<T>::parseFromString(const String & str) const
 {
@@ -109,6 +61,12 @@ T DataTypeDecimal<T>::parseFromString(const String & str) const
     return x;
 }
 
+template <typename T>
+SerializationPtr DataTypeDecimal<T>::doGetDefaultSerialization() const
+{
+    return std::make_shared<SerializationDecimal<T>>(this->precision, this->scale);
+}
+
 
 static DataTypePtr create(const ASTPtr & arguments)
 {
diff --git a/src/DataTypes/DataTypesDecimal.h b/src/DataTypes/DataTypesDecimal.h
index 2b708b53be0..5aeac78b2ef 100644
--- a/src/DataTypes/DataTypesDecimal.h
+++ b/src/DataTypes/DataTypesDecimal.h
@@ -42,17 +42,9 @@ public:
     bool canBePromoted() const override { return true; }
     DataTypePtr promoteNumericType() const override;
 
-    void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-    void deserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
-    void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
-
     bool equals(const IDataType & rhs) const override;
-
     T parseFromString(const String & str) const;
-    void readText(T & x, ReadBuffer & istr, bool csv = false) const { readText(x, istr, this->precision, this->scale, csv); }
-
-    static void readText(T & x, ReadBuffer & istr, UInt32 precision_, UInt32 scale_, bool csv = false);
-    static bool tryReadText(T & x, ReadBuffer & istr, UInt32 precision_, UInt32 scale_);
+    SerializationPtr doGetDefaultSerialization() const override;
 };
 
 template <typename T>
diff --git a/src/DataTypes/DataTypesNumber.h b/src/DataTypes/DataTypesNumber.h
index 0ec655bde50..79272756465 100644
--- a/src/DataTypes/DataTypesNumber.h
+++ b/src/DataTypes/DataTypesNumber.h
@@ -3,6 +3,7 @@
 #include <type_traits>
 #include <Core/Field.h>
 #include <DataTypes/DataTypeNumberBase.h>
+#include <DataTypes/Serializations/SerializationNumber.h>
 
 
 namespace DB
@@ -25,6 +26,11 @@ class DataTypeNumber final : public DataTypeNumberBase<T>
         using PromotedType = DataTypeNumber<NearestFieldType<T>>;
         return std::make_shared<PromotedType>();
     }
+
+    SerializationPtr doGetDefaultSerialization() const override
+    {
+        return std::make_shared<SerializationNumber<T>>();
+    }
 };
 
 using DataTypeUInt8 = DataTypeNumber<UInt8>;
diff --git a/src/DataTypes/EnumValues.cpp b/src/DataTypes/EnumValues.cpp
new file mode 100644
index 00000000000..d4ca7e4dfdd
--- /dev/null
+++ b/src/DataTypes/EnumValues.cpp
@@ -0,0 +1,77 @@
+#include <DataTypes/EnumValues.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int SYNTAX_ERROR;
+    extern const int EMPTY_DATA_PASSED;
+    extern const int BAD_ARGUMENTS;
+}
+
+template <typename T>
+EnumValues<T>::EnumValues(const Values & values_)
+    : values(values_)
+{
+    if (values.empty())
+        throw Exception{"DataTypeEnum enumeration cannot be empty", ErrorCodes::EMPTY_DATA_PASSED};
+
+    std::sort(std::begin(values), std::end(values), [] (auto & left, auto & right)
+    {
+        return left.second < right.second;
+    });
+
+    fillMaps();
+}
+
+template <typename T>
+void EnumValues<T>::fillMaps()
+{
+    for (const auto & name_and_value : values)
+    {
+        const auto inserted_value = name_to_value_map.insert(
+            { StringRef{name_and_value.first}, name_and_value.second });
+
+        if (!inserted_value.second)
+            throw Exception{"Duplicate names in enum: '" + name_and_value.first + "' = " + toString(name_and_value.second)
+                    + " and " + toString(inserted_value.first->getMapped()),
+                ErrorCodes::SYNTAX_ERROR};
+
+        const auto inserted_name = value_to_name_map.insert(
+            { name_and_value.second, StringRef{name_and_value.first} });
+
+        if (!inserted_name.second)
+            throw Exception{"Duplicate values in enum: '" + name_and_value.first + "' = " + toString(name_and_value.second)
+                    + " and '" + toString((*inserted_name.first).first) + "'",
+                ErrorCodes::SYNTAX_ERROR};
+    }
+}
+
+template <typename T>
+T EnumValues<T>::getValue(StringRef field_name, bool try_treat_as_id) const
+{
+    const auto it = name_to_value_map.find(field_name);
+    if (!it)
+    {
+        /// It is used in CSV and TSV input formats. If we fail to find given string in
+        /// enum names, we will try to treat it as enum id.
+        if (try_treat_as_id)
+        {
+            T x;
+            ReadBufferFromMemory tmp_buf(field_name.data, field_name.size);
+            readText(x, tmp_buf);
+            /// Check if we reached end of the tmp_buf (otherwise field_name is not a number)
+            /// and try to find it in enum ids
+            if (tmp_buf.eof() && value_to_name_map.find(x) != value_to_name_map.end())
+                return x;
+        }
+        throw Exception{"Unknown element '" + field_name.toString() + "' for enum", ErrorCodes::BAD_ARGUMENTS};
+    }
+    return it->getMapped();
+}
+
+template class EnumValues<Int8>;
+template class EnumValues<Int16>;
+
+}
diff --git a/src/DataTypes/EnumValues.h b/src/DataTypes/EnumValues.h
new file mode 100644
index 00000000000..45ac30f9cd7
--- /dev/null
+++ b/src/DataTypes/EnumValues.h
@@ -0,0 +1,71 @@
+#pragma once
+
+#include <Common/HashTable/HashMap.h>
+#include <unordered_map>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int BAD_ARGUMENTS;
+}
+
+template <typename T>
+class EnumValues
+{
+public:
+    using Value = std::pair<std::string, T>;
+    using Values = std::vector<Value>;
+    using NameToValueMap = HashMap<StringRef, T, StringRefHash>;
+    using ValueToNameMap = std::unordered_map<T, StringRef>;
+
+private:
+    Values values;
+    NameToValueMap name_to_value_map;
+    ValueToNameMap value_to_name_map;
+
+    void fillMaps();
+
+public:
+    EnumValues(const Values & values_);
+
+    const Values & getValues() const { return values; }
+
+    auto findByValue(const T & value) const
+    {
+        const auto it = value_to_name_map.find(value);
+        if (it == std::end(value_to_name_map))
+            throw Exception{"Unexpected value " + toString(value) + " in enum", ErrorCodes::BAD_ARGUMENTS};
+
+        return it;
+    }
+
+    const StringRef & getNameForValue(const T & value) const
+    {
+        return findByValue(value)->second;
+    }
+
+    T getValue(StringRef field_name, bool try_treat_as_id = false) const;
+
+    template <typename TValues>
+    bool containsAll(const TValues & rhs_values) const
+    {
+        auto check = [&](const auto & value)
+        {
+            auto it = name_to_value_map.find(value.first);
+            /// If we don't have this name, than we have to be sure,
+            /// that this value exists in enum
+            if (it == name_to_value_map.end())
+                return value_to_name_map.count(value.second) > 0;
+
+            /// If we have this name, than it should have the same value
+            return it->value.second == value.second;
+        };
+
+        return std::all_of(rhs_values.begin(), rhs_values.end(), check);
+    }
+};
+
+}
+
diff --git a/src/DataTypes/IDataType.cpp b/src/DataTypes/IDataType.cpp
index 5582a8698e0..c0679557ec9 100644
--- a/src/DataTypes/IDataType.cpp
+++ b/src/DataTypes/IDataType.cpp
@@ -11,6 +11,7 @@
 #include <DataTypes/IDataType.h>
 #include <DataTypes/DataTypeCustom.h>
 #include <DataTypes/NestedUtils.h>
+#include <DataTypes/Serializations/SerializationTupleElement.h>
 
 
 namespace DB
@@ -18,54 +19,11 @@ namespace DB
 
 namespace ErrorCodes
 {
-    extern const int MULTIPLE_STREAMS_REQUIRED;
     extern const int LOGICAL_ERROR;
     extern const int DATA_TYPE_CANNOT_BE_PROMOTED;
     extern const int ILLEGAL_COLUMN;
 }
 
-String IDataType::Substream::toString() const
-{
-    switch (type)
-    {
-        case ArrayElements:
-            return "ArrayElements";
-        case ArraySizes:
-            return "ArraySizes";
-        case NullableElements:
-            return "NullableElements";
-        case NullMap:
-            return "NullMap";
-        case TupleElement:
-            return "TupleElement(" + tuple_element_name + ", "
-                + std::to_string(escape_tuple_delimiter) + ")";
-        case DictionaryKeys:
-            return "DictionaryKeys";
-        case DictionaryIndexes:
-            return "DictionaryIndexes";
-    }
-
-    __builtin_unreachable();
-}
-
-String IDataType::SubstreamPath::toString() const
-{
-    WriteBufferFromOwnString wb;
-    wb << "{";
-    for (size_t i = 0; i < size(); ++i)
-    {
-        if (i != 0)
-            wb << ", ";
-        wb << at(i).toString();
-    }
-    wb << "}";
-    return wb.str();
-}
-
-IDataType::IDataType() : custom_name(nullptr), custom_text_serialization(nullptr), custom_streams(nullptr)
-{
-}
-
 IDataType::~IDataType() = default;
 
 String IDataType::getName() const
@@ -119,21 +77,19 @@ DataTypePtr IDataType::promoteNumericType() const
     throw Exception("Data type " + getName() + " can't be promoted.", ErrorCodes::DATA_TYPE_CANNOT_BE_PROMOTED);
 }
 
-void IDataType::serializeBinaryBulk(const IColumn &, WriteBuffer &, size_t, size_t) const
-{
-    throw Exception("Data type " + getName() + " must be serialized with multiple streams", ErrorCodes::MULTIPLE_STREAMS_REQUIRED);
-}
-
-void IDataType::deserializeBinaryBulk(IColumn &, ReadBuffer &, size_t, double) const
-{
-    throw Exception("Data type " + getName() + " must be deserialized with multiple streams", ErrorCodes::MULTIPLE_STREAMS_REQUIRED);
-}
-
 size_t IDataType::getSizeOfValueInMemory() const
 {
     throw Exception("Value of type " + getName() + " in memory is not of fixed size.", ErrorCodes::LOGICAL_ERROR);
 }
 
+DataTypePtr IDataType::tryGetSubcolumnType(const String & subcolumn_name) const
+{
+    if (subcolumn_name == MAIN_SUBCOLUMN_NAME)
+        return shared_from_this();
+
+    return nullptr;
+}
+
 DataTypePtr IDataType::getSubcolumnType(const String & subcolumn_name) const
 {
     auto subcolumn_type = tryGetSubcolumnType(subcolumn_name);
@@ -151,14 +107,14 @@ ColumnPtr IDataType::getSubcolumn(const String & subcolumn_name, const IColumn &
 Names IDataType::getSubcolumnNames() const
 {
     NameSet res;
-    enumerateStreams([&res, this](const SubstreamPath & substream_path, const IDataType & /* substream_type */)
+    getDefaultSerialization()->enumerateStreams([&res, this](const ISerialization::SubstreamPath & substream_path)
     {
-        SubstreamPath new_path;
+        ISerialization::SubstreamPath new_path;
         /// Iterate over path to try to get intermediate subcolumns for complex nested types.
         for (const auto & elem : substream_path)
         {
             new_path.push_back(elem);
-            auto subcolumn_name = getSubcolumnNameForStream(new_path);
+            auto subcolumn_name = ISerialization::getSubcolumnNameForStream(new_path);
             if (!subcolumn_name.empty() && tryGetSubcolumnType(subcolumn_name))
                 res.insert(subcolumn_name);
         }
@@ -167,287 +123,72 @@ Names IDataType::getSubcolumnNames() const
     return Names(std::make_move_iterator(res.begin()), std::make_move_iterator(res.end()));
 }
 
-static String getNameForSubstreamPath(
-    String stream_name,
-    const IDataType::SubstreamPath & path,
-    bool escape_tuple_delimiter)
-{
-    size_t array_level = 0;
-    for (const auto & elem : path)
-    {
-        if (elem.type == IDataType::Substream::NullMap)
-            stream_name += ".null";
-        else if (elem.type == IDataType::Substream::ArraySizes)
-            stream_name += ".size" + toString(array_level);
-        else if (elem.type == IDataType::Substream::ArrayElements)
-            ++array_level;
-        else if (elem.type == IDataType::Substream::DictionaryKeys)
-            stream_name += ".dict";
-        else if (elem.type == IDataType::Substream::TupleElement)
-        {
-            /// For compatibility reasons, we use %2E (escaped dot) instead of dot.
-            /// Because nested data may be represented not by Array of Tuple,
-            ///  but by separate Array columns with names in a form of a.b,
-            ///  and name is encoded as a whole.
-            stream_name += (escape_tuple_delimiter && elem.escape_tuple_delimiter ?
-                escapeForFileName(".") : ".") + escapeForFileName(elem.tuple_element_name);
-        }
-    }
-
-    return stream_name;
-}
-
-String IDataType::getFileNameForStream(const NameAndTypePair & column, const SubstreamPath & path)
-{
-    auto name_in_storage = column.getNameInStorage();
-    auto nested_storage_name = Nested::extractTableName(name_in_storage);
-
-    if (name_in_storage != nested_storage_name && (path.size() == 1 && path[0].type == IDataType::Substream::ArraySizes))
-        name_in_storage = nested_storage_name;
-
-    auto stream_name = escapeForFileName(name_in_storage);
-    return getNameForSubstreamPath(std::move(stream_name), path, true);
-}
-
-String IDataType::getSubcolumnNameForStream(const SubstreamPath & path)
-{
-    auto subcolumn_name = getNameForSubstreamPath("", path, false);
-    if (!subcolumn_name.empty())
-        subcolumn_name = subcolumn_name.substr(1); // It starts with a dot.
-
-    return subcolumn_name;
-}
-
-bool IDataType::isSpecialCompressionAllowed(const SubstreamPath & path)
-{
-    for (const Substream & elem : path)
-    {
-        if (elem.type == Substream::NullMap
-            || elem.type == Substream::ArraySizes
-            || elem.type == Substream::DictionaryIndexes)
-            return false;
-    }
-    return true;
-}
-
 void IDataType::insertDefaultInto(IColumn & column) const
 {
     column.insertDefault();
 }
 
-void IDataType::enumerateStreams(const StreamCallback & callback, SubstreamPath & path) const
-{
-    if (custom_streams)
-        custom_streams->enumerateStreams(callback, path);
-    else
-        enumerateStreamsImpl(callback, path);
-}
-
-void IDataType::serializeBinaryBulkStatePrefix(
-    SerializeBinaryBulkSettings & settings,
-    SerializeBinaryBulkStatePtr & state) const
-{
-    if (custom_streams)
-        custom_streams->serializeBinaryBulkStatePrefix(settings, state);
-    else
-        serializeBinaryBulkStatePrefixImpl(settings, state);
-}
-
-void IDataType::serializeBinaryBulkStateSuffix(
-    SerializeBinaryBulkSettings & settings,
-    SerializeBinaryBulkStatePtr & state) const
-{
-    if (custom_streams)
-        custom_streams->serializeBinaryBulkStateSuffix(settings, state);
-    else
-        serializeBinaryBulkStateSuffixImpl(settings, state);
-}
-
-void IDataType::deserializeBinaryBulkStatePrefix(
-    DeserializeBinaryBulkSettings & settings,
-    DeserializeBinaryBulkStatePtr & state) const
-{
-    if (custom_streams)
-        custom_streams->deserializeBinaryBulkStatePrefix(settings, state);
-    else
-        deserializeBinaryBulkStatePrefixImpl(settings, state);
-}
-
-void IDataType::serializeBinaryBulkWithMultipleStreams(
-    const IColumn & column,
-    size_t offset,
-    size_t limit,
-    SerializeBinaryBulkSettings & settings,
-    SerializeBinaryBulkStatePtr & state) const
-{
-    if (custom_streams)
-        custom_streams->serializeBinaryBulkWithMultipleStreams(column, offset, limit, settings, state);
-    else
-        serializeBinaryBulkWithMultipleStreamsImpl(column, offset, limit, settings, state);
-}
-
-void IDataType::deserializeBinaryBulkWithMultipleStreamsImpl(
-    IColumn & column,
-    size_t limit,
-    DeserializeBinaryBulkSettings & settings,
-    DeserializeBinaryBulkStatePtr & /* state */,
-    SubstreamsCache * /* cache */) const
-{
-    if (ReadBuffer * stream = settings.getter(settings.path))
-        deserializeBinaryBulk(column, *stream, limit, settings.avg_value_size_hint);
-}
-
-
-void IDataType::deserializeBinaryBulkWithMultipleStreams(
-    ColumnPtr & column,
-    size_t limit,
-    DeserializeBinaryBulkSettings & settings,
-    DeserializeBinaryBulkStatePtr & state,
-    SubstreamsCache * cache) const
-{
-    if (custom_streams)
-    {
-        custom_streams->deserializeBinaryBulkWithMultipleStreams(column, limit, settings, state, cache);
-        return;
-    }
-
-    /// Do not cache complex type, because they can be constructed
-    /// from their subcolumns, which are in cache.
-    if (!haveSubtypes())
-    {
-        auto cached_column = getFromSubstreamsCache(cache, settings.path);
-        if (cached_column)
-        {
-            column = cached_column;
-            return;
-        }
-    }
-
-    auto mutable_column = column->assumeMutable();
-    deserializeBinaryBulkWithMultipleStreamsImpl(*mutable_column, limit, settings, state, cache);
-    column = std::move(mutable_column);
-
-    if (!haveSubtypes())
-        addToSubstreamsCache(cache, settings.path, column);
-}
-
-void IDataType::serializeAsTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    if (custom_text_serialization)
-        custom_text_serialization->serializeTextEscaped(column, row_num, ostr, settings);
-    else
-        serializeTextEscaped(column, row_num, ostr, settings);
-}
-
-void IDataType::deserializeAsTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
-{
-    if (custom_text_serialization)
-        custom_text_serialization->deserializeTextEscaped(column, istr, settings);
-    else
-        deserializeTextEscaped(column, istr, settings);
-}
-
-void IDataType::serializeAsTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    if (custom_text_serialization)
-        custom_text_serialization->serializeTextQuoted(column, row_num, ostr, settings);
-    else
-        serializeTextQuoted(column, row_num, ostr, settings);
-}
-
-void IDataType::deserializeAsTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
-{
-    if (custom_text_serialization)
-        custom_text_serialization->deserializeTextQuoted(column, istr, settings);
-    else
-        deserializeTextQuoted(column, istr, settings);
-}
-
-void IDataType::serializeAsTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    if (custom_text_serialization)
-        custom_text_serialization->serializeTextCSV(column, row_num, ostr, settings);
-    else
-        serializeTextCSV(column, row_num, ostr, settings);
-}
-
-void IDataType::deserializeAsTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
-{
-    if (custom_text_serialization)
-        custom_text_serialization->deserializeTextCSV(column, istr, settings);
-    else
-        deserializeTextCSV(column, istr, settings);
-}
-
-void IDataType::serializeAsText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    if (custom_text_serialization)
-        custom_text_serialization->serializeText(column, row_num, ostr, settings);
-    else
-        serializeText(column, row_num, ostr, settings);
-}
-
-void IDataType::deserializeAsWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
-{
-    if (custom_text_serialization)
-        custom_text_serialization->deserializeWholeText(column, istr, settings);
-    else
-        deserializeWholeText(column, istr, settings);
-}
-
-void IDataType::serializeAsTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    if (custom_text_serialization)
-        custom_text_serialization->serializeTextJSON(column, row_num, ostr, settings);
-    else
-        serializeTextJSON(column, row_num, ostr, settings);
-}
-
-void IDataType::deserializeAsTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
-{
-    if (custom_text_serialization)
-        custom_text_serialization->deserializeTextJSON(column, istr, settings);
-    else
-        deserializeTextJSON(column, istr, settings);
-}
-
-void IDataType::serializeAsTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    if (custom_text_serialization)
-        custom_text_serialization->serializeTextXML(column, row_num, ostr, settings);
-    else
-        serializeTextXML(column, row_num, ostr, settings);
-}
-
 void IDataType::setCustomization(DataTypeCustomDescPtr custom_desc_) const
 {
     /// replace only if not null
     if (custom_desc_->name)
         custom_name = std::move(custom_desc_->name);
 
-    if (custom_desc_->text_serialization)
-        custom_text_serialization = std::move(custom_desc_->text_serialization);
-
-    if (custom_desc_->streams)
-        custom_streams = std::move(custom_desc_->streams);
+    if (custom_desc_->serialization)
+        custom_serialization = std::move(custom_desc_->serialization);
 }
 
-void IDataType::addToSubstreamsCache(SubstreamsCache * cache, const SubstreamPath & path, ColumnPtr column)
+SerializationPtr IDataType::getDefaultSerialization() const
 {
-    if (cache && !path.empty())
-        cache->emplace(getSubcolumnNameForStream(path), column);
+    if (custom_serialization)
+        return custom_serialization;
+
+    return doGetDefaultSerialization();
 }
 
-ColumnPtr IDataType::getFromSubstreamsCache(SubstreamsCache * cache, const SubstreamPath & path)
+SerializationPtr IDataType::getSubcolumnSerialization(const String & subcolumn_name, const BaseSerializationGetter &) const
 {
-    if (!cache || path.empty())
-        return nullptr;
+    throw Exception(ErrorCodes::ILLEGAL_COLUMN, "There is no subcolumn {} in type {}", subcolumn_name, getName());
+}
 
-    auto it = cache->find(getSubcolumnNameForStream(path));
-    if (it == cache->end())
-        return nullptr;
+// static
+SerializationPtr IDataType::getSerialization(const NameAndTypePair & column, const IDataType::StreamExistenceCallback & callback)
+{
+    if (column.isSubcolumn())
+    {
+        /// Wrap to custom serialization deepest subcolumn, which is represented in non-complex type.
+        auto base_serialization_getter = [&](const IDataType & subcolumn_type)
+        {
+            return subcolumn_type.getSerialization(column.name, callback);
+        };
 
-    return it->second;
+        auto type_in_storage = column.getTypeInStorage();
+        return type_in_storage->getSubcolumnSerialization(column.getSubcolumnName(), base_serialization_getter);
+    }
+
+    return column.type->getSerialization(column.name, callback);
+}
+
+SerializationPtr IDataType::getSerialization(const String &, const StreamExistenceCallback &) const
+{
+    return getDefaultSerialization();
+}
+
+DataTypePtr IDataType::getTypeForSubstream(const ISerialization::SubstreamPath & substream_path) const
+{
+    auto type = tryGetSubcolumnType(ISerialization::getSubcolumnNameForStream(substream_path));
+    if (type)
+        return type->getSubcolumnType(MAIN_SUBCOLUMN_NAME);
+
+    return getSubcolumnType(MAIN_SUBCOLUMN_NAME);
+}
+
+void IDataType::enumerateStreams(const SerializationPtr & serialization, const StreamCallbackWithType & callback, ISerialization::SubstreamPath & path) const
+{
+    serialization->enumerateStreams([&](const ISerialization::SubstreamPath & substream_path)
+    {
+        callback(substream_path, *getTypeForSubstream(substream_path));
+    }, path);
 }
 
 }
diff --git a/src/DataTypes/IDataType.h b/src/DataTypes/IDataType.h
index c9c848a8037..9b762cfa4c5 100644
--- a/src/DataTypes/IDataType.h
+++ b/src/DataTypes/IDataType.h
@@ -5,7 +5,7 @@
 #include <boost/noncopyable.hpp>
 #include <Core/Names.h>
 #include <Core/Types.h>
-#include <DataTypes/DataTypeCustom_fwd.h>
+#include <DataTypes/DataTypeCustom.h>
 
 
 namespace DB
@@ -27,19 +27,25 @@ using DataTypePtr = std::shared_ptr<const IDataType>;
 using DataTypes = std::vector<DataTypePtr>;
 
 struct NameAndTypePair;
+class SerializationInfo;
 
 
 /** Properties of data type.
-  * Contains methods for serialization/deserialization.
+  *
+  * Contains methods for getting serialization instances.
+  * One data type may have different serializations, which can be chosen
+  * dynamically before reading or writing, according to information about
+  * column content (see `getSerialization` methods).
+  *
   * Implementations of this interface represent a data type (example: UInt8)
   *  or parametric family of data types (example: Array(...)).
   *
   * DataType is totally immutable object. You can always share them.
   */
-class IDataType : private boost::noncopyable
+class IDataType : private boost::noncopyable, public std::enable_shared_from_this<IDataType>
 {
 public:
-    IDataType();
+    IDataType() = default;
     virtual ~IDataType();
 
     /// Compile time flag. If false, then if C++ types are the same, then SQL types are also the same.
@@ -57,275 +63,47 @@ public:
     /// Data type id. It's used for runtime type checks.
     virtual TypeIndex getTypeId() const = 0;
 
-    /** Binary serialization for range of values in column - for writing to disk/network, etc.
-      *
-      * Some data types are represented in multiple streams while being serialized.
-      * Example:
-      * - Arrays are represented as stream of all elements and stream of array sizes.
-      * - Nullable types are represented as stream of values (with unspecified values in place of NULLs) and stream of NULL flags.
-      *
-      * Different streams are identified by "path".
-      * If the data type require single stream (it's true for most of data types), the stream will have empty path.
-      * Otherwise, the path can have components like "array elements", "array sizes", etc.
-      *
-      * For multidimensional arrays, path can have arbitrary length.
-      * As an example, for 2-dimensional arrays of numbers we have at least three streams:
-      * - array sizes;                      (sizes of top level arrays)
-      * - array elements / array sizes;     (sizes of second level (nested) arrays)
-      * - array elements / array elements;  (the most deep elements, placed contiguously)
-      *
-      * Descendants must override either serializeBinaryBulk, deserializeBinaryBulk methods (for simple cases with single stream)
-      *  or serializeBinaryBulkWithMultipleStreams, deserializeBinaryBulkWithMultipleStreams, enumerateStreams methods (for cases with multiple streams).
-      *
-      * Default implementations of ...WithMultipleStreams methods will call serializeBinaryBulk, deserializeBinaryBulk for single stream.
-      */
-
-    struct Substream
-    {
-        enum Type
-        {
-            ArrayElements,
-            ArraySizes,
-
-            NullableElements,
-            NullMap,
-
-            TupleElement,
-
-            DictionaryKeys,
-            DictionaryIndexes,
-        };
-        Type type;
-
-        /// Index of tuple element, starting at 1 or name.
-        String tuple_element_name;
-
-        /// Do we need to escape a dot in filenames for tuple elements.
-        bool escape_tuple_delimiter = true;
-
-        Substream(Type type_) : type(type_) {}
-
-        String toString() const;
-    };
-
-    struct SubstreamPath : public std::vector<Substream>
-    {
-        String toString() const;
-    };
-
-    /// Cache for common substreams of one type, but possible different its subcolumns.
-    /// E.g. sizes of arrays of Nested data type.
-    using SubstreamsCache = std::unordered_map<String, ColumnPtr>;
-
-    using StreamCallback = std::function<void(const SubstreamPath &, const IDataType &)>;
-
-    void enumerateStreams(const StreamCallback & callback, SubstreamPath & path) const;
-    void enumerateStreams(const StreamCallback & callback, SubstreamPath && path) const { enumerateStreams(callback, path); }
-    void enumerateStreams(const StreamCallback & callback) const { enumerateStreams(callback, {}); }
-
-    virtual DataTypePtr tryGetSubcolumnType(const String & /* subcolumn_name */) const { return nullptr; }
+    static constexpr auto MAIN_SUBCOLUMN_NAME = "__main";
+    virtual DataTypePtr tryGetSubcolumnType(const String & subcolumn_name) const;
     DataTypePtr getSubcolumnType(const String & subcolumn_name) const;
     virtual ColumnPtr getSubcolumn(const String & subcolumn_name, const IColumn & column) const;
     Names getSubcolumnNames() const;
 
-    using OutputStreamGetter = std::function<WriteBuffer*(const SubstreamPath &)>;
-    using InputStreamGetter = std::function<ReadBuffer*(const SubstreamPath &)>;
+    /// Returns default serialization of data type.
+    SerializationPtr getDefaultSerialization() const;
 
-    struct SerializeBinaryBulkState
-    {
-        virtual ~SerializeBinaryBulkState() = default;
-    };
-    struct DeserializeBinaryBulkState
-    {
-        virtual ~DeserializeBinaryBulkState() = default;
-    };
+    /// Asks whether the stream with given name exists in table.
+    /// If callback returned true for all streams, which are required for
+    /// one of serialization types, that serialization will be chosen for reading.
+    /// If callback always returned false, the default serialization will be chosen.
+    using StreamExistenceCallback = std::function<bool(const String &)>;
+    using BaseSerializationGetter = std::function<SerializationPtr(const IDataType &)>;
 
-    using SerializeBinaryBulkStatePtr = std::shared_ptr<SerializeBinaryBulkState>;
-    using DeserializeBinaryBulkStatePtr = std::shared_ptr<DeserializeBinaryBulkState>;
+    /// Chooses serialization for reading of one column or subcolumns by
+    /// checking existence of substreams using callback.
+    static SerializationPtr getSerialization(
+        const NameAndTypePair & column,
+        const StreamExistenceCallback & callback = [](const String &) { return false; });
 
-    struct SerializeBinaryBulkSettings
-    {
-        OutputStreamGetter getter;
-        SubstreamPath path;
+    virtual SerializationPtr getSerialization(const String & column_name, const StreamExistenceCallback & callback) const;
 
-        size_t low_cardinality_max_dictionary_size = 0;
-        bool low_cardinality_use_single_dictionary_for_part = true;
+    /// Returns serialization wrapper for reading one particular subcolumn of data type.
+    virtual SerializationPtr getSubcolumnSerialization(
+        const String & subcolumn_name, const BaseSerializationGetter & base_serialization_getter) const;
 
-        bool position_independent_encoding = true;
-    };
+    using StreamCallbackWithType = std::function<void(const ISerialization::SubstreamPath &, const IDataType &)>;
 
-    struct DeserializeBinaryBulkSettings
-    {
-        InputStreamGetter getter;
-        SubstreamPath path;
-
-        /// True if continue reading from previous positions in file. False if made fseek to the start of new granule.
-        bool continuous_reading = true;
-
-        bool position_independent_encoding = true;
-        /// If not zero, may be used to avoid reallocations while reading column of String type.
-        double avg_value_size_hint = 0;
-    };
-
-    /// Call before serializeBinaryBulkWithMultipleStreams chain to write something before first mark.
-    void serializeBinaryBulkStatePrefix(
-        SerializeBinaryBulkSettings & settings,
-        SerializeBinaryBulkStatePtr & state) const;
-
-    /// Call after serializeBinaryBulkWithMultipleStreams chain to finish serialization.
-    void serializeBinaryBulkStateSuffix(
-        SerializeBinaryBulkSettings & settings,
-        SerializeBinaryBulkStatePtr & state) const;
-
-    /// Call before before deserializeBinaryBulkWithMultipleStreams chain to get DeserializeBinaryBulkStatePtr.
-    void deserializeBinaryBulkStatePrefix(
-        DeserializeBinaryBulkSettings & settings,
-        DeserializeBinaryBulkStatePtr & state) const;
-
-    /** 'offset' and 'limit' are used to specify range.
-      * limit = 0 - means no limit.
-      * offset must be not greater than size of column.
-      * offset + limit could be greater than size of column
-      *  - in that case, column is serialized till the end.
-      */
-    void serializeBinaryBulkWithMultipleStreams(
-        const IColumn & column,
-        size_t offset,
-        size_t limit,
-        SerializeBinaryBulkSettings & settings,
-        SerializeBinaryBulkStatePtr & state) const;
-
-    /// Read no more than limit values and append them into column.
-    void deserializeBinaryBulkWithMultipleStreams(
-        ColumnPtr & column,
-        size_t limit,
-        DeserializeBinaryBulkSettings & settings,
-        DeserializeBinaryBulkStatePtr & state,
-        SubstreamsCache * cache = nullptr) const;
-
-    /** Override these methods for data types that require just single stream (most of data types).
-      */
-    virtual void serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, size_t offset, size_t limit) const;
-    virtual void deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, size_t limit, double avg_value_size_hint) const;
-
-    /** Serialization/deserialization of individual values.
-      *
-      * These are helper methods for implementation of various formats to input/output for user (like CSV, JSON, etc.).
-      * There is no one-to-one correspondence between formats and these methods.
-      * For example, TabSeparated and Pretty formats could use same helper method serializeTextEscaped.
-      *
-      * For complex data types (like arrays) binary serde for individual values may differ from bulk serde.
-      * For example, if you serialize single array, it will be represented as its size and elements in single contiguous stream,
-      *  but if you bulk serialize column with arrays, then sizes and elements will be written to separate streams.
-      */
-
-    /// There is two variants for binary serde. First variant work with Field.
-    virtual void serializeBinary(const Field & field, WriteBuffer & ostr) const = 0;
-    virtual void deserializeBinary(Field & field, ReadBuffer & istr) const = 0;
-
-    /// Other variants takes a column, to avoid creating temporary Field object.
-    /// Column must be non-constant.
-
-    /// Serialize one value of a column at specified row number.
-    virtual void serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr) const = 0;
-    /// Deserialize one value and insert into a column.
-    /// If method will throw an exception, then column will be in same state as before call to method.
-    virtual void deserializeBinary(IColumn & column, ReadBuffer & istr) const = 0;
-
-    /** Text serialization with escaping but without quoting.
-      */
-    void serializeAsTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const;
-
-    void deserializeAsTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const;
-
-    /** Text serialization as a literal that may be inserted into a query.
-      */
-    void serializeAsTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const;
-
-    void deserializeAsTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const;
-
-    /** Text serialization for the CSV format.
-      */
-    void serializeAsTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const;
-    void deserializeAsTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings &) const;
-
-    /** Text serialization for displaying on a terminal or saving into a text file, and the like.
-      * Without escaping or quoting.
-      */
-    void serializeAsText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const;
-
-    /** Text deserialization in case when buffer contains only one value, without any escaping and delimiters.
-      */
-    void deserializeAsWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const;
-
-    /** Text serialization intended for using in JSON format.
-      */
-    void serializeAsTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const;
-    void deserializeAsTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const;
-
-    /** Text serialization for putting into the XML format.
-      */
-    void serializeAsTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const;
+    void enumerateStreams(const SerializationPtr & serialization, const StreamCallbackWithType & callback, ISerialization::SubstreamPath & path) const;
+    void enumerateStreams(const SerializationPtr & serialization, const StreamCallbackWithType & callback, ISerialization::SubstreamPath && path) const { enumerateStreams(serialization, callback, path); }
+    void enumerateStreams(const SerializationPtr & serialization, const StreamCallbackWithType & callback) const { enumerateStreams(serialization, callback, {}); }
 
 protected:
     virtual String doGetName() const;
+    virtual SerializationPtr doGetDefaultSerialization() const = 0;
 
-    virtual void enumerateStreamsImpl(const StreamCallback & callback, SubstreamPath & path) const
-    {
-        callback(path, *this);
-    }
-
-    virtual void serializeBinaryBulkStatePrefixImpl(
-        SerializeBinaryBulkSettings & /*settings*/,
-        SerializeBinaryBulkStatePtr & /*state*/) const {}
-
-    virtual void serializeBinaryBulkStateSuffixImpl(
-        SerializeBinaryBulkSettings & /*settings*/,
-        SerializeBinaryBulkStatePtr & /*state*/) const {}
-
-    virtual void deserializeBinaryBulkStatePrefixImpl(
-        DeserializeBinaryBulkSettings & /*settings*/,
-        DeserializeBinaryBulkStatePtr & /*state*/) const {}
-
-    virtual void serializeBinaryBulkWithMultipleStreamsImpl(
-        const IColumn & column,
-        size_t offset,
-        size_t limit,
-        SerializeBinaryBulkSettings & settings,
-        SerializeBinaryBulkStatePtr & /*state*/) const
-    {
-        if (WriteBuffer * stream = settings.getter(settings.path))
-            serializeBinaryBulk(column, *stream, offset, limit);
-    }
-
-    virtual void deserializeBinaryBulkWithMultipleStreamsImpl(
-        IColumn & column,
-        size_t limit,
-        DeserializeBinaryBulkSettings & settings,
-        DeserializeBinaryBulkStatePtr & state,
-        SubstreamsCache * cache) const;
-
-    /// Default implementations of text serialization in case of 'custom_text_serialization' is not set.
-
-    virtual void serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const = 0;
-    virtual void deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const = 0;
-    virtual void serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const = 0;
-    virtual void deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const = 0;
-    virtual void serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const = 0;
-    virtual void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings &) const = 0;
-    virtual void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const = 0;
-    virtual void deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const = 0;
-    virtual void serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const = 0;
-    virtual void deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const = 0;
-    virtual void serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-    {
-        serializeText(column, row_num, ostr, settings);
-    }
+    DataTypePtr getTypeForSubstream(const ISerialization::SubstreamPath & substream_path) const;
 
 public:
-    static void addToSubstreamsCache(SubstreamsCache * cache, const SubstreamPath & path, ColumnPtr column);
-    static ColumnPtr getFromSubstreamsCache(SubstreamsCache * cache, const SubstreamPath & path);
-
     /** Create empty column for corresponding type.
       */
     virtual MutableColumnPtr createColumn() const = 0;
@@ -357,7 +135,6 @@ public:
     /// Checks that two instances belong to the same type
     virtual bool equals(const IDataType & rhs) const = 0;
 
-
     /// Various properties on behaviour of data type.
 
     /** The data type is dependent on parameters and types with different parameters are different.
@@ -483,27 +260,20 @@ public:
     /// Updates avg_value_size_hint for newly read column. Uses to optimize deserialization. Zero expected for first column.
     static void updateAvgValueSizeHint(const IColumn & column, double & avg_value_size_hint);
 
-    static String getFileNameForStream(const NameAndTypePair & column, const SubstreamPath & path);
-    static String getSubcolumnNameForStream(const SubstreamPath & path);
-
-    /// Substream path supports special compression methods like codec Delta.
-    /// For all other substreams (like ArraySizes, NullMasks, etc.) we use only
-    /// generic compression codecs like LZ4.
-    static bool isSpecialCompressionAllowed(const SubstreamPath & path);
 protected:
     friend class DataTypeFactory;
     friend class AggregateFunctionSimpleState;
+
     /// Customize this DataType
     void setCustomization(DataTypeCustomDescPtr custom_desc_) const;
 
     /// This is mutable to allow setting custom name and serialization on `const IDataType` post construction.
     mutable DataTypeCustomNamePtr custom_name;
-    mutable DataTypeCustomTextSerializationPtr custom_text_serialization;
-    mutable DataTypeCustomStreamsPtr custom_streams;
+    mutable SerializationPtr custom_serialization;
 
 public:
     const IDataTypeCustomName * getCustomName() const { return custom_name.get(); }
-    const IDataTypeCustomStreams * getCustomStreams() const { return custom_streams.get(); }
+    const ISerialization * getCustomSerialization() const { return custom_serialization.get(); }
 };
 
 
diff --git a/src/DataTypes/IDataTypeDummy.h b/src/DataTypes/IDataTypeDummy.h
index 08cc0778a6e..ca522d1c9b4 100644
--- a/src/DataTypes/IDataTypeDummy.h
+++ b/src/DataTypes/IDataTypeDummy.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DataTypes/DataTypeWithSimpleSerialization.h>
+#include <DataTypes/IDataType.h>
 #include <Core/Field.h>
 
 
@@ -17,7 +17,7 @@ namespace ErrorCodes
   *
   * That is, this class is used just to distinguish the corresponding data type from the others.
   */
-class IDataTypeDummy : public DataTypeWithSimpleSerialization
+class IDataTypeDummy : public IDataType
 {
 private:
     [[noreturn]] void throwNoSerialization() const
@@ -26,15 +26,6 @@ private:
     }
 
 public:
-    void serializeBinary(const Field &, WriteBuffer &) const override                       { throwNoSerialization(); }
-    void deserializeBinary(Field &, ReadBuffer &) const override                            { throwNoSerialization(); }
-    void serializeBinary(const IColumn &, size_t, WriteBuffer &) const override             { throwNoSerialization(); }
-    void deserializeBinary(IColumn &, ReadBuffer &) const override                          { throwNoSerialization(); }
-    void serializeBinaryBulk(const IColumn &, WriteBuffer &, size_t, size_t) const override { throwNoSerialization(); }
-    void deserializeBinaryBulk(IColumn &, ReadBuffer &, size_t, double) const override      { throwNoSerialization(); }
-    void serializeText(const IColumn &, size_t, WriteBuffer &, const FormatSettings &) const override { throwNoSerialization(); }
-    void deserializeText(IColumn &, ReadBuffer &, const FormatSettings &) const override    { throwNoSerialization(); }
-
     MutableColumnPtr createColumn() const override
     {
         throw Exception("Method createColumn() is not implemented for data type " + getName(), ErrorCodes::NOT_IMPLEMENTED);
@@ -52,6 +43,8 @@ public:
 
     bool haveSubtypes() const override { return false; }
     bool cannotBeStoredInTables() const override { return true; }
+
+    SerializationPtr doGetDefaultSerialization() const override { throwNoSerialization(); }
 };
 
 }
diff --git a/src/DataTypes/Serializations/ISerialization.cpp b/src/DataTypes/Serializations/ISerialization.cpp
new file mode 100644
index 00000000000..ab2e8e1958b
--- /dev/null
+++ b/src/DataTypes/Serializations/ISerialization.cpp
@@ -0,0 +1,197 @@
+#include <DataTypes/Serializations/ISerialization.h>
+#include <Columns/IColumn.h>
+#include <IO/WriteHelpers.h>
+#include <IO/Operators.h>
+#include <Common/escapeForFileName.h>
+#include <DataTypes/NestedUtils.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int MULTIPLE_STREAMS_REQUIRED;
+}
+
+String ISerialization::Substream::toString() const
+{
+    switch (type)
+    {
+        case ArrayElements:
+            return "ArrayElements";
+        case ArraySizes:
+            return "ArraySizes";
+        case NullableElements:
+            return "NullableElements";
+        case NullMap:
+            return "NullMap";
+        case TupleElement:
+            return "TupleElement(" + tuple_element_name + ", "
+                + std::to_string(escape_tuple_delimiter) + ")";
+        case DictionaryKeys:
+            return "DictionaryKeys";
+        case DictionaryIndexes:
+            return "DictionaryIndexes";
+        case SparseElements:
+            return "SparseElements";
+        case SparseOffsets:
+            return "SparseOffsets";
+    }
+
+    __builtin_unreachable();
+}
+
+String ISerialization::SubstreamPath::toString() const
+{
+    WriteBufferFromOwnString wb;
+    wb << "{";
+    for (size_t i = 0; i < size(); ++i)
+    {
+        if (i != 0)
+            wb << ", ";
+        wb << at(i).toString();
+    }
+    wb << "}";
+    return wb.str();
+}
+
+void ISerialization::enumerateStreams(const StreamCallback & callback, SubstreamPath & path) const
+{
+    callback(path);
+}
+
+void ISerialization::serializeBinaryBulk(const IColumn & column, WriteBuffer &, size_t, size_t) const
+{
+    throw Exception(ErrorCodes::MULTIPLE_STREAMS_REQUIRED, "Column {} must be serialized with multiple streams", column.getName());
+}
+
+void ISerialization::deserializeBinaryBulk(IColumn & column, ReadBuffer &, size_t, double) const
+{
+    throw Exception(ErrorCodes::MULTIPLE_STREAMS_REQUIRED, "Column {} must be deserialized with multiple streams", column.getName());
+}
+
+void ISerialization::serializeBinaryBulkWithMultipleStreams(
+    const IColumn & column,
+    size_t offset,
+    size_t limit,
+    SerializeBinaryBulkSettings & settings,
+    SerializeBinaryBulkStatePtr & /* state */) const
+{
+    if (WriteBuffer * stream = settings.getter(settings.path))
+        serializeBinaryBulk(column, *stream, offset, limit);
+}
+
+void ISerialization::deserializeBinaryBulkWithMultipleStreams(
+    ColumnPtr & column,
+    size_t limit,
+    DeserializeBinaryBulkSettings & settings,
+    DeserializeBinaryBulkStatePtr & /* state */,
+    SubstreamsCache * cache) const
+{
+    auto cached_column = getFromSubstreamsCache(cache, settings.path);
+    if (cached_column)
+    {
+        column = cached_column;
+    }
+    else if (ReadBuffer * stream = settings.getter(settings.path))
+    {
+        auto mutable_column = column->assumeMutable();
+        deserializeBinaryBulk(*mutable_column, *stream, limit, settings.avg_value_size_hint);
+        column = std::move(mutable_column);
+        addToSubstreamsCache(cache, settings.path, column);
+    }
+}
+
+static String getNameForSubstreamPath(
+    String stream_name,
+    const ISerialization::SubstreamPath & path,
+    bool escape_tuple_delimiter)
+{
+    using Substream = ISerialization::Substream;
+
+    size_t array_level = 0;
+    for (const auto & elem : path)
+    {
+        if (elem.type == Substream::NullMap)
+            stream_name += ".null";
+        else if (elem.type == Substream::ArraySizes)
+            stream_name += ".size" + toString(array_level);
+        else if (elem.type == Substream::ArrayElements)
+            ++array_level;
+        else if (elem.type == Substream::DictionaryKeys)
+            stream_name += ".dict";
+        else if (elem.type == Substream::SparseOffsets)
+            stream_name += ".sparse.idx";
+        else if (elem.type == Substream::TupleElement)
+        {
+            /// For compatibility reasons, we use %2E (escaped dot) instead of dot.
+            /// Because nested data may be represented not by Array of Tuple,
+            ///  but by separate Array columns with names in a form of a.b,
+            ///  and name is encoded as a whole.
+            stream_name += (escape_tuple_delimiter && elem.escape_tuple_delimiter ?
+                escapeForFileName(".") : ".") + escapeForFileName(elem.tuple_element_name);
+        }
+    }
+
+    return stream_name;
+}
+
+String ISerialization::getFileNameForStream(const NameAndTypePair & column, const SubstreamPath & path)
+{
+    return getFileNameForStream(column.getNameInStorage(), path);
+}
+
+String ISerialization::getFileNameForStream(const String & name_in_storage, const SubstreamPath & path)
+{
+    String stream_name;
+    auto nested_storage_name = Nested::extractTableName(name_in_storage);
+    if (name_in_storage != nested_storage_name && (path.size() == 1 && path[0].type == ISerialization::Substream::ArraySizes))
+        stream_name = escapeForFileName(nested_storage_name);
+    else
+        stream_name = escapeForFileName(name_in_storage);
+
+    return getNameForSubstreamPath(std::move(stream_name), path, true);
+}
+
+String ISerialization::getSubcolumnNameForStream(const SubstreamPath & path)
+{
+    auto subcolumn_name = getNameForSubstreamPath("", path, false);
+    if (!subcolumn_name.empty())
+        subcolumn_name = subcolumn_name.substr(1); // It starts with a dot.
+
+    return subcolumn_name;
+}
+
+void ISerialization::addToSubstreamsCache(SubstreamsCache * cache, const SubstreamPath & path, ColumnPtr column)
+{
+    if (cache && !path.empty())
+        cache->emplace(getSubcolumnNameForStream(path), column);
+}
+
+ColumnPtr ISerialization::getFromSubstreamsCache(SubstreamsCache * cache, const SubstreamPath & path)
+{
+    if (!cache || path.empty())
+        return nullptr;
+
+    auto it = cache->find(getSubcolumnNameForStream(path));
+    if (it == cache->end())
+        return nullptr;
+
+    return it->second;
+}
+
+bool ISerialization::isSpecialCompressionAllowed(const SubstreamPath & path)
+{
+    for (const auto & elem : path)
+    {
+        if (elem.type == Substream::NullMap
+            || elem.type == Substream::ArraySizes
+            || elem.type == Substream::DictionaryIndexes
+            || elem.type == Substream::SparseOffsets)
+            return false;
+    }
+    return true;
+}
+
+}
diff --git a/src/DataTypes/Serializations/ISerialization.h b/src/DataTypes/Serializations/ISerialization.h
new file mode 100644
index 00000000000..03785fc07f4
--- /dev/null
+++ b/src/DataTypes/Serializations/ISerialization.h
@@ -0,0 +1,259 @@
+#pragma once
+
+#include <Common/COW.h>
+#include <Core/Types.h>
+
+#include <unordered_map>
+#include <memory>
+
+namespace DB
+{
+
+class IDataType;
+
+class ReadBuffer;
+class WriteBuffer;
+class ProtobufReader;
+class ProtobufWriter;
+
+class IColumn;
+using ColumnPtr = COW<IColumn>::Ptr;
+using MutableColumnPtr = COW<IColumn>::MutablePtr;
+
+class Field;
+
+struct FormatSettings;
+struct NameAndTypePair;
+
+class ISerialization
+{
+public:
+    ISerialization() = default;
+    virtual ~ISerialization() = default;
+
+    /** Binary serialization for range of values in column - for writing to disk/network, etc.
+      *
+      * Some data types are represented in multiple streams while being serialized.
+      * Example:
+      * - Arrays are represented as stream of all elements and stream of array sizes.
+      * - Nullable types are represented as stream of values (with unspecified values in place of NULLs) and stream of NULL flags.
+      *
+      * Different streams are identified by "path".
+      * If the data type require single stream (it's true for most of data types), the stream will have empty path.
+      * Otherwise, the path can have components like "array elements", "array sizes", etc.
+      *
+      * For multidimensional arrays, path can have arbitrary length.
+      * As an example, for 2-dimensional arrays of numbers we have at least three streams:
+      * - array sizes;                      (sizes of top level arrays)
+      * - array elements / array sizes;     (sizes of second level (nested) arrays)
+      * - array elements / array elements;  (the most deep elements, placed contiguously)
+      *
+      * Descendants must override either serializeBinaryBulk, deserializeBinaryBulk methods (for simple cases with single stream)
+      *  or serializeBinaryBulkWithMultipleStreams, deserializeBinaryBulkWithMultipleStreams, enumerateStreams methods (for cases with multiple streams).
+      *
+      * Default implementations of ...WithMultipleStreams methods will call serializeBinaryBulk, deserializeBinaryBulk for single stream.
+      */
+
+    struct Substream
+    {
+        enum Type
+        {
+            ArrayElements,
+            ArraySizes,
+
+            NullableElements,
+            NullMap,
+
+            TupleElement,
+
+            DictionaryKeys,
+            DictionaryIndexes,
+
+            SparseElements,
+            SparseOffsets,
+        };
+        Type type;
+
+        /// Index of tuple element, starting at 1 or name.
+        String tuple_element_name;
+
+        /// Do we need to escape a dot in filenames for tuple elements.
+        bool escape_tuple_delimiter = true;
+
+        Substream(Type type_) : type(type_) {}
+
+        String toString() const;
+    };
+
+    struct SubstreamPath : public std::vector<Substream>
+    {
+        String toString() const;
+    };
+
+    /// Cache for common substreams of one type, but possible different its subcolumns.
+    /// E.g. sizes of arrays of Nested data type.
+    using SubstreamsCache = std::unordered_map<String, ColumnPtr>;
+
+    using StreamCallback = std::function<void(const SubstreamPath &)>;
+
+    virtual void enumerateStreams(const StreamCallback & callback, SubstreamPath & path) const;
+    void enumerateStreams(const StreamCallback & callback, SubstreamPath && path) const { enumerateStreams(callback, path); }
+    void enumerateStreams(const StreamCallback & callback) const { enumerateStreams(callback, {}); }
+
+    using OutputStreamGetter = std::function<WriteBuffer*(const SubstreamPath &)>;
+    using InputStreamGetter = std::function<ReadBuffer*(const SubstreamPath &)>;
+
+    struct SerializeBinaryBulkState
+    {
+        virtual ~SerializeBinaryBulkState() = default;
+    };
+
+    struct DeserializeBinaryBulkState
+    {
+        virtual ~DeserializeBinaryBulkState() = default;
+    };
+
+    using SerializeBinaryBulkStatePtr = std::shared_ptr<SerializeBinaryBulkState>;
+    using DeserializeBinaryBulkStatePtr = std::shared_ptr<DeserializeBinaryBulkState>;
+
+    struct SerializeBinaryBulkSettings
+    {
+        OutputStreamGetter getter;
+        SubstreamPath path;
+
+        size_t low_cardinality_max_dictionary_size = 0;
+        bool low_cardinality_use_single_dictionary_for_part = true;
+
+        bool position_independent_encoding = true;
+    };
+
+    struct DeserializeBinaryBulkSettings
+    {
+        InputStreamGetter getter;
+        SubstreamPath path;
+
+        /// True if continue reading from previous positions in file. False if made fseek to the start of new granule.
+        bool continuous_reading = true;
+
+        bool position_independent_encoding = true;
+        /// If not zero, may be used to avoid reallocations while reading column of String type.
+        double avg_value_size_hint = 0;
+    };
+
+    /// Call before serializeBinaryBulkWithMultipleStreams chain to write something before first mark.
+    virtual void serializeBinaryBulkStatePrefix(
+        SerializeBinaryBulkSettings & /*settings*/,
+        SerializeBinaryBulkStatePtr & /*state*/) const {}
+
+    /// Call after serializeBinaryBulkWithMultipleStreams chain to finish serialization.
+    virtual void serializeBinaryBulkStateSuffix(
+        SerializeBinaryBulkSettings & /*settings*/,
+        SerializeBinaryBulkStatePtr & /*state*/) const {}
+
+    /// Call before before deserializeBinaryBulkWithMultipleStreams chain to get DeserializeBinaryBulkStatePtr.
+    virtual void deserializeBinaryBulkStatePrefix(
+        DeserializeBinaryBulkSettings & /*settings*/,
+        DeserializeBinaryBulkStatePtr & /*state*/) const {}
+
+    /** 'offset' and 'limit' are used to specify range.
+      * limit = 0 - means no limit.
+      * offset must be not greater than size of column.
+      * offset + limit could be greater than size of column
+      *  - in that case, column is serialized till the end.
+      */
+    virtual void serializeBinaryBulkWithMultipleStreams(
+        const IColumn & column,
+        size_t offset,
+        size_t limit,
+        SerializeBinaryBulkSettings & settings,
+        SerializeBinaryBulkStatePtr & state) const;
+
+    /// Read no more than limit values and append them into column.
+    virtual void deserializeBinaryBulkWithMultipleStreams(
+        ColumnPtr & column,
+        size_t limit,
+        DeserializeBinaryBulkSettings & settings,
+        DeserializeBinaryBulkStatePtr & state,
+        SubstreamsCache * cache) const;
+
+    /** Override these methods for data types that require just single stream (most of data types).
+      */
+    virtual void serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, size_t offset, size_t limit) const;
+    virtual void deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, size_t limit, double avg_value_size_hint) const;
+
+    /** Serialization/deserialization of individual values.
+      *
+      * These are helper methods for implementation of various formats to input/output for user (like CSV, JSON, etc.).
+      * There is no one-to-one correspondence between formats and these methods.
+      * For example, TabSeparated and Pretty formats could use same helper method serializeTextEscaped.
+      *
+      * For complex data types (like arrays) binary serde for individual values may differ from bulk serde.
+      * For example, if you serialize single array, it will be represented as its size and elements in single contiguous stream,
+      *  but if you bulk serialize column with arrays, then sizes and elements will be written to separate streams.
+      */
+
+    /// There is two variants for binary serde. First variant work with Field.
+    virtual void serializeBinary(const Field & field, WriteBuffer & ostr) const = 0;
+    virtual void deserializeBinary(Field & field, ReadBuffer & istr) const = 0;
+
+    /// Other variants takes a column, to avoid creating temporary Field object.
+    /// Column must be non-constant.
+
+    /// Serialize one value of a column at specified row number.
+    virtual void serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr) const = 0;
+    /// Deserialize one value and insert into a column.
+    /// If method will throw an exception, then column will be in same state as before call to method.
+    virtual void deserializeBinary(IColumn & column, ReadBuffer & istr) const = 0;
+
+    /** Text serialization with escaping but without quoting.
+      */
+    virtual void serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const = 0;
+
+    virtual void deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const = 0;
+
+    /** Text serialization as a literal that may be inserted into a query.
+      */
+    virtual void serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const = 0;
+
+    virtual void deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const = 0;
+
+    /** Text serialization for the CSV format.
+      */
+    virtual void serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const = 0;
+    virtual void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings &) const = 0;
+
+    /** Text serialization for displaying on a terminal or saving into a text file, and the like.
+      * Without escaping or quoting.
+      */
+    virtual void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const = 0;
+
+    /** Text deserialization in case when buffer contains only one value, without any escaping and delimiters.
+      */
+    virtual void deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const = 0;
+
+    /** Text serialization intended for using in JSON format.
+      */
+    virtual void serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const = 0;
+    virtual void deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const = 0;
+
+    /** Text serialization for putting into the XML format.
+      */
+    virtual void serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+    {
+        serializeText(column, row_num, ostr, settings);
+    }
+
+    static String getFileNameForStream(const NameAndTypePair & column, const SubstreamPath & path);
+    static String getFileNameForStream(const String & name_in_storage, const SubstreamPath & path);
+    static String getSubcolumnNameForStream(const SubstreamPath & path);
+
+    static void addToSubstreamsCache(SubstreamsCache * cache, const SubstreamPath & path, ColumnPtr column);
+    static ColumnPtr getFromSubstreamsCache(SubstreamsCache * cache, const SubstreamPath & path);
+
+    static bool isSpecialCompressionAllowed(const SubstreamPath & path);
+};
+
+using SerializationPtr = std::shared_ptr<const ISerialization>;
+using Serializations = std::vector<SerializationPtr>;
+
+}
diff --git a/src/DataTypes/Serializations/SerializationAggregateFunction.cpp b/src/DataTypes/Serializations/SerializationAggregateFunction.cpp
new file mode 100644
index 00000000000..e0bcb65d895
--- /dev/null
+++ b/src/DataTypes/Serializations/SerializationAggregateFunction.cpp
@@ -0,0 +1,221 @@
+#include <DataTypes/Serializations/SerializationAggregateFunction.h>
+
+#include <IO/WriteHelpers.h>
+#include <IO/ReadHelpers.h>
+
+#include <Columns/ColumnAggregateFunction.h>
+
+#include <Common/typeid_cast.h>
+#include <Common/assert_cast.h>
+#include <Common/AlignedBuffer.h>
+
+#include <Formats/FormatSettings.h>
+#include <Formats/ProtobufReader.h>
+#include <Formats/ProtobufWriter.h>
+#include <IO/WriteBufferFromString.h>
+#include <IO/Operators.h>
+
+namespace DB
+{
+
+void SerializationAggregateFunction::serializeBinary(const Field & field, WriteBuffer & ostr) const
+{
+    const String & s = get<const String &>(field);
+    writeVarUInt(s.size(), ostr);
+    writeString(s, ostr);
+}
+
+void SerializationAggregateFunction::deserializeBinary(Field & field, ReadBuffer & istr) const
+{
+    UInt64 size;
+    readVarUInt(size, istr);
+    field = String();
+    String & s = get<String &>(field);
+    s.resize(size);
+    istr.readStrict(s.data(), size);
+}
+
+void SerializationAggregateFunction::serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr) const
+{
+    function->serialize(assert_cast<const ColumnAggregateFunction &>(column).getData()[row_num], ostr);
+}
+
+void SerializationAggregateFunction::deserializeBinary(IColumn & column, ReadBuffer & istr) const
+{
+    ColumnAggregateFunction & column_concrete = assert_cast<ColumnAggregateFunction &>(column);
+
+    Arena & arena = column_concrete.createOrGetArena();
+    size_t size_of_state = function->sizeOfData();
+    AggregateDataPtr place = arena.alignedAlloc(size_of_state, function->alignOfData());
+
+    function->create(place);
+    try
+    {
+        function->deserialize(place, istr, &arena);
+    }
+    catch (...)
+    {
+        function->destroy(place);
+        throw;
+    }
+
+    column_concrete.getData().push_back(place);
+}
+
+void SerializationAggregateFunction::serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, size_t offset, size_t limit) const
+{
+    const ColumnAggregateFunction & real_column = typeid_cast<const ColumnAggregateFunction &>(column);
+    const ColumnAggregateFunction::Container & vec = real_column.getData();
+
+    ColumnAggregateFunction::Container::const_iterator it = vec.begin() + offset;
+    ColumnAggregateFunction::Container::const_iterator end = limit ? it + limit : vec.end();
+
+    if (end > vec.end())
+        end = vec.end();
+
+    for (; it != end; ++it)
+        function->serialize(*it, ostr);
+}
+
+void SerializationAggregateFunction::deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, size_t limit, double /*avg_value_size_hint*/) const
+{
+    ColumnAggregateFunction & real_column = typeid_cast<ColumnAggregateFunction &>(column);
+    ColumnAggregateFunction::Container & vec = real_column.getData();
+
+    Arena & arena = real_column.createOrGetArena();
+    real_column.set(function);
+    vec.reserve(vec.size() + limit);
+
+    size_t size_of_state = function->sizeOfData();
+    size_t align_of_state = function->alignOfData();
+
+    for (size_t i = 0; i < limit; ++i)
+    {
+        if (istr.eof())
+            break;
+
+        AggregateDataPtr place = arena.alignedAlloc(size_of_state, align_of_state);
+
+        function->create(place);
+
+        try
+        {
+            function->deserialize(place, istr, &arena);
+        }
+        catch (...)
+        {
+            function->destroy(place);
+            throw;
+        }
+
+        vec.push_back(place);
+    }
+}
+
+static String serializeToString(const AggregateFunctionPtr & function, const IColumn & column, size_t row_num)
+{
+    WriteBufferFromOwnString buffer;
+    function->serialize(assert_cast<const ColumnAggregateFunction &>(column).getData()[row_num], buffer);
+    return buffer.str();
+}
+
+static void deserializeFromString(const AggregateFunctionPtr & function, IColumn & column, const String & s)
+{
+    ColumnAggregateFunction & column_concrete = assert_cast<ColumnAggregateFunction &>(column);
+
+    Arena & arena = column_concrete.createOrGetArena();
+    size_t size_of_state = function->sizeOfData();
+    AggregateDataPtr place = arena.alignedAlloc(size_of_state, function->alignOfData());
+
+    function->create(place);
+
+    try
+    {
+        ReadBufferFromString istr(s);
+        function->deserialize(place, istr, &arena);
+    }
+    catch (...)
+    {
+        function->destroy(place);
+        throw;
+    }
+
+    column_concrete.getData().push_back(place);
+}
+
+void SerializationAggregateFunction::serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const
+{
+    writeString(serializeToString(function, column, row_num), ostr);
+}
+
+
+void SerializationAggregateFunction::serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const
+{
+    writeEscapedString(serializeToString(function, column, row_num), ostr);
+}
+
+
+void SerializationAggregateFunction::deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
+{
+    String s;
+    readEscapedString(s, istr);
+    deserializeFromString(function, column, s);
+}
+
+
+void SerializationAggregateFunction::serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const
+{
+    writeQuotedString(serializeToString(function, column, row_num), ostr);
+}
+
+
+void SerializationAggregateFunction::deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
+{
+    String s;
+    readQuotedStringWithSQLStyle(s, istr);
+    deserializeFromString(function, column, s);
+}
+
+
+void SerializationAggregateFunction::deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
+{
+    String s;
+    readStringUntilEOF(s, istr);
+    deserializeFromString(function, column, s);
+}
+
+
+void SerializationAggregateFunction::serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    writeJSONString(serializeToString(function, column, row_num), ostr, settings);
+}
+
+
+void SerializationAggregateFunction::deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
+{
+    String s;
+    readJSONString(s, istr);
+    deserializeFromString(function, column, s);
+}
+
+
+void SerializationAggregateFunction::serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const
+{
+    writeXMLStringForTextElement(serializeToString(function, column, row_num), ostr);
+}
+
+
+void SerializationAggregateFunction::serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const
+{
+    writeCSV(serializeToString(function, column, row_num), ostr);
+}
+
+
+void SerializationAggregateFunction::deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    String s;
+    readCSV(s, istr, settings.csv);
+    deserializeFromString(function, column, s);
+}
+
+}
diff --git a/src/DataTypes/Serializations/SerializationAggregateFunction.h b/src/DataTypes/Serializations/SerializationAggregateFunction.h
new file mode 100644
index 00000000000..58a7d52ffe7
--- /dev/null
+++ b/src/DataTypes/Serializations/SerializationAggregateFunction.h
@@ -0,0 +1,43 @@
+#pragma once
+
+#include <AggregateFunctions/IAggregateFunction.h>
+
+#include <DataTypes/Serializations/ISerialization.h>
+
+
+namespace DB
+{
+
+class SerializationAggregateFunction final : public ISerialization
+{
+private:
+    AggregateFunctionPtr function;
+
+public:
+    static constexpr bool is_parametric = true;
+
+    SerializationAggregateFunction(const AggregateFunctionPtr & function_): function(function_) {}
+
+    /// NOTE These two functions for serializing single values are incompatible with the functions below.
+    void serializeBinary(const Field & field, WriteBuffer & ostr) const override;
+    void deserializeBinary(Field & field, ReadBuffer & istr) const override;
+
+    void serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr) const override;
+    void deserializeBinary(IColumn & column, ReadBuffer & istr) const override;
+    void serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, size_t offset, size_t limit) const override;
+    void deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, size_t limit, double avg_value_size_hint) const override;
+    void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    void serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    void deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+
+    void serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    void serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
+};
+
+}
diff --git a/src/DataTypes/Serializations/SerializationArray.cpp b/src/DataTypes/Serializations/SerializationArray.cpp
new file mode 100644
index 00000000000..70a72c51e78
--- /dev/null
+++ b/src/DataTypes/Serializations/SerializationArray.cpp
@@ -0,0 +1,507 @@
+#include <DataTypes/Serializations/SerializationArray.h>
+#include <DataTypes/Serializations/SerializationNumber.h>
+#include <Columns/ColumnArray.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <IO/ReadBufferFromString.h>
+#include <IO/WriteBufferFromString.h>
+
+#include <Formats/FormatSettings.h>
+#include <Formats/ProtobufReader.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int CANNOT_READ_ALL_DATA;
+    extern const int CANNOT_READ_ARRAY_FROM_TEXT;
+    extern const int LOGICAL_ERROR;
+}
+
+void SerializationArray::serializeBinary(const Field & field, WriteBuffer & ostr) const
+{
+    const Array & a = get<const Array &>(field);
+    writeVarUInt(a.size(), ostr);
+    for (size_t i = 0; i < a.size(); ++i)
+    {
+        nested->serializeBinary(a[i], ostr);
+    }
+}
+
+
+void SerializationArray::deserializeBinary(Field & field, ReadBuffer & istr) const
+{
+    size_t size;
+    readVarUInt(size, istr);
+    field = Array(size);
+    Array & arr = get<Array &>(field);
+    for (size_t i = 0; i < size; ++i)
+        nested->deserializeBinary(arr[i], istr);
+}
+
+
+void SerializationArray::serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr) const
+{
+    const ColumnArray & column_array = assert_cast<const ColumnArray &>(column);
+    const ColumnArray::Offsets & offsets = column_array.getOffsets();
+
+    size_t offset = offsets[row_num - 1];
+    size_t next_offset = offsets[row_num];
+    size_t size = next_offset - offset;
+
+    writeVarUInt(size, ostr);
+
+    const IColumn & nested_column = column_array.getData();
+    for (size_t i = offset; i < next_offset; ++i)
+        nested->serializeBinary(nested_column, i, ostr);
+}
+
+
+void SerializationArray::deserializeBinary(IColumn & column, ReadBuffer & istr) const
+{
+    ColumnArray & column_array = assert_cast<ColumnArray &>(column);
+    ColumnArray::Offsets & offsets = column_array.getOffsets();
+
+    size_t size;
+    readVarUInt(size, istr);
+
+    IColumn & nested_column = column_array.getData();
+
+    size_t i = 0;
+    try
+    {
+        for (; i < size; ++i)
+            nested->deserializeBinary(nested_column, istr);
+    }
+    catch (...)
+    {
+        if (i)
+            nested_column.popBack(i);
+        throw;
+    }
+
+    offsets.push_back(offsets.back() + size);
+}
+
+
+namespace
+{
+    void serializeArraySizesPositionIndependent(const IColumn & column, WriteBuffer & ostr, UInt64 offset, UInt64 limit)
+    {
+        const ColumnArray & column_array = typeid_cast<const ColumnArray &>(column);
+        const ColumnArray::Offsets & offset_values = column_array.getOffsets();
+        size_t size = offset_values.size();
+
+        if (!size)
+            return;
+
+        size_t end = limit && (offset + limit < size)
+            ? offset + limit
+            : size;
+
+        ColumnArray::Offset prev_offset = offset_values[offset - 1];
+        for (size_t i = offset; i < end; ++i)
+        {
+            ColumnArray::Offset current_offset = offset_values[i];
+            writeIntBinary(current_offset - prev_offset, ostr);
+            prev_offset = current_offset;
+        }
+    }
+
+    void deserializeArraySizesPositionIndependent(ColumnArray & column_array, ReadBuffer & istr, UInt64 limit)
+    {
+        ColumnArray::Offsets & offset_values = column_array.getOffsets();
+        size_t initial_size = offset_values.size();
+        offset_values.resize(initial_size + limit);
+
+        size_t i = initial_size;
+        ColumnArray::Offset current_offset = initial_size ? offset_values[initial_size - 1] : 0;
+        while (i < initial_size + limit && !istr.eof())
+        {
+            ColumnArray::Offset current_size = 0;
+            readIntBinary(current_size, istr);
+            current_offset += current_size;
+            offset_values[i] = current_offset;
+            ++i;
+        }
+
+        offset_values.resize(i);
+    }
+
+    ColumnPtr arraySizesToOffsets(const IColumn & column)
+    {
+        const auto & column_sizes = assert_cast<const ColumnArray::ColumnOffsets &>(column);
+        MutableColumnPtr column_offsets = column_sizes.cloneEmpty();
+
+        if (column_sizes.empty())
+            return column_offsets;
+
+        const auto & sizes_data = column_sizes.getData();
+        auto & offsets_data = assert_cast<ColumnArray::ColumnOffsets &>(*column_offsets).getData();
+
+        offsets_data.resize(sizes_data.size());
+
+        IColumn::Offset prev_offset = 0;
+        for (size_t i = 0, size = sizes_data.size(); i < size; ++i)
+        {
+            prev_offset += sizes_data[i];
+            offsets_data[i] = prev_offset;
+        }
+
+        return column_offsets;
+    }
+}
+
+ColumnPtr arrayOffsetsToSizes(const IColumn & column)
+{
+    const auto & column_offsets = assert_cast<const ColumnArray::ColumnOffsets &>(column);
+    MutableColumnPtr column_sizes = column_offsets.cloneEmpty();
+
+    if (column_offsets.empty())
+        return column_sizes;
+
+    const auto & offsets_data = column_offsets.getData();
+    auto & sizes_data = assert_cast<ColumnArray::ColumnOffsets &>(*column_sizes).getData();
+
+    sizes_data.resize(offsets_data.size());
+
+    IColumn::Offset prev_offset = 0;
+    for (size_t i = 0, size = offsets_data.size(); i < size; ++i)
+    {
+        auto current_offset = offsets_data[i];
+        sizes_data[i] = current_offset - prev_offset;
+        prev_offset =  current_offset;
+    }
+
+    return column_sizes;
+}
+
+
+void SerializationArray::enumerateStreams(const StreamCallback & callback, SubstreamPath & path) const
+{
+    path.push_back(Substream::ArraySizes);
+    callback(path);
+    path.back() = Substream::ArrayElements;
+    nested->enumerateStreams(callback, path);
+    path.pop_back();
+}
+
+
+void SerializationArray::serializeBinaryBulkStatePrefix(
+    SerializeBinaryBulkSettings & settings,
+    SerializeBinaryBulkStatePtr & state) const
+{
+    settings.path.push_back(Substream::ArrayElements);
+    nested->serializeBinaryBulkStatePrefix(settings, state);
+    settings.path.pop_back();
+}
+
+
+void SerializationArray::serializeBinaryBulkStateSuffix(
+    SerializeBinaryBulkSettings & settings,
+    SerializeBinaryBulkStatePtr & state) const
+{
+    settings.path.push_back(Substream::ArrayElements);
+    nested->serializeBinaryBulkStateSuffix(settings, state);
+    settings.path.pop_back();
+}
+
+
+void SerializationArray::deserializeBinaryBulkStatePrefix(
+    DeserializeBinaryBulkSettings & settings,
+    DeserializeBinaryBulkStatePtr & state) const
+{
+    settings.path.push_back(Substream::ArrayElements);
+    nested->deserializeBinaryBulkStatePrefix(settings, state);
+    settings.path.pop_back();
+}
+
+
+void SerializationArray::serializeBinaryBulkWithMultipleStreams(
+    const IColumn & column,
+    size_t offset,
+    size_t limit,
+    SerializeBinaryBulkSettings & settings,
+    SerializeBinaryBulkStatePtr & state) const
+{
+    const ColumnArray & column_array = typeid_cast<const ColumnArray &>(column);
+
+    /// First serialize array sizes.
+    settings.path.push_back(Substream::ArraySizes);
+    if (auto * stream = settings.getter(settings.path))
+    {
+        if (settings.position_independent_encoding)
+            serializeArraySizesPositionIndependent(column, *stream, offset, limit);
+        else
+            SerializationNumber<ColumnArray::Offset>().serializeBinaryBulk(*column_array.getOffsetsPtr(), *stream, offset, limit);
+    }
+
+    /// Then serialize contents of arrays.
+    settings.path.back() = Substream::ArrayElements;
+    const ColumnArray::Offsets & offset_values = column_array.getOffsets();
+
+    if (offset > offset_values.size())
+        return;
+
+    /** offset - from which array to write.
+      * limit - how many arrays should be written, or 0, if you write everything that is.
+      * end - up to which array the recorded piece ends.
+      *
+      * nested_offset - from which element of the innards to write.
+      * nested_limit - how many elements of the innards to write, or 0, if you write everything that is.
+      */
+
+    size_t end = std::min(offset + limit, offset_values.size());
+
+    size_t nested_offset = offset ? offset_values[offset - 1] : 0;
+    size_t nested_limit = limit
+        ? offset_values[end - 1] - nested_offset
+        : 0;
+
+    if (limit == 0 || nested_limit)
+        nested->serializeBinaryBulkWithMultipleStreams(column_array.getData(), nested_offset, nested_limit, settings, state);
+    settings.path.pop_back();
+}
+
+
+void SerializationArray::deserializeBinaryBulkWithMultipleStreams(
+    ColumnPtr & column,
+    size_t limit,
+    DeserializeBinaryBulkSettings & settings,
+    DeserializeBinaryBulkStatePtr & state,
+    SubstreamsCache * cache) const
+{
+    auto mutable_column = column->assumeMutable();
+    ColumnArray & column_array = typeid_cast<ColumnArray &>(*mutable_column);
+    settings.path.push_back(Substream::ArraySizes);
+
+    if (auto cached_column = getFromSubstreamsCache(cache, settings.path))
+    {
+        column_array.getOffsetsPtr() = arraySizesToOffsets(*cached_column);
+    }
+    else if (auto * stream = settings.getter(settings.path))
+    {
+        if (settings.position_independent_encoding)
+            deserializeArraySizesPositionIndependent(column_array, *stream, limit);
+        else
+            SerializationNumber<ColumnArray::Offset>().deserializeBinaryBulk(column_array.getOffsetsColumn(), *stream, limit, 0);
+
+        addToSubstreamsCache(cache, settings.path, arrayOffsetsToSizes(column_array.getOffsetsColumn()));
+    }
+
+    settings.path.back() = Substream::ArrayElements;
+
+    ColumnArray::Offsets & offset_values = column_array.getOffsets();
+    ColumnPtr & nested_column = column_array.getDataPtr();
+
+    /// Number of values corresponding with `offset_values` must be read.
+    size_t last_offset = offset_values.back();
+    if (last_offset < nested_column->size())
+        throw Exception("Nested column is longer than last offset", ErrorCodes::LOGICAL_ERROR);
+    size_t nested_limit = last_offset - nested_column->size();
+
+    /// Adjust value size hint. Divide it to the average array size.
+    settings.avg_value_size_hint = nested_limit ? settings.avg_value_size_hint / nested_limit * offset_values.size() : 0;
+
+    nested->deserializeBinaryBulkWithMultipleStreams(nested_column, nested_limit, settings, state, cache);
+
+    settings.path.pop_back();
+
+    /// Check consistency between offsets and elements subcolumns.
+    /// But if elements column is empty - it's ok for columns of Nested types that was added by ALTER.
+    if (!nested_column->empty() && nested_column->size() != last_offset)
+        throw ParsingException("Cannot read all array values: read just " + toString(nested_column->size()) + " of " + toString(last_offset),
+            ErrorCodes::CANNOT_READ_ALL_DATA);
+
+    column = std::move(mutable_column);
+}
+
+
+template <typename Writer>
+static void serializeTextImpl(const IColumn & column, size_t row_num, WriteBuffer & ostr, Writer && write_nested)
+{
+    const ColumnArray & column_array = assert_cast<const ColumnArray &>(column);
+    const ColumnArray::Offsets & offsets = column_array.getOffsets();
+
+    size_t offset = offsets[row_num - 1];
+    size_t next_offset = offsets[row_num];
+
+    const IColumn & nested_column = column_array.getData();
+
+    writeChar('[', ostr);
+    for (size_t i = offset; i < next_offset; ++i)
+    {
+        if (i != offset)
+            writeChar(',', ostr);
+        write_nested(nested_column, i);
+    }
+    writeChar(']', ostr);
+}
+
+
+template <typename Reader>
+static void deserializeTextImpl(IColumn & column, ReadBuffer & istr, Reader && read_nested, bool allow_unenclosed)
+{
+    ColumnArray & column_array = assert_cast<ColumnArray &>(column);
+    ColumnArray::Offsets & offsets = column_array.getOffsets();
+
+    IColumn & nested_column = column_array.getData();
+
+    size_t size = 0;
+
+    bool has_braces = false;
+    if (checkChar('[', istr))
+        has_braces = true;
+    else if (!allow_unenclosed)
+        throw Exception(ErrorCodes::CANNOT_READ_ARRAY_FROM_TEXT, "Array does not start with '[' character");
+
+    try
+    {
+        bool first = true;
+        while (!istr.eof() && *istr.position() != ']')
+        {
+            if (!first)
+            {
+                if (*istr.position() == ',')
+                    ++istr.position();
+                else
+                    throw ParsingException(ErrorCodes::CANNOT_READ_ARRAY_FROM_TEXT,
+                        "Cannot read array from text, expected comma or end of array, found '{}'",
+                        *istr.position());
+            }
+
+            first = false;
+
+            skipWhitespaceIfAny(istr);
+
+            if (*istr.position() == ']')
+                break;
+
+            read_nested(nested_column);
+            ++size;
+
+            skipWhitespaceIfAny(istr);
+        }
+
+        if (has_braces)
+            assertChar(']', istr);
+        else /// If array is not enclosed in braces, we read until EOF.
+            assertEOF(istr);
+    }
+    catch (...)
+    {
+        if (size)
+            nested_column.popBack(size);
+        throw;
+    }
+
+    offsets.push_back(offsets.back() + size);
+}
+
+
+void SerializationArray::serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    serializeTextImpl(column, row_num, ostr,
+        [&](const IColumn & nested_column, size_t i)
+        {
+            nested->serializeTextQuoted(nested_column, i, ostr, settings);
+        });
+}
+
+
+void SerializationArray::deserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    deserializeTextImpl(column, istr,
+        [&](IColumn & nested_column)
+        {
+            nested->deserializeTextQuoted(nested_column, istr, settings);
+        }, false);
+}
+
+void SerializationArray::serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    const ColumnArray & column_array = assert_cast<const ColumnArray &>(column);
+    const ColumnArray::Offsets & offsets = column_array.getOffsets();
+
+    size_t offset = offsets[row_num - 1];
+    size_t next_offset = offsets[row_num];
+
+    const IColumn & nested_column = column_array.getData();
+
+    writeChar('[', ostr);
+    for (size_t i = offset; i < next_offset; ++i)
+    {
+        if (i != offset)
+            writeChar(',', ostr);
+        nested->serializeTextJSON(nested_column, i, ostr, settings);
+    }
+    writeChar(']', ostr);
+}
+
+
+void SerializationArray::deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    deserializeTextImpl(column, istr,
+        [&](IColumn & nested_column)
+        {
+            nested->deserializeTextJSON(nested_column, istr, settings);
+        }, false);
+}
+
+
+void SerializationArray::serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    const ColumnArray & column_array = assert_cast<const ColumnArray &>(column);
+    const ColumnArray::Offsets & offsets = column_array.getOffsets();
+
+    size_t offset = offsets[row_num - 1];
+    size_t next_offset = offsets[row_num];
+
+    const IColumn & nested_column = column_array.getData();
+
+    writeCString("<array>", ostr);
+    for (size_t i = offset; i < next_offset; ++i)
+    {
+        writeCString("<elem>", ostr);
+        nested->serializeTextXML(nested_column, i, ostr, settings);
+        writeCString("</elem>", ostr);
+    }
+    writeCString("</array>", ostr);
+}
+
+
+void SerializationArray::serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    /// There is no good way to serialize an array in CSV. Therefore, we serialize it into a string, and then write the resulting string in CSV.
+    WriteBufferFromOwnString wb;
+    serializeText(column, row_num, wb, settings);
+    writeCSV(wb.str(), ostr);
+}
+
+
+void SerializationArray::deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    String s;
+    readCSV(s, istr, settings.csv);
+    ReadBufferFromString rb(s);
+
+    if (settings.csv.input_format_arrays_as_nested_csv)
+    {
+        deserializeTextImpl(column, rb,
+            [&](IColumn & nested_column)
+            {
+                nested->deserializeTextCSV(nested_column, rb, settings);
+            }, true);
+    }
+    else
+    {
+        deserializeTextImpl(column, rb,
+            [&](IColumn & nested_column)
+            {
+                nested->deserializeTextQuoted(nested_column, rb, settings);
+            }, true);
+    }
+}
+
+}
diff --git a/src/DataTypes/Serializations/SerializationArray.h b/src/DataTypes/Serializations/SerializationArray.h
new file mode 100644
index 00000000000..71037090a48
--- /dev/null
+++ b/src/DataTypes/Serializations/SerializationArray.h
@@ -0,0 +1,69 @@
+#pragma once
+
+#include <DataTypes/Serializations/SimpleTextSerialization.h>
+
+namespace DB
+{
+
+class SerializationArray final : public SimpleTextSerialization
+{
+private:
+    SerializationPtr nested;
+
+public:
+    SerializationArray(const SerializationPtr & nested_) : nested(nested_) {}
+
+    void serializeBinary(const Field & field, WriteBuffer & ostr) const override;
+    void deserializeBinary(Field & field, ReadBuffer & istr) const override;
+    void serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr) const override;
+    void deserializeBinary(IColumn & column, ReadBuffer & istr) const override;
+
+    void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void deserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+
+    void serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+
+    void serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+
+    void serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+
+    /** Streaming serialization of arrays is arranged in a special way:
+      * - elements placed in a row are written/read without array sizes;
+      * - the sizes are written/read in a separate stream,
+      * This is necessary, because when implementing nested structures, several arrays can have common sizes.
+      */
+
+    void enumerateStreams(const StreamCallback & callback, SubstreamPath & path) const override;
+
+    void serializeBinaryBulkStatePrefix(
+            SerializeBinaryBulkSettings & settings,
+            SerializeBinaryBulkStatePtr & state) const override;
+
+    void serializeBinaryBulkStateSuffix(
+            SerializeBinaryBulkSettings & settings,
+            SerializeBinaryBulkStatePtr & state) const override;
+
+    void deserializeBinaryBulkStatePrefix(
+            DeserializeBinaryBulkSettings & settings,
+            DeserializeBinaryBulkStatePtr & state) const override;
+
+    void serializeBinaryBulkWithMultipleStreams(
+            const IColumn & column,
+            size_t offset,
+            size_t limit,
+            SerializeBinaryBulkSettings & settings,
+            SerializeBinaryBulkStatePtr & state) const override;
+
+    void deserializeBinaryBulkWithMultipleStreams(
+        ColumnPtr & column,
+        size_t limit,
+        DeserializeBinaryBulkSettings & settings,
+        DeserializeBinaryBulkStatePtr & state,
+        SubstreamsCache * cache) const override;
+};
+
+ColumnPtr arrayOffsetsToSizes(const IColumn & column);
+
+}
diff --git a/src/DataTypes/Serializations/SerializationCustomSimpleText.cpp b/src/DataTypes/Serializations/SerializationCustomSimpleText.cpp
new file mode 100644
index 00000000000..9347c4f60f3
--- /dev/null
+++ b/src/DataTypes/Serializations/SerializationCustomSimpleText.cpp
@@ -0,0 +1,97 @@
+#include <DataTypes/Serializations/SerializationCustomSimpleText.h>
+
+#include <IO/ReadBufferFromString.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteBufferFromString.h>
+#include <IO/WriteHelpers.h>
+
+namespace
+{
+
+using namespace DB;
+
+String serializeToString(const SerializationCustomSimpleText & domain, const IColumn & column, size_t row_num, const FormatSettings & settings)
+{
+    WriteBufferFromOwnString buffer;
+    domain.serializeText(column, row_num, buffer, settings);
+
+    return buffer.str();
+}
+
+void deserializeFromString(const SerializationCustomSimpleText & domain, IColumn & column, const String & s, const FormatSettings & settings)
+{
+    ReadBufferFromString istr(s);
+    domain.deserializeText(column, istr, settings);
+}
+
+}
+
+namespace DB
+{
+
+SerializationCustomSimpleText::SerializationCustomSimpleText(const SerializationPtr & nested_)
+    : SerializationWrapper(nested_)
+{
+}
+
+void SerializationCustomSimpleText::deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    String str;
+    readString(str, istr);
+    deserializeFromString(*this, column, str, settings);
+}
+
+void SerializationCustomSimpleText::serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    writeEscapedString(serializeToString(*this, column, row_num, settings), ostr);
+}
+
+void SerializationCustomSimpleText::deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    String str;
+    readEscapedString(str, istr);
+    deserializeFromString(*this, column, str, settings);
+}
+
+void SerializationCustomSimpleText::serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    writeQuotedString(serializeToString(*this, column, row_num, settings), ostr);
+}
+
+void SerializationCustomSimpleText::deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    String str;
+    readQuotedString(str, istr);
+    deserializeFromString(*this, column, str, settings);
+}
+
+void SerializationCustomSimpleText::serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    writeCSVString(serializeToString(*this, column, row_num, settings), ostr);
+}
+
+void SerializationCustomSimpleText::deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    String str;
+    readCSVString(str, istr, settings.csv);
+    deserializeFromString(*this, column, str, settings);
+}
+
+void SerializationCustomSimpleText::serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    writeJSONString(serializeToString(*this, column, row_num, settings), ostr, settings);
+}
+
+void SerializationCustomSimpleText::deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    String str;
+    readJSONString(str, istr);
+    deserializeFromString(*this, column, str, settings);
+}
+
+void SerializationCustomSimpleText::serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    writeXMLStringForTextElement(serializeToString(*this, column, row_num, settings), ostr);
+}
+
+}
diff --git a/src/DataTypes/DataTypeCustomSimpleTextSerialization.h b/src/DataTypes/Serializations/SerializationCustomSimpleText.h
similarity index 92%
rename from src/DataTypes/DataTypeCustomSimpleTextSerialization.h
rename to src/DataTypes/Serializations/SerializationCustomSimpleText.h
index d983b66eecc..ae938b1104b 100644
--- a/src/DataTypes/DataTypeCustomSimpleTextSerialization.h
+++ b/src/DataTypes/Serializations/SerializationCustomSimpleText.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DataTypes/DataTypeCustom.h>
+#include <DataTypes/Serializations/SerializationWrapper.h>
 
 namespace DB
 {
@@ -12,9 +12,11 @@ class IColumn;
 
 /** Simple IDataTypeCustomTextSerialization that uses serializeText/deserializeText
  * for all serialization and deserialization. */
-class DataTypeCustomSimpleTextSerialization : public IDataTypeCustomTextSerialization
+class SerializationCustomSimpleText : public SerializationWrapper
 {
 public:
+    SerializationCustomSimpleText(const SerializationPtr & nested_);
+
     // Methods that subclasses must override in order to get full serialization/deserialization support.
     virtual void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override = 0;
     virtual void deserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const = 0;
diff --git a/src/DataTypes/Serializations/SerializationDate.cpp b/src/DataTypes/Serializations/SerializationDate.cpp
new file mode 100644
index 00000000000..ee9110d360d
--- /dev/null
+++ b/src/DataTypes/Serializations/SerializationDate.cpp
@@ -0,0 +1,83 @@
+#include <DataTypes/Serializations/SerializationDate.h>
+
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+
+#include <Columns/ColumnsNumber.h>
+#include <Formats/ProtobufReader.h>
+#include <Formats/ProtobufWriter.h>
+
+#include <Common/assert_cast.h>
+
+namespace DB
+{
+
+void SerializationDate::serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const
+{
+    writeDateText(DayNum(assert_cast<const ColumnUInt16 &>(column).getData()[row_num]), ostr);
+}
+
+void SerializationDate::deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    deserializeTextEscaped(column, istr, settings);
+}
+
+void SerializationDate::deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
+{
+    DayNum x;
+    readDateText(x, istr);
+    assert_cast<ColumnUInt16 &>(column).getData().push_back(x);
+}
+
+void SerializationDate::serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    serializeText(column, row_num, ostr, settings);
+}
+
+void SerializationDate::serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    writeChar('\'', ostr);
+    serializeText(column, row_num, ostr, settings);
+    writeChar('\'', ostr);
+}
+
+void SerializationDate::deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
+{
+    DayNum x;
+    assertChar('\'', istr);
+    readDateText(x, istr);
+    assertChar('\'', istr);
+    assert_cast<ColumnUInt16 &>(column).getData().push_back(x);    /// It's important to do this at the end - for exception safety.
+}
+
+void SerializationDate::serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    writeChar('"', ostr);
+    serializeText(column, row_num, ostr, settings);
+    writeChar('"', ostr);
+}
+
+void SerializationDate::deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
+{
+    DayNum x;
+    assertChar('"', istr);
+    readDateText(x, istr);
+    assertChar('"', istr);
+    assert_cast<ColumnUInt16 &>(column).getData().push_back(x);
+}
+
+void SerializationDate::serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    writeChar('"', ostr);
+    serializeText(column, row_num, ostr, settings);
+    writeChar('"', ostr);
+}
+
+void SerializationDate::deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
+{
+    LocalDate value;
+    readCSV(value, istr);
+    assert_cast<ColumnUInt16 &>(column).getData().push_back(value.getDayNum());
+}
+
+}
diff --git a/src/DataTypes/Serializations/SerializationDate.h b/src/DataTypes/Serializations/SerializationDate.h
new file mode 100644
index 00000000000..099d7444c3d
--- /dev/null
+++ b/src/DataTypes/Serializations/SerializationDate.h
@@ -0,0 +1,23 @@
+#pragma once
+
+#include <DataTypes/Serializations/SerializationNumber.h>
+
+namespace DB
+{
+
+class SerializationDate final : public SerializationNumber<UInt16>
+{
+public:
+    void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    void serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    void serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    void serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    void serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
+};
+
+}
diff --git a/src/DataTypes/Serializations/SerializationDateTime.cpp b/src/DataTypes/Serializations/SerializationDateTime.cpp
new file mode 100644
index 00000000000..16e47601eeb
--- /dev/null
+++ b/src/DataTypes/Serializations/SerializationDateTime.cpp
@@ -0,0 +1,155 @@
+#include <DataTypes/Serializations/SerializationDateTime.h>
+
+#include <Columns/ColumnVector.h>
+#include <Common/assert_cast.h>
+#include <common/DateLUT.h>
+#include <Formats/FormatSettings.h>
+#include <Formats/ProtobufReader.h>
+#include <Formats/ProtobufWriter.h>
+#include <IO/Operators.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <IO/parseDateTimeBestEffort.h>
+
+namespace DB
+{
+
+namespace
+{
+
+inline void readText(time_t & x, ReadBuffer & istr, const FormatSettings & settings, const DateLUTImpl & time_zone, const DateLUTImpl & utc_time_zone)
+{
+    switch (settings.date_time_input_format)
+    {
+        case FormatSettings::DateTimeInputFormat::Basic:
+            readDateTimeText(x, istr, time_zone);
+            return;
+        case FormatSettings::DateTimeInputFormat::BestEffort:
+            parseDateTimeBestEffort(x, istr, time_zone, utc_time_zone);
+            return;
+    }
+}
+
+}
+
+SerializationDateTime::SerializationDateTime(
+    const DateLUTImpl & time_zone_, const DateLUTImpl & utc_time_zone_)
+    : time_zone(time_zone_), utc_time_zone(utc_time_zone_)
+{
+}
+
+void SerializationDateTime::serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    auto value = assert_cast<const ColumnType &>(column).getData()[row_num];
+    switch (settings.date_time_output_format)
+    {
+        case FormatSettings::DateTimeOutputFormat::Simple:
+            writeDateTimeText(value, ostr, time_zone);
+            return;
+        case FormatSettings::DateTimeOutputFormat::UnixTimestamp:
+            writeIntText(value, ostr);
+            return;
+        case FormatSettings::DateTimeOutputFormat::ISO:
+            writeDateTimeTextISO(value, ostr, utc_time_zone);
+            return;
+    }
+}
+
+void SerializationDateTime::serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    serializeText(column, row_num, ostr, settings);
+}
+
+void SerializationDateTime::deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    deserializeTextEscaped(column, istr, settings);
+}
+
+void SerializationDateTime::deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    time_t x = 0;
+    readText(x, istr, settings, time_zone, utc_time_zone);
+    if (x < 0)
+        x = 0;
+    assert_cast<ColumnType &>(column).getData().push_back(x);
+}
+
+void SerializationDateTime::serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    writeChar('\'', ostr);
+    serializeText(column, row_num, ostr, settings);
+    writeChar('\'', ostr);
+}
+
+void SerializationDateTime::deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    time_t x = 0;
+    if (checkChar('\'', istr)) /// Cases: '2017-08-31 18:36:48' or '1504193808'
+    {
+        readText(x, istr, settings, time_zone, utc_time_zone);
+        assertChar('\'', istr);
+    }
+    else /// Just 1504193808 or 01504193808
+    {
+        readIntText(x, istr);
+    }
+    if (x < 0)
+        x = 0;
+    assert_cast<ColumnType &>(column).getData().push_back(x);    /// It's important to do this at the end - for exception safety.
+}
+
+void SerializationDateTime::serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    writeChar('"', ostr);
+    serializeText(column, row_num, ostr, settings);
+    writeChar('"', ostr);
+}
+
+void SerializationDateTime::deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    time_t x = 0;
+    if (checkChar('"', istr))
+    {
+        readText(x, istr, settings, time_zone, utc_time_zone);
+        assertChar('"', istr);
+    }
+    else
+    {
+        readIntText(x, istr);
+    }
+    if (x < 0)
+        x = 0;
+    assert_cast<ColumnType &>(column).getData().push_back(x);
+}
+
+void SerializationDateTime::serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    writeChar('"', ostr);
+    serializeText(column, row_num, ostr, settings);
+    writeChar('"', ostr);
+}
+
+void SerializationDateTime::deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    time_t x = 0;
+
+    if (istr.eof())
+        throwReadAfterEOF();
+
+    char maybe_quote = *istr.position();
+
+    if (maybe_quote == '\'' || maybe_quote == '\"')
+        ++istr.position();
+
+    readText(x, istr, settings, time_zone, utc_time_zone);
+
+    if (maybe_quote == '\'' || maybe_quote == '\"')
+        assertChar(maybe_quote, istr);
+
+    if (x < 0)
+        x = 0;
+
+    assert_cast<ColumnType &>(column).getData().push_back(x);
+}
+
+}
diff --git a/src/DataTypes/Serializations/SerializationDateTime.h b/src/DataTypes/Serializations/SerializationDateTime.h
new file mode 100644
index 00000000000..8cf57ddef89
--- /dev/null
+++ b/src/DataTypes/Serializations/SerializationDateTime.h
@@ -0,0 +1,32 @@
+#pragma once
+
+#include <DataTypes/Serializations/SerializationNumber.h>
+
+class DateLUTImpl;
+
+namespace DB
+{
+
+class SerializationDateTime final : public SerializationNumber<UInt32>
+{
+private:
+    const DateLUTImpl & time_zone;
+    const DateLUTImpl & utc_time_zone;
+
+public:
+    SerializationDateTime(const DateLUTImpl & time_zone_, const DateLUTImpl & utc_time_zone_);
+
+    void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
+    void serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    void serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    void serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    void serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
+};
+
+}
+
diff --git a/src/DataTypes/Serializations/SerializationDateTime64.cpp b/src/DataTypes/Serializations/SerializationDateTime64.cpp
new file mode 100644
index 00000000000..9f3958faa4d
--- /dev/null
+++ b/src/DataTypes/Serializations/SerializationDateTime64.cpp
@@ -0,0 +1,151 @@
+#include <DataTypes/Serializations/SerializationDateTime64.h>
+
+#include <Columns/ColumnVector.h>
+#include <Common/assert_cast.h>
+#include <Common/typeid_cast.h>
+#include <common/DateLUT.h>
+#include <Formats/FormatSettings.h>
+#include <Formats/ProtobufReader.h>
+#include <Formats/ProtobufWriter.h>
+#include <IO/Operators.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteBufferFromString.h>
+#include <IO/WriteHelpers.h>
+#include <IO/parseDateTimeBestEffort.h>
+
+namespace DB
+{
+
+SerializationDateTime64::SerializationDateTime64(
+    const DateLUTImpl & time_zone_, const DateLUTImpl & utc_time_zone_, UInt32 scale_)
+    : SerializationDecimalBase<DateTime64>(DecimalUtils::max_precision<DateTime64>, scale_)
+    , time_zone(time_zone_), utc_time_zone(utc_time_zone_)
+{
+}
+
+void SerializationDateTime64::serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    auto value = assert_cast<const ColumnType &>(column).getData()[row_num];
+    switch (settings.date_time_output_format)
+    {
+        case FormatSettings::DateTimeOutputFormat::Simple:
+            writeDateTimeText(value, scale, ostr, time_zone);
+            return;
+        case FormatSettings::DateTimeOutputFormat::UnixTimestamp:
+            writeDateTimeUnixTimestamp(value, scale, ostr);
+            return;
+        case FormatSettings::DateTimeOutputFormat::ISO:
+            writeDateTimeTextISO(value, scale, ostr, utc_time_zone);
+            return;
+    }
+}
+
+void SerializationDateTime64::deserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
+{
+    DateTime64 result = 0;
+    readDateTime64Text(result, scale, istr, time_zone);
+    assert_cast<ColumnType &>(column).getData().push_back(result);
+}
+
+void SerializationDateTime64::deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    deserializeTextEscaped(column, istr, settings);
+}
+
+void SerializationDateTime64::serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    serializeText(column, row_num, ostr, settings);
+}
+
+static inline void readText(DateTime64 & x, UInt32 scale, ReadBuffer & istr, const FormatSettings & settings, const DateLUTImpl & time_zone, const DateLUTImpl & utc_time_zone)
+{
+    switch (settings.date_time_input_format)
+    {
+        case FormatSettings::DateTimeInputFormat::Basic:
+            readDateTime64Text(x, scale, istr, time_zone);
+            return;
+        case FormatSettings::DateTimeInputFormat::BestEffort:
+            parseDateTime64BestEffort(x, scale, istr, time_zone, utc_time_zone);
+            return;
+    }
+}
+
+void SerializationDateTime64::deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    DateTime64 x = 0;
+    readText(x, scale, istr, settings, time_zone, utc_time_zone);
+    assert_cast<ColumnType &>(column).getData().push_back(x);
+}
+
+void SerializationDateTime64::serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    writeChar('\'', ostr);
+    serializeText(column, row_num, ostr, settings);
+    writeChar('\'', ostr);
+}
+
+void SerializationDateTime64::deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    DateTime64 x = 0;
+    if (checkChar('\'', istr)) /// Cases: '2017-08-31 18:36:48' or '1504193808'
+    {
+        readText(x, scale, istr, settings, time_zone, utc_time_zone);
+        assertChar('\'', istr);
+    }
+    else /// Just 1504193808 or 01504193808
+    {
+        readIntText(x, istr);
+    }
+    assert_cast<ColumnType &>(column).getData().push_back(x);    /// It's important to do this at the end - for exception safety.
+}
+
+void SerializationDateTime64::serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    writeChar('"', ostr);
+    serializeText(column, row_num, ostr, settings);
+    writeChar('"', ostr);
+}
+
+void SerializationDateTime64::deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    DateTime64 x = 0;
+    if (checkChar('"', istr))
+    {
+        readText(x, scale, istr, settings, time_zone, utc_time_zone);
+        assertChar('"', istr);
+    }
+    else
+    {
+        readIntText(x, istr);
+    }
+    assert_cast<ColumnType &>(column).getData().push_back(x);
+}
+
+void SerializationDateTime64::serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    writeChar('"', ostr);
+    serializeText(column, row_num, ostr, settings);
+    writeChar('"', ostr);
+}
+
+void SerializationDateTime64::deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    DateTime64 x = 0;
+
+    if (istr.eof())
+        throwReadAfterEOF();
+
+    char maybe_quote = *istr.position();
+
+    if (maybe_quote == '\'' || maybe_quote == '\"')
+        ++istr.position();
+
+    readText(x, scale, istr, settings, time_zone, utc_time_zone);
+
+    if (maybe_quote == '\'' || maybe_quote == '\"')
+        assertChar(maybe_quote, istr);
+
+    assert_cast<ColumnType &>(column).getData().push_back(x);
+}
+
+}
diff --git a/src/DataTypes/Serializations/SerializationDateTime64.h b/src/DataTypes/Serializations/SerializationDateTime64.h
new file mode 100644
index 00000000000..c36649daef1
--- /dev/null
+++ b/src/DataTypes/Serializations/SerializationDateTime64.h
@@ -0,0 +1,32 @@
+#pragma once
+
+#include <DataTypes/Serializations/SerializationDecimalBase.h>
+
+class DateLUTImpl;
+
+namespace DB
+{
+
+class SerializationDateTime64 final : public SerializationDecimalBase<DateTime64>
+{
+private:
+    const DateLUTImpl & time_zone;
+    const DateLUTImpl & utc_time_zone;
+
+public:
+    SerializationDateTime64(const DateLUTImpl & time_zone_, const DateLUTImpl & utc_time_zone_, UInt32 scale_);
+
+    void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void deserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    void deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
+    void serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    void serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    void serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    void serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
+};
+
+}
diff --git a/src/DataTypes/Serializations/SerializationDecimal.cpp b/src/DataTypes/Serializations/SerializationDecimal.cpp
new file mode 100644
index 00000000000..e0073c80aca
--- /dev/null
+++ b/src/DataTypes/Serializations/SerializationDecimal.cpp
@@ -0,0 +1,74 @@
+#include <DataTypes/Serializations/SerializationDecimal.h>
+
+#include <Columns/ColumnVector.h>
+#include <Common/assert_cast.h>
+#include <Common/typeid_cast.h>
+#include <Formats/ProtobufReader.h>
+#include <Formats/ProtobufWriter.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <IO/readDecimalText.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int DECIMAL_OVERFLOW;
+}
+
+template <typename T>
+bool SerializationDecimal<T>::tryReadText(T & x, ReadBuffer & istr, UInt32 precision, UInt32 scale)
+{
+    UInt32 unread_scale = scale;
+    if (!tryReadDecimalText(istr, x, precision, unread_scale))
+        return false;
+
+    if (common::mulOverflow(x.value, DecimalUtils::scaleMultiplier<T>(unread_scale), x.value))
+        return false;
+
+    return true;
+}
+
+template <typename T>
+void SerializationDecimal<T>::readText(T & x, ReadBuffer & istr, UInt32 precision, UInt32 scale, bool csv)
+{
+    UInt32 unread_scale = scale;
+    if (csv)
+        readCSVDecimalText(istr, x, precision, unread_scale);
+    else
+        readDecimalText(istr, x, precision, unread_scale);
+
+    if (common::mulOverflow(x.value, DecimalUtils::scaleMultiplier<T>(unread_scale), x.value))
+        throw Exception("Decimal math overflow", ErrorCodes::DECIMAL_OVERFLOW);
+}
+
+template <typename T>
+void SerializationDecimal<T>::serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const
+{
+    T value = assert_cast<const ColumnType &>(column).getData()[row_num];
+    writeText(value, this->scale, ostr);
+}
+
+template <typename T>
+void SerializationDecimal<T>::deserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
+{
+    T x;
+    readText(x, istr);
+    assert_cast<ColumnType &>(column).getData().push_back(x);
+}
+
+template <typename T>
+void SerializationDecimal<T>::deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
+{
+    T x;
+    readText(x, istr, true);
+    assert_cast<ColumnType &>(column).getData().push_back(x);
+}
+
+template class SerializationDecimal<Decimal32>;
+template class SerializationDecimal<Decimal64>;
+template class SerializationDecimal<Decimal128>;
+template class SerializationDecimal<Decimal256>;
+
+}
diff --git a/src/DataTypes/Serializations/SerializationDecimal.h b/src/DataTypes/Serializations/SerializationDecimal.h
new file mode 100644
index 00000000000..dc193cdf0d3
--- /dev/null
+++ b/src/DataTypes/Serializations/SerializationDecimal.h
@@ -0,0 +1,27 @@
+#pragma once
+
+#include <DataTypes/Serializations/SerializationDecimalBase.h>
+
+namespace DB
+{
+
+template <typename T>
+class SerializationDecimal final : public SerializationDecimalBase<T>
+{
+public:
+    using typename SerializationDecimalBase<T>::ColumnType;
+
+    SerializationDecimal(UInt32 precision_, UInt32 scale_)
+        : SerializationDecimalBase<T>(precision_, scale_) {}
+
+    void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void deserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+
+    void readText(T & x, ReadBuffer & istr, bool csv = false) const { readText(x, istr, this->precision, this->scale, csv); }
+
+    static void readText(T & x, ReadBuffer & istr, UInt32 precision_, UInt32 scale_, bool csv = false);
+    static bool tryReadText(T & x, ReadBuffer & istr, UInt32 precision_, UInt32 scale_);
+};
+
+}
diff --git a/src/DataTypes/Serializations/SerializationDecimalBase.cpp b/src/DataTypes/Serializations/SerializationDecimalBase.cpp
new file mode 100644
index 00000000000..8557c9ff719
--- /dev/null
+++ b/src/DataTypes/Serializations/SerializationDecimalBase.cpp
@@ -0,0 +1,73 @@
+#include <DataTypes/Serializations/SerializationDecimalBase.h>
+
+#include <Common/assert_cast.h>
+#include <Common/typeid_cast.h>
+#include <Formats/ProtobufReader.h>
+#include <Formats/ProtobufWriter.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+
+
+namespace DB
+{
+
+template <typename T>
+void SerializationDecimalBase<T>::serializeBinary(const Field & field, WriteBuffer & ostr) const
+{
+    FieldType x = get<DecimalField<T>>(field);
+    writeBinary(x, ostr);
+}
+
+template <typename T>
+void SerializationDecimalBase<T>::serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr) const
+{
+    const FieldType & x = assert_cast<const ColumnType &>(column).getElement(row_num);
+    writeBinary(x, ostr);
+}
+
+template <typename T>
+void SerializationDecimalBase<T>::serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, size_t offset, size_t limit) const
+{
+    const typename ColumnType::Container & x = typeid_cast<const ColumnType &>(column).getData();
+
+    size_t size = x.size();
+
+    if (limit == 0 || offset + limit > size)
+        limit = size - offset;
+
+    ostr.write(reinterpret_cast<const char *>(&x[offset]), sizeof(FieldType) * limit);
+}
+
+template <typename T>
+void SerializationDecimalBase<T>::deserializeBinary(Field & field, ReadBuffer & istr) const
+{
+    typename FieldType::NativeType x;
+    readBinary(x, istr);
+    field = DecimalField(T(x), this->scale);
+}
+
+template <typename T>
+void SerializationDecimalBase<T>::deserializeBinary(IColumn & column, ReadBuffer & istr) const
+{
+    typename FieldType::NativeType x;
+    readBinary(x, istr);
+    assert_cast<ColumnType &>(column).getData().push_back(FieldType(x));
+}
+
+template <typename T>
+void SerializationDecimalBase<T>::deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, size_t limit, double) const
+{
+    typename ColumnType::Container & x = typeid_cast<ColumnType &>(column).getData();
+    size_t initial_size = x.size();
+    x.resize(initial_size + limit);
+    size_t size = istr.readBig(reinterpret_cast<char*>(&x[initial_size]), sizeof(FieldType) * limit);
+    x.resize(initial_size + size / sizeof(FieldType));
+}
+
+template class SerializationDecimalBase<Decimal32>;
+template class SerializationDecimalBase<Decimal64>;
+template class SerializationDecimalBase<Decimal128>;
+template class SerializationDecimalBase<Decimal256>;
+template class SerializationDecimalBase<DateTime64>;
+
+}
diff --git a/src/DataTypes/Serializations/SerializationDecimalBase.h b/src/DataTypes/Serializations/SerializationDecimalBase.h
new file mode 100644
index 00000000000..fd3dcb17e35
--- /dev/null
+++ b/src/DataTypes/Serializations/SerializationDecimalBase.h
@@ -0,0 +1,32 @@
+#pragma once
+
+#include <DataTypes/Serializations/SimpleTextSerialization.h>
+#include <Columns/ColumnDecimal.h>
+
+namespace DB
+{
+
+template <typename T>
+class SerializationDecimalBase : public SimpleTextSerialization
+{
+protected:
+    const UInt32 precision;
+    const UInt32 scale;
+
+public:
+    using FieldType = T;
+    using ColumnType = ColumnDecimal<T>;
+
+    SerializationDecimalBase(UInt32 precision_, UInt32 scale_)
+        : precision(precision_), scale(scale_) {}
+
+    void serializeBinary(const Field & field, WriteBuffer & ostr) const override;
+    void serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr) const override;
+    void serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, size_t offset, size_t limit) const override;
+
+    void deserializeBinary(Field & field, ReadBuffer & istr) const override;
+    void deserializeBinary(IColumn & column, ReadBuffer & istr) const override;
+    void deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, size_t limit, double avg_value_size_hint) const override;
+};
+
+}
diff --git a/src/DataTypes/Serializations/SerializationEnum.cpp b/src/DataTypes/Serializations/SerializationEnum.cpp
new file mode 100644
index 00000000000..a1550e70608
--- /dev/null
+++ b/src/DataTypes/Serializations/SerializationEnum.cpp
@@ -0,0 +1,112 @@
+#include <DataTypes/Serializations/SerializationEnum.h>
+
+#include <IO/WriteBufferFromString.h>
+#include <Formats/FormatSettings.h>
+#include <Formats/ProtobufReader.h>
+#include <Formats/ProtobufWriter.h>
+#include <Common/assert_cast.h>
+
+namespace DB
+{
+
+template <typename Type>
+void SerializationEnum<Type>::serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const
+{
+    writeString(this->getNameForValue(assert_cast<const ColumnType &>(column).getData()[row_num]), ostr);
+}
+
+template <typename Type>
+void SerializationEnum<Type>::serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const
+{
+    writeEscapedString(this->getNameForValue(assert_cast<const ColumnType &>(column).getData()[row_num]), ostr);
+}
+
+template <typename Type>
+void SerializationEnum<Type>::deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    if (settings.tsv.input_format_enum_as_number)
+        assert_cast<ColumnType &>(column).getData().push_back(readValue(istr));
+    else
+    {
+        /// NOTE It would be nice to do without creating a temporary object - at least extract std::string out.
+        std::string field_name;
+        readEscapedString(field_name, istr);
+        assert_cast<ColumnType &>(column).getData().push_back(this->getValue(StringRef(field_name), true));
+    }
+}
+
+template <typename Type>
+void SerializationEnum<Type>::serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const
+{
+    writeQuotedString(this->getNameForValue(assert_cast<const ColumnType &>(column).getData()[row_num]), ostr);
+}
+
+template <typename Type>
+void SerializationEnum<Type>::deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
+{
+    std::string field_name;
+    readQuotedStringWithSQLStyle(field_name, istr);
+    assert_cast<ColumnType &>(column).getData().push_back(this->getValue(StringRef(field_name)));
+}
+
+template <typename Type>
+void SerializationEnum<Type>::deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    if (settings.tsv.input_format_enum_as_number)
+        assert_cast<ColumnType &>(column).getData().push_back(readValue(istr));
+    else
+    {
+        std::string field_name;
+        readString(field_name, istr);
+        assert_cast<ColumnType &>(column).getData().push_back(this->getValue(StringRef(field_name), true));
+    }
+}
+
+template <typename Type>
+void SerializationEnum<Type>::serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    writeJSONString(this->getNameForValue(assert_cast<const ColumnType &>(column).getData()[row_num]), ostr, settings);
+}
+
+template <typename Type>
+void SerializationEnum<Type>::serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const
+{
+    writeXMLStringForTextElement(this->getNameForValue(assert_cast<const ColumnType &>(column).getData()[row_num]), ostr);
+}
+
+template <typename Type>
+void SerializationEnum<Type>::deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
+{
+    if (!istr.eof() && *istr.position() != '"')
+        assert_cast<ColumnType &>(column).getData().push_back(readValue(istr));
+    else
+    {
+        std::string field_name;
+        readJSONString(field_name, istr);
+        assert_cast<ColumnType &>(column).getData().push_back(this->getValue(StringRef(field_name)));
+    }
+}
+
+template <typename Type>
+void SerializationEnum<Type>::serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const
+{
+    writeCSVString(this->getNameForValue(assert_cast<const ColumnType &>(column).getData()[row_num]), ostr);
+}
+
+template <typename Type>
+void SerializationEnum<Type>::deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    if (settings.csv.input_format_enum_as_number)
+        assert_cast<ColumnType &>(column).getData().push_back(readValue(istr));
+    else
+    {
+        std::string field_name;
+        readCSVString(field_name, istr, settings.csv);
+        assert_cast<ColumnType &>(column).getData().push_back(this->getValue(StringRef(field_name), true));
+    }
+}
+
+template class SerializationEnum<Int8>;
+template class SerializationEnum<Int16>;
+
+}
diff --git a/src/DataTypes/Serializations/SerializationEnum.h b/src/DataTypes/Serializations/SerializationEnum.h
new file mode 100644
index 00000000000..dfa9e74c7a1
--- /dev/null
+++ b/src/DataTypes/Serializations/SerializationEnum.h
@@ -0,0 +1,40 @@
+#pragma once
+
+#include <DataTypes/Serializations/SerializationNumber.h>
+#include <DataTypes/EnumValues.h>
+
+namespace DB
+{
+
+template <typename Type>
+class SerializationEnum : public SerializationNumber<Type>, public EnumValues<Type>
+{
+public:
+    using typename SerializationNumber<Type>::FieldType;
+    using typename SerializationNumber<Type>::ColumnType;
+    using typename EnumValues<Type>::Values;
+
+    SerializationEnum(const Values & values_) : EnumValues<Type>(values_) {}
+
+    void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    void serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    void deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+
+    void serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    void serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
+
+    FieldType readValue(ReadBuffer & istr) const
+    {
+        FieldType x;
+        readText(x, istr);
+        return this->findByValue(x)->first;
+    }
+};
+
+}
diff --git a/src/DataTypes/Serializations/SerializationFixedString.cpp b/src/DataTypes/Serializations/SerializationFixedString.cpp
new file mode 100644
index 00000000000..5c63631e2a3
--- /dev/null
+++ b/src/DataTypes/Serializations/SerializationFixedString.cpp
@@ -0,0 +1,203 @@
+#include <DataTypes/Serializations/SerializationFixedString.h>
+
+#include <Columns/ColumnFixedString.h>
+#include <Columns/ColumnConst.h>
+
+#include <Formats/FormatSettings.h>
+#include <Formats/ProtobufReader.h>
+#include <Formats/ProtobufWriter.h>
+
+#include <IO/WriteBuffer.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <IO/VarInt.h>
+
+#include <Common/typeid_cast.h>
+#include <Common/assert_cast.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int CANNOT_READ_ALL_DATA;
+    extern const int TOO_LARGE_STRING_SIZE;
+}
+
+void SerializationFixedString::serializeBinary(const Field & field, WriteBuffer & ostr) const
+{
+    const String & s = get<const String &>(field);
+    ostr.write(s.data(), std::min(s.size(), n));
+    if (s.size() < n)
+        for (size_t i = s.size(); i < n; ++i)
+            ostr.write(0);
+}
+
+
+void SerializationFixedString::deserializeBinary(Field & field, ReadBuffer & istr) const
+{
+    field = String();
+    String & s = get<String &>(field);
+    s.resize(n);
+    istr.readStrict(s.data(), n);
+}
+
+
+void SerializationFixedString::serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr) const
+{
+    ostr.write(reinterpret_cast<const char *>(&assert_cast<const ColumnFixedString &>(column).getChars()[n * row_num]), n);
+}
+
+
+void SerializationFixedString::deserializeBinary(IColumn & column, ReadBuffer & istr) const
+{
+    ColumnFixedString::Chars & data = assert_cast<ColumnFixedString &>(column).getChars();
+    size_t old_size = data.size();
+    data.resize(old_size + n);
+    try
+    {
+        istr.readStrict(reinterpret_cast<char *>(data.data() + old_size), n);
+    }
+    catch (...)
+    {
+        data.resize_assume_reserved(old_size);
+        throw;
+    }
+}
+
+
+void SerializationFixedString::serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, size_t offset, size_t limit) const
+{
+    const ColumnFixedString::Chars & data = typeid_cast<const ColumnFixedString &>(column).getChars();
+
+    size_t size = data.size() / n;
+
+    if (limit == 0 || offset + limit > size)
+        limit = size - offset;
+
+    if (limit)
+        ostr.write(reinterpret_cast<const char *>(&data[n * offset]), n * limit);
+}
+
+
+void SerializationFixedString::deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, size_t limit, double /*avg_value_size_hint*/) const
+{
+    ColumnFixedString::Chars & data = typeid_cast<ColumnFixedString &>(column).getChars();
+
+    size_t initial_size = data.size();
+    size_t max_bytes = limit * n;
+    data.resize(initial_size + max_bytes);
+    size_t read_bytes = istr.readBig(reinterpret_cast<char *>(&data[initial_size]), max_bytes);
+
+    if (read_bytes % n != 0)
+        throw Exception("Cannot read all data of type FixedString. Bytes read:" + toString(read_bytes) + ". String size:" + toString(n) + ".",
+            ErrorCodes::CANNOT_READ_ALL_DATA);
+
+    data.resize(initial_size + read_bytes);
+}
+
+
+void SerializationFixedString::serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const
+{
+    writeString(reinterpret_cast<const char *>(&assert_cast<const ColumnFixedString &>(column).getChars()[n * row_num]), n, ostr);
+}
+
+
+void SerializationFixedString::serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const
+{
+    const char * pos = reinterpret_cast<const char *>(&assert_cast<const ColumnFixedString &>(column).getChars()[n * row_num]);
+    writeAnyEscapedString<'\''>(pos, pos + n, ostr);
+}
+
+
+void SerializationFixedString::alignStringLength(size_t n, PaddedPODArray<UInt8> & data, size_t string_start)
+{
+    size_t length = data.size() - string_start;
+    if (length < n)
+    {
+        data.resize_fill(string_start + n);
+    }
+    else if (length > n)
+    {
+        data.resize_assume_reserved(string_start);
+        throw Exception(ErrorCodes::TOO_LARGE_STRING_SIZE, "Too large value for FixedString({})", n);
+    }
+}
+
+template <typename Reader>
+static inline void read(const SerializationFixedString & self, IColumn & column, Reader && reader)
+{
+    ColumnFixedString::Chars & data = typeid_cast<ColumnFixedString &>(column).getChars();
+    size_t prev_size = data.size();
+    try
+    {
+        reader(data);
+        SerializationFixedString::alignStringLength(self.getN(), data, prev_size);
+    }
+    catch (...)
+    {
+        data.resize_assume_reserved(prev_size);
+        throw;
+    }
+}
+
+
+void SerializationFixedString::deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
+{
+    read(*this, column, [&istr](ColumnFixedString::Chars & data) { readEscapedStringInto(data, istr); });
+}
+
+
+void SerializationFixedString::serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const
+{
+    const char * pos = reinterpret_cast<const char *>(&assert_cast<const ColumnFixedString &>(column).getChars()[n * row_num]);
+    writeAnyQuotedString<'\''>(pos, pos + n, ostr);
+}
+
+
+void SerializationFixedString::deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
+{
+    read(*this, column, [&istr](ColumnFixedString::Chars & data) { readQuotedStringInto<true>(data, istr); });
+}
+
+
+void SerializationFixedString::deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
+{
+    read(*this, column, [&istr](ColumnFixedString::Chars & data) { readStringInto(data, istr); });
+}
+
+
+void SerializationFixedString::serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    const char * pos = reinterpret_cast<const char *>(&assert_cast<const ColumnFixedString &>(column).getChars()[n * row_num]);
+    writeJSONString(pos, pos + n, ostr, settings);
+}
+
+
+void SerializationFixedString::deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
+{
+    read(*this, column, [&istr](ColumnFixedString::Chars & data) { readJSONStringInto(data, istr); });
+}
+
+
+void SerializationFixedString::serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const
+{
+    const char * pos = reinterpret_cast<const char *>(&assert_cast<const ColumnFixedString &>(column).getChars()[n * row_num]);
+    writeXMLStringForTextElement(pos, pos + n, ostr);
+}
+
+
+void SerializationFixedString::serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const
+{
+    const char * pos = reinterpret_cast<const char *>(&assert_cast<const ColumnFixedString &>(column).getChars()[n * row_num]);
+    writeCSVString(pos, pos + n, ostr);
+}
+
+
+void SerializationFixedString::deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    read(*this, column, [&istr, &csv = settings.csv](ColumnFixedString::Chars & data) { readCSVStringInto(data, istr, csv); });
+}
+
+
+}
diff --git a/src/DataTypes/Serializations/SerializationFixedString.h b/src/DataTypes/Serializations/SerializationFixedString.h
new file mode 100644
index 00000000000..82559d10800
--- /dev/null
+++ b/src/DataTypes/Serializations/SerializationFixedString.h
@@ -0,0 +1,50 @@
+#pragma once
+
+#include <DataTypes/Serializations/ISerialization.h>
+#include <Common/PODArray.h>
+
+namespace DB
+{
+
+class SerializationFixedString : public ISerialization
+{
+private:
+    size_t n;
+
+public:
+    SerializationFixedString(size_t n_) : n(n_) {}
+    size_t getN() const { return n; }
+
+    void serializeBinary(const Field & field, WriteBuffer & ostr) const override;
+    void deserializeBinary(Field & field, ReadBuffer & istr) const override;
+    void serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr) const override;
+    void deserializeBinary(IColumn & column, ReadBuffer & istr) const override;
+
+    void serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, size_t offset, size_t limit) const override;
+    void deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, size_t limit, double avg_value_size_hint) const override;
+
+    void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+
+    void deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+
+    void serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+
+    void serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+
+    void serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+
+    void serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+
+    void serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+
+    /// Makes sure that the length of a newly inserted string to `chars` is equal to getN().
+    /// If the length is less than getN() the function will add zero characters up to getN().
+    /// If the length is greater than getN() the function will throw an exception.
+    static void alignStringLength(size_t n, PaddedPODArray<UInt8> & data, size_t string_start);
+};
+
+}
diff --git a/src/DataTypes/Serializations/SerializationIP.cpp b/src/DataTypes/Serializations/SerializationIP.cpp
new file mode 100644
index 00000000000..ec49f960c77
--- /dev/null
+++ b/src/DataTypes/Serializations/SerializationIP.cpp
@@ -0,0 +1,94 @@
+#include <DataTypes/Serializations/SerializationIP.h>
+#include <Columns/ColumnsNumber.h>
+#include <Common/Exception.h>
+#include <Common/formatIPv6.h>
+#include <Functions/FunctionsCoding.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int CANNOT_PARSE_DOMAIN_VALUE_FROM_STRING;
+    extern const int ILLEGAL_COLUMN;
+}
+
+SerializationIPv4::SerializationIPv4(const SerializationPtr & nested_)
+    : SerializationCustomSimpleText(nested_)
+{
+}
+
+void SerializationIPv4::serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const
+{
+    const auto * col = checkAndGetColumn<ColumnUInt32>(&column);
+    if (!col)
+    {
+        throw Exception("IPv4 type can only serialize columns of type UInt32." + column.getName(), ErrorCodes::ILLEGAL_COLUMN);
+    }
+
+    char buffer[IPV4_MAX_TEXT_LENGTH + 1] = {'\0'};
+    char * ptr = buffer;
+    formatIPv4(reinterpret_cast<const unsigned char *>(&col->getData()[row_num]), ptr);
+
+    ostr.write(buffer, strlen(buffer));
+}
+
+void SerializationIPv4::deserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
+{
+    ColumnUInt32 * col = typeid_cast<ColumnUInt32 *>(&column);
+    if (!col)
+    {
+        throw Exception("IPv4 type can only deserialize columns of type UInt32." + column.getName(), ErrorCodes::ILLEGAL_COLUMN);
+    }
+
+    char buffer[IPV4_MAX_TEXT_LENGTH + 1] = {'\0'};
+    istr.read(buffer, sizeof(buffer) - 1);
+    UInt32 ipv4_value = 0;
+    if (!parseIPv4(buffer, reinterpret_cast<unsigned char *>(&ipv4_value)))
+    {
+        throw Exception("Invalid IPv4 value.", ErrorCodes::CANNOT_PARSE_DOMAIN_VALUE_FROM_STRING);
+    }
+
+    col->insert(ipv4_value);
+}
+
+SerializationIPv6::SerializationIPv6(const SerializationPtr & nested_)
+    : SerializationCustomSimpleText(nested_)
+{
+}
+void SerializationIPv6::serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const
+{
+    const auto * col = checkAndGetColumn<ColumnFixedString>(&column);
+    if (!col)
+    {
+        throw Exception("IPv6 type domain can only serialize columns of type FixedString(16)." + column.getName(), ErrorCodes::ILLEGAL_COLUMN);
+    }
+
+    char buffer[IPV6_MAX_TEXT_LENGTH + 1] = {'\0'};
+    char * ptr = buffer;
+    formatIPv6(reinterpret_cast<const unsigned char *>(col->getDataAt(row_num).data), ptr);
+
+    ostr.write(buffer, strlen(buffer));
+}
+
+void SerializationIPv6::deserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
+{
+    ColumnFixedString * col = typeid_cast<ColumnFixedString *>(&column);
+    if (!col)
+    {
+        throw Exception("IPv6 type domain can only deserialize columns of type FixedString(16)." + column.getName(), ErrorCodes::ILLEGAL_COLUMN);
+    }
+
+    char buffer[IPV6_MAX_TEXT_LENGTH + 1] = {'\0'};
+    istr.read(buffer, sizeof(buffer) - 1);
+
+    std::string ipv6_value(IPV6_BINARY_LENGTH, '\0');
+    if (!parseIPv6(buffer, reinterpret_cast<unsigned char *>(ipv6_value.data())))
+    {
+        throw Exception("Invalid IPv6 value.", ErrorCodes::CANNOT_PARSE_DOMAIN_VALUE_FROM_STRING);
+    }
+
+    col->insertString(ipv6_value);
+}
+
+}
diff --git a/src/DataTypes/Serializations/SerializationIP.h b/src/DataTypes/Serializations/SerializationIP.h
new file mode 100644
index 00000000000..f1f4d90aba5
--- /dev/null
+++ b/src/DataTypes/Serializations/SerializationIP.h
@@ -0,0 +1,26 @@
+#pragma once
+
+#include <DataTypes/Serializations/SerializationCustomSimpleText.h>
+
+namespace DB
+{
+
+class SerializationIPv4 final : public SerializationCustomSimpleText
+{
+public:
+    SerializationIPv4(const SerializationPtr & nested_);
+
+    void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void deserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+};
+
+class SerializationIPv6 : public SerializationCustomSimpleText
+{
+public:
+    SerializationIPv6(const SerializationPtr & nested_);
+
+    void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void deserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+};
+
+}
diff --git a/src/DataTypes/Serializations/SerializationLowCardinality.cpp b/src/DataTypes/Serializations/SerializationLowCardinality.cpp
new file mode 100644
index 00000000000..41d9a4100e0
--- /dev/null
+++ b/src/DataTypes/Serializations/SerializationLowCardinality.cpp
@@ -0,0 +1,827 @@
+#include <DataTypes/Serializations/SerializationLowCardinality.h>
+#include <DataTypes/DataTypeLowCardinality.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/DataTypesNumber.h>
+
+#include <Columns/ColumnLowCardinality.h>
+#include <Columns/ColumnUnique.h>
+#include <Columns/ColumnFixedString.h>
+#include <Columns/ColumnsCommon.h>
+#include <Common/HashTable/HashMap.h>
+#include <Common/typeid_cast.h>
+#include <Common/assert_cast.h>
+#include <Core/Field.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+namespace
+{
+    const ColumnLowCardinality & getColumnLowCardinality(const IColumn & column)
+    {
+        return typeid_cast<const ColumnLowCardinality &>(column);
+    }
+
+    ColumnLowCardinality & getColumnLowCardinality(IColumn & column)
+    {
+        return typeid_cast<ColumnLowCardinality &>(column);
+    }
+}
+
+SerializationLowCardinality::SerializationLowCardinality(const DataTypePtr & dictionary_type_)
+     : dictionary_type(dictionary_type_)
+     , dict_inner_serialization(removeNullable(dictionary_type_)->getDefaultSerialization())
+{
+}
+
+void SerializationLowCardinality::enumerateStreams(const StreamCallback & callback, SubstreamPath & path) const
+{
+    path.push_back(Substream::DictionaryKeys);
+    dict_inner_serialization->enumerateStreams(callback, path);
+    path.back() = Substream::DictionaryIndexes;
+    callback(path);
+    path.pop_back();
+}
+
+struct KeysSerializationVersion
+{
+    enum Value
+    {
+        /// Version is written at the start of <name.dict.bin>.
+        /// Dictionary is written as number N and N keys after them.
+        /// Dictionary can be shared for continuous range of granules, so some marks may point to the same position.
+        /// Shared dictionary is stored in state and is read once.
+        SharedDictionariesWithAdditionalKeys = 1,
+    };
+
+    Value value;
+
+    static void checkVersion(UInt64 version)
+    {
+        if (version != SharedDictionariesWithAdditionalKeys)
+            throw Exception("Invalid version for SerializationLowCardinality key column.", ErrorCodes::LOGICAL_ERROR);
+    }
+
+    explicit KeysSerializationVersion(UInt64 version) : value(static_cast<Value>(version)) { checkVersion(version); }
+};
+
+/// Version is stored at the start of each granule. It's used to store indexes type and flags.
+struct IndexesSerializationType
+{
+    using SerializationType = UInt64;
+    /// Need to read dictionary if it wasn't.
+    static constexpr SerializationType NeedGlobalDictionaryBit = 1u << 8u;
+    /// Need to read additional keys. Additional keys are stored before indexes as value N and N keys after them.
+    static constexpr SerializationType HasAdditionalKeysBit = 1u << 9u;
+    /// Need to update dictionary. It means that previous granule has different dictionary.
+    static constexpr SerializationType NeedUpdateDictionary = 1u << 10u;
+
+    enum Type
+    {
+        TUInt8 = 0,
+        TUInt16,
+        TUInt32,
+        TUInt64,
+    };
+
+    Type type;
+    bool has_additional_keys;
+    bool need_global_dictionary;
+    bool need_update_dictionary;
+
+    static constexpr SerializationType resetFlags(SerializationType type)
+    {
+        return type & (~(HasAdditionalKeysBit | NeedGlobalDictionaryBit | NeedUpdateDictionary));
+    }
+
+    static void checkType(SerializationType type)
+    {
+        UInt64 value = resetFlags(type);
+        if (value <= TUInt64)
+            return;
+
+        throw Exception("Invalid type for SerializationLowCardinality index column.", ErrorCodes::LOGICAL_ERROR);
+    }
+
+    void serialize(WriteBuffer & buffer) const
+    {
+        SerializationType val = type;
+        if (has_additional_keys)
+            val |= HasAdditionalKeysBit;
+        if (need_global_dictionary)
+            val |= NeedGlobalDictionaryBit;
+        if (need_update_dictionary)
+            val |= NeedUpdateDictionary;
+        writeIntBinary(val, buffer);
+    }
+
+    void deserialize(ReadBuffer & buffer)
+    {
+        SerializationType val;
+        readIntBinary(val, buffer);
+        checkType(val);
+        has_additional_keys = (val & HasAdditionalKeysBit) != 0;
+        need_global_dictionary = (val & NeedGlobalDictionaryBit) != 0;
+        need_update_dictionary = (val & NeedUpdateDictionary) != 0;
+        type = static_cast<Type>(resetFlags(val));
+    }
+
+    IndexesSerializationType(const IColumn & column,
+                             bool has_additional_keys_,
+                             bool need_global_dictionary_,
+                             bool enumerate_dictionaries)
+        : has_additional_keys(has_additional_keys_)
+        , need_global_dictionary(need_global_dictionary_)
+        , need_update_dictionary(enumerate_dictionaries)
+    {
+        if (typeid_cast<const ColumnUInt8 *>(&column))
+            type = TUInt8;
+        else if (typeid_cast<const ColumnUInt16 *>(&column))
+            type = TUInt16;
+        else if (typeid_cast<const ColumnUInt32 *>(&column))
+            type = TUInt32;
+        else if (typeid_cast<const ColumnUInt64 *>(&column))
+            type = TUInt64;
+        else
+            throw Exception("Invalid Indexes column for IndexesSerializationType. Expected ColumnUInt*, got "
+                            + column.getName(), ErrorCodes::LOGICAL_ERROR);
+    }
+
+    DataTypePtr getDataType() const
+    {
+        if (type == TUInt8)
+            return std::make_shared<DataTypeUInt8>();
+        if (type == TUInt16)
+            return std::make_shared<DataTypeUInt16>();
+        if (type == TUInt32)
+            return std::make_shared<DataTypeUInt32>();
+        if (type == TUInt64)
+            return std::make_shared<DataTypeUInt64>();
+
+        throw Exception("Can't create DataType from IndexesSerializationType.", ErrorCodes::LOGICAL_ERROR);
+    }
+
+    IndexesSerializationType() = default;
+};
+
+struct SerializeStateLowCardinality : public ISerialization::SerializeBinaryBulkState
+{
+    KeysSerializationVersion key_version;
+    MutableColumnUniquePtr shared_dictionary;
+
+    explicit SerializeStateLowCardinality(UInt64 key_version_) : key_version(key_version_) {}
+};
+
+struct DeserializeStateLowCardinality : public ISerialization::DeserializeBinaryBulkState
+{
+    KeysSerializationVersion key_version;
+    ColumnUniquePtr global_dictionary;
+
+    IndexesSerializationType index_type;
+    ColumnPtr additional_keys;
+    ColumnPtr null_map;
+    UInt64 num_pending_rows = 0;
+
+    /// If dictionary should be updated.
+    /// Can happen is some granules was skipped while reading from MergeTree.
+    /// We should store this flag in State because
+    ///   in case of long block of empty arrays we may not need read dictionary at first reading.
+    bool need_update_dictionary = false;
+
+    explicit DeserializeStateLowCardinality(UInt64 key_version_) : key_version(key_version_) {}
+};
+
+static SerializeStateLowCardinality * checkAndGetLowCardinalitySerializeState(
+    ISerialization::SerializeBinaryBulkStatePtr & state)
+{
+    if (!state)
+        throw Exception("Got empty state for SerializationLowCardinality.", ErrorCodes::LOGICAL_ERROR);
+
+    auto * low_cardinality_state = typeid_cast<SerializeStateLowCardinality *>(state.get());
+    if (!low_cardinality_state)
+    {
+        auto & state_ref = *state;
+        throw Exception("Invalid SerializeBinaryBulkState for SerializationLowCardinality. Expected: "
+                        + demangle(typeid(SerializeStateLowCardinality).name()) + ", got "
+                        + demangle(typeid(state_ref).name()), ErrorCodes::LOGICAL_ERROR);
+    }
+
+    return low_cardinality_state;
+}
+
+static DeserializeStateLowCardinality * checkAndGetLowCardinalityDeserializeState(
+    ISerialization::DeserializeBinaryBulkStatePtr & state)
+{
+    if (!state)
+        throw Exception("Got empty state for SerializationLowCardinality.", ErrorCodes::LOGICAL_ERROR);
+
+    auto * low_cardinality_state = typeid_cast<DeserializeStateLowCardinality *>(state.get());
+    if (!low_cardinality_state)
+    {
+        auto & state_ref = *state;
+        throw Exception("Invalid DeserializeBinaryBulkState for SerializationLowCardinality. Expected: "
+                        + demangle(typeid(DeserializeStateLowCardinality).name()) + ", got "
+                        + demangle(typeid(state_ref).name()), ErrorCodes::LOGICAL_ERROR);
+    }
+
+    return low_cardinality_state;
+}
+
+void SerializationLowCardinality::serializeBinaryBulkStatePrefix(
+    SerializeBinaryBulkSettings & settings,
+    SerializeBinaryBulkStatePtr & state) const
+{
+    settings.path.push_back(Substream::DictionaryKeys);
+    auto * stream = settings.getter(settings.path);
+    settings.path.pop_back();
+
+    if (!stream)
+        throw Exception("Got empty stream in SerializationLowCardinality::serializeBinaryBulkStatePrefix",
+                        ErrorCodes::LOGICAL_ERROR);
+
+    /// Write version and create SerializeBinaryBulkState.
+    UInt64 key_version = KeysSerializationVersion::SharedDictionariesWithAdditionalKeys;
+
+    writeIntBinary(key_version, *stream);
+
+    state = std::make_shared<SerializeStateLowCardinality>(key_version);
+}
+
+void SerializationLowCardinality::serializeBinaryBulkStateSuffix(
+    SerializeBinaryBulkSettings & settings,
+    SerializeBinaryBulkStatePtr & state) const
+{
+    auto * low_cardinality_state = checkAndGetLowCardinalitySerializeState(state);
+    KeysSerializationVersion::checkVersion(low_cardinality_state->key_version.value);
+
+    if (low_cardinality_state->shared_dictionary && settings.low_cardinality_max_dictionary_size)
+    {
+        auto nested_column = low_cardinality_state->shared_dictionary->getNestedNotNullableColumn();
+
+        settings.path.push_back(Substream::DictionaryKeys);
+        auto * stream = settings.getter(settings.path);
+        settings.path.pop_back();
+
+        if (!stream)
+            throw Exception("Got empty stream in SerializationLowCardinality::serializeBinaryBulkStateSuffix",
+                            ErrorCodes::LOGICAL_ERROR);
+
+        UInt64 num_keys = nested_column->size();
+        writeIntBinary(num_keys, *stream);
+        dict_inner_serialization->serializeBinaryBulk(*nested_column, *stream, 0, num_keys);
+        low_cardinality_state->shared_dictionary = nullptr;
+    }
+}
+
+void SerializationLowCardinality::deserializeBinaryBulkStatePrefix(
+    DeserializeBinaryBulkSettings & settings,
+    DeserializeBinaryBulkStatePtr & state) const
+{
+    settings.path.push_back(Substream::DictionaryKeys);
+    auto * stream = settings.getter(settings.path);
+    settings.path.pop_back();
+
+    if (!stream)
+        return;
+
+    UInt64 keys_version;
+    readIntBinary(keys_version, *stream);
+
+    state = std::make_shared<DeserializeStateLowCardinality>(keys_version);
+}
+
+namespace
+{
+    template <typename T>
+    PaddedPODArray<T> * getIndexesData(IColumn & indexes)
+    {
+        auto * column = typeid_cast<ColumnVector<T> *>(&indexes);
+        if (column)
+            return &column->getData();
+
+        return nullptr;
+    }
+
+    struct IndexMapsWithAdditionalKeys
+    {
+        MutableColumnPtr dictionary_map;
+        MutableColumnPtr additional_keys_map;
+    };
+
+    template <typename T>
+    IndexMapsWithAdditionalKeys mapIndexWithAdditionalKeysRef(PaddedPODArray<T> & index, size_t dict_size)
+    {
+        PaddedPODArray<T> copy(index.cbegin(), index.cend());
+
+        HashMap<T, T> dict_map;
+        HashMap<T, T> add_keys_map;
+
+        for (auto val : index)
+        {
+            if (val < dict_size)
+                dict_map.insert({val, dict_map.size()});
+            else
+                add_keys_map.insert({val, add_keys_map.size()});
+        }
+
+        auto dictionary_map = ColumnVector<T>::create(dict_map.size());
+        auto additional_keys_map = ColumnVector<T>::create(add_keys_map.size());
+        auto & dict_data = dictionary_map->getData();
+        auto & add_keys_data = additional_keys_map->getData();
+
+        for (auto val : dict_map)
+            dict_data[val.second] = val.first;
+
+        for (auto val : add_keys_map)
+            add_keys_data[val.second] = val.first - dict_size;
+
+        for (auto & val : index)
+            val = val < dict_size ? dict_map[val]
+                                  : add_keys_map[val] + dict_map.size();
+
+        for (size_t i = 0; i < index.size(); ++i)
+        {
+            T expected = index[i] < dict_data.size() ? dict_data[index[i]]
+                                                     : add_keys_data[index[i] - dict_data.size()] + dict_size;
+            if (expected != copy[i])
+                throw Exception("Expected " + toString(expected) + ", but got " + toString(copy[i]), ErrorCodes::LOGICAL_ERROR);
+
+        }
+
+        return {std::move(dictionary_map), std::move(additional_keys_map)};
+    }
+
+    template <typename T>
+    IndexMapsWithAdditionalKeys mapIndexWithAdditionalKeys(PaddedPODArray<T> & index, size_t dict_size)
+    {
+        T max_less_dict_size = 0;
+        T max_value = 0;
+
+        auto size = index.size();
+        if (size == 0)
+            return {ColumnVector<T>::create(), ColumnVector<T>::create()};
+
+        for (size_t i = 0; i < size; ++i)
+        {
+            auto val = index[i];
+            if (val < dict_size)
+                max_less_dict_size = std::max(max_less_dict_size, val);
+
+            max_value = std::max(max_value, val);
+        }
+
+        auto map_size = UInt64(max_less_dict_size) + 1;
+        auto overflow_map_size = max_value >= dict_size ? (UInt64(max_value - dict_size) + 1) : 0;
+        PaddedPODArray<T> map(map_size, 0);
+        PaddedPODArray<T> overflow_map(overflow_map_size, 0);
+
+        T zero_pos_value = 0;
+        T zero_pos_overflowed_value = 0;
+        UInt64 cur_pos = 0;
+        UInt64 cur_overflowed_pos = 0;
+
+        for (size_t i = 0; i < size; ++i)
+        {
+            T val = index[i];
+            if (val < dict_size)
+            {
+                if (cur_pos == 0)
+                {
+                    zero_pos_value = val;
+                    ++cur_pos;
+                }
+                else if (map[val] == 0 && val != zero_pos_value)
+                {
+                    map[val] = cur_pos;
+                    ++cur_pos;
+                }
+            }
+            else
+            {
+                T shifted_val = val - dict_size;
+                if (cur_overflowed_pos == 0)
+                {
+                    zero_pos_overflowed_value = shifted_val;
+                    ++cur_overflowed_pos;
+                }
+                else if (overflow_map[shifted_val] == 0 && shifted_val != zero_pos_overflowed_value)
+                {
+                    overflow_map[shifted_val] = cur_overflowed_pos;
+                    ++cur_overflowed_pos;
+                }
+            }
+        }
+
+        auto dictionary_map = ColumnVector<T>::create(cur_pos);
+        auto additional_keys_map = ColumnVector<T>::create(cur_overflowed_pos);
+        auto & dict_data = dictionary_map->getData();
+        auto & add_keys_data = additional_keys_map->getData();
+
+        for (size_t i = 0; i < map_size; ++i)
+            if (map[i])
+                dict_data[map[i]] = static_cast<T>(i);
+
+        for (size_t i = 0; i < overflow_map_size; ++i)
+            if (overflow_map[i])
+                add_keys_data[overflow_map[i]] = static_cast<T>(i);
+
+        if (cur_pos)
+            dict_data[0] = zero_pos_value;
+        if (cur_overflowed_pos)
+            add_keys_data[0] = zero_pos_overflowed_value;
+
+        for (size_t i = 0; i < size; ++i)
+        {
+            T & val = index[i];
+            if (val < dict_size)
+                val = map[val];
+            else
+                val = overflow_map[val - dict_size] + cur_pos;
+        }
+
+        return {std::move(dictionary_map), std::move(additional_keys_map)};
+    }
+
+    /// Update column and return map with old indexes.
+    /// Let N is the number of distinct values which are less than max_size;
+    ///     old_column - column before function call;
+    ///     new_column - column after function call:
+    /// * if old_column[i] < max_size, than
+    ///       dictionary_map[new_column[i]] = old_column[i]
+    /// * else
+    ///       additional_keys_map[new_column[i]] = old_column[i] - dict_size + N
+    IndexMapsWithAdditionalKeys mapIndexWithAdditionalKeys(IColumn & column, size_t dict_size)
+    {
+        if (auto * data_uint8 = getIndexesData<UInt8>(column))
+            return mapIndexWithAdditionalKeys(*data_uint8, dict_size);
+        else if (auto * data_uint16 = getIndexesData<UInt16>(column))
+            return mapIndexWithAdditionalKeys(*data_uint16, dict_size);
+        else if (auto * data_uint32 = getIndexesData<UInt32>(column))
+            return mapIndexWithAdditionalKeys(*data_uint32, dict_size);
+        else if (auto * data_uint64 = getIndexesData<UInt64>(column))
+            return mapIndexWithAdditionalKeys(*data_uint64, dict_size);
+        else
+            throw Exception("Indexes column for mapIndexWithAdditionalKeys must be UInt, got " + column.getName(),
+                            ErrorCodes::LOGICAL_ERROR);
+    }
+}
+
+void SerializationLowCardinality::serializeBinaryBulkWithMultipleStreams(
+    const IColumn & column,
+    size_t offset,
+    size_t limit,
+    SerializeBinaryBulkSettings & settings,
+    SerializeBinaryBulkStatePtr & state) const
+{
+    settings.path.push_back(Substream::DictionaryKeys);
+    auto * keys_stream = settings.getter(settings.path);
+    settings.path.back() = Substream::DictionaryIndexes;
+    auto * indexes_stream = settings.getter(settings.path);
+    settings.path.pop_back();
+
+    if (!keys_stream && !indexes_stream)
+        return;
+
+    if (!keys_stream)
+        throw Exception("Got empty stream for SerializationLowCardinality keys.", ErrorCodes::LOGICAL_ERROR);
+
+    if (!indexes_stream)
+        throw Exception("Got empty stream for SerializationLowCardinality indexes.", ErrorCodes::LOGICAL_ERROR);
+
+    const ColumnLowCardinality & low_cardinality_column = typeid_cast<const ColumnLowCardinality &>(column);
+
+    auto * low_cardinality_state = checkAndGetLowCardinalitySerializeState(state);
+    auto & global_dictionary = low_cardinality_state->shared_dictionary;
+    KeysSerializationVersion::checkVersion(low_cardinality_state->key_version.value);
+
+    bool need_update_dictionary = global_dictionary == nullptr;
+    if (need_update_dictionary)
+        global_dictionary = DataTypeLowCardinality::createColumnUnique(*dictionary_type);
+
+    size_t max_limit = column.size() - offset;
+    limit = limit ? std::min(limit, max_limit) : max_limit;
+
+    /// Do not write anything for empty column. (May happen while writing empty arrays.)
+    if (limit == 0)
+        return;
+
+    auto sub_column = low_cardinality_column.cutAndCompact(offset, limit);
+    ColumnPtr positions = sub_column->getIndexesPtr();
+    ColumnPtr keys = sub_column->getDictionary().getNestedColumn();
+
+    if (settings.low_cardinality_max_dictionary_size)
+    {
+        /// Insert used_keys into global dictionary and update sub_index.
+        auto indexes_with_overflow = global_dictionary->uniqueInsertRangeWithOverflow(*keys, 0, keys->size(),
+                                                                                      settings.low_cardinality_max_dictionary_size);
+        size_t max_size = settings.low_cardinality_max_dictionary_size + indexes_with_overflow.overflowed_keys->size();
+        ColumnLowCardinality::Index(indexes_with_overflow.indexes->getPtr()).check(max_size);
+
+        if (global_dictionary->size() > settings.low_cardinality_max_dictionary_size)
+            throw Exception("Got dictionary with size " + toString(global_dictionary->size()) +
+                            " but max dictionary size is " + toString(settings.low_cardinality_max_dictionary_size),
+                            ErrorCodes::LOGICAL_ERROR);
+
+        positions = indexes_with_overflow.indexes->index(*positions, 0);
+        keys = std::move(indexes_with_overflow.overflowed_keys);
+
+        if (global_dictionary->size() < settings.low_cardinality_max_dictionary_size && !keys->empty())
+            throw Exception("Has additional keys, but dict size is " + toString(global_dictionary->size()) +
+                            " which is less then max dictionary size (" + toString(settings.low_cardinality_max_dictionary_size) + ")",
+                            ErrorCodes::LOGICAL_ERROR);
+    }
+
+    if (const auto * nullable_keys = checkAndGetColumn<ColumnNullable>(*keys))
+        keys = nullable_keys->getNestedColumnPtr();
+
+    bool need_additional_keys = !keys->empty();
+    bool need_dictionary = settings.low_cardinality_max_dictionary_size != 0;
+    bool need_write_dictionary = !settings.low_cardinality_use_single_dictionary_for_part
+                                 && global_dictionary->size() >= settings.low_cardinality_max_dictionary_size;
+
+    IndexesSerializationType index_version(*positions, need_additional_keys, need_dictionary, need_update_dictionary);
+    index_version.serialize(*indexes_stream);
+
+    if (need_write_dictionary)
+    {
+        const auto & nested_column = global_dictionary->getNestedNotNullableColumn();
+        UInt64 num_keys = nested_column->size();
+        writeIntBinary(num_keys, *keys_stream);
+        dict_inner_serialization->serializeBinaryBulk(*nested_column, *keys_stream, 0, num_keys);
+        low_cardinality_state->shared_dictionary = nullptr;
+    }
+
+    if (need_additional_keys)
+    {
+        UInt64 num_keys = keys->size();
+        writeIntBinary(num_keys, *indexes_stream);
+        dict_inner_serialization->serializeBinaryBulk(*keys, *indexes_stream, 0, num_keys);
+    }
+
+    UInt64 num_rows = positions->size();
+    writeIntBinary(num_rows, *indexes_stream);
+    auto index_serialization = index_version.getDataType()->getDefaultSerialization();
+    index_serialization->serializeBinaryBulk(*positions, *indexes_stream, 0, num_rows);
+}
+
+void SerializationLowCardinality::deserializeBinaryBulkWithMultipleStreams(
+    ColumnPtr & column,
+    size_t limit,
+    DeserializeBinaryBulkSettings & settings,
+    DeserializeBinaryBulkStatePtr & state,
+    SubstreamsCache * /* cache */) const
+{
+    auto mutable_column = column->assumeMutable();
+    ColumnLowCardinality & low_cardinality_column = typeid_cast<ColumnLowCardinality &>(*mutable_column);
+
+    settings.path.push_back(Substream::DictionaryKeys);
+    auto * keys_stream = settings.getter(settings.path);
+    settings.path.back() = Substream::DictionaryIndexes;
+    auto * indexes_stream = settings.getter(settings.path);
+    settings.path.pop_back();
+
+    if (!keys_stream && !indexes_stream)
+        return;
+
+    if (!keys_stream)
+        throw Exception("Got empty stream for SerializationLowCardinality keys.", ErrorCodes::LOGICAL_ERROR);
+
+    if (!indexes_stream)
+        throw Exception("Got empty stream for SerializationLowCardinality indexes.", ErrorCodes::LOGICAL_ERROR);
+
+    auto * low_cardinality_state = checkAndGetLowCardinalityDeserializeState(state);
+    KeysSerializationVersion::checkVersion(low_cardinality_state->key_version.value);
+
+    auto read_dictionary = [this, low_cardinality_state, keys_stream]()
+    {
+        UInt64 num_keys;
+        readIntBinary(num_keys, *keys_stream);
+
+        auto keys_type = removeNullable(dictionary_type);
+        auto global_dict_keys = keys_type->createColumn();
+        dict_inner_serialization->deserializeBinaryBulk(*global_dict_keys, *keys_stream, num_keys, 0);
+
+        auto column_unique = DataTypeLowCardinality::createColumnUnique(*dictionary_type, std::move(global_dict_keys));
+        low_cardinality_state->global_dictionary = std::move(column_unique);
+    };
+
+    auto read_additional_keys = [this, low_cardinality_state, indexes_stream]()
+    {
+        UInt64 num_keys;
+        readIntBinary(num_keys, *indexes_stream);
+        auto keys_type = removeNullable(dictionary_type);
+        auto additional_keys = keys_type->createColumn();
+        dict_inner_serialization->deserializeBinaryBulk(*additional_keys, *indexes_stream, num_keys, 0);
+        low_cardinality_state->additional_keys = std::move(additional_keys);
+
+        if (!low_cardinality_state->index_type.need_global_dictionary && dictionary_type->isNullable())
+        {
+            auto null_map = ColumnUInt8::create(num_keys, 0);
+            if (num_keys)
+                null_map->getElement(0) = 1;
+
+            low_cardinality_state->null_map = std::move(null_map);
+        }
+    };
+
+    auto read_indexes = [this, low_cardinality_state, indexes_stream, &low_cardinality_column](UInt64 num_rows)
+    {
+        auto indexes_type = low_cardinality_state->index_type.getDataType();
+        MutableColumnPtr indexes_column = indexes_type->createColumn();
+        indexes_type->getDefaultSerialization()->deserializeBinaryBulk(*indexes_column, *indexes_stream, num_rows, 0);
+
+        auto & global_dictionary = low_cardinality_state->global_dictionary;
+        const auto & additional_keys = low_cardinality_state->additional_keys;
+
+        bool has_additional_keys = low_cardinality_state->index_type.has_additional_keys;
+        bool column_is_empty = low_cardinality_column.empty();
+
+        if (!low_cardinality_state->index_type.need_global_dictionary)
+        {
+            ColumnPtr keys_column = additional_keys;
+            if (low_cardinality_state->null_map)
+                keys_column = ColumnNullable::create(additional_keys, low_cardinality_state->null_map);
+            low_cardinality_column.insertRangeFromDictionaryEncodedColumn(*keys_column, *indexes_column);
+        }
+        else if (!has_additional_keys)
+        {
+            if (column_is_empty)
+                low_cardinality_column.setSharedDictionary(global_dictionary);
+
+            auto local_column = ColumnLowCardinality::create(global_dictionary, std::move(indexes_column));
+            low_cardinality_column.insertRangeFrom(*local_column, 0, num_rows);
+        }
+        else
+        {
+            auto maps = mapIndexWithAdditionalKeys(*indexes_column, global_dictionary->size());
+
+            ColumnLowCardinality::Index(maps.additional_keys_map->getPtr()).check(additional_keys->size());
+
+            ColumnLowCardinality::Index(indexes_column->getPtr()).check(
+                    maps.dictionary_map->size() + maps.additional_keys_map->size());
+
+            auto used_keys = IColumn::mutate(global_dictionary->getNestedColumn()->index(*maps.dictionary_map, 0));
+
+            if (!maps.additional_keys_map->empty())
+            {
+                auto used_add_keys = additional_keys->index(*maps.additional_keys_map, 0);
+
+                if (dictionary_type->isNullable())
+                {
+                    ColumnPtr null_map = ColumnUInt8::create(used_add_keys->size(), 0);
+                    used_add_keys = ColumnNullable::create(used_add_keys, null_map);
+                }
+
+                used_keys->insertRangeFrom(*used_add_keys, 0, used_add_keys->size());
+            }
+
+            low_cardinality_column.insertRangeFromDictionaryEncodedColumn(*used_keys, *indexes_column);
+        }
+    };
+
+    if (!settings.continuous_reading)
+    {
+        low_cardinality_state->num_pending_rows = 0;
+
+        /// Remember in state that some granules were skipped and we need to update dictionary.
+        low_cardinality_state->need_update_dictionary = true;
+    }
+
+    while (limit)
+    {
+        if (low_cardinality_state->num_pending_rows == 0)
+        {
+            if (indexes_stream->eof())
+                break;
+
+            auto & index_type = low_cardinality_state->index_type;
+            auto & global_dictionary = low_cardinality_state->global_dictionary;
+
+            index_type.deserialize(*indexes_stream);
+
+            bool need_update_dictionary =
+                !global_dictionary || index_type.need_update_dictionary || low_cardinality_state->need_update_dictionary;
+            if (index_type.need_global_dictionary && need_update_dictionary)
+            {
+                read_dictionary();
+                low_cardinality_state->need_update_dictionary = false;
+            }
+
+            if (low_cardinality_state->index_type.has_additional_keys)
+                read_additional_keys();
+            else
+                low_cardinality_state->additional_keys = nullptr;
+
+            readIntBinary(low_cardinality_state->num_pending_rows, *indexes_stream);
+        }
+
+        size_t num_rows_to_read = std::min<UInt64>(limit, low_cardinality_state->num_pending_rows);
+        read_indexes(num_rows_to_read);
+        limit -= num_rows_to_read;
+        low_cardinality_state->num_pending_rows -= num_rows_to_read;
+    }
+
+    column = std::move(mutable_column);
+}
+
+void SerializationLowCardinality::serializeBinary(const Field & field, WriteBuffer & ostr) const
+{
+    dictionary_type->getDefaultSerialization()->serializeBinary(field, ostr);
+}
+void SerializationLowCardinality::deserializeBinary(Field & field, ReadBuffer & istr) const
+{
+    dictionary_type->getDefaultSerialization()->deserializeBinary(field, istr);
+}
+
+void SerializationLowCardinality::serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr) const
+{
+    serializeImpl(column, row_num, &ISerialization::serializeBinary, ostr);
+}
+void SerializationLowCardinality::deserializeBinary(IColumn & column, ReadBuffer & istr) const
+{
+    deserializeImpl(column, &ISerialization::deserializeBinary, istr);
+}
+
+void SerializationLowCardinality::serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    serializeImpl(column, row_num, &ISerialization::serializeTextEscaped, ostr, settings);
+}
+
+void SerializationLowCardinality::deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    deserializeImpl(column, &ISerialization::deserializeTextEscaped, istr, settings);
+}
+
+void SerializationLowCardinality::serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    serializeImpl(column, row_num, &ISerialization::serializeTextQuoted, ostr, settings);
+}
+
+void SerializationLowCardinality::deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    deserializeImpl(column, &ISerialization::deserializeTextQuoted, istr, settings);
+}
+
+void SerializationLowCardinality::deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    deserializeImpl(column, &ISerialization::deserializeWholeText, istr, settings);
+}
+
+void SerializationLowCardinality::serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    serializeImpl(column, row_num, &ISerialization::serializeTextCSV, ostr, settings);
+}
+
+void SerializationLowCardinality::deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    deserializeImpl(column, &ISerialization::deserializeTextCSV, istr, settings);
+}
+
+void SerializationLowCardinality::serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    serializeImpl(column, row_num, &ISerialization::serializeText, ostr, settings);
+}
+
+void SerializationLowCardinality::serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    serializeImpl(column, row_num, &ISerialization::serializeTextJSON, ostr, settings);
+}
+void SerializationLowCardinality::deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    deserializeImpl(column, &ISerialization::deserializeTextJSON, istr, settings);
+}
+
+void SerializationLowCardinality::serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    serializeImpl(column, row_num, &ISerialization::serializeTextXML, ostr, settings);
+}
+
+template <typename... Params, typename... Args>
+void SerializationLowCardinality::serializeImpl(
+    const IColumn & column, size_t row_num, SerializationLowCardinality::SerializeFunctionPtr<Params...> func, Args &&... args) const
+{
+    const auto & low_cardinality_column = getColumnLowCardinality(column);
+    size_t unique_row_number = low_cardinality_column.getIndexes().getUInt(row_num);
+    auto serialization = dictionary_type->getDefaultSerialization();
+    (serialization.get()->*func)(*low_cardinality_column.getDictionary().getNestedColumn(), unique_row_number, std::forward<Args>(args)...);
+}
+
+template <typename... Params, typename... Args>
+void SerializationLowCardinality::deserializeImpl(
+    IColumn & column, SerializationLowCardinality::DeserializeFunctionPtr<Params...> func, Args &&... args) const
+{
+    auto & low_cardinality_column= getColumnLowCardinality(column);
+    auto temp_column = low_cardinality_column.getDictionary().getNestedColumn()->cloneEmpty();
+
+    auto serialization = dictionary_type->getDefaultSerialization();
+    (serialization.get()->*func)(*temp_column, std::forward<Args>(args)...);
+
+    low_cardinality_column.insertFromFullColumn(*temp_column, 0);
+}
+
+}
diff --git a/src/DataTypes/Serializations/SerializationLowCardinality.h b/src/DataTypes/Serializations/SerializationLowCardinality.h
new file mode 100644
index 00000000000..e9ca0349e38
--- /dev/null
+++ b/src/DataTypes/Serializations/SerializationLowCardinality.h
@@ -0,0 +1,81 @@
+#pragma once
+
+#include <DataTypes/Serializations/ISerialization.h>
+
+namespace DB
+{
+
+class IDataType;
+using DataTypePtr = std::shared_ptr<const IDataType>;
+
+class SerializationLowCardinality : public ISerialization
+{
+private:
+    DataTypePtr dictionary_type;
+    SerializationPtr dict_inner_serialization;
+
+public:
+    SerializationLowCardinality(const DataTypePtr & dictionary_type);
+
+    void enumerateStreams(const StreamCallback & callback, SubstreamPath & path) const override;
+
+    void serializeBinaryBulkStatePrefix(
+            SerializeBinaryBulkSettings & settings,
+            SerializeBinaryBulkStatePtr & state) const override;
+
+    void serializeBinaryBulkStateSuffix(
+            SerializeBinaryBulkSettings & settings,
+            SerializeBinaryBulkStatePtr & state) const override;
+
+    void deserializeBinaryBulkStatePrefix(
+            DeserializeBinaryBulkSettings & settings,
+            DeserializeBinaryBulkStatePtr & state) const override;
+
+    void serializeBinaryBulkWithMultipleStreams(
+            const IColumn & column,
+            size_t offset,
+            size_t limit,
+            SerializeBinaryBulkSettings & settings,
+            SerializeBinaryBulkStatePtr & state) const override;
+
+    void deserializeBinaryBulkWithMultipleStreams(
+            ColumnPtr & column,
+            size_t limit,
+            DeserializeBinaryBulkSettings & settings,
+            DeserializeBinaryBulkStatePtr & state,
+            SubstreamsCache * cache) const override;
+
+    void serializeBinary(const Field & field, WriteBuffer & ostr) const override;
+    void deserializeBinary(Field & field, ReadBuffer & istr) const override;
+    void serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr) const override;
+    void deserializeBinary(IColumn & column, ReadBuffer & istr) const override;
+    void serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override;
+    void deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
+    void serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override;
+    void deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
+    void deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
+    void serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override;
+    void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
+    void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override;
+    void serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override;
+    void deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
+    void serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override;
+
+private:
+    template <typename ... Params>
+    using SerializeFunctionPtr = void (ISerialization::*)(const IColumn &, size_t, Params ...) const;
+
+    template <typename... Params, typename... Args>
+    void serializeImpl(const IColumn & column, size_t row_num, SerializeFunctionPtr<Params...> func, Args &&... args) const;
+
+    template <typename ... Params>
+    using DeserializeFunctionPtr = void (ISerialization::*)(IColumn &, Params ...) const;
+
+    template <typename ... Params, typename... Args>
+    void deserializeImpl(IColumn & column, DeserializeFunctionPtr<Params...> func, Args &&... args) const;
+
+    // template <typename Creator>
+    // static MutableColumnUniquePtr createColumnUniqueImpl(const IDataType & keys_type, const Creator & creator);
+};
+
+}
diff --git a/src/DataTypes/Serializations/SerializationMap.cpp b/src/DataTypes/Serializations/SerializationMap.cpp
new file mode 100644
index 00000000000..26b473c9d0a
--- /dev/null
+++ b/src/DataTypes/Serializations/SerializationMap.cpp
@@ -0,0 +1,291 @@
+#include <DataTypes/Serializations/SerializationMap.h>
+#include <DataTypes/Serializations/SerializationArray.h>
+#include <DataTypes/Serializations/SerializationTuple.h>
+
+#include <Common/StringUtils/StringUtils.h>
+#include <Columns/ColumnMap.h>
+#include <Columns/ColumnArray.h>
+#include <Core/Field.h>
+#include <Formats/FormatSettings.h>
+#include <Common/typeid_cast.h>
+#include <Common/assert_cast.h>
+#include <Common/quoteString.h>
+#include <IO/WriteHelpers.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteBufferFromString.h>
+#include <IO/ReadBufferFromString.h>
+#include <IO/Operators.h>
+
+#include <ext/map.h>
+#include <ext/enumerate.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int CANNOT_READ_MAP_FROM_TEXT;
+}
+
+SerializationMap::SerializationMap(const SerializationPtr & key_, const SerializationPtr & value_, const SerializationPtr & nested_)
+    : key(key_), value(value_), nested(nested_)
+{
+}
+
+static const IColumn & extractNestedColumn(const IColumn & column)
+{
+    return assert_cast<const ColumnMap &>(column).getNestedColumn();
+}
+
+static IColumn & extractNestedColumn(IColumn & column)
+{
+    return assert_cast<ColumnMap &>(column).getNestedColumn();
+}
+
+void SerializationMap::serializeBinary(const Field & field, WriteBuffer & ostr) const
+{
+    const auto & map = get<const Map &>(field);
+    writeVarUInt(map.size(), ostr);
+    for (const auto & elem : map)
+    {
+        const auto & tuple = elem.safeGet<const Tuple>();
+        assert(tuple.size() == 2);
+        key->serializeBinary(tuple[0], ostr);
+        value->serializeBinary(tuple[1], ostr);
+    }
+}
+
+void SerializationMap::deserializeBinary(Field & field, ReadBuffer & istr) const
+{
+    size_t size;
+    readVarUInt(size, istr);
+    field = Map(size);
+    for (auto & elem : field.get<Map &>())
+    {
+        Tuple tuple(2);
+        key->deserializeBinary(tuple[0], istr);
+        value->deserializeBinary(tuple[1], istr);
+        elem = std::move(tuple);
+    }
+}
+
+void SerializationMap::serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr) const
+{
+    nested->serializeBinary(extractNestedColumn(column), row_num, ostr);
+}
+
+void SerializationMap::deserializeBinary(IColumn & column, ReadBuffer & istr) const
+{
+    nested->deserializeBinary(extractNestedColumn(column), istr);
+}
+
+
+template <typename Writer>
+void SerializationMap::serializeTextImpl(const IColumn & column, size_t row_num, WriteBuffer & ostr, Writer && writer) const
+{
+    const auto & column_map = assert_cast<const ColumnMap &>(column);
+
+    const auto & nested_array = column_map.getNestedColumn();
+    const auto & nested_tuple = column_map.getNestedData();
+    const auto & offsets = nested_array.getOffsets();
+
+    size_t offset = offsets[row_num - 1];
+    size_t next_offset = offsets[row_num];
+
+    writeChar('{', ostr);
+    for (size_t i = offset; i < next_offset; ++i)
+    {
+        if (i != offset)
+            writeChar(',', ostr);
+        writer(key, nested_tuple.getColumn(0), i);
+        writeChar(':', ostr);
+        writer(value, nested_tuple.getColumn(1), i);
+    }
+    writeChar('}', ostr);
+}
+
+template <typename Reader>
+void SerializationMap::deserializeTextImpl(IColumn & column, ReadBuffer & istr, Reader && reader) const
+{
+    auto & column_map = assert_cast<ColumnMap &>(column);
+
+    auto & nested_array = column_map.getNestedColumn();
+    auto & nested_tuple = column_map.getNestedData();
+    auto & offsets = nested_array.getOffsets();
+
+    auto & key_column = nested_tuple.getColumn(0);
+    auto & value_column = nested_tuple.getColumn(1);
+
+    size_t size = 0;
+    assertChar('{', istr);
+
+    try
+    {
+        bool first = true;
+        while (!istr.eof() && *istr.position() != '}')
+        {
+            if (!first)
+            {
+                if (*istr.position() == ',')
+                    ++istr.position();
+                else
+                    throw Exception("Cannot read Map from text", ErrorCodes::CANNOT_READ_MAP_FROM_TEXT);
+            }
+
+            first = false;
+
+            skipWhitespaceIfAny(istr);
+
+            if (*istr.position() == '}')
+                break;
+
+            reader(key, key_column);
+            skipWhitespaceIfAny(istr);
+            assertChar(':', istr);
+
+            ++size;
+            skipWhitespaceIfAny(istr);
+            reader(value, value_column);
+
+            skipWhitespaceIfAny(istr);
+        }
+
+        offsets.push_back(offsets.back() + size);
+        assertChar('}', istr);
+    }
+    catch (...)
+    {
+        throw;
+    }
+}
+
+void SerializationMap::serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    serializeTextImpl(column, row_num, ostr,
+        [&](const SerializationPtr & subcolumn_serialization, const IColumn & subcolumn, size_t pos)
+        {
+            subcolumn_serialization->serializeTextQuoted(subcolumn, pos, ostr, settings);
+        });
+}
+
+void SerializationMap::deserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+
+    deserializeTextImpl(column, istr,
+        [&](const SerializationPtr & subcolumn_serialization, IColumn & subcolumn)
+        {
+            subcolumn_serialization->deserializeTextQuoted(subcolumn, istr, settings);
+        });
+}
+
+
+void SerializationMap::serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    serializeTextImpl(column, row_num, ostr,
+        [&](const SerializationPtr & subcolumn_serialization, const IColumn & subcolumn, size_t pos)
+        {
+            subcolumn_serialization->serializeTextJSON(subcolumn, pos, ostr, settings);
+        });
+}
+
+void SerializationMap::deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    deserializeTextImpl(column, istr,
+        [&](const SerializationPtr & subcolumn_serialization, IColumn & subcolumn)
+        {
+            subcolumn_serialization->deserializeTextJSON(subcolumn, istr, settings);
+        });
+}
+
+void SerializationMap::serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    const auto & column_map = assert_cast<const ColumnMap &>(column);
+    const auto & offsets = column_map.getNestedColumn().getOffsets();
+
+    size_t offset = offsets[row_num - 1];
+    size_t next_offset = offsets[row_num];
+
+    const auto & nested_data = column_map.getNestedData();
+
+    writeCString("<map>", ostr);
+    for (size_t i = offset; i < next_offset; ++i)
+    {
+        writeCString("<elem>", ostr);
+        writeCString("<key>", ostr);
+        key->serializeTextXML(nested_data.getColumn(0), i, ostr, settings);
+        writeCString("</key>", ostr);
+
+        writeCString("<value>", ostr);
+        value->serializeTextXML(nested_data.getColumn(1), i, ostr, settings);
+        writeCString("</value>", ostr);
+        writeCString("</elem>", ostr);
+    }
+    writeCString("</map>", ostr);
+}
+
+void SerializationMap::serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    WriteBufferFromOwnString wb;
+    serializeText(column, row_num, wb, settings);
+    writeCSV(wb.str(), ostr);
+}
+
+void SerializationMap::deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    String s;
+    readCSV(s, istr, settings.csv);
+    ReadBufferFromString rb(s);
+    deserializeText(column, rb, settings);
+}
+
+
+void SerializationMap::enumerateStreams(const StreamCallback & callback, SubstreamPath & path) const
+{
+    nested->enumerateStreams(callback, path);
+}
+
+void SerializationMap::serializeBinaryBulkStatePrefix(
+    SerializeBinaryBulkSettings & settings,
+    SerializeBinaryBulkStatePtr & state) const
+{
+    nested->serializeBinaryBulkStatePrefix(settings, state);
+}
+
+void SerializationMap::serializeBinaryBulkStateSuffix(
+    SerializeBinaryBulkSettings & settings,
+    SerializeBinaryBulkStatePtr & state) const
+{
+    nested->serializeBinaryBulkStateSuffix(settings, state);
+}
+
+void SerializationMap::deserializeBinaryBulkStatePrefix(
+    DeserializeBinaryBulkSettings & settings,
+    DeserializeBinaryBulkStatePtr & state) const
+{
+    nested->deserializeBinaryBulkStatePrefix(settings, state);
+}
+
+
+void SerializationMap::serializeBinaryBulkWithMultipleStreams(
+    const IColumn & column,
+    size_t offset,
+    size_t limit,
+    SerializeBinaryBulkSettings & settings,
+    SerializeBinaryBulkStatePtr & state) const
+{
+    nested->serializeBinaryBulkWithMultipleStreams(extractNestedColumn(column), offset, limit, settings, state);
+}
+
+void SerializationMap::deserializeBinaryBulkWithMultipleStreams(
+    ColumnPtr & column,
+    size_t limit,
+    DeserializeBinaryBulkSettings & settings,
+    DeserializeBinaryBulkStatePtr & state,
+    SubstreamsCache * cache) const
+{
+    auto & column_map = assert_cast<ColumnMap &>(*column->assumeMutable());
+    nested->deserializeBinaryBulkWithMultipleStreams(column_map.getNestedColumnPtr(), limit, settings, state, cache);
+}
+
+}
diff --git a/src/DataTypes/Serializations/SerializationMap.h b/src/DataTypes/Serializations/SerializationMap.h
new file mode 100644
index 00000000000..6f72d5c2594
--- /dev/null
+++ b/src/DataTypes/Serializations/SerializationMap.h
@@ -0,0 +1,71 @@
+#pragma once
+
+#include <DataTypes/Serializations/SimpleTextSerialization.h>
+
+
+namespace DB
+{
+
+class SerializationMap final : public SimpleTextSerialization
+{
+private:
+    SerializationPtr key;
+    SerializationPtr value;
+
+    /// 'nested' is an Array(Tuple(key_type, value_type))
+    SerializationPtr nested;
+
+public:
+    SerializationMap(const SerializationPtr & key_type_, const SerializationPtr & value_type_, const SerializationPtr & nested_);
+
+    void serializeBinary(const Field & field, WriteBuffer & ostr) const override;
+    void deserializeBinary(Field & field, ReadBuffer & istr) const override;
+    void serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr) const override;
+    void deserializeBinary(IColumn & column, ReadBuffer & istr) const override;
+    void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void deserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    void serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    void serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+
+    void serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+
+    void enumerateStreams(const StreamCallback & callback, SubstreamPath & path) const override;
+
+    void serializeBinaryBulkStatePrefix(
+        SerializeBinaryBulkSettings & settings,
+        SerializeBinaryBulkStatePtr & state) const override;
+
+    void serializeBinaryBulkStateSuffix(
+        SerializeBinaryBulkSettings & settings,
+        SerializeBinaryBulkStatePtr & state) const override;
+
+    void deserializeBinaryBulkStatePrefix(
+        DeserializeBinaryBulkSettings & settings,
+        DeserializeBinaryBulkStatePtr & state) const override;
+
+    void serializeBinaryBulkWithMultipleStreams(
+        const IColumn & column,
+        size_t offset,
+        size_t limit,
+        SerializeBinaryBulkSettings & settings,
+        SerializeBinaryBulkStatePtr & state) const override;
+
+    void deserializeBinaryBulkWithMultipleStreams(
+        ColumnPtr & column,
+        size_t limit,
+        DeserializeBinaryBulkSettings & settings,
+        DeserializeBinaryBulkStatePtr & state,
+        SubstreamsCache * cache) const override;
+
+private:
+    template <typename Writer>
+    void serializeTextImpl(const IColumn & column, size_t row_num, WriteBuffer & ostr, Writer && writer) const;
+
+    template <typename Reader>
+    void deserializeTextImpl(IColumn & column, ReadBuffer & istr, Reader && reader) const;
+};
+
+}
+
diff --git a/src/DataTypes/Serializations/SerializationNothing.cpp b/src/DataTypes/Serializations/SerializationNothing.cpp
new file mode 100644
index 00000000000..6b11ea6d252
--- /dev/null
+++ b/src/DataTypes/Serializations/SerializationNothing.cpp
@@ -0,0 +1,25 @@
+#include <DataTypes/Serializations/SerializationNothing.h>
+#include <Columns/ColumnNothing.h>
+#include <IO/ReadBuffer.h>
+#include <IO/WriteBuffer.h>
+
+namespace DB
+{
+
+void SerializationNothing::serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, size_t offset, size_t limit) const
+{
+    size_t size = column.size();
+
+    if (limit == 0 || offset + limit > size)
+        limit = size - offset;
+
+    for (size_t i = 0; i < limit; ++i)
+        ostr.write('0');
+}
+
+void SerializationNothing::deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, size_t limit, double /*avg_value_size_hint*/) const
+{
+    typeid_cast<ColumnNothing &>(column).addSize(istr.tryIgnore(limit));
+}
+
+}
diff --git a/src/DataTypes/Serializations/SerializationNothing.h b/src/DataTypes/Serializations/SerializationNothing.h
new file mode 100644
index 00000000000..a7b26c117bc
--- /dev/null
+++ b/src/DataTypes/Serializations/SerializationNothing.h
@@ -0,0 +1,34 @@
+#pragma once
+
+#include <DataTypes/Serializations/SimpleTextSerialization.h>
+#include <Common/Exception.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int NOT_IMPLEMENTED;
+}
+
+class SerializationNothing : public SimpleTextSerialization
+{
+private:
+    [[noreturn]] void throwNoSerialization() const
+    {
+        throw Exception("Serialization is not implemented", ErrorCodes::NOT_IMPLEMENTED);
+    }
+public:
+    void serializeBinary(const Field &, WriteBuffer &) const override                       { throwNoSerialization(); }
+    void deserializeBinary(Field &, ReadBuffer &) const override                            { throwNoSerialization(); }
+    void serializeBinary(const IColumn &, size_t, WriteBuffer &) const override             { throwNoSerialization(); }
+    void deserializeBinary(IColumn &, ReadBuffer &) const override                          { throwNoSerialization(); }
+    void serializeText(const IColumn &, size_t, WriteBuffer &, const FormatSettings &) const override { throwNoSerialization(); }
+    void deserializeText(IColumn &, ReadBuffer &, const FormatSettings &) const override    { throwNoSerialization(); }
+
+    /// These methods read and write zero bytes just to allow to figure out size of column.
+    void serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, size_t offset, size_t limit) const override;
+    void deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, size_t limit, double avg_value_size_hint) const override;
+};
+
+}
diff --git a/src/DataTypes/Serializations/SerializationNullable.cpp b/src/DataTypes/Serializations/SerializationNullable.cpp
new file mode 100644
index 00000000000..4de2b08c043
--- /dev/null
+++ b/src/DataTypes/Serializations/SerializationNullable.cpp
@@ -0,0 +1,473 @@
+#include <DataTypes/Serializations/SerializationNullable.h>
+#include <DataTypes/Serializations/SerializationNumber.h>
+
+#include <Columns/ColumnNullable.h>
+#include <Core/Field.h>
+#include <IO/ReadBuffer.h>
+#include <IO/ReadBufferFromMemory.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteBuffer.h>
+#include <IO/WriteHelpers.h>
+#include <IO/ConcatReadBuffer.h>
+#include <Common/typeid_cast.h>
+#include <Common/assert_cast.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int CANNOT_READ_ALL_DATA;
+}
+
+void SerializationNullable::enumerateStreams(const StreamCallback & callback, SubstreamPath & path) const
+{
+    path.push_back(Substream::NullMap);
+    callback(path);
+    path.back() = Substream::NullableElements;
+    nested->enumerateStreams(callback, path);
+    path.pop_back();
+}
+
+
+void SerializationNullable::serializeBinaryBulkStatePrefix(
+        SerializeBinaryBulkSettings & settings,
+        SerializeBinaryBulkStatePtr & state) const
+{
+    settings.path.push_back(Substream::NullableElements);
+    nested->serializeBinaryBulkStatePrefix(settings, state);
+    settings.path.pop_back();
+}
+
+
+void SerializationNullable::serializeBinaryBulkStateSuffix(
+    SerializeBinaryBulkSettings & settings,
+    SerializeBinaryBulkStatePtr & state) const
+{
+    settings.path.push_back(Substream::NullableElements);
+    nested->serializeBinaryBulkStateSuffix(settings, state);
+    settings.path.pop_back();
+}
+
+
+void SerializationNullable::deserializeBinaryBulkStatePrefix(
+    DeserializeBinaryBulkSettings & settings,
+    DeserializeBinaryBulkStatePtr & state) const
+{
+    settings.path.push_back(Substream::NullableElements);
+    nested->deserializeBinaryBulkStatePrefix(settings, state);
+    settings.path.pop_back();
+}
+
+
+void SerializationNullable::serializeBinaryBulkWithMultipleStreams(
+    const IColumn & column,
+    size_t offset,
+    size_t limit,
+    SerializeBinaryBulkSettings & settings,
+    SerializeBinaryBulkStatePtr & state) const
+{
+    const ColumnNullable & col = assert_cast<const ColumnNullable &>(column);
+    col.checkConsistency();
+
+    /// First serialize null map.
+    settings.path.push_back(Substream::NullMap);
+    if (auto * stream = settings.getter(settings.path))
+        SerializationNumber<UInt8>().serializeBinaryBulk(col.getNullMapColumn(), *stream, offset, limit);
+
+    /// Then serialize contents of arrays.
+    settings.path.back() = Substream::NullableElements;
+    nested->serializeBinaryBulkWithMultipleStreams(col.getNestedColumn(), offset, limit, settings, state);
+    settings.path.pop_back();
+}
+
+
+void SerializationNullable::deserializeBinaryBulkWithMultipleStreams(
+    ColumnPtr & column,
+    size_t limit,
+    DeserializeBinaryBulkSettings & settings,
+    DeserializeBinaryBulkStatePtr & state,
+    SubstreamsCache * cache) const
+{
+    auto mutable_column = column->assumeMutable();
+    ColumnNullable & col = assert_cast<ColumnNullable &>(*mutable_column);
+
+    settings.path.push_back(Substream::NullMap);
+    if (auto cached_column = getFromSubstreamsCache(cache, settings.path))
+    {
+        col.getNullMapColumnPtr() = cached_column;
+    }
+    else if (auto * stream = settings.getter(settings.path))
+    {
+        SerializationNumber<UInt8>().deserializeBinaryBulk(col.getNullMapColumn(), *stream, limit, 0);
+        addToSubstreamsCache(cache, settings.path, col.getNullMapColumnPtr());
+    }
+
+    settings.path.back() = Substream::NullableElements;
+    nested->deserializeBinaryBulkWithMultipleStreams(col.getNestedColumnPtr(), limit, settings, state, cache);
+    settings.path.pop_back();
+}
+
+
+void SerializationNullable::serializeBinary(const Field & field, WriteBuffer & ostr) const
+{
+    if (field.isNull())
+    {
+        writeBinary(true, ostr);
+    }
+    else
+    {
+        writeBinary(false, ostr);
+        nested->serializeBinary(field, ostr);
+    }
+}
+
+void SerializationNullable::deserializeBinary(Field & field, ReadBuffer & istr) const
+{
+    bool is_null = false;
+    readBinary(is_null, istr);
+    if (!is_null)
+    {
+        nested->deserializeBinary(field, istr);
+    }
+    else
+    {
+        field = Null();
+    }
+}
+
+void SerializationNullable::serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr) const
+{
+    const ColumnNullable & col = assert_cast<const ColumnNullable &>(column);
+
+    bool is_null = col.isNullAt(row_num);
+    writeBinary(is_null, ostr);
+    if (!is_null)
+        nested->serializeBinary(col.getNestedColumn(), row_num, ostr);
+}
+
+/// Deserialize value into ColumnNullable.
+/// We need to insert both to nested column and to null byte map, or, in case of exception, to not insert at all.
+template <typename ReturnType = void, typename CheckForNull, typename DeserializeNested, typename std::enable_if_t<std::is_same_v<ReturnType, void>, ReturnType>* = nullptr>
+static ReturnType safeDeserialize(
+    IColumn & column, const ISerialization &,
+    CheckForNull && check_for_null, DeserializeNested && deserialize_nested)
+{
+    ColumnNullable & col = assert_cast<ColumnNullable &>(column);
+
+    if (check_for_null())
+    {
+        col.insertDefault();
+    }
+    else
+    {
+        deserialize_nested(col.getNestedColumn());
+
+        try
+        {
+            col.getNullMapData().push_back(0);
+        }
+        catch (...)
+        {
+            col.getNestedColumn().popBack(1);
+            throw;
+        }
+    }
+}
+
+/// Deserialize value into non-nullable column. In case of NULL, insert default value and return false.
+template <typename ReturnType = void, typename CheckForNull, typename DeserializeNested, typename std::enable_if_t<std::is_same_v<ReturnType, bool>, ReturnType>* = nullptr>
+static ReturnType safeDeserialize(
+        IColumn & column, const ISerialization & nested,
+        CheckForNull && check_for_null, DeserializeNested && deserialize_nested)
+{
+    assert(!dynamic_cast<ColumnNullable *>(&column));
+    assert(!dynamic_cast<const SerializationNullable *>(&nested));
+    UNUSED(nested);
+
+    bool insert_default = check_for_null();
+    if (insert_default)
+        column.insertDefault();
+    else
+        deserialize_nested(column);
+    return !insert_default;
+}
+
+
+void SerializationNullable::deserializeBinary(IColumn & column, ReadBuffer & istr) const
+{
+    safeDeserialize(column, *nested,
+        [&istr] { bool is_null = false; readBinary(is_null, istr); return is_null; },
+        [this, &istr] (IColumn & nested_column) { nested->deserializeBinary(nested_column, istr); });
+}
+
+
+void SerializationNullable::serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    const ColumnNullable & col = assert_cast<const ColumnNullable &>(column);
+
+    if (col.isNullAt(row_num))
+        writeString(settings.tsv.null_representation, ostr);
+    else
+        nested->serializeTextEscaped(col.getNestedColumn(), row_num, ostr, settings);
+}
+
+
+void SerializationNullable::deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    deserializeTextEscapedImpl<void>(column, istr, settings, nested);
+}
+
+template<typename ReturnType>
+ReturnType SerializationNullable::deserializeTextEscapedImpl(IColumn & column, ReadBuffer & istr, const FormatSettings & settings,
+                                                    const SerializationPtr & nested)
+{
+    /// Little tricky, because we cannot discriminate null from first character.
+
+    if (istr.eof() || *istr.position() != '\\') /// Some data types can deserialize absence of data (e.g. empty string), so eof is ok.
+    {
+        /// This is not null, surely.
+        return safeDeserialize<ReturnType>(column, *nested,
+            [] { return false; },
+            [&nested, &istr, &settings] (IColumn & nested_column) { nested->deserializeTextEscaped(nested_column, istr, settings); });
+    }
+    else
+    {
+        /// Now we know, that data in buffer starts with backslash.
+        ++istr.position();
+
+        if (istr.eof())
+            throw ParsingException("Unexpected end of stream, while parsing value of Nullable type, after backslash", ErrorCodes::CANNOT_READ_ALL_DATA);
+
+        return safeDeserialize<ReturnType>(column, *nested,
+            [&istr]
+            {
+                if (*istr.position() == 'N')
+                {
+                    ++istr.position();
+                    return true;
+                }
+                return false;
+            },
+            [&nested, &istr, &settings] (IColumn & nested_column)
+            {
+                if (istr.position() != istr.buffer().begin())
+                {
+                    /// We could step back to consume backslash again.
+                    --istr.position();
+                    nested->deserializeTextEscaped(nested_column, istr, settings);
+                }
+                else
+                {
+                    /// Otherwise, we need to place backslash back in front of istr.
+                    ReadBufferFromMemory prefix("\\", 1);
+                    ConcatReadBuffer prepended_istr(prefix, istr);
+
+                    nested->deserializeTextEscaped(nested_column, prepended_istr, settings);
+
+                    /// Synchronise cursor position in original buffer.
+
+                    if (prepended_istr.count() > 1)
+                        istr.position() = prepended_istr.position();
+                }
+            });
+    }
+}
+
+void SerializationNullable::serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    const ColumnNullable & col = assert_cast<const ColumnNullable &>(column);
+
+    if (col.isNullAt(row_num))
+        writeCString("NULL", ostr);
+    else
+        nested->serializeTextQuoted(col.getNestedColumn(), row_num, ostr, settings);
+}
+
+
+void SerializationNullable::deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    deserializeTextQuotedImpl<void>(column, istr, settings, nested);
+}
+
+template<typename ReturnType>
+ReturnType SerializationNullable::deserializeTextQuotedImpl(IColumn & column, ReadBuffer & istr, const FormatSettings & settings,
+                                                   const SerializationPtr & nested)
+{
+    return safeDeserialize<ReturnType>(column, *nested,
+        [&istr]
+        {
+            return checkStringByFirstCharacterAndAssertTheRestCaseInsensitive("NULL", istr);
+        },
+        [&nested, &istr, &settings] (IColumn & nested_column) { nested->deserializeTextQuoted(nested_column, istr, settings); });
+}
+
+
+void SerializationNullable::deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    deserializeWholeTextImpl<void>(column, istr, settings, nested);
+}
+
+template <typename ReturnType>
+ReturnType SerializationNullable::deserializeWholeTextImpl(IColumn & column, ReadBuffer & istr, const FormatSettings & settings,
+                                                  const SerializationPtr & nested)
+{
+    return safeDeserialize<ReturnType>(column, *nested,
+        [&istr]
+        {
+            return checkStringByFirstCharacterAndAssertTheRestCaseInsensitive("NULL", istr)
+                || checkStringByFirstCharacterAndAssertTheRest("ᴺᵁᴸᴸ", istr);
+        },
+        [&nested, &istr, &settings] (IColumn & nested_column) { nested->deserializeWholeText(nested_column, istr, settings); });
+}
+
+
+void SerializationNullable::serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    const ColumnNullable & col = assert_cast<const ColumnNullable &>(column);
+
+    if (col.isNullAt(row_num))
+        writeCString("\\N", ostr);
+    else
+        nested->serializeTextCSV(col.getNestedColumn(), row_num, ostr, settings);
+}
+
+void SerializationNullable::deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    deserializeTextCSVImpl<void>(column, istr, settings, nested);
+}
+
+template<typename ReturnType>
+ReturnType SerializationNullable::deserializeTextCSVImpl(IColumn & column, ReadBuffer & istr, const FormatSettings & settings,
+                                                    const SerializationPtr & nested)
+{
+    constexpr char const * null_literal = "NULL";
+    constexpr size_t len = 4;
+    size_t null_prefix_len = 0;
+
+    auto check_for_null = [&istr, &settings, &null_prefix_len]
+    {
+        if (checkStringByFirstCharacterAndAssertTheRest("\\N", istr))
+            return true;
+        if (!settings.csv.unquoted_null_literal_as_null)
+            return false;
+
+        /// Check for unquoted NULL
+        while (!istr.eof() && null_prefix_len < len && null_literal[null_prefix_len] == *istr.position())
+        {
+            ++null_prefix_len;
+            ++istr.position();
+        }
+        if (null_prefix_len == len)
+            return true;
+
+        /// Value and "NULL" have common prefix, but value is not "NULL".
+        /// Restore previous buffer position if possible.
+        if (null_prefix_len <= istr.offset())
+        {
+            istr.position() -= null_prefix_len;
+            null_prefix_len = 0;
+        }
+        return false;
+    };
+
+    auto deserialize_nested = [&nested, &settings, &istr, &null_prefix_len] (IColumn & nested_column)
+    {
+        if (likely(!null_prefix_len))
+            nested->deserializeTextCSV(nested_column, istr, settings);
+        else
+        {
+            /// Previous buffer position was not restored,
+            /// so we need to prepend extracted characters (rare case)
+            ReadBufferFromMemory prepend(null_literal, null_prefix_len);
+            ConcatReadBuffer buf(prepend, istr);
+            nested->deserializeTextCSV(nested_column, buf, settings);
+
+            /// Check if all extracted characters were read by nested parser and update buffer position
+            if (null_prefix_len < buf.count())
+                istr.position() = buf.position();
+            else if (null_prefix_len > buf.count())
+            {
+                /// It can happen only if there is an unquoted string instead of a number
+                /// or if someone uses 'U' or 'L' as delimiter in CSV.
+                /// In the first case we cannot continue reading anyway. The second case seems to be unlikely.
+                if (settings.csv.delimiter == 'U' || settings.csv.delimiter == 'L')
+                    throw DB::ParsingException("Enabled setting input_format_csv_unquoted_null_literal_as_null may not work correctly "
+                                        "with format_csv_delimiter = 'U' or 'L' for large input.", ErrorCodes::CANNOT_READ_ALL_DATA);
+                WriteBufferFromOwnString parsed_value;
+                nested->serializeTextCSV(nested_column, nested_column.size() - 1, parsed_value, settings);
+                throw DB::ParsingException("Error while parsing \"" + std::string(null_literal, null_prefix_len)
+                                    + std::string(istr.position(), std::min(size_t{10}, istr.available())) + "\" as Nullable"
+                                    + " at position " + std::to_string(istr.count()) + ": got \"" + std::string(null_literal, buf.count())
+                                    + "\", which was deserialized as \""
+                                    + parsed_value.str() + "\". It seems that input data is ill-formatted.",
+                                    ErrorCodes::CANNOT_READ_ALL_DATA);
+            }
+        }
+    };
+
+    return safeDeserialize<ReturnType>(column, *nested, check_for_null, deserialize_nested);
+}
+
+void SerializationNullable::serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    const ColumnNullable & col = assert_cast<const ColumnNullable &>(column);
+
+    /// In simple text format (like 'Pretty' format) (these formats are suitable only for output and cannot be parsed back),
+    ///  data is printed without escaping.
+    /// It makes theoretically impossible to distinguish between NULL and some string value, regardless on how do we print NULL.
+    /// For this reason, we output NULL in a bit strange way.
+    /// This assumes UTF-8 and proper font support. This is Ok, because Pretty formats are "presentational", not for data exchange.
+
+    if (col.isNullAt(row_num))
+    {
+        if (settings.pretty.charset == FormatSettings::Pretty::Charset::UTF8)
+            writeCString("ᴺᵁᴸᴸ", ostr);
+        else
+            writeCString("NULL", ostr);
+    }
+    else
+        nested->serializeText(col.getNestedColumn(), row_num, ostr, settings);
+}
+
+void SerializationNullable::serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    const ColumnNullable & col = assert_cast<const ColumnNullable &>(column);
+
+    if (col.isNullAt(row_num))
+        writeCString("null", ostr);
+    else
+        nested->serializeTextJSON(col.getNestedColumn(), row_num, ostr, settings);
+}
+
+void SerializationNullable::deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    deserializeTextJSONImpl<void>(column, istr, settings, nested);
+}
+
+template<typename ReturnType>
+ReturnType SerializationNullable::deserializeTextJSONImpl(IColumn & column, ReadBuffer & istr, const FormatSettings & settings,
+                                                    const SerializationPtr & nested)
+{
+    return safeDeserialize<ReturnType>(column, *nested,
+        [&istr] { return checkStringByFirstCharacterAndAssertTheRest("null", istr); },
+        [&nested, &istr, &settings] (IColumn & nested_column) { nested->deserializeTextJSON(nested_column, istr, settings); });
+}
+
+void SerializationNullable::serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    const ColumnNullable & col = assert_cast<const ColumnNullable &>(column);
+
+    if (col.isNullAt(row_num))
+        writeCString("\\N", ostr);
+    else
+        nested->serializeTextXML(col.getNestedColumn(), row_num, ostr, settings);
+}
+
+template bool SerializationNullable::deserializeWholeTextImpl<bool>(IColumn & column, ReadBuffer & istr, const FormatSettings & settings, const SerializationPtr & nested);
+template bool SerializationNullable::deserializeTextEscapedImpl<bool>(IColumn & column, ReadBuffer & istr, const FormatSettings & settings, const SerializationPtr & nested);
+template bool SerializationNullable::deserializeTextQuotedImpl<bool>(IColumn & column, ReadBuffer & istr, const FormatSettings &, const SerializationPtr & nested);
+template bool SerializationNullable::deserializeTextCSVImpl<bool>(IColumn & column, ReadBuffer & istr, const FormatSettings & settings, const SerializationPtr & nested);
+template bool SerializationNullable::deserializeTextJSONImpl<bool>(IColumn & column, ReadBuffer & istr, const FormatSettings &, const SerializationPtr & nested);
+
+}
diff --git a/src/DataTypes/Serializations/SerializationNullable.h b/src/DataTypes/Serializations/SerializationNullable.h
new file mode 100644
index 00000000000..b0b96c021d3
--- /dev/null
+++ b/src/DataTypes/Serializations/SerializationNullable.h
@@ -0,0 +1,85 @@
+#pragma once
+
+#include <DataTypes/Serializations/ISerialization.h>
+
+namespace DB
+{
+
+class SerializationNullable : public ISerialization
+{
+private:
+    SerializationPtr nested;
+
+public:
+    SerializationNullable(const SerializationPtr & nested_) : nested(nested_) {}
+
+    void enumerateStreams(const StreamCallback & callback, SubstreamPath & path) const override;
+
+    void serializeBinaryBulkStatePrefix(
+            SerializeBinaryBulkSettings & settings,
+            SerializeBinaryBulkStatePtr & state) const override;
+
+    void serializeBinaryBulkStateSuffix(
+            SerializeBinaryBulkSettings & settings,
+            SerializeBinaryBulkStatePtr & state) const override;
+
+    void deserializeBinaryBulkStatePrefix(
+            DeserializeBinaryBulkSettings & settings,
+            DeserializeBinaryBulkStatePtr & state) const override;
+
+    void serializeBinaryBulkWithMultipleStreams(
+            const IColumn & column,
+            size_t offset,
+            size_t limit,
+            SerializeBinaryBulkSettings & settings,
+            SerializeBinaryBulkStatePtr & state) const override;
+
+    void deserializeBinaryBulkWithMultipleStreams(
+            ColumnPtr & column,
+            size_t limit,
+            DeserializeBinaryBulkSettings & settings,
+            DeserializeBinaryBulkStatePtr & state,
+            SubstreamsCache * cache) const override;
+
+    void serializeBinary(const Field & field, WriteBuffer & ostr) const override;
+    void deserializeBinary(Field & field, ReadBuffer & istr) const override;
+    void serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr) const override;
+    void deserializeBinary(IColumn & column, ReadBuffer & istr) const override;
+    void serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    void serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    void deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+
+    void serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+
+    /** It is questionable, how NULL values could be represented in CSV. There are three variants:
+      * 1. \N
+      * 2. empty string (without quotes)
+      * 3. NULL
+      * We support all of them (however, second variant is supported by CSVRowInputStream, not by deserializeTextCSV).
+      * (see also input_format_defaults_for_omitted_fields and input_format_csv_unquoted_null_literal_as_null settings)
+      * In CSV, non-NULL string value, starting with \N characters, must be placed in quotes, to avoid ambiguity.
+      */
+    void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
+
+    void serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+
+    /// If ReturnType is bool, check for NULL and deserialize value into non-nullable column (and return true) or insert default value of nested type (and return false)
+    /// If ReturnType is void, deserialize Nullable(T)
+    template <typename ReturnType = bool>
+    static ReturnType deserializeWholeTextImpl(IColumn & column, ReadBuffer & istr, const FormatSettings & settings, const SerializationPtr & nested);
+    template <typename ReturnType = bool>
+    static ReturnType deserializeTextEscapedImpl(IColumn & column, ReadBuffer & istr, const FormatSettings & settings, const SerializationPtr & nested);
+    template <typename ReturnType = bool>
+    static ReturnType deserializeTextQuotedImpl(IColumn & column, ReadBuffer & istr, const FormatSettings &, const SerializationPtr & nested);
+    template <typename ReturnType = bool>
+    static ReturnType deserializeTextCSVImpl(IColumn & column, ReadBuffer & istr, const FormatSettings & settings, const SerializationPtr & nested);
+    template <typename ReturnType = bool>
+    static ReturnType deserializeTextJSONImpl(IColumn & column, ReadBuffer & istr, const FormatSettings &, const SerializationPtr & nested);
+};
+
+}
diff --git a/src/DataTypes/Serializations/SerializationNumber.cpp b/src/DataTypes/Serializations/SerializationNumber.cpp
new file mode 100644
index 00000000000..b0a91b11716
--- /dev/null
+++ b/src/DataTypes/Serializations/SerializationNumber.cpp
@@ -0,0 +1,215 @@
+#include <DataTypes/Serializations/SerializationNumber.h>
+#include <Columns/ColumnVector.h>
+#include <Columns/ColumnConst.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <Common/NaNUtils.h>
+#include <Common/typeid_cast.h>
+#include <Common/assert_cast.h>
+#include <Formats/FormatSettings.h>
+#include <Formats/ProtobufReader.h>
+#include <Formats/ProtobufWriter.h>
+#include <Core/Field.h>
+
+namespace DB
+{
+
+template <typename T>
+void SerializationNumber<T>::serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const
+{
+    writeText(assert_cast<const ColumnVector<T> &>(column).getData()[row_num], ostr);
+}
+
+template <typename T>
+void SerializationNumber<T>::deserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
+{
+    T x;
+
+    if constexpr (is_integer_v<T> && is_arithmetic_v<T>)
+        readIntTextUnsafe(x, istr);
+    else
+        readText(x, istr);
+
+    assert_cast<ColumnVector<T> &>(column).getData().push_back(x);
+}
+
+template <typename T>
+static inline void writeDenormalNumber(T x, WriteBuffer & ostr)
+{
+    if constexpr (std::is_floating_point_v<T>)
+    {
+        if (std::signbit(x))
+        {
+            if (isNaN(x))
+                writeCString("-nan", ostr);
+            else
+                writeCString("-inf", ostr);
+        }
+        else
+        {
+            if (isNaN(x))
+                writeCString("nan", ostr);
+            else
+                writeCString("inf", ostr);
+        }
+    }
+    else
+    {
+        /// This function is not called for non floating point numbers.
+        (void)x;
+    }
+}
+
+
+template <typename T>
+void SerializationNumber<T>::serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    auto x = assert_cast<const ColumnVector<T> &>(column).getData()[row_num];
+    bool is_finite = isFinite(x);
+
+    const bool need_quote = (is_integer_v<T> && (sizeof(T) >= 8) && settings.json.quote_64bit_integers)
+        || (settings.json.quote_denormals && !is_finite);
+
+    if (need_quote)
+        writeChar('"', ostr);
+
+    if (is_finite)
+        writeText(x, ostr);
+    else if (!settings.json.quote_denormals)
+        writeCString("null", ostr);
+    else
+        writeDenormalNumber(x, ostr);
+
+    if (need_quote)
+        writeChar('"', ostr);
+}
+
+template <typename T>
+void SerializationNumber<T>::deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
+{
+    bool has_quote = false;
+    if (!istr.eof() && *istr.position() == '"')        /// We understand the number both in quotes and without.
+    {
+        has_quote = true;
+        ++istr.position();
+    }
+
+    FieldType x;
+
+    /// null
+    if (!has_quote && !istr.eof() && *istr.position() == 'n')
+    {
+        ++istr.position();
+        assertString("ull", istr);
+
+        x = NaNOrZero<T>();
+    }
+    else
+    {
+        static constexpr bool is_uint8 = std::is_same_v<T, UInt8>;
+        static constexpr bool is_int8 = std::is_same_v<T, Int8>;
+
+        if (is_uint8 || is_int8)
+        {
+            // extra conditions to parse true/false strings into 1/0
+            if (istr.eof())
+                throwReadAfterEOF();
+            if (*istr.position() == 't' || *istr.position() == 'f')
+            {
+                bool tmp = false;
+                readBoolTextWord(tmp, istr);
+                x = tmp;
+            }
+            else
+                readText(x, istr);
+        }
+        else
+        {
+            readText(x, istr);
+        }
+
+        if (has_quote)
+            assertChar('"', istr);
+    }
+
+    assert_cast<ColumnVector<T> &>(column).getData().push_back(x);
+}
+
+template <typename T>
+void SerializationNumber<T>::deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
+{
+    FieldType x;
+    readCSV(x, istr);
+    assert_cast<ColumnVector<T> &>(column).getData().push_back(x);
+}
+
+template <typename T>
+void SerializationNumber<T>::serializeBinary(const Field & field, WriteBuffer & ostr) const
+{
+    /// ColumnVector<T>::ValueType is a narrower type. For example, UInt8, when the Field type is UInt64
+    typename ColumnVector<T>::ValueType x = get<FieldType>(field);
+    writeBinary(x, ostr);
+}
+
+template <typename T>
+void SerializationNumber<T>::deserializeBinary(Field & field, ReadBuffer & istr) const
+{
+    typename ColumnVector<T>::ValueType x;
+    readBinary(x, istr);
+    field = NearestFieldType<FieldType>(x);
+}
+
+template <typename T>
+void SerializationNumber<T>::serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr) const
+{
+    writeBinary(assert_cast<const ColumnVector<T> &>(column).getData()[row_num], ostr);
+}
+
+template <typename T>
+void SerializationNumber<T>::deserializeBinary(IColumn & column, ReadBuffer & istr) const
+{
+    typename ColumnVector<T>::ValueType x;
+    readBinary(x, istr);
+    assert_cast<ColumnVector<T> &>(column).getData().push_back(x);
+}
+
+template <typename T>
+void SerializationNumber<T>::serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, size_t offset, size_t limit) const
+{
+    const typename ColumnVector<T>::Container & x = typeid_cast<const ColumnVector<T> &>(column).getData();
+
+    size_t size = x.size();
+
+    if (limit == 0 || offset + limit > size)
+        limit = size - offset;
+
+    if (limit)
+        ostr.write(reinterpret_cast<const char *>(&x[offset]), sizeof(typename ColumnVector<T>::ValueType) * limit);
+}
+
+template <typename T>
+void SerializationNumber<T>::deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, size_t limit, double /*avg_value_size_hint*/) const
+{
+    typename ColumnVector<T>::Container & x = typeid_cast<ColumnVector<T> &>(column).getData();
+    size_t initial_size = x.size();
+    x.resize(initial_size + limit);
+    size_t size = istr.readBig(reinterpret_cast<char*>(&x[initial_size]), sizeof(typename ColumnVector<T>::ValueType) * limit);
+    x.resize(initial_size + size / sizeof(typename ColumnVector<T>::ValueType));
+}
+
+template class SerializationNumber<UInt8>;
+template class SerializationNumber<UInt16>;
+template class SerializationNumber<UInt32>;
+template class SerializationNumber<UInt64>;
+template class SerializationNumber<UInt128>; // base for UUID
+template class SerializationNumber<UInt256>;
+template class SerializationNumber<Int8>;
+template class SerializationNumber<Int16>;
+template class SerializationNumber<Int32>;
+template class SerializationNumber<Int64>;
+template class SerializationNumber<Int128>;
+template class SerializationNumber<Int256>;
+template class SerializationNumber<Float32>;
+template class SerializationNumber<Float64>;
+
+}
diff --git a/src/DataTypes/Serializations/SerializationNumber.h b/src/DataTypes/Serializations/SerializationNumber.h
new file mode 100644
index 00000000000..09976a4bc4f
--- /dev/null
+++ b/src/DataTypes/Serializations/SerializationNumber.h
@@ -0,0 +1,33 @@
+#pragma once
+
+#include <DataTypes/Serializations/SimpleTextSerialization.h>
+#include <Columns/ColumnVector.h>
+
+namespace DB
+{
+
+template <typename T>
+class SerializationNumber : public SimpleTextSerialization
+{
+    static_assert(IsNumber<T>);
+
+public:
+    using FieldType = T;
+    using ColumnType = ColumnVector<T>;
+
+    void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void deserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
+    void serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override;
+    void deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
+
+    /** Format is platform-dependent. */
+    void serializeBinary(const Field & field, WriteBuffer & ostr) const override;
+    void deserializeBinary(Field & field, ReadBuffer & istr) const override;
+    void serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr) const override;
+    void deserializeBinary(IColumn & column, ReadBuffer & istr) const override;
+    void serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, size_t offset, size_t limit) const override;
+    void deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, size_t limit, double avg_value_size_hint) const override;
+};
+
+}
diff --git a/src/DataTypes/Serializations/SerializationString.cpp b/src/DataTypes/Serializations/SerializationString.cpp
new file mode 100644
index 00000000000..c3c24ed6749
--- /dev/null
+++ b/src/DataTypes/Serializations/SerializationString.cpp
@@ -0,0 +1,300 @@
+#include <DataTypes/Serializations/SerializationString.h>
+
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnConst.h>
+
+#include <Common/typeid_cast.h>
+#include <Common/assert_cast.h>
+
+#include <Core/Field.h>
+
+#include <Formats/FormatSettings.h>
+#include <Formats/ProtobufReader.h>
+#include <Formats/ProtobufWriter.h>
+
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <IO/VarInt.h>
+
+#ifdef __SSE2__
+    #include <emmintrin.h>
+#endif
+
+namespace DB
+{
+
+void SerializationString::serializeBinary(const Field & field, WriteBuffer & ostr) const
+{
+    const String & s = get<const String &>(field);
+    writeVarUInt(s.size(), ostr);
+    writeString(s, ostr);
+}
+
+
+void SerializationString::deserializeBinary(Field & field, ReadBuffer & istr) const
+{
+    UInt64 size;
+    readVarUInt(size, istr);
+    field = String();
+    String & s = get<String &>(field);
+    s.resize(size);
+    istr.readStrict(s.data(), size);
+}
+
+
+void SerializationString::serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr) const
+{
+    const StringRef & s = assert_cast<const ColumnString &>(column).getDataAt(row_num);
+    writeVarUInt(s.size, ostr);
+    writeString(s, ostr);
+}
+
+
+void SerializationString::deserializeBinary(IColumn & column, ReadBuffer & istr) const
+{
+    ColumnString & column_string = assert_cast<ColumnString &>(column);
+    ColumnString::Chars & data = column_string.getChars();
+    ColumnString::Offsets & offsets = column_string.getOffsets();
+
+    UInt64 size;
+    readVarUInt(size, istr);
+
+    size_t old_chars_size = data.size();
+    size_t offset = old_chars_size + size + 1;
+    offsets.push_back(offset);
+
+    try
+    {
+        data.resize(offset);
+        istr.readStrict(reinterpret_cast<char*>(&data[offset - size - 1]), size);
+        data.back() = 0;
+    }
+    catch (...)
+    {
+        offsets.pop_back();
+        data.resize_assume_reserved(old_chars_size);
+        throw;
+    }
+}
+
+
+void SerializationString::serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, size_t offset, size_t limit) const
+{
+    const ColumnString & column_string = typeid_cast<const ColumnString &>(column);
+    const ColumnString::Chars & data = column_string.getChars();
+    const ColumnString::Offsets & offsets = column_string.getOffsets();
+
+    size_t size = column.size();
+    if (!size)
+        return;
+
+    size_t end = limit && offset + limit < size
+        ? offset + limit
+        : size;
+
+    if (offset == 0)
+    {
+        UInt64 str_size = offsets[0] - 1;
+        writeVarUInt(str_size, ostr);
+        ostr.write(reinterpret_cast<const char *>(data.data()), str_size);
+
+        ++offset;
+    }
+
+    for (size_t i = offset; i < end; ++i)
+    {
+        UInt64 str_size = offsets[i] - offsets[i - 1] - 1;
+        writeVarUInt(str_size, ostr);
+        ostr.write(reinterpret_cast<const char *>(&data[offsets[i - 1]]), str_size);
+    }
+}
+
+
+template <int UNROLL_TIMES>
+static NO_INLINE void deserializeBinarySSE2(ColumnString::Chars & data, ColumnString::Offsets & offsets, ReadBuffer & istr, size_t limit)
+{
+    size_t offset = data.size();
+    for (size_t i = 0; i < limit; ++i)
+    {
+        if (istr.eof())
+            break;
+
+        UInt64 size;
+        readVarUInt(size, istr);
+
+        offset += size + 1;
+        offsets.push_back(offset);
+
+        data.resize(offset);
+
+        if (size)
+        {
+#ifdef __SSE2__
+            /// An optimistic branch in which more efficient copying is possible.
+            if (offset + 16 * UNROLL_TIMES <= data.capacity() && istr.position() + size + 16 * UNROLL_TIMES <= istr.buffer().end())
+            {
+                const __m128i * sse_src_pos = reinterpret_cast<const __m128i *>(istr.position());
+                const __m128i * sse_src_end = sse_src_pos + (size + (16 * UNROLL_TIMES - 1)) / 16 / UNROLL_TIMES * UNROLL_TIMES;
+                __m128i * sse_dst_pos = reinterpret_cast<__m128i *>(&data[offset - size - 1]);
+
+                while (sse_src_pos < sse_src_end)
+                {
+                    for (size_t j = 0; j < UNROLL_TIMES; ++j)
+                        _mm_storeu_si128(sse_dst_pos + j, _mm_loadu_si128(sse_src_pos + j));
+
+                    sse_src_pos += UNROLL_TIMES;
+                    sse_dst_pos += UNROLL_TIMES;
+                }
+
+                istr.position() += size;
+            }
+            else
+#endif
+            {
+                istr.readStrict(reinterpret_cast<char*>(&data[offset - size - 1]), size);
+            }
+        }
+
+        data[offset - 1] = 0;
+    }
+}
+
+
+void SerializationString::deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, size_t limit, double avg_value_size_hint) const
+{
+    ColumnString & column_string = typeid_cast<ColumnString &>(column);
+    ColumnString::Chars & data = column_string.getChars();
+    ColumnString::Offsets & offsets = column_string.getOffsets();
+
+    double avg_chars_size = 1; /// By default reserve only for empty strings.
+
+    if (avg_value_size_hint && avg_value_size_hint > sizeof(offsets[0]))
+    {
+        /// Randomly selected.
+        constexpr auto avg_value_size_hint_reserve_multiplier = 1.2;
+
+        avg_chars_size = (avg_value_size_hint - sizeof(offsets[0])) * avg_value_size_hint_reserve_multiplier;
+    }
+
+    size_t size_to_reserve = data.size() + std::ceil(limit * avg_chars_size);
+
+    /// Never reserve for too big size.
+    if (size_to_reserve < 256 * 1024 * 1024)
+    {
+        try
+        {
+            data.reserve(size_to_reserve);
+        }
+        catch (Exception & e)
+        {
+            e.addMessage(
+                "(avg_value_size_hint = " + toString(avg_value_size_hint)
+                + ", avg_chars_size = " + toString(avg_chars_size)
+                + ", limit = " + toString(limit) + ")");
+            throw;
+        }
+    }
+
+    offsets.reserve(offsets.size() + limit);
+
+    if (avg_chars_size >= 64)
+        deserializeBinarySSE2<4>(data, offsets, istr, limit);
+    else if (avg_chars_size >= 48)
+        deserializeBinarySSE2<3>(data, offsets, istr, limit);
+    else if (avg_chars_size >= 32)
+        deserializeBinarySSE2<2>(data, offsets, istr, limit);
+    else
+        deserializeBinarySSE2<1>(data, offsets, istr, limit);
+}
+
+
+void SerializationString::serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const
+{
+    writeString(assert_cast<const ColumnString &>(column).getDataAt(row_num), ostr);
+}
+
+
+void SerializationString::serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const
+{
+    writeEscapedString(assert_cast<const ColumnString &>(column).getDataAt(row_num), ostr);
+}
+
+
+template <typename Reader>
+static inline void read(IColumn & column, Reader && reader)
+{
+    ColumnString & column_string = assert_cast<ColumnString &>(column);
+    ColumnString::Chars & data = column_string.getChars();
+    ColumnString::Offsets & offsets = column_string.getOffsets();
+    size_t old_chars_size = data.size();
+    size_t old_offsets_size = offsets.size();
+    try
+    {
+        reader(data);
+        data.push_back(0);
+        offsets.push_back(data.size());
+    }
+    catch (...)
+    {
+        offsets.resize_assume_reserved(old_offsets_size);
+        data.resize_assume_reserved(old_chars_size);
+        throw;
+    }
+}
+
+
+void SerializationString::deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
+{
+    read(column, [&](ColumnString::Chars & data) { readStringInto(data, istr); });
+}
+
+
+void SerializationString::deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
+{
+    read(column, [&](ColumnString::Chars & data) { readEscapedStringInto(data, istr); });
+}
+
+
+void SerializationString::serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const
+{
+    writeQuotedString(assert_cast<const ColumnString &>(column).getDataAt(row_num), ostr);
+}
+
+
+void SerializationString::deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
+{
+    read(column, [&](ColumnString::Chars & data) { readQuotedStringInto<true>(data, istr); });
+}
+
+
+void SerializationString::serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    writeJSONString(assert_cast<const ColumnString &>(column).getDataAt(row_num), ostr, settings);
+}
+
+
+void SerializationString::deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
+{
+    read(column, [&](ColumnString::Chars & data) { readJSONStringInto(data, istr); });
+}
+
+
+void SerializationString::serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const
+{
+    writeXMLStringForTextElement(assert_cast<const ColumnString &>(column).getDataAt(row_num), ostr);
+}
+
+
+void SerializationString::serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const
+{
+    writeCSVString<>(assert_cast<const ColumnString &>(column).getDataAt(row_num), ostr);
+}
+
+
+void SerializationString::deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    read(column, [&](ColumnString::Chars & data) { readCSVStringInto(data, istr, settings.csv); });
+}
+
+
+}
diff --git a/src/DataTypes/Serializations/SerializationString.h b/src/DataTypes/Serializations/SerializationString.h
new file mode 100644
index 00000000000..ee5de2c18f1
--- /dev/null
+++ b/src/DataTypes/Serializations/SerializationString.h
@@ -0,0 +1,37 @@
+#pragma once
+
+#include <DataTypes/Serializations/ISerialization.h>
+
+namespace DB
+{
+
+class SerializationString final : public ISerialization
+{
+public:
+    void serializeBinary(const Field & field, WriteBuffer & ostr) const override;
+    void deserializeBinary(Field & field, ReadBuffer & istr) const override;
+    void serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr) const override;
+    void deserializeBinary(IColumn & column, ReadBuffer & istr) const override;
+
+    void serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, size_t offset, size_t limit) const override;
+    void deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, size_t limit, double avg_value_size_hint) const override;
+
+    void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+
+    void serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+
+    void serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+
+    void serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+
+    void serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+
+    void serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+};
+
+}
diff --git a/src/DataTypes/Serializations/SerializationTuple.cpp b/src/DataTypes/Serializations/SerializationTuple.cpp
new file mode 100644
index 00000000000..bdeea80477e
--- /dev/null
+++ b/src/DataTypes/Serializations/SerializationTuple.cpp
@@ -0,0 +1,408 @@
+#include <DataTypes/Serializations/SerializationTuple.h>
+#include <Core/Field.h>
+#include <Columns/ColumnTuple.h>
+#include <Common/assert_cast.h>
+#include <IO/WriteHelpers.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteBufferFromString.h>
+#include <IO/Operators.h>
+
+#include <ext/map.h>
+#include <ext/enumerate.h>
+#include <ext/range.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int SIZES_OF_COLUMNS_IN_TUPLE_DOESNT_MATCH;
+    extern const int NOT_FOUND_COLUMN_IN_BLOCK;
+    extern const int LOGICAL_ERROR;
+}
+
+
+static inline IColumn & extractElementColumn(IColumn & column, size_t idx)
+{
+    return assert_cast<ColumnTuple &>(column).getColumn(idx);
+}
+
+static inline const IColumn & extractElementColumn(const IColumn & column, size_t idx)
+{
+    return assert_cast<const ColumnTuple &>(column).getColumn(idx);
+}
+
+void SerializationTuple::serializeBinary(const Field & field, WriteBuffer & ostr) const
+{
+    const auto & tuple = get<const Tuple &>(field);
+    for (const auto idx_elem : ext::enumerate(elems))
+        idx_elem.second->serializeBinary(tuple[idx_elem.first], ostr);
+}
+
+void SerializationTuple::deserializeBinary(Field & field, ReadBuffer & istr) const
+{
+    const size_t size = elems.size();
+
+    Tuple tuple(size);
+    for (const auto i : ext::range(0, size))
+        elems[i]->deserializeBinary(tuple[i], istr);
+
+    field = tuple;
+}
+
+void SerializationTuple::serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr) const
+{
+    for (const auto idx_elem : ext::enumerate(elems))
+        idx_elem.second->serializeBinary(extractElementColumn(column, idx_elem.first), row_num, ostr);
+}
+
+
+template <typename F>
+static void addElementSafe(size_t num_elems, IColumn & column, F && impl)
+{
+    /// We use the assumption that tuples of zero size do not exist.
+    size_t old_size = column.size();
+
+    try
+    {
+        impl();
+
+        // Check that all columns now have the same size.
+        size_t new_size = column.size();
+        for (auto i : ext::range(1, num_elems))
+        {
+            const auto & element_column = extractElementColumn(column, i);
+            if (element_column.size() != new_size)
+            {
+                // This is not a logical error because it may work with
+                // user-supplied data.
+                throw Exception(ErrorCodes::SIZES_OF_COLUMNS_IN_TUPLE_DOESNT_MATCH,
+                    "Cannot read a tuple because not all elements are present");
+            }
+        }
+    }
+    catch (...)
+    {
+        for (const auto & i : ext::range(0, num_elems))
+        {
+            auto & element_column = extractElementColumn(column, i);
+            if (element_column.size() > old_size)
+                element_column.popBack(1);
+        }
+
+        throw;
+    }
+}
+
+void SerializationTuple::deserializeBinary(IColumn & column, ReadBuffer & istr) const
+{
+    addElementSafe(elems.size(), column, [&]
+    {
+        for (const auto & i : ext::range(0, ext::size(elems)))
+            elems[i]->deserializeBinary(extractElementColumn(column, i), istr);
+    });
+}
+
+void SerializationTuple::serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    writeChar('(', ostr);
+    for (const auto i : ext::range(0, ext::size(elems)))
+    {
+        if (i != 0)
+            writeChar(',', ostr);
+        elems[i]->serializeTextQuoted(extractElementColumn(column, i), row_num, ostr, settings);
+    }
+    writeChar(')', ostr);
+}
+
+void SerializationTuple::deserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    const size_t size = elems.size();
+    assertChar('(', istr);
+
+    addElementSafe(elems.size(), column, [&]
+    {
+        for (const auto i : ext::range(0, size))
+        {
+            skipWhitespaceIfAny(istr);
+            if (i != 0)
+            {
+                assertChar(',', istr);
+                skipWhitespaceIfAny(istr);
+            }
+            elems[i]->deserializeTextQuoted(extractElementColumn(column, i), istr, settings);
+        }
+    });
+
+    // Special format for one element tuple (1,)
+    if (1 == elems.size())
+    {
+        skipWhitespaceIfAny(istr);
+        // Allow both (1) and (1,)
+        checkChar(',', istr);
+    }
+    skipWhitespaceIfAny(istr);
+    assertChar(')', istr);
+}
+
+void SerializationTuple::serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    if (settings.json.named_tuples_as_objects
+        && have_explicit_names)
+    {
+        writeChar('{', ostr);
+        for (const auto i : ext::range(0, ext::size(elems)))
+        {
+            if (i != 0)
+            {
+                writeChar(',', ostr);
+            }
+            writeJSONString(elems[i]->getElementName(), ostr, settings);
+            writeChar(':', ostr);
+            elems[i]->serializeTextJSON(extractElementColumn(column, i), row_num, ostr, settings);
+        }
+        writeChar('}', ostr);
+    }
+    else
+    {
+        writeChar('[', ostr);
+        for (const auto i : ext::range(0, ext::size(elems)))
+        {
+            if (i != 0)
+                writeChar(',', ostr);
+            elems[i]->serializeTextJSON(extractElementColumn(column, i), row_num, ostr, settings);
+        }
+        writeChar(']', ostr);
+    }
+}
+
+void SerializationTuple::deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    if (settings.json.named_tuples_as_objects
+        && have_explicit_names)
+    {
+        skipWhitespaceIfAny(istr);
+        assertChar('{', istr);
+        skipWhitespaceIfAny(istr);
+
+        addElementSafe(elems.size(), column, [&]
+        {
+            // Require all elements but in arbitrary order.
+            for (auto i : ext::range(0, ext::size(elems)))
+            {
+                if (i > 0)
+                {
+                    skipWhitespaceIfAny(istr);
+                    assertChar(',', istr);
+                    skipWhitespaceIfAny(istr);
+                }
+
+                std::string name;
+                readDoubleQuotedString(name, istr);
+                skipWhitespaceIfAny(istr);
+                assertChar(':', istr);
+                skipWhitespaceIfAny(istr);
+
+                const size_t element_pos = getPositionByName(name);
+                auto & element_column = extractElementColumn(column, element_pos);
+                elems[element_pos]->deserializeTextJSON(element_column, istr, settings);
+            }
+        });
+
+        skipWhitespaceIfAny(istr);
+        assertChar('}', istr);
+    }
+    else
+    {
+        const size_t size = elems.size();
+        assertChar('[', istr);
+
+        addElementSafe(elems.size(), column, [&]
+        {
+            for (const auto i : ext::range(0, size))
+            {
+                skipWhitespaceIfAny(istr);
+                if (i != 0)
+                {
+                    assertChar(',', istr);
+                    skipWhitespaceIfAny(istr);
+                }
+                elems[i]->deserializeTextJSON(extractElementColumn(column, i), istr, settings);
+            }
+        });
+
+        skipWhitespaceIfAny(istr);
+        assertChar(']', istr);
+    }
+}
+
+void SerializationTuple::serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    writeCString("<tuple>", ostr);
+    for (const auto i : ext::range(0, ext::size(elems)))
+    {
+        writeCString("<elem>", ostr);
+        elems[i]->serializeTextXML(extractElementColumn(column, i), row_num, ostr, settings);
+        writeCString("</elem>", ostr);
+    }
+    writeCString("</tuple>", ostr);
+}
+
+void SerializationTuple::serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    for (const auto i : ext::range(0, ext::size(elems)))
+    {
+        if (i != 0)
+            writeChar(',', ostr);
+        elems[i]->serializeTextCSV(extractElementColumn(column, i), row_num, ostr, settings);
+    }
+}
+
+void SerializationTuple::deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    addElementSafe(elems.size(), column, [&]
+    {
+        const size_t size = elems.size();
+        for (const auto i : ext::range(0, size))
+        {
+            if (i != 0)
+            {
+                skipWhitespaceIfAny(istr);
+                assertChar(settings.csv.delimiter, istr);
+                skipWhitespaceIfAny(istr);
+            }
+            elems[i]->deserializeTextCSV(extractElementColumn(column, i), istr, settings);
+        }
+    });
+}
+
+void SerializationTuple::enumerateStreams(const StreamCallback & callback, SubstreamPath & path) const
+{
+    for (const auto & elem : elems)
+        elem->enumerateStreams(callback, path);
+}
+
+struct SerializeBinaryBulkStateTuple : public ISerialization::SerializeBinaryBulkState
+{
+    std::vector<ISerialization::SerializeBinaryBulkStatePtr> states;
+};
+
+struct DeserializeBinaryBulkStateTuple : public ISerialization::DeserializeBinaryBulkState
+{
+    std::vector<ISerialization::DeserializeBinaryBulkStatePtr> states;
+};
+
+static SerializeBinaryBulkStateTuple * checkAndGetTupleSerializeState(ISerialization::SerializeBinaryBulkStatePtr & state)
+{
+    if (!state)
+        throw Exception("Got empty state for DataTypeTuple.", ErrorCodes::LOGICAL_ERROR);
+
+    auto * tuple_state = typeid_cast<SerializeBinaryBulkStateTuple *>(state.get());
+    if (!tuple_state)
+    {
+        auto & state_ref = *state;
+        throw Exception("Invalid SerializeBinaryBulkState for DataTypeTuple. Expected: "
+                        + demangle(typeid(SerializeBinaryBulkStateTuple).name()) + ", got "
+                        + demangle(typeid(state_ref).name()), ErrorCodes::LOGICAL_ERROR);
+    }
+
+    return tuple_state;
+}
+
+static DeserializeBinaryBulkStateTuple * checkAndGetTupleDeserializeState(ISerialization::DeserializeBinaryBulkStatePtr & state)
+{
+    if (!state)
+        throw Exception("Got empty state for DataTypeTuple.", ErrorCodes::LOGICAL_ERROR);
+
+    auto * tuple_state = typeid_cast<DeserializeBinaryBulkStateTuple *>(state.get());
+    if (!tuple_state)
+    {
+        auto & state_ref = *state;
+        throw Exception("Invalid DeserializeBinaryBulkState for DataTypeTuple. Expected: "
+                        + demangle(typeid(DeserializeBinaryBulkStateTuple).name()) + ", got "
+                        + demangle(typeid(state_ref).name()), ErrorCodes::LOGICAL_ERROR);
+    }
+
+    return tuple_state;
+}
+
+void SerializationTuple::serializeBinaryBulkStatePrefix(
+    SerializeBinaryBulkSettings & settings,
+    SerializeBinaryBulkStatePtr & state) const
+{
+    auto tuple_state = std::make_shared<SerializeBinaryBulkStateTuple>();
+    tuple_state->states.resize(elems.size());
+
+    for (size_t i = 0; i < elems.size(); ++i)
+        elems[i]->serializeBinaryBulkStatePrefix(settings, tuple_state->states[i]);
+
+    state = std::move(tuple_state);
+}
+
+void SerializationTuple::serializeBinaryBulkStateSuffix(
+    SerializeBinaryBulkSettings & settings,
+    SerializeBinaryBulkStatePtr & state) const
+{
+    auto * tuple_state = checkAndGetTupleSerializeState(state);
+
+    for (size_t i = 0; i < elems.size(); ++i)
+        elems[i]->serializeBinaryBulkStateSuffix(settings, tuple_state->states[i]);
+}
+
+void SerializationTuple::deserializeBinaryBulkStatePrefix(
+        DeserializeBinaryBulkSettings & settings,
+        DeserializeBinaryBulkStatePtr & state) const
+{
+    auto tuple_state = std::make_shared<DeserializeBinaryBulkStateTuple>();
+    tuple_state->states.resize(elems.size());
+
+    for (size_t i = 0; i < elems.size(); ++i)
+        elems[i]->deserializeBinaryBulkStatePrefix(settings, tuple_state->states[i]);
+
+    state = std::move(tuple_state);
+}
+
+void SerializationTuple::serializeBinaryBulkWithMultipleStreams(
+    const IColumn & column,
+    size_t offset,
+    size_t limit,
+    SerializeBinaryBulkSettings & settings,
+    SerializeBinaryBulkStatePtr & state) const
+{
+    auto * tuple_state = checkAndGetTupleSerializeState(state);
+
+    for (const auto i : ext::range(0, ext::size(elems)))
+    {
+        const auto & element_col = extractElementColumn(column, i);
+        elems[i]->serializeBinaryBulkWithMultipleStreams(element_col, offset, limit, settings, tuple_state->states[i]);
+    }
+}
+
+void SerializationTuple::deserializeBinaryBulkWithMultipleStreams(
+    ColumnPtr & column,
+    size_t limit,
+    DeserializeBinaryBulkSettings & settings,
+    DeserializeBinaryBulkStatePtr & state,
+    SubstreamsCache * cache) const
+{
+    auto * tuple_state = checkAndGetTupleDeserializeState(state);
+
+    auto mutable_column = column->assumeMutable();
+    auto & column_tuple = assert_cast<ColumnTuple &>(*mutable_column);
+
+    settings.avg_value_size_hint = 0;
+    for (const auto i : ext::range(0, ext::size(elems)))
+        elems[i]->deserializeBinaryBulkWithMultipleStreams(column_tuple.getColumnPtr(i), limit, settings, tuple_state->states[i], cache);
+}
+
+size_t SerializationTuple::getPositionByName(const String & name) const
+{
+    size_t size = elems.size();
+    for (size_t i = 0; i < size; ++i)
+        if (elems[i]->getElementName() == name)
+            return i;
+    throw Exception("Tuple doesn't have element with name '" + name + "'", ErrorCodes::NOT_FOUND_COLUMN_IN_BLOCK);
+}
+
+}
diff --git a/src/DataTypes/Serializations/SerializationTuple.h b/src/DataTypes/Serializations/SerializationTuple.h
new file mode 100644
index 00000000000..13668572fff
--- /dev/null
+++ b/src/DataTypes/Serializations/SerializationTuple.h
@@ -0,0 +1,69 @@
+#pragma once
+
+#include <DataTypes/Serializations/SimpleTextSerialization.h>
+#include <DataTypes/Serializations/SerializationTupleElement.h>
+
+namespace DB
+{
+
+class SerializationTuple final : public SimpleTextSerialization
+{
+public:
+    using ElementSerializationPtr = std::shared_ptr<const SerializationTupleElement>;
+    using ElementSerializations = std::vector<ElementSerializationPtr>;
+
+    SerializationTuple(const ElementSerializations & elems_, bool have_explicit_names_)
+        : elems(elems_), have_explicit_names(have_explicit_names_) {}
+
+    void serializeBinary(const Field & field, WriteBuffer & ostr) const override;
+    void deserializeBinary(Field & field, ReadBuffer & istr) const override;
+    void serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr) const override;
+    void deserializeBinary(IColumn & column, ReadBuffer & istr) const override;
+    void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void deserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    void serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    void serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+
+    /// Tuples in CSV format will be serialized as separate columns (that is, losing their nesting in the tuple).
+    void serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+
+    /** Each sub-column in a tuple is serialized in separate stream.
+      */
+    void enumerateStreams(const StreamCallback & callback, SubstreamPath & path) const override;
+
+    void serializeBinaryBulkStatePrefix(
+            SerializeBinaryBulkSettings & settings,
+            SerializeBinaryBulkStatePtr & state) const override;
+
+    void serializeBinaryBulkStateSuffix(
+            SerializeBinaryBulkSettings & settings,
+            SerializeBinaryBulkStatePtr & state) const override;
+
+    void deserializeBinaryBulkStatePrefix(
+            DeserializeBinaryBulkSettings & settings,
+            DeserializeBinaryBulkStatePtr & state) const override;
+
+    void serializeBinaryBulkWithMultipleStreams(
+            const IColumn & column,
+            size_t offset,
+            size_t limit,
+            SerializeBinaryBulkSettings & settings,
+            SerializeBinaryBulkStatePtr & state) const override;
+
+    void deserializeBinaryBulkWithMultipleStreams(
+            ColumnPtr & column,
+            size_t limit,
+            DeserializeBinaryBulkSettings & settings,
+            DeserializeBinaryBulkStatePtr & state,
+            SubstreamsCache * cache) const override;
+
+private:
+    ElementSerializations elems;
+    bool have_explicit_names;
+
+    size_t getPositionByName(const String & name) const;
+};
+
+}
diff --git a/src/DataTypes/Serializations/SerializationTupleElement.cpp b/src/DataTypes/Serializations/SerializationTupleElement.cpp
new file mode 100644
index 00000000000..4b50810fcd6
--- /dev/null
+++ b/src/DataTypes/Serializations/SerializationTupleElement.cpp
@@ -0,0 +1,73 @@
+#include <DataTypes/Serializations/SerializationTupleElement.h>
+
+namespace DB
+{
+
+void SerializationTupleElement::enumerateStreams(
+    const StreamCallback & callback,
+    SubstreamPath & path) const
+{
+    addToPath(path);
+    nested_serialization->enumerateStreams(callback, path);
+    path.pop_back();
+}
+
+void SerializationTupleElement::serializeBinaryBulkStatePrefix(
+    SerializeBinaryBulkSettings & settings,
+    SerializeBinaryBulkStatePtr & state) const
+{
+    addToPath(settings.path);
+    nested_serialization->serializeBinaryBulkStatePrefix(settings, state);
+    settings.path.pop_back();
+}
+
+void SerializationTupleElement::serializeBinaryBulkStateSuffix(
+    SerializeBinaryBulkSettings & settings,
+    SerializeBinaryBulkStatePtr & state) const
+{
+    addToPath(settings.path);
+    nested_serialization->serializeBinaryBulkStateSuffix(settings, state);
+    settings.path.pop_back();
+}
+
+void SerializationTupleElement::deserializeBinaryBulkStatePrefix(
+    DeserializeBinaryBulkSettings & settings,
+    DeserializeBinaryBulkStatePtr & state) const
+{
+    addToPath(settings.path);
+    nested_serialization->deserializeBinaryBulkStatePrefix(settings, state);
+    settings.path.pop_back();
+}
+
+void SerializationTupleElement::serializeBinaryBulkWithMultipleStreams(
+    const IColumn & column,
+    size_t offset,
+    size_t limit,
+    SerializeBinaryBulkSettings & settings,
+    SerializeBinaryBulkStatePtr & state) const
+{
+    addToPath(settings.path);
+    nested_serialization->serializeBinaryBulkWithMultipleStreams(column, offset, limit, settings, state);
+    settings.path.pop_back();
+}
+
+void SerializationTupleElement::deserializeBinaryBulkWithMultipleStreams(
+    ColumnPtr & column,
+    size_t limit,
+    DeserializeBinaryBulkSettings & settings,
+    DeserializeBinaryBulkStatePtr & state,
+    SubstreamsCache * cache) const
+{
+    addToPath(settings.path);
+    nested_serialization->deserializeBinaryBulkWithMultipleStreams(column, limit, settings, state, cache);
+    settings.path.pop_back();
+}
+
+void SerializationTupleElement::addToPath(SubstreamPath & path) const
+{
+    path.push_back(Substream::TupleElement);
+    path.back().tuple_element_name = name;
+    path.back().escape_tuple_delimiter = escape_delimiter;
+}
+
+}
diff --git a/src/DataTypes/Serializations/SerializationTupleElement.h b/src/DataTypes/Serializations/SerializationTupleElement.h
new file mode 100644
index 00000000000..b85014c9e64
--- /dev/null
+++ b/src/DataTypes/Serializations/SerializationTupleElement.h
@@ -0,0 +1,57 @@
+#pragma once
+
+#include <DataTypes/Serializations/SerializationWrapper.h>
+
+namespace DB
+{
+
+class SerializationTupleElement final : public SerializationWrapper
+{
+private:
+    String name;
+    bool escape_delimiter;
+
+public:
+    SerializationTupleElement(const SerializationPtr & nested_, const String & name_, bool escape_delimiter_ = true)
+        : SerializationWrapper(nested_)
+        , name(name_), escape_delimiter(escape_delimiter_)
+    {
+    }
+
+    const String & getElementName() const { return name; }
+
+    void enumerateStreams(
+        const StreamCallback & callback,
+        SubstreamPath & path) const override;
+
+    void serializeBinaryBulkStatePrefix(
+         SerializeBinaryBulkSettings & settings,
+        SerializeBinaryBulkStatePtr & state) const override;
+
+    void serializeBinaryBulkStateSuffix(
+        SerializeBinaryBulkSettings & settings,
+        SerializeBinaryBulkStatePtr & state) const override;
+
+    void deserializeBinaryBulkStatePrefix(
+        DeserializeBinaryBulkSettings & settings,
+        DeserializeBinaryBulkStatePtr & state) const override;
+
+    void serializeBinaryBulkWithMultipleStreams(
+        const IColumn & column,
+        size_t offset,
+        size_t limit,
+        SerializeBinaryBulkSettings & settings,
+        SerializeBinaryBulkStatePtr & state) const override;
+
+    void deserializeBinaryBulkWithMultipleStreams(
+        ColumnPtr & column,
+        size_t limit,
+        DeserializeBinaryBulkSettings & settings,
+        DeserializeBinaryBulkStatePtr & state,
+        SubstreamsCache * cache) const override;
+
+private:
+    void addToPath(SubstreamPath & path) const;
+};
+
+}
diff --git a/src/DataTypes/Serializations/SerializationUUID.cpp b/src/DataTypes/Serializations/SerializationUUID.cpp
new file mode 100644
index 00000000000..1a0640a5e69
--- /dev/null
+++ b/src/DataTypes/Serializations/SerializationUUID.cpp
@@ -0,0 +1,80 @@
+#include <DataTypes/Serializations/SerializationUUID.h>
+#include <Columns/ColumnsNumber.h>
+#include <Formats/ProtobufReader.h>
+#include <Formats/ProtobufWriter.h>
+#include <IO/WriteHelpers.h>
+#include <IO/ReadHelpers.h>
+#include <Common/assert_cast.h>
+
+namespace DB
+{
+
+void SerializationUUID::serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const
+{
+    writeText(UUID(assert_cast<const ColumnUInt128 &>(column).getData()[row_num]), ostr);
+}
+
+void SerializationUUID::deserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
+{
+    UUID x;
+    readText(x, istr);
+    assert_cast<ColumnUInt128 &>(column).getData().push_back(x);
+}
+
+void SerializationUUID::deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    deserializeText(column, istr, settings);
+}
+
+void SerializationUUID::serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    serializeText(column, row_num, ostr, settings);
+}
+
+void SerializationUUID::serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    writeChar('\'', ostr);
+    serializeText(column, row_num, ostr, settings);
+    writeChar('\'', ostr);
+}
+
+void SerializationUUID::deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
+{
+    UUID x;
+    assertChar('\'', istr);
+    readText(x, istr);
+    assertChar('\'', istr);
+    assert_cast<ColumnUInt128 &>(column).getData().push_back(x);    /// It's important to do this at the end - for exception safety.
+}
+
+void SerializationUUID::serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    writeChar('"', ostr);
+    serializeText(column, row_num, ostr, settings);
+    writeChar('"', ostr);
+}
+
+void SerializationUUID::deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
+{
+    UUID x;
+    assertChar('"', istr);
+    readText(x, istr);
+    assertChar('"', istr);
+    assert_cast<ColumnUInt128 &>(column).getData().push_back(x);
+}
+
+void SerializationUUID::serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    writeChar('"', ostr);
+    serializeText(column, row_num, ostr, settings);
+    writeChar('"', ostr);
+}
+
+void SerializationUUID::deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
+{
+    UUID value;
+    readCSV(value, istr);
+    assert_cast<ColumnUInt128 &>(column).getData().push_back(value);
+}
+
+}
diff --git a/src/DataTypes/Serializations/SerializationUUID.h b/src/DataTypes/Serializations/SerializationUUID.h
new file mode 100644
index 00000000000..93bf166bbd9
--- /dev/null
+++ b/src/DataTypes/Serializations/SerializationUUID.h
@@ -0,0 +1,23 @@
+#pragma once
+
+#include <DataTypes/Serializations/SerializationNumber.h>
+
+namespace DB
+{
+
+class SerializationUUID : public SerializationNumber<UInt128>
+{
+public:
+    void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void deserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    void serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    void serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    void serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    void serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
+};
+
+}
diff --git a/src/DataTypes/Serializations/SerializationWrapper.cpp b/src/DataTypes/Serializations/SerializationWrapper.cpp
new file mode 100644
index 00000000000..f75c9a1dd8b
--- /dev/null
+++ b/src/DataTypes/Serializations/SerializationWrapper.cpp
@@ -0,0 +1,140 @@
+#include <DataTypes/Serializations/SerializationWrapper.h>
+#include <Columns/IColumn.h>
+
+namespace DB
+{
+
+void SerializationWrapper::enumerateStreams(const StreamCallback & callback, SubstreamPath & path) const
+{
+    nested_serialization->enumerateStreams(callback, path);
+}
+
+void SerializationWrapper::serializeBinaryBulkStatePrefix(
+    SerializeBinaryBulkSettings & settings,
+    SerializeBinaryBulkStatePtr & state) const
+{
+    nested_serialization->serializeBinaryBulkStatePrefix(settings, state);
+}
+
+void SerializationWrapper::serializeBinaryBulkStateSuffix(
+    SerializeBinaryBulkSettings & settings,
+    SerializeBinaryBulkStatePtr & state) const
+{
+    nested_serialization->serializeBinaryBulkStateSuffix(settings, state);
+}
+
+void SerializationWrapper::deserializeBinaryBulkStatePrefix(
+    DeserializeBinaryBulkSettings & settings,
+    DeserializeBinaryBulkStatePtr & state) const
+{
+    nested_serialization->deserializeBinaryBulkStatePrefix(settings, state);
+}
+
+void SerializationWrapper::serializeBinaryBulkWithMultipleStreams(
+    const IColumn & column,
+    size_t offset,
+    size_t limit,
+    SerializeBinaryBulkSettings & settings,
+    SerializeBinaryBulkStatePtr & state) const
+{
+
+    nested_serialization->serializeBinaryBulkWithMultipleStreams(column, offset, limit, settings, state);
+}
+
+void SerializationWrapper::deserializeBinaryBulkWithMultipleStreams(
+    ColumnPtr & column,
+    size_t limit,
+    DeserializeBinaryBulkSettings & settings,
+    DeserializeBinaryBulkStatePtr & state,
+    SubstreamsCache * cache) const
+{
+
+    nested_serialization->deserializeBinaryBulkWithMultipleStreams(column, limit, settings, state, cache);
+}
+
+void SerializationWrapper::serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, size_t offset, size_t limit) const
+{
+    nested_serialization->serializeBinaryBulk(column, ostr, offset, limit);
+}
+
+void SerializationWrapper::deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, size_t limit, double avg_value_size_hint) const
+{
+    nested_serialization->deserializeBinaryBulk(column, istr, limit, avg_value_size_hint);
+}
+
+void SerializationWrapper::serializeBinary(const Field & field, WriteBuffer & ostr) const
+{
+    nested_serialization->serializeBinary(field, ostr);
+}
+
+void SerializationWrapper::deserializeBinary(Field & field, ReadBuffer & istr) const
+{
+    nested_serialization->deserializeBinary(field, istr);
+}
+
+void SerializationWrapper::serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr) const
+{
+    nested_serialization->serializeBinary(column, row_num, ostr);
+}
+
+void SerializationWrapper::deserializeBinary(IColumn & column, ReadBuffer & istr) const
+{
+    nested_serialization->deserializeBinary(column, istr);
+}
+
+void SerializationWrapper::serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    nested_serialization->serializeTextEscaped(column, row_num, ostr, settings);
+}
+
+void SerializationWrapper::deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    nested_serialization->deserializeTextEscaped(column, istr, settings);
+}
+
+void SerializationWrapper::serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    nested_serialization->serializeTextQuoted(column, row_num, ostr, settings);
+}
+
+void SerializationWrapper::deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    nested_serialization->deserializeTextQuoted(column, istr, settings);
+}
+
+void SerializationWrapper::serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    nested_serialization->serializeTextCSV(column, row_num, ostr, settings);
+}
+
+void SerializationWrapper::deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    nested_serialization->deserializeTextCSV(column, istr, settings);
+}
+
+void SerializationWrapper::serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    nested_serialization->serializeText(column, row_num, ostr, settings);
+}
+
+void SerializationWrapper::deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    nested_serialization->deserializeWholeText(column, istr, settings);
+}
+
+void SerializationWrapper::serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    nested_serialization->serializeTextJSON(column, row_num, ostr, settings);
+}
+
+void SerializationWrapper::deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    nested_serialization->deserializeTextJSON(column, istr, settings);
+}
+
+void SerializationWrapper::serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    nested_serialization->serializeTextXML(column, row_num, ostr, settings);
+}
+
+}
diff --git a/src/DataTypes/Serializations/SerializationWrapper.h b/src/DataTypes/Serializations/SerializationWrapper.h
new file mode 100644
index 00000000000..399d3b198b3
--- /dev/null
+++ b/src/DataTypes/Serializations/SerializationWrapper.h
@@ -0,0 +1,74 @@
+#pragma once
+
+#include <DataTypes/Serializations/ISerialization.h>
+#include <Common/Exception.h>
+
+namespace DB
+{
+
+/// Wrapper for serialization, which calls methods, which are not overridden, from nested serialization.
+/// You can inherit this class, when you need to override bunch of methods, to avoid boilerplate code.
+class SerializationWrapper : public ISerialization
+{
+protected:
+    SerializationPtr nested_serialization;
+
+public:
+    SerializationWrapper(const SerializationPtr & nested_serialization_) : nested_serialization(nested_serialization_) {}
+
+    void enumerateStreams(const StreamCallback & callback, SubstreamPath & path) const override;
+
+    void serializeBinaryBulkStatePrefix(
+        SerializeBinaryBulkSettings & settings,
+        SerializeBinaryBulkStatePtr & state) const override;
+
+    void serializeBinaryBulkStateSuffix(
+        SerializeBinaryBulkSettings & settings,
+        SerializeBinaryBulkStatePtr & state) const override;
+
+    void deserializeBinaryBulkStatePrefix(
+        DeserializeBinaryBulkSettings & settings,
+        DeserializeBinaryBulkStatePtr & state) const override;
+
+    void serializeBinaryBulkWithMultipleStreams(
+        const IColumn & column,
+        size_t offset,
+        size_t limit,
+        SerializeBinaryBulkSettings & settings,
+        SerializeBinaryBulkStatePtr & state) const override;
+
+    void deserializeBinaryBulkWithMultipleStreams(
+        ColumnPtr & column,
+        size_t limit,
+        DeserializeBinaryBulkSettings & settings,
+        DeserializeBinaryBulkStatePtr & state,
+        SubstreamsCache * cache) const override;
+
+    void serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, size_t offset, size_t limit) const override;
+    void deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, size_t limit, double avg_value_size_hint) const override;
+
+    void serializeBinary(const Field & field, WriteBuffer & ostr) const override;
+    void deserializeBinary(Field & field, ReadBuffer & istr) const override;
+
+    void serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr) const override;
+    void deserializeBinary(IColumn & column, ReadBuffer & istr) const override;
+
+    void serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+
+    void serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+
+    void serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+
+    void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+
+    void serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+
+    void serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override;
+};
+
+}
diff --git a/src/DataTypes/DataTypeWithSimpleSerialization.h b/src/DataTypes/Serializations/SimpleTextSerialization.h
similarity index 87%
rename from src/DataTypes/DataTypeWithSimpleSerialization.h
rename to src/DataTypes/Serializations/SimpleTextSerialization.h
index 6f6120deb4f..04c5b190203 100644
--- a/src/DataTypes/DataTypeWithSimpleSerialization.h
+++ b/src/DataTypes/Serializations/SimpleTextSerialization.h
@@ -1,16 +1,15 @@
 #pragma once
-#include <DataTypes/IDataType.h>
+#include <DataTypes/Serializations/ISerialization.h>
 
 namespace DB
 {
 
-/// Helper class to define same IDataType text (de)serialization for all the variants (escaped, quoted, JSON, CSV).
+/// Helper class to define same ISerialization text (de)serialization for all the variants (escaped, quoted, JSON, CSV).
 /// You need to define serializeText() and deserializeText() in derived class.
-class DataTypeWithSimpleSerialization : public IDataType
+class SimpleTextSerialization : public ISerialization
 {
 protected:
-    DataTypeWithSimpleSerialization()
-    {}
+    SimpleTextSerialization() = default;
 
     void serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override
     {
diff --git a/src/DataTypes/getLeastSupertype.cpp b/src/DataTypes/getLeastSupertype.cpp
index da0e2ed8ce4..6710313349b 100644
--- a/src/DataTypes/getLeastSupertype.cpp
+++ b/src/DataTypes/getLeastSupertype.cpp
@@ -8,6 +8,7 @@
 
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeTuple.h>
+#include <DataTypes/DataTypeMap.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypeLowCardinality.h>
 #include <DataTypes/DataTypeNothing.h>
@@ -162,6 +163,36 @@ DataTypePtr getLeastSupertype(const DataTypes & types)
         }
     }
 
+    /// For maps
+    {
+        bool have_maps = false;
+        bool all_maps = true;
+        DataTypes key_types;
+        DataTypes value_types;
+        key_types.reserve(types.size());
+        value_types.reserve(types.size());
+
+        for (const auto & type : types)
+        {
+            if (const DataTypeMap * type_map = typeid_cast<const DataTypeMap *>(type.get()))
+            {
+                have_maps = true;
+                key_types.emplace_back(type_map->getKeyType());
+                value_types.emplace_back(type_map->getValueType());
+            }
+            else
+                all_maps = false;
+        }
+
+        if (have_maps)
+        {
+            if (!all_maps)
+                throw Exception(getExceptionMessagePrefix(types) + " because some of them are Maps and some of them are not", ErrorCodes::NO_COMMON_TYPE);
+
+            return std::make_shared<DataTypeMap>(getLeastSupertype(key_types), getLeastSupertype(value_types));
+        }
+    }
+
     /// For LowCardinality. This is above Nullable, because LowCardinality can contain Nullable but cannot be inside Nullable.
     {
         bool have_low_cardinality = false;
diff --git a/src/DataTypes/tests/gtest_DataType_deserializeAsText.cpp b/src/DataTypes/tests/gtest_DataType_deserializeAsText.cpp
index 48e2f0d80a0..9d8c32c92b6 100644
--- a/src/DataTypes/tests/gtest_DataType_deserializeAsText.cpp
+++ b/src/DataTypes/tests/gtest_DataType_deserializeAsText.cpp
@@ -67,7 +67,7 @@ TEST_P(ParseDataTypeTest, parseStringValue)
     for (const auto & value : p.values)
     {
         ReadBuffer buffer(const_cast<char *>(value.data()), value.size(), 0);
-        data_type->deserializeAsWholeText(*col, buffer, FormatSettings{});
+        data_type->getDefaultSerialization()->deserializeWholeText(*col, buffer, FormatSettings{});
     }
 
     ASSERT_EQ(p.expected_values.size(), col->size()) << "Actual items: " << *col;
diff --git a/src/DataTypes/ya.make b/src/DataTypes/ya.make
index 356424af8dd..e7294c298e5 100644
--- a/src/DataTypes/ya.make
+++ b/src/DataTypes/ya.make
@@ -15,7 +15,6 @@ SRCS(
     DataTypeCustomGeo.cpp
     DataTypeCustomIPv4AndIPv6.cpp
     DataTypeCustomSimpleAggregateFunction.cpp
-    DataTypeCustomSimpleTextSerialization.cpp
     DataTypeDate.cpp
     DataTypeDateTime.cpp
     DataTypeDateTime64.cpp
@@ -32,15 +31,37 @@ SRCS(
     DataTypeNothing.cpp
     DataTypeNullable.cpp
     DataTypeNumberBase.cpp
-    DataTypeOneElementTuple.cpp
     DataTypeString.cpp
     DataTypeTuple.cpp
     DataTypeUUID.cpp
     DataTypesDecimal.cpp
     DataTypesNumber.cpp
+    EnumValues.cpp
     FieldToDataType.cpp
     IDataType.cpp
     NestedUtils.cpp
+    Serializations/ISerialization.cpp
+    Serializations/SerializationAggregateFunction.cpp
+    Serializations/SerializationArray.cpp
+    Serializations/SerializationCustomSimpleText.cpp
+    Serializations/SerializationDate.cpp
+    Serializations/SerializationDateTime.cpp
+    Serializations/SerializationDateTime64.cpp
+    Serializations/SerializationDecimal.cpp
+    Serializations/SerializationDecimalBase.cpp
+    Serializations/SerializationEnum.cpp
+    Serializations/SerializationFixedString.cpp
+    Serializations/SerializationIP.cpp
+    Serializations/SerializationLowCardinality.cpp
+    Serializations/SerializationMap.cpp
+    Serializations/SerializationNothing.cpp
+    Serializations/SerializationNullable.cpp
+    Serializations/SerializationNumber.cpp
+    Serializations/SerializationString.cpp
+    Serializations/SerializationTuple.cpp
+    Serializations/SerializationTupleElement.cpp
+    Serializations/SerializationUUID.cpp
+    Serializations/SerializationWrapper.cpp
     convertMySQLDataType.cpp
     getLeastSupertype.cpp
     getMostSubtype.cpp
diff --git a/src/Databases/DatabaseAtomic.cpp b/src/Databases/DatabaseAtomic.cpp
index 71e0effb2d2..6d564bc29a3 100644
--- a/src/Databases/DatabaseAtomic.cpp
+++ b/src/Databases/DatabaseAtomic.cpp
@@ -35,10 +35,10 @@ public:
     UUID uuid() const override { return table()->getStorageID().uuid; }
 };
 
-DatabaseAtomic::DatabaseAtomic(String name_, String metadata_path_, UUID uuid, const String & logger_name, const Context & context_)
+DatabaseAtomic::DatabaseAtomic(String name_, String metadata_path_, UUID uuid, const String & logger_name, ContextPtr context_)
     : DatabaseOrdinary(name_, std::move(metadata_path_), "store/", logger_name, context_)
-    , path_to_table_symlinks(global_context.getPath() + "data/" + escapeForFileName(name_) + "/")
-    , path_to_metadata_symlink(global_context.getPath() + "metadata/" + escapeForFileName(name_))
+    , path_to_table_symlinks(getContext()->getPath() + "data/" + escapeForFileName(name_) + "/")
+    , path_to_metadata_symlink(getContext()->getPath() + "metadata/" + escapeForFileName(name_))
     , db_uuid(uuid)
 {
     assert(db_uuid != UUIDHelpers::Nil);
@@ -46,7 +46,7 @@ DatabaseAtomic::DatabaseAtomic(String name_, String metadata_path_, UUID uuid, c
     tryCreateMetadataSymlink();
 }
 
-DatabaseAtomic::DatabaseAtomic(String name_, String metadata_path_, UUID uuid, const Context & context_)
+DatabaseAtomic::DatabaseAtomic(String name_, String metadata_path_, UUID uuid, ContextPtr context_)
     : DatabaseAtomic(name_, std::move(metadata_path_), uuid, "DatabaseAtomic (" + name_ + ")", context_)
 {
 }
@@ -68,7 +68,7 @@ String DatabaseAtomic::getTableDataPath(const ASTCreateQuery & query) const
     return tmp;
 }
 
-void DatabaseAtomic::drop(const Context &)
+void DatabaseAtomic::drop(ContextPtr)
 {
     assert(tables.empty());
     try
@@ -106,8 +106,15 @@ StoragePtr DatabaseAtomic::detachTable(const String & name)
     return table;
 }
 
-void DatabaseAtomic::dropTable(const Context & context, const String & table_name, bool no_delay)
+void DatabaseAtomic::dropTable(ContextPtr local_context, const String & table_name, bool no_delay)
 {
+    if (auto * mv = dynamic_cast<StorageMaterializedView *>(tryGetTable(table_name, local_context).get()))
+    {
+        /// Remove the inner table (if any) to avoid deadlock
+        /// (due to attempt to execute DROP from the worker thread)
+        mv->dropInnerTable(no_delay, local_context);
+    }
+
     String table_metadata_path = getObjectMetadataPath(table_name);
     String table_metadata_path_drop;
     StoragePtr table;
@@ -115,8 +122,8 @@ void DatabaseAtomic::dropTable(const Context & context, const String & table_nam
         std::unique_lock lock(mutex);
         table = getTableUnlocked(table_name, lock);
         table_metadata_path_drop = DatabaseCatalog::instance().getPathForDroppedMetadata(table->getStorageID());
-        auto txn = context.getZooKeeperMetadataTransaction();
-        if (txn && !context.isInternalSubquery())
+        auto txn = local_context->getZooKeeperMetadataTransaction();
+        if (txn && !local_context->isInternalSubquery())
             txn->commit();      /// Commit point (a sort of) for Replicated database
 
         /// NOTE: replica will be lost if server crashes before the following rename
@@ -131,16 +138,13 @@ void DatabaseAtomic::dropTable(const Context & context, const String & table_nam
     }
     if (table->storesDataOnDisk())
         tryRemoveSymlink(table_name);
-    /// Remove the inner table (if any) to avoid deadlock
-    /// (due to attempt to execute DROP from the worker thread)
-    if (auto * mv = dynamic_cast<StorageMaterializedView *>(table.get()))
-        mv->dropInnerTable(no_delay, context);
+
     /// Notify DatabaseCatalog that table was dropped. It will remove table data in background.
     /// Cleanup is performed outside of database to allow easily DROP DATABASE without waiting for cleanup to complete.
     DatabaseCatalog::instance().enqueueDroppedTableCleanup(table->getStorageID(), table, table_metadata_path_drop, no_delay);
 }
 
-void DatabaseAtomic::renameTable(const Context & context, const String & table_name, IDatabase & to_database,
+void DatabaseAtomic::renameTable(ContextPtr local_context, const String & table_name, IDatabase & to_database,
                                  const String & to_table_name, bool exchange, bool dictionary)
 {
     if (typeid(*this) != typeid(to_database))
@@ -148,7 +152,7 @@ void DatabaseAtomic::renameTable(const Context & context, const String & table_n
         if (!typeid_cast<DatabaseOrdinary *>(&to_database))
             throw Exception("Moving tables between databases of different engines is not supported", ErrorCodes::NOT_IMPLEMENTED);
         /// Allow moving tables between Atomic and Ordinary (with table lock)
-        DatabaseOnDisk::renameTable(context, table_name, to_database, to_table_name, exchange, dictionary);
+        DatabaseOnDisk::renameTable(local_context, table_name, to_database, to_table_name, exchange, dictionary);
         return;
     }
 
@@ -244,8 +248,8 @@ void DatabaseAtomic::renameTable(const Context & context, const String & table_n
     }
 
     /// Table renaming actually begins here
-    auto txn = context.getZooKeeperMetadataTransaction();
-    if (txn && !context.isInternalSubquery())
+    auto txn = local_context->getZooKeeperMetadataTransaction();
+    if (txn && !local_context->isInternalSubquery())
         txn->commit();     /// Commit point (a sort of) for Replicated database
 
     /// NOTE: replica will be lost if server crashes before the following rename
@@ -287,7 +291,7 @@ void DatabaseAtomic::renameTable(const Context & context, const String & table_n
 
 void DatabaseAtomic::commitCreateTable(const ASTCreateQuery & query, const StoragePtr & table,
                                        const String & table_metadata_tmp_path, const String & table_metadata_path,
-                                       const Context & query_context)
+                                       ContextPtr query_context)
 {
     DetachedTables not_in_use;
     auto table_data_path = getTableDataPath(query);
@@ -305,8 +309,8 @@ void DatabaseAtomic::commitCreateTable(const ASTCreateQuery & query, const Stora
         DatabaseCatalog::instance().addUUIDMapping(query.uuid);
         locked_uuid = true;
 
-        auto txn = query_context.getZooKeeperMetadataTransaction();
-        if (txn && !query_context.isInternalSubquery())
+        auto txn = query_context->getZooKeeperMetadataTransaction();
+        if (txn && !query_context->isInternalSubquery())
             txn->commit();     /// Commit point (a sort of) for Replicated database
 
         /// NOTE: replica will be lost if server crashes before the following renameNoReplace(...)
@@ -329,7 +333,7 @@ void DatabaseAtomic::commitCreateTable(const ASTCreateQuery & query, const Stora
 }
 
 void DatabaseAtomic::commitAlterTable(const StorageID & table_id, const String & table_metadata_tmp_path, const String & table_metadata_path,
-                                      const String & /*statement*/, const Context & query_context)
+                                      const String & /*statement*/, ContextPtr query_context)
 {
     bool check_file_exists = true;
     SCOPE_EXIT({ std::error_code code; if (check_file_exists) std::filesystem::remove(table_metadata_tmp_path, code); });
@@ -340,8 +344,8 @@ void DatabaseAtomic::commitAlterTable(const StorageID & table_id, const String &
     if (table_id.uuid != actual_table_id.uuid)
         throw Exception("Cannot alter table because it was renamed", ErrorCodes::CANNOT_ASSIGN_ALTER);
 
-    auto txn = query_context.getZooKeeperMetadataTransaction();
-    if (txn && !query_context.isInternalSubquery())
+    auto txn = query_context->getZooKeeperMetadataTransaction();
+    if (txn && !query_context->isInternalSubquery())
         txn->commit();      /// Commit point (a sort of) for Replicated database
 
     /// NOTE: replica will be lost if server crashes before the following rename
@@ -361,8 +365,8 @@ void DatabaseAtomic::assertDetachedTableNotInUse(const UUID & uuid)
     /// 4. INSERT INTO table ...; (both Storage instances writes data without any synchronization)
     /// To avoid it, we remember UUIDs of detached tables and does not allow ATTACH table with such UUID until detached instance still in use.
     if (detached_tables.count(uuid))
-        throw Exception("Cannot attach table with UUID " + toString(uuid) +
-              ", because it was detached but still used by some query. Retry later.", ErrorCodes::TABLE_ALREADY_EXISTS);
+        throw Exception(ErrorCodes::TABLE_ALREADY_EXISTS, "Cannot attach table with UUID {}, "
+                        "because it was detached but still used by some query. Retry later.", toString(uuid));
 }
 
 void DatabaseAtomic::setDetachedTableNotInUseForce(const UUID & uuid)
@@ -405,26 +409,27 @@ void DatabaseAtomic::assertCanBeDetached(bool cleanup)
                         "because some tables are still in use. Retry later.", ErrorCodes::DATABASE_NOT_EMPTY);
 }
 
-DatabaseTablesIteratorPtr DatabaseAtomic::getTablesIterator(const Context & context, const IDatabase::FilterByNameFunction & filter_by_table_name)
+DatabaseTablesIteratorPtr
+DatabaseAtomic::getTablesIterator(ContextPtr local_context, const IDatabase::FilterByNameFunction & filter_by_table_name)
 {
-    auto base_iter = DatabaseWithOwnTablesBase::getTablesIterator(context, filter_by_table_name);
+    auto base_iter = DatabaseWithOwnTablesBase::getTablesIterator(local_context, filter_by_table_name);
     return std::make_unique<AtomicDatabaseTablesSnapshotIterator>(std::move(typeid_cast<DatabaseTablesSnapshotIterator &>(*base_iter)));
 }
 
 UUID DatabaseAtomic::tryGetTableUUID(const String & table_name) const
 {
-    if (auto table = tryGetTable(table_name, global_context))
+    if (auto table = tryGetTable(table_name, getContext()))
         return table->getStorageID().uuid;
     return UUIDHelpers::Nil;
 }
 
-void DatabaseAtomic::loadStoredObjects(Context & context, bool has_force_restore_data_flag, bool force_attach)
+void DatabaseAtomic::loadStoredObjects(ContextPtr local_context, bool has_force_restore_data_flag, bool force_attach)
 {
     /// Recreate symlinks to table data dirs in case of force restore, because some of them may be broken
     if (has_force_restore_data_flag)
         Poco::File(path_to_table_symlinks).remove(true);
 
-    DatabaseOrdinary::loadStoredObjects(context, has_force_restore_data_flag, force_attach);
+    DatabaseOrdinary::loadStoredObjects(local_context, has_force_restore_data_flag, force_attach);
 
     if (has_force_restore_data_flag)
     {
@@ -445,7 +450,7 @@ void DatabaseAtomic::tryCreateSymlink(const String & table_name, const String &
     try
     {
         String link = path_to_table_symlinks + escapeForFileName(table_name);
-        Poco::File data = Poco::Path(global_context.getPath()).makeAbsolute().toString() + actual_data_path;
+        Poco::File data = Poco::Path(getContext()->getPath()).makeAbsolute().toString() + actual_data_path;
         if (!if_data_path_exist || data.exists())
             data.linkTo(link, Poco::File::LINK_SYMBOLIC);
     }
@@ -505,8 +510,8 @@ void DatabaseAtomic::renameDatabase(const String & new_name)
     }
 
     auto new_name_escaped = escapeForFileName(new_name);
-    auto old_database_metadata_path = global_context.getPath() + "metadata/" + escapeForFileName(getDatabaseName()) + ".sql";
-    auto new_database_metadata_path = global_context.getPath() + "metadata/" + new_name_escaped + ".sql";
+    auto old_database_metadata_path = getContext()->getPath() + "metadata/" + escapeForFileName(getDatabaseName()) + ".sql";
+    auto new_database_metadata_path = getContext()->getPath() + "metadata/" + new_name_escaped + ".sql";
     renameNoReplace(old_database_metadata_path, new_database_metadata_path);
 
     String old_path_to_table_symlinks;
@@ -531,9 +536,9 @@ void DatabaseAtomic::renameDatabase(const String & new_name)
             renameDictionaryInMemoryUnlocked(old_name, name);
         }
 
-        path_to_metadata_symlink = global_context.getPath() + "metadata/" + new_name_escaped;
+        path_to_metadata_symlink = getContext()->getPath() + "metadata/" + new_name_escaped;
         old_path_to_table_symlinks = path_to_table_symlinks;
-        path_to_table_symlinks = global_context.getPath() + "data/" + new_name_escaped + "/";
+        path_to_table_symlinks = getContext()->getPath() + "data/" + new_name_escaped + "/";
     }
 
     Poco::File(old_path_to_table_symlinks).renameTo(path_to_table_symlinks);
@@ -563,17 +568,11 @@ void DatabaseAtomic::renameDictionaryInMemoryUnlocked(const StorageID & old_name
     auto result = external_loader.getLoadResult(toString(old_name.uuid));
     if (!result.object)
         return;
-    const auto & dict = dynamic_cast<const IDictionaryBase &>(*result.object);
+    const auto & dict = dynamic_cast<const IDictionary &>(*result.object);
     dict.updateDictionaryName(new_name);
 }
 void DatabaseAtomic::waitDetachedTableNotInUse(const UUID & uuid)
 {
-    {
-        std::lock_guard lock{mutex};
-        if (detached_tables.count(uuid) == 0)
-            return;
-    }
-
     /// Table is in use while its shared_ptr counter is greater than 1.
     /// We cannot trigger condvar on shared_ptr destruction, so it's busy wait.
     while (true)
@@ -589,5 +588,13 @@ void DatabaseAtomic::waitDetachedTableNotInUse(const UUID & uuid)
     }
 }
 
+void DatabaseAtomic::checkDetachedTableNotInUse(const UUID & uuid)
+{
+    DetachedTables not_in_use;
+    std::lock_guard lock{mutex};
+    not_in_use = cleanupDetachedTables();
+    assertDetachedTableNotInUse(uuid);
+}
+
 }
 
diff --git a/src/Databases/DatabaseAtomic.h b/src/Databases/DatabaseAtomic.h
index 09cdf269b35..695d22360ca 100644
--- a/src/Databases/DatabaseAtomic.h
+++ b/src/Databases/DatabaseAtomic.h
@@ -19,8 +19,8 @@ namespace DB
 class DatabaseAtomic : public DatabaseOrdinary
 {
 public:
-    DatabaseAtomic(String name_, String metadata_path_, UUID uuid, const String & logger_name, const Context & context_);
-    DatabaseAtomic(String name_, String metadata_path_, UUID uuid, const Context & context_);
+    DatabaseAtomic(String name_, String metadata_path_, UUID uuid, const String & logger_name, ContextPtr context_);
+    DatabaseAtomic(String name_, String metadata_path_, UUID uuid, ContextPtr context_);
 
     String getEngineName() const override { return "Atomic"; }
     UUID getUUID() const override { return db_uuid; }
@@ -28,14 +28,14 @@ public:
     void renameDatabase(const String & new_name) override;
 
     void renameTable(
-            const Context & context,
+            ContextPtr context,
             const String & table_name,
             IDatabase & to_database,
             const String & to_table_name,
             bool exchange,
             bool dictionary) override;
 
-    void dropTable(const Context & context, const String & table_name, bool no_delay) override;
+    void dropTable(ContextPtr context, const String & table_name, bool no_delay) override;
 
     void attachTable(const String & name, const StoragePtr & table, const String & relative_table_path) override;
     StoragePtr detachTable(const String & name) override;
@@ -43,11 +43,11 @@ public:
     String getTableDataPath(const String & table_name) const override;
     String getTableDataPath(const ASTCreateQuery & query) const override;
 
-    void drop(const Context & /*context*/) override;
+    void drop(ContextPtr /*context*/) override;
 
-    DatabaseTablesIteratorPtr getTablesIterator(const Context & context, const FilterByNameFunction & filter_by_table_name) override;
+    DatabaseTablesIteratorPtr getTablesIterator(ContextPtr context, const FilterByNameFunction & filter_by_table_name) override;
 
-    void loadStoredObjects(Context & context, bool has_force_restore_data_flag, bool force_attach) override;
+    void loadStoredObjects(ContextPtr context, bool has_force_restore_data_flag, bool force_attach) override;
 
     /// Atomic database cannot be detached if there is detached table which still in use
     void assertCanBeDetached(bool cleanup) override;
@@ -58,15 +58,16 @@ public:
     void tryRemoveSymlink(const String & table_name);
 
     void waitDetachedTableNotInUse(const UUID & uuid) override;
+    void checkDetachedTableNotInUse(const UUID & uuid) override;
     void setDetachedTableNotInUseForce(const UUID & uuid);
 
 protected:
-    void commitAlterTable(const StorageID & table_id, const String & table_metadata_tmp_path, const String & table_metadata_path, const String & statement, const Context & query_context) override;
+    void commitAlterTable(const StorageID & table_id, const String & table_metadata_tmp_path, const String & table_metadata_path, const String & statement, ContextPtr query_context) override;
     void commitCreateTable(const ASTCreateQuery & query, const StoragePtr & table,
-                           const String & table_metadata_tmp_path, const String & table_metadata_path, const Context & query_context) override;
+                           const String & table_metadata_tmp_path, const String & table_metadata_path, ContextPtr query_context) override;
 
     void assertDetachedTableNotInUse(const UUID & uuid);
-    typedef std::unordered_map<UUID, StoragePtr> DetachedTables;
+    using DetachedTables = std::unordered_map<UUID, StoragePtr>;
     [[nodiscard]] DetachedTables cleanupDetachedTables();
 
     void tryCreateMetadataSymlink();
@@ -74,7 +75,7 @@ protected:
     void renameDictionaryInMemoryUnlocked(const StorageID & old_name, const StorageID & new_name);
 
     //TODO store path in DatabaseWithOwnTables::tables
-    typedef std::unordered_map<String, String> NameToPathMap;
+    using NameToPathMap = std::unordered_map<String, String>;
     NameToPathMap table_name_to_path;
 
     DetachedTables detached_tables;
diff --git a/src/Databases/DatabaseDictionary.cpp b/src/Databases/DatabaseDictionary.cpp
index ff5510f0bf9..c00201145eb 100644
--- a/src/Databases/DatabaseDictionary.cpp
+++ b/src/Databases/DatabaseDictionary.cpp
@@ -44,17 +44,16 @@ namespace
     }
 }
 
-DatabaseDictionary::DatabaseDictionary(const String & name_, const Context & context_)
-    : IDatabase(name_)
+DatabaseDictionary::DatabaseDictionary(const String & name_, ContextPtr context_)
+    : IDatabase(name_), WithContext(context_->getGlobalContext())
     , log(&Poco::Logger::get("DatabaseDictionary(" + database_name + ")"))
-    , global_context(context_.getGlobalContext())
 {
 }
 
 Tables DatabaseDictionary::listTables(const FilterByNameFunction & filter_by_name)
 {
     Tables tables;
-    auto load_results = global_context.getExternalDictionariesLoader().getLoadResults(filter_by_name);
+    auto load_results = getContext()->getExternalDictionariesLoader().getLoadResults(filter_by_name);
     String db_name = getDatabaseName();
     for (auto & load_result : load_results)
     {
@@ -65,34 +64,34 @@ Tables DatabaseDictionary::listTables(const FilterByNameFunction & filter_by_nam
     return tables;
 }
 
-bool DatabaseDictionary::isTableExist(const String & table_name, const Context &) const
+bool DatabaseDictionary::isTableExist(const String & table_name, ContextPtr) const
 {
-    return global_context.getExternalDictionariesLoader().getCurrentStatus(table_name) != ExternalLoader::Status::NOT_EXIST;
+    return getContext()->getExternalDictionariesLoader().getCurrentStatus(table_name) != ExternalLoader::Status::NOT_EXIST;
 }
 
-StoragePtr DatabaseDictionary::tryGetTable(const String & table_name, const Context &) const
+StoragePtr DatabaseDictionary::tryGetTable(const String & table_name, ContextPtr) const
 {
-    auto load_result = global_context.getExternalDictionariesLoader().getLoadResult(table_name);
+    auto load_result = getContext()->getExternalDictionariesLoader().getLoadResult(table_name);
     return createStorageDictionary(getDatabaseName(), load_result);
 }
 
-DatabaseTablesIteratorPtr DatabaseDictionary::getTablesIterator(const Context &, const FilterByNameFunction & filter_by_table_name)
+DatabaseTablesIteratorPtr DatabaseDictionary::getTablesIterator(ContextPtr, const FilterByNameFunction & filter_by_table_name)
 {
     return std::make_unique<DatabaseTablesSnapshotIterator>(listTables(filter_by_table_name), getDatabaseName());
 }
 
 bool DatabaseDictionary::empty() const
 {
-    return !global_context.getExternalDictionariesLoader().hasObjects();
+    return !getContext()->getExternalDictionariesLoader().hasObjects();
 }
 
-ASTPtr DatabaseDictionary::getCreateTableQueryImpl(const String & table_name, const Context &, bool throw_on_error) const
+ASTPtr DatabaseDictionary::getCreateTableQueryImpl(const String & table_name, ContextPtr, bool throw_on_error) const
 {
     String query;
     {
         WriteBufferFromString buffer(query);
 
-        auto load_result = global_context.getExternalDictionariesLoader().getLoadResult(table_name);
+        auto load_result = getContext()->getExternalDictionariesLoader().getLoadResult(table_name);
         if (!load_result.config)
         {
             if (throw_on_error)
@@ -106,7 +105,7 @@ ASTPtr DatabaseDictionary::getCreateTableQueryImpl(const String & table_name, co
         buffer << ") Engine = Dictionary(" << backQuoteIfNeed(table_name) << ")";
     }
 
-    auto settings = global_context.getSettingsRef();
+    auto settings = getContext()->getSettingsRef();
     ParserCreateQuery parser;
     const char * pos = query.data();
     std::string error_message;
@@ -126,7 +125,7 @@ ASTPtr DatabaseDictionary::getCreateDatabaseQuery() const
         WriteBufferFromString buffer(query);
         buffer << "CREATE DATABASE " << backQuoteIfNeed(getDatabaseName()) << " ENGINE = Dictionary";
     }
-    auto settings = global_context.getSettingsRef();
+    auto settings = getContext()->getSettingsRef();
     ParserCreateQuery parser;
     return parseQuery(parser, query.data(), query.data() + query.size(), "", 0, settings.max_parser_depth);
 }
diff --git a/src/Databases/DatabaseDictionary.h b/src/Databases/DatabaseDictionary.h
index 2cfc6ef3285..06402a96381 100644
--- a/src/Databases/DatabaseDictionary.h
+++ b/src/Databases/DatabaseDictionary.h
@@ -1,11 +1,12 @@
 #pragma once
 
-#include <mutex>
-#include <unordered_set>
 #include <Databases/DatabasesCommon.h>
 #include <Databases/IDatabase.h>
 #include <Storages/IStorage_fwd.h>
 
+#include <mutex>
+#include <unordered_set>
+
 
 namespace Poco
 {
@@ -19,21 +20,21 @@ namespace DB
 /* Database to store StorageDictionary tables
  * automatically creates tables for all dictionaries
  */
-class DatabaseDictionary final : public IDatabase
+class DatabaseDictionary final : public IDatabase, WithContext
 {
 public:
-    DatabaseDictionary(const String & name_, const Context & context_);
+    DatabaseDictionary(const String & name_, ContextPtr context_);
 
     String getEngineName() const override
     {
         return "Dictionary";
     }
 
-    bool isTableExist(const String & table_name, const Context & context) const override;
+    bool isTableExist(const String & table_name, ContextPtr context) const override;
 
-    StoragePtr tryGetTable(const String & table_name, const Context & context) const override;
+    StoragePtr tryGetTable(const String & table_name, ContextPtr context) const override;
 
-    DatabaseTablesIteratorPtr getTablesIterator(const Context & context, const FilterByNameFunction & filter_by_table_name) override;
+    DatabaseTablesIteratorPtr getTablesIterator(ContextPtr context, const FilterByNameFunction & filter_by_table_name) override;
 
     bool empty() const override;
 
@@ -44,11 +45,10 @@ public:
     void shutdown() override;
 
 protected:
-    ASTPtr getCreateTableQueryImpl(const String & table_name, const Context & context, bool throw_on_error) const override;
+    ASTPtr getCreateTableQueryImpl(const String & table_name, ContextPtr context, bool throw_on_error) const override;
 
 private:
     Poco::Logger * log;
-    const Context & global_context;
 
     Tables listTables(const FilterByNameFunction & filter_by_name);
 };
diff --git a/src/Databases/DatabaseFactory.cpp b/src/Databases/DatabaseFactory.cpp
index cd0143556c9..9d09ac731d2 100644
--- a/src/Databases/DatabaseFactory.cpp
+++ b/src/Databases/DatabaseFactory.cpp
@@ -30,13 +30,14 @@
 #endif
 
 #if USE_MYSQL || USE_LIBPQXX
+#include <Common/parseRemoteDescription.h>
 #include <Interpreters/evaluateConstantExpression.h>
 #include <Common/parseAddress.h>
 #endif
 
 #if USE_LIBPQXX
 #include <Databases/PostgreSQL/DatabasePostgreSQL.h> // Y_IGNORE
-#include <Storages/PostgreSQL/PostgreSQLConnection.h>
+#include <Storages/PostgreSQL/PostgreSQLConnectionPool.h>
 #endif
 
 namespace DB
@@ -50,7 +51,7 @@ namespace ErrorCodes
     extern const int CANNOT_CREATE_DATABASE;
 }
 
-DatabasePtr DatabaseFactory::get(const ASTCreateQuery & create, const String & metadata_path, Context & context)
+DatabasePtr DatabaseFactory::get(const ASTCreateQuery & create, const String & metadata_path, ContextPtr context)
 {
     bool created = false;
 
@@ -65,8 +66,8 @@ DatabasePtr DatabaseFactory::get(const ASTCreateQuery & create, const String & m
 
         DatabasePtr impl = getImpl(create, metadata_path, context);
 
-        if (impl && context.hasQueryContext() && context.getSettingsRef().log_queries)
-            context.getQueryContext().addQueryFactoriesInfo(Context::QueryLogFactories::Database, impl->getEngineName());
+        if (impl && context->hasQueryContext() && context->getSettingsRef().log_queries)
+            context->getQueryContext()->addQueryFactoriesInfo(Context::QueryLogFactories::Database, impl->getEngineName());
 
         return impl;
 
@@ -91,7 +92,7 @@ static inline ValueType safeGetLiteralValue(const ASTPtr &ast, const String &eng
     return ast->as<ASTLiteral>()->value.safeGet<ValueType>();
 }
 
-DatabasePtr DatabaseFactory::getImpl(const ASTCreateQuery & create, const String & metadata_path, Context & context)
+DatabasePtr DatabaseFactory::getImpl(const ASTCreateQuery & create, const String & metadata_path, ContextPtr context)
 {
     auto * engine_define = create.storage;
     const String & database_name = create.database;
@@ -133,19 +134,20 @@ DatabasePtr DatabaseFactory::getImpl(const ASTCreateQuery & create, const String
         ASTs & arguments = engine->arguments->children;
         arguments[1] = evaluateConstantExpressionOrIdentifierAsLiteral(arguments[1], context);
 
-        const auto & host_name_and_port = safeGetLiteralValue<String>(arguments[0], engine_name);
+        const auto & host_port = safeGetLiteralValue<String>(arguments[0], engine_name);
         const auto & mysql_database_name = safeGetLiteralValue<String>(arguments[1], engine_name);
         const auto & mysql_user_name = safeGetLiteralValue<String>(arguments[2], engine_name);
         const auto & mysql_user_password = safeGetLiteralValue<String>(arguments[3], engine_name);
 
         try
         {
-            const auto & [remote_host_name, remote_port] = parseAddress(host_name_and_port, 3306);
-            auto mysql_pool = mysqlxx::Pool(mysql_database_name, remote_host_name, mysql_user_name, mysql_user_password, remote_port);
-
             if (engine_name == "MySQL")
             {
                 auto mysql_database_settings = std::make_unique<ConnectionMySQLSettings>();
+                /// Split into replicas if needed.
+                size_t max_addresses = context->getSettingsRef().glob_expansion_max_elements;
+                auto addresses = parseRemoteDescriptionForExternalDatabase(host_port, max_addresses, 3306);
+                auto mysql_pool = mysqlxx::PoolWithFailover(mysql_database_name, addresses, mysql_user_name, mysql_user_password);
 
                 mysql_database_settings->loadFromQueryContext(context);
                 mysql_database_settings->loadFromQuery(*engine_define); /// higher priority
@@ -154,7 +156,10 @@ DatabasePtr DatabaseFactory::getImpl(const ASTCreateQuery & create, const String
                     context, database_name, metadata_path, engine_define, mysql_database_name, std::move(mysql_database_settings), std::move(mysql_pool));
             }
 
+            const auto & [remote_host_name, remote_port] = parseAddress(host_port, 3306);
             MySQLClient client(remote_host_name, remote_port, mysql_user_name, mysql_user_password);
+            auto mysql_pool = mysqlxx::Pool(mysql_database_name, remote_host_name, mysql_user_name, mysql_user_password, remote_port);
+
 
             auto materialize_mode_settings = std::make_unique<MaterializeMySQLSettings>();
 
@@ -204,9 +209,9 @@ DatabasePtr DatabaseFactory::getImpl(const ASTCreateQuery & create, const String
         String shard_name = safeGetLiteralValue<String>(arguments[1], "Replicated");
         String replica_name  = safeGetLiteralValue<String>(arguments[2], "Replicated");
 
-        zookeeper_path = context.getMacros()->expand(zookeeper_path);
-        shard_name = context.getMacros()->expand(shard_name);
-        replica_name = context.getMacros()->expand(replica_name);
+        zookeeper_path = context->getMacros()->expand(zookeeper_path);
+        shard_name = context->getMacros()->expand(shard_name);
+        replica_name = context->getMacros()->expand(replica_name);
 
         DatabaseReplicatedSettings database_replicated_settings{};
         if (engine_define->settings)
@@ -243,14 +248,20 @@ DatabasePtr DatabaseFactory::getImpl(const ASTCreateQuery & create, const String
         if (engine->arguments->children.size() == 5)
             use_table_cache = safeGetLiteralValue<UInt64>(engine_args[4], engine_name);
 
-        auto parsed_host_port = parseAddress(host_port, 5432);
+        /// Split into replicas if needed.
+        size_t max_addresses = context->getSettingsRef().glob_expansion_max_elements;
+        auto addresses = parseRemoteDescriptionForExternalDatabase(host_port, max_addresses, 5432);
 
         /// no connection is made here
-        auto connection = std::make_shared<PostgreSQLConnection>(
-            postgres_database_name, parsed_host_port.first, parsed_host_port.second, username, password);
+        auto connection_pool = std::make_shared<postgres::PoolWithFailover>(
+            postgres_database_name,
+            addresses,
+            username, password,
+            context->getSettingsRef().postgresql_connection_pool_size,
+            context->getSettingsRef().postgresql_connection_pool_wait_timeout);
 
         return std::make_shared<DatabasePostgreSQL>(
-            context, metadata_path, engine_define, database_name, postgres_database_name, connection, use_table_cache);
+            context, metadata_path, engine_define, database_name, postgres_database_name, connection_pool, use_table_cache);
     }
 
 #endif
diff --git a/src/Databases/DatabaseFactory.h b/src/Databases/DatabaseFactory.h
index 88d33dc1cd5..8992ea27093 100644
--- a/src/Databases/DatabaseFactory.h
+++ b/src/Databases/DatabaseFactory.h
@@ -11,9 +11,9 @@ class ASTCreateQuery;
 class DatabaseFactory
 {
 public:
-    static DatabasePtr get(const ASTCreateQuery & create, const String & metadata_path, Context & context);
+    static DatabasePtr get(const ASTCreateQuery & create, const String & metadata_path, ContextPtr context);
 
-    static DatabasePtr getImpl(const ASTCreateQuery & create, const String & metadata_path, Context & context);
+    static DatabasePtr getImpl(const ASTCreateQuery & create, const String & metadata_path, ContextPtr context);
 };
 
 }
diff --git a/src/Databases/DatabaseLazy.cpp b/src/Databases/DatabaseLazy.cpp
index f297bf2c82f..d498cb96062 100644
--- a/src/Databases/DatabaseLazy.cpp
+++ b/src/Databases/DatabaseLazy.cpp
@@ -10,7 +10,7 @@
 #include <Storages/IStorage.h>
 
 #include <common/logger_useful.h>
-#include <ext/scope_guard.h>
+#include <ext/scope_guard_safe.h>
 #include <iomanip>
 #include <Poco/File.h>
 
@@ -27,7 +27,7 @@ namespace ErrorCodes
 }
 
 
-DatabaseLazy::DatabaseLazy(const String & name_, const String & metadata_path_, time_t expiration_time_, const Context & context_)
+DatabaseLazy::DatabaseLazy(const String & name_, const String & metadata_path_, time_t expiration_time_, ContextPtr context_)
     : DatabaseOnDisk(name_, metadata_path_, "data/" + escapeForFileName(name_) + "/", "DatabaseLazy (" + name_ + ")", context_)
     , expiration_time(expiration_time_)
 {
@@ -35,11 +35,11 @@ DatabaseLazy::DatabaseLazy(const String & name_, const String & metadata_path_,
 
 
 void DatabaseLazy::loadStoredObjects(
-    Context & context,
+    ContextPtr local_context,
     bool /* has_force_restore_data_flag */,
     bool /*force_attach*/)
 {
-    iterateMetadataFiles(context, [this](const String & file_name)
+    iterateMetadataFiles(local_context, [this](const String & file_name)
     {
         const std::string table_name = file_name.substr(0, file_name.size() - 4);
 
@@ -56,15 +56,15 @@ void DatabaseLazy::loadStoredObjects(
 
 
 void DatabaseLazy::createTable(
-    const Context & context,
+    ContextPtr local_context,
     const String & table_name,
     const StoragePtr & table,
     const ASTPtr & query)
 {
-    SCOPE_EXIT({ clearExpiredTables(); });
+    SCOPE_EXIT_MEMORY_SAFE({ clearExpiredTables(); });
     if (!endsWith(table->getName(), "Log"))
         throw Exception("Lazy engine can be used only with *Log tables.", ErrorCodes::UNSUPPORTED_METHOD);
-    DatabaseOnDisk::createTable(context, table_name, table, query);
+    DatabaseOnDisk::createTable(local_context, table_name, table, query);
 
     /// DatabaseOnDisk::createTable renames file, so we need to get new metadata_modification_time.
     std::lock_guard lock(mutex);
@@ -74,24 +74,24 @@ void DatabaseLazy::createTable(
 }
 
 void DatabaseLazy::dropTable(
-    const Context & context,
+    ContextPtr local_context,
     const String & table_name,
     bool no_delay)
 {
-    SCOPE_EXIT({ clearExpiredTables(); });
-    DatabaseOnDisk::dropTable(context, table_name, no_delay);
+    SCOPE_EXIT_MEMORY_SAFE({ clearExpiredTables(); });
+    DatabaseOnDisk::dropTable(local_context, table_name, no_delay);
 }
 
 void DatabaseLazy::renameTable(
-    const Context & context,
+    ContextPtr local_context,
     const String & table_name,
     IDatabase & to_database,
     const String & to_table_name,
     bool exchange,
     bool dictionary)
 {
-    SCOPE_EXIT({ clearExpiredTables(); });
-    DatabaseOnDisk::renameTable(context, table_name, to_database, to_table_name, exchange, dictionary);
+    SCOPE_EXIT_MEMORY_SAFE({ clearExpiredTables(); });
+    DatabaseOnDisk::renameTable(local_context, table_name, to_database, to_table_name, exchange, dictionary);
 }
 
 
@@ -105,7 +105,7 @@ time_t DatabaseLazy::getObjectMetadataModificationTime(const String & table_name
 }
 
 void DatabaseLazy::alterTable(
-    const Context & /* context */,
+    ContextPtr /* context */,
     const StorageID & /*table_id*/,
     const StorageInMemoryMetadata & /* metadata */)
 {
@@ -115,14 +115,14 @@ void DatabaseLazy::alterTable(
 
 bool DatabaseLazy::isTableExist(const String & table_name) const
 {
-    SCOPE_EXIT({ clearExpiredTables(); });
+    SCOPE_EXIT_MEMORY_SAFE({ clearExpiredTables(); });
     std::lock_guard lock(mutex);
     return tables_cache.find(table_name) != tables_cache.end();
 }
 
 StoragePtr DatabaseLazy::tryGetTable(const String & table_name) const
 {
-    SCOPE_EXIT({ clearExpiredTables(); });
+    SCOPE_EXIT_MEMORY_SAFE({ clearExpiredTables(); });
     {
         std::lock_guard lock(mutex);
         auto it = tables_cache.find(table_name);
@@ -142,7 +142,7 @@ StoragePtr DatabaseLazy::tryGetTable(const String & table_name) const
     return loadTable(table_name);
 }
 
-DatabaseTablesIteratorPtr DatabaseLazy::getTablesIterator(const Context &, const FilterByNameFunction & filter_by_table_name)
+DatabaseTablesIteratorPtr DatabaseLazy::getTablesIterator(ContextPtr, const FilterByNameFunction & filter_by_table_name)
 {
     std::lock_guard lock(mutex);
     Strings filtered_tables;
@@ -224,7 +224,7 @@ DatabaseLazy::~DatabaseLazy()
 
 StoragePtr DatabaseLazy::loadTable(const String & table_name) const
 {
-    SCOPE_EXIT({ clearExpiredTables(); });
+    SCOPE_EXIT_MEMORY_SAFE({ clearExpiredTables(); });
 
     LOG_DEBUG(log, "Load table {} to cache.", backQuote(table_name));
 
@@ -233,9 +233,9 @@ StoragePtr DatabaseLazy::loadTable(const String & table_name) const
     try
     {
         StoragePtr table;
-        Context context_copy(global_context); /// some tables can change context, but not LogTables
+        auto context_copy = Context::createCopy(context); /// some tables can change context, but not LogTables
 
-        auto ast = parseQueryFromMetadata(log, global_context, table_metadata_path, /*throw_on_error*/ true, /*remove_empty*/false);
+        auto ast = parseQueryFromMetadata(log, getContext(), table_metadata_path, /*throw_on_error*/ true, /*remove_empty*/false);
         if (ast)
         {
             const auto & ast_create = ast->as<const ASTCreateQuery &>();
diff --git a/src/Databases/DatabaseLazy.h b/src/Databases/DatabaseLazy.h
index 2d091297c91..99a71b342fa 100644
--- a/src/Databases/DatabaseLazy.h
+++ b/src/Databases/DatabaseLazy.h
@@ -18,7 +18,7 @@ class Context;
 class DatabaseLazy final : public DatabaseOnDisk
 {
 public:
-    DatabaseLazy(const String & name_, const String & metadata_path_, time_t expiration_time_, const Context & context_);
+    DatabaseLazy(const String & name_, const String & metadata_path_, time_t expiration_time_, ContextPtr context_);
 
     String getEngineName() const override { return "Lazy"; }
 
@@ -27,22 +27,22 @@ public:
     bool canContainDistributedTables() const override { return false; }
 
     void loadStoredObjects(
-        Context & context,
+        ContextPtr context,
         bool has_force_restore_data_flag, bool force_attach) override;
 
     void createTable(
-        const Context & context,
+        ContextPtr context,
         const String & table_name,
         const StoragePtr & table,
         const ASTPtr & query) override;
 
     void dropTable(
-        const Context & context,
+        ContextPtr context,
         const String & table_name,
         bool no_delay) override;
 
     void renameTable(
-        const Context & context,
+        ContextPtr context,
         const String & table_name,
         IDatabase & to_database,
         const String & to_table_name,
@@ -50,21 +50,21 @@ public:
         bool dictionary) override;
 
     void alterTable(
-        const Context & context,
+        ContextPtr context,
         const StorageID & table_id,
         const StorageInMemoryMetadata & metadata) override;
 
     time_t getObjectMetadataModificationTime(const String & table_name) const override;
 
-    bool isTableExist(const String & table_name, const Context &) const override { return isTableExist(table_name); }
+    bool isTableExist(const String & table_name, ContextPtr) const override { return isTableExist(table_name); }
     bool isTableExist(const String & table_name) const;
 
-    StoragePtr tryGetTable(const String & table_name, const Context &) const override { return tryGetTable(table_name); }
+    StoragePtr tryGetTable(const String & table_name, ContextPtr) const override { return tryGetTable(table_name); }
     StoragePtr tryGetTable(const String & table_name) const;
 
     bool empty() const override;
 
-    DatabaseTablesIteratorPtr getTablesIterator(const Context & context, const FilterByNameFunction & filter_by_table_name) override;
+    DatabaseTablesIteratorPtr getTablesIterator(ContextPtr context, const FilterByNameFunction & filter_by_table_name) override;
 
     void attachTable(const String & table_name, const StoragePtr & table, const String & relative_table_path) override;
 
diff --git a/src/Databases/DatabaseMemory.cpp b/src/Databases/DatabaseMemory.cpp
index 357acb32371..f21a145df55 100644
--- a/src/Databases/DatabaseMemory.cpp
+++ b/src/Databases/DatabaseMemory.cpp
@@ -16,13 +16,13 @@ namespace ErrorCodes
     extern const int UNKNOWN_TABLE;
 }
 
-DatabaseMemory::DatabaseMemory(const String & name_, const Context & context)
-    : DatabaseWithOwnTablesBase(name_, "DatabaseMemory(" + name_ + ")", context)
+DatabaseMemory::DatabaseMemory(const String & name_, ContextPtr context_)
+    : DatabaseWithOwnTablesBase(name_, "DatabaseMemory(" + name_ + ")", context_)
     , data_path("data/" + escapeForFileName(database_name) + "/")
 {}
 
 void DatabaseMemory::createTable(
-    const Context & /*context*/,
+    ContextPtr /*context*/,
     const String & table_name,
     const StoragePtr & table,
     const ASTPtr & query)
@@ -33,7 +33,7 @@ void DatabaseMemory::createTable(
 }
 
 void DatabaseMemory::dropTable(
-    const Context & /*context*/,
+    ContextPtr /*context*/,
     const String & table_name,
     bool /*no_delay*/)
 {
@@ -67,7 +67,7 @@ ASTPtr DatabaseMemory::getCreateDatabaseQuery() const
     return create_query;
 }
 
-ASTPtr DatabaseMemory::getCreateTableQueryImpl(const String & table_name, const Context &, bool throw_on_error) const
+ASTPtr DatabaseMemory::getCreateTableQueryImpl(const String & table_name, ContextPtr, bool throw_on_error) const
 {
     std::lock_guard lock{mutex};
     auto it = create_queries.find(table_name);
@@ -83,15 +83,15 @@ ASTPtr DatabaseMemory::getCreateTableQueryImpl(const String & table_name, const
 
 UUID DatabaseMemory::tryGetTableUUID(const String & table_name) const
 {
-    if (auto table = tryGetTable(table_name, global_context))
+    if (auto table = tryGetTable(table_name, getContext()))
         return table->getStorageID().uuid;
     return UUIDHelpers::Nil;
 }
 
-void DatabaseMemory::drop(const Context & context)
+void DatabaseMemory::drop(ContextPtr local_context)
 {
     /// Remove data on explicit DROP DATABASE
-    std::filesystem::remove_all(context.getPath() + data_path);
+    std::filesystem::remove_all(local_context->getPath() + data_path);
 }
 
 }
diff --git a/src/Databases/DatabaseMemory.h b/src/Databases/DatabaseMemory.h
index 40cc808e42b..8c9cf86ec19 100644
--- a/src/Databases/DatabaseMemory.h
+++ b/src/Databases/DatabaseMemory.h
@@ -19,22 +19,22 @@ namespace DB
 class DatabaseMemory final : public DatabaseWithOwnTablesBase
 {
 public:
-    DatabaseMemory(const String & name_, const Context & context);
+    DatabaseMemory(const String & name_, ContextPtr context);
 
     String getEngineName() const override { return "Memory"; }
 
     void createTable(
-        const Context & context,
+        ContextPtr context,
         const String & table_name,
         const StoragePtr & table,
         const ASTPtr & query) override;
 
     void dropTable(
-        const Context & context,
+        ContextPtr context,
         const String & table_name,
         bool no_delay) override;
 
-    ASTPtr getCreateTableQueryImpl(const String & name, const Context & context, bool throw_on_error) const override;
+    ASTPtr getCreateTableQueryImpl(const String & name, ContextPtr context, bool throw_on_error) const override;
     ASTPtr getCreateDatabaseQuery() const override;
 
     /// DatabaseMemory allows to create tables, which store data on disk.
@@ -46,7 +46,7 @@ public:
 
     UUID tryGetTableUUID(const String & table_name) const override;
 
-    void drop(const Context & context) override;
+    void drop(ContextPtr context) override;
 
 private:
     String data_path;
diff --git a/src/Databases/DatabaseOnDisk.cpp b/src/Databases/DatabaseOnDisk.cpp
index e5d2b23ace0..14ad1c7e4c5 100644
--- a/src/Databases/DatabaseOnDisk.cpp
+++ b/src/Databases/DatabaseOnDisk.cpp
@@ -46,7 +46,7 @@ std::pair<String, StoragePtr> createTableFromAST(
     ASTCreateQuery ast_create_query,
     const String & database_name,
     const String & table_data_path_relative,
-    Context & context,
+    ContextPtr context,
     bool has_force_restore_data_flag)
 {
     ast_create_query.attach = true;
@@ -58,7 +58,7 @@ std::pair<String, StoragePtr> createTableFromAST(
         auto table_function = factory.get(ast_create_query.as_table_function, context);
         ColumnsDescription columns;
         if (ast_create_query.columns_list && ast_create_query.columns_list->columns)
-            columns = InterpreterCreateQuery::getColumnsDescription(*ast_create_query.columns_list->columns, context, false);
+            columns = InterpreterCreateQuery::getColumnsDescription(*ast_create_query.columns_list->columns, context, true);
         StoragePtr storage = table_function->execute(ast_create_query.as_table_function, context, ast_create_query.table, std::move(columns));
         storage->renameInMemory(ast_create_query);
         return {ast_create_query.table, storage};
@@ -69,7 +69,7 @@ std::pair<String, StoragePtr> createTableFromAST(
     if (!ast_create_query.columns_list || !ast_create_query.columns_list->columns)
         throw Exception("Missing definition of columns.", ErrorCodes::EMPTY_LIST_OF_COLUMNS_PASSED);
 
-    ColumnsDescription columns = InterpreterCreateQuery::getColumnsDescription(*ast_create_query.columns_list->columns, context, false);
+    ColumnsDescription columns = InterpreterCreateQuery::getColumnsDescription(*ast_create_query.columns_list->columns, context, true);
     ConstraintsDescription constraints = InterpreterCreateQuery::getConstraintsDescription(ast_create_query.columns_list->constraints);
 
     return
@@ -79,7 +79,7 @@ std::pair<String, StoragePtr> createTableFromAST(
             ast_create_query,
             table_data_path_relative,
             context,
-            context.getGlobalContext(),
+            context->getGlobalContext(),
             columns,
             constraints,
             has_force_restore_data_flag)
@@ -188,23 +188,23 @@ DatabaseOnDisk::DatabaseOnDisk(
     const String & metadata_path_,
     const String & data_path_,
     const String & logger,
-    const Context & context)
-    : DatabaseWithOwnTablesBase(name, logger, context)
+    ContextPtr local_context)
+    : DatabaseWithOwnTablesBase(name, logger, local_context)
     , metadata_path(metadata_path_)
     , data_path(data_path_)
 {
-    Poco::File(context.getPath() + data_path).createDirectories();
+    Poco::File(local_context->getPath() + data_path).createDirectories();
     Poco::File(metadata_path).createDirectories();
 }
 
 
 void DatabaseOnDisk::createTable(
-    const Context & context,
+    ContextPtr local_context,
     const String & table_name,
     const StoragePtr & table,
     const ASTPtr & query)
 {
-    const auto & settings = context.getSettingsRef();
+    const auto & settings = local_context->getSettingsRef();
     const auto & create = query->as<ASTCreateQuery &>();
     assert(table_name == create.table);
 
@@ -221,18 +221,20 @@ void DatabaseOnDisk::createTable(
     /// But there is protection from it - see using DDLGuard in InterpreterCreateQuery.
 
     if (isDictionaryExist(table_name))
-        throw Exception(ErrorCodes::DICTIONARY_ALREADY_EXISTS, "Dictionary {}.{} already exists", backQuote(getDatabaseName()), backQuote(table_name));
+        throw Exception(
+            ErrorCodes::DICTIONARY_ALREADY_EXISTS, "Dictionary {}.{} already exists", backQuote(getDatabaseName()), backQuote(table_name));
 
-    if (isTableExist(table_name, global_context))
-        throw Exception(ErrorCodes::TABLE_ALREADY_EXISTS, "Table {}.{} already exists", backQuote(getDatabaseName()), backQuote(table_name));
+    if (isTableExist(table_name, getContext()))
+        throw Exception(
+            ErrorCodes::TABLE_ALREADY_EXISTS, "Table {}.{} already exists", backQuote(getDatabaseName()), backQuote(table_name));
 
     String table_metadata_path = getObjectMetadataPath(table_name);
 
     if (create.attach_short_syntax)
     {
         /// Metadata already exists, table was detached
+        removeDetachedPermanentlyFlag(local_context, table_name, table_metadata_path, true);
         attachTable(table_name, table, getTableDataPath(create));
-        removeDetachedPermanentlyFlag(table_name, table_metadata_path);
         return;
     }
 
@@ -241,7 +243,7 @@ void DatabaseOnDisk::createTable(
 
     if (create.attach && Poco::File(table_metadata_path).exists())
     {
-        ASTPtr ast_detached = parseQueryFromMetadata(log, context, table_metadata_path);
+        ASTPtr ast_detached = parseQueryFromMetadata(log, local_context, table_metadata_path);
         auto & create_detached = ast_detached->as<ASTCreateQuery &>();
 
         // either both should be Nil, either values should be equal
@@ -268,14 +270,14 @@ void DatabaseOnDisk::createTable(
         out.close();
     }
 
-    commitCreateTable(create, table, table_metadata_tmp_path, table_metadata_path, context);
+    commitCreateTable(create, table, table_metadata_tmp_path, table_metadata_path, local_context);
 
-    removeDetachedPermanentlyFlag(table_name, table_metadata_path);
+    removeDetachedPermanentlyFlag(local_context, table_name, table_metadata_path, false);
 }
 
 /// If the table was detached permanently we will have a flag file with
 /// .sql.detached extension, is not needed anymore since we attached the table back
-void DatabaseOnDisk::removeDetachedPermanentlyFlag(const String & table_name, const String & table_metadata_path) const
+void DatabaseOnDisk::removeDetachedPermanentlyFlag(ContextPtr, const String & table_name, const String & table_metadata_path, bool) const
 {
     try
     {
@@ -293,7 +295,7 @@ void DatabaseOnDisk::removeDetachedPermanentlyFlag(const String & table_name, co
 
 void DatabaseOnDisk::commitCreateTable(const ASTCreateQuery & query, const StoragePtr & table,
                                        const String & table_metadata_tmp_path, const String & table_metadata_path,
-                                       const Context & /*query_context*/)
+                                       ContextPtr /*query_context*/)
 {
     try
     {
@@ -311,7 +313,7 @@ void DatabaseOnDisk::commitCreateTable(const ASTCreateQuery & query, const Stora
     }
 }
 
-void DatabaseOnDisk::detachTablePermanently(const Context &, const String & table_name)
+void DatabaseOnDisk::detachTablePermanently(ContextPtr, const String & table_name)
 {
     auto table = detachTable(table_name);
 
@@ -327,7 +329,7 @@ void DatabaseOnDisk::detachTablePermanently(const Context &, const String & tabl
     }
 }
 
-void DatabaseOnDisk::dropTable(const Context & context, const String & table_name, bool /*no_delay*/)
+void DatabaseOnDisk::dropTable(ContextPtr local_context, const String & table_name, bool /*no_delay*/)
 {
     String table_metadata_path = getObjectMetadataPath(table_name);
     String table_metadata_path_drop = table_metadata_path + drop_suffix;
@@ -349,7 +351,7 @@ void DatabaseOnDisk::dropTable(const Context & context, const String & table_nam
         table->drop();
         table->is_dropped = true;
 
-        Poco::File table_data_dir{context.getPath() + table_data_path_relative};
+        Poco::File table_data_dir{local_context->getPath() + table_data_path_relative};
         if (table_data_dir.exists())
             table_data_dir.remove(true);
     }
@@ -387,7 +389,7 @@ void DatabaseOnDisk::checkMetadataFilenameAvailabilityUnlocked(const String & to
 }
 
 void DatabaseOnDisk::renameTable(
-        const Context & context,
+        ContextPtr local_context,
         const String & table_name,
         IDatabase & to_database,
         const String & to_table_name,
@@ -418,15 +420,16 @@ void DatabaseOnDisk::renameTable(
     String table_metadata_path;
     ASTPtr attach_query;
     /// DatabaseLazy::detachTable may return nullptr even if table exists, so we need tryGetTable for this case.
-    StoragePtr table = tryGetTable(table_name, global_context);
+    StoragePtr table = tryGetTable(table_name, getContext());
     detachTable(table_name);
     UUID prev_uuid = UUIDHelpers::Nil;
     try
     {
-        table_lock = table->lockExclusively(context.getCurrentQueryId(), context.getSettingsRef().lock_acquire_timeout);
+        table_lock = table->lockExclusively(
+            local_context->getCurrentQueryId(), local_context->getSettingsRef().lock_acquire_timeout);
 
         table_metadata_path = getObjectMetadataPath(table_name);
-        attach_query = parseQueryFromMetadata(log, context, table_metadata_path);
+        attach_query = parseQueryFromMetadata(log, local_context, table_metadata_path);
         auto & create = attach_query->as<ASTCreateQuery &>();
         create.database = to_database.getDatabaseName();
         create.table = to_table_name;
@@ -454,7 +457,7 @@ void DatabaseOnDisk::renameTable(
     }
 
     /// Now table data are moved to new database, so we must add metadata and attach table to new database
-    to_database.createTable(context, to_table_name, table, attach_query);
+    to_database.createTable(local_context, to_table_name, table, attach_query);
 
     Poco::File(table_metadata_path).remove();
 
@@ -473,10 +476,10 @@ void DatabaseOnDisk::renameTable(
 
 
 /// It returns create table statement (even if table is detached)
-ASTPtr DatabaseOnDisk::getCreateTableQueryImpl(const String & table_name, const Context &, bool throw_on_error) const
+ASTPtr DatabaseOnDisk::getCreateTableQueryImpl(const String & table_name, ContextPtr, bool throw_on_error) const
 {
     ASTPtr ast;
-    bool has_table = tryGetTable(table_name, global_context) != nullptr;
+    bool has_table = tryGetTable(table_name, getContext()) != nullptr;
     auto table_metadata_path = getObjectMetadataPath(table_name);
     try
     {
@@ -497,11 +500,11 @@ ASTPtr DatabaseOnDisk::getCreateDatabaseQuery() const
 {
     ASTPtr ast;
 
-    auto settings = global_context.getSettingsRef();
+    auto settings = getContext()->getSettingsRef();
     {
         std::lock_guard lock(mutex);
-        auto database_metadata_path = global_context.getPath() + "metadata/" + escapeForFileName(database_name) + ".sql";
-        ast = parseQueryFromMetadata(log, global_context, database_metadata_path, true);
+        auto database_metadata_path = getContext()->getPath() + "metadata/" + escapeForFileName(database_name) + ".sql";
+        ast = parseQueryFromMetadata(log, getContext(), database_metadata_path, true);
         auto & ast_create_query = ast->as<ASTCreateQuery &>();
         ast_create_query.attach = false;
         ast_create_query.database = database_name;
@@ -518,10 +521,10 @@ ASTPtr DatabaseOnDisk::getCreateDatabaseQuery() const
     return ast;
 }
 
-void DatabaseOnDisk::drop(const Context & context)
+void DatabaseOnDisk::drop(ContextPtr local_context)
 {
     assert(tables.empty());
-    Poco::File(context.getPath() + getDataPath()).remove(false);
+    Poco::File(local_context->getPath() + getDataPath()).remove(false);
     Poco::File(getMetadataPath()).remove(false);
 }
 
@@ -541,14 +544,14 @@ time_t DatabaseOnDisk::getObjectMetadataModificationTime(const String & object_n
         return static_cast<time_t>(0);
 }
 
-void DatabaseOnDisk::iterateMetadataFiles(const Context & context, const IteratingFunction & process_metadata_file) const
+void DatabaseOnDisk::iterateMetadataFiles(ContextPtr local_context, const IteratingFunction & process_metadata_file) const
 {
     auto process_tmp_drop_metadata_file = [&](const String & file_name)
     {
         assert(getUUID() == UUIDHelpers::Nil);
         static const char * tmp_drop_ext = ".sql.tmp_drop";
         const std::string object_name = file_name.substr(0, file_name.size() - strlen(tmp_drop_ext));
-        if (Poco::File(context.getPath() + getDataPath() + '/' + object_name).exists())
+        if (Poco::File(local_context->getPath() + getDataPath() + '/' + object_name).exists())
         {
             Poco::File(getMetadataPath() + file_name).renameTo(getMetadataPath() + object_name + ".sql");
             LOG_WARNING(log, "Object {} was not dropped previously and will be restored", backQuote(object_name));
@@ -615,7 +618,12 @@ void DatabaseOnDisk::iterateMetadataFiles(const Context & context, const Iterati
     pool.wait();
 }
 
-ASTPtr DatabaseOnDisk::parseQueryFromMetadata(Poco::Logger * logger, const Context & context, const String & metadata_file_path, bool throw_on_error /*= true*/, bool remove_empty /*= false*/)
+ASTPtr DatabaseOnDisk::parseQueryFromMetadata(
+    Poco::Logger * logger,
+    ContextPtr local_context,
+    const String & metadata_file_path,
+    bool throw_on_error /*= true*/,
+    bool remove_empty /*= false*/)
 {
     String query;
 
@@ -643,7 +651,7 @@ ASTPtr DatabaseOnDisk::parseQueryFromMetadata(Poco::Logger * logger, const Conte
         return nullptr;
     }
 
-    auto settings = context.getSettingsRef();
+    auto settings = local_context->getSettingsRef();
     ParserCreateQuery parser;
     const char * pos = query.data();
     std::string error_message;
@@ -662,7 +670,12 @@ ASTPtr DatabaseOnDisk::parseQueryFromMetadata(Poco::Logger * logger, const Conte
         table_name = unescapeForFileName(table_name);
 
         if (create.table != TABLE_WITH_UUID_NAME_PLACEHOLDER && logger)
-            LOG_WARNING(logger, "File {} contains both UUID and table name. Will use name `{}` instead of `{}`", metadata_file_path, table_name, create.table);
+            LOG_WARNING(
+                logger,
+                "File {} contains both UUID and table name. Will use name `{}` instead of `{}`",
+                metadata_file_path,
+                table_name,
+                create.table);
         create.table = table_name;
     }
 
@@ -671,7 +684,7 @@ ASTPtr DatabaseOnDisk::parseQueryFromMetadata(Poco::Logger * logger, const Conte
 
 ASTPtr DatabaseOnDisk::getCreateQueryFromMetadata(const String & database_metadata_path, bool throw_on_error) const
 {
-    ASTPtr ast = parseQueryFromMetadata(log, global_context, database_metadata_path, throw_on_error);
+    ASTPtr ast = parseQueryFromMetadata(log, getContext(), database_metadata_path, throw_on_error);
 
     if (ast)
     {
diff --git a/src/Databases/DatabaseOnDisk.h b/src/Databases/DatabaseOnDisk.h
index fefe6e91606..677465e306e 100644
--- a/src/Databases/DatabaseOnDisk.h
+++ b/src/Databases/DatabaseOnDisk.h
@@ -16,7 +16,7 @@ std::pair<String, StoragePtr> createTableFromAST(
     ASTCreateQuery ast_create_query,
     const String & database_name,
     const String & table_data_path_relative,
-    Context & context,
+    ContextPtr context,
     bool has_force_restore_data_flag);
 
 /** Get the string with the table definition based on the CREATE query.
@@ -33,23 +33,23 @@ void applyMetadataChangesToCreateQuery(const ASTPtr & query, const StorageInMemo
 class DatabaseOnDisk : public DatabaseWithOwnTablesBase
 {
 public:
-    DatabaseOnDisk(const String & name, const String & metadata_path_, const String & data_path_, const String & logger, const Context & context);
+    DatabaseOnDisk(const String & name, const String & metadata_path_, const String & data_path_, const String & logger, ContextPtr context);
 
     void createTable(
-        const Context & context,
+        ContextPtr context,
         const String & table_name,
         const StoragePtr & table,
         const ASTPtr & query) override;
 
-    void detachTablePermanently(const Context & context, const String & table_name) override;
+    void detachTablePermanently(ContextPtr context, const String & table_name) override;
 
     void dropTable(
-        const Context & context,
+        ContextPtr context,
         const String & table_name,
         bool no_delay) override;
 
     void renameTable(
-        const Context & context,
+        ContextPtr context,
         const String & table_name,
         IDatabase & to_database,
         const String & to_table_name,
@@ -58,7 +58,7 @@ public:
 
     ASTPtr getCreateDatabaseQuery() const override;
 
-    void drop(const Context & context) override;
+    void drop(ContextPtr context) override;
 
     String getObjectMetadataPath(const String & object_name) const override;
 
@@ -69,7 +69,7 @@ public:
     String getTableDataPath(const ASTCreateQuery & query) const override { return getTableDataPath(query.table); }
     String getMetadataPath() const override { return metadata_path; }
 
-    static ASTPtr parseQueryFromMetadata(Poco::Logger * log, const Context & context, const String & metadata_file_path, bool throw_on_error = true, bool remove_empty = false);
+    static ASTPtr parseQueryFromMetadata(Poco::Logger * log, ContextPtr context, const String & metadata_file_path, bool throw_on_error = true, bool remove_empty = false);
 
     /// will throw when the table we want to attach already exists (in active / detached / detached permanently form)
     void checkMetadataFilenameAvailability(const String & to_table_name) const;
@@ -82,23 +82,22 @@ protected:
 
     using IteratingFunction = std::function<void(const String &)>;
 
-    void iterateMetadataFiles(const Context & context, const IteratingFunction & process_metadata_file) const;
+    void iterateMetadataFiles(ContextPtr context, const IteratingFunction & process_metadata_file) const;
 
     ASTPtr getCreateTableQueryImpl(
         const String & table_name,
-        const Context & context,
+        ContextPtr context,
         bool throw_on_error) const override;
 
     ASTPtr getCreateQueryFromMetadata(const String & metadata_path, bool throw_on_error) const;
 
     virtual void commitCreateTable(const ASTCreateQuery & query, const StoragePtr & table,
-                                   const String & table_metadata_tmp_path, const String & table_metadata_path, const Context & query_context);
+                                   const String & table_metadata_tmp_path, const String & table_metadata_path, ContextPtr query_context);
+
+    virtual void removeDetachedPermanentlyFlag(ContextPtr context, const String & table_name, const String & table_metadata_path, bool attach) const;
 
     const String metadata_path;
     const String data_path;
-
-private:
-    void removeDetachedPermanentlyFlag(const String & table_name, const String & table_metadata_path) const;
 };
 
 }
diff --git a/src/Databases/DatabaseOrdinary.cpp b/src/Databases/DatabaseOrdinary.cpp
index a94668dacf7..840be0e006a 100644
--- a/src/Databases/DatabaseOrdinary.cpp
+++ b/src/Databases/DatabaseOrdinary.cpp
@@ -36,7 +36,7 @@ static constexpr size_t METADATA_FILE_BUFFER_SIZE = 32768;
 namespace
 {
     void tryAttachTable(
-        Context & context,
+        ContextPtr context,
         const ASTCreateQuery & query,
         DatabaseOrdinary & database,
         const String & database_name,
@@ -62,7 +62,7 @@ namespace
     }
 
 
-    void tryAttachDictionary(const ASTPtr & query, DatabaseOrdinary & database, const String & metadata_path, const Context & context)
+    void tryAttachDictionary(const ASTPtr & query, DatabaseOrdinary & database, const String & metadata_path, ContextPtr context)
     {
         auto & create_query = query->as<ASTCreateQuery &>();
         assert(create_query.is_dictionary);
@@ -94,18 +94,18 @@ namespace
 }
 
 
-DatabaseOrdinary::DatabaseOrdinary(const String & name_, const String & metadata_path_, const Context & context_)
+DatabaseOrdinary::DatabaseOrdinary(const String & name_, const String & metadata_path_, ContextPtr context_)
     : DatabaseOrdinary(name_, metadata_path_, "data/" + escapeForFileName(name_) + "/", "DatabaseOrdinary (" + name_ + ")", context_)
 {
 }
 
 DatabaseOrdinary::DatabaseOrdinary(
-    const String & name_, const String & metadata_path_, const String & data_path_, const String & logger, const Context & context_)
+    const String & name_, const String & metadata_path_, const String & data_path_, const String & logger, ContextPtr context_)
     : DatabaseWithDictionaries(name_, metadata_path_, data_path_, logger, context_)
 {
 }
 
-void DatabaseOrdinary::loadStoredObjects(Context & context, bool has_force_restore_data_flag, bool /*force_attach*/)
+void DatabaseOrdinary::loadStoredObjects(ContextPtr local_context, bool has_force_restore_data_flag, bool /*force_attach*/)
 {
     /** Tables load faster if they are loaded in sorted (by name) order.
       * Otherwise (for the ext4 filesystem), `DirectoryIterator` iterates through them in some order,
@@ -117,7 +117,8 @@ void DatabaseOrdinary::loadStoredObjects(Context & context, bool has_force_resto
 
     size_t total_dictionaries = 0;
 
-    auto process_metadata = [&context, &file_names, &total_dictionaries, &file_names_mutex, this](const String & file_name)
+    auto process_metadata = [context_weak = ContextWeakPtr(local_context), &file_names, &total_dictionaries, &file_names_mutex, this](
+                                const String & file_name)
     {
         fs::path path(getMetadataPath());
         fs::path file_path(file_name);
@@ -125,7 +126,7 @@ void DatabaseOrdinary::loadStoredObjects(Context & context, bool has_force_resto
 
         try
         {
-            auto ast = parseQueryFromMetadata(log, context, full_path.string(), /*throw_on_error*/ true, /*remove_empty*/ false);
+            auto ast = parseQueryFromMetadata(log, getContext(), full_path.string(), /*throw_on_error*/ true, /*remove_empty*/ false);
             if (ast)
             {
                 auto * create_query = ast->as<ASTCreateQuery>();
@@ -155,7 +156,7 @@ void DatabaseOrdinary::loadStoredObjects(Context & context, bool has_force_resto
         }
     };
 
-    iterateMetadataFiles(context, process_metadata);
+    iterateMetadataFiles(local_context, process_metadata);
 
     size_t total_tables = file_names.size() - total_dictionaries;
 
@@ -180,7 +181,7 @@ void DatabaseOrdinary::loadStoredObjects(Context & context, bool has_force_resto
         auto create_query = query->as<const ASTCreateQuery &>();
         if (create_query.is_dictionary)
         {
-            tryAttachDictionary(query, *this, getMetadataPath() + name, context);
+            tryAttachDictionary(query, *this, getMetadataPath() + name, local_context);
 
             /// Messages, so that it's not boring to wait for the server to load for a long time.
             logAboutProgress(log, ++dictionaries_processed, total_dictionaries, watch);
@@ -195,7 +196,7 @@ void DatabaseOrdinary::loadStoredObjects(Context & context, bool has_force_resto
             pool.scheduleOrThrowOnError([&]()
             {
                 tryAttachTable(
-                    context,
+                    local_context,
                     create_query,
                     *this,
                     database_name,
@@ -245,7 +246,7 @@ void DatabaseOrdinary::startupTables(ThreadPool & thread_pool)
     thread_pool.wait();
 }
 
-void DatabaseOrdinary::alterTable(const Context & context, const StorageID & table_id, const StorageInMemoryMetadata & metadata)
+void DatabaseOrdinary::alterTable(ContextPtr local_context, const StorageID & table_id, const StorageInMemoryMetadata & metadata)
 {
     String table_name = table_id.table_name;
     /// Read the definition of the table and replace the necessary parts with new ones.
@@ -265,7 +266,7 @@ void DatabaseOrdinary::alterTable(const Context & context, const StorageID & tab
         statement.data() + statement.size(),
         "in file " + table_metadata_path,
         0,
-        context.getSettingsRef().max_parser_depth);
+        local_context->getSettingsRef().max_parser_depth);
 
     applyMetadataChangesToCreateQuery(ast, metadata);
 
@@ -274,15 +275,15 @@ void DatabaseOrdinary::alterTable(const Context & context, const StorageID & tab
         WriteBufferFromFile out(table_metadata_tmp_path, statement.size(), O_WRONLY | O_CREAT | O_EXCL);
         writeString(statement, out);
         out.next();
-        if (context.getSettingsRef().fsync_metadata)
+        if (local_context->getSettingsRef().fsync_metadata)
             out.sync();
         out.close();
     }
 
-    commitAlterTable(table_id, table_metadata_tmp_path, table_metadata_path, statement, context);
+    commitAlterTable(table_id, table_metadata_tmp_path, table_metadata_path, statement, local_context);
 }
 
-void DatabaseOrdinary::commitAlterTable(const StorageID &, const String & table_metadata_tmp_path, const String & table_metadata_path, const String & /*statement*/, const Context & /*query_context*/)
+void DatabaseOrdinary::commitAlterTable(const StorageID &, const String & table_metadata_tmp_path, const String & table_metadata_path, const String & /*statement*/, ContextPtr /*query_context*/)
 {
     try
     {
diff --git a/src/Databases/DatabaseOrdinary.h b/src/Databases/DatabaseOrdinary.h
index c1ad32345f6..4cf58cef9f0 100644
--- a/src/Databases/DatabaseOrdinary.h
+++ b/src/Databases/DatabaseOrdinary.h
@@ -14,23 +14,26 @@ namespace DB
 class DatabaseOrdinary : public DatabaseWithDictionaries
 {
 public:
-    DatabaseOrdinary(const String & name_, const String & metadata_path_, const Context & context);
-    DatabaseOrdinary(const String & name_, const String & metadata_path_, const String & data_path_, const String & logger, const Context & context_);
+    DatabaseOrdinary(const String & name_, const String & metadata_path_, ContextPtr context);
+    DatabaseOrdinary(
+        const String & name_, const String & metadata_path_, const String & data_path_, const String & logger, ContextPtr context_);
 
     String getEngineName() const override { return "Ordinary"; }
 
-    void loadStoredObjects(
-        Context & context,
-        bool has_force_restore_data_flag,
-        bool force_attach) override;
+    void loadStoredObjects(ContextPtr context, bool has_force_restore_data_flag, bool force_attach) override;
 
     void alterTable(
-        const Context & context,
+        ContextPtr context,
         const StorageID & table_id,
         const StorageInMemoryMetadata & metadata) override;
 
 protected:
-    virtual void commitAlterTable(const StorageID & table_id, const String & table_metadata_tmp_path, const String & table_metadata_path, const String & statement, const Context & query_context);
+    virtual void commitAlterTable(
+        const StorageID & table_id,
+        const String & table_metadata_tmp_path,
+        const String & table_metadata_path,
+        const String & statement,
+        ContextPtr query_context);
 
     void startupTables(ThreadPool & thread_pool);
 };
diff --git a/src/Databases/DatabaseReplicated.cpp b/src/Databases/DatabaseReplicated.cpp
index 12cff3407d3..46d67e275ba 100644
--- a/src/Databases/DatabaseReplicated.cpp
+++ b/src/Databases/DatabaseReplicated.cpp
@@ -18,10 +18,12 @@
 #include <Interpreters/Cluster.h>
 #include <common/getFQDNOrHostName.h>
 #include <Parsers/ASTAlterQuery.h>
+#include <Parsers/ASTDropQuery.h>
 #include <Parsers/ParserCreateQuery.h>
 #include <Parsers/parseQuery.h>
 #include <Interpreters/InterpreterCreateQuery.h>
 #include <Parsers/formatAST.h>
+#include <Common/Macros.h>
 
 namespace DB
 {
@@ -45,12 +47,12 @@ static constexpr const char * BROKEN_TABLES_SUFFIX = "_broken_tables";
 
 zkutil::ZooKeeperPtr DatabaseReplicated::getZooKeeper() const
 {
-    return global_context.getZooKeeper();
+    return getContext()->getZooKeeper();
 }
 
-static inline String getHostID(const Context & global_context, const UUID & db_uuid)
+static inline String getHostID(ContextPtr global_context, const UUID & db_uuid)
 {
-    return Cluster::Address::toString(getFQDNOrHostName(), global_context.getTCPPort()) + ':' + toString(db_uuid);
+    return Cluster::Address::toString(getFQDNOrHostName(), global_context->getTCPPort()) + ':' + toString(db_uuid);
 }
 
 
@@ -64,7 +66,7 @@ DatabaseReplicated::DatabaseReplicated(
     const String & shard_name_,
     const String & replica_name_,
     DatabaseReplicatedSettings db_settings_,
-    const Context & context_)
+    ContextPtr context_)
     : DatabaseAtomic(name_, metadata_path_, uuid, "DatabaseReplicated (" + name_ + ")", context_)
     , zookeeper_path(zookeeper_path_)
     , shard_name(shard_name_)
@@ -105,11 +107,26 @@ std::pair<String, String> DatabaseReplicated::parseFullReplicaName(const String
 
 ClusterPtr DatabaseReplicated::getCluster() const
 {
-    /// TODO Maintain up-to-date Cluster and allow to use it in Distributed tables
+    std::lock_guard lock{mutex};
+    if (cluster)
+        return cluster;
+
+    cluster = getClusterImpl();
+    return cluster;
+}
+
+void DatabaseReplicated::setCluster(ClusterPtr && new_cluster)
+{
+    std::lock_guard lock{mutex};
+    cluster = std::move(new_cluster);
+}
+
+ClusterPtr DatabaseReplicated::getClusterImpl() const
+{
     Strings hosts;
     Strings host_ids;
 
-    auto zookeeper = global_context.getZooKeeper();
+    auto zookeeper = getContext()->getZooKeeper();
     constexpr int max_retries = 10;
     int iteration = 0;
     bool success = false;
@@ -120,7 +137,7 @@ ClusterPtr DatabaseReplicated::getCluster() const
         hosts = zookeeper->getChildren(zookeeper_path + "/replicas", &stat);
         if (hosts.empty())
             throw Exception(ErrorCodes::LOGICAL_ERROR, "No hosts found");
-        Int32 cver = stat.cversion;
+        Int32 cversion = stat.cversion;
         std::sort(hosts.begin(), hosts.end());
 
         std::vector<zkutil::ZooKeeper::FutureGet> futures;
@@ -139,7 +156,9 @@ ClusterPtr DatabaseReplicated::getCluster() const
         }
 
         zookeeper->get(zookeeper_path + "/replicas", &stat);
-        if (success && cver == stat.version)
+        if (cversion != stat.cversion)
+            success = false;
+        if (success)
             break;
     }
     if (!success)
@@ -157,34 +176,35 @@ ClusterPtr DatabaseReplicated::getCluster() const
         if (id == DROPPED_MARK)
             continue;
         auto [shard, replica] = parseFullReplicaName(hosts[i]);
-        auto pos = id.find(':');
-        String host = id.substr(0, pos);
+        auto pos = id.rfind(':');
+        String host_port = id.substr(0, pos);
         if (shard != current_shard)
         {
             current_shard = shard;
             if (!shards.back().empty())
                 shards.emplace_back();
         }
-        shards.back().emplace_back(unescapeForFileName(host));
+        shards.back().emplace_back(unescapeForFileName(host_port));
     }
 
-    /// TODO make it configurable
-    String username = "default";
-    String password;
+    String username = db_settings.cluster_username;
+    String password = db_settings.cluster_password;
+    UInt16 default_port = getContext()->getTCPPort();
+    bool secure = db_settings.cluster_secure_connection;
 
-    return std::make_shared<Cluster>(global_context.getSettingsRef(), shards, username, password, global_context.getTCPPort(), false);
+    return std::make_shared<Cluster>(getContext()->getSettingsRef(), shards, username, password, default_port, false, secure);
 }
 
 void DatabaseReplicated::tryConnectToZooKeeperAndInitDatabase(bool force_attach)
 {
     try
     {
-        if (!global_context.hasZooKeeper())
+        if (!getContext()->hasZooKeeper())
         {
             throw Exception("Can't create replicated database without ZooKeeper", ErrorCodes::NO_ZOOKEEPER);
         }
 
-        auto current_zookeeper = global_context.getZooKeeper();
+        auto current_zookeeper = getContext()->getZooKeeper();
 
         if (!current_zookeeper->exists(zookeeper_path))
         {
@@ -197,7 +217,7 @@ void DatabaseReplicated::tryConnectToZooKeeperAndInitDatabase(bool force_attach)
         String replica_host_id;
         if (current_zookeeper->tryGet(replica_path, replica_host_id))
         {
-            String host_id = getHostID(global_context, db_uuid);
+            String host_id = getHostID(getContext(), db_uuid);
             if (replica_host_id != host_id)
                 throw Exception(ErrorCodes::REPLICA_IS_ALREADY_EXIST,
                                 "Replica {} of shard {} of replicated database at {} already exists. Replica host ID: '{}', current host ID: '{}'",
@@ -253,11 +273,8 @@ bool DatabaseReplicated::createDatabaseNodesInZooKeeper(const zkutil::ZooKeeperP
     __builtin_unreachable();
 }
 
-void DatabaseReplicated::createReplicaNodesInZooKeeper(const zkutil::ZooKeeperPtr & current_zookeeper)
+void DatabaseReplicated::createEmptyLogEntry(Coordination::Requests & ops, const ZooKeeperPtr & current_zookeeper)
 {
-    /// Write host name to replica_path, it will protect from multiple replicas with the same name
-    auto host_id = getHostID(global_context, db_uuid);
-
     /// On replica creation add empty entry to log. Can be used to trigger some actions on other replicas (e.g. update cluster info).
     DDLLogEntry entry{};
 
@@ -266,36 +283,95 @@ void DatabaseReplicated::createReplicaNodesInZooKeeper(const zkutil::ZooKeeperPt
     String counter_path = current_zookeeper->create(counter_prefix, "", zkutil::CreateMode::EphemeralSequential);
     String query_path = query_path_prefix + counter_path.substr(counter_prefix.size());
 
+    ops.emplace_back(zkutil::makeCreateRequest(query_path, entry.toString(), zkutil::CreateMode::Persistent));
+    ops.emplace_back(zkutil::makeCreateRequest(query_path + "/committed", getFullReplicaName(), zkutil::CreateMode::Persistent));
+    ops.emplace_back(zkutil::makeRemoveRequest(counter_path, -1));
+}
+
+void DatabaseReplicated::createReplicaNodesInZooKeeper(const zkutil::ZooKeeperPtr & current_zookeeper)
+{
+    /// Write host name to replica_path, it will protect from multiple replicas with the same name
+    auto host_id = getHostID(getContext(), db_uuid);
+
     Coordination::Requests ops;
     ops.emplace_back(zkutil::makeCreateRequest(replica_path, host_id, zkutil::CreateMode::Persistent));
     ops.emplace_back(zkutil::makeCreateRequest(replica_path + "/log_ptr", "0", zkutil::CreateMode::Persistent));
-    ops.emplace_back(zkutil::makeCreateRequest(query_path, entry.toString(), zkutil::CreateMode::Persistent));
-    ops.emplace_back(zkutil::makeRemoveRequest(counter_path, -1));
+    createEmptyLogEntry(ops, current_zookeeper);
     current_zookeeper->multi(ops);
 }
 
-void DatabaseReplicated::loadStoredObjects(Context & context, bool has_force_restore_data_flag, bool force_attach)
+void DatabaseReplicated::loadStoredObjects(ContextPtr local_context, bool has_force_restore_data_flag, bool force_attach)
 {
     tryConnectToZooKeeperAndInitDatabase(force_attach);
 
-    DatabaseAtomic::loadStoredObjects(context, has_force_restore_data_flag, force_attach);
+    DatabaseAtomic::loadStoredObjects(local_context, has_force_restore_data_flag, force_attach);
 
-    ddl_worker = std::make_unique<DatabaseReplicatedDDLWorker>(this, global_context);
+    ddl_worker = std::make_unique<DatabaseReplicatedDDLWorker>(this, getContext());
     ddl_worker->startup();
 }
 
-BlockIO DatabaseReplicated::tryEnqueueReplicatedDDL(const ASTPtr & query, const Context & query_context)
+void DatabaseReplicated::checkQueryValid(const ASTPtr & query, ContextPtr query_context) const
 {
-    if (is_readonly)
-        throw Exception(ErrorCodes::NO_ZOOKEEPER, "Database is in readonly mode, because it cannot connect to ZooKeeper");
-
-    if (query_context.getClientInfo().query_kind != ClientInfo::QueryKind::INITIAL_QUERY)
-        throw Exception(ErrorCodes::INCORRECT_QUERY, "It's not initial query. ON CLUSTER is not allowed for Replicated database.");
-
     /// Replicas will set correct name of current database in query context (database name can be different on replicas)
-    if (auto * ddl_query = query->as<ASTQueryWithTableAndOutput>())
+    if (auto * ddl_query = dynamic_cast<ASTQueryWithTableAndOutput *>(query.get()))
+    {
+        if (ddl_query->database != getDatabaseName())
+            throw Exception(ErrorCodes::UNKNOWN_DATABASE, "Database was renamed");
         ddl_query->database.clear();
 
+        if (auto * create = query->as<ASTCreateQuery>())
+        {
+            bool replicated_table = create->storage && create->storage->engine && startsWith(create->storage->engine->name, "Replicated");
+            if (!replicated_table || !create->storage->engine->arguments)
+                return;
+
+            ASTs & args = create->storage->engine->arguments->children;
+            if (args.size() < 2)
+                return;
+
+            ASTLiteral * arg1 = args[0]->as<ASTLiteral>();
+            ASTLiteral * arg2 = args[1]->as<ASTLiteral>();
+            if (!arg1 || !arg2 || arg1->value.getType() != Field::Types::String || arg2->value.getType() != Field::Types::String)
+                return;
+
+            String maybe_path = arg1->value.get<String>();
+            String maybe_replica = arg2->value.get<String>();
+
+            /// Looks like it's ReplicatedMergeTree with explicit zookeeper_path and replica_name arguments.
+            /// Let's ensure that some macros are used.
+            /// NOTE: we cannot check here that substituted values will be actually different on shards and replicas.
+
+            Macros::MacroExpansionInfo info;
+            info.table_id = {getDatabaseName(), create->table, create->uuid};
+            query_context->getMacros()->expand(maybe_path, info);
+            bool maybe_shard_macros = info.expanded_other;
+            info.expanded_other = false;
+            query_context->getMacros()->expand(maybe_replica, info);
+            bool maybe_replica_macros = info.expanded_other;
+            bool enable_functional_tests_helper = getContext()->getConfigRef().has("_functional_tests_helper_database_replicated_replace_args_macros");
+
+            if (!enable_functional_tests_helper)
+                LOG_WARNING(log, "It's not recommended to explicitly specify zookeeper_path and replica_name in ReplicatedMergeTree arguments");
+
+            if (maybe_shard_macros && maybe_replica_macros)
+                return;
+
+            if (enable_functional_tests_helper)
+            {
+                if (maybe_path.empty() || maybe_path.back() != '/')
+                    maybe_path += '/';
+                arg1->value = maybe_path + "auto_{shard}";
+                arg2->value = maybe_replica + "auto_{replica}";
+                return;
+            }
+
+            throw Exception(ErrorCodes::INCORRECT_QUERY,
+                            "Explicit zookeeper_path and replica_name are specified in ReplicatedMergeTree arguments. "
+                            "If you really want to specify it explicitly, then you should use some macros "
+                            "to distinguish different shards and replicas");
+        }
+    }
+
     if (const auto * query_alter = query->as<ASTAlterQuery>())
     {
         for (const auto & command : query_alter->command_list->children)
@@ -305,34 +381,47 @@ BlockIO DatabaseReplicated::tryEnqueueReplicatedDDL(const ASTPtr & query, const
         }
     }
 
+    if (auto * query_drop = query->as<ASTDropQuery>())
+    {
+        if (query_drop->kind == ASTDropQuery::Kind::Detach && query_context->getSettingsRef().database_replicated_always_detach_permanently)
+            query_drop->permanently = true;
+        if (query_drop->kind == ASTDropQuery::Kind::Detach && !query_drop->permanently)
+            throw Exception(ErrorCodes::INCORRECT_QUERY, "DETACH TABLE is not allowed for Replicated databases. "
+                                                         "Use DETACH TABLE PERMANENTLY or SYSTEM RESTART REPLICA or set "
+                                                         "database_replicated_always_detach_permanently to 1");
+    }
+}
+
+BlockIO DatabaseReplicated::tryEnqueueReplicatedDDL(const ASTPtr & query, ContextPtr query_context)
+{
+    if (is_readonly)
+        throw Exception(ErrorCodes::NO_ZOOKEEPER, "Database is in readonly mode, because it cannot connect to ZooKeeper");
+
+    if (query_context->getClientInfo().query_kind != ClientInfo::QueryKind::INITIAL_QUERY)
+        throw Exception(ErrorCodes::INCORRECT_QUERY, "It's not initial query. ON CLUSTER is not allowed for Replicated database.");
+
+    checkQueryValid(query, query_context);
     LOG_DEBUG(log, "Proposing query: {}", queryToString(query));
 
-    /// TODO maybe write current settings to log entry?
     DDLLogEntry entry;
     entry.query = queryToString(query);
     entry.initiator = ddl_worker->getCommonHostID();
+    entry.setSettingsIfRequired(query_context);
     String node_path = ddl_worker->tryEnqueueAndExecuteEntry(entry, query_context);
 
-    BlockIO io;
-    if (query_context.getSettingsRef().distributed_ddl_task_timeout == 0)
-        return io;
-
     Strings hosts_to_wait = getZooKeeper()->getChildren(zookeeper_path + "/replicas");
-    auto stream = std::make_shared<DDLQueryStatusInputStream>(node_path, entry, query_context, hosts_to_wait);
-    if (query_context.getSettingsRef().database_replicated_ddl_output)
-        io.in = std::move(stream);
-    return io;
+    return getDistributedDDLStatus(node_path, entry, query_context, hosts_to_wait);
 }
 
-static UUID getTableUUIDIfReplicated(const String & metadata, const Context & context)
+static UUID getTableUUIDIfReplicated(const String & metadata, ContextPtr context)
 {
     bool looks_like_replicated = metadata.find("ReplicatedMergeTree") != std::string::npos;
     if (!looks_like_replicated)
         return UUIDHelpers::Nil;
 
     ParserCreateQuery parser;
-    auto size = context.getSettingsRef().max_query_size;
-    auto depth = context.getSettingsRef().max_parser_depth;
+    auto size = context->getSettingsRef().max_query_size;
+    auto depth = context->getSettingsRef().max_parser_depth;
     ASTPtr query = parseQuery(parser, metadata, size, depth);
     const ASTCreateQuery & create = query->as<const ASTCreateQuery &>();
     if (!create.storage || !create.storage->engine)
@@ -368,7 +457,7 @@ void DatabaseReplicated::recoverLostReplica(const ZooKeeperPtr & current_zookeep
     std::unordered_map<UUID, String> zk_replicated_id_to_name;
     for (const auto & zk_table : table_name_to_metadata)
     {
-        UUID zk_replicated_id = getTableUUIDIfReplicated(zk_table.second, global_context);
+        UUID zk_replicated_id = getTableUUIDIfReplicated(zk_table.second, getContext());
         if (zk_replicated_id != UUIDHelpers::Nil)
             zk_replicated_id_to_name.emplace(zk_replicated_id, zk_table.first);
     }
@@ -378,7 +467,8 @@ void DatabaseReplicated::recoverLostReplica(const ZooKeeperPtr & current_zookeep
     std::vector<std::pair<String, String>> replicated_tables_to_rename;
     size_t total_tables = 0;
     std::vector<UUID> replicated_ids;
-    for (auto existing_tables_it = getTablesIterator(global_context, {}); existing_tables_it->isValid(); existing_tables_it->next(), ++total_tables)
+    for (auto existing_tables_it = getTablesIterator(getContext(), {}); existing_tables_it->isValid();
+         existing_tables_it->next(), ++total_tables)
     {
         String name = existing_tables_it->name();
         UUID local_replicated_id = UUIDHelpers::Nil;
@@ -417,7 +507,7 @@ void DatabaseReplicated::recoverLostReplica(const ZooKeeperPtr & current_zookeep
         /// We use Ordinary engine for destination database, because it's the only way to discard table UUID
         /// and make possible creation of new table with the same UUID.
         String query = fmt::format("CREATE DATABASE IF NOT EXISTS {} ENGINE=Ordinary", backQuoteIfNeed(to_db_name));
-        Context query_context = global_context;
+        auto query_context = Context::createCopy(getContext());
         executeQuery(query, query_context, true);
     }
 
@@ -430,12 +520,12 @@ void DatabaseReplicated::recoverLostReplica(const ZooKeeperPtr & current_zookeep
         if (getDatabaseName() != db_name)
             throw Exception(ErrorCodes::UNKNOWN_DATABASE, "Database was renamed, will retry");
 
-        auto table = tryGetTable(table_name, global_context);
+        auto table = tryGetTable(table_name, getContext());
         if (isDictionaryExist(table_name))
         {
             /// We can safely drop any dictionaries because they do not store data
             LOG_DEBUG(log, "Will DROP DICTIONARY {}", backQuoteIfNeed(table_name));
-            DatabaseAtomic::removeDictionary(global_context, table_name);
+            DatabaseAtomic::removeDictionary(getContext(), table_name);
             ++dropped_dicts;
         }
         else if (!table->storesDataOnDisk())
@@ -443,7 +533,7 @@ void DatabaseReplicated::recoverLostReplica(const ZooKeeperPtr & current_zookeep
             LOG_DEBUG(log, "Will DROP TABLE {}, because it does not store data on disk and can be safely dropped", backQuoteIfNeed(table_name));
             dropped_tables.push_back(tryGetTableUUID(table_name));
             table->shutdown();
-            DatabaseAtomic::dropTable(global_context, table_name, true);
+            DatabaseAtomic::dropTable(getContext(), table_name, true);
         }
         else
         {
@@ -453,7 +543,7 @@ void DatabaseReplicated::recoverLostReplica(const ZooKeeperPtr & current_zookeep
             assert(db_name < to_db_name);
             DDLGuardPtr to_table_guard = DatabaseCatalog::instance().getDDLGuard(to_db_name, to_name);
             auto to_db_ptr = DatabaseCatalog::instance().getDatabase(to_db_name);
-            DatabaseAtomic::renameTable(global_context, table_name, *to_db_ptr, to_name, false, false);
+            DatabaseAtomic::renameTable(getContext(), table_name, *to_db_ptr, to_name, false, false);
             ++moved_tables;
         }
     }
@@ -472,7 +562,7 @@ void DatabaseReplicated::recoverLostReplica(const ZooKeeperPtr & current_zookeep
         /// TODO Maybe we should do it in two steps: rename all tables to temporary names and then rename them to actual names?
         DDLGuardPtr table_guard = DatabaseCatalog::instance().getDDLGuard(db_name, std::min(from, to));
         DDLGuardPtr to_table_guard = DatabaseCatalog::instance().getDDLGuard(db_name, std::max(from, to));
-        DatabaseAtomic::renameTable(global_context, from, *this, to, false, false);
+        DatabaseAtomic::renameTable(getContext(), from, *this, to, false, false);
     }
 
     for (const auto & id : dropped_tables)
@@ -480,7 +570,7 @@ void DatabaseReplicated::recoverLostReplica(const ZooKeeperPtr & current_zookeep
 
     for (const auto & name_and_meta : table_name_to_metadata)
     {
-        if (isTableExist(name_and_meta.first, global_context))
+        if (isTableExist(name_and_meta.first, getContext()))
         {
             assert(name_and_meta.second == readMetadataFile(name_and_meta.first));
             continue;
@@ -488,11 +578,11 @@ void DatabaseReplicated::recoverLostReplica(const ZooKeeperPtr & current_zookeep
 
         auto query_ast = parseQueryFromMetadataInZooKeeper(name_and_meta.first, name_and_meta.second);
 
-        Context query_context = global_context;
-        query_context.makeQueryContext();
-        query_context.getClientInfo().query_kind = ClientInfo::QueryKind::SECONDARY_QUERY;
-        query_context.setCurrentDatabase(database_name);
-        query_context.setCurrentQueryId(""); // generate random query_id
+        auto query_context = Context::createCopy(getContext());
+        query_context->makeQueryContext();
+        query_context->getClientInfo().query_kind = ClientInfo::QueryKind::SECONDARY_QUERY;
+        query_context->setCurrentDatabase(database_name);
+        query_context->setCurrentQueryId(""); // generate random query_id
 
         LOG_INFO(log, "Executing {}", serializeAST(*query_ast));
         InterpreterCreateQuery(query_ast, query_context).execute();
@@ -554,24 +644,31 @@ ASTPtr DatabaseReplicated::parseQueryFromMetadataInZooKeeper(const String & node
 {
     ParserCreateQuery parser;
     String description = "in ZooKeeper " + zookeeper_path + "/metadata/" + node_name;
-    auto ast = parseQuery(parser, query, description, 0, global_context.getSettingsRef().max_parser_depth);
+    auto ast = parseQuery(parser, query, description, 0, getContext()->getSettingsRef().max_parser_depth);
 
     auto & create = ast->as<ASTCreateQuery &>();
-    if (create.uuid == UUIDHelpers::Nil || create.table != TABLE_WITH_UUID_NAME_PLACEHOLDER || ! create.database.empty())
+    if (create.uuid == UUIDHelpers::Nil || create.table != TABLE_WITH_UUID_NAME_PLACEHOLDER || !create.database.empty())
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Got unexpected query from {}: {}", node_name, query);
 
+    bool is_materialized_view_with_inner_table = create.is_materialized_view && create.to_table_id.empty();
+
     create.database = getDatabaseName();
     create.table = unescapeForFileName(node_name);
-    create.attach = false;
+    create.attach = is_materialized_view_with_inner_table;
 
     return ast;
 }
 
-void DatabaseReplicated::drop(const Context & context_)
+void DatabaseReplicated::drop(ContextPtr context_)
 {
     auto current_zookeeper = getZooKeeper();
-    current_zookeeper->set(replica_path, DROPPED_MARK);
+    Coordination::Requests ops;
+    ops.emplace_back(zkutil::makeSetRequest(replica_path, DROPPED_MARK, -1));
+    createEmptyLogEntry(ops, current_zookeeper);
+    current_zookeeper->multi(ops);
+
     DatabaseAtomic::drop(context_);
+
     current_zookeeper->tryRemoveRecursive(replica_path);
     /// TODO it may leave garbage in ZooKeeper if the last node lost connection here
     if (current_zookeeper->tryRemove(zookeeper_path + "/replicas") == Coordination::Error::ZOK)
@@ -595,22 +692,22 @@ void DatabaseReplicated::shutdown()
 }
 
 
-void DatabaseReplicated::dropTable(const Context & context, const String & table_name, bool no_delay)
+void DatabaseReplicated::dropTable(ContextPtr local_context, const String & table_name, bool no_delay)
 {
-    auto txn = context.getZooKeeperMetadataTransaction();
-    assert(!ddl_worker->isCurrentlyActive() || txn);
+    auto txn = local_context->getZooKeeperMetadataTransaction();
+    assert(!ddl_worker->isCurrentlyActive() || txn || startsWith(table_name, ".inner_id."));
     if (txn && txn->isInitialQuery())
     {
         String metadata_zk_path = zookeeper_path + "/metadata/" + escapeForFileName(table_name);
         txn->addOp(zkutil::makeRemoveRequest(metadata_zk_path, -1));
     }
-    DatabaseAtomic::dropTable(context, table_name, no_delay);
+    DatabaseAtomic::dropTable(local_context, table_name, no_delay);
 }
 
-void DatabaseReplicated::renameTable(const Context & context, const String & table_name, IDatabase & to_database,
+void DatabaseReplicated::renameTable(ContextPtr local_context, const String & table_name, IDatabase & to_database,
                                      const String & to_table_name, bool exchange, bool dictionary)
 {
-    auto txn = context.getZooKeeperMetadataTransaction();
+    auto txn = local_context->getZooKeeperMetadataTransaction();
     assert(txn);
 
     if (txn->isInitialQuery())
@@ -619,9 +716,9 @@ void DatabaseReplicated::renameTable(const Context & context, const String & tab
             throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Moving tables between databases is not supported for Replicated engine");
         if (table_name == to_table_name)
             throw Exception(ErrorCodes::INCORRECT_QUERY, "Cannot rename table to itself");
-        if (!isTableExist(table_name, context))
+        if (!isTableExist(table_name, local_context))
             throw Exception(ErrorCodes::UNKNOWN_TABLE, "Table {} does not exist", table_name);
-        if (exchange && !to_database.isTableExist(to_table_name, context))
+        if (exchange && !to_database.isTableExist(to_table_name, local_context))
             throw Exception(ErrorCodes::UNKNOWN_TABLE, "Table {} does not exist", to_table_name);
 
         String statement = readMetadataFile(table_name);
@@ -637,14 +734,14 @@ void DatabaseReplicated::renameTable(const Context & context, const String & tab
         txn->addOp(zkutil::makeCreateRequest(metadata_zk_path_to, statement, zkutil::CreateMode::Persistent));
     }
 
-    DatabaseAtomic::renameTable(context, table_name, to_database, to_table_name, exchange, dictionary);
+    DatabaseAtomic::renameTable(local_context, table_name, to_database, to_table_name, exchange, dictionary);
 }
 
 void DatabaseReplicated::commitCreateTable(const ASTCreateQuery & query, const StoragePtr & table,
                        const String & table_metadata_tmp_path, const String & table_metadata_path,
-                       const Context & query_context)
+                       ContextPtr query_context)
 {
-    auto txn = query_context.getZooKeeperMetadataTransaction();
+    auto txn = query_context->getZooKeeperMetadataTransaction();
     assert(!ddl_worker->isCurrentlyActive() || txn);
     if (txn && txn->isInitialQuery())
     {
@@ -658,9 +755,9 @@ void DatabaseReplicated::commitCreateTable(const ASTCreateQuery & query, const S
 
 void DatabaseReplicated::commitAlterTable(const StorageID & table_id,
                                           const String & table_metadata_tmp_path, const String & table_metadata_path,
-                                          const String & statement, const Context & query_context)
+                                          const String & statement, ContextPtr query_context)
 {
-    auto txn = query_context.getZooKeeperMetadataTransaction();
+    auto txn = query_context->getZooKeeperMetadataTransaction();
     if (txn && txn->isInitialQuery())
     {
         String metadata_zk_path = zookeeper_path + "/metadata/" + escapeForFileName(table_id.table_name);
@@ -669,11 +766,11 @@ void DatabaseReplicated::commitAlterTable(const StorageID & table_id,
     DatabaseAtomic::commitAlterTable(table_id, table_metadata_tmp_path, table_metadata_path, statement, query_context);
 }
 
-void DatabaseReplicated::createDictionary(const Context & context,
+void DatabaseReplicated::createDictionary(ContextPtr local_context,
                                           const String & dictionary_name,
                                           const ASTPtr & query)
 {
-    auto txn = context.getZooKeeperMetadataTransaction();
+    auto txn = local_context->getZooKeeperMetadataTransaction();
     assert(!ddl_worker->isCurrentlyActive() || txn);
     if (txn && txn->isInitialQuery())
     {
@@ -681,33 +778,49 @@ void DatabaseReplicated::createDictionary(const Context & context,
         String statement = getObjectDefinitionFromCreateQuery(query->clone());
         txn->addOp(zkutil::makeCreateRequest(metadata_zk_path, statement, zkutil::CreateMode::Persistent));
     }
-    DatabaseAtomic::createDictionary(context, dictionary_name, query);
+    DatabaseAtomic::createDictionary(local_context, dictionary_name, query);
 }
 
-void DatabaseReplicated::removeDictionary(const Context & context, const String & dictionary_name)
+void DatabaseReplicated::removeDictionary(ContextPtr local_context, const String & dictionary_name)
 {
-    auto txn = context.getZooKeeperMetadataTransaction();
+    auto txn = local_context->getZooKeeperMetadataTransaction();
     assert(!ddl_worker->isCurrentlyActive() || txn);
     if (txn && txn->isInitialQuery())
     {
         String metadata_zk_path = zookeeper_path + "/metadata/" + escapeForFileName(dictionary_name);
         txn->addOp(zkutil::makeRemoveRequest(metadata_zk_path, -1));
     }
-    DatabaseAtomic::removeDictionary(context, dictionary_name);
+    DatabaseAtomic::removeDictionary(local_context, dictionary_name);
 }
 
-void DatabaseReplicated::detachTablePermanently(const Context & context, const String & table_name)
+void DatabaseReplicated::detachTablePermanently(ContextPtr local_context, const String & table_name)
 {
-    auto txn = context.getZooKeeperMetadataTransaction();
+    auto txn = local_context->getZooKeeperMetadataTransaction();
     assert(!ddl_worker->isCurrentlyActive() || txn);
     if (txn && txn->isInitialQuery())
     {
+        /// We have to remove metadata from zookeeper, because we do not distinguish permanently detached tables
+        /// from attached tables when recovering replica.
         String metadata_zk_path = zookeeper_path + "/metadata/" + escapeForFileName(table_name);
         txn->addOp(zkutil::makeRemoveRequest(metadata_zk_path, -1));
     }
-    DatabaseAtomic::detachTablePermanently(context, table_name);
+    DatabaseAtomic::detachTablePermanently(local_context, table_name);
 }
 
+void DatabaseReplicated::removeDetachedPermanentlyFlag(ContextPtr local_context, const String & table_name, const String & table_metadata_path, bool attach) const
+{
+    auto txn = local_context->getZooKeeperMetadataTransaction();
+    assert(!ddl_worker->isCurrentlyActive() || txn);
+    if (txn && txn->isInitialQuery() && attach)
+    {
+        String metadata_zk_path = zookeeper_path + "/metadata/" + escapeForFileName(table_name);
+        String statement = readMetadataFile(table_name);
+        txn->addOp(zkutil::makeCreateRequest(metadata_zk_path, statement, zkutil::CreateMode::Persistent));
+    }
+    DatabaseAtomic::removeDetachedPermanentlyFlag(local_context, table_name, table_metadata_path, attach);
+}
+
+
 String DatabaseReplicated::readMetadataFile(const String & table_name) const
 {
     String statement;
diff --git a/src/Databases/DatabaseReplicated.h b/src/Databases/DatabaseReplicated.h
index fde53cf2c29..5220535f095 100644
--- a/src/Databases/DatabaseReplicated.h
+++ b/src/Databases/DatabaseReplicated.h
@@ -24,31 +24,32 @@ public:
     DatabaseReplicated(const String & name_, const String & metadata_path_, UUID uuid,
                        const String & zookeeper_path_, const String & shard_name_, const String & replica_name_,
                        DatabaseReplicatedSettings db_settings_,
-                       const Context & context);
+                       ContextPtr context);
 
     ~DatabaseReplicated() override;
 
     String getEngineName() const override { return "Replicated"; }
 
     /// If current query is initial, then the following methods add metadata updating ZooKeeper operations to current ZooKeeperMetadataTransaction.
-    void dropTable(const Context &, const String & table_name, bool no_delay) override;
-    void renameTable(const Context & context, const String & table_name, IDatabase & to_database,
+    void dropTable(ContextPtr, const String & table_name, bool no_delay) override;
+    void renameTable(ContextPtr context, const String & table_name, IDatabase & to_database,
                      const String & to_table_name, bool exchange, bool dictionary) override;
     void commitCreateTable(const ASTCreateQuery & query, const StoragePtr & table,
                            const String & table_metadata_tmp_path, const String & table_metadata_path,
-                           const Context & query_context) override;
+                           ContextPtr query_context) override;
     void commitAlterTable(const StorageID & table_id,
                           const String & table_metadata_tmp_path, const String & table_metadata_path,
-                          const String & statement, const Context & query_context) override;
-    void createDictionary(const Context & context,
+                          const String & statement, ContextPtr query_context) override;
+    void createDictionary(ContextPtr context,
                           const String & dictionary_name,
                           const ASTPtr & query) override;
-    void removeDictionary(const Context & context, const String & dictionary_name) override;
-    void detachTablePermanently(const Context & context, const String & table_name) override;
+    void removeDictionary(ContextPtr context, const String & dictionary_name) override;
+    void detachTablePermanently(ContextPtr context, const String & table_name) override;
+    void removeDetachedPermanentlyFlag(ContextPtr context, const String & table_name, const String & table_metadata_path, bool attach) const override;
 
     /// Try to execute DLL query on current host as initial query. If query is succeed,
     /// then it will be executed on all replicas.
-    BlockIO tryEnqueueReplicatedDDL(const ASTPtr & query, const Context & query_context);
+    BlockIO tryEnqueueReplicatedDDL(const ASTPtr & query, ContextPtr query_context);
 
     void stopReplication();
 
@@ -58,9 +59,9 @@ public:
     /// Returns cluster consisting of database replicas
     ClusterPtr getCluster() const;
 
-    void drop(const Context & /*context*/) override;
+    void drop(ContextPtr /*context*/) override;
 
-    void loadStoredObjects(Context & context, bool has_force_restore_data_flag, bool force_attach) override;
+    void loadStoredObjects(ContextPtr context, bool has_force_restore_data_flag, bool force_attach) override;
     void shutdown() override;
 
     friend struct DatabaseReplicatedTask;
@@ -70,12 +71,19 @@ private:
     bool createDatabaseNodesInZooKeeper(const ZooKeeperPtr & current_zookeeper);
     void createReplicaNodesInZooKeeper(const ZooKeeperPtr & current_zookeeper);
 
+    void checkQueryValid(const ASTPtr & query, ContextPtr query_context) const;
+
     void recoverLostReplica(const ZooKeeperPtr & current_zookeeper, UInt32 our_log_ptr, UInt32 max_log_ptr);
     std::map<String, String> tryGetConsistentMetadataSnapshot(const ZooKeeperPtr & zookeeper, UInt32 & max_log_ptr);
 
     ASTPtr parseQueryFromMetadataInZooKeeper(const String & node_name, const String & query);
     String readMetadataFile(const String & table_name) const;
 
+    ClusterPtr getClusterImpl() const;
+    void setCluster(ClusterPtr && new_cluster);
+
+    void createEmptyLogEntry(Coordination::Requests & ops, const ZooKeeperPtr & current_zookeeper);
+
     String zookeeper_path;
     String shard_name;
     String replica_name;
@@ -86,6 +94,8 @@ private:
 
     std::atomic_bool is_readonly = true;
     std::unique_ptr<DatabaseReplicatedDDLWorker> ddl_worker;
+
+    mutable ClusterPtr cluster;
 };
 
 }
diff --git a/src/Databases/DatabaseReplicatedSettings.h b/src/Databases/DatabaseReplicatedSettings.h
index 11d5b3820e4..43003af1120 100644
--- a/src/Databases/DatabaseReplicatedSettings.h
+++ b/src/Databases/DatabaseReplicatedSettings.h
@@ -11,6 +11,9 @@ class ASTStorage;
     M(Float, max_broken_tables_ratio, 0.5, "Do not recover replica automatically if the ratio of staled tables to all tables is greater", 0) \
     M(UInt64, max_replication_lag_to_enqueue, 10, "Replica will throw exception on attempt to execute query if its replication lag greater", 0) \
     M(UInt64, wait_entry_commited_timeout_sec, 3600, "Replicas will try to cancel query if timeout exceed, but initiator host has not executed it yet", 0) \
+    M(String, cluster_username, "default", "Username to use when connecting to hosts of cluster", 0) \
+    M(String, cluster_password, "", "Password to use when connecting to hosts of cluster", 0) \
+    M(Bool, cluster_secure_connection, false, "Enable TLS when connecting to hosts of cluster", 0) \
 
 DECLARE_SETTINGS_TRAITS(DatabaseReplicatedSettingsTraits, LIST_OF_DATABASE_REPLICATED_SETTINGS)
 
diff --git a/src/Databases/DatabaseReplicatedWorker.cpp b/src/Databases/DatabaseReplicatedWorker.cpp
index e0c5717711c..9ae4d026bf0 100644
--- a/src/Databases/DatabaseReplicatedWorker.cpp
+++ b/src/Databases/DatabaseReplicatedWorker.cpp
@@ -13,7 +13,7 @@ namespace ErrorCodes
     extern const int UNFINISHED;
 }
 
-DatabaseReplicatedDDLWorker::DatabaseReplicatedDDLWorker(DatabaseReplicated * db, const Context & context_)
+DatabaseReplicatedDDLWorker::DatabaseReplicatedDDLWorker(DatabaseReplicated * db, ContextPtr context_)
     : DDLWorker(/* pool_size */ 1, db->zookeeper_path + "/log", context_, nullptr, {}, fmt::format("DDLWorker({})", db->getDatabaseName()))
     , database(db)
 {
@@ -22,7 +22,7 @@ DatabaseReplicatedDDLWorker::DatabaseReplicatedDDLWorker(DatabaseReplicated * db
     /// We also need similar graph to load tables on server startup in order of topsort.
 }
 
-void DatabaseReplicatedDDLWorker::initializeMainThread()
+bool DatabaseReplicatedDDLWorker::initializeMainThread()
 {
     while (!stop_flag)
     {
@@ -33,7 +33,7 @@ void DatabaseReplicatedDDLWorker::initializeMainThread()
                 database->tryConnectToZooKeeperAndInitDatabase(false);
             initializeReplication();
             initialized = true;
-            return;
+            return true;
         }
         catch (...)
         {
@@ -41,6 +41,8 @@ void DatabaseReplicatedDDLWorker::initializeMainThread()
             sleepForSeconds(5);
         }
     }
+
+    return false;
 }
 
 void DatabaseReplicatedDDLWorker::shutdown()
@@ -61,7 +63,7 @@ void DatabaseReplicatedDDLWorker::initializeReplication()
     if (our_log_ptr == 0 || our_log_ptr + logs_to_keep < max_log_ptr)
         database->recoverLostReplica(current_zookeeper, our_log_ptr, max_log_ptr);
     else
-        last_skipped_entry_name.emplace(log_ptr_str);
+        last_skipped_entry_name.emplace(DDLTaskBase::getLogEntryName(our_log_ptr));
 }
 
 String DatabaseReplicatedDDLWorker::enqueueQuery(DDLLogEntry & entry)
@@ -89,7 +91,7 @@ String DatabaseReplicatedDDLWorker::enqueueQuery(DDLLogEntry & entry)
     return node_path;
 }
 
-String DatabaseReplicatedDDLWorker::tryEnqueueAndExecuteEntry(DDLLogEntry & entry, const Context & query_context)
+String DatabaseReplicatedDDLWorker::tryEnqueueAndExecuteEntry(DDLLogEntry & entry, ContextPtr query_context)
 {
     /// NOTE Possibly it would be better to execute initial query on the most up-to-date node,
     /// but it requires more complex logic around /try node.
@@ -113,7 +115,7 @@ String DatabaseReplicatedDDLWorker::tryEnqueueAndExecuteEntry(DDLLogEntry & entr
     task->is_initial_query = true;
 
     LOG_DEBUG(log, "Waiting for worker thread to process all entries before {}", entry_name);
-    UInt64 timeout = query_context.getSettingsRef().database_replicated_initial_query_timeout_sec;
+    UInt64 timeout = query_context->getSettingsRef().database_replicated_initial_query_timeout_sec;
     {
         std::unique_lock lock{mutex};
         bool processed = wait_current_task_change.wait_for(lock, std::chrono::seconds(timeout), [&]()
@@ -123,7 +125,7 @@ String DatabaseReplicatedDDLWorker::tryEnqueueAndExecuteEntry(DDLLogEntry & entr
         });
 
         if (!processed)
-            throw Exception(ErrorCodes::UNFINISHED, "Timeout: Cannot enqueue query on this replica,"
+            throw Exception(ErrorCodes::UNFINISHED, "Timeout: Cannot enqueue query on this replica, "
                             "most likely because replica is busy with previous queue entries");
     }
 
@@ -235,6 +237,8 @@ DDLTaskPtr DatabaseReplicatedDDLWorker::initAndCheckTask(const String & entry_na
 
     if (task->entry.query.empty())
     {
+        /// Some replica is added or removed, let's update cached cluster
+        database->setCluster(database->getClusterImpl());
         out_reason = fmt::format("Entry {} is a dummy task", entry_name);
         return {};
     }
diff --git a/src/Databases/DatabaseReplicatedWorker.h b/src/Databases/DatabaseReplicatedWorker.h
index 6ba46a98bca..16ad100b81a 100644
--- a/src/Databases/DatabaseReplicatedWorker.h
+++ b/src/Databases/DatabaseReplicatedWorker.h
@@ -21,16 +21,16 @@ class DatabaseReplicated;
 class DatabaseReplicatedDDLWorker : public DDLWorker
 {
 public:
-    DatabaseReplicatedDDLWorker(DatabaseReplicated * db, const Context & context_);
+    DatabaseReplicatedDDLWorker(DatabaseReplicated * db, ContextPtr context_);
 
     String enqueueQuery(DDLLogEntry & entry) override;
 
-    String tryEnqueueAndExecuteEntry(DDLLogEntry & entry, const Context & query_context);
+    String tryEnqueueAndExecuteEntry(DDLLogEntry & entry, ContextPtr query_context);
 
     void shutdown() override;
 
 private:
-    void initializeMainThread() override;
+    bool initializeMainThread() override;
     void initializeReplication();
 
     DDLTaskPtr initAndCheckTask(const String & entry_name, String & out_reason, const ZooKeeperPtr & zookeeper) override;
diff --git a/src/Databases/DatabaseWithDictionaries.cpp b/src/Databases/DatabaseWithDictionaries.cpp
index d92f0f1897e..c97417e292c 100644
--- a/src/Databases/DatabaseWithDictionaries.cpp
+++ b/src/Databases/DatabaseWithDictionaries.cpp
@@ -49,7 +49,7 @@ void DatabaseWithDictionaries::attachDictionary(const String & dictionary_name,
         /// Attach the dictionary as table too.
         try
         {
-            /// TODO Make StorageDictionary an owner of IDictionaryBase objects.
+            /// TODO Make StorageDictionary an owner of IDictionary objects.
             /// All DDL operations with dictionaries will work with StorageDictionary table,
             /// and StorageDictionary will be responsible for loading of DDL dictionaries.
             /// ExternalLoaderDatabaseConfigRepository and other hacks related to ExternalLoader
@@ -125,9 +125,9 @@ void DatabaseWithDictionaries::detachDictionaryImpl(const String & dictionary_na
         detachTable(dictionary_name);
 }
 
-void DatabaseWithDictionaries::createDictionary(const Context & context, const String & dictionary_name, const ASTPtr & query)
+void DatabaseWithDictionaries::createDictionary(ContextPtr local_context, const String & dictionary_name, const ASTPtr & query)
 {
-    const auto & settings = context.getSettingsRef();
+    const auto & settings = local_context->getSettingsRef();
 
     /** The code is based on the assumption that all threads share the same order of operations:
       * - create the .sql.tmp file;
@@ -151,7 +151,7 @@ void DatabaseWithDictionaries::createDictionary(const Context & context, const S
         throw Exception(ErrorCodes::DICTIONARY_ALREADY_EXISTS,
                         "Dictionary {} already exists.", dict_id.getFullNameNotQuoted());
 
-    if (isTableExist(dictionary_name, global_context))
+    if (isTableExist(dictionary_name, getContext()))
         throw Exception(ErrorCodes::TABLE_ALREADY_EXISTS, "Table {} already exists.", dict_id.getFullTableName());
 
     String dictionary_metadata_path = getObjectMetadataPath(dictionary_name);
@@ -169,17 +169,28 @@ void DatabaseWithDictionaries::createDictionary(const Context & context, const S
     }
 
     bool succeeded = false;
+    bool uuid_locked = false;
     SCOPE_EXIT({
         if (!succeeded)
+        {
+            if (uuid_locked)
+                DatabaseCatalog::instance().removeUUIDMappingFinally(dict_id.uuid);
             Poco::File(dictionary_metadata_tmp_path).remove();
+        }
     });
 
+    if (dict_id.uuid != UUIDHelpers::Nil)
+    {
+        DatabaseCatalog::instance().addUUIDMapping(dict_id.uuid);
+        uuid_locked = true;
+    }
+
     /// Add a temporary repository containing the dictionary.
     /// We need this temp repository to try loading the dictionary before actually attaching it to the database.
     auto temp_repository = external_loader.addConfigRepository(std::make_unique<ExternalLoaderTempConfigRepository>(
-        getDatabaseName(), dictionary_metadata_tmp_path, getDictionaryConfigurationFromAST(query->as<const ASTCreateQuery &>(), context)));
+        getDatabaseName(), dictionary_metadata_tmp_path, getDictionaryConfigurationFromAST(query->as<const ASTCreateQuery &>(), local_context)));
 
-    bool lazy_load = context.getConfigRef().getBool("dictionaries_lazy_load", true);
+    bool lazy_load = local_context->getConfigRef().getBool("dictionaries_lazy_load", true);
     if (!lazy_load)
     {
         /// load() is called here to force loading the dictionary, wait until the loading is finished,
@@ -187,15 +198,15 @@ void DatabaseWithDictionaries::createDictionary(const Context & context, const S
         external_loader.load(dict_id.getInternalDictionaryName());
     }
 
-    auto config = getDictionaryConfigurationFromAST(query->as<const ASTCreateQuery &>(), context);
+    auto config = getDictionaryConfigurationFromAST(query->as<const ASTCreateQuery &>(), local_context);
     attachDictionary(dictionary_name, DictionaryAttachInfo{query, config, time(nullptr)});
     SCOPE_EXIT({
         if (!succeeded)
             detachDictionary(dictionary_name);
     });
 
-    auto txn = context.getZooKeeperMetadataTransaction();
-    if (txn && !context.isInternalSubquery())
+    auto txn = local_context->getZooKeeperMetadataTransaction();
+    if (txn && !local_context->isInternalSubquery())
         txn->commit();      /// Commit point (a sort of) for Replicated database
 
     /// If it was ATTACH query and file with dictionary metadata already exist
@@ -210,7 +221,7 @@ void DatabaseWithDictionaries::createDictionary(const Context & context, const S
     succeeded = true;
 }
 
-void DatabaseWithDictionaries::removeDictionary(const Context & context, const String & dictionary_name)
+void DatabaseWithDictionaries::removeDictionary(ContextPtr local_context, const String & dictionary_name)
 {
     DictionaryAttachInfo attach_info;
     detachDictionaryImpl(dictionary_name, attach_info);
@@ -219,8 +230,8 @@ void DatabaseWithDictionaries::removeDictionary(const Context & context, const S
     {
         String dictionary_metadata_path = getObjectMetadataPath(dictionary_name);
 
-        auto txn = context.getZooKeeperMetadataTransaction();
-        if (txn && !context.isInternalSubquery())
+        auto txn = local_context->getZooKeeperMetadataTransaction();
+        if (txn && !local_context->isInternalSubquery())
             txn->commit();      /// Commit point (a sort of) for Replicated database
 
         Poco::File(dictionary_metadata_path).remove();
@@ -335,7 +346,7 @@ void DatabaseWithDictionaries::reloadDictionaryConfig(const String & full_name)
     /// Ensure that this database is attached to ExternalLoader as a config repository.
     if (!database_as_config_repo_for_external_loader.load())
     {
-        auto repository = std::make_unique<ExternalLoaderDatabaseConfigRepository>(*this, global_context);
+        auto repository = std::make_unique<ExternalLoaderDatabaseConfigRepository>(*this, getContext());
         auto remove_repository_callback = external_loader.addConfigRepository(std::move(repository));
         database_as_config_repo_for_external_loader = boost::make_shared<ext::scope_guard>(std::move(remove_repository_callback));
     }
@@ -359,9 +370,9 @@ void DatabaseWithDictionaries::shutdown()
 
 
 DatabaseWithDictionaries::DatabaseWithDictionaries(
-    const String & name, const String & metadata_path_, const String & data_path_, const String & logger, const Context & context)
-    : DatabaseOnDisk(name, metadata_path_, data_path_, logger, context)
-    , external_loader(context.getExternalDictionariesLoader())
+    const String & name, const String & metadata_path_, const String & data_path_, const String & logger, ContextPtr context_)
+    : DatabaseOnDisk(name, metadata_path_, data_path_, logger, context_)
+    , external_loader(context_->getExternalDictionariesLoader())
 {
 }
 
diff --git a/src/Databases/DatabaseWithDictionaries.h b/src/Databases/DatabaseWithDictionaries.h
index d69289d7456..d10908c7c06 100644
--- a/src/Databases/DatabaseWithDictionaries.h
+++ b/src/Databases/DatabaseWithDictionaries.h
@@ -17,11 +17,11 @@ public:
 
     void detachDictionary(const String & dictionary_name) override;
 
-    void createDictionary(const Context & context,
+    void createDictionary(ContextPtr context,
                           const String & dictionary_name,
                           const ASTPtr & query) override;
 
-    void removeDictionary(const Context & context, const String & dictionary_name) override;
+    void removeDictionary(ContextPtr context, const String & dictionary_name) override;
 
     bool isDictionaryExist(const String & dictionary_name) const override;
 
@@ -38,7 +38,7 @@ public:
     ~DatabaseWithDictionaries() override;
 
 protected:
-    DatabaseWithDictionaries(const String & name, const String & metadata_path_, const String & data_path_, const String & logger, const Context & context);
+    DatabaseWithDictionaries(const String & name, const String & metadata_path_, const String & data_path_, const String & logger, ContextPtr context);
 
     ASTPtr getCreateDictionaryQueryImpl(const String & dictionary_name, bool throw_on_error) const override;
 
diff --git a/src/Databases/DatabasesCommon.cpp b/src/Databases/DatabasesCommon.cpp
index 2d3d206162b..9329b0a4210 100644
--- a/src/Databases/DatabasesCommon.cpp
+++ b/src/Databases/DatabasesCommon.cpp
@@ -20,18 +20,18 @@ namespace ErrorCodes
     extern const int UNKNOWN_DATABASE;
 }
 
-DatabaseWithOwnTablesBase::DatabaseWithOwnTablesBase(const String & name_, const String & logger, const Context & context)
-        : IDatabase(name_), log(&Poco::Logger::get(logger)), global_context(context.getGlobalContext())
+DatabaseWithOwnTablesBase::DatabaseWithOwnTablesBase(const String & name_, const String & logger, ContextPtr context_)
+        : IDatabase(name_), WithContext(context_->getGlobalContext()), log(&Poco::Logger::get(logger))
 {
 }
 
-bool DatabaseWithOwnTablesBase::isTableExist(const String & table_name, const Context &) const
+bool DatabaseWithOwnTablesBase::isTableExist(const String & table_name, ContextPtr) const
 {
     std::lock_guard lock(mutex);
     return tables.find(table_name) != tables.end();
 }
 
-StoragePtr DatabaseWithOwnTablesBase::tryGetTable(const String & table_name, const Context &) const
+StoragePtr DatabaseWithOwnTablesBase::tryGetTable(const String & table_name, ContextPtr) const
 {
     std::lock_guard lock(mutex);
     auto it = tables.find(table_name);
@@ -40,7 +40,7 @@ StoragePtr DatabaseWithOwnTablesBase::tryGetTable(const String & table_name, con
     return {};
 }
 
-DatabaseTablesIteratorPtr DatabaseWithOwnTablesBase::getTablesIterator(const Context &, const FilterByNameFunction & filter_by_table_name)
+DatabaseTablesIteratorPtr DatabaseWithOwnTablesBase::getTablesIterator(ContextPtr, const FilterByNameFunction & filter_by_table_name)
 {
     std::lock_guard lock(mutex);
     if (!filter_by_table_name)
diff --git a/src/Databases/DatabasesCommon.h b/src/Databases/DatabasesCommon.h
index 5e1e555a524..da1bd6c1852 100644
--- a/src/Databases/DatabasesCommon.h
+++ b/src/Databases/DatabasesCommon.h
@@ -16,12 +16,12 @@ namespace DB
 class Context;
 
 /// A base class for databases that manage their own list of tables.
-class DatabaseWithOwnTablesBase : public IDatabase
+class DatabaseWithOwnTablesBase : public IDatabase, protected WithContext
 {
 public:
-    bool isTableExist(const String & table_name, const Context & context) const override;
+    bool isTableExist(const String & table_name, ContextPtr context) const override;
 
-    StoragePtr tryGetTable(const String & table_name, const Context & context) const override;
+    StoragePtr tryGetTable(const String & table_name, ContextPtr context) const override;
 
     bool empty() const override;
 
@@ -29,7 +29,7 @@ public:
 
     StoragePtr detachTable(const String & table_name) override;
 
-    DatabaseTablesIteratorPtr getTablesIterator(const Context & context, const FilterByNameFunction & filter_by_table_name) override;
+    DatabaseTablesIteratorPtr getTablesIterator(ContextPtr context, const FilterByNameFunction & filter_by_table_name) override;
 
     void shutdown() override;
 
@@ -38,9 +38,8 @@ public:
 protected:
     Tables tables;
     Poco::Logger * log;
-    const Context & global_context;
 
-    DatabaseWithOwnTablesBase(const String & name_, const String & logger, const Context & context);
+    DatabaseWithOwnTablesBase(const String & name_, const String & logger, ContextPtr context);
 
     void attachTableUnlocked(const String & table_name, const StoragePtr & table, std::unique_lock<std::mutex> & lock);
     StoragePtr detachTableUnlocked(const String & table_name, std::unique_lock<std::mutex> & lock);
diff --git a/src/Databases/IDatabase.h b/src/Databases/IDatabase.h
index 3a196f827b7..8c356b88460 100644
--- a/src/Databases/IDatabase.h
+++ b/src/Databases/IDatabase.h
@@ -10,6 +10,7 @@
 
 #include <boost/range/adaptor/map.hpp>
 #include <boost/range/algorithm/copy.hpp>
+
 #include <ctime>
 #include <functional>
 #include <memory>
@@ -18,7 +19,6 @@
 namespace DB
 {
 
-class Context;
 struct Settings;
 struct ConstraintsDescription;
 struct IndicesDescription;
@@ -153,10 +153,10 @@ public:
 
     /// Load a set of existing tables.
     /// You can call only once, right after the object is created.
-    virtual void loadStoredObjects(Context & /*context*/, bool /*has_force_restore_data_flag*/, bool /*force_attach*/ = false) {}
+    virtual void loadStoredObjects(ContextPtr /*context*/, bool /*has_force_restore_data_flag*/, bool /*force_attach*/ = false) {}
 
     /// Check the existence of the table.
-    virtual bool isTableExist(const String & name, const Context & context) const = 0;
+    virtual bool isTableExist(const String & name, ContextPtr context) const = 0;
 
     /// Check the existence of the dictionary
     virtual bool isDictionaryExist(const String & /*name*/) const
@@ -165,7 +165,7 @@ public:
     }
 
     /// Get the table for work. Return nullptr if there is no table.
-    virtual StoragePtr tryGetTable(const String & name, const Context & context) const = 0;
+    virtual StoragePtr tryGetTable(const String & name, ContextPtr context) const = 0;
 
     virtual UUID tryGetTableUUID(const String & /*table_name*/) const { return UUIDHelpers::Nil; }
 
@@ -173,7 +173,7 @@ public:
 
     /// Get an iterator that allows you to pass through all the tables.
     /// It is possible to have "hidden" tables that are not visible when passing through, but are visible if you get them by name using the functions above.
-    virtual DatabaseTablesIteratorPtr getTablesIterator(const Context & context, const FilterByNameFunction & filter_by_table_name = {}) = 0;
+    virtual DatabaseTablesIteratorPtr getTablesIterator(ContextPtr context, const FilterByNameFunction & filter_by_table_name = {}) = 0;
 
     /// Get an iterator to pass through all the dictionaries.
     virtual DatabaseDictionariesIteratorPtr getDictionariesIterator([[maybe_unused]] const FilterByNameFunction & filter_by_dictionary_name = {})
@@ -186,7 +186,7 @@ public:
 
     /// Add the table to the database. Record its presence in the metadata.
     virtual void createTable(
-        const Context & /*context*/,
+        ContextPtr /*context*/,
         const String & /*name*/,
         const StoragePtr & /*table*/,
         const ASTPtr & /*query*/)
@@ -196,7 +196,7 @@ public:
 
     /// Add the dictionary to the database. Record its presence in the metadata.
     virtual void createDictionary(
-        const Context & /*context*/,
+        ContextPtr /*context*/,
         const String & /*dictionary_name*/,
         const ASTPtr & /*query*/)
     {
@@ -205,7 +205,7 @@ public:
 
     /// Delete the table from the database, drop table and delete the metadata.
     virtual void dropTable(
-        const Context & /*context*/,
+        ContextPtr /*context*/,
         const String & /*name*/,
         [[maybe_unused]] bool no_delay = false)
     {
@@ -214,7 +214,7 @@ public:
 
     /// Delete the dictionary from the database. Delete the metadata.
     virtual void removeDictionary(
-        const Context & /*context*/,
+        ContextPtr /*context*/,
         const String & /*dictionary_name*/)
     {
         throw Exception("There is no DROP DICTIONARY query for Database" + getEngineName(), ErrorCodes::NOT_IMPLEMENTED);
@@ -249,14 +249,14 @@ public:
 
     /// Forget about the table without deleting it's data, but rename metadata file to prevent reloading it
     /// with next restart. The database may not support this method.
-    virtual void detachTablePermanently(const Context & /*context*/, const String & /*name*/)
+    virtual void detachTablePermanently(ContextPtr /*context*/, const String & /*name*/)
     {
         throw Exception("There is no DETACH TABLE PERMANENTLY query for Database" + getEngineName(), ErrorCodes::NOT_IMPLEMENTED);
     }
 
     /// Rename the table and possibly move the table to another database.
     virtual void renameTable(
-        const Context & /*context*/,
+        ContextPtr /*context*/,
         const String & /*name*/,
         IDatabase & /*to_database*/,
         const String & /*to_name*/,
@@ -271,7 +271,7 @@ public:
     /// Change the table structure in metadata.
     /// You must call under the alter_lock of the corresponding table . If engine_modifier is empty, then engine does not change.
     virtual void alterTable(
-        const Context & /*context*/,
+        ContextPtr /*context*/,
         const StorageID & /*table_id*/,
         const StorageInMemoryMetadata & /*metadata*/)
     {
@@ -285,12 +285,12 @@ public:
     }
 
     /// Get the CREATE TABLE query for the table. It can also provide information for detached tables for which there is metadata.
-    ASTPtr tryGetCreateTableQuery(const String & name, const Context & context) const noexcept
+    ASTPtr tryGetCreateTableQuery(const String & name, ContextPtr context) const noexcept
     {
         return getCreateTableQueryImpl(name, context, false);
     }
 
-    ASTPtr getCreateTableQuery(const String & name, const Context & context) const
+    ASTPtr getCreateTableQuery(const String & name, ContextPtr context) const
     {
         return getCreateTableQueryImpl(name, context, true);
     }
@@ -345,18 +345,19 @@ public:
 
     virtual void assertCanBeDetached(bool /*cleanup*/) {}
 
-    virtual void waitDetachedTableNotInUse(const UUID & /*uuid*/) { assert(false); }
+    virtual void waitDetachedTableNotInUse(const UUID & /*uuid*/) { }
+    virtual void checkDetachedTableNotInUse(const UUID & /*uuid*/) { }
 
     /// Ask all tables to complete the background threads they are using and delete all table objects.
     virtual void shutdown() = 0;
 
     /// Delete data and metadata stored inside the database, if exists.
-    virtual void drop(const Context & /*context*/) {}
+    virtual void drop(ContextPtr /*context*/) {}
 
-    virtual ~IDatabase() {}
+    virtual ~IDatabase() = default;
 
 protected:
-    virtual ASTPtr getCreateTableQueryImpl(const String & /*name*/, const Context & /*context*/, bool throw_on_error) const
+    virtual ASTPtr getCreateTableQueryImpl(const String & /*name*/, ContextPtr /*context*/, bool throw_on_error) const
     {
         if (throw_on_error)
             throw Exception("There is no SHOW CREATE TABLE query for Database" + getEngineName(), ErrorCodes::CANNOT_GET_CREATE_TABLE_QUERY);
diff --git a/src/Databases/MySQL/ConnectionMySQLSettings.cpp b/src/Databases/MySQL/ConnectionMySQLSettings.cpp
index fa92e793225..1026d14018b 100644
--- a/src/Databases/MySQL/ConnectionMySQLSettings.cpp
+++ b/src/Databases/MySQL/ConnectionMySQLSettings.cpp
@@ -50,12 +50,12 @@ void ConnectionMySQLSettings::loadFromQuery(ASTStorage & storage_def)
 #undef ADD_IF_ABSENT
 }
 
-void ConnectionMySQLSettings::loadFromQueryContext(const Context & context)
+void ConnectionMySQLSettings::loadFromQueryContext(ContextPtr context)
 {
-    if (!context.hasQueryContext())
+    if (!context->hasQueryContext())
         return;
 
-    const Settings & settings = context.getQueryContext().getSettingsRef();
+    const Settings & settings = context->getQueryContext()->getSettingsRef();
 
     if (settings.mysql_datatypes_support_level.value != mysql_datatypes_support_level.value)
         set("mysql_datatypes_support_level", settings.mysql_datatypes_support_level.toString());
diff --git a/src/Databases/MySQL/ConnectionMySQLSettings.h b/src/Databases/MySQL/ConnectionMySQLSettings.h
index ce2773307c5..f05985a0cda 100644
--- a/src/Databases/MySQL/ConnectionMySQLSettings.h
+++ b/src/Databases/MySQL/ConnectionMySQLSettings.h
@@ -1,13 +1,13 @@
 #pragma once
 
-#include <Core/Defines.h>
 #include <Core/BaseSettings.h>
+#include <Core/Defines.h>
 #include <Core/SettingsEnums.h>
+#include <Interpreters/Context_fwd.h>
 
 namespace DB
 {
 
-class Context;
 class ASTStorage;
 
 #define LIST_OF_CONNECTION_MYSQL_SETTINGS(M) \
@@ -27,7 +27,7 @@ struct ConnectionMySQLSettings : public BaseSettings<ConnectionMySQLSettingsTrai
 {
     void loadFromQuery(ASTStorage & storage_def);
 
-    void loadFromQueryContext(const Context & context);
+    void loadFromQueryContext(ContextPtr context);
 };
 
 }
diff --git a/src/Databases/MySQL/DatabaseConnectionMySQL.cpp b/src/Databases/MySQL/DatabaseConnectionMySQL.cpp
index eeea12ae8f3..4e63bed9c6d 100644
--- a/src/Databases/MySQL/DatabaseConnectionMySQL.cpp
+++ b/src/Databases/MySQL/DatabaseConnectionMySQL.cpp
@@ -45,10 +45,16 @@ constexpr static const auto suffix = ".remove_flag";
 static constexpr const std::chrono::seconds cleaner_sleep_time{30};
 static const std::chrono::seconds lock_acquire_timeout{10};
 
-DatabaseConnectionMySQL::DatabaseConnectionMySQL(const Context & context, const String & database_name_, const String & metadata_path_,
-    const ASTStorage * database_engine_define_, const String & database_name_in_mysql_, std::unique_ptr<ConnectionMySQLSettings> settings_, mysqlxx::Pool && pool)
+DatabaseConnectionMySQL::DatabaseConnectionMySQL(
+    ContextPtr context_,
+    const String & database_name_,
+    const String & metadata_path_,
+    const ASTStorage * database_engine_define_,
+    const String & database_name_in_mysql_,
+    std::unique_ptr<ConnectionMySQLSettings> settings_,
+    mysqlxx::PoolWithFailover && pool)
     : IDatabase(database_name_)
-    , global_context(context.getGlobalContext())
+    , WithContext(context_->getGlobalContext())
     , metadata_path(metadata_path_)
     , database_engine_define(database_engine_define_->clone())
     , database_name_in_mysql(database_name_in_mysql_)
@@ -63,7 +69,7 @@ bool DatabaseConnectionMySQL::empty() const
 {
     std::lock_guard<std::mutex> lock(mutex);
 
-    fetchTablesIntoLocalCache(global_context);
+    fetchTablesIntoLocalCache(getContext());
 
     if (local_tables_cache.empty())
         return true;
@@ -75,12 +81,12 @@ bool DatabaseConnectionMySQL::empty() const
     return true;
 }
 
-DatabaseTablesIteratorPtr DatabaseConnectionMySQL::getTablesIterator(const Context & context, const FilterByNameFunction & filter_by_table_name)
+DatabaseTablesIteratorPtr DatabaseConnectionMySQL::getTablesIterator(ContextPtr local_context, const FilterByNameFunction & filter_by_table_name)
 {
     Tables tables;
     std::lock_guard<std::mutex> lock(mutex);
 
-    fetchTablesIntoLocalCache(context);
+    fetchTablesIntoLocalCache(local_context);
 
     for (const auto & [table_name, modify_time_and_storage] : local_tables_cache)
         if (!remove_or_detach_tables.count(table_name) && (!filter_by_table_name || filter_by_table_name(table_name)))
@@ -89,16 +95,16 @@ DatabaseTablesIteratorPtr DatabaseConnectionMySQL::getTablesIterator(const Conte
     return std::make_unique<DatabaseTablesSnapshotIterator>(tables, database_name);
 }
 
-bool DatabaseConnectionMySQL::isTableExist(const String & name, const Context & context) const
+bool DatabaseConnectionMySQL::isTableExist(const String & name, ContextPtr local_context) const
 {
-    return bool(tryGetTable(name, context));
+    return bool(tryGetTable(name, local_context));
 }
 
-StoragePtr DatabaseConnectionMySQL::tryGetTable(const String & mysql_table_name, const Context & context) const
+StoragePtr DatabaseConnectionMySQL::tryGetTable(const String & mysql_table_name, ContextPtr local_context) const
 {
     std::lock_guard<std::mutex> lock(mutex);
 
-    fetchTablesIntoLocalCache(context);
+    fetchTablesIntoLocalCache(local_context);
 
     if (!remove_or_detach_tables.count(mysql_table_name) && local_tables_cache.find(mysql_table_name) != local_tables_cache.end())
         return local_tables_cache[mysql_table_name].second;
@@ -153,11 +159,11 @@ static ASTPtr getCreateQueryFromStorage(const StoragePtr & storage, const ASTPtr
     return create_table_query;
 }
 
-ASTPtr DatabaseConnectionMySQL::getCreateTableQueryImpl(const String & table_name, const Context & context, bool throw_on_error) const
+ASTPtr DatabaseConnectionMySQL::getCreateTableQueryImpl(const String & table_name, ContextPtr local_context, bool throw_on_error) const
 {
     std::lock_guard<std::mutex> lock(mutex);
 
-    fetchTablesIntoLocalCache(context);
+    fetchTablesIntoLocalCache(local_context);
 
     if (local_tables_cache.find(table_name) == local_tables_cache.end())
     {
@@ -174,7 +180,7 @@ time_t DatabaseConnectionMySQL::getObjectMetadataModificationTime(const String &
 {
     std::lock_guard<std::mutex> lock(mutex);
 
-    fetchTablesIntoLocalCache(global_context);
+    fetchTablesIntoLocalCache(getContext());
 
     if (local_tables_cache.find(table_name) == local_tables_cache.end())
         throw Exception("MySQL table " + database_name_in_mysql + "." + table_name + " doesn't exist.", ErrorCodes::UNKNOWN_TABLE);
@@ -190,12 +196,12 @@ ASTPtr DatabaseConnectionMySQL::getCreateDatabaseQuery() const
     return create_query;
 }
 
-void DatabaseConnectionMySQL::fetchTablesIntoLocalCache(const Context & context) const
+void DatabaseConnectionMySQL::fetchTablesIntoLocalCache(ContextPtr local_context) const
 {
-    const auto & tables_with_modification_time = fetchTablesWithModificationTime();
+    const auto & tables_with_modification_time = fetchTablesWithModificationTime(local_context);
 
     destroyLocalCacheExtraTables(tables_with_modification_time);
-    fetchLatestTablesStructureIntoCache(tables_with_modification_time, context);
+    fetchLatestTablesStructureIntoCache(tables_with_modification_time, local_context);
 }
 
 void DatabaseConnectionMySQL::destroyLocalCacheExtraTables(const std::map<String, UInt64> & tables_with_modification_time) const
@@ -212,7 +218,8 @@ void DatabaseConnectionMySQL::destroyLocalCacheExtraTables(const std::map<String
     }
 }
 
-void DatabaseConnectionMySQL::fetchLatestTablesStructureIntoCache(const std::map<String, UInt64> &tables_modification_time, const Context & context) const
+void DatabaseConnectionMySQL::fetchLatestTablesStructureIntoCache(
+    const std::map<String, UInt64> & tables_modification_time, ContextPtr local_context) const
 {
     std::vector<String> wait_update_tables_name;
     for (const auto & table_modification_time : tables_modification_time)
@@ -224,7 +231,7 @@ void DatabaseConnectionMySQL::fetchLatestTablesStructureIntoCache(const std::map
             wait_update_tables_name.emplace_back(table_modification_time.first);
     }
 
-    std::map<String, NamesAndTypesList> tables_and_columns = fetchTablesColumnsList(wait_update_tables_name, context);
+    std::map<String, NamesAndTypesList> tables_and_columns = fetchTablesColumnsList(wait_update_tables_name, local_context);
 
     for (const auto & table_and_columns : tables_and_columns)
     {
@@ -241,11 +248,11 @@ void DatabaseConnectionMySQL::fetchLatestTablesStructureIntoCache(const std::map
 
         local_tables_cache[table_name] = std::make_pair(table_modification_time, StorageMySQL::create(
             StorageID(database_name, table_name), std::move(mysql_pool), database_name_in_mysql, table_name,
-            false, "", ColumnsDescription{columns_name_and_type}, ConstraintsDescription{}, global_context));
+            false, "", ColumnsDescription{columns_name_and_type}, ConstraintsDescription{}, getContext()));
     }
 }
 
-std::map<String, UInt64> DatabaseConnectionMySQL::fetchTablesWithModificationTime() const
+std::map<String, UInt64> DatabaseConnectionMySQL::fetchTablesWithModificationTime(ContextPtr local_context) const
 {
     Block tables_status_sample_block
     {
@@ -261,7 +268,8 @@ std::map<String, UInt64> DatabaseConnectionMySQL::fetchTablesWithModificationTim
              " WHERE TABLE_SCHEMA = " << quote << database_name_in_mysql;
 
     std::map<String, UInt64> tables_with_modification_time;
-    MySQLBlockInputStream result(mysql_pool.get(), query.str(), tables_status_sample_block, DEFAULT_BLOCK_SIZE);
+    StreamSettings mysql_input_stream_settings(local_context->getSettingsRef());
+    MySQLBlockInputStream result(mysql_pool.get(), query.str(), tables_status_sample_block, mysql_input_stream_settings);
 
     while (Block block = result.read())
     {
@@ -276,15 +284,16 @@ std::map<String, UInt64> DatabaseConnectionMySQL::fetchTablesWithModificationTim
     return tables_with_modification_time;
 }
 
-std::map<String, NamesAndTypesList> DatabaseConnectionMySQL::fetchTablesColumnsList(const std::vector<String> & tables_name, const Context & context) const
+std::map<String, NamesAndTypesList>
+DatabaseConnectionMySQL::fetchTablesColumnsList(const std::vector<String> & tables_name, ContextPtr local_context) const
 {
-    const auto & settings = context.getSettingsRef();
+    const auto & settings = local_context->getSettingsRef();
 
     return DB::fetchTablesColumnsList(
             mysql_pool,
             database_name_in_mysql,
             tables_name,
-            settings.external_table_functions_use_nulls,
+            settings,
             database_settings->mysql_datatypes_support_level);
 }
 
@@ -303,7 +312,7 @@ void DatabaseConnectionMySQL::shutdown()
     local_tables_cache.clear();
 }
 
-void DatabaseConnectionMySQL::drop(const Context & /*context*/)
+void DatabaseConnectionMySQL::drop(ContextPtr /*context*/)
 {
     Poco::File(getMetadataPath()).remove(true);
 }
@@ -378,7 +387,7 @@ String DatabaseConnectionMySQL::getMetadataPath() const
     return metadata_path;
 }
 
-void DatabaseConnectionMySQL::loadStoredObjects(Context &, bool, bool /*force_attach*/)
+void DatabaseConnectionMySQL::loadStoredObjects(ContextPtr, bool, bool /*force_attach*/)
 {
 
     std::lock_guard<std::mutex> lock{mutex};
@@ -395,7 +404,7 @@ void DatabaseConnectionMySQL::loadStoredObjects(Context &, bool, bool /*force_at
     }
 }
 
-void DatabaseConnectionMySQL::detachTablePermanently(const Context &, const String & table_name)
+void DatabaseConnectionMySQL::detachTablePermanently(ContextPtr, const String & table_name)
 {
     std::lock_guard<std::mutex> lock{mutex};
 
@@ -429,9 +438,9 @@ void DatabaseConnectionMySQL::detachTablePermanently(const Context &, const Stri
     table_iter->second.second->is_dropped = true;
 }
 
-void DatabaseConnectionMySQL::dropTable(const Context & context, const String & table_name, bool /*no_delay*/)
+void DatabaseConnectionMySQL::dropTable(ContextPtr local_context, const String & table_name, bool /*no_delay*/)
 {
-    detachTablePermanently(context, table_name);
+    detachTablePermanently(local_context, table_name);
 }
 
 DatabaseConnectionMySQL::~DatabaseConnectionMySQL()
@@ -456,7 +465,7 @@ DatabaseConnectionMySQL::~DatabaseConnectionMySQL()
     }
 }
 
-void DatabaseConnectionMySQL::createTable(const Context &, const String & table_name, const StoragePtr & storage, const ASTPtr & create_query)
+void DatabaseConnectionMySQL::createTable(ContextPtr, const String & table_name, const StoragePtr & storage, const ASTPtr & create_query)
 {
     const auto & create = create_query->as<ASTCreateQuery>();
 
@@ -467,7 +476,7 @@ void DatabaseConnectionMySQL::createTable(const Context &, const String & table_
     /// XXX: hack
     /// In order to prevent users from broken the table structure by executing attach table database_name.table_name (...)
     /// we should compare the old and new create_query to make them completely consistent
-    const auto & origin_create_query = getCreateTableQuery(table_name, global_context);
+    const auto & origin_create_query = getCreateTableQuery(table_name, getContext());
     origin_create_query->as<ASTCreateQuery>()->attach = true;
 
     if (queryToString(origin_create_query) != queryToString(create_query))
diff --git a/src/Databases/MySQL/DatabaseConnectionMySQL.h b/src/Databases/MySQL/DatabaseConnectionMySQL.h
index d0a5c041d7b..7e81003e9a9 100644
--- a/src/Databases/MySQL/DatabaseConnectionMySQL.h
+++ b/src/Databases/MySQL/DatabaseConnectionMySQL.h
@@ -10,6 +10,7 @@
 #include <Databases/DatabasesCommon.h>
 #include <Databases/MySQL/ConnectionMySQLSettings.h>
 #include <Parsers/ASTCreateQuery.h>
+#include <mysqlxx/PoolWithFailover.h>
 
 #include <atomic>
 #include <condition_variable>
@@ -30,15 +31,19 @@ enum class MySQLDataTypesSupport;
  *  It doesn't make any manipulations with filesystem.
  *  All tables are created by calling code after real-time pull-out structure from remote MySQL
  */
-class DatabaseConnectionMySQL final : public IDatabase
+class DatabaseConnectionMySQL final : public IDatabase, WithContext
 {
 public:
     ~DatabaseConnectionMySQL() override;
 
     DatabaseConnectionMySQL(
-        const Context & context, const String & database_name, const String & metadata_path,
-        const ASTStorage * database_engine_define, const String & database_name_in_mysql, std::unique_ptr<ConnectionMySQLSettings> settings_,
-        mysqlxx::Pool && pool);
+        ContextPtr context,
+        const String & database_name,
+        const String & metadata_path,
+        const ASTStorage * database_engine_define,
+        const String & database_name_in_mysql,
+        std::unique_ptr<ConnectionMySQLSettings> settings_,
+        mysqlxx::PoolWithFailover && pool);
 
     String getEngineName() const override { return "MySQL"; }
 
@@ -50,39 +55,38 @@ public:
 
     bool empty() const override;
 
-    DatabaseTablesIteratorPtr getTablesIterator(const Context & context, const FilterByNameFunction & filter_by_table_name) override;
+    DatabaseTablesIteratorPtr getTablesIterator(ContextPtr context, const FilterByNameFunction & filter_by_table_name) override;
 
     ASTPtr getCreateDatabaseQuery() const override;
 
-    bool isTableExist(const String & name, const Context & context) const override;
+    bool isTableExist(const String & name, ContextPtr context) const override;
 
-    StoragePtr tryGetTable(const String & name, const Context & context) const override;
+    StoragePtr tryGetTable(const String & name, ContextPtr context) const override;
 
     time_t getObjectMetadataModificationTime(const String & name) const override;
 
     void shutdown() override;
 
-    void drop(const Context & /*context*/) override;
+    void drop(ContextPtr /*context*/) override;
 
     String getMetadataPath() const override;
 
-    void createTable(const Context &, const String & table_name, const StoragePtr & storage, const ASTPtr & create_query) override;
+    void createTable(ContextPtr, const String & table_name, const StoragePtr & storage, const ASTPtr & create_query) override;
 
-    void loadStoredObjects(Context &, bool, bool force_attach) override;
+    void loadStoredObjects(ContextPtr, bool, bool force_attach) override;
 
     StoragePtr detachTable(const String & table_name) override;
 
-    void detachTablePermanently(const Context & context, const String & table_name) override;
+    void detachTablePermanently(ContextPtr context, const String & table_name) override;
 
-    void dropTable(const Context & context, const String & table_name, bool no_delay) override;
+    void dropTable(ContextPtr context, const String & table_name, bool no_delay) override;
 
     void attachTable(const String & table_name, const StoragePtr & storage, const String & relative_table_path) override;
 
 protected:
-    ASTPtr getCreateTableQueryImpl(const String & name, const Context & context, bool throw_on_error) const override;
+    ASTPtr getCreateTableQueryImpl(const String & name, ContextPtr context, bool throw_on_error) const override;
 
 private:
-    const Context & global_context;
     String metadata_path;
     ASTPtr database_engine_define;
     String database_name_in_mysql;
@@ -91,7 +95,7 @@ private:
     std::atomic<bool> quit{false};
     std::condition_variable cond;
 
-    using MySQLPool = mysqlxx::Pool;
+    using MySQLPool = mysqlxx::PoolWithFailover;
     using ModifyTimeAndStorage = std::pair<UInt64, StoragePtr>;
 
     mutable MySQLPool mysql_pool;
@@ -102,15 +106,15 @@ private:
 
     void cleanOutdatedTables();
 
-    void fetchTablesIntoLocalCache(const Context & context) const;
+    void fetchTablesIntoLocalCache(ContextPtr context) const;
 
-    std::map<String, UInt64> fetchTablesWithModificationTime() const;
+    std::map<String, UInt64> fetchTablesWithModificationTime(ContextPtr local_context) const;
 
-    std::map<String, NamesAndTypesList> fetchTablesColumnsList(const std::vector<String> & tables_name, const Context & context) const;
+    std::map<String, NamesAndTypesList> fetchTablesColumnsList(const std::vector<String> & tables_name, ContextPtr context) const;
 
     void destroyLocalCacheExtraTables(const std::map<String, UInt64> & tables_with_modification_time) const;
 
-    void fetchLatestTablesStructureIntoCache(const std::map<String, UInt64> & tables_modification_time, const Context & context) const;
+    void fetchLatestTablesStructureIntoCache(const std::map<String, UInt64> & tables_modification_time, ContextPtr context) const;
 
     ThreadFromGlobalPool thread;
 };
diff --git a/src/Databases/MySQL/DatabaseMaterializeMySQL.cpp b/src/Databases/MySQL/DatabaseMaterializeMySQL.cpp
index 6a9f1e37f8e..62a66b22c93 100644
--- a/src/Databases/MySQL/DatabaseMaterializeMySQL.cpp
+++ b/src/Databases/MySQL/DatabaseMaterializeMySQL.cpp
@@ -26,27 +26,40 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
-template<>
+template <>
 DatabaseMaterializeMySQL<DatabaseOrdinary>::DatabaseMaterializeMySQL(
-    const Context & context, const String & database_name_, const String & metadata_path_, UUID /*uuid*/,
-    const String & mysql_database_name_, mysqlxx::Pool && pool_, MySQLClient && client_, std::unique_ptr<MaterializeMySQLSettings> settings_)
-    : DatabaseOrdinary(database_name_
-                      , metadata_path_
-                      , "data/" + escapeForFileName(database_name_) + "/"
-                      , "DatabaseMaterializeMySQL<Ordinary> (" + database_name_ + ")", context
-                      )
+    ContextPtr context_,
+    const String & database_name_,
+    const String & metadata_path_,
+    UUID /*uuid*/,
+    const String & mysql_database_name_,
+    mysqlxx::Pool && pool_,
+    MySQLClient && client_,
+    std::unique_ptr<MaterializeMySQLSettings> settings_)
+    : DatabaseOrdinary(
+        database_name_,
+        metadata_path_,
+        "data/" + escapeForFileName(database_name_) + "/",
+        "DatabaseMaterializeMySQL<Ordinary> (" + database_name_ + ")",
+        context_)
     , settings(std::move(settings_))
-    , materialize_thread(context, database_name_, mysql_database_name_, std::move(pool_), std::move(client_), settings.get())
+    , materialize_thread(context_, database_name_, mysql_database_name_, std::move(pool_), std::move(client_), settings.get())
 {
 }
 
-template<>
+template <>
 DatabaseMaterializeMySQL<DatabaseAtomic>::DatabaseMaterializeMySQL(
-    const Context & context, const String & database_name_, const String & metadata_path_, UUID uuid,
-    const String & mysql_database_name_, mysqlxx::Pool && pool_, MySQLClient && client_, std::unique_ptr<MaterializeMySQLSettings> settings_)
-    : DatabaseAtomic(database_name_, metadata_path_, uuid, "DatabaseMaterializeMySQL<Atomic> (" + database_name_ + ")", context)
+    ContextPtr context_,
+    const String & database_name_,
+    const String & metadata_path_,
+    UUID uuid,
+    const String & mysql_database_name_,
+    mysqlxx::Pool && pool_,
+    MySQLClient && client_,
+    std::unique_ptr<MaterializeMySQLSettings> settings_)
+    : DatabaseAtomic(database_name_, metadata_path_, uuid, "DatabaseMaterializeMySQL<Atomic> (" + database_name_ + ")", context_)
     , settings(std::move(settings_))
-    , materialize_thread(context, database_name_, mysql_database_name_, std::move(pool_), std::move(client_), settings.get())
+    , materialize_thread(context_, database_name_, mysql_database_name_, std::move(pool_), std::move(client_), settings.get())
 {
 }
 
@@ -79,35 +92,28 @@ void DatabaseMaterializeMySQL<Base>::setException(const std::exception_ptr & exc
 }
 
 template<typename Base>
-void DatabaseMaterializeMySQL<Base>::loadStoredObjects(Context & context, bool has_force_restore_data_flag, bool force_attach)
+void DatabaseMaterializeMySQL<Base>::loadStoredObjects(ContextPtr context_, bool has_force_restore_data_flag, bool force_attach)
 {
-    Base::loadStoredObjects(context, has_force_restore_data_flag, force_attach);
-    try
-    {
-        materialize_thread.startSynchronization();
-        started_up = true;
-    }
-    catch (...)
-    {
-        tryLogCurrentException(Base::log, "Cannot load MySQL nested database stored objects.");
+    Base::loadStoredObjects(context_, has_force_restore_data_flag, force_attach);
+    if (!force_attach)
+        materialize_thread.assertMySQLAvailable();
 
-        if (!force_attach)
-            throw;
-    }
+    materialize_thread.startSynchronization();
+    started_up = true;
 }
 
 template<typename Base>
-void DatabaseMaterializeMySQL<Base>::createTable(const Context & context, const String & name, const StoragePtr & table, const ASTPtr & query)
+void DatabaseMaterializeMySQL<Base>::createTable(ContextPtr context_, const String & name, const StoragePtr & table, const ASTPtr & query)
 {
     assertCalledFromSyncThreadOrDrop("create table");
-    Base::createTable(context, name, table, query);
+    Base::createTable(context_, name, table, query);
 }
 
 template<typename Base>
-void DatabaseMaterializeMySQL<Base>::dropTable(const Context & context, const String & name, bool no_delay)
+void DatabaseMaterializeMySQL<Base>::dropTable(ContextPtr context_, const String & name, bool no_delay)
 {
     assertCalledFromSyncThreadOrDrop("drop table");
-    Base::dropTable(context, name, no_delay);
+    Base::dropTable(context_, name, no_delay);
 }
 
 template<typename Base>
@@ -125,7 +131,7 @@ StoragePtr DatabaseMaterializeMySQL<Base>::detachTable(const String & name)
 }
 
 template<typename Base>
-void DatabaseMaterializeMySQL<Base>::renameTable(const Context & context, const String & name, IDatabase & to_database, const String & to_name, bool exchange, bool dictionary)
+void DatabaseMaterializeMySQL<Base>::renameTable(ContextPtr context_, const String & name, IDatabase & to_database, const String & to_name, bool exchange, bool dictionary)
 {
     assertCalledFromSyncThreadOrDrop("rename table");
 
@@ -138,18 +144,18 @@ void DatabaseMaterializeMySQL<Base>::renameTable(const Context & context, const
     if (to_database.getDatabaseName() != Base::getDatabaseName())
         throw Exception("Cannot rename with other database for MaterializeMySQL database.", ErrorCodes::NOT_IMPLEMENTED);
 
-    Base::renameTable(context, name, *this, to_name, exchange, dictionary);
+    Base::renameTable(context_, name, *this, to_name, exchange, dictionary);
 }
 
 template<typename Base>
-void DatabaseMaterializeMySQL<Base>::alterTable(const Context & context, const StorageID & table_id, const StorageInMemoryMetadata & metadata)
+void DatabaseMaterializeMySQL<Base>::alterTable(ContextPtr context_, const StorageID & table_id, const StorageInMemoryMetadata & metadata)
 {
     assertCalledFromSyncThreadOrDrop("alter table");
-    Base::alterTable(context, table_id, metadata);
+    Base::alterTable(context_, table_id, metadata);
 }
 
 template<typename Base>
-void DatabaseMaterializeMySQL<Base>::drop(const Context & context)
+void DatabaseMaterializeMySQL<Base>::drop(ContextPtr context_)
 {
     /// Remove metadata info
     Poco::File metadata(Base::getMetadataPath() + "/.metadata");
@@ -157,15 +163,15 @@ void DatabaseMaterializeMySQL<Base>::drop(const Context & context)
     if (metadata.exists())
         metadata.remove(false);
 
-    Base::drop(context);
+    Base::drop(context_);
 }
 
 template<typename Base>
-StoragePtr DatabaseMaterializeMySQL<Base>::tryGetTable(const String & name, const Context & context) const
+StoragePtr DatabaseMaterializeMySQL<Base>::tryGetTable(const String & name, ContextPtr context_) const
 {
     if (!MaterializeMySQLSyncThread::isMySQLSyncThread())
     {
-        StoragePtr nested_storage = Base::tryGetTable(name, context);
+        StoragePtr nested_storage = Base::tryGetTable(name, context_);
 
         if (!nested_storage)
             return {};
@@ -173,19 +179,20 @@ StoragePtr DatabaseMaterializeMySQL<Base>::tryGetTable(const String & name, cons
         return std::make_shared<StorageMaterializeMySQL>(std::move(nested_storage), this);
     }
 
-    return Base::tryGetTable(name, context);
+    return Base::tryGetTable(name, context_);
 }
 
-template<typename Base>
-DatabaseTablesIteratorPtr DatabaseMaterializeMySQL<Base>::getTablesIterator(const Context & context, const DatabaseOnDisk::FilterByNameFunction & filter_by_table_name)
+template <typename Base>
+DatabaseTablesIteratorPtr
+DatabaseMaterializeMySQL<Base>::getTablesIterator(ContextPtr context_, const DatabaseOnDisk::FilterByNameFunction & filter_by_table_name)
 {
     if (!MaterializeMySQLSyncThread::isMySQLSyncThread())
     {
-        DatabaseTablesIteratorPtr iterator = Base::getTablesIterator(context, filter_by_table_name);
+        DatabaseTablesIteratorPtr iterator = Base::getTablesIterator(context_, filter_by_table_name);
         return std::make_unique<DatabaseMaterializeTablesIterator>(std::move(iterator), this);
     }
 
-    return Base::getTablesIterator(context, filter_by_table_name);
+    return Base::getTablesIterator(context_, filter_by_table_name);
 }
 
 template<typename Base>
diff --git a/src/Databases/MySQL/DatabaseMaterializeMySQL.h b/src/Databases/MySQL/DatabaseMaterializeMySQL.h
index e1229269a33..cd9fe640239 100644
--- a/src/Databases/MySQL/DatabaseMaterializeMySQL.h
+++ b/src/Databases/MySQL/DatabaseMaterializeMySQL.h
@@ -23,7 +23,7 @@ class DatabaseMaterializeMySQL : public Base
 public:
 
     DatabaseMaterializeMySQL(
-        const Context & context, const String & database_name_, const String & metadata_path_, UUID uuid,
+        ContextPtr context, const String & database_name_, const String & metadata_path_, UUID uuid,
         const String & mysql_database_name_, mysqlxx::Pool && pool_,
         MySQLClient && client_, std::unique_ptr<MaterializeMySQLSettings> settings_);
 
@@ -43,25 +43,25 @@ protected:
 public:
     String getEngineName() const override { return "MaterializeMySQL"; }
 
-    void loadStoredObjects(Context & context, bool has_force_restore_data_flag, bool force_attach) override;
+    void loadStoredObjects(ContextPtr context_, bool has_force_restore_data_flag, bool force_attach) override;
 
-    void createTable(const Context & context, const String & name, const StoragePtr & table, const ASTPtr & query) override;
+    void createTable(ContextPtr context_, const String & name, const StoragePtr & table, const ASTPtr & query) override;
 
-    void dropTable(const Context & context, const String & name, bool no_delay) override;
+    void dropTable(ContextPtr context_, const String & name, bool no_delay) override;
 
     void attachTable(const String & name, const StoragePtr & table, const String & relative_table_path) override;
 
     StoragePtr detachTable(const String & name) override;
 
-    void renameTable(const Context & context, const String & name, IDatabase & to_database, const String & to_name, bool exchange, bool dictionary) override;
+    void renameTable(ContextPtr context_, const String & name, IDatabase & to_database, const String & to_name, bool exchange, bool dictionary) override;
 
-    void alterTable(const Context & context, const StorageID & table_id, const StorageInMemoryMetadata & metadata) override;
+    void alterTable(ContextPtr context_, const StorageID & table_id, const StorageInMemoryMetadata & metadata) override;
 
-    void drop(const Context & context) override;
+    void drop(ContextPtr context_) override;
 
-    StoragePtr tryGetTable(const String & name, const Context & context) const override;
+    StoragePtr tryGetTable(const String & name, ContextPtr context_) const override;
 
-    DatabaseTablesIteratorPtr getTablesIterator(const Context & context, const DatabaseOnDisk::FilterByNameFunction & filter_by_table_name) override;
+    DatabaseTablesIteratorPtr getTablesIterator(ContextPtr context_, const DatabaseOnDisk::FilterByNameFunction & filter_by_table_name) override;
 
     void assertCalledFromSyncThreadOrDrop(const char * method) const;
 
diff --git a/src/Databases/MySQL/FetchTablesColumnsList.cpp b/src/Databases/MySQL/FetchTablesColumnsList.cpp
index 3e25c703a1d..cfd01d4ddc4 100644
--- a/src/Databases/MySQL/FetchTablesColumnsList.cpp
+++ b/src/Databases/MySQL/FetchTablesColumnsList.cpp
@@ -41,10 +41,10 @@ namespace DB
 {
 
 std::map<String, NamesAndTypesList> fetchTablesColumnsList(
-        mysqlxx::Pool & pool,
+        mysqlxx::PoolWithFailover & pool,
         const String & database_name,
         const std::vector<String> & tables_name,
-        bool external_table_functions_use_nulls,
+        const Settings & settings,
         MultiEnum<MySQLDataTypesSupport> type_support)
 {
     std::map<String, NamesAndTypesList> tables_and_columns;
@@ -72,13 +72,18 @@ std::map<String, NamesAndTypesList> fetchTablesColumnsList(
              " IS_NULLABLE = 'YES' AS is_nullable,"
              " COLUMN_TYPE LIKE '%unsigned' AS is_unsigned,"
              " CHARACTER_MAXIMUM_LENGTH AS length,"
-             " NUMERIC_PRECISION as '',"
+             " NUMERIC_PRECISION as numeric_precision,"
              " IF(ISNULL(NUMERIC_SCALE), DATETIME_PRECISION, NUMERIC_SCALE) AS scale" // we know DATETIME_PRECISION as a scale in CH
              " FROM INFORMATION_SCHEMA.COLUMNS"
-             " WHERE TABLE_SCHEMA = " << quote << database_name
-          << " AND TABLE_NAME IN " << toQueryStringWithQuote(tables_name) << " ORDER BY ORDINAL_POSITION";
+             " WHERE ";
 
-    MySQLBlockInputStream result(pool.get(), query.str(), tables_columns_sample_block, DEFAULT_BLOCK_SIZE);
+    if (!database_name.empty())
+        query << " TABLE_SCHEMA = " << quote << database_name << " AND ";
+
+    query << " TABLE_NAME IN " << toQueryStringWithQuote(tables_name) << " ORDER BY ORDINAL_POSITION";
+
+    StreamSettings mysql_input_stream_settings(settings);
+    MySQLBlockInputStream result(pool.get(), query.str(), tables_columns_sample_block, mysql_input_stream_settings);
     while (Block block = result.read())
     {
         const auto & table_name_col = *block.getByPosition(0).column;
@@ -99,7 +104,7 @@ std::map<String, NamesAndTypesList> fetchTablesColumnsList(
                     convertMySQLDataType(
                             type_support,
                             column_type_col[i].safeGet<String>(),
-                            external_table_functions_use_nulls && is_nullable_col[i].safeGet<UInt64>(),
+                            settings.external_table_functions_use_nulls && is_nullable_col[i].safeGet<UInt64>(),
                             is_unsigned_col[i].safeGet<UInt64>(),
                             char_max_length_col[i].safeGet<UInt64>(),
                             precision_col[i].safeGet<UInt64>(),
diff --git a/src/Databases/MySQL/FetchTablesColumnsList.h b/src/Databases/MySQL/FetchTablesColumnsList.h
index 52191c2ecb8..55f18e0115f 100644
--- a/src/Databases/MySQL/FetchTablesColumnsList.h
+++ b/src/Databases/MySQL/FetchTablesColumnsList.h
@@ -3,7 +3,7 @@
 #include "config_core.h"
 #if USE_MYSQL
 
-#include <mysqlxx/Pool.h>
+#include <mysqlxx/PoolWithFailover.h>
 
 #include <common/types.h>
 #include <Core/MultiEnum.h>
@@ -12,15 +12,16 @@
 
 #include <map>
 #include <vector>
+#include <Core/Settings.h>
 
 namespace DB
 {
 
 std::map<String, NamesAndTypesList> fetchTablesColumnsList(
-        mysqlxx::Pool & pool,
+        mysqlxx::PoolWithFailover & pool,
         const String & database_name,
         const std::vector<String> & tables_name,
-        bool external_table_functions_use_nulls,
+        const Settings & settings,
         MultiEnum<MySQLDataTypesSupport> type_support);
 
 }
diff --git a/src/Databases/MySQL/MaterializeMetadata.cpp b/src/Databases/MySQL/MaterializeMetadata.cpp
index 84f44771bf1..c389ab5a1b0 100644
--- a/src/Databases/MySQL/MaterializeMetadata.cpp
+++ b/src/Databases/MySQL/MaterializeMetadata.cpp
@@ -24,7 +24,8 @@ namespace ErrorCodes
 }
 
 static std::unordered_map<String, String> fetchTablesCreateQuery(
-    const mysqlxx::PoolWithFailover::Entry & connection, const String & database_name, const std::vector<String> & fetch_tables)
+    const mysqlxx::PoolWithFailover::Entry & connection, const String & database_name,
+    const std::vector<String> & fetch_tables, const Settings & global_settings)
 {
     std::unordered_map<String, String> tables_create_query;
     for (const auto & fetch_table_name : fetch_tables)
@@ -34,9 +35,10 @@ static std::unordered_map<String, String> fetchTablesCreateQuery(
             {std::make_shared<DataTypeString>(), "Create Table"},
         };
 
+        StreamSettings mysql_input_stream_settings(global_settings, false, true);
         MySQLBlockInputStream show_create_table(
             connection, "SHOW CREATE TABLE " + backQuoteIfNeed(database_name) + "." + backQuoteIfNeed(fetch_table_name),
-            show_create_table_header, DEFAULT_BLOCK_SIZE, false, true);
+            show_create_table_header, mysql_input_stream_settings);
 
         Block create_query_block = show_create_table.read();
         if (!create_query_block || create_query_block.rows() != 1)
@@ -49,13 +51,14 @@ static std::unordered_map<String, String> fetchTablesCreateQuery(
 }
 
 
-static std::vector<String> fetchTablesInDB(const mysqlxx::PoolWithFailover::Entry & connection, const std::string & database)
+static std::vector<String> fetchTablesInDB(const mysqlxx::PoolWithFailover::Entry & connection, const std::string & database, const Settings & global_settings)
 {
     Block header{{std::make_shared<DataTypeString>(), "table_name"}};
-    String query = "SELECT TABLE_NAME AS table_name FROM INFORMATION_SCHEMA.TABLES  WHERE TABLE_SCHEMA = " + quoteString(database);
+    String query = "SELECT TABLE_NAME AS table_name FROM INFORMATION_SCHEMA.TABLES  WHERE TABLE_TYPE != 'VIEW' AND TABLE_SCHEMA = " + quoteString(database);
 
     std::vector<String> tables_in_db;
-    MySQLBlockInputStream input(connection, query, header, DEFAULT_BLOCK_SIZE);
+    StreamSettings mysql_input_stream_settings(global_settings);
+    MySQLBlockInputStream input(connection, query, header, mysql_input_stream_settings);
 
     while (Block block = input.read())
     {
@@ -77,7 +80,8 @@ void MaterializeMetadata::fetchMasterStatus(mysqlxx::PoolWithFailover::Entry & c
         {std::make_shared<DataTypeString>(), "Executed_Gtid_Set"},
     };
 
-    MySQLBlockInputStream input(connection, "SHOW MASTER STATUS;", header, DEFAULT_BLOCK_SIZE, false, true);
+    StreamSettings mysql_input_stream_settings(settings, false, true);
+    MySQLBlockInputStream input(connection, "SHOW MASTER STATUS;", header, mysql_input_stream_settings);
     Block master_status = input.read();
 
     if (!master_status || master_status.rows() != 1)
@@ -99,7 +103,8 @@ void MaterializeMetadata::fetchMasterVariablesValue(const mysqlxx::PoolWithFailo
     };
 
     const String & fetch_query = "SHOW VARIABLES WHERE Variable_name = 'binlog_checksum'";
-    MySQLBlockInputStream variables_input(connection, fetch_query, variables_header, DEFAULT_BLOCK_SIZE, false, true);
+    StreamSettings mysql_input_stream_settings(settings, false, true);
+    MySQLBlockInputStream variables_input(connection, fetch_query, variables_header, mysql_input_stream_settings);
 
     while (Block variables_block = variables_input.read())
     {
@@ -114,7 +119,7 @@ void MaterializeMetadata::fetchMasterVariablesValue(const mysqlxx::PoolWithFailo
     }
 }
 
-static bool checkSyncUserPrivImpl(const mysqlxx::PoolWithFailover::Entry & connection, WriteBuffer & out)
+static bool checkSyncUserPrivImpl(const mysqlxx::PoolWithFailover::Entry & connection, const Settings & global_settings, WriteBuffer & out)
 {
     Block sync_user_privs_header
     {
@@ -122,7 +127,8 @@ static bool checkSyncUserPrivImpl(const mysqlxx::PoolWithFailover::Entry & conne
     };
 
     String grants_query, sub_privs;
-    MySQLBlockInputStream input(connection, "SHOW GRANTS FOR CURRENT_USER();", sync_user_privs_header, DEFAULT_BLOCK_SIZE);
+    StreamSettings mysql_input_stream_settings(global_settings);
+    MySQLBlockInputStream input(connection, "SHOW GRANTS FOR CURRENT_USER();", sync_user_privs_header, mysql_input_stream_settings);
     while (Block block = input.read())
     {
         for (size_t index = 0; index < block.rows(); ++index)
@@ -146,11 +152,11 @@ static bool checkSyncUserPrivImpl(const mysqlxx::PoolWithFailover::Entry & conne
     return false;
 }
 
-static void checkSyncUserPriv(const mysqlxx::PoolWithFailover::Entry & connection)
+static void checkSyncUserPriv(const mysqlxx::PoolWithFailover::Entry & connection, const Settings & global_settings)
 {
     WriteBufferFromOwnString out;
 
-    if (!checkSyncUserPrivImpl(connection, out))
+    if (!checkSyncUserPrivImpl(connection, global_settings, out))
         throw Exception("MySQL SYNC USER ACCESS ERR: mysql sync user needs "
                         "at least GLOBAL PRIVILEGES:'RELOAD, REPLICATION SLAVE, REPLICATION CLIENT' "
                         "and SELECT PRIVILEGE on MySQL Database."
@@ -159,12 +165,16 @@ static void checkSyncUserPriv(const mysqlxx::PoolWithFailover::Entry & connectio
 
 bool MaterializeMetadata::checkBinlogFileExists(const mysqlxx::PoolWithFailover::Entry & connection) const
 {
+    if (binlog_file.empty())
+        return false;
+
     Block logs_header {
         {std::make_shared<DataTypeString>(), "Log_name"},
         {std::make_shared<DataTypeUInt64>(), "File_size"}
     };
 
-    MySQLBlockInputStream input(connection, "SHOW MASTER LOGS", logs_header, DEFAULT_BLOCK_SIZE, false, true);
+    StreamSettings mysql_input_stream_settings(settings, false, true);
+    MySQLBlockInputStream input(connection, "SHOW MASTER LOGS", logs_header, mysql_input_stream_settings);
 
     while (Block block = input.read())
     {
@@ -219,13 +229,8 @@ void MaterializeMetadata::transaction(const MySQLReplication::Position & positio
     commitMetadata(std::move(fun), persistent_tmp_path, persistent_path);
 }
 
-MaterializeMetadata::MaterializeMetadata(
-    mysqlxx::PoolWithFailover::Entry & connection, const String & path_,
-    const String & database, bool & opened_transaction)
-    : persistent_path(path_)
+MaterializeMetadata::MaterializeMetadata(const String & path_, const Settings & settings_) : persistent_path(path_), settings(settings_)
 {
-    checkSyncUserPriv(connection);
-
     if (Poco::File(persistent_path).exists())
     {
         ReadBufferFromFile in(persistent_path, DBMS_DEFAULT_BUFFER_SIZE);
@@ -239,9 +244,17 @@ MaterializeMetadata::MaterializeMetadata(
         assertString("\nData Version:\t", in);
         readIntText(data_version, in);
 
-        if (checkBinlogFileExists(connection))
-            return;
     }
+}
+
+void MaterializeMetadata::startReplication(
+    mysqlxx::PoolWithFailover::Entry & connection, const String & database,
+    bool & opened_transaction, std::unordered_map<String, String> & need_dumping_tables)
+{
+    checkSyncUserPriv(connection, settings);
+
+    if (checkBinlogFileExists(connection))
+      return;
 
     bool locked_tables = false;
 
@@ -257,7 +270,7 @@ MaterializeMetadata::MaterializeMetadata(
         connection->query("START TRANSACTION /*!40100 WITH CONSISTENT SNAPSHOT */;").execute();
 
         opened_transaction = true;
-        need_dumping_tables = fetchTablesCreateQuery(connection, database, fetchTablesInDB(connection, database));
+        need_dumping_tables = fetchTablesCreateQuery(connection, database, fetchTablesInDB(connection, database, settings), settings);
         connection->query("UNLOCK TABLES;").execute();
     }
     catch (...)
diff --git a/src/Databases/MySQL/MaterializeMetadata.h b/src/Databases/MySQL/MaterializeMetadata.h
index f4cd2970fce..079786c261c 100644
--- a/src/Databases/MySQL/MaterializeMetadata.h
+++ b/src/Databases/MySQL/MaterializeMetadata.h
@@ -10,6 +10,7 @@
 #include <Core/MySQL/MySQLReplication.h>
 #include <mysqlxx/Connection.h>
 #include <mysqlxx/PoolWithFailover.h>
+#include <Interpreters/Context.h>
 
 namespace DB
 {
@@ -25,6 +26,7 @@ namespace DB
 struct MaterializeMetadata
 {
     const String persistent_path;
+    const Settings settings;
 
     String binlog_file;
     UInt64 binlog_position;
@@ -35,7 +37,6 @@ struct MaterializeMetadata
     size_t data_version = 1;
     size_t meta_version = 2;
     String binlog_checksum = "CRC32";
-    std::unordered_map<String, String> need_dumping_tables;
 
     void fetchMasterStatus(mysqlxx::PoolWithFailover::Entry & connection);
 
@@ -45,9 +46,13 @@ struct MaterializeMetadata
 
     void transaction(const MySQLReplication::Position & position, const std::function<void()> & fun);
 
-    MaterializeMetadata(
-        mysqlxx::PoolWithFailover::Entry & connection, const String & path
-        , const String & database, bool & opened_transaction);
+    void startReplication(
+        mysqlxx::PoolWithFailover::Entry & connection,
+        const String & database,
+        bool & opened_transaction,
+        std::unordered_map<String, String> & need_dumping_tables);
+
+    MaterializeMetadata(const String & path_, const Settings & settings_);
 };
 
 }
diff --git a/src/Databases/MySQL/MaterializeMySQLSettings.h b/src/Databases/MySQL/MaterializeMySQLSettings.h
index 07de219c72f..9bd05b5382b 100644
--- a/src/Databases/MySQL/MaterializeMySQLSettings.h
+++ b/src/Databases/MySQL/MaterializeMySQLSettings.h
@@ -14,7 +14,7 @@ class ASTStorage;
     M(UInt64, max_rows_in_buffers, DEFAULT_BLOCK_SIZE, "Max rows that data is allowed to cache in memory(for database and the cache data unable to query). when rows is exceeded, the data will be materialized", 0) \
     M(UInt64, max_bytes_in_buffers, DBMS_DEFAULT_BUFFER_SIZE, "Max bytes that data is allowed to cache in memory(for database and the cache data unable to query). when rows is exceeded, the data will be materialized", 0) \
     M(UInt64, max_flush_data_time, 1000, "Max milliseconds that data is allowed to cache in memory(for database and the cache data unable to query). when this time is exceeded, the data will be materialized", 0)  \
-    M(UInt64, max_wait_time_when_mysql_unavailable, 1000, "Dump full data retry interval when MySQL is not available(milliseconds).", 0) \
+    M(Int64, max_wait_time_when_mysql_unavailable, 1000, "Retry interval when MySQL is not available (milliseconds). Negative value disable retry.", 0) \
     M(Bool, allows_query_when_mysql_lost, false, "Allow query materialized table when mysql is lost.", 0) \
 
     DECLARE_SETTINGS_TRAITS(MaterializeMySQLSettingsTraits, LIST_OF_MATERIALIZE_MODE_SETTINGS)
diff --git a/src/Databases/MySQL/MaterializeMySQLSyncThread.cpp b/src/Databases/MySQL/MaterializeMySQLSyncThread.cpp
index 08d170768f4..82161ac5c8d 100644
--- a/src/Databases/MySQL/MaterializeMySQLSyncThread.cpp
+++ b/src/Databases/MySQL/MaterializeMySQLSyncThread.cpp
@@ -35,34 +35,36 @@ namespace ErrorCodes
     extern const int ILLEGAL_MYSQL_VARIABLE;
     extern const int SYNC_MYSQL_USER_ACCESS_ERROR;
     extern const int UNKNOWN_DATABASE;
+    extern const int UNKNOWN_EXCEPTION;
+    extern const int CANNOT_READ_ALL_DATA;
 }
 
 static constexpr auto MYSQL_BACKGROUND_THREAD_NAME = "MySQLDBSync";
 
-static Context createQueryContext(const Context & global_context)
+static ContextPtr createQueryContext(ContextPtr context)
 {
-    Settings new_query_settings = global_context.getSettings();
+    Settings new_query_settings = context->getSettings();
     new_query_settings.insert_allow_materialized_columns = true;
 
     /// To avoid call AST::format
     /// TODO: We need to implement the format function for MySQLAST
     new_query_settings.enable_global_with_statement = false;
 
-    Context query_context(global_context);
-    query_context.setSettings(new_query_settings);
+    auto query_context = Context::createCopy(context);
+    query_context->setSettings(new_query_settings);
     CurrentThread::QueryScope query_scope(query_context);
 
-    query_context.getClientInfo().query_kind = ClientInfo::QueryKind::SECONDARY_QUERY;
-    query_context.setCurrentQueryId(""); // generate random query_id
+    query_context->getClientInfo().query_kind = ClientInfo::QueryKind::SECONDARY_QUERY;
+    query_context->setCurrentQueryId(""); // generate random query_id
     return query_context;
 }
 
-static BlockIO tryToExecuteQuery(const String & query_to_execute, Context & query_context, const String & database, const String & comment)
+static BlockIO tryToExecuteQuery(const String & query_to_execute, ContextPtr query_context, const String & database, const String & comment)
 {
     try
     {
         if (!database.empty())
-            query_context.setCurrentDatabase(database);
+            query_context->setCurrentDatabase(database);
 
         return executeQuery("/*" + comment + "*/ " + query_to_execute, query_context, true);
     }
@@ -88,7 +90,7 @@ MaterializeMySQLSyncThread::~MaterializeMySQLSyncThread()
     }
 }
 
-static void checkMySQLVariables(const mysqlxx::Pool::Entry & connection)
+static void checkMySQLVariables(const mysqlxx::Pool::Entry & connection, const Settings & settings)
 {
     Block variables_header{
         {std::make_shared<DataTypeString>(), "Variable_name"},
@@ -102,19 +104,19 @@ static void checkMySQLVariables(const mysqlxx::Pool::Entry & connection)
          "OR (Variable_name = 'default_authentication_plugin' AND upper(Value) = 'MYSQL_NATIVE_PASSWORD') "
          "OR (Variable_name = 'log_bin_use_v1_row_events' AND upper(Value) = 'OFF');";
 
-    MySQLBlockInputStream variables_input(connection, check_query, variables_header, DEFAULT_BLOCK_SIZE, false, true);
+    StreamSettings mysql_input_stream_settings(settings, false, true);
+    MySQLBlockInputStream variables_input(connection, check_query, variables_header, mysql_input_stream_settings);
 
-    Block variables_block = variables_input.read();
-    if (!variables_block || variables_block.rows() != 5)
+    std::unordered_map<String, String> variables_error_message{
+        {"log_bin", "log_bin = 'ON'"},
+        {"binlog_format", "binlog_format='ROW'"},
+        {"binlog_row_image", "binlog_row_image='FULL'"},
+        {"default_authentication_plugin", "default_authentication_plugin='mysql_native_password'"},
+        {"log_bin_use_v1_row_events", "log_bin_use_v1_row_events='OFF'"}
+    };
+
+    while (Block variables_block = variables_input.read())
     {
-        std::unordered_map<String, String> variables_error_message{
-            {"log_bin", "log_bin = 'ON'"},
-            {"binlog_format", "binlog_format='ROW'"},
-            {"binlog_row_image", "binlog_row_image='FULL'"},
-            {"default_authentication_plugin", "default_authentication_plugin='mysql_native_password'"},
-            {"log_bin_use_v1_row_events", "log_bin_use_v1_row_events='OFF'"}
-        };
-
         ColumnPtr variable_name_column = variables_block.getByName("Variable_name").column;
 
         for (size_t index = 0; index < variables_block.rows(); ++index)
@@ -124,7 +126,10 @@ static void checkMySQLVariables(const mysqlxx::Pool::Entry & connection)
             if (error_message_it != variables_error_message.end())
                 variables_error_message.erase(error_message_it);
         }
+    }
 
+    if  (!variables_error_message.empty())
+    {
         bool first = true;
         WriteBufferFromOwnString error_message;
         error_message << "Illegal MySQL variables, the MaterializeMySQL engine requires ";
@@ -141,10 +146,19 @@ static void checkMySQLVariables(const mysqlxx::Pool::Entry & connection)
 }
 
 MaterializeMySQLSyncThread::MaterializeMySQLSyncThread(
-    const Context & context, const String & database_name_, const String & mysql_database_name_,
-    mysqlxx::Pool && pool_, MySQLClient && client_, MaterializeMySQLSettings * settings_)
-    : log(&Poco::Logger::get("MaterializeMySQLSyncThread")), global_context(context.getGlobalContext()), database_name(database_name_)
-    , mysql_database_name(mysql_database_name_), pool(std::move(pool_)), client(std::move(client_)), settings(settings_)
+    ContextPtr context_,
+    const String & database_name_,
+    const String & mysql_database_name_,
+    mysqlxx::Pool && pool_,
+    MySQLClient && client_,
+    MaterializeMySQLSettings * settings_)
+    : WithContext(context_->getGlobalContext())
+    , log(&Poco::Logger::get("MaterializeMySQLSyncThread"))
+    , database_name(database_name_)
+    , mysql_database_name(mysql_database_name_)
+    , pool(std::move(pool_))
+    , client(std::move(client_))
+    , settings(settings_)
 {
     query_prefix = "EXTERNAL DDL FROM MySQL(" + backQuoteIfNeed(database_name) + ", " + backQuoteIfNeed(mysql_database_name) + ") ";
 }
@@ -155,32 +169,50 @@ void MaterializeMySQLSyncThread::synchronization()
 
     try
     {
-        if (std::optional<MaterializeMetadata> metadata = prepareSynchronized())
+        MaterializeMetadata metadata(
+            DatabaseCatalog::instance().getDatabase(database_name)->getMetadataPath() + "/.metadata", getContext()->getSettingsRef());
+        bool need_reconnect = true;
+
+        Stopwatch watch;
+        Buffers buffers(database_name);
+
+        while (!isCancelled())
         {
-            Stopwatch watch;
-            Buffers buffers(database_name);
-
-            while (!isCancelled())
+            if (need_reconnect)
+            {
+                if (!prepareSynchronized(metadata))
+                    break;
+                need_reconnect = false;
+            }
+
+            /// TODO: add gc task for `sign = -1`(use alter table delete, execute by interval. need final state)
+            UInt64 max_flush_time = settings->max_flush_data_time;
+
+            try
             {
-                /// TODO: add gc task for `sign = -1`(use alter table delete, execute by interval. need final state)
-                UInt64 max_flush_time = settings->max_flush_data_time;
                 BinlogEventPtr binlog_event = client.readOneBinlogEvent(std::max(UInt64(1), max_flush_time - watch.elapsedMilliseconds()));
+                if (binlog_event)
+                    onEvent(buffers, binlog_event, metadata);
+            }
+            catch (const Exception & e)
+            {
+                if (e.code() != ErrorCodes::CANNOT_READ_ALL_DATA || settings->max_wait_time_when_mysql_unavailable < 0)
+                    throw;
 
-                {
-                    if (binlog_event)
-                        onEvent(buffers, binlog_event, *metadata);
-
-                    if (watch.elapsedMilliseconds() > max_flush_time || buffers.checkThresholds(
-                            settings->max_rows_in_buffer, settings->max_bytes_in_buffer,
-                            settings->max_rows_in_buffers, settings->max_bytes_in_buffers)
-                        )
-                    {
-                        watch.restart();
-
-                        if (!buffers.data.empty())
-                            flushBuffersData(buffers, *metadata);
-                    }
-                }
+                flushBuffersData(buffers, metadata);
+                LOG_INFO(log, "Lost connection to MySQL");
+                need_reconnect = true;
+                setSynchronizationThreadException(std::current_exception());
+                sleepForMilliseconds(settings->max_wait_time_when_mysql_unavailable);
+                continue;
+            }
+            if (watch.elapsedMilliseconds() > max_flush_time || buffers.checkThresholds(
+                    settings->max_rows_in_buffer, settings->max_bytes_in_buffer,
+                    settings->max_rows_in_buffers, settings->max_bytes_in_buffers)
+                )
+            {
+                watch.restart();
+                flushBuffersData(buffers, metadata);
             }
         }
     }
@@ -188,8 +220,7 @@ void MaterializeMySQLSyncThread::synchronization()
     {
         client.disconnect();
         tryLogCurrentException(log);
-        auto db = DatabaseCatalog::instance().getDatabase(database_name);
-        setSynchronizationThreadException(db, std::current_exception());
+        setSynchronizationThreadException(std::current_exception());
     }
 }
 
@@ -204,35 +235,32 @@ void MaterializeMySQLSyncThread::stopSynchronization()
 }
 
 void MaterializeMySQLSyncThread::startSynchronization()
+{
+    background_thread_pool = std::make_unique<ThreadFromGlobalPool>([this]() { synchronization(); });
+}
+
+void MaterializeMySQLSyncThread::assertMySQLAvailable()
 {
     try
     {
-        checkMySQLVariables(pool.get());
-        background_thread_pool = std::make_unique<ThreadFromGlobalPool>([this]() { synchronization(); });
+        checkMySQLVariables(pool.get(), getContext()->getSettingsRef());
     }
-    catch (...)
+    catch (const mysqlxx::ConnectionFailed & e)
     {
-        try
-        {
+        if (e.errnum() == ER_ACCESS_DENIED_ERROR
+            || e.errnum() == ER_DBACCESS_DENIED_ERROR)
+            throw Exception("MySQL SYNC USER ACCESS ERR: mysql sync user needs "
+                            "at least GLOBAL PRIVILEGES:'RELOAD, REPLICATION SLAVE, REPLICATION CLIENT' "
+                            "and SELECT PRIVILEGE on Database " + mysql_database_name
+                            , ErrorCodes::SYNC_MYSQL_USER_ACCESS_ERROR);
+        else if (e.errnum() == ER_BAD_DB_ERROR)
+            throw Exception("Unknown database '" + mysql_database_name + "' on MySQL", ErrorCodes::UNKNOWN_DATABASE);
+        else
             throw;
-        }
-        catch (mysqlxx::ConnectionFailed & e)
-        {
-            if (e.errnum() == ER_ACCESS_DENIED_ERROR
-                || e.errnum() == ER_DBACCESS_DENIED_ERROR)
-                throw Exception("MySQL SYNC USER ACCESS ERR: mysql sync user needs "
-                                "at least GLOBAL PRIVILEGES:'RELOAD, REPLICATION SLAVE, REPLICATION CLIENT' "
-                                "and SELECT PRIVILEGE on Database " + mysql_database_name
-                    , ErrorCodes::SYNC_MYSQL_USER_ACCESS_ERROR);
-            else if (e.errnum() == ER_BAD_DB_ERROR)
-                throw Exception("Unknown database '" + mysql_database_name + "' on MySQL", ErrorCodes::UNKNOWN_DATABASE);
-            else
-                throw;
-        }
     }
 }
 
-static inline void cleanOutdatedTables(const String & database_name, const Context & context)
+static inline void cleanOutdatedTables(const String & database_name, ContextPtr context)
 {
     String cleaning_table_name;
     try
@@ -242,7 +270,7 @@ static inline void cleanOutdatedTables(const String & database_name, const Conte
 
         for (auto iterator = clean_database->getTablesIterator(context); iterator->isValid(); iterator->next())
         {
-            Context query_context = createQueryContext(context);
+            auto query_context = createQueryContext(context);
             String comment = "Materialize MySQL step 1: execute MySQL DDL for dump data";
             cleaning_table_name = backQuoteIfNeed(database_name) + "." + backQuoteIfNeed(iterator->name());
             tryToExecuteQuery(" DROP TABLE " + cleaning_table_name, query_context, database_name, comment);
@@ -255,7 +283,8 @@ static inline void cleanOutdatedTables(const String & database_name, const Conte
     }
 }
 
-static inline BlockOutputStreamPtr getTableOutput(const String & database_name, const String & table_name, Context & query_context, bool insert_materialized = false)
+static inline BlockOutputStreamPtr
+getTableOutput(const String & database_name, const String & table_name, ContextPtr query_context, bool insert_materialized = false)
 {
     const StoragePtr & storage = DatabaseCatalog::instance().getTable(StorageID(database_name, table_name), query_context);
 
@@ -285,24 +314,25 @@ static inline BlockOutputStreamPtr getTableOutput(const String & database_name,
 }
 
 static inline void dumpDataForTables(
-    mysqlxx::Pool::Entry & connection, MaterializeMetadata & master_info,
+    mysqlxx::Pool::Entry & connection, const std::unordered_map<String, String> & need_dumping_tables,
     const String & query_prefix, const String & database_name, const String & mysql_database_name,
-    const Context & context, const std::function<bool()> & is_cancelled)
+    ContextPtr context, const std::function<bool()> & is_cancelled)
 {
-    auto iterator = master_info.need_dumping_tables.begin();
-    for (; iterator != master_info.need_dumping_tables.end() && !is_cancelled(); ++iterator)
+    auto iterator = need_dumping_tables.begin();
+    for (; iterator != need_dumping_tables.end() && !is_cancelled(); ++iterator)
     {
         try
         {
             const auto & table_name = iterator->first;
-            Context query_context = createQueryContext(context);
+            auto query_context = createQueryContext(context);
             String comment = "Materialize MySQL step 1: execute MySQL DDL for dump data";
             tryToExecuteQuery(query_prefix + " " + iterator->second, query_context, database_name, comment); /// create table.
 
             auto out = std::make_shared<CountingBlockOutputStream>(getTableOutput(database_name, table_name, query_context));
+            StreamSettings mysql_input_stream_settings(context->getSettingsRef());
             MySQLBlockInputStream input(
                 connection, "SELECT * FROM " + backQuoteIfNeed(mysql_database_name) + "." + backQuoteIfNeed(table_name),
-                out->getHeader(), DEFAULT_BLOCK_SIZE);
+                out->getHeader(), mysql_input_stream_settings);
 
             Stopwatch watch;
             copyData(input, *out, is_cancelled);
@@ -329,7 +359,7 @@ static inline UInt32 randomNumber()
     return dist6(rng);
 }
 
-std::optional<MaterializeMetadata> MaterializeMySQLSyncThread::prepareSynchronized()
+bool MaterializeMySQLSyncThread::prepareSynchronized(MaterializeMetadata & metadata)
 {
     bool opened_transaction = false;
     mysqlxx::PoolWithFailover::Entry connection;
@@ -338,21 +368,34 @@ std::optional<MaterializeMetadata> MaterializeMySQLSyncThread::prepareSynchroniz
     {
         try
         {
-            connection = pool.get();
+            connection = pool.tryGet();
+            if (connection.isNull())
+            {
+                if (settings->max_wait_time_when_mysql_unavailable < 0)
+                    throw Exception("Unable to connect to MySQL", ErrorCodes::UNKNOWN_EXCEPTION);
+                sleepForMilliseconds(settings->max_wait_time_when_mysql_unavailable);
+                continue;
+            }
+
             opened_transaction = false;
 
-            MaterializeMetadata metadata(
-                connection, DatabaseCatalog::instance().getDatabase(database_name)->getMetadataPath() + "/.metadata", mysql_database_name, opened_transaction);
+            checkMySQLVariables(connection, getContext()->getSettingsRef());
+            std::unordered_map<String, String> need_dumping_tables;
+            metadata.startReplication(connection, mysql_database_name, opened_transaction, need_dumping_tables);
 
-            if (!metadata.need_dumping_tables.empty())
+            if (!need_dumping_tables.empty())
             {
                 Position position;
                 position.update(metadata.binlog_position, metadata.binlog_file, metadata.executed_gtid_set);
 
                 metadata.transaction(position, [&]()
                 {
-                    cleanOutdatedTables(database_name, global_context);
-                    dumpDataForTables(connection, metadata, query_prefix, database_name, mysql_database_name, global_context, [this] { return isCancelled(); });
+                    cleanOutdatedTables(database_name, getContext());
+                    dumpDataForTables(
+                        connection, need_dumping_tables, query_prefix, database_name, mysql_database_name, getContext(), [this]
+                        {
+                            return isCancelled();
+                        });
                 });
 
                 const auto & position_message = [&]()
@@ -369,7 +412,9 @@ std::optional<MaterializeMetadata> MaterializeMySQLSyncThread::prepareSynchroniz
 
             client.connect();
             client.startBinlogDumpGTID(randomNumber(), mysql_database_name, metadata.executed_gtid_set, metadata.binlog_checksum);
-            return metadata;
+
+            setSynchronizationThreadException(nullptr);
+            return true;
         }
         catch (...)
         {
@@ -382,20 +427,29 @@ std::optional<MaterializeMetadata> MaterializeMySQLSyncThread::prepareSynchroniz
             {
                 throw;
             }
-            catch (const mysqlxx::ConnectionFailed &)
+            catch (const mysqlxx::ConnectionFailed &) {}
+            catch (const mysqlxx::BadQuery & e)
             {
-                /// Avoid busy loop when MySQL is not available.
-                sleepForMilliseconds(settings->max_wait_time_when_mysql_unavailable);
+                // Lost connection to MySQL server during query
+                if (e.code() != CR_SERVER_LOST || settings->max_wait_time_when_mysql_unavailable < 0)
+                    throw;
             }
+
+            setSynchronizationThreadException(std::current_exception());
+            /// Avoid busy loop when MySQL is not available.
+            sleepForMilliseconds(settings->max_wait_time_when_mysql_unavailable);
         }
     }
 
-    return {};
+    return false;
 }
 
 void MaterializeMySQLSyncThread::flushBuffersData(Buffers & buffers, MaterializeMetadata & metadata)
 {
-    metadata.transaction(client.getPosition(), [&]() { buffers.commit(global_context); });
+    if (buffers.data.empty())
+        return;
+
+    metadata.transaction(client.getPosition(), [&]() { buffers.commit(getContext()); });
 
     const auto & position_message = [&]()
     {
@@ -628,21 +682,21 @@ void MaterializeMySQLSyncThread::onEvent(Buffers & buffers, const BinlogEventPtr
     if (receive_event->type() == MYSQL_WRITE_ROWS_EVENT)
     {
         WriteRowsEvent & write_rows_event = static_cast<WriteRowsEvent &>(*receive_event);
-        Buffers::BufferAndSortingColumnsPtr buffer = buffers.getTableDataBuffer(write_rows_event.table, global_context);
+        Buffers::BufferAndSortingColumnsPtr buffer = buffers.getTableDataBuffer(write_rows_event.table, getContext());
         size_t bytes = onWriteOrDeleteData<1>(write_rows_event.rows, buffer->first, ++metadata.data_version);
         buffers.add(buffer->first.rows(), buffer->first.bytes(), write_rows_event.rows.size(), bytes);
     }
     else if (receive_event->type() == MYSQL_UPDATE_ROWS_EVENT)
     {
         UpdateRowsEvent & update_rows_event = static_cast<UpdateRowsEvent &>(*receive_event);
-        Buffers::BufferAndSortingColumnsPtr buffer = buffers.getTableDataBuffer(update_rows_event.table, global_context);
+        Buffers::BufferAndSortingColumnsPtr buffer = buffers.getTableDataBuffer(update_rows_event.table, getContext());
         size_t bytes = onUpdateData(update_rows_event.rows, buffer->first, ++metadata.data_version, buffer->second);
         buffers.add(buffer->first.rows(), buffer->first.bytes(), update_rows_event.rows.size(), bytes);
     }
     else if (receive_event->type() == MYSQL_DELETE_ROWS_EVENT)
     {
         DeleteRowsEvent & delete_rows_event = static_cast<DeleteRowsEvent &>(*receive_event);
-        Buffers::BufferAndSortingColumnsPtr buffer = buffers.getTableDataBuffer(delete_rows_event.table, global_context);
+        Buffers::BufferAndSortingColumnsPtr buffer = buffers.getTableDataBuffer(delete_rows_event.table, getContext());
         size_t bytes = onWriteOrDeleteData<-1>(delete_rows_event.rows, buffer->first, ++metadata.data_version);
         buffers.add(buffer->first.rows(), buffer->first.bytes(), delete_rows_event.rows.size(), bytes);
     }
@@ -651,7 +705,7 @@ void MaterializeMySQLSyncThread::onEvent(Buffers & buffers, const BinlogEventPtr
         QueryEvent & query_event = static_cast<QueryEvent &>(*receive_event);
         Position position_before_ddl;
         position_before_ddl.update(metadata.binlog_position, metadata.binlog_file, metadata.executed_gtid_set);
-        metadata.transaction(position_before_ddl, [&]() { buffers.commit(global_context); });
+        metadata.transaction(position_before_ddl, [&]() { buffers.commit(getContext()); });
         metadata.transaction(client.getPosition(),[&](){ executeDDLAtomic(query_event); });
     }
     else
@@ -682,7 +736,7 @@ void MaterializeMySQLSyncThread::executeDDLAtomic(const QueryEvent & query_event
 {
     try
     {
-        Context query_context = createQueryContext(global_context);
+        auto query_context = createQueryContext(getContext());
         String comment = "Materialize MySQL step 2: execute MySQL DDL for sync data";
         String event_database = query_event.schema == mysql_database_name ? database_name : "";
         tryToExecuteQuery(query_prefix + query_event.query, query_context, event_database, comment);
@@ -705,6 +759,12 @@ bool MaterializeMySQLSyncThread::isMySQLSyncThread()
     return getThreadName() == MYSQL_BACKGROUND_THREAD_NAME;
 }
 
+void MaterializeMySQLSyncThread::setSynchronizationThreadException(const std::exception_ptr & exception)
+{
+    auto db = DatabaseCatalog::instance().getDatabase(database_name);
+    DB::setSynchronizationThreadException(db, exception);
+}
+
 void MaterializeMySQLSyncThread::Buffers::add(size_t block_rows, size_t block_bytes, size_t written_rows, size_t written_bytes)
 {
     total_blocks_rows += written_rows;
@@ -719,13 +779,13 @@ bool MaterializeMySQLSyncThread::Buffers::checkThresholds(size_t check_block_row
         || total_blocks_bytes >= check_total_bytes;
 }
 
-void MaterializeMySQLSyncThread::Buffers::commit(const Context & context)
+void MaterializeMySQLSyncThread::Buffers::commit(ContextPtr context)
 {
     try
     {
         for (auto & table_name_and_buffer : data)
         {
-            Context query_context = createQueryContext(context);
+            auto query_context = createQueryContext(context);
             OneBlockInputStream input(table_name_and_buffer.second->first);
             BlockOutputStreamPtr out = getTableOutput(database, table_name_and_buffer.first, query_context, true);
             copyData(input, *out);
@@ -745,7 +805,7 @@ void MaterializeMySQLSyncThread::Buffers::commit(const Context & context)
 }
 
 MaterializeMySQLSyncThread::Buffers::BufferAndSortingColumnsPtr MaterializeMySQLSyncThread::Buffers::getTableDataBuffer(
-    const String & table_name, const Context & context)
+    const String & table_name, ContextPtr context)
 {
     const auto & iterator = data.find(table_name);
     if (iterator == data.end())
diff --git a/src/Databases/MySQL/MaterializeMySQLSyncThread.h b/src/Databases/MySQL/MaterializeMySQLSyncThread.h
index 26934b87511..03958fe10cc 100644
--- a/src/Databases/MySQL/MaterializeMySQLSyncThread.h
+++ b/src/Databases/MySQL/MaterializeMySQLSyncThread.h
@@ -36,24 +36,29 @@ namespace DB
  *  real-time pull incremental data:
  *      We will pull the binlog event of MySQL to parse and execute when the full data synchronization is completed.
  */
-class MaterializeMySQLSyncThread
+class MaterializeMySQLSyncThread : WithContext
 {
 public:
     ~MaterializeMySQLSyncThread();
 
     MaterializeMySQLSyncThread(
-        const Context & context, const String & database_name_, const String & mysql_database_name_
-        , mysqlxx::Pool && pool_, MySQLClient && client_, MaterializeMySQLSettings * settings_);
+        ContextPtr context,
+        const String & database_name_,
+        const String & mysql_database_name_,
+        mysqlxx::Pool && pool_,
+        MySQLClient && client_,
+        MaterializeMySQLSettings * settings_);
 
     void stopSynchronization();
 
     void startSynchronization();
 
+    void assertMySQLAvailable();
+
     static bool isMySQLSyncThread();
 
 private:
     Poco::Logger * log;
-    const Context & global_context;
 
     String database_name;
     String mysql_database_name;
@@ -69,6 +74,9 @@ private:
     const int ER_DBACCESS_DENIED_ERROR = 1044;
     const int ER_BAD_DB_ERROR = 1049;
 
+    // https://dev.mysql.com/doc/mysql-errors/8.0/en/client-error-reference.html
+    const int CR_SERVER_LOST = 2013;
+
     struct Buffers
     {
         String database;
@@ -85,20 +93,20 @@ private:
 
         Buffers(const String & database_) : database(database_) {}
 
-        void commit(const Context & context);
+        void commit(ContextPtr context);
 
         void add(size_t block_rows, size_t block_bytes, size_t written_rows, size_t written_bytes);
 
         bool checkThresholds(size_t check_block_rows, size_t check_block_bytes, size_t check_total_rows, size_t check_total_bytes) const;
 
-        BufferAndSortingColumnsPtr getTableDataBuffer(const String & table, const Context & context);
+        BufferAndSortingColumnsPtr getTableDataBuffer(const String & table, ContextPtr context);
     };
 
     void synchronization();
 
     bool isCancelled() { return sync_quit.load(std::memory_order_relaxed); }
 
-    std::optional<MaterializeMetadata> prepareSynchronized();
+    bool prepareSynchronized(MaterializeMetadata & metadata);
 
     void flushBuffersData(Buffers & buffers, MaterializeMetadata & metadata);
 
@@ -107,6 +115,8 @@ private:
     std::atomic<bool> sync_quit{false};
     std::unique_ptr<ThreadFromGlobalPool> background_thread_pool;
     void executeDDLAtomic(const QueryEvent & query_event);
+
+    void setSynchronizationThreadException(const std::exception_ptr & exception);
 };
 
 }
diff --git a/src/Databases/PostgreSQL/DatabasePostgreSQL.cpp b/src/Databases/PostgreSQL/DatabasePostgreSQL.cpp
index 722b9c64edb..e12d7f975ce 100644
--- a/src/Databases/PostgreSQL/DatabasePostgreSQL.cpp
+++ b/src/Databases/PostgreSQL/DatabasePostgreSQL.cpp
@@ -5,7 +5,6 @@
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypeArray.h>
 #include <Storages/StoragePostgreSQL.h>
-#include <Storages/PostgreSQL/PostgreSQLConnection.h>
 #include <Interpreters/Context.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <Parsers/ASTFunction.h>
@@ -16,6 +15,8 @@
 #include <Poco/DirectoryIterator.h>
 #include <Poco/File.h>
 #include <Databases/PostgreSQL/fetchPostgreSQLTableStructure.h>
+#include <Common/quoteString.h>
+#include <Storages/PostgreSQL/PostgreSQLConnectionPool.h>
 
 
 namespace DB
@@ -34,22 +35,22 @@ static const auto suffix = ".removed";
 static const auto cleaner_reschedule_ms = 60000;
 
 DatabasePostgreSQL::DatabasePostgreSQL(
-        const Context & context,
+        ContextPtr context_,
         const String & metadata_path_,
         const ASTStorage * database_engine_define_,
         const String & dbname_,
         const String & postgres_dbname,
-        PostgreSQLConnectionPtr connection_,
+        postgres::PoolWithFailoverPtr connection_pool_,
         const bool cache_tables_)
     : IDatabase(dbname_)
-    , global_context(context.getGlobalContext())
+    , WithContext(context_->getGlobalContext())
     , metadata_path(metadata_path_)
     , database_engine_define(database_engine_define_->clone())
     , dbname(postgres_dbname)
-    , connection(std::move(connection_))
+    , connection_pool(std::move(connection_pool_))
     , cache_tables(cache_tables_)
 {
-    cleaner_task = context.getSchedulePool().createTask("PostgreSQLCleanerTask", [this]{ removeOutdatedTables(); });
+    cleaner_task = getContext()->getSchedulePool().createTask("PostgreSQLCleanerTask", [this]{ removeOutdatedTables(); });
     cleaner_task->deactivate();
 }
 
@@ -68,8 +69,7 @@ bool DatabasePostgreSQL::empty() const
 }
 
 
-DatabaseTablesIteratorPtr DatabasePostgreSQL::getTablesIterator(
-        const Context & context, const FilterByNameFunction & /* filter_by_table_name */)
+DatabaseTablesIteratorPtr DatabasePostgreSQL::getTablesIterator(ContextPtr local_context, const FilterByNameFunction & /* filter_by_table_name */)
 {
     std::lock_guard<std::mutex> lock(mutex);
 
@@ -78,7 +78,7 @@ DatabaseTablesIteratorPtr DatabasePostgreSQL::getTablesIterator(
 
     for (const auto & table_name : table_names)
         if (!detached_or_dropped.count(table_name))
-            tables[table_name] = fetchTable(table_name, context, true);
+            tables[table_name] = fetchTable(table_name, local_context, true);
 
     return std::make_unique<DatabaseTablesSnapshotIterator>(tables, database_name);
 }
@@ -89,7 +89,8 @@ std::unordered_set<std::string> DatabasePostgreSQL::fetchTablesList() const
     std::unordered_set<std::string> tables;
     std::string query = "SELECT tablename FROM pg_catalog.pg_tables "
         "WHERE schemaname != 'pg_catalog' AND schemaname != 'information_schema'";
-    pqxx::read_transaction tx(*connection->conn());
+    auto connection = connection_pool->get();
+    pqxx::read_transaction tx(connection->conn());
 
     for (auto table_name : tx.stream<std::string>(query))
         tables.insert(std::get<0>(table_name));
@@ -107,7 +108,8 @@ bool DatabasePostgreSQL::checkPostgresTable(const String & table_name) const
             "PostgreSQL table name cannot contain single quote or backslash characters, passed {}", table_name);
     }
 
-    pqxx::nontransaction tx(*connection->conn());
+    auto connection = connection_pool->get();
+    pqxx::nontransaction tx(connection->conn());
 
     try
     {
@@ -132,7 +134,7 @@ bool DatabasePostgreSQL::checkPostgresTable(const String & table_name) const
 }
 
 
-bool DatabasePostgreSQL::isTableExist(const String & table_name, const Context & /* context */) const
+bool DatabasePostgreSQL::isTableExist(const String & table_name, ContextPtr /* context */) const
 {
     std::lock_guard<std::mutex> lock(mutex);
 
@@ -143,33 +145,33 @@ bool DatabasePostgreSQL::isTableExist(const String & table_name, const Context &
 }
 
 
-StoragePtr DatabasePostgreSQL::tryGetTable(const String & table_name, const Context & context) const
+StoragePtr DatabasePostgreSQL::tryGetTable(const String & table_name, ContextPtr local_context) const
 {
     std::lock_guard<std::mutex> lock(mutex);
 
     if (!detached_or_dropped.count(table_name))
-        return fetchTable(table_name, context, false);
+        return fetchTable(table_name, local_context, false);
 
     return StoragePtr{};
 }
 
 
-StoragePtr DatabasePostgreSQL::fetchTable(const String & table_name, const Context & context, const bool table_checked) const
+StoragePtr DatabasePostgreSQL::fetchTable(const String & table_name, ContextPtr local_context, const bool table_checked) const
 {
     if (!cache_tables || !cached_tables.count(table_name))
     {
         if (!table_checked && !checkPostgresTable(table_name))
             return StoragePtr{};
 
-        auto use_nulls = context.getSettingsRef().external_table_functions_use_nulls;
-        auto columns = fetchPostgreSQLTableStructure(connection->conn(), table_name, use_nulls);
+        auto use_nulls = local_context->getSettingsRef().external_table_functions_use_nulls;
+        auto columns = fetchPostgreSQLTableStructure(connection_pool->get(), doubleQuoteString(table_name), use_nulls);
 
         if (!columns)
             return StoragePtr{};
 
         auto storage = StoragePostgreSQL::create(
-                StorageID(database_name, table_name), table_name, std::make_shared<PostgreSQLConnection>(connection->conn_str()),
-                ColumnsDescription{*columns}, ConstraintsDescription{}, context);
+                StorageID(database_name, table_name), *connection_pool, table_name,
+                ColumnsDescription{*columns}, ConstraintsDescription{}, local_context);
 
         if (cache_tables)
             cached_tables[table_name] = storage;
@@ -229,7 +231,7 @@ StoragePtr DatabasePostgreSQL::detachTable(const String & table_name)
 }
 
 
-void DatabasePostgreSQL::createTable(const Context &, const String & table_name, const StoragePtr & storage, const ASTPtr & create_query)
+void DatabasePostgreSQL::createTable(ContextPtr, const String & table_name, const StoragePtr & storage, const ASTPtr & create_query)
 {
     const auto & create = create_query->as<ASTCreateQuery>();
 
@@ -240,7 +242,7 @@ void DatabasePostgreSQL::createTable(const Context &, const String & table_name,
 }
 
 
-void DatabasePostgreSQL::dropTable(const Context &, const String & table_name, bool /* no_delay */)
+void DatabasePostgreSQL::dropTable(ContextPtr, const String & table_name, bool /* no_delay */)
 {
     std::lock_guard<std::mutex> lock{mutex};
 
@@ -268,13 +270,13 @@ void DatabasePostgreSQL::dropTable(const Context &, const String & table_name, b
 }
 
 
-void DatabasePostgreSQL::drop(const Context & /*context*/)
+void DatabasePostgreSQL::drop(ContextPtr /*context*/)
 {
     Poco::File(getMetadataPath()).remove(true);
 }
 
 
-void DatabasePostgreSQL::loadStoredObjects(Context & /* context */, bool, bool /*force_attach*/)
+void DatabasePostgreSQL::loadStoredObjects(ContextPtr /* context */, bool, bool /*force_attach*/)
 {
     {
         std::lock_guard<std::mutex> lock{mutex};
@@ -346,9 +348,9 @@ ASTPtr DatabasePostgreSQL::getCreateDatabaseQuery() const
 }
 
 
-ASTPtr DatabasePostgreSQL::getCreateTableQueryImpl(const String & table_name, const Context & context, bool throw_on_error) const
+ASTPtr DatabasePostgreSQL::getCreateTableQueryImpl(const String & table_name, ContextPtr local_context, bool throw_on_error) const
 {
-    auto storage = fetchTable(table_name, context, false);
+    auto storage = fetchTable(table_name, local_context, false);
     if (!storage)
     {
         if (throw_on_error)
diff --git a/src/Databases/PostgreSQL/DatabasePostgreSQL.h b/src/Databases/PostgreSQL/DatabasePostgreSQL.h
index 56ea6645f15..3505c38e499 100644
--- a/src/Databases/PostgreSQL/DatabasePostgreSQL.h
+++ b/src/Databases/PostgreSQL/DatabasePostgreSQL.h
@@ -9,14 +9,13 @@
 #include <Databases/DatabasesCommon.h>
 #include <Core/BackgroundSchedulePool.h>
 #include <Parsers/ASTCreateQuery.h>
+#include <Storages/PostgreSQL/PostgreSQLPoolWithFailover.h>
 
 
 namespace DB
 {
 
 class Context;
-class PostgreSQLConnection;
-using PostgreSQLConnectionPtr = std::shared_ptr<PostgreSQLConnection>;
 
 
 /** Real-time access to table list and table structure from remote PostgreSQL.
@@ -24,18 +23,18 @@ using PostgreSQLConnectionPtr = std::shared_ptr<PostgreSQLConnection>;
  *  If `cache_tables` == 1 (default: 0) table structure is cached and not checked for being modififed,
  *  but it will be updated during detach->attach.
  */
-class DatabasePostgreSQL final : public IDatabase
+class DatabasePostgreSQL final : public IDatabase, WithContext
 {
 
 public:
     DatabasePostgreSQL(
-        const Context & context,
+        ContextPtr context,
         const String & metadata_path_,
         const ASTStorage * database_engine_define,
         const String & dbname_,
         const String & postgres_dbname,
-        PostgreSQLConnectionPtr connection_,
-        const bool cache_tables_);
+        postgres::PoolWithFailoverPtr connection_pool_,
+        bool cache_tables_);
 
     String getEngineName() const override { return "PostgreSQL"; }
     String getMetadataPath() const override { return metadata_path; }
@@ -48,31 +47,30 @@ public:
 
     bool empty() const override;
 
-    void loadStoredObjects(Context &, bool, bool force_attach) override;
+    void loadStoredObjects(ContextPtr, bool, bool force_attach) override;
 
-    DatabaseTablesIteratorPtr getTablesIterator(const Context & context, const FilterByNameFunction & filter_by_table_name) override;
+    DatabaseTablesIteratorPtr getTablesIterator(ContextPtr context, const FilterByNameFunction & filter_by_table_name) override;
 
-    bool isTableExist(const String & name, const Context & context) const override;
-    StoragePtr tryGetTable(const String & name, const Context & context) const override;
+    bool isTableExist(const String & name, ContextPtr context) const override;
+    StoragePtr tryGetTable(const String & name, ContextPtr context) const override;
 
-    void createTable(const Context &, const String & table_name, const StoragePtr & storage, const ASTPtr & create_query) override;
-    void dropTable(const Context &, const String & table_name, bool no_delay) override;
+    void createTable(ContextPtr, const String & table_name, const StoragePtr & storage, const ASTPtr & create_query) override;
+    void dropTable(ContextPtr, const String & table_name, bool no_delay) override;
 
     void attachTable(const String & table_name, const StoragePtr & storage, const String & relative_table_path) override;
     StoragePtr detachTable(const String & table_name) override;
 
-    void drop(const Context & /*context*/) override;
+    void drop(ContextPtr /*context*/) override;
     void shutdown() override;
 
 protected:
-    ASTPtr getCreateTableQueryImpl(const String & table_name, const Context & context, bool throw_on_error) const override;
+    ASTPtr getCreateTableQueryImpl(const String & table_name, ContextPtr context, bool throw_on_error) const override;
 
 private:
-    const Context & global_context;
     String metadata_path;
     ASTPtr database_engine_define;
     String dbname;
-    PostgreSQLConnectionPtr connection;
+    postgres::PoolWithFailoverPtr connection_pool;
     const bool cache_tables;
 
     mutable Tables cached_tables;
@@ -81,7 +79,7 @@ private:
 
     bool checkPostgresTable(const String & table_name) const;
     std::unordered_set<std::string> fetchTablesList() const;
-    StoragePtr fetchTable(const String & table_name, const Context & context, const bool table_checked) const;
+    StoragePtr fetchTable(const String & table_name, ContextPtr context, bool table_checked) const;
     void removeOutdatedTables();
     ASTPtr getColumnDeclaration(const DataTypePtr & data_type) const;
 };
diff --git a/src/Databases/PostgreSQL/fetchPostgreSQLTableStructure.cpp b/src/Databases/PostgreSQL/fetchPostgreSQLTableStructure.cpp
index a6e5ded3efd..066090d02d6 100644
--- a/src/Databases/PostgreSQL/fetchPostgreSQLTableStructure.cpp
+++ b/src/Databases/PostgreSQL/fetchPostgreSQLTableStructure.cpp
@@ -40,6 +40,8 @@ static DataTypePtr convertPostgreSQLDataType(std::string & type, bool is_nullabl
         res = std::make_shared<DataTypeInt32>();
     else if (type == "bigint")
         res = std::make_shared<DataTypeInt64>();
+    else if (type == "boolean")
+        res = std::make_shared<DataTypeUInt8>();
     else if (type == "real")
         res = std::make_shared<DataTypeFloat32>();
     else if (type == "double precision")
@@ -54,19 +56,32 @@ static DataTypePtr convertPostgreSQLDataType(std::string & type, bool is_nullabl
         res = std::make_shared<DataTypeDate>();
     else if (type.starts_with("numeric"))
     {
-        /// Numeric and decimal will both end up here as numeric.
-        res = DataTypeFactory::instance().get(type);
-        uint32_t precision = getDecimalPrecision(*res);
-        uint32_t scale = getDecimalScale(*res);
+        /// Numeric and decimal will both end up here as numeric. If it has type and precision,
+        /// there will be Numeric(x, y), otherwise just Numeric
+        UInt32 precision, scale;
+        if (type.ends_with(")"))
+        {
+            res = DataTypeFactory::instance().get(type);
+            precision = getDecimalPrecision(*res);
+            scale = getDecimalScale(*res);
 
-        if (precision <= DecimalUtils::max_precision<Decimal32>)
-            res = std::make_shared<DataTypeDecimal<Decimal32>>(precision, scale);
-        else if (precision <= DecimalUtils::max_precision<Decimal64>)
-            res = std::make_shared<DataTypeDecimal<Decimal64>>(precision, scale);
-        else if (precision <= DecimalUtils::max_precision<Decimal128>)
+            if (precision <= DecimalUtils::max_precision<Decimal32>)
+                res = std::make_shared<DataTypeDecimal<Decimal32>>(precision, scale);
+            else if (precision <= DecimalUtils::max_precision<Decimal64>)
+                res = std::make_shared<DataTypeDecimal<Decimal64>>(precision, scale);
+            else if (precision <= DecimalUtils::max_precision<Decimal128>)
+                res = std::make_shared<DataTypeDecimal<Decimal128>>(precision, scale);
+            else if (precision <= DecimalUtils::max_precision<Decimal256>)
+                res = std::make_shared<DataTypeDecimal<Decimal256>>(precision, scale);
+            else
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Precision {} and scale {} are too big and not supported", precision, scale);
+        }
+        else
+        {
+            precision = DecimalUtils::max_precision<Decimal128>;
+            scale = precision / 2;
             res = std::make_shared<DataTypeDecimal<Decimal128>>(precision, scale);
-        else if (precision <= DecimalUtils::max_precision<Decimal256>)
-            res = std::make_shared<DataTypeDecimal<Decimal256>>(precision, scale);
+        }
     }
 
     if (!res)
@@ -81,7 +96,7 @@ static DataTypePtr convertPostgreSQLDataType(std::string & type, bool is_nullabl
 
 
 std::shared_ptr<NamesAndTypesList> fetchPostgreSQLTableStructure(
-    std::shared_ptr<pqxx::connection> connection, const String & postgres_table_name, bool use_nulls)
+    postgres::ConnectionHolderPtr connection, const String & postgres_table_name, bool use_nulls)
 {
     auto columns = NamesAndTypesList();
 
@@ -100,7 +115,7 @@ std::shared_ptr<NamesAndTypesList> fetchPostgreSQLTableStructure(
            "AND NOT attisdropped AND attnum > 0", postgres_table_name);
     try
     {
-        pqxx::read_transaction tx(*connection);
+        pqxx::read_transaction tx(connection->conn());
         pqxx::stream_from stream(tx, pqxx::from_query, std::string_view(query));
 
         std::tuple<std::string, std::string, std::string, uint16_t> row;
@@ -120,7 +135,7 @@ std::shared_ptr<NamesAndTypesList> fetchPostgreSQLTableStructure(
     {
         throw Exception(fmt::format(
                     "PostgreSQL table {}.{} does not exist",
-                    connection->dbname(), postgres_table_name), ErrorCodes::UNKNOWN_TABLE);
+                    connection->conn().dbname(), postgres_table_name), ErrorCodes::UNKNOWN_TABLE);
     }
     catch (Exception & e)
     {
diff --git a/src/Databases/PostgreSQL/fetchPostgreSQLTableStructure.h b/src/Databases/PostgreSQL/fetchPostgreSQLTableStructure.h
index bbbb379541b..f40929aa91d 100644
--- a/src/Databases/PostgreSQL/fetchPostgreSQLTableStructure.h
+++ b/src/Databases/PostgreSQL/fetchPostgreSQLTableStructure.h
@@ -12,7 +12,7 @@ namespace DB
 {
 
 std::shared_ptr<NamesAndTypesList> fetchPostgreSQLTableStructure(
-    std::shared_ptr<pqxx::connection> connection, const String & postgres_table_name, bool use_nulls);
+    postgres::ConnectionHolderPtr connection, const String & postgres_table_name, bool use_nulls);
 
 }
 
diff --git a/src/Dictionaries/BucketCache.h b/src/Dictionaries/BucketCache.h
deleted file mode 100644
index 381110066a6..00000000000
--- a/src/Dictionaries/BucketCache.h
+++ /dev/null
@@ -1,226 +0,0 @@
-#pragma once
-
-#include <Common/HashTable/Hash.h>
-#include <common/logger_useful.h>
-#include <type_traits>
-#include <vector>
-
-namespace DB
-{
-
-namespace
-{
-    inline size_t roundUpToPowerOfTwoOrZero(size_t x)
-    {
-        size_t r = 8;
-        while (x > r)
-            r <<= 1;
-        return r;
-    }
-}
-
-struct EmptyDeleter {};
-
-struct Int64Hasher
-{
-    size_t operator()(const size_t x) const
-    {
-        return intHash64(x);
-    }
-};
-
-
-/*
-    Class for storing cache index.
-    It consists of two arrays.
-    The first one is split into buckets (each stores 8 elements (cells)) determined by hash of the element key.
-    The second one is split into 4bit numbers, which are positions in bucket for next element write (So cache uses FIFO eviction algorithm inside each bucket).
-*/
-template <typename K, typename V, typename Hasher, typename Deleter = EmptyDeleter>
-class BucketCacheIndex
-{
-    struct Cell
-    {
-        K key;
-        V index;
-    };
-
-public:
-    template <typename = std::enable_if<std::is_same_v<EmptyDeleter, Deleter>>>
-    BucketCacheIndex(size_t cells_)
-        : buckets(roundUpToPowerOfTwoOrZero(cells_) / bucket_size)
-        , bucket_mask(buckets - 1)
-        , cells(buckets * bucket_size)
-        , positions((buckets / 2) + 1)
-    {
-        for (auto & cell : cells)
-            cell.index.setNotExists();
-        for (size_t bucket = 0; bucket < buckets; ++bucket)
-            setPosition(bucket, 0);
-    }
-
-    template <typename = std::enable_if<!std::is_same_v<EmptyDeleter, Deleter>>>
-    BucketCacheIndex(size_t cells_, Deleter deleter_)
-        : deleter(deleter_)
-        , buckets(roundUpToPowerOfTwoOrZero(cells_) / bucket_size)
-        , bucket_mask(buckets - 1)
-        , cells(buckets * bucket_size)
-        , positions((buckets / 2) + 1)
-    {
-        for (auto & cell : cells)
-            cell.index.setNotExists();
-        for (size_t bucket = 0; bucket < buckets; ++bucket)
-            setPosition(bucket, 0);
-    }
-
-    void set(K key, V val)
-    {
-        const size_t bucket = (hash(key) & bucket_mask);
-        const size_t idx = getCellIndex(key, bucket);
-        if (!cells[idx].index.exists())
-        {
-            incPosition(bucket);
-            ++sz;
-        }
-
-        cells[idx].key = key;
-        cells[idx].index = val;
-    }
-
-    template <typename = std::enable_if<!std::is_same_v<EmptyDeleter, Deleter>>>
-    void setWithDelete(K key, V val)
-    {
-        const size_t bucket = (hash(key) & bucket_mask);
-        const size_t idx = getCellIndex(key, bucket);
-        if (!cells[idx].index.exists())
-        {
-            incPosition(bucket);
-            ++sz;
-        }
-        else
-        {
-            deleter(cells[idx].key);
-        }
-
-        cells[idx].key = key;
-        cells[idx].index = val;
-    }
-
-    bool get(K key, V & val) const
-    {
-        const size_t bucket = (hash(key) & bucket_mask);
-        const size_t idx = getCellIndex(key, bucket);
-        if (!cells[idx].index.exists() || cells[idx].key != key)
-            return false;
-        val = cells[idx].index;
-        return true;
-    }
-
-    bool getKeyAndValue(K & key, V & val) const
-    {
-        const size_t bucket = (hash(key) & bucket_mask);
-        const size_t idx = getCellIndex(key, bucket);
-        if (!cells[idx].index.exists() || cells[idx].key != key)
-            return false;
-        key = cells[idx].key;
-        val = cells[idx].index;
-        return true;
-    }
-
-    bool erase(K key)
-    {
-        const size_t bucket = (hash(key) & bucket_mask);
-        const size_t idx = getCellIndex(key, bucket);
-        if (!cells[idx].index.exists() || cells[idx].key != key)
-            return false;
-
-        cells[idx].index.setNotExists();
-        --sz;
-        if constexpr (!std::is_same_v<EmptyDeleter, Deleter>)
-            deleter(cells[idx].key);
-
-        return true;
-    }
-
-    size_t size() const
-    {
-        return sz;
-    }
-
-    size_t capacity() const
-    {
-        return cells.size();
-    }
-
-    auto keys() const
-    {
-        std::vector<K> res;
-        for (const auto & cell : cells)
-        {
-            if (cell.index.exists())
-            {
-                res.push_back(cell.key);
-            }
-        }
-        return res;
-    }
-
-private:
-    /// Searches for the key in the bucket.
-    /// Returns index of cell with provided key.
-    size_t getCellIndex(const K key, const size_t bucket) const
-    {
-        const size_t pos = getPosition(bucket);
-        for (int idx = 7; idx >= 0; --idx)
-        {
-            const size_t cur = ((pos + 1 + idx) & pos_mask);
-            if (cells[bucket * bucket_size + cur].index.exists() &&
-                cells[bucket * bucket_size + cur].key == key)
-            {
-                return bucket * bucket_size + cur;
-            }
-        }
-
-        return bucket * bucket_size + pos;
-    }
-
-    /// Returns current position for write in the bucket.
-    size_t getPosition(const size_t bucket) const
-    {
-        const size_t idx = (bucket >> 1);
-        if ((bucket & 1) == 0)
-            return ((positions[idx] >> 4) & pos_mask);
-        return (positions[idx] & pos_mask);
-    }
-
-    /// Sets current posiotion in the bucket.
-    void setPosition(const size_t bucket, const size_t pos)
-    {
-        const size_t idx = bucket >> 1;
-        if ((bucket & 1) == 0)
-            positions[idx] = ((pos << 4) | (positions[idx] & ((1 << 4) - 1)));
-        else
-            positions[idx] = (pos | (positions[idx] & (((1 << 4) - 1) << 4)));
-    }
-
-    void incPosition(const size_t bucket)
-    {
-        setPosition(bucket, (getPosition(bucket) + 1) & pos_mask);
-    }
-
-    static constexpr size_t bucket_size = 8;
-    static constexpr size_t pos_size = 3;
-    static constexpr size_t pos_mask = (1 << pos_size) - 1;
-
-    Hasher hash;
-    Deleter deleter;
-
-    size_t buckets;
-    size_t bucket_mask;
-
-    std::vector<Cell> cells;
-    std::vector<char> positions;
-    size_t sz = 0;
-};
-
-}
diff --git a/src/Dictionaries/CMakeLists.txt b/src/Dictionaries/CMakeLists.txt
index 4d6ab4b85f8..563c0f3914b 100644
--- a/src/Dictionaries/CMakeLists.txt
+++ b/src/Dictionaries/CMakeLists.txt
@@ -20,6 +20,10 @@ target_link_libraries(clickhouse_dictionaries
         string_utils
 )
 
+target_link_libraries(clickhouse_dictionaries
+    PUBLIC
+        abseil_swiss_tables)
+
 if(USE_CASSANDRA)
     target_include_directories(clickhouse_dictionaries SYSTEM PRIVATE ${CASSANDRA_INCLUDE_DIR})
 endif()
diff --git a/src/Dictionaries/CacheDictionary.cpp b/src/Dictionaries/CacheDictionary.cpp
index 67bcab109ea..b1b8ebed5bd 100644
--- a/src/Dictionaries/CacheDictionary.cpp
+++ b/src/Dictionaries/CacheDictionary.cpp
@@ -1,25 +1,21 @@
 #include "CacheDictionary.h"
 
 #include <memory>
-#include <Columns/ColumnString.h>
-#include <Common/BitHelpers.h>
-#include <Common/CurrentMetrics.h>
-#include <Common/HashTable/Hash.h>
-#include <Common/ProfileEvents.h>
-#include <Common/ProfilingScopedRWLock.h>
-#include <Common/randomSeed.h>
-#include <Common/typeid_cast.h>
-#include <Core/Defines.h>
-#include <IO/WriteBufferFromOStream.h>
+
 #include <ext/range.h>
 #include <ext/size.h>
 #include <ext/map.h>
 #include <ext/chrono_io.h>
-#include <Common/setThreadName.h>
-#include <DataTypes/DataTypesDecimal.h>
-#include "DictionaryBlockInputStream.h"
-#include "DictionaryFactory.h"
-#include <Functions/FunctionHelpers.h>
+
+#include <Core/Defines.h>
+#include <Common/CurrentMetrics.h>
+#include <Common/HashTable/Hash.h>
+#include <Common/HashTable/HashSet.h>
+#include <Common/ProfileEvents.h>
+#include <Common/ProfilingScopedRWLock.h>
+
+#include <Dictionaries/DictionaryBlockInputStream.h>
+#include <Dictionaries/HierarchyDictionariesUtils.h>
 
 namespace ProfileEvents
 {
@@ -40,88 +36,82 @@ namespace CurrentMetrics
 extern const Metric DictCacheRequests;
 }
 
-
 namespace DB
 {
 namespace ErrorCodes
 {
     extern const int CACHE_DICTIONARY_UPDATE_FAIL;
-    extern const int TYPE_MISMATCH;
-    extern const int BAD_ARGUMENTS;
     extern const int UNSUPPORTED_METHOD;
-    extern const int TOO_SMALL_BUFFER_SIZE;
-    extern const int TIMEOUT_EXCEEDED;
 }
 
-
-inline size_t CacheDictionary::getCellIdx(const Key id) const
-{
-    const auto hash = intHash64(id);
-    const auto idx = hash & size_overlap_mask;
-    return idx;
-}
-
-
-CacheDictionary::CacheDictionary(
+template <DictionaryKeyType dictionary_key_type>
+CacheDictionary<dictionary_key_type>::CacheDictionary(
     const StorageID & dict_id_,
     const DictionaryStructure & dict_struct_,
     DictionarySourcePtr source_ptr_,
+    CacheDictionaryStoragePtr cache_storage_ptr_,
+    CacheDictionaryUpdateQueueConfiguration update_queue_configuration_,
     DictionaryLifetime dict_lifetime_,
-    size_t strict_max_lifetime_seconds_,
-    size_t size_,
-    bool allow_read_expired_keys_,
-    size_t max_update_queue_size_,
-    size_t update_queue_push_timeout_milliseconds_,
-    size_t query_wait_timeout_milliseconds_,
-    size_t max_threads_for_updates_)
+    bool allow_read_expired_keys_)
     : IDictionary(dict_id_)
     , dict_struct(dict_struct_)
     , source_ptr{std::move(source_ptr_)}
+    , cache_storage_ptr(cache_storage_ptr_)
+    , update_queue(
+        dict_id_.getNameForLogs(),
+        update_queue_configuration_,
+        [this](CacheDictionaryUpdateUnitPtr<dictionary_key_type> unit_to_update)
+        {
+            update(unit_to_update);
+        })
     , dict_lifetime(dict_lifetime_)
-    , strict_max_lifetime_seconds(strict_max_lifetime_seconds_)
-    , allow_read_expired_keys(allow_read_expired_keys_)
-    , max_update_queue_size(max_update_queue_size_)
-    , update_queue_push_timeout_milliseconds(update_queue_push_timeout_milliseconds_)
-    , query_wait_timeout_milliseconds(query_wait_timeout_milliseconds_)
-    , max_threads_for_updates(max_threads_for_updates_)
     , log(&Poco::Logger::get("ExternalDictionaries"))
-    , size{roundUpToPowerOfTwoOrZero(std::max(size_, size_t(max_collision_length)))}
-    , size_overlap_mask{this->size - 1}
-    , cells{this->size}
+    , allow_read_expired_keys(allow_read_expired_keys_)
     , rnd_engine(randomSeed())
-    , update_queue(max_update_queue_size_)
-    , update_pool(max_threads_for_updates)
 {
     if (!source_ptr->supportsSelectiveLoad())
-        throw Exception{full_name + ": source cannot be used with CacheDictionary", ErrorCodes::UNSUPPORTED_METHOD};
-
-    createAttributes();
-    for (size_t i = 0; i < max_threads_for_updates; ++i)
-        update_pool.scheduleOrThrowOnError([this] { updateThreadFunction(); });
+        throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "{}: source cannot be used with CacheDictionary", full_name);
 }
 
-CacheDictionary::~CacheDictionary()
+template <DictionaryKeyType dictionary_key_type>
+CacheDictionary<dictionary_key_type>::~CacheDictionary()
 {
-    finished = true;
-    update_queue.clear();
-    for (size_t i = 0; i < max_threads_for_updates; ++i)
-    {
-        auto empty_finishing_ptr = std::make_shared<UpdateUnit>(std::vector<Key>());
-        update_queue.push(empty_finishing_ptr);
-    }
-    update_pool.wait();
+    update_queue.stopAndWait();
 }
 
-size_t CacheDictionary::getBytesAllocated() const
+template <DictionaryKeyType dictionary_key_type>
+size_t CacheDictionary<dictionary_key_type>::getElementCount() const
+{
+    const ProfilingScopedReadRWLock read_lock{rw_lock, ProfileEvents::DictCacheLockReadNs};
+    return cache_storage_ptr->getSize();
+}
+
+template <DictionaryKeyType dictionary_key_type>
+size_t CacheDictionary<dictionary_key_type>::getBytesAllocated() const
 {
     /// In case of existing string arena we check the size of it.
     /// But the same appears in setAttributeValue() function, which is called from update() function
     /// which in turn is called from another thread.
     const ProfilingScopedReadRWLock read_lock{rw_lock, ProfileEvents::DictCacheLockReadNs};
-    return bytes_allocated + (string_arena ? string_arena->size() : 0);
+    return cache_storage_ptr->getBytesAllocated();
 }
 
-const IDictionarySource * CacheDictionary::getSource() const
+template <DictionaryKeyType dictionary_key_type>
+double CacheDictionary<dictionary_key_type>::getLoadFactor() const
+{
+    const ProfilingScopedReadRWLock read_lock{rw_lock, ProfileEvents::DictCacheLockReadNs};
+    return cache_storage_ptr->getLoadFactor();
+}
+
+template <DictionaryKeyType dictionary_key_type>
+std::exception_ptr CacheDictionary<dictionary_key_type>::getLastException() const
+{
+    const ProfilingScopedReadRWLock read_lock{rw_lock, ProfileEvents::DictCacheLockReadNs};
+    return last_exception;
+}
+
+template <DictionaryKeyType dictionary_key_type>
+const IDictionarySource * CacheDictionary<dictionary_key_type>::getSource() const
 {
     /// Mutex required here because of the getSourceAndUpdateIfNeeded() function
     /// which is used from another thread.
@@ -129,1154 +119,444 @@ const IDictionarySource * CacheDictionary::getSource() const
     return source_ptr.get();
 }
 
-void CacheDictionary::toParent(const PaddedPODArray<Key> & ids, PaddedPODArray<Key> & out) const
-{
-    const auto null_value = std::get<UInt64>(hierarchical_attribute->null_value);
-    DictionaryDefaultValueExtractor<UInt64> default_value_extractor(null_value);
-    getItemsNumberImpl<UInt64, UInt64>(*hierarchical_attribute, ids, out, default_value_extractor);
-}
-
-
-/// Allow to use single value in same way as array.
-static inline CacheDictionary::Key getAt(const PaddedPODArray<CacheDictionary::Key> & arr, const size_t idx)
-{
-    return arr[idx];
-}
-static inline CacheDictionary::Key getAt(const CacheDictionary::Key & value, const size_t)
-{
-    return value;
-}
-
-
-template <typename AncestorType>
-void CacheDictionary::isInImpl(const PaddedPODArray<Key> & child_ids, const AncestorType & ancestor_ids, PaddedPODArray<UInt8> & out) const
-{
-    /// Transform all children to parents until ancestor id or null_value will be reached.
-
-    size_t out_size = out.size();
-    memset(out.data(), 0xFF, out_size); /// 0xFF means "not calculated"
-
-    const auto null_value = std::get<UInt64>(hierarchical_attribute->null_value);
-
-    PaddedPODArray<Key> children(out_size, 0);
-    PaddedPODArray<Key> parents(child_ids.begin(), child_ids.end());
-
-    for (size_t i = 0; i < DBMS_HIERARCHICAL_DICTIONARY_MAX_DEPTH; ++i)
-    {
-        size_t out_idx = 0;
-        size_t parents_idx = 0;
-        size_t new_children_idx = 0;
-
-        while (out_idx < out_size)
-        {
-            /// Already calculated
-            if (out[out_idx] != 0xFF)
-            {
-                ++out_idx;
-                continue;
-            }
-
-            /// No parent
-            if (parents[parents_idx] == null_value)
-            {
-                out[out_idx] = 0;
-            }
-            /// Found ancestor
-            else if (parents[parents_idx] == getAt(ancestor_ids, parents_idx))
-            {
-                out[out_idx] = 1;
-            }
-            /// Loop detected
-            else if (children[new_children_idx] == parents[parents_idx])
-            {
-                out[out_idx] = 1;
-            }
-            /// Found intermediate parent, add this value to search at next loop iteration
-            else
-            {
-                children[new_children_idx] = parents[parents_idx];
-                ++new_children_idx;
-            }
-
-            ++out_idx;
-            ++parents_idx;
-        }
-
-        if (new_children_idx == 0)
-            break;
-
-        /// Transform all children to its parents.
-        children.resize(new_children_idx);
-        parents.resize(new_children_idx);
-
-        toParent(children, parents);
-    }
-}
-
-void CacheDictionary::isInVectorVector(
-    const PaddedPODArray<Key> & child_ids, const PaddedPODArray<Key> & ancestor_ids, PaddedPODArray<UInt8> & out) const
-{
-    isInImpl(child_ids, ancestor_ids, out);
-}
-
-void CacheDictionary::isInVectorConstant(const PaddedPODArray<Key> & child_ids, const Key ancestor_id, PaddedPODArray<UInt8> & out) const
-{
-    isInImpl(child_ids, ancestor_id, out);
-}
-
-void CacheDictionary::isInConstantVector(const Key child_id, const PaddedPODArray<Key> & ancestor_ids, PaddedPODArray<UInt8> & out) const
-{
-    /// Special case with single child value.
-
-    const auto null_value = std::get<UInt64>(hierarchical_attribute->null_value);
-
-    PaddedPODArray<Key> child(1, child_id);
-    PaddedPODArray<Key> parent(1);
-    std::vector<Key> ancestors(1, child_id);
-
-    /// Iteratively find all ancestors for child.
-    for (size_t i = 0; i < DBMS_HIERARCHICAL_DICTIONARY_MAX_DEPTH; ++i)
-    {
-        toParent(child, parent);
-
-        if (parent[0] == null_value)
-            break;
-
-        child[0] = parent[0];
-        ancestors.push_back(parent[0]);
-    }
-
-    /// Assuming short hierarchy, so linear search is Ok.
-    for (size_t i = 0, out_size = out.size(); i < out_size; ++i)
-        out[i] = std::find(ancestors.begin(), ancestors.end(), ancestor_ids[i]) != ancestors.end();
-}
-
-ColumnPtr CacheDictionary::getColumn(
+template <DictionaryKeyType dictionary_key_type>
+ColumnPtr CacheDictionary<dictionary_key_type>::getColumn(
     const std::string & attribute_name,
     const DataTypePtr & result_type,
     const Columns & key_columns,
-    const DataTypes &,
-    const ColumnPtr default_values_column) const
+    const DataTypes & key_types,
+    const ColumnPtr & default_values_column) const
 {
-    ColumnPtr result;
+    return getColumns({attribute_name}, {result_type}, key_columns, key_types, {default_values_column}).front();
+}
 
-    PaddedPODArray<Key> backup_storage;
-    const auto & keys = getColumnVectorData(this, key_columns.front(), backup_storage);
-    auto keys_size = keys.size();
+template <DictionaryKeyType dictionary_key_type>
+Columns CacheDictionary<dictionary_key_type>::getColumns(
+    const Strings & attribute_names,
+    const DataTypes & result_types,
+    const Columns & key_columns,
+    const DataTypes & key_types,
+    const Columns & default_values_columns) const
+{
+    /**
+    * Flow of getColumsImpl
+    * 1. Get fetch result from storage
+    * 2. If all keys are found in storage and not expired
+    *   2.1. If storage returns fetched columns in order of keys then result is returned to client.
+    *   2.2. If storage does not return fetched columns in order of keys then reorder
+    *    result columns and return result to client.
+    * 3. If all keys are found in storage but some of them are expired and we allow to read expired keys
+    * start async request to source and perform actions from step 2 for result returned from storage.
+    * 4. If some keys are found and some are not, start sync update from source.
+    * 5. Aggregate columns returned from storage and source, if key is not found in storage and in source
+    * use default value.
+    */
 
-    auto & attribute = getAttribute(attribute_name);
-    const auto & dictionary_attribute = dict_struct.getAttribute(attribute_name, result_type);
+    if (dictionary_key_type == DictionaryKeyType::complex)
+        dict_struct.validateKeyTypes(key_types);
+
+    DictionaryKeysArenaHolder<dictionary_key_type> arena_holder;
+    DictionaryKeysExtractor<dictionary_key_type> extractor(key_columns, arena_holder.getComplexKeyArena());
+    auto keys = extractor.extractAllKeys();
+
+    DictionaryStorageFetchRequest request(dict_struct, attribute_names, result_types, default_values_columns);
+
+    FetchResult result_of_fetch_from_storage;
 
-    auto type_call = [&](const auto &dictionary_attribute_type)
     {
-        using Type = std::decay_t<decltype(dictionary_attribute_type)>;
-        using AttributeType = typename Type::AttributeType;
-        using ColumnProvider = DictionaryAttributeColumnProvider<AttributeType>;
+        const ProfilingScopedReadRWLock read_lock{rw_lock, ProfileEvents::DictCacheLockWriteNs};
+        result_of_fetch_from_storage = cache_storage_ptr->fetchColumnsForKeys(keys, request);
+    }
 
-        const auto & null_value = std::get<AttributeType>(attribute.null_value);
-        DictionaryDefaultValueExtractor<AttributeType> default_value_extractor(null_value, default_values_column);
+    size_t found_keys_size = result_of_fetch_from_storage.found_keys_size;
+    size_t expired_keys_size = result_of_fetch_from_storage.expired_keys_size;
+    size_t not_found_keys_size = result_of_fetch_from_storage.not_found_keys_size;
 
-        auto column = ColumnProvider::getColumn(dictionary_attribute, keys_size);
+    ProfileEvents::increment(ProfileEvents::DictCacheKeysHit, found_keys_size);
+    ProfileEvents::increment(ProfileEvents::DictCacheKeysExpired, expired_keys_size);
+    ProfileEvents::increment(ProfileEvents::DictCacheKeysNotFound, not_found_keys_size);
 
-        if constexpr (std::is_same_v<AttributeType, String>)
-        {
-            getItemsString(attribute, keys, column.get(), default_value_extractor);
-        }
+    query_count.fetch_add(keys.size());
+    hit_count.fetch_add(found_keys_size);
+
+    MutableColumns & fetched_columns_from_storage = result_of_fetch_from_storage.fetched_columns;
+    const PaddedPODArray<KeyState> & key_index_to_state_from_storage = result_of_fetch_from_storage.key_index_to_state;
+
+    bool source_returns_fetched_columns_in_order_of_keys = cache_storage_ptr->returnsFetchedColumnsInOrderOfRequestedKeys();
+
+    if (not_found_keys_size == 0 && expired_keys_size == 0)
+    {
+        /// All keys were found in storage
+
+        if (source_returns_fetched_columns_in_order_of_keys)
+            return request.filterRequestedColumns(fetched_columns_from_storage);
         else
         {
-            auto & out = column->getData();
-            getItemsNumberImpl<AttributeType, AttributeType>(attribute, keys, out, default_value_extractor);
-        }
+            /// Reorder result from storage to requested keys indexes
+            MutableColumns aggregated_columns = aggregateColumnsInOrderOfKeys(
+                keys,
+                request,
+                fetched_columns_from_storage,
+                key_index_to_state_from_storage);
 
-        result = std::move(column);
-    };
-
-    callOnDictionaryAttributeType(attribute.type, type_call);
-
-    return result;
-}
-
-template <typename AttributeType, typename OutputType, typename DefaultValueExtractor>
-void CacheDictionary::getItemsNumberImpl(
-    Attribute & attribute,
-    const PaddedPODArray<Key> & ids,
-    ResultArrayType<OutputType> & out,
-    DefaultValueExtractor & default_value_extractor) const
-{
-    /// First fill everything with default values
-    const auto rows = ext::size(ids);
-    for (const auto row : ext::range(0, rows))
-        out[row] = default_value_extractor[row];
-
-    /// Maybe there are duplicate keys, so we remember their indices.
-    std::unordered_map<Key, std::vector<size_t>> cache_expired_or_not_found_ids;
-
-    auto & attribute_array = std::get<ContainerPtrType<AttributeType>>(attribute.arrays);
-
-    size_t cache_hit = 0;
-    size_t cache_not_found_count = 0;
-    size_t cache_expired_cound = 0;
-
-    {
-        const ProfilingScopedReadRWLock read_lock{rw_lock, ProfileEvents::DictCacheLockReadNs};
-
-        const auto now = std::chrono::system_clock::now();
-
-        auto insert_to_answer_routine = [&](size_t row, size_t idx)
-        {
-            auto & cell = cells[idx];
-            if (!cell.isDefault())
-                out[row] = static_cast<OutputType>(attribute_array[idx]);
-        };
-
-        /// fetch up-to-date values, decide which ones require update
-        for (const auto row : ext::range(0, rows))
-        {
-            const auto id = ids[row];
-
-            /** cell should be updated if either:
-                *    1. ids do not match,
-                *    2. cell has expired,
-                *    3. explicit defaults were specified and cell was set default. */
-
-            const auto [cell_idx, state] = findCellIdxForGet(id, now);
-
-            if (state == ResultState::FoundAndValid)
-            {
-                ++cache_hit;
-                insert_to_answer_routine(row, cell_idx);
-            }
-            else if (state == ResultState::NotFound || state == ResultState::FoundButExpiredPermanently)
-            {
-                ++cache_not_found_count;
-                cache_expired_or_not_found_ids[id].push_back(row);
-            }
-            else if (state == ResultState::FoundButExpired)
-            {
-                cache_expired_cound++;
-                cache_expired_or_not_found_ids[id].push_back(row);
-
-                if (allow_read_expired_keys)
-                    insert_to_answer_routine(row, cell_idx);
-            }
+            return request.filterRequestedColumns(aggregated_columns);
         }
     }
 
-    ProfileEvents::increment(ProfileEvents::DictCacheKeysExpired, cache_expired_cound);
-    ProfileEvents::increment(ProfileEvents::DictCacheKeysNotFound, cache_not_found_count);
-    ProfileEvents::increment(ProfileEvents::DictCacheKeysHit, cache_hit);
+    size_t keys_to_update_size = not_found_keys_size + expired_keys_size;
+    auto update_unit = std::make_shared<CacheDictionaryUpdateUnit<dictionary_key_type>>(key_columns, key_index_to_state_from_storage, request, keys_to_update_size);
 
-    query_count.fetch_add(rows, std::memory_order_relaxed);
-    hit_count.fetch_add(rows - cache_not_found_count - cache_expired_cound, std::memory_order_release);
+    HashMap<KeyType, size_t> requested_keys_to_fetched_columns_during_update_index;
+    MutableColumns fetched_columns_during_update = request.makeAttributesResultColumns();
 
-    if (!cache_not_found_count)
+    if (not_found_keys_size == 0 && expired_keys_size > 0 && allow_read_expired_keys)
     {
-        /// Nothing to update - return
-        if (!cache_expired_cound)
-            return;
+        /// Start async update only if allow read expired keys and all keys are found
+        update_queue.tryPushToUpdateQueueOrThrow(update_unit);
 
-        /// Update async only if allow_read_expired_keys_is_enabledadd condvar usage and better code
-        if (allow_read_expired_keys)
-        {
-            std::vector<Key> required_expired_ids;
-            required_expired_ids.reserve(cache_expired_cound);
-            std::transform(std::begin(cache_expired_or_not_found_ids), std::end(cache_expired_or_not_found_ids),
-                           std::back_inserter(required_expired_ids), [](auto & pair) { return pair.first; });
-
-            /// request new values
-            auto update_unit_ptr = std::make_shared<UpdateUnit>(std::move(required_expired_ids));
-
-            tryPushToUpdateQueueOrThrow(update_unit_ptr);
-
-            /// Nothing to do - return
-            return;
-        }
-    }
-
-    /// From this point we have to update all keys sync.
-    /// Maybe allow_read_expired_keys_from_cache_dictionary is disabled
-    /// and there no cache_not_found_ids but some cache_expired.
-
-    std::vector<Key> required_ids;
-    required_ids.reserve(cache_not_found_count + cache_expired_cound);
-    std::transform(std::begin(cache_expired_or_not_found_ids), std::end(cache_expired_or_not_found_ids),
-                   std::back_inserter(required_ids), [](auto & pair) { return pair.first; });
-
-    /// Request new values
-    auto update_unit_ptr = std::make_shared<UpdateUnit>(std::move(required_ids));
-
-    tryPushToUpdateQueueOrThrow(update_unit_ptr);
-    waitForCurrentUpdateFinish(update_unit_ptr);
-
-    /// Add updated keys to answer.
-
-    const size_t attribute_index = getAttributeIndex(attribute.name);
-
-    for (auto & [key, value] : update_unit_ptr->found_ids)
-    {
-        if (value.found)
-        {
-            for (const size_t row : cache_expired_or_not_found_ids[key])
-                out[row] = std::get<OutputType>(value.values[attribute_index]);
-        }
-    }
-}
-
-void CacheDictionary::getItemsString(
-    Attribute & attribute,
-    const PaddedPODArray<Key> & ids,
-    ColumnString * out,
-    DictionaryDefaultValueExtractor<String> & default_value_extractor) const
-{
-    const auto rows = ext::size(ids);
-
-    /// Save on some allocations.
-    out->getOffsets().reserve(rows);
-
-    auto & attribute_array = std::get<ContainerPtrType<StringRef>>(attribute.arrays);
-
-    auto found_outdated_values = false;
-
-    /// Perform optimistic version, fallback to pessimistic if failed.
-    {
-        const ProfilingScopedReadRWLock read_lock{rw_lock, ProfileEvents::DictCacheLockReadNs};
-
-        const auto now = std::chrono::system_clock::now();
-
-        /// Fetch up-to-date values, discard on fail.
-        for (const auto row : ext::range(0, rows))
-        {
-            const auto id = ids[row];
-            const auto [cell_idx, state] = findCellIdxForGet(id, now);
-
-            if (state == ResultState::FoundAndValid)
-            {
-                auto & cell = cells[cell_idx];
-                const auto string_ref = cell.isDefault() ? default_value_extractor[row] : attribute_array[cell_idx];
-                out->insertData(string_ref.data, string_ref.size);
-            }
-            else
-            {
-                found_outdated_values = true;
-                break;
-            }
-        }
-    }
-
-    /// Optimistic code completed successfully.
-    if (!found_outdated_values)
-    {
-        query_count.fetch_add(rows, std::memory_order_relaxed);
-        hit_count.fetch_add(rows, std::memory_order_release);
-        ProfileEvents::increment(ProfileEvents::DictCacheKeysHit, ids.size());
-        return;
-    }
-
-    /// Now onto the pessimistic one, discard possible partial results from the optimistic path.
-    out->getChars().resize_assume_reserved(0);
-    out->getOffsets().resize_assume_reserved(0);
-
-    /// Mapping: <id> -> { all indices `i` of `ids` such that `ids[i]` = <id> }
-    std::unordered_map<Key, std::vector<size_t>> cache_expired_or_not_found_ids;
-    /// we are going to store every string separately
-    std::unordered_map<Key, String> local_cache;
-
-    size_t cache_not_found_count = 0;
-    size_t cache_expired_count = 0;
-
-    size_t total_length = 0;
-    size_t cache_hit = 0;
-    {
-        const ProfilingScopedReadRWLock read_lock{rw_lock, ProfileEvents::DictCacheLockReadNs};
-
-        const auto now = std::chrono::system_clock::now();
-
-        auto insert_value_routine = [&](size_t row, size_t id, size_t cell_idx)
-        {
-            const auto & cell = cells[cell_idx];
-            const auto string_ref = cell.isDefault() ? default_value_extractor[row] : attribute_array[cell_idx];
-
-            /// Do not store default, but count it in total length.
-            if (!cell.isDefault())
-                local_cache[id] = String{string_ref};
-
-            total_length += string_ref.size + 1;
-        };
-
-        for (const auto row : ext::range(0, ids.size()))
-        {
-            const auto id = ids[row];
-            const auto [cell_idx, state] = findCellIdxForGet(id, now);
-
-            if (state == ResultState::FoundAndValid)
-            {
-                ++cache_hit;
-                insert_value_routine(row, id, cell_idx);
-            }
-            else if (state == ResultState::NotFound || state == ResultState::FoundButExpiredPermanently)
-            {
-                ++cache_not_found_count;
-                cache_expired_or_not_found_ids[id].push_back(row);
-            }
-            else if (state == ResultState::FoundButExpired)
-            {
-                ++cache_expired_count;
-                cache_expired_or_not_found_ids[id].push_back(row);
-
-                if (allow_read_expired_keys)
-                    insert_value_routine(row, id, cell_idx);
-            }
-        }
-    }
-
-    ProfileEvents::increment(ProfileEvents::DictCacheKeysExpired, cache_expired_count);
-    ProfileEvents::increment(ProfileEvents::DictCacheKeysNotFound, cache_not_found_count);
-    ProfileEvents::increment(ProfileEvents::DictCacheKeysHit, cache_hit);
-
-    query_count.fetch_add(rows, std::memory_order_relaxed);
-    hit_count.fetch_add(rows - cache_expired_count - cache_not_found_count, std::memory_order_release);
-
-    /// Async update of expired keys.
-    if (!cache_not_found_count)
-    {
-        if (allow_read_expired_keys && cache_expired_count)
-        {
-            std::vector<Key> required_expired_ids;
-            required_expired_ids.reserve(cache_expired_count);
-            std::transform(std::begin(cache_expired_or_not_found_ids), std::end(cache_expired_or_not_found_ids),
-                           std::back_inserter(required_expired_ids), [](auto & pair) { return pair.first; });
-
-            auto update_unit_ptr = std::make_shared<UpdateUnit>(std::move(required_expired_ids));
-
-            tryPushToUpdateQueueOrThrow(update_unit_ptr);
-
-            /// Insert all found keys and defaults to output array.
-            out->getChars().reserve(total_length);
-
-            for (const auto row : ext::range(0, ext::size(ids)))
-            {
-                const auto id = ids[row];
-                StringRef value;
-
-                /// Previously we stored found keys in map.
-                const auto it = local_cache.find(id);
-                if (it != local_cache.end())
-                    value = StringRef(it->second);
-                else
-                    value = default_value_extractor[row];
-
-                out->insertData(value.data, value.size);
-            }
-
-            /// Nothing to do else.
-            return;
-        }
-    }
-
-    /// We will request both cache_not_found_ids and cache_expired_ids sync.
-    std::vector<Key> required_ids;
-    required_ids.reserve(cache_not_found_count + cache_expired_count);
-    std::transform(
-        std::begin(cache_expired_or_not_found_ids), std::end(cache_expired_or_not_found_ids),
-        std::back_inserter(required_ids), [](auto & pair) { return pair.first; });
-
-    auto update_unit_ptr = std::make_shared<UpdateUnit>(std::move(required_ids));
-
-    tryPushToUpdateQueueOrThrow(update_unit_ptr);
-    waitForCurrentUpdateFinish(update_unit_ptr);
-
-    const size_t attribute_index = getAttributeIndex(attribute.name);
-
-    /// Only calculate the total length.
-    for (auto & [key, value] : update_unit_ptr->found_ids)
-    {
-        if (value.found)
-        {
-            const auto found_value_ref = std::get<String>(value.values[attribute_index]);
-            total_length += (found_value_ref.size() + 1) * cache_expired_or_not_found_ids[key].size();
-        }
+        if (source_returns_fetched_columns_in_order_of_keys)
+            return request.filterRequestedColumns(fetched_columns_from_storage);
         else
         {
-            for (const auto row : cache_expired_or_not_found_ids[key])
-                total_length += default_value_extractor[row].size + 1;
+            /// Reorder result from storage to requested keys indexes
+            MutableColumns aggregated_columns = aggregateColumnsInOrderOfKeys(
+                keys,
+                request,
+                fetched_columns_from_storage,
+                key_index_to_state_from_storage);
+
+            return request.filterRequestedColumns(aggregated_columns);
         }
     }
-
-    out->getChars().reserve(total_length);
-
-    for (const auto row : ext::range(0, ext::size(ids)))
+    else
     {
-        const auto id = ids[row];
-        StringRef value;
+        /// Start sync update
+        update_queue.tryPushToUpdateQueueOrThrow(update_unit);
+        update_queue.waitForCurrentUpdateFinish(update_unit);
 
-        /// We have two maps: found in cache and found in source.
-        const auto local_it = local_cache.find(id);
-        if (local_it != local_cache.end())
-            value = StringRef(local_it->second);
-        else
-        {
-            const auto found_it = update_unit_ptr->found_ids.find(id);
-
-            /// Previously we didn't store defaults in local cache.
-            if (found_it != update_unit_ptr->found_ids.end() && found_it->second.found)
-                value = std::get<String>(found_it->second.values[attribute_index]);
-            else
-                value = default_value_extractor[row];
-        }
-
-        out->insertData(value.data, value.size);
+        requested_keys_to_fetched_columns_during_update_index = std::move(update_unit->requested_keys_to_fetched_columns_during_update_index);
+        fetched_columns_during_update = std::move(update_unit->fetched_columns_during_update);
     }
+
+    MutableColumns aggregated_columns = aggregateColumns(
+        keys,
+        request,
+        fetched_columns_from_storage,
+        key_index_to_state_from_storage,
+        fetched_columns_during_update,
+        requested_keys_to_fetched_columns_during_update_index);
+
+    return request.filterRequestedColumns(aggregated_columns);
 }
 
-
-template<class... Ts>
-struct Overloaded : Ts... {using Ts::operator()...;};
-
-template<class... Ts>
-Overloaded(Ts...) -> Overloaded<Ts...>;
-
-std::string CacheDictionary::AttributeValuesForKey::dump()
+template <DictionaryKeyType dictionary_key_type>
+ColumnUInt8::Ptr CacheDictionary<dictionary_key_type>::hasKeys(const Columns & key_columns, const DataTypes & key_types) const
 {
-    WriteBufferFromOwnString os;
-    for (auto & attr : values)
-        std::visit(Overloaded {
-            [&os](UInt8 arg)   { os << "type: UInt8, value: "   <<  std::to_string(arg) << "\n"; },
-            [&os](UInt16 arg)  { os << "type: UInt16, value: "  <<  std::to_string(arg) << "\n"; },
-            [&os](UInt32 arg)  { os << "type: UInt32, value: "  <<  std::to_string(arg) << "\n"; },
-            [&os](UInt64 arg)  { os << "type: UInt64, value: "  <<  std::to_string(arg) << "\n"; },
-            [&os](UInt128 arg) { os << "type: UInt128, value: " << arg.toHexString() << "\n"; },
-            [&os](Int8 arg)   { os << "type: Int8, value: "   <<  std::to_string(arg) << "\n"; },
-            [&os](Int16 arg)  { os << "type: Int16, value: "  <<  std::to_string(arg) << "\n"; },
-            [&os](Int32 arg)  { os << "type: Int32, value: "  <<  std::to_string(arg) << "\n"; },
-            [&os](Int64 arg)  { os << "type: Int64, value: "  <<  std::to_string(arg) << "\n"; },
-            [&os](Decimal32 arg)   { os << "type: Decimal32, value: "  <<  std::to_string(arg) << "\n"; },
-            [&os](Decimal64 arg)   { os << "type: Decimal64, value: "  <<  std::to_string(arg) << "\n"; },
-            [&os](Decimal128)  { os << "type: Decimal128, value: ???" << "\n" ; },
-            [&os](Float32 arg)   { os << "type: Float32, value: "  <<  std::to_string(arg) << "\n"; },
-            [&os](Float64 arg)   { os << "type: Float64, value: "  <<  std::to_string(arg) << "\n"; },
-            [&os](String arg)  { os << "type: String, value: " <<  arg + "\n"; }
-        }, attr);
-    return os.str();
-};
+    /**
+    * Flow of hasKeys. It is similar to getColumns. But there is an important detail, if key is identified with default value in storage
+    * it means that in hasKeys result this key will be false.
+    *
+    * 1. Get fetch result from storage
+    * 2. If all keys are found in storage and not expired and there are no default keys return that we have all keys.
+    * Otherwise set allow_expired_keys_during_aggregation and go to step 5.
+    * 3. If all keys are found in storage and some of them are expired and allow_read_expired keys is true return that we have all keys.
+    * Otherwise set allow_expired_keys_during_aggregation and go to step 5.
+    * 4. If not all keys are found in storage start sync update from source.
+    * 5. Start aggregation of keys from source and storage.
+    * If we allow read expired keys from step 2 or 3 then count them as founded in storage.
+    * Check if key was found in storage not default for that key set true in result array.
+    * Check that key was fetched during update for that key set true in result array.
+    */
+
+    if (dictionary_key_type == DictionaryKeyType::complex)
+        dict_struct.validateKeyTypes(key_types);
 
 
-std::string CacheDictionary::UpdateUnit::dumpFoundIds()
-{
-    WriteBufferFromOwnString os;
-    for (auto it : found_ids)
+    DictionaryKeysArenaHolder<dictionary_key_type> arena_holder;
+    DictionaryKeysExtractor<dictionary_key_type> extractor(key_columns, arena_holder.getComplexKeyArena());
+    const auto keys = extractor.extractAllKeys();
+
+    /// We make empty request just to fetch if keys exists
+    DictionaryStorageFetchRequest request(dict_struct, {}, {}, {});
+
+    FetchResult result_of_fetch_from_storage;
+
     {
-        os << "Key: " << std::to_string(it.first) << "\n";
-        if (it.second.found)
-            os << it.second.dump() << "\n";
-    }
-    return os.str();
-};
+        /// Write lock on storage
+        const ProfilingScopedWriteRWLock write_lock{rw_lock, ProfileEvents::DictCacheLockWriteNs};
 
-/// Returns cell_idx in handmade open addressing cache table and the state of the cell stored the key.
-CacheDictionary::FindResult CacheDictionary::findCellIdxForGet(const Key & id, const time_point_t now) const
-{
-    auto pos = getCellIdx(id);
-    const auto stop = pos + max_collision_length;
-    for (; pos < stop; ++pos)
-    {
-        const auto cell_idx = pos & size_overlap_mask;
-        const auto & cell = cells[cell_idx];
-
-        if (cell.id != id)
-            continue;
-
-        if (isExpiredPermanently(now, cell.expiresAt()))
-            return {cell_idx, ResultState::FoundButExpiredPermanently};
-
-        if (isExpired(now, cell.expiresAt()))
-            return {cell_idx, ResultState::FoundButExpired};
-
-        return {cell_idx, ResultState::FoundAndValid};
+        result_of_fetch_from_storage = cache_storage_ptr->fetchColumnsForKeys(keys, request);
     }
 
-    return {pos & size_overlap_mask, ResultState::NotFound};
-}
+    size_t found_keys_size = result_of_fetch_from_storage.found_keys_size;
+    size_t expired_keys_size = result_of_fetch_from_storage.expired_keys_size;
+    size_t not_found_keys_size = result_of_fetch_from_storage.not_found_keys_size;
 
-/// Returns cell_idx such that cells[cell_idx].id = id or the oldest cell in bounds of max_coolision_length.
-size_t CacheDictionary::findCellIdxForSet(const Key & id) const
-{
-    auto pos = getCellIdx(id);
-    auto oldest_id = pos;
-    auto oldest_time = time_point_t::max();
-    const auto stop = pos + max_collision_length;
-    for (; pos < stop; ++pos)
+    ProfileEvents::increment(ProfileEvents::DictCacheKeysHit, found_keys_size);
+    ProfileEvents::increment(ProfileEvents::DictCacheKeysExpired, expired_keys_size);
+    ProfileEvents::increment(ProfileEvents::DictCacheKeysNotFound, not_found_keys_size);
+
+    query_count.fetch_add(keys.size());
+    hit_count.fetch_add(found_keys_size);
+
+    size_t keys_to_update_size = expired_keys_size + not_found_keys_size;
+    auto update_unit = std::make_shared<CacheDictionaryUpdateUnit<dictionary_key_type>>(key_columns, result_of_fetch_from_storage.key_index_to_state, request, keys_to_update_size);
+
+    HashMap<KeyType, size_t> requested_keys_to_fetched_columns_during_update_index;
+    bool allow_expired_keys_during_aggregation = false;
+
+    if (not_found_keys_size == 0 && expired_keys_size == 0)
     {
-        const auto cell_idx = pos & size_overlap_mask;
-        const auto & cell = cells[cell_idx];
+        /// All keys were found in storage
 
-        if (cell.id != id)
+        if (result_of_fetch_from_storage.default_keys_size == 0)
+            return ColumnUInt8::create(keys.size(), true);
+
+        allow_expired_keys_during_aggregation = true;
+    }
+    else if (not_found_keys_size == 0 && expired_keys_size > 0 && allow_read_expired_keys)
+    {
+        /// Start async update only if allow read expired keys and all keys are found
+        update_queue.tryPushToUpdateQueueOrThrow(update_unit);
+
+        if (result_of_fetch_from_storage.default_keys_size == 0)
+            return ColumnUInt8::create(keys.size(), true);
+
+        allow_expired_keys_during_aggregation = true;
+    }
+    else
+    {
+        /// Start sync update
+        update_queue.tryPushToUpdateQueueOrThrow(update_unit);
+        update_queue.waitForCurrentUpdateFinish(update_unit);
+
+        requested_keys_to_fetched_columns_during_update_index = std::move(update_unit->requested_keys_to_fetched_columns_during_update_index);
+    }
+
+    auto result = ColumnUInt8::create(keys.size(), false);
+    auto & data = result->getData();
+
+    for (size_t key_index = 0; key_index < keys.size(); ++key_index)
+    {
+        auto key = keys[key_index];
+
+        bool valid_expired_key = allow_expired_keys_during_aggregation && result_of_fetch_from_storage.key_index_to_state[key_index].isExpired();
+
+        if (result_of_fetch_from_storage.key_index_to_state[key_index].isFound() || valid_expired_key)
         {
-            /// maybe we already found nearest expired cell (try minimize collision_length on insert)
-            if (cell.expiresAt() < oldest_time)
-            {
-                oldest_time = cell.expiresAt();
-                oldest_id = cell_idx;
-            }
-            continue;
+            /// Check if key was fetched from cache
+            data[key_index] = !result_of_fetch_from_storage.key_index_to_state[key_index].isDefault();
         }
 
-        /// We found the exact place for id.
-        return cell_idx;
-    }
-
-    return oldest_id;
-}
-
-ColumnUInt8::Ptr CacheDictionary::hasKeys(const Columns & key_columns, const DataTypes &) const
-{
-    PaddedPODArray<Key> backup_storage;
-    const auto& ids = getColumnVectorData(this, key_columns.front(), backup_storage);
-
-    auto result = ColumnUInt8::create(ext::size(ids));
-    auto& out = result->getData();
-
-    /// There are three types of ids.
-    /// - Valid ids. These ids are presented in local cache and their lifetime is not expired.
-    /// - CacheExpired ids. Ids that are in local cache, but their values are rotted (lifetime is expired).
-    /// - CacheNotFound ids. We have to go to external storage to know its value.
-
-    /// Mark everything as absent.
-    const auto rows = ext::size(ids);
-    for (const auto row : ext::range(0, rows))
-        out[row] = false;
-
-    /// Mapping: <id> -> { all indices `i` of `ids` such that `ids[i]` = <id> }
-    std::unordered_map<Key, std::vector<size_t>> cache_expired_or_not_found_ids;
-
-    size_t cache_hit = 0;
-
-    size_t cache_expired_count = 0;
-    size_t cache_not_found_count = 0;
-
-    {
-        const ProfilingScopedReadRWLock read_lock{rw_lock, ProfileEvents::DictCacheLockReadNs};
-
-        const auto now = std::chrono::system_clock::now();
-        /// fetch up-to-date values, decide which ones require update
-        for (const auto row : ext::range(0, rows))
+        if (requested_keys_to_fetched_columns_during_update_index.has(key))
         {
-            const auto id = ids[row];
-            const auto [cell_idx, state] = findCellIdxForGet(id, now);
-            auto & cell = cells[cell_idx];
-
-            auto insert_to_answer_routine = [&] ()
-            {
-                out[row] = !cell.isDefault();
-            };
-
-            if (state == ResultState::FoundAndValid)
-            {
-                ++cache_hit;
-                insert_to_answer_routine();
-            }
-            else if (state == ResultState::NotFound || state == ResultState::FoundButExpiredPermanently)
-            {
-                /// Permanently expired equals to not found semantically.
-                ++cache_not_found_count;
-                cache_expired_or_not_found_ids[id].push_back(row);
-            }
-            else if (state == ResultState::FoundButExpired)
-            {
-                cache_expired_count++;
-                cache_expired_or_not_found_ids[id].push_back(row);
-
-                if (allow_read_expired_keys)
-                    insert_to_answer_routine();
-            }
+            /// Check if key was not in cache and was fetched during update
+            data[key_index] = true;
         }
     }
 
-    ProfileEvents::increment(ProfileEvents::DictCacheKeysExpired, cache_expired_count);
-    ProfileEvents::increment(ProfileEvents::DictCacheKeysNotFound, cache_not_found_count);
-    ProfileEvents::increment(ProfileEvents::DictCacheKeysHit, cache_hit);
-
-    query_count.fetch_add(rows, std::memory_order_relaxed);
-    hit_count.fetch_add(rows - cache_expired_count - cache_not_found_count, std::memory_order_release);
-
-    if (!cache_not_found_count)
-    {
-        /// Nothing to update - return;
-        if (!cache_expired_count)
-            return result;
-
-        if (allow_read_expired_keys)
-        {
-            std::vector<Key> required_expired_ids;
-            required_expired_ids.reserve(cache_expired_count);
-            std::transform(
-                    std::begin(cache_expired_or_not_found_ids), std::end(cache_expired_or_not_found_ids),
-                    std::back_inserter(required_expired_ids), [](auto & pair) { return pair.first; });
-
-            auto update_unit_ptr = std::make_shared<UpdateUnit>(std::move(required_expired_ids));
-
-            tryPushToUpdateQueueOrThrow(update_unit_ptr);
-            /// Update is async - no need to wait.
-            return result;
-        }
-    }
-
-    /// At this point we have two situations.
-    /// There may be both types of keys: expired and not_found.
-    /// We will update them all synchronously.
-
-    std::vector<Key> required_ids;
-    required_ids.reserve(cache_not_found_count + cache_expired_count);
-    std::transform(
-            std::begin(cache_expired_or_not_found_ids), std::end(cache_expired_or_not_found_ids),
-            std::back_inserter(required_ids), [](auto & pair) { return pair.first; });
-
-    auto update_unit_ptr = std::make_shared<UpdateUnit>(std::move(required_ids));
-
-    tryPushToUpdateQueueOrThrow(update_unit_ptr);
-    waitForCurrentUpdateFinish(update_unit_ptr);
-
-    for (auto & [key, value] : update_unit_ptr->found_ids)
-    {
-        if (value.found)
-            for (const auto row : cache_expired_or_not_found_ids[key])
-                out[row] = true;
-    }
-
     return result;
 }
 
-
-void CacheDictionary::createAttributes()
+template <DictionaryKeyType dictionary_key_type>
+ColumnPtr CacheDictionary<dictionary_key_type>::getHierarchy(
+    ColumnPtr key_column [[maybe_unused]],
+    const DataTypePtr & key_type [[maybe_unused]]) const
 {
-    const auto attributes_size = dict_struct.attributes.size();
-    attributes.reserve(attributes_size);
-
-    bytes_allocated += size * sizeof(CellMetadata);
-    bytes_allocated += attributes_size * sizeof(attributes.front());
-
-    for (const auto & attribute : dict_struct.attributes)
+    if (dictionary_key_type == DictionaryKeyType::simple)
     {
-        attribute_index_by_name.emplace(attribute.name, attributes.size());
-        attributes.push_back(createAttributeWithTypeAndName(attribute.underlying_type, attribute.name, attribute.null_value));
-
-        if (attribute.hierarchical)
-        {
-            hierarchical_attribute = &attributes.back();
-
-            if (hierarchical_attribute->type != AttributeUnderlyingType::utUInt64)
-                throw Exception{full_name + ": hierarchical attribute must be UInt64.", ErrorCodes::TYPE_MISMATCH};
-        }
+        auto result = getKeysHierarchyDefaultImplementation(this, key_column, key_type);
+        query_count.fetch_add(key_column->size(), std::memory_order_relaxed);
+        return result;
     }
+    else
+        return nullptr;
 }
 
-/* For unknown reason clang-tidy wants this function to be static, but it uses bytes_allocated, which is a class member.
- * NOLINT(readability-convert-member-functions-to-static) */
-CacheDictionary::Attribute CacheDictionary::createAttributeWithTypeAndName(const AttributeUnderlyingType type, const String & name, const Field & null_value)
+template <DictionaryKeyType dictionary_key_type>
+ColumnUInt8::Ptr CacheDictionary<dictionary_key_type>::isInHierarchy(
+    ColumnPtr key_column [[maybe_unused]],
+    ColumnPtr in_key_column [[maybe_unused]],
+    const DataTypePtr & key_type [[maybe_unused]]) const
 {
-    Attribute attr{type, name, {}, {}};
-
-    switch (type)
+    if (dictionary_key_type == DictionaryKeyType::simple)
     {
-        /* Macro argument should be enclosed in parentheses, but if do so we cannot initialize \
-         * NearestFieldType which takes TYPE as a template parameter. */
-#define DISPATCH(TYPE)\
-        case AttributeUnderlyingType::ut##TYPE:\
-        {\
-            attr.null_value = TYPE(null_value.get<NearestFieldType<TYPE>>()); /* NOLINT(bugprone-macro-parentheses) */ \
-            attr.arrays = std::make_unique<ContainerType<TYPE>>(size); /* NOLINT(bugprone-macro-parentheses) */ \
-            bytes_allocated += size * sizeof(TYPE);\
-            break;\
-        }
-        DISPATCH(UInt8)
-        DISPATCH(UInt16)
-        DISPATCH(UInt32)
-        DISPATCH(UInt64)
-        DISPATCH(UInt128)
-        DISPATCH(Int8)
-        DISPATCH(Int16)
-        DISPATCH(Int32)
-        DISPATCH(Int64)
-        DISPATCH(Decimal32)
-        DISPATCH(Decimal64)
-        DISPATCH(Decimal128)
-        DISPATCH(Float32)
-        DISPATCH(Float64)
-#undef DISPATCH
-        case AttributeUnderlyingType::utString: {
-            attr.null_value = null_value.get<String>();
-            attr.arrays = std::make_unique<ContainerType<StringRef>>(size);
-            bytes_allocated += size * sizeof(StringRef);
-            if (!string_arena)
-                string_arena = std::make_unique<ArenaWithFreeLists>();
-            break;
-        }
+        auto result = getKeysIsInHierarchyDefaultImplementation(this, key_column, in_key_column, key_type);
+        query_count.fetch_add(key_column->size(), std::memory_order_relaxed);
+        return result;
     }
-
-    return attr;
+    else
+        return nullptr;
 }
 
-void CacheDictionary::setDefaultAttributeValue(Attribute & attribute, const Key idx) const
+template <DictionaryKeyType dictionary_key_type>
+MutableColumns CacheDictionary<dictionary_key_type>::aggregateColumnsInOrderOfKeys(
+    const PaddedPODArray<KeyType> & keys,
+    const DictionaryStorageFetchRequest & request,
+    const MutableColumns & fetched_columns,
+    const PaddedPODArray<KeyState> & key_index_to_state)
 {
-    switch (attribute.type)
+    MutableColumns aggregated_columns = request.makeAttributesResultColumns();
+
+    /// If keys were returned not in order of keys, aggregate fetched columns in order of requested keys.
+
+    for (size_t fetch_request_index = 0; fetch_request_index < request.attributesSize(); ++fetch_request_index)
     {
-        /* Macro argument should be enclosed in parentheses, but if do so we cannot initialize \
-        * NearestFieldType which takes TYPE as a template parameter.  */
-#define DISPATCH(TYPE)\
-        case AttributeUnderlyingType::ut##TYPE:\
-            std::get<ContainerPtrType<TYPE>>(attribute.arrays)[idx] = std::get<TYPE>(attribute.null_value); /* NOLINT(bugprone-macro-parentheses) */ \
-            break;
-        DISPATCH(UInt8)
-        DISPATCH(UInt16)
-        DISPATCH(UInt32)
-        DISPATCH(UInt64)
-        DISPATCH(UInt128)
-        DISPATCH(Int8)
-        DISPATCH(Int16)
-        DISPATCH(Int32)
-        DISPATCH(Int64)
-        DISPATCH(Decimal32)
-        DISPATCH(Decimal64)
-        DISPATCH(Decimal128)
-        DISPATCH(Float32)
-        DISPATCH(Float64)
-#undef DISPATCH
-        case AttributeUnderlyingType::utString:
-        {
-            const auto & null_value_ref = std::get<String>(attribute.null_value);
-            auto & string_ref = std::get<ContainerPtrType<StringRef>>(attribute.arrays)[idx];
-
-            if (string_ref.data != null_value_ref.data())
-            {
-                if (string_ref.data)
-                    string_arena->free(const_cast<char *>(string_ref.data), string_ref.size);
-
-                string_ref = StringRef{null_value_ref};
-            }
-
-            break;
-        }
-    }
-}
-
-void CacheDictionary::setAttributeValue(Attribute & attribute, const Key idx, const Field & value) const
-{
-    switch (attribute.type)
-    {
-        case AttributeUnderlyingType::utUInt8:
-            std::get<ContainerPtrType<UInt8>>(attribute.arrays)[idx] = value.get<UInt64>();
-            break;
-        case AttributeUnderlyingType::utUInt16:
-            std::get<ContainerPtrType<UInt16>>(attribute.arrays)[idx] = value.get<UInt64>();
-            break;
-        case AttributeUnderlyingType::utUInt32:
-            std::get<ContainerPtrType<UInt32>>(attribute.arrays)[idx] = value.get<UInt64>();
-            break;
-        case AttributeUnderlyingType::utUInt64:
-            std::get<ContainerPtrType<UInt64>>(attribute.arrays)[idx] = value.get<UInt64>();
-            break;
-        case AttributeUnderlyingType::utUInt128:
-            std::get<ContainerPtrType<UInt128>>(attribute.arrays)[idx] = value.get<UInt128>();
-            break;
-        case AttributeUnderlyingType::utInt8:
-            std::get<ContainerPtrType<Int8>>(attribute.arrays)[idx] = value.get<Int64>();
-            break;
-        case AttributeUnderlyingType::utInt16:
-            std::get<ContainerPtrType<Int16>>(attribute.arrays)[idx] = value.get<Int64>();
-            break;
-        case AttributeUnderlyingType::utInt32:
-            std::get<ContainerPtrType<Int32>>(attribute.arrays)[idx] = value.get<Int64>();
-            break;
-        case AttributeUnderlyingType::utInt64:
-            std::get<ContainerPtrType<Int64>>(attribute.arrays)[idx] = value.get<Int64>();
-            break;
-        case AttributeUnderlyingType::utFloat32:
-            std::get<ContainerPtrType<Float32>>(attribute.arrays)[idx] = value.get<Float64>();
-            break;
-        case AttributeUnderlyingType::utFloat64:
-            std::get<ContainerPtrType<Float64>>(attribute.arrays)[idx] = value.get<Float64>();
-            break;
-        case AttributeUnderlyingType::utDecimal32:
-            std::get<ContainerPtrType<Decimal32>>(attribute.arrays)[idx] = value.get<Decimal32>();
-            break;
-        case AttributeUnderlyingType::utDecimal64:
-            std::get<ContainerPtrType<Decimal64>>(attribute.arrays)[idx] = value.get<Decimal64>();
-            break;
-        case AttributeUnderlyingType::utDecimal128:
-            std::get<ContainerPtrType<Decimal128>>(attribute.arrays)[idx] = value.get<Decimal128>();
-            break;
-
-        case AttributeUnderlyingType::utString:
-        {
-            const auto & string = value.get<String>();
-            auto & string_ref = std::get<ContainerPtrType<StringRef>>(attribute.arrays)[idx];
-            const auto & null_value_ref = std::get<String>(attribute.null_value);
-
-            /// free memory unless it points to a null_value
-            if (string_ref.data && string_ref.data != null_value_ref.data())
-                string_arena->free(const_cast<char *>(string_ref.data), string_ref.size);
-
-            const auto str_size = string.size();
-            if (str_size != 0)
-            {
-                auto * string_ptr = string_arena->alloc(str_size + 1);
-                std::copy(string.data(), string.data() + str_size + 1, string_ptr);
-                string_ref = StringRef{string_ptr, str_size};
-            }
-            else
-                string_ref = {};
-
-            break;
-        }
-    }
-}
-
-CacheDictionary::Attribute & CacheDictionary::getAttribute(const std::string & attribute_name) const
-{
-    const size_t attr_index = getAttributeIndex(attribute_name);
-    return attributes[attr_index];
-}
-
-size_t CacheDictionary::getAttributeIndex(const std::string & attribute_name) const
-{
-    const auto it = attribute_index_by_name.find(attribute_name);
-    if (it == std::end(attribute_index_by_name))
-        throw Exception{full_name + ": no such attribute '" + attribute_name + "'", ErrorCodes::BAD_ARGUMENTS};
-
-    return it->second;
-}
-
-bool CacheDictionary::isEmptyCell(const UInt64 idx) const
-{
-    return (idx != zero_cell_idx && cells[idx].id == 0) || (cells[idx].deadline == time_point_t());
-}
-
-
-PaddedPODArray<CacheDictionary::Key> CacheDictionary::getCachedIds() const
-{
-    const ProfilingScopedReadRWLock read_lock{rw_lock, ProfileEvents::DictCacheLockReadNs};
-
-    PaddedPODArray<Key> array;
-    for (size_t idx = 0; idx < cells.size(); ++idx)
-    {
-        auto & cell = cells[idx];
-        if (!isEmptyCell(idx) && !cells[idx].isDefault())
-            array.push_back(cell.id);
-    }
-    return array;
-}
-
-BlockInputStreamPtr CacheDictionary::getBlockInputStream(const Names & column_names, size_t max_block_size) const
-{
-    using BlockInputStreamType = DictionaryBlockInputStream<Key>;
-    return std::make_shared<BlockInputStreamType>(shared_from_this(), max_block_size, getCachedIds(), column_names);
-}
-
-std::exception_ptr CacheDictionary::getLastException() const
-{
-    const ProfilingScopedReadRWLock read_lock{rw_lock, ProfileEvents::DictCacheLockReadNs};
-    return last_exception;
-}
-
-void registerDictionaryCache(DictionaryFactory & factory)
-{
-    auto create_layout = [=](const std::string & full_name,
-                             const DictionaryStructure & dict_struct,
-                             const Poco::Util::AbstractConfiguration & config,
-                             const std::string & config_prefix,
-                             DictionarySourcePtr source_ptr) -> DictionaryPtr
-    {
-        if (dict_struct.key)
-            throw Exception{"'key' is not supported for dictionary of layout 'cache'",
-                            ErrorCodes::UNSUPPORTED_METHOD};
-
-        if (dict_struct.range_min || dict_struct.range_max)
-            throw Exception{full_name
-                                + ": elements .structure.range_min and .structure.range_max should be defined only "
-                                  "for a dictionary of layout 'range_hashed'",
-                            ErrorCodes::BAD_ARGUMENTS};
-        const auto & layout_prefix = config_prefix + ".layout";
-
-        const size_t size = config.getUInt64(layout_prefix + ".cache.size_in_cells");
-        if (size == 0)
-            throw Exception{full_name + ": dictionary of layout 'cache' cannot have 0 cells",
-                            ErrorCodes::TOO_SMALL_BUFFER_SIZE};
-
-        const bool require_nonempty = config.getBool(config_prefix + ".require_nonempty", false);
-        if (require_nonempty)
-            throw Exception{full_name + ": dictionary of layout 'cache' cannot have 'require_nonempty' attribute set",
-                            ErrorCodes::BAD_ARGUMENTS};
-
-        const auto dict_id = StorageID::fromDictionaryConfig(config, config_prefix);
-        const DictionaryLifetime dict_lifetime{config, config_prefix + ".lifetime"};
-
-        const size_t strict_max_lifetime_seconds =
-                config.getUInt64(layout_prefix + ".cache.strict_max_lifetime_seconds", static_cast<size_t>(dict_lifetime.max_sec));
-
-        const size_t max_update_queue_size =
-                config.getUInt64(layout_prefix + ".cache.max_update_queue_size", 100000);
-        if (max_update_queue_size == 0)
-            throw Exception{full_name + ": dictionary of layout 'cache' cannot have empty update queue of size 0",
-                            ErrorCodes::TOO_SMALL_BUFFER_SIZE};
-
-        const bool allow_read_expired_keys =
-                config.getBool(layout_prefix + ".cache.allow_read_expired_keys", false);
-
-        const size_t update_queue_push_timeout_milliseconds =
-                config.getUInt64(layout_prefix + ".cache.update_queue_push_timeout_milliseconds", 10);
-        if (update_queue_push_timeout_milliseconds < 10)
-            throw Exception{full_name + ": dictionary of layout 'cache' have too little update_queue_push_timeout",
-                            ErrorCodes::BAD_ARGUMENTS};
-
-        const size_t query_wait_timeout_milliseconds =
-                config.getUInt64(layout_prefix + ".cache.query_wait_timeout_milliseconds", 60000);
-
-        const size_t max_threads_for_updates =
-                config.getUInt64(layout_prefix + ".max_threads_for_updates", 4);
-        if (max_threads_for_updates == 0)
-            throw Exception{full_name + ": dictionary of layout 'cache' cannot have zero threads for updates.",
-                            ErrorCodes::BAD_ARGUMENTS};
-
-        return std::make_unique<CacheDictionary>(
-                dict_id,
-                dict_struct,
-                std::move(source_ptr),
-                dict_lifetime,
-                strict_max_lifetime_seconds,
-                size,
-                allow_read_expired_keys,
-                max_update_queue_size,
-                update_queue_push_timeout_milliseconds,
-                query_wait_timeout_milliseconds,
-                max_threads_for_updates);
-    };
-    factory.registerLayout("cache", create_layout, false);
-}
-
-void CacheDictionary::updateThreadFunction()
-{
-    setThreadName("AsyncUpdater");
-    while (!finished)
-    {
-        UpdateUnitPtr popped;
-        update_queue.pop(popped);
-
-        if (finished)
-            break;
-
-        try
-        {
-            /// Update a bunch of ids.
-            update(popped);
-
-            /// Notify thread about finished updating the bunch of ids
-            /// where their own ids were included.
-            std::unique_lock<std::mutex> lock(update_mutex);
-
-            popped->is_done = true;
-            is_update_finished.notify_all();
-        }
-        catch (...)
-        {
-            std::unique_lock<std::mutex> lock(update_mutex);
-
-            popped->current_exception = std::current_exception();
-            is_update_finished.notify_all();
-        }
-    }
-}
-
-void CacheDictionary::waitForCurrentUpdateFinish(UpdateUnitPtr & update_unit_ptr) const
-{
-    std::unique_lock<std::mutex> update_lock(update_mutex);
-
-    bool result = is_update_finished.wait_for(
-            update_lock,
-            std::chrono::milliseconds(query_wait_timeout_milliseconds),
-            [&] { return update_unit_ptr->is_done || update_unit_ptr->current_exception; });
-
-    if (!result)
-    {
-        throw DB::Exception(ErrorCodes::TIMEOUT_EXCEEDED,
-                            "Dictionary {} source seems unavailable, because {}ms timeout exceeded.",
-                            getDictionaryID().getNameForLogs(), toString(query_wait_timeout_milliseconds));
-    }
-
-
-    if (update_unit_ptr->current_exception)
-    {
-        // Don't just rethrow it, because sharing the same exception object
-        // between multiple threads can lead to weird effects if they decide to
-        // modify it, for example, by adding some error context.
-        try
-        {
-            std::rethrow_exception(update_unit_ptr->current_exception);
-        }
-        catch (...)
-        {
-            throw DB::Exception(ErrorCodes::CACHE_DICTIONARY_UPDATE_FAIL,
-                "Update failed for dictionary '{}': {}",
-                getDictionaryID().getNameForLogs(),
-                getCurrentExceptionMessage(true /*with stack trace*/,
-                    true /*check embedded stack trace*/));
-        }
-    }
-}
-
-void CacheDictionary::tryPushToUpdateQueueOrThrow(UpdateUnitPtr & update_unit_ptr) const
-{
-    if (!update_queue.tryPush(update_unit_ptr, update_queue_push_timeout_milliseconds))
-        throw DB::Exception(ErrorCodes::CACHE_DICTIONARY_UPDATE_FAIL,
-                "Cannot push to internal update queue in dictionary {}. "
-                "Timelimit of {} ms. exceeded. Current queue size is {}",
-                getDictionaryID().getNameForLogs(), std::to_string(update_queue_push_timeout_milliseconds),
-                std::to_string(update_queue.size()));
-}
-
-
-std::vector<CacheDictionary::AttributeValue> CacheDictionary::getAttributeValuesFromBlockAtPosition(const std::vector<const IColumn *> & column_ptrs, size_t position)
-{
-    std::vector<AttributeValue> answer;
-    answer.reserve(column_ptrs.size());
-
-    for (const auto * pure_column : column_ptrs)
-    {
-#define DISPATCH(TYPE) \
-        if (const auto * column = typeid_cast<const Column##TYPE *>(pure_column)) { \
-            answer.emplace_back(column->getElement(position)); \
-            continue; \
-        }
-        DISPATCH(UInt8)
-        DISPATCH(UInt16)
-        DISPATCH(UInt32)
-        DISPATCH(UInt64)
-        DISPATCH(UInt128)
-        DISPATCH(Int8)
-        DISPATCH(Int16)
-        DISPATCH(Int32)
-        DISPATCH(Int64)
-        DISPATCH(Decimal<Decimal32>)
-        DISPATCH(Decimal<Decimal64>)
-        DISPATCH(Decimal<Decimal128>)
-        DISPATCH(Float32)
-        DISPATCH(Float64)
-#undef DISPATCH
-        if (const auto * column = typeid_cast<const ColumnString *>(pure_column))
-        {
-            answer.emplace_back(column->getDataAt(position).toString());
+        if (!request.shouldFillResultColumnWithIndex(fetch_request_index))
             continue;
+
+        const auto & aggregated_column = aggregated_columns[fetch_request_index];
+        const auto & fetched_column = fetched_columns[fetch_request_index];
+
+        for (size_t key_index = 0; key_index < keys.size(); ++key_index)
+        {
+            auto state = key_index_to_state[key_index];
+
+            if (state.isNotFound())
+                continue;
+
+            aggregated_column->insertFrom(*fetched_column, state.getFetchedColumnIndex());
         }
     }
-    return answer;
+
+    return aggregated_columns;
 }
 
-void CacheDictionary::update(UpdateUnitPtr & update_unit_ptr)
+template <DictionaryKeyType dictionary_key_type>
+MutableColumns CacheDictionary<dictionary_key_type>::aggregateColumns(
+        const PaddedPODArray<KeyType> & keys,
+        const DictionaryStorageFetchRequest & request,
+        const MutableColumns & fetched_columns_from_storage,
+        const PaddedPODArray<KeyState> & key_index_to_fetched_columns_from_storage_result,
+        const MutableColumns & fetched_columns_during_update,
+        const HashMap<KeyType, size_t> & found_keys_to_fetched_columns_during_update_index)
 {
+    /**
+    * Aggregation of columns fetched from storage and from source during update.
+    * If key was found in storage add it to result.
+    * If key was found in source during update add it to result.
+    * If key was not found in storage or in source during update add default value.
+    */
+
+    MutableColumns aggregated_columns = request.makeAttributesResultColumns();
+
+    for (size_t fetch_request_index = 0; fetch_request_index < request.attributesSize(); ++fetch_request_index)
+    {
+        if (!request.shouldFillResultColumnWithIndex(fetch_request_index))
+            continue;
+
+        const auto & aggregated_column = aggregated_columns[fetch_request_index];
+        const auto & fetched_column_from_storage = fetched_columns_from_storage[fetch_request_index];
+        const auto & fetched_column_during_update = fetched_columns_during_update[fetch_request_index];
+        const auto & default_value_provider = request.defaultValueProviderAtIndex(fetch_request_index);
+
+        for (size_t key_index = 0; key_index < keys.size(); ++key_index)
+        {
+            auto key = keys[key_index];
+
+            auto key_state_from_storage = key_index_to_fetched_columns_from_storage_result[key_index];
+            if (key_state_from_storage.isFound())
+            {
+                /// Check and insert value if key was fetched from cache
+                aggregated_column->insertFrom(*fetched_column_from_storage, key_state_from_storage.getFetchedColumnIndex());
+                continue;
+            }
+
+            /// Check and insert value if key was not in cache and was fetched during update
+            const auto * find_iterator_in_fetch_during_update = found_keys_to_fetched_columns_during_update_index.find(key);
+            if (find_iterator_in_fetch_during_update)
+            {
+                aggregated_column->insertFrom(*fetched_column_during_update, find_iterator_in_fetch_during_update->getMapped());
+                continue;
+            }
+
+            /// Insert default value
+            aggregated_column->insert(default_value_provider.getDefaultValue(key_index));
+        }
+    }
+
+    return aggregated_columns;
+}
+
+template <DictionaryKeyType dictionary_key_type>
+BlockInputStreamPtr CacheDictionary<dictionary_key_type>::getBlockInputStream(const Names & column_names, size_t max_block_size) const
+{
+    std::shared_ptr<DictionaryBlockInputStream> stream;
+
+    {
+        /// Write lock on storage
+        const ProfilingScopedWriteRWLock write_lock{rw_lock, ProfileEvents::DictCacheLockWriteNs};
+
+        if constexpr (dictionary_key_type == DictionaryKeyType::simple)
+            stream = std::make_shared<DictionaryBlockInputStream>(shared_from_this(), max_block_size, cache_storage_ptr->getCachedSimpleKeys(), column_names);
+        else
+        {
+            auto keys = cache_storage_ptr->getCachedComplexKeys();
+            stream = std::make_shared<DictionaryBlockInputStream>(shared_from_this(), max_block_size, keys, column_names);
+        }
+    }
+
+    return stream;
+}
+
+template <DictionaryKeyType dictionary_key_type>
+void CacheDictionary<dictionary_key_type>::update(CacheDictionaryUpdateUnitPtr<dictionary_key_type> update_unit_ptr)
+{
+    /**
+    * Update has following flow.
+    * 1. Filter only necessary keys to request, keys that are expired or not found.
+    * And create not_found_keys hash_set including each requested key.
+    * In case of simple_keys we need to fill requested_keys_vector with requested value key.
+    * In case of complex_keys we need to fill requested_complex_key_rows with requested row.
+    * 2. Create stream from source with necessary keys to request using method for simple or complex keys.
+    * 3. Create fetched columns during update variable. This columns will aggregate columns that we fetch from source.
+    * 4. When block is fetched from source. Split it into keys columns and attributes columns.
+    * Insert attributes columns into associated fetched columns during update.
+    * Create KeysExtractor and extract keys from keys columns.
+    * Update map of requested found key to fetched column index.
+    * Remove found key from not_found_keys.
+    * 5. Add aggregated columns during update into storage.
+    * 6. Add not found keys as default into storage.
+    */
     CurrentMetrics::Increment metric_increment{CurrentMetrics::DictCacheRequests};
-    ProfileEvents::increment(ProfileEvents::DictCacheKeysRequested, update_unit_ptr->requested_ids.size());
 
-    auto & map_ids = update_unit_ptr->found_ids;
+    size_t found_keys_size = 0;
 
-    size_t found_num = 0;
+    Arena * complex_key_arena = update_unit_ptr->complex_keys_arena_holder.getComplexKeyArena();
+    DictionaryKeysExtractor<dictionary_key_type> requested_keys_extractor(update_unit_ptr->key_columns, complex_key_arena);
+    auto requested_keys = requested_keys_extractor.extractAllKeys();
+
+    HashSet<KeyType> not_found_keys;
+
+    std::vector<UInt64> requested_keys_vector;
+    std::vector<size_t> requested_complex_key_rows;
+
+    if constexpr (dictionary_key_type == DictionaryKeyType::simple)
+        requested_keys_vector.reserve(requested_keys.size());
+    else
+        requested_complex_key_rows.reserve(requested_keys.size());
+
+    auto & key_index_to_state_from_storage = update_unit_ptr->key_index_to_state;
+
+    for (size_t i = 0; i < key_index_to_state_from_storage.size(); ++i)
+    {
+        if (key_index_to_state_from_storage[i].isExpired()
+            || key_index_to_state_from_storage[i].isNotFound())
+        {
+            if constexpr (dictionary_key_type == DictionaryKeyType::simple)
+                requested_keys_vector.emplace_back(requested_keys[i]);
+            else
+                requested_complex_key_rows.emplace_back(i);
+
+            auto requested_key = requested_keys[i];
+            not_found_keys.insert(requested_key);
+        }
+    }
+
+    size_t requested_keys_size = update_unit_ptr->keys_to_update_size;
+    ProfileEvents::increment(ProfileEvents::DictCacheKeysRequested, requested_keys_size);
+
+    const auto & fetch_request = update_unit_ptr->request;
 
     const auto now = std::chrono::system_clock::now();
 
@@ -1287,85 +567,77 @@ void CacheDictionary::update(UpdateUnitPtr & update_unit_ptr)
             auto current_source_ptr = getSourceAndUpdateIfNeeded();
 
             Stopwatch watch;
+            BlockInputStreamPtr stream;
+
+            if constexpr (dictionary_key_type == DictionaryKeyType::simple)
+                stream = current_source_ptr->loadIds(requested_keys_vector);
+            else
+                stream = current_source_ptr->loadKeys(update_unit_ptr->key_columns, requested_complex_key_rows);
 
-            BlockInputStreamPtr stream = current_source_ptr->loadIds(update_unit_ptr->requested_ids);
             stream->readPrefix();
 
-            while (true)
+            size_t skip_keys_size_offset = dict_struct.getKeysSize();
+            PaddedPODArray<KeyType> found_keys_in_source;
+
+            Columns fetched_columns_during_update = fetch_request.makeAttributesResultColumnsNonMutable();
+
+            while (Block block = stream->read())
             {
-                Block block = stream->read();
-                if (!block)
-                    break;
+                Columns key_columns;
+                key_columns.reserve(skip_keys_size_offset);
 
-                const auto * id_column = typeid_cast<const ColumnUInt64 *>(block.safeGetByPosition(0).column.get());
-                if (!id_column)
-                    throw Exception{ErrorCodes::TYPE_MISMATCH,
-                                    "{}: id column has type different from UInt64.", getDictionaryID().getNameForLogs()};
+                auto block_columns = block.getColumns();
 
-                const auto & ids = id_column->getData();
-
-                /// cache column pointers
-                const auto column_ptrs = ext::map<std::vector>(
-                        ext::range(0, attributes.size()), [&block](size_t i) { return block.safeGetByPosition(i + 1).column.get(); });
-
-                found_num += ids.size();
-
-                for (const auto i : ext::range(0, ids.size()))
+                /// Split into keys columns and attribute columns
+                for (size_t i = 0; i < skip_keys_size_offset; ++i)
                 {
-                    /// Modifying cache with write lock
-                    ProfilingScopedWriteRWLock write_lock{rw_lock, ProfileEvents::DictCacheLockWriteNs};
-                    const auto id = ids[i];
+                    key_columns.emplace_back(*block_columns.begin());
+                    block_columns.erase(block_columns.begin());
+                }
 
-                    const auto cell_idx = findCellIdxForSet(id);
-                    auto & cell = cells[cell_idx];
+                DictionaryKeysExtractor<dictionary_key_type> keys_extractor(key_columns, complex_key_arena);
+                auto keys_extracted_from_block = keys_extractor.extractAllKeys();
 
-                    auto it = map_ids.find(id);
+                for (size_t index_of_attribute = 0; index_of_attribute < fetched_columns_during_update.size(); ++index_of_attribute)
+                {
+                    auto & column_to_update = fetched_columns_during_update[index_of_attribute];
+                    auto column = block.safeGetByPosition(skip_keys_size_offset + index_of_attribute).column;
+                    column_to_update->assumeMutable()->insertRangeFrom(*column, 0, keys_extracted_from_block.size());
+                }
 
-                    /// We have some extra keys from source. Won't add them to cache.
-                    if (it == map_ids.end())
-                        continue;
+                for (size_t i = 0; i < keys_extracted_from_block.size(); ++i)
+                {
+                    auto fetched_key_from_source = keys_extracted_from_block[i];
 
-                    auto & all_attributes = it->second;
-                    all_attributes.found = true;
-                    all_attributes.values = getAttributeValuesFromBlockAtPosition(column_ptrs, i);
-
-                    for (const auto attribute_idx : ext::range(0, attributes.size()))
-                    {
-                        const auto & attribute_column = *column_ptrs[attribute_idx];
-                        auto & attribute = attributes[attribute_idx];
-
-                        setAttributeValue(attribute, cell_idx, attribute_column[i]);
-                    }
-
-                    /// if cell id is zero and zero does not map to this cell, then the cell is unused
-                    if (cell.id == 0 && cell_idx != zero_cell_idx)
-                        element_count.fetch_add(1, std::memory_order_relaxed);
-
-                    cell.id = id;
-                    setLifetime(cell, now);
+                    not_found_keys.erase(fetched_key_from_source);
+                    update_unit_ptr->requested_keys_to_fetched_columns_during_update_index[fetched_key_from_source] = found_keys_size;
+                    found_keys_in_source.emplace_back(fetched_key_from_source);
+                    ++found_keys_size;
                 }
             }
 
+            PaddedPODArray<KeyType> not_found_keys_in_source;
+            not_found_keys_in_source.reserve(not_found_keys.size());
+
+            for (auto & cell : not_found_keys)
+                not_found_keys_in_source.emplace_back(cell.getKey());
+
+            auto & update_unit_ptr_mutable_columns = update_unit_ptr->fetched_columns_during_update;
+            for (const auto & fetched_column : fetched_columns_during_update)
+                update_unit_ptr_mutable_columns.emplace_back(fetched_column->assumeMutable());
+
             stream->readSuffix();
 
-            /// Lock for cache modification
-            ProfilingScopedWriteRWLock write_lock{rw_lock, ProfileEvents::DictCacheLockWriteNs};
-
-            for (auto & [key, value] : update_unit_ptr->found_ids)
             {
-                if (!value.found)
-                {
-                    auto cell_idx = findCellIdxForSet(key);
-                    auto & cell = cells[cell_idx];
-                    cell.id = key;
-                    setLifetime(cell, now);
-                    cell.setDefault();
-                }
-            }
+                /// Lock for cache modification
+                ProfilingScopedWriteRWLock write_lock{rw_lock, ProfileEvents::DictCacheLockWriteNs};
+                cache_storage_ptr->insertColumnsForKeys(found_keys_in_source, fetched_columns_during_update);
+                cache_storage_ptr->insertDefaultKeys(not_found_keys_in_source);
 
-            error_count = 0;
-            last_exception = std::exception_ptr{};
-            backoff_end_time = std::chrono::system_clock::time_point{};
+                error_count = 0;
+                last_exception = std::exception_ptr{};
+                backoff_end_time = std::chrono::system_clock::time_point{};
+            }
 
             ProfileEvents::increment(ProfileEvents::DictCacheRequestTimeNs, watch.elapsed());
         }
@@ -1394,10 +666,9 @@ void CacheDictionary::update(UpdateUnitPtr & update_unit_ptr)
             }
         }
 
-
-    ProfileEvents::increment(ProfileEvents::DictCacheKeysRequestedMiss, update_unit_ptr->requested_ids.size() - found_num);
-    ProfileEvents::increment(ProfileEvents::DictCacheKeysRequestedFound, found_num);
-    ProfileEvents::increment(ProfileEvents::DictCacheRequests);
+        ProfileEvents::increment(ProfileEvents::DictCacheKeysRequestedMiss, requested_keys_size - found_keys_size);
+        ProfileEvents::increment(ProfileEvents::DictCacheKeysRequestedFound, found_keys_size);
+        ProfileEvents::increment(ProfileEvents::DictCacheRequests);
     }
     else
     {
@@ -1409,4 +680,7 @@ void CacheDictionary::update(UpdateUnitPtr & update_unit_ptr)
     }
 }
 
+template class CacheDictionary<DictionaryKeyType::simple>;
+template class CacheDictionary<DictionaryKeyType::complex>;
+
 }
diff --git a/src/Dictionaries/CacheDictionary.h b/src/Dictionaries/CacheDictionary.h
index 35d38f03cbe..62cd509d006 100644
--- a/src/Dictionaries/CacheDictionary.h
+++ b/src/Dictionaries/CacheDictionary.h
@@ -3,72 +3,76 @@
 #include <atomic>
 #include <chrono>
 #include <cmath>
-#include <map>
 #include <mutex>
 #include <shared_mutex>
 #include <utility>
-#include <variant>
 #include <vector>
-#include <common/logger_useful.h>
-#include <Columns/ColumnDecimal.h>
-#include <Columns/ColumnString.h>
-#include <Common/ThreadPool.h>
-#include <Common/ConcurrentBoundedQueue.h>
+
 #include <pcg_random.hpp>
-#include <Common/ArenaWithFreeLists.h>
+
+#include <common/logger_useful.h>
+
+#include <Common/randomSeed.h>
+#include <Common/ThreadPool.h>
 #include <Common/CurrentMetrics.h>
-#include <ext/bit_cast.h>
-#include "DictionaryStructure.h"
-#include "IDictionary.h"
-#include "IDictionarySource.h"
-#include "DictionaryHelpers.h"
-
-namespace CurrentMetrics
-{
-    extern const Metric CacheDictionaryUpdateQueueBatches;
-    extern const Metric CacheDictionaryUpdateQueueKeys;
-}
 
+#include <Dictionaries/IDictionary.h>
+#include <Dictionaries/ICacheDictionaryStorage.h>
+#include <Dictionaries/DictionaryStructure.h>
+#include <Dictionaries/IDictionarySource.h>
+#include <Dictionaries/DictionaryHelpers.h>
+#include <Dictionaries/CacheDictionaryUpdateQueue.h>
 
 namespace DB
 {
+/** CacheDictionary store keys in cache storage and can asynchronous and synchronous updates during keys fetch.
 
-namespace ErrorCodes
-{
-}
+    If keys are not found in storage during fetch, dictionary start update operation with update queue.
 
-/*
- *
- * This dictionary is stored in a cache that has a fixed number of cells.
- * These cells contain frequently used elements.
- * When searching for a dictionary, the cache is searched first and special heuristic is used:
- * while looking for the key, we take a look only at max_collision_length elements.
- * So, our cache is not perfect. It has errors like "the key is in cache, but the cache says that it does not".
- * And in this case we simply ask external source for the key which is faster.
- * You have to keep this logic in mind.
- * */
+    During update operation necessary keys are fetched from source and inserted into storage.
+
+    After that data from storage and source are aggregated and returned to the client.
+
+    Typical flow:
+
+    1. Client request data during for example getColumn function call.
+    2. CacheDictionary request data from storage and if all data is found in storage it returns result to client.
+    3. If some data is not in storage cache dictionary try to perform update.
+
+    If all keys are just expired and allow_read_expired_keys option is set dictionary starts asynchronous update and
+    return result to client.
+
+    If there are not found keys dictionary start synchronous update and wait for result.
+
+    4. After getting result from synchronous update dictionary aggregates data that was previously fetched from
+    storage and data that was fetched during update and return result to client.
+ */
+template <DictionaryKeyType dictionary_key_type>
 class CacheDictionary final : public IDictionary
 {
 public:
+    using KeyType = std::conditional_t<dictionary_key_type == DictionaryKeyType::simple, UInt64, StringRef>;
+    static_assert(dictionary_key_type != DictionaryKeyType::range, "Range key type is not supported by cache dictionary");
+
     CacheDictionary(
         const StorageID & dict_id_,
         const DictionaryStructure & dict_struct_,
         DictionarySourcePtr source_ptr_,
+        CacheDictionaryStoragePtr cache_storage_ptr_,
+        CacheDictionaryUpdateQueueConfiguration update_queue_configuration_,
         DictionaryLifetime dict_lifetime_,
-        size_t strict_max_lifetime_seconds,
-        size_t size_,
-        bool allow_read_expired_keys_,
-        size_t max_update_queue_size_,
-        size_t update_queue_push_timeout_milliseconds_,
-        size_t query_wait_timeout_milliseconds,
-        size_t max_threads_for_updates);
+        bool allow_read_expired_keys_);
 
     ~CacheDictionary() override;
 
-    std::string getTypeName() const override { return "Cache"; }
+    std::string getTypeName() const override { return cache_storage_ptr->getName(); }
+
+    size_t getElementCount() const override;
 
     size_t getBytesAllocated() const override;
 
+    double getLoadFactor() const override;
+
     size_t getQueryCount() const override { return query_count.load(std::memory_order_relaxed); }
 
     double getHitRate() const override
@@ -76,10 +80,6 @@ public:
         return static_cast<double>(hit_count.load(std::memory_order_acquire)) / query_count.load(std::memory_order_relaxed);
     }
 
-    size_t getElementCount() const override { return element_count.load(std::memory_order_relaxed); }
-
-    double getLoadFactor() const override { return static_cast<double>(element_count.load(std::memory_order_relaxed)) / size; }
-
     bool supportUpdates() const override { return false; }
 
     std::shared_ptr<const IExternalLoadable> clone() const override
@@ -88,14 +88,10 @@ public:
                 getDictionaryID(),
                 dict_struct,
                 getSourceAndUpdateIfNeeded()->clone(),
+                cache_storage_ptr,
+                update_queue.getConfiguration(),
                 dict_lifetime,
-                strict_max_lifetime_seconds,
-                size,
-                allow_read_expired_keys,
-                max_update_queue_size,
-                update_queue_push_timeout_milliseconds,
-                query_wait_timeout_milliseconds,
-                max_threads_for_updates);
+                allow_read_expired_keys);
     }
 
     const IDictionarySource * getSource() const override;
@@ -106,133 +102,61 @@ public:
 
     bool isInjective(const std::string & attribute_name) const override
     {
-        return dict_struct.attributes[&getAttribute(attribute_name) - attributes.data()].injective;
+        return dict_struct.getAttribute(attribute_name).injective;
     }
 
-    bool hasHierarchy() const override { return hierarchical_attribute; }
-
-    void toParent(const PaddedPODArray<Key> & ids, PaddedPODArray<Key> & out) const override;
-
-    void isInVectorVector(
-        const PaddedPODArray<Key> & child_ids, const PaddedPODArray<Key> & ancestor_ids, PaddedPODArray<UInt8> & out) const override;
-    void isInVectorConstant(const PaddedPODArray<Key> & child_ids, const Key ancestor_id, PaddedPODArray<UInt8> & out) const override;
-    void isInConstantVector(const Key child_id, const PaddedPODArray<Key> & ancestor_ids, PaddedPODArray<UInt8> & out) const override;
-
-    std::exception_ptr getLastException() const override;
-
-    DictionaryKeyType getKeyType() const override { return DictionaryKeyType::simple; }
+    DictionaryKeyType getKeyType() const override
+    {
+        return dictionary_key_type == DictionaryKeyType::simple ? DictionaryKeyType::simple : DictionaryKeyType::complex;
+    }
 
     ColumnPtr getColumn(
         const std::string& attribute_name,
         const DataTypePtr & result_type,
         const Columns & key_columns,
         const DataTypes & key_types,
-        const ColumnPtr default_values_column) const override;
+        const ColumnPtr & default_values_column) const override;
+
+    Columns getColumns(
+        const Strings & attribute_names,
+        const DataTypes & result_types,
+        const Columns & key_columns,
+        const DataTypes & key_types,
+        const Columns & default_values_columns) const override;
 
     ColumnUInt8::Ptr hasKeys(const Columns & key_columns, const DataTypes & key_types) const override;
 
-    template <typename T>
-    using ResultArrayType = std::conditional_t<IsDecimalNumber<T>, DecimalPaddedPODArray<T>, PaddedPODArray<T>>;
-
     BlockInputStreamPtr getBlockInputStream(const Names & column_names, size_t max_block_size) const override;
 
+    std::exception_ptr getLastException() const override;
+
+    bool hasHierarchy() const override { return dictionary_key_type == DictionaryKeyType::simple && dict_struct.hierarchical_attribute_index.has_value(); }
+
+    ColumnPtr getHierarchy(ColumnPtr key_column, const DataTypePtr & key_type) const override;
+
+    ColumnUInt8::Ptr isInHierarchy(
+        ColumnPtr key_column,
+        ColumnPtr in_key_column,
+        const DataTypePtr & key_type) const override;
+
 private:
-    template <typename Value>
-    using ContainerType = Value[];
-    template <typename Value>
-    using ContainerPtrType = std::unique_ptr<ContainerType<Value>>;
+    using FetchResult = std::conditional_t<dictionary_key_type == DictionaryKeyType::simple, SimpleKeysStorageFetchResult, ComplexKeysStorageFetchResult>;
 
-    using time_point_t = std::chrono::system_clock::time_point;
+    static MutableColumns aggregateColumnsInOrderOfKeys(
+        const PaddedPODArray<KeyType> & keys,
+        const DictionaryStorageFetchRequest & request,
+        const MutableColumns & fetched_columns,
+        const PaddedPODArray<KeyState> & key_index_to_state);
 
-    struct CellMetadata final
-    {
-        UInt64 id;
-        time_point_t deadline;
-        bool is_default{false};
+    static MutableColumns aggregateColumns(
+        const PaddedPODArray<KeyType> & keys,
+        const DictionaryStorageFetchRequest & request,
+        const MutableColumns & fetched_columns_from_storage,
+        const PaddedPODArray<KeyState> & key_index_to_fetched_columns_from_storage_result,
+        const MutableColumns & fetched_columns_during_update,
+        const HashMap<KeyType, size_t> & found_keys_to_fetched_columns_during_update_index);
 
-        time_point_t expiresAt() const { return deadline; }
-        void setExpiresAt(const time_point_t & t) { deadline = t; is_default = false; }
-        bool isDefault() const { return is_default; }
-        void setDefault() { is_default = true; }
-    };
-
-    using AttributeValue = std::variant<
-        UInt8, UInt16, UInt32, UInt64, UInt128,
-        Int8, Int16, Int32, Int64,
-        Decimal32, Decimal64, Decimal128,
-        Float32, Float64, String>;
-
-    struct AttributeValuesForKey
-    {
-        bool found{false};
-        std::vector<AttributeValue> values;
-
-        std::string dump();
-    };
-
-    using FoundValuesForKeys = std::unordered_map<Key, AttributeValuesForKey>;
-
-    struct Attribute final
-    {
-        AttributeUnderlyingType type;
-        String name;
-        /// Default value for each type. Could be defined in config.
-        AttributeValue null_value;
-        /// We store attribute value for all keys. It is a "row" in a hand-made open addressing hashtable,
-        /// where "column" is key.
-        std::variant<
-            ContainerPtrType<UInt8>,
-            ContainerPtrType<UInt16>,
-            ContainerPtrType<UInt32>,
-            ContainerPtrType<UInt64>,
-            ContainerPtrType<UInt128>,
-            ContainerPtrType<Int8>,
-            ContainerPtrType<Int16>,
-            ContainerPtrType<Int32>,
-            ContainerPtrType<Int64>,
-            ContainerPtrType<Decimal32>,
-            ContainerPtrType<Decimal64>,
-            ContainerPtrType<Decimal128>,
-            ContainerPtrType<Float32>,
-            ContainerPtrType<Float64>,
-            ContainerPtrType<StringRef>>
-            arrays;
-    };
-
-    void createAttributes();
-
-    /* NOLINTNEXTLINE(readability-convert-member-functions-to-static) */
-    Attribute createAttributeWithTypeAndName(const AttributeUnderlyingType type, const String & name, const Field & null_value);
-
-    template <typename AttributeType, typename OutputType, typename DefaultValueExtractor>
-    void getItemsNumberImpl(
-        Attribute & attribute,
-        const PaddedPODArray<Key> & ids,
-        ResultArrayType<OutputType> & out,
-        DefaultValueExtractor & default_value_extractor) const;
-
-    void getItemsString(
-        Attribute & attribute,
-        const PaddedPODArray<Key> & ids,
-        ColumnString * out,
-        DictionaryDefaultValueExtractor<String> & default_value_extractor) const;
-
-    PaddedPODArray<Key> getCachedIds() const;
-
-    bool isEmptyCell(const UInt64 idx) const;
-
-    size_t getCellIdx(const Key id) const;
-
-    void setDefaultAttributeValue(Attribute & attribute, const Key idx) const;
-
-    void setAttributeValue(Attribute & attribute, const Key idx, const Field & value) const;
-
-    static std::vector<AttributeValue> getAttributeValuesFromBlockAtPosition(const std::vector<const IColumn *> & column_ptrs, size_t position);
-
-    Attribute & getAttribute(const std::string & attribute_name) const;
-    size_t getAttributeIndex(const std::string & attribute_name) const;
-
-    using SharedDictionarySourcePtr = std::shared_ptr<IDictionarySource>;
+    void update(CacheDictionaryUpdateUnitPtr<dictionary_key_type> update_unit_ptr);
 
     /// Update dictionary source pointer if required and return it. Thread safe.
     /// MultiVersion is not used here because it works with constant pointers.
@@ -252,160 +176,38 @@ private:
         return source_ptr;
     }
 
-    inline void setLifetime(CellMetadata & cell, time_point_t now)
-    {
-        if (dict_lifetime.min_sec != 0 && dict_lifetime.max_sec != 0)
-        {
-            std::uniform_int_distribution<UInt64> distribution{dict_lifetime.min_sec, dict_lifetime.max_sec};
-            cell.setExpiresAt(now + std::chrono::seconds{distribution(rnd_engine)});
-        }
-        else
-        {
-            /// This maybe not obvious, but when we define is this cell is expired or expired permanently, we add strict_max_lifetime_seconds
-            /// to the expiration time. And it overflows pretty well.
-            cell.setExpiresAt(std::chrono::time_point<std::chrono::system_clock>::max() - 2 * std::chrono::seconds(strict_max_lifetime_seconds));
-        }
-    }
-
-    inline bool isExpired(time_point_t now, time_point_t deadline) const
-    {
-        return now > deadline;
-    }
-
-    inline bool isExpiredPermanently(time_point_t now, time_point_t deadline) const
-    {
-        return now > deadline + std::chrono::seconds(strict_max_lifetime_seconds);
-    }
-
-    enum class ResultState
-    {
-        NotFound,
-        FoundAndValid,
-        FoundButExpired,
-        /// Here is a gap between there two states in which a key could be read
-        /// with an enabled setting in config enable_read_expired_keys.
-        FoundButExpiredPermanently
-    };
-
-    using FindResult = std::pair<size_t, ResultState>;
-
-    FindResult findCellIdxForGet(const Key & id, const time_point_t now) const;
-
-    size_t findCellIdxForSet(const Key & id) const;
-
-    template <typename AncestorType>
-    void isInImpl(const PaddedPODArray<Key> & child_ids, const AncestorType & ancestor_ids, PaddedPODArray<UInt8> & out) const;
-
     const DictionaryStructure dict_struct;
 
     /// Dictionary source should be used with mutex
     mutable std::mutex source_mutex;
     mutable SharedDictionarySourcePtr source_ptr;
 
+    CacheDictionaryStoragePtr cache_storage_ptr;
+    mutable CacheDictionaryUpdateQueue<dictionary_key_type> update_queue;
+
     const DictionaryLifetime dict_lifetime;
-    const size_t strict_max_lifetime_seconds;
-    const bool allow_read_expired_keys;
-    const size_t max_update_queue_size;
-    const size_t update_queue_push_timeout_milliseconds;
-    const size_t query_wait_timeout_milliseconds;
-    const size_t max_threads_for_updates;
 
     Poco::Logger * log;
 
+    const bool allow_read_expired_keys;
+
+    mutable pcg64 rnd_engine;
+
     /// This lock is used for the inner cache state update function lock it for
     /// write, when it need to update cache state all other functions just
     /// readers. Surprisingly this lock is also used for last_exception pointer.
     mutable std::shared_mutex rw_lock;
 
-    /// Actual size will be increased to match power of 2
-    const size_t size;
-
-    /// all bits to 1  mask (size - 1) (0b1000 - 1 = 0b111)
-    const size_t size_overlap_mask;
-
-    /// Max tries to find cell, overlapped with mask: if size = 16 and start_cell=10: will try cells: 10,11,12,13,14,15,0,1,2,3
-    static constexpr size_t max_collision_length = 10;
-
-    const size_t zero_cell_idx{getCellIdx(0)};
-    std::map<std::string, size_t> attribute_index_by_name;
-    mutable std::vector<Attribute> attributes;
-    mutable std::vector<CellMetadata> cells;
-    Attribute * hierarchical_attribute = nullptr;
-    std::unique_ptr<ArenaWithFreeLists> string_arena;
-
     mutable std::exception_ptr last_exception;
-    mutable std::atomic<size_t> error_count{0};
+    mutable std::atomic<size_t> error_count {0};
     mutable std::atomic<std::chrono::system_clock::time_point> backoff_end_time{std::chrono::system_clock::time_point{}};
 
-    mutable pcg64 rnd_engine;
-
-    mutable size_t bytes_allocated = 0;
-    mutable std::atomic<size_t> element_count{0};
     mutable std::atomic<size_t> hit_count{0};
     mutable std::atomic<size_t> query_count{0};
 
-    /*
-     * How the update goes: we basically have a method like get(keys)->values. Values are cached, so sometimes we
-     * can return them from the cache. For values not in cache, we query them from the source, and add to the
-     * cache. The cache is lossy, so we can't expect it to store all the keys, and we store them separately.
-     * So, there is a map of found keys to all its attributes.
-     */
-    struct UpdateUnit
-    {
-        explicit UpdateUnit(std::vector<Key> && requested_ids_) :
-                requested_ids(std::move(requested_ids_)),
-                alive_keys(CurrentMetrics::CacheDictionaryUpdateQueueKeys, requested_ids.size())
-        {
-            found_ids.reserve(requested_ids.size());
-            for (const auto id : requested_ids)
-                found_ids.insert({id, {}});
-        }
-
-        std::vector<Key> requested_ids;
-        FoundValuesForKeys found_ids;
-
-        std::atomic<bool> is_done{false};
-        std::exception_ptr current_exception{nullptr};
-
-        /// While UpdateUnit is alive, it is accounted in update_queue size.
-        CurrentMetrics::Increment alive_batch{CurrentMetrics::CacheDictionaryUpdateQueueBatches};
-        CurrentMetrics::Increment alive_keys;
-
-        std::string dumpFoundIds();
-    };
-
-    using UpdateUnitPtr = std::shared_ptr<UpdateUnit>;
-    using UpdateQueue = ConcurrentBoundedQueue<UpdateUnitPtr>;
-
-    mutable UpdateQueue update_queue;
-
-    ThreadPool update_pool;
-
-    /*
-     *  Actually, we can divide all requested keys into two 'buckets'. There are only four possible states and they
-     * are described in the table.
-     *
-     * cache_not_found_ids  |0|0|1|1|
-     * cache_expired_ids    |0|1|0|1|
-     *
-     * 0 - if set is empty, 1 - otherwise
-     *
-     * Only if there are no cache_not_found_ids and some cache_expired_ids
-     * (with allow_read_expired_keys setting) we can perform async update.
-     * Otherwise we have no concatenate ids and update them sync.
-     *
-     */
-    void updateThreadFunction();
-    void update(UpdateUnitPtr & update_unit_ptr);
-
-
-    void tryPushToUpdateQueueOrThrow(UpdateUnitPtr & update_unit_ptr) const;
-    void waitForCurrentUpdateFinish(UpdateUnitPtr & update_unit_ptr) const;
-
-    mutable std::mutex update_mutex;
-    mutable std::condition_variable is_update_finished;
-
-    std::atomic<bool> finished{false};
 };
 
+extern template class CacheDictionary<DictionaryKeyType::simple>;
+extern template class CacheDictionary<DictionaryKeyType::complex>;
+
 }
diff --git a/src/Dictionaries/CacheDictionaryStorage.h b/src/Dictionaries/CacheDictionaryStorage.h
new file mode 100644
index 00000000000..720800e6357
--- /dev/null
+++ b/src/Dictionaries/CacheDictionaryStorage.h
@@ -0,0 +1,711 @@
+#pragma once
+
+#include <chrono>
+#include <variant>
+
+#include <pcg_random.hpp>
+
+#include <Common/randomSeed.h>
+#include <Common/Arena.h>
+#include <Common/ArenaWithFreeLists.h>
+#include <Common/HashTable/LRUHashMap.h>
+#include <Dictionaries/DictionaryStructure.h>
+#include <Dictionaries/ICacheDictionaryStorage.h>
+#include <Dictionaries/DictionaryHelpers.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int NOT_IMPLEMENTED;
+}
+
+struct CacheDictionaryStorageConfiguration
+{
+    /// Max size of storage in cells
+    const size_t max_size_in_cells;
+    /// Needed to perform check if cell is expired or not found. Default value is dictionary max lifetime.
+    const size_t strict_max_lifetime_seconds;
+    /// Lifetime of dictionary. Cell deadline is random value between lifetime min and max seconds.
+    const DictionaryLifetime lifetime;
+};
+
+/** ICacheDictionaryStorage implementation that keeps key in hash table with fixed collision length.
+  * Value in hash table point to index in attributes arrays.
+  */
+template <DictionaryKeyType dictionary_key_type>
+class CacheDictionaryStorage final : public ICacheDictionaryStorage
+{
+
+    static constexpr size_t max_collision_length = 10;
+
+public:
+    using KeyType = std::conditional_t<dictionary_key_type == DictionaryKeyType::simple, UInt64, StringRef>;
+    static_assert(dictionary_key_type != DictionaryKeyType::range, "Range key type is not supported by CacheDictionaryStorage");
+
+    explicit CacheDictionaryStorage(
+        const DictionaryStructure & dictionary_structure,
+        CacheDictionaryStorageConfiguration & configuration_)
+        : configuration(configuration_)
+        , rnd_engine(randomSeed())
+    {
+        size_t cells_size = roundUpToPowerOfTwoOrZero(std::max(configuration.max_size_in_cells, max_collision_length));
+
+        cells.resize_fill(cells_size);
+        size_overlap_mask = cells_size - 1;
+
+        setup(dictionary_structure);
+    }
+
+    bool returnsFetchedColumnsInOrderOfRequestedKeys() const override { return true; }
+
+    String getName() const override
+    {
+        if (dictionary_key_type == DictionaryKeyType::simple)
+            return "Cache";
+        else
+            return "ComplexKeyCache";
+    }
+
+    bool supportsSimpleKeys() const override { return dictionary_key_type == DictionaryKeyType::simple; }
+
+    SimpleKeysStorageFetchResult fetchColumnsForKeys(
+        const PaddedPODArray<UInt64> & keys,
+        const DictionaryStorageFetchRequest & fetch_request) override
+    {
+        if constexpr (dictionary_key_type == DictionaryKeyType::simple)
+            return fetchColumnsForKeysImpl<SimpleKeysStorageFetchResult>(keys, fetch_request);
+        else
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method fetchColumnsForKeys is not supported for complex key storage");
+    }
+
+    void insertColumnsForKeys(const PaddedPODArray<UInt64> & keys, Columns columns) override
+    {
+        if constexpr (dictionary_key_type == DictionaryKeyType::simple)
+            insertColumnsForKeysImpl(keys, columns);
+        else
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method insertColumnsForKeys is not supported for complex key storage");
+    }
+
+    void insertDefaultKeys(const PaddedPODArray<UInt64> & keys) override
+    {
+        if constexpr (dictionary_key_type == DictionaryKeyType::simple)
+            insertDefaultKeysImpl(keys);
+        else
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method insertDefaultKeysImpl is not supported for complex key storage");
+    }
+
+    PaddedPODArray<UInt64> getCachedSimpleKeys() const override
+    {
+        if constexpr (dictionary_key_type == DictionaryKeyType::simple)
+            return getCachedKeysImpl();
+        else
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method getCachedSimpleKeys is not supported for complex key storage");
+    }
+
+    bool supportsComplexKeys() const override { return dictionary_key_type == DictionaryKeyType::complex; }
+
+    ComplexKeysStorageFetchResult fetchColumnsForKeys(
+        const PaddedPODArray<StringRef> & keys,
+        const DictionaryStorageFetchRequest & column_fetch_requests) override
+    {
+        if constexpr (dictionary_key_type == DictionaryKeyType::complex)
+            return fetchColumnsForKeysImpl<ComplexKeysStorageFetchResult>(keys, column_fetch_requests);
+        else
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method fetchColumnsForKeys is not supported for simple key storage");
+    }
+
+    void insertColumnsForKeys(const PaddedPODArray<StringRef> & keys, Columns columns) override
+    {
+        if constexpr (dictionary_key_type == DictionaryKeyType::complex)
+            insertColumnsForKeysImpl(keys, columns);
+        else
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method insertColumnsForKeys is not supported for simple key storage");
+    }
+
+    void insertDefaultKeys(const PaddedPODArray<StringRef> & keys) override
+    {
+        if constexpr (dictionary_key_type == DictionaryKeyType::complex)
+            insertDefaultKeysImpl(keys);
+        else
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method insertDefaultKeysImpl is not supported for simple key storage");
+    }
+
+    PaddedPODArray<StringRef> getCachedComplexKeys() const override
+    {
+        if constexpr (dictionary_key_type == DictionaryKeyType::complex)
+            return getCachedKeysImpl();
+        else
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method getCachedComplexKeys is not supported for simple key storage");
+    }
+
+    size_t getSize() const override { return size; }
+
+    double getLoadFactor() const override { return static_cast<double>(size) / configuration.max_size_in_cells; }
+
+    size_t getBytesAllocated() const override
+    {
+        size_t attributes_size_in_bytes = 0;
+        size_t attributes_size = attributes.size();
+
+        for (size_t attribute_index = 0; attribute_index < attributes_size; ++attribute_index)
+        {
+            getAttributeContainer(attribute_index, [&](const auto & container)
+            {
+                attributes_size_in_bytes += container.capacity() * sizeof(container[0]);
+            });
+        }
+
+        return arena.size() + sizeof(Cell) * configuration.max_size_in_cells + attributes_size_in_bytes;
+    }
+
+private:
+
+    struct FetchedKey
+    {
+        FetchedKey(size_t element_index_, bool is_default_)
+            : element_index(element_index_)
+            , is_default(is_default_)
+        {}
+
+        size_t element_index;
+        bool is_default;
+    };
+
+    template <typename KeysStorageFetchResult>
+    KeysStorageFetchResult fetchColumnsForKeysImpl(
+        const PaddedPODArray<KeyType> & keys,
+        const DictionaryStorageFetchRequest & fetch_request)
+    {
+        KeysStorageFetchResult result;
+
+        result.fetched_columns = fetch_request.makeAttributesResultColumns();
+        result.key_index_to_state.resize_fill(keys.size());
+
+        const time_t now = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
+
+        size_t fetched_columns_index = 0;
+        size_t keys_size = keys.size();
+
+        PaddedPODArray<FetchedKey> fetched_keys;
+        fetched_keys.resize_fill(keys_size);
+
+        for (size_t key_index = 0; key_index < keys_size; ++key_index)
+        {
+            auto key = keys[key_index];
+            auto [key_state, cell_index] = getKeyStateAndCellIndex(key, now);
+
+            if (unlikely(key_state == KeyState::not_found))
+            {
+                result.key_index_to_state[key_index] = {KeyState::not_found};
+                ++result.not_found_keys_size;
+                continue;
+            }
+
+            auto & cell = cells[cell_index];
+
+            result.expired_keys_size += static_cast<size_t>(key_state == KeyState::expired);
+
+            result.key_index_to_state[key_index] = {key_state, fetched_columns_index};
+            fetched_keys[fetched_columns_index] = FetchedKey(cell.element_index, cell.is_default);
+
+            ++fetched_columns_index;
+
+            result.key_index_to_state[key_index].setDefaultValue(cell.is_default);
+            result.default_keys_size += cell.is_default;
+        }
+
+        result.found_keys_size = keys_size - (result.expired_keys_size + result.not_found_keys_size);
+
+        for (size_t attribute_index = 0; attribute_index < fetch_request.attributesSize(); ++attribute_index)
+        {
+            if (!fetch_request.shouldFillResultColumnWithIndex(attribute_index))
+                continue;
+
+            auto & attribute = attributes[attribute_index];
+            const auto & default_value_provider = fetch_request.defaultValueProviderAtIndex(attribute_index);
+
+            size_t fetched_keys_size = fetched_keys.size();
+            auto & fetched_column = *result.fetched_columns[attribute_index];
+            fetched_column.reserve(fetched_keys_size);
+
+            if (unlikely(attribute.is_complex_type))
+            {
+                auto & container = std::get<std::vector<Field>>(attribute.attribute_container);
+
+                for (size_t fetched_key_index = 0; fetched_key_index < fetched_columns_index; ++fetched_key_index)
+                {
+                    auto fetched_key = fetched_keys[fetched_key_index];
+
+                    if (unlikely(fetched_key.is_default))
+                        fetched_column.insert(default_value_provider.getDefaultValue(fetched_key_index));
+                    else
+                        fetched_column.insert(container[fetched_key.element_index]);
+                }
+            }
+            else
+            {
+                auto type_call = [&](const auto & dictionary_attribute_type)
+                {
+                    using Type = std::decay_t<decltype(dictionary_attribute_type)>;
+                    using AttributeType = typename Type::AttributeType;
+                    using ValueType = DictionaryValueType<AttributeType>;
+                    using ColumnType =
+                        std::conditional_t<std::is_same_v<AttributeType, String>, ColumnString,
+                            std::conditional_t<IsDecimalNumber<AttributeType>, ColumnDecimal<ValueType>,
+                                ColumnVector<AttributeType>>>;
+
+                    auto & container = std::get<PaddedPODArray<ValueType>>(attribute.attribute_container);
+                    ColumnType & column_typed = static_cast<ColumnType &>(fetched_column);
+
+                    if constexpr (std::is_same_v<ColumnType, ColumnString>)
+                    {
+                        for (size_t fetched_key_index = 0; fetched_key_index < fetched_columns_index; ++fetched_key_index)
+                        {
+                            auto fetched_key = fetched_keys[fetched_key_index];
+
+                            if (unlikely(fetched_key.is_default))
+                                column_typed.insert(default_value_provider.getDefaultValue(fetched_key_index));
+                            else
+                            {
+                                auto item = container[fetched_key.element_index];
+                                column_typed.insertData(item.data, item.size);
+                            }
+                        }
+                    }
+                    else
+                    {
+                        auto & data = column_typed.getData();
+
+                        for (size_t fetched_key_index = 0; fetched_key_index < fetched_columns_index; ++fetched_key_index)
+                        {
+                            auto fetched_key = fetched_keys[fetched_key_index];
+
+                            if (unlikely(fetched_key.is_default))
+                                column_typed.insert(default_value_provider.getDefaultValue(fetched_key_index));
+                            else
+                            {
+                                auto item = container[fetched_key.element_index];
+                                data.push_back(item);
+                            }
+                        }
+                    }
+                };
+
+                callOnDictionaryAttributeType(attribute.type, type_call);
+            }
+        }
+
+        return result;
+    }
+
+    void insertColumnsForKeysImpl(const PaddedPODArray<KeyType> & keys, Columns columns)
+    {
+        const auto now = std::chrono::system_clock::now();
+
+        Field column_value;
+
+        for (size_t key_index = 0; key_index < keys.size(); ++key_index)
+        {
+            auto key = keys[key_index];
+
+            size_t cell_index = getCellIndexForInsert(key);
+            auto & cell = cells[cell_index];
+
+            bool cell_was_default = cell.is_default;
+            cell.is_default = false;
+
+            bool was_inserted = cell.deadline == 0;
+
+            if (was_inserted)
+            {
+                if constexpr (std::is_same_v<KeyType, StringRef>)
+                    cell.key = copyStringInArena(key);
+                else
+                    cell.key = key;
+
+                for (size_t attribute_index = 0; attribute_index < columns.size(); ++attribute_index)
+                {
+                    auto & column = columns[attribute_index];
+
+                    getAttributeContainer(attribute_index, [&](auto & container)
+                    {
+                        container.emplace_back();
+                        cell.element_index = container.size() - 1;
+
+                        using ElementType = std::decay_t<decltype(container[0])>;
+
+                        column->get(key_index, column_value);
+
+                        if constexpr (std::is_same_v<ElementType, Field>)
+                            container.back() = column_value;
+                        else if constexpr (std::is_same_v<ElementType, StringRef>)
+                        {
+                            const String & string_value = column_value.get<String>();
+                            StringRef string_value_ref = StringRef {string_value.data(), string_value.size()};
+                            StringRef inserted_value = copyStringInArena(string_value_ref);
+                            container.back() = inserted_value;
+                        }
+                        else
+                            container.back() = column_value.get<NearestFieldType<ElementType>>();
+                    });
+                }
+
+                ++size;
+            }
+            else
+            {
+                if (cell.key != key)
+                {
+                    if constexpr (std::is_same_v<KeyType, StringRef>)
+                    {
+                        char * data = const_cast<char *>(cell.key.data);
+                        arena.free(data, cell.key.size);
+                        cell.key = copyStringInArena(key);
+                    }
+                    else
+                        cell.key = key;
+                }
+
+                /// Put values into existing index
+                size_t index_to_use = cell.element_index;
+
+                for (size_t attribute_index = 0; attribute_index < columns.size(); ++attribute_index)
+                {
+                    auto & column = columns[attribute_index];
+
+                    getAttributeContainer(attribute_index, [&](auto & container)
+                    {
+                        using ElementType = std::decay_t<decltype(container[0])>;
+
+                        column->get(key_index, column_value);
+
+                        if constexpr (std::is_same_v<ElementType, Field>)
+                            container[index_to_use] = column_value;
+                        else if constexpr (std::is_same_v<ElementType, StringRef>)
+                        {
+                            const String & string_value = column_value.get<String>();
+                            StringRef string_ref_value = StringRef {string_value.data(), string_value.size()};
+                            StringRef inserted_value = copyStringInArena(string_ref_value);
+
+                            if (!cell_was_default)
+                            {
+                                StringRef previous_value = container[index_to_use];
+                                arena.free(const_cast<char *>(previous_value.data), previous_value.size);
+                            }
+
+                            container[index_to_use] = inserted_value;
+                        }
+                        else
+                            container[index_to_use] = column_value.get<NearestFieldType<ElementType>>();
+                    });
+                }
+            }
+
+            setCellDeadline(cell, now);
+        }
+    }
+
+    void insertDefaultKeysImpl(const PaddedPODArray<KeyType> & keys)
+    {
+        const auto now = std::chrono::system_clock::now();
+
+        size_t keys_size = keys.size();
+
+        for (size_t key_index = 0; key_index < keys_size; ++key_index)
+        {
+            auto key = keys[key_index];
+
+            size_t cell_index = getCellIndexForInsert(key);
+            auto & cell = cells[cell_index];
+
+            bool was_inserted = cell.deadline == 0;
+            bool cell_was_default = cell.is_default;
+
+            cell.is_default = true;
+
+            if (was_inserted)
+            {
+                if constexpr (std::is_same_v<KeyType, StringRef>)
+                    cell.key = copyStringInArena(key);
+                else
+                    cell.key = key;
+
+                for (size_t attribute_index = 0; attribute_index < attributes.size(); ++attribute_index)
+                {
+                    getAttributeContainer(attribute_index, [&](auto & container)
+                    {
+                        container.emplace_back();
+                        cell.element_index = container.size() - 1;
+                    });
+                }
+
+                ++size;
+            }
+            else
+            {
+                for (size_t attribute_index = 0; attribute_index < attributes.size(); ++attribute_index)
+                {
+                    getAttributeContainer(attribute_index, [&](const auto & container)
+                    {
+                        using ElementType = std::decay_t<decltype(container[0])>;
+
+                        if constexpr (std::is_same_v<ElementType, StringRef>)
+                        {
+                            if (!cell_was_default)
+                            {
+                                StringRef previous_value = container[cell.element_index];
+                                arena.free(const_cast<char *>(previous_value.data), previous_value.size);
+                            }
+                        }
+                    });
+                }
+
+                if (cell.key != key)
+                {
+                    if constexpr (std::is_same_v<KeyType, StringRef>)
+                    {
+                        char * data = const_cast<char *>(cell.key.data);
+                        arena.free(data, cell.key.size);
+                        cell.key = copyStringInArena(key);
+                    }
+                    else
+                        cell.key = key;
+                }
+            }
+
+            setCellDeadline(cell, now);
+        }
+    }
+
+    PaddedPODArray<KeyType> getCachedKeysImpl() const
+    {
+        PaddedPODArray<KeyType> result;
+        result.reserve(size);
+
+        for (auto & cell : cells)
+        {
+            if (cell.deadline == 0)
+                continue;
+
+            if (cell.is_default)
+                continue;
+
+            result.emplace_back(cell.key);
+        }
+
+        return result;
+    }
+
+    template <typename GetContainerFunc>
+    void getAttributeContainer(size_t attribute_index, GetContainerFunc && func)
+    {
+        auto & attribute = attributes[attribute_index];
+        auto & attribute_type = attribute.type;
+
+        if (unlikely(attribute.is_complex_type))
+        {
+            auto & container = std::get<std::vector<Field>>(attribute.attribute_container);
+            std::forward<GetContainerFunc>(func)(container);
+        }
+        else
+        {
+            auto type_call = [&](const auto & dictionary_attribute_type)
+            {
+                using Type = std::decay_t<decltype(dictionary_attribute_type)>;
+                using AttributeType = typename Type::AttributeType;
+                using ValueType = DictionaryValueType<AttributeType>;
+
+                auto & container = std::get<PaddedPODArray<ValueType>>(attribute.attribute_container);
+                std::forward<GetContainerFunc>(func)(container);
+            };
+
+            callOnDictionaryAttributeType(attribute_type, type_call);
+        }
+    }
+
+    template <typename GetContainerFunc>
+    void getAttributeContainer(size_t attribute_index, GetContainerFunc && func) const
+    {
+        return const_cast<std::decay_t<decltype(*this)> *>(this)->template getAttributeContainer(attribute_index, std::forward<GetContainerFunc>(func));
+    }
+
+    StringRef copyStringInArena(StringRef value_to_copy)
+    {
+        size_t value_to_copy_size = value_to_copy.size;
+        char * place_for_key = arena.alloc(value_to_copy_size);
+        memcpy(reinterpret_cast<void *>(place_for_key), reinterpret_cast<const void *>(value_to_copy.data), value_to_copy_size);
+        StringRef updated_value{place_for_key, value_to_copy_size};
+
+        return updated_value;
+    }
+
+    void setup(const DictionaryStructure & dictionary_structure)
+    {
+        /// For each dictionary attribute create storage attribute
+        /// For simple attributes create PODArray, for complex vector of Fields
+
+        attributes.reserve(dictionary_structure.attributes.size());
+
+        for (const auto & dictionary_attribute : dictionary_structure.attributes)
+        {
+            auto attribute_type = dictionary_attribute.underlying_type;
+
+            auto type_call = [&](const auto & dictionary_attribute_type)
+            {
+                using Type = std::decay_t<decltype(dictionary_attribute_type)>;
+                using AttributeType = typename Type::AttributeType;
+                using ValueType = DictionaryValueType<AttributeType>;
+
+                attributes.emplace_back();
+                auto & last_attribute = attributes.back();
+                last_attribute.type = attribute_type;
+                last_attribute.is_complex_type = dictionary_attribute.is_nullable || dictionary_attribute.is_array;
+
+                if (dictionary_attribute.is_nullable)
+                    last_attribute.attribute_container = std::vector<Field>();
+                else
+                    last_attribute.attribute_container = PaddedPODArray<ValueType>();
+            };
+
+            callOnDictionaryAttributeType(attribute_type, type_call);
+        }
+    }
+
+    using TimePoint = std::chrono::system_clock::time_point;
+
+    struct Cell
+    {
+        KeyType key;
+        size_t element_index;
+        bool is_default;
+        time_t deadline;
+    };
+
+    struct Attribute
+    {
+        AttributeUnderlyingType type;
+        bool is_complex_type;
+
+        std::variant<
+            PaddedPODArray<UInt8>,
+            PaddedPODArray<UInt16>,
+            PaddedPODArray<UInt32>,
+            PaddedPODArray<UInt64>,
+            PaddedPODArray<UInt128>,
+            PaddedPODArray<Int8>,
+            PaddedPODArray<Int16>,
+            PaddedPODArray<Int32>,
+            PaddedPODArray<Int64>,
+            PaddedPODArray<Decimal32>,
+            PaddedPODArray<Decimal64>,
+            PaddedPODArray<Decimal128>,
+            PaddedPODArray<Decimal256>,
+            PaddedPODArray<Float32>,
+            PaddedPODArray<Float64>,
+            PaddedPODArray<StringRef>,
+            std::vector<Field>> attribute_container;
+    };
+
+    CacheDictionaryStorageConfiguration configuration;
+
+    pcg64 rnd_engine;
+
+    size_t size_overlap_mask = 0;
+
+    size_t size = 0;
+
+    PaddedPODArray<Cell> cells;
+
+    ArenaWithFreeLists arena;
+
+    std::vector<Attribute> attributes;
+
+    inline void setCellDeadline(Cell & cell, TimePoint now)
+    {
+        if (configuration.lifetime.min_sec == 0 && configuration.lifetime.max_sec == 0)
+        {
+            /// This maybe not obvious, but when we define is this cell is expired or expired permanently, we add strict_max_lifetime_seconds
+            /// to the expiration time. And it overflows pretty well.
+            auto deadline = std::chrono::time_point<std::chrono::system_clock>::max() - 2 * std::chrono::seconds(configuration.strict_max_lifetime_seconds);
+            cell.deadline = std::chrono::system_clock::to_time_t(deadline);
+            return;
+        }
+
+        size_t min_sec_lifetime = configuration.lifetime.min_sec;
+        size_t max_sec_lifetime = configuration.lifetime.max_sec;
+
+        std::uniform_int_distribution<UInt64> distribution{min_sec_lifetime, max_sec_lifetime};
+
+        auto deadline = now + std::chrono::seconds(distribution(rnd_engine));
+        cell.deadline = std::chrono::system_clock::to_time_t(deadline);
+    }
+
+    inline size_t getCellIndex(const KeyType key) const
+    {
+        const size_t hash = DefaultHash<KeyType>()(key);
+        const size_t index = hash & size_overlap_mask;
+        return index;
+    }
+
+    using KeyStateAndCellIndex = std::pair<KeyState::State, size_t>;
+
+    inline KeyStateAndCellIndex getKeyStateAndCellIndex(const KeyType key, const time_t now) const
+    {
+        size_t place_value = getCellIndex(key);
+        const size_t place_value_end = place_value + max_collision_length;
+
+        time_t max_lifetime_seconds = static_cast<time_t>(configuration.strict_max_lifetime_seconds);
+
+        for (; place_value < place_value_end; ++place_value)
+        {
+            const auto cell_place_value = place_value & size_overlap_mask;
+            const auto & cell = cells[cell_place_value];
+
+            if (cell.key != key)
+                continue;
+
+            if (unlikely(now > cell.deadline + max_lifetime_seconds))
+                return std::make_pair(KeyState::not_found, cell_place_value);
+
+            if (unlikely(now > cell.deadline))
+                return std::make_pair(KeyState::expired, cell_place_value);
+
+            return std::make_pair(KeyState::found, cell_place_value);
+        }
+
+        return std::make_pair(KeyState::not_found, place_value & size_overlap_mask);
+    }
+
+    inline size_t getCellIndexForInsert(const KeyType & key) const
+    {
+        size_t place_value = getCellIndex(key);
+        const size_t place_value_end = place_value + max_collision_length;
+        size_t oldest_place_value = place_value;
+
+        time_t oldest_time = std::numeric_limits<time_t>::max();
+
+        for (; place_value < place_value_end; ++place_value)
+        {
+            const size_t cell_place_value = place_value & size_overlap_mask;
+            const Cell cell = cells[cell_place_value];
+
+            if (cell.deadline == 0)
+                return cell_place_value;
+
+            if (cell.key == key)
+                return cell_place_value;
+
+            if (cell.deadline < oldest_time)
+            {
+                oldest_time = cell.deadline;
+                oldest_place_value = cell_place_value;
+            }
+        }
+
+        return oldest_place_value;
+    }
+};
+
+}
diff --git a/src/Dictionaries/CacheDictionaryUpdateQueue.cpp b/src/Dictionaries/CacheDictionaryUpdateQueue.cpp
new file mode 100644
index 00000000000..310abed822f
--- /dev/null
+++ b/src/Dictionaries/CacheDictionaryUpdateQueue.cpp
@@ -0,0 +1,161 @@
+#include "CacheDictionaryUpdateQueue.h"
+
+#include <Dictionaries/CacheDictionaryUpdateQueue.h>
+
+#include <Common/setThreadName.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int CACHE_DICTIONARY_UPDATE_FAIL;
+    extern const int UNSUPPORTED_METHOD;
+    extern const int TIMEOUT_EXCEEDED;
+}
+
+template class CacheDictionaryUpdateUnit<DictionaryKeyType::simple>;
+template class CacheDictionaryUpdateUnit<DictionaryKeyType::complex>;
+
+template <DictionaryKeyType dictionary_key_type>
+CacheDictionaryUpdateQueue<dictionary_key_type>::CacheDictionaryUpdateQueue(
+    String dictionary_name_for_logs_,
+    CacheDictionaryUpdateQueueConfiguration configuration_,
+    UpdateFunction && update_func_)
+    : dictionary_name_for_logs(std::move(dictionary_name_for_logs_))
+    , configuration(configuration_)
+    , update_func(std::move(update_func_))
+    , update_queue(configuration.max_update_queue_size)
+    , update_pool(configuration.max_threads_for_updates)
+{
+    for (size_t i = 0; i < configuration.max_threads_for_updates; ++i)
+        update_pool.scheduleOrThrowOnError([this] { updateThreadFunction(); });
+}
+
+template <DictionaryKeyType dictionary_key_type>
+CacheDictionaryUpdateQueue<dictionary_key_type>::~CacheDictionaryUpdateQueue()
+{
+    try {
+        if (!finished)
+            stopAndWait();
+    }
+    catch (...)
+    {
+        /// TODO: Write log
+    }
+}
+
+template <DictionaryKeyType dictionary_key_type>
+void CacheDictionaryUpdateQueue<dictionary_key_type>::tryPushToUpdateQueueOrThrow(CacheDictionaryUpdateUnitPtr<dictionary_key_type> & update_unit_ptr)
+{
+    if (finished)
+        throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "CacheDictionaryUpdateQueue finished");
+
+    if (!update_queue.tryPush(update_unit_ptr, configuration.update_queue_push_timeout_milliseconds))
+        throw DB::Exception(ErrorCodes::CACHE_DICTIONARY_UPDATE_FAIL,
+            "Cannot push to internal update queue in dictionary {}. "
+            "Timelimit of {} ms. exceeded. Current queue size is {}",
+            dictionary_name_for_logs,
+            std::to_string(configuration.update_queue_push_timeout_milliseconds),
+            std::to_string(update_queue.size()));
+}
+
+template <DictionaryKeyType dictionary_key_type>
+void CacheDictionaryUpdateQueue<dictionary_key_type>::waitForCurrentUpdateFinish(CacheDictionaryUpdateUnitPtr<dictionary_key_type> & update_unit_ptr) const
+{
+    if (finished)
+        throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "CacheDictionaryUpdateQueue finished");
+
+    std::unique_lock<std::mutex> update_lock(update_mutex);
+
+    bool result = is_update_finished.wait_for(
+        update_lock,
+        std::chrono::milliseconds(configuration.query_wait_timeout_milliseconds),
+        [&]
+        {
+            return update_unit_ptr->is_done || update_unit_ptr->current_exception;
+        });
+
+    if (!result)
+    {
+        throw DB::Exception(
+            ErrorCodes::TIMEOUT_EXCEEDED,
+            "Dictionary {} source seems unavailable, because {} ms timeout exceeded.",
+            dictionary_name_for_logs,
+            toString(configuration.query_wait_timeout_milliseconds));
+    }
+
+    if (update_unit_ptr->current_exception)
+    {
+        // Don't just rethrow it, because sharing the same exception object
+        // between multiple threads can lead to weird effects if they decide to
+        // modify it, for example, by adding some error context.
+        try
+        {
+            std::rethrow_exception(update_unit_ptr->current_exception);
+        }
+        catch (...)
+        {
+            throw DB::Exception(
+                ErrorCodes::CACHE_DICTIONARY_UPDATE_FAIL,
+                "Update failed for dictionary '{}': {}",
+                dictionary_name_for_logs,
+                getCurrentExceptionMessage(true /*with stack trace*/, true /*check embedded stack trace*/));
+        }
+    }
+}
+
+template <DictionaryKeyType dictionary_key_type>
+void CacheDictionaryUpdateQueue<dictionary_key_type>::stopAndWait()
+{
+    finished = true;
+    update_queue.clear();
+
+    for (size_t i = 0; i < configuration.max_threads_for_updates; ++i)
+    {
+        auto empty_finishing_ptr = std::make_shared<CacheDictionaryUpdateUnit<dictionary_key_type>>();
+        update_queue.push(empty_finishing_ptr);
+    }
+
+    update_pool.wait();
+}
+
+template <DictionaryKeyType dictionary_key_type>
+void CacheDictionaryUpdateQueue<dictionary_key_type>::updateThreadFunction()
+{
+    setThreadName("UpdQueue");
+
+    while (!finished)
+    {
+        CacheDictionaryUpdateUnitPtr<dictionary_key_type> unit_to_update;
+        update_queue.pop(unit_to_update);
+
+        if (finished)
+            break;
+
+        try
+        {
+            /// Update
+            update_func(unit_to_update);
+
+            /// Notify thread about finished updating the bunch of ids
+            /// where their own ids were included.
+            std::unique_lock<std::mutex> lock(update_mutex);
+
+            unit_to_update->is_done = true;
+            is_update_finished.notify_all();
+        }
+        catch (...)
+        {
+            std::unique_lock<std::mutex> lock(update_mutex);
+
+            unit_to_update->current_exception = std::current_exception(); // NOLINT(bugprone-throw-keyword-missing)
+            is_update_finished.notify_all();
+        }
+    }
+}
+
+template class CacheDictionaryUpdateQueue<DictionaryKeyType::simple>;
+template class CacheDictionaryUpdateQueue<DictionaryKeyType::complex>;
+
+}
diff --git a/src/Dictionaries/CacheDictionaryUpdateQueue.h b/src/Dictionaries/CacheDictionaryUpdateQueue.h
new file mode 100644
index 00000000000..3d27a157752
--- /dev/null
+++ b/src/Dictionaries/CacheDictionaryUpdateQueue.h
@@ -0,0 +1,173 @@
+#pragma once
+
+#include <atomic>
+#include <mutex>
+#include <shared_mutex>
+#include <utility>
+#include <vector>
+#include <functional>
+
+#include <Common/ThreadPool.h>
+#include <Common/ConcurrentBoundedQueue.h>
+#include <Common/CurrentMetrics.h>
+#include <Common/PODArray.h>
+#include <Common/HashTable/HashMap.h>
+#include <Columns/IColumn.h>
+#include <Dictionaries/ICacheDictionaryStorage.h>
+
+namespace CurrentMetrics
+{
+    extern const Metric CacheDictionaryUpdateQueueBatches;
+    extern const Metric CacheDictionaryUpdateQueueKeys;
+}
+
+namespace DB
+{
+
+/** This class is passed between update queue and update queue client during update.
+
+    For simple keys we pass simple keys.
+
+    For complex keys we pass complex keys columns and requested rows to update.
+
+    During update cache dictionary should fill requested_keys_to_fetched_columns_during_update_index and
+    fetched_columns_during_update.
+
+    For complex key to extend lifetime of key complex key arena should be used.
+*/
+template <DictionaryKeyType dictionary_key_type>
+class CacheDictionaryUpdateUnit
+{
+public:
+    using KeyType = std::conditional_t<dictionary_key_type == DictionaryKeyType::simple, UInt64, StringRef>;
+
+    /// Constructor for complex keys update request
+    explicit CacheDictionaryUpdateUnit(
+        const Columns & key_columns_,
+        const PaddedPODArray<KeyState> & key_index_to_state_from_storage_,
+        const DictionaryStorageFetchRequest & request_,
+        size_t keys_to_update_size_)
+        : key_columns(key_columns_)
+        , key_index_to_state(key_index_to_state_from_storage_.begin(), key_index_to_state_from_storage_.end())
+        , request(request_)
+        , keys_to_update_size(keys_to_update_size_)
+        , alive_keys(CurrentMetrics::CacheDictionaryUpdateQueueKeys, keys_to_update_size)
+    {}
+
+    CacheDictionaryUpdateUnit()
+        : keys_to_update_size(0)
+        , alive_keys(CurrentMetrics::CacheDictionaryUpdateQueueKeys, 0)
+    {}
+
+    const Columns key_columns;
+    const PaddedPODArray<KeyState> key_index_to_state;
+    const DictionaryStorageFetchRequest request;
+    const size_t keys_to_update_size;
+
+    HashMap<KeyType, size_t> requested_keys_to_fetched_columns_during_update_index;
+    MutableColumns fetched_columns_during_update;
+
+    /// Complex keys are serialized in this arena
+    DictionaryKeysArenaHolder<dictionary_key_type> complex_keys_arena_holder;
+
+private:
+    template <DictionaryKeyType>
+    friend class CacheDictionaryUpdateQueue;
+
+    std::atomic<bool> is_done{false};
+    std::exception_ptr current_exception{nullptr};
+
+    /// While UpdateUnit is alive, it is accounted in update_queue size.
+    CurrentMetrics::Increment alive_batch{CurrentMetrics::CacheDictionaryUpdateQueueBatches};
+    CurrentMetrics::Increment alive_keys;
+};
+
+template <DictionaryKeyType dictionary_key_type>
+using CacheDictionaryUpdateUnitPtr = std::shared_ptr<CacheDictionaryUpdateUnit<dictionary_key_type>>;
+
+extern template class CacheDictionaryUpdateUnit<DictionaryKeyType::simple>;
+extern template class CacheDictionaryUpdateUnit<DictionaryKeyType::complex>;
+
+struct CacheDictionaryUpdateQueueConfiguration
+{
+    /// Size of update queue
+    const size_t max_update_queue_size;
+    /// Size in thead pool of update queue
+    const size_t max_threads_for_updates;
+    /// Timeout for trying to push update unit into queue
+    const size_t update_queue_push_timeout_milliseconds;
+    /// Timeout during sync waititing of update unit
+    const size_t query_wait_timeout_milliseconds;
+};
+
+/** Responsibility of this class is to provide asynchronous and synchronous update support for CacheDictionary
+
+    It is responsibility of CacheDictionary to perform update with UpdateUnit using UpdateFunction.
+*/
+template <DictionaryKeyType dictionary_key_type>
+class CacheDictionaryUpdateQueue
+{
+public:
+    /// Client of update queue must provide this function in constructor and perform update using update unit.
+    using UpdateFunction = std::function<void (CacheDictionaryUpdateUnitPtr<dictionary_key_type>)>;
+    static_assert(dictionary_key_type != DictionaryKeyType::range, "Range key type is not supported by CacheDictionaryUpdateQueue");
+
+    CacheDictionaryUpdateQueue(
+        String dictionary_name_for_logs_,
+        CacheDictionaryUpdateQueueConfiguration configuration_,
+        UpdateFunction && update_func_);
+
+    ~CacheDictionaryUpdateQueue();
+
+    /// Get configuration that was passed to constructor
+    const CacheDictionaryUpdateQueueConfiguration & getConfiguration() const { return configuration; }
+
+    /// Is queue finished
+    bool isFinished() const { return finished; }
+
+    /// Synchronous wait for update queue to stop
+    void stopAndWait();
+
+    /** Try to add update unit into queue.
+
+        If queue is full and oush cannot be performed in update_queue_push_timeout_milliseconds from configuration
+        an exception will be thrown.
+
+        If queue already finished an exception will be thrown.
+    */
+    void tryPushToUpdateQueueOrThrow(CacheDictionaryUpdateUnitPtr<dictionary_key_type> & update_unit_ptr);
+
+    /** Try to synchronously wait for update completion.
+
+        If exception was passed from update function during update it will be rethrowed.
+
+        If update will not be finished in query_wait_timeout_milliseconds from configuration
+        an exception will be thrown.
+
+        If queue already finished an exception will be thrown.
+    */
+    void waitForCurrentUpdateFinish(CacheDictionaryUpdateUnitPtr<dictionary_key_type> & update_unit_ptr) const;
+
+private:
+    void updateThreadFunction();
+
+    using UpdateQueue = ConcurrentBoundedQueue<CacheDictionaryUpdateUnitPtr<dictionary_key_type>>;
+
+    String dictionary_name_for_logs;
+
+    CacheDictionaryUpdateQueueConfiguration configuration;
+    UpdateFunction update_func;
+
+    UpdateQueue update_queue;
+    ThreadPool update_pool;
+
+    mutable std::mutex update_mutex;
+    mutable std::condition_variable is_update_finished;
+
+    std::atomic<bool> finished{false};
+};
+
+extern template class CacheDictionaryUpdateQueue<DictionaryKeyType::simple>;
+extern template class CacheDictionaryUpdateQueue<DictionaryKeyType::complex>;
+
+}
diff --git a/src/Dictionaries/CassandraBlockInputStream.cpp b/src/Dictionaries/CassandraBlockInputStream.cpp
index 721cb44a82e..4e71c212451 100644
--- a/src/Dictionaries/CassandraBlockInputStream.cpp
+++ b/src/Dictionaries/CassandraBlockInputStream.cpp
@@ -142,7 +142,7 @@ void CassandraBlockInputStream::insertValue(IColumn & column, ValueType type, co
             break;
         }
         default:
-            throw Exception("Unknown type : " + std::to_string(static_cast<int>(type)), ErrorCodes::UNKNOWN_TYPE);
+            throw Exception(ErrorCodes::UNKNOWN_TYPE, "Unknown type : {}", std::to_string(static_cast<int>(type)));
     }
 }
 
@@ -256,7 +256,7 @@ void CassandraBlockInputStream::assertTypes(const CassResultPtr & result)
                 expected_text = "uuid";
                 break;
             default:
-                throw Exception("Unknown type : " + std::to_string(static_cast<int>(description.types[i].first)), ErrorCodes::UNKNOWN_TYPE);
+                throw Exception(ErrorCodes::UNKNOWN_TYPE, "Unknown type : {}", std::to_string(static_cast<int>(description.types[i].first)));
         }
 
         CassValueType got = cass_result_column_type(result, i);
@@ -267,8 +267,10 @@ void CassandraBlockInputStream::assertTypes(const CassResultPtr & result)
                 continue;
 
             const auto & column_name = description.sample_block.getColumnsWithTypeAndName()[i].name;
-            throw Exception("Type mismatch for column " + column_name + ": expected Cassandra type " + expected_text,
-                            ErrorCodes::TYPE_MISMATCH);
+            throw Exception(ErrorCodes::TYPE_MISMATCH,
+                "Type mismatch for column {} : expected Cassandra type {}",
+                column_name,
+                expected_text);
         }
     }
 
diff --git a/src/Dictionaries/CassandraDictionarySource.cpp b/src/Dictionaries/CassandraDictionarySource.cpp
index 643e9af54b8..b4f7f3221bc 100644
--- a/src/Dictionaries/CassandraDictionarySource.cpp
+++ b/src/Dictionaries/CassandraDictionarySource.cpp
@@ -17,7 +17,7 @@ void registerDictionarySourceCassandra(DictionarySourceFactory & factory)
                                    [[maybe_unused]] const Poco::Util::AbstractConfiguration & config,
                                    [[maybe_unused]] const std::string & config_prefix,
                                    [[maybe_unused]] Block & sample_block,
-                                                    const Context & /* context */,
+                                                    ContextPtr /* context */,
                                                     const std::string & /* default_database */,
                                                     bool /*check_config*/) -> DictionarySourcePtr
     {
@@ -25,8 +25,8 @@ void registerDictionarySourceCassandra(DictionarySourceFactory & factory)
     setupCassandraDriverLibraryLogging(CASS_LOG_INFO);
     return std::make_unique<CassandraDictionarySource>(dict_struct, config, config_prefix + ".cassandra", sample_block);
 #else
-    throw Exception{"Dictionary source of type `cassandra` is disabled because ClickHouse was built without cassandra support.",
-                    ErrorCodes::SUPPORT_IS_DISABLED};
+    throw Exception(ErrorCodes::SUPPORT_IS_DISABLED,
+        "Dictionary source of type `cassandra` is disabled because ClickHouse was built without cassandra support.");
 #endif
     };
     factory.registerSource("cassandra", create_table_source);
@@ -90,7 +90,7 @@ void CassandraSettings::setConsistency(const String & config_str)
     else if (config_str == "LocalSerial")
         consistency = CASS_CONSISTENCY_LOCAL_SERIAL;
     else    /// CASS_CONSISTENCY_ANY is only valid for writes
-        throw Exception("Unsupported consistency level: " + config_str, ErrorCodes::INVALID_CONFIG_PARAMETER);
+        throw Exception(ErrorCodes::INVALID_CONFIG_PARAMETER, "Unsupported consistency level: {}", config_str);
 }
 
 static const size_t max_block_size = 8192;
@@ -156,7 +156,7 @@ BlockInputStreamPtr CassandraDictionarySource::loadIds(const std::vector<UInt64>
 BlockInputStreamPtr CassandraDictionarySource::loadKeys(const Columns & key_columns, const std::vector<size_t> & requested_rows)
 {
     if (requested_rows.empty())
-        throw Exception("No rows requested", ErrorCodes::LOGICAL_ERROR);
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "No rows requested");
 
     /// TODO is there a better way to load data by complex keys?
     std::unordered_map<UInt64, std::vector<size_t>> partitions;
@@ -185,7 +185,7 @@ BlockInputStreamPtr CassandraDictionarySource::loadKeys(const Columns & key_colu
 
 BlockInputStreamPtr CassandraDictionarySource::loadUpdatedAll()
 {
-    throw Exception("Method loadUpdatedAll is unsupported for CassandraDictionarySource", ErrorCodes::NOT_IMPLEMENTED);
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method loadUpdatedAll is unsupported for CassandraDictionarySource");
 }
 
 CassSessionShared CassandraDictionarySource::getSession()
diff --git a/src/Dictionaries/CassandraHelpers.cpp b/src/Dictionaries/CassandraHelpers.cpp
index 6de80a455c7..81f7d6d9a63 100644
--- a/src/Dictionaries/CassandraHelpers.cpp
+++ b/src/Dictionaries/CassandraHelpers.cpp
@@ -16,8 +16,10 @@ extern const int CASSANDRA_INTERNAL_ERROR;
 void cassandraCheck(CassError code)
 {
     if (code != CASS_OK)
-        throw Exception("Cassandra driver error " + std::to_string(code) + ": " + cass_error_desc(code),
-                        ErrorCodes::CASSANDRA_INTERNAL_ERROR);
+        throw Exception(ErrorCodes::CASSANDRA_INTERNAL_ERROR,
+            "Cassandra driver error {}: {}",
+            std::to_string(code),
+            cass_error_desc(code));
 }
 
 
@@ -31,8 +33,12 @@ void cassandraWaitAndCheck(CassFuturePtr & future)
     const char * message;
     size_t message_len;
     cass_future_error_message(future, &message, & message_len);
-    std::string full_message = "Cassandra driver error " + std::to_string(code) + ": " + cass_error_desc(code) + ": " + message;
-    throw Exception(full_message, ErrorCodes::CASSANDRA_INTERNAL_ERROR);
+
+    throw Exception(ErrorCodes::CASSANDRA_INTERNAL_ERROR,
+        "Cassandra driver error {}: {}: {}",
+        std::to_string(code),
+        cass_error_desc(code),
+        message);
 }
 
 static std::once_flag setup_logging_flag;
diff --git a/src/Dictionaries/ClickHouseDictionarySource.cpp b/src/Dictionaries/ClickHouseDictionarySource.cpp
index 8d733bcd90a..fdb0d76a8d7 100644
--- a/src/Dictionaries/ClickHouseDictionarySource.cpp
+++ b/src/Dictionaries/ClickHouseDictionarySource.cpp
@@ -18,111 +18,85 @@
 namespace DB
 {
 
-static const size_t MAX_CONNECTIONS = 16;
-
-inline static UInt16 getPortFromContext(const Context & context, bool secure)
+namespace ErrorCodes
 {
-    return secure ? context.getTCPPortSecure().value_or(0) : context.getTCPPort();
+    extern const int BAD_ARGUMENTS;
 }
 
-static ConnectionPoolWithFailoverPtr createPool(
-    const std::string & host,
-    UInt16 port,
-    bool secure,
-    const std::string & db,
-    const std::string & user,
-    const std::string & password)
+namespace
 {
-    ConnectionPoolPtrs pools;
-    pools.emplace_back(std::make_shared<ConnectionPool>(
-        MAX_CONNECTIONS,
-        host,
-        port,
-        db,
-        user,
-        password,
-        "", /* cluster */
-        "", /* cluster_secret */
-        "ClickHouseDictionarySource",
-        Protocol::Compression::Enable,
-        secure ? Protocol::Secure::Enable : Protocol::Secure::Disable));
-    return std::make_shared<ConnectionPoolWithFailover>(pools, LoadBalancing::RANDOM);
-}
+    constexpr size_t MAX_CONNECTIONS = 16;
 
+    inline UInt16 getPortFromContext(ContextPtr context, bool secure)
+    {
+        return secure ? context->getTCPPortSecure().value_or(0) : context->getTCPPort();
+    }
+
+    ConnectionPoolWithFailoverPtr createPool(const ClickHouseDictionarySource::Configuration & configuration)
+    {
+        if (configuration.is_local)
+            return nullptr;
+
+        ConnectionPoolPtrs pools;
+        pools.emplace_back(std::make_shared<ConnectionPool>(
+            MAX_CONNECTIONS,
+            configuration.host,
+            configuration.port,
+            configuration.db,
+            configuration.user,
+            configuration.password,
+            "", /* cluster */
+            "", /* cluster_secret */
+            "ClickHouseDictionarySource",
+            Protocol::Compression::Enable,
+            configuration.secure ? Protocol::Secure::Enable : Protocol::Secure::Disable));
+
+        return std::make_shared<ConnectionPoolWithFailover>(pools, LoadBalancing::RANDOM);
+    }
+
+}
 
 ClickHouseDictionarySource::ClickHouseDictionarySource(
     const DictionaryStructure & dict_struct_,
-    const Poco::Util::AbstractConfiguration & config,
-    const std::string & path_to_settings,
-    const std::string & config_prefix,
+    const Configuration & configuration_,
     const Block & sample_block_,
-    const Context & context_,
-    const std::string & default_database)
+    ContextPtr context_)
     : update_time{std::chrono::system_clock::from_time_t(0)}
     , dict_struct{dict_struct_}
-    , secure(config.getBool(config_prefix + ".secure", false))
-    , host{config.getString(config_prefix + ".host", "localhost")}
-    , port(config.getInt(config_prefix + ".port", getPortFromContext(context_, secure)))
-    , user{config.getString(config_prefix + ".user", "default")}
-    , password{config.getString(config_prefix + ".password", "")}
-    , db{config.getString(config_prefix + ".db", default_database)}
-    , table{config.getString(config_prefix + ".table")}
-    , where{config.getString(config_prefix + ".where", "")}
-    , update_field{config.getString(config_prefix + ".update_field", "")}
-    , invalidate_query{config.getString(config_prefix + ".invalidate_query", "")}
-    , query_builder{dict_struct, db, "", table, where, IdentifierQuotingStyle::Backticks}
+    , configuration{configuration_}
+    , query_builder{dict_struct, configuration.db, "", configuration.table, configuration.where, IdentifierQuotingStyle::Backticks}
     , sample_block{sample_block_}
-    , context(context_)
-    , is_local{isLocalAddress({host, port}, getPortFromContext(context_, secure))}
-    , pool{is_local ? nullptr : createPool(host, port, secure, db, user, password)}
+    , context(Context::createCopy(context_))
+    , pool{createPool(configuration)}
     , load_all_query{query_builder.composeLoadAllQuery()}
 {
-    /// We should set user info even for the case when the dictionary is loaded in-process (without TCP communication).
-    if (is_local)
-    {
-        context.setUser(user, password, Poco::Net::SocketAddress("127.0.0.1", 0));
-        context = copyContextAndApplySettings(path_to_settings, context, config);
-    }
-
     /// Query context is needed because some code in executeQuery function may assume it exists.
     /// Current example is Context::getSampleBlockCache from InterpreterSelectWithUnionQuery::getSampleBlock.
-    context.makeQueryContext();
+    context->makeQueryContext();
 }
 
-
 ClickHouseDictionarySource::ClickHouseDictionarySource(const ClickHouseDictionarySource & other)
     : update_time{other.update_time}
     , dict_struct{other.dict_struct}
-    , secure{other.secure}
-    , host{other.host}
-    , port{other.port}
-    , user{other.user}
-    , password{other.password}
-    , db{other.db}
-    , table{other.table}
-    , where{other.where}
-    , update_field{other.update_field}
-    , invalidate_query{other.invalidate_query}
+    , configuration{other.configuration}
     , invalidate_query_response{other.invalidate_query_response}
-    , query_builder{dict_struct, db, "", table, where, IdentifierQuotingStyle::Backticks}
+    , query_builder{dict_struct, configuration.db, "", configuration.table, configuration.where, IdentifierQuotingStyle::Backticks}
     , sample_block{other.sample_block}
-    , context(other.context)
-    , is_local{other.is_local}
-    , pool{is_local ? nullptr : createPool(host, port, secure, db, user, password)}
+    , context(Context::createCopy(other.context))
+    , pool{createPool(configuration)}
     , load_all_query{other.load_all_query}
 {
-    context.makeQueryContext();
+    context->makeQueryContext();
 }
 
 std::string ClickHouseDictionarySource::getUpdateFieldAndDate()
 {
     if (update_time != std::chrono::system_clock::from_time_t(0))
     {
-        auto tmp_time = update_time;
+        time_t hr_time = std::chrono::system_clock::to_time_t(update_time) - 1;
+        std::string str_time = DateLUT::instance().timeToString(hr_time);
         update_time = std::chrono::system_clock::now();
-        time_t hr_time = std::chrono::system_clock::to_time_t(tmp_time) - 1;
-        std::string str_time = std::to_string(LocalDateTime(hr_time));
-        return query_builder.composeUpdateQuery(update_field, str_time);
+        return query_builder.composeUpdateQuery(configuration.update_field, str_time);
     }
     else
     {
@@ -133,48 +107,32 @@ std::string ClickHouseDictionarySource::getUpdateFieldAndDate()
 
 BlockInputStreamPtr ClickHouseDictionarySource::loadAll()
 {
-    /** Query to local ClickHouse is marked internal in order to avoid
-      *    the necessity of holding process_list_element shared pointer.
-      */
-    if (is_local)
-    {
-        auto stream = executeQuery(load_all_query, context, true).getInputStream();
-        /// FIXME res.in may implicitly use some objects owned be res, but them will be destructed after return
-        stream = std::make_shared<ConvertingBlockInputStream>(stream, sample_block, ConvertingBlockInputStream::MatchColumnsMode::Position);
-        return stream;
-    }
-    return std::make_shared<RemoteBlockInputStream>(pool, load_all_query, sample_block, context);
+    return createStreamForQuery(load_all_query);
 }
 
 BlockInputStreamPtr ClickHouseDictionarySource::loadUpdatedAll()
 {
-    std::string load_update_query = getUpdateFieldAndDate();
-    if (is_local)
-    {
-        auto stream = executeQuery(load_update_query, context, true).getInputStream();
-        stream = std::make_shared<ConvertingBlockInputStream>(stream, sample_block, ConvertingBlockInputStream::MatchColumnsMode::Position);
-        return stream;
-    }
-    return std::make_shared<RemoteBlockInputStream>(pool, load_update_query, sample_block, context);
+    String load_update_query = getUpdateFieldAndDate();
+    return createStreamForQuery(load_update_query);
 }
 
 BlockInputStreamPtr ClickHouseDictionarySource::loadIds(const std::vector<UInt64> & ids)
 {
-    return createStreamForSelectiveLoad(query_builder.composeLoadIdsQuery(ids));
+    return createStreamForQuery(query_builder.composeLoadIdsQuery(ids));
 }
 
 
 BlockInputStreamPtr ClickHouseDictionarySource::loadKeys(const Columns & key_columns, const std::vector<size_t> & requested_rows)
 {
-    return createStreamForSelectiveLoad(
-        query_builder.composeLoadKeysQuery(key_columns, requested_rows, ExternalQueryBuilder::IN_WITH_TUPLES));
+    String query = query_builder.composeLoadKeysQuery(key_columns, requested_rows, ExternalQueryBuilder::IN_WITH_TUPLES);
+    return createStreamForQuery(query);
 }
 
 bool ClickHouseDictionarySource::isModified() const
 {
-    if (!invalidate_query.empty())
+    if (!configuration.invalidate_query.empty())
     {
-        auto response = doInvalidateQuery(invalidate_query);
+        auto response = doInvalidateQuery(configuration.invalidate_query);
         LOG_TRACE(log, "Invalidate query has returned: {}, previous value: {}", response, invalidate_query_response);
         if (invalidate_query_response == response)
             return false;
@@ -185,34 +143,36 @@ bool ClickHouseDictionarySource::isModified() const
 
 bool ClickHouseDictionarySource::hasUpdateField() const
 {
-    return !update_field.empty();
+    return !configuration.update_field.empty();
 }
 
 std::string ClickHouseDictionarySource::toString() const
 {
-    return "ClickHouse: " + db + '.' + table + (where.empty() ? "" : ", where: " + where);
+    const std::string & where = configuration.where;
+    return "ClickHouse: " + configuration.db + '.' + configuration.table + (where.empty() ? "" : ", where: " + where);
 }
 
-
-BlockInputStreamPtr ClickHouseDictionarySource::createStreamForSelectiveLoad(const std::string & query)
+BlockInputStreamPtr ClickHouseDictionarySource::createStreamForQuery(const String & query)
 {
-    if (is_local)
+    /// Sample block should not contain first row default values
+    auto empty_sample_block = sample_block.cloneEmpty();
+
+    if (configuration.is_local)
     {
-        auto res = executeQuery(query, context, true).getInputStream();
-        res = std::make_shared<ConvertingBlockInputStream>(
-            res, sample_block, ConvertingBlockInputStream::MatchColumnsMode::Position);
-        return res;
+        auto stream = executeQuery(query, context, true).getInputStream();
+        stream = std::make_shared<ConvertingBlockInputStream>(stream, empty_sample_block, ConvertingBlockInputStream::MatchColumnsMode::Position);
+        return stream;
     }
 
-    return std::make_shared<RemoteBlockInputStream>(pool, query, sample_block, context);
+    return std::make_shared<RemoteBlockInputStream>(pool, query, empty_sample_block, context);
 }
 
 std::string ClickHouseDictionarySource::doInvalidateQuery(const std::string & request) const
 {
     LOG_TRACE(log, "Performing invalidate query");
-    if (is_local)
+    if (configuration.is_local)
     {
-        Context query_context = context;
+        auto query_context = Context::createCopy(context);
         auto input_block = executeQuery(request, query_context, true).getInputStream();
         return readInvalidateQuery(*input_block);
     }
@@ -225,20 +185,55 @@ std::string ClickHouseDictionarySource::doInvalidateQuery(const std::string & re
     }
 }
 
-
 void registerDictionarySourceClickHouse(DictionarySourceFactory & factory)
 {
     auto create_table_source = [=](const DictionaryStructure & dict_struct,
                                  const Poco::Util::AbstractConfiguration & config,
                                  const std::string & config_prefix,
                                  Block & sample_block,
-                                 const Context & context,
-                                 const std::string & default_database,
+                                 ContextPtr context,
+                                 const std::string & default_database [[maybe_unused]],
                                  bool /* check_config */) -> DictionarySourcePtr
     {
-        return std::make_unique<ClickHouseDictionarySource>(
-            dict_struct, config, config_prefix, config_prefix + ".clickhouse", sample_block, context, default_database);
+        bool secure = config.getBool(config_prefix + ".secure", false);
+        auto context_copy = Context::createCopy(context);
+
+        UInt16 default_port = getPortFromContext(context_copy, secure);
+
+        std::string settings_config_prefix = config_prefix + ".clickhouse";
+        std::string host = config.getString(settings_config_prefix + ".host", "localhost");
+        UInt16 port = static_cast<UInt16>(config.getUInt(settings_config_prefix + ".port", default_port));
+
+        ClickHouseDictionarySource::Configuration configuration {
+            .secure = config.getBool(settings_config_prefix + ".secure", false),
+            .host = host,
+            .port = port,
+            .user = config.getString(settings_config_prefix + ".user", "default"),
+            .password = config.getString(settings_config_prefix + ".password", ""),
+            .db = config.getString(settings_config_prefix + ".db", default_database),
+            .table = config.getString(settings_config_prefix + ".table"),
+            .where = config.getString(settings_config_prefix + ".where", ""),
+            .update_field = config.getString(settings_config_prefix + ".update_field", ""),
+            .invalidate_query = config.getString(settings_config_prefix + ".invalidate_query", ""),
+            .is_local = isLocalAddress({host, port}, default_port)
+        };
+
+        /// We should set user info even for the case when the dictionary is loaded in-process (without TCP communication).
+        if (configuration.is_local)
+        {
+            context_copy->setUser(configuration.user, configuration.password, Poco::Net::SocketAddress("127.0.0.1", 0));
+            context_copy = copyContextAndApplySettings(config_prefix, context_copy, config);
+        }
+
+        String dictionary_name = config.getString(".dictionary.name", "");
+        String dictionary_database = config.getString(".dictionary.database", "");
+
+        if (dictionary_name == configuration.table && dictionary_database == configuration.db)
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "ClickHouseDictionarySource table cannot be dictionary table");
+
+        return std::make_unique<ClickHouseDictionarySource>(dict_struct, configuration, sample_block, context_copy);
     };
+
     factory.registerSource("clickhouse", create_table_source);
 }
 
diff --git a/src/Dictionaries/ClickHouseDictionarySource.h b/src/Dictionaries/ClickHouseDictionarySource.h
index 9ef77d061fd..21c290ab23b 100644
--- a/src/Dictionaries/ClickHouseDictionarySource.h
+++ b/src/Dictionaries/ClickHouseDictionarySource.h
@@ -18,14 +18,26 @@ namespace DB
 class ClickHouseDictionarySource final : public IDictionarySource
 {
 public:
+    struct Configuration
+    {
+        const bool secure;
+        const std::string host;
+        const UInt16 port;
+        const std::string user;
+        const std::string password;
+        const std::string db;
+        const std::string table;
+        const std::string where;
+        const std::string update_field;
+        const std::string invalidate_query;
+        const bool is_local;
+    };
+
     ClickHouseDictionarySource(
         const DictionaryStructure & dict_struct_,
-        const Poco::Util::AbstractConfiguration & config,
-        const std::string & path_to_settings,
-        const std::string & config_prefix,
+        const Configuration & configuration_,
         const Block & sample_block_,
-        const Context & context,
-        const std::string & default_database);
+        ContextPtr context);
 
     /// copy-constructor is provided in order to support cloneability
     ClickHouseDictionarySource(const ClickHouseDictionarySource & other);
@@ -50,32 +62,22 @@ public:
 
     /// Used for detection whether the hashtable should be preallocated
     /// (since if there is WHERE then it can filter out too much)
-    bool hasWhere() const { return !where.empty(); }
+    bool hasWhere() const { return !configuration.where.empty(); }
 
 private:
     std::string getUpdateFieldAndDate();
 
-    BlockInputStreamPtr createStreamForSelectiveLoad(const std::string & query);
+    BlockInputStreamPtr createStreamForQuery(const String & query);
 
     std::string doInvalidateQuery(const std::string & request) const;
 
     std::chrono::time_point<std::chrono::system_clock> update_time;
     const DictionaryStructure dict_struct;
-    const bool secure;
-    const std::string host;
-    const UInt16 port;
-    const std::string user;
-    const std::string password;
-    const std::string db;
-    const std::string table;
-    const std::string where;
-    const std::string update_field;
-    std::string invalidate_query;
+    const Configuration configuration;
     mutable std::string invalidate_query_response;
     ExternalQueryBuilder query_builder;
     Block sample_block;
-    Context context;
-    const bool is_local;
+    ContextPtr context;
     ConnectionPoolWithFailoverPtr pool;
     const std::string load_all_query;
     Poco::Logger * log = &Poco::Logger::get("ClickHouseDictionarySource");
diff --git a/src/Dictionaries/ComplexKeyCacheDictionary.cpp b/src/Dictionaries/ComplexKeyCacheDictionary.cpp
deleted file mode 100644
index cbb57f81793..00000000000
--- a/src/Dictionaries/ComplexKeyCacheDictionary.cpp
+++ /dev/null
@@ -1,915 +0,0 @@
-#include "ComplexKeyCacheDictionary.h"
-#include <Common/Arena.h>
-#include <Common/BitHelpers.h>
-#include <Common/CurrentMetrics.h>
-#include <Common/ProfileEvents.h>
-#include <Common/ProfilingScopedRWLock.h>
-#include <Common/Stopwatch.h>
-#include <Common/randomSeed.h>
-#include <ext/map.h>
-#include <ext/range.h>
-#include "DictionaryBlockInputStream.h"
-#include "DictionaryFactory.h"
-#include <Functions/FunctionHelpers.h>
-#include <DataTypes/DataTypesDecimal.h>
-
-namespace ProfileEvents
-{
-extern const Event DictCacheKeysRequested;
-extern const Event DictCacheKeysRequestedMiss;
-extern const Event DictCacheKeysRequestedFound;
-extern const Event DictCacheKeysExpired;
-extern const Event DictCacheKeysNotFound;
-extern const Event DictCacheKeysHit;
-extern const Event DictCacheRequestTimeNs;
-extern const Event DictCacheLockWriteNs;
-extern const Event DictCacheLockReadNs;
-}
-
-namespace CurrentMetrics
-{
-extern const Metric DictCacheRequests;
-}
-
-
-namespace DB
-{
-namespace ErrorCodes
-{
-    extern const int TYPE_MISMATCH;
-    extern const int BAD_ARGUMENTS;
-    extern const int UNSUPPORTED_METHOD;
-    extern const int TOO_SMALL_BUFFER_SIZE;
-}
-
-
-inline UInt64 ComplexKeyCacheDictionary::getCellIdx(const StringRef key) const
-{
-    const auto hash = StringRefHash{}(key);
-    const auto idx = hash & size_overlap_mask;
-    return idx;
-}
-
-
-ComplexKeyCacheDictionary::ComplexKeyCacheDictionary(
-    const StorageID & dict_id_,
-    const DictionaryStructure & dict_struct_,
-    DictionarySourcePtr source_ptr_,
-    const DictionaryLifetime dict_lifetime_,
-    const size_t size_)
-    : IDictionaryBase(dict_id_)
-    , dict_struct(dict_struct_)
-    , source_ptr{std::move(source_ptr_)}
-    , dict_lifetime(dict_lifetime_)
-    , size{roundUpToPowerOfTwoOrZero(std::max(size_, size_t(max_collision_length)))}
-    , size_overlap_mask{this->size - 1}
-    , rnd_engine(randomSeed())
-{
-    if (!this->source_ptr->supportsSelectiveLoad())
-        throw Exception{full_name + ": source cannot be used with ComplexKeyCacheDictionary", ErrorCodes::UNSUPPORTED_METHOD};
-
-    createAttributes();
-}
-
-ColumnPtr ComplexKeyCacheDictionary::getColumn(
-    const std::string & attribute_name,
-    const DataTypePtr & result_type,
-    const Columns & key_columns,
-    const DataTypes & key_types,
-    const ColumnPtr default_values_column) const
-{
-    dict_struct.validateKeyTypes(key_types);
-
-    ColumnPtr result;
-
-    auto & attribute = getAttribute(attribute_name);
-    const auto & dictionary_attribute = dict_struct.getAttribute(attribute_name, result_type);
-
-    auto keys_size = key_columns.front()->size();
-
-    auto type_call = [&](const auto &dictionary_attribute_type)
-    {
-        using Type = std::decay_t<decltype(dictionary_attribute_type)>;
-        using AttributeType = typename Type::AttributeType;
-        using ColumnProvider = DictionaryAttributeColumnProvider<AttributeType>;
-
-        const auto & null_value = std::get<AttributeType>(attribute.null_values);
-        DictionaryDefaultValueExtractor<AttributeType> default_value_extractor(null_value, default_values_column);
-
-        auto column = ColumnProvider::getColumn(dictionary_attribute, keys_size);
-
-        if constexpr (std::is_same_v<AttributeType, String>)
-        {
-            auto * out = column.get();
-            getItemsString(attribute, key_columns, out, default_value_extractor);
-        }
-        else
-        {
-            auto & out = column->getData();
-            getItemsNumberImpl<AttributeType, AttributeType>(attribute, key_columns, out, default_value_extractor);
-        }
-
-        result = std::move(column);
-    };
-
-    callOnDictionaryAttributeType(attribute.type, type_call);
-
-    return result;
-}
-
-/// returns cell_idx (always valid for replacing), 'cell is valid' flag, 'cell is outdated' flag,
-/// true  false   found and valid
-/// false true    not found (something outdated, maybe our cell)
-/// false false   not found (other id stored with valid data)
-/// true  true    impossible
-///
-/// todo: split this func to two: find_for_get and find_for_set
-ComplexKeyCacheDictionary::FindResult
-ComplexKeyCacheDictionary::findCellIdx(const StringRef & key, const CellMetadata::time_point_t now, const size_t hash) const
-{
-    auto pos = hash;
-    auto oldest_id = pos;
-    auto oldest_time = CellMetadata::time_point_t::max();
-    const auto stop = pos + max_collision_length;
-
-    for (; pos < stop; ++pos)
-    {
-        const auto cell_idx = pos & size_overlap_mask;
-        const auto & cell = cells[cell_idx];
-
-        if (cell.hash != hash || cell.key != key)
-        {
-            /// maybe we already found nearest expired cell
-            if (oldest_time > now && oldest_time > cell.expiresAt())
-            {
-                oldest_time = cell.expiresAt();
-                oldest_id = cell_idx;
-            }
-
-            continue;
-        }
-
-        if (cell.expiresAt() < now)
-        {
-            return {cell_idx, false, true};
-        }
-
-        return {cell_idx, true, false};
-    }
-
-    oldest_id &= size_overlap_mask;
-    return {oldest_id, false, false};
-}
-
-ColumnUInt8::Ptr ComplexKeyCacheDictionary::hasKeys(const Columns & key_columns, const DataTypes & key_types) const
-{
-    dict_struct.validateKeyTypes(key_types);
-
-    const auto rows_num = key_columns.front()->size();
-
-    auto result = ColumnUInt8::create(rows_num);
-    auto& out = result->getData();
-
-    for (const auto row : ext::range(0, rows_num))
-        out[row] = false;
-
-    /// Mapping: <key> -> { all indices `i` of `key_columns` such that `key_columns[i]` = <key> }
-    MapType<std::vector<size_t>> outdated_keys;
-
-    const auto keys_size = dict_struct.key->size();
-    StringRefs keys(keys_size);
-    Arena temporary_keys_pool;
-    PODArray<StringRef> keys_array(rows_num);
-
-    size_t cache_expired = 0, cache_not_found = 0, cache_hit = 0;
-    {
-        const ProfilingScopedReadRWLock read_lock{rw_lock, ProfileEvents::DictCacheLockReadNs};
-
-        const auto now = std::chrono::system_clock::now();
-        /// fetch up-to-date values, decide which ones require update
-        for (const auto row : ext::range(0, rows_num))
-        {
-            const StringRef key = placeKeysInPool(row, key_columns, keys, *dict_struct.key, temporary_keys_pool);
-            keys_array[row] = key;
-            const auto find_result = findCellIdx(key, now);
-            const auto & cell_idx = find_result.cell_idx;
-            /** cell should be updated if either:
-                *    1. keys (or hash) do not match,
-                *    2. cell has expired,
-                *    3. explicit defaults were specified and cell was set default. */
-            if (!find_result.valid)
-            {
-                outdated_keys[key].push_back(row);
-                if (find_result.outdated)
-                    ++cache_expired;
-                else
-                    ++cache_not_found;
-            }
-            else
-            {
-                ++cache_hit;
-                const auto & cell = cells[cell_idx];
-                out[row] = !cell.isDefault();
-            }
-        }
-    }
-    ProfileEvents::increment(ProfileEvents::DictCacheKeysExpired, cache_expired);
-    ProfileEvents::increment(ProfileEvents::DictCacheKeysNotFound, cache_not_found);
-    ProfileEvents::increment(ProfileEvents::DictCacheKeysHit, cache_hit);
-
-    query_count.fetch_add(rows_num, std::memory_order_relaxed);
-    hit_count.fetch_add(rows_num - outdated_keys.size(), std::memory_order_release);
-
-    if (outdated_keys.empty())
-        return result;
-
-    std::vector<size_t> required_rows(outdated_keys.size());
-    std::transform(
-        std::begin(outdated_keys), std::end(outdated_keys), std::begin(required_rows), [](auto & pair) { return pair.getMapped().front(); });
-
-    /// request new values
-    update(
-        key_columns,
-        keys_array,
-        required_rows,
-        [&](const StringRef key, const auto)
-        {
-            for (const auto out_idx : outdated_keys[key])
-                out[out_idx] = true;
-        },
-        [&](const StringRef key, const auto)
-        {
-            for (const auto out_idx : outdated_keys[key])
-                out[out_idx] = false;
-        });
-
-    return result;
-}
-
-
-template <typename AttributeType, typename OutputType, typename DefaultValueExtractor>
-void ComplexKeyCacheDictionary::getItemsNumberImpl(
-    Attribute & attribute,
-    const Columns & key_columns,
-    PaddedPODArray<OutputType> & out,
-    DefaultValueExtractor & default_value_extractor) const
-{
-    /// Mapping: <key> -> { all indices `i` of `key_columns` such that `key_columns[i]` = <key> }
-    MapType<std::vector<size_t>> outdated_keys;
-    auto & attribute_array = std::get<ContainerPtrType<AttributeType>>(attribute.arrays);
-
-    const auto rows_num = key_columns.front()->size();
-    const auto keys_size = dict_struct.key->size();
-    StringRefs keys(keys_size);
-    Arena temporary_keys_pool;
-    PODArray<StringRef> keys_array(rows_num);
-
-    size_t cache_expired = 0, cache_not_found = 0, cache_hit = 0;
-    {
-        const ProfilingScopedReadRWLock read_lock{rw_lock, ProfileEvents::DictCacheLockReadNs};
-
-        const auto now = std::chrono::system_clock::now();
-        /// fetch up-to-date values, decide which ones require update
-        for (const auto row : ext::range(0, rows_num))
-        {
-            const StringRef key = placeKeysInPool(row, key_columns, keys, *dict_struct.key, temporary_keys_pool);
-            keys_array[row] = key;
-            const auto find_result = findCellIdx(key, now);
-
-            /** cell should be updated if either:
-                *    1. keys (or hash) do not match,
-                *    2. cell has expired,
-                *    3. explicit defaults were specified and cell was set default. */
-
-            if (!find_result.valid)
-            {
-                outdated_keys[key].push_back(row);
-                if (find_result.outdated)
-                    ++cache_expired;
-                else
-                    ++cache_not_found;
-            }
-            else
-            {
-                ++cache_hit;
-                const auto & cell_idx = find_result.cell_idx;
-                const auto & cell = cells[cell_idx];
-                out[row] = cell.isDefault() ? default_value_extractor[row] : static_cast<OutputType>(attribute_array[cell_idx]);
-            }
-        }
-    }
-    ProfileEvents::increment(ProfileEvents::DictCacheKeysExpired, cache_expired);
-    ProfileEvents::increment(ProfileEvents::DictCacheKeysNotFound, cache_not_found);
-    ProfileEvents::increment(ProfileEvents::DictCacheKeysHit, cache_hit);
-    query_count.fetch_add(rows_num, std::memory_order_relaxed);
-    hit_count.fetch_add(rows_num - outdated_keys.size(), std::memory_order_release);
-
-    if (outdated_keys.empty())
-        return;
-
-    std::vector<size_t> required_rows(outdated_keys.size());
-    std::transform(std::begin(outdated_keys), std::end(outdated_keys), std::begin(required_rows), [](auto & pair)
-    {
-        return pair.getMapped().front();
-    });
-
-    /// request new values
-    update(
-        key_columns,
-        keys_array,
-        required_rows,
-        [&](const StringRef key, const size_t cell_idx)
-        {
-            for (const auto row : outdated_keys[key])
-                out[row] = static_cast<OutputType>(attribute_array[cell_idx]);
-        },
-        [&](const StringRef key, const size_t)
-        {
-            for (const auto row : outdated_keys[key])
-                out[row] = default_value_extractor[row];
-        });
-}
-
-void ComplexKeyCacheDictionary::getItemsString(
-    Attribute & attribute,
-    const Columns & key_columns,
-    ColumnString * out,
-    DictionaryDefaultValueExtractor<String> & default_value_extractor) const
-{
-    const auto rows_num = key_columns.front()->size();
-    /// save on some allocations
-    out->getOffsets().reserve(rows_num);
-
-    const auto keys_size = dict_struct.key->size();
-    StringRefs keys(keys_size);
-    Arena temporary_keys_pool;
-
-    auto & attribute_array = std::get<ContainerPtrType<StringRef>>(attribute.arrays);
-
-    auto found_outdated_values = false;
-
-    /// perform optimistic version, fallback to pessimistic if failed
-    {
-        const ProfilingScopedReadRWLock read_lock{rw_lock, ProfileEvents::DictCacheLockReadNs};
-
-        const auto now = std::chrono::system_clock::now();
-        /// fetch up-to-date values, discard on fail
-        for (const auto row : ext::range(0, rows_num))
-        {
-            const StringRef key = placeKeysInPool(row, key_columns, keys, *dict_struct.key, temporary_keys_pool);
-            SCOPE_EXIT(temporary_keys_pool.rollback(key.size));
-            const auto find_result = findCellIdx(key, now);
-
-            if (!find_result.valid)
-            {
-                found_outdated_values = true;
-                break;
-            }
-            else
-            {
-                const auto & cell_idx = find_result.cell_idx;
-                const auto & cell = cells[cell_idx];
-                const auto string_ref = cell.isDefault() ? default_value_extractor[row] : attribute_array[cell_idx];
-                out->insertData(string_ref.data, string_ref.size);
-            }
-        }
-    }
-
-    /// optimistic code completed successfully
-    if (!found_outdated_values)
-    {
-        query_count.fetch_add(rows_num, std::memory_order_relaxed);
-        hit_count.fetch_add(rows_num, std::memory_order_release);
-        return;
-    }
-
-    /// now onto the pessimistic one, discard possible partial results from the optimistic path
-    out->getChars().resize_assume_reserved(0);
-    out->getOffsets().resize_assume_reserved(0);
-
-    /// Mapping: <key> -> { all indices `i` of `key_columns` such that `key_columns[i]` = <key> }
-    MapType<std::vector<size_t>> outdated_keys;
-    /// we are going to store every string separately
-    MapType<StringRef> map;
-    PODArray<StringRef> keys_array(rows_num);
-
-    size_t total_length = 0;
-    size_t cache_expired = 0, cache_not_found = 0, cache_hit = 0;
-    {
-        const ProfilingScopedReadRWLock read_lock{rw_lock, ProfileEvents::DictCacheLockReadNs};
-
-        const auto now = std::chrono::system_clock::now();
-        for (const auto row : ext::range(0, rows_num))
-        {
-            const StringRef key = placeKeysInPool(row, key_columns, keys, *dict_struct.key, temporary_keys_pool);
-            keys_array[row] = key;
-            const auto find_result = findCellIdx(key, now);
-
-            if (!find_result.valid)
-            {
-                outdated_keys[key].push_back(row);
-                if (find_result.outdated)
-                    ++cache_expired;
-                else
-                    ++cache_not_found;
-            }
-            else
-            {
-                ++cache_hit;
-                const auto & cell_idx = find_result.cell_idx;
-                const auto & cell = cells[cell_idx];
-                const auto string_ref = cell.isDefault() ? default_value_extractor[row] : attribute_array[cell_idx];
-
-                if (!cell.isDefault())
-                    map[key] = copyIntoArena(string_ref, temporary_keys_pool);
-
-                total_length += string_ref.size + 1;
-            }
-        }
-    }
-    ProfileEvents::increment(ProfileEvents::DictCacheKeysExpired, cache_expired);
-    ProfileEvents::increment(ProfileEvents::DictCacheKeysNotFound, cache_not_found);
-    ProfileEvents::increment(ProfileEvents::DictCacheKeysHit, cache_hit);
-
-    query_count.fetch_add(rows_num, std::memory_order_relaxed);
-    hit_count.fetch_add(rows_num - outdated_keys.size(), std::memory_order_release);
-
-    /// request new values
-    if (!outdated_keys.empty())
-    {
-        std::vector<size_t> required_rows(outdated_keys.size());
-        std::transform(std::begin(outdated_keys), std::end(outdated_keys), std::begin(required_rows), [](auto & pair)
-        {
-            return pair.getMapped().front();
-        });
-
-        update(
-            key_columns,
-            keys_array,
-            required_rows,
-            [&](const StringRef key, const size_t cell_idx)
-            {
-                const StringRef attribute_value = attribute_array[cell_idx];
-
-                /// We must copy key and value to own memory, because it may be replaced with another
-                ///  in next iterations of inner loop of update.
-                const StringRef copied_key = copyIntoArena(key, temporary_keys_pool);
-                const StringRef copied_value = copyIntoArena(attribute_value, temporary_keys_pool);
-
-                map[copied_key] = copied_value;
-                total_length += (attribute_value.size + 1) * outdated_keys[key].size();
-            },
-            [&](const StringRef key, const size_t)
-            {
-                for (const auto row : outdated_keys[key])
-                    total_length += default_value_extractor[row].size + 1;
-            });
-    }
-
-    out->getChars().reserve(total_length);
-
-    for (const auto row : ext::range(0, ext::size(keys_array)))
-    {
-        const StringRef key = keys_array[row];
-        auto * const it = map.find(key);
-        const auto string_ref = it ? it->getMapped() : default_value_extractor[row];
-        out->insertData(string_ref.data, string_ref.size);
-    }
-}
-
-template <typename PresentKeyHandler, typename AbsentKeyHandler>
-void ComplexKeyCacheDictionary::update(
-    const Columns & in_key_columns,
-    const PODArray<StringRef> & in_keys,
-    const std::vector<size_t> & in_requested_rows,
-    PresentKeyHandler && on_cell_updated,
-    AbsentKeyHandler && on_key_not_found) const
-{
-    MapType<bool> remaining_keys{in_requested_rows.size()};
-    for (const auto row : in_requested_rows)
-        remaining_keys.insert({in_keys[row], false});
-
-    std::uniform_int_distribution<UInt64> distribution(dict_lifetime.min_sec, dict_lifetime.max_sec);
-
-    const ProfilingScopedWriteRWLock write_lock{rw_lock, ProfileEvents::DictCacheLockWriteNs};
-    {
-        Stopwatch watch;
-        auto stream = source_ptr->loadKeys(in_key_columns, in_requested_rows);
-        stream->readPrefix();
-
-        const auto keys_size = dict_struct.key->size();
-        StringRefs keys(keys_size);
-
-        const auto attributes_size = attributes.size();
-        const auto now = std::chrono::system_clock::now();
-
-        while (const auto block = stream->read())
-        {
-            /// cache column pointers
-            const auto key_columns = ext::map<Columns>(
-                ext::range(0, keys_size), [&](const size_t attribute_idx) { return block.safeGetByPosition(attribute_idx).column; });
-
-            const auto attribute_columns = ext::map<Columns>(ext::range(0, attributes_size), [&](const size_t attribute_idx)
-            {
-                return block.safeGetByPosition(keys_size + attribute_idx).column;
-            });
-
-            const auto rows_num = block.rows();
-
-            for (const auto row : ext::range(0, rows_num))
-            {
-                auto key = allocKey(row, key_columns, keys);
-                const auto hash = StringRefHash{}(key);
-                const auto find_result = findCellIdx(key, now, hash);
-                const auto & cell_idx = find_result.cell_idx;
-                auto & cell = cells[cell_idx];
-
-                for (const auto attribute_idx : ext::range(0, attributes.size()))
-                {
-                    const auto & attribute_column = *attribute_columns[attribute_idx];
-                    auto & attribute = attributes[attribute_idx];
-
-                    setAttributeValue(attribute, cell_idx, attribute_column[row]);
-                }
-
-                /// if cell id is zero and zero does not map to this cell, then the cell is unused
-                if (cell.key == StringRef{} && cell_idx != zero_cell_idx)
-                    element_count.fetch_add(1, std::memory_order_relaxed);
-
-                /// handle memory allocated for old key
-                if (key == cell.key)
-                {
-                    freeKey(key);
-                    key = cell.key;
-                }
-                else
-                {
-                    /// new key is different from the old one
-                    if (cell.key.data)
-                        freeKey(cell.key);
-
-                    cell.key = key;
-                }
-
-                cell.hash = hash;
-
-                if (dict_lifetime.min_sec != 0 && dict_lifetime.max_sec != 0)
-                    cell.setExpiresAt(std::chrono::system_clock::now() + std::chrono::seconds{distribution(rnd_engine)});
-                else
-                    cell.setExpiresAt(std::chrono::time_point<std::chrono::system_clock>::max());
-
-                /// inform caller
-                on_cell_updated(key, cell_idx);
-                /// mark corresponding id as found
-                remaining_keys[key] = true;
-            }
-        }
-
-        stream->readSuffix();
-
-        ProfileEvents::increment(ProfileEvents::DictCacheKeysRequested, in_requested_rows.size());
-        ProfileEvents::increment(ProfileEvents::DictCacheRequestTimeNs, watch.elapsed());
-    }
-
-    size_t found_num = 0;
-    size_t not_found_num = 0;
-
-    const auto now = std::chrono::system_clock::now();
-
-    /// Check which ids have not been found and require setting null_value
-    for (const auto & key_found_pair : remaining_keys)
-    {
-        if (key_found_pair.getMapped())
-        {
-            ++found_num;
-            continue;
-        }
-
-        ++not_found_num;
-
-        auto key = key_found_pair.getKey();
-        const auto hash = StringRefHash{}(key);
-        const auto find_result = findCellIdx(key, now, hash);
-        const auto & cell_idx = find_result.cell_idx;
-        auto & cell = cells[cell_idx];
-
-        /// Set null_value for each attribute
-        for (auto & attribute : attributes)
-            setDefaultAttributeValue(attribute, cell_idx);
-
-        /// Check if cell had not been occupied before and increment element counter if it hadn't
-        if (cell.key == StringRef{} && cell_idx != zero_cell_idx)
-            element_count.fetch_add(1, std::memory_order_relaxed);
-
-        if (key == cell.key)
-            key = cell.key;
-        else
-        {
-            if (cell.key.data)
-                freeKey(cell.key);
-
-            /// copy key from temporary pool
-            key = copyKey(key);
-            cell.key = key;
-        }
-
-        cell.hash = hash;
-
-        if (dict_lifetime.min_sec != 0 && dict_lifetime.max_sec != 0)
-            cell.setExpiresAt(std::chrono::system_clock::now() + std::chrono::seconds{distribution(rnd_engine)});
-        else
-            cell.setExpiresAt(std::chrono::time_point<std::chrono::system_clock>::max());
-
-        cell.setDefault();
-
-        /// inform caller that the cell has not been found
-        on_key_not_found(key, cell_idx);
-    }
-
-    ProfileEvents::increment(ProfileEvents::DictCacheKeysRequestedFound, found_num);
-    ProfileEvents::increment(ProfileEvents::DictCacheKeysRequestedMiss, not_found_num);
-}
-
-
-void ComplexKeyCacheDictionary::createAttributes()
-{
-    const auto attributes_size = dict_struct.attributes.size();
-    attributes.reserve(attributes_size);
-
-    bytes_allocated += size * sizeof(CellMetadata);
-    bytes_allocated += attributes_size * sizeof(attributes.front());
-
-    for (const auto & attribute : dict_struct.attributes)
-    {
-        attribute_index_by_name.emplace(attribute.name, attributes.size());
-        attributes.push_back(createAttributeWithType(attribute.underlying_type, attribute.null_value));
-
-        if (attribute.hierarchical)
-            throw Exception{full_name + ": hierarchical attributes not supported for dictionary of type " + getTypeName(),
-                            ErrorCodes::TYPE_MISMATCH};
-    }
-}
-
-ComplexKeyCacheDictionary::Attribute & ComplexKeyCacheDictionary::getAttribute(const std::string & attribute_name) const
-{
-    const auto it = attribute_index_by_name.find(attribute_name);
-    if (it == std::end(attribute_index_by_name))
-        throw Exception{full_name + ": no such attribute '" + attribute_name + "'", ErrorCodes::BAD_ARGUMENTS};
-
-    return attributes[it->second];
-}
-
-void ComplexKeyCacheDictionary::setDefaultAttributeValue(Attribute & attribute, const size_t idx) const
-{
-    auto type_call = [&](const auto &dictionary_attribute_type)
-    {
-        using Type = std::decay_t<decltype(dictionary_attribute_type)>;
-        using AttributeType = typename Type::AttributeType;
-
-        if constexpr (std::is_same_v<AttributeType, String>)
-        {
-            const auto & null_value_ref = std::get<String>(attribute.null_values);
-            auto & string_ref = std::get<ContainerPtrType<StringRef>>(attribute.arrays)[idx];
-
-            if (string_ref.data != null_value_ref.data())
-            {
-                if (string_ref.data)
-                    string_arena->free(const_cast<char *>(string_ref.data), string_ref.size);
-
-                string_ref = StringRef{null_value_ref};
-            }
-        }
-        else
-        {
-            std::get<ContainerPtrType<AttributeType>>(attribute.arrays)[idx] = std::get<AttributeType>(attribute.null_values);
-        }
-    };
-
-    callOnDictionaryAttributeType(attribute.type, type_call);
-}
-
-ComplexKeyCacheDictionary::Attribute
-ComplexKeyCacheDictionary::createAttributeWithType(const AttributeUnderlyingType type, const Field & null_value)
-{
-    Attribute attr{type, {}, {}};
-
-    auto type_call = [&](const auto &dictionary_attribute_type)
-    {
-        using Type = std::decay_t<decltype(dictionary_attribute_type)>;
-        using AttributeType = typename Type::AttributeType;
-
-        if constexpr (std::is_same_v<AttributeType, String>)
-        {
-            attr.null_values = null_value.get<String>();
-            attr.arrays = std::make_unique<ContainerType<StringRef>>(size);
-            bytes_allocated += size * sizeof(StringRef);
-            if (!string_arena)
-                string_arena = std::make_unique<ArenaWithFreeLists>();
-        }
-        else
-        {
-            attr.null_values = AttributeType(null_value.get<NearestFieldType<AttributeType>>()); /* NOLINT */
-            attr.arrays = std::make_unique<ContainerType<AttributeType>>(size); /* NOLINT */
-            bytes_allocated += size * sizeof(AttributeType);
-        }
-    };
-
-    callOnDictionaryAttributeType(type, type_call);
-
-    return attr;
-}
-
-void ComplexKeyCacheDictionary::setAttributeValue(Attribute & attribute, const size_t idx, const Field & value) const
-{
-    auto type_call = [&](const auto &dictionary_attribute_type)
-    {
-        using Type = std::decay_t<decltype(dictionary_attribute_type)>;
-        using AttributeType = typename Type::AttributeType;
-
-        if constexpr (std::is_same_v<AttributeType, String>)
-        {
-            const auto & string = value.get<String>();
-            auto & string_ref = std::get<ContainerPtrType<StringRef>>(attribute.arrays)[idx];
-            const auto & null_value_ref = std::get<String>(attribute.null_values);
-
-            /// free memory unless it points to a null_value
-            if (string_ref.data && string_ref.data != null_value_ref.data())
-                string_arena->free(const_cast<char *>(string_ref.data), string_ref.size);
-
-            const auto str_size = string.size();
-            if (str_size != 0)
-            {
-                auto * str_ptr = string_arena->alloc(str_size);
-                std::copy(string.data(), string.data() + str_size, str_ptr);
-                string_ref = StringRef{str_ptr, str_size};
-            }
-            else
-                string_ref = {};
-        }
-        else
-        {
-            std::get<ContainerPtrType<AttributeType>>(attribute.arrays)[idx] = value.get<NearestFieldType<AttributeType>>();
-        }
-    };
-
-    callOnDictionaryAttributeType(attribute.type, type_call);
-}
-
-StringRef ComplexKeyCacheDictionary::allocKey(const size_t row, const Columns & key_columns, StringRefs & keys) const
-{
-    if (key_size_is_fixed)
-        return placeKeysInFixedSizePool(row, key_columns);
-
-    return placeKeysInPool(row, key_columns, keys, *dict_struct.key, *keys_pool);
-}
-
-void ComplexKeyCacheDictionary::freeKey(const StringRef key) const
-{
-    if (key_size_is_fixed)
-        fixed_size_keys_pool->free(const_cast<char *>(key.data));
-    else
-        keys_pool->free(const_cast<char *>(key.data), key.size);
-}
-
-template <typename Pool>
-StringRef ComplexKeyCacheDictionary::placeKeysInPool(
-    const size_t row, const Columns & key_columns, StringRefs & keys, const std::vector<DictionaryAttribute> & key_attributes, Pool & pool)
-{
-    const auto keys_size = key_columns.size();
-    size_t sum_keys_size{};
-
-    for (size_t j = 0; j < keys_size; ++j)
-    {
-        keys[j] = key_columns[j]->getDataAt(row);
-        sum_keys_size += keys[j].size;
-        if (key_attributes[j].underlying_type == AttributeUnderlyingType::utString)
-            sum_keys_size += sizeof(size_t) + 1;
-    }
-
-    auto place = pool.alloc(sum_keys_size);
-
-    auto key_start = place;
-    for (size_t j = 0; j < keys_size; ++j)
-    {
-        if (key_attributes[j].underlying_type == AttributeUnderlyingType::utString)
-        {
-            auto start = key_start;
-            auto key_size = keys[j].size + 1;
-            memcpy(key_start, &key_size, sizeof(size_t));
-            key_start += sizeof(size_t);
-            memcpy(key_start, keys[j].data, keys[j].size);
-            key_start += keys[j].size;
-            *key_start = '\0';
-            ++key_start;
-            keys[j].data = start;
-            keys[j].size += sizeof(size_t) + 1;
-        }
-        else
-        {
-            memcpy(key_start, keys[j].data, keys[j].size);
-            keys[j].data = key_start;
-            key_start += keys[j].size;
-        }
-    }
-
-    return {place, sum_keys_size};
-}
-
-/// Explicit instantiations.
-
-template StringRef ComplexKeyCacheDictionary::placeKeysInPool<Arena>(
-    const size_t row,
-    const Columns & key_columns,
-    StringRefs & keys,
-    const std::vector<DictionaryAttribute> & key_attributes,
-    Arena & pool);
-
-template StringRef ComplexKeyCacheDictionary::placeKeysInPool<ArenaWithFreeLists>(
-    const size_t row,
-    const Columns & key_columns,
-    StringRefs & keys,
-    const std::vector<DictionaryAttribute> & key_attributes,
-    ArenaWithFreeLists & pool);
-
-
-StringRef ComplexKeyCacheDictionary::placeKeysInFixedSizePool(const size_t row, const Columns & key_columns) const
-{
-    auto * res = fixed_size_keys_pool->alloc();
-    auto * place = res;
-
-    for (const auto & key_column : key_columns)
-    {
-        const StringRef key = key_column->getDataAt(row);
-        memcpy(place, key.data, key.size);
-        place += key.size;
-    }
-
-    return {res, key_size};
-}
-
-StringRef ComplexKeyCacheDictionary::copyIntoArena(StringRef src, Arena & arena)
-{
-    char * allocated = arena.alloc(src.size);
-    memcpy(allocated, src.data, src.size);
-    return {allocated, src.size};
-}
-
-StringRef ComplexKeyCacheDictionary::copyKey(const StringRef key) const
-{
-    auto * res = key_size_is_fixed ? fixed_size_keys_pool->alloc() : keys_pool->alloc(key.size);
-    memcpy(res, key.data, key.size);
-
-    return {res, key.size};
-}
-
-bool ComplexKeyCacheDictionary::isEmptyCell(const UInt64 idx) const
-{
-    return (
-        cells[idx].key == StringRef{}
-        && (idx != zero_cell_idx || cells[idx].data == ext::safe_bit_cast<CellMetadata::time_point_urep_t>(CellMetadata::time_point_t())));
-}
-
-BlockInputStreamPtr ComplexKeyCacheDictionary::getBlockInputStream(const Names & column_names, size_t max_block_size) const
-{
-    std::vector<StringRef> keys;
-    {
-        const ProfilingScopedReadRWLock read_lock{rw_lock, ProfileEvents::DictCacheLockReadNs};
-
-        for (auto idx : ext::range(0, cells.size()))
-            if (!isEmptyCell(idx) && !cells[idx].isDefault())
-                keys.push_back(cells[idx].key);
-    }
-
-    using BlockInputStreamType = DictionaryBlockInputStream<UInt64>;
-    return std::make_shared<BlockInputStreamType>(shared_from_this(), max_block_size, keys, column_names);
-}
-
-void registerDictionaryComplexKeyCache(DictionaryFactory & factory)
-{
-    auto create_layout = [=](const std::string & full_name,
-                             const DictionaryStructure & dict_struct,
-                             const Poco::Util::AbstractConfiguration & config,
-                             const std::string & config_prefix,
-                             DictionarySourcePtr source_ptr) -> DictionaryPtr
-    {
-        if (!dict_struct.key)
-            throw Exception{"'key' is required for dictionary of layout 'complex_key_hashed'", ErrorCodes::BAD_ARGUMENTS};
-        const auto & layout_prefix = config_prefix + ".layout";
-        const auto size = config.getInt(layout_prefix + ".complex_key_cache.size_in_cells");
-        if (size == 0)
-            throw Exception{full_name + ": dictionary of layout 'cache' cannot have 0 cells", ErrorCodes::TOO_SMALL_BUFFER_SIZE};
-
-        const bool require_nonempty = config.getBool(config_prefix + ".require_nonempty", false);
-        if (require_nonempty)
-            throw Exception{full_name + ": dictionary of layout 'cache' cannot have 'require_nonempty' attribute set",
-                            ErrorCodes::BAD_ARGUMENTS};
-
-        const auto dict_id = StorageID::fromDictionaryConfig(config, config_prefix);
-        const DictionaryLifetime dict_lifetime{config, config_prefix + ".lifetime"};
-        return std::make_unique<ComplexKeyCacheDictionary>(dict_id, dict_struct, std::move(source_ptr), dict_lifetime, size);
-    };
-    factory.registerLayout("complex_key_cache", create_layout, true);
-}
-
-
-}
diff --git a/src/Dictionaries/ComplexKeyCacheDictionary.h b/src/Dictionaries/ComplexKeyCacheDictionary.h
deleted file mode 100644
index f5643fc799c..00000000000
--- a/src/Dictionaries/ComplexKeyCacheDictionary.h
+++ /dev/null
@@ -1,276 +0,0 @@
-#pragma once
-
-#include <atomic>
-#include <chrono>
-#include <map>
-#include <shared_mutex>
-#include <variant>
-#include <vector>
-#include <Columns/ColumnDecimal.h>
-#include <Columns/ColumnString.h>
-#include <pcg_random.hpp>
-#include <Common/ArenaWithFreeLists.h>
-#include <Common/HashTable/HashMap.h>
-#include <Common/ProfilingScopedRWLock.h>
-#include <Common/SmallObjectPool.h>
-#include <common/StringRef.h>
-#include <ext/bit_cast.h>
-#include <ext/map.h>
-#include <ext/range.h>
-#include <ext/size.h>
-#include <ext/scope_guard.h>
-#include "DictionaryStructure.h"
-#include "IDictionary.h"
-#include "IDictionarySource.h"
-#include <DataStreams/IBlockInputStream.h>
-#include "DictionaryHelpers.h"
-
-namespace ProfileEvents
-{
-extern const Event DictCacheKeysRequested;
-extern const Event DictCacheKeysRequestedMiss;
-extern const Event DictCacheKeysRequestedFound;
-extern const Event DictCacheKeysExpired;
-extern const Event DictCacheKeysNotFound;
-extern const Event DictCacheKeysHit;
-extern const Event DictCacheRequestTimeNs;
-extern const Event DictCacheLockWriteNs;
-extern const Event DictCacheLockReadNs;
-}
-
-namespace DB
-{
-class ComplexKeyCacheDictionary final : public IDictionaryBase
-{
-public:
-    ComplexKeyCacheDictionary(
-        const StorageID & dict_id_,
-        const DictionaryStructure & dict_struct_,
-        DictionarySourcePtr source_ptr_,
-        const DictionaryLifetime dict_lifetime_,
-        const size_t size_);
-
-    std::string getKeyDescription() const { return key_description; }
-
-    std::string getTypeName() const override { return "ComplexKeyCache"; }
-
-    size_t getBytesAllocated() const override
-    {
-        return bytes_allocated + (key_size_is_fixed ? fixed_size_keys_pool->size() : keys_pool->size())
-            + (string_arena ? string_arena->size() : 0);
-    }
-
-    size_t getQueryCount() const override { return query_count.load(std::memory_order_relaxed); }
-
-    double getHitRate() const override
-    {
-        return static_cast<double>(hit_count.load(std::memory_order_acquire)) / query_count.load(std::memory_order_relaxed);
-    }
-
-    size_t getElementCount() const override { return element_count.load(std::memory_order_relaxed); }
-
-    double getLoadFactor() const override { return static_cast<double>(element_count.load(std::memory_order_relaxed)) / size; }
-
-    bool supportUpdates() const override { return false; }
-
-    std::shared_ptr<const IExternalLoadable> clone() const override
-    {
-        return std::make_shared<ComplexKeyCacheDictionary>(getDictionaryID(), dict_struct, source_ptr->clone(), dict_lifetime, size);
-    }
-
-    const IDictionarySource * getSource() const override { return source_ptr.get(); }
-
-    const DictionaryLifetime & getLifetime() const override { return dict_lifetime; }
-
-    const DictionaryStructure & getStructure() const override { return dict_struct; }
-
-    bool isInjective(const std::string & attribute_name) const override
-    {
-        return dict_struct.attributes[&getAttribute(attribute_name) - attributes.data()].injective;
-    }
-
-    DictionaryKeyType getKeyType() const override { return DictionaryKeyType::complex; }
-
-    ColumnPtr getColumn(
-        const std::string& attribute_name,
-        const DataTypePtr & result_type,
-        const Columns & key_columns,
-        const DataTypes & key_types,
-        const ColumnPtr default_values_column) const override;
-
-    ColumnUInt8::Ptr hasKeys(const Columns & key_columns, const DataTypes & key_types) const override;
-
-    BlockInputStreamPtr getBlockInputStream(const Names & column_names, size_t max_block_size) const override;
-
-private:
-    template <typename Value>
-    using MapType = HashMapWithSavedHash<StringRef, Value, StringRefHash>;
-    template <typename Value>
-    using ContainerType = Value[];
-    template <typename Value>
-    using ContainerPtrType = std::unique_ptr<ContainerType<Value>>;
-
-    struct CellMetadata final
-    {
-        using time_point_t = std::chrono::system_clock::time_point;
-        using time_point_rep_t = time_point_t::rep;
-        using time_point_urep_t = std::make_unsigned_t<time_point_rep_t>;
-
-        static constexpr UInt64 EXPIRES_AT_MASK = std::numeric_limits<time_point_rep_t>::max();
-        static constexpr UInt64 IS_DEFAULT_MASK = ~EXPIRES_AT_MASK;
-
-        StringRef key;
-        decltype(StringRefHash{}(key)) hash;
-        /// Stores both expiration time and `is_default` flag in the most significant bit
-        time_point_urep_t data;
-
-        /// Sets expiration time, resets `is_default` flag to false
-        time_point_t expiresAt() const { return ext::safe_bit_cast<time_point_t>(data & EXPIRES_AT_MASK); }
-        void setExpiresAt(const time_point_t & t) { data = ext::safe_bit_cast<time_point_urep_t>(t); }
-
-        bool isDefault() const { return (data & IS_DEFAULT_MASK) == IS_DEFAULT_MASK; }
-        void setDefault() { data |= IS_DEFAULT_MASK; }
-    };
-
-    struct Attribute final
-    {
-        AttributeUnderlyingType type;
-        std::variant<
-            UInt8,
-            UInt16,
-            UInt32,
-            UInt64,
-            UInt128,
-            Int8,
-            Int16,
-            Int32,
-            Int64,
-            Decimal32,
-            Decimal64,
-            Decimal128,
-            Float32,
-            Float64,
-            String>
-            null_values;
-        std::variant<
-            ContainerPtrType<UInt8>,
-            ContainerPtrType<UInt16>,
-            ContainerPtrType<UInt32>,
-            ContainerPtrType<UInt64>,
-            ContainerPtrType<UInt128>,
-            ContainerPtrType<Int8>,
-            ContainerPtrType<Int16>,
-            ContainerPtrType<Int32>,
-            ContainerPtrType<Int64>,
-            ContainerPtrType<Decimal32>,
-            ContainerPtrType<Decimal64>,
-            ContainerPtrType<Decimal128>,
-            ContainerPtrType<Float32>,
-            ContainerPtrType<Float64>,
-            ContainerPtrType<StringRef>>
-            arrays;
-    };
-
-    void createAttributes();
-
-    Attribute createAttributeWithType(const AttributeUnderlyingType type, const Field & null_value);
-
-    template <typename AttributeType, typename OutputType, typename DefaultValueExtractor>
-    void getItemsNumberImpl(
-        Attribute & attribute,
-        const Columns & key_columns,
-        PaddedPODArray<OutputType> & out,
-        DefaultValueExtractor & default_value_extractor) const;
-
-    void getItemsString(
-        Attribute & attribute,
-        const Columns & key_columns,
-        ColumnString * out,
-        DictionaryDefaultValueExtractor<String> & default_value_extractor) const;
-
-    template <typename PresentKeyHandler, typename AbsentKeyHandler>
-    void update(
-        const Columns & in_key_columns,
-        const PODArray<StringRef> & in_keys,
-        const std::vector<size_t> & in_requested_rows,
-        PresentKeyHandler && on_cell_updated,
-        AbsentKeyHandler && on_key_not_found) const;
-
-    UInt64 getCellIdx(const StringRef key) const;
-
-    void setDefaultAttributeValue(Attribute & attribute, const size_t idx) const;
-
-    void setAttributeValue(Attribute & attribute, const size_t idx, const Field & value) const;
-
-    Attribute & getAttribute(const std::string & attribute_name) const;
-
-    StringRef allocKey(const size_t row, const Columns & key_columns, StringRefs & keys) const;
-
-    void freeKey(const StringRef key) const;
-
-    template <typename Arena>
-    static StringRef placeKeysInPool(
-        const size_t row,
-        const Columns & key_columns,
-        StringRefs & keys,
-        const std::vector<DictionaryAttribute> & key_attributes,
-        Arena & pool);
-
-    StringRef placeKeysInFixedSizePool(const size_t row, const Columns & key_columns) const;
-
-    static StringRef copyIntoArena(StringRef src, Arena & arena);
-    StringRef copyKey(const StringRef key) const;
-
-    struct FindResult
-    {
-        const size_t cell_idx;
-        const bool valid;
-        const bool outdated;
-    };
-
-    FindResult findCellIdx(const StringRef & key, const CellMetadata::time_point_t now, const size_t hash) const;
-    FindResult findCellIdx(const StringRef & key, const CellMetadata::time_point_t now) const
-    {
-        const auto hash = StringRefHash{}(key);
-        return findCellIdx(key, now, hash);
-    }
-
-    bool isEmptyCell(const UInt64 idx) const;
-
-    const DictionaryStructure dict_struct;
-    const DictionarySourcePtr source_ptr;
-    const DictionaryLifetime dict_lifetime;
-    const std::string key_description{dict_struct.getKeyDescription()};
-
-    mutable std::shared_mutex rw_lock;
-
-    /// Actual size will be increased to match power of 2
-    const size_t size;
-
-    /// all bits to 1  mask (size - 1) (0b1000 - 1 = 0b111)
-    const size_t size_overlap_mask;
-
-    /// Max tries to find cell, overlapped with mask: if size = 16 and start_cell=10: will try cells: 10,11,12,13,14,15,0,1,2,3
-    static constexpr size_t max_collision_length = 10;
-
-    const UInt64 zero_cell_idx{getCellIdx(StringRef{})};
-    std::map<std::string, size_t> attribute_index_by_name;
-    mutable std::vector<Attribute> attributes;
-    mutable std::vector<CellMetadata> cells{size};
-    const bool key_size_is_fixed{dict_struct.isKeySizeFixed()};
-    size_t key_size{key_size_is_fixed ? dict_struct.getKeySize() : 0};
-    std::unique_ptr<ArenaWithFreeLists> keys_pool = key_size_is_fixed ? nullptr : std::make_unique<ArenaWithFreeLists>();
-    std::unique_ptr<SmallObjectPool> fixed_size_keys_pool = key_size_is_fixed ? std::make_unique<SmallObjectPool>(key_size) : nullptr;
-    std::unique_ptr<ArenaWithFreeLists> string_arena;
-
-    mutable pcg64 rnd_engine;
-
-    mutable size_t bytes_allocated = 0;
-    mutable std::atomic<size_t> element_count{0};
-    mutable std::atomic<size_t> hit_count{0};
-    mutable std::atomic<size_t> query_count{0};
-
-    const std::chrono::time_point<std::chrono::system_clock> creation_time = std::chrono::system_clock::now();
-};
-
-}
diff --git a/src/Dictionaries/ComplexKeyDirectDictionary.cpp b/src/Dictionaries/ComplexKeyDirectDictionary.cpp
deleted file mode 100644
index 391b5c47980..00000000000
--- a/src/Dictionaries/ComplexKeyDirectDictionary.cpp
+++ /dev/null
@@ -1,403 +0,0 @@
-#include "ComplexKeyDirectDictionary.h"
-#include <IO/WriteHelpers.h>
-#include "DictionaryBlockInputStream.h"
-#include "DictionaryFactory.h"
-#include <Core/Defines.h>
-#include <Columns/ColumnNullable.h>
-#include <Functions/FunctionHelpers.h>
-#include <DataTypes/DataTypesDecimal.h>
-
-namespace DB
-{
-namespace ErrorCodes
-{
-    extern const int TYPE_MISMATCH;
-    extern const int BAD_ARGUMENTS;
-    extern const int UNSUPPORTED_METHOD;
-}
-
-
-ComplexKeyDirectDictionary::ComplexKeyDirectDictionary(
-    const StorageID & dict_id_,
-    const DictionaryStructure & dict_struct_,
-    DictionarySourcePtr source_ptr_,
-    BlockPtr saved_block_)
-    : IDictionaryBase(dict_id_)
-    , dict_struct(dict_struct_)
-    , source_ptr{std::move(source_ptr_)}
-    , saved_block{std::move(saved_block_)}
-{
-    if (!this->source_ptr->supportsSelectiveLoad())
-        throw Exception{full_name + ": source cannot be used with ComplexKeyDirectDictionary", ErrorCodes::UNSUPPORTED_METHOD};
-
-
-    createAttributes();
-}
-
-ColumnPtr ComplexKeyDirectDictionary::getColumn(
-    const std::string & attribute_name,
-    const DataTypePtr & result_type,
-    const Columns & key_columns,
-    const DataTypes & key_types,
-    const ColumnPtr default_values_column) const
-{
-    dict_struct.validateKeyTypes(key_types);
-
-    ColumnPtr result;
-
-    const auto & attribute = getAttribute(attribute_name);
-    const auto & dictionary_attribute = dict_struct.getAttribute(attribute_name, result_type);
-
-    auto keys_size = key_columns.front()->size();
-
-    ColumnUInt8::MutablePtr col_null_map_to;
-    ColumnUInt8::Container * vec_null_map_to = nullptr;
-    if (attribute.is_nullable)
-    {
-        col_null_map_to = ColumnUInt8::create(keys_size, false);
-        vec_null_map_to = &col_null_map_to->getData();
-    }
-
-    auto type_call = [&](const auto & dictionary_attribute_type)
-    {
-        using Type = std::decay_t<decltype(dictionary_attribute_type)>;
-        using AttributeType = typename Type::AttributeType;
-        using ValueType = DictionaryValueType<AttributeType>;
-        using ColumnProvider = DictionaryAttributeColumnProvider<AttributeType>;
-
-        const auto attribute_null_value = std::get<ValueType>(attribute.null_values);
-        AttributeType null_value = static_cast<AttributeType>(attribute_null_value);
-        DictionaryDefaultValueExtractor<AttributeType> default_value_extractor(std::move(null_value), default_values_column);
-
-        auto column = ColumnProvider::getColumn(dictionary_attribute, keys_size);
-
-        if constexpr (std::is_same_v<AttributeType, String>)
-        {
-            auto * out = column.get();
-
-            getItemsImpl<String, String>(
-                attribute,
-                key_columns,
-                [&](const size_t row, const String value, bool is_null)
-                {
-                    if (attribute.is_nullable)
-                        (*vec_null_map_to)[row] = is_null;
-
-                    const auto ref = StringRef{value};
-                    out->insertData(ref.data, ref.size);
-                },
-                default_value_extractor);
-        }
-        else
-        {
-            auto & out = column->getData();
-
-            getItemsImpl<AttributeType, AttributeType>(
-                attribute,
-                key_columns,
-                [&](const size_t row, const auto value, bool is_null)
-                {
-                    if (attribute.is_nullable)
-                        (*vec_null_map_to)[row] = is_null;
-
-                    out[row] = value;
-                },
-                default_value_extractor);
-        }
-
-
-        result = std::move(column);
-    };
-
-    callOnDictionaryAttributeType(attribute.type, type_call);
-
-    if (attribute.is_nullable)
-    {
-        result = ColumnNullable::create(result, std::move(col_null_map_to));
-    }
-
-    return result;
-}
-
-ColumnUInt8::Ptr ComplexKeyDirectDictionary::hasKeys(const Columns & key_columns, const DataTypes & key_types) const
-{
-    dict_struct.validateKeyTypes(key_types);
-
-    auto size = key_columns.front()->size();
-    auto result = ColumnUInt8::create(size);
-    auto& out = result->getData();
-
-    const auto rows = key_columns.front()->size();
-    const auto keys_size = dict_struct.key->size();
-    StringRefs keys_array(keys_size);
-    MapType<UInt8> has_key;
-    Arena temporary_keys_pool;
-    std::vector<size_t> to_load(rows);
-    PODArray<StringRef> keys(rows);
-
-    for (const auto row : ext::range(0, rows))
-    {
-        const StringRef key = placeKeysInPool(row, key_columns, keys_array, *dict_struct.key, temporary_keys_pool);
-        keys[row] = key;
-        has_key[key] = 0;
-        to_load[row] = row;
-    }
-
-    auto stream = source_ptr->loadKeys(key_columns, to_load);
-
-    stream->readPrefix();
-
-    while (const auto block = stream->read())
-    {
-        const auto columns = ext::map<Columns>(
-            ext::range(0, keys_size), [&](const size_t attribute_idx) { return block.safeGetByPosition(attribute_idx).column; });
-
-        Arena pool;
-
-        StringRefs keys_temp(keys_size);
-
-        const auto columns_size = columns.front()->size();
-
-        for (const auto row_idx : ext::range(0, columns_size))
-        {
-            const StringRef key = placeKeysInPool(row_idx, columns, keys_temp, *dict_struct.key, pool);
-            if (has_key.has(key))
-            {
-                has_key[key] = 1;
-            }
-        }
-    }
-
-    stream->readSuffix();
-
-    for (const auto row : ext::range(0, rows))
-    {
-        out[row] = has_key[keys[row]];
-    }
-
-    query_count.fetch_add(rows, std::memory_order_relaxed);
-
-    return result;
-}
-
-void ComplexKeyDirectDictionary::createAttributes()
-{
-    const auto size = dict_struct.attributes.size();
-    attributes.reserve(size);
-
-    for (const auto & attribute : dict_struct.attributes)
-    {
-        attribute_index_by_name.emplace(attribute.name, attributes.size());
-        attribute_name_by_index.emplace(attributes.size(), attribute.name);
-        attributes.push_back(createAttribute(attribute, attribute.null_value, attribute.name));
-
-        if (attribute.hierarchical)
-            throw Exception{full_name + ": hierarchical attributes not supported for dictionary of type " + getTypeName(),
-                            ErrorCodes::TYPE_MISMATCH};
-    }
-}
-
-template <typename T>
-void ComplexKeyDirectDictionary::createAttributeImpl(Attribute & attribute, const Field & null_value)
-{
-    attribute.null_values = T(null_value.get<NearestFieldType<T>>());
-}
-
-template <>
-void ComplexKeyDirectDictionary::createAttributeImpl<String>(Attribute & attribute, const Field & null_value)
-{
-    attribute.string_arena = std::make_unique<Arena>();
-    const String & string = null_value.get<String>();
-    const char * string_in_arena = attribute.string_arena->insert(string.data(), string.size());
-    attribute.null_values.emplace<StringRef>(string_in_arena, string.size());
-}
-
-
-ComplexKeyDirectDictionary::Attribute ComplexKeyDirectDictionary::createAttribute(
-    const DictionaryAttribute & attribute, const Field & null_value, const std::string & attr_name)
-{
-    Attribute attr{attribute.underlying_type, attribute.is_nullable, {}, {}, attr_name};
-
-    auto type_call = [&](const auto &dictionary_attribute_type)
-    {
-        using Type = std::decay_t<decltype(dictionary_attribute_type)>;
-        using AttributeType = typename Type::AttributeType;
-        createAttributeImpl<AttributeType>(attr, null_value);
-    };
-
-    callOnDictionaryAttributeType(attribute.underlying_type, type_call);
-
-    return attr;
-}
-
-template <typename Pool>
-StringRef ComplexKeyDirectDictionary::placeKeysInPool(
-    const size_t row, const Columns & key_columns, StringRefs & keys, const std::vector<DictionaryAttribute> & key_attributes, Pool & pool) const
-{
-    const auto keys_size = key_columns.size();
-    size_t sum_keys_size{};
-
-    for (size_t j = 0; j < keys_size; ++j)
-    {
-        keys[j] = key_columns[j]->getDataAt(row);
-        sum_keys_size += keys[j].size;
-        if (key_attributes[j].underlying_type == AttributeUnderlyingType::utString)
-            sum_keys_size += sizeof(size_t) + 1;
-    }
-
-    auto place = pool.alloc(sum_keys_size);
-
-    auto key_start = place;
-    for (size_t j = 0; j < keys_size; ++j)
-    {
-        if (key_attributes[j].underlying_type == AttributeUnderlyingType::utString)
-        {
-            auto start = key_start;
-            auto key_size = keys[j].size + 1;
-            memcpy(key_start, &key_size, sizeof(size_t));
-            key_start += sizeof(size_t);
-            memcpy(key_start, keys[j].data, keys[j].size);
-            key_start += keys[j].size;
-            *key_start = '\0';
-            ++key_start;
-            keys[j].data = start;
-            keys[j].size += sizeof(size_t) + 1;
-        }
-        else
-        {
-            memcpy(key_start, keys[j].data, keys[j].size);
-            keys[j].data = key_start;
-            key_start += keys[j].size;
-        }
-    }
-
-    return {place, sum_keys_size};
-}
-
-
-template <typename AttributeType, typename OutputType, typename ValueSetter, typename DefaultValueExtractor>
-void ComplexKeyDirectDictionary::getItemsImpl(
-    const Attribute & attribute,
-    const Columns & key_columns,
-    ValueSetter && set_value,
-    DefaultValueExtractor & default_value_extractor) const
-{
-    const auto rows = key_columns.front()->size();
-    const auto keys_size = dict_struct.key->size();
-    StringRefs keys_array(keys_size);
-    MapType<OutputType> value_by_key;
-    HashMapWithSavedHash<StringRef, bool, StringRefHash> value_is_null;
-    Arena temporary_keys_pool;
-    std::vector<size_t> to_load(rows);
-    PODArray<StringRef> keys(rows);
-
-    for (const auto row : ext::range(0, rows))
-    {
-        const StringRef key = placeKeysInPool(row, key_columns, keys_array, *dict_struct.key, temporary_keys_pool);
-        keys[row] = key;
-        value_by_key[key] = static_cast<AttributeType>(default_value_extractor[row]);
-        to_load[row] = row;
-        value_is_null[key] = false;
-    }
-
-    auto stream = source_ptr->loadKeys(key_columns, to_load);
-    const auto attributes_size = attributes.size();
-
-    stream->readPrefix();
-
-    while (const auto block = stream->read())
-    {
-        const auto columns = ext::map<Columns>(
-            ext::range(0, keys_size), [&](const size_t attribute_idx) { return block.safeGetByPosition(attribute_idx).column; });
-
-        const auto attribute_columns = ext::map<Columns>(ext::range(0, attributes_size), [&](const size_t attribute_idx)
-            {
-                return block.safeGetByPosition(keys_size + attribute_idx).column;
-            });
-        for (const size_t attribute_idx : ext::range(0, attributes.size()))
-        {
-            if (attribute.name != attribute_name_by_index.at(attribute_idx))
-            {
-                continue;
-            }
-
-            const IColumn & attribute_column = *attribute_columns[attribute_idx];
-            Arena pool;
-
-            StringRefs keys_temp(keys_size);
-
-            const auto columns_size = columns.front()->size();
-
-            for (const auto row_idx : ext::range(0, columns_size))
-            {
-                const StringRef key = placeKeysInPool(row_idx, columns, keys_temp, *dict_struct.key, pool);
-
-                if (value_by_key.has(key))
-                {
-                    auto value = attribute_column[row_idx];
-
-                    if (value.isNull())
-                        value_is_null[key] = true;
-                    else
-                        value_by_key[key] = static_cast<OutputType>(value.template get<NearestFieldType<AttributeType>>());
-                }
-            }
-        }
-    }
-
-    stream->readSuffix();
-
-    for (const auto row : ext::range(0, rows))
-    {
-        auto key = keys[row];
-        set_value(row, value_by_key[key], value_is_null[key]);
-    }
-
-    query_count.fetch_add(rows, std::memory_order_relaxed);
-}
-
-const ComplexKeyDirectDictionary::Attribute & ComplexKeyDirectDictionary::getAttribute(const std::string & attribute_name) const
-{
-    const auto it = attribute_index_by_name.find(attribute_name);
-    if (it == std::end(attribute_index_by_name))
-        throw Exception{full_name + ": no such attribute '" + attribute_name + "'", ErrorCodes::BAD_ARGUMENTS};
-
-    return attributes[it->second];
-}
-
-BlockInputStreamPtr ComplexKeyDirectDictionary::getBlockInputStream(const Names & /* column_names */, size_t /* max_block_size */) const
-{
-    return source_ptr->loadAll();
-}
-
-
-void registerDictionaryComplexKeyDirect(DictionaryFactory & factory)
-{
-    auto create_layout = [=](const std::string & full_name,
-                             const DictionaryStructure & dict_struct,
-                             const Poco::Util::AbstractConfiguration & config,
-                             const std::string & config_prefix,
-                             DictionarySourcePtr source_ptr) -> DictionaryPtr
-    {
-        if (!dict_struct.key)
-            throw Exception{"'key' is required for dictionary of layout 'complex_key_direct'", ErrorCodes::BAD_ARGUMENTS};
-
-        if (dict_struct.range_min || dict_struct.range_max)
-            throw Exception{full_name
-                                + ": elements .structure.range_min and .structure.range_max should be defined only "
-                                  "for a dictionary of layout 'range_hashed'",
-                            ErrorCodes::BAD_ARGUMENTS};
-
-        const auto dict_id = StorageID::fromDictionaryConfig(config, config_prefix);
-
-        if (config.has(config_prefix + ".lifetime.min") || config.has(config_prefix + ".lifetime.max"))
-            throw Exception{"'lifetime' parameter is redundant for the dictionary' of layout 'direct'", ErrorCodes::BAD_ARGUMENTS};
-
-
-        return std::make_unique<ComplexKeyDirectDictionary>(dict_id, dict_struct, std::move(source_ptr));
-    };
-    factory.registerLayout("complex_key_direct", create_layout, true);
-}
-
-
-}
diff --git a/src/Dictionaries/ComplexKeyDirectDictionary.h b/src/Dictionaries/ComplexKeyDirectDictionary.h
deleted file mode 100644
index 0e191321daa..00000000000
--- a/src/Dictionaries/ComplexKeyDirectDictionary.h
+++ /dev/null
@@ -1,147 +0,0 @@
-#pragma once
-
-#include <atomic>
-#include <variant>
-#include <vector>
-#include <Columns/ColumnDecimal.h>
-#include <Columns/ColumnString.h>
-#include <Common/Arena.h>
-#include <Core/Block.h>
-
-#include <Common/HashTable/HashMap.h>
-#include <ext/range.h>
-#include <ext/size.h>
-#include <ext/map.h>
-#include "IDictionary.h"
-#include "IDictionarySource.h"
-#include "DictionaryStructure.h"
-#include "DictionaryHelpers.h"
-
-namespace DB
-{
-
-class ComplexKeyDirectDictionary final : public IDictionaryBase
-{
-public:
-    ComplexKeyDirectDictionary(
-        const StorageID & dict_id_,
-        const DictionaryStructure & dict_struct_,
-        DictionarySourcePtr source_ptr_,
-        BlockPtr saved_block_ = nullptr);
-
-    std::string getTypeName() const override { return "ComplexKeyDirect"; }
-
-    size_t getBytesAllocated() const override { return 0; }
-
-    size_t getQueryCount() const override { return query_count.load(std::memory_order_relaxed); }
-
-    double getHitRate() const override { return 1.0; }
-
-    size_t getElementCount() const override { return 0; }
-
-    double getLoadFactor() const override { return 0; }
-
-    std::string getKeyDescription() const { return key_description; }
-
-    std::shared_ptr<const IExternalLoadable> clone() const override
-    {
-        return std::make_shared<ComplexKeyDirectDictionary>(getDictionaryID(), dict_struct, source_ptr->clone(), saved_block);
-    }
-
-    const IDictionarySource * getSource() const override { return source_ptr.get(); }
-
-    const DictionaryLifetime & getLifetime() const override { return dict_lifetime; }
-
-    const DictionaryStructure & getStructure() const override { return dict_struct; }
-
-    bool isInjective(const std::string & attribute_name) const override
-    {
-        return dict_struct.attributes[&getAttribute(attribute_name) - attributes.data()].injective;
-    }
-
-    DictionaryKeyType getKeyType() const override { return DictionaryKeyType::complex; }
-
-    ColumnPtr getColumn(
-        const std::string& attribute_name,
-        const DataTypePtr & result_type,
-        const Columns & key_columns,
-        const DataTypes & key_types,
-        const ColumnPtr default_values_column) const override;
-
-    ColumnUInt8::Ptr hasKeys(const Columns & key_columns, const DataTypes & key_types) const override;
-
-    BlockInputStreamPtr getBlockInputStream(const Names & column_names, size_t max_block_size) const override;
-
-private:
-    template <typename Value>
-    using MapType = HashMapWithSavedHash<StringRef, Value, StringRefHash>;
-
-    struct Attribute final
-    {
-        AttributeUnderlyingType type;
-        bool is_nullable;
-
-        std::variant<
-            UInt8,
-            UInt16,
-            UInt32,
-            UInt64,
-            UInt128,
-            Int8,
-            Int16,
-            Int32,
-            Int64,
-            Decimal32,
-            Decimal64,
-            Decimal128,
-            Float32,
-            Float64,
-            StringRef>
-            null_values;
-        std::unique_ptr<Arena> string_arena;
-        std::string name;
-    };
-
-    void createAttributes();
-
-    template <typename T>
-    void addAttributeSize(const Attribute & attribute);
-
-    template <typename T>
-    static void createAttributeImpl(Attribute & attribute, const Field & null_value);
-
-    static Attribute createAttribute(const DictionaryAttribute & attribute, const Field & null_value, const std::string & name);
-
-    template <typename Pool>
-    StringRef placeKeysInPool(
-        const size_t row, const Columns & key_columns, StringRefs & keys, const std::vector<DictionaryAttribute> & key_attributes, Pool & pool) const;
-
-    template <typename AttributeType, typename OutputType, typename ValueSetter, typename DefaultValueExtractor>
-    void getItemsImpl(
-        const Attribute & attribute,
-        const Columns & key_columns,
-        ValueSetter && set_value,
-        DefaultValueExtractor & default_value_extractor) const;
-
-    template <typename T>
-    void setAttributeValueImpl(Attribute & attribute, const Key id, const T & value);
-
-    void setAttributeValue(Attribute & attribute, const Key id, const Field & value);
-
-    const Attribute & getAttribute(const std::string & attribute_name) const;
-
-    const DictionaryStructure dict_struct;
-    const DictionarySourcePtr source_ptr;
-    const DictionaryLifetime dict_lifetime;
-
-    std::map<std::string, size_t> attribute_index_by_name;
-    std::map<size_t, std::string> attribute_name_by_index;
-    std::vector<Attribute> attributes;
-
-    mutable std::atomic<size_t> query_count{0};
-
-    BlockPtr saved_block;
-    const std::string key_description{dict_struct.getKeyDescription()};
-};
-
-}
diff --git a/src/Dictionaries/ComplexKeyHashedDictionary.cpp b/src/Dictionaries/ComplexKeyHashedDictionary.cpp
deleted file mode 100644
index a0784b5a417..00000000000
--- a/src/Dictionaries/ComplexKeyHashedDictionary.cpp
+++ /dev/null
@@ -1,588 +0,0 @@
-#include "ComplexKeyHashedDictionary.h"
-#include <ext/map.h>
-#include <ext/range.h>
-#include <Columns/ColumnsNumber.h>
-#include <Columns/ColumnNullable.h>
-#include <Functions/FunctionHelpers.h>
-#include <DataTypes/DataTypesDecimal.h>
-#include "DictionaryBlockInputStream.h"
-#include "DictionaryFactory.h"
-
-namespace DB
-{
-namespace ErrorCodes
-{
-    extern const int TYPE_MISMATCH;
-    extern const int BAD_ARGUMENTS;
-    extern const int DICTIONARY_IS_EMPTY;
-}
-
-ComplexKeyHashedDictionary::ComplexKeyHashedDictionary(
-    const StorageID & dict_id_,
-    const DictionaryStructure & dict_struct_,
-    DictionarySourcePtr source_ptr_,
-    const DictionaryLifetime dict_lifetime_,
-    bool require_nonempty_,
-    BlockPtr saved_block_)
-    : IDictionaryBase(dict_id_)
-    , dict_struct(dict_struct_)
-    , source_ptr{std::move(source_ptr_)}
-    , dict_lifetime(dict_lifetime_)
-    , require_nonempty(require_nonempty_)
-    , saved_block{std::move(saved_block_)}
-{
-    createAttributes();
-    loadData();
-    calculateBytesAllocated();
-}
-
-ColumnPtr ComplexKeyHashedDictionary::getColumn(
-    const std::string & attribute_name,
-    const DataTypePtr & result_type,
-    const Columns & key_columns,
-    const DataTypes & key_types,
-    const ColumnPtr default_values_column) const
-{
-    dict_struct.validateKeyTypes(key_types);
-
-    ColumnPtr result;
-
-    const auto & attribute = getAttribute(attribute_name);
-    const auto & dictionary_attribute = dict_struct.getAttribute(attribute_name, result_type);
-
-    auto keys_size = key_columns.front()->size();
-
-    ColumnUInt8::MutablePtr col_null_map_to;
-    ColumnUInt8::Container * vec_null_map_to = nullptr;
-    if (attribute.is_nullable)
-    {
-        col_null_map_to = ColumnUInt8::create(keys_size, false);
-        vec_null_map_to = &col_null_map_to->getData();
-    }
-
-    auto type_call = [&](const auto &dictionary_attribute_type)
-    {
-        using Type = std::decay_t<decltype(dictionary_attribute_type)>;
-        using AttributeType = typename Type::AttributeType;
-        using ValueType = DictionaryValueType<AttributeType>;
-        using ColumnProvider = DictionaryAttributeColumnProvider<AttributeType>;
-
-        const auto attribute_null_value = std::get<ValueType>(attribute.null_values);
-        AttributeType null_value = static_cast<AttributeType>(attribute_null_value);
-        DictionaryDefaultValueExtractor<AttributeType> default_value_extractor(std::move(null_value), default_values_column);
-
-        auto column = ColumnProvider::getColumn(dictionary_attribute, keys_size);
-
-        if constexpr (std::is_same_v<AttributeType, String>)
-        {
-            auto * out = column.get();
-
-            getItemsImpl<StringRef, StringRef>(
-                attribute,
-                key_columns,
-                [&](const size_t row, const StringRef value, bool is_null)
-                {
-                    if (attribute.is_nullable)
-                        (*vec_null_map_to)[row] = is_null;
-
-                    out->insertData(value.data, value.size);
-                },
-                default_value_extractor);
-        }
-        else
-        {
-            auto & out = column->getData();
-
-            getItemsImpl<AttributeType, AttributeType>(
-                attribute,
-                key_columns,
-                [&](const size_t row, const auto value, bool is_null)
-                {
-                    if (attribute.is_nullable)
-                        (*vec_null_map_to)[row] = is_null;
-
-                    out[row] = value;
-                },
-                default_value_extractor);
-        }
-
-        result = std::move(column);
-    };
-
-    callOnDictionaryAttributeType(attribute.type, type_call);
-
-    if (attribute.is_nullable)
-    {
-        result = ColumnNullable::create(result, std::move(col_null_map_to));
-    }
-
-    return result;
-}
-
-ColumnUInt8::Ptr ComplexKeyHashedDictionary::hasKeys(const Columns & key_columns, const DataTypes & key_types) const
-{
-    dict_struct.validateKeyTypes(key_types);
-
-    auto size = key_columns.front()->size();
-    auto result = ColumnUInt8::create(size);
-    auto& out = result->getData();
-
-    const auto & attribute = attributes.front();
-
-    auto type_call = [&](const auto & dictionary_attribute_type)
-    {
-        using Type = std::decay_t<decltype(dictionary_attribute_type)>;
-        using AttributeType = typename Type::AttributeType;
-        using ValueType = DictionaryValueType<AttributeType>;
-
-        has<ValueType>(attribute, key_columns, out);
-    };
-
-    callOnDictionaryAttributeType(attribute.type, type_call);
-
-    return result;
-}
-
-void ComplexKeyHashedDictionary::createAttributes()
-{
-    const auto size = dict_struct.attributes.size();
-    attributes.reserve(size);
-
-    for (const auto & attribute : dict_struct.attributes)
-    {
-        attribute_index_by_name.emplace(attribute.name, attributes.size());
-        attributes.push_back(createAttribute(attribute, attribute.null_value));
-
-        if (attribute.hierarchical)
-            throw Exception{full_name + ": hierarchical attributes not supported for dictionary of type " + getTypeName(),
-                            ErrorCodes::TYPE_MISMATCH};
-    }
-}
-
-void ComplexKeyHashedDictionary::blockToAttributes(const Block & block)
-{
-    /// created upfront to avoid excess allocations
-    const auto keys_size = dict_struct.key->size();
-    StringRefs keys(keys_size);
-
-    const auto attributes_size = attributes.size();
-    const auto rows = block.rows();
-    element_count += rows;
-
-    const auto key_column_ptrs = ext::map<Columns>(
-        ext::range(0, keys_size), [&](const size_t attribute_idx) { return block.safeGetByPosition(attribute_idx).column; });
-
-    const auto attribute_column_ptrs = ext::map<Columns>(ext::range(0, attributes_size), [&](const size_t attribute_idx)
-    {
-        return block.safeGetByPosition(keys_size + attribute_idx).column;
-    });
-
-    for (const auto row_idx : ext::range(0, rows))
-    {
-        /// calculate key once per row
-        const auto key = placeKeysInPool(row_idx, key_column_ptrs, keys, keys_pool);
-
-        auto should_rollback = false;
-
-        for (const auto attribute_idx : ext::range(0, attributes_size))
-        {
-            const auto & attribute_column = *attribute_column_ptrs[attribute_idx];
-            auto & attribute = attributes[attribute_idx];
-            const auto inserted = setAttributeValue(attribute, key, attribute_column[row_idx]);
-            if (!inserted)
-                should_rollback = true;
-        }
-
-        /// @note on multiple equal keys the mapped value for the first one is stored
-        if (should_rollback)
-            keys_pool.rollback(key.size);
-    }
-}
-
-void ComplexKeyHashedDictionary::updateData()
-{
-    /// created upfront to avoid excess allocations
-    const auto keys_size = dict_struct.key->size();
-    StringRefs keys(keys_size);
-
-    const auto attributes_size = attributes.size();
-
-    if (!saved_block || saved_block->rows() == 0)
-    {
-        auto stream = source_ptr->loadUpdatedAll();
-        stream->readPrefix();
-
-        while (const auto block = stream->read())
-        {
-            /// We are using this method to keep saved data if input stream consists of multiple blocks
-            if (!saved_block)
-                saved_block = std::make_shared<DB::Block>(block.cloneEmpty());
-            for (const auto attribute_idx : ext::range(0, keys_size + attributes_size))
-            {
-                const IColumn & update_column = *block.getByPosition(attribute_idx).column.get();
-                MutableColumnPtr saved_column = saved_block->getByPosition(attribute_idx).column->assumeMutable();
-                saved_column->insertRangeFrom(update_column, 0, update_column.size());
-            }
-        }
-        stream->readSuffix();
-    }
-    else
-    {
-        auto stream = source_ptr->loadUpdatedAll();
-
-        stream->readPrefix();
-        while (Block block = stream->read())
-        {
-            const auto saved_key_column_ptrs = ext::map<Columns>(
-                ext::range(0, keys_size), [&](const size_t key_idx) { return saved_block->safeGetByPosition(key_idx).column; });
-
-            const auto update_key_column_ptrs = ext::map<Columns>(
-                ext::range(0, keys_size), [&](const size_t key_idx) { return block.safeGetByPosition(key_idx).column; });
-
-            Arena temp_key_pool;
-            ContainerType<std::vector<size_t>> update_key_hash;
-
-            for (size_t i = 0; i < block.rows(); ++i)
-            {
-                const auto u_key = placeKeysInPool(i, update_key_column_ptrs, keys, temp_key_pool);
-                update_key_hash[u_key].push_back(i);
-            }
-
-            const size_t rows = saved_block->rows();
-            IColumn::Filter filter(rows);
-
-            for (size_t i = 0; i < saved_block->rows(); ++i)
-            {
-                const auto s_key = placeKeysInPool(i, saved_key_column_ptrs, keys, temp_key_pool);
-                auto * it = update_key_hash.find(s_key);
-                if (it)
-                    filter[i] = 0;
-                else
-                    filter[i] = 1;
-            }
-
-            auto block_columns = block.mutateColumns();
-            for (const auto attribute_idx : ext::range(0, keys_size + attributes_size))
-            {
-                auto & column = saved_block->safeGetByPosition(attribute_idx).column;
-                const auto & filtered_column = column->filter(filter, -1);
-
-                block_columns[attribute_idx]->insertRangeFrom(*filtered_column.get(), 0, filtered_column->size());
-            }
-
-            saved_block->setColumns(std::move(block_columns));
-        }
-        stream->readSuffix();
-    }
-
-    if (saved_block)
-        blockToAttributes(*saved_block.get());
-}
-
-void ComplexKeyHashedDictionary::loadData()
-{
-    if (!source_ptr->hasUpdateField())
-    {
-        auto stream = source_ptr->loadAll();
-        stream->readPrefix();
-
-        while (const auto block = stream->read())
-            blockToAttributes(block);
-
-        stream->readSuffix();
-    }
-    else
-        updateData();
-
-    if (require_nonempty && 0 == element_count)
-        throw Exception{full_name + ": dictionary source is empty and 'require_nonempty' property is set.", ErrorCodes::DICTIONARY_IS_EMPTY};
-}
-
-template <typename T>
-void ComplexKeyHashedDictionary::addAttributeSize(const Attribute & attribute)
-{
-    const auto & map_ref = std::get<ContainerType<T>>(attribute.maps);
-    bytes_allocated += sizeof(ContainerType<T>) + map_ref.getBufferSizeInBytes();
-    bucket_count = map_ref.getBufferSizeInCells();
-}
-
-template <>
-void ComplexKeyHashedDictionary::addAttributeSize<String>(const Attribute & attribute)
-{
-    const auto & map_ref = std::get<ContainerType<StringRef>>(attribute.maps);
-    bytes_allocated += sizeof(ContainerType<StringRef>) + map_ref.getBufferSizeInBytes();
-    bucket_count = map_ref.getBufferSizeInCells();
-    bytes_allocated += sizeof(Arena) + attribute.string_arena->size();
-}
-
-void ComplexKeyHashedDictionary::calculateBytesAllocated()
-{
-    bytes_allocated += attributes.size() * sizeof(attributes.front());
-
-    for (const auto & attribute : attributes)
-    {
-        auto type_call = [&](const auto & dictionary_attribute_type)
-        {
-            using Type = std::decay_t<decltype(dictionary_attribute_type)>;
-            using AttributeType = typename Type::AttributeType;
-
-            addAttributeSize<AttributeType>(attribute);
-        };
-
-        callOnDictionaryAttributeType(attribute.type, type_call);
-    }
-
-    bytes_allocated += keys_pool.size();
-}
-
-template <typename T>
-void ComplexKeyHashedDictionary::createAttributeImpl(Attribute & attribute, const Field & null_value)
-{
-    attribute.null_values = T(null_value.get<NearestFieldType<T>>());
-    attribute.maps.emplace<ContainerType<T>>();
-}
-
-template <>
-void ComplexKeyHashedDictionary::createAttributeImpl<String>(Attribute & attribute, const Field & null_value)
-{
-    attribute.string_arena = std::make_unique<Arena>();
-    const String & string = null_value.get<String>();
-    const char * string_in_arena = attribute.string_arena->insert(string.data(), string.size());
-    attribute.null_values.emplace<StringRef>(string_in_arena, string.size());
-    attribute.maps.emplace<ContainerType<StringRef>>();
-}
-
-ComplexKeyHashedDictionary::Attribute
-ComplexKeyHashedDictionary::createAttribute(const DictionaryAttribute & attribute, const Field & null_value)
-{
-    auto nullable_set = attribute.is_nullable ? std::make_unique<NullableSet>() : nullptr;
-    Attribute attr{attribute.underlying_type, attribute.is_nullable, std::move(nullable_set), {}, {}, {}};
-
-    auto type_call = [&](const auto &dictionary_attribute_type)
-    {
-        using Type = std::decay_t<decltype(dictionary_attribute_type)>;
-        using AttributeType = typename Type::AttributeType;
-        createAttributeImpl<AttributeType>(attr, null_value);
-    };
-
-    callOnDictionaryAttributeType(attribute.underlying_type, type_call);
-
-    return attr;
-}
-
-
-template <typename AttributeType, typename OutputType, typename ValueSetter, typename DefaultValueExtractor>
-void ComplexKeyHashedDictionary::getItemsImpl(
-    const Attribute & attribute,
-    const Columns & key_columns,
-    ValueSetter && set_value,
-    DefaultValueExtractor & default_value_extractor) const
-{
-    const auto & attr = std::get<ContainerType<AttributeType>>(attribute.maps);
-
-    const auto keys_size = key_columns.size();
-    StringRefs keys(keys_size);
-    Arena temporary_keys_pool;
-
-    const auto rows = key_columns.front()->size();
-    for (const auto i : ext::range(0, rows))
-    {
-        /// copy key data to arena so it is contiguous and return StringRef to it
-        const auto key = placeKeysInPool(i, key_columns, keys, temporary_keys_pool);
-
-        const auto it = attr.find(key);
-
-        if (it)
-        {
-            set_value(i, static_cast<OutputType>(it->getMapped()), false);
-        }
-        else
-        {
-            if (attribute.is_nullable && attribute.nullable_set->find(key) != nullptr)
-                set_value(i, default_value_extractor[i], true);
-            else
-                set_value(i, default_value_extractor[i], false);
-        }
-
-        /// free memory allocated for the key
-        temporary_keys_pool.rollback(key.size);
-    }
-
-    query_count.fetch_add(rows, std::memory_order_relaxed);
-}
-
-
-template <typename T>
-bool ComplexKeyHashedDictionary::setAttributeValueImpl(Attribute & attribute, const StringRef key, const T value)
-{
-    auto & map = std::get<ContainerType<T>>(attribute.maps);
-    const auto pair = map.insert({key, value});
-    return pair.second;
-}
-
-template <>
-bool ComplexKeyHashedDictionary::setAttributeValueImpl<String>(Attribute & attribute, const StringRef key, const String value)
-{
-    const auto * string_in_arena = attribute.string_arena->insert(value.data(), value.size());
-    return setAttributeValueImpl<StringRef>(attribute, key, StringRef{string_in_arena, value.size()});
-}
-
-bool ComplexKeyHashedDictionary::setAttributeValue(Attribute & attribute, const StringRef key, const Field & value)
-{
-    bool result = false;
-
-    auto type_call = [&](const auto &dictionary_attribute_type)
-    {
-        using Type = std::decay_t<decltype(dictionary_attribute_type)>;
-        using AttributeType = typename Type::AttributeType;
-
-        if (attribute.is_nullable)
-        {
-            if (value.isNull())
-            {
-                attribute.nullable_set->insert(key);
-                result = true;
-                return;
-            }
-            else
-            {
-                attribute.nullable_set->erase(key);
-            }
-        }
-
-        result = setAttributeValueImpl<AttributeType>(attribute, key, value.get<NearestFieldType<AttributeType>>());
-    };
-
-    callOnDictionaryAttributeType(attribute.type, type_call);
-
-    return result;
-}
-
-const ComplexKeyHashedDictionary::Attribute & ComplexKeyHashedDictionary::getAttribute(const std::string & attribute_name) const
-{
-    const auto it = attribute_index_by_name.find(attribute_name);
-    if (it == std::end(attribute_index_by_name))
-        throw Exception{full_name + ": no such attribute '" + attribute_name + "'", ErrorCodes::BAD_ARGUMENTS};
-
-    return attributes[it->second];
-}
-
-StringRef ComplexKeyHashedDictionary::placeKeysInPool(const size_t row, const Columns & key_columns, StringRefs & keys, Arena & pool)
-{
-    const auto keys_size = key_columns.size();
-    size_t sum_keys_size{};
-
-    const char * block_start = nullptr;
-    for (size_t j = 0; j < keys_size; ++j)
-    {
-        keys[j] = key_columns[j]->serializeValueIntoArena(row, pool, block_start);
-        sum_keys_size += keys[j].size;
-    }
-
-    const auto * key_start = block_start;
-    for (size_t j = 0; j < keys_size; ++j)
-    {
-        keys[j].data = key_start;
-        key_start += keys[j].size;
-    }
-
-    return {block_start, sum_keys_size};
-}
-
-template <typename T>
-void ComplexKeyHashedDictionary::has(const Attribute & attribute, const Columns & key_columns, PaddedPODArray<UInt8> & out) const
-{
-    const auto & attr = std::get<ContainerType<T>>(attribute.maps);
-    const auto keys_size = key_columns.size();
-    StringRefs keys(keys_size);
-    Arena temporary_keys_pool;
-    const auto rows = key_columns.front()->size();
-
-    for (const auto i : ext::range(0, rows))
-    {
-        /// copy key data to arena so it is contiguous and return StringRef to it
-        const auto key = placeKeysInPool(i, key_columns, keys, temporary_keys_pool);
-
-        const auto it = attr.find(key);
-        out[i] = static_cast<bool>(it);
-
-        if (attribute.is_nullable && !out[i])
-            out[i] = attribute.nullable_set->find(key) != nullptr;
-
-        /// free memory allocated for the key
-        temporary_keys_pool.rollback(key.size);
-    }
-
-    query_count.fetch_add(rows, std::memory_order_relaxed);
-}
-
-std::vector<StringRef> ComplexKeyHashedDictionary::getKeys() const
-{
-    const Attribute & attribute = attributes.front();
-
-    std::vector<StringRef> result;
-
-    auto type_call = [&](const auto & dictionary_attribute_type)
-    {
-        using Type = std::decay_t<decltype(dictionary_attribute_type)>;
-        using AttributeType = typename Type::AttributeType;
-
-        if constexpr (std::is_same_v<AttributeType, String>)
-        {
-            result = getKeys<StringRef>(attribute);
-        }
-        else
-        {
-            result = getKeys<AttributeType>(attribute);
-        }
-    };
-
-    callOnDictionaryAttributeType(attribute.type, type_call);
-
-    return result;
-}
-
-template <typename T>
-std::vector<StringRef> ComplexKeyHashedDictionary::getKeys(const Attribute & attribute) const
-{
-    const ContainerType<T> & attr = std::get<ContainerType<T>>(attribute.maps);
-    std::vector<StringRef> keys;
-    keys.reserve(attr.size());
-    for (const auto & key : attr)
-        keys.push_back(key.getKey());
-
-    if (attribute.is_nullable)
-    {
-        for (const auto & key: *attribute.nullable_set)
-            keys.push_back(key.getKey());
-    }
-
-    return keys;
-}
-
-BlockInputStreamPtr ComplexKeyHashedDictionary::getBlockInputStream(const Names & column_names, size_t max_block_size) const
-{
-    using BlockInputStreamType = DictionaryBlockInputStream<UInt64>;
-    return std::make_shared<BlockInputStreamType>(shared_from_this(), max_block_size, getKeys(), column_names);
-}
-
-void registerDictionaryComplexKeyHashed(DictionaryFactory & factory)
-{
-    auto create_layout = [=](const std::string &,
-                             const DictionaryStructure & dict_struct,
-                             const Poco::Util::AbstractConfiguration & config,
-                             const std::string & config_prefix,
-                             DictionarySourcePtr source_ptr) -> DictionaryPtr
-    {
-        if (!dict_struct.key)
-            throw Exception{"'key' is required for dictionary of layout 'complex_key_hashed'", ErrorCodes::BAD_ARGUMENTS};
-
-        const auto dict_id = StorageID::fromDictionaryConfig(config, config_prefix);
-        const DictionaryLifetime dict_lifetime{config, config_prefix + ".lifetime"};
-        const bool require_nonempty = config.getBool(config_prefix + ".require_nonempty", false);
-        return std::make_unique<ComplexKeyHashedDictionary>(dict_id, dict_struct, std::move(source_ptr), dict_lifetime, require_nonempty);
-    };
-    factory.registerLayout("complex_key_hashed", create_layout, true);
-}
-
-}
diff --git a/src/Dictionaries/ComplexKeyHashedDictionary.h b/src/Dictionaries/ComplexKeyHashedDictionary.h
deleted file mode 100644
index ecc720ca0b0..00000000000
--- a/src/Dictionaries/ComplexKeyHashedDictionary.h
+++ /dev/null
@@ -1,185 +0,0 @@
-#pragma once
-
-#include <atomic>
-#include <memory>
-#include <variant>
-#include <Columns/ColumnDecimal.h>
-#include <Columns/ColumnString.h>
-#include <Common/Arena.h>
-#include <Common/HashTable/HashMap.h>
-#include <Common/HashTable/HashSet.h>
-#include <Core/Block.h>
-#include <common/StringRef.h>
-#include <ext/range.h>
-#include "IDictionary.h"
-#include "IDictionarySource.h"
-#include "DictionaryStructure.h"
-#include "DictionaryHelpers.h"
-
-namespace DB
-{
-
-class ComplexKeyHashedDictionary final : public IDictionaryBase
-{
-public:
-    ComplexKeyHashedDictionary(
-        const StorageID & dict_id_,
-        const DictionaryStructure & dict_struct_,
-        DictionarySourcePtr source_ptr_,
-        const DictionaryLifetime dict_lifetime_,
-        bool require_nonempty_,
-        BlockPtr saved_block_ = nullptr);
-
-    std::string getKeyDescription() const { return key_description; }
-
-    std::string getTypeName() const override { return "ComplexKeyHashed"; }
-
-    size_t getBytesAllocated() const override { return bytes_allocated; }
-
-    size_t getQueryCount() const override { return query_count.load(std::memory_order_relaxed); }
-
-    double getHitRate() const override { return 1.0; }
-
-    size_t getElementCount() const override { return element_count; }
-
-    double getLoadFactor() const override { return static_cast<double>(element_count) / bucket_count; }
-
-    std::shared_ptr<const IExternalLoadable> clone() const override
-    {
-        return std::make_shared<ComplexKeyHashedDictionary>(getDictionaryID(), dict_struct, source_ptr->clone(), dict_lifetime, require_nonempty, saved_block);
-    }
-
-    const IDictionarySource * getSource() const override { return source_ptr.get(); }
-
-    const DictionaryLifetime & getLifetime() const override { return dict_lifetime; }
-
-    const DictionaryStructure & getStructure() const override { return dict_struct; }
-
-    bool isInjective(const std::string & attribute_name) const override
-    {
-        return dict_struct.attributes[&getAttribute(attribute_name) - attributes.data()].injective;
-    }
-
-    DictionaryKeyType getKeyType() const override { return DictionaryKeyType::complex; }
-
-    ColumnPtr getColumn(
-        const std::string& attribute_name,
-        const DataTypePtr & result_type,
-        const Columns & key_columns,
-        const DataTypes & key_types,
-        const ColumnPtr default_values_column) const override;
-
-    ColumnUInt8::Ptr hasKeys(const Columns & key_columns, const DataTypes & key_types) const override;
-
-    BlockInputStreamPtr getBlockInputStream(const Names & column_names, size_t max_block_size) const override;
-
-private:
-    template <typename Value>
-    using ContainerType = HashMapWithSavedHash<StringRef, Value, StringRefHash>;
-
-    using NullableSet = HashSetWithSavedHash<StringRef, StringRefHash>;
-
-    struct Attribute final
-    {
-        AttributeUnderlyingType type;
-        bool is_nullable;
-        std::unique_ptr<NullableSet> nullable_set;
-
-        std::variant<
-            UInt8,
-            UInt16,
-            UInt32,
-            UInt64,
-            UInt128,
-            Int8,
-            Int16,
-            Int32,
-            Int64,
-            Decimal32,
-            Decimal64,
-            Decimal128,
-            Float32,
-            Float64,
-            StringRef>
-            null_values;
-        std::variant<
-            ContainerType<UInt8>,
-            ContainerType<UInt16>,
-            ContainerType<UInt32>,
-            ContainerType<UInt64>,
-            ContainerType<UInt128>,
-            ContainerType<Int8>,
-            ContainerType<Int16>,
-            ContainerType<Int32>,
-            ContainerType<Int64>,
-            ContainerType<Decimal32>,
-            ContainerType<Decimal64>,
-            ContainerType<Decimal128>,
-            ContainerType<Float32>,
-            ContainerType<Float64>,
-            ContainerType<StringRef>>
-            maps;
-        std::unique_ptr<Arena> string_arena;
-    };
-
-    void createAttributes();
-
-    void blockToAttributes(const Block & block);
-
-    void updateData();
-
-    void loadData();
-
-    template <typename T>
-    void addAttributeSize(const Attribute & attribute);
-
-    void calculateBytesAllocated();
-
-    template <typename T>
-    static void createAttributeImpl(Attribute & attribute, const Field & null_value);
-
-    static Attribute createAttribute(const DictionaryAttribute & attribute, const Field & null_value);
-
-    template <typename AttributeType, typename OutputType, typename ValueSetter, typename DefaultValueExtractor>
-    void getItemsImpl(
-        const Attribute & attribute,
-        const Columns & key_columns,
-        ValueSetter && set_value,
-        DefaultValueExtractor & default_value_extractor) const;
-
-    template <typename T>
-    static bool setAttributeValueImpl(Attribute & attribute, const StringRef key, const T value);
-
-    static bool setAttributeValue(Attribute & attribute, const StringRef key, const Field & value);
-
-    const Attribute & getAttribute(const std::string & attribute_name) const;
-
-    static StringRef placeKeysInPool(const size_t row, const Columns & key_columns, StringRefs & keys, Arena & pool);
-
-    template <typename T>
-    void has(const Attribute & attribute, const Columns & key_columns, PaddedPODArray<UInt8> & out) const;
-
-    std::vector<StringRef> getKeys() const;
-
-    template <typename T>
-    std::vector<StringRef> getKeys(const Attribute & attribute) const;
-
-    const DictionaryStructure dict_struct;
-    const DictionarySourcePtr source_ptr;
-    const DictionaryLifetime dict_lifetime;
-    const bool require_nonempty;
-    const std::string key_description{dict_struct.getKeyDescription()};
-
-    std::map<std::string, size_t> attribute_index_by_name;
-    std::vector<Attribute> attributes;
-    Arena keys_pool;
-
-    size_t bytes_allocated = 0;
-    size_t element_count = 0;
-    size_t bucket_count = 0;
-    mutable std::atomic<size_t> query_count{0};
-
-    BlockPtr saved_block;
-};
-
-}
diff --git a/src/Dictionaries/DictionaryBlockInputStream.cpp b/src/Dictionaries/DictionaryBlockInputStream.cpp
new file mode 100644
index 00000000000..433ff211831
--- /dev/null
+++ b/src/Dictionaries/DictionaryBlockInputStream.cpp
@@ -0,0 +1,200 @@
+#include "DictionaryBlockInputStream.h"
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+DictionaryBlockInputStream::DictionaryBlockInputStream(
+    std::shared_ptr<const IDictionary> dictionary_, UInt64 max_block_size_, PaddedPODArray<UInt64> && ids_, const Names & column_names_)
+    : DictionaryBlockInputStreamBase(ids_.size(), max_block_size_)
+    , dictionary(dictionary_)
+    , column_names(column_names_)
+    , ids(std::move(ids_))
+    , key_type(DictionaryInputStreamKeyType::Id)
+{
+}
+
+DictionaryBlockInputStream::DictionaryBlockInputStream(
+    std::shared_ptr<const IDictionary> dictionary_,
+    UInt64 max_block_size_,
+    const PaddedPODArray<StringRef> & keys,
+    const Names & column_names_)
+    : DictionaryBlockInputStreamBase(keys.size(), max_block_size_)
+    , dictionary(dictionary_)
+    , column_names(column_names_)
+    , key_type(DictionaryInputStreamKeyType::ComplexKey)
+{
+    const DictionaryStructure & dictionary_structure = dictionary->getStructure();
+    fillKeyColumns(keys, 0, keys.size(), dictionary_structure, key_columns);
+}
+
+DictionaryBlockInputStream::DictionaryBlockInputStream(
+    std::shared_ptr<const IDictionary> dictionary_,
+    UInt64 max_block_size_,
+    const Columns & data_columns_,
+    const Names & column_names_,
+    GetColumnsFunction && get_key_columns_function_,
+    GetColumnsFunction && get_view_columns_function_)
+    : DictionaryBlockInputStreamBase(data_columns_.front()->size(), max_block_size_)
+    , dictionary(dictionary_)
+    , column_names(column_names_)
+    , data_columns(data_columns_)
+    , get_key_columns_function(std::move(get_key_columns_function_))
+    , get_view_columns_function(std::move(get_view_columns_function_))
+    , key_type(DictionaryInputStreamKeyType::Callback)
+{
+}
+
+Block DictionaryBlockInputStream::getBlock(size_t start, size_t length) const
+{
+    /// TODO: Rewrite
+    switch (key_type)
+    {
+        case DictionaryInputStreamKeyType::ComplexKey:
+        {
+            Columns columns;
+            ColumnsWithTypeAndName view_columns;
+            columns.reserve(key_columns.size());
+            for (const auto & key_column : key_columns)
+            {
+                ColumnPtr column = key_column.column->cut(start, length);
+                columns.emplace_back(column);
+                view_columns.emplace_back(column, key_column.type, key_column.name);
+            }
+            return fillBlock({}, columns, {}, std::move(view_columns));
+        }
+
+        case DictionaryInputStreamKeyType::Id:
+        {
+            PaddedPODArray<UInt64> ids_to_fill(ids.begin() + start, ids.begin() + start + length);
+            return fillBlock(ids_to_fill, {}, {}, {});
+        }
+
+        case DictionaryInputStreamKeyType::Callback:
+        {
+            Columns columns;
+            columns.reserve(data_columns.size());
+            for (const auto & data_column : data_columns)
+                columns.push_back(data_column->cut(start, length));
+            const DictionaryStructure & dictionaty_structure = dictionary->getStructure();
+            const auto & attributes = *dictionaty_structure.key;
+            ColumnsWithTypeAndName keys_with_type_and_name = get_key_columns_function(columns, attributes);
+            ColumnsWithTypeAndName view_with_type_and_name = get_view_columns_function(columns, attributes);
+            DataTypes types;
+            columns.clear();
+            for (const auto & key_column : keys_with_type_and_name)
+            {
+                columns.push_back(key_column.column);
+                types.push_back(key_column.type);
+            }
+            return fillBlock({}, columns, types, std::move(view_with_type_and_name));
+        }
+    }
+
+    throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected DictionaryInputStreamKeyType.");
+}
+
+Block DictionaryBlockInputStream::fillBlock(
+    const PaddedPODArray<UInt64> & ids_to_fill,
+    const Columns & keys,
+    const DataTypes & types,
+    ColumnsWithTypeAndName && view) const
+{
+    std::unordered_set<std::string> names(column_names.begin(), column_names.end());
+
+    DataTypes data_types = types;
+    ColumnsWithTypeAndName block_columns;
+
+    data_types.reserve(keys.size());
+    const DictionaryStructure & dictionary_structure = dictionary->getStructure();
+    if (data_types.empty() && dictionary_structure.key)
+        for (const auto & key : *dictionary_structure.key)
+            data_types.push_back(key.type);
+
+    for (const auto & column : view)
+        if (names.find(column.name) != names.end())
+            block_columns.push_back(column);
+
+    const DictionaryStructure & structure = dictionary->getStructure();
+    ColumnPtr ids_column = getColumnFromIds(ids_to_fill);
+
+    if (structure.id && names.find(structure.id->name) != names.end())
+    {
+        block_columns.emplace_back(ids_column, std::make_shared<DataTypeUInt64>(), structure.id->name);
+    }
+
+    auto dictionary_key_type = dictionary->getKeyType();
+
+    for (const auto idx : ext::range(0, structure.attributes.size()))
+    {
+        const DictionaryAttribute & attribute = structure.attributes[idx];
+        if (names.find(attribute.name) != names.end())
+        {
+            ColumnPtr column;
+
+            if (dictionary_key_type == DictionaryKeyType::simple)
+            {
+                column = dictionary->getColumn(
+                    attribute.name,
+                    attribute.type,
+                    {ids_column},
+                    {std::make_shared<DataTypeUInt64>()},
+                    nullptr /* default_values_column */);
+            }
+            else
+            {
+                column = dictionary->getColumn(
+                    attribute.name,
+                    attribute.type,
+                    keys,
+                    data_types,
+                    nullptr /* default_values_column*/);
+            }
+
+            block_columns.emplace_back(column, attribute.type, attribute.name);
+        }
+    }
+
+    return Block(block_columns);
+}
+
+ColumnPtr DictionaryBlockInputStream::getColumnFromIds(const PaddedPODArray<UInt64> & ids_to_fill)
+{
+    auto column_vector = ColumnVector<UInt64>::create();
+    column_vector->getData().assign(ids_to_fill);
+    return column_vector;
+}
+
+void DictionaryBlockInputStream::fillKeyColumns(
+    const PaddedPODArray<StringRef> & keys,
+    size_t start,
+    size_t size,
+    const DictionaryStructure & dictionary_structure,
+    ColumnsWithTypeAndName & result)
+{
+    MutableColumns columns;
+    columns.reserve(dictionary_structure.key->size());
+
+    for (const DictionaryAttribute & attribute : *dictionary_structure.key)
+        columns.emplace_back(attribute.type->createColumn());
+
+    for (auto idx : ext::range(start, size))
+    {
+        const auto & key = keys[idx];
+        const auto *ptr = key.data;
+        for (auto & column : columns)
+            ptr = column->deserializeAndInsertFromArena(ptr);
+    }
+
+    for (size_t i = 0, num_columns = columns.size(); i < num_columns; ++i)
+    {
+        const auto & dictionary_attribute = (*dictionary_structure.key)[i];
+        result.emplace_back(ColumnWithTypeAndName{std::move(columns[i]), dictionary_attribute.type, dictionary_attribute.name});
+    }
+}
+
+}
diff --git a/src/Dictionaries/DictionaryBlockInputStream.h b/src/Dictionaries/DictionaryBlockInputStream.h
index f045d47c2c2..5197df411fa 100644
--- a/src/Dictionaries/DictionaryBlockInputStream.h
+++ b/src/Dictionaries/DictionaryBlockInputStream.h
@@ -16,26 +16,24 @@
 
 namespace DB
 {
-namespace ErrorCodes
-{
-    extern const int LOGICAL_ERROR;
-}
-
 
+/// TODO: Remove this class
 /* BlockInputStream implementation for external dictionaries
  * read() returns blocks consisting of the in-memory contents of the dictionaries
  */
-template <typename Key>
 class DictionaryBlockInputStream : public DictionaryBlockInputStreamBase
 {
 public:
     DictionaryBlockInputStream(
-        std::shared_ptr<const IDictionaryBase> dictionary, UInt64 max_block_size, PaddedPODArray<Key> && ids, const Names & column_names);
+        std::shared_ptr<const IDictionary> dictionary,
+        UInt64 max_block_size,
+        PaddedPODArray<UInt64> && ids,
+        const Names & column_names);
 
     DictionaryBlockInputStream(
-        std::shared_ptr<const IDictionaryBase> dictionary,
+        std::shared_ptr<const IDictionary> dictionary,
         UInt64 max_block_size,
-        const std::vector<StringRef> & keys,
+        const PaddedPODArray<StringRef> & keys,
         const Names & column_names);
 
     using GetColumnsFunction = std::function<ColumnsWithTypeAndName(const Columns &, const std::vector<DictionaryAttribute> & attributes)>;
@@ -45,7 +43,7 @@ public:
     // and get_view_columns_function to get key representation.
     // Now used in trie dictionary, where columns are stored as ip and mask, and are showed as string
     DictionaryBlockInputStream(
-        std::shared_ptr<const IDictionaryBase> dictionary,
+        std::shared_ptr<const IDictionary> dictionary,
         UInt64 max_block_size,
         const Columns & data_columns,
         const Names & column_names,
@@ -55,24 +53,27 @@ public:
     String getName() const override { return "Dictionary"; }
 
 protected:
-    Block getBlock(size_t start, size_t size) const override;
+    Block getBlock(size_t start, size_t length) const override;
 
 private:
-    Block
-    fillBlock(const PaddedPODArray<Key> & ids_to_fill, const Columns & keys, const DataTypes & types, ColumnsWithTypeAndName && view) const;
+    Block fillBlock(
+        const PaddedPODArray<UInt64> & ids_to_fill,
+        const Columns & keys,
+        const DataTypes & types,
+        ColumnsWithTypeAndName && view) const;
 
-    ColumnPtr getColumnFromIds(const PaddedPODArray<Key> & ids_to_fill) const;
+    static ColumnPtr getColumnFromIds(const PaddedPODArray<UInt64> & ids_to_fill);
 
-    void fillKeyColumns(
-        const std::vector<StringRef> & keys,
+    static void fillKeyColumns(
+        const PaddedPODArray<StringRef> & keys,
         size_t start,
         size_t size,
         const DictionaryStructure & dictionary_structure,
-        ColumnsWithTypeAndName & columns) const;
+        ColumnsWithTypeAndName & result);
 
-    std::shared_ptr<const IDictionaryBase> dictionary;
+    std::shared_ptr<const IDictionary> dictionary;
     Names column_names;
-    PaddedPODArray<Key> ids;
+    PaddedPODArray<UInt64> ids;
     ColumnsWithTypeAndName key_columns;
 
     Columns data_columns;
@@ -89,200 +90,4 @@ private:
     DictionaryInputStreamKeyType key_type;
 };
 
-
-template <typename Key>
-DictionaryBlockInputStream<Key>::DictionaryBlockInputStream(
-    std::shared_ptr<const IDictionaryBase> dictionary_, UInt64 max_block_size_, PaddedPODArray<Key> && ids_, const Names & column_names_)
-    : DictionaryBlockInputStreamBase(ids_.size(), max_block_size_)
-    , dictionary(dictionary_)
-    , column_names(column_names_)
-    , ids(std::move(ids_))
-    , key_type(DictionaryInputStreamKeyType::Id)
-{
-}
-
-template <typename Key>
-DictionaryBlockInputStream<Key>::DictionaryBlockInputStream(
-    std::shared_ptr<const IDictionaryBase> dictionary_,
-    UInt64 max_block_size_,
-    const std::vector<StringRef> & keys,
-    const Names & column_names_)
-    : DictionaryBlockInputStreamBase(keys.size(), max_block_size_)
-    , dictionary(dictionary_)
-    , column_names(column_names_)
-    , key_type(DictionaryInputStreamKeyType::ComplexKey)
-{
-    const DictionaryStructure & dictionary_structure = dictionary->getStructure();
-    fillKeyColumns(keys, 0, keys.size(), dictionary_structure, key_columns);
-}
-
-template <typename Key>
-DictionaryBlockInputStream<Key>::DictionaryBlockInputStream(
-    std::shared_ptr<const IDictionaryBase> dictionary_,
-    UInt64 max_block_size_,
-    const Columns & data_columns_,
-    const Names & column_names_,
-    GetColumnsFunction && get_key_columns_function_,
-    GetColumnsFunction && get_view_columns_function_)
-    : DictionaryBlockInputStreamBase(data_columns_.front()->size(), max_block_size_)
-    , dictionary(dictionary_)
-    , column_names(column_names_)
-    , data_columns(data_columns_)
-    , get_key_columns_function(std::move(get_key_columns_function_))
-    , get_view_columns_function(std::move(get_view_columns_function_))
-    , key_type(DictionaryInputStreamKeyType::Callback)
-{
-}
-
-
-template <typename Key>
-Block DictionaryBlockInputStream<Key>::getBlock(size_t start, size_t length) const
-{
-    /// TODO: Rewrite
-    switch (key_type)
-    {
-        case DictionaryInputStreamKeyType::ComplexKey:
-        {
-            Columns columns;
-            ColumnsWithTypeAndName view_columns;
-            columns.reserve(key_columns.size());
-            for (const auto & key_column : key_columns)
-            {
-                ColumnPtr column = key_column.column->cut(start, length);
-                columns.emplace_back(column);
-                view_columns.emplace_back(column, key_column.type, key_column.name);
-            }
-            return fillBlock({}, columns, {}, std::move(view_columns));
-        }
-
-        case DictionaryInputStreamKeyType::Id:
-        {
-            PaddedPODArray<Key> ids_to_fill(ids.begin() + start, ids.begin() + start + length);
-            return fillBlock(ids_to_fill, {}, {}, {});
-        }
-
-        case DictionaryInputStreamKeyType::Callback:
-        {
-            Columns columns;
-            columns.reserve(data_columns.size());
-            for (const auto & data_column : data_columns)
-                columns.push_back(data_column->cut(start, length));
-            const DictionaryStructure & dictionaty_structure = dictionary->getStructure();
-            const auto & attributes = *dictionaty_structure.key;
-            ColumnsWithTypeAndName keys_with_type_and_name = get_key_columns_function(columns, attributes);
-            ColumnsWithTypeAndName view_with_type_and_name = get_view_columns_function(columns, attributes);
-            DataTypes types;
-            columns.clear();
-            for (const auto & key_column : keys_with_type_and_name)
-            {
-                columns.push_back(key_column.column);
-                types.push_back(key_column.type);
-            }
-            return fillBlock({}, columns, types, std::move(view_with_type_and_name));
-        }
-    }
-
-    throw Exception("Unexpected DictionaryInputStreamKeyType.", ErrorCodes::LOGICAL_ERROR);
-}
-
-template <typename Key>
-Block DictionaryBlockInputStream<Key>::fillBlock(
-    const PaddedPODArray<Key> & ids_to_fill, const Columns & keys, const DataTypes & types, ColumnsWithTypeAndName && view) const
-{
-    std::unordered_set<std::string> names(column_names.begin(), column_names.end());
-
-    DataTypes data_types = types;
-    ColumnsWithTypeAndName block_columns;
-
-    data_types.reserve(keys.size());
-    const DictionaryStructure & dictionaty_structure = dictionary->getStructure();
-    if (data_types.empty() && dictionaty_structure.key)
-        for (const auto & key : *dictionaty_structure.key)
-            data_types.push_back(key.type);
-
-    for (const auto & column : view)
-        if (names.find(column.name) != names.end())
-            block_columns.push_back(column);
-
-    const DictionaryStructure & structure = dictionary->getStructure();
-    ColumnPtr ids_column = getColumnFromIds(ids_to_fill);
-
-    if (structure.id && names.find(structure.id->name) != names.end())
-    {
-        block_columns.emplace_back(ids_column, std::make_shared<DataTypeUInt64>(), structure.id->name);
-    }
-
-    auto dictionary_key_type = dictionary->getKeyType();
-
-    for (const auto idx : ext::range(0, structure.attributes.size()))
-    {
-        const DictionaryAttribute & attribute = structure.attributes[idx];
-        if (names.find(attribute.name) != names.end())
-        {
-            ColumnPtr column;
-
-            if (dictionary_key_type == DictionaryKeyType::simple)
-            {
-                column = dictionary->getColumn(
-                    attribute.name,
-                    attribute.type,
-                    {ids_column},
-                    {std::make_shared<DataTypeUInt64>()},
-                    nullptr /* default_values_column */);
-            }
-            else
-            {
-                column = dictionary->getColumn(
-                    attribute.name,
-                    attribute.type,
-                    keys,
-                    data_types,
-                    nullptr /* default_values_column*/);
-            }
-
-            block_columns.emplace_back(column, attribute.type, attribute.name);
-        }
-    }
-
-    return Block(block_columns);
-}
-
-template <typename Key>
-ColumnPtr DictionaryBlockInputStream<Key>::getColumnFromIds(const PaddedPODArray<Key> & ids_to_fill) const
-{
-    auto column_vector = ColumnVector<UInt64>::create();
-    column_vector->getData().reserve(ids_to_fill.size());
-    for (UInt64 id : ids_to_fill)
-        column_vector->insertValue(id);
-    return column_vector;
-}
-
-
-template <typename Key>
-void DictionaryBlockInputStream<Key>::fillKeyColumns(
-    const std::vector<StringRef> & keys,
-    size_t start,
-    size_t size,
-    const DictionaryStructure & dictionary_structure,
-    ColumnsWithTypeAndName & res) const
-{
-    MutableColumns columns;
-    columns.reserve(dictionary_structure.key->size());
-
-    for (const DictionaryAttribute & attribute : *dictionary_structure.key)
-        columns.emplace_back(attribute.type->createColumn());
-
-    for (auto idx : ext::range(start, size))
-    {
-        const auto & key = keys[idx];
-        auto ptr = key.data;
-        for (auto & column : columns)
-            ptr = column->deserializeAndInsertFromArena(ptr);
-    }
-
-    for (size_t i = 0, num_columns = columns.size(); i < num_columns; ++i)
-        res.emplace_back(
-            ColumnWithTypeAndName{std::move(columns[i]), (*dictionary_structure.key)[i].type, (*dictionary_structure.key)[i].name});
-}
-
 }
diff --git a/src/Dictionaries/DictionaryFactory.cpp b/src/Dictionaries/DictionaryFactory.cpp
index 0ab7d199186..413bbd4f967 100644
--- a/src/Dictionaries/DictionaryFactory.cpp
+++ b/src/Dictionaries/DictionaryFactory.cpp
@@ -20,7 +20,7 @@ namespace ErrorCodes
 void DictionaryFactory::registerLayout(const std::string & layout_type, Creator create_layout, bool is_complex)
 {
     if (!registered_layouts.emplace(layout_type, std::move(create_layout)).second)
-        throw Exception("DictionaryFactory: the layout name '" + layout_type + "' is not unique", ErrorCodes::LOGICAL_ERROR);
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "DictionaryFactory: the layout name '{}' is not unique", layout_type);
 
     layout_complexity[layout_type] = is_complex;
 
@@ -31,15 +31,16 @@ DictionaryPtr DictionaryFactory::create(
     const std::string & name,
     const Poco::Util::AbstractConfiguration & config,
     const std::string & config_prefix,
-    const Context & context,
+    ContextPtr context,
     bool check_source_config) const
 {
     Poco::Util::AbstractConfiguration::Keys keys;
     const auto & layout_prefix = config_prefix + ".layout";
     config.keys(layout_prefix, keys);
     if (keys.size() != 1)
-        throw Exception{name + ": element dictionary.layout should have exactly one child element",
-                        ErrorCodes::EXCESSIVE_ELEMENT_IN_CONFIG};
+        throw Exception(ErrorCodes::EXCESSIVE_ELEMENT_IN_CONFIG,
+            "{}: element dictionary.layout should have exactly one child element",
+            name);
 
     const DictionaryStructure dict_struct{config, config_prefix};
 
@@ -47,8 +48,8 @@ DictionaryPtr DictionaryFactory::create(
         name, config, config_prefix + ".source", dict_struct, context, config.getString(config_prefix + ".database", ""), check_source_config);
     LOG_TRACE(&Poco::Logger::get("DictionaryFactory"), "Created dictionary source '{}' for dictionary '{}'", source_ptr->toString(), name);
 
-    if (context.hasQueryContext() && context.getSettingsRef().log_queries)
-        context.getQueryContext().addQueryFactoriesInfo(Context::QueryLogFactories::Dictionary, name);
+    if (context->hasQueryContext() && context->getSettingsRef().log_queries)
+        context->getQueryContext()->addQueryFactoriesInfo(Context::QueryLogFactories::Dictionary, name);
 
     const auto & layout_type = keys.front();
 
@@ -61,10 +62,13 @@ DictionaryPtr DictionaryFactory::create(
         }
     }
 
-    throw Exception{name + ": unknown dictionary layout type: " + layout_type, ErrorCodes::UNKNOWN_ELEMENT_IN_CONFIG};
+    throw Exception(ErrorCodes::UNKNOWN_ELEMENT_IN_CONFIG,
+        "{}: unknown dictionary layout type: {}",
+        name,
+        layout_type);
 }
 
-DictionaryPtr DictionaryFactory::create(const std::string & name, const ASTCreateQuery & ast, const Context & context) const
+DictionaryPtr DictionaryFactory::create(const std::string & name, const ASTCreateQuery & ast, ContextPtr context) const
 {
     auto configuration = getDictionaryConfigurationFromAST(ast, context);
     return DictionaryFactory::create(name, *configuration, "dictionary", context, true);
@@ -77,7 +81,9 @@ bool DictionaryFactory::isComplex(const std::string & layout_type) const
     if (found != layout_complexity.end())
         return found->second;
 
-    throw Exception{"Unknown dictionary layout type: " + layout_type, ErrorCodes::UNKNOWN_ELEMENT_IN_CONFIG};
+    throw Exception(ErrorCodes::UNKNOWN_ELEMENT_IN_CONFIG,
+        "Unknown dictionary layout type: {}",
+        layout_type);
 }
 
 
diff --git a/src/Dictionaries/DictionaryFactory.h b/src/Dictionaries/DictionaryFactory.h
index 3d3f793e2b2..b869550a9af 100644
--- a/src/Dictionaries/DictionaryFactory.h
+++ b/src/Dictionaries/DictionaryFactory.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <Interpreters/Context_fwd.h>
 #include "IDictionary.h"
 #include "registerDictionaries.h"
 #include <Parsers/ASTCreateQuery.h>
@@ -21,8 +22,6 @@ class Logger;
 namespace DB
 {
 
-class Context;
-
 /** Create dictionary according to its layout.
   */
 class DictionaryFactory : private boost::noncopyable
@@ -37,13 +36,13 @@ public:
         const std::string & name,
         const Poco::Util::AbstractConfiguration & config,
         const std::string & config_prefix,
-        const Context & context,
+        ContextPtr context,
         bool check_source_config = false) const;
 
     /// Create dictionary from DDL-query
     DictionaryPtr create(const std::string & name,
         const ASTCreateQuery & ast,
-        const Context & context) const;
+        ContextPtr context) const;
 
     using Creator = std::function<DictionaryPtr(
         const std::string & name,
diff --git a/src/Dictionaries/DictionaryHelpers.h b/src/Dictionaries/DictionaryHelpers.h
index 0026d8848ca..e4406c9a22b 100644
--- a/src/Dictionaries/DictionaryHelpers.h
+++ b/src/Dictionaries/DictionaryHelpers.h
@@ -1,11 +1,16 @@
 #pragma once
 
+#include <Common/Arena.h>
+#include <Common/HashTable/HashMap.h>
 #include <Columns/IColumn.h>
 #include <Columns/ColumnDecimal.h>
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnVector.h>
+#include <DataStreams/IBlockInputStream.h>
 #include <DataTypes/DataTypesDecimal.h>
-#include "DictionaryStructure.h"
+#include <Core/Block.h>
+#include <Dictionaries/IDictionary.h>
+#include <Dictionaries/DictionaryStructure.h>
 
 namespace DB
 {
@@ -13,6 +18,202 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int TYPE_MISMATCH;
+    extern const int BAD_ARGUMENTS;
+}
+
+/** Simple helper for getting default.
+  * Initialized with default value and default values column.
+  * If default values column is not null default value is taken from column.
+  * If default value is null default value is taken from initializer.
+  */
+class DefaultValueProvider final
+{
+public:
+    explicit DefaultValueProvider(Field default_value_, ColumnPtr default_values_column_ = nullptr)
+        : default_value(std::move(default_value_))
+        , default_values_column(default_values_column_)
+    {
+    }
+
+    inline bool isConstant() const { return default_values_column == nullptr; }
+
+    Field getDefaultValue(size_t row) const
+    {
+        if (default_values_column)
+            return (*default_values_column)[row];
+
+        return default_value;
+    }
+
+private:
+    Field default_value;
+    ColumnPtr default_values_column;
+};
+
+/** Support class for dictionary storages.
+
+    The main idea is that during fetch we create all columns, but fill only columns that client requested.
+
+    We need to create other columns during fetch, because in case of serialized storage we can skip
+    unnecessary columns serialized in cache with skipSerializedInArena method.
+
+    When result is fetched from the storage client of storage can filterOnlyNecessaryColumns
+    and get only columns that match attributes_names_to_fetch.
+ */
+class DictionaryStorageFetchRequest
+{
+public:
+    DictionaryStorageFetchRequest(
+        const DictionaryStructure & structure,
+        const Strings & attributes_names_to_fetch,
+        DataTypes attributes_to_fetch_result_types,
+        Columns attributes_default_values_columns)
+        : attributes_to_fetch_names_set(attributes_names_to_fetch.begin(), attributes_names_to_fetch.end())
+        , attributes_to_fetch_filter(structure.attributes.size(), false)
+    {
+        assert(attributes_default_values_columns.size() == attributes_names_to_fetch.size());
+
+        if (attributes_to_fetch_names_set.size() != attributes_names_to_fetch.size())
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Attribute names to fetch should be unique");
+
+        size_t attributes_size = structure.attributes.size();
+        dictionary_attributes_types.reserve(attributes_size);
+        attributes_default_value_providers.reserve(attributes_to_fetch_names_set.size());
+
+        size_t attributes_to_fetch_index = 0;
+        for (size_t i = 0; i < attributes_size; ++i)
+        {
+            const auto & dictionary_attribute = structure.attributes[i];
+            const auto & name = dictionary_attribute.name;
+            const auto & type = dictionary_attribute.type;
+            dictionary_attributes_types.emplace_back(type);
+
+            if (attributes_to_fetch_names_set.find(name) != attributes_to_fetch_names_set.end())
+            {
+                attributes_to_fetch_filter[i] = true;
+                auto & attribute_to_fetch_result_type = attributes_to_fetch_result_types[attributes_to_fetch_index];
+
+                if (!attribute_to_fetch_result_type->equals(*type))
+                    throw Exception(ErrorCodes::TYPE_MISMATCH,
+                    "Attribute type does not match, expected ({}), found ({})",
+                    attribute_to_fetch_result_type->getName(),
+                    type->getName());
+
+                attributes_default_value_providers.emplace_back(dictionary_attribute.null_value, attributes_default_values_columns[attributes_to_fetch_index]);
+                ++attributes_to_fetch_index;
+            }
+            else
+                attributes_default_value_providers.emplace_back(dictionary_attribute.null_value);
+        }
+    }
+
+    DictionaryStorageFetchRequest() = default;
+
+    /// Check requested attributes size
+    ALWAYS_INLINE size_t attributesSize() const
+    {
+        return dictionary_attributes_types.size();
+    }
+
+    /// Check if attribute with attribute_name was requested to fetch
+    ALWAYS_INLINE bool containsAttribute(const String & attribute_name) const
+    {
+        return attributes_to_fetch_names_set.find(attribute_name) != attributes_to_fetch_names_set.end();
+    }
+
+    /// Check if attribute with attribute_index should be filled during fetch
+    ALWAYS_INLINE bool shouldFillResultColumnWithIndex(size_t attribute_index) const
+    {
+        return attributes_to_fetch_filter[attribute_index];
+    }
+
+    const DataTypePtr & dataTypeAtIndex(size_t attribute_index) const
+    {
+        return dictionary_attributes_types[attribute_index];
+    }
+
+    const DefaultValueProvider & defaultValueProviderAtIndex(size_t attribute_index) const
+    {
+        return attributes_default_value_providers[attribute_index];
+    }
+
+    /// Create columns for each of dictionary attributes
+    MutableColumns makeAttributesResultColumns() const
+    {
+        MutableColumns result;
+        result.reserve(dictionary_attributes_types.size());
+
+        for (const auto & type : dictionary_attributes_types)
+            result.emplace_back(type->createColumn());
+
+        return result;
+    }
+
+    Columns makeAttributesResultColumnsNonMutable() const
+    {
+        Columns result;
+        result.reserve(dictionary_attributes_types.size());
+
+        for (const auto & type : dictionary_attributes_types)
+            result.emplace_back(type->createColumn());
+
+        return result;
+    }
+
+    /// Filter only requested columns
+    Columns filterRequestedColumns(MutableColumns & fetched_mutable_columns) const
+    {
+        Columns result;
+        result.reserve(dictionary_attributes_types.size());
+
+        for (size_t fetch_request_index = 0; fetch_request_index < dictionary_attributes_types.size(); ++fetch_request_index)
+            if (shouldFillResultColumnWithIndex(fetch_request_index))
+                result.emplace_back(std::move(fetched_mutable_columns[fetch_request_index]));
+
+        return result;
+    }
+private:
+    std::unordered_set<String> attributes_to_fetch_names_set;
+    std::vector<bool> attributes_to_fetch_filter;
+    std::vector<DefaultValueProvider> attributes_default_value_providers;
+    DataTypes dictionary_attributes_types;
+};
+
+static inline void insertDefaultValuesIntoColumns(
+    MutableColumns & columns,
+    const DictionaryStorageFetchRequest & fetch_request,
+    size_t row_index)
+{
+    size_t columns_size = columns.size();
+
+    for (size_t column_index = 0; column_index < columns_size; ++column_index)
+    {
+        const auto & column = columns[column_index];
+        const auto & default_value_provider = fetch_request.defaultValueProviderAtIndex(column_index);
+
+        if (fetch_request.shouldFillResultColumnWithIndex(column_index))
+            column->insert(default_value_provider.getDefaultValue(row_index));
+    }
+}
+
+/// Deserialize column value and insert it in columns.
+/// Skip unnecessary columns that were not requested from deserialization.
+static inline void deserializeAndInsertIntoColumns(
+    MutableColumns & columns,
+    const DictionaryStorageFetchRequest & fetch_request,
+    const char * place_for_serialized_columns)
+{
+    size_t columns_size = columns.size();
+
+    for (size_t column_index = 0; column_index < columns_size; ++column_index)
+    {
+        const auto & column = columns[column_index];
+
+        if (fetch_request.shouldFillResultColumnWithIndex(column_index))
+            place_for_serialized_columns = column->deserializeAndInsertFromArena(place_for_serialized_columns);
+        else
+            place_for_serialized_columns = column->skipSerializedInArena(place_for_serialized_columns);
+    }
 }
 
 /**
@@ -50,7 +251,7 @@ public:
         else if constexpr (IsNumber<DictionaryAttributeType>)
             return ColumnType::create(size);
         else
-            throw Exception{"Unsupported attribute type.", ErrorCodes::TYPE_MISMATCH};
+            throw Exception(ErrorCodes::TYPE_MISMATCH, "Unsupported attribute type.");
     }
 };
 
@@ -69,7 +270,7 @@ class DictionaryDefaultValueExtractor
 public:
     using DefaultValueType = DictionaryValueType<DictionaryAttributeType>;
 
-    DictionaryDefaultValueExtractor(DictionaryAttributeType attribute_default_value, ColumnPtr default_values_column_ = nullptr)
+    explicit DictionaryDefaultValueExtractor(DictionaryAttributeType attribute_default_value, ColumnPtr default_values_column_ = nullptr)
         : default_value(std::move(attribute_default_value))
     {
         if (default_values_column_ == nullptr)
@@ -87,7 +288,7 @@ public:
                 use_default_value_from_column = false;
             }
             else
-                throw Exception{"Type of default column is not the same as dictionary attribute type.", ErrorCodes::TYPE_MISMATCH};
+                throw Exception(ErrorCodes::TYPE_MISMATCH, "Type of default column is not the same as dictionary attribute type.");
         }
     }
 
@@ -109,14 +310,235 @@ private:
     bool use_default_value_from_column = false;
 };
 
+template <DictionaryKeyType key_type>
+class DictionaryKeysArenaHolder;
+
+template <>
+class DictionaryKeysArenaHolder<DictionaryKeyType::simple>
+{
+public:
+    static Arena * getComplexKeyArena() { return nullptr; }
+};
+
+template <>
+class DictionaryKeysArenaHolder<DictionaryKeyType::complex>
+{
+public:
+
+    Arena * getComplexKeyArena() { return &complex_key_arena; }
+
+private:
+    Arena complex_key_arena;
+};
+
+
+template <DictionaryKeyType key_type>
+class DictionaryKeysExtractor
+{
+public:
+    using KeyType = std::conditional_t<key_type == DictionaryKeyType::simple, UInt64, StringRef>;
+    static_assert(key_type != DictionaryKeyType::range, "Range key type is not supported by DictionaryKeysExtractor");
+
+    explicit DictionaryKeysExtractor(const Columns & key_columns_, Arena * complex_key_arena_)
+        : key_columns(key_columns_)
+        , complex_key_arena(complex_key_arena_)
+    {
+        assert(!key_columns.empty());
+
+        if constexpr (key_type == DictionaryKeyType::simple)
+        {
+            key_columns[0] = key_columns[0]->convertToFullColumnIfConst();
+
+            const auto * vector_col = checkAndGetColumn<ColumnVector<UInt64>>(key_columns[0].get());
+            if (!vector_col)
+                throw Exception(ErrorCodes::TYPE_MISMATCH, "Column type mismatch for simple key expected UInt64");
+        }
+
+        keys_size = key_columns.front()->size();
+    }
+
+    inline size_t getKeysSize() const
+    {
+        return keys_size;
+    }
+
+    inline size_t getCurrentKeyIndex() const
+    {
+        return current_key_index;
+    }
+
+    inline KeyType extractCurrentKey()
+    {
+        assert(current_key_index < keys_size);
+
+        if constexpr (key_type == DictionaryKeyType::simple)
+        {
+            const auto & column_vector = static_cast<const ColumnVector<UInt64> &>(*key_columns[0]);
+            const auto & data = column_vector.getData();
+
+            auto key = data[current_key_index];
+            ++current_key_index;
+            return key;
+        }
+        else
+        {
+            size_t allocated_size_for_columns = 0;
+            const char * block_start = nullptr;
+
+            for (const auto & column : key_columns)
+            {
+                StringRef serialized_data = column->serializeValueIntoArena(current_key_index, *complex_key_arena, block_start);
+                allocated_size_for_columns += serialized_data.size;
+            }
+
+            ++current_key_index;
+            current_complex_key = StringRef{block_start, allocated_size_for_columns};
+            return  current_complex_key;
+        }
+    }
+
+    void rollbackCurrentKey() const
+    {
+        if constexpr (key_type == DictionaryKeyType::complex)
+            complex_key_arena->rollback(current_complex_key.size);
+    }
+
+    PaddedPODArray<KeyType> extractAllKeys()
+    {
+        PaddedPODArray<KeyType> result;
+        result.reserve(keys_size - current_key_index);
+
+        for (; current_key_index < keys_size;)
+        {
+            auto value = extractCurrentKey();
+            result.emplace_back(value);
+        }
+
+        return result;
+    }
+
+    void reset()
+    {
+        current_key_index = 0;
+    }
+private:
+    Columns key_columns;
+
+    size_t keys_size = 0;
+    size_t current_key_index = 0;
+
+    KeyType current_complex_key {};
+    Arena * complex_key_arena;
+};
+
+/** Merge block with blocks from stream. If there are duplicate keys in block they are filtered out.
+  * In result block_to_update will be merged with blocks from stream.
+  * Note: readPrefix readImpl readSuffix will be called on stream object during function execution.
+  */
+template <DictionaryKeyType dictionary_key_type>
+void mergeBlockWithStream(
+    size_t key_column_size [[maybe_unused]],
+    Block & block_to_update [[maybe_unused]],
+    BlockInputStreamPtr & stream [[maybe_unused]])
+{
+    using KeyType = std::conditional_t<dictionary_key_type == DictionaryKeyType::simple, UInt64, StringRef>;
+    static_assert(dictionary_key_type != DictionaryKeyType::range, "Range key type is not supported by updatePreviousyLoadedBlockWithStream");
+
+    Columns saved_block_key_columns;
+    saved_block_key_columns.reserve(key_column_size);
+
+    /// Split into keys columns and attribute columns
+    for (size_t i = 0; i < key_column_size; ++i)
+        saved_block_key_columns.emplace_back(block_to_update.safeGetByPosition(i).column);
+
+    DictionaryKeysArenaHolder<dictionary_key_type> arena_holder;
+    DictionaryKeysExtractor<dictionary_key_type> saved_keys_extractor(saved_block_key_columns, arena_holder.getComplexKeyArena());
+    auto saved_keys_extracted_from_block = saved_keys_extractor.extractAllKeys();
+
+    IColumn::Filter filter(saved_keys_extracted_from_block.size(), true);
+
+    HashMap<KeyType, size_t> saved_key_to_index;
+    saved_key_to_index.reserve(saved_keys_extracted_from_block.size());
+
+    size_t indexes_to_remove_count = 0;
+
+    for (size_t i = 0; i < saved_keys_extracted_from_block.size(); ++i)
+    {
+        auto saved_key = saved_keys_extracted_from_block[i];
+        auto [it, was_inserted] = saved_key_to_index.insert(makePairNoInit(saved_key, i));
+
+        if (!was_inserted)
+        {
+            size_t index_to_remove = it->getMapped();
+            filter[index_to_remove] = false;
+            it->getMapped() = i;
+            ++indexes_to_remove_count;
+        }
+    }
+
+    auto result_fetched_columns = block_to_update.cloneEmptyColumns();
+
+    stream->readPrefix();
+
+    while (Block block = stream->read())
+    {
+        Columns block_key_columns;
+        block_key_columns.reserve(key_column_size);
+
+        /// Split into keys columns and attribute columns
+        for (size_t i = 0; i < key_column_size; ++i)
+            block_key_columns.emplace_back(block.safeGetByPosition(i).column);
+
+        DictionaryKeysExtractor<dictionary_key_type> update_keys_extractor(block_key_columns, arena_holder.getComplexKeyArena());
+        PaddedPODArray<KeyType> update_keys = update_keys_extractor.extractAllKeys();
+
+        for (auto update_key : update_keys)
+        {
+            const auto * it = saved_key_to_index.find(update_key);
+            if (it != nullptr)
+            {
+                size_t index_to_filter = it->getMapped();
+                filter[index_to_filter] = false;
+                ++indexes_to_remove_count;
+            }
+        }
+
+        size_t rows = block.rows();
+
+        for (size_t column_index = 0; column_index < block.columns(); ++column_index)
+        {
+            const auto update_column = block.safeGetByPosition(column_index).column;
+            MutableColumnPtr & result_fetched_column = result_fetched_columns[column_index];
+
+            result_fetched_column->insertRangeFrom(*update_column, 0, rows);
+        }
+    }
+
+    stream->readSuffix();
+
+    size_t result_fetched_rows = result_fetched_columns.front()->size();
+    size_t filter_hint = filter.size() - indexes_to_remove_count;
+
+    for (size_t column_index = 0; column_index < block_to_update.columns(); ++column_index)
+    {
+        auto & column = block_to_update.getByPosition(column_index).column;
+        column = column->filter(filter, filter_hint);
+
+        MutableColumnPtr mutable_column = column->assumeMutable();
+        const IColumn & fetched_column = *result_fetched_columns[column_index];
+        mutable_column->insertRangeFrom(fetched_column, 0, result_fetched_rows);
+    }
+}
+
 /**
  * Returns ColumnVector data as PaddedPodArray.
 
  * If column is constant parameter backup_storage is used to store values.
  */
+/// TODO: Remove
 template <typename T>
 static const PaddedPODArray<T> & getColumnVectorData(
-    const IDictionaryBase * dictionary,
+    const IDictionary * dictionary,
     const ColumnPtr column,
     PaddedPODArray<T> & backup_storage)
 {
@@ -126,10 +548,10 @@ static const PaddedPODArray<T> & getColumnVectorData(
 
     if (!vector_col)
     {
-        throw Exception{ErrorCodes::TYPE_MISMATCH,
+        throw Exception(ErrorCodes::TYPE_MISMATCH,
             "{}: type mismatch: column has wrong type expected {}",
             dictionary->getDictionaryID().getNameForLogs(),
-            TypeName<T>::get()};
+            TypeName<T>::get());
     }
 
     if (is_const_column)
diff --git a/src/Dictionaries/DictionarySourceFactory.cpp b/src/Dictionaries/DictionarySourceFactory.cpp
index af3552364ba..50ba6405074 100644
--- a/src/Dictionaries/DictionarySourceFactory.cpp
+++ b/src/Dictionaries/DictionarySourceFactory.cpp
@@ -71,7 +71,7 @@ DictionarySourceFactory::DictionarySourceFactory() : log(&Poco::Logger::get("Dic
 void DictionarySourceFactory::registerSource(const std::string & source_type, Creator create_source)
 {
     if (!registered_sources.emplace(source_type, std::move(create_source)).second)
-        throw Exception("DictionarySourceFactory: the source name '" + source_type + "' is not unique", ErrorCodes::LOGICAL_ERROR);
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "DictionarySourceFactory: the source name '{}' is not unique", source_type);
 }
 
 DictionarySourcePtr DictionarySourceFactory::create(
@@ -79,7 +79,7 @@ DictionarySourcePtr DictionarySourceFactory::create(
     const Poco::Util::AbstractConfiguration & config,
     const std::string & config_prefix,
     const DictionaryStructure & dict_struct,
-    const Context & context,
+    ContextPtr context,
     const std::string & default_database,
     bool check_config) const
 {
@@ -87,8 +87,9 @@ DictionarySourcePtr DictionarySourceFactory::create(
     config.keys(config_prefix, keys);
 
     if (keys.empty() || keys.size() > 2)
-        throw Exception{name + ": element dictionary.source should have one or two child elements",
-                        ErrorCodes::EXCESSIVE_ELEMENT_IN_CONFIG};
+        throw Exception(ErrorCodes::EXCESSIVE_ELEMENT_IN_CONFIG,
+            "{}: element dictionary.source should have one or two child elements",
+            name);
 
     const std::string & source_type = keys.front() == "settings" ? keys.back() : keys.front();
 
@@ -100,7 +101,10 @@ DictionarySourcePtr DictionarySourceFactory::create(
         return create_source(dict_struct, config, config_prefix, sample_block, context, default_database, check_config);
     }
 
-    throw Exception{name + ": unknown dictionary source type: " + source_type, ErrorCodes::UNKNOWN_ELEMENT_IN_CONFIG};
+    throw Exception(ErrorCodes::UNKNOWN_ELEMENT_IN_CONFIG,
+        "{}: unknown dictionary source type: {}",
+        name,
+        source_type);
 }
 
 DictionarySourceFactory & DictionarySourceFactory::instance()
diff --git a/src/Dictionaries/DictionarySourceFactory.h b/src/Dictionaries/DictionarySourceFactory.h
index 1406660dfb4..bb583927ac4 100644
--- a/src/Dictionaries/DictionarySourceFactory.h
+++ b/src/Dictionaries/DictionarySourceFactory.h
@@ -2,6 +2,7 @@
 
 #include "IDictionarySource.h"
 #include <Core/Block.h>
+#include <Interpreters/Context_fwd.h>
 
 #include <unordered_map>
 
@@ -17,7 +18,7 @@ class Logger;
 
 namespace DB
 {
-class Context;
+
 struct DictionaryStructure;
 
 /// creates IDictionarySource instance from config and DictionaryStructure
@@ -34,7 +35,7 @@ public:
         const Poco::Util::AbstractConfiguration & config,
         const std::string & config_prefix,
         Block & sample_block,
-        const Context & context,
+        ContextPtr context,
         const std::string & default_database,
         bool check_config)>;
 
@@ -47,7 +48,7 @@ public:
         const Poco::Util::AbstractConfiguration & config,
         const std::string & config_prefix,
         const DictionaryStructure & dict_struct,
-        const Context & context,
+        ContextPtr context,
         const std::string & default_database,
         bool check_config) const;
 
diff --git a/src/Dictionaries/DictionarySourceHelpers.cpp b/src/Dictionaries/DictionarySourceHelpers.cpp
index 2a872672aff..e175c6c3eae 100644
--- a/src/Dictionaries/DictionarySourceHelpers.cpp
+++ b/src/Dictionaries/DictionarySourceHelpers.cpp
@@ -13,6 +13,11 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+    extern const int SIZES_OF_COLUMNS_DOESNT_MATCH;
+}
+
 void formatBlock(BlockOutputStreamPtr & out, const Block & block)
 {
     out->writePrefix();
@@ -62,12 +67,12 @@ Block blockForKeys(
     return block;
 }
 
-Context copyContextAndApplySettings(
+ContextPtr copyContextAndApplySettings(
     const std::string & config_prefix,
-    const Context & context,
+    ContextPtr context,
     const Poco::Util::AbstractConfiguration & config)
 {
-    Context local_context(context);
+    auto local_context = Context::createCopy(context);
     if (config.has(config_prefix + ".settings"))
     {
         const auto prefix = config_prefix + ".settings";
@@ -83,9 +88,67 @@ Context copyContextAndApplySettings(
             changes.emplace_back(key, value);
         }
 
-        local_context.applySettingsChanges(changes);
+        local_context->applySettingsChanges(changes);
     }
     return local_context;
 }
 
+
+BlockInputStreamWithAdditionalColumns::BlockInputStreamWithAdditionalColumns(
+    Block block_to_add_, std::unique_ptr<IBlockInputStream> && stream_)
+    : block_to_add(std::move(block_to_add_))
+    , stream(std::move(stream_))
+{
+}
+
+Block BlockInputStreamWithAdditionalColumns::getHeader() const
+{
+    auto header = stream->getHeader();
+
+    if (header)
+    {
+        for (Int64 i = static_cast<Int64>(block_to_add.columns() - 1); i >= 0; --i)
+            header.insert(0, block_to_add.getByPosition(i).cloneEmpty());
+    }
+
+    return header;
+}
+
+Block BlockInputStreamWithAdditionalColumns::readImpl()
+{
+    auto block = stream->read();
+
+    if (block)
+    {
+        auto block_rows = block.rows();
+
+        auto cut_block = block_to_add.cloneWithCutColumns(current_range_index, block_rows);
+
+        if (cut_block.rows() != block_rows)
+            throw Exception(ErrorCodes::SIZES_OF_COLUMNS_DOESNT_MATCH,
+                "Number of rows in block to add after cut must equal to number of rows in block from inner stream");
+
+        for (Int64 i = static_cast<Int64>(cut_block.columns() - 1); i >= 0; --i)
+            block.insert(0, cut_block.getByPosition(i));
+
+        current_range_index += block_rows;
+    }
+
+    return block;
+}
+
+void BlockInputStreamWithAdditionalColumns::readPrefix()
+{
+    stream->readPrefix();
+}
+
+void BlockInputStreamWithAdditionalColumns::readSuffix()
+{
+    stream->readSuffix();
+}
+
+String BlockInputStreamWithAdditionalColumns::getName() const
+{
+    return "BlockInputStreamWithAdditionalColumns";
+}
 }
diff --git a/src/Dictionaries/DictionarySourceHelpers.h b/src/Dictionaries/DictionarySourceHelpers.h
index cad5441c66e..1febf921e07 100644
--- a/src/Dictionaries/DictionarySourceHelpers.h
+++ b/src/Dictionaries/DictionarySourceHelpers.h
@@ -6,17 +6,18 @@
 
 #include <Poco/File.h>
 #include <Poco/Util/AbstractConfiguration.h>
-
+#include <DataStreams/IBlockInputStream.h>
 #include <Columns/IColumn.h>
 #include <Core/Block.h>
+#include <Interpreters/Context_fwd.h>
 
 namespace DB
 {
+
 class IBlockOutputStream;
 using BlockOutputStreamPtr = std::shared_ptr<IBlockOutputStream>;
 
 struct DictionaryStructure;
-class Context;
 
 /// Write keys to block output stream.
 
@@ -36,14 +37,39 @@ Block blockForKeys(
     const std::vector<size_t> & requested_rows);
 
 /// Used for applying settings to copied context in some register[...]Source functions
-Context copyContextAndApplySettings(
+ContextPtr copyContextAndApplySettings(
     const std::string & config_prefix,
-    const Context & context,
+    ContextPtr context,
     const Poco::Util::AbstractConfiguration & config);
 
 void applySettingsToContext(
     const std::string & config_prefix,
-    Context & context,
+    ContextPtr context,
     const Poco::Util::AbstractConfiguration & config);
 
+/** A stream, adds additional columns to each block that it will read from inner stream.
+     *
+     *  block_to_add rows size must be equal to final sum rows size of all inner stream blocks.
+     */
+class BlockInputStreamWithAdditionalColumns final : public IBlockInputStream
+{
+public:
+    BlockInputStreamWithAdditionalColumns(Block block_to_add_, std::unique_ptr<IBlockInputStream> && stream_);
+
+    Block getHeader() const override;
+
+    Block readImpl() override;
+
+    void readPrefix() override;
+
+    void readSuffix() override;
+
+    String getName() const override;
+
+private:
+    Block block_to_add;
+    std::unique_ptr<IBlockInputStream> stream;
+    size_t current_range_index = 0;
+};
+
 }
diff --git a/src/Dictionaries/DictionaryStructure.cpp b/src/Dictionaries/DictionaryStructure.cpp
index 408e4803b1b..dd53e31041b 100644
--- a/src/Dictionaries/DictionaryStructure.cpp
+++ b/src/Dictionaries/DictionaryStructure.cpp
@@ -33,7 +33,7 @@ namespace
         const auto expression = config.getString(config_prefix + ".expression", "");
 
         if (name.empty() && !expression.empty())
-            throw Exception{"Element " + config_prefix + ".name is empty", ErrorCodes::BAD_ARGUMENTS};
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Element {}.name is empty");
 
         const auto type_name = config.getString(config_prefix + ".type", default_type);
         return DictionaryTypedSpecialAttribute{std::move(name), std::move(expression), DataTypeFactory::instance().get(type_name)};
@@ -65,6 +65,7 @@ AttributeUnderlyingType getAttributeUnderlyingType(const DataTypePtr & type)
         case TypeIndex::Decimal32:      return AttributeUnderlyingType::utDecimal32;
         case TypeIndex::Decimal64:      return AttributeUnderlyingType::utDecimal64;
         case TypeIndex::Decimal128:     return AttributeUnderlyingType::utDecimal128;
+        case TypeIndex::Decimal256:     return AttributeUnderlyingType::utDecimal256;
 
         case TypeIndex::Date:           return AttributeUnderlyingType::utUInt16;
         case TypeIndex::DateTime:       return AttributeUnderlyingType::utUInt32;
@@ -81,11 +82,11 @@ AttributeUnderlyingType getAttributeUnderlyingType(const DataTypePtr & type)
         default: break;
     }
 
-    throw Exception{"Unknown type for dictionary" + type->getName(), ErrorCodes::UNKNOWN_TYPE};
+    throw Exception(ErrorCodes::UNKNOWN_TYPE, "Unknown type {} for dictionary attribute", type->getName());
 }
 
 
-std::string toString(const AttributeUnderlyingType type)
+std::string toString(AttributeUnderlyingType type)
 {
     switch (type)
     {
@@ -117,11 +118,13 @@ std::string toString(const AttributeUnderlyingType type)
             return "Decimal64";
         case AttributeUnderlyingType::utDecimal128:
             return "Decimal128";
+        case AttributeUnderlyingType::utDecimal256:
+            return "Decimal256";
         case AttributeUnderlyingType::utString:
             return "String";
     }
 
-    throw Exception{"Unknown attribute_type " + toString(static_cast<int>(type)), ErrorCodes::ARGUMENT_OUT_OF_BOUND};
+    throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND, "Unknown dictionary attribute type {}", toString(static_cast<int>(type)));
 }
 
 
@@ -129,7 +132,7 @@ DictionarySpecialAttribute::DictionarySpecialAttribute(const Poco::Util::Abstrac
     : name{config.getString(config_prefix + ".name", "")}, expression{config.getString(config_prefix + ".expression", "")}
 {
     if (name.empty() && !expression.empty())
-        throw Exception{"Element " + config_prefix + ".name is empty", ErrorCodes::BAD_ARGUMENTS};
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Element {}.name is empty", config_prefix);
 }
 
 
@@ -141,23 +144,23 @@ DictionaryStructure::DictionaryStructure(const Poco::Util::AbstractConfiguration
     const auto has_key = config.has(structure_prefix + ".key");
 
     if (has_key && has_id)
-        throw Exception{"Only one of 'id' and 'key' should be specified", ErrorCodes::BAD_ARGUMENTS};
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Only one of 'id' and 'key' should be specified");
 
     if (has_id)
         id.emplace(config, structure_prefix + ".id");
     else if (has_key)
     {
-        key.emplace(getAttributes(config, structure_prefix + ".key", false, false));
+        key.emplace(getAttributes(config, structure_prefix + ".key", true));
         if (key->empty())
-            throw Exception{"Empty 'key' supplied", ErrorCodes::BAD_ARGUMENTS};
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Empty 'key' supplied");
     }
     else
-        throw Exception{"Dictionary structure should specify either 'id' or 'key'", ErrorCodes::BAD_ARGUMENTS};
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Dictionary structure should specify either 'id' or 'key'");
 
     if (id)
     {
         if (id->name.empty())
-            throw Exception{"'id' cannot be empty", ErrorCodes::BAD_ARGUMENTS};
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "'id' cannot be empty");
 
         const char * range_default_type = "Date";
         if (config.has(structure_prefix + ".range_min"))
@@ -168,38 +171,57 @@ DictionaryStructure::DictionaryStructure(const Poco::Util::AbstractConfiguration
 
         if (range_min.has_value() != range_max.has_value())
         {
-            throw Exception{"Dictionary structure should have both 'range_min' and 'range_max' either specified or not.",
-                            ErrorCodes::BAD_ARGUMENTS};
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                "Dictionary structure should have both 'range_min' and 'range_max' either specified or not.");
         }
 
         if (range_min && range_max && !range_min->type->equals(*range_max->type))
         {
-            throw Exception{"Dictionary structure 'range_min' and 'range_max' should have same type, "
-                            "'range_min' type: "
-                                + range_min->type->getName()
-                                + ", "
-                                  "'range_max' type: "
-                                + range_max->type->getName(),
-                            ErrorCodes::BAD_ARGUMENTS};
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                "Dictionary structure 'range_min' and 'range_max' should have same type, "
+                "'range_min' type: {},"
+                "'range_max' type: {}",
+                range_min->type->getName(),
+                range_max->type->getName());
         }
 
         if (range_min)
         {
             if (!range_min->type->isValueRepresentedByInteger())
-                throw Exception{"Dictionary structure type of 'range_min' and 'range_max' should be an integer, Date, DateTime, or Enum."
-                                " Actual 'range_min' and 'range_max' type is "
-                                    + range_min->type->getName(),
-                                ErrorCodes::BAD_ARGUMENTS};
+                throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                    "Dictionary structure type of 'range_min' and 'range_max' should be an integer, Date, DateTime, or Enum."
+                    " Actual 'range_min' and 'range_max' type is {}",
+                    range_min->type->getName());
         }
 
         if (!id->expression.empty() || (range_min && !range_min->expression.empty()) || (range_max && !range_max->expression.empty()))
             has_expressions = true;
     }
 
-    attributes = getAttributes(config, structure_prefix);
+    attributes = getAttributes(config, structure_prefix, false);
+
+    for (size_t i = 0; i < attributes.size(); ++i)
+    {
+        const auto & attribute = attributes[i];
+        const auto & attribute_name = attribute.name;
+        attribute_name_to_index[attribute_name] = i;
+
+        if (attribute.hierarchical)
+        {
+            if (id && attribute.underlying_type != AttributeUnderlyingType::utUInt64)
+                throw Exception(ErrorCodes::TYPE_MISMATCH,
+                    "Hierarchical attribute type for dictionary with simple key must be UInt64. Actual {}",
+                    toString(attribute.underlying_type));
+
+            else if (key)
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Dictionary with complex key does not support hierarchy");
+
+            hierarchical_attribute_index = i;
+        }
+    }
 
     if (attributes.empty())
-        throw Exception{"Dictionary has no attributes defined", ErrorCodes::BAD_ARGUMENTS};
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Dictionary has no attributes defined");
 
     if (config.getBool(config_prefix + ".layout.ip_trie.access_to_key_from_attributes", false))
         access_to_key_from_attributes = true;
@@ -209,7 +231,7 @@ DictionaryStructure::DictionaryStructure(const Poco::Util::AbstractConfiguration
 void DictionaryStructure::validateKeyTypes(const DataTypes & key_types) const
 {
     if (key_types.size() != key->size())
-        throw Exception{"Key structure does not match, expected " + getKeyDescription(), ErrorCodes::TYPE_MISMATCH};
+        throw Exception(ErrorCodes::TYPE_MISMATCH, "Key structure does not match, expected {}", getKeyDescription());
 
     for (const auto i : ext::range(0, key_types.size()))
     {
@@ -217,40 +239,55 @@ void DictionaryStructure::validateKeyTypes(const DataTypes & key_types) const
         const auto & actual_type = key_types[i];
 
         if (!areTypesEqual(expected_type, actual_type))
-            throw Exception{"Key type at position " + std::to_string(i) + " does not match, expected " + expected_type->getName() + ", found "
-                    + actual_type->getName(),
-                ErrorCodes::TYPE_MISMATCH};
+            throw Exception(ErrorCodes::TYPE_MISMATCH,
+            "Key type at position {} does not match, expected {}, found {}",
+            std::to_string(i),
+            expected_type->getName(),
+            actual_type->getName());
     }
 }
 
-const DictionaryAttribute & DictionaryStructure::getAttribute(const String & attribute_name) const
+const DictionaryAttribute & DictionaryStructure::getAttribute(const std::string & attribute_name) const
 {
-    auto find_iter
-        = std::find_if(attributes.begin(), attributes.end(), [&](const auto & attribute) { return attribute.name == attribute_name; });
-    if (find_iter != attributes.end())
-        return *find_iter;
+    auto it = attribute_name_to_index.find(attribute_name);
 
-    if (key && access_to_key_from_attributes)
+    if (it == attribute_name_to_index.end())
     {
-        find_iter = std::find_if(key->begin(), key->end(), [&](const auto & attribute) { return attribute.name == attribute_name; });
-        if (find_iter != key->end())
-            return *find_iter;
+        if (!access_to_key_from_attributes)
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "No such attribute '{}'", attribute_name);
+
+        for (const auto & key_attribute : *key)
+            if (key_attribute.name == attribute_name)
+                return key_attribute;
+
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "No such attribute '{}' in keys", attribute_name);
     }
 
-    throw Exception{"No such attribute '" + attribute_name + "'", ErrorCodes::BAD_ARGUMENTS};
+    size_t attribute_index = it->second;
+    return attributes[attribute_index];
 }
 
-const DictionaryAttribute & DictionaryStructure::getAttribute(const String & attribute_name, const DataTypePtr & type) const
+const DictionaryAttribute & DictionaryStructure::getAttribute(const std::string & attribute_name, const DataTypePtr & type) const
 {
     const auto & attribute = getAttribute(attribute_name);
 
     if (!areTypesEqual(attribute.type, type))
-        throw Exception{"Attribute type does not match, expected " + attribute.type->getName() + ", found " + type->getName(),
-            ErrorCodes::TYPE_MISMATCH};
+        throw Exception(ErrorCodes::TYPE_MISMATCH,
+            "Attribute type does not match, expected {}, found {}",
+            attribute.type->getName(),
+            type->getName());
 
     return attribute;
 }
 
+size_t DictionaryStructure::getKeysSize() const
+{
+    if (id)
+        return 1;
+    else
+        return key->size();
+}
+
 std::string DictionaryStructure::getKeyDescription() const
 {
     if (id)
@@ -289,14 +326,6 @@ bool DictionaryStructure::isKeySizeFixed() const
     return true;
 }
 
-size_t DictionaryStructure::getKeySize() const
-{
-    return std::accumulate(std::begin(*key), std::end(*key), size_t{}, [](const auto running_size, const auto & key_i)
-    {
-        return running_size + key_i.type->getSizeOfValueInMemory();
-    });
-}
-
 Strings DictionaryStructure::getKeysNames() const
 {
     if (id)
@@ -321,21 +350,24 @@ static void checkAttributeKeys(const Poco::Util::AbstractConfiguration::Keys & k
     for (const auto & key : keys)
     {
         if (valid_keys.find(key) == valid_keys.end())
-            throw Exception{"Unknown key '" + key + "' inside attribute section", ErrorCodes::BAD_ARGUMENTS};
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unknown key '{}' inside attribute section", key);
     }
 }
 
-
 std::vector<DictionaryAttribute> DictionaryStructure::getAttributes(
     const Poco::Util::AbstractConfiguration & config,
     const std::string & config_prefix,
-    const bool hierarchy_allowed,
-    const bool allow_null_values)
+    bool complex_key_attributes)
 {
+    /// If we request complex key attributes they does not support hierarchy and does not allow null values
+    const bool hierarchy_allowed = !complex_key_attributes;
+    const bool allow_null_values = !complex_key_attributes;
+
     Poco::Util::AbstractConfiguration::Keys config_elems;
     config.keys(config_prefix, config_elems);
     auto has_hierarchy = false;
 
+    std::unordered_set<String> attribute_names;
     std::vector<DictionaryAttribute> res_attributes;
 
     const FormatSettings format_settings;
@@ -358,6 +390,13 @@ std::vector<DictionaryAttribute> DictionaryStructure::getAttributes(
         if ((range_min && name == range_min->name) || (range_max && name == range_max->name))
             continue;
 
+        auto insert_result = attribute_names.insert(name);
+        bool inserted = insert_result.second;
+
+        if (!inserted)
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                "Dictionary attributes names must be unique. Attribute name ({}) is not unique",
+                name);
 
         const auto type_string = config.getString(prefix + "type");
         const auto initial_type = DataTypeFactory::instance().get(type_string);
@@ -391,7 +430,7 @@ std::vector<DictionaryAttribute> DictionaryStructure::getAttributes(
                 {
                     ReadBufferFromString null_value_buffer{null_value_string};
                     auto column_with_null_value = type->createColumn();
-                    type->deserializeAsTextEscaped(*column_with_null_value, null_value_buffer, format_settings);
+                    type->getDefaultSerialization()->deserializeTextEscaped(*column_with_null_value, null_value_buffer, format_settings);
                     null_value = (*column_with_null_value)[0];
                 }
             }
@@ -408,13 +447,13 @@ std::vector<DictionaryAttribute> DictionaryStructure::getAttributes(
         const auto injective = config.getBool(prefix + "injective", false);
         const auto is_object_id = config.getBool(prefix + "is_object_id", false);
         if (name.empty())
-            throw Exception{"Properties 'name' and 'type' of an attribute cannot be empty", ErrorCodes::BAD_ARGUMENTS};
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Properties 'name' and 'type' of an attribute cannot be empty");
 
         if (has_hierarchy && !hierarchy_allowed)
-            throw Exception{"Hierarchy not allowed in '" + prefix, ErrorCodes::BAD_ARGUMENTS};
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Hierarchy not allowed in '{}'", prefix);
 
         if (has_hierarchy && hierarchical)
-            throw Exception{"Only one hierarchical attribute supported", ErrorCodes::BAD_ARGUMENTS};
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Only one hierarchical attribute supported");
 
         has_hierarchy = has_hierarchy || hierarchical;
 
@@ -422,6 +461,7 @@ std::vector<DictionaryAttribute> DictionaryStructure::getAttributes(
             name,
             underlying_type,
             initial_type,
+            initial_type->getDefaultSerialization(),
             type,
             expression,
             null_value,
diff --git a/src/Dictionaries/DictionaryStructure.h b/src/Dictionaries/DictionaryStructure.h
index 0ff50868e26..ce5dd3dd422 100644
--- a/src/Dictionaries/DictionaryStructure.h
+++ b/src/Dictionaries/DictionaryStructure.h
@@ -1,17 +1,18 @@
 #pragma once
 
-#include <Core/Field.h>
-#include <DataTypes/IDataType.h>
-#include <IO/ReadBufferFromString.h>
-#include <Interpreters/IExternalLoadable.h>
-#include <Poco/Util/AbstractConfiguration.h>
-
 #include <map>
 #include <optional>
 #include <string>
 #include <vector>
 
 
+#include <Poco/Util/AbstractConfiguration.h>
+
+#include <Core/Field.h>
+#include <IO/ReadBufferFromString.h>
+#include <DataTypes/IDataType.h>
+#include <Interpreters/IExternalLoadable.h>
+
 namespace DB
 {
 
@@ -31,13 +32,14 @@ enum class AttributeUnderlyingType
     utDecimal32,
     utDecimal64,
     utDecimal128,
+    utDecimal256,
     utString
 };
 
 
 AttributeUnderlyingType getAttributeUnderlyingType(const std::string & type);
 
-std::string toString(const AttributeUnderlyingType type);
+std::string toString(AttributeUnderlyingType type);
 
 /// Min and max lifetimes for a dictionary or it's entry
 using DictionaryLifetime = ExternalLoadableLifetime;
@@ -45,6 +47,7 @@ using DictionaryLifetime = ExternalLoadableLifetime;
 /** Holds the description of a single dictionary attribute:
 *    - name, used for lookup into dictionary and source;
 *    - type, used in conjunction with DataTypeFactory and getAttributeUnderlyingTypeByname;
+*    - nested_type, contains nested type of complex type like Nullable, Array
 *    - null_value, used as a default value for non-existent entries in the dictionary,
 *        decimal representation for numeric attributes;
 *    - hierarchical, whether this attribute defines a hierarchy;
@@ -56,6 +59,7 @@ struct DictionaryAttribute final
     const std::string name;
     const AttributeUnderlyingType underlying_type;
     const DataTypePtr type;
+    const SerializationPtr serialization;
     const DataTypePtr nested_type;
     const std::string expression;
     const Field null_value;
@@ -122,6 +126,9 @@ void callOnDictionaryAttributeType(AttributeUnderlyingType type, F&& func)
         case AttributeUnderlyingType::utDecimal128:
             func(DictionaryAttributeType<Decimal128>());
             break;
+        case AttributeUnderlyingType::utDecimal256:
+            func(DictionaryAttributeType<Decimal256>());
+            break;
     }
 };
 
@@ -147,28 +154,33 @@ struct DictionaryStructure final
     std::optional<DictionarySpecialAttribute> id;
     std::optional<std::vector<DictionaryAttribute>> key;
     std::vector<DictionaryAttribute> attributes;
+    std::unordered_map<std::string, size_t> attribute_name_to_index;
     std::optional<DictionaryTypedSpecialAttribute> range_min;
     std::optional<DictionaryTypedSpecialAttribute> range_max;
+    std::optional<size_t> hierarchical_attribute_index;
+
     bool has_expressions = false;
     bool access_to_key_from_attributes = false;
 
     DictionaryStructure(const Poco::Util::AbstractConfiguration & config, const std::string & config_prefix);
 
     void validateKeyTypes(const DataTypes & key_types) const;
-    const DictionaryAttribute & getAttribute(const String & attribute_name) const;
-    const DictionaryAttribute & getAttribute(const String & attribute_name, const DataTypePtr & type) const;
+
+    const DictionaryAttribute & getAttribute(const std::string & attribute_name) const;
+    const DictionaryAttribute & getAttribute(const std::string & attribute_name, const DataTypePtr & type) const;
+
+    Strings getKeysNames() const;
+    size_t getKeysSize() const;
+
     std::string getKeyDescription() const;
     bool isKeySizeFixed() const;
-    size_t getKeySize() const;
-    Strings getKeysNames() const;
 
 private:
     /// range_min and range_max have to be parsed before this function call
     std::vector<DictionaryAttribute> getAttributes(
         const Poco::Util::AbstractConfiguration & config,
         const std::string & config_prefix,
-        const bool hierarchy_allowed = true,
-        const bool allow_null_values = true);
+        bool complex_key_attributes);
 };
 
 }
diff --git a/src/Dictionaries/DirectDictionary.cpp b/src/Dictionaries/DirectDictionary.cpp
index b61f256b0cc..2038704414e 100644
--- a/src/Dictionaries/DirectDictionary.cpp
+++ b/src/Dictionaries/DirectDictionary.cpp
@@ -1,430 +1,338 @@
 #include "DirectDictionary.h"
-#include <IO/WriteHelpers.h>
-#include "DictionaryBlockInputStream.h"
-#include "DictionaryFactory.h"
+
 #include <Core/Defines.h>
-#include <Functions/FunctionHelpers.h>
-#include <Columns/ColumnNullable.h>
+#include <Common/HashTable/HashMap.h>
+#include <DataStreams/IBlockInputStream.h>
 #include <DataTypes/DataTypesDecimal.h>
-#include <Common/HashTable/HashSet.h>
+#include <Functions/FunctionHelpers.h>
+
+#include <Dictionaries/DictionaryFactory.h>
+#include <Dictionaries/HierarchyDictionariesUtils.h>
 
 namespace DB
 {
 namespace ErrorCodes
 {
-    extern const int TYPE_MISMATCH;
-    extern const int BAD_ARGUMENTS;
     extern const int UNSUPPORTED_METHOD;
+    extern const int BAD_ARGUMENTS;
 }
 
-
-DirectDictionary::DirectDictionary(
+template <DictionaryKeyType dictionary_key_type>
+DirectDictionary<dictionary_key_type>::DirectDictionary(
     const StorageID & dict_id_,
     const DictionaryStructure & dict_struct_,
-    DictionarySourcePtr source_ptr_,
-    BlockPtr saved_block_)
+    DictionarySourcePtr source_ptr_)
     : IDictionary(dict_id_)
     , dict_struct(dict_struct_)
     , source_ptr{std::move(source_ptr_)}
-    , saved_block{std::move(saved_block_)}
 {
-    if (!this->source_ptr->supportsSelectiveLoad())
-        throw Exception{full_name + ": source cannot be used with DirectDictionary", ErrorCodes::UNSUPPORTED_METHOD};
-
-    createAttributes();
+    if (!source_ptr->supportsSelectiveLoad())
+        throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "{}: source cannot be used with DirectDictionary", full_name);
 }
 
-
-void DirectDictionary::toParent(const PaddedPODArray<Key> & ids, PaddedPODArray<Key> & out) const
+template <DictionaryKeyType dictionary_key_type>
+Columns DirectDictionary<dictionary_key_type>::getColumns(
+    const Strings & attribute_names,
+    const DataTypes & result_types,
+    const Columns & key_columns,
+    const DataTypes & key_types [[maybe_unused]],
+    const Columns & default_values_columns) const
 {
-    const auto null_value = std::get<UInt64>(hierarchical_attribute->null_values);
-    DictionaryDefaultValueExtractor<UInt64> extractor(null_value);
+    if constexpr (dictionary_key_type == DictionaryKeyType::complex)
+        dict_struct.validateKeyTypes(key_types);
 
-    getItemsImpl<UInt64, UInt64>(
-        *hierarchical_attribute,
-        ids,
-        [&](const size_t row, const UInt64 value, bool) { out[row] = value; },
-        extractor);
-}
+    DictionaryKeysArenaHolder<dictionary_key_type> arena_holder;
+    DictionaryKeysExtractor<dictionary_key_type> extractor(key_columns, arena_holder.getComplexKeyArena());
+    const auto requested_keys = extractor.extractAllKeys();
 
+    DictionaryStorageFetchRequest request(dict_struct, attribute_names, result_types, default_values_columns);
 
-static inline DirectDictionary::Key getAt(const PaddedPODArray<DirectDictionary::Key> & arr, const size_t idx)
-{
-    return arr[idx];
-}
-static inline DirectDictionary::Key getAt(const DirectDictionary::Key & value, const size_t)
-{
-    return value;
-}
+    HashMap<KeyType, size_t> key_to_fetched_index;
+    key_to_fetched_index.reserve(requested_keys.size());
 
-DirectDictionary::Key DirectDictionary::getValueOrNullByKey(const Key & to_find) const
-{
-    std::vector<Key> required_key = {to_find};
-
-    auto stream = source_ptr->loadIds(required_key);
-    stream->readPrefix();
-
-    bool is_found = false;
-    Key result = std::get<Key>(hierarchical_attribute->null_values);
-    while (const auto block = stream->read())
+    auto fetched_columns_from_storage = request.makeAttributesResultColumns();
+    for (size_t attribute_index = 0; attribute_index < request.attributesSize(); ++attribute_index)
     {
-        const IColumn & id_column = *block.safeGetByPosition(0).column;
+        if (!request.shouldFillResultColumnWithIndex(attribute_index))
+            continue;
 
-        for (const size_t attribute_idx : ext::range(0, attributes.size()))
-        {
-            if (is_found)
-                break;
-
-            const IColumn & attribute_column = *block.safeGetByPosition(attribute_idx + 1).column;
-
-            for (const auto row_idx : ext::range(0, id_column.size()))
-            {
-                const auto key = id_column[row_idx].get<UInt64>();
-
-                if (key == to_find && hierarchical_attribute->name == attribute_name_by_index.at(attribute_idx))
-                {
-                    result = attribute_column[row_idx].get<Key>();
-                    is_found = true;
-                    break;
-                }
-            }
-        }
+        auto & fetched_column_from_storage = fetched_columns_from_storage[attribute_index];
+        fetched_column_from_storage->reserve(requested_keys.size());
     }
 
-    stream->readSuffix();
+    size_t fetched_key_index = 0;
 
-    return result;
-}
+    Columns block_key_columns;
+    size_t dictionary_keys_size = dict_struct.getKeysNames().size();
+    block_key_columns.reserve(dictionary_keys_size);
 
-template <typename ChildType, typename AncestorType>
-void DirectDictionary::isInImpl(const ChildType & child_ids, const AncestorType & ancestor_ids, PaddedPODArray<UInt8> & out) const
-{
-    const auto null_value = std::get<UInt64>(hierarchical_attribute->null_values);
-    const auto rows = out.size();
+    BlockInputStreamPtr stream = getSourceBlockInputStream(key_columns, requested_keys);
 
-    for (const auto row : ext::range(0, rows))
-    {
-        auto id = getAt(child_ids, row);
-        const auto ancestor_id = getAt(ancestor_ids, row);
-
-        for (size_t i = 0; id != null_value && id != ancestor_id && i < DBMS_HIERARCHICAL_DICTIONARY_MAX_DEPTH; ++i)
-            id = getValueOrNullByKey(id);
-
-        out[row] = id != null_value && id == ancestor_id;
-    }
-
-    query_count.fetch_add(rows, std::memory_order_relaxed);
-}
-
-
-void DirectDictionary::isInVectorVector(
-    const PaddedPODArray<Key> & child_ids, const PaddedPODArray<Key> & ancestor_ids, PaddedPODArray<UInt8> & out) const
-{
-    isInImpl(child_ids, ancestor_ids, out);
-}
-
-void DirectDictionary::isInVectorConstant(const PaddedPODArray<Key> & child_ids, const Key ancestor_id, PaddedPODArray<UInt8> & out) const
-{
-    isInImpl(child_ids, ancestor_id, out);
-}
-
-void DirectDictionary::isInConstantVector(const Key child_id, const PaddedPODArray<Key> & ancestor_ids, PaddedPODArray<UInt8> & out) const
-{
-    isInImpl(child_id, ancestor_ids, out);
-}
-
-ColumnPtr DirectDictionary::getColumn(
-        const std::string & attribute_name,
-        const DataTypePtr & result_type,
-        const Columns & key_columns,
-        const DataTypes &,
-        const ColumnPtr default_values_column) const
-{
-    ColumnPtr result;
-
-    PaddedPODArray<Key> backup_storage;
-    const auto & ids = getColumnVectorData(this, key_columns.front(), backup_storage);
-
-    const auto & attribute = getAttribute(attribute_name);
-
-    auto keys_size = ids.size();
-
-    ColumnUInt8::MutablePtr col_null_map_to;
-    ColumnUInt8::Container * vec_null_map_to = nullptr;
-    if (attribute.is_nullable)
-    {
-        col_null_map_to = ColumnUInt8::create(keys_size, false);
-        vec_null_map_to = &col_null_map_to->getData();
-    }
-
-    const auto & dictionary_attribute = dict_struct.getAttribute(attribute_name, result_type);
-
-    auto type_call = [&](const auto &dictionary_attribute_type)
-    {
-        using Type = std::decay_t<decltype(dictionary_attribute_type)>;
-        using AttributeType = typename Type::AttributeType;
-
-        using ValueType = DictionaryValueType<AttributeType>;
-        using ColumnProvider = DictionaryAttributeColumnProvider<AttributeType>;
-
-        const auto attribute_null_value = std::get<ValueType>(attribute.null_values);
-        AttributeType null_value = static_cast<AttributeType>(attribute_null_value);
-        DictionaryDefaultValueExtractor<AttributeType> default_value_extractor(std::move(null_value), default_values_column);
-
-        auto column = ColumnProvider::getColumn(dictionary_attribute, keys_size);
-
-        if constexpr (std::is_same_v<AttributeType, String>)
-        {
-            auto * out = column.get();
-
-            getItemsImpl<String, String>(
-                attribute,
-                ids,
-                [&](const size_t row, const String value, bool is_null)
-                {
-                    if (attribute.is_nullable)
-                        (*vec_null_map_to)[row] = is_null;
-
-                    const auto ref = StringRef{value};
-                    out->insertData(ref.data, ref.size);
-                },
-                default_value_extractor);
-        }
-        else
-        {
-            auto & out = column->getData();
-
-            getItemsImpl<AttributeType, AttributeType>(
-                attribute,
-                ids,
-                [&](const size_t row, const auto value, bool is_null)
-                {
-                    if (attribute.is_nullable)
-                        (*vec_null_map_to)[row] = is_null;
-
-                    out[row] = value;
-                },
-                default_value_extractor);
-        }
-
-        result = std::move(column);
-    };
-
-    callOnDictionaryAttributeType(attribute.type, type_call);
-
-    if (attribute.is_nullable)
-    {
-        result = ColumnNullable::create(result, std::move(col_null_map_to));
-    }
-
-    return result;
-}
-
-ColumnUInt8::Ptr DirectDictionary::hasKeys(const Columns & key_columns, const DataTypes &) const
-{
-    PaddedPODArray<Key> backup_storage;
-    const auto& ids = getColumnVectorData(this, key_columns.front(), backup_storage);
-
-    auto result = ColumnUInt8::create(ext::size(ids));
-    auto& out = result->getData();
-
-    const auto rows = ext::size(ids);
-
-    HashMap<Key, UInt8> has_key;
-    for (const auto row : ext::range(0, rows))
-        has_key[ids[row]] = 0;
-
-    std::vector<Key> to_load;
-    to_load.reserve(has_key.size());
-    for (auto it = has_key.begin(); it != has_key.end(); ++it)
-        to_load.emplace_back(static_cast<Key>(it->getKey()));
-
-    auto stream = source_ptr->loadIds(to_load);
     stream->readPrefix();
 
     while (const auto block = stream->read())
     {
-        const IColumn & id_column = *block.safeGetByPosition(0).column;
+        /// Split into keys columns and attribute columns
+        for (size_t i = 0; i < dictionary_keys_size; ++i)
+            block_key_columns.emplace_back(block.safeGetByPosition(i).column);
 
-        for (const auto row_idx : ext::range(0, id_column.size()))
+        DictionaryKeysExtractor<dictionary_key_type> block_keys_extractor(block_key_columns, arena_holder.getComplexKeyArena());
+        auto block_keys = block_keys_extractor.extractAllKeys();
+
+        for (size_t attribute_index = 0; attribute_index < request.attributesSize(); ++attribute_index)
         {
-            const auto key = id_column[row_idx].get<UInt64>();
-            has_key[key] = 1;
+            if (!request.shouldFillResultColumnWithIndex(attribute_index))
+                continue;
+
+            const auto & block_column = block.safeGetByPosition(dictionary_keys_size + attribute_index).column;
+            fetched_columns_from_storage[attribute_index]->insertRangeFrom(*block_column, 0, block_keys.size());
         }
+
+        for (size_t block_key_index = 0; block_key_index < block_keys.size(); ++block_key_index)
+        {
+            auto block_key = block_keys[block_key_index];
+            key_to_fetched_index[block_key] = fetched_key_index;
+            ++fetched_key_index;
+        }
+
+        block_key_columns.clear();
     }
 
     stream->readSuffix();
 
-    for (const auto row : ext::range(0, rows))
-        out[row] = has_key[ids[row]];
+    Field value_to_insert;
 
-    query_count.fetch_add(rows, std::memory_order_relaxed);
+    size_t requested_keys_size = requested_keys.size();
+
+    auto result_columns = request.makeAttributesResultColumns();
+
+    for (size_t attribute_index = 0; attribute_index < result_columns.size(); ++attribute_index)
+    {
+        if (!request.shouldFillResultColumnWithIndex(attribute_index))
+            continue;
+
+        auto & result_column = result_columns[attribute_index];
+
+        const auto & fetched_column_from_storage = fetched_columns_from_storage[attribute_index];
+        const auto & default_value_provider = request.defaultValueProviderAtIndex(attribute_index);
+
+        result_column->reserve(requested_keys_size);
+
+        for (size_t requested_key_index = 0; requested_key_index < requested_keys_size; ++requested_key_index)
+        {
+            const auto requested_key = requested_keys[requested_key_index];
+            const auto * it = key_to_fetched_index.find(requested_key);
+
+            if (it)
+                fetched_column_from_storage->get(it->getMapped(), value_to_insert);
+            else
+                value_to_insert = default_value_provider.getDefaultValue(requested_key_index);
+
+            result_column->insert(value_to_insert);
+        }
+    }
+
+    query_count.fetch_add(requested_keys_size, std::memory_order_relaxed);
+
+    return request.filterRequestedColumns(result_columns);
+}
+
+template <DictionaryKeyType dictionary_key_type>
+ColumnPtr DirectDictionary<dictionary_key_type>::getColumn(
+    const std::string & attribute_name,
+    const DataTypePtr & result_type,
+    const Columns & key_columns,
+    const DataTypes & key_types,
+    const ColumnPtr & default_values_column) const
+{
+    return getColumns({ attribute_name }, { result_type }, key_columns, key_types, { default_values_column }).front();
+}
+
+template <DictionaryKeyType dictionary_key_type>
+ColumnUInt8::Ptr DirectDictionary<dictionary_key_type>::hasKeys(
+    const Columns & key_columns,
+    const DataTypes & key_types [[maybe_unused]]) const
+{
+    if constexpr (dictionary_key_type == DictionaryKeyType::complex)
+        dict_struct.validateKeyTypes(key_types);
+
+    DictionaryKeysArenaHolder<dictionary_key_type> arena_holder;
+    DictionaryKeysExtractor<dictionary_key_type> requested_keys_extractor(key_columns, arena_holder.getComplexKeyArena());
+    auto requested_keys = requested_keys_extractor.extractAllKeys();
+    size_t requested_keys_size = requested_keys.size();
+
+    HashMap<KeyType, size_t> requested_key_to_index;
+    requested_key_to_index.reserve(requested_keys_size);
+
+    for (size_t i = 0; i < requested_keys.size(); ++i)
+    {
+        auto requested_key = requested_keys[i];
+        requested_key_to_index[requested_key] = i;
+    }
+
+    auto result = ColumnUInt8::create(requested_keys_size, false);
+    auto & result_data = result->getData();
+
+    Columns block_key_columns;
+    size_t dictionary_keys_size = dict_struct.getKeysNames().size();
+    block_key_columns.reserve(dictionary_keys_size);
+
+    BlockInputStreamPtr stream = getSourceBlockInputStream(key_columns, requested_keys);
+
+    stream->readPrefix();
+
+    while (const auto block = stream->read())
+    {
+        /// Split into keys columns and attribute columns
+        for (size_t i = 0; i < dictionary_keys_size; ++i)
+            block_key_columns.emplace_back(block.safeGetByPosition(i).column);
+
+        DictionaryKeysExtractor<dictionary_key_type> block_keys_extractor(block_key_columns, arena_holder.getComplexKeyArena());
+        size_t block_keys_size = block_keys_extractor.getKeysSize();
+
+        for (size_t i = 0; i < block_keys_size; ++i)
+        {
+            auto block_key = block_keys_extractor.extractCurrentKey();
+
+            const auto * it = requested_key_to_index.find(block_key);
+            assert(it);
+
+            size_t result_data_found_index = it->getMapped();
+            result_data[result_data_found_index] = true;
+
+            block_keys_extractor.rollbackCurrentKey();
+        }
+
+        block_key_columns.clear();
+    }
+
+    stream->readSuffix();
+
+    query_count.fetch_add(requested_keys_size, std::memory_order_relaxed);
 
     return result;
 }
 
-void DirectDictionary::createAttributes()
+template <DictionaryKeyType dictionary_key_type>
+ColumnPtr DirectDictionary<dictionary_key_type>::getHierarchy(
+    ColumnPtr key_column,
+    const DataTypePtr & key_type) const
 {
-    const auto size = dict_struct.attributes.size();
-    attributes.reserve(size);
-
-    for (const auto & attribute : dict_struct.attributes)
+    if (dictionary_key_type == DictionaryKeyType::simple)
     {
-        attribute_index_by_name.emplace(attribute.name, attributes.size());
-        attribute_name_by_index.emplace(attributes.size(), attribute.name);
-        attributes.push_back(createAttribute(attribute, attribute.null_value, attribute.name));
-
-        if (attribute.hierarchical)
-        {
-            hierarchical_attribute = &attributes.back();
-
-            if (hierarchical_attribute->type != AttributeUnderlyingType::utUInt64)
-                throw Exception{full_name + ": hierarchical attribute must be UInt64.", ErrorCodes::TYPE_MISMATCH};
-        }
+        auto result = getKeysHierarchyDefaultImplementation(this, key_column, key_type);
+        query_count.fetch_add(key_column->size(), std::memory_order_relaxed);
+        return result;
     }
+    else
+        return nullptr;
 }
 
-
-template <typename T>
-void DirectDictionary::createAttributeImpl(Attribute & attribute, const Field & null_value)
+template <DictionaryKeyType dictionary_key_type>
+ColumnUInt8::Ptr DirectDictionary<dictionary_key_type>::isInHierarchy(
+    ColumnPtr key_column,
+    ColumnPtr in_key_column,
+    const DataTypePtr & key_type) const
 {
-    attribute.null_values = T(null_value.get<NearestFieldType<T>>());
-}
-
-template <>
-void DirectDictionary::createAttributeImpl<String>(Attribute & attribute, const Field & null_value)
-{
-    attribute.string_arena = std::make_unique<Arena>();
-    const String & string = null_value.get<String>();
-    const char * string_in_arena = attribute.string_arena->insert(string.data(), string.size());
-    attribute.null_values.emplace<StringRef>(string_in_arena, string.size());
-}
-
-
-DirectDictionary::Attribute DirectDictionary::createAttribute(const DictionaryAttribute& attribute, const Field & null_value, const std::string & attr_name)
-{
-    Attribute attr{attribute.underlying_type, attribute.is_nullable, {}, {}, attr_name};
-
-    auto type_call = [&](const auto &dictionary_attribute_type)
+    if (dictionary_key_type == DictionaryKeyType::simple)
     {
-        using Type = std::decay_t<decltype(dictionary_attribute_type)>;
-        using AttributeType = typename Type::AttributeType;
-        createAttributeImpl<AttributeType>(attr, null_value);
-    };
-
-    callOnDictionaryAttributeType(attribute.underlying_type, type_call);
-
-    return attr;
+        auto result = getKeysIsInHierarchyDefaultImplementation(this, key_column, in_key_column, key_type);
+        query_count.fetch_add(key_column->size(), std::memory_order_relaxed);
+        return result;
+    }
+    else
+        return nullptr;
 }
 
-
-template <typename AttributeType, typename OutputType, typename ValueSetter, typename DefaultValueExtractor>
-void DirectDictionary::getItemsImpl(
-    const Attribute & attribute,
-    const PaddedPODArray<Key> & ids,
-    ValueSetter && set_value,
-    DefaultValueExtractor & default_value_extractor) const
+template <DictionaryKeyType dictionary_key_type>
+BlockInputStreamPtr DirectDictionary<dictionary_key_type>::getSourceBlockInputStream(
+    const Columns & key_columns [[maybe_unused]],
+    const PaddedPODArray<KeyType> & requested_keys [[maybe_unused]]) const
 {
-    const auto rows = ext::size(ids);
+    size_t requested_keys_size = requested_keys.size();
 
-    HashMap<Key, OutputType> value_by_key;
-    HashSet<Key> value_is_null;
+    BlockInputStreamPtr stream;
 
-    for (const auto row : ext::range(0, rows))
+    if constexpr (dictionary_key_type == DictionaryKeyType::simple)
     {
-        auto key = ids[row];
-        value_by_key[key] = static_cast<AttributeType>(default_value_extractor[row]);
+        std::vector<UInt64> ids;
+        ids.reserve(requested_keys_size);
+
+        for (auto key : requested_keys)
+            ids.emplace_back(key);
+
+        stream = source_ptr->loadIds(ids);
+    }
+    else
+    {
+        std::vector<size_t> requested_rows;
+        requested_rows.reserve(requested_keys_size);
+        for (size_t i = 0; i < requested_keys_size; ++i)
+            requested_rows.emplace_back(i);
+
+        stream = source_ptr->loadKeys(key_columns, requested_rows);
     }
 
-    std::vector<Key> to_load;
-    to_load.reserve(value_by_key.size());
-    for (auto it = value_by_key.begin(); it != value_by_key.end(); ++it)
-        to_load.emplace_back(static_cast<Key>(it->getKey()));
-
-    auto stream = source_ptr->loadIds(to_load);
-    stream->readPrefix();
-
-    const auto it = attribute_index_by_name.find(attribute.name);
-    if (it == std::end(attribute_index_by_name))
-        throw Exception{full_name + ": no such attribute '" + attribute.name + "'", ErrorCodes::BAD_ARGUMENTS};
-
-    auto attribute_index = it->second;
-
-    while (const auto block = stream->read())
-    {
-        const IColumn & id_column = *block.safeGetByPosition(0).column;
-
-        const IColumn & attribute_column = *block.safeGetByPosition(attribute_index + 1).column;
-
-        for (const auto row_idx : ext::range(0, id_column.size()))
-        {
-            const auto key = id_column[row_idx].get<UInt64>();
-
-            if (value_by_key.find(key) != value_by_key.end())
-            {
-                auto value = attribute_column[row_idx];
-
-                if (value.isNull())
-                    value_is_null.insert(key);
-                else
-                    value_by_key[key] = static_cast<OutputType>(value.get<NearestFieldType<AttributeType>>());
-            }
-        }
-    }
-
-    stream->readSuffix();
-
-    for (const auto row : ext::range(0, rows))
-    {
-        auto key = ids[row];
-        set_value(row, value_by_key[key], value_is_null.find(key) != nullptr);
-    }
-
-    query_count.fetch_add(rows, std::memory_order_relaxed);
+    return stream;
 }
 
-const DirectDictionary::Attribute & DirectDictionary::getAttribute(const std::string & attribute_name) const
-{
-    const auto it = attribute_index_by_name.find(attribute_name);
-    if (it == std::end(attribute_index_by_name))
-        throw Exception{full_name + ": no such attribute '" + attribute_name + "'", ErrorCodes::BAD_ARGUMENTS};
-
-    return attributes[it->second];
-}
-
-
-BlockInputStreamPtr DirectDictionary::getBlockInputStream(const Names & /* column_names */, size_t /* max_block_size */) const
+template <DictionaryKeyType dictionary_key_type>
+BlockInputStreamPtr DirectDictionary<dictionary_key_type>::getBlockInputStream(const Names & /* column_names */, size_t /* max_block_size */) const
 {
     return source_ptr->loadAll();
 }
 
-
-void registerDictionaryDirect(DictionaryFactory & factory)
+namespace
 {
-    auto create_layout = [=](const std::string & full_name,
-                             const DictionaryStructure & dict_struct,
-                             const Poco::Util::AbstractConfiguration & config,
-                             const std::string & config_prefix,
-                             DictionarySourcePtr source_ptr) -> DictionaryPtr
+    template <DictionaryKeyType dictionary_key_type>
+    DictionaryPtr createDirectDictionary(
+        const std::string & full_name,
+        const DictionaryStructure & dict_struct,
+        const Poco::Util::AbstractConfiguration & config,
+        const std::string & config_prefix,
+        DictionarySourcePtr source_ptr)
     {
-        if (dict_struct.key)
-            throw Exception{"'key' is not supported for dictionary of layout 'direct'", ErrorCodes::UNSUPPORTED_METHOD};
+        const auto * layout_name = dictionary_key_type == DictionaryKeyType::simple ? "direct" : "complex_key_direct";
+
+        if constexpr (dictionary_key_type == DictionaryKeyType::simple)
+        {
+            if (dict_struct.key)
+                throw Exception(ErrorCodes::UNSUPPORTED_METHOD,
+                    "'key' is not supported for dictionary of layout '{}'",
+                    layout_name);
+        }
+        else
+        {
+            if (dict_struct.id)
+                throw Exception(ErrorCodes::UNSUPPORTED_METHOD,
+                    "'id' is not supported for dictionary of layout '{}'",
+                    layout_name);
+        }
 
         if (dict_struct.range_min || dict_struct.range_max)
-            throw Exception{full_name
-                                + ": elements .structure.range_min and .structure.range_max should be defined only "
-                                  "for a dictionary of layout 'range_hashed'",
-                            ErrorCodes::BAD_ARGUMENTS};
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                "{}: elements .structure.range_min and .structure.range_max should be defined only "
+                "for a dictionary of layout 'range_hashed'",
+                full_name);
 
         const auto dict_id = StorageID::fromDictionaryConfig(config, config_prefix);
 
         if (config.has(config_prefix + ".lifetime.min") || config.has(config_prefix + ".lifetime.max"))
-            throw Exception{"'lifetime' parameter is redundant for the dictionary' of layout 'direct'", ErrorCodes::BAD_ARGUMENTS};
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                "'lifetime' parameter is redundant for the dictionary' of layout '{}'",
+                layout_name);
 
+        return std::make_unique<DirectDictionary<dictionary_key_type>>(dict_id, dict_struct, std::move(source_ptr));
+    }
+}
 
-        return std::make_unique<DirectDictionary>(dict_id, dict_struct, std::move(source_ptr));
-    };
-    factory.registerLayout("direct", create_layout, false);
+template class DirectDictionary<DictionaryKeyType::simple>;
+template class DirectDictionary<DictionaryKeyType::complex>;
+
+void registerDictionaryDirect(DictionaryFactory & factory)
+{
+    factory.registerLayout("direct", createDirectDictionary<DictionaryKeyType::simple>, false);
+    factory.registerLayout("complex_key_direct", createDirectDictionary<DictionaryKeyType::complex>, true);
 }
 
 
diff --git a/src/Dictionaries/DirectDictionary.h b/src/Dictionaries/DirectDictionary.h
index c6f4c15556b..e547e10433c 100644
--- a/src/Dictionaries/DirectDictionary.h
+++ b/src/Dictionaries/DirectDictionary.h
@@ -18,16 +18,25 @@
 namespace DB
 {
 
+template <DictionaryKeyType dictionary_key_type>
 class DirectDictionary final : public IDictionary
 {
 public:
+    static_assert(dictionary_key_type != DictionaryKeyType::range, "Range key type is not supported by direct dictionary");
+    using KeyType = std::conditional_t<dictionary_key_type == DictionaryKeyType::simple, UInt64, StringRef>;
+
     DirectDictionary(
         const StorageID & dict_id_,
         const DictionaryStructure & dict_struct_,
-        DictionarySourcePtr source_ptr_,
-        BlockPtr saved_block_ = nullptr);
+        DictionarySourcePtr source_ptr_);
 
-    std::string getTypeName() const override { return "Direct"; }
+    std::string getTypeName() const override
+    {
+        if constexpr (dictionary_key_type == DictionaryKeyType::simple)
+            return "Direct";
+        else
+            return "ComplexKeyDirect";
+    }
 
     size_t getBytesAllocated() const override { return 0; }
 
@@ -41,7 +50,7 @@ public:
 
     std::shared_ptr<const IExternalLoadable> clone() const override
     {
-        return std::make_shared<DirectDictionary>(getDictionaryID(), dict_struct, source_ptr->clone(), saved_block);
+        return std::make_shared<DirectDictionary>(getDictionaryID(), dict_struct, source_ptr->clone());
     }
 
     const IDictionarySource * getSource() const override { return source_ptr.get(); }
@@ -52,98 +61,49 @@ public:
 
     bool isInjective(const std::string & attribute_name) const override
     {
-        return dict_struct.attributes[&getAttribute(attribute_name) - attributes.data()].injective;
+        return dict_struct.getAttribute(attribute_name).injective;
     }
 
-    bool hasHierarchy() const override { return hierarchical_attribute; }
+    DictionaryKeyType getKeyType() const override { return dictionary_key_type; }
 
-    void toParent(const PaddedPODArray<Key> & ids, PaddedPODArray<Key> & out) const override;
-
-    void isInVectorVector(
-        const PaddedPODArray<Key> & child_ids, const PaddedPODArray<Key> & ancestor_ids, PaddedPODArray<UInt8> & out) const override;
-    void isInVectorConstant(const PaddedPODArray<Key> & child_ids, const Key ancestor_id, PaddedPODArray<UInt8> & out) const override;
-    void isInConstantVector(const Key child_id, const PaddedPODArray<Key> & ancestor_ids, PaddedPODArray<UInt8> & out) const override;
-
-    DictionaryKeyType getKeyType() const override { return DictionaryKeyType::simple; }
+    Columns getColumns(
+        const Strings & attribute_names,
+        const DataTypes & result_types,
+        const Columns & key_columns,
+        const DataTypes & key_types,
+        const Columns & default_values_columns) const override;
 
     ColumnPtr getColumn(
         const std::string& attribute_name,
         const DataTypePtr & result_type,
         const Columns & key_columns,
         const DataTypes & key_types,
-        const ColumnPtr default_values_column) const override;
+        const ColumnPtr & default_values_column) const override;
 
     ColumnUInt8::Ptr hasKeys(const Columns & key_columns, const DataTypes & key_types) const override;
 
+    bool hasHierarchy() const override { return dict_struct.hierarchical_attribute_index.has_value(); }
+
+    ColumnPtr getHierarchy(ColumnPtr key_column, const DataTypePtr & key_type) const override;
+
+    ColumnUInt8::Ptr isInHierarchy(
+        ColumnPtr key_column,
+        ColumnPtr in_key_column,
+        const DataTypePtr & key_type) const override;
+
     BlockInputStreamPtr getBlockInputStream(const Names & column_names, size_t max_block_size) const override;
 
 private:
-    struct Attribute final
-    {
-        AttributeUnderlyingType type;
-        bool is_nullable;
-        std::variant<
-            UInt8,
-            UInt16,
-            UInt32,
-            UInt64,
-            UInt128,
-            Int8,
-            Int16,
-            Int32,
-            Int64,
-            Decimal32,
-            Decimal64,
-            Decimal128,
-            Float32,
-            Float64,
-            StringRef>
-            null_values;
-        std::unique_ptr<Arena> string_arena;
-        std::string name;
-    };
-
-    void createAttributes();
-
-    template <typename T>
-    void addAttributeSize(const Attribute & attribute);
-
-    template <typename T>
-    static void createAttributeImpl(Attribute & attribute, const Field & null_value);
-
-    static Attribute createAttribute(const DictionaryAttribute& attribute, const Field & null_value, const std::string & name);
-
-    template <typename AttributeType, typename OutputType, typename ValueSetter, typename DefaultValueExtractor>
-    void getItemsImpl(
-        const Attribute & attribute,
-        const PaddedPODArray<Key> & ids,
-        ValueSetter && set_value,
-        DefaultValueExtractor & default_value_extractor) const;
-
-    template <typename T>
-    void setAttributeValueImpl(Attribute & attribute, const Key id, const T & value);
-
-    void setAttributeValue(Attribute & attribute, const Key id, const Field & value);
-
-    const Attribute & getAttribute(const std::string & attribute_name) const;
-
-    Key getValueOrNullByKey(const Key & to_find) const;
-
-    template <typename ChildType, typename AncestorType>
-    void isInImpl(const ChildType & child_ids, const AncestorType & ancestor_ids, PaddedPODArray<UInt8> & out) const;
+    BlockInputStreamPtr getSourceBlockInputStream(const Columns & key_columns, const PaddedPODArray<KeyType> & requested_keys) const;
 
     const DictionaryStructure dict_struct;
     const DictionarySourcePtr source_ptr;
     const DictionaryLifetime dict_lifetime;
 
-    std::map<std::string, size_t> attribute_index_by_name;
-    std::map<size_t, std::string> attribute_name_by_index;
-    std::vector<Attribute> attributes;
-    const Attribute * hierarchical_attribute = nullptr;
-
     mutable std::atomic<size_t> query_count{0};
-
-    BlockPtr saved_block;
 };
 
+extern template class DirectDictionary<DictionaryKeyType::simple>;
+extern template class DirectDictionary<DictionaryKeyType::complex>;
+
 }
diff --git a/src/Dictionaries/ExecutableDictionarySource.cpp b/src/Dictionaries/ExecutableDictionarySource.cpp
index 37dde600adf..13feab2071a 100644
--- a/src/Dictionaries/ExecutableDictionarySource.cpp
+++ b/src/Dictionaries/ExecutableDictionarySource.cpp
@@ -27,7 +27,6 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
     extern const int DICTIONARY_ACCESS_DENIED;
     extern const int UNSUPPORTED_METHOD;
-    extern const int SIZES_OF_COLUMNS_DOESNT_MATCH;
 }
 
 namespace
@@ -58,13 +57,12 @@ namespace
 
 }
 
-
 ExecutableDictionarySource::ExecutableDictionarySource(
     const DictionaryStructure & dict_struct_,
     const Poco::Util::AbstractConfiguration & config,
     const std::string & config_prefix,
     Block & sample_block_,
-    const Context & context_)
+    ContextPtr context_)
     : log(&Poco::Logger::get("ExecutableDictionarySource"))
     , dict_struct{dict_struct_}
     , implicit_key{config.getBool(config_prefix + ".implicit_key", false)}
@@ -99,25 +97,25 @@ ExecutableDictionarySource::ExecutableDictionarySource(const ExecutableDictionar
     , update_field{other.update_field}
     , format{other.format}
     , sample_block{other.sample_block}
-    , context(other.context)
+    , context(Context::createCopy(other.context))
 {
 }
 
 BlockInputStreamPtr ExecutableDictionarySource::loadAll()
 {
     if (implicit_key)
-        throw Exception("ExecutableDictionarySource with implicit_key does not support loadAll method", ErrorCodes::UNSUPPORTED_METHOD);
+        throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "ExecutableDictionarySource with implicit_key does not support loadAll method");
 
     LOG_TRACE(log, "loadAll {}", toString());
     auto process = ShellCommand::execute(command);
-    auto input_stream = context.getInputFormat(format, process->out, sample_block, max_block_size);
+    auto input_stream = context->getInputFormat(format, process->out, sample_block, max_block_size);
     return std::make_shared<ShellCommandOwningBlockInputStream>(log, input_stream, std::move(process));
 }
 
 BlockInputStreamPtr ExecutableDictionarySource::loadUpdatedAll()
 {
     if (implicit_key)
-        throw Exception("ExecutableDictionarySource with implicit_key does not support loadUpdatedAll method", ErrorCodes::UNSUPPORTED_METHOD);
+        throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "ExecutableDictionarySource with implicit_key does not support loadUpdatedAll method");
 
     time_t new_update_time = time(nullptr);
     SCOPE_EXIT(update_time = new_update_time);
@@ -128,7 +126,7 @@ BlockInputStreamPtr ExecutableDictionarySource::loadUpdatedAll()
 
     LOG_TRACE(log, "loadUpdatedAll {}", command_with_update_field);
     auto process = ShellCommand::execute(command_with_update_field);
-    auto input_stream = context.getInputFormat(format, process->out, sample_block, max_block_size);
+    auto input_stream = context->getInputFormat(format, process->out, sample_block, max_block_size);
     return std::make_shared<ShellCommandOwningBlockInputStream>(log, input_stream, std::move(process));
 }
 
@@ -141,7 +139,7 @@ namespace
     {
     public:
         BlockInputStreamWithBackgroundThread(
-            const Context & context,
+            ContextPtr context,
             const std::string & format,
             const Block & sample_block,
             const std::string & command_str,
@@ -152,7 +150,7 @@ namespace
             send_data(std::move(send_data_)),
             thread([this] { send_data(command->in); })
         {
-            stream = context.getInputFormat(format, command->out, sample_block, max_block_size);
+            stream = context->getInputFormat(format, command->out, sample_block, max_block_size);
         }
 
         ~BlockInputStreamWithBackgroundThread() override
@@ -200,101 +198,14 @@ namespace
         std::function<void(WriteBufferFromFile &)> send_data;
         ThreadFromGlobalPool thread;
     };
-
-    /** A stream, adds additional columns to each block that it will read from inner stream.
-     *
-     *  block_to_add rows size must be equal to final sum rows size of all inner stream blocks.
-     */
-    class BlockInputStreamWithAdditionalColumns final: public IBlockInputStream
-    {
-    public:
-        BlockInputStreamWithAdditionalColumns(
-            Block block_to_add_,
-            std::unique_ptr<IBlockInputStream>&& stream_)
-            : block_to_add(std::move(block_to_add_))
-            , stream(std::move(stream_))
-        {
-        }
-
-        Block getHeader() const override
-        {
-            auto header = stream->getHeader();
-
-            if (header)
-            {
-                for (Int64 i = static_cast<Int64>(block_to_add.columns() - 1); i >= 0; --i)
-                    header.insert(0, block_to_add.getByPosition(i).cloneEmpty());
-            }
-
-            return header;
-        }
-
-        Block readImpl() override
-        {
-            auto block = stream->read();
-
-            if (block)
-            {
-                auto block_rows = block.rows();
-
-                auto cut_block = block_to_add.cloneWithCutColumns(current_range_index, block_rows);
-
-                if (cut_block.rows() != block_rows)
-                    throw Exception(
-                        "Number of rows in block to add after cut must equal to number of rows in block from inner stream",
-                        ErrorCodes::SIZES_OF_COLUMNS_DOESNT_MATCH);
-
-                for (Int64 i = static_cast<Int64>(cut_block.columns() - 1); i >= 0; --i)
-                    block.insert(0, cut_block.getByPosition(i));
-
-                current_range_index += block_rows;
-            }
-
-            return block;
-        }
-
-        void readPrefix() override
-        {
-            stream->readPrefix();
-        }
-
-        void readSuffix() override
-        {
-            stream->readSuffix();
-        }
-
-        String getName() const override { return "BlockInputStreamWithAdditionalColumns"; }
-
-    private:
-        Block block_to_add;
-        std::unique_ptr<IBlockInputStream> stream;
-        size_t current_range_index = 0;
-    };
-
 }
 
-
 BlockInputStreamPtr ExecutableDictionarySource::loadIds(const std::vector<UInt64> & ids)
 {
     LOG_TRACE(log, "loadIds {} size = {}", toString(), ids.size());
 
     auto block = blockForIds(dict_struct, ids);
-
-    auto stream = std::make_unique<BlockInputStreamWithBackgroundThread>(
-        context, format, sample_block, command, log,
-        [block, this](WriteBufferFromFile & out) mutable
-        {
-            auto output_stream = context.getOutputStream(format, out, block.cloneEmpty());
-            formatBlock(output_stream, block);
-            out.close();
-        });
-
-    if (implicit_key)
-    {
-        return std::make_shared<BlockInputStreamWithAdditionalColumns>(block, std::move(stream));
-    }
-    else
-        return std::shared_ptr<BlockInputStreamWithBackgroundThread>(stream.release());
+    return getStreamForBlock(block);
 }
 
 BlockInputStreamPtr ExecutableDictionarySource::loadKeys(const Columns & key_columns, const std::vector<size_t> & requested_rows)
@@ -302,12 +213,16 @@ BlockInputStreamPtr ExecutableDictionarySource::loadKeys(const Columns & key_col
     LOG_TRACE(log, "loadKeys {} size = {}", toString(), requested_rows.size());
 
     auto block = blockForKeys(dict_struct, key_columns, requested_rows);
+    return getStreamForBlock(block);
+}
 
+BlockInputStreamPtr ExecutableDictionarySource::getStreamForBlock(const Block & block)
+{
     auto stream = std::make_unique<BlockInputStreamWithBackgroundThread>(
         context, format, sample_block, command, log,
         [block, this](WriteBufferFromFile & out) mutable
         {
-            auto output_stream = context.getOutputStream(format, out, block.cloneEmpty());
+            auto output_stream = context->getOutputStream(format, out, block.cloneEmpty());
             formatBlock(output_stream, block);
             out.close();
         });
@@ -349,20 +264,20 @@ void registerDictionarySourceExecutable(DictionarySourceFactory & factory)
                                  const Poco::Util::AbstractConfiguration & config,
                                  const std::string & config_prefix,
                                  Block & sample_block,
-                                 const Context & context,
+                                 ContextPtr context,
                                  const std::string & /* default_database */,
                                  bool check_config) -> DictionarySourcePtr
     {
         if (dict_struct.has_expressions)
-            throw Exception{"Dictionary source of type `executable` does not support attribute expressions", ErrorCodes::LOGICAL_ERROR};
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Dictionary source of type `executable` does not support attribute expressions");
 
         /// Executable dictionaries may execute arbitrary commands.
         /// It's OK for dictionaries created by administrator from xml-file, but
         /// maybe dangerous for dictionaries created from DDL-queries.
         if (check_config)
-            throw Exception("Dictionaries with Executable dictionary source is not allowed", ErrorCodes::DICTIONARY_ACCESS_DENIED);
+            throw Exception(ErrorCodes::DICTIONARY_ACCESS_DENIED, "Dictionaries with executable dictionary source are not allowed to be created from DDL query");
 
-        Context context_local_copy = copyContextAndApplySettings(config_prefix, context, config);
+        auto context_local_copy = copyContextAndApplySettings(config_prefix, context, config);
 
         return std::make_unique<ExecutableDictionarySource>(
             dict_struct, config, config_prefix + ".executable",
diff --git a/src/Dictionaries/ExecutableDictionarySource.h b/src/Dictionaries/ExecutableDictionarySource.h
index 7aa203f267b..878cb086873 100644
--- a/src/Dictionaries/ExecutableDictionarySource.h
+++ b/src/Dictionaries/ExecutableDictionarySource.h
@@ -20,7 +20,7 @@ public:
         const Poco::Util::AbstractConfiguration & config,
         const std::string & config_prefix,
         Block & sample_block_,
-        const Context & context_);
+        ContextPtr context_);
 
     ExecutableDictionarySource(const ExecutableDictionarySource & other);
     ExecutableDictionarySource & operator=(const ExecutableDictionarySource &) = delete;
@@ -47,6 +47,8 @@ public:
 
     std::string toString() const override;
 
+    BlockInputStreamPtr getStreamForBlock(const Block & block);
+
 private:
     Poco::Logger * log;
     time_t update_time = 0;
@@ -56,7 +58,7 @@ private:
     const std::string update_field;
     const std::string format;
     Block sample_block;
-    Context context;
+    ContextPtr context;
 };
 
 }
diff --git a/src/Dictionaries/ExecutablePoolDictionarySource.cpp b/src/Dictionaries/ExecutablePoolDictionarySource.cpp
new file mode 100644
index 00000000000..e920b8392d6
--- /dev/null
+++ b/src/Dictionaries/ExecutablePoolDictionarySource.cpp
@@ -0,0 +1,323 @@
+#include "ExecutablePoolDictionarySource.h"
+
+#include <functional>
+#include <ext/scope_guard.h>
+#include <DataStreams/IBlockOutputStream.h>
+#include <Interpreters/Context.h>
+#include <IO/WriteHelpers.h>
+#include <IO/ReadHelpers.h>
+#include <IO/copyData.h>
+#include <Common/ShellCommand.h>
+#include <Common/ThreadPool.h>
+#include <common/logger_useful.h>
+#include <common/LocalDateTime.h>
+#include "DictionarySourceFactory.h"
+#include "DictionarySourceHelpers.h"
+#include "DictionaryStructure.h"
+#include "registerDictionaries.h"
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+    extern const int DICTIONARY_ACCESS_DENIED;
+    extern const int UNSUPPORTED_METHOD;
+    extern const int TIMEOUT_EXCEEDED;
+}
+
+ExecutablePoolDictionarySource::ExecutablePoolDictionarySource(
+    const DictionaryStructure & dict_struct_,
+    const Configuration & configuration_,
+    Block & sample_block_,
+    ContextPtr context_)
+    : log(&Poco::Logger::get("ExecutablePoolDictionarySource"))
+    , dict_struct{dict_struct_}
+    , configuration{configuration_}
+    , sample_block{sample_block_}
+    , context{context_}
+    /// If pool size == 0 then there is no size restrictions. Poco max size of semaphore is integer type.
+    , process_pool{std::make_shared<ProcessPool>(configuration.pool_size == 0 ? std::numeric_limits<int>::max() : configuration.pool_size)}
+{
+    /// Remove keys from sample_block for implicit_key dictionary because
+    /// these columns will not be returned from source
+    /// Implicit key means that the source script will return only values,
+    /// and the correspondence to the requested keys is determined implicitly - by the order of rows in the result.
+    if (configuration.implicit_key)
+    {
+        auto keys_names = dict_struct.getKeysNames();
+
+        for (auto & key_name : keys_names)
+        {
+            size_t key_column_position_in_block = sample_block.getPositionByName(key_name);
+            sample_block.erase(key_column_position_in_block);
+        }
+    }
+}
+
+ExecutablePoolDictionarySource::ExecutablePoolDictionarySource(const ExecutablePoolDictionarySource & other)
+    : log(&Poco::Logger::get("ExecutablePoolDictionarySource"))
+    , update_time{other.update_time}
+    , dict_struct{other.dict_struct}
+    , configuration{other.configuration}
+    , sample_block{other.sample_block}
+    , context{Context::createCopy(other.context)}
+    , process_pool{std::make_shared<ProcessPool>(configuration.pool_size)}
+{
+}
+
+BlockInputStreamPtr ExecutablePoolDictionarySource::loadAll()
+{
+    throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "ExecutablePoolDictionarySource with implicit_key does not support loadAll method");
+}
+
+BlockInputStreamPtr ExecutablePoolDictionarySource::loadUpdatedAll()
+{
+    throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "ExecutablePoolDictionarySource with implicit_key does not support loadAll method");
+}
+
+namespace
+{
+    /** A stream, that runs child process and sends data to its stdin in background thread,
+      *  and receives data from its stdout.
+      */
+    class PoolBlockInputStreamWithBackgroundThread final : public IBlockInputStream
+    {
+    public:
+        PoolBlockInputStreamWithBackgroundThread(
+            std::shared_ptr<ProcessPool> process_pool_,
+            std::unique_ptr<ShellCommand> && command_,
+            BlockInputStreamPtr && stream_,
+            size_t read_rows_,
+            Poco::Logger * log_,
+            std::function<void(WriteBufferFromFile &)> && send_data_)
+            : process_pool(process_pool_)
+            , command(std::move(command_))
+            , stream(std::move(stream_))
+            , rows_to_read(read_rows_)
+            , log(log_)
+            , send_data(std::move(send_data_))
+            , thread([this]
+            {
+                try
+                {
+                    send_data(command->in);
+                }
+                catch (...)
+                {
+                    std::lock_guard<std::mutex> lck(exception_during_read_lock);
+                    exception_during_read = std::current_exception();
+                }
+            })
+        {}
+
+        ~PoolBlockInputStreamWithBackgroundThread() override
+        {
+            if (thread.joinable())
+                thread.join();
+
+            if (command)
+                process_pool->returnObject(std::move(command));
+        }
+
+        Block getHeader() const override
+        {
+            return stream->getHeader();
+        }
+
+    private:
+        Block readImpl() override
+        {
+            rethrowExceptionDuringReadIfNeeded();
+
+            if (current_read_rows == rows_to_read)
+                return Block();
+
+            Block block;
+
+            try
+            {
+                block = stream->read();
+                current_read_rows += block.rows();
+            }
+            catch (...)
+            {
+                tryLogCurrentException(log);
+                command = nullptr;
+                throw;
+            }
+
+            return block;
+        }
+
+        void readPrefix() override
+        {
+            rethrowExceptionDuringReadIfNeeded();
+            stream->readPrefix();
+        }
+
+        void readSuffix() override
+        {
+            if (thread.joinable())
+                thread.join();
+
+            rethrowExceptionDuringReadIfNeeded();
+            stream->readSuffix();
+        }
+
+        void rethrowExceptionDuringReadIfNeeded()
+        {
+            std::lock_guard<std::mutex> lck(exception_during_read_lock);
+            if (exception_during_read)
+            {
+                command = nullptr;
+                std::rethrow_exception(exception_during_read);
+            }
+        }
+
+        String getName() const override { return "PoolWithBackgroundThread"; }
+
+        std::shared_ptr<ProcessPool> process_pool;
+        std::unique_ptr<ShellCommand> command;
+        BlockInputStreamPtr stream;
+        size_t rows_to_read;
+        Poco::Logger * log;
+        std::function<void(WriteBufferFromFile &)> send_data;
+        ThreadFromGlobalPool thread;
+        size_t current_read_rows = 0;
+        std::mutex exception_during_read_lock;
+        std::exception_ptr exception_during_read;
+    };
+
+}
+
+BlockInputStreamPtr ExecutablePoolDictionarySource::loadIds(const std::vector<UInt64> & ids)
+{
+    LOG_TRACE(log, "loadIds {} size = {}", toString(), ids.size());
+
+    auto block = blockForIds(dict_struct, ids);
+    return getStreamForBlock(block);
+}
+
+BlockInputStreamPtr ExecutablePoolDictionarySource::loadKeys(const Columns & key_columns, const std::vector<size_t> & requested_rows)
+{
+    LOG_TRACE(log, "loadKeys {} size = {}", toString(), requested_rows.size());
+
+    auto block = blockForKeys(dict_struct, key_columns, requested_rows);
+    return getStreamForBlock(block);
+}
+
+BlockInputStreamPtr ExecutablePoolDictionarySource::getStreamForBlock(const Block & block)
+{
+    std::unique_ptr<ShellCommand> process;
+    bool result = process_pool->tryBorrowObject(process, [this]()
+    {
+        bool terminate_in_destructor = true;
+        ShellCommandDestructorStrategy strategy { terminate_in_destructor, configuration.command_termination_timeout };
+        auto shell_command = ShellCommand::execute(configuration.command, false, strategy);
+        return shell_command;
+    }, configuration.max_command_execution_time * 10000);
+
+    if (!result)
+        throw Exception(ErrorCodes::TIMEOUT_EXCEEDED,
+            "Could not get process from pool, max command execution timeout exceeded ({}) seconds",
+            configuration.max_command_execution_time);
+
+    size_t rows_to_read = block.rows();
+    auto read_stream = context->getInputFormat(configuration.format, process->out, sample_block, rows_to_read);
+
+    auto stream = std::make_unique<PoolBlockInputStreamWithBackgroundThread>(
+        process_pool, std::move(process), std::move(read_stream), rows_to_read, log,
+        [block, this](WriteBufferFromFile & out) mutable
+        {
+            auto output_stream = context->getOutputStream(configuration.format, out, block.cloneEmpty());
+            formatBlock(output_stream, block);
+        });
+
+    if (configuration.implicit_key)
+        return std::make_shared<BlockInputStreamWithAdditionalColumns>(block, std::move(stream));
+    else
+        return std::shared_ptr<PoolBlockInputStreamWithBackgroundThread>(stream.release());
+}
+
+bool ExecutablePoolDictionarySource::isModified() const
+{
+    return true;
+}
+
+bool ExecutablePoolDictionarySource::supportsSelectiveLoad() const
+{
+    return true;
+}
+
+bool ExecutablePoolDictionarySource::hasUpdateField() const
+{
+    return !configuration.update_field.empty();
+}
+
+DictionarySourcePtr ExecutablePoolDictionarySource::clone() const
+{
+    return std::make_unique<ExecutablePoolDictionarySource>(*this);
+}
+
+std::string ExecutablePoolDictionarySource::toString() const
+{
+    return "ExecutablePool size: " + std::to_string(configuration.pool_size) + " command: " + configuration.command;
+}
+
+void registerDictionarySourceExecutablePool(DictionarySourceFactory & factory)
+{
+    auto create_table_source = [=](const DictionaryStructure & dict_struct,
+                                 const Poco::Util::AbstractConfiguration & config,
+                                 const std::string & config_prefix,
+                                 Block & sample_block,
+                                 ContextPtr context,
+                                 const std::string & /* default_database */,
+                                 bool check_config) -> DictionarySourcePtr
+    {
+        if (dict_struct.has_expressions)
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Dictionary source of type `executable_pool` does not support attribute expressions");
+
+        /// Executable dictionaries may execute arbitrary commands.
+        /// It's OK for dictionaries created by administrator from xml-file, but
+        /// maybe dangerous for dictionaries created from DDL-queries.
+        if (check_config)
+            throw Exception(ErrorCodes::DICTIONARY_ACCESS_DENIED, "Dictionaries with executable pool dictionary source are not allowed to be created from DDL query");
+
+        auto context_local_copy = copyContextAndApplySettings(config_prefix, context, config);
+
+        /** Currently parallel parsing input format cannot read exactly max_block_size rows from input,
+         *  so it will be blocked on ReadBufferFromFileDescriptor because this file descriptor represent pipe that does not have eof.
+         */
+        auto settings_no_parallel_parsing = context_local_copy->getSettings();
+        settings_no_parallel_parsing.input_format_parallel_parsing = false;
+        context_local_copy->setSettings(settings_no_parallel_parsing);
+
+        String configuration_config_prefix = config_prefix + ".executable_pool";
+
+        size_t max_command_execution_time = config.getUInt64(configuration_config_prefix + ".max_command_execution_time", 10);
+
+        size_t max_execution_time_seconds = static_cast<size_t>(context->getSettings().max_execution_time.totalSeconds());
+        if (max_execution_time_seconds != 0 && max_command_execution_time > max_execution_time_seconds)
+            max_command_execution_time = max_execution_time_seconds;
+
+        ExecutablePoolDictionarySource::Configuration configuration
+        {
+            .command = config.getString(configuration_config_prefix + ".command"),
+            .format = config.getString(configuration_config_prefix + ".format"),
+            .pool_size = config.getUInt64(configuration_config_prefix + ".size"),
+            .update_field = config.getString(configuration_config_prefix + ".update_field", ""),
+            .implicit_key = config.getBool(configuration_config_prefix + ".implicit_key", false),
+            .command_termination_timeout = config.getUInt64(configuration_config_prefix + ".command_termination_timeout", 10),
+            .max_command_execution_time = max_command_execution_time
+        };
+
+        return std::make_unique<ExecutablePoolDictionarySource>(dict_struct, configuration, sample_block, context_local_copy);
+    };
+
+    factory.registerSource("executable_pool", create_table_source);
+}
+
+}
diff --git a/src/Dictionaries/ExecutablePoolDictionarySource.h b/src/Dictionaries/ExecutablePoolDictionarySource.h
new file mode 100644
index 00000000000..7a0b8681a21
--- /dev/null
+++ b/src/Dictionaries/ExecutablePoolDictionarySource.h
@@ -0,0 +1,85 @@
+#pragma once
+
+#include <common/BorrowedObjectPool.h>
+
+#include <Core/Block.h>
+#include <Interpreters/Context.h>
+
+#include "IDictionarySource.h"
+#include "DictionaryStructure.h"
+
+namespace Poco { class Logger; }
+
+
+namespace DB
+{
+
+using ProcessPool = BorrowedObjectPool<std::unique_ptr<ShellCommand>>;
+
+/** ExecutablePoolDictionarySource allows loading data from pool of processes.
+  * When client requests ids or keys source get process from ProcessPool
+  * and create stream based on source format from process stdout.
+  * It is important that stream format will expect only rows that were requested.
+  * When stream is finished process is returned back to the ProcessPool.
+  * If there are no processes in pool during request client will be blocked
+  * until some process will be retunred to pool.
+  */
+class ExecutablePoolDictionarySource final : public IDictionarySource
+{
+public:
+    struct Configuration
+    {
+        const String command;
+        const String format;
+        const size_t pool_size;
+        const String update_field;
+        const bool implicit_key;
+        const size_t command_termination_timeout;
+        const size_t max_command_execution_time;
+    };
+
+    ExecutablePoolDictionarySource(
+        const DictionaryStructure & dict_struct_,
+        const Configuration & configuration_,
+        Block & sample_block_,
+        ContextPtr context_);
+
+    ExecutablePoolDictionarySource(const ExecutablePoolDictionarySource & other);
+    ExecutablePoolDictionarySource & operator=(const ExecutablePoolDictionarySource &) = delete;
+
+    BlockInputStreamPtr loadAll() override;
+
+    /** The logic of this method is flawed, absolutely incorrect and ignorant.
+      * It may lead to skipping some values due to clock sync or timezone changes.
+      * The intended usage of "update_field" is totally different.
+      */
+    BlockInputStreamPtr loadUpdatedAll() override;
+
+    BlockInputStreamPtr loadIds(const std::vector<UInt64> & ids) override;
+
+    BlockInputStreamPtr loadKeys(const Columns & key_columns, const std::vector<size_t> & requested_rows) override;
+
+    bool isModified() const override;
+
+    bool supportsSelectiveLoad() const override;
+
+    bool hasUpdateField() const override;
+
+    DictionarySourcePtr clone() const override;
+
+    std::string toString() const override;
+
+    BlockInputStreamPtr getStreamForBlock(const Block & block);
+
+private:
+    Poco::Logger * log;
+    time_t update_time = 0;
+    const DictionaryStructure dict_struct;
+    const Configuration configuration;
+
+    Block sample_block;
+    ContextPtr context;
+    std::shared_ptr<ProcessPool> process_pool;
+};
+
+}
diff --git a/src/Dictionaries/ExternalQueryBuilder.cpp b/src/Dictionaries/ExternalQueryBuilder.cpp
index e8d71b1fd85..8c6e9f60afb 100644
--- a/src/Dictionaries/ExternalQueryBuilder.cpp
+++ b/src/Dictionaries/ExternalQueryBuilder.cpp
@@ -173,7 +173,7 @@ std::string ExternalQueryBuilder::composeUpdateQuery(const std::string & update_
 std::string ExternalQueryBuilder::composeLoadIdsQuery(const std::vector<UInt64> & ids)
 {
     if (!dict_struct.id)
-        throw Exception{"Simple key required for method", ErrorCodes::UNSUPPORTED_METHOD};
+        throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "Simple key required for method");
 
     WriteBufferFromOwnString out;
     writeString("SELECT ", out);
@@ -244,10 +244,10 @@ std::string ExternalQueryBuilder::composeLoadKeysQuery(
     const Columns & key_columns, const std::vector<size_t> & requested_rows, LoadKeysMethod method, size_t partition_key_prefix)
 {
     if (!dict_struct.key)
-        throw Exception{"Composite key required for method", ErrorCodes::UNSUPPORTED_METHOD};
+        throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "Composite key required for method");
 
     if (key_columns.size() != dict_struct.key->size())
-        throw Exception{"The size of key_columns does not equal to the size of dictionary key", ErrorCodes::LOGICAL_ERROR};
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "The size of key_columns does not equal to the size of dictionary key");
 
     WriteBufferFromOwnString out;
     writeString("SELECT ", out);
@@ -358,7 +358,7 @@ void ExternalQueryBuilder::composeKeyCondition(const Columns & key_columns, cons
         /// key_i=value_i
         writeQuoted(key_description.name, out);
         writeString("=", out);
-        key_description.type->serializeAsTextQuoted(*key_columns[i], row, out, format_settings);
+        key_description.serialization->serializeTextQuoted(*key_columns[i], row, out, format_settings);
     }
 }
 
@@ -386,7 +386,7 @@ void ExternalQueryBuilder::composeInWithTuples(const Columns & key_columns, cons
 void ExternalQueryBuilder::composeKeyTupleDefinition(WriteBuffer & out, size_t beg, size_t end) const
 {
     if (!dict_struct.key)
-        throw Exception{"Composite key required for method", ErrorCodes::UNSUPPORTED_METHOD};
+        throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "Composite key required for method");
 
     writeChar('(', out);
 
@@ -415,7 +415,7 @@ void ExternalQueryBuilder::composeKeyTuple(const Columns & key_columns, const si
             writeString(", ", out);
 
         first = false;
-        (*dict_struct.key)[i].type->serializeAsTextQuoted(*key_columns[i], row, out, format_settings);
+        (*dict_struct.key)[i].serialization->serializeTextQuoted(*key_columns[i], row, out, format_settings);
     }
 
     writeString(")", out);
diff --git a/src/Dictionaries/FileDictionarySource.cpp b/src/Dictionaries/FileDictionarySource.cpp
index addc2adef02..378c6f11857 100644
--- a/src/Dictionaries/FileDictionarySource.cpp
+++ b/src/Dictionaries/FileDictionarySource.cpp
@@ -1,8 +1,11 @@
 #include "FileDictionarySource.h"
+
+#include <Poco/File.h>
+#include <filesystem>
+
 #include <DataStreams/OwningBlockInputStream.h>
 #include <IO/ReadBufferFromFile.h>
 #include <Interpreters/Context.h>
-#include <Poco/File.h>
 #include <Common/StringUtils/StringUtils.h>
 #include <common/logger_useful.h>
 #include "DictionarySourceFactory.h"
@@ -10,7 +13,6 @@
 #include "registerDictionaries.h"
 #include "DictionarySourceHelpers.h"
 
-
 namespace DB
 {
 static const UInt64 max_block_size = 8192;
@@ -24,7 +26,7 @@ namespace ErrorCodes
 
 FileDictionarySource::FileDictionarySource(
     const std::string & filepath_, const std::string & format_,
-    Block & sample_block_, const Context & context_, bool check_config)
+    Block & sample_block_, ContextPtr context_, bool check_config)
     : filepath{filepath_}
     , format{format_}
     , sample_block{sample_block_}
@@ -32,9 +34,19 @@ FileDictionarySource::FileDictionarySource(
 {
     if (check_config)
     {
-        const String user_files_path = context.getUserFilesPath();
-        if (!startsWith(filepath, user_files_path))
-            throw Exception(ErrorCodes::PATH_ACCESS_DENIED, "File path {} is not inside {}", filepath, user_files_path);
+        auto source_file_path = std::filesystem::path(filepath);
+        auto source_file_absolute_path = std::filesystem::canonical(source_file_path);
+
+        String user_files_path_string_value = context->getUserFilesPath();
+        auto user_files_path = std::filesystem::path(user_files_path_string_value);
+        auto user_files_absolute_path = std::filesystem::canonical(user_files_path);
+
+        auto [_, user_files_absolute_path_mismatch_it] = std::mismatch(source_file_absolute_path.begin(), source_file_absolute_path.end(), user_files_absolute_path.begin(), user_files_absolute_path.end());
+
+        bool user_files_absolute_path_include_source_file_absolute_path = user_files_absolute_path_mismatch_it == user_files_absolute_path.end();
+
+        if (!user_files_absolute_path_include_source_file_absolute_path)
+            throw Exception(ErrorCodes::PATH_ACCESS_DENIED, "File path {} is not inside {}", filepath, user_files_path_string_value);
     }
 }
 
@@ -43,7 +55,7 @@ FileDictionarySource::FileDictionarySource(const FileDictionarySource & other)
     : filepath{other.filepath}
     , format{other.format}
     , sample_block{other.sample_block}
-    , context(other.context)
+    , context(Context::createCopy(other.context))
     , last_modification{other.last_modification}
 {
 }
@@ -53,7 +65,7 @@ BlockInputStreamPtr FileDictionarySource::loadAll()
 {
     LOG_TRACE(&Poco::Logger::get("FileDictionary"), "loadAll {}", toString());
     auto in_ptr = std::make_unique<ReadBufferFromFile>(filepath);
-    auto stream = context.getInputFormat(format, *in_ptr, sample_block, max_block_size);
+    auto stream = context->getInputFormat(format, *in_ptr, sample_block, max_block_size);
     last_modification = getLastModification();
 
     return std::make_shared<OwningBlockInputStream<ReadBuffer>>(stream, std::move(in_ptr));
@@ -77,17 +89,17 @@ void registerDictionarySourceFile(DictionarySourceFactory & factory)
                                  const Poco::Util::AbstractConfiguration & config,
                                  const std::string & config_prefix,
                                  Block & sample_block,
-                                 const Context & context,
+                                 ContextPtr context,
                                  const std::string & /* default_database */,
                                  bool check_config) -> DictionarySourcePtr
     {
         if (dict_struct.has_expressions)
-            throw Exception{"Dictionary source of type `file` does not support attribute expressions", ErrorCodes::LOGICAL_ERROR};
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Dictionary source of type `file` does not support attribute expressions");
 
         const auto filepath = config.getString(config_prefix + ".file.path");
         const auto format = config.getString(config_prefix + ".file.format");
 
-        Context context_local_copy = copyContextAndApplySettings(config_prefix, context, config);
+        auto context_local_copy = copyContextAndApplySettings(config_prefix, context, config);
 
         return std::make_unique<FileDictionarySource>(filepath, format, sample_block, context_local_copy, check_config);
     };
diff --git a/src/Dictionaries/FileDictionarySource.h b/src/Dictionaries/FileDictionarySource.h
index fa47b280911..6559503cccd 100644
--- a/src/Dictionaries/FileDictionarySource.h
+++ b/src/Dictionaries/FileDictionarySource.h
@@ -17,7 +17,7 @@ class FileDictionarySource final : public IDictionarySource
 {
 public:
     FileDictionarySource(const std::string & filepath_, const std::string & format_,
-        Block & sample_block_, const Context & context_, bool check_config);
+        Block & sample_block_, ContextPtr context_, bool check_config);
 
     FileDictionarySource(const FileDictionarySource & other);
 
@@ -25,17 +25,17 @@ public:
 
     BlockInputStreamPtr loadUpdatedAll() override
     {
-        throw Exception{"Method loadUpdatedAll is unsupported for FileDictionarySource", ErrorCodes::NOT_IMPLEMENTED};
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method loadUpdatedAll is unsupported for FileDictionarySource");
     }
 
     BlockInputStreamPtr loadIds(const std::vector<UInt64> & /*ids*/) override
     {
-        throw Exception{"Method loadIds is unsupported for FileDictionarySource", ErrorCodes::NOT_IMPLEMENTED};
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method loadIds is unsupported for FileDictionarySource");
     }
 
     BlockInputStreamPtr loadKeys(const Columns & /*key_columns*/, const std::vector<size_t> & /*requested_rows*/) override
     {
-        throw Exception{"Method loadKeys is unsupported for FileDictionarySource", ErrorCodes::NOT_IMPLEMENTED};
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method loadKeys is unsupported for FileDictionarySource");
     }
 
     bool isModified() const override
@@ -61,7 +61,7 @@ private:
     const std::string filepath;
     const std::string format;
     Block sample_block;
-    const Context context;
+    ContextPtr context;
     Poco::Timestamp last_modification;
 };
 
diff --git a/src/Dictionaries/FlatDictionary.cpp b/src/Dictionaries/FlatDictionary.cpp
index f4f50a69598..1540a3a876b 100644
--- a/src/Dictionaries/FlatDictionary.cpp
+++ b/src/Dictionaries/FlatDictionary.cpp
@@ -1,131 +1,69 @@
 #include "FlatDictionary.h"
 
 #include <Core/Defines.h>
+#include <Common/HashTable/HashMap.h>
+#include <Common/HashTable/HashSet.h>
+
 #include <DataTypes/DataTypesDecimal.h>
 #include <IO/WriteHelpers.h>
 #include <Columns/ColumnsNumber.h>
 #include <Columns/ColumnNullable.h>
 #include <Functions/FunctionHelpers.h>
 
-#include "DictionaryBlockInputStream.h"
-#include "DictionaryFactory.h"
+#include <Dictionaries/DictionaryBlockInputStream.h>
+#include <Dictionaries/DictionaryFactory.h>
+#include <Dictionaries/HierarchyDictionariesUtils.h>
 
 namespace DB
 {
 namespace ErrorCodes
 {
-    extern const int TYPE_MISMATCH;
     extern const int ARGUMENT_OUT_OF_BOUND;
     extern const int BAD_ARGUMENTS;
     extern const int DICTIONARY_IS_EMPTY;
     extern const int UNSUPPORTED_METHOD;
 }
 
-static const auto initial_array_size = 1024;
-static const auto max_array_size = 500000;
-
-
 FlatDictionary::FlatDictionary(
     const StorageID & dict_id_,
     const DictionaryStructure & dict_struct_,
     DictionarySourcePtr source_ptr_,
     const DictionaryLifetime dict_lifetime_,
-    bool require_nonempty_,
-    BlockPtr saved_block_)
+    Configuration configuration_,
+    BlockPtr previously_loaded_block_)
     : IDictionary(dict_id_)
     , dict_struct(dict_struct_)
     , source_ptr{std::move(source_ptr_)}
     , dict_lifetime(dict_lifetime_)
-    , require_nonempty(require_nonempty_)
-    , loaded_ids(initial_array_size, false)
-    , saved_block{std::move(saved_block_)}
+    , configuration(configuration_)
+    , loaded_keys(configuration.initial_array_size, false)
+    , previously_loaded_block(std::move(previously_loaded_block_))
 {
     createAttributes();
     loadData();
     calculateBytesAllocated();
 }
 
-
-void FlatDictionary::toParent(const PaddedPODArray<Key> & ids, PaddedPODArray<Key> & out) const
-{
-    const auto null_value = std::get<UInt64>(hierarchical_attribute->null_values);
-    DictionaryDefaultValueExtractor<UInt64> extractor(null_value);
-
-    getItemsImpl<UInt64, UInt64>(
-        *hierarchical_attribute,
-        ids,
-        [&](const size_t row, const UInt64 value) { out[row] = value; },
-        extractor);
-}
-
-
-/// Allow to use single value in same way as array.
-static inline FlatDictionary::Key getAt(const PaddedPODArray<FlatDictionary::Key> & arr, const size_t idx)
-{
-    return arr[idx];
-}
-static inline FlatDictionary::Key getAt(const FlatDictionary::Key & value, const size_t)
-{
-    return value;
-}
-
-template <typename ChildType, typename AncestorType>
-void FlatDictionary::isInImpl(const ChildType & child_ids, const AncestorType & ancestor_ids, PaddedPODArray<UInt8> & out) const
-{
-    const auto null_value = std::get<UInt64>(hierarchical_attribute->null_values);
-    const auto & attr = std::get<ContainerType<Key>>(hierarchical_attribute->arrays);
-    const auto rows = out.size();
-
-    size_t loaded_size = attr.size();
-    for (const auto row : ext::range(0, rows))
-    {
-        auto id = getAt(child_ids, row);
-        const auto ancestor_id = getAt(ancestor_ids, row);
-
-        for (size_t i = 0; id < loaded_size && id != null_value && id != ancestor_id && i < DBMS_HIERARCHICAL_DICTIONARY_MAX_DEPTH; ++i)
-            id = attr[id];
-
-        out[row] = id != null_value && id == ancestor_id;
-    }
-
-    query_count.fetch_add(rows, std::memory_order_relaxed);
-}
-
-
-void FlatDictionary::isInVectorVector(
-    const PaddedPODArray<Key> & child_ids, const PaddedPODArray<Key> & ancestor_ids, PaddedPODArray<UInt8> & out) const
-{
-    isInImpl(child_ids, ancestor_ids, out);
-}
-
-void FlatDictionary::isInVectorConstant(const PaddedPODArray<Key> & child_ids, const Key ancestor_id, PaddedPODArray<UInt8> & out) const
-{
-    isInImpl(child_ids, ancestor_id, out);
-}
-
-void FlatDictionary::isInConstantVector(const Key child_id, const PaddedPODArray<Key> & ancestor_ids, PaddedPODArray<UInt8> & out) const
-{
-    isInImpl(child_id, ancestor_ids, out);
-}
-
 ColumnPtr FlatDictionary::getColumn(
         const std::string & attribute_name,
         const DataTypePtr & result_type,
         const Columns & key_columns,
         const DataTypes &,
-        const ColumnPtr default_values_column) const
+        const ColumnPtr & default_values_column) const
 {
     ColumnPtr result;
 
-    PaddedPODArray<Key> backup_storage;
+    PaddedPODArray<UInt64> backup_storage;
     const auto & ids = getColumnVectorData(this, key_columns.front(), backup_storage);
 
     auto size = ids.size();
 
-    const auto & attribute = getAttribute(attribute_name);
     const auto & dictionary_attribute = dict_struct.getAttribute(attribute_name, result_type);
 
-    auto type_call = [&](const auto &dictionary_attribute_type)
+    size_t attribute_index = dict_struct.attribute_name_to_index.find(attribute_name)->second;
+    const auto & attribute = attributes[attribute_index];
+
+    auto type_call = [&](const auto & dictionary_attribute_type)
     {
         using Type = std::decay_t<decltype(dictionary_attribute_type)>;
         using AttributeType = typename Type::AttributeType;
@@ -167,7 +105,7 @@ ColumnPtr FlatDictionary::getColumn(
     if (attribute.nullable_set)
     {
         ColumnUInt8::MutablePtr col_null_map_to = ColumnUInt8::create(size, false);
-        ColumnUInt8::Container& vec_null_map_to = col_null_map_to->getData();
+        ColumnUInt8::Container & vec_null_map_to = col_null_map_to->getData();
 
         for (size_t row = 0; row < ids.size(); ++row)
         {
@@ -183,24 +121,111 @@ ColumnPtr FlatDictionary::getColumn(
     return result;
 }
 
-
 ColumnUInt8::Ptr FlatDictionary::hasKeys(const Columns & key_columns, const DataTypes &) const
 {
-    PaddedPODArray<Key> backup_storage;
-    const auto& ids = getColumnVectorData(this, key_columns.front(), backup_storage);
+    PaddedPODArray<UInt64> backup_storage;
+    const auto & keys = getColumnVectorData(this, key_columns.front(), backup_storage);
+    size_t keys_size = keys.size();
 
-    auto result = ColumnUInt8::create(ext::size(ids));
-    auto& out = result->getData();
+    auto result = ColumnUInt8::create(keys_size);
+    auto & out = result->getData();
 
-    const auto ids_count = ext::size(ids);
-
-    for (const auto i : ext::range(0, ids_count))
+    for (size_t key_index = 0; key_index < keys_size; ++key_index)
     {
-        const auto id = ids[i];
-        out[i] = id < loaded_ids.size() && loaded_ids[id];
+        const auto key = keys[key_index];
+        out[key_index] = key < loaded_keys.size() && loaded_keys[key];
     }
 
-    query_count.fetch_add(ids_count, std::memory_order_relaxed);
+    query_count.fetch_add(keys_size, std::memory_order_relaxed);
+
+    return result;
+}
+
+ColumnPtr FlatDictionary::getHierarchy(ColumnPtr key_column, const DataTypePtr &) const
+{
+    PaddedPODArray<UInt64> keys_backup_storage;
+    const auto & keys = getColumnVectorData(this, key_column, keys_backup_storage);
+
+    size_t hierarchical_attribute_index = *dict_struct.hierarchical_attribute_index;
+    const auto & hierarchical_attribute = attributes[hierarchical_attribute_index];
+
+    const UInt64 null_value = std::get<UInt64>(hierarchical_attribute.null_values);
+    const ContainerType<UInt64> & parent_keys = std::get<ContainerType<UInt64>>(hierarchical_attribute.container);
+
+    auto is_key_valid_func = [&, this](auto & key) { return key < loaded_keys.size() && loaded_keys[key]; };
+
+    auto get_parent_key_func = [&, this](auto & hierarchy_key)
+    {
+        bool is_key_valid = hierarchy_key < loaded_keys.size() && loaded_keys[hierarchy_key];
+        std::optional<UInt64> result = is_key_valid ? std::make_optional(parent_keys[hierarchy_key]) : std::nullopt;
+        return result;
+    };
+
+    auto dictionary_hierarchy_array = getKeysHierarchyArray(keys, null_value, is_key_valid_func, get_parent_key_func);
+
+    query_count.fetch_add(keys.size(), std::memory_order_relaxed);
+
+    return dictionary_hierarchy_array;
+}
+
+ColumnUInt8::Ptr FlatDictionary::isInHierarchy(
+    ColumnPtr key_column,
+    ColumnPtr in_key_column,
+    const DataTypePtr &) const
+{
+    PaddedPODArray<UInt64> keys_backup_storage;
+    const auto & keys = getColumnVectorData(this, key_column, keys_backup_storage);
+
+    PaddedPODArray<UInt64> keys_in_backup_storage;
+    const auto & keys_in = getColumnVectorData(this, in_key_column, keys_in_backup_storage);
+
+    size_t hierarchical_attribute_index = *dict_struct.hierarchical_attribute_index;
+    const auto & hierarchical_attribute = attributes[hierarchical_attribute_index];
+
+    const UInt64 null_value = std::get<UInt64>(hierarchical_attribute.null_values);
+    const ContainerType<UInt64> & parent_keys = std::get<ContainerType<UInt64>>(hierarchical_attribute.container);
+
+    auto is_key_valid_func = [&, this](auto & key) { return key < loaded_keys.size() && loaded_keys[key]; };
+
+    auto get_parent_key_func = [&, this](auto & hierarchy_key)
+    {
+        bool is_key_valid = hierarchy_key < loaded_keys.size() && loaded_keys[hierarchy_key];
+        std::optional<UInt64> result = is_key_valid ? std::make_optional(parent_keys[hierarchy_key]) : std::nullopt;
+        return result;
+    };
+
+    auto result = getKeysIsInHierarchyColumn(keys, keys_in, null_value, is_key_valid_func, get_parent_key_func);
+
+    query_count.fetch_add(keys.size(), std::memory_order_relaxed);
+
+    return result;
+}
+
+ColumnPtr FlatDictionary::getDescendants(
+    ColumnPtr key_column,
+    const DataTypePtr &,
+    size_t level) const
+{
+    PaddedPODArray<UInt64> keys_backup;
+    const auto & keys = getColumnVectorData(this, key_column, keys_backup);
+
+    size_t hierarchical_attribute_index = *dict_struct.hierarchical_attribute_index;
+    const auto & hierarchical_attribute = attributes[hierarchical_attribute_index];
+    const ContainerType<UInt64> & parent_keys = std::get<ContainerType<UInt64>>(hierarchical_attribute.container);
+
+    HashMap<UInt64, PaddedPODArray<UInt64>> parent_to_child;
+
+    for (size_t i = 0; i < parent_keys.size(); ++i)
+    {
+        auto parent_key = parent_keys[i];
+
+        if (loaded_keys[i])
+            parent_to_child[parent_key].emplace_back(static_cast<UInt64>(i));
+    }
+
+    auto result = getKeysDescendantsArray(keys, parent_to_child, level);
+
+    query_count.fetch_add(keys.size(), std::memory_order_relaxed);
 
     return result;
 }
@@ -211,38 +236,44 @@ void FlatDictionary::createAttributes()
     attributes.reserve(size);
 
     for (const auto & attribute : dict_struct.attributes)
-    {
-        attribute_index_by_name.emplace(attribute.name, attributes.size());
         attributes.push_back(createAttribute(attribute, attribute.null_value));
-
-        if (attribute.hierarchical)
-        {
-            hierarchical_attribute = &attributes.back();
-
-            if (hierarchical_attribute->type != AttributeUnderlyingType::utUInt64)
-                throw Exception{full_name + ": hierarchical attribute must be UInt64.", ErrorCodes::TYPE_MISMATCH};
-        }
-    }
 }
 
 void FlatDictionary::blockToAttributes(const Block & block)
 {
-    const IColumn & id_column = *block.safeGetByPosition(0).column;
-    element_count += id_column.size();
+    const auto keys_column = block.safeGetByPosition(0).column;
 
-    for (const size_t attribute_idx : ext::range(0, attributes.size()))
+    DictionaryKeysArenaHolder<DictionaryKeyType::simple> arena_holder;
+    DictionaryKeysExtractor<DictionaryKeyType::simple> keys_extractor({ keys_column }, arena_holder.getComplexKeyArena());
+    auto keys = keys_extractor.extractAllKeys();
+
+    HashSet<UInt64> already_processed_keys;
+
+    size_t key_offset = 1;
+    for (size_t attribute_index = 0; attribute_index < attributes.size(); ++attribute_index)
     {
-        const IColumn & attribute_column = *block.safeGetByPosition(attribute_idx + 1).column;
-        Attribute & attribute = attributes[attribute_idx];
+        const IColumn & attribute_column = *block.safeGetByPosition(attribute_index + key_offset).column;
+        Attribute & attribute = attributes[attribute_index];
 
-        for (const auto row_idx : ext::range(0, id_column.size()))
-            setAttributeValue(attribute, id_column[row_idx].get<UInt64>(), attribute_column[row_idx]);
+        for (size_t i = 0; i < keys.size(); ++i)
+        {
+            auto key = keys[i];
+
+            if (already_processed_keys.find(key) != nullptr)
+                continue;
+            already_processed_keys.insert(key);
+
+            setAttributeValue(attribute, key, attribute_column[i]);
+            ++element_count;
+        }
+
+        already_processed_keys.clear();
     }
 }
 
 void FlatDictionary::updateData()
 {
-    if (!saved_block || saved_block->rows() == 0)
+    if (!previously_loaded_block || previously_loaded_block->rows() == 0)
     {
         auto stream = source_ptr->loadUpdatedAll();
         stream->readPrefix();
@@ -250,12 +281,13 @@ void FlatDictionary::updateData()
         while (const auto block = stream->read())
         {
             /// We are using this to keep saved data if input stream consists of multiple blocks
-            if (!saved_block)
-                saved_block = std::make_shared<DB::Block>(block.cloneEmpty());
-            for (const auto attribute_idx : ext::range(0, attributes.size() + 1))
+            if (!previously_loaded_block)
+                previously_loaded_block = std::make_shared<DB::Block>(block.cloneEmpty());
+
+            for (size_t column_index = 0; column_index < block.columns(); ++column_index)
             {
-                const IColumn & update_column = *block.getByPosition(attribute_idx).column.get();
-                MutableColumnPtr saved_column = saved_block->getByPosition(attribute_idx).column->assumeMutable();
+                const IColumn & update_column = *block.getByPosition(column_index).column.get();
+                MutableColumnPtr saved_column = previously_loaded_block->getByPosition(column_index).column->assumeMutable();
                 saved_column->insertRangeFrom(update_column, 0, update_column.size());
             }
         }
@@ -264,51 +296,14 @@ void FlatDictionary::updateData()
     else
     {
         auto stream = source_ptr->loadUpdatedAll();
-        stream->readPrefix();
-
-        while (Block block = stream->read())
-        {
-            const auto & saved_id_column = *saved_block->safeGetByPosition(0).column;
-            const auto & update_id_column = *block.safeGetByPosition(0).column;
-
-            std::unordered_map<Key, std::vector<size_t>> update_ids;
-            for (size_t row = 0; row < update_id_column.size(); ++row)
-            {
-                const auto id = update_id_column.get64(row);
-                update_ids[id].push_back(row);
-            }
-
-            const size_t saved_rows = saved_id_column.size();
-            IColumn::Filter filter(saved_rows);
-            std::unordered_map<Key, std::vector<size_t>>::iterator it;
-
-            for (size_t row = 0; row < saved_id_column.size(); ++row)
-            {
-                auto id = saved_id_column.get64(row);
-                it = update_ids.find(id);
-
-                if (it != update_ids.end())
-                    filter[row] = 0;
-                else
-                    filter[row] = 1;
-            }
-
-            auto block_columns = block.mutateColumns();
-            for (const auto attribute_idx : ext::range(0, attributes.size() + 1))
-            {
-                auto & column = saved_block->safeGetByPosition(attribute_idx).column;
-                const auto & filtered_column = column->filter(filter, -1);
-
-                block_columns[attribute_idx]->insertRangeFrom(*filtered_column.get(), 0, filtered_column->size());
-            }
-
-            saved_block->setColumns(std::move(block_columns));
-        }
-        stream->readSuffix();
+        mergeBlockWithStream<DictionaryKeyType::simple>(
+            dict_struct.getKeysSize(),
+            *previously_loaded_block,
+            stream);
     }
 
-    if (saved_block)
-        blockToAttributes(*saved_block.get());
+    if (previously_loaded_block)
+        blockToAttributes(*previously_loaded_block.get());
 }
 
 void FlatDictionary::loadData()
@@ -326,26 +321,8 @@ void FlatDictionary::loadData()
     else
         updateData();
 
-    if (require_nonempty && 0 == element_count)
-        throw Exception{full_name + ": dictionary source is empty and 'require_nonempty' property is set.", ErrorCodes::DICTIONARY_IS_EMPTY};
-}
-
-
-template <typename T>
-void FlatDictionary::addAttributeSize(const Attribute & attribute)
-{
-    const auto & array_ref = std::get<ContainerType<T>>(attribute.arrays);
-    bytes_allocated += sizeof(PaddedPODArray<T>) + array_ref.allocated_bytes();
-    bucket_count = array_ref.capacity();
-}
-
-template <>
-void FlatDictionary::addAttributeSize<String>(const Attribute & attribute)
-{
-    const auto & array_ref = std::get<ContainerType<StringRef>>(attribute.arrays);
-    bytes_allocated += sizeof(PaddedPODArray<StringRef>) + array_ref.allocated_bytes();
-    bytes_allocated += sizeof(Arena) + attribute.string_arena->size();
-    bucket_count = array_ref.capacity();
+    if (configuration.require_nonempty && 0 == element_count)
+        throw Exception(ErrorCodes::DICTIONARY_IS_EMPTY, "{}: dictionary source is empty and 'require_nonempty' property is set.", full_name);
 }
 
 void FlatDictionary::calculateBytesAllocated()
@@ -358,103 +335,108 @@ void FlatDictionary::calculateBytesAllocated()
         {
             using Type = std::decay_t<decltype(dictionary_attribute_type)>;
             using AttributeType = typename Type::AttributeType;
+            using ValueType = DictionaryValueType<AttributeType>;
 
-            addAttributeSize<AttributeType>(attribute);
+            const auto & container = std::get<ContainerType<ValueType>>(attribute.container);
+            bytes_allocated += sizeof(PaddedPODArray<ValueType>) + container.allocated_bytes();
+            bucket_count = container.capacity();
+
+            if constexpr (std::is_same_v<ValueType, StringRef>)
+                bytes_allocated += sizeof(Arena) + attribute.string_arena->size();
         };
 
         callOnDictionaryAttributeType(attribute.type, type_call);
     }
 }
 
-
-template <typename T>
-void FlatDictionary::createAttributeImpl(Attribute & attribute, const Field & null_value)
+FlatDictionary::Attribute FlatDictionary::createAttribute(const DictionaryAttribute & dictionary_attribute, const Field & null_value)
 {
-    attribute.null_values = T(null_value.get<NearestFieldType<T>>());
-    const auto & null_value_ref = std::get<T>(attribute.null_values);
-    attribute.arrays.emplace<ContainerType<T>>(initial_array_size, null_value_ref);
-}
+    auto nullable_set = dictionary_attribute.is_nullable ? std::make_optional<NullableSet>() : std::optional<NullableSet>{};
+    Attribute attribute{dictionary_attribute.underlying_type, std::move(nullable_set), {}, {}, {}};
 
-template <>
-void FlatDictionary::createAttributeImpl<String>(Attribute & attribute, const Field & null_value)
-{
-    attribute.string_arena = std::make_unique<Arena>();
-    const String & string = null_value.get<String>();
-    const char * string_in_arena = attribute.string_arena->insert(string.data(), string.size());
-    attribute.null_values.emplace<StringRef>(string_in_arena, string.size());
-    attribute.arrays.emplace<ContainerType<StringRef>>(initial_array_size, StringRef(string_in_arena, string.size()));
-}
-
-
-FlatDictionary::Attribute FlatDictionary::createAttribute(const DictionaryAttribute& attribute, const Field & null_value)
-{
-    auto nullable_set = attribute.is_nullable ? std::make_optional<NullableSet>() : std::optional<NullableSet>{};
-    Attribute attr{attribute.underlying_type, std::move(nullable_set), {}, {}, {}};
-
-    auto type_call = [&](const auto &dictionary_attribute_type)
+    auto type_call = [&](const auto & dictionary_attribute_type)
     {
         using Type = std::decay_t<decltype(dictionary_attribute_type)>;
         using AttributeType = typename Type::AttributeType;
+        using ValueType = DictionaryValueType<AttributeType>;
 
-        createAttributeImpl<AttributeType>(attr, null_value);
+        if constexpr (std::is_same_v<ValueType, StringRef>)
+        {
+            attribute.string_arena = std::make_unique<Arena>();
+            const String & string = null_value.get<String>();
+            const char * string_in_arena = attribute.string_arena->insert(string.data(), string.size());
+            attribute.null_values.emplace<StringRef>(string_in_arena, string.size());
+        }
+        else
+            attribute.null_values = ValueType(null_value.get<NearestFieldType<ValueType>>());
+
+        const auto & null_value_ref = std::get<ValueType>(attribute.null_values);
+        attribute.container.emplace<ContainerType<ValueType>>(configuration.initial_array_size, null_value_ref);
     };
 
-    callOnDictionaryAttributeType(attribute.underlying_type, type_call);
+    callOnDictionaryAttributeType(dictionary_attribute.underlying_type, type_call);
 
-    return attr;
+    return attribute;
 }
 
-
 template <typename AttributeType, typename OutputType, typename ValueSetter, typename DefaultValueExtractor>
 void FlatDictionary::getItemsImpl(
     const Attribute & attribute,
-    const PaddedPODArray<Key> & ids,
+    const PaddedPODArray<UInt64> & keys,
     ValueSetter && set_value,
     DefaultValueExtractor & default_value_extractor) const
 {
-    const auto & attr = std::get<ContainerType<AttributeType>>(attribute.arrays);
-    const auto rows = ext::size(ids);
+    const auto & container = std::get<ContainerType<AttributeType>>(attribute.container);
+    const auto rows = keys.size();
 
-    for (const auto row : ext::range(0, rows))
+    for (size_t row = 0; row < rows; ++row)
     {
-        const auto id = ids[row];
-        set_value(row, id < ext::size(attr) && loaded_ids[id] ? static_cast<OutputType>(attr[id]) : default_value_extractor[row]);
+        const auto key = keys[row];
+
+        if (key < loaded_keys.size() && loaded_keys[key])
+            set_value(row, static_cast<OutputType>(container[key]));
+        else
+            set_value(row, default_value_extractor[row]);
     }
 
     query_count.fetch_add(rows, std::memory_order_relaxed);
 }
 
 template <typename T>
-void FlatDictionary::resize(Attribute & attribute, const Key id)
+void FlatDictionary::resize(Attribute & attribute, UInt64 key)
 {
-    if (id >= max_array_size)
-        throw Exception{full_name + ": identifier should be less than " + toString(max_array_size), ErrorCodes::ARGUMENT_OUT_OF_BOUND};
+    if (key >= configuration.max_array_size)
+        throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND,
+            "{}: identifier should be less than {}",
+            full_name,
+            toString(configuration.max_array_size));
 
-    auto & array = std::get<ContainerType<T>>(attribute.arrays);
-    if (id >= array.size())
+    auto & container = std::get<ContainerType<T>>(attribute.container);
+
+    if (key >= container.size())
     {
-        const size_t elements_count = id + 1; //id=0 -> elements_count=1
-        loaded_ids.resize(elements_count, false);
-        array.resize_fill(elements_count, std::get<T>(attribute.null_values));
+        const size_t elements_count = key + 1; //id=0 -> elements_count=1
+        loaded_keys.resize(elements_count, false);
+        container.resize_fill(elements_count, std::get<T>(attribute.null_values));
     }
 }
 
 template <typename T>
-void FlatDictionary::setAttributeValueImpl(Attribute & attribute, const Key id, const T & value)
+void FlatDictionary::setAttributeValueImpl(Attribute & attribute, UInt64 key, const T & value)
 {
-    auto & array = std::get<ContainerType<T>>(attribute.arrays);
-    array[id] = value;
-    loaded_ids[id] = true;
+    auto & array = std::get<ContainerType<T>>(attribute.container);
+    array[key] = value;
+    loaded_keys[key] = true;
 }
 
 template <>
-void FlatDictionary::setAttributeValueImpl<String>(Attribute & attribute, const Key id, const String & value)
+void FlatDictionary::setAttributeValueImpl<String>(Attribute & attribute, UInt64 key, const String & value)
 {
     const auto * string_in_arena = attribute.string_arena->insert(value.data(), value.size());
-    setAttributeValueImpl(attribute, id, StringRef{string_in_arena, value.size()});
+    setAttributeValueImpl(attribute, key, StringRef{string_in_arena, value.size()});
 }
 
-void FlatDictionary::setAttributeValue(Attribute & attribute, const Key id, const Field & value)
+void FlatDictionary::setAttributeValue(Attribute & attribute, const UInt64 key, const Field & value)
 {
     auto type_call = [&](const auto &dictionary_attribute_type)
     {
@@ -462,55 +444,36 @@ void FlatDictionary::setAttributeValue(Attribute & attribute, const Key id, cons
         using AttributeType = typename Type::AttributeType;
         using ResizeType = std::conditional_t<std::is_same_v<AttributeType, String>, StringRef, AttributeType>;
 
-        resize<ResizeType>(attribute, id);
+        resize<ResizeType>(attribute, key);
 
         if (attribute.nullable_set)
         {
             if (value.isNull())
             {
-                attribute.nullable_set->insert(id);
-                loaded_ids[id] = true;
+                attribute.nullable_set->insert(key);
+                loaded_keys[key] = true;
                 return;
             }
-            else
-            {
-                attribute.nullable_set->erase(id);
-            }
         }
 
-        setAttributeValueImpl<AttributeType>(attribute, id, value.get<NearestFieldType<AttributeType>>());
+        setAttributeValueImpl<AttributeType>(attribute, key, value.get<AttributeType>());
     };
 
     callOnDictionaryAttributeType(attribute.type, type_call);
 }
 
-
-const FlatDictionary::Attribute & FlatDictionary::getAttribute(const std::string & attribute_name) const
-{
-    const auto it = attribute_index_by_name.find(attribute_name);
-    if (it == std::end(attribute_index_by_name))
-        throw Exception{full_name + ": no such attribute '" + attribute_name + "'", ErrorCodes::BAD_ARGUMENTS};
-
-    return attributes[it->second];
-}
-
-PaddedPODArray<FlatDictionary::Key> FlatDictionary::getIds() const
-{
-    const auto ids_count = ext::size(loaded_ids);
-
-    PaddedPODArray<Key> ids;
-    ids.reserve(ids_count);
-
-    for (auto idx : ext::range(0, ids_count))
-        if (loaded_ids[idx])
-            ids.push_back(idx);
-    return ids;
-}
-
 BlockInputStreamPtr FlatDictionary::getBlockInputStream(const Names & column_names, size_t max_block_size) const
 {
-    using BlockInputStreamType = DictionaryBlockInputStream<Key>;
-    return std::make_shared<BlockInputStreamType>(shared_from_this(), max_block_size, getIds(), column_names);
+    const auto keys_count = loaded_keys.size();
+
+    PaddedPODArray<UInt64> keys;
+    keys.reserve(keys_count);
+
+    for (size_t key_index = 0; key_index < keys_count; ++key_index)
+        if (loaded_keys[key_index])
+            keys.push_back(key_index);
+
+    return std::make_shared<DictionaryBlockInputStream>(shared_from_this(), max_block_size, std::move(keys), column_names);
 }
 
 void registerDictionaryFlat(DictionaryFactory & factory)
@@ -522,19 +485,32 @@ void registerDictionaryFlat(DictionaryFactory & factory)
                              DictionarySourcePtr source_ptr) -> DictionaryPtr
     {
         if (dict_struct.key)
-            throw Exception{"'key' is not supported for dictionary of layout 'flat'", ErrorCodes::UNSUPPORTED_METHOD};
+            throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "'key' is not supported for dictionary of layout 'flat'");
 
         if (dict_struct.range_min || dict_struct.range_max)
-            throw Exception{full_name
-                                + ": elements .structure.range_min and .structure.range_max should be defined only "
-                                  "for a dictionary of layout 'range_hashed'",
-                            ErrorCodes::BAD_ARGUMENTS};
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                            "{}: elements .structure.range_min and .structure.range_max should be defined only "
+                            "for a dictionary of layout 'range_hashed'",
+                            full_name);
+
+        static constexpr size_t default_initial_array_size = 1024;
+        static constexpr size_t default_max_array_size = 500000;
+
+        String dictionary_layout_prefix = config_prefix + ".layout" + ".flat";
+
+        FlatDictionary::Configuration configuration
+        {
+            .initial_array_size = config.getUInt64(dictionary_layout_prefix + ".initial_array_size", default_initial_array_size),
+            .max_array_size = config.getUInt64(dictionary_layout_prefix + ".max_array_size", default_max_array_size),
+            .require_nonempty = config.getBool(config_prefix + ".require_nonempty", false)
+        };
 
         const auto dict_id = StorageID::fromDictionaryConfig(config, config_prefix);
         const DictionaryLifetime dict_lifetime{config, config_prefix + ".lifetime"};
-        const bool require_nonempty = config.getBool(config_prefix + ".require_nonempty", false);
-        return std::make_unique<FlatDictionary>(dict_id, dict_struct, std::move(source_ptr), dict_lifetime, require_nonempty);
+
+        return std::make_unique<FlatDictionary>(dict_id, dict_struct, std::move(source_ptr), dict_lifetime, std::move(configuration));
     };
+
     factory.registerLayout("flat", create_layout, false);
 }
 
diff --git a/src/Dictionaries/FlatDictionary.h b/src/Dictionaries/FlatDictionary.h
index 23bfa3d37b5..0a5f88f270a 100644
--- a/src/Dictionaries/FlatDictionary.h
+++ b/src/Dictionaries/FlatDictionary.h
@@ -26,13 +26,20 @@ namespace DB
 class FlatDictionary final : public IDictionary
 {
 public:
+    struct Configuration
+    {
+        size_t initial_array_size;
+        size_t max_array_size;
+        bool require_nonempty;
+    };
+
     FlatDictionary(
         const StorageID & dict_id_,
         const DictionaryStructure & dict_struct_,
         DictionarySourcePtr source_ptr_,
         const DictionaryLifetime dict_lifetime_,
-        bool require_nonempty_,
-        BlockPtr saved_block_ = nullptr);
+        Configuration configuration_,
+        BlockPtr previously_loaded_block_ = nullptr);
 
     std::string getTypeName() const override { return "Flat"; }
 
@@ -48,7 +55,7 @@ public:
 
     std::shared_ptr<const IExternalLoadable> clone() const override
     {
-        return std::make_shared<FlatDictionary>(getDictionaryID(), dict_struct, source_ptr->clone(), dict_lifetime, require_nonempty, saved_block);
+        return std::make_shared<FlatDictionary>(getDictionaryID(), dict_struct, source_ptr->clone(), dict_lifetime, configuration, previously_loaded_block);
     }
 
     const IDictionarySource * getSource() const override { return source_ptr.get(); }
@@ -59,18 +66,9 @@ public:
 
     bool isInjective(const std::string & attribute_name) const override
     {
-        return dict_struct.attributes[&getAttribute(attribute_name) - attributes.data()].injective;
+        return dict_struct.getAttribute(attribute_name).injective;
     }
 
-    bool hasHierarchy() const override { return hierarchical_attribute; }
-
-    void toParent(const PaddedPODArray<Key> & ids, PaddedPODArray<Key> & out) const override;
-
-    void isInVectorVector(
-        const PaddedPODArray<Key> & child_ids, const PaddedPODArray<Key> & ancestor_ids, PaddedPODArray<UInt8> & out) const override;
-    void isInVectorConstant(const PaddedPODArray<Key> & child_ids, const Key ancestor_id, PaddedPODArray<UInt8> & out) const override;
-    void isInConstantVector(const Key child_id, const PaddedPODArray<Key> & ancestor_ids, PaddedPODArray<UInt8> & out) const override;
-
     DictionaryKeyType getKeyType() const override { return DictionaryKeyType::simple; }
 
     ColumnPtr getColumn(
@@ -78,17 +76,31 @@ public:
         const DataTypePtr & result_type,
         const Columns & key_columns,
         const DataTypes & key_types,
-        const ColumnPtr default_values_column) const override;
+        const ColumnPtr & default_values_column) const override;
 
     ColumnUInt8::Ptr hasKeys(const Columns & key_columns, const DataTypes & key_types) const override;
 
+    bool hasHierarchy() const override { return dict_struct.hierarchical_attribute_index.has_value(); }
+
+    ColumnPtr getHierarchy(ColumnPtr key_column, const DataTypePtr & key_type) const override;
+
+    ColumnUInt8::Ptr isInHierarchy(
+        ColumnPtr key_column,
+        ColumnPtr in_key_column,
+        const DataTypePtr & key_type) const override;
+
+    ColumnPtr getDescendants(
+        ColumnPtr key_column,
+        const DataTypePtr & key_type,
+        size_t level) const override;
+
     BlockInputStreamPtr getBlockInputStream(const Names & column_names, size_t max_block_size) const override;
 
 private:
     template <typename Value>
     using ContainerType = PaddedPODArray<Value>;
 
-    using NullableSet = HashSet<Key, DefaultHash<Key>>;
+    using NullableSet = HashSet<UInt64, DefaultHash<UInt64>>;
 
     struct Attribute final
     {
@@ -108,6 +120,7 @@ private:
             Decimal32,
             Decimal64,
             Decimal128,
+            Decimal256,
             Float32,
             Float64,
             StringRef>
@@ -125,10 +138,11 @@ private:
             ContainerType<Decimal32>,
             ContainerType<Decimal64>,
             ContainerType<Decimal128>,
+            ContainerType<Decimal256>,
             ContainerType<Float32>,
             ContainerType<Float64>,
             ContainerType<StringRef>>
-            arrays;
+            container;
 
         std::unique_ptr<Arena> string_arena;
     };
@@ -138,54 +152,39 @@ private:
     void updateData();
     void loadData();
 
-    template <typename T>
-    void addAttributeSize(const Attribute & attribute);
-
     void calculateBytesAllocated();
 
-    template <typename T>
-    static void createAttributeImpl(Attribute & attribute, const Field & null_value);
-
-    static Attribute createAttribute(const DictionaryAttribute& attribute, const Field & null_value);
+    Attribute createAttribute(const DictionaryAttribute& attribute, const Field & null_value);
 
     template <typename AttributeType, typename OutputType, typename ValueSetter, typename DefaultValueExtractor>
     void getItemsImpl(
         const Attribute & attribute,
-        const PaddedPODArray<Key> & ids,
+        const PaddedPODArray<UInt64> & keys,
         ValueSetter && set_value,
         DefaultValueExtractor & default_value_extractor) const;
 
     template <typename T>
-    void resize(Attribute & attribute, const Key id);
+    void resize(Attribute & attribute, UInt64 key);
 
     template <typename T>
-    void setAttributeValueImpl(Attribute & attribute, const Key id, const T & value);
+    void setAttributeValueImpl(Attribute & attribute, UInt64 key, const T & value);
 
-    void setAttributeValue(Attribute & attribute, const Key id, const Field & value);
-
-    const Attribute & getAttribute(const std::string & attribute_name) const;
-
-    template <typename ChildType, typename AncestorType>
-    void isInImpl(const ChildType & child_ids, const AncestorType & ancestor_ids, PaddedPODArray<UInt8> & out) const;
-
-    PaddedPODArray<Key> getIds() const;
+    void setAttributeValue(Attribute & attribute, UInt64 key, const Field & value);
 
     const DictionaryStructure dict_struct;
     const DictionarySourcePtr source_ptr;
     const DictionaryLifetime dict_lifetime;
-    const bool require_nonempty;
+    const Configuration configuration;
 
-    std::map<std::string, size_t> attribute_index_by_name;
     std::vector<Attribute> attributes;
-    const Attribute * hierarchical_attribute = nullptr;
-    std::vector<bool> loaded_ids;
+    std::vector<bool> loaded_keys;
 
     size_t bytes_allocated = 0;
     size_t element_count = 0;
     size_t bucket_count = 0;
     mutable std::atomic<size_t> query_count{0};
 
-    BlockPtr saved_block;
+    BlockPtr previously_loaded_block;
 };
 
 }
diff --git a/src/Dictionaries/HTTPDictionarySource.cpp b/src/Dictionaries/HTTPDictionarySource.cpp
index ddcac117e58..b674d593444 100644
--- a/src/Dictionaries/HTTPDictionarySource.cpp
+++ b/src/Dictionaries/HTTPDictionarySource.cpp
@@ -30,7 +30,7 @@ HTTPDictionarySource::HTTPDictionarySource(
     const Poco::Util::AbstractConfiguration & config,
     const std::string & config_prefix,
     Block & sample_block_,
-    const Context & context_,
+    ContextPtr context_,
     bool check_config)
     : log(&Poco::Logger::get("HTTPDictionarySource"))
     , update_time{std::chrono::system_clock::from_time_t(0)}
@@ -44,7 +44,7 @@ HTTPDictionarySource::HTTPDictionarySource(
 {
 
     if (check_config)
-        context.getRemoteHostFilter().checkURL(Poco::URI(url));
+        context->getRemoteHostFilter().checkURL(Poco::URI(url));
 
     const auto & credentials_prefix = config_prefix + ".credentials";
 
@@ -80,7 +80,7 @@ HTTPDictionarySource::HTTPDictionarySource(const HTTPDictionarySource & other)
     , update_field{other.update_field}
     , format{other.format}
     , sample_block{other.sample_block}
-    , context(other.context)
+    , context(Context::createCopy(other.context))
     , timeouts(ConnectionTimeouts::getHTTPTimeouts(context))
 {
     credentials.setUsername(other.credentials.getUsername());
@@ -111,7 +111,7 @@ BlockInputStreamPtr HTTPDictionarySource::loadAll()
     auto in_ptr = std::make_unique<ReadWriteBufferFromHTTP>(
         uri, Poco::Net::HTTPRequest::HTTP_GET, ReadWriteBufferFromHTTP::OutStreamCallback(), timeouts,
         0, credentials, DBMS_DEFAULT_BUFFER_SIZE, header_entries);
-    auto input_stream = context.getInputFormat(format, *in_ptr, sample_block, max_block_size);
+    auto input_stream = context->getInputFormat(format, *in_ptr, sample_block, max_block_size);
     return std::make_shared<OwningBlockInputStream<ReadWriteBufferFromHTTP>>(input_stream, std::move(in_ptr));
 }
 
@@ -123,7 +123,7 @@ BlockInputStreamPtr HTTPDictionarySource::loadUpdatedAll()
     auto in_ptr = std::make_unique<ReadWriteBufferFromHTTP>(
         uri, Poco::Net::HTTPRequest::HTTP_GET, ReadWriteBufferFromHTTP::OutStreamCallback(), timeouts,
         0, credentials, DBMS_DEFAULT_BUFFER_SIZE, header_entries);
-    auto input_stream = context.getInputFormat(format, *in_ptr, sample_block, max_block_size);
+    auto input_stream = context->getInputFormat(format, *in_ptr, sample_block, max_block_size);
     return std::make_shared<OwningBlockInputStream<ReadWriteBufferFromHTTP>>(input_stream, std::move(in_ptr));
 }
 
@@ -136,7 +136,7 @@ BlockInputStreamPtr HTTPDictionarySource::loadIds(const std::vector<UInt64> & id
     ReadWriteBufferFromHTTP::OutStreamCallback out_stream_callback = [block, this](std::ostream & ostr)
     {
         WriteBufferFromOStream out_buffer(ostr);
-        auto output_stream = context.getOutputStream(format, out_buffer, sample_block);
+        auto output_stream = context->getOutputStreamParallelIfPossible(format, out_buffer, sample_block);
         formatBlock(output_stream, block);
     };
 
@@ -144,7 +144,7 @@ BlockInputStreamPtr HTTPDictionarySource::loadIds(const std::vector<UInt64> & id
     auto in_ptr = std::make_unique<ReadWriteBufferFromHTTP>(
         uri, Poco::Net::HTTPRequest::HTTP_POST, out_stream_callback, timeouts,
         0, credentials, DBMS_DEFAULT_BUFFER_SIZE, header_entries);
-    auto input_stream = context.getInputFormat(format, *in_ptr, sample_block, max_block_size);
+    auto input_stream = context->getInputFormat(format, *in_ptr, sample_block, max_block_size);
     return std::make_shared<OwningBlockInputStream<ReadWriteBufferFromHTTP>>(input_stream, std::move(in_ptr));
 }
 
@@ -157,7 +157,7 @@ BlockInputStreamPtr HTTPDictionarySource::loadKeys(const Columns & key_columns,
     ReadWriteBufferFromHTTP::OutStreamCallback out_stream_callback = [block, this](std::ostream & ostr)
     {
         WriteBufferFromOStream out_buffer(ostr);
-        auto output_stream = context.getOutputStream(format, out_buffer, sample_block);
+        auto output_stream = context->getOutputStreamParallelIfPossible(format, out_buffer, sample_block);
         formatBlock(output_stream, block);
     };
 
@@ -165,7 +165,7 @@ BlockInputStreamPtr HTTPDictionarySource::loadKeys(const Columns & key_columns,
     auto in_ptr = std::make_unique<ReadWriteBufferFromHTTP>(
         uri, Poco::Net::HTTPRequest::HTTP_POST, out_stream_callback, timeouts,
         0, credentials, DBMS_DEFAULT_BUFFER_SIZE, header_entries);
-    auto input_stream = context.getInputFormat(format, *in_ptr, sample_block, max_block_size);
+    auto input_stream = context->getInputFormat(format, *in_ptr, sample_block, max_block_size);
     return std::make_shared<OwningBlockInputStream<ReadWriteBufferFromHTTP>>(input_stream, std::move(in_ptr));
 }
 
@@ -201,14 +201,14 @@ void registerDictionarySourceHTTP(DictionarySourceFactory & factory)
                                  const Poco::Util::AbstractConfiguration & config,
                                  const std::string & config_prefix,
                                  Block & sample_block,
-                                 const Context & context,
+                                 ContextPtr context,
                                  const std::string & /* default_database */,
                                  bool check_config) -> DictionarySourcePtr
     {
         if (dict_struct.has_expressions)
-            throw Exception{"Dictionary source of type `http` does not support attribute expressions", ErrorCodes::LOGICAL_ERROR};
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Dictionary source of type `http` does not support attribute expressions");
 
-        Context context_local_copy = copyContextAndApplySettings(config_prefix, context, config);
+        auto context_local_copy = copyContextAndApplySettings(config_prefix, context, config);
 
         return std::make_unique<HTTPDictionarySource>(
             dict_struct, config, config_prefix + ".http",
diff --git a/src/Dictionaries/HTTPDictionarySource.h b/src/Dictionaries/HTTPDictionarySource.h
index e7920132e83..c42c67ec8c9 100644
--- a/src/Dictionaries/HTTPDictionarySource.h
+++ b/src/Dictionaries/HTTPDictionarySource.h
@@ -26,7 +26,7 @@ public:
         const Poco::Util::AbstractConfiguration & config,
         const std::string & config_prefix,
         Block & sample_block_,
-        const Context & context_,
+        ContextPtr context_,
         bool check_config);
 
     HTTPDictionarySource(const HTTPDictionarySource & other);
@@ -65,7 +65,7 @@ private:
     std::string update_field;
     const std::string format;
     Block sample_block;
-    Context context;
+    ContextPtr context;
     ConnectionTimeouts timeouts;
 };
 
diff --git a/src/Dictionaries/HashedDictionary.cpp b/src/Dictionaries/HashedDictionary.cpp
index b51f2414142..2a403554a80 100644
--- a/src/Dictionaries/HashedDictionary.cpp
+++ b/src/Dictionaries/HashedDictionary.cpp
@@ -1,13 +1,14 @@
 #include "HashedDictionary.h"
-#include <ext/size.h>
-#include "DictionaryBlockInputStream.h"
-#include "DictionaryFactory.h"
-#include "ClickHouseDictionarySource.h"
+
 #include <Core/Defines.h>
-#include <Functions/FunctionHelpers.h>
+#include <DataTypes/DataTypesDecimal.h>
 #include <Columns/ColumnsNumber.h>
 #include <Columns/ColumnNullable.h>
-#include <DataTypes/DataTypesDecimal.h>
+#include <Functions/FunctionHelpers.h>
+
+#include <Dictionaries/DictionaryBlockInputStream.h>
+#include <Dictionaries/DictionaryFactory.h>
+#include <Dictionaries/HierarchyDictionariesUtils.h>
 
 namespace
 {
@@ -15,136 +16,74 @@ namespace
 /// NOTE: Trailing return type is explicitly specified for SFINAE.
 
 /// google::sparse_hash_map
-template <typename T> auto first(const T & value) -> decltype(value.first) { return value.first; } // NOLINT
-template <typename T> auto second(const T & value) -> decltype(value.second) { return value.second; } // NOLINT
+template <typename T> auto getKeyFromCell(const T & value) -> decltype(value->first) { return value->first; } // NOLINT
+template <typename T> auto getValueFromCell(const T & value) -> decltype(value->second) { return value->second; } // NOLINT
 
 /// HashMap
-template <typename T> auto first(const T & value) -> decltype(value.getKey()) { return value.getKey(); } // NOLINT
-template <typename T> auto second(const T & value) -> decltype(value.getMapped()) { return value.getMapped(); } // NOLINT
+template <typename T> auto getKeyFromCell(const T & value) -> decltype(value->getKey()) { return value->getKey(); } // NOLINT
+template <typename T> auto getValueFromCell(const T & value) -> decltype(value->getMapped()) { return value->getMapped(); } // NOLINT
 
 }
 
 namespace DB
 {
+
 namespace ErrorCodes
 {
-    extern const int TYPE_MISMATCH;
     extern const int BAD_ARGUMENTS;
     extern const int DICTIONARY_IS_EMPTY;
     extern const int UNSUPPORTED_METHOD;
 }
 
-
-HashedDictionary::HashedDictionary(
+template <DictionaryKeyType dictionary_key_type, bool sparse>
+HashedDictionary<dictionary_key_type, sparse>::HashedDictionary(
     const StorageID & dict_id_,
     const DictionaryStructure & dict_struct_,
     DictionarySourcePtr source_ptr_,
     const DictionaryLifetime dict_lifetime_,
     bool require_nonempty_,
-    bool sparse_,
-    BlockPtr saved_block_)
+    BlockPtr previously_loaded_block_)
     : IDictionary(dict_id_)
     , dict_struct(dict_struct_)
-    , source_ptr{std::move(source_ptr_)}
+    , source_ptr(std::move(source_ptr_))
     , dict_lifetime(dict_lifetime_)
     , require_nonempty(require_nonempty_)
-    , sparse(sparse_)
-    , saved_block{std::move(saved_block_)}
+    , previously_loaded_block(std::move(previously_loaded_block_))
 {
     createAttributes();
     loadData();
     calculateBytesAllocated();
 }
 
-
-void HashedDictionary::toParent(const PaddedPODArray<Key> & ids, PaddedPODArray<Key> & out) const
-{
-    const auto null_value = std::get<UInt64>(hierarchical_attribute->null_values);
-    DictionaryDefaultValueExtractor<UInt64> extractor(null_value);
-
-    getItemsImpl<UInt64, UInt64>(
-        *hierarchical_attribute,
-        ids,
-        [&](const size_t row, const UInt64 value) { out[row] = value; },
-        extractor);
-}
-
-
-/// Allow to use single value in same way as array.
-static inline HashedDictionary::Key getAt(const PaddedPODArray<HashedDictionary::Key> & arr, const size_t idx)
-{
-    return arr[idx];
-}
-static inline HashedDictionary::Key getAt(const HashedDictionary::Key & value, const size_t)
-{
-    return value;
-}
-
-template <typename AttrType, typename ChildType, typename AncestorType>
-void HashedDictionary::isInAttrImpl(const AttrType & attr, const ChildType & child_ids, const AncestorType & ancestor_ids, PaddedPODArray<UInt8> & out) const
-{
-    const auto null_value = std::get<UInt64>(hierarchical_attribute->null_values);
-    const auto rows = out.size();
-
-    for (const auto row : ext::range(0, rows))
-    {
-        auto id = getAt(child_ids, row);
-        const auto ancestor_id = getAt(ancestor_ids, row);
-
-        for (size_t i = 0; id != null_value && id != ancestor_id && i < DBMS_HIERARCHICAL_DICTIONARY_MAX_DEPTH; ++i)
-        {
-            auto it = attr.find(id);
-            if (it != std::end(attr))
-                id = second(*it);
-            else
-                break;
-        }
-
-        out[row] = id != null_value && id == ancestor_id;
-    }
-
-    query_count.fetch_add(rows, std::memory_order_relaxed);
-}
-template <typename ChildType, typename AncestorType>
-void HashedDictionary::isInImpl(const ChildType & child_ids, const AncestorType & ancestor_ids, PaddedPODArray<UInt8> & out) const
-{
-    if (!sparse)
-        return isInAttrImpl(*std::get<CollectionPtrType<Key>>(hierarchical_attribute->maps), child_ids, ancestor_ids, out);
-    return isInAttrImpl(*std::get<SparseCollectionPtrType<Key>>(hierarchical_attribute->sparse_maps), child_ids, ancestor_ids, out);
-}
-
-void HashedDictionary::isInVectorVector(
-    const PaddedPODArray<Key> & child_ids, const PaddedPODArray<Key> & ancestor_ids, PaddedPODArray<UInt8> & out) const
-{
-    isInImpl(child_ids, ancestor_ids, out);
-}
-
-void HashedDictionary::isInVectorConstant(const PaddedPODArray<Key> & child_ids, const Key ancestor_id, PaddedPODArray<UInt8> & out) const
-{
-    isInImpl(child_ids, ancestor_id, out);
-}
-
-void HashedDictionary::isInConstantVector(const Key child_id, const PaddedPODArray<Key> & ancestor_ids, PaddedPODArray<UInt8> & out) const
-{
-    isInImpl(child_id, ancestor_ids, out);
-}
-
-ColumnPtr HashedDictionary::getColumn(
+template <DictionaryKeyType dictionary_key_type, bool sparse>
+ColumnPtr HashedDictionary<dictionary_key_type, sparse>::getColumn(
     const std::string & attribute_name,
     const DataTypePtr & result_type,
     const Columns & key_columns,
-    const DataTypes &,
-    const ColumnPtr default_values_column) const
+    const DataTypes & key_types [[maybe_unused]],
+    const ColumnPtr & default_values_column) const
 {
+    if (dictionary_key_type == DictionaryKeyType::complex)
+        dict_struct.validateKeyTypes(key_types);
+
     ColumnPtr result;
 
-    PaddedPODArray<Key> backup_storage;
-    const auto & ids = getColumnVectorData(this, key_columns.front(), backup_storage);
+    DictionaryKeysArenaHolder<dictionary_key_type> arena_holder;
+    DictionaryKeysExtractor<dictionary_key_type> extractor(key_columns, arena_holder.getComplexKeyArena());
 
-    auto size = ids.size();
+    const size_t size = extractor.getKeysSize();
 
-    const auto & attribute = getAttribute(attribute_name);
     const auto & dictionary_attribute = dict_struct.getAttribute(attribute_name, result_type);
+    const size_t attribute_index = dict_struct.attribute_name_to_index.find(attribute_name)->second;
+    auto & attribute = attributes[attribute_index];
+
+    ColumnUInt8::MutablePtr col_null_map_to;
+    ColumnUInt8::Container * vec_null_map_to = nullptr;
+    if (attribute.is_nullable_set)
+    {
+        col_null_map_to = ColumnUInt8::create(size, false);
+        vec_null_map_to = &col_null_map_to->getData();
+    }
 
     auto type_call = [&](const auto & dictionary_attribute_type)
     {
@@ -159,24 +98,34 @@ ColumnPtr HashedDictionary::getColumn(
 
         auto column = ColumnProvider::getColumn(dictionary_attribute, size);
 
-        if constexpr (std::is_same_v<AttributeType, String>)
+        if constexpr (std::is_same_v<ValueType, StringRef>)
         {
             auto * out = column.get();
 
-            getItemsImpl<StringRef, StringRef>(
+            getItemsImpl<ValueType>(
                 attribute,
-                ids,
+                extractor,
                 [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
+                [&](const size_t row)
+                {
+                    out->insertDefault();
+                    (*vec_null_map_to)[row] = true;
+                },
                 default_value_extractor);
         }
         else
         {
             auto & out = column->getData();
 
-            getItemsImpl<AttributeType, AttributeType>(
+            getItemsImpl<ValueType>(
                 attribute,
-                ids,
+                extractor,
                 [&](const size_t row, const auto value) { return out[row] = value; },
+                [&](const size_t row)
+                {
+                    out[row] = ValueType();
+                    (*vec_null_map_to)[row] = true;
+                },
                 default_value_extractor);
         }
 
@@ -185,89 +134,216 @@ ColumnPtr HashedDictionary::getColumn(
 
     callOnDictionaryAttributeType(attribute.type, type_call);
 
-    if (attribute.nullable_set)
-    {
-        ColumnUInt8::MutablePtr col_null_map_to = ColumnUInt8::create(size, false);
-        ColumnUInt8::Container& vec_null_map_to = col_null_map_to->getData();
-
-        for (size_t row = 0; row < ids.size(); ++row)
-        {
-            auto id = ids[row];
-
-            if (attribute.nullable_set->find(id) != nullptr)
-                vec_null_map_to[row] = true;
-        }
-
+    if (attribute.is_nullable_set)
         result = ColumnNullable::create(result, std::move(col_null_map_to));
+
+    return result;
+}
+
+template <DictionaryKeyType dictionary_key_type, bool sparse>
+ColumnUInt8::Ptr HashedDictionary<dictionary_key_type, sparse>::hasKeys(const Columns & key_columns, const DataTypes & key_types) const
+{
+    if (dictionary_key_type == DictionaryKeyType::complex)
+        dict_struct.validateKeyTypes(key_types);
+
+    DictionaryKeysArenaHolder<dictionary_key_type> arena_holder;
+    DictionaryKeysExtractor<dictionary_key_type> extractor(key_columns, arena_holder.getComplexKeyArena());
+
+    size_t keys_size = extractor.getKeysSize();
+
+    auto result = ColumnUInt8::create(keys_size, false);
+    auto & out = result->getData();
+
+    if (attributes.empty())
+    {
+        query_count.fetch_add(keys_size, std::memory_order_relaxed);
+        return result;
     }
 
-    return result;
-}
-
-ColumnUInt8::Ptr HashedDictionary::hasKeys(const Columns & key_columns, const DataTypes &) const
-{
-    PaddedPODArray<Key> backup_storage;
-    const auto& ids = getColumnVectorData(this, key_columns.front(), backup_storage);
-
-    size_t ids_count = ext::size(ids);
-
-    auto result = ColumnUInt8::create(ext::size(ids));
-    auto& out = result->getData();
-
     const auto & attribute = attributes.front();
+    bool is_attribute_nullable = attribute.is_nullable_set.has_value();
 
-    auto type_call = [&](const auto & dictionary_attribute_type)
+    getAttributeContainer(0, [&](const auto & container)
     {
-        using Type = std::decay_t<decltype(dictionary_attribute_type)>;
-        using AttributeType = typename Type::AttributeType;
-        has<AttributeType>(attribute, ids, out);
-    };
+        for (size_t requested_key_index = 0; requested_key_index < keys_size; ++requested_key_index)
+        {
+            auto requested_key = extractor.extractCurrentKey();
 
-    callOnDictionaryAttributeType(attribute.type, type_call);
+            out[requested_key_index] = container.find(requested_key) != container.end();
 
-    query_count.fetch_add(ids_count, std::memory_order_relaxed);
+            if (is_attribute_nullable && !out[requested_key_index])
+                out[requested_key_index] = attribute.is_nullable_set->find(requested_key) != nullptr;
+
+            extractor.rollbackCurrentKey();
+        }
+    });
+
+    query_count.fetch_add(keys_size, std::memory_order_relaxed);
 
     return result;
 }
 
-void HashedDictionary::createAttributes()
+template <DictionaryKeyType dictionary_key_type, bool sparse>
+ColumnPtr HashedDictionary<dictionary_key_type, sparse>::getHierarchy(ColumnPtr key_column [[maybe_unused]], const DataTypePtr &) const
+{
+    if constexpr (dictionary_key_type == DictionaryKeyType::simple)
+    {
+        PaddedPODArray<UInt64> keys_backup_storage;
+        const auto & keys = getColumnVectorData(this, key_column, keys_backup_storage);
+
+        size_t hierarchical_attribute_index = *dict_struct.hierarchical_attribute_index;
+
+        const auto & dictionary_attribute = dict_struct.attributes[hierarchical_attribute_index];
+        const auto & hierarchical_attribute = attributes[hierarchical_attribute_index];
+
+        const UInt64 null_value = dictionary_attribute.null_value.template get<UInt64>();
+        const CollectionType<UInt64> & parent_keys_map = std::get<CollectionType<UInt64>>(hierarchical_attribute.container);
+
+        auto is_key_valid_func = [&](auto & key) { return parent_keys_map.find(key) != parent_keys_map.end(); };
+
+        auto get_parent_func = [&](auto & hierarchy_key)
+        {
+            std::optional<UInt64> result;
+
+            auto it = parent_keys_map.find(hierarchy_key);
+
+            if (it != parent_keys_map.end())
+                result = getValueFromCell(it);
+
+            return result;
+        };
+
+        auto dictionary_hierarchy_array = getKeysHierarchyArray(keys, null_value, is_key_valid_func, get_parent_func);
+
+        query_count.fetch_add(keys.size(), std::memory_order_relaxed);
+
+        return dictionary_hierarchy_array;
+    }
+    else
+        return nullptr;
+}
+
+template <DictionaryKeyType dictionary_key_type, bool sparse>
+ColumnUInt8::Ptr HashedDictionary<dictionary_key_type, sparse>::isInHierarchy(
+    ColumnPtr key_column [[maybe_unused]],
+    ColumnPtr in_key_column [[maybe_unused]],
+    const DataTypePtr &) const
+{
+    if constexpr (dictionary_key_type == DictionaryKeyType::simple)
+    {
+        PaddedPODArray<UInt64> keys_backup_storage;
+        const auto & keys = getColumnVectorData(this, key_column, keys_backup_storage);
+
+        PaddedPODArray<UInt64> keys_in_backup_storage;
+        const auto & keys_in = getColumnVectorData(this, in_key_column, keys_in_backup_storage);
+
+        size_t hierarchical_attribute_index = *dict_struct.hierarchical_attribute_index;
+
+        const auto & dictionary_attribute = dict_struct.attributes[hierarchical_attribute_index];
+        auto & hierarchical_attribute = attributes[hierarchical_attribute_index];
+
+        const UInt64 null_value = dictionary_attribute.null_value.template get<UInt64>();
+        const CollectionType<UInt64> & parent_keys_map = std::get<CollectionType<UInt64>>(hierarchical_attribute.container);
+
+        auto is_key_valid_func = [&](auto & key) { return parent_keys_map.find(key) != parent_keys_map.end(); };
+
+        auto get_parent_func = [&](auto & hierarchy_key)
+        {
+            std::optional<UInt64> result;
+
+            auto it = parent_keys_map.find(hierarchy_key);
+
+            if (it != parent_keys_map.end())
+                result = getValueFromCell(it);
+
+            return result;
+        };
+
+        auto result = getKeysIsInHierarchyColumn(keys, keys_in, null_value, is_key_valid_func, get_parent_func);
+
+        query_count.fetch_add(keys.size(), std::memory_order_relaxed);
+
+        return result;
+    }
+    else
+        return nullptr;
+}
+
+template <DictionaryKeyType dictionary_key_type, bool sparse>
+ColumnPtr HashedDictionary<dictionary_key_type, sparse>::getDescendants(
+    ColumnPtr key_column [[maybe_unused]],
+    const DataTypePtr &,
+    size_t level [[maybe_unused]]) const
+{
+    if constexpr (dictionary_key_type == DictionaryKeyType::simple)
+    {
+        PaddedPODArray<UInt64> keys_backup;
+        const auto & keys = getColumnVectorData(this, key_column, keys_backup);
+
+        size_t hierarchical_attribute_index = *dict_struct.hierarchical_attribute_index;
+
+        const auto & hierarchical_attribute = attributes[hierarchical_attribute_index];
+        const CollectionType<UInt64> & parent_keys = std::get<CollectionType<UInt64>>(hierarchical_attribute.container);
+
+        HashMap<UInt64, PaddedPODArray<UInt64>> parent_to_child;
+
+        for (const auto & [key, value] : parent_keys)
+            parent_to_child[value].emplace_back(key);
+
+        auto result = getKeysDescendantsArray(keys, parent_to_child, level);
+
+        query_count.fetch_add(keys.size(), std::memory_order_relaxed);
+
+        return result;
+    }
+    else
+        return nullptr;
+}
+
+template <DictionaryKeyType dictionary_key_type, bool sparse>
+void HashedDictionary<dictionary_key_type, sparse>::createAttributes()
 {
     const auto size = dict_struct.attributes.size();
     attributes.reserve(size);
 
-    for (const auto & attribute : dict_struct.attributes)
+    for (const auto & dictionary_attribute : dict_struct.attributes)
     {
-        attribute_index_by_name.emplace(attribute.name, attributes.size());
-        attributes.push_back(createAttribute(attribute, attribute.null_value));
-
-        if (attribute.hierarchical)
+        auto type_call = [&, this](const auto & dictionary_attribute_type)
         {
-            hierarchical_attribute = &attributes.back();
+            using Type = std::decay_t<decltype(dictionary_attribute_type)>;
+            using AttributeType = typename Type::AttributeType;
+            using ValueType = DictionaryValueType<AttributeType>;
 
-            if (hierarchical_attribute->type != AttributeUnderlyingType::utUInt64)
-                throw Exception{full_name + ": hierarchical attribute must be UInt64.", ErrorCodes::TYPE_MISMATCH};
-        }
+            auto is_nullable_set = dictionary_attribute.is_nullable ? std::make_optional<NullableSet>() : std::optional<NullableSet>{};
+            std::unique_ptr<Arena> string_arena = std::is_same_v<AttributeType, String> ? std::make_unique<Arena>() : nullptr;
+
+            ValueType default_value;
+
+            if constexpr (std::is_same_v<ValueType, StringRef>)
+            {
+                string_arena = std::make_unique<Arena>();
+
+                const auto & string_null_value = dictionary_attribute.null_value.template get<String>();
+                const size_t string_null_value_size = string_null_value.size();
+
+                const char * string_in_arena = string_arena->insert(string_null_value.data(), string_null_value_size);
+                default_value = {string_in_arena, string_null_value_size};
+            }
+            else
+                default_value = dictionary_attribute.null_value.template get<NearestFieldType<ValueType>>();
+
+            Attribute attribute{dictionary_attribute.underlying_type, std::move(is_nullable_set), default_value, CollectionType<ValueType>(), std::move(string_arena)};
+            attributes.emplace_back(std::move(attribute));
+        };
+
+        callOnDictionaryAttributeType(dictionary_attribute.underlying_type, type_call);
     }
 }
 
-void HashedDictionary::blockToAttributes(const Block & block)
+template <DictionaryKeyType dictionary_key_type, bool sparse>
+void HashedDictionary<dictionary_key_type, sparse>::updateData()
 {
-    const auto & id_column = *block.safeGetByPosition(0).column;
-
-    for (const size_t attribute_idx : ext::range(0, attributes.size()))
-    {
-        const IColumn & attribute_column = *block.safeGetByPosition(attribute_idx + 1).column;
-        auto & attribute = attributes[attribute_idx];
-
-        for (const auto row_idx : ext::range(0, id_column.size()))
-            if (setAttributeValue(attribute, id_column[row_idx].get<UInt64>(), attribute_column[row_idx]))
-                ++element_count;
-    }
-}
-
-void HashedDictionary::updateData()
-{
-    if (!saved_block || saved_block->rows() == 0)
+    if (!previously_loaded_block || previously_loaded_block->rows() == 0)
     {
         auto stream = source_ptr->loadUpdatedAll();
         stream->readPrefix();
@@ -275,12 +351,13 @@ void HashedDictionary::updateData()
         while (const auto block = stream->read())
         {
             /// We are using this to keep saved data if input stream consists of multiple blocks
-            if (!saved_block)
-                saved_block = std::make_shared<DB::Block>(block.cloneEmpty());
+            if (!previously_loaded_block)
+                previously_loaded_block = std::make_shared<DB::Block>(block.cloneEmpty());
+
             for (const auto attribute_idx : ext::range(0, attributes.size() + 1))
             {
                 const IColumn & update_column = *block.getByPosition(attribute_idx).column.get();
-                MutableColumnPtr saved_column = saved_block->getByPosition(attribute_idx).column->assumeMutable();
+                MutableColumnPtr saved_column = previously_loaded_block->getByPosition(attribute_idx).column->assumeMutable();
                 saved_column->insertRangeFrom(update_column, 0, update_column.size());
             }
         }
@@ -289,137 +366,177 @@ void HashedDictionary::updateData()
     else
     {
         auto stream = source_ptr->loadUpdatedAll();
-        stream->readPrefix();
+        mergeBlockWithStream<dictionary_key_type>(
+            dict_struct.getKeysSize(),
+            *previously_loaded_block,
+            stream);
+    }
 
-        while (Block block = stream->read())
+    if (previously_loaded_block)
+    {
+        resize(previously_loaded_block->rows());
+        blockToAttributes(*previously_loaded_block.get());
+    }
+}
+
+template <DictionaryKeyType dictionary_key_type, bool sparse>
+void HashedDictionary<dictionary_key_type, sparse>::blockToAttributes(const Block & block [[maybe_unused]])
+{
+    size_t skip_keys_size_offset = dict_struct.getKeysSize();
+
+    Columns key_columns;
+    key_columns.reserve(skip_keys_size_offset);
+
+    /// Split into keys columns and attribute columns
+    for (size_t i = 0; i < skip_keys_size_offset; ++i)
+        key_columns.emplace_back(block.safeGetByPosition(i).column);
+
+    DictionaryKeysArenaHolder<dictionary_key_type> arena_holder;
+    DictionaryKeysExtractor<dictionary_key_type> keys_extractor(key_columns, arena_holder.getComplexKeyArena());
+    const size_t keys_size = keys_extractor.getKeysSize();
+
+    Field column_value_to_insert;
+
+    for (size_t attribute_index = 0; attribute_index < attributes.size(); ++attribute_index)
+    {
+        const IColumn & attribute_column = *block.safeGetByPosition(skip_keys_size_offset + attribute_index).column;
+        auto & attribute = attributes[attribute_index];
+        bool attribute_is_nullable = attribute.is_nullable_set.has_value();
+
+        getAttributeContainer(attribute_index, [&](auto & container)
         {
-            const auto & saved_id_column = *saved_block->safeGetByPosition(0).column;
-            const auto & update_id_column = *block.safeGetByPosition(0).column;
+            using ContainerType = std::decay_t<decltype(container)>;
+            using AttributeValueType = typename ContainerType::mapped_type;
 
-            std::unordered_map<Key, std::vector<size_t>> update_ids;
-            for (size_t row = 0; row < update_id_column.size(); ++row)
+            for (size_t key_index = 0; key_index < keys_size; ++key_index)
             {
-                const auto id = update_id_column.get64(row);
-                update_ids[id].push_back(row);
-            }
+                auto key = keys_extractor.extractCurrentKey();
 
-            const size_t saved_rows = saved_id_column.size();
-            IColumn::Filter filter(saved_rows);
-            std::unordered_map<Key, std::vector<size_t>>::iterator it;
+                auto it = container.find(key);
+                bool key_is_nullable_and_already_exists = attribute_is_nullable && attribute.is_nullable_set->find(key) != nullptr;
 
-            for (size_t row = 0; row < saved_id_column.size(); ++row)
-            {
-                auto id = saved_id_column.get64(row);
-                it = update_ids.find(id);
+                if (key_is_nullable_and_already_exists || it != container.end())
+                {
+                    keys_extractor.rollbackCurrentKey();
+                    continue;
+                }
 
-                if (it != update_ids.end())
-                    filter[row] = 0;
+                if constexpr (std::is_same_v<KeyType, StringRef>)
+                    key = copyKeyInArena(key);
+
+                attribute_column.get(key_index, column_value_to_insert);
+
+                if (attribute.is_nullable_set && column_value_to_insert.isNull())
+                {
+                    attribute.is_nullable_set->insert(key);
+                    keys_extractor.rollbackCurrentKey();
+                    continue;
+                }
+
+                if constexpr (std::is_same_v<AttributeValueType, StringRef>)
+                {
+                    String & value_to_insert = column_value_to_insert.get<String>();
+                    size_t value_to_insert_size = value_to_insert.size();
+
+                    const char * string_in_arena = attribute.string_arena->insert(value_to_insert.data(), value_to_insert_size);
+
+                    StringRef string_in_arena_reference = StringRef{string_in_arena, value_to_insert_size};
+                    container.insert({key, string_in_arena_reference});
+                }
                 else
-                    filter[row] = 1;
+                {
+                    auto value_to_insert = column_value_to_insert.get<NearestFieldType<AttributeValueType>>();
+                    container.insert({key, value_to_insert});
+                }
+
+                ++element_count;
+
+                keys_extractor.rollbackCurrentKey();
             }
 
-            auto block_columns = block.mutateColumns();
-            for (const auto attribute_idx : ext::range(0, attributes.size() + 1))
-            {
-                auto & column = saved_block->safeGetByPosition(attribute_idx).column;
-                const auto & filtered_column = column->filter(filter, -1);
-
-                block_columns[attribute_idx]->insertRangeFrom(*filtered_column.get(), 0, filtered_column->size());
-            }
-
-            saved_block->setColumns(std::move(block_columns));
-        }
-        stream->readSuffix();
-    }
-
-    if (saved_block)
-    {
-        resize(saved_block->rows());
-        blockToAttributes(*saved_block.get());
+            keys_extractor.reset();
+        });
     }
 }
 
-template <typename T>
-void HashedDictionary::resize(Attribute & attribute, size_t added_rows)
+template <DictionaryKeyType dictionary_key_type, bool sparse>
+void HashedDictionary<dictionary_key_type, sparse>::resize(size_t added_rows)
 {
-    if (!sparse)
-    {
-        const auto & map_ref = std::get<CollectionPtrType<T>>(attribute.maps);
-        added_rows += map_ref->size();
-        map_ref->reserve(added_rows);
-    }
-    else
-    {
-        const auto & map_ref = std::get<SparseCollectionPtrType<T>>(attribute.sparse_maps);
-        added_rows += map_ref->size();
-        map_ref->resize(added_rows);
-    }
-}
-
-template <>
-void HashedDictionary::resize<String>(Attribute & attribute, size_t added_rows)
-{
-    resize<StringRef>(attribute, added_rows);
-}
-
-void HashedDictionary::resize(size_t added_rows)
-{
-    if (!added_rows)
+    if (unlikely(!added_rows))
         return;
 
-    for (auto & attribute : attributes)
+    for (size_t attribute_index = 0; attribute_index < attributes.size(); ++attribute_index)
     {
-        auto type_call = [&](const auto & dictionary_attribute_type)
+        getAttributeContainer(attribute_index, [added_rows](auto & attribute_map)
         {
-            using Type = std::decay_t<decltype(dictionary_attribute_type)>;
-            using AttributeType = typename Type::AttributeType;
-            resize<AttributeType>(attribute, added_rows);
-        };
+            size_t reserve_size = added_rows + attribute_map.size();
 
-        callOnDictionaryAttributeType(attribute.type, type_call);
+            if constexpr (sparse)
+                attribute_map.resize(reserve_size);
+            else
+                attribute_map.reserve(reserve_size);
+        });
     }
 }
 
-void HashedDictionary::loadData()
+template <DictionaryKeyType dictionary_key_type, bool sparse>
+template <typename AttributeType, typename ValueSetter, typename NullableValueSetter, typename DefaultValueExtractor>
+void HashedDictionary<dictionary_key_type, sparse>::getItemsImpl(
+    const Attribute & attribute,
+    DictionaryKeysExtractor<dictionary_key_type> & keys_extractor,
+    ValueSetter && set_value [[maybe_unused]],
+    NullableValueSetter && set_nullable_value [[maybe_unused]],
+    DefaultValueExtractor & default_value_extractor) const
+{
+    const auto & attribute_container = std::get<CollectionType<AttributeType>>(attribute.container);
+    const size_t keys_size = keys_extractor.getKeysSize();
+
+    bool is_attribute_nullable = attribute.is_nullable_set.has_value();
+
+    for (size_t key_index = 0; key_index < keys_size; ++key_index)
+    {
+        auto key = keys_extractor.extractCurrentKey();
+
+        const auto it = attribute_container.find(key);
+
+        if (it != attribute_container.end())
+            set_value(key_index, getValueFromCell(it));
+        else
+        {
+            if (is_attribute_nullable && attribute.is_nullable_set->find(key) != nullptr)
+                set_nullable_value(key_index);
+            else
+                set_value(key_index, default_value_extractor[key_index]);
+        }
+
+        keys_extractor.rollbackCurrentKey();
+    }
+
+    query_count.fetch_add(keys_size, std::memory_order_relaxed);
+}
+
+template <DictionaryKeyType dictionary_key_type, bool sparse>
+StringRef HashedDictionary<dictionary_key_type, sparse>::copyKeyInArena(StringRef key)
+{
+    size_t key_size = key.size;
+    char * place_for_key = complex_key_arena.alloc(key_size);
+    memcpy(reinterpret_cast<void *>(place_for_key), reinterpret_cast<const void *>(key.data), key_size);
+    StringRef updated_key{place_for_key, key_size};
+    return updated_key;
+}
+
+template <DictionaryKeyType dictionary_key_type, bool sparse>
+void HashedDictionary<dictionary_key_type, sparse>::loadData()
 {
     if (!source_ptr->hasUpdateField())
     {
-        /// atomic since progress callbac called in parallel
-        std::atomic<uint64_t> new_size = 0;
         auto stream = source_ptr->loadAll();
 
-        /// preallocation can be used only when we know number of rows, for this we need:
-        /// - source clickhouse
-        /// - no filtering (i.e. lack of <where>), since filtering can filter
-        ///   too much rows and eventually it may allocate memory that will
-        ///   never be used.
-        bool preallocate = false;
-        if (const auto & clickhouse_source = dynamic_cast<ClickHouseDictionarySource *>(source_ptr.get()))
-        {
-            if (!clickhouse_source->hasWhere())
-                preallocate = true;
-        }
-
-        if (preallocate)
-        {
-            stream->setProgressCallback([&new_size](const Progress & progress)
-            {
-                new_size += progress.total_rows_to_read;
-            });
-        }
-
         stream->readPrefix();
 
         while (const auto block = stream->read())
         {
-            if (new_size)
-            {
-                size_t current_new_size = new_size.exchange(0);
-                if (current_new_size)
-                    resize(current_new_size);
-            }
-            else
-                resize(block.rows());
+            resize(block.rows());
             blockToAttributes(block);
         }
 
@@ -429,263 +546,120 @@ void HashedDictionary::loadData()
         updateData();
 
     if (require_nonempty && 0 == element_count)
-        throw Exception{full_name + ": dictionary source is empty and 'require_nonempty' property is set.", ErrorCodes::DICTIONARY_IS_EMPTY};
+        throw Exception(ErrorCodes::DICTIONARY_IS_EMPTY,
+            "{}: dictionary source is empty and 'require_nonempty' property is set.",
+            full_name);
 }
 
-template <typename T>
-void HashedDictionary::addAttributeSize(const Attribute & attribute)
-{
-    if (!sparse)
-    {
-        const auto & map_ref = std::get<CollectionPtrType<T>>(attribute.maps);
-        bytes_allocated += sizeof(CollectionType<T>) + map_ref->getBufferSizeInBytes();
-        bucket_count = map_ref->getBufferSizeInCells();
-    }
-    else
-    {
-        const auto & map_ref = std::get<SparseCollectionPtrType<T>>(attribute.sparse_maps);
-        bucket_count = map_ref->bucket_count();
-
-        /** TODO: more accurate calculation */
-        bytes_allocated += sizeof(SparseCollectionType<T>);
-        bytes_allocated += bucket_count;
-        bytes_allocated += map_ref->size() * (sizeof(Key) + sizeof(T));
-    }
-}
-
-template <>
-void HashedDictionary::addAttributeSize<String>(const Attribute & attribute)
-{
-    addAttributeSize<StringRef>(attribute);
-    bytes_allocated += sizeof(Arena) + attribute.string_arena->size();
-}
-
-void HashedDictionary::calculateBytesAllocated()
+template <DictionaryKeyType dictionary_key_type, bool sparse>
+void HashedDictionary<dictionary_key_type, sparse>::calculateBytesAllocated()
 {
     bytes_allocated += attributes.size() * sizeof(attributes.front());
 
-    for (const auto & attribute : attributes)
+    for (size_t i = 0; i < attributes.size(); ++i)
     {
-        auto type_call = [&](const auto & dictionary_attribute_type)
+        getAttributeContainer(i, [&](const auto & container)
         {
-            using Type = std::decay_t<decltype(dictionary_attribute_type)>;
-            using AttributeType = typename Type::AttributeType;
-            addAttributeSize<AttributeType>(attribute);
-        };
+            using ContainerType = std::decay_t<decltype(container)>;
+            using AttributeValueType = typename ContainerType::mapped_type;
 
-        callOnDictionaryAttributeType(attribute.type, type_call);
-    }
-}
+            bytes_allocated += sizeof(container);
 
-template <typename T>
-void HashedDictionary::createAttributeImpl(Attribute & attribute, const Field & null_value)
-{
-    attribute.null_values = T(null_value.get<NearestFieldType<T>>());
-    if (!sparse)
-        attribute.maps = std::make_unique<CollectionType<T>>();
-    else
-        attribute.sparse_maps = std::make_unique<SparseCollectionType<T>>();
-}
-
-template <>
-void HashedDictionary::createAttributeImpl<String>(Attribute & attribute, const Field & null_value)
-{
-    attribute.string_arena = std::make_unique<Arena>();
-    const String & string = null_value.get<String>();
-    const char * string_in_arena = attribute.string_arena->insert(string.data(), string.size());
-    attribute.null_values.emplace<StringRef>(string_in_arena, string.size());
-
-    if (!sparse)
-        attribute.maps = std::make_unique<CollectionType<StringRef>>();
-    else
-        attribute.sparse_maps = std::make_unique<SparseCollectionType<StringRef>>();
-}
-
-HashedDictionary::Attribute HashedDictionary::createAttribute(const DictionaryAttribute& attribute, const Field & null_value)
-{
-    auto nullable_set = attribute.is_nullable ? std::make_optional<NullableSet>() : std::optional<NullableSet>{};
-    Attribute attr{attribute.underlying_type, std::move(nullable_set), {}, {}, {}, {}};
-
-    auto type_call = [&, this](const auto &dictionary_attribute_type)
-    {
-        using Type = std::decay_t<decltype(dictionary_attribute_type)>;
-        using AttributeType = typename Type::AttributeType;
-        createAttributeImpl<AttributeType>(attr, null_value);
-    };
-
-    callOnDictionaryAttributeType(attribute.underlying_type, type_call);
-
-    return attr;
-}
-
-
-template <typename AttributeType, typename OutputType, typename MapType, typename ValueSetter, typename DefaultValueExtractor>
-void HashedDictionary::getItemsAttrImpl(
-    const MapType & attr,
-    const PaddedPODArray<Key> & ids,
-    ValueSetter && set_value,
-    DefaultValueExtractor & default_value_extractor) const
-{
-    const auto rows = ext::size(ids);
-
-    for (const auto i : ext::range(0, rows))
-    {
-        const auto it = attr.find(ids[i]);
-        set_value(i, it != attr.end() ? static_cast<OutputType>(second(*it)) : default_value_extractor[i]);
-    }
-
-    query_count.fetch_add(rows, std::memory_order_relaxed);
-}
-
-template <typename AttributeType, typename OutputType, typename ValueSetter, typename DefaultValueExtractor>
-void HashedDictionary::getItemsImpl(
-    const Attribute & attribute,
-    const PaddedPODArray<Key> & ids,
-    ValueSetter && set_value,
-    DefaultValueExtractor & default_value_extractor) const
-{
-    if (!sparse)
-        return getItemsAttrImpl<AttributeType, OutputType>(*std::get<CollectionPtrType<AttributeType>>(attribute.maps), ids, set_value, default_value_extractor);
-    return getItemsAttrImpl<AttributeType, OutputType>(*std::get<SparseCollectionPtrType<AttributeType>>(attribute.sparse_maps), ids, set_value, default_value_extractor);
-}
-
-
-template <typename T>
-bool HashedDictionary::setAttributeValueImpl(Attribute & attribute, const Key id, const T value)
-{
-    if (!sparse)
-    {
-        auto & map = *std::get<CollectionPtrType<T>>(attribute.maps);
-        return map.insert({id, value}).second;
-    }
-    else
-    {
-        auto & map = *std::get<SparseCollectionPtrType<T>>(attribute.sparse_maps);
-        return map.insert({id, value}).second;
-    }
-}
-
-template <>
-bool HashedDictionary::setAttributeValueImpl<String>(Attribute & attribute, const Key id, const String value)
-{
-    const auto * string_in_arena = attribute.string_arena->insert(value.data(), value.size());
-    return setAttributeValueImpl<StringRef>(attribute, id, StringRef{string_in_arena, value.size()});
-}
-
-bool HashedDictionary::setAttributeValue(Attribute & attribute, const Key id, const Field & value)
-{
-    bool result = false;
-
-    auto type_call = [&, this](const auto &dictionary_attribute_type)
-    {
-        using Type = std::decay_t<decltype(dictionary_attribute_type)>;
-        using AttributeType = typename Type::AttributeType;
-
-        if (attribute.nullable_set)
-        {
-            if (value.isNull())
+            if constexpr (sparse || std::is_same_v<AttributeValueType, Field>)
             {
-                result = attribute.nullable_set->insert(id).second;
-                return;
+                /// bucket_count() - Returns table size, that includes empty and deleted
+                /// size()         - Returns table size, w/o empty and deleted
+                /// and since this is sparsehash, empty cells should not be significant,
+                /// and since items cannot be removed from the dictionary, deleted is also not important.
+                bytes_allocated += container.size() * (sizeof(KeyType) + sizeof(AttributeValueType));
+                bucket_count = container.bucket_count();
             }
             else
             {
-                attribute.nullable_set->erase(id);
+                bytes_allocated += container.getBufferSizeInBytes();
+                bucket_count = container.getBufferSizeInCells();
             }
-        }
+        });
 
-        result = setAttributeValueImpl<AttributeType>(attribute, id, value.get<NearestFieldType<AttributeType>>());
-    };
-
-    callOnDictionaryAttributeType(attribute.type, type_call);
-
-    return result;
-}
-
-const HashedDictionary::Attribute & HashedDictionary::getAttribute(const std::string & attribute_name) const
-{
-    const auto it = attribute_index_by_name.find(attribute_name);
-    if (it == std::end(attribute_index_by_name))
-        throw Exception{full_name + ": no such attribute '" + attribute_name + "'", ErrorCodes::BAD_ARGUMENTS};
-
-    return attributes[it->second];
-}
-
-template <typename T>
-void HashedDictionary::has(const Attribute & attribute, const PaddedPODArray<Key> & ids, PaddedPODArray<UInt8> & out) const
-{
-    const auto & attr = *std::get<CollectionPtrType<T>>(attribute.maps);
-    const auto rows = ext::size(ids);
-
-    for (const auto i : ext::range(0, rows))
-    {
-        out[i] = attr.find(ids[i]) != nullptr;
-
-        if (attribute.nullable_set && !out[i])
-            out[i] = attribute.nullable_set->find(ids[i]) != nullptr;
+        if (attributes[i].string_arena)
+            bytes_allocated += attributes[i].string_arena->size();
     }
+
+    bytes_allocated += complex_key_arena.size();
 }
 
-template <>
-void HashedDictionary::has<String>(const Attribute & attribute, const PaddedPODArray<Key> & ids, PaddedPODArray<UInt8> & out) const
+template <DictionaryKeyType dictionary_key_type, bool sparse>
+BlockInputStreamPtr HashedDictionary<dictionary_key_type, sparse>::getBlockInputStream(const Names & column_names, size_t max_block_size) const
 {
-    has<StringRef>(attribute, ids, out);
+    PaddedPODArray<HashedDictionary::KeyType> keys;
+
+    if (!attributes.empty())
+    {
+        const auto & attribute = attributes.front();
+
+        getAttributeContainer(0, [&](auto & container)
+        {
+            keys.reserve(container.size());
+
+            for (const auto & [key, value] : container)
+            {
+                (void)(value);
+                keys.emplace_back(key);
+            }
+
+            if (attribute.is_nullable_set)
+            {
+                const auto & is_nullable_set = *attribute.is_nullable_set;
+                keys.reserve(is_nullable_set.size());
+
+                for (auto & node : is_nullable_set)
+                    keys.emplace_back(node.getKey());
+            }
+        });
+    }
+
+    if constexpr (dictionary_key_type == DictionaryKeyType::simple)
+        return std::make_shared<DictionaryBlockInputStream>(shared_from_this(), max_block_size, std::move(keys), column_names);
+    else
+        return std::make_shared<DictionaryBlockInputStream>(shared_from_this(), max_block_size, keys, column_names);
 }
 
-template <typename T, typename AttrType>
-PaddedPODArray<HashedDictionary::Key> HashedDictionary::getIdsAttrImpl(const AttrType & attr) const
+template <DictionaryKeyType dictionary_key_type, bool sparse>
+template <typename GetContainerFunc>
+void HashedDictionary<dictionary_key_type, sparse>::getAttributeContainer(size_t attribute_index, GetContainerFunc && get_container_func)
 {
-    PaddedPODArray<Key> ids;
-    ids.reserve(attr.size());
-    for (const auto & value : attr)
-        ids.push_back(first(value));
+    assert(attribute_index < attributes.size());
 
-    return ids;
-}
-template <typename T>
-PaddedPODArray<HashedDictionary::Key> HashedDictionary::getIds(const Attribute & attribute) const
-{
-    if (!sparse)
-        return getIdsAttrImpl<T>(*std::get<CollectionPtrType<T>>(attribute.maps));
-    return getIdsAttrImpl<T>(*std::get<SparseCollectionPtrType<T>>(attribute.sparse_maps));
-}
-
-template <>
-PaddedPODArray<HashedDictionary::Key> HashedDictionary::getIds<String>(const Attribute & attribute) const
-{
-    return getIds<StringRef>(attribute);
-}
-
-PaddedPODArray<HashedDictionary::Key> HashedDictionary::getIds() const
-{
-    const auto & attribute = attributes.front();
-    PaddedPODArray<HashedDictionary::Key> result;
+    auto & attribute = attributes[attribute_index];
 
     auto type_call = [&](const auto & dictionary_attribute_type)
     {
         using Type = std::decay_t<decltype(dictionary_attribute_type)>;
         using AttributeType = typename Type::AttributeType;
-        /// TODO: Check if order is satisfied
-        result = getIds<AttributeType>(attribute);
+        using ValueType = DictionaryValueType<AttributeType>;
 
-        if (attribute.nullable_set)
-        {
-            for (const auto& value: *attribute.nullable_set)
-                result.push_back(value.getKey());
-        }
+        auto & attribute_container = std::get<CollectionType<ValueType>>(attribute.container);
+        std::forward<GetContainerFunc>(get_container_func)(attribute_container);
     };
 
     callOnDictionaryAttributeType(attribute.type, type_call);
-
-    return result;
 }
 
-BlockInputStreamPtr HashedDictionary::getBlockInputStream(const Names & column_names, size_t max_block_size) const
+template <DictionaryKeyType dictionary_key_type, bool sparse>
+template <typename GetContainerFunc>
+void HashedDictionary<dictionary_key_type, sparse>::getAttributeContainer(size_t attribute_index, GetContainerFunc && get_container_func) const
 {
-    using BlockInputStreamType = DictionaryBlockInputStream<Key>;
-    return std::make_shared<BlockInputStreamType>(shared_from_this(), max_block_size, getIds(), column_names);
+    const_cast<std::decay_t<decltype(*this)> *>(this)->getAttributeContainer(attribute_index, [&](auto & attribute_container)
+    {
+        std::forward<GetContainerFunc>(get_container_func)(attribute_container);
+    });
 }
 
+template class HashedDictionary<DictionaryKeyType::simple, true>;
+template class HashedDictionary<DictionaryKeyType::simple, false>;
+template class HashedDictionary<DictionaryKeyType::complex, true>;
+template class HashedDictionary<DictionaryKeyType::complex, false>;
+
 void registerDictionaryHashed(DictionaryFactory & factory)
 {
     auto create_layout = [](const std::string & full_name,
@@ -693,27 +667,51 @@ void registerDictionaryHashed(DictionaryFactory & factory)
                              const Poco::Util::AbstractConfiguration & config,
                              const std::string & config_prefix,
                              DictionarySourcePtr source_ptr,
+                             DictionaryKeyType dictionary_key_type,
                              bool sparse) -> DictionaryPtr
     {
-        if (dict_struct.key)
-            throw Exception{"'key' is not supported for dictionary of layout 'hashed'", ErrorCodes::UNSUPPORTED_METHOD};
+        if (dictionary_key_type == DictionaryKeyType::simple && dict_struct.key)
+            throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "'key' is not supported for simple key hashed dictionary");
+        else if (dictionary_key_type == DictionaryKeyType::complex && dict_struct.id)
+            throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "'id' is not supported for complex key hashed dictionary");
 
         if (dict_struct.range_min || dict_struct.range_max)
-            throw Exception{full_name
-                                + ": elements .structure.range_min and .structure.range_max should be defined only "
-                                  "for a dictionary of layout 'range_hashed'",
-                            ErrorCodes::BAD_ARGUMENTS};
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                "{}: elements .structure.range_min and .structure.range_max should be defined only "
+                "for a dictionary of layout 'range_hashed'",
+                full_name);
 
         const auto dict_id = StorageID::fromDictionaryConfig(config, config_prefix);
         const DictionaryLifetime dict_lifetime{config, config_prefix + ".lifetime"};
         const bool require_nonempty = config.getBool(config_prefix + ".require_nonempty", false);
-        return std::make_unique<HashedDictionary>(dict_id, dict_struct, std::move(source_ptr), dict_lifetime, require_nonempty, sparse);
+
+        if (dictionary_key_type == DictionaryKeyType::simple)
+        {
+            if (sparse)
+                return std::make_unique<HashedDictionary<DictionaryKeyType::simple, true>>(dict_id, dict_struct, std::move(source_ptr), dict_lifetime, require_nonempty);
+            else
+                return std::make_unique<HashedDictionary<DictionaryKeyType::simple, false>>(dict_id, dict_struct, std::move(source_ptr), dict_lifetime, require_nonempty);
+        }
+        else
+        {
+            if (sparse)
+                return std::make_unique<HashedDictionary<DictionaryKeyType::complex, true>>(dict_id, dict_struct, std::move(source_ptr), dict_lifetime, require_nonempty);
+            else
+                return std::make_unique<HashedDictionary<DictionaryKeyType::complex, false>>(dict_id, dict_struct, std::move(source_ptr), dict_lifetime, require_nonempty);
+        }
     };
+
     using namespace std::placeholders;
+
     factory.registerLayout("hashed",
-        [=](auto && a, auto && b, auto && c, auto && d, DictionarySourcePtr e){ return create_layout(a, b, c, d, std::move(e), /* sparse = */ false); }, false);
+        [=](auto && a, auto && b, auto && c, auto && d, DictionarySourcePtr e){ return create_layout(a, b, c, d, std::move(e), DictionaryKeyType::simple, /* sparse = */ false); }, false);
     factory.registerLayout("sparse_hashed",
-        [=](auto && a, auto && b, auto && c, auto && d, DictionarySourcePtr e){ return create_layout(a, b, c, d, std::move(e), /* sparse = */ true); }, false);
+        [=](auto && a, auto && b, auto && c, auto && d, DictionarySourcePtr e){ return create_layout(a, b, c, d, std::move(e), DictionaryKeyType::simple, /* sparse = */ true); }, false);
+    factory.registerLayout("complex_key_hashed",
+        [=](auto && a, auto && b, auto && c, auto && d, DictionarySourcePtr e){ return create_layout(a, b, c, d, std::move(e), DictionaryKeyType::complex, /* sparse = */ false); }, true);
+    factory.registerLayout("complex_key_sparse_hashed",
+        [=](auto && a, auto && b, auto && c, auto && d, DictionarySourcePtr e){ return create_layout(a, b, c, d, std::move(e), DictionaryKeyType::complex, /* sparse = */ true); }, true);
+
 }
 
 }
diff --git a/src/Dictionaries/HashedDictionary.h b/src/Dictionaries/HashedDictionary.h
index 97b329a8b25..0d0ab8dcb43 100644
--- a/src/Dictionaries/HashedDictionary.h
+++ b/src/Dictionaries/HashedDictionary.h
@@ -4,17 +4,21 @@
 #include <memory>
 #include <variant>
 #include <optional>
-#include <Columns/ColumnDecimal.h>
-#include <Columns/ColumnString.h>
-#include <Core/Block.h>
-#include <Common/HashTable/HashMap.h>
-#include <Common/HashTable/HashSet.h>
+
 #include <sparsehash/sparse_hash_map>
 #include <ext/range.h>
-#include "DictionaryStructure.h"
-#include "IDictionary.h"
-#include "IDictionarySource.h"
-#include "DictionaryHelpers.h"
+
+#include <Common/HashTable/HashMap.h>
+#include <Common/HashTable/HashSet.h>
+#include <Core/Block.h>
+
+#include <Columns/ColumnDecimal.h>
+#include <Columns/ColumnString.h>
+
+#include <Dictionaries/DictionaryStructure.h>
+#include <Dictionaries/IDictionary.h>
+#include <Dictionaries/IDictionarySource.h>
+#include <Dictionaries/DictionaryHelpers.h>
 
 /** This dictionary stores all content in a hash table in memory
   * (a separate Key -> Value map for each attribute)
@@ -24,19 +28,32 @@
 namespace DB
 {
 
+template <DictionaryKeyType dictionary_key_type, bool sparse>
 class HashedDictionary final : public IDictionary
 {
 public:
+    using KeyType = std::conditional_t<dictionary_key_type == DictionaryKeyType::simple, UInt64, StringRef>;
+    static_assert(dictionary_key_type != DictionaryKeyType::range, "Range key type is not supported by hashed dictionary");
+
     HashedDictionary(
         const StorageID & dict_id_,
         const DictionaryStructure & dict_struct_,
         DictionarySourcePtr source_ptr_,
         const DictionaryLifetime dict_lifetime_,
         bool require_nonempty_,
-        bool sparse_,
-        BlockPtr saved_block_ = nullptr);
+        BlockPtr previously_loaded_block_ = nullptr);
 
-    std::string getTypeName() const override { return sparse ? "SparseHashed" : "Hashed"; }
+    std::string getTypeName() const override
+    {
+        if constexpr (dictionary_key_type == DictionaryKeyType::simple && sparse)
+            return "SparseHashed";
+        else if constexpr (dictionary_key_type == DictionaryKeyType::simple && !sparse)
+            return "Hashed";
+        else if constexpr (dictionary_key_type == DictionaryKeyType::complex && sparse)
+            return "ComplexKeySpareseHashed";
+        else
+            return "ComplexKeyHashed";
+    }
 
     size_t getBytesAllocated() const override { return bytes_allocated; }
 
@@ -50,7 +67,7 @@ public:
 
     std::shared_ptr<const IExternalLoadable> clone() const override
     {
-        return std::make_shared<HashedDictionary>(getDictionaryID(), dict_struct, source_ptr->clone(), dict_lifetime, require_nonempty, sparse, saved_block);
+        return std::make_shared<HashedDictionary<dictionary_key_type, sparse>>(getDictionaryID(), dict_struct, source_ptr->clone(), dict_lifetime, require_nonempty, previously_loaded_block);
     }
 
     const IDictionarySource * getSource() const override { return source_ptr.get(); }
@@ -61,54 +78,66 @@ public:
 
     bool isInjective(const std::string & attribute_name) const override
     {
-        return dict_struct.attributes[&getAttribute(attribute_name) - attributes.data()].injective;
+        return dict_struct.getAttribute(attribute_name).injective;
     }
 
-    bool hasHierarchy() const override { return hierarchical_attribute; }
-
-    void toParent(const PaddedPODArray<Key> & ids, PaddedPODArray<Key> & out) const override;
-
-    DictionaryKeyType getKeyType() const override { return DictionaryKeyType::simple; }
+    DictionaryKeyType getKeyType() const override { return dictionary_key_type; }
 
     ColumnPtr getColumn(
         const std::string& attribute_name,
         const DataTypePtr & result_type,
         const Columns & key_columns,
         const DataTypes & key_types,
-        const ColumnPtr default_values_column) const override;
+        const ColumnPtr & default_values_column) const override;
 
     ColumnUInt8::Ptr hasKeys(const Columns & key_columns, const DataTypes & key_types) const override;
 
-    void isInVectorVector(
-        const PaddedPODArray<Key> & child_ids, const PaddedPODArray<Key> & ancestor_ids, PaddedPODArray<UInt8> & out) const override;
-    void isInVectorConstant(const PaddedPODArray<Key> & child_ids, const Key ancestor_id, PaddedPODArray<UInt8> & out) const override;
-    void isInConstantVector(const Key child_id, const PaddedPODArray<Key> & ancestor_ids, PaddedPODArray<UInt8> & out) const override;
+    bool hasHierarchy() const override { return dictionary_key_type == DictionaryKeyType::simple && dict_struct.hierarchical_attribute_index.has_value(); }
+
+    ColumnPtr getHierarchy(ColumnPtr key_column, const DataTypePtr & hierarchy_attribute_type) const override;
+
+    ColumnUInt8::Ptr isInHierarchy(
+        ColumnPtr key_column,
+        ColumnPtr in_key_column,
+        const DataTypePtr & key_type) const override;
+
+    ColumnPtr getDescendants(
+        ColumnPtr key_column,
+        const DataTypePtr & key_type,
+        size_t level) const override;
 
     BlockInputStreamPtr getBlockInputStream(const Names & column_names, size_t max_block_size) const override;
 
 private:
     template <typename Value>
-    using CollectionType = HashMap<UInt64, Value>;
-    template <typename Value>
-    using CollectionPtrType = std::unique_ptr<CollectionType<Value>>;
+    using CollectionTypeNonSparse = std::conditional_t<
+        dictionary_key_type == DictionaryKeyType::simple,
+        HashMap<UInt64, Value>,
+        HashMapWithSavedHash<StringRef, Value, DefaultHash<StringRef>>>;
 
 #if !defined(ARCADIA_BUILD)
-    template <typename Value>
-    using SparseCollectionType = google::sparse_hash_map<UInt64, Value, DefaultHash<UInt64>>;
+    template <typename Key, typename Value>
+    using SparseHashMap = google::sparse_hash_map<Key, Value, DefaultHash<Key>>;
 #else
-    template <typename Value>
-    using SparseCollectionType = google::sparsehash::sparse_hash_map<UInt64, Value, DefaultHash<UInt64>>;
+        template <typename Key, typename Value>
+        using SparseHashMap = google::sparsehash::sparse_hash_map<Key, Value, DefaultHash<Key>>;
 #endif
 
     template <typename Value>
-    using SparseCollectionPtrType = std::unique_ptr<SparseCollectionType<Value>>;
+    using CollectionTypeSparse = std::conditional_t<
+        dictionary_key_type == DictionaryKeyType::simple,
+        SparseHashMap<UInt64, Value>,
+        SparseHashMap<StringRef, Value>>;
 
-    using NullableSet = HashSet<Key, DefaultHash<Key>>;
+    template <typename Value>
+    using CollectionType = std::conditional_t<sparse, CollectionTypeSparse<Value>, CollectionTypeNonSparse<Value>>;
+
+    using NullableSet = HashSet<KeyType, DefaultHash<KeyType>>;
 
     struct Attribute final
     {
         AttributeUnderlyingType type;
-        std::optional<NullableSet> nullable_set;
+        std::optional<NullableSet> is_nullable_set;
 
         std::variant<
             UInt8,
@@ -123,44 +152,31 @@ private:
             Decimal32,
             Decimal64,
             Decimal128,
+            Decimal256,
             Float32,
             Float64,
             StringRef>
             null_values;
+
         std::variant<
-            CollectionPtrType<UInt8>,
-            CollectionPtrType<UInt16>,
-            CollectionPtrType<UInt32>,
-            CollectionPtrType<UInt64>,
-            CollectionPtrType<UInt128>,
-            CollectionPtrType<Int8>,
-            CollectionPtrType<Int16>,
-            CollectionPtrType<Int32>,
-            CollectionPtrType<Int64>,
-            CollectionPtrType<Decimal32>,
-            CollectionPtrType<Decimal64>,
-            CollectionPtrType<Decimal128>,
-            CollectionPtrType<Float32>,
-            CollectionPtrType<Float64>,
-            CollectionPtrType<StringRef>>
-            maps;
-        std::variant<
-            SparseCollectionPtrType<UInt8>,
-            SparseCollectionPtrType<UInt16>,
-            SparseCollectionPtrType<UInt32>,
-            SparseCollectionPtrType<UInt64>,
-            SparseCollectionPtrType<UInt128>,
-            SparseCollectionPtrType<Int8>,
-            SparseCollectionPtrType<Int16>,
-            SparseCollectionPtrType<Int32>,
-            SparseCollectionPtrType<Int64>,
-            SparseCollectionPtrType<Decimal32>,
-            SparseCollectionPtrType<Decimal64>,
-            SparseCollectionPtrType<Decimal128>,
-            SparseCollectionPtrType<Float32>,
-            SparseCollectionPtrType<Float64>,
-            SparseCollectionPtrType<StringRef>>
-            sparse_maps;
+            CollectionType<UInt8>,
+            CollectionType<UInt16>,
+            CollectionType<UInt32>,
+            CollectionType<UInt64>,
+            CollectionType<UInt128>,
+            CollectionType<Int8>,
+            CollectionType<Int16>,
+            CollectionType<Int32>,
+            CollectionType<Int64>,
+            CollectionType<Decimal32>,
+            CollectionType<Decimal64>,
+            CollectionType<Decimal128>,
+            CollectionType<Decimal256>,
+            CollectionType<Float32>,
+            CollectionType<Float64>,
+            CollectionType<StringRef>>
+            container;
+
         std::unique_ptr<Arena> string_arena;
     };
 
@@ -172,76 +188,46 @@ private:
 
     void loadData();
 
-    template <typename T>
-    void addAttributeSize(const Attribute & attribute);
-
     void calculateBytesAllocated();
 
-    template <typename T>
-    void createAttributeImpl(Attribute & attribute, const Field & null_value);
-
-    Attribute createAttribute(const DictionaryAttribute& attribute, const Field & null_value);
-
-    template <typename AttributeType, typename OutputType, typename MapType, typename ValueSetter, typename DefaultValueExtractor>
-    void getItemsAttrImpl(
-        const MapType & attr,
-        const PaddedPODArray<Key> & ids,
-        ValueSetter && set_value,
-        DefaultValueExtractor & default_value_extractor) const;
-
-    template <typename AttributeType, typename OutputType, typename ValueSetter, typename DefaultValueExtractor>
+    template <typename AttributeType, typename ValueSetter, typename NullableValueSetter, typename DefaultValueExtractor>
     void getItemsImpl(
         const Attribute & attribute,
-        const PaddedPODArray<Key> & ids,
+        DictionaryKeysExtractor<dictionary_key_type> & keys_extractor,
         ValueSetter && set_value,
+        NullableValueSetter && set_nullable_value,
         DefaultValueExtractor & default_value_extractor) const;
 
-    template <typename T>
-    bool setAttributeValueImpl(Attribute & attribute, const Key id, const T value);
+    template <typename GetContainerFunc>
+    void getAttributeContainer(size_t attribute_index, GetContainerFunc && get_container_func);
 
-    bool setAttributeValue(Attribute & attribute, const Key id, const Field & value);
+    template <typename GetContainerFunc>
+    void getAttributeContainer(size_t attribute_index, GetContainerFunc && get_container_func) const;
 
-    const Attribute & getAttribute(const std::string & attribute_name) const;
-
-    template <typename T>
-    void has(const Attribute & attribute, const PaddedPODArray<Key> & ids, PaddedPODArray<UInt8> & out) const;
-
-    template <typename T, typename AttrType>
-    PaddedPODArray<Key> getIdsAttrImpl(const AttrType & attr) const;
-    template <typename T>
-    PaddedPODArray<Key> getIds(const Attribute & attribute) const;
-
-    PaddedPODArray<Key> getIds() const;
-
-    /// Preallocates the hashtable based on query progress
-    /// (Only while loading all data).
-    ///
-    /// @see preallocate
-    template <typename T>
-    void resize(Attribute & attribute, size_t added_rows);
     void resize(size_t added_rows);
 
-    template <typename AttrType, typename ChildType, typename AncestorType>
-    void isInAttrImpl(const AttrType & attr, const ChildType & child_ids, const AncestorType & ancestor_ids, PaddedPODArray<UInt8> & out) const;
-    template <typename ChildType, typename AncestorType>
-    void isInImpl(const ChildType & child_ids, const AncestorType & ancestor_ids, PaddedPODArray<UInt8> & out) const;
+    StringRef copyKeyInArena(StringRef key);
 
     const DictionaryStructure dict_struct;
     const DictionarySourcePtr source_ptr;
     const DictionaryLifetime dict_lifetime;
     const bool require_nonempty;
-    const bool sparse;
 
-    std::map<std::string, size_t> attribute_index_by_name;
     std::vector<Attribute> attributes;
-    const Attribute * hierarchical_attribute = nullptr;
 
     size_t bytes_allocated = 0;
     size_t element_count = 0;
     size_t bucket_count = 0;
     mutable std::atomic<size_t> query_count{0};
 
-    BlockPtr saved_block;
+    BlockPtr previously_loaded_block;
+    Arena complex_key_arena;
 };
 
+extern template class HashedDictionary<DictionaryKeyType::simple, false>;
+extern template class HashedDictionary<DictionaryKeyType::simple, true>;
+
+extern template class HashedDictionary<DictionaryKeyType::complex, false>;
+extern template class HashedDictionary<DictionaryKeyType::complex, true>;
+
 }
diff --git a/src/Dictionaries/HierarchyDictionariesUtils.cpp b/src/Dictionaries/HierarchyDictionariesUtils.cpp
new file mode 100644
index 00000000000..5bca6a5ac1a
--- /dev/null
+++ b/src/Dictionaries/HierarchyDictionariesUtils.cpp
@@ -0,0 +1,156 @@
+#include "HierarchyDictionariesUtils.h"
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int UNSUPPORTED_METHOD;
+}
+
+namespace
+{
+    /** In case of cache or direct dictionary we does not have structure with child to parent representation.
+      * This function build such structure calling getColumn for initial keys to request and for next keys in hierarchy,
+      * until all keys are requested or result key is null value.
+      * To distinguish null value key and key that is not present in dictionary, we use special default value column
+      * with max UInt64 value, if result column key has such value we assume that current key is not presented in dictionary storage.
+      */
+    HashMap<UInt64, UInt64> getChildToParentHierarchyMapImpl(
+        const IDictionary * dictionary,
+        const DictionaryAttribute & hierarchical_attribute,
+        const PaddedPODArray<UInt64> & initial_keys_to_request,
+        const DataTypePtr & key_type)
+    {
+        UInt64 null_value = hierarchical_attribute.null_value.get<UInt64>();
+
+        ColumnPtr key_to_request_column = ColumnVector<UInt64>::create();
+        auto * key_to_request_column_typed = static_cast<ColumnVector<UInt64> *>(key_to_request_column->assumeMutable().get());
+
+        UInt64 key_not_in_storage_value = std::numeric_limits<UInt64>::max();
+        ColumnPtr key_not_in_storage_default_value_column = ColumnVector<UInt64>::create(initial_keys_to_request.size(), key_not_in_storage_value);
+
+        PaddedPODArray<UInt64> & keys_to_request = key_to_request_column_typed->getData();
+        keys_to_request.assign(initial_keys_to_request);
+
+        PaddedPODArray<UInt64> next_keys_to_request;
+        HashSet<UInt64> already_requested_keys;
+
+        HashMap<UInt64, UInt64> child_to_parent_key;
+
+        while (!keys_to_request.empty())
+        {
+            child_to_parent_key.reserve(child_to_parent_key.size() + keys_to_request.size());
+
+            auto parent_key_column = dictionary->getColumn(
+                hierarchical_attribute.name,
+                hierarchical_attribute.type,
+                {key_to_request_column},
+                {key_type},
+                key_not_in_storage_default_value_column);
+
+            const auto * parent_key_column_typed = checkAndGetColumn<ColumnVector<UInt64>>(*parent_key_column);
+            if (!parent_key_column_typed)
+                throw Exception(ErrorCodes::UNSUPPORTED_METHOD,
+                    "Parent key column should be UInt64. Actual {}",
+                    hierarchical_attribute.type->getName());
+
+            const auto & parent_keys = parent_key_column_typed->getData();
+            next_keys_to_request.clear();
+
+            for (size_t i = 0; i < keys_to_request.size(); ++i)
+            {
+                auto key = keys_to_request[i];
+                auto parent_key = parent_keys[i];
+
+                if (parent_key == key_not_in_storage_value)
+                    continue;
+
+                child_to_parent_key[key] = parent_key;
+
+                if (parent_key == null_value ||
+                    already_requested_keys.find(parent_key) != nullptr)
+                    continue;
+
+                already_requested_keys.insert(parent_key);
+                next_keys_to_request.emplace_back(parent_key);
+            }
+
+            keys_to_request.clear();
+            keys_to_request.assign(next_keys_to_request);
+        }
+
+        return child_to_parent_key;
+    }
+}
+
+ColumnPtr getKeysHierarchyDefaultImplementation(const IDictionary * dictionary, ColumnPtr key_column, const DataTypePtr & key_type)
+{
+    key_column = key_column->convertToFullColumnIfConst();
+    const auto * key_column_typed = checkAndGetColumn<ColumnVector<UInt64>>(*key_column);
+    if (!key_column_typed)
+        throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "Key column should be UInt64");
+
+    const auto & dictionary_structure = dictionary->getStructure();
+    size_t hierarchical_attribute_index = *dictionary_structure.hierarchical_attribute_index;
+    const auto & hierarchical_attribute = dictionary_structure.attributes[hierarchical_attribute_index];
+
+    const PaddedPODArray<UInt64> & requested_keys = key_column_typed->getData();
+    HashMap<UInt64, UInt64> key_to_parent_key = getChildToParentHierarchyMapImpl(dictionary, hierarchical_attribute, requested_keys, key_type);
+
+    auto is_key_valid_func = [&](auto & key) { return key_to_parent_key.find(key) != nullptr; };
+
+    auto get_parent_key_func = [&](auto & key)
+    {
+        auto it = key_to_parent_key.find(key);
+        std::optional<UInt64> result = (it != nullptr ? std::make_optional(it->getMapped()) : std::nullopt);
+        return result;
+    };
+
+    UInt64 null_value = hierarchical_attribute.null_value.get<UInt64>();
+
+    auto dictionary_hierarchy_array = getKeysHierarchyArray(requested_keys, null_value, is_key_valid_func, get_parent_key_func);
+    return dictionary_hierarchy_array;
+}
+
+ColumnUInt8::Ptr getKeysIsInHierarchyDefaultImplementation(
+    const IDictionary * dictionary,
+    ColumnPtr key_column,
+    ColumnPtr in_key_column,
+    const DataTypePtr & key_type)
+{
+    key_column = key_column->convertToFullColumnIfConst();
+    in_key_column = in_key_column->convertToFullColumnIfConst();
+
+    const auto * key_column_typed = checkAndGetColumn<ColumnVector<UInt64>>(*key_column);
+    if (!key_column_typed)
+        throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "Key column should be UInt64");
+
+    const auto * in_key_column_typed = checkAndGetColumn<ColumnVector<UInt64>>(*in_key_column);
+    if (!in_key_column_typed)
+        throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "Key column should be UInt64");
+
+    const auto & dictionary_structure = dictionary->getStructure();
+    size_t hierarchical_attribute_index = *dictionary_structure.hierarchical_attribute_index;
+    const auto & hierarchical_attribute = dictionary_structure.attributes[hierarchical_attribute_index];
+
+    const PaddedPODArray<UInt64> & requested_keys = key_column_typed->getData();
+    HashMap<UInt64, UInt64> key_to_parent_key = getChildToParentHierarchyMapImpl(dictionary, hierarchical_attribute, requested_keys, key_type);
+
+    auto is_key_valid_func = [&](auto & key) { return key_to_parent_key.find(key) != nullptr; };
+
+    auto get_parent_key_func = [&](auto & key)
+    {
+        auto it = key_to_parent_key.find(key);
+        std::optional<UInt64> result = (it != nullptr ? std::make_optional(it->getMapped()) : std::nullopt);
+        return result;
+    };
+
+    UInt64 null_value = hierarchical_attribute.null_value.get<UInt64>();
+    const auto & in_keys = in_key_column_typed->getData();
+
+    auto result = getKeysIsInHierarchyColumn(requested_keys, in_keys, null_value, is_key_valid_func, get_parent_key_func);
+    return result;
+}
+
+}
diff --git a/src/Dictionaries/HierarchyDictionariesUtils.h b/src/Dictionaries/HierarchyDictionariesUtils.h
new file mode 100644
index 00000000000..8b2fe6ef08e
--- /dev/null
+++ b/src/Dictionaries/HierarchyDictionariesUtils.h
@@ -0,0 +1,467 @@
+#pragma once
+
+#include <common/types.h>
+#include <Common/PODArray.h>
+#include <Common/HashTable/HashMap.h>
+#include <Common/HashTable/HashSet.h>
+
+#include <Columns/IColumn.h>
+#include <Columns/ColumnVector.h>
+#include <Columns/ColumnArray.h>
+
+#include <Dictionaries/IDictionary.h>
+
+namespace DB
+{
+
+namespace detail
+{
+    template <typename KeyType>
+    struct ElementsAndOffsets
+    {
+        PaddedPODArray<KeyType> elements;
+        PaddedPODArray<IColumn::Offset> offsets;
+    };
+
+    template <typename T>
+    struct IsKeyValidFuncInterface
+    {
+        bool operator()(T key [[maybe_unused]]) { return false; }
+    };
+
+    template <typename T>
+    struct GetParentKeyFuncInterface
+    {
+        std::optional<T> operator()(T key [[maybe_unused]]) { return {}; }
+    };
+
+    /** Calculate hierarchy for keys iterating the hierarchy from child to parent using get_parent_key_func provided by client.
+      * Hierarchy iteration is stopped if key equals null value, get_parent_key_func returns null optional, or hierarchy depth
+      * greater or equal than DBMS_HIERARCHICAL_DICTIONARY_MAX_DEPTH.
+      * IsKeyValidFunc used for each input hierarchy key, if it returns false result hierarchy for that key will have size 0.
+      * Hierarchy result is ElementsAndOffsets structure, for each element there is hierarchy array,
+      * with size offset[element_index] - (element_index > 0 ? offset[element_index - 1] : 0).
+      *
+      * Example:
+      * id  parent_id
+      * 1   0
+      * 2   1
+      * 3   1
+      * 4   2
+      *
+      * If hierarchy_null_value will be 0. Requested keys [1, 2, 3, 4, 5].
+      * Result: [1], [2, 1], [3, 1], [4, 2, 1], []
+      * Elements: [1, 2, 1, 3, 1, 4, 2, 1]
+      * Offsets: [1, 3, 5, 8, 8]
+      */
+    template <typename KeyType, typename IsKeyValidFunc, typename GetParentKeyFunc>
+    ElementsAndOffsets<KeyType> getHierarchy(
+        const PaddedPODArray<KeyType> & keys,
+        const KeyType & hierarchy_null_value,
+        IsKeyValidFunc && is_key_valid_func,
+        GetParentKeyFunc && get_parent_key_func)
+    {
+        size_t hierarchy_keys_size = keys.size();
+
+        PaddedPODArray<KeyType> elements;
+        elements.reserve(hierarchy_keys_size);
+
+        PaddedPODArray<IColumn::Offset> offsets;
+        offsets.reserve(hierarchy_keys_size);
+
+        struct OffsetInArray
+        {
+            size_t offset_index;
+            size_t array_element_offset;
+        };
+
+        HashMap<KeyType, OffsetInArray> already_processes_keys_to_offset;
+        already_processes_keys_to_offset.reserve(hierarchy_keys_size);
+
+        for (size_t i = 0; i < hierarchy_keys_size; ++i)
+        {
+            auto hierarchy_key = keys[i];
+            size_t current_hierarchy_depth = 0;
+
+            bool is_key_valid = std::forward<IsKeyValidFunc>(is_key_valid_func)(hierarchy_key);
+
+            if (!is_key_valid)
+            {
+                offsets.emplace_back(elements.size());
+                continue;
+            }
+
+            while (true)
+            {
+                const auto * it = already_processes_keys_to_offset.find(hierarchy_key);
+
+                if (it)
+                {
+                    const auto & index = it->getMapped();
+
+                    size_t offset = index.offset_index;
+
+                    bool is_loop = (offset == offsets.size());
+
+                    if (unlikely(is_loop))
+                        break;
+
+                    size_t array_element_offset = index.array_element_offset;
+
+                    size_t previous_offset_size = offset > 0 ? offsets[offset - 1] : 0;
+                    size_t start_index = previous_offset_size + array_element_offset;
+                    size_t end_index = offsets[offset];
+
+                    elements.insertFromItself(elements.begin() + start_index, elements.begin() + end_index);
+                    break;
+                }
+
+                if (hierarchy_key == hierarchy_null_value || current_hierarchy_depth >= DBMS_HIERARCHICAL_DICTIONARY_MAX_DEPTH)
+                    break;
+
+                already_processes_keys_to_offset[hierarchy_key] = {offsets.size(), current_hierarchy_depth};
+                elements.emplace_back(hierarchy_key);
+                ++current_hierarchy_depth;
+
+                std::optional<KeyType> parent_key = std::forward<GetParentKeyFunc>(get_parent_key_func)(hierarchy_key);
+
+                if (!parent_key.has_value())
+                    break;
+
+                hierarchy_key = *parent_key;
+            }
+
+            offsets.emplace_back(elements.size());
+        }
+
+        ElementsAndOffsets<KeyType> result = {std::move(elements), std::move(offsets)};
+
+        return result;
+    }
+
+    /** Returns array with UInt8 represent if key from in_keys array is in hierarchy of key from keys column.
+      * If value in result array is 1 that means key from in_keys array is in hierarchy of key from
+      * keys array with same index, 0 therwise.
+      * For getting hierarchy implementation uses getKeysHierarchy function.
+      *
+      * Not: keys size must be equal to in_keys_size.
+      */
+    template <typename KeyType, typename IsKeyValidFunc, typename GetParentKeyFunc>
+    PaddedPODArray<UInt8> getIsInHierarchy(
+        const PaddedPODArray<KeyType> & keys,
+        const PaddedPODArray<KeyType> & in_keys,
+        const KeyType & hierarchy_null_value,
+        IsKeyValidFunc && is_key_valid_func,
+        GetParentKeyFunc && get_parent_func)
+    {
+        assert(keys.size() == in_keys.size());
+
+        PaddedPODArray<UInt8> result;
+        result.resize_fill(keys.size());
+
+        detail::ElementsAndOffsets<KeyType> hierarchy = detail::getHierarchy(
+            keys,
+            hierarchy_null_value,
+            std::forward<IsKeyValidFunc>(is_key_valid_func),
+            std::forward<GetParentKeyFunc>(get_parent_func));
+
+        auto & offsets = hierarchy.offsets;
+        auto & elements = hierarchy.elements;
+
+        for (size_t i = 0; i < offsets.size(); ++i)
+        {
+            size_t i_elements_start = i > 0 ? offsets[i - 1] : 0;
+            size_t i_elements_end = offsets[i];
+
+            auto & key_to_find = in_keys[i];
+
+            const auto * begin = elements.begin() + i_elements_start;
+            const auto * end = elements.begin() + i_elements_end;
+
+            const auto * it = std::find(begin, end, key_to_find);
+
+            bool contains_key = (it != end);
+            result[i] = contains_key;
+        }
+
+        return result;
+    }
+
+    struct GetAllDescendantsStrategy { size_t level = 0; };
+    struct GetDescendantsAtSpecificLevelStrategy { size_t level = 0; };
+
+    /** Get descendants for keys iterating the hierarchy from parent to child using parent_to_child hash map provided by client.
+      * GetAllDescendantsStrategy get all descendants for key
+      * GetDescendantsAtSpecificLevelStrategy get descendants only for specific hierarchy level.
+      * Hierarchy result is ElementsAndOffsets structure, for each element there is descendants array,
+      * with size offset[element_index] - (element_index > 0 ? offset[element_index - 1] : 0).
+      *
+      * Example:
+      * id  parent_id
+      * 1   0
+      * 2   1
+      * 3   1
+      * 4   2
+      *
+      * Example. Strategy GetAllDescendantsStrategy.
+      * Requested keys [0, 1, 2, 3, 4].
+      * Result: [1, 2, 3, 4], [2, 2, 4], [4], [], []
+      * Elements: [1, 2, 3, 4, 2, 3, 4, 4]
+      * Offsets: [4, 7, 8, 8, 8]
+      *
+      * Example. Strategy GetDescendantsAtSpecificLevelStrategy with level 1.
+      * Requested keys [0, 1, 2, 3, 4].
+      * Result: [1], [2, 3], [4], [], [];
+      * Offsets: [1, 3, 4, 4, 4];
+      */
+    template <typename KeyType, typename Strategy>
+    ElementsAndOffsets<KeyType> getDescendants(
+        const PaddedPODArray<KeyType> & keys,
+        const HashMap<KeyType, PaddedPODArray<KeyType>> & parent_to_child,
+        Strategy strategy)
+    {
+        /// If strategy is GetAllDescendantsStrategy we try to cache and later reuse previously calculated descendants.
+        /// If strategy is GetDescendantsAtSpecificLevelStrategy we does not use cache strategy.
+        size_t keys_size = keys.size();
+
+        PaddedPODArray<KeyType> descendants;
+        descendants.reserve(keys_size);
+
+        PaddedPODArray<IColumn::Offset> descendants_offsets;
+        descendants_offsets.reserve(keys_size);
+
+        struct Range
+        {
+            size_t start_index;
+            size_t end_index;
+        };
+
+        static constexpr Int64 key_range_requires_update = -1;
+        HashMap<KeyType, Range> already_processed_keys_to_range [[maybe_unused]];
+
+        if constexpr (std::is_same_v<Strategy, GetAllDescendantsStrategy>)
+            already_processed_keys_to_range.reserve(keys_size);
+
+        struct KeyAndDepth
+        {
+            KeyType key;
+            Int64 depth;
+        };
+
+        HashSet<KeyType> already_processed_keys_during_loop;
+        already_processed_keys_during_loop.reserve(keys_size);
+
+        PaddedPODArray<KeyAndDepth> next_keys_to_process_stack;
+        next_keys_to_process_stack.reserve(keys_size);
+
+        Int64 level = static_cast<Int64>(strategy.level);
+
+        for (size_t i = 0; i < keys_size; ++i)
+        {
+            const KeyType & requested_key = keys[i];
+
+            if (parent_to_child.find(requested_key) == nullptr)
+            {
+                descendants_offsets.emplace_back(descendants.size());
+                continue;
+            }
+
+            next_keys_to_process_stack.emplace_back(KeyAndDepth{requested_key, 0});
+
+            /** To cache range for key without recursive function calls and custom stack we put special
+              * signaling value on stack key_range_requires_update.
+              * When we pop such value from stack that means processing descendants for key is finished
+              * and we can update range with end_index.
+              */
+            while (!next_keys_to_process_stack.empty())
+            {
+                KeyAndDepth key_to_process = next_keys_to_process_stack.back();
+
+                KeyType key = key_to_process.key;
+                Int64 depth = key_to_process.depth;
+                next_keys_to_process_stack.pop_back();
+
+                if constexpr (std::is_same_v<Strategy, GetAllDescendantsStrategy>)
+                {
+                    /// Update end_index for key
+                    if (depth == key_range_requires_update)
+                    {
+                        auto * it = already_processed_keys_to_range.find(key);
+                        assert(it);
+
+                        auto & range_to_update = it->getMapped();
+                        range_to_update.end_index = descendants.size();
+                        continue;
+                    }
+                }
+
+                if (unlikely(already_processed_keys_during_loop.find(key) != nullptr))
+                {
+                    next_keys_to_process_stack.clear();
+                    break;
+                }
+
+                if constexpr (std::is_same_v<Strategy, GetAllDescendantsStrategy>)
+                {
+                    const auto * already_processed_it = already_processed_keys_to_range.find(key);
+
+                    if (already_processed_it)
+                    {
+                        Range range = already_processed_it->getMapped();
+
+                        if (unlikely(range.start_index > range.end_index))
+                        {
+                            /// Broken range because there was loop
+                            already_processed_keys_to_range.erase(key);
+                        }
+                        else
+                        {
+                            auto insert_start_iterator = descendants.begin() + range.start_index;
+                            auto insert_end_iterator = descendants.begin() + range.end_index;
+                            descendants.insertFromItself(insert_start_iterator, insert_end_iterator);
+                            continue;
+                        }
+                    }
+                }
+
+                const auto * it = parent_to_child.find(key);
+
+                if (!it || depth >= DBMS_HIERARCHICAL_DICTIONARY_MAX_DEPTH)
+                    continue;
+
+                if constexpr (std::is_same_v<Strategy, GetDescendantsAtSpecificLevelStrategy>)
+                {
+                    if (depth > level)
+                        continue;
+                }
+
+                if constexpr (std::is_same_v<Strategy, GetAllDescendantsStrategy>)
+                {
+                    /// Put special signaling value on stack and update cache with range start
+                    size_t range_start_index = descendants.size();
+                    already_processed_keys_to_range[key].start_index = range_start_index;
+                    next_keys_to_process_stack.emplace_back(KeyAndDepth{key, key_range_requires_update});
+                }
+
+                already_processed_keys_during_loop.insert(key);
+
+                ++depth;
+
+                const auto & children = it->getMapped();
+
+                for (auto child_key : children)
+                {
+                    /// In case of GetAllDescendantsStrategy we add any descendant to result array
+                    /// If strategy is GetDescendantsAtSpecificLevelStrategy we require depth == level
+                    if (std::is_same_v<Strategy, GetAllDescendantsStrategy> || depth == level)
+                        descendants.emplace_back(child_key);
+
+                    next_keys_to_process_stack.emplace_back(KeyAndDepth{child_key, depth});
+                }
+            }
+
+            already_processed_keys_during_loop.clear();
+
+            descendants_offsets.emplace_back(descendants.size());
+        }
+
+        ElementsAndOffsets<KeyType> result = {std::move(descendants), std::move(descendants_offsets)};
+        return result;
+    }
+
+    /// Converts ElementAndOffsets structure into ArrayColumn
+    template<typename KeyType>
+    ColumnPtr convertElementsAndOffsetsIntoArray(ElementsAndOffsets<KeyType> && elements_and_offsets)
+    {
+        auto elements_column = ColumnVector<KeyType>::create();
+        elements_column->getData() = std::move(elements_and_offsets.elements);
+
+        auto offsets_column = ColumnVector<IColumn::Offset>::create();
+        offsets_column->getData() = std::move(elements_and_offsets.offsets);
+
+        auto column_array = ColumnArray::create(std::move(elements_column), std::move(offsets_column));
+
+        return column_array;
+    }
+}
+
+/// Returns hierarchy array column for keys
+template <typename KeyType, typename IsKeyValidFunc, typename GetParentKeyFunc>
+ColumnPtr getKeysHierarchyArray(
+    const PaddedPODArray<KeyType> & keys,
+    const KeyType & hierarchy_null_value,
+    IsKeyValidFunc && is_key_valid_func,
+    GetParentKeyFunc && get_parent_func)
+{
+    auto elements_and_offsets = detail::getHierarchy(
+        keys,
+        hierarchy_null_value,
+        std::forward<IsKeyValidFunc>(is_key_valid_func),
+        std::forward<GetParentKeyFunc>(get_parent_func));
+
+    return detail::convertElementsAndOffsetsIntoArray(std::move(elements_and_offsets));
+}
+
+/// Returns is in hierarchy column for keys
+template <typename KeyType, typename IsKeyValidFunc, typename GetParentKeyFunc>
+ColumnUInt8::Ptr getKeysIsInHierarchyColumn(
+    const PaddedPODArray<KeyType> & hierarchy_keys,
+    const PaddedPODArray<KeyType> & hierarchy_in_keys,
+    const KeyType & hierarchy_null_value,
+    IsKeyValidFunc && is_key_valid_func,
+    GetParentKeyFunc && get_parent_func)
+{
+    auto is_in_hierarchy_data = detail::getIsInHierarchy(
+        hierarchy_keys,
+        hierarchy_in_keys,
+        hierarchy_null_value,
+        std::forward<IsKeyValidFunc>(is_key_valid_func),
+        std::forward<GetParentKeyFunc>(get_parent_func));
+
+    auto result = ColumnUInt8::create();
+    result->getData() = std::move(is_in_hierarchy_data);
+
+    return result;
+}
+
+/// Returns descendants array column for keys
+template <typename KeyType>
+ColumnPtr getKeysDescendantsArray(
+    const PaddedPODArray<KeyType> & requested_keys,
+    const HashMap<KeyType, PaddedPODArray<KeyType>> & parent_to_child,
+    size_t level)
+{
+    if (level == 0)
+    {
+        detail::GetAllDescendantsStrategy strategy { .level = level };
+        auto elements_and_offsets = detail::getDescendants(requested_keys, parent_to_child, strategy);
+        return detail::convertElementsAndOffsetsIntoArray(std::move(elements_and_offsets));
+    }
+    else
+    {
+        detail::GetDescendantsAtSpecificLevelStrategy strategy { .level = level };
+        auto elements_and_offsets = detail::getDescendants(requested_keys, parent_to_child, strategy);
+        return detail::convertElementsAndOffsetsIntoArray(std::move(elements_and_offsets));
+    }
+}
+
+/** Default getHierarchy implementation for dictionaries that does not have structure with child to parent representation.
+  * Implementation will build such structure with getColumn calls, and then getHierarchy for such structure.
+  * Returns ColumnArray with hierarchy arrays for keys from key_column.
+  */
+ColumnPtr getKeysHierarchyDefaultImplementation(
+    const IDictionary * dictionary,
+    ColumnPtr key_column,
+    const DataTypePtr & key_type);
+
+/** Default isInHierarchy implementation for dictionaries that does not have structure with child to parent representation.
+  * Implementation will build such structure with getColumn calls, and then getHierarchy for such structure.
+  * Returns UInt8 column if key from in_key_column is in key hierarchy from key_column.
+  */
+ColumnUInt8::Ptr getKeysIsInHierarchyDefaultImplementation(
+    const IDictionary * dictionary,
+    ColumnPtr key_column,
+    ColumnPtr in_key_column,
+    const DataTypePtr & key_type);
+
+}
diff --git a/src/Dictionaries/ICacheDictionaryStorage.h b/src/Dictionaries/ICacheDictionaryStorage.h
new file mode 100644
index 00000000000..72b3ef76f11
--- /dev/null
+++ b/src/Dictionaries/ICacheDictionaryStorage.h
@@ -0,0 +1,125 @@
+#pragma once
+
+#include <Common/PODArray.h>
+#include <Common/HashTable/HashMap.h>
+#include <Columns/IColumn.h>
+#include <Dictionaries/DictionaryHelpers.h>
+
+namespace DB
+{
+
+struct KeyState
+{
+    enum State: uint8_t
+    {
+        not_found = 0,
+        expired = 1,
+        found = 2,
+    };
+
+    KeyState(State state_, size_t fetched_column_index_)
+        : state(state_)
+        , fetched_column_index(fetched_column_index_)
+    {}
+
+    KeyState(State state_)
+        : state(state_)
+    {}
+
+    inline bool isFound() const { return state == State::found; }
+    inline bool isExpired() const { return state == State::expired; }
+    inline bool isNotFound() const { return state == State::not_found; }
+    inline bool isDefault() const { return is_default; }
+    inline void setDefault() { is_default = true; }
+    inline void setDefaultValue(bool is_default_value) { is_default = is_default_value; }
+    /// Valid only if keyState is found or expired
+    inline size_t getFetchedColumnIndex() const { return fetched_column_index; }
+    inline void setFetchedColumnIndex(size_t fetched_column_index_value) { fetched_column_index = fetched_column_index_value; }
+private:
+    State state = not_found;
+    size_t fetched_column_index = 0;
+    bool is_default = false;
+};
+
+/// Result of fetch from CacheDictionaryStorage
+template <typename KeyType>
+struct KeysStorageFetchResult
+{
+    /// Fetched column values
+    MutableColumns fetched_columns;
+
+    PaddedPODArray<KeyState> key_index_to_state;
+
+    size_t expired_keys_size = 0;
+
+    size_t found_keys_size = 0;
+
+    size_t not_found_keys_size = 0;
+
+    size_t default_keys_size = 0;
+
+};
+
+using SimpleKeysStorageFetchResult = KeysStorageFetchResult<UInt64>;
+using ComplexKeysStorageFetchResult = KeysStorageFetchResult<StringRef>;
+
+class ICacheDictionaryStorage
+{
+public:
+
+    virtual ~ICacheDictionaryStorage() = default;
+
+    /// Necessary if all keys are found we can return result to client without additional aggregation
+    virtual bool returnsFetchedColumnsInOrderOfRequestedKeys() const = 0;
+
+    /// Name of storage
+    virtual String getName() const = 0;
+
+    /// Does storage support simple keys
+    virtual bool supportsSimpleKeys() const = 0;
+
+    /// Fetch columns for keys, this method is not write thread safe
+    virtual SimpleKeysStorageFetchResult fetchColumnsForKeys(
+        const PaddedPODArray<UInt64> & keys,
+        const DictionaryStorageFetchRequest & fetch_request) = 0;
+
+    /// Fetch columns for keys, this method is not write thread safe
+    virtual void insertColumnsForKeys(const PaddedPODArray<UInt64> & keys, Columns columns) = 0;
+
+    /// Insert default keys
+    virtual void insertDefaultKeys(const PaddedPODArray<UInt64> & keys) = 0;
+
+    /// Return cached simple keys
+    virtual PaddedPODArray<UInt64> getCachedSimpleKeys() const = 0;
+
+    /// Does storage support complex keys
+    virtual bool supportsComplexKeys() const = 0;
+
+    /// Fetch columns for keys, this method is not write thread safe
+    virtual ComplexKeysStorageFetchResult fetchColumnsForKeys(
+        const PaddedPODArray<StringRef> & keys,
+        const DictionaryStorageFetchRequest & column_fetch_requests) = 0;
+
+    /// Fetch columns for keys, this method is not write thread safe
+    virtual void insertColumnsForKeys(const PaddedPODArray<StringRef> & keys, Columns columns) = 0;
+
+    /// Insert default keys
+    virtual void insertDefaultKeys(const PaddedPODArray<StringRef> & keys) = 0;
+
+    /// Return cached simple keys
+    virtual PaddedPODArray<StringRef> getCachedComplexKeys() const = 0;
+
+    /// Return size of keys in storage
+    virtual size_t getSize() const = 0;
+
+    /// Returns storage load factor
+    virtual double getLoadFactor() const = 0;
+
+    /// Return bytes allocated in storage
+    virtual size_t getBytesAllocated() const = 0;
+
+};
+
+using CacheDictionaryStoragePtr = std::shared_ptr<ICacheDictionaryStorage>;
+
+}
diff --git a/src/Dictionaries/IDictionary.h b/src/Dictionaries/IDictionary.h
index e0e4c7eb880..a7445312409 100644
--- a/src/Dictionaries/IDictionary.h
+++ b/src/Dictionaries/IDictionary.h
@@ -24,8 +24,8 @@ namespace ErrorCodes
     extern const int NOT_IMPLEMENTED;
 }
 
-struct IDictionaryBase;
-using DictionaryPtr = std::unique_ptr<IDictionaryBase>;
+struct IDictionary;
+using DictionaryPtr = std::unique_ptr<IDictionary>;
 
 /** DictionaryKeyType provides IDictionary client information about
   * which key type is supported by dictionary.
@@ -47,13 +47,11 @@ enum class DictionaryKeyType
 /**
  * Base class for Dictionaries implementation.
  */
-struct IDictionaryBase : public IExternalLoadable
+struct IDictionary : public IExternalLoadable
 {
-    using Key = UInt64;
-
-    IDictionaryBase(const StorageID & dict_id_)
-    : dict_id(dict_id_)
-    , full_name(dict_id.getInternalDictionaryName())
+    explicit IDictionary(const StorageID & dictionary_id_)
+    : dictionary_id(dictionary_id_)
+    , full_name(dictionary_id.getInternalDictionaryName())
     {
     }
 
@@ -61,14 +59,14 @@ struct IDictionaryBase : public IExternalLoadable
     StorageID getDictionaryID() const
     {
         std::lock_guard lock{name_mutex};
-        return dict_id;
+        return dictionary_id;
     }
 
     void updateDictionaryName(const StorageID & new_name) const
     {
         std::lock_guard lock{name_mutex};
-        assert(new_name.uuid == dict_id.uuid && dict_id.uuid != UUIDHelpers::Nil);
-        dict_id = new_name;
+        assert(new_name.uuid == dictionary_id.uuid && dictionary_id.uuid != UUIDHelpers::Nil);
+        dictionary_id = new_name;
     }
 
     const std::string & getLoadableName() const override final { return getFullName(); }
@@ -80,8 +78,9 @@ struct IDictionaryBase : public IExternalLoadable
 
     std::string getDatabaseOrNoDatabaseTag() const
     {
-        if (!dict_id.database_name.empty())
-            return dict_id.database_name;
+        if (!dictionary_id.database_name.empty())
+            return dictionary_id.database_name;
+
         return NO_DATABASE_TAG;
     }
 
@@ -120,7 +119,36 @@ struct IDictionaryBase : public IExternalLoadable
         const DataTypePtr & result_type,
         const Columns & key_columns,
         const DataTypes & key_types,
-        const ColumnPtr default_values_column) const = 0;
+        const ColumnPtr & default_values_column) const = 0;
+
+    /** Get multiple columns from dictionary.
+      *
+      * Default implementation just calls getColumn multiple times.
+      * Subclasses can provide custom more efficient implementation.
+      */
+    virtual Columns getColumns(
+        const Strings & attribute_names,
+        const DataTypes & result_types,
+        const Columns & key_columns,
+        const DataTypes & key_types,
+        const Columns & default_values_columns) const
+    {
+        size_t attribute_names_size = attribute_names.size();
+
+        Columns result;
+        result.reserve(attribute_names_size);
+
+        for (size_t i = 0; i < attribute_names_size; ++i)
+        {
+            const auto & attribute_name = attribute_names[i];
+            const auto & result_type = result_types[i];
+            const auto & default_values_column = default_values_columns[i];
+
+            result.emplace_back(getColumn(attribute_name, result_type, key_columns, key_types, default_values_column));
+        }
+
+        return result;
+    }
 
     /** Subclass must validate key columns and key types and return ColumnUInt8 that
       * is bitmask representation of is key in dictionary or not.
@@ -130,74 +158,65 @@ struct IDictionaryBase : public IExternalLoadable
         const Columns & key_columns,
         const DataTypes & key_types) const = 0;
 
+    virtual bool hasHierarchy() const { return false; }
+
+    virtual ColumnPtr getHierarchy(
+        ColumnPtr key_column [[maybe_unused]],
+        const DataTypePtr & key_type [[maybe_unused]]) const
+    {
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED,
+                        "Method getHierarchy is not supported for {} dictionary.",
+                        getDictionaryID().getNameForLogs());
+    }
+
+    virtual ColumnUInt8::Ptr isInHierarchy(
+        ColumnPtr key_column [[maybe_unused]],
+        ColumnPtr in_key_column [[maybe_unused]],
+        const DataTypePtr & key_type [[maybe_unused]]) const
+    {
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED,
+                        "Method isInHierarchy is not supported for {} dictionary.",
+                        getDictionaryID().getNameForLogs());
+    }
+
+    virtual ColumnPtr getDescendants(
+        ColumnPtr key_column [[maybe_unused]],
+        const DataTypePtr & key_type [[maybe_unused]],
+        size_t level [[maybe_unused]]) const
+    {
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED,
+                        "Method getDescendants is not supported for {} dictionary.",
+                        getDictionaryID().getNameForLogs());
+    }
+
     virtual BlockInputStreamPtr getBlockInputStream(const Names & column_names, size_t max_block_size) const = 0;
 
     bool supportUpdates() const override { return true; }
 
     bool isModified() const override
     {
-        auto source = getSource();
+        const auto * source = getSource();
         return source && source->isModified();
     }
 
     virtual std::exception_ptr getLastException() const { return {}; }
 
-    std::shared_ptr<IDictionaryBase> shared_from_this()
+    std::shared_ptr<IDictionary> shared_from_this()
     {
-        return std::static_pointer_cast<IDictionaryBase>(IExternalLoadable::shared_from_this());
+        return std::static_pointer_cast<IDictionary>(IExternalLoadable::shared_from_this());
     }
 
-    std::shared_ptr<const IDictionaryBase> shared_from_this() const
+    std::shared_ptr<const IDictionary> shared_from_this() const
     {
-        return std::static_pointer_cast<const IDictionaryBase>(IExternalLoadable::shared_from_this());
+        return std::static_pointer_cast<const IDictionary>(IExternalLoadable::shared_from_this());
     }
 
 private:
     mutable std::mutex name_mutex;
-    mutable StorageID dict_id;
+    mutable StorageID dictionary_id;
 
 protected:
     const String full_name;
 };
 
-struct IDictionary : IDictionaryBase
-{
-    IDictionary(const StorageID & dict_id_) : IDictionaryBase(dict_id_) {}
-
-    virtual bool hasHierarchy() const = 0;
-
-    virtual void toParent(const PaddedPODArray<Key> & ids, PaddedPODArray<Key> & out) const = 0;
-
-    /// TODO: Rewrite
-    /// Methods for hierarchy.
-
-    virtual void isInVectorVector(
-        const PaddedPODArray<Key> & /*child_ids*/, const PaddedPODArray<Key> & /*ancestor_ids*/, PaddedPODArray<UInt8> & /*out*/) const
-    {
-        throw Exception(ErrorCodes::NOT_IMPLEMENTED,
-                        "Hierarchy is not supported for {} dictionary.", getDictionaryID().getNameForLogs());
-    }
-
-    virtual void
-    isInVectorConstant(const PaddedPODArray<Key> & /*child_ids*/, const Key /*ancestor_id*/, PaddedPODArray<UInt8> & /*out*/) const
-    {
-        throw Exception(ErrorCodes::NOT_IMPLEMENTED,
-                        "Hierarchy is not supported for {} dictionary.", getDictionaryID().getNameForLogs());
-    }
-
-    virtual void
-    isInConstantVector(const Key /*child_id*/, const PaddedPODArray<Key> & /*ancestor_ids*/, PaddedPODArray<UInt8> & /*out*/) const
-    {
-        throw Exception(ErrorCodes::NOT_IMPLEMENTED,
-                        "Hierarchy is not supported for {} dictionary.", getDictionaryID().getNameForLogs());
-    }
-
-    void isInConstantConstant(const Key child_id, const Key ancestor_id, UInt8 & out) const
-    {
-        PaddedPODArray<UInt8> out_arr(1);
-        isInVectorConstant(PaddedPODArray<Key>(1, child_id), ancestor_id, out_arr);
-        out = out_arr[0];
-    }
-};
-
 }
diff --git a/src/Dictionaries/IDictionarySource.h b/src/Dictionaries/IDictionarySource.h
index 145b2e03dd2..90f8b7f3a55 100644
--- a/src/Dictionaries/IDictionarySource.h
+++ b/src/Dictionaries/IDictionarySource.h
@@ -10,6 +10,7 @@ namespace DB
 {
 class IDictionarySource;
 using DictionarySourcePtr = std::unique_ptr<IDictionarySource>;
+using SharedDictionarySourcePtr = std::shared_ptr<IDictionarySource>;
 
 /** Data-provider interface for external dictionaries,
 *    abstracts out the data source (file, MySQL, ClickHouse, external program, network request et cetera)
diff --git a/src/Dictionaries/IPAddressDictionary.cpp b/src/Dictionaries/IPAddressDictionary.cpp
index 6447c76ee73..5c5f71e0b1d 100644
--- a/src/Dictionaries/IPAddressDictionary.cpp
+++ b/src/Dictionaries/IPAddressDictionary.cpp
@@ -4,19 +4,17 @@
 #include <Common/assert_cast.h>
 #include <Common/IPv6ToBinary.h>
 #include <Common/memcmpSmall.h>
-#include <Common/memcpySmall.h>
 #include <Common/typeid_cast.h>
 #include <DataTypes/DataTypeFixedString.h>
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypesDecimal.h>
-#include <IO/WriteIntText.h>
 #include <Poco/ByteOrder.h>
 #include <Common/formatIPv6.h>
 #include <common/itoa.h>
 #include <ext/map.h>
 #include <ext/range.h>
-#include "DictionaryBlockInputStream.h"
-#include "DictionaryFactory.h"
+#include <Dictionaries/DictionaryBlockInputStream.h>
+#include <Dictionaries/DictionaryFactory.h>
 #include <Functions/FunctionHelpers.h>
 
 namespace DB
@@ -126,20 +124,20 @@ static size_t formatIPWithPrefix(const unsigned char * src, UInt8 prefix_len, bo
 static void validateKeyTypes(const DataTypes & key_types)
 {
     if (key_types.empty() || key_types.size() > 2)
-        throw Exception{"Expected a single IP address or IP with mask", ErrorCodes::TYPE_MISMATCH};
+        throw Exception(ErrorCodes::TYPE_MISMATCH, "Expected a single IP address or IP with mask");
 
     const auto * key_ipv4type = typeid_cast<const DataTypeUInt32 *>(key_types[0].get());
     const auto * key_ipv6type = typeid_cast<const DataTypeFixedString *>(key_types[0].get());
 
     if (key_ipv4type == nullptr && (key_ipv6type == nullptr || key_ipv6type->getN() != 16))
-        throw Exception{"Key does not match, expected either `IPv4` (`UInt32`) or `IPv6` (`FixedString(16)`)",
-                        ErrorCodes::TYPE_MISMATCH};
+        throw Exception(ErrorCodes::TYPE_MISMATCH,
+            "Key does not match, expected either `IPv4` (`UInt32`) or `IPv6` (`FixedString(16)`)");
 
     if (key_types.size() > 1)
     {
         const auto * mask_col_type = typeid_cast<const DataTypeUInt8 *>(key_types[1].get());
         if (mask_col_type == nullptr)
-            throw Exception{"Mask do not match, expected UInt8", ErrorCodes::TYPE_MISMATCH};
+            throw Exception(ErrorCodes::TYPE_MISMATCH, "Mask do not match, expected UInt8");
     }
 }
 
@@ -191,64 +189,13 @@ inline static void mapIPv4ToIPv6(UInt32 addr, uint8_t * buf)
     memcpy(&buf[12], &addr, 4);
 }
 
-static bool matchIPv4Subnet(UInt32 target, UInt32 addr, UInt8 prefix)
-{
-    UInt32 mask = (prefix >= 32) ? 0xffffffffu : ~(0xffffffffu >> prefix);
-    return (target & mask) == addr;
-}
-
-#if defined(__SSE2__)
-#include <emmintrin.h>
-
-static bool matchIPv6Subnet(const uint8_t * target, const uint8_t * addr, UInt8 prefix)
-{
-    uint16_t mask = _mm_movemask_epi8(_mm_cmpeq_epi8(
-        _mm_loadu_si128(reinterpret_cast<const __m128i *>(target)),
-        _mm_loadu_si128(reinterpret_cast<const __m128i *>(addr))));
-    mask = ~mask;
-
-    if (mask)
-    {
-        auto offset = __builtin_ctz(mask);
-
-        if (prefix / 8 != offset)
-            return prefix / 8 < offset;
-
-        auto cmpmask = ~(0xff >> (prefix % 8));
-        return (target[offset] & cmpmask) == addr[offset];
-    }
-    return true;
-}
-
-# else
-
-static bool matchIPv6Subnet(const uint8_t * target, const uint8_t * addr, UInt8 prefix)
-{
-    if (prefix > IPV6_BINARY_LENGTH * 8U)
-        prefix = IPV6_BINARY_LENGTH * 8U;
-
-    size_t i = 0;
-    for (; prefix >= 8; ++i, prefix -= 8)
-    {
-        if (target[i] != addr[i])
-            return false;
-    }
-    if (prefix == 0)
-        return true;
-
-    auto mask = ~(0xff >> prefix);
-    return (target[i] & mask) == addr[i];
-}
-
-#endif  // __SSE2__
-
 IPAddressDictionary::IPAddressDictionary(
     const StorageID & dict_id_,
     const DictionaryStructure & dict_struct_,
     DictionarySourcePtr source_ptr_,
     const DictionaryLifetime dict_lifetime_,
     bool require_nonempty_)
-    : IDictionaryBase(dict_id_)
+    : IDictionary(dict_id_)
     , dict_struct(dict_struct_)
     , source_ptr{std::move(source_ptr_)}
     , dict_lifetime(dict_lifetime_)
@@ -267,7 +214,7 @@ ColumnPtr IPAddressDictionary::getColumn(
     const DataTypePtr & result_type,
     const Columns & key_columns,
     const DataTypes & key_types,
-    const ColumnPtr default_values_column) const
+    const ColumnPtr & default_values_column) const
 {
     validateKeyTypes(key_types);
 
@@ -290,7 +237,6 @@ ColumnPtr IPAddressDictionary::getColumn(
 
         auto column = ColumnProvider::getColumn(dictionary_attribute, size);
 
-
         if constexpr (std::is_same_v<AttributeType, String>)
         {
             auto * out = column.get();
@@ -347,7 +293,7 @@ ColumnUInt8::Ptr IPAddressDictionary::hasKeys(const Columns & key_columns, const
         {
             auto addr = first_column->getDataAt(i);
             if (unlikely(addr.size != IPV6_BINARY_LENGTH))
-                throw Exception("Expected key to be FixedString(16)", ErrorCodes::LOGICAL_ERROR);
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Expected key to be FixedString(16)");
 
             auto found = tryLookupIPv6(reinterpret_cast<const uint8_t *>(addr.data));
             out[i] = (found != ipNotFound());
@@ -370,8 +316,10 @@ void IPAddressDictionary::createAttributes()
             attributes.push_back(createAttributeWithType(attribute.underlying_type, attribute.null_value));
 
             if (attribute.hierarchical)
-                throw Exception{full_name + ": hierarchical attributes not supported for dictionary of type " + getTypeName(),
-                                ErrorCodes::TYPE_MISMATCH};
+                throw Exception(ErrorCodes::TYPE_MISMATCH,
+                    "{}: hierarchical attributes not supported for dictionary of type {}",
+                    full_name,
+                    getTypeName());
         }
     };
 
@@ -546,7 +494,7 @@ void IPAddressDictionary::loadData()
     LOG_TRACE(logger, "{} ip records are read", ip_records.size());
 
     if (require_nonempty && 0 == element_count)
-        throw Exception{full_name + ": dictionary source is empty and 'require_nonempty' property is set.", ErrorCodes::DICTIONARY_IS_EMPTY};
+        throw Exception(ErrorCodes::DICTIONARY_IS_EMPTY, "{}: dictionary source is empty and 'require_nonempty' property is set.", full_name);
 }
 
 template <typename T>
@@ -596,7 +544,7 @@ void IPAddressDictionary::calculateBytesAllocated()
 template <typename T>
 void IPAddressDictionary::createAttributeImpl(Attribute & attribute, const Field & null_value)
 {
-    attribute.null_values = null_value.isNull() ? T{} : T(null_value.get<NearestFieldType<T>>());
+    attribute.null_values = null_value.isNull() ? T{} : T(null_value.get<T>());
     attribute.maps.emplace<ContainerType<T>>();
 }
 
@@ -645,7 +593,7 @@ void IPAddressDictionary::getItemsByTwoKeyColumnsImpl(
     {
         const auto * key_ip_column_ptr = typeid_cast<const ColumnVector<UInt32> *>(&*key_columns.front());
         if (key_ip_column_ptr == nullptr)
-            throw Exception{"Expected a UInt32 IP column", ErrorCodes::TYPE_MISMATCH};
+            throw Exception(ErrorCodes::TYPE_MISMATCH, "Expected a UInt32 IP column");
 
         const auto & key_mask_column = assert_cast<const ColumnVector<UInt8> &>(*key_columns.back());
 
@@ -679,7 +627,7 @@ void IPAddressDictionary::getItemsByTwoKeyColumnsImpl(
 
     const auto * key_ip_column_ptr = typeid_cast<const ColumnFixedString *>(&*key_columns.front());
     if (key_ip_column_ptr == nullptr || key_ip_column_ptr->getN() != IPV6_BINARY_LENGTH)
-        throw Exception{"Expected a FixedString(16) IP column", ErrorCodes::TYPE_MISMATCH};
+        throw Exception(ErrorCodes::TYPE_MISMATCH, "Expected a FixedString(16) IP column");
 
     const auto & key_mask_column = assert_cast<const ColumnVector<UInt8> &>(*key_columns.back());
 
@@ -752,7 +700,7 @@ void IPAddressDictionary::getItemsImpl(
         {
             auto addr = first_column->getDataAt(i);
             if (addr.size != IPV6_BINARY_LENGTH)
-                throw Exception("Expected key to be FixedString(16)", ErrorCodes::LOGICAL_ERROR);
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Expected key to be FixedString(16)");
 
             auto found = tryLookupIPv6(reinterpret_cast<const uint8_t *>(addr.data));
             if (found != ipNotFound())
@@ -787,7 +735,7 @@ void IPAddressDictionary::setAttributeValue(Attribute & attribute, const Field &
         }
         else
         {
-            setAttributeValueImpl<AttributeType>(attribute, value.get<NearestFieldType<AttributeType>>());
+            setAttributeValueImpl<AttributeType>(attribute, value.get<AttributeType>());
         }
     };
 
@@ -798,7 +746,7 @@ const IPAddressDictionary::Attribute & IPAddressDictionary::getAttribute(const s
 {
     const auto it = attribute_index_by_name.find(attribute_name);
     if (it == std::end(attribute_index_by_name))
-        throw Exception{full_name + ": no such attribute '" + attribute_name + "'", ErrorCodes::BAD_ARGUMENTS};
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "{}: no such attribute '{}'", full_name, attribute_name);
 
     return attributes[it->second];
 }
@@ -858,9 +806,6 @@ static auto keyViewGetter()
 
 BlockInputStreamPtr IPAddressDictionary::getBlockInputStream(const Names & column_names, size_t max_block_size) const
 {
-    using BlockInputStreamType = DictionaryBlockInputStream<UInt64>;
-
-
     const bool is_ipv4 = std::get_if<IPv4Container>(&ip_column) != nullptr;
 
     auto get_keys = [is_ipv4](const Columns & columns, const std::vector<DictionaryAttribute> & dict_attributes)
@@ -881,12 +826,12 @@ BlockInputStreamPtr IPAddressDictionary::getBlockInputStream(const Names & colum
     if (is_ipv4)
     {
         auto get_view = keyViewGetter<ColumnVector<UInt32>, true>();
-        return std::make_shared<BlockInputStreamType>(
+        return std::make_shared<DictionaryBlockInputStream>(
             shared_from_this(), max_block_size, getKeyColumns(), column_names, std::move(get_keys), std::move(get_view));
     }
 
     auto get_view = keyViewGetter<ColumnFixedString, false>();
-    return std::make_shared<BlockInputStreamType>(
+    return std::make_shared<DictionaryBlockInputStream>(
         shared_from_this(), max_block_size, getKeyColumns(), column_names, std::move(get_keys), std::move(get_view));
 }
 
@@ -978,7 +923,7 @@ void registerDictionaryTrie(DictionaryFactory & factory)
                              DictionarySourcePtr source_ptr) -> DictionaryPtr
     {
         if (!dict_struct.key || dict_struct.key->size() != 1)
-            throw Exception{"Dictionary of layout 'ip_trie' has to have one 'key'", ErrorCodes::BAD_ARGUMENTS};
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Dictionary of layout 'ip_trie' has to have one 'key'");
 
         const auto dict_id = StorageID::fromDictionaryConfig(config, config_prefix);
         const DictionaryLifetime dict_lifetime{config, config_prefix + ".lifetime"};
diff --git a/src/Dictionaries/IPAddressDictionary.h b/src/Dictionaries/IPAddressDictionary.h
index 6c5cfa765e8..619d1579e4e 100644
--- a/src/Dictionaries/IPAddressDictionary.h
+++ b/src/Dictionaries/IPAddressDictionary.h
@@ -20,7 +20,7 @@
 
 namespace DB
 {
-class IPAddressDictionary final : public IDictionaryBase
+class IPAddressDictionary final : public IDictionary
 {
 public:
     IPAddressDictionary(
@@ -67,7 +67,7 @@ public:
         const DataTypePtr & result_type,
         const Columns & key_columns,
         const DataTypes & key_types,
-        const ColumnPtr default_values_column) const override;
+        const ColumnPtr & default_values_column) const override;
 
     ColumnUInt8::Ptr hasKeys(const Columns & key_columns, const DataTypes & key_types) const override;
 
@@ -101,6 +101,7 @@ private:
             Decimal32,
             Decimal64,
             Decimal128,
+            Decimal256,
             Float32,
             Float64,
             String>
@@ -118,6 +119,7 @@ private:
             ContainerType<Decimal32>,
             ContainerType<Decimal64>,
             ContainerType<Decimal128>,
+            ContainerType<Decimal256>,
             ContainerType<Float32>,
             ContainerType<Float64>,
             ContainerType<StringRef>>
diff --git a/src/Dictionaries/LibraryDictionarySource.cpp b/src/Dictionaries/LibraryDictionarySource.cpp
index 6d763444b54..a971ba4b1be 100644
--- a/src/Dictionaries/LibraryDictionarySource.cpp
+++ b/src/Dictionaries/LibraryDictionarySource.cpp
@@ -1,4 +1,5 @@
 #include "LibraryDictionarySource.h"
+
 #include <DataStreams/OneBlockInputStream.h>
 #include <Interpreters/Context.h>
 #include <Poco/File.h>
@@ -6,304 +7,185 @@
 #include <ext/bit_cast.h>
 #include <ext/range.h>
 #include <ext/scope_guard.h>
-#include <Common/StringUtils/StringUtils.h>
 #include "DictionarySourceFactory.h"
+#include "DictionarySourceHelpers.h"
 #include "DictionaryStructure.h"
-#include "LibraryDictionarySourceExternal.h"
 #include "registerDictionaries.h"
+#include <IO/WriteBufferFromString.h>
+#include <IO/WriteHelpers.h>
+
 
 namespace DB
 {
+
 namespace ErrorCodes
 {
-    extern const int SIZES_OF_COLUMNS_DOESNT_MATCH;
     extern const int FILE_DOESNT_EXIST;
     extern const int EXTERNAL_LIBRARY_ERROR;
     extern const int PATH_ACCESS_DENIED;
 }
 
 
-class CStringsHolder
-{
-public:
-    using Container = std::vector<std::string>;
-    explicit CStringsHolder(const Container & strings_pass)
-    {
-        strings_holder = strings_pass;
-        strings.size = strings_holder.size();
-        ptr_holder = std::make_unique<ClickHouseLibrary::CString[]>(strings.size);
-        strings.data = ptr_holder.get();
-        size_t i = 0;
-        for (auto & str : strings_holder)
-        {
-            strings.data[i] = str.c_str();
-            ++i;
-        }
-    }
-
-    ClickHouseLibrary::CStrings strings; // will pass pointer to lib
-
-private:
-    std::unique_ptr<ClickHouseLibrary::CString[]> ptr_holder = nullptr;
-    Container strings_holder;
-};
-
-
-namespace
-{
-    constexpr auto lib_config_settings = ".settings";
-
-
-    CStringsHolder getLibSettings(const Poco::Util::AbstractConfiguration & config, const std::string & config_root)
-    {
-        Poco::Util::AbstractConfiguration::Keys config_keys;
-        config.keys(config_root, config_keys);
-        CStringsHolder::Container strings;
-        for (const auto & key : config_keys)
-        {
-            std::string key_name = key;
-            auto bracket_pos = key.find('[');
-            if (bracket_pos != std::string::npos && bracket_pos > 0)
-                key_name = key.substr(0, bracket_pos);
-            strings.emplace_back(key_name);
-            strings.emplace_back(config.getString(config_root + "." + key));
-        }
-        return CStringsHolder(strings);
-    }
-
-
-    Block dataToBlock(const Block & sample_block, const void * data)
-    {
-        if (!data)
-            throw Exception("LibraryDictionarySource: No data returned", ErrorCodes::EXTERNAL_LIBRARY_ERROR);
-
-        const auto * columns_received = static_cast<const ClickHouseLibrary::Table *>(data);
-        if (columns_received->error_code)
-            throw Exception(
-                "LibraryDictionarySource: Returned error: " + std::to_string(columns_received->error_code) + " "
-                    + (columns_received->error_string ? columns_received->error_string : ""),
-                ErrorCodes::EXTERNAL_LIBRARY_ERROR);
-
-        MutableColumns columns(sample_block.columns());
-        for (const auto i : ext::range(0, columns.size()))
-            columns[i] = sample_block.getByPosition(i).column->cloneEmpty();
-
-        for (size_t col_n = 0; col_n < columns_received->size; ++col_n)
-        {
-            if (columns.size() != columns_received->data[col_n].size)
-                throw Exception(
-                    "LibraryDictionarySource: Returned unexpected number of columns: " + std::to_string(columns_received->data[col_n].size)
-                        + ", must be " + std::to_string(columns.size()),
-                    ErrorCodes::SIZES_OF_COLUMNS_DOESNT_MATCH);
-
-            for (size_t row_n = 0; row_n < columns_received->data[col_n].size; ++row_n)
-            {
-                const auto & field = columns_received->data[col_n].data[row_n];
-                if (!field.data)
-                {
-                    /// sample_block contains null_value (from config) inside corresponding column
-                    const auto & col = sample_block.getByPosition(row_n);
-                    columns[row_n]->insertFrom(*(col.column), 0);
-                }
-                else
-                {
-                    const auto & size = field.size;
-                    columns[row_n]->insertData(static_cast<const char *>(field.data), size);
-                }
-            }
-        }
-
-        return sample_block.cloneWithColumns(std::move(columns));
-    }
-}
-
-
 LibraryDictionarySource::LibraryDictionarySource(
     const DictionaryStructure & dict_struct_,
     const Poco::Util::AbstractConfiguration & config,
     const std::string & config_prefix_,
     Block & sample_block_,
-    const Context & context,
+    ContextPtr context_,
     bool check_config)
     : log(&Poco::Logger::get("LibraryDictionarySource"))
     , dict_struct{dict_struct_}
     , config_prefix{config_prefix_}
     , path{config.getString(config_prefix + ".path", "")}
+    , dictionary_id(getDictID())
     , sample_block{sample_block_}
+    , context(Context::createCopy(context_))
 {
 
     if (check_config)
     {
-        const String dictionaries_lib_path = context.getDictionariesLibPath();
+        const String dictionaries_lib_path = context->getDictionariesLibPath();
         if (!startsWith(path, dictionaries_lib_path))
-            throw Exception("LibraryDictionarySource: Library path " + path + " is not inside " + dictionaries_lib_path, ErrorCodes::PATH_ACCESS_DENIED);
+            throw Exception(ErrorCodes::PATH_ACCESS_DENIED, "LibraryDictionarySource: Library path {} is not inside {}", path, dictionaries_lib_path);
     }
 
     if (!Poco::File(path).exists())
-        throw Exception(
-            "LibraryDictionarySource: Can't load library " + Poco::File(path).path() + ": file doesn't exist",
-            ErrorCodes::FILE_DOESNT_EXIST);
+        throw Exception(ErrorCodes::FILE_DOESNT_EXIST, "LibraryDictionarySource: Can't load library {}: file doesn't exist", Poco::File(path).path());
 
     description.init(sample_block);
-    library = std::make_shared<SharedLibrary>(path, RTLD_LAZY
-#if defined(RTLD_DEEPBIND) && !defined(ADDRESS_SANITIZER) // Does not exists in FreeBSD. Cannot work with Address Sanitizer.
-        | RTLD_DEEPBIND
-#endif
-    );
-    settings = std::make_shared<CStringsHolder>(getLibSettings(config, config_prefix + lib_config_settings));
-    if (auto lib_new = library->tryGet<decltype(lib_data) (*)(decltype(&settings->strings), decltype(&ClickHouseLibrary::log))>(
-            "ClickHouseDictionary_v3_libNew"))
-        lib_data = lib_new(&settings->strings, ClickHouseLibrary::log);
+    bridge_helper = std::make_shared<LibraryBridgeHelper>(context, description.sample_block, dictionary_id);
+    auto res = bridge_helper->initLibrary(path, getLibrarySettingsString(config, config_prefix + ".settings"), getDictAttributesString());
+
+    if (!res)
+        throw Exception(ErrorCodes::EXTERNAL_LIBRARY_ERROR, "Failed to create shared library from path: {}", path);
 }
 
+
+LibraryDictionarySource::~LibraryDictionarySource()
+{
+    bridge_helper->removeLibrary();
+}
+
+
 LibraryDictionarySource::LibraryDictionarySource(const LibraryDictionarySource & other)
     : log(&Poco::Logger::get("LibraryDictionarySource"))
     , dict_struct{other.dict_struct}
     , config_prefix{other.config_prefix}
     , path{other.path}
+    , dictionary_id{getDictID()}
     , sample_block{other.sample_block}
-    , library{other.library}
+    , context(other.context)
     , description{other.description}
-    , settings{other.settings}
 {
-    if (auto lib_clone = library->tryGet<decltype(lib_data) (*)(decltype(other.lib_data))>("ClickHouseDictionary_v3_libClone"))
-        lib_data = lib_clone(other.lib_data);
-    else if (
-        auto lib_new = library->tryGet<decltype(lib_data) (*)(decltype(&settings->strings), decltype(&ClickHouseLibrary::log))>(
-            "ClickHouseDictionary_v3_libNew"))
-        lib_data = lib_new(&settings->strings, ClickHouseLibrary::log);
+    bridge_helper = std::make_shared<LibraryBridgeHelper>(context, description.sample_block, dictionary_id);
+    bridge_helper->cloneLibrary(other.dictionary_id);
 }
 
-LibraryDictionarySource::~LibraryDictionarySource()
+
+bool LibraryDictionarySource::isModified() const
 {
-    if (auto lib_delete = library->tryGet<void (*)(decltype(lib_data))>("ClickHouseDictionary_v3_libDelete"))
-        lib_delete(lib_data);
+    return bridge_helper->isModified();
 }
 
+
+bool LibraryDictionarySource::supportsSelectiveLoad() const
+{
+    return bridge_helper->supportsSelectiveLoad();
+}
+
+
 BlockInputStreamPtr LibraryDictionarySource::loadAll()
 {
     LOG_TRACE(log, "loadAll {}", toString());
-
-    auto columns_holder = std::make_unique<ClickHouseLibrary::CString[]>(dict_struct.attributes.size());
-    ClickHouseLibrary::CStrings columns{static_cast<decltype(ClickHouseLibrary::CStrings::data)>(columns_holder.get()),
-                                        dict_struct.attributes.size()};
-    size_t i = 0;
-    for (const auto & a : dict_struct.attributes)
-    {
-        columns.data[i] = a.name.c_str();
-        ++i;
-    }
-    void * data_ptr = nullptr;
-
-    /// Get function pointer before dataNew call because library->get may throw.
-    auto func_load_all
-        = library->get<void * (*)(decltype(data_ptr), decltype(&settings->strings), decltype(&columns))>("ClickHouseDictionary_v3_loadAll");
-    data_ptr = library->get<decltype(data_ptr) (*)(decltype(lib_data))>("ClickHouseDictionary_v3_dataNew")(lib_data);
-    auto * data = func_load_all(data_ptr, &settings->strings, &columns);
-    auto block = dataToBlock(description.sample_block, data);
-    SCOPE_EXIT(library->get<void (*)(decltype(lib_data), decltype(data_ptr))>("ClickHouseDictionary_v3_dataDelete")(lib_data, data_ptr));
-    return std::make_shared<OneBlockInputStream>(block);
+    return bridge_helper->loadAll();
 }
 
+
 BlockInputStreamPtr LibraryDictionarySource::loadIds(const std::vector<UInt64> & ids)
 {
     LOG_TRACE(log, "loadIds {} size = {}", toString(), ids.size());
-
-    const ClickHouseLibrary::VectorUInt64 ids_data{ext::bit_cast<decltype(ClickHouseLibrary::VectorUInt64::data)>(ids.data()), ids.size()};
-    auto columns_holder = std::make_unique<ClickHouseLibrary::CString[]>(dict_struct.attributes.size());
-    ClickHouseLibrary::CStrings columns_pass{static_cast<decltype(ClickHouseLibrary::CStrings::data)>(columns_holder.get()),
-                                             dict_struct.attributes.size()};
-    size_t i = 0;
-    for (const auto & a : dict_struct.attributes)
-    {
-        columns_pass.data[i] = a.name.c_str();
-        ++i;
-    }
-    void * data_ptr = nullptr;
-
-    /// Get function pointer before dataNew call because library->get may throw.
-    auto func_load_ids
-        = library->get<void * (*)(decltype(data_ptr), decltype(&settings->strings), decltype(&columns_pass), decltype(&ids_data))>(
-            "ClickHouseDictionary_v3_loadIds");
-    data_ptr = library->get<decltype(data_ptr) (*)(decltype(lib_data))>("ClickHouseDictionary_v3_dataNew")(lib_data);
-    auto * data = func_load_ids(data_ptr, &settings->strings, &columns_pass, &ids_data);
-    auto block = dataToBlock(description.sample_block, data);
-    SCOPE_EXIT(library->get<void (*)(decltype(lib_data), decltype(data_ptr))>("ClickHouseDictionary_v3_dataDelete")(lib_data, data_ptr));
-    return std::make_shared<OneBlockInputStream>(block);
+    return bridge_helper->loadIds(getDictIdsString(ids));
 }
 
+
 BlockInputStreamPtr LibraryDictionarySource::loadKeys(const Columns & key_columns, const std::vector<std::size_t> & requested_rows)
 {
     LOG_TRACE(log, "loadKeys {} size = {}", toString(), requested_rows.size());
-
-    auto holder = std::make_unique<ClickHouseLibrary::Row[]>(key_columns.size());
-    std::vector<std::unique_ptr<ClickHouseLibrary::Field[]>> column_data_holders;
-    for (size_t i = 0; i < key_columns.size(); ++i)
-    {
-        auto cell_holder = std::make_unique<ClickHouseLibrary::Field[]>(requested_rows.size());
-        for (size_t j = 0; j < requested_rows.size(); ++j)
-        {
-            auto data_ref = key_columns[i]->getDataAt(requested_rows[j]);
-            cell_holder[j] = ClickHouseLibrary::Field{.data = static_cast<const void *>(data_ref.data), .size = data_ref.size};
-        }
-        holder[i]
-            = ClickHouseLibrary::Row{.data = static_cast<ClickHouseLibrary::Field *>(cell_holder.get()), .size = requested_rows.size()};
-
-        column_data_holders.push_back(std::move(cell_holder));
-    }
-
-    ClickHouseLibrary::Table request_cols{.data = static_cast<ClickHouseLibrary::Row *>(holder.get()), .size = key_columns.size()};
-
-    void * data_ptr = nullptr;
-    /// Get function pointer before dataNew call because library->get may throw.
-    auto func_load_keys = library->get<void * (*)(decltype(data_ptr), decltype(&settings->strings), decltype(&request_cols))>(
-        "ClickHouseDictionary_v3_loadKeys");
-    data_ptr = library->get<decltype(data_ptr) (*)(decltype(lib_data))>("ClickHouseDictionary_v3_dataNew")(lib_data);
-    auto * data = func_load_keys(data_ptr, &settings->strings, &request_cols);
-    auto block = dataToBlock(description.sample_block, data);
-    SCOPE_EXIT(library->get<void (*)(decltype(lib_data), decltype(data_ptr))>("ClickHouseDictionary_v3_dataDelete")(lib_data, data_ptr));
-    return std::make_shared<OneBlockInputStream>(block);
+    auto block = blockForKeys(dict_struct, key_columns, requested_rows);
+    return bridge_helper->loadKeys(block);
 }
 
-bool LibraryDictionarySource::isModified() const
-{
-    if (auto func_is_modified
-        = library->tryGet<bool (*)(decltype(lib_data), decltype(&settings->strings))>("ClickHouseDictionary_v3_isModified"))
-        return func_is_modified(lib_data, &settings->strings);
-    return true;
-}
-
-bool LibraryDictionarySource::supportsSelectiveLoad() const
-{
-    if (auto func_supports_selective_load
-        = library->tryGet<bool (*)(decltype(lib_data), decltype(&settings->strings))>("ClickHouseDictionary_v3_supportsSelectiveLoad"))
-        return func_supports_selective_load(lib_data, &settings->strings);
-    return true;
-}
 
 DictionarySourcePtr LibraryDictionarySource::clone() const
 {
     return std::make_unique<LibraryDictionarySource>(*this);
 }
 
+
 std::string LibraryDictionarySource::toString() const
 {
     return path;
 }
 
+
+String LibraryDictionarySource::getLibrarySettingsString(const Poco::Util::AbstractConfiguration & config, const std::string & config_root)
+{
+    Poco::Util::AbstractConfiguration::Keys config_keys;
+    config.keys(config_root, config_keys);
+    WriteBufferFromOwnString out;
+    std::vector<std::string> settings;
+
+    for (const auto & key : config_keys)
+    {
+        std::string key_name = key;
+        auto bracket_pos = key.find('[');
+
+        if (bracket_pos != std::string::npos && bracket_pos > 0)
+            key_name = key.substr(0, bracket_pos);
+
+        settings.push_back(key_name);
+        settings.push_back(config.getString(config_root + "." + key));
+    }
+
+    writeVectorBinary(settings, out);
+    return out.str();
+}
+
+
+String LibraryDictionarySource::getDictIdsString(const std::vector<UInt64> & ids)
+{
+    WriteBufferFromOwnString out;
+    writeVectorBinary(ids, out);
+    return out.str();
+}
+
+
+String LibraryDictionarySource::getDictAttributesString()
+{
+    std::vector<String> attributes_names(dict_struct.attributes.size());
+    for (size_t i = 0; i < dict_struct.attributes.size(); ++i)
+        attributes_names[i] = dict_struct.attributes[i].name;
+    WriteBufferFromOwnString out;
+    writeVectorBinary(attributes_names, out);
+    return out.str();
+}
+
+
 void registerDictionarySourceLibrary(DictionarySourceFactory & factory)
 {
     auto create_table_source = [=](const DictionaryStructure & dict_struct,
                                  const Poco::Util::AbstractConfiguration & config,
                                  const std::string & config_prefix,
                                  Block & sample_block,
-                                 const Context & context,
+                                 ContextPtr context,
                                  const std::string & /* default_database */,
                                  bool check_config) -> DictionarySourcePtr
     {
         return std::make_unique<LibraryDictionarySource>(dict_struct, config, config_prefix + ".library", sample_block, context, check_config);
     };
+
     factory.registerSource("library", create_table_source);
 }
 
+
 }
diff --git a/src/Dictionaries/LibraryDictionarySource.h b/src/Dictionaries/LibraryDictionarySource.h
index 4d73b3f97d4..1ab47c5a06f 100644
--- a/src/Dictionaries/LibraryDictionarySource.h
+++ b/src/Dictionaries/LibraryDictionarySource.h
@@ -1,10 +1,13 @@
 #pragma once
 
 #include <Common/SharedLibrary.h>
+#include <Bridge/LibraryBridgeHelper.h>
 #include <common/LocalDateTime.h>
+#include <Core/UUID.h>
 #include "DictionaryStructure.h"
 #include <Core/ExternalResultDescription.h>
 #include "IDictionarySource.h"
+#include <Interpreters/Context_fwd.h>
 
 
 namespace Poco
@@ -17,18 +20,17 @@ namespace Util
 }
 }
 
-
 namespace DB
 {
+
 namespace ErrorCodes
 {
     extern const int NOT_IMPLEMENTED;
 }
-class CStringsHolder;
 
-/// Allows loading dictionaries from dynamic libraries (.so)
-/// Experimental version
-/// Example: tests/external_dictionaries/dictionary_library/dictionary_library.cpp
+class CStringsHolder;
+using LibraryBridgeHelperPtr = std::shared_ptr<LibraryBridgeHelper>;
+
 class LibraryDictionarySource final : public IDictionarySource
 {
 public:
@@ -37,7 +39,7 @@ public:
         const Poco::Util::AbstractConfiguration & config,
         const std::string & config_prefix_,
         Block & sample_block_,
-        const Context & context,
+        ContextPtr context_,
         bool check_config);
 
     LibraryDictionarySource(const LibraryDictionarySource & other);
@@ -49,7 +51,7 @@ public:
 
     BlockInputStreamPtr loadUpdatedAll() override
     {
-        throw Exception{"Method loadUpdatedAll is unsupported for LibraryDictionarySource", ErrorCodes::NOT_IMPLEMENTED};
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method loadUpdatedAll is unsupported for LibraryDictionarySource");
     }
 
     BlockInputStreamPtr loadIds(const std::vector<UInt64> & ids) override;
@@ -68,18 +70,26 @@ public:
     std::string toString() const override;
 
 private:
-    Poco::Logger * log;
+    static String getDictIdsString(const std::vector<UInt64> & ids);
 
-    LocalDateTime getLastModification() const;
+    String getDictAttributesString();
+
+    static String getLibrarySettingsString(const Poco::Util::AbstractConfiguration & config, const std::string & config_root);
+
+    static Field getDictID() { return UUIDHelpers::generateV4(); }
+
+    Poco::Logger * log;
 
     const DictionaryStructure dict_struct;
     const std::string config_prefix;
     const std::string path;
+    const Field dictionary_id;
+
     Block sample_block;
-    SharedLibraryPtr library;
+    ContextPtr context;
+
+    LibraryBridgeHelperPtr bridge_helper;
     ExternalResultDescription description;
-    std::shared_ptr<CStringsHolder> settings;
-    void * lib_data = nullptr;
 };
 
 }
diff --git a/src/Dictionaries/LibraryDictionarySourceExternal.h b/src/Dictionaries/LibraryDictionarySourceExternal.h
deleted file mode 100644
index 7a031cdb315..00000000000
--- a/src/Dictionaries/LibraryDictionarySourceExternal.h
+++ /dev/null
@@ -1,64 +0,0 @@
-#pragma once
-
-#include <cstdint>
-
-#define CLICKHOUSE_DICTIONARY_LIBRARY_API 1
-
-namespace ClickHouseLibrary
-{
-using CString = const char *;
-using ColumnName = CString;
-using ColumnNames = ColumnName[];
-
-struct CStrings
-{
-    CString * data = nullptr;
-    uint64_t size = 0;
-};
-
-struct VectorUInt64
-{
-    const uint64_t * data = nullptr;
-    uint64_t size = 0;
-};
-
-struct ColumnsUInt64
-{
-    VectorUInt64 * data = nullptr;
-    uint64_t size = 0;
-};
-
-struct Field
-{
-    const void * data = nullptr;
-    uint64_t size = 0;
-};
-
-struct Row
-{
-    const Field * data = nullptr;
-    uint64_t size = 0;
-};
-
-struct Table
-{
-    const Row * data = nullptr;
-    uint64_t size = 0;
-    uint64_t error_code = 0; // 0 = ok; !0 = error, with message in error_string
-    const char * error_string = nullptr;
-};
-
-enum LogLevel
-{
-    FATAL = 1,
-    CRITICAL,
-    ERROR,
-    WARNING,
-    NOTICE,
-    INFORMATION,
-    DEBUG,
-    TRACE,
-};
-
-void log(LogLevel level, CString msg);
-}
diff --git a/src/Dictionaries/MongoDBDictionarySource.cpp b/src/Dictionaries/MongoDBDictionarySource.cpp
index 5b5d0c4d20f..0ab45dc4593 100644
--- a/src/Dictionaries/MongoDBDictionarySource.cpp
+++ b/src/Dictionaries/MongoDBDictionarySource.cpp
@@ -13,7 +13,7 @@ void registerDictionarySourceMongoDB(DictionarySourceFactory & factory)
         const Poco::Util::AbstractConfiguration & config,
         const std::string & root_config_prefix,
         Block & sample_block,
-        const Context &,
+        ContextPtr,
         const std::string & /* default_database */,
         bool /* check_config */)
     {
@@ -126,7 +126,7 @@ MongoDBDictionarySource::MongoDBDictionarySource(
 #if POCO_VERSION >= 0x01070800
             Poco::MongoDB::Database poco_db(db);
             if (!poco_db.authenticate(*connection, user, password, method.empty() ? Poco::MongoDB::Database::AUTH_SCRAM_SHA1 : method))
-                throw Exception("Cannot authenticate in MongoDB, incorrect user or password", ErrorCodes::MONGODB_CANNOT_AUTHENTICATE);
+                throw Exception(ErrorCodes::MONGODB_CANNOT_AUTHENTICATE, "Cannot authenticate in MongoDB, incorrect user or password");
 #else
             authenticate(*connection, db, user, password);
 #endif
@@ -151,7 +151,7 @@ BlockInputStreamPtr MongoDBDictionarySource::loadAll()
 BlockInputStreamPtr MongoDBDictionarySource::loadIds(const std::vector<UInt64> & ids)
 {
     if (!dict_struct.id)
-        throw Exception{"'id' is required for selective loading", ErrorCodes::UNSUPPORTED_METHOD};
+        throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "'id' is required for selective loading");
 
     auto cursor = createCursor(db, collection, sample_block);
 
@@ -172,7 +172,7 @@ BlockInputStreamPtr MongoDBDictionarySource::loadIds(const std::vector<UInt64> &
 BlockInputStreamPtr MongoDBDictionarySource::loadKeys(const Columns & key_columns, const std::vector<size_t> & requested_rows)
 {
     if (!dict_struct.key)
-        throw Exception{"'key' is required for selective loading", ErrorCodes::UNSUPPORTED_METHOD};
+        throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "'key' is required for selective loading");
 
     auto cursor = createCursor(db, collection, sample_block);
 
@@ -198,6 +198,7 @@ BlockInputStreamPtr MongoDBDictionarySource::loadKeys(const Columns & key_column
                 case AttributeUnderlyingType::utDecimal32:
                 case AttributeUnderlyingType::utDecimal64:
                 case AttributeUnderlyingType::utDecimal128:
+                case AttributeUnderlyingType::utDecimal256:
                     key.add(attr.second.name, Int32(key_columns[attr.first]->get64(row_idx)));
                     break;
 
diff --git a/src/Dictionaries/MongoDBDictionarySource.h b/src/Dictionaries/MongoDBDictionarySource.h
index ad7b66fe1a7..fef5749190f 100644
--- a/src/Dictionaries/MongoDBDictionarySource.h
+++ b/src/Dictionaries/MongoDBDictionarySource.h
@@ -50,7 +50,7 @@ public:
 
     BlockInputStreamPtr loadUpdatedAll() override
     {
-        throw Exception{"Method loadUpdatedAll is unsupported for MongoDBDictionarySource", ErrorCodes::NOT_IMPLEMENTED};
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method loadUpdatedAll is unsupported for MongoDBDictionarySource");
     }
 
     bool supportsSelectiveLoad() const override { return true; }
diff --git a/src/Dictionaries/MySQLDictionarySource.cpp b/src/Dictionaries/MySQLDictionarySource.cpp
index a21b1bd50fc..676863ae588 100644
--- a/src/Dictionaries/MySQLDictionarySource.cpp
+++ b/src/Dictionaries/MySQLDictionarySource.cpp
@@ -4,9 +4,15 @@
 #include "DictionarySourceFactory.h"
 #include "DictionaryStructure.h"
 #include "registerDictionaries.h"
+#include <Core/Settings.h>
+#include <Interpreters/Context.h>
 
 namespace DB
 {
+
+[[maybe_unused]]
+static const size_t default_num_tries_on_connection_loss = 3;
+
 namespace ErrorCodes
 {
     extern const int SUPPORT_IS_DISABLED;
@@ -14,22 +20,22 @@ namespace ErrorCodes
 
 void registerDictionarySourceMysql(DictionarySourceFactory & factory)
 {
-    auto create_table_source = [=](const DictionaryStructure & dict_struct,
-                                 const Poco::Util::AbstractConfiguration & config,
-                                 const std::string & config_prefix,
-                                 Block & sample_block,
-                                 const Context & /* context */,
+    auto create_table_source = [=]([[maybe_unused]] const DictionaryStructure & dict_struct,
+                                   [[maybe_unused]] const Poco::Util::AbstractConfiguration & config,
+                                   [[maybe_unused]] const std::string & config_prefix,
+                                   [[maybe_unused]] Block & sample_block,
+                                   [[maybe_unused]] ContextPtr context,
                                  const std::string & /* default_database */,
                                  bool /* check_config */) -> DictionarySourcePtr {
 #if USE_MYSQL
-        return std::make_unique<MySQLDictionarySource>(dict_struct, config, config_prefix + ".mysql", sample_block);
+        StreamSettings mysql_input_stream_settings(context->getSettingsRef()
+            , config.getBool(config_prefix + ".mysql.close_connection", false) || config.getBool(config_prefix + ".mysql.share_connection", false)
+            , false
+            , config.getBool(config_prefix + ".mysql.fail_on_connection_loss", false) ? 1 : default_num_tries_on_connection_loss);
+        return std::make_unique<MySQLDictionarySource>(dict_struct, config, config_prefix + ".mysql", sample_block, mysql_input_stream_settings);
 #else
-        (void)dict_struct;
-        (void)config;
-        (void)config_prefix;
-        (void)sample_block;
-        throw Exception{"Dictionary source of type `mysql` is disabled because ClickHouse was built without mysql support.",
-                        ErrorCodes::SUPPORT_IS_DISABLED};
+        throw Exception(ErrorCodes::SUPPORT_IS_DISABLED,
+            "Dictionary source of type `mysql` is disabled because ClickHouse was built without mysql support.");
 #endif
     };
     factory.registerSource("mysql", create_table_source);
@@ -45,20 +51,21 @@ void registerDictionarySourceMysql(DictionarySourceFactory & factory)
 #    include <IO/WriteHelpers.h>
 #    include <common/LocalDateTime.h>
 #    include <common/logger_useful.h>
-#    include <Formats/MySQLBlockInputStream.h>
 #    include "readInvalidateQuery.h"
+#    include <mysqlxx/Exception.h>
 #    include <mysqlxx/PoolFactory.h>
+#    include <Core/Settings.h>
 
 namespace DB
 {
-static const UInt64 max_block_size = 8192;
 
 
 MySQLDictionarySource::MySQLDictionarySource(
     const DictionaryStructure & dict_struct_,
     const Poco::Util::AbstractConfiguration & config,
     const std::string & config_prefix,
-    const Block & sample_block_)
+    const Block & sample_block_,
+    const StreamSettings & settings_)
     : log(&Poco::Logger::get("MySQLDictionarySource"))
     , update_time{std::chrono::system_clock::from_time_t(0)}
     , dict_struct{dict_struct_}
@@ -68,11 +75,11 @@ MySQLDictionarySource::MySQLDictionarySource(
     , update_field{config.getString(config_prefix + ".update_field", "")}
     , dont_check_update_time{config.getBool(config_prefix + ".dont_check_update_time", false)}
     , sample_block{sample_block_}
-    , pool{mysqlxx::PoolFactory::instance().get(config, config_prefix)}
+    , pool{std::make_shared<mysqlxx::PoolWithFailover>(mysqlxx::PoolFactory::instance().get(config, config_prefix))}
     , query_builder{dict_struct, db, "", table, where, IdentifierQuotingStyle::Backticks}
     , load_all_query{query_builder.composeLoadAllQuery()}
     , invalidate_query{config.getString(config_prefix + ".invalidate_query", "")}
-    , close_connection{config.getBool(config_prefix + ".close_connection", false) || config.getBool(config_prefix + ".share_connection", false)}
+    , settings(settings_)
 {
 }
 
@@ -93,7 +100,7 @@ MySQLDictionarySource::MySQLDictionarySource(const MySQLDictionarySource & other
     , last_modification{other.last_modification}
     , invalidate_query{other.invalidate_query}
     , invalidate_query_response{other.invalidate_query_response}
-    , close_connection{other.close_connection}
+    , settings(other.settings)
 {
 }
 
@@ -101,10 +108,9 @@ std::string MySQLDictionarySource::getUpdateFieldAndDate()
 {
     if (update_time != std::chrono::system_clock::from_time_t(0))
     {
-        auto tmp_time = update_time;
+        time_t hr_time = std::chrono::system_clock::to_time_t(update_time) - 1;
+        std::string str_time = DateLUT::instance().timeToString(hr_time);
         update_time = std::chrono::system_clock::now();
-        time_t hr_time = std::chrono::system_clock::to_time_t(tmp_time) - 1;
-        std::string str_time = std::to_string(LocalDateTime(hr_time));
         return query_builder.composeUpdateQuery(update_field, str_time);
     }
     else
@@ -114,39 +120,43 @@ std::string MySQLDictionarySource::getUpdateFieldAndDate()
     }
 }
 
+BlockInputStreamPtr MySQLDictionarySource::loadFromQuery(const String & query)
+{
+    return std::make_shared<MySQLWithFailoverBlockInputStream>(
+            pool, query, sample_block, settings);
+}
+
 BlockInputStreamPtr MySQLDictionarySource::loadAll()
 {
-    auto connection = pool.get();
+    auto connection = pool->get();
     last_modification = getLastModification(connection, false);
 
     LOG_TRACE(log, load_all_query);
-    return std::make_shared<MySQLBlockInputStream>(connection, load_all_query, sample_block, max_block_size, close_connection);
+    return loadFromQuery(load_all_query);
 }
 
 BlockInputStreamPtr MySQLDictionarySource::loadUpdatedAll()
 {
-    auto connection = pool.get();
+    auto connection = pool->get();
     last_modification = getLastModification(connection, false);
 
     std::string load_update_query = getUpdateFieldAndDate();
     LOG_TRACE(log, load_update_query);
-    return std::make_shared<MySQLBlockInputStream>(connection, load_update_query, sample_block, max_block_size, close_connection);
+    return loadFromQuery(load_update_query);
 }
 
 BlockInputStreamPtr MySQLDictionarySource::loadIds(const std::vector<UInt64> & ids)
 {
     /// We do not log in here and do not update the modification time, as the request can be large, and often called.
-
     const auto query = query_builder.composeLoadIdsQuery(ids);
-    return std::make_shared<MySQLBlockInputStream>(pool.get(), query, sample_block, max_block_size, close_connection);
+    return loadFromQuery(query);
 }
 
 BlockInputStreamPtr MySQLDictionarySource::loadKeys(const Columns & key_columns, const std::vector<size_t> & requested_rows)
 {
     /// We do not log in here and do not update the modification time, as the request can be large, and often called.
-
     const auto query = query_builder.composeLoadKeysQuery(key_columns, requested_rows, ExternalQueryBuilder::AND_OR_CHAIN);
-    return std::make_shared<MySQLBlockInputStream>(pool.get(), query, sample_block, max_block_size, close_connection);
+    return loadFromQuery(query);
 }
 
 bool MySQLDictionarySource::isModified() const
@@ -162,7 +172,7 @@ bool MySQLDictionarySource::isModified() const
 
     if (dont_check_update_time)
         return true;
-    auto connection = pool.get();
+    auto connection = pool->get();
     return getLastModification(connection, true) > last_modification;
 }
 
@@ -228,7 +238,7 @@ LocalDateTime MySQLDictionarySource::getLastModification(mysqlxx::Pool::Entry &
             if (!update_time_value.isNull())
             {
                 modification_time = update_time_value.getDateTime();
-                LOG_TRACE(log, "Got modification time: {}", modification_time);
+                LOG_TRACE(log, "Got modification time: {}", update_time_value.getString());
             }
 
             /// fetch remaining rows to avoid "commands out of sync" error
@@ -236,7 +246,7 @@ LocalDateTime MySQLDictionarySource::getLastModification(mysqlxx::Pool::Entry &
                 ++fetched_rows;
         }
 
-        if (close_connection && allow_connection_closure)
+        if (settings.auto_close && allow_connection_closure)
         {
             connection.disconnect();
         }
@@ -260,7 +270,7 @@ std::string MySQLDictionarySource::doInvalidateQuery(const std::string & request
     Block invalidate_sample_block;
     ColumnPtr column(ColumnString::create());
     invalidate_sample_block.insert(ColumnWithTypeAndName(column, std::make_shared<DataTypeString>(), "Sample Block"));
-    MySQLBlockInputStream block_input_stream(pool.get(), request, invalidate_sample_block, 1, close_connection);
+    MySQLBlockInputStream block_input_stream(pool->get(), request, invalidate_sample_block, settings);
     return readInvalidateQuery(block_input_stream);
 }
 
diff --git a/src/Dictionaries/MySQLDictionarySource.h b/src/Dictionaries/MySQLDictionarySource.h
index 34f784cdfeb..ef1d81b862f 100644
--- a/src/Dictionaries/MySQLDictionarySource.h
+++ b/src/Dictionaries/MySQLDictionarySource.h
@@ -12,7 +12,7 @@
 #    include "DictionaryStructure.h"
 #    include "ExternalQueryBuilder.h"
 #    include "IDictionarySource.h"
-
+#    include <Formats/MySQLBlockInputStream.h>
 
 namespace Poco
 {
@@ -34,8 +34,9 @@ public:
     MySQLDictionarySource(
         const DictionaryStructure & dict_struct_,
         const Poco::Util::AbstractConfiguration & config,
-        const std::string & config_prefix,
-        const Block & sample_block_);
+        const String & config_prefix,
+        const Block & sample_block_,
+        const StreamSettings & settings_);
 
     /// copy-constructor is provided in order to support cloneability
     MySQLDictionarySource(const MySQLDictionarySource & other);
@@ -60,6 +61,8 @@ public:
     std::string toString() const override;
 
 private:
+    BlockInputStreamPtr loadFromQuery(const String & query);
+
     std::string getUpdateFieldAndDate();
 
     static std::string quoteForLike(const std::string s);
@@ -79,13 +82,13 @@ private:
     const std::string update_field;
     const bool dont_check_update_time;
     Block sample_block;
-    mutable mysqlxx::PoolWithFailover pool;
+    mutable mysqlxx::PoolWithFailoverPtr pool;
     ExternalQueryBuilder query_builder;
     const std::string load_all_query;
     LocalDateTime last_modification;
     std::string invalidate_query;
     mutable std::string invalidate_query_response;
-    const bool close_connection;
+    const StreamSettings settings;
 };
 
 }
diff --git a/src/Dictionaries/PolygonDictionary.cpp b/src/Dictionaries/PolygonDictionary.cpp
index e0d0fa0a0e6..64d435cf632 100644
--- a/src/Dictionaries/PolygonDictionary.cpp
+++ b/src/Dictionaries/PolygonDictionary.cpp
@@ -1,4 +1,8 @@
 #include "PolygonDictionary.h"
+
+#include <numeric>
+#include <cmath>
+
 #include "DictionaryBlockInputStream.h"
 #include "DictionaryFactory.h"
 
@@ -8,8 +12,6 @@
 #include <Functions/FunctionHelpers.h>
 #include <DataTypes/DataTypesDecimal.h>
 
-#include <numeric>
-
 namespace DB
 {
 
@@ -28,70 +30,16 @@ IPolygonDictionary::IPolygonDictionary(
         const DictionaryLifetime dict_lifetime_,
         InputType input_type_,
         PointType point_type_)
-        : IDictionaryBase(dict_id_)
+        : IDictionary(dict_id_)
         , dict_struct(dict_struct_)
         , source_ptr(std::move(source_ptr_))
         , dict_lifetime(dict_lifetime_)
         , input_type(input_type_)
         , point_type(point_type_)
 {
-    createAttributes();
+    setup();
     loadData();
-}
-
-std::string IPolygonDictionary::getTypeName() const
-{
-    return "Polygon";
-}
-
-std::string IPolygonDictionary::getKeyDescription() const
-{
-    return dict_struct.getKeyDescription();
-}
-
-size_t IPolygonDictionary::getBytesAllocated() const
-{
-    return bytes_allocated;
-}
-
-size_t IPolygonDictionary::getQueryCount() const
-{
-    return query_count.load(std::memory_order_relaxed);
-}
-
-double IPolygonDictionary::getHitRate() const
-{
-    return 1.0;
-}
-
-size_t IPolygonDictionary::getElementCount() const
-{
-    return element_count;
-}
-
-double IPolygonDictionary::getLoadFactor() const
-{
-    return 1.0;
-}
-
-const IDictionarySource * IPolygonDictionary::getSource() const
-{
-    return source_ptr.get();
-}
-
-const DictionaryLifetime & IPolygonDictionary::getLifetime() const
-{
-    return dict_lifetime;
-}
-
-const DictionaryStructure & IPolygonDictionary::getStructure() const
-{
-    return dict_struct;
-}
-
-bool IPolygonDictionary::isInjective(const std::string &) const
-{
-    return false;
+    calculateBytesAllocated();
 }
 
 ColumnPtr IPolygonDictionary::getColumn(
@@ -99,52 +47,102 @@ ColumnPtr IPolygonDictionary::getColumn(
     const DataTypePtr & result_type,
     const Columns & key_columns,
     const DataTypes &,
-    const ColumnPtr default_values_column) const
+    const ColumnPtr & default_values_column) const
 {
-    ColumnPtr result;
+    const auto requested_key_points = extractPoints(key_columns);
 
-    const auto index = getAttributeIndex(attribute_name);
-    const auto & dictionary_attribute = dict_struct.getAttribute(attribute_name, result_type);
+    const auto & attribute = dict_struct.getAttribute(attribute_name, result_type);
+    bool complex_attribute = attribute.is_nullable || attribute.is_array;
+    DefaultValueProvider default_value_provider(attribute.null_value, default_values_column);
 
-    auto keys_size = key_columns.front()->size();
+    size_t attribute_index = dict_struct.attribute_name_to_index.find(attribute_name)->second;
+    const auto & attribute_values_column = attributes[attribute_index];
 
-    auto type_call = [&](const auto &dictionary_attribute_type)
+    auto result = attribute_values_column->cloneEmpty();
+    result->reserve(requested_key_points.size());
+
+    Field row_value_to_insert;
+    size_t polygon_index = 0;
+
+    if (unlikely(complex_attribute))
     {
-        using Type = std::decay_t<decltype(dictionary_attribute_type)>;
-        using AttributeType = typename Type::AttributeType;
-        using ColumnProvider = DictionaryAttributeColumnProvider<AttributeType>;
-
-        const auto & null_value = std::get<AttributeType>(null_values[index]);
-        DictionaryDefaultValueExtractor<AttributeType> default_value_extractor(null_value, default_values_column);
-
-        auto column = ColumnProvider::getColumn(dictionary_attribute, keys_size);
-
-        if constexpr (std::is_same_v<AttributeType, String>)
+        for (size_t requested_key_index = 0; requested_key_index < requested_key_points.size(); ++requested_key_index)
         {
-            auto column_string = ColumnString::create();
-            auto * out = column.get();
+            const auto found = find(requested_key_points[requested_key_index], polygon_index);
 
-            getItemsImpl<String, StringRef>(
-                index,
-                key_columns,
-                [&](const size_t, const StringRef & value) { out->insertData(value.data, value.size); },
-                default_value_extractor);
+            if (found)
+            {
+                size_t attribute_values_index = polygon_index_to_attribute_value_index[polygon_index];
+                attribute_values_column->get(attribute_values_index, row_value_to_insert);
+            }
+            else
+                row_value_to_insert = default_value_provider.getDefaultValue(requested_key_index);
+
+            result->insert(row_value_to_insert);
         }
-        else
+    }
+    else
+    {
+        auto type_call = [&](const auto & dictionary_attribute_type)
         {
-            auto & out = column->getData();
+            using Type = std::decay_t<decltype(dictionary_attribute_type)>;
+            using AttributeType = typename Type::AttributeType;
+            using ValueType = DictionaryValueType<AttributeType>;
+            using ColumnType = std::conditional_t<
+                std::is_same_v<AttributeType, String>,
+                ColumnString,
+                std::conditional_t<IsDecimalNumber<AttributeType>, ColumnDecimal<ValueType>, ColumnVector<AttributeType>>>;
 
-            getItemsImpl<AttributeType, AttributeType>(
-                index,
-                key_columns,
-                [&](const size_t row, const auto value) { return out[row] = value; },
-                default_value_extractor);
-        }
+            const auto attribute_values_column_typed = typeid_cast<const ColumnType *>(attribute_values_column.get());
+            if (!attribute_values_column_typed)
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "An attribute type should be same as dictionary type");
 
-        result = std::move(column);
-    };
+            ColumnType & result_column_typed = static_cast<ColumnType &>(*result);
 
-    callOnDictionaryAttributeType(dict_struct.attributes[index].underlying_type, type_call);
+            if constexpr (std::is_same_v<ColumnType, ColumnString>)
+            {
+                for (size_t requested_key_index = 0; requested_key_index < requested_key_points.size(); ++requested_key_index)
+                {
+                    const auto found = find(requested_key_points[requested_key_index], polygon_index);
+
+                    if (found)
+                    {
+                        size_t attribute_values_index = polygon_index_to_attribute_value_index[polygon_index];
+                        auto data_to_insert = attribute_values_column->getDataAt(attribute_values_index);
+                        result_column_typed.insertData(data_to_insert.data, data_to_insert.size);
+                    }
+                    else
+                        result_column_typed.insert(default_value_provider.getDefaultValue(requested_key_index));
+                }
+            }
+            else
+            {
+                auto & attribute_data = attribute_values_column_typed->getData();
+                auto & result_data = result_column_typed.getData();
+
+                for (size_t requested_key_index = 0; requested_key_index < requested_key_points.size(); ++requested_key_index)
+                {
+                    const auto found = find(requested_key_points[requested_key_index], polygon_index);
+
+                    if (found)
+                    {
+                        size_t attribute_values_index = polygon_index_to_attribute_value_index[polygon_index];
+                        auto & item = attribute_data[attribute_values_index];
+                        result_data.emplace_back(item);
+                    }
+                    else
+                    {
+                        row_value_to_insert = default_value_provider.getDefaultValue(requested_key_index);
+                        result_data.emplace_back(row_value_to_insert.template get<NearestFieldType<ValueType>>());
+                    }
+                }
+            }
+        };
+
+        callOnDictionaryAttributeType(attribute.underlying_type, type_call);
+    }
+
+    query_count.fetch_add(requested_key_points.size(), std::memory_order_relaxed);
 
     return result;
 }
@@ -153,103 +151,42 @@ BlockInputStreamPtr IPolygonDictionary::getBlockInputStream(const Names &, size_
 {
     // TODO: In order for this to work one would first have to support retrieving arrays from dictionaries.
     //  I believe this is a separate task done by some other people.
-    throw Exception{"Reading the dictionary is not allowed", ErrorCodes::UNSUPPORTED_METHOD};
+    throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "Reading the dictionary is not allowed");
 }
 
-template <typename T>
-void IPolygonDictionary::appendNullValueImpl(const Field & null_value)
+void IPolygonDictionary::setup()
 {
-    null_values.emplace_back(T(null_value.get<NearestFieldType<T>>()));
-}
+    attributes.reserve(dict_struct.attributes.size());
 
-void IPolygonDictionary::appendNullValue(AttributeUnderlyingType type, const Field & null_value)
-{
-    switch (type)
+    for (const auto & attribute : dict_struct.attributes)
     {
-        case AttributeUnderlyingType::utUInt8:
-            appendNullValueImpl<UInt8>(null_value);
-            break;
-        case AttributeUnderlyingType::utUInt16:
-            appendNullValueImpl<UInt16>(null_value);
-            break;
-        case AttributeUnderlyingType::utUInt32:
-            appendNullValueImpl<UInt32>(null_value);
-            break;
-        case AttributeUnderlyingType::utUInt64:
-            appendNullValueImpl<UInt64>(null_value);
-            break;
-        case AttributeUnderlyingType::utUInt128:
-            appendNullValueImpl<UInt128>(null_value);
-            break;
-        case AttributeUnderlyingType::utInt8:
-            appendNullValueImpl<Int8>(null_value);
-            break;
-        case AttributeUnderlyingType::utInt16:
-            appendNullValueImpl<Int16>(null_value);
-            break;
-        case AttributeUnderlyingType::utInt32:
-            appendNullValueImpl<Int32>(null_value);
-            break;
-        case AttributeUnderlyingType::utInt64:
-            appendNullValueImpl<Int64>(null_value);
-            break;
-        case AttributeUnderlyingType::utFloat32:
-            appendNullValueImpl<Float32>(null_value);
-            break;
-        case AttributeUnderlyingType::utFloat64:
-            appendNullValueImpl<Float64>(null_value);
-            break;
-        case AttributeUnderlyingType::utDecimal32:
-            appendNullValueImpl<Decimal32>(null_value);
-            break;
-        case AttributeUnderlyingType::utDecimal64:
-            appendNullValueImpl<Decimal64>(null_value);
-            break;
-        case AttributeUnderlyingType::utDecimal128:
-            appendNullValueImpl<Decimal128>(null_value);
-            break;
-        case AttributeUnderlyingType::utString:
-            appendNullValueImpl<String>(null_value);
-            break;
-    }
-}
+        auto column = attribute.type->createColumn();
+        attributes.emplace_back(std::move(column));
 
-void IPolygonDictionary::createAttributes()
-{
-    attributes.resize(dict_struct.attributes.size());
-    for (size_t i = 0; i < dict_struct.attributes.size(); ++i)
-    {
-        const auto & attr = dict_struct.attributes[i];
-        attribute_index_by_name.emplace(attr.name, i);
-
-        appendNullValue(attr.underlying_type, attr.null_value);
-
-        if (attr.hierarchical)
-            throw Exception{ErrorCodes::TYPE_MISMATCH,
+        if (attribute.hierarchical)
+            throw Exception(ErrorCodes::TYPE_MISMATCH,
                             "{}: hierarchical attributes not supported for dictionary of polygonal type",
-                            getDictionaryID().getNameForLogs()};
+                            getDictionaryID().getNameForLogs());
     }
 }
 
 void IPolygonDictionary::blockToAttributes(const DB::Block & block)
 {
     const auto rows = block.rows();
-    element_count += rows;
+
+    size_t skip_key_column_offset = 1;
     for (size_t i = 0; i < attributes.size(); ++i)
     {
-        const auto & column = block.safeGetByPosition(i + 1);
-        if (attributes[i])
-        {
-            MutableColumnPtr mutated = IColumn::mutate(std::move(attributes[i]));
-            mutated->insertRangeFrom(*column.column, 0, column.column->size());
-            attributes[i] = std::move(mutated);
-        }
-        else
-            attributes[i] = column.column;
+        const auto & block_column = block.safeGetByPosition(i + skip_key_column_offset);
+        const auto & column = block_column.column;
+
+        attributes[i]->assumeMutable()->insertRangeFrom(*column, 0, column->size());
     }
+
     /** Multi-polygons could cause bigger sizes, but this is better than nothing. */
     polygons.reserve(polygons.size() + rows);
-    ids.reserve(ids.size() + rows);
+    polygon_index_to_attribute_value_index.reserve(polygon_index_to_attribute_value_index.size() + rows);
+
     const auto & key = block.safeGetByPosition(0).column;
     extractPolygons(key);
 }
@@ -262,114 +199,104 @@ void IPolygonDictionary::loadData()
         blockToAttributes(block);
     stream->readSuffix();
 
-    std::vector<double> areas;
-    areas.reserve(polygons.size());
+
+    /// Correct and sort polygons by area and update polygon_index_to_attribute_value_index after sort
+    PaddedPODArray<double> areas;
+    areas.resize_fill(polygons.size());
 
     std::vector<std::pair<Polygon, size_t>> polygon_ids;
     polygon_ids.reserve(polygons.size());
+
     for (size_t i = 0; i < polygons.size(); ++i)
     {
         auto & polygon = polygons[i];
         bg::correct(polygon);
-        areas.push_back(bg::area(polygon));
+
+        areas[i] = bg::area(polygon);
         polygon_ids.emplace_back(polygon, i);
     }
-    sort(polygon_ids.begin(), polygon_ids.end(), [& areas](const auto & lhs, const auto & rhs)
+
+    std::sort(polygon_ids.begin(), polygon_ids.end(), [& areas](const auto & lhs, const auto & rhs)
     {
         return areas[lhs.second] < areas[rhs.second];
     });
+
     std::vector<size_t> correct_ids;
     correct_ids.reserve(polygon_ids.size());
+
     for (size_t i = 0; i < polygon_ids.size(); ++i)
     {
         auto & polygon = polygon_ids[i];
-        correct_ids.emplace_back(ids[polygon.second]);
+        correct_ids.emplace_back(polygon_index_to_attribute_value_index[polygon.second]);
         polygons[i] = polygon.first;
     }
-    ids = correct_ids;
+
+    polygon_index_to_attribute_value_index = std::move(correct_ids);
 }
 
 void IPolygonDictionary::calculateBytesAllocated()
 {
-    // TODO:: Account for key.
+    /// Index allocated by subclass not counted because it take a small part in relation to attributes and polygons
+
     for (const auto & column : attributes)
         bytes_allocated += column->allocatedBytes();
+
+    for (auto & polygon : polygons)
+        bytes_allocated += bg::num_points(polygon) * sizeof(Point);
 }
 
 std::vector<IPolygonDictionary::Point> IPolygonDictionary::extractPoints(const Columns & key_columns)
 {
     if (key_columns.size() != 2)
-        throw Exception{"Expected two columns of coordinates", ErrorCodes::BAD_ARGUMENTS};
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Expected two columns of coordinates with type Float64");
+
     const auto * column_x = typeid_cast<const ColumnVector<Float64>*>(key_columns[0].get());
     const auto * column_y = typeid_cast<const ColumnVector<Float64>*>(key_columns[1].get());
+
     if (!column_x || !column_y)
-        throw Exception{"Expected columns of Float64", ErrorCodes::TYPE_MISMATCH};
+        throw Exception(ErrorCodes::TYPE_MISMATCH, "Expected columns of Float64");
+
     const auto rows = key_columns.front()->size();
+
     std::vector<Point> result;
     result.reserve(rows);
+
     for (const auto row : ext::range(0, rows))
-        result.emplace_back(column_x->getElement(row), column_y->getElement(row));
+    {
+        auto x = column_x->getElement(row);
+        auto y = column_y->getElement(row);
+
+        if (isNaN(x) || isNaN(y))
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                "PolygonDictionary input point component must not be NaN");
+
+        if (std::isinf(x) || std::isinf(y))
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                "PolygonDictionary input point component must not be infinite");
+
+        result.emplace_back(x, y);
+    }
+
     return result;
 }
 
 ColumnUInt8::Ptr IPolygonDictionary::hasKeys(const Columns & key_columns, const DataTypes &) const
 {
-    auto size = key_columns.front()->size();
-    auto result = ColumnUInt8::create(size);
+    std::vector<IPolygonDictionary::Point> points = extractPoints(key_columns);
+
+    auto result = ColumnUInt8::create(points.size());
     auto& out = result->getData();
 
-    size_t row = 0;
-    for (const auto & pt : extractPoints(key_columns))
+    for (size_t i = 0; i < points.size(); ++i)
     {
-        size_t trash = 0;
-        out[row] = find(pt, trash);
-        ++row;
-    }
-
-    query_count.fetch_add(row, std::memory_order_relaxed);
-
-    return result;
-}
-
-size_t IPolygonDictionary::getAttributeIndex(const std::string & attribute_name) const
-{
-    const auto it = attribute_index_by_name.find(attribute_name);
-    if (it == attribute_index_by_name.end())
-        throw Exception{"No such attribute: " + attribute_name, ErrorCodes::BAD_ARGUMENTS};
-    return it->second;
-}
-
-template <typename AttributeType, typename OutputType, typename ValueSetter, typename DefaultValueExtractor>
-void IPolygonDictionary::getItemsImpl(
-        size_t attribute_ind,
-        const Columns & key_columns,
-        ValueSetter && set_value,
-        DefaultValueExtractor & default_value_extractor) const
-{
-    const auto points = extractPoints(key_columns);
-
-    using ColVecType = std::conditional_t<IsDecimalNumber<AttributeType>, ColumnDecimal<AttributeType>, ColumnVector<AttributeType>>;
-    using ColType = std::conditional_t<std::is_same<AttributeType, String>::value, ColumnString, ColVecType>;
-    const auto column = typeid_cast<const ColType *>(attributes[attribute_ind].get());
-    if (!column)
-        throw Exception{"An attribute should be a column of its type", ErrorCodes::BAD_ARGUMENTS};
-    for (const auto i : ext::range(0, points.size()))
-    {
-        size_t id = 0;
-        const auto found = find(points[i], id);
-        id = ids[id];
-        if (!found)
-        {
-            set_value(i, static_cast<OutputType>(default_value_extractor[i]));
-            continue;
-        }
-        if constexpr (std::is_same<AttributeType, String>::value)
-            set_value(i, static_cast<OutputType>(column->getDataAt(id)));
-        else
-            set_value(i, static_cast<OutputType>(column->getElement(id)));
+        size_t unused_find_result = 0;
+        auto & point = points[i];
+        out[i] = find(point, unused_find_result);
     }
 
     query_count.fetch_add(points.size(), std::memory_order_relaxed);
+
+    return result;
 }
 
 namespace
@@ -465,17 +392,17 @@ const IColumn * unrollMultiPolygons(const ColumnPtr & column, Offset & offset)
 {
     const auto * ptr_multi_polygons = typeid_cast<const ColumnArray*>(column.get());
     if (!ptr_multi_polygons)
-        throw Exception{"Expected a column containing arrays of polygons", ErrorCodes::TYPE_MISMATCH};
+        throw Exception(ErrorCodes::TYPE_MISMATCH, "Expected a column containing arrays of polygons");
     offset.multi_polygon_offsets.assign(ptr_multi_polygons->getOffsets());
 
     const auto * ptr_polygons = typeid_cast<const ColumnArray*>(&ptr_multi_polygons->getData());
     if (!ptr_polygons)
-        throw Exception{"Expected a column containing arrays of rings when reading polygons", ErrorCodes::TYPE_MISMATCH};
+        throw Exception(ErrorCodes::TYPE_MISMATCH, "Expected a column containing arrays of rings when reading polygons");
     offset.polygon_offsets.assign(ptr_polygons->getOffsets());
 
     const auto * ptr_rings = typeid_cast<const ColumnArray*>(&ptr_polygons->getData());
     if (!ptr_rings)
-        throw Exception{"Expected a column containing arrays of points when reading rings", ErrorCodes::TYPE_MISMATCH};
+        throw Exception(ErrorCodes::TYPE_MISMATCH, "Expected a column containing arrays of points when reading rings");
     offset.ring_offsets.assign(ptr_rings->getOffsets());
 
     return ptr_rings->getDataPtr().get();
@@ -485,7 +412,7 @@ const IColumn * unrollSimplePolygons(const ColumnPtr & column, Offset & offset)
 {
     const auto * ptr_polygons = typeid_cast<const ColumnArray*>(column.get());
     if (!ptr_polygons)
-        throw Exception{"Expected a column containing arrays of points", ErrorCodes::TYPE_MISMATCH};
+        throw Exception(ErrorCodes::TYPE_MISMATCH, "Expected a column containing arrays of points");
     offset.ring_offsets.assign(ptr_polygons->getOffsets());
     std::iota(offset.polygon_offsets.begin(), offset.polygon_offsets.end(), 1);
     offset.multi_polygon_offsets.assign(offset.polygon_offsets);
@@ -498,13 +425,13 @@ void handlePointsReprByArrays(const IColumn * column, Data & data, Offset & offs
     const auto * ptr_points = typeid_cast<const ColumnArray*>(column);
     const auto * ptr_coord = typeid_cast<const ColumnVector<Float64>*>(&ptr_points->getData());
     if (!ptr_coord)
-        throw Exception{"Expected coordinates to be of type Float64", ErrorCodes::TYPE_MISMATCH};
+        throw Exception(ErrorCodes::TYPE_MISMATCH, "Expected coordinates to be of type Float64");
     const auto & offsets = ptr_points->getOffsets();
     IColumn::Offset prev_offset = 0;
     for (size_t i = 0; i < offsets.size(); ++i)
     {
         if (offsets[i] - prev_offset != 2)
-            throw Exception{"All points should be two-dimensional", ErrorCodes::BAD_ARGUMENTS};
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "All points should be two-dimensional");
         prev_offset = offsets[i];
         addNewPoint(ptr_coord->getElement(2 * i), ptr_coord->getElement(2 * i + 1), data, offset);
     }
@@ -514,13 +441,13 @@ void handlePointsReprByTuples(const IColumn * column, Data & data, Offset & offs
 {
     const auto * ptr_points = typeid_cast<const ColumnTuple*>(column);
     if (!ptr_points)
-        throw Exception{"Expected a column of tuples representing points", ErrorCodes::TYPE_MISMATCH};
+        throw Exception(ErrorCodes::TYPE_MISMATCH, "Expected a column of tuples representing points");
     if (ptr_points->tupleSize() != 2)
-        throw Exception{"Points should be two-dimensional", ErrorCodes::BAD_ARGUMENTS};
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Points should be two-dimensional");
     const auto * column_x = typeid_cast<const ColumnVector<Float64>*>(&ptr_points->getColumn(0));
     const auto * column_y = typeid_cast<const ColumnVector<Float64>*>(&ptr_points->getColumn(1));
     if (!column_x || !column_y)
-        throw Exception{"Expected coordinates to be of type Float64", ErrorCodes::TYPE_MISMATCH};
+        throw Exception(ErrorCodes::TYPE_MISMATCH, "Expected coordinates to be of type Float64");
     for (size_t i = 0; i < column_x->size(); ++i)
     {
         addNewPoint(column_x->getElement(i), column_y->getElement(i), data, offset);
@@ -531,7 +458,7 @@ void handlePointsReprByTuples(const IColumn * column, Data & data, Offset & offs
 
 void IPolygonDictionary::extractPolygons(const ColumnPtr & column)
 {
-    Data data = {polygons, ids};
+    Data data = {polygons, polygon_index_to_attribute_value_index};
     Offset offset;
 
     const IColumn * points_collection = nullptr;
@@ -546,8 +473,8 @@ void IPolygonDictionary::extractPolygons(const ColumnPtr & column)
     }
 
     if (!offset.allRingsHaveAPositiveArea())
-        throw Exception{"Every ring included in a polygon or excluded from it should contain at least 3 points",
-                        ErrorCodes::BAD_ARGUMENTS};
+        throw Exception(ErrorCodes::BAD_ARGUMENTS,
+            "Every ring included in a polygon or excluded from it should contain at least 3 points");
 
     /** Adding the first empty polygon */
     data.addPolygon(true);
diff --git a/src/Dictionaries/PolygonDictionary.h b/src/Dictionaries/PolygonDictionary.h
index a0ea189c10a..5974e6461a7 100644
--- a/src/Dictionaries/PolygonDictionary.h
+++ b/src/Dictionaries/PolygonDictionary.h
@@ -24,7 +24,7 @@ namespace bg = boost::geometry;
   * An implementation should inherit from this base class and preprocess the data upon construction if needed.
   * It must override the find method of this class which retrieves the polygon containing a single point.
   */
-class IPolygonDictionary : public IDictionaryBase
+class IPolygonDictionary : public IDictionary
 {
 public:
     /** Controls the different types of polygons allowed as input.
@@ -57,27 +57,25 @@ public:
             InputType input_type_,
             PointType point_type_);
 
-    std::string getTypeName() const override;
+    std::string getTypeName() const override { return "Polygon"; }
 
-    std::string getKeyDescription() const;
+    size_t getBytesAllocated() const override { return bytes_allocated; }
 
-    size_t getBytesAllocated() const override;
+    size_t getQueryCount() const override { return query_count.load(std::memory_order_relaxed); }
 
-    size_t getQueryCount() const override;
+    double getHitRate() const override { return 1.0; }
 
-    double getHitRate() const override;
+    size_t getElementCount() const override { return attributes.empty() ? 0 : attributes.front()->size(); }
 
-    size_t getElementCount() const override;
+    double getLoadFactor() const override { return 1.0; }
 
-    double getLoadFactor() const override;
+    const IDictionarySource * getSource() const override { return source_ptr.get(); }
 
-    const IDictionarySource * getSource() const override;
+    const DictionaryStructure & getStructure() const override { return dict_struct; }
 
-    const DictionaryStructure & getStructure() const override;
+    const DictionaryLifetime  & getLifetime() const override { return dict_lifetime; }
 
-    const DictionaryLifetime  & getLifetime() const override;
-
-    bool isInjective(const std::string & attribute_name) const override;
+    bool isInjective(const std::string & attribute_name) const override { return dict_struct.getAttribute(attribute_name).injective; }
 
     DictionaryKeyType getKeyType() const override { return DictionaryKeyType::complex; }
 
@@ -86,7 +84,7 @@ public:
         const DataTypePtr & result_type,
         const Columns & key_columns,
         const DataTypes & key_types,
-        const ColumnPtr default_values_column) const override;
+        const ColumnPtr & default_values_column) const override;
 
     ColumnUInt8::Ptr hasKeys(const Columns & key_columns, const DataTypes & key_types) const override;
 
@@ -106,13 +104,9 @@ protected:
      *  If true id is set to the index of a polygon containing the given point.
      *  Overridden in different implementations of this interface.
      */
-    virtual bool find(const Point & point, size_t & id) const = 0;
+    virtual bool find(const Point & point, size_t & polygon_index) const = 0;
 
     std::vector<Polygon> polygons;
-    /** Since the original data may have been in the form of multi-polygons, an id is stored for each single polygon
-     *  corresponding to the row in which any other attributes for this entry are located.
-     */
-    std::vector<size_t> ids;
 
     const DictionaryStructure dict_struct;
     const DictionarySourcePtr source_ptr;
@@ -126,7 +120,7 @@ private:
      *  The polygons serving as keys are extracted into boost types.
      *  All other values are stored in one column per attribute.
      */
-    void createAttributes();
+    void setup();
     void blockToAttributes(const Block & block);
     void loadData();
 
@@ -135,13 +129,6 @@ private:
     /** Checks whether a given attribute exists and returns its index */
     size_t getAttributeIndex(const std::string & attribute_name) const;
 
-    /** Helper functions to retrieve and instantiate the provided null value of an attribute.
-     *  Since a null value is obligatory for every attribute they are simply appended to null_values defined below.
-     */
-    template <typename T>
-    void appendNullValueImpl(const Field & null_value);
-    void appendNullValue(AttributeUnderlyingType type, const Field & value);
-
     /** Helper function for retrieving the value of an attribute by key. */
     template <typename AttributeType, typename OutputType, typename ValueSetter, typename DefaultValueExtractor>
     void getItemsImpl(
@@ -150,32 +137,16 @@ private:
         ValueSetter && set_value,
         DefaultValueExtractor & default_value_extractor) const;
 
-    /** A mapping from the names of the attributes to their index in the two vectors defined below. */
-    std::map<std::string, size_t> attribute_index_by_name;
-    /** A vector of columns storing the values of each attribute. */
     Columns attributes;
-    /** A vector of null values corresponding to each attribute. */
-    std::vector<std::variant<
-        UInt8,
-        UInt16,
-        UInt32,
-        UInt64,
-        UInt128,
-        Int8,
-        Int16,
-        Int32,
-        Int64,
-        Decimal32,
-        Decimal64,
-        Decimal128,
-        Float32,
-        Float64,
-        String>> null_values;
 
     size_t bytes_allocated = 0;
-    size_t element_count = 0;
     mutable std::atomic<size_t> query_count{0};
 
+    /** Since the original data may have been in the form of multi-polygons, an id is stored for each single polygon
+     *  corresponding to the row in which any other attributes for this entry are located.
+     */
+    std::vector<size_t> polygon_index_to_attribute_value_index;
+
     /** Extracts a list of polygons from a column according to input_type and point_type.
      *  The polygons are appended to the dictionary with the corresponding ids.
      */
diff --git a/src/Dictionaries/PolygonDictionaryImplementations.cpp b/src/Dictionaries/PolygonDictionaryImplementations.cpp
index 6570b112853..fb4fb605465 100644
--- a/src/Dictionaries/PolygonDictionaryImplementations.cpp
+++ b/src/Dictionaries/PolygonDictionaryImplementations.cpp
@@ -39,14 +39,14 @@ std::shared_ptr<const IExternalLoadable> PolygonDictionarySimple::clone() const
             this->point_type);
 }
 
-bool PolygonDictionarySimple::find(const Point & point, size_t & id) const
+bool PolygonDictionarySimple::find(const Point & point, size_t & polygon_index) const
 {
     bool found = false;
     for (size_t i = 0; i < polygons.size(); ++i)
     {
         if (bg::covered_by(point, polygons[i]))
         {
-            id = i;
+            polygon_index = i;
             found = true;
             break;
         }
@@ -90,7 +90,7 @@ std::shared_ptr<const IExternalLoadable> PolygonDictionaryIndexEach::clone() con
             this->max_depth);
 }
 
-bool PolygonDictionaryIndexEach::find(const Point & point, size_t & id) const
+bool PolygonDictionaryIndexEach::find(const Point & point, size_t & polygon_index) const
 {
     const auto * cell = grid.find(point.x(), point.y());
     if (cell)
@@ -100,13 +100,13 @@ bool PolygonDictionaryIndexEach::find(const Point & point, size_t & id) const
             size_t unused;
             if (buckets[candidate].find(point, unused))
             {
-                id = candidate;
+                polygon_index = candidate;
                 return true;
             }
         }
         if (cell->first_covered != FinalCell::kNone)
         {
-            id = cell->first_covered;
+            polygon_index = cell->first_covered;
             return true;
         }
     }
@@ -142,19 +142,19 @@ std::shared_ptr<const IExternalLoadable> PolygonDictionaryIndexCell::clone() con
             this->max_depth);
 }
 
-bool PolygonDictionaryIndexCell::find(const Point & point, size_t & id) const
+bool PolygonDictionaryIndexCell::find(const Point & point, size_t & polygon_index) const
 {
     const auto * cell = index.find(point.x(), point.y());
     if (cell)
     {
-        if (!(cell->corresponding_ids).empty() && cell->index.find(point, id))
+        if (!(cell->corresponding_ids).empty() && cell->index.find(point, polygon_index))
         {
-            id = cell->corresponding_ids[id];
+            polygon_index = cell->corresponding_ids[polygon_index];
             return true;
         }
         if (cell->first_covered != FinalCellWithSlabs::kNone)
         {
-            id = cell->first_covered;
+            polygon_index = cell->first_covered;
             return true;
         }
     }
@@ -172,10 +172,10 @@ DictionaryPtr createLayout(const std::string & ,
     const String name = config.getString(config_prefix + ".name");
 
     if (!dict_struct.key)
-        throw Exception{"'key' is required for a polygon dictionary", ErrorCodes::BAD_ARGUMENTS};
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "'key' is required for a polygon dictionary");
     if (dict_struct.key->size() != 1)
-        throw Exception{"The 'key' should consist of a single attribute for a polygon dictionary",
-                        ErrorCodes::BAD_ARGUMENTS};
+        throw Exception(ErrorCodes::BAD_ARGUMENTS,
+            "The 'key' should consist of a single attribute for a polygon dictionary");
 
     IPolygonDictionary::InputType input_type;
     IPolygonDictionary::PointType point_type;
@@ -206,19 +206,19 @@ DictionaryPtr createLayout(const std::string & ,
         point_type = IPolygonDictionary::PointType::Tuple;
     }
     else
-        throw Exception{"The key type " + key_type->getName() +
-                        " is not one of the following allowed types for a polygon dictionary: " +
-                        multi_polygon_array.getName() + " " +
-                        multi_polygon_tuple.getName() + " " +
-                        simple_polygon_array.getName() + " " +
-                        simple_polygon_tuple.getName() + " ",
-                        ErrorCodes::BAD_ARGUMENTS};
+        throw Exception(ErrorCodes::BAD_ARGUMENTS,
+            "The key type {} is not one of the following allowed types for a polygon dictionary: {} {} {} {} ",
+            key_type->getName(),
+            multi_polygon_array.getName(),
+            multi_polygon_tuple.getName(),
+            simple_polygon_array.getName(),
+            simple_polygon_tuple.getName());
 
     if (dict_struct.range_min || dict_struct.range_max)
-        throw Exception{name
-                        + ": elements range_min and range_max should be defined only "
-                          "for a dictionary of layout 'range_hashed'",
-                        ErrorCodes::BAD_ARGUMENTS};
+        throw Exception(ErrorCodes::BAD_ARGUMENTS,
+            "{}: elements range_min and range_max should be defined only "
+            "for a dictionary of layout 'range_hashed'",
+            name);
 
     const DictionaryLifetime dict_lifetime{config, config_prefix + ".lifetime"};
 
diff --git a/src/Dictionaries/PolygonDictionaryImplementations.h b/src/Dictionaries/PolygonDictionaryImplementations.h
index 24910c23430..b49bf3f4d6c 100644
--- a/src/Dictionaries/PolygonDictionaryImplementations.h
+++ b/src/Dictionaries/PolygonDictionaryImplementations.h
@@ -27,7 +27,7 @@ public:
     std::shared_ptr<const IExternalLoadable> clone() const override;
 
 private:
-    bool find(const Point & point, size_t & id) const override;
+    bool find(const Point & point, size_t & polygon_index) const override;
 };
 
 /** A polygon dictionary which generates a recursive grid in order to efficiently cut the number
@@ -55,7 +55,7 @@ public:
     static constexpr size_t kMaxDepthDefault = 5;
 
 private:
-    bool find(const Point & point, size_t & id) const override;
+    bool find(const Point & point, size_t & polygon_index) const override;
 
     std::vector<SlabsPolygonIndex> buckets;
     GridRoot<FinalCell> grid;
@@ -84,7 +84,7 @@ public:
     static constexpr size_t kMaxDepthDefault = 5;
 
 private:
-    bool find(const Point & point, size_t & id) const override;
+    bool find(const Point & point, size_t & polygon_index) const override;
 
     GridRoot<FinalCellWithSlabs> index;
 
diff --git a/src/Dictionaries/PolygonDictionaryUtils.cpp b/src/Dictionaries/PolygonDictionaryUtils.cpp
index e35016aaef2..2575affbb56 100644
--- a/src/Dictionaries/PolygonDictionaryUtils.cpp
+++ b/src/Dictionaries/PolygonDictionaryUtils.cpp
@@ -90,7 +90,6 @@ std::vector<Coord> SlabsPolygonIndex::uniqueX(const std::vector<Polygon> & polyg
     std::sort(all_x.begin(), all_x.end());
     all_x.erase(std::unique(all_x.begin(), all_x.end()), all_x.end());
 
-    LOG_TRACE(log, "Found {} unique x coordinates", all_x.size());
     return all_x;
 }
 
@@ -112,8 +111,6 @@ void SlabsPolygonIndex::indexBuild(const std::vector<Polygon> & polygons)
     /** Total number of edges */
     size_t m = all_edges.size();
 
-    LOG_TRACE(log, "Just sorted {} edges from all {} polygons", all_edges.size(), polygons.size());
-
     /** Using custom comparator for fetching edges in right_point order, like in scanline */
     auto cmp = [](const Edge & a, const Edge & b)
     {
@@ -180,8 +177,6 @@ void SlabsPolygonIndex::indexBuild(const std::vector<Polygon> & polygons)
             }
         }
     }
-
-    LOG_TRACE(log, "Polygon index is built, total_index_edges = {}", total_index_edges);
 }
 
 void SlabsPolygonIndex::indexAddRing(const Ring & ring, size_t polygon_id)
diff --git a/src/Dictionaries/PolygonDictionaryUtils.h b/src/Dictionaries/PolygonDictionaryUtils.h
index cd99717f98a..865d78a7cad 100644
--- a/src/Dictionaries/PolygonDictionaryUtils.h
+++ b/src/Dictionaries/PolygonDictionaryUtils.h
@@ -73,7 +73,7 @@ public:
 
 private:
     /** Returns unique x coordinates among all points */
-    std::vector<Coord> uniqueX(const std::vector<Polygon> & polygons);
+    static std::vector<Coord> uniqueX(const std::vector<Polygon> & polygons);
 
     /** Builds index described above */
     void indexBuild(const std::vector<Polygon> & polygons);
diff --git a/src/Dictionaries/PostgreSQLDictionarySource.cpp b/src/Dictionaries/PostgreSQLDictionarySource.cpp
index aa852404750..54022dfd5cb 100644
--- a/src/Dictionaries/PostgreSQLDictionarySource.cpp
+++ b/src/Dictionaries/PostgreSQLDictionarySource.cpp
@@ -8,7 +8,6 @@
 #include <Columns/ColumnString.h>
 #include <DataTypes/DataTypeString.h>
 #include <DataStreams/PostgreSQLBlockInputStream.h>
-#include <Storages/PostgreSQL/PostgreSQLConnection.h>
 #include "readInvalidateQuery.h"
 #endif
 
@@ -29,11 +28,10 @@ PostgreSQLDictionarySource::PostgreSQLDictionarySource(
     const DictionaryStructure & dict_struct_,
     const Poco::Util::AbstractConfiguration & config_,
     const std::string & config_prefix,
-    PostgreSQLConnectionPtr connection_,
     const Block & sample_block_)
     : dict_struct{dict_struct_}
     , sample_block(sample_block_)
-    , connection(std::move(connection_))
+    , connection(std::make_shared<postgres::PoolWithFailover>(config_, config_prefix))
     , log(&Poco::Logger::get("PostgreSQLDictionarySource"))
     , db(config_.getString(fmt::format("{}.db", config_prefix), ""))
     , table(config_.getString(fmt::format("{}.table", config_prefix), ""))
@@ -50,7 +48,7 @@ PostgreSQLDictionarySource::PostgreSQLDictionarySource(
 PostgreSQLDictionarySource::PostgreSQLDictionarySource(const PostgreSQLDictionarySource & other)
     : dict_struct(other.dict_struct)
     , sample_block(other.sample_block)
-    , connection(std::make_shared<PostgreSQLConnection>(other.connection->conn_str()))
+    , connection(other.connection)
     , log(&Poco::Logger::get("PostgreSQLDictionarySource"))
     , db(other.db)
     , table(other.table)
@@ -68,8 +66,7 @@ PostgreSQLDictionarySource::PostgreSQLDictionarySource(const PostgreSQLDictionar
 BlockInputStreamPtr PostgreSQLDictionarySource::loadAll()
 {
     LOG_TRACE(log, load_all_query);
-    return std::make_shared<PostgreSQLBlockInputStream>(
-            connection->conn(), load_all_query, sample_block, max_block_size);
+    return loadBase(load_all_query);
 }
 
 
@@ -77,23 +74,28 @@ BlockInputStreamPtr PostgreSQLDictionarySource::loadUpdatedAll()
 {
     auto load_update_query = getUpdateFieldAndDate();
     LOG_TRACE(log, load_update_query);
-    return std::make_shared<PostgreSQLBlockInputStream>(connection->conn(), load_update_query, sample_block, max_block_size);
+    return loadBase(load_update_query);
 }
 
 BlockInputStreamPtr PostgreSQLDictionarySource::loadIds(const std::vector<UInt64> & ids)
 {
     const auto query = query_builder.composeLoadIdsQuery(ids);
-    return std::make_shared<PostgreSQLBlockInputStream>(connection->conn(), query, sample_block, max_block_size);
+    return loadBase(query);
 }
 
 
 BlockInputStreamPtr PostgreSQLDictionarySource::loadKeys(const Columns & key_columns, const std::vector<size_t> & requested_rows)
 {
     const auto query = query_builder.composeLoadKeysQuery(key_columns, requested_rows, ExternalQueryBuilder::AND_OR_CHAIN);
-    return std::make_shared<PostgreSQLBlockInputStream>(connection->conn(), query, sample_block, max_block_size);
+    return loadBase(query);
 }
 
 
+BlockInputStreamPtr PostgreSQLDictionarySource::loadBase(const String & query)
+{
+    return std::make_shared<PostgreSQLBlockInputStream>(connection->get(), query, sample_block, max_block_size);
+}
+
 bool PostgreSQLDictionarySource::isModified() const
 {
     if (!invalidate_query.empty())
@@ -112,7 +114,7 @@ std::string PostgreSQLDictionarySource::doInvalidateQuery(const std::string & re
     Block invalidate_sample_block;
     ColumnPtr column(ColumnString::create());
     invalidate_sample_block.insert(ColumnWithTypeAndName(column, std::make_shared<DataTypeString>(), "Sample Block"));
-    PostgreSQLBlockInputStream block_input_stream(connection->conn(), request, invalidate_sample_block, 1);
+    PostgreSQLBlockInputStream block_input_stream(connection->get(), request, invalidate_sample_block, 1);
     return readInvalidateQuery(block_input_stream);
 }
 
@@ -127,10 +129,9 @@ std::string PostgreSQLDictionarySource::getUpdateFieldAndDate()
 {
     if (update_time != std::chrono::system_clock::from_time_t(0))
     {
-        auto tmp_time = update_time;
+        time_t hr_time = std::chrono::system_clock::to_time_t(update_time) - 1;
+        std::string str_time = DateLUT::instance().timeToString(hr_time);
         update_time = std::chrono::system_clock::now();
-        time_t hr_time = std::chrono::system_clock::to_time_t(tmp_time) - 1;
-        std::string str_time = std::to_string(LocalDateTime(hr_time));
         return query_builder.composeUpdateQuery(update_field, str_time);
     }
     else
@@ -166,28 +167,21 @@ void registerDictionarySourcePostgreSQL(DictionarySourceFactory & factory)
                                  const Poco::Util::AbstractConfiguration & config,
                                  const std::string & root_config_prefix,
                                  Block & sample_block,
-                                 const Context & /* context */,
+                                 ContextPtr /* context */,
                                  const std::string & /* default_database */,
                                  bool /* check_config */) -> DictionarySourcePtr
     {
 #if USE_LIBPQXX
         const auto config_prefix = root_config_prefix + ".postgresql";
-        auto connection = std::make_shared<PostgreSQLConnection>(
-            config.getString(fmt::format("{}.db", config_prefix), ""),
-            config.getString(fmt::format("{}.host", config_prefix), ""),
-            config.getUInt(fmt::format("{}.port", config_prefix), 0),
-            config.getString(fmt::format("{}.user", config_prefix), ""),
-            config.getString(fmt::format("{}.password", config_prefix), ""));
-
         return std::make_unique<PostgreSQLDictionarySource>(
-                dict_struct, config, config_prefix, connection, sample_block);
+                dict_struct, config, config_prefix, sample_block);
 #else
         (void)dict_struct;
         (void)config;
         (void)root_config_prefix;
         (void)sample_block;
-        throw Exception{"Dictionary source of type `postgresql` is disabled because ClickHouse was built without postgresql support.",
-                        ErrorCodes::SUPPORT_IS_DISABLED};
+        throw Exception(ErrorCodes::SUPPORT_IS_DISABLED,
+            "Dictionary source of type `postgresql` is disabled because ClickHouse was built without postgresql support.");
 #endif
     };
     factory.registerSource("postgresql", create_table_source);
diff --git a/src/Dictionaries/PostgreSQLDictionarySource.h b/src/Dictionaries/PostgreSQLDictionarySource.h
index a826ff15f4f..f1520a37a79 100644
--- a/src/Dictionaries/PostgreSQLDictionarySource.h
+++ b/src/Dictionaries/PostgreSQLDictionarySource.h
@@ -11,7 +11,7 @@
 #include <Core/Block.h>
 #include <common/LocalDateTime.h>
 #include <common/logger_useful.h>
-#include <Storages/StoragePostgreSQL.h>
+#include <Storages/PostgreSQL/PostgreSQLPoolWithFailover.h>
 #include <pqxx/pqxx>
 
 
@@ -26,7 +26,6 @@ public:
         const DictionaryStructure & dict_struct_,
         const Poco::Util::AbstractConfiguration & config_,
         const std::string & config_prefix,
-        PostgreSQLConnectionPtr connection_,
         const Block & sample_block_);
 
     /// copy-constructor is provided in order to support cloneability
@@ -48,10 +47,11 @@ public:
 private:
     std::string getUpdateFieldAndDate();
     std::string doInvalidateQuery(const std::string & request) const;
+    BlockInputStreamPtr loadBase(const String & query);
 
     const DictionaryStructure dict_struct;
     Block sample_block;
-    PostgreSQLConnectionPtr connection;
+    postgres::PoolWithFailoverPtr connection;
     Poco::Logger * log;
 
     const std::string db;
diff --git a/src/Dictionaries/RangeDictionaryBlockInputStream.h b/src/Dictionaries/RangeDictionaryBlockInputStream.h
index ccd77d49e0f..499eea7152f 100644
--- a/src/Dictionaries/RangeDictionaryBlockInputStream.h
+++ b/src/Dictionaries/RangeDictionaryBlockInputStream.h
@@ -17,14 +17,14 @@ namespace DB
  * BlockInputStream implementation for external dictionaries
  * read() returns single block consisting of the in-memory contents of the dictionaries
  */
-template <typename DictionaryType, typename RangeType, typename Key>
+template <typename RangeType>
 class RangeDictionaryBlockInputStream : public DictionaryBlockInputStreamBase
 {
 public:
-    using DictionaryPtr = std::shared_ptr<DictionaryType const>;
+    using Key = UInt64;
 
     RangeDictionaryBlockInputStream(
-        DictionaryPtr dictionary,
+        std::shared_ptr<const IDictionary> dictionary,
         size_t max_block_size,
         const Names & column_names,
         PaddedPODArray<Key> && ids_to_fill,
@@ -40,35 +40,26 @@ private:
     template <typename T>
     ColumnPtr getColumnFromPODArray(const PaddedPODArray<T> & array) const;
 
-    template <typename DictionarySpecialAttributeType, typename T>
-    void addSpecialColumn(
-        const std::optional<DictionarySpecialAttributeType> & attribute,
-        DataTypePtr type,
-        const std::string & default_name,
-        const std::unordered_set<std::string> & column_names_set,
-        const PaddedPODArray<T> & values,
-        ColumnsWithTypeAndName & columns,
-        bool force = false) const;
-
     Block fillBlock(
         const PaddedPODArray<Key> & ids_to_fill,
         const PaddedPODArray<RangeType> & block_start_dates,
         const PaddedPODArray<RangeType> & block_end_dates) const;
 
-    PaddedPODArray<Int64>
-    makeDateKey(const PaddedPODArray<RangeType> & block_start_dates, const PaddedPODArray<RangeType> & block_end_dates) const;
+    PaddedPODArray<Int64> makeDateKey(
+        const PaddedPODArray<RangeType> & block_start_dates,
+        const PaddedPODArray<RangeType> & block_end_dates) const;
 
-    DictionaryPtr dictionary;
-    Names column_names;
+    std::shared_ptr<const IDictionary> dictionary;
+    NameSet column_names;
     PaddedPODArray<Key> ids;
     PaddedPODArray<RangeType> start_dates;
     PaddedPODArray<RangeType> end_dates;
 };
 
 
-template <typename DictionaryType, typename RangeType, typename Key>
-RangeDictionaryBlockInputStream<DictionaryType, RangeType, Key>::RangeDictionaryBlockInputStream(
-    DictionaryPtr dictionary_,
+template <typename RangeType>
+RangeDictionaryBlockInputStream<RangeType>::RangeDictionaryBlockInputStream(
+    std::shared_ptr<const IDictionary> dictionary_,
     size_t max_block_size_,
     const Names & column_names_,
     PaddedPODArray<Key> && ids_,
@@ -76,15 +67,15 @@ RangeDictionaryBlockInputStream<DictionaryType, RangeType, Key>::RangeDictionary
     PaddedPODArray<RangeType> && block_end_dates)
     : DictionaryBlockInputStreamBase(ids_.size(), max_block_size_)
     , dictionary(dictionary_)
-    , column_names(column_names_)
+    , column_names(column_names_.begin(), column_names_.end())
     , ids(std::move(ids_))
     , start_dates(std::move(block_start_dates))
     , end_dates(std::move(block_end_dates))
 {
 }
 
-template <typename DictionaryType, typename RangeType, typename Key>
-Block RangeDictionaryBlockInputStream<DictionaryType, RangeType, Key>::getBlock(size_t start, size_t length) const
+template <typename RangeType>
+Block RangeDictionaryBlockInputStream<RangeType>::getBlock(size_t start, size_t length) const
 {
     PaddedPODArray<Key> block_ids;
     PaddedPODArray<RangeType> block_start_dates;
@@ -103,38 +94,19 @@ Block RangeDictionaryBlockInputStream<DictionaryType, RangeType, Key>::getBlock(
     return fillBlock(block_ids, block_start_dates, block_end_dates);
 }
 
-template <typename DictionaryType, typename RangeType, typename Key>
+template <typename RangeType>
 template <typename T>
-ColumnPtr RangeDictionaryBlockInputStream<DictionaryType, RangeType, Key>::getColumnFromPODArray(const PaddedPODArray<T> & array) const
+ColumnPtr RangeDictionaryBlockInputStream<RangeType>::getColumnFromPODArray(const PaddedPODArray<T> & array) const
 {
     auto column_vector = ColumnVector<T>::create();
     column_vector->getData().reserve(array.size());
-    for (T value : array)
-        column_vector->insertValue(value);
+    column_vector->getData().insert(array.begin(), array.end());
+
     return column_vector;
 }
 
-template <typename DictionaryType, typename RangeType, typename Key>
-template <typename DictionarySpecialAttributeType, typename T>
-void RangeDictionaryBlockInputStream<DictionaryType, RangeType, Key>::addSpecialColumn(
-    const std::optional<DictionarySpecialAttributeType> & attribute,
-    DataTypePtr type,
-    const std::string & default_name,
-    const std::unordered_set<std::string> & column_names_set,
-    const PaddedPODArray<T> & values,
-    ColumnsWithTypeAndName & columns,
-    bool force) const
-{
-    std::string name = default_name;
-    if (attribute)
-        name = attribute->name;
-
-    if (force || column_names_set.find(name) != column_names_set.end())
-        columns.emplace_back(getColumnFromPODArray(values), type, name);
-}
-
-template <typename DictionaryType, typename RangeType, typename Key>
-PaddedPODArray<Int64> RangeDictionaryBlockInputStream<DictionaryType, RangeType, Key>::makeDateKey(
+template <typename RangeType>
+PaddedPODArray<Int64> RangeDictionaryBlockInputStream<RangeType>::makeDateKey(
     const PaddedPODArray<RangeType> & block_start_dates, const PaddedPODArray<RangeType> & block_end_dates) const
 {
     PaddedPODArray<Int64> key(block_start_dates.size());
@@ -150,8 +122,8 @@ PaddedPODArray<Int64> RangeDictionaryBlockInputStream<DictionaryType, RangeType,
 }
 
 
-template <typename DictionaryType, typename RangeType, typename Key>
-Block RangeDictionaryBlockInputStream<DictionaryType, RangeType, Key>::fillBlock(
+template <typename RangeType>
+Block RangeDictionaryBlockInputStream<RangeType>::fillBlock(
     const PaddedPODArray<Key> & ids_to_fill,
     const PaddedPODArray<RangeType> & block_start_dates,
     const PaddedPODArray<RangeType> & block_end_dates) const
@@ -159,20 +131,32 @@ Block RangeDictionaryBlockInputStream<DictionaryType, RangeType, Key>::fillBlock
     ColumnsWithTypeAndName columns;
     const DictionaryStructure & structure = dictionary->getStructure();
 
-    std::unordered_set<std::string> names(column_names.begin(), column_names.end());
-
-    addSpecialColumn(structure.id, std::make_shared<DataTypeUInt64>(), "ID", names, ids_to_fill, columns, true);
-    auto ids_column = columns.back().column;
-    addSpecialColumn(structure.range_min, structure.range_max->type, "Range Start", names, block_start_dates, columns);
-    addSpecialColumn(structure.range_max, structure.range_max->type, "Range End", names, block_end_dates, columns);
+    auto ids_column = getColumnFromPODArray(ids_to_fill);
+    const std::string & id_column_name = structure.id->name;
+    if (column_names.find(id_column_name) != column_names.end())
+        columns.emplace_back(ids_column, std::make_shared<DataTypeUInt64>(), id_column_name);
 
     auto date_key = makeDateKey(block_start_dates, block_end_dates);
     auto date_column = getColumnFromPODArray(date_key);
 
+    const std::string & range_min_column_name = structure.range_min->name;
+    if (column_names.find(range_min_column_name) != column_names.end())
+    {
+        auto range_min_column = getColumnFromPODArray(block_start_dates);
+        columns.emplace_back(range_min_column, structure.range_max->type, range_min_column_name);
+    }
+
+    const std::string & range_max_column_name = structure.range_max->name;
+    if (column_names.find(range_max_column_name) != column_names.end())
+    {
+        auto range_max_column = getColumnFromPODArray(block_end_dates);
+        columns.emplace_back(range_max_column, structure.range_max->type, range_max_column_name);
+    }
+
     for (const auto idx : ext::range(0, structure.attributes.size()))
     {
         const DictionaryAttribute & attribute = structure.attributes[idx];
-        if (names.find(attribute.name) != names.end())
+        if (column_names.find(attribute.name) != column_names.end())
         {
             ColumnPtr column = dictionary->getColumn(
                 attribute.name,
diff --git a/src/Dictionaries/RangeHashedDictionary.cpp b/src/Dictionaries/RangeHashedDictionary.cpp
index 9fb1a57a381..1bdcd942b4a 100644
--- a/src/Dictionaries/RangeHashedDictionary.cpp
+++ b/src/Dictionaries/RangeHashedDictionary.cpp
@@ -52,7 +52,6 @@ namespace ErrorCodes
     extern const int DICTIONARY_IS_EMPTY;
     extern const int TYPE_MISMATCH;
     extern const int UNSUPPORTED_METHOD;
-    extern const int NOT_IMPLEMENTED;
 }
 
 bool RangeHashedDictionary::Range::isCorrectDate(const RangeStorageType & date)
@@ -77,7 +76,7 @@ RangeHashedDictionary::RangeHashedDictionary(
     DictionarySourcePtr source_ptr_,
     const DictionaryLifetime dict_lifetime_,
     bool require_nonempty_)
-    : IDictionaryBase(dict_id_)
+    : IDictionary(dict_id_)
     , dict_struct(dict_struct_)
     , source_ptr{std::move(source_ptr_)}
     , dict_lifetime(dict_lifetime_)
@@ -93,7 +92,7 @@ ColumnPtr RangeHashedDictionary::getColumn(
     const DataTypePtr & result_type,
     const Columns & key_columns,
     const DataTypes & key_types,
-    const ColumnPtr default_values_column) const
+    const ColumnPtr & default_values_column) const
 {
     ColumnPtr result;
 
@@ -178,10 +177,76 @@ ColumnPtr RangeHashedDictionary::getColumn(
     return result;
 }
 
-ColumnUInt8::Ptr RangeHashedDictionary::hasKeys(const Columns &, const DataTypes &) const
+ColumnUInt8::Ptr RangeHashedDictionary::hasKeys(const Columns & key_columns, const DataTypes & key_types) const
 {
-    throw Exception(ErrorCodes::NOT_IMPLEMENTED,
-        "Has not supported", getDictionaryID().getNameForLogs());
+    auto range_storage_column = key_columns[1];
+    ColumnWithTypeAndName column_to_cast = {range_storage_column->convertToFullColumnIfConst(), key_types[1], ""};
+
+    auto range_column_storage_type = std::make_shared<DataTypeInt64>();
+    auto range_column_updated = castColumnAccurate(column_to_cast, range_column_storage_type);
+
+    PaddedPODArray<UInt64> key_backup_storage;
+    PaddedPODArray<RangeStorageType> range_backup_storage;
+
+    const PaddedPODArray<UInt64> & ids = getColumnVectorData(this, key_columns[0], key_backup_storage);
+    const PaddedPODArray<RangeStorageType> & dates = getColumnVectorData(this, range_column_updated, range_backup_storage);
+
+    const auto & attribute = attributes.front();
+
+    ColumnUInt8::Ptr result;
+
+    auto type_call = [&](const auto & dictionary_attribute_type)
+    {
+        using Type = std::decay_t<decltype(dictionary_attribute_type)>;
+        using AttributeType = typename Type::AttributeType;
+        using ValueType = DictionaryValueType<AttributeType>;
+        result = hasKeysImpl<ValueType>(attribute, ids, dates);
+    };
+
+    callOnDictionaryAttributeType(attribute.type, type_call);
+
+    query_count.fetch_add(ids.size(), std::memory_order_relaxed);
+
+    return result;
+}
+
+template <typename AttributeType>
+ColumnUInt8::Ptr RangeHashedDictionary::hasKeysImpl(
+    const Attribute & attribute,
+    const PaddedPODArray<UInt64> & ids,
+    const PaddedPODArray<RangeStorageType> & dates) const
+{
+    auto result = ColumnUInt8::create(ids.size());
+    auto& out = result->getData();
+
+    const auto & attr = *std::get<Ptr<AttributeType>>(attribute.maps);
+
+    for (const auto row : ext::range(0, ids.size()))
+    {
+        const auto it = attr.find(ids[row]);
+
+        if (it)
+        {
+            const auto date = dates[row];
+            const auto & ranges_and_values = it->getMapped();
+            const auto val_it = std::find_if(
+                std::begin(ranges_and_values),
+                std::end(ranges_and_values),
+                [date](const Value<AttributeType> & v)
+                {
+                    return v.range.contains(date);
+                });
+
+            if (val_it != std::end(ranges_and_values))
+                out[row] = true;
+            else
+                out[row] = false;
+        }
+        else
+            out[row] = false;
+    }
+
+    return result;
 }
 
 void RangeHashedDictionary::createAttributes()
@@ -195,8 +260,8 @@ void RangeHashedDictionary::createAttributes()
         attributes.push_back(createAttribute(attribute, attribute.null_value));
 
         if (attribute.hierarchical)
-            throw Exception{ErrorCodes::BAD_ARGUMENTS, "Hierarchical attributes not supported by {} dictionary.",
-                            getDictionaryID().getNameForLogs()};
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Hierarchical attributes not supported by {} dictionary.",
+                            getDictionaryID().getNameForLogs());
     }
 }
 
@@ -246,8 +311,8 @@ void RangeHashedDictionary::loadData()
     stream->readSuffix();
 
     if (require_nonempty && 0 == element_count)
-        throw Exception{full_name + ": dictionary source is empty and 'require_nonempty' property is set.",
-                        ErrorCodes::DICTIONARY_IS_EMPTY};
+        throw Exception(ErrorCodes::DICTIONARY_IS_EMPTY,
+            "{}: dictionary source is empty and 'require_nonempty' property is set.");
 }
 
 template <typename T>
@@ -285,7 +350,7 @@ void RangeHashedDictionary::calculateBytesAllocated()
 template <typename T>
 void RangeHashedDictionary::createAttributeImpl(Attribute & attribute, const Field & null_value)
 {
-    attribute.null_values = T(null_value.get<NearestFieldType<T>>());
+    attribute.null_values = T(null_value.get<T>());
     attribute.maps = std::make_unique<Collection<T>>();
 }
 
@@ -323,10 +388,10 @@ void RangeHashedDictionary::getItemsImpl(
     ValueSetter && set_value,
     DefaultValueExtractor & default_value_extractor) const
 {
-    PaddedPODArray<Key> key_backup_storage;
+    PaddedPODArray<UInt64> key_backup_storage;
     PaddedPODArray<RangeStorageType> range_backup_storage;
 
-    const PaddedPODArray<Key> & ids = getColumnVectorData(this, key_columns[0], key_backup_storage);
+    const PaddedPODArray<UInt64> & ids = getColumnVectorData(this, key_columns[0], key_backup_storage);
     const PaddedPODArray<RangeStorageType> & dates = getColumnVectorData(this, key_columns[1], range_backup_storage);
 
     const auto & attr = *std::get<Ptr<AttributeType>>(attribute.maps);
@@ -371,7 +436,7 @@ void RangeHashedDictionary::getItemsImpl(
 
 
 template <typename T>
-void RangeHashedDictionary::setAttributeValueImpl(Attribute & attribute, const Key id, const Range & range, const Field & value)
+void RangeHashedDictionary::setAttributeValueImpl(Attribute & attribute, const UInt64 id, const Range & range, const Field & value)
 {
     using ValueType = std::conditional_t<std::is_same_v<T, String>, StringRef, T>;
     auto & map = *std::get<Ptr<ValueType>>(attribute.maps);
@@ -393,7 +458,7 @@ void RangeHashedDictionary::setAttributeValueImpl(Attribute & attribute, const K
         }
         else
         {
-            value_to_insert = Value<ValueType>{ range, { value.get<NearestFieldType<ValueType>>() }};
+            value_to_insert = Value<ValueType>{ range, { value.get<ValueType>() }};
         }
     }
 
@@ -415,7 +480,7 @@ void RangeHashedDictionary::setAttributeValueImpl(Attribute & attribute, const K
         map.insert({id, Values<ValueType>{std::move(value_to_insert)}});
 }
 
-void RangeHashedDictionary::setAttributeValue(Attribute & attribute, const Key id, const Range & range, const Field & value)
+void RangeHashedDictionary::setAttributeValue(Attribute & attribute, const UInt64 id, const Range & range, const Field & value)
 {
     auto type_call = [&](const auto &dictionary_attribute_type)
     {
@@ -432,7 +497,7 @@ const RangeHashedDictionary::Attribute & RangeHashedDictionary::getAttribute(con
 {
     const auto it = attribute_index_by_name.find(attribute_name);
     if (it == std::end(attribute_index_by_name))
-        throw Exception{full_name + ": no such attribute '" + attribute_name + "'", ErrorCodes::BAD_ARGUMENTS};
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "{}: no such attribute '{}'", full_name, attribute_name);
 
     return attributes[it->second];
 }
@@ -442,15 +507,18 @@ RangeHashedDictionary::getAttributeWithType(const std::string & attribute_name,
 {
     const auto & attribute = getAttribute(attribute_name);
     if (attribute.type != type)
-        throw Exception{attribute_name + ": type mismatch: attribute " + attribute_name + " has type " + toString(attribute.type),
-                        ErrorCodes::TYPE_MISMATCH};
+        throw Exception(ErrorCodes::TYPE_MISMATCH, "attribute {} has type {}",
+            attribute_name,
+            toString(attribute.type));
 
     return attribute;
 }
 
 template <typename RangeType>
 void RangeHashedDictionary::getIdsAndDates(
-    PaddedPODArray<Key> & ids, PaddedPODArray<RangeType> & start_dates, PaddedPODArray<RangeType> & end_dates) const
+    PaddedPODArray<UInt64> & ids,
+    PaddedPODArray<RangeType> & start_dates,
+    PaddedPODArray<RangeType> & end_dates) const
 {
     const auto & attribute = attributes.front();
 
@@ -458,11 +526,9 @@ void RangeHashedDictionary::getIdsAndDates(
     {
         using Type = std::decay_t<decltype(dictionary_attribute_type)>;
         using AttributeType = typename Type::AttributeType;
+        using ValueType = DictionaryValueType<AttributeType>;
 
-        if constexpr (std::is_same_v<AttributeType, String>)
-            getIdsAndDates<StringRef>(attribute, ids, start_dates, end_dates);
-        else
-            getIdsAndDates<AttributeType>(attribute, ids, start_dates, end_dates);
+        getIdsAndDates<ValueType>(attribute, ids, start_dates, end_dates);
     };
 
     callOnDictionaryAttributeType(attribute.type, type_call);
@@ -471,7 +537,7 @@ void RangeHashedDictionary::getIdsAndDates(
 template <typename T, typename RangeType>
 void RangeHashedDictionary::getIdsAndDates(
     const Attribute & attribute,
-    PaddedPODArray<Key> & ids,
+    PaddedPODArray<UInt64> & ids,
     PaddedPODArray<RangeType> & start_dates,
     PaddedPODArray<RangeType> & end_dates) const
 {
@@ -491,8 +557,9 @@ void RangeHashedDictionary::getIdsAndDates(
             start_dates.push_back(value.range.left);
             end_dates.push_back(value.range.right);
 
-            if (is_date && static_cast<UInt64>(end_dates.back()) > DATE_LUT_MAX_DAY_NUM)
-                end_dates.back() = 0;
+            if constexpr (std::numeric_limits<RangeType>::max() > DATE_LUT_MAX_DAY_NUM) /// Avoid warning about tautological comparison in next line.
+                if (is_date && static_cast<UInt64>(end_dates.back()) > DATE_LUT_MAX_DAY_NUM)
+                    end_dates.back() = 0;
         }
     }
 }
@@ -501,18 +568,25 @@ void RangeHashedDictionary::getIdsAndDates(
 template <typename RangeType>
 BlockInputStreamPtr RangeHashedDictionary::getBlockInputStreamImpl(const Names & column_names, size_t max_block_size) const
 {
-    PaddedPODArray<Key> ids;
+    PaddedPODArray<UInt64> ids;
     PaddedPODArray<RangeType> start_dates;
     PaddedPODArray<RangeType> end_dates;
     getIdsAndDates(ids, start_dates, end_dates);
 
-    using BlockInputStreamType = RangeDictionaryBlockInputStream<RangeHashedDictionary, RangeType, Key>;
-    auto dict_ptr = std::static_pointer_cast<const RangeHashedDictionary>(shared_from_this());
-    return std::make_shared<BlockInputStreamType>(
-        dict_ptr, max_block_size, column_names, std::move(ids), std::move(start_dates), std::move(end_dates));
+    using BlockInputStreamType = RangeDictionaryBlockInputStream<RangeType>;
+
+    auto stream = std::make_shared<BlockInputStreamType>(
+        shared_from_this(),
+        max_block_size,
+        column_names,
+        std::move(ids),
+        std::move(start_dates),
+        std::move(end_dates));
+
+    return stream;
 }
 
-struct RangeHashedDIctionaryCallGetBlockInputStreamImpl
+struct RangeHashedDictionaryCallGetBlockInputStreamImpl
 {
     BlockInputStreamPtr stream;
     const RangeHashedDictionary * dict;
@@ -532,7 +606,7 @@ BlockInputStreamPtr RangeHashedDictionary::getBlockInputStream(const Names & col
 {
     using ListType = TypeList<UInt8, UInt16, UInt32, UInt64, Int8, Int16, Int32, Int64, Int128, Float32, Float64>;
 
-    RangeHashedDIctionaryCallGetBlockInputStreamImpl callable;
+    RangeHashedDictionaryCallGetBlockInputStreamImpl callable;
     callable.dict = this;
     callable.column_names = &column_names;
     callable.max_block_size = max_block_size;
@@ -540,8 +614,9 @@ BlockInputStreamPtr RangeHashedDictionary::getBlockInputStream(const Names & col
     ListType::forEach(callable);
 
     if (!callable.stream)
-        throw Exception(
-            "Unexpected range type for RangeHashed dictionary: " + dict_struct.range_min->type->getName(), ErrorCodes::LOGICAL_ERROR);
+        throw Exception(ErrorCodes::LOGICAL_ERROR,
+            "Unexpected range type for RangeHashed dictionary: {}",
+            dict_struct.range_min->type->getName());
 
     return callable.stream;
 }
@@ -556,11 +631,12 @@ void registerDictionaryRangeHashed(DictionaryFactory & factory)
                              DictionarySourcePtr source_ptr) -> DictionaryPtr
     {
         if (dict_struct.key)
-            throw Exception{"'key' is not supported for dictionary of layout 'range_hashed'", ErrorCodes::UNSUPPORTED_METHOD};
+            throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "'key' is not supported for dictionary of layout 'range_hashed'");
 
         if (!dict_struct.range_min || !dict_struct.range_max)
-            throw Exception{full_name + ": dictionary of layout 'range_hashed' requires .structure.range_min and .structure.range_max",
-                            ErrorCodes::BAD_ARGUMENTS};
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                "{}: dictionary of layout 'range_hashed' requires .structure.range_min and .structure.range_max",
+                full_name);
 
         const auto dict_id = StorageID::fromDictionaryConfig(config, config_prefix);
         const DictionaryLifetime dict_lifetime{config, config_prefix + ".lifetime"};
diff --git a/src/Dictionaries/RangeHashedDictionary.h b/src/Dictionaries/RangeHashedDictionary.h
index 80cf47eb93b..8a286f530ba 100644
--- a/src/Dictionaries/RangeHashedDictionary.h
+++ b/src/Dictionaries/RangeHashedDictionary.h
@@ -16,7 +16,7 @@
 
 namespace DB
 {
-class RangeHashedDictionary final : public IDictionaryBase
+class RangeHashedDictionary final : public IDictionary
 {
 public:
     RangeHashedDictionary(
@@ -61,7 +61,7 @@ public:
         const DataTypePtr & result_type,
         const Columns & key_columns,
         const DataTypes & key_types,
-        const ColumnPtr default_values_column) const override;
+        const ColumnPtr & default_values_column) const override;
 
     ColumnUInt8::Ptr hasKeys(const Columns & key_columns, const DataTypes & key_types) const override;
 
@@ -93,8 +93,6 @@ private:
     template <typename T>
     using Ptr = std::unique_ptr<Collection<T>>;
 
-    using NullableSet = HashSet<Key, DefaultHash<Key>>;
-
     struct Attribute final
     {
     public:
@@ -114,6 +112,7 @@ private:
             Decimal32,
             Decimal64,
             Decimal128,
+            Decimal256,
             Float32,
             Float64,
             StringRef>
@@ -131,6 +130,7 @@ private:
             Ptr<Decimal32>,
             Ptr<Decimal64>,
             Ptr<Decimal128>,
+            Ptr<Decimal256>,
             Ptr<Float32>,
             Ptr<Float64>,
             Ptr<StringRef>>
@@ -159,29 +159,35 @@ private:
         ValueSetter && set_value,
         DefaultValueExtractor & default_value_extractor) const;
 
-    template <typename T>
-    static void setAttributeValueImpl(Attribute & attribute, const Key id, const Range & range, const Field & value);
+    template <typename AttributeType>
+    ColumnUInt8::Ptr hasKeysImpl(
+        const Attribute & attribute,
+        const PaddedPODArray<UInt64> & ids,
+        const PaddedPODArray<RangeStorageType> & dates) const;
 
-    static void setAttributeValue(Attribute & attribute, const Key id, const Range & range, const Field & value);
+    template <typename T>
+    static void setAttributeValueImpl(Attribute & attribute, const UInt64 id, const Range & range, const Field & value);
+
+    static void setAttributeValue(Attribute & attribute, const UInt64 id, const Range & range, const Field & value);
 
     const Attribute & getAttribute(const std::string & attribute_name) const;
 
     const Attribute & getAttributeWithType(const std::string & name, const AttributeUnderlyingType type) const;
 
     template <typename RangeType>
-    void getIdsAndDates(PaddedPODArray<Key> & ids, PaddedPODArray<RangeType> & start_dates, PaddedPODArray<RangeType> & end_dates) const;
+    void getIdsAndDates(PaddedPODArray<UInt64> & ids, PaddedPODArray<RangeType> & start_dates, PaddedPODArray<RangeType> & end_dates) const;
 
     template <typename T, typename RangeType>
     void getIdsAndDates(
         const Attribute & attribute,
-        PaddedPODArray<Key> & ids,
+        PaddedPODArray<UInt64> & ids,
         PaddedPODArray<RangeType> & start_dates,
         PaddedPODArray<RangeType> & end_dates) const;
 
     template <typename RangeType>
     BlockInputStreamPtr getBlockInputStreamImpl(const Names & column_names, size_t max_block_size) const;
 
-    friend struct RangeHashedDIctionaryCallGetBlockInputStreamImpl;
+    friend struct RangeHashedDictionaryCallGetBlockInputStreamImpl;
 
     const DictionaryStructure dict_struct;
     const DictionarySourcePtr source_ptr;
diff --git a/src/Dictionaries/RedisBlockInputStream.cpp b/src/Dictionaries/RedisBlockInputStream.cpp
index a5514d14155..f74ac348a99 100644
--- a/src/Dictionaries/RedisBlockInputStream.cpp
+++ b/src/Dictionaries/RedisBlockInputStream.cpp
@@ -57,7 +57,7 @@ namespace DB
         void insertValue(IColumn & column, const ValueType type, const Poco::Redis::BulkString & bulk_string)
         {
             if (bulk_string.isNull())
-                throw Exception{"Type mismatch, expected not Null String", ErrorCodes::TYPE_MISMATCH};
+                throw Exception(ErrorCodes::TYPE_MISMATCH, "Type mismatch, expected not Null String");
 
             const String & string_value = bulk_string.value();
             switch (type)
@@ -99,13 +99,22 @@ namespace DB
                     assert_cast<ColumnUInt16 &>(column).insertValue(parse<LocalDate>(string_value).getDayNum());
                     break;
                 case ValueType::vtDateTime:
-                    assert_cast<ColumnUInt32 &>(column).insertValue(static_cast<UInt32>(parse<LocalDateTime>(string_value)));
+                {
+                    ReadBufferFromString in(string_value);
+                    time_t time = 0;
+                    readDateTimeText(time, in);
+                    if (time < 0)
+                        time = 0;
+                    assert_cast<ColumnUInt32 &>(column).insertValue(time);
                     break;
+                }
                 case ValueType::vtUUID:
                     assert_cast<ColumnUInt128 &>(column).insertValue(parse<UUID>(string_value));
                     break;
                 default:
-                    throw Exception("Value of unsupported type:" + column.getName(), ErrorCodes::UNKNOWN_TYPE);
+                    throw Exception(ErrorCodes::UNKNOWN_TYPE,
+                        "Value of unsupported type: {}",
+                        column.getName());
             }
         }
     }
@@ -145,8 +154,9 @@ namespace DB
                 const auto & keys_array = keys.get<RedisArray>(cursor);
                 if (keys_array.size() < 2)
                 {
-                    throw Exception{"Too low keys in request to source: " + DB::toString(keys_array.size())
-                                    + ", expected 2 or more", ErrorCodes::LOGICAL_ERROR};
+                    throw Exception(ErrorCodes::LOGICAL_ERROR,
+                        "Too low keys in request to source: {}, expected 2 or more",
+                        DB::toString(keys_array.size()));
                 }
 
                 if (num_rows + keys_array.size() - 1 > max_block_size)
@@ -159,8 +169,8 @@ namespace DB
                 auto values = client->execute<RedisArray>(command_for_values);
 
                 if (keys_array.size() != values.size() + 1) // 'HMGET' primary_key secondary_keys
-                    throw Exception{"Inconsistent sizes of keys and values in Redis request",
-                                    ErrorCodes::NUMBER_OF_COLUMNS_DOESNT_MATCH};
+                    throw Exception(ErrorCodes::NUMBER_OF_COLUMNS_DOESNT_MATCH,
+                        "Inconsistent sizes of keys and values in Redis request");
 
                 const auto & primary_key = keys_array.get<RedisBulkString>(0);
                 for (size_t i = 0; i < values.size(); ++i)
@@ -189,7 +199,8 @@ namespace DB
 
             auto values = client->execute<RedisArray>(command_for_values);
             if (values.size() != need_values)
-                throw Exception{"Inconsistent sizes of keys and values in Redis request", ErrorCodes::INTERNAL_REDIS_ERROR};
+                throw Exception(ErrorCodes::INTERNAL_REDIS_ERROR,
+                    "Inconsistent sizes of keys and values in Redis request");
 
             for (size_t i = 0; i < values.size(); ++i)
             {
diff --git a/src/Dictionaries/RedisDictionarySource.cpp b/src/Dictionaries/RedisDictionarySource.cpp
index f1d0c0c5d3c..8144b37e63d 100644
--- a/src/Dictionaries/RedisDictionarySource.cpp
+++ b/src/Dictionaries/RedisDictionarySource.cpp
@@ -12,7 +12,7 @@ void registerDictionarySourceRedis(DictionarySourceFactory & factory)
                                    const Poco::Util::AbstractConfiguration & config,
                                    const String & config_prefix,
                                    Block & sample_block,
-                                   const Context & /* context */,
+                                   ContextPtr /* context */,
                                    const std::string & /* default_database */,
                                    bool /* check_config */) -> DictionarySourcePtr {
         return std::make_unique<RedisDictionarySource>(dict_struct, config, config_prefix + ".redis", sample_block);
@@ -66,25 +66,27 @@ namespace DB
             , client{std::make_shared<Poco::Redis::Client>(host, port)}
     {
         if (dict_struct.attributes.size() != 1)
-            throw Exception{"Invalid number of non key columns for Redis source: " +
-                            DB::toString(dict_struct.attributes.size()) + ", expected 1",
-                            ErrorCodes::INVALID_CONFIG_PARAMETER};
+            throw Exception(ErrorCodes::INVALID_CONFIG_PARAMETER,
+                "Invalid number of non key columns for Redis source: {}, expected 1",
+                DB::toString(dict_struct.attributes.size()));
 
         if (storage_type == RedisStorageType::HASH_MAP)
         {
             if (!dict_struct.key)
-                throw Exception{"Redis source with storage type \'hash_map\' must have key",
-                                ErrorCodes::INVALID_CONFIG_PARAMETER};
+                throw Exception(ErrorCodes::INVALID_CONFIG_PARAMETER,
+                    "Redis source with storage type \'hash_map\' must have key");
 
             if (dict_struct.key->size() != 2)
-                throw Exception{"Redis source with storage type \'hash_map\' requires 2 keys",
-                                ErrorCodes::INVALID_CONFIG_PARAMETER};
+                throw Exception(ErrorCodes::INVALID_CONFIG_PARAMETER,
+                    "Redis source with storage type \'hash_map\' requires 2 keys");
             // suppose key[0] is primary key, key[1] is secondary key
 
             for (const auto & key : *dict_struct.key)
                 if (!isInteger(key.type) && !isString(key.type))
                     throw Exception(ErrorCodes::INVALID_CONFIG_PARAMETER,
-                        "Redis source supports only integer or string key, but key '{}' of type {} given", key.name, key.type->getName());
+                        "Redis source supports only integer or string key, but key '{}' of type {} given",
+                        key.name,
+                        key.type->getName());
         }
 
         if (!password.empty())
@@ -93,8 +95,9 @@ namespace DB
             command << password;
             String reply = client->execute<String>(command);
             if (reply != "OK")
-                throw Exception{"Authentication failed with reason "
-                     + reply, ErrorCodes::INTERNAL_REDIS_ERROR};
+                throw Exception(ErrorCodes::INTERNAL_REDIS_ERROR,
+                    "Authentication failed with reason {}",
+                    reply);
         }
 
         if (db_index != 0)
@@ -103,8 +106,10 @@ namespace DB
             command << std::to_string(db_index);
             String reply = client->execute<String>(command);
             if (reply != "OK")
-                throw Exception{"Selecting database with index " + DB::toString(db_index)
-                    + " failed with reason " + reply, ErrorCodes::INTERNAL_REDIS_ERROR};
+                throw Exception(ErrorCodes::INTERNAL_REDIS_ERROR,
+                    "Selecting database with index {} failed with reason {}",
+                    DB::toString(db_index),
+                    reply);
         }
     }
 
@@ -215,10 +220,10 @@ namespace DB
             client->connect(host, port);
 
         if (storage_type == RedisStorageType::HASH_MAP)
-            throw Exception{"Cannot use loadIds with 'hash_map' storage type", ErrorCodes::UNSUPPORTED_METHOD};
+            throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "Cannot use loadIds with 'hash_map' storage type");
 
         if (!dict_struct.id)
-            throw Exception{"'id' is required for selective loading", ErrorCodes::UNSUPPORTED_METHOD};
+            throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "'id' is required for selective loading");
 
         RedisArray keys;
 
@@ -234,7 +239,7 @@ namespace DB
             client->connect(host, port);
 
         if (key_columns.size() != dict_struct.key->size())
-            throw Exception{"The size of key_columns does not equal to the size of dictionary key", ErrorCodes::LOGICAL_ERROR};
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "The size of key_columns does not equal to the size of dictionary key");
 
         RedisArray keys;
         for (auto row : requested_rows)
@@ -268,7 +273,7 @@ namespace DB
         if (storage_type_str == "hash_map")
             return RedisStorageType::HASH_MAP;
         else if (!storage_type_str.empty() && storage_type_str != "simple")
-            throw Exception("Unknown storage type " + storage_type_str + " for Redis dictionary", ErrorCodes::INVALID_CONFIG_PARAMETER);
+            throw Exception(ErrorCodes::INVALID_CONFIG_PARAMETER, "Unknown storage type {} for Redis dictionary", storage_type_str);
 
         return RedisStorageType::SIMPLE;
     }
diff --git a/src/Dictionaries/RedisDictionarySource.h b/src/Dictionaries/RedisDictionarySource.h
index 71d2a7e724a..b2c5859decd 100644
--- a/src/Dictionaries/RedisDictionarySource.h
+++ b/src/Dictionaries/RedisDictionarySource.h
@@ -63,7 +63,7 @@ namespace ErrorCodes
 
         BlockInputStreamPtr loadUpdatedAll() override
         {
-            throw Exception{"Method loadUpdatedAll is unsupported for RedisDictionarySource", ErrorCodes::NOT_IMPLEMENTED};
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method loadUpdatedAll is unsupported for RedisDictionarySource");
         }
 
         bool supportsSelectiveLoad() const override { return true; }
diff --git a/src/Dictionaries/SSDCacheDictionary.cpp b/src/Dictionaries/SSDCacheDictionary.cpp
deleted file mode 100644
index cbeea39decb..00000000000
--- a/src/Dictionaries/SSDCacheDictionary.cpp
+++ /dev/null
@@ -1,1667 +0,0 @@
-#if defined(OS_LINUX) || defined(__FreeBSD__)
-
-#include "SSDCacheDictionary.h"
-
-#include <algorithm>
-#include <Columns/ColumnsNumber.h>
-#include <Common/typeid_cast.h>
-#include <Common/ProfileEvents.h>
-#include <Common/ProfilingScopedRWLock.h>
-#include <Common/MemorySanitizer.h>
-#include <DataStreams/IBlockInputStream.h>
-#include "DictionaryBlockInputStream.h"
-#include "DictionaryFactory.h"
-#include <IO/AIO.h>
-#include <IO/ReadHelpers.h>
-#include <IO/WriteHelpers.h>
-#include <ext/chrono_io.h>
-#include <ext/map.h>
-#include <ext/range.h>
-#include <ext/size.h>
-#include <ext/bit_cast.h>
-#include <filesystem>
-#include <city.h>
-#include <fcntl.h>
-#include <Functions/FunctionHelpers.h>
-#include <DataTypes/DataTypesDecimal.h>
-
-namespace ProfileEvents
-{
-    extern const Event DictCacheKeysRequested;
-    extern const Event DictCacheKeysRequestedMiss;
-    extern const Event DictCacheKeysRequestedFound;
-    extern const Event DictCacheKeysExpired;
-    extern const Event DictCacheKeysNotFound;
-    extern const Event DictCacheKeysHit;
-    extern const Event DictCacheRequestTimeNs;
-    extern const Event DictCacheRequests;
-    extern const Event DictCacheLockWriteNs;
-    extern const Event DictCacheLockReadNs;
-    extern const Event FileOpen;
-    extern const Event WriteBufferAIOWrite;
-    extern const Event WriteBufferAIOWriteBytes;
-}
-
-namespace CurrentMetrics
-{
-    extern const Metric DictCacheRequests;
-    extern const Metric Write;
-}
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int AIO_READ_ERROR;
-    extern const int AIO_WRITE_ERROR;
-    extern const int BAD_ARGUMENTS;
-    extern const int CACHE_DICTIONARY_UPDATE_FAIL;
-    extern const int CANNOT_ALLOCATE_MEMORY;
-    extern const int CANNOT_CREATE_DIRECTORY;
-    extern const int CANNOT_FSYNC;
-    extern const int CANNOT_IO_GETEVENTS;
-    extern const int CANNOT_IO_SUBMIT;
-    extern const int CANNOT_OPEN_FILE;
-    extern const int CORRUPTED_DATA;
-    extern const int FILE_DOESNT_EXIST;
-    extern const int LOGICAL_ERROR;
-    extern const int TYPE_MISMATCH;
-    extern const int UNSUPPORTED_METHOD;
-}
-
-namespace
-{
-    constexpr size_t DEFAULT_SSD_BLOCK_SIZE_BYTES = DEFAULT_AIO_FILE_BLOCK_SIZE;
-    constexpr size_t DEFAULT_FILE_SIZE_BYTES = 4 * 1024 * 1024 * 1024ULL;
-    constexpr size_t DEFAULT_PARTITIONS_COUNT = 16;
-    constexpr size_t DEFAULT_READ_BUFFER_SIZE_BYTES = 16 * DEFAULT_SSD_BLOCK_SIZE_BYTES;
-    constexpr size_t DEFAULT_WRITE_BUFFER_SIZE_BYTES = DEFAULT_SSD_BLOCK_SIZE_BYTES;
-
-    constexpr size_t DEFAULT_MAX_STORED_KEYS = 100000;
-
-    constexpr size_t BUFFER_ALIGNMENT = DEFAULT_AIO_FILE_BLOCK_SIZE;
-    constexpr size_t BLOCK_CHECKSUM_SIZE_BYTES = 8;
-    constexpr size_t BLOCK_SPECIAL_FIELDS_SIZE_BYTES = 4;
-
-    constexpr UInt64 KEY_METADATA_EXPIRES_AT_MASK = std::numeric_limits<std::chrono::system_clock::time_point::rep>::max();
-    constexpr UInt64 KEY_METADATA_IS_DEFAULT_MASK = ~KEY_METADATA_EXPIRES_AT_MASK;
-
-    constexpr size_t KEY_IN_MEMORY_BIT = 63;
-    constexpr size_t KEY_IN_MEMORY = (1ULL << KEY_IN_MEMORY_BIT);
-    constexpr size_t BLOCK_INDEX_BITS = 32;
-    constexpr size_t INDEX_IN_BLOCK_BITS = 16;
-    constexpr size_t INDEX_IN_BLOCK_MASK = (1ULL << INDEX_IN_BLOCK_BITS) - 1;
-    constexpr size_t BLOCK_INDEX_MASK = ((1ULL << (BLOCK_INDEX_BITS + INDEX_IN_BLOCK_BITS)) - 1) ^ INDEX_IN_BLOCK_MASK;
-
-    constexpr size_t NOT_EXISTS = -1;
-
-    constexpr UInt8 HAS_NOT_FOUND = 2;
-
-    const std::string BIN_FILE_EXT = ".bin";
-
-    int preallocateDiskSpace(int fd, size_t len)
-    {
-        #if defined(__FreeBSD__)
-            return posix_fallocate(fd, 0, len);
-        #else
-            return fallocate(fd, 0, 0, len);
-        #endif
-    }
-}
-
-SSDCachePartition::Metadata::time_point_t SSDCachePartition::Metadata::expiresAt() const
-{
-    return ext::safe_bit_cast<time_point_t>(data & KEY_METADATA_EXPIRES_AT_MASK);
-}
-
-void SSDCachePartition::Metadata::setExpiresAt(const time_point_t & t)
-{
-    data = ext::safe_bit_cast<time_point_urep_t>(t);
-}
-
-bool SSDCachePartition::Metadata::isDefault() const
-{
-    return (data & KEY_METADATA_IS_DEFAULT_MASK) == KEY_METADATA_IS_DEFAULT_MASK;
-}
-void SSDCachePartition::Metadata::setDefault()
-{
-    data |= KEY_METADATA_IS_DEFAULT_MASK;
-}
-
-bool SSDCachePartition::Index::inMemory() const
-{
-    return (index & KEY_IN_MEMORY) == KEY_IN_MEMORY;
-}
-
-bool SSDCachePartition::Index::exists() const
-{
-    return index != NOT_EXISTS;
-}
-
-void SSDCachePartition::Index::setNotExists()
-{
-    index = NOT_EXISTS;
-}
-
-void SSDCachePartition::Index::setInMemory(const bool in_memory)
-{
-    index = (index & ~KEY_IN_MEMORY) | (static_cast<size_t>(in_memory) << KEY_IN_MEMORY_BIT);
-}
-
-size_t SSDCachePartition::Index::getAddressInBlock() const
-{
-    return index & INDEX_IN_BLOCK_MASK;
-}
-
-void SSDCachePartition::Index::setAddressInBlock(const size_t address_in_block)
-{
-    index = (index & ~INDEX_IN_BLOCK_MASK) | address_in_block;
-}
-
-size_t SSDCachePartition::Index::getBlockId() const
-{
-    return (index & BLOCK_INDEX_MASK) >> INDEX_IN_BLOCK_BITS;
-}
-
-void SSDCachePartition::Index::setBlockId(const size_t block_id)
-{
-    index = (index & ~BLOCK_INDEX_MASK) | (block_id << INDEX_IN_BLOCK_BITS);
-}
-
-SSDCachePartition::SSDCachePartition(
-        const AttributeUnderlyingType & /* key_structure */,
-        const std::vector<AttributeUnderlyingType> & attributes_structure_,
-        const std::string & dir_path,
-        const size_t file_id_,
-        const size_t max_size_,
-        const size_t block_size_,
-        const size_t read_buffer_size_,
-        const size_t write_buffer_size_,
-        const size_t max_stored_keys_)
-    : file_id(file_id_)
-    , max_size(max_size_)
-    , block_size(block_size_)
-    , read_buffer_size(read_buffer_size_)
-    , write_buffer_size(write_buffer_size_)
-    , max_stored_keys(max_stored_keys_)
-    , path(dir_path + "/" + std::to_string(file_id))
-    , key_to_index(max_stored_keys)
-    , attributes_structure(attributes_structure_)
-{
-    keys_buffer.type = AttributeUnderlyingType::utUInt64;
-    keys_buffer.values = SSDCachePartition::Attribute::Container<UInt64>();
-
-    if (!std::filesystem::create_directories(std::filesystem::path{dir_path}))
-    {
-        if (std::filesystem::exists(std::filesystem::path{dir_path}))
-            LOG_INFO(&Poco::Logger::get("SSDCachePartition::Constructor"), "Using existing directory '{}' for cache-partition", dir_path);
-        else
-            throw Exception{"Failed to create directories.", ErrorCodes::CANNOT_CREATE_DIRECTORY};
-    }
-
-    {
-        ProfileEvents::increment(ProfileEvents::FileOpen);
-
-        const std::string filename = path + BIN_FILE_EXT;
-        fd = ::open(filename.c_str(), O_RDWR | O_CREAT | O_TRUNC | O_DIRECT, 0666);
-        if (fd == -1)
-        {
-            auto error_code = (errno == ENOENT) ? ErrorCodes::FILE_DOESNT_EXIST : ErrorCodes::CANNOT_OPEN_FILE;
-            throwFromErrnoWithPath("Cannot open file " + filename, filename, error_code);
-        }
-
-        if (preallocateDiskSpace(fd, max_size * block_size) < 0)
-        {
-            throwFromErrnoWithPath("Cannot preallocate space for the file " + filename, filename, ErrorCodes::CANNOT_ALLOCATE_MEMORY);
-        }
-    }
-}
-
-SSDCachePartition::~SSDCachePartition()
-{
-    std::unique_lock lock(rw_lock);
-    ::close(fd);
-}
-
-size_t SSDCachePartition::appendDefaults(
-    const Attribute & new_keys, const PaddedPODArray<Metadata> & metadata, const size_t begin)
-{
-    return appendBlock(new_keys, Attributes{}, metadata, begin);
-}
-
-size_t SSDCachePartition::appendBlock(
-    const Attribute & new_keys, const Attributes & new_attributes, const PaddedPODArray<Metadata> & metadata, const size_t begin)
-{
-    std::unique_lock lock(rw_lock);
-    if (!new_attributes.empty() && new_attributes.size() != attributes_structure.size())
-        throw Exception{"Wrong columns number in block.", ErrorCodes::BAD_ARGUMENTS};
-
-    const auto & ids = std::get<Attribute::Container<UInt64>>(new_keys.values);
-    auto & ids_buffer = std::get<Attribute::Container<UInt64>>(keys_buffer.values);
-
-    if (!memory)
-        memory.emplace(block_size * write_buffer_size, BUFFER_ALIGNMENT);
-
-    auto init_write_buffer = [&]()
-    {
-        write_buffer.emplace(memory->data() + current_memory_block_id * block_size, block_size);
-        uint64_t tmp = 0;
-        write_buffer->write(reinterpret_cast<char*>(&tmp), BLOCK_CHECKSUM_SIZE_BYTES);
-        write_buffer->write(reinterpret_cast<char*>(&tmp), BLOCK_SPECIAL_FIELDS_SIZE_BYTES);
-        keys_in_block = 0;
-    };
-
-    if (!write_buffer)
-        init_write_buffer();
-
-    bool flushed = false;
-    auto finish_block = [&]()
-    {
-        write_buffer.reset();
-        std::memcpy(memory->data() + block_size * current_memory_block_id + BLOCK_CHECKSUM_SIZE_BYTES, &keys_in_block, sizeof(keys_in_block)); // set count
-        uint64_t checksum = CityHash_v1_0_2::CityHash64(memory->data() + block_size * current_memory_block_id + BLOCK_CHECKSUM_SIZE_BYTES, block_size - BLOCK_CHECKSUM_SIZE_BYTES); // checksum
-        std::memcpy(memory->data() + block_size * current_memory_block_id, &checksum, sizeof(checksum));
-        if (++current_memory_block_id == write_buffer_size)
-            flush();
-        flushed = true;
-    };
-
-    for (size_t index = begin; index < ids.size();)
-    {
-        Index cache_index;
-        cache_index.setInMemory(true);
-        cache_index.setBlockId(current_memory_block_id);
-        if (current_memory_block_id >= write_buffer_size)
-            throw DB::Exception("lel " + std::to_string(current_memory_block_id) + " " +
-                std::to_string(write_buffer_size) + " " + std::to_string(index), ErrorCodes::LOGICAL_ERROR);
-
-        cache_index.setAddressInBlock(write_buffer->offset());
-
-        flushed = false;
-        if (2 * sizeof(UInt64) > write_buffer->available()) // place for key and metadata
-        {
-            finish_block();
-        }
-        else
-        {
-            writeBinary(ids[index], *write_buffer);
-            writeBinary(metadata[index].data, *write_buffer);
-        }
-
-        for (const auto & attribute : new_attributes)
-        {
-            if (flushed)
-                break;
-            switch (attribute.type)
-            {
-#define DISPATCH(TYPE) \
-            case AttributeUnderlyingType::ut##TYPE: \
-                { \
-                    if (sizeof(TYPE) > write_buffer->available()) \
-                    { \
-                        finish_block(); \
-                        continue; \
-                    } \
-                    else \
-                    { \
-                        const auto & values = std::get<Attribute::Container<TYPE>>(attribute.values); /* NOLINT */ \
-                        writeBinary(values[index], *write_buffer); \
-                    } \
-                } \
-                break;
-
-                DISPATCH(UInt8)
-                DISPATCH(UInt16)
-                DISPATCH(UInt32)
-                DISPATCH(UInt64)
-                DISPATCH(UInt128)
-                DISPATCH(Int8)
-                DISPATCH(Int16)
-                DISPATCH(Int32)
-                DISPATCH(Int64)
-                DISPATCH(Decimal32)
-                DISPATCH(Decimal64)
-                DISPATCH(Decimal128)
-                DISPATCH(Float32)
-                DISPATCH(Float64)
-#undef DISPATCH
-
-            case AttributeUnderlyingType::utString:
-                {
-                    const auto & value = std::get<Attribute::Container<String>>(attribute.values)[index];
-                    if (sizeof(UInt64) + value.size() > write_buffer->available())
-                    {
-                        finish_block();
-                        continue;
-                    }
-                    else
-                    {
-                        writeStringBinary(value, *write_buffer);
-                    }
-                }
-                break;
-            }
-        }
-
-        if (!flushed)
-        {
-            key_to_index.set(ids[index], cache_index);
-            ids_buffer.push_back(ids[index]);
-            ++index;
-            ++keys_in_block;
-        }
-        else  // next block in write buffer or flushed to ssd
-        {
-            init_write_buffer();
-        }
-    }
-    return ids.size() - begin;
-}
-
-void SSDCachePartition::flush()
-{
-    if (current_file_block_id >= max_size)
-        clearOldestBlocks();
-
-    const auto & ids = std::get<Attribute::Container<UInt64>>(keys_buffer.values);
-    if (ids.empty())
-        return;
-    LOG_INFO(&Poco::Logger::get("SSDCachePartition::flush()"), "Flushing to Disk.");
-
-    AIOContext aio_context{1};
-
-    iocb write_request{};
-    iocb * write_request_ptr{&write_request};
-
-#if defined(__FreeBSD__)
-    write_request.aio.aio_lio_opcode = LIO_WRITE;
-    write_request.aio.aio_fildes = fd;
-    write_request.aio.aio_buf = reinterpret_cast<volatile void *>(memory->data());
-    write_request.aio.aio_nbytes = block_size * write_buffer_size;
-    write_request.aio.aio_offset = (current_file_block_id % max_size) * block_size;
-#else
-    write_request.aio_lio_opcode = IOCB_CMD_PWRITE;
-    write_request.aio_fildes = fd;
-    write_request.aio_buf = reinterpret_cast<UInt64>(memory->data());
-    write_request.aio_nbytes = block_size * write_buffer_size;
-    write_request.aio_offset = (current_file_block_id % max_size) * block_size;
-#endif
-
-    while (io_submit(aio_context.ctx, 1, &write_request_ptr) < 0)
-    {
-        if (errno != EINTR)
-            throw Exception("Cannot submit request for asynchronous IO on file " + path + BIN_FILE_EXT, ErrorCodes::CANNOT_IO_SUBMIT);
-    }
-
-    CurrentMetrics::Increment metric_increment_write{CurrentMetrics::Write};
-
-    io_event event;
-    while (io_getevents(aio_context.ctx, 1, 1, &event, nullptr) < 0)
-    {
-        if (errno != EINTR)
-            throw Exception("Failed to wait for asynchronous IO completion on file " + path + BIN_FILE_EXT, ErrorCodes::CANNOT_IO_GETEVENTS);
-    }
-
-    // Unpoison the memory returned from an uninstrumented system function.
-    __msan_unpoison(&event, sizeof(event));
-
-    ssize_t  bytes_written;
-#if defined(__FreeBSD__)
-    bytes_written = aio_return(reinterpret_cast<struct aiocb *>(event.udata));
-#else
-    bytes_written = event.res;
-#endif
-
-    ProfileEvents::increment(ProfileEvents::WriteBufferAIOWrite);
-    ProfileEvents::increment(ProfileEvents::WriteBufferAIOWriteBytes, bytes_written);
-
-    if (bytes_written != static_cast<decltype(bytes_written)>(block_size * write_buffer_size))
-        throw Exception("Not all data was written for asynchronous IO on file " + path + BIN_FILE_EXT + ". returned: " + std::to_string(bytes_written), ErrorCodes::AIO_WRITE_ERROR);
-
-    if (::fsync(fd) < 0)
-        throwFromErrnoWithPath("Cannot fsync " + path + BIN_FILE_EXT, path + BIN_FILE_EXT, ErrorCodes::CANNOT_FSYNC);
-
-    /// commit changes in index
-    for (const auto & id : ids)
-    {
-        Index index;
-        if (key_to_index.get(id, index))
-        {
-            if (index.inMemory()) // Row can be inserted in the buffer twice, so we need to move to ssd only the last index.
-            {
-                index.setInMemory(false);
-                index.setBlockId((current_file_block_id % max_size) + index.getBlockId());
-            }
-            key_to_index.set(id, index);
-        }
-    }
-
-    current_file_block_id += write_buffer_size;
-    current_memory_block_id = 0;
-
-    /// clear buffer
-    std::visit([](auto & attr) { attr.clear(); }, keys_buffer.values);
-}
-
-template <typename Out, typename GetDefault>
-void SSDCachePartition::getValue(const size_t attribute_index, const PaddedPODArray<UInt64> & ids,
-    ResultArrayType<Out> & out, std::vector<bool> & found, GetDefault & default_value_extractor,
-    std::chrono::system_clock::time_point now) const
-{
-    auto set_value = [&](const size_t index, ReadBuffer & buf)
-    {
-        buf.ignore(sizeof(Key)); // key
-        Metadata metadata;
-        readBinary(metadata.data, buf);
-        if (metadata.expiresAt() > now)
-        {
-            if (metadata.isDefault())
-                out[index] = default_value_extractor[index];
-            else
-            {
-                ignoreFromBufferToAttributeIndex(attribute_index, buf);
-                readBinary(out[index], buf);
-            }
-            found[index] = true;
-        }
-    };
-
-    getImpl(ids, set_value, found);
-}
-
-void SSDCachePartition::getString(const size_t attribute_index, const PaddedPODArray<UInt64> & ids,
-    StringRefs & refs, ArenaWithFreeLists & arena, std::vector<bool> & found, std::vector<size_t> & default_ids,
-    std::chrono::system_clock::time_point now) const
-{
-    auto set_value = [&](const size_t index, ReadBuffer & buf)
-    {
-        buf.ignore(sizeof(Key)); // key
-        Metadata metadata;
-        readBinary(metadata.data, buf);
-
-        if (metadata.expiresAt() > now)
-        {
-            if (metadata.isDefault())
-                default_ids.push_back(index);
-            else
-            {
-                ignoreFromBufferToAttributeIndex(attribute_index, buf);
-                size_t size = 0;
-                readVarUInt(size, buf);
-                char * string_ptr = arena.alloc(size);
-                memcpy(string_ptr, buf.position(), size);
-                refs[index].data = string_ptr;
-                refs[index].size = size;
-            }
-            found[index] = true;
-        }
-    };
-
-    getImpl(ids, set_value, found);
-}
-
-void SSDCachePartition::has(const PaddedPODArray<UInt64> & ids, ResultArrayType<UInt8> & out,
-    std::vector<bool> & found, std::chrono::system_clock::time_point now) const
-{
-    auto set_value = [&](const size_t index, ReadBuffer & buf)
-    {
-        buf.ignore(sizeof(Key)); // key
-        Metadata metadata;
-        readBinary(metadata.data, buf);
-
-        if (metadata.expiresAt() > now)
-            out[index] = !metadata.isDefault();
-    };
-
-    getImpl(ids, set_value, found);
-}
-
-template <typename SetFunc>
-void SSDCachePartition::getImpl(const PaddedPODArray<UInt64> & ids, SetFunc & set,
-    std::vector<bool> & found) const
-{
-    std::shared_lock lock(rw_lock);
-    PaddedPODArray<Index> indices(ids.size());
-    for (size_t i = 0; i < ids.size(); ++i)
-    {
-        Index index;
-        if (found[i])
-            indices[i].setNotExists();
-        else if (key_to_index.get(ids[i], index))
-        {
-            indices[i] = index;
-        }
-        else
-            indices[i].setNotExists();
-    }
-
-    getValueFromMemory(indices, set);
-    getValueFromStorage(indices, set);
-}
-
-template <typename SetFunc>
-void SSDCachePartition::getValueFromMemory(const PaddedPODArray<Index> & indices, SetFunc & set) const
-{
-    // Do not check checksum while reading from memory.
-    for (size_t i = 0; i < indices.size(); ++i)
-    {
-        const auto & index = indices[i];
-        if (index.exists() && index.inMemory())
-        {
-            const size_t offset = index.getBlockId() * block_size + index.getAddressInBlock();
-
-            ReadBufferFromMemory read_buffer(memory->data() + offset, block_size * write_buffer_size - offset);
-            set(i, read_buffer);
-        }
-    }
-}
-
-template <typename SetFunc>
-void SSDCachePartition::getValueFromStorage(const PaddedPODArray<Index> & indices, SetFunc & set) const
-{
-    std::vector<std::pair<Index, size_t>> index_to_out;
-    for (size_t i = 0; i < indices.size(); ++i)
-    {
-        const auto & index = indices[i];
-        if (index.exists() && !index.inMemory())
-            index_to_out.emplace_back(index, i);
-    }
-    if (index_to_out.empty())
-        return;
-
-    /// sort by (block_id, offset_in_block)
-    std::sort(std::begin(index_to_out), std::end(index_to_out));
-
-    Memory read_buffer(block_size * read_buffer_size, BUFFER_ALIGNMENT);
-
-    std::vector<iocb> requests;
-    std::vector<iocb*> pointers;
-    std::vector<std::vector<size_t>> blocks_to_indices;
-    requests.reserve(index_to_out.size());
-    pointers.reserve(index_to_out.size());
-    blocks_to_indices.reserve(index_to_out.size());
-    for (size_t i = 0; i < index_to_out.size(); ++i)
-    {
-        #if defined(__FreeBSD__)
-        const size_t back_offset = requests.empty() ? -1 : static_cast<size_t>(requests.back().aio.aio_offset);
-        #else
-        const size_t back_offset = requests.empty() ? -1 : static_cast<size_t>(requests.back().aio_offset);
-        #endif
-
-        if (!requests.empty() && back_offset == index_to_out[i].first.getBlockId() * block_size)
-        {
-            blocks_to_indices.back().push_back(i);
-            continue;
-        }
-
-        iocb request{};
-#if defined(__FreeBSD__)
-        request.aio.aio_lio_opcode = LIO_READ;
-        request.aio.aio_fildes = fd;
-        request.aio.aio_buf = reinterpret_cast<volatile void *>(
-            reinterpret_cast<UInt64>(read_buffer.data()) + block_size * (requests.size() % read_buffer_size));
-        request.aio.aio_nbytes = block_size;
-        request.aio.aio_offset = index_to_out[i].first.getBlockId() * block_size;
-        request.aio_data = requests.size();
-#else
-        request.aio_lio_opcode = IOCB_CMD_PREAD;
-        request.aio_fildes = fd;
-        request.aio_buf = reinterpret_cast<UInt64>(read_buffer.data()) + block_size * (requests.size() % read_buffer_size);
-        request.aio_nbytes = block_size;
-        request.aio_offset = index_to_out[i].first.getBlockId() * block_size;
-        request.aio_data = requests.size();
-#endif
-        requests.push_back(request);
-        pointers.push_back(&requests.back());
-        blocks_to_indices.emplace_back();
-        blocks_to_indices.back().push_back(i);
-    }
-
-    AIOContext aio_context(read_buffer_size);
-
-    std::vector<bool> processed(requests.size(), false);
-    std::vector<io_event> events(requests.size());
-    #if defined(__linux__)
-    for (auto & event : events)
-        event.res = -1;
-    #endif
-
-    size_t to_push = 0;
-    size_t to_pop = 0;
-    while (to_pop < requests.size())
-    {
-        int popped = 0;
-        while (to_pop < to_push && (popped = io_getevents(aio_context.ctx, to_push - to_pop, to_push - to_pop, &events[to_pop], nullptr)) <= 0)
-        {
-            if (errno != EINTR)
-                throwFromErrno("io_getevents: Failed to get an event for asynchronous IO", ErrorCodes::CANNOT_IO_GETEVENTS);
-        }
-
-        for (size_t i = to_pop; i < to_pop + popped; ++i)
-        {
-            const auto request_id = events[i].data;
-            const auto & request = requests[request_id];
-
-            #if defined(__FreeBSD__)
-            const auto bytes_written = aio_return(reinterpret_cast<struct aiocb *>(events[i].udata));
-            #else
-            const auto bytes_written = events[i].res;
-            #endif
-
-            if (bytes_written != static_cast<ssize_t>(block_size))
-            {
-                #if defined(__FreeBSD__)
-                    throw Exception("AIO failed to read file " + path + BIN_FILE_EXT + ".", ErrorCodes::AIO_READ_ERROR);
-                #else
-                    throw Exception("AIO failed to read file " + path + BIN_FILE_EXT + ". " +
-                        "request_id= " + std::to_string(request.aio_data) + "/ " + std::to_string(requests.size()) +
-                        ", aio_nbytes=" + std::to_string(request.aio_nbytes) + ", aio_offset=" + std::to_string(request.aio_offset) +
-                        ", returned=" + std::to_string(events[i].res) + ", errno=" + std::to_string(errno), ErrorCodes::AIO_READ_ERROR);
-                #endif
-            }
-            #if defined(__FreeBSD__)
-            const char* buf_ptr = reinterpret_cast<char *>(reinterpret_cast<UInt64>(request.aio.aio_buf));
-            #else
-            const auto* buf_ptr = reinterpret_cast<char *>(request.aio_buf);
-            #endif
-            __msan_unpoison(buf_ptr, block_size);
-            uint64_t checksum = 0;
-            ReadBufferFromMemory buf_special(buf_ptr, block_size);
-            readBinary(checksum, buf_special);
-            uint64_t calculated_checksum = CityHash_v1_0_2::CityHash64(buf_ptr + BLOCK_CHECKSUM_SIZE_BYTES, block_size - BLOCK_CHECKSUM_SIZE_BYTES);
-            if (checksum != calculated_checksum)
-            {
-                throw Exception("Cache data corrupted. From block = " + std::to_string(checksum) + " calculated = " + std::to_string(calculated_checksum) + ".", ErrorCodes::CORRUPTED_DATA);
-            }
-
-            for (const size_t idx : blocks_to_indices[request_id])
-            {
-                const auto & [file_index, out_index] = index_to_out[idx];
-                ReadBufferFromMemory buf(
-                        buf_ptr + file_index.getAddressInBlock(),
-                        block_size - file_index.getAddressInBlock());
-                set(out_index, buf);
-            }
-
-            processed[request_id] = true;
-        }
-
-        while (to_pop < requests.size() && processed[to_pop])
-            ++to_pop;
-
-        /// add new io tasks
-        const int new_tasks_count = std::min(read_buffer_size - (to_push - to_pop), requests.size() - to_push);
-
-        int pushed = 0;
-        while (new_tasks_count > 0 && (pushed = io_submit(aio_context.ctx, new_tasks_count, &pointers[to_push])) <= 0)
-        {
-            if (errno != EINTR)
-                throwFromErrno("io_submit: Failed to submit a request for asynchronous IO", ErrorCodes::CANNOT_IO_SUBMIT);
-        }
-        to_push += pushed;
-    }
-}
-
-void SSDCachePartition::clearOldestBlocks()
-{
-    // write_buffer_size, because we need to erase the whole buffer.
-    Memory read_buffer_memory(block_size * write_buffer_size, BUFFER_ALIGNMENT);
-
-    iocb request{};
-#if defined(__FreeBSD__)
-    request.aio.aio_lio_opcode = LIO_READ;
-    request.aio.aio_fildes = fd;
-    request.aio.aio_buf = reinterpret_cast<volatile void *>(reinterpret_cast<UInt64>(read_buffer_memory.data()));
-    request.aio.aio_nbytes = block_size * write_buffer_size;
-    request.aio.aio_offset = (current_file_block_id % max_size) * block_size;
-    request.aio_data = 0;
-#else
-    request.aio_lio_opcode = IOCB_CMD_PREAD;
-    request.aio_fildes = fd;
-    request.aio_buf = reinterpret_cast<UInt64>(read_buffer_memory.data());
-    request.aio_nbytes = block_size * write_buffer_size;
-    request.aio_offset = (current_file_block_id % max_size) * block_size;
-    request.aio_data = 0;
-#endif
-
-    {
-        iocb* request_ptr = &request;
-        io_event event{};
-        AIOContext aio_context(1);
-
-        while (io_submit(aio_context.ctx, 1, &request_ptr) != 1)
-        {
-            if (errno != EINTR)
-                throwFromErrno("io_submit: Failed to submit a request for asynchronous IO", ErrorCodes::CANNOT_IO_SUBMIT);
-        }
-
-        while (io_getevents(aio_context.ctx, 1, 1, &event, nullptr) != 1)
-        {
-            if (errno != EINTR)
-                throwFromErrno("io_getevents: Failed to get an event for asynchronous IO", ErrorCodes::CANNOT_IO_GETEVENTS);
-        }
-
-#if defined(__FreeBSD__)
-        if (aio_return(reinterpret_cast<struct aiocb *>(event.udata)) != static_cast<ssize_t>(request.aio.aio_nbytes))
-            throw Exception("GC: AIO failed to read file " + path + BIN_FILE_EXT + ".", ErrorCodes::AIO_READ_ERROR);
-#else
-        if (event.res != static_cast<ssize_t>(request.aio_nbytes))
-            throw Exception("GC: AIO failed to read file " + path + BIN_FILE_EXT + ". " +
-                "aio_nbytes=" + std::to_string(request.aio_nbytes) +
-                ", returned=" + std::to_string(event.res) + ".", ErrorCodes::AIO_READ_ERROR);
-#endif
-        __msan_unpoison(read_buffer_memory.data(), read_buffer_memory.size());
-    }
-
-    std::vector<UInt64> keys;
-    keys.reserve(write_buffer_size);
-
-    for (size_t i = 0; i < write_buffer_size; ++i)
-    {
-        ReadBufferFromMemory read_buffer(read_buffer_memory.data() + i * block_size, block_size);
-
-        uint64_t checksum = 0;
-        readBinary(checksum, read_buffer);
-        uint64_t calculated_checksum = CityHash_v1_0_2::CityHash64(read_buffer_memory.data() + i * block_size + BLOCK_CHECKSUM_SIZE_BYTES, block_size - BLOCK_CHECKSUM_SIZE_BYTES);
-        if (checksum != calculated_checksum)
-        {
-            throw Exception("Cache data corrupted. From block = " + std::to_string(checksum) + " calculated = " + std::to_string(calculated_checksum) + ".", ErrorCodes::CORRUPTED_DATA);
-        }
-
-        uint32_t keys_in_current_block = 0;
-        readBinary(keys_in_current_block, read_buffer);
-
-        for (uint32_t j = 0; j < keys_in_current_block; ++j)
-        {
-            keys.emplace_back();
-            readBinary(keys.back(), read_buffer);
-            Metadata metadata;
-            readBinary(metadata.data, read_buffer);
-
-            if (!metadata.isDefault())
-            {
-                for (const auto & attribute : attributes_structure)
-                {
-                    switch (attribute)
-                    {
-            #define DISPATCH(TYPE) \
-                    case AttributeUnderlyingType::ut##TYPE: \
-                        read_buffer.ignore(sizeof(TYPE)); \
-                        break;
-
-                        DISPATCH(UInt8)
-                        DISPATCH(UInt16)
-                        DISPATCH(UInt32)
-                        DISPATCH(UInt64)
-                        DISPATCH(UInt128)
-                        DISPATCH(Int8)
-                        DISPATCH(Int16)
-                        DISPATCH(Int32)
-                        DISPATCH(Int64)
-                        DISPATCH(Decimal32)
-                        DISPATCH(Decimal64)
-                        DISPATCH(Decimal128)
-                        DISPATCH(Float32)
-                        DISPATCH(Float64)
-            #undef DISPATCH
-
-                    case AttributeUnderlyingType::utString:
-                        {
-                            size_t size = 0;
-                            readVarUInt(size, read_buffer);
-                            read_buffer.ignore(size);
-                        }
-                        break;
-                    }
-                }
-            }
-        }
-    }
-
-    const size_t start_block = current_file_block_id % max_size;
-    const size_t finish_block = start_block + write_buffer_size;
-    for (const auto & key : keys)
-    {
-        Index index;
-        if (key_to_index.get(key, index))
-        {
-            size_t block_id = index.getBlockId();
-            if (start_block <= block_id && block_id < finish_block)
-                key_to_index.erase(key);
-        }
-    }
-}
-
-void SSDCachePartition::ignoreFromBufferToAttributeIndex(const size_t attribute_index, ReadBuffer & buf) const
-{
-    for (size_t i = 0; i < attribute_index; ++i)
-    {
-        switch (attributes_structure[i])
-        {
-#define DISPATCH(TYPE) \
-        case AttributeUnderlyingType::ut##TYPE: \
-            buf.ignore(sizeof(TYPE)); \
-            break;
-
-            DISPATCH(UInt8)
-            DISPATCH(UInt16)
-            DISPATCH(UInt32)
-            DISPATCH(UInt64)
-            DISPATCH(UInt128)
-            DISPATCH(Int8)
-            DISPATCH(Int16)
-            DISPATCH(Int32)
-            DISPATCH(Int64)
-            DISPATCH(Decimal32)
-            DISPATCH(Decimal64)
-            DISPATCH(Decimal128)
-            DISPATCH(Float32)
-            DISPATCH(Float64)
-#undef DISPATCH
-
-        case AttributeUnderlyingType::utString:
-            {
-                size_t size = 0;
-                readVarUInt(size, buf);
-                buf.ignore(size);
-            }
-            break;
-        }
-    }
-}
-
-size_t SSDCachePartition::getId() const
-{
-    return file_id;
-}
-
-double SSDCachePartition::getLoadFactor() const
-{
-    std::shared_lock lock(rw_lock);
-    return static_cast<double>(current_file_block_id) / max_size;
-}
-
-size_t SSDCachePartition::getElementCount() const
-{
-    std::shared_lock lock(rw_lock);
-    return key_to_index.size();
-}
-
-size_t SSDCachePartition::getBytesAllocated() const
-{
-    std::shared_lock lock(rw_lock);
-    return 16.5 * key_to_index.capacity() + (memory ? memory->size() : 0);
-}
-
-PaddedPODArray<SSDCachePartition::Key> SSDCachePartition::getCachedIds(const std::chrono::system_clock::time_point /* now */) const
-{
-    std::unique_lock lock(rw_lock); // Begin and end iterators can be changed.
-    PaddedPODArray<Key> array;
-    for (const auto & key : key_to_index.keys())
-        array.push_back(key);
-    return array;
-}
-
-void SSDCachePartition::remove()
-{
-    std::unique_lock lock(rw_lock);
-    std::filesystem::remove(std::filesystem::path(path + BIN_FILE_EXT));
-}
-
-SSDCacheStorage::SSDCacheStorage(
-        const AttributeTypes & attributes_structure_,
-        const std::string & path_,
-        const size_t max_partitions_count_,
-        const size_t file_size_,
-        const size_t block_size_,
-        const size_t read_buffer_size_,
-        const size_t write_buffer_size_,
-        const size_t max_stored_keys_)
-    : attributes_structure(attributes_structure_)
-    , path(path_)
-    , max_partitions_count(max_partitions_count_)
-    , file_size(file_size_)
-    , block_size(block_size_)
-    , read_buffer_size(read_buffer_size_)
-    , write_buffer_size(write_buffer_size_)
-    , max_stored_keys(max_stored_keys_)
-    , log(&Poco::Logger::get("SSDCacheStorage"))
-{
-}
-
-SSDCacheStorage::~SSDCacheStorage()
-{
-    std::unique_lock lock(rw_lock);
-    partition_delete_queue.splice(std::end(partition_delete_queue), partitions);
-    collectGarbage();
-}
-
-template <typename Out, typename GetDefault>
-void SSDCacheStorage::getValue(const size_t attribute_index, const PaddedPODArray<UInt64> & ids,
-      ResultArrayType<Out> & out, std::unordered_map<Key, std::vector<size_t>> & not_found,
-      GetDefault & default_value_extractor, std::chrono::system_clock::time_point now) const
-{
-    std::vector<bool> found(ids.size(), false);
-
-    {
-        std::shared_lock lock(rw_lock);
-        for (const auto & partition : partitions)
-            partition->getValue<Out>(attribute_index, ids, out, found, default_value_extractor, now);
-    }
-
-    for (size_t i = 0; i < ids.size(); ++i)
-        if (!found[i])
-            not_found[ids[i]].push_back(i);
-
-    query_count.fetch_add(ids.size(), std::memory_order_relaxed);
-    hit_count.fetch_add(ids.size() - not_found.size(), std::memory_order_release);
-}
-
-void SSDCacheStorage::getString(const size_t attribute_index, const PaddedPODArray<UInt64> & ids,
-    StringRefs & refs, ArenaWithFreeLists & arena, std::unordered_map<Key, std::vector<size_t>> & not_found,
-    std::vector<size_t> & default_ids, std::chrono::system_clock::time_point now) const
-{
-    std::vector<bool> found(ids.size(), false);
-
-    {
-        std::shared_lock lock(rw_lock);
-        for (const auto & partition : partitions)
-            partition->getString(attribute_index, ids, refs, arena, found, default_ids, now);
-    }
-
-    for (size_t i = 0; i < ids.size(); ++i)
-        if (!found[i])
-            not_found[ids[i]].push_back(i);
-
-    query_count.fetch_add(ids.size(), std::memory_order_relaxed);
-    hit_count.fetch_add(ids.size() - not_found.size(), std::memory_order_release);
-}
-
-void SSDCacheStorage::has(const PaddedPODArray<UInt64> & ids, ResultArrayType<UInt8> & out,
-     std::unordered_map<Key, std::vector<size_t>> & not_found, std::chrono::system_clock::time_point now) const
-{
-    for (size_t i = 0; i < ids.size(); ++i)
-        out[i] = HAS_NOT_FOUND;
-    std::vector<bool> found(ids.size(), false);
-
-    {
-        std::shared_lock lock(rw_lock);
-        for (const auto & partition : partitions)
-            partition->has(ids, out, found, now);
-
-        for (size_t i = 0; i < ids.size(); ++i)
-            if (out[i] == HAS_NOT_FOUND)
-                not_found[ids[i]].push_back(i);
-    }
-
-    query_count.fetch_add(ids.size(), std::memory_order_relaxed);
-    hit_count.fetch_add(ids.size() - not_found.size(), std::memory_order_release);
-}
-
-namespace
-{
-SSDCachePartition::Attributes createAttributesFromBlock(
-        const Block & block, const size_t begin_column, const std::vector<AttributeUnderlyingType> & structure)
-{
-    SSDCachePartition::Attributes attributes;
-
-    const auto columns = block.getColumns();
-    for (size_t i = 0; i < structure.size(); ++i)
-    {
-        const auto & column = columns[i + begin_column];
-        switch (structure[i])
-        {
-#define DISPATCH(TYPE) \
-        case AttributeUnderlyingType::ut##TYPE: \
-            { \
-                SSDCachePartition::Attribute::Container<TYPE> values(column->size()); \
-                memcpy(&values[0], column->getRawData().data, sizeof(TYPE) * values.size()); \
-                attributes.emplace_back(); \
-                attributes.back().type = structure[i]; \
-                attributes.back().values = std::move(values); \
-            } \
-            break;
-
-            DISPATCH(UInt8)
-            DISPATCH(UInt16)
-            DISPATCH(UInt32)
-            DISPATCH(UInt64)
-            DISPATCH(UInt128)
-            DISPATCH(Int8)
-            DISPATCH(Int16)
-            DISPATCH(Int32)
-            DISPATCH(Int64)
-            DISPATCH(Decimal32)
-            DISPATCH(Decimal64)
-            DISPATCH(Decimal128)
-            DISPATCH(Float32)
-            DISPATCH(Float64)
-#undef DISPATCH
-
-        case AttributeUnderlyingType::utString:
-            {
-                attributes.emplace_back();
-                SSDCachePartition::Attribute::Container<String> values(column->size());
-                for (size_t j = 0; j < column->size(); ++j)
-                {
-                    const auto ref = column->getDataAt(j);
-                    values[j].resize(ref.size);
-                    memcpy(values[j].data(), ref.data, ref.size);
-                }
-                attributes.back().type = structure[i];
-                attributes.back().values = std::move(values);
-            }
-            break;
-        }
-    }
-
-    return attributes;
-}
-}
-
-template <typename PresentIdHandler, typename AbsentIdHandler>
-void SSDCacheStorage::update(DictionarySourcePtr & source_ptr, const std::vector<Key> & requested_ids,
-        PresentIdHandler && on_updated, AbsentIdHandler && on_id_not_found,
-        const DictionaryLifetime lifetime)
-{
-    auto append_block = [this](const SSDCachePartition::Attribute & new_keys,
-            const SSDCachePartition::Attributes & new_attributes, const PaddedPODArray<SSDCachePartition::Metadata> & metadata)
-    {
-        size_t inserted = 0;
-        while (inserted < metadata.size())
-        {
-            if (!partitions.empty())
-                inserted += partitions.front()->appendBlock(new_keys, new_attributes, metadata, inserted);
-            if (inserted < metadata.size())
-            {
-                partitions.emplace_front(std::make_unique<SSDCachePartition>(
-                        AttributeUnderlyingType::utUInt64, attributes_structure, path,
-                        (partitions.empty() ? 0 : partitions.front()->getId() + 1),
-                        file_size, block_size, read_buffer_size, write_buffer_size, max_stored_keys));
-            }
-        }
-
-        collectGarbage();
-    };
-
-    CurrentMetrics::Increment metric_increment{CurrentMetrics::DictCacheRequests};
-    ProfileEvents::increment(ProfileEvents::DictCacheKeysRequested, requested_ids.size());
-
-    std::unordered_map<Key, UInt8> remaining_ids{requested_ids.size()};
-    for (const auto id : requested_ids)
-        remaining_ids.insert({id, 0});
-
-    const auto now = std::chrono::system_clock::now();
-
-    {
-        const ProfilingScopedWriteRWLock write_lock{rw_lock, ProfileEvents::DictCacheLockWriteNs};
-
-        if (now > backoff_end_time)
-        {
-            try
-            {
-                if (update_error_count)
-                {
-                    /// Recover after error: we have to clone the source here because
-                    /// it could keep connections which should be reset after error.
-                    source_ptr = source_ptr->clone();
-                }
-
-                Stopwatch watch;
-                auto stream = source_ptr->loadIds(requested_ids);
-                stream->readPrefix();
-
-                while (const auto block = stream->read())
-                {
-                    const auto new_keys = std::move(createAttributesFromBlock(block, 0, { AttributeUnderlyingType::utUInt64 }).front());
-                    const auto new_attributes = createAttributesFromBlock(block, 1, attributes_structure);
-
-                    const auto & ids = std::get<SSDCachePartition::Attribute::Container<UInt64>>(new_keys.values);
-
-                    PaddedPODArray<SSDCachePartition::Metadata> metadata(ids.size());
-
-                    for (const auto i : ext::range(0, ids.size()))
-                    {
-                        std::uniform_int_distribution<UInt64> distribution{lifetime.min_sec, lifetime.max_sec};
-                        metadata[i].setExpiresAt(now + std::chrono::seconds(distribution(rnd_engine)));
-                        /// mark corresponding id as found
-                        on_updated(ids[i], i, new_attributes);
-                        remaining_ids[ids[i]] = 1;
-                    }
-
-                    append_block(new_keys, new_attributes, metadata);
-                }
-
-                stream->readSuffix();
-
-                update_error_count = 0;
-                last_update_exception = std::exception_ptr{};
-                backoff_end_time = std::chrono::system_clock::time_point{};
-
-                ProfileEvents::increment(ProfileEvents::DictCacheRequestTimeNs, watch.elapsed());
-            }
-            catch (...)
-            {
-                ++update_error_count;
-                last_update_exception = std::current_exception();
-                backoff_end_time = now + std::chrono::seconds(calculateDurationWithBackoff(rnd_engine, update_error_count));
-
-                tryLogException(last_update_exception, log,
-                        "Could not update ssd cache dictionary, next update is scheduled at " + ext::to_string(backoff_end_time));
-            }
-        }
-    }
-
-    auto append_defaults = [this](const SSDCachePartition::Attribute & new_keys, const PaddedPODArray<SSDCachePartition::Metadata> & metadata)
-    {
-        size_t inserted = 0;
-        while (inserted < metadata.size())
-        {
-            if (!partitions.empty())
-                inserted += partitions.front()->appendDefaults(new_keys, metadata, inserted);
-            if (inserted < metadata.size())
-            {
-                partitions.emplace_front(std::make_unique<SSDCachePartition>(
-                        AttributeUnderlyingType::utUInt64, attributes_structure, path,
-                        (partitions.empty() ? 0 : partitions.front()->getId() + 1),
-                        file_size, block_size, read_buffer_size, write_buffer_size, max_stored_keys));
-            }
-        }
-
-        collectGarbage();
-    };
-
-    size_t not_found_num = 0, found_num = 0;
-    /// Check which ids have not been found and require setting null_value
-    SSDCachePartition::Attribute new_keys;
-    new_keys.type = AttributeUnderlyingType::utUInt64;
-    new_keys.values = SSDCachePartition::Attribute::Container<UInt64>();
-
-    PaddedPODArray<SSDCachePartition::Metadata> metadata;
-    {
-        const ProfilingScopedWriteRWLock write_lock{rw_lock, ProfileEvents::DictCacheLockWriteNs};
-
-        for (const auto & id_found_pair : remaining_ids)
-        {
-            if (id_found_pair.second)
-            {
-                ++found_num;
-                continue;
-            }
-            ++not_found_num;
-
-            const auto id = id_found_pair.first;
-
-            if (update_error_count)
-            {
-                /// TODO: use old values
-
-                // We don't have expired data for that `id` so all we can do is
-                // to rethrow `last_exception`. We might have to throw the same
-                // exception for different callers of dictGet() in different
-                // threads, which might then modify the exception object, so we
-                // have to throw a copy.
-                try
-                {
-                    std::rethrow_exception(last_update_exception);
-                }
-                catch (...)
-                {
-                    throw DB::Exception(ErrorCodes::CACHE_DICTIONARY_UPDATE_FAIL,
-                        "Update failed for dictionary '{}': {}",
-                        getPath(),
-                        getCurrentExceptionMessage(true /*with stack trace*/,
-                            true /*check embedded stack trace*/));
-                }
-            }
-
-            /// Set key
-            std::get<SSDCachePartition::Attribute::Container<UInt64>>(new_keys.values).push_back(id);
-
-            std::uniform_int_distribution<UInt64> distribution{lifetime.min_sec, lifetime.max_sec};
-            metadata.emplace_back();
-            metadata.back().setExpiresAt(now + std::chrono::seconds(distribution(rnd_engine)));
-            metadata.back().setDefault();
-
-            /// Inform caller that the cell has not been found
-            on_id_not_found(id);
-        }
-
-        if (not_found_num)
-            append_defaults(new_keys, metadata);
-    }
-
-    ProfileEvents::increment(ProfileEvents::DictCacheKeysRequestedMiss, not_found_num);
-    ProfileEvents::increment(ProfileEvents::DictCacheKeysRequestedFound, found_num);
-    ProfileEvents::increment(ProfileEvents::DictCacheRequests);
-}
-
-PaddedPODArray<SSDCachePartition::Key> SSDCacheStorage::getCachedIds() const
-{
-    PaddedPODArray<Key> array;
-
-    const auto now = std::chrono::system_clock::now();
-
-    std::shared_lock lock(rw_lock);
-    for (const auto & partition : partitions)
-    {
-        const auto cached_in_partition = partition->getCachedIds(now);
-        array.insert(std::begin(cached_in_partition), std::end(cached_in_partition));
-    }
-
-    return array;
-}
-
-double SSDCacheStorage::getLoadFactor() const
-{
-    double result = 0;
-    std::shared_lock lock(rw_lock);
-    for (const auto & partition : partitions)
-        result += partition->getLoadFactor();
-    return result / partitions.size();
-}
-
-size_t SSDCacheStorage::getElementCount() const
-{
-    size_t result = 0;
-    std::shared_lock lock(rw_lock);
-    for (const auto & partition : partitions)
-        result += partition->getElementCount();
-    return result;
-}
-
-size_t SSDCacheStorage::getBytesAllocated() const
-{
-    size_t result = 0;
-    std::shared_lock lock(rw_lock);
-    for (const auto & partition : partitions)
-        result += partition->getBytesAllocated();
-    return result;
-}
-
-void SSDCacheStorage::collectGarbage()
-{
-    // add partitions to queue
-    while (partitions.size() > max_partitions_count)
-        partition_delete_queue.splice(std::end(partition_delete_queue), partitions, std::prev(std::end(partitions)));
-
-    // drop unused partitions
-    while (!partition_delete_queue.empty() && partition_delete_queue.front().use_count() == 1)
-    {
-        partition_delete_queue.front()->remove();
-        partition_delete_queue.pop_front();
-    }
-}
-
-SSDCacheDictionary::SSDCacheDictionary(
-    const StorageID & dict_id_,
-    const DictionaryStructure & dict_struct_,
-    DictionarySourcePtr source_ptr_,
-    const DictionaryLifetime dict_lifetime_,
-    const std::string & path_,
-    const size_t max_partitions_count_,
-    const size_t file_size_,
-    const size_t block_size_,
-    const size_t read_buffer_size_,
-    const size_t write_buffer_size_,
-    const size_t max_stored_keys_)
-    : IDictionary(dict_id_)
-    , dict_struct(dict_struct_)
-    , source_ptr(std::move(source_ptr_))
-    , dict_lifetime(dict_lifetime_)
-    , path(path_)
-    , max_partitions_count(max_partitions_count_)
-    , file_size(file_size_)
-    , block_size(block_size_)
-    , read_buffer_size(read_buffer_size_)
-    , write_buffer_size(write_buffer_size_)
-    , max_stored_keys(max_stored_keys_)
-    , storage(ext::map<std::vector>(dict_struct.attributes, [](const auto & attribute) { return attribute.underlying_type; }),
-            path, max_partitions_count, file_size, block_size, read_buffer_size, write_buffer_size, max_stored_keys)
-    , log(&Poco::Logger::get("SSDCacheDictionary"))
-{
-    LOG_INFO(log, "Using storage path '{}'.", path);
-    if (!this->source_ptr->supportsSelectiveLoad())
-        throw Exception{name + ": source cannot be used with CacheDictionary", ErrorCodes::UNSUPPORTED_METHOD};
-
-    createAttributes();
-}
-
-ColumnPtr SSDCacheDictionary::getColumn(
-    const std::string & attribute_name,
-    const DataTypePtr & result_type,
-    const Columns & key_columns,
-    const DataTypes &,
-    const ColumnPtr default_values_column) const
-{
-    ColumnPtr result;
-
-    PaddedPODArray<Key> backup_storage;
-    const auto & ids = getColumnVectorData(this, key_columns.front(), backup_storage);
-    auto keys_size = ids.size();
-
-    const auto index = getAttributeIndex(attribute_name);
-    const auto & dictionary_attribute = dict_struct.getAttribute(attribute_name, result_type);
-
-    auto type_call = [&](const auto &dictionary_attribute_type)
-    {
-        using Type = std::decay_t<decltype(dictionary_attribute_type)>;
-        using AttributeType = typename Type::AttributeType;
-        using ColumnProvider = DictionaryAttributeColumnProvider<AttributeType>;
-
-        const auto & null_value = std::get<AttributeType>(null_values[index]);
-        DictionaryDefaultValueExtractor<AttributeType> default_value_extractor(null_value, default_values_column);
-
-        auto column = ColumnProvider::getColumn(dictionary_attribute, keys_size);
-
-        if constexpr (std::is_same_v<AttributeType, String>)
-        {
-            getItemsStringImpl(index, ids, column.get(), default_value_extractor);
-        }
-        else
-        {
-            auto & out = column->getData();
-            getItemsNumberImpl<AttributeType, AttributeType>(index, ids, out, default_value_extractor);
-        }
-
-        result = std::move(column);
-    };
-
-    callOnDictionaryAttributeType(dict_struct.attributes[index].underlying_type, type_call);
-
-    return result;
-}
-
-template <typename AttributeType, typename OutputType, typename DefaultGetter>
-void SSDCacheDictionary::getItemsNumberImpl(
-        const size_t attribute_index,
-        const PaddedPODArray<Key> & ids,
-        ResultArrayType<OutputType> & out,
-        DefaultGetter & default_value_extractor) const
-{
-    const auto now = std::chrono::system_clock::now();
-
-    std::unordered_map<Key, std::vector<size_t>> not_found_ids;
-    storage.getValue<OutputType>(attribute_index, ids, out, not_found_ids, default_value_extractor, now);
-    if (not_found_ids.empty())
-        return;
-
-    std::vector<Key> required_ids(not_found_ids.size());
-    std::transform(std::begin(not_found_ids), std::end(not_found_ids), std::begin(required_ids), [](const auto & pair) { return pair.first; });
-
-    storage.update(
-            source_ptr,
-            required_ids,
-            [&](const auto id, const auto row, const auto & new_attributes)
-            {
-                for (const size_t out_row : not_found_ids[id])
-                    out[out_row] = std::get<SSDCachePartition::Attribute::Container<OutputType>>(new_attributes[attribute_index].values)[row];
-            },
-            [&](const size_t id)
-            {
-                for (const size_t row : not_found_ids[id])
-                    out[row] = default_value_extractor[row];
-            },
-            getLifetime());
-}
-
-template <typename DefaultGetter>
-void SSDCacheDictionary::getItemsStringImpl(
-    const size_t attribute_index,
-    const PaddedPODArray<Key> & ids,
-    ColumnString * out,
-    DefaultGetter & default_value_extractor) const
-{
-    const auto now = std::chrono::system_clock::now();
-
-    std::unordered_map<Key, std::vector<size_t>> not_found_ids;
-
-    StringRefs refs(ids.size());
-    ArenaWithFreeLists string_arena;
-    std::vector<size_t> default_rows;
-    storage.getString(attribute_index, ids, refs, string_arena, not_found_ids, default_rows, now);
-    std::sort(std::begin(default_rows), std::end(default_rows));
-
-    if (not_found_ids.empty())
-    {
-        size_t default_index = 0;
-        for (size_t row = 0; row < ids.size(); ++row)
-        {
-            if (unlikely(default_index != default_rows.size() && default_rows[default_index] == row))
-            {
-                auto to_insert = default_value_extractor[row];
-                out->insertData(to_insert.data, to_insert.size);
-                ++default_index;
-            }
-            else
-                out->insertData(refs[row].data, refs[row].size);
-        }
-        return;
-    }
-
-    std::vector<Key> required_ids(not_found_ids.size());
-    std::transform(std::begin(not_found_ids), std::end(not_found_ids), std::begin(required_ids), [](const auto & pair) { return pair.first; });
-
-    std::unordered_map<Key, String> update_result;
-
-    storage.update(
-            source_ptr,
-            required_ids,
-            [&](const auto id, const auto row, const auto & new_attributes)
-            {
-                update_result[id] = std::get<SSDCachePartition::Attribute::Container<String>>(new_attributes[attribute_index].values)[row];
-            },
-            [&](const size_t) {},
-            getLifetime());
-
-    size_t default_index = 0;
-    for (size_t row = 0; row < ids.size(); ++row)
-    {
-        const auto & id = ids[row];
-        if (unlikely(default_index != default_rows.size() && default_rows[default_index] == row))
-        {
-            auto to_insert = default_value_extractor[row];
-            out->insertData(to_insert.data, to_insert.size);
-            ++default_index;
-        }
-        else if (auto it = not_found_ids.find(id); it == std::end(not_found_ids))
-        {
-            out->insertData(refs[row].data, refs[row].size);
-        }
-        else if (auto it_update = update_result.find(id); it_update != std::end(update_result))
-        {
-            out->insertData(it_update->second.data(), it_update->second.size());
-        }
-        else
-        {
-            auto to_insert = default_value_extractor[row];
-            out->insertData(to_insert.data, to_insert.size);
-        }
-    }
-}
-
-ColumnUInt8::Ptr SSDCacheDictionary::hasKeys(const Columns & key_columns, const DataTypes &) const
-{
-    PaddedPODArray<Key> backup_storage;
-    const auto& ids = getColumnVectorData(this, key_columns.front(), backup_storage);
-
-    auto result = ColumnUInt8::create(ext::size(ids));
-    auto& out = result->getData();
-
-    const auto rows = ext::size(ids);
-    for (const auto row : ext::range(0, rows))
-        out[row] = false;
-
-    const auto now = std::chrono::system_clock::now();
-
-    std::unordered_map<Key, std::vector<size_t>> not_found_ids;
-    storage.has(ids, out, not_found_ids, now);
-    if (not_found_ids.empty())
-        return result;
-
-    std::vector<Key> required_ids(not_found_ids.size());
-    std::transform(std::begin(not_found_ids), std::end(not_found_ids), std::begin(required_ids), [](const auto & pair) { return pair.first; });
-
-    storage.update(
-            source_ptr,
-            required_ids,
-            [&](const auto id, const auto, const auto &)
-            {
-                for (const size_t out_row : not_found_ids[id])
-                    out[out_row] = true;
-            },
-            [&](const size_t id)
-            {
-                for (const size_t row : not_found_ids[id])
-                    out[row] = false;
-            },
-            getLifetime());
-
-    return result;
-}
-
-BlockInputStreamPtr SSDCacheDictionary::getBlockInputStream(const Names & column_names, size_t max_block_size) const
-{
-    using BlockInputStreamType = DictionaryBlockInputStream<Key>;
-    return std::make_shared<BlockInputStreamType>(shared_from_this(), max_block_size, storage.getCachedIds(), column_names);
-}
-
-size_t SSDCacheDictionary::getAttributeIndex(const std::string & attr_name) const
-{
-    auto it = attribute_index_by_name.find(attr_name);
-    if (it == std::end(attribute_index_by_name))
-        throw  Exception{"Attribute `" + name + "` does not exist.", ErrorCodes::BAD_ARGUMENTS};
-    return it->second;
-}
-
-template <typename T>
-AttributeValueVariant SSDCacheDictionary::createAttributeNullValueWithTypeImpl(const Field & null_value)
-{
-    AttributeValueVariant var_null_value = static_cast<T>(null_value.get<NearestFieldType<T>>());
-    bytes_allocated += sizeof(T);
-    return var_null_value;
-}
-
-template <>
-AttributeValueVariant SSDCacheDictionary::createAttributeNullValueWithTypeImpl<String>(const Field & null_value)
-{
-    AttributeValueVariant var_null_value = null_value.get<String>();
-    bytes_allocated += sizeof(StringRef);
-    return var_null_value;
-}
-
-AttributeValueVariant SSDCacheDictionary::createAttributeNullValueWithType(const AttributeUnderlyingType type, const Field & null_value)
-{
-    switch (type)
-    {
-#define DISPATCH(TYPE) \
-case AttributeUnderlyingType::ut##TYPE: \
-    return createAttributeNullValueWithTypeImpl<TYPE>(null_value);
-
-        DISPATCH(UInt8)
-        DISPATCH(UInt16)
-        DISPATCH(UInt32)
-        DISPATCH(UInt64)
-        DISPATCH(UInt128)
-        DISPATCH(Int8)
-        DISPATCH(Int16)
-        DISPATCH(Int32)
-        DISPATCH(Int64)
-        DISPATCH(Decimal32)
-        DISPATCH(Decimal64)
-        DISPATCH(Decimal128)
-        DISPATCH(Float32)
-        DISPATCH(Float64)
-        DISPATCH(String)
-#undef DISPATCH
-    }
-    throw Exception{"Unknown attribute type: " + std::to_string(static_cast<int>(type)), ErrorCodes::TYPE_MISMATCH};
-}
-
-void SSDCacheDictionary::createAttributes()
-{
-    null_values.reserve(dict_struct.attributes.size());
-    for (size_t i = 0; i < dict_struct.attributes.size(); ++i)
-    {
-        const auto & attribute = dict_struct.attributes[i];
-
-        attribute_index_by_name.emplace(attribute.name, i);
-        null_values.push_back(createAttributeNullValueWithType(attribute.underlying_type, attribute.null_value));
-
-        if (attribute.hierarchical)
-            throw Exception{name + ": hierarchical attributes not supported for dictionary of type " + getTypeName(),
-                            ErrorCodes::TYPE_MISMATCH};
-    }
-}
-
-void registerDictionarySSDCache(DictionaryFactory & factory)
-{
-    auto create_layout = [=](const std::string & name,
-                             const DictionaryStructure & dict_struct,
-                             const Poco::Util::AbstractConfiguration & config,
-                             const std::string & config_prefix,
-                             DictionarySourcePtr source_ptr) -> DictionaryPtr
-    {
-        if (dict_struct.key)
-            throw Exception{"'key' is not supported for dictionary of layout 'cache'", ErrorCodes::UNSUPPORTED_METHOD};
-
-        const auto dict_id = StorageID::fromDictionaryConfig(config, config_prefix);
-
-        if (dict_struct.range_min || dict_struct.range_max)
-            throw Exception{name
-                            + ": elements .structure.range_min and .structure.range_max should be defined only "
-                              "for a dictionary of layout 'range_hashed'",
-                            ErrorCodes::BAD_ARGUMENTS};
-        const auto & layout_prefix = config_prefix + ".layout";
-
-        const auto max_partitions_count = config.getInt(layout_prefix + ".ssd_cache.max_partitions_count", DEFAULT_PARTITIONS_COUNT);
-        if (max_partitions_count <= 0)
-            throw Exception{name + ": dictionary of layout 'ssd_cache' cannot have 0 (or less) max_partitions_count", ErrorCodes::BAD_ARGUMENTS};
-
-        const auto block_size = config.getInt(layout_prefix + ".ssd_cache.block_size", DEFAULT_SSD_BLOCK_SIZE_BYTES);
-        if (block_size <= 0)
-            throw Exception{name + ": dictionary of layout 'ssd_cache' cannot have 0 (or less) block_size", ErrorCodes::BAD_ARGUMENTS};
-
-        const auto file_size = config.getInt64(layout_prefix + ".ssd_cache.file_size", DEFAULT_FILE_SIZE_BYTES);
-        if (file_size <= 0)
-            throw Exception{name + ": dictionary of layout 'ssd_cache' cannot have 0 (or less) file_size", ErrorCodes::BAD_ARGUMENTS};
-        if (file_size % block_size != 0)
-            throw Exception{name + ": file_size must be a multiple of block_size", ErrorCodes::BAD_ARGUMENTS};
-
-        const auto read_buffer_size = config.getInt64(layout_prefix + ".ssd_cache.read_buffer_size", DEFAULT_READ_BUFFER_SIZE_BYTES);
-        if (read_buffer_size <= 0)
-            throw Exception{name + ": dictionary of layout 'ssd_cache' cannot have 0 (or less) read_buffer_size", ErrorCodes::BAD_ARGUMENTS};
-        if (read_buffer_size % block_size != 0)
-            throw Exception{name + ": read_buffer_size must be a multiple of block_size", ErrorCodes::BAD_ARGUMENTS};
-
-        const auto write_buffer_size = config.getInt64(layout_prefix + ".ssd_cache.write_buffer_size", DEFAULT_WRITE_BUFFER_SIZE_BYTES);
-        if (write_buffer_size <= 0)
-            throw Exception{name + ": dictionary of layout 'ssd_cache' cannot have 0 (or less) write_buffer_size", ErrorCodes::BAD_ARGUMENTS};
-        if (write_buffer_size % block_size != 0)
-            throw Exception{name + ": write_buffer_size must be a multiple of block_size", ErrorCodes::BAD_ARGUMENTS};
-
-        auto path = config.getString(layout_prefix + ".ssd_cache.path");
-        if (path.empty())
-            throw Exception{name + ": dictionary of layout 'ssd_cache' cannot have empty path",
-                            ErrorCodes::BAD_ARGUMENTS};
-        if (path.at(0) != '/')
-            path = std::filesystem::path{config.getString("path")}.concat(path).string();
-
-        const auto max_stored_keys = config.getInt64(layout_prefix + ".ssd_cache.max_stored_keys", DEFAULT_MAX_STORED_KEYS);
-        if (max_stored_keys <= 0)
-            throw Exception{name + ": dictionary of layout 'ssd_cache' cannot have 0 (or less) max_stored_keys", ErrorCodes::BAD_ARGUMENTS};
-
-        const DictionaryLifetime dict_lifetime{config, config_prefix + ".lifetime"};
-        return std::make_unique<SSDCacheDictionary>(
-                dict_id, dict_struct, std::move(source_ptr), dict_lifetime, path,
-                max_partitions_count, file_size / block_size, block_size,
-                read_buffer_size / block_size, write_buffer_size / block_size,
-                max_stored_keys);
-    };
-    factory.registerLayout("ssd_cache", create_layout, false);
-}
-
-}
-
-#endif
diff --git a/src/Dictionaries/SSDCacheDictionary.h b/src/Dictionaries/SSDCacheDictionary.h
deleted file mode 100644
index 4d4d3befa22..00000000000
--- a/src/Dictionaries/SSDCacheDictionary.h
+++ /dev/null
@@ -1,418 +0,0 @@
-#pragma once
-
-#if defined(__linux__) || defined(__FreeBSD__)
-
-#include <atomic>
-#include <chrono>
-#include <list>
-#include <shared_mutex>
-#include <variant>
-#include <vector>
-
-#include <Poco/Logger.h>
-
-#include <Columns/ColumnDecimal.h>
-#include <Columns/ColumnString.h>
-#include <Common/ArenaWithFreeLists.h>
-#include <Common/CurrentMetrics.h>
-#include <common/logger_useful.h>
-#include <Compression/CompressedWriteBuffer.h>
-#include <Core/Block.h>
-#include <Dictionaries/BucketCache.h>
-#include <IO/HashingWriteBuffer.h>
-#include <pcg_random.hpp>
-#include "DictionaryStructure.h"
-#include "IDictionary.h"
-#include "IDictionarySource.h"
-#include "DictionaryHelpers.h"
-
-namespace DB
-{
-
-using AttributeValueVariant = std::variant<
-        UInt8,
-        UInt16,
-        UInt32,
-        UInt64,
-        UInt128,
-        Int8,
-        Int16,
-        Int32,
-        Int64,
-        Decimal32,
-        Decimal64,
-        Decimal128,
-        Float32,
-        Float64,
-        String>;
-
-
-/*
-    Class for operations with cache file and index.
-    Supports GET/SET operations.
-*/
-class SSDCachePartition
-{
-public:
-    struct Index final
-    {
-        bool inMemory() const;
-        void setInMemory(bool in_memory);
-
-        bool exists() const;
-        void setNotExists();
-
-        size_t getAddressInBlock() const;
-        void setAddressInBlock(size_t address_in_block);
-
-        size_t getBlockId() const;
-        void setBlockId(size_t block_id);
-
-        bool operator< (const Index & rhs) const { return index < rhs.index; }
-
-        /// Stores `is_in_memory` flag, block id, address in uncompressed block
-        uint64_t index = 0;
-    };
-
-    struct Metadata final
-    {
-        using time_point_t = std::chrono::system_clock::time_point;
-        using time_point_rep_t = time_point_t::rep;
-        using time_point_urep_t = make_unsigned_t<time_point_rep_t>;
-
-        time_point_t expiresAt() const;
-        void setExpiresAt(const time_point_t & t);
-
-        bool isDefault() const;
-        void setDefault();
-
-        /// Stores both expiration time and `is_default` flag in the most significant bit
-        time_point_urep_t data = 0;
-    };
-
-    using Offset = size_t;
-    using Offsets = std::vector<Offset>;
-    using Key = IDictionary::Key;
-
-    SSDCachePartition(
-            const AttributeUnderlyingType & key_structure,
-            const std::vector<AttributeUnderlyingType> & attributes_structure,
-            const std::string & dir_path,
-            size_t file_id,
-            size_t max_size,
-            size_t block_size,
-            size_t read_buffer_size,
-            size_t write_buffer_size,
-            size_t max_stored_keys);
-
-    ~SSDCachePartition();
-
-    template <typename T>
-    using ResultArrayType = std::conditional_t<IsDecimalNumber<T>, DecimalPaddedPODArray<T>, PaddedPODArray<T>>;
-
-    template <typename Out, typename GetDefault>
-    void getValue(size_t attribute_index, const PaddedPODArray<UInt64> & ids,
-            ResultArrayType<Out> & out, std::vector<bool> & found, GetDefault & default_value_extractor,
-            std::chrono::system_clock::time_point now) const;
-
-    void getString(size_t attribute_index, const PaddedPODArray<UInt64> & ids,
-            StringRefs & refs, ArenaWithFreeLists & arena, std::vector<bool> & found,
-            std::vector<size_t> & default_ids, std::chrono::system_clock::time_point now) const;
-
-    void has(const PaddedPODArray<UInt64> & ids, ResultArrayType<UInt8> & out,
-            std::vector<bool> & found, std::chrono::system_clock::time_point now) const;
-
-    struct Attribute
-    {
-        template <typename T>
-        using Container = std::vector<T>;
-
-        AttributeUnderlyingType type;
-        std::variant<
-                Container<UInt8>,
-                Container<UInt16>,
-                Container<UInt32>,
-                Container<UInt64>,
-                Container<UInt128>,
-                Container<Int8>,
-                Container<Int16>,
-                Container<Int32>,
-                Container<Int64>,
-                Container<Decimal32>,
-                Container<Decimal64>,
-                Container<Decimal128>,
-                Container<Float32>,
-                Container<Float64>,
-                Container<String>> values;
-    };
-    using Attributes = std::vector<Attribute>;
-
-    size_t appendBlock(const Attribute & new_keys, const Attributes & new_attributes,
-            const PaddedPODArray<Metadata> & metadata, size_t begin);
-
-    size_t appendDefaults(const Attribute & new_keys, const PaddedPODArray<Metadata> & metadata, size_t begin);
-
-    void flush();
-
-    void remove();
-
-    size_t getId() const;
-
-    PaddedPODArray<Key> getCachedIds(std::chrono::system_clock::time_point now) const;
-
-    double getLoadFactor() const;
-
-    size_t getElementCount() const;
-
-    size_t getBytesAllocated() const;
-
-private:
-    void clearOldestBlocks();
-
-    template <typename SetFunc>
-    void getImpl(const PaddedPODArray<UInt64> & ids, SetFunc & set, std::vector<bool> & found) const;
-
-    template <typename SetFunc>
-    void getValueFromMemory(const PaddedPODArray<Index> & indices, SetFunc & set) const;
-
-    template <typename SetFunc>
-    void getValueFromStorage(const PaddedPODArray<Index> & indices, SetFunc & set) const;
-
-    void ignoreFromBufferToAttributeIndex(size_t attribute_index, ReadBuffer & buf) const;
-
-    const size_t file_id;
-    const size_t max_size;
-    const size_t block_size;
-    const size_t read_buffer_size;
-    const size_t write_buffer_size;
-    const size_t max_stored_keys;
-    const std::string path;
-
-    mutable std::shared_mutex rw_lock;
-
-    int fd = -1;
-
-    mutable BucketCacheIndex<UInt64, Index, Int64Hasher> key_to_index;
-
-    Attribute keys_buffer;
-    const std::vector<AttributeUnderlyingType> attributes_structure;
-
-    std::optional<Memory<>> memory;
-    std::optional<WriteBuffer> write_buffer;
-    uint32_t keys_in_block = 0;
-
-    size_t current_memory_block_id = 0;
-    size_t current_file_block_id = 0;
-};
-
-using SSDCachePartitionPtr = std::shared_ptr<SSDCachePartition>;
-
-
-/*
-    Class for managing SSDCachePartition and getting data from source.
-*/
-class SSDCacheStorage
-{
-public:
-    using AttributeTypes = std::vector<AttributeUnderlyingType>;
-    using Key = SSDCachePartition::Key;
-
-    SSDCacheStorage(
-            const AttributeTypes & attributes_structure,
-            const std::string & path,
-            size_t max_partitions_count,
-            size_t file_size,
-            size_t block_size,
-            size_t read_buffer_size,
-            size_t write_buffer_size,
-            size_t max_stored_keys);
-
-    ~SSDCacheStorage();
-
-    template <typename T>
-    using ResultArrayType = SSDCachePartition::ResultArrayType<T>;
-
-    template <typename Out, typename GetDefault>
-    void getValue(size_t attribute_index, const PaddedPODArray<UInt64> & ids,
-            ResultArrayType<Out> & out, std::unordered_map<Key, std::vector<size_t>> & not_found,
-            GetDefault & default_value_extractor, std::chrono::system_clock::time_point now) const;
-
-    void getString(size_t attribute_index, const PaddedPODArray<UInt64> & ids,
-            StringRefs & refs, ArenaWithFreeLists & arena, std::unordered_map<Key, std::vector<size_t>> & not_found,
-            std::vector<size_t> & default_ids, std::chrono::system_clock::time_point now) const;
-
-    void has(const PaddedPODArray<UInt64> & ids, ResultArrayType<UInt8> & out,
-             std::unordered_map<Key, std::vector<size_t>> & not_found, std::chrono::system_clock::time_point now) const;
-
-    template <typename PresentIdHandler, typename AbsentIdHandler>
-    void update(DictionarySourcePtr & source_ptr, const std::vector<Key> & requested_ids,
-            PresentIdHandler && on_updated, AbsentIdHandler && on_id_not_found,
-            DictionaryLifetime lifetime);
-
-    PaddedPODArray<Key> getCachedIds() const;
-
-    std::exception_ptr getLastException() const { return last_update_exception; }
-
-    const std::string & getPath() const { return path; }
-
-    size_t getQueryCount() const { return query_count.load(std::memory_order_relaxed); }
-
-    size_t getHitCount() const { return hit_count.load(std::memory_order_acquire); }
-
-    size_t getElementCount() const;
-
-    double getLoadFactor() const;
-
-    size_t getBytesAllocated() const;
-
-private:
-    void collectGarbage();
-
-    const AttributeTypes attributes_structure;
-
-    const std::string path;
-    const size_t max_partitions_count;
-    const size_t file_size;
-    const size_t block_size;
-    const size_t read_buffer_size;
-    const size_t write_buffer_size;
-    const size_t max_stored_keys;
-
-    mutable std::shared_mutex rw_lock;
-    std::list<SSDCachePartitionPtr> partitions;
-    std::list<SSDCachePartitionPtr> partition_delete_queue;
-
-    Poco::Logger * const log;
-
-    mutable pcg64 rnd_engine;
-
-    mutable std::exception_ptr last_update_exception;
-    mutable size_t update_error_count = 0;
-    mutable std::chrono::system_clock::time_point backoff_end_time;
-
-    mutable std::atomic<size_t> hit_count{0};
-    mutable std::atomic<size_t> query_count{0};
-};
-
-
-/*
-    Dictionary interface
-*/
-class SSDCacheDictionary final : public IDictionary
-{
-public:
-    SSDCacheDictionary(
-            const StorageID & dict_id_,
-            const DictionaryStructure & dict_struct_,
-            DictionarySourcePtr source_ptr_,
-            DictionaryLifetime dict_lifetime_,
-            const std::string & path,
-            size_t max_partitions_count_,
-            size_t file_size_,
-            size_t block_size_,
-            size_t read_buffer_size_,
-            size_t write_buffer_size_,
-            size_t max_stored_keys_);
-
-    std::string getTypeName() const override { return "SSDCache"; }
-
-    size_t getBytesAllocated() const override { return storage.getBytesAllocated(); }
-
-    size_t getQueryCount() const override { return storage.getQueryCount(); }
-
-    double getHitRate() const override
-    {
-        return static_cast<double>(storage.getHitCount()) / storage.getQueryCount();
-    }
-
-    size_t getElementCount() const override { return storage.getElementCount(); }
-
-    double getLoadFactor() const override { return storage.getLoadFactor(); }
-
-    bool supportUpdates() const override { return false; }
-
-    std::shared_ptr<const IExternalLoadable> clone() const override
-    {
-        return std::make_shared<SSDCacheDictionary>(getDictionaryID(), dict_struct, source_ptr->clone(), dict_lifetime,
-                path, max_partitions_count, file_size, block_size, read_buffer_size, write_buffer_size, max_stored_keys);
-    }
-
-    const IDictionarySource * getSource() const override { return source_ptr.get(); }
-
-    const DictionaryLifetime & getLifetime() const override { return dict_lifetime; }
-
-    const DictionaryStructure & getStructure() const override { return dict_struct; }
-
-    bool isInjective(const std::string & attribute_name) const override
-    {
-        return dict_struct.attributes[getAttributeIndex(attribute_name)].injective;
-    }
-
-    bool hasHierarchy() const override { return false; }
-
-    void toParent(const PaddedPODArray<Key> &, PaddedPODArray<Key> &) const override { }
-
-    std::exception_ptr getLastException() const override { return storage.getLastException(); }
-
-    DictionaryKeyType getKeyType() const override { return DictionaryKeyType::simple; }
-
-    ColumnPtr getColumn(
-        const std::string& attribute_name,
-        const DataTypePtr & result_type,
-        const Columns & key_columns,
-        const DataTypes & key_types,
-        const ColumnPtr default_values_column) const override;
-
-    ColumnUInt8::Ptr hasKeys(const Columns & key_columns, const DataTypes & key_types) const override;
-
-    template <typename T>
-    using ResultArrayType = SSDCacheStorage::ResultArrayType<T>;
-
-    BlockInputStreamPtr getBlockInputStream(const Names & column_names, size_t max_block_size) const override;
-
-private:
-    size_t getAttributeIndex(const std::string & attr_name) const;
-
-    template <typename T>
-    AttributeValueVariant createAttributeNullValueWithTypeImpl(const Field & null_value);
-    AttributeValueVariant createAttributeNullValueWithType(AttributeUnderlyingType type, const Field & null_value);
-    void createAttributes();
-
-    template <typename AttributeType, typename OutputType, typename DefaultGetter>
-    void getItemsNumberImpl(
-        size_t attribute_index,
-        const PaddedPODArray<Key> & ids,
-        ResultArrayType<OutputType> & out,
-        DefaultGetter & default_value_extractor) const;
-
-    template <typename DefaultGetter>
-    void getItemsStringImpl(
-        size_t attribute_index,
-        const PaddedPODArray<Key> & ids,
-        ColumnString * out,
-        DefaultGetter & default_value_extractor) const;
-
-    const std::string name;
-    const DictionaryStructure dict_struct;
-    mutable DictionarySourcePtr source_ptr;
-    const DictionaryLifetime dict_lifetime;
-
-    const std::string path;
-    const size_t max_partitions_count;
-    const size_t file_size;
-    const size_t block_size;
-    const size_t read_buffer_size;
-    const size_t write_buffer_size;
-    const size_t max_stored_keys;
-
-    std::map<std::string, size_t> attribute_index_by_name;
-    std::vector<AttributeValueVariant> null_values;
-    mutable SSDCacheStorage storage;
-    Poco::Logger * const log;
-
-    mutable size_t bytes_allocated = 0;
-};
-
-}
-
-#endif
diff --git a/src/Dictionaries/SSDCacheDictionaryStorage.h b/src/Dictionaries/SSDCacheDictionaryStorage.h
new file mode 100644
index 00000000000..7d72beca35e
--- /dev/null
+++ b/src/Dictionaries/SSDCacheDictionaryStorage.h
@@ -0,0 +1,1390 @@
+#pragma once
+
+#if defined(__linux__) || defined(__FreeBSD__)
+
+#include <chrono>
+
+#include <pcg_random.hpp>
+#include <filesystem>
+#include <city.h>
+#include <fcntl.h>
+#include <absl/container/flat_hash_map.h>
+#include <absl/container/flat_hash_set.h>
+
+#include <common/unaligned.h>
+#include <Common/Stopwatch.h>
+#include <Common/randomSeed.h>
+#include <Common/Arena.h>
+#include <Common/ArenaWithFreeLists.h>
+#include <Common/MemorySanitizer.h>
+#include <Common/HashTable/HashMap.h>
+#include <IO/AIO.h>
+#include <Dictionaries/DictionaryStructure.h>
+#include <Dictionaries/ICacheDictionaryStorage.h>
+#include <Dictionaries/DictionaryHelpers.h>
+
+namespace ProfileEvents
+{
+    extern const Event FileOpen;
+    extern const Event WriteBufferAIOWrite;
+    extern const Event WriteBufferAIOWriteBytes;
+}
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int AIO_READ_ERROR;
+    extern const int AIO_WRITE_ERROR;
+    extern const int CANNOT_ALLOCATE_MEMORY;
+    extern const int CANNOT_CREATE_DIRECTORY;
+    extern const int CANNOT_FSYNC;
+    extern const int CANNOT_IO_GETEVENTS;
+    extern const int CANNOT_IO_SUBMIT;
+    extern const int CANNOT_OPEN_FILE;
+    extern const int CORRUPTED_DATA;
+    extern const int FILE_DOESNT_EXIST;
+    extern const int UNSUPPORTED_METHOD;
+    extern const int NOT_IMPLEMENTED;
+}
+
+struct SSDCacheDictionaryStorageConfiguration
+{
+    const size_t strict_max_lifetime_seconds;
+    const DictionaryLifetime lifetime;
+
+    const std::string file_path;
+    const size_t max_partitions_count;
+    const size_t block_size;
+    const size_t file_blocks_size;
+    const size_t read_buffer_blocks_size;
+    const size_t write_buffer_blocks_size;
+};
+
+
+/** Simple Key is serialized in block with following structure
+    key     | data_size | data
+    8 bytes | 8 bytes   | data_size bytes
+
+    Complex Key is serialized in block with following structure
+    key_size     | key_data       | data_size | data
+    8 bytes      | key_size bytes | 8 bytes   | data_size bytes
+*/
+template <typename TKeyType>
+struct SSDCacheKey final
+{
+    using KeyType = TKeyType;
+
+    SSDCacheKey(KeyType key_, size_t size_, const char * data_)
+        : key(key_)
+        , size(size_)
+        , data(data_)
+    {}
+
+    KeyType key;
+    size_t size;
+    const char * data;
+};
+
+using SSDCacheSimpleKey = SSDCacheKey<UInt64>;
+using SSDCacheComplexKey = SSDCacheKey<StringRef>;
+
+/** Block is serialized with following structure
+    check_sum | keys_size | [keys]
+    8 bytes   | 8 bytes   |
+*/
+class SSDCacheBlock final
+{
+    static constexpr size_t block_header_check_sum_size = sizeof(size_t);
+    static constexpr size_t block_header_keys_size = sizeof(size_t);
+public:
+
+    /// Block header size
+    static constexpr size_t block_header_size = block_header_check_sum_size + block_header_keys_size;
+
+    explicit SSDCacheBlock(size_t block_size_)
+        : block_size(block_size_)
+    {}
+
+    /// Checks if simple key can be written in empty block with block_size
+    static bool canBeWrittenInEmptyBlock(SSDCacheSimpleKey & simple_key, size_t block_size)
+    {
+        static constexpr size_t simple_key_size = sizeof(simple_key.key);
+
+        return (block_header_size + simple_key_size + sizeof(simple_key.size) + simple_key.size) <= block_size;
+    }
+
+    /// Checks if complex key can be written in empty block with block_size
+    static bool canBeWrittenInEmptyBlock(SSDCacheComplexKey & complex_key, size_t block_size)
+    {
+        StringRef & key = complex_key.key;
+        size_t complex_key_size = sizeof(key.size) + key.size;
+
+        return (block_header_size + complex_key_size + sizeof(complex_key.size) + complex_key.size) <= block_size;
+    }
+
+    /// Reset block with new block_data
+    /// block_data must be filled with zeroes if it is new block
+    inline void reset(char * new_block_data)
+    {
+        block_data = new_block_data;
+        current_block_offset = block_header_size;
+        keys_size = unalignedLoad<size_t>(new_block_data + block_header_check_sum_size);
+    }
+
+    /// Check if it is enough place to write key in block
+    inline bool enoughtPlaceToWriteKey(const SSDCacheSimpleKey & cache_key) const
+    {
+        return (current_block_offset + (sizeof(cache_key.key) + sizeof(cache_key.size) + cache_key.size)) <= block_size;
+    }
+
+    /// Check if it is enough place to write key in block
+    inline bool enoughtPlaceToWriteKey(const SSDCacheComplexKey & cache_key) const
+    {
+        const StringRef & key = cache_key.key;
+        size_t complex_key_size = sizeof(key.size) + key.size;
+
+        return (current_block_offset + (complex_key_size + sizeof(cache_key.size) + cache_key.size)) <= block_size;
+    }
+
+    /// Write key and returns offset in ssd cache block where data is written
+    /// It is client responsibility to check if there is enough place in block to write key
+    /// Returns true if key was written and false if there was not enough place to write key
+    inline bool writeKey(const SSDCacheSimpleKey & cache_key, size_t & offset_in_block)
+    {
+        assert(cache_key.size > 0);
+
+        if (!enoughtPlaceToWriteKey(cache_key))
+            return false;
+
+        char * current_block_offset_data = block_data + current_block_offset;
+
+        /// Write simple key
+        memcpy(reinterpret_cast<void *>(current_block_offset_data), reinterpret_cast<const void *>(&cache_key.key), sizeof(cache_key.key));
+        current_block_offset_data += sizeof(cache_key.key);
+        current_block_offset += sizeof(cache_key.key);
+
+        /// Write serialized columns size
+        memcpy(reinterpret_cast<void *>(current_block_offset_data), reinterpret_cast<const void *>(&cache_key.size), sizeof(cache_key.size));
+        current_block_offset_data += sizeof(cache_key.size);
+        current_block_offset += sizeof(cache_key.size);
+
+        offset_in_block = current_block_offset;
+
+        memcpy(reinterpret_cast<void *>(current_block_offset_data), reinterpret_cast<const void *>(cache_key.data), cache_key.size);
+        current_block_offset += cache_key.size;
+
+        ++keys_size;
+
+        return true;
+    }
+
+    inline bool writeKey(const SSDCacheComplexKey & cache_key, size_t & offset_in_block)
+    {
+        assert(cache_key.size > 0);
+
+        if (!enoughtPlaceToWriteKey(cache_key))
+            return false;
+
+        char * current_block_offset_data = block_data + current_block_offset;
+
+        const StringRef & key = cache_key.key;
+
+        /// Write complex key
+        memcpy(reinterpret_cast<void *>(current_block_offset_data), reinterpret_cast<const void *>(&key.size), sizeof(key.size));
+        current_block_offset_data += sizeof(key.size);
+        current_block_offset += sizeof(key.size);
+
+        memcpy(reinterpret_cast<void *>(current_block_offset_data), reinterpret_cast<const void *>(key.data), key.size);
+        current_block_offset_data += key.size;
+        current_block_offset += key.size;
+
+        /// Write serialized columns size
+        memcpy(reinterpret_cast<void *>(current_block_offset_data), reinterpret_cast<const void *>(&cache_key.size), sizeof(cache_key.size));
+        current_block_offset_data += sizeof(cache_key.size);
+        current_block_offset += sizeof(cache_key.size);
+
+        offset_in_block = current_block_offset;
+
+        memcpy(reinterpret_cast<void *>(current_block_offset_data), reinterpret_cast<const void *>(cache_key.data), cache_key.size);
+        current_block_offset += cache_key.size;
+
+        ++keys_size;
+
+        return true;
+    }
+
+    inline size_t getKeysSize() const { return keys_size; }
+
+    /// Write keys size into block header
+    inline void writeKeysSize()
+    {
+        char * keys_size_offset_data = block_data + block_header_check_sum_size;
+        std::memcpy(keys_size_offset_data, &keys_size, sizeof(size_t));
+    }
+
+    /// Get check sum from block header
+    inline size_t getCheckSum() const { return unalignedLoad<size_t>(block_data); }
+
+    /// Calculate check sum in block
+    inline size_t calculateCheckSum() const
+    {
+        size_t calculated_check_sum = static_cast<size_t>(CityHash_v1_0_2::CityHash64(block_data + block_header_check_sum_size, block_size - block_header_check_sum_size));
+
+        return calculated_check_sum;
+    }
+
+    /// Check if check sum from block header matched calculated check sum in block
+    inline bool checkCheckSum() const
+    {
+        size_t calculated_check_sum = calculateCheckSum();
+        size_t check_sum = getCheckSum();
+
+        return calculated_check_sum == check_sum;
+    }
+
+    /// Write check sum in block header
+    inline void writeCheckSum()
+    {
+        size_t check_sum = static_cast<size_t>(CityHash_v1_0_2::CityHash64(block_data + block_header_check_sum_size, block_size - block_header_check_sum_size));
+        std::memcpy(block_data, &check_sum, sizeof(size_t));
+    }
+
+    inline size_t getBlockSize() const { return block_size; }
+
+    /// Returns block data
+    inline char * getBlockData() const { return block_data; }
+
+    /// Read keys that were serialized in block
+    /// It is client responsibility to ensure that simple or complex keys were written in block
+    void readSimpleKeys(PaddedPODArray<UInt64> & simple_keys) const
+    {
+        char * block_start = block_data + block_header_size;
+        char * block_end = block_data + block_size;
+
+        static constexpr size_t key_prefix_size = sizeof(UInt64) + sizeof(size_t);
+
+        while (block_start + key_prefix_size < block_end)
+        {
+            UInt64 key = unalignedLoad<UInt64>(block_start);
+            block_start += sizeof(UInt64);
+
+            size_t allocated_size = unalignedLoad<size_t>(block_start);
+            block_start += sizeof(size_t);
+
+            /// If we read empty allocated size that means it is end of block
+            if (allocated_size == 0)
+                break;
+
+            simple_keys.emplace_back(key);
+            block_start += allocated_size;
+        }
+    }
+
+    void readComplexKeys(PaddedPODArray<StringRef> & complex_keys) const
+    {
+        char * block_start = block_data + block_header_size;
+        char * block_end = block_data + block_size;
+
+        static constexpr size_t key_prefix_size = sizeof(size_t) + sizeof(size_t);
+
+        while (block_start + key_prefix_size < block_end)
+        {
+            size_t key_size = unalignedLoad<size_t>(block_start);
+            block_start += sizeof(key_size);
+
+            StringRef complex_key (block_start, key_size);
+
+            block_start += key_size;
+
+            size_t allocated_size = unalignedLoad<size_t>(block_start);
+            block_start += sizeof(size_t);
+
+            /// If we read empty allocated size that means it is end of block
+            if (allocated_size == 0)
+                break;
+
+            complex_keys.emplace_back(complex_key);
+            block_start += allocated_size;
+        }
+    }
+
+private:
+    size_t block_size;
+    char * block_data = nullptr;
+
+    size_t current_block_offset = block_header_size;
+    size_t keys_size = 0;
+};
+
+struct SSDCacheIndex
+{
+    SSDCacheIndex(size_t block_index_, size_t offset_in_block_)
+        : block_index(block_index_)
+        , offset_in_block(offset_in_block_)
+    {}
+
+    SSDCacheIndex() = default;
+
+    size_t block_index = 0;
+    size_t offset_in_block = 0;
+};
+
+inline bool operator==(const SSDCacheIndex & lhs, const SSDCacheIndex & rhs)
+{
+    return lhs.block_index == rhs.block_index && lhs.offset_in_block == rhs.offset_in_block;
+}
+
+/** Logically represents multiple memory_buffer_blocks_size SSDCacheBlocks and current write block.
+  * If key cannot be written into current_write_block, current block keys size and check summ is written
+  * and buffer increase index of current_write_block_index.
+  * If current_write_block_index == memory_buffer_blocks_size write key will always returns true.
+  * If reset is called current_write_block_index is set to 0.
+  */
+template <typename SSDCacheKeyType>
+class SSDCacheMemoryBuffer
+{
+public:
+    using KeyType = typename SSDCacheKeyType::KeyType;
+
+    explicit SSDCacheMemoryBuffer(size_t block_size_, size_t memory_buffer_blocks_size_)
+        : block_size(block_size_)
+        , partition_blocks_size(memory_buffer_blocks_size_)
+        , buffer(block_size * partition_blocks_size, 4096)
+        , current_write_block(block_size)
+    {
+        current_write_block.reset(buffer.m_data);
+    }
+
+    bool writeKey(const SSDCacheKeyType & key, SSDCacheIndex & index)
+    {
+        if (current_block_index == partition_blocks_size)
+            return false;
+
+        size_t block_offset = 0;
+        bool write_in_current_block = current_write_block.writeKey(key, block_offset);
+
+        if (write_in_current_block)
+        {
+            index.block_index = current_block_index;
+            index.offset_in_block = block_offset;
+            return true;
+        }
+
+        current_write_block.writeKeysSize();
+        current_write_block.writeCheckSum();
+
+        ++current_block_index;
+
+        if (current_block_index == partition_blocks_size)
+            return false;
+
+        current_write_block.reset(buffer.m_data + (block_size * current_block_index));
+
+        write_in_current_block = current_write_block.writeKey(key, block_offset);
+        assert(write_in_current_block);
+
+        index.block_index = current_block_index;
+        index.offset_in_block = block_offset;
+
+        return write_in_current_block;
+    }
+
+    void writeKeysSizeAndCheckSumForCurrentWriteBlock()
+    {
+        current_write_block.writeKeysSize();
+        current_write_block.writeCheckSum();
+    }
+
+    inline char * getPlace(SSDCacheIndex index) const
+    {
+        return buffer.m_data + index.block_index * block_size + index.offset_in_block;
+    }
+
+    inline size_t getCurrentBlockIndex() const { return current_block_index; }
+
+    inline const char * getData() const { return buffer.m_data; }
+
+    inline size_t getSizeInBytes() const { return block_size * partition_blocks_size; }
+
+    void readKeys(PaddedPODArray<KeyType> & keys) const
+    {
+        SSDCacheBlock block(block_size);
+
+        for (size_t block_index = 0; block_index < partition_blocks_size; ++block_index)
+        {
+            block.reset(buffer.m_data + (block_index * block_size));
+
+            if constexpr (std::is_same_v<KeyType, UInt64>)
+                block.readSimpleKeys(keys);
+            else
+                block.readComplexKeys(keys);
+        }
+    }
+
+    inline void reset()
+    {
+        current_block_index = 0;
+        current_write_block.reset(buffer.m_data);
+    }
+
+    const size_t block_size;
+
+    const size_t partition_blocks_size;
+
+private:
+    Memory<Allocator<true>> buffer;
+
+    SSDCacheBlock current_write_block;
+
+    size_t current_block_index = 0;
+};
+
+/// Logically represents multiple memory_buffer_blocks_size SSDCacheBlocks on file system
+template <typename SSDCacheKeyType>
+class SSDCacheFileBuffer : private boost::noncopyable
+{
+    static constexpr auto BIN_FILE_EXT = ".bin";
+
+public:
+
+    using KeyType = typename SSDCacheKeyType::KeyType;
+
+    explicit SSDCacheFileBuffer(
+        const std::string & file_path_,
+        size_t block_size_,
+        size_t file_blocks_size_)
+        : file_path(file_path_ + BIN_FILE_EXT)
+        , block_size(block_size_)
+        , file_blocks_size(file_blocks_size_)
+    {
+        auto path = std::filesystem::path{file_path};
+        auto parent_path_directory = path.parent_path();
+
+        /// If cache file is in directory that does not exists create it
+        if (!std::filesystem::exists(parent_path_directory))
+            if (!std::filesystem::create_directories(parent_path_directory))
+                throw Exception(ErrorCodes::CANNOT_CREATE_DIRECTORY, "Failed to create directories.");
+
+        ProfileEvents::increment(ProfileEvents::FileOpen);
+
+        file.fd = ::open(file_path.c_str(), O_RDWR | O_CREAT | O_TRUNC | O_DIRECT, 0666);
+        if (file.fd == -1)
+        {
+            auto error_code = (errno == ENOENT) ? ErrorCodes::FILE_DOESNT_EXIST : ErrorCodes::CANNOT_OPEN_FILE;
+            throwFromErrnoWithPath("Cannot open file " + file_path, file_path, error_code);
+        }
+
+        allocateSizeForNextPartition();
+    }
+
+    void allocateSizeForNextPartition()
+    {
+        if (preallocateDiskSpace(file.fd, current_blocks_size * block_size, block_size * file_blocks_size) < 0)
+            throwFromErrnoWithPath("Cannot preallocate space for the file " + file_path, file_path, ErrorCodes::CANNOT_ALLOCATE_MEMORY);
+
+        current_blocks_size += file_blocks_size;
+    }
+
+    bool writeBuffer(const char * buffer, size_t buffer_size_in_blocks)
+    {
+        if (current_block_index + buffer_size_in_blocks > current_blocks_size)
+            return false;
+
+        AIOContext aio_context{1};
+
+        iocb write_request{};
+        iocb * write_request_ptr{&write_request};
+
+        #if defined(__FreeBSD__)
+        write_request.aio.aio_lio_opcode = LIO_WRITE;
+        write_request.aio.aio_fildes = file.fd;
+        write_request.aio.aio_buf = reinterpret_cast<volatile void *>(const_cast<char *>(buffer));
+        write_request.aio.aio_nbytes = block_size * buffer_size_in_blocks;
+        write_request.aio.aio_offset = current_block_index * block_size;
+        #else
+        write_request.aio_lio_opcode = IOCB_CMD_PWRITE;
+        write_request.aio_fildes = file.fd;
+        write_request.aio_buf = reinterpret_cast<UInt64>(buffer);
+        write_request.aio_nbytes = block_size * buffer_size_in_blocks;
+        write_request.aio_offset = current_block_index * block_size;
+        #endif
+
+        while (io_submit(aio_context.ctx, 1, &write_request_ptr) < 0)
+        {
+            if (errno != EINTR)
+                throw Exception(ErrorCodes::CANNOT_IO_SUBMIT, "Cannot submit request for asynchronous IO on file {}", file_path);
+        }
+
+        // CurrentMetrics::Increment metric_increment_write{CurrentMetrics::Write};
+
+        io_event event;
+
+        while (io_getevents(aio_context.ctx, 1, 1, &event, nullptr) < 0)
+        {
+            if (errno != EINTR)
+                throw Exception(ErrorCodes::CANNOT_IO_GETEVENTS, "Failed to wait for asynchronous IO completion on file {}", file_path);
+        }
+
+        // Unpoison the memory returned from an uninstrumented system function.
+        __msan_unpoison(&event, sizeof(event));
+
+        auto bytes_written = eventResult(event);
+
+        ProfileEvents::increment(ProfileEvents::WriteBufferAIOWrite);
+        ProfileEvents::increment(ProfileEvents::WriteBufferAIOWriteBytes, bytes_written);
+
+        if (bytes_written != static_cast<decltype(bytes_written)>(block_size * buffer_size_in_blocks))
+            throw Exception(ErrorCodes::AIO_WRITE_ERROR,
+                "Not all data was written for asynchronous IO on file {}. returned: {}",
+                file_path,
+                std::to_string(bytes_written));
+
+        if (::fsync(file.fd) < 0)
+            throwFromErrnoWithPath("Cannot fsync " + file_path, file_path, ErrorCodes::CANNOT_FSYNC);
+
+        current_block_index += buffer_size_in_blocks;
+
+        return true;
+    }
+
+    bool readKeys(size_t block_start, size_t blocks_length, PaddedPODArray<KeyType> & out) const
+    {
+        if (block_start + blocks_length > current_blocks_size)
+            return false;
+
+        size_t buffer_size_in_bytes = blocks_length * block_size;
+
+        Memory read_buffer_memory(block_size * blocks_length, block_size);
+
+        iocb request{};
+        iocb * request_ptr = &request;
+
+        #if defined(__FreeBSD__)
+        request.aio.aio_lio_opcode = LIO_READ;
+        request.aio.aio_fildes = file.fd;
+        request.aio.aio_buf = reinterpret_cast<volatile void *>(reinterpret_cast<UInt64>(read_buffer_memory.data()));
+        request.aio.aio_nbytes = buffer_size_in_bytes;
+        request.aio.aio_offset = block_start * block_size;
+        request.aio_data = 0;
+        #else
+        request.aio_lio_opcode = IOCB_CMD_PREAD;
+        request.aio_fildes = file.fd;
+        request.aio_buf = reinterpret_cast<UInt64>(read_buffer_memory.data());
+        request.aio_nbytes = buffer_size_in_bytes;
+        request.aio_offset = block_start * block_size;
+        request.aio_data = 0;
+        #endif
+
+        io_event event{};
+        AIOContext aio_context(1);
+
+        while (io_submit(aio_context.ctx, 1, &request_ptr) != 1)
+        {
+            if (errno != EINTR)
+                throwFromErrno("io_submit: Failed to submit a request for asynchronous IO", ErrorCodes::CANNOT_IO_SUBMIT);
+        }
+
+        while (io_getevents(aio_context.ctx, 1, 1, &event, nullptr) != 1)
+        {
+            if (errno != EINTR)
+                throwFromErrno("io_getevents: Failed to get an event for asynchronous IO", ErrorCodes::CANNOT_IO_GETEVENTS);
+        }
+
+        auto read_bytes = eventResult(event);
+
+        if (read_bytes != static_cast<ssize_t>(buffer_size_in_bytes))
+            throw Exception(ErrorCodes::AIO_READ_ERROR,
+                "GC: AIO failed to read file {}. Expected bytes {}. Actual bytes {}",
+                file_path,
+                buffer_size_in_bytes,
+                read_bytes);
+
+        SSDCacheBlock block(block_size);
+
+        for (size_t i = 0; i < blocks_length; ++i)
+        {
+            block.reset(read_buffer_memory.data() + (i * block_size));
+
+            if constexpr (std::is_same_v<SSDCacheKeyType, SSDCacheSimpleKey>)
+                block.readSimpleKeys(out);
+            else
+                block.readComplexKeys(out);
+        }
+
+        return true;
+    }
+
+    template <typename FetchBlockFunc>
+    void fetchBlocks(size_t read_from_file_buffer_blocks_size, const PaddedPODArray<size_t> & blocks_to_fetch, FetchBlockFunc && func) const
+    {
+        if (blocks_to_fetch.empty())
+            return;
+
+        Memory<Allocator<true>> read_buffer(read_from_file_buffer_blocks_size * block_size, 4096);
+
+        size_t blocks_to_fetch_size = blocks_to_fetch.size();
+
+        PaddedPODArray<iocb> requests;
+        PaddedPODArray<iocb *> pointers;
+
+        requests.reserve(blocks_to_fetch_size);
+        pointers.reserve(blocks_to_fetch_size);
+
+        for (size_t block_to_fetch_index = 0; block_to_fetch_index < blocks_to_fetch_size; ++block_to_fetch_index)
+        {
+            iocb request{};
+
+            char * buffer_place = read_buffer.data() + block_size * (block_to_fetch_index % read_from_file_buffer_blocks_size);
+
+            #if defined(__FreeBSD__)
+            request.aio.aio_lio_opcode = LIO_READ;
+            request.aio.aio_fildes = file.fd;
+            request.aio.aio_buf = reinterpret_cast<volatile void *>(reinterpret_cast<UInt64>(buffer_place));
+            request.aio.aio_nbytes = block_size;
+            request.aio.aio_offset = block_size * blocks_to_fetch[block_to_fetch_index];
+            request.aio_data = block_to_fetch_index;
+            #else
+            request.aio_lio_opcode = IOCB_CMD_PREAD;
+            request.aio_fildes = file.fd;
+            request.aio_buf = reinterpret_cast<UInt64>(buffer_place);
+            request.aio_nbytes = block_size;
+            request.aio_offset = block_size * blocks_to_fetch[block_to_fetch_index];
+            request.aio_data = block_to_fetch_index;
+            #endif
+
+            requests.push_back(request);
+            pointers.push_back(&requests.back());
+        }
+
+        AIOContext aio_context(read_from_file_buffer_blocks_size);
+
+        PaddedPODArray<bool> processed(requests.size(), false);
+        PaddedPODArray<io_event> events;
+        events.resize_fill(requests.size());
+
+        size_t to_push = 0;
+        size_t to_pop = 0;
+
+        while (to_pop < requests.size())
+        {
+            int popped = 0;
+
+            while (to_pop < to_push && (popped = io_getevents(aio_context.ctx, to_push - to_pop, to_push - to_pop, &events[to_pop], nullptr)) <= 0)
+            {
+                if (errno != EINTR)
+                    throwFromErrno("io_getevents: Failed to get an event for asynchronous IO", ErrorCodes::CANNOT_IO_GETEVENTS);
+            }
+
+            for (size_t i = to_pop; i < to_pop + popped; ++i)
+            {
+                size_t block_to_fetch_index = events[i].data;
+                const auto & request = requests[block_to_fetch_index];
+
+                const ssize_t read_bytes = eventResult(events[i]);
+
+                if (read_bytes != static_cast<ssize_t>(block_size))
+                    throw Exception(ErrorCodes::AIO_READ_ERROR,
+                        "GC: AIO failed to read file ({}). Expected bytes ({}). Actual bytes ({})", file_path, block_size, read_bytes);
+
+                char * request_buffer = getRequestBuffer(request);
+
+                // Unpoison the memory returned from an uninstrumented system function.
+                __msan_unpoison(request_buffer, block_size);
+
+                SSDCacheBlock block(block_size);
+                block.reset(request_buffer);
+
+                if (!block.checkCheckSum())
+                {
+                    std::string calculated_check_sum = std::to_string(block.calculateCheckSum());
+                    std::string check_sum = std::to_string(block.getCheckSum());
+                    throw Exception(ErrorCodes::CORRUPTED_DATA,
+                        "Cache data corrupted. Checksum validation failed. Calculated {} in block {}",
+                        calculated_check_sum,
+                        check_sum);
+                }
+
+                std::forward<FetchBlockFunc>(func)(blocks_to_fetch[block_to_fetch_index], block.getBlockData());
+
+                processed[block_to_fetch_index] = true;
+            }
+
+            while (to_pop < requests.size() && processed[to_pop])
+                ++to_pop;
+
+            /// add new io tasks
+            const int new_tasks_count = std::min(read_from_file_buffer_blocks_size - (to_push - to_pop), requests.size() - to_push);
+
+            int pushed = 0;
+            while (new_tasks_count > 0 && (pushed = io_submit(aio_context.ctx, new_tasks_count, &pointers[to_push])) <= 0)
+            {
+                if (errno != EINTR)
+                    throwFromErrno("io_submit: Failed to submit a request for asynchronous IO", ErrorCodes::CANNOT_IO_SUBMIT);
+            }
+
+            to_push += pushed;
+        }
+    }
+
+    inline size_t getCurrentBlockIndex() const { return current_block_index; }
+
+    inline void reset()
+    {
+        current_block_index = 0;
+    }
+private:
+    struct FileDescriptor : private boost::noncopyable
+    {
+
+        FileDescriptor() = default;
+
+        FileDescriptor(FileDescriptor && rhs) : fd(rhs.fd) { rhs.fd = -1; }
+
+        FileDescriptor & operator=(FileDescriptor && rhs)
+        {
+            close(fd);
+
+            fd = rhs.fd;
+            rhs.fd = -1;
+        }
+
+        ~FileDescriptor()
+        {
+            if (fd != -1)
+                close(fd);
+        }
+
+        int fd = -1;
+    };
+
+    inline static int preallocateDiskSpace(int fd, size_t offset, size_t len)
+    {
+        #if defined(__FreeBSD__)
+            return posix_fallocate(fd, offset, len);
+        #else
+            return fallocate(fd, 0, offset, len);
+        #endif
+    }
+
+    inline static char * getRequestBuffer(const iocb & request)
+    {
+        char * result = nullptr;
+
+        #if defined(__FreeBSD__)
+            result = reinterpret_cast<char *>(reinterpret_cast<UInt64>(request.aio.aio_buf));
+        #else
+            result = reinterpret_cast<char *>(request.aio_buf);
+        #endif
+
+        return result;
+    }
+
+    inline static ssize_t eventResult(io_event & event)
+    {
+        ssize_t  bytes_written;
+
+        #if defined(__FreeBSD__)
+            bytes_written = aio_return(reinterpret_cast<struct aiocb *>(event.udata));
+        #else
+            bytes_written = event.res;
+        #endif
+
+        return bytes_written;
+    }
+
+    String file_path;
+    size_t block_size;
+    size_t file_blocks_size;
+    FileDescriptor file;
+
+    size_t current_block_index = 0;
+    size_t current_blocks_size = 0;
+};
+
+/** ICacheDictionaryStorage implementation that keeps column data serialized in memory index and in disk partitions.
+  * Data is first written in memory buffer.
+  * If memory buffer is full then buffer is flushed to disk partition.
+  * If memory buffer cannot be flushed to associated disk partition, then if partition
+  * can be allocated (current partition index < max_partitions_size) storage allocates new partition, if not old partitions are reused.
+  * Index maps key to partition block and offset.
+  */
+template <DictionaryKeyType dictionary_key_type>
+class SSDCacheDictionaryStorage final : public ICacheDictionaryStorage
+{
+public:
+    using SSDCacheKeyType = std::conditional_t<dictionary_key_type == DictionaryKeyType::simple, SSDCacheSimpleKey, SSDCacheComplexKey>;
+    using KeyType = std::conditional_t<dictionary_key_type == DictionaryKeyType::simple, UInt64, StringRef>;
+
+    explicit SSDCacheDictionaryStorage(const SSDCacheDictionaryStorageConfiguration & configuration_)
+        : configuration(configuration_)
+        , file_buffer(configuration_.file_path, configuration.block_size, configuration.file_blocks_size)
+        , rnd_engine(randomSeed())
+    {
+        memory_buffer_partitions.emplace_back(configuration.block_size, configuration.write_buffer_blocks_size);
+    }
+
+    bool returnsFetchedColumnsInOrderOfRequestedKeys() const override { return false; }
+
+    String getName() const override
+    {
+        if (dictionary_key_type == DictionaryKeyType::simple)
+            return "SSDCache";
+        else
+            return "SSDComplexKeyCache";
+    }
+
+    bool supportsSimpleKeys() const override { return dictionary_key_type == DictionaryKeyType::simple; }
+
+    SimpleKeysStorageFetchResult fetchColumnsForKeys(
+        const PaddedPODArray<UInt64> & keys,
+        const DictionaryStorageFetchRequest & fetch_request) override
+    {
+        if constexpr (dictionary_key_type == DictionaryKeyType::simple)
+            return fetchColumnsForKeysImpl<SimpleKeysStorageFetchResult>(keys, fetch_request);
+        else
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method insertColumnsForKeys is not supported for complex key storage");
+    }
+
+    void insertColumnsForKeys(const PaddedPODArray<UInt64> & keys, Columns columns) override
+    {
+        if constexpr (dictionary_key_type == DictionaryKeyType::simple)
+            insertColumnsForKeysImpl(keys, columns);
+        else
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method insertColumnsForKeys is not supported for complex key storage");
+    }
+
+    void insertDefaultKeys(const PaddedPODArray<UInt64> & keys) override
+    {
+        if constexpr (dictionary_key_type == DictionaryKeyType::simple)
+            insertDefaultKeysImpl(keys);
+        else
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method insertDefaultKeysImpl is not supported for complex key storage");
+    }
+
+    PaddedPODArray<UInt64> getCachedSimpleKeys() const override
+    {
+        if constexpr (dictionary_key_type == DictionaryKeyType::simple)
+            return getCachedKeysImpl();
+        else
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method getCachedSimpleKeys is not supported for complex key storage");
+    }
+
+    bool supportsComplexKeys() const override { return dictionary_key_type == DictionaryKeyType::complex; }
+
+    ComplexKeysStorageFetchResult fetchColumnsForKeys(
+        const PaddedPODArray<StringRef> & keys,
+        const DictionaryStorageFetchRequest & fetch_request) override
+    {
+        if constexpr (dictionary_key_type == DictionaryKeyType::complex)
+            return fetchColumnsForKeysImpl<ComplexKeysStorageFetchResult>(keys, fetch_request);
+        else
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method fetchColumnsForKeys is not supported for simple key storage");
+    }
+
+    void insertColumnsForKeys(const PaddedPODArray<StringRef> & keys, Columns columns) override
+    {
+        if constexpr (dictionary_key_type == DictionaryKeyType::complex)
+            insertColumnsForKeysImpl(keys, columns);
+        else
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method insertColumnsForKeys is not supported for simple key storage");
+    }
+
+    void insertDefaultKeys(const PaddedPODArray<StringRef> & keys) override
+    {
+        if constexpr (dictionary_key_type == DictionaryKeyType::complex)
+            insertDefaultKeysImpl(keys);
+        else
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method insertDefaultKeysImpl is not supported for simple key storage");
+    }
+
+    PaddedPODArray<StringRef> getCachedComplexKeys() const override
+    {
+        if constexpr (dictionary_key_type == DictionaryKeyType::complex)
+            return getCachedKeysImpl();
+        else
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method getCachedSimpleKeys is not supported for simple key storage");
+    }
+
+    size_t getSize() const override { return index.size(); }
+
+    double getLoadFactor() const override
+    {
+        size_t partitions_size = memory_buffer_partitions.size();
+
+        if (partitions_size == configuration.max_partitions_count)
+            return 1.0;
+
+        auto & current_memory_partition = memory_buffer_partitions[current_partition_index];
+
+        size_t full_partitions = partitions_size - 1;
+        size_t blocks_in_memory = (full_partitions * configuration.write_buffer_blocks_size) + current_memory_partition.getCurrentBlockIndex();
+        size_t blocks_on_disk = file_buffer.getCurrentBlockIndex();
+
+        size_t max_blocks_size = (configuration.file_blocks_size + configuration.write_buffer_blocks_size) * configuration.max_partitions_count;
+
+        double load_factor = static_cast<double>(blocks_in_memory + blocks_on_disk) / max_blocks_size;
+        return load_factor;
+    }
+
+    size_t getBytesAllocated() const override
+    {
+        size_t memory_partitions_bytes_size = memory_buffer_partitions.size() * configuration.write_buffer_blocks_size * configuration.block_size;
+        size_t file_partitions_bytes_size = memory_buffer_partitions.size() * configuration.file_blocks_size * configuration.block_size;
+
+        return index.getBufferSizeInBytes() + memory_partitions_bytes_size + file_partitions_bytes_size;
+    }
+
+private:
+
+    using TimePoint = std::chrono::system_clock::time_point;
+
+    struct Cell
+    {
+        enum CellState
+        {
+            in_memory,
+            on_disk,
+            default_value
+        };
+
+        time_t deadline;
+        SSDCacheIndex index;
+        size_t in_memory_partition_index;
+        CellState state;
+
+        inline bool isInMemory() const { return state == in_memory; }
+        inline bool isOnDisk() const { return state == on_disk; }
+        inline bool isDefaultValue() const { return state == default_value; }
+    };
+
+    struct KeyToBlockOffset
+    {
+        KeyToBlockOffset(size_t key_index_, size_t offset_in_block_)
+            : key_index(key_index_), offset_in_block(offset_in_block_)
+        {}
+
+        size_t key_index = 0;
+        size_t offset_in_block = 0;
+    };
+
+    template <typename Result>
+    Result fetchColumnsForKeysImpl(
+        const PaddedPODArray<KeyType> & keys,
+        const DictionaryStorageFetchRequest & fetch_request) const
+    {
+        Result result;
+
+        result.fetched_columns = fetch_request.makeAttributesResultColumns();
+        result.key_index_to_state.resize_fill(keys.size());
+
+        const time_t now = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
+
+        size_t fetched_columns_index = 0;
+
+        using BlockIndexToKeysMap = absl::flat_hash_map<size_t, PaddedPODArray<KeyToBlockOffset>, DefaultHash<size_t>>;
+        BlockIndexToKeysMap block_to_keys_map;
+        absl::flat_hash_set<size_t, DefaultHash<size_t>> unique_blocks_to_request;
+        PaddedPODArray<size_t> blocks_to_request;
+
+        time_t strict_max_lifetime_seconds = static_cast<time_t>(configuration.strict_max_lifetime_seconds);
+        size_t keys_size = keys.size();
+
+        for (size_t attribute_size = 0; attribute_size < fetch_request.attributesSize(); ++attribute_size)
+            if (fetch_request.shouldFillResultColumnWithIndex(attribute_size))
+                result.fetched_columns[attribute_size]->reserve(keys_size);
+
+        for (size_t key_index = 0; key_index < keys_size; ++key_index)
+        {
+            auto key = keys[key_index];
+
+            const auto * it = index.find(key);
+
+            if (!it)
+            {
+                ++result.not_found_keys_size;
+                continue;
+            }
+
+            const auto & cell = it->getMapped();
+
+            if (unlikely(now > cell.deadline + strict_max_lifetime_seconds))
+            {
+                ++result.not_found_keys_size;
+                continue;
+            }
+
+            bool cell_is_expired = false;
+            KeyState::State key_state = KeyState::found;
+
+            if (now > cell.deadline)
+            {
+                cell_is_expired = true;
+                key_state = KeyState::expired;
+            }
+
+            result.expired_keys_size += static_cast<size_t>(cell_is_expired);
+            result.found_keys_size += static_cast<size_t>(!cell_is_expired);
+
+            switch (cell.state)
+            {
+                case Cell::in_memory:
+                {
+                    result.key_index_to_state[key_index] = {key_state, fetched_columns_index};
+                    ++fetched_columns_index;
+
+                    const auto & partition = memory_buffer_partitions[cell.in_memory_partition_index];
+                    char * serialized_columns_place = partition.getPlace(cell.index);
+                    deserializeAndInsertIntoColumns(result.fetched_columns, fetch_request, serialized_columns_place);
+                    break;
+                }
+                case Cell::on_disk:
+                {
+                    PaddedPODArray<KeyToBlockOffset> & keys_block = block_to_keys_map[cell.index.block_index];
+                    keys_block.emplace_back(key_index, cell.index.offset_in_block);
+
+                    KeyState::State state = cell_is_expired ? KeyState::expired : KeyState::found;
+
+                    /// Fetched column index will be set later during fetch blocks
+                    result.key_index_to_state[key_index] = {state, 0};
+
+                    auto insert_result = unique_blocks_to_request.insert(cell.index.block_index);
+                    bool was_inserted = insert_result.second;
+
+                    if (was_inserted)
+                        blocks_to_request.emplace_back(cell.index.block_index);
+
+                    break;
+                }
+                case Cell::default_value:
+                {
+                    result.key_index_to_state[key_index] = {key_state, fetched_columns_index};
+                    result.key_index_to_state[key_index].setDefault();
+                    ++fetched_columns_index;
+                    ++result.default_keys_size;
+
+                    insertDefaultValuesIntoColumns(result.fetched_columns, fetch_request, key_index);
+                    break;
+                }
+            }
+        }
+
+        /// Sort blocks by offset before start async io requests
+        std::sort(blocks_to_request.begin(), blocks_to_request.end());
+
+        file_buffer.fetchBlocks(configuration.read_buffer_blocks_size, blocks_to_request, [&](size_t block_index, char * block_data)
+        {
+            auto & keys_in_block = block_to_keys_map[block_index];
+
+            for (auto & key_in_block : keys_in_block)
+            {
+                char * key_data = block_data + key_in_block.offset_in_block;
+                deserializeAndInsertIntoColumns(result.fetched_columns, fetch_request, key_data);
+
+                result.key_index_to_state[key_in_block.key_index].setFetchedColumnIndex(fetched_columns_index);
+
+                ++fetched_columns_index;
+            }
+        });
+
+        return result;
+    }
+
+    void insertColumnsForKeysImpl(const PaddedPODArray<KeyType> & keys, Columns columns)
+    {
+        size_t columns_to_serialize_size = columns.size();
+        PaddedPODArray<StringRef> temporary_column_data(columns_to_serialize_size);
+
+        Arena temporary_values_pool;
+
+        const auto now = std::chrono::system_clock::now();
+
+        for (size_t key_index = 0; key_index < keys.size(); ++key_index)
+        {
+            size_t allocated_size_for_columns = 0;
+            const char * block_start = nullptr;
+
+            auto key = keys[key_index];
+
+            for (size_t column_index = 0; column_index < columns_to_serialize_size; ++column_index)
+            {
+                auto & column = columns[column_index];
+                temporary_column_data[column_index] = column->serializeValueIntoArena(key_index, temporary_values_pool, block_start);
+                allocated_size_for_columns += temporary_column_data[column_index].size;
+            }
+
+            SSDCacheKeyType ssd_cache_key { key, allocated_size_for_columns, block_start };
+
+            if (!SSDCacheBlock::canBeWrittenInEmptyBlock(ssd_cache_key, configuration.block_size))
+                throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "Serialized columns size is greater than allowed block size and metadata");
+
+            /// We cannot reuse place that is already allocated in file or memory cache so we erase key from index
+            eraseKeyFromIndex(key);
+
+            Cell cell;
+            setCellDeadline(cell, now);
+
+            if constexpr (dictionary_key_type == DictionaryKeyType::complex)
+            {
+                /// Copy complex key into arena and put in cache
+                size_t key_size = key.size;
+                char * place_for_key = complex_key_arena.alloc(key_size);
+                memcpy(reinterpret_cast<void *>(place_for_key), reinterpret_cast<const void *>(key.data), key_size);
+                KeyType updated_key{place_for_key, key_size};
+                ssd_cache_key.key = updated_key;
+            }
+
+            insertCell(ssd_cache_key, cell);
+
+            temporary_values_pool.rollback(allocated_size_for_columns);
+        }
+    }
+
+    void insertDefaultKeysImpl(const PaddedPODArray<KeyType> & keys)
+    {
+        const auto now = std::chrono::system_clock::now();
+
+        for (auto key : keys)
+        {
+            eraseKeyFromIndex(key);
+
+            Cell cell;
+
+            setCellDeadline(cell, now);
+            cell.index = {0, 0};
+            cell.in_memory_partition_index = 0;
+            cell.state = Cell::default_value;
+
+
+            if constexpr (dictionary_key_type == DictionaryKeyType::complex)
+            {
+                /// Copy complex key into arena and put in cache
+                size_t key_size = key.size;
+                char * place_for_key = complex_key_arena.alloc(key_size);
+                memcpy(reinterpret_cast<void *>(place_for_key), reinterpret_cast<const void *>(key.data), key_size);
+                KeyType updated_key{place_for_key, key_size};
+                key = updated_key;
+            }
+
+            index[key] = cell;
+        }
+    }
+
+    PaddedPODArray<KeyType> getCachedKeysImpl() const
+    {
+        PaddedPODArray<KeyType> result;
+        result.reserve(index.size());
+
+        for (auto & node : index)
+        {
+            auto & cell = node.getMapped();
+
+            if (cell.state == Cell::default_value)
+                continue;
+
+            result.emplace_back(node.getKey());
+        }
+
+        return result;
+    }
+
+    void insertCell(SSDCacheKeyType & ssd_cache_key, Cell & cell)
+    {
+        /** InsertCell has following flow
+
+            1. We try to write key into current memory buffer, if write succeeded then return.
+            2. Then if we does not write key into current memory buffer, we try to flush current memory buffer
+            to disk.
+
+            If flush succeeded then reset current memory buffer, write key into it and return.
+            If flush failed that means that current partition on disk is full, need to allocate new partition
+            or start reusing old ones.
+
+            Retry to step 1.
+         */
+
+        SSDCacheIndex cache_index {0, 0};
+
+        while (true)
+        {
+            bool started_reusing_old_partitions = memory_buffer_partitions.size() == configuration.max_partitions_count;
+
+            auto & current_memory_buffer_partition = memory_buffer_partitions[current_partition_index];
+
+            bool write_into_memory_buffer_result = current_memory_buffer_partition.writeKey(ssd_cache_key, cache_index);
+
+            if (write_into_memory_buffer_result)
+            {
+                cell.state = Cell::in_memory;
+                cell.index = cache_index;
+                cell.in_memory_partition_index = current_partition_index;
+
+                index[ssd_cache_key.key] = cell;
+                break;
+            }
+            else
+            {
+                /// Partition memory write buffer if full flush it to disk and retry
+                size_t block_index_in_file_before_write = file_buffer.getCurrentBlockIndex();
+
+                if (started_reusing_old_partitions)
+                {
+                    /// If we start reusing old partitions we need to remove old keys on disk from index before writing buffer
+                    PaddedPODArray<KeyType> old_keys;
+                    file_buffer.readKeys(block_index_in_file_before_write, configuration.write_buffer_blocks_size, old_keys);
+
+                    size_t file_read_end_block_index = block_index_in_file_before_write + configuration.write_buffer_blocks_size;
+
+                    for (auto old_key : old_keys)
+                    {
+                        auto * it = index.find(old_key);
+
+                        if (it)
+                        {
+                            const Cell & old_key_cell = it->getMapped();
+
+                            size_t old_key_block = old_key_cell.index.block_index;
+
+                            /// Check if key in index is key from old partition blocks
+                            if (old_key_cell.isOnDisk() &&
+                                old_key_block >= block_index_in_file_before_write &&
+                                old_key_block < file_read_end_block_index)
+                                eraseKeyFromIndex(old_key);
+                        }
+                    }
+                }
+
+                const char * partition_data = current_memory_buffer_partition.getData();
+
+                bool flush_to_file_result = file_buffer.writeBuffer(partition_data, configuration.write_buffer_blocks_size);
+
+                if (flush_to_file_result)
+                {
+                    /// Update index cells keys offset and block index
+                    PaddedPODArray<KeyType> keys_to_update;
+                    current_memory_buffer_partition.readKeys(keys_to_update);
+
+                    absl::flat_hash_set<KeyType, DefaultHash<KeyType>> updated_keys;
+
+                    Int64 keys_to_update_size = static_cast<Int64>(keys_to_update.size());
+
+                    /// Start from last to first because there can be multiple keys in same partition.
+                    /// The valid key is the latest.
+                    for (Int64 i = keys_to_update_size - 1; i >= 0; --i)
+                    {
+                        auto key_to_update = keys_to_update[i];
+                        auto * it = index.find(key_to_update);
+
+                        /// If there are no key to update or key to update not in memory
+                        if (!it || it->getMapped().state != Cell::in_memory)
+                            continue;
+
+                        /// If there were duplicated keys in memory buffer partition
+                        if (updated_keys.contains(it->getKey()))
+                            continue;
+
+                        updated_keys.insert(key_to_update);
+
+                        Cell & cell_to_update = it->getMapped();
+
+                        cell_to_update.state = Cell::on_disk;
+                        cell_to_update.index.block_index += block_index_in_file_before_write;
+                    }
+
+                    /// Memory buffer partition flushed to disk start reusing it
+                    current_memory_buffer_partition.reset();
+                    memset(const_cast<char *>(current_memory_buffer_partition.getData()), 0, current_memory_buffer_partition.getSizeInBytes());
+
+                    write_into_memory_buffer_result = current_memory_buffer_partition.writeKey(ssd_cache_key, cache_index);
+                    assert(write_into_memory_buffer_result);
+
+                    cell.state = Cell::in_memory;
+                    cell.index = cache_index;
+                    cell.in_memory_partition_index = current_partition_index;
+
+                    index[ssd_cache_key.key] = cell;
+                    break;
+                }
+                else
+                {
+                    /// Partition is full need to try next partition
+
+                    if (memory_buffer_partitions.size() < configuration.max_partitions_count)
+                    {
+                        /// Try tro create next partition without reusing old partitions
+                        ++current_partition_index;
+                        file_buffer.allocateSizeForNextPartition();
+                        memory_buffer_partitions.emplace_back(configuration.block_size, configuration.write_buffer_blocks_size);
+                    }
+                    else
+                    {
+                        /// Start reusing old partitions
+                        current_partition_index = (current_partition_index + 1) % memory_buffer_partitions.size();
+                        file_buffer.reset();
+                    }
+                }
+            }
+        }
+    }
+
+    inline void setCellDeadline(Cell & cell, TimePoint now)
+    {
+        if (configuration.lifetime.min_sec == 0 && configuration.lifetime.max_sec == 0)
+        {
+            auto deadline = std::chrono::time_point<std::chrono::system_clock>::max() - 2 * std::chrono::seconds(configuration.strict_max_lifetime_seconds);
+            cell.deadline = std::chrono::system_clock::to_time_t(deadline);
+            return;
+        }
+
+        size_t min_sec_lifetime = configuration.lifetime.min_sec;
+        size_t max_sec_lifetime = configuration.lifetime.max_sec;
+
+        std::uniform_int_distribution<UInt64> distribution{min_sec_lifetime, max_sec_lifetime};
+        auto deadline = now + std::chrono::seconds(distribution(rnd_engine));
+        cell.deadline = std::chrono::system_clock::to_time_t(deadline);
+    }
+
+    inline void eraseKeyFromIndex(KeyType key)
+    {
+        auto it = index.find(key);
+
+        if (it == nullptr)
+            return;
+
+        /// In case of complex key in arena key is serialized from hash table
+        KeyType key_copy = it->getKey();
+
+        index.erase(key);
+
+        if constexpr (std::is_same_v<KeyType, StringRef>)
+            complex_key_arena.free(const_cast<char *>(key_copy.data), key_copy.size);
+    }
+
+    SSDCacheDictionaryStorageConfiguration configuration;
+
+    SSDCacheFileBuffer<SSDCacheKeyType> file_buffer;
+
+    std::vector<SSDCacheMemoryBuffer<SSDCacheKeyType>> memory_buffer_partitions;
+
+    pcg64 rnd_engine;
+
+    using SimpleKeyHashMap = HashMap<UInt64, Cell>;
+    using ComplexKeyHashMap = HashMapWithSavedHash<StringRef, Cell>;
+
+    using CacheMap = std::conditional_t<
+        dictionary_key_type == DictionaryKeyType::simple,
+        SimpleKeyHashMap,
+        ComplexKeyHashMap>;
+
+    ArenaWithFreeLists complex_key_arena;
+
+    CacheMap index;
+
+    size_t current_partition_index = 0;
+
+};
+
+}
+
+#endif
diff --git a/src/Dictionaries/SSDComplexKeyCacheDictionary.cpp b/src/Dictionaries/SSDComplexKeyCacheDictionary.cpp
deleted file mode 100644
index cb22dd2be15..00000000000
--- a/src/Dictionaries/SSDComplexKeyCacheDictionary.cpp
+++ /dev/null
@@ -1,1772 +0,0 @@
-#if defined(OS_LINUX) || defined(__FreeBSD__)
-
-#include "SSDComplexKeyCacheDictionary.h"
-
-#include <algorithm>
-#include <Columns/ColumnsNumber.h>
-#include <Common/typeid_cast.h>
-#include <Common/ProfileEvents.h>
-#include <Common/ProfilingScopedRWLock.h>
-#include <Common/MemorySanitizer.h>
-#include <DataStreams/IBlockInputStream.h>
-#include <DataTypes/DataTypesDecimal.h>
-#include "DictionaryBlockInputStream.h"
-#include "DictionaryFactory.h"
-#include <IO/AIO.h>
-#include <IO/ReadHelpers.h>
-#include <IO/WriteHelpers.h>
-#include <ext/chrono_io.h>
-#include <ext/map.h>
-#include <ext/range.h>
-#include <ext/size.h>
-#include <ext/bit_cast.h>
-#include <numeric>
-#include <filesystem>
-#include <city.h>
-#include <fcntl.h>
-#include <Functions/FunctionHelpers.h>
-
-namespace ProfileEvents
-{
-    extern const Event DictCacheKeysRequested;
-    extern const Event DictCacheKeysRequestedMiss;
-    extern const Event DictCacheKeysRequestedFound;
-    extern const Event DictCacheKeysExpired;
-    extern const Event DictCacheKeysNotFound;
-    extern const Event DictCacheKeysHit;
-    extern const Event DictCacheRequestTimeNs;
-    extern const Event DictCacheRequests;
-    extern const Event DictCacheLockWriteNs;
-    extern const Event DictCacheLockReadNs;
-    extern const Event FileOpen;
-    extern const Event WriteBufferAIOWrite;
-    extern const Event WriteBufferAIOWriteBytes;
-}
-
-namespace CurrentMetrics
-{
-    extern const Metric DictCacheRequests;
-    extern const Metric Write;
-}
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int AIO_READ_ERROR;
-    extern const int AIO_WRITE_ERROR;
-    extern const int BAD_ARGUMENTS;
-    extern const int CACHE_DICTIONARY_UPDATE_FAIL;
-    extern const int CANNOT_ALLOCATE_MEMORY;
-    extern const int CANNOT_CREATE_DIRECTORY;
-    extern const int CANNOT_FSYNC;
-    extern const int CANNOT_IO_GETEVENTS;
-    extern const int CANNOT_IO_SUBMIT;
-    extern const int CANNOT_OPEN_FILE;
-    extern const int CORRUPTED_DATA;
-    extern const int FILE_DOESNT_EXIST;
-    extern const int NOT_IMPLEMENTED;
-    extern const int TYPE_MISMATCH;
-    extern const int UNSUPPORTED_METHOD;
-}
-
-namespace
-{
-    constexpr size_t DEFAULT_SSD_BLOCK_SIZE_BYTES = DEFAULT_AIO_FILE_BLOCK_SIZE;
-    constexpr size_t DEFAULT_FILE_SIZE_BYTES = 4 * 1024 * 1024 * 1024ULL;
-    constexpr size_t DEFAULT_PARTITIONS_COUNT = 16;
-    constexpr size_t DEFAULT_READ_BUFFER_SIZE_BYTES = 16 * DEFAULT_SSD_BLOCK_SIZE_BYTES;
-    constexpr size_t DEFAULT_WRITE_BUFFER_SIZE_BYTES = DEFAULT_SSD_BLOCK_SIZE_BYTES;
-
-    constexpr size_t DEFAULT_MAX_STORED_KEYS = 100000;
-
-    constexpr size_t BUFFER_ALIGNMENT = DEFAULT_AIO_FILE_BLOCK_SIZE;
-    constexpr size_t BLOCK_CHECKSUM_SIZE_BYTES = 8;
-    constexpr size_t BLOCK_SPECIAL_FIELDS_SIZE_BYTES = 4;
-
-    constexpr UInt64 KEY_METADATA_EXPIRES_AT_MASK = std::numeric_limits<std::chrono::system_clock::time_point::rep>::max();
-    constexpr UInt64 KEY_METADATA_IS_DEFAULT_MASK = ~KEY_METADATA_EXPIRES_AT_MASK;
-
-    constexpr size_t KEY_IN_MEMORY_BIT = 63;
-    constexpr size_t KEY_IN_MEMORY = (1ULL << KEY_IN_MEMORY_BIT);
-    constexpr size_t BLOCK_INDEX_BITS = 32;
-    constexpr size_t INDEX_IN_BLOCK_BITS = 16;
-    constexpr size_t INDEX_IN_BLOCK_MASK = (1ULL << INDEX_IN_BLOCK_BITS) - 1;
-    constexpr size_t BLOCK_INDEX_MASK = ((1ULL << (BLOCK_INDEX_BITS + INDEX_IN_BLOCK_BITS)) - 1) ^ INDEX_IN_BLOCK_MASK;
-
-    constexpr size_t NOT_EXISTS = -1;
-
-    constexpr UInt8 HAS_NOT_FOUND = 2;
-
-    const std::string BIN_FILE_EXT = ".bin";
-    const std::string IND_FILE_EXT = ".idx";
-
-    int preallocateDiskSpace(int fd, size_t len)
-    {
-        #if defined(__FreeBSD__)
-            return posix_fallocate(fd, 0, len);
-        #else
-            return fallocate(fd, 0, 0, len);
-        #endif
-    }
-}
-
-SSDComplexKeyCachePartition::Metadata::time_point_t SSDComplexKeyCachePartition::Metadata::expiresAt() const
-{
-    return ext::safe_bit_cast<time_point_t>(data & KEY_METADATA_EXPIRES_AT_MASK);
-}
-void SSDComplexKeyCachePartition::Metadata::setExpiresAt(const time_point_t & t)
-{
-    data = ext::safe_bit_cast<time_point_urep_t>(t);
-}
-
-bool SSDComplexKeyCachePartition::Metadata::isDefault() const
-{
-    return (data & KEY_METADATA_IS_DEFAULT_MASK) == KEY_METADATA_IS_DEFAULT_MASK;
-}
-void SSDComplexKeyCachePartition::Metadata::setDefault()
-{
-    data |= KEY_METADATA_IS_DEFAULT_MASK;
-}
-
-bool SSDComplexKeyCachePartition::Index::inMemory() const
-{
-    return (index & KEY_IN_MEMORY) == KEY_IN_MEMORY;
-}
-
-bool SSDComplexKeyCachePartition::Index::exists() const
-{
-    return index != NOT_EXISTS;
-}
-
-void SSDComplexKeyCachePartition::Index::setNotExists()
-{
-    index = NOT_EXISTS;
-}
-
-void SSDComplexKeyCachePartition::Index::setInMemory(const bool in_memory)
-{
-    index = (index & ~KEY_IN_MEMORY) | (static_cast<size_t>(in_memory) << KEY_IN_MEMORY_BIT);
-}
-
-size_t SSDComplexKeyCachePartition::Index::getAddressInBlock() const
-{
-    return index & INDEX_IN_BLOCK_MASK;
-}
-
-void SSDComplexKeyCachePartition::Index::setAddressInBlock(const size_t address_in_block)
-{
-    index = (index & ~INDEX_IN_BLOCK_MASK) | address_in_block;
-}
-
-size_t SSDComplexKeyCachePartition::Index::getBlockId() const
-{
-    return (index & BLOCK_INDEX_MASK) >> INDEX_IN_BLOCK_BITS;
-}
-
-void SSDComplexKeyCachePartition::Index::setBlockId(const size_t block_id)
-{
-    index = (index & ~BLOCK_INDEX_MASK) | (block_id << INDEX_IN_BLOCK_BITS);
-}
-
-SSDComplexKeyCachePartition::SSDComplexKeyCachePartition(
-        const AttributeUnderlyingType & /* key_structure */,
-        const std::vector<AttributeUnderlyingType> & attributes_structure_,
-        const std::string & dir_path,
-        const size_t file_id_,
-        const size_t max_size_,
-        const size_t block_size_,
-        const size_t read_buffer_size_,
-        const size_t write_buffer_size_,
-        const size_t max_stored_keys_)
-    : file_id(file_id_)
-    , max_size(max_size_)
-    , block_size(block_size_)
-    , read_buffer_size(read_buffer_size_)
-    , write_buffer_size(write_buffer_size_)
-    , max_stored_keys(max_stored_keys_)
-    , path(dir_path + "/" + std::to_string(file_id))
-    , key_to_index(max_stored_keys, KeyDeleter(keys_pool))
-    , attributes_structure(attributes_structure_)
-{
-    if (!std::filesystem::create_directories(std::filesystem::path{dir_path}))
-    {
-        if (std::filesystem::exists(std::filesystem::path{dir_path}))
-            LOG_INFO(&Poco::Logger::get("SSDComplexKeyCachePartition::Constructor"), "Using existing directory '{}' for cache-partition", dir_path);
-        else
-            throw Exception{"Failed to create directories.", ErrorCodes::CANNOT_CREATE_DIRECTORY};
-    }
-
-    {
-        ProfileEvents::increment(ProfileEvents::FileOpen);
-
-        const std::string filename = path + BIN_FILE_EXT;
-        fd = ::open(filename.c_str(), O_RDWR | O_CREAT | O_TRUNC | O_DIRECT, 0666);
-        if (fd == -1)
-        {
-            auto error_code = (errno == ENOENT) ? ErrorCodes::FILE_DOESNT_EXIST : ErrorCodes::CANNOT_OPEN_FILE;
-            throwFromErrnoWithPath("Cannot open file " + filename, filename, error_code);
-        }
-
-        if (preallocateDiskSpace(fd, max_size * block_size) < 0)
-            throwFromErrnoWithPath("Cannot preallocate space for the file " + filename, filename, ErrorCodes::CANNOT_ALLOCATE_MEMORY);
-    }
-}
-
-SSDComplexKeyCachePartition::~SSDComplexKeyCachePartition()
-{
-    std::unique_lock lock(rw_lock);
-    ::close(fd);
-}
-
-size_t SSDComplexKeyCachePartition::appendDefaults(
-    const KeyRefs & keys_in,
-    const PaddedPODArray<Metadata> & metadata,
-    const size_t begin)
-{
-    std::unique_lock lock(rw_lock);
-    KeyRefs keys(keys_in.size());
-    for (size_t i = 0; i < keys_in.size(); ++i)
-        keys[i] = keys_pool.copyKeyFrom(keys_in[i]);
-
-    return append(keys, Attributes{}, metadata, begin);
-}
-
-size_t SSDComplexKeyCachePartition::appendBlock(
-    const Columns & key_columns, const DataTypes & /* key_types */,
-    const Attributes & new_attributes, const PaddedPODArray<Metadata> & metadata, const size_t begin)
-{
-    std::unique_lock lock(rw_lock);
-    if (!new_attributes.empty() && new_attributes.size() != attributes_structure.size())
-        throw Exception{"Wrong columns number in block.", ErrorCodes::BAD_ARGUMENTS};
-
-    const auto keys_size = key_columns.size();
-    KeyRefs keys(key_columns.front()->size());
-    {
-        StringRefs tmp_keys_refs(keys_size);
-        for (size_t i = 0; i < key_columns.front()->size(); ++i)
-            keys[i] = keys_pool.allocKey(i, key_columns, tmp_keys_refs);
-    }
-
-    return append(keys, new_attributes, metadata, begin);
-}
-
-size_t SSDComplexKeyCachePartition::append(
-    const KeyRefs & keys,
-    const Attributes & new_attributes,
-    const PaddedPODArray<Metadata> & metadata,
-    const size_t begin)
-{
-    if (!memory)
-        memory.emplace(block_size * write_buffer_size, BUFFER_ALIGNMENT);
-
-    auto init_write_buffer = [&]()
-    {
-        write_buffer.emplace(memory->data() + current_memory_block_id * block_size, block_size);
-        uint64_t tmp = 0;
-        write_buffer->write(reinterpret_cast<char*>(&tmp), BLOCK_CHECKSUM_SIZE_BYTES);
-        write_buffer->write(reinterpret_cast<char*>(&tmp), BLOCK_SPECIAL_FIELDS_SIZE_BYTES);
-        keys_in_block = 0;
-    };
-
-    if (!write_buffer)
-        init_write_buffer();
-    if (!keys_buffer_pool)
-        keys_buffer_pool.emplace();
-
-    bool flushed = false;
-    auto finish_block = [&]()
-    {
-        write_buffer.reset();
-        std::memcpy(memory->data() + block_size * current_memory_block_id + BLOCK_CHECKSUM_SIZE_BYTES, &keys_in_block, sizeof(keys_in_block)); // set count
-        uint64_t checksum = CityHash_v1_0_2::CityHash64(memory->data() + block_size * current_memory_block_id + BLOCK_CHECKSUM_SIZE_BYTES, block_size - BLOCK_CHECKSUM_SIZE_BYTES); // checksum
-        std::memcpy(memory->data() + block_size * current_memory_block_id, &checksum, sizeof(checksum));
-        if (++current_memory_block_id == write_buffer_size)
-            flush();
-        flushed = true;
-    };
-
-    for (size_t index = begin; index < keys.size();)
-    {
-        Index cache_index;
-        cache_index.setInMemory(true);
-        cache_index.setBlockId(current_memory_block_id);
-        cache_index.setAddressInBlock(write_buffer->offset());
-
-        flushed = false;
-        if (keys[index].fullSize() + sizeof(UInt64) > write_buffer->available()) // place for key and metadata
-        {
-            finish_block();
-        }
-        else
-        {
-            keys_pool.writeKey(keys[index], *write_buffer);
-            writeBinary(metadata[index].data, *write_buffer);
-        }
-
-        for (const auto & attribute : new_attributes)
-        {
-            if (flushed)
-                break;
-            switch (attribute.type)
-            {
-#define DISPATCH(TYPE) \
-            case AttributeUnderlyingType::ut##TYPE: \
-                { \
-                    if (sizeof(TYPE) > write_buffer->available()) \
-                    { \
-                        finish_block(); \
-                        continue; \
-                    } \
-                    else \
-                    { \
-                        const auto & values = std::get<Attribute::Container<TYPE>>(attribute.values); /* NOLINT */ \
-                        writeBinary(values[index], *write_buffer); \
-                    } \
-                } \
-                break;
-
-                DISPATCH(UInt8)
-                DISPATCH(UInt16)
-                DISPATCH(UInt32)
-                DISPATCH(UInt64)
-                DISPATCH(UInt128)
-                DISPATCH(Int8)
-                DISPATCH(Int16)
-                DISPATCH(Int32)
-                DISPATCH(Int64)
-                DISPATCH(Decimal32)
-                DISPATCH(Decimal64)
-                DISPATCH(Decimal128)
-                DISPATCH(Float32)
-                DISPATCH(Float64)
-#undef DISPATCH
-
-            case AttributeUnderlyingType::utString:
-                {
-                    const auto & value = std::get<Attribute::Container<String>>(attribute.values)[index];
-                    if (sizeof(UInt64) + value.size() > write_buffer->available())
-                    {
-                        finish_block();
-                        continue;
-                    }
-                    else
-                    {
-                        writeStringBinary(value, *write_buffer);
-                    }
-                }
-                break;
-            }
-        }
-
-        if (!flushed)
-        {
-            key_to_index.setWithDelete(keys[index], cache_index);
-            keys_buffer.push_back(keys_buffer_pool->copyKeyFrom(keys[index]));
-            ++index;
-            ++keys_in_block;
-        }
-        else  // next block in write buffer or flushed to ssd
-        {
-            init_write_buffer();
-        }
-    }
-    return keys.size() - begin;
-}
-
-void SSDComplexKeyCachePartition::flush()
-{
-    if (current_file_block_id >= max_size)
-        clearOldestBlocks();
-
-    if (keys_buffer.empty())
-        return;
-
-    AIOContext aio_context{1};
-
-    iocb write_request{};
-    iocb * write_request_ptr{&write_request};
-
-#if defined(__FreeBSD__)
-    write_request.aio.aio_lio_opcode = LIO_WRITE;
-    write_request.aio.aio_fildes = fd;
-    write_request.aio.aio_buf = reinterpret_cast<volatile void *>(memory->data());
-    write_request.aio.aio_nbytes = block_size * write_buffer_size;
-    write_request.aio.aio_offset = (current_file_block_id % max_size) * block_size;
-#else
-    write_request.aio_lio_opcode = IOCB_CMD_PWRITE;
-    write_request.aio_fildes = fd;
-    write_request.aio_buf = reinterpret_cast<UInt64>(memory->data());
-    write_request.aio_nbytes = block_size * write_buffer_size;
-    write_request.aio_offset = (current_file_block_id % max_size) * block_size;
-#endif
-
-    while (io_submit(aio_context.ctx, 1, &write_request_ptr) < 0)
-    {
-        if (errno != EINTR)
-            throw Exception("Cannot submit request for asynchronous IO on file " + path + BIN_FILE_EXT, ErrorCodes::CANNOT_IO_SUBMIT);
-    }
-
-    CurrentMetrics::Increment metric_increment_write{CurrentMetrics::Write};
-
-    io_event event;
-    while (io_getevents(aio_context.ctx, 1, 1, &event, nullptr) < 0)
-    {
-        if (errno != EINTR)
-            throw Exception("Failed to wait for asynchronous IO completion on file " + path + BIN_FILE_EXT, ErrorCodes::CANNOT_IO_GETEVENTS);
-    }
-
-    // Unpoison the memory returned from an uninstrumented system function.
-    __msan_unpoison(&event, sizeof(event));
-
-    ssize_t  bytes_written;
-#if defined(__FreeBSD__)
-    bytes_written = aio_return(reinterpret_cast<struct aiocb *>(event.udata));
-#else
-    bytes_written = event.res;
-#endif
-
-    ProfileEvents::increment(ProfileEvents::WriteBufferAIOWrite);
-    ProfileEvents::increment(ProfileEvents::WriteBufferAIOWriteBytes, bytes_written);
-
-    if (bytes_written != static_cast<decltype(bytes_written)>(block_size * write_buffer_size))
-        throw Exception("Not all data was written for asynchronous IO on file " + path + BIN_FILE_EXT + ". returned: " + std::to_string(bytes_written), ErrorCodes::AIO_WRITE_ERROR);
-
-    if (::fsync(fd) < 0)
-        throwFromErrnoWithPath("Cannot fsync " + path + BIN_FILE_EXT, path + BIN_FILE_EXT, ErrorCodes::CANNOT_FSYNC);
-
-    /// commit changes in index
-    for (auto & key : keys_buffer)
-    {
-        Index index;
-        if (key_to_index.getKeyAndValue(key, index))
-        {
-            if (index.inMemory()) // Row can be inserted in the buffer twice, so we need to move to ssd only the last index.
-            {
-                index.setInMemory(false);
-                index.setBlockId((current_file_block_id % max_size) + index.getBlockId());
-            }
-            key_to_index.set(key, index);
-        }
-    }
-
-    current_file_block_id += write_buffer_size;
-    current_memory_block_id = 0;
-
-    /// clear buffer
-    keys_buffer.clear();
-    keys_buffer_pool.reset();
-    keys_buffer_pool.emplace();
-}
-
-template <typename Out, typename GetDefault>
-void SSDComplexKeyCachePartition::getValue(
-    const size_t attribute_index,
-    const Columns & key_columns,
-    const DataTypes & key_types,
-    ResultArrayType<Out> & out,
-    std::vector<bool> & found,
-    GetDefault & default_value_extractor,
-    std::chrono::system_clock::time_point now) const
-{
-    auto set_value = [&](const size_t index, ReadBuffer & buf)
-    {
-        keys_pool.ignoreKey(buf);
-        Metadata metadata;
-        readVarUInt(metadata.data, buf);
-
-        if (metadata.expiresAt() > now)
-        {
-            if (metadata.isDefault())
-                out[index] = default_value_extractor[index];
-            else
-            {
-                ignoreFromBufferToAttributeIndex(attribute_index, buf);
-                readBinary(out[index], buf);
-            }
-            found[index] = true;
-        }
-    };
-
-    getImpl(key_columns, key_types, set_value, found);
-}
-
-void SSDComplexKeyCachePartition::getString(const size_t attribute_index,
-    const Columns & key_columns, const DataTypes & key_types,
-    StringRefs & refs, ArenaWithFreeLists & arena, std::vector<bool> & found,
-    std::vector<size_t> & default_ids,
-    std::chrono::system_clock::time_point now) const
-{
-    auto set_value = [&](const size_t index, ReadBuffer & buf)
-    {
-        keys_pool.ignoreKey(buf);
-        Metadata metadata;
-        readBinary(metadata.data, buf);
-
-        if (metadata.expiresAt() > now)
-        {
-            if (metadata.isDefault())
-                default_ids.push_back(index);
-            else
-            {
-                ignoreFromBufferToAttributeIndex(attribute_index, buf);
-                size_t size = 0;
-                readVarUInt(size, buf);
-                char * string_ptr = arena.alloc(size);
-                memcpy(string_ptr, buf.position(), size);
-                refs[index].data = string_ptr;
-                refs[index].size = size;
-            }
-            found[index] = true;
-        }
-    };
-
-    getImpl(key_columns, key_types, set_value, found);
-}
-
-void SSDComplexKeyCachePartition::hasKeys(
-    const Columns & key_columns, const DataTypes & key_types, ResultArrayType<UInt8> & out,
-    std::vector<bool> & found, std::chrono::system_clock::time_point now) const
-{
-    auto set_value = [&](const size_t index, ReadBuffer & buf)
-    {
-        keys_pool.ignoreKey(buf);
-        Metadata metadata;
-        readBinary(metadata.data, buf);
-
-        if (metadata.expiresAt() > now)
-            out[index] = !metadata.isDefault();
-    };
-
-    getImpl(key_columns, key_types, set_value, found);
-}
-
-template <typename SetFunc>
-void SSDComplexKeyCachePartition::getImpl(
-    const Columns & key_columns, const DataTypes & /* key_types */,
-    SetFunc & set, std::vector<bool> & found) const
-{
-    TemporalComplexKeysPool tmp_keys_pool;
-    StringRefs tmp_refs(key_columns.size());
-
-    std::shared_lock lock(rw_lock);
-    PaddedPODArray<Index> indices(key_columns.front()->size());
-    for (size_t i = 0; i < key_columns.front()->size(); ++i)
-    {
-        auto key = tmp_keys_pool.allocKey(i, key_columns, tmp_refs);
-        SCOPE_EXIT(tmp_keys_pool.rollback(key));
-        Index index;
-        if (found[i])
-            indices[i].setNotExists();
-        else if (key_to_index.get(key, index))
-            indices[i] = index;
-        else
-            indices[i].setNotExists();
-    }
-
-    getValueFromMemory(indices, set);
-    getValueFromStorage(indices, set);
-}
-
-template <typename SetFunc>
-void SSDComplexKeyCachePartition::getValueFromMemory(const PaddedPODArray<Index> & indices, SetFunc & set) const
-{
-    // Do not check checksum while reading from memory.
-    for (size_t i = 0; i < indices.size(); ++i)
-    {
-        const auto & index = indices[i];
-        if (index.exists() && index.inMemory())
-        {
-            const size_t offset = index.getBlockId() * block_size + index.getAddressInBlock();
-
-            ReadBufferFromMemory read_buffer(memory->data() + offset, block_size * write_buffer_size - offset);
-            set(i, read_buffer);
-        }
-    }
-}
-
-template <typename SetFunc>
-void SSDComplexKeyCachePartition::getValueFromStorage(const PaddedPODArray<Index> & indices, SetFunc & set) const
-{
-    std::vector<std::pair<Index, size_t>> index_to_out;
-    for (size_t i = 0; i < indices.size(); ++i)
-    {
-        const auto & index = indices[i];
-        if (index.exists() && !index.inMemory())
-            index_to_out.emplace_back(index, i);
-    }
-    if (index_to_out.empty())
-        return;
-
-    /// sort by (block_id, offset_in_block)
-    std::sort(std::begin(index_to_out), std::end(index_to_out));
-
-    Memory read_buffer(block_size * read_buffer_size, BUFFER_ALIGNMENT);
-
-    // TODO: merge requests
-    std::vector<iocb> requests;
-    std::vector<iocb*> pointers;
-    std::vector<std::vector<size_t>> blocks_to_indices;
-    requests.reserve(index_to_out.size());
-    pointers.reserve(index_to_out.size());
-    blocks_to_indices.reserve(index_to_out.size());
-    for (size_t i = 0; i < index_to_out.size(); ++i)
-    {
-        #if defined(__FreeBSD__)
-        const size_t back_offset = requests.empty() ? -1 : static_cast<size_t>(requests.back().aio.aio_offset);
-        #else
-        const size_t back_offset = requests.empty() ? -1 : static_cast<size_t>(requests.back().aio_offset);
-        #endif
-
-        if (!requests.empty() && back_offset == index_to_out[i].first.getBlockId() * block_size)
-        {
-            blocks_to_indices.back().push_back(i);
-            continue;
-        }
-
-        iocb request{};
-#if defined(__FreeBSD__)
-        request.aio.aio_lio_opcode = LIO_READ;
-        request.aio.aio_fildes = fd;
-        request.aio.aio_buf = reinterpret_cast<volatile void *>(
-            reinterpret_cast<UInt64>(read_buffer.data()) + block_size * (requests.size() % read_buffer_size));
-        request.aio.aio_nbytes = block_size;
-        request.aio.aio_offset = index_to_out[i].first.getBlockId() * block_size;
-        request.aio_data = requests.size();
-#else
-        request.aio_lio_opcode = IOCB_CMD_PREAD;
-        request.aio_fildes = fd;
-        request.aio_buf = reinterpret_cast<UInt64>(read_buffer.data()) + block_size * (requests.size() % read_buffer_size);
-        request.aio_nbytes = block_size;
-        request.aio_offset = index_to_out[i].first.getBlockId() * block_size;
-        request.aio_data = requests.size();
-#endif
-        requests.push_back(request);
-        pointers.push_back(&requests.back());
-        blocks_to_indices.emplace_back();
-        blocks_to_indices.back().push_back(i);
-    }
-
-    AIOContext aio_context(read_buffer_size);
-
-    std::vector<bool> processed(requests.size(), false);
-    std::vector<io_event> events(requests.size());
-    #if defined(__linux__)
-    for (auto & event : events)
-        event.res = -1;
-    #endif
-
-
-    size_t to_push = 0;
-    size_t to_pop = 0;
-    while (to_pop < requests.size())
-    {
-        /// get io tasks from previous iteration
-        int popped = 0;
-        while (to_pop < to_push && (popped = io_getevents(aio_context.ctx, to_push - to_pop, to_push - to_pop, &events[to_pop], nullptr)) <= 0)
-        {
-            if (errno != EINTR)
-                throwFromErrno("io_getevents: Failed to get an event for asynchronous IO", ErrorCodes::CANNOT_IO_GETEVENTS);
-        }
-
-        for (size_t i = to_pop; i < to_pop + popped; ++i)
-        {
-            const auto request_id = events[i].data;
-            const auto & request = requests[request_id];
-
-            #if defined(__FreeBSD__)
-            const auto bytes_written = aio_return(reinterpret_cast<struct aiocb *>(events[i].udata));
-            #else
-            const auto bytes_written = events[i].res;
-            #endif
-
-            if (bytes_written != static_cast<ssize_t>(block_size))
-            {
-                #if defined(__FreeBSD__)
-                    throw Exception("AIO failed to read file " + path + BIN_FILE_EXT + ".", ErrorCodes::AIO_READ_ERROR);
-                #else
-                    throw Exception("AIO failed to read file " + path + BIN_FILE_EXT + ". " +
-                        "request_id= " + std::to_string(request.aio_data) + "/ " + std::to_string(requests.size()) +
-                        ", aio_nbytes=" + std::to_string(request.aio_nbytes) + ", aio_offset=" + std::to_string(request.aio_offset) +
-                        ", returned=" + std::to_string(events[i].res) + ", errno=" + std::to_string(errno), ErrorCodes::AIO_READ_ERROR);
-                #endif
-            }
-            #if defined(__FreeBSD__)
-            const char* buf_ptr = reinterpret_cast<char *>(reinterpret_cast<UInt64>(request.aio.aio_buf));
-            #else
-            const auto* buf_ptr = reinterpret_cast<char *>(request.aio_buf);
-            #endif
-
-            __msan_unpoison(buf_ptr, block_size);
-            uint64_t checksum = 0;
-            ReadBufferFromMemory buf_special(buf_ptr, block_size);
-            readBinary(checksum, buf_special);
-            uint64_t calculated_checksum = CityHash_v1_0_2::CityHash64(buf_ptr + BLOCK_CHECKSUM_SIZE_BYTES, block_size - BLOCK_CHECKSUM_SIZE_BYTES);
-            if (checksum != calculated_checksum)
-            {
-                throw Exception("Cache data corrupted. From block = " + std::to_string(checksum) + " calculated = " + std::to_string(calculated_checksum) + ".", ErrorCodes::CORRUPTED_DATA);
-            }
-
-            for (const size_t idx : blocks_to_indices[request_id])
-            {
-                const auto & [file_index, out_index] = index_to_out[idx];
-                ReadBufferFromMemory buf(
-                        buf_ptr + file_index.getAddressInBlock(),
-                        block_size - file_index.getAddressInBlock());
-                set(out_index, buf);
-            }
-
-            processed[request_id] = true;
-        }
-
-        while (to_pop < requests.size() && processed[to_pop])
-            ++to_pop;
-
-        /// add new io tasks
-        const int new_tasks_count = std::min(read_buffer_size - (to_push - to_pop), requests.size() - to_push);
-
-        int pushed = 0;
-        while (new_tasks_count > 0 && (pushed = io_submit(aio_context.ctx, new_tasks_count, &pointers[to_push])) <= 0)
-        {
-            if (errno != EINTR)
-                throwFromErrno("io_submit: Failed to submit a request for asynchronous IO", ErrorCodes::CANNOT_IO_SUBMIT);
-        }
-        to_push += pushed;
-    }
-}
-
-void SSDComplexKeyCachePartition::clearOldestBlocks()
-{
-    // write_buffer_size, because we need to erase the whole buffer.
-    Memory read_buffer_memory(block_size * write_buffer_size, BUFFER_ALIGNMENT);
-
-    iocb request{};
-#if defined(__FreeBSD__)
-    request.aio.aio_lio_opcode = LIO_READ;
-    request.aio.aio_fildes = fd;
-    request.aio.aio_buf = reinterpret_cast<volatile void *>(reinterpret_cast<UInt64>(read_buffer_memory.data()));
-    request.aio.aio_nbytes = block_size * write_buffer_size;
-    request.aio.aio_offset = (current_file_block_id % max_size) * block_size;
-    request.aio_data = 0;
-#else
-    request.aio_lio_opcode = IOCB_CMD_PREAD;
-    request.aio_fildes = fd;
-    request.aio_buf = reinterpret_cast<UInt64>(read_buffer_memory.data());
-    request.aio_nbytes = block_size * write_buffer_size;
-    request.aio_offset = (current_file_block_id % max_size) * block_size;
-    request.aio_data = 0;
-#endif
-
-    {
-        iocb* request_ptr = &request;
-        io_event event{};
-        AIOContext aio_context(1);
-
-        while (io_submit(aio_context.ctx, 1, &request_ptr) != 1)
-            if (errno != EINTR)
-                throwFromErrno("io_submit: Failed to submit a request for asynchronous IO", ErrorCodes::CANNOT_IO_SUBMIT);
-
-        while (io_getevents(aio_context.ctx, 1, 1, &event, nullptr) != 1)
-            if (errno != EINTR)
-                throwFromErrno("io_getevents: Failed to get an event for asynchronous IO", ErrorCodes::CANNOT_IO_GETEVENTS);
-
-#if defined(__FreeBSD__)
-        if (aio_return(reinterpret_cast<struct aiocb *>(event.udata)) != static_cast<ssize_t>(request.aio.aio_nbytes))
-            throw Exception("GC: AIO failed to read file " + path + BIN_FILE_EXT + ".", ErrorCodes::AIO_READ_ERROR);
-#else
-        if (event.res != static_cast<ssize_t>(request.aio_nbytes))
-            throw Exception("GC: AIO failed to read file " + path + BIN_FILE_EXT + ". " +
-                "aio_nbytes=" + std::to_string(request.aio_nbytes) +
-                ", returned=" + std::to_string(event.res) + ".", ErrorCodes::AIO_READ_ERROR);
-#endif
-        __msan_unpoison(read_buffer_memory.data(), read_buffer_memory.size());
-    }
-
-    TemporalComplexKeysPool tmp_keys_pool;
-    KeyRefs keys;
-
-    for (size_t i = 0; i < write_buffer_size; ++i)
-    {
-        ReadBufferFromMemory read_buffer(read_buffer_memory.data() + i * block_size, block_size);
-
-        uint64_t checksum = 0;
-        readBinary(checksum, read_buffer);
-        uint64_t calculated_checksum = CityHash_v1_0_2::CityHash64(read_buffer_memory.data() + i * block_size + BLOCK_CHECKSUM_SIZE_BYTES, block_size - BLOCK_CHECKSUM_SIZE_BYTES);
-        if (checksum != calculated_checksum)
-        {
-            throw Exception("Cache data corrupted. From block = " + std::to_string(checksum) + " calculated = " + std::to_string(calculated_checksum) + ".", ErrorCodes::CORRUPTED_DATA);
-        }
-
-        uint32_t keys_in_current_block = 0;
-        readBinary(keys_in_current_block, read_buffer);
-
-        for (uint32_t j = 0; j < keys_in_current_block; ++j)
-        {
-            keys.emplace_back();
-            tmp_keys_pool.readKey(keys.back(), read_buffer);
-
-            Metadata metadata;
-            readBinary(metadata.data, read_buffer);
-
-            if (!metadata.isDefault())
-            {
-                for (const auto & attr : attributes_structure)
-                {
-                    switch (attr)
-                    {
-            #define DISPATCH(TYPE) \
-                    case AttributeUnderlyingType::ut##TYPE: \
-                        read_buffer.ignore(sizeof(TYPE)); \
-                        break;
-
-                        DISPATCH(UInt8)
-                        DISPATCH(UInt16)
-                        DISPATCH(UInt32)
-                        DISPATCH(UInt64)
-                        DISPATCH(UInt128)
-                        DISPATCH(Int8)
-                        DISPATCH(Int16)
-                        DISPATCH(Int32)
-                        DISPATCH(Int64)
-                        DISPATCH(Decimal32)
-                        DISPATCH(Decimal64)
-                        DISPATCH(Decimal128)
-                        DISPATCH(Float32)
-                        DISPATCH(Float64)
-            #undef DISPATCH
-
-                    case AttributeUnderlyingType::utString:
-                        {
-                            size_t size = 0;
-                            readVarUInt(size, read_buffer);
-                            read_buffer.ignore(size);
-                        }
-                        break;
-                    }
-                }
-            }
-        }
-    }
-
-    const size_t start_block = current_file_block_id % max_size;
-    const size_t finish_block = start_block + write_buffer_size;
-    for (const auto& key : keys)
-    {
-        Index index;
-        if (key_to_index.get(key, index))
-        {
-            size_t block_id = index.getBlockId();
-            if (start_block <= block_id && block_id < finish_block)
-                key_to_index.erase(key);
-        }
-    }
-}
-
-void SSDComplexKeyCachePartition::ignoreFromBufferToAttributeIndex(const size_t attribute_index, ReadBuffer & buf) const
-{
-    for (size_t i = 0; i < attribute_index; ++i)
-    {
-        switch (attributes_structure[i])
-        {
-#define DISPATCH(TYPE) \
-        case AttributeUnderlyingType::ut##TYPE: \
-            buf.ignore(sizeof(TYPE)); \
-            break;
-
-            DISPATCH(UInt8)
-            DISPATCH(UInt16)
-            DISPATCH(UInt32)
-            DISPATCH(UInt64)
-            DISPATCH(UInt128)
-            DISPATCH(Int8)
-            DISPATCH(Int16)
-            DISPATCH(Int32)
-            DISPATCH(Int64)
-            DISPATCH(Decimal32)
-            DISPATCH(Decimal64)
-            DISPATCH(Decimal128)
-            DISPATCH(Float32)
-            DISPATCH(Float64)
-#undef DISPATCH
-
-        case AttributeUnderlyingType::utString:
-            {
-                size_t size = 0;
-                readVarUInt(size, buf);
-                buf.ignore(size);
-            }
-            break;
-        }
-    }
-}
-
-size_t SSDComplexKeyCachePartition::getId() const
-{
-    return file_id;
-}
-
-double SSDComplexKeyCachePartition::getLoadFactor() const
-{
-    std::shared_lock lock(rw_lock);
-    return static_cast<double>(current_file_block_id) / max_size;
-}
-
-size_t SSDComplexKeyCachePartition::getElementCount() const
-{
-    std::shared_lock lock(rw_lock);
-    return key_to_index.size();
-}
-
-size_t SSDComplexKeyCachePartition::getBytesAllocated() const
-{
-    std::shared_lock lock(rw_lock);
-    return 16.5 * key_to_index.capacity() + keys_pool.size() +
-        (keys_buffer_pool ? keys_buffer_pool->size() : 0) + (memory ? memory->size() : 0);
-}
-
-void SSDComplexKeyCachePartition::remove()
-{
-    std::unique_lock lock(rw_lock);
-    std::filesystem::remove(std::filesystem::path(path + BIN_FILE_EXT));
-}
-
-SSDComplexKeyCacheStorage::SSDComplexKeyCacheStorage(
-        const AttributeTypes & attributes_structure_,
-        const std::string & path_,
-        const size_t max_partitions_count_,
-        const size_t file_size_,
-        const size_t block_size_,
-        const size_t read_buffer_size_,
-        const size_t write_buffer_size_,
-        const size_t max_stored_keys_)
-    : attributes_structure(attributes_structure_)
-    , path(path_)
-    , max_partitions_count(max_partitions_count_)
-    , file_size(file_size_)
-    , block_size(block_size_)
-    , read_buffer_size(read_buffer_size_)
-    , write_buffer_size(write_buffer_size_)
-    , max_stored_keys(max_stored_keys_)
-    , log(&Poco::Logger::get("SSDComplexKeyCacheStorage"))
-{
-}
-
-SSDComplexKeyCacheStorage::~SSDComplexKeyCacheStorage()
-{
-    std::unique_lock lock(rw_lock);
-    partition_delete_queue.splice(std::end(partition_delete_queue), partitions);
-    collectGarbage();
-}
-
-template <typename Out, typename GetDefault>
-void SSDComplexKeyCacheStorage::getValue(
-    const size_t attribute_index, const Columns & key_columns, const DataTypes & key_types,
-    ResultArrayType<Out> & out, std::unordered_map<KeyRef, std::vector<size_t>> & not_found,
-    TemporalComplexKeysPool & not_found_pool,
-    GetDefault & get_default, std::chrono::system_clock::time_point now) const
-{
-    size_t n = key_columns.front()->size();
-    std::vector<bool> found(n, false);
-
-    {
-        std::shared_lock lock(rw_lock);
-        for (const auto & partition : partitions)
-            partition->getValue<Out>(attribute_index, key_columns, key_types, out, found, get_default, now);
-    }
-
-    size_t count_not_found = 0;
-    StringRefs tmp_refs(key_columns.size());
-    for (size_t i = 0; i < n; ++i)
-    {
-        if (!found[i])
-        {
-            auto key = not_found_pool.allocKey(i, key_columns, tmp_refs);
-            not_found[key].push_back(i);
-            ++count_not_found;
-        }
-    }
-
-    query_count.fetch_add(n, std::memory_order_relaxed);
-    hit_count.fetch_add(n - count_not_found, std::memory_order_release);
-}
-
-void SSDComplexKeyCacheStorage::getString(
-    const size_t attribute_index, const Columns & key_columns, const DataTypes & key_types,
-    StringRefs & refs, ArenaWithFreeLists & arena,
-    std::unordered_map<KeyRef, std::vector<size_t>> & not_found,
-    TemporalComplexKeysPool & not_found_pool,
-    std::vector<size_t> & default_ids, std::chrono::system_clock::time_point now) const
-{
-    size_t n = key_columns.front()->size();
-    std::vector<bool> found(n, false);
-
-    {
-        std::shared_lock lock(rw_lock);
-        for (const auto & partition : partitions)
-            partition->getString(attribute_index, key_columns, key_types, refs, arena, found, default_ids, now);
-    }
-
-    size_t count_not_found = 0;
-    StringRefs tmp_refs(key_columns.size());
-    for (size_t i = 0; i < n; ++i)
-    {
-        if (!found[i])
-        {
-            auto key = not_found_pool.allocKey(i, key_columns, tmp_refs);
-            not_found[key].push_back(i);
-            ++count_not_found;
-        }
-    }
-
-    query_count.fetch_add(n, std::memory_order_relaxed);
-    hit_count.fetch_add(n - count_not_found, std::memory_order_release);
-}
-
-void SSDComplexKeyCacheStorage::hasKeys(
-    const Columns & key_columns, const DataTypes & key_types, ResultArrayType<UInt8> & out,
-    std::unordered_map<KeyRef, std::vector<size_t>> & not_found,
-    TemporalComplexKeysPool & not_found_pool, std::chrono::system_clock::time_point now) const
-{
-    size_t n = key_columns.front()->size();
-    for (size_t i = 0; i < n; ++i)
-        out[i] = HAS_NOT_FOUND;
-    std::vector<bool> found(n, false);
-
-    {
-        std::shared_lock lock(rw_lock);
-        for (const auto & partition : partitions)
-            partition->hasKeys(key_columns, key_types, out, found, now);
-    }
-
-    size_t count_not_found = 0;
-    StringRefs tmp_refs(key_columns.size());
-    for (size_t i = 0; i < n; ++i)
-    {
-        if (out[i] == HAS_NOT_FOUND)
-        {
-            auto key = not_found_pool.allocKey(i, key_columns, tmp_refs);
-            not_found[key].push_back(i);
-            ++count_not_found;
-        }
-    }
-
-    query_count.fetch_add(n, std::memory_order_relaxed);
-    hit_count.fetch_add(n - count_not_found, std::memory_order_release);
-}
-
-namespace
-{
-SSDComplexKeyCachePartition::Attributes createAttributesFromBlock(
-        const Block & block, const size_t begin_column, const std::vector<AttributeUnderlyingType> & structure)
-{
-    SSDComplexKeyCachePartition::Attributes attributes;
-
-    const auto columns = block.getColumns();
-    for (size_t i = 0; i < structure.size(); ++i)
-    {
-        const auto & column = columns[i + begin_column];
-        switch (structure[i])
-        {
-#define DISPATCH(TYPE) \
-        case AttributeUnderlyingType::ut##TYPE: \
-            { \
-                SSDComplexKeyCachePartition::Attribute::Container<TYPE> values(column->size()); \
-                memcpy(&values[0], column->getRawData().data, sizeof(TYPE) * values.size()); \
-                attributes.emplace_back(); \
-                attributes.back().type = structure[i]; \
-                attributes.back().values = std::move(values); \
-            } \
-            break;
-
-            DISPATCH(UInt8)
-            DISPATCH(UInt16)
-            DISPATCH(UInt32)
-            DISPATCH(UInt64)
-            DISPATCH(UInt128)
-            DISPATCH(Int8)
-            DISPATCH(Int16)
-            DISPATCH(Int32)
-            DISPATCH(Int64)
-            DISPATCH(Decimal32)
-            DISPATCH(Decimal64)
-            DISPATCH(Decimal128)
-            DISPATCH(Float32)
-            DISPATCH(Float64)
-#undef DISPATCH
-
-        case AttributeUnderlyingType::utString:
-            {
-                attributes.emplace_back();
-                SSDComplexKeyCachePartition::Attribute::Container<String> values(column->size());
-                for (size_t j = 0; j < column->size(); ++j)
-                {
-                    const auto ref = column->getDataAt(j);
-                    values[j].resize(ref.size);
-                    memcpy(values[j].data(), ref.data, ref.size);
-                }
-                attributes.back().type = structure[i];
-                attributes.back().values = std::move(values);
-            }
-            break;
-        }
-    }
-
-    return attributes;
-}
-}
-
-template <typename PresentIdHandler, typename AbsentIdHandler>
-void SSDComplexKeyCacheStorage::update(
-    DictionarySourcePtr & source_ptr,
-    const Columns & key_columns,
-    const DataTypes & key_types,
-    const KeyRefs & required_keys,
-    const std::vector<size_t> & required_rows,
-    TemporalComplexKeysPool & tmp_keys_pool,
-    PresentIdHandler && on_updated,
-    AbsentIdHandler && on_key_not_found,
-    const DictionaryLifetime lifetime)
-{
-    assert(key_columns.size() == key_types.size());
-
-    auto append_block = [&key_types, this](
-        const Columns & new_keys,
-        const SSDComplexKeyCachePartition::Attributes & new_attributes,
-        const PaddedPODArray<SSDComplexKeyCachePartition::Metadata> & metadata)
-    {
-        size_t inserted = 0;
-        while (inserted < metadata.size())
-        {
-            if (!partitions.empty())
-                inserted += partitions.front()->appendBlock(
-                    new_keys, key_types, new_attributes, metadata, inserted);
-            if (inserted < metadata.size())
-            {
-                partitions.emplace_front(std::make_unique<SSDComplexKeyCachePartition>(
-                    AttributeUnderlyingType::utUInt64, attributes_structure, path,
-                    (partitions.empty() ? 0 : partitions.front()->getId() + 1),
-                    file_size, block_size, read_buffer_size, write_buffer_size, max_stored_keys));
-            }
-        }
-
-        collectGarbage();
-    };
-
-    CurrentMetrics::Increment metric_increment{CurrentMetrics::DictCacheRequests};
-    ProfileEvents::increment(ProfileEvents::DictCacheKeysRequested, required_keys.size());
-
-    std::unordered_map<KeyRef, UInt8> remaining_keys{required_keys.size()};
-    for (const auto & key : required_keys)
-        remaining_keys.insert({key, 0});
-
-    const auto now = std::chrono::system_clock::now();
-
-    {
-        const auto keys_size = key_columns.size();
-        StringRefs keys(keys_size);
-
-        const ProfilingScopedWriteRWLock write_lock{rw_lock, ProfileEvents::DictCacheLockWriteNs};
-
-        if (now > backoff_end_time)
-        {
-            try
-            {
-                if (update_error_count)
-                {
-                    /// Recover after error: we have to clone the source here because
-                    /// it could keep connections which should be reset after error.
-                    source_ptr = source_ptr->clone();
-                }
-
-                Stopwatch watch;
-                auto stream = source_ptr->loadKeys(key_columns, required_rows);
-                stream->readPrefix();
-
-                while (const auto block = stream->read())
-                {
-                    const auto new_key_columns = ext::map<Columns>(
-                        ext::range(0, keys_size),
-                        [&](const size_t attribute_idx) { return block.safeGetByPosition(attribute_idx).column; });
-
-                    const auto new_attributes = createAttributesFromBlock(block, keys_size, attributes_structure);
-
-                    const auto rows_num = block.rows();
-                    PaddedPODArray<SSDComplexKeyCachePartition::Metadata> metadata(rows_num);
-
-                    for (const auto i : ext::range(0, rows_num))
-                    {
-                        auto key = tmp_keys_pool.allocKey(i, new_key_columns, keys);
-                        //SCOPE_EXIT(tmp_keys_pool.rollback(key));
-
-                        std::uniform_int_distribution<UInt64> distribution{lifetime.min_sec, lifetime.max_sec};
-                        metadata[i].setExpiresAt(now + std::chrono::seconds(distribution(rnd_engine)));
-                        /// mark corresponding id as found
-                        on_updated(key, i, new_attributes);
-                        remaining_keys[key] = 1;
-                    }
-
-                    append_block(new_key_columns, new_attributes, metadata);
-                }
-
-                stream->readSuffix();
-
-                update_error_count = 0;
-                last_update_exception = std::exception_ptr{};
-                backoff_end_time = std::chrono::system_clock::time_point{};
-
-                ProfileEvents::increment(ProfileEvents::DictCacheRequestTimeNs, watch.elapsed());
-            }
-            catch (...)
-            {
-                ++update_error_count;
-                last_update_exception = std::current_exception();
-                backoff_end_time = now + std::chrono::seconds(calculateDurationWithBackoff(rnd_engine, update_error_count));
-
-                tryLogException(last_update_exception, log,
-                        "Could not update ssd cache dictionary, next update is scheduled at " + ext::to_string(backoff_end_time));
-            }
-        }
-    }
-
-    auto append_defaults = [this](
-        const KeyRefs & new_keys,
-        const PaddedPODArray<SSDComplexKeyCachePartition::Metadata> & metadata)
-    {
-        size_t inserted = 0;
-        while (inserted < metadata.size())
-        {
-            if (!partitions.empty())
-                inserted += partitions.front()->appendDefaults(
-                    new_keys, metadata, inserted);
-            if (inserted < metadata.size())
-            {
-                partitions.emplace_front(std::make_unique<SSDComplexKeyCachePartition>(
-                        AttributeUnderlyingType::utUInt64, attributes_structure, path,
-                        (partitions.empty() ? 0 : partitions.front()->getId() + 1),
-                        file_size, block_size, read_buffer_size, write_buffer_size, max_stored_keys));
-            }
-        }
-
-        collectGarbage();
-    };
-
-    size_t not_found_num = 0, found_num = 0;
-    /// Check which ids have not been found and require setting null_value
-    KeyRefs default_keys;
-
-    PaddedPODArray<SSDComplexKeyCachePartition::Metadata> metadata;
-    {
-        const ProfilingScopedWriteRWLock write_lock{rw_lock, ProfileEvents::DictCacheLockWriteNs};
-
-        for (const auto & key_found_pair : remaining_keys)
-        {
-            if (key_found_pair.second)
-            {
-                ++found_num;
-                continue;
-            }
-            ++not_found_num;
-
-            const auto key = key_found_pair.first;
-
-            if (update_error_count)
-            {
-                /// TODO: use old values.
-
-                // We don't have expired data for that `id` so all we can do is
-                // to rethrow `last_exception`. We might have to throw the same
-                // exception for different callers of dictGet() in different
-                // threads, which might then modify the exception object, so we
-                // have to throw a copy.
-                try
-                {
-                    std::rethrow_exception(last_update_exception);
-                }
-                catch (...)
-                {
-                    throw DB::Exception(ErrorCodes::CACHE_DICTIONARY_UPDATE_FAIL,
-                        "Update failed for dictionary '{}': {}",
-                        getPath(),
-                        getCurrentExceptionMessage(true /*with stack trace*/,
-                            true /*check embedded stack trace*/));
-                }
-            }
-
-            std::uniform_int_distribution<UInt64> distribution{lifetime.min_sec, lifetime.max_sec};
-            metadata.emplace_back();
-            metadata.back().setExpiresAt(now + std::chrono::seconds(distribution(rnd_engine)));
-            metadata.back().setDefault();
-
-            default_keys.push_back(key);
-
-            /// inform caller that the cell has not been found
-            on_key_not_found(key);
-        }
-
-        if (not_found_num)
-            append_defaults(default_keys, metadata);
-    }
-
-    ProfileEvents::increment(ProfileEvents::DictCacheKeysRequestedMiss, not_found_num);
-    ProfileEvents::increment(ProfileEvents::DictCacheKeysRequestedFound, found_num);
-    ProfileEvents::increment(ProfileEvents::DictCacheRequests);
-}
-
-double SSDComplexKeyCacheStorage::getLoadFactor() const
-{
-    double result = 0;
-    std::shared_lock lock(rw_lock);
-    for (const auto & partition : partitions)
-        result += partition->getLoadFactor();
-    return result / partitions.size();
-}
-
-size_t SSDComplexKeyCacheStorage::getElementCount() const
-{
-    size_t result = 0;
-    std::shared_lock lock(rw_lock);
-    for (const auto & partition : partitions)
-        result += partition->getElementCount();
-    return result;
-}
-
-void SSDComplexKeyCacheStorage::collectGarbage()
-{
-    // add partitions to queue
-    while (partitions.size() > max_partitions_count)
-    {
-        partition_delete_queue.splice(std::end(partition_delete_queue), partitions, std::prev(std::end(partitions)));
-    }
-
-    // drop unused partitions
-    while (!partition_delete_queue.empty() && partition_delete_queue.front().use_count() == 1)
-    {
-        partition_delete_queue.front()->remove();
-        partition_delete_queue.pop_front();
-    }
-}
-
-SSDComplexKeyCacheDictionary::SSDComplexKeyCacheDictionary(
-    const StorageID & dict_id_,
-    const DictionaryStructure & dict_struct_,
-    DictionarySourcePtr source_ptr_,
-    const DictionaryLifetime dict_lifetime_,
-    const std::string & path_,
-    const size_t max_partitions_count_,
-    const size_t file_size_,
-    const size_t block_size_,
-    const size_t read_buffer_size_,
-    const size_t write_buffer_size_,
-    const size_t max_stored_keys_)
-    : IDictionaryBase(dict_id_)
-    , dict_struct(dict_struct_)
-    , source_ptr(std::move(source_ptr_))
-    , dict_lifetime(dict_lifetime_)
-    , path(path_)
-    , max_partitions_count(max_partitions_count_)
-    , file_size(file_size_)
-    , block_size(block_size_)
-    , read_buffer_size(read_buffer_size_)
-    , write_buffer_size(write_buffer_size_)
-    , max_stored_keys(max_stored_keys_)
-    , storage(ext::map<std::vector>(dict_struct.attributes, [](const auto & attribute) { return attribute.underlying_type; }),
-            path, max_partitions_count, file_size, block_size, read_buffer_size, write_buffer_size, max_stored_keys)
-    , log(&Poco::Logger::get("SSDComplexKeyCacheDictionary"))
-{
-    LOG_INFO(log, "Using storage path '{}'.", path);
-    if (!this->source_ptr->supportsSelectiveLoad())
-        throw Exception{name + ": source cannot be used with CacheDictionary", ErrorCodes::UNSUPPORTED_METHOD};
-
-    createAttributes();
-}
-
-ColumnPtr SSDComplexKeyCacheDictionary::getColumn(
-    const std::string & attribute_name,
-    const DataTypePtr & result_type,
-    const Columns & key_columns,
-    const DataTypes & key_types,
-    const ColumnPtr default_values_column) const
-{
-    ColumnPtr result;
-
-    dict_struct.validateKeyTypes(key_types);
-
-    const auto index = getAttributeIndex(attribute_name);
-    const auto & dictionary_attribute = dict_struct.getAttribute(attribute_name, result_type);
-
-    auto keys_size = key_columns.front()->size();
-
-    auto type_call = [&](const auto &dictionary_attribute_type)
-    {
-        using Type = std::decay_t<decltype(dictionary_attribute_type)>;
-        using AttributeType = typename Type::AttributeType;
-        using ColumnProvider = DictionaryAttributeColumnProvider<AttributeType>;
-
-        const auto & null_value = std::get<AttributeType>(null_values[index]);
-        DictionaryDefaultValueExtractor<AttributeType> default_value_extractor(null_value, default_values_column);
-
-        auto column = ColumnProvider::getColumn(dictionary_attribute, keys_size);
-
-        if constexpr (std::is_same_v<AttributeType, String>)
-        {
-            auto * out = column.get();
-            getItemsStringImpl(index, key_columns, key_types, out, default_value_extractor);
-        }
-        else
-        {
-            auto & out = column->getData();
-            getItemsNumberImpl<AttributeType, AttributeType>(
-                index,
-                key_columns,
-                key_types,
-                out,
-                default_value_extractor);
-        }
-
-        result = std::move(column);
-    };
-
-    callOnDictionaryAttributeType(dict_struct.attributes[index].underlying_type, type_call);
-
-    return result;
-}
-
-template <typename AttributeType, typename OutputType, typename DefaultValueExtractor>
-void SSDComplexKeyCacheDictionary::getItemsNumberImpl(
-    const size_t attribute_index,
-    const Columns & key_columns,
-    const DataTypes & key_types,
-    ResultArrayType<OutputType> & out,
-    DefaultValueExtractor & default_value_extractor) const
-{
-    assert(dict_struct.key);
-    assert(key_columns.size() == key_types.size());
-
-    dict_struct.validateKeyTypes(key_types);
-
-    const auto now = std::chrono::system_clock::now();
-
-    TemporalComplexKeysPool not_found_pool;
-    std::unordered_map<KeyRef, std::vector<size_t>> not_found_keys;
-    storage.getValue<OutputType>(attribute_index, key_columns, key_types, out, not_found_keys, not_found_pool, default_value_extractor, now);
-    if (not_found_keys.empty())
-        return;
-
-    std::vector<KeyRef> required_keys(not_found_keys.size());
-    std::transform(std::begin(not_found_keys), std::end(not_found_keys), std::begin(required_keys), [](const auto & pair) { return pair.first; });
-    std::vector<size_t> required_rows;
-    required_rows.reserve(required_keys.size());
-    for (const auto & key_ref : required_keys)
-        required_rows.push_back(not_found_keys[key_ref].front());
-
-    TemporalComplexKeysPool tmp_keys_pool;
-    storage.update(
-            source_ptr,
-            key_columns,
-            key_types,
-            required_keys,
-            required_rows,
-            tmp_keys_pool,
-            [&](const auto key, const auto row, const auto & new_attributes)
-            {
-                for (const size_t out_row : not_found_keys[key])
-                    out[out_row] = std::get<SSDComplexKeyCachePartition::Attribute::Container<OutputType>>(new_attributes[attribute_index].values)[row];
-            },
-            [&](const auto key)
-            {
-                for (const size_t row : not_found_keys[key])
-                    out[row] = default_value_extractor[row];
-            },
-            getLifetime());
-}
-
-void SSDComplexKeyCacheDictionary::getItemsStringImpl(
-    const size_t attribute_index,
-    const Columns & key_columns,
-    const DataTypes & key_types,
-    ColumnString * out,
-    DictionaryDefaultValueExtractor<String> & default_value_extractor) const
-{
-    dict_struct.validateKeyTypes(key_types);
-
-    const auto now = std::chrono::system_clock::now();
-
-    TemporalComplexKeysPool not_found_pool;
-    std::unordered_map<KeyRef, std::vector<size_t>> not_found_keys;
-
-    const size_t n = key_columns.front()->size();
-
-    StringRefs refs(n);
-    ArenaWithFreeLists string_arena;
-    std::vector<size_t> default_rows;
-    storage.getString(
-        attribute_index, key_columns, key_types,
-        refs, string_arena, not_found_keys, not_found_pool, default_rows, now);
-    std::sort(std::begin(default_rows), std::end(default_rows));
-
-    if (not_found_keys.empty())
-    {
-        size_t default_index = 0;
-        for (size_t row = 0; row < n; ++row)
-        {
-            if (unlikely(default_index != default_rows.size() && default_rows[default_index] == row))
-            {
-                auto to_insert = default_value_extractor[row];
-                out->insertData(to_insert.data, to_insert.size);
-                ++default_index;
-            }
-            else
-                out->insertData(refs[row].data, refs[row].size);
-        }
-        return;
-    }
-
-    std::vector<KeyRef> required_keys(not_found_keys.size());
-    std::transform(std::begin(not_found_keys), std::end(not_found_keys), std::begin(required_keys), [](const auto & pair) { return pair.first; });
-
-    std::unordered_map<KeyRef, String> update_result;
-
-    std::vector<size_t> required_rows;
-    required_rows.reserve(required_keys.size());
-    for (const auto & key_ref : required_keys)
-        required_rows.push_back(not_found_keys[key_ref].front());
-
-    TemporalComplexKeysPool tmp_keys_pool;
-    storage.update(
-            source_ptr,
-            key_columns,
-            key_types,
-            required_keys,
-            required_rows,
-            tmp_keys_pool,
-            [&](const auto key, const auto row, const auto & new_attributes)
-            {
-                update_result[key] = std::get<SSDComplexKeyCachePartition::Attribute::Container<String>>(new_attributes[attribute_index].values)[row];
-            },
-            [&](const auto) {},
-            getLifetime());
-
-    StringRefs tmp_refs(key_columns.size());
-    size_t default_index = 0;
-    for (size_t row = 0; row < n; ++row)
-    {
-        const auto key = tmp_keys_pool.allocKey(row, key_columns, tmp_refs);
-        SCOPE_EXIT(tmp_keys_pool.rollback(key));
-        if (unlikely(default_index != default_rows.size() && default_rows[default_index] == row))
-        {
-            auto to_insert = default_value_extractor[row];
-            out->insertData(to_insert.data, to_insert.size);
-            ++default_index;
-        }
-        else if (auto it = not_found_keys.find(key); it == std::end(not_found_keys))
-        {
-            out->insertData(refs[row].data, refs[row].size);
-        }
-        else if (auto it_update = update_result.find(key); it_update != std::end(update_result))
-        {
-            out->insertData(it_update->second.data(), it_update->second.size());
-        }
-        else
-        {
-            auto to_insert = default_value_extractor[row];
-            out->insertData(to_insert.data, to_insert.size);
-        }
-    }
-}
-
-ColumnUInt8::Ptr SSDComplexKeyCacheDictionary::hasKeys(const Columns & key_columns, const DataTypes & key_types) const
-{
-    dict_struct.validateKeyTypes(key_types);
-
-    const auto rows_num = key_columns.front()->size();
-
-    auto result = ColumnUInt8::create(rows_num);
-    auto& out = result->getData();
-
-    for (const auto row : ext::range(0, rows_num))
-        out[row] = false;
-
-    const auto now = std::chrono::system_clock::now();
-
-    std::unordered_map<KeyRef, std::vector<size_t>> not_found_keys;
-    TemporalComplexKeysPool not_found_pool;
-    storage.hasKeys(key_columns, key_types, out, not_found_keys, not_found_pool, now);
-    if (not_found_keys.empty())
-        return result;
-
-    std::vector<KeyRef> required_keys(not_found_keys.size());
-    std::transform(std::begin(not_found_keys), std::end(not_found_keys), std::begin(required_keys), [](const auto & pair) { return pair.first; });
-
-    std::vector<size_t> required_rows;
-    required_rows.reserve(required_keys.size());
-    for (const auto & key_ref : required_keys)
-        required_rows.push_back(not_found_keys[key_ref].front());
-
-    TemporalComplexKeysPool tmp_keys_pool;
-    storage.update(
-            source_ptr,
-            key_columns,
-            key_types,
-            required_keys,
-            required_rows,
-            tmp_keys_pool,
-            [&](const auto key, const auto, const auto &)
-            {
-                for (const size_t out_row : not_found_keys[key])
-                    out[out_row] = true;
-            },
-            [&](const auto key)
-            {
-                for (const size_t row : not_found_keys[key])
-                    out[row] = false;
-            },
-            getLifetime());
-
-    return result;
-}
-
-BlockInputStreamPtr SSDComplexKeyCacheDictionary::getBlockInputStream(
-    const Names & /* column_names */, size_t /* max_block_size*/) const
-{
-    throw DB::Exception("Method not supported.", ErrorCodes::NOT_IMPLEMENTED);
-}
-
-size_t SSDComplexKeyCacheDictionary::getAttributeIndex(const std::string & attr_name) const
-{
-    auto it = attribute_index_by_name.find(attr_name);
-    if (it == std::end(attribute_index_by_name))
-        throw  Exception{"Attribute `" + name + "` does not exist.", ErrorCodes::BAD_ARGUMENTS};
-    return it->second;
-}
-
-template <typename T>
-AttributeValueVariant SSDComplexKeyCacheDictionary::createAttributeNullValueWithTypeImpl(const Field & null_value)
-{
-    AttributeValueVariant var_null_value = static_cast<T>(null_value.get<NearestFieldType<T>>());
-    bytes_allocated += sizeof(T);
-    return var_null_value;
-}
-
-template <>
-AttributeValueVariant SSDComplexKeyCacheDictionary::createAttributeNullValueWithTypeImpl<String>(const Field & null_value)
-{
-    AttributeValueVariant var_null_value = null_value.get<String>();
-    bytes_allocated += sizeof(StringRef);
-    return var_null_value;
-}
-
-AttributeValueVariant SSDComplexKeyCacheDictionary::createAttributeNullValueWithType(const AttributeUnderlyingType type, const Field & null_value)
-{
-    switch (type)
-    {
-#define DISPATCH(TYPE) \
-case AttributeUnderlyingType::ut##TYPE: \
-    return createAttributeNullValueWithTypeImpl<TYPE>(null_value); /* NOLINT */
-
-        DISPATCH(UInt8)
-        DISPATCH(UInt16)
-        DISPATCH(UInt32)
-        DISPATCH(UInt64)
-        DISPATCH(UInt128)
-        DISPATCH(Int8)
-        DISPATCH(Int16)
-        DISPATCH(Int32)
-        DISPATCH(Int64)
-        DISPATCH(Decimal32)
-        DISPATCH(Decimal64)
-        DISPATCH(Decimal128)
-        DISPATCH(Float32)
-        DISPATCH(Float64)
-        DISPATCH(String)
-#undef DISPATCH
-    }
-    throw Exception{"Unknown attribute type: " + std::to_string(static_cast<int>(type)), ErrorCodes::TYPE_MISMATCH};
-}
-
-void SSDComplexKeyCacheDictionary::createAttributes()
-{
-    null_values.reserve(dict_struct.attributes.size());
-    for (size_t i = 0; i < dict_struct.attributes.size(); ++i)
-    {
-        const auto & attribute = dict_struct.attributes[i];
-
-        attribute_index_by_name.emplace(attribute.name, i);
-        null_values.push_back(createAttributeNullValueWithType(attribute.underlying_type, attribute.null_value));
-
-        if (attribute.hierarchical)
-            throw Exception{name + ": hierarchical attributes not supported for dictionary of type " + getTypeName(),
-                            ErrorCodes::TYPE_MISMATCH};
-    }
-}
-
-void registerDictionarySSDComplexKeyCache(DictionaryFactory & factory)
-{
-    auto create_layout = [=](const std::string & name,
-                             const DictionaryStructure & dict_struct,
-                             const Poco::Util::AbstractConfiguration & config,
-                             const std::string & config_prefix,
-                             DictionarySourcePtr source_ptr) -> DictionaryPtr
-    {
-        const auto dict_id = StorageID::fromDictionaryConfig(config, config_prefix);
-
-        if (dict_struct.id)
-            throw Exception{"'id' is not supported for dictionary of layout 'complex_key_cache'", ErrorCodes::UNSUPPORTED_METHOD};
-
-        if (dict_struct.range_min || dict_struct.range_max)
-            throw Exception{name
-                            + ": elements .structure.range_min and .structure.range_max should be defined only "
-                              "for a dictionary of layout 'range_hashed'",
-                            ErrorCodes::BAD_ARGUMENTS};
-        const auto & layout_prefix = config_prefix + ".layout";
-
-        const auto max_partitions_count = config.getInt(layout_prefix + ".complex_key_ssd_cache.max_partitions_count", DEFAULT_PARTITIONS_COUNT);
-        if (max_partitions_count <= 0)
-            throw Exception{name + ": dictionary of layout 'complex_key_ssd_cache' cannot have 0 (or less) max_partitions_count", ErrorCodes::BAD_ARGUMENTS};
-
-        const auto block_size = config.getInt(layout_prefix + ".complex_key_ssd_cache.block_size", DEFAULT_SSD_BLOCK_SIZE_BYTES);
-        if (block_size <= 0)
-            throw Exception{name + ": dictionary of layout 'complex_key_ssd_cache' cannot have 0 (or less) block_size", ErrorCodes::BAD_ARGUMENTS};
-
-        const auto file_size = config.getInt64(layout_prefix + ".complex_key_ssd_cache.file_size", DEFAULT_FILE_SIZE_BYTES);
-        if (file_size <= 0)
-            throw Exception{name + ": dictionary of layout 'complex_key_ssd_cache' cannot have 0 (or less) file_size", ErrorCodes::BAD_ARGUMENTS};
-        if (file_size % block_size != 0)
-            throw Exception{name + ": file_size must be a multiple of block_size", ErrorCodes::BAD_ARGUMENTS};
-
-        const auto read_buffer_size = config.getInt64(layout_prefix + ".complex_key_ssd_cache.read_buffer_size", DEFAULT_READ_BUFFER_SIZE_BYTES);
-        if (read_buffer_size <= 0)
-            throw Exception{name + ": dictionary of layout 'complex_key_ssd_cache' cannot have 0 (or less) read_buffer_size", ErrorCodes::BAD_ARGUMENTS};
-        if (read_buffer_size % block_size != 0)
-            throw Exception{name + ": read_buffer_size must be a multiple of block_size", ErrorCodes::BAD_ARGUMENTS};
-
-        const auto write_buffer_size = config.getInt64(layout_prefix + ".complex_key_ssd_cache.write_buffer_size", DEFAULT_WRITE_BUFFER_SIZE_BYTES);
-        if (write_buffer_size <= 0)
-            throw Exception{name + ": dictionary of layout 'complex_key_ssd_cache' cannot have 0 (or less) write_buffer_size", ErrorCodes::BAD_ARGUMENTS};
-        if (write_buffer_size % block_size != 0)
-            throw Exception{name + ": write_buffer_size must be a multiple of block_size", ErrorCodes::BAD_ARGUMENTS};
-
-        auto path = config.getString(layout_prefix + ".complex_key_ssd_cache.path");
-        if (path.empty())
-            throw Exception{name + ": dictionary of layout 'complex_key_ssd_cache' cannot have empty path",
-                            ErrorCodes::BAD_ARGUMENTS};
-        if (path.at(0) != '/')
-            path = std::filesystem::path{config.getString("path")}.concat(path).string();
-
-        const auto max_stored_keys = config.getInt64(layout_prefix + ".complex_key_ssd_cache.max_stored_keys", DEFAULT_MAX_STORED_KEYS);
-        if (max_stored_keys <= 0)
-            throw Exception{name + ": dictionary of layout 'complex_key_ssd_cache' cannot have 0 (or less) max_stored_keys", ErrorCodes::BAD_ARGUMENTS};
-
-        const DictionaryLifetime dict_lifetime{config, config_prefix + ".lifetime"};
-        return std::make_unique<SSDComplexKeyCacheDictionary>(
-                dict_id, dict_struct, std::move(source_ptr), dict_lifetime, path,
-                max_partitions_count, file_size / block_size, block_size,
-                read_buffer_size / block_size, write_buffer_size / block_size,
-                max_stored_keys);
-    };
-    factory.registerLayout("complex_key_ssd_cache", create_layout, true);
-}
-
-}
-
-#endif
diff --git a/src/Dictionaries/SSDComplexKeyCacheDictionary.h b/src/Dictionaries/SSDComplexKeyCacheDictionary.h
deleted file mode 100644
index be65d823e34..00000000000
--- a/src/Dictionaries/SSDComplexKeyCacheDictionary.h
+++ /dev/null
@@ -1,634 +0,0 @@
-#pragma once
-
-#if defined(OS_LINUX) || defined(__FreeBSD__)
-
-#include <atomic>
-#include <chrono>
-#include <list>
-#include <shared_mutex>
-#include <variant>
-#include <vector>
-#include <Poco/Logger.h>
-#include <Columns/ColumnDecimal.h>
-#include <Columns/ColumnString.h>
-#include <Common/Arena.h>
-#include <Common/ArenaWithFreeLists.h>
-#include <Common/CurrentMetrics.h>
-#include <common/logger_useful.h>
-#include <Common/SmallObjectPool.h>
-#include <Compression/CompressedWriteBuffer.h>
-#include <Core/Block.h>
-#include <Dictionaries/BucketCache.h>
-#include <ext/scope_guard.h>
-#include <IO/HashingWriteBuffer.h>
-#include <pcg_random.hpp>
-#include "IDictionary.h"
-#include "IDictionarySource.h"
-#include "DictionaryStructure.h"
-#include "DictionaryHelpers.h"
-
-namespace DB
-{
-
-class KeyRef
-{
-public:
-    explicit KeyRef(char * data) : ptr(data) {}
-
-    KeyRef() : ptr(nullptr) {}
-
-    inline UInt16 size() const
-    {
-        UInt16 res;
-        memcpy(&res, ptr, sizeof(res));
-        return res;
-    }
-
-    inline size_t fullSize() const
-    {
-        return static_cast<size_t>(size()) + sizeof(UInt16);
-    }
-
-    inline bool isNull() const
-    {
-        return ptr == nullptr;
-    }
-
-    inline char * data() const
-    {
-        return ptr + sizeof(UInt16);
-    }
-
-    inline char * fullData() const
-    {
-        return ptr;
-    }
-
-    inline char * fullData()
-    {
-        return ptr;
-    }
-
-    inline const StringRef getRef() const
-    {
-        return StringRef(data(), size());
-    }
-
-    inline bool operator==(const KeyRef & other) const
-    {
-        return getRef() == other.getRef();
-    }
-
-    inline bool operator!=(const KeyRef & other) const
-    {
-        return !(*this == other);
-    }
-
-    inline bool operator<(const KeyRef & other) const
-    {
-        return getRef() <  other.getRef();
-    }
-
-private:
-    char * ptr;
-};
-
-using KeyRefs = std::vector<KeyRef>;
-}
-
-namespace std
-{
-    template <>
-    struct hash<DB::KeyRef>
-    {
-        size_t operator() (DB::KeyRef key_ref) const
-        {
-            return hasher(key_ref.getRef());
-        }
-
-        std::hash<StringRef> hasher;
-    };
-}
-
-namespace DB
-{
-
-using AttributeValueVariant = std::variant<
-        UInt8,
-        UInt16,
-        UInt32,
-        UInt64,
-        UInt128,
-        Int8,
-        Int16,
-        Int32,
-        Int64,
-        Decimal32,
-        Decimal64,
-        Decimal128,
-        Float32,
-        Float64,
-        String>;
-
-/*
-    The pool for storing complex keys.
-*/
-template <typename A>
-class ComplexKeysPoolImpl
-{
-public:
-    KeyRef allocKey(const size_t row, const Columns & key_columns, StringRefs & keys)
-    {
-        const auto keys_size = key_columns.size();
-        UInt16 sum_keys_size{};
-
-        for (size_t j = 0; j < keys_size; ++j)
-        {
-            keys[j] = key_columns[j]->getDataAt(row);
-            sum_keys_size += keys[j].size;
-            if (!key_columns[j]->valuesHaveFixedSize())  // String
-                sum_keys_size += sizeof(size_t) + 1;
-        }
-
-        auto place = arena.alloc(sum_keys_size + sizeof(sum_keys_size));
-
-        auto key_start = place;
-        memcpy(key_start, &sum_keys_size, sizeof(sum_keys_size));
-        key_start += sizeof(sum_keys_size);
-        for (size_t j = 0; j < keys_size; ++j)
-        {
-            if (!key_columns[j]->valuesHaveFixedSize())  // String
-            {
-                auto key_size = keys[j].size + 1;
-                memcpy(key_start, &key_size, sizeof(size_t));
-                key_start += sizeof(size_t);
-                memcpy(key_start, keys[j].data, keys[j].size);
-                key_start += keys[j].size;
-                *key_start = '\0';
-                ++key_start;
-            }
-            else
-            {
-                memcpy(key_start, keys[j].data, keys[j].size);
-                key_start += keys[j].size;
-            }
-        }
-
-        return KeyRef(place);
-    }
-
-    KeyRef copyKeyFrom(const KeyRef & key)
-    {
-        char * data = arena.alloc(key.fullSize());
-        memcpy(data, key.fullData(), key.fullSize());
-        return KeyRef(data);
-    }
-
-    void freeKey(const KeyRef & key)
-    {
-        if constexpr (std::is_same_v<A, ArenaWithFreeLists>)
-            arena.free(key.fullData(), key.fullSize());
-    }
-
-    void rollback(const KeyRef & key)
-    {
-        if constexpr (std::is_same_v<A, Arena>)
-            arena.rollback(key.fullSize());
-    }
-
-    void writeKey(const KeyRef & key, WriteBuffer & buf)
-    {
-        buf.write(key.fullData(), key.fullSize());
-    }
-
-    void readKey(KeyRef & key, ReadBuffer & buf)
-    {
-        UInt16 sz;
-        readBinary(sz, buf);
-        char * data = nullptr;
-        if constexpr (std::is_same_v<A, SmallObjectPool>)
-            data = arena.alloc();
-        else
-            data = arena.alloc(sz + sizeof(sz));
-        memcpy(data, &sz, sizeof(sz));
-        buf.read(data + sizeof(sz), sz);
-        key = KeyRef(data);
-    }
-
-    void ignoreKey(ReadBuffer & buf) const
-    {
-        UInt16 sz;
-        readBinary(sz, buf);
-        buf.ignore(sz);
-    }
-
-    size_t size() const
-    {
-        return arena.size();
-    }
-
-private:
-    A arena;
-};
-
-using TemporalComplexKeysPool = ComplexKeysPoolImpl<Arena>;
-using ComplexKeysPool = ComplexKeysPoolImpl<ArenaWithFreeLists>;
-
-struct KeyDeleter
-{
-    KeyDeleter(ComplexKeysPool & keys_pool_) : keys_pool(keys_pool_) {}
-
-    void operator()(const KeyRef key) const
-    {
-        keys_pool.freeKey(key);
-    }
-
-    ComplexKeysPool & keys_pool;
-};
-
-
-/*
-    Class for operations with cache file and index.
-    Supports GET/SET operations.
-*/
-class SSDComplexKeyCachePartition
-{
-public:
-    struct Index final
-    {
-        bool inMemory() const;
-        void setInMemory(const bool in_memory);
-
-        bool exists() const;
-        void setNotExists();
-
-        size_t getAddressInBlock() const;
-        void setAddressInBlock(const size_t address_in_block);
-
-        size_t getBlockId() const;
-        void setBlockId(const size_t block_id);
-
-        bool operator< (const Index & rhs) const { return index < rhs.index; }
-
-        /// Stores `is_in_memory` flag, block id, address in uncompressed block
-        uint64_t index = 0;
-    };
-
-    struct Metadata final
-    {
-        using time_point_t = std::chrono::system_clock::time_point;
-        using time_point_rep_t = time_point_t::rep;
-        using time_point_urep_t = std::make_unsigned_t<time_point_rep_t>;
-
-        time_point_t expiresAt() const;
-        void setExpiresAt(const time_point_t & t);
-
-        bool isDefault() const;
-        void setDefault();
-
-        /// Stores both expiration time and `is_default` flag in the most significant bit
-        time_point_urep_t data = 0;
-    };
-
-    using Offset = size_t;
-    using Offsets = std::vector<Offset>;
-
-
-    SSDComplexKeyCachePartition(
-            const AttributeUnderlyingType & key_structure,
-            const std::vector<AttributeUnderlyingType> & attributes_structure,
-            const std::string & dir_path,
-            const size_t file_id,
-            const size_t max_size,
-            const size_t block_size,
-            const size_t read_buffer_size,
-            const size_t write_buffer_size,
-            const size_t max_stored_keys);
-
-    ~SSDComplexKeyCachePartition();
-
-    template <typename T>
-    using ResultArrayType = std::conditional_t<IsDecimalNumber<T>, DecimalPaddedPODArray<T>, PaddedPODArray<T>>;
-
-    template <typename Out, typename GetDefault>
-    void getValue(const size_t attribute_index,
-            const Columns & key_columns, const DataTypes & key_types,
-            ResultArrayType<Out> & out, std::vector<bool> & found, GetDefault & default_value_extractor,
-            std::chrono::system_clock::time_point now) const;
-
-    void getString(const size_t attribute_index,
-            const Columns & key_columns, const DataTypes & key_types,
-            StringRefs & refs, ArenaWithFreeLists & arena, std::vector<bool> & found,
-            std::vector<size_t> & default_ids, std::chrono::system_clock::time_point now) const;
-
-    void hasKeys(const Columns & key_columns, const DataTypes & key_types,
-            ResultArrayType<UInt8> & out, std::vector<bool> & found,
-            std::chrono::system_clock::time_point now) const;
-
-    struct Attribute
-    {
-        template <typename T>
-        using Container = std::vector<T>;
-
-        AttributeUnderlyingType type;
-        std::variant<
-                Container<UInt8>,
-                Container<UInt16>,
-                Container<UInt32>,
-                Container<UInt64>,
-                Container<UInt128>,
-                Container<Int8>,
-                Container<Int16>,
-                Container<Int32>,
-                Container<Int64>,
-                Container<Decimal32>,
-                Container<Decimal64>,
-                Container<Decimal128>,
-                Container<Float32>,
-                Container<Float64>,
-                Container<String>> values;
-    };
-    using Attributes = std::vector<Attribute>;
-
-    size_t appendBlock(
-        const Columns & key_columns,
-        const DataTypes & key_types,
-        const Attributes & new_attributes,
-        const PaddedPODArray<Metadata> & metadata,
-        const size_t begin);
-
-    size_t appendDefaults(
-        const KeyRefs & keys,
-        const PaddedPODArray<Metadata> & metadata,
-        const size_t begin);
-
-    void clearOldestBlocks();
-
-    void flush();
-
-    void remove();
-
-    size_t getId() const;
-
-    double getLoadFactor() const;
-
-    size_t getElementCount() const;
-
-    size_t getBytesAllocated() const;
-
-private:
-    size_t append(
-        const KeyRefs & keys,
-        const Attributes & new_attributes,
-        const PaddedPODArray<Metadata> & metadata,
-        const size_t begin);
-
-    template <typename SetFunc>
-    void getImpl(const Columns & key_columns, const DataTypes & key_types,
-        SetFunc & set, std::vector<bool> & found) const;
-
-    template <typename SetFunc>
-    void getValueFromMemory(const PaddedPODArray<Index> & indices, SetFunc & set) const;
-
-    template <typename SetFunc>
-    void getValueFromStorage(const PaddedPODArray<Index> & indices, SetFunc & set) const;
-
-    void ignoreFromBufferToAttributeIndex(const size_t attribute_index, ReadBuffer & buf) const;
-
-    const size_t file_id;
-    const size_t max_size;
-    const size_t block_size;
-    const size_t read_buffer_size;
-    const size_t write_buffer_size;
-    const size_t max_stored_keys;
-    const std::string path;
-
-    mutable std::shared_mutex rw_lock;
-
-    int fd = -1;
-
-    ComplexKeysPool keys_pool;
-    mutable BucketCacheIndex<KeyRef, Index, std::hash<KeyRef>, KeyDeleter> key_to_index;
-
-    std::optional<TemporalComplexKeysPool> keys_buffer_pool;
-    KeyRefs keys_buffer;
-
-    const std::vector<AttributeUnderlyingType> attributes_structure;
-
-    std::optional<Memory<>> memory;
-    std::optional<WriteBuffer> write_buffer;
-    uint32_t keys_in_block = 0;
-
-    size_t current_memory_block_id = 0;
-    size_t current_file_block_id = 0;
-};
-
-using SSDComplexKeyCachePartitionPtr = std::shared_ptr<SSDComplexKeyCachePartition>;
-
-
-/** Class for managing SSDCachePartition and getting data from source.
-  */
-class SSDComplexKeyCacheStorage
-{
-public:
-    using AttributeTypes = std::vector<AttributeUnderlyingType>;
-
-    SSDComplexKeyCacheStorage(
-            const AttributeTypes & attributes_structure,
-            const std::string & path,
-            const size_t max_partitions_count,
-            const size_t file_size,
-            const size_t block_size,
-            const size_t read_buffer_size,
-            const size_t write_buffer_size,
-            const size_t max_stored_keys);
-
-    ~SSDComplexKeyCacheStorage();
-
-    template <typename T>
-    using ResultArrayType = SSDComplexKeyCachePartition::ResultArrayType<T>;
-
-    template <typename Out, typename GetDefault>
-    void getValue(const size_t attribute_index, const Columns & key_columns, const DataTypes & key_types,
-            ResultArrayType<Out> & out, std::unordered_map<KeyRef, std::vector<size_t>> & not_found,
-            TemporalComplexKeysPool & not_found_pool,
-            GetDefault & get_default, std::chrono::system_clock::time_point now) const;
-
-    void getString(const size_t attribute_index, const Columns & key_columns, const DataTypes & key_types,
-            StringRefs & refs, ArenaWithFreeLists & arena, std::unordered_map<KeyRef, std::vector<size_t>> & not_found,
-            TemporalComplexKeysPool & not_found_pool,
-            std::vector<size_t> & default_ids, std::chrono::system_clock::time_point now) const;
-
-    void hasKeys(const Columns & key_columns, const DataTypes & key_types, ResultArrayType<UInt8> & out,
-            std::unordered_map<KeyRef, std::vector<size_t>> & not_found,
-            TemporalComplexKeysPool & not_found_pool, std::chrono::system_clock::time_point now) const;
-
-    template <typename PresentIdHandler, typename AbsentIdHandler>
-    void update(DictionarySourcePtr & source_ptr,
-            const Columns & key_columns, const DataTypes & key_types,
-            const KeyRefs & required_keys, const std::vector<size_t> & required_rows,
-            TemporalComplexKeysPool & tmp_keys_pool,
-            PresentIdHandler && on_updated, AbsentIdHandler && on_key_not_found,
-            const DictionaryLifetime lifetime);
-
-    std::exception_ptr getLastException() const { return last_update_exception; }
-
-    const std::string & getPath() const { return path; }
-
-    size_t getQueryCount() const { return query_count.load(std::memory_order_relaxed); }
-
-    size_t getHitCount() const { return hit_count.load(std::memory_order_acquire); }
-
-    size_t getElementCount() const;
-
-    double getLoadFactor() const;
-
-private:
-    void collectGarbage();
-
-    const AttributeTypes attributes_structure;
-
-    const std::string path;
-    const size_t max_partitions_count;
-    const size_t file_size;
-    const size_t block_size;
-    const size_t read_buffer_size;
-    const size_t write_buffer_size;
-    const size_t max_stored_keys;
-
-    mutable std::shared_mutex rw_lock;
-    std::list<SSDComplexKeyCachePartitionPtr> partitions;
-    std::list<SSDComplexKeyCachePartitionPtr> partition_delete_queue;
-
-    Poco::Logger * const log;
-
-    mutable pcg64 rnd_engine;
-
-    mutable std::exception_ptr last_update_exception;
-    mutable size_t update_error_count = 0;
-    mutable std::chrono::system_clock::time_point backoff_end_time;
-
-    mutable std::atomic<size_t> hit_count{0};
-    mutable std::atomic<size_t> query_count{0};
-};
-
-
-/** Dictionary interface
-  */
-class SSDComplexKeyCacheDictionary final : public IDictionaryBase
-{
-public:
-    SSDComplexKeyCacheDictionary(
-            const StorageID & dict_id_,
-            const DictionaryStructure & dict_struct_,
-            DictionarySourcePtr source_ptr_,
-            const DictionaryLifetime dict_lifetime_,
-            const std::string & path,
-            const size_t max_partitions_count_,
-            const size_t file_size_,
-            const size_t block_size_,
-            const size_t read_buffer_size_,
-            const size_t write_buffer_size_,
-            const size_t max_stored_keys_);
-
-    std::string getKeyDescription() const { return dict_struct.getKeyDescription(); }
-
-    std::string getTypeName() const override { return "SSDComplexKeyCache"; }
-
-    size_t getBytesAllocated() const override { return 0; } // TODO: ?
-
-    size_t getQueryCount() const override { return storage.getQueryCount(); }
-
-    double getHitRate() const override
-    {
-        return static_cast<double>(storage.getHitCount()) / storage.getQueryCount();
-    }
-
-    size_t getElementCount() const override { return storage.getElementCount(); }
-
-    double getLoadFactor() const override { return storage.getLoadFactor(); }
-
-    bool supportUpdates() const override { return false; }
-
-    std::shared_ptr<const IExternalLoadable> clone() const override
-    {
-        return std::make_shared<SSDComplexKeyCacheDictionary>(getDictionaryID(), dict_struct, source_ptr->clone(), dict_lifetime, path,
-                max_partitions_count, file_size, block_size, read_buffer_size, write_buffer_size, max_stored_keys);
-    }
-
-    const IDictionarySource * getSource() const override { return source_ptr.get(); }
-
-    const DictionaryLifetime & getLifetime() const override { return dict_lifetime; }
-
-    const DictionaryStructure & getStructure() const override { return dict_struct; }
-
-    bool isInjective(const std::string & attribute_name) const override
-    {
-        return dict_struct.attributes[getAttributeIndex(attribute_name)].injective;
-    }
-
-    std::exception_ptr getLastException() const override { return storage.getLastException(); }
-
-    DictionaryKeyType getKeyType() const override { return DictionaryKeyType::complex; }
-
-    ColumnPtr getColumn(
-        const std::string& attribute_name,
-        const DataTypePtr & result_type,
-        const Columns & key_columns,
-        const DataTypes & key_types,
-        const ColumnPtr default_values_column) const override;
-
-    ColumnUInt8::Ptr hasKeys(const Columns & key_columns, const DataTypes & key_types) const override;
-
-    template <typename T>
-    using ResultArrayType = SSDComplexKeyCacheStorage::ResultArrayType<T>;
-
-    BlockInputStreamPtr getBlockInputStream(const Names & column_names, size_t max_block_size) const override;
-
-private:
-    size_t getAttributeIndex(const std::string & attr_name) const;
-
-    template <typename T>
-    AttributeValueVariant createAttributeNullValueWithTypeImpl(const Field & null_value);
-    AttributeValueVariant createAttributeNullValueWithType(const AttributeUnderlyingType type, const Field & null_value);
-    void createAttributes();
-
-    template <typename AttributeType, typename OutputType, typename DefaultValueExtractor>
-    void getItemsNumberImpl(
-        const size_t attribute_index,
-        const Columns & key_columns,
-        const DataTypes & key_types,
-        ResultArrayType<OutputType> & out,
-        DefaultValueExtractor & default_value_extractor) const;
-
-    void getItemsStringImpl(
-        const size_t attribute_index,
-        const Columns & key_columns,
-        const DataTypes & key_types,
-        ColumnString * out,
-        DictionaryDefaultValueExtractor<String> & default_value_extractor) const;
-
-    const std::string name;
-    const DictionaryStructure dict_struct;
-    mutable DictionarySourcePtr source_ptr;
-    const DictionaryLifetime dict_lifetime;
-
-    const std::string path;
-    const size_t max_partitions_count;
-    const size_t file_size;
-    const size_t block_size;
-    const size_t read_buffer_size;
-    const size_t write_buffer_size;
-    const size_t max_stored_keys;
-
-    std::map<std::string, size_t> attribute_index_by_name;
-    std::vector<AttributeValueVariant> null_values;
-    mutable SSDComplexKeyCacheStorage storage;
-    Poco::Logger * const log;
-
-    mutable size_t bytes_allocated = 0;
-};
-
-}
-
-#endif
diff --git a/src/Dictionaries/XDBCDictionarySource.cpp b/src/Dictionaries/XDBCDictionarySource.cpp
index 3615f72605f..5774641a90f 100644
--- a/src/Dictionaries/XDBCDictionarySource.cpp
+++ b/src/Dictionaries/XDBCDictionarySource.cpp
@@ -11,18 +11,14 @@
 #include <Interpreters/Context.h>
 #include <Poco/Net/HTTPRequest.h>
 #include <Poco/Util/AbstractConfiguration.h>
-#include <Common/XDBCBridgeHelper.h>
 #include <common/LocalDateTime.h>
 #include <common/logger_useful.h>
 #include "DictionarySourceFactory.h"
 #include "DictionaryStructure.h"
 #include "readInvalidateQuery.h"
-
 #include "registerDictionaries.h"
+#include <Common/escapeForFileName.h>
 
-#if USE_ODBC
-#    include <Poco/Data/ODBC/Connector.h> // Y_IGNORE
-#endif
 
 namespace DB
 {
@@ -41,7 +37,7 @@ namespace
             const Poco::URI & uri,
             std::function<void(std::ostream &)> callback,
             const Block & sample_block,
-            const Context & context,
+            ContextPtr context,
             UInt64 max_block_size,
             const ConnectionTimeouts & timeouts,
             const String name_)
@@ -89,9 +85,9 @@ namespace
         else
         {
             if (!schema.empty())
-                throw Exception{"Dictionary source of type " + bridge_.getName() + " specifies a schema but schema is not supported by "
-                                    + bridge_.getName() + "-driver",
-                                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
+                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                    "Dictionary source of type {0} specifies a schema but schema is not supported by {0}-driver",
+                    bridge_.getName());
         }
 
         return {dict_struct_, db_, schema, table, where_, bridge_.getIdentifierQuotingStyle()};
@@ -106,9 +102,10 @@ XDBCDictionarySource::XDBCDictionarySource(
     const Poco::Util::AbstractConfiguration & config_,
     const std::string & config_prefix_,
     const Block & sample_block_,
-    const Context & context_,
+    ContextPtr context_,
     const BridgeHelperPtr bridge_)
-    : log(&Poco::Logger::get(bridge_->getName() + "DictionarySource"))
+    : WithContext(context_->getGlobalContext())
+    , log(&Poco::Logger::get(bridge_->getName() + "DictionarySource"))
     , update_time{std::chrono::system_clock::from_time_t(0)}
     , dict_struct{dict_struct_}
     , db{config_.getString(config_prefix_ + ".db", "")}
@@ -122,18 +119,18 @@ XDBCDictionarySource::XDBCDictionarySource(
     , invalidate_query{config_.getString(config_prefix_ + ".invalidate_query", "")}
     , bridge_helper{bridge_}
     , timeouts{ConnectionTimeouts::getHTTPTimeouts(context_)}
-    , global_context(context_.getGlobalContext())
 {
     bridge_url = bridge_helper->getMainURI();
 
-    auto url_params = bridge_helper->getURLParams(sample_block_.getNamesAndTypesList().toString(), max_block_size);
+    auto url_params = bridge_helper->getURLParams(max_block_size);
     for (const auto & [name, value] : url_params)
         bridge_url.addQueryParameter(name, value);
 }
 
 /// copy-constructor is provided in order to support cloneability
 XDBCDictionarySource::XDBCDictionarySource(const XDBCDictionarySource & other)
-    : log(&Poco::Logger::get(other.bridge_helper->getName() + "DictionarySource"))
+    : WithContext(other.getContext())
+    , log(&Poco::Logger::get(other.bridge_helper->getName() + "DictionarySource"))
     , update_time{other.update_time}
     , dict_struct{other.dict_struct}
     , db{other.db}
@@ -148,18 +145,17 @@ XDBCDictionarySource::XDBCDictionarySource(const XDBCDictionarySource & other)
     , bridge_helper{other.bridge_helper}
     , bridge_url{other.bridge_url}
     , timeouts{other.timeouts}
-    , global_context{other.global_context}
 {
 }
 
+
 std::string XDBCDictionarySource::getUpdateFieldAndDate()
 {
     if (update_time != std::chrono::system_clock::from_time_t(0))
     {
-        auto tmp_time = update_time;
+        time_t hr_time = std::chrono::system_clock::to_time_t(update_time) - 1;
+        std::string str_time = DateLUT::instance().timeToString(hr_time);
         update_time = std::chrono::system_clock::now();
-        time_t hr_time = std::chrono::system_clock::to_time_t(tmp_time) - 1;
-        std::string str_time = std::to_string(LocalDateTime(hr_time));
         return query_builder.composeUpdateQuery(update_field, str_time);
     }
     else
@@ -169,52 +165,61 @@ std::string XDBCDictionarySource::getUpdateFieldAndDate()
     }
 }
 
+
 BlockInputStreamPtr XDBCDictionarySource::loadAll()
 {
     LOG_TRACE(log, load_all_query);
-    return loadBase(load_all_query);
+    return loadFromQuery(bridge_url, sample_block, load_all_query);
 }
 
+
 BlockInputStreamPtr XDBCDictionarySource::loadUpdatedAll()
 {
     std::string load_query_update = getUpdateFieldAndDate();
 
     LOG_TRACE(log, load_query_update);
-    return loadBase(load_query_update);
+    return loadFromQuery(bridge_url, sample_block, load_query_update);
 }
 
+
 BlockInputStreamPtr XDBCDictionarySource::loadIds(const std::vector<UInt64> & ids)
 {
     const auto query = query_builder.composeLoadIdsQuery(ids);
-    return loadBase(query);
+    return loadFromQuery(bridge_url, sample_block, query);
 }
 
+
 BlockInputStreamPtr XDBCDictionarySource::loadKeys(const Columns & key_columns, const std::vector<size_t> & requested_rows)
 {
     const auto query = query_builder.composeLoadKeysQuery(key_columns, requested_rows, ExternalQueryBuilder::AND_OR_CHAIN);
-    return loadBase(query);
+    return loadFromQuery(bridge_url, sample_block, query);
 }
 
+
 bool XDBCDictionarySource::supportsSelectiveLoad() const
 {
     return true;
 }
 
+
 bool XDBCDictionarySource::hasUpdateField() const
 {
     return !update_field.empty();
 }
 
+
 DictionarySourcePtr XDBCDictionarySource::clone() const
 {
     return std::make_unique<XDBCDictionarySource>(*this);
 }
 
+
 std::string XDBCDictionarySource::toString() const
 {
     return bridge_helper->getName() + ": " + db + '.' + table + (where.empty() ? "" : ", where: " + where);
 }
 
+
 bool XDBCDictionarySource::isModified() const
 {
     if (!invalidate_query.empty())
@@ -237,51 +242,48 @@ std::string XDBCDictionarySource::doInvalidateQuery(const std::string & request)
     bridge_helper->startBridgeSync();
 
     auto invalidate_url = bridge_helper->getMainURI();
-    auto url_params = bridge_helper->getURLParams(invalidate_sample_block.getNamesAndTypesList().toString(), max_block_size);
+    auto url_params = bridge_helper->getURLParams(max_block_size);
     for (const auto & [name, value] : url_params)
         invalidate_url.addQueryParameter(name, value);
 
-    XDBCBridgeBlockInputStream stream(
-        invalidate_url,
-        [request](std::ostream & os) { os << "query=" << request; },
-        invalidate_sample_block,
-        global_context,
-        max_block_size,
-        timeouts,
-        bridge_helper->getName() + "BlockInputStream");
-
-    return readInvalidateQuery(stream);
+    return readInvalidateQuery(*loadFromQuery(invalidate_url, invalidate_sample_block, request));
 }
 
-BlockInputStreamPtr XDBCDictionarySource::loadBase(const std::string & query) const
+
+BlockInputStreamPtr XDBCDictionarySource::loadFromQuery(const Poco::URI url, const Block & required_sample_block, const std::string & query) const
 {
     bridge_helper->startBridgeSync();
+
+    auto write_body_callback = [required_sample_block, query](std::ostream & os)
+    {
+        os << "sample_block=" << escapeForFileName(required_sample_block.getNamesAndTypesList().toString());
+        os << "&";
+        os << "query=" << escapeForFileName(query);
+    };
+
     return std::make_shared<XDBCBridgeBlockInputStream>(
-        bridge_url,
-        [query](std::ostream & os) { os << "query=" << query; },
-        sample_block,
-        global_context,
+        url,
+        write_body_callback,
+        required_sample_block,
+        getContext(),
         max_block_size,
         timeouts,
         bridge_helper->getName() + "BlockInputStream");
 }
 
+
 void registerDictionarySourceXDBC(DictionarySourceFactory & factory)
 {
-#if USE_ODBC
-    Poco::Data::ODBC::Connector::registerConnector();
-#endif
-
     auto create_table_source = [=](const DictionaryStructure & dict_struct,
                                    const Poco::Util::AbstractConfiguration & config,
                                    const std::string & config_prefix,
                                    Block & sample_block,
-                                   const Context & context,
+                                   ContextPtr context,
                                    const std::string & /* default_database */,
                                    bool /* check_config */) -> DictionarySourcePtr {
 #if USE_ODBC
         BridgeHelperPtr bridge = std::make_shared<XDBCBridgeHelper<ODBCBridgeMixin>>(
-            context, context.getSettings().http_receive_timeout, config.getString(config_prefix + ".odbc.connection_string"));
+            context, context->getSettings().http_receive_timeout, config.getString(config_prefix + ".odbc.connection_string"));
         return std::make_unique<XDBCDictionarySource>(dict_struct, config, config_prefix + ".odbc", sample_block, context, bridge);
 #else
         (void)dict_struct;
@@ -289,24 +291,25 @@ void registerDictionarySourceXDBC(DictionarySourceFactory & factory)
         (void)config_prefix;
         (void)sample_block;
         (void)context;
-        throw Exception{"Dictionary source of type `odbc` is disabled because poco library was built without ODBC support.",
-                        ErrorCodes::SUPPORT_IS_DISABLED};
+        throw Exception(ErrorCodes::SUPPORT_IS_DISABLED,
+            "Dictionary source of type `odbc` is disabled because poco library was built without ODBC support.");
 #endif
     };
     factory.registerSource("odbc", create_table_source);
 }
 
+
 void registerDictionarySourceJDBC(DictionarySourceFactory & factory)
 {
     auto create_table_source = [=](const DictionaryStructure & /* dict_struct */,
                                  const Poco::Util::AbstractConfiguration & /* config */,
                                  const std::string & /* config_prefix */,
                                  Block & /* sample_block */,
-                                 const Context & /* context */,
+                                 ContextPtr /* context */,
                                  const std::string & /* default_database */,
                                  bool /* check_config */) -> DictionarySourcePtr {
-        throw Exception{"Dictionary source of type `jdbc` is disabled until consistent support for nullable fields.",
-                        ErrorCodes::SUPPORT_IS_DISABLED};
+        throw Exception(ErrorCodes::SUPPORT_IS_DISABLED,
+            "Dictionary source of type `jdbc` is disabled until consistent support for nullable fields.");
         //        BridgeHelperPtr bridge = std::make_shared<XDBCBridgeHelper<JDBCBridgeMixin>>(config, context.getSettings().http_receive_timeout, config.getString(config_prefix + ".connection_string"));
         //        return std::make_unique<XDBCDictionarySource>(dict_struct, config, config_prefix + ".jdbc", sample_block, context, bridge);
     };
diff --git a/src/Dictionaries/XDBCDictionarySource.h b/src/Dictionaries/XDBCDictionarySource.h
index 87bc42c76ab..bd473e0db8a 100644
--- a/src/Dictionaries/XDBCDictionarySource.h
+++ b/src/Dictionaries/XDBCDictionarySource.h
@@ -3,7 +3,7 @@
 #include <IO/ConnectionTimeouts.h>
 #include <Poco/Data/SessionPool.h>
 #include <Poco/URI.h>
-#include <Common/XDBCBridgeHelper.h>
+#include <Bridge/XDBCBridgeHelper.h>
 #include "DictionaryStructure.h"
 #include "ExternalQueryBuilder.h"
 #include "IDictionarySource.h"
@@ -23,7 +23,7 @@ class Logger;
 namespace DB
 {
 /// Allows loading dictionaries from a XDBC source via bridges
-class XDBCDictionarySource final : public IDictionarySource
+class XDBCDictionarySource final : public IDictionarySource, WithContext
 {
 public:
     XDBCDictionarySource(
@@ -31,7 +31,7 @@ public:
         const Poco::Util::AbstractConfiguration & config_,
         const std::string & config_prefix_,
         const Block & sample_block_,
-        const Context & context_,
+        ContextPtr context_,
         BridgeHelperPtr bridge);
 
     /// copy-constructor is provided in order to support cloneability
@@ -62,7 +62,7 @@ private:
     // execute invalidate_query. expects single cell in result
     std::string doInvalidateQuery(const std::string & request) const;
 
-    BlockInputStreamPtr loadBase(const std::string & query) const;
+    BlockInputStreamPtr loadFromQuery(const Poco::URI url, const Block & required_sample_block, const std::string & query) const;
 
     Poco::Logger * log;
 
@@ -82,7 +82,6 @@ private:
     BridgeHelperPtr bridge_helper;
     Poco::URI bridge_url;
     ConnectionTimeouts timeouts;
-    const Context & global_context;
 };
 
 }
diff --git a/src/Dictionaries/getDictionaryConfigurationFromAST.cpp b/src/Dictionaries/getDictionaryConfigurationFromAST.cpp
index 04ba1db09fc..5ab8213020b 100644
--- a/src/Dictionaries/getDictionaryConfigurationFromAST.cpp
+++ b/src/Dictionaries/getDictionaryConfigurationFromAST.cpp
@@ -299,15 +299,30 @@ void buildPrimaryKeyConfiguration(
     if (!complex)
     {
         if (key_names.size() != 1)
-            throw Exception("Primary key for simple dictionary must contain exactly one element",
-                ErrorCodes::INCORRECT_DICTIONARY_DEFINITION);
+            throw Exception(ErrorCodes::INCORRECT_DICTIONARY_DEFINITION,
+                "Primary key for simple dictionary must contain exactly one element");
 
         AutoPtr<Element> id_element(doc->createElement("id"));
         root->appendChild(id_element);
         AutoPtr<Element> name_element(doc->createElement("name"));
         id_element->appendChild(name_element);
 
-        const ASTDictionaryAttributeDeclaration * dict_attr = children.front()->as<const ASTDictionaryAttributeDeclaration>();
+        auto identifier_name = key_names.front();
+
+        auto it = std::find_if(children.begin(), children.end(), [&](const ASTPtr & node)
+        {
+            const ASTDictionaryAttributeDeclaration * dict_attr = node->as<const ASTDictionaryAttributeDeclaration>();
+            return dict_attr->name == identifier_name;
+        });
+
+        if (it == children.end())
+        {
+            throw Exception(ErrorCodes::INCORRECT_DICTIONARY_DEFINITION,
+                "Primary key field '{}' not found among attributes",
+                identifier_name);
+        }
+
+        const ASTDictionaryAttributeDeclaration * dict_attr = (*it)->as<const ASTDictionaryAttributeDeclaration>();
 
         AutoPtr<Text> name(doc->createTextNode(dict_attr->name));
         name_element->appendChild(name);
@@ -317,8 +332,8 @@ void buildPrimaryKeyConfiguration(
     else
     {
         if (children.size() < key_names.size())
-            throw Exception(
-                "Primary key fields count is more, than dictionary attributes count.", ErrorCodes::INCORRECT_DICTIONARY_DEFINITION);
+            throw Exception(ErrorCodes::INCORRECT_DICTIONARY_DEFINITION,
+                "Primary key fields count is more, than dictionary attributes count.");
 
         AutoPtr<Element> key_element(doc->createElement("key"));
         root->appendChild(key_element);
@@ -336,8 +351,9 @@ void buildPrimaryKeyConfiguration(
                 }
             }
             if (!found)
-                throw Exception(
-                    "Primary key field '" + key_name + "' not found among attributes.", ErrorCodes::INCORRECT_DICTIONARY_DEFINITION);
+                throw Exception(ErrorCodes::INCORRECT_DICTIONARY_DEFINITION,
+                    "Primary key field '{}' not found among attributes.",
+                    key_name);
         }
     }
 }
@@ -358,7 +374,7 @@ NamesToTypeNames buildDictionaryAttributesConfiguration(
     {
         const ASTDictionaryAttributeDeclaration * dict_attr = child->as<const ASTDictionaryAttributeDeclaration>();
         if (!dict_attr->type)
-            throw Exception("Dictionary attribute must has type", ErrorCodes::INCORRECT_DICTIONARY_DEFINITION);
+            throw Exception(ErrorCodes::INCORRECT_DICTIONARY_DEFINITION, "Dictionary attribute must has type");
 
         attributes_names_and_types.emplace(dict_attr->name, queryToString(dict_attr->type));
         if (std::find(key_columns.begin(), key_columns.end(), dict_attr->name) == key_columns.end())
@@ -374,7 +390,7 @@ void buildConfigurationFromFunctionWithKeyValueArguments(
     AutoPtr<Document> doc,
     AutoPtr<Element> root,
     const ASTExpressionList * ast_expr_list,
-    const Context & context)
+    ContextPtr context)
 {
     const auto & children = ast_expr_list->children;
     for (size_t i = 0; i != children.size(); ++i)
@@ -416,9 +432,8 @@ void buildConfigurationFromFunctionWithKeyValueArguments(
         }
         else
         {
-            throw Exception(
-                "Incorrect ASTPair contains wrong value, should be literal, identifier or list",
-                ErrorCodes::INCORRECT_DICTIONARY_DEFINITION);
+            throw Exception(ErrorCodes::INCORRECT_DICTIONARY_DEFINITION,
+                "Incorrect ASTPair contains wrong value, should be literal, identifier or list");
         }
     }
 }
@@ -442,7 +457,7 @@ void buildSourceConfiguration(
     AutoPtr<Element> root,
     const ASTFunctionWithKeyValueArguments * source,
     const ASTDictionarySettings * settings,
-    const Context & context)
+    ContextPtr context)
 {
     AutoPtr<Element> outer_element(doc->createElement("source"));
     root->appendChild(outer_element);
@@ -470,24 +485,24 @@ void buildSourceConfiguration(
 void checkAST(const ASTCreateQuery & query)
 {
     if (!query.is_dictionary || query.dictionary == nullptr)
-        throw Exception("Cannot convert dictionary to configuration from non-dictionary AST.", ErrorCodes::INCORRECT_DICTIONARY_DEFINITION);
+        throw Exception(ErrorCodes::INCORRECT_DICTIONARY_DEFINITION, "Cannot convert dictionary to configuration from non-dictionary AST.");
 
     if (query.dictionary_attributes_list == nullptr || query.dictionary_attributes_list->children.empty())
-        throw Exception("Cannot create dictionary with empty attributes list", ErrorCodes::INCORRECT_DICTIONARY_DEFINITION);
+        throw Exception(ErrorCodes::INCORRECT_DICTIONARY_DEFINITION, "Cannot create dictionary with empty attributes list");
 
     if (query.dictionary->layout == nullptr)
-        throw Exception("Cannot create dictionary with empty layout", ErrorCodes::INCORRECT_DICTIONARY_DEFINITION);
+        throw Exception(ErrorCodes::INCORRECT_DICTIONARY_DEFINITION, "Cannot create dictionary with empty layout");
 
     const auto is_direct_layout = !strcasecmp(query.dictionary->layout->layout_type.data(), "direct") ||
                                 !strcasecmp(query.dictionary->layout->layout_type.data(), "complex_key_direct");
     if (query.dictionary->lifetime == nullptr && !is_direct_layout)
-        throw Exception("Cannot create dictionary with empty lifetime", ErrorCodes::INCORRECT_DICTIONARY_DEFINITION);
+        throw Exception(ErrorCodes::INCORRECT_DICTIONARY_DEFINITION, "Cannot create dictionary with empty lifetime");
 
     if (query.dictionary->primary_key == nullptr)
-        throw Exception("Cannot create dictionary without primary key", ErrorCodes::INCORRECT_DICTIONARY_DEFINITION);
+        throw Exception(ErrorCodes::INCORRECT_DICTIONARY_DEFINITION, "Cannot create dictionary without primary key");
 
     if (query.dictionary->source == nullptr)
-        throw Exception("Cannot create dictionary with empty source", ErrorCodes::INCORRECT_DICTIONARY_DEFINITION);
+        throw Exception(ErrorCodes::INCORRECT_DICTIONARY_DEFINITION, "Cannot create dictionary with empty source");
 
     /// Range can be empty
 }
@@ -496,14 +511,14 @@ void checkPrimaryKey(const NamesToTypeNames & all_attrs, const Names & key_attrs
 {
     for (const auto & key_attr : key_attrs)
         if (all_attrs.count(key_attr) == 0)
-            throw Exception("Unknown key attribute '" + key_attr + "'", ErrorCodes::INCORRECT_DICTIONARY_DEFINITION);
+            throw Exception(ErrorCodes::INCORRECT_DICTIONARY_DEFINITION, "Unknown key attribute '{}'", key_attr);
 }
 
 }
 
 
 DictionaryConfigurationPtr
-getDictionaryConfigurationFromAST(const ASTCreateQuery & query, const Context & context, const std::string & database_)
+getDictionaryConfigurationFromAST(const ASTCreateQuery & query, ContextPtr context, const std::string & database_)
 {
     checkAST(query);
 
diff --git a/src/Dictionaries/getDictionaryConfigurationFromAST.h b/src/Dictionaries/getDictionaryConfigurationFromAST.h
index 5132e3c77e0..de8659e4d7b 100644
--- a/src/Dictionaries/getDictionaryConfigurationFromAST.h
+++ b/src/Dictionaries/getDictionaryConfigurationFromAST.h
@@ -2,6 +2,7 @@
 
 #include <Poco/Util/AbstractConfiguration.h>
 #include <Parsers/ASTCreateQuery.h>
+#include <Interpreters/Context_fwd.h>
 
 namespace DB
 {
@@ -11,5 +12,5 @@ using DictionaryConfigurationPtr = Poco::AutoPtr<Poco::Util::AbstractConfigurati
 /// This function is necessary because all loadable objects configuration are Poco::AbstractConfiguration
 /// Can throw exception if query is ill-formed
 DictionaryConfigurationPtr
-getDictionaryConfigurationFromAST(const ASTCreateQuery & query, const Context & context, const std::string & database_ = "");
+getDictionaryConfigurationFromAST(const ASTCreateQuery & query, ContextPtr context, const std::string & database_ = "");
 }
diff --git a/src/Dictionaries/readInvalidateQuery.cpp b/src/Dictionaries/readInvalidateQuery.cpp
index 9b5b34133b2..4664b61bfc4 100644
--- a/src/Dictionaries/readInvalidateQuery.cpp
+++ b/src/Dictionaries/readInvalidateQuery.cpp
@@ -20,25 +20,25 @@ std::string readInvalidateQuery(IBlockInputStream & block_input_stream)
 
     Block block = block_input_stream.read();
     if (!block)
-        throw Exception("Empty response", ErrorCodes::RECEIVED_EMPTY_DATA);
+        throw Exception(ErrorCodes::RECEIVED_EMPTY_DATA, "Empty response");
 
     auto columns = block.columns();
     if (columns > 1)
-        throw Exception("Expected single column in resultset, got " + std::to_string(columns), ErrorCodes::TOO_MANY_COLUMNS);
+        throw Exception(ErrorCodes::TOO_MANY_COLUMNS, "Expected single column in resultset, got {}", std::to_string(columns));
 
     auto rows = block.rows();
     if (rows == 0)
-        throw Exception("Expected single row in resultset, got 0", ErrorCodes::RECEIVED_EMPTY_DATA);
+        throw Exception(ErrorCodes::RECEIVED_EMPTY_DATA, "Expected single row in resultset, got 0");
     if (rows > 1)
-        throw Exception("Expected single row in resultset, got at least " + std::to_string(rows), ErrorCodes::TOO_MANY_ROWS);
+        throw Exception(ErrorCodes::TOO_MANY_ROWS, "Expected single row in resultset, got at least {}", std::to_string(rows));
 
     WriteBufferFromOwnString out;
     auto & column_type = block.getByPosition(0);
-    column_type.type->serializeAsTextQuoted(*column_type.column->convertToFullColumnIfConst(), 0, out, FormatSettings());
+    column_type.type->getDefaultSerialization()->serializeTextQuoted(*column_type.column->convertToFullColumnIfConst(), 0, out, FormatSettings());
 
     while ((block = block_input_stream.read()))
         if (block.rows() > 0)
-            throw Exception("Expected single row in resultset, got at least " + std::to_string(rows + 1), ErrorCodes::TOO_MANY_ROWS);
+            throw Exception(ErrorCodes::TOO_MANY_ROWS, "Expected single row in resultset, got at least {}", std::to_string(rows + 1));
 
     block_input_stream.readSuffix();
     return out.str();
diff --git a/src/Dictionaries/registerCacheDictionaries.cpp b/src/Dictionaries/registerCacheDictionaries.cpp
new file mode 100644
index 00000000000..9cc90c44418
--- /dev/null
+++ b/src/Dictionaries/registerCacheDictionaries.cpp
@@ -0,0 +1,304 @@
+#include "CacheDictionary.h"
+#include "CacheDictionaryStorage.h"
+#include "SSDCacheDictionaryStorage.h"
+#include <Dictionaries/DictionaryFactory.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int TOO_SMALL_BUFFER_SIZE;
+    extern const int UNSUPPORTED_METHOD;
+    extern const int BAD_ARGUMENTS;
+}
+
+CacheDictionaryStorageConfiguration parseCacheStorageConfiguration(
+    const String & full_name,
+    const Poco::Util::AbstractConfiguration & config,
+    const String & layout_prefix,
+    const DictionaryLifetime & dict_lifetime,
+    DictionaryKeyType dictionary_key_type)
+{
+    String dictionary_type_prefix = (dictionary_key_type == DictionaryKeyType::complex) ? ".complex_key_cache." : ".cache.";
+    String dictionary_configuration_prefix = layout_prefix + dictionary_type_prefix;
+
+    const size_t size = config.getUInt64(dictionary_configuration_prefix + "size_in_cells");
+    if (size == 0)
+        throw Exception(ErrorCodes::TOO_SMALL_BUFFER_SIZE,
+            "{}: cache dictionary cannot have 0 cells",
+            full_name);
+
+    size_t dict_lifetime_seconds = static_cast<size_t>(dict_lifetime.max_sec);
+    const size_t strict_max_lifetime_seconds = config.getUInt64(dictionary_configuration_prefix + "strict_max_lifetime_seconds", dict_lifetime_seconds);
+
+    size_t rounded_size = roundUpToPowerOfTwoOrZero(size);
+
+    CacheDictionaryStorageConfiguration storage_configuration{rounded_size, strict_max_lifetime_seconds, dict_lifetime};
+
+    return storage_configuration;
+}
+
+#if defined(OS_LINUX) || defined(__FreeBSD__)
+
+SSDCacheDictionaryStorageConfiguration parseSSDCacheStorageConfiguration(
+    const String & full_name,
+    const Poco::Util::AbstractConfiguration & config,
+    const String & layout_prefix,
+    const DictionaryLifetime & dict_lifetime,
+    DictionaryKeyType dictionary_key_type)
+{
+    String dictionary_type_prefix = dictionary_key_type == DictionaryKeyType::complex ? ".complex_key_ssd_cache." : ".ssd_cache.";
+    String dictionary_configuration_prefix = layout_prefix + dictionary_type_prefix;
+
+    const size_t strict_max_lifetime_seconds
+        = config.getUInt64(dictionary_configuration_prefix + "strict_max_lifetime_seconds", static_cast<size_t>(dict_lifetime.max_sec));
+
+    static constexpr size_t DEFAULT_SSD_BLOCK_SIZE_BYTES = DEFAULT_AIO_FILE_BLOCK_SIZE;
+    static constexpr size_t DEFAULT_FILE_SIZE_BYTES = 4 * 1024 * 1024 * 1024ULL;
+    static constexpr size_t DEFAULT_READ_BUFFER_SIZE_BYTES = 16 * DEFAULT_SSD_BLOCK_SIZE_BYTES;
+    static constexpr size_t DEFAULT_WRITE_BUFFER_SIZE_BYTES = DEFAULT_SSD_BLOCK_SIZE_BYTES;
+
+    static constexpr size_t DEFAULT_PARTITIONS_COUNT = 16;
+
+    const size_t max_partitions_count
+        = config.getInt64(dictionary_configuration_prefix + "ssd_cache.max_partitions_count", DEFAULT_PARTITIONS_COUNT);
+
+    const size_t block_size = config.getInt64(dictionary_configuration_prefix + "block_size", DEFAULT_SSD_BLOCK_SIZE_BYTES);
+    const size_t file_size = config.getInt64(dictionary_configuration_prefix + "file_size", DEFAULT_FILE_SIZE_BYTES);
+    if (file_size % block_size != 0)
+        throw Exception(ErrorCodes::BAD_ARGUMENTS,
+            "{}: file_size must be a multiple of block_size",
+            full_name);
+
+    const size_t read_buffer_size = config.getInt64(dictionary_configuration_prefix + "read_buffer_size", DEFAULT_READ_BUFFER_SIZE_BYTES);
+    if (read_buffer_size % block_size != 0)
+        throw Exception(ErrorCodes::BAD_ARGUMENTS,
+            "{}: read_buffer_size must be a multiple of block_size",
+            full_name);
+
+    const size_t write_buffer_size
+        = config.getInt64(dictionary_configuration_prefix + "write_buffer_size", DEFAULT_WRITE_BUFFER_SIZE_BYTES);
+    if (write_buffer_size % block_size != 0)
+        throw Exception(ErrorCodes::BAD_ARGUMENTS,
+            "{}: write_buffer_size must be a multiple of block_size",
+            full_name);
+
+    auto directory_path = config.getString(dictionary_configuration_prefix + "path");
+    if (directory_path.empty())
+        throw Exception(ErrorCodes::BAD_ARGUMENTS,
+            "{}: ssd cache dictionary cannot have empty path",
+            full_name);
+
+    if (directory_path.at(0) != '/')
+        directory_path = std::filesystem::path{config.getString("path")}.concat(directory_path).string();
+
+    SSDCacheDictionaryStorageConfiguration configuration{
+        strict_max_lifetime_seconds,
+        dict_lifetime,
+        directory_path,
+        max_partitions_count,
+        block_size,
+        file_size / block_size,
+        read_buffer_size / block_size,
+        write_buffer_size / block_size};
+
+    return configuration;
+}
+
+#endif
+
+CacheDictionaryUpdateQueueConfiguration parseCacheDictionaryUpdateQueueConfiguration(
+    const String & full_name,
+    const Poco::Util::AbstractConfiguration & config,
+    const String & layout_prefix,
+    DictionaryKeyType key_type)
+{
+    String layout_type = key_type == DictionaryKeyType::complex ? "complex_key_cache" : "cache";
+
+    const size_t max_update_queue_size = config.getUInt64(layout_prefix + ".cache.max_update_queue_size", 100000);
+    if (max_update_queue_size == 0)
+        throw Exception(ErrorCodes::TOO_SMALL_BUFFER_SIZE,
+            "{}: dictionary of layout '{}' cannot have empty update queue of size 0",
+            full_name,
+            layout_type);
+
+    const size_t update_queue_push_timeout_milliseconds
+        = config.getUInt64(layout_prefix + ".cache.update_queue_push_timeout_milliseconds", 10);
+    if (update_queue_push_timeout_milliseconds < 10)
+        throw Exception(ErrorCodes::BAD_ARGUMENTS,
+            "{}: dictionary of layout '{}' have too little update_queue_push_timeout",
+            full_name,
+            layout_type);
+
+    const size_t query_wait_timeout_milliseconds = config.getUInt64(layout_prefix + ".cache.query_wait_timeout_milliseconds", 60000);
+
+    const size_t max_threads_for_updates = config.getUInt64(layout_prefix + ".max_threads_for_updates", 4);
+    if (max_threads_for_updates == 0)
+        throw Exception(ErrorCodes::BAD_ARGUMENTS,
+            "{}: dictionary of layout) '{}' cannot have zero threads for updates",
+            full_name,
+            layout_type);
+
+    CacheDictionaryUpdateQueueConfiguration update_queue_configuration{
+        max_update_queue_size, max_threads_for_updates, update_queue_push_timeout_milliseconds, query_wait_timeout_milliseconds};
+
+    return update_queue_configuration;
+}
+
+template <DictionaryKeyType dictionary_key_type>
+DictionaryPtr createCacheDictionaryLayout(
+    const String & full_name,
+    const DictionaryStructure & dict_struct,
+    const Poco::Util::AbstractConfiguration & config,
+    const std::string & config_prefix,
+    DictionarySourcePtr source_ptr)
+{
+    static_assert(dictionary_key_type != DictionaryKeyType::range, "Range key type is not supported by CacheDictionary");
+
+    if constexpr (dictionary_key_type == DictionaryKeyType::simple)
+    {
+        if (dict_struct.key)
+            throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "'key' is not supported for dictionary of layout 'cache'");
+    }
+    else if constexpr (dictionary_key_type == DictionaryKeyType::complex)
+    {
+        if (dict_struct.id)
+            throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "'id' is not supported for dictionary of layout 'complex_key_cache'");
+    }
+
+    if (dict_struct.range_min || dict_struct.range_max)
+        throw Exception(ErrorCodes::BAD_ARGUMENTS,
+            "{}: elements .structure.range_min and .structure.range_max should be defined only "
+            "for a dictionary of layout 'range_hashed'",
+            full_name);
+
+    const bool require_nonempty = config.getBool(config_prefix + ".require_nonempty", false);
+    if (require_nonempty)
+        throw Exception(ErrorCodes::BAD_ARGUMENTS,
+            "{}: cache dictionary of layout cannot have 'require_nonempty' attribute set",
+            full_name);
+
+    const auto & layout_prefix = config_prefix + ".layout";
+
+    const auto dict_id = StorageID::fromDictionaryConfig(config, config_prefix);
+
+    const DictionaryLifetime dict_lifetime{config, config_prefix + ".lifetime"};
+
+    const bool allow_read_expired_keys = config.getBool(layout_prefix + ".cache.allow_read_expired_keys", false);
+
+    auto storage_configuration = parseCacheStorageConfiguration(full_name, config, layout_prefix, dict_lifetime, dictionary_key_type);
+
+    std::shared_ptr<ICacheDictionaryStorage> storage = std::make_shared<CacheDictionaryStorage<dictionary_key_type>>(dict_struct, storage_configuration);
+
+    auto update_queue_configuration = parseCacheDictionaryUpdateQueueConfiguration(full_name, config, layout_prefix, dictionary_key_type);
+
+    return std::make_unique<CacheDictionary<dictionary_key_type>>(
+        dict_id, dict_struct, std::move(source_ptr), storage, update_queue_configuration, dict_lifetime, allow_read_expired_keys);
+}
+
+#if defined(OS_LINUX) || defined(__FreeBSD__)
+
+template <DictionaryKeyType dictionary_key_type>
+DictionaryPtr createSSDCacheDictionaryLayout(
+    const String & full_name,
+    const DictionaryStructure & dict_struct,
+    const Poco::Util::AbstractConfiguration & config,
+    const std::string & config_prefix,
+    DictionarySourcePtr source_ptr)
+{
+    static_assert(dictionary_key_type != DictionaryKeyType::range, "Range key type is not supported by CacheDictionary");
+
+    if constexpr (dictionary_key_type == DictionaryKeyType::simple)
+    {
+        if (dict_struct.key)
+            throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "'key' is not supported for dictionary of layout 'ssd_cache'");
+    }
+    else if constexpr (dictionary_key_type == DictionaryKeyType::complex)
+    {
+        if (dict_struct.id)
+            throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "'id' is not supported for dictionary of layout 'complex_key_ssd_cache'");
+    }
+
+    if (dict_struct.range_min || dict_struct.range_max)
+        throw Exception(ErrorCodes::BAD_ARGUMENTS,
+            "{}: elements .structure.range_min and .structure.range_max should be defined only "
+            "for a dictionary of layout 'range_hashed'",
+            full_name);
+
+    const bool require_nonempty = config.getBool(config_prefix + ".require_nonempty", false);
+    if (require_nonempty)
+        throw Exception(ErrorCodes::BAD_ARGUMENTS,
+            "{}: cache dictionary of layout cannot have 'require_nonempty' attribute set",
+            full_name);
+
+    const auto & layout_prefix = config_prefix + ".layout";
+
+    const auto dict_id = StorageID::fromDictionaryConfig(config, config_prefix);
+
+    const DictionaryLifetime dict_lifetime{config, config_prefix + ".lifetime"};
+
+    const bool allow_read_expired_keys = config.getBool(layout_prefix + ".cache.allow_read_expired_keys", false);
+
+    auto storage_configuration = parseSSDCacheStorageConfiguration(full_name, config, layout_prefix, dict_lifetime, dictionary_key_type);
+    auto storage = std::make_shared<SSDCacheDictionaryStorage<dictionary_key_type>>(storage_configuration);
+
+    auto update_queue_configuration
+        = parseCacheDictionaryUpdateQueueConfiguration(full_name, config, layout_prefix, dictionary_key_type);
+
+    return std::make_unique<CacheDictionary<dictionary_key_type>>(
+        dict_id, dict_struct, std::move(source_ptr), storage, update_queue_configuration, dict_lifetime, allow_read_expired_keys);
+}
+
+#endif
+
+void registerDictionaryCache(DictionaryFactory & factory)
+{
+    auto create_simple_cache_layout = [=](const String & full_name,
+                                          const DictionaryStructure & dict_struct,
+                                          const Poco::Util::AbstractConfiguration & config,
+                                          const std::string & config_prefix,
+                                          DictionarySourcePtr source_ptr) -> DictionaryPtr
+    {
+        return createCacheDictionaryLayout<DictionaryKeyType::simple>(full_name, dict_struct, config, config_prefix, std::move(source_ptr));
+    };
+
+    factory.registerLayout("cache", create_simple_cache_layout, false);
+
+    auto create_complex_key_cache_layout = [=](const std::string & full_name,
+                                               const DictionaryStructure & dict_struct,
+                                               const Poco::Util::AbstractConfiguration & config,
+                                               const std::string & config_prefix,
+                                               DictionarySourcePtr source_ptr) -> DictionaryPtr
+    {
+        return createCacheDictionaryLayout<DictionaryKeyType::complex>(full_name, dict_struct, config, config_prefix, std::move(source_ptr));
+    };
+
+    factory.registerLayout("complex_key_cache", create_complex_key_cache_layout, true);
+
+#if defined(OS_LINUX) || defined(__FreeBSD__)
+
+    auto create_simple_ssd_cache_layout = [=](const std::string & full_name,
+                                              const DictionaryStructure & dict_struct,
+                                              const Poco::Util::AbstractConfiguration & config,
+                                              const std::string & config_prefix,
+                                              DictionarySourcePtr source_ptr) -> DictionaryPtr
+    {
+        return createSSDCacheDictionaryLayout<DictionaryKeyType::simple>(full_name, dict_struct, config, config_prefix, std::move(source_ptr));
+    };
+
+    factory.registerLayout("ssd_cache", create_simple_ssd_cache_layout, false);
+
+    auto create_complex_key_ssd_cache_layout = [=](const std::string & full_name,
+                                                   const DictionaryStructure & dict_struct,
+                                                   const Poco::Util::AbstractConfiguration & config,
+                                                   const std::string & config_prefix,
+                                                   DictionarySourcePtr source_ptr) -> DictionaryPtr {
+        return createSSDCacheDictionaryLayout<DictionaryKeyType::complex>(full_name, dict_struct, config, config_prefix, std::move(source_ptr));
+    };
+
+    factory.registerLayout("complex_key_ssd_cache", create_complex_key_ssd_cache_layout, true);
+#endif
+}
+
+}
diff --git a/src/Dictionaries/registerDictionaries.cpp b/src/Dictionaries/registerDictionaries.cpp
index abcc0ce06ad..8d24a6ea979 100644
--- a/src/Dictionaries/registerDictionaries.cpp
+++ b/src/Dictionaries/registerDictionaries.cpp
@@ -18,22 +18,17 @@ void registerDictionarySourceJDBC(DictionarySourceFactory & source_factory);
 void registerDictionarySourcePostgreSQL(DictionarySourceFactory & source_factory);
 #endif
 void registerDictionarySourceExecutable(DictionarySourceFactory & source_factory);
+void registerDictionarySourceExecutablePool(DictionarySourceFactory & source_factory);
 void registerDictionarySourceHTTP(DictionarySourceFactory & source_factory);
 void registerDictionarySourceLibrary(DictionarySourceFactory & source_factory);
 
 class DictionaryFactory;
 void registerDictionaryRangeHashed(DictionaryFactory & factory);
 void registerDictionaryComplexKeyHashed(DictionaryFactory & factory);
-void registerDictionaryComplexKeyCache(DictionaryFactory & factory);
-void registerDictionaryComplexKeyDirect(DictionaryFactory & factory);
 void registerDictionaryTrie(DictionaryFactory & factory);
 void registerDictionaryFlat(DictionaryFactory & factory);
 void registerDictionaryHashed(DictionaryFactory & factory);
 void registerDictionaryCache(DictionaryFactory & factory);
-#if defined(__linux__) || defined(__FreeBSD__)
-void registerDictionarySSDCache(DictionaryFactory & factory);
-void registerDictionarySSDComplexKeyCache(DictionaryFactory & factory);
-#endif
 void registerDictionaryPolygon(DictionaryFactory & factory);
 void registerDictionaryDirect(DictionaryFactory & factory);
 
@@ -54,6 +49,7 @@ void registerDictionaries()
         registerDictionarySourcePostgreSQL(source_factory);
 #endif
         registerDictionarySourceExecutable(source_factory);
+        registerDictionarySourceExecutablePool(source_factory);
         registerDictionarySourceHTTP(source_factory);
         registerDictionarySourceLibrary(source_factory);
     }
@@ -61,17 +57,10 @@ void registerDictionaries()
     {
         auto & factory = DictionaryFactory::instance();
         registerDictionaryRangeHashed(factory);
-        registerDictionaryComplexKeyHashed(factory);
-        registerDictionaryComplexKeyCache(factory);
-        registerDictionaryComplexKeyDirect(factory);
         registerDictionaryTrie(factory);
         registerDictionaryFlat(factory);
         registerDictionaryHashed(factory);
         registerDictionaryCache(factory);
-#if defined(OS_LINUX) || defined(__FreeBSD__)
-        registerDictionarySSDCache(factory);
-        registerDictionarySSDComplexKeyCache(factory);
-#endif
         registerDictionaryPolygon(factory);
         registerDictionaryDirect(factory);
     }
diff --git a/src/Dictionaries/tests/gtest_dictionary_ssd_cache_dictionary_storage.cpp b/src/Dictionaries/tests/gtest_dictionary_ssd_cache_dictionary_storage.cpp
new file mode 100644
index 00000000000..9fd9dc9b78c
--- /dev/null
+++ b/src/Dictionaries/tests/gtest_dictionary_ssd_cache_dictionary_storage.cpp
@@ -0,0 +1,240 @@
+#if defined(__linux__) || defined(__FreeBSD__)
+
+#include <gtest/gtest.h>
+
+#include <Dictionaries/SSDCacheDictionaryStorage.h>
+
+using namespace DB;
+
+TEST(SSDCacheDictionaryStorage, SSDCacheBlockWithSSDCacheSimpleKey)
+{
+    static constexpr size_t block_data_size = 4096;
+    std::unique_ptr<char[]> block_data(new char[block_data_size]);
+    memset(block_data.get(), 0, block_data_size);
+
+    {
+        memset(block_data.get(), 0, block_data_size);
+
+        SSDCacheBlock block(block_data_size);
+
+        block.reset(block_data.get());
+
+        std::unique_ptr<char[]> data_to_insert(new char[4000]);
+        memset(data_to_insert.get(), 1, 4000);
+
+        SSDCacheSimpleKey key(0, 200, data_to_insert.get());
+        ASSERT_EQ(block.getKeysSize(), 0);
+
+        bool write_result = false;
+        size_t offset_in_block = 0;
+
+        ASSERT_TRUE(block.enoughtPlaceToWriteKey(key));
+        write_result = block.writeKey(key, offset_in_block);
+        ASSERT_TRUE(write_result);
+        ASSERT_EQ(block.getKeysSize(), 1);
+
+        key.key = 1;
+        ASSERT_TRUE(block.enoughtPlaceToWriteKey(key));
+        write_result = block.writeKey(key, offset_in_block);
+        ASSERT_TRUE(write_result);
+        ASSERT_EQ(block.getKeysSize(), 2);
+
+        key.key = 2;
+        ASSERT_TRUE(block.enoughtPlaceToWriteKey(key));
+        write_result = block.writeKey(key, offset_in_block);
+        ASSERT_TRUE(write_result);
+        ASSERT_EQ(block.getKeysSize(), 3);
+
+        PaddedPODArray<UInt64> expected = {0,1,2};
+        PaddedPODArray<UInt64> actual;
+        block.readSimpleKeys(actual);
+        ASSERT_EQ(actual, expected);
+    }
+    {
+        memset(block_data.get(), 0, block_data_size);
+        SSDCacheBlock block(block_data_size);
+        block.reset(block_data.get());
+
+        static constexpr size_t block_header_size = SSDCacheBlock::block_header_size;
+        static constexpr size_t key_metadata_size = sizeof(size_t) * 2;
+
+        std::unique_ptr<char[]> data_to_insert(new char[4080]);
+        memset(data_to_insert.get(), 1, 4000);
+
+        SSDCacheSimpleKey key {0, 4064, data_to_insert.get()};
+
+        ASSERT_TRUE(SSDCacheBlock::canBeWrittenInEmptyBlock(key, block_data_size));
+        key.size = 4065;
+        ASSERT_FALSE(SSDCacheBlock::canBeWrittenInEmptyBlock(key, block_data_size));
+        key.size = 4064;
+
+        size_t offset_in_block;
+        ASSERT_TRUE(block.enoughtPlaceToWriteKey(key));
+        ASSERT_TRUE(block.writeKey(key, offset_in_block));
+        ASSERT_EQ(offset_in_block, block_header_size + key_metadata_size);
+
+        ASSERT_FALSE(block.enoughtPlaceToWriteKey({1, 4065, data_to_insert.get()}));
+        offset_in_block = 0;
+        ASSERT_FALSE(block.writeKey({1, 4065, data_to_insert.get()}, offset_in_block));
+        ASSERT_EQ(offset_in_block, 0);
+
+        PaddedPODArray<UInt64> expected = {0};
+        PaddedPODArray<UInt64> actual;
+        block.readSimpleKeys(actual);
+        ASSERT_EQ(actual, expected);
+    }
+    {
+        memset(block_data.get(), 0, block_data_size);
+        SSDCacheBlock block(block_data_size);
+        block.reset(block_data.get());
+
+        PaddedPODArray<UInt64> expected = {};
+        PaddedPODArray<UInt64> actual;
+        block.readSimpleKeys(actual);
+        ASSERT_EQ(actual, expected);
+    }
+    {
+        memset(block_data.get(), 0, block_data_size);
+        SSDCacheBlock block(block_data_size);
+        block.reset(block_data.get());
+
+        std::unique_ptr<char[]> data_to_insert(new char[4000]);
+        memset(data_to_insert.get(), 1, 4000);
+        size_t offset_in_block;
+        SSDCacheSimpleKey key {0, 200, data_to_insert.get()};
+        block.writeKey({1, 200, data_to_insert.get()}, offset_in_block);
+        ASSERT_EQ(block.getKeysSize(), 1);
+
+        ASSERT_FALSE(block.checkCheckSum());
+        block.writeCheckSum();
+        ASSERT_TRUE(block.checkCheckSum());
+
+        SSDCacheBlock other_block(block_data_size);
+        other_block.reset(block_data.get());
+        bool write_result = other_block.writeKey({2, 200, data_to_insert.get()}, offset_in_block);
+        ASSERT_TRUE(write_result);
+
+        ASSERT_FALSE(block.checkCheckSum());
+        block.writeCheckSum();
+        ASSERT_TRUE(block.checkCheckSum());
+    }
+}
+
+TEST(SSDCacheDictionaryStorage, SSDCacheBlockWithSSDCachComplexKey)
+{
+    static constexpr size_t block_data_size = 4096;
+    std::unique_ptr<char[]> block_data(new char[block_data_size]);
+    memset(block_data.get(), 0, block_data_size);
+
+    {
+        memset(block_data.get(), 0, block_data_size);
+
+        SSDCacheBlock block(block_data_size);
+
+        block.reset(block_data.get());
+
+        std::unique_ptr<char[]> data_to_insert(new char[4000]);
+        memset(data_to_insert.get(), 1, 4000);
+
+        String key = "0";
+
+        SSDCacheComplexKey ssd_cache_key(key, 200, data_to_insert.get());
+        ASSERT_EQ(block.getKeysSize(), 0);
+
+        bool write_result = false;
+        size_t offset_in_block = 0;
+
+        ASSERT_TRUE(block.enoughtPlaceToWriteKey(ssd_cache_key));
+        write_result = block.writeKey(ssd_cache_key, offset_in_block);
+        ASSERT_TRUE(write_result);
+        ASSERT_EQ(block.getKeysSize(), 1);
+
+        ssd_cache_key.key = "1";
+        ASSERT_TRUE(block.enoughtPlaceToWriteKey(ssd_cache_key));
+        write_result = block.writeKey(ssd_cache_key, offset_in_block);
+        ASSERT_TRUE(write_result);
+        ASSERT_EQ(block.getKeysSize(), 2);
+
+        ssd_cache_key.key = "2";
+        ASSERT_TRUE(block.enoughtPlaceToWriteKey(ssd_cache_key));
+        write_result = block.writeKey(ssd_cache_key, offset_in_block);
+        ASSERT_TRUE(write_result);
+        ASSERT_EQ(block.getKeysSize(), 3);
+
+        PaddedPODArray<StringRef> expected = {"0","1","2"};
+        PaddedPODArray<StringRef> actual;
+
+        block.readComplexKeys(actual);
+        ASSERT_EQ(actual, expected);
+    }
+    {
+        memset(block_data.get(), 0, block_data_size);
+        SSDCacheBlock block(block_data_size);
+        block.reset(block_data.get());
+
+        static constexpr size_t block_header_size = SSDCacheBlock::block_header_size;
+        static constexpr size_t key_metadata_size = sizeof(size_t) * 2;
+
+        std::unique_ptr<char[]> data_to_insert(new char[4080]);
+        memset(data_to_insert.get(), 1, 4000);
+
+        SSDCacheComplexKey key {"", 4064, data_to_insert.get()};
+
+        ASSERT_TRUE(SSDCacheBlock::canBeWrittenInEmptyBlock(key, block_data_size));
+        key.size = 4065;
+        ASSERT_FALSE(SSDCacheBlock::canBeWrittenInEmptyBlock(key, block_data_size));
+        key.size = 4064;
+
+        size_t offset_in_block;
+        ASSERT_TRUE(block.enoughtPlaceToWriteKey(key));
+        ASSERT_TRUE(block.writeKey(key, offset_in_block));
+        ASSERT_EQ(offset_in_block, block_header_size + key_metadata_size);
+
+        ASSERT_FALSE(block.enoughtPlaceToWriteKey({1, 4065, data_to_insert.get()}));
+        offset_in_block = 0;
+        ASSERT_FALSE(block.writeKey({1, 4065, data_to_insert.get()}, offset_in_block));
+        ASSERT_EQ(offset_in_block, 0);
+
+        PaddedPODArray<UInt64> expected = {0};
+        PaddedPODArray<UInt64> actual;
+        block.readSimpleKeys(actual);
+        ASSERT_EQ(actual, expected);
+    }
+    {
+        memset(block_data.get(), 0, block_data_size);
+        SSDCacheBlock block(block_data_size);
+        block.reset(block_data.get());
+
+        PaddedPODArray<StringRef> expected = {};
+        PaddedPODArray<StringRef> actual;
+        block.readComplexKeys(actual);
+        ASSERT_EQ(actual, expected);
+    }
+    {
+        memset(block_data.get(), 0, block_data_size);
+        SSDCacheBlock block(block_data_size);
+        block.reset(block_data.get());
+
+        std::unique_ptr<char[]> data_to_insert(new char[4000]);
+        memset(data_to_insert.get(), 1, 4000);
+        size_t offset_in_block;
+        SSDCacheComplexKey key {"0", 200, data_to_insert.get()};
+        block.writeKey({1, 200, data_to_insert.get()}, offset_in_block);
+        ASSERT_EQ(block.getKeysSize(), 1);
+
+        ASSERT_FALSE(block.checkCheckSum());
+        block.writeCheckSum();
+        ASSERT_TRUE(block.checkCheckSum());
+
+        SSDCacheBlock other_block(block_data_size);
+        other_block.reset(block_data.get());
+        bool write_result = other_block.writeKey({2, 200, data_to_insert.get()}, offset_in_block);
+        ASSERT_TRUE(write_result);
+
+        ASSERT_FALSE(block.checkCheckSum());
+        block.writeCheckSum();
+        ASSERT_TRUE(block.checkCheckSum());
+    }
+}
+
+#endif
diff --git a/src/Dictionaries/tests/gtest_hierarchy_dictionaries_utils.cpp b/src/Dictionaries/tests/gtest_hierarchy_dictionaries_utils.cpp
new file mode 100644
index 00000000000..064f57dfe11
--- /dev/null
+++ b/src/Dictionaries/tests/gtest_hierarchy_dictionaries_utils.cpp
@@ -0,0 +1,225 @@
+#include <gtest/gtest.h>
+
+#include <Common/HashTable/HashMap.h>
+
+#include <Dictionaries/HierarchyDictionariesUtils.h>
+
+using namespace DB;
+
+TEST(HierarchyDictionariesUtils, getHierarchy)
+{
+    {
+        HashMap<UInt64, UInt64> child_to_parent;
+        child_to_parent[1] = 0;
+        child_to_parent[2] = 1;
+        child_to_parent[3] = 1;
+        child_to_parent[4] = 2;
+
+        auto is_key_valid_func = [&](auto key) { return child_to_parent.find(key) != nullptr; };
+
+        auto get_parent_key_func = [&](auto key)
+        {
+            auto it = child_to_parent.find(key);
+            std::optional<UInt64> value = (it != nullptr ? std::make_optional(it->getMapped()) : std::nullopt);
+            return value;
+        };
+
+        UInt64 hierarchy_null_value_key = 0;
+        PaddedPODArray<UInt64> keys = {1, 2, 3, 4, 5};
+
+        auto result = DB::detail::getHierarchy(
+            keys,
+            hierarchy_null_value_key,
+            is_key_valid_func,
+            get_parent_key_func);
+
+        const auto & actual_elements = result.elements;
+        const auto & actual_offsets = result.offsets;
+
+        PaddedPODArray<UInt64> expected_elements = {1, 2, 1, 3, 1, 4, 2, 1};
+        PaddedPODArray<IColumn::Offset> expected_offsets = {1, 3, 5, 8, 8};
+
+        ASSERT_EQ(actual_elements, expected_elements);
+        ASSERT_EQ(actual_offsets, expected_offsets);
+    }
+    {
+        HashMap<UInt64, UInt64> child_to_parent;
+        child_to_parent[1] = 2;
+        child_to_parent[2] = 1;
+
+        auto is_key_valid_func = [&](auto key) { return child_to_parent.find(key) != nullptr; };
+
+        auto get_parent_key_func = [&](auto key)
+        {
+            auto it = child_to_parent.find(key);
+            std::optional<UInt64> value = (it != nullptr ? std::make_optional(it->getMapped()) : std::nullopt);
+            return value;
+        };
+
+        UInt64 hierarchy_null_value_key = 0;
+        PaddedPODArray<UInt64> keys = {1, 2, 3};
+
+        auto result = DB::detail::getHierarchy(
+            keys,
+            hierarchy_null_value_key,
+            is_key_valid_func,
+            get_parent_key_func);
+
+        const auto & actual_elements = result.elements;
+        const auto & actual_offsets = result.offsets;
+
+        PaddedPODArray<UInt64> expected_elements = {1, 2, 2};
+        PaddedPODArray<IColumn::Offset> expected_offsets = {2, 3, 3};
+
+        ASSERT_EQ(actual_elements, expected_elements);
+        ASSERT_EQ(actual_offsets, expected_offsets);
+    }
+}
+
+TEST(HierarchyDictionariesUtils, getIsInHierarchy)
+{
+    {
+        HashMap<UInt64, UInt64> child_to_parent;
+        child_to_parent[1] = 0;
+        child_to_parent[2] = 1;
+        child_to_parent[3] = 1;
+        child_to_parent[4] = 2;
+
+        auto is_key_valid_func = [&](auto key) { return child_to_parent.find(key) != nullptr; };
+
+        auto get_parent_key_func = [&](auto key)
+        {
+            auto it = child_to_parent.find(key);
+            std::optional<UInt64> value = (it != nullptr ? std::make_optional(it->getMapped()) : std::nullopt);
+            return value;
+        };
+
+        UInt64 hierarchy_null_value_key = 0;
+        PaddedPODArray<UInt64> keys = {1, 2, 3, 4, 5};
+        PaddedPODArray<UInt64> keys_in = {1, 1, 1, 2, 5};
+
+        PaddedPODArray<UInt8> actual = DB::detail::getIsInHierarchy(
+            keys,
+            keys_in,
+            hierarchy_null_value_key,
+            is_key_valid_func,
+            get_parent_key_func);
+
+        PaddedPODArray<UInt8> expected = {1,1,1,1,0};
+
+        ASSERT_EQ(actual, expected);
+    }
+    {
+        HashMap<UInt64, UInt64> child_to_parent;
+        child_to_parent[1] = 2;
+        child_to_parent[2] = 1;
+
+        auto is_key_valid_func = [&](auto key)
+        {
+            return child_to_parent.find(key) != nullptr;
+        };
+
+        auto get_parent_key_func = [&](auto key)
+        {
+            auto it = child_to_parent.find(key);
+            std::optional<UInt64> value = (it != nullptr ? std::make_optional(it->getMapped()) : std::nullopt);
+            return value;
+        };
+
+        UInt64 hierarchy_null_value_key = 0;
+        PaddedPODArray<UInt64> keys = {1, 2, 3};
+        PaddedPODArray<UInt64> keys_in = {1, 2, 3};
+
+        PaddedPODArray<UInt8> actual = DB::detail::getIsInHierarchy(
+            keys,
+            keys_in,
+            hierarchy_null_value_key,
+            is_key_valid_func,
+            get_parent_key_func);
+
+        PaddedPODArray<UInt8> expected = {1, 1, 0};
+        ASSERT_EQ(actual, expected);
+    }
+}
+
+TEST(HierarchyDictionariesUtils, getDescendants)
+{
+    {
+        HashMap<UInt64, PaddedPODArray<UInt64>> parent_to_child;
+        parent_to_child[0].emplace_back(1);
+        parent_to_child[1].emplace_back(2);
+        parent_to_child[1].emplace_back(3);
+        parent_to_child[2].emplace_back(4);
+
+        PaddedPODArray<UInt64> keys = {0, 1, 2, 3, 4};
+
+        {
+            auto result = DB::detail::getDescendants(
+                keys,
+                parent_to_child,
+                DB::detail::GetAllDescendantsStrategy());
+
+            const auto & actual_elements = result.elements;
+            const auto & actual_offsets = result.offsets;
+
+            PaddedPODArray<UInt64> expected_elements = {1, 2, 3, 4, 2, 3, 4, 4};
+            PaddedPODArray<IColumn::Offset> expected_offsets = {4, 7, 8, 8, 8};
+
+            ASSERT_EQ(actual_elements, expected_elements);
+            ASSERT_EQ(actual_offsets, expected_offsets);
+        }
+        {
+            auto result = DB::detail::getDescendants(
+                keys,
+                parent_to_child,
+                DB::detail::GetDescendantsAtSpecificLevelStrategy{1});
+
+            const auto & actual_elements = result.elements;
+            const auto & actual_offsets = result.offsets;
+
+            PaddedPODArray<UInt64> expected_elements = {1, 2, 3, 4};
+            PaddedPODArray<IColumn::Offset> expected_offsets = {1, 3, 4, 4, 4};
+
+            ASSERT_EQ(actual_elements, expected_elements);
+            ASSERT_EQ(actual_offsets, expected_offsets);
+        }
+    }
+    {
+        HashMap<UInt64, PaddedPODArray<UInt64>> parent_to_child;
+        parent_to_child[1].emplace_back(2);
+        parent_to_child[2].emplace_back(1);
+
+        PaddedPODArray<UInt64> keys = {1, 2, 3};
+
+        {
+            auto result = DB::detail::getDescendants(
+                keys,
+                parent_to_child,
+                DB::detail::GetAllDescendantsStrategy());
+
+            const auto & actual_elements = result.elements;
+            const auto & actual_offsets = result.offsets;
+
+            PaddedPODArray<UInt64> expected_elements = {2, 1, 1};
+            PaddedPODArray<IColumn::Offset> expected_offsets = {2, 3, 3};
+
+            ASSERT_EQ(actual_elements, expected_elements);
+            ASSERT_EQ(actual_offsets, expected_offsets);
+        }
+        {
+            auto result = DB::detail::getDescendants(
+                keys,
+                parent_to_child,
+                DB::detail::GetDescendantsAtSpecificLevelStrategy{1});
+
+            const auto & actual_elements = result.elements;
+            const auto & actual_offsets = result.offsets;
+
+            PaddedPODArray<UInt64> expected_elements = {2, 1};
+            PaddedPODArray<IColumn::Offset> expected_offsets = {1, 2, 2};
+
+            ASSERT_EQ(actual_elements, expected_elements);
+            ASSERT_EQ(actual_offsets, expected_offsets);
+        }
+    }
+}
diff --git a/src/Dictionaries/ya.make b/src/Dictionaries/ya.make
index 4f33dc80559..36152fe439a 100644
--- a/src/Dictionaries/ya.make
+++ b/src/Dictionaries/ya.make
@@ -9,6 +9,7 @@ PEERDIR(
     contrib/libs/poco/MongoDB
     contrib/libs/poco/Redis
     contrib/libs/sparsehash
+    contrib/restricted/abseil-cpp
 )
 
 IF (USE_ODBC)
@@ -20,13 +21,12 @@ NO_COMPILER_WARNINGS()
 
 SRCS(
     CacheDictionary.cpp
+    CacheDictionaryUpdateQueue.cpp
     CassandraBlockInputStream.cpp
     CassandraDictionarySource.cpp
     CassandraHelpers.cpp
     ClickHouseDictionarySource.cpp
-    ComplexKeyCacheDictionary.cpp
-    ComplexKeyDirectDictionary.cpp
-    ComplexKeyHashedDictionary.cpp
+    DictionaryBlockInputStream.cpp
     DictionaryBlockInputStreamBase.cpp
     DictionaryFactory.cpp
     DictionarySourceFactory.cpp
@@ -42,14 +42,15 @@ SRCS(
     Embedded/RegionsHierarchy.cpp
     Embedded/RegionsNames.cpp
     ExecutableDictionarySource.cpp
+    ExecutablePoolDictionarySource.cpp
     ExternalQueryBuilder.cpp
     FileDictionarySource.cpp
     FlatDictionary.cpp
     HTTPDictionarySource.cpp
     HashedDictionary.cpp
+    HierarchyDictionariesUtils.cpp
     IPAddressDictionary.cpp
     LibraryDictionarySource.cpp
-    LibraryDictionarySourceExternal.cpp
     MongoDBDictionarySource.cpp
     MySQLDictionarySource.cpp
     PolygonDictionary.cpp
@@ -58,11 +59,10 @@ SRCS(
     RangeHashedDictionary.cpp
     RedisBlockInputStream.cpp
     RedisDictionarySource.cpp
-    SSDCacheDictionary.cpp
-    SSDComplexKeyCacheDictionary.cpp
     XDBCDictionarySource.cpp
     getDictionaryConfigurationFromAST.cpp
     readInvalidateQuery.cpp
+    registerCacheDictionaries.cpp
     registerDictionaries.cpp
     writeParenthesisedString.cpp
 
diff --git a/src/Dictionaries/ya.make.in b/src/Dictionaries/ya.make.in
index e52b106d034..aa82fb21ba6 100644
--- a/src/Dictionaries/ya.make.in
+++ b/src/Dictionaries/ya.make.in
@@ -8,6 +8,7 @@ PEERDIR(
     contrib/libs/poco/MongoDB
     contrib/libs/poco/Redis
     contrib/libs/sparsehash
+    contrib/restricted/abseil-cpp
 )
 
 IF (USE_ODBC)
diff --git a/src/Disks/DiskCacheWrapper.cpp b/src/Disks/DiskCacheWrapper.cpp
index 6d991c17c67..95034b8e107 100644
--- a/src/Disks/DiskCacheWrapper.cpp
+++ b/src/Disks/DiskCacheWrapper.cpp
@@ -1,7 +1,6 @@
 #include "DiskCacheWrapper.h"
 #include <IO/copyData.h>
 #include <Common/quoteString.h>
-#include <common/logger_useful.h>
 #include <condition_variable>
 
 namespace DB
@@ -103,15 +102,21 @@ std::shared_ptr<FileDownloadMetadata> DiskCacheWrapper::acquireDownloadMetadata(
 }
 
 std::unique_ptr<ReadBufferFromFileBase>
-DiskCacheWrapper::readFile(const String & path, size_t buf_size, size_t estimated_size, size_t aio_threshold, size_t mmap_threshold) const
+DiskCacheWrapper::readFile(
+    const String & path,
+    size_t buf_size,
+    size_t estimated_size,
+    size_t aio_threshold,
+    size_t mmap_threshold,
+    MMappedFileCache * mmap_cache) const
 {
     if (!cache_file_predicate(path))
-        return DiskDecorator::readFile(path, buf_size, estimated_size, aio_threshold, mmap_threshold);
+        return DiskDecorator::readFile(path, buf_size, estimated_size, aio_threshold, mmap_threshold, mmap_cache);
 
-    LOG_DEBUG(&Poco::Logger::get("DiskCache"), "Read file {} from cache", backQuote(path));
+    LOG_DEBUG(log, "Read file {} from cache", backQuote(path));
 
     if (cache_disk->exists(path))
-        return cache_disk->readFile(path, buf_size, estimated_size, aio_threshold, mmap_threshold);
+        return cache_disk->readFile(path, buf_size, estimated_size, aio_threshold, mmap_threshold, mmap_cache);
 
     auto metadata = acquireDownloadMetadata(path);
 
@@ -122,11 +127,11 @@ DiskCacheWrapper::readFile(const String & path, size_t buf_size, size_t estimate
         {
             /// This thread will responsible for file downloading to cache.
             metadata->status = DOWNLOADING;
-            LOG_DEBUG(&Poco::Logger::get("DiskCache"), "File {} doesn't exist in cache. Will download it", backQuote(path));
+            LOG_DEBUG(log, "File {} doesn't exist in cache. Will download it", backQuote(path));
         }
         else if (metadata->status == DOWNLOADING)
         {
-            LOG_DEBUG(&Poco::Logger::get("DiskCache"), "Waiting for file {} download to cache", backQuote(path));
+            LOG_DEBUG(log, "Waiting for file {} download to cache", backQuote(path));
             metadata->condition.wait(lock, [metadata] { return metadata->status == DOWNLOADED || metadata->status == ERROR; });
         }
     }
@@ -145,13 +150,13 @@ DiskCacheWrapper::readFile(const String & path, size_t buf_size, size_t estimate
 
                 auto tmp_path = path + ".tmp";
                 {
-                    auto src_buffer = DiskDecorator::readFile(path, buf_size, estimated_size, aio_threshold, mmap_threshold);
+                    auto src_buffer = DiskDecorator::readFile(path, buf_size, estimated_size, aio_threshold, mmap_threshold, mmap_cache);
                     auto dst_buffer = cache_disk->writeFile(tmp_path, buf_size, WriteMode::Rewrite);
                     copyData(*src_buffer, *dst_buffer);
                 }
                 cache_disk->moveFile(tmp_path, path);
 
-                LOG_DEBUG(&Poco::Logger::get("DiskCache"), "File {} downloaded to cache", backQuote(path));
+                LOG_DEBUG(log, "File {} downloaded to cache", backQuote(path));
             }
             catch (...)
             {
@@ -169,9 +174,9 @@ DiskCacheWrapper::readFile(const String & path, size_t buf_size, size_t estimate
     }
 
     if (metadata->status == DOWNLOADED)
-        return cache_disk->readFile(path, buf_size, estimated_size, aio_threshold, mmap_threshold);
+        return cache_disk->readFile(path, buf_size, estimated_size, aio_threshold, mmap_threshold, mmap_cache);
 
-    return DiskDecorator::readFile(path, buf_size, estimated_size, aio_threshold, mmap_threshold);
+    return DiskDecorator::readFile(path, buf_size, estimated_size, aio_threshold, mmap_threshold, mmap_cache);
 }
 
 std::unique_ptr<WriteBufferFromFileBase>
@@ -180,7 +185,7 @@ DiskCacheWrapper::writeFile(const String & path, size_t buf_size, WriteMode mode
     if (!cache_file_predicate(path))
         return DiskDecorator::writeFile(path, buf_size, mode);
 
-    LOG_DEBUG(&Poco::Logger::get("DiskCache"), "Write file {} to cache", backQuote(path));
+    LOG_DEBUG(log, "Write file {} to cache", backQuote(path));
 
     auto dir_path = directoryPath(path);
     if (!cache_disk->exists(dir_path))
@@ -191,7 +196,7 @@ DiskCacheWrapper::writeFile(const String & path, size_t buf_size, WriteMode mode
         [this, path, buf_size, mode]()
         {
             /// Copy file from cache to actual disk when cached buffer is finalized.
-            auto src_buffer = cache_disk->readFile(path, buf_size, 0, 0, 0);
+            auto src_buffer = cache_disk->readFile(path, buf_size, 0, 0, 0, nullptr);
             auto dst_buffer = DiskDecorator::writeFile(path, buf_size, mode);
             copyData(*src_buffer, *dst_buffer);
             dst_buffer->finalize();
@@ -209,7 +214,13 @@ void DiskCacheWrapper::clearDirectory(const String & path)
 void DiskCacheWrapper::moveDirectory(const String & from_path, const String & to_path)
 {
     if (cache_disk->exists(from_path))
+    {
+        /// Destination directory may not be empty if previous directory move attempt was failed.
+        if (cache_disk->exists(to_path) && cache_disk->isDirectory(to_path))
+            cache_disk->clearDirectory(to_path);
+
         cache_disk->moveDirectory(from_path, to_path);
+    }
     DiskDecorator::moveDirectory(from_path, to_path);
 }
 
@@ -265,6 +276,20 @@ void DiskCacheWrapper::removeRecursive(const String & path)
     DiskDecorator::removeRecursive(path);
 }
 
+void DiskCacheWrapper::removeSharedFile(const String & path, bool keep_s3)
+{
+    if (cache_disk->exists(path))
+        cache_disk->removeSharedFile(path, keep_s3);
+    DiskDecorator::removeSharedFile(path, keep_s3);
+}
+
+void DiskCacheWrapper::removeSharedRecursive(const String & path, bool keep_s3)
+{
+    if (cache_disk->exists(path))
+        cache_disk->removeSharedRecursive(path, keep_s3);
+    DiskDecorator::removeSharedRecursive(path, keep_s3);
+}
+
 void DiskCacheWrapper::createHardLink(const String & src_path, const String & dst_path)
 {
     /// Don't create hardlinks for cache files to shadow directory as it just waste cache disk space.
diff --git a/src/Disks/DiskCacheWrapper.h b/src/Disks/DiskCacheWrapper.h
index bf1a5df693a..6d58394640f 100644
--- a/src/Disks/DiskCacheWrapper.h
+++ b/src/Disks/DiskCacheWrapper.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <unordered_map>
+#include <common/logger_useful.h>
 #include "DiskDecorator.h"
 #include "DiskLocal.h"
 
@@ -32,14 +33,23 @@ public:
     void moveDirectory(const String & from_path, const String & to_path) override;
     void moveFile(const String & from_path, const String & to_path) override;
     void replaceFile(const String & from_path, const String & to_path) override;
-    std::unique_ptr<ReadBufferFromFileBase>
-    readFile(const String & path, size_t buf_size, size_t estimated_size, size_t aio_threshold, size_t mmap_threshold) const override;
-    std::unique_ptr<WriteBufferFromFileBase>
-    writeFile(const String & path, size_t buf_size, WriteMode mode) override;
+
+    std::unique_ptr<ReadBufferFromFileBase> readFile(
+        const String & path,
+        size_t buf_size,
+        size_t estimated_size,
+        size_t aio_threshold,
+        size_t mmap_threshold,
+        MMappedFileCache * mmap_cache) const override;
+
+    std::unique_ptr<WriteBufferFromFileBase> writeFile(const String & path, size_t buf_size, WriteMode mode) override;
+
     void removeFile(const String & path) override;
     void removeFileIfExists(const String & path) override;
     void removeDirectory(const String & path) override;
     void removeRecursive(const String & path) override;
+    void removeSharedFile(const String & path, bool keep_s3) override;
+    void removeSharedRecursive(const String & path, bool keep_s3) override;
     void createHardLink(const String & src_path, const String & dst_path) override;
     ReservationPtr reserve(UInt64 bytes) override;
 
@@ -54,6 +64,8 @@ private:
     mutable std::unordered_map<String, std::weak_ptr<FileDownloadMetadata>> file_downloads;
     /// Protects concurrent downloading files to cache.
     mutable std::mutex mutex;
+
+    Poco::Logger * log = &Poco::Logger::get("DiskCache");
 };
 
 }
diff --git a/src/Disks/DiskDecorator.cpp b/src/Disks/DiskDecorator.cpp
index 3ebd1b6cf3b..144dc928dd3 100644
--- a/src/Disks/DiskDecorator.cpp
+++ b/src/Disks/DiskDecorator.cpp
@@ -114,9 +114,10 @@ void DiskDecorator::listFiles(const String & path, std::vector<String> & file_na
 }
 
 std::unique_ptr<ReadBufferFromFileBase>
-DiskDecorator::readFile(const String & path, size_t buf_size, size_t estimated_size, size_t aio_threshold, size_t mmap_threshold) const
+DiskDecorator::readFile(
+    const String & path, size_t buf_size, size_t estimated_size, size_t aio_threshold, size_t mmap_threshold, MMappedFileCache * mmap_cache) const
 {
-    return delegate->readFile(path, buf_size, estimated_size, aio_threshold, mmap_threshold);
+    return delegate->readFile(path, buf_size, estimated_size, aio_threshold, mmap_threshold, mmap_cache);
 }
 
 std::unique_ptr<WriteBufferFromFileBase>
@@ -145,6 +146,16 @@ void DiskDecorator::removeRecursive(const String & path)
     delegate->removeRecursive(path);
 }
 
+void DiskDecorator::removeSharedFile(const String & path, bool keep_s3)
+{
+    delegate->removeSharedFile(path, keep_s3);
+}
+
+void DiskDecorator::removeSharedRecursive(const String & path, bool keep_s3)
+{
+    delegate->removeSharedRecursive(path, keep_s3);
+}
+
 void DiskDecorator::setLastModified(const String & path, const Poco::Timestamp & timestamp)
 {
     delegate->setLastModified(path, timestamp);
diff --git a/src/Disks/DiskDecorator.h b/src/Disks/DiskDecorator.h
index c204d10bed9..918223b38d7 100644
--- a/src/Disks/DiskDecorator.h
+++ b/src/Disks/DiskDecorator.h
@@ -34,19 +34,36 @@ public:
     void replaceFile(const String & from_path, const String & to_path) override;
     void copy(const String & from_path, const std::shared_ptr<IDisk> & to_disk, const String & to_path) override;
     void listFiles(const String & path, std::vector<String> & file_names) override;
-    std::unique_ptr<ReadBufferFromFileBase>
-    readFile(const String & path, size_t buf_size, size_t estimated_size, size_t aio_threshold, size_t mmap_threshold) const override;
-    std::unique_ptr<WriteBufferFromFileBase>
-    writeFile(const String & path, size_t buf_size, WriteMode mode) override;
+
+    std::unique_ptr<ReadBufferFromFileBase> readFile(
+        const String & path,
+        size_t buf_size,
+        size_t estimated_size,
+        size_t aio_threshold,
+        size_t mmap_threshold,
+        MMappedFileCache * mmap_cache) const override;
+
+    std::unique_ptr<WriteBufferFromFileBase> writeFile(
+        const String & path,
+        size_t buf_size,
+        WriteMode mode) override;
+
     void removeFile(const String & path) override;
     void removeFileIfExists(const String & path) override;
     void removeDirectory(const String & path) override;
     void removeRecursive(const String & path) override;
+    void removeSharedFile(const String & path, bool keep_s3) override;
+    void removeSharedRecursive(const String & path, bool keep_s3) override;
     void setLastModified(const String & path, const Poco::Timestamp & timestamp) override;
     Poco::Timestamp getLastModified(const String & path) override;
     void setReadOnly(const String & path) override;
     void createHardLink(const String & src_path, const String & dst_path) override;
     void truncateFile(const String & path, size_t size) override;
+    int open(const String & path, mode_t mode) const;
+    void close(int fd) const;
+    void sync(int fd) const;
+    String getUniqueId(const String & path) const override { return delegate->getUniqueId(path); }
+    bool checkUniqueId(const String & id) const override { return delegate->checkUniqueId(id); }
     DiskType::Type getType() const override { return delegate->getType(); }
     Executor & getExecutor() override;
     void onFreeze(const String & path) override;
diff --git a/src/Disks/DiskFactory.cpp b/src/Disks/DiskFactory.cpp
index b604269ae16..03412be9729 100644
--- a/src/Disks/DiskFactory.cpp
+++ b/src/Disks/DiskFactory.cpp
@@ -24,7 +24,7 @@ DiskPtr DiskFactory::create(
     const String & name,
     const Poco::Util::AbstractConfiguration & config,
     const String & config_prefix,
-    const Context & context) const
+    ContextConstPtr context) const
 {
     const auto disk_type = config.getString(config_prefix + ".type", "local");
 
diff --git a/src/Disks/DiskFactory.h b/src/Disks/DiskFactory.h
index d41f14bd753..ba833d9e25f 100644
--- a/src/Disks/DiskFactory.h
+++ b/src/Disks/DiskFactory.h
@@ -1,17 +1,18 @@
 #pragma once
 
-#include <common/types.h>
 #include <Disks/IDisk.h>
+#include <Interpreters/Context_fwd.h>
+#include <common/types.h>
+
+#include <boost/noncopyable.hpp>
+#include <Poco/Util/AbstractConfiguration.h>
 
 #include <functional>
 #include <unordered_map>
-#include <boost/noncopyable.hpp>
-#include <Poco/Util/AbstractConfiguration.h>
 
 
 namespace DB
 {
-class Context;
 
 /**
  * Disk factory. Responsible for creating new disk objects.
@@ -23,7 +24,7 @@ public:
         const String & name,
         const Poco::Util::AbstractConfiguration & config,
         const String & config_prefix,
-        const Context & context)>;
+        ContextConstPtr context)>;
 
     static DiskFactory & instance();
 
@@ -33,7 +34,7 @@ public:
         const String & name,
         const Poco::Util::AbstractConfiguration & config,
         const String & config_prefix,
-        const Context & context) const;
+        ContextConstPtr context) const;
 
 private:
     using DiskTypeRegistry = std::unordered_map<String, Creator>;
diff --git a/src/Disks/DiskLocal.cpp b/src/Disks/DiskLocal.cpp
index 5035a865191..d0cf6a00344 100644
--- a/src/Disks/DiskLocal.cpp
+++ b/src/Disks/DiskLocal.cpp
@@ -2,13 +2,13 @@
 #include <Common/createHardLink.h>
 #include "DiskFactory.h"
 
+#include <Disks/LocalDirectorySyncGuard.h>
 #include <Interpreters/Context.h>
 #include <Common/filesystemHelpers.h>
 #include <Common/quoteString.h>
-#include <Disks/LocalDirectorySyncGuard.h>
 
 #include <IO/createReadBufferFromFileBase.h>
-#include <common/logger_useful.h>
+
 #include <unistd.h>
 
 
@@ -96,7 +96,7 @@ bool DiskLocal::tryReserve(UInt64 bytes)
     std::lock_guard lock(DiskLocal::reservation_mutex);
     if (bytes == 0)
     {
-        LOG_DEBUG(&Poco::Logger::get("DiskLocal"), "Reserving 0 bytes on disk {}", backQuote(name));
+        LOG_DEBUG(log, "Reserving 0 bytes on disk {}", backQuote(name));
         ++reservation_count;
         return true;
     }
@@ -105,7 +105,7 @@ bool DiskLocal::tryReserve(UInt64 bytes)
     UInt64 unreserved_space = available_space - std::min(available_space, reserved_bytes);
     if (unreserved_space >= bytes)
     {
-        LOG_DEBUG(&Poco::Logger::get("DiskLocal"), "Reserving {} on disk {}, having unreserved {}.",
+        LOG_DEBUG(log, "Reserving {} on disk {}, having unreserved {}.",
             ReadableSize(bytes), backQuote(name), ReadableSize(unreserved_space));
         ++reservation_count;
         reserved_bytes += bytes;
@@ -219,9 +219,10 @@ void DiskLocal::replaceFile(const String & from_path, const String & to_path)
 }
 
 std::unique_ptr<ReadBufferFromFileBase>
-DiskLocal::readFile(const String & path, size_t buf_size, size_t estimated_size, size_t aio_threshold, size_t mmap_threshold) const
+DiskLocal::readFile(
+    const String & path, size_t buf_size, size_t estimated_size, size_t aio_threshold, size_t mmap_threshold, MMappedFileCache * mmap_cache) const
 {
-    return createReadBufferFromFileBase(disk_path + path, estimated_size, aio_threshold, mmap_threshold, buf_size);
+    return createReadBufferFromFileBase(disk_path + path, estimated_size, aio_threshold, mmap_threshold, mmap_cache, buf_size);
 }
 
 std::unique_ptr<WriteBufferFromFileBase>
@@ -338,7 +339,7 @@ DiskLocalReservation::~DiskLocalReservation()
         if (disk->reserved_bytes < size)
         {
             disk->reserved_bytes = 0;
-            LOG_ERROR(&Poco::Logger::get("DiskLocal"), "Unbalanced reservations size for disk '{}'.", disk->getName());
+            LOG_ERROR(disk->log, "Unbalanced reservations size for disk '{}'.", disk->getName());
         }
         else
         {
@@ -346,7 +347,7 @@ DiskLocalReservation::~DiskLocalReservation()
         }
 
         if (disk->reservation_count == 0)
-            LOG_ERROR(&Poco::Logger::get("DiskLocal"), "Unbalanced reservation count for disk '{}'.", disk->getName());
+            LOG_ERROR(disk->log, "Unbalanced reservation count for disk '{}'.", disk->getName());
         else
             --disk->reservation_count;
     }
@@ -362,7 +363,7 @@ void registerDiskLocal(DiskFactory & factory)
     auto creator = [](const String & name,
                       const Poco::Util::AbstractConfiguration & config,
                       const String & config_prefix,
-                      const Context & context) -> DiskPtr {
+                      ContextConstPtr context) -> DiskPtr {
         String path = config.getString(config_prefix + ".path", "");
         if (name == "default")
         {
@@ -370,7 +371,7 @@ void registerDiskLocal(DiskFactory & factory)
                 throw Exception(
                     "\"default\" disk path should be provided in <path> not it <storage_configuration>",
                     ErrorCodes::UNKNOWN_ELEMENT_IN_CONFIG);
-            path = context.getPath();
+            path = context->getPath();
         }
         else
         {
@@ -382,7 +383,7 @@ void registerDiskLocal(DiskFactory & factory)
 
         if (Poco::File disk{path}; !disk.canRead() || !disk.canWrite())
         {
-            throw Exception("There is no RW access to disk " + name + " (" + path + ")", ErrorCodes::PATH_ACCESS_DENIED);
+            throw Exception("There is no RW access to the disk " + name + " (" + path + ")", ErrorCodes::PATH_ACCESS_DENIED);
         }
 
         bool has_space_ratio = config.has(config_prefix + ".keep_free_space_ratio");
@@ -401,7 +402,7 @@ void registerDiskLocal(DiskFactory & factory)
                 throw Exception("'keep_free_space_ratio' have to be between 0 and 1", ErrorCodes::EXCESSIVE_ELEMENT_IN_CONFIG);
             String tmp_path = path;
             if (tmp_path.empty())
-                tmp_path = context.getPath();
+                tmp_path = context->getPath();
 
             // Create tmp disk for getting total disk space.
             keep_free_space_bytes = static_cast<UInt64>(DiskLocal("tmp", tmp_path, 0).getTotalSpace() * ratio);
diff --git a/src/Disks/DiskLocal.h b/src/Disks/DiskLocal.h
index 7dbfbe445f8..567ca24eb50 100644
--- a/src/Disks/DiskLocal.h
+++ b/src/Disks/DiskLocal.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <common/logger_useful.h>
 #include <Disks/IDisk.h>
 #include <IO/ReadBufferFromFile.h>
 #include <IO/ReadBufferFromFileBase.h>
@@ -76,7 +77,8 @@ public:
         size_t buf_size,
         size_t estimated_size,
         size_t aio_threshold,
-        size_t mmap_threshold) const override;
+        size_t mmap_threshold,
+        MMappedFileCache * mmap_cache) const override;
 
     std::unique_ptr<WriteBufferFromFileBase> writeFile(
         const String & path,
@@ -114,6 +116,8 @@ private:
     UInt64 reservation_count = 0;
 
     static std::mutex reservation_mutex;
+
+    Poco::Logger * log = &Poco::Logger::get("DiskLocal");
 };
 
 }
diff --git a/src/Disks/DiskMemory.cpp b/src/Disks/DiskMemory.cpp
index a0905e67427..68257ec4948 100644
--- a/src/Disks/DiskMemory.cpp
+++ b/src/Disks/DiskMemory.cpp
@@ -314,7 +314,7 @@ void DiskMemory::replaceFileImpl(const String & from_path, const String & to_pat
     files.insert(std::move(node));
 }
 
-std::unique_ptr<ReadBufferFromFileBase> DiskMemory::readFile(const String & path, size_t /*buf_size*/, size_t, size_t, size_t) const
+std::unique_ptr<ReadBufferFromFileBase> DiskMemory::readFile(const String & path, size_t /*buf_size*/, size_t, size_t, size_t, MMappedFileCache *) const
 {
     std::lock_guard lock(mutex);
 
@@ -451,7 +451,7 @@ void registerDiskMemory(DiskFactory & factory)
     auto creator = [](const String & name,
                       const Poco::Util::AbstractConfiguration & /*config*/,
                       const String & /*config_prefix*/,
-                      const Context & /*context*/) -> DiskPtr { return std::make_shared<DiskMemory>(name); };
+                      ContextConstPtr /*context*/) -> DiskPtr { return std::make_shared<DiskMemory>(name); };
     factory.registerDiskType("memory", creator);
 }
 
diff --git a/src/Disks/DiskMemory.h b/src/Disks/DiskMemory.h
index 29ac4919833..d5c57b20a4a 100644
--- a/src/Disks/DiskMemory.h
+++ b/src/Disks/DiskMemory.h
@@ -67,7 +67,8 @@ public:
         size_t buf_size,
         size_t estimated_size,
         size_t aio_threshold,
-        size_t mmap_threshold) const override;
+        size_t mmap_threshold,
+        MMappedFileCache * mmap_cache) const override;
 
     std::unique_ptr<WriteBufferFromFileBase> writeFile(
         const String & path,
diff --git a/src/Disks/DiskSelector.cpp b/src/Disks/DiskSelector.cpp
index 0fb728a4f02..e317d8508da 100644
--- a/src/Disks/DiskSelector.cpp
+++ b/src/Disks/DiskSelector.cpp
@@ -18,7 +18,7 @@ namespace ErrorCodes
     extern const int UNKNOWN_DISK;
 }
 
-DiskSelector::DiskSelector(const Poco::Util::AbstractConfiguration & config, const String & config_prefix, const Context & context)
+DiskSelector::DiskSelector(const Poco::Util::AbstractConfiguration & config, const String & config_prefix, ContextConstPtr context)
 {
     Poco::Util::AbstractConfiguration::Keys keys;
     config.keys(config_prefix, keys);
@@ -40,12 +40,12 @@ DiskSelector::DiskSelector(const Poco::Util::AbstractConfiguration & config, con
         disks.emplace(disk_name, factory.create(disk_name, config, disk_config_prefix, context));
     }
     if (!has_default_disk)
-        disks.emplace(default_disk_name, std::make_shared<DiskLocal>(default_disk_name, context.getPath(), 0));
+        disks.emplace(default_disk_name, std::make_shared<DiskLocal>(default_disk_name, context->getPath(), 0));
 }
 
 
 DiskSelectorPtr DiskSelector::updateFromConfig(
-    const Poco::Util::AbstractConfiguration & config, const String & config_prefix, const Context & context) const
+    const Poco::Util::AbstractConfiguration & config, const String & config_prefix, ContextPtr context) const
 {
     Poco::Util::AbstractConfiguration::Keys keys;
     config.keys(config_prefix, keys);
diff --git a/src/Disks/DiskSelector.h b/src/Disks/DiskSelector.h
index 5d023fe1fbc..6b7e8174d3d 100644
--- a/src/Disks/DiskSelector.h
+++ b/src/Disks/DiskSelector.h
@@ -10,7 +10,6 @@
 namespace DB
 {
 
-class Context;
 class DiskSelector;
 using DiskSelectorPtr = std::shared_ptr<const DiskSelector>;
 using DisksMap = std::map<String, DiskPtr>;
@@ -20,13 +19,13 @@ using DisksMap = std::map<String, DiskPtr>;
 class DiskSelector
 {
 public:
-    DiskSelector(const Poco::Util::AbstractConfiguration & config, const String & config_prefix, const Context & context);
+    DiskSelector(const Poco::Util::AbstractConfiguration & config, const String & config_prefix, ContextConstPtr context);
     DiskSelector(const DiskSelector & from) : disks(from.disks) { }
 
     DiskSelectorPtr updateFromConfig(
         const Poco::Util::AbstractConfiguration & config,
         const String & config_prefix,
-        const Context & context
+        ContextPtr context
     ) const;
 
     /// Get disk by name
diff --git a/src/Disks/DiskType.h b/src/Disks/DiskType.h
new file mode 100644
index 00000000000..4e0ae226af4
--- /dev/null
+++ b/src/Disks/DiskType.h
@@ -0,0 +1,32 @@
+#pragma once
+
+#include <common/types.h>
+
+namespace DB
+{
+
+struct DiskType
+{
+    enum class Type
+    {
+        Local,
+        RAM,
+        S3
+    };
+    static String toString(Type disk_type)
+    {
+        switch (disk_type)
+        {
+            case Type::Local:
+                return "local";
+            case Type::RAM:
+                return "memory";
+            case Type::S3:
+                return "s3";
+        }
+        __builtin_unreachable();
+    }
+};
+
+}
+
diff --git a/src/Disks/IDisk.h b/src/Disks/IDisk.h
index 6f021346174..726145cb5d2 100644
--- a/src/Disks/IDisk.h
+++ b/src/Disks/IDisk.h
@@ -5,6 +5,7 @@
 #include <Common/CurrentMetrics.h>
 #include <Common/Exception.h>
 #include <Disks/Executor.h>
+#include <Disks/DiskType.h>
 
 #include <memory>
 #include <mutex>
@@ -30,6 +31,7 @@ using Reservations = std::vector<ReservationPtr>;
 
 class ReadBufferFromFileBase;
 class WriteBufferFromFileBase;
+class MMappedFileCache;
 
 /**
  * Mode of opening a file for write.
@@ -57,29 +59,6 @@ public:
 
 using SpacePtr = std::shared_ptr<Space>;
 
-struct DiskType
-{
-    enum class Type
-    {
-        Local,
-        RAM,
-        S3
-    };
-    static String toString(Type disk_type)
-    {
-        switch (disk_type)
-        {
-            case Type::Local:
-                return "local";
-            case Type::RAM:
-                return "memory";
-            case Type::S3:
-                return "s3";
-        }
-        __builtin_unreachable();
-    }
-};
-
 /**
  * A guard, that should synchronize file's or directory's state
  * with storage device (e.g. fsync in POSIX) in its destructor.
@@ -175,7 +154,8 @@ public:
         size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE,
         size_t estimated_size = 0,
         size_t aio_threshold = 0,
-        size_t mmap_threshold = 0) const = 0;
+        size_t mmap_threshold = 0,
+        MMappedFileCache * mmap_cache = nullptr) const = 0;
 
     /// Open the file for write and return WriteBufferFromFileBase object.
     virtual std::unique_ptr<WriteBufferFromFileBase> writeFile(
@@ -195,6 +175,21 @@ public:
     /// Remove file or directory with all children. Use with extra caution. Throws exception if file doesn't exists.
     virtual void removeRecursive(const String & path) = 0;
 
+    /// Remove file. Throws exception if file doesn't exists or if directory is not empty.
+    /// Differs from removeFile for S3 disks
+    /// Second bool param is a flag to remove (true) or keep (false) shared data on S3
+    virtual void removeSharedFile(const String & path, bool) { removeFile(path); }
+
+    /// Remove file or directory with all children. Use with extra caution. Throws exception if file doesn't exists.
+    /// Differs from removeRecursive for S3 disks
+    /// Second bool param is a flag to remove (true) or keep (false) shared data on S3
+    virtual void removeSharedRecursive(const String & path, bool) { removeRecursive(path); }
+
+    /// Remove file or directory if it exists.
+    /// Differs from removeFileIfExists for S3 disks
+    /// Second bool param is a flag to remove (true) or keep (false) shared data on S3
+    virtual void removeSharedFileIfExists(const String & path, bool) { removeFileIfExists(path); }
+
     /// Set last modified time to file or directory at `path`.
     virtual void setLastModified(const String & path, const Poco::Timestamp & timestamp) = 0;
 
@@ -216,6 +211,15 @@ public:
     /// Invoked when Global Context is shutdown.
     virtual void shutdown() { }
 
+    /// Return some uniq string for file, overrode for S3
+    /// Required for distinguish different copies of the same part on S3
+    virtual String getUniqueId(const String & path) const { return path; }
+
+    /// Check file exists and ClickHouse has an access to it
+    /// Overrode in DiskS3
+    /// Required for S3 to ensure that replica has access to data wroten by other node
+    virtual bool checkUniqueId(const String & id) const { return exists(id); }
+
     /// Returns executor to perform asynchronous operations.
     virtual Executor & getExecutor() { return *executor; }
 
diff --git a/src/Disks/IStoragePolicy.h b/src/Disks/IStoragePolicy.h
index a41ea87c328..59cff3c85d5 100644
--- a/src/Disks/IStoragePolicy.h
+++ b/src/Disks/IStoragePolicy.h
@@ -1,4 +1,7 @@
 #pragma once
+
+#include <Disks/DiskType.h>
+
 #include <memory>
 #include <vector>
 #include <common/types.h>
@@ -36,6 +39,7 @@ public:
     /// mutations files
     virtual DiskPtr getAnyDisk() const = 0;
     virtual DiskPtr getDiskByName(const String & disk_name) const = 0;
+    virtual Disks getDisksByType(DiskType::Type type) const = 0;
     /// Get free space from most free disk
     virtual UInt64 getMaxUnreservedFreeSpace() const = 0;
     /// Reserves space on any volume with index > min_volume_index or returns nullptr
@@ -57,6 +61,7 @@ public:
     /// Check if we have any volume with stopped merges
     virtual bool hasAnyVolumeWithDisabledMerges() const = 0;
     virtual bool containsVolume(const String & volume_name) const = 0;
+    /// Returns disks by type ordered by volumes priority
 };
 
 }
diff --git a/src/Disks/S3/DiskS3.cpp b/src/Disks/S3/DiskS3.cpp
index 3d91d5fbb78..14d3e1e5d5e 100644
--- a/src/Disks/S3/DiskS3.cpp
+++ b/src/Disks/S3/DiskS3.cpp
@@ -2,9 +2,11 @@
 
 #include "Disks/DiskFactory.h"
 
+#include <bitset>
 #include <random>
 #include <optional>
 #include <utility>
+#include <IO/ReadBufferFromString.h>
 #include <IO/ReadBufferFromFile.h>
 #include <IO/ReadBufferFromS3.h>
 #include <IO/ReadHelpers.h>
@@ -18,7 +20,6 @@
 #include <Common/quoteString.h>
 #include <Common/thread_local_rng.h>
 #include <Common/ThreadPool.h>
-#include <common/logger_useful.h>
 
 #include <aws/s3/model/CopyObjectRequest.h>
 #include <aws/s3/model/DeleteObjectsRequest.h>
@@ -90,6 +91,16 @@ void throwIfError(Aws::Utils::Outcome<Result, Error> & response)
     }
 }
 
+template <typename Result, typename Error>
+void throwIfError(const Aws::Utils::Outcome<Result, Error> & response)
+{
+    if (!response.IsSuccess())
+    {
+        const auto & err = response.GetError();
+        throw Exception(err.GetMessage(), static_cast<int>(err.GetErrorType()));
+    }
+}
+
 /**
  * S3 metadata file layout:
  * Number of S3 objects, Total size of all S3 objects.
@@ -239,8 +250,12 @@ class ReadIndirectBufferFromS3 final : public ReadBufferFromFileBase
 {
 public:
     ReadIndirectBufferFromS3(
-        std::shared_ptr<Aws::S3::S3Client> client_ptr_, const String & bucket_, DiskS3::Metadata metadata_, size_t buf_size_)
-        : client_ptr(std::move(client_ptr_)), bucket(bucket_), metadata(std::move(metadata_)), buf_size(buf_size_)
+        std::shared_ptr<Aws::S3::S3Client> client_ptr_, const String & bucket_, DiskS3::Metadata metadata_, UInt64 s3_max_single_read_retries_, size_t buf_size_)
+        : client_ptr(std::move(client_ptr_))
+        , bucket(bucket_)
+        , metadata(std::move(metadata_))
+        , s3_max_single_read_retries(s3_max_single_read_retries_)
+        , buf_size(buf_size_)
     {
     }
 
@@ -296,7 +311,7 @@ private:
             const auto & [path, size] = metadata.s3_objects[i];
             if (size > offset)
             {
-                auto buf = std::make_unique<ReadBufferFromS3>(client_ptr, bucket, metadata.s3_root_path + path, buf_size);
+                auto buf = std::make_unique<ReadBufferFromS3>(client_ptr, bucket, metadata.s3_root_path + path, s3_max_single_read_retries, buf_size);
                 buf->seek(offset, SEEK_SET);
                 return buf;
             }
@@ -325,7 +340,7 @@ private:
 
         ++current_buf_idx;
         const auto & path = metadata.s3_objects[current_buf_idx].first;
-        current_buf = std::make_unique<ReadBufferFromS3>(client_ptr, bucket, metadata.s3_root_path + path, buf_size);
+        current_buf = std::make_unique<ReadBufferFromS3>(client_ptr, bucket, metadata.s3_root_path + path, s3_max_single_read_retries, buf_size);
         current_buf->next();
         working_buffer = current_buf->buffer();
         absolute_position += working_buffer.size();
@@ -336,6 +351,7 @@ private:
     std::shared_ptr<Aws::S3::S3Client> client_ptr;
     const String & bucket;
     DiskS3::Metadata metadata;
+    UInt64 s3_max_single_read_retries;
     size_t buf_size;
 
     size_t absolute_position = 0;
@@ -481,7 +497,7 @@ public:
             if (disk->reserved_bytes < size)
             {
                 disk->reserved_bytes = 0;
-                LOG_ERROR(&Poco::Logger::get("DiskLocal"), "Unbalanced reservations size for disk '{}'.", disk->getName());
+                LOG_ERROR(disk->log, "Unbalanced reservations size for disk '{}'.", disk->getName());
             }
             else
             {
@@ -489,7 +505,7 @@ public:
             }
 
             if (disk->reservation_count == 0)
-                LOG_ERROR(&Poco::Logger::get("DiskLocal"), "Unbalanced reservation count for disk '{}'.", disk->getName());
+                LOG_ERROR(disk->log, "Unbalanced reservation count for disk '{}'.", disk->getName());
             else
                 --disk->reservation_count;
         }
@@ -525,7 +541,7 @@ public:
                 }
                 catch (...)
                 {
-                    tryLogCurrentException(&Poco::Logger::get("DiskS3"), "Failed to run async task");
+                    tryLogCurrentException("DiskS3", "Failed to run async task");
 
                     try
                     {
@@ -549,6 +565,7 @@ DiskS3::DiskS3(
     String bucket_,
     String s3_root_path_,
     String metadata_path_,
+    UInt64 s3_max_single_read_retries_,
     size_t min_upload_part_size_,
     size_t max_single_part_upload_size_,
     size_t min_bytes_for_seek_,
@@ -562,6 +579,7 @@ DiskS3::DiskS3(
     , bucket(std::move(bucket_))
     , s3_root_path(std::move(s3_root_path_))
     , metadata_path(std::move(metadata_path_))
+    , s3_max_single_read_retries(s3_max_single_read_retries_)
     , min_upload_part_size(min_upload_part_size_)
     , max_single_part_upload_size(max_single_part_upload_size_)
     , min_bytes_for_seek(min_bytes_for_seek_)
@@ -609,6 +627,15 @@ void DiskS3::createDirectories(const String & path)
     Poco::File(metadata_path + path).createDirectories();
 }
 
+String DiskS3::getUniqueId(const String & path) const
+{
+    Metadata metadata(s3_root_path, metadata_path, path);
+    String id;
+    if (!metadata.s3_objects.empty())
+        id = metadata.s3_root_path + metadata.s3_objects[0].first;
+    return id;
+}
+
 DiskDirectoryIteratorPtr DiskS3::iterateDirectory(const String & path)
 {
     return std::make_unique<DiskS3DirectoryIterator>(metadata_path + path, path);
@@ -629,7 +656,7 @@ void DiskS3::moveFile(const String & from_path, const String & to_path)
     if (send_metadata)
     {
         auto revision = ++revision_counter;
-        const DiskS3::ObjectMetadata object_metadata {
+        const ObjectMetadata object_metadata {
             {"from_path", from_path},
             {"to_path", to_path}
         };
@@ -652,14 +679,14 @@ void DiskS3::replaceFile(const String & from_path, const String & to_path)
         moveFile(from_path, to_path);
 }
 
-std::unique_ptr<ReadBufferFromFileBase> DiskS3::readFile(const String & path, size_t buf_size, size_t, size_t, size_t) const
+std::unique_ptr<ReadBufferFromFileBase> DiskS3::readFile(const String & path, size_t buf_size, size_t, size_t, size_t, MMappedFileCache *) const
 {
     auto metadata = readMeta(path);
 
-    LOG_DEBUG(&Poco::Logger::get("DiskS3"), "Read from file by path: {}. Existing S3 objects: {}",
+    LOG_DEBUG(log, "Read from file by path: {}. Existing S3 objects: {}",
         backQuote(metadata_path + path), metadata.s3_objects.size());
 
-    auto reader = std::make_unique<ReadIndirectBufferFromS3>(client, bucket, metadata, buf_size);
+    auto reader = std::make_unique<ReadIndirectBufferFromS3>(client, bucket, metadata, s3_max_single_read_retries, buf_size);
     return std::make_unique<SeekAvoidingReadBuffer>(std::move(reader), min_bytes_for_seek);
 }
 
@@ -692,7 +719,7 @@ std::unique_ptr<WriteBufferFromFileBase> DiskS3::writeFile(const String & path,
         /// Save empty metadata to disk to have ability to get file size while buffer is not finalized.
         metadata.save();
 
-        LOG_DEBUG(&Poco::Logger::get("DiskS3"), "Write to file by path: {}. New S3 path: {}", backQuote(metadata_path + path), s3_root_path + s3_path);
+        LOG_DEBUG(log, "Write to file by path: {}. New S3 path: {}", backQuote(metadata_path + path), s3_root_path + s3_path);
 
         return std::make_unique<WriteIndirectBufferFromS3>(
             client, bucket, metadata, s3_path, object_metadata, min_upload_part_size, max_single_part_upload_size, buf_size);
@@ -701,7 +728,7 @@ std::unique_ptr<WriteBufferFromFileBase> DiskS3::writeFile(const String & path,
     {
         auto metadata = readMeta(path);
 
-        LOG_DEBUG(&Poco::Logger::get("DiskS3"), "Append to file by path: {}. New S3 path: {}. Existing S3 objects: {}.",
+        LOG_DEBUG(log, "Append to file by path: {}. New S3 path: {}. Existing S3 objects: {}.",
             backQuote(metadata_path + path), s3_root_path + s3_path, metadata.s3_objects.size());
 
         return std::make_unique<WriteIndirectBufferFromS3>(
@@ -711,7 +738,7 @@ std::unique_ptr<WriteBufferFromFileBase> DiskS3::writeFile(const String & path,
 
 void DiskS3::removeMeta(const String & path, AwsS3KeyKeeper & keys)
 {
-    LOG_DEBUG(&Poco::Logger::get("DiskS3"), "Remove file by path: {}", backQuote(metadata_path + path));
+    LOG_DEBUG(log, "Remove file by path: {}", backQuote(metadata_path + path));
 
     Poco::File file(metadata_path + path);
 
@@ -743,7 +770,7 @@ void DiskS3::removeMeta(const String & path, AwsS3KeyKeeper & keys)
         if (e.code() == ErrorCodes::UNKNOWN_FORMAT)
         {
             LOG_WARNING(
-                &Poco::Logger::get("DiskS3"),
+                log,
                 "Metadata file {} can't be read by reason: {}. Removing it forcibly.",
                 backQuote(path),
                 e.nested() ? e.nested()->message() : e.message());
@@ -791,13 +818,6 @@ void DiskS3::removeAws(const AwsS3KeyKeeper & keys)
     }
 }
 
-void DiskS3::removeFile(const String & path)
-{
-    AwsS3KeyKeeper keys;
-    removeMeta(path, keys);
-    removeAws(keys);
-}
-
 void DiskS3::removeFileIfExists(const String & path)
 {
     AwsS3KeyKeeper keys;
@@ -813,11 +833,20 @@ void DiskS3::removeDirectory(const String & path)
     Poco::File(metadata_path + path).remove();
 }
 
-void DiskS3::removeRecursive(const String & path)
+void DiskS3::removeSharedFile(const String & path, bool keep_s3)
+{
+    AwsS3KeyKeeper keys;
+    removeMeta(path, keys);
+    if (!keep_s3)
+        removeAws(keys);
+}
+
+void DiskS3::removeSharedRecursive(const String & path, bool keep_s3)
 {
     AwsS3KeyKeeper keys;
     removeMetaRecursive(path, keys);
-    removeAws(keys);
+    if (!keep_s3)
+        removeAws(keys);
 }
 
 bool DiskS3::tryReserve(UInt64 bytes)
@@ -825,7 +854,7 @@ bool DiskS3::tryReserve(UInt64 bytes)
     std::lock_guard lock(reservation_mutex);
     if (bytes == 0)
     {
-        LOG_DEBUG(&Poco::Logger::get("DiskS3"), "Reserving 0 bytes on s3 disk {}", backQuote(name));
+        LOG_DEBUG(log, "Reserving 0 bytes on s3 disk {}", backQuote(name));
         ++reservation_count;
         return true;
     }
@@ -834,7 +863,7 @@ bool DiskS3::tryReserve(UInt64 bytes)
     UInt64 unreserved_space = available_space - std::min(available_space, reserved_bytes);
     if (unreserved_space >= bytes)
     {
-        LOG_DEBUG(&Poco::Logger::get("DiskS3"), "Reserving {} on disk {}, having unreserved {}.",
+        LOG_DEBUG(log, "Reserving {} on disk {}, having unreserved {}.",
             ReadableSize(bytes), backQuote(name), ReadableSize(unreserved_space));
         ++reservation_count;
         reserved_bytes += bytes;
@@ -919,34 +948,159 @@ void DiskS3::startup()
     if (!send_metadata)
         return;
 
-    LOG_INFO(&Poco::Logger::get("DiskS3"), "Starting up disk {}", name);
+    LOG_INFO(log, "Starting up disk {}", name);
 
-    /// Find last revision.
-    UInt64 l = 0, r = LATEST_REVISION;
-    while (l < r)
-    {
-        LOG_DEBUG(&Poco::Logger::get("DiskS3"), "Check revision in bounds {}-{}", l, r);
+    if (readSchemaVersion(bucket, s3_root_path) < RESTORABLE_SCHEMA_VERSION)
+        migrateToRestorableSchema();
 
-        auto revision = l + (r - l + 1) / 2;
-        auto revision_str = revisionToString(revision);
+    findLastRevision();
 
-        LOG_DEBUG(&Poco::Logger::get("DiskS3"), "Check object with revision {}", revision);
-
-        /// Check file or operation with such revision exists.
-        if (checkObjectExists(s3_root_path + "r" + revision_str)
-            || checkObjectExists(s3_root_path + "operations/r" + revision_str))
-            l = revision;
-        else
-            r = revision - 1;
-    }
-    revision_counter = l;
-    LOG_INFO(&Poco::Logger::get("DiskS3"), "Found last revision number {} for disk {}", revision_counter, name);
+    LOG_INFO(log, "Disk {} started up", name);
 }
 
-bool DiskS3::checkObjectExists(const String & prefix)
+void DiskS3::findLastRevision()
+{
+    /// Construct revision number from high to low bits.
+    String revision;
+    revision.reserve(64);
+    for (int bit = 0; bit < 64; bit++)
+    {
+        auto revision_prefix = revision + "1";
+
+        LOG_DEBUG(log, "Check object exists with revision prefix {}", revision_prefix);
+
+        /// Check file or operation with such revision prefix exists.
+        if (checkObjectExists(bucket, s3_root_path + "r" + revision_prefix)
+            || checkObjectExists(bucket, s3_root_path + "operations/r" + revision_prefix))
+            revision += "1";
+        else
+            revision += "0";
+    }
+    revision_counter = static_cast<UInt64>(std::bitset<64>(revision).to_ullong());
+    LOG_INFO(log, "Found last revision number {} for disk {}", revision_counter, name);
+}
+
+int DiskS3::readSchemaVersion(const String & source_bucket, const String & source_path)
+{
+    int version = 0;
+    if (!checkObjectExists(source_bucket, source_path + SCHEMA_VERSION_OBJECT))
+        return version;
+
+    ReadBufferFromS3 buffer(client, source_bucket, source_path + SCHEMA_VERSION_OBJECT, s3_max_single_read_retries);
+    readIntText(version, buffer);
+
+    return version;
+}
+
+void DiskS3::saveSchemaVersion(const int & version)
+{
+    WriteBufferFromS3 buffer (client, bucket, s3_root_path + SCHEMA_VERSION_OBJECT, min_upload_part_size, max_single_part_upload_size);
+    writeIntText(version, buffer);
+    buffer.finalize();
+}
+
+void DiskS3::updateObjectMetadata(const String & key, const ObjectMetadata & metadata)
+{
+    Aws::S3::Model::CopyObjectRequest request;
+    request.SetCopySource(bucket + "/" + key);
+    request.SetBucket(bucket);
+    request.SetKey(key);
+    request.SetMetadata(metadata);
+    request.SetMetadataDirective(Aws::S3::Model::MetadataDirective::REPLACE);
+
+    auto outcome = client->CopyObject(request);
+    throwIfError(outcome);
+}
+
+void DiskS3::migrateFileToRestorableSchema(const String & path)
+{
+    LOG_DEBUG(log, "Migrate file {} to restorable schema", metadata_path + path);
+
+    auto meta = readMeta(path);
+
+    for (const auto & [key, _] : meta.s3_objects)
+    {
+        ObjectMetadata metadata {
+            {"path", path}
+        };
+        updateObjectMetadata(s3_root_path + key, metadata);
+    }
+}
+
+void DiskS3::migrateToRestorableSchemaRecursive(const String & path, Futures & results)
+{
+    checkStackSize(); /// This is needed to prevent stack overflow in case of cyclic symlinks.
+
+    LOG_DEBUG(log, "Migrate directory {} to restorable schema", metadata_path + path);
+
+    bool dir_contains_only_files = true;
+    for (auto it = iterateDirectory(path); it->isValid(); it->next())
+        if (isDirectory(it->path()))
+        {
+            dir_contains_only_files = false;
+            break;
+        }
+
+    /// The whole directory can be migrated asynchronously.
+    if (dir_contains_only_files)
+    {
+        auto result = getExecutor().execute([this, path]
+             {
+                 for (auto it = iterateDirectory(path); it->isValid(); it->next())
+                     migrateFileToRestorableSchema(it->path());
+             });
+
+        results.push_back(std::move(result));
+    }
+    else
+    {
+        for (auto it = iterateDirectory(path); it->isValid(); it->next())
+            if (!isDirectory(it->path()))
+            {
+                auto source_path = it->path();
+                auto result = getExecutor().execute([this, source_path]
+                    {
+                        migrateFileToRestorableSchema(source_path);
+                    });
+
+                results.push_back(std::move(result));
+            }
+            else
+                migrateToRestorableSchemaRecursive(it->path(), results);
+    }
+}
+
+void DiskS3::migrateToRestorableSchema()
+{
+    try
+    {
+        LOG_INFO(log, "Start migration to restorable schema for disk {}", name);
+
+        Futures results;
+
+        for (const auto & root : data_roots)
+            if (exists(root))
+                migrateToRestorableSchemaRecursive(root + '/', results);
+
+        for (auto & result : results)
+            result.wait();
+        for (auto & result : results)
+            result.get();
+
+        saveSchemaVersion(RESTORABLE_SCHEMA_VERSION);
+    }
+    catch (const Exception &)
+    {
+        tryLogCurrentException(log, fmt::format("Failed to migrate to restorable schema for disk {}", name));
+
+        throw;
+    }
+}
+
+bool DiskS3::checkObjectExists(const String & source_bucket, const String & prefix)
 {
     Aws::S3::Model::ListObjectsV2Request request;
-    request.SetBucket(bucket);
+    request.SetBucket(source_bucket);
     request.SetPrefix(prefix);
     request.SetMaxKeys(1);
 
@@ -956,6 +1110,23 @@ bool DiskS3::checkObjectExists(const String & prefix)
     return !outcome.GetResult().GetContents().empty();
 }
 
+bool DiskS3::checkUniqueId(const String & id) const
+{
+    /// Check that we have right s3 and have access rights
+    /// Actually interprets id as s3 object name and checks if it exists
+    Aws::S3::Model::ListObjectsV2Request request;
+    request.SetBucket(bucket);
+    request.SetPrefix(id);
+    auto resp = client->ListObjectsV2(request);
+    throwIfError(resp);
+    Aws::Vector<Aws::S3::Model::Object> object_list = resp.GetResult().GetContents();
+
+    for (const auto & object : object_list)
+        if (object.GetKey() == id)
+            return true;
+    return false;
+}
+
 Aws::S3::Model::HeadObjectResult DiskS3::headObject(const String & source_bucket, const String & key)
 {
     Aws::S3::Model::HeadObjectRequest request;
@@ -1006,46 +1177,64 @@ struct DiskS3::RestoreInformation
     UInt64 revision = LATEST_REVISION;
     String source_bucket;
     String source_path;
+    bool detached = false;
 };
 
 void DiskS3::readRestoreInformation(DiskS3::RestoreInformation & restore_information)
 {
-    ReadBufferFromFile buffer(metadata_path + restore_file_name, 512);
+    ReadBufferFromFile buffer(metadata_path + RESTORE_FILE_NAME, 512);
     buffer.next();
 
-    /// Empty file - just restore all metadata.
-    if (!buffer.hasPendingData())
-        return;
-
     try
     {
-        readIntText(restore_information.revision, buffer);
-        assertChar('\n', buffer);
+        std::map<String, String> properties;
 
-        if (!buffer.hasPendingData())
-            return;
+        while (buffer.hasPendingData())
+        {
+            String property;
+            readText(property, buffer);
+            assertChar('\n', buffer);
 
-        readText(restore_information.source_bucket, buffer);
-        assertChar('\n', buffer);
+            auto pos = property.find('=');
+            if (pos == String::npos || pos == 0 || pos == property.length())
+                throw Exception(fmt::format("Invalid property {} in restore file", property), ErrorCodes::UNKNOWN_FORMAT);
 
-        if (!buffer.hasPendingData())
-            return;
+            auto key = property.substr(0, pos);
+            auto value = property.substr(pos + 1);
 
-        readText(restore_information.source_path, buffer);
-        assertChar('\n', buffer);
+            auto it = properties.find(key);
+            if (it != properties.end())
+                throw Exception(fmt::format("Property key duplication {} in restore file", key), ErrorCodes::UNKNOWN_FORMAT);
 
-        if (buffer.hasPendingData())
-            throw Exception("Extra information at the end of restore file", ErrorCodes::UNKNOWN_FORMAT);
+            properties[key] = value;
+        }
+
+        for (const auto & [key, value] : properties)
+        {
+            ReadBufferFromString value_buffer (value);
+
+            if (key == "revision")
+                readIntText(restore_information.revision, value_buffer);
+            else if (key == "source_bucket")
+                readText(restore_information.source_bucket, value_buffer);
+            else if (key == "source_path")
+                readText(restore_information.source_path, value_buffer);
+            else if (key == "detached")
+                readBoolTextWord(restore_information.detached, value_buffer);
+            else
+                throw Exception(fmt::format("Unknown key {} in restore file", key), ErrorCodes::UNKNOWN_FORMAT);
+        }
     }
-    catch (const Exception & e)
+    catch (const Exception &)
     {
-        throw Exception("Failed to read restore information", e, ErrorCodes::UNKNOWN_FORMAT);
+        tryLogCurrentException(log, "Failed to read restore information");
+        throw;
     }
 }
 
 void DiskS3::restore()
 {
-    if (!exists(restore_file_name))
+    if (!exists(RESTORE_FILE_NAME))
         return;
 
     try
@@ -1072,33 +1261,43 @@ void DiskS3::restore()
                 throw Exception("Restoring to the same bucket is allowed only if source path is not a sub-path of configured path in S3 disk", ErrorCodes::BAD_ARGUMENTS);
         }
 
-        ///TODO: Cleanup FS and bucket if previous restore was failed.
-
-        LOG_INFO(&Poco::Logger::get("DiskS3"), "Starting to restore disk {}. Revision: {}, Source bucket: {}, Source path: {}",
+        LOG_INFO(log, "Starting to restore disk {}. Revision: {}, Source bucket: {}, Source path: {}",
                  name, information.revision, information.source_bucket, information.source_path);
 
-        restoreFiles(information.source_bucket, information.source_path, information.revision);
-        restoreFileOperations(information.source_bucket, information.source_path, information.revision);
+        if (readSchemaVersion(information.source_bucket, information.source_path) < RESTORABLE_SCHEMA_VERSION)
+            throw Exception("Source bucket doesn't have restorable schema.", ErrorCodes::BAD_ARGUMENTS);
 
-        Poco::File restore_file(metadata_path + restore_file_name);
+        LOG_INFO(log, "Removing old metadata...");
+
+        bool cleanup_s3 = information.source_bucket != bucket || information.source_path != s3_root_path;
+        for (const auto & root : data_roots)
+            if (exists(root))
+                removeSharedRecursive(root + '/', !cleanup_s3);
+
+        restoreFiles(information);
+        restoreFileOperations(information);
+
+        Poco::File restore_file(metadata_path + RESTORE_FILE_NAME);
         restore_file.remove();
 
-        LOG_INFO(&Poco::Logger::get("DiskS3"), "Restore disk {} finished", name);
+        saveSchemaVersion(RESTORABLE_SCHEMA_VERSION);
+
+        LOG_INFO(log, "Restore disk {} finished", name);
     }
-    catch (const Exception & e)
+    catch (const Exception &)
     {
-        LOG_ERROR(&Poco::Logger::get("DiskS3"), "Failed to restore disk. Code: {}, e.displayText() = {}, Stack trace:\n\n{}", e.code(), e.displayText(), e.getStackTraceString());
+        tryLogCurrentException(log, fmt::format("Failed to restore disk {}", name));
 
         throw;
     }
 }
 
-void DiskS3::restoreFiles(const String & source_bucket, const String & source_path, UInt64 target_revision)
+void DiskS3::restoreFiles(const RestoreInformation & restore_information)
 {
-    LOG_INFO(&Poco::Logger::get("DiskS3"), "Starting restore files for disk {}", name);
+    LOG_INFO(log, "Starting restore files for disk {}", name);
 
     std::vector<std::future<void>> results;
-    listObjects(source_bucket, source_path, [this, &source_bucket, &source_path, &target_revision, &results](auto list_result)
+    auto restore_files = [this, &restore_information, &results](auto list_result)
     {
         std::vector<String> keys;
         for (const auto & row : list_result.GetContents())
@@ -1111,7 +1310,7 @@ void DiskS3::restoreFiles(const String & source_bucket, const String & source_pa
 
             const auto [revision, _] = extractRevisionAndOperationFromKey(key);
             /// Filter early if it's possible to get revision from key.
-            if (revision > target_revision)
+            if (revision > restore_information.revision)
                 continue;
 
             keys.push_back(key);
@@ -1119,23 +1318,26 @@ void DiskS3::restoreFiles(const String & source_bucket, const String & source_pa
 
         if (!keys.empty())
         {
-            auto result = getExecutor().execute([this, &source_bucket, &source_path, keys]()
+            auto result = getExecutor().execute([this, &restore_information, keys]()
             {
-                processRestoreFiles(source_bucket, source_path, keys);
+                processRestoreFiles(restore_information.source_bucket, restore_information.source_path, keys);
             });
 
             results.push_back(std::move(result));
         }
 
         return true;
-    });
+    };
+
+    /// Execute.
+    listObjects(restore_information.source_bucket, restore_information.source_path, restore_files);
 
     for (auto & result : results)
         result.wait();
     for (auto & result : results)
         result.get();
 
-    LOG_INFO(&Poco::Logger::get("DiskS3"), "Files are restored for disk {}", name);
+    LOG_INFO(log, "Files are restored for disk {}", name);
 }
 
 void DiskS3::processRestoreFiles(const String & source_bucket, const String & source_path, Strings keys)
@@ -1148,7 +1350,11 @@ void DiskS3::processRestoreFiles(const String & source_bucket, const String & so
         /// Restore file if object has 'path' in metadata.
         auto path_entry = object_metadata.find("path");
         if (path_entry == object_metadata.end())
-            throw Exception("Failed to restore key " + key + " because it doesn't have 'path' in metadata", ErrorCodes::S3_ERROR);
+        {
+            /// Such keys can remain after migration, we can skip them.
+            LOG_WARNING(log, "Skip key {} because it doesn't have 'path' in metadata", key);
+            continue;
+        }
 
         const auto & path = path_entry->second;
 
@@ -1163,18 +1369,19 @@ void DiskS3::processRestoreFiles(const String & source_bucket, const String & so
         metadata.addObject(relative_key, head_result.GetContentLength());
         metadata.save();
 
-        LOG_DEBUG(&Poco::Logger::get("DiskS3"), "Restored file {}", path);
+        LOG_DEBUG(log, "Restored file {}", path);
     }
 }
 
-void DiskS3::restoreFileOperations(const String & source_bucket, const String & source_path, UInt64 target_revision)
+void DiskS3::restoreFileOperations(const RestoreInformation & restore_information)
 {
-    LOG_INFO(&Poco::Logger::get("DiskS3"), "Starting restore file operations for disk {}", name);
+    LOG_INFO(log, "Starting restore file operations for disk {}", name);
 
     /// Enable recording file operations if we restore to different bucket / path.
-    send_metadata = bucket != source_bucket || s3_root_path != source_path;
+    send_metadata = bucket != restore_information.source_bucket || s3_root_path != restore_information.source_path;
 
-    listObjects(source_bucket, source_path + "operations/", [this, &source_bucket, &target_revision](auto list_result)
+    std::set<String> renames;
+    auto restore_file_operations = [this, &restore_information, &renames](auto list_result)
     {
         const String rename = "rename";
         const String hardlink = "hardlink";
@@ -1186,20 +1393,20 @@ void DiskS3::restoreFileOperations(const String & source_bucket, const String &
             const auto [revision, operation] = extractRevisionAndOperationFromKey(key);
             if (revision == UNKNOWN_REVISION)
             {
-                LOG_WARNING(&Poco::Logger::get("DiskS3"), "Skip key {} with unknown revision", key);
+                LOG_WARNING(log, "Skip key {} with unknown revision", key);
                 continue;
             }
 
             /// S3 ensures that keys will be listed in ascending UTF-8 bytes order (revision order).
             /// We can stop processing if revision of the object is already more than required.
-            if (revision > target_revision)
+            if (revision > restore_information.revision)
                 return false;
 
             /// Keep original revision if restore to different bucket / path.
             if (send_metadata)
                 revision_counter = revision - 1;
 
-            auto object_metadata = headObject(source_bucket, key).GetMetadata();
+            auto object_metadata = headObject(restore_information.source_bucket, key).GetMetadata();
             if (operation == rename)
             {
                 auto from_path = object_metadata["from_path"];
@@ -1207,7 +1414,23 @@ void DiskS3::restoreFileOperations(const String & source_bucket, const String &
                 if (exists(from_path))
                 {
                     moveFile(from_path, to_path);
-                    LOG_DEBUG(&Poco::Logger::get("DiskS3"), "Revision {}. Restored rename {} -> {}", revision, from_path, to_path);
+                    LOG_DEBUG(log, "Revision {}. Restored rename {} -> {}", revision, from_path, to_path);
+
+                    if (restore_information.detached && isDirectory(to_path))
+                    {
+                        /// Sometimes directory paths are passed without trailing '/'. We should keep them in one consistent way.
+                        if (!from_path.ends_with('/'))
+                            from_path += '/';
+                        if (!to_path.ends_with('/'))
+                            to_path += '/';
+
+                        /// Always keep latest actual directory path to avoid 'detaching' not existing paths.
+                        auto it = renames.find(from_path);
+                        if (it != renames.end())
+                            renames.erase(it);
+
+                        renames.insert(to_path);
+                    }
                 }
             }
             else if (operation == hardlink)
@@ -1218,27 +1441,55 @@ void DiskS3::restoreFileOperations(const String & source_bucket, const String &
                 {
                     createDirectories(directoryPath(dst_path));
                     createHardLink(src_path, dst_path);
-                    LOG_DEBUG(&Poco::Logger::get("DiskS3"), "Revision {}. Restored hardlink {} -> {}", revision, src_path, dst_path);
+                    LOG_DEBUG(log, "Revision {}. Restored hardlink {} -> {}", revision, src_path, dst_path);
                 }
             }
         }
 
         return true;
-    });
+    };
+
+    /// Execute.
+    listObjects(restore_information.source_bucket, restore_information.source_path + "operations/", restore_file_operations);
+
+    if (restore_information.detached)
+    {
+        Strings not_finished_prefixes{"tmp_", "delete_tmp_", "attaching_", "deleting_"};
+
+        for (const auto & path : renames)
+        {
+            /// Skip already detached parts.
+            if (path.find("/detached/") != std::string::npos)
+                continue;
+
+            /// Skip not finished parts. They shouldn't be in 'detached' directory, because CH wouldn't be able to finish processing them.
+            Poco::Path directory_path (path);
+            auto directory_name = directory_path.directory(directory_path.depth() - 1);
+            auto predicate = [&directory_name](String & prefix) { return directory_name.starts_with(prefix); };
+            if (std::any_of(not_finished_prefixes.begin(), not_finished_prefixes.end(), predicate))
+                continue;
+
+            auto detached_path = pathToDetached(path);
+
+            LOG_DEBUG(log, "Move directory to 'detached' {} -> {}", path, detached_path);
+
+            Poco::File(metadata_path + path).moveTo(metadata_path + detached_path);
+        }
+    }
 
     send_metadata = true;
 
-    LOG_INFO(&Poco::Logger::get("DiskS3"), "File operations restored for disk {}", name);
+    LOG_INFO(log, "File operations restored for disk {}", name);
 }
 
 std::tuple<UInt64, String> DiskS3::extractRevisionAndOperationFromKey(const String & key)
 {
-    UInt64 revision = UNKNOWN_REVISION;
+    String revision_str;
     String operation;
 
-    re2::RE2::FullMatch(key, key_regexp, &revision, &operation);
+    re2::RE2::FullMatch(key, key_regexp, &revision_str, &operation);
 
-    return {revision, operation};
+    return {(revision_str.empty() ? UNKNOWN_REVISION : static_cast<UInt64>(std::bitset<64>(revision_str).to_ullong())), operation};
 }
 
 String DiskS3::shrinkKey(const String & path, const String & key)
@@ -1251,15 +1502,12 @@ String DiskS3::shrinkKey(const String & path, const String & key)
 
 String DiskS3::revisionToString(UInt64 revision)
 {
-    static constexpr size_t max_digits = 19; /// UInt64 max digits in decimal representation.
+    return std::bitset<64>(revision).to_string();
+}
 
-    /// Align revision number with leading zeroes to have strict lexicographical order of them.
-    auto revision_str = std::to_string(revision);
-    auto digits_to_align = max_digits - revision_str.length();
-    for (size_t i = 0; i < digits_to_align; ++i)
-        revision_str = "0" + revision_str;
-
-    return revision_str;
+String DiskS3::pathToDetached(const String & source_path)
+{
+    return Poco::Path(source_path).parent().append(Poco::Path("detached")).toString() + '/';
 }
 
 void DiskS3::onFreeze(const String & path)
diff --git a/src/Disks/S3/DiskS3.h b/src/Disks/S3/DiskS3.h
index 5182ae4801b..758d4055a3e 100644
--- a/src/Disks/S3/DiskS3.h
+++ b/src/Disks/S3/DiskS3.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <atomic>
+#include <common/logger_useful.h>
 #include "Disks/DiskFactory.h"
 #include "Disks/Executor.h"
 #include "ProxyConfiguration.h"
@@ -25,6 +26,7 @@ class DiskS3 : public IDisk
 {
 public:
     using ObjectMetadata = std::map<std::string, std::string>;
+    using Futures = std::vector<std::future<void>>;
 
     friend class DiskS3Reservation;
 
@@ -39,6 +41,7 @@ public:
         String bucket_,
         String s3_root_path_,
         String metadata_path_,
+        UInt64 s3_max_single_read_retries_,
         size_t min_upload_part_size_,
         size_t max_single_part_upload_size_,
         size_t min_bytes_for_seek_,
@@ -89,17 +92,21 @@ public:
         size_t buf_size,
         size_t estimated_size,
         size_t aio_threshold,
-        size_t mmap_threshold) const override;
+        size_t mmap_threshold,
+        MMappedFileCache * mmap_cache) const override;
 
     std::unique_ptr<WriteBufferFromFileBase> writeFile(
         const String & path,
         size_t buf_size,
         WriteMode mode) override;
 
-    void removeFile(const String & path) override;
+    void removeFile(const String & path) override { removeSharedFile(path, false); }
     void removeFileIfExists(const String & path) override;
     void removeDirectory(const String & path) override;
-    void removeRecursive(const String & path) override;
+    void removeRecursive(const String & path) override { removeSharedRecursive(path, false); }
+
+    void removeSharedFile(const String & path, bool keep_s3) override;
+    void removeSharedRecursive(const String & path, bool keep_s3) override;
 
     void createHardLink(const String & src_path, const String & dst_path) override;
 
@@ -115,6 +122,14 @@ public:
 
     void shutdown() override;
 
+    /// Return some uniq string for file
+    /// Required for distinguish different copies of the same part on S3
+    String getUniqueId(const String & path) const override;
+
+    /// Check file exists and ClickHouse has an access to it
+    /// Required for S3 to ensure that replica has access to data wroten by other node
+    bool checkUniqueId(const String & id) const override;
+
     /// Actions performed after disk creation.
     void startup();
 
@@ -135,29 +150,43 @@ private:
     Metadata createMeta(const String & path) const;
 
     void createFileOperationObject(const String & operation_name, UInt64 revision, const ObjectMetadata & metadata);
+    /// Converts revision to binary string with leading zeroes (64 bit).
     static String revisionToString(UInt64 revision);
 
-    bool checkObjectExists(const String & prefix);
+    bool checkObjectExists(const String & source_bucket, const String & prefix);
+    void findLastRevision();
+
+    int readSchemaVersion(const String & source_bucket, const String & source_path);
+    void saveSchemaVersion(const int & version);
+    void updateObjectMetadata(const String & key, const ObjectMetadata & metadata);
+    void migrateFileToRestorableSchema(const String & path);
+    void migrateToRestorableSchemaRecursive(const String & path, Futures & results);
+    void migrateToRestorableSchema();
+
     Aws::S3::Model::HeadObjectResult headObject(const String & source_bucket, const String & key);
     void listObjects(const String & source_bucket, const String & source_path, std::function<bool(const Aws::S3::Model::ListObjectsV2Result &)> callback);
     void copyObject(const String & src_bucket, const String & src_key, const String & dst_bucket, const String & dst_key);
 
     void readRestoreInformation(RestoreInformation & restore_information);
-    void restoreFiles(const String & source_bucket, const String & source_path, UInt64 target_revision);
+    void restoreFiles(const RestoreInformation & restore_information);
     void processRestoreFiles(const String & source_bucket, const String & source_path, std::vector<String> keys);
-    void restoreFileOperations(const String & source_bucket, const String & source_path, UInt64 target_revision);
+    void restoreFileOperations(const RestoreInformation & restore_information);
 
     /// Remove 'path' prefix from 'key' to get relative key.
     /// It's needed to store keys to metadata files in RELATIVE_PATHS version.
     static String shrinkKey(const String & path, const String & key);
     std::tuple<UInt64, String> extractRevisionAndOperationFromKey(const String & key);
 
+    /// Forms detached path '../../detached/part_name/' from '../../part_name/'
+    static String pathToDetached(const String & source_path);
+
     const String name;
     std::shared_ptr<Aws::S3::S3Client> client;
     std::shared_ptr<S3::ProxyConfiguration> proxy_configuration;
     const String bucket;
     const String s3_root_path;
-    const String metadata_path;
+    String metadata_path;
+    UInt64 s3_max_single_read_retries;
     size_t min_upload_part_size;
     size_t max_single_part_upload_size;
     size_t min_bytes_for_seek;
@@ -168,16 +197,25 @@ private:
     std::mutex reservation_mutex;
 
     std::atomic<UInt64> revision_counter;
-    static constexpr UInt64 LATEST_REVISION = (static_cast<UInt64>(1)) << 63;
+    static constexpr UInt64 LATEST_REVISION = std::numeric_limits<UInt64>::max();
     static constexpr UInt64 UNKNOWN_REVISION = 0;
 
     /// File at path {metadata_path}/restore contains metadata restore information
-    const String restore_file_name = "restore";
+    inline static const String RESTORE_FILE_NAME = "restore";
     /// The number of keys listed in one request (1000 is max value)
     int list_object_keys_size;
 
     /// Key has format: ../../r{revision}-{operation}
     const re2::RE2 key_regexp {".*/r(\\d+)-(\\w+).*"};
+
+    /// Object contains information about schema version.
+    inline static const String SCHEMA_VERSION_OBJECT = ".SCHEMA_VERSION";
+    /// Version with possibility to backup-restore metadata.
+    static constexpr int RESTORABLE_SCHEMA_VERSION = 1;
+    /// Directories with data.
+    const std::vector<String> data_roots {"data", "store"};
+
+    Poco::Logger * log = &Poco::Logger::get("DiskS3");
 };
 
 }
diff --git a/src/Disks/S3/registerDiskS3.cpp b/src/Disks/S3/registerDiskS3.cpp
index 3ce2f909760..352f7467ba0 100644
--- a/src/Disks/S3/registerDiskS3.cpp
+++ b/src/Disks/S3/registerDiskS3.cpp
@@ -1,9 +1,17 @@
-#include <aws/core/client/DefaultRetryStrategy.h>
+#if !defined(ARCADIA_BUILD)
+    #include <Common/config.h>
+#endif
+
 #include <IO/ReadHelpers.h>
-#include <IO/S3Common.h>
 #include <IO/WriteHelpers.h>
 #include <Interpreters/Context.h>
 #include <common/logger_useful.h>
+
+
+#if USE_AWS_S3
+
+#include <aws/core/client/DefaultRetryStrategy.h>
+#include <IO/S3Common.h>
 #include "DiskS3.h"
 #include "Disks/DiskCacheWrapper.h"
 #include "Disks/DiskFactory.h"
@@ -109,20 +117,20 @@ void registerDiskS3(DiskFactory & factory)
     auto creator = [](const String & name,
                       const Poco::Util::AbstractConfiguration & config,
                       const String & config_prefix,
-                      const Context & context) -> DiskPtr {
-        Poco::File disk{context.getPath() + "disks/" + name};
+                      ContextConstPtr context) -> DiskPtr {
+        Poco::File disk{context->getPath() + "disks/" + name};
         disk.createDirectories();
 
         S3::PocoHTTPClientConfiguration client_configuration = S3::ClientFactory::instance().createClientConfiguration(
-            context.getRemoteHostFilter(),
-            context.getGlobalContext().getSettingsRef().s3_max_redirects);
+            context->getRemoteHostFilter(),
+            context->getGlobalContext()->getSettingsRef().s3_max_redirects);
 
         S3::URI uri(Poco::URI(config.getString(config_prefix + ".endpoint")));
         if (uri.key.back() != '/')
             throw Exception("S3 path must ends with '/', but '" + uri.key + "' doesn't.", ErrorCodes::BAD_ARGUMENTS);
 
         client_configuration.connectTimeoutMs = config.getUInt(config_prefix + ".connect_timeout_ms", 10000);
-        client_configuration.httpRequestTimeoutMs = config.getUInt(config_prefix + ".request_timeout_ms", 5000);
+        client_configuration.requestTimeoutMs = config.getUInt(config_prefix + ".request_timeout_ms", 5000);
         client_configuration.maxConnections = config.getUInt(config_prefix + ".max_connections", 100);
         client_configuration.endpointOverride = uri.endpoint;
 
@@ -140,10 +148,11 @@ void registerDiskS3(DiskFactory & factory)
             config.getString(config_prefix + ".secret_access_key", ""),
             config.getString(config_prefix + ".server_side_encryption_customer_key_base64", ""),
             {},
-            config.getBool(config_prefix + ".use_environment_credentials", config.getBool("s3.use_environment_credentials", false))
+            config.getBool(config_prefix + ".use_environment_credentials", config.getBool("s3.use_environment_credentials", false)),
+            config.getBool(config_prefix + ".use_insecure_imds_request", config.getBool("s3.use_insecure_imds_request", false))
         );
 
-        String metadata_path = config.getString(config_prefix + ".metadata_path", context.getPath() + "disks/" + name + "/");
+        String metadata_path = config.getString(config_prefix + ".metadata_path", context->getPath() + "disks/" + name + "/");
 
         auto s3disk = std::make_shared<DiskS3>(
             name,
@@ -152,8 +161,9 @@ void registerDiskS3(DiskFactory & factory)
             uri.bucket,
             uri.key,
             metadata_path,
-            context.getSettingsRef().s3_min_upload_part_size,
-            context.getSettingsRef().s3_max_single_part_upload_size,
+            context->getSettingsRef().s3_max_single_read_retries,
+            context->getSettingsRef().s3_min_upload_part_size,
+            context->getSettingsRef().s3_max_single_part_upload_size,
             config.getUInt64(config_prefix + ".min_bytes_for_seek", 1024 * 1024),
             config.getBool(config_prefix + ".send_metadata", false),
             config.getInt(config_prefix + ".thread_pool_size", 16),
@@ -174,7 +184,7 @@ void registerDiskS3(DiskFactory & factory)
 
         if (cache_enabled)
         {
-            String cache_path = config.getString(config_prefix + ".cache_path", context.getPath() + "disks/" + name + "/cache/");
+            String cache_path = config.getString(config_prefix + ".cache_path", context->getPath() + "disks/" + name + "/cache/");
 
             if (metadata_path == cache_path)
                 throw Exception("Metadata and cache path should be different: " + metadata_path, ErrorCodes::BAD_ARGUMENTS);
@@ -196,3 +206,10 @@ void registerDiskS3(DiskFactory & factory)
 }
 
 }
+
+#else
+
+void registerDiskS3(DiskFactory &) {}
+
+#endif
+
diff --git a/src/Disks/StoragePolicy.cpp b/src/Disks/StoragePolicy.cpp
index a1345879c83..cff2685ca24 100644
--- a/src/Disks/StoragePolicy.cpp
+++ b/src/Disks/StoragePolicy.cpp
@@ -159,6 +159,17 @@ Disks StoragePolicy::getDisks() const
 }
 
 
+Disks StoragePolicy::getDisksByType(DiskType::Type type) const
+{
+    Disks res;
+    for (const auto & volume : volumes)
+        for (const auto & disk : volume->getDisks())
+            if (disk->getType() == type)
+                res.push_back(disk);
+    return res;
+}
+
+
 DiskPtr StoragePolicy::getAnyDisk() const
 {
     /// StoragePolicy must contain at least one Volume
diff --git a/src/Disks/StoragePolicy.h b/src/Disks/StoragePolicy.h
index 6676ab19043..71773e91f70 100644
--- a/src/Disks/StoragePolicy.h
+++ b/src/Disks/StoragePolicy.h
@@ -47,6 +47,9 @@ public:
     /// Returns disks ordered by volumes priority
     Disks getDisks() const override;
 
+    /// Returns disks by type ordered by volumes priority
+    Disks getDisksByType(DiskType::Type type) const override;
+
     /// Returns any disk
     /// Used when it's not important, for example for
     /// mutations files
diff --git a/src/Disks/tests/gtest_disk.cpp b/src/Disks/tests/gtest_disk.cpp
index 525b5e6ce38..3b9dca63002 100644
--- a/src/Disks/tests/gtest_disk.cpp
+++ b/src/Disks/tests/gtest_disk.cpp
@@ -4,7 +4,7 @@
 #include <IO/WriteHelpers.h>
 #include "gtest_disk.h"
 
-#if !__clang__
+#if !defined(__clang__)
 #    pragma GCC diagnostic push
 #    pragma GCC diagnostic ignored "-Wsuggest-override"
 #endif
diff --git a/src/Formats/FormatFactory.cpp b/src/Formats/FormatFactory.cpp
index f7f32cf9b6f..6774c5eed88 100644
--- a/src/Formats/FormatFactory.cpp
+++ b/src/Formats/FormatFactory.cpp
@@ -43,16 +43,15 @@ const FormatFactory::Creators & FormatFactory::getCreators(const String & name)
     throw Exception("Unknown format " + name, ErrorCodes::UNKNOWN_FORMAT);
 }
 
-FormatSettings getFormatSettings(const Context & context)
+FormatSettings getFormatSettings(ContextConstPtr context)
 {
-    const auto & settings = context.getSettingsRef();
+    const auto & settings = context->getSettingsRef();
 
     return getFormatSettings(context, settings);
 }
 
 template <typename Settings>
-FormatSettings getFormatSettings(const Context & context,
-    const Settings & settings)
+FormatSettings getFormatSettings(ContextConstPtr context, const Settings & settings)
 {
     FormatSettings format_settings;
 
@@ -99,8 +98,8 @@ FormatSettings getFormatSettings(const Context & context,
     format_settings.regexp.regexp = settings.format_regexp;
     format_settings.regexp.skip_unmatched = settings.format_regexp_skip_unmatched;
     format_settings.schema.format_schema = settings.format_schema;
-    format_settings.schema.format_schema_path = context.getFormatSchemaPath();
-    format_settings.schema.is_server = context.hasGlobalContext() && (context.getGlobalContext().getApplicationType() == Context::ApplicationType::SERVER);
+    format_settings.schema.format_schema_path = context->getFormatSchemaPath();
+    format_settings.schema.is_server = context->hasGlobalContext() && (context->getGlobalContext()->getApplicationType() == Context::ApplicationType::SERVER);
     format_settings.skip_unknown_fields = settings.input_format_skip_unknown_fields;
     format_settings.template_settings.resultset_format = settings.format_template_resultset;
     format_settings.template_settings.row_between_delimiter = settings.format_template_rows_between_delimiter;
@@ -120,26 +119,22 @@ FormatSettings getFormatSettings(const Context & context,
     {
         const Poco::URI & avro_schema_registry_url = settings.format_avro_schema_registry_url;
         if (!avro_schema_registry_url.empty())
-            context.getRemoteHostFilter().checkURL(avro_schema_registry_url);
+            context->getRemoteHostFilter().checkURL(avro_schema_registry_url);
     }
 
     return format_settings;
 }
 
-template
-FormatSettings getFormatSettings<FormatFactorySettings>(const Context & context,
-    const FormatFactorySettings & settings);
+template FormatSettings getFormatSettings<FormatFactorySettings>(ContextConstPtr context, const FormatFactorySettings & settings);
 
-template
-FormatSettings getFormatSettings<Settings>(const Context & context,
-    const Settings & settings);
+template FormatSettings getFormatSettings<Settings>(ContextConstPtr context, const Settings & settings);
 
 
 InputFormatPtr FormatFactory::getInput(
     const String & name,
     ReadBuffer & buf,
     const Block & sample,
-    const Context & context,
+    ContextConstPtr context,
     UInt64 max_block_size,
     const std::optional<FormatSettings> & _format_settings) const
 {
@@ -154,7 +149,7 @@ InputFormatPtr FormatFactory::getInput(
         throw Exception("Format " + name + " is not suitable for input (with processors)", ErrorCodes::FORMAT_IS_NOT_SUITABLE_FOR_INPUT);
     }
 
-    const Settings & settings = context.getSettingsRef();
+    const Settings & settings = context->getSettingsRef();
     const auto & file_segmentation_engine = getCreators(name).file_segmentation_engine;
 
     // Doesn't make sense to use parallel parsing with less than four threads
@@ -204,13 +199,17 @@ InputFormatPtr FormatFactory::getInput(
     return format;
 }
 
-BlockOutputStreamPtr FormatFactory::getOutputStreamParallelIfPossible(const String & name,
-    WriteBuffer & buf, const Block & sample, const Context & context,
-    WriteCallback callback, const std::optional<FormatSettings> & _format_settings) const
+BlockOutputStreamPtr FormatFactory::getOutputStreamParallelIfPossible(
+    const String & name,
+    WriteBuffer & buf,
+    const Block & sample,
+    ContextConstPtr context,
+    WriteCallback callback,
+    const std::optional<FormatSettings> & _format_settings) const
 {
     const auto & output_getter = getCreators(name).output_processor_creator;
 
-    const Settings & settings = context.getSettingsRef();
+    const Settings & settings = context->getSettingsRef();
     bool parallel_formatting = settings.output_format_parallel_formatting;
 
     if (output_getter && parallel_formatting && getCreators(name).supports_parallel_formatting
@@ -237,12 +236,15 @@ BlockOutputStreamPtr FormatFactory::getOutputStreamParallelIfPossible(const Stri
 }
 
 
-BlockOutputStreamPtr FormatFactory::getOutputStream(const String & name,
-    WriteBuffer & buf, const Block & sample, const Context & context,
-    WriteCallback callback, const std::optional<FormatSettings> & _format_settings) const
+BlockOutputStreamPtr FormatFactory::getOutputStream(
+    const String & name,
+    WriteBuffer & buf,
+    const Block & sample,
+    ContextConstPtr context,
+    WriteCallback callback,
+    const std::optional<FormatSettings> & _format_settings) const
 {
-    auto format_settings = _format_settings
-        ? *_format_settings : getFormatSettings(context);
+    auto format_settings = _format_settings ? *_format_settings : getFormatSettings(context);
 
     if (!getCreators(name).output_processor_creator)
     {
@@ -267,7 +269,7 @@ InputFormatPtr FormatFactory::getInputFormat(
     const String & name,
     ReadBuffer & buf,
     const Block & sample,
-    const Context & context,
+    ContextConstPtr context,
     UInt64 max_block_size,
     const std::optional<FormatSettings> & _format_settings) const
 {
@@ -275,13 +277,12 @@ InputFormatPtr FormatFactory::getInputFormat(
     if (!input_getter)
         throw Exception("Format " + name + " is not suitable for input", ErrorCodes::FORMAT_IS_NOT_SUITABLE_FOR_INPUT);
 
-    const Settings & settings = context.getSettingsRef();
+    const Settings & settings = context->getSettingsRef();
 
-    if (context.hasQueryContext() && settings.log_queries)
-        context.getQueryContext().addQueryFactoriesInfo(Context::QueryLogFactories::Format, name);
+    if (context->hasQueryContext() && settings.log_queries)
+        context->getQueryContext()->addQueryFactoriesInfo(Context::QueryLogFactories::Format, name);
 
-    auto format_settings = _format_settings
-        ? *_format_settings : getFormatSettings(context);
+    auto format_settings = _format_settings ? *_format_settings : getFormatSettings(context);
 
     RowInputFormatParams params;
     params.max_block_size = max_block_size;
@@ -289,7 +290,6 @@ InputFormatPtr FormatFactory::getInputFormat(
     params.allow_errors_ratio = format_settings.input_allow_errors_ratio;
     params.max_execution_time = settings.max_execution_time;
     params.timeout_overflow_mode = settings.timeout_overflow_mode;
-
     auto format = input_getter(buf, sample, params, format_settings);
 
     /// It's a kludge. Because I cannot remove context from values format.
@@ -300,18 +300,20 @@ InputFormatPtr FormatFactory::getInputFormat(
 }
 
 OutputFormatPtr FormatFactory::getOutputFormatParallelIfPossible(
-    const String & name, WriteBuffer & buf, const Block & sample,
-    const Context & context, WriteCallback callback,
+    const String & name,
+    WriteBuffer & buf,
+    const Block & sample,
+    ContextConstPtr context,
+    WriteCallback callback,
     const std::optional<FormatSettings> & _format_settings) const
 {
     const auto & output_getter = getCreators(name).output_processor_creator;
     if (!output_getter)
         throw Exception("Format " + name + " is not suitable for output (with processors)", ErrorCodes::FORMAT_IS_NOT_SUITABLE_FOR_OUTPUT);
 
-    auto format_settings = _format_settings
-        ? *_format_settings : getFormatSettings(context);
+    auto format_settings = _format_settings ? *_format_settings : getFormatSettings(context);
 
-    const Settings & settings = context.getSettingsRef();
+    const Settings & settings = context->getSettingsRef();
 
     if (settings.output_format_parallel_formatting && getCreators(name).supports_parallel_formatting
         && !settings.output_format_json_array_of_rows)
@@ -322,8 +324,8 @@ OutputFormatPtr FormatFactory::getOutputFormatParallelIfPossible(
 
         ParallelFormattingOutputFormat::Params builder{buf, sample, formatter_creator, settings.max_threads};
 
-        if (context.hasQueryContext() && settings.log_queries)
-            context.getQueryContext().addQueryFactoriesInfo(Context::QueryLogFactories::Format, name);
+        if (context->hasQueryContext() && settings.log_queries)
+            context->getQueryContext()->addQueryFactoriesInfo(Context::QueryLogFactories::Format, name);
 
         return std::make_shared<ParallelFormattingOutputFormat>(builder);
     }
@@ -333,16 +335,19 @@ OutputFormatPtr FormatFactory::getOutputFormatParallelIfPossible(
 
 
 OutputFormatPtr FormatFactory::getOutputFormat(
-    const String & name, WriteBuffer & buf, const Block & sample,
-    const Context & context, WriteCallback callback,
+    const String & name,
+    WriteBuffer & buf,
+    const Block & sample,
+    ContextConstPtr context,
+    WriteCallback callback,
     const std::optional<FormatSettings> & _format_settings) const
 {
     const auto & output_getter = getCreators(name).output_processor_creator;
     if (!output_getter)
         throw Exception("Format " + name + " is not suitable for output (with processors)", ErrorCodes::FORMAT_IS_NOT_SUITABLE_FOR_OUTPUT);
 
-    if (context.hasQueryContext() && context.getSettingsRef().log_queries)
-        context.getQueryContext().addQueryFactoriesInfo(Context::QueryLogFactories::Format, name);
+    if (context->hasQueryContext() && context->getSettingsRef().log_queries)
+        context->getQueryContext()->addQueryFactoriesInfo(Context::QueryLogFactories::Format, name);
 
     RowOutputFormatParams params;
     params.callback = std::move(callback);
@@ -412,11 +417,26 @@ void FormatFactory::markOutputFormatSupportsParallelFormatting(const String & na
 {
     auto & target = dict[name].supports_parallel_formatting;
     if (target)
-        throw Exception("FormatFactory: Output format " + name + " is already marked as supporting parallel formatting.", ErrorCodes::LOGICAL_ERROR);
+        throw Exception("FormatFactory: Output format " + name + " is already marked as supporting parallel formatting", ErrorCodes::LOGICAL_ERROR);
     target = true;
 }
 
 
+void FormatFactory::markFormatAsColumnOriented(const String & name)
+{
+    auto & target = dict[name].is_column_oriented;
+    if (target)
+        throw Exception("FormatFactory: Format " + name + " is already marked as column oriented", ErrorCodes::LOGICAL_ERROR);
+    target = true;
+}
+
+
+bool FormatFactory::checkIfFormatIsColumnOriented(const String & name)
+{
+    const auto & target = getCreators(name);
+    return target.is_column_oriented;
+}
+
 FormatFactory & FormatFactory::instance()
 {
     static FormatFactory ret;
diff --git a/src/Formats/FormatFactory.h b/src/Formats/FormatFactory.h
index 4fa7e9a0c01..d5e4b1b0341 100644
--- a/src/Formats/FormatFactory.h
+++ b/src/Formats/FormatFactory.h
@@ -1,21 +1,22 @@
 #pragma once
 
-#include <common/types.h>
 #include <Columns/IColumn.h>
 #include <DataStreams/IBlockStream_fwd.h>
 #include <Formats/FormatSettings.h>
+#include <Interpreters/Context_fwd.h>
 #include <IO/BufferWithOwnMemory.h>
+#include <common/types.h>
+
+#include <boost/noncopyable.hpp>
 
 #include <functional>
 #include <memory>
 #include <unordered_map>
-#include <boost/noncopyable.hpp>
 
 namespace DB
 {
 
 class Block;
-class Context;
 struct Settings;
 struct FormatFactorySettings;
 
@@ -34,11 +35,10 @@ struct RowOutputFormatParams;
 using InputFormatPtr = std::shared_ptr<IInputFormat>;
 using OutputFormatPtr = std::shared_ptr<IOutputFormat>;
 
-FormatSettings getFormatSettings(const Context & context);
+FormatSettings getFormatSettings(ContextConstPtr context);
 
 template <typename T>
-FormatSettings getFormatSettings(const Context & context,
-    const T & settings);
+FormatSettings getFormatSettings(ContextConstPtr context, const T & settings);
 
 /** Allows to create an IBlockInputStream or IBlockOutputStream by the name of the format.
   * Note: format and compression are independent things.
@@ -101,6 +101,7 @@ private:
         OutputProcessorCreator output_processor_creator;
         FileSegmentationEngine file_segmentation_engine;
         bool supports_parallel_formatting{false};
+        bool is_column_oriented{false};
     };
 
     using FormatsDictionary = std::unordered_map<String, Creators>;
@@ -112,38 +113,52 @@ public:
         const String & name,
         ReadBuffer & buf,
         const Block & sample,
-        const Context & context,
+        ContextConstPtr context,
         UInt64 max_block_size,
         const std::optional<FormatSettings> & format_settings = std::nullopt) const;
 
     /// Checks all preconditions. Returns ordinary stream if parallel formatting cannot be done.
     /// Currently used only in Client. Don't use it something else! Better look at getOutputFormatParallelIfPossible.
-    BlockOutputStreamPtr getOutputStreamParallelIfPossible(const String & name, WriteBuffer & buf,
-        const Block & sample, const Context & context, WriteCallback callback = {},
+    BlockOutputStreamPtr getOutputStreamParallelIfPossible(
+        const String & name,
+        WriteBuffer & buf,
+        const Block & sample,
+        ContextConstPtr context,
+        WriteCallback callback = {},
         const std::optional<FormatSettings> & format_settings = std::nullopt) const;
 
     /// Currently used only in Client. Don't use it something else! Better look at getOutputFormat.
-    BlockOutputStreamPtr getOutputStream(const String & name, WriteBuffer & buf,
-        const Block & sample, const Context & context, WriteCallback callback = {},
+    BlockOutputStreamPtr getOutputStream(
+        const String & name,
+        WriteBuffer & buf,
+        const Block & sample,
+        ContextConstPtr context,
+        WriteCallback callback = {},
         const std::optional<FormatSettings> & format_settings = std::nullopt) const;
 
     InputFormatPtr getInputFormat(
         const String & name,
         ReadBuffer & buf,
         const Block & sample,
-        const Context & context,
+        ContextConstPtr context,
         UInt64 max_block_size,
         const std::optional<FormatSettings> & format_settings = std::nullopt) const;
 
     /// Checks all preconditions. Returns ordinary format if parallel formatting cannot be done.
     OutputFormatPtr getOutputFormatParallelIfPossible(
-        const String & name, WriteBuffer & buf, const Block & sample,
-        const Context & context, WriteCallback callback = {},
+        const String & name,
+        WriteBuffer & buf,
+        const Block & sample,
+        ContextConstPtr context,
+        WriteCallback callback = {},
         const std::optional<FormatSettings> & format_settings = std::nullopt) const;
 
     OutputFormatPtr getOutputFormat(
-        const String & name, WriteBuffer & buf, const Block & sample,
-        const Context & context, WriteCallback callback = {},
+        const String & name,
+        WriteBuffer & buf,
+        const Block & sample,
+        ContextConstPtr context,
+        WriteCallback callback = {},
         const std::optional<FormatSettings> & format_settings = std::nullopt) const;
 
     /// Register format by its name.
@@ -155,6 +170,9 @@ public:
     void registerOutputFormatProcessor(const String & name, OutputProcessorCreator output_creator);
 
     void markOutputFormatSupportsParallelFormatting(const String & name);
+    void markFormatAsColumnOriented(const String & name);
+
+    bool checkIfFormatIsColumnOriented(const String & name);
 
     const FormatsDictionary & getAllFormats() const
     {
diff --git a/src/Formats/FormatSettings.h b/src/Formats/FormatSettings.h
index c1f02c65748..33d51b1797f 100644
--- a/src/Formats/FormatSettings.h
+++ b/src/Formats/FormatSettings.h
@@ -27,7 +27,7 @@ struct FormatSettings
     bool with_names_use_header = false;
     bool write_statistics = true;
     bool import_nested_json = false;
-    bool null_as_default = false;
+    bool null_as_default = true;
 
     enum class DateTimeInputFormat
     {
diff --git a/src/Formats/IRowInputStream.cpp b/src/Formats/IRowInputStream.cpp
deleted file mode 100644
index f3603982de5..00000000000
--- a/src/Formats/IRowInputStream.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <Formats/IRowInputStream.h>
-#include <Common/Exception.h>
-
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int NOT_IMPLEMENTED;
-}
-
-void IRowInputStream::syncAfterError()
-{
-    throw Exception("Method syncAfterError is not implemented for input format", ErrorCodes::NOT_IMPLEMENTED);
-}
-
-}
diff --git a/src/Formats/IRowInputStream.h b/src/Formats/IRowInputStream.h
deleted file mode 100644
index e0b8a574f17..00000000000
--- a/src/Formats/IRowInputStream.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#pragma once
-
-#include <boost/noncopyable.hpp>
-#include <memory>
-#include <string>
-
-#include <Columns/IColumn.h>
-
-
-namespace DB
-{
-
-/// Contains extra information about read data.
-struct RowReadExtension
-{
-    /// IRowInputStream.read() output. It contains non zero for columns that actually read from the source and zero otherwise.
-    /// It's used to attach defaults for partially filled rows.
-    /// Can be empty, this means that all columns are read.
-    std::vector<UInt8> read_columns;
-};
-
-/** Interface of stream, that allows to read data by rows.
-  */
-class IRowInputStream : private boost::noncopyable
-{
-public:
-    /** Read next row and append it to the columns.
-      * If no more rows - return false.
-      */
-    virtual bool read(MutableColumns & columns, RowReadExtension & extra) = 0;
-
-    virtual void readPrefix() {}                /// delimiter before begin of result
-    virtual void readSuffix() {}                /// delimiter after end of result
-
-    /// Skip data until next row.
-    /// This is intended for text streams, that allow skipping of errors.
-    /// By default - throws not implemented exception.
-    virtual bool allowSyncAfterError() const { return false; }
-    virtual void syncAfterError();
-
-    /// In case of parse error, try to roll back and parse last one or two rows very carefully
-    ///  and collect as much as possible diagnostic information about error.
-    /// If not implemented, returns empty string.
-    virtual std::string getDiagnosticInfo() { return {}; }
-
-    virtual ~IRowInputStream() {}
-};
-
-using RowInputStreamPtr = std::shared_ptr<IRowInputStream>;
-
-}
diff --git a/src/Formats/IRowOutputStream.cpp b/src/Formats/IRowOutputStream.cpp
deleted file mode 100644
index f84d810b8e8..00000000000
--- a/src/Formats/IRowOutputStream.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-#include <Common/Exception.h>
-#include <Core/Block.h>
-#include <Formats/IRowOutputStream.h>
-
-
-namespace DB
-{
-namespace ErrorCodes
-{
-    extern const int NOT_IMPLEMENTED;
-}
-
-
-void IRowOutputStream::write(const Block & block, size_t row_num)
-{
-    size_t columns = block.columns();
-
-    writeRowStartDelimiter();
-
-    for (size_t i = 0; i < columns; ++i)
-    {
-        if (i != 0)
-            writeFieldDelimiter();
-
-        const auto & col = block.getByPosition(i);
-        writeField(*col.column, *col.type, row_num);
-    }
-
-    writeRowEndDelimiter();
-}
-
-void IRowOutputStream::writeField(const IColumn &, const IDataType &, size_t)
-{
-    throw Exception("Method writeField is not implemented for output format", ErrorCodes::NOT_IMPLEMENTED);
-}
-
-}
diff --git a/src/Formats/IRowOutputStream.h b/src/Formats/IRowOutputStream.h
deleted file mode 100644
index 7cf6251cd0d..00000000000
--- a/src/Formats/IRowOutputStream.h
+++ /dev/null
@@ -1,63 +0,0 @@
-#pragma once
-
-#include <memory>
-#include <cstdint>
-#include <boost/noncopyable.hpp>
-#include <common/types.h>
-
-
-namespace DB
-{
-
-class Block;
-class IColumn;
-class IDataType;
-struct Progress;
-
-
-/** Interface of stream for writing data by rows (for example: for output to terminal).
-  */
-class IRowOutputStream : private boost::noncopyable
-{
-public:
-
-    /** Write a row.
-      * Default implementation calls methods to write single values and delimiters
-      * (except delimiter between rows (writeRowBetweenDelimiter())).
-      */
-    virtual void write(const Block & block, size_t row_num);
-
-    /** Write single value. */
-    virtual void writeField(const IColumn & column, const IDataType & type, size_t row_num);
-
-    /** Write delimiter. */
-    virtual void writeFieldDelimiter() {}      /// delimiter between values
-    virtual void writeRowStartDelimiter() {}   /// delimiter before each row
-    virtual void writeRowEndDelimiter() {}     /// delimiter after each row
-    virtual void writeRowBetweenDelimiter() {} /// delimiter between rows
-    virtual void writePrefix() {}              /// delimiter before resultset
-    virtual void writeSuffix() {}              /// delimiter after resultset
-
-    /** Flush output buffers if any. */
-    virtual void flush() {}
-
-    /** Methods to set additional information for output in formats, that support it.
-      */
-    virtual void setRowsBeforeLimit(size_t /*rows_before_limit*/) {}
-    virtual void setTotals(const Block & /*totals*/) {}
-    virtual void setExtremes(const Block & /*extremes*/) {}
-
-    /** Notify about progress. Method could be called from different threads.
-      * Passed value are delta, that must be summarized.
-      */
-    virtual void onProgress(const Progress & /*progress*/) {}
-
-    /** Content-Type to set when sending HTTP response. */
-    virtual String getContentType() const { return "text/plain; charset=UTF-8"; }
-
-    virtual ~IRowOutputStream() {}
-};
-
-using RowOutputStreamPtr = std::shared_ptr<IRowOutputStream>;
-
-}
diff --git a/src/Formats/MySQLBlockInputStream.cpp b/src/Formats/MySQLBlockInputStream.cpp
index 87df0c1f4b1..be0cb31f22d 100644
--- a/src/Formats/MySQLBlockInputStream.cpp
+++ b/src/Formats/MySQLBlockInputStream.cpp
@@ -1,31 +1,44 @@
 #if !defined(ARCADIA_BUILD)
-#    include "config_core.h"
+#include "config_core.h"
 #endif
 
 #if USE_MYSQL
-#    include <vector>
-#    include <Columns/ColumnNullable.h>
-#    include <Columns/ColumnString.h>
-#    include <Columns/ColumnsNumber.h>
-#    include <Columns/ColumnDecimal.h>
-#    include <Columns/ColumnFixedString.h>
-#    include <DataTypes/IDataType.h>
-#    include <DataTypes/DataTypeNullable.h>
-#    include <IO/ReadHelpers.h>
-#    include <IO/WriteHelpers.h>
-#    include <IO/Operators.h>
-#    include <Common/assert_cast.h>
-#    include <ext/range.h>
-#    include "MySQLBlockInputStream.h"
+#include <vector>
+#include <Columns/ColumnNullable.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnsNumber.h>
+#include <Columns/ColumnDecimal.h>
+#include <Columns/ColumnFixedString.h>
+#include <DataTypes/IDataType.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <IO/ReadBufferFromString.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <IO/Operators.h>
+#include <Common/assert_cast.h>
+#include <ext/range.h>
+#include <common/logger_useful.h>
+#include "MySQLBlockInputStream.h"
+
 
 namespace DB
 {
+
 namespace ErrorCodes
 {
     extern const int NUMBER_OF_COLUMNS_DOESNT_MATCH;
     extern const int NOT_IMPLEMENTED;
 }
 
+StreamSettings::StreamSettings(const Settings & settings, bool auto_close_, bool fetch_by_name_, size_t max_retry_)
+    : max_read_mysql_row_nums((settings.external_storage_max_read_rows) ? settings.external_storage_max_read_rows : settings.max_block_size)
+    , max_read_mysql_bytes_size(settings.external_storage_max_read_bytes)
+    , auto_close(auto_close_)
+    , fetch_by_name(fetch_by_name_)
+    , default_num_tries_on_connection_loss(max_retry_)
+{
+}
+
 MySQLBlockInputStream::Connection::Connection(
     const mysqlxx::PoolWithFailover::Entry & entry_,
     const std::string & query_str)
@@ -35,72 +48,137 @@ MySQLBlockInputStream::Connection::Connection(
 {
 }
 
+/// Used in MaterializeMySQL and in doInvalidateQuery for dictionary source.
 MySQLBlockInputStream::MySQLBlockInputStream(
     const mysqlxx::PoolWithFailover::Entry & entry,
     const std::string & query_str,
     const Block & sample_block,
-    const UInt64 max_block_size_,
-    const bool auto_close_,
-    const bool fetch_by_name_)
-    : connection{std::make_unique<Connection>(entry, query_str)}
-    , max_block_size{max_block_size_}
-    , auto_close{auto_close_}
-    , fetch_by_name(fetch_by_name_)
+    const StreamSettings & settings_)
+    : log(&Poco::Logger::get("MySQLBlockInputStream"))
+    , connection{std::make_unique<Connection>(entry, query_str)}
+    , settings{std::make_unique<StreamSettings>(settings_)}
 {
     description.init(sample_block);
     initPositionMappingFromQueryResultStructure();
 }
 
+/// For descendant MySQLWithFailoverBlockInputStream
+    MySQLBlockInputStream::MySQLBlockInputStream(const Block &sample_block_, const StreamSettings & settings_)
+    : log(&Poco::Logger::get("MySQLBlockInputStream"))
+    , settings(std::make_unique<StreamSettings>(settings_))
+{
+    description.init(sample_block_);
+}
+
+/// Used by MySQL storage / table function and dictionary source.
+MySQLWithFailoverBlockInputStream::MySQLWithFailoverBlockInputStream(
+    mysqlxx::PoolWithFailoverPtr pool_,
+    const std::string & query_str_,
+    const Block & sample_block_,
+    const StreamSettings & settings_)
+: MySQLBlockInputStream(sample_block_, settings_)
+, pool(pool_)
+, query_str(query_str_)
+{
+}
+
+void MySQLWithFailoverBlockInputStream::readPrefix()
+{
+    size_t count_connect_attempts = 0;
+
+    /// For recovering from "Lost connection to MySQL server during query" errors
+    while (true)
+    {
+        try
+        {
+            connection = std::make_unique<Connection>(pool->get(), query_str);
+            break;
+        }
+        catch (const mysqlxx::ConnectionLost & ecl)  /// There are two retriable failures: CR_SERVER_GONE_ERROR, CR_SERVER_LOST
+        {
+            LOG_WARNING(log, "Failed connection ({}/{}). Trying to reconnect... (Info: {})", count_connect_attempts, settings->default_num_tries_on_connection_loss, ecl.displayText());
+        }
+
+        if (++count_connect_attempts > settings->default_num_tries_on_connection_loss)
+        {
+            LOG_ERROR(log, "Failed to create connection to MySQL. ({}/{})", count_connect_attempts, settings->default_num_tries_on_connection_loss);
+            throw;
+        }
+    }
+
+    initPositionMappingFromQueryResultStructure();
+}
 
 namespace
 {
     using ValueType = ExternalResultDescription::ValueType;
 
-    void insertValue(const IDataType & data_type, IColumn & column, const ValueType type, const mysqlxx::Value & value)
+    void insertValue(const IDataType & data_type, IColumn & column, const ValueType type, const mysqlxx::Value & value, size_t & read_bytes_size)
     {
         switch (type)
         {
             case ValueType::vtUInt8:
                 assert_cast<ColumnUInt8 &>(column).insertValue(value.getUInt());
+                read_bytes_size += 1;
                 break;
             case ValueType::vtUInt16:
                 assert_cast<ColumnUInt16 &>(column).insertValue(value.getUInt());
+                read_bytes_size += 2;
                 break;
             case ValueType::vtUInt32:
                 assert_cast<ColumnUInt32 &>(column).insertValue(value.getUInt());
+                read_bytes_size += 4;
                 break;
             case ValueType::vtUInt64:
                 assert_cast<ColumnUInt64 &>(column).insertValue(value.getUInt());
+                read_bytes_size += 8;
                 break;
             case ValueType::vtInt8:
                 assert_cast<ColumnInt8 &>(column).insertValue(value.getInt());
+                read_bytes_size += 1;
                 break;
             case ValueType::vtInt16:
                 assert_cast<ColumnInt16 &>(column).insertValue(value.getInt());
+                read_bytes_size += 2;
                 break;
             case ValueType::vtInt32:
                 assert_cast<ColumnInt32 &>(column).insertValue(value.getInt());
+                read_bytes_size += 4;
                 break;
             case ValueType::vtInt64:
                 assert_cast<ColumnInt64 &>(column).insertValue(value.getInt());
+                read_bytes_size += 8;
                 break;
             case ValueType::vtFloat32:
                 assert_cast<ColumnFloat32 &>(column).insertValue(value.getDouble());
+                read_bytes_size += 4;
                 break;
             case ValueType::vtFloat64:
                 assert_cast<ColumnFloat64 &>(column).insertValue(value.getDouble());
+                read_bytes_size += 8;
                 break;
             case ValueType::vtString:
                 assert_cast<ColumnString &>(column).insertData(value.data(), value.size());
+                read_bytes_size += assert_cast<ColumnString &>(column).byteSize();
                 break;
             case ValueType::vtDate:
                 assert_cast<ColumnUInt16 &>(column).insertValue(UInt16(value.getDate().getDayNum()));
+                read_bytes_size += 2;
                 break;
             case ValueType::vtDateTime:
-                assert_cast<ColumnUInt32 &>(column).insertValue(UInt32(value.getDateTime()));
+            {
+                ReadBufferFromString in(value);
+                time_t time = 0;
+                readDateTimeText(time, in);
+                if (time < 0)
+                    time = 0;
+                assert_cast<ColumnUInt32 &>(column).insertValue(time);
+                read_bytes_size += 4;
                 break;
+            }
             case ValueType::vtUUID:
                 assert_cast<ColumnUInt128 &>(column).insert(parse<UUID>(value.data(), value.size()));
+                read_bytes_size += assert_cast<ColumnUInt128 &>(column).byteSize();
                 break;
             case ValueType::vtDateTime64:[[fallthrough]];
             case ValueType::vtDecimal32: [[fallthrough]];
@@ -109,11 +187,13 @@ namespace
             case ValueType::vtDecimal256:
             {
                 ReadBuffer buffer(const_cast<char *>(value.data()), value.size(), 0);
-                data_type.deserializeAsWholeText(column, buffer, FormatSettings{});
+                data_type.getDefaultSerialization()->deserializeWholeText(column, buffer, FormatSettings{});
+                read_bytes_size += column.sizeOfValueIfFixed();
                 break;
             }
             case ValueType::vtFixedString:
                 assert_cast<ColumnFixedString &>(column).insertData(value.data(), value.size());
+                read_bytes_size += column.sizeOfValueIfFixed();
                 break;
             default:
                 throw Exception("Unsupported value type", ErrorCodes::NOT_IMPLEMENTED);
@@ -129,8 +209,9 @@ Block MySQLBlockInputStream::readImpl()
     auto row = connection->result.fetch();
     if (!row)
     {
-        if (auto_close)
+        if (settings->auto_close)
            connection->entry.disconnect();
+
         return {};
     }
 
@@ -139,6 +220,8 @@ Block MySQLBlockInputStream::readImpl()
         columns[i] = description.sample_block.getByPosition(i).column->cloneEmpty();
 
     size_t num_rows = 0;
+    size_t read_bytes_size = 0;
+
     while (row)
     {
         for (size_t index = 0; index < position_mapping.size(); ++index)
@@ -154,12 +237,12 @@ Block MySQLBlockInputStream::readImpl()
                 {
                     ColumnNullable & column_nullable = assert_cast<ColumnNullable &>(*columns[index]);
                     const auto & data_type = assert_cast<const DataTypeNullable &>(*sample.type);
-                    insertValue(*data_type.getNestedType(), column_nullable.getNestedColumn(), description.types[index].first, value);
+                    insertValue(*data_type.getNestedType(), column_nullable.getNestedColumn(), description.types[index].first, value, read_bytes_size);
                     column_nullable.getNullMapData().emplace_back(false);
                 }
                 else
                 {
-                    insertValue(*sample.type, *columns[index], description.types[index].first, value);
+                    insertValue(*sample.type, *columns[index], description.types[index].first, value, read_bytes_size);
                 }
             }
             else
@@ -175,7 +258,7 @@ Block MySQLBlockInputStream::readImpl()
         }
 
         ++num_rows;
-        if (num_rows == max_block_size)
+        if (num_rows == settings->max_read_mysql_row_nums || (settings->max_read_mysql_bytes_size && read_bytes_size >= settings->max_read_mysql_bytes_size))
             break;
 
         row = connection->result.fetch();
@@ -183,23 +266,11 @@ Block MySQLBlockInputStream::readImpl()
     return description.sample_block.cloneWithColumns(std::move(columns));
 }
 
-MySQLBlockInputStream::MySQLBlockInputStream(
-    const Block & sample_block_,
-    UInt64 max_block_size_,
-    bool auto_close_,
-    bool fetch_by_name_)
-    : max_block_size(max_block_size_)
-    , auto_close(auto_close_)
-    , fetch_by_name(fetch_by_name_)
-{
-    description.init(sample_block_);
-}
-
 void MySQLBlockInputStream::initPositionMappingFromQueryResultStructure()
 {
     position_mapping.resize(description.sample_block.columns());
 
-    if (!fetch_by_name)
+    if (!settings->fetch_by_name)
     {
         if (description.sample_block.columns() != connection->result.getNumFields())
             throw Exception{"mysqlxx::UseQueryResult contains " + toString(connection->result.getNumFields()) + " columns while "
@@ -242,25 +313,6 @@ void MySQLBlockInputStream::initPositionMappingFromQueryResultStructure()
     }
 }
 
-MySQLLazyBlockInputStream::MySQLLazyBlockInputStream(
-    mysqlxx::Pool & pool_,
-    const std::string & query_str_,
-    const Block & sample_block_,
-    const UInt64 max_block_size_,
-    const bool auto_close_,
-    const bool fetch_by_name_)
-    : MySQLBlockInputStream(sample_block_, max_block_size_, auto_close_, fetch_by_name_)
-    , pool(pool_)
-    , query_str(query_str_)
-{
-}
-
-void MySQLLazyBlockInputStream::readPrefix()
-{
-    connection = std::make_unique<Connection>(pool.get(), query_str);
-    initPositionMappingFromQueryResultStructure();
-}
-
 }
 
 #endif
diff --git a/src/Formats/MySQLBlockInputStream.h b/src/Formats/MySQLBlockInputStream.h
index 269b630fcc7..12deb9c3146 100644
--- a/src/Formats/MySQLBlockInputStream.h
+++ b/src/Formats/MySQLBlockInputStream.h
@@ -6,11 +6,24 @@
 #include <mysqlxx/PoolWithFailover.h>
 #include <mysqlxx/Query.h>
 #include <Core/ExternalResultDescription.h>
-
+#include <Core/Settings.h>
 
 namespace DB
 {
 
+struct StreamSettings
+{
+    /// Check if setting is enabled, otherwise use common `max_block_size` setting.
+    size_t max_read_mysql_row_nums;
+    size_t max_read_mysql_bytes_size;
+    bool auto_close;
+    bool fetch_by_name;
+    size_t default_num_tries_on_connection_loss;
+
+    StreamSettings(const Settings & settings, bool auto_close_ = false, bool fetch_by_name_ = false, size_t max_retry_ = 5);
+
+};
+
 /// Allows processing results of a MySQL query as a sequence of Blocks, simplifies chaining
 class MySQLBlockInputStream : public IBlockInputStream
 {
@@ -19,16 +32,14 @@ public:
         const mysqlxx::PoolWithFailover::Entry & entry,
         const std::string & query_str,
         const Block & sample_block,
-        const UInt64 max_block_size_,
-        const bool auto_close_ = false,
-        const bool fetch_by_name_ = false);
+        const StreamSettings & settings_);
 
     String getName() const override { return "MySQL"; }
 
     Block getHeader() const override { return description.sample_block.cloneEmpty(); }
 
 protected:
-    MySQLBlockInputStream(const Block & sample_block_, UInt64 max_block_size_, bool auto_close_, bool fetch_by_name_);
+    MySQLBlockInputStream(const Block & sample_block_, const StreamSettings & settings);
     Block readImpl() override;
     void initPositionMappingFromQueryResultStructure();
 
@@ -41,32 +52,31 @@ protected:
         mysqlxx::UseQueryResult result;
     };
 
+    Poco::Logger * log;
     std::unique_ptr<Connection> connection;
 
-    const UInt64 max_block_size;
-    const bool auto_close;
-    const bool fetch_by_name;
+    const std::unique_ptr<StreamSettings> settings;
     std::vector<size_t> position_mapping;
     ExternalResultDescription description;
 };
 
 /// Like MySQLBlockInputStream, but allocates connection only when reading is starting.
 /// It allows to create a lot of stream objects without occupation of all connection pool.
-class MySQLLazyBlockInputStream final : public MySQLBlockInputStream
+/// Also makes attempts to reconnect in case of connection failures.
+class MySQLWithFailoverBlockInputStream final : public MySQLBlockInputStream
 {
 public:
-    MySQLLazyBlockInputStream(
-        mysqlxx::Pool & pool_,
+
+    MySQLWithFailoverBlockInputStream(
+        mysqlxx::PoolWithFailoverPtr pool_,
         const std::string & query_str_,
         const Block & sample_block_,
-        const UInt64 max_block_size_,
-        const bool auto_close_ = false,
-        const bool fetch_by_name_ = false);
+        const StreamSettings & settings_);
 
 private:
     void readPrefix() override;
 
-    mysqlxx::Pool & pool;
+    mysqlxx::PoolWithFailoverPtr pool;
     std::string query_str;
 };
 
diff --git a/src/Formats/ProtobufSerializer.cpp b/src/Formats/ProtobufSerializer.cpp
index 82149460773..3539628f98e 100644
--- a/src/Formats/ProtobufSerializer.cpp
+++ b/src/Formats/ProtobufSerializer.cpp
@@ -24,6 +24,8 @@
 #   include <DataTypes/DataTypeMap.h>
 #   include <DataTypes/DataTypeNullable.h>
 #   include <DataTypes/DataTypeTuple.h>
+#   include <DataTypes/Serializations/SerializationDecimal.h>
+#   include <DataTypes/Serializations/SerializationFixedString.h>
 #   include <Formats/ProtobufReader.h>
 #   include <Formats/ProtobufWriter.h>
 #   include <IO/ReadBufferFromString.h>
@@ -525,16 +527,16 @@ namespace
     {
     public:
         using ColumnType = std::conditional_t<is_fixed_string, ColumnFixedString, ColumnString>;
-        using StringDataType = std::conditional_t<is_fixed_string, DataTypeFixedString, DataTypeString>;
 
         ProtobufSerializerString(
-            const StringDataType & string_data_type_,
+            const std::shared_ptr<const DataTypeFixedString> & fixed_string_data_type_,
             const google::protobuf::FieldDescriptor & field_descriptor_,
             const ProtobufReaderOrWriter & reader_or_writer_)
             : ProtobufSerializerSingleValue(field_descriptor_, reader_or_writer_)
+            , fixed_string_data_type(fixed_string_data_type_)
+            , n(fixed_string_data_type->getN())
         {
             static_assert(is_fixed_string, "This constructor for FixedString only");
-            n = string_data_type_.getN();
             setFunctions();
             prepareEnumMapping();
         }
@@ -583,11 +585,11 @@ namespace
             {
                 if (row_num < old_size)
                 {
-                    ColumnFixedString::alignStringLength(text_buffer, n, 0);
+                    SerializationFixedString::alignStringLength(n, text_buffer, 0);
                     memcpy(data.data() + row_num * n, text_buffer.data(), n);
                 }
                 else
-                    ColumnFixedString::alignStringLength(data, n, old_data_size);
+                    SerializationFixedString::alignStringLength(n, data, old_data_size);
             }
             else
             {
@@ -817,7 +819,7 @@ namespace
                 auto str = default_function();
                 arr.insert(str.data(), str.data() + str.size());
                 if constexpr (is_fixed_string)
-                    ColumnFixedString::alignStringLength(arr, n, 0);
+                    SerializationFixedString::alignStringLength(n, arr, 0);
                 default_string = std::move(arr);
             }
             return *default_string;
@@ -865,7 +867,8 @@ namespace
             str.insert(name.data(), name.data() + name.length());
         }
 
-        size_t n = 0;
+        const std::shared_ptr<const DataTypeFixedString> fixed_string_data_type;
+        const size_t n = 0;
         std::function<void(const std::string_view &)> write_function;
         std::function<void(PaddedPODArray<UInt8> &)> read_function;
         std::function<String()> default_function;
@@ -1325,7 +1328,7 @@ namespace
             if constexpr (std::is_same_v<DecimalType, DateTime64>)
                 readDateTime64Text(decimal, scale, buf);
             else
-                DataTypeDecimal<DecimalType>::readText(decimal, buf, precision, scale);
+                SerializationDecimal<DecimalType>::readText(decimal, buf, precision, scale);
             return decimal;
         }
 
@@ -1485,6 +1488,8 @@ namespace
             ReadBufferFromString buf{str};
             time_t tm = 0;
             readDateTimeText(tm, buf);
+            if (tm < 0)
+                tm = 0;
             return tm;
         }
 
@@ -2765,7 +2770,7 @@ namespace
                 case TypeIndex::DateTime: return std::make_unique<ProtobufSerializerDateTime>(field_descriptor, reader_or_writer);
                 case TypeIndex::DateTime64: return std::make_unique<ProtobufSerializerDateTime64>(assert_cast<const DataTypeDateTime64 &>(*data_type), field_descriptor, reader_or_writer);
                 case TypeIndex::String: return std::make_unique<ProtobufSerializerString<false>>(field_descriptor, reader_or_writer);
-                case TypeIndex::FixedString: return std::make_unique<ProtobufSerializerString<true>>(assert_cast<const DataTypeFixedString &>(*data_type), field_descriptor, reader_or_writer);
+                case TypeIndex::FixedString: return std::make_unique<ProtobufSerializerString<true>>(typeid_cast<std::shared_ptr<const DataTypeFixedString>>(data_type), field_descriptor, reader_or_writer);
                 case TypeIndex::Enum8: return std::make_unique<ProtobufSerializerEnum<Int8>>(typeid_cast<std::shared_ptr<const DataTypeEnum8>>(data_type), field_descriptor, reader_or_writer);
                 case TypeIndex::Enum16: return std::make_unique<ProtobufSerializerEnum<Int16>>(typeid_cast<std::shared_ptr<const DataTypeEnum16>>(data_type), field_descriptor, reader_or_writer);
                 case TypeIndex::Decimal32: return std::make_unique<ProtobufSerializerDecimal<Decimal32>>(assert_cast<const DataTypeDecimal<Decimal32> &>(*data_type), field_descriptor, reader_or_writer);
@@ -2810,12 +2815,7 @@ namespace
                     const auto & array_data_type = assert_cast<const DataTypeArray &>(*data_type);
 
                     if (!allow_repeat)
-                    {
-                        throw Exception(
-                            "The field " + quoteString(field_descriptor.full_name())
-                                + " must be repeated in the protobuf schema to match the column " + backQuote(StringRef{column_name}),
-                            ErrorCodes::PROTOBUF_FIELD_NOT_REPEATED);
-                    }
+                        throwFieldNotRepeated(field_descriptor, column_name);
 
                     auto nested_serializer = buildFieldSerializer(column_name, array_data_type.getNestedType(), field_descriptor,
                                                                   /* allow_repeat = */ false); // We do our repeating now, so for nested type we forget about the repeating.
@@ -2860,12 +2860,7 @@ namespace
 
                     /// Serialize as a repeated field.
                     if (!allow_repeat && (size_of_tuple > 1))
-                    {
-                        throw Exception(
-                            "The field " + quoteString(field_descriptor.full_name())
-                                + " must be repeated in the protobuf schema to match the column " + backQuote(StringRef{column_name}),
-                            ErrorCodes::PROTOBUF_FIELD_NOT_REPEATED);
-                    }
+                        throwFieldNotRepeated(field_descriptor, column_name);
 
                     std::vector<std::unique_ptr<ProtobufSerializer>> nested_serializers;
                     for (const auto & nested_data_type : tuple_data_type.getElements())
@@ -2891,6 +2886,21 @@ namespace
             }
         }
 
+        [[noreturn]] static void throwFieldNotRepeated(const FieldDescriptor & field_descriptor, const std::string_view & column_name)
+        {
+            if (!field_descriptor.is_repeated())
+                throw Exception(
+                    "The field " + quoteString(field_descriptor.full_name())
+                        + " must be repeated in the protobuf schema to match the column " + backQuote(StringRef{column_name}),
+                    ErrorCodes::PROTOBUF_FIELD_NOT_REPEATED);
+
+            throw Exception(
+                "The field " + quoteString(field_descriptor.full_name())
+                    + " is repeated but the level of repeatedness is not enough to serialize a multidimensional array from the column "
+                    + backQuote(StringRef{column_name}) + ". It's recommended to make the parent field repeated as well.",
+                ErrorCodes::PROTOBUF_FIELD_NOT_REPEATED);
+        }
+
         const ProtobufReaderOrWriter reader_or_writer;
     };
 }
diff --git a/src/Formats/ya.make b/src/Formats/ya.make
index 8fe938be125..476e13f9a4f 100644
--- a/src/Formats/ya.make
+++ b/src/Formats/ya.make
@@ -13,8 +13,6 @@ PEERDIR(
 SRCS(
     FormatFactory.cpp
     FormatSchemaInfo.cpp
-    IRowInputStream.cpp
-    IRowOutputStream.cpp
     JSONEachRowUtils.cpp
     MySQLBlockInputStream.cpp
     NativeFormat.cpp
diff --git a/src/Functions/CMakeLists.txt b/src/Functions/CMakeLists.txt
index 1c3beb2e47d..7cbca175c0d 100644
--- a/src/Functions/CMakeLists.txt
+++ b/src/Functions/CMakeLists.txt
@@ -1,5 +1,7 @@
 configure_file(config_functions.h.in ${ConfigIncludePath}/config_functions.h)
 
+add_subdirectory(divide)
+
 include(${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake)
 add_headers_and_sources(clickhouse_functions .)
 
@@ -25,7 +27,7 @@ target_link_libraries(clickhouse_functions
     PRIVATE
         ${ZLIB_LIBRARIES}
         boost::filesystem
-        libdivide
+        divide_impl
 )
 
 if (OPENSSL_CRYPTO_LIBRARY)
diff --git a/src/Functions/CustomWeekTransforms.h b/src/Functions/CustomWeekTransforms.h
index afcbadc835c..28da546eb93 100644
--- a/src/Functions/CustomWeekTransforms.h
+++ b/src/Functions/CustomWeekTransforms.h
@@ -33,14 +33,21 @@ static inline UInt32 dateIsNotSupported(const char * name)
 /// This factor transformation will say that the function is monotone everywhere.
 struct ZeroTransform
 {
-    static inline UInt16 execute(UInt32, UInt8, const DateLUTImpl &) { return 0; }
     static inline UInt16 execute(UInt16, UInt8, const DateLUTImpl &) { return 0; }
+    static inline UInt16 execute(UInt32, UInt8, const DateLUTImpl &) { return 0; }
+    static inline UInt16 execute(Int64, UInt8, const DateLUTImpl &) { return 0; }
 };
 
 struct ToWeekImpl
 {
     static constexpr auto name = "toWeek";
 
+    static inline UInt8 execute(Int64 t, UInt8 week_mode, const DateLUTImpl & time_zone)
+    {
+        // TODO: ditch conversion to DayNum, since it doesn't support extended range.
+        YearWeek yw = time_zone.toYearWeek(time_zone.toDayNum(t), week_mode);
+        return yw.second;
+    }
     static inline UInt8 execute(UInt32 t, UInt8 week_mode, const DateLUTImpl & time_zone)
     {
         YearWeek yw = time_zone.toYearWeek(time_zone.toDayNum(t), week_mode);
@@ -59,6 +66,13 @@ struct ToYearWeekImpl
 {
     static constexpr auto name = "toYearWeek";
 
+    static inline UInt32 execute(Int64 t, UInt8 week_mode, const DateLUTImpl & time_zone)
+    {
+        // TODO: ditch toDayNum()
+        YearWeek yw = time_zone.toYearWeek(time_zone.toDayNum(t), week_mode | static_cast<UInt32>(WeekModeFlag::YEAR));
+        return yw.first * 100 + yw.second;
+    }
+
     static inline UInt32 execute(UInt32 t, UInt8 week_mode, const DateLUTImpl & time_zone)
     {
         YearWeek yw = time_zone.toYearWeek(time_zone.toDayNum(t), week_mode | static_cast<UInt32>(WeekModeFlag::YEAR));
@@ -77,13 +91,19 @@ struct ToStartOfWeekImpl
 {
     static constexpr auto name = "toStartOfWeek";
 
+    static inline UInt16 execute(Int64 t, UInt8 week_mode, const DateLUTImpl & time_zone)
+    {
+        return time_zone.toFirstDayNumOfWeek(time_zone.toDayNum(t), week_mode);
+//        return time_zone.toFirstDayNumOfWeek(t, week_mode);
+    }
     static inline UInt16 execute(UInt32 t, UInt8 week_mode, const DateLUTImpl & time_zone)
     {
         return time_zone.toFirstDayNumOfWeek(time_zone.toDayNum(t), week_mode);
+//        return time_zone.toFirstDayNumOfWeek(t, week_mode);
     }
     static inline UInt16 execute(UInt16 d, UInt8 week_mode, const DateLUTImpl & time_zone)
     {
-        return time_zone.toFirstDayNumOfWeek(DayNum(d), week_mode);
+        return time_zone.toFirstDayNumOfWeek(ExtendedDayNum(d), week_mode);
     }
 
     using FactorTransform = ZeroTransform;
diff --git a/src/Functions/DateTimeTransforms.h b/src/Functions/DateTimeTransforms.h
index 333b397312d..c299b9c4169 100644
--- a/src/Functions/DateTimeTransforms.h
+++ b/src/Functions/DateTimeTransforms.h
@@ -3,6 +3,7 @@
 #include <Core/DecimalFunctions.h>
 #include <Common/Exception.h>
 #include <common/DateLUTImpl.h>
+//#include <common/TimeZone.h>
 #include <Columns/ColumnVector.h>
 #include <Columns/ColumnDecimal.h>
 #include <Functions/FunctionHelpers.h>
@@ -33,14 +34,15 @@ namespace ErrorCodes
   *  factor-transformation F is "round to the nearest month" (2015-02-03 -> 2015-02-01).
   */
 
-static inline UInt32 dateIsNotSupported(const char * name)
-{
-    throw Exception("Illegal type Date of argument for function " + std::string(name), ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
-}
+    static inline UInt32 dateIsNotSupported(const char * name)
+    {
+        throw Exception("Illegal type Date of argument for function " + std::string(name), ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+    }
 
 /// This factor transformation will say that the function is monotone everywhere.
 struct ZeroTransform
 {
+    static inline UInt16 execute(Int64, const DateLUTImpl &) { return 0; }
     static inline UInt16 execute(UInt32, const DateLUTImpl &) { return 0; }
     static inline UInt16 execute(UInt16, const DateLUTImpl &) { return 0; }
 };
@@ -49,6 +51,10 @@ struct ToDateImpl
 {
     static constexpr auto name = "toDate";
 
+    static inline UInt16 execute(Int64 t, const DateLUTImpl & time_zone)
+    {
+        return UInt16(time_zone.toDayNum(t));
+    }
     static inline UInt16 execute(UInt32 t, const DateLUTImpl & time_zone)
     {
         return UInt16(time_zone.toDayNum(t));
@@ -65,13 +71,18 @@ struct ToStartOfDayImpl
 {
     static constexpr auto name = "toStartOfDay";
 
+    //TODO: right now it is hardcoded to produce DateTime only, needs fixing later. See date_and_time_type_details::ResultDataTypeMap for deduction of result type example.
+    static inline UInt32 execute(const DecimalUtils::DecimalComponents<DateTime64> & t, const DateLUTImpl & time_zone)
+    {
+        return time_zone.toDate(static_cast<time_t>(t.whole));
+    }
     static inline UInt32 execute(UInt32 t, const DateLUTImpl & time_zone)
     {
         return time_zone.toDate(t);
     }
     static inline UInt32 execute(UInt16 d, const DateLUTImpl & time_zone)
     {
-        return time_zone.toDate(DayNum(d));
+        return time_zone.toDate(ExtendedDayNum(d));
     }
 
     using FactorTransform = ZeroTransform;
@@ -81,13 +92,19 @@ struct ToMondayImpl
 {
     static constexpr auto name = "toMonday";
 
+    static inline UInt16 execute(Int64 t, const DateLUTImpl & time_zone)
+    {
+        //return time_zone.toFirstDayNumOfWeek(time_zone.toDayNum(t));
+        return time_zone.toFirstDayNumOfWeek(t);
+    }
     static inline UInt16 execute(UInt32 t, const DateLUTImpl & time_zone)
     {
-        return time_zone.toFirstDayNumOfWeek(time_zone.toDayNum(t));
+        //return time_zone.toFirstDayNumOfWeek(time_zone.toDayNum(t));
+        return time_zone.toFirstDayNumOfWeek(t);
     }
     static inline UInt16 execute(UInt16 d, const DateLUTImpl & time_zone)
     {
-        return time_zone.toFirstDayNumOfWeek(DayNum(d));
+        return time_zone.toFirstDayNumOfWeek(ExtendedDayNum(d));
     }
 
     using FactorTransform = ZeroTransform;
@@ -97,13 +114,17 @@ struct ToStartOfMonthImpl
 {
     static constexpr auto name = "toStartOfMonth";
 
+    static inline UInt16 execute(Int64 t, const DateLUTImpl & time_zone)
+    {
+        return time_zone.toFirstDayNumOfMonth(time_zone.toDayNum(t));
+    }
     static inline UInt16 execute(UInt32 t, const DateLUTImpl & time_zone)
     {
         return time_zone.toFirstDayNumOfMonth(time_zone.toDayNum(t));
     }
     static inline UInt16 execute(UInt16 d, const DateLUTImpl & time_zone)
     {
-        return time_zone.toFirstDayNumOfMonth(DayNum(d));
+        return time_zone.toFirstDayNumOfMonth(ExtendedDayNum(d));
     }
 
     using FactorTransform = ZeroTransform;
@@ -113,13 +134,17 @@ struct ToStartOfQuarterImpl
 {
     static constexpr auto name = "toStartOfQuarter";
 
+    static inline UInt16 execute(Int64 t, const DateLUTImpl & time_zone)
+    {
+        return time_zone.toFirstDayNumOfQuarter(time_zone.toDayNum(t));
+    }
     static inline UInt16 execute(UInt32 t, const DateLUTImpl & time_zone)
     {
         return time_zone.toFirstDayNumOfQuarter(time_zone.toDayNum(t));
     }
     static inline UInt16 execute(UInt16 d, const DateLUTImpl & time_zone)
     {
-        return time_zone.toFirstDayNumOfQuarter(DayNum(d));
+        return time_zone.toFirstDayNumOfQuarter(ExtendedDayNum(d));
     }
 
     using FactorTransform = ZeroTransform;
@@ -129,13 +154,17 @@ struct ToStartOfYearImpl
 {
     static constexpr auto name = "toStartOfYear";
 
+    static inline UInt16 execute(Int64 t, const DateLUTImpl & time_zone)
+    {
+        return time_zone.toFirstDayNumOfYear(time_zone.toDayNum(t));
+    }
     static inline UInt16 execute(UInt32 t, const DateLUTImpl & time_zone)
     {
         return time_zone.toFirstDayNumOfYear(time_zone.toDayNum(t));
     }
     static inline UInt16 execute(UInt16 d, const DateLUTImpl & time_zone)
     {
-        return time_zone.toFirstDayNumOfYear(DayNum(d));
+        return time_zone.toFirstDayNumOfYear(ExtendedDayNum(d));
     }
 
     using FactorTransform = ZeroTransform;
@@ -144,9 +173,13 @@ struct ToStartOfYearImpl
 
 struct ToTimeImpl
 {
+    /// When transforming to time, the date will be equated to 1970-01-01.
     static constexpr auto name = "toTime";
 
-    /// When transforming to time, the date will be equated to 1970-01-02.
+    static UInt32 execute(const DecimalUtils::DecimalComponents<DateTime64> & t, const DateLUTImpl & time_zone)
+    {
+        return time_zone.toTime(t.whole) + 86400;
+    }
     static inline UInt32 execute(UInt32 t, const DateLUTImpl & time_zone)
     {
         return time_zone.toTime(t) + 86400;
@@ -164,6 +197,10 @@ struct ToStartOfMinuteImpl
 {
     static constexpr auto name = "toStartOfMinute";
 
+    static inline UInt32 execute(const DecimalUtils::DecimalComponents<DateTime64> & t, const DateLUTImpl & time_zone)
+    {
+        return time_zone.toStartOfMinute(t.whole);
+    }
     static inline UInt32 execute(UInt32 t, const DateLUTImpl & time_zone)
     {
         return time_zone.toStartOfMinute(t);
@@ -215,6 +252,10 @@ struct ToStartOfFiveMinuteImpl
 {
     static constexpr auto name = "toStartOfFiveMinute";
 
+    static inline UInt32 execute(const DecimalUtils::DecimalComponents<DateTime64> & t, const DateLUTImpl & time_zone)
+    {
+        return time_zone.toStartOfFiveMinute(t.whole);
+    }
     static inline UInt32 execute(UInt32 t, const DateLUTImpl & time_zone)
     {
         return time_zone.toStartOfFiveMinute(t);
@@ -231,6 +272,10 @@ struct ToStartOfTenMinutesImpl
 {
     static constexpr auto name = "toStartOfTenMinutes";
 
+    static inline UInt32 execute(const DecimalUtils::DecimalComponents<DateTime64> & t, const DateLUTImpl & time_zone)
+    {
+        return time_zone.toStartOfTenMinutes(t.whole);
+    }
     static inline UInt32 execute(UInt32 t, const DateLUTImpl & time_zone)
     {
         return time_zone.toStartOfTenMinutes(t);
@@ -247,6 +292,10 @@ struct ToStartOfFifteenMinutesImpl
 {
     static constexpr auto name = "toStartOfFifteenMinutes";
 
+    static inline UInt32 execute(const DecimalUtils::DecimalComponents<DateTime64> & t, const DateLUTImpl & time_zone)
+    {
+        return time_zone.toStartOfFifteenMinutes(t.whole);
+    }
     static inline UInt32 execute(UInt32 t, const DateLUTImpl & time_zone)
     {
         return time_zone.toStartOfFifteenMinutes(t);
@@ -264,6 +313,12 @@ struct TimeSlotImpl
 {
     static constexpr auto name = "timeSlot";
 
+    //static inline DecimalUtils::DecimalComponents<DateTime64> execute(const DecimalUtils::DecimalComponents<DateTime64> & t, const DateLUTImpl &)
+    static inline UInt32 execute(const DecimalUtils::DecimalComponents<DateTime64> & t, const DateLUTImpl &)
+    {
+        return t.whole / 1800 * 1800;
+    }
+
     static inline UInt32 execute(UInt32 t, const DateLUTImpl &)
     {
         return t / 1800 * 1800;
@@ -281,6 +336,11 @@ struct ToStartOfHourImpl
 {
     static constexpr auto name = "toStartOfHour";
 
+    static inline UInt32 execute(const DecimalUtils::DecimalComponents<DateTime64> & t, const DateLUTImpl & time_zone)
+    {
+        return time_zone.toStartOfHour(t.whole);
+    }
+
     static inline UInt32 execute(UInt32 t, const DateLUTImpl & time_zone)
     {
         return time_zone.toStartOfHour(t);
@@ -298,13 +358,17 @@ struct ToYearImpl
 {
     static constexpr auto name = "toYear";
 
+    static inline UInt16 execute(Int64 t, const DateLUTImpl & time_zone)
+    {
+        return time_zone.toYear(t);
+    }
     static inline UInt16 execute(UInt32 t, const DateLUTImpl & time_zone)
     {
         return time_zone.toYear(t);
     }
     static inline UInt16 execute(UInt16 d, const DateLUTImpl & time_zone)
     {
-        return time_zone.toYear(DayNum(d));
+        return time_zone.toYear(ExtendedDayNum(d));
     }
 
     using FactorTransform = ZeroTransform;
@@ -314,13 +378,17 @@ struct ToQuarterImpl
 {
     static constexpr auto name = "toQuarter";
 
+    static inline UInt8 execute(Int64 t, const DateLUTImpl & time_zone)
+    {
+        return time_zone.toQuarter(t);
+    }
     static inline UInt8 execute(UInt32 t, const DateLUTImpl & time_zone)
     {
         return time_zone.toQuarter(t);
     }
     static inline UInt8 execute(UInt16 d, const DateLUTImpl & time_zone)
     {
-        return time_zone.toQuarter(DayNum(d));
+        return time_zone.toQuarter(ExtendedDayNum(d));
     }
 
     using FactorTransform = ToStartOfYearImpl;
@@ -330,13 +398,17 @@ struct ToMonthImpl
 {
     static constexpr auto name = "toMonth";
 
+    static inline UInt8 execute(Int64 t, const DateLUTImpl & time_zone)
+    {
+        return time_zone.toMonth(t);
+    }
     static inline UInt8 execute(UInt32 t, const DateLUTImpl & time_zone)
     {
         return time_zone.toMonth(t);
     }
     static inline UInt8 execute(UInt16 d, const DateLUTImpl & time_zone)
     {
-        return time_zone.toMonth(DayNum(d));
+        return time_zone.toMonth(ExtendedDayNum(d));
     }
 
     using FactorTransform = ToStartOfYearImpl;
@@ -346,13 +418,17 @@ struct ToDayOfMonthImpl
 {
     static constexpr auto name = "toDayOfMonth";
 
+    static inline UInt8 execute(Int64 t, const DateLUTImpl & time_zone)
+    {
+        return time_zone.toDayOfMonth(t);
+    }
     static inline UInt8 execute(UInt32 t, const DateLUTImpl & time_zone)
     {
         return time_zone.toDayOfMonth(t);
     }
     static inline UInt8 execute(UInt16 d, const DateLUTImpl & time_zone)
     {
-        return time_zone.toDayOfMonth(DayNum(d));
+        return time_zone.toDayOfMonth(ExtendedDayNum(d));
     }
 
     using FactorTransform = ToStartOfMonthImpl;
@@ -362,13 +438,17 @@ struct ToDayOfWeekImpl
 {
     static constexpr auto name = "toDayOfWeek";
 
+    static inline UInt8 execute(Int64 t, const DateLUTImpl & time_zone)
+    {
+        return time_zone.toDayOfWeek(t);
+    }
     static inline UInt8 execute(UInt32 t, const DateLUTImpl & time_zone)
     {
         return time_zone.toDayOfWeek(t);
     }
     static inline UInt8 execute(UInt16 d, const DateLUTImpl & time_zone)
     {
-        return time_zone.toDayOfWeek(DayNum(d));
+        return time_zone.toDayOfWeek(ExtendedDayNum(d));
     }
 
     using FactorTransform = ToMondayImpl;
@@ -378,13 +458,17 @@ struct ToDayOfYearImpl
 {
     static constexpr auto name = "toDayOfYear";
 
+    static inline UInt16 execute(Int64 t, const DateLUTImpl & time_zone)
+    {
+        return time_zone.toDayOfYear(t);
+    }
     static inline UInt16 execute(UInt32 t, const DateLUTImpl & time_zone)
     {
         return time_zone.toDayOfYear(t);
     }
     static inline UInt16 execute(UInt16 d, const DateLUTImpl & time_zone)
     {
-        return time_zone.toDayOfYear(DayNum(d));
+        return time_zone.toDayOfYear(ExtendedDayNum(d));
     }
 
     using FactorTransform = ToStartOfYearImpl;
@@ -394,6 +478,10 @@ struct ToHourImpl
 {
     static constexpr auto name = "toHour";
 
+    static inline UInt8 execute(Int64 t, const DateLUTImpl & time_zone)
+    {
+        return time_zone.toHour(t);
+    }
     static inline UInt8 execute(UInt32 t, const DateLUTImpl & time_zone)
     {
         return time_zone.toHour(t);
@@ -411,6 +499,11 @@ struct TimezoneOffsetImpl
 {
     static constexpr auto name = "timezoneOffset";
 
+    static inline time_t execute(Int64 t, const DateLUTImpl & time_zone)
+    {
+        return time_zone.timezoneOffset(t);
+    }
+
     static inline time_t execute(UInt32 t, const DateLUTImpl & time_zone)
     {
         return time_zone.timezoneOffset(t);
@@ -428,6 +521,10 @@ struct ToMinuteImpl
 {
     static constexpr auto name = "toMinute";
 
+    static inline UInt8 execute(Int64 t, const DateLUTImpl & time_zone)
+    {
+        return time_zone.toMinute(t);
+    }
     static inline UInt8 execute(UInt32 t, const DateLUTImpl & time_zone)
     {
         return time_zone.toMinute(t);
@@ -444,6 +541,10 @@ struct ToSecondImpl
 {
     static constexpr auto name = "toSecond";
 
+    static inline UInt8 execute(Int64 t, const DateLUTImpl & time_zone)
+    {
+        return time_zone.toSecond(t);
+    }
     static inline UInt8 execute(UInt32 t, const DateLUTImpl & time_zone)
     {
         return time_zone.toSecond(t);
@@ -460,13 +561,17 @@ struct ToISOYearImpl
 {
     static constexpr auto name = "toISOYear";
 
+    static inline UInt16 execute(Int64 t, const DateLUTImpl & time_zone)
+    {
+        return time_zone.toISOYear(time_zone.toDayNum(t));
+    }
     static inline UInt16 execute(UInt32 t, const DateLUTImpl & time_zone)
     {
         return time_zone.toISOYear(time_zone.toDayNum(t));
     }
     static inline UInt16 execute(UInt16 d, const DateLUTImpl & time_zone)
     {
-        return time_zone.toISOYear(DayNum(d));
+        return time_zone.toISOYear(ExtendedDayNum(d));
     }
 
     using FactorTransform = ZeroTransform;
@@ -476,13 +581,17 @@ struct ToStartOfISOYearImpl
 {
     static constexpr auto name = "toStartOfISOYear";
 
+    static inline UInt16 execute(Int64 t, const DateLUTImpl & time_zone)
+    {
+        return time_zone.toFirstDayNumOfISOYear(time_zone.toDayNum(t));
+    }
     static inline UInt16 execute(UInt32 t, const DateLUTImpl & time_zone)
     {
         return time_zone.toFirstDayNumOfISOYear(time_zone.toDayNum(t));
     }
     static inline UInt16 execute(UInt16 d, const DateLUTImpl & time_zone)
     {
-        return time_zone.toFirstDayNumOfISOYear(DayNum(d));
+        return time_zone.toFirstDayNumOfISOYear(ExtendedDayNum(d));
     }
 
     using FactorTransform = ZeroTransform;
@@ -492,13 +601,17 @@ struct ToISOWeekImpl
 {
     static constexpr auto name = "toISOWeek";
 
+    static inline UInt8 execute(Int64 t, const DateLUTImpl & time_zone)
+    {
+        return time_zone.toISOWeek(time_zone.toDayNum(t));
+    }
     static inline UInt8 execute(UInt32 t, const DateLUTImpl & time_zone)
     {
         return time_zone.toISOWeek(time_zone.toDayNum(t));
     }
     static inline UInt8 execute(UInt16 d, const DateLUTImpl & time_zone)
     {
-        return time_zone.toISOWeek(DayNum(d));
+        return time_zone.toISOWeek(ExtendedDayNum(d));
     }
 
     using FactorTransform = ToISOYearImpl;
@@ -508,13 +621,17 @@ struct ToRelativeYearNumImpl
 {
     static constexpr auto name = "toRelativeYearNum";
 
-    static inline UInt16 execute(UInt32 t, const DateLUTImpl & time_zone)
+    static inline UInt16 execute(Int64 t, const DateLUTImpl & time_zone)
     {
         return time_zone.toYear(t);
     }
+    static inline UInt16 execute(UInt32 t, const DateLUTImpl & time_zone)
+    {
+        return time_zone.toYear(static_cast<time_t>(t));
+    }
     static inline UInt16 execute(UInt16 d, const DateLUTImpl & time_zone)
     {
-        return time_zone.toYear(DayNum(d));
+        return time_zone.toYear(ExtendedDayNum(d));
     }
 
     using FactorTransform = ZeroTransform;
@@ -524,13 +641,17 @@ struct ToRelativeQuarterNumImpl
 {
     static constexpr auto name = "toRelativeQuarterNum";
 
-    static inline UInt16 execute(UInt32 t, const DateLUTImpl & time_zone)
+    static inline UInt16 execute(Int64 t, const DateLUTImpl & time_zone)
     {
         return time_zone.toRelativeQuarterNum(t);
     }
+    static inline UInt16 execute(UInt32 t, const DateLUTImpl & time_zone)
+    {
+        return time_zone.toRelativeQuarterNum(static_cast<time_t>(t));
+    }
     static inline UInt16 execute(UInt16 d, const DateLUTImpl & time_zone)
     {
-        return time_zone.toRelativeQuarterNum(DayNum(d));
+        return time_zone.toRelativeQuarterNum(ExtendedDayNum(d));
     }
 
     using FactorTransform = ZeroTransform;
@@ -540,13 +661,17 @@ struct ToRelativeMonthNumImpl
 {
     static constexpr auto name = "toRelativeMonthNum";
 
-    static inline UInt16 execute(UInt32 t, const DateLUTImpl & time_zone)
+    static inline UInt16 execute(Int64 t, const DateLUTImpl & time_zone)
     {
         return time_zone.toRelativeMonthNum(t);
     }
+    static inline UInt16 execute(UInt32 t, const DateLUTImpl & time_zone)
+    {
+        return time_zone.toRelativeMonthNum(static_cast<time_t>(t));
+    }
     static inline UInt16 execute(UInt16 d, const DateLUTImpl & time_zone)
     {
-        return time_zone.toRelativeMonthNum(DayNum(d));
+        return time_zone.toRelativeMonthNum(ExtendedDayNum(d));
     }
 
     using FactorTransform = ZeroTransform;
@@ -556,13 +681,17 @@ struct ToRelativeWeekNumImpl
 {
     static constexpr auto name = "toRelativeWeekNum";
 
-    static inline UInt16 execute(UInt32 t, const DateLUTImpl & time_zone)
+    static inline UInt16 execute(Int64 t, const DateLUTImpl & time_zone)
     {
         return time_zone.toRelativeWeekNum(t);
     }
+    static inline UInt16 execute(UInt32 t, const DateLUTImpl & time_zone)
+    {
+        return time_zone.toRelativeWeekNum(static_cast<time_t>(t));
+    }
     static inline UInt16 execute(UInt16 d, const DateLUTImpl & time_zone)
     {
-        return time_zone.toRelativeWeekNum(DayNum(d));
+        return time_zone.toRelativeWeekNum(ExtendedDayNum(d));
     }
 
     using FactorTransform = ZeroTransform;
@@ -572,10 +701,14 @@ struct ToRelativeDayNumImpl
 {
     static constexpr auto name = "toRelativeDayNum";
 
-    static inline UInt16 execute(UInt32 t, const DateLUTImpl & time_zone)
+    static inline UInt16 execute(Int64 t, const DateLUTImpl & time_zone)
     {
         return time_zone.toDayNum(t);
     }
+    static inline UInt16 execute(UInt32 t, const DateLUTImpl & time_zone)
+    {
+        return time_zone.toDayNum(static_cast<time_t>(t));
+    }
     static inline UInt16 execute(UInt16 d, const DateLUTImpl &)
     {
         return static_cast<DayNum>(d);
@@ -589,13 +722,17 @@ struct ToRelativeHourNumImpl
 {
     static constexpr auto name = "toRelativeHourNum";
 
-    static inline UInt32 execute(UInt32 t, const DateLUTImpl & time_zone)
+    static inline UInt32 execute(Int64 t, const DateLUTImpl & time_zone)
     {
         return time_zone.toRelativeHourNum(t);
     }
+    static inline UInt32 execute(UInt32 t, const DateLUTImpl & time_zone)
+    {
+        return time_zone.toRelativeHourNum(static_cast<time_t>(t));
+    }
     static inline UInt32 execute(UInt16 d, const DateLUTImpl & time_zone)
     {
-        return time_zone.toRelativeHourNum(DayNum(d));
+        return time_zone.toRelativeHourNum(ExtendedDayNum(d));
     }
 
     using FactorTransform = ZeroTransform;
@@ -605,13 +742,17 @@ struct ToRelativeMinuteNumImpl
 {
     static constexpr auto name = "toRelativeMinuteNum";
 
-    static inline UInt32 execute(UInt32 t, const DateLUTImpl & time_zone)
+    static inline UInt32 execute(Int64 t, const DateLUTImpl & time_zone)
     {
         return time_zone.toRelativeMinuteNum(t);
     }
+    static inline UInt32 execute(UInt32 t, const DateLUTImpl & time_zone)
+    {
+        return time_zone.toRelativeMinuteNum(static_cast<time_t>(t));
+    }
     static inline UInt32 execute(UInt16 d, const DateLUTImpl & time_zone)
     {
-        return time_zone.toRelativeMinuteNum(DayNum(d));
+        return time_zone.toRelativeMinuteNum(ExtendedDayNum(d));
     }
 
     using FactorTransform = ZeroTransform;
@@ -621,13 +762,17 @@ struct ToRelativeSecondNumImpl
 {
     static constexpr auto name = "toRelativeSecondNum";
 
+    static inline Int64 execute(Int64 t, const DateLUTImpl &)
+    {
+        return t;
+    }
     static inline UInt32 execute(UInt32 t, const DateLUTImpl &)
     {
         return t;
     }
     static inline UInt32 execute(UInt16 d, const DateLUTImpl & time_zone)
     {
-        return time_zone.fromDayNum(DayNum(d));
+        return time_zone.fromDayNum(ExtendedDayNum(d));
     }
 
     using FactorTransform = ZeroTransform;
@@ -637,6 +782,10 @@ struct ToYYYYMMImpl
 {
     static constexpr auto name = "toYYYYMM";
 
+    static inline UInt32 execute(Int64 t, const DateLUTImpl & time_zone)
+    {
+        return time_zone.toNumYYYYMM(t);
+    }
     static inline UInt32 execute(UInt32 t, const DateLUTImpl & time_zone)
     {
         return time_zone.toNumYYYYMM(t);
@@ -653,6 +802,10 @@ struct ToYYYYMMDDImpl
 {
     static constexpr auto name = "toYYYYMMDD";
 
+    static inline UInt32 execute(Int64 t, const DateLUTImpl & time_zone)
+    {
+        return time_zone.toNumYYYYMMDD(t);
+    }
     static inline UInt32 execute(UInt32 t, const DateLUTImpl & time_zone)
     {
         return time_zone.toNumYYYYMMDD(t);
@@ -669,6 +822,10 @@ struct ToYYYYMMDDhhmmssImpl
 {
     static constexpr auto name = "toYYYYMMDDhhmmss";
 
+    static inline UInt64 execute(Int64 t, const DateLUTImpl & time_zone)
+    {
+        return time_zone.toNumYYYYMMDDhhmmss(t);
+    }
     static inline UInt64 execute(UInt32 t, const DateLUTImpl & time_zone)
     {
         return time_zone.toNumYYYYMMDDhhmmss(t);
diff --git a/src/Functions/DivisionUtils.h b/src/Functions/DivisionUtils.h
index 2b4c07b1cff..174ea7ee797 100644
--- a/src/Functions/DivisionUtils.h
+++ b/src/Functions/DivisionUtils.h
@@ -105,7 +105,7 @@ struct DivideIntegralImpl
             auto res = checkedDivision(CastA(a), CastB(b));
 
             if constexpr (std::is_floating_point_v<decltype(res)>)
-                if (isNaN(res) || res >= std::numeric_limits<Result>::max() || res <= std::numeric_limits<Result>::lowest())
+                if (isNaN(res) || res >= static_cast<double>(std::numeric_limits<Result>::max()) || res <= std::numeric_limits<Result>::lowest())
                     throw Exception("Cannot perform integer division, because it will produce infinite or too large number",
                         ErrorCodes::ILLEGAL_DIVISION);
 
diff --git a/src/Functions/FunctionBase64Conversion.h b/src/Functions/FunctionBase64Conversion.h
index 4887e9fe8cc..d060b86c54b 100644
--- a/src/Functions/FunctionBase64Conversion.h
+++ b/src/Functions/FunctionBase64Conversion.h
@@ -61,7 +61,7 @@ class FunctionBase64Conversion : public IFunction
 public:
     static constexpr auto name = Func::name;
 
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextPtr)
     {
         return std::make_shared<FunctionBase64Conversion>();
     }
diff --git a/src/Functions/FunctionBinaryArithmetic.h b/src/Functions/FunctionBinaryArithmetic.h
index bb85ae32622..ef9d05b4b5e 100644
--- a/src/Functions/FunctionBinaryArithmetic.h
+++ b/src/Functions/FunctionBinaryArithmetic.h
@@ -512,7 +512,7 @@ class FunctionBinaryArithmetic : public IFunction
     static constexpr const bool is_multiply = IsOperation<Op>::multiply;
     static constexpr const bool is_division = IsOperation<Op>::division;
 
-    const Context & context;
+    ContextPtr context;
     bool check_decimal_overflow = true;
 
     template <typename F>
@@ -593,7 +593,7 @@ class FunctionBinaryArithmetic : public IFunction
     }
 
     static FunctionOverloadResolverPtr
-    getFunctionForIntervalArithmetic(const DataTypePtr & type0, const DataTypePtr & type1, const Context & context)
+    getFunctionForIntervalArithmetic(const DataTypePtr & type0, const DataTypePtr & type1, ContextPtr context)
     {
         bool first_is_date_or_datetime = isDateOrDateTime(type0);
         bool second_is_date_or_datetime = isDateOrDateTime(type1);
@@ -939,9 +939,9 @@ class FunctionBinaryArithmetic : public IFunction
 
 public:
     static constexpr auto name = Name::name;
-    static FunctionPtr create(const Context & context) { return std::make_shared<FunctionBinaryArithmetic>(context); }
+    static FunctionPtr create(ContextPtr context) { return std::make_shared<FunctionBinaryArithmetic>(context); }
 
-    explicit FunctionBinaryArithmetic(const Context & context_)
+    explicit FunctionBinaryArithmetic(ContextPtr context_)
     :   context(context_),
         check_decimal_overflow(decimalCheckArithmeticOverflow(context))
     {}
@@ -955,7 +955,7 @@ public:
         return getReturnTypeImplStatic(arguments, context);
     }
 
-    static DataTypePtr getReturnTypeImplStatic(const DataTypes & arguments, const Context & context)
+    static DataTypePtr getReturnTypeImplStatic(const DataTypes & arguments, ContextPtr context)
     {
         /// Special case when multiply aggregate function state
         if (isAggregateMultiply(arguments[0], arguments[1]))
@@ -1367,7 +1367,7 @@ public:
         const ColumnWithTypeAndName & left_,
         const ColumnWithTypeAndName & right_,
         const DataTypePtr & return_type_,
-        const Context & context)
+        ContextPtr context)
     {
         return std::make_shared<FunctionBinaryArithmeticWithConstants>(left_, right_, return_type_, context);
     }
@@ -1376,7 +1376,7 @@ public:
         const ColumnWithTypeAndName & left_,
         const ColumnWithTypeAndName & right_,
         const DataTypePtr & return_type_,
-        const Context & context_)
+        ContextPtr context_)
         : Base(context_), left(left_), right(right_), return_type(return_type_)
     {
     }
@@ -1530,12 +1530,12 @@ class BinaryArithmeticOverloadResolver : public IFunctionOverloadResolverImpl
 {
 public:
     static constexpr auto name = Name::name;
-    static FunctionOverloadResolverImplPtr create(const Context & context)
+    static FunctionOverloadResolverImplPtr create(ContextPtr context)
     {
         return std::make_unique<BinaryArithmeticOverloadResolver>(context);
     }
 
-    explicit BinaryArithmeticOverloadResolver(const Context & context_) : context(context_) {}
+    explicit BinaryArithmeticOverloadResolver(ContextPtr context_) : context(context_) {}
 
     String getName() const override { return name; }
     size_t getNumberOfArguments() const override { return 2; }
@@ -1571,6 +1571,6 @@ public:
     }
 
 private:
-    const Context & context;
+    ContextPtr context;
 };
 }
diff --git a/src/Functions/FunctionBitTestMany.h b/src/Functions/FunctionBitTestMany.h
index 6d527c66390..a2be56c42b0 100644
--- a/src/Functions/FunctionBitTestMany.h
+++ b/src/Functions/FunctionBitTestMany.h
@@ -24,7 +24,7 @@ struct FunctionBitTestMany : public IFunction
 {
 public:
     static constexpr auto name = Name::name;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionBitTestMany>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionBitTestMany>(); }
 
     String getName() const override { return name; }
 
diff --git a/src/Functions/FunctionCustomWeekToSomething.h b/src/Functions/FunctionCustomWeekToSomething.h
index 8a343cffb95..c6f56fdc50a 100644
--- a/src/Functions/FunctionCustomWeekToSomething.h
+++ b/src/Functions/FunctionCustomWeekToSomething.h
@@ -4,7 +4,7 @@
 #include <DataTypes/DataTypeDateTime64.h>
 #include <Functions/CustomWeekTransforms.h>
 #include <Functions/IFunctionImpl.h>
-#include <Functions/extractTimeZoneFromFunctionArguments.h>
+#include <Functions/TransformDateTime64.h>
 #include <IO/WriteHelpers.h>
 
 
@@ -23,7 +23,7 @@ class FunctionCustomWeekToSomething : public IFunction
 {
 public:
     static constexpr auto name = Transform::name;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionCustomWeekToSomething>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionCustomWeekToSomething>(); }
 
     String getName() const override { return name; }
 
diff --git a/src/Functions/FunctionDateOrDateTimeAddInterval.h b/src/Functions/FunctionDateOrDateTimeAddInterval.h
index 5f964b899b4..8a9d454028c 100644
--- a/src/Functions/FunctionDateOrDateTimeAddInterval.h
+++ b/src/Functions/FunctionDateOrDateTimeAddInterval.h
@@ -11,6 +11,7 @@
 #include <Functions/FunctionHelpers.h>
 #include <Functions/castTypeToEither.h>
 #include <Functions/extractTimeZoneFromFunctionArguments.h>
+#include <Functions/TransformDateTime64.h>
 
 #include <IO/WriteHelpers.h>
 
@@ -25,31 +26,6 @@ namespace ErrorCodes
     extern const int ILLEGAL_COLUMN;
 }
 
-/// AddOnDateTime64DefaultImpl provides default implementation of add-X functionality for DateTime64.
-///
-/// Default implementation is not to change fractional part, but only modify whole part as if it was DateTime.
-/// That means large whole values (for scale less than 9) might not fit into UInt32-range,
-/// and hence default implementation will produce incorrect results.
-template <typename T>
-struct AddOnDateTime64DefaultImpl
-{
-    AddOnDateTime64DefaultImpl(UInt32 scale_ = 0)
-        : scale_multiplier(DecimalUtils::scaleMultiplier<DateTime64::NativeType>(scale_))
-    {}
-
-    // Default implementation for add/sub on DateTime64: do math on whole part (the same way as for DateTime), leave fractional as it is.
-    inline DateTime64 execute(const DateTime64 & t, Int64 delta, const DateLUTImpl & time_zone) const
-    {
-        const auto components = DecimalUtils::splitWithScaleMultiplier(t, scale_multiplier);
-
-        const auto whole = static_cast<const T *>(this)->execute(static_cast<UInt32>(components.whole), delta, time_zone);
-        return DecimalUtils::decimalFromComponentsWithMultiplier<DateTime64>(static_cast<DateTime64::NativeType>(whole), components.fractional, scale_multiplier);
-    }
-
-    UInt32 scale_multiplier = 1;
-};
-
-
 /// Type of first argument of 'execute' function overload defines what INPUT DataType it is used for.
 /// Return type defines what is the OUTPUT (return) type of the CH function.
 /// Corresponding types:
@@ -60,14 +36,16 @@ struct AddOnDateTime64DefaultImpl
 ///  - 'AddSecondsImpl::execute(UInt32, ...) -> UInt32' is available to the ClickHouse users as 'addSeconds(DateTime, ...) -> DateTime'
 ///  - 'AddSecondsImpl::execute(UInt16, ...) -> UInt32' is available to the ClickHouse users as 'addSeconds(Date, ...) -> DateTime'
 
-struct AddSecondsImpl : public AddOnDateTime64DefaultImpl<AddSecondsImpl>
+struct AddSecondsImpl
 {
-    using Base = AddOnDateTime64DefaultImpl<AddSecondsImpl>;
-    using Base::Base;
-    using Base::execute;
-
     static constexpr auto name = "addSeconds";
 
+    static inline NO_SANITIZE_UNDEFINED DecimalUtils::DecimalComponents<DateTime64>
+    execute(DecimalUtils::DecimalComponents<DateTime64> t, Int64 delta, const DateLUTImpl &)
+    {
+        return {t.whole + delta, t.fractional};
+    }
+
     static inline NO_SANITIZE_UNDEFINED UInt32 execute(UInt32 t, Int64 delta, const DateLUTImpl &)
     {
         return t + delta;
@@ -75,18 +53,20 @@ struct AddSecondsImpl : public AddOnDateTime64DefaultImpl<AddSecondsImpl>
 
     static inline NO_SANITIZE_UNDEFINED UInt32 execute(UInt16 d, Int64 delta, const DateLUTImpl & time_zone)
     {
-        return time_zone.fromDayNum(DayNum(d)) + delta;
+        return time_zone.fromDayNum(ExtendedDayNum(d)) + delta;
     }
 };
 
-struct AddMinutesImpl : public AddOnDateTime64DefaultImpl<AddMinutesImpl>
+struct AddMinutesImpl
 {
-    using Base = AddOnDateTime64DefaultImpl<AddMinutesImpl>;
-    using Base::Base;
-    using Base::execute;
-
     static constexpr auto name = "addMinutes";
 
+    static inline NO_SANITIZE_UNDEFINED DecimalUtils::DecimalComponents<DateTime64>
+    execute(DecimalUtils::DecimalComponents<DateTime64> t, Int64 delta, const DateLUTImpl &)
+    {
+        return {t.whole + delta * 60, t.fractional};
+    }
+
     static inline NO_SANITIZE_UNDEFINED UInt32 execute(UInt32 t, Int64 delta, const DateLUTImpl &)
     {
         return t + delta * 60;
@@ -94,18 +74,19 @@ struct AddMinutesImpl : public AddOnDateTime64DefaultImpl<AddMinutesImpl>
 
     static inline NO_SANITIZE_UNDEFINED UInt32 execute(UInt16 d, Int64 delta, const DateLUTImpl & time_zone)
     {
-        return time_zone.fromDayNum(DayNum(d)) + delta * 60;
+        return time_zone.fromDayNum(ExtendedDayNum(d)) + delta * 60;
     }
 };
 
-struct AddHoursImpl : public AddOnDateTime64DefaultImpl<AddHoursImpl>
+struct AddHoursImpl
 {
-    using Base = AddOnDateTime64DefaultImpl<AddHoursImpl>;
-    using Base::Base;
-    using Base::execute;
-
     static constexpr auto name = "addHours";
 
+    static inline NO_SANITIZE_UNDEFINED DecimalUtils::DecimalComponents<DateTime64>
+    execute(DecimalUtils::DecimalComponents<DateTime64> t, Int64 delta, const DateLUTImpl &)
+    {
+        return {t.whole + delta * 3600, t.fractional};
+    }
     static inline NO_SANITIZE_UNDEFINED UInt32 execute(UInt32 t, Int64 delta, const DateLUTImpl &)
     {
         return t + delta * 3600;
@@ -113,19 +94,21 @@ struct AddHoursImpl : public AddOnDateTime64DefaultImpl<AddHoursImpl>
 
     static inline NO_SANITIZE_UNDEFINED UInt32 execute(UInt16 d, Int64 delta, const DateLUTImpl & time_zone)
     {
-        return time_zone.fromDayNum(DayNum(d)) + delta * 3600;
+        return time_zone.fromDayNum(ExtendedDayNum(d)) + delta * 3600;
     }
 };
 
-struct AddDaysImpl : public AddOnDateTime64DefaultImpl<AddDaysImpl>
+struct AddDaysImpl
 {
-    using Base = AddOnDateTime64DefaultImpl<AddDaysImpl>;
-    using Base::Base;
-    using Base::execute;
-
     static constexpr auto name = "addDays";
 
-    static inline UInt32 execute(UInt32 t, Int64 delta, const DateLUTImpl & time_zone)
+    static inline NO_SANITIZE_UNDEFINED DecimalUtils::DecimalComponents<DateTime64>
+    execute(DecimalUtils::DecimalComponents<DateTime64> t, Int64 delta, const DateLUTImpl & time_zone)
+    {
+        return {time_zone.addDays(t.whole, delta), t.fractional};
+    }
+
+    static inline NO_SANITIZE_UNDEFINED UInt32 execute(UInt32 t, Int64 delta, const DateLUTImpl & time_zone)
     {
         return time_zone.addDays(t, delta);
     }
@@ -136,14 +119,16 @@ struct AddDaysImpl : public AddOnDateTime64DefaultImpl<AddDaysImpl>
     }
 };
 
-struct AddWeeksImpl : public AddOnDateTime64DefaultImpl<AddWeeksImpl>
+struct AddWeeksImpl
 {
-    using Base = AddOnDateTime64DefaultImpl<AddWeeksImpl>;
-    using Base::Base;
-    using Base::execute;
-
     static constexpr auto name = "addWeeks";
 
+    static inline NO_SANITIZE_UNDEFINED DecimalUtils::DecimalComponents<DateTime64>
+    execute(DecimalUtils::DecimalComponents<DateTime64> t, Int64 delta, const DateLUTImpl & time_zone)
+    {
+        return {time_zone.addWeeks(t.whole, delta), t.fractional};
+    }
+
     static inline NO_SANITIZE_UNDEFINED UInt32 execute(UInt32 t, Int64 delta, const DateLUTImpl & time_zone)
     {
         return time_zone.addWeeks(t, delta);
@@ -155,14 +140,16 @@ struct AddWeeksImpl : public AddOnDateTime64DefaultImpl<AddWeeksImpl>
     }
 };
 
-struct AddMonthsImpl : public AddOnDateTime64DefaultImpl<AddMonthsImpl>
+struct AddMonthsImpl
 {
-    using Base = AddOnDateTime64DefaultImpl<AddMonthsImpl>;
-    using Base::Base;
-    using Base::execute;
-
     static constexpr auto name = "addMonths";
 
+    static inline DecimalUtils::DecimalComponents<DateTime64>
+    execute(DecimalUtils::DecimalComponents<DateTime64> t, Int64 delta, const DateLUTImpl & time_zone)
+    {
+        return {time_zone.addMonths(t.whole, delta), t.fractional};
+    }
+
     static inline UInt32 execute(UInt32 t, Int64 delta, const DateLUTImpl & time_zone)
     {
         return time_zone.addMonths(t, delta);
@@ -170,18 +157,20 @@ struct AddMonthsImpl : public AddOnDateTime64DefaultImpl<AddMonthsImpl>
 
     static inline UInt16 execute(UInt16 d, Int64 delta, const DateLUTImpl & time_zone)
     {
-        return time_zone.addMonths(DayNum(d), delta);
+        return time_zone.addMonths(ExtendedDayNum(d), delta);
     }
 };
 
-struct AddQuartersImpl : public AddOnDateTime64DefaultImpl<AddQuartersImpl>
+struct AddQuartersImpl
 {
-    using Base = AddOnDateTime64DefaultImpl<AddQuartersImpl>;
-    using Base::Base;
-    using Base::execute;
-
     static constexpr auto name = "addQuarters";
 
+    static inline DecimalUtils::DecimalComponents<DateTime64>
+    execute(DecimalUtils::DecimalComponents<DateTime64> t, Int64 delta, const DateLUTImpl & time_zone)
+    {
+        return {time_zone.addQuarters(t.whole, delta), t.fractional};
+    }
+
     static inline UInt32 execute(UInt32 t, Int64 delta, const DateLUTImpl & time_zone)
     {
         return time_zone.addQuarters(t, delta);
@@ -189,18 +178,20 @@ struct AddQuartersImpl : public AddOnDateTime64DefaultImpl<AddQuartersImpl>
 
     static inline UInt16 execute(UInt16 d, Int64 delta, const DateLUTImpl & time_zone)
     {
-        return time_zone.addQuarters(DayNum(d), delta);
+        return time_zone.addQuarters(ExtendedDayNum(d), delta);
     }
 };
 
-struct AddYearsImpl : public AddOnDateTime64DefaultImpl<AddYearsImpl>
+struct AddYearsImpl
 {
-    using Base = AddOnDateTime64DefaultImpl<AddYearsImpl>;
-    using Base::Base;
-    using Base::execute;
-
     static constexpr auto name = "addYears";
 
+    static inline DecimalUtils::DecimalComponents<DateTime64>
+    execute(DecimalUtils::DecimalComponents<DateTime64> t, Int64 delta, const DateLUTImpl & time_zone)
+    {
+        return {time_zone.addYears(t.whole, delta), t.fractional};
+    }
+
     static inline UInt32 execute(UInt32 t, Int64 delta, const DateLUTImpl & time_zone)
     {
         return time_zone.addYears(t, delta);
@@ -208,7 +199,7 @@ struct AddYearsImpl : public AddOnDateTime64DefaultImpl<AddYearsImpl>
 
     static inline UInt16 execute(UInt16 d, Int64 delta, const DateLUTImpl & time_zone)
     {
-        return time_zone.addYears(DayNum(d), delta);
+        return time_zone.addYears(ExtendedDayNum(d), delta);
     }
 };
 
@@ -282,14 +273,16 @@ struct Adder
 
 private:
     template <typename FromVectorType, typename ToVectorType, typename DeltaColumnType>
-    NO_INLINE NO_SANITIZE_UNDEFINED void vectorVector(const FromVectorType & vec_from, ToVectorType & vec_to, const DeltaColumnType & delta, const DateLUTImpl & time_zone, size_t size) const
+    NO_INLINE NO_SANITIZE_UNDEFINED void vectorVector(
+        const FromVectorType & vec_from, ToVectorType & vec_to, const DeltaColumnType & delta, const DateLUTImpl & time_zone, size_t size) const
     {
         for (size_t i = 0; i < size; ++i)
             vec_to[i] = transform.execute(vec_from[i], delta.getData()[i], time_zone);
     }
 
     template <typename FromType, typename ToVectorType, typename DeltaColumnType>
-    NO_INLINE NO_SANITIZE_UNDEFINED void constantVector(const FromType & from, ToVectorType & vec_to, const DeltaColumnType & delta, const DateLUTImpl & time_zone, size_t size) const
+    NO_INLINE NO_SANITIZE_UNDEFINED void constantVector(
+        const FromType & from, ToVectorType & vec_to, const DeltaColumnType & delta, const DateLUTImpl & time_zone, size_t size) const
     {
         for (size_t i = 0; i < size; ++i)
             vec_to[i] = transform.execute(from, delta.getData()[i], time_zone);
@@ -351,6 +344,7 @@ template <> struct ResultDataTypeMap<Int16>      { using ResultDataType = DataTy
 template <> struct ResultDataTypeMap<UInt32>     { using ResultDataType = DataTypeDateTime; };
 template <> struct ResultDataTypeMap<Int32>      { using ResultDataType = DataTypeDateTime; };
 template <> struct ResultDataTypeMap<DateTime64> { using ResultDataType = DataTypeDateTime64; };
+template <> struct ResultDataTypeMap<Int64>      { using ResultDataType = DataTypeDateTime64; };
 }
 
 template <typename Transform>
@@ -358,7 +352,7 @@ class FunctionDateOrDateTimeAddInterval : public IFunction
 {
 public:
     static constexpr auto name = Transform::name;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionDateOrDateTimeAddInterval>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionDateOrDateTimeAddInterval>(); }
 
     String getName() const override
     {
@@ -417,10 +411,18 @@ public:
         }
     }
 
+    // TransformDateTime64 helps choosing correct overload of exec and does some transformations
+    // on input and output parameters to simplify support of DateTime64 in concrete Transform.
+    template <typename FieldType>
+    using TransformType = std::conditional_t<
+        std::is_same_v<FieldType, DateTime64>,
+        TransformDateTime64<Transform>,
+        Transform>;
+
     /// Helper templates to deduce return type based on argument type, since some overloads may promote or denote types,
     /// e.g. addSeconds(Date, 1) => DateTime
     template <typename FieldType>
-    using TransformExecuteReturnType = decltype(std::declval<Transform>().execute(FieldType(), 0, std::declval<DateLUTImpl>()));
+    using TransformExecuteReturnType = decltype(std::declval<TransformType<FieldType>>().execute(FieldType(), 0, std::declval<DateLUTImpl>()));
 
     // Deduces RETURN DataType from INPUT DataType, based on return type of Transform{}.execute(INPUT_TYPE, UInt64, DateLUTImpl).
     // e.g. for Transform-type that has execute()-overload with 'UInt16' input and 'UInt32' return,
@@ -475,8 +477,9 @@ public:
         }
         else if (const auto * datetime64_type = assert_cast<const DataTypeDateTime64 *>(from_type))
         {
-            return DateTimeAddIntervalImpl<DataTypeDateTime64, TransformResultDataType<DataTypeDateTime64>, Transform>::execute(
-                Transform{datetime64_type->getScale()}, arguments, result_type);
+            using WrappedTransformType = TransformType<typename DataTypeDateTime64::FieldType>;
+            return DateTimeAddIntervalImpl<DataTypeDateTime64, TransformResultDataType<DataTypeDateTime64>, WrappedTransformType>::execute(
+                    WrappedTransformType{datetime64_type->getScale()}, arguments, result_type);
         }
         else
             throw Exception("Illegal type " + arguments[0].type->getName() + " of first argument of function " + getName(),
diff --git a/src/Functions/FunctionDateOrDateTimeToSomething.h b/src/Functions/FunctionDateOrDateTimeToSomething.h
index e0676f3dc0f..b9d0a7f45fe 100644
--- a/src/Functions/FunctionDateOrDateTimeToSomething.h
+++ b/src/Functions/FunctionDateOrDateTimeToSomething.h
@@ -5,6 +5,7 @@
 #include <DataTypes/DataTypeDateTime64.h>
 #include <Functions/extractTimeZoneFromFunctionArguments.h>
 #include <Functions/DateTimeTransforms.h>
+#include <Functions/TransformDateTime64.h>
 #include <IO/WriteHelpers.h>
 
 
@@ -23,7 +24,7 @@ class FunctionDateOrDateTimeToSomething : public IFunction
 {
 public:
     static constexpr auto name = Transform::name;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionDateOrDateTimeToSomething>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionDateOrDateTimeToSomething>(); }
 
     String getName() const override
     {
@@ -107,6 +108,7 @@ public:
         else if (which.isDateTime64())
         {
             const auto scale = static_cast<const DataTypeDateTime64 *>(from_type)->getScale();
+
             const TransformDateTime64<Transform> transformer(scale);
             return DateTimeTransformImpl<DataTypeDateTime64, ToDataType, decltype(transformer)>::execute(arguments, result_type, input_rows_count, transformer);
         }
@@ -133,7 +135,6 @@ public:
 
         /// This method is called only if the function has one argument. Therefore, we do not care about the non-local time zone.
         const DateLUTImpl & date_lut = DateLUT::instance();
-
         if (left.isNull() || right.isNull())
             return is_not_monotonic;
 
diff --git a/src/Functions/FunctionFQDN.cpp b/src/Functions/FunctionFQDN.cpp
index 7b3b89eb511..9cad9011cd4 100644
--- a/src/Functions/FunctionFQDN.cpp
+++ b/src/Functions/FunctionFQDN.cpp
@@ -12,7 +12,7 @@ class FunctionFQDN : public IFunction
 {
 public:
     static constexpr auto name = "FQDN";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextPtr)
     {
         return std::make_shared<FunctionFQDN>();
     }
diff --git a/src/Functions/FunctionFactory.cpp b/src/Functions/FunctionFactory.cpp
index 09fd360a925..35ac9ab647b 100644
--- a/src/Functions/FunctionFactory.cpp
+++ b/src/Functions/FunctionFactory.cpp
@@ -52,7 +52,7 @@ void FunctionFactory::registerFunction(const
 
 FunctionOverloadResolverImplPtr FunctionFactory::getImpl(
     const std::string & name,
-    const Context & context) const
+    ContextPtr context) const
 {
     auto res = tryGetImpl(name, context);
     if (!res)
@@ -82,14 +82,14 @@ std::vector<std::string> FunctionFactory::getAllNames() const
 
 FunctionOverloadResolverPtr FunctionFactory::get(
     const std::string & name,
-    const Context & context) const
+    ContextPtr context) const
 {
     return std::make_shared<FunctionOverloadResolverAdaptor>(getImpl(name, context));
 }
 
 FunctionOverloadResolverImplPtr FunctionFactory::tryGetImpl(
     const std::string & name_param,
-    const Context & context) const
+    ContextPtr context) const
 {
     String name = getAliasToOrName(name_param);
     FunctionOverloadResolverImplPtr res;
@@ -99,7 +99,8 @@ FunctionOverloadResolverImplPtr FunctionFactory::tryGetImpl(
         res = it->second(context);
     else
     {
-        it = case_insensitive_functions.find(Poco::toLower(name));
+        name = Poco::toLower(name);
+        it = case_insensitive_functions.find(name);
         if (case_insensitive_functions.end() != it)
             res = it->second(context);
     }
@@ -109,7 +110,7 @@ FunctionOverloadResolverImplPtr FunctionFactory::tryGetImpl(
 
     if (CurrentThread::isInitialized())
     {
-        const auto * query_context = CurrentThread::get().getQueryContext();
+        auto query_context = CurrentThread::get().getQueryContext();
         if (query_context && query_context->getSettingsRef().log_queries)
             query_context->addQueryFactoriesInfo(Context::QueryLogFactories::Function, name);
     }
@@ -119,7 +120,7 @@ FunctionOverloadResolverImplPtr FunctionFactory::tryGetImpl(
 
 FunctionOverloadResolverPtr FunctionFactory::tryGet(
         const std::string & name,
-        const Context & context) const
+        ContextPtr context) const
 {
     auto impl = tryGetImpl(name, context);
     return impl ? std::make_shared<FunctionOverloadResolverAdaptor>(std::move(impl))
diff --git a/src/Functions/FunctionFactory.h b/src/Functions/FunctionFactory.h
index 7990e78daf8..96238a88420 100644
--- a/src/Functions/FunctionFactory.h
+++ b/src/Functions/FunctionFactory.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <Functions/IFunctionAdaptors.h>
+#include <Interpreters/Context_fwd.h>
 #include <Common/IFactoryWithAliases.h>
 
 #include <functional>
@@ -12,14 +13,12 @@
 namespace DB
 {
 
-class Context;
-
-
 /** Creates function by name.
   * Function could use for initialization (take ownership of shared_ptr, for example)
   *  some dictionaries from Context.
   */
-class FunctionFactory : private boost::noncopyable, public IFactoryWithAliases<std::function<FunctionOverloadResolverImplPtr(const Context &)>>
+class FunctionFactory : private boost::noncopyable,
+                        public IFactoryWithAliases<std::function<FunctionOverloadResolverImplPtr(ContextPtr)>>
 {
 public:
     static FunctionFactory & instance();
@@ -43,14 +42,14 @@ public:
     std::vector<std::string> getAllNames() const;
 
     /// Throws an exception if not found.
-    FunctionOverloadResolverPtr get(const std::string & name, const Context & context) const;
+    FunctionOverloadResolverPtr get(const std::string & name, ContextPtr context) const;
 
     /// Returns nullptr if not found.
-    FunctionOverloadResolverPtr tryGet(const std::string & name, const Context & context) const;
+    FunctionOverloadResolverPtr tryGet(const std::string & name, ContextPtr context) const;
 
     /// The same methods to get developer interface implementation.
-    FunctionOverloadResolverImplPtr getImpl(const std::string & name, const Context & context) const;
-    FunctionOverloadResolverImplPtr tryGetImpl(const std::string & name, const Context & context) const;
+    FunctionOverloadResolverImplPtr getImpl(const std::string & name, ContextPtr context) const;
+    FunctionOverloadResolverImplPtr tryGetImpl(const std::string & name, ContextPtr context) const;
 
 private:
     using Functions = std::unordered_map<std::string, Value>;
@@ -59,7 +58,7 @@ private:
     Functions case_insensitive_functions;
 
     template <typename Function>
-    static FunctionOverloadResolverImplPtr createDefaultFunction(const Context & context)
+    static FunctionOverloadResolverImplPtr createDefaultFunction(ContextPtr context)
     {
         return std::make_unique<DefaultOverloadResolver>(Function::create(context));
     }
diff --git a/src/Functions/FunctionFile.cpp b/src/Functions/FunctionFile.cpp
index f477f6123c3..9247152367b 100644
--- a/src/Functions/FunctionFile.cpp
+++ b/src/Functions/FunctionFile.cpp
@@ -21,12 +21,12 @@ namespace ErrorCodes
 }
 
 /// A function to read file as a string.
-class FunctionFile : public IFunction
+class FunctionFile : public IFunction, WithContext
 {
 public:
     static constexpr auto name = "file";
-    static FunctionPtr create(const Context &context) { return std::make_shared<FunctionFile>(context); }
-    explicit FunctionFile(const Context &context_) : context(context_) {}
+    static FunctionPtr create(ContextPtr context_) { return std::make_shared<FunctionFile>(context_); }
+    explicit FunctionFile(ContextPtr context_) : WithContext(context_) {}
 
     String getName() const override { return name; }
 
@@ -68,7 +68,7 @@ public:
         {
             const char * filename = reinterpret_cast<const char *>(&chars[source_offset]);
 
-            const String user_files_path = context.getUserFilesPath();
+            const String user_files_path = getContext()->getUserFilesPath();
             String user_files_absolute_path = Poco::Path(user_files_path).makeAbsolute().makeDirectory().toString();
             Poco::Path poco_filepath = Poco::Path(filename);
             if (poco_filepath.isRelative())
@@ -113,7 +113,7 @@ private:
     void checkReadIsAllowedOrThrow(const std::string & user_files_absolute_path, const std::string & file_absolute_path) const
     {
         // If run in Local mode, no need for path checking.
-        if (context.getApplicationType() != Context::ApplicationType::LOCAL)
+        if (getContext()->getApplicationType() != Context::ApplicationType::LOCAL)
             if (file_absolute_path.find(user_files_absolute_path) != 0)
                 throw Exception("File is not inside " + user_files_absolute_path, ErrorCodes::DATABASE_ACCESS_DENIED);
 
@@ -121,8 +121,6 @@ private:
         if (path_poco_file.exists() && path_poco_file.isDirectory())
             throw Exception("File can't be a directory", ErrorCodes::INCORRECT_FILE_NAME);
     }
-
-    const Context & context;
 };
 
 
diff --git a/src/Functions/FunctionJoinGet.cpp b/src/Functions/FunctionJoinGet.cpp
index 6b15bf821b2..2ad9985d44c 100644
--- a/src/Functions/FunctionJoinGet.cpp
+++ b/src/Functions/FunctionJoinGet.cpp
@@ -25,16 +25,18 @@ ColumnPtr ExecutableFunctionJoinGet<or_null>::execute(const ColumnsWithTypeAndNa
         auto key = arguments[i];
         keys.emplace_back(std::move(key));
     }
-    return join->joinGet(keys, result_columns).column;
+    return storage_join->joinGet(keys, result_columns).column;
 }
 
 template <bool or_null>
 ExecutableFunctionImplPtr FunctionJoinGet<or_null>::prepare(const ColumnsWithTypeAndName &) const
 {
-    return std::make_unique<ExecutableFunctionJoinGet<or_null>>(join, DB::Block{{return_type->createColumn(), return_type, attr_name}});
+    Block result_columns {{return_type->createColumn(), return_type, attr_name}};
+    return std::make_unique<ExecutableFunctionJoinGet<or_null>>(table_lock, storage_join, result_columns);
 }
 
-static auto getJoin(const ColumnsWithTypeAndName & arguments, const Context & context)
+static std::pair<std::shared_ptr<StorageJoin>, String>
+getJoin(const ColumnsWithTypeAndName & arguments, ContextPtr context)
 {
     String join_name;
     if (const auto * name_col = checkAndGetColumnConst<ColumnString>(arguments[0].column.get()))
@@ -50,7 +52,7 @@ static auto getJoin(const ColumnsWithTypeAndName & arguments, const Context & co
     String database_name;
     if (dot == String::npos)
     {
-        database_name = context.getCurrentDatabase();
+        database_name = context->getCurrentDatabase();
         dot = 0;
     }
     else
@@ -86,14 +88,13 @@ FunctionBaseImplPtr JoinGetOverloadResolver<or_null>::build(const ColumnsWithTyp
             "Number of arguments for function " + getName() + " doesn't match: passed " + toString(arguments.size())
                 + ", should be greater or equal to 3",
             ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
-    auto [storage_join, attr_name] = getJoin(arguments, context);
-    auto join = storage_join->getJoin();
+    auto [storage_join, attr_name] = getJoin(arguments, getContext());
     DataTypes data_types(arguments.size() - 2);
     for (size_t i = 2; i < arguments.size(); ++i)
         data_types[i - 2] = arguments[i].type;
-    auto return_type = join->joinGetCheckAndGetReturnType(data_types, attr_name, or_null);
-    auto table_lock = storage_join->lockForShare(context.getInitialQueryId(), context.getSettingsRef().lock_acquire_timeout);
-    return std::make_unique<FunctionJoinGet<or_null>>(table_lock, storage_join, join, attr_name, data_types, return_type);
+    auto return_type = storage_join->joinGetCheckAndGetReturnType(data_types, attr_name, or_null);
+    auto table_lock = storage_join->lockForShare(getContext()->getInitialQueryId(), getContext()->getSettingsRef().lock_acquire_timeout);
+    return std::make_unique<FunctionJoinGet<or_null>>(table_lock, storage_join, attr_name, data_types, return_type);
 }
 
 void registerFunctionJoinGet(FunctionFactory & factory)
diff --git a/src/Functions/FunctionJoinGet.h b/src/Functions/FunctionJoinGet.h
index 27f348e9698..016ef15f2d5 100644
--- a/src/Functions/FunctionJoinGet.h
+++ b/src/Functions/FunctionJoinGet.h
@@ -1,5 +1,7 @@
 #pragma once
+
 #include <Functions/IFunctionImpl.h>
+#include <Interpreters/Context_fwd.h>
 #include <Storages/IStorage_fwd.h>
 #include <Storages/TableLockHolder.h>
 #include <Core/Block.h>
@@ -7,16 +9,21 @@
 namespace DB
 {
 
-class Context;
 class HashJoin;
-using HashJoinPtr = std::shared_ptr<HashJoin>;
+class StorageJoin;
+using StorageJoinPtr = std::shared_ptr<StorageJoin>;
 
 template <bool or_null>
 class ExecutableFunctionJoinGet final : public IExecutableFunctionImpl
 {
 public:
-    ExecutableFunctionJoinGet(HashJoinPtr join_, const DB::Block & result_columns_)
-        : join(std::move(join_)), result_columns(result_columns_) {}
+    ExecutableFunctionJoinGet(TableLockHolder table_lock_,
+                              StorageJoinPtr storage_join_,
+                              const DB::Block & result_columns_)
+        : table_lock(std::move(table_lock_))
+        , storage_join(std::move(storage_join_))
+        , result_columns(result_columns_)
+    {}
 
     static constexpr auto name = or_null ? "joinGetOrNull" : "joinGet";
 
@@ -29,7 +36,8 @@ public:
     String getName() const override { return name; }
 
 private:
-    HashJoinPtr join;
+    TableLockHolder table_lock;
+    StorageJoinPtr storage_join;
     DB::Block result_columns;
 };
 
@@ -39,12 +47,11 @@ class FunctionJoinGet final : public IFunctionBaseImpl
 public:
     static constexpr auto name = or_null ? "joinGetOrNull" : "joinGet";
 
-    FunctionJoinGet(TableLockHolder table_lock_, StoragePtr storage_join_,
-                    HashJoinPtr join_, String attr_name_,
+    FunctionJoinGet(TableLockHolder table_lock_,
+                    StorageJoinPtr storage_join_, String attr_name_,
                     DataTypes argument_types_, DataTypePtr return_type_)
         : table_lock(std::move(table_lock_))
-        , storage_join(std::move(storage_join_))
-        , join(std::move(join_))
+        , storage_join(storage_join_)
         , attr_name(std::move(attr_name_))
         , argument_types(std::move(argument_types_))
         , return_type(std::move(return_type_))
@@ -60,21 +67,20 @@ public:
 
 private:
     TableLockHolder table_lock;
-    StoragePtr storage_join;
-    HashJoinPtr join;
+    StorageJoinPtr storage_join;
     const String attr_name;
     DataTypes argument_types;
     DataTypePtr return_type;
 };
 
 template <bool or_null>
-class JoinGetOverloadResolver final : public IFunctionOverloadResolverImpl
+class JoinGetOverloadResolver final : public IFunctionOverloadResolverImpl, WithContext
 {
 public:
     static constexpr auto name = or_null ? "joinGetOrNull" : "joinGet";
-    static FunctionOverloadResolverImplPtr create(const Context & context) { return std::make_unique<JoinGetOverloadResolver>(context); }
+    static FunctionOverloadResolverImplPtr create(ContextPtr context_) { return std::make_unique<JoinGetOverloadResolver>(context_); }
 
-    explicit JoinGetOverloadResolver(const Context & context_) : context(context_) {}
+    explicit JoinGetOverloadResolver(ContextPtr context_) : WithContext(context_) {}
 
     String getName() const override { return name; }
 
@@ -87,9 +93,6 @@ public:
     bool isVariadic() const override { return true; }
     size_t getNumberOfArguments() const override { return 0; }
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {0, 1}; }
-
-private:
-    const Context & context;
 };
 
 }
diff --git a/src/Functions/FunctionMathBinaryFloat64.h b/src/Functions/FunctionMathBinaryFloat64.h
index 0a0688dc75c..00f6909f65c 100644
--- a/src/Functions/FunctionMathBinaryFloat64.h
+++ b/src/Functions/FunctionMathBinaryFloat64.h
@@ -28,7 +28,7 @@ class FunctionMathBinaryFloat64 : public IFunction
 {
 public:
     static constexpr auto name = Impl::name;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionMathBinaryFloat64>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionMathBinaryFloat64>(); }
     static_assert(Impl::rows_per_iteration > 0, "Impl must process at least one row per iteration");
 
     bool useDefaultImplementationForConstants() const override { return true; }
diff --git a/src/Functions/FunctionMathConstFloat64.h b/src/Functions/FunctionMathConstFloat64.h
index f03f469bc35..04ade5b4637 100644
--- a/src/Functions/FunctionMathConstFloat64.h
+++ b/src/Functions/FunctionMathConstFloat64.h
@@ -13,7 +13,7 @@ class FunctionMathConstFloat64 : public IFunction
 {
 public:
     static constexpr auto name = Impl::name;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionMathConstFloat64>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionMathConstFloat64>(); }
 
 private:
     String getName() const override { return name; }
diff --git a/src/Functions/FunctionMathUnary.h b/src/Functions/FunctionMathUnary.h
index 49b0428811a..e24d19e5a9b 100644
--- a/src/Functions/FunctionMathUnary.h
+++ b/src/Functions/FunctionMathUnary.h
@@ -35,7 +35,7 @@ class FunctionMathUnary : public IFunction
 {
 public:
     static constexpr auto name = Impl::name;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionMathUnary>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionMathUnary>(); }
 
 private:
     String getName() const override { return name; }
diff --git a/src/Functions/FunctionNumericPredicate.h b/src/Functions/FunctionNumericPredicate.h
index 72a17adac4c..9bb0f700fe0 100644
--- a/src/Functions/FunctionNumericPredicate.h
+++ b/src/Functions/FunctionNumericPredicate.h
@@ -1,8 +1,10 @@
 #pragma once
+
 #include <Functions/IFunctionImpl.h>
 #include <Functions/FunctionHelpers.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <Columns/ColumnsNumber.h>
+#include <Interpreters/Context_fwd.h>
 #include <ext/range.h>
 
 
@@ -21,7 +23,7 @@ class FunctionNumericPredicate : public IFunction
 {
 public:
     static constexpr auto name = Impl::name;
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextPtr)
     {
         return std::make_shared<FunctionNumericPredicate>();
     }
diff --git a/src/Functions/FunctionStartsEndsWith.h b/src/Functions/FunctionStartsEndsWith.h
index 2899bc259d5..87c07c5efd2 100644
--- a/src/Functions/FunctionStartsEndsWith.h
+++ b/src/Functions/FunctionStartsEndsWith.h
@@ -142,7 +142,7 @@ template <typename Name>
 class FunctionStartsEndsWith : public TargetSpecific::Default::FunctionStartsEndsWith<Name>
 {
 public:
-    explicit FunctionStartsEndsWith(const Context & context) : selector(context)
+    explicit FunctionStartsEndsWith(ContextPtr context) : selector(context)
     {
         selector.registerImplementation<TargetArch::Default,
             TargetSpecific::Default::FunctionStartsEndsWith<Name>>();
@@ -164,7 +164,7 @@ public:
         return selector.selectAndExecute(arguments, result_type, input_rows_count);
     }
 
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextPtr context)
     {
         return std::make_shared<FunctionStartsEndsWith<Name>>(context);
     }
diff --git a/src/Functions/FunctionStringOrArrayToT.h b/src/Functions/FunctionStringOrArrayToT.h
index e00acc006cf..40ce62a5666 100644
--- a/src/Functions/FunctionStringOrArrayToT.h
+++ b/src/Functions/FunctionStringOrArrayToT.h
@@ -25,7 +25,7 @@ class FunctionStringOrArrayToT : public IFunction
 {
 public:
     static constexpr auto name = Name::name;
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextPtr)
     {
         return std::make_shared<FunctionStringOrArrayToT>();
     }
diff --git a/src/Functions/FunctionStringReplace.h b/src/Functions/FunctionStringReplace.h
index bd8edbf9202..2e99f58531a 100644
--- a/src/Functions/FunctionStringReplace.h
+++ b/src/Functions/FunctionStringReplace.h
@@ -23,7 +23,7 @@ class FunctionStringReplace : public IFunction
 {
 public:
     static constexpr auto name = Name::name;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionStringReplace>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionStringReplace>(); }
 
     String getName() const override { return name; }
 
diff --git a/src/Functions/FunctionStringToString.h b/src/Functions/FunctionStringToString.h
index 4123b41c547..36009dc30c0 100644
--- a/src/Functions/FunctionStringToString.h
+++ b/src/Functions/FunctionStringToString.h
@@ -1,9 +1,11 @@
 #pragma once
+
 #include <DataTypes/DataTypeString.h>
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnFixedString.h>
 #include <Functions/FunctionHelpers.h>
 #include <Functions/IFunctionImpl.h>
+#include <Interpreters/Context_fwd.h>
 
 
 namespace DB
@@ -21,7 +23,7 @@ class FunctionStringToString : public IFunction
 {
 public:
     static constexpr auto name = Name::name;
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextPtr)
     {
         return std::make_shared<FunctionStringToString>();
     }
diff --git a/src/Functions/FunctionUnaryArithmetic.h b/src/Functions/FunctionUnaryArithmetic.h
index 06469a83e3e..9145c4a2ec5 100644
--- a/src/Functions/FunctionUnaryArithmetic.h
+++ b/src/Functions/FunctionUnaryArithmetic.h
@@ -110,7 +110,7 @@ class FunctionUnaryArithmetic : public IFunction
 
 public:
     static constexpr auto name = Name::name;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionUnaryArithmetic>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionUnaryArithmetic>(); }
 
     String getName() const override
     {
diff --git a/src/Functions/FunctionUnixTimestamp64.h b/src/Functions/FunctionUnixTimestamp64.h
index 20e225990bd..18f9c7a8b02 100644
--- a/src/Functions/FunctionUnixTimestamp64.h
+++ b/src/Functions/FunctionUnixTimestamp64.h
@@ -33,7 +33,7 @@ public:
 
     static_assert(std::is_same_v<SourceDataType, DataTypeDateTime64> || std::is_same_v<ResultDataType, DataTypeDateTime64>);
 
-    static auto create(const Context &)
+    static auto create(ContextPtr)
     {
         return std::make_shared<FunctionUnixTimestamp64<Impl>>();
     }
diff --git a/src/Functions/FunctionsAES.h b/src/Functions/FunctionsAES.h
index 132e94907f5..b76b454fd77 100644
--- a/src/Functions/FunctionsAES.h
+++ b/src/Functions/FunctionsAES.h
@@ -141,7 +141,7 @@ class FunctionEncrypt : public IFunction
 public:
     static constexpr OpenSSLDetails::CompatibilityMode compatibility_mode = Impl::compatibility_mode;
     static constexpr auto name = Impl::name;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionEncrypt>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionEncrypt>(); }
 
 private:
     using CipherMode = OpenSSLDetails::CipherMode;
@@ -416,7 +416,7 @@ class FunctionDecrypt : public IFunction
 public:
     static constexpr OpenSSLDetails::CompatibilityMode compatibility_mode = Impl::compatibility_mode;
     static constexpr auto name = Impl::name;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionDecrypt>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionDecrypt>(); }
 
 private:
     using CipherMode = OpenSSLDetails::CipherMode;
@@ -538,8 +538,9 @@ private:
 
         [[maybe_unused]] const auto block_size = static_cast<size_t>(EVP_CIPHER_block_size(evp_cipher));
         [[maybe_unused]] const auto iv_size = static_cast<size_t>(EVP_CIPHER_iv_length(evp_cipher));
-        const auto key_size = static_cast<size_t>(EVP_CIPHER_key_length(evp_cipher));
-        const auto tag_size = 16; // https://tools.ietf.org/html/rfc5116#section-5.1
+
+        const size_t key_size = static_cast<size_t>(EVP_CIPHER_key_length(evp_cipher));
+        static constexpr size_t tag_size = 16; // https://tools.ietf.org/html/rfc5116#section-5.1
 
         auto decrypted_result_column = ColumnString::create();
         auto & decrypted_result_column_data = decrypted_result_column->getChars();
@@ -549,9 +550,17 @@ private:
             size_t resulting_size = 0;
             for (size_t r = 0; r < input_rows_count; ++r)
             {
-                resulting_size += input_column->getDataAt(r).size + 1;
+                size_t string_size = input_column->getDataAt(r).size;
+                resulting_size += string_size + 1;  /// With terminating zero.
+
                 if constexpr (mode == CipherMode::RFC5116_AEAD_AES_GCM)
+                {
+                    if (string_size < tag_size)
+                        throw Exception("Encrypted data is smaller than the size of additional data for AEAD mode, cannot decrypt.",
+                            ErrorCodes::BAD_ARGUMENTS);
+
                     resulting_size -= tag_size;
+                }
             }
 
 #if defined(MEMORY_SANITIZER)
@@ -565,6 +574,7 @@ private:
             decrypted_result_column_data.resize(resulting_size);
 #endif
         }
+
         auto * decrypted = decrypted_result_column_data.data();
 
         KeyHolder<mode> key_holder;
@@ -631,7 +641,7 @@ private:
                     // 1.a.2: Set AAD if present
                     if (aad_column)
                     {
-                        const auto aad_data = aad_column->getDataAt(r);
+                        StringRef aad_data = aad_column->getDataAt(r);
                         int tmp_len = 0;
                         if (aad_data.size != 0 && EVP_DecryptUpdate(evp_ctx, nullptr, &tmp_len,
                                 reinterpret_cast<const unsigned char *>(aad_data.data), aad_data.size) != 1)
diff --git a/src/Functions/FunctionsBitmap.h b/src/Functions/FunctionsBitmap.h
index 054f8800630..aa4a6b50ea3 100644
--- a/src/Functions/FunctionsBitmap.h
+++ b/src/Functions/FunctionsBitmap.h
@@ -93,7 +93,7 @@ class FunctionBitmapBuildImpl : public IFunction
 public:
     static constexpr auto name = Name::name;
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionBitmapBuildImpl>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionBitmapBuildImpl>(); }
 
     String getName() const override { return name; }
 
@@ -221,7 +221,7 @@ class FunctionBitmapToArrayImpl : public IFunction
 public:
     static constexpr auto name = Name::name;
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionBitmapToArrayImpl>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionBitmapToArrayImpl>(); }
 
     String getName() const override { return name; }
 
@@ -311,7 +311,7 @@ class FunctionBitmapSubset : public IFunction
 public:
     static constexpr auto name = Impl::name;
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionBitmapSubset<Impl>>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionBitmapSubset<Impl>>(); }
 
     String getName() const override { return name; }
 
@@ -469,7 +469,7 @@ class FunctionBitmapTransform : public IFunction
 public:
     static constexpr auto name = "bitmapTransform";
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionBitmapTransform>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionBitmapTransform>(); }
 
     String getName() const override { return name; }
 
@@ -635,7 +635,7 @@ class FunctionBitmapSelfCardinalityImpl : public IFunction
 public:
     static constexpr auto name = Impl::name;
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionBitmapSelfCardinalityImpl<Impl>>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionBitmapSelfCardinalityImpl<Impl>>(); }
 
     String getName() const override { return name; }
 
@@ -807,7 +807,7 @@ class FunctionBitmapContains : public IFunction
 public:
     static constexpr auto name = "bitmapContains";
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionBitmapContains>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionBitmapContains>(); }
 
     String getName() const override { return name; }
 
@@ -911,7 +911,7 @@ class FunctionBitmapCardinality : public IFunction
 public:
     static constexpr auto name = Name::name;
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionBitmapCardinality>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionBitmapCardinality>(); }
 
     String getName() const override { return name; }
 
@@ -1054,7 +1054,7 @@ class FunctionBitmap : public IFunction
 public:
     static constexpr auto name = Name::name;
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionBitmap>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionBitmap>(); }
 
     String getName() const override { return name; }
 
@@ -1100,14 +1100,14 @@ public:
             return executeBitmapData<UInt32>(arguments, input_rows_count);
         else if (which.isUInt64())
             return executeBitmapData<UInt64>(arguments, input_rows_count);
-        else if (which.isUInt8())
-            return executeBitmapData<UInt8>(arguments, input_rows_count);
-        else if (which.isUInt16())
-            return executeBitmapData<UInt16>(arguments, input_rows_count);
-        else if (which.isUInt32())
-            return executeBitmapData<UInt32>(arguments, input_rows_count);
-        else if (which.isUInt64())
-            return executeBitmapData<UInt64>(arguments, input_rows_count);
+        else if (which.isInt8())
+            return executeBitmapData<Int8>(arguments, input_rows_count);
+        else if (which.isInt16())
+            return executeBitmapData<Int16>(arguments, input_rows_count);
+        else if (which.isInt32())
+            return executeBitmapData<Int32>(arguments, input_rows_count);
+        else if (which.isInt64())
+            return executeBitmapData<Int64>(arguments, input_rows_count);
         else
             throw Exception(
                 "Unexpected type " + from_type->getName() + " of argument of function " + getName(), ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
diff --git a/src/Functions/FunctionsCoding.cpp b/src/Functions/FunctionsCoding.cpp
index cf85b4512d5..c1e20a657b2 100644
--- a/src/Functions/FunctionsCoding.cpp
+++ b/src/Functions/FunctionsCoding.cpp
@@ -20,7 +20,7 @@ void registerFunctionsCoding(FunctionFactory & factory)
     factory.registerFunction<FunctionUUIDNumToString>();
     factory.registerFunction<FunctionUUIDStringToNum>();
     factory.registerFunction<FunctionHex>(FunctionFactory::CaseInsensitive);
-    factory.registerFunction<FunctionUnhex>();
+    factory.registerFunction<FunctionUnhex>(FunctionFactory::CaseInsensitive);
     factory.registerFunction<FunctionChar>(FunctionFactory::CaseInsensitive);
     factory.registerFunction<FunctionBitmaskToArray>();
     factory.registerFunction<FunctionToIPv4>();
diff --git a/src/Functions/FunctionsCoding.h b/src/Functions/FunctionsCoding.h
index abfb1e83a77..933d4f01b92 100644
--- a/src/Functions/FunctionsCoding.h
+++ b/src/Functions/FunctionsCoding.h
@@ -1,28 +1,29 @@
 #pragma once
 
-#include <Common/formatIPv6.h>
-#include <Common/hex.h>
-#include <Common/IPv6ToBinary.h>
-#include <Common/typeid_cast.h>
-#include <IO/WriteHelpers.h>
-#include <DataTypes/DataTypeFactory.h>
-#include <DataTypes/DataTypesNumber.h>
-#include <DataTypes/DataTypeString.h>
-#include <DataTypes/DataTypeFixedString.h>
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnConst.h>
+#include <Columns/ColumnDecimal.h>
+#include <Columns/ColumnFixedString.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnTuple.h>
+#include <Columns/ColumnsNumber.h>
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeDate.h>
 #include <DataTypes/DataTypeDateTime.h>
-#include <DataTypes/DataTypeUUID.h>
+#include <DataTypes/DataTypeFactory.h>
+#include <DataTypes/DataTypeFixedString.h>
+#include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypeTuple.h>
-#include <Columns/ColumnsNumber.h>
-#include <Columns/ColumnString.h>
-#include <Columns/ColumnFixedString.h>
-#include <Columns/ColumnArray.h>
-#include <Columns/ColumnConst.h>
-#include <Columns/ColumnTuple.h>
-#include <Columns/ColumnDecimal.h>
-#include <Functions/IFunctionImpl.h>
+#include <DataTypes/DataTypeUUID.h>
+#include <DataTypes/DataTypesNumber.h>
 #include <Functions/FunctionHelpers.h>
+#include <Functions/IFunctionImpl.h>
+#include <Interpreters/Context_fwd.h>
+#include <IO/WriteHelpers.h>
+#include <Common/IPv6ToBinary.h>
+#include <Common/formatIPv6.h>
+#include <Common/hex.h>
+#include <Common/typeid_cast.h>
 
 #include <arpa/inet.h>
 #include <ext/range.h>
@@ -68,7 +69,7 @@ class FunctionIPv6NumToString : public IFunction
 {
 public:
     static constexpr auto name = "IPv6NumToString";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionIPv6NumToString>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionIPv6NumToString>(); }
 
     String getName() const override { return name; }
 
@@ -138,7 +139,7 @@ class FunctionCutIPv6 : public IFunction
 {
 public:
     static constexpr auto name = "cutIPv6";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionCutIPv6>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionCutIPv6>(); }
 
     String getName() const override { return name; }
 
@@ -261,7 +262,7 @@ class FunctionIPv6StringToNum : public IFunction
 {
 public:
     static constexpr auto name = "IPv6StringToNum";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionIPv6StringToNum>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionIPv6StringToNum>(); }
 
     static inline bool tryParseIPv4(const char * pos)
     {
@@ -339,7 +340,7 @@ class FunctionIPv4NumToString : public IFunction
 {
 public:
     static constexpr auto name = Name::name;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionIPv4NumToString<mask_tail_octets, Name>>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionIPv4NumToString<mask_tail_octets, Name>>(); }
 
     String getName() const override
     {
@@ -400,7 +401,7 @@ class FunctionIPv4StringToNum : public IFunction
 {
 public:
     static constexpr auto name = "IPv4StringToNum";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionIPv4StringToNum>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionIPv4StringToNum>(); }
 
     String getName() const override
     {
@@ -463,7 +464,7 @@ class FunctionIPv4ToIPv6 : public IFunction
 {
 public:
      static constexpr auto name = "IPv4ToIPv6";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionIPv4ToIPv6>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionIPv4ToIPv6>(); }
 
     String getName() const override { return name; }
 
@@ -518,7 +519,7 @@ class FunctionToIPv4 : public FunctionIPv4StringToNum
 {
 public:
     static constexpr auto name = "toIPv4";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionToIPv4>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionToIPv4>(); }
 
     String getName() const override
     {
@@ -541,7 +542,7 @@ class FunctionToIPv6 : public FunctionIPv6StringToNum
 {
 public:
     static constexpr auto name = "toIPv6";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionToIPv6>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionToIPv6>(); }
 
     String getName() const override { return name; }
 
@@ -559,7 +560,7 @@ class FunctionMACNumToString : public IFunction
 {
 public:
     static constexpr auto name = "MACNumToString";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionMACNumToString>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionMACNumToString>(); }
 
     String getName() const override
     {
@@ -689,7 +690,7 @@ class FunctionMACStringTo : public IFunction
 {
 public:
     static constexpr auto name = Impl::name;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionMACStringTo<Impl>>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionMACStringTo<Impl>>(); }
 
     String getName() const override
     {
@@ -752,7 +753,7 @@ class FunctionUUIDNumToString : public IFunction
 
 public:
     static constexpr auto name = "UUIDNumToString";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionUUIDNumToString>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionUUIDNumToString>(); }
 
     String getName() const override
     {
@@ -850,7 +851,7 @@ private:
 
 public:
     static constexpr auto name = "UUIDStringToNum";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionUUIDStringToNum>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionUUIDStringToNum>(); }
 
     String getName() const override
     {
@@ -954,7 +955,7 @@ class FunctionHex : public IFunction
 {
 public:
     static constexpr auto name = "hex";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionHex>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionHex>(); }
 
     String getName() const override
     {
@@ -1237,7 +1238,7 @@ class FunctionUnhex : public IFunction
 {
 public:
     static constexpr auto name = "unhex";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionUnhex>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionUnhex>(); }
 
     String getName() const override
     {
@@ -1326,7 +1327,7 @@ class FunctionChar : public IFunction
 {
 public:
     static constexpr auto name = "char";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionChar>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionChar>(); }
 
     String getName() const override
     {
@@ -1421,7 +1422,7 @@ class FunctionBitmaskToArray : public IFunction
 {
 public:
     static constexpr auto name = "bitmaskToArray";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionBitmaskToArray>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionBitmaskToArray>(); }
 
     String getName() const override
     {
@@ -1507,7 +1508,7 @@ class FunctionToStringCutToZero : public IFunction
 {
 public:
     static constexpr auto name = "toStringCutToZero";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionToStringCutToZero>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionToStringCutToZero>(); }
 
     String getName() const override
     {
@@ -1645,7 +1646,7 @@ private:
 
     static inline void applyCIDRMask(const UInt8 * __restrict src, UInt8 * __restrict dst_lower, UInt8 * __restrict dst_upper, UInt8 bits_to_keep)
     {
-        __m128i mask = _mm_loadu_si128(reinterpret_cast<const __m128i *>(getCIDRMaskIPv6(bits_to_keep)));
+        __m128i mask = _mm_loadu_si128(reinterpret_cast<const __m128i *>(getCIDRMaskIPv6(bits_to_keep).data()));
         __m128i lower = _mm_and_si128(_mm_loadu_si128(reinterpret_cast<const __m128i *>(src)), mask);
         _mm_storeu_si128(reinterpret_cast<__m128i *>(dst_lower), lower);
 
@@ -1659,7 +1660,7 @@ private:
     /// NOTE IPv6 is stored in memory in big endian format that makes some difficulties.
     static void applyCIDRMask(const UInt8 * __restrict src, UInt8 * __restrict dst_lower, UInt8 * __restrict dst_upper, UInt8 bits_to_keep)
     {
-        const auto * mask = getCIDRMaskIPv6(bits_to_keep);
+        const auto & mask = getCIDRMaskIPv6(bits_to_keep);
 
         for (size_t i = 0; i < 16; ++i)
         {
@@ -1672,7 +1673,7 @@ private:
 
 public:
     static constexpr auto name = "IPv6CIDRToRange";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionIPv6CIDRToRange>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionIPv6CIDRToRange>(); }
 
     String getName() const override { return name; }
     size_t getNumberOfArguments() const override { return 2; }
@@ -1786,7 +1787,7 @@ private:
 
 public:
     static constexpr auto name = "IPv4CIDRToRange";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionIPv4CIDRToRange>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionIPv4CIDRToRange>(); }
 
     String getName() const override { return name; }
     size_t getNumberOfArguments() const override { return 2; }
@@ -1867,7 +1868,7 @@ class FunctionIsIPv4String : public FunctionIPv4StringToNum
 public:
     static constexpr auto name = "isIPv4String";
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionIsIPv4String>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionIsIPv4String>(); }
 
     String getName() const override { return name; }
 
@@ -1913,7 +1914,7 @@ class FunctionIsIPv6String : public FunctionIPv6StringToNum
 public:
     static constexpr auto name = "isIPv6String";
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionIsIPv6String>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionIsIPv6String>(); }
 
     String getName() const override { return name; }
 
diff --git a/src/Functions/FunctionsComparison.h b/src/Functions/FunctionsComparison.h
index bbfa1ea20d8..025b7c67b21 100644
--- a/src/Functions/FunctionsComparison.h
+++ b/src/Functions/FunctionsComparison.h
@@ -552,22 +552,18 @@ struct NameLessOrEquals    { static constexpr auto name = "lessOrEquals"; };
 struct NameGreaterOrEquals { static constexpr auto name = "greaterOrEquals"; };
 
 
-template <
-    template <typename, typename> class Op,
-    typename Name>
+template <template <typename, typename> class Op, typename Name>
 class FunctionComparison : public IFunction
 {
 public:
     static constexpr auto name = Name::name;
-    static FunctionPtr create(const Context & context) { return std::make_shared<FunctionComparison>(context); }
+    static FunctionPtr create(ContextPtr context) { return std::make_shared<FunctionComparison>(context); }
 
-    explicit FunctionComparison(const Context & context_)
-    :   context(context_),
-        check_decimal_overflow(decimalCheckComparisonOverflow(context))
-    {}
+    explicit FunctionComparison(ContextPtr context_)
+        : context(context_), check_decimal_overflow(decimalCheckComparisonOverflow(context)) {}
 
 private:
-    const Context & context;
+    ContextPtr context;
     bool check_decimal_overflow = true;
 
     template <typename T0, typename T1>
diff --git a/src/Functions/FunctionsConsistentHashing.h b/src/Functions/FunctionsConsistentHashing.h
index faf66579fc4..17432cd7e78 100644
--- a/src/Functions/FunctionsConsistentHashing.h
+++ b/src/Functions/FunctionsConsistentHashing.h
@@ -6,6 +6,7 @@
 #include <Functions/FunctionHelpers.h>
 #include <Functions/IFunctionImpl.h>
 #include <Common/typeid_cast.h>
+#include <Interpreters/Context_fwd.h>
 
 
 namespace DB
@@ -23,7 +24,7 @@ class FunctionConsistentHashImpl : public IFunction
 public:
     static constexpr auto name = Impl::name;
 
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextPtr)
     {
         return std::make_shared<FunctionConsistentHashImpl<Impl>>();
     }
diff --git a/src/Functions/FunctionsConversion.h b/src/Functions/FunctionsConversion.h
index 2e2a4ce9cfa..9b40be58862 100644
--- a/src/Functions/FunctionsConversion.h
+++ b/src/Functions/FunctionsConversion.h
@@ -26,6 +26,7 @@
 #include <DataTypes/DataTypeUUID.h>
 #include <DataTypes/DataTypeInterval.h>
 #include <DataTypes/DataTypeAggregateFunction.h>
+#include <DataTypes/Serializations/SerializationDecimal.h>
 #include <Formats/FormatSettings.h>
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnFixedString.h>
@@ -44,6 +45,7 @@
 #include <Functions/FunctionHelpers.h>
 #include <Functions/DateTimeTransforms.h>
 #include <Functions/toFixedString.h>
+#include <Functions/TransformDateTime64.h>
 #include <DataTypes/DataTypeLowCardinality.h>
 #include <Columns/ColumnLowCardinality.h>
 #include <Interpreters/Context.h>
@@ -310,10 +312,15 @@ struct ToDateTimeImpl
         return time_zone.fromDayNum(DayNum(d));
     }
 
-    // no-op conversion from DateTime to DateTime, used in DateTime64 to DateTime conversion.
-    static inline UInt32 execute(UInt32 d, const DateLUTImpl & /*time_zone*/)
+    static inline UInt32 execute(UInt32 dt, const DateLUTImpl & /*time_zone*/)
     {
-        return d;
+        return dt;
+    }
+
+    // TODO: return UInt32 ???
+    static inline Int64 execute(Int64 dt64, const DateLUTImpl & /*time_zone*/)
+    {
+        return dt64;
     }
 };
 
@@ -329,6 +336,7 @@ struct ToDateTransform32Or64
 
     static inline NO_SANITIZE_UNDEFINED ToType execute(const FromType & from, const DateLUTImpl & time_zone)
     {
+        // since converting to Date, no need in values outside of default LUT range.
         return (from < 0xFFFF)
             ? from
             : time_zone.toDayNum(std::min(time_t(from), time_t(0xFFFFFFFF)));
@@ -342,6 +350,7 @@ struct ToDateTransform32Or64Signed
 
     static inline NO_SANITIZE_UNDEFINED ToType execute(const FromType & from, const DateLUTImpl & time_zone)
     {
+        // TODO: decide narrow or extended range based on FromType
         /// The function should be monotonic (better for query optimizations), so we saturate instead of overflow.
         if (from < 0)
             return 0;
@@ -447,35 +456,8 @@ template <typename Name> struct ConvertImpl<DataTypeFloat32, DataTypeDateTime, N
 template <typename Name> struct ConvertImpl<DataTypeFloat64, DataTypeDateTime, Name>
     : DateTimeTransformImpl<DataTypeFloat64, DataTypeDateTime, ToDateTimeTransform64Signed<Float64, UInt32>> {};
 
-
-/** Conversion of Date or DateTime to DateTime64: add zero sub-second part.
-  */
-struct ToDateTime64Transform
-{
-    static constexpr auto name = "toDateTime64";
-
-    const DateTime64::NativeType scale_multiplier = 1;
-
-    ToDateTime64Transform(UInt32 scale = 0)
-        : scale_multiplier(DecimalUtils::scaleMultiplier<DateTime64::NativeType>(scale))
-    {}
-
-    inline DateTime64::NativeType execute(UInt16 d, const DateLUTImpl & time_zone) const
-    {
-        const auto dt = ToDateTimeImpl::execute(d, time_zone);
-        return execute(dt, time_zone);
-    }
-
-    inline DateTime64::NativeType execute(UInt32 dt, const DateLUTImpl & /*time_zone*/) const
-    {
-        return DecimalUtils::decimalFromComponentsWithMultiplier<DateTime64>(dt, 0, scale_multiplier);
-    }
-};
-
-template <typename Name> struct ConvertImpl<DataTypeDate, DataTypeDateTime64, Name, ConvertDefaultBehaviorTag>
-    : DateTimeTransformImpl<DataTypeDate, DataTypeDateTime64, ToDateTime64Transform> {};
-template <typename Name> struct ConvertImpl<DataTypeDateTime, DataTypeDateTime64, Name, ConvertDefaultBehaviorTag>
-    : DateTimeTransformImpl<DataTypeDateTime, DataTypeDateTime64, ToDateTime64Transform> {};
+const time_t LUT_MIN_TIME = -1420070400l;       // 1925-01-01 UTC
+const time_t LUT_MAX_TIME = 9877248000l;        // 2282-12-31 UTC
 
 /** Conversion of numeric to DateTime64
   */
@@ -493,7 +475,7 @@ struct ToDateTime64TransformUnsigned
 
     inline NO_SANITIZE_UNDEFINED DateTime64::NativeType execute(FromType from, const DateLUTImpl &) const
     {
-        from = std::min(time_t(from), time_t(0xFFFFFFFF));
+        from = std::min<time_t>(from, LUT_MAX_TIME);
         return DecimalUtils::decimalFromComponentsWithMultiplier<DateTime64>(from, 0, scale_multiplier);
     }
 };
@@ -510,9 +492,8 @@ struct ToDateTime64TransformSigned
 
     inline NO_SANITIZE_UNDEFINED DateTime64::NativeType execute(FromType from, const DateLUTImpl &) const
     {
-        if (from < 0)
-            return 0;
-        from = std::min(time_t(from), time_t(0xFFFFFFFF));
+        from = std::max<time_t>(from, LUT_MIN_TIME);
+        from = std::min<time_t>(from, LUT_MAX_TIME);
         return DecimalUtils::decimalFromComponentsWithMultiplier<DateTime64>(from, 0, scale_multiplier);
     }
 };
@@ -551,6 +532,7 @@ template <typename Name> struct ConvertImpl<DataTypeFloat32, DataTypeDateTime64,
 template <typename Name> struct ConvertImpl<DataTypeFloat64, DataTypeDateTime64, Name>
     : DateTimeTransformImpl<DataTypeFloat64, DataTypeDateTime64, ToDateTime64TransformFloat<DataTypeFloat64, Float64>> {};
 
+
 /** Conversion of DateTime64 to Date or DateTime: discards fractional part.
  */
 template <typename Transform>
@@ -571,10 +553,41 @@ struct FromDateTime64Transform
     }
 };
 
+/** Conversion of DateTime64 to Date or DateTime: discards fractional part.
+ */
 template <typename Name> struct ConvertImpl<DataTypeDateTime64, DataTypeDate, Name, ConvertDefaultBehaviorTag>
-    : DateTimeTransformImpl<DataTypeDateTime64, DataTypeDate, FromDateTime64Transform<ToDateImpl>> {};
+    : DateTimeTransformImpl<DataTypeDateTime64, DataTypeDate, TransformDateTime64<ToDateImpl>> {};
 template <typename Name> struct ConvertImpl<DataTypeDateTime64, DataTypeDateTime, Name, ConvertDefaultBehaviorTag>
-    : DateTimeTransformImpl<DataTypeDateTime64, DataTypeDateTime, FromDateTime64Transform<ToDateTimeImpl>> {};
+    : DateTimeTransformImpl<DataTypeDateTime64, DataTypeDateTime, TransformDateTime64<ToDateTimeImpl>> {};
+
+struct ToDateTime64Transform
+{
+    static constexpr auto name = "toDateTime64";
+
+    const DateTime64::NativeType scale_multiplier = 1;
+
+    ToDateTime64Transform(UInt32 scale = 0)
+        : scale_multiplier(DecimalUtils::scaleMultiplier<DateTime64::NativeType>(scale))
+    {}
+
+    inline DateTime64::NativeType execute(UInt16 d, const DateLUTImpl & time_zone) const
+    {
+        const auto dt = ToDateTimeImpl::execute(d, time_zone);
+        return execute(dt, time_zone);
+    }
+
+    inline DateTime64::NativeType execute(UInt32 dt, const DateLUTImpl & /*time_zone*/) const
+    {
+        return DecimalUtils::decimalFromComponentsWithMultiplier<DateTime64>(dt, 0, scale_multiplier);
+    }
+};
+
+/** Conversion of Date or DateTime to DateTime64: add zero sub-second part.
+  */
+template <typename Name> struct ConvertImpl<DataTypeDate, DataTypeDateTime64, Name, ConvertDefaultBehaviorTag>
+    : DateTimeTransformImpl<DataTypeDate, DataTypeDateTime64, ToDateTime64Transform> {};
+template <typename Name> struct ConvertImpl<DataTypeDateTime, DataTypeDateTime64, Name, ConvertDefaultBehaviorTag>
+    : DateTimeTransformImpl<DataTypeDateTime, DataTypeDateTime64, ToDateTime64Transform> {};
 
 
 /** Transformation of numbers, dates, datetimes to strings: through formatting.
@@ -658,7 +671,6 @@ struct ConvertImpl<FromDataType, std::enable_if_t<!std::is_same_v<FromDataType,
         const auto & type = static_cast<const FromDataType &>(*col_with_type_and_name.type);
 
         const DateLUTImpl * time_zone = nullptr;
-
         /// For argument of DateTime type, second argument with time zone could be specified.
         if constexpr (std::is_same_v<FromDataType, DataTypeDateTime> || std::is_same_v<FromDataType, DataTypeDateTime64>)
             time_zone = &extractTimeZoneFromFunctionArguments(arguments, 1, 0);
@@ -725,9 +737,10 @@ struct ConvertImplGenericToString
         WriteBufferFromVector<ColumnString::Chars> write_buffer(data_to);
 
         FormatSettings format_settings;
+        auto serialization = type.getDefaultSerialization();
         for (size_t i = 0; i < size; ++i)
         {
-            type.serializeAsText(col_from, i, write_buffer, format_settings);
+            serialization->serializeText(col_from, i, write_buffer, format_settings);
             writeChar(0, write_buffer);
             offsets_to[i] = write_buffer.count();
         }
@@ -754,14 +767,18 @@ inline void parseImpl<DataTypeDate>(DataTypeDate::FieldType & x, ReadBuffer & rb
     x = tmp;
 }
 
+// NOTE: no need of extra overload of DateTime64, since readDateTimeText64 has different signature and that case is explicitly handled in the calling code.
 template <>
 inline void parseImpl<DataTypeDateTime>(DataTypeDateTime::FieldType & x, ReadBuffer & rb, const DateLUTImpl * time_zone)
 {
-    time_t tmp = 0;
-    readDateTimeText(tmp, rb, *time_zone);
-    x = tmp;
+    time_t time = 0;
+    readDateTimeText(time, rb, *time_zone);
+    if (time < 0)
+        time = 0;
+    x = time;
 }
 
+
 template <>
 inline void parseImpl<DataTypeUUID>(DataTypeUUID::FieldType & x, ReadBuffer & rb, const DateLUTImpl *)
 {
@@ -989,9 +1006,18 @@ struct ConvertThroughParsing
                 }
                 else if constexpr (parsing_mode == ConvertFromStringParsingMode::BestEffortUS)
                 {
-                    time_t res;
-                    parseDateTimeBestEffortUS(res, read_buffer, *local_time_zone, *utc_time_zone);
-                    vec_to[i] = res;
+                    if constexpr (to_datetime64)
+                    {
+                        DateTime64 res = 0;
+                        parseDateTime64BestEffortUS(res, vec_to.getScale(), read_buffer, *local_time_zone, *utc_time_zone);
+                        vec_to[i] = res;
+                    }
+                    else
+                    {
+                        time_t res;
+                        parseDateTimeBestEffortUS(res, read_buffer, *local_time_zone, *utc_time_zone);
+                        vec_to[i] = res;
+                    }
                 }
                 else
                 {
@@ -1002,7 +1028,7 @@ struct ConvertThroughParsing
                         vec_to[i] = value;
                     }
                     else if constexpr (IsDataTypeDecimal<ToDataType>)
-                        ToDataType::readText(vec_to[i], read_buffer, ToDataType::maxPrecision(), vec_to.getScale());
+                        SerializationDecimal<typename ToDataType::FieldType>::readText(vec_to[i], read_buffer, ToDataType::maxPrecision(), vec_to.getScale());
                     else
                         parseImpl<ToDataType>(vec_to[i], read_buffer, local_time_zone);
                 }
@@ -1044,7 +1070,7 @@ struct ConvertThroughParsing
                         vec_to[i] = value;
                     }
                     else if constexpr (IsDataTypeDecimal<ToDataType>)
-                        parsed = ToDataType::tryReadText(vec_to[i], read_buffer, ToDataType::maxPrecision(), vec_to.getScale());
+                        parsed = SerializationDecimal<typename ToDataType::FieldType>::tryReadText(vec_to[i], read_buffer, ToDataType::maxPrecision(), vec_to.getScale());
                     else
                         parsed = tryParseImpl<ToDataType>(vec_to[i], read_buffer, local_time_zone);
                 }
@@ -1108,11 +1134,12 @@ struct ConvertImplGenericFromString
             size_t current_offset = 0;
 
             FormatSettings format_settings;
+            auto serialization = data_type_to.getDefaultSerialization();
             for (size_t i = 0; i < size; ++i)
             {
                 ReadBufferFromMemory read_buffer(&chars[current_offset], offsets[i] - current_offset - 1);
 
-                data_type_to.deserializeAsWholeText(column_to, read_buffer, format_settings);
+                serialization->deserializeWholeText(column_to, read_buffer, format_settings);
 
                 if (!read_buffer.eof())
                     throwExceptionForIncompletelyParsedValue(read_buffer, result_type);
@@ -1263,7 +1290,7 @@ public:
     static constexpr bool to_string_or_fixed_string = std::is_same_v<ToDataType, DataTypeFixedString> ||
                                                       std::is_same_v<ToDataType, DataTypeString>;
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionConvert>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionConvert>(); }
     static FunctionPtr create() { return std::make_shared<FunctionConvert>(); }
 
     String getName() const override
@@ -1559,7 +1586,7 @@ public:
 
     static constexpr bool to_datetime64 = std::is_same_v<ToDataType, DataTypeDateTime64>;
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionConvertFromString>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionConvertFromString>(); }
     static FunctionPtr create() { return std::make_shared<FunctionConvertFromString>(); }
 
     String getName() const override
@@ -2248,7 +2275,7 @@ private:
     std::optional<Diagnostic> diagnostic;
     CastType cast_type;
 
-    WrapperType createFunctionAdaptor(FunctionPtr function, const DataTypePtr & from_type) const
+    static WrapperType createFunctionAdaptor(FunctionPtr function, const DataTypePtr & from_type)
     {
         auto function_adaptor = FunctionOverloadResolverAdaptor(std::make_unique<DefaultOverloadResolver>(function))
                                     .build({ColumnWithTypeAndName{nullptr, from_type, ""}});
@@ -2340,7 +2367,7 @@ private:
         };
     }
 
-    WrapperType createStringWrapper(const DataTypePtr & from_type) const
+    static WrapperType createStringWrapper(const DataTypePtr & from_type)
     {
         FunctionPtr function = FunctionToString::create();
         return createFunctionAdaptor(function, from_type);
@@ -2586,7 +2613,7 @@ private:
     WrapperType createTupleToMapWrapper(const DataTypes & from_kv_types, const DataTypes & to_kv_types) const
     {
         return [element_wrappers = getElementWrappers(from_kv_types, to_kv_types), from_kv_types, to_kv_types]
-            (ColumnsWithTypeAndName & arguments, const DataTypePtr &, const ColumnNullable * nullable_source, size_t input_rows_count) -> ColumnPtr
+            (ColumnsWithTypeAndName & arguments, const DataTypePtr &, const ColumnNullable * nullable_source, size_t /*input_rows_count*/) -> ColumnPtr
         {
             const auto * col = arguments.front().column.get();
             const auto & column_tuple = assert_cast<const ColumnTuple &>(*col);
@@ -2597,7 +2624,7 @@ private:
             {
                 const auto & column_array = assert_cast<const ColumnArray &>(column_tuple.getColumn(i));
                 ColumnsWithTypeAndName element = {{column_array.getDataPtr(), from_kv_types[i], ""}};
-                converted_columns[i] = element_wrappers[i](element, to_kv_types[i], nullable_source, input_rows_count);
+                converted_columns[i] = element_wrappers[i](element, to_kv_types[i], nullable_source, (element[0].column)->size());
                 offsets[i] = column_array.getOffsetsPtr();
             }
 
@@ -2614,7 +2641,7 @@ private:
     WrapperType createMapToMapWrrapper(const DataTypes & from_kv_types, const DataTypes & to_kv_types) const
     {
         return [element_wrappers = getElementWrappers(from_kv_types, to_kv_types), from_kv_types, to_kv_types]
-            (ColumnsWithTypeAndName & arguments, const DataTypePtr &, const ColumnNullable * nullable_source, size_t input_rows_count) -> ColumnPtr
+            (ColumnsWithTypeAndName & arguments, const DataTypePtr &, const ColumnNullable * nullable_source, size_t /*input_rows_count*/) -> ColumnPtr
         {
             const auto * col = arguments.front().column.get();
             const auto & column_map = typeid_cast<const ColumnMap &>(*col);
@@ -2624,7 +2651,7 @@ private:
             for (size_t i = 0; i < 2; ++i)
             {
                 ColumnsWithTypeAndName element = {{nested_data.getColumnPtr(i), from_kv_types[i], ""}};
-                converted_columns[i] = element_wrappers[i](element, to_kv_types[i], nullable_source, input_rows_count);
+                converted_columns[i] = element_wrappers[i](element, to_kv_types[i], nullable_source, (element[0].column)->size());
             }
 
             return ColumnMap::create(converted_columns[0], converted_columns[1], column_map.getNestedColumn().getOffsetsPtr());
@@ -2635,7 +2662,7 @@ private:
     WrapperType createArrayToMapWrrapper(const DataTypes & from_kv_types, const DataTypes & to_kv_types) const
     {
         return [element_wrappers = getElementWrappers(from_kv_types, to_kv_types), from_kv_types, to_kv_types]
-            (ColumnsWithTypeAndName & arguments, const DataTypePtr &, const ColumnNullable * nullable_source, size_t input_rows_count) -> ColumnPtr
+            (ColumnsWithTypeAndName & arguments, const DataTypePtr &, const ColumnNullable * nullable_source, size_t /*input_rows_count*/) -> ColumnPtr
         {
             const auto * col = arguments.front().column.get();
             const auto & column_array = typeid_cast<const ColumnArray &>(*col);
@@ -2645,7 +2672,7 @@ private:
             for (size_t i = 0; i < 2; ++i)
             {
                 ColumnsWithTypeAndName element = {{nested_data.getColumnPtr(i), from_kv_types[i], ""}};
-                converted_columns[i] = element_wrappers[i](element, to_kv_types[i], nullable_source, input_rows_count);
+                converted_columns[i] = element_wrappers[i](element, to_kv_types[i], nullable_source, (element[0].column)->size());
             }
 
             return ColumnMap::create(converted_columns[0], converted_columns[1], column_array.getOffsetsPtr());
@@ -2774,12 +2801,16 @@ private:
                 auto & out_data = static_cast<typename EnumType::ColumnType &>(*res).getData();
                 out_data.resize(size);
 
+                auto default_enum_value = result_type.getValues().front().second;
+
                 if (nullable_col)
                 {
                     for (const auto i : ext::range(0, size))
                     {
                         if (!nullable_col->isNullAt(i))
                             out_data[i] = result_type.getValue(col->getDataAt(i));
+                        else
+                            out_data[i] = default_enum_value;
                     }
                 }
                 else
@@ -3094,43 +3125,43 @@ public:
 
     static MonotonicityForRange getMonotonicityInformation(const DataTypePtr & from_type, const IDataType * to_type)
     {
-        if (const auto type = checkAndGetDataType<DataTypeUInt8>(to_type))
+        if (const auto *const type = checkAndGetDataType<DataTypeUInt8>(to_type))
             return monotonicityForType(type);
-        if (const auto type = checkAndGetDataType<DataTypeUInt16>(to_type))
+        if (const auto *const type = checkAndGetDataType<DataTypeUInt16>(to_type))
             return monotonicityForType(type);
-        if (const auto type = checkAndGetDataType<DataTypeUInt32>(to_type))
+        if (const auto *const type = checkAndGetDataType<DataTypeUInt32>(to_type))
             return monotonicityForType(type);
-        if (const auto type = checkAndGetDataType<DataTypeUInt64>(to_type))
+        if (const auto *const type = checkAndGetDataType<DataTypeUInt64>(to_type))
             return monotonicityForType(type);
-        if (const auto type = checkAndGetDataType<DataTypeUInt256>(to_type))
+        if (const auto *const type = checkAndGetDataType<DataTypeUInt256>(to_type))
             return monotonicityForType(type);
-        if (const auto type = checkAndGetDataType<DataTypeInt8>(to_type))
+        if (const auto *const type = checkAndGetDataType<DataTypeInt8>(to_type))
             return monotonicityForType(type);
-        if (const auto type = checkAndGetDataType<DataTypeInt16>(to_type))
+        if (const auto *const type = checkAndGetDataType<DataTypeInt16>(to_type))
             return monotonicityForType(type);
-        if (const auto type = checkAndGetDataType<DataTypeInt32>(to_type))
+        if (const auto *const type = checkAndGetDataType<DataTypeInt32>(to_type))
             return monotonicityForType(type);
-        if (const auto type = checkAndGetDataType<DataTypeInt64>(to_type))
+        if (const auto *const type = checkAndGetDataType<DataTypeInt64>(to_type))
             return monotonicityForType(type);
-        if (const auto type = checkAndGetDataType<DataTypeInt128>(to_type))
+        if (const auto *const type = checkAndGetDataType<DataTypeInt128>(to_type))
             return monotonicityForType(type);
-        if (const auto type = checkAndGetDataType<DataTypeInt256>(to_type))
+        if (const auto *const type = checkAndGetDataType<DataTypeInt256>(to_type))
             return monotonicityForType(type);
-        if (const auto type = checkAndGetDataType<DataTypeFloat32>(to_type))
+        if (const auto *const type = checkAndGetDataType<DataTypeFloat32>(to_type))
             return monotonicityForType(type);
-        if (const auto type = checkAndGetDataType<DataTypeFloat64>(to_type))
+        if (const auto *const type = checkAndGetDataType<DataTypeFloat64>(to_type))
             return monotonicityForType(type);
-        if (const auto type = checkAndGetDataType<DataTypeDate>(to_type))
+        if (const auto *const type = checkAndGetDataType<DataTypeDate>(to_type))
             return monotonicityForType(type);
-        if (const auto type = checkAndGetDataType<DataTypeDateTime>(to_type))
+        if (const auto *const type = checkAndGetDataType<DataTypeDateTime>(to_type))
             return monotonicityForType(type);
-        if (const auto type = checkAndGetDataType<DataTypeString>(to_type))
+        if (const auto *const type = checkAndGetDataType<DataTypeString>(to_type))
             return monotonicityForType(type);
         if (isEnum(from_type))
         {
-            if (const auto type = checkAndGetDataType<DataTypeEnum8>(to_type))
+            if (const auto *const type = checkAndGetDataType<DataTypeEnum8>(to_type))
                 return monotonicityForType(type);
-            if (const auto type = checkAndGetDataType<DataTypeEnum16>(to_type))
+            if (const auto *const type = checkAndGetDataType<DataTypeEnum16>(to_type))
                 return monotonicityForType(type);
         }
         /// other types like Null, FixedString, Array and Tuple have no monotonicity defined
@@ -3153,9 +3184,9 @@ public:
         ? accurate_cast_name
         : (cast_type == CastType::accurateOrNull ? accurate_cast_or_null_name : cast_name);
 
-    static FunctionOverloadResolverImplPtr create(const Context & context)
+    static FunctionOverloadResolverImplPtr create(ContextPtr context)
     {
-        return createImpl(context.getSettingsRef().cast_keep_nullable);
+        return createImpl(context->getSettingsRef().cast_keep_nullable);
     }
 
     static FunctionOverloadResolverImplPtr createImpl(bool keep_nullable, std::optional<Diagnostic> diagnostic = {})
diff --git a/src/Functions/FunctionsEmbeddedDictionaries.h b/src/Functions/FunctionsEmbeddedDictionaries.h
index 01456365740..7584a217a26 100644
--- a/src/Functions/FunctionsEmbeddedDictionaries.h
+++ b/src/Functions/FunctionsEmbeddedDictionaries.h
@@ -483,81 +483,81 @@ struct NameRegionIn                    { static constexpr auto name = "regionIn"
 struct FunctionRegionToCity :
     public FunctionTransformWithDictionary<UInt32, RegionToCityImpl,    RegionsHierarchyGetter,    NameRegionToCity>
 {
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextPtr context)
     {
-        return std::make_shared<base_type>(context.getEmbeddedDictionaries().getRegionsHierarchies());
+        return std::make_shared<base_type>(context->getEmbeddedDictionaries().getRegionsHierarchies());
     }
 };
 
 struct FunctionRegionToArea :
     public FunctionTransformWithDictionary<UInt32, RegionToAreaImpl,    RegionsHierarchyGetter,    NameRegionToArea>
 {
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextPtr context)
     {
-        return std::make_shared<base_type>(context.getEmbeddedDictionaries().getRegionsHierarchies());
+        return std::make_shared<base_type>(context->getEmbeddedDictionaries().getRegionsHierarchies());
     }
 };
 
 struct FunctionRegionToDistrict :
     public FunctionTransformWithDictionary<UInt32, RegionToDistrictImpl, RegionsHierarchyGetter, NameRegionToDistrict>
 {
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextPtr context)
     {
-        return std::make_shared<base_type>(context.getEmbeddedDictionaries().getRegionsHierarchies());
+        return std::make_shared<base_type>(context->getEmbeddedDictionaries().getRegionsHierarchies());
     }
 };
 
 struct FunctionRegionToCountry :
     public FunctionTransformWithDictionary<UInt32, RegionToCountryImpl, RegionsHierarchyGetter, NameRegionToCountry>
 {
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextPtr context)
     {
-        return std::make_shared<base_type>(context.getEmbeddedDictionaries().getRegionsHierarchies());
+        return std::make_shared<base_type>(context->getEmbeddedDictionaries().getRegionsHierarchies());
     }
 };
 
 struct FunctionRegionToContinent :
     public FunctionTransformWithDictionary<UInt32, RegionToContinentImpl, RegionsHierarchyGetter, NameRegionToContinent>
 {
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextPtr context)
     {
-        return std::make_shared<base_type>(context.getEmbeddedDictionaries().getRegionsHierarchies());
+        return std::make_shared<base_type>(context->getEmbeddedDictionaries().getRegionsHierarchies());
     }
 };
 
 struct FunctionRegionToTopContinent :
     public FunctionTransformWithDictionary<UInt32, RegionToTopContinentImpl, RegionsHierarchyGetter, NameRegionToTopContinent>
 {
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextPtr context)
     {
-        return std::make_shared<base_type>(context.getEmbeddedDictionaries().getRegionsHierarchies());
+        return std::make_shared<base_type>(context->getEmbeddedDictionaries().getRegionsHierarchies());
     }
 };
 
 struct FunctionRegionToPopulation :
     public FunctionTransformWithDictionary<UInt32, RegionToPopulationImpl, RegionsHierarchyGetter, NameRegionToPopulation>
 {
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextPtr context)
     {
-        return std::make_shared<base_type>(context.getEmbeddedDictionaries().getRegionsHierarchies());
+        return std::make_shared<base_type>(context->getEmbeddedDictionaries().getRegionsHierarchies());
     }
 };
 
 struct FunctionRegionIn :
     public FunctionIsInWithDictionary<UInt32, RegionInImpl, RegionsHierarchyGetter,    NameRegionIn>
 {
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextPtr context)
     {
-        return std::make_shared<base_type>(context.getEmbeddedDictionaries().getRegionsHierarchies());
+        return std::make_shared<base_type>(context->getEmbeddedDictionaries().getRegionsHierarchies());
     }
 };
 
 struct FunctionRegionHierarchy :
     public FunctionHierarchyWithDictionary<UInt32, RegionHierarchyImpl, RegionsHierarchyGetter, NameRegionHierarchy>
 {
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextPtr context)
     {
-        return std::make_shared<base_type>(context.getEmbeddedDictionaries().getRegionsHierarchies());
+        return std::make_shared<base_type>(context->getEmbeddedDictionaries().getRegionsHierarchies());
     }
 };
 
@@ -567,9 +567,9 @@ class FunctionRegionToName : public IFunction
 {
 public:
     static constexpr auto name = "regionToName";
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextPtr context)
     {
-        return std::make_shared<FunctionRegionToName>(context.getEmbeddedDictionaries().getRegionsNames());
+        return std::make_shared<FunctionRegionToName>(context->getEmbeddedDictionaries().getRegionsNames());
     }
 
 private:
@@ -643,9 +643,9 @@ public:
 
             const ColumnUInt32::Container & region_ids = col_from->getData();
 
-            for (size_t i = 0; i < region_ids.size(); ++i)
+            for (unsigned int region_id : region_ids)
             {
-                const StringRef & name_ref = dict.getRegionName(region_ids[i], language);
+                const StringRef & name_ref = dict.getRegionName(region_id, language);
                 col_to->insertDataWithTerminatingZero(name_ref.data, name_ref.size + 1);
             }
 
diff --git a/src/Functions/FunctionsExternalDictionaries.cpp b/src/Functions/FunctionsExternalDictionaries.cpp
index f037a3bd808..6b83f761086 100644
--- a/src/Functions/FunctionsExternalDictionaries.cpp
+++ b/src/Functions/FunctionsExternalDictionaries.cpp
@@ -24,6 +24,8 @@ void registerFunctionsExternalDictionaries(FunctionFactory & factory)
     factory.registerFunction<FunctionDictGetString>();
     factory.registerFunction<FunctionDictGetHierarchy>();
     factory.registerFunction<FunctionDictIsIn>();
+    factory.registerFunction<FunctionDictGetChildren>();
+    factory.registerFunction<FunctionDictGetDescendants>();
     factory.registerFunction<FunctionDictGetUInt8OrDefault>();
     factory.registerFunction<FunctionDictGetUInt16OrDefault>();
     factory.registerFunction<FunctionDictGetUInt32OrDefault>();
@@ -40,6 +42,7 @@ void registerFunctionsExternalDictionaries(FunctionFactory & factory)
     factory.registerFunction<FunctionDictGetStringOrDefault>();
     factory.registerFunction<FunctionDictGetNoType<DictionaryGetFunctionType::get>>();
     factory.registerFunction<FunctionDictGetNoType<DictionaryGetFunctionType::getOrDefault>>();
+    factory.registerFunction<FunctionDictGetOrNull>();
 }
 
 }
diff --git a/src/Functions/FunctionsExternalDictionaries.h b/src/Functions/FunctionsExternalDictionaries.h
index ac59775a755..6157b532cb9 100644
--- a/src/Functions/FunctionsExternalDictionaries.h
+++ b/src/Functions/FunctionsExternalDictionaries.h
@@ -19,30 +19,16 @@
 #include <Columns/ColumnArray.h>
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnTuple.h>
+#include <Columns/ColumnNullable.h>
 
 #include <Access/AccessFlags.h>
 
 #include <Interpreters/Context.h>
 #include <Interpreters/ExternalDictionariesLoader.h>
+#include <Interpreters/castColumn.h>
 
 #include <Functions/IFunctionImpl.h>
 #include <Functions/FunctionHelpers.h>
-
-#include <Dictionaries/FlatDictionary.h>
-#include <Dictionaries/HashedDictionary.h>
-#include <Dictionaries/CacheDictionary.h>
-#if defined(OS_LINUX) || defined(__FreeBSD__)
-#include <Dictionaries/SSDCacheDictionary.h>
-#include <Dictionaries/SSDComplexKeyCacheDictionary.h>
-#endif
-#include <Dictionaries/ComplexKeyHashedDictionary.h>
-#include <Dictionaries/ComplexKeyCacheDictionary.h>
-#include <Dictionaries/ComplexKeyDirectDictionary.h>
-#include <Dictionaries/RangeHashedDictionary.h>
-#include <Dictionaries/IPAddressDictionary.h>
-#include <Dictionaries/PolygonDictionaryImplementations.h>
-#include <Dictionaries/DirectDictionary.h>
-
 #include <ext/range.h>
 
 #include <type_traits>
@@ -54,12 +40,10 @@ namespace ErrorCodes
 {
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
     extern const int UNSUPPORTED_METHOD;
-    extern const int UNKNOWN_TYPE;
     extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
     extern const int ILLEGAL_COLUMN;
     extern const int BAD_ARGUMENTS;
     extern const int TYPE_MISMATCH;
-    extern const int NOT_IMPLEMENTED;
 }
 
 
@@ -78,26 +62,31 @@ namespace ErrorCodes
   */
 
 
-class FunctionDictHelper
+class FunctionDictHelper : WithContext
 {
 public:
-    explicit FunctionDictHelper(const Context & context_) : context(context_), external_loader(context.getExternalDictionariesLoader()) {}
+    explicit FunctionDictHelper(ContextPtr context_) : WithContext(context_) {}
 
-    std::shared_ptr<const IDictionaryBase> getDictionary(const String & dictionary_name)
+    std::shared_ptr<const IDictionary> getDictionary(const String & dictionary_name)
     {
-        String resolved_name = DatabaseCatalog::instance().resolveDictionaryName(dictionary_name);
-        auto dict = external_loader.getDictionary(resolved_name);
+        auto dict = getContext()->getExternalDictionariesLoader().getDictionary(dictionary_name, getContext());
+
         if (!access_checked)
         {
-            context.checkAccess(AccessType::dictGet, dict->getDatabaseOrNoDatabaseTag(), dict->getDictionaryID().getTableName());
+            getContext()->checkAccess(AccessType::dictGet, dict->getDatabaseOrNoDatabaseTag(), dict->getDictionaryID().getTableName());
             access_checked = true;
         }
+
         return dict;
     }
 
-    std::shared_ptr<const IDictionaryBase> getDictionary(const ColumnWithTypeAndName & column)
+    std::shared_ptr<const IDictionary> getDictionary(const ColumnPtr & column)
     {
-        const auto * dict_name_col = checkAndGetColumnConst<ColumnString>(column.column.get());
+        const auto * dict_name_col = checkAndGetColumnConst<ColumnString>(column.get());
+
+        if (!dict_name_col)
+            throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "Expected const String column");
+
         return getDictionary(dict_name_col->getValue<String>());
     }
 
@@ -108,31 +97,25 @@ public:
             return false;
 
         if (sample_columns.columns() < 3)
-            throw Exception{"Wrong arguments count", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH};
+            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Wrong arguments count");
 
         const auto * dict_name_col = checkAndGetColumnConst<ColumnString>(sample_columns.getByPosition(0).column.get());
         if (!dict_name_col)
-            throw Exception{"First argument of function dictGet... must be a constant string", ErrorCodes::ILLEGAL_COLUMN};
+            throw Exception(ErrorCodes::ILLEGAL_COLUMN, "First argument of function dictGet must be a constant string");
 
         const auto * attr_name_col = checkAndGetColumnConst<ColumnString>(sample_columns.getByPosition(1).column.get());
         if (!attr_name_col)
-            throw Exception{"Second argument of function dictGet... must be a constant string", ErrorCodes::ILLEGAL_COLUMN};
+            throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Second argument of function dictGet... must be a constant string");
 
         return getDictionary(dict_name_col->getValue<String>())->isInjective(attr_name_col->getValue<String>());
     }
 
     DictionaryStructure getDictionaryStructure(const String & dictionary_name) const
     {
-        String resolved_name = DatabaseCatalog::instance().resolveDictionaryName(dictionary_name);
-        auto load_result = external_loader.getLoadResult(resolved_name);
-        if (!load_result.config)
-            throw Exception("Dictionary " + backQuote(dictionary_name) + " not found", ErrorCodes::BAD_ARGUMENTS);
-        return ExternalDictionariesLoader::getDictionaryStructure(*load_result.config);
+        return getContext()->getExternalDictionariesLoader().getDictionaryStructure(dictionary_name, getContext());
     }
 
 private:
-    const Context & context;
-    const ExternalDictionariesLoader & external_loader;
     /// Access cannot be not granted, since in this case checkAccess() will throw and access_checked will not be updated.
     std::atomic<bool> access_checked = false;
 
@@ -149,37 +132,47 @@ class FunctionDictHas final : public IFunction
 public:
     static constexpr auto name = "dictHas";
 
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextPtr context)
     {
         return std::make_shared<FunctionDictHas>(context);
     }
 
-    explicit FunctionDictHas(const Context & context_) : helper(context_) {}
+    explicit FunctionDictHas(ContextPtr context_) : helper(context_) {}
 
     String getName() const override { return name; }
 
-private:
-    size_t getNumberOfArguments() const override { return 2; }
+    size_t getNumberOfArguments() const override { return 0; }
+    bool isVariadic() const override { return true; }
+
+    bool isDeterministic() const override { return false; }
 
     bool useDefaultImplementationForConstants() const final { return true; }
+
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const final { return {0}; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
+        if (arguments.size() < 2)
+            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+                "Wrong argument count for function {}",
+                getName());
+
         if (!isString(arguments[0]))
-            throw Exception{"Illegal type " + arguments[0]->getName() + " of first argument of function " + getName()
-                + ", expected a string.", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Illegal type {} of first argument of function, expected a string",
+                arguments[0]->getName(),
+                getName());
 
         if (!WhichDataType(arguments[1]).isUInt64() &&
             !isTuple(arguments[1]))
-            throw Exception{"Illegal type " + arguments[1]->getName() + " of second argument of function " + getName()
-                + ", must be UInt64 or tuple(...).", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Illegal type {} of second argument of function {} must be UInt64 or tuple(...)",
+                arguments[1]->getName(),
+                getName());
 
         return std::make_shared<DataTypeUInt8>();
     }
 
-    bool isDeterministic() const override { return false; }
-
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
         /** Do not require existence of the dictionary if the function is called for empty columns.
@@ -192,26 +185,52 @@ private:
         if (input_rows_count == 0)
             return result_type->createColumn();
 
-        auto dictionary = helper.getDictionary(arguments[0]);
+        auto dictionary = helper.getDictionary(arguments[0].column);
         auto dictionary_key_type = dictionary->getKeyType();
 
         const ColumnWithTypeAndName & key_column_with_type = arguments[1];
         const auto key_column = key_column_with_type.column;
         const auto key_column_type = WhichDataType(key_column_with_type.type);
 
+        ColumnPtr range_col = nullptr;
+        DataTypePtr range_col_type = nullptr;
+
+        if (dictionary_key_type == DictionaryKeyType::range)
+        {
+            if (arguments.size() != 3)
+                throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+                    "Wrong argument count for function {} when dictionary has key type range",
+                    getName());
+
+            range_col = arguments[2].column;
+            range_col_type = arguments[2].type;
+
+            if (!(range_col_type->isValueRepresentedByInteger() && range_col_type->getSizeOfValueInMemory() <= sizeof(Int64)))
+                throw Exception(ErrorCodes::ILLEGAL_COLUMN,
+                    "Illegal type {} of fourth argument of function {} must be convertible to Int64.",
+                    range_col_type->getName(),
+                    getName());
+        }
+
         if (dictionary_key_type == DictionaryKeyType::simple)
         {
             if (!key_column_type.isUInt64())
-                throw Exception{"Second argument of function " + getName() + " must be " + dictionary->getStructure().getKeyDescription(),
-                    ErrorCodes::TYPE_MISMATCH};
+                 throw Exception(
+                     ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                     "Second argument of function {} must be UInt64 when dictionary is simple. Actual type {}.",
+                     getName(),
+                     key_column_with_type.type->getName());
 
             return dictionary->hasKeys({key_column}, {std::make_shared<DataTypeUInt64>()});
         }
         else if (dictionary_key_type == DictionaryKeyType::complex)
         {
             if (!key_column_type.isTuple())
-                throw Exception{"Second argument of function " + getName() + " must be " + dictionary->getStructure().getKeyDescription(),
-                    ErrorCodes::TYPE_MISMATCH};
+                throw Exception(
+                    ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                    "Second argument of function {} must be tuple when dictionary is complex. Actual type {}.",
+                    getName(),
+                    key_column_with_type.type->getName());
 
             /// Functions in external dictionaries_loader only support full-value (not constant) columns with keys.
             ColumnPtr key_column_full = key_column->convertToFullColumnIfConst();
@@ -222,9 +241,19 @@ private:
             return dictionary->hasKeys(key_columns, key_types);
         }
         else
-            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Has not supported for range dictionary", dictionary->getDictionaryID().getNameForLogs());
+        {
+            if (!key_column_type.isUInt64())
+                throw Exception(
+                    ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                    "Second argument of function {} must be UInt64 when dictionary is range. Actual type {}.",
+                    getName(),
+                    key_column_with_type.type->getName());
+
+            return dictionary->hasKeys({key_column, range_col}, {std::make_shared<DataTypeUInt64>(), range_col_type});
+        }
     }
 
+private:
     mutable FunctionDictHelper helper;
 };
 
@@ -241,12 +270,12 @@ class FunctionDictGetNoType final : public IFunction
 public:
     static constexpr auto name = dictionary_get_function_type == DictionaryGetFunctionType::get ? "dictGet" : "dictGetOrDefault";
 
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextPtr context)
     {
         return std::make_shared<FunctionDictGetNoType>(context);
     }
 
-    explicit FunctionDictGetNoType(const Context & context_) : helper(context_) {}
+    explicit FunctionDictGetNoType(ContextPtr context_) : helper(context_) {}
 
     String getName() const override { return name; }
 
@@ -266,24 +295,36 @@ public:
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
         if (arguments.size() < 3)
-            throw Exception{"Wrong argument count for function " + getName(), ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH};
+            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+                "Wrong argument count for function {}",
+                getName());
 
         String dictionary_name;
         if (const auto * name_col = checkAndGetColumnConst<ColumnString>(arguments[0].column.get()))
             dictionary_name = name_col->getValue<String>();
         else
-            throw Exception{"Illegal type " + arguments[0].type->getName() + " of first argument of function " + getName()
-                + ", expected a const string.", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Illegal type {} of first argument of function {}, expected a const string.",
+                arguments[0].type->getName(),
+                getName());
 
-        String attribute_name;
-        if (const auto * name_col = checkAndGetColumnConst<ColumnString>(arguments[1].column.get()))
-            attribute_name = name_col->getValue<String>();
+        Strings attribute_names = getAttributeNamesFromColumn(arguments[1].column, arguments[1].type);
+
+        DataTypes types;
+
+        auto dictionary_structure = helper.getDictionaryStructure(dictionary_name);
+
+        for (auto & attribute_name : attribute_names)
+        {
+            /// We're extracting the return type from the dictionary's config, without loading the dictionary.
+            auto attribute = dictionary_structure.getAttribute(attribute_name);
+            types.emplace_back(attribute.type);
+        }
+
+        if (types.size() > 1)
+            return std::make_shared<DataTypeTuple>(types, attribute_names);
         else
-            throw Exception{"Illegal type " + arguments[1].type->getName() + " of second argument of function " + getName()
-                + ", expected a const string.", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
-
-        /// We're extracting the return type from the dictionary's config, without loading the dictionary.
-        return helper.getDictionaryStructure(dictionary_name).getAttribute(attribute_name).type;
+            return types.front();
     }
 
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
@@ -296,23 +337,20 @@ public:
         if (const auto * name_col = checkAndGetColumnConst<ColumnString>(arguments[0].column.get()))
             dictionary_name = name_col->getValue<String>();
         else
-            throw Exception{"Illegal type " + arguments[0].type->getName() + " of first argument of function " + getName()
-                + ", expected a const string.", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Illegal type {} of first argument of function {}, expected a const string.",
+                arguments[0].type->getName(),
+                getName());
 
-        String attribute_name;
-
-        if (const auto * name_col = checkAndGetColumnConst<ColumnString>(arguments[1].column.get()))
-            attribute_name = name_col->getValue<String>();
-        else
-            throw Exception{"Illegal type " + arguments[1].type->getName() + " of second argument of function " + getName()
-                + ", expected a const string.", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
+        Strings attribute_names = getAttributeNamesFromColumn(arguments[1].column, arguments[1].type);
 
         auto dictionary = helper.getDictionary(dictionary_name);
 
         if (!WhichDataType(arguments[2].type).isUInt64() && !isTuple(arguments[2].type))
-            throw Exception{"Illegal type " + arguments[2].type->getName() + " of third argument of function "
-                    + getName() + ", must be UInt64 or tuple(...).",
-                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Illegal type {} of third argument of function {}, must be UInt64 or tuple(...).",
+                arguments[2].type->getName(),
+                getName());
 
         auto dictionary_key_type = dictionary->getKeyType();
 
@@ -324,27 +362,81 @@ public:
         if (dictionary_key_type == DictionaryKeyType::range)
         {
             if (current_arguments_index >= arguments.size())
-                throw Exception{"Wrong argument count for function " + getName(), ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH};
+                throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+                    "Number of arguments for function {} doesn't match: passed {} should be {}",
+                    getName(),
+                    arguments.size(),
+                    arguments.size() + 1);
 
             range_col = arguments[current_arguments_index].column;
             range_col_type = arguments[current_arguments_index].type;
 
             if (!(range_col_type->isValueRepresentedByInteger() && range_col_type->getSizeOfValueInMemory() <= sizeof(Int64)))
-                throw Exception{"Illegal type " + range_col_type->getName() + " of fourth argument of function "
-                        + getName() + " must be convertible to Int64.",
-                    ErrorCodes::ILLEGAL_COLUMN};
+                throw Exception(ErrorCodes::ILLEGAL_COLUMN,
+                    "Illegal type {} of fourth argument of function must be convertible to Int64.",
+                    range_col_type->getName(),
+                    getName());
 
             ++current_arguments_index;
         }
 
-        ColumnPtr default_col = nullptr;
+        Columns default_cols;
 
         if (dictionary_get_function_type == DictionaryGetFunctionType::getOrDefault)
         {
             if (current_arguments_index >= arguments.size())
-                throw Exception{"Wrong argument count for function " + getName(), ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH};
+                throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+                    "Number of arguments for function {} doesn't match: passed {} should be {}",
+                    getName(),
+                    arguments.size(),
+                    arguments.size() + 1);
 
-            default_col = arguments[current_arguments_index].column;
+            const auto & column_before_cast = arguments[current_arguments_index];
+
+            if (const DataTypeTuple * type_tuple = typeid_cast<const DataTypeTuple *>(column_before_cast.type.get()))
+            {
+                const DataTypes & nested_types = type_tuple->getElements();
+
+                for (const auto & nested_type : nested_types)
+                    if (nested_type->isNullable())
+                        throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                            "Wrong argument for function {} default values column nullable is not supported",
+                            getName());
+            }
+            else if (column_before_cast.type->isNullable())
+                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                    "Wrong argument for function {} default values column nullable is not supported",
+                    getName());
+
+            auto result_type_no_nullable = removeNullable(result_type);
+
+            ColumnWithTypeAndName column_to_cast = {column_before_cast.column->convertToFullColumnIfConst(), column_before_cast.type, column_before_cast.name};
+
+            auto result = castColumnAccurate(column_to_cast, result_type_no_nullable);
+
+            if (attribute_names.size() > 1)
+            {
+                const auto * tuple_column = checkAndGetColumn<ColumnTuple>(result.get());
+
+                if (!tuple_column)
+                    throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                        "Wrong argument for function {} default values column must be tuple",
+                        getName());
+
+                if (tuple_column->tupleSize() != attribute_names.size())
+                    throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                        "Wrong argument for function {} default values tuple column must contain same column size as requested attributes",
+                        getName());
+
+                default_cols = tuple_column->getColumnsCopy();
+            }
+            else
+                default_cols.emplace_back(result);
+        }
+        else
+        {
+            for (size_t i = 0; i < attribute_names.size(); ++i)
+                default_cols.emplace_back(nullptr);
         }
 
         ColumnPtr result;
@@ -354,30 +446,153 @@ public:
 
         if (dictionary_key_type == DictionaryKeyType::simple)
         {
-            result = dictionary->getColumn(attribute_name, result_type, {key_column}, {std::make_shared<DataTypeUInt64>()}, default_col);
+            if (!WhichDataType(key_col_with_type.type).isUInt64())
+                 throw Exception(
+                     ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                     "Third argument of function {} must be UInt64 when dictionary is simple. Actual type {}.",
+                     getName(),
+                     key_col_with_type.type->getName());
+
+            if (attribute_names.size() > 1)
+            {
+                const auto & result_tuple_type = assert_cast<const DataTypeTuple &>(*result_type);
+
+                Columns result_columns = dictionary->getColumns(
+                    attribute_names,
+                    result_tuple_type.getElements(),
+                    {key_column},
+                    {std::make_shared<DataTypeUInt64>()},
+                    default_cols);
+
+                result = ColumnTuple::create(std::move(result_columns));
+            }
+            else
+                result = dictionary->getColumn(
+                    attribute_names[0],
+                    result_type,
+                    {key_column},
+                    {std::make_shared<DataTypeUInt64>()},
+                    default_cols.front());
         }
         else if (dictionary_key_type == DictionaryKeyType::complex)
         {
+            if (!isTuple(key_col_with_type.type))
+                 throw Exception(
+                     ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                     "Third argument of function {} must be tuple when dictionary is complex. Actual type {}.",
+                     getName(),
+                     key_col_with_type.type->getName());
+
             /// Functions in external dictionaries_loader only support full-value (not constant) columns with keys.
             ColumnPtr key_column_full = key_col_with_type.column->convertToFullColumnIfConst();
 
+            if (!isTuple(key_col_with_type.type))
+                throw Exception(
+                    ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                    "Third argument of function {} must be tuple when dictionary is complex. Actual type {}.",
+                    getName(),
+                    key_col_with_type.type->getName());
+
             const auto & key_columns = typeid_cast<const ColumnTuple &>(*key_column_full).getColumnsCopy();
             const auto & key_types = static_cast<const DataTypeTuple &>(*key_col_with_type.type).getElements();
 
-            result = dictionary->getColumn(attribute_name, result_type, key_columns, key_types, default_col);
+            if (attribute_names.size() > 1)
+            {
+                const auto & result_tuple_type = assert_cast<const DataTypeTuple &>(*result_type);
+
+                Columns result_columns = dictionary->getColumns(
+                    attribute_names,
+                    result_tuple_type.getElements(),
+                    key_columns,
+                    key_types,
+                    default_cols);
+
+                result = ColumnTuple::create(std::move(result_columns));
+            }
+            else
+                result = dictionary->getColumn(
+                    attribute_names[0],
+                    result_type,
+                    key_columns,
+                    key_types,
+                    default_cols.front());
         }
         else if (dictionary_key_type == DictionaryKeyType::range)
         {
-            result = dictionary->getColumn(
-                attribute_name, result_type, {key_column, range_col}, {std::make_shared<DataTypeUInt64>(), range_col_type}, default_col);
+            if (!WhichDataType(key_col_with_type.type).isUInt64())
+                 throw Exception(
+                     ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                     "Third argument of function {} must be UInt64 when dictionary is range. Actual type {}.",
+                     getName(),
+                     key_col_with_type.type->getName());
+
+            if (attribute_names.size() > 1)
+            {
+                const auto & result_tuple_type = assert_cast<const DataTypeTuple &>(*result_type);
+
+                Columns result_columns = dictionary->getColumns(
+                    attribute_names,
+                    result_tuple_type.getElements(),
+                    {key_column, range_col},
+                    {std::make_shared<DataTypeUInt64>(), range_col_type},
+                    default_cols);
+
+                result = ColumnTuple::create(std::move(result_columns));
+            }
+            else
+                result = dictionary->getColumn(
+                    attribute_names[0],
+                    result_type,
+                    {key_column, range_col},
+                    {std::make_shared<DataTypeUInt64>(), range_col_type},
+                    default_cols.front());
         }
         else
-            throw Exception{"Unknown dictionary identifier type", ErrorCodes::BAD_ARGUMENTS};
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unknown dictionary identifier type");
 
         return result;
     }
 
 private:
+
+    Strings getAttributeNamesFromColumn(const ColumnPtr & column, const DataTypePtr & type) const
+    {
+        Strings attribute_names;
+
+        if (const auto * name_col = checkAndGetColumnConst<ColumnString>(column.get()))
+            attribute_names.emplace_back(name_col->getValue<String>());
+        else if (const auto * tuple_col_const = checkAndGetColumnConst<ColumnTuple>(column.get()))
+        {
+            const ColumnTuple & tuple_col = assert_cast<const ColumnTuple &>(tuple_col_const->getDataColumn());
+            size_t tuple_size = tuple_col.tupleSize();
+
+            if (tuple_size < 1)
+                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                    "Tuple second argument of function {} must contain multiple constant string columns");
+
+            for (size_t i = 0; i < tuple_col.tupleSize(); ++i)
+            {
+                const auto * tuple_column = tuple_col.getColumnPtr(i).get();
+
+                const auto * attribute_name_column = checkAndGetColumn<ColumnString>(tuple_column);
+
+                if (!attribute_name_column)
+                    throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                        "Tuple second argument of function {} must contain multiple constant string columns",
+                        getName());
+
+                attribute_names.emplace_back(attribute_name_column->getDataAt(0));
+            }
+        }
+        else
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Illegal type {} of second argument of function {}, expected a const string or const tuple of const strings.",
+                type->getName(),
+                getName());
+
+        return attribute_names;
+    }
+
     mutable FunctionDictHelper helper;
 };
 
@@ -389,12 +604,12 @@ class FunctionDictGetImpl final : public IFunction
 public:
     static constexpr auto name = Name::name;
 
-    static FunctionPtr create(const Context &context)
+    static FunctionPtr create(ContextPtr context)
     {
         return std::make_shared<FunctionDictGetImpl>(context);
     }
 
-    explicit FunctionDictGetImpl(const Context & context_) : impl(context_) {}
+    explicit FunctionDictGetImpl(ContextPtr context_) : impl(context_) {}
 
     String getName() const override { return name; }
 
@@ -523,6 +738,164 @@ using FunctionDictGetDecimal64OrDefault = FunctionDictGetOrDefault<DataTypeDecim
 using FunctionDictGetDecimal128OrDefault = FunctionDictGetOrDefault<DataTypeDecimal<Decimal128>, NameDictGetDecimal128OrDefault>;
 using FunctionDictGetStringOrDefault = FunctionDictGetOrDefault<DataTypeString, NameDictGetStringOrDefault>;
 
+class FunctionDictGetOrNull final : public IFunction
+{
+public:
+    static constexpr auto name = "dictGetOrNull";
+
+    static FunctionPtr create(ContextPtr context)
+    {
+        return std::make_shared<FunctionDictGetOrNull>(context);
+    }
+
+    explicit FunctionDictGetOrNull(ContextPtr context_)
+        : dictionary_get_func_impl(context_)
+        , dictionary_has_func_impl(context_)
+    {}
+
+    String getName() const override { return name; }
+
+private:
+
+    size_t getNumberOfArguments() const override { return 0; }
+
+    bool isVariadic() const override { return true; }
+
+    bool useDefaultImplementationForConstants() const override { return true; }
+
+    bool useDefaultImplementationForNulls() const override { return false; }
+
+    bool isDeterministic() const override { return false; }
+
+    ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {0, 1}; }
+
+    bool isInjective(const ColumnsWithTypeAndName & sample_columns) const override
+    {
+        return dictionary_get_func_impl.isInjective(sample_columns);
+    }
+
+    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
+    {
+        auto result_type = dictionary_get_func_impl.getReturnTypeImpl(arguments);
+
+        WhichDataType result_data_type(result_type);
+        if (result_data_type.isTuple())
+        {
+            const auto & data_type_tuple = static_cast<const DataTypeTuple &>(*result_type);
+            auto elements_types_copy = data_type_tuple.getElements();
+            for (auto & element_type : elements_types_copy)
+                element_type = makeNullable(element_type);
+
+            result_type = std::make_shared<DataTypeTuple>(elements_types_copy, data_type_tuple.getElementNames());
+        }
+        else
+            result_type = makeNullable(result_type);
+
+        return result_type;
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    {
+        /** We call dictHas function to get which map is key presented in dictionary.
+            For key that presented in dictionary dict has result for that key index value will be 1. Otherwise 0.
+            We invert result, and then for key that is not presented in dictionary value will be 1. Otherwise 0.
+            This inverted result will be used as null column map.
+            After that we call dict get function, by contract for key that are not presented in dictionary we
+            return default value.
+            We create nullable column from dict get result column and null column map.
+
+            2 additional implementation details:
+            1. Result from dict get can be tuple if client requested multiple attributes we apply such operation on each result column.
+            2. If column is already nullable we merge column null map with null map that we get from dict has.
+          */
+
+        auto dict_has_arguments = filterAttributeNameArgumentForDictHas(arguments);
+        auto is_key_in_dictionary_column = dictionary_has_func_impl.executeImpl(dict_has_arguments, std::make_shared<DataTypeUInt8>(), input_rows_count);
+        auto is_key_in_dictionary_column_mutable = is_key_in_dictionary_column->assumeMutable();
+        ColumnVector<UInt8> & is_key_in_dictionary_column_typed = assert_cast<ColumnVector<UInt8> &>(*is_key_in_dictionary_column_mutable);
+        PaddedPODArray<UInt8> & is_key_in_dictionary_data = is_key_in_dictionary_column_typed.getData();
+        for (auto & key : is_key_in_dictionary_data)
+            key = !key;
+
+        auto result_type = dictionary_get_func_impl.getReturnTypeImpl(arguments);
+        auto dictionary_get_result_column = dictionary_get_func_impl.executeImpl(arguments, result_type, input_rows_count);
+
+        ColumnPtr result;
+
+        WhichDataType result_data_type(result_type);
+        auto dictionary_get_result_column_mutable = dictionary_get_result_column->assumeMutable();
+
+        if (result_data_type.isTuple())
+        {
+            ColumnTuple & column_tuple = assert_cast<ColumnTuple &>(*dictionary_get_result_column_mutable);
+
+            const auto & columns = column_tuple.getColumns();
+            size_t tuple_size = columns.size();
+
+            MutableColumns new_columns(tuple_size);
+            for (size_t tuple_column_index = 0; tuple_column_index < tuple_size; ++tuple_column_index)
+            {
+                auto nullable_column_map = ColumnVector<UInt8>::create();
+                auto & nullable_column_map_data = nullable_column_map->getData();
+                nullable_column_map_data.assign(is_key_in_dictionary_data);
+
+                auto mutable_column = columns[tuple_column_index]->assumeMutable();
+                if (ColumnNullable * nullable_column = typeid_cast<ColumnNullable *>(mutable_column.get()))
+                {
+                    auto & null_map_data = nullable_column->getNullMapData();
+                    addNullMap(null_map_data, is_key_in_dictionary_data);
+                    new_columns[tuple_column_index] = std::move(mutable_column);
+                }
+                else
+                    new_columns[tuple_column_index] = ColumnNullable::create(std::move(mutable_column), std::move(nullable_column_map));
+            }
+
+            result = ColumnTuple::create(std::move(new_columns));
+        }
+        else
+        {
+            if (ColumnNullable * nullable_column = typeid_cast<ColumnNullable *>(dictionary_get_result_column_mutable.get()))
+            {
+                auto & null_map_data = nullable_column->getNullMapData();
+                addNullMap(null_map_data, is_key_in_dictionary_data);
+                result = std::move(dictionary_get_result_column);
+            }
+            else
+                result = ColumnNullable::create(std::move(dictionary_get_result_column), std::move(is_key_in_dictionary_column_mutable));
+        }
+
+        return result;
+    }
+
+    static void addNullMap(PaddedPODArray<UInt8> & null_map, PaddedPODArray<UInt8> & null_map_to_add)
+    {
+        assert(null_map.size() == null_map_to_add.size());
+
+        for (size_t i = 0; i < null_map.size(); ++i)
+            null_map[i] = null_map[i] || null_map_to_add[i];
+    }
+
+    static ColumnsWithTypeAndName filterAttributeNameArgumentForDictHas(const ColumnsWithTypeAndName & arguments)
+    {
+        ColumnsWithTypeAndName dict_has_arguments;
+        dict_has_arguments.reserve(arguments.size() - 1);
+        size_t attribute_name_argument_index = 1;
+
+        for (size_t i = 0; i < arguments.size(); ++i)
+        {
+            if (i == attribute_name_argument_index)
+                continue;
+
+            dict_has_arguments.emplace_back(arguments[i]);
+        }
+
+        return dict_has_arguments;
+    }
+
+    const FunctionDictGetNoType<DictionaryGetFunctionType::get> dictionary_get_func_impl;
+    const FunctionDictHas dictionary_has_func_impl;
+};
+
 /// Functions to work with hierarchies.
 
 class FunctionDictGetHierarchy final : public IFunction
@@ -530,12 +903,12 @@ class FunctionDictGetHierarchy final : public IFunction
 public:
     static constexpr auto name = "dictGetHierarchy";
 
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextPtr context)
     {
         return std::make_shared<FunctionDictGetHierarchy>(context);
     }
 
-    explicit FunctionDictGetHierarchy(const Context & context_) : helper(context_) {}
+    explicit FunctionDictGetHierarchy(ContextPtr context_) : helper(context_) {}
 
     String getName() const override { return name; }
 
@@ -549,12 +922,16 @@ private:
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         if (!isString(arguments[0]))
-            throw Exception{"Illegal type " + arguments[0]->getName() + " of first argument of function " + getName()
-                + ", expected a string.", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Illegal type of first argument of function {}. Expected String. Actual type {}",
+                getName(),
+                arguments[0]->getName());
 
         if (!WhichDataType(arguments[1]).isUInt64())
-            throw Exception{"Illegal type " + arguments[1]->getName() + " of second argument of function " + getName()
-                + ", must be UInt64.", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Illegal type of second argument of function {}. Expected UInt64. Actual type {}",
+                getName(),
+                arguments[1]->getName());
 
         return std::make_shared<DataTypeArray>(std::make_shared<DataTypeUInt64>());
     }
@@ -566,108 +943,15 @@ private:
         if (input_rows_count == 0)
             return result_type->createColumn();
 
-        auto dict = helper.getDictionary(arguments[0]);
-        ColumnPtr res;
+        auto dictionary = helper.getDictionary(arguments[0].column);
 
-        if (!((res = executeDispatch<FlatDictionary>(arguments, result_type, dict))
-            || (res = executeDispatch<DirectDictionary>(arguments, result_type, dict))
-            || (res = executeDispatch<HashedDictionary>(arguments, result_type, dict))
-            || (res = executeDispatch<CacheDictionary>(arguments, result_type, dict))))
-            throw Exception{"Unsupported dictionary type " + dict->getTypeName(), ErrorCodes::UNKNOWN_TYPE};
+        if (!dictionary->hasHierarchy())
+            throw Exception(ErrorCodes::UNSUPPORTED_METHOD,
+                "Dictionary {} does not support hierarchy",
+                dictionary->getFullName());
 
-        return res;
-    }
-
-    template <typename DictionaryType>
-    ColumnPtr executeDispatch(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, const std::shared_ptr<const IDictionaryBase> & dict_ptr) const
-    {
-        const auto * dict = typeid_cast<const DictionaryType *>(dict_ptr.get());
-        if (!dict)
-            return nullptr;
-
-        if (!dict->hasHierarchy())
-            throw Exception{"Dictionary does not have a hierarchy", ErrorCodes::UNSUPPORTED_METHOD};
-
-        const auto get_hierarchies = [&] (const PaddedPODArray<UInt64> & in, PaddedPODArray<UInt64> & out, PaddedPODArray<UInt64> & offsets)
-        {
-            const auto size = in.size();
-
-            /// copy of `in` array
-            auto in_array = std::make_unique<PaddedPODArray<UInt64>>(std::begin(in), std::end(in));
-            /// used for storing and handling result of ::toParent call
-            auto out_array = std::make_unique<PaddedPODArray<UInt64>>(size);
-            /// resulting hierarchies
-            std::vector<std::vector<IDictionary::Key>> hierarchies(size);    /// TODO Bad code, poor performance.
-
-            /// total number of non-zero elements, used for allocating all the required memory upfront
-            size_t total_count = 0;
-
-            while (true)
-            {
-                auto all_zeroes = true;
-
-                /// erase zeroed identifiers, store non-zeroed ones
-                for (const auto i : ext::range(0, size))
-                {
-                    const auto id = (*in_array)[i];
-                    if (0 == id)
-                        continue;
-
-
-                    auto & hierarchy = hierarchies[i];
-
-                    /// Checking for loop
-                    if (std::find(std::begin(hierarchy), std::end(hierarchy), id) != std::end(hierarchy))
-                        continue;
-
-                    all_zeroes = false;
-                    /// place id at it's corresponding place
-                    hierarchy.push_back(id);
-
-                    ++total_count;
-                }
-
-                if (all_zeroes)
-                    break;
-
-                /// translate all non-zero identifiers at once
-                dict->toParent(*in_array, *out_array);
-
-                /// we're going to use the `in_array` from this iteration as `out_array` on the next one
-                std::swap(in_array, out_array);
-            }
-
-            out.reserve(total_count);
-            offsets.resize(size);
-
-            for (const auto i : ext::range(0, size))
-            {
-                const auto & ids = hierarchies[i];
-                out.insert_assume_reserved(std::begin(ids), std::end(ids));
-                offsets[i] = out.size();
-            }
-        };
-
-        const auto * id_col_untyped = arguments[1].column.get();
-        if (const auto * id_col = checkAndGetColumn<ColumnUInt64>(id_col_untyped))
-        {
-            const auto & in = id_col->getData();
-            auto backend = ColumnUInt64::create();
-            auto offsets = ColumnArray::ColumnOffsets::create();
-            get_hierarchies(in, backend->getData(), offsets->getData());
-            return ColumnArray::create(std::move(backend), std::move(offsets));
-        }
-        else if (const auto * id_col_const = checkAndGetColumnConst<ColumnVector<UInt64>>(id_col_untyped))
-        {
-            const PaddedPODArray<UInt64> in(1, id_col_const->getValue<UInt64>());
-            auto backend = ColumnUInt64::create();
-            auto offsets = ColumnArray::ColumnOffsets::create();
-            get_hierarchies(in, backend->getData(), offsets->getData());
-            auto array = ColumnArray::create(std::move(backend), std::move(offsets));
-            return result_type->createColumnConst(id_col_const->size(), (*array)[0].get<Array>());
-        }
-        else
-            throw Exception{"Second argument of function " + getName() + " must be UInt64", ErrorCodes::ILLEGAL_COLUMN};
+        ColumnPtr result = dictionary->getHierarchy(arguments[1].column, std::make_shared<DataTypeUInt64>());
+        return result;
     }
 
     mutable FunctionDictHelper helper;
@@ -679,12 +963,12 @@ class FunctionDictIsIn final : public IFunction
 public:
     static constexpr auto name = "dictIsIn";
 
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextPtr context)
     {
         return std::make_shared<FunctionDictIsIn>(context);
     }
 
-    explicit FunctionDictIsIn(const Context & context_)
+    explicit FunctionDictIsIn(ContextPtr context_)
         : helper(context_) {}
 
     String getName() const override { return name; }
@@ -698,16 +982,22 @@ private:
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         if (!isString(arguments[0]))
-            throw Exception{"Illegal type " + arguments[0]->getName() + " of first argument of function " + getName()
-                + ", expected a string.", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Illegal type of first argument of function {}. Expected String. Actual type {}",
+                getName(),
+                arguments[0]->getName());
 
         if (!WhichDataType(arguments[1]).isUInt64())
-            throw Exception{"Illegal type " + arguments[1]->getName() + " of second argument of function " + getName()
-                + ", must be UInt64.", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Illegal type of second argument of function {}. Expected UInt64. Actual type {}",
+                getName(),
+                arguments[1]->getName());
 
         if (!WhichDataType(arguments[2]).isUInt64())
-            throw Exception{"Illegal type " + arguments[2]->getName() + " of third argument of function " + getName()
-                + ", must be UInt64.", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Illegal type of third argument of function {}. Expected UInt64. Actual type {}",
+                getName(),
+                arguments[2]->getName());
 
         return std::make_shared<DataTypeUInt8>();
     }
@@ -719,105 +1009,165 @@ private:
         if (input_rows_count == 0)
             return result_type->createColumn();
 
-        auto dict = helper.getDictionary(arguments[0]);
+        auto dict = helper.getDictionary(arguments[0].column);
 
-        ColumnPtr res;
-        if (!((res = executeDispatch<FlatDictionary>(arguments, dict))
-            || (res = executeDispatch<DirectDictionary>(arguments, dict))
-            || (res = executeDispatch<HashedDictionary>(arguments, dict))
-            || (res = executeDispatch<CacheDictionary>(arguments, dict))))
-            throw Exception{"Unsupported dictionary type " + dict->getTypeName(), ErrorCodes::UNKNOWN_TYPE};
+        if (!dict->hasHierarchy())
+            throw Exception(ErrorCodes::UNSUPPORTED_METHOD,
+                "Dictionary {} does not support hierarchy",
+                dict->getFullName());
+
+        ColumnPtr res = dict->isInHierarchy(arguments[1].column, arguments[2].column, std::make_shared<DataTypeUInt64>());
 
         return res;
     }
 
-    template <typename DictionaryType>
-    ColumnPtr executeDispatch(const ColumnsWithTypeAndName & arguments, const std::shared_ptr<const IDictionaryBase> & dict_ptr) const
+    mutable FunctionDictHelper helper;
+};
+
+class FunctionDictGetChildren final : public IFunction
+{
+public:
+    static constexpr auto name = "dictGetChildren";
+
+    static FunctionPtr create(ContextPtr context)
     {
-        const auto * dict = typeid_cast<const DictionaryType *>(dict_ptr.get());
-        if (!dict)
-            return nullptr;
-
-        if (!dict->hasHierarchy())
-            throw Exception{"Dictionary does not have a hierarchy", ErrorCodes::UNSUPPORTED_METHOD};
-
-        const auto * child_id_col_untyped = arguments[1].column.get();
-        const auto * ancestor_id_col_untyped = arguments[2].column.get();
-
-        if (const auto * child_id_col = checkAndGetColumn<ColumnUInt64>(child_id_col_untyped))
-            return execute(dict, child_id_col, ancestor_id_col_untyped);
-        else if (const auto * child_id_col_const = checkAndGetColumnConst<ColumnVector<UInt64>>(child_id_col_untyped))
-            return execute(dict, child_id_col_const, ancestor_id_col_untyped);
-        else
-            throw Exception{"Illegal column " + child_id_col_untyped->getName()
-                + " of second argument of function " + getName(), ErrorCodes::ILLEGAL_COLUMN};
+        return std::make_shared<FunctionDictGetChildren>(context);
     }
 
-    template <typename DictionaryType>
-    ColumnPtr execute(const DictionaryType * dict,
-                 const ColumnUInt64 * child_id_col, const IColumn * ancestor_id_col_untyped) const
+    explicit FunctionDictGetChildren(ContextPtr context_)
+        : helper(context_) {}
+
+    String getName() const override { return name; }
+
+private:
+    size_t getNumberOfArguments() const override { return 2; }
+
+    bool useDefaultImplementationForConstants() const final { return true; }
+    ColumnNumbers getArgumentsThatAreAlwaysConstant() const final { return {0}; }
+    bool isDeterministic() const override { return false; }
+
+    DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
-        if (const auto * ancestor_id_col = checkAndGetColumn<ColumnUInt64>(ancestor_id_col_untyped))
-        {
-            auto out = ColumnUInt8::create();
+        if (!isString(arguments[0]))
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Illegal type of first argument of function {}. Expected String. Actual type {}",
+                getName(),
+                arguments[0]->getName());
 
-            const auto & child_ids = child_id_col->getData();
-            const auto & ancestor_ids = ancestor_id_col->getData();
-            auto & data = out->getData();
-            const auto size = child_id_col->size();
-            data.resize(size);
+        if (!WhichDataType(arguments[1]).isUInt64())
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Illegal type of second argument of function {}. Expected UInt64. Actual type {}",
+                getName(),
+                arguments[1]->getName());
 
-            dict->isInVectorVector(child_ids, ancestor_ids, data);
-            return out;
-        }
-        else if (const auto * ancestor_id_col_const = checkAndGetColumnConst<ColumnVector<UInt64>>(ancestor_id_col_untyped))
-        {
-            auto out = ColumnUInt8::create();
-
-            const auto & child_ids = child_id_col->getData();
-            const auto ancestor_id = ancestor_id_col_const->getValue<UInt64>();
-            auto & data = out->getData();
-            const auto size = child_id_col->size();
-            data.resize(size);
-
-            dict->isInVectorConstant(child_ids, ancestor_id, data);
-            return out;
-        }
-        else
-        {
-            throw Exception{"Illegal column " + ancestor_id_col_untyped->getName()
-                + " of third argument of function " + getName(), ErrorCodes::ILLEGAL_COLUMN};
-        }
+        return std::make_shared<DataTypeArray>(std::make_shared<DataTypeUInt64>());
     }
 
-    template <typename DictionaryType>
-    ColumnPtr execute(const DictionaryType * dict, const ColumnConst * child_id_col, const IColumn * ancestor_id_col_untyped) const
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
-        if (const auto * ancestor_id_col = checkAndGetColumn<ColumnUInt64>(ancestor_id_col_untyped))
+        if (input_rows_count == 0)
+            return result_type->createColumn();
+
+        auto dictionary = helper.getDictionary(arguments[0].column);
+
+        if (!dictionary->hasHierarchy())
+            throw Exception(ErrorCodes::UNSUPPORTED_METHOD,
+                "Dictionary {} does not support hierarchy",
+                dictionary->getFullName());
+
+        ColumnPtr result = dictionary->getDescendants(arguments[1].column, std::make_shared<DataTypeUInt64>(), 1);
+
+        return result;
+    }
+
+    mutable FunctionDictHelper helper;
+};
+
+class FunctionDictGetDescendants final : public IFunction
+{
+public:
+    static constexpr auto name = "dictGetDescendants";
+
+    static FunctionPtr create(ContextPtr context)
+    {
+        return std::make_shared<FunctionDictGetDescendants>(context);
+    }
+
+    explicit FunctionDictGetDescendants(ContextPtr context_)
+        : helper(context_) {}
+
+    String getName() const override { return name; }
+
+private:
+    size_t getNumberOfArguments() const override { return 0; }
+    bool isVariadic() const override { return true; }
+
+    bool useDefaultImplementationForConstants() const final { return true; }
+    ColumnNumbers getArgumentsThatAreAlwaysConstant() const final { return {0}; }
+    bool isDeterministic() const override { return false; }
+
+
+    DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
+    {
+        size_t arguments_size = arguments.size();
+        if (arguments_size < 2 || arguments_size > 3)
         {
-            auto out = ColumnUInt8::create();
-
-            const auto child_id = child_id_col->getValue<UInt64>();
-            const auto & ancestor_ids = ancestor_id_col->getData();
-            auto & data = out->getData();
-            const auto size = child_id_col->size();
-            data.resize(size);
-
-            dict->isInConstantVector(child_id, ancestor_ids, data);
-            return out;
+            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+                "Illegal arguments size of function {}. Expects 2 or 3 arguments size. Actual size {}",
+                getName(),
+                arguments_size);
         }
-        else if (const auto * ancestor_id_col_const = checkAndGetColumnConst<ColumnVector<UInt64>>(ancestor_id_col_untyped))
+
+        if (!isString(arguments[0]))
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Illegal type of first argument of function {}. Expected const String. Actual type {}",
+                getName(),
+                arguments[0]->getName());
+
+        if (!WhichDataType(arguments[1]).isUInt64())
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Illegal type of second argument of function {}. Expected UInt64. Actual type {}",
+                getName(),
+                arguments[1]->getName());
+
+        if (arguments.size() == 3 && !isUnsignedInteger(arguments[2]))
         {
-            const auto child_id = child_id_col->getValue<UInt64>();
-            const auto ancestor_id = ancestor_id_col_const->getValue<UInt64>();
-            UInt8 res = 0;
-
-            dict->isInConstantConstant(child_id, ancestor_id, res);
-            return DataTypeUInt8().createColumnConst(child_id_col->size(), res);
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Illegal type of third argument of function {}. Expected const unsigned integer. Actual type {}",
+                getName(),
+                arguments[2]->getName());
         }
-        else
-            throw Exception{"Illegal column " + ancestor_id_col_untyped->getName()
-                + " of third argument of function " + getName(), ErrorCodes::ILLEGAL_COLUMN};
+
+        return std::make_shared<DataTypeArray>(std::make_shared<DataTypeUInt64>());
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    {
+        if (input_rows_count == 0)
+            return result_type->createColumn();
+
+        auto dictionary = helper.getDictionary(arguments[0].column);
+
+        size_t level = 0;
+
+        if (arguments.size() == 3)
+        {
+            if (!isColumnConst(*arguments[2].column))
+                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                    "Illegal type of third argument of function {}. Expected const unsigned integer.",
+                    getName());
+
+            level = static_cast<size_t>(arguments[2].column->get64(0));
+        }
+
+        if (!dictionary->hasHierarchy())
+            throw Exception(ErrorCodes::UNSUPPORTED_METHOD,
+                "Dictionary {} does not support hierarchy",
+                dictionary->getFullName());
+
+        ColumnPtr res = dictionary->getDescendants(arguments[1].column, std::make_shared<DataTypeUInt64>(), level);
+
+        return res;
     }
 
     mutable FunctionDictHelper helper;
diff --git a/src/Functions/FunctionsExternalModels.cpp b/src/Functions/FunctionsExternalModels.cpp
index ecec9383252..da46f7fcb38 100644
--- a/src/Functions/FunctionsExternalModels.cpp
+++ b/src/Functions/FunctionsExternalModels.cpp
@@ -18,9 +18,9 @@
 namespace DB
 {
 
-FunctionPtr FunctionModelEvaluate::create(const Context & context)
+FunctionPtr FunctionModelEvaluate::create(ContextPtr context)
 {
-    return std::make_shared<FunctionModelEvaluate>(context.getExternalModelsLoader());
+    return std::make_shared<FunctionModelEvaluate>(context->getExternalModelsLoader());
 }
 
 namespace ErrorCodes
diff --git a/src/Functions/FunctionsExternalModels.h b/src/Functions/FunctionsExternalModels.h
index 9bb6cc5a77c..9f46e70c906 100644
--- a/src/Functions/FunctionsExternalModels.h
+++ b/src/Functions/FunctionsExternalModels.h
@@ -1,11 +1,12 @@
 #pragma once
+
 #include <Functions/IFunctionImpl.h>
+#include <Interpreters/Context_fwd.h>
 
 namespace DB
 {
 
 class ExternalModelsLoader;
-class Context;
 
 /// Evaluate external model.
 /// First argument - model name, the others - model arguments.
@@ -16,7 +17,7 @@ class FunctionModelEvaluate final : public IFunction
 public:
     static constexpr auto name = "modelEvaluate";
 
-    static FunctionPtr create(const Context & context);
+    static FunctionPtr create(ContextPtr context);
 
     explicit FunctionModelEvaluate(const ExternalModelsLoader & models_loader_) : models_loader(models_loader_) {}
 
diff --git a/src/Functions/FunctionsHashing.h b/src/Functions/FunctionsHashing.h
index 41152660e4f..94f8acbdf66 100644
--- a/src/Functions/FunctionsHashing.h
+++ b/src/Functions/FunctionsHashing.h
@@ -535,7 +535,7 @@ class FunctionStringHashFixedString : public IFunction
 {
 public:
     static constexpr auto name = Impl::name;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionStringHashFixedString>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionStringHashFixedString>(); }
 
     String getName() const override
     {
@@ -700,7 +700,7 @@ template <typename Impl, typename Name>
 class FunctionIntHash : public TargetSpecific::Default::FunctionIntHash<Impl, Name>
 {
 public:
-    explicit FunctionIntHash(const Context & context) : selector(context)
+    explicit FunctionIntHash(ContextPtr context) : selector(context)
     {
         selector.registerImplementation<TargetArch::Default,
             TargetSpecific::Default::FunctionIntHash<Impl, Name>>();
@@ -718,7 +718,7 @@ public:
         return selector.selectAndExecute(arguments, result_type, input_rows_count);
     }
 
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextPtr context)
     {
         return std::make_shared<FunctionIntHash>(context);
     }
@@ -1076,7 +1076,7 @@ template <typename Impl>
 class FunctionAnyHash : public TargetSpecific::Default::FunctionAnyHash<Impl>
 {
 public:
-    explicit FunctionAnyHash(const Context & context) : selector(context)
+    explicit FunctionAnyHash(ContextPtr context) : selector(context)
     {
         selector.registerImplementation<TargetArch::Default,
             TargetSpecific::Default::FunctionAnyHash<Impl>>();
@@ -1094,7 +1094,7 @@ public:
         return selector.selectAndExecute(arguments, result_type, input_rows_count);
     }
 
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextPtr context)
     {
         return std::make_shared<FunctionAnyHash>(context);
     }
@@ -1181,7 +1181,7 @@ class FunctionURLHash : public IFunction
 {
 public:
     static constexpr auto name = "URLHash";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionURLHash>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionURLHash>(); }
 
     String getName() const override { return name; }
 
diff --git a/src/Functions/FunctionsJSON.h b/src/Functions/FunctionsJSON.h
index f066bb1029a..c2fd44e2e2a 100644
--- a/src/Functions/FunctionsJSON.h
+++ b/src/Functions/FunctionsJSON.h
@@ -270,11 +270,11 @@ private:
 
 
 template <typename Name, template<typename> typename Impl>
-class FunctionJSON : public IFunction
+class FunctionJSON : public IFunction, WithContext
 {
 public:
-    static FunctionPtr create(const Context & context_) { return std::make_shared<FunctionJSON>(context_); }
-    FunctionJSON(const Context & context_) : context(context_) {}
+    static FunctionPtr create(ContextPtr context_) { return std::make_shared<FunctionJSON>(context_); }
+    FunctionJSON(ContextPtr context_) : WithContext(context_) {}
 
     static constexpr auto name = Name::name;
     String getName() const override { return Name::name; }
@@ -291,7 +291,7 @@ public:
     {
         /// Choose JSONParser.
 #if USE_SIMDJSON
-        if (context.getSettingsRef().allow_simdjson)
+        if (getContext()->getSettingsRef().allow_simdjson)
             return FunctionJSONHelpers::Executor<Name, Impl, SimdJSONParser>::run(arguments, result_type, input_rows_count);
 #endif
 
@@ -301,9 +301,6 @@ public:
         return FunctionJSONHelpers::Executor<Name, Impl, DummyJSONParser>::run(arguments, result_type, input_rows_count);
 #endif
     }
-
-private:
-    const Context & context;
 };
 
 
@@ -613,8 +610,8 @@ struct JSONExtractTree
     class Node
     {
     public:
-        Node() {}
-        virtual ~Node() {}
+        Node() = default;
+        virtual ~Node() = default;
         virtual bool insertResultToColumn(IColumn &, const Element &) = 0;
     };
 
diff --git a/src/Functions/FunctionsLogical.h b/src/Functions/FunctionsLogical.h
index a5579ebdf8a..12733348762 100644
--- a/src/Functions/FunctionsLogical.h
+++ b/src/Functions/FunctionsLogical.h
@@ -138,7 +138,7 @@ class FunctionAnyArityLogical : public IFunction
 {
 public:
     static constexpr auto name = Name::name;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionAnyArityLogical>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionAnyArityLogical>(); }
 
 public:
     String getName() const override
@@ -203,7 +203,7 @@ class FunctionUnaryLogical : public IFunction
 {
 public:
     static constexpr auto name = Name::name;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionUnaryLogical>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionUnaryLogical>(); }
 
 public:
     String getName() const override
diff --git a/src/Functions/FunctionsMultiStringFuzzySearch.h b/src/Functions/FunctionsMultiStringFuzzySearch.h
index 551c6e97495..90b5bc72744 100644
--- a/src/Functions/FunctionsMultiStringFuzzySearch.h
+++ b/src/Functions/FunctionsMultiStringFuzzySearch.h
@@ -34,9 +34,9 @@ class FunctionsMultiStringFuzzySearch : public IFunction
 
 public:
     static constexpr auto name = Name::name;
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextPtr context)
     {
-        if (Impl::is_using_hyperscan && !context.getSettingsRef().allow_hyperscan)
+        if (Impl::is_using_hyperscan && !context->getSettingsRef().allow_hyperscan)
             throw Exception(
                 "Hyperscan functions are disabled, because setting 'allow_hyperscan' is set to 0", ErrorCodes::FUNCTION_NOT_ALLOWED);
 
diff --git a/src/Functions/FunctionsMultiStringPosition.h b/src/Functions/FunctionsMultiStringPosition.h
index 2c0f2ae8f7b..b137d2d0c80 100644
--- a/src/Functions/FunctionsMultiStringPosition.h
+++ b/src/Functions/FunctionsMultiStringPosition.h
@@ -51,7 +51,7 @@ class FunctionsMultiStringPosition : public IFunction
 {
 public:
     static constexpr auto name = Name::name;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionsMultiStringPosition>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionsMultiStringPosition>(); }
 
     String getName() const override { return name; }
 
diff --git a/src/Functions/FunctionsMultiStringSearch.h b/src/Functions/FunctionsMultiStringSearch.h
index f1185c2d850..e39ee5f816e 100644
--- a/src/Functions/FunctionsMultiStringSearch.h
+++ b/src/Functions/FunctionsMultiStringSearch.h
@@ -47,9 +47,9 @@ class FunctionsMultiStringSearch : public IFunction
 
 public:
     static constexpr auto name = Name::name;
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextPtr context)
     {
-        if (Impl::is_using_hyperscan && !context.getSettingsRef().allow_hyperscan)
+        if (Impl::is_using_hyperscan && !context->getSettingsRef().allow_hyperscan)
             throw Exception(
                 "Hyperscan functions are disabled, because setting 'allow_hyperscan' is set to 0", ErrorCodes::FUNCTION_NOT_ALLOWED);
 
diff --git a/src/Functions/FunctionsRandom.h b/src/Functions/FunctionsRandom.h
index f7b0ac8c2e0..c933f70e9b3 100644
--- a/src/Functions/FunctionsRandom.h
+++ b/src/Functions/FunctionsRandom.h
@@ -91,7 +91,7 @@ template <typename ToType, typename Name>
 class FunctionRandom : public FunctionRandomImpl<TargetSpecific::Default::RandImpl, ToType, Name>
 {
 public:
-    explicit FunctionRandom(const Context & context) : selector(context)
+    explicit FunctionRandom(ContextPtr context) : selector(context)
     {
         selector.registerImplementation<TargetArch::Default,
             FunctionRandomImpl<TargetSpecific::Default::RandImpl, ToType, Name>>();
@@ -107,7 +107,7 @@ public:
         return selector.selectAndExecute(arguments, result_type, input_rows_count);
     }
 
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextPtr context)
     {
         return std::make_shared<FunctionRandom<ToType, Name>>(context);
     }
diff --git a/src/Functions/FunctionsRound.h b/src/Functions/FunctionsRound.h
index b510f62662e..01074984ebf 100644
--- a/src/Functions/FunctionsRound.h
+++ b/src/Functions/FunctionsRound.h
@@ -21,6 +21,8 @@
 
 #ifdef __SSE4_1__
     #include <smmintrin.h>
+#else
+    #include <fenv.h>
 #endif
 
 
@@ -34,6 +36,7 @@ namespace ErrorCodes
     extern const int ARGUMENT_OUT_OF_BOUND;
     extern const int ILLEGAL_COLUMN;
     extern const int BAD_ARGUMENTS;
+    extern const int CANNOT_SET_ROUNDING_MODE;
 }
 
 
@@ -231,7 +234,7 @@ inline float roundWithMode(float x, RoundingMode mode)
 {
     switch (mode)
     {
-        case RoundingMode::Round: return roundf(x);
+        case RoundingMode::Round: return nearbyintf(x);
         case RoundingMode::Floor: return floorf(x);
         case RoundingMode::Ceil: return ceilf(x);
         case RoundingMode::Trunc: return truncf(x);
@@ -244,7 +247,7 @@ inline double roundWithMode(double x, RoundingMode mode)
 {
     switch (mode)
     {
-        case RoundingMode::Round: return round(x);
+        case RoundingMode::Round: return nearbyint(x);
         case RoundingMode::Floor: return floor(x);
         case RoundingMode::Ceil: return ceil(x);
         case RoundingMode::Trunc: return trunc(x);
@@ -523,7 +526,7 @@ class FunctionRounding : public IFunction
 {
 public:
     static constexpr auto name = Name::name;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionRounding>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionRounding>(); }
 
     String getName() const override
     {
@@ -595,6 +598,15 @@ public:
             return false;
         };
 
+#if !defined(__SSE4_1__)
+        /// In case of "nearbyint" function is used, we should ensure the expected rounding mode for the Banker's rounding.
+        /// Actually it is by default. But we will set it just in case.
+
+        if constexpr (rounding_mode == RoundingMode::Round)
+            if (0 != fesetround(FE_TONEAREST))
+                throw Exception("Cannot set floating point rounding mode", ErrorCodes::CANNOT_SET_ROUNDING_MODE);
+#endif
+
         if (!callOnIndexAndDataType<void>(column.type->getTypeId(), call))
         {
             throw Exception("Illegal column " + column.name + " of argument of function " + getName(),
@@ -623,7 +635,7 @@ class FunctionRoundDown : public IFunction
 {
 public:
     static constexpr auto name = "roundDown";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionRoundDown>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionRoundDown>(); }
 
     String getName() const override { return name; }
 
diff --git a/src/Functions/FunctionsStringArray.h b/src/Functions/FunctionsStringArray.h
index 6d1b8723653..60dd624bd4f 100644
--- a/src/Functions/FunctionsStringArray.h
+++ b/src/Functions/FunctionsStringArray.h
@@ -345,7 +345,7 @@ class FunctionTokens : public IFunction
 {
 public:
     static constexpr auto name = Generator::name;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionTokens>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionTokens>(); }
 
     String getName() const override
     {
@@ -508,7 +508,7 @@ private:
 
 public:
     static constexpr auto name = "arrayStringConcat";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionArrayStringConcat>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionArrayStringConcat>(); }
 
     String getName() const override
     {
diff --git a/src/Functions/FunctionsStringHash.h b/src/Functions/FunctionsStringHash.h
index 72fb6e4c76d..1001d3143f8 100644
--- a/src/Functions/FunctionsStringHash.h
+++ b/src/Functions/FunctionsStringHash.h
@@ -10,6 +10,7 @@
 #include <DataTypes/DataTypeString.h>
 #include <Functions/FunctionHelpers.h>
 #include <Functions/IFunctionImpl.h>
+#include <Interpreters/Context_fwd.h>
 
 namespace DB
 {
@@ -34,7 +35,7 @@ public:
     static constexpr size_t max_shingle_size = 25;
     static constexpr size_t max_num_hashes = 25;
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionsStringHash>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionsStringHash>(); }
 
     String getName() const override { return name; }
 
diff --git a/src/Functions/FunctionsStringSearch.h b/src/Functions/FunctionsStringSearch.h
index 75579b28fd3..abbf4e5e650 100644
--- a/src/Functions/FunctionsStringSearch.h
+++ b/src/Functions/FunctionsStringSearch.h
@@ -51,7 +51,7 @@ class FunctionsStringSearch : public IFunction
 {
 public:
     static constexpr auto name = Name::name;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionsStringSearch>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionsStringSearch>(); }
 
     String getName() const override { return name; }
 
diff --git a/src/Functions/FunctionsStringSearchToString.h b/src/Functions/FunctionsStringSearchToString.h
index 3b910ae51af..424a54be434 100644
--- a/src/Functions/FunctionsStringSearchToString.h
+++ b/src/Functions/FunctionsStringSearchToString.h
@@ -36,7 +36,7 @@ class FunctionsStringSearchToString : public IFunction
 {
 public:
     static constexpr auto name = Name::name;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionsStringSearchToString>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionsStringSearchToString>(); }
 
     String getName() const override { return name; }
 
diff --git a/src/Functions/FunctionsStringSimilarity.h b/src/Functions/FunctionsStringSimilarity.h
index ba725fbd598..cd5ed405c89 100644
--- a/src/Functions/FunctionsStringSimilarity.h
+++ b/src/Functions/FunctionsStringSimilarity.h
@@ -6,6 +6,7 @@
 #include <DataTypes/DataTypesNumber.h>
 #include <Functions/FunctionHelpers.h>
 #include <Functions/IFunctionImpl.h>
+#include <Interpreters/Context_fwd.h>
 
 namespace DB
 {
@@ -32,7 +33,7 @@ class FunctionsStringSimilarity : public IFunction
 public:
     static constexpr auto name = Name::name;
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionsStringSimilarity>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionsStringSimilarity>(); }
 
     String getName() const override { return name; }
 
diff --git a/src/Functions/GatherUtils/Algorithms.h b/src/Functions/GatherUtils/Algorithms.h
index e174261d76e..1a962089d0c 100644
--- a/src/Functions/GatherUtils/Algorithms.h
+++ b/src/Functions/GatherUtils/Algorithms.h
@@ -82,7 +82,7 @@ inline ALWAYS_INLINE void writeSlice(const GenericArraySlice & slice, GenericArr
         sink.current_offset += slice.size;
     }
     else
-        throw Exception("Function writeSlice expect same column types for GenericArraySlice and GenericArraySink.",
+        throw Exception("Function writeSlice expects same column types for GenericArraySlice and GenericArraySink.",
                         ErrorCodes::LOGICAL_ERROR);
 }
 
@@ -162,7 +162,7 @@ inline ALWAYS_INLINE void writeSlice(const GenericValueSlice & slice, GenericArr
         ++sink.current_offset;
     }
     else
-        throw Exception("Function writeSlice expect same column types for GenericValueSlice and GenericArraySink.",
+        throw Exception("Function writeSlice expects same column types for GenericValueSlice and GenericArraySink.",
                         ErrorCodes::LOGICAL_ERROR);
 }
 
@@ -609,7 +609,7 @@ bool sliceHas(const GenericArraySlice & first, const GenericArraySlice & second)
 {
     /// Generic arrays should have the same type in order to use column.compareAt(...)
     if (!first.elements->structureEquals(*second.elements))
-        return false;
+        throw Exception("Function sliceHas expects same column types for slices.", ErrorCodes::LOGICAL_ERROR);
 
     auto impl = sliceHasImpl<search_type, GenericArraySlice, GenericArraySlice, sliceEqualElements, insliceEqualElements>;
     return impl(first, second, nullptr, nullptr);
@@ -670,7 +670,7 @@ void NO_INLINE arrayAllAny(FirstSource && first, SecondSource && second, ColumnU
     auto & data = result.getData();
     for (auto row : ext::range(0, size))
     {
-        data[row] = static_cast<UInt8>(sliceHas<search_type>(first.getWhole(), second.getWhole()) ? 1 : 0);
+        data[row] = static_cast<UInt8>(sliceHas<search_type>(first.getWhole(), second.getWhole()));
         first.next();
         second.next();
     }
diff --git a/src/Functions/GatherUtils/Sources.h b/src/Functions/GatherUtils/Sources.h
index e3eb5f6df75..4dbaff9f567 100644
--- a/src/Functions/GatherUtils/Sources.h
+++ b/src/Functions/GatherUtils/Sources.h
@@ -140,7 +140,7 @@ struct NumericArraySource : public ArraySourceImpl<NumericArraySource<T>>
 
 
 /// The methods can be virtual or not depending on the template parameter. See IStringSource.
-#if !__clang__
+#if !defined(__clang__)
 #   pragma GCC diagnostic push
 #   pragma GCC diagnostic ignored "-Wsuggest-override"
 #elif __clang_major__ >= 11
@@ -233,7 +233,7 @@ struct ConstSource : public Base
     }
 };
 
-#if !__clang__ || __clang_major__ >= 11
+#if !defined(__clang__) || __clang_major__ >= 11
 #   pragma GCC diagnostic pop
 #endif
 
diff --git a/src/Functions/IFunction.cpp b/src/Functions/IFunction.cpp
index e4a1adb8525..0a8e8f426b0 100644
--- a/src/Functions/IFunction.cpp
+++ b/src/Functions/IFunction.cpp
@@ -477,7 +477,7 @@ DataTypePtr FunctionOverloadResolverAdaptor::getReturnTypeDefaultImplementationF
     }
     if (null_presence.has_nullable)
     {
-        Block nested_columns = createBlockWithNestedColumns(arguments);
+        auto nested_columns = Block(createBlockWithNestedColumns(arguments));
         auto return_type = getter(ColumnsWithTypeAndName(nested_columns.begin(), nested_columns.end()));
         return makeNullable(return_type);
     }
diff --git a/src/Functions/IFunction.h b/src/Functions/IFunction.h
index e94449335fb..f9217d30707 100644
--- a/src/Functions/IFunction.h
+++ b/src/Functions/IFunction.h
@@ -1,16 +1,16 @@
 #pragma once
 
-#include <memory>
-
-#include <Core/Names.h>
-#include <Core/ColumnsWithTypeAndName.h>
 #include <Core/ColumnNumbers.h>
+#include <Core/ColumnsWithTypeAndName.h>
+#include <Core/Names.h>
 #include <DataTypes/IDataType.h>
 
 #if !defined(ARCADIA_BUILD)
 #    include "config_core.h"
 #endif
 
+#include <memory>
+
 /// This file contains user interface for functions.
 /// For developer interface (in case you need to implement a new function) see IFunctionImpl.h
 
diff --git a/src/Functions/IFunctionAdaptors.h b/src/Functions/IFunctionAdaptors.h
index cbb71c99b1b..2b9034dc784 100644
--- a/src/Functions/IFunctionAdaptors.h
+++ b/src/Functions/IFunctionAdaptors.h
@@ -1,4 +1,5 @@
 #pragma once
+
 #include <Functions/IFunctionImpl.h>
 
 namespace DB
diff --git a/src/Functions/IFunctionImpl.h b/src/Functions/IFunctionImpl.h
index a9ec6926c63..f75fe07122d 100644
--- a/src/Functions/IFunctionImpl.h
+++ b/src/Functions/IFunctionImpl.h
@@ -1,4 +1,5 @@
 #pragma once
+
 #include <Functions/IFunction.h>
 
 /// This file contains developer interface for functions.
diff --git a/src/Functions/LeastGreatestGeneric.h b/src/Functions/LeastGreatestGeneric.h
index b13286daded..583f0851777 100644
--- a/src/Functions/LeastGreatestGeneric.h
+++ b/src/Functions/LeastGreatestGeneric.h
@@ -30,7 +30,7 @@ class FunctionLeastGreatestGeneric : public IFunction
 {
 public:
     static constexpr auto name = kind == LeastGreatest::Least ? "least" : "greatest";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionLeastGreatestGeneric<kind>>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionLeastGreatestGeneric<kind>>(); }
 
 private:
     String getName() const override { return name; }
@@ -92,12 +92,12 @@ class LeastGreatestOverloadResolver : public IFunctionOverloadResolverImpl
 public:
     static constexpr auto name = kind == LeastGreatest::Least ? "least" : "greatest";
 
-    static FunctionOverloadResolverImplPtr create(const Context & context)
+    static FunctionOverloadResolverImplPtr create(ContextPtr context)
     {
         return std::make_unique<LeastGreatestOverloadResolver<kind, SpecializedFunction>>(context);
     }
 
-    explicit LeastGreatestOverloadResolver(const Context & context_) : context(context_) {}
+    explicit LeastGreatestOverloadResolver(ContextPtr context_) : context(context_) {}
 
     String getName() const override { return name; }
     size_t getNumberOfArguments() const override { return 0; }
@@ -127,7 +127,7 @@ public:
     }
 
 private:
-    const Context & context;
+    ContextPtr context;
 };
 
 }
diff --git a/src/Functions/PerformanceAdaptors.h b/src/Functions/PerformanceAdaptors.h
index 5d4d013691c..113ee24ca6f 100644
--- a/src/Functions/PerformanceAdaptors.h
+++ b/src/Functions/PerformanceAdaptors.h
@@ -172,7 +172,7 @@ namespace detail
  * /// default implementation.
  * class MyFunction : public MyDefaultImpl
  * {
- *     MyFunction(const Context & context) : selector(context) {
+ *     MyFunction(ContextPtr context) : selector(context) {
  *         /// Register all implementations in constructor.
  *         /// There could be as many implementation for every target as you want.
  *         selector.registerImplementation<TargetArch::Default, MyDefaultImpl>();
@@ -185,7 +185,7 @@ namespace detail
  *         selector.selectAndExecute(...);
  *     }
  *
- *     static FunctionPtr create(const Context & context) {
+ *     static FunctionPtr create(ContextPtr context) {
  *         return std::make_shared<MyFunction>(context);
  *     }
  * private:
@@ -193,12 +193,12 @@ namespace detail
  * };
  */
 template <typename FunctionInterface>
-class ImplementationSelector
+class ImplementationSelector : WithContext
 {
 public:
     using ImplementationPtr = std::shared_ptr<FunctionInterface>;
 
-    ImplementationSelector(const Context & context_) : context(context_) {}
+    ImplementationSelector(ContextPtr context_) : WithContext(context_) {}
 
     /* Select the best implementation based on previous runs.
      * If FunctionInterface is IFunction, then "executeImpl" method of the implementation will be called
@@ -248,7 +248,7 @@ public:
         if (isArchSupported(Arch))
         {
             // TODO(dakovalkov): make this option better.
-            const auto & choose_impl = context.getSettingsRef().function_implementation.value;
+            const auto & choose_impl = getContext()->getSettingsRef().function_implementation.value;
             if (choose_impl.empty() || choose_impl == detail::getImplementationTag<FunctionImpl>(Arch))
             {
                 implementations.emplace_back(std::make_shared<FunctionImpl>(std::forward<Args>(args)...));
@@ -258,7 +258,6 @@ public:
     }
 
 private:
-    const Context & context;
     std::vector<ImplementationPtr> implementations;
     mutable detail::PerformanceStatistics statistics; /// It is protected by internal mutex.
 };
diff --git a/src/Functions/PolygonUtils.h b/src/Functions/PolygonUtils.h
index c8e96f0b63a..27ee1d2a99f 100644
--- a/src/Functions/PolygonUtils.h
+++ b/src/Functions/PolygonUtils.h
@@ -12,7 +12,7 @@
 /// Warning in boost::geometry during template strategy substitution.
 #pragma GCC diagnostic push
 
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
 #endif
 
@@ -285,7 +285,7 @@ void PointInPolygonWithGrid<CoordinateType>::calcGridAttributes(
     const Point & max_corner = box.max_corner();
 
 #pragma GCC diagnostic push
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
 #endif
 
@@ -322,7 +322,7 @@ void PointInPolygonWithGrid<CoordinateType>::buildGrid()
     for (size_t row = 0; row < grid_size; ++row)
     {
 #pragma GCC diagnostic push
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
 #endif
         CoordinateType y_min = min_corner.y() + row * cell_height;
diff --git a/src/Functions/ReplaceRegexpImpl.h b/src/Functions/ReplaceRegexpImpl.h
index d9531cb343d..3e80dd5b337 100644
--- a/src/Functions/ReplaceRegexpImpl.h
+++ b/src/Functions/ReplaceRegexpImpl.h
@@ -164,7 +164,10 @@ struct ReplaceRegexpImpl
         size_t size = offsets.size();
         res_offsets.resize(size);
 
-        re2_st::RE2 searcher(needle);
+        typename re2_st::RE2::Options regexp_options;
+        /// Never write error messages to stderr. It's ignorant to do it from library code.
+        regexp_options.set_log_errors(false);
+        re2_st::RE2 searcher(needle, regexp_options);
         int num_captures = std::min(searcher.NumberOfCapturingGroups() + 1, static_cast<int>(max_captures));
 
         Instructions instructions = createInstructions(replacement, num_captures);
@@ -193,7 +196,10 @@ struct ReplaceRegexpImpl
         res_data.reserve(data.size());
         res_offsets.resize(size);
 
-        re2_st::RE2 searcher(needle);
+        typename re2_st::RE2::Options regexp_options;
+        /// Never write error messages to stderr. It's ignorant to do it from library code.
+        regexp_options.set_log_errors(false);
+        re2_st::RE2 searcher(needle, regexp_options);
         int num_captures = std::min(searcher.NumberOfCapturingGroups() + 1, static_cast<int>(max_captures));
 
         Instructions instructions = createInstructions(replacement, num_captures);
diff --git a/src/Functions/SimdJSONParser.h b/src/Functions/SimdJSONParser.h
index a9adfa27e2c..7ff3c45130d 100644
--- a/src/Functions/SimdJSONParser.h
+++ b/src/Functions/SimdJSONParser.h
@@ -42,11 +42,11 @@ struct SimdJSONParser
         ALWAYS_INLINE bool isBool() const { return element.type() == simdjson::dom::element_type::BOOL; }
         ALWAYS_INLINE bool isNull() const { return element.type() == simdjson::dom::element_type::NULL_VALUE; }
 
-        ALWAYS_INLINE Int64 getInt64() const { return element.get_int64().first; }
-        ALWAYS_INLINE UInt64 getUInt64() const { return element.get_uint64().first; }
-        ALWAYS_INLINE double getDouble() const { return element.get_double().first; }
-        ALWAYS_INLINE bool getBool() const { return element.get_bool().first; }
-        ALWAYS_INLINE std::string_view getString() const { return element.get_string().first; }
+        ALWAYS_INLINE Int64 getInt64() const { return element.get_int64().value_unsafe(); }
+        ALWAYS_INLINE UInt64 getUInt64() const { return element.get_uint64().value_unsafe(); }
+        ALWAYS_INLINE double getDouble() const { return element.get_double().value_unsafe(); }
+        ALWAYS_INLINE bool getBool() const { return element.get_bool().value_unsafe(); }
+        ALWAYS_INLINE std::string_view getString() const { return element.get_string().value_unsafe(); }
         ALWAYS_INLINE Array getArray() const;
         ALWAYS_INLINE Object getObject() const;
 
@@ -75,7 +75,7 @@ struct SimdJSONParser
         ALWAYS_INLINE Iterator begin() const { return array.begin(); }
         ALWAYS_INLINE Iterator end() const { return array.end(); }
         ALWAYS_INLINE size_t size() const { return array.size(); }
-        ALWAYS_INLINE Element operator[](size_t index) const { assert(index < size()); return array.at(index).first; }
+        ALWAYS_INLINE Element operator[](size_t index) const { assert(index < size()); return array.at(index).value_unsafe(); }
 
     private:
         simdjson::dom::array array;
@@ -111,7 +111,7 @@ struct SimdJSONParser
             if (x.error())
                 return false;
 
-            result = x.first;
+            result = x.value_unsafe();
             return true;
         }
 
@@ -137,7 +137,7 @@ struct SimdJSONParser
         if (document.error())
             return false;
 
-        result = document.first;
+        result = document.value_unsafe();
         return true;
     }
 
@@ -155,12 +155,12 @@ private:
 
 inline ALWAYS_INLINE SimdJSONParser::Array SimdJSONParser::Element::getArray() const
 {
-    return element.get_array().first;
+    return element.get_array().value_unsafe();
 }
 
 inline ALWAYS_INLINE SimdJSONParser::Object SimdJSONParser::Element::getObject() const
 {
-    return element.get_object().first;
+    return element.get_object().value_unsafe();
 }
 
 }
diff --git a/src/Functions/TargetSpecific.h b/src/Functions/TargetSpecific.h
index 8de6a3dbec4..e6d3fe6d665 100644
--- a/src/Functions/TargetSpecific.h
+++ b/src/Functions/TargetSpecific.h
@@ -36,15 +36,15 @@
  * int func() {
  * #if USE_MULTITARGET_CODE
  *     if (isArchSupported(TargetArch::AVX2))
- *         return TargetSpecifc::AVX2::funcImpl();
+ *         return TargetSpecific::AVX2::funcImpl();
  * #endif
- *     return TargetSpecifc::Default::funcImpl();
+ *     return TargetSpecific::Default::funcImpl();
  * }
  *
  * Sometimes code may benefit from compiling with different options.
  * For these purposes use DECLARE_MULTITARGET_CODE macros. It will create a copy
  * of the code for every supported target and compile it with different options.
- * These copies are available via TargetSpecifc namespaces described above.
+ * These copies are available via TargetSpecific namespaces described above.
  *
  * Inside every TargetSpecific namespace there is a constexpr variable BuildArch,
  * which indicates the target platform for current code.
@@ -106,7 +106,7 @@ String toString(TargetArch arch);
 /* Clang shows warning when there aren't any objects to apply pragma.
  * To prevent this warning we define this function inside every macros with pragmas.
  */
-#   define DUMMY_FUNCTION_DEFINITION void __dummy_function_definition();
+#   define DUMMY_FUNCTION_DEFINITION [[maybe_unused]] void __dummy_function_definition();
 #else
 #   define BEGIN_AVX512F_SPECIFIC_CODE \
         _Pragma("GCC push_options") \
diff --git a/src/Functions/TransformDateTime64.h b/src/Functions/TransformDateTime64.h
new file mode 100644
index 00000000000..4eab2a491c7
--- /dev/null
+++ b/src/Functions/TransformDateTime64.h
@@ -0,0 +1,95 @@
+#pragma once
+
+#include <Core/Types.h>
+#include <Core/DecimalFunctions.h>
+
+namespace DB
+{
+/** Tansform-type wrapper for DateTime64, simplifies DateTime64 support for given Transform.
+ *
+ * Depending on what overloads of Transform::execute() are available, when called with DateTime64 value,
+ * invokes Transform::execute() with either:
+ * * whole part of DateTime64 value, discarding fractional part (1)
+ * * DateTime64 value and scale factor (2)
+ * * DateTime64 broken down to components, result of execute is then re-assembled back into DateTime64 value (3)
+ *
+ * Suitable Transfotm-types are commonly used in Date/DateTime manipulation functions,
+ * and should implement static (or const) function with following signatures:
+ * 1:
+ *     R execute(Int64 whole_value, ... )
+ * 2:
+ *     R execute(DateTime64 value, Int64 scale_multiplier, ... )
+ * 3:
+ *     R execute(DecimalUtils::DecimalComponents<DateTime64> components, ... )
+ *
+ * Where R could be of arbitrary type, in case of (3) if R is DecimalUtils::DecimalComponents<DateTime64>, result is re-assembed back into DateTime64.
+*/
+template <typename Transform>
+class TransformDateTime64
+{
+private:
+    // Detect if Transform::execute is const or static method
+    // with signature defined by template args (ignoring result type).
+    template<typename = void, typename... Args>
+    struct TransformHasExecuteOverload : std::false_type {};
+
+    template<typename... Args>
+    struct TransformHasExecuteOverload<std::void_t<decltype(std::declval<Transform>().execute(std::declval<Args>()...))>, Args...>
+        : std::true_type {};
+
+    template<typename... Args>
+    static constexpr bool TransformHasExecuteOverload_v = TransformHasExecuteOverload<void, Args...>::value;
+
+public:
+    static constexpr auto name = Transform::name;
+
+    // non-explicit constructor to allow creating from scale value (or with no scale at all), indispensable in some contexts.
+    TransformDateTime64(UInt32 scale_ = 0)
+        : scale_multiplier(DecimalUtils::scaleMultiplier<DateTime64::NativeType>(scale_))
+    {}
+
+    template <typename ... Args>
+    inline auto NO_SANITIZE_UNDEFINED execute(const DateTime64 & t, Args && ... args) const
+    {
+        /// Type conversion from float to integer may be required.
+        /// We are Ok with implementation specific result for out of range and denormals conversion.
+
+        if constexpr (TransformHasExecuteOverload_v<DateTime64, decltype(scale_multiplier), Args...>)
+        {
+            return wrapped_transform.execute(t, scale_multiplier, std::forward<Args>(args)...);
+        }
+        else if constexpr (TransformHasExecuteOverload_v<DecimalUtils::DecimalComponents<DateTime64>, Args...>)
+        {
+            auto components = DecimalUtils::splitWithScaleMultiplier(t, scale_multiplier);
+
+            const auto result = wrapped_transform.execute(components, std::forward<Args>(args)...);
+            using ResultType = std::decay_t<decltype(result)>;
+
+            if constexpr (std::is_same_v<DecimalUtils::DecimalComponents<DateTime64>, ResultType>)
+            {
+                return DecimalUtils::decimalFromComponentsWithMultiplier<DateTime64>(result, scale_multiplier);
+            }
+            else
+            {
+                return result;
+            }
+        }
+        else
+        {
+            const auto components = DecimalUtils::splitWithScaleMultiplier(t, scale_multiplier);
+            return wrapped_transform.execute(static_cast<Int64>(components.whole), std::forward<Args>(args)...);
+        }
+    }
+
+    template <typename T, typename ... Args, typename = std::enable_if_t<!std::is_same_v<T, DateTime64>>>
+    inline auto execute(const T & t, Args && ... args) const
+    {
+        return wrapped_transform.execute(t, std::forward<Args>(args)...);
+    }
+
+private:
+    DateTime64::NativeType scale_multiplier = 1;
+    Transform wrapped_transform = {};
+};
+
+}
diff --git a/src/Functions/URL/ExtractFirstSignificantSubdomain.h b/src/Functions/URL/ExtractFirstSignificantSubdomain.h
index c13b5f50156..974574058e9 100644
--- a/src/Functions/URL/ExtractFirstSignificantSubdomain.h
+++ b/src/Functions/URL/ExtractFirstSignificantSubdomain.h
@@ -90,7 +90,70 @@ struct ExtractFirstSignificantSubdomain
             res_data += last_3_periods[1] + 1 - begin;
             res_size = last_3_periods[0] - last_3_periods[1] - 1;
         }
-   }
+    }
+
+    /// The difference with execute() is due to custom TLD list can have records of any level,
+    /// not only 2-nd level (like non-custom variant), so it requires more lookups.
+    template <class Lookup>
+    static void executeCustom(const Lookup & lookup, const Pos data, const size_t size, Pos & res_data, size_t & res_size, Pos * out_domain_end = nullptr)
+    {
+        res_data = data;
+        res_size = 0;
+
+        Pos tmp;
+        size_t domain_length;
+        ExtractDomain<without_www>::execute(data, size, tmp, domain_length);
+
+        if (domain_length == 0)
+            return;
+
+        if (out_domain_end)
+            *out_domain_end = tmp + domain_length;
+
+        /// cut useless dot
+        if (tmp[domain_length - 1] == '.')
+            --domain_length;
+
+        res_data = tmp;
+        res_size = domain_length;
+
+        auto begin = tmp;
+        auto end = begin + domain_length;
+        const char * last_2_periods[2]{};
+        const char * prev = begin - 1;
+
+        auto pos = find_first_symbols<'.'>(begin, end);
+        while (pos < end)
+        {
+            if (lookup(pos + 1, end - pos - 1))
+            {
+                res_data += prev + 1 - begin;
+                res_size = end - 1 - prev;
+                return;
+            }
+
+            last_2_periods[1] = last_2_periods[0];
+            last_2_periods[0] = pos;
+            prev = pos;
+            pos = find_first_symbols<'.'>(pos + 1, end);
+        }
+
+        /// if there is domain of the first level (i.e. no dots in the hostname) -> return nothing
+        if (!last_2_periods[0])
+            return;
+
+        /// if there is domain of the second level -> always return itself
+        if (!last_2_periods[1])
+        {
+            res_size = last_2_periods[0] - begin;
+            return;
+        }
+
+        /// if there is domain of the 3+ level, and zero records in TLD list ->
+        /// fallback to domain of the second level
+        res_data += last_2_periods[1] + 1 - begin;
+        res_size = last_2_periods[0] - last_2_periods[1] - 1;
+    }
 };
 
 }
diff --git a/src/Functions/URL/FirstSignificantSubdomainCustomImpl.h b/src/Functions/URL/FirstSignificantSubdomainCustomImpl.h
index 244b32459c1..4670d610725 100644
--- a/src/Functions/URL/FirstSignificantSubdomainCustomImpl.h
+++ b/src/Functions/URL/FirstSignificantSubdomainCustomImpl.h
@@ -17,10 +17,10 @@ namespace ErrorCodes
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
 }
 
-struct FirstSignificantSubdomainCustomtLookup
+struct FirstSignificantSubdomainCustomLookup
 {
     const TLDList & tld_list;
-    FirstSignificantSubdomainCustomtLookup(const std::string & tld_list_name)
+    FirstSignificantSubdomainCustomLookup(const std::string & tld_list_name)
         : tld_list(TLDListsHolder::getInstance().getTldList(tld_list_name))
     {
     }
@@ -36,7 +36,7 @@ class FunctionCutToFirstSignificantSubdomainCustomImpl : public IFunction
 {
 public:
     static constexpr auto name = Name::name;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionCutToFirstSignificantSubdomainCustomImpl>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionCutToFirstSignificantSubdomainCustomImpl>(); }
 
     String getName() const override { return name; }
     size_t getNumberOfArguments() const override { return 2; }
@@ -63,7 +63,7 @@ public:
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & /*result_type*/, size_t /*input_rows_count*/) const override
     {
         const ColumnConst * column_tld_list_name = checkAndGetColumnConstStringOrFixedString(arguments[1].column.get());
-        FirstSignificantSubdomainCustomtLookup tld_lookup(column_tld_list_name->getValue<String>());
+        FirstSignificantSubdomainCustomLookup tld_lookup(column_tld_list_name->getValue<String>());
 
         /// FIXME: convertToFullColumnIfConst() is suboptimal
         auto column = arguments[0].column->convertToFullColumnIfConst();
@@ -79,7 +79,7 @@ public:
                 ErrorCodes::ILLEGAL_COLUMN);
     }
 
-    static void vector(FirstSignificantSubdomainCustomtLookup & tld_lookup,
+    static void vector(FirstSignificantSubdomainCustomLookup & tld_lookup,
         const ColumnString::Chars & data, const ColumnString::Offsets & offsets,
         ColumnString::Chars & res_data, ColumnString::Offsets & res_offsets)
     {
diff --git a/src/Functions/URL/cutToFirstSignificantSubdomainCustom.cpp b/src/Functions/URL/cutToFirstSignificantSubdomainCustom.cpp
index 11fd27e317b..7532ddd00f2 100644
--- a/src/Functions/URL/cutToFirstSignificantSubdomainCustom.cpp
+++ b/src/Functions/URL/cutToFirstSignificantSubdomainCustom.cpp
@@ -10,7 +10,7 @@ struct CutToFirstSignificantSubdomainCustom
 {
     static size_t getReserveLengthForElement() { return 15; }
 
-    static void execute(FirstSignificantSubdomainCustomtLookup & tld_lookup, const Pos data, const size_t size, Pos & res_data, size_t & res_size)
+    static void execute(FirstSignificantSubdomainCustomLookup & tld_lookup, const Pos data, const size_t size, Pos & res_data, size_t & res_size)
     {
         res_data = data;
         res_size = 0;
@@ -18,7 +18,7 @@ struct CutToFirstSignificantSubdomainCustom
         Pos tmp_data;
         size_t tmp_length;
         Pos domain_end;
-        ExtractFirstSignificantSubdomain<without_www>::execute(tld_lookup, data, size, tmp_data, tmp_length, &domain_end);
+        ExtractFirstSignificantSubdomain<without_www>::executeCustom(tld_lookup, data, size, tmp_data, tmp_length, &domain_end);
 
         if (tmp_length == 0)
             return;
diff --git a/src/Functions/URL/port.cpp b/src/Functions/URL/port.cpp
index adc3ffa5001..382ea71eda5 100644
--- a/src/Functions/URL/port.cpp
+++ b/src/Functions/URL/port.cpp
@@ -21,7 +21,7 @@ namespace ErrorCodes
 struct FunctionPort : public IFunction
 {
     static constexpr auto name = "port";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionPort>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionPort>(); }
 
     String getName() const override { return name; }
     bool isVariadic() const override { return true; }
diff --git a/src/Functions/abtesting.cpp b/src/Functions/abtesting.cpp
index 7bed2f4a2b9..871357fe450 100644
--- a/src/Functions/abtesting.cpp
+++ b/src/Functions/abtesting.cpp
@@ -168,7 +168,7 @@ class FunctionBayesAB : public IFunction
 public:
     static constexpr auto name = "bayesAB";
 
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextPtr)
     {
         return std::make_shared<FunctionBayesAB>();
     }
diff --git a/src/Functions/addressToLine.cpp b/src/Functions/addressToLine.cpp
index a115b13e54a..554e154e866 100644
--- a/src/Functions/addressToLine.cpp
+++ b/src/Functions/addressToLine.cpp
@@ -36,9 +36,9 @@ class FunctionAddressToLine : public IFunction
 {
 public:
     static constexpr auto name = "addressToLine";
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextPtr context)
     {
-        context.checkAccess(AccessType::addressToLine);
+        context->checkAccess(AccessType::addressToLine);
         return std::make_shared<FunctionAddressToLine>();
     }
 
diff --git a/src/Functions/addressToSymbol.cpp b/src/Functions/addressToSymbol.cpp
index 5accfd1dd94..db8fe8d3b60 100644
--- a/src/Functions/addressToSymbol.cpp
+++ b/src/Functions/addressToSymbol.cpp
@@ -28,9 +28,9 @@ class FunctionAddressToSymbol : public IFunction
 {
 public:
     static constexpr auto name = "addressToSymbol";
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextPtr context)
     {
-        context.checkAccess(AccessType::addressToSymbol);
+        context->checkAccess(AccessType::addressToSymbol);
         return std::make_shared<FunctionAddressToSymbol>();
     }
 
diff --git a/src/Functions/appendTrailingCharIfAbsent.cpp b/src/Functions/appendTrailingCharIfAbsent.cpp
index 7ba9a870105..aa939860560 100644
--- a/src/Functions/appendTrailingCharIfAbsent.cpp
+++ b/src/Functions/appendTrailingCharIfAbsent.cpp
@@ -24,7 +24,7 @@ class FunctionAppendTrailingCharIfAbsent : public IFunction
 {
 public:
     static constexpr auto name = "appendTrailingCharIfAbsent";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextPtr)
     {
         return std::make_shared<FunctionAppendTrailingCharIfAbsent>();
     }
diff --git a/src/Functions/array/FunctionArrayMapped.h b/src/Functions/array/FunctionArrayMapped.h
index e336a86d994..4b6320824fa 100644
--- a/src/Functions/array/FunctionArrayMapped.h
+++ b/src/Functions/array/FunctionArrayMapped.h
@@ -11,6 +11,7 @@
 #include <Functions/IFunctionImpl.h>
 #include <Functions/FunctionHelpers.h>
 #include <IO/WriteHelpers.h>
+#include <Interpreters/Context_fwd.h>
 
 
 namespace DB
@@ -43,7 +44,7 @@ class FunctionArrayMapped : public IFunction
 {
 public:
     static constexpr auto name = Name::name;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionArrayMapped>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionArrayMapped>(); }
 
     String getName() const override
     {
diff --git a/src/Functions/array/array.cpp b/src/Functions/array/array.cpp
index ef36069015c..3c6d4066e7c 100644
--- a/src/Functions/array/array.cpp
+++ b/src/Functions/array/array.cpp
@@ -14,7 +14,7 @@ class FunctionArray : public IFunction
 {
 public:
     static constexpr auto name = "array";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextPtr)
     {
         return std::make_shared<FunctionArray>();
     }
diff --git a/src/Functions/array/arrayConcat.cpp b/src/Functions/array/arrayConcat.cpp
index 5ab22dede19..2908fbef7e0 100644
--- a/src/Functions/array/arrayConcat.cpp
+++ b/src/Functions/array/arrayConcat.cpp
@@ -26,7 +26,7 @@ class FunctionArrayConcat : public IFunction
 {
 public:
     static constexpr auto name = "arrayConcat";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionArrayConcat>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionArrayConcat>(); }
 
     String getName() const override { return name; }
 
diff --git a/src/Functions/array/arrayDistinct.cpp b/src/Functions/array/arrayDistinct.cpp
index e3be840b01f..cf73a577def 100644
--- a/src/Functions/array/arrayDistinct.cpp
+++ b/src/Functions/array/arrayDistinct.cpp
@@ -26,7 +26,7 @@ class FunctionArrayDistinct : public IFunction
 public:
     static constexpr auto name = "arrayDistinct";
 
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextPtr)
     {
         return std::make_shared<FunctionArrayDistinct>();
     }
diff --git a/src/Functions/array/arrayElement.cpp b/src/Functions/array/arrayElement.cpp
index 7d053988cae..4254b00e4bc 100644
--- a/src/Functions/array/arrayElement.cpp
+++ b/src/Functions/array/arrayElement.cpp
@@ -41,7 +41,7 @@ class FunctionArrayElement : public IFunction
 {
 public:
     static constexpr auto name = "arrayElement";
-    static FunctionPtr create(const Context & context);
+    static FunctionPtr create(ContextPtr context);
 
     String getName() const override;
 
@@ -449,7 +449,7 @@ struct ArrayElementGenericImpl
 }
 
 
-FunctionPtr FunctionArrayElement::create(const Context &)
+FunctionPtr FunctionArrayElement::create(ContextPtr)
 {
     return std::make_shared<FunctionArrayElement>();
 }
@@ -872,10 +872,18 @@ bool FunctionArrayElement::matchKeyToIndexNumberConst(
     if (!data_numeric)
         return false;
 
-    if (index.getType() != Field::Types::UInt64 && index.getType() != Field::Types::Int64)
+    std::optional<DataType> index_as_integer;
+    Field::dispatch([&](const auto & value)
+    {
+        using FieldType = std::decay_t<decltype(value)>;
+        if constexpr (is_integer_v<FieldType> && std::is_convertible_v<FieldType, DataType>)
+            index_as_integer = static_cast<DataType>(value);
+    }, index);
+
+    if (!index_as_integer)
         return false;
 
-    MatcherNumberConst<DataType> matcher{data_numeric->getData(), get<DataType>(index)};
+    MatcherNumberConst<DataType> matcher{data_numeric->getData(), *index_as_integer};
     executeMatchKeyToIndex(offsets, matched_idxs, matcher);
     return true;
 }
@@ -910,6 +918,10 @@ bool FunctionArrayElement::matchKeyToIndex(
         || matchKeyToIndexNumber<Int16>(data, offsets, arguments, matched_idxs)
         || matchKeyToIndexNumber<Int32>(data, offsets, arguments, matched_idxs)
         || matchKeyToIndexNumber<Int64>(data, offsets, arguments, matched_idxs)
+        || matchKeyToIndexNumber<Int128>(data, offsets, arguments, matched_idxs)
+        || matchKeyToIndexNumber<UInt128>(data, offsets, arguments, matched_idxs)
+        || matchKeyToIndexNumber<Int256>(data, offsets, arguments, matched_idxs)
+        || matchKeyToIndexNumber<UInt256>(data, offsets, arguments, matched_idxs)
         || matchKeyToIndexString(data, offsets, arguments, matched_idxs);
 }
 
@@ -925,6 +937,10 @@ bool FunctionArrayElement::matchKeyToIndexConst(
         || matchKeyToIndexNumberConst<Int16>(data, offsets, index, matched_idxs)
         || matchKeyToIndexNumberConst<Int32>(data, offsets, index, matched_idxs)
         || matchKeyToIndexNumberConst<Int64>(data, offsets, index, matched_idxs)
+        || matchKeyToIndexNumberConst<Int128>(data, offsets, index, matched_idxs)
+        || matchKeyToIndexNumberConst<UInt128>(data, offsets, index, matched_idxs)
+        || matchKeyToIndexNumberConst<Int256>(data, offsets, index, matched_idxs)
+        || matchKeyToIndexNumberConst<UInt256>(data, offsets, index, matched_idxs)
         || matchKeyToIndexStringConst(data, offsets, index, matched_idxs);
 }
 
@@ -949,7 +965,7 @@ ColumnPtr FunctionArrayElement::executeMap(
     {
         if (input_rows_count > 0 && !matchKeyToIndex(keys_data, offsets, arguments, indices_data))
             throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                "Illegal types of arguments: {}, {} for function ",
+                "Illegal types of arguments: {}, {} for function {}",
                 arguments[0].type->getName(), arguments[1].type->getName(), getName());
     }
     else
diff --git a/src/Functions/array/arrayEnumerate.cpp b/src/Functions/array/arrayEnumerate.cpp
index 82bb25e2129..b77fc9a468f 100644
--- a/src/Functions/array/arrayEnumerate.cpp
+++ b/src/Functions/array/arrayEnumerate.cpp
@@ -22,7 +22,7 @@ class FunctionArrayEnumerate : public IFunction
 public:
     static constexpr auto name = "arrayEnumerate";
 
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextPtr)
     {
         return std::make_shared<FunctionArrayEnumerate>();
     }
diff --git a/src/Functions/array/arrayEnumerateExtended.h b/src/Functions/array/arrayEnumerateExtended.h
index 39bdd2a515e..9edf7959354 100644
--- a/src/Functions/array/arrayEnumerateExtended.h
+++ b/src/Functions/array/arrayEnumerateExtended.h
@@ -30,7 +30,7 @@ template <typename Derived>
 class FunctionArrayEnumerateExtended : public IFunction
 {
 public:
-    static FunctionPtr create(const Context &) { return std::make_shared<Derived>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<Derived>(); }
 
     String getName() const override { return Derived::name; }
 
diff --git a/src/Functions/array/arrayEnumerateRanked.h b/src/Functions/array/arrayEnumerateRanked.h
index ce82b8bcd86..2d13482b01e 100644
--- a/src/Functions/array/arrayEnumerateRanked.h
+++ b/src/Functions/array/arrayEnumerateRanked.h
@@ -90,7 +90,7 @@ template <typename Derived>
 class FunctionArrayEnumerateRankedExtended : public IFunction
 {
 public:
-    static FunctionPtr create(const Context & /* context */) { return std::make_shared<Derived>(); }
+    static FunctionPtr create(ContextPtr /* context */) { return std::make_shared<Derived>(); }
 
     String getName() const override { return Derived::name; }
 
diff --git a/src/Functions/array/arrayFlatten.cpp b/src/Functions/array/arrayFlatten.cpp
index f9330bcd432..e1b8f96b2ee 100644
--- a/src/Functions/array/arrayFlatten.cpp
+++ b/src/Functions/array/arrayFlatten.cpp
@@ -20,7 +20,7 @@ class ArrayFlatten : public IFunction
 public:
     static constexpr auto name = "arrayFlatten";
 
-    static FunctionPtr create(const Context &) { return std::make_shared<ArrayFlatten>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<ArrayFlatten>(); }
 
     size_t getNumberOfArguments() const override { return 1; }
     bool useDefaultImplementationForConstants() const override { return true; }
diff --git a/src/Functions/array/arrayIndex.h b/src/Functions/array/arrayIndex.h
index bc9e0b5608d..1b58c9418bf 100644
--- a/src/Functions/array/arrayIndex.h
+++ b/src/Functions/array/arrayIndex.h
@@ -5,6 +5,7 @@
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/getLeastSupertype.h>
 #include <Columns/ColumnArray.h>
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnFixedString.h>
@@ -13,9 +14,9 @@
 #include <Common/FieldVisitorsAccurateComparison.h>
 #include <Common/memcmpSmall.h>
 #include <Common/assert_cast.h>
-#include "Columns/ColumnLowCardinality.h"
-#include "DataTypes/DataTypeLowCardinality.h"
-#include "Interpreters/castColumn.h"
+#include <Columns/ColumnLowCardinality.h>
+#include <DataTypes/DataTypeLowCardinality.h>
+#include <Interpreters/castColumn.h>
 
 
 namespace DB
@@ -354,7 +355,7 @@ class FunctionArrayIndex : public IFunction
 {
 public:
     static constexpr auto name = Name::name;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionArrayIndex>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionArrayIndex>(); }
 
     /// Get function name.
     String getName() const override { return name; }
@@ -373,11 +374,10 @@ public:
                 ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
 
         if (!arguments[1]->onlyNull() && !allowArguments(array_type->getNestedType(), arguments[1]))
-            throw Exception("Types of array and 2nd argument of function \""
-                + getName() + "\" must be identical up to nullability, cardinality, "
-                "numeric types, or Enum and numeric type. Passed: "
-                + arguments[0]->getName() + " and " + arguments[1]->getName() + ".",
-                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Types of array and 2nd argument of function `{}` must be identical up to nullability, cardinality, "
+                "numeric types, or Enum and numeric type. Passed: {} and {}.",
+                getName(), arguments[0]->getName(), arguments[1]->getName());
 
         return std::make_shared<DataTypeNumber<ResultType>>();
     }
@@ -494,86 +494,13 @@ private:
         inline void moveResult() { result_column = std::move(result); }
     };
 
-    static inline bool allowNested(const DataTypePtr & left, const DataTypePtr & right)
-    {
-        return ((isNativeNumber(left) || isEnum(left)) && isNativeNumber(right)) || left->equals(*right);
-    }
-
     static inline bool allowArguments(const DataTypePtr & array_inner_type, const DataTypePtr & arg)
     {
-        if (allowNested(array_inner_type, arg))
-            return true;
+        auto inner_type_decayed = removeNullable(removeLowCardinality(array_inner_type));
+        auto arg_decayed = removeNullable(removeLowCardinality(arg));
 
-        /// Nullable
-
-        const bool array_is_nullable = array_inner_type->isNullable();
-        const bool arg_is_nullable = arg->isNullable();
-
-        const DataTypePtr arg_or_arg_nullable_nested = arg_is_nullable
-            ? checkAndGetDataType<DataTypeNullable>(arg.get())->getNestedType()
-            : arg;
-
-        if (array_is_nullable) // comparing Array(Nullable(T)) elem and U
-        {
-            const DataTypePtr array_nullable_nested =
-                checkAndGetDataType<DataTypeNullable>(array_inner_type.get())->getNestedType();
-
-            // We also allow Nullable(T) and LC(U) if the Nullable(T) and U are allowed,
-            // the LC(U) will be converted to U.
-            return allowNested(
-                    array_nullable_nested,
-                    recursiveRemoveLowCardinality(arg_or_arg_nullable_nested));
-        }
-        else if (arg_is_nullable) // cannot compare Array(T) elem (namely, T) and Nullable(T)
-            return false;
-
-        /// LowCardinality
-
-        const auto * const array_lc_ptr = checkAndGetDataType<DataTypeLowCardinality>(array_inner_type.get());
-        const auto * const arg_lc_ptr = checkAndGetDataType<DataTypeLowCardinality>(arg.get());
-
-        const DataTypePtr array_lc_inner_type = recursiveRemoveLowCardinality(array_inner_type);
-        const DataTypePtr arg_lc_inner_type = recursiveRemoveLowCardinality(arg);
-
-        const bool array_is_lc = nullptr != array_lc_ptr;
-        const bool arg_is_lc = nullptr != arg_lc_ptr;
-
-        const bool array_lc_inner_type_is_nullable = array_is_lc && array_lc_inner_type->isNullable();
-        const bool arg_lc_inner_type_is_nullable = arg_is_lc && arg_lc_inner_type->isNullable();
-
-        if (array_is_lc) // comparing LC(T) and U
-        {
-            const DataTypePtr array_lc_nested_or_lc_nullable_nested = array_lc_inner_type_is_nullable
-                ? checkAndGetDataType<DataTypeNullable>(array_lc_inner_type.get())->getNestedType()
-                : array_lc_inner_type;
-
-            if (arg_is_lc) // comparing LC(T) and LC(U)
-            {
-                const DataTypePtr arg_lc_nested_or_lc_nullable_nested = arg_lc_inner_type_is_nullable
-                    ? checkAndGetDataType<DataTypeNullable>(arg_lc_inner_type.get())->getNestedType()
-                    : arg_lc_inner_type;
-
-                return allowNested(
-                        array_lc_nested_or_lc_nullable_nested,
-                        arg_lc_nested_or_lc_nullable_nested);
-            }
-            else if (arg_is_nullable) // Comparing LC(T) and Nullable(U)
-            {
-                if (!array_lc_inner_type_is_nullable)
-                    return false; // Can't compare Array(LC(U)) elem and Nullable(T);
-
-                return allowNested(
-                        array_lc_nested_or_lc_nullable_nested,
-                        arg_or_arg_nullable_nested);
-            }
-            else // Comparing LC(T) and U (U neither Nullable nor LC)
-                return allowNested(array_lc_nested_or_lc_nullable_nested, arg);
-        }
-
-        if (arg_is_lc) // Allow T and LC(U) if U and T are allowed (the low cardinality column will be converted).
-            return allowNested(array_inner_type, arg_lc_inner_type);
-
-        return false;
+        return ((isNativeNumber(inner_type_decayed) || isEnum(inner_type_decayed)) && isNativeNumber(arg_decayed))
+            || getLeastSupertype({inner_type_decayed, arg_decayed});
     }
 
 #define INTEGRAL_TPL_PACK UInt8, UInt16, UInt32, UInt64, Int8, Int16, Int32, Int64, Float32, Float64
@@ -1044,33 +971,38 @@ private:
         if (!col)
             return nullptr;
 
-        const IColumn & col_nested = col->getData();
+        DataTypePtr array_elements_type = assert_cast<const DataTypeArray &>(*arguments[0].type).getNestedType();
+        const DataTypePtr & index_type = arguments[1].type;
+
+        DataTypePtr common_type = getLeastSupertype({array_elements_type, index_type});
+
+        ColumnPtr col_nested = castColumn({ col->getDataPtr(), array_elements_type, "" }, common_type);
 
         const ColumnPtr right_ptr = arguments[1].column->convertToFullColumnIfLowCardinality();
-        const IColumn & item_arg = *right_ptr.get();
+        ColumnPtr item_arg = castColumn({ right_ptr, removeLowCardinality(index_type), "" }, common_type);
 
         auto col_res = ResultColumnType::create();
 
         auto [null_map_data, null_map_item] = getNullMaps(arguments);
 
-        if (item_arg.onlyNull())
+        if (item_arg->onlyNull())
             Impl::Null<ConcreteAction>::process(
                 col->getOffsets(),
                 col_res->getData(),
                 null_map_data);
-        else if (isColumnConst(item_arg))
+        else if (isColumnConst(*item_arg))
             Impl::Main<ConcreteAction, true>::vector(
-                col_nested,
+                *col_nested,
                 col->getOffsets(),
-                typeid_cast<const ColumnConst &>(item_arg).getDataColumn(),
+                typeid_cast<const ColumnConst &>(*item_arg).getDataColumn(),
                 col_res->getData(), /// TODO This is wrong.
                 null_map_data,
                 nullptr);
         else
             Impl::Main<ConcreteAction>::vector(
-                col_nested,
+                *col_nested,
                 col->getOffsets(),
-                item_arg,
+                *item_arg,
                 col_res->getData(),
                 null_map_data,
                 null_map_item);
diff --git a/src/Functions/array/arrayIntersect.cpp b/src/Functions/array/arrayIntersect.cpp
index 736069d6060..7275a1395c0 100644
--- a/src/Functions/array/arrayIntersect.cpp
+++ b/src/Functions/array/arrayIntersect.cpp
@@ -38,8 +38,8 @@ class FunctionArrayIntersect : public IFunction
 {
 public:
     static constexpr auto name = "arrayIntersect";
-    static FunctionPtr create(const Context & context) { return std::make_shared<FunctionArrayIntersect>(context); }
-    explicit FunctionArrayIntersect(const Context & context_) : context(context_) {}
+    static FunctionPtr create(ContextPtr context) { return std::make_shared<FunctionArrayIntersect>(context); }
+    explicit FunctionArrayIntersect(ContextPtr context_) : context(context_) {}
 
     String getName() const override { return name; }
 
@@ -53,7 +53,7 @@ public:
     bool useDefaultImplementationForConstants() const override { return true; }
 
 private:
-    const Context & context;
+    ContextPtr context;
 
     /// Initially allocate a piece of memory for 64 elements. NOTE: This is just a guess.
     static constexpr size_t INITIAL_SIZE_DEGREE = 6;
@@ -281,7 +281,7 @@ FunctionArrayIntersect::CastArgumentsResult FunctionArrayIntersect::castColumns(
     return {.initial = initial_columns, .casted = casted_columns};
 }
 
-static ColumnPtr callFunctionNotEquals(ColumnWithTypeAndName first, ColumnWithTypeAndName second, const Context & context)
+static ColumnPtr callFunctionNotEquals(ColumnWithTypeAndName first, ColumnWithTypeAndName second, ContextPtr context)
 {
     ColumnsWithTypeAndName args{first, second};
     auto eq_func = FunctionFactory::instance().get("notEquals", context)->build(args);
diff --git a/src/Functions/array/arrayJoin.cpp b/src/Functions/array/arrayJoin.cpp
index c4991b0663e..1ba215239ec 100644
--- a/src/Functions/array/arrayJoin.cpp
+++ b/src/Functions/array/arrayJoin.cpp
@@ -20,7 +20,7 @@ class FunctionArrayJoin : public IFunction
 {
 public:
     static constexpr auto name = "arrayJoin";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextPtr)
     {
         return std::make_shared<FunctionArrayJoin>();
     }
diff --git a/src/Functions/array/arrayPopBack.cpp b/src/Functions/array/arrayPopBack.cpp
index d69e59e7128..0b532c22661 100644
--- a/src/Functions/array/arrayPopBack.cpp
+++ b/src/Functions/array/arrayPopBack.cpp
@@ -9,7 +9,7 @@ class FunctionArrayPopBack : public FunctionArrayPop
 {
 public:
     static constexpr auto name = "arrayPopBack";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionArrayPopBack>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionArrayPopBack>(); }
     FunctionArrayPopBack() : FunctionArrayPop(false, name) {}
 };
 
diff --git a/src/Functions/array/arrayPopFront.cpp b/src/Functions/array/arrayPopFront.cpp
index ca9ce923aaa..57eedf9b44a 100644
--- a/src/Functions/array/arrayPopFront.cpp
+++ b/src/Functions/array/arrayPopFront.cpp
@@ -9,7 +9,7 @@ class FunctionArrayPopFront : public FunctionArrayPop
 {
 public:
     static constexpr auto name = "arrayPopFront";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionArrayPopFront>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionArrayPopFront>(); }
     FunctionArrayPopFront() : FunctionArrayPop(true, name) {}
 };
 
diff --git a/src/Functions/array/arrayPushBack.cpp b/src/Functions/array/arrayPushBack.cpp
index 3c6d4113b88..3171bca9d2c 100644
--- a/src/Functions/array/arrayPushBack.cpp
+++ b/src/Functions/array/arrayPushBack.cpp
@@ -9,7 +9,7 @@ class FunctionArrayPushBack : public FunctionArrayPush
 {
 public:
     static constexpr auto name = "arrayPushBack";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionArrayPushBack>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionArrayPushBack>(); }
     FunctionArrayPushBack() : FunctionArrayPush(false, name) {}
 };
 
diff --git a/src/Functions/array/arrayPushFront.cpp b/src/Functions/array/arrayPushFront.cpp
index 49f47170f3c..d12dfe02af1 100644
--- a/src/Functions/array/arrayPushFront.cpp
+++ b/src/Functions/array/arrayPushFront.cpp
@@ -10,7 +10,7 @@ class FunctionArrayPushFront : public FunctionArrayPush
 {
 public:
     static constexpr auto name = "arrayPushFront";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionArrayPushFront>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionArrayPushFront>(); }
     FunctionArrayPushFront() : FunctionArrayPush(true, name) {}
 };
 
diff --git a/src/Functions/array/arrayReduce.cpp b/src/Functions/array/arrayReduce.cpp
index 342a4b18854..1e1ae08ff3a 100644
--- a/src/Functions/array/arrayReduce.cpp
+++ b/src/Functions/array/arrayReduce.cpp
@@ -11,7 +11,7 @@
 #include <AggregateFunctions/parseAggregateFunctionParameters.h>
 #include <Common/Arena.h>
 
-#include <ext/scope_guard.h>
+#include <ext/scope_guard_safe.h>
 
 
 namespace DB
@@ -37,7 +37,7 @@ class FunctionArrayReduce : public IFunction
 {
 public:
     static constexpr auto name = "arrayReduce";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionArrayReduce>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionArrayReduce>(); }
 
     String getName() const override { return name; }
 
@@ -172,7 +172,7 @@ ColumnPtr FunctionArrayReduce::executeImpl(const ColumnsWithTypeAndName & argume
         }
     }
 
-    SCOPE_EXIT({
+    SCOPE_EXIT_MEMORY_SAFE({
         for (size_t i = 0; i < input_rows_count; ++i)
             agg_func.destroy(places[i]);
     });
diff --git a/src/Functions/array/arrayReduceInRanges.cpp b/src/Functions/array/arrayReduceInRanges.cpp
index 9839d2a8fe7..ea87fc96630 100644
--- a/src/Functions/array/arrayReduceInRanges.cpp
+++ b/src/Functions/array/arrayReduceInRanges.cpp
@@ -13,7 +13,7 @@
 #include <AggregateFunctions/parseAggregateFunctionParameters.h>
 #include <Common/Arena.h>
 
-#include <ext/scope_guard.h>
+#include <ext/scope_guard_safe.h>
 
 
 namespace DB
@@ -40,7 +40,7 @@ class FunctionArrayReduceInRanges : public IFunction
 public:
     static const size_t minimum_step = 64;
     static constexpr auto name = "arrayReduceInRanges";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionArrayReduceInRanges>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionArrayReduceInRanges>(); }
 
     String getName() const override { return name; }
 
@@ -252,7 +252,7 @@ ColumnPtr FunctionArrayReduceInRanges::executeImpl(const ColumnsWithTypeAndName
             }
         }
 
-        SCOPE_EXIT({
+        SCOPE_EXIT_MEMORY_SAFE({
             for (size_t j = 0; j < place_total; ++j)
                 agg_func.destroy(places[j]);
         });
@@ -331,7 +331,7 @@ ColumnPtr FunctionArrayReduceInRanges::executeImpl(const ColumnsWithTypeAndName
             AggregateDataPtr place = arena->alignedAlloc(agg_func.sizeOfData(), agg_func.alignOfData());
             agg_func.create(place);
 
-            SCOPE_EXIT({
+            SCOPE_EXIT_MEMORY_SAFE({
                 agg_func.destroy(place);
             });
 
diff --git a/src/Functions/array/arrayResize.cpp b/src/Functions/array/arrayResize.cpp
index 0f7f20d7747..eead7a0fa84 100644
--- a/src/Functions/array/arrayResize.cpp
+++ b/src/Functions/array/arrayResize.cpp
@@ -25,7 +25,7 @@ class FunctionArrayResize : public IFunction
 {
 public:
     static constexpr auto name = "arrayResize";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionArrayResize>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionArrayResize>(); }
 
     String getName() const override { return name; }
 
diff --git a/src/Functions/array/arrayReverse.cpp b/src/Functions/array/arrayReverse.cpp
index 1eb07c53497..5928ab0d72f 100644
--- a/src/Functions/array/arrayReverse.cpp
+++ b/src/Functions/array/arrayReverse.cpp
@@ -24,7 +24,7 @@ class FunctionArrayReverse : public IFunction
 {
 public:
     static constexpr auto name = "arrayReverse";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionArrayReverse>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionArrayReverse>(); }
 
     String getName() const override { return name; }
 
diff --git a/src/Functions/array/arrayScalarProduct.h b/src/Functions/array/arrayScalarProduct.h
index 2ff8b88b2f0..6a23d6a45d8 100644
--- a/src/Functions/array/arrayScalarProduct.h
+++ b/src/Functions/array/arrayScalarProduct.h
@@ -25,7 +25,7 @@ class FunctionArrayScalarProduct : public IFunction
 {
 public:
     static constexpr auto name = Name::name;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionArrayScalarProduct>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionArrayScalarProduct>(); }
 
 private:
     using ResultColumnType = ColumnVector<typename Method::ResultType>;
diff --git a/src/Functions/array/arraySlice.cpp b/src/Functions/array/arraySlice.cpp
index 1e72e6a45cf..859d3b99db2 100644
--- a/src/Functions/array/arraySlice.cpp
+++ b/src/Functions/array/arraySlice.cpp
@@ -34,7 +34,7 @@ class FunctionArraySlice : public IFunction
 {
 public:
     static constexpr auto name = "arraySlice";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionArraySlice>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionArraySlice>(); }
 
     String getName() const override { return name; }
 
diff --git a/src/Functions/array/arrayUniq.cpp b/src/Functions/array/arrayUniq.cpp
index 70246872f6b..ba0bcf8cd0c 100644
--- a/src/Functions/array/arrayUniq.cpp
+++ b/src/Functions/array/arrayUniq.cpp
@@ -31,7 +31,7 @@ class FunctionArrayUniq : public IFunction
 public:
     static constexpr auto name = "arrayUniq";
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionArrayUniq>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionArrayUniq>(); }
 
     String getName() const override { return name; }
 
diff --git a/src/Functions/array/arrayWithConstant.cpp b/src/Functions/array/arrayWithConstant.cpp
index f9fc0ac3b66..453e95ed3b5 100644
--- a/src/Functions/array/arrayWithConstant.cpp
+++ b/src/Functions/array/arrayWithConstant.cpp
@@ -30,7 +30,7 @@ class FunctionArrayWithConstant : public IFunction
 public:
     static constexpr auto name = "arrayWithConstant";
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionArrayWithConstant>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionArrayWithConstant>(); }
 
     String getName() const override { return name; }
     size_t getNumberOfArguments() const override { return 2; }
diff --git a/src/Functions/array/arrayZip.cpp b/src/Functions/array/arrayZip.cpp
index 5a377355710..f77b4f6dfe9 100644
--- a/src/Functions/array/arrayZip.cpp
+++ b/src/Functions/array/arrayZip.cpp
@@ -23,7 +23,7 @@ class FunctionArrayZip : public IFunction
 {
 public:
     static constexpr auto name = "arrayZip";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionArrayZip>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionArrayZip>(); }
 
     String getName() const override
     {
diff --git a/src/Functions/array/emptyArray.cpp b/src/Functions/array/emptyArray.cpp
index ac227370180..54d9b794ba5 100644
--- a/src/Functions/array/emptyArray.cpp
+++ b/src/Functions/array/emptyArray.cpp
@@ -29,7 +29,7 @@ struct FunctionEmptyArray : public IFunction
 {
     static constexpr auto base_name = "emptyArray";
     static const String name;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionEmptyArray>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionEmptyArray>(); }
 
 private:
     String getName() const override
diff --git a/src/Functions/array/emptyArrayToSingle.cpp b/src/Functions/array/emptyArrayToSingle.cpp
index e3bfe62ac22..8f726d55ab0 100644
--- a/src/Functions/array/emptyArrayToSingle.cpp
+++ b/src/Functions/array/emptyArrayToSingle.cpp
@@ -27,7 +27,7 @@ class FunctionEmptyArrayToSingle : public IFunction
 {
 public:
     static constexpr auto name = "emptyArrayToSingle";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionEmptyArrayToSingle>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionEmptyArrayToSingle>(); }
 
     String getName() const override { return name; }
 
diff --git a/src/Functions/array/hasAll.cpp b/src/Functions/array/hasAll.cpp
index 27843b76f66..c1959515e9f 100644
--- a/src/Functions/array/hasAll.cpp
+++ b/src/Functions/array/hasAll.cpp
@@ -10,7 +10,7 @@ class FunctionArrayHasAll : public FunctionArrayHasAllAny
 {
 public:
     static constexpr auto name = "hasAll";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionArrayHasAll>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionArrayHasAll>(); }
     FunctionArrayHasAll() : FunctionArrayHasAllAny(GatherUtils::ArraySearchType::All, name) {}
 };
 
diff --git a/src/Functions/array/hasAllAny.h b/src/Functions/array/hasAllAny.h
index b35c5996652..1ad1df14020 100644
--- a/src/Functions/array/hasAllAny.h
+++ b/src/Functions/array/hasAllAny.h
@@ -13,6 +13,7 @@
 #include <Interpreters/castColumn.h>
 #include <Common/typeid_cast.h>
 #include <ext/range.h>
+#include <ext/map.h>
 
 
 namespace DB
@@ -51,41 +52,13 @@ public:
 
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
-        size_t rows = input_rows_count;
         size_t num_args = arguments.size();
 
-        DataTypePtr common_type = nullptr;
-        auto commonType = [&common_type, &arguments]()
-        {
-            if (common_type == nullptr)
-            {
-                DataTypes data_types;
-                data_types.reserve(arguments.size());
-                for (const auto & argument : arguments)
-                    data_types.push_back(argument.type);
-
-                common_type = getLeastSupertype(data_types);
-            }
-
-            return common_type;
-        };
+        DataTypePtr common_type = getLeastSupertype(ext::map(arguments, [](auto & arg) { return arg.type; }));
 
         Columns preprocessed_columns(num_args);
-
         for (size_t i = 0; i < num_args; ++i)
-        {
-            const auto & argument = arguments[i];
-            ColumnPtr preprocessed_column = argument.column;
-
-            const auto * argument_type = typeid_cast<const DataTypeArray *>(argument.type.get());
-            const auto & nested_type = argument_type->getNestedType();
-
-            /// Converts Array(Nothing) or Array(Nullable(Nothing) to common type. Example: hasAll([Null, 1], [Null]) -> 1
-            if (typeid_cast<const DataTypeNothing *>(removeNullable(nested_type).get()))
-                preprocessed_column = castColumn(argument, commonType());
-
-            preprocessed_columns[i] = std::move(preprocessed_column);
-        }
+            preprocessed_columns[i] = castColumn(arguments[i], common_type);
 
         std::vector<std::unique_ptr<GatherUtils::IArraySource>> sources;
 
@@ -100,12 +73,12 @@ public:
             }
 
             if (const auto * argument_column_array = typeid_cast<const ColumnArray *>(argument_column.get()))
-                sources.emplace_back(GatherUtils::createArraySource(*argument_column_array, is_const, rows));
+                sources.emplace_back(GatherUtils::createArraySource(*argument_column_array, is_const, input_rows_count));
             else
                 throw Exception{"Arguments for function " + getName() + " must be arrays.", ErrorCodes::LOGICAL_ERROR};
         }
 
-        auto result_column = ColumnUInt8::create(rows);
+        auto result_column = ColumnUInt8::create(input_rows_count);
         auto * result_column_ptr = typeid_cast<ColumnUInt8 *>(result_column.get());
         GatherUtils::sliceHas(*sources[0], *sources[1], search_type, *result_column_ptr);
 
diff --git a/src/Functions/array/hasAny.cpp b/src/Functions/array/hasAny.cpp
index 085a01c008e..fac810c7ba1 100644
--- a/src/Functions/array/hasAny.cpp
+++ b/src/Functions/array/hasAny.cpp
@@ -10,7 +10,7 @@ class FunctionArrayHasAny : public FunctionArrayHasAllAny
 {
 public:
     static constexpr auto name = "hasAny";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionArrayHasAny>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionArrayHasAny>(); }
     FunctionArrayHasAny() : FunctionArrayHasAllAny(GatherUtils::ArraySearchType::Any, name) {}
 };
 
diff --git a/src/Functions/array/hasSubstr.cpp b/src/Functions/array/hasSubstr.cpp
index 73430824b57..886f82f577b 100644
--- a/src/Functions/array/hasSubstr.cpp
+++ b/src/Functions/array/hasSubstr.cpp
@@ -10,7 +10,7 @@ class FunctionArrayHasSubstr : public FunctionArrayHasAllAny
 {
 public:
     static constexpr auto name = "hasSubstr";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionArrayHasSubstr>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionArrayHasSubstr>(); }
     FunctionArrayHasSubstr() : FunctionArrayHasAllAny(GatherUtils::ArraySearchType::Substr, name) {}
 };
 
diff --git a/src/Functions/array/mapOp.cpp b/src/Functions/array/mapOp.cpp
index 62662099961..78b7ce2b155 100644
--- a/src/Functions/array/mapOp.cpp
+++ b/src/Functions/array/mapOp.cpp
@@ -6,7 +6,9 @@
 #include <DataTypes/DataTypesNumber.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
-#include "Core/ColumnWithTypeAndName.h"
+#include <common/arithmeticOverflow.h>
+#include <Core/ColumnWithTypeAndName.h>
+
 
 namespace DB
 {
@@ -41,7 +43,7 @@ class FunctionMapOp : public IFunction
 {
 public:
     static constexpr auto name = (op_type == OpTypes::ADD) ? "mapAdd" : "mapSubtract";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionMapOp>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionMapOp>(); }
 
 private:
     String getName() const override { return name; }
@@ -159,27 +161,27 @@ private:
                     if constexpr (is_str_key)
                     {
                         // have to use Field structs to get strings
-                        key = arg.key_column.operator[](offset + j).get<KeyType>();
+                        key = arg.key_column[offset + j].get<KeyType>();
                     }
                     else
                     {
                         key = assert_cast<const ColumnVector<KeyType> &>(arg.key_column).getData()[offset + j];
                     }
 
-                    auto value = arg.val_column.operator[](offset + j).get<ValType>();
+                    ValType value = arg.val_column[offset + j].get<ValType>();
 
                     if constexpr (op_type == OpTypes::ADD)
                     {
                         const auto [it, inserted] = summing_map.insert({key, value});
                         if (!inserted)
-                            it->second += value;
+                            it->second = common::addIgnoreOverflow(it->second, value);
                     }
                     else
                     {
                         static_assert(op_type == OpTypes::SUBTRACT);
-                        const auto [it, inserted] = summing_map.insert({key, first ? value : -value});
+                        const auto [it, inserted] = summing_map.insert({key, first ? value : common::negateIgnoreOverflow(value)});
                         if (!inserted)
-                            it->second -= value;
+                            it->second = common::subIgnoreOverflow(it->second, value);
                     }
                 }
 
diff --git a/src/Functions/array/mapPopulateSeries.cpp b/src/Functions/array/mapPopulateSeries.cpp
index 2050e0c28ab..eb2f6192346 100644
--- a/src/Functions/array/mapPopulateSeries.cpp
+++ b/src/Functions/array/mapPopulateSeries.cpp
@@ -23,7 +23,7 @@ class FunctionMapPopulateSeries : public IFunction
 {
 public:
     static constexpr auto name = "mapPopulateSeries";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionMapPopulateSeries>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionMapPopulateSeries>(); }
 
 private:
     String getName() const override { return name; }
@@ -190,7 +190,7 @@ private:
             }
 
             static constexpr size_t MAX_ARRAY_SIZE = 1ULL << 30;
-            if (static_cast<size_t>(max_key - min_key) > MAX_ARRAY_SIZE)
+            if (static_cast<size_t>(max_key) - static_cast<size_t>(min_key) > MAX_ARRAY_SIZE)
                 throw Exception(ErrorCodes::TOO_LARGE_ARRAY_SIZE, "Too large array size in the result of function {}", getName());
 
             /* fill the result arrays */
diff --git a/src/Functions/array/range.cpp b/src/Functions/array/range.cpp
index 1a057458175..1b1ab802578 100644
--- a/src/Functions/array/range.cpp
+++ b/src/Functions/array/range.cpp
@@ -22,12 +22,17 @@ namespace ErrorCodes
 }
 
 
+/** Generates array
+  * range(size): [0, size)
+  * range(start, end): [start, end)
+  * range(start, end, step): [start, end) with step increments.
+  */
 class FunctionRange : public IFunction
 {
 public:
     static constexpr auto name = "range";
     static constexpr size_t max_elements = 100'000'000;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionRange>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionRange>(); }
 
 private:
     String getName() const override { return name; }
@@ -40,9 +45,9 @@ private:
     {
         if (arguments.size() > 3 || arguments.empty())
         {
-            throw Exception{"Function " + getName() + " needs 1..3 arguments; passed "
-                            + std::to_string(arguments.size()) + ".",
-                            ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH};
+            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+                "Function {} needs 1..3 arguments; passed {}.",
+                getName(), arguments.size());
         }
 
         for (const auto & arg : arguments)
@@ -339,6 +344,18 @@ private:
 
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
+        DataTypePtr elem_type = checkAndGetDataType<DataTypeArray>(result_type.get())->getNestedType();
+        WhichDataType which(elem_type);
+
+        if (!which.isUInt8()
+            && !which.isUInt16()
+            && !which.isUInt32()
+            && !which.isUInt64())
+        {
+            throw Exception{"Illegal columns of arguments of function " + getName()
+                + ", the function only implemented for unsigned integers up to 64 bit", ErrorCodes::ILLEGAL_COLUMN};
+        }
+
         ColumnPtr res;
         if (arguments.size() == 1)
         {
@@ -356,22 +373,24 @@ private:
         Columns columns_holder(3);
         ColumnRawPtrs column_ptrs(3);
 
-        const auto return_type = checkAndGetDataType<DataTypeArray>(result_type.get())->getNestedType();
-
         for (size_t i = 0; i < arguments.size(); ++i)
         {
             if (i == 1)
-                columns_holder[i] = castColumn(arguments[i], return_type)->convertToFullColumnIfConst();
+                columns_holder[i] = castColumn(arguments[i], elem_type)->convertToFullColumnIfConst();
             else
-                columns_holder[i] = castColumn(arguments[i], return_type);
+                columns_holder[i] = castColumn(arguments[i], elem_type);
 
             column_ptrs[i] = columns_holder[i].get();
         }
 
-        // for step column, defaults to 1
+        /// Step is one by default.
         if (arguments.size() == 2)
         {
-            columns_holder[2] = return_type->createColumnConst(input_rows_count, 1);
+            /// Convert a column with constant 1 to the result type.
+            columns_holder[2] = castColumn(
+                {DataTypeUInt8().createColumnConst(input_rows_count, 1), std::make_shared<DataTypeUInt8>(), {}},
+                elem_type);
+
             column_ptrs[2] = columns_holder[2].get();
         }
 
@@ -385,7 +404,9 @@ private:
             if ((res = executeConstStartStep<UInt8>(column_ptrs[1], start, step, input_rows_count)) ||
                 (res = executeConstStartStep<UInt16>(column_ptrs[1], start, step, input_rows_count)) ||
                 (res = executeConstStartStep<UInt32>(column_ptrs[1], start, step, input_rows_count)) ||
-                (res = executeConstStartStep<UInt64>(column_ptrs[1], start, step, input_rows_count))) {}
+                (res = executeConstStartStep<UInt64>(column_ptrs[1], start, step, input_rows_count)))
+            {
+            }
         }
         else if (is_start_const && !is_step_const)
         {
@@ -394,7 +415,9 @@ private:
             if ((res = executeConstStart<UInt8>(column_ptrs[1], column_ptrs[2], start, input_rows_count)) ||
                 (res = executeConstStart<UInt16>(column_ptrs[1], column_ptrs[2], start, input_rows_count)) ||
                 (res = executeConstStart<UInt32>(column_ptrs[1], column_ptrs[2], start, input_rows_count)) ||
-                (res = executeConstStart<UInt64>(column_ptrs[1], column_ptrs[2], start, input_rows_count))) {}
+                (res = executeConstStart<UInt64>(column_ptrs[1], column_ptrs[2], start, input_rows_count)))
+            {
+            }
         }
         else if (!is_start_const && is_step_const)
         {
@@ -403,14 +426,18 @@ private:
             if ((res = executeConstStep<UInt8>(column_ptrs[0], column_ptrs[1], step, input_rows_count)) ||
                 (res = executeConstStep<UInt16>(column_ptrs[0], column_ptrs[1], step, input_rows_count)) ||
                 (res = executeConstStep<UInt32>(column_ptrs[0], column_ptrs[1], step, input_rows_count)) ||
-                (res = executeConstStep<UInt64>(column_ptrs[0], column_ptrs[1], step, input_rows_count))) {}
+                (res = executeConstStep<UInt64>(column_ptrs[0], column_ptrs[1], step, input_rows_count)))
+            {
+            }
         }
         else
         {
             if ((res = executeGeneric<UInt8>(column_ptrs[0], column_ptrs[1], column_ptrs[2], input_rows_count)) ||
                 (res = executeGeneric<UInt16>(column_ptrs[0], column_ptrs[1], column_ptrs[2], input_rows_count)) ||
                 (res = executeGeneric<UInt32>(column_ptrs[0], column_ptrs[1], column_ptrs[2], input_rows_count)) ||
-                (res = executeGeneric<UInt64>(column_ptrs[0], column_ptrs[1], column_ptrs[2], input_rows_count))) {}
+                (res = executeGeneric<UInt64>(column_ptrs[0], column_ptrs[1], column_ptrs[2], input_rows_count)))
+            {
+            }
         }
 
         if (!res)
diff --git a/src/Functions/assumeNotNull.cpp b/src/Functions/assumeNotNull.cpp
index ab0d50c8c56..83c595eb0ab 100644
--- a/src/Functions/assumeNotNull.cpp
+++ b/src/Functions/assumeNotNull.cpp
@@ -19,7 +19,7 @@ class FunctionAssumeNotNull : public IFunction
 public:
     static constexpr auto name = "assumeNotNull";
 
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextPtr)
     {
         return std::make_shared<FunctionAssumeNotNull>();
     }
diff --git a/src/Functions/bar.cpp b/src/Functions/bar.cpp
index 7364311a1be..c2b5f93994e 100644
--- a/src/Functions/bar.cpp
+++ b/src/Functions/bar.cpp
@@ -16,6 +16,7 @@ namespace ErrorCodes
     extern const int ARGUMENT_OUT_OF_BOUND;
     extern const int ILLEGAL_COLUMN;
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+    extern const int BAD_ARGUMENTS;
 }
 
 namespace
@@ -28,7 +29,7 @@ class FunctionBar : public IFunction
 {
 public:
     static constexpr auto name = "bar";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextPtr)
     {
         return std::make_shared<FunctionBar>();
     }
@@ -110,6 +111,9 @@ public:
                 arguments[2].column->getFloat64(i),
                 max_width);
 
+            if (!isFinite(width))
+                throw Exception("Value of width must not be NaN and Inf", ErrorCodes::BAD_ARGUMENTS);
+
             size_t next_size = current_offset + UnicodeBar::getWidthInBytes(width) + 1;
             dst_chars.resize(next_size);
             UnicodeBar::render(width, reinterpret_cast<char *>(&dst_chars[current_offset]));
diff --git a/src/Functions/bitHammingDistance.cpp b/src/Functions/bitHammingDistance.cpp
index 9b9ff5b6c07..25b902b8bd5 100644
--- a/src/Functions/bitHammingDistance.cpp
+++ b/src/Functions/bitHammingDistance.cpp
@@ -74,7 +74,7 @@ class FunctionBitHammingDistance : public IFunction
 public:
     static constexpr auto name = "bitHammingDistance";
     using ResultType = UInt8;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionBitHammingDistance>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionBitHammingDistance>(); }
 
     String getName() const override { return name; }
 
diff --git a/src/Functions/bitmaskToList.cpp b/src/Functions/bitmaskToList.cpp
index ccd163895ff..4b9a54f805f 100644
--- a/src/Functions/bitmaskToList.cpp
+++ b/src/Functions/bitmaskToList.cpp
@@ -30,7 +30,7 @@ class FunctionBitmaskToList : public IFunction
 {
 public:
     static constexpr auto name = "bitmaskToList";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionBitmaskToList>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionBitmaskToList>(); }
 
     String getName() const override
     {
diff --git a/src/Functions/blockNumber.cpp b/src/Functions/blockNumber.cpp
index 512dd9bcf29..0b7d47a67ec 100644
--- a/src/Functions/blockNumber.cpp
+++ b/src/Functions/blockNumber.cpp
@@ -18,7 +18,7 @@ private:
 
 public:
     static constexpr auto name = "blockNumber";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextPtr)
     {
         return std::make_shared<FunctionBlockNumber>();
     }
diff --git a/src/Functions/blockSerializedSize.cpp b/src/Functions/blockSerializedSize.cpp
index 9c9b380ffef..f34a354836a 100644
--- a/src/Functions/blockSerializedSize.cpp
+++ b/src/Functions/blockSerializedSize.cpp
@@ -15,7 +15,7 @@ class FunctionBlockSerializedSize : public IFunction
 public:
     static constexpr auto name = "blockSerializedSize";
 
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextPtr)
     {
         return std::make_shared<FunctionBlockSerializedSize>();
     }
@@ -44,18 +44,20 @@ public:
     {
         ColumnPtr full_column = elem.column->convertToFullColumnIfConst();
 
-        IDataType::SerializeBinaryBulkSettings settings;
+        ISerialization::SerializeBinaryBulkSettings settings;
         NullWriteBuffer out;
 
-        settings.getter = [&out](IDataType::SubstreamPath) -> WriteBuffer * { return &out; };
+        settings.getter = [&out](ISerialization::SubstreamPath) -> WriteBuffer * { return &out; };
 
-        IDataType::SerializeBinaryBulkStatePtr state;
+        ISerialization::SerializeBinaryBulkStatePtr state;
 
-        elem.type->serializeBinaryBulkStatePrefix(settings, state);
-        elem.type->serializeBinaryBulkWithMultipleStreams(*full_column,
+        auto serialization = elem.type->getDefaultSerialization();
+
+        serialization->serializeBinaryBulkStatePrefix(settings, state);
+        serialization->serializeBinaryBulkWithMultipleStreams(*full_column,
             0 /** offset */, 0 /** limit */,
             settings, state);
-        elem.type->serializeBinaryBulkStateSuffix(settings, state);
+        serialization->serializeBinaryBulkStateSuffix(settings, state);
 
         return out.count();
     }
diff --git a/src/Functions/blockSize.cpp b/src/Functions/blockSize.cpp
index f08c0b0d963..9572cc19c06 100644
--- a/src/Functions/blockSize.cpp
+++ b/src/Functions/blockSize.cpp
@@ -15,7 +15,7 @@ class FunctionBlockSize : public IFunction
 {
 public:
     static constexpr auto name = "blockSize";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextPtr)
     {
         return std::make_shared<FunctionBlockSize>();
     }
diff --git a/src/Functions/buildId.cpp b/src/Functions/buildId.cpp
index 7361f0e4546..a0bad20023f 100644
--- a/src/Functions/buildId.cpp
+++ b/src/Functions/buildId.cpp
@@ -18,7 +18,7 @@ class FunctionBuildId : public IFunction
 {
 public:
     static constexpr auto name = "buildId";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextPtr)
     {
         return std::make_shared<FunctionBuildId>();
     }
diff --git a/src/Functions/byteSize.cpp b/src/Functions/byteSize.cpp
index ea1a9c83581..76080f2850c 100644
--- a/src/Functions/byteSize.cpp
+++ b/src/Functions/byteSize.cpp
@@ -17,7 +17,7 @@ class FunctionByteSize : public IFunction
 {
 public:
     static constexpr auto name = "byteSize";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextPtr)
     {
         return std::make_shared<FunctionByteSize>();
     }
diff --git a/src/Functions/caseWithExpression.cpp b/src/Functions/caseWithExpression.cpp
index 195eb7e72ae..24b5855cc5b 100644
--- a/src/Functions/caseWithExpression.cpp
+++ b/src/Functions/caseWithExpression.cpp
@@ -1,6 +1,6 @@
-#include <Functions/FunctionFactory.h>
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/getLeastSupertype.h>
+#include <Functions/FunctionFactory.h>
 
 
 namespace DB
@@ -20,9 +20,9 @@ class FunctionCaseWithExpression : public IFunction
 {
 public:
     static constexpr auto name = "caseWithExpression";
-    static FunctionPtr create(const Context & context_) { return std::make_shared<FunctionCaseWithExpression>(context_); }
+    static FunctionPtr create(ContextPtr context_) { return std::make_shared<FunctionCaseWithExpression>(context_); }
 
-    explicit FunctionCaseWithExpression(const Context & context_) : context(context_) {}
+    explicit FunctionCaseWithExpression(ContextPtr context_) : context(context_) {}
     bool isVariadic() const override { return true; }
     size_t getNumberOfArguments() const override { return 0; }
     String getName() const override { return name; }
@@ -98,7 +98,7 @@ public:
     }
 
 private:
-    const Context & context;
+    ContextPtr context;
 };
 
 }
diff --git a/src/Functions/coalesce.cpp b/src/Functions/coalesce.cpp
index 12521185532..05dd83c5b63 100644
--- a/src/Functions/coalesce.cpp
+++ b/src/Functions/coalesce.cpp
@@ -1,17 +1,18 @@
-#include <Functions/IFunctionImpl.h>
-#include <Functions/FunctionHelpers.h>
-#include <Functions/FunctionFactory.h>
-#include <DataTypes/DataTypesNumber.h>
-#include <DataTypes/DataTypeNullable.h>
-#include <DataTypes/DataTypeNothing.h>
-#include <DataTypes/getLeastSupertype.h>
-#include <Core/ColumnNumbers.h>
-#include <Columns/ColumnNullable.h>
 #include <Columns/ColumnLowCardinality.h>
+#include <Columns/ColumnNullable.h>
+#include <Core/ColumnNumbers.h>
+#include <DataTypes/DataTypeNothing.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/getLeastSupertype.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/FunctionHelpers.h>
+#include <Functions/IFunctionImpl.h>
 
 
 namespace DB
 {
+
 namespace
 {
 
@@ -23,12 +24,12 @@ class FunctionCoalesce : public IFunction
 public:
     static constexpr auto name = "coalesce";
 
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextPtr context)
     {
         return std::make_shared<FunctionCoalesce>(context);
     }
 
-    explicit FunctionCoalesce(const Context & context_) : context(context_) {}
+    explicit FunctionCoalesce(ContextPtr context_) : context(context_) {}
 
     std::string getName() const override
     {
@@ -159,7 +160,7 @@ public:
     }
 
 private:
-    const Context & context;
+    ContextPtr context;
 };
 
 }
diff --git a/src/Functions/concat.cpp b/src/Functions/concat.cpp
index de4d5e9efc4..e8a3c44efb1 100644
--- a/src/Functions/concat.cpp
+++ b/src/Functions/concat.cpp
@@ -33,8 +33,8 @@ class ConcatImpl : public IFunction
 {
 public:
     static constexpr auto name = Name::name;
-    explicit ConcatImpl(const Context & context_) : context(context_) {}
-    static FunctionPtr create(const Context & context) { return std::make_shared<ConcatImpl>(context); }
+    explicit ConcatImpl(ContextPtr context_) : context(context_) {}
+    static FunctionPtr create(ContextPtr context) { return std::make_shared<ConcatImpl>(context); }
 
     String getName() const override { return name; }
 
@@ -85,7 +85,7 @@ public:
     }
 
 private:
-    const Context & context;
+    ContextWeakPtr context;
 
     ColumnPtr executeBinary(const ColumnsWithTypeAndName & arguments, size_t input_rows_count) const
     {
@@ -191,9 +191,9 @@ class ConcatOverloadResolver : public IFunctionOverloadResolverImpl
 {
 public:
     static constexpr auto name = "concat";
-    static FunctionOverloadResolverImplPtr create(const Context & context) { return std::make_unique<ConcatOverloadResolver>(context); }
+    static FunctionOverloadResolverImplPtr create(ContextPtr context) { return std::make_unique<ConcatOverloadResolver>(context); }
 
-    explicit ConcatOverloadResolver(const Context & context_) : context(context_) {}
+    explicit ConcatOverloadResolver(ContextPtr context_) : context(context_) {}
 
     String getName() const override { return name; }
     size_t getNumberOfArguments() const override { return 0; }
@@ -223,7 +223,7 @@ public:
     }
 
 private:
-    const Context & context;
+    ContextPtr context;
 };
 
 }
diff --git a/src/Functions/connectionId.cpp b/src/Functions/connectionId.cpp
new file mode 100644
index 00000000000..780ee5e19aa
--- /dev/null
+++ b/src/Functions/connectionId.cpp
@@ -0,0 +1,38 @@
+#include <DataTypes/DataTypesNumber.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/IFunctionImpl.h>
+#include <Interpreters/Context.h>
+
+
+namespace DB
+{
+
+/// Get the connection Id. It's used for MySQL handler only.
+class FunctionConnectionId : public IFunction, WithContext
+{
+public:
+    static constexpr auto name = "connectionId";
+
+    explicit FunctionConnectionId(ContextPtr context_) : WithContext(context_) {}
+
+    static FunctionPtr create(ContextPtr context_) { return std::make_shared<FunctionConnectionId>(context_); }
+
+    String getName() const override { return name; }
+
+    size_t getNumberOfArguments() const override { return 0; }
+
+    DataTypePtr getReturnTypeImpl(const DataTypes & /*arguments*/) const override { return std::make_shared<DataTypeUInt64>(); }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr & result_type, size_t input_rows_count) const override
+    {
+        return result_type->createColumnConst(input_rows_count, getContext()->getClientInfo().connection_id);
+    }
+};
+
+void registerFunctionConnectionId(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionConnectionId>(FunctionFactory::CaseInsensitive);
+    factory.registerAlias("connection_id", "connectionID", FunctionFactory::CaseInsensitive);
+}
+
+}
diff --git a/src/Functions/convertCharset.cpp b/src/Functions/convertCharset.cpp
index c32bbc358f5..b204875b4ff 100644
--- a/src/Functions/convertCharset.cpp
+++ b/src/Functions/convertCharset.cpp
@@ -162,7 +162,7 @@ private:
 
 public:
     static constexpr auto name = "convertCharset";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionConvertCharset>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionConvertCharset>(); }
 
     String getName() const override
     {
diff --git a/src/Functions/countDigits.cpp b/src/Functions/countDigits.cpp
index 4469e11a421..6dd927731b8 100644
--- a/src/Functions/countDigits.cpp
+++ b/src/Functions/countDigits.cpp
@@ -28,7 +28,7 @@ class FunctionCountDigits : public IFunction
 public:
     static constexpr auto name = "countDigits";
 
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextPtr)
     {
         return std::make_shared<FunctionCountDigits>();
     }
diff --git a/src/Functions/countMatches.h b/src/Functions/countMatches.h
index be3d06ffb84..4cae039a0d0 100644
--- a/src/Functions/countMatches.h
+++ b/src/Functions/countMatches.h
@@ -27,7 +27,7 @@ class FunctionCountMatches : public IFunction
 {
 public:
     static constexpr auto name = CountMatchesBase::name;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionCountMatches<CountMatchesBase>>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionCountMatches<CountMatchesBase>>(); }
 
     String getName() const override { return name; }
     size_t getNumberOfArguments() const override { return 2; }
diff --git a/src/Functions/currentDatabase.cpp b/src/Functions/currentDatabase.cpp
index 17dbc8d98e4..8be49c6cfe8 100644
--- a/src/Functions/currentDatabase.cpp
+++ b/src/Functions/currentDatabase.cpp
@@ -16,9 +16,9 @@ class FunctionCurrentDatabase : public IFunction
 
 public:
     static constexpr auto name = "currentDatabase";
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextPtr context)
     {
-        return std::make_shared<FunctionCurrentDatabase>(context.getCurrentDatabase());
+        return std::make_shared<FunctionCurrentDatabase>(context->getCurrentDatabase());
     }
 
     explicit FunctionCurrentDatabase(const String & db_name_) : db_name{db_name_}
diff --git a/src/Functions/currentUser.cpp b/src/Functions/currentUser.cpp
index 77eb2228d19..69780f4fa8b 100644
--- a/src/Functions/currentUser.cpp
+++ b/src/Functions/currentUser.cpp
@@ -16,9 +16,9 @@ class FunctionCurrentUser : public IFunction
 
 public:
     static constexpr auto name = "currentUser";
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextPtr context)
     {
-        return std::make_shared<FunctionCurrentUser>(context.getClientInfo().initial_user);
+        return std::make_shared<FunctionCurrentUser>(context->getClientInfo().initial_user);
     }
 
     explicit FunctionCurrentUser(const String & user_name_) : user_name{user_name_}
diff --git a/src/Functions/dateDiff.cpp b/src/Functions/dateDiff.cpp
index 54833eb359f..8cd5eae3441 100644
--- a/src/Functions/dateDiff.cpp
+++ b/src/Functions/dateDiff.cpp
@@ -3,12 +3,14 @@
 #include <DataTypes/DataTypesNumber.h>
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnsNumber.h>
+#include <Columns/ColumnDecimal.h>
 
 #include <Functions/IFunctionImpl.h>
 #include <Functions/FunctionHelpers.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/extractTimeZoneFromFunctionArguments.h>
 #include <Functions/DateTimeTransforms.h>
+#include <Functions/TransformDateTime64.h>
 
 #include <IO/WriteHelpers.h>
 
@@ -42,9 +44,10 @@ namespace
   */
 class FunctionDateDiff : public IFunction
 {
+    using ColumnDateTime64 = ColumnDecimal<DateTime64>;
 public:
     static constexpr auto name = "dateDiff";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionDateDiff>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionDateDiff>(); }
 
     String getName() const override
     {
@@ -97,8 +100,8 @@ public:
         size_t rows = input_rows_count;
         auto res = ColumnInt64::create(rows);
 
-        const DateLUTImpl & timezone_x = extractTimeZoneFromFunctionArguments(arguments, 3, 1);
-        const DateLUTImpl & timezone_y = extractTimeZoneFromFunctionArguments(arguments, 3, 2);
+        const auto & timezone_x = extractTimeZoneFromFunctionArguments(arguments, 3, 1);
+        const auto & timezone_y = extractTimeZoneFromFunctionArguments(arguments, 3, 2);
 
         if (unit == "year" || unit == "yy" || unit == "yyyy")
             dispatchForColumns<ToRelativeYearNumImpl>(x, y, timezone_x, timezone_y, res->getData());
@@ -133,17 +136,21 @@ private:
             dispatchForSecondColumn<Transform>(*x_vec_16, y, timezone_x, timezone_y, result);
         else if (const auto * x_vec_32 = checkAndGetColumn<ColumnUInt32>(&x))
             dispatchForSecondColumn<Transform>(*x_vec_32, y, timezone_x, timezone_y, result);
+        else if (const auto * x_vec_64 = checkAndGetColumn<ColumnDateTime64>(&x))
+            dispatchForSecondColumn<Transform>(*x_vec_64, y, timezone_x, timezone_y, result);
         else if (const auto * x_const_16 = checkAndGetColumnConst<ColumnUInt16>(&x))
             dispatchConstForSecondColumn<Transform>(x_const_16->getValue<UInt16>(), y, timezone_x, timezone_y, result);
         else if (const auto * x_const_32 = checkAndGetColumnConst<ColumnUInt32>(&x))
             dispatchConstForSecondColumn<Transform>(x_const_32->getValue<UInt32>(), y, timezone_x, timezone_y, result);
+        else if (const auto * x_const_64 = checkAndGetColumnConst<ColumnDateTime64>(&x))
+            dispatchConstForSecondColumn<Transform>(x_const_64->getValue<DecimalField<DateTime64>>(), y, timezone_x, timezone_y, result);
         else
-            throw Exception("Illegal column for first argument of function " + getName() + ", must be Date or DateTime", ErrorCodes::ILLEGAL_COLUMN);
+            throw Exception("Illegal column for first argument of function " + getName() + ", must be Date, DateTime or DateTime64", ErrorCodes::ILLEGAL_COLUMN);
     }
 
-    template <typename Transform, typename T1>
+    template <typename Transform, typename LeftColumnType>
     void dispatchForSecondColumn(
-        const ColumnVector<T1> & x, const IColumn & y,
+        const LeftColumnType & x, const IColumn & y,
         const DateLUTImpl & timezone_x, const DateLUTImpl & timezone_y,
         ColumnInt64::Container & result) const
     {
@@ -151,10 +158,14 @@ private:
             vectorVector<Transform>(x, *y_vec_16, timezone_x, timezone_y, result);
         else if (const auto * y_vec_32 = checkAndGetColumn<ColumnUInt32>(&y))
             vectorVector<Transform>(x, *y_vec_32, timezone_x, timezone_y, result);
+        else if (const auto * y_vec_64 = checkAndGetColumn<ColumnDateTime64>(&y))
+            vectorVector<Transform>(x, *y_vec_64, timezone_x, timezone_y, result);
         else if (const auto * y_const_16 = checkAndGetColumnConst<ColumnUInt16>(&y))
             vectorConstant<Transform>(x, y_const_16->getValue<UInt16>(), timezone_x, timezone_y, result);
         else if (const auto * y_const_32 = checkAndGetColumnConst<ColumnUInt32>(&y))
             vectorConstant<Transform>(x, y_const_32->getValue<UInt32>(), timezone_x, timezone_y, result);
+        else if (const auto * y_const_64 = checkAndGetColumnConst<ColumnDateTime64>(&y))
+            vectorConstant<Transform>(x, y_const_64->getValue<DecimalField<DateTime64>>(), timezone_x, timezone_y, result);
         else
             throw Exception("Illegal column for second argument of function " + getName() + ", must be Date or DateTime", ErrorCodes::ILLEGAL_COLUMN);
     }
@@ -169,49 +180,81 @@ private:
             constantVector<Transform>(x, *y_vec_16, timezone_x, timezone_y, result);
         else if (const auto * y_vec_32 = checkAndGetColumn<ColumnUInt32>(&y))
             constantVector<Transform>(x, *y_vec_32, timezone_x, timezone_y, result);
+        else if (const auto * y_vec_64 = checkAndGetColumn<ColumnDateTime64>(&y))
+            constantVector<Transform>(x, *y_vec_64, timezone_x, timezone_y, result);
         else
             throw Exception("Illegal column for second argument of function " + getName() + ", must be Date or DateTime", ErrorCodes::ILLEGAL_COLUMN);
     }
 
-    template <typename Transform, typename T1, typename T2>
+    template <typename Transform, typename LeftColumnType, typename RightColumnType>
     void vectorVector(
-        const ColumnVector<T1> & x, const ColumnVector<T2> & y,
+        const LeftColumnType & x, const RightColumnType & y,
         const DateLUTImpl & timezone_x, const DateLUTImpl & timezone_y,
         ColumnInt64::Container & result) const
     {
         const auto & x_data = x.getData();
         const auto & y_data = y.getData();
+
+        const auto transform_x = TransformDateTime64<Transform>(getScale(x));
+        const auto transform_y = TransformDateTime64<Transform>(getScale(y));
         for (size_t i = 0, size = x.size(); i < size; ++i)
-            result[i] = calculate<Transform>(x_data[i], y_data[i], timezone_x, timezone_y);
+                result[i] = calculate(transform_x, transform_y, x_data[i], y_data[i], timezone_x, timezone_y);
     }
 
-    template <typename Transform, typename T1, typename T2>
+    template <typename Transform, typename LeftColumnType, typename T2>
     void vectorConstant(
-        const ColumnVector<T1> & x, T2 y,
+        const LeftColumnType & x, T2 y,
         const DateLUTImpl & timezone_x, const DateLUTImpl & timezone_y,
         ColumnInt64::Container & result) const
     {
         const auto & x_data = x.getData();
+        const auto transform_x = TransformDateTime64<Transform>(getScale(x));
+        const auto transform_y = TransformDateTime64<Transform>(getScale(y));
+        const auto y_value = stripDecimalFieldValue(y);
+
         for (size_t i = 0, size = x.size(); i < size; ++i)
-            result[i] = calculate<Transform>(x_data[i], y, timezone_x, timezone_y);
+            result[i] = calculate(transform_x, transform_y, x_data[i], y_value, timezone_x, timezone_y);
     }
 
-    template <typename Transform, typename T1, typename T2>
+    template <typename Transform, typename T1, typename RightColumnType>
     void constantVector(
-        T1 x, const ColumnVector<T2> & y,
+        T1 x, const RightColumnType & y,
         const DateLUTImpl & timezone_x, const DateLUTImpl & timezone_y,
         ColumnInt64::Container & result) const
     {
         const auto & y_data = y.getData();
+        const auto transform_x = TransformDateTime64<Transform>(getScale(x));
+        const auto transform_y = TransformDateTime64<Transform>(getScale(y));
+        const auto x_value = stripDecimalFieldValue(x);
+
         for (size_t i = 0, size = y.size(); i < size; ++i)
-            result[i] = calculate<Transform>(x, y_data[i], timezone_x, timezone_y);
+            result[i] = calculate(transform_x, transform_y, x_value, y_data[i], timezone_x, timezone_y);
     }
 
-    template <typename Transform, typename T1, typename T2>
-    Int64 calculate(T1 x, T2 y, const DateLUTImpl & timezone_x, const DateLUTImpl & timezone_y) const
+    template <typename TransformX, typename TransformY, typename T1, typename T2>
+    Int64 calculate(const TransformX & transform_x, const TransformY & transform_y, T1 x, T2 y, const DateLUTImpl & timezone_x, const DateLUTImpl & timezone_y) const
     {
-        return Int64(Transform::execute(y, timezone_y))
-             - Int64(Transform::execute(x, timezone_x));
+        return Int64(transform_y.execute(y, timezone_y))
+             - Int64(transform_x.execute(x, timezone_x));
+    }
+
+    template <typename T>
+    static UInt32 getScale(const T & v)
+    {
+        if constexpr (std::is_same_v<T, ColumnDateTime64>)
+            return v.getScale();
+        else if constexpr (std::is_same_v<T, DecimalField<DateTime64>>)
+            return v.getScale();
+
+        return 0;
+    }
+    template <typename T>
+    static auto stripDecimalFieldValue(T && v)
+    {
+        if constexpr (std::is_same_v<std::decay_t<T>, DecimalField<DateTime64>>)
+            return v.getValue();
+        else
+            return v;
     }
 };
 
diff --git a/src/Functions/date_trunc.cpp b/src/Functions/date_trunc.cpp
index f55b3b56536..7952eda4f2b 100644
--- a/src/Functions/date_trunc.cpp
+++ b/src/Functions/date_trunc.cpp
@@ -25,9 +25,9 @@ class FunctionDateTrunc : public IFunction
 public:
     static constexpr auto name = "date_trunc";
 
-    explicit FunctionDateTrunc(const Context & context_) : context(context_) {}
+    explicit FunctionDateTrunc(ContextPtr context_) : context(context_) {}
 
-    static FunctionPtr create(const Context & context) { return std::make_shared<FunctionDateTrunc>(context); }
+    static FunctionPtr create(ContextPtr context) { return std::make_shared<FunctionDateTrunc>(context); }
 
     String getName() const override { return name; }
 
@@ -146,7 +146,7 @@ public:
     }
 
 private:
-    const Context & context;
+    ContextPtr context;
     mutable IntervalKind::Kind datepart_kind = IntervalKind::Kind::Second;
 };
 
diff --git a/src/Functions/defaultValueOfArgumentType.cpp b/src/Functions/defaultValueOfArgumentType.cpp
index a46715ffaad..85b2f261f60 100644
--- a/src/Functions/defaultValueOfArgumentType.cpp
+++ b/src/Functions/defaultValueOfArgumentType.cpp
@@ -13,7 +13,7 @@ class FunctionDefaultValueOfArgumentType : public IFunction
 {
 public:
     static constexpr auto name = "defaultValueOfArgumentType";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextPtr)
     {
         return std::make_shared<FunctionDefaultValueOfArgumentType>();
     }
diff --git a/src/Functions/defaultValueOfTypeName.cpp b/src/Functions/defaultValueOfTypeName.cpp
index 4f6d19bbc53..7be985cf560 100644
--- a/src/Functions/defaultValueOfTypeName.cpp
+++ b/src/Functions/defaultValueOfTypeName.cpp
@@ -21,7 +21,7 @@ class FunctionDefaultValueOfTypeName : public IFunction
 {
 public:
     static constexpr auto name = "defaultValueOfTypeName";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextPtr)
     {
         return std::make_shared<FunctionDefaultValueOfTypeName>();
     }
diff --git a/src/Functions/demange.cpp b/src/Functions/demange.cpp
index d6cddc18f7a..755a50dccbb 100644
--- a/src/Functions/demange.cpp
+++ b/src/Functions/demange.cpp
@@ -25,9 +25,9 @@ class FunctionDemangle : public IFunction
 {
 public:
     static constexpr auto name = "demangle";
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextPtr context)
     {
-        context.checkAccess(AccessType::demangle);
+        context->checkAccess(AccessType::demangle);
         return std::make_shared<FunctionDemangle>();
     }
 
diff --git a/src/Functions/divide/CMakeLists.txt b/src/Functions/divide/CMakeLists.txt
new file mode 100644
index 00000000000..e5a10f0817c
--- /dev/null
+++ b/src/Functions/divide/CMakeLists.txt
@@ -0,0 +1,22 @@
+# A library for integer division by constant with CPU dispatching.
+
+if (ARCH_AMD64)
+    add_library(divide_impl_sse2 divideImpl.cpp)
+    target_compile_options(divide_impl_sse2 PRIVATE -msse2 -DNAMESPACE=SSE2)
+    target_link_libraries(divide_impl_sse2 libdivide)
+
+    add_library(divide_impl_avx2 divideImpl.cpp)
+    target_compile_options(divide_impl_avx2 PRIVATE -mavx2 -DNAMESPACE=AVX2)
+    target_link_libraries(divide_impl_avx2 libdivide)
+
+    set(IMPLEMENTATIONS divide_impl_sse2 divide_impl_avx2)
+else ()
+    add_library(divide_impl_generic divideImpl.cpp)
+    target_compile_options(divide_impl_generic PRIVATE -DNAMESPACE=Generic)
+    target_link_libraries(divide_impl_generic libdivide)
+
+    set(IMPLEMENTATIONS divide_impl_generic)
+endif ()
+
+add_library(divide_impl divide.cpp)
+target_link_libraries(divide_impl ${IMPLEMENTATIONS} clickhouse_common_io)
diff --git a/src/Functions/divide/divide.cpp b/src/Functions/divide/divide.cpp
new file mode 100644
index 00000000000..5ab11df2a65
--- /dev/null
+++ b/src/Functions/divide/divide.cpp
@@ -0,0 +1,57 @@
+#include "divide.h"
+#include <Common/CpuId.h>
+
+#if defined(__x86_64__) && !defined(ARCADIA_BUILD)
+namespace SSE2
+{
+    template <typename A, typename B, typename ResultType>
+    void divideImpl(const A * __restrict a_pos, B b, ResultType * __restrict c_pos, size_t size);
+}
+
+namespace AVX2
+{
+    template <typename A, typename B, typename ResultType>
+    void divideImpl(const A * __restrict a_pos, B b, ResultType * __restrict c_pos, size_t size);
+}
+#else
+namespace Generic
+{
+    template <typename A, typename B, typename ResultType>
+    void divideImpl(const A * __restrict a_pos, B b, ResultType * __restrict c_pos, size_t size);
+}
+#endif
+
+
+template <typename A, typename B, typename ResultType>
+void divideImpl(const A * __restrict a_pos, B b, ResultType * __restrict c_pos, size_t size)
+{
+#if defined(__x86_64__) && !defined(ARCADIA_BUILD)
+    if (DB::Cpu::CpuFlagsCache::have_AVX2)
+        AVX2::divideImpl(a_pos, b, c_pos, size);
+    else if (DB::Cpu::CpuFlagsCache::have_SSE2)
+        SSE2::divideImpl(a_pos, b, c_pos, size);
+#else
+    Generic::divideImpl(a_pos, b, c_pos, size);
+#endif
+}
+
+
+template void divideImpl<uint64_t, uint64_t, uint64_t>(const uint64_t * __restrict, uint64_t, uint64_t * __restrict, size_t);
+template void divideImpl<uint64_t, uint32_t, uint64_t>(const uint64_t * __restrict, uint32_t, uint64_t * __restrict, size_t);
+template void divideImpl<uint64_t, uint16_t, uint64_t>(const uint64_t * __restrict, uint16_t, uint64_t * __restrict, size_t);
+template void divideImpl<uint64_t, char8_t, uint64_t>(const uint64_t * __restrict, char8_t, uint64_t * __restrict, size_t);
+
+template void divideImpl<uint32_t, uint64_t, uint32_t>(const uint32_t * __restrict, uint64_t, uint32_t * __restrict, size_t);
+template void divideImpl<uint32_t, uint32_t, uint32_t>(const uint32_t * __restrict, uint32_t, uint32_t * __restrict, size_t);
+template void divideImpl<uint32_t, uint16_t, uint32_t>(const uint32_t * __restrict, uint16_t, uint32_t * __restrict, size_t);
+template void divideImpl<uint32_t, char8_t, uint32_t>(const uint32_t * __restrict, char8_t, uint32_t * __restrict, size_t);
+
+template void divideImpl<int64_t, int64_t, int64_t>(const int64_t * __restrict, int64_t, int64_t * __restrict, size_t);
+template void divideImpl<int64_t, int32_t, int64_t>(const int64_t * __restrict, int32_t, int64_t * __restrict, size_t);
+template void divideImpl<int64_t, int16_t, int64_t>(const int64_t * __restrict, int16_t, int64_t * __restrict, size_t);
+template void divideImpl<int64_t, int8_t, int64_t>(const int64_t * __restrict, int8_t, int64_t * __restrict, size_t);
+
+template void divideImpl<int32_t, int64_t, int32_t>(const int32_t * __restrict, int64_t, int32_t * __restrict, size_t);
+template void divideImpl<int32_t, int32_t, int32_t>(const int32_t * __restrict, int32_t, int32_t * __restrict, size_t);
+template void divideImpl<int32_t, int16_t, int32_t>(const int32_t * __restrict, int16_t, int32_t * __restrict, size_t);
+template void divideImpl<int32_t, int8_t, int32_t>(const int32_t * __restrict, int8_t, int32_t * __restrict, size_t);
diff --git a/src/Functions/divide/divide.h b/src/Functions/divide/divide.h
new file mode 100644
index 00000000000..1c17a461159
--- /dev/null
+++ b/src/Functions/divide/divide.h
@@ -0,0 +1,6 @@
+#pragma once
+
+#include <cstddef>
+
+template <typename A, typename B, typename ResultType>
+extern void divideImpl(const A * __restrict a_pos, B b, ResultType * __restrict c_pos, size_t size);
diff --git a/src/Functions/divide/divideImpl.cpp b/src/Functions/divide/divideImpl.cpp
new file mode 100644
index 00000000000..f4c1a97d3ad
--- /dev/null
+++ b/src/Functions/divide/divideImpl.cpp
@@ -0,0 +1,79 @@
+/// This translation unit should be compiled multiple times
+/// with different values of NAMESPACE and machine flags (sse2, avx2).
+
+#if !defined(NAMESPACE)
+    #if defined(ARCADIA_BUILD)
+        #define NAMESPACE Generic
+    #else
+        #error "NAMESPACE macro must be defined"
+    #endif
+#endif
+
+#if defined(__AVX2__)
+    #define REG_SIZE 32
+    #define LIBDIVIDE_AVX2
+#elif defined(__SSE2__)
+    #define REG_SIZE 16
+    #define LIBDIVIDE_SSE2
+#endif
+
+#include <libdivide.h>
+
+
+namespace NAMESPACE
+{
+
+template <typename A, typename B, typename ResultType>
+void divideImpl(const A * __restrict a_pos, B b, ResultType * __restrict c_pos, size_t size)
+{
+    libdivide::divider<A> divider(b);
+    const A * a_end = a_pos + size;
+
+#if defined(__SSE2__)
+    static constexpr size_t values_per_simd_register = REG_SIZE / sizeof(A);
+    const A * a_end_simd = a_pos + size / values_per_simd_register * values_per_simd_register;
+
+    while (a_pos < a_end_simd)
+    {
+#if defined(__AVX2__)
+        _mm256_storeu_si256(reinterpret_cast<__m256i *>(c_pos),
+            _mm256_loadu_si256(reinterpret_cast<const __m256i *>(a_pos)) / divider);
+#else
+        _mm_storeu_si128(reinterpret_cast<__m128i *>(c_pos),
+            _mm_loadu_si128(reinterpret_cast<const __m128i *>(a_pos)) / divider);
+#endif
+
+        a_pos += values_per_simd_register;
+        c_pos += values_per_simd_register;
+    }
+#endif
+
+    while (a_pos < a_end)
+    {
+        *c_pos = *a_pos / divider;
+        ++a_pos;
+        ++c_pos;
+    }
+}
+
+template void divideImpl<uint64_t, uint64_t, uint64_t>(const uint64_t * __restrict, uint64_t, uint64_t * __restrict, size_t);
+template void divideImpl<uint64_t, uint32_t, uint64_t>(const uint64_t * __restrict, uint32_t, uint64_t * __restrict, size_t);
+template void divideImpl<uint64_t, uint16_t, uint64_t>(const uint64_t * __restrict, uint16_t, uint64_t * __restrict, size_t);
+template void divideImpl<uint64_t, char8_t, uint64_t>(const uint64_t * __restrict, char8_t, uint64_t * __restrict, size_t);
+
+template void divideImpl<uint32_t, uint64_t, uint32_t>(const uint32_t * __restrict, uint64_t, uint32_t * __restrict, size_t);
+template void divideImpl<uint32_t, uint32_t, uint32_t>(const uint32_t * __restrict, uint32_t, uint32_t * __restrict, size_t);
+template void divideImpl<uint32_t, uint16_t, uint32_t>(const uint32_t * __restrict, uint16_t, uint32_t * __restrict, size_t);
+template void divideImpl<uint32_t, char8_t, uint32_t>(const uint32_t * __restrict, char8_t, uint32_t * __restrict, size_t);
+
+template void divideImpl<int64_t, int64_t, int64_t>(const int64_t * __restrict, int64_t, int64_t * __restrict, size_t);
+template void divideImpl<int64_t, int32_t, int64_t>(const int64_t * __restrict, int32_t, int64_t * __restrict, size_t);
+template void divideImpl<int64_t, int16_t, int64_t>(const int64_t * __restrict, int16_t, int64_t * __restrict, size_t);
+template void divideImpl<int64_t, int8_t, int64_t>(const int64_t * __restrict, int8_t, int64_t * __restrict, size_t);
+
+template void divideImpl<int32_t, int64_t, int32_t>(const int32_t * __restrict, int64_t, int32_t * __restrict, size_t);
+template void divideImpl<int32_t, int32_t, int32_t>(const int32_t * __restrict, int32_t, int32_t * __restrict, size_t);
+template void divideImpl<int32_t, int16_t, int32_t>(const int32_t * __restrict, int16_t, int32_t * __restrict, size_t);
+template void divideImpl<int32_t, int8_t, int32_t>(const int32_t * __restrict, int8_t, int32_t * __restrict, size_t);
+
+}
diff --git a/src/Functions/dumpColumnStructure.cpp b/src/Functions/dumpColumnStructure.cpp
index 723b76616ed..827aabb8df9 100644
--- a/src/Functions/dumpColumnStructure.cpp
+++ b/src/Functions/dumpColumnStructure.cpp
@@ -14,7 +14,7 @@ class FunctionDumpColumnStructure : public IFunction
 {
 public:
     static constexpr auto name = "dumpColumnStructure";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextPtr)
     {
         return std::make_shared<FunctionDumpColumnStructure>();
     }
diff --git a/src/Functions/errorCodeToName.cpp b/src/Functions/errorCodeToName.cpp
index 20e80e457c9..4b96c355cd9 100644
--- a/src/Functions/errorCodeToName.cpp
+++ b/src/Functions/errorCodeToName.cpp
@@ -19,7 +19,7 @@ class FunctionErrorCodeToName : public IFunction
 {
 public:
     static constexpr auto name = "errorCodeToName";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextPtr)
     {
         return std::make_shared<FunctionErrorCodeToName>();
     }
diff --git a/src/Functions/evalMLMethod.cpp b/src/Functions/evalMLMethod.cpp
index 03d26db4043..7bdf4ea7db2 100644
--- a/src/Functions/evalMLMethod.cpp
+++ b/src/Functions/evalMLMethod.cpp
@@ -28,11 +28,11 @@ class FunctionEvalMLMethod : public IFunction
 {
 public:
     static constexpr auto name = "evalMLMethod";
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextPtr context)
     {
         return std::make_shared<FunctionEvalMLMethod>(context);
     }
-    explicit FunctionEvalMLMethod(const Context & context_) : context(context_)
+    explicit FunctionEvalMLMethod(ContextPtr context_) : context(context_)
     {}
 
     String getName() const override
@@ -81,7 +81,7 @@ public:
         return agg_function->predictValues(arguments, context);
     }
 
-    const Context & context;
+    ContextPtr context;
 };
 
 }
diff --git a/src/Functions/extractAllGroups.h b/src/Functions/extractAllGroups.h
index 7132c5dae82..289cff6ca4a 100644
--- a/src/Functions/extractAllGroups.h
+++ b/src/Functions/extractAllGroups.h
@@ -51,7 +51,7 @@ public:
     static constexpr auto Kind = Impl::Kind;
     static constexpr auto name = Impl::Name;
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionExtractAllGroups>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionExtractAllGroups>(); }
 
     String getName() const override { return name; }
 
@@ -172,11 +172,12 @@ public:
                     for (size_t group = 1; group <= groups_count; ++group)
                         all_matches.push_back(matched_groups[group]);
 
-                    /// Additional limit to fail fast on supposedly incorrect usage.
-                    static constexpr size_t MAX_GROUPS_PER_ROW = 1000000;
-
-                    if (all_matches.size() > MAX_GROUPS_PER_ROW)
-                        throw Exception(ErrorCodes::TOO_LARGE_ARRAY_SIZE, "Too large array size in the result of function {}", getName());
+                    /// Additional limit to fail fast on supposedly incorrect usage, arbitrary value.
+                    static constexpr size_t MAX_MATCHES_PER_ROW = 1000;
+                    if (matches_per_row > MAX_MATCHES_PER_ROW)
+                        throw Exception(ErrorCodes::TOO_LARGE_ARRAY_SIZE,
+                                "Too many matches per row (> {}) in the result of function {}",
+                                MAX_MATCHES_PER_ROW, getName());
 
                     pos = matched_groups[0].data() + std::max<size_t>(1, matched_groups[0].size());
 
diff --git a/src/Functions/extractGroups.cpp b/src/Functions/extractGroups.cpp
index 3f21be09e88..f1d728ee3f6 100644
--- a/src/Functions/extractGroups.cpp
+++ b/src/Functions/extractGroups.cpp
@@ -31,7 +31,7 @@ class FunctionExtractGroups : public IFunction
 {
 public:
     static constexpr auto name = "extractGroups";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionExtractGroups>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionExtractGroups>(); }
 
     String getName() const override { return name; }
 
@@ -65,12 +65,12 @@ public:
         const auto & re2 = regexp->getRE2();
 
         if (!re2)
-            throw Exception("There is no groups in regexp: " + needle, ErrorCodes::BAD_ARGUMENTS);
+            throw Exception("There are no groups in regexp: " + needle, ErrorCodes::BAD_ARGUMENTS);
 
         const size_t groups_count = re2->NumberOfCapturingGroups();
 
         if (!groups_count)
-            throw Exception("There is no groups in regexp: " + needle, ErrorCodes::BAD_ARGUMENTS);
+            throw Exception("There are no groups in regexp: " + needle, ErrorCodes::BAD_ARGUMENTS);
 
         // Including 0-group, which is the whole regexp.
         PODArrayWithStackMemory<re2_st::StringPiece, 128> matched_groups(groups_count + 1);
diff --git a/src/Functions/extractTextFromHTML.cpp b/src/Functions/extractTextFromHTML.cpp
new file mode 100644
index 00000000000..5ca82eb317d
--- /dev/null
+++ b/src/Functions/extractTextFromHTML.cpp
@@ -0,0 +1,358 @@
+#include <Columns/ColumnString.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/FunctionHelpers.h>
+#include <Functions/IFunctionImpl.h>
+#include <common/find_symbols.h>
+#include <Common/StringUtils/StringUtils.h>
+
+
+/** A function to extract text from HTML or XHTML.
+  * It does not necessarily 100% conforms to any of the HTML, XML or XHTML standards,
+  * but the implementation is reasonably accurate and it is fast.
+  *
+  * The rules are the following:
+  *
+  * 1. Comments are skipped. Example: <!-- test -->
+  * Comment must end with -->. Nested comments are not possible.
+  * Note: constructions like <!--> <!---> are not valid comments in HTML but will be skipped by other rules.
+  *
+  * 2. CDATA is pasted verbatim.
+  * Note: CDATA is XML/XHTML specific. But we still process it for "best-effort" approach.
+  *
+  * 3. 'script' and 'style' elements are removed with all their content.
+  * Note: it's assumed that closing tag cannot appear inside content.
+  * For example, in JS string literal is has to be escaped as "<\/script>".
+  * Note: comments and CDATA is possible inside script or style - then closing tags are not searched inside CDATA.
+  * Example: <script><![CDATA[</script>]]></script>
+  * But still searched inside comments. Sometimes it becomes complicated:
+  * <script>var x = "<!--"; </script> var y = "-->"; alert(x + y);</script>
+  * Note: script and style can be the names of XML namespaces - then they are not treat like usual script or style.
+  * Example: <script:a>Hello</script:a>.
+  * Note: whitespaces are possible after closing tag name: </script > but not before: < / script>.
+  *
+  * 4. Other tags or tag-like elements are skipped without inner content.
+  * Example: <a>.</a>
+  * Note: it's expected that this HTML is illegal: <a test=">"></a>
+  * Note: it will also skip something like tags: <>, <!>, etc.
+  * Note: tag without end will be skipped to the end of input: <hello
+  * >
+  * 5. HTML and XML entities are not decoded.
+  * It should be processed by separate function.
+  *
+  * 6. Whitespaces in text are collapsed or inserted by specific rules.
+  * Whitespaces at beginning and at the end are removed.
+  * Consecutive whitespaces are collapsed.
+  * But if text is separated by other elements and there is no whitespace, it is inserted.
+  * It may be unnatural, examples: Hello<b>world</b>, Hello<!-- -->world
+  * - in HTML there will be no whitespace, but the function will insert it.
+  * But also consider: Hello<p>world</p>, Hello<br>world.
+  * This behaviour is reasonable for data analysis, e.g. convert HTML to a bag of words.
+  *
+  * 7. Also note that correct handling of whitespaces would require
+  * support of <pre></pre> and CSS display and white-space properties.
+  *
+  * Usage example:
+  *
+  * SELECT extractTextFromHTML(html) FROM url('https://yandex.ru/', RawBLOB, 'html String')
+  *
+  * - ClickHouse has embedded web browser.
+  */
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int ILLEGAL_COLUMN;
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+}
+
+namespace
+{
+
+inline bool startsWith(const char * s, const char * end, const char * prefix)
+{
+    return s + strlen(prefix) < end && 0 == memcmp(s, prefix, strlen(prefix));
+}
+
+inline bool checkAndSkip(const char * __restrict & s, const char * end, const char * prefix)
+{
+    if (startsWith(s, end, prefix))
+    {
+        s += strlen(prefix);
+        return true;
+    }
+    return false;
+}
+
+bool processComment(const char * __restrict & src, const char * end)
+{
+    if (!checkAndSkip(src, end, "<!--"))
+        return false;
+
+    while (true)
+    {
+        const char * gt = find_first_symbols<'>'>(src, end);
+        if (gt >= end)
+            break;
+
+        if (gt > src + strlen("--") && gt[-1] == '-' && gt[-2] == '-')
+        {
+            src = gt + 1;
+            break;
+        }
+
+        src = gt + 1;
+    }
+
+    return true;
+}
+
+bool processCDATA(const char * __restrict & src, const char * end, char * __restrict & dst)
+{
+    if (!checkAndSkip(src, end, "<![CDATA["))
+        return false;
+
+    const char * gt = src;
+    while (true)
+    {
+        gt = find_first_symbols<'>'>(gt, end);
+        if (gt >= end)
+            break;
+
+        if (gt[-1] == ']' && gt[-2] == ']')
+        {
+            if (dst)
+            {
+                size_t bytes_to_copy = gt - src - strlen("]]");
+                memcpy(dst, src, bytes_to_copy);
+                dst += bytes_to_copy;
+            }
+            src = gt + 1;
+            break;
+        }
+
+        ++gt;
+    }
+
+    return true;
+}
+
+bool processElementAndSkipContent(const char * __restrict & src, const char * end, const char * tag_name)
+{
+    const auto * old_src = src;
+
+    if (!(src < end && *src == '<'))
+        return false;
+    ++src;
+
+    if (!checkAndSkip(src, end, tag_name))
+    {
+        src = old_src;
+        return false;
+    }
+
+    if (src >= end)
+        return false;
+
+    if (!(isWhitespaceASCII(*src) || *src == '>'))
+    {
+        src = old_src;
+        return false;
+    }
+
+    const char * gt = find_first_symbols<'>'>(src, end);
+    if (gt >= end)
+        return false;
+
+    src = gt + 1;
+
+    while (true)
+    {
+        const char * lt = find_first_symbols<'<'>(src, end);
+        src = lt;
+        if (src + 1 >= end)
+            break;
+
+        ++src;
+
+        /// Skip CDATA
+        if (*src == '!')
+        {
+            --src;
+            char * dst = nullptr;
+            if (processCDATA(src, end, dst))
+                continue;
+            ++src;
+        }
+
+        if (*src != '/')
+            continue;
+        ++src;
+
+        if (checkAndSkip(src, end, tag_name))
+        {
+            while (src < end && isWhitespaceASCII(*src))
+                ++src;
+
+            if (src >= end)
+                break;
+
+            if (*src == '>')
+            {
+                ++src;
+                break;
+            }
+        }
+    }
+
+    return true;
+}
+
+bool skipTag(const char * __restrict & src, const char * end)
+{
+    if (src < end && *src == '<')
+    {
+        src = find_first_symbols<'>'>(src, end);
+        if (src < end)
+            ++src;
+
+        return true;
+    }
+
+    return false;
+}
+
+void copyText(const char * __restrict & src, const char * end, char * __restrict & dst, bool needs_whitespace)
+{
+    while (src < end && isWhitespaceASCII(*src))
+        ++src;
+
+    const char * lt = find_first_symbols<'<'>(src, end);
+
+    if (needs_whitespace && src < lt)
+    {
+        *dst = ' ';
+        ++dst;
+    }
+
+    while (true)
+    {
+        const char * ws = find_first_symbols<' ', '\t', '\n', '\r', '\f', '\v'>(src, lt);
+        size_t bytes_to_copy = ws - src;
+        memcpy(dst, src, bytes_to_copy);
+        dst += bytes_to_copy;
+
+        src = ws;
+        while (src < lt && isWhitespaceASCII(*src))
+            ++src;
+
+        if (src < lt)
+        {
+            *dst = ' ';
+            ++dst;
+        }
+        else
+        {
+            break;
+        }
+    }
+
+    src = lt;
+}
+
+size_t extract(const char * __restrict src, size_t size, char * __restrict dst)
+{
+    /** There are the following rules:
+      * - comments are removed with all their content;
+      * - elements 'script' and 'style' are removed with all their content;
+      * - for other elements tags are removed but content is processed as text;
+      * - CDATA should be copied verbatim;
+      */
+
+    const char * end = src + size;
+    char * dst_begin = dst;
+
+    while (src < end)
+    {
+        bool needs_whitespace = dst != dst_begin && dst[-1] != ' ';
+        copyText(src, end, dst, needs_whitespace);
+
+        processComment(src, end)
+            || processCDATA(src, end, dst)
+            || processElementAndSkipContent(src, end, "script")
+            || processElementAndSkipContent(src, end, "style")
+            || skipTag(src, end);
+    }
+
+    return dst - dst_begin;
+}
+
+}
+
+
+class FunctionExtractTextFromHTML : public IFunction
+{
+public:
+    static constexpr auto name = "extractTextFromHTML";
+
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionExtractTextFromHTML>(); }
+    String getName() const override { return name; }
+    size_t getNumberOfArguments() const override { return 1; }
+    bool useDefaultImplementationForConstants() const override { return true; }
+
+    DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
+    {
+        if (!isString(arguments[0]))
+            throw Exception(
+                "Illegal type " + arguments[0]->getName() + " of argument of function " + getName(), ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+        return arguments[0];
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t rows) const override
+    {
+        const ColumnString * src = checkAndGetColumn<ColumnString>(arguments[0].column.get());
+        if (!src)
+             throw Exception("First argument for function " + getName() + " must be string.", ErrorCodes::ILLEGAL_COLUMN);
+
+        const ColumnString::Chars & src_chars = src->getChars();
+        const ColumnString::Offsets & src_offsets = src->getOffsets();
+
+        auto res = ColumnString::create();
+
+        ColumnString::Chars & res_chars = res->getChars();
+        ColumnString::Offsets & res_offsets = res->getOffsets();
+
+        res_chars.resize(src_chars.size());
+        res_offsets.resize(src_offsets.size());
+
+        ColumnString::Offset src_offset = 0;
+        ColumnString::Offset res_offset = 0;
+
+        for (size_t i = 0; i < rows; ++i)
+        {
+            auto next_src_offset = src_offsets[i];
+
+            res_offset += extract(
+                reinterpret_cast<const char *>(&src_chars[src_offset]),
+                next_src_offset - src_offset - 1,
+                reinterpret_cast<char *>(&res_chars[res_offset]));
+
+            res_chars[res_offset] = 0;
+            ++res_offset;
+            res_offsets[i] = res_offset;
+
+            src_offset = next_src_offset;
+        }
+
+        res_chars.resize(res_offset);
+        return res;
+    }
+};
+
+void registerFunctionExtractTextFromHTML(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionExtractTextFromHTML>();
+}
+
+}
diff --git a/src/Functions/extractTimeZoneFromFunctionArguments.cpp b/src/Functions/extractTimeZoneFromFunctionArguments.cpp
index 9d6e54a599e..dbc014ad2eb 100644
--- a/src/Functions/extractTimeZoneFromFunctionArguments.cpp
+++ b/src/Functions/extractTimeZoneFromFunctionArguments.cpp
@@ -44,9 +44,9 @@ std::string extractTimeZoneNameFromFunctionArguments(const ColumnsWithTypeAndNam
 
         /// If time zone is attached to an argument of type DateTime.
         if (const auto * type = checkAndGetDataType<DataTypeDateTime>(arguments[datetime_arg_num].type.get()))
-            return type->getTimeZone().getTimeZone();
+            return type->hasExplicitTimeZone() ? type->getTimeZone().getTimeZone() : std::string();
         if (const auto * type = checkAndGetDataType<DataTypeDateTime64>(arguments[datetime_arg_num].type.get()))
-            return type->getTimeZone().getTimeZone();
+            return type->hasExplicitTimeZone() ? type->getTimeZone().getTimeZone() : std::string();
 
         return {};
     }
@@ -66,10 +66,11 @@ const DateLUTImpl & extractTimeZoneFromFunctionArguments(const ColumnsWithTypeAn
         if (arguments.empty())
             return DateLUT::instance();
 
+        const auto & dt_arg = arguments[datetime_arg_num].type.get();
         /// If time zone is attached to an argument of type DateTime.
-        if (const auto * type = checkAndGetDataType<DataTypeDateTime>(arguments[datetime_arg_num].type.get()))
+        if (const auto * type = checkAndGetDataType<DataTypeDateTime>(dt_arg))
             return type->getTimeZone();
-        if (const auto * type = checkAndGetDataType<DataTypeDateTime64>(arguments[datetime_arg_num].type.get()))
+        if (const auto * type = checkAndGetDataType<DataTypeDateTime64>(dt_arg))
             return type->getTimeZone();
 
         return DateLUT::instance();
diff --git a/src/Functions/extractTimeZoneFromFunctionArguments.h b/src/Functions/extractTimeZoneFromFunctionArguments.h
index 6323b45f568..9dd3fdd4903 100644
--- a/src/Functions/extractTimeZoneFromFunctionArguments.h
+++ b/src/Functions/extractTimeZoneFromFunctionArguments.h
@@ -13,6 +13,7 @@ namespace DB
 class Block;
 
 /// Determine working timezone either from optional argument with time zone name or from time zone in DateTime type of argument.
+/// Returns empty string if default time zone should be used.
 std::string extractTimeZoneNameFromFunctionArguments(
     const ColumnsWithTypeAndName & arguments, size_t time_zone_arg_num, size_t datetime_arg_num);
 
diff --git a/src/Functions/filesystem.cpp b/src/Functions/filesystem.cpp
index 879c48dbe67..565166d2a18 100644
--- a/src/Functions/filesystem.cpp
+++ b/src/Functions/filesystem.cpp
@@ -34,9 +34,9 @@ class FilesystemImpl : public IFunction
 public:
     static constexpr auto name = Impl::name;
 
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextPtr context)
     {
-        return std::make_shared<FilesystemImpl<Impl>>(std::filesystem::space(context.getConfigRef().getString("path")));
+        return std::make_shared<FilesystemImpl<Impl>>(std::filesystem::space(context->getConfigRef().getString("path")));
     }
 
     explicit FilesystemImpl(std::filesystem::space_info spaceinfo_) : spaceinfo(spaceinfo_) { }
diff --git a/src/Functions/finalizeAggregation.cpp b/src/Functions/finalizeAggregation.cpp
index 91d80e1d692..6bf6932ceee 100644
--- a/src/Functions/finalizeAggregation.cpp
+++ b/src/Functions/finalizeAggregation.cpp
@@ -24,7 +24,7 @@ class FunctionFinalizeAggregation : public IFunction
 {
 public:
     static constexpr auto name = "finalizeAggregation";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextPtr)
     {
         return std::make_shared<FunctionFinalizeAggregation>();
     }
diff --git a/src/Functions/formatDateTime.cpp b/src/Functions/formatDateTime.cpp
index fd909ed6fce..293710fc190 100644
--- a/src/Functions/formatDateTime.cpp
+++ b/src/Functions/formatDateTime.cpp
@@ -46,9 +46,8 @@ template <> struct ActionValueTypeMap<DataTypeInt64>      { using ActionValueTyp
 template <> struct ActionValueTypeMap<DataTypeUInt64>     { using ActionValueType = UInt32; };
 template <> struct ActionValueTypeMap<DataTypeDate>       { using ActionValueType = UInt16; };
 template <> struct ActionValueTypeMap<DataTypeDateTime>   { using ActionValueType = UInt32; };
-// TODO(vnemkov): once there is support for Int64 in LUT, make that Int64.
 // TODO(vnemkov): to add sub-second format instruction, make that DateTime64 and do some math in Action<T>.
-template <> struct ActionValueTypeMap<DataTypeDateTime64> { using ActionValueType = UInt32; };
+template <> struct ActionValueTypeMap<DataTypeDateTime64> { using ActionValueType = Int64; };
 
 
 /** formatDateTime(time, 'pattern')
@@ -282,7 +281,7 @@ private:
 public:
     static constexpr auto name = Name::name;
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionFormatDateTimeImpl>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionFormatDateTimeImpl>(); }
 
     String getName() const override
     {
@@ -434,7 +433,6 @@ public:
             time_zone_tmp = &DateLUT::instance();
 
         const DateLUTImpl & time_zone = *time_zone_tmp;
-
         const auto & vec = times->getData();
 
         UInt32 scale [[maybe_unused]] = 0;
@@ -482,7 +480,7 @@ public:
                     // since right now LUT does not support Int64-values and not format instructions for subsecond parts,
                     // treat DatTime64 values just as DateTime values by ignoring fractional and casting to UInt32.
                     const auto c = DecimalUtils::split(vec[i], scale);
-                    instruction.perform(pos, static_cast<UInt32>(c.whole), time_zone);
+                    instruction.perform(pos, static_cast<Int64>(c.whole), time_zone);
                 }
             }
             else
@@ -519,6 +517,8 @@ public:
         {
             if constexpr (std::is_same_v<T, UInt32>)
                 instructions.emplace_back(func, shift);
+            else if constexpr (std::is_same_v<T, Int64>)
+                instructions.emplace_back(func, shift);
             else
                 add_shift(shift);
         };
diff --git a/src/Functions/formatReadable.h b/src/Functions/formatReadable.h
index ae70c1afa87..7a11aa184d9 100644
--- a/src/Functions/formatReadable.h
+++ b/src/Functions/formatReadable.h
@@ -28,7 +28,7 @@ class FunctionFormatReadable : public IFunction
 {
 public:
     static constexpr auto name = Impl::name;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionFormatReadable<Impl>>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionFormatReadable<Impl>>(); }
 
     String getName() const override
     {
diff --git a/src/Functions/formatReadableTimeDelta.cpp b/src/Functions/formatReadableTimeDelta.cpp
index 9ffdb8464e0..7913a53c9c3 100644
--- a/src/Functions/formatReadableTimeDelta.cpp
+++ b/src/Functions/formatReadableTimeDelta.cpp
@@ -38,7 +38,7 @@ class FunctionFormatReadableTimeDelta : public IFunction
 {
 public:
     static constexpr auto name = "formatReadableTimeDelta";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionFormatReadableTimeDelta>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionFormatReadableTimeDelta>(); }
 
     String getName() const override { return name; }
 
diff --git a/src/Functions/formatRow.cpp b/src/Functions/formatRow.cpp
index e8f82669aae..e58149138ad 100644
--- a/src/Functions/formatRow.cpp
+++ b/src/Functions/formatRow.cpp
@@ -35,7 +35,7 @@ class FunctionFormatRow : public IFunction
 public:
     static constexpr auto name = no_newline ? "formatRowNoNewline" : "formatRow";
 
-    FunctionFormatRow(const String & format_name_, const Context & context_) : format_name(format_name_), context(context_)
+    FunctionFormatRow(const String & format_name_, ContextPtr context_) : format_name(format_name_), context(context_)
     {
         if (!FormatFactory::instance().getAllFormats().count(format_name))
             throw Exception("Unknown format " + format_name, ErrorCodes::UNKNOWN_FORMAT);
@@ -76,7 +76,7 @@ public:
 
 private:
     String format_name;
-    const Context & context;
+    ContextPtr context;
 };
 
 template <bool no_newline>
@@ -84,8 +84,8 @@ class FormatRowOverloadResolver : public IFunctionOverloadResolverImpl
 {
 public:
     static constexpr auto name = no_newline ? "formatRowNoNewline" : "formatRow";
-    static FunctionOverloadResolverImplPtr create(const Context & context) { return std::make_unique<FormatRowOverloadResolver>(context); }
-    explicit FormatRowOverloadResolver(const Context & context_) : context(context_) { }
+    static FunctionOverloadResolverImplPtr create(ContextPtr context) { return std::make_unique<FormatRowOverloadResolver>(context); }
+    explicit FormatRowOverloadResolver(ContextPtr context_) : context(context_) { }
     String getName() const override { return name; }
     bool isVariadic() const override { return true; }
     size_t getNumberOfArguments() const override { return 0; }
@@ -111,7 +111,7 @@ public:
     DataTypePtr getReturnType(const DataTypes &) const override { return std::make_shared<DataTypeString>(); }
 
 private:
-    const Context & context;
+    ContextPtr context;
 };
 
 }
diff --git a/src/Functions/formatString.cpp b/src/Functions/formatString.cpp
index c97692bcb10..aac9d74904d 100644
--- a/src/Functions/formatString.cpp
+++ b/src/Functions/formatString.cpp
@@ -31,7 +31,7 @@ class FormatFunction : public IFunction
 public:
     static constexpr auto name = Name::name;
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FormatFunction>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FormatFunction>(); }
 
     String getName() const override { return name; }
 
diff --git a/src/Functions/fromModifiedJulianDay.cpp b/src/Functions/fromModifiedJulianDay.cpp
index cd5699bfac5..3cf5f9b2216 100644
--- a/src/Functions/fromModifiedJulianDay.cpp
+++ b/src/Functions/fromModifiedJulianDay.cpp
@@ -151,7 +151,7 @@ namespace DB
     public:
         static constexpr auto name = Name::name;
 
-        static FunctionOverloadResolverImplPtr create(const Context &)
+        static FunctionOverloadResolverImplPtr create(ContextPtr)
         {
             return std::make_unique<FromModifiedJulianDayOverloadResolver<Name, nullOnErrors>>();
         }
diff --git a/src/Functions/fuzzBits.cpp b/src/Functions/fuzzBits.cpp
index a0631084742..eadaa0aad01 100644
--- a/src/Functions/fuzzBits.cpp
+++ b/src/Functions/fuzzBits.cpp
@@ -53,7 +53,7 @@ class FunctionFuzzBits : public IFunction
 public:
     static constexpr auto name = "fuzzBits";
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionFuzzBits>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionFuzzBits>(); }
 
     String getName() const override { return name; }
 
diff --git a/src/Functions/generateUUIDv4.cpp b/src/Functions/generateUUIDv4.cpp
index e519f5217b5..a1e50e3c54f 100644
--- a/src/Functions/generateUUIDv4.cpp
+++ b/src/Functions/generateUUIDv4.cpp
@@ -59,7 +59,7 @@ public:
 class FunctionGenerateUUIDv4 : public TargetSpecific::Default::FunctionGenerateUUIDv4
 {
 public:
-    explicit FunctionGenerateUUIDv4(const Context & context) : selector(context)
+    explicit FunctionGenerateUUIDv4(ContextPtr context) : selector(context)
     {
         selector.registerImplementation<TargetArch::Default,
             TargetSpecific::Default::FunctionGenerateUUIDv4>();
@@ -75,7 +75,7 @@ public:
         return selector.selectAndExecute(arguments, result_type, input_rows_count);
     }
 
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextPtr context)
     {
         return std::make_shared<FunctionGenerateUUIDv4>(context);
     }
diff --git a/src/Functions/geoToH3.cpp b/src/Functions/geoToH3.cpp
index 6518043d15f..7b3d742bb60 100644
--- a/src/Functions/geoToH3.cpp
+++ b/src/Functions/geoToH3.cpp
@@ -33,7 +33,7 @@ class FunctionGeoToH3 : public IFunction
 public:
     static constexpr auto name = "geoToH3";
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionGeoToH3>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionGeoToH3>(); }
 
     std::string getName() const override { return name; }
 
diff --git a/src/Functions/geohashDecode.cpp b/src/Functions/geohashDecode.cpp
index 7e73b501bd5..bf774905868 100644
--- a/src/Functions/geohashDecode.cpp
+++ b/src/Functions/geohashDecode.cpp
@@ -27,7 +27,7 @@ class FunctionGeohashDecode : public IFunction
 {
 public:
     static constexpr auto name = "geohashDecode";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionGeohashDecode>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionGeohashDecode>(); }
 
     String getName() const override
     {
diff --git a/src/Functions/geohashEncode.cpp b/src/Functions/geohashEncode.cpp
index 794e77b4e24..15abe96e3e5 100644
--- a/src/Functions/geohashEncode.cpp
+++ b/src/Functions/geohashEncode.cpp
@@ -28,7 +28,7 @@ class FunctionGeohashEncode : public IFunction
 {
 public:
     static constexpr auto name = "geohashEncode";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionGeohashEncode>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionGeohashEncode>(); }
 
     String getName() const override
     {
diff --git a/src/Functions/geohashesInBox.cpp b/src/Functions/geohashesInBox.cpp
index 0e18916053f..6bcae5c2440 100644
--- a/src/Functions/geohashesInBox.cpp
+++ b/src/Functions/geohashesInBox.cpp
@@ -29,7 +29,7 @@ class FunctionGeohashesInBox : public IFunction
 {
 public:
     static constexpr auto name = "geohashesInBox";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionGeohashesInBox>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionGeohashesInBox>(); }
 
     String getName() const override { return name; }
 
diff --git a/src/Functions/geometryConverters.h b/src/Functions/geometryConverters.h
new file mode 100644
index 00000000000..3e912cb42d7
--- /dev/null
+++ b/src/Functions/geometryConverters.h
@@ -0,0 +1,362 @@
+#pragma once
+
+#include <Core/ColumnWithTypeAndName.h>
+#include <Core/Types.h>
+
+#include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+
+#include <Columns/ColumnsNumber.h>
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnTuple.h>
+#include <Common/NaNUtils.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/IDataType.h>
+#include <DataTypes/DataTypeFactory.h>
+#include <IO/WriteHelpers.h>
+#include <Interpreters/castColumn.h>
+
+#include <cmath>
+#include <common/logger_useful.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int BAD_ARGUMENTS;
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+}
+
+template <typename Point>
+using Ring = boost::geometry::model::ring<Point>;
+
+template <typename Point>
+using Polygon = boost::geometry::model::polygon<Point>;
+
+template <typename Point>
+using MultiPolygon = boost::geometry::model::multi_polygon<Polygon<Point>>;
+
+using CartesianPoint = boost::geometry::model::d2::point_xy<Float64>;
+using CartesianRing = Ring<CartesianPoint>;
+using CartesianPolygon = Polygon<CartesianPoint>;
+using CartesianMultiPolygon = MultiPolygon<CartesianPoint>;
+
+using SphericalPoint = boost::geometry::model::point<Float64, 2, boost::geometry::cs::spherical_equatorial<boost::geometry::degree>>;
+using SphericalRing = Ring<SphericalPoint>;
+using SphericalPolygon = Polygon<SphericalPoint>;
+using SphericalMultiPolygon = MultiPolygon<SphericalPoint>;
+
+/**
+ * Class which takes converts Column with type Tuple(Float64, Float64) to a vector of boost point type.
+ * They are (x,y) in case of cartesian coordinated and (lon,lat) in case of Spherical.
+*/
+template <typename Point>
+struct ColumnToPointsConverter
+{
+    static std::vector<Point> convert(ColumnPtr col)
+    {
+        const auto * tuple = typeid_cast<const ColumnTuple *>(col.get());
+        const auto & tuple_columns = tuple->getColumns();
+
+        const auto * x_data = typeid_cast<const ColumnFloat64 *>(tuple_columns[0].get());
+        const auto * y_data = typeid_cast<const ColumnFloat64 *>(tuple_columns[1].get());
+
+        const auto * first_container = x_data->getData().data();
+        const auto * second_container = y_data->getData().data();
+
+        std::vector<Point> answer(col->size());
+
+        for (size_t i = 0; i < col->size(); ++i)
+        {
+            const Float64 first = first_container[i];
+            const Float64 second = second_container[i];
+
+            if (isNaN(first) || isNaN(second))
+                throw Exception("Point's component must not be NaN", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+
+            if (std::isinf(first) || std::isinf(second))
+                throw Exception("Point's component must not be infinite", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+
+            answer[i] = Point(first, second);
+        }
+
+        return answer;
+    }
+};
+
+
+template <typename Point>
+struct ColumnToRingsConverter
+{
+    static std::vector<Ring<Point>> convert(ColumnPtr col)
+    {
+        const IColumn::Offsets & offsets = typeid_cast<const ColumnArray &>(*col).getOffsets();
+        size_t prev_offset = 0;
+        std::vector<Ring<Point>> answer;
+        answer.reserve(offsets.size());
+        auto tmp = ColumnToPointsConverter<Point>::convert(typeid_cast<const ColumnArray &>(*col).getDataPtr());
+        for (size_t offset : offsets)
+        {
+            answer.emplace_back(tmp.begin() + prev_offset, tmp.begin() + offset);
+            prev_offset = offset;
+        }
+        return answer;
+    }
+};
+
+
+template <typename Point>
+struct ColumnToPolygonsConverter
+{
+    static std::vector<Polygon<Point>> convert(ColumnPtr col)
+    {
+        const IColumn::Offsets & offsets = typeid_cast<const ColumnArray &>(*col).getOffsets();
+        std::vector<Polygon<Point>> answer(offsets.size());
+        auto all_rings = ColumnToRingsConverter<Point>::convert(typeid_cast<const ColumnArray &>(*col).getDataPtr());
+
+        size_t prev_offset = 0;
+        for (size_t iter = 0; iter < offsets.size(); ++iter)
+        {
+            const auto current_array_size = offsets[iter] - prev_offset;
+            answer[iter].outer() = std::move(all_rings[prev_offset]);
+            answer[iter].inners().reserve(current_array_size);
+            for (size_t inner_holes = prev_offset + 1; inner_holes < offsets[iter]; ++inner_holes)
+                answer[iter].inners().emplace_back(std::move(all_rings[inner_holes]));
+            prev_offset = offsets[iter];
+        }
+
+        return answer;
+    }
+};
+
+
+template <typename Point>
+struct ColumnToMultiPolygonsConverter
+{
+    static std::vector<MultiPolygon<Point>> convert(ColumnPtr col)
+    {
+        const IColumn::Offsets & offsets = typeid_cast<const ColumnArray &>(*col).getOffsets();
+        size_t prev_offset = 0;
+        std::vector<MultiPolygon<Point>> answer(offsets.size());
+
+        auto all_polygons = ColumnToPolygonsConverter<Point>::convert(typeid_cast<const ColumnArray &>(*col).getDataPtr());
+
+        for (size_t iter = 0; iter < offsets.size(); ++iter)
+        {
+            for (size_t polygon_iter = prev_offset; polygon_iter < offsets[iter]; ++polygon_iter)
+                answer[iter].emplace_back(std::move(all_polygons[polygon_iter]));
+            prev_offset = offsets[iter];
+        }
+
+        return answer;
+    }
+};
+
+
+/// To serialize Spherical or Cartesian point (a pair of numbers in both cases).
+template <typename Point>
+class PointSerializer
+{
+public:
+    PointSerializer()
+        : first(ColumnFloat64::create())
+        , second(ColumnFloat64::create())
+        , first_container(first->getData())
+        , second_container(second->getData())
+    {}
+
+    explicit PointSerializer(size_t n)
+        : first(ColumnFloat64::create(n))
+        , second(ColumnFloat64::create(n))
+        , first_container(first->getData())
+        , second_container(second->getData())
+    {}
+
+    void add(const Point & point)
+    {
+        first_container.emplace_back(point.template get<0>());
+        second_container.emplace_back(point.template get<1>());
+    }
+
+    ColumnPtr finalize()
+    {
+        Columns columns(2);
+        columns[0] = std::move(first);
+        columns[1] = std::move(second);
+
+        return ColumnTuple::create(columns);
+    }
+
+private:
+    ColumnFloat64::MutablePtr first;
+    ColumnFloat64::MutablePtr second;
+
+    ColumnFloat64::Container & first_container;
+    ColumnFloat64::Container & second_container;
+};
+
+/// Serialize Point, Ring as Ring
+template <typename Point>
+class RingSerializer
+{
+public:
+    RingSerializer()
+        : offsets(ColumnUInt64::create())
+    {}
+
+    explicit RingSerializer(size_t n)
+        : offsets(ColumnUInt64::create(n))
+    {}
+
+    void add(const Ring<Point> & ring)
+    {
+        size += ring.size();
+        offsets->insertValue(size);
+        for (const auto & point : ring)
+            point_serializer.add(point);
+    }
+
+    ColumnPtr finalize()
+    {
+        return ColumnArray::create(point_serializer.finalize(), std::move(offsets));
+    }
+
+private:
+    size_t size = 0;
+    PointSerializer<Point> point_serializer;
+    ColumnUInt64::MutablePtr offsets;
+};
+
+/// Serialize Point, Ring, Polygon as Polygon
+template <typename Point>
+class PolygonSerializer
+{
+public:
+    PolygonSerializer()
+        : offsets(ColumnUInt64::create())
+    {}
+
+    explicit PolygonSerializer(size_t n)
+        : offsets(ColumnUInt64::create(n))
+    {}
+
+    void add(const Ring<Point> & ring)
+    {
+        size++;
+        offsets->insertValue(size);
+        ring_serializer.add(ring);
+    }
+
+    void add(const Polygon<Point> & polygon)
+    {
+        /// Outer ring + all inner rings (holes).
+        size += 1 + polygon.inners().size();
+        offsets->insertValue(size);
+        ring_serializer.add(polygon.outer());
+        for (const auto & ring : polygon.inners())
+            ring_serializer.add(ring);
+    }
+
+    ColumnPtr finalize()
+    {
+        return ColumnArray::create(ring_serializer.finalize(), std::move(offsets));
+    }
+
+private:
+    size_t size = 0;
+    RingSerializer<Point> ring_serializer;
+    ColumnUInt64::MutablePtr offsets;
+};
+
+/// Serialize Point, Ring, Polygon, MultiPolygon as MultiPolygon
+template <typename Point>
+class MultiPolygonSerializer
+{
+public:
+    MultiPolygonSerializer()
+        : offsets(ColumnUInt64::create())
+    {}
+
+    explicit MultiPolygonSerializer(size_t n)
+        : offsets(ColumnUInt64::create(n))
+    {}
+
+    void add(const Ring<Point> & ring)
+    {
+        size++;
+        offsets->insertValue(size);
+        polygon_serializer.add(ring);
+    }
+
+    void add(const Polygon<Point> & polygon)
+    {
+        size++;
+        offsets->insertValue(size);
+        polygon_serializer.add(polygon);
+    }
+
+    void add(const MultiPolygon<Point> & multi_polygon)
+    {
+        size += multi_polygon.size();
+        offsets->insertValue(size);
+        for (const auto & polygon : multi_polygon)
+        {
+            polygon_serializer.add(polygon);
+        }
+    }
+
+    ColumnPtr finalize()
+    {
+        return ColumnArray::create(polygon_serializer.finalize(), std::move(offsets));
+    }
+
+private:
+    size_t size = 0;
+    PolygonSerializer<Point> polygon_serializer;
+    ColumnUInt64::MutablePtr offsets;
+};
+
+
+template <typename PType>
+struct ConverterType
+{
+    using Type = PType;
+};
+
+template <typename Point, typename F>
+static void callOnGeometryDataType(DataTypePtr type, F && f)
+{
+    const auto & factory = DataTypeFactory::instance();
+
+    /// There is no Point type, because for most of geometry functions it is useless.
+    if (factory.get("Point")->equals(*type))
+        return f(ConverterType<ColumnToPointsConverter<Point>>());
+    else if (factory.get("Ring")->equals(*type))
+        return f(ConverterType<ColumnToRingsConverter<Point>>());
+    else if (factory.get("Polygon")->equals(*type))
+        return f(ConverterType<ColumnToPolygonsConverter<Point>>());
+    else if (factory.get("MultiPolygon")->equals(*type))
+        return f(ConverterType<ColumnToMultiPolygonsConverter<Point>>());
+    throw Exception(fmt::format("Unknown geometry type {}", type->getName()), ErrorCodes::BAD_ARGUMENTS);
+}
+
+
+template <typename Point, typename F>
+static void callOnTwoGeometryDataTypes(DataTypePtr left_type, DataTypePtr right_type, F && func)
+{
+    return callOnGeometryDataType<Point>(left_type, [&](const auto & left_types)
+    {
+        using LeftConverterType = std::decay_t<decltype(left_types)>;
+
+        return callOnGeometryDataType<Point>(right_type, [&](const auto & right_types)
+        {
+            using RightConverterType = std::decay_t<decltype(right_types)>;
+
+            return func(LeftConverterType(), RightConverterType());
+        });
+    });
+}
+
+}
diff --git a/src/Functions/getMacro.cpp b/src/Functions/getMacro.cpp
index 949016d862d..7fe41498d35 100644
--- a/src/Functions/getMacro.cpp
+++ b/src/Functions/getMacro.cpp
@@ -30,9 +30,9 @@ private:
 
 public:
     static constexpr auto name = "getMacro";
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextPtr context)
     {
-        return std::make_shared<FunctionGetMacro>(context.getMacros());
+        return std::make_shared<FunctionGetMacro>(context->getMacros());
     }
 
     explicit FunctionGetMacro(MultiVersion<Macros>::Version macros_) : macros(std::move(macros_)) {}
diff --git a/src/Functions/getScalar.cpp b/src/Functions/getScalar.cpp
index 4803c5a81d5..5520be9d9c2 100644
--- a/src/Functions/getScalar.cpp
+++ b/src/Functions/getScalar.cpp
@@ -20,16 +20,16 @@ namespace
 
 /** Get scalar value of sub queries from query context via IAST::Hash.
   */
-class FunctionGetScalar : public IFunction
+class FunctionGetScalar : public IFunction, WithContext
 {
 public:
     static constexpr auto name = "__getScalar";
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextPtr context_)
     {
-        return std::make_shared<FunctionGetScalar>(context);
+        return std::make_shared<FunctionGetScalar>(context_);
     }
 
-    explicit FunctionGetScalar(const Context & context_) : context(context_) {}
+    explicit FunctionGetScalar(ContextPtr context_) : WithContext(context_) {}
 
     String getName() const override
     {
@@ -46,8 +46,8 @@ public:
         if (arguments.size() != 1 || !isString(arguments[0].type) || !arguments[0].column || !isColumnConst(*arguments[0].column))
             throw Exception("Function " + getName() + " accepts one const string argument", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
         auto scalar_name = assert_cast<const ColumnConst &>(*arguments[0].column).getValue<String>();
-        const Context & query_context = context.hasQueryContext() ? context.getQueryContext() : context;
-        scalar = query_context.getScalar(scalar_name).getByPosition(0);
+        ContextPtr query_context = getContext()->hasQueryContext() ? getContext()->getQueryContext() : getContext();
+        scalar = query_context->getScalar(scalar_name).getByPosition(0);
         return scalar.type;
     }
 
@@ -58,7 +58,6 @@ public:
 
 private:
     mutable ColumnWithTypeAndName scalar;
-    const Context & context;
 };
 
 }
diff --git a/src/Functions/getSetting.cpp b/src/Functions/getSetting.cpp
index 5da5f902d8c..6494f42c53c 100644
--- a/src/Functions/getSetting.cpp
+++ b/src/Functions/getSetting.cpp
@@ -19,13 +19,13 @@ namespace
 {
 
 /// Get the value of a setting.
-class FunctionGetSetting : public IFunction
+class FunctionGetSetting : public IFunction, WithContext
 {
 public:
     static constexpr auto name = "getSetting";
 
-    static FunctionPtr create(const Context & context_) { return std::make_shared<FunctionGetSetting>(context_); }
-    explicit FunctionGetSetting(const Context & context_) : context(context_) {}
+    static FunctionPtr create(ContextPtr context_) { return std::make_shared<FunctionGetSetting>(context_); }
+    explicit FunctionGetSetting(ContextPtr context_) : WithContext(context_) {}
 
     String getName() const override { return name; }
     bool isDeterministic() const override { return false; }
@@ -43,7 +43,7 @@ public:
                             ErrorCodes::ILLEGAL_COLUMN};
 
         std::string_view setting_name{column->getDataAt(0)};
-        value = context.getSettingsRef().get(setting_name);
+        value = getContext()->getSettingsRef().get(setting_name);
 
         DataTypePtr type = applyVisitor(FieldToDataType{}, value);
         value = convertFieldToType(value, *type);
@@ -57,7 +57,6 @@ public:
 
 private:
     mutable Field value;
-    const Context & context;
 };
 
 }
diff --git a/src/Functions/getSizeOfEnumType.cpp b/src/Functions/getSizeOfEnumType.cpp
index dea56bd3063..9499b0e3bf0 100644
--- a/src/Functions/getSizeOfEnumType.cpp
+++ b/src/Functions/getSizeOfEnumType.cpp
@@ -20,7 +20,7 @@ class FunctionGetSizeOfEnumType : public IFunction
 {
 public:
     static constexpr auto name = "getSizeOfEnumType";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextPtr)
     {
         return std::make_shared<FunctionGetSizeOfEnumType>();
     }
diff --git a/src/Functions/globalVariable.cpp b/src/Functions/globalVariable.cpp
index 55561af4d10..9f3c89b16e2 100644
--- a/src/Functions/globalVariable.cpp
+++ b/src/Functions/globalVariable.cpp
@@ -30,7 +30,7 @@ class FunctionGlobalVariable : public IFunction
 {
 public:
     static constexpr auto name = "globalVariable";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextPtr)
     {
         return std::make_shared<FunctionGlobalVariable>();
     }
@@ -77,8 +77,11 @@ private:
         DataTypePtr type;
         Field value;
     };
-    std::unordered_map<String, TypeAndValue> global_variable_map = {
-        {"max_allowed_packet", {std::make_shared<DataTypeInt32>(), 67108864}}, {"version", {std::make_shared<DataTypeString>(), "5.7.30"}}};
+    std::unordered_map<String, TypeAndValue> global_variable_map
+        = {{"max_allowed_packet", {std::make_shared<DataTypeInt32>(), 67108864}},
+           {"version", {std::make_shared<DataTypeString>(), "5.7.30"}},
+           {"version_comment", {std::make_shared<DataTypeString>(), ""}},
+           {"transaction_isolation", {std::make_shared<DataTypeString>(), "READ-UNCOMMITTED"}}};
 };
 
 }
diff --git a/src/Functions/greatCircleDistance.cpp b/src/Functions/greatCircleDistance.cpp
index 801f8b3da7f..93ec7c9de4c 100644
--- a/src/Functions/greatCircleDistance.cpp
+++ b/src/Functions/greatCircleDistance.cpp
@@ -287,7 +287,7 @@ template <Method method>
 class FunctionGeoDistance : public TargetSpecific::Default::FunctionGeoDistance<method>
 {
 public:
-    explicit FunctionGeoDistance(const Context & context) : selector(context)
+    explicit FunctionGeoDistance(ContextPtr context) : selector(context)
     {
         selector.registerImplementation<TargetArch::Default,
             TargetSpecific::Default::FunctionGeoDistance<method>>();
@@ -307,7 +307,7 @@ public:
         return selector.selectAndExecute(arguments, result_type, input_rows_count);
     }
 
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextPtr context)
     {
         return std::make_shared<FunctionGeoDistance<method>>(context);
     }
diff --git a/src/Functions/h3EdgeAngle.cpp b/src/Functions/h3EdgeAngle.cpp
index 58ce5def111..ad8d1ee441f 100644
--- a/src/Functions/h3EdgeAngle.cpp
+++ b/src/Functions/h3EdgeAngle.cpp
@@ -32,7 +32,7 @@ class FunctionH3EdgeAngle : public IFunction
 public:
     static constexpr auto name = "h3EdgeAngle";
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionH3EdgeAngle>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionH3EdgeAngle>(); }
 
     std::string getName() const override { return name; }
 
diff --git a/src/Functions/h3EdgeLengthM.cpp b/src/Functions/h3EdgeLengthM.cpp
index 8f8aebc857e..85d307e1da3 100644
--- a/src/Functions/h3EdgeLengthM.cpp
+++ b/src/Functions/h3EdgeLengthM.cpp
@@ -37,7 +37,7 @@ class FunctionH3EdgeLengthM : public IFunction
 public:
     static constexpr auto name = "h3EdgeLengthM";
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionH3EdgeLengthM>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionH3EdgeLengthM>(); }
 
     std::string getName() const override { return name; }
 
diff --git a/src/Functions/h3GetBaseCell.cpp b/src/Functions/h3GetBaseCell.cpp
index 92d9ee5e3e0..fcad82098e6 100644
--- a/src/Functions/h3GetBaseCell.cpp
+++ b/src/Functions/h3GetBaseCell.cpp
@@ -29,7 +29,7 @@ class FunctionH3GetBaseCell : public IFunction
 public:
     static constexpr auto name = "h3GetBaseCell";
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionH3GetBaseCell>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionH3GetBaseCell>(); }
 
     std::string getName() const override { return name; }
 
diff --git a/src/Functions/h3GetResolution.cpp b/src/Functions/h3GetResolution.cpp
index f2676ccbb82..d1bfd899150 100644
--- a/src/Functions/h3GetResolution.cpp
+++ b/src/Functions/h3GetResolution.cpp
@@ -29,7 +29,7 @@ class FunctionH3GetResolution : public IFunction
 public:
     static constexpr auto name = "h3GetResolution";
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionH3GetResolution>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionH3GetResolution>(); }
 
     std::string getName() const override { return name; }
 
diff --git a/src/Functions/h3HexAreaM2.cpp b/src/Functions/h3HexAreaM2.cpp
index c7a16b57465..e44bf660333 100644
--- a/src/Functions/h3HexAreaM2.cpp
+++ b/src/Functions/h3HexAreaM2.cpp
@@ -32,7 +32,7 @@ class FunctionH3HexAreaM2 : public IFunction
 public:
     static constexpr auto name = "h3HexAreaM2";
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionH3HexAreaM2>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionH3HexAreaM2>(); }
 
     std::string getName() const override { return name; }
 
diff --git a/src/Functions/h3IndexesAreNeighbors.cpp b/src/Functions/h3IndexesAreNeighbors.cpp
index d43fca15012..56c69ed0a8b 100644
--- a/src/Functions/h3IndexesAreNeighbors.cpp
+++ b/src/Functions/h3IndexesAreNeighbors.cpp
@@ -29,7 +29,7 @@ class FunctionH3IndexesAreNeighbors : public IFunction
 public:
     static constexpr auto name = "h3IndexesAreNeighbors";
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionH3IndexesAreNeighbors>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionH3IndexesAreNeighbors>(); }
 
     std::string getName() const override { return name; }
 
diff --git a/src/Functions/h3IsValid.cpp b/src/Functions/h3IsValid.cpp
index 2918431e3b6..1e4840b3537 100644
--- a/src/Functions/h3IsValid.cpp
+++ b/src/Functions/h3IsValid.cpp
@@ -29,7 +29,7 @@ class FunctionH3IsValid : public IFunction
 public:
     static constexpr auto name = "h3IsValid";
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionH3IsValid>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionH3IsValid>(); }
 
     std::string getName() const override { return name; }
 
diff --git a/src/Functions/h3ToChildren.cpp b/src/Functions/h3ToChildren.cpp
index b63d4efc83e..9730aefe3d4 100644
--- a/src/Functions/h3ToChildren.cpp
+++ b/src/Functions/h3ToChildren.cpp
@@ -38,7 +38,7 @@ class FunctionH3ToChildren : public IFunction
 public:
     static constexpr auto name = "h3ToChildren";
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionH3ToChildren>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionH3ToChildren>(); }
 
     std::string getName() const override { return name; }
 
diff --git a/src/Functions/h3ToParent.cpp b/src/Functions/h3ToParent.cpp
index 73c1d002df5..4baf9527301 100644
--- a/src/Functions/h3ToParent.cpp
+++ b/src/Functions/h3ToParent.cpp
@@ -32,7 +32,7 @@ class FunctionH3ToParent : public IFunction
 public:
     static constexpr auto name = "h3ToParent";
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionH3ToParent>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionH3ToParent>(); }
 
     std::string getName() const override { return name; }
 
diff --git a/src/Functions/h3ToString.cpp b/src/Functions/h3ToString.cpp
index 16d7d14964a..dcd0951f67f 100644
--- a/src/Functions/h3ToString.cpp
+++ b/src/Functions/h3ToString.cpp
@@ -29,7 +29,7 @@ class FunctionH3ToString : public IFunction
 public:
     static constexpr auto name = "h3ToString";
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionH3ToString>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionH3ToString>(); }
 
     std::string getName() const override { return name; }
 
diff --git a/src/Functions/h3kRing.cpp b/src/Functions/h3kRing.cpp
index fd4a8ac57e8..40e73f9dea2 100644
--- a/src/Functions/h3kRing.cpp
+++ b/src/Functions/h3kRing.cpp
@@ -35,7 +35,7 @@ class FunctionH3KRing : public IFunction
 public:
     static constexpr auto name = "h3kRing";
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionH3KRing>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionH3KRing>(); }
 
     std::string getName() const override { return name; }
 
diff --git a/src/Functions/hasColumnInTable.cpp b/src/Functions/hasColumnInTable.cpp
index d5fe00e025f..28f83a63386 100644
--- a/src/Functions/hasColumnInTable.cpp
+++ b/src/Functions/hasColumnInTable.cpp
@@ -25,16 +25,16 @@ namespace
 /** Usage:
  *  hasColumnInTable(['hostname'[, 'username'[, 'password']],] 'database', 'table', 'column')
  */
-class FunctionHasColumnInTable : public IFunction
+class FunctionHasColumnInTable : public IFunction, WithContext
 {
 public:
     static constexpr auto name = "hasColumnInTable";
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextPtr context_)
     {
-        return std::make_shared<FunctionHasColumnInTable>(context.getGlobalContext());
+        return std::make_shared<FunctionHasColumnInTable>(context_->getGlobalContext());
     }
 
-    explicit FunctionHasColumnInTable(const Context & global_context_) : global_context(global_context_)
+    explicit FunctionHasColumnInTable(ContextPtr global_context_) : WithContext(global_context_)
     {
     }
 
@@ -57,9 +57,6 @@ public:
     bool isDeterministic() const override { return false; }
 
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override;
-
-private:
-    const Context & global_context;
 };
 
 
@@ -117,7 +114,7 @@ ColumnPtr FunctionHasColumnInTable::executeImpl(const ColumnsWithTypeAndName & a
     bool has_column;
     if (host_name.empty())
     {
-        const StoragePtr & table = DatabaseCatalog::instance().getTable({database_name, table_name}, global_context);
+        const StoragePtr & table = DatabaseCatalog::instance().getTable({database_name, table_name}, getContext());
         auto table_metadata = table->getInMemoryMetadataPtr();
         has_column = table_metadata->getColumns().hasPhysical(column_name);
     }
@@ -126,14 +123,14 @@ ColumnPtr FunctionHasColumnInTable::executeImpl(const ColumnsWithTypeAndName & a
         std::vector<std::vector<String>> host_names = {{ host_name }};
 
         auto cluster = std::make_shared<Cluster>(
-            global_context.getSettings(),
+            getContext()->getSettings(),
             host_names,
             !user_name.empty() ? user_name : "default",
             password,
-            global_context.getTCPPort(),
+            getContext()->getTCPPort(),
             false);
 
-        auto remote_columns = getStructureOfRemoteTable(*cluster, {database_name, table_name}, global_context);
+        auto remote_columns = getStructureOfRemoteTable(*cluster, {database_name, table_name}, getContext());
         has_column = remote_columns.hasPhysical(column_name);
     }
 
diff --git a/src/Functions/hasThreadFuzzer.cpp b/src/Functions/hasThreadFuzzer.cpp
index 545ac0175f2..e9b48aa70f9 100644
--- a/src/Functions/hasThreadFuzzer.cpp
+++ b/src/Functions/hasThreadFuzzer.cpp
@@ -16,7 +16,7 @@ class FunctionHasThreadFuzzer : public IFunction
 {
 public:
     static constexpr auto name = "hasThreadFuzzer";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextPtr)
     {
         return std::make_shared<FunctionHasThreadFuzzer>();
     }
diff --git a/src/Functions/hostName.cpp b/src/Functions/hostName.cpp
index beaaec37e70..250c410aa9c 100644
--- a/src/Functions/hostName.cpp
+++ b/src/Functions/hostName.cpp
@@ -15,7 +15,7 @@ class FunctionHostName : public IFunction
 {
 public:
     static constexpr auto name = "hostName";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextPtr)
     {
         return std::make_shared<FunctionHostName>();
     }
diff --git a/src/Functions/htmlOrXmlCoarseParse.cpp b/src/Functions/htmlOrXmlCoarseParse.cpp
deleted file mode 100644
index 442de3d36b0..00000000000
--- a/src/Functions/htmlOrXmlCoarseParse.cpp
+++ /dev/null
@@ -1,582 +0,0 @@
-#include <Columns/ColumnString.h>
-#include <Functions/FunctionFactory.h>
-#include <Functions/FunctionHelpers.h>
-#include <Functions/IFunctionImpl.h>
-
-#include <utility>
-#include <vector>
-#include <algorithm>
-
-#if USE_HYPERSCAN
-#   include <hs.h>
-
-namespace DB
-{
-namespace ErrorCodes
-{
-    extern const int ILLEGAL_COLUMN;
-    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
-    extern const int CANNOT_ALLOCATE_MEMORY;
-    extern const int NOT_IMPLEMENTED;
-}
-
-namespace
-{
-struct HxCoarseParseImpl
-{
-private:
-    struct SpanInfo
-    {
-        SpanInfo(): id(0), match_space(std::pair<unsigned long long, unsigned long long>(0, 0)) {}  // NOLINT
-        SpanInfo(unsigned int matchId, std::pair<unsigned long long, unsigned long long> matchSpan): id(matchId), match_space(matchSpan){} // NOLINT
-        SpanInfo(const SpanInfo& obj)
-        {
-            id = obj.id;
-            match_space = obj.match_space;
-        }
-        SpanInfo& operator=(const SpanInfo& obj) = default;
-
-        unsigned int id;
-        std::pair<unsigned long long, unsigned long long> match_space;  // NOLINT
-    };
-    using SpanElement = std::vector<SpanInfo>;
-    struct Span
-    {
-        Span(): set_script(false), set_style(false), set_semi(false), is_finding_cdata(false) {}
-
-        SpanElement copy_stack;         // copy area
-        SpanElement tag_stack;          // regexp area
-        SpanInfo script_ptr;            // script pointer
-        bool set_script;                // whether set script
-        SpanInfo style_ptr;             // style pointer
-        bool set_style;                 // whether set style
-        SpanInfo semi_ptr;              // tag ptr
-        bool set_semi;                  // whether set semi
-
-        bool is_finding_cdata;
-    };
-
-    static inline void copyZone(
-        ColumnString::Offset& current_dst_string_offset,
-        ColumnString::Offset& current_copy_loc,
-        ColumnString::Chars& dst_chars,
-        const ColumnString::Chars& src_chars,
-        size_t bytes_to_copy,
-        unsigned is_space
-    )
-    {
-        bool is_last_space = false;
-        if (current_dst_string_offset == 0 || dst_chars[current_dst_string_offset - 1] == 0 || dst_chars[current_dst_string_offset - 1] == ' ')
-        {
-            is_last_space = true;
-        }
-        if (bytes_to_copy == 0)
-        {
-            if (is_space && !is_last_space)
-            {
-                dst_chars[current_dst_string_offset++] = ' ';
-            }
-        }
-        else
-        {
-            if (is_last_space && src_chars[current_copy_loc] == ' ')
-            {
-                --bytes_to_copy;
-                ++current_copy_loc;
-            }
-            if (bytes_to_copy > 0)
-            {
-                memcpySmallAllowReadWriteOverflow15(
-                    &dst_chars[current_dst_string_offset], &src_chars[current_copy_loc], bytes_to_copy);
-                current_dst_string_offset += bytes_to_copy;
-            }
-
-            // separator is space and last character is not space.
-            if (is_space && !(current_dst_string_offset == 0 || dst_chars[current_dst_string_offset - 1] == 0 || dst_chars[current_dst_string_offset - 1] == ' '))
-            {
-                dst_chars[current_dst_string_offset++] = ' ';
-            }
-        }
-        // return;
-    }
-    static inline void popArea(SpanElement& stack, unsigned long long from, unsigned long long to)  //NOLINT
-    {
-        while (!stack.empty())
-        {
-            if (to > stack.back().match_space.second && from < stack.back().match_space.second)
-            {
-                stack.pop_back();
-            }
-            else
-            {
-                break;
-            }
-        }
-        // return;
-    }
-
-    static void dealCommonTag(Span* matches)
-    {
-        while (!matches->copy_stack.empty() && matches->copy_stack.back().id != 10)
-        {
-            matches->copy_stack.pop_back();
-        }
-        if (!matches->copy_stack.empty())
-        {
-            matches->copy_stack.pop_back();
-        }
-        unsigned long long from;    // NOLINT
-        unsigned long long to;      // NOLINT
-        unsigned id;
-        for (auto begin = matches->tag_stack.begin(); begin != matches->tag_stack.end(); ++begin)
-        {
-            from = begin->match_space.first;
-            to = begin->match_space.second;
-            id = begin->id;
-            switch (id)
-            {
-                case 12:
-                case 13:
-                {
-                    popArea(matches->copy_stack, from, to);
-                    if (matches->copy_stack.empty() || from >= matches->copy_stack.back().match_space.second)
-                        matches->copy_stack.push_back(SpanInfo(id, std::make_pair(from, to)));
-                    break;
-                }
-                case 0:
-                case 2:
-                case 3:
-                case 4:
-                case 5:
-                case 6:
-                case 7:
-                case 8:
-                case 9:
-                case 10:
-                {
-                    if (!matches->set_semi || (matches->set_semi && from == matches->semi_ptr.match_space.first))
-                    {
-                        matches->set_semi = true;
-                        matches->semi_ptr = SpanInfo(id, std::make_pair(from, to));
-                    }
-                    break;
-                }
-                case 1:
-                {
-                    if (matches->set_semi)
-                    {
-                        switch (matches->semi_ptr.id)
-                        {
-                            case 0:
-                            case 2:
-                            case 3:
-                            case 6:
-                            case 7:
-                            case 10:
-                            {
-                                if (matches->semi_ptr.id == 2 || (matches->semi_ptr.id == 3 && matches->semi_ptr.match_space.second == from))
-                                {
-                                    if (!matches->set_script)
-                                    {
-                                        matches->set_script = true;
-                                        matches->script_ptr = SpanInfo(matches->semi_ptr.id, std::make_pair(matches->semi_ptr.match_space.first, to));
-                                    }
-                                }
-                                else if (matches->semi_ptr.id == 6 || (matches->semi_ptr.id == 7 && matches->semi_ptr.match_space.second == from))
-                                {
-                                    if (!matches->set_style)
-                                    {
-                                        matches->set_style = true;
-                                        matches->style_ptr = SpanInfo(matches->semi_ptr.id, std::make_pair(matches->semi_ptr.match_space.first, to));
-                                    }
-                                }
-                                popArea(matches->copy_stack, matches->semi_ptr.match_space.first, to);
-                                matches->copy_stack.push_back(SpanInfo(0, std::make_pair(matches->semi_ptr.match_space.first, to)));
-                                matches->set_semi = false;
-                                break;
-                            }
-                            case 4:
-                            case 5:
-                            case 8:
-                            case 9:
-                            {
-                                SpanInfo complete_zone;
-
-                                complete_zone.match_space.second = to;
-                                if (matches->set_script && (matches->semi_ptr.id == 4 || (matches->semi_ptr.id == 5 && matches->semi_ptr.match_space.second == from)))
-                                {
-                                    complete_zone.id = matches->script_ptr.id;
-                                    complete_zone.match_space.first = matches->script_ptr.match_space.first;
-                                    matches->set_script = false;
-                                }
-                                else if (matches->set_style && (matches->semi_ptr.id == 8 || (matches->semi_ptr.id == 9 && matches->semi_ptr.match_space.second == from)))
-                                {
-                                    complete_zone.id = matches->style_ptr.id;
-                                    complete_zone.match_space.first = matches->style_ptr.match_space.first;
-                                    matches->set_style = false;
-                                }
-                                else
-                                {
-                                    complete_zone.id = matches->semi_ptr.id;
-                                    complete_zone.match_space.first = matches->semi_ptr.match_space.first;
-                                }
-                                popArea(matches->copy_stack, complete_zone.match_space.first, complete_zone.match_space.second);
-                                matches->copy_stack.push_back(complete_zone);
-                                matches->set_semi = false;
-                                break;
-                            }
-                        }
-                    }
-                    break;
-                }
-                default:
-                {
-                    break;
-                }
-            }
-        }
-        // return;
-    }
-    static int spanCollect(unsigned int id,
-                          unsigned long long from,  // NOLINT
-                          unsigned long long to,    // NOLINT
-                          unsigned int , void * ctx)
-    {
-        Span* matches = static_cast<Span*>(ctx);
-        from = id == 12 ? from : to - patterns_length[id];
-
-        if (matches->is_finding_cdata)
-        {
-            if (id == 11)
-            {
-                matches->copy_stack.push_back(SpanInfo(id, std::make_pair(from, to)));
-                matches->is_finding_cdata = false;
-                matches->tag_stack.clear();
-                if (matches->semi_ptr.id == 10)
-                {
-                    matches->set_semi = false;
-                }
-            }
-            else if (id == 12 || id == 13)
-            {
-                popArea(matches->copy_stack, from, to);
-                if (matches->copy_stack.empty() || from >= matches->copy_stack.back().match_space.second)
-                    matches->copy_stack.push_back(SpanInfo(id, std::make_pair(from, to)));
-
-                popArea(matches->tag_stack, from, to);
-                if (matches->tag_stack.empty() || from >= matches->tag_stack.back().match_space.second)
-                    matches->tag_stack.push_back(SpanInfo(id, std::make_pair(from, to)));
-            }
-            else
-            {
-                popArea(matches->tag_stack, from, to);
-                matches->tag_stack.push_back(SpanInfo(id, std::make_pair(from, to)));
-            }
-        }
-        else
-        {
-            switch (id)
-            {
-                case 12:
-                case 13:
-                {
-                    popArea(matches->copy_stack, from, to);
-                    if (matches->copy_stack.empty() || from >= matches->copy_stack.back().match_space.second)
-                        matches->copy_stack.push_back(SpanInfo(id, std::make_pair(from, to)));
-                    break;
-                }
-                case 0:
-                case 2:
-                case 3:
-                case 4:
-                case 5:
-                case 6:
-                case 7:
-                case 8:
-                case 9:
-                {
-                    if (!matches->set_semi || (matches->set_semi && from == matches->semi_ptr.match_space.first))
-                    {
-                        matches->set_semi = true;
-                        matches->semi_ptr = SpanInfo(id, std::make_pair(from, to));
-                    }
-                    break;
-                }
-                case 10:
-                {
-                    if (!matches->set_semi || (matches->set_semi && from == matches->semi_ptr.match_space.first))
-                    {
-                        matches->set_semi = true;
-                        matches->semi_ptr = SpanInfo(id, std::make_pair(from, to));
-                    }
-                    matches->is_finding_cdata = true;
-                    matches->copy_stack.push_back(SpanInfo(id, std::make_pair(from, to)));
-                    matches->tag_stack.push_back(SpanInfo(id, std::make_pair(from, to)));
-                    break;
-                }
-                case 1:
-                {
-                    if (matches->set_semi)
-                    {
-                        switch (matches->semi_ptr.id)
-                        {
-                            case 0:
-                            case 2:
-                            case 3:
-                            case 6:
-                            case 7:
-                            case 10:
-                            {
-                                if (matches->semi_ptr.id == 2 || (matches->semi_ptr.id == 3 && matches->semi_ptr.match_space.second == from))
-                                {
-                                    if (!matches->set_script)
-                                    {
-                                        matches->set_script = true;
-                                        matches->script_ptr = SpanInfo(matches->semi_ptr.id, std::make_pair(matches->semi_ptr.match_space.first, to));
-                                    }
-                                }
-                                else if (matches->semi_ptr.id == 6 || (matches->semi_ptr.id == 7 && matches->semi_ptr.match_space.second == from))
-                                {
-                                    if (!matches->set_style)
-                                    {
-                                        matches->set_style = true;
-                                        matches->style_ptr = SpanInfo(matches->semi_ptr.id, std::make_pair(matches->semi_ptr.match_space.first, to));
-                                    }
-                                }
-                                popArea(matches->copy_stack, matches->semi_ptr.match_space.first, to);
-                                matches->copy_stack.push_back(SpanInfo(matches->semi_ptr.id, std::make_pair(matches->semi_ptr.match_space.first, to)));
-                                matches->set_semi = false;
-                                break;
-                            }
-                            case 4:
-                            case 5:
-                            case 8:
-                            case 9:
-                            {
-                                SpanInfo complete_zone;
-                                complete_zone.match_space.second = to;
-                                if (matches->set_script && (matches->semi_ptr.id == 4 || (matches->semi_ptr.id == 5 && matches->semi_ptr.match_space.second == from)))
-                                {
-                                    complete_zone.id = matches->script_ptr.id;
-                                    complete_zone.match_space.first = matches->script_ptr.match_space.first;
-                                    matches->set_script = false;
-                                }
-                                else if (matches->set_style && (matches->semi_ptr.id == 8 || (matches->semi_ptr.id == 9 && matches->semi_ptr.match_space.second == from)))
-                                {
-                                    complete_zone.id = matches->style_ptr.id;
-                                    complete_zone.match_space.first = matches->style_ptr.match_space.first;
-                                    matches->set_style = false;
-                                }
-                                else
-                                {
-                                    complete_zone.id = matches->semi_ptr.id;
-                                    complete_zone.match_space.first = matches->semi_ptr.match_space.first;
-                                }
-                                popArea(matches->copy_stack, complete_zone.match_space.first, complete_zone.match_space.second);
-                                matches->copy_stack.push_back(complete_zone);
-                                matches->set_semi = false;
-                                break;
-                            }
-                        }
-                    }
-                    break;
-                }
-                default:
-                {
-                    break;
-                }
-            }
-        }
-        return 0;
-    }
-    #if USE_HYPERSCAN
-    static hs_database_t* buildDatabase(const std::vector<const char* > &expressions,
-                                        const std::vector<unsigned> &flags,
-                                        const std::vector<unsigned> &id,
-                                        unsigned int mode)
-    {
-        hs_database_t *db;
-        hs_compile_error_t *compile_err;
-        hs_error_t err;
-        err = hs_compile_multi(expressions.data(), flags.data(), id.data(),
-                            expressions.size(), mode, nullptr, &db, &compile_err);
-
-        if (err != HS_SUCCESS)
-        {
-            hs_free_compile_error(compile_err);
-            throw Exception("Hyper scan database cannot be compiled.", ErrorCodes::CANNOT_ALLOCATE_MEMORY);
-        }
-        return db;
-    }
-    #endif
-    static std::vector<const char*> patterns;
-    static std::vector<std::size_t> patterns_length;
-    static std::vector<unsigned> patterns_flag;
-    static std::vector<unsigned> ids;
-
-public:
-    static void executeInternal(
-        const ColumnString::Chars & src_chars,
-        const ColumnString::Offsets & src_offsets,
-        ColumnString::Chars & dst_chars,
-        ColumnString::Offsets & dst_offsets)
-    {
-    #if USE_HYPERSCAN
-        hs_database_t * db = buildDatabase(patterns, patterns_flag, ids, HS_MODE_BLOCK);
-        hs_scratch_t* scratch = nullptr;
-        if (hs_alloc_scratch(db, &scratch) != HS_SUCCESS)
-        {
-            hs_free_database(db);
-            throw Exception("Unable to allocate scratch space.", ErrorCodes::CANNOT_ALLOCATE_MEMORY);
-        }
-        dst_chars.resize(src_chars.size());
-        dst_offsets.resize(src_offsets.size());
-
-        ColumnString::Offset current_src_string_offset = 0;
-        ColumnString::Offset current_dst_string_offset = 0;
-        ColumnString::Offset current_copy_loc;
-        ColumnString::Offset current_copy_end;
-        unsigned is_space;
-        size_t bytes_to_copy;
-        Span match_zoneall;
-
-        for (size_t off = 0; off < src_offsets.size(); ++off)
-        {
-            hs_scan(db, reinterpret_cast<const char *>(&src_chars[current_src_string_offset]), src_offsets[off] - current_src_string_offset, 0, scratch, spanCollect, &match_zoneall);
-            if (match_zoneall.is_finding_cdata)
-            {
-                dealCommonTag(&match_zoneall);
-            }
-            SpanElement& match_zone = match_zoneall.copy_stack;
-            current_copy_loc = current_src_string_offset;
-            if (match_zone.empty())
-            {
-                current_copy_end = src_offsets[off];
-                is_space = 0;
-            }
-            else
-            {
-                current_copy_end = current_src_string_offset + match_zone.begin()->match_space.first;
-                is_space = (match_zone.begin()->id == 12 || match_zone.begin()->id == 13)?1:0;
-            }
-
-            bytes_to_copy = current_copy_end - current_copy_loc;
-            copyZone(current_dst_string_offset, current_copy_loc, dst_chars, src_chars, bytes_to_copy, is_space);
-            for (auto begin = match_zone.begin(); begin != match_zone.end(); ++begin)
-            {
-                current_copy_loc = current_src_string_offset + begin->match_space.second;
-                if (begin + 1 >= match_zone.end())
-                {
-                    current_copy_end = src_offsets[off];
-                    is_space = 0;
-                }
-                else
-                {
-                    current_copy_end = current_src_string_offset + (begin+1)->match_space.first;
-                    is_space = ((begin+1)->id == 12 || (begin+1)->id == 13)?1:0;
-                }
-                bytes_to_copy = current_copy_end - current_copy_loc;
-                copyZone(current_dst_string_offset, current_copy_loc, dst_chars, src_chars, bytes_to_copy, is_space);
-            }
-            if (current_dst_string_offset > 1 && dst_chars[current_dst_string_offset - 2] == ' ')
-            {
-                dst_chars[current_dst_string_offset - 2] = 0;
-                --current_dst_string_offset;
-            }
-            dst_offsets[off] = current_dst_string_offset;
-            current_src_string_offset = src_offsets[off];
-            match_zoneall.copy_stack.clear();
-            match_zoneall.tag_stack.clear();
-        }
-            dst_chars.resize(dst_chars.size());
-            hs_free_scratch(scratch);
-            hs_free_database(db);
-    #else
-        (void)src_chars;
-        (void)src_offsets;
-        (void)dst_chars;
-        (void)dst_offsets;
-        throw Exception(
-            "htmlOrXmlCoarseParse is not implemented when hyperscan is off (is it x86 processor?)",
-            ErrorCodes::NOT_IMPLEMENTED);
-    #endif
-    }
-};
-
-std::vector<const char*> HxCoarseParseImpl::patterns =
-    {
-        "<[^\\s<>]",       // 0  "<", except "< ", "<<", "<>"
-        ">",               // 1  ">"
-        "<script\\s",      // 2  <script xxxxx>
-        "<script",         // 3  <script>
-        "</script\\s",     // 4  </script xxxx>
-        "</script",        // 5  </script>
-        "<style\\s",       // 6  <style xxxxxx>
-        "<style",          // 7  <style>
-        "</style\\s",      // 8  </style xxxxx>
-        "</style",         // 9  </style>
-        "<!\\[CDATA\\[",   // 10 <![CDATA[xxxxxx]]>
-        "\\]\\]>",         // 11 ]]>
-        "\\s{2,}",         // 12 "   ", continuous blanks
-        "[^\\S ]"          // 13 "\n", "\t" and other white space, it does not include single ' '.
-    };
-std::vector<std::size_t> HxCoarseParseImpl::patterns_length =
-    {
-        2, 1, 8, 7, 9, 8, 7, 6, 8, 7, 9, 3, 0, 1
-    };
-#if USE_HYPERSCAN
-std::vector<unsigned> HxCoarseParseImpl::patterns_flag =
-    {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, HS_FLAG_SOM_LEFTMOST, 0
-    };
-#endif
-std::vector<unsigned> HxCoarseParseImpl::ids =
-    {
-        0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13
-    };
-
-class FunctionHtmlOrXmlCoarseParse : public IFunction
-{
-public:
-    static constexpr auto name = "htmlOrXmlCoarseParse";
-
-    static FunctionPtr create(const Context &) {return std::make_shared<FunctionHtmlOrXmlCoarseParse>(); }
-
-    String getName() const override {return name;}
-
-    size_t getNumberOfArguments() const override {return 1;}
-
-    DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
-    {
-        if (!isString(arguments[0]))
-            throw Exception(
-                "Illegal type " + arguments[0]->getName() + " of argument of function " + getName(), ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
-        return arguments[0];
-    }
-
-    bool useDefaultImplementationForConstants() const override {return true;}
-
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & , size_t) const override
-    {
-        const auto & strcolumn = arguments[0].column;
-        if (const ColumnString* html_sentence = checkAndGetColumn<ColumnString>(strcolumn.get()))
-        {
-            auto col_res = ColumnString::create();
-            HxCoarseParseImpl::executeInternal(html_sentence->getChars(), html_sentence->getOffsets(), col_res->getChars(), col_res->getOffsets());
-            return col_res;
-        }
-        else
-        {
-            throw Exception("First argument for function " + getName() + " must be string.", ErrorCodes::ILLEGAL_COLUMN);
-        }
-    }
-};
-}
-
-void registerFunctionHtmlOrXmlCoarseParse(FunctionFactory & factory)
-{
-    factory.registerFunction<FunctionHtmlOrXmlCoarseParse>();
-}
-
-}
-#endif
diff --git a/src/Functions/identity.cpp b/src/Functions/identity.cpp
index cb8fcf28c23..2bfeb4cdda3 100644
--- a/src/Functions/identity.cpp
+++ b/src/Functions/identity.cpp
@@ -11,7 +11,7 @@ class FunctionIdentity : public IFunction
 {
 public:
     static constexpr auto name = "identity";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextPtr)
     {
         return std::make_shared<FunctionIdentity>();
     }
diff --git a/src/Functions/if.cpp b/src/Functions/if.cpp
index 614bfcf700e..4883b827d7d 100644
--- a/src/Functions/if.cpp
+++ b/src/Functions/if.cpp
@@ -173,7 +173,7 @@ class FunctionIf : public FunctionIfBase</*null_is_false=*/false>
 {
 public:
     static constexpr auto name = "if";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionIf>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionIf>(); }
 
 private:
     template <typename T0, typename T1>
diff --git a/src/Functions/ifNotFinite.cpp b/src/Functions/ifNotFinite.cpp
index 88b23da0126..8a80fbc82ee 100644
--- a/src/Functions/ifNotFinite.cpp
+++ b/src/Functions/ifNotFinite.cpp
@@ -17,9 +17,9 @@ class FunctionIfNotFinite : public IFunction
 public:
     static constexpr auto name = "ifNotFinite";
 
-    explicit FunctionIfNotFinite(const Context & context_) : context(context_) {}
+    explicit FunctionIfNotFinite(ContextPtr context_) : context(context_) {}
 
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextPtr context)
     {
         return std::make_shared<FunctionIfNotFinite>(context);
     }
@@ -59,7 +59,7 @@ public:
     }
 
 private:
-    const Context & context;
+    ContextPtr context;
 };
 
 }
diff --git a/src/Functions/ifNull.cpp b/src/Functions/ifNull.cpp
index af29fa0e1f0..763d125a8b7 100644
--- a/src/Functions/ifNull.cpp
+++ b/src/Functions/ifNull.cpp
@@ -21,9 +21,9 @@ class FunctionIfNull : public IFunction
 public:
     static constexpr auto name = "ifNull";
 
-    explicit FunctionIfNull(const Context & context_) : context(context_) {}
+    explicit FunctionIfNull(ContextPtr context_) : context(context_) {}
 
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextPtr context)
     {
         return std::make_shared<FunctionIfNull>(context);
     }
@@ -83,7 +83,7 @@ public:
     }
 
 private:
-    const Context & context;
+    ContextPtr context;
 };
 
 }
diff --git a/src/Functions/ignore.cpp b/src/Functions/ignore.cpp
index 1348144cb05..1a8a838036c 100644
--- a/src/Functions/ignore.cpp
+++ b/src/Functions/ignore.cpp
@@ -14,7 +14,7 @@ class FunctionIgnore : public IFunction
 {
 public:
     static constexpr auto name = "ignore";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextPtr)
     {
         return std::make_shared<FunctionIgnore>();
     }
diff --git a/src/Functions/in.cpp b/src/Functions/in.cpp
index b9a0c81b508..aac8de14fe6 100644
--- a/src/Functions/in.cpp
+++ b/src/Functions/in.cpp
@@ -52,7 +52,7 @@ public:
     /// It is needed to perform type analysis without creation of set.
     static constexpr auto name = FunctionInName<negative, global, null_is_skipped, ignore_set>::name;
 
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextPtr)
     {
         return std::make_shared<FunctionIn>();
     }
diff --git a/src/Functions/indexHint.cpp b/src/Functions/indexHint.cpp
new file mode 100644
index 00000000000..3a893201896
--- /dev/null
+++ b/src/Functions/indexHint.cpp
@@ -0,0 +1,70 @@
+#include <Functions/IFunctionImpl.h>
+#include <Functions/FunctionFactory.h>
+#include <DataTypes/DataTypesNumber.h>
+
+
+namespace DB
+{
+
+
+/** The `indexHint` function takes any number of any arguments and always returns one.
+  *
+  * This function has a special meaning (see ExpressionAnalyzer, KeyCondition)
+  * - the expressions inside it are not evaluated;
+  * - but when analyzing the index (selecting ranges for reading), this function is treated the same way,
+  *   as if instead of using it the expression itself would be.
+  *
+  * Example: WHERE something AND indexHint(CounterID = 34)
+  * - do not read or calculate CounterID = 34, but select ranges in which the CounterID = 34 expression can be true.
+  *
+  * The function can be used for debugging purposes, as well as for (hidden from the user) query conversions.
+  */
+class FunctionIndexHint : public IFunction
+{
+public:
+    static constexpr auto name = "indexHint";
+    static FunctionPtr create(ContextPtr)
+    {
+        return std::make_shared<FunctionIndexHint>();
+    }
+
+    bool isVariadic() const override
+    {
+        return true;
+    }
+    size_t getNumberOfArguments() const override
+    {
+        return 0;
+    }
+
+    bool useDefaultImplementationForNulls() const override { return false; }
+
+    bool isSuitableForConstantFolding() const override { return false; }
+
+    String getName() const override
+    {
+        return name;
+    }
+    DataTypePtr getReturnTypeImpl(const DataTypes & /*arguments*/) const override
+    {
+        return std::make_shared<DataTypeUInt8>();
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
+    {
+        return DataTypeUInt8().createColumnConst(input_rows_count, 1u);
+    }
+
+    ColumnPtr getResultIfAlwaysReturnsConstantAndHasArguments(const ColumnsWithTypeAndName &) const override
+    {
+        return DataTypeUInt8().createColumnConst(1, 1u);
+    }
+};
+
+
+void registerFunctionIndexHint(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionIndexHint>();
+}
+
+}
diff --git a/src/Functions/initializeAggregation.cpp b/src/Functions/initializeAggregation.cpp
index 4b90b7956c5..75c3ea14de8 100644
--- a/src/Functions/initializeAggregation.cpp
+++ b/src/Functions/initializeAggregation.cpp
@@ -9,7 +9,7 @@
 #include <AggregateFunctions/parseAggregateFunctionParameters.h>
 #include <Common/Arena.h>
 
-#include <ext/scope_guard.h>
+#include <ext/scope_guard_safe.h>
 
 
 namespace DB
@@ -29,7 +29,7 @@ class FunctionInitializeAggregation : public IFunction
 {
 public:
     static constexpr auto name = "initializeAggregation";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionInitializeAggregation>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionInitializeAggregation>(); }
 
     String getName() const override { return name; }
 
@@ -132,7 +132,7 @@ ColumnPtr FunctionInitializeAggregation::executeImpl(const ColumnsWithTypeAndNam
         }
     }
 
-    SCOPE_EXIT({
+    SCOPE_EXIT_MEMORY_SAFE({
         for (size_t i = 0; i < input_rows_count; ++i)
             agg_func.destroy(places[i]);
     });
diff --git a/src/Functions/intDiv.cpp b/src/Functions/intDiv.cpp
index e13c46e9cd1..14df8af66ca 100644
--- a/src/Functions/intDiv.cpp
+++ b/src/Functions/intDiv.cpp
@@ -1,11 +1,7 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionBinaryArithmetic.h>
 
-#if defined(__SSE2__)
-#    define LIBDIVIDE_SSE2 1
-#endif
-
-#include <libdivide.h>
+#include "divide/divide.h"
 
 
 namespace DB
@@ -24,20 +20,35 @@ template <typename A, typename B>
 struct DivideIntegralByConstantImpl
     : BinaryOperation<A, B, DivideIntegralImpl<A, B>>
 {
-    using ResultType = typename DivideIntegralImpl<A, B>::ResultType;
+    using Op = DivideIntegralImpl<A, B>;
+    using ResultType = typename Op::ResultType;
     static const constexpr bool allow_fixed_string = false;
 
-    static NO_INLINE void vectorConstant(const A * __restrict a_pos, B b, ResultType * __restrict c_pos, size_t size)
+    template <OpCase op_case>
+    static void NO_INLINE process(const A * __restrict a, const B * __restrict b, ResultType * __restrict c, size_t size)
+    {
+        if constexpr (op_case == OpCase::Vector)
+            for (size_t i = 0; i < size; ++i)
+                c[i] = Op::template apply<ResultType>(a[i], b[i]);
+        else if constexpr (op_case == OpCase::LeftConstant)
+            for (size_t i = 0; i < size; ++i)
+                c[i] = Op::template apply<ResultType>(*a, b[i]);
+        else
+            vectorConstant(a, *b, c, size);
+    }
+
+    static ResultType process(A a, B b) { return Op::template apply<ResultType>(a, b); }
+
+    static void NO_INLINE NO_SANITIZE_UNDEFINED vectorConstant(const A * __restrict a_pos, B b, ResultType * __restrict c_pos, size_t size)
     {
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wsign-compare"
 
         /// Division by -1. By the way, we avoid FPE by division of the largest negative number by -1.
-        /// And signed integer overflow is well defined in C++20.
         if (unlikely(is_signed_v<B> && b == -1))
         {
             for (size_t i = 0; i < size; ++i)
-                c_pos[i] = -a_pos[i];
+                c_pos[i] = -make_unsigned_t<A>(a_pos[i]);   /// Avoid UBSan report in signed integer overflow.
             return;
         }
 
@@ -55,34 +66,11 @@ struct DivideIntegralByConstantImpl
         if (unlikely(static_cast<A>(b) == 0))
             throw Exception("Division by zero", ErrorCodes::ILLEGAL_DIVISION);
 
-        libdivide::divider<A> divider(b);
-
-        const A * a_end = a_pos + size;
-
-#if defined(__SSE2__)
-        static constexpr size_t values_per_sse_register = 16 / sizeof(A);
-        const A * a_end_sse = a_pos + size / values_per_sse_register * values_per_sse_register;
-
-        while (a_pos < a_end_sse)
-        {
-            _mm_storeu_si128(reinterpret_cast<__m128i *>(c_pos),
-                _mm_loadu_si128(reinterpret_cast<const __m128i *>(a_pos)) / divider);
-
-            a_pos += values_per_sse_register;
-            c_pos += values_per_sse_register;
-        }
-#endif
-
-        while (a_pos < a_end)
-        {
-            *c_pos = *a_pos / divider;
-            ++a_pos;
-            ++c_pos;
-        }
+        divideImpl(a_pos, b, c_pos, size);
     }
 };
 
-/** Specializations are specified for dividing numbers of the type UInt64 and UInt32 by the numbers of the same sign.
+/** Specializations are specified for dividing numbers of the type UInt64, UInt32, Int64, Int32 by the numbers of the same sign.
   * Can be expanded to all possible combinations, but more code is needed.
   */
 
diff --git a/src/Functions/isConstant.cpp b/src/Functions/isConstant.cpp
index 09e14226b70..12514b71a11 100644
--- a/src/Functions/isConstant.cpp
+++ b/src/Functions/isConstant.cpp
@@ -15,7 +15,7 @@ class FunctionIsConstant : public IFunction
 {
 public:
     static constexpr auto name = "isConstant";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextPtr)
     {
         return std::make_shared<FunctionIsConstant>();
     }
diff --git a/src/Functions/isDecimalOverflow.cpp b/src/Functions/isDecimalOverflow.cpp
index 9104b1f1dee..16d6752e6a5 100644
--- a/src/Functions/isDecimalOverflow.cpp
+++ b/src/Functions/isDecimalOverflow.cpp
@@ -28,7 +28,7 @@ class FunctionIsDecimalOverflow : public IFunction
 public:
     static constexpr auto name = "isDecimalOverflow";
 
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextPtr)
     {
         return std::make_shared<FunctionIsDecimalOverflow>();
     }
diff --git a/src/Functions/isIPAddressContainedIn.cpp b/src/Functions/isIPAddressContainedIn.cpp
new file mode 100644
index 00000000000..fb5b8a3271d
--- /dev/null
+++ b/src/Functions/isIPAddressContainedIn.cpp
@@ -0,0 +1,259 @@
+#include <Columns/ColumnConst.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnsNumber.h>
+#include <Common/IPv6ToBinary.h>
+#include <Common/formatIPv6.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Functions/IFunctionImpl.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/FunctionHelpers.h>
+#include <variant>
+#include <charconv>
+
+
+#include <common/logger_useful.h>
+namespace DB::ErrorCodes
+{
+    extern const int CANNOT_PARSE_TEXT;
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+}
+
+namespace
+{
+
+class IPAddressVariant
+{
+public:
+
+    explicit IPAddressVariant(const StringRef & address_str)
+    {
+        /// IP address parser functions require that the input is
+        /// NULL-terminated so we need to copy it.
+        const auto address_str_copy = std::string(address_str);
+
+        UInt32 v4;
+        if (DB::parseIPv4(address_str_copy.c_str(), reinterpret_cast<unsigned char *>(&v4)))
+        {
+            addr = v4;
+        }
+        else
+        {
+            addr = IPv6AddrType();
+            bool success = DB::parseIPv6(address_str_copy.c_str(), std::get<IPv6AddrType>(addr).data());
+            if (!success)
+                throw DB::Exception("Neither IPv4 nor IPv6 address: '" + address_str_copy + "'",
+                                    DB::ErrorCodes::CANNOT_PARSE_TEXT);
+        }
+    }
+
+    UInt32 asV4() const
+    {
+        if (const auto * val = std::get_if<IPv4AddrType>(&addr))
+            return *val;
+        return 0;
+    }
+
+    const uint8_t * asV6() const
+    {
+        if (const auto * val = std::get_if<IPv6AddrType>(&addr))
+            return val->data();
+        return nullptr;
+    }
+
+private:
+    using IPv4AddrType = UInt32;
+    using IPv6AddrType = std::array<uint8_t, IPV6_BINARY_LENGTH>;
+
+    std::variant<IPv4AddrType, IPv6AddrType> addr;
+};
+
+struct IPAddressCIDR
+{
+    IPAddressVariant address;
+    UInt8 prefix;
+};
+
+IPAddressCIDR parseIPWithCIDR(const StringRef cidr_str)
+{
+    std::string_view cidr_str_view(cidr_str);
+    size_t pos_slash = cidr_str_view.find('/');
+
+    if (pos_slash == 0)
+        throw DB::Exception("Error parsing IP address with prefix: " + std::string(cidr_str), DB::ErrorCodes::CANNOT_PARSE_TEXT);
+    if (pos_slash == std::string_view::npos)
+        throw DB::Exception("The text does not contain '/': " + std::string(cidr_str), DB::ErrorCodes::CANNOT_PARSE_TEXT);
+
+    std::string_view addr_str = cidr_str_view.substr(0, pos_slash);
+    IPAddressVariant addr(StringRef{addr_str.data(), addr_str.size()});
+
+    uint8_t prefix = 0;
+    auto prefix_str = cidr_str_view.substr(pos_slash+1);
+
+    const auto * prefix_str_end = prefix_str.data() + prefix_str.size();
+    auto [parse_end, parse_error] = std::from_chars(prefix_str.data(), prefix_str_end, prefix);
+    uint8_t max_prefix = (addr.asV6() ? IPV6_BINARY_LENGTH : IPV4_BINARY_LENGTH) * 8;
+    bool has_error = parse_error != std::errc() || parse_end != prefix_str_end || prefix > max_prefix;
+    if (has_error)
+        throw DB::Exception("The CIDR has a malformed prefix bits: " + std::string(cidr_str), DB::ErrorCodes::CANNOT_PARSE_TEXT);
+
+    return {addr, static_cast<UInt8>(prefix)};
+}
+
+inline bool isAddressInRange(const IPAddressVariant & address, const IPAddressCIDR & cidr)
+{
+    if (const auto * cidr_v6 = cidr.address.asV6())
+    {
+        if (const auto * addr_v6 = address.asV6())
+            return DB::matchIPv6Subnet(addr_v6, cidr_v6, cidr.prefix);
+    }
+    else
+    {
+        if (!address.asV6())
+            return DB::matchIPv4Subnet(address.asV4(), cidr.address.asV4(), cidr.prefix);
+    }
+    return false;
+}
+
+}
+
+namespace DB
+{
+    class FunctionIsIPAddressContainedIn : public IFunction
+    {
+    public:
+        static constexpr auto name = "isIPAddressInRange";
+        String getName() const override { return name; }
+        static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionIsIPAddressContainedIn>(); }
+
+        ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & /* return_type */, size_t input_rows_count) const override
+        {
+            const IColumn * col_addr = arguments[0].column.get();
+            const IColumn * col_cidr = arguments[1].column.get();
+
+            if (const auto * col_addr_const = checkAndGetAnyColumnConst(col_addr))
+            {
+                if (const auto * col_cidr_const = checkAndGetAnyColumnConst(col_cidr))
+                    return executeImpl(*col_addr_const, *col_cidr_const, input_rows_count);
+                else
+                    return executeImpl(*col_addr_const, *col_cidr, input_rows_count);
+            }
+            else
+            {
+                if (const auto * col_cidr_const = checkAndGetAnyColumnConst(col_cidr))
+                    return executeImpl(*col_addr, *col_cidr_const, input_rows_count);
+                else
+                    return executeImpl(*col_addr, *col_cidr, input_rows_count);
+            }
+        }
+
+        virtual DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
+        {
+            if (arguments.size() != 2)
+                throw Exception(
+                    "Number of arguments for function " + getName() + " doesn't match: passed " + toString(arguments.size()) + ", should be 2",
+                    ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
+
+            const DataTypePtr & addr_type = arguments[0];
+            const DataTypePtr & prefix_type = arguments[1];
+
+            if (!isString(addr_type) || !isString(prefix_type))
+                throw Exception("The arguments of function " + getName() + " must be String",
+                                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+
+            return std::make_shared<DataTypeUInt8>();
+        }
+
+        virtual size_t getNumberOfArguments() const override { return 2; }
+        bool useDefaultImplementationForNulls() const override { return false; }
+
+    private:
+        /// Like checkAndGetColumnConst() but this function doesn't
+        /// care about the type of data column.
+        static const ColumnConst * checkAndGetAnyColumnConst(const IColumn * column)
+        {
+            if (!column || !isColumnConst(*column))
+                return nullptr;
+
+            return assert_cast<const ColumnConst *>(column);
+        }
+
+        /// Both columns are constant.
+        static ColumnPtr executeImpl(
+            const ColumnConst & col_addr_const,
+            const ColumnConst & col_cidr_const,
+            size_t input_rows_count)
+        {
+            const auto & col_addr = col_addr_const.getDataColumn();
+            const auto & col_cidr = col_cidr_const.getDataColumn();
+
+            const auto addr = IPAddressVariant(col_addr.getDataAt(0));
+            const auto cidr = parseIPWithCIDR(col_cidr.getDataAt(0));
+
+            ColumnUInt8::MutablePtr col_res = ColumnUInt8::create(1);
+            ColumnUInt8::Container & vec_res = col_res->getData();
+
+            vec_res[0] = isAddressInRange(addr, cidr) ? 1 : 0;
+
+            return ColumnConst::create(std::move(col_res), input_rows_count);
+        }
+
+        /// Address is constant.
+        static ColumnPtr executeImpl(const ColumnConst & col_addr_const, const IColumn & col_cidr, size_t input_rows_count)
+        {
+            const auto & col_addr = col_addr_const.getDataColumn();
+
+            const auto addr = IPAddressVariant(col_addr.getDataAt   (0));
+
+            ColumnUInt8::MutablePtr col_res = ColumnUInt8::create(input_rows_count);
+            ColumnUInt8::Container & vec_res = col_res->getData();
+
+            for (size_t i = 0; i < input_rows_count; i++)
+            {
+                const auto cidr = parseIPWithCIDR(col_cidr.getDataAt(i));
+                vec_res[i] = isAddressInRange(addr, cidr) ? 1 : 0;
+            }
+            return col_res;
+        }
+
+        /// CIDR is constant.
+        static ColumnPtr executeImpl(const IColumn & col_addr, const ColumnConst & col_cidr_const, size_t input_rows_count)
+        {
+            const auto & col_cidr = col_cidr_const.getDataColumn();
+
+            const auto cidr = parseIPWithCIDR(col_cidr.getDataAt(0));
+
+            ColumnUInt8::MutablePtr col_res = ColumnUInt8::create(input_rows_count);
+            ColumnUInt8::Container & vec_res = col_res->getData();
+            for (size_t i = 0; i < input_rows_count; i++)
+            {
+                const auto addr = IPAddressVariant(col_addr.getDataAt(i));
+                vec_res[i] = isAddressInRange(addr, cidr) ? 1 : 0;
+            }
+            return col_res;
+        }
+
+        /// Neither are constant.
+        static ColumnPtr executeImpl(const IColumn & col_addr, const IColumn & col_cidr, size_t input_rows_count)
+        {
+            ColumnUInt8::MutablePtr col_res = ColumnUInt8::create(input_rows_count);
+            ColumnUInt8::Container & vec_res = col_res->getData();
+
+            for (size_t i = 0; i < input_rows_count; i++)
+            {
+                const auto addr = IPAddressVariant(col_addr.getDataAt(i));
+                const auto cidr = parseIPWithCIDR(col_cidr.getDataAt(i));
+
+                vec_res[i] = isAddressInRange(addr, cidr) ? 1 : 0;
+            }
+
+            return col_res;
+        }
+    };
+
+    void registerFunctionIsIPAddressContainedIn(FunctionFactory & factory)
+    {
+        factory.registerFunction<FunctionIsIPAddressContainedIn>();
+    }
+}
diff --git a/src/Functions/isNotNull.cpp b/src/Functions/isNotNull.cpp
index 104547ac485..0ba240833f5 100644
--- a/src/Functions/isNotNull.cpp
+++ b/src/Functions/isNotNull.cpp
@@ -19,7 +19,7 @@ class FunctionIsNotNull : public IFunction
 public:
     static constexpr auto name = "isNotNull";
 
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextPtr)
     {
         return std::make_shared<FunctionIsNotNull>();
     }
diff --git a/src/Functions/isNull.cpp b/src/Functions/isNull.cpp
index 35ba6b7b86d..142403aedf8 100644
--- a/src/Functions/isNull.cpp
+++ b/src/Functions/isNull.cpp
@@ -18,7 +18,7 @@ class FunctionIsNull : public IFunction
 public:
     static constexpr auto name = "isNull";
 
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextPtr)
     {
         return std::make_shared<FunctionIsNull>();
     }
diff --git a/src/Functions/isZeroOrNull.cpp b/src/Functions/isZeroOrNull.cpp
index ceaa03dee14..d1fd950c22c 100644
--- a/src/Functions/isZeroOrNull.cpp
+++ b/src/Functions/isZeroOrNull.cpp
@@ -26,7 +26,7 @@ class FunctionIsZeroOrNull : public IFunction
 public:
     static constexpr auto name = "isZeroOrNull";
 
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextPtr)
     {
         return std::make_shared<FunctionIsZeroOrNull>();
     }
diff --git a/src/Functions/logTrace.cpp b/src/Functions/logTrace.cpp
index 6f2719588f2..a56d9ef5de1 100644
--- a/src/Functions/logTrace.cpp
+++ b/src/Functions/logTrace.cpp
@@ -21,7 +21,7 @@ namespace
     {
     public:
         static constexpr auto name = "logTrace";
-        static FunctionPtr create(const Context &) { return std::make_shared<FunctionLogTrace>(); }
+        static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionLogTrace>(); }
 
         String getName() const override { return name; }
 
diff --git a/src/Functions/lowCardinalityIndices.cpp b/src/Functions/lowCardinalityIndices.cpp
index 67bee2f0d3f..b46fb17d6b1 100644
--- a/src/Functions/lowCardinalityIndices.cpp
+++ b/src/Functions/lowCardinalityIndices.cpp
@@ -21,7 +21,7 @@ class FunctionLowCardinalityIndices: public IFunction
 {
 public:
     static constexpr auto name = "lowCardinalityIndices";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionLowCardinalityIndices>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionLowCardinalityIndices>(); }
 
     String getName() const override { return name; }
 
@@ -35,7 +35,7 @@ public:
     {
         const auto * type = typeid_cast<const DataTypeLowCardinality *>(arguments[0].get());
         if (!type)
-            throw Exception("First first argument of function lowCardinalityIndexes must be ColumnLowCardinality, but got"
+            throw Exception("First first argument of function lowCardinalityIndexes must be ColumnLowCardinality, but got "
                             + arguments[0]->getName(), ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
 
         return std::make_shared<DataTypeUInt64>();
diff --git a/src/Functions/lowCardinalityKeys.cpp b/src/Functions/lowCardinalityKeys.cpp
index a7cb6b45550..245a016ac6a 100644
--- a/src/Functions/lowCardinalityKeys.cpp
+++ b/src/Functions/lowCardinalityKeys.cpp
@@ -19,7 +19,7 @@ class FunctionLowCardinalityKeys: public IFunction
 {
 public:
     static constexpr auto name = "lowCardinalityKeys";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionLowCardinalityKeys>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionLowCardinalityKeys>(); }
 
     String getName() const override { return name; }
 
@@ -33,7 +33,7 @@ public:
     {
         const auto * type = typeid_cast<const DataTypeLowCardinality *>(arguments[0].get());
         if (!type)
-            throw Exception("First first argument of function lowCardinalityKeys must be ColumnLowCardinality, but got"
+            throw Exception("First first argument of function lowCardinalityKeys must be ColumnLowCardinality, but got "
                             + arguments[0]->getName(), ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
 
         return type->getDictionaryType();
diff --git a/src/Functions/map.cpp b/src/Functions/map.cpp
index 6133d6ef91c..d2ec10abd1c 100644
--- a/src/Functions/map.cpp
+++ b/src/Functions/map.cpp
@@ -34,7 +34,7 @@ class FunctionMap : public IFunction
 public:
     static constexpr auto name = "map";
 
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextPtr)
     {
         return std::make_shared<FunctionMap>();
     }
@@ -65,7 +65,8 @@ public:
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         if (arguments.size() % 2 != 0)
-            throw Exception("Function " + getName() + " even number of arguments", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
+            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+                "Function {} requires even number of arguments, but {} given", getName(), arguments.size());
 
         DataTypes keys, values;
         for (size_t i = 0; i < arguments.size(); i += 2)
@@ -145,7 +146,7 @@ class FunctionMapContains : public IFunction
 {
 public:
     static constexpr auto name = NameMapContains::name;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionMapContains>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionMapContains>(); }
 
     String getName() const override
     {
@@ -208,7 +209,7 @@ class FunctionMapKeys : public IFunction
 {
 public:
     static constexpr auto name = "mapKeys";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionMapKeys>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionMapKeys>(); }
 
     String getName() const override
     {
@@ -255,7 +256,7 @@ class FunctionMapValues : public IFunction
 {
 public:
     static constexpr auto name = "mapValues";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionMapValues>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionMapValues>(); }
 
     String getName() const override
     {
diff --git a/src/Functions/materialize.h b/src/Functions/materialize.h
index 5b06ac36da7..741669e69d9 100644
--- a/src/Functions/materialize.h
+++ b/src/Functions/materialize.h
@@ -11,7 +11,7 @@ class FunctionMaterialize : public IFunction
 {
 public:
     static constexpr auto name = "materialize";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextPtr)
     {
         return std::make_shared<FunctionMaterialize>();
     }
diff --git a/src/Functions/modulo.cpp b/src/Functions/modulo.cpp
index 388e6ab9fb9..ed68982cd71 100644
--- a/src/Functions/modulo.cpp
+++ b/src/Functions/modulo.cpp
@@ -24,10 +24,26 @@ template <typename A, typename B>
 struct ModuloByConstantImpl
     : BinaryOperation<A, B, ModuloImpl<A, B>>
 {
-    using ResultType = typename ModuloImpl<A, B>::ResultType;
+    using Op = ModuloImpl<A, B>;
+    using ResultType = typename Op::ResultType;
     static const constexpr bool allow_fixed_string = false;
 
-    static NO_INLINE void vectorConstant(const A * __restrict src, B b, ResultType * __restrict dst, size_t size)
+    template <OpCase op_case>
+    static void NO_INLINE process(const A * __restrict a, const B * __restrict b, ResultType * __restrict c, size_t size)
+    {
+        if constexpr (op_case == OpCase::Vector)
+            for (size_t i = 0; i < size; ++i)
+                c[i] = Op::template apply<ResultType>(a[i], b[i]);
+        else if constexpr (op_case == OpCase::LeftConstant)
+            for (size_t i = 0; i < size; ++i)
+                c[i] = Op::template apply<ResultType>(*a, b[i]);
+        else
+            vectorConstant(a, *b, c, size);
+    }
+
+    static ResultType process(A a, B b) { return Op::template apply<ResultType>(a, b); }
+
+    static void NO_INLINE NO_SANITIZE_UNDEFINED vectorConstant(const A * __restrict src, B b, ResultType * __restrict dst, size_t size)
     {
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wsign-compare"
@@ -54,12 +70,19 @@ struct ModuloByConstantImpl
         if (unlikely(static_cast<A>(b) == 0))
             throw Exception("Division by zero", ErrorCodes::ILLEGAL_DIVISION);
 
-        libdivide::divider<A> divider(b);
+        /// Division by min negative value.
+        if (std::is_signed_v<B> && b == std::numeric_limits<B>::lowest())
+            throw Exception("Division by the most negative number", ErrorCodes::ILLEGAL_DIVISION);
+
+        /// Modulo of division by negative number is the same as the positive number.
+        if (b < 0)
+            b = -b;
 
         /// Here we failed to make the SSE variant from libdivide give an advantage.
 
         if (b & (b - 1))
         {
+            libdivide::divider<A> divider(b);
             for (size_t i = 0; i < size; ++i)
                 dst[i] = src[i] - (src[i] / divider) * b; /// NOTE: perhaps, the division semantics with the remainder of negative numbers is not preserved.
         }
diff --git a/src/Functions/multiIf.cpp b/src/Functions/multiIf.cpp
index 8ca92954873..d9be4512851 100644
--- a/src/Functions/multiIf.cpp
+++ b/src/Functions/multiIf.cpp
@@ -35,7 +35,7 @@ class FunctionMultiIf final : public FunctionIfBase</*null_is_false=*/true>
 {
 public:
     static constexpr auto name = "multiIf";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionMultiIf>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionMultiIf>(); }
 
     String getName() const override { return name; }
     bool isVariadic() const override { return true; }
diff --git a/src/Functions/neighbor.cpp b/src/Functions/neighbor.cpp
index 598e1225877..e841fe9e79b 100644
--- a/src/Functions/neighbor.cpp
+++ b/src/Functions/neighbor.cpp
@@ -31,7 +31,7 @@ class FunctionNeighbor : public IFunction
 {
 public:
     static constexpr auto name = "neighbor";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionNeighbor>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionNeighbor>(); }
 
     /// Get the name of the function.
     String getName() const override { return name; }
diff --git a/src/Functions/normalizedQueryHash.cpp b/src/Functions/normalizedQueryHash.cpp
index 5704b5301ca..e08680518c1 100644
--- a/src/Functions/normalizedQueryHash.cpp
+++ b/src/Functions/normalizedQueryHash.cpp
@@ -51,7 +51,7 @@ class FunctionNormalizedQueryHash : public IFunction
 {
 public:
     static constexpr auto name = keep_names ? "normalizedQueryHashKeepNames" : "normalizedQueryHash";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextPtr)
     {
         return std::make_shared<FunctionNormalizedQueryHash>();
     }
diff --git a/src/Functions/now.cpp b/src/Functions/now.cpp
index 79870ace007..8d7c185c2af 100644
--- a/src/Functions/now.cpp
+++ b/src/Functions/now.cpp
@@ -83,7 +83,7 @@ public:
     bool isVariadic() const override { return true; }
 
     size_t getNumberOfArguments() const override { return 0; }
-    static FunctionOverloadResolverImplPtr create(const Context &) { return std::make_unique<NowOverloadResolver>(); }
+    static FunctionOverloadResolverImplPtr create(ContextPtr) { return std::make_unique<NowOverloadResolver>(); }
 
     DataTypePtr getReturnType(const ColumnsWithTypeAndName & arguments) const override
     {
diff --git a/src/Functions/now64.cpp b/src/Functions/now64.cpp
index feb821fde82..503ce524437 100644
--- a/src/Functions/now64.cpp
+++ b/src/Functions/now64.cpp
@@ -30,7 +30,7 @@ Field nowSubsecond(UInt32 scale)
     if (clock_gettime(CLOCK_REALTIME, &spec))
         throwFromErrno("Cannot clock_gettime.", ErrorCodes::CANNOT_CLOCK_GETTIME);
 
-    DecimalUtils::DecimalComponents<DateTime64::NativeType> components{spec.tv_sec, spec.tv_nsec};
+    DecimalUtils::DecimalComponents<DateTime64> components{spec.tv_sec, spec.tv_nsec};
 
     // clock_gettime produces subsecond part in nanoseconds, but decimalFromComponents fractional is scale-dependent.
     // Andjust fractional to scale, e.g. for 123456789 nanoseconds:
@@ -106,7 +106,7 @@ public:
     bool isVariadic() const override { return true; }
 
     size_t getNumberOfArguments() const override { return 0; }
-    static FunctionOverloadResolverImplPtr create(const Context &) { return std::make_unique<Now64OverloadResolver>(); }
+    static FunctionOverloadResolverImplPtr create(ContextPtr) { return std::make_unique<Now64OverloadResolver>(); }
 
     DataTypePtr getReturnType(const ColumnsWithTypeAndName & arguments) const override
     {
diff --git a/src/Functions/nullIf.cpp b/src/Functions/nullIf.cpp
index 200425a7b83..332f85f918f 100644
--- a/src/Functions/nullIf.cpp
+++ b/src/Functions/nullIf.cpp
@@ -18,16 +18,16 @@ namespace
 class FunctionNullIf : public IFunction
 {
 private:
-    const Context & context;
+    ContextPtr context;
 public:
     static constexpr auto name = "nullIf";
 
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextPtr context)
     {
         return std::make_shared<FunctionNullIf>(context);
     }
 
-    explicit FunctionNullIf(const Context & context_) : context(context_) {}
+    explicit FunctionNullIf(ContextPtr context_) : context(context_) {}
 
     std::string getName() const override
     {
diff --git a/src/Functions/partitionId.cpp b/src/Functions/partitionId.cpp
new file mode 100644
index 00000000000..f501b120740
--- /dev/null
+++ b/src/Functions/partitionId.cpp
@@ -0,0 +1,70 @@
+#include <memory>
+#include <Columns/ColumnString.h>
+#include <Core/Block.h>
+#include <DataTypes/DataTypeString.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/IFunctionImpl.h>
+#include <Storages/MergeTree/MergeTreePartition.h>
+
+
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+}
+
+
+/** partitionId(x, y, ...) is a function that computes partition ids of arguments.
+  * The function is slow and should not be called for large amount of rows.
+  */
+class FunctionPartitionId : public IFunction
+{
+public:
+    static constexpr auto name = "partitionId";
+
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionPartitionId>(); }
+
+    String getName() const override { return name; }
+
+    bool isVariadic() const override { return true; }
+
+    size_t getNumberOfArguments() const override { return 0; }
+
+    bool isInjective(const ColumnsWithTypeAndName & /*sample_columns*/) const override { return true; }
+
+    bool useDefaultImplementationForNulls() const override { return true; }
+    bool useDefaultImplementationForConstants() const override { return true; }
+
+    DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
+    {
+        if (arguments.empty())
+            throw Exception("Function " + getName() + " requires at least one argument.", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
+
+        return std::make_shared<DataTypeString>();
+    }
+
+    virtual ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    {
+        Block sample_block(arguments);
+        size_t size = arguments.size();
+
+        auto result_column = ColumnString::create();
+        for (size_t j = 0; j < input_rows_count; ++j)
+        {
+            Row row(size);
+            for (size_t i = 0; i < size; ++i)
+                arguments[i].column->get(j, row[i]);
+            MergeTreePartition partition(std::move(row));
+            result_column->insert(partition.getID(sample_block));
+        }
+        return result_column;
+    }
+};
+
+void registerFunctionPartitionId(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionPartitionId>();
+}
+
+}
diff --git a/src/Functions/pointInEllipses.cpp b/src/Functions/pointInEllipses.cpp
index 4edd400d55d..eed564ef988 100644
--- a/src/Functions/pointInEllipses.cpp
+++ b/src/Functions/pointInEllipses.cpp
@@ -39,7 +39,7 @@ class FunctionPointInEllipses : public IFunction
 {
 public:
     static constexpr auto name = "pointInEllipses";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionPointInEllipses>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionPointInEllipses>(); }
 
 private:
 
diff --git a/src/Functions/pointInPolygon.cpp b/src/Functions/pointInPolygon.cpp
index 3fd369cb4be..842a5010190 100644
--- a/src/Functions/pointInPolygon.cpp
+++ b/src/Functions/pointInPolygon.cpp
@@ -13,6 +13,7 @@
 #include <Columns/ColumnsNumber.h>
 #include <Common/ObjectPool.h>
 #include <Common/ProfileEvents.h>
+#include <common/arithmeticOverflow.h>
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypeTuple.h>
@@ -59,10 +60,10 @@ public:
 
     explicit FunctionPointInPolygon(bool validate_) : validate(validate_) {}
 
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextPtr context)
     {
         return std::make_shared<FunctionPointInPolygon<PointInConstPolygonImpl>>(
-            context.getSettingsRef().validate_polygons);
+            context->getSettingsRef().validate_polygons);
     }
 
     String getName() const override
@@ -425,7 +426,14 @@ private:
     {
         out_container.reserve(end - begin);
         for (size_t i = begin; i < end; ++i)
+        {
+            Int64 result = 0;
+            if (common::mulOverflow(static_cast<Int64>(x_data[i]), static_cast<Int64>(y_data[i]), result))
+                throw Exception("The coordinates of the point are such that subsequent calculations cannot be performed correctly. " \
+                                "Most likely they are very large in modulus.", ErrorCodes::BAD_ARGUMENTS);
+
             out_container.emplace_back(x_data[i], y_data[i]);
+        }
     }
 
     void parseConstPolygonWithoutHolesFromSingleColumn(const IColumn & column, size_t i, Polygon & out_polygon) const
@@ -540,7 +548,7 @@ private:
         }
     }
 
-    void parseConstPolygon(const ColumnsWithTypeAndName & arguments, Polygon & out_polygon) const
+    void NO_SANITIZE_UNDEFINED parseConstPolygon(const ColumnsWithTypeAndName & arguments, Polygon & out_polygon) const
     {
         if (arguments.size() == 2)
             parseConstPolygonFromSingleColumn(arguments, out_polygon);
diff --git a/src/Functions/polygonArea.cpp b/src/Functions/polygonArea.cpp
new file mode 100644
index 00000000000..9a36b71d5b1
--- /dev/null
+++ b/src/Functions/polygonArea.cpp
@@ -0,0 +1,108 @@
+#include <Functions/FunctionFactory.h>
+#include <Functions/geometryConverters.h>
+
+#include <boost/geometry.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
+
+#include <common/logger_useful.h>
+
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnTuple.h>
+#include <Columns/ColumnsNumber.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeTuple.h>
+#include <DataTypes/DataTypeCustomGeo.h>
+#include <DataTypes/DataTypesNumber.h>
+
+#include <memory>
+#include <string>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+}
+
+template <typename Point>
+class FunctionPolygonArea : public IFunction
+{
+public:
+    static inline const char * name;
+
+    explicit FunctionPolygonArea() = default;
+
+    static FunctionPtr create(ContextPtr)
+    {
+        return std::make_shared<FunctionPolygonArea>();
+    }
+
+    String getName() const override
+    {
+        return name;
+    }
+
+    bool isVariadic() const override
+    {
+        return false;
+    }
+
+    size_t getNumberOfArguments() const override
+    {
+        return 1;
+    }
+
+    DataTypePtr getReturnTypeImpl(const DataTypes &) const override
+    {
+        return std::make_shared<DataTypeFloat64>();
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & /*result_type*/, size_t input_rows_count) const override
+    {
+        auto res_column = ColumnFloat64::create();
+        auto & res_data = res_column->getData();
+        res_data.reserve(input_rows_count);
+
+        callOnGeometryDataType<Point>(arguments[0].type, [&] (const auto & type)
+        {
+            using TypeConverter = std::decay_t<decltype(type)>;
+            using Converter = typename TypeConverter::Type;
+
+            if constexpr (std::is_same_v<ColumnToPointsConverter<Point>, Converter>)
+                throw Exception(fmt::format("The argument of function {} must not be Point", getName()), ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+            else
+            {
+                auto geometries = Converter::convert(arguments[0].column->convertToFullColumnIfConst());
+
+                for (size_t i = 0; i < input_rows_count; i++)
+                    res_data.emplace_back(boost::geometry::area(geometries[i]));
+            }
+        }
+        );
+
+        return res_column;
+    }
+
+    bool useDefaultImplementationForConstants() const override
+    {
+        return true;
+    }
+};
+
+template <>
+const char * FunctionPolygonArea<CartesianPoint>::name = "polygonAreaCartesian";
+
+template <>
+const char * FunctionPolygonArea<SphericalPoint>::name = "polygonAreaSpherical";
+
+
+void registerFunctionPolygonArea(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionPolygonArea<CartesianPoint>>();
+    factory.registerFunction<FunctionPolygonArea<SphericalPoint>>();
+}
+
+
+}
diff --git a/src/Functions/polygonConvexHull.cpp b/src/Functions/polygonConvexHull.cpp
new file mode 100644
index 00000000000..5bce3c5bbdd
--- /dev/null
+++ b/src/Functions/polygonConvexHull.cpp
@@ -0,0 +1,105 @@
+#include <Functions/FunctionFactory.h>
+#include <Functions/geometryConverters.h>
+
+#include <boost/geometry.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
+
+#include <common/logger_useful.h>
+
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnTuple.h>
+#include <Columns/ColumnsNumber.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeTuple.h>
+#include <DataTypes/DataTypeCustomGeo.h>
+
+#include <memory>
+#include <string>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int BAD_ARGUMENTS;
+}
+
+template <typename Point>
+class FunctionPolygonConvexHull : public IFunction
+{
+public:
+    static const char * name;
+
+    explicit FunctionPolygonConvexHull() = default;
+
+    static FunctionPtr create(ContextPtr)
+    {
+        return std::make_shared<FunctionPolygonConvexHull>();
+    }
+
+    String getName() const override
+    {
+        return name;
+    }
+
+    bool isVariadic() const override
+    {
+        return false;
+    }
+
+    size_t getNumberOfArguments() const override
+    {
+        return 1;
+    }
+
+    DataTypePtr getReturnTypeImpl(const DataTypes &) const override
+    {
+        return DataTypeFactory::instance().get("Polygon");
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & /*result_type*/, size_t input_rows_count) const override
+    {
+        PolygonSerializer<Point> serializer;
+
+        callOnGeometryDataType<Point>(arguments[0].type, [&] (const auto & type)
+        {
+            using TypeConverter = std::decay_t<decltype(type)>;
+            using Converter = typename TypeConverter::Type;
+
+            if constexpr (std::is_same_v<Converter, ColumnToPointsConverter<Point>>)
+                throw Exception(fmt::format("The argument of function {} must not be a Point", getName()), ErrorCodes::BAD_ARGUMENTS);
+            else
+            {
+                auto geometries = Converter::convert(arguments[0].column->convertToFullColumnIfConst());
+
+                for (size_t i = 0; i < input_rows_count; i++)
+                {
+                    Polygon<Point> convex_hull{};
+                    boost::geometry::convex_hull(geometries[i], convex_hull);
+                    serializer.add(convex_hull);
+                }
+            }
+        }
+        );
+
+        return serializer.finalize();
+    }
+
+    bool useDefaultImplementationForConstants() const override
+    {
+        return true;
+    }
+};
+
+
+template <>
+const char * FunctionPolygonConvexHull<CartesianPoint>::name = "polygonConvexHullCartesian";
+
+
+void registerFunctionPolygonConvexHull(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionPolygonConvexHull<CartesianPoint>>();
+}
+
+}
diff --git a/src/Functions/polygonPerimeter.cpp b/src/Functions/polygonPerimeter.cpp
new file mode 100644
index 00000000000..5a6e293630e
--- /dev/null
+++ b/src/Functions/polygonPerimeter.cpp
@@ -0,0 +1,107 @@
+#include <Functions/FunctionFactory.h>
+#include <Functions/geometryConverters.h>
+
+#include <boost/geometry.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
+
+#include <common/logger_useful.h>
+
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnTuple.h>
+#include <Columns/ColumnsNumber.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeTuple.h>
+#include <DataTypes/DataTypesNumber.h>
+
+#include <memory>
+#include <string>
+
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+}
+
+
+template <typename Point>
+class FunctionPolygonPerimeter : public IFunction
+{
+public:
+    static const char * name;
+
+    explicit FunctionPolygonPerimeter() = default;
+
+    static FunctionPtr create(ContextPtr)
+    {
+        return std::make_shared<FunctionPolygonPerimeter>();
+    }
+
+    String getName() const override
+    {
+        return name;
+    }
+
+    bool isVariadic() const override
+    {
+        return false;
+    }
+
+    size_t getNumberOfArguments() const override
+    {
+        return 1;
+    }
+
+    DataTypePtr getReturnTypeImpl(const DataTypes &) const override
+    {
+        return std::make_shared<DataTypeFloat64>();
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & /*result_type*/, size_t input_rows_count) const override
+    {
+        auto res_column = ColumnFloat64::create();
+        auto & res_data = res_column->getData();
+        res_data.reserve(input_rows_count);
+
+        callOnGeometryDataType<Point>(arguments[0].type, [&] (const auto & type)
+        {
+            using TypeConverter = std::decay_t<decltype(type)>;
+            using Converter = typename TypeConverter::Type;
+
+            if constexpr (std::is_same_v<ColumnToPointsConverter<Point>, Converter>)
+                throw Exception(fmt::format("The argument of function {} must not be Point", getName()), ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+            else
+            {
+                auto geometries = Converter::convert(arguments[0].column->convertToFullColumnIfConst());
+
+                for (size_t i = 0; i < input_rows_count; i++)
+                    res_data.emplace_back(boost::geometry::perimeter(geometries[i]));
+            }
+        }
+        );
+
+        return res_column;
+    }
+
+    bool useDefaultImplementationForConstants() const override
+    {
+        return true;
+    }
+};
+
+template <>
+const char * FunctionPolygonPerimeter<CartesianPoint>::name = "polygonPerimeterCartesian";
+
+template <>
+const char * FunctionPolygonPerimeter<SphericalPoint>::name = "polygonPerimeterSpherical";
+
+
+void registerFunctionPolygonPerimeter(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionPolygonPerimeter<CartesianPoint>>();
+    factory.registerFunction<FunctionPolygonPerimeter<SphericalPoint>>();
+}
+
+
+}
diff --git a/src/Functions/polygonsDistance.cpp b/src/Functions/polygonsDistance.cpp
new file mode 100644
index 00000000000..d6c4ff36e4d
--- /dev/null
+++ b/src/Functions/polygonsDistance.cpp
@@ -0,0 +1,117 @@
+#include <Functions/FunctionFactory.h>
+#include <Functions/geometryConverters.h>
+
+#include <boost/geometry.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
+
+#include <common/logger_useful.h>
+
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnTuple.h>
+#include <Columns/ColumnConst.h>
+#include <Columns/ColumnsNumber.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeTuple.h>
+#include <DataTypes/DataTypeCustomGeo.h>
+
+#include <memory>
+#include <utility>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+}
+
+template <typename Point>
+class FunctionPolygonsDistance : public IFunction
+{
+public:
+    static inline const char * name;
+
+    explicit FunctionPolygonsDistance() = default;
+
+    static FunctionPtr create(ContextPtr)
+    {
+        return std::make_shared<FunctionPolygonsDistance>();
+    }
+
+    String getName() const override
+    {
+        return name;
+    }
+
+    bool isVariadic() const override
+    {
+        return false;
+    }
+
+    size_t getNumberOfArguments() const override
+    {
+        return 2;
+    }
+
+    DataTypePtr getReturnTypeImpl(const DataTypes &) const override
+    {
+        return std::make_shared<DataTypeFloat64>();
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & /*result_type*/, size_t input_rows_count) const override
+    {
+        auto res_column = ColumnFloat64::create();
+        auto & res_data = res_column->getData();
+        res_data.reserve(input_rows_count);
+
+        callOnTwoGeometryDataTypes<Point>(arguments[0].type, arguments[1].type, [&](const auto & left_type, const auto & right_type)
+        {
+            using LeftConverterType = std::decay_t<decltype(left_type)>;
+            using RightConverterType = std::decay_t<decltype(right_type)>;
+
+            using LeftConverter = typename LeftConverterType::Type;
+            using RightConverter = typename RightConverterType::Type;
+
+            if constexpr (std::is_same_v<ColumnToPointsConverter<Point>, LeftConverter> || std::is_same_v<ColumnToPointsConverter<Point>, RightConverter>)
+                throw Exception(fmt::format("Any argument of function {} must not be Point", getName()), ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+            else
+            {
+                auto first = LeftConverter::convert(arguments[0].column->convertToFullColumnIfConst());
+                auto second = RightConverter::convert(arguments[1].column->convertToFullColumnIfConst());
+
+                for (size_t i = 0; i < input_rows_count; i++)
+                {
+                    boost::geometry::correct(first[i]);
+                    boost::geometry::correct(second[i]);
+
+                    res_data.emplace_back(boost::geometry::distance(first[i], second[i]));
+                }
+            }
+        });
+
+        return res_column;
+    }
+
+    bool useDefaultImplementationForConstants() const override
+    {
+        return true;
+    }
+};
+
+template <>
+const char * FunctionPolygonsDistance<CartesianPoint>::name = "polygonsDistanceCartesian";
+
+template <>
+const char * FunctionPolygonsDistance<SphericalPoint>::name = "polygonsDistanceSpherical";
+
+
+void registerFunctionPolygonsDistance(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionPolygonsDistance<CartesianPoint>>();
+    factory.registerFunction<FunctionPolygonsDistance<SphericalPoint>>();
+}
+
+
+}
diff --git a/src/Functions/polygonsEquals.cpp b/src/Functions/polygonsEquals.cpp
new file mode 100644
index 00000000000..9e2902d0528
--- /dev/null
+++ b/src/Functions/polygonsEquals.cpp
@@ -0,0 +1,114 @@
+#include <Functions/FunctionFactory.h>
+#include <Functions/geometryConverters.h>
+
+#include <boost/geometry.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
+
+#include <common/logger_useful.h>
+
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnTuple.h>
+#include <Columns/ColumnConst.h>
+#include <Columns/ColumnsNumber.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeTuple.h>
+#include <DataTypes/DataTypeCustomGeo.h>
+
+#include <memory>
+#include <utility>
+
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+}
+
+template <typename Point>
+class FunctionPolygonsEquals : public IFunction
+{
+public:
+    static const char * name;
+
+    explicit FunctionPolygonsEquals() = default;
+
+    static FunctionPtr create(ContextPtr)
+    {
+        return std::make_shared<FunctionPolygonsEquals>();
+    }
+
+    String getName() const override
+    {
+        return name;
+    }
+
+    bool isVariadic() const override
+    {
+        return false;
+    }
+
+    size_t getNumberOfArguments() const override
+    {
+        return 2;
+    }
+
+    DataTypePtr getReturnTypeImpl(const DataTypes &) const override
+    {
+        return std::make_shared<DataTypeUInt8>();
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & /*result_type*/, size_t input_rows_count) const override
+    {
+        auto res_column = ColumnUInt8::create();
+        auto & res_data = res_column->getData();
+        res_data.reserve(input_rows_count);
+
+        callOnTwoGeometryDataTypes<Point>(arguments[0].type, arguments[1].type, [&](const auto & left_type, const auto & right_type)
+        {
+            using LeftConverterType = std::decay_t<decltype(left_type)>;
+            using RightConverterType = std::decay_t<decltype(right_type)>;
+
+            using LeftConverter = typename LeftConverterType::Type;
+            using RightConverter = typename RightConverterType::Type;
+
+            if constexpr (std::is_same_v<ColumnToPointsConverter<Point>, LeftConverter> || std::is_same_v<ColumnToPointsConverter<Point>, RightConverter>)
+                throw Exception(fmt::format("Any argument of function {} must not be Point", getName()), ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+            else
+            {
+                auto first = LeftConverter::convert(arguments[0].column->convertToFullColumnIfConst());
+                auto second = RightConverter::convert(arguments[1].column->convertToFullColumnIfConst());
+
+                for (size_t i = 0; i < input_rows_count; i++)
+                {
+                    boost::geometry::correct(first[i]);
+                    boost::geometry::correct(second[i]);
+
+                    /// Main work here.
+                    res_data.emplace_back(boost::geometry::equals(first[i], second[i]));
+                }
+            }
+        }
+        );
+
+        return res_column;
+    }
+
+    bool useDefaultImplementationForConstants() const override
+    {
+        return true;
+    }
+};
+
+
+template <>
+const char * FunctionPolygonsEquals<CartesianPoint>::name = "polygonsEqualsCartesian";
+
+
+void registerFunctionPolygonsEquals(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionPolygonsEquals<CartesianPoint>>();
+}
+
+}
diff --git a/src/Functions/polygonsIntersection.cpp b/src/Functions/polygonsIntersection.cpp
new file mode 100644
index 00000000000..699488abab1
--- /dev/null
+++ b/src/Functions/polygonsIntersection.cpp
@@ -0,0 +1,122 @@
+#include <Functions/FunctionFactory.h>
+#include <Functions/geometryConverters.h>
+
+#include <boost/geometry.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
+
+#include <common/logger_useful.h>
+
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnTuple.h>
+#include <Columns/ColumnConst.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeTuple.h>
+#include <DataTypes/DataTypeCustomGeo.h>
+
+#include <memory>
+#include <utility>
+#include <chrono>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+}
+
+template <typename Point>
+class FunctionPolygonsIntersection : public IFunction
+{
+public:
+    static inline const char * name;
+
+    explicit FunctionPolygonsIntersection() = default;
+
+    static FunctionPtr create(ContextPtr)
+    {
+        return std::make_shared<FunctionPolygonsIntersection>();
+    }
+
+    String getName() const override
+    {
+        return name;
+    }
+
+    bool isVariadic() const override
+    {
+        return false;
+    }
+
+    size_t getNumberOfArguments() const override
+    {
+        return 2;
+    }
+
+    DataTypePtr getReturnTypeImpl(const DataTypes &) const override
+    {
+        /// Intersection of each with figure with each could be easily represent as MultiPolygon.
+        return DataTypeFactory::instance().get("MultiPolygon");
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & /*result_type*/, size_t input_rows_count) const override
+    {
+        MultiPolygonSerializer<Point> serializer;
+
+        callOnTwoGeometryDataTypes<Point>(arguments[0].type, arguments[1].type, [&](const auto & left_type, const auto & right_type)
+        {
+            using LeftConverterType = std::decay_t<decltype(left_type)>;
+            using RightConverterType = std::decay_t<decltype(right_type)>;
+
+            using LeftConverter = typename LeftConverterType::Type;
+            using RightConverter = typename RightConverterType::Type;
+
+            if constexpr (std::is_same_v<ColumnToPointsConverter<Point>, LeftConverter> || std::is_same_v<ColumnToPointsConverter<Point>, RightConverter>)
+                throw Exception(fmt::format("Any argument of function {} must not be Point", getName()), ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+            else
+            {
+                auto first = LeftConverter::convert(arguments[0].column->convertToFullColumnIfConst());
+                auto second = RightConverter::convert(arguments[1].column->convertToFullColumnIfConst());
+
+                /// We are not interested in some pitfalls in third-party libraries
+                /// NOLINTNEXTLINE(clang-analyzer-core.uninitialized.Assign)
+                for (size_t i = 0; i < input_rows_count; ++i)
+                {
+                    /// Orient the polygons correctly.
+                    boost::geometry::correct(first[i]);
+                    boost::geometry::correct(second[i]);
+
+                    MultiPolygon<Point> intersection{};
+                    /// Main work here.
+                    boost::geometry::intersection(first[i], second[i], intersection);
+
+                    serializer.add(intersection);
+                }
+            }
+        });
+
+        return serializer.finalize();
+    }
+
+    bool useDefaultImplementationForConstants() const override
+    {
+        return true;
+    }
+};
+
+
+template <>
+const char * FunctionPolygonsIntersection<CartesianPoint>::name = "polygonsIntersectionCartesian";
+
+template <>
+const char * FunctionPolygonsIntersection<SphericalPoint>::name = "polygonsIntersectionSpherical";
+
+
+void registerFunctionPolygonsIntersection(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionPolygonsIntersection<CartesianPoint>>();
+    factory.registerFunction<FunctionPolygonsIntersection<SphericalPoint>>();
+}
+
+}
diff --git a/src/Functions/polygonsSymDifference.cpp b/src/Functions/polygonsSymDifference.cpp
new file mode 100644
index 00000000000..129e553f060
--- /dev/null
+++ b/src/Functions/polygonsSymDifference.cpp
@@ -0,0 +1,116 @@
+#include <Functions/FunctionFactory.h>
+#include <Functions/geometryConverters.h>
+
+#include <boost/geometry.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
+
+#include <common/logger_useful.h>
+
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnTuple.h>
+#include <Columns/ColumnConst.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeTuple.h>
+#include <DataTypes/DataTypeCustomGeo.h>
+
+#include <memory>
+#include <utility>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+}
+
+
+template <typename Point>
+class FunctionPolygonsSymDifference : public IFunction
+{
+public:
+    static const char * name;
+
+    explicit FunctionPolygonsSymDifference() = default;
+
+    static FunctionPtr create(ContextPtr)
+    {
+        return std::make_shared<FunctionPolygonsSymDifference>();
+    }
+
+    String getName() const override
+    {
+        return name;
+    }
+
+    bool isVariadic() const override
+    {
+        return false;
+    }
+
+    size_t getNumberOfArguments() const override
+    {
+        return 2;
+    }
+
+    DataTypePtr getReturnTypeImpl(const DataTypes &) const override
+    {
+        return DataTypeFactory::instance().get("MultiPolygon");
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & /*result_type*/, size_t input_rows_count) const override
+    {
+        MultiPolygonSerializer<Point> serializer;
+
+        callOnTwoGeometryDataTypes<Point>(arguments[0].type, arguments[1].type, [&](const auto & left_type, const auto & right_type)
+        {
+            using LeftConverterType = std::decay_t<decltype(left_type)>;
+            using RightConverterType = std::decay_t<decltype(right_type)>;
+
+            using LeftConverter = typename LeftConverterType::Type;
+            using RightConverter = typename RightConverterType::Type;
+
+            if constexpr (std::is_same_v<ColumnToPointsConverter<Point>, LeftConverter> || std::is_same_v<ColumnToPointsConverter<Point>, RightConverter>)
+                throw Exception(fmt::format("Any argument of function {} must not be Point", getName()), ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+            else
+            {
+                auto first = LeftConverter::convert(arguments[0].column->convertToFullColumnIfConst());
+                auto second = RightConverter::convert(arguments[1].column->convertToFullColumnIfConst());
+
+                /// NOLINTNEXTLINE(clang-analyzer-core.uninitialized.Assign)
+                for (size_t i = 0; i < input_rows_count; i++)
+                {
+                    boost::geometry::correct(first[i]);
+                    boost::geometry::correct(second[i]);
+
+                    MultiPolygon<Point> sym_difference{};
+                    boost::geometry::sym_difference(first[i], second[i], sym_difference);
+
+                    serializer.add(sym_difference);
+                }
+            }
+        });
+
+        return serializer.finalize();
+    }
+
+    bool useDefaultImplementationForConstants() const override
+    {
+        return true;
+    }
+};
+
+template <>
+const char * FunctionPolygonsSymDifference<CartesianPoint>::name = "polygonsSymDifferenceCartesian";
+
+template <>
+const char * FunctionPolygonsSymDifference<SphericalPoint>::name = "polygonsSymDifferenceSpherical";
+
+void registerFunctionPolygonsSymDifference(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionPolygonsSymDifference<CartesianPoint>>();
+    factory.registerFunction<FunctionPolygonsSymDifference<SphericalPoint>>();
+}
+
+}
diff --git a/src/Functions/polygonsUnion.cpp b/src/Functions/polygonsUnion.cpp
new file mode 100644
index 00000000000..e7281c299d0
--- /dev/null
+++ b/src/Functions/polygonsUnion.cpp
@@ -0,0 +1,120 @@
+#include <Functions/FunctionFactory.h>
+#include <Functions/geometryConverters.h>
+
+#include <boost/geometry.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
+
+#include <common/logger_useful.h>
+
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnTuple.h>
+#include <Columns/ColumnConst.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeTuple.h>
+#include <DataTypes/DataTypeCustomGeo.h>
+
+#include <memory>
+#include <string>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+}
+
+
+template <typename Point>
+class FunctionPolygonsUnion : public IFunction
+{
+public:
+    static inline const char * name;
+
+    explicit FunctionPolygonsUnion() = default;
+
+    static FunctionPtr create(ContextPtr)
+    {
+        return std::make_shared<FunctionPolygonsUnion>();
+    }
+
+    String getName() const override
+    {
+        return name;
+    }
+
+    bool isVariadic() const override
+    {
+        return false;
+    }
+
+    size_t getNumberOfArguments() const override
+    {
+        return 2;
+    }
+
+    DataTypePtr getReturnTypeImpl(const DataTypes &) const override
+    {
+        return DataTypeFactory::instance().get("MultiPolygon");
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & /*result_type*/, size_t input_rows_count) const override
+    {
+        MultiPolygonSerializer<Point> serializer;
+
+        callOnTwoGeometryDataTypes<Point>(arguments[0].type, arguments[1].type, [&](const auto & left_type, const auto & right_type)
+        {
+            using LeftConverterType = std::decay_t<decltype(left_type)>;
+            using RightConverterType = std::decay_t<decltype(right_type)>;
+
+            using LeftConverter = typename LeftConverterType::Type;
+            using RightConverter = typename RightConverterType::Type;
+
+            if constexpr (std::is_same_v<ColumnToPointsConverter<Point>, LeftConverter> || std::is_same_v<ColumnToPointsConverter<Point>, RightConverter>)
+                throw Exception(fmt::format("Any argument of function {} must not be Point", getName()), ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+            else
+            {
+                auto first = LeftConverter::convert(arguments[0].column->convertToFullColumnIfConst());
+                auto second = RightConverter::convert(arguments[1].column->convertToFullColumnIfConst());
+
+                /// We are not interested in some pitfalls in third-party libraries
+                /// NOLINTNEXTLINE(clang-analyzer-core.uninitialized.Assign)
+                for (size_t i = 0; i < input_rows_count; i++)
+                {
+                    /// Orient the polygons correctly.
+                    boost::geometry::correct(first[i]);
+                    boost::geometry::correct(second[i]);
+
+                    MultiPolygon<Point> polygons_union{};
+                    /// Main work here.
+                    boost::geometry::union_(first[i], second[i], polygons_union);
+
+                    serializer.add(polygons_union);
+                }
+            }
+        });
+
+        return serializer.finalize();
+    }
+
+    bool useDefaultImplementationForConstants() const override
+    {
+        return true;
+    }
+};
+
+template <>
+const char * FunctionPolygonsUnion<CartesianPoint>::name = "polygonsUnionCartesian";
+
+template <>
+const char * FunctionPolygonsUnion<SphericalPoint>::name = "polygonsUnionSpherical";
+
+
+void registerFunctionPolygonsUnion(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionPolygonsUnion<CartesianPoint>>();
+    factory.registerFunction<FunctionPolygonsUnion<SphericalPoint>>();
+}
+
+}
diff --git a/src/Functions/polygonsWithin.cpp b/src/Functions/polygonsWithin.cpp
new file mode 100644
index 00000000000..2fd5b7e2225
--- /dev/null
+++ b/src/Functions/polygonsWithin.cpp
@@ -0,0 +1,119 @@
+#include <Functions/FunctionFactory.h>
+#include <Functions/geometryConverters.h>
+
+#include <boost/geometry.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
+
+#include <common/logger_useful.h>
+
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnTuple.h>
+#include <Columns/ColumnConst.h>
+#include <Columns/ColumnsNumber.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeTuple.h>
+#include <DataTypes/DataTypeCustomGeo.h>
+
+#include <memory>
+#include <utility>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+}
+
+
+template <typename Point>
+class FunctionPolygonsWithin : public IFunction
+{
+public:
+    static inline const char * name;
+
+    explicit FunctionPolygonsWithin() = default;
+
+    static FunctionPtr create(ContextPtr)
+    {
+        return std::make_shared<FunctionPolygonsWithin>();
+    }
+
+    String getName() const override
+    {
+        return name;
+    }
+
+    bool isVariadic() const override
+    {
+        return false;
+    }
+
+    size_t getNumberOfArguments() const override
+    {
+        return 2;
+    }
+
+    DataTypePtr getReturnTypeImpl(const DataTypes &) const override
+    {
+        return std::make_shared<DataTypeUInt8>();
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & /*result_type*/, size_t input_rows_count) const override
+    {
+        auto res_column = ColumnUInt8::create();
+        auto & res_data = res_column->getData();
+        res_data.reserve(input_rows_count);
+
+        callOnTwoGeometryDataTypes<Point>(arguments[0].type, arguments[1].type, [&](const auto & left_type, const auto & right_type)
+        {
+            using LeftConverterType = std::decay_t<decltype(left_type)>;
+            using RightConverterType = std::decay_t<decltype(right_type)>;
+
+            using LeftConverter = typename LeftConverterType::Type;
+            using RightConverter = typename RightConverterType::Type;
+
+            if constexpr (std::is_same_v<ColumnToPointsConverter<Point>, LeftConverter> || std::is_same_v<ColumnToPointsConverter<Point>, RightConverter>)
+                throw Exception(fmt::format("Any argument of function {} must not be Point", getName()), ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+            else
+            {
+                auto first = LeftConverter::convert(arguments[0].column->convertToFullColumnIfConst());
+                auto second = RightConverter::convert(arguments[1].column->convertToFullColumnIfConst());
+
+                /// NOLINTNEXTLINE(clang-analyzer-core.uninitialized.Assign)
+                for (size_t i = 0; i < input_rows_count; i++)
+                {
+                    boost::geometry::correct(first[i]);
+                    boost::geometry::correct(second[i]);
+
+                    res_data.emplace_back(boost::geometry::within(first[i], second[i]));
+                }
+            }
+        });
+
+        return res_column;
+    }
+
+    bool useDefaultImplementationForConstants() const override
+    {
+        return true;
+    }
+};
+
+
+template <>
+const char * FunctionPolygonsWithin<CartesianPoint>::name = "polygonsWithinCartesian";
+
+template <>
+const char * FunctionPolygonsWithin<SphericalPoint>::name = "polygonsWithinSpherical";
+
+
+void registerFunctionPolygonsWithin(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionPolygonsWithin<CartesianPoint>>();
+    factory.registerFunction<FunctionPolygonsWithin<SphericalPoint>>();
+}
+
+}
diff --git a/src/Functions/randConstant.cpp b/src/Functions/randConstant.cpp
index acc178ae974..f1164beda8d 100644
--- a/src/Functions/randConstant.cpp
+++ b/src/Functions/randConstant.cpp
@@ -79,7 +79,7 @@ public:
     bool isVariadic() const override { return true; }
     size_t getNumberOfArguments() const override { return 0; }
 
-    static FunctionOverloadResolverImplPtr create(const Context &)
+    static FunctionOverloadResolverImplPtr create(ContextPtr)
     {
         return std::make_unique<RandomConstantOverloadResolver<ToType, Name>>();
     }
diff --git a/src/Functions/randomFixedString.cpp b/src/Functions/randomFixedString.cpp
index 2e493ddb43d..b358fc72ba6 100644
--- a/src/Functions/randomFixedString.cpp
+++ b/src/Functions/randomFixedString.cpp
@@ -77,7 +77,7 @@ public:
 class FunctionRandomFixedString : public FunctionRandomFixedStringImpl<TargetSpecific::Default::RandImpl>
 {
 public:
-    explicit FunctionRandomFixedString(const Context & context) : selector(context)
+    explicit FunctionRandomFixedString(ContextPtr context) : selector(context)
     {
         selector.registerImplementation<TargetArch::Default,
             FunctionRandomFixedStringImpl<TargetSpecific::Default::RandImpl>>();
@@ -93,7 +93,7 @@ public:
         return selector.selectAndExecute(arguments, result_type, input_rows_count);
     }
 
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextPtr context)
     {
         return std::make_shared<FunctionRandomFixedString>(context);
     }
diff --git a/src/Functions/randomPrintableASCII.cpp b/src/Functions/randomPrintableASCII.cpp
index ce7f809c151..c70163b237d 100644
--- a/src/Functions/randomPrintableASCII.cpp
+++ b/src/Functions/randomPrintableASCII.cpp
@@ -27,7 +27,7 @@ class FunctionRandomPrintableASCII : public IFunction
 {
 public:
     static constexpr auto name = "randomPrintableASCII";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionRandomPrintableASCII>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionRandomPrintableASCII>(); }
 
     String getName() const override
     {
diff --git a/src/Functions/randomString.cpp b/src/Functions/randomString.cpp
index f51a75c0422..4cc108b1afe 100644
--- a/src/Functions/randomString.cpp
+++ b/src/Functions/randomString.cpp
@@ -97,7 +97,7 @@ public:
 class FunctionRandomString : public FunctionRandomStringImpl<TargetSpecific::Default::RandImpl>
 {
 public:
-    explicit FunctionRandomString(const Context & context) : selector(context)
+    explicit FunctionRandomString(ContextPtr context) : selector(context)
     {
         selector.registerImplementation<TargetArch::Default,
             FunctionRandomStringImpl<TargetSpecific::Default::RandImpl>>();
@@ -113,7 +113,7 @@ public:
         return selector.selectAndExecute(arguments, result_type, input_rows_count);
     }
 
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextPtr context)
     {
         return std::make_shared<FunctionRandomString>(context);
     }
diff --git a/src/Functions/randomStringUTF8.cpp b/src/Functions/randomStringUTF8.cpp
index 163092226f2..7c19993bfaa 100644
--- a/src/Functions/randomStringUTF8.cpp
+++ b/src/Functions/randomStringUTF8.cpp
@@ -30,7 +30,7 @@ class FunctionRandomStringUTF8 : public IFunction
 public:
     static constexpr auto name = "randomStringUTF8";
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionRandomStringUTF8>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionRandomStringUTF8>(); }
 
     String getName() const override { return name; }
 
diff --git a/src/Functions/readWkt.cpp b/src/Functions/readWkt.cpp
new file mode 100644
index 00000000000..2ce4becb01c
--- /dev/null
+++ b/src/Functions/readWkt.cpp
@@ -0,0 +1,105 @@
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeCustomGeo.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/FunctionHelpers.h>
+#include <Functions/geometryConverters.h>
+#include <Columns/ColumnString.h>
+
+#include <string>
+#include <memory>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+}
+
+
+template <class DataTypeName, class Geometry, class Serializer, class NameHolder>
+class FunctionReadWkt : public IFunction
+{
+public:
+    explicit FunctionReadWkt() = default;
+
+    static constexpr const char * name = NameHolder::name;
+
+    String getName() const override
+    {
+        return name;
+    }
+
+    size_t getNumberOfArguments() const override
+    {
+        return 1;
+    }
+
+    DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
+    {
+        if (checkAndGetDataType<DataTypeString>(arguments[0].get()) == nullptr)
+        {
+            throw Exception("First argument should be String",
+                    ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+        }
+
+        return DataTypeFactory::instance().get(DataTypeName().getName());
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & /*result_type*/, size_t input_rows_count) const override
+    {
+        const auto * column_string = checkAndGetColumn<ColumnString>(arguments[0].column.get());
+
+        Serializer serializer;
+        Geometry geometry;
+
+        for (size_t i = 0; i < input_rows_count; i++)
+        {
+            const auto & str = column_string->getDataAt(i).toString();
+            boost::geometry::read_wkt(str, geometry);
+            serializer.add(geometry);
+        }
+
+        return serializer.finalize();
+    }
+
+    bool useDefaultImplementationForConstants() const override
+    {
+        return true;
+    }
+
+    static FunctionPtr create(ContextPtr)
+    {
+        return std::make_shared<FunctionReadWkt<DataTypeName, Geometry, Serializer, NameHolder>>();
+    }
+};
+
+struct ReadWktPointNameHolder
+{
+    static constexpr const char * name = "readWktPoint";
+};
+
+struct ReadWktRingNameHolder
+{
+    static constexpr const char * name = "readWktRing";
+};
+
+struct ReadWktPolygonNameHolder
+{
+    static constexpr const char * name = "readWktPolygon";
+};
+
+struct ReadWktMultiPolygonNameHolder
+{
+    static constexpr const char * name = "readWktMultiPolygon";
+};
+
+void registerFunctionReadWkt(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionReadWkt<DataTypePointName, CartesianPoint, PointSerializer<CartesianPoint>, ReadWktPointNameHolder>>();
+    factory.registerFunction<FunctionReadWkt<DataTypeRingName, CartesianRing, RingSerializer<CartesianPoint>, ReadWktRingNameHolder>>();
+    factory.registerFunction<FunctionReadWkt<DataTypePolygonName, CartesianPolygon, PolygonSerializer<CartesianPoint>, ReadWktPolygonNameHolder>>();
+    factory.registerFunction<FunctionReadWkt<DataTypeMultiPolygonName, CartesianMultiPolygon, MultiPolygonSerializer<CartesianPoint>, ReadWktMultiPolygonNameHolder>>();
+}
+
+}
diff --git a/src/Functions/regexpQuoteMeta.cpp b/src/Functions/regexpQuoteMeta.cpp
index a5ab5166fe3..0f1ec476a3b 100644
--- a/src/Functions/regexpQuoteMeta.cpp
+++ b/src/Functions/regexpQuoteMeta.cpp
@@ -21,7 +21,7 @@ class FunctionRegexpQuoteMeta : public IFunction
 public:
     static constexpr auto name = "regexpQuoteMeta";
 
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextPtr)
     {
         return std::make_shared<FunctionRegexpQuoteMeta>();
     }
diff --git a/src/Functions/registerFunctions.cpp b/src/Functions/registerFunctions.cpp
index d827cc40a86..6db0f9183b2 100644
--- a/src/Functions/registerFunctions.cpp
+++ b/src/Functions/registerFunctions.cpp
@@ -45,6 +45,7 @@ void registerFunctionsUnixTimestamp64(FunctionFactory & factory);
 void registerFunctionBitHammingDistance(FunctionFactory & factory);
 void registerFunctionTupleHammingDistance(FunctionFactory & factory);
 void registerFunctionsStringHash(FunctionFactory & factory);
+void registerFunctionValidateNestedArraySizes(FunctionFactory & factory);
 #if !defined(ARCADIA_BUILD)
 void registerFunctionBayesAB(FunctionFactory &);
 #endif
@@ -103,6 +104,7 @@ void registerFunctions()
     registerFunctionBitHammingDistance(factory);
     registerFunctionTupleHammingDistance(factory);
     registerFunctionsStringHash(factory);
+    registerFunctionValidateNestedArraySizes(factory);
 
 #if !defined(ARCADIA_BUILD)
     registerFunctionBayesAB(factory);
diff --git a/src/Functions/registerFunctionsGeo.cpp b/src/Functions/registerFunctionsGeo.cpp
index 2ed02bbd73b..605dd4dcba0 100644
--- a/src/Functions/registerFunctionsGeo.cpp
+++ b/src/Functions/registerFunctionsGeo.cpp
@@ -10,9 +10,21 @@ class FunctionFactory;
 void registerFunctionGeoDistance(FunctionFactory & factory);
 void registerFunctionPointInEllipses(FunctionFactory & factory);
 void registerFunctionPointInPolygon(FunctionFactory & factory);
+void registerFunctionPolygonsIntersection(FunctionFactory & factory);
+void registerFunctionPolygonsUnion(FunctionFactory & factory);
+void registerFunctionPolygonArea(FunctionFactory & factory);
+void registerFunctionPolygonConvexHull(FunctionFactory & factory);
+void registerFunctionPolygonsSymDifference(FunctionFactory & factory);
+void registerFunctionPolygonsEquals(FunctionFactory & factory);
+void registerFunctionPolygonsDistance(FunctionFactory & factory);
+void registerFunctionPolygonsWithin(FunctionFactory & factory);
+void registerFunctionPolygonPerimeter(FunctionFactory & factory);
 void registerFunctionGeohashEncode(FunctionFactory & factory);
 void registerFunctionGeohashDecode(FunctionFactory & factory);
 void registerFunctionGeohashesInBox(FunctionFactory & factory);
+void registerFunctionWkt(FunctionFactory & factory);
+void registerFunctionReadWkt(FunctionFactory & factory);
+void registerFunctionSvg(FunctionFactory & factory);
 
 #if USE_H3
 void registerFunctionGeoToH3(FunctionFactory &);
@@ -36,9 +48,21 @@ void registerFunctionsGeo(FunctionFactory & factory)
     registerFunctionGeoDistance(factory);
     registerFunctionPointInEllipses(factory);
     registerFunctionPointInPolygon(factory);
+    registerFunctionPolygonsIntersection(factory);
+    registerFunctionPolygonsUnion(factory);
+    registerFunctionPolygonArea(factory);
+    registerFunctionPolygonConvexHull(factory);
+    registerFunctionPolygonsSymDifference(factory);
+    registerFunctionPolygonsEquals(factory);
+    registerFunctionPolygonsDistance(factory);
+    registerFunctionPolygonsWithin(factory);
+    registerFunctionPolygonPerimeter(factory);
     registerFunctionGeohashEncode(factory);
     registerFunctionGeohashDecode(factory);
     registerFunctionGeohashesInBox(factory);
+    registerFunctionWkt(factory);
+    registerFunctionReadWkt(factory);
+    registerFunctionSvg(factory);
 
 #if USE_H3
     registerFunctionGeoToH3(factory);
diff --git a/src/Functions/registerFunctionsMiscellaneous.cpp b/src/Functions/registerFunctionsMiscellaneous.cpp
index 3438145981b..3403390ea72 100644
--- a/src/Functions/registerFunctionsMiscellaneous.cpp
+++ b/src/Functions/registerFunctionsMiscellaneous.cpp
@@ -28,6 +28,7 @@ void registerFunctionSleep(FunctionFactory &);
 void registerFunctionSleepEachRow(FunctionFactory &);
 void registerFunctionMaterialize(FunctionFactory &);
 void registerFunctionIgnore(FunctionFactory &);
+void registerFunctionIndexHint(FunctionFactory &);
 void registerFunctionIdentity(FunctionFactory &);
 void registerFunctionArrayJoin(FunctionFactory &);
 void registerFunctionReplicate(FunctionFactory &);
@@ -41,7 +42,8 @@ void registerFunctionThrowIf(FunctionFactory &);
 void registerFunctionVersion(FunctionFactory &);
 void registerFunctionBuildId(FunctionFactory &);
 void registerFunctionUptime(FunctionFactory &);
-void registerFunctionTimeZone(FunctionFactory &);
+void registerFunctionTimezone(FunctionFactory &);
+void registerFunctionTimezoneOf(FunctionFactory &);
 void registerFunctionRunningAccumulate(FunctionFactory &);
 void registerFunctionRunningDifference(FunctionFactory &);
 void registerFunctionRunningDifferenceStartingWithFirstValue(FunctionFactory &);
@@ -69,6 +71,9 @@ void registerFunctionErrorCodeToName(FunctionFactory &);
 void registerFunctionTcpPort(FunctionFactory &);
 void registerFunctionByteSize(FunctionFactory &);
 void registerFunctionFile(FunctionFactory & factory);
+void registerFunctionConnectionId(FunctionFactory & factory);
+void registerFunctionPartitionId(FunctionFactory & factory);
+void registerFunctionIsIPAddressContainedIn(FunctionFactory &);
 
 #if USE_ICU
 void registerFunctionConvertCharset(FunctionFactory &);
@@ -97,6 +102,7 @@ void registerFunctionsMiscellaneous(FunctionFactory & factory)
     registerFunctionSleepEachRow(factory);
     registerFunctionMaterialize(factory);
     registerFunctionIgnore(factory);
+    registerFunctionIndexHint(factory);
     registerFunctionIdentity(factory);
     registerFunctionArrayJoin(factory);
     registerFunctionReplicate(factory);
@@ -110,7 +116,8 @@ void registerFunctionsMiscellaneous(FunctionFactory & factory)
     registerFunctionVersion(factory);
     registerFunctionBuildId(factory);
     registerFunctionUptime(factory);
-    registerFunctionTimeZone(factory);
+    registerFunctionTimezone(factory);
+    registerFunctionTimezoneOf(factory);
     registerFunctionRunningAccumulate(factory);
     registerFunctionRunningDifference(factory);
     registerFunctionRunningDifferenceStartingWithFirstValue(factory);
@@ -138,6 +145,9 @@ void registerFunctionsMiscellaneous(FunctionFactory & factory)
     registerFunctionTcpPort(factory);
     registerFunctionByteSize(factory);
     registerFunctionFile(factory);
+    registerFunctionConnectionId(factory);
+    registerFunctionPartitionId(factory);
+    registerFunctionIsIPAddressContainedIn(factory);
 
 #if USE_ICU
     registerFunctionConvertCharset(factory);
diff --git a/src/Functions/registerFunctionsString.cpp b/src/Functions/registerFunctionsString.cpp
index b6327dfb92f..f6f95489f82 100644
--- a/src/Functions/registerFunctionsString.cpp
+++ b/src/Functions/registerFunctionsString.cpp
@@ -6,9 +6,7 @@ namespace DB
 {
 
 class FunctionFactory;
-#if USE_HYPERSCAN
-void registerFunctionHtmlOrXmlCoarseParse(FunctionFactory &);
-#endif
+
 void registerFunctionRepeat(FunctionFactory &);
 void registerFunctionEmpty(FunctionFactory &);
 void registerFunctionNotEmpty(FunctionFactory &);
@@ -35,8 +33,9 @@ void registerFunctionRegexpQuoteMeta(FunctionFactory &);
 void registerFunctionNormalizeQuery(FunctionFactory &);
 void registerFunctionNormalizedQueryHash(FunctionFactory &);
 void registerFunctionCountMatches(FunctionFactory &);
-void registerFunctionEncodeXMLComponent(FunctionFactory & factory);
-void registerFunctionDecodeXMLComponent(FunctionFactory & factory);
+void registerFunctionEncodeXMLComponent(FunctionFactory &);
+void registerFunctionDecodeXMLComponent(FunctionFactory &);
+void registerFunctionExtractTextFromHTML(FunctionFactory &);
 
 
 #if USE_BASE64
@@ -47,9 +46,6 @@ void registerFunctionTryBase64Decode(FunctionFactory &);
 
 void registerFunctionsString(FunctionFactory & factory)
 {
-#if USE_HYPERSCAN
-    registerFunctionHtmlOrXmlCoarseParse(factory);
-#endif
     registerFunctionRepeat(factory);
     registerFunctionEmpty(factory);
     registerFunctionNotEmpty(factory);
@@ -78,6 +74,7 @@ void registerFunctionsString(FunctionFactory & factory)
     registerFunctionCountMatches(factory);
     registerFunctionEncodeXMLComponent(factory);
     registerFunctionDecodeXMLComponent(factory);
+    registerFunctionExtractTextFromHTML(factory);
 #if USE_BASE64
     registerFunctionBase64Encode(factory);
     registerFunctionBase64Decode(factory);
diff --git a/src/Functions/reinterpretAs.cpp b/src/Functions/reinterpretAs.cpp
index 3f4ba3d23e1..f8a7b8eec84 100644
--- a/src/Functions/reinterpretAs.cpp
+++ b/src/Functions/reinterpretAs.cpp
@@ -47,7 +47,7 @@ class FunctionReinterpret : public IFunction
 public:
     static constexpr auto name = "reinterpret";
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionReinterpret>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionReinterpret>(); }
 
     String getName() const override { return name; }
 
@@ -349,7 +349,7 @@ class FunctionReinterpretAs : public IFunction
 {
 public:
     static constexpr auto name = Name::name;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionReinterpretAs>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionReinterpretAs>(); }
 
     String getName() const override { return name; }
 
diff --git a/src/Functions/repeat.cpp b/src/Functions/repeat.cpp
index 29347d6a275..221dc11a43d 100644
--- a/src/Functions/repeat.cpp
+++ b/src/Functions/repeat.cpp
@@ -173,7 +173,7 @@ class FunctionRepeat : public IFunction
 
 public:
     static constexpr auto name = "repeat";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionRepeat>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionRepeat>(); }
 
     String getName() const override { return name; }
 
diff --git a/src/Functions/replicate.cpp b/src/Functions/replicate.cpp
index ca391bec6ce..4a452498417 100644
--- a/src/Functions/replicate.cpp
+++ b/src/Functions/replicate.cpp
@@ -4,6 +4,7 @@
 #include <Functions/FunctionHelpers.h>
 #include <DataTypes/DataTypeArray.h>
 #include <Columns/ColumnArray.h>
+#include <Interpreters/Context.h>
 
 
 namespace DB
diff --git a/src/Functions/replicate.h b/src/Functions/replicate.h
index 9a33951b2a3..a778114ffe9 100644
--- a/src/Functions/replicate.h
+++ b/src/Functions/replicate.h
@@ -1,11 +1,11 @@
 #pragma once
+
 #include <Functions/IFunctionImpl.h>
+#include <Interpreters/Context_fwd.h>
 
 namespace DB
 {
 
-class Context;
-
 /// Creates an array, multiplying the column (the first argument) by the number of elements in the array (the second argument).
 /// Function may accept more then two arguments. If so, the first array with non-empty offsets is chosen.
 class FunctionReplicate : public IFunction
@@ -13,7 +13,7 @@ class FunctionReplicate : public IFunction
 public:
     static constexpr auto name = "replicate";
 
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextPtr)
     {
         return std::make_shared<FunctionReplicate>();
     }
diff --git a/src/Functions/reverse.cpp b/src/Functions/reverse.cpp
index 16676eaa936..ec29958dd48 100644
--- a/src/Functions/reverse.cpp
+++ b/src/Functions/reverse.cpp
@@ -57,7 +57,7 @@ class FunctionReverse : public IFunction
 {
 public:
     static constexpr auto name = "reverse";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextPtr)
     {
         return std::make_shared<FunctionReverse>();
     }
@@ -117,9 +117,9 @@ class ReverseOverloadResolver : public IFunctionOverloadResolverImpl
 {
 public:
     static constexpr auto name = "reverse";
-    static FunctionOverloadResolverImplPtr create(const Context & context) { return std::make_unique<ReverseOverloadResolver>(context); }
+    static FunctionOverloadResolverImplPtr create(ContextPtr context) { return std::make_unique<ReverseOverloadResolver>(context); }
 
-    explicit ReverseOverloadResolver(const Context & context_) : context(context_) {}
+    explicit ReverseOverloadResolver(ContextPtr context_) : context(context_) {}
 
     String getName() const override { return name; }
     size_t getNumberOfArguments() const override { return 1; }
@@ -141,7 +141,7 @@ public:
     }
 
 private:
-    const Context & context;
+    ContextPtr context;
 };
 
 }
diff --git a/src/Functions/rowNumberInAllBlocks.cpp b/src/Functions/rowNumberInAllBlocks.cpp
index 3aeaade7137..06b6e7c81b0 100644
--- a/src/Functions/rowNumberInAllBlocks.cpp
+++ b/src/Functions/rowNumberInAllBlocks.cpp
@@ -18,7 +18,7 @@ private:
 
 public:
     static constexpr auto name = "rowNumberInAllBlocks";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextPtr)
     {
         return std::make_shared<FunctionRowNumberInAllBlocks>();
     }
diff --git a/src/Functions/rowNumberInBlock.cpp b/src/Functions/rowNumberInBlock.cpp
index 0a5cf63041f..7359a1c5f40 100644
--- a/src/Functions/rowNumberInBlock.cpp
+++ b/src/Functions/rowNumberInBlock.cpp
@@ -13,7 +13,7 @@ class FunctionRowNumberInBlock : public IFunction
 {
 public:
     static constexpr auto name = "rowNumberInBlock";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextPtr)
     {
         return std::make_shared<FunctionRowNumberInBlock>();
     }
diff --git a/src/Functions/runningAccumulate.cpp b/src/Functions/runningAccumulate.cpp
index 1a01b88e22c..7c1b1f7162e 100644
--- a/src/Functions/runningAccumulate.cpp
+++ b/src/Functions/runningAccumulate.cpp
@@ -5,7 +5,7 @@
 #include <DataTypes/DataTypeAggregateFunction.h>
 #include <Common/AlignedBuffer.h>
 #include <Common/Arena.h>
-#include <ext/scope_guard.h>
+#include <ext/scope_guard_safe.h>
 
 
 namespace DB
@@ -33,7 +33,7 @@ class FunctionRunningAccumulate : public IFunction
 {
 public:
     static constexpr auto name = "runningAccumulate";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextPtr)
     {
         return std::make_shared<FunctionRunningAccumulate>();
     }
@@ -104,7 +104,7 @@ public:
         const auto & states = column_with_states->getData();
 
         bool state_created = false;
-        SCOPE_EXIT({
+        SCOPE_EXIT_MEMORY_SAFE({
             if (state_created)
                 agg_func.destroy(place.data());
         });
diff --git a/src/Functions/runningConcurrency.cpp b/src/Functions/runningConcurrency.cpp
index a225e3152e7..8403fc93c33 100644
--- a/src/Functions/runningConcurrency.cpp
+++ b/src/Functions/runningConcurrency.cpp
@@ -47,6 +47,8 @@ namespace DB
             typename ColVecConc::Container & vec_concurrency = col_concurrency->getData();
 
             std::multiset<typename ArgDataType::FieldType> ongoing_until;
+            auto begin_serializaion = arguments[0].type->getDefaultSerialization();
+            auto end_serialization = arguments[1].type->getDefaultSerialization();
             for (size_t i = 0; i < input_rows_count; ++i)
             {
                 const auto begin = vec_begin[i];
@@ -56,8 +58,8 @@ namespace DB
                 {
                     const FormatSettings default_format;
                     WriteBufferFromOwnString buf_begin, buf_end;
-                    arguments[0].type->serializeAsTextQuoted(*(arguments[0].column), i, buf_begin, default_format);
-                    arguments[1].type->serializeAsTextQuoted(*(arguments[1].column), i, buf_end, default_format);
+                    begin_serializaion->serializeTextQuoted(*(arguments[0].column), i, buf_begin, default_format);
+                    end_serialization->serializeTextQuoted(*(arguments[1].column), i, buf_end, default_format);
                     throw Exception(
                         "Incorrect order of events: " + buf_begin.str() + " > " + buf_end.str(),
                         ErrorCodes::INCORRECT_DATA);
@@ -152,7 +154,7 @@ namespace DB
     public:
         static constexpr auto name = Name::name;
 
-        static FunctionOverloadResolverImplPtr create(const Context &)
+        static FunctionOverloadResolverImplPtr create(ContextPtr)
         {
             return std::make_unique<RunningConcurrencyOverloadResolver<Name, ConcurrencyDataType>>();
         }
diff --git a/src/Functions/runningDifference.h b/src/Functions/runningDifference.h
index db32b5f9a3f..4cd53d7b53a 100644
--- a/src/Functions/runningDifference.h
+++ b/src/Functions/runningDifference.h
@@ -124,7 +124,7 @@ private:
 public:
     static constexpr auto name = FunctionRunningDifferenceName<is_first_line_zero>::name;
 
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextPtr)
     {
         return std::make_shared<FunctionRunningDifferenceImpl<is_first_line_zero>>();
     }
diff --git a/src/Functions/sleep.h b/src/Functions/sleep.h
index 65566e36d1f..a3de2d13677 100644
--- a/src/Functions/sleep.h
+++ b/src/Functions/sleep.h
@@ -8,6 +8,7 @@
 #include <Common/assert_cast.h>
 #include <common/sleep.h>
 #include <IO/WriteHelpers.h>
+#include <Interpreters/Context_fwd.h>
 
 
 namespace DB
@@ -35,7 +36,7 @@ class FunctionSleep : public IFunction
 {
 public:
     static constexpr auto name = variant == FunctionSleepVariant::PerBlock ? "sleep" : "sleepEachRow";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextPtr)
     {
         return std::make_shared<FunctionSleep<variant>>();
     }
diff --git a/src/Functions/stringToH3.cpp b/src/Functions/stringToH3.cpp
index 575382ec40f..9b02711db50 100644
--- a/src/Functions/stringToH3.cpp
+++ b/src/Functions/stringToH3.cpp
@@ -34,7 +34,7 @@ class FunctionStringToH3 : public IFunction
 public:
     static constexpr auto name = "stringToH3";
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionStringToH3>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionStringToH3>(); }
 
     std::string getName() const override { return name; }
 
diff --git a/src/Functions/substring.cpp b/src/Functions/substring.cpp
index 3fe82b5e0b0..cac1688c81a 100644
--- a/src/Functions/substring.cpp
+++ b/src/Functions/substring.cpp
@@ -36,7 +36,7 @@ class FunctionSubstring : public IFunction
 {
 public:
     static constexpr auto name = is_utf8 ? "substringUTF8" : "substring";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextPtr)
     {
         return std::make_shared<FunctionSubstring>();
     }
diff --git a/src/Functions/svg.cpp b/src/Functions/svg.cpp
new file mode 100644
index 00000000000..39473816c8c
--- /dev/null
+++ b/src/Functions/svg.cpp
@@ -0,0 +1,105 @@
+#include <DataTypes/DataTypeString.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/FunctionHelpers.h>
+#include <Functions/geometryConverters.h>
+#include <Columns/ColumnString.h>
+
+#include <string>
+#include <memory>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+    extern const int TOO_MANY_ARGUMENTS_FOR_FUNCTION;
+    extern const int TOO_FEW_ARGUMENTS_FOR_FUNCTION;
+}
+
+class FunctionSvg : public IFunction
+{
+public:
+    static inline const char * name = "svg";
+
+    explicit FunctionSvg() = default;
+
+    static FunctionPtr create(ContextPtr)
+    {
+        return std::make_shared<FunctionSvg>();
+    }
+
+    String getName() const override
+    {
+        return name;
+    }
+
+    bool isVariadic() const override
+    {
+        return true;
+    }
+
+    size_t getNumberOfArguments() const override
+    {
+        return 2;
+    }
+
+    DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
+    {
+        if (arguments.size() > 2)
+        {
+            throw Exception("Too many arguments", ErrorCodes::TOO_MANY_ARGUMENTS_FOR_FUNCTION);
+        }
+        else if (arguments.empty())
+        {
+            throw Exception("Too few arguments", ErrorCodes::TOO_FEW_ARGUMENTS_FOR_FUNCTION);
+        }
+        else if (arguments.size() == 2 && checkAndGetDataType<DataTypeString>(arguments[1].get()) == nullptr)
+        {
+            throw Exception("Second argument should be String", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+        }
+
+        return std::make_shared<DataTypeString>();
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & /*result_type*/, size_t input_rows_count) const override
+    {
+        auto res_column = ColumnString::create();
+        bool has_style = arguments.size() > 1;
+        ColumnPtr style;
+        if (has_style)
+            style = arguments[1].column;
+
+        callOnGeometryDataType<CartesianPoint>(arguments[0].type, [&] (const auto & type)
+        {
+            using TypeConverter = std::decay_t<decltype(type)>;
+            using Converter = typename TypeConverter::Type;
+
+            auto figures = Converter::convert(arguments[0].column->convertToFullColumnIfConst());
+
+            for (size_t i = 0; i < input_rows_count; i++)
+            {
+                std::stringstream str; // STYLE_CHECK_ALLOW_STD_STRING_STREAM
+                boost::geometry::correct(figures[i]);
+                str << boost::geometry::svg(figures[i], has_style ? style->getDataAt(i).toString() : "");
+                std::string serialized = str.str();
+                res_column->insertData(serialized.c_str(), serialized.size());
+            }
+        }
+        );
+
+        return res_column;
+    }
+
+    bool useDefaultImplementationForConstants() const override
+    {
+        return true;
+    }
+};
+
+void registerFunctionSvg(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionSvg>();
+}
+
+}
diff --git a/src/Functions/tcpPort.cpp b/src/Functions/tcpPort.cpp
index 26991c900ab..484843ced3f 100644
--- a/src/Functions/tcpPort.cpp
+++ b/src/Functions/tcpPort.cpp
@@ -14,9 +14,9 @@ class FunctionTcpPort : public IFunction
 public:
     static constexpr auto name = "tcpPort";
 
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextPtr context)
     {
-        return std::make_shared<FunctionTcpPort>(context.getTCPPort());
+        return std::make_shared<FunctionTcpPort>(context->getTCPPort());
     }
 
     explicit FunctionTcpPort(UInt16 port_) : port(port_)
diff --git a/src/Functions/throwIf.cpp b/src/Functions/throwIf.cpp
index f74ab29186a..d12a90119b9 100644
--- a/src/Functions/throwIf.cpp
+++ b/src/Functions/throwIf.cpp
@@ -26,7 +26,7 @@ class FunctionThrowIf : public IFunction
 {
 public:
     static constexpr auto name = "throwIf";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextPtr)
     {
         return std::make_shared<FunctionThrowIf>();
     }
diff --git a/src/Functions/tid.cpp b/src/Functions/tid.cpp
index 44321deb15f..d5402a00da3 100644
--- a/src/Functions/tid.cpp
+++ b/src/Functions/tid.cpp
@@ -13,7 +13,7 @@ namespace
     {
     public:
         static constexpr auto name = "tid";
-        static FunctionPtr create(const Context &) { return std::make_shared<FunctionTid>(); }
+        static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionTid>(); }
 
         String getName() const override { return name; }
 
diff --git a/src/Functions/timeSlots.cpp b/src/Functions/timeSlots.cpp
index ef5902eba11..9af16bf6fe0 100644
--- a/src/Functions/timeSlots.cpp
+++ b/src/Functions/timeSlots.cpp
@@ -109,7 +109,7 @@ class FunctionTimeSlots : public IFunction
 public:
     static constexpr auto name = "timeSlots";
     static constexpr UInt32 TIME_SLOT_SIZE = 1800;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionTimeSlots>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionTimeSlots>(); }
 
     String getName() const override
     {
diff --git a/src/Functions/timezone.cpp b/src/Functions/timezone.cpp
index 4522f21c8b2..178bfe76dc9 100644
--- a/src/Functions/timezone.cpp
+++ b/src/Functions/timezone.cpp
@@ -12,13 +12,13 @@ namespace
 
 /** Returns the server time zone.
   */
-class FunctionTimeZone : public IFunction
+class FunctionTimezone : public IFunction
 {
 public:
     static constexpr auto name = "timezone";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextPtr)
     {
-        return std::make_shared<FunctionTimeZone>();
+        return std::make_shared<FunctionTimezone>();
     }
 
     String getName() const override
@@ -45,9 +45,10 @@ public:
 
 }
 
-void registerFunctionTimeZone(FunctionFactory & factory)
+void registerFunctionTimezone(FunctionFactory & factory)
 {
-    factory.registerFunction<FunctionTimeZone>();
+    factory.registerFunction<FunctionTimezone>();
+    factory.registerAlias("timeZone", "timezone");
 }
 
 }
diff --git a/src/Functions/timezoneOf.cpp b/src/Functions/timezoneOf.cpp
new file mode 100644
index 00000000000..dd399b8be26
--- /dev/null
+++ b/src/Functions/timezoneOf.cpp
@@ -0,0 +1,118 @@
+#include <Functions/IFunctionImpl.h>
+#include <Functions/FunctionFactory.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <common/DateLUTImpl.h>
+#include <Core/Field.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int BAD_ARGUMENTS;
+}
+
+
+namespace
+{
+
+
+/** timezoneOf(x) - get the name of the timezone of DateTime data type.
+  * Example: Europe/Moscow.
+  */
+class ExecutableFunctionTimezoneOf : public IExecutableFunctionImpl
+{
+public:
+    static constexpr auto name = "timezoneOf";
+    String getName() const override { return name; }
+
+    bool useDefaultImplementationForNulls() const override { return false; }
+    bool useDefaultImplementationForLowCardinalityColumns() const override { return false; }
+
+    /// Execute the function on the columns.
+    ColumnPtr execute(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    {
+        DataTypePtr type_no_nullable = removeNullable(arguments[0].type);
+
+        return DataTypeString().createColumnConst(input_rows_count,
+            dynamic_cast<const TimezoneMixin &>(*type_no_nullable).getTimeZone().getTimeZone());
+    }
+};
+
+
+class BaseFunctionTimezoneOf : public IFunctionBaseImpl
+{
+public:
+    BaseFunctionTimezoneOf(DataTypes argument_types_, DataTypePtr return_type_)
+        : argument_types(std::move(argument_types_)), return_type(std::move(return_type_)) {}
+
+    static constexpr auto name = "timezoneOf";
+    String getName() const override { return name; }
+
+    bool isDeterministic() const override { return true; }
+    bool isDeterministicInScopeOfQuery() const override { return true; }
+
+    const DataTypes & getArgumentTypes() const override { return argument_types; }
+    const DataTypePtr & getResultType() const override { return return_type; }
+
+    ExecutableFunctionImplPtr prepare(const ColumnsWithTypeAndName &) const override
+    {
+        return std::make_unique<ExecutableFunctionTimezoneOf>();
+    }
+
+    ColumnPtr getResultIfAlwaysReturnsConstantAndHasArguments(const ColumnsWithTypeAndName & arguments) const override
+    {
+        DataTypePtr type_no_nullable = removeNullable(arguments[0].type);
+
+        return DataTypeString().createColumnConst(1,
+            dynamic_cast<const TimezoneMixin &>(*type_no_nullable).getTimeZone().getTimeZone());
+    }
+
+private:
+    DataTypes argument_types;
+    DataTypePtr return_type;
+};
+
+
+class FunctionTimezoneOfBuilder : public IFunctionOverloadResolverImpl
+{
+public:
+    static constexpr auto name = "timezoneOf";
+    String getName() const override { return name; }
+    static FunctionOverloadResolverImplPtr create(ContextPtr) { return std::make_unique<FunctionTimezoneOfBuilder>(); }
+
+    size_t getNumberOfArguments() const override { return 1; }
+
+    DataTypePtr getReturnType(const DataTypes & types) const override
+    {
+        DataTypePtr type_no_nullable = removeNullable(types[0]);
+
+        if (isDateTime(type_no_nullable) || isDateTime64(type_no_nullable))
+            return std::make_shared<DataTypeString>();
+        else
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Bad argument for function {}, should be DateTime or DateTime64", name);
+    }
+
+    FunctionBaseImplPtr build(const ColumnsWithTypeAndName & arguments, const DataTypePtr & return_type) const override
+    {
+        return std::make_unique<BaseFunctionTimezoneOf>(DataTypes{arguments[0].type}, return_type);
+    }
+
+    bool useDefaultImplementationForNulls() const override { return false; }
+    bool useDefaultImplementationForLowCardinalityColumns() const override { return false; }
+    ColumnNumbers getArgumentsThatDontImplyNullableReturnType(size_t /*number_of_arguments*/) const override { return {0}; }
+};
+
+}
+
+void registerFunctionTimezoneOf(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionTimezoneOfBuilder>();
+    factory.registerAlias("timeZoneOf", "timezoneOf");
+}
+
+}
+
diff --git a/src/Functions/toColumnTypeName.cpp b/src/Functions/toColumnTypeName.cpp
index 2b59accba84..56b464a0b01 100644
--- a/src/Functions/toColumnTypeName.cpp
+++ b/src/Functions/toColumnTypeName.cpp
@@ -14,7 +14,7 @@ class FunctionToColumnTypeName : public IFunction
 {
 public:
     static constexpr auto name = "toColumnTypeName";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextPtr)
     {
         return std::make_shared<FunctionToColumnTypeName>();
     }
diff --git a/src/Functions/toFixedString.h b/src/Functions/toFixedString.h
index 23c9e92faaf..3911a758a51 100644
--- a/src/Functions/toFixedString.h
+++ b/src/Functions/toFixedString.h
@@ -32,7 +32,7 @@ class FunctionToFixedString : public IFunction
 {
 public:
     static constexpr auto name = "toFixedString";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionToFixedString>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionToFixedString>(); }
     static FunctionPtr create() { return std::make_shared<FunctionToFixedString>(); }
 
     String getName() const override
diff --git a/src/Functions/toLowCardinality.cpp b/src/Functions/toLowCardinality.cpp
index fe06b2d6087..4e35d2e1b32 100644
--- a/src/Functions/toLowCardinality.cpp
+++ b/src/Functions/toLowCardinality.cpp
@@ -14,7 +14,7 @@ class FunctionToLowCardinality: public IFunction
 {
 public:
     static constexpr auto name = "toLowCardinality";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionToLowCardinality>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionToLowCardinality>(); }
 
     String getName() const override { return name; }
 
diff --git a/src/Functions/toModifiedJulianDay.cpp b/src/Functions/toModifiedJulianDay.cpp
index 32e9eb23987..3450de95a32 100644
--- a/src/Functions/toModifiedJulianDay.cpp
+++ b/src/Functions/toModifiedJulianDay.cpp
@@ -172,7 +172,7 @@ namespace DB
     public:
         static constexpr auto name = Name::name;
 
-        static FunctionOverloadResolverImplPtr create(const Context &)
+        static FunctionOverloadResolverImplPtr create(ContextPtr)
         {
             return std::make_unique<ToModifiedJulianDayOverloadResolver<Name, ToDataType, nullOnErrors>>();
         }
diff --git a/src/Functions/toNullable.cpp b/src/Functions/toNullable.cpp
index 5758fe41adf..af64142798e 100644
--- a/src/Functions/toNullable.cpp
+++ b/src/Functions/toNullable.cpp
@@ -16,7 +16,7 @@ class FunctionToNullable : public IFunction
 public:
     static constexpr auto name = "toNullable";
 
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextPtr)
     {
         return std::make_shared<FunctionToNullable>();
     }
diff --git a/src/Functions/toStartOfInterval.cpp b/src/Functions/toStartOfInterval.cpp
index 6f5a52ca182..d21565f9cf0 100644
--- a/src/Functions/toStartOfInterval.cpp
+++ b/src/Functions/toStartOfInterval.cpp
@@ -7,6 +7,7 @@
 #include <Functions/DateTimeTransforms.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/IFunctionImpl.h>
+#include <Functions/TransformDateTime64.h>
 #include <IO/WriteHelpers.h>
 
 
@@ -35,13 +36,18 @@ namespace
 
         static UInt16 execute(UInt16 d, UInt64 years, const DateLUTImpl & time_zone)
         {
-            return time_zone.toStartOfYearInterval(DayNum(d), years);
+            return time_zone.toStartOfYearInterval(ExtendedDayNum(d), years);
         }
 
         static UInt16 execute(UInt32 t, UInt64 years, const DateLUTImpl & time_zone)
         {
             return time_zone.toStartOfYearInterval(time_zone.toDayNum(t), years);
         }
+
+        static UInt16 execute(Int64 t, UInt64 years, const DateLUTImpl & time_zone)
+        {
+            return time_zone.toStartOfYearInterval(time_zone.toDayNum(t), years);
+        }
     };
 
     template <>
@@ -51,13 +57,18 @@ namespace
 
         static UInt16 execute(UInt16 d, UInt64 quarters, const DateLUTImpl & time_zone)
         {
-            return time_zone.toStartOfQuarterInterval(DayNum(d), quarters);
+            return time_zone.toStartOfQuarterInterval(ExtendedDayNum(d), quarters);
         }
 
         static UInt16 execute(UInt32 t, UInt64 quarters, const DateLUTImpl & time_zone)
         {
             return time_zone.toStartOfQuarterInterval(time_zone.toDayNum(t), quarters);
         }
+
+        static UInt16 execute(Int64 t, UInt64 quarters, const DateLUTImpl & time_zone)
+        {
+            return time_zone.toStartOfQuarterInterval(time_zone.toDayNum(t), quarters);
+        }
     };
 
     template <>
@@ -67,13 +78,18 @@ namespace
 
         static UInt16 execute(UInt16 d, UInt64 months, const DateLUTImpl & time_zone)
         {
-            return time_zone.toStartOfMonthInterval(DayNum(d), months);
+            return time_zone.toStartOfMonthInterval(ExtendedDayNum(d), months);
         }
 
         static UInt16 execute(UInt32 t, UInt64 months, const DateLUTImpl & time_zone)
         {
             return time_zone.toStartOfMonthInterval(time_zone.toDayNum(t), months);
         }
+
+        static UInt16 execute(Int64 t, UInt64 months, const DateLUTImpl & time_zone)
+        {
+            return time_zone.toStartOfMonthInterval(time_zone.toDayNum(t), months);
+        }
     };
 
     template <>
@@ -83,13 +99,18 @@ namespace
 
         static UInt16 execute(UInt16 d, UInt64 weeks, const DateLUTImpl & time_zone)
         {
-            return time_zone.toStartOfWeekInterval(DayNum(d), weeks);
+            return time_zone.toStartOfWeekInterval(ExtendedDayNum(d), weeks);
         }
 
         static UInt16 execute(UInt32 t, UInt64 weeks, const DateLUTImpl & time_zone)
         {
             return time_zone.toStartOfWeekInterval(time_zone.toDayNum(t), weeks);
         }
+
+        static UInt16 execute(Int64 t, UInt64 weeks, const DateLUTImpl & time_zone)
+        {
+            return time_zone.toStartOfWeekInterval(time_zone.toDayNum(t), weeks);
+        }
     };
 
     template <>
@@ -99,13 +120,18 @@ namespace
 
         static UInt32 execute(UInt16 d, UInt64 days, const DateLUTImpl & time_zone)
         {
-            return time_zone.toStartOfDayInterval(DayNum(d), days);
+            return time_zone.toStartOfDayInterval(ExtendedDayNum(d), days);
         }
 
         static UInt32 execute(UInt32 t, UInt64 days, const DateLUTImpl & time_zone)
         {
             return time_zone.toStartOfDayInterval(time_zone.toDayNum(t), days);
         }
+
+        static UInt32 execute(Int64 t, UInt64 days, const DateLUTImpl & time_zone)
+        {
+            return time_zone.toStartOfDayInterval(time_zone.toDayNum(t), days);
+        }
     };
 
     template <>
@@ -114,8 +140,8 @@ namespace
         static constexpr auto name = function_name;
 
         static UInt32 execute(UInt16, UInt64, const DateLUTImpl &) { return dateIsNotSupported(function_name); }
-
         static UInt32 execute(UInt32 t, UInt64 hours, const DateLUTImpl & time_zone) { return time_zone.toStartOfHourInterval(t, hours); }
+        static UInt32 execute(Int64 t, UInt64 hours, const DateLUTImpl & time_zone) { return time_zone.toStartOfHourInterval(t, hours); }
     };
 
     template <>
@@ -129,6 +155,11 @@ namespace
         {
             return time_zone.toStartOfMinuteInterval(t, minutes);
         }
+
+        static UInt32 execute(Int64 t, UInt64 minutes, const DateLUTImpl & time_zone)
+        {
+            return time_zone.toStartOfMinuteInterval(t, minutes);
+        }
     };
 
     template <>
@@ -142,13 +173,18 @@ namespace
         {
             return time_zone.toStartOfSecondInterval(t, seconds);
         }
+
+        static Int64 execute(Int64 t, UInt64 seconds, const DateLUTImpl & time_zone)
+        {
+            return time_zone.toStartOfSecondInterval(t, seconds);
+        }
     };
 
 
 class FunctionToStartOfInterval : public IFunction
 {
 public:
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionToStartOfInterval>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionToStartOfInterval>(); }
 
     static constexpr auto name = function_name;
     String getName() const override { return name; }
@@ -230,7 +266,7 @@ public:
     {
         const auto & time_column = arguments[0];
         const auto & interval_column = arguments[1];
-        const DateLUTImpl & time_zone = extractTimeZoneFromFunctionArguments(arguments, 2, 0);
+        const auto & time_zone = extractTimeZoneFromFunctionArguments(arguments, 2, 0);
         auto result_column = dispatchForColumns(time_column, interval_column, time_zone);
         return result_column;
     }
diff --git a/src/Functions/toTimeZone.cpp b/src/Functions/toTimezone.cpp
similarity index 87%
rename from src/Functions/toTimeZone.cpp
rename to src/Functions/toTimezone.cpp
index fbf3a0778a6..a5df3a87f2b 100644
--- a/src/Functions/toTimeZone.cpp
+++ b/src/Functions/toTimezone.cpp
@@ -21,11 +21,11 @@ namespace
 {
 
 /// Just changes time zone information for data type. The calculation is free.
-class FunctionToTimeZone : public IFunction
+class FunctionToTimezone : public IFunction
 {
 public:
-    static constexpr auto name = "toTimeZone";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionToTimeZone>(); }
+    static constexpr auto name = "toTimezone";
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionToTimezone>(); }
 
     String getName() const override
     {
@@ -64,7 +64,8 @@ public:
 
 void registerFunctionToTimeZone(FunctionFactory & factory)
 {
-    factory.registerFunction<FunctionToTimeZone>();
+    factory.registerFunction<FunctionToTimezone>();
+    factory.registerAlias("toTimeZone", "toTimezone");
 }
 
 }
diff --git a/src/Functions/toTypeName.cpp b/src/Functions/toTypeName.cpp
index 5de07e1d386..92d24b1dc99 100644
--- a/src/Functions/toTypeName.cpp
+++ b/src/Functions/toTypeName.cpp
@@ -65,7 +65,7 @@ class FunctionToTypeNameBuilder : public IFunctionOverloadResolverImpl
 public:
     static constexpr auto name = "toTypeName";
     String getName() const override { return name; }
-    static FunctionOverloadResolverImplPtr create(const Context &) { return std::make_unique<FunctionToTypeNameBuilder>(); }
+    static FunctionOverloadResolverImplPtr create(ContextPtr) { return std::make_unique<FunctionToTypeNameBuilder>(); }
 
     size_t getNumberOfArguments() const override { return 1; }
 
diff --git a/src/Functions/today.cpp b/src/Functions/today.cpp
index 65373058540..65e94c047e6 100644
--- a/src/Functions/today.cpp
+++ b/src/Functions/today.cpp
@@ -71,13 +71,13 @@ public:
 
     size_t getNumberOfArguments() const override { return 0; }
 
-    static FunctionOverloadResolverImplPtr create(const Context &) { return std::make_unique<TodayOverloadResolver>(); }
+    static FunctionOverloadResolverImplPtr create(ContextPtr) { return std::make_unique<TodayOverloadResolver>(); }
 
     DataTypePtr getReturnType(const DataTypes &) const override { return std::make_shared<DataTypeDate>(); }
 
     FunctionBaseImplPtr build(const ColumnsWithTypeAndName &, const DataTypePtr &) const override
     {
-        return std::make_unique<FunctionBaseToday>(DateLUT::instance().toDayNum(time(nullptr)));
+        return std::make_unique<FunctionBaseToday>(DayNum(DateLUT::instance().toDayNum(time(nullptr)).toUnderType()));
     }
 };
 
diff --git a/src/Functions/transform.cpp b/src/Functions/transform.cpp
index 07fbd5a7b96..b7c2b584ba0 100644
--- a/src/Functions/transform.cpp
+++ b/src/Functions/transform.cpp
@@ -58,7 +58,7 @@ class FunctionTransform : public IFunction
 {
 public:
     static constexpr auto name = "transform";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionTransform>(); }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionTransform>(); }
 
     String getName() const override
     {
diff --git a/src/Functions/trap.cpp b/src/Functions/trap.cpp
index 61ec52a1d07..f946a7fabfb 100644
--- a/src/Functions/trap.cpp
+++ b/src/Functions/trap.cpp
@@ -32,16 +32,16 @@ namespace ErrorCodes
 class FunctionTrap : public IFunction
 {
 private:
-    const Context & context;
+    ContextPtr context;
 
 public:
     static constexpr auto name = "trap";
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextPtr context)
     {
         return std::make_shared<FunctionTrap>(context);
     }
 
-    FunctionTrap(const Context & context_) : context(context_) {}
+    FunctionTrap(ContextPtr context_) : context(context_) {}
 
     String getName() const override
     {
diff --git a/src/Functions/tuple.cpp b/src/Functions/tuple.cpp
index 308090eb9bb..80a6f284bea 100644
--- a/src/Functions/tuple.cpp
+++ b/src/Functions/tuple.cpp
@@ -24,7 +24,7 @@ class FunctionTuple : public IFunction
 public:
     static constexpr auto name = "tuple";
 
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextPtr)
     {
         return std::make_shared<FunctionTuple>();
     }
diff --git a/src/Functions/tupleElement.cpp b/src/Functions/tupleElement.cpp
index dbfa802a414..ecf1ed5203f 100644
--- a/src/Functions/tupleElement.cpp
+++ b/src/Functions/tupleElement.cpp
@@ -30,7 +30,7 @@ class FunctionTupleElement : public IFunction
 {
 public:
     static constexpr auto name = "tupleElement";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextPtr)
     {
         return std::make_shared<FunctionTupleElement>();
     }
diff --git a/src/Functions/tupleHammingDistance.cpp b/src/Functions/tupleHammingDistance.cpp
index 0fd21e0ea91..9d660e388cb 100644
--- a/src/Functions/tupleHammingDistance.cpp
+++ b/src/Functions/tupleHammingDistance.cpp
@@ -19,14 +19,14 @@ namespace ErrorCodes
 class FunctionTupleHammingDistance : public IFunction
 {
 private:
-    const Context & context;
+    ContextPtr context;
 
 public:
     static constexpr auto name = "tupleHammingDistance";
     using ResultType = UInt8;
 
-    explicit FunctionTupleHammingDistance(const Context & context_) : context(context_) {}
-    static FunctionPtr create(const Context & context) { return std::make_shared<FunctionTupleHammingDistance>(context); }
+    explicit FunctionTupleHammingDistance(ContextPtr context_) : context(context_) {}
+    static FunctionPtr create(ContextPtr context) { return std::make_shared<FunctionTupleHammingDistance>(context); }
 
     String getName() const override { return name; }
 
diff --git a/src/Functions/uptime.cpp b/src/Functions/uptime.cpp
index b5662a87c93..f31cb2b0d17 100644
--- a/src/Functions/uptime.cpp
+++ b/src/Functions/uptime.cpp
@@ -13,9 +13,9 @@ class FunctionUptime : public IFunction
 {
 public:
     static constexpr auto name = "uptime";
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextPtr context)
     {
-        return std::make_shared<FunctionUptime>(context.getUptimeSeconds());
+        return std::make_shared<FunctionUptime>(context->getUptimeSeconds());
     }
 
     explicit FunctionUptime(time_t uptime_) : uptime(uptime_)
diff --git a/src/Functions/validateNestedArraySizes.cpp b/src/Functions/validateNestedArraySizes.cpp
new file mode 100644
index 00000000000..b589b1e2e5c
--- /dev/null
+++ b/src/Functions/validateNestedArraySizes.cpp
@@ -0,0 +1,113 @@
+#include <DataTypes/DataTypesNumber.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/FunctionHelpers.h>
+#include <Columns/ColumnsNumber.h>
+#include <Columns/ColumnArray.h>
+#include <Core/ColumnWithTypeAndName.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+    extern const int SIZES_OF_ARRAYS_DOESNT_MATCH;
+}
+
+/** Function validateNestedArraySizes is used to check the consistency of Nested DataType subcolumns's offsets when Update
+ *  Arguments: num > 2
+ *     The first argument is the condition of WHERE in UPDATE operation, only when this is true, we need to check
+ *     The rest arguments are the subcolumns of Nested DataType.
+ */
+class FunctionValidateNestedArraySizes : public IFunction
+{
+public:
+    static constexpr auto name = "validateNestedArraySizes";
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionValidateNestedArraySizes>(); }
+
+    String getName() const override { return name; }
+    bool isVariadic() const override { return true; }
+    size_t getNumberOfArguments() const override { return 0; }
+    bool useDefaultImplementationForConstants() const override { return true; }
+    DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override;
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override;
+};
+
+DataTypePtr FunctionValidateNestedArraySizes::getReturnTypeImpl(const DataTypes & arguments) const
+{
+    size_t num_args = arguments.size();
+
+    if (num_args < 3)
+        throw Exception(
+            "Function " + getName() + " needs more than two arguments; passed " + toString(arguments.size()) + ".",
+            ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
+
+    if (!WhichDataType(arguments[0]).isUInt8())
+        throw Exception("Illegal type " + arguments[0]->getName() + " of first argument of function " + getName() + " Must be UInt.",
+                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+
+    for (size_t i = 1; i < num_args; ++i)
+        if (!WhichDataType(arguments[i]).isArray())
+            throw Exception(
+                "Illegal type " + arguments[i]->getName() + " of " + toString(i) + " argument of function " + getName() + " Must be Array.",
+                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+
+    return std::make_shared<DataTypeUInt8>();
+}
+
+ColumnPtr FunctionValidateNestedArraySizes::executeImpl(
+    const ColumnsWithTypeAndName & arguments, const DataTypePtr & /*result_type*/, size_t input_rows_count) const
+{
+    const ColumnUInt8 * condition_column = typeid_cast<const ColumnUInt8 *>(arguments[0].column.get());
+
+    size_t args_num = arguments.size();
+
+    for (size_t i = 0; i < input_rows_count; ++i)
+    {
+        if (!condition_column->getData()[i])
+            continue;
+
+        /// The condition is true, then check the row in subcolumns in Nested Type has the same array size
+        size_t first_length = 0;
+        size_t length = 0;
+        for (size_t args_idx = 1; args_idx < args_num; ++args_idx)
+        {
+            const auto & current_arg = arguments[args_idx];
+            const ColumnArray * current_column = nullptr;
+            if (const auto * const_array = checkAndGetColumnConst<ColumnArray>(current_arg.column.get()))
+            {
+                current_column = checkAndGetColumn<ColumnArray>(&const_array->getDataColumn());
+                length = current_column->getOffsets()[0];
+            }
+            else
+            {
+                current_column = checkAndGetColumn<ColumnArray>(current_arg.column.get());
+                const auto & offsets = current_column->getOffsets();
+                length = offsets[i] - offsets[i - 1];
+            }
+
+            if (args_idx == 1)
+            {
+                first_length = length;
+            }
+            else if (first_length != length)
+            {
+                throw Exception(
+                    ErrorCodes::SIZES_OF_ARRAYS_DOESNT_MATCH,
+                    "Elements '{}' and '{}' of Nested data structure (Array columns) "
+                    "have different array sizes ({} and {} respectively) on row {}",
+                    arguments[1].name, arguments[args_idx].name, first_length, length, i);
+            }
+        }
+    }
+
+    return ColumnUInt8::create(input_rows_count, 1);
+}
+
+void registerFunctionValidateNestedArraySizes(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionValidateNestedArraySizes>();
+}
+
+}
diff --git a/src/Functions/version.cpp b/src/Functions/version.cpp
index 404c03223ad..0af269d8f89 100644
--- a/src/Functions/version.cpp
+++ b/src/Functions/version.cpp
@@ -16,7 +16,7 @@ class FunctionVersion : public IFunction
 {
 public:
     static constexpr auto name = "version";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextPtr)
     {
         return std::make_shared<FunctionVersion>();
     }
@@ -49,7 +49,7 @@ public:
 
 void registerFunctionVersion(FunctionFactory & factory)
 {
-    factory.registerFunction<FunctionVersion>();
+    factory.registerFunction<FunctionVersion>(FunctionFactory::CaseInsensitive);
 }
 
 }
diff --git a/src/Functions/visibleWidth.cpp b/src/Functions/visibleWidth.cpp
index 1fe36208de9..7a2a2f54f45 100644
--- a/src/Functions/visibleWidth.cpp
+++ b/src/Functions/visibleWidth.cpp
@@ -19,7 +19,7 @@ class FunctionVisibleWidth : public IFunction
 {
 public:
     static constexpr auto name = "visibleWidth";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextPtr)
     {
         return std::make_shared<FunctionVisibleWidth>();
     }
@@ -58,11 +58,12 @@ public:
 
         String tmp;
         FormatSettings format_settings;
+        auto serialization = src.type->getDefaultSerialization();
         for (size_t i = 0; i < size; ++i)
         {
             {
                 WriteBufferFromString out(tmp);
-                src.type->serializeAsText(*src.column, i, out, format_settings);
+                serialization->serializeText(*src.column, i, out, format_settings);
             }
 
             res_data[i] = UTF8::countCodePoints(reinterpret_cast<const UInt8 *>(tmp.data()), tmp.size());
diff --git a/src/Functions/visitParamExtractBool.cpp b/src/Functions/visitParamExtractBool.cpp
index 7f989ccbb9e..059115b5b13 100644
--- a/src/Functions/visitParamExtractBool.cpp
+++ b/src/Functions/visitParamExtractBool.cpp
@@ -19,10 +19,13 @@ struct ExtractBool
 struct NameVisitParamExtractBool   { static constexpr auto name = "visitParamExtractBool"; };
 using FunctionVisitParamExtractBool = FunctionsStringSearch<ExtractParamImpl<ExtractBool>, NameVisitParamExtractBool>;
 
+struct NameSimpleJSONExtractBool   { static constexpr auto name = "simpleJSONExtractBool"; };
+using FunctionSimpleJSONExtractBool = FunctionsStringSearch<ExtractParamImpl<ExtractBool>, NameSimpleJSONExtractBool>;
 
 void registerFunctionVisitParamExtractBool(FunctionFactory & factory)
 {
     factory.registerFunction<FunctionVisitParamExtractBool>();
+    factory.registerFunction<FunctionSimpleJSONExtractBool>();
 }
 
 }
diff --git a/src/Functions/visitParamExtractFloat.cpp b/src/Functions/visitParamExtractFloat.cpp
index b02b0209daf..7a55cff365c 100644
--- a/src/Functions/visitParamExtractFloat.cpp
+++ b/src/Functions/visitParamExtractFloat.cpp
@@ -9,10 +9,13 @@ namespace DB
 struct NameVisitParamExtractFloat  { static constexpr auto name = "visitParamExtractFloat"; };
 using FunctionVisitParamExtractFloat = FunctionsStringSearch<ExtractParamImpl<ExtractNumericType<Float64>>, NameVisitParamExtractFloat>;
 
+struct NameSimpleJSONExtractFloat  { static constexpr auto name = "simpleJSONExtractFloat"; };
+using FunctionSimpleJSONExtractFloat = FunctionsStringSearch<ExtractParamImpl<ExtractNumericType<Float64>>, NameSimpleJSONExtractFloat>;
 
 void registerFunctionVisitParamExtractFloat(FunctionFactory & factory)
 {
     factory.registerFunction<FunctionVisitParamExtractFloat>();
+    factory.registerFunction<FunctionSimpleJSONExtractFloat>();
 }
 
 }
diff --git a/src/Functions/visitParamExtractInt.cpp b/src/Functions/visitParamExtractInt.cpp
index f3f30f566e6..7c2188c10fc 100644
--- a/src/Functions/visitParamExtractInt.cpp
+++ b/src/Functions/visitParamExtractInt.cpp
@@ -9,10 +9,13 @@ namespace DB
 struct NameVisitParamExtractInt    { static constexpr auto name = "visitParamExtractInt"; };
 using FunctionVisitParamExtractInt = FunctionsStringSearch<ExtractParamImpl<ExtractNumericType<Int64>>, NameVisitParamExtractInt>;
 
+struct NameSimpleJSONExtractInt    { static constexpr auto name = "simpleJSONExtractInt"; };
+using FunctionSimpleJSONExtractInt = FunctionsStringSearch<ExtractParamImpl<ExtractNumericType<Int64>>, NameSimpleJSONExtractInt>;
 
 void registerFunctionVisitParamExtractInt(FunctionFactory & factory)
 {
     factory.registerFunction<FunctionVisitParamExtractInt>();
+    factory.registerFunction<FunctionSimpleJSONExtractInt>();
 }
 
 }
diff --git a/src/Functions/visitParamExtractRaw.cpp b/src/Functions/visitParamExtractRaw.cpp
index add882f003f..734fe107557 100644
--- a/src/Functions/visitParamExtractRaw.cpp
+++ b/src/Functions/visitParamExtractRaw.cpp
@@ -59,10 +59,13 @@ struct ExtractRaw
 struct NameVisitParamExtractRaw    { static constexpr auto name = "visitParamExtractRaw"; };
 using FunctionVisitParamExtractRaw = FunctionsStringSearchToString<ExtractParamToStringImpl<ExtractRaw>, NameVisitParamExtractRaw>;
 
+struct NameSimpleJSONExtractRaw    { static constexpr auto name = "simpleJSONExtractRaw"; };
+using FunctionSimpleJSONExtractRaw = FunctionsStringSearchToString<ExtractParamToStringImpl<ExtractRaw>, NameSimpleJSONExtractRaw>;
 
 void registerFunctionVisitParamExtractRaw(FunctionFactory & factory)
 {
     factory.registerFunction<FunctionVisitParamExtractRaw>();
+    factory.registerFunction<FunctionSimpleJSONExtractRaw>();
 }
 
 }
diff --git a/src/Functions/visitParamExtractString.cpp b/src/Functions/visitParamExtractString.cpp
index b633a59807e..23f24b9e3b8 100644
--- a/src/Functions/visitParamExtractString.cpp
+++ b/src/Functions/visitParamExtractString.cpp
@@ -20,10 +20,13 @@ struct ExtractString
 struct NameVisitParamExtractString { static constexpr auto name = "visitParamExtractString"; };
 using FunctionVisitParamExtractString = FunctionsStringSearchToString<ExtractParamToStringImpl<ExtractString>, NameVisitParamExtractString>;
 
+struct NameSimpleJSONExtractString { static constexpr auto name = "simpleJSONExtractString"; };
+using FunctionSimpleJSONExtractString = FunctionsStringSearchToString<ExtractParamToStringImpl<ExtractString>, NameSimpleJSONExtractString>;
 
 void registerFunctionVisitParamExtractString(FunctionFactory & factory)
 {
     factory.registerFunction<FunctionVisitParamExtractString>();
+    factory.registerFunction<FunctionSimpleJSONExtractString>();
 }
 
 }
diff --git a/src/Functions/visitParamExtractUInt.cpp b/src/Functions/visitParamExtractUInt.cpp
index 5e70eed8253..f5466a63b0d 100644
--- a/src/Functions/visitParamExtractUInt.cpp
+++ b/src/Functions/visitParamExtractUInt.cpp
@@ -9,10 +9,14 @@ namespace DB
 struct NameVisitParamExtractUInt   { static constexpr auto name = "visitParamExtractUInt"; };
 using FunctionVisitParamExtractUInt = FunctionsStringSearch<ExtractParamImpl<ExtractNumericType<UInt64>>, NameVisitParamExtractUInt>;
 
+struct NameSimpleJSONExtractUInt   { static constexpr auto name = "simpleJSONExtractUInt"; };
+using FunctionSimpleJSONExtractUInt = FunctionsStringSearch<ExtractParamImpl<ExtractNumericType<UInt64>>, NameSimpleJSONExtractUInt>;
+
 
 void registerFunctionVisitParamExtractUInt(FunctionFactory & factory)
 {
     factory.registerFunction<FunctionVisitParamExtractUInt>();
+    factory.registerFunction<FunctionSimpleJSONExtractUInt>();
 }
 
 }
diff --git a/src/Functions/visitParamHas.cpp b/src/Functions/visitParamHas.cpp
index 5fbedfb4995..f4f377f9e8f 100644
--- a/src/Functions/visitParamHas.cpp
+++ b/src/Functions/visitParamHas.cpp
@@ -19,10 +19,13 @@ struct HasParam
 struct NameVisitParamHas           { static constexpr auto name = "visitParamHas"; };
 using FunctionVisitParamHas = FunctionsStringSearch<ExtractParamImpl<HasParam>, NameVisitParamHas>;
 
+struct NameSimpleJSONHas           { static constexpr auto name = "simpleJSONHas"; };
+using FunctionSimpleJSONHas = FunctionsStringSearch<ExtractParamImpl<HasParam>, NameSimpleJSONHas>;
 
 void registerFunctionVisitParamHas(FunctionFactory & factory)
 {
     factory.registerFunction<FunctionVisitParamHas>();
+    factory.registerFunction<FunctionSimpleJSONHas>();
 }
 
 }
diff --git a/src/Functions/wkt.cpp b/src/Functions/wkt.cpp
new file mode 100644
index 00000000000..b5567a19e89
--- /dev/null
+++ b/src/Functions/wkt.cpp
@@ -0,0 +1,74 @@
+#include <DataTypes/DataTypeString.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/geometryConverters.h>
+#include <Columns/ColumnString.h>
+
+#include <string>
+#include <memory>
+
+namespace DB
+{
+
+class FunctionWkt : public IFunction
+{
+public:
+    static inline const char * name = "wkt";
+
+    explicit FunctionWkt() = default;
+
+    static FunctionPtr create(ContextPtr)
+    {
+        return std::make_shared<FunctionWkt>();
+    }
+
+    String getName() const override
+    {
+        return name;
+    }
+
+    size_t getNumberOfArguments() const override
+    {
+        return 1;
+    }
+
+    DataTypePtr getReturnTypeImpl(const DataTypes &) const override
+    {
+        return std::make_shared<DataTypeString>();
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & /*result_type*/, size_t input_rows_count) const override
+    {
+        auto res_column = ColumnString::create();
+
+        callOnGeometryDataType<CartesianPoint>(arguments[0].type, [&] (const auto & type)
+        {
+            using TypeConverter = std::decay_t<decltype(type)>;
+            using Converter = typename TypeConverter::Type;
+
+            auto figures = Converter::convert(arguments[0].column->convertToFullColumnIfConst());
+
+            for (size_t i = 0; i < input_rows_count; i++)
+            {
+                std::stringstream str; // STYLE_CHECK_ALLOW_STD_STRING_STREAM
+                str << boost::geometry::wkt(figures[i]);
+                std::string serialized = str.str();
+                res_column->insertData(serialized.c_str(), serialized.size());
+            }
+        }
+        );
+
+        return res_column;
+    }
+
+    bool useDefaultImplementationForConstants() const override
+    {
+        return true;
+    }
+};
+
+void registerFunctionWkt(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionWkt>();
+}
+
+}
diff --git a/src/Functions/ya.make b/src/Functions/ya.make
index 20ba5f846a3..2a541369ff4 100644
--- a/src/Functions/ya.make
+++ b/src/Functions/ya.make
@@ -210,6 +210,7 @@ SRCS(
     cbrt.cpp
     coalesce.cpp
     concat.cpp
+    connectionId.cpp
     convertCharset.cpp
     cos.cpp
     cosh.cpp
@@ -228,6 +229,8 @@ SRCS(
     defaultValueOfTypeName.cpp
     demange.cpp
     divide.cpp
+    divide/divide.cpp
+    divide/divideImpl.cpp
     dumpColumnStructure.cpp
     e.cpp
     empty.cpp
@@ -246,6 +249,7 @@ SRCS(
     extractAllGroupsHorizontal.cpp
     extractAllGroupsVertical.cpp
     extractGroups.cpp
+    extractTextFromHTML.cpp
     extractTimeZoneFromFunctionArguments.cpp
     filesystem.cpp
     finalizeAggregation.cpp
@@ -291,7 +295,6 @@ SRCS(
     hasToken.cpp
     hasTokenCaseInsensitive.cpp
     hostName.cpp
-    htmlOrXmlCoarseParse.cpp
     hypot.cpp
     identity.cpp
     if.cpp
@@ -300,6 +303,7 @@ SRCS(
     ignore.cpp
     ilike.cpp
     in.cpp
+    indexHint.cpp
     initializeAggregation.cpp
     intDiv.cpp
     intDivOrZero.cpp
@@ -308,6 +312,7 @@ SRCS(
     isConstant.cpp
     isDecimalOverflow.cpp
     isFinite.cpp
+    isIPAddressContainedIn.cpp
     isInfinite.cpp
     isNaN.cpp
     isNotNull.cpp
@@ -372,10 +377,20 @@ SRCS(
     now.cpp
     now64.cpp
     nullIf.cpp
+    partitionId.cpp
     pi.cpp
     plus.cpp
     pointInEllipses.cpp
     pointInPolygon.cpp
+    polygonArea.cpp
+    polygonConvexHull.cpp
+    polygonPerimeter.cpp
+    polygonsDistance.cpp
+    polygonsEquals.cpp
+    polygonsIntersection.cpp
+    polygonsSymDifference.cpp
+    polygonsUnion.cpp
+    polygonsWithin.cpp
     position.cpp
     positionCaseInsensitive.cpp
     positionCaseInsensitiveUTF8.cpp
@@ -388,6 +403,7 @@ SRCS(
     randomPrintableASCII.cpp
     randomString.cpp
     randomStringUTF8.cpp
+    readWkt.cpp
     regexpQuoteMeta.cpp
     registerFunctions.cpp
     registerFunctionsArithmetic.cpp
@@ -446,6 +462,7 @@ SRCS(
     subtractSeconds.cpp
     subtractWeeks.cpp
     subtractYears.cpp
+    svg.cpp
     tan.cpp
     tanh.cpp
     tcpPort.cpp
@@ -455,6 +472,7 @@ SRCS(
     timeSlot.cpp
     timeSlots.cpp
     timezone.cpp
+    timezoneOf.cpp
     timezoneOffset.cpp
     toColumnTypeName.cpp
     toCustomWeek.cpp
@@ -494,7 +512,7 @@ SRCS(
     toStartOfTenMinutes.cpp
     toStartOfYear.cpp
     toTime.cpp
-    toTimeZone.cpp
+    toTimezone.cpp
     toTypeName.cpp
     toUnixTimestamp64Micro.cpp
     toUnixTimestamp64Milli.cpp
@@ -515,6 +533,7 @@ SRCS(
     upper.cpp
     upperUTF8.cpp
     uptime.cpp
+    validateNestedArraySizes.cpp
     version.cpp
     visibleWidth.cpp
     visitParamExtractBool.cpp
@@ -524,6 +543,7 @@ SRCS(
     visitParamExtractString.cpp
     visitParamExtractUInt.cpp
     visitParamHas.cpp
+    wkt.cpp
     yandexConsistentHash.cpp
     yesterday.cpp
 
diff --git a/src/Functions/yesterday.cpp b/src/Functions/yesterday.cpp
index 7c0d1ebd38b..76c4e1c1d16 100644
--- a/src/Functions/yesterday.cpp
+++ b/src/Functions/yesterday.cpp
@@ -69,7 +69,7 @@ public:
 
     size_t getNumberOfArguments() const override { return 0; }
 
-    static FunctionOverloadResolverImplPtr create(const Context &) { return std::make_unique<YesterdayOverloadResolver>(); }
+    static FunctionOverloadResolverImplPtr create(ContextPtr) { return std::make_unique<YesterdayOverloadResolver>(); }
 
     DataTypePtr getReturnType(const DataTypes &) const override { return std::make_shared<DataTypeDate>(); }
 
diff --git a/src/IO/AsynchronousWriteBuffer.h b/src/IO/AsynchronousWriteBuffer.h
deleted file mode 100644
index 8c44f8c7d4a..00000000000
--- a/src/IO/AsynchronousWriteBuffer.h
+++ /dev/null
@@ -1,71 +0,0 @@
-#pragma once
-
-#include <vector>
-#include <Common/ThreadPool.h>
-#include <Common/MemoryTracker.h>
-#include <IO/WriteBuffer.h>
-
-
-namespace DB
-{
-
-
-/** Writes data asynchronously using double buffering.
-  */
-class AsynchronousWriteBuffer : public WriteBuffer
-{
-private:
-    WriteBuffer & out;               /// The main buffer, responsible for writing data.
-    std::vector <char> memory;       /// A piece of memory for duplicating the buffer.
-    ThreadPool pool;                 /// For asynchronous data writing.
-    bool started;                    /// Has an asynchronous data write started?
-
-    /// Swap the main and duplicate buffers.
-    void swapBuffers()
-    {
-        swap(out);
-    }
-
-    void nextImpl() override
-    {
-        if (!offset())
-            return;
-
-        if (started)
-            pool.wait();
-        else
-            started = true;
-
-        swapBuffers();
-
-        /// The data will be written in separate stream.
-        pool.scheduleOrThrowOnError([this] { thread(); });
-    }
-
-public:
-    AsynchronousWriteBuffer(WriteBuffer & out_) : WriteBuffer(nullptr, 0), out(out_), memory(out.buffer().size()), pool(1), started(false)
-    {
-        /// Data is written to the duplicate buffer.
-        set(memory.data(), memory.size());
-    }
-
-    ~AsynchronousWriteBuffer() override
-    {
-        /// FIXME move final flush into the caller
-        MemoryTracker::LockExceptionInThread lock;
-
-        if (started)
-            pool.wait();
-
-        swapBuffers();
-        out.next();
-    }
-
-    /// That is executed in a separate thread
-    void thread()
-    {
-        out.next();
-    }
-};
-
-}
diff --git a/src/IO/BrotliWriteBuffer.cpp b/src/IO/BrotliWriteBuffer.cpp
index d14c94ca43d..3d0afa86360 100644
--- a/src/IO/BrotliWriteBuffer.cpp
+++ b/src/IO/BrotliWriteBuffer.cpp
@@ -50,7 +50,7 @@ BrotliWriteBuffer::BrotliWriteBuffer(std::unique_ptr<WriteBuffer> out_, int comp
 BrotliWriteBuffer::~BrotliWriteBuffer()
 {
     /// FIXME move final flush into the caller
-    MemoryTracker::LockExceptionInThread lock;
+    MemoryTracker::LockExceptionInThread lock(VariableContext::Global);
     finish();
 }
 
@@ -64,29 +64,38 @@ void BrotliWriteBuffer::nextImpl()
     in_data = reinterpret_cast<unsigned char *>(working_buffer.begin());
     in_available = offset();
 
-    do
+    try
     {
-        out->nextIfAtEnd();
-        out_data = reinterpret_cast<unsigned char *>(out->position());
-        out_capacity = out->buffer().end() - out->position();
-
-        int result = BrotliEncoderCompressStream(
-                brotli->state,
-                in_available ? BROTLI_OPERATION_PROCESS : BROTLI_OPERATION_FINISH,
-                &in_available,
-                &in_data,
-                &out_capacity,
-                &out_data,
-                nullptr);
-
-        out->position() = out->buffer().end() - out_capacity;
-
-        if (result == 0)
+        do
         {
-            throw Exception("brotli compress failed", ErrorCodes::BROTLI_WRITE_FAILED);
+            out->nextIfAtEnd();
+            out_data = reinterpret_cast<unsigned char *>(out->position());
+            out_capacity = out->buffer().end() - out->position();
+
+            int result = BrotliEncoderCompressStream(
+                    brotli->state,
+                    in_available ? BROTLI_OPERATION_PROCESS : BROTLI_OPERATION_FINISH,
+                    &in_available,
+                    &in_data,
+                    &out_capacity,
+                    &out_data,
+                    nullptr);
+
+            out->position() = out->buffer().end() - out_capacity;
+
+            if (result == 0)
+            {
+                throw Exception("brotli compress failed", ErrorCodes::BROTLI_WRITE_FAILED);
+            }
         }
+        while (in_available > 0);
+    }
+    catch (...)
+    {
+        /// Do not try to write next time after exception.
+        out->position() = out->buffer().begin();
+        throw;
     }
-    while (in_available > 0 || out_capacity == 0);
 }
 
 void BrotliWriteBuffer::finish()
@@ -94,6 +103,23 @@ void BrotliWriteBuffer::finish()
     if (finished)
         return;
 
+    try
+    {
+        finishImpl();
+        out->finalize();
+        finished = true;
+    }
+    catch (...)
+    {
+        /// Do not try to flush next time after exception.
+        out->position() = out->buffer().begin();
+        finished = true;
+        throw;
+    }
+}
+
+void BrotliWriteBuffer::finishImpl()
+{
     next();
 
     while (true)
@@ -115,7 +141,6 @@ void BrotliWriteBuffer::finish()
 
         if (BrotliEncoderIsFinished(brotli->state))
         {
-            finished = true;
             return;
         }
 
diff --git a/src/IO/BrotliWriteBuffer.h b/src/IO/BrotliWriteBuffer.h
index 5a294354f49..26788bc6795 100644
--- a/src/IO/BrotliWriteBuffer.h
+++ b/src/IO/BrotliWriteBuffer.h
@@ -18,11 +18,14 @@ public:
 
     ~BrotliWriteBuffer() override;
 
-    void finish();
+    void finalize() override { finish(); }
 
 private:
     void nextImpl() override;
 
+    void finish();
+    void finishImpl();
+
     class BrotliStateWrapper;
     std::unique_ptr<BrotliStateWrapper> brotli;
 
diff --git a/src/IO/CompressionMethod.cpp b/src/IO/CompressionMethod.cpp
index 8c0c2744a0a..6e437e34c10 100644
--- a/src/IO/CompressionMethod.cpp
+++ b/src/IO/CompressionMethod.cpp
@@ -15,6 +15,8 @@
 #    include <Common/config.h>
 #endif
 
+#include <boost/algorithm/string/case_conv.hpp>
+
 
 namespace DB
 {
@@ -55,23 +57,24 @@ CompressionMethod chooseCompressionMethod(const std::string & path, const std::s
             file_extension = path.substr(pos + 1, std::string::npos);
     }
 
-    const std::string * method_str = file_extension.empty() ? &hint : &file_extension;
+    std::string method_str = file_extension.empty() ? hint : std::move(file_extension);
+    boost::algorithm::to_lower(method_str);
 
-    if (*method_str == "gzip" || *method_str == "gz")
+    if (method_str == "gzip" || method_str == "gz")
         return CompressionMethod::Gzip;
-    if (*method_str == "deflate")
+    if (method_str == "deflate")
         return CompressionMethod::Zlib;
-    if (*method_str == "brotli" || *method_str == "br")
+    if (method_str == "brotli" || method_str == "br")
         return CompressionMethod::Brotli;
-    if (*method_str == "LZMA" || *method_str == "xz")
+    if (method_str == "lzma" || method_str == "xz")
         return CompressionMethod::Xz;
-    if (*method_str == "zstd" || *method_str == "zst")
+    if (method_str == "zstd" || method_str == "zst")
         return CompressionMethod::Zstd;
     if (hint.empty() || hint == "auto" || hint == "none")
         return CompressionMethod::None;
 
     throw Exception(
-        "Unknown compression method " + hint + ". Only 'auto', 'none', 'gzip', 'br', 'xz', 'zstd' are supported as compression methods",
+        "Unknown compression method " + hint + ". Only 'auto', 'none', 'gzip', 'deflate', 'br', 'xz', 'zstd' are supported as compression methods",
         ErrorCodes::NOT_IMPLEMENTED);
 }
 
diff --git a/src/IO/ConnectionTimeouts.h b/src/IO/ConnectionTimeouts.h
index e5efabee6e2..ba3be840e77 100644
--- a/src/IO/ConnectionTimeouts.h
+++ b/src/IO/ConnectionTimeouts.h
@@ -1,11 +1,12 @@
 #pragma once
 
+#include <Interpreters/Context_fwd.h>
+
 #include <Poco/Timespan.h>
 
 namespace DB
 {
 
-class Context;
 struct Settings;
 
 struct ConnectionTimeouts
@@ -17,6 +18,10 @@ struct ConnectionTimeouts
     Poco::Timespan http_keep_alive_timeout;
     Poco::Timespan secure_connection_timeout;
 
+    /// Timeouts for HedgedConnections
+    Poco::Timespan hedged_connection_timeout;
+    Poco::Timespan receive_data_timeout;
+
     ConnectionTimeouts() = default;
 
     ConnectionTimeouts(const Poco::Timespan & connection_timeout_,
@@ -27,7 +32,9 @@ struct ConnectionTimeouts
       receive_timeout(receive_timeout_),
       tcp_keep_alive_timeout(0),
       http_keep_alive_timeout(0),
-      secure_connection_timeout(connection_timeout)
+      secure_connection_timeout(connection_timeout),
+      hedged_connection_timeout(receive_timeout_),
+      receive_data_timeout(receive_timeout_)
     {
     }
 
@@ -40,7 +47,9 @@ struct ConnectionTimeouts
       receive_timeout(receive_timeout_),
       tcp_keep_alive_timeout(tcp_keep_alive_timeout_),
       http_keep_alive_timeout(0),
-      secure_connection_timeout(connection_timeout)
+      secure_connection_timeout(connection_timeout),
+      hedged_connection_timeout(receive_timeout_),
+      receive_data_timeout(receive_timeout_)
     {
     }
     ConnectionTimeouts(const Poco::Timespan & connection_timeout_,
@@ -53,7 +62,9 @@ struct ConnectionTimeouts
           receive_timeout(receive_timeout_),
           tcp_keep_alive_timeout(tcp_keep_alive_timeout_),
           http_keep_alive_timeout(http_keep_alive_timeout_),
-          secure_connection_timeout(connection_timeout)
+          secure_connection_timeout(connection_timeout),
+          hedged_connection_timeout(receive_timeout_),
+          receive_data_timeout(receive_timeout_)
     {
     }
 
@@ -62,13 +73,17 @@ struct ConnectionTimeouts
                        const Poco::Timespan & receive_timeout_,
                        const Poco::Timespan & tcp_keep_alive_timeout_,
                        const Poco::Timespan & http_keep_alive_timeout_,
-                       const Poco::Timespan & secure_connection_timeout_)
-            : connection_timeout(connection_timeout_),
-              send_timeout(send_timeout_),
-              receive_timeout(receive_timeout_),
-              tcp_keep_alive_timeout(tcp_keep_alive_timeout_),
-              http_keep_alive_timeout(http_keep_alive_timeout_),
-              secure_connection_timeout(secure_connection_timeout_)
+                       const Poco::Timespan & secure_connection_timeout_,
+                       const Poco::Timespan & receive_hello_timeout_,
+                       const Poco::Timespan & receive_data_timeout_)
+        : connection_timeout(connection_timeout_),
+          send_timeout(send_timeout_),
+          receive_timeout(receive_timeout_),
+          tcp_keep_alive_timeout(tcp_keep_alive_timeout_),
+          http_keep_alive_timeout(http_keep_alive_timeout_),
+          secure_connection_timeout(secure_connection_timeout_),
+          hedged_connection_timeout(receive_hello_timeout_),
+          receive_data_timeout(receive_data_timeout_)
     {
     }
 
@@ -87,14 +102,16 @@ struct ConnectionTimeouts
                                   saturate(receive_timeout, limit),
                                   saturate(tcp_keep_alive_timeout, limit),
                                   saturate(http_keep_alive_timeout, limit),
-                                  saturate(secure_connection_timeout, limit));
+                                  saturate(secure_connection_timeout, limit),
+                                  saturate(hedged_connection_timeout, limit),
+                                  saturate(receive_data_timeout, limit));
     }
 
     /// Timeouts for the case when we have just single attempt to connect.
     static ConnectionTimeouts getTCPTimeoutsWithoutFailover(const Settings & settings);
     /// Timeouts for the case when we will try many addresses in a loop.
     static ConnectionTimeouts getTCPTimeoutsWithFailover(const Settings & settings);
-    static ConnectionTimeouts getHTTPTimeouts(const Context & context);
+    static ConnectionTimeouts getHTTPTimeouts(ContextPtr context);
 };
 
 }
diff --git a/src/IO/ConnectionTimeoutsContext.h b/src/IO/ConnectionTimeoutsContext.h
index ce19738f507..8d6f96b82a3 100644
--- a/src/IO/ConnectionTimeoutsContext.h
+++ b/src/IO/ConnectionTimeoutsContext.h
@@ -16,13 +16,21 @@ inline ConnectionTimeouts ConnectionTimeouts::getTCPTimeoutsWithoutFailover(cons
 /// Timeouts for the case when we will try many addresses in a loop.
 inline ConnectionTimeouts ConnectionTimeouts::getTCPTimeoutsWithFailover(const Settings & settings)
 {
-    return ConnectionTimeouts(settings.connect_timeout_with_failover_ms, settings.send_timeout, settings.receive_timeout, settings.tcp_keep_alive_timeout, 0, settings.connect_timeout_with_failover_secure_ms);
+    return ConnectionTimeouts(
+        settings.connect_timeout_with_failover_ms,
+        settings.send_timeout,
+        settings.receive_timeout,
+        settings.tcp_keep_alive_timeout,
+        0,
+        settings.connect_timeout_with_failover_secure_ms,
+        settings.hedged_connection_timeout_ms,
+        settings.receive_data_timeout_ms);
 }
 
-inline ConnectionTimeouts ConnectionTimeouts::getHTTPTimeouts(const Context & context)
+inline ConnectionTimeouts ConnectionTimeouts::getHTTPTimeouts(ContextPtr context)
 {
-    const auto & settings = context.getSettingsRef();
-    const auto & config = context.getConfigRef();
+    const auto & settings = context->getSettingsRef();
+    const auto & config = context->getConfigRef();
     Poco::Timespan http_keep_alive_timeout{config.getUInt("keep_alive_timeout", 10), 0};
     return ConnectionTimeouts(settings.http_connection_timeout, settings.http_send_timeout, settings.http_receive_timeout, settings.tcp_keep_alive_timeout, http_keep_alive_timeout);
 }
diff --git a/src/IO/HTTPChunkedReadBuffer.cpp b/src/IO/HTTPChunkedReadBuffer.cpp
index bd9bbba4c6c..374e04031d0 100644
--- a/src/IO/HTTPChunkedReadBuffer.cpp
+++ b/src/IO/HTTPChunkedReadBuffer.cpp
@@ -14,7 +14,6 @@ namespace ErrorCodes
     extern const int ARGUMENT_OUT_OF_BOUND;
     extern const int UNEXPECTED_END_OF_FILE;
     extern const int CORRUPTED_DATA;
-    extern const int TOO_MANY_BYTES;
 }
 
 size_t HTTPChunkedReadBuffer::readChunkHeader()
@@ -40,9 +39,6 @@ size_t HTTPChunkedReadBuffer::readChunkHeader()
     if (in->eof())
         throw Exception("Unexpected end of file while reading chunk header of HTTP chunked data", ErrorCodes::UNEXPECTED_END_OF_FILE);
 
-    if (res > max_size)
-        throw Exception("Chunk size is too large", ErrorCodes::TOO_MANY_BYTES);
-
     assertString("\n", *in);
     return res;
 }
diff --git a/src/IO/HTTPChunkedReadBuffer.h b/src/IO/HTTPChunkedReadBuffer.h
index 0ccebc69d08..378835cafc0 100644
--- a/src/IO/HTTPChunkedReadBuffer.h
+++ b/src/IO/HTTPChunkedReadBuffer.h
@@ -10,11 +10,10 @@ namespace DB
 class HTTPChunkedReadBuffer : public BufferWithOwnMemory<ReadBuffer>
 {
 public:
-    HTTPChunkedReadBuffer(std::unique_ptr<ReadBuffer> in_, size_t max_chunk_size) : in(std::move(in_)), max_size(max_chunk_size) {}
+    explicit HTTPChunkedReadBuffer(std::unique_ptr<ReadBuffer> in_) : in(std::move(in_)) {}
 
 private:
     std::unique_ptr<ReadBuffer> in;
-    const size_t max_size;
 
     size_t readChunkHeader();
     void readChunkFooter();
diff --git a/src/IO/HexWriteBuffer.cpp b/src/IO/HexWriteBuffer.cpp
deleted file mode 100644
index 4e3403ba74b..00000000000
--- a/src/IO/HexWriteBuffer.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-#include <common/types.h>
-#include <Common/hex.h>
-#include <Common/MemoryTracker.h>
-#include <IO/HexWriteBuffer.h>
-
-
-namespace DB
-{
-
-void HexWriteBuffer::nextImpl()
-{
-    if (!offset())
-        return;
-
-    for (Position p = working_buffer.begin(); p != pos; ++p)
-    {
-        UInt8 byte = *p;
-        out.write(hexDigitUppercase(byte / 16));
-        out.write(hexDigitUppercase(byte % 16));
-    }
-}
-
-HexWriteBuffer::~HexWriteBuffer()
-{
-    /// FIXME move final flush into the caller
-    MemoryTracker::LockExceptionInThread lock;
-    nextImpl();
-}
-
-}
diff --git a/src/IO/HexWriteBuffer.h b/src/IO/HexWriteBuffer.h
deleted file mode 100644
index a68dd29065b..00000000000
--- a/src/IO/HexWriteBuffer.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#pragma once
-
-#include <IO/WriteBuffer.h>
-
-
-/// Since HexWriteBuffer is often created in the inner loop, we'll make its buffer size small.
-#define DBMS_HEX_WRITE_BUFFER_SIZE 32
-
-
-namespace DB
-{
-
-/** Everything that is written into it, translates to HEX (in capital letters) and writes to another WriteBuffer.
-  */
-class HexWriteBuffer final : public WriteBuffer
-{
-protected:
-    char buf[DBMS_HEX_WRITE_BUFFER_SIZE]; //-V730
-    WriteBuffer & out;
-
-    void nextImpl() override;
-
-public:
-    HexWriteBuffer(WriteBuffer & out_) : WriteBuffer(buf, sizeof(buf)), out(out_) {}
-    ~HexWriteBuffer() override;
-};
-
-}
diff --git a/src/IO/LZMADeflatingWriteBuffer.cpp b/src/IO/LZMADeflatingWriteBuffer.cpp
index 5803bc1e9f1..29cde872241 100644
--- a/src/IO/LZMADeflatingWriteBuffer.cpp
+++ b/src/IO/LZMADeflatingWriteBuffer.cpp
@@ -50,7 +50,7 @@ LZMADeflatingWriteBuffer::LZMADeflatingWriteBuffer(
 LZMADeflatingWriteBuffer::~LZMADeflatingWriteBuffer()
 {
     /// FIXME move final flush into the caller
-    MemoryTracker::LockExceptionInThread lock;
+    MemoryTracker::LockExceptionInThread lock(VariableContext::Global);
 
     finish();
     lzma_end(&lstr);
@@ -64,27 +64,36 @@ void LZMADeflatingWriteBuffer::nextImpl()
     lstr.next_in = reinterpret_cast<unsigned char *>(working_buffer.begin());
     lstr.avail_in = offset();
 
-    lzma_action action = LZMA_RUN;
-    do
+    try
     {
-        out->nextIfAtEnd();
-        lstr.next_out = reinterpret_cast<unsigned char *>(out->position());
-        lstr.avail_out = out->buffer().end() - out->position();
+        lzma_action action = LZMA_RUN;
+        do
+        {
+            out->nextIfAtEnd();
+            lstr.next_out = reinterpret_cast<unsigned char *>(out->position());
+            lstr.avail_out = out->buffer().end() - out->position();
 
-        lzma_ret ret = lzma_code(&lstr, action);
-        out->position() = out->buffer().end() - lstr.avail_out;
+            lzma_ret ret = lzma_code(&lstr, action);
+            out->position() = out->buffer().end() - lstr.avail_out;
 
-        if (ret == LZMA_STREAM_END)
-            return;
+            if (ret == LZMA_STREAM_END)
+                return;
 
-        if (ret != LZMA_OK)
-            throw Exception(
-                ErrorCodes::LZMA_STREAM_ENCODER_FAILED,
-                "lzma stream encoding failed: error code: {}; lzma_version: {}",
-                ret,
-                LZMA_VERSION_STRING);
+            if (ret != LZMA_OK)
+                throw Exception(
+                    ErrorCodes::LZMA_STREAM_ENCODER_FAILED,
+                    "lzma stream encoding failed: error code: {}; lzma_version: {}",
+                    ret,
+                    LZMA_VERSION_STRING);
 
-    } while (lstr.avail_in > 0 || lstr.avail_out == 0);
+        } while (lstr.avail_in > 0 || lstr.avail_out == 0);
+    }
+    catch (...)
+    {
+        /// Do not try to write next time after exception.
+        out->position() = out->buffer().begin();
+        throw;
+    }
 }
 
 
@@ -93,6 +102,23 @@ void LZMADeflatingWriteBuffer::finish()
     if (finished)
         return;
 
+    try
+    {
+        finishImpl();
+        out->finalize();
+        finished = true;
+    }
+    catch (...)
+    {
+        /// Do not try to flush next time after exception.
+        out->position() = out->buffer().begin();
+        finished = true;
+        throw;
+    }
+}
+
+void LZMADeflatingWriteBuffer::finishImpl()
+{
     next();
 
     do
@@ -106,7 +132,6 @@ void LZMADeflatingWriteBuffer::finish()
 
         if (ret == LZMA_STREAM_END)
         {
-            finished = true;
             return;
         }
 
diff --git a/src/IO/LZMADeflatingWriteBuffer.h b/src/IO/LZMADeflatingWriteBuffer.h
index efa4532d372..98eb1732e76 100644
--- a/src/IO/LZMADeflatingWriteBuffer.h
+++ b/src/IO/LZMADeflatingWriteBuffer.h
@@ -24,13 +24,16 @@ public:
         char * existing_memory = nullptr,
         size_t alignment = 0);
 
-    void finish();
+    void finalize() override { finish(); }
 
     ~LZMADeflatingWriteBuffer() override;
 
 private:
     void nextImpl() override;
 
+    void finish();
+    void finishImpl();
+
     std::unique_ptr<WriteBuffer> out;
     lzma_stream lstr;
     bool finished = false;
diff --git a/src/IO/MMapReadBufferFromFile.cpp b/src/IO/MMapReadBufferFromFile.cpp
index d881e0d2b30..b3354c42fbb 100644
--- a/src/IO/MMapReadBufferFromFile.cpp
+++ b/src/IO/MMapReadBufferFromFile.cpp
@@ -44,7 +44,8 @@ MMapReadBufferFromFile::MMapReadBufferFromFile(const std::string & file_name_, s
     : file_name(file_name_)
 {
     open();
-    init(fd, offset, length_);
+    mapped.set(fd, offset, length_);
+    init();
 }
 
 
@@ -52,7 +53,8 @@ MMapReadBufferFromFile::MMapReadBufferFromFile(const std::string & file_name_, s
     : file_name(file_name_)
 {
     open();
-    init(fd, offset);
+    mapped.set(fd, offset);
+    init();
 }
 
 
diff --git a/src/IO/MMapReadBufferFromFileDescriptor.cpp b/src/IO/MMapReadBufferFromFileDescriptor.cpp
index 2034a116e0c..c5adfc017ae 100644
--- a/src/IO/MMapReadBufferFromFileDescriptor.cpp
+++ b/src/IO/MMapReadBufferFromFileDescriptor.cpp
@@ -16,91 +16,49 @@ namespace DB
 
 namespace ErrorCodes
 {
-    extern const int CANNOT_ALLOCATE_MEMORY;
-    extern const int CANNOT_MUNMAP;
-    extern const int CANNOT_STAT;
-    extern const int BAD_ARGUMENTS;
-    extern const int LOGICAL_ERROR;
     extern const int ARGUMENT_OUT_OF_BOUND;
     extern const int CANNOT_SEEK_THROUGH_FILE;
 }
 
 
-void MMapReadBufferFromFileDescriptor::init(int fd_, size_t offset, size_t length_)
+void MMapReadBufferFromFileDescriptor::init()
 {
-    fd = fd_;
-    length = length_;
+    size_t length = mapped.getLength();
+    BufferBase::set(mapped.getData(), length, 0);
 
-    if (length)
-    {
-        void * buf = mmap(nullptr, length, PROT_READ, MAP_PRIVATE, fd, offset);
-        if (MAP_FAILED == buf)
-            throwFromErrno(fmt::format("MMapReadBufferFromFileDescriptor: Cannot mmap {}.", ReadableSize(length)),
-                ErrorCodes::CANNOT_ALLOCATE_MEMORY);
-
-        BufferBase::set(static_cast<char *>(buf), length, 0);
-
-        size_t page_size = static_cast<size_t>(::getPageSize());
-        ReadBuffer::padded = (length % page_size) > 0 && (length % page_size) <= (page_size - 15);
-    }
-}
-
-void MMapReadBufferFromFileDescriptor::init(int fd_, size_t offset)
-{
-    fd = fd_;
-
-    struct stat stat_res {};
-    if (0 != fstat(fd, &stat_res))
-        throwFromErrno("MMapReadBufferFromFileDescriptor: Cannot fstat.", ErrorCodes::CANNOT_STAT);
-
-    off_t file_size = stat_res.st_size;
-
-    if (file_size < 0)
-        throw Exception("MMapReadBufferFromFileDescriptor: fstat returned negative file size", ErrorCodes::LOGICAL_ERROR);
-
-    if (offset > static_cast<size_t>(file_size))
-        throw Exception("MMapReadBufferFromFileDescriptor: requested offset is greater than file size", ErrorCodes::BAD_ARGUMENTS);
-
-    init(fd, offset, file_size - offset);
+    size_t page_size = static_cast<size_t>(::getPageSize());
+    ReadBuffer::padded = (length % page_size) > 0 && (length % page_size) <= (page_size - 15);
 }
 
 
-MMapReadBufferFromFileDescriptor::MMapReadBufferFromFileDescriptor(int fd_, size_t offset_, size_t length_)
+MMapReadBufferFromFileDescriptor::MMapReadBufferFromFileDescriptor(int fd, size_t offset, size_t length)
+    : mapped(fd, offset, length)
 {
-    init(fd_, offset_, length_);
+    init();
 }
 
 
-MMapReadBufferFromFileDescriptor::MMapReadBufferFromFileDescriptor(int fd_, size_t offset_)
+MMapReadBufferFromFileDescriptor::MMapReadBufferFromFileDescriptor(int fd, size_t offset)
+    : mapped(fd, offset)
 {
-    init(fd_, offset_);
-}
-
-
-MMapReadBufferFromFileDescriptor::~MMapReadBufferFromFileDescriptor()
-{
-    if (length)
-        finish();    /// Exceptions will lead to std::terminate and that's Ok.
+    init();
 }
 
 
 void MMapReadBufferFromFileDescriptor::finish()
 {
-    if (0 != munmap(internalBuffer().begin(), length))
-        throwFromErrno(fmt::format("MMapReadBufferFromFileDescriptor: Cannot munmap {}.", ReadableSize(length)),
-            ErrorCodes::CANNOT_MUNMAP);
-
-    length = 0;
+    mapped.finish();
 }
 
+
 std::string MMapReadBufferFromFileDescriptor::getFileName() const
 {
-    return "(fd = " + toString(fd) + ")";
+    return "(fd = " + toString(mapped.getFD()) + ")";
 }
 
 int MMapReadBufferFromFileDescriptor::getFD() const
 {
-    return fd;
+    return mapped.getFD();
 }
 
 off_t MMapReadBufferFromFileDescriptor::getPosition()
@@ -116,13 +74,13 @@ off_t MMapReadBufferFromFileDescriptor::seek(off_t offset, int whence)
     else if (whence == SEEK_CUR)
         new_pos = count() + offset;
     else
-        throw Exception("MMapReadBufferFromFileDescriptor::seek expects SEEK_SET or SEEK_CUR as whence", ErrorCodes::ARGUMENT_OUT_OF_BOUND);
+        throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND, "MMapReadBufferFromFileDescriptor::seek expects SEEK_SET or SEEK_CUR as whence");
 
     working_buffer = internal_buffer;
     if (new_pos < 0 || new_pos > off_t(working_buffer.size()))
-        throw Exception("Cannot seek through file " + getFileName()
-            + " because seek position (" + toString(new_pos) + ") is out of bounds [0, " + toString(working_buffer.size()) + "]",
-            ErrorCodes::CANNOT_SEEK_THROUGH_FILE);
+        throw Exception(ErrorCodes::CANNOT_SEEK_THROUGH_FILE,
+            "Cannot seek through file {} because seek position ({}) is out of bounds [0, {}]",
+            getFileName(), new_pos, working_buffer.size());
 
     position() = working_buffer.begin() + new_pos;
     return new_pos;
diff --git a/src/IO/MMapReadBufferFromFileDescriptor.h b/src/IO/MMapReadBufferFromFileDescriptor.h
index e409e9d2d0c..03718a61a6c 100644
--- a/src/IO/MMapReadBufferFromFileDescriptor.h
+++ b/src/IO/MMapReadBufferFromFileDescriptor.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <IO/ReadBufferFromFileBase.h>
+#include <IO/MMappedFileDescriptor.h>
 
 
 namespace DB
@@ -18,8 +19,9 @@ public:
 
 protected:
     MMapReadBufferFromFileDescriptor() {}
-    void init(int fd_, size_t offset, size_t length_);
-    void init(int fd_, size_t offset);
+    void init();
+
+    MMappedFileDescriptor mapped;
 
 public:
     MMapReadBufferFromFileDescriptor(int fd_, size_t offset_, size_t length_);
@@ -27,18 +29,12 @@ public:
     /// Map till end of file.
     MMapReadBufferFromFileDescriptor(int fd_, size_t offset_);
 
-    ~MMapReadBufferFromFileDescriptor() override;
-
     /// unmap memory before call to destructor
     void finish();
 
     off_t getPosition() override;
     std::string getFileName() const override;
     int getFD() const;
-
-private:
-    size_t length = 0;
-    int fd = -1;
 };
 
 }
diff --git a/src/IO/MMapReadBufferFromFileWithCache.cpp b/src/IO/MMapReadBufferFromFileWithCache.cpp
new file mode 100644
index 00000000000..0d31c29bdaa
--- /dev/null
+++ b/src/IO/MMapReadBufferFromFileWithCache.cpp
@@ -0,0 +1,77 @@
+#include <IO/MMapReadBufferFromFileWithCache.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int ARGUMENT_OUT_OF_BOUND;
+    extern const int CANNOT_SEEK_THROUGH_FILE;
+}
+
+
+void MMapReadBufferFromFileWithCache::init()
+{
+    size_t length = mapped->getLength();
+    BufferBase::set(mapped->getData(), length, 0);
+
+    size_t page_size = static_cast<size_t>(::getPageSize());
+    ReadBuffer::padded = (length % page_size) > 0 && (length % page_size) <= (page_size - 15);
+}
+
+
+MMapReadBufferFromFileWithCache::MMapReadBufferFromFileWithCache(
+    MMappedFileCache & cache, const std::string & file_name, size_t offset, size_t length)
+{
+    mapped = cache.getOrSet(cache.hash(file_name, offset, length), [&]
+    {
+        return std::make_shared<MMappedFile>(file_name, offset, length);
+    });
+
+    init();
+}
+
+MMapReadBufferFromFileWithCache::MMapReadBufferFromFileWithCache(
+    MMappedFileCache & cache, const std::string & file_name, size_t offset)
+{
+    mapped = cache.getOrSet(cache.hash(file_name, offset, -1), [&]
+    {
+        return std::make_shared<MMappedFile>(file_name, offset);
+    });
+
+    init();
+}
+
+
+std::string MMapReadBufferFromFileWithCache::getFileName() const
+{
+    return mapped->getFileName();
+}
+
+off_t MMapReadBufferFromFileWithCache::getPosition()
+{
+    return count();
+}
+
+off_t MMapReadBufferFromFileWithCache::seek(off_t offset, int whence)
+{
+    off_t new_pos;
+    if (whence == SEEK_SET)
+        new_pos = offset;
+    else if (whence == SEEK_CUR)
+        new_pos = count() + offset;
+    else
+        throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND, "MMapReadBufferFromFileWithCache::seek expects SEEK_SET or SEEK_CUR as whence");
+
+    working_buffer = internal_buffer;
+    if (new_pos < 0 || new_pos > off_t(working_buffer.size()))
+        throw Exception(ErrorCodes::CANNOT_SEEK_THROUGH_FILE,
+            "Cannot seek through file {} because seek position ({}) is out of bounds [0, {}]",
+            getFileName(), new_pos, working_buffer.size());
+
+    position() = working_buffer.begin() + new_pos;
+    return new_pos;
+}
+
+}
diff --git a/src/IO/MMapReadBufferFromFileWithCache.h b/src/IO/MMapReadBufferFromFileWithCache.h
new file mode 100644
index 00000000000..ff84f81610a
--- /dev/null
+++ b/src/IO/MMapReadBufferFromFileWithCache.h
@@ -0,0 +1,29 @@
+#pragma once
+
+#include <IO/ReadBufferFromFileBase.h>
+#include <IO/MMappedFileCache.h>
+#include <IO/MMapReadBufferFromFileDescriptor.h>
+
+
+namespace DB
+{
+
+class MMapReadBufferFromFileWithCache : public ReadBufferFromFileBase
+{
+public:
+    MMapReadBufferFromFileWithCache(MMappedFileCache & cache, const std::string & file_name, size_t offset, size_t length);
+
+    /// Map till end of file.
+    MMapReadBufferFromFileWithCache(MMappedFileCache & cache, const std::string & file_name, size_t offset);
+
+    off_t getPosition() override;
+    std::string getFileName() const override;
+    off_t seek(off_t offset, int whence) override;
+
+private:
+    MMappedFileCache::MappedPtr mapped;
+
+    void init();
+};
+
+}
diff --git a/src/IO/MMappedFile.cpp b/src/IO/MMappedFile.cpp
new file mode 100644
index 00000000000..edd2e5ef0ce
--- /dev/null
+++ b/src/IO/MMappedFile.cpp
@@ -0,0 +1,78 @@
+#include <unistd.h>
+#include <fcntl.h>
+
+#include <Common/ProfileEvents.h>
+#include <Common/formatReadable.h>
+#include <Common/Exception.h>
+#include <IO/MMappedFile.h>
+
+
+namespace ProfileEvents
+{
+    extern const Event FileOpen;
+}
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int FILE_DOESNT_EXIST;
+    extern const int CANNOT_OPEN_FILE;
+    extern const int CANNOT_CLOSE_FILE;
+}
+
+
+void MMappedFile::open()
+{
+    ProfileEvents::increment(ProfileEvents::FileOpen);
+
+    fd = ::open(file_name.c_str(), O_RDONLY | O_CLOEXEC);
+
+    if (-1 == fd)
+        throwFromErrnoWithPath("Cannot open file " + file_name, file_name,
+                               errno == ENOENT ? ErrorCodes::FILE_DOESNT_EXIST : ErrorCodes::CANNOT_OPEN_FILE);
+}
+
+
+std::string MMappedFile::getFileName() const
+{
+    return file_name;
+}
+
+
+MMappedFile::MMappedFile(const std::string & file_name_, size_t offset_, size_t length_)
+    : file_name(file_name_)
+{
+    open();
+    set(fd, offset_, length_);
+}
+
+
+MMappedFile::MMappedFile(const std::string & file_name_, size_t offset_)
+    : file_name(file_name_)
+{
+    open();
+    set(fd, offset_);
+}
+
+
+MMappedFile::~MMappedFile()
+{
+    if (fd != -1)
+        close();    /// Exceptions will lead to std::terminate and that's Ok.
+}
+
+
+void MMappedFile::close()
+{
+    finish();
+
+    if (0 != ::close(fd))
+        throw Exception("Cannot close file", ErrorCodes::CANNOT_CLOSE_FILE);
+
+    fd = -1;
+    metric_increment.destroy();
+}
+
+}
diff --git a/src/IO/MMappedFile.h b/src/IO/MMappedFile.h
new file mode 100644
index 00000000000..6ecf988fa94
--- /dev/null
+++ b/src/IO/MMappedFile.h
@@ -0,0 +1,40 @@
+#pragma once
+
+#include <Common/CurrentMetrics.h>
+#include <IO/MMappedFileDescriptor.h>
+#include <cstddef>
+
+
+namespace CurrentMetrics
+{
+    extern const Metric OpenFileForRead;
+}
+
+
+namespace DB
+{
+
+/// Opens a file and mmaps a region in it (or a whole file) into memory. Unmaps and closes in destructor.
+class MMappedFile : public MMappedFileDescriptor
+{
+public:
+    MMappedFile(const std::string & file_name_, size_t offset_, size_t length_);
+
+    /// Map till end of file.
+    MMappedFile(const std::string & file_name_, size_t offset_);
+
+    ~MMappedFile() override;
+
+    void close();
+
+    std::string getFileName() const;
+
+private:
+    std::string file_name;
+
+    CurrentMetrics::Increment metric_increment{CurrentMetrics::OpenFileForRead};
+
+    void open();
+};
+
+}
diff --git a/src/IO/MMappedFileCache.h b/src/IO/MMappedFileCache.h
new file mode 100644
index 00000000000..cbd1977350b
--- /dev/null
+++ b/src/IO/MMappedFileCache.h
@@ -0,0 +1,63 @@
+#pragma once
+
+#include <Common/LRUCache.h>
+#include <Common/SipHash.h>
+#include <Common/UInt128.h>
+#include <Common/ProfileEvents.h>
+#include <IO/MMappedFile.h>
+
+
+namespace ProfileEvents
+{
+    extern const Event MMappedFileCacheHits;
+    extern const Event MMappedFileCacheMisses;
+}
+
+namespace DB
+{
+
+
+/** Cache of opened and mmapped files for reading.
+  * mmap/munmap is heavy operation and better to keep mapped file to subsequent use than to map/unmap every time.
+  */
+class MMappedFileCache : public LRUCache<UInt128, MMappedFile, UInt128TrivialHash>
+{
+private:
+    using Base = LRUCache<UInt128, MMappedFile, UInt128TrivialHash>;
+
+public:
+    MMappedFileCache(size_t max_size_in_bytes)
+        : Base(max_size_in_bytes) {}
+
+    /// Calculate key from path to file and offset.
+    static UInt128 hash(const String & path_to_file, size_t offset, ssize_t length = -1)
+    {
+        UInt128 key;
+
+        SipHash hash;
+        hash.update(path_to_file.data(), path_to_file.size() + 1);
+        hash.update(offset);
+        hash.update(length);
+
+        hash.get128(key.low, key.high);
+
+        return key;
+    }
+
+    template <typename LoadFunc>
+    MappedPtr getOrSet(const Key & key, LoadFunc && load)
+    {
+        auto result = Base::getOrSet(key, load);
+        if (result.second)
+            ProfileEvents::increment(ProfileEvents::MMappedFileCacheMisses);
+        else
+            ProfileEvents::increment(ProfileEvents::MMappedFileCacheHits);
+
+        return result.first;
+    }
+};
+
+using MMappedFileCachePtr = std::shared_ptr<MMappedFileCache>;
+
+}
+
diff --git a/src/IO/MMappedFileDescriptor.cpp b/src/IO/MMappedFileDescriptor.cpp
new file mode 100644
index 00000000000..db2752d14f9
--- /dev/null
+++ b/src/IO/MMappedFileDescriptor.cpp
@@ -0,0 +1,107 @@
+#include <sys/mman.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+#include <fmt/format.h>
+
+#include <Common/formatReadable.h>
+#include <Common/Exception.h>
+#include <common/getPageSize.h>
+#include <IO/MMappedFileDescriptor.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int CANNOT_ALLOCATE_MEMORY;
+    extern const int CANNOT_MUNMAP;
+    extern const int CANNOT_STAT;
+    extern const int BAD_ARGUMENTS;
+    extern const int LOGICAL_ERROR;
+}
+
+
+static size_t getFileSize(int fd)
+{
+    struct stat stat_res {};
+    if (0 != fstat(fd, &stat_res))
+        throwFromErrno("MMappedFileDescriptor: Cannot fstat.", ErrorCodes::CANNOT_STAT);
+
+    off_t file_size = stat_res.st_size;
+
+    if (file_size < 0)
+        throw Exception("MMappedFileDescriptor: fstat returned negative file size", ErrorCodes::LOGICAL_ERROR);
+
+    return file_size;
+}
+
+
+MMappedFileDescriptor::MMappedFileDescriptor(int fd_, size_t offset_, size_t length_)
+{
+    set(fd_, offset_, length_);
+}
+
+MMappedFileDescriptor::MMappedFileDescriptor(int fd_, size_t offset_)
+    : fd(fd_), offset(offset_)
+{
+    set(fd_, offset_);
+}
+
+void MMappedFileDescriptor::set(int fd_, size_t offset_, size_t length_)
+{
+    finish();
+
+    fd = fd_;
+    offset = offset_;
+    length = length_;
+
+    if (!length)
+        return;
+
+    void * buf = mmap(nullptr, length, PROT_READ, MAP_PRIVATE, fd, offset);
+    if (MAP_FAILED == buf)
+        throwFromErrno(fmt::format("MMappedFileDescriptor: Cannot mmap {}.", ReadableSize(length)),
+            ErrorCodes::CANNOT_ALLOCATE_MEMORY);
+
+    data = static_cast<char *>(buf);
+
+    files_metric_increment.changeTo(1);
+    bytes_metric_increment.changeTo(length);
+}
+
+void MMappedFileDescriptor::set(int fd_, size_t offset_)
+{
+    size_t file_size = getFileSize(fd_);
+
+    if (offset > static_cast<size_t>(file_size))
+        throw Exception("MMappedFileDescriptor: requested offset is greater than file size", ErrorCodes::BAD_ARGUMENTS);
+
+    set(fd_, offset_, file_size - offset);
+}
+
+void MMappedFileDescriptor::finish()
+{
+    if (!length)
+        return;
+
+    if (0 != munmap(data, length))
+        throwFromErrno(fmt::format("MMappedFileDescriptor: Cannot munmap {}.", ReadableSize(length)),
+            ErrorCodes::CANNOT_MUNMAP);
+
+    length = 0;
+
+    files_metric_increment.changeTo(0);
+    bytes_metric_increment.changeTo(0);
+}
+
+MMappedFileDescriptor::~MMappedFileDescriptor()
+{
+    finish(); /// Exceptions will lead to std::terminate and that's Ok.
+}
+
+}
+
+
diff --git a/src/IO/MMappedFileDescriptor.h b/src/IO/MMappedFileDescriptor.h
new file mode 100644
index 00000000000..01dc7e1866c
--- /dev/null
+++ b/src/IO/MMappedFileDescriptor.h
@@ -0,0 +1,59 @@
+#pragma once
+
+#include <cstddef>
+#include <Common/CurrentMetrics.h>
+
+namespace CurrentMetrics
+{
+    extern const Metric MMappedFiles;
+    extern const Metric MMappedFileBytes;
+}
+
+
+namespace DB
+{
+
+/// MMaps a region in file (or a whole file) into memory. Unmaps in destructor.
+/// Does not open or close file.
+class MMappedFileDescriptor
+{
+public:
+    MMappedFileDescriptor(int fd_, size_t offset_, size_t length_);
+    MMappedFileDescriptor(int fd_, size_t offset_);
+
+    /// Makes empty object that can be initialized with `set`.
+    MMappedFileDescriptor() {}
+
+    virtual ~MMappedFileDescriptor();
+
+    char * getData() { return data; }
+    const char * getData() const { return data; }
+
+    int getFD() const { return fd; }
+    size_t getOffset() const { return offset; }
+    size_t getLength() const { return length; }
+
+    /// Unmap memory before call to destructor
+    void finish();
+
+    /// Initialize or reset to another fd.
+    void set(int fd_, size_t offset_, size_t length_);
+    void set(int fd_, size_t offset_);
+
+protected:
+    MMappedFileDescriptor(const MMappedFileDescriptor &) = delete;
+    MMappedFileDescriptor(MMappedFileDescriptor &&) = delete;
+
+    void init();
+
+    int fd = -1;
+    size_t offset = 0;
+    size_t length = 0;
+    char * data = nullptr;
+
+    CurrentMetrics::Increment files_metric_increment{CurrentMetrics::MMappedFiles, 0};
+    CurrentMetrics::Increment bytes_metric_increment{CurrentMetrics::MMappedFileBytes, 0};
+};
+
+}
+
diff --git a/src/IO/PeekableReadBuffer.cpp b/src/IO/PeekableReadBuffer.cpp
index 1d999d586b2..c7cef777afc 100644
--- a/src/IO/PeekableReadBuffer.cpp
+++ b/src/IO/PeekableReadBuffer.cpp
@@ -82,6 +82,7 @@ bool PeekableReadBuffer::peekNext()
         checkpoint.emplace(memory.data());
         checkpoint_in_own_memory = true;
     }
+
     if (currentlyReadFromOwnMemory())
     {
         /// Update buffer size
@@ -99,7 +100,6 @@ bool PeekableReadBuffer::peekNext()
                 pos_offset = 0;
         }
         BufferBase::set(memory.data(), peeked_size + bytes_to_copy, pos_offset);
-
     }
 
     peeked_size += bytes_to_copy;
@@ -113,12 +113,21 @@ void PeekableReadBuffer::rollbackToCheckpoint(bool drop)
 {
     checkStateCorrect();
 
-    if (!checkpoint)
-        throw DB::Exception("There is no checkpoint", ErrorCodes::LOGICAL_ERROR);
-    else if (checkpointInOwnMemory() == currentlyReadFromOwnMemory())
+    assert(checkpoint);
+
+    if (checkpointInOwnMemory() == currentlyReadFromOwnMemory())
+    {
+        /// Both checkpoint and position are in the same buffer.
         pos = *checkpoint;
-    else /// Checkpoint is in own memory and pos is not. Switch to reading from own memory
+    }
+    else
+    {
+        /// Checkpoint is in own memory and position is not.
+        assert(checkpointInOwnMemory());
+
+        /// Switch to reading from own memory.
         BufferBase::set(memory.data(), peeked_size, *checkpoint - memory.data());
+    }
 
     if (drop)
         dropCheckpoint();
@@ -134,6 +143,7 @@ bool PeekableReadBuffer::nextImpl()
 
     checkStateCorrect();
     bool res;
+    bool checkpoint_at_end = checkpoint && *checkpoint == working_buffer.end() && currentlyReadFromOwnMemory();
 
     if (checkpoint)
     {
@@ -163,6 +173,13 @@ bool PeekableReadBuffer::nextImpl()
     BufferBase::set(sub_working.begin(), sub_working.size(), sub_buf.offset());
     nextimpl_working_buffer_offset = sub_buf.offset();
 
+    if (checkpoint_at_end)
+    {
+        checkpoint.emplace(position());
+        peeked_size = 0;
+        checkpoint_in_own_memory = false;
+    }
+
     checkStateCorrect();
     return res;
 }
diff --git a/src/IO/PeekableReadBuffer.h b/src/IO/PeekableReadBuffer.h
index 4f6e669b31d..4515c6f8ce5 100644
--- a/src/IO/PeekableReadBuffer.h
+++ b/src/IO/PeekableReadBuffer.h
@@ -43,10 +43,7 @@ public:
     /// Forget checkpoint and all data between checkpoint and position
     ALWAYS_INLINE inline void dropCheckpoint()
     {
-#ifndef NDEBUG
-        if (!checkpoint)
-            throw DB::Exception("There is no checkpoint", ErrorCodes::LOGICAL_ERROR);
-#endif
+        assert(checkpoint);
         if (!currentlyReadFromOwnMemory())
         {
             /// Don't need to store unread data anymore
diff --git a/src/IO/Progress.h b/src/IO/Progress.h
index a3efb96db98..64bf3a404af 100644
--- a/src/IO/Progress.h
+++ b/src/IO/Progress.h
@@ -64,12 +64,12 @@ struct Progress
     std::atomic<size_t> written_rows {0};
     std::atomic<size_t> written_bytes {0};
 
-    Progress() {}
+    Progress() = default;
     Progress(size_t read_rows_, size_t read_bytes_, size_t total_rows_to_read_ = 0)
         : read_rows(read_rows_), read_bytes(read_bytes_), total_rows_to_read(total_rows_to_read_) {}
-    Progress(ReadProgress read_progress)
+    explicit Progress(ReadProgress read_progress)
         : read_rows(read_progress.read_rows), read_bytes(read_progress.read_bytes), total_rows_to_read(read_progress.total_rows_to_read) {}
-    Progress(WriteProgress write_progress)
+    explicit Progress(WriteProgress write_progress)
         : written_rows(write_progress.written_rows), written_bytes(write_progress.written_bytes)  {}
 
     void read(ReadBuffer & in, UInt64 server_revision);
@@ -86,7 +86,7 @@ struct Progress
         written_rows += rhs.written_rows;
         written_bytes += rhs.written_bytes;
 
-        return rhs.read_rows || rhs.written_rows ? true : false;
+        return rhs.read_rows || rhs.written_rows;
     }
 
     void reset()
diff --git a/src/IO/ReadBufferFromIStream.h b/src/IO/ReadBufferFromIStream.h
index 7f804783ba2..67cc60c053f 100644
--- a/src/IO/ReadBufferFromIStream.h
+++ b/src/IO/ReadBufferFromIStream.h
@@ -17,7 +17,7 @@ private:
     bool nextImpl() override;
 
 public:
-    ReadBufferFromIStream(std::istream & istr_, size_t size = DBMS_DEFAULT_BUFFER_SIZE);
+    explicit ReadBufferFromIStream(std::istream & istr_, size_t size = DBMS_DEFAULT_BUFFER_SIZE);
 };
 
 }
diff --git a/src/IO/ReadBufferFromPocoSocket.cpp b/src/IO/ReadBufferFromPocoSocket.cpp
index 59f0dc25667..d1ceaaf6a35 100644
--- a/src/IO/ReadBufferFromPocoSocket.cpp
+++ b/src/IO/ReadBufferFromPocoSocket.cpp
@@ -1,6 +1,7 @@
 #include <Poco/Net/NetException.h>
 
 #include <IO/ReadBufferFromPocoSocket.h>
+#include <IO/TimeoutSetter.h>
 #include <Common/Exception.h>
 #include <Common/NetException.h>
 #include <Common/Stopwatch.h>
@@ -14,7 +15,6 @@ namespace ProfileEvents
 
 namespace DB
 {
-
 namespace ErrorCodes
 {
     extern const int NETWORK_ERROR;
@@ -28,23 +28,16 @@ bool ReadBufferFromPocoSocket::nextImpl()
     ssize_t bytes_read = 0;
     Stopwatch watch;
 
-    int flags = 0;
-    if (async_callback)
-        flags |= MSG_DONTWAIT;
-
     /// Add more details to exceptions.
     try
     {
-        bytes_read = socket.impl()->receiveBytes(internal_buffer.begin(), internal_buffer.size(), flags);
-
-        /// If async_callback is specified, and read is blocking, run async_callback and try again later.
+        /// If async_callback is specified, and read will block, run async_callback and try again later.
         /// It is expected that file descriptor may be polled externally.
         /// Note that receive timeout is not checked here. External code should check it while polling.
-        while (bytes_read < 0 && async_callback && errno == EAGAIN)
-        {
-            async_callback(socket);
-            bytes_read = socket.impl()->receiveBytes(internal_buffer.begin(), internal_buffer.size(), flags);
-        }
+        while (async_callback && !socket.poll(0, Poco::Net::Socket::SELECT_READ))
+            async_callback(socket.impl()->sockfd(), socket.getReceiveTimeout(), socket_description);
+
+        bytes_read = socket.impl()->receiveBytes(internal_buffer.begin(), internal_buffer.size());
     }
     catch (const Poco::Net::NetException & e)
     {
@@ -74,7 +67,10 @@ bool ReadBufferFromPocoSocket::nextImpl()
 }
 
 ReadBufferFromPocoSocket::ReadBufferFromPocoSocket(Poco::Net::Socket & socket_, size_t buf_size)
-    : BufferWithOwnMemory<ReadBuffer>(buf_size), socket(socket_), peer_address(socket.peerAddress())
+    : BufferWithOwnMemory<ReadBuffer>(buf_size)
+    , socket(socket_)
+    , peer_address(socket.peerAddress())
+    , socket_description("socket (" + peer_address.toString() + ")")
 {
 }
 
diff --git a/src/IO/ReadBufferFromPocoSocket.h b/src/IO/ReadBufferFromPocoSocket.h
index d182d48d1f8..032020c7330 100644
--- a/src/IO/ReadBufferFromPocoSocket.h
+++ b/src/IO/ReadBufferFromPocoSocket.h
@@ -8,6 +8,8 @@
 namespace DB
 {
 
+using AsyncCallback = std::function<void(int, const Poco::Timespan &, const std::string &)>;
+
 /// Works with the ready Poco::Net::Socket. Blocking operations.
 class ReadBufferFromPocoSocket : public BufferWithOwnMemory<ReadBuffer>
 {
@@ -27,10 +29,11 @@ public:
 
     bool poll(size_t timeout_microseconds) const;
 
-    void setAsyncCallback(std::function<void(Poco::Net::Socket &)> async_callback_) { async_callback = std::move(async_callback_); }
+    void setAsyncCallback(AsyncCallback async_callback_) { async_callback = std::move(async_callback_); }
 
 private:
-    std::function<void(Poco::Net::Socket &)> async_callback;
+    AsyncCallback async_callback;
+    std::string socket_description;
 };
 
 }
diff --git a/src/IO/ReadBufferFromS3.cpp b/src/IO/ReadBufferFromS3.cpp
index fd07a7f309a..1e27b0284b7 100644
--- a/src/IO/ReadBufferFromS3.cpp
+++ b/src/IO/ReadBufferFromS3.cpp
@@ -12,10 +12,12 @@
 
 #    include <utility>
 
+
 namespace ProfileEvents
 {
     extern const Event S3ReadMicroseconds;
     extern const Event S3ReadBytes;
+    extern const Event S3ReadRequestsErrors;
 }
 
 namespace DB
@@ -29,26 +31,58 @@ namespace ErrorCodes
 
 
 ReadBufferFromS3::ReadBufferFromS3(
-    std::shared_ptr<Aws::S3::S3Client> client_ptr_, const String & bucket_, const String & key_, size_t buffer_size_)
-    : SeekableReadBuffer(nullptr, 0), client_ptr(std::move(client_ptr_)), bucket(bucket_), key(key_), buffer_size(buffer_size_)
+    std::shared_ptr<Aws::S3::S3Client> client_ptr_, const String & bucket_, const String & key_, UInt64 s3_max_single_read_retries_, size_t buffer_size_)
+    : SeekableReadBuffer(nullptr, 0)
+    , client_ptr(std::move(client_ptr_))
+    , bucket(bucket_)
+    , key(key_)
+    , s3_max_single_read_retries(s3_max_single_read_retries_)
+    , buffer_size(buffer_size_)
 {
 }
 
-
 bool ReadBufferFromS3::nextImpl()
 {
-    if (!initialized)
-    {
+    /// Restoring valid value of `count()` during `nextImpl()`. See `ReadBuffer::next()`.
+    pos = working_buffer.begin();
+
+    if (!impl)
         impl = initialize();
-        initialized = true;
-    }
 
     Stopwatch watch;
-    auto res = impl->next();
+    bool next_result = false;
+
+    for (Int64 attempt = static_cast<Int64>(s3_max_single_read_retries); attempt >= 0; --attempt)
+    {
+        if (!impl)
+            impl = initialize();
+
+        try
+        {
+            next_result = impl->next();
+            /// FIXME. 1. Poco `istream` cannot read less than buffer_size or this state is being discarded during
+            ///           istream <-> iostream conversion. `gcount` always contains 0,
+            ///           that's why we always have error "Cannot read from istream at offset 0".
+
+            break;
+        }
+        catch (const Exception & e)
+        {
+            ProfileEvents::increment(ProfileEvents::S3ReadRequestsErrors, 1);
+
+            LOG_INFO(log, "Caught exception while reading S3 object. Bucket: {}, Key: {}, Offset: {}, Remaining attempts: {}, Message: {}",
+                    bucket, key, getPosition(), attempt, e.message());
+
+            impl.reset();
+
+            if (!attempt)
+                throw;
+        }
+    }
+
     watch.stop();
     ProfileEvents::increment(ProfileEvents::S3ReadMicroseconds, watch.elapsedMicroseconds());
-
-    if (!res)
+    if (!next_result)
         return false;
     internal_buffer = impl->buffer();
 
@@ -60,7 +94,7 @@ bool ReadBufferFromS3::nextImpl()
 
 off_t ReadBufferFromS3::seek(off_t offset_, int whence)
 {
-    if (initialized)
+    if (impl)
         throw Exception("Seek is allowed only before first read attempt from the buffer.", ErrorCodes::CANNOT_SEEK_THROUGH_FILE);
 
     if (whence != SEEK_SET)
@@ -74,7 +108,6 @@ off_t ReadBufferFromS3::seek(off_t offset_, int whence)
     return offset;
 }
 
-
 off_t ReadBufferFromS3::getPosition()
 {
     return offset + count();
@@ -82,13 +115,13 @@ off_t ReadBufferFromS3::getPosition()
 
 std::unique_ptr<ReadBuffer> ReadBufferFromS3::initialize()
 {
-    LOG_TRACE(log, "Read S3 object. Bucket: {}, Key: {}, Offset: {}", bucket, key, std::to_string(offset));
+    LOG_TRACE(log, "Read S3 object. Bucket: {}, Key: {}, Offset: {}", bucket, key, getPosition());
 
     Aws::S3::Model::GetObjectRequest req;
     req.SetBucket(bucket);
     req.SetKey(key);
-    if (offset != 0)
-        req.SetRange("bytes=" + std::to_string(offset) + "-");
+    if (getPosition())
+        req.SetRange("bytes=" + std::to_string(getPosition()) + "-");
 
     Aws::S3::Model::GetObjectOutcome outcome = client_ptr->GetObject(req);
 
diff --git a/src/IO/ReadBufferFromS3.h b/src/IO/ReadBufferFromS3.h
index 829b73d0af6..1f4124d909f 100644
--- a/src/IO/ReadBufferFromS3.h
+++ b/src/IO/ReadBufferFromS3.h
@@ -27,8 +27,8 @@ private:
     std::shared_ptr<Aws::S3::S3Client> client_ptr;
     String bucket;
     String key;
+    UInt64 s3_max_single_read_retries;
     size_t buffer_size;
-    bool initialized = false;
     off_t offset = 0;
     Aws::S3::Model::GetObjectResult read_result;
     std::unique_ptr<ReadBuffer> impl;
@@ -40,6 +40,7 @@ public:
         std::shared_ptr<Aws::S3::S3Client> client_ptr_,
         const String & bucket_,
         const String & key_,
+        UInt64 s3_max_single_read_retries_,
         size_t buffer_size_ = DBMS_DEFAULT_BUFFER_SIZE);
 
     bool nextImpl() override;
diff --git a/src/IO/ReadHelpers.h b/src/IO/ReadHelpers.h
index e33de04f322..cf25b819e6c 100644
--- a/src/IO/ReadHelpers.h
+++ b/src/IO/ReadHelpers.h
@@ -747,7 +747,7 @@ inline ReturnType readDateTimeTextImpl(DateTime64 & datetime64, UInt32 scale, Re
         return ReturnType(false);
     }
 
-    DB::DecimalUtils::DecimalComponents<DateTime64::NativeType> components{static_cast<DateTime64::NativeType>(whole), 0};
+    DB::DecimalUtils::DecimalComponents<DateTime64> components{static_cast<DateTime64::NativeType>(whole), 0};
 
     if (!buf.eof() && *buf.position() == '.')
     {
@@ -773,7 +773,8 @@ inline ReturnType readDateTimeTextImpl(DateTime64 & datetime64, UInt32 scale, Re
         while (!buf.eof() && isNumericASCII(*buf.position()))
             ++buf.position();
     }
-    else if (scale && (whole >= 1000000000LL * scale))
+    /// 9908870400 is time_t value for 2184-01-01 UTC (a bit over the last year supported by DateTime64)
+    else if (whole >= 9908870400LL)
     {
         /// Unix timestamp with subsecond precision, already scaled to integer.
         /// For disambiguation we support only time since 2001-09-09 01:46:40 UTC and less than 30 000 years in future.
@@ -791,9 +792,9 @@ inline ReturnType readDateTimeTextImpl(DateTime64 & datetime64, UInt32 scale, Re
     return ReturnType(true);
 }
 
-inline void readDateTimeText(time_t & datetime, ReadBuffer & buf, const DateLUTImpl & date_lut = DateLUT::instance())
+inline void readDateTimeText(time_t & datetime, ReadBuffer & buf, const DateLUTImpl & time_zone = DateLUT::instance())
 {
-    readDateTimeTextImpl<void>(datetime, buf, date_lut);
+    readDateTimeTextImpl<void>(datetime, buf, time_zone);
 }
 
 inline void readDateTime64Text(DateTime64 & datetime64, UInt32 scale, ReadBuffer & buf, const DateLUTImpl & date_lut = DateLUT::instance())
@@ -801,9 +802,9 @@ inline void readDateTime64Text(DateTime64 & datetime64, UInt32 scale, ReadBuffer
     readDateTimeTextImpl<void>(datetime64, scale, buf, date_lut);
 }
 
-inline bool tryReadDateTimeText(time_t & datetime, ReadBuffer & buf, const DateLUTImpl & date_lut = DateLUT::instance())
+inline bool tryReadDateTimeText(time_t & datetime, ReadBuffer & buf, const DateLUTImpl & time_zone = DateLUT::instance())
 {
-    return readDateTimeTextImpl<bool>(datetime, buf, date_lut);
+    return readDateTimeTextImpl<bool>(datetime, buf, time_zone);
 }
 
 inline bool tryReadDateTime64Text(DateTime64 & datetime64, UInt32 scale, ReadBuffer & buf, const DateLUTImpl & date_lut = DateLUT::instance())
diff --git a/src/IO/S3/PocoHTTPClient.cpp b/src/IO/S3/PocoHTTPClient.cpp
index 471044dd08c..6df8d5ec5ad 100644
--- a/src/IO/S3/PocoHTTPClient.cpp
+++ b/src/IO/S3/PocoHTTPClient.cpp
@@ -81,12 +81,11 @@ PocoHTTPClient::PocoHTTPClient(const PocoHTTPClientConfiguration & clientConfigu
     : per_request_configuration(clientConfiguration.perRequestConfiguration)
     , timeouts(ConnectionTimeouts(
           Poco::Timespan(clientConfiguration.connectTimeoutMs * 1000), /// connection timeout.
-          Poco::Timespan(clientConfiguration.httpRequestTimeoutMs * 1000), /// send timeout.
-          Poco::Timespan(clientConfiguration.httpRequestTimeoutMs * 1000) /// receive timeout.
+          Poco::Timespan(clientConfiguration.requestTimeoutMs * 1000), /// send timeout.
+          Poco::Timespan(clientConfiguration.requestTimeoutMs * 1000) /// receive timeout.
           ))
     , remote_host_filter(clientConfiguration.remote_host_filter)
     , s3_max_redirects(clientConfiguration.s3_max_redirects)
-    , max_connections(clientConfiguration.maxConnections)
 {
 }
 
@@ -156,19 +155,24 @@ void PocoHTTPClient::makeRequestInternal(
         for (unsigned int attempt = 0; attempt <= s3_max_redirects; ++attempt)
         {
             Poco::URI target_uri(uri);
-            Poco::URI proxy_uri;
-
-            auto request_configuration = per_request_configuration(request);
-            if (!request_configuration.proxyHost.empty())
-            {
-                proxy_uri.setScheme(Aws::Http::SchemeMapper::ToString(request_configuration.proxyScheme));
-                proxy_uri.setHost(request_configuration.proxyHost);
-                proxy_uri.setPort(request_configuration.proxyPort);
-            }
 
             /// Reverse proxy can replace host header with resolved ip address instead of host name.
             /// This can lead to request signature difference on S3 side.
-            auto session = makePooledHTTPSession(target_uri, proxy_uri, timeouts, max_connections, false);
+            auto session = makeHTTPSession(target_uri, timeouts, false);
+
+            auto request_configuration = per_request_configuration(request);
+
+            if (!request_configuration.proxyHost.empty())
+            {
+                bool use_tunnel = request_configuration.proxyScheme == Aws::Http::Scheme::HTTP && target_uri.getScheme() == "https";
+
+                session->setProxy(
+                    request_configuration.proxyHost,
+                    request_configuration.proxyPort,
+                    Aws::Http::SchemeMapper::ToString(request_configuration.proxyScheme),
+                    use_tunnel
+                );
+            }
 
             Poco::Net::HTTPRequest poco_request(Poco::Net::HTTPRequest::HTTP_1_1);
 
@@ -255,7 +259,11 @@ void PocoHTTPClient::makeRequestInternal(
                 String error_message;
                 Poco::StreamCopier::copyToString(response_body_stream, error_message);
 
-                response->SetClientErrorType(Aws::Client::CoreErrors::NETWORK_CONNECTION);
+                if (Aws::Http::IsRetryableHttpResponseCode(response->GetResponseCode()))
+                    response->SetClientErrorType(Aws::Client::CoreErrors::NETWORK_CONNECTION);
+                else
+                    response->SetClientErrorType(Aws::Client::CoreErrors::USER_CANCELLED);
+
                 response->SetClientErrorMessage(error_message);
 
                 if (status_code == 429 || status_code == 503)
diff --git a/src/IO/S3/PocoHTTPClient.h b/src/IO/S3/PocoHTTPClient.h
index 918943a413c..34b8ea801bd 100644
--- a/src/IO/S3/PocoHTTPClient.h
+++ b/src/IO/S3/PocoHTTPClient.h
@@ -1,13 +1,17 @@
 #pragma once
 
+#include <Common/config.h>
+
+#if USE_AWS_S3
+
 #include <Common/RemoteHostFilter.h>
 #include <IO/ConnectionTimeouts.h>
 #include <IO/HTTPCommon.h>
 #include <IO/S3/SessionAwareIOStream.h>
-#include <aws/core/client/ClientConfiguration.h>
-#include <aws/core/http/HttpClient.h>
-#include <aws/core/http/HttpRequest.h>
-#include <aws/core/http/standard/StandardHttpResponse.h>
+#include <aws/core/client/ClientConfiguration.h> // Y_IGNORE
+#include <aws/core/http/HttpClient.h> // Y_IGNORE
+#include <aws/core/http/HttpRequest.h> // Y_IGNORE
+#include <aws/core/http/standard/StandardHttpResponse.h> // Y_IGNORE
 
 namespace Aws::Http::Standard
 {
@@ -40,7 +44,7 @@ private:
 class PocoHTTPResponse : public Aws::Http::Standard::StandardHttpResponse
 {
 public:
-    using SessionPtr = PooledHTTPSessionPtr;
+    using SessionPtr = HTTPSessionPtr;
 
     PocoHTTPResponse(const std::shared_ptr<const Aws::Http::HttpRequest> request)
         : Aws::Http::Standard::StandardHttpResponse(request)
@@ -91,7 +95,8 @@ private:
     ConnectionTimeouts timeouts;
     const RemoteHostFilter & remote_host_filter;
     unsigned int s3_max_redirects;
-    unsigned int max_connections;
 };
 
 }
+
+#endif
diff --git a/src/IO/S3Common.cpp b/src/IO/S3Common.cpp
index f9962735ddc..8e93c375573 100644
--- a/src/IO/S3Common.cpp
+++ b/src/IO/S3Common.cpp
@@ -6,16 +6,20 @@
 #    include <IO/WriteBufferFromString.h>
 #    include <Storages/StorageS3Settings.h>
 
+#    include <aws/core/Version.h>
 #    include <aws/core/auth/AWSCredentialsProvider.h>
 #    include <aws/core/auth/AWSCredentialsProviderChain.h>
 #    include <aws/core/auth/STSCredentialsProvider.h>
 #    include <aws/core/client/DefaultRetryStrategy.h>
 #    include <aws/core/platform/Environment.h>
+#    include <aws/core/platform/OSVersionInfo.h>
+#    include <aws/core/utils/json/JsonSerializer.h>
 #    include <aws/core/utils/logging/LogMacros.h>
 #    include <aws/core/utils/logging/LogSystemInterface.h>
 #    include <aws/core/utils/HashingUtils.h>
-#    include <aws/s3/S3Client.h>
 #    include <aws/core/http/HttpClientFactory.h>
+#    include <aws/s3/S3Client.h>
+
 #    include <IO/S3/PocoHTTPClientFactory.h>
 #    include <IO/S3/PocoHTTPClient.h>
 #    include <Poco/URI.h>
@@ -91,28 +95,289 @@ private:
     std::unordered_map<String, Poco::Logger *> tag_loggers;
 };
 
+class AWSEC2MetadataClient : public Aws::Internal::AWSHttpResourceClient
+{
+    static constexpr char EC2_SECURITY_CREDENTIALS_RESOURCE[] = "/latest/meta-data/iam/security-credentials";
+    static constexpr char EC2_IMDS_TOKEN_RESOURCE[] = "/latest/api/token";
+    static constexpr char EC2_IMDS_TOKEN_HEADER[] = "x-aws-ec2-metadata-token";
+    static constexpr char EC2_IMDS_TOKEN_TTL_DEFAULT_VALUE[] = "21600";
+    static constexpr char EC2_IMDS_TOKEN_TTL_HEADER[] = "x-aws-ec2-metadata-token-ttl-seconds";
+
+    static constexpr char EC2_DEFAULT_METADATA_ENDPOINT[] = "http://169.254.169.254";
+
+public:
+    /// See EC2MetadataClient.
+
+    explicit AWSEC2MetadataClient(const Aws::Client::ClientConfiguration & client_configuration)
+        : Aws::Internal::AWSHttpResourceClient(client_configuration)
+        , logger(&Poco::Logger::get("AWSEC2InstanceProfileConfigLoader"))
+    {
+    }
+
+    AWSEC2MetadataClient& operator =(const AWSEC2MetadataClient & rhs) = delete;
+    AWSEC2MetadataClient(const AWSEC2MetadataClient & rhs) = delete;
+    AWSEC2MetadataClient& operator =(const AWSEC2MetadataClient && rhs) = delete;
+    AWSEC2MetadataClient(const AWSEC2MetadataClient && rhs) = delete;
+
+    virtual ~AWSEC2MetadataClient() override = default;
+
+    using Aws::Internal::AWSHttpResourceClient::GetResource;
+
+    virtual Aws::String GetResource(const char * resource_path) const
+    {
+        return GetResource(endpoint.c_str(), resource_path, nullptr/*authToken*/);
+    }
+
+    virtual Aws::String getDefaultCredentials() const
+    {
+        String credentials_string;
+        {
+            std::unique_lock<std::recursive_mutex> locker(token_mutex);
+
+            LOG_TRACE(logger, "Getting default credentials for EC2 instance.");
+            auto result = GetResourceWithAWSWebServiceResult(endpoint.c_str(), EC2_SECURITY_CREDENTIALS_RESOURCE, nullptr);
+            credentials_string = result.GetPayload();
+            if (result.GetResponseCode() == Aws::Http::HttpResponseCode::UNAUTHORIZED)
+            {
+                return {};
+            }
+        }
+
+        String trimmed_credentials_string = Aws::Utils::StringUtils::Trim(credentials_string.c_str());
+        if (trimmed_credentials_string.empty())
+            return {};
+
+        std::vector<String> security_credentials = Aws::Utils::StringUtils::Split(trimmed_credentials_string, '\n');
+
+        LOG_DEBUG(logger, "Calling EC2MetadataService resource, {} returned credential string {}.",
+                EC2_SECURITY_CREDENTIALS_RESOURCE, trimmed_credentials_string);
+
+        if (security_credentials.empty())
+        {
+            LOG_WARNING(logger, "Initial call to EC2MetadataService to get credentials failed.");
+            return {};
+        }
+
+        Aws::StringStream ss;
+        ss << EC2_SECURITY_CREDENTIALS_RESOURCE << "/" << security_credentials[0];
+        LOG_DEBUG(logger, "Calling EC2MetadataService resource {}.", ss.str());
+        return GetResource(ss.str().c_str());
+    }
+
+    static Aws::String awsComputeUserAgentString()
+    {
+        Aws::StringStream ss;
+        ss << "aws-sdk-cpp/" << Aws::Version::GetVersionString() << " " << Aws::OSVersionInfo::ComputeOSVersionString()
+                << " " << Aws::Version::GetCompilerVersionString();
+        return ss.str();
+    }
+
+    virtual Aws::String getDefaultCredentialsSecurely() const
+    {
+        String user_agent_string = awsComputeUserAgentString();
+        String new_token;
+
+        {
+            std::unique_lock<std::recursive_mutex> locker(token_mutex);
+
+            Aws::StringStream ss;
+            ss << endpoint << EC2_IMDS_TOKEN_RESOURCE;
+            std::shared_ptr<Aws::Http::HttpRequest> token_request(Aws::Http::CreateHttpRequest(ss.str(), Aws::Http::HttpMethod::HTTP_PUT,
+                                                                        Aws::Utils::Stream::DefaultResponseStreamFactoryMethod));
+            token_request->SetHeaderValue(EC2_IMDS_TOKEN_TTL_HEADER, EC2_IMDS_TOKEN_TTL_DEFAULT_VALUE);
+            token_request->SetUserAgent(user_agent_string);
+            LOG_TRACE(logger, "Calling EC2MetadataService to get token.");
+            auto result = GetResourceWithAWSWebServiceResult(token_request);
+            const String & token_string = result.GetPayload();
+            new_token = Aws::Utils::StringUtils::Trim(token_string.c_str());
+
+            if (result.GetResponseCode() == Aws::Http::HttpResponseCode::BAD_REQUEST)
+            {
+                return {};
+            }
+            else if (result.GetResponseCode() != Aws::Http::HttpResponseCode::OK || new_token.empty())
+            {
+                LOG_TRACE(logger, "Calling EC2MetadataService to get token failed, falling back to less secure way.");
+                return getDefaultCredentials();
+            }
+            token = new_token;
+        }
+
+        String url = endpoint + EC2_SECURITY_CREDENTIALS_RESOURCE;
+        std::shared_ptr<Aws::Http::HttpRequest> profile_request(Aws::Http::CreateHttpRequest(url,
+                Aws::Http::HttpMethod::HTTP_GET,
+                Aws::Utils::Stream::DefaultResponseStreamFactoryMethod));
+        profile_request->SetHeaderValue(EC2_IMDS_TOKEN_HEADER, new_token);
+        profile_request->SetUserAgent(user_agent_string);
+        String profile_string = GetResourceWithAWSWebServiceResult(profile_request).GetPayload();
+
+        String trimmed_profile_string = Aws::Utils::StringUtils::Trim(profile_string.c_str());
+        std::vector<String> security_credentials = Aws::Utils::StringUtils::Split(trimmed_profile_string, '\n');
+
+        LOG_DEBUG(logger, "Calling EC2MetadataService resource, {} with token returned profile string {}.",
+                EC2_SECURITY_CREDENTIALS_RESOURCE, trimmed_profile_string);
+
+        if (security_credentials.empty())
+        {
+            LOG_WARNING(logger, "Calling EC2Metadataservice to get profiles failed.");
+            return {};
+        }
+
+        Aws::StringStream ss;
+        ss << endpoint << EC2_SECURITY_CREDENTIALS_RESOURCE << "/" << security_credentials[0];
+        std::shared_ptr<Aws::Http::HttpRequest> credentials_request(Aws::Http::CreateHttpRequest(ss.str(),
+                Aws::Http::HttpMethod::HTTP_GET,
+                Aws::Utils::Stream::DefaultResponseStreamFactoryMethod));
+        credentials_request->SetHeaderValue(EC2_IMDS_TOKEN_HEADER, new_token);
+        credentials_request->SetUserAgent(user_agent_string);
+        LOG_DEBUG(logger, "Calling EC2MetadataService resource {} with token.", ss.str());
+        return GetResourceWithAWSWebServiceResult(credentials_request).GetPayload();
+    }
+
+    virtual Aws::String getCurrentRegion() const
+    {
+        return Aws::Region::AWS_GLOBAL;
+    }
+
+private:
+    const Aws::String endpoint = EC2_DEFAULT_METADATA_ENDPOINT;
+    mutable std::recursive_mutex token_mutex;
+    mutable Aws::String token;
+    Poco::Logger * logger;
+};
+
+class AWSEC2InstanceProfileConfigLoader : public Aws::Config::AWSProfileConfigLoader
+{
+public:
+    explicit AWSEC2InstanceProfileConfigLoader(const std::shared_ptr<AWSEC2MetadataClient> & client_, bool use_secure_pull_)
+        : client(client_)
+        , use_secure_pull(use_secure_pull_)
+        , logger(&Poco::Logger::get("AWSEC2InstanceProfileConfigLoader"))
+    {
+    }
+
+    virtual ~AWSEC2InstanceProfileConfigLoader() override = default;
+
+protected:
+    virtual bool LoadInternal() override
+    {
+        auto credentials_str = use_secure_pull ? client->getDefaultCredentialsSecurely() : client->getDefaultCredentials();
+
+        /// See EC2InstanceProfileConfigLoader.
+        if (credentials_str.empty())
+            return false;
+
+        Aws::Utils::Json::JsonValue credentials_doc(credentials_str);
+        if (!credentials_doc.WasParseSuccessful())
+        {
+            LOG_ERROR(logger, "Failed to parse output from EC2MetadataService.");
+            return false;
+        }
+        String access_key, secret_key, token;
+
+        auto credentials_view = credentials_doc.View();
+        access_key = credentials_view.GetString("AccessKeyId");
+        LOG_ERROR(logger, "Successfully pulled credentials from EC2MetadataService with access key {}.", access_key);
+
+        secret_key = credentials_view.GetString("SecretAccessKey");
+        token = credentials_view.GetString("Token");
+
+        auto region = client->getCurrentRegion();
+
+        Aws::Config::Profile profile;
+        profile.SetCredentials(Aws::Auth::AWSCredentials(access_key, secret_key, token));
+        profile.SetRegion(region);
+        profile.SetName(Aws::Config::INSTANCE_PROFILE_KEY);
+
+        m_profiles[Aws::Config::INSTANCE_PROFILE_KEY] = profile;
+
+        return true;
+    }
+
+private:
+    std::shared_ptr<AWSEC2MetadataClient> client;
+    bool use_secure_pull;
+    Poco::Logger * logger;
+};
+
+class AWSInstanceProfileCredentialsProvider : public Aws::Auth::AWSCredentialsProvider
+{
+public:
+    /// See InstanceProfileCredentialsProvider.
+
+    explicit AWSInstanceProfileCredentialsProvider(const std::shared_ptr<AWSEC2InstanceProfileConfigLoader> & config_loader)
+        : ec2_metadata_config_loader(config_loader)
+        , load_frequency_ms(Aws::Auth::REFRESH_THRESHOLD)
+        , logger(&Poco::Logger::get("AWSInstanceProfileCredentialsProvider"))
+    {
+        LOG_INFO(logger, "Creating Instance with injected EC2MetadataClient and refresh rate {}.");
+    }
+
+    Aws::Auth::AWSCredentials GetAWSCredentials() override
+    {
+        refreshIfExpired();
+        Aws::Utils::Threading::ReaderLockGuard guard(m_reloadLock);
+        auto profile_it = ec2_metadata_config_loader->GetProfiles().find(Aws::Config::INSTANCE_PROFILE_KEY);
+
+        if (profile_it != ec2_metadata_config_loader->GetProfiles().end())
+        {
+            return profile_it->second.GetCredentials();
+        }
+
+        return Aws::Auth::AWSCredentials();
+    }
+
+protected:
+    void Reload() override
+    {
+        LOG_INFO(logger, "Credentials have expired attempting to repull from EC2 Metadata Service.");
+        ec2_metadata_config_loader->Load();
+        AWSCredentialsProvider::Reload();
+    }
+
+private:
+    void refreshIfExpired()
+    {
+        LOG_DEBUG(logger, "Checking if latest credential pull has expired.");
+        Aws::Utils::Threading::ReaderLockGuard guard(m_reloadLock);
+        if (!IsTimeToRefresh(load_frequency_ms))
+        {
+            return;
+        }
+
+        guard.UpgradeToWriterLock();
+        if (!IsTimeToRefresh(load_frequency_ms)) // double-checked lock to avoid refreshing twice
+        {
+            return;
+        }
+        Reload();
+    }
+
+    std::shared_ptr<AWSEC2InstanceProfileConfigLoader> ec2_metadata_config_loader;
+    Int64 load_frequency_ms;
+    Poco::Logger * logger;
+};
+
 class S3CredentialsProviderChain : public Aws::Auth::AWSCredentialsProviderChain
 {
 public:
-    explicit S3CredentialsProviderChain(const DB::S3::PocoHTTPClientConfiguration & configuration, const Aws::Auth::AWSCredentials & credentials, bool use_environment_credentials)
+    explicit S3CredentialsProviderChain(const DB::S3::PocoHTTPClientConfiguration & configuration, const Aws::Auth::AWSCredentials & credentials, bool use_environment_credentials, bool use_insecure_imds_request)
     {
+        auto * logger = &Poco::Logger::get("S3CredentialsProviderChain");
+
         if (use_environment_credentials)
         {
-            const DB::RemoteHostFilter & remote_host_filter = configuration.remote_host_filter;
-            const unsigned int s3_max_redirects = configuration.s3_max_redirects;
-
             static const char AWS_ECS_CONTAINER_CREDENTIALS_RELATIVE_URI[] = "AWS_CONTAINER_CREDENTIALS_RELATIVE_URI";
             static const char AWS_ECS_CONTAINER_CREDENTIALS_FULL_URI[] = "AWS_CONTAINER_CREDENTIALS_FULL_URI";
             static const char AWS_ECS_CONTAINER_AUTHORIZATION_TOKEN[] = "AWS_CONTAINER_AUTHORIZATION_TOKEN";
             static const char AWS_EC2_METADATA_DISABLED[] = "AWS_EC2_METADATA_DISABLED";
 
-            auto * logger = &Poco::Logger::get("S3CredentialsProviderChain");
-
             /// The only difference from DefaultAWSCredentialsProviderChain::DefaultAWSCredentialsProviderChain()
             /// is that this chain uses custom ClientConfiguration.
 
             AddProvider(std::make_shared<Aws::Auth::EnvironmentAWSCredentialsProvider>());
             AddProvider(std::make_shared<Aws::Auth::ProfileConfigFileAWSCredentialsProvider>());
+            AddProvider(std::make_shared<Aws::Auth::ProcessCredentialsProvider>());
             AddProvider(std::make_shared<Aws::Auth::STSAssumeRoleWebIdentityCredentialsProvider>());
 
             /// ECS TaskRole Credentials only available when ENVIRONMENT VARIABLE is set.
@@ -145,7 +410,7 @@ public:
             }
             else if (Aws::Utils::StringUtils::ToLower(ec2_metadata_disabled.c_str()) != "true")
             {
-                DB::S3::PocoHTTPClientConfiguration aws_client_configuration = DB::S3::ClientFactory::instance().createClientConfiguration(remote_host_filter, s3_max_redirects);
+                DB::S3::PocoHTTPClientConfiguration aws_client_configuration = DB::S3::ClientFactory::instance().createClientConfiguration(configuration.remote_host_filter, configuration.s3_max_redirects);
 
                 /// See MakeDefaultHttpResourceClientConfiguration().
                 /// This is part of EC2 metadata client, but unfortunately it can't be accessed from outside
@@ -163,13 +428,16 @@ public:
                 /// EC2MetadataService throttles by delaying the response so the service client should set a large read timeout.
                 /// EC2MetadataService delay is in order of seconds so it only make sense to retry after a couple of seconds.
                 aws_client_configuration.connectTimeoutMs = 1000;
+
+                /// FIXME. Somehow this timeout does not work in docker without --net=host.
                 aws_client_configuration.requestTimeoutMs = 1000;
+
                 aws_client_configuration.retryStrategy = std::make_shared<Aws::Client::DefaultRetryStrategy>(1, 1000);
 
-                auto ec2_metadata_client = std::make_shared<Aws::Internal::EC2MetadataClient>(aws_client_configuration);
-                auto config_loader = std::make_shared<Aws::Config::EC2InstanceProfileConfigLoader>(ec2_metadata_client);
+                auto ec2_metadata_client = std::make_shared<AWSEC2MetadataClient>(aws_client_configuration);
+                auto config_loader = std::make_shared<AWSEC2InstanceProfileConfigLoader>(ec2_metadata_client, !use_insecure_imds_request);
 
-                AddProvider(std::make_shared<Aws::Auth::InstanceProfileCredentialsProvider>(config_loader));
+                AddProvider(std::make_shared<AWSInstanceProfileCredentialsProvider>(config_loader));
                 LOG_INFO(logger, "Added EC2 metadata service credentials provider to the provider chain.");
             }
         }
@@ -185,12 +453,14 @@ public:
         const Aws::Client::ClientConfiguration & client_configuration,
         const Aws::Auth::AWSCredentials & credentials,
         const DB::HeaderCollection & headers_,
-        bool use_environment_credentials)
+        bool use_environment_credentials,
+        bool use_insecure_imds_request)
         : Aws::Client::AWSAuthV4Signer(
             std::make_shared<S3CredentialsProviderChain>(
                 static_cast<const DB::S3::PocoHTTPClientConfiguration &>(client_configuration),
                 credentials,
-                use_environment_credentials),
+                use_environment_credentials,
+                use_insecure_imds_request),
             "s3",
             client_configuration.region,
             Aws::Client::AWSAuthV4Signer::PayloadSigningPolicy::Never,
@@ -281,7 +551,8 @@ namespace S3
         const String & secret_access_key,
         const String & server_side_encryption_customer_key_base64,
         HeaderCollection headers,
-        bool use_environment_credentials)
+        bool use_environment_credentials,
+        bool use_insecure_imds_request)
     {
         PocoHTTPClientConfiguration client_configuration = cfg_;
         client_configuration.updateSchemeAndRegion();
@@ -308,7 +579,8 @@ namespace S3
             client_configuration,
             std::move(credentials),
             std::move(headers),
-            use_environment_credentials);
+            use_environment_credentials,
+            use_insecure_imds_request);
 
         return std::make_shared<Aws::S3::S3Client>(
             std::move(auth_signer),
diff --git a/src/IO/S3Common.h b/src/IO/S3Common.h
index b071daefee1..981218643ea 100644
--- a/src/IO/S3Common.h
+++ b/src/IO/S3Common.h
@@ -5,8 +5,8 @@
 #if USE_AWS_S3
 
 #include <common/types.h>
-#include <aws/core/Aws.h>
-#include <aws/core/client/ClientConfiguration.h>
+#include <aws/core/Aws.h>  // Y_IGNORE
+#include <aws/core/client/ClientConfiguration.h> // Y_IGNORE
 #include <IO/S3/PocoHTTPClient.h>
 #include <Poco/URI.h>
 
@@ -38,7 +38,8 @@ public:
         const String & secret_access_key,
         const String & server_side_encryption_customer_key_base64,
         HeaderCollection headers,
-        bool use_environment_credentials);
+        bool use_environment_credentials,
+        bool use_insecure_imds_request);
 
     PocoHTTPClientConfiguration createClientConfiguration(
         const RemoteHostFilter & remote_host_filter,
diff --git a/src/Client/TimeoutSetter.cpp b/src/IO/TimeoutSetter.cpp
similarity index 97%
rename from src/Client/TimeoutSetter.cpp
rename to src/IO/TimeoutSetter.cpp
index 87368f93ba3..f06cafecff8 100644
--- a/src/Client/TimeoutSetter.cpp
+++ b/src/IO/TimeoutSetter.cpp
@@ -1,4 +1,4 @@
-#include "TimeoutSetter.h"
+#include <IO/TimeoutSetter.h>
 
 #include <common/logger_useful.h>
 
diff --git a/src/Client/TimeoutSetter.h b/src/IO/TimeoutSetter.h
similarity index 100%
rename from src/Client/TimeoutSetter.h
rename to src/IO/TimeoutSetter.h
diff --git a/src/IO/UncompressedCache.h b/src/IO/UncompressedCache.h
index 86f1530e5b3..b2f62ef2ada 100644
--- a/src/IO/UncompressedCache.h
+++ b/src/IO/UncompressedCache.h
@@ -58,16 +58,17 @@ public:
         return key;
     }
 
-    MappedPtr get(const Key & key)
+    template <typename LoadFunc>
+    MappedPtr getOrSet(const Key & key, LoadFunc && load)
     {
-        MappedPtr res = Base::get(key);
+        auto result = Base::getOrSet(key, std::forward<LoadFunc>(load));
 
-        if (res)
-            ProfileEvents::increment(ProfileEvents::UncompressedCacheHits);
-        else
+        if (result.second)
             ProfileEvents::increment(ProfileEvents::UncompressedCacheMisses);
+        else
+            ProfileEvents::increment(ProfileEvents::UncompressedCacheHits);
 
-        return res;
+        return result.first;
     }
 
 private:
diff --git a/src/IO/WriteBufferFromFile.cpp b/src/IO/WriteBufferFromFile.cpp
index b3a63842326..67cd7ba27d6 100644
--- a/src/IO/WriteBufferFromFile.cpp
+++ b/src/IO/WriteBufferFromFile.cpp
@@ -79,7 +79,7 @@ WriteBufferFromFile::~WriteBufferFromFile()
         return;
 
     /// FIXME move final flush into the caller
-    MemoryTracker::LockExceptionInThread lock;
+    MemoryTracker::LockExceptionInThread lock(VariableContext::Global);
 
     next();
 
diff --git a/src/IO/WriteBufferFromFileDescriptor.cpp b/src/IO/WriteBufferFromFileDescriptor.cpp
index bfd874ee396..cd265653bb9 100644
--- a/src/IO/WriteBufferFromFileDescriptor.cpp
+++ b/src/IO/WriteBufferFromFileDescriptor.cpp
@@ -98,7 +98,7 @@ WriteBufferFromFileDescriptor::~WriteBufferFromFileDescriptor()
     }
 
     /// FIXME move final flush into the caller
-    MemoryTracker::LockExceptionInThread lock;
+    MemoryTracker::LockExceptionInThread lock(VariableContext::Global);
     next();
 }
 
diff --git a/src/IO/WriteBufferFromOStream.cpp b/src/IO/WriteBufferFromOStream.cpp
index cf731934c93..36fbf8301c1 100644
--- a/src/IO/WriteBufferFromOStream.cpp
+++ b/src/IO/WriteBufferFromOStream.cpp
@@ -43,7 +43,7 @@ WriteBufferFromOStream::WriteBufferFromOStream(
 WriteBufferFromOStream::~WriteBufferFromOStream()
 {
     /// FIXME move final flush into the caller
-    MemoryTracker::LockExceptionInThread lock;
+    MemoryTracker::LockExceptionInThread lock(VariableContext::Global);
     next();
 }
 
diff --git a/src/IO/WriteBufferFromPocoSocket.cpp b/src/IO/WriteBufferFromPocoSocket.cpp
index 284fa5dbd97..7338bcabdb5 100644
--- a/src/IO/WriteBufferFromPocoSocket.cpp
+++ b/src/IO/WriteBufferFromPocoSocket.cpp
@@ -1,6 +1,7 @@
 #include <Poco/Net/NetException.h>
 
 #include <IO/WriteBufferFromPocoSocket.h>
+#include <IO/TimeoutSetter.h>
 
 #include <Common/Exception.h>
 #include <Common/NetException.h>
@@ -72,7 +73,7 @@ WriteBufferFromPocoSocket::WriteBufferFromPocoSocket(Poco::Net::Socket & socket_
 WriteBufferFromPocoSocket::~WriteBufferFromPocoSocket()
 {
     /// FIXME move final flush into the caller
-    MemoryTracker::LockExceptionInThread lock;
+    MemoryTracker::LockExceptionInThread lock(VariableContext::Global);
     next();
 }
 
diff --git a/src/IO/WriteBufferFromS3.cpp b/src/IO/WriteBufferFromS3.cpp
index a6ec60b295f..a63e00efce4 100644
--- a/src/IO/WriteBufferFromS3.cpp
+++ b/src/IO/WriteBufferFromS3.cpp
@@ -21,6 +21,7 @@ namespace ProfileEvents
     extern const Event S3WriteBytes;
 }
 
+
 namespace DB
 {
 // S3 protocol does not allow to have multipart upload with more than 10000 parts.
@@ -50,9 +51,9 @@ WriteBufferFromS3::WriteBufferFromS3(
     , client_ptr(std::move(client_ptr_))
     , minimum_upload_part_size(minimum_upload_part_size_)
     , max_single_part_upload_size(max_single_part_upload_size_)
-    , temporary_buffer(Aws::MakeShared<Aws::StringStream>("temporary buffer"))
-    , last_part_size(0)
-{ }
+{
+    allocateBuffer();
+}
 
 void WriteBufferFromS3::nextImpl()
 {
@@ -72,15 +73,21 @@ void WriteBufferFromS3::nextImpl()
     if (!multipart_upload_id.empty() && last_part_size > minimum_upload_part_size)
     {
         writePart();
-        last_part_size = 0;
-        temporary_buffer = Aws::MakeShared<Aws::StringStream>("temporary buffer");
+        allocateBuffer();
     }
 }
 
+void WriteBufferFromS3::allocateBuffer()
+{
+    temporary_buffer = Aws::MakeShared<Aws::StringStream>("temporary buffer");
+    temporary_buffer->exceptions(std::ios::badbit);
+    last_part_size = 0;
+}
+
 void WriteBufferFromS3::finalize()
 {
     /// FIXME move final flush into the caller
-    MemoryTracker::LockExceptionInThread lock;
+    MemoryTracker::LockExceptionInThread lock(VariableContext::Global);
     finalizeImpl();
 }
 
@@ -107,7 +114,14 @@ void WriteBufferFromS3::finalizeImpl()
 
 WriteBufferFromS3::~WriteBufferFromS3()
 {
-    finalizeImpl();
+    try
+    {
+        finalizeImpl();
+    }
+    catch (...)
+    {
+        tryLogCurrentException(log);
+    }
 }
 
 void WriteBufferFromS3::createMultipartUpload()
@@ -123,17 +137,26 @@ void WriteBufferFromS3::createMultipartUpload()
     if (outcome.IsSuccess())
     {
         multipart_upload_id = outcome.GetResult().GetUploadId();
-        LOG_DEBUG(log, "Multipart upload has created. Upload id: {}", multipart_upload_id);
+        LOG_DEBUG(log, "Multipart upload has created. Bucket: {}, Key: {}, Upload id: {}", bucket, key, multipart_upload_id);
     }
     else
         throw Exception(outcome.GetError().GetMessage(), ErrorCodes::S3_ERROR);
 }
 
-
 void WriteBufferFromS3::writePart()
 {
-    if (temporary_buffer->tellp() <= 0)
+    auto size = temporary_buffer->tellp();
+
+    LOG_DEBUG(log, "Writing part. Bucket: {}, Key: {}, Upload_id: {}, Size: {}", bucket, key, multipart_upload_id, size);
+
+    if (size < 0)
+        throw Exception("Failed to write part. Buffer in invalid state.", ErrorCodes::S3_ERROR);
+
+    if (size == 0)
+    {
+        LOG_DEBUG(log, "Skipping writing part. Buffer is empty.");
         return;
+    }
 
     if (part_tags.size() == S3_WARN_MAX_PARTS)
     {
@@ -147,18 +170,16 @@ void WriteBufferFromS3::writePart()
     req.SetKey(key);
     req.SetPartNumber(part_tags.size() + 1);
     req.SetUploadId(multipart_upload_id);
-    req.SetContentLength(temporary_buffer->tellp());
+    req.SetContentLength(size);
     req.SetBody(temporary_buffer);
 
     auto outcome = client_ptr->UploadPart(req);
 
-    LOG_TRACE(log, "Writing part. Bucket: {}, Key: {}, Upload_id: {}, Data size: {}", bucket, key, multipart_upload_id, temporary_buffer->tellp());
-
     if (outcome.IsSuccess())
     {
         auto etag = outcome.GetResult().GetETag();
         part_tags.push_back(etag);
-        LOG_DEBUG(log, "Writing part finished. Total parts: {}, Upload_id: {}, Etag: {}", part_tags.size(), multipart_upload_id, etag);
+        LOG_DEBUG(log, "Writing part finished. Bucket: {}, Key: {}, Upload_id: {}, Etag: {}, Parts: {}", bucket, key, multipart_upload_id, etag, part_tags.size());
     }
     else
         throw Exception(outcome.GetError().GetMessage(), ErrorCodes::S3_ERROR);
@@ -166,7 +187,10 @@ void WriteBufferFromS3::writePart()
 
 void WriteBufferFromS3::completeMultipartUpload()
 {
-    LOG_DEBUG(log, "Completing multipart upload. Bucket: {}, Key: {}, Upload_id: {}", bucket, key, multipart_upload_id);
+    LOG_DEBUG(log, "Completing multipart upload. Bucket: {}, Key: {}, Upload_id: {}, Parts: {}", bucket, key, multipart_upload_id, part_tags.size());
+
+    if (part_tags.empty())
+        throw Exception("Failed to complete multipart upload. No parts have uploaded", ErrorCodes::S3_ERROR);
 
     Aws::S3::Model::CompleteMultipartUploadRequest req;
     req.SetBucket(bucket);
@@ -185,22 +209,30 @@ void WriteBufferFromS3::completeMultipartUpload()
     auto outcome = client_ptr->CompleteMultipartUpload(req);
 
     if (outcome.IsSuccess())
-        LOG_DEBUG(log, "Multipart upload has completed. Upload_id: {}", multipart_upload_id);
+        LOG_DEBUG(log, "Multipart upload has completed. Bucket: {}, Key: {}, Upload_id: {}, Parts: {}", bucket, key, multipart_upload_id, part_tags.size());
     else
         throw Exception(outcome.GetError().GetMessage(), ErrorCodes::S3_ERROR);
 }
 
 void WriteBufferFromS3::makeSinglepartUpload()
 {
-    if (temporary_buffer->tellp() <= 0)
-        return;
+    auto size = temporary_buffer->tellp();
 
-    LOG_DEBUG(log, "Making single part upload. Bucket: {}, Key: {}", bucket, key);
+    LOG_DEBUG(log, "Making single part upload. Bucket: {}, Key: {}, Size: {}", bucket, key, size);
+
+    if (size < 0)
+        throw Exception("Failed to make single part upload. Buffer in invalid state", ErrorCodes::S3_ERROR);
+
+    if (size == 0)
+    {
+        LOG_DEBUG(log, "Skipping single part upload. Buffer is empty.");
+        return;
+    }
 
     Aws::S3::Model::PutObjectRequest req;
     req.SetBucket(bucket);
     req.SetKey(key);
-    req.SetContentLength(temporary_buffer->tellp());
+    req.SetContentLength(size);
     req.SetBody(temporary_buffer);
     if (object_metadata.has_value())
         req.SetMetadata(object_metadata.value());
@@ -208,7 +240,7 @@ void WriteBufferFromS3::makeSinglepartUpload()
     auto outcome = client_ptr->PutObject(req);
 
     if (outcome.IsSuccess())
-        LOG_DEBUG(log, "Single part upload has completed. Bucket: {}, Key: {}", bucket, key);
+        LOG_DEBUG(log, "Single part upload has completed. Bucket: {}, Key: {}, Object size: {}", bucket, key, req.GetContentLength());
     else
         throw Exception(outcome.GetError().GetMessage(), ErrorCodes::S3_ERROR);
 }
diff --git a/src/IO/WriteBufferFromS3.h b/src/IO/WriteBufferFromS3.h
index 9e4b056603a..7a77949072b 100644
--- a/src/IO/WriteBufferFromS3.h
+++ b/src/IO/WriteBufferFromS3.h
@@ -69,6 +69,8 @@ public:
 private:
     bool finalized = false;
 
+    void allocateBuffer();
+
     void createMultipartUpload();
     void writePart();
     void completeMultipartUpload();
diff --git a/src/IO/WriteBufferFromVector.h b/src/IO/WriteBufferFromVector.h
index 1dcf2c3f327..0e0cd3c522b 100644
--- a/src/IO/WriteBufferFromVector.h
+++ b/src/IO/WriteBufferFromVector.h
@@ -45,7 +45,7 @@ private:
     }
 
 public:
-    WriteBufferFromVector(VectorType & vector_)
+    explicit WriteBufferFromVector(VectorType & vector_)
         : WriteBuffer(reinterpret_cast<Position>(vector_.data()), vector_.size()), vector(vector_)
     {
         if (vector.empty())
@@ -95,7 +95,7 @@ public:
     ~WriteBufferFromVector() override
     {
         /// FIXME move final flush into the caller
-        MemoryTracker::LockExceptionInThread lock;
+        MemoryTracker::LockExceptionInThread lock(VariableContext::Global);
         finalize();
     }
 };
diff --git a/src/IO/WriteBufferValidUTF8.cpp b/src/IO/WriteBufferValidUTF8.cpp
index 1071ac1078d..ecdf38eae34 100644
--- a/src/IO/WriteBufferValidUTF8.cpp
+++ b/src/IO/WriteBufferValidUTF8.cpp
@@ -138,7 +138,7 @@ void WriteBufferValidUTF8::finish()
 WriteBufferValidUTF8::~WriteBufferValidUTF8()
 {
     /// FIXME move final flush into the caller
-    MemoryTracker::LockExceptionInThread lock;
+    MemoryTracker::LockExceptionInThread lock(VariableContext::Global);
     finish();
 }
 
diff --git a/src/IO/WriteHelpers.h b/src/IO/WriteHelpers.h
index a382ae13cdd..b9497b6f87e 100644
--- a/src/IO/WriteHelpers.h
+++ b/src/IO/WriteHelpers.h
@@ -819,26 +819,20 @@ inline void writeDateTimeText(const LocalDateTime & datetime, WriteBuffer & buf)
 
 /// In the format YYYY-MM-DD HH:MM:SS, according to the specified time zone.
 template <char date_delimeter = '-', char time_delimeter = ':', char between_date_time_delimiter = ' '>
-inline void writeDateTimeText(time_t datetime, WriteBuffer & buf, const DateLUTImpl & date_lut = DateLUT::instance())
+inline void writeDateTimeText(time_t datetime, WriteBuffer & buf, const DateLUTImpl & time_zone = DateLUT::instance())
 {
-    const auto & values = date_lut.getValues(datetime);
-    writeDateTimeText<date_delimeter, time_delimeter, between_date_time_delimiter>(
-        LocalDateTime(values.year, values.month, values.day_of_month,
-            date_lut.toHour(datetime), date_lut.toMinute(datetime), date_lut.toSecond(datetime)), buf);
+    writeDateTimeText<date_delimeter, time_delimeter, between_date_time_delimiter>(LocalDateTime(datetime, time_zone), buf);
 }
 
 /// In the format YYYY-MM-DD HH:MM:SS.NNNNNNNNN, according to the specified time zone.
 template <char date_delimeter = '-', char time_delimeter = ':', char between_date_time_delimiter = ' ', char fractional_time_delimiter = '.'>
-inline void writeDateTimeText(DateTime64 datetime64, UInt32 scale, WriteBuffer & buf, const DateLUTImpl & date_lut = DateLUT::instance())
+inline void writeDateTimeText(DateTime64 datetime64, UInt32 scale, WriteBuffer & buf, const DateLUTImpl & time_zone = DateLUT::instance())
 {
     static constexpr UInt32 MaxScale = DecimalUtils::max_precision<DateTime64>;
     scale = scale > MaxScale ? MaxScale : scale;
 
     auto components = DecimalUtils::split(datetime64, scale);
-    const auto & values = date_lut.getValues(components.whole);
-    writeDateTimeText<date_delimeter, time_delimeter, between_date_time_delimiter>(
-        LocalDateTime(values.year, values.month, values.day_of_month,
-            date_lut.toHour(components.whole), date_lut.toMinute(components.whole), date_lut.toSecond(components.whole)), buf);
+    writeDateTimeText<date_delimeter, time_delimeter, between_date_time_delimiter>(LocalDateTime(components.whole, time_zone), buf);
 
     if (scale > 0)
     {
@@ -849,9 +843,9 @@ inline void writeDateTimeText(DateTime64 datetime64, UInt32 scale, WriteBuffer &
 
 /// In the RFC 1123 format: "Tue, 03 Dec 2019 00:11:50 GMT". You must provide GMT DateLUT.
 /// This is needed for HTTP requests.
-inline void writeDateTimeTextRFC1123(time_t datetime, WriteBuffer & buf, const DateLUTImpl & date_lut)
+inline void writeDateTimeTextRFC1123(time_t datetime, WriteBuffer & buf, const DateLUTImpl & time_zone = DateLUT::instance())
 {
-    const auto & values = date_lut.getValues(datetime);
+    const auto & values = time_zone.getValues(datetime);
 
     static const char week_days[3 * 8 + 1] = "XXX" "Mon" "Tue" "Wed" "Thu" "Fri" "Sat" "Sun";
     static const char months[3 * 13 + 1] = "XXX" "Jan" "Feb" "Mar" "Apr" "May" "Jun" "Jul" "Aug" "Sep" "Oct" "Nov" "Dec";
@@ -865,11 +859,11 @@ inline void writeDateTimeTextRFC1123(time_t datetime, WriteBuffer & buf, const D
     buf.write(&digits100[values.year / 100 * 2], 2);
     buf.write(&digits100[values.year % 100 * 2], 2);
     buf.write(' ');
-    buf.write(&digits100[date_lut.toHour(datetime) * 2], 2);
+    buf.write(&digits100[time_zone.toHour(datetime) * 2], 2);
     buf.write(':');
-    buf.write(&digits100[date_lut.toMinute(datetime) * 2], 2);
+    buf.write(&digits100[time_zone.toMinute(datetime) * 2], 2);
     buf.write(':');
-    buf.write(&digits100[date_lut.toSecond(datetime) * 2], 2);
+    buf.write(&digits100[time_zone.toSecond(datetime) * 2], 2);
     buf.write(" GMT", 4);
 }
 
diff --git a/src/IO/ZlibDeflatingWriteBuffer.cpp b/src/IO/ZlibDeflatingWriteBuffer.cpp
index 4b838ac6d0a..3cf00f627b3 100644
--- a/src/IO/ZlibDeflatingWriteBuffer.cpp
+++ b/src/IO/ZlibDeflatingWriteBuffer.cpp
@@ -49,7 +49,7 @@ ZlibDeflatingWriteBuffer::ZlibDeflatingWriteBuffer(
 ZlibDeflatingWriteBuffer::~ZlibDeflatingWriteBuffer()
 {
     /// FIXME move final flush into the caller
-    MemoryTracker::LockExceptionInThread lock;
+    MemoryTracker::LockExceptionInThread lock(VariableContext::Global);
 
     finish();
 
@@ -75,19 +75,28 @@ void ZlibDeflatingWriteBuffer::nextImpl()
     zstr.next_in = reinterpret_cast<unsigned char *>(working_buffer.begin());
     zstr.avail_in = offset();
 
-    do
+    try
     {
-        out->nextIfAtEnd();
-        zstr.next_out = reinterpret_cast<unsigned char *>(out->position());
-        zstr.avail_out = out->buffer().end() - out->position();
+        do
+        {
+            out->nextIfAtEnd();
+            zstr.next_out = reinterpret_cast<unsigned char *>(out->position());
+            zstr.avail_out = out->buffer().end() - out->position();
 
-        int rc = deflate(&zstr, Z_NO_FLUSH);
-        out->position() = out->buffer().end() - zstr.avail_out;
+            int rc = deflate(&zstr, Z_NO_FLUSH);
+            out->position() = out->buffer().end() - zstr.avail_out;
 
-        if (rc != Z_OK)
-            throw Exception(std::string("deflate failed: ") + zError(rc), ErrorCodes::ZLIB_DEFLATE_FAILED);
+            if (rc != Z_OK)
+                throw Exception(std::string("deflate failed: ") + zError(rc), ErrorCodes::ZLIB_DEFLATE_FAILED);
+        }
+        while (zstr.avail_in > 0 || zstr.avail_out == 0);
+    }
+    catch (...)
+    {
+        /// Do not try to write next time after exception.
+        out->position() = out->buffer().begin();
+        throw;
     }
-    while (zstr.avail_in > 0 || zstr.avail_out == 0);
 }
 
 void ZlibDeflatingWriteBuffer::finish()
@@ -95,6 +104,23 @@ void ZlibDeflatingWriteBuffer::finish()
     if (finished)
         return;
 
+    try
+    {
+        finishImpl();
+        out->finalize();
+        finished = true;
+    }
+    catch (...)
+    {
+        /// Do not try to flush next time after exception.
+        out->position() = out->buffer().begin();
+        finished = true;
+        throw;
+    }
+}
+
+void ZlibDeflatingWriteBuffer::finishImpl()
+{
     next();
 
     /// https://github.com/zlib-ng/zlib-ng/issues/494
@@ -123,7 +149,6 @@ void ZlibDeflatingWriteBuffer::finish()
 
         if (rc == Z_STREAM_END)
         {
-            finished = true;
             return;
         }
 
diff --git a/src/IO/ZlibDeflatingWriteBuffer.h b/src/IO/ZlibDeflatingWriteBuffer.h
index f9df8f8157b..6f623f55f56 100644
--- a/src/IO/ZlibDeflatingWriteBuffer.h
+++ b/src/IO/ZlibDeflatingWriteBuffer.h
@@ -22,16 +22,19 @@ public:
             char * existing_memory = nullptr,
             size_t alignment = 0);
 
-    /// Flush all pending data and write zlib footer to the underlying buffer.
-    /// After the first call to this function, subsequent calls will have no effect and
-    /// an attempt to write to this buffer will result in exception.
-    void finish();
+    void finalize() override { finish(); }
 
     ~ZlibDeflatingWriteBuffer() override;
 
 private:
     void nextImpl() override;
 
+    void finishImpl();
+    /// Flush all pending data and write zlib footer to the underlying buffer.
+    /// After the first call to this function, subsequent calls will have no effect and
+    /// an attempt to write to this buffer will result in exception.
+    void finish();
+
     std::unique_ptr<WriteBuffer> out;
     z_stream zstr;
     bool finished = false;
diff --git a/src/IO/ZstdDeflatingWriteBuffer.cpp b/src/IO/ZstdDeflatingWriteBuffer.cpp
index 9b79d5ae513..08b289a2e04 100644
--- a/src/IO/ZstdDeflatingWriteBuffer.cpp
+++ b/src/IO/ZstdDeflatingWriteBuffer.cpp
@@ -31,7 +31,7 @@ ZstdDeflatingWriteBuffer::ZstdDeflatingWriteBuffer(
 ZstdDeflatingWriteBuffer::~ZstdDeflatingWriteBuffer()
 {
     /// FIXME move final flush into the caller
-    MemoryTracker::LockExceptionInThread lock;
+    MemoryTracker::LockExceptionInThread lock(VariableContext::Global);
 
     finish();
 
@@ -61,28 +61,53 @@ void ZstdDeflatingWriteBuffer::nextImpl()
     input.size = offset();
     input.pos = 0;
 
-    bool finished = false;
-    do
+    try
     {
-        out->nextIfAtEnd();
+        bool ended = false;
+        do
+        {
+            out->nextIfAtEnd();
 
-        output.dst = reinterpret_cast<unsigned char *>(out->buffer().begin());
-        output.size = out->buffer().size();
-        output.pos = out->offset();
+            output.dst = reinterpret_cast<unsigned char *>(out->buffer().begin());
+            output.size = out->buffer().size();
+            output.pos = out->offset();
 
 
-        ZSTD_compressStream2(cctx, &output, &input, mode);
-        out->position() = out->buffer().begin() + output.pos;
-        finished = (input.pos == input.size);
-    } while (!finished);
-
+            ZSTD_compressStream2(cctx, &output, &input, mode);
+            out->position() = out->buffer().begin() + output.pos;
+            ended = (input.pos == input.size);
+        } while (!ended);
+    }
+    catch (...)
+    {
+        /// Do not try to write next time after exception.
+        out->position() = out->buffer().begin();
+        throw;
+    }
 }
 
 void ZstdDeflatingWriteBuffer::finish()
 {
-    if (flushed)
+    if (finished)
         return;
 
+    try
+    {
+        finishImpl();
+        out->finalize();
+        finished = true;
+    }
+    catch (...)
+    {
+        /// Do not try to flush next time after exception.
+        out->position() = out->buffer().begin();
+        finished = true;
+        throw;
+    }
+}
+
+void ZstdDeflatingWriteBuffer::finishImpl()
+{
     next();
 
     out->nextIfAtEnd();
@@ -99,7 +124,6 @@ void ZstdDeflatingWriteBuffer::finish()
     if (ZSTD_isError(remaining))
         throw Exception(ErrorCodes::ZSTD_ENCODER_FAILED, "zstd stream encoder end failed: zstd version: {}", ZSTD_VERSION_STRING);
     out->position() = out->buffer().begin() + output.pos;
-    flushed = true;
 }
 
 }
diff --git a/src/IO/ZstdDeflatingWriteBuffer.h b/src/IO/ZstdDeflatingWriteBuffer.h
index 2c7dd38dbb0..b4ecc44d6f4 100644
--- a/src/IO/ZstdDeflatingWriteBuffer.h
+++ b/src/IO/ZstdDeflatingWriteBuffer.h
@@ -20,21 +20,24 @@ public:
         char * existing_memory = nullptr,
         size_t alignment = 0);
 
-    /// Flush all pending data and write zstd footer to the underlying buffer.
-    /// After the first call to this function, subsequent calls will have no effect and
-    /// an attempt to write to this buffer will result in exception.
-    void finish();
+    void finalize() override { finish(); }
 
     ~ZstdDeflatingWriteBuffer() override;
 
 private:
     void nextImpl() override;
 
+    /// Flush all pending data and write zstd footer to the underlying buffer.
+    /// After the first call to this function, subsequent calls will have no effect and
+    /// an attempt to write to this buffer will result in exception.
+    void finish();
+    void finishImpl();
+
     std::unique_ptr<WriteBuffer> out;
     ZSTD_CCtx * cctx;
     ZSTD_inBuffer input;
     ZSTD_outBuffer output;
-    bool flushed = false;
+    bool finished = false;
 };
 
 }
diff --git a/src/IO/createReadBufferFromFileBase.cpp b/src/IO/createReadBufferFromFileBase.cpp
index c1d4377fdff..230f049b2cb 100644
--- a/src/IO/createReadBufferFromFileBase.cpp
+++ b/src/IO/createReadBufferFromFileBase.cpp
@@ -3,7 +3,7 @@
 #if defined(OS_LINUX) || defined(__FreeBSD__)
 #include <IO/ReadBufferAIO.h>
 #endif
-#include <IO/MMapReadBufferFromFile.h>
+#include <IO/MMapReadBufferFromFileWithCache.h>
 #include <Common/ProfileEvents.h>
 
 
@@ -21,7 +21,7 @@ namespace DB
 
 std::unique_ptr<ReadBufferFromFileBase> createReadBufferFromFileBase(
     const std::string & filename_,
-    size_t estimated_size, size_t aio_threshold, size_t mmap_threshold,
+    size_t estimated_size, size_t aio_threshold, size_t mmap_threshold, MMappedFileCache * mmap_cache,
     size_t buffer_size_, int flags_, char * existing_memory_, size_t alignment)
 {
 #if defined(OS_LINUX) || defined(__FreeBSD__)
@@ -45,11 +45,11 @@ std::unique_ptr<ReadBufferFromFileBase> createReadBufferFromFileBase(
     (void)estimated_size;
 #endif
 
-    if (!existing_memory_ && mmap_threshold && estimated_size >= mmap_threshold)
+    if (!existing_memory_ && mmap_threshold && mmap_cache && estimated_size >= mmap_threshold)
     {
         try
         {
-            auto res = std::make_unique<MMapReadBufferFromFile>(filename_, 0);
+            auto res = std::make_unique<MMapReadBufferFromFileWithCache>(*mmap_cache, filename_, 0);
             ProfileEvents::increment(ProfileEvents::CreatedReadBufferMMap);
             return res;
         }
diff --git a/src/IO/createReadBufferFromFileBase.h b/src/IO/createReadBufferFromFileBase.h
index 61dfde6229f..46d5b39ea44 100644
--- a/src/IO/createReadBufferFromFileBase.h
+++ b/src/IO/createReadBufferFromFileBase.h
@@ -8,6 +8,9 @@
 namespace DB
 {
 
+class MMappedFileCache;
+
+
 /** Create an object to read data from a file.
   * estimated_size - the number of bytes to read
   * aio_threshold - the minimum number of bytes for asynchronous reads
@@ -20,6 +23,7 @@ std::unique_ptr<ReadBufferFromFileBase> createReadBufferFromFileBase(
     size_t estimated_size,
     size_t aio_threshold,
     size_t mmap_threshold,
+    MMappedFileCache * mmap_cache,
     size_t buffer_size_ = DBMS_DEFAULT_BUFFER_SIZE,
     int flags_ = -1,
     char * existing_memory_ = nullptr,
diff --git a/src/IO/parseDateTimeBestEffort.cpp b/src/IO/parseDateTimeBestEffort.cpp
index 47a298ede29..a7a9eaaa4dd 100644
--- a/src/IO/parseDateTimeBestEffort.cpp
+++ b/src/IO/parseDateTimeBestEffort.cpp
@@ -46,7 +46,7 @@ inline size_t readAlpha(char * res, size_t max_chars, ReadBuffer & in)
 }
 
 #if defined(__PPC__)
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
 #endif
 #endif
@@ -600,7 +600,7 @@ ReturnType parseDateTimeBestEffortImpl(
     return ReturnType(true);
 }
 
-template <typename ReturnType>
+template <typename ReturnType, bool is_us_style>
 ReturnType parseDateTime64BestEffortImpl(DateTime64 & res, UInt32 scale, ReadBuffer & in, const DateLUTImpl & local_time_zone, const DateLUTImpl & utc_time_zone)
 {
     time_t whole;
@@ -608,12 +608,12 @@ ReturnType parseDateTime64BestEffortImpl(DateTime64 & res, UInt32 scale, ReadBuf
 
     if constexpr (std::is_same_v<ReturnType, bool>)
     {
-        if (!parseDateTimeBestEffortImpl<bool, false>(whole, in, local_time_zone, utc_time_zone, &subsecond))
+        if (!parseDateTimeBestEffortImpl<bool, is_us_style>(whole, in, local_time_zone, utc_time_zone, &subsecond))
             return false;
     }
     else
     {
-        parseDateTimeBestEffortImpl<ReturnType, false>(whole, in, local_time_zone, utc_time_zone, &subsecond);
+        parseDateTimeBestEffortImpl<ReturnType, is_us_style>(whole, in, local_time_zone, utc_time_zone, &subsecond);
     }
 
 
@@ -634,7 +634,7 @@ ReturnType parseDateTime64BestEffortImpl(DateTime64 & res, UInt32 scale, ReadBuf
 }
 
 #if defined(__PPC__)
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic pop
 #endif
 #endif
@@ -661,12 +661,17 @@ bool tryParseDateTimeBestEffortUS(time_t & res, ReadBuffer & in, const DateLUTIm
 
 void parseDateTime64BestEffort(DateTime64 & res, UInt32 scale, ReadBuffer & in, const DateLUTImpl & local_time_zone, const DateLUTImpl & utc_time_zone)
 {
-    return parseDateTime64BestEffortImpl<void>(res, scale, in, local_time_zone, utc_time_zone);
+    return parseDateTime64BestEffortImpl<void, false>(res, scale, in, local_time_zone, utc_time_zone);
+}
+
+void parseDateTime64BestEffortUS(DateTime64 & res, UInt32 scale, ReadBuffer & in, const DateLUTImpl & local_time_zone, const DateLUTImpl & utc_time_zone)
+{
+    return parseDateTime64BestEffortImpl<void, true>(res, scale, in, local_time_zone, utc_time_zone);
 }
 
 bool tryParseDateTime64BestEffort(DateTime64 & res, UInt32 scale, ReadBuffer & in, const DateLUTImpl & local_time_zone, const DateLUTImpl & utc_time_zone)
 {
-    return parseDateTime64BestEffortImpl<bool>(res, scale, in, local_time_zone, utc_time_zone);
+    return parseDateTime64BestEffortImpl<bool, false>(res, scale, in, local_time_zone, utc_time_zone);
 }
 
 }
diff --git a/src/IO/parseDateTimeBestEffort.h b/src/IO/parseDateTimeBestEffort.h
index 65e92cbee42..fe3da24a797 100644
--- a/src/IO/parseDateTimeBestEffort.h
+++ b/src/IO/parseDateTimeBestEffort.h
@@ -61,6 +61,7 @@ bool tryParseDateTimeBestEffort(time_t & res, ReadBuffer & in, const DateLUTImpl
 void parseDateTimeBestEffortUS(time_t & res, ReadBuffer & in, const DateLUTImpl & local_time_zone, const DateLUTImpl & utc_time_zone);
 bool tryParseDateTimeBestEffortUS(time_t & res, ReadBuffer & in, const DateLUTImpl & local_time_zone, const DateLUTImpl & utc_time_zone);
 void parseDateTime64BestEffort(DateTime64 & res, UInt32 scale, ReadBuffer & in, const DateLUTImpl & local_time_zone, const DateLUTImpl & utc_time_zone);
+void parseDateTime64BestEffortUS(DateTime64 & res, UInt32 scale, ReadBuffer & in, const DateLUTImpl & local_time_zone, const DateLUTImpl & utc_time_zone);
 bool tryParseDateTime64BestEffort(DateTime64 & res, UInt32 scale, ReadBuffer & in, const DateLUTImpl & local_time_zone, const DateLUTImpl & utc_time_zone);
 
 }
diff --git a/src/IO/tests/CMakeLists.txt b/src/IO/tests/CMakeLists.txt
index fcd59d94cb0..bcd0a8bba24 100644
--- a/src/IO/tests/CMakeLists.txt
+++ b/src/IO/tests/CMakeLists.txt
@@ -25,9 +25,6 @@ target_link_libraries (var_uint PRIVATE clickhouse_common_io)
 add_executable (read_escaped_string read_escaped_string.cpp)
 target_link_libraries (read_escaped_string PRIVATE clickhouse_common_io)
 
-add_executable (async_write async_write.cpp)
-target_link_libraries (async_write PRIVATE dbms)
-
 add_executable (parse_int_perf parse_int_perf.cpp)
 target_link_libraries (parse_int_perf PRIVATE clickhouse_common_io)
 
@@ -42,11 +39,9 @@ target_link_libraries (o_direct_and_dirty_pages PRIVATE clickhouse_common_io)
 
 add_executable (hashing_write_buffer hashing_write_buffer.cpp)
 target_link_libraries (hashing_write_buffer PRIVATE clickhouse_common_io)
-add_check(hashing_write_buffer)
 
 add_executable (hashing_read_buffer hashing_read_buffer.cpp)
 target_link_libraries (hashing_read_buffer PRIVATE clickhouse_common_io)
-add_check (hashing_read_buffer)
 
 add_executable (io_operators io_operators.cpp)
 target_link_libraries (io_operators PRIVATE clickhouse_common_io)
diff --git a/src/IO/tests/async_write.cpp b/src/IO/tests/async_write.cpp
deleted file mode 100644
index e3bff7cf341..00000000000
--- a/src/IO/tests/async_write.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-#include <iostream>
-
-#include <IO/ReadBufferFromFileDescriptor.h>
-#include <IO/WriteBufferFromFileDescriptor.h>
-#include <IO/AsynchronousWriteBuffer.h>
-#include <IO/copyData.h>
-#include <Compression/CompressedWriteBuffer.h>
-
-
-int main(int, char **)
-try
-{
-    DB::ReadBufferFromFileDescriptor in1(STDIN_FILENO);
-    DB::WriteBufferFromFileDescriptor out1(STDOUT_FILENO);
-    DB::AsynchronousWriteBuffer out2(out1);
-    DB::CompressedWriteBuffer out3(out2);
-
-    DB::copyData(in1, out3);
-
-    return 0;
-}
-catch (const DB::Exception & e)
-{
-    std::cerr << e.what() << ", " << e.displayText() << std::endl;
-    return 1;
-}
diff --git a/src/IO/tests/gtest_DateTimeToString.cpp b/src/IO/tests/gtest_DateTimeToString.cpp
index eb609f0f97e..058e7c12fdd 100644
--- a/src/IO/tests/gtest_DateTimeToString.cpp
+++ b/src/IO/tests/gtest_DateTimeToString.cpp
@@ -161,7 +161,7 @@ INSTANTIATE_TEST_SUITE_P(DateTimeToString, DateTimeToStringParamTestDayNum,
         {
             "Negative DayNum value wraps as if it was UInt16 due to LUT limitations and to maintain compatibility with existing code.",
             DayNum(-10 * 365),
-            "2106-02-07"
+            "2139-06-10"
         },
     })
 );
diff --git a/src/IO/tests/gtest_peekable_read_buffer.cpp b/src/IO/tests/gtest_peekable_read_buffer.cpp
index 8c491338bd3..2e5ca47c0aa 100644
--- a/src/IO/tests/gtest_peekable_read_buffer.cpp
+++ b/src/IO/tests/gtest_peekable_read_buffer.cpp
@@ -6,11 +6,6 @@
 #include <IO/ConcatReadBuffer.h>
 #include <IO/PeekableReadBuffer.h>
 
-namespace DB::ErrorCodes
-{
-    extern const int LOGICAL_ERROR;
-}
-
 static void readAndAssert(DB::ReadBuffer & buf, const char * str)
 {
     size_t n = strlen(str);
@@ -48,20 +43,6 @@ try
         readAndAssert(peekable, "01234");
     }
 
-#ifndef ABORT_ON_LOGICAL_ERROR
-    bool exception = false;
-    try
-    {
-        peekable.rollbackToCheckpoint();
-    }
-    catch (DB::Exception & e)
-    {
-        if (e.code() != DB::ErrorCodes::LOGICAL_ERROR)
-            throw;
-        exception = true;
-    }
-    ASSERT_TRUE(exception);
-#endif
     assertAvailable(peekable, "56789");
 
     readAndAssert(peekable, "56");
diff --git a/src/IO/tests/lzma_buffers.cpp b/src/IO/tests/lzma_buffers.cpp
index 7eb6bf8b81c..ff3d518bfab 100644
--- a/src/IO/tests/lzma_buffers.cpp
+++ b/src/IO/tests/lzma_buffers.cpp
@@ -28,7 +28,7 @@ try
             DB::writeIntText(i, lzma_buf);
             DB::writeChar('\t', lzma_buf);
         }
-        lzma_buf.finish();
+        lzma_buf.finalize();
 
         stopwatch.stop();
 
diff --git a/src/IO/tests/parse_int_perf.cpp b/src/IO/tests/parse_int_perf.cpp
index 93f49d80258..e35a3d8a857 100644
--- a/src/IO/tests/parse_int_perf.cpp
+++ b/src/IO/tests/parse_int_perf.cpp
@@ -62,7 +62,6 @@ int main(int argc, char ** argv)
         {
             DB::WriteBufferFromVector wb(formatted);
         //    DB::CompressedWriteBuffer wb2(wb1);
-        //    DB::AsynchronousWriteBuffer wb(wb2);
             Stopwatch watch;
 
             UInt64 tsc = rdtsc();
diff --git a/src/IO/tests/zlib_buffers.cpp b/src/IO/tests/zlib_buffers.cpp
index 3428d5e995a..2068a3e6668 100644
--- a/src/IO/tests/zlib_buffers.cpp
+++ b/src/IO/tests/zlib_buffers.cpp
@@ -30,7 +30,7 @@ try
             DB::writeIntText(i, deflating_buf);
             DB::writeChar('\t', deflating_buf);
         }
-        deflating_buf.finish();
+        deflating_buf.finalize();
 
         stopwatch.stop();
         std::cout << "Writing done. Elapsed: " << stopwatch.elapsedSeconds() << " s."
diff --git a/src/IO/tests/zstd_buffers.cpp b/src/IO/tests/zstd_buffers.cpp
index f269c0b22fd..533229f4878 100644
--- a/src/IO/tests/zstd_buffers.cpp
+++ b/src/IO/tests/zstd_buffers.cpp
@@ -30,7 +30,7 @@ try
             DB::writeIntText(i, zstd_buf);
             DB::writeChar('\t', zstd_buf);
         }
-        zstd_buf.finish();
+        zstd_buf.finalize();
 
         stopwatch.stop();
 
diff --git a/src/IO/ya.make b/src/IO/ya.make
index 980719aa74f..01b3995ef7a 100644
--- a/src/IO/ya.make
+++ b/src/IO/ya.make
@@ -29,12 +29,14 @@ SRCS(
     HTTPChunkedReadBuffer.cpp
     HTTPCommon.cpp
     HashingWriteBuffer.cpp
-    HexWriteBuffer.cpp
     LZMADeflatingWriteBuffer.cpp
     LZMAInflatingReadBuffer.cpp
     LimitReadBuffer.cpp
     MMapReadBufferFromFile.cpp
     MMapReadBufferFromFileDescriptor.cpp
+    MMapReadBufferFromFileWithCache.cpp
+    MMappedFile.cpp
+    MMappedFileDescriptor.cpp
     MemoryReadWriteBuffer.cpp
     MySQLBinlogEventReadBuffer.cpp
     MySQLPacketPayloadReadBuffer.cpp
@@ -51,6 +53,7 @@ SRCS(
     ReadBufferFromPocoSocket.cpp
     ReadHelpers.cpp
     SeekAvoidingReadBuffer.cpp
+    TimeoutSetter.cpp
     UseSSL.cpp
     WriteBufferFromFile.cpp
     WriteBufferFromFileBase.cpp
diff --git a/src/Interpreters/ActionLocksManager.cpp b/src/Interpreters/ActionLocksManager.cpp
index 76e5228bec3..0f9b4d01bdf 100644
--- a/src/Interpreters/ActionLocksManager.cpp
+++ b/src/Interpreters/ActionLocksManager.cpp
@@ -19,29 +19,27 @@ namespace ActionLocks
 }
 
 
-ActionLocksManager::ActionLocksManager(const Context & context)
-        : global_context(context.getGlobalContext())
+ActionLocksManager::ActionLocksManager(ContextPtr context_) : WithContext(context_->getGlobalContext())
 {
 }
 
 template <typename F>
-inline void forEachTable(F && f, const Context & context)
+inline void forEachTable(F && f, ContextPtr context)
 {
     for (auto & elem : DatabaseCatalog::instance().getDatabases())
         for (auto iterator = elem.second->getTablesIterator(context); iterator->isValid(); iterator->next())
             if (auto table = iterator->table())
                 f(table);
-
 }
 
-void ActionLocksManager::add(StorageActionBlockType action_type, const Context & context)
+void ActionLocksManager::add(StorageActionBlockType action_type, ContextPtr context_)
 {
-    forEachTable([&](const StoragePtr & table) { add(table, action_type); }, context);
+    forEachTable([&](const StoragePtr & table) { add(table, action_type); }, context_);
 }
 
 void ActionLocksManager::add(const StorageID & table_id, StorageActionBlockType action_type)
 {
-    if (auto table = DatabaseCatalog::instance().tryGetTable(table_id, global_context))
+    if (auto table = DatabaseCatalog::instance().tryGetTable(table_id, getContext()))
         add(table, action_type);
 }
 
@@ -66,7 +64,7 @@ void ActionLocksManager::remove(StorageActionBlockType action_type)
 
 void ActionLocksManager::remove(const StorageID & table_id, StorageActionBlockType action_type)
 {
-    if (auto table = DatabaseCatalog::instance().tryGetTable(table_id, global_context))
+    if (auto table = DatabaseCatalog::instance().tryGetTable(table_id, getContext()))
         remove(table, action_type);
 }
 
diff --git a/src/Interpreters/ActionLocksManager.h b/src/Interpreters/ActionLocksManager.h
index a39d8b5784f..f030afec891 100644
--- a/src/Interpreters/ActionLocksManager.h
+++ b/src/Interpreters/ActionLocksManager.h
@@ -1,9 +1,10 @@
 #pragma once
 
-#include <common/types.h>
+#include <Interpreters/Context_fwd.h>
+#include <Interpreters/StorageID.h>
 #include <Storages/IStorage_fwd.h>
 #include <Common/ActionLock.h>
-#include <Interpreters/StorageID.h>
+#include <common/types.h>
 
 #include <mutex>
 #include <unordered_map>
@@ -12,17 +13,15 @@
 namespace DB
 {
 
-class Context;
-
 /// Holds ActionLocks for tables
 /// Does not store pointers to tables
-class ActionLocksManager
+class ActionLocksManager : WithContext
 {
 public:
-    ActionLocksManager(const Context & context);
+    explicit ActionLocksManager(ContextPtr context);
 
     /// Adds new locks for each table
-    void add(StorageActionBlockType action_type, const Context & context);
+    void add(StorageActionBlockType action_type, ContextPtr context);
     /// Add new lock for a table if it has not been already added
     void add(const StorageID & table_id, StorageActionBlockType action_type);
     void add(const StoragePtr & table, StorageActionBlockType action_type);
@@ -43,7 +42,6 @@ private:
 
     mutable std::mutex mutex;
     StorageLocks storage_locks;
-    const Context & global_context;
 };
 
 }
diff --git a/src/Interpreters/ActionsDAG.cpp b/src/Interpreters/ActionsDAG.cpp
index 12942371d4f..2e6a6398291 100644
--- a/src/Interpreters/ActionsDAG.cpp
+++ b/src/Interpreters/ActionsDAG.cpp
@@ -6,6 +6,7 @@
 #include <Functions/IFunctionAdaptors.h>
 #include <Functions/FunctionsConversion.h>
 #include <Functions/materialize.h>
+#include <Functions/FunctionsLogical.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/ExpressionJIT.h>
 #include <IO/WriteBufferFromString.h>
@@ -19,7 +20,6 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int LOGICAL_ERROR;
-    extern const int DUPLICATE_COLUMN;
     extern const int UNKNOWN_IDENTIFIER;
     extern const int TYPE_MISMATCH;
     extern const int NUMBER_OF_COLUMNS_DOESNT_MATCH;
@@ -31,7 +31,7 @@ namespace ErrorCodes
 ActionsDAG::ActionsDAG(const NamesAndTypesList & inputs_)
 {
     for (const auto & input : inputs_)
-        addInput(input.name, input.type, true);
+        index.push_back(&addInput(input.name, input.type));
 }
 
 ActionsDAG::ActionsDAG(const ColumnsWithTypeAndName & inputs_)
@@ -40,7 +40,7 @@ ActionsDAG::ActionsDAG(const ColumnsWithTypeAndName & inputs_)
     {
         if (input.column && isColumnConst(*input.column))
         {
-            addInput(input, true);
+            addInput(input);
 
             /// Here we also add column.
             /// It will allow to remove input which is actually constant (after projection).
@@ -48,49 +48,34 @@ ActionsDAG::ActionsDAG(const ColumnsWithTypeAndName & inputs_)
             ///   without any respect to header structure. So, it is a way to drop materialized column and use
             ///   constant value from header.
             /// We cannot remove such input right now cause inputs positions are important in some cases.
-            addColumn(input, true);
+            index.push_back(&addColumn(input));
         }
         else
-            addInput(input.name, input.type, true);
+            index.push_back(&addInput(input.name, input.type));
     }
 }
 
-ActionsDAG::Node & ActionsDAG::addNode(Node node, bool can_replace, bool add_to_index)
+ActionsDAG::Node & ActionsDAG::addNode(Node node)
 {
-    auto it = index.find(node.result_name);
-    if (it != index.end() && !can_replace && add_to_index)
-        throw Exception("Column '" + node.result_name + "' already exists", ErrorCodes::DUPLICATE_COLUMN);
-
     auto & res = nodes.emplace_back(std::move(node));
 
     if (res.type == ActionType::INPUT)
         inputs.emplace_back(&res);
 
-    if (add_to_index)
-        index.replace(&res);
     return res;
 }
 
-ActionsDAG::Node & ActionsDAG::getNode(const std::string & name)
-{
-    auto it = index.find(name);
-    if (it == index.end())
-        throw Exception("Unknown identifier: '" + name + "'", ErrorCodes::UNKNOWN_IDENTIFIER);
-
-    return **it;
-}
-
-const ActionsDAG::Node & ActionsDAG::addInput(std::string name, DataTypePtr type, bool can_replace)
+const ActionsDAG::Node & ActionsDAG::addInput(std::string name, DataTypePtr type)
 {
     Node node;
     node.type = ActionType::INPUT;
     node.result_type = std::move(type);
     node.result_name = std::move(name);
 
-    return addNode(std::move(node), can_replace);
+    return addNode(std::move(node));
 }
 
-const ActionsDAG::Node & ActionsDAG::addInput(ColumnWithTypeAndName column, bool can_replace)
+const ActionsDAG::Node & ActionsDAG::addInput(ColumnWithTypeAndName column)
 {
     Node node;
     node.type = ActionType::INPUT;
@@ -98,10 +83,10 @@ const ActionsDAG::Node & ActionsDAG::addInput(ColumnWithTypeAndName column, bool
     node.result_name = std::move(column.name);
     node.column = std::move(column.column);
 
-    return addNode(std::move(node), can_replace);
+    return addNode(std::move(node));
 }
 
-const ActionsDAG::Node & ActionsDAG::addColumn(ColumnWithTypeAndName column, bool can_replace, bool materialize)
+const ActionsDAG::Node & ActionsDAG::addColumn(ColumnWithTypeAndName column)
 {
     if (!column.column)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot add column {} because it is nullptr", column.name);
@@ -112,30 +97,10 @@ const ActionsDAG::Node & ActionsDAG::addColumn(ColumnWithTypeAndName column, boo
     node.result_name = std::move(column.name);
     node.column = std::move(column.column);
 
-    auto * res = &addNode(std::move(node), can_replace, !materialize);
-
-    if (materialize)
-    {
-        auto & name = res->result_name;
-
-        FunctionOverloadResolverPtr func_builder_materialize =
-                std::make_shared<FunctionOverloadResolverAdaptor>(
-                        std::make_unique<DefaultOverloadResolver>(
-                                std::make_shared<FunctionMaterialize>()));
-
-        res = &addFunction(func_builder_materialize, {res}, {}, true, false);
-        res = &addAlias(*res, name, true);
-    }
-
-    return *res;
+    return addNode(std::move(node));
 }
 
-const ActionsDAG::Node & ActionsDAG::addAlias(const std::string & name, std::string alias, bool can_replace)
-{
-    return addAlias(getNode(name), alias, can_replace);
-}
-
-ActionsDAG::Node & ActionsDAG::addAlias(Node & child, std::string alias, bool can_replace)
+const ActionsDAG::Node & ActionsDAG::addAlias(const Node & child, std::string alias)
 {
     Node node;
     node.type = ActionType::ALIAS;
@@ -144,13 +109,11 @@ ActionsDAG::Node & ActionsDAG::addAlias(Node & child, std::string alias, bool ca
     node.column = child.column;
     node.children.emplace_back(&child);
 
-    return addNode(std::move(node), can_replace);
+    return addNode(std::move(node));
 }
 
-const ActionsDAG::Node & ActionsDAG::addArrayJoin(const std::string & source_name, std::string result_name)
+const ActionsDAG::Node & ActionsDAG::addArrayJoin(const Node & child, std::string result_name)
 {
-    auto & child = getNode(source_name);
-
     const DataTypeArray * array_type = typeid_cast<const DataTypeArray *>(child.result_type.get());
     if (!array_type)
         throw Exception("ARRAY JOIN requires array argument", ErrorCodes::TYPE_MISMATCH);
@@ -166,37 +129,8 @@ const ActionsDAG::Node & ActionsDAG::addArrayJoin(const std::string & source_nam
 
 const ActionsDAG::Node & ActionsDAG::addFunction(
         const FunctionOverloadResolverPtr & function,
-        const Names & argument_names,
-        std::string result_name,
-        const Context & context [[maybe_unused]],
-        bool can_replace)
-{
-    const auto & all_settings = context.getSettingsRef();
-    settings.max_temporary_columns = all_settings.max_temporary_columns;
-    settings.max_temporary_non_const_columns = all_settings.max_temporary_non_const_columns;
-
-#if USE_EMBEDDED_COMPILER
-    settings.compile_expressions = all_settings.compile_expressions;
-    settings.min_count_to_compile_expression = all_settings.min_count_to_compile_expression;
-
-    if (!compilation_cache)
-        compilation_cache = context.getCompiledExpressionCache();
-#endif
-
-    Inputs children;
-    children.reserve(argument_names.size());
-    for (const auto & name : argument_names)
-        children.push_back(&getNode(name));
-
-    return addFunction(function, children, std::move(result_name), can_replace);
-}
-
-ActionsDAG::Node & ActionsDAG::addFunction(
-        const FunctionOverloadResolverPtr & function,
-        Inputs children,
-        std::string result_name,
-        bool can_replace,
-        bool add_to_index)
+        NodeRawConstPtrs children,
+        std::string result_name)
 {
     size_t num_arguments = children.size();
 
@@ -210,7 +144,7 @@ ActionsDAG::Node & ActionsDAG::addFunction(
 
     for (size_t i = 0; i < num_arguments; ++i)
     {
-        auto & child = *node.children[i];
+        const auto & child = *node.children[i];
 
         ColumnWithTypeAndName argument;
         argument.column = child.column;
@@ -228,10 +162,7 @@ ActionsDAG::Node & ActionsDAG::addFunction(
     node.function = node.function_base->prepare(arguments);
 
     /// If all arguments are constants, and function is suitable to be executed in 'prepare' stage - execute function.
-    /// But if we compile expressions compiled version of this function maybe placed in cache,
-    /// so we don't want to unfold non deterministic functions
-    if (all_const && node.function_base->isSuitableForConstantFolding()
-        && (!settings.compile_expressions || node.function_base->isDeterministic()))
+    if (all_const && node.function_base->isSuitableForConstantFolding())
     {
         size_t num_rows = arguments.empty() ? 0 : arguments.front().column->size();
         auto col = node.function->execute(arguments, node.result_type, num_rows, true);
@@ -250,7 +181,7 @@ ActionsDAG::Node & ActionsDAG::addFunction(
         }
     }
 
-    /// Some functions like ignore() or getTypeName() always return constant result even if arguments are not constant.
+    /// Some functions like ignore(), indexHint() or getTypeName() always return constant result even if arguments are not constant.
     /// We can't do constant folding, but can specify in sample block that function result is constant to avoid
     /// unnecessary materialization.
     if (!node.column && node.function_base->isSuitableForConstantFolding())
@@ -276,9 +207,39 @@ ActionsDAG::Node & ActionsDAG::addFunction(
 
     node.result_name = std::move(result_name);
 
-    return addNode(std::move(node), can_replace, add_to_index);
+    return addNode(std::move(node));
 }
 
+const ActionsDAG::Node & ActionsDAG::findInIndex(const std::string & name) const
+{
+    if (const auto * node = tryFindInIndex(name))
+        return *node;
+
+    throw Exception(ErrorCodes::UNKNOWN_IDENTIFIER, "Unknown identifier: '{}'", name);
+}
+
+const ActionsDAG::Node * ActionsDAG::tryFindInIndex(const std::string & name) const
+{
+    for (const auto & node : index)
+        if (node->result_name == name)
+            return node;
+
+    return nullptr;
+}
+
+void ActionsDAG::addOrReplaceInIndex(const Node & node)
+{
+    for (auto & index_node : index)
+    {
+        if (index_node->result_name == node.result_name)
+        {
+            index_node = &node;
+            return;
+        }
+    }
+
+    index.push_back(&node);
+}
 
 NamesAndTypesList ActionsDAG::getRequiredColumns() const
 {
@@ -330,49 +291,65 @@ std::string ActionsDAG::dumpNames() const
     return out.str();
 }
 
-void ActionsDAG::removeUnusedActions(const Names & required_names)
+void ActionsDAG::removeUnusedActions(const NameSet & required_names)
 {
-    std::unordered_set<Node *> nodes_set;
-    std::vector<Node *> required_nodes;
+    NodeRawConstPtrs required_nodes;
     required_nodes.reserve(required_names.size());
 
-    for (const auto & name : required_names)
+    NameSet added;
+    for (const auto & node : index)
     {
-        auto it = index.find(name);
-        if (it == index.end())
-            throw Exception(ErrorCodes::UNKNOWN_IDENTIFIER,
-                            "Unknown column: {}, there are only columns {}", name, dumpNames());
-
-        if (nodes_set.insert(*it).second)
-            required_nodes.push_back(*it);
+        if (required_names.count(node->result_name) && added.count(node->result_name) == 0)
+        {
+            required_nodes.push_back(node);
+            added.insert(node->result_name);
+        }
     }
 
-    removeUnusedActions(required_nodes);
-}
-
-void ActionsDAG::removeUnusedActions(const std::vector<Node *> & required_nodes)
-{
+    if (added.size() < required_names.size())
     {
-        Index new_index;
-
-        for (auto * node : required_nodes)
-            new_index.insert(node);
-
-        index.swap(new_index);
+        for (const auto & name : required_names)
+            if (added.count(name) == 0)
+                throw Exception(ErrorCodes::UNKNOWN_IDENTIFIER,
+                                "Unknown column: {}, there are only columns {}", name, dumpNames());
     }
 
+    index.swap(required_nodes);
     removeUnusedActions();
 }
 
-void ActionsDAG::removeUnusedActions()
+void ActionsDAG::removeUnusedActions(const Names & required_names)
+{
+    NodeRawConstPtrs required_nodes;
+    required_nodes.reserve(required_names.size());
+
+    std::unordered_map<std::string_view, const Node *> names_map;
+    for (const auto * node : index)
+        names_map[node->result_name] = node;
+
+    for (const auto & name : required_names)
+    {
+        auto it = names_map.find(name);
+        if (it == names_map.end())
+            throw Exception(ErrorCodes::UNKNOWN_IDENTIFIER,
+                            "Unknown column: {}, there are only columns {}", name, dumpDAG());
+
+        required_nodes.push_back(it->second);
+    }
+
+    index.swap(required_nodes);
+    removeUnusedActions();
+}
+
+void ActionsDAG::removeUnusedActions(bool allow_remove_inputs)
 {
     std::unordered_set<const Node *> visited_nodes;
     std::stack<Node *> stack;
 
-    for (auto * node : index)
+    for (const auto * node : index)
     {
         visited_nodes.insert(node);
-        stack.push(node);
+        stack.push(const_cast<Node *>(node));
     }
 
     for (auto & node : nodes)
@@ -388,6 +365,9 @@ void ActionsDAG::removeUnusedActions()
             visited_nodes.insert(&node);
             stack.push(&node);
         }
+
+        if (node.type == ActionType::INPUT && !allow_remove_inputs)
+            visited_nodes.insert(&node);
     }
 
     while (!stack.empty())
@@ -402,11 +382,11 @@ void ActionsDAG::removeUnusedActions()
             node->children.clear();
         }
 
-        for (auto * child : node->children)
+        for (const auto * child : node->children)
         {
             if (visited_nodes.count(child) == 0)
             {
-                stack.push(child);
+                stack.push(const_cast<Node *>(child));
                 visited_nodes.insert(child);
             }
         }
@@ -417,22 +397,29 @@ void ActionsDAG::removeUnusedActions()
     inputs.erase(it, inputs.end());
 }
 
-void ActionsDAG::addAliases(const NamesWithAliases & aliases, std::vector<Node *> & result_nodes)
+void ActionsDAG::addAliases(const NamesWithAliases & aliases)
 {
-    std::vector<Node *> required_nodes;
+    std::unordered_map<std::string_view, size_t> names_map;
+    for (size_t i = 0; i < index.size(); ++i)
+        names_map[index[i]->result_name] = i;
+
+    NodeRawConstPtrs required_nodes;
+    required_nodes.reserve(aliases.size());
 
     for (const auto & item : aliases)
     {
-        auto & child = getNode(item.first);
-        required_nodes.push_back(&child);
-    }
+        auto it = names_map.find(item.first);
+        if (it == names_map.end())
+            throw Exception(ErrorCodes::UNKNOWN_IDENTIFIER,
+                            "Unknown column: {}, there are only columns {}", item.first, dumpNames());
 
-    result_nodes.reserve(aliases.size());
+        required_nodes.push_back(index[it->second]);
+    }
 
     for (size_t i = 0; i < aliases.size(); ++i)
     {
         const auto & item = aliases[i];
-        auto * child = required_nodes[i];
+        const auto * child = required_nodes[i];
 
         if (!item.second.empty() && item.first != item.second)
         {
@@ -443,40 +430,74 @@ void ActionsDAG::addAliases(const NamesWithAliases & aliases, std::vector<Node *
             node.column = child->column;
             node.children.emplace_back(child);
 
-            auto & alias = addNode(std::move(node), true);
-            result_nodes.push_back(&alias);
+            child = &addNode(std::move(node));
+        }
+
+        auto it = names_map.find(child->result_name);
+        if (it == names_map.end())
+        {
+            names_map[child->result_name] = index.size();
+            index.push_back(child);
         }
         else
-            result_nodes.push_back(child);
+            index[it->second] = child;
     }
 }
 
-void ActionsDAG::addAliases(const NamesWithAliases & aliases)
-{
-    std::vector<Node *> result_nodes;
-    addAliases(aliases, result_nodes);
-}
-
 void ActionsDAG::project(const NamesWithAliases & projection)
 {
-    std::vector<Node *> result_nodes;
-    addAliases(projection, result_nodes);
-    removeUnusedActions(result_nodes);
+    std::unordered_map<std::string_view, const Node *> names_map;
+    for (const auto * node : index)
+        names_map.emplace(node->result_name, node);
+
+    index.clear();
+    index.reserve(projection.size());
+
+    for (const auto & item : projection)
+    {
+        auto it = names_map.find(item.first);
+        if (it == names_map.end())
+            throw Exception(ErrorCodes::UNKNOWN_IDENTIFIER,
+                            "Unknown column: {}, there are only columns {}", item.first, dumpNames());
+
+        index.push_back(it->second);
+    }
+
+    for (size_t i = 0; i < projection.size(); ++i)
+    {
+        const auto & item = projection[i];
+        auto & child = index[i];
+
+        if (!item.second.empty() && item.first != item.second)
+        {
+            Node node;
+            node.type = ActionType::ALIAS;
+            node.result_type = child->result_type;
+            node.result_name = std::move(item.second);
+            node.column = child->column;
+            node.children.emplace_back(child);
+
+            child = &addNode(std::move(node));
+        }
+    }
+
+    removeUnusedActions();
     projectInput();
-    settings.projected_output = true;
+    projected_output = true;
 }
 
 bool ActionsDAG::tryRestoreColumn(const std::string & column_name)
 {
-    if (index.contains(column_name))
-        return true;
+    for (const auto * node : index)
+        if (node->result_name == column_name)
+            return true;
 
     for (auto it = nodes.rbegin(); it != nodes.rend(); ++it)
     {
         auto & node = *it;
         if (node.result_name == column_name)
         {
-            index.replace(&node);
+            index.push_back(&node);
             return true;
         }
     }
@@ -498,7 +519,7 @@ bool ActionsDAG::removeUnusedResult(const std::string & column_name)
             throw Exception(ErrorCodes::LOGICAL_ERROR, "Not found result {} in ActionsDAG\n{}", column_name, dumpDAG());
 
         col = *it;
-        index.remove(it);
+        index.erase(it);
     }
 
     /// Check if column is in input.
@@ -516,6 +537,11 @@ bool ActionsDAG::removeUnusedResult(const std::string & column_name)
             if (col == child)
                 return false;
 
+    /// Do not remove input if it was mentioned in index several times.
+    for (const auto * node : index)
+        if (col == node)
+            return false;
+
     /// Remove from nodes and inputs.
     for (auto jt = nodes.begin(); jt != nodes.end(); ++jt)
     {
@@ -532,7 +558,9 @@ bool ActionsDAG::removeUnusedResult(const std::string & column_name)
 
 ActionsDAGPtr ActionsDAG::clone() const
 {
-    auto actions = cloneEmpty();
+    auto actions = std::make_shared<ActionsDAG>();
+    actions->project_input = project_input;
+    actions->projected_output = projected_output;
 
     std::unordered_map<const Node *, Node *> copy_map;
 
@@ -547,7 +575,7 @@ ActionsDAGPtr ActionsDAG::clone() const
             child = copy_map[child];
 
     for (const auto & node : index)
-        actions->index.insert(copy_map[node]);
+        actions->index.push_back(copy_map[node]);
 
     for (const auto & node : inputs)
         actions->inputs.push_back(copy_map[node]);
@@ -555,16 +583,13 @@ ActionsDAGPtr ActionsDAG::clone() const
     return actions;
 }
 
-void ActionsDAG::compileExpressions()
-{
 #if USE_EMBEDDED_COMPILER
-    if (settings.compile_expressions)
-    {
-        compileFunctions();
-        removeUnusedActions();
-    }
-#endif
+void ActionsDAG::compileExpressions(size_t min_count_to_compile_expression)
+{
+    compileFunctions(min_count_to_compile_expression);
+    removeUnusedActions();
 }
+#endif
 
 std::string ActionsDAG::dumpDAG() const
 {
@@ -656,30 +681,30 @@ bool ActionsDAG::trivial() const
 }
 
 void ActionsDAG::addMaterializingOutputActions()
+{
+    for (auto & node : index)
+        node = &materializeNode(*node);
+}
+
+const ActionsDAG::Node & ActionsDAG::materializeNode(const Node & node)
 {
     FunctionOverloadResolverPtr func_builder_materialize =
             std::make_shared<FunctionOverloadResolverAdaptor>(
                     std::make_unique<DefaultOverloadResolver>(
                             std::make_shared<FunctionMaterialize>()));
 
-    Index new_index;
-    std::vector<Node *> index_nodes(index.begin(), index.end());
-    for (auto * node : index_nodes)
-    {
-        auto & name = node->result_name;
-        node = &addFunction(func_builder_materialize, {node}, {}, true, false);
-        node = &addAlias(*node, name, true);
-        new_index.insert(node);
-    }
-
-    index.swap(new_index);
+    const auto & name = node.result_name;
+    const auto * func = &addFunction(func_builder_materialize, {&node}, {});
+    return addAlias(*func, name);
 }
 
 ActionsDAGPtr ActionsDAG::makeConvertingActions(
     const ColumnsWithTypeAndName & source,
     const ColumnsWithTypeAndName & result,
     MatchColumnsMode mode,
-    bool ignore_constant_values)
+    bool ignore_constant_values,
+    bool add_casted_columns,
+    NameToNameMap * new_names)
 {
     size_t num_input_columns = source.size();
     size_t num_result_columns = result.size();
@@ -687,8 +712,11 @@ ActionsDAGPtr ActionsDAG::makeConvertingActions(
     if (mode == MatchColumnsMode::Position && num_input_columns != num_result_columns)
         throw Exception("Number of columns doesn't match", ErrorCodes::NUMBER_OF_COLUMNS_DOESNT_MATCH);
 
+    if (add_casted_columns && mode != MatchColumnsMode::Name)
+        throw Exception("Converting with add_casted_columns supported only for MatchColumnsMode::Name", ErrorCodes::LOGICAL_ERROR);
+
     auto actions_dag = std::make_shared<ActionsDAG>(source);
-    std::vector<Node *> projection(num_result_columns);
+    NodeRawConstPtrs projection(num_result_columns);
 
     FunctionOverloadResolverPtr func_builder_materialize =
             std::make_shared<FunctionOverloadResolverAdaptor>(
@@ -705,13 +733,14 @@ ActionsDAGPtr ActionsDAG::makeConvertingActions(
     for (size_t result_col_num = 0; result_col_num < num_result_columns; ++result_col_num)
     {
         const auto & res_elem = result[result_col_num];
-        Node * src_node = nullptr;
+        const Node * src_node = nullptr;
+        const Node * dst_node = nullptr;
 
         switch (mode)
         {
             case MatchColumnsMode::Position:
             {
-                src_node = actions_dag->inputs[result_col_num];
+                src_node = dst_node = actions_dag->inputs[result_col_num];
                 break;
             }
 
@@ -722,7 +751,7 @@ ActionsDAGPtr ActionsDAG::makeConvertingActions(
                     throw Exception("Cannot find column " + backQuote(res_elem.name) + " in source stream",
                                     ErrorCodes::THERE_IS_NO_COLUMN);
 
-                src_node = actions_dag->inputs[input.front()];
+                src_node = dst_node = actions_dag->inputs[input.front()];
                 input.pop_front();
                 break;
             }
@@ -731,10 +760,10 @@ ActionsDAGPtr ActionsDAG::makeConvertingActions(
         /// Check constants.
         if (const auto * res_const = typeid_cast<const ColumnConst *>(res_elem.column.get()))
         {
-            if (const auto * src_const = typeid_cast<const ColumnConst *>(src_node->column.get()))
+            if (const auto * src_const = typeid_cast<const ColumnConst *>(dst_node->column.get()))
             {
                 if (ignore_constant_values)
-                   src_node = const_cast<Node *>(&actions_dag->addColumn(res_elem, true));
+                    dst_node = &actions_dag->addColumn(res_elem);
                 else if (res_const->getField() != src_const->getField())
                     throw Exception("Cannot convert column " + backQuote(res_elem.name) + " because "
                                     "it is constant but values of constants are different in source and result",
@@ -747,38 +776,61 @@ ActionsDAGPtr ActionsDAG::makeConvertingActions(
         }
 
         /// Add CAST function to convert into result type if needed.
-        if (!res_elem.type->equals(*src_node->result_type))
+        if (!res_elem.type->equals(*dst_node->result_type))
         {
             ColumnWithTypeAndName column;
             column.name = res_elem.type->getName();
             column.column = DataTypeString().createColumnConst(0, column.name);
             column.type = std::make_shared<DataTypeString>();
 
-            auto * right_arg = const_cast<Node *>(&actions_dag->addColumn(std::move(column), true));
-            auto * left_arg = src_node;
+            const auto * right_arg = &actions_dag->addColumn(std::move(column));
+            const auto * left_arg = dst_node;
 
-            FunctionCast::Diagnostic diagnostic = {src_node->result_name, res_elem.name};
+            FunctionCast::Diagnostic diagnostic = {dst_node->result_name, res_elem.name};
             FunctionOverloadResolverPtr func_builder_cast =
                     std::make_shared<FunctionOverloadResolverAdaptor>(
                             CastOverloadResolver<CastType::nonAccurate>::createImpl(false, std::move(diagnostic)));
 
-            Inputs children = { left_arg, right_arg };
-            src_node = &actions_dag->addFunction(func_builder_cast, std::move(children), {}, true);
+            NodeRawConstPtrs children = { left_arg, right_arg };
+            dst_node = &actions_dag->addFunction(func_builder_cast, std::move(children), {});
         }
 
-        if (src_node->column && isColumnConst(*src_node->column) && !(res_elem.column && isColumnConst(*res_elem.column)))
+        if (dst_node->column && isColumnConst(*dst_node->column) && !(res_elem.column && isColumnConst(*res_elem.column)))
         {
-            Inputs children = {src_node};
-            src_node = &actions_dag->addFunction(func_builder_materialize, std::move(children), {}, true);
+            NodeRawConstPtrs children = {dst_node};
+            dst_node = &actions_dag->addFunction(func_builder_materialize, std::move(children), {});
         }
 
-        if (src_node->result_name != res_elem.name)
-            src_node = &actions_dag->addAlias(*src_node, res_elem.name, true);
+        if (dst_node->result_name != res_elem.name)
+        {
+            if (add_casted_columns)
+            {
+                if (inputs.contains(dst_node->result_name))
+                    throw Exception("Cannot convert column " + backQuote(res_elem.name) +
+                                    " to "+ backQuote(dst_node->result_name) +
+                                    " because other column have same name",
+                                    ErrorCodes::ILLEGAL_COLUMN);
+                if (new_names)
+                    new_names->emplace(res_elem.name, dst_node->result_name);
 
-        projection[result_col_num] = src_node;
+                /// Leave current column on same place, add converted to back
+                projection[result_col_num] = src_node;
+                projection.push_back(dst_node);
+            }
+            else
+            {
+                dst_node = &actions_dag->addAlias(*dst_node, res_elem.name);
+                projection[result_col_num] = dst_node;
+            }
+        }
+        else
+        {
+            projection[result_col_num] = dst_node;
+        }
     }
 
-    actions_dag->removeUnusedActions(projection);
+    actions_dag->index.swap(projection);
+    actions_dag->removeUnusedActions();
     actions_dag->projectInput();
 
     return actions_dag;
@@ -793,11 +845,12 @@ ActionsDAGPtr ActionsDAG::makeAddingColumnActions(ColumnWithTypeAndName column)
                             std::make_shared<FunctionMaterialize>()));
 
     auto column_name = column.name;
-    const auto & column_node = adding_column_action->addColumn(std::move(column));
-    Inputs inputs = {const_cast<Node *>(&column_node)};
-    auto & function_node = adding_column_action->addFunction(func_builder_materialize, std::move(inputs), {}, true);
-    adding_column_action->addAlias(function_node, std::move(column_name), true);
+    const auto * column_node = &adding_column_action->addColumn(std::move(column));
+    NodeRawConstPtrs inputs = {column_node};
+    const auto & function_node = adding_column_action->addFunction(func_builder_materialize, std::move(inputs), {});
+    const auto & alias_node = adding_column_action->addAlias(function_node, std::move(column_name));
 
+    adding_column_action->index.push_back(&alias_node);
     return adding_column_action;
 }
 
@@ -811,23 +864,23 @@ ActionsDAGPtr ActionsDAG::merge(ActionsDAG && first, ActionsDAG && second)
 
     /// This map contains nodes which should be removed from `first` index, cause they are used as inputs for `second`.
     /// The second element is the number of removes (cause one node may be repeated several times in result).
-    std::unordered_map<Node *, size_t> removed_first_result;
+    std::unordered_map<const Node *, size_t> removed_first_result;
     /// Map inputs of `second` to nodes of `first`.
-    std::unordered_map<Node *, Node *> inputs_map;
+    std::unordered_map<const Node *, const Node *> inputs_map;
 
     /// Update inputs list.
     {
         /// Index may have multiple columns with same name. They also may be used by `second`. Order is important.
-        std::unordered_map<std::string_view, std::list<Node *>> first_result;
-        for (auto & node : first.index)
+        std::unordered_map<std::string_view, std::list<const Node *>> first_result;
+        for (const auto & node : first.index)
             first_result[node->result_name].push_back(node);
 
-        for (auto & node : second.inputs)
+        for (const auto & node : second.inputs)
         {
             auto it = first_result.find(node->result_name);
             if (it == first_result.end() || it->second.empty())
             {
-                if (first.settings.project_input)
+                if (first.project_input)
                     throw Exception(ErrorCodes::LOGICAL_ERROR,
                                     "Cannot find column {} in ActionsDAG result", node->result_name);
 
@@ -867,50 +920,29 @@ ActionsDAGPtr ActionsDAG::merge(ActionsDAG && first, ActionsDAG && second)
     }
 
     /// Update index.
-    if (second.settings.project_input)
+    if (second.project_input)
     {
         first.index.swap(second.index);
-        first.settings.project_input = true;
+        first.project_input = true;
     }
     else
     {
-        /// Remove `second` inputs from index.
-        for (auto it = first.index.begin(); it != first.index.end();)
+        /// Add not removed result from first actions.
+        for (const auto * node : first.index)
         {
-            auto cur = it;
-            ++it;
-
-            auto jt = removed_first_result.find(*cur);
-            if (jt != removed_first_result.end() && jt->second > 0)
-            {
-                first.index.remove(cur);
-                --jt->second;
-            }
+            auto it = removed_first_result.find(node);
+            if (it != removed_first_result.end() && it->second > 0)
+                --it->second;
+            else
+                second.index.push_back(node);
         }
 
-        for (auto it = second.index.rbegin(); it != second.index.rend(); ++it)
-            first.index.prepend(*it);
+        first.index.swap(second.index);
     }
 
-
     first.nodes.splice(first.nodes.end(), std::move(second.nodes));
 
-    /// Here we rebuild index because some string_view from the first map now may point to string from second.
-    ActionsDAG::Index first_index;
-    for (auto * node : first.index)
-        first_index.insert(node);
-
-    first.index.swap(first_index);
-
-#if USE_EMBEDDED_COMPILER
-    if (first.compilation_cache == nullptr)
-        first.compilation_cache = second.compilation_cache;
-#endif
-
-    first.settings.max_temporary_columns = std::max(first.settings.max_temporary_columns, second.settings.max_temporary_columns);
-    first.settings.max_temporary_non_const_columns = std::max(first.settings.max_temporary_non_const_columns, second.settings.max_temporary_non_const_columns);
-    first.settings.min_count_to_compile_expression = std::max(first.settings.min_count_to_compile_expression, second.settings.min_count_to_compile_expression);
-    first.settings.projected_output = second.settings.projected_output;
+    first.projected_output = second.projected_output;
 
     /// Drop unused inputs and, probably, some actions.
     first.removeUnusedActions();
@@ -923,13 +955,13 @@ ActionsDAG::SplitResult ActionsDAG::split(std::unordered_set<const Node *> split
     /// Split DAG into two parts.
     /// (first_nodes, first_index) is a part which will have split_list in result.
     /// (second_nodes, second_index) is a part which will have same index as current actions.
-    std::list<Node> second_nodes;
-    std::list<Node> first_nodes;
-    Index second_index;
-    Index first_index;
+    Nodes second_nodes;
+    Nodes first_nodes;
+    NodeRawConstPtrs second_index;
+    NodeRawConstPtrs first_index;
 
     /// List of nodes from current actions which are not inputs, but will be in second part.
-    std::vector<const Node *> new_inputs;
+    NodeRawConstPtrs new_inputs;
 
     struct Frame
     {
@@ -999,7 +1031,7 @@ ActionsDAG::SplitResult ActionsDAG::split(std::unordered_set<const Node *> split
             /// At first, visit all children.
             while (cur.next_child_to_visit < cur.node->children.size())
             {
-                auto * child = cur.node->children[cur.next_child_to_visit];
+                const auto * child = cur.node->children[cur.next_child_to_visit];
                 auto & child_data = data[child];
 
                 if (!child_data.visited)
@@ -1087,13 +1119,13 @@ ActionsDAG::SplitResult ActionsDAG::split(std::unordered_set<const Node *> split
         }
     }
 
-    for (auto * node : index)
-        second_index.insert(data[node].to_second);
+    for (const auto * node : index)
+        second_index.push_back(data[node].to_second);
 
-    Inputs second_inputs;
-    Inputs first_inputs;
+    NodeRawConstPtrs second_inputs;
+    NodeRawConstPtrs first_inputs;
 
-    for (auto * input : inputs)
+    for (const auto * input : inputs)
     {
         const auto & cur = data[input];
         first_inputs.push_back(cur.to_first);
@@ -1103,15 +1135,15 @@ ActionsDAG::SplitResult ActionsDAG::split(std::unordered_set<const Node *> split
     {
         const auto & cur = data[input];
         second_inputs.push_back(cur.to_second);
-        first_index.insert(cur.to_first);
+        first_index.push_back(cur.to_first);
     }
 
-    auto first_actions = cloneEmpty();
+    auto first_actions = std::make_shared<ActionsDAG>();
     first_actions->nodes.swap(first_nodes);
     first_actions->index.swap(first_index);
     first_actions->inputs.swap(first_inputs);
 
-    auto second_actions = cloneEmpty();
+    auto second_actions = std::make_shared<ActionsDAG>();
     second_actions->nodes.swap(second_nodes);
     second_actions->index.swap(second_index);
     second_actions->inputs.swap(second_inputs);
@@ -1149,7 +1181,7 @@ ActionsDAG::SplitResult ActionsDAG::splitActionsBeforeArrayJoin(const NameSet &
             /// At first, visit all children. We depend on ARRAY JOIN if any child does.
             while (cur.next_child_to_visit < cur.node->children.size())
             {
-                auto * child = cur.node->children[cur.next_child_to_visit];
+                const auto * child = cur.node->children[cur.next_child_to_visit];
 
                 if (visited_nodes.count(child) == 0)
                 {
@@ -1183,24 +1215,381 @@ ActionsDAG::SplitResult ActionsDAG::splitActionsBeforeArrayJoin(const NameSet &
 
     auto res = split(split_nodes);
     /// Do not remove array joined columns if they are not used.
-    res.first->settings.project_input = false;
+    res.first->project_input = false;
     return res;
 }
 
 ActionsDAG::SplitResult ActionsDAG::splitActionsForFilter(const std::string & column_name) const
 {
-    auto it = index.begin();
-    for (; it != index.end(); ++it)
-        if ((*it)->result_name == column_name)
-            break;
-
-    if (it == index.end())
+    const auto * node = tryFindInIndex(column_name);
+    if (!node)
         throw Exception(ErrorCodes::LOGICAL_ERROR,
                         "Index for ActionsDAG does not contain filter column name {}. DAG:\n{}",
                         column_name, dumpDAG());
 
-    std::unordered_set<const Node *> split_nodes = {*it};
+    std::unordered_set<const Node *> split_nodes = {node};
     return split(split_nodes);
 }
 
+namespace
+{
+
+struct ConjunctionNodes
+{
+    ActionsDAG::NodeRawConstPtrs allowed;
+    ActionsDAG::NodeRawConstPtrs rejected;
+};
+
+/// Take a node which result is predicate.
+/// Assuming predicate is a conjunction (probably, trivial).
+/// Find separate conjunctions nodes. Split nodes into allowed and rejected sets.
+/// Allowed predicate is a predicate which can be calculated using only nodes from allowed_nodes set.
+ConjunctionNodes getConjunctionNodes(ActionsDAG::Node * predicate, std::unordered_set<const ActionsDAG::Node *> allowed_nodes)
+{
+    ConjunctionNodes conjunction;
+    std::unordered_set<const ActionsDAG::Node *> allowed;
+    std::unordered_set<const ActionsDAG::Node *> rejected;
+
+    struct Frame
+    {
+        const ActionsDAG::Node * node;
+        bool is_predicate = false;
+        size_t next_child_to_visit = 0;
+        size_t num_allowed_children = 0;
+    };
+
+    std::stack<Frame> stack;
+    std::unordered_set<const ActionsDAG::Node *> visited_nodes;
+
+    stack.push(Frame{.node = predicate, .is_predicate = true});
+    visited_nodes.insert(predicate);
+    while (!stack.empty())
+    {
+        auto & cur = stack.top();
+        bool is_conjunction = cur.is_predicate
+                                && cur.node->type == ActionsDAG::ActionType::FUNCTION
+                                && cur.node->function_base->getName() == "and";
+
+        /// At first, visit all children.
+        while (cur.next_child_to_visit < cur.node->children.size())
+        {
+            const auto * child = cur.node->children[cur.next_child_to_visit];
+
+            if (visited_nodes.count(child) == 0)
+            {
+                visited_nodes.insert(child);
+                stack.push({.node = child, .is_predicate = is_conjunction});
+                break;
+            }
+
+            if (allowed_nodes.contains(child))
+                ++cur.num_allowed_children;
+            ++cur.next_child_to_visit;
+        }
+
+        if (cur.next_child_to_visit == cur.node->children.size())
+        {
+            if (cur.num_allowed_children == cur.node->children.size())
+            {
+                if (cur.node->type != ActionsDAG::ActionType::ARRAY_JOIN && cur.node->type != ActionsDAG::ActionType::INPUT)
+                    allowed_nodes.emplace(cur.node);
+            }
+            else if (is_conjunction)
+            {
+                for (const auto * child : cur.node->children)
+                {
+                    if (allowed_nodes.count(child))
+                    {
+                        if (allowed.insert(child).second)
+                            conjunction.allowed.push_back(child);
+
+                    }
+                }
+            }
+            else if (cur.is_predicate)
+            {
+                if (rejected.insert(cur.node).second)
+                    conjunction.rejected.push_back(cur.node);
+            }
+
+            stack.pop();
+        }
+    }
+
+    if (conjunction.allowed.empty())
+    {
+        /// If nothing was added to conjunction, check if it is trivial.
+        if (allowed_nodes.count(predicate))
+            conjunction.allowed.push_back(predicate);
+    }
+
+    return conjunction;
+}
+
+ColumnsWithTypeAndName prepareFunctionArguments(const ActionsDAG::NodeRawConstPtrs & nodes)
+{
+    ColumnsWithTypeAndName arguments;
+    arguments.reserve(nodes.size());
+
+    for (const auto * child : nodes)
+    {
+        ColumnWithTypeAndName argument;
+        argument.column = child->column;
+        argument.type = child->result_type;
+        argument.name = child->result_name;
+
+        arguments.emplace_back(std::move(argument));
+    }
+
+    return arguments;
+}
+
+}
+
+/// Create actions which calculate conjunction of selected nodes.
+/// Assume conjunction nodes are predicates (and may be used as arguments of function AND).
+///
+/// Result actions add single column with conjunction result (it is always first in index).
+/// No other columns are added or removed.
+ActionsDAGPtr ActionsDAG::cloneActionsForConjunction(NodeRawConstPtrs conjunction, const ColumnsWithTypeAndName & all_inputs)
+{
+    if (conjunction.empty())
+        return nullptr;
+
+    auto actions = std::make_shared<ActionsDAG>();
+
+    FunctionOverloadResolverPtr func_builder_and =
+            std::make_shared<FunctionOverloadResolverAdaptor>(
+                    std::make_unique<DefaultOverloadResolver>(
+                            std::make_shared<FunctionAnd>()));
+
+    std::unordered_map<const ActionsDAG::Node *, const ActionsDAG::Node *> nodes_mapping;
+    std::unordered_map<std::string, std::list<const Node *>> required_inputs;
+
+    struct Frame
+    {
+        const ActionsDAG::Node * node;
+        size_t next_child_to_visit = 0;
+    };
+
+    std::stack<Frame> stack;
+
+    /// DFS. Clone actions.
+    for (const auto * predicate : conjunction)
+    {
+        if (nodes_mapping.count(predicate))
+            continue;
+
+        stack.push({.node = predicate});
+        while (!stack.empty())
+        {
+            auto & cur = stack.top();
+            /// At first, visit all children.
+            while (cur.next_child_to_visit < cur.node->children.size())
+            {
+                const auto * child = cur.node->children[cur.next_child_to_visit];
+
+                if (nodes_mapping.count(child) == 0)
+                {
+                    stack.push({.node = child});
+                    break;
+                }
+
+                ++cur.next_child_to_visit;
+            }
+
+            if (cur.next_child_to_visit == cur.node->children.size())
+            {
+                auto & node = actions->nodes.emplace_back(*cur.node);
+                nodes_mapping[cur.node] = &node;
+
+                for (auto & child : node.children)
+                    child = nodes_mapping[child];
+
+                if (node.type == ActionType::INPUT)
+                    required_inputs[node.result_name].push_back(&node);
+
+                stack.pop();
+            }
+        }
+    }
+
+    const Node * result_predicate = nodes_mapping[*conjunction.begin()];
+
+    if (conjunction.size() > 1)
+    {
+        NodeRawConstPtrs args;
+        args.reserve(conjunction.size());
+        for (const auto * predicate : conjunction)
+            args.emplace_back(nodes_mapping[predicate]);
+
+        result_predicate = &actions->addFunction(func_builder_and, std::move(args), {});
+    }
+
+    actions->index.push_back(result_predicate);
+
+    for (const auto & col : all_inputs)
+    {
+        const Node * input;
+        auto & list = required_inputs[col.name];
+        if (list.empty())
+            input = &actions->addInput(col);
+        else
+        {
+            input = list.front();
+            list.pop_front();
+            actions->inputs.push_back(input);
+        }
+
+        actions->index.push_back(input);
+    }
+
+    return actions;
+}
+
+ActionsDAGPtr ActionsDAG::cloneActionsForFilterPushDown(
+    const std::string & filter_name,
+    bool can_remove_filter,
+    const Names & available_inputs,
+    const ColumnsWithTypeAndName & all_inputs)
+{
+    Node * predicate = const_cast<Node *>(tryFindInIndex(filter_name));
+    if (!predicate)
+            throw Exception(ErrorCodes::LOGICAL_ERROR,
+                            "Index for ActionsDAG does not contain filter column name {}. DAG:\n{}",
+                            filter_name, dumpDAG());
+
+    /// If condition is constant let's do nothing.
+    /// It means there is nothing to push down or optimization was already applied.
+    if (predicate->type == ActionType::COLUMN)
+        return nullptr;
+
+    std::unordered_set<const Node *> allowed_nodes;
+
+    /// Get input nodes from available_inputs names.
+    {
+        std::unordered_map<std::string_view, std::list<const Node *>> inputs_map;
+        for (const auto & input : inputs)
+            inputs_map[input->result_name].emplace_back(input);
+
+        for (const auto & name : available_inputs)
+        {
+            auto & inputs_list = inputs_map[name];
+            if (inputs_list.empty())
+                continue;
+
+            allowed_nodes.emplace(inputs_list.front());
+            inputs_list.pop_front();
+        }
+    }
+
+    auto conjunction = getConjunctionNodes(predicate, allowed_nodes);
+    auto actions = cloneActionsForConjunction(conjunction.allowed, all_inputs);
+    if (!actions)
+        return nullptr;
+
+    /// Now, when actions are created, update current DAG.
+
+    if (conjunction.rejected.empty())
+    {
+        /// The whole predicate was split.
+        if (can_remove_filter)
+        {
+            /// If filter column is not needed, remove it from index.
+            for (auto i = index.begin(); i != index.end(); ++i)
+            {
+                if (*i == predicate)
+                {
+                    index.erase(i);
+                    break;
+                }
+            }
+        }
+        else
+        {
+            /// Replace predicate result to constant 1.
+            Node node;
+            node.type = ActionType::COLUMN;
+            node.result_name = std::move(predicate->result_name);
+            node.result_type = std::move(predicate->result_type);
+            node.column = node.result_type->createColumnConst(0, 1);
+
+            if (predicate->type != ActionType::INPUT)
+                *predicate = std::move(node);
+            else
+            {
+                /// Special case. We cannot replace input to constant inplace.
+                /// Because we cannot affect inputs list for actions.
+                /// So we just add a new constant and update index.
+                const auto * new_predicate = &addNode(node);
+                for (auto & index_node : index)
+                    if (index_node == predicate)
+                        index_node = new_predicate;
+            }
+        }
+
+        removeUnusedActions(false);
+    }
+    else
+    {
+        /// Predicate is conjunction, where both allowed and rejected sets are not empty.
+        /// Replace this node to conjunction of rejected predicates.
+
+        NodeRawConstPtrs new_children = std::move(conjunction.rejected);
+
+        if (new_children.size() == 1)
+        {
+            /// Rejected set has only one predicate.
+            if (new_children.front()->result_type->equals(*predicate->result_type))
+            {
+                /// If it's type is same, just add alias.
+                Node node;
+                node.type = ActionType::ALIAS;
+                node.result_name = predicate->result_name;
+                node.result_type = predicate->result_type;
+                node.children.swap(new_children);
+                *predicate = std::move(node);
+            }
+            else
+            {
+                /// If type is different, cast column.
+                /// This case is possible, cause AND can use any numeric type as argument.
+                Node node;
+                node.type = ActionType::COLUMN;
+                node.result_name = predicate->result_type->getName();
+                node.column = DataTypeString().createColumnConst(0, node.result_name);
+                node.result_type = std::make_shared<DataTypeString>();
+
+                const auto * right_arg = &nodes.emplace_back(std::move(node));
+                const auto * left_arg = new_children.front();
+
+                predicate->children = {left_arg, right_arg};
+                auto arguments = prepareFunctionArguments(predicate->children);
+
+                FunctionOverloadResolverPtr func_builder_cast =
+                        std::make_shared<FunctionOverloadResolverAdaptor>(
+                                CastOverloadResolver<CastType::nonAccurate>::createImpl(false));
+
+                predicate->function_builder = func_builder_cast;
+                predicate->function_base = predicate->function_builder->build(arguments);
+                predicate->function = predicate->function_base->prepare(arguments);
+            }
+        }
+        else
+        {
+            /// Predicate is function AND, which still have more then one argument.
+            /// Just update children and rebuild it.
+            predicate->children.swap(new_children);
+            auto arguments = prepareFunctionArguments(predicate->children);
+
+            predicate->function_base = predicate->function_builder->build(arguments);
+            predicate->function = predicate->function_base->prepare(arguments);
+        }
+
+        removeUnusedActions(false);
+    }
+
+    return actions;
+}
+
 }
diff --git a/src/Interpreters/ActionsDAG.h b/src/Interpreters/ActionsDAG.h
index 3c8778e239a..bdfb4644f5b 100644
--- a/src/Interpreters/ActionsDAG.h
+++ b/src/Interpreters/ActionsDAG.h
@@ -3,6 +3,7 @@
 #include <Core/ColumnsWithTypeAndName.h>
 #include <Core/NamesAndTypes.h>
 #include <Core/Names.h>
+#include <Interpreters/Context_fwd.h>
 
 #if !defined(ARCADIA_BUILD)
 #    include "config_core.h"
@@ -26,7 +27,6 @@ using FunctionOverloadResolverPtr = std::shared_ptr<IFunctionOverloadResolver>;
 class IDataType;
 using DataTypePtr = std::shared_ptr<const IDataType>;
 
-class Context;
 class CompiledExpressionCache;
 
 /// Directed acyclic graph of expressions.
@@ -55,9 +55,13 @@ public:
         FUNCTION,
     };
 
+    struct Node;
+    using NodeRawPtrs = std::vector<Node *>;
+    using NodeRawConstPtrs = std::vector<const Node *>;
+
     struct Node
     {
-        std::vector<Node *> children;
+        NodeRawConstPtrs children;
 
         ActionType type;
 
@@ -79,102 +83,18 @@ public:
         bool allow_constant_folding = true;
     };
 
-    /// Index is used to:
-    ///     * find Node by it's result_name
-    ///     * specify order of columns in result
-    /// It represents a set of available columns.
-    /// Removing of column from index is equivalent to removing of column from final result.
-    ///
-    /// DAG allows actions with duplicating result names. In this case index will point to last added Node.
-    /// It does not cause any problems as long as execution of actions does not depend on action names anymore.
-    ///
-    /// Index is a list of nodes + [map: name -> list::iterator].
-    /// List is ordered, may contain nodes with same names, or one node several times.
-    class Index
-    {
-    private:
-        std::list<Node *> list;
-        /// Map key is a string_view to Node::result_name for node from value.
-        /// Map always point to existing node, so key always valid (nodes live longer then index).
-        std::unordered_map<std::string_view, std::list<Node *>::iterator> map;
-
-    public:
-        auto size() const { return list.size(); }
-        bool contains(std::string_view key) const { return map.count(key) != 0; }
-
-        std::list<Node *>::iterator begin() { return list.begin(); }
-        std::list<Node *>::iterator end() { return list.end(); }
-        std::list<Node *>::const_iterator begin() const { return list.begin(); }
-        std::list<Node *>::const_iterator end() const { return list.end(); }
-        std::list<Node *>::const_reverse_iterator rbegin() const { return list.rbegin(); }
-        std::list<Node *>::const_reverse_iterator rend() const { return list.rend(); }
-        std::list<Node *>::const_iterator find(std::string_view key) const
-        {
-            auto it = map.find(key);
-            if (it == map.end())
-                return list.end();
-
-            return it->second;
-        }
-
-        /// Insert method doesn't check if map already have node with the same name.
-        /// If node with the same name exists, it is removed from map, but not list.
-        /// It is expected and used for project(), when result may have several columns with the same name.
-        void insert(Node * node) { map[node->result_name] = list.emplace(list.end(), node); }
-        void prepend(Node * node) { map[node->result_name] = list.emplace(list.begin(), node); }
-
-        /// If node with same name exists in index, replace it. Otherwise insert new node to index.
-        void replace(Node * node)
-        {
-            if (auto handle = map.extract(node->result_name))
-            {
-                handle.key() = node->result_name; /// Change string_view
-                *handle.mapped() = node;
-                map.insert(std::move(handle));
-            }
-            else
-                insert(node);
-        }
-
-        void remove(std::list<Node *>::iterator it)
-        {
-            auto map_it = map.find((*it)->result_name);
-            if (map_it != map.end() && map_it->second == it)
-                map.erase(map_it);
-
-            list.erase(it);
-        }
-
-        void swap(Index & other)
-        {
-            list.swap(other.list);
-            map.swap(other.map);
-        }
-    };
-
+    /// NOTE: std::list is an implementation detail.
+    /// It allows to add and remove new nodes inplace without reallocation.
+    /// Raw pointers to nodes remain valid.
     using Nodes = std::list<Node>;
-    using Inputs = std::vector<Node *>;
-
-    struct ActionsSettings
-    {
-        size_t max_temporary_columns = 0;
-        size_t max_temporary_non_const_columns = 0;
-        size_t min_count_to_compile_expression = 0;
-        bool compile_expressions = false;
-        bool project_input = false;
-        bool projected_output = false;
-    };
 
 private:
     Nodes nodes;
-    Index index;
-    Inputs inputs;
+    NodeRawConstPtrs index;
+    NodeRawConstPtrs inputs;
 
-    ActionsSettings settings;
-
-#if USE_EMBEDDED_COMPILER
-    std::shared_ptr<CompiledExpressionCache> compilation_cache;
-#endif
+    bool project_input = false;
+    bool projected_output = false;
 
 public:
     ActionsDAG() = default;
@@ -185,8 +105,8 @@ public:
     explicit ActionsDAG(const ColumnsWithTypeAndName & inputs_);
 
     const Nodes & getNodes() const { return nodes; }
-    const Index & getIndex() const { return index; }
-    const Inputs & getInputs() const { return inputs; }
+    const NodeRawConstPtrs & getIndex() const { return index; }
+    const NodeRawConstPtrs & getInputs() const { return inputs; }
 
     NamesAndTypesList getRequiredColumns() const;
     ColumnsWithTypeAndName getResultColumns() const;
@@ -196,17 +116,26 @@ public:
     std::string dumpNames() const;
     std::string dumpDAG() const;
 
-    const Node & addInput(std::string name, DataTypePtr type, bool can_replace = false);
-    const Node & addInput(ColumnWithTypeAndName column, bool can_replace = false);
-    const Node & addColumn(ColumnWithTypeAndName column, bool can_replace = false, bool materialize = false);
-    const Node & addAlias(const std::string & name, std::string alias, bool can_replace = false);
-    const Node & addArrayJoin(const std::string & source_name, std::string result_name);
+    const Node & addInput(std::string name, DataTypePtr type);
+    const Node & addInput(ColumnWithTypeAndName column);
+    const Node & addColumn(ColumnWithTypeAndName column);
+    const Node & addAlias(const Node & child, std::string alias);
+    const Node & addArrayJoin(const Node & child, std::string result_name);
     const Node & addFunction(
             const FunctionOverloadResolverPtr & function,
-            const Names & argument_names,
-            std::string result_name,
-            const Context & context,
-            bool can_replace = false);
+            NodeRawConstPtrs children,
+            std::string result_name);
+
+    /// Index can contain any column returned from DAG.
+    /// You may manually change it if needed.
+    NodeRawConstPtrs & getIndex() { return index; }
+    /// Find first column by name in index. This search is linear.
+    const Node & findInIndex(const std::string & name) const;
+    /// Same, but return nullptr if node not found.
+    const Node * tryFindInIndex(const std::string & name) const;
+    /// Find first node with the same name in index and replace it.
+    /// If was not found, add node to index end.
+    void addOrReplaceInIndex(const Node & node);
 
     /// Call addAlias several times.
     void addAliases(const NamesWithAliases & aliases);
@@ -220,16 +149,20 @@ public:
     /// Return true if column was removed from inputs.
     bool removeUnusedResult(const std::string & column_name);
 
-    void projectInput() { settings.project_input = true; }
+    void projectInput(bool project = true) { project_input = project; }
+    bool isInputProjected() const { return project_input; }
+    bool isOutputProjected() const { return projected_output; }
+
     void removeUnusedActions(const Names & required_names);
+    void removeUnusedActions(const NameSet & required_names);
 
     bool hasArrayJoin() const;
     bool hasStatefulFunctions() const;
     bool trivial() const; /// If actions has no functions or array join.
 
-    const ActionsSettings & getSettings() const { return settings; }
-
-    void compileExpressions();
+#if USE_EMBEDDED_COMPILER
+    void compileExpressions(size_t min_count_to_compile_expression);
+#endif
 
     ActionsDAGPtr clone() const;
 
@@ -237,6 +170,9 @@ public:
     /// Also add aliases so the result names remain unchanged.
     void addMaterializingOutputActions();
 
+    /// Apply materialize() function to node. Result node has the same name.
+    const Node & materializeNode(const Node & node);
+
     enum class MatchColumnsMode
     {
         /// Require same number of columns in source and result. Match columns by corresponding positions, regardless to names.
@@ -248,11 +184,15 @@ public:
     /// Create ActionsDAG which converts block structure from source to result.
     /// It is needed to convert result from different sources to the same structure, e.g. for UNION query.
     /// Conversion should be possible with only usage of CAST function and renames.
+    /// @param ignore_constant_values - Do not check that constants are same. Use value from result_header.
+    /// @param add_casted_columns - Create new columns with converted values instead of replacing original.
     static ActionsDAGPtr makeConvertingActions(
         const ColumnsWithTypeAndName & source,
         const ColumnsWithTypeAndName & result,
         MatchColumnsMode mode,
-        bool ignore_constant_values = false); /// Do not check that constants are same. Use value from result_header.
+        bool ignore_constant_values = false,
+        bool add_casted_columns = false,
+        NameToNameMap * new_names = nullptr);
 
     /// Create expression which add const column and then materialize it.
     static ActionsDAGPtr makeAddingColumnActions(ColumnWithTypeAndName column);
@@ -278,35 +218,39 @@ public:
     /// Index of initial actions must contain column_name.
     SplitResult splitActionsForFilter(const std::string & column_name) const;
 
+    /// Create actions which may calculate part of filter using only available_inputs.
+    /// If nothing may be calculated, returns nullptr.
+    /// Otherwise, return actions which inputs are from available_inputs.
+    /// Returned actions add single column which may be used for filter. Added column will be the first one.
+    /// Also, replace some nodes of current inputs to constant 1 in case they are filtered.
+    ///
+    /// @param all_inputs should contain inputs from previous step, which will be used for result actions.
+    /// It is expected that all_inputs contain columns from available_inputs.
+    /// This parameter is needed to enforce result actions save columns order in block.
+    /// Otherwise for some queries, e.g. with GROUP BY, columns will be mixed.
+    /// Example: SELECT sum(x), y, z FROM tab WHERE z > 0 and sum(x) > 0
+    /// Pushed condition: z > 0
+    /// GROUP BY step will transform columns `x, y, z` -> `sum(x), y, z`
+    /// If we just add filter step with actions `z -> z > 0` before GROUP BY,
+    /// columns will be transformed like `x, y, z` -> `z > 0, z, x, y` -(remove filter)-> `z, x, y`.
+    /// To avoid it, add inputs from `all_inputs` list,
+    /// so actions `x, y, z -> z > 0, x, y, z` -(remove filter)-> `x, y, z` will not change columns order.
+    ActionsDAGPtr cloneActionsForFilterPushDown(
+        const std::string & filter_name,
+        bool can_remove_filter,
+        const Names & available_inputs,
+        const ColumnsWithTypeAndName & all_inputs);
+
 private:
-    Node & addNode(Node node, bool can_replace = false, bool add_to_index = true);
-    Node & getNode(const std::string & name);
+    Node & addNode(Node node);
 
-    Node & addAlias(Node & child, std::string alias, bool can_replace);
-    Node & addFunction(
-            const FunctionOverloadResolverPtr & function,
-            Inputs children,
-            std::string result_name,
-            bool can_replace,
-            bool add_to_index = true);
-
-    ActionsDAGPtr cloneEmpty() const
-    {
-        auto actions = std::make_shared<ActionsDAG>();
-        actions->settings = settings;
+    void removeUnusedActions(bool allow_remove_inputs = true);
 
 #if USE_EMBEDDED_COMPILER
-        actions->compilation_cache = compilation_cache;
+    void compileFunctions(size_t min_count_to_compile_expression);
 #endif
-        return actions;
-    }
 
-    void removeUnusedActions(const std::vector<Node *> & required_nodes);
-    void removeUnusedActions();
-    void addAliases(const NamesWithAliases & aliases, std::vector<Node *> & result_nodes);
-
-    void compileFunctions();
+    static ActionsDAGPtr cloneActionsForConjunction(NodeRawConstPtrs conjunction, const ColumnsWithTypeAndName & all_inputs);
 };
 
-
 }
diff --git a/src/Interpreters/ActionsVisitor.cpp b/src/Interpreters/ActionsVisitor.cpp
index ca78c370834..b7d679a81f1 100644
--- a/src/Interpreters/ActionsVisitor.cpp
+++ b/src/Interpreters/ActionsVisitor.cpp
@@ -52,6 +52,7 @@ namespace ErrorCodes
     extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
     extern const int INCORRECT_ELEMENT_OF_SET;
     extern const int BAD_ARGUMENTS;
+    extern const int DUPLICATE_COLUMN;
 }
 
 static NamesAndTypesList::iterator findColumn(const String & name, NamesAndTypesList & cols)
@@ -126,7 +127,7 @@ static Block createBlockFromCollection(const Collection & collection, const Data
     return res;
 }
 
-static Field extractValueFromNode(const ASTPtr & node, const IDataType & type, const Context & context)
+static Field extractValueFromNode(const ASTPtr & node, const IDataType & type, ContextPtr context)
 {
     if (const auto * lit = node->as<ASTLiteral>())
     {
@@ -141,7 +142,7 @@ static Field extractValueFromNode(const ASTPtr & node, const IDataType & type, c
         throw Exception("Incorrect element of set. Must be literal or constant expression.", ErrorCodes::INCORRECT_ELEMENT_OF_SET);
 }
 
-static Block createBlockFromAST(const ASTPtr & node, const DataTypes & types, const Context & context)
+static Block createBlockFromAST(const ASTPtr & node, const DataTypes & types, ContextPtr context)
 {
     /// Will form a block with values from the set.
 
@@ -155,7 +156,7 @@ static Block createBlockFromAST(const ASTPtr & node, const DataTypes & types, co
     DataTypePtr tuple_type;
     Row tuple_values;
     const auto & list = node->as<ASTExpressionList &>();
-    bool transform_null_in = context.getSettingsRef().transform_null_in;
+    bool transform_null_in = context->getSettingsRef().transform_null_in;
     for (const auto & elem : list.children)
     {
         if (num_columns == 1)
@@ -244,7 +245,7 @@ Block createBlockForSet(
     const DataTypePtr & left_arg_type,
     const ASTPtr & right_arg,
     const DataTypes & set_element_types,
-    const Context & context)
+    ContextPtr context)
 {
     auto [right_arg_value, right_arg_type] = evaluateConstantExpression(right_arg, context);
 
@@ -258,7 +259,7 @@ Block createBlockForSet(
     };
 
     Block block;
-    bool tranform_null_in = context.getSettingsRef().transform_null_in;
+    bool tranform_null_in = context->getSettingsRef().transform_null_in;
 
     /// 1 in 1; (1, 2) in (1, 2); identity(tuple(tuple(tuple(1)))) in tuple(tuple(tuple(1))); etc.
     if (left_type_depth == right_type_depth)
@@ -287,9 +288,9 @@ Block createBlockForSet(
     const DataTypePtr & left_arg_type,
     const std::shared_ptr<ASTFunction> & right_arg,
     const DataTypes & set_element_types,
-    const Context & context)
+    ContextPtr context)
 {
-    auto get_tuple_type_from_ast = [&context](const auto & func) -> DataTypePtr
+    auto get_tuple_type_from_ast = [context](const auto & func) -> DataTypePtr
     {
         if (func && (func->name == "tuple" || func->name == "array") && !func->arguments->children.empty())
         {
@@ -336,7 +337,7 @@ Block createBlockForSet(
 
 SetPtr makeExplicitSet(
     const ASTFunction * node, const ActionsDAG & actions, bool create_ordered_set,
-    const Context & context, const SizeLimits & size_limits, PreparedSets & prepared_sets)
+    ContextPtr context, const SizeLimits & size_limits, PreparedSets & prepared_sets)
 {
     const IAST & args = *node->arguments;
 
@@ -346,11 +347,9 @@ SetPtr makeExplicitSet(
     const ASTPtr & left_arg = args.children.at(0);
     const ASTPtr & right_arg = args.children.at(1);
 
-    const auto & index = actions.getIndex();
-    auto it = index.find(left_arg->getColumnName());
-    if (it == index.end())
-        throw Exception("Unknown identifier: '" + left_arg->getColumnName() + "'", ErrorCodes::UNKNOWN_IDENTIFIER);
-    const DataTypePtr & left_arg_type = (*it)->result_type;
+    auto column_name = left_arg->getColumnName();
+    const auto & dag_node = actions.findInIndex(column_name);
+    const DataTypePtr & left_arg_type = dag_node.result_type;
 
     DataTypes set_element_types = {left_arg_type};
     const auto * left_tuple_type = typeid_cast<const DataTypeTuple *>(left_arg_type.get());
@@ -372,7 +371,8 @@ SetPtr makeExplicitSet(
     else
         block = createBlockForSet(left_arg_type, right_arg, set_element_types, context);
 
-    SetPtr set = std::make_shared<Set>(size_limits, create_ordered_set, context.getSettingsRef().transform_null_in);
+    SetPtr set
+        = std::make_shared<Set>(size_limits, create_ordered_set, context->getSettingsRef().transform_null_in);
     set->setHeader(block.cloneEmpty());
     set->insertFromBlock(block);
     set->finishInsert();
@@ -381,12 +381,60 @@ SetPtr makeExplicitSet(
     return set;
 }
 
+ScopeStack::Level::~Level() = default;
+ScopeStack::Level::Level() = default;
+ScopeStack::Level::Level(Level &&) = default;
+
+class ScopeStack::Index
+{
+    /// Map column name -> Node.
+    /// Use string_view as key which always points to Node::result_name.
+    std::unordered_map<std::string_view, const ActionsDAG::Node *> map;
+    ActionsDAG::NodeRawConstPtrs & index;
+
+public:
+    explicit Index(ActionsDAG::NodeRawConstPtrs & index_) : index(index_)
+    {
+        for (const auto * node : index)
+            map.emplace(node->result_name, node);
+    }
+
+    void addNode(const ActionsDAG::Node * node)
+    {
+        bool inserted = map.emplace(node->result_name, node).second;
+        if (!inserted)
+            throw Exception("Column '" + node->result_name + "' already exists", ErrorCodes::DUPLICATE_COLUMN);
+
+        index.push_back(node);
+    }
+
+    const ActionsDAG::Node * tryGetNode(const std::string & name) const
+    {
+        auto it = map.find(name);
+        if (it == map.end())
+            return nullptr;
+
+        return it->second;
+    }
+
+    const ActionsDAG::Node & getNode(const std::string & name) const
+    {
+        const auto * node = tryGetNode(name);
+        if (!node)
+            throw Exception("Unknown identifier: '" + name + "'", ErrorCodes::UNKNOWN_IDENTIFIER);
+
+        return *node;
+    }
+
+    bool contains(const std::string & name) const { return map.count(name) > 0; }
+};
+
 ActionsMatcher::Data::Data(
-    const Context & context_, SizeLimits set_size_limit_, size_t subquery_depth_,
+    ContextPtr context_, SizeLimits set_size_limit_, size_t subquery_depth_,
     const NamesAndTypesList & source_columns_, ActionsDAGPtr actions_dag,
     PreparedSets & prepared_sets_, SubqueriesForSets & subqueries_for_sets_,
     bool no_subqueries_, bool no_makeset_, bool only_consts_, bool create_source_for_in_)
-    : context(context_)
+    : WithContext(context_)
     , set_size_limit(set_size_limit_)
     , subquery_depth(subquery_depth_)
     , source_columns(source_columns_)
@@ -397,21 +445,21 @@ ActionsMatcher::Data::Data(
     , only_consts(only_consts_)
     , create_source_for_in(create_source_for_in_)
     , visit_depth(0)
-    , actions_stack(std::move(actions_dag), context)
+    , actions_stack(std::move(actions_dag), context_)
     , next_unique_suffix(actions_stack.getLastActions().getIndex().size() + 1)
 {
 }
 
 bool ActionsMatcher::Data::hasColumn(const String & column_name) const
 {
-    return actions_stack.getLastActions().getIndex().contains(column_name);
+    return actions_stack.getLastActionsIndex().contains(column_name);
 }
 
-ScopeStack::ScopeStack(ActionsDAGPtr actions_dag, const Context & context_)
-    : context(context_)
+ScopeStack::ScopeStack(ActionsDAGPtr actions_dag, ContextPtr context_) : WithContext(context_)
 {
     auto & level = stack.emplace_back();
     level.actions_dag = std::move(actions_dag);
+    level.index = std::make_unique<ScopeStack::Index>(level.actions_dag->getIndex());
 
     for (const auto & node : level.actions_dag->getIndex())
         if (node->type == ActionsDAG::ActionType::INPUT)
@@ -422,20 +470,23 @@ void ScopeStack::pushLevel(const NamesAndTypesList & input_columns)
 {
     auto & level = stack.emplace_back();
     level.actions_dag = std::make_shared<ActionsDAG>();
+    level.index = std::make_unique<ScopeStack::Index>(level.actions_dag->getIndex());
     const auto & prev = stack[stack.size() - 2];
 
     for (const auto & input_column : input_columns)
     {
-        level.actions_dag->addInput(input_column.name, input_column.type);
+        const auto & node = level.actions_dag->addInput(input_column.name, input_column.type);
+        level.index->addNode(&node);
         level.inputs.emplace(input_column.name);
     }
 
-    const auto & index = level.actions_dag->getIndex();
-
     for (const auto & node : prev.actions_dag->getIndex())
     {
-        if (!index.contains(node->result_name))
-            level.actions_dag->addInput({node->column, node->result_type, node->result_name});
+        if (!level.index->contains(node->result_name))
+        {
+            const auto & input = level.actions_dag->addInput({node->column, node->result_type, node->result_name});
+            level.index->addNode(&input);
+        }
     }
 }
 
@@ -448,10 +499,8 @@ size_t ScopeStack::getColumnLevel(const std::string & name)
         if (stack[i].inputs.count(name))
             return i;
 
-        const auto & index = stack[i].actions_dag->getIndex();
-        auto it = index.find(name);
-
-        if (it != index.end() && (*it)->type != ActionsDAG::ActionType::INPUT)
+        const auto * node = stack[i].index->tryGetNode(name);
+        if (node && node->type != ActionsDAG::ActionType::INPUT)
             return i;
     }
 
@@ -461,32 +510,46 @@ size_t ScopeStack::getColumnLevel(const std::string & name)
 void ScopeStack::addColumn(ColumnWithTypeAndName column)
 {
     const auto & node = stack[0].actions_dag->addColumn(std::move(column));
+    stack[0].index->addNode(&node);
 
     for (size_t j = 1; j < stack.size(); ++j)
-        stack[j].actions_dag->addInput({node.column, node.result_type, node.result_name});
+    {
+        const auto & input = stack[j].actions_dag->addInput({node.column, node.result_type, node.result_name});
+        stack[j].index->addNode(&input);
+    }
 }
 
 void ScopeStack::addAlias(const std::string & name, std::string alias)
 {
     auto level = getColumnLevel(name);
-    const auto & node = stack[level].actions_dag->addAlias(name, std::move(alias));
+    const auto & source = stack[level].index->getNode(name);
+    const auto & node = stack[level].actions_dag->addAlias(source, std::move(alias));
+    stack[level].index->addNode(&node);
 
     for (size_t j = level + 1; j < stack.size(); ++j)
-        stack[j].actions_dag->addInput({node.column, node.result_type, node.result_name});
+    {
+        const auto & input = stack[j].actions_dag->addInput({node.column, node.result_type, node.result_name});
+        stack[j].index->addNode(&input);
+    }
 }
 
 void ScopeStack::addArrayJoin(const std::string & source_name, std::string result_name)
 {
     getColumnLevel(source_name);
 
-    if (!stack.front().actions_dag->getIndex().contains(source_name))
+    const auto * source_node = stack.front().index->tryGetNode(source_name);
+    if (!source_node)
         throw Exception("Expression with arrayJoin cannot depend on lambda argument: " + source_name,
                         ErrorCodes::BAD_ARGUMENTS);
 
-    const auto & node = stack.front().actions_dag->addArrayJoin(source_name, std::move(result_name));
+    const auto & node = stack.front().actions_dag->addArrayJoin(*source_node, std::move(result_name));
+    stack.front().index->addNode(&node);
 
     for (size_t j = 1; j < stack.size(); ++j)
-        stack[j].actions_dag->addInput({node.column, node.result_type, node.result_name});
+    {
+        const auto & input = stack[j].actions_dag->addInput({node.column, node.result_type, node.result_name});
+        stack[j].index->addNode(&input);
+    }
 }
 
 void ScopeStack::addFunction(
@@ -498,17 +561,26 @@ void ScopeStack::addFunction(
     for (const auto & argument : argument_names)
         level = std::max(level, getColumnLevel(argument));
 
-    const auto & node = stack[level].actions_dag->addFunction(function, argument_names, std::move(result_name), context);
+    ActionsDAG::NodeRawConstPtrs children;
+    children.reserve(argument_names.size());
+    for (const auto & argument : argument_names)
+        children.push_back(&stack[level].index->getNode(argument));
+
+    const auto & node = stack[level].actions_dag->addFunction(function, std::move(children), std::move(result_name));
+    stack[level].index->addNode(&node);
 
     for (size_t j = level + 1; j < stack.size(); ++j)
-        stack[j].actions_dag->addInput({node.column, node.result_type, node.result_name});
+    {
+        const auto & input = stack[j].actions_dag->addInput({node.column, node.result_type, node.result_name});
+        stack[j].index->addNode(&input);
+    }
 }
 
 ActionsDAGPtr ScopeStack::popLevel()
 {
-    auto res = std::move(stack.back());
+    auto res = std::move(stack.back().actions_dag);
     stack.pop_back();
-    return res.actions_dag;
+    return res;
 }
 
 std::string ScopeStack::dumpNames() const
@@ -521,6 +593,11 @@ const ActionsDAG & ScopeStack::getLastActions() const
     return *stack.back().actions_dag;
 }
 
+const ScopeStack::Index & ScopeStack::getLastActionsIndex() const
+{
+    return *stack.back().index;
+}
+
 bool ActionsMatcher::needChildVisit(const ASTPtr & node, const ASTPtr & child)
 {
     /// Visit children themself
@@ -568,13 +645,12 @@ std::optional<NameAndTypePair> ActionsMatcher::getNameAndTypeFromAST(const ASTPt
         child_column_name = as_literal->unique_column_name;
     }
 
-    const auto & index = data.actions_stack.getLastActions().getIndex();
-    auto it = index.find(child_column_name);
-    if (it != index.end())
-        return NameAndTypePair(child_column_name, (*it)->result_type);
+    const auto & index = data.actions_stack.getLastActionsIndex();
+    if (const auto * node = index.tryGetNode(child_column_name))
+        return NameAndTypePair(child_column_name, node->result_type);
 
     if (!data.only_consts)
-        throw Exception("Unknown identifier: " + child_column_name + " there are columns: " + data.actions_stack.dumpNames(),
+        throw Exception("Unknown identifier: " + child_column_name + "; there are columns: " + data.actions_stack.dumpNames(),
                         ErrorCodes::UNKNOWN_IDENTIFIER);
 
     return {};
@@ -622,7 +698,7 @@ ASTs ActionsMatcher::doUntuple(const ASTFunction * function, ActionsMatcher::Dat
         else
             func->setAlias(data.getUniqueName("_ut_" + name));
 
-        auto function_builder = FunctionFactory::instance().get(func->name, data.context);
+        auto function_builder = FunctionFactory::instance().get(func->name, data.getContext());
         data.addFunction(function_builder, {tuple_name_type->name, literal->getColumnName()}, func->getColumnName());
 
         columns.push_back(std::move(func));
@@ -674,7 +750,7 @@ void ActionsMatcher::visit(const ASTIdentifier & identifier, const ASTPtr & ast,
             if (column_name_type.name == column_name)
             {
                 throw Exception("Column " + backQuote(column_name) + " is not under aggregate function and not in GROUP BY",
-                ErrorCodes::NOT_AN_AGGREGATE);
+                                ErrorCodes::NOT_AN_AGGREGATE);
             }
         }
 
@@ -727,7 +803,7 @@ void ActionsMatcher::visit(const ASTFunction & node, const ASTPtr & ast, Data &
                 auto argument_name = node.arguments->children.at(0)->getColumnName();
 
                 data.addFunction(
-                        FunctionFactory::instance().get(node.name + "IgnoreSet", data.context),
+                        FunctionFactory::instance().get(node.name + "IgnoreSet", data.getContext()),
                         { argument_name, argument_name },
                         column_name);
             }
@@ -735,6 +811,14 @@ void ActionsMatcher::visit(const ASTFunction & node, const ASTPtr & ast, Data &
         }
     }
 
+    /// A special function `indexHint`. Everything that is inside it is not calculated
+    if (node.name == "indexHint")
+    {
+        // Arguments are removed. We add function instead of constant column to avoid constant folding.
+        data.addFunction(FunctionFactory::instance().get("indexHint", data.getContext()), {}, column_name);
+        return;
+    }
+
     if (node.is_window_function)
     {
         // Also add columns from PARTITION BY and ORDER BY of window functions.
@@ -770,7 +854,7 @@ void ActionsMatcher::visit(const ASTFunction & node, const ASTPtr & ast, Data &
     FunctionOverloadResolverPtr function_builder;
     try
     {
-        function_builder = FunctionFactory::instance().get(node.name, data.context);
+        function_builder = FunctionFactory::instance().get(node.name, data.getContext());
     }
     catch (Exception & e)
     {
@@ -865,7 +949,7 @@ void ActionsMatcher::visit(const ASTFunction & node, const ASTPtr & ast, Data &
             else if (identifier && (functionIsJoinGet(node.name) || functionIsDictGet(node.name)) && arg == 0)
             {
                 auto table_id = IdentifierSemantic::extractDatabaseAndTable(*identifier);
-                table_id = data.context.resolveStorageID(table_id, Context::ResolveOrdinary);
+                table_id = data.getContext()->resolveStorageID(table_id, Context::ResolveOrdinary);
                 auto column_string = ColumnString::create();
                 column_string->insert(table_id.getDatabaseName() + "." + table_id.getTableName());
                 ColumnWithTypeAndName column(
@@ -927,7 +1011,9 @@ void ActionsMatcher::visit(const ASTFunction & node, const ASTPtr & ast, Data &
                     String result_name = lambda->arguments->children.at(1)->getColumnName();
                     lambda_dag->removeUnusedActions(Names(1, result_name));
 
-                    auto lambda_actions = std::make_shared<ExpressionActions>(lambda_dag);
+                    auto lambda_actions = std::make_shared<ExpressionActions>(
+                        lambda_dag,
+                        ExpressionActionsSettings::fromContext(data.getContext()));
 
                     DataTypePtr result_type = lambda_actions->getSampleBlock().getByName(result_name).type;
 
@@ -983,12 +1069,8 @@ void ActionsMatcher::visit(const ASTLiteral & literal, const ASTPtr & /* ast */,
     if (literal.unique_column_name.empty())
     {
         const auto default_name = literal.getColumnName();
-        const auto & index = data.actions_stack.getLastActions().getIndex();
-        const ActionsDAG::Node * existing_column = nullptr;
-
-        auto it = index.find(default_name);
-        if (it != index.end())
-            existing_column = *it;
+        const auto & index = data.actions_stack.getLastActionsIndex();
+        const auto * existing_column = index.tryGetNode(default_name);
 
         /*
          * To approximate CSE, bind all identical literals to a single temporary
@@ -1051,8 +1133,8 @@ SetPtr ActionsMatcher::makeSet(const ASTFunction & node, Data & data, bool no_su
         ///  and the table has the type Set (a previously prepared set).
         if (identifier)
         {
-            auto table_id = data.context.resolveStorageID(right_in_operand);
-            StoragePtr table = DatabaseCatalog::instance().tryGetTable(table_id, data.context);
+            auto table_id = data.getContext()->resolveStorageID(right_in_operand);
+            StoragePtr table = DatabaseCatalog::instance().tryGetTable(table_id, data.getContext());
 
             if (table)
             {
@@ -1077,7 +1159,7 @@ SetPtr ActionsMatcher::makeSet(const ASTFunction & node, Data & data, bool no_su
             return subquery_for_set.set;
         }
 
-        SetPtr set = std::make_shared<Set>(data.set_size_limit, false, data.context.getSettingsRef().transform_null_in);
+        SetPtr set = std::make_shared<Set>(data.set_size_limit, false, data.getContext()->getSettingsRef().transform_null_in);
 
         /** The following happens for GLOBAL INs or INs:
           * - in the addExternalStorage function, the IN (SELECT ...) subquery is replaced with IN _data1,
@@ -1089,7 +1171,7 @@ SetPtr ActionsMatcher::makeSet(const ASTFunction & node, Data & data, bool no_su
           */
         if (!subquery_for_set.source && data.create_source_for_in)
         {
-            auto interpreter = interpretSubquery(right_in_operand, data.context, data.subquery_depth, {});
+            auto interpreter = interpretSubquery(right_in_operand, data.getContext(), data.subquery_depth, {});
             subquery_for_set.source = std::make_unique<QueryPlan>();
             interpreter->buildQueryPlan(*subquery_for_set.source);
         }
@@ -1101,10 +1183,10 @@ SetPtr ActionsMatcher::makeSet(const ASTFunction & node, Data & data, bool no_su
     else
     {
         const auto & last_actions = data.actions_stack.getLastActions();
-        const auto & index = last_actions.getIndex();
+        const auto & index = data.actions_stack.getLastActionsIndex();
         if (index.contains(left_in_operand->getColumnName()))
             /// An explicit enumeration of values in parentheses.
-            return makeExplicitSet(&node, last_actions, false, data.context, data.set_size_limit, data.prepared_sets);
+            return makeExplicitSet(&node, last_actions, false, data.getContext(), data.set_size_limit, data.prepared_sets);
         else
             return {};
     }
diff --git a/src/Interpreters/ActionsVisitor.h b/src/Interpreters/ActionsVisitor.h
index 8e186f06fee..1d7d64f739a 100644
--- a/src/Interpreters/ActionsVisitor.h
+++ b/src/Interpreters/ActionsVisitor.h
@@ -1,15 +1,15 @@
 #pragma once
 
-#include <Parsers/IAST.h>
+#include <Interpreters/Context_fwd.h>
+#include <Interpreters/InDepthNodeVisitor.h>
 #include <Interpreters/PreparedSets.h>
 #include <Interpreters/SubqueryForSet.h>
-#include <Interpreters/InDepthNodeVisitor.h>
+#include <Parsers/IAST.h>
 
 
 namespace DB
 {
 
-class Context;
 class ASTFunction;
 
 class ExpressionActions;
@@ -24,7 +24,7 @@ using FunctionOverloadResolverPtr = std::shared_ptr<IFunctionOverloadResolver>;
 /// The case of an explicit enumeration of values.
 SetPtr makeExplicitSet(
     const ASTFunction * node, const ActionsDAG & actions, bool create_ordered_set,
-    const Context & context, const SizeLimits & limits, PreparedSets & prepared_sets);
+    ContextPtr context, const SizeLimits & limits, PreparedSets & prepared_sets);
 
 /** Create a block for set from expression.
   * 'set_element_types' - types of what are on the left hand side of IN.
@@ -41,7 +41,7 @@ Block createBlockForSet(
     const DataTypePtr & left_arg_type,
     const std::shared_ptr<ASTFunction> & right_arg,
     const DataTypes & set_element_types,
-    const Context & context);
+    ContextPtr context);
 
 /** Create a block for set from literal.
   * 'set_element_types' - types of what are on the left hand side of IN.
@@ -51,7 +51,7 @@ Block createBlockForSet(
     const DataTypePtr & left_arg_type,
     const ASTPtr & right_arg,
     const DataTypes & set_element_types,
-    const Context & context);
+    ContextPtr context);
 
 /** For ActionsVisitor
   * A stack of ExpressionActions corresponding to nested lambda expressions.
@@ -60,21 +60,27 @@ Block createBlockForSet(
   *  calculation of the product must be done outside the lambda expression (it does not depend on x),
   *  and the calculation of the sum is inside (depends on x).
   */
-struct ScopeStack
+struct ScopeStack : WithContext
 {
+    class Index;
+    using IndexPtr = std::unique_ptr<Index>;
+
     struct Level
     {
         ActionsDAGPtr actions_dag;
+        IndexPtr index;
         NameSet inputs;
+
+        Level();
+        Level(Level &&);
+        ~Level();
     };
 
     using Levels = std::vector<Level>;
 
     Levels stack;
 
-    const Context & context;
-
-    ScopeStack(ActionsDAGPtr actions_dag, const Context & context_);
+    ScopeStack(ActionsDAGPtr actions_dag, ContextPtr context_);
 
     void pushLevel(const NamesAndTypesList & input_columns);
 
@@ -91,6 +97,7 @@ struct ScopeStack
     ActionsDAGPtr popLevel();
 
     const ActionsDAG & getLastActions() const;
+    const Index & getLastActionsIndex() const;
     std::string dumpNames() const;
 };
 
@@ -104,9 +111,8 @@ class ActionsMatcher
 public:
     using Visitor = ConstInDepthNodeVisitor<ActionsMatcher, true>;
 
-    struct Data
+    struct Data : public WithContext
     {
-        const Context & context;
         SizeLimits set_size_limit;
         size_t subquery_depth;
         const NamesAndTypesList & source_columns;
@@ -126,10 +132,18 @@ public:
          */
         int next_unique_suffix;
 
-        Data(const Context & context_, SizeLimits set_size_limit_, size_t subquery_depth_,
-                const NamesAndTypesList & source_columns_, ActionsDAGPtr actions_dag,
-                PreparedSets & prepared_sets_, SubqueriesForSets & subqueries_for_sets_,
-                bool no_subqueries_, bool no_makeset_, bool only_consts_, bool create_source_for_in_);
+        Data(
+            ContextPtr context_,
+            SizeLimits set_size_limit_,
+            size_t subquery_depth_,
+            const NamesAndTypesList & source_columns_,
+            ActionsDAGPtr actions_dag,
+            PreparedSets & prepared_sets_,
+            SubqueriesForSets & subqueries_for_sets_,
+            bool no_subqueries_,
+            bool no_makeset_,
+            bool only_consts_,
+            bool create_source_for_in_);
 
         /// Does result of the calculation already exists in the block.
         bool hasColumn(const String & column_name) const;
diff --git a/src/Interpreters/AggregationCommon.h b/src/Interpreters/AggregationCommon.h
index e896b0e14df..43b0671f661 100644
--- a/src/Interpreters/AggregationCommon.h
+++ b/src/Interpreters/AggregationCommon.h
@@ -19,11 +19,6 @@
 #include <tmmintrin.h>
 #endif
 
-
-template <>
-struct DefaultHash<StringRef> : public StringRefHash {};
-
-
 namespace DB
 {
 namespace ErrorCodes
@@ -70,6 +65,57 @@ constexpr auto getBitmapSize()
 
 }
 
+template<typename T, size_t step>
+void fillFixedBatch(size_t num_rows, const T * source, T * dest)
+{
+    for (size_t i = 0; i < num_rows; ++i)
+    {
+        *dest = *source;
+        ++source;
+        dest += step;
+    }
+}
+
+/// Move keys of size T into binary blob, starting from offset.
+/// It is assumed that offset is aligned to sizeof(T).
+/// Example: sizeof(key) = 16, sizeof(T) = 4, offset = 8
+/// out[0] : [--------****----]
+/// out[1] : [--------****----]
+/// ...
+template<typename T, typename Key>
+void fillFixedBatch(size_t keys_size, const ColumnRawPtrs & key_columns, const Sizes & key_sizes, PaddedPODArray<Key> & out, size_t & offset)
+{
+    for (size_t i = 0; i < keys_size; ++i)
+    {
+        if (key_sizes[i] == sizeof(T))
+        {
+            const auto * column = key_columns[i];
+            size_t num_rows = column->size();
+            out.resize_fill(num_rows);
+
+            /// Note: here we violate strict aliasing.
+            /// It should be ok as log as we do not reffer to any value from `out` before filling.
+            const char * source = static_cast<const ColumnVectorHelper *>(column)->getRawDataBegin<sizeof(T)>();
+            T * dest = reinterpret_cast<T *>(reinterpret_cast<char *>(out.data()) + offset);
+            fillFixedBatch<T, sizeof(Key) / sizeof(T)>(num_rows, reinterpret_cast<const T *>(source), dest);
+            offset += sizeof(T);
+        }
+    }
+}
+
+/// Pack into a binary blob of type T a set of fixed-size keys. Granted that all the keys fit into the
+/// binary blob. Keys are placed starting from the longest one.
+template <typename T>
+void packFixedBatch(size_t keys_size, const ColumnRawPtrs & key_columns, const Sizes & key_sizes, PaddedPODArray<T> & out)
+{
+    size_t offset = 0;
+    fillFixedBatch<UInt128>(keys_size, key_columns, key_sizes, out, offset);
+    fillFixedBatch<UInt64>(keys_size, key_columns, key_sizes, out, offset);
+    fillFixedBatch<UInt32>(keys_size, key_columns, key_sizes, out, offset);
+    fillFixedBatch<UInt16>(keys_size, key_columns, key_sizes, out, offset);
+    fillFixedBatch<UInt8>(keys_size, key_columns, key_sizes, out, offset);
+}
+
 template <typename T>
 using KeysNullMap = std::array<UInt8, getBitmapSize<T>()>;
 
diff --git a/src/Interpreters/Aggregator.cpp b/src/Interpreters/Aggregator.cpp
index abff6f21acf..ad9cc0fc2d2 100644
--- a/src/Interpreters/Aggregator.cpp
+++ b/src/Interpreters/Aggregator.cpp
@@ -440,80 +440,27 @@ void NO_INLINE Aggregator::executeImpl(
     typename Method::State state(key_columns, key_sizes, aggregation_state_cache);
 
     if (!no_more_keys)
-        executeImplBatch(method, state, aggregates_pool, rows, aggregate_instructions);
+        executeImplBatch<false>(method, state, aggregates_pool, rows, aggregate_instructions, overflow_row);
     else
-        executeImplCase<true>(method, state, aggregates_pool, rows, aggregate_instructions, overflow_row);
+        executeImplBatch<true>(method, state, aggregates_pool, rows, aggregate_instructions, overflow_row);
 }
 
 
 template <bool no_more_keys, typename Method>
-void NO_INLINE Aggregator::executeImplCase(
+void NO_INLINE Aggregator::executeImplBatch(
     Method & method,
     typename Method::State & state,
     Arena * aggregates_pool,
     size_t rows,
     AggregateFunctionInstruction * aggregate_instructions,
     AggregateDataPtr overflow_row) const
-{
-    /// NOTE When editing this code, also pay attention to SpecializedAggregator.h.
-
-    /// For all rows.
-    for (size_t i = 0; i < rows; ++i)
-    {
-        AggregateDataPtr aggregate_data = nullptr;
-
-        if constexpr (!no_more_keys)  /// Insert.
-        {
-            auto emplace_result = state.emplaceKey(method.data, i, *aggregates_pool);
-
-            /// If a new key is inserted, initialize the states of the aggregate functions, and possibly something related to the key.
-            if (emplace_result.isInserted())
-            {
-                /// exception-safety - if you can not allocate memory or create states, then destructors will not be called.
-                emplace_result.setMapped(nullptr);
-
-                aggregate_data = aggregates_pool->alignedAlloc(total_size_of_aggregate_states, align_aggregate_states);
-                createAggregateStates(aggregate_data);
-
-                emplace_result.setMapped(aggregate_data);
-            }
-            else
-                aggregate_data = emplace_result.getMapped();
-        }
-        else
-        {
-            /// Add only if the key already exists.
-            auto find_result = state.findKey(method.data, i, *aggregates_pool);
-            if (find_result.isFound())
-                aggregate_data = find_result.getMapped();
-        }
-
-        /// aggregate_date == nullptr means that the new key did not fit in the hash table because of no_more_keys.
-
-        /// If the key does not fit, and the data does not need to be aggregated in a separate row, then there's nothing to do.
-        if (!aggregate_data && !overflow_row)
-            continue;
-
-        AggregateDataPtr value = aggregate_data ? aggregate_data : overflow_row;
-
-        /// Add values to the aggregate functions.
-        for (AggregateFunctionInstruction * inst = aggregate_instructions; inst->that; ++inst)
-            (*inst->func)(inst->that, value + inst->state_offset, inst->arguments, i, aggregates_pool);
-    }
-}
-
-
-template <typename Method>
-void NO_INLINE Aggregator::executeImplBatch(
-    Method & method,
-    typename Method::State & state,
-    Arena * aggregates_pool,
-    size_t rows,
-    AggregateFunctionInstruction * aggregate_instructions) const
 {
     /// Optimization for special case when there are no aggregate functions.
     if (params.aggregates_size == 0)
     {
+        if constexpr (no_more_keys)
+            return;
+
         /// For all rows.
         AggregateDataPtr place = aggregates_pool->alloc(0);
         for (size_t i = 0; i < rows; ++i)
@@ -522,7 +469,7 @@ void NO_INLINE Aggregator::executeImplBatch(
     }
 
     /// Optimization for special case when aggregating by 8bit key.
-    if constexpr (std::is_same_v<Method, typename decltype(AggregatedDataVariants::key8)::element_type>)
+    if constexpr (!no_more_keys && std::is_same_v<Method, typename decltype(AggregatedDataVariants::key8)::element_type>)
     {
         /// We use another method if there are aggregate functions with -Array combinator.
         bool has_arrays = false;
@@ -565,24 +512,37 @@ void NO_INLINE Aggregator::executeImplBatch(
     {
         AggregateDataPtr aggregate_data = nullptr;
 
-        auto emplace_result = state.emplaceKey(method.data, i, *aggregates_pool);
-
-        /// If a new key is inserted, initialize the states of the aggregate functions, and possibly something related to the key.
-        if (emplace_result.isInserted())
+        if constexpr (!no_more_keys)
         {
-            /// exception-safety - if you can not allocate memory or create states, then destructors will not be called.
-            emplace_result.setMapped(nullptr);
+            auto emplace_result = state.emplaceKey(method.data, i, *aggregates_pool);
 
-            aggregate_data = aggregates_pool->alignedAlloc(total_size_of_aggregate_states, align_aggregate_states);
-            createAggregateStates(aggregate_data);
+            /// If a new key is inserted, initialize the states of the aggregate functions, and possibly something related to the key.
+            if (emplace_result.isInserted())
+            {
+                /// exception-safety - if you can not allocate memory or create states, then destructors will not be called.
+                emplace_result.setMapped(nullptr);
 
-            emplace_result.setMapped(aggregate_data);
+                aggregate_data = aggregates_pool->alignedAlloc(total_size_of_aggregate_states, align_aggregate_states);
+                createAggregateStates(aggregate_data);
+
+                emplace_result.setMapped(aggregate_data);
+            }
+            else
+                aggregate_data = emplace_result.getMapped();
+
+            assert(aggregate_data != nullptr);
         }
         else
-            aggregate_data = emplace_result.getMapped();
+        {
+            /// Add only if the key already exists.
+            auto find_result = state.findKey(method.data, i, *aggregates_pool);
+            if (find_result.isFound())
+                aggregate_data = find_result.getMapped();
+            else
+                aggregate_data = overflow_row;
+        }
 
         places[i] = aggregate_data;
-        assert(places[i] != nullptr);
     }
 
     /// Add values to the aggregate functions.
@@ -874,7 +834,7 @@ void Aggregator::writeToTemporaryFile(AggregatedDataVariants & data_variants, co
     ProfileEvents::increment(ProfileEvents::ExternalAggregationCompressedBytes, compressed_bytes);
     ProfileEvents::increment(ProfileEvents::ExternalAggregationUncompressedBytes, uncompressed_bytes);
 
-    LOG_TRACE(log,
+    LOG_DEBUG(log,
         "Written part in {} sec., {} rows, {} uncompressed, {} compressed,"
         " {} uncompressed bytes per row, {} compressed bytes per row, compression rate: {}"
         " ({} rows/sec., {}/sec. uncompressed, {}/sec. compressed)",
@@ -987,7 +947,7 @@ void Aggregator::writeToTemporaryFileImpl(
     /// `data_variants` will not destroy them in the destructor, they are now owned by ColumnAggregateFunction objects.
     data_variants.aggregator = nullptr;
 
-    LOG_TRACE(log, "Max size of temporary block: {} rows, {}.", max_temporary_block_size_rows, ReadableSize(max_temporary_block_size_bytes));
+    LOG_DEBUG(log, "Max size of temporary block: {} rows, {}.", max_temporary_block_size_rows, ReadableSize(max_temporary_block_size_bytes));
 }
 
 
@@ -1031,10 +991,15 @@ void Aggregator::convertToBlockImpl(
     if (key_columns.size() != params.keys_size)
         throw Exception{"Aggregate. Unexpected key columns size.", ErrorCodes::LOGICAL_ERROR};
 
+    std::vector<IColumn *> raw_key_columns;
+    raw_key_columns.reserve(key_columns.size());
+    for (auto & column : key_columns)
+        raw_key_columns.push_back(column.get());
+
     if (final)
-        convertToBlockImplFinal(method, data, key_columns, final_aggregate_columns, arena);
+        convertToBlockImplFinal(method, data, std::move(raw_key_columns), final_aggregate_columns, arena);
     else
-        convertToBlockImplNotFinal(method, data, key_columns, aggregate_columns);
+        convertToBlockImplNotFinal(method, data, std::move(raw_key_columns), aggregate_columns);
     /// In order to release memory early.
     data.clearAndShrink();
 }
@@ -1112,7 +1077,7 @@ template <typename Method, typename Table>
 void NO_INLINE Aggregator::convertToBlockImplFinal(
     Method & method,
     Table & data,
-    MutableColumns & key_columns,
+    std::vector<IColumn *>  key_columns,
     MutableColumns & final_aggregate_columns,
     Arena * arena) const
 {
@@ -1125,9 +1090,12 @@ void NO_INLINE Aggregator::convertToBlockImplFinal(
         }
     }
 
+    auto shuffled_key_sizes = method.shuffleKeyColumns(key_columns, key_sizes);
+    const auto & key_sizes_ref = shuffled_key_sizes ? *shuffled_key_sizes :  key_sizes;
+
     data.forEachValue([&](const auto & key, auto & mapped)
     {
-        method.insertKeyIntoColumns(key, key_columns, key_sizes);
+        method.insertKeyIntoColumns(key, key_columns, key_sizes_ref);
         insertAggregatesIntoColumns(mapped, final_aggregate_columns, arena);
     });
 }
@@ -1136,7 +1104,7 @@ template <typename Method, typename Table>
 void NO_INLINE Aggregator::convertToBlockImplNotFinal(
     Method & method,
     Table & data,
-    MutableColumns & key_columns,
+    std::vector<IColumn *>  key_columns,
     AggregateColumnsData & aggregate_columns) const
 {
     if constexpr (Method::low_cardinality_optimization)
@@ -1152,9 +1120,12 @@ void NO_INLINE Aggregator::convertToBlockImplNotFinal(
         }
     }
 
+    auto shuffled_key_sizes = method.shuffleKeyColumns(key_columns, key_sizes);
+    const auto & key_sizes_ref = shuffled_key_sizes ? *shuffled_key_sizes :  key_sizes;
+
     data.forEachValue([&](const auto & key, auto & mapped)
     {
-        method.insertKeyIntoColumns(key, key_columns, key_sizes);
+        method.insertKeyIntoColumns(key, key_columns, key_sizes_ref);
 
         /// reserved, so push_back does not throw exceptions
         for (size_t i = 0; i < params.aggregates_size; ++i)
@@ -1249,29 +1220,35 @@ Block Aggregator::prepareBlockAndFill(
     return res;
 }
 
-void Aggregator::fillAggregateColumnsWithSingleKey(
-    AggregatedDataVariants & data_variants,
-    MutableColumns & final_aggregate_columns)
+void Aggregator::addSingleKeyToAggregateColumns(
+    const AggregatedDataVariants & data_variants,
+    MutableColumns & aggregate_columns) const
 {
-    AggregatedDataWithoutKey & data = data_variants.without_key;
-
+    const auto & data = data_variants.without_key;
     for (size_t i = 0; i < params.aggregates_size; ++i)
     {
-        ColumnAggregateFunction & column_aggregate_func = assert_cast<ColumnAggregateFunction &>(*final_aggregate_columns[i]);
-        for (auto & pool : data_variants.aggregates_pools)
-        {
-            column_aggregate_func.addArena(pool);
-        }
+        auto & column_aggregate_func = assert_cast<ColumnAggregateFunction &>(*aggregate_columns[i]);
         column_aggregate_func.getData().push_back(data + offsets_of_aggregate_states[i]);
     }
-    data = nullptr;
+}
+
+void Aggregator::addArenasToAggregateColumns(
+    const AggregatedDataVariants & data_variants,
+    MutableColumns & aggregate_columns) const
+{
+    for (size_t i = 0; i < params.aggregates_size; ++i)
+    {
+        auto & column_aggregate_func = assert_cast<ColumnAggregateFunction &>(*aggregate_columns[i]);
+        for (const auto & pool : data_variants.aggregates_pools)
+            column_aggregate_func.addArena(pool);
+    }
 }
 
 void Aggregator::createStatesAndFillKeyColumnsWithSingleKey(
     AggregatedDataVariants & data_variants,
     Columns & key_columns,
     size_t key_row,
-    MutableColumns & final_key_columns)
+    MutableColumns & final_key_columns) const
 {
     AggregateDataPtr place = data_variants.aggregates_pool->alignedAlloc(total_size_of_aggregate_states, align_aggregate_states);
     createAggregateStates(place);
@@ -1378,35 +1355,46 @@ BlocksList Aggregator::prepareBlocksAndFillTwoLevelImpl(
         for (size_t i = data_variants.aggregates_pools.size(); i < max_threads; ++i)
             data_variants.aggregates_pools.push_back(std::make_shared<Arena>());
 
-    auto converter = [&](size_t bucket, ThreadGroupStatusPtr thread_group)
+    std::atomic<UInt32> next_bucket_to_merge = 0;
+
+    auto converter = [&](size_t thread_id, ThreadGroupStatusPtr thread_group)
     {
         if (thread_group)
             CurrentThread::attachToIfDetached(thread_group);
 
-        /// Select Arena to avoid race conditions
-        size_t thread_number = static_cast<size_t>(bucket) % max_threads;
-        Arena * arena = data_variants.aggregates_pools.at(thread_number).get();
+        BlocksList blocks;
+        while (true)
+        {
+            UInt32 bucket = next_bucket_to_merge.fetch_add(1);
 
-        return convertOneBucketToBlock(data_variants, method, arena, final, bucket);
+            if (bucket >= Method::Data::NUM_BUCKETS)
+                break;
+
+            if (method.data.impls[bucket].empty())
+                continue;
+
+            /// Select Arena to avoid race conditions
+            Arena * arena = data_variants.aggregates_pools.at(thread_id).get();
+            blocks.emplace_back(convertOneBucketToBlock(data_variants, method, arena, final, bucket));
+        }
+        return blocks;
     };
 
     /// packaged_task is used to ensure that exceptions are automatically thrown into the main stream.
 
-    std::vector<std::packaged_task<Block()>> tasks(Method::Data::NUM_BUCKETS);
+    std::vector<std::packaged_task<BlocksList()>> tasks(max_threads);
 
     try
     {
-        for (size_t bucket = 0; bucket < Method::Data::NUM_BUCKETS; ++bucket)
+        for (size_t thread_id = 0; thread_id < max_threads; ++thread_id)
         {
-            if (method.data.impls[bucket].empty())
-                continue;
-
-            tasks[bucket] = std::packaged_task<Block()>([group = CurrentThread::getGroup(), bucket, &converter]{ return converter(bucket, group); });
+            tasks[thread_id] = std::packaged_task<BlocksList()>(
+                [group = CurrentThread::getGroup(), thread_id, &converter] { return converter(thread_id, group); });
 
             if (thread_pool)
-                thread_pool->scheduleOrThrowOnError([bucket, &tasks] { tasks[bucket](); });
+                thread_pool->scheduleOrThrowOnError([thread_id, &tasks] { tasks[thread_id](); });
             else
-                tasks[bucket]();
+                tasks[thread_id]();
         }
     }
     catch (...)
@@ -1428,7 +1416,7 @@ BlocksList Aggregator::prepareBlocksAndFillTwoLevelImpl(
         if (!task.valid())
             continue;
 
-        blocks.emplace_back(task.get_future().get());
+        blocks.splice(blocks.end(), task.get_future().get());
     }
 
     return blocks;
@@ -1493,7 +1481,7 @@ BlocksList Aggregator::convertToBlocks(AggregatedDataVariants & data_variants, b
     }
 
     double elapsed_seconds = watch.elapsedSeconds();
-    LOG_TRACE(log,
+    LOG_DEBUG(log,
         "Converted aggregated data to blocks. {} rows, {} in {} sec. ({} rows/sec., {}/sec.)",
         rows, ReadableSize(bytes),
         elapsed_seconds, rows / elapsed_seconds,
@@ -2121,7 +2109,7 @@ Block Aggregator::mergeBlocks(BlocksList & blocks, bool final)
     size_t rows = block.rows();
     size_t bytes = block.bytes();
     double elapsed_seconds = watch.elapsedSeconds();
-    LOG_TRACE(log, "Merged partially aggregated blocks. {} rows, {}. in {} sec. ({} rows/sec., {}/sec.)",
+    LOG_DEBUG(log, "Merged partially aggregated blocks. {} rows, {}. in {} sec. ({} rows/sec., {}/sec.)",
         rows, ReadableSize(bytes),
         elapsed_seconds, rows / elapsed_seconds,
         ReadableSize(bytes / elapsed_seconds));
diff --git a/src/Interpreters/Aggregator.h b/src/Interpreters/Aggregator.h
index c5bcc1eb27f..3415382d485 100644
--- a/src/Interpreters/Aggregator.h
+++ b/src/Interpreters/Aggregator.h
@@ -196,11 +196,14 @@ struct AggregationMethodOneNumber
     /// Use optimization for low cardinality.
     static const bool low_cardinality_optimization = false;
 
+    /// Shuffle key columns before `insertKeyIntoColumns` call if needed.
+    std::optional<Sizes> shuffleKeyColumns(std::vector<IColumn *> &, const Sizes &) { return {}; }
+
     // Insert the key from the hash table into columns.
-    static void insertKeyIntoColumns(const Key & key, MutableColumns & key_columns, const Sizes & /*key_sizes*/)
+    static void insertKeyIntoColumns(const Key & key, std::vector<IColumn *> & key_columns, const Sizes & /*key_sizes*/)
     {
         const auto * key_holder = reinterpret_cast<const char *>(&key);
-        auto * column = static_cast<ColumnVectorHelper *>(key_columns[0].get());
+        auto * column = static_cast<ColumnVectorHelper *>(key_columns[0]);
         column->insertRawData<sizeof(FieldType)>(key_holder);
     }
 };
@@ -225,9 +228,11 @@ struct AggregationMethodString
 
     static const bool low_cardinality_optimization = false;
 
-    static void insertKeyIntoColumns(const StringRef & key, MutableColumns & key_columns, const Sizes &)
+    std::optional<Sizes> shuffleKeyColumns(std::vector<IColumn *> &, const Sizes &) { return {}; }
+
+    static void insertKeyIntoColumns(const StringRef & key, std::vector<IColumn *> & key_columns, const Sizes &)
     {
-        static_cast<ColumnString *>(key_columns[0].get())->insertData(key.data, key.size);
+        static_cast<ColumnString *>(key_columns[0])->insertData(key.data, key.size);
     }
 };
 
@@ -251,9 +256,11 @@ struct AggregationMethodStringNoCache
 
     static const bool low_cardinality_optimization = false;
 
-    static void insertKeyIntoColumns(const StringRef & key, MutableColumns & key_columns, const Sizes &)
+    std::optional<Sizes> shuffleKeyColumns(std::vector<IColumn *> &, const Sizes &) { return {}; }
+
+    static void insertKeyIntoColumns(const StringRef & key, std::vector<IColumn *> & key_columns, const Sizes &)
     {
-        static_cast<ColumnString *>(key_columns[0].get())->insertData(key.data, key.size);
+        static_cast<ColumnString *>(key_columns[0])->insertData(key.data, key.size);
     }
 };
 
@@ -277,9 +284,11 @@ struct AggregationMethodFixedString
 
     static const bool low_cardinality_optimization = false;
 
-    static void insertKeyIntoColumns(const StringRef & key, MutableColumns & key_columns, const Sizes &)
+    std::optional<Sizes> shuffleKeyColumns(std::vector<IColumn *> &, const Sizes &) { return {}; }
+
+    static void insertKeyIntoColumns(const StringRef & key, std::vector<IColumn *> & key_columns, const Sizes &)
     {
-        static_cast<ColumnFixedString *>(key_columns[0].get())->insertData(key.data, key.size);
+        static_cast<ColumnFixedString *>(key_columns[0])->insertData(key.data, key.size);
     }
 };
 
@@ -302,9 +311,11 @@ struct AggregationMethodFixedStringNoCache
 
     static const bool low_cardinality_optimization = false;
 
-    static void insertKeyIntoColumns(const StringRef & key, MutableColumns & key_columns, const Sizes &)
+    std::optional<Sizes> shuffleKeyColumns(std::vector<IColumn *> &, const Sizes &) { return {}; }
+
+    static void insertKeyIntoColumns(const StringRef & key, std::vector<IColumn *> & key_columns, const Sizes &)
     {
-        static_cast<ColumnFixedString *>(key_columns[0].get())->insertData(key.data, key.size);
+        static_cast<ColumnFixedString *>(key_columns[0])->insertData(key.data, key.size);
     }
 };
 
@@ -331,10 +342,12 @@ struct AggregationMethodSingleLowCardinalityColumn : public SingleColumnMethod
 
     static const bool low_cardinality_optimization = true;
 
+    std::optional<Sizes> shuffleKeyColumns(std::vector<IColumn *> &, const Sizes &) { return {}; }
+
     static void insertKeyIntoColumns(const Key & key,
-        MutableColumns & key_columns_low_cardinality, const Sizes & /*key_sizes*/)
+         std::vector<IColumn *> & key_columns_low_cardinality, const Sizes & /*key_sizes*/)
     {
-        auto * col = assert_cast<ColumnLowCardinality *>(key_columns_low_cardinality[0].get());
+        auto * col = assert_cast<ColumnLowCardinality *>(key_columns_low_cardinality[0]);
 
         if constexpr (std::is_same_v<Key, StringRef>)
         {
@@ -375,7 +388,12 @@ struct AggregationMethodKeysFixed
 
     static const bool low_cardinality_optimization = false;
 
-    static void insertKeyIntoColumns(const Key & key, MutableColumns & key_columns, const Sizes & key_sizes)
+    std::optional<Sizes> shuffleKeyColumns(std::vector<IColumn *> & key_columns, const Sizes & key_sizes)
+    {
+        return State::shuffleKeyColumns(key_columns, key_sizes);
+    }
+
+    static void insertKeyIntoColumns(const Key & key, std::vector<IColumn *> & key_columns, const Sizes & key_sizes)
     {
         size_t keys_size = key_columns.size();
 
@@ -401,7 +419,7 @@ struct AggregationMethodKeysFixed
             }
             else
             {
-                observed_column = key_columns[i].get();
+                observed_column = key_columns[i];
                 null_map = nullptr;
             }
 
@@ -453,7 +471,9 @@ struct AggregationMethodSerialized
 
     static const bool low_cardinality_optimization = false;
 
-    static void insertKeyIntoColumns(const StringRef & key, MutableColumns & key_columns, const Sizes &)
+    std::optional<Sizes> shuffleKeyColumns(std::vector<IColumn *> &, const Sizes &) { return {}; }
+
+    static void insertKeyIntoColumns(const StringRef & key, std::vector<IColumn *> & key_columns, const Sizes &)
     {
         const auto * pos = key.data;
         for (auto & column : key_columns)
@@ -1091,7 +1111,7 @@ protected:
 
     /// Specialization for a particular value no_more_keys.
     template <bool no_more_keys, typename Method>
-    void executeImplCase(
+    void executeImplBatch(
         Method & method,
         typename Method::State & state,
         Arena * aggregates_pool,
@@ -1099,14 +1119,6 @@ protected:
         AggregateFunctionInstruction * aggregate_instructions,
         AggregateDataPtr overflow_row) const;
 
-    template <typename Method>
-    void executeImplBatch(
-        Method & method,
-        typename Method::State & state,
-        Arena * aggregates_pool,
-        size_t rows,
-        AggregateFunctionInstruction * aggregate_instructions) const;
-
     /// For case when there are no keys (all aggregate into one row).
     static void executeWithoutKeyImpl(
         AggregatedDataWithoutKey & res,
@@ -1184,7 +1196,7 @@ protected:
     void convertToBlockImplFinal(
         Method & method,
         Table & data,
-        MutableColumns & key_columns,
+        std::vector<IColumn *> key_columns,
         MutableColumns & final_aggregate_columns,
         Arena * arena) const;
 
@@ -1192,7 +1204,7 @@ protected:
     void convertToBlockImplNotFinal(
         Method & method,
         Table & data,
-        MutableColumns & key_columns,
+        std::vector<IColumn *>  key_columns,
         AggregateColumnsData & aggregate_columns) const;
 
     template <typename Filler>
@@ -1283,14 +1295,18 @@ protected:
         AggregateFunctionInstructions & instructions,
         NestedColumnsHolder & nested_columns_holder);
 
-    void fillAggregateColumnsWithSingleKey(
-        AggregatedDataVariants & data_variants,
-        MutableColumns & final_aggregate_columns);
+    void addSingleKeyToAggregateColumns(
+        const AggregatedDataVariants & data_variants,
+        MutableColumns & aggregate_columns) const;
+
+    void addArenasToAggregateColumns(
+        const AggregatedDataVariants & data_variants,
+        MutableColumns & aggregate_columns) const;
 
     void createStatesAndFillKeyColumnsWithSingleKey(
         AggregatedDataVariants & data_variants,
         Columns & key_columns, size_t key_row,
-        MutableColumns & final_key_columns);
+        MutableColumns & final_key_columns) const;
 };
 
 
diff --git a/src/Interpreters/ApplyWithSubqueryVisitor.cpp b/src/Interpreters/ApplyWithSubqueryVisitor.cpp
index f3d0c82e5f1..27e0e438a71 100644
--- a/src/Interpreters/ApplyWithSubqueryVisitor.cpp
+++ b/src/Interpreters/ApplyWithSubqueryVisitor.cpp
@@ -13,28 +13,7 @@ namespace DB
 void ApplyWithSubqueryVisitor::visit(ASTPtr & ast, const Data & data)
 {
     if (auto * node_select = ast->as<ASTSelectQuery>())
-    {
-        std::optional<Data> new_data;
-        if (auto with = node_select->with())
-        {
-            for (auto & child : with->children)
-            {
-                visit(child, new_data ? *new_data : data);
-                if (auto * ast_with_elem = child->as<ASTWithElement>())
-                {
-                    if (!new_data)
-                        new_data = data;
-                    new_data->subqueries[ast_with_elem->name] = ast_with_elem->subquery;
-                }
-            }
-        }
-
-        for (auto & child : node_select->children)
-        {
-            if (child != node_select->with())
-                visit(child, new_data ? *new_data : data);
-        }
-    }
+        visit(*node_select, data);
     else
     {
         for (auto & child : ast->children)
@@ -46,6 +25,36 @@ void ApplyWithSubqueryVisitor::visit(ASTPtr & ast, const Data & data)
     }
 }
 
+void ApplyWithSubqueryVisitor::visit(ASTSelectQuery & ast, const Data & data)
+{
+    std::optional<Data> new_data;
+    if (auto with = ast.with())
+    {
+        for (auto & child : with->children)
+        {
+            visit(child, new_data ? *new_data : data);
+            if (auto * ast_with_elem = child->as<ASTWithElement>())
+            {
+                if (!new_data)
+                    new_data = data;
+                new_data->subqueries[ast_with_elem->name] = ast_with_elem->subquery;
+            }
+        }
+    }
+
+    for (auto & child : ast.children)
+    {
+        if (child != ast.with())
+            visit(child, new_data ? *new_data : data);
+    }
+}
+
+void ApplyWithSubqueryVisitor::visit(ASTSelectWithUnionQuery & ast, const Data & data)
+{
+    for (auto & child : ast.children)
+        visit(child, data);
+}
+
 void ApplyWithSubqueryVisitor::visit(ASTTableExpression & table, const Data & data)
 {
     if (table.database_and_table_name)
diff --git a/src/Interpreters/ApplyWithSubqueryVisitor.h b/src/Interpreters/ApplyWithSubqueryVisitor.h
index ed3f9fbcd3e..3b17de1d691 100644
--- a/src/Interpreters/ApplyWithSubqueryVisitor.h
+++ b/src/Interpreters/ApplyWithSubqueryVisitor.h
@@ -7,6 +7,8 @@
 namespace DB
 {
 class ASTFunction;
+class ASTSelectQuery;
+class ASTSelectWithUnionQuery;
 struct ASTTableExpression;
 
 class ApplyWithSubqueryVisitor
@@ -18,9 +20,13 @@ public:
     };
 
     static void visit(ASTPtr & ast) { visit(ast, {}); }
+    static void visit(ASTSelectQuery & select) { visit(select, {}); }
+    static void visit(ASTSelectWithUnionQuery & select) { visit(select, {}); }
 
 private:
     static void visit(ASTPtr & ast, const Data & data);
+    static void visit(ASTSelectQuery & ast, const Data & data);
+    static void visit(ASTSelectWithUnionQuery & ast, const Data & data);
     static void visit(ASTTableExpression & table, const Data & data);
     static void visit(ASTFunction & func, const Data & data);
 };
diff --git a/src/Interpreters/ArrayJoinAction.cpp b/src/Interpreters/ArrayJoinAction.cpp
index 77d63bd7752..3d176857601 100644
--- a/src/Interpreters/ArrayJoinAction.cpp
+++ b/src/Interpreters/ArrayJoinAction.cpp
@@ -16,10 +16,10 @@ namespace ErrorCodes
     extern const int TYPE_MISMATCH;
 }
 
-ArrayJoinAction::ArrayJoinAction(const NameSet & array_joined_columns_, bool array_join_is_left, const Context & context)
+ArrayJoinAction::ArrayJoinAction(const NameSet & array_joined_columns_, bool array_join_is_left, ContextPtr context)
     : columns(array_joined_columns_)
     , is_left(array_join_is_left)
-    , is_unaligned(context.getSettingsRef().enable_unaligned_array_join)
+    , is_unaligned(context->getSettingsRef().enable_unaligned_array_join)
 {
     if (columns.empty())
         throw Exception("No arrays to join", ErrorCodes::LOGICAL_ERROR);
diff --git a/src/Interpreters/ArrayJoinAction.h b/src/Interpreters/ArrayJoinAction.h
index 81f720f00ef..975bf25a953 100644
--- a/src/Interpreters/ArrayJoinAction.h
+++ b/src/Interpreters/ArrayJoinAction.h
@@ -2,13 +2,12 @@
 
 #include <Core/Names.h>
 #include <Core/Block.h>
+#include <Interpreters/Context_fwd.h>
 
 
 namespace DB
 {
 
-class Context;
-
 class IFunctionOverloadResolver;
 using FunctionOverloadResolverPtr = std::shared_ptr<IFunctionOverloadResolver>;
 
@@ -27,7 +26,7 @@ public:
     /// For LEFT ARRAY JOIN.
     FunctionOverloadResolverPtr function_builder;
 
-    ArrayJoinAction(const NameSet & array_joined_columns_, bool array_join_is_left, const Context & context);
+    ArrayJoinAction(const NameSet & array_joined_columns_, bool array_join_is_left, ContextPtr context);
     void prepare(ColumnsWithTypeAndName & sample) const;
     void execute(Block & block);
 };
diff --git a/src/Interpreters/AsynchronousMetrics.cpp b/src/Interpreters/AsynchronousMetrics.cpp
index 4fe922252d5..6eb143d17df 100644
--- a/src/Interpreters/AsynchronousMetrics.cpp
+++ b/src/Interpreters/AsynchronousMetrics.cpp
@@ -12,6 +12,7 @@
 #include <Storages/StorageMergeTree.h>
 #include <Storages/StorageReplicatedMergeTree.h>
 #include <IO/UncompressedCache.h>
+#include <IO/MMappedFileCache.h>
 #include <Databases/IDatabase.h>
 #include <chrono>
 
@@ -171,7 +172,7 @@ void AsynchronousMetrics::update()
     AsynchronousMetricValues new_values;
 
     {
-        if (auto mark_cache = global_context.getMarkCache())
+        if (auto mark_cache = getContext()->getMarkCache())
         {
             new_values["MarkCacheBytes"] = mark_cache->weight();
             new_values["MarkCacheFiles"] = mark_cache->count();
@@ -179,21 +180,28 @@ void AsynchronousMetrics::update()
     }
 
     {
-        if (auto uncompressed_cache = global_context.getUncompressedCache())
+        if (auto uncompressed_cache = getContext()->getUncompressedCache())
         {
             new_values["UncompressedCacheBytes"] = uncompressed_cache->weight();
             new_values["UncompressedCacheCells"] = uncompressed_cache->count();
         }
     }
 
+    {
+        if (auto mmap_cache = getContext()->getMMappedFileCache())
+        {
+            new_values["MMapCacheCells"] = mmap_cache->count();
+        }
+    }
+
 #if USE_EMBEDDED_COMPILER
     {
-        if (auto compiled_expression_cache = global_context.getCompiledExpressionCache())
+        if (auto * compiled_expression_cache = CompiledExpressionCacheFactory::instance().tryGetCache())
             new_values["CompiledExpressionCacheCount"]  = compiled_expression_cache->count();
     }
 #endif
 
-    new_values["Uptime"] = global_context.getUptimeSeconds();
+    new_values["Uptime"] = getContext()->getUptimeSeconds();
 
     /// Process memory usage according to OS
 #if defined(OS_LINUX)
@@ -256,7 +264,7 @@ void AsynchronousMetrics::update()
             /// Check if database can contain MergeTree tables
             if (!db.second->canContainMergeTreeTables())
                 continue;
-            for (auto iterator = db.second->getTablesIterator(global_context); iterator->isValid(); iterator->next())
+            for (auto iterator = db.second->getTablesIterator(getContext()); iterator->isValid(); iterator->next())
             {
                 ++total_number_of_tables;
                 const auto & table = iterator->table();
@@ -299,14 +307,14 @@ void AsynchronousMetrics::update()
                 if (table_merge_tree)
                 {
                     calculateMax(max_part_count_for_partition, table_merge_tree->getMaxPartsCountForPartition());
-                    const auto & settings = global_context.getSettingsRef();
+                    const auto & settings = getContext()->getSettingsRef();
                     total_number_of_bytes += table_merge_tree->totalBytes(settings).value();
                     total_number_of_rows += table_merge_tree->totalRows(settings).value();
                     total_number_of_parts += table_merge_tree->getPartsCount();
                 }
                 if (table_replicated_merge_tree)
                 {
-                    const auto & settings = global_context.getSettingsRef();
+                    const auto & settings = getContext()->getSettingsRef();
                     total_number_of_bytes += table_replicated_merge_tree->totalBytes(settings).value();
                     total_number_of_rows += table_replicated_merge_tree->totalRows(settings).value();
                     total_number_of_parts += table_replicated_merge_tree->getPartsCount();
@@ -446,7 +454,7 @@ void AsynchronousMetrics::update()
     /// Add more metrics as you wish.
 
     // Log the new metrics.
-    if (auto log = global_context.getAsynchronousMetricLog())
+    if (auto log = getContext()->getAsynchronousMetricLog())
     {
         log->addValues(new_values);
     }
diff --git a/src/Interpreters/AsynchronousMetrics.h b/src/Interpreters/AsynchronousMetrics.h
index f727b1d6b48..38875c21edd 100644
--- a/src/Interpreters/AsynchronousMetrics.h
+++ b/src/Interpreters/AsynchronousMetrics.h
@@ -1,18 +1,19 @@
 #pragma once
 
-#include <thread>
-#include <mutex>
-#include <condition_variable>
-#include <unordered_map>
-#include <string>
-#include <Common/ThreadPool.h>
+#include <Interpreters/Context_fwd.h>
 #include <Common/MemoryStatisticsOS.h>
+#include <Common/ThreadPool.h>
+
+#include <condition_variable>
+#include <mutex>
+#include <string>
+#include <thread>
+#include <unordered_map>
 
 
 namespace DB
 {
 
-class Context;
 class ProtocolServerAdapter;
 
 using AsynchronousMetricValue = double;
@@ -23,16 +24,16 @@ using AsynchronousMetricValues = std::unordered_map<std::string, AsynchronousMet
   *  calculates and updates some metrics,
   *  that are not updated automatically (so, need to be asynchronously calculated).
   */
-class AsynchronousMetrics
+class AsynchronousMetrics : WithContext
 {
 public:
 #if defined(ARCADIA_BUILD)
     /// This constructor needs only to provide backward compatibility with some other projects (hello, Arcadia).
     /// Never use this in the ClickHouse codebase.
     AsynchronousMetrics(
-        Context & global_context_,
+        ContextPtr global_context_,
         int update_period_seconds = 60)
-        : global_context(global_context_)
+        : WithContext(global_context_)
         , update_period(update_period_seconds)
     {
     }
@@ -42,11 +43,11 @@ public:
     /// in Arcadia -- it uses its own server implementation that also uses these
     /// metrics.
     AsynchronousMetrics(
-        Context & global_context_,
+        ContextPtr global_context_,
         int update_period_seconds,
         std::shared_ptr<std::vector<ProtocolServerAdapter>> servers_to_start_before_tables_,
         std::shared_ptr<std::vector<ProtocolServerAdapter>> servers_)
-        : global_context(global_context_)
+        : WithContext(global_context_)
         , update_period(update_period_seconds)
         , servers_to_start_before_tables(servers_to_start_before_tables_)
         , servers(servers_)
@@ -68,7 +69,6 @@ public:
     AsynchronousMetricValues getValues() const;
 
 private:
-    Context & global_context;
     const std::chrono::seconds update_period;
     std::shared_ptr<std::vector<ProtocolServerAdapter>> servers_to_start_before_tables{nullptr};
     std::shared_ptr<std::vector<ProtocolServerAdapter>> servers{nullptr};
diff --git a/src/Interpreters/CatBoostModel.cpp b/src/Interpreters/CatBoostModel.cpp
index 3e4329c6080..e19258540b9 100644
--- a/src/Interpreters/CatBoostModel.cpp
+++ b/src/Interpreters/CatBoostModel.cpp
@@ -480,20 +480,15 @@ void CatBoostLibHolder::initAPI()
 
 std::shared_ptr<CatBoostLibHolder> getCatBoostWrapperHolder(const std::string & lib_path)
 {
-    static std::weak_ptr<CatBoostLibHolder> ptr;
+    static std::shared_ptr<CatBoostLibHolder> ptr;
     static std::mutex mutex;
 
     std::lock_guard lock(mutex);
-    auto result = ptr.lock();
 
-    if (!result || result->getCurrentPath() != lib_path)
-    {
-        result = std::make_shared<CatBoostLibHolder>(lib_path);
-        /// This assignment is not atomic, which prevents from creating lock only inside 'if'.
-        ptr = result;
-    }
+    if (!ptr || ptr->getCurrentPath() != lib_path)
+        ptr = std::make_shared<CatBoostLibHolder>(lib_path);
 
-    return result;
+    return ptr;
 }
 
 }
diff --git a/src/Interpreters/ClientInfo.cpp b/src/Interpreters/ClientInfo.cpp
index 5449f397f49..223837aaf3d 100644
--- a/src/Interpreters/ClientInfo.cpp
+++ b/src/Interpreters/ClientInfo.cpp
@@ -60,6 +60,9 @@ void ClientInfo::write(WriteBuffer & out, const UInt64 server_protocol_revision)
     if (server_protocol_revision >= DBMS_MIN_REVISION_WITH_QUOTA_KEY_IN_CLIENT_INFO)
         writeBinary(quota_key, out);
 
+    if (server_protocol_revision >= DBMS_MIN_PROTOCOL_VERSION_WITH_DISTRIBUTED_DEPTH)
+        writeVarUInt(distributed_depth, out);
+
     if (interface == Interface::TCP)
     {
         if (server_protocol_revision >= DBMS_MIN_REVISION_WITH_VERSION_PATCH)
@@ -137,6 +140,9 @@ void ClientInfo::read(ReadBuffer & in, const UInt64 client_protocol_revision)
     if (client_protocol_revision >= DBMS_MIN_REVISION_WITH_QUOTA_KEY_IN_CLIENT_INFO)
         readBinary(quota_key, in);
 
+    if (client_protocol_revision >= DBMS_MIN_PROTOCOL_VERSION_WITH_DISTRIBUTED_DEPTH)
+        readVarUInt(distributed_depth, in);
+
     if (interface == Interface::TCP)
     {
         if (client_protocol_revision >= DBMS_MIN_REVISION_WITH_VERSION_PATCH)
diff --git a/src/Interpreters/ClientInfo.h b/src/Interpreters/ClientInfo.h
index d2b7beb7d8c..60abb0dd671 100644
--- a/src/Interpreters/ClientInfo.h
+++ b/src/Interpreters/ClientInfo.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <Core/UUID.h>
 #include <Poco/Net/SocketAddress.h>
 #include <Common/UInt128.h>
 #include <common/types.h>
@@ -84,6 +85,9 @@ public:
     String http_user_agent;
     String http_referer;
 
+    /// For mysql
+    UInt64 connection_id = 0;
+
     /// Comma separated list of forwarded IP addresses (from X-Forwarded-For for HTTP interface).
     /// It's expected that proxy appends the forwarded address to the end of the list.
     /// The element can be trusted only if you trust the corresponding proxy.
@@ -93,6 +97,8 @@ public:
     /// Common
     String quota_key;
 
+    UInt64 distributed_depth = 0;
+
     bool empty() const { return query_kind == QueryKind::NO_QUERY; }
 
     /** Serialization and deserialization.
diff --git a/src/Interpreters/Cluster.cpp b/src/Interpreters/Cluster.cpp
index c9c56c96cbe..48b33589087 100644
--- a/src/Interpreters/Cluster.cpp
+++ b/src/Interpreters/Cluster.cpp
@@ -5,8 +5,8 @@
 #include <Common/isLocalAddress.h>
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/parseAddress.h>
+#include <Common/Config/AbstractConfigurationComparison.h>
 #include <Core/Settings.h>
-#include <IO/HexWriteBuffer.h>
 #include <IO/WriteHelpers.h>
 #include <IO/ReadHelpers.h>
 #include <Poco/Util/AbstractConfiguration.h>
@@ -103,10 +103,14 @@ Cluster::Address::Address(
     password = config.getString(config_prefix + ".password", "");
     default_database = config.getString(config_prefix + ".default_database", "");
     secure = config.getBool(config_prefix + ".secure", false) ? Protocol::Secure::Enable : Protocol::Secure::Disable;
-    compression = config.getBool(config_prefix + ".compression", true) ? Protocol::Compression::Enable : Protocol::Compression::Disable;
     priority = config.getInt(config_prefix + ".priority", 1);
     const char * port_type = secure == Protocol::Secure::Enable ? "tcp_port_secure" : "tcp_port";
     is_local = isLocal(config.getInt(port_type, 0));
+
+    /// By default compression is disabled if address looks like localhost.
+    /// NOTE: it's still enabled when interacting with servers on different port, but we don't want to complicate the logic.
+    compression = config.getBool(config_prefix + ".compression", !is_local)
+        ? Protocol::Compression::Enable : Protocol::Compression::Disable;
 }
 
 
@@ -116,7 +120,9 @@ Cluster::Address::Address(
         const String & password_,
         UInt16 clickhouse_port,
         bool secure_,
-        Int64 priority_)
+        Int64 priority_,
+        UInt32 shard_index_,
+        UInt32 replica_index_)
     : user(user_)
     , password(password_)
 {
@@ -126,6 +132,8 @@ Cluster::Address::Address(
     secure = secure_ ? Protocol::Secure::Enable : Protocol::Secure::Disable;
     priority = priority_;
     is_local = isLocal(clickhouse_port);
+    shard_index = shard_index_;
+    replica_index = replica_index_;
 }
 
 
@@ -266,20 +274,45 @@ void Clusters::setCluster(const String & cluster_name, const std::shared_ptr<Clu
 }
 
 
-void Clusters::updateClusters(const Poco::Util::AbstractConfiguration & config, const Settings & settings, const String & config_prefix)
+void Clusters::updateClusters(const Poco::Util::AbstractConfiguration & new_config, const Settings & settings, const String & config_prefix, Poco::Util::AbstractConfiguration * old_config)
 {
-    Poco::Util::AbstractConfiguration::Keys config_keys;
-    config.keys(config_prefix, config_keys);
+    Poco::Util::AbstractConfiguration::Keys new_config_keys;
+    new_config.keys(config_prefix, new_config_keys);
+
+    /// If old config is set, we will update only clusters with updated config.
+    /// In this case, we first need to find clusters that were deleted from config.
+    Poco::Util::AbstractConfiguration::Keys deleted_keys;
+    if (old_config)
+    {
+        std::sort(new_config_keys.begin(), new_config_keys.end());
+
+        Poco::Util::AbstractConfiguration::Keys old_config_keys;
+        old_config->keys(config_prefix, old_config_keys);
+        std::sort(old_config_keys.begin(), old_config_keys.end());
+
+        std::set_difference(
+            old_config_keys.begin(), old_config_keys.end(), new_config_keys.begin(), new_config_keys.end(), std::back_inserter(deleted_keys));
+    }
 
     std::lock_guard lock(mutex);
 
-    impl.clear();
-    for (const auto & key : config_keys)
+    /// If old config is set, remove deleted clusters from impl, otherwise just clear it.
+    if (old_config)
+    {
+        for (const auto & key : deleted_keys)
+            impl.erase(key);
+    }
+    else
+        impl.clear();
+
+    for (const auto & key : new_config_keys)
     {
         if (key.find('.') != String::npos)
             throw Exception("Cluster names with dots are not supported: '" + key + "'", ErrorCodes::SYNTAX_ERROR);
 
-        impl.emplace(key, std::make_shared<Cluster>(config, settings, config_prefix, key));
+        /// If old config is set and cluster config wasn't changed, don't update this cluster.
+        if (!old_config || !isSameConfiguration(new_config, *old_config, config_prefix + "." + key))
+            impl[key] = std::make_shared<Cluster>(new_config, settings, config_prefix, key);
     }
 }
 
@@ -466,7 +499,7 @@ Cluster::Cluster(const Settings & settings, const std::vector<std::vector<String
     {
         Addresses current;
         for (const auto & replica : shard)
-            current.emplace_back(replica, username, password, clickhouse_port, secure, priority);
+            current.emplace_back(replica, username, password, clickhouse_port, secure, priority, current_shard_num, current.size() + 1);
 
         addresses_with_failover.emplace_back(current);
 
@@ -564,6 +597,7 @@ Cluster::Cluster(Cluster::ReplicasAsShardsTag, const Cluster & from, const Setti
     if (from.addresses_with_failover.empty())
         throw Exception("Cluster is empty", ErrorCodes::LOGICAL_ERROR);
 
+    UInt32 shard_num = 0;
     std::set<std::pair<String, int>> unique_hosts;
     for (size_t shard_index : ext::range(0, from.shards_info.size()))
     {
@@ -574,6 +608,8 @@ Cluster::Cluster(Cluster::ReplicasAsShardsTag, const Cluster & from, const Setti
                 continue;   /// Duplicate host, skip.
 
             ShardInfo info;
+            info.shard_num = ++shard_num;
+
             if (address.is_local)
                 info.local_addresses.push_back(address);
 
diff --git a/src/Interpreters/Cluster.h b/src/Interpreters/Cluster.h
index c64d52724e5..5976074ec7a 100644
--- a/src/Interpreters/Cluster.h
+++ b/src/Interpreters/Cluster.h
@@ -1,10 +1,12 @@
 #pragma once
 
-#include <map>
 #include <Client/ConnectionPool.h>
 #include <Client/ConnectionPoolWithFailover.h>
+
 #include <Poco/Net/SocketAddress.h>
 
+#include <map>
+
 namespace Poco
 {
     namespace Util
@@ -53,6 +55,8 @@ public:
     static Poco::Timespan saturate(const Poco::Timespan & v, const Poco::Timespan & limit);
 
 public:
+    using SlotToShard = std::vector<UInt64>;
+
     struct Address
     {
         /** In configuration file,
@@ -97,6 +101,7 @@ public:
         Int64 priority = 1;
 
         Address() = default;
+
         Address(
             const Poco::Util::AbstractConfiguration & config,
             const String & config_prefix,
@@ -104,13 +109,16 @@ public:
             const String & cluster_secret_,
             UInt32 shard_index_ = 0,
             UInt32 replica_index_ = 0);
+
         Address(
             const String & host_port_,
             const String & user_,
             const String & password_,
             UInt16 clickhouse_port,
             bool secure_ = false,
-            Int64 priority_ = 1);
+            Int64 priority_ = 1,
+            UInt32 shard_index_ = 0,
+            UInt32 replica_index_ = 0);
 
         /// Returns 'escaped_host_name:port'
         String toString() const;
@@ -226,7 +234,6 @@ public:
     bool maybeCrossReplication() const;
 
 private:
-    using SlotToShard = std::vector<UInt64>;
     SlotToShard slot_to_shard;
 
 public:
@@ -276,7 +283,7 @@ public:
     ClusterPtr getCluster(const std::string & cluster_name) const;
     void setCluster(const String & cluster_name, const ClusterPtr & cluster);
 
-    void updateClusters(const Poco::Util::AbstractConfiguration & config, const Settings & settings, const String & config_prefix);
+    void updateClusters(const Poco::Util::AbstractConfiguration & new_config, const Settings & settings, const String & config_prefix, Poco::Util::AbstractConfiguration * old_config = nullptr);
 
 public:
     using Impl = std::map<String, ClusterPtr>;
diff --git a/src/Interpreters/ClusterProxy/IStreamFactory.h b/src/Interpreters/ClusterProxy/IStreamFactory.h
index 3cf100cd85c..f66eee93e0a 100644
--- a/src/Interpreters/ClusterProxy/IStreamFactory.h
+++ b/src/Interpreters/ClusterProxy/IStreamFactory.h
@@ -8,7 +8,6 @@ namespace DB
 {
 
 struct Settings;
-class Context;
 class Cluster;
 class Throttler;
 struct SelectQueryInfo;
@@ -27,12 +26,12 @@ namespace ClusterProxy
 class IStreamFactory
 {
 public:
-    virtual ~IStreamFactory() {}
+    virtual ~IStreamFactory() = default;
 
     virtual void createForShard(
             const Cluster::ShardInfo & shard_info,
-            const String & query, const ASTPtr & query_ast,
-            const std::shared_ptr<Context> & context_ptr, const ThrottlerPtr & throttler,
+            const ASTPtr & query_ast,
+            ContextPtr context, const ThrottlerPtr & throttler,
             const SelectQueryInfo & query_info,
             std::vector<QueryPlanPtr> & res,
             Pipes & remote_pipes,
diff --git a/src/Interpreters/ClusterProxy/SelectStreamFactory.cpp b/src/Interpreters/ClusterProxy/SelectStreamFactory.cpp
index 47726e49d50..7cb55f32162 100644
--- a/src/Interpreters/ClusterProxy/SelectStreamFactory.cpp
+++ b/src/Interpreters/ClusterProxy/SelectStreamFactory.cpp
@@ -15,6 +15,8 @@
 #include <Processors/Sources/DelayedSource.h>
 #include <Processors/QueryPlan/QueryPlan.h>
 #include <Processors/QueryPlan/ExpressionStep.h>
+#include <Processors/QueryPlan/BuildQueryPipelineSettings.h>
+#include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
 
 
 namespace ProfileEvents
@@ -74,7 +76,7 @@ namespace
 std::unique_ptr<QueryPlan> createLocalPlan(
     const ASTPtr & query_ast,
     const Block & header,
-    const Context & context,
+    ContextPtr context,
     QueryProcessingStage::Enum processed_stage)
 {
     checkStackSize();
@@ -113,24 +115,22 @@ String formattedAST(const ASTPtr & ast)
 
 void SelectStreamFactory::createForShard(
     const Cluster::ShardInfo & shard_info,
-    const String &, const ASTPtr & query_ast,
-    const std::shared_ptr<Context> & context_ptr, const ThrottlerPtr & throttler,
+    const ASTPtr & query_ast,
+    ContextPtr context, const ThrottlerPtr & throttler,
     const SelectQueryInfo &,
     std::vector<QueryPlanPtr> & plans,
     Pipes & remote_pipes,
     Pipes & delayed_pipes,
     Poco::Logger * log)
 {
-    const auto & context = *context_ptr;
-
     bool add_agg_info = processed_stage == QueryProcessingStage::WithMergeableState;
     bool add_totals = false;
     bool add_extremes = false;
-    bool async_read = context_ptr->getSettingsRef().async_socket_for_remote;
+    bool async_read = context->getSettingsRef().async_socket_for_remote;
     if (processed_stage == QueryProcessingStage::Complete)
     {
         add_totals = query_ast->as<ASTSelectQuery &>().group_by_with_totals;
-        add_extremes = context.getSettingsRef().extremes;
+        add_extremes = context->getSettingsRef().extremes;
     }
 
     auto modified_query_ast = query_ast->clone();
@@ -155,10 +155,10 @@ void SelectStreamFactory::createForShard(
             remote_query_executor->setMainTable(main_table);
 
         remote_pipes.emplace_back(createRemoteSourcePipe(remote_query_executor, add_agg_info, add_totals, add_extremes, async_read));
-        remote_pipes.back().addInterpreterContext(context_ptr);
+        remote_pipes.back().addInterpreterContext(context);
     };
 
-    const auto & settings = context.getSettingsRef();
+    const auto & settings = context->getSettingsRef();
 
     if (settings.prefer_localhost_replica && shard_info.isLocal())
     {
@@ -171,7 +171,7 @@ void SelectStreamFactory::createForShard(
         }
         else
         {
-            auto resolved_id = context.resolveStorageID(main_table);
+            auto resolved_id = context->resolveStorageID(main_table);
             main_table_storage = DatabaseCatalog::instance().tryGetTable(resolved_id, context);
         }
 
@@ -248,12 +248,12 @@ void SelectStreamFactory::createForShard(
 
         auto lazily_create_stream = [
                 pool = shard_info.pool, shard_num = shard_info.shard_num, modified_query, header = header, modified_query_ast,
-                &context, context_ptr, throttler,
+                context, throttler,
                 main_table = main_table, table_func_ptr = table_func_ptr, scalars = scalars, external_tables = external_tables,
                 stage = processed_stage, local_delay, add_agg_info, add_totals, add_extremes, async_read]()
             -> Pipe
         {
-            auto current_settings = context.getSettingsRef();
+            auto current_settings = context->getSettingsRef();
             auto timeouts = ConnectionTimeouts::getTCPTimeoutsWithFailover(
                 current_settings).getSaturated(
                     current_settings.max_execution_time);
@@ -284,7 +284,9 @@ void SelectStreamFactory::createForShard(
             if (try_results.empty() || local_delay < max_remote_delay)
             {
                 auto plan = createLocalPlan(modified_query_ast, header, context, stage);
-                return QueryPipeline::getPipe(std::move(*plan->buildQueryPipeline()));
+                return QueryPipeline::getPipe(std::move(*plan->buildQueryPipeline(
+                    QueryPlanOptimizationSettings::fromContext(context),
+                    BuildQueryPipelineSettings::fromContext(context))));
             }
             else
             {
@@ -301,7 +303,7 @@ void SelectStreamFactory::createForShard(
         };
 
         delayed_pipes.emplace_back(createDelayedPipe(header, lazily_create_stream, add_totals, add_extremes));
-        delayed_pipes.back().addInterpreterContext(context_ptr);
+        delayed_pipes.back().addInterpreterContext(context);
     }
     else
         emplace_remote_stream();
diff --git a/src/Interpreters/ClusterProxy/SelectStreamFactory.h b/src/Interpreters/ClusterProxy/SelectStreamFactory.h
index 596e99b8a18..0705bcb2903 100644
--- a/src/Interpreters/ClusterProxy/SelectStreamFactory.h
+++ b/src/Interpreters/ClusterProxy/SelectStreamFactory.h
@@ -8,8 +8,6 @@
 namespace DB
 {
 
-using Scalars = std::map<String, Block>;
-
 namespace ClusterProxy
 {
 
@@ -36,8 +34,8 @@ public:
 
     void createForShard(
         const Cluster::ShardInfo & shard_info,
-        const String & query, const ASTPtr & query_ast,
-        const std::shared_ptr<Context> & context_ptr, const ThrottlerPtr & throttler,
+        const ASTPtr & query_ast,
+        ContextPtr context, const ThrottlerPtr & throttler,
         const SelectQueryInfo & query_info,
         std::vector<QueryPlanPtr> & plans,
         Pipes & remote_pipes,
diff --git a/src/Interpreters/ClusterProxy/executeQuery.cpp b/src/Interpreters/ClusterProxy/executeQuery.cpp
index 59cbae67770..5284756a4ff 100644
--- a/src/Interpreters/ClusterProxy/executeQuery.cpp
+++ b/src/Interpreters/ClusterProxy/executeQuery.cpp
@@ -5,7 +5,7 @@
 #include <Interpreters/Cluster.h>
 #include <Interpreters/IInterpreter.h>
 #include <Interpreters/ProcessList.h>
-#include <Parsers/queryToString.h>
+#include <Interpreters/OptimizeShardingKeyRewriteInVisitor.h>
 #include <Processors/Pipe.h>
 #include <Processors/QueryPlan/QueryPlan.h>
 #include <Processors/QueryPlan/ReadFromPreparedSource.h>
@@ -16,10 +16,15 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+    extern const int TOO_LARGE_DISTRIBUTED_DEPTH;
+}
+
 namespace ClusterProxy
 {
 
-std::shared_ptr<Context> updateSettingsForCluster(const Cluster & cluster, const Context & context, const Settings & settings, Poco::Logger * log)
+ContextPtr updateSettingsForCluster(const Cluster & cluster, ContextPtr context, const Settings & settings, Poco::Logger * log)
 {
     Settings new_settings = settings;
     new_settings.queue_max_wait_ms = Cluster::saturate(new_settings.queue_max_wait_ms, settings.max_execution_time);
@@ -78,7 +83,7 @@ std::shared_ptr<Context> updateSettingsForCluster(const Cluster & cluster, const
         }
     }
 
-    auto new_context = std::make_shared<Context>(context);
+    auto new_context = Context::createCopy(context);
     new_context->setSettings(new_settings);
     return new_context;
 }
@@ -86,22 +91,28 @@ std::shared_ptr<Context> updateSettingsForCluster(const Cluster & cluster, const
 void executeQuery(
     QueryPlan & query_plan,
     IStreamFactory & stream_factory, Poco::Logger * log,
-    const ASTPtr & query_ast, const Context & context, const SelectQueryInfo & query_info)
+    const ASTPtr & query_ast, ContextPtr context, const SelectQueryInfo & query_info,
+    const ExpressionActionsPtr & sharding_key_expr,
+    const std::string & sharding_key_column_name,
+    const ClusterPtr & not_optimized_cluster)
 {
     assert(log);
 
-    const Settings & settings = context.getSettingsRef();
+    const Settings & settings = context->getSettingsRef();
+
+    if (settings.max_distributed_depth && context->getClientInfo().distributed_depth > settings.max_distributed_depth)
+        throw Exception("Maximum distributed depth exceeded", ErrorCodes::TOO_LARGE_DISTRIBUTED_DEPTH);
 
     std::vector<QueryPlanPtr> plans;
     Pipes remote_pipes;
     Pipes delayed_pipes;
 
-    const std::string query = queryToString(query_ast);
+    auto new_context = updateSettingsForCluster(*query_info.getCluster(), context, settings, log);
 
-    auto new_context = updateSettingsForCluster(*query_info.cluster, context, settings, log);
+    new_context->getClientInfo().distributed_depth += 1;
 
     ThrottlerPtr user_level_throttler;
-    if (auto * process_list_element = context.getProcessListElement())
+    if (auto * process_list_element = context->getProcessListElement())
         user_level_throttler = process_list_element->getUserNetworkThrottler();
 
     /// Network bandwidth limit, if needed.
@@ -117,9 +128,28 @@ void executeQuery(
     else
         throttler = user_level_throttler;
 
-    for (const auto & shard_info : query_info.cluster->getShardsInfo())
+    size_t shards = query_info.getCluster()->getShardCount();
+    for (const auto & shard_info : query_info.getCluster()->getShardsInfo())
     {
-        stream_factory.createForShard(shard_info, query, query_ast,
+        ASTPtr query_ast_for_shard;
+        if (query_info.optimized_cluster && settings.optimize_skip_unused_shards_rewrite_in && shards > 1)
+        {
+            query_ast_for_shard = query_ast->clone();
+
+            OptimizeShardingKeyRewriteInVisitor::Data visitor_data{
+                sharding_key_expr,
+                sharding_key_column_name,
+                shard_info,
+                not_optimized_cluster->getSlotToShard(),
+            };
+            OptimizeShardingKeyRewriteInVisitor visitor(visitor_data);
+            visitor.visit(query_ast_for_shard);
+        }
+        else
+            query_ast_for_shard = query_ast;
+
+        stream_factory.createForShard(shard_info,
+            query_ast_for_shard,
             new_context, throttler, query_info, plans,
             remote_pipes, delayed_pipes, log);
     }
@@ -156,8 +186,7 @@ void executeQuery(
     for (auto & plan : plans)
         input_streams.emplace_back(plan->getCurrentDataStream());
 
-    auto header = input_streams.front().header;
-    auto union_step = std::make_unique<UnionStep>(std::move(input_streams), header);
+    auto union_step = std::make_unique<UnionStep>(std::move(input_streams));
     query_plan.unitePlans(std::move(union_step), std::move(plans));
 }
 
diff --git a/src/Interpreters/ClusterProxy/executeQuery.h b/src/Interpreters/ClusterProxy/executeQuery.h
index 8840b82d5b2..46525335803 100644
--- a/src/Interpreters/ClusterProxy/executeQuery.h
+++ b/src/Interpreters/ClusterProxy/executeQuery.h
@@ -1,18 +1,22 @@
 #pragma once
 
+#include <Interpreters/Context_fwd.h>
 #include <Parsers/IAST.h>
 
 namespace DB
 {
 
 struct Settings;
-class Context;
 class Cluster;
+using ClusterPtr = std::shared_ptr<Cluster>;
 struct SelectQueryInfo;
 
 class Pipe;
 class QueryPlan;
 
+class ExpressionActions;
+using ExpressionActionsPtr = std::shared_ptr<ExpressionActions>;
+
 namespace ClusterProxy
 {
 
@@ -27,7 +31,7 @@ class IStreamFactory;
 ///   - optimize_skip_unused_shards_nesting
 ///
 /// @return new Context with adjusted settings
-std::shared_ptr<Context> updateSettingsForCluster(const Cluster & cluster, const Context & context, const Settings & settings, Poco::Logger * log = nullptr);
+ContextPtr updateSettingsForCluster(const Cluster & cluster, ContextPtr context, const Settings & settings, Poco::Logger * log = nullptr);
 
 /// Execute a distributed query, creating a vector of BlockInputStreams, from which the result can be read.
 /// `stream_factory` object encapsulates the logic of creating streams for a different type of query
@@ -35,7 +39,10 @@ std::shared_ptr<Context> updateSettingsForCluster(const Cluster & cluster, const
 void executeQuery(
     QueryPlan & query_plan,
     IStreamFactory & stream_factory, Poco::Logger * log,
-    const ASTPtr & query_ast, const Context & context, const SelectQueryInfo & query_info);
+    const ASTPtr & query_ast, ContextPtr context, const SelectQueryInfo & query_info,
+    const ExpressionActionsPtr & sharding_key_expr,
+    const std::string & sharding_key_column_name,
+    const ClusterPtr & not_optimized_cluster);
 
 }
 
diff --git a/src/Interpreters/CollectJoinOnKeysVisitor.cpp b/src/Interpreters/CollectJoinOnKeysVisitor.cpp
index a0ea27e9905..3b3fdaa65cb 100644
--- a/src/Interpreters/CollectJoinOnKeysVisitor.cpp
+++ b/src/Interpreters/CollectJoinOnKeysVisitor.cpp
@@ -16,26 +16,6 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
-namespace
-{
-
-void addAndTerm(ASTPtr & ast, const ASTPtr & term)
-{
-    if (!ast)
-        ast = term;
-    else
-        ast = makeASTFunction("and", ast, term);
-}
-
-/// If this is an inner join and the expression related to less than 2 tables, then move it to WHERE
-bool canMoveToWhere(std::pair<size_t, size_t> table_numbers, ASTTableJoin::Kind kind)
-{
-    return kind == ASTTableJoin::Kind::Inner &&
-        (table_numbers.first == table_numbers.second || table_numbers.first == 0 || table_numbers.second == 0);
-}
-
-}
-
 void CollectJoinOnKeysMatcher::Data::addJoinKeys(const ASTPtr & left_ast, const ASTPtr & right_ast,
                                                  const std::pair<size_t, size_t> & table_no)
 {
@@ -49,8 +29,7 @@ void CollectJoinOnKeysMatcher::Data::addJoinKeys(const ASTPtr & left_ast, const
     else
         throw Exception("Cannot detect left and right JOIN keys. JOIN ON section is ambiguous.",
                         ErrorCodes::AMBIGUOUS_COLUMN_NAME);
-    if (table_no.first != table_no.second && table_no.first > 0 && table_no.second > 0)
-        has_some = true;
+    has_some = true;
 }
 
 void CollectJoinOnKeysMatcher::Data::addAsofJoinKeys(const ASTPtr & left_ast, const ASTPtr & right_ast,
@@ -99,45 +78,22 @@ void CollectJoinOnKeysMatcher::visit(const ASTFunction & func, const ASTPtr & as
     {
         ASTPtr left = func.arguments->children.at(0);
         ASTPtr right = func.arguments->children.at(1);
-        auto table_numbers = getTableNumbers(left, right, data);
-
-        if (canMoveToWhere(table_numbers, data.kind))
-        {
-            addAndTerm(data.new_where_conditions, ast);
-        }
-        else
-        {
-            if (data.kind == ASTTableJoin::Kind::Inner)
-            {
-                addAndTerm(data.new_on_expression, ast);
-            }
-            data.addJoinKeys(left, right, table_numbers);
-        }
+        auto table_numbers = getTableNumbers(ast, left, right, data);
+        data.addJoinKeys(left, right, table_numbers);
     }
-    else if (inequality != ASOF::Inequality::None && !data.is_asof)
+    else if (inequality != ASOF::Inequality::None)
     {
-        ASTPtr left = func.arguments->children.at(0);
-        ASTPtr right = func.arguments->children.at(1);
-        auto table_numbers = getTableNumbers(left, right, data);
-        if (canMoveToWhere(table_numbers, data.kind))
-        {
-            addAndTerm(data.new_where_conditions, ast);
-        }
-        else
-        {
+        if (!data.is_asof)
             throw Exception("JOIN ON inequalities are not supported. Unexpected '" + queryToString(ast) + "'",
-                ErrorCodes::NOT_IMPLEMENTED);
-        }
-    }
-    else if (inequality != ASOF::Inequality::None && data.is_asof)
-    {
+                            ErrorCodes::NOT_IMPLEMENTED);
+
         if (data.asof_left_key || data.asof_right_key)
             throw Exception("ASOF JOIN expects exactly one inequality in ON section. Unexpected '" + queryToString(ast) + "'",
-                ErrorCodes::INVALID_JOIN_ON_EXPRESSION);
+                            ErrorCodes::INVALID_JOIN_ON_EXPRESSION);
 
         ASTPtr left = func.arguments->children.at(0);
         ASTPtr right = func.arguments->children.at(1);
-        auto table_numbers = getTableNumbers(left, right, data);
+        auto table_numbers = getTableNumbers(ast, left, right, data);
 
         data.addAsofJoinKeys(left, right, table_numbers, inequality);
     }
@@ -162,8 +118,7 @@ void CollectJoinOnKeysMatcher::getIdentifiers(const ASTPtr & ast, std::vector<co
         getIdentifiers(child, out);
 }
 
-
-std::pair<size_t, size_t> CollectJoinOnKeysMatcher::getTableNumbers(const ASTPtr & left_ast, const ASTPtr & right_ast,
+std::pair<size_t, size_t> CollectJoinOnKeysMatcher::getTableNumbers(const ASTPtr & expr, const ASTPtr & left_ast, const ASTPtr & right_ast,
                                                                     Data & data)
 {
     std::vector<const ASTIdentifier *> left_identifiers;
@@ -172,13 +127,23 @@ std::pair<size_t, size_t> CollectJoinOnKeysMatcher::getTableNumbers(const ASTPtr
     getIdentifiers(left_ast, left_identifiers);
     getIdentifiers(right_ast, right_identifiers);
 
-    size_t left_idents_table = 0;
-    size_t right_idents_table = 0;
+    if (left_identifiers.empty() || right_identifiers.empty())
+    {
+        throw Exception("Not equi-join ON expression: " + queryToString(expr) + ". No columns in one of equality side.",
+                        ErrorCodes::INVALID_JOIN_ON_EXPRESSION);
+    }
 
-    if (!left_identifiers.empty())
-        left_idents_table = getTableForIdentifiers(left_identifiers, data);
-    if (!right_identifiers.empty())
-        right_idents_table = getTableForIdentifiers(right_identifiers, data);
+    size_t left_idents_table = getTableForIdentifiers(left_identifiers, data);
+    size_t right_idents_table = getTableForIdentifiers(right_identifiers, data);
+
+    if (left_idents_table && left_idents_table == right_idents_table)
+    {
+        auto left_name = queryToString(*left_identifiers[0]);
+        auto right_name = queryToString(*right_identifiers[0]);
+
+        throw Exception("In expression " + queryToString(expr) + " columns " + left_name + " and " + right_name
+            + " are from the same table but from different arguments of equal function", ErrorCodes::INVALID_JOIN_ON_EXPRESSION);
+    }
 
     return std::make_pair(left_idents_table, right_idents_table);
 }
diff --git a/src/Interpreters/CollectJoinOnKeysVisitor.h b/src/Interpreters/CollectJoinOnKeysVisitor.h
index aa2fd80d07c..54e008a114e 100644
--- a/src/Interpreters/CollectJoinOnKeysVisitor.h
+++ b/src/Interpreters/CollectJoinOnKeysVisitor.h
@@ -5,7 +5,6 @@
 #include <Interpreters/InDepthNodeVisitor.h>
 #include <Interpreters/DatabaseAndTableWithAlias.h>
 #include <Interpreters/Aliases.h>
-#include <Parsers/ASTTablesInSelectQuery.h>
 
 
 namespace DB
@@ -31,11 +30,8 @@ public:
         const TableWithColumnNamesAndTypes & right_table;
         const Aliases & aliases;
         const bool is_asof{false};
-        ASTTableJoin::Kind kind;
         ASTPtr asof_left_key{};
         ASTPtr asof_right_key{};
-        ASTPtr new_on_expression{};
-        ASTPtr new_where_conditions{};
         bool has_some{false};
 
         void addJoinKeys(const ASTPtr & left_ast, const ASTPtr & right_ast, const std::pair<size_t, size_t> & table_no);
@@ -61,7 +57,7 @@ private:
     static void visit(const ASTFunction & func, const ASTPtr & ast, Data & data);
 
     static void getIdentifiers(const ASTPtr & ast, std::vector<const ASTIdentifier *> & out);
-    static std::pair<size_t, size_t> getTableNumbers(const ASTPtr & left_ast, const ASTPtr & right_ast, Data & data);
+    static std::pair<size_t, size_t> getTableNumbers(const ASTPtr & expr, const ASTPtr & left_ast, const ASTPtr & right_ast, Data & data);
     static const ASTIdentifier * unrollAliases(const ASTIdentifier * identifier, const Aliases & aliases);
     static size_t getTableForIdentifiers(std::vector<const ASTIdentifier *> & identifiers, const Data & data);
 };
diff --git a/src/Interpreters/ColumnAliasesVisitor.h b/src/Interpreters/ColumnAliasesVisitor.h
index 2cd9ad796cd..a1f8e79f64c 100644
--- a/src/Interpreters/ColumnAliasesVisitor.h
+++ b/src/Interpreters/ColumnAliasesVisitor.h
@@ -56,12 +56,12 @@ public:
         /// Do not analyze joined columns.
         /// They may have aliases and come to description as is.
         const NameSet & forbidden_columns;
-        const Context & context;
+        ContextPtr context;
 
         /// private_aliases are from lambda, so these are local names.
         NameSet private_aliases;
 
-        Data(const ColumnsDescription & columns_, const NameSet & forbidden_columns_, const Context & context_)
+        Data(const ColumnsDescription & columns_, const NameSet & forbidden_columns_, ContextPtr context_)
         : columns(columns_)
         , forbidden_columns(forbidden_columns_)
         , context(context_)
diff --git a/src/Interpreters/Context.cpp b/src/Interpreters/Context.cpp
index 98e4a87fba3..8c0d8f9d48b 100644
--- a/src/Interpreters/Context.cpp
+++ b/src/Interpreters/Context.cpp
@@ -12,7 +12,7 @@
 #include <Common/Stopwatch.h>
 #include <Common/formatReadable.h>
 #include <Common/thread_local_rng.h>
-#include <Coordination/NuKeeperStorageDispatcher.h>
+#include <Coordination/KeeperStorageDispatcher.h>
 #include <Compression/ICompressionCodec.h>
 #include <Core/BackgroundSchedulePool.h>
 #include <Formats/FormatFactory.h>
@@ -29,15 +29,20 @@
 #include <Disks/DiskLocal.h>
 #include <TableFunctions/TableFunctionFactory.h>
 #include <Interpreters/ActionLocksManager.h>
+#include <Interpreters/ExternalLoaderXMLConfigRepository.h>
 #include <Core/Settings.h>
+#include <Core/SettingsQuirks.h>
 #include <Access/AccessControlManager.h>
 #include <Access/ContextAccess.h>
 #include <Access/EnabledRolesInfo.h>
 #include <Access/EnabledRowPolicies.h>
 #include <Access/QuotaUsage.h>
 #include <Access/User.h>
+#include <Access/Credentials.h>
 #include <Access/SettingsProfile.h>
 #include <Access/SettingsConstraints.h>
+#include <Access/ExternalAuthenticators.h>
+#include <Access/GSSAcceptor.h>
 #include <Interpreters/ExpressionJIT.h>
 #include <Dictionaries/Embedded/GeoDictionariesLoader.h>
 #include <Interpreters/EmbeddedDictionaries.h>
@@ -45,18 +50,22 @@
 #include <Interpreters/ExternalModelsLoader.h>
 #include <Interpreters/ExpressionActions.h>
 #include <Interpreters/ProcessList.h>
+#include <Interpreters/InterserverCredentials.h>
 #include <Interpreters/Cluster.h>
 #include <Interpreters/InterserverIOHandler.h>
 #include <Interpreters/SystemLog.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/DDLWorker.h>
+#include <Interpreters/DDLTask.h>
 #include <IO/ReadBufferFromFile.h>
 #include <IO/UncompressedCache.h>
+#include <IO/MMappedFileCache.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <Parsers/ParserCreateQuery.h>
 #include <Parsers/parseQuery.h>
 #include <Common/StackTrace.h>
 #include <Common/Config/ConfigProcessor.h>
+#include <Common/Config/AbstractConfigurationComparison.h>
 #include <Common/ZooKeeper/ZooKeeper.h>
 #include <Common/ShellCommand.h>
 #include <Common/TraceCollector.h>
@@ -131,13 +140,13 @@ public:
     /// Find existing session or create a new.
     std::shared_ptr<NamedSession> acquireSession(
         const String & session_id,
-        Context & context,
+        ContextPtr context,
         std::chrono::steady_clock::duration timeout,
         bool throw_if_not_found)
     {
         std::unique_lock lock(mutex);
 
-        auto & user_name = context.client_info.current_user;
+        auto & user_name = context->client_info.current_user;
 
         if (user_name.empty())
             throw Exception("Empty user name.", ErrorCodes::LOGICAL_ERROR);
@@ -153,7 +162,7 @@ public:
             /// Create a new session from current context.
             it = sessions.insert(std::make_pair(key, std::make_shared<NamedSession>(key, context, timeout, *this))).first;
         }
-        else if (it->second->key.first != context.client_info.current_user)
+        else if (it->second->key.first != context->client_info.current_user)
         {
             throw Exception("Session belongs to a different user", ErrorCodes::SESSION_IS_LOCKED);
         }
@@ -164,7 +173,7 @@ public:
         if (!session.unique())
             throw Exception("Session is locked by a concurrent client.", ErrorCodes::SESSION_IS_LOCKED);
 
-        session->context.client_info = context.client_info;
+        session->context->client_info = context->client_info;
 
         return session;
     }
@@ -217,7 +226,6 @@ private:
     void cleanThread()
     {
         setThreadName("SessionCleaner");
-
         std::unique_lock lock{mutex};
 
         while (true)
@@ -285,7 +293,7 @@ void NamedSession::release()
 /** Set of known objects (environment), that could be used in query.
   * Shared (global) part. Order of members (especially, order of destruction) is very important.
   */
-struct ContextShared
+struct ContextSharedPart
 {
     Poco::Logger * log = &Poco::Logger::get("Context");
 
@@ -307,7 +315,7 @@ struct ContextShared
 
 #if USE_NURAFT
     mutable std::mutex nu_keeper_storage_dispatcher_mutex;
-    mutable std::shared_ptr<NuKeeperStorageDispatcher> nu_keeper_storage_dispatcher;
+    mutable std::shared_ptr<KeeperStorageDispatcher> nu_keeper_storage_dispatcher;
 #endif
     mutable std::mutex auxiliary_zookeepers_mutex;
     mutable std::map<String, zkutil::ZooKeeperPtr> auxiliary_zookeepers;    /// Map for auxiliary ZooKeeper clients.
@@ -315,9 +323,8 @@ struct ContextShared
 
     String interserver_io_host;                             /// The host name by which this server is available for other servers.
     UInt16 interserver_io_port = 0;                         /// and port.
-    String interserver_io_user;
-    String interserver_io_password;
     String interserver_scheme;                              /// http or https
+    MultiVersion<InterserverCredentials> interserver_io_credentials;
 
     String path;                                            /// Path to the data directory, with a slash at the end.
     String flags_path;                                      /// Path to the directory with some control flags for server maintenance.
@@ -331,12 +338,16 @@ struct ContextShared
     mutable std::optional<EmbeddedDictionaries> embedded_dictionaries;    /// Metrica's dictionaries. Have lazy initialization.
     mutable std::optional<ExternalDictionariesLoader> external_dictionaries_loader;
     mutable std::optional<ExternalModelsLoader> external_models_loader;
+    ConfigurationPtr external_models_config;
+    ext::scope_guard models_repository_guard;
+
     String default_profile_name;                            /// Default profile name used for default values.
     String system_profile_name;                             /// Profile used by system processes
     String buffer_profile_name;                             /// Profile used by Buffer engine for flushing to the underlying
     AccessControlManager access_control_manager;
     mutable UncompressedCachePtr uncompressed_cache;        /// The cache of decompressed blocks.
     mutable MarkCachePtr mark_cache;                        /// Cache of marks in compressed files.
+    mutable MMappedFileCachePtr mmap_cache; /// Cache of mmapped files to avoid frequent open/map/unmap/close and to reuse from several threads.
     ProcessList process_list;                               /// Executing queries at the moment.
     MergeList merge_list;                                   /// The list of executable merge (for (Replicated)?MergeTree)
     ReplicatedFetchList replicated_fetch_list;
@@ -362,7 +373,7 @@ struct ContextShared
     std::atomic_size_t max_partition_size_to_drop = 50000000000lu; /// Protects MergeTree partitions from accidental DROP (50GB by default)
     String format_schema_path;                              /// Path to a directory that contains schema files used by input formats.
     ActionLocksManagerPtr action_locks_manager;             /// Set of storages' action lockers
-    std::optional<SystemLogs> system_logs;                  /// Used to log queries and operations on parts
+    std::unique_ptr<SystemLogs> system_logs;                /// Used to log queries and operations on parts
     std::optional<StorageS3Settings> storage_s3_settings;   /// Settings of S3 storage
 
     RemoteHostFilter remote_host_filter; /// Allowed URL from config.xml
@@ -376,10 +387,6 @@ struct ContextShared
     ConfigurationPtr clusters_config;                        /// Stores updated configs
     mutable std::mutex clusters_mutex;                       /// Guards clusters and clusters_config
 
-#if USE_EMBEDDED_COMPILER
-    std::shared_ptr<CompiledExpressionCache> compiled_expression_cache;
-#endif
-
     bool shutdown_called = false;
 
     Stopwatch uptime_watch;
@@ -391,7 +398,7 @@ struct ContextShared
 
     Context::ConfigReloadCallback config_reload_callback;
 
-    ContextShared()
+    ContextSharedPart()
         : macros(std::make_unique<Macros>())
     {
         /// TODO: make it singleton (?)
@@ -405,7 +412,7 @@ struct ContextShared
     }
 
 
-    ~ContextShared()
+    ~ContextSharedPart()
     {
         try
         {
@@ -435,24 +442,32 @@ struct ContextShared
 
         DatabaseCatalog::shutdown();
 
-        /// Preemptive destruction is important, because these objects may have a refcount to ContextShared (cyclic reference).
-        /// TODO: Get rid of this.
+        std::unique_ptr<SystemLogs> delete_system_logs;
+        {
+            auto lock = std::lock_guard(mutex);
 
-        system_logs.reset();
-        embedded_dictionaries.reset();
-        external_dictionaries_loader.reset();
-        external_models_loader.reset();
-        buffer_flush_schedule_pool.reset();
-        schedule_pool.reset();
-        distributed_schedule_pool.reset();
-        message_broker_schedule_pool.reset();
-        ddl_worker.reset();
+            /// Preemptive destruction is important, because these objects may have a refcount to ContextShared (cyclic reference).
+            /// TODO: Get rid of this.
 
-        /// Stop trace collector if any
-        trace_collector.reset();
-        /// Stop zookeeper connection
-        zookeeper.reset();
+            delete_system_logs = std::move(system_logs);
+            embedded_dictionaries.reset();
+            external_dictionaries_loader.reset();
+            models_repository_guard.reset();
+            external_models_loader.reset();
+            buffer_flush_schedule_pool.reset();
+            schedule_pool.reset();
+            distributed_schedule_pool.reset();
+            message_broker_schedule_pool.reset();
+            ddl_worker.reset();
 
+            /// Stop trace collector if any
+            trace_collector.reset();
+            /// Stop zookeeper connection
+            zookeeper.reset();
+        }
+
+        /// Can be removed w/o context lock
+        delete_system_logs.reset();
     }
 
     bool hasTraceCollector() const
@@ -480,27 +495,48 @@ SharedContextHolder::SharedContextHolder(SharedContextHolder &&) noexcept = defa
 SharedContextHolder & SharedContextHolder::operator=(SharedContextHolder &&) = default;
 SharedContextHolder::SharedContextHolder() = default;
 SharedContextHolder::~SharedContextHolder() = default;
-SharedContextHolder::SharedContextHolder(std::unique_ptr<ContextShared> shared_context)
+SharedContextHolder::SharedContextHolder(std::unique_ptr<ContextSharedPart> shared_context)
     : shared(std::move(shared_context)) {}
 
 void SharedContextHolder::reset() { shared.reset(); }
 
-
-Context Context::createGlobal(ContextShared * shared)
+ContextPtr Context::createGlobal(ContextSharedPart * shared)
 {
-    Context res;
-    res.shared = shared;
+    auto res = std::shared_ptr<Context>(new Context);
+    res->shared = shared;
     return res;
 }
 
 void Context::initGlobal()
 {
-    DatabaseCatalog::init(*this);
+    DatabaseCatalog::init(shared_from_this());
 }
 
 SharedContextHolder Context::createShared()
 {
-    return SharedContextHolder(std::make_unique<ContextShared>());
+    return SharedContextHolder(std::make_unique<ContextSharedPart>());
+}
+
+ContextPtr Context::createCopy(const ContextConstPtr & other)
+{
+    return std::shared_ptr<Context>(new Context(*other));
+}
+
+ContextPtr Context::createCopy(const ContextWeakConstPtr & other)
+{
+    auto ptr = other.lock();
+    if (!ptr) throw Exception("Can't copy an expired context", ErrorCodes::LOGICAL_ERROR);
+    return createCopy(ptr);
+}
+
+ContextPtr Context::createCopy(const ContextPtr & other)
+{
+    return createCopy(std::const_pointer_cast<const Context>(other));
+}
+
+void Context::copyFrom(const ContextPtr & other)
+{
+    *this = *other;
 }
 
 Context::~Context() = default;
@@ -528,12 +564,13 @@ void Context::enableNamedSessions()
     shared->named_sessions.emplace();
 }
 
-std::shared_ptr<NamedSession> Context::acquireNamedSession(const String & session_id, std::chrono::steady_clock::duration timeout, bool session_check)
+std::shared_ptr<NamedSession>
+Context::acquireNamedSession(const String & session_id, std::chrono::steady_clock::duration timeout, bool session_check)
 {
     if (!shared->named_sessions)
         throw Exception("Support for named sessions is not enabled", ErrorCodes::NOT_IMPLEMENTED);
 
-    return shared->named_sessions->acquireSession(session_id, *this, timeout, session_check);
+    return shared->named_sessions->acquireSession(session_id, shared_from_this(), timeout, session_check);
 }
 
 String Context::resolveDatabase(const String & database_name) const
@@ -669,6 +706,12 @@ void Context::setExternalAuthenticatorsConfig(const Poco::Util::AbstractConfigur
     shared->access_control_manager.setExternalAuthenticatorsConfig(config);
 }
 
+std::unique_ptr<GSSAcceptorContext> Context::makeGSSAcceptorContext() const
+{
+    auto lock = getLock();
+    return std::make_unique<GSSAcceptorContext>(shared->access_control_manager.getExternalAuthenticators().getKerberosParams());
+}
+
 void Context::setUsersConfig(const ConfigurationPtr & config)
 {
     auto lock = getLock();
@@ -683,29 +726,22 @@ ConfigurationPtr Context::getUsersConfig()
 }
 
 
-void Context::setUserImpl(const String & name, const std::optional<String> & password, const Poco::Net::SocketAddress & address)
+void Context::setUser(const Credentials & credentials, const Poco::Net::SocketAddress & address)
 {
     auto lock = getLock();
 
-    client_info.current_user = name;
+    client_info.current_user = credentials.getUserName();
     client_info.current_address = address;
 
 #if defined(ARCADIA_BUILD)
     /// This is harmful field that is used only in foreign "Arcadia" build.
-    client_info.current_password = password.value_or("");
+    client_info.current_password.clear();
+    if (const auto * basic_credentials = dynamic_cast<const BasicCredentials *>(&credentials))
+        client_info.current_password = basic_credentials->getPassword();
 #endif
 
-    /// Find a user with such name and check the password.
-    UUID new_user_id;
-    if (password)
-        new_user_id = getAccessControlManager().login(name, *password, address.host());
-    else
-    {
-        /// Access w/o password is done under interserver-secret (remote_servers.secret)
-        /// So it is okay not to check client's host in this case (since there is trust).
-        new_user_id = getAccessControlManager().getIDOfLoggedUser(name);
-    }
-
+    /// Find a user with such name and check the credentials.
+    auto new_user_id = getAccessControlManager().login(credentials, address.host());
     auto new_access = getAccessControlManager().getContextAccess(
         new_user_id, /* current_roles = */ {}, /* use_default_roles = */ true,
         settings, current_database, client_info);
@@ -720,12 +756,12 @@ void Context::setUserImpl(const String & name, const std::optional<String> & pas
 
 void Context::setUser(const String & name, const String & password, const Poco::Net::SocketAddress & address)
 {
-    setUserImpl(name, password, address);
+    setUser(BasicCredentials(name, password), address);
 }
 
 void Context::setUserWithoutCheckingPassword(const String & name, const Poco::Net::SocketAddress & address)
 {
-    setUserImpl(name, {} /* no password */, address);
+    setUser(AlwaysAllowCredentials(name), address);
 }
 
 std::shared_ptr<const User> Context::getUser() const
@@ -751,7 +787,7 @@ std::optional<UUID> Context::getUserID() const
 }
 
 
-void Context::setCurrentRoles(const boost::container::flat_set<UUID> & current_roles_)
+void Context::setCurrentRoles(const std::vector<UUID> & current_roles_)
 {
     auto lock = getLock();
     if (current_roles == current_roles_ && !use_default_roles)
@@ -887,21 +923,23 @@ const Block & Context::getScalar(const String & name) const
 
 Tables Context::getExternalTables() const
 {
-    assert(global_context != this || getApplicationType() == ApplicationType::LOCAL);
+    assert(!isGlobalContext() || getApplicationType() == ApplicationType::LOCAL);
     auto lock = getLock();
 
     Tables res;
     for (const auto & table : external_tables_mapping)
         res[table.first] = table.second->getTable();
 
-    if (query_context && query_context != this)
+    auto query_context_ptr = query_context.lock();
+    auto session_context_ptr = session_context.lock();
+    if (query_context_ptr && query_context_ptr.get() != this)
     {
-        Tables buf = query_context->getExternalTables();
+        Tables buf = query_context_ptr->getExternalTables();
         res.insert(buf.begin(), buf.end());
     }
-    else if (session_context && session_context != this)
+    else if (session_context_ptr && session_context_ptr.get() != this)
     {
-        Tables buf = session_context->getExternalTables();
+        Tables buf = session_context_ptr->getExternalTables();
         res.insert(buf.begin(), buf.end());
     }
     return res;
@@ -910,7 +948,7 @@ Tables Context::getExternalTables() const
 
 void Context::addExternalTable(const String & table_name, TemporaryTableHolder && temporary_table)
 {
-    assert(global_context != this || getApplicationType() == ApplicationType::LOCAL);
+    assert(!isGlobalContext() || getApplicationType() == ApplicationType::LOCAL);
     auto lock = getLock();
     if (external_tables_mapping.end() != external_tables_mapping.find(table_name))
         throw Exception("Temporary table " + backQuoteIfNeed(table_name) + " already exists.", ErrorCodes::TABLE_ALREADY_EXISTS);
@@ -920,7 +958,7 @@ void Context::addExternalTable(const String & table_name, TemporaryTableHolder &
 
 std::shared_ptr<TemporaryTableHolder> Context::removeExternalTable(const String & table_name)
 {
-    assert(global_context != this || getApplicationType() == ApplicationType::LOCAL);
+    assert(!isGlobalContext() || getApplicationType() == ApplicationType::LOCAL);
     std::shared_ptr<TemporaryTableHolder> holder;
     {
         auto lock = getLock();
@@ -936,21 +974,21 @@ std::shared_ptr<TemporaryTableHolder> Context::removeExternalTable(const String
 
 void Context::addScalar(const String & name, const Block & block)
 {
-    assert(global_context != this || getApplicationType() == ApplicationType::LOCAL);
+    assert(!isGlobalContext() || getApplicationType() == ApplicationType::LOCAL);
     scalars[name] = block;
 }
 
 
 bool Context::hasScalar(const String & name) const
 {
-    assert(global_context != this || getApplicationType() == ApplicationType::LOCAL);
+    assert(!isGlobalContext() || getApplicationType() == ApplicationType::LOCAL);
     return scalars.count(name);
 }
 
 
 void Context::addQueryAccessInfo(const String & quoted_database_name, const String & full_quoted_table_name, const Names & column_names)
 {
-    assert(global_context != this || getApplicationType() == ApplicationType::LOCAL);
+    assert(!isGlobalContext() || getApplicationType() == ApplicationType::LOCAL);
     std::lock_guard<std::mutex> lock(query_access_info.mutex);
     query_access_info.databases.emplace(quoted_database_name);
     query_access_info.tables.emplace(full_quoted_table_name);
@@ -961,7 +999,7 @@ void Context::addQueryAccessInfo(const String & quoted_database_name, const Stri
 
 void Context::addQueryFactoriesInfo(QueryLogFactories factory_type, const String & created_object) const
 {
-    assert(global_context != this || getApplicationType() == ApplicationType::LOCAL);
+    assert(!isGlobalContext() || getApplicationType() == ApplicationType::LOCAL);
     auto lock = getLock();
 
     switch (factory_type)
@@ -1006,10 +1044,10 @@ StoragePtr Context::executeTableFunction(const ASTPtr & table_expression)
 
     if (!res)
     {
-        TableFunctionPtr table_function_ptr = TableFunctionFactory::instance().get(table_expression, *this);
+        TableFunctionPtr table_function_ptr = TableFunctionFactory::instance().get(table_expression, shared_from_this());
 
         /// Run it and remember the result
-        res = table_function_ptr->execute(table_expression, *this, table_function_ptr->getName());
+        res = table_function_ptr->execute(table_expression, shared_from_this(), table_function_ptr->getName());
     }
 
     return res;
@@ -1101,6 +1139,7 @@ void Context::applySettingsChanges(const SettingsChanges & changes)
     auto lock = getLock();
     for (const SettingChange & change : changes)
         applySettingChange(change);
+    applySettingsQuirks(settings);
 }
 
 
@@ -1149,7 +1188,7 @@ String Context::getInitialQueryId() const
 
 void Context::setCurrentDatabaseNameInGlobalContext(const String & name)
 {
-    if (global_context != this)
+    if (!isGlobalContext())
         throw Exception("Cannot set current database for non global context, this method should be used during server initialization",
                         ErrorCodes::LOGICAL_ERROR);
     auto lock = getLock();
@@ -1258,53 +1297,37 @@ void Context::setMacros(std::unique_ptr<Macros> && macros)
     shared->macros.set(std::move(macros));
 }
 
-const Context & Context::getQueryContext() const
+ContextPtr Context::getQueryContext() const
 {
-    if (!query_context)
-        throw Exception("There is no query", ErrorCodes::THERE_IS_NO_QUERY);
-    return *query_context;
+    auto ptr = query_context.lock();
+    if (!ptr) throw Exception("There is no query or query context has expired", ErrorCodes::THERE_IS_NO_QUERY);
+    return ptr;
 }
 
-Context & Context::getQueryContext()
+bool Context::isInternalSubquery() const
 {
-    if (!query_context)
-        throw Exception("There is no query", ErrorCodes::THERE_IS_NO_QUERY);
-    return *query_context;
+    auto ptr = query_context.lock();
+    return ptr && ptr.get() != this;
 }
 
-const Context & Context::getSessionContext() const
+ContextPtr Context::getSessionContext() const
 {
-    if (!session_context)
-        throw Exception("There is no session", ErrorCodes::THERE_IS_NO_SESSION);
-    return *session_context;
+    auto ptr = session_context.lock();
+    if (!ptr) throw Exception("There is no session or session context has expired", ErrorCodes::THERE_IS_NO_SESSION);
+    return ptr;
 }
 
-Context & Context::getSessionContext()
+ContextPtr Context::getGlobalContext() const
 {
-    if (!session_context)
-        throw Exception("There is no session", ErrorCodes::THERE_IS_NO_SESSION);
-    return *session_context;
+    auto ptr = global_context.lock();
+    if (!ptr) throw Exception("There is no global context or global context has expired", ErrorCodes::LOGICAL_ERROR);
+    return ptr;
 }
 
-const Context & Context::getGlobalContext() const
+ContextPtr Context::getBufferContext() const
 {
-    if (!global_context)
-        throw Exception("Logical error: there is no global context", ErrorCodes::LOGICAL_ERROR);
-    return *global_context;
-}
-
-Context & Context::getGlobalContext()
-{
-    if (!global_context)
-        throw Exception("Logical error: there is no global context", ErrorCodes::LOGICAL_ERROR);
-    return *global_context;
-}
-
-const Context & Context::getBufferContext() const
-{
-    if (!buffer_context)
-        throw Exception("Logical error: there is no buffer context", ErrorCodes::LOGICAL_ERROR);
-    return *buffer_context;
+    if (!buffer_context) throw Exception("There is no buffer context", ErrorCodes::LOGICAL_ERROR);
+    return buffer_context;
 }
 
 
@@ -1321,39 +1344,47 @@ EmbeddedDictionaries & Context::getEmbeddedDictionaries()
 
 const ExternalDictionariesLoader & Context::getExternalDictionariesLoader() const
 {
-    std::lock_guard lock(shared->external_dictionaries_mutex);
-    if (!shared->external_dictionaries_loader)
-    {
-        if (!this->global_context)
-            throw Exception("Logical error: there is no global context", ErrorCodes::LOGICAL_ERROR);
-
-        shared->external_dictionaries_loader.emplace(*this->global_context);
-    }
-    return *shared->external_dictionaries_loader;
+    return const_cast<Context *>(this)->getExternalDictionariesLoader();
 }
 
 ExternalDictionariesLoader & Context::getExternalDictionariesLoader()
 {
-    return const_cast<ExternalDictionariesLoader &>(const_cast<const Context *>(this)->getExternalDictionariesLoader());
+    std::lock_guard lock(shared->external_dictionaries_mutex);
+    if (!shared->external_dictionaries_loader)
+        shared->external_dictionaries_loader.emplace(getGlobalContext());
+    return *shared->external_dictionaries_loader;
 }
 
 
 const ExternalModelsLoader & Context::getExternalModelsLoader() const
 {
-    std::lock_guard lock(shared->external_models_mutex);
-    if (!shared->external_models_loader)
-    {
-        if (!this->global_context)
-            throw Exception("Logical error: there is no global context", ErrorCodes::LOGICAL_ERROR);
-
-        shared->external_models_loader.emplace(*this->global_context);
-    }
-    return *shared->external_models_loader;
+    return const_cast<Context *>(this)->getExternalModelsLoader();
 }
 
 ExternalModelsLoader & Context::getExternalModelsLoader()
 {
-    return const_cast<ExternalModelsLoader &>(const_cast<const Context *>(this)->getExternalModelsLoader());
+    std::lock_guard lock(shared->external_models_mutex);
+    return getExternalModelsLoaderUnlocked();
+}
+
+ExternalModelsLoader & Context::getExternalModelsLoaderUnlocked()
+{
+    if (!shared->external_models_loader)
+        shared->external_models_loader.emplace(getGlobalContext());
+    return *shared->external_models_loader;
+}
+
+void Context::setExternalModelsConfig(const ConfigurationPtr & config, const std::string & config_name)
+{
+    std::lock_guard lock(shared->external_models_mutex);
+
+    if (shared->external_models_config && isSameConfigurationWithMultipleKeys(*config, *shared->external_models_config, "", config_name))
+        return;
+
+    shared->external_models_config = config;
+    shared->models_repository_guard .reset();
+    shared->models_repository_guard = getExternalModelsLoaderUnlocked().addConfigRepository(
+        std::make_unique<ExternalLoaderXMLConfigRepository>(*config, config_name));
 }
 
 
@@ -1367,7 +1398,7 @@ EmbeddedDictionaries & Context::getEmbeddedDictionariesImpl(const bool throw_on_
 
         shared->embedded_dictionaries.emplace(
             std::move(geo_dictionaries_loader),
-            *this->global_context,
+            getGlobalContext(),
             throw_on_error);
     }
 
@@ -1441,14 +1472,12 @@ void Context::setMarkCache(size_t cache_size_in_bytes)
     shared->mark_cache = std::make_shared<MarkCache>(cache_size_in_bytes);
 }
 
-
 MarkCachePtr Context::getMarkCache() const
 {
     auto lock = getLock();
     return shared->mark_cache;
 }
 
-
 void Context::dropMarkCache() const
 {
     auto lock = getLock();
@@ -1457,6 +1486,30 @@ void Context::dropMarkCache() const
 }
 
 
+void Context::setMMappedFileCache(size_t cache_size_in_num_entries)
+{
+    auto lock = getLock();
+
+    if (shared->mmap_cache)
+        throw Exception("Mapped file cache has been already created.", ErrorCodes::LOGICAL_ERROR);
+
+    shared->mmap_cache = std::make_shared<MMappedFileCache>(cache_size_in_num_entries);
+}
+
+MMappedFileCachePtr Context::getMMappedFileCache() const
+{
+    auto lock = getLock();
+    return shared->mmap_cache;
+}
+
+void Context::dropMMappedFileCache() const
+{
+    auto lock = getLock();
+    if (shared->mmap_cache)
+        shared->mmap_cache->reset();
+}
+
+
 void Context::dropCaches() const
 {
     auto lock = getLock();
@@ -1466,6 +1519,9 @@ void Context::dropCaches() const
 
     if (shared->mark_cache)
         shared->mark_cache->reset();
+
+    if (shared->mmap_cache)
+        shared->mmap_cache->reset();
 }
 
 BackgroundSchedulePool & Context::getBufferFlushSchedulePool() const
@@ -1539,7 +1595,7 @@ BackgroundSchedulePool & Context::getMessageBrokerSchedulePool() const
         shared->message_broker_schedule_pool.emplace(
             settings.background_message_broker_schedule_pool_size,
             CurrentMetrics::BackgroundDistributedSchedulePoolTask,
-            "BgMsgBrkSchPool");
+            "BgMBSchPool");
     return *shared->message_broker_schedule_pool;
 }
 
@@ -1587,35 +1643,35 @@ zkutil::ZooKeeperPtr Context::getZooKeeper() const
 }
 
 
-void Context::initializeNuKeeperStorageDispatcher() const
+void Context::initializeKeeperStorageDispatcher() const
 {
 #if USE_NURAFT
     std::lock_guard lock(shared->nu_keeper_storage_dispatcher_mutex);
 
     if (shared->nu_keeper_storage_dispatcher)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Trying to initialize NuKeeper multiple times");
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Trying to initialize Keeper multiple times");
 
     const auto & config = getConfigRef();
-    if (config.has("test_keeper_server"))
+    if (config.has("keeper_server"))
     {
-        shared->nu_keeper_storage_dispatcher = std::make_shared<NuKeeperStorageDispatcher>();
+        shared->nu_keeper_storage_dispatcher = std::make_shared<KeeperStorageDispatcher>();
         shared->nu_keeper_storage_dispatcher->initialize(config);
     }
 #endif
 }
 
 #if USE_NURAFT
-std::shared_ptr<NuKeeperStorageDispatcher> & Context::getNuKeeperStorageDispatcher() const
+std::shared_ptr<KeeperStorageDispatcher> & Context::getKeeperStorageDispatcher() const
 {
     std::lock_guard lock(shared->nu_keeper_storage_dispatcher_mutex);
     if (!shared->nu_keeper_storage_dispatcher)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "NuKeeper must be initialized before requests");
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Keeper must be initialized before requests");
 
     return shared->nu_keeper_storage_dispatcher;
 }
 #endif
 
-void Context::shutdownNuKeeperStorageDispatcher() const
+void Context::shutdownKeeperStorageDispatcher() const
 {
 #if USE_NURAFT
     std::lock_guard lock(shared->nu_keeper_storage_dispatcher_mutex);
@@ -1661,7 +1717,12 @@ void Context::resetZooKeeper() const
 static void reloadZooKeeperIfChangedImpl(const ConfigurationPtr & config, const std::string & config_name, zkutil::ZooKeeperPtr & zk)
 {
     if (!zk || zk->configChanged(*config, config_name))
+    {
+        if (zk)
+            zk->finalize();
+
         zk = std::make_shared<zkutil::ZooKeeper>(*config, config_name);
+    }
 }
 
 void Context::reloadZooKeeperIfChanged(const ConfigurationPtr & config) const
@@ -1700,6 +1761,17 @@ bool Context::hasAuxiliaryZooKeeper(const String & name) const
     return getConfigRef().has("auxiliary_zookeepers." + name);
 }
 
+InterserverCredentialsPtr Context::getInterserverCredentials()
+{
+    return shared->interserver_io_credentials.get();
+}
+
+void Context::updateInterserverCredentials(const Poco::Util::AbstractConfiguration & config)
+{
+    auto credentials = InterserverCredentials::make(config, "interserver_http_credentials");
+    shared->interserver_io_credentials.set(std::move(credentials));
+}
+
 void Context::setInterserverIOAddress(const String & host, UInt16 port)
 {
     shared->interserver_io_host = host;
@@ -1715,17 +1787,6 @@ std::pair<String, UInt16> Context::getInterserverIOAddress() const
     return { shared->interserver_io_host, shared->interserver_io_port };
 }
 
-void Context::setInterserverCredentials(const String & user_, const String & password)
-{
-    shared->interserver_io_user = user_;
-    shared->interserver_io_password = password;
-}
-
-std::pair<String, String> Context::getInterserverCredentials() const
-{
-    return { shared->interserver_io_user, shared->interserver_io_password };
-}
-
 void Context::setInterserverScheme(const String & scheme)
 {
     shared->interserver_scheme = scheme;
@@ -1767,11 +1828,14 @@ std::optional<UInt16> Context::getTCPPortSecure() const
 std::shared_ptr<Cluster> Context::getCluster(const std::string & cluster_name) const
 {
     auto res = getClusters().getCluster(cluster_name);
+    if (res)
+        return res;
 
-    if (!res)
-        throw Exception("Requested cluster '" + cluster_name + "' not found", ErrorCodes::BAD_GET);
+    res = tryGetReplicatedDatabaseCluster(cluster_name);
+    if (res)
+        return res;
 
-    return res;
+    throw Exception("Requested cluster '" + cluster_name + "' not found", ErrorCodes::BAD_GET);
 }
 
 
@@ -1826,12 +1890,17 @@ void Context::setClustersConfig(const ConfigurationPtr & config, const String &
 {
     std::lock_guard lock(shared->clusters_mutex);
 
+    /// Do not update clusters if this part of config wasn't changed.
+    if (shared->clusters && isSameConfiguration(*config, *shared->clusters_config, config_name))
+        return;
+
+    auto old_clusters_config = shared->clusters_config;
     shared->clusters_config = config;
 
     if (!shared->clusters)
         shared->clusters = std::make_unique<Clusters>(*shared->clusters_config, settings, config_name);
     else
-        shared->clusters->updateClusters(*shared->clusters_config, settings, config_name);
+        shared->clusters->updateClusters(*shared->clusters_config, settings, config_name, old_clusters_config);
 }
 
 
@@ -1849,7 +1918,7 @@ void Context::setCluster(const String & cluster_name, const std::shared_ptr<Clus
 void Context::initializeSystemLogs()
 {
     auto lock = getLock();
-    shared->system_logs.emplace(*global_context, getConfigRef());
+    shared->system_logs = std::make_unique<SystemLogs>(getGlobalContext(), getConfigRef());
 }
 
 void Context::initializeTraceCollector()
@@ -1936,7 +2005,7 @@ std::shared_ptr<MetricLog> Context::getMetricLog()
 }
 
 
-std::shared_ptr<AsynchronousMetricLog> Context::getAsynchronousMetricLog()
+std::shared_ptr<AsynchronousMetricLog> Context::getAsynchronousMetricLog() const
 {
     auto lock = getLock();
 
@@ -2015,7 +2084,7 @@ DiskSelectorPtr Context::getDiskSelector(std::lock_guard<std::mutex> & /* lock *
         constexpr auto config_name = "storage_configuration.disks";
         const auto & config = getConfigRef();
 
-        shared->merge_tree_disk_selector = std::make_shared<DiskSelector>(config, config_name, *this);
+        shared->merge_tree_disk_selector = std::make_shared<DiskSelector>(config, config_name, shared_from_this());
     }
     return shared->merge_tree_disk_selector;
 }
@@ -2038,17 +2107,20 @@ void Context::updateStorageConfiguration(const Poco::Util::AbstractConfiguration
     std::lock_guard lock(shared->storage_policies_mutex);
 
     if (shared->merge_tree_disk_selector)
-        shared->merge_tree_disk_selector = shared->merge_tree_disk_selector->updateFromConfig(config, "storage_configuration.disks", *this);
+        shared->merge_tree_disk_selector
+            = shared->merge_tree_disk_selector->updateFromConfig(config, "storage_configuration.disks", shared_from_this());
 
     if (shared->merge_tree_storage_policy_selector)
     {
         try
         {
-            shared->merge_tree_storage_policy_selector = shared->merge_tree_storage_policy_selector->updateFromConfig(config, "storage_configuration.policies", shared->merge_tree_disk_selector);
+            shared->merge_tree_storage_policy_selector = shared->merge_tree_storage_policy_selector->updateFromConfig(
+                config, "storage_configuration.policies", shared->merge_tree_disk_selector);
         }
         catch (Exception & e)
         {
-            LOG_ERROR(shared->log, "An error has occurred while reloading storage policies, storage policies were not applied: {}", e.message());
+            LOG_ERROR(
+                shared->log, "An error has occurred while reloading storage policies, storage policies were not applied: {}", e.message());
         }
     }
 
@@ -2181,27 +2253,28 @@ void Context::checkPartitionCanBeDropped(const String & database, const String &
 
 BlockInputStreamPtr Context::getInputFormat(const String & name, ReadBuffer & buf, const Block & sample, UInt64 max_block_size) const
 {
-    return std::make_shared<InputStreamFromInputFormat>(FormatFactory::instance().getInput(name, buf, sample, *this, max_block_size));
+    return std::make_shared<InputStreamFromInputFormat>(
+        FormatFactory::instance().getInput(name, buf, sample, shared_from_this(), max_block_size));
 }
 
 BlockOutputStreamPtr Context::getOutputStreamParallelIfPossible(const String & name, WriteBuffer & buf, const Block & sample) const
 {
-    return FormatFactory::instance().getOutputStreamParallelIfPossible(name, buf, sample, *this);
+    return FormatFactory::instance().getOutputStreamParallelIfPossible(name, buf, sample, shared_from_this());
 }
 
 BlockOutputStreamPtr Context::getOutputStream(const String & name, WriteBuffer & buf, const Block & sample) const
 {
-    return FormatFactory::instance().getOutputStream(name, buf, sample, *this);
+    return FormatFactory::instance().getOutputStream(name, buf, sample, shared_from_this());
 }
 
 OutputFormatPtr Context::getOutputFormatParallelIfPossible(const String & name, WriteBuffer & buf, const Block & sample) const
 {
-    return FormatFactory::instance().getOutputFormatParallelIfPossible(name, buf, sample, *this);
+    return FormatFactory::instance().getOutputFormatParallelIfPossible(name, buf, sample, shared_from_this());
 }
 
 OutputFormatPtr Context::getOutputFormat(const String & name, WriteBuffer & buf, const Block & sample) const
 {
-    return FormatFactory::instance().getOutputFormat(name, buf, sample, *this);
+    return FormatFactory::instance().getOutputFormat(name, buf, sample, shared_from_this());
 }
 
 
@@ -2264,8 +2337,10 @@ void Context::setDefaultProfiles(const Poco::Util::AbstractConfiguration & confi
     shared->system_profile_name = config.getString("system_profile", shared->default_profile_name);
     setProfile(shared->system_profile_name);
 
+    applySettingsQuirks(settings, &Poco::Logger::get("SettingsQuirks"));
+
     shared->buffer_profile_name = config.getString("buffer_profile", shared->system_profile_name);
-    buffer_context = std::make_shared<Context>(*this);
+    buffer_context = Context::createCopy(shared_from_this());
     buffer_context->setProfile(shared->buffer_profile_name);
 }
 
@@ -2291,7 +2366,7 @@ void Context::setFormatSchemaPath(const String & path)
 
 Context::SampleBlockCache & Context::getSampleBlockCache() const
 {
-    return getQueryContext().sample_block_cache;
+    return getQueryContext()->sample_block_cache;
 }
 
 
@@ -2314,36 +2389,7 @@ void Context::setQueryParameter(const String & name, const String & value)
 }
 
 
-#if USE_EMBEDDED_COMPILER
-
-std::shared_ptr<CompiledExpressionCache> Context::getCompiledExpressionCache() const
-{
-    auto lock = getLock();
-    return shared->compiled_expression_cache;
-}
-
-void Context::setCompiledExpressionCache(size_t cache_size)
-{
-
-    auto lock = getLock();
-
-    if (shared->compiled_expression_cache)
-        throw Exception("Compiled expressions cache has been already created.", ErrorCodes::LOGICAL_ERROR);
-
-    shared->compiled_expression_cache = std::make_shared<CompiledExpressionCache>(cache_size);
-}
-
-void Context::dropCompiledExpressionCache() const
-{
-    auto lock = getLock();
-    if (shared->compiled_expression_cache)
-        shared->compiled_expression_cache->reset();
-}
-
-#endif
-
-
-void Context::addXDBCBridgeCommand(std::unique_ptr<ShellCommand> cmd) const
+void Context::addBridgeCommand(std::unique_ptr<ShellCommand> cmd) const
 {
     auto lock = getLock();
     shared->bridge_commands.emplace_back(std::move(cmd));
@@ -2367,7 +2413,7 @@ std::shared_ptr<ActionLocksManager> Context::getActionLocksManager()
     auto lock = getLock();
 
     if (!shared->action_locks_manager)
-        shared->action_locks_manager = std::make_shared<ActionLocksManager>(*this);
+        shared->action_locks_manager = std::make_shared<ActionLocksManager>(shared_from_this());
 
     return shared->action_locks_manager;
 }
@@ -2385,7 +2431,7 @@ void Context::initializeExternalTablesIfSet()
 {
     if (external_tables_initializer_callback)
     {
-        external_tables_initializer_callback(*this);
+        external_tables_initializer_callback(shared_from_this());
         /// Reset callback
         external_tables_initializer_callback = {};
     }
@@ -2406,7 +2452,7 @@ void Context::initializeInput(const StoragePtr & input_storage)
     if (!input_initializer_callback)
         throw Exception("Input initializer is not set", ErrorCodes::LOGICAL_ERROR);
 
-    input_initializer_callback(*this, input_storage);
+    input_initializer_callback(shared_from_this(), input_storage);
     /// Reset callback
     input_initializer_callback = {};
 }
@@ -2505,12 +2551,12 @@ StorageID Context::resolveStorageIDImpl(StorageID storage_id, StorageNamespace w
     if (look_for_external_table)
     {
         /// Global context should not contain temporary tables
-        assert(global_context != this || getApplicationType() == ApplicationType::LOCAL);
+        assert(!isGlobalContext() || getApplicationType() == ApplicationType::LOCAL);
 
         auto resolved_id = StorageID::createEmpty();
-        auto try_resolve = [&](const Context & context) -> bool
+        auto try_resolve = [&](ContextConstPtr context) -> bool
         {
-            const auto & tables = context.external_tables_mapping;
+            const auto & tables = context->external_tables_mapping;
             auto it = tables.find(storage_id.getTableName());
             if (it == tables.end())
                 return false;
@@ -2519,17 +2565,19 @@ StorageID Context::resolveStorageIDImpl(StorageID storage_id, StorageNamespace w
         };
 
         /// Firstly look for temporary table in current context
-        if (try_resolve(*this))
+        if (try_resolve(shared_from_this()))
             return resolved_id;
 
         /// If not found and current context was created from some query context, look for temporary table in query context
-        bool is_local_context = query_context && query_context != this;
-        if (is_local_context && try_resolve(*query_context))
+        auto query_context_ptr = query_context.lock();
+        bool is_local_context = query_context_ptr && query_context_ptr.get() != this;
+        if (is_local_context && try_resolve(query_context_ptr))
             return resolved_id;
 
         /// If not found and current context was created from some session context, look for temporary table in session context
-        bool is_local_or_query_context = session_context && session_context != this;
-        if (is_local_or_query_context && try_resolve(*session_context))
+        auto session_context_ptr = session_context.lock();
+        bool is_local_or_query_context = session_context_ptr && session_context_ptr.get() != this;
+        if (is_local_or_query_context && try_resolve(session_context_ptr))
             return resolved_id;
     }
 
@@ -2556,7 +2604,7 @@ StorageID Context::resolveStorageIDImpl(StorageID storage_id, StorageNamespace w
 void Context::initZooKeeperMetadataTransaction(ZooKeeperMetadataTransactionPtr txn, [[maybe_unused]] bool attach_existing)
 {
     assert(!metadata_transaction);
-    assert(attach_existing || query_context == this);
+    assert(attach_existing || query_context.lock().get() == this);
     metadata_transaction = std::move(txn);
 }
 
@@ -2575,6 +2623,20 @@ PartUUIDsPtr Context::getPartUUIDs()
     return part_uuids;
 }
 
+
+ReadTaskCallback Context::getReadTaskCallback() const
+{
+    if (!next_task_callback.has_value())
+        throw Exception(fmt::format("Next task callback is not set for query {}", getInitialQueryId()), ErrorCodes::LOGICAL_ERROR);
+    return next_task_callback.value();
+}
+
+
+void Context::setReadTaskCallback(ReadTaskCallback && callback)
+{
+    next_task_callback = callback;
+}
+
 PartUUIDsPtr Context::getIgnoredPartUUIDs()
 {
     auto lock = getLock();
diff --git a/src/Interpreters/Context.h b/src/Interpreters/Context.h
index 563fb172488..680ee7c779f 100644
--- a/src/Interpreters/Context.h
+++ b/src/Interpreters/Context.h
@@ -1,19 +1,26 @@
 #pragma once
 
+#include <Access/RowPolicy.h>
 #include <Core/Block.h>
 #include <Core/NamesAndTypes.h>
 #include <Core/Settings.h>
-#include <common/types.h>
 #include <Core/UUID.h>
 #include <DataStreams/IBlockStream_fwd.h>
 #include <Interpreters/ClientInfo.h>
+#include <Interpreters/Context_fwd.h>
 #include <Interpreters/DatabaseCatalog.h>
 #include <Parsers/IAST_fwd.h>
-#include <Access/RowPolicy.h>
-#include <Common/MultiVersion.h>
-#include <Common/ThreadPool.h>
-#include <Common/OpenTelemetryTraceContext.h>
 #include <Storages/IStorage_fwd.h>
+#include <Common/MultiVersion.h>
+#include <Common/OpenTelemetryTraceContext.h>
+#include <Common/RemoteHostFilter.h>
+#include <Common/ThreadPool.h>
+#include <common/types.h>
+
+#if !defined(ARCADIA_BUILD)
+#    include "config_core.h"
+#endif
+
 #include <atomic>
 #include <chrono>
 #include <condition_variable>
@@ -22,32 +29,16 @@
 #include <mutex>
 #include <optional>
 #include <thread>
-#include <Common/RemoteHostFilter.h>
-
-#if !defined(ARCADIA_BUILD)
-#    include "config_core.h"
-#endif
 
 
-namespace Poco
-{
-    namespace Net
-    {
-        class IPAddress;
-    }
-}
-
-namespace zkutil
-{
-    class ZooKeeper;
-}
+namespace Poco::Net { class IPAddress; }
+namespace zkutil { class ZooKeeper; }
 
 
 namespace DB
 {
 
-struct ContextShared;
-class Context;
+struct ContextSharedPart;
 class ContextAccess;
 struct User;
 using UserPtr = std::shared_ptr<const User>;
@@ -61,6 +52,8 @@ class AccessRightsElements;
 class EmbeddedDictionaries;
 class ExternalDictionariesLoader;
 class ExternalModelsLoader;
+class InterserverCredentials;
+using InterserverCredentialsPtr = std::shared_ptr<const InterserverCredentials>;
 class InterserverIOHandler;
 class BackgroundSchedulePool;
 class MergeList;
@@ -68,6 +61,7 @@ class ReplicatedFetchList;
 class Cluster;
 class Compiler;
 class MarkCache;
+class MMappedFileCache;
 class UncompressedCache;
 class ProcessList;
 class QueryStatus;
@@ -93,6 +87,8 @@ using ActionLocksManagerPtr = std::shared_ptr<ActionLocksManager>;
 class ShellCommand;
 class ICompressionCodec;
 class AccessControlManager;
+class Credentials;
+class GSSAcceptorContext;
 class SettingsConstraints;
 class RemoteHostFilter;
 struct StorageID;
@@ -108,7 +104,7 @@ class StoragePolicySelector;
 using StoragePolicySelectorPtr = std::shared_ptr<const StoragePolicySelector>;
 struct PartUUIDs;
 using PartUUIDsPtr = std::shared_ptr<PartUUIDs>;
-class NuKeeperStorageDispatcher;
+class KeeperStorageDispatcher;
 
 class IOutputFormat;
 using OutputFormatPtr = std::shared_ptr<IOutputFormat>;
@@ -125,15 +121,15 @@ class CompiledExpressionCache;
 #endif
 
 /// Callback for external tables initializer
-using ExternalTablesInitializer = std::function<void(Context &)>;
+using ExternalTablesInitializer = std::function<void(ContextPtr)>;
 
 /// Callback for initialize input()
-using InputInitializer = std::function<void(Context &, const StoragePtr &)>;
+using InputInitializer = std::function<void(ContextPtr, const StoragePtr &)>;
 /// Callback for reading blocks of data from client for function input()
-using InputBlocksReader = std::function<Block(Context &)>;
+using InputBlocksReader = std::function<Block(ContextPtr)>;
 
-/// Scalar results of sub queries
-using Scalars = std::map<String, Block>;
+/// Used in distributed task processing
+using ReadTaskCallback = std::function<String()>;
 
 /// An empty interface for an arbitrary object that may be attached by a shared pointer
 /// to query context, when using ClickHouse as a library.
@@ -150,15 +146,16 @@ struct SharedContextHolder
 {
     ~SharedContextHolder();
     SharedContextHolder();
-    SharedContextHolder(std::unique_ptr<ContextShared> shared_context);
+    explicit SharedContextHolder(std::unique_ptr<ContextSharedPart> shared_context);
     SharedContextHolder(SharedContextHolder &&) noexcept;
 
     SharedContextHolder & operator=(SharedContextHolder &&);
 
-    ContextShared * get() const { return shared.get(); }
+    ContextSharedPart * get() const { return shared.get(); }
     void reset();
+
 private:
-    std::unique_ptr<ContextShared> shared;
+    std::unique_ptr<ContextSharedPart> shared;
 };
 
 /** A set of known objects that can be used in the query.
@@ -167,10 +164,10 @@ private:
   *
   * Everything is encapsulated for all sorts of checks and locks.
   */
-class Context
+class Context: public std::enable_shared_from_this<Context>
 {
 private:
-    ContextShared * shared;
+    ContextSharedPart * shared;
 
     ClientInfo client_info;
     ExternalTablesInitializer external_tables_initializer_callback;
@@ -179,7 +176,7 @@ private:
     InputBlocksReader input_blocks_reader;
 
     std::optional<UUID> user_id;
-    boost::container::flat_set<UUID> current_roles;
+    std::vector<UUID> current_roles;
     bool use_default_roles = false;
     std::shared_ptr<const ContextAccess> access;
     std::shared_ptr<const EnabledRowPolicies> initial_row_policy;
@@ -195,6 +192,9 @@ private:
     TemporaryTablesMapping external_tables_mapping;
     Scalars scalars;
 
+    /// Fields for distributed s3 function
+    std::optional<ReadTaskCallback> next_task_callback;
+
     /// Record entities accessed by current query, and store this information in system.query_log.
     struct QueryAccessInfo
     {
@@ -249,18 +249,19 @@ private:
     /// Needs to be chandged while having const context in factories methods
     mutable QueryFactoriesInfo query_factories_info;
 
-    //TODO maybe replace with temporary tables?
+    /// TODO: maybe replace with temporary tables?
     StoragePtr view_source;                 /// Temporary StorageValues used to generate alias columns for materialized views
     Tables table_function_results;          /// Temporary tables obtained by execution of table functions. Keyed by AST tree id.
 
-    Context * query_context = nullptr;
-    Context * session_context = nullptr;    /// Session context or nullptr. Could be equal to this.
-    Context * global_context = nullptr;     /// Global context. Could be equal to this.
-    std::shared_ptr<Context> buffer_context;/// Buffer context. Could be equal to this.
+    ContextWeakPtr query_context;
+    ContextWeakPtr session_context;  /// Session context or nullptr. Could be equal to this.
+    ContextWeakPtr global_context;   /// Global context. Could be equal to this.
+
+    /// XXX: move this stuff to shared part instead.
+    ContextPtr buffer_context;  /// Buffer context. Could be equal to this.
 
 public:
-    // Top-level OpenTelemetry trace context for the query. Makes sense only for
-    // a query context.
+    // Top-level OpenTelemetry trace context for the query. Makes sense only for a query context.
     OpenTelemetryTraceContext query_trace_context;
 
 private:
@@ -278,7 +279,7 @@ private:
     IHostContextPtr host_context;  /// Arbitrary object that may used to attach some host specific information to query context,
                                    /// when using ClickHouse as a library in some project. For example, it may contain host
                                    /// logger, some query identification information, profiling guards, etc. This field is
-                                   /// to be customized in HTTP and TCP servers by overloading the customizeContext(DB::Context&)
+                                   /// to be customized in HTTP and TCP servers by overloading the customizeContext(DB::ContextPtr)
                                    /// methods.
 
     ZooKeeperMetadataTransactionPtr metadata_transaction;    /// Distributed DDL context. I'm not sure if it's a suitable place for this,
@@ -287,16 +288,20 @@ private:
                                                     /// thousands of signatures.
                                                     /// And I hope it will be replaced with more common Transaction sometime.
 
-    /// Use copy constructor or createGlobal() instead
     Context();
+    Context(const Context &);
+    Context & operator=(const Context &);
 
 public:
     /// Create initial Context with ContextShared and etc.
-    static Context createGlobal(ContextShared * shared);
+    static ContextPtr createGlobal(ContextSharedPart * shared);
+    static ContextPtr createCopy(const ContextWeakConstPtr & other);
+    static ContextPtr createCopy(const ContextConstPtr & other);
+    static ContextPtr createCopy(const ContextPtr & other);
     static SharedContextHolder createShared();
 
-    Context(const Context &);
-    Context & operator=(const Context &);
+    void copyFrom(const ContextPtr & other);
+
     ~Context();
 
     String getPath() const;
@@ -322,9 +327,12 @@ public:
     AccessControlManager & getAccessControlManager();
     const AccessControlManager & getAccessControlManager() const;
 
-    /// Sets external authenticators config (LDAP).
+    /// Sets external authenticators config (LDAP, Kerberos).
     void setExternalAuthenticatorsConfig(const Poco::Util::AbstractConfiguration & config);
 
+    /// Creates GSSAcceptorContext instance based on external authenticator params.
+    std::unique_ptr<GSSAcceptorContext> makeGSSAcceptorContext() const;
+
     /** Take the list of users, quotas and configuration profiles from this config.
       * The list of users is completely replaced.
       * The accumulated quota values are not reset if the quota is not deleted.
@@ -332,11 +340,12 @@ public:
     void setUsersConfig(const ConfigurationPtr & config);
     ConfigurationPtr getUsersConfig();
 
-    /// Sets the current user, checks the password and that the specified host is allowed.
-    /// Must be called before getClientInfo.
+    /// Sets the current user, checks the credentials and that the specified host is allowed.
+    /// Must be called before getClientInfo() can be called.
+    void setUser(const Credentials & credentials, const Poco::Net::SocketAddress & address);
     void setUser(const String & name, const String & password, const Poco::Net::SocketAddress & address);
 
-    /// Sets the current user, *do not checks the password and that the specified host is allowed*.
+    /// Sets the current user, *does not check the password/credentials and that the specified host is allowed*.
     /// Must be called before getClientInfo.
     ///
     /// (Used only internally in cluster, if the secret matches)
@@ -348,7 +357,7 @@ public:
     String getUserName() const;
     std::optional<UUID> getUserID() const;
 
-    void setCurrentRoles(const boost::container::flat_set<UUID> & current_roles_);
+    void setCurrentRoles(const std::vector<UUID> & current_roles_);
     void setCurrentRolesDefault();
     boost::container::flat_set<UUID> getCurrentRoles() const;
     boost::container::flat_set<UUID> getEnabledRoles() const;
@@ -496,8 +505,11 @@ public:
     EmbeddedDictionaries & getEmbeddedDictionaries();
     ExternalDictionariesLoader & getExternalDictionariesLoader();
     ExternalModelsLoader & getExternalModelsLoader();
+    ExternalModelsLoader & getExternalModelsLoaderUnlocked();
     void tryCreateEmbeddedDictionaries() const;
 
+    void setExternalModelsConfig(const ConfigurationPtr & config, const std::string & config_name = "models_config");
+
     /// I/O formats.
     BlockInputStreamPtr getInputFormat(const String & name, ReadBuffer & buf, const Block & sample, UInt64 max_block_size) const;
 
@@ -515,8 +527,8 @@ public:
     std::pair<String, UInt16> getInterserverIOAddress() const;
 
     /// Credentials which server will use to communicate with others
-    void setInterserverCredentials(const String & user, const String & password);
-    std::pair<String, String> getInterserverCredentials() const;
+    void updateInterserverCredentials(const Poco::Util::AbstractConfiguration & config);
+    InterserverCredentialsPtr getInterserverCredentials();
 
     /// Interserver requests scheme (http or https)
     void setInterserverScheme(const String & scheme);
@@ -539,27 +551,29 @@ public:
 
     /// For methods below you may need to acquire the context lock by yourself.
 
-    const Context & getQueryContext() const;
-    Context & getQueryContext();
-    bool hasQueryContext() const { return query_context != nullptr; }
-    bool isInternalSubquery() const { return hasQueryContext() && query_context != this; }
+    ContextPtr getQueryContext() const;
+    bool hasQueryContext() const { return !query_context.expired(); }
+    bool isInternalSubquery() const;
 
-    const Context & getSessionContext() const;
-    Context & getSessionContext();
-    bool hasSessionContext() const { return session_context != nullptr; }
+    ContextPtr getSessionContext() const;
+    bool hasSessionContext() const { return !session_context.expired(); }
 
-    const Context & getGlobalContext() const;
-    Context & getGlobalContext();
-    bool hasGlobalContext() const { return global_context != nullptr; }
+    ContextPtr getGlobalContext() const;
+    bool hasGlobalContext() const { return !global_context.expired(); }
+    bool isGlobalContext() const
+    {
+        auto ptr = global_context.lock();
+        return ptr && ptr.get() == this;
+    }
 
-    const Context & getBufferContext() const;
+    ContextPtr getBufferContext() const;
 
-    void setQueryContext(Context & context_) { query_context = &context_; }
-    void setSessionContext(Context & context_) { session_context = &context_; }
+    void setQueryContext(ContextPtr context_) { query_context = context_; }
+    void setSessionContext(ContextPtr context_) { session_context = context_; }
 
-    void makeQueryContext() { query_context = this; }
-    void makeSessionContext() { session_context = this; }
-    void makeGlobalContext() { initGlobal(); global_context = this; }
+    void makeQueryContext() { query_context = shared_from_this(); }
+    void makeSessionContext() { session_context = shared_from_this(); }
+    void makeGlobalContext() { initGlobal(); global_context = shared_from_this(); }
 
     const Settings & getSettingsRef() const { return settings; }
 
@@ -591,10 +605,10 @@ public:
     std::shared_ptr<zkutil::ZooKeeper> getAuxiliaryZooKeeper(const String & name) const;
 
 #if USE_NURAFT
-    std::shared_ptr<NuKeeperStorageDispatcher> & getNuKeeperStorageDispatcher() const;
+    std::shared_ptr<KeeperStorageDispatcher> & getKeeperStorageDispatcher() const;
 #endif
-    void initializeNuKeeperStorageDispatcher() const;
-    void shutdownNuKeeperStorageDispatcher() const;
+    void initializeKeeperStorageDispatcher() const;
+    void shutdownKeeperStorageDispatcher() const;
 
     /// Set auxiliary zookeepers configuration at server starting or configuration reloading.
     void reloadAuxiliaryZooKeepersConfigIfChanged(const ConfigurationPtr & config);
@@ -617,6 +631,11 @@ public:
     std::shared_ptr<MarkCache> getMarkCache() const;
     void dropMarkCache() const;
 
+    /// Create a cache of mapped files to avoid frequent open/map/unmap/close and to reuse from several threads.
+    void setMMappedFileCache(size_t cache_size_in_num_entries);
+    std::shared_ptr<MMappedFileCache> getMMappedFileCache() const;
+    void dropMMappedFileCache() const;
+
     /** Clear the caches of the uncompressed blocks and marks.
       * This is usually done when renaming tables, changing the type of columns, deleting a table.
       *  - since caches are linked to file names, and become incorrect.
@@ -663,7 +682,7 @@ public:
     std::shared_ptr<TraceLog> getTraceLog();
     std::shared_ptr<TextLog> getTextLog();
     std::shared_ptr<MetricLog> getMetricLog();
-    std::shared_ptr<AsynchronousMetricLog> getAsynchronousMetricLog();
+    std::shared_ptr<AsynchronousMetricLog> getAsynchronousMetricLog() const;
     std::shared_ptr<OpenTelemetrySpanLog> getOpenTelemetrySpanLog();
 
     /// Returns an object used to log operations with parts if it possible.
@@ -734,14 +753,8 @@ public:
     void setQueryParameter(const String & name, const String & value);
     void setQueryParameters(const NameToNameMap & parameters) { query_parameters = parameters; }
 
-#if USE_EMBEDDED_COMPILER
-    std::shared_ptr<CompiledExpressionCache> getCompiledExpressionCache() const;
-    void setCompiledExpressionCache(size_t cache_size);
-    void dropCompiledExpressionCache() const;
-#endif
-
     /// Add started bridge command. It will be killed after context destruction
-    void addXDBCBridgeCommand(std::unique_ptr<ShellCommand> cmd) const;
+    void addBridgeCommand(std::unique_ptr<ShellCommand> cmd) const;
 
     IHostContextPtr & getHostContext();
     const IHostContextPtr & getHostContext() const;
@@ -762,6 +775,10 @@ public:
 
     PartUUIDsPtr getPartUUIDs();
     PartUUIDsPtr getIgnoredPartUUIDs();
+
+    ReadTaskCallback getReadTaskCallback() const;
+    void setReadTaskCallback(ReadTaskCallback && callback);
+
 private:
     std::unique_lock<std::recursive_mutex> getLock() const;
 
@@ -798,12 +815,12 @@ struct NamedSession
 {
     NamedSessionKey key;
     UInt64 close_cycle = 0;
-    Context context;
+    ContextPtr context;
     std::chrono::steady_clock::duration timeout;
     NamedSessions & parent;
 
-    NamedSession(NamedSessionKey key_, Context & context_, std::chrono::steady_clock::duration timeout_, NamedSessions & parent_)
-        : key(key_), context(context_), timeout(timeout_), parent(parent_)
+    NamedSession(NamedSessionKey key_, ContextPtr context_, std::chrono::steady_clock::duration timeout_, NamedSessions & parent_)
+        : key(key_), context(Context::createCopy(context_)), timeout(timeout_), parent(parent_)
     {
     }
 
diff --git a/src/Interpreters/Context_fwd.h b/src/Interpreters/Context_fwd.h
new file mode 100644
index 00000000000..d7232717bb2
--- /dev/null
+++ b/src/Interpreters/Context_fwd.h
@@ -0,0 +1,54 @@
+#pragma once
+
+#include <Common/Exception.h>
+
+#include <map>
+#include <memory>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+class Block;
+
+/// Scalar results of subqueries
+using Scalars = std::map<String, Block>;
+
+class Context;
+
+/// Most used types have shorter names
+/// TODO: in the first part of refactoring all the context pointers are non-const.
+using ContextPtr = std::shared_ptr<Context>;
+using ContextConstPtr = std::shared_ptr<const Context>;
+using ContextWeakPtr = std::weak_ptr<Context>;
+using ContextWeakConstPtr = std::weak_ptr<const Context>;
+
+template <class Shared = ContextPtr>
+struct WithContextImpl
+{
+    using Weak = typename Shared::weak_type;
+    using ConstShared = std::shared_ptr<const typename Shared::element_type>;
+    using ConstWeak = typename ConstShared::weak_type;
+
+    WithContextImpl() = default;
+    explicit WithContextImpl(Weak context_) : context(context_) {}
+
+    inline Shared getContext() const
+    {
+        auto ptr = context.lock();
+        if (!ptr) throw Exception("Context has expired", ErrorCodes::LOGICAL_ERROR);
+        return ptr;
+    }
+
+protected:
+    Weak context;
+};
+
+using WithContext = WithContextImpl<>;
+using WithConstContext = WithContextImpl<ContextConstPtr>;
+
+}
diff --git a/src/Interpreters/ConvertStringsToEnumVisitor.h b/src/Interpreters/ConvertStringsToEnumVisitor.h
index 1e5d8fa9a9b..adf408f87bd 100644
--- a/src/Interpreters/ConvertStringsToEnumVisitor.h
+++ b/src/Interpreters/ConvertStringsToEnumVisitor.h
@@ -41,8 +41,8 @@ String makeStringsEnum(const std::set<String> & values)
 
 void changeIfArguments(ASTPtr & first, ASTPtr & second)
 {
-    String first_value = first->as<ASTLiteral>()->value.get<NearestFieldType<String>>();
-    String second_value = second->as<ASTLiteral>()->value.get<NearestFieldType<String>>();
+    String first_value = first->as<ASTLiteral>()->value.get<String>();
+    String second_value = second->as<ASTLiteral>()->value.get<String>();
 
     std::set<String> values;
     values.insert(first_value);
@@ -67,9 +67,9 @@ void changeTransformArguments(ASTPtr & array_to, ASTPtr & other)
 {
     std::set<String> values;
 
-    for (const auto & item : array_to->as<ASTLiteral>()->value.get<NearestFieldType<Array>>())
-        values.insert(item.get<NearestFieldType<String>>());
-    values.insert(other->as<ASTLiteral>()->value.get<NearestFieldType<String>>());
+    for (const auto & item : array_to->as<ASTLiteral>()->value.get<Array>())
+        values.insert(item.get<String>());
+    values.insert(other->as<ASTLiteral>()->value.get<String>());
 
     String enum_string = makeStringsEnum(values);
 
@@ -197,7 +197,7 @@ struct ConvertStringsToEnumMatcher
                 String(literal_other->value.getTypeName()) != "String")
                 return;
 
-            Array array_to = literal_to->value.get<NearestFieldType<Array>>();
+            Array array_to = literal_to->value.get<Array>();
             if (array_to.size() == 0)
                 return;
 
diff --git a/src/Interpreters/CrashLog.cpp b/src/Interpreters/CrashLog.cpp
index bf81a2e8aba..5067acd4a5c 100644
--- a/src/Interpreters/CrashLog.cpp
+++ b/src/Interpreters/CrashLog.cpp
@@ -40,7 +40,7 @@ void CrashLogElement::appendToBlock(MutableColumns & columns) const
 {
     size_t i = 0;
 
-    columns[i++]->insert(DateLUT::instance().toDayNum(event_time));
+    columns[i++]->insert(DateLUT::instance().toDayNum(event_time).toUnderType());
     columns[i++]->insert(event_time);
     columns[i++]->insert(timestamp_ns);
     columns[i++]->insert(signal);
diff --git a/src/Interpreters/CrossToInnerJoinVisitor.cpp b/src/Interpreters/CrossToInnerJoinVisitor.cpp
index 604bfc7774f..b6f977cd9b5 100644
--- a/src/Interpreters/CrossToInnerJoinVisitor.cpp
+++ b/src/Interpreters/CrossToInnerJoinVisitor.cpp
@@ -1,20 +1,21 @@
 #include <Common/typeid_cast.h>
 #include <Functions/FunctionsComparison.h>
 #include <Functions/FunctionsLogical.h>
+#include <IO/WriteHelpers.h>
 #include <Interpreters/CrossToInnerJoinVisitor.h>
 #include <Interpreters/DatabaseAndTableWithAlias.h>
 #include <Interpreters/IdentifierSemantic.h>
 #include <Interpreters/misc.h>
+#include <Parsers/ASTExpressionList.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTLiteral.h>
 #include <Parsers/ASTSelectQuery.h>
 #include <Parsers/ASTSubquery.h>
 #include <Parsers/ASTTablesInSelectQuery.h>
-#include <Parsers/ASTIdentifier.h>
-#include <Parsers/ASTFunction.h>
-#include <Parsers/ASTExpressionList.h>
-#include <Parsers/ParserTablesInSelectQuery.h>
 #include <Parsers/ExpressionListParsers.h>
+#include <Parsers/ParserTablesInSelectQuery.h>
 #include <Parsers/parseQuery.h>
-#include <IO/WriteHelpers.h>
 
 namespace DB
 {
@@ -80,147 +81,70 @@ private:
     ASTTableJoin * join = nullptr;
 };
 
-bool isComparison(const String & name)
+bool isAllowedToRewriteCrossJoin(const ASTPtr & node, const Aliases & aliases)
 {
-    return name == NameEquals::name ||
-        name == NameNotEquals::name ||
-        name == NameLess::name ||
-        name == NameGreater::name ||
-        name == NameLessOrEquals::name ||
-        name == NameGreaterOrEquals::name;
+    if (node->as<ASTFunction>())
+    {
+        auto idents = IdentifiersCollector::collect(node);
+        for (const auto * ident : idents)
+        {
+            if (ident->isShort() && aliases.count(ident->shortName()))
+                return false;
+        }
+        return true;
+    }
+    return node->as<ASTIdentifier>() || node->as<ASTLiteral>();
 }
 
-/// It checks if where expression could be moved to JOIN ON expression partially or entirely.
-class CheckExpressionVisitorData
+/// Return mapping table_no -> expression with expression that can be moved into JOIN ON section
+std::map<size_t, std::vector<ASTPtr>> moveExpressionToJoinOn(
+    const ASTPtr & ast,
+    const std::vector<JoinedElement> & joined_tables,
+    const std::vector<TableWithColumnNamesAndTypes> & tables,
+    const Aliases & aliases)
 {
-public:
-    using TypeToVisit = const ASTFunction;
-
-    CheckExpressionVisitorData(const std::vector<JoinedElement> & tables_,
-                               const std::vector<TableWithColumnNamesAndTypes> & tables_with_columns,
-                               const Aliases & aliases_)
-        : joined_tables(tables_)
-        , tables(tables_with_columns)
-        , aliases(aliases_)
-        , ands_only(true)
-    {}
-
-    void visit(const ASTFunction & node, const ASTPtr & ast)
+    std::map<size_t, std::vector<ASTPtr>> asts_to_join_on;
+    for (const auto & node : collectConjunctions(ast))
     {
-        if (!ands_only)
-            return;
-
-        if (node.name == NameAnd::name)
+        if (const auto * func = node->as<ASTFunction>(); func && func->name == NameEquals::name)
         {
-            if (!node.arguments || node.arguments->children.empty())
-                throw Exception("Logical error: function requires argument", ErrorCodes::LOGICAL_ERROR);
+            if (!func->arguments || func->arguments->children.size() != 2)
+                return {};
 
-            for (auto & child : node.arguments->children)
+            /// Check if the identifiers are from different joined tables.
+            /// If it's a self joint, tables should have aliases.
+            auto left_table_pos = IdentifierSemantic::getIdentsMembership(func->arguments->children[0], tables, aliases);
+            auto right_table_pos = IdentifierSemantic::getIdentsMembership(func->arguments->children[1], tables, aliases);
+
+            /// Identifiers from different table move to JOIN ON
+            if (left_table_pos && right_table_pos && *left_table_pos != *right_table_pos)
             {
-                if (const auto * func = child->as<ASTFunction>())
-                    visit(*func, child);
+                size_t table_pos = std::max(*left_table_pos, *right_table_pos);
+                if (joined_tables[table_pos].canAttachOnExpression())
+                    asts_to_join_on[table_pos].push_back(node);
                 else
-                    ands_only = false;
+                    return {};
             }
         }
-        else if (node.name == NameEquals::name)
-        {
-            if (size_t min_table = canMoveEqualsToJoinOn(node))
-                asts_to_join_on[min_table].push_back(ast);
-        }
-        else if (isComparison(node.name))
-        {
-            /// leave other comparisons as is
-        }
-        else if (functionIsLikeOperator(node.name) || /// LIKE, NOT LIKE, ILIKE, NOT ILIKE
-                 functionIsInOperator(node.name))  /// IN, NOT IN
-        {
-            /// leave as is. It's not possible to make push down here cause of unknown aliases and not implemented JOIN predicates.
-            ///     select a as b form t1, t2 where t1.x = t2.x and b in(42)
-            ///     select a as b form t1 inner join t2 on t1.x = t2.x and b in(42)
-        }
-        else
-        {
-            ands_only = false;
-            asts_to_join_on.clear();
-        }
-    }
 
-    bool complex() const { return !ands_only; }
-    bool matchAny(size_t t) const { return asts_to_join_on.count(t); }
-
-    ASTPtr makeOnExpression(size_t table_pos)
-    {
-        if (!asts_to_join_on.count(table_pos))
+        if (!isAllowedToRewriteCrossJoin(node, aliases))
             return {};
-
-        std::vector<ASTPtr> & expressions = asts_to_join_on[table_pos];
-
-        if (expressions.size() == 1)
-            return expressions[0]->clone();
-
-        std::vector<ASTPtr> arguments;
-        arguments.reserve(expressions.size());
-        for (auto & ast : expressions)
-            arguments.emplace_back(ast->clone());
-
-        return makeASTFunction(NameAnd::name, std::move(arguments));
     }
+    return asts_to_join_on;
+}
 
-private:
-    const std::vector<JoinedElement> & joined_tables;
-    const std::vector<TableWithColumnNamesAndTypes> & tables;
-    std::map<size_t, std::vector<ASTPtr>> asts_to_join_on;
-    const Aliases & aliases;
-    bool ands_only;
+ASTPtr makeOnExpression(const std::vector<ASTPtr> & expressions)
+{
+    if (expressions.size() == 1)
+        return expressions[0]->clone();
 
-    size_t canMoveEqualsToJoinOn(const ASTFunction & node)
-    {
-        if (!node.arguments)
-            throw Exception("Logical error: function requires arguments", ErrorCodes::LOGICAL_ERROR);
-        if (node.arguments->children.size() != 2)
-            return false;
-
-        const auto * left = node.arguments->children[0]->as<ASTIdentifier>();
-        const auto * right = node.arguments->children[1]->as<ASTIdentifier>();
-        if (!left || !right)
-            return false;
-
-        /// Moving expressions that use column aliases is not supported.
-        if (left->isShort() && aliases.count(left->shortName()))
-            return false;
-        if (right->isShort() && aliases.count(right->shortName()))
-            return false;
-
-        return checkIdentifiers(*left, *right);
-    }
-
-    /// Check if the identifiers are from different joined tables. If it's a self joint, tables should have aliases.
-    /// select * from t1 a cross join t2 b where a.x = b.x
-    /// @return table position to attach expression to or 0.
-    size_t checkIdentifiers(const ASTIdentifier & left, const ASTIdentifier & right)
-    {
-        std::optional<size_t> left_table_pos = IdentifierSemantic::getMembership(left);
-        if (!left_table_pos)
-            left_table_pos = IdentifierSemantic::chooseTableColumnMatch(left, tables);
-
-        std::optional<size_t> right_table_pos = IdentifierSemantic::getMembership(right);
-        if (!right_table_pos)
-            right_table_pos = IdentifierSemantic::chooseTableColumnMatch(right, tables);
-
-        if (left_table_pos && right_table_pos && (*left_table_pos != *right_table_pos))
-        {
-            size_t table_pos = std::max(*left_table_pos, *right_table_pos);
-            if (joined_tables[table_pos].canAttachOnExpression())
-                return table_pos;
-        }
-        return 0;
-    }
-};
-
-using CheckExpressionMatcher = ConstOneTypeMatcher<CheckExpressionVisitorData, NeedChild::none>;
-using CheckExpressionVisitor = ConstInDepthNodeVisitor<CheckExpressionMatcher, true>;
+    std::vector<ASTPtr> arguments;
+    arguments.reserve(expressions.size());
+    for (const auto & ast : expressions)
+        arguments.emplace_back(ast->clone());
 
+    return makeASTFunction(NameAnd::name, std::move(arguments));
+}
 
 bool getTables(ASTSelectQuery & select, std::vector<JoinedElement> & joined_tables, size_t & num_comma)
 {
@@ -320,7 +244,6 @@ void CrossToInnerJoinMatcher::visit(ASTSelectQuery & select, ASTPtr &, Data & da
     }
 
     /// COMMA to CROSS
-
     if (num_comma)
     {
         for (auto & table : joined_tables)
@@ -328,22 +251,17 @@ void CrossToInnerJoinMatcher::visit(ASTSelectQuery & select, ASTPtr &, Data & da
     }
 
     /// CROSS to INNER
-
-    if (!select.where())
-        return;
-
-    CheckExpressionVisitor::Data visitor_data{joined_tables, data.tables_with_columns, data.aliases};
-    CheckExpressionVisitor(visitor_data).visit(select.where());
-
-    if (visitor_data.complex())
-        return;
-
-    for (size_t i = 1; i < joined_tables.size(); ++i)
+    if (data.cross_to_inner_join_rewrite && select.where())
     {
-        if (visitor_data.matchAny(i))
+        auto asts_to_join_on = moveExpressionToJoinOn(select.where(), joined_tables, data.tables_with_columns, data.aliases);
+        for (size_t i = 1; i < joined_tables.size(); ++i)
         {
-            if (joined_tables[i].rewriteCrossToInner(visitor_data.makeOnExpression(i)))
-                data.done = true;
+            const auto & expr_it = asts_to_join_on.find(i);
+            if (expr_it != asts_to_join_on.end())
+            {
+                if (joined_tables[i].rewriteCrossToInner(makeOnExpression(expr_it->second)))
+                    data.done = true;
+            }
         }
     }
 }
diff --git a/src/Interpreters/CrossToInnerJoinVisitor.h b/src/Interpreters/CrossToInnerJoinVisitor.h
index 7cd5c93b1e3..885cf8162c1 100644
--- a/src/Interpreters/CrossToInnerJoinVisitor.h
+++ b/src/Interpreters/CrossToInnerJoinVisitor.h
@@ -19,6 +19,7 @@ public:
         const Aliases & aliases;
         const String current_database;
         bool done = false;
+        bool cross_to_inner_join_rewrite = true;
     };
 
     static bool needChildVisit(ASTPtr &, const ASTPtr &);
diff --git a/src/Interpreters/DDLTask.cpp b/src/Interpreters/DDLTask.cpp
index 4be465d3de4..087e5504672 100644
--- a/src/Interpreters/DDLTask.cpp
+++ b/src/Interpreters/DDLTask.cpp
@@ -10,6 +10,7 @@
 #include <Parsers/ParserQuery.h>
 #include <Parsers/parseQuery.h>
 #include <Parsers/ASTQueryWithOnCluster.h>
+#include <Parsers/formatAST.h>
 #include <Parsers/ASTQueryWithTableAndOutput.h>
 #include <Databases/DatabaseReplicated.h>
 
@@ -43,20 +44,47 @@ bool HostID::isLocalAddress(UInt16 clickhouse_port) const
     }
 }
 
+void DDLLogEntry::assertVersion() const
+{
+    constexpr UInt64 max_version = 2;
+    if (version == 0 || max_version < version)
+        throw Exception(ErrorCodes::UNKNOWN_FORMAT_VERSION, "Unknown DDLLogEntry format version: {}."
+                                                            "Maximum supported version is {}", version, max_version);
+}
+
+void DDLLogEntry::setSettingsIfRequired(ContextPtr context)
+{
+    version = context->getSettingsRef().distributed_ddl_entry_format_version;
+    if (version == 2)
+        settings.emplace(context->getSettingsRef().changes());
+}
 
 String DDLLogEntry::toString() const
 {
     WriteBufferFromOwnString wb;
 
-    Strings host_id_strings(hosts.size());
-    std::transform(hosts.begin(), hosts.end(), host_id_strings.begin(), HostID::applyToString);
-
-    auto version = CURRENT_VERSION;
     wb << "version: " << version << "\n";
     wb << "query: " << escape << query << "\n";
-    wb << "hosts: " << host_id_strings << "\n";
+
+    bool write_hosts = version == 1 || !hosts.empty();
+    if (write_hosts)
+    {
+        Strings host_id_strings(hosts.size());
+        std::transform(hosts.begin(), hosts.end(), host_id_strings.begin(), HostID::applyToString);
+        wb << "hosts: " << host_id_strings << "\n";
+    }
+
     wb << "initiator: " << initiator << "\n";
 
+    bool write_settings = 1 <= version && settings && !settings->empty();
+    if (write_settings)
+    {
+        ASTSetQuery ast;
+        ast.is_standalone = false;
+        ast.changes = *settings;
+        wb << "settings: " << serializeAST(ast) << "\n";
+    }
+
     return wb.str();
 }
 
@@ -64,59 +92,82 @@ void DDLLogEntry::parse(const String & data)
 {
     ReadBufferFromString rb(data);
 
-    int version;
     rb >> "version: " >> version >> "\n";
-
-    if (version != CURRENT_VERSION)
-        throw Exception(ErrorCodes::UNKNOWN_FORMAT_VERSION, "Unknown DDLLogEntry format version: {}", version);
+    assertVersion();
 
     Strings host_id_strings;
     rb >> "query: " >> escape >> query >> "\n";
-    rb >> "hosts: " >> host_id_strings >> "\n";
+    if (version == 1)
+    {
+        rb >> "hosts: " >> host_id_strings >> "\n";
 
-    if (!rb.eof())
-        rb >> "initiator: " >> initiator >> "\n";
-    else
-        initiator.clear();
+        if (!rb.eof())
+            rb >> "initiator: " >> initiator >> "\n";
+        else
+            initiator.clear();
+    }
+    else if (version == 2)
+    {
+
+        if (!rb.eof() && *rb.position() == 'h')
+            rb >> "hosts: " >> host_id_strings >> "\n";
+        if (!rb.eof() && *rb.position() == 'i')
+            rb >> "initiator: " >> initiator >> "\n";
+        if (!rb.eof() && *rb.position() == 's')
+        {
+            String settings_str;
+            rb >> "settings: " >> settings_str >> "\n";
+            ParserSetQuery parser{true};
+            constexpr UInt64 max_size = 4096;
+            constexpr UInt64 max_depth = 16;
+            ASTPtr settings_ast = parseQuery(parser, settings_str, max_size, max_depth);
+            settings.emplace(std::move(settings_ast->as<ASTSetQuery>()->changes));
+        }
+    }
 
     assertEOF(rb);
 
-    hosts.resize(host_id_strings.size());
-    std::transform(host_id_strings.begin(), host_id_strings.end(), hosts.begin(), HostID::fromString);
+    if (!host_id_strings.empty())
+    {
+        hosts.resize(host_id_strings.size());
+        std::transform(host_id_strings.begin(), host_id_strings.end(), hosts.begin(), HostID::fromString);
+    }
 }
 
 
-void DDLTaskBase::parseQueryFromEntry(const Context & context)
+void DDLTaskBase::parseQueryFromEntry(ContextPtr context)
 {
     const char * begin = entry.query.data();
     const char * end = begin + entry.query.size();
 
     ParserQuery parser_query(end);
     String description;
-    query = parseQuery(parser_query, begin, end, description, 0, context.getSettingsRef().max_parser_depth);
+    query = parseQuery(parser_query, begin, end, description, 0, context->getSettingsRef().max_parser_depth);
 }
 
-std::unique_ptr<Context> DDLTaskBase::makeQueryContext(Context & from_context, const ZooKeeperPtr & /*zookeeper*/)
+ContextPtr DDLTaskBase::makeQueryContext(ContextPtr from_context, const ZooKeeperPtr & /*zookeeper*/)
 {
-    auto query_context = std::make_unique<Context>(from_context);
+    auto query_context = Context::createCopy(from_context);
     query_context->makeQueryContext();
     query_context->setCurrentQueryId(""); // generate random query_id
     query_context->getClientInfo().query_kind = ClientInfo::QueryKind::SECONDARY_QUERY;
+    if (entry.settings)
+        query_context->applySettingsChanges(*entry.settings);
     return query_context;
 }
 
 
-bool DDLTask::findCurrentHostID(const Context & global_context, Poco::Logger * log)
+bool DDLTask::findCurrentHostID(ContextPtr global_context, Poco::Logger * log)
 {
     bool host_in_hostlist = false;
 
     for (const HostID & host : entry.hosts)
     {
-        auto maybe_secure_port = global_context.getTCPPortSecure();
+        auto maybe_secure_port = global_context->getTCPPortSecure();
 
         /// The port is considered local if it matches TCP or TCP secure port that the server is listening.
         bool is_local_port = (maybe_secure_port && host.isLocalAddress(*maybe_secure_port))
-                             || host.isLocalAddress(global_context.getTCPPort());
+                             || host.isLocalAddress(global_context->getTCPPort());
 
         if (!is_local_port)
             continue;
@@ -138,14 +189,14 @@ bool DDLTask::findCurrentHostID(const Context & global_context, Poco::Logger * l
     return host_in_hostlist;
 }
 
-void DDLTask::setClusterInfo(const Context & context, Poco::Logger * log)
+void DDLTask::setClusterInfo(ContextPtr context, Poco::Logger * log)
 {
     auto * query_on_cluster = dynamic_cast<ASTQueryWithOnCluster *>(query.get());
     if (!query_on_cluster)
         throw Exception("Received unknown DDL query", ErrorCodes::UNKNOWN_TYPE_OF_QUERY);
 
     cluster_name = query_on_cluster->cluster;
-    cluster = context.tryGetCluster(cluster_name);
+    cluster = context->tryGetCluster(cluster_name);
 
     if (!cluster)
         throw Exception(ErrorCodes::INCONSISTENT_CLUSTER_DEFINITION,
@@ -226,7 +277,7 @@ bool DDLTask::tryFindHostInCluster()
     return found_exact_match;
 }
 
-bool DDLTask::tryFindHostInClusterViaResolving(const Context & context)
+bool DDLTask::tryFindHostInClusterViaResolving(ContextPtr context)
 {
     const auto & shards = cluster->getShardsAddresses();
     bool found_via_resolving = false;
@@ -237,9 +288,9 @@ bool DDLTask::tryFindHostInClusterViaResolving(const Context & context)
         {
             const Cluster::Address & address = shards[shard_num][replica_num];
 
-            if (auto resolved = address.getResolvedAddress();
-                resolved && (isLocalAddress(*resolved, context.getTCPPort())
-                             || (context.getTCPPortSecure() && isLocalAddress(*resolved, *context.getTCPPortSecure()))))
+            if (auto resolved = address.getResolvedAddress(); resolved
+                && (isLocalAddress(*resolved, context->getTCPPort())
+                    || (context->getTCPPortSecure() && isLocalAddress(*resolved, *context->getTCPPortSecure()))))
             {
                 if (found_via_resolving)
                 {
@@ -293,7 +344,18 @@ String DatabaseReplicatedTask::getShardID() const
     return database->shard_name;
 }
 
-std::unique_ptr<Context> DatabaseReplicatedTask::makeQueryContext(Context & from_context, const ZooKeeperPtr & zookeeper)
+void DatabaseReplicatedTask::parseQueryFromEntry(ContextPtr context)
+{
+    DDLTaskBase::parseQueryFromEntry(context);
+    if (auto * ddl_query = dynamic_cast<ASTQueryWithTableAndOutput *>(query.get()))
+    {
+        /// Update database name with actual name of local database
+        assert(ddl_query->database.empty());
+        ddl_query->database = database->getDatabaseName();
+    }
+}
+
+ContextPtr DatabaseReplicatedTask::makeQueryContext(ContextPtr from_context, const ZooKeeperPtr & zookeeper)
 {
     auto query_context = DDLTaskBase::makeQueryContext(from_context, zookeeper);
     query_context->getClientInfo().query_kind = ClientInfo::QueryKind::SECONDARY_QUERY;
@@ -320,6 +382,8 @@ std::unique_ptr<Context> DatabaseReplicatedTask::makeQueryContext(Context & from
 
 String DDLTaskBase::getLogEntryName(UInt32 log_entry_number)
 {
+    /// Sequential counter in ZooKeeper is Int32.
+    assert(log_entry_number < std::numeric_limits<Int32>::max());
     constexpr size_t seq_node_digits = 10;
     String number = toString(log_entry_number);
     String name = "query-" + String(seq_node_digits - number.size(), '0') + number;
@@ -330,7 +394,9 @@ UInt32 DDLTaskBase::getLogEntryNumber(const String & log_entry_name)
 {
     constexpr const char * name = "query-";
     assert(startsWith(log_entry_name, name));
-    return parse<UInt32>(log_entry_name.substr(strlen(name)));
+    UInt32 num = parse<UInt32>(log_entry_name.substr(strlen(name)));
+    assert(num < std::numeric_limits<Int32>::max());
+    return num;
 }
 
 void ZooKeeperMetadataTransaction::commit()
@@ -341,4 +407,11 @@ void ZooKeeperMetadataTransaction::commit()
     state = COMMITTED;
 }
 
+ClusterPtr tryGetReplicatedDatabaseCluster(const String & cluster_name)
+{
+    if (const auto * replicated_db = dynamic_cast<const DatabaseReplicated *>(DatabaseCatalog::instance().tryGetDatabase(cluster_name).get()))
+        return replicated_db->getCluster();
+    return {};
+}
+
 }
diff --git a/src/Interpreters/DDLTask.h b/src/Interpreters/DDLTask.h
index 18c1f4c80cd..874a29f051d 100644
--- a/src/Interpreters/DDLTask.h
+++ b/src/Interpreters/DDLTask.h
@@ -1,4 +1,5 @@
 #pragma once
+
 #include <Core/Types.h>
 #include <Interpreters/Cluster.h>
 #include <Common/ZooKeeper/Types.h>
@@ -18,6 +19,7 @@ namespace DB
 
 class ASTQueryWithOnCluster;
 using ZooKeeperPtr = std::shared_ptr<zkutil::ZooKeeper>;
+using ClusterPtr = std::shared_ptr<Cluster>;
 class DatabaseReplicated;
 
 class ZooKeeperMetadataTransaction;
@@ -56,15 +58,16 @@ struct HostID
 
 struct DDLLogEntry
 {
+    UInt64 version = 1;
     String query;
     std::vector<HostID> hosts;
     String initiator; // optional
+    std::optional<SettingsChanges> settings;
 
-    static constexpr int CURRENT_VERSION = 1;
-
+    void setSettingsIfRequired(ContextPtr context);
     String toString() const;
-
     void parse(const String & data);
+    void assertVersion() const;
 };
 
 struct DDLTaskBase
@@ -91,11 +94,11 @@ struct DDLTaskBase
     DDLTaskBase(const DDLTaskBase &) = delete;
     virtual ~DDLTaskBase() = default;
 
-    void parseQueryFromEntry(const Context & context);
+    virtual void parseQueryFromEntry(ContextPtr context);
 
     virtual String getShardID() const = 0;
 
-    virtual std::unique_ptr<Context> makeQueryContext(Context & from_context, const ZooKeeperPtr & zookeeper);
+    virtual ContextPtr makeQueryContext(ContextPtr from_context, const ZooKeeperPtr & zookeeper);
 
     inline String getActiveNodePath() const { return entry_path + "/active/" + host_id_str; }
     inline String getFinishedNodePath() const { return entry_path + "/finished/" + host_id_str; }
@@ -109,15 +112,15 @@ struct DDLTask : public DDLTaskBase
 {
     DDLTask(const String & name, const String & path) : DDLTaskBase(name, path) {}
 
-    bool findCurrentHostID(const Context & global_context, Poco::Logger * log);
+    bool findCurrentHostID(ContextPtr global_context, Poco::Logger * log);
 
-    void setClusterInfo(const Context & context, Poco::Logger * log);
+    void setClusterInfo(ContextPtr context, Poco::Logger * log);
 
     String getShardID() const override;
 
 private:
     bool tryFindHostInCluster();
-    bool tryFindHostInClusterViaResolving(const Context & context);
+    bool tryFindHostInClusterViaResolving(ContextPtr context);
 
     HostID host_id;
     String cluster_name;
@@ -132,7 +135,8 @@ struct DatabaseReplicatedTask : public DDLTaskBase
     DatabaseReplicatedTask(const String & name, const String & path, DatabaseReplicated * database_);
 
     String getShardID() const override;
-    std::unique_ptr<Context> makeQueryContext(Context & from_context, const ZooKeeperPtr & zookeeper) override;
+    void parseQueryFromEntry(ContextPtr context) override;
+    ContextPtr makeQueryContext(ContextPtr from_context, const ZooKeeperPtr & zookeeper) override;
 
     DatabaseReplicated * database;
 };
@@ -189,7 +193,9 @@ public:
 
     void commit();
 
-    ~ZooKeeperMetadataTransaction() { assert(isExecuted() || std::uncaught_exception()); }
+    ~ZooKeeperMetadataTransaction() { assert(isExecuted() || std::uncaught_exceptions()); }
 };
 
+ClusterPtr tryGetReplicatedDatabaseCluster(const String & cluster_name);
+
 }
diff --git a/src/Interpreters/DDLWorker.cpp b/src/Interpreters/DDLWorker.cpp
index 67f716c235c..1c023f757f8 100644
--- a/src/Interpreters/DDLWorker.cpp
+++ b/src/Interpreters/DDLWorker.cpp
@@ -29,6 +29,7 @@
 #include <common/logger_useful.h>
 #include <random>
 #include <pcg_random.hpp>
+#include <ext/scope_guard_safe.h>
 
 namespace fs = std::filesystem;
 
@@ -48,6 +49,7 @@ namespace ErrorCodes
     extern const int MEMORY_LIMIT_EXCEEDED;
 }
 
+constexpr const char * TASK_PROCESSED_OUT_REASON = "Task has been already processed";
 
 namespace
 {
@@ -147,9 +149,15 @@ std::unique_ptr<ZooKeeperLock> createSimpleZooKeeperLock(
 }
 
 
-DDLWorker::DDLWorker(int pool_size_, const std::string & zk_root_dir, const Context & context_, const Poco::Util::AbstractConfiguration * config, const String & prefix,
-                     const String & logger_name, const CurrentMetrics::Metric * max_entry_metric_)
-    : context(context_)
+DDLWorker::DDLWorker(
+    int pool_size_,
+    const std::string & zk_root_dir,
+    ContextPtr context_,
+    const Poco::Util::AbstractConfiguration * config,
+    const String & prefix,
+    const String & logger_name,
+    const CurrentMetrics::Metric * max_entry_metric_)
+    : context(Context::createCopy(context_))
     , log(&Poco::Logger::get(logger_name))
     , pool_size(pool_size_)
     , max_entry_metric(max_entry_metric_)
@@ -175,16 +183,16 @@ DDLWorker::DDLWorker(int pool_size_, const std::string & zk_root_dir, const Cont
         max_tasks_in_queue = std::max<UInt64>(1, config->getUInt64(prefix + ".max_tasks_in_queue", max_tasks_in_queue));
 
         if (config->has(prefix + ".profile"))
-            context.setSetting("profile", config->getString(prefix + ".profile"));
+            context->setSetting("profile", config->getString(prefix + ".profile"));
     }
 
-    if (context.getSettingsRef().readonly)
+    if (context->getSettingsRef().readonly)
     {
         LOG_WARNING(log, "Distributed DDL worker is run with readonly settings, it will not be able to execute DDL queries Set appropriate system_profile or distributed_ddl.profile to fix this.");
     }
 
     host_fqdn = getFQDNOrHostName();
-    host_fqdn_id = Cluster::Address::toString(host_fqdn, context.getTCPPort());
+    host_fqdn_id = Cluster::Address::toString(host_fqdn, context->getTCPPort());
 }
 
 void DDLWorker::startup()
@@ -223,7 +231,7 @@ ZooKeeperPtr DDLWorker::getAndSetZooKeeper()
     std::lock_guard lock(zookeeper_mutex);
 
     if (!current_zookeeper || current_zookeeper->expired())
-        current_zookeeper = context.getZooKeeper();
+        current_zookeeper = context->getZooKeeper();
 
     return current_zookeeper;
 }
@@ -290,7 +298,7 @@ DDLTaskPtr DDLWorker::initAndCheckTask(const String & entry_name, String & out_r
 
     if (zookeeper->exists(task->getFinishedNodePath()))
     {
-        out_reason = "Task has been already processed";
+        out_reason = TASK_PROCESSED_OUT_REASON;
         return {};
     }
 
@@ -305,46 +313,138 @@ static void filterAndSortQueueNodes(Strings & all_nodes)
     std::sort(all_nodes.begin(), all_nodes.end());
 }
 
-void DDLWorker::scheduleTasks()
+void DDLWorker::scheduleTasks(bool reinitialized)
 {
     LOG_DEBUG(log, "Scheduling tasks");
     auto zookeeper = tryGetZooKeeper();
 
-    for (auto & task : current_tasks)
+    /// Main thread of DDLWorker was restarted, probably due to lost connection with ZooKeeper.
+    /// We have some unfinished tasks.
+    /// To avoid duplication of some queries we should try to write execution status again.
+    /// To avoid skipping of some entries which were not executed we should be careful when choosing begin_node to start from.
+    /// NOTE: It does not protect from all cases of query duplication, see also comments in processTask(...)
+    if (reinitialized)
     {
-        /// Main thread of DDLWorker was restarted, probably due to lost connection with ZooKeeper.
-        /// We have some unfinished tasks. To avoid duplication of some queries, try to write execution status.
-        bool task_still_exists = zookeeper->exists(task->entry_path);
-        bool status_written = zookeeper->exists(task->getFinishedNodePath());
-        if (task->was_executed && !status_written && task_still_exists)
+        if (current_tasks.empty())
+            LOG_TRACE(log, "Don't have unfinished tasks after restarting");
+        else
+            LOG_INFO(log, "Have {} unfinished tasks, will check them", current_tasks.size());
+        assert(current_tasks.size() <= pool_size + (worker_pool != nullptr));
+        auto task_it = current_tasks.begin();
+        while (task_it != current_tasks.end())
         {
-            processTask(*task, zookeeper);
+            auto & task = *task_it;
+            if (task->completely_processed)
+            {
+                assert(task->was_executed);
+                /// Status must be written (but finished/ node may not exist if entry was deleted).
+                /// If someone is deleting entry concurrently, then /active status dir must not exist.
+                assert(zookeeper->exists(task->getFinishedNodePath()) || !zookeeper->exists(fs::path(task->entry_path) / "active"));
+                ++task_it;
+            }
+            else if (task->was_executed)
+            {
+                /// Connection was lost on attempt to write status. Will retry.
+                bool status_written = zookeeper->exists(task->getFinishedNodePath());
+                /// You might think that the following condition is redundant, because status_written implies completely_processed.
+                /// But it's wrong. It's possible that (!task->completely_processed && status_written)
+                /// if ZooKeeper successfully received and processed our request
+                /// but we lost connection while waiting for the response.
+                /// Yeah, distributed systems is a zoo.
+                if (status_written)
+                    task->completely_processed = true;
+                else
+                    processTask(*task, zookeeper);
+                ++task_it;
+            }
+            else
+            {
+                /// We didn't even executed a query, so let's just remove it.
+                /// We will try to read the task again and execute it from the beginning.
+                /// NOTE: We can safely compare entry names as Strings, because they are padded.
+                /// Entry name always starts with "query-" and contain exactly 10 decimal digits
+                /// of log entry number (with leading zeros).
+                if (!first_failed_task_name || task->entry_name < *first_failed_task_name)
+                    first_failed_task_name = task->entry_name;
+                task_it = current_tasks.erase(task_it);
+            }
         }
     }
 
     Strings queue_nodes = zookeeper->getChildren(queue_dir, nullptr, queue_updated_event);
+    size_t size_before_filtering = queue_nodes.size();
     filterAndSortQueueNodes(queue_nodes);
-    if (queue_nodes.empty())
-    {
-        LOG_TRACE(log, "No tasks to schedule");
-        return;
-    }
-    else if (max_tasks_in_queue < queue_nodes.size())
+    /// The following message is too verbose, but it can be useful too debug mysterious test failures in CI
+    LOG_TRACE(log, "scheduleTasks: initialized={}, size_before_filtering={}, queue_size={}, "
+                   "entries={}..{}, "
+                   "first_failed_task_name={}, current_tasks_size={},"
+                   "last_current_task={},"
+                   "last_skipped_entry_name={}",
+                   initialized, size_before_filtering, queue_nodes.size(),
+                   queue_nodes.empty() ? "none" : queue_nodes.front(), queue_nodes.empty() ? "none" : queue_nodes.back(),
+                   first_failed_task_name ? *first_failed_task_name : "none", current_tasks.size(),
+                   current_tasks.empty() ? "none" : current_tasks.back()->entry_name,
+                   last_skipped_entry_name ? *last_skipped_entry_name : "none");
+
+    if (max_tasks_in_queue < queue_nodes.size())
         cleanup_event->set();
 
-    bool server_startup = current_tasks.empty();
+    /// Detect queue start, using:
+    /// - skipped tasks
+    /// - in memory tasks (that are currently active or were finished recently)
+    /// - failed tasks (that should be processed again)
     auto begin_node = queue_nodes.begin();
-
-    if (!server_startup)
+    if (first_failed_task_name)
     {
-        /// We will recheck status of last executed tasks. It's useful if main thread was just restarted.
-        auto & min_task = *std::min_element(current_tasks.begin(), current_tasks.end());
-        String min_entry_name = last_skipped_entry_name ? std::min(min_task->entry_name, *last_skipped_entry_name) : min_task->entry_name;
-        begin_node = std::upper_bound(queue_nodes.begin(), queue_nodes.end(), min_entry_name);
-        current_tasks.clear();
+        /// If we had failed tasks, then we should start from the first failed task.
+        assert(reinitialized);
+        begin_node = std::lower_bound(queue_nodes.begin(), queue_nodes.end(), first_failed_task_name);
+    }
+    else
+    {
+        /// We had no failed tasks. Let's just choose the maximum entry we have previously seen.
+        String last_task_name;
+        if (!current_tasks.empty())
+            last_task_name = current_tasks.back()->entry_name;
+        if (last_skipped_entry_name && last_task_name < *last_skipped_entry_name)
+            last_task_name = *last_skipped_entry_name;
+        begin_node = std::upper_bound(queue_nodes.begin(), queue_nodes.end(), last_task_name);
     }
 
-    assert(current_tasks.empty());
+    if (begin_node == queue_nodes.end())
+        LOG_DEBUG(log, "No tasks to schedule");
+    else
+        LOG_DEBUG(log, "Will schedule {} tasks starting from {}", std::distance(begin_node, queue_nodes.end()), *begin_node);
+
+    /// Let's ensure that it's exactly the first task we should process.
+    /// Maybe such asserts are too paranoid and excessive,
+    /// but it's easy enough to break DDLWorker in a very unobvious way by making some minor change in code.
+    [[maybe_unused]] bool have_no_tasks_info = !first_failed_task_name && current_tasks.empty() && !last_skipped_entry_name;
+    assert(have_no_tasks_info || queue_nodes.end() == std::find_if(queue_nodes.begin(), queue_nodes.end(), [&](const String & entry_name)
+    {
+        /// We should return true if some invariants are violated.
+        String reason;
+        auto task = initAndCheckTask(entry_name, reason, zookeeper);
+        bool maybe_currently_processing = current_tasks.end() != std::find_if(current_tasks.begin(), current_tasks.end(), [&](const auto & t)
+        {
+            return t->entry_name == entry_name;
+        });
+        /// begin_node is something like a log pointer
+        if (begin_node == queue_nodes.end() || entry_name < *begin_node)
+        {
+            /// Return true if entry should be scheduled.
+            /// There is a minor race condition: initAndCheckTask(...) may return not null
+            /// if someone is deleting outdated entry right now (including finished/ nodes), so we also check active/ status dir.
+            bool maybe_concurrently_deleting = task && !zookeeper->exists(fs::path(task->entry_path) / "active");
+            return task && !maybe_concurrently_deleting && !maybe_currently_processing;
+        }
+        else
+        {
+            /// Return true if entry should not be scheduled.
+            bool processed = !task && reason == TASK_PROCESSED_OUT_REASON;
+            return processed || maybe_currently_processing;
+        }
+    }));
 
     for (auto it = begin_node; it != queue_nodes.end() && !stop_flag; ++it)
     {
@@ -365,7 +465,7 @@ void DDLWorker::scheduleTasks()
 
         if (worker_pool)
         {
-            worker_pool->scheduleOrThrowOnError([this, &saved_task, &zookeeper]()
+            worker_pool->scheduleOrThrowOnError([this, &saved_task, zookeeper]()
             {
                 setThreadName("DDLWorkerExec");
                 processTask(saved_task, zookeeper);
@@ -381,8 +481,18 @@ void DDLWorker::scheduleTasks()
 DDLTaskBase & DDLWorker::saveTask(DDLTaskPtr && task)
 {
     current_tasks.remove_if([](const DDLTaskPtr & t) { return t->completely_processed.load(); });
-    assert(current_tasks.size() <= pool_size);
+    /// Tasks are scheduled and executed in main thread <==> Parallel execution is disabled
+    assert((worker_pool != nullptr) == (1 < pool_size));
+    /// Parallel execution is disabled ==> All previous tasks are failed to start or finished,
+    /// so current tasks list must be empty when we are ready to process new one.
+    assert(worker_pool || current_tasks.empty());
+    /// Parallel execution is enabled ==> Not more than pool_size tasks are currently executing.
+    /// Note: If current_tasks.size() == pool_size, then all worker threads are busy,
+    /// so we will wait on worker_pool->scheduleOrThrowOnError(...)
+    assert(!worker_pool || current_tasks.size() <= pool_size);
     current_tasks.emplace_back(std::move(task));
+    if (first_failed_task_name && *first_failed_task_name == current_tasks.back()->entry_name)
+        first_failed_task_name.reset();
     return *current_tasks.back();
 }
 
@@ -401,8 +511,8 @@ bool DDLWorker::tryExecuteQuery(const String & query, DDLTaskBase & task, const
     {
         auto query_context = task.makeQueryContext(context, zookeeper);
         if (!task.is_initial_query)
-            query_scope.emplace(*query_context);
-        executeQuery(istr, ostr, !task.is_initial_query, *query_context, {});
+            query_scope.emplace(query_context);
+        executeQuery(istr, ostr, !task.is_initial_query, query_context, {});
 
         if (auto txn = query_context->getZooKeeperMetadataTransaction())
         {
@@ -469,10 +579,15 @@ void DDLWorker::updateMaxDDLEntryID(const String & entry_name)
 void DDLWorker::processTask(DDLTaskBase & task, const ZooKeeperPtr & zookeeper)
 {
     LOG_DEBUG(log, "Processing task {} ({})", task.entry_name, task.entry.query);
+    assert(!task.completely_processed);
 
     String active_node_path = task.getActiveNodePath();
     String finished_node_path = task.getFinishedNodePath();
 
+    /// Step 1: Create ephemeral node in active/ status dir.
+    /// It allows other hosts to understand that task is currently executing (useful for system.distributed_ddl_queue)
+    /// and protects from concurrent deletion or the task.
+
     /// It will tryRemove(...) on exception
     auto active_node = zkutil::EphemeralNodeHolder::existing(active_node_path, *zookeeper);
 
@@ -488,7 +603,21 @@ void DDLWorker::processTask(DDLTaskBase & task, const ZooKeeperPtr & zookeeper)
 
         /// Status dirs were not created in enqueueQuery(...) or someone is removing entry
         if (create_active_res == Coordination::Error::ZNONODE)
+        {
+            assert(dynamic_cast<DatabaseReplicatedTask *>(&task) == nullptr);
+            if (task.was_executed)
+            {
+                /// Special case:
+                /// Task was executed (and we are trying to write status after connection loss) ==> Status dirs were previously created.
+                /// (Status dirs were previously created AND active/ does not exist) ==> Task was removed.
+                /// We cannot write status, but it's not required anymore, because no one will try to execute it again.
+                /// So we consider task as completely processed.
+                LOG_WARNING(log, "Task {} is executed, but looks like entry {} was deleted, cannot write status", task.entry_name, task.entry_path);
+                task.completely_processed = true;
+                return;
+            }
             createStatusDirs(task.entry_path, zookeeper);
+        }
 
         if (create_active_res == Coordination::Error::ZNODEEXISTS)
         {
@@ -498,7 +627,7 @@ void DDLWorker::processTask(DDLTaskBase & task, const ZooKeeperPtr & zookeeper)
             String dummy;
             if (zookeeper->tryGet(active_node_path, dummy, nullptr, eph_node_disappeared))
             {
-                constexpr int timeout_ms = 5000;
+                constexpr int timeout_ms = 30 * 1000;
                 if (!eph_node_disappeared->tryWait(timeout_ms))
                     throw Exception(ErrorCodes::LOGICAL_ERROR, "Ephemeral node {} still exists, "
                                     "probably it's owned by someone else", active_node_path);
@@ -508,6 +637,7 @@ void DDLWorker::processTask(DDLTaskBase & task, const ZooKeeperPtr & zookeeper)
         zookeeper->create(active_node_path, {}, zkutil::CreateMode::Ephemeral);
     }
 
+    /// Step 2: Execute query from the task.
     if (!task.was_executed)
     {
         /// If table and database engine supports it, they will execute task.ops by their own in a single transaction
@@ -528,7 +658,7 @@ void DDLWorker::processTask(DDLTaskBase & task, const ZooKeeperPtr & zookeeper)
                 if (!query_with_table->table.empty())
                 {
                     /// It's not CREATE DATABASE
-                    auto table_id = context.tryResolveStorageID(*query_with_table, Context::ResolveOrdinary);
+                    auto table_id = context->tryResolveStorageID(*query_with_table, Context::ResolveOrdinary);
                     storage = DatabaseCatalog::instance().tryGetTable(table_id, context);
                 }
 
@@ -578,6 +708,7 @@ void DDLWorker::processTask(DDLTaskBase & task, const ZooKeeperPtr & zookeeper)
 
     updateMaxDDLEntryID(task.entry_name);
 
+    /// Step 3: Create node in finished/ status dir and write execution status.
     /// FIXME: if server fails right here, the task will be executed twice. We need WAL here.
     /// NOTE: If ZooKeeper connection is lost here, we will try again to write query status.
     /// NOTE: If both table and database are replicated, task is executed in single ZK transaction.
@@ -709,7 +840,7 @@ bool DDLWorker::tryExecuteQueryOnLeaderReplica(
             zookeeper->set(tries_to_execute_path, toString(counter + 1));
 
             task.ops.push_back(create_shard_flag);
-            SCOPE_EXIT({ if (!executed_by_us && !task.ops.empty()) task.ops.pop_back(); });
+            SCOPE_EXIT_MEMORY({ if (!executed_by_us && !task.ops.empty()) task.ops.pop_back(); });
 
             /// If the leader will unexpectedly changed this method will return false
             /// and on the next iteration new leader will take lock
@@ -761,7 +892,7 @@ bool DDLWorker::tryExecuteQueryOnLeaderReplica(
         else /// If we exceeded amount of tries
         {
             LOG_WARNING(log, "Task {} was not executed by anyone, maximum number of retries exceeded", task.entry_name);
-            task.execution_status = ExecutionStatus(ErrorCodes::UNFINISHED, "Cannot execute replicated DDL query, maximum retires exceeded");
+            task.execution_status = ExecutionStatus(ErrorCodes::UNFINISHED, "Cannot execute replicated DDL query, maximum retries exceeded");
         }
         return false;
     }
@@ -930,11 +1061,11 @@ String DDLWorker::enqueueQuery(DDLLogEntry & entry)
 }
 
 
-void DDLWorker::initializeMainThread()
+bool DDLWorker::initializeMainThread()
 {
     assert(!initialized);
     setThreadName("DDLWorker");
-    LOG_DEBUG(log, "Started DDLWorker thread");
+    LOG_DEBUG(log, "Initializing DDLWorker thread");
 
     while (!stop_flag)
     {
@@ -943,7 +1074,7 @@ void DDLWorker::initializeMainThread()
             auto zookeeper = getAndSetZooKeeper();
             zookeeper->createAncestors(fs::path(queue_dir) / "");
             initialized = true;
-            return;
+            return true;
         }
         catch (const Coordination::Exception & e)
         {
@@ -964,6 +1095,8 @@ void DDLWorker::initializeMainThread()
         /// Avoid busy loop when ZooKeeper is not available.
         sleepForSeconds(5);
     }
+
+    return false;
 }
 
 void DDLWorker::runMainThread()
@@ -989,15 +1122,19 @@ void DDLWorker::runMainThread()
     {
         try
         {
+            bool reinitialized = !initialized;
+
             /// Reinitialize DDLWorker state (including ZooKeeper connection) if required
             if (!initialized)
             {
-                initializeMainThread();
+                /// Stopped
+                if (!initializeMainThread())
+                    break;
                 LOG_DEBUG(log, "Initialized DDLWorker thread");
             }
 
             cleanup_event->set();
-            scheduleTasks();
+            scheduleTasks(reinitialized);
 
             LOG_DEBUG(log, "Waiting for queue updates");
             queue_updated_event->wait();
@@ -1007,6 +1144,9 @@ void DDLWorker::runMainThread()
             if (Coordination::isHardwareError(e.code))
             {
                 initialized = false;
+                /// Wait for pending async tasks
+                if (1 < pool_size)
+                    worker_pool = std::make_unique<ThreadPool>(pool_size);
                 LOG_INFO(log, "Lost ZooKeeper connection, will try to connect again: {}", getCurrentExceptionMessage(true));
             }
             else
diff --git a/src/Interpreters/DDLWorker.h b/src/Interpreters/DDLWorker.h
index 8b0a8f038a0..e92644f0f99 100644
--- a/src/Interpreters/DDLWorker.h
+++ b/src/Interpreters/DDLWorker.h
@@ -42,7 +42,7 @@ class AccessRightsElements;
 class DDLWorker
 {
 public:
-    DDLWorker(int pool_size_, const std::string & zk_root_dir, const Context & context_, const Poco::Util::AbstractConfiguration * config, const String & prefix,
+    DDLWorker(int pool_size_, const std::string & zk_root_dir, ContextPtr context_, const Poco::Util::AbstractConfiguration * config, const String & prefix,
               const String & logger_name = "DDLWorker", const CurrentMetrics::Metric * max_entry_metric_ = nullptr);
     virtual ~DDLWorker();
 
@@ -69,7 +69,7 @@ protected:
     ZooKeeperPtr getAndSetZooKeeper();
 
     /// Iterates through queue tasks in ZooKeeper, runs execution of new tasks
-    void scheduleTasks();
+    void scheduleTasks(bool reinitialized);
 
     DDLTaskBase & saveTask(DDLTaskPtr && task);
 
@@ -104,13 +104,13 @@ protected:
     /// Init task node
     void createStatusDirs(const std::string & node_path, const ZooKeeperPtr & zookeeper);
 
-    virtual void initializeMainThread();
+    /// Return false if the worker was stopped (stop_flag = true)
+    virtual bool initializeMainThread();
 
     void runMainThread();
     void runCleanupThread();
 
-protected:
-    Context context;
+    ContextPtr context;
     Poco::Logger * log;
 
     std::string host_fqdn;      /// current host domain name
@@ -122,6 +122,7 @@ protected:
 
     /// Save state of executed task to avoid duplicate execution on ZK error
     std::optional<String> last_skipped_entry_name;
+    std::optional<String> first_failed_task_name;
     std::list<DDLTaskPtr> current_tasks;
 
     std::shared_ptr<Poco::Event> queue_updated_event = std::make_shared<Poco::Event>();
diff --git a/src/Interpreters/DNSCacheUpdater.cpp b/src/Interpreters/DNSCacheUpdater.cpp
index 723945165e3..27d0c3abd92 100644
--- a/src/Interpreters/DNSCacheUpdater.cpp
+++ b/src/Interpreters/DNSCacheUpdater.cpp
@@ -1,15 +1,16 @@
 #include "DNSCacheUpdater.h"
-#include <Common/DNSResolver.h>
+
 #include <Interpreters/Context.h>
+#include <Common/DNSResolver.h>
 
 
 namespace DB
 {
 
-DNSCacheUpdater::DNSCacheUpdater(Context & context_, Int32 update_period_seconds_)
-    : context(context_),
-    update_period_seconds(update_period_seconds_),
-    pool(context_.getSchedulePool())
+DNSCacheUpdater::DNSCacheUpdater(ContextPtr context_, Int32 update_period_seconds_)
+    : WithContext(context_)
+    , update_period_seconds(update_period_seconds_)
+    , pool(getContext()->getSchedulePool())
 {
     task_handle = pool.createTask("DNSCacheUpdater", [this]{ run(); });
 }
@@ -24,7 +25,7 @@ void DNSCacheUpdater::run()
         LOG_INFO(&Poco::Logger::get("DNSCacheUpdater"), "IPs of some hosts have been changed. Will reload cluster config.");
         try
         {
-            context.reloadClusterConfig();
+            getContext()->reloadClusterConfig();
         }
         catch (...)
         {
diff --git a/src/Interpreters/DNSCacheUpdater.h b/src/Interpreters/DNSCacheUpdater.h
index 2cc0f9f0f21..bbbc2ab3d21 100644
--- a/src/Interpreters/DNSCacheUpdater.h
+++ b/src/Interpreters/DNSCacheUpdater.h
@@ -1,26 +1,24 @@
 #pragma once
 
 #include <Core/BackgroundSchedulePool.h>
+#include <Interpreters/Context_fwd.h>
 #include <Common/Stopwatch.h>
 
 
 namespace DB
 {
 
-class Context;
-
 /// Add a task to BackgroundProcessingPool that resolves all hosts and updates cache with constant period.
-class DNSCacheUpdater
+class DNSCacheUpdater : WithContext
 {
 public:
-    explicit DNSCacheUpdater(Context & context, Int32 update_period_seconds_);
+    DNSCacheUpdater(ContextPtr context, Int32 update_period_seconds_);
     ~DNSCacheUpdater();
     void start();
 
 private:
     void run();
 
-    Context & context;
     Int32 update_period_seconds;
 
     BackgroundSchedulePool & pool;
diff --git a/src/Interpreters/DatabaseAndTableWithAlias.h b/src/Interpreters/DatabaseAndTableWithAlias.h
index b889509c264..a4773ec435b 100644
--- a/src/Interpreters/DatabaseAndTableWithAlias.h
+++ b/src/Interpreters/DatabaseAndTableWithAlias.h
@@ -16,8 +16,6 @@ namespace DB
 class ASTSelectQuery;
 class ASTIdentifier;
 struct ASTTableExpression;
-class Context;
-
 
 /// Extracts database name (and/or alias) from table expression or identifier
 struct DatabaseAndTableWithAlias
@@ -28,9 +26,9 @@ struct DatabaseAndTableWithAlias
     UUID uuid = UUIDHelpers::Nil;
 
     DatabaseAndTableWithAlias() = default;
-    DatabaseAndTableWithAlias(const ASTPtr & identifier_node, const String & current_database = "");
-    DatabaseAndTableWithAlias(const ASTIdentifier & identifier, const String & current_database = "");
-    DatabaseAndTableWithAlias(const ASTTableExpression & table_expression, const String & current_database = "");
+    explicit DatabaseAndTableWithAlias(const ASTPtr & identifier_node, const String & current_database = "");
+    explicit DatabaseAndTableWithAlias(const ASTIdentifier & identifier, const String & current_database = "");
+    explicit DatabaseAndTableWithAlias(const ASTTableExpression & table_expression, const String & current_database = "");
 
     /// "alias." or "table." if alias is empty
     String getQualifiedNamePrefix(bool with_dot = true) const;
@@ -75,14 +73,14 @@ struct TableWithColumnNamesAndTypes
 
     void addMaterializedColumns(const NamesAndTypesList & addition)
     {
-        addAdditionalColumns(alias_columns, addition);
+        addAdditionalColumns(materialized_columns, addition);
     }
 
 private:
     void addAdditionalColumns(NamesAndTypesList & target, const NamesAndTypesList & addition)
     {
         target.insert(target.end(), addition.begin(), addition.end());
-        for (auto & col : addition)
+        for (const auto & col : addition)
             names.insert(col.name);
     }
 
diff --git a/src/Interpreters/DatabaseCatalog.cpp b/src/Interpreters/DatabaseCatalog.cpp
index f27fb93b2d4..d88b87a73d4 100644
--- a/src/Interpreters/DatabaseCatalog.cpp
+++ b/src/Interpreters/DatabaseCatalog.cpp
@@ -48,9 +48,8 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
-TemporaryTableHolder::TemporaryTableHolder(const Context & context_,
-                                           const TemporaryTableHolder::Creator & creator, const ASTPtr & query)
-    : global_context(context_.getGlobalContext())
+TemporaryTableHolder::TemporaryTableHolder(ContextPtr context_, const TemporaryTableHolder::Creator & creator, const ASTPtr & query)
+    : WithContext(context_->getGlobalContext())
     , temporary_tables(DatabaseCatalog::instance().getDatabaseForTemporaryTables().get())
 {
     ASTPtr original_create;
@@ -73,13 +72,13 @@ TemporaryTableHolder::TemporaryTableHolder(const Context & context_,
     }
     auto table_id = StorageID(DatabaseCatalog::TEMPORARY_DATABASE, global_name, id);
     auto table = creator(table_id);
-    temporary_tables->createTable(global_context, global_name, table, original_create);
+    temporary_tables->createTable(getContext(), global_name, table, original_create);
     table->startup();
 }
 
 
 TemporaryTableHolder::TemporaryTableHolder(
-    const Context & context_,
+    ContextPtr context_,
     const ColumnsDescription & columns,
     const ConstraintsDescription & constraints,
     const ASTPtr & query,
@@ -103,7 +102,7 @@ TemporaryTableHolder::TemporaryTableHolder(
 }
 
 TemporaryTableHolder::TemporaryTableHolder(TemporaryTableHolder && rhs)
-        : global_context(rhs.global_context), temporary_tables(rhs.temporary_tables), id(rhs.id)
+        : WithContext(rhs.context), temporary_tables(rhs.temporary_tables), id(rhs.id)
 {
     rhs.id = UUIDHelpers::Nil;
 }
@@ -118,7 +117,7 @@ TemporaryTableHolder & TemporaryTableHolder::operator = (TemporaryTableHolder &&
 TemporaryTableHolder::~TemporaryTableHolder()
 {
     if (id != UUIDHelpers::Nil)
-        temporary_tables->dropTable(global_context, "_tmp_" + toString(id));
+        temporary_tables->dropTable(getContext(), "_tmp_" + toString(id));
 }
 
 StorageID TemporaryTableHolder::getGlobalTableID() const
@@ -128,7 +127,7 @@ StorageID TemporaryTableHolder::getGlobalTableID() const
 
 StoragePtr TemporaryTableHolder::getTable() const
 {
-    auto table = temporary_tables->tryGetTable("_tmp_" + toString(id), global_context);
+    auto table = temporary_tables->tryGetTable("_tmp_" + toString(id), getContext());
     if (!table)
         throw Exception("Temporary table " + getGlobalTableID().getNameForLogs() + " not found", ErrorCodes::LOGICAL_ERROR);
     return table;
@@ -137,13 +136,13 @@ StoragePtr TemporaryTableHolder::getTable() const
 
 void DatabaseCatalog::loadDatabases()
 {
-    drop_delay_sec = global_context.getConfigRef().getInt("database_atomic_delay_before_drop_table_sec", default_drop_delay_sec);
+    drop_delay_sec = getContext()->getConfigRef().getInt("database_atomic_delay_before_drop_table_sec", default_drop_delay_sec);
 
-    auto db_for_temporary_and_external_tables = std::make_shared<DatabaseMemory>(TEMPORARY_DATABASE, global_context);
+    auto db_for_temporary_and_external_tables = std::make_shared<DatabaseMemory>(TEMPORARY_DATABASE, getContext());
     attachDatabase(TEMPORARY_DATABASE, db_for_temporary_and_external_tables);
 
     loadMarkedAsDroppedTables();
-    auto task_holder = global_context.getSchedulePool().createTask("DatabaseCatalog", [this](){ this->dropTableDataTask(); });
+    auto task_holder = getContext()->getSchedulePool().createTask("DatabaseCatalog", [this](){ this->dropTableDataTask(); });
     drop_task = std::make_unique<BackgroundSchedulePoolTaskHolder>(std::move(task_holder));
     (*drop_task)->activate();
     std::lock_guard lock{tables_marked_dropped_mutex};
@@ -152,7 +151,7 @@ void DatabaseCatalog::loadDatabases()
 
     /// Another background thread which drops temporary LiveViews.
     /// We should start it after loadMarkedAsDroppedTables() to avoid race condition.
-    TemporaryLiveViewCleaner::instance().startupIfNecessary();
+    TemporaryLiveViewCleaner::instance().startup();
 }
 
 void DatabaseCatalog::shutdownImpl()
@@ -212,7 +211,7 @@ DatabaseAndTable DatabaseCatalog::tryGetByUUID(const UUID & uuid) const
 
 DatabaseAndTable DatabaseCatalog::getTableImpl(
     const StorageID & table_id,
-    const Context & context,
+    ContextPtr context_,
     std::optional<Exception> * exception) const
 {
     if (!table_id)
@@ -268,7 +267,7 @@ DatabaseAndTable DatabaseCatalog::getTableImpl(
         database = it->second;
     }
 
-    auto table = database->tryGetTable(table_id.table_name, context);
+    auto table = database->tryGetTable(table_id.table_name, context_);
     if (!table && exception)
             exception->emplace(ErrorCodes::UNKNOWN_TABLE, "Table {} doesn't exist", table_id.getNameForLogs());
     if (!table)
@@ -351,11 +350,11 @@ DatabasePtr DatabaseCatalog::detachDatabase(const String & database_name, bool d
     if (drop)
     {
         /// Delete the database.
-        db->drop(global_context);
+        db->drop(getContext());
 
         /// Old ClickHouse versions did not store database.sql files
         Poco::File database_metadata_file(
-                global_context.getPath() + "metadata/" + escapeForFileName(database_name) + ".sql");
+                getContext()->getPath() + "metadata/" + escapeForFileName(database_name) + ".sql");
         if (database_metadata_file.exists())
             database_metadata_file.remove(false);
     }
@@ -423,7 +422,7 @@ Databases DatabaseCatalog::getDatabases() const
     return databases;
 }
 
-bool DatabaseCatalog::isTableExist(const DB::StorageID & table_id, const Context & context) const
+bool DatabaseCatalog::isTableExist(const DB::StorageID & table_id, ContextPtr context_) const
 {
     if (table_id.hasUUID())
         return tryGetByUUID(table_id.uuid).second != nullptr;
@@ -435,12 +434,12 @@ bool DatabaseCatalog::isTableExist(const DB::StorageID & table_id, const Context
         if (iter != databases.end())
             db = iter->second;
     }
-    return db && db->isTableExist(table_id.table_name, context);
+    return db && db->isTableExist(table_id.table_name, context_);
 }
 
-void DatabaseCatalog::assertTableDoesntExist(const StorageID & table_id, const Context & context) const
+void DatabaseCatalog::assertTableDoesntExist(const StorageID & table_id, ContextPtr context_) const
 {
-    if (isTableExist(table_id, context))
+    if (isTableExist(table_id, context_))
         throw Exception("Table " + table_id.getNameForLogs() + " already exists.", ErrorCodes::TABLE_ALREADY_EXISTS);
 }
 
@@ -528,13 +527,13 @@ void DatabaseCatalog::updateUUIDMapping(const UUID & uuid, DatabasePtr database,
 
 std::unique_ptr<DatabaseCatalog> DatabaseCatalog::database_catalog;
 
-DatabaseCatalog::DatabaseCatalog(Context & global_context_)
-    : global_context(global_context_), log(&Poco::Logger::get("DatabaseCatalog"))
+DatabaseCatalog::DatabaseCatalog(ContextPtr global_context_)
+    : WithContext(global_context_), log(&Poco::Logger::get("DatabaseCatalog"))
 {
-    TemporaryLiveViewCleaner::init(global_context);
+    TemporaryLiveViewCleaner::init(global_context_);
 }
 
-DatabaseCatalog & DatabaseCatalog::init(Context & global_context_)
+DatabaseCatalog & DatabaseCatalog::init(ContextPtr global_context_)
 {
     if (database_catalog)
     {
@@ -568,9 +567,9 @@ void DatabaseCatalog::shutdown()
     }
 }
 
-DatabasePtr DatabaseCatalog::getDatabase(const String & database_name, const Context & local_context) const
+DatabasePtr DatabaseCatalog::getDatabase(const String & database_name, ContextPtr local_context) const
 {
-    String resolved_database = local_context.resolveDatabase(database_name);
+    String resolved_database = local_context->resolveDatabase(database_name);
     return getDatabase(resolved_database);
 }
 
@@ -635,32 +634,32 @@ bool DatabaseCatalog::isDictionaryExist(const StorageID & table_id) const
     return db && db->isDictionaryExist(table_id.getTableName());
 }
 
-StoragePtr DatabaseCatalog::getTable(const StorageID & table_id, const Context & context) const
+StoragePtr DatabaseCatalog::getTable(const StorageID & table_id, ContextPtr local_context) const
 {
     std::optional<Exception> exc;
-    auto res = getTableImpl(table_id, context, &exc);
+    auto res = getTableImpl(table_id, local_context, &exc);
     if (!res.second)
         throw Exception(*exc);
     return res.second;
 }
 
-StoragePtr DatabaseCatalog::tryGetTable(const StorageID & table_id, const Context & context) const
+StoragePtr DatabaseCatalog::tryGetTable(const StorageID & table_id, ContextPtr local_context) const
 {
-    return getTableImpl(table_id, context, nullptr).second;
+    return getTableImpl(table_id, local_context, nullptr).second;
 }
 
-DatabaseAndTable DatabaseCatalog::getDatabaseAndTable(const StorageID & table_id, const Context & context) const
+DatabaseAndTable DatabaseCatalog::getDatabaseAndTable(const StorageID & table_id, ContextPtr local_context) const
 {
     std::optional<Exception> exc;
-    auto res = getTableImpl(table_id, context, &exc);
+    auto res = getTableImpl(table_id, local_context, &exc);
     if (!res.second)
         throw Exception(*exc);
     return res;
 }
 
-DatabaseAndTable DatabaseCatalog::tryGetDatabaseAndTable(const StorageID & table_id, const Context & context) const
+DatabaseAndTable DatabaseCatalog::tryGetDatabaseAndTable(const StorageID & table_id, ContextPtr local_context) const
 {
-    return getTableImpl(table_id, context, nullptr);
+    return getTableImpl(table_id, local_context, nullptr);
 }
 
 void DatabaseCatalog::loadMarkedAsDroppedTables()
@@ -673,7 +672,7 @@ void DatabaseCatalog::loadMarkedAsDroppedTables()
     /// we should load them and enqueue cleanup to remove data from store/ and metadata from ZooKeeper
 
     std::map<String, StorageID> dropped_metadata;
-    String path = global_context.getPath() + "metadata_dropped/";
+    String path = getContext()->getPath() + "metadata_dropped/";
 
     if (!std::filesystem::exists(path))
     {
@@ -728,7 +727,7 @@ void DatabaseCatalog::loadMarkedAsDroppedTables()
 
 String DatabaseCatalog::getPathForDroppedMetadata(const StorageID & table_id) const
 {
-    return global_context.getPath() + "metadata_dropped/" +
+    return getContext()->getPath() + "metadata_dropped/" +
            escapeForFileName(table_id.getDatabaseName()) + "." +
            escapeForFileName(table_id.getTableName()) + "." +
            toString(table_id.uuid) + ".sql";
@@ -751,7 +750,8 @@ void DatabaseCatalog::enqueueDroppedTableCleanup(StorageID table_id, StoragePtr
     {
         /// Try load table from metadata to drop it correctly (e.g. remove metadata from zk or remove data from all volumes)
         LOG_INFO(log, "Trying load partially dropped table {} from {}", table_id.getNameForLogs(), dropped_metadata_path);
-        ASTPtr ast = DatabaseOnDisk::parseQueryFromMetadata(log, global_context, dropped_metadata_path, /*throw_on_error*/ false, /*remove_empty*/false);
+        ASTPtr ast = DatabaseOnDisk::parseQueryFromMetadata(
+            log, getContext(), dropped_metadata_path, /*throw_on_error*/ false, /*remove_empty*/ false);
         auto * create = typeid_cast<ASTCreateQuery *>(ast.get());
         assert(!create || create->uuid == table_id.uuid);
 
@@ -762,7 +762,7 @@ void DatabaseCatalog::enqueueDroppedTableCleanup(StorageID table_id, StoragePtr
             create->table = table_id.table_name;
             try
             {
-                table = createTableFromAST(*create, table_id.getDatabaseName(), data_path, global_context, false).second;
+                table = createTableFromAST(*create, table_id.getDatabaseName(), data_path, getContext(), false).second;
                 table->is_dropped = true;
             }
             catch (...)
@@ -889,7 +889,7 @@ void DatabaseCatalog::dropTableFinally(const TableMarkedAsDropped & table)
 
     /// Even if table is not loaded, try remove its data from disk.
     /// TODO remove data from all volumes
-    String data_path = global_context.getPath() + "store/" + getPathForUUID(table.table_id.uuid);
+    String data_path = getContext()->getPath() + "store/" + getPathForUUID(table.table_id.uuid);
     Poco::File table_data_dir{data_path};
     if (table_data_dir.exists())
     {
@@ -910,31 +910,6 @@ String DatabaseCatalog::getPathForUUID(const UUID & uuid)
     return toString(uuid).substr(0, uuid_prefix_len) + '/' + toString(uuid) + '/';
 }
 
-String DatabaseCatalog::resolveDictionaryName(const String & name) const
-{
-    /// If it's dictionary from Atomic database, then we need to convert qualified name to UUID.
-    /// Try to split name and get id from associated StorageDictionary.
-    /// If something went wrong, return name as is.
-
-    /// TODO support dot in name for dictionaries in Atomic databases
-    auto pos = name.find('.');
-    if (pos == std::string::npos || name.find('.', pos + 1) != std::string::npos)
-        return name;
-    String maybe_database_name = name.substr(0, pos);
-    String maybe_table_name = name.substr(pos + 1);
-
-    auto db_and_table = tryGetDatabaseAndTable({maybe_database_name, maybe_table_name}, global_context);
-    if (!db_and_table.first)
-        return name;
-    assert(db_and_table.second);
-    if (db_and_table.first->getUUID() == UUIDHelpers::Nil)
-        return name;
-    if (db_and_table.second->getName() != "Dictionary")
-        return name;
-
-    return toString(db_and_table.second->getStorageID().uuid);
-}
-
 void DatabaseCatalog::waitTableFinallyDropped(const UUID & uuid)
 {
     if (uuid == UUIDHelpers::Nil)
diff --git a/src/Interpreters/DatabaseCatalog.h b/src/Interpreters/DatabaseCatalog.h
index bb82dbfc440..388079b54f2 100644
--- a/src/Interpreters/DatabaseCatalog.h
+++ b/src/Interpreters/DatabaseCatalog.h
@@ -1,25 +1,28 @@
 #pragma once
-#include <Storages/IStorage_fwd.h>
+
+#include <Core/UUID.h>
+#include <Interpreters/Context_fwd.h>
 #include <Interpreters/StorageID.h>
 #include <Parsers/IAST_fwd.h>
-#include <Core/UUID.h>
-#include <Poco/Logger.h>
+#include <Storages/IStorage_fwd.h>
+
 #include <boost/noncopyable.hpp>
-#include <memory>
-#include <map>
-#include <set>
-#include <unordered_map>
-#include <unordered_set>
-#include <mutex>
-#include <shared_mutex>
+#include <Poco/Logger.h>
+
 #include <array>
 #include <list>
+#include <map>
+#include <memory>
+#include <mutex>
+#include <set>
+#include <shared_mutex>
+#include <unordered_map>
+#include <unordered_set>
 
 
 namespace DB
 {
 
-class Context;
 class IDatabase;
 class Exception;
 class ColumnsDescription;
@@ -51,7 +54,12 @@ public:
     /// NOTE: using std::map here (and not std::unordered_map) to avoid iterator invalidation on insertion.
     using Map = std::map<String, Entry>;
 
-    DDLGuard(Map & map_, std::shared_mutex & db_mutex_, std::unique_lock<std::mutex> guards_lock_, const String & elem, const String & database_name);
+    DDLGuard(
+        Map & map_,
+        std::shared_mutex & db_mutex_,
+        std::unique_lock<std::mutex> guards_lock_,
+        const String & elem,
+        const String & database_name);
     ~DDLGuard();
 
     /// Unlocks table name, keeps holding read lock for database name
@@ -74,15 +82,15 @@ using DDLGuardPtr = std::unique_ptr<DDLGuard>;
 /// Such table can be accessed from everywhere by its ID.
 /// Removes the table from database on destruction.
 /// TemporaryTableHolder object can be attached to a query or session Context, so table will be accessible through the context.
-struct TemporaryTableHolder : boost::noncopyable
+struct TemporaryTableHolder : boost::noncopyable, WithContext
 {
-    typedef std::function<StoragePtr(const StorageID &)> Creator;
+    using Creator = std::function<StoragePtr (const StorageID &)>;
 
-    TemporaryTableHolder(const Context & context, const Creator & creator, const ASTPtr & query = {});
+    TemporaryTableHolder(ContextPtr context, const Creator & creator, const ASTPtr & query = {});
 
     /// Creates temporary table with Engine=Memory
     TemporaryTableHolder(
-        const Context & context,
+        ContextPtr context,
         const ColumnsDescription & columns,
         const ConstraintsDescription & constraints,
         const ASTPtr & query = {},
@@ -99,7 +107,6 @@ struct TemporaryTableHolder : boost::noncopyable
 
     operator bool () const { return id != UUIDHelpers::Nil; }
 
-    const Context & global_context;
     IDatabase * temporary_tables = nullptr;
     UUID id = UUIDHelpers::Nil;
 };
@@ -109,13 +116,14 @@ using TemporaryTablesMapping = std::map<String, std::shared_ptr<TemporaryTableHo
 
 class BackgroundSchedulePoolTaskHolder;
 
-class DatabaseCatalog : boost::noncopyable
+/// For some reason Context is required to get Storage from Database object
+class DatabaseCatalog : boost::noncopyable, WithContext
 {
 public:
     static constexpr const char * TEMPORARY_DATABASE = "_temporary_and_external_tables";
     static constexpr const char * SYSTEM_DATABASE = "system";
 
-    static DatabaseCatalog & init(Context & global_context_);
+    static DatabaseCatalog & init(ContextPtr global_context_);
     static DatabaseCatalog & instance();
     static void shutdown();
 
@@ -146,19 +154,19 @@ public:
     Databases getDatabases() const;
 
     /// Same as getDatabase(const String & database_name), but if database_name is empty, current database of local_context is used
-    DatabasePtr getDatabase(const String & database_name, const Context & local_context) const;
+    DatabasePtr getDatabase(const String & database_name, ContextPtr local_context) const;
 
     /// For all of the following methods database_name in table_id must be not empty (even for temporary tables).
-    void assertTableDoesntExist(const StorageID & table_id, const Context & context) const;
-    bool isTableExist(const StorageID & table_id, const Context & context) const;
+    void assertTableDoesntExist(const StorageID & table_id, ContextPtr context) const;
+    bool isTableExist(const StorageID & table_id, ContextPtr context) const;
     bool isDictionaryExist(const StorageID & table_id) const;
 
-    StoragePtr getTable(const StorageID & table_id, const Context & context) const;
-    StoragePtr tryGetTable(const StorageID & table_id, const Context & context) const;
-    DatabaseAndTable getDatabaseAndTable(const StorageID & table_id, const Context & context) const;
-    DatabaseAndTable tryGetDatabaseAndTable(const StorageID & table_id, const Context & context) const;
+    StoragePtr getTable(const StorageID & table_id, ContextPtr context) const;
+    StoragePtr tryGetTable(const StorageID & table_id, ContextPtr context) const;
+    DatabaseAndTable getDatabaseAndTable(const StorageID & table_id, ContextPtr context) const;
+    DatabaseAndTable tryGetDatabaseAndTable(const StorageID & table_id, ContextPtr context) const;
     DatabaseAndTable getTableImpl(const StorageID & table_id,
-                                  const Context & context,
+                                  ContextPtr context,
                                   std::optional<Exception> * exception = nullptr) const;
 
     void addDependency(const StorageID & from, const StorageID & where);
@@ -192,9 +200,6 @@ public:
     String getPathForDroppedMetadata(const StorageID & table_id) const;
     void enqueueDroppedTableCleanup(StorageID table_id, StoragePtr table, String dropped_metadata_path, bool ignore_delay = false);
 
-    /// Try convert qualified dictionary name to persistent UUID
-    String resolveDictionaryName(const String & name) const;
-
     void waitTableFinallyDropped(const UUID & uuid);
 
 private:
@@ -203,7 +208,7 @@ private:
     // make emplace(global_context_) compile with private constructor ¯\_(ツ)_/¯.
     static std::unique_ptr<DatabaseCatalog> database_catalog;
 
-    DatabaseCatalog(Context & global_context_);
+    explicit DatabaseCatalog(ContextPtr global_context_);
     void assertDatabaseExistsUnlocked(const String & database_name) const;
     void assertDatabaseDoesntExistUnlocked(const String & database_name) const;
 
@@ -219,7 +224,7 @@ private:
     static constexpr UInt64 bits_for_first_level = 4;
     using UUIDToStorageMap = std::array<UUIDToStorageMapPart, 1ull << bits_for_first_level>;
 
-    inline size_t getFirstLevelIdx(const UUID & uuid) const
+    static inline size_t getFirstLevelIdx(const UUID & uuid)
     {
         return uuid.toUnderType().low >> (64 - bits_for_first_level);
     }
@@ -240,11 +245,8 @@ private:
     static constexpr size_t reschedule_time_ms = 100;
     static constexpr time_t drop_error_cooldown_sec = 5;
 
-private:
     using UUIDToDatabaseMap = std::unordered_map<UUID, DatabasePtr>;
 
-    /// For some reason Context is required to get Storage from Database object
-    Context & global_context;
     mutable std::mutex databases_mutex;
 
     ViewDependencies view_dependencies;
diff --git a/src/Interpreters/DictionaryReader.cpp b/src/Interpreters/DictionaryReader.cpp
index 1b503bd8313..fc795b9cdfb 100644
--- a/src/Interpreters/DictionaryReader.cpp
+++ b/src/Interpreters/DictionaryReader.cpp
@@ -44,7 +44,7 @@ DictionaryReader::FunctionWrapper::FunctionWrapper(FunctionOverloadResolverPtr r
 static constexpr const size_t key_size = 1;
 
 DictionaryReader::DictionaryReader(const String & dictionary_name, const Names & src_column_names, const NamesAndTypesList & result_columns,
-                                   const Context & context)
+                                   ContextPtr context)
     : result_header(makeResultBlock(result_columns))
     , key_position(key_size + result_header.columns())
 {
diff --git a/src/Interpreters/DictionaryReader.h b/src/Interpreters/DictionaryReader.h
index b49a15debb3..bfb21e2f050 100644
--- a/src/Interpreters/DictionaryReader.h
+++ b/src/Interpreters/DictionaryReader.h
@@ -3,12 +3,11 @@
 #include <Core/Block.h>
 #include <Columns/ColumnVector.h>
 #include <Functions/IFunctionAdaptors.h>
+#include <Interpreters/Context_fwd.h>
 
 namespace DB
 {
 
-class Context;
-
 /// Read block of required columns from Dictionary by UInt64 key column. Rename columns if needed.
 /// Current implementation uses dictHas() + N * dictGet() functions.
 class DictionaryReader
@@ -35,7 +34,7 @@ public:
     };
 
     DictionaryReader(const String & dictionary_name, const Names & src_column_names, const NamesAndTypesList & result_columns,
-                     const Context & context);
+                     ContextPtr context);
     void readKeys(const IColumn & keys, Block & out_block, ColumnVector<UInt8>::Container & found, std::vector<size_t> & positions) const;
 
 private:
diff --git a/src/Interpreters/DuplicateOrderByVisitor.h b/src/Interpreters/DuplicateOrderByVisitor.h
index f5e5763c719..4f95854e17b 100644
--- a/src/Interpreters/DuplicateOrderByVisitor.h
+++ b/src/Interpreters/DuplicateOrderByVisitor.h
@@ -21,7 +21,7 @@ class ASTFunctionStatefulData
 public:
     using TypeToVisit = ASTFunction;
 
-    const Context & context;
+    ContextPtr context;
     bool & is_stateful;
     void visit(ASTFunction & ast_function, ASTPtr &)
     {
@@ -80,7 +80,7 @@ class DuplicateOrderByData
 public:
     using TypeToVisit = ASTSelectQuery;
 
-    const Context & context;
+    ContextPtr context;
 
     void visit(ASTSelectQuery & select_query, ASTPtr &)
     {
diff --git a/src/Interpreters/EmbeddedDictionaries.cpp b/src/Interpreters/EmbeddedDictionaries.cpp
index 58b21fdda52..947768ad3d7 100644
--- a/src/Interpreters/EmbeddedDictionaries.cpp
+++ b/src/Interpreters/EmbeddedDictionaries.cpp
@@ -35,7 +35,7 @@ bool EmbeddedDictionaries::reloadDictionary(
     const bool throw_on_error,
     const bool force_reload)
 {
-    const auto & config = context.getConfigRef();
+    const auto & config = getContext()->getConfigRef();
 
     bool not_initialized = dictionary.get() == nullptr;
 
@@ -122,12 +122,12 @@ void EmbeddedDictionaries::reloadPeriodically()
 
 EmbeddedDictionaries::EmbeddedDictionaries(
     std::unique_ptr<GeoDictionariesLoader> geo_dictionaries_loader_,
-    Context & context_,
+    ContextPtr context_,
     const bool throw_on_error)
-    : log(&Poco::Logger::get("EmbeddedDictionaries"))
-    , context(context_)
+    : WithContext(context_)
+    , log(&Poco::Logger::get("EmbeddedDictionaries"))
     , geo_dictionaries_loader(std::move(geo_dictionaries_loader_))
-    , reload_period(context_.getConfigRef().getInt("builtin_dictionaries_reload_interval", 3600))
+    , reload_period(getContext()->getConfigRef().getInt("builtin_dictionaries_reload_interval", 3600))
 {
     reloadImpl(throw_on_error);
     reloading_thread = ThreadFromGlobalPool([this] { reloadPeriodically(); });
diff --git a/src/Interpreters/EmbeddedDictionaries.h b/src/Interpreters/EmbeddedDictionaries.h
index 69b21d4b39a..674b3a7f01e 100644
--- a/src/Interpreters/EmbeddedDictionaries.h
+++ b/src/Interpreters/EmbeddedDictionaries.h
@@ -1,10 +1,13 @@
 #pragma once
 
+#include <Interpreters/Context_fwd.h>
+#include <Common/MultiVersion.h>
+#include <Common/ThreadPool.h>
+
+#include <Poco/Event.h>
+
 #include <thread>
 #include <functional>
-#include <Common/MultiVersion.h>
-#include <Common/ThreadPool.h>
-#include <Poco/Event.h>
 
 
 namespace Poco { class Logger; namespace Util { class AbstractConfiguration; } }
@@ -17,16 +20,12 @@ class GeoDictionariesLoader;
 namespace DB
 {
 
-class Context;
-
-
 /// Metrica's Dictionaries which can be used in functions.
 
-class EmbeddedDictionaries
+class EmbeddedDictionaries : WithContext
 {
 private:
     Poco::Logger * log;
-    Context & context;
 
     MultiVersion<RegionsHierarchies> regions_hierarchies;
     MultiVersion<RegionsNames> regions_names;
@@ -44,7 +43,7 @@ private:
     Poco::Event destroy;
 
 
-    void handleException(const bool throw_on_error) const;
+    void handleException(bool throw_on_error) const;
 
     /** Updates directories (dictionaries) every reload_period seconds.
      * If all dictionaries are not loaded at least once, try reload them with exponential delay (1, 2, ... reload_period).
@@ -53,7 +52,7 @@ private:
     void reloadPeriodically();
 
     /// Updates dictionaries.
-    bool reloadImpl(const bool throw_on_error, const bool force_reload = false);
+    bool reloadImpl(bool throw_on_error, bool force_reload = false);
 
     template <typename Dictionary>
     using DictionaryReloader = std::function<std::unique_ptr<Dictionary>(const Poco::Util::AbstractConfiguration & config)>;
@@ -62,15 +61,15 @@ private:
     bool reloadDictionary(
         MultiVersion<Dictionary> & dictionary,
         DictionaryReloader<Dictionary> reload_dictionary,
-        const bool throw_on_error,
-        const bool force_reload);
+        bool throw_on_error,
+        bool force_reload);
 
 public:
     /// Every reload_period seconds directories are updated inside a separate thread.
     EmbeddedDictionaries(
         std::unique_ptr<GeoDictionariesLoader> geo_dictionaries_loader,
-        Context & context,
-        const bool throw_on_error);
+        ContextPtr context,
+        bool throw_on_error);
 
     /// Forcibly reloads all dictionaries.
     void reload();
diff --git a/src/Interpreters/ExecuteScalarSubqueriesVisitor.cpp b/src/Interpreters/ExecuteScalarSubqueriesVisitor.cpp
index e6061aabe94..97ad191289c 100644
--- a/src/Interpreters/ExecuteScalarSubqueriesVisitor.cpp
+++ b/src/Interpreters/ExecuteScalarSubqueriesVisitor.cpp
@@ -1,27 +1,23 @@
-#include <Parsers/ASTFunction.h>
-#include <Parsers/ASTLiteral.h>
-#include <Parsers/ASTSubquery.h>
-#include <Parsers/ASTSelectQuery.h>
-#include <Parsers/ASTTablesInSelectQuery.h>
-#include <Parsers/ASTExpressionList.h>
-#include <Parsers/ASTWithElement.h>
-
-#include <Interpreters/Context.h>
-#include <Interpreters/misc.h>
-#include <Interpreters/InterpreterSelectWithUnionQuery.h>
 #include <Interpreters/ExecuteScalarSubqueriesVisitor.h>
-#include <Interpreters/addTypeConversionToAST.h>
 
+#include <Columns/ColumnTuple.h>
 #include <DataStreams/IBlockInputStream.h>
 #include <DataStreams/materializeBlock.h>
 #include <DataTypes/DataTypeAggregateFunction.h>
 #include <DataTypes/DataTypeTuple.h>
-
-#include <Columns/ColumnTuple.h>
-
 #include <IO/WriteHelpers.h>
-
-#include <Processors/Executors/PullingPipelineExecutor.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/InterpreterSelectWithUnionQuery.h>
+#include <Interpreters/addTypeConversionToAST.h>
+#include <Interpreters/misc.h>
+#include <Parsers/ASTExpressionList.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTSelectQuery.h>
+#include <Parsers/ASTSubquery.h>
+#include <Parsers/ASTTablesInSelectQuery.h>
+#include <Parsers/ASTWithElement.h>
+#include <Processors/Executors/PullingAsyncPipelineExecutor.h>
 
 namespace DB
 {
@@ -82,17 +78,17 @@ void ExecuteScalarSubqueriesMatcher::visit(const ASTSubquery & subquery, ASTPtr
     auto scalar_query_hash_str = toString(hash.first) + "_" + toString(hash.second);
 
     Block scalar;
-    if (data.context.hasQueryContext() && data.context.getQueryContext().hasScalar(scalar_query_hash_str))
-        scalar = data.context.getQueryContext().getScalar(scalar_query_hash_str);
+    if (data.getContext()->hasQueryContext() && data.getContext()->getQueryContext()->hasScalar(scalar_query_hash_str))
+        scalar = data.getContext()->getQueryContext()->getScalar(scalar_query_hash_str);
     else if (data.scalars.count(scalar_query_hash_str))
         scalar = data.scalars[scalar_query_hash_str];
     else
     {
-        Context subquery_context = data.context;
-        Settings subquery_settings = data.context.getSettings();
+        auto subquery_context = Context::createCopy(data.getContext());
+        Settings subquery_settings = data.getContext()->getSettings();
         subquery_settings.max_result_rows = 1;
         subquery_settings.extremes = false;
-        subquery_context.setSettings(subquery_settings);
+        subquery_context->setSettings(subquery_settings);
 
         ASTPtr subquery_select = subquery.children.at(0);
 
@@ -122,8 +118,10 @@ void ExecuteScalarSubqueriesMatcher::visit(const ASTSubquery & subquery, ASTPtr
 
             try
             {
-                PullingPipelineExecutor executor(io.pipeline);
-                if (!executor.pull(block))
+                PullingAsyncPipelineExecutor executor(io.pipeline);
+                while (block.rows() == 0 && executor.pull(block));
+
+                if (block.rows() == 0)
                 {
                     /// Interpret subquery with empty result as Null literal
                     auto ast_new = std::make_unique<ASTLiteral>(Null());
@@ -132,7 +130,13 @@ void ExecuteScalarSubqueriesMatcher::visit(const ASTSubquery & subquery, ASTPtr
                     return;
                 }
 
-                if (block.rows() != 1 || executor.pull(block))
+                if (block.rows() != 1)
+                    throw Exception("Scalar subquery returned more than one row", ErrorCodes::INCORRECT_RESULT_OF_SCALAR_SUBQUERY);
+
+                Block tmp_block;
+                while (tmp_block.rows() == 0 && executor.pull(tmp_block));
+
+                if (tmp_block.rows() != 0)
                     throw Exception("Scalar subquery returned more than one row", ErrorCodes::INCORRECT_RESULT_OF_SCALAR_SUBQUERY);
             }
             catch (const Exception & e)
@@ -159,10 +163,11 @@ void ExecuteScalarSubqueriesMatcher::visit(const ASTSubquery & subquery, ASTPtr
         }
     }
 
-    const Settings & settings = data.context.getSettingsRef();
+    const Settings & settings = data.getContext()->getSettingsRef();
 
     // Always convert to literals when there is no query context.
-    if (data.only_analyze || !settings.enable_scalar_subquery_optimization || worthConvertingToLiteral(scalar) || !data.context.hasQueryContext())
+    if (data.only_analyze || !settings.enable_scalar_subquery_optimization || worthConvertingToLiteral(scalar)
+        || !data.getContext()->hasQueryContext())
     {
         auto lit = std::make_unique<ASTLiteral>((*scalar.safeGetByPosition(0).column)[0]);
         lit->alias = subquery.alias;
@@ -193,7 +198,7 @@ void ExecuteScalarSubqueriesMatcher::visit(const ASTSubquery & subquery, ASTPtr
 void ExecuteScalarSubqueriesMatcher::visit(const ASTFunction & func, ASTPtr & ast, Data & data)
 {
     /// Don't descend into subqueries in arguments of IN operator.
-    /// But if an argument is not subquery, than deeper may be scalar subqueries and we need to descend in them.
+    /// But if an argument is not subquery, then deeper may be scalar subqueries and we need to descend in them.
 
     std::vector<ASTPtr *> out;
     if (checkFunctionIsInOrGlobalInOperator(func))
diff --git a/src/Interpreters/ExecuteScalarSubqueriesVisitor.h b/src/Interpreters/ExecuteScalarSubqueriesVisitor.h
index 02949ad6d59..c230f346779 100644
--- a/src/Interpreters/ExecuteScalarSubqueriesVisitor.h
+++ b/src/Interpreters/ExecuteScalarSubqueriesVisitor.h
@@ -1,13 +1,13 @@
 #pragma once
 
-#include <Common/typeid_cast.h>
 #include <Core/Block.h>
+#include <Interpreters/Context_fwd.h>
 #include <Interpreters/InDepthNodeVisitor.h>
+#include <Common/typeid_cast.h>
 
 namespace DB
 {
 
-class Context;
 class ASTSubquery;
 class ASTFunction;
 struct ASTTableExpression;
@@ -33,9 +33,8 @@ class ExecuteScalarSubqueriesMatcher
 public:
     using Visitor = InDepthNodeVisitor<ExecuteScalarSubqueriesMatcher, true>;
 
-    struct Data
+    struct Data : public WithContext
     {
-        const Context & context;
         size_t subquery_depth;
         Scalars & scalars;
         bool only_analyze;
diff --git a/src/Interpreters/ExpressionActions.cpp b/src/Interpreters/ExpressionActions.cpp
index b1fd23d4311..e4d81dbbf94 100644
--- a/src/Interpreters/ExpressionActions.cpp
+++ b/src/Interpreters/ExpressionActions.cpp
@@ -44,16 +44,18 @@ namespace ErrorCodes
 
 ExpressionActions::~ExpressionActions() = default;
 
-ExpressionActions::ExpressionActions(ActionsDAGPtr actions_dag_)
+ExpressionActions::ExpressionActions(ActionsDAGPtr actions_dag_, const ExpressionActionsSettings & settings_)
+    : settings(settings_)
 {
     actions_dag = actions_dag_->clone();
 
-    actions_dag->compileExpressions();
+#if USE_EMBEDDED_COMPILER
+    if (settings.compile_expressions)
+        actions_dag->compileExpressions(settings.min_count_to_compile_expression);
+#endif
 
     linearizeActions();
 
-    const auto & settings = actions_dag->getSettings();
-
     if (settings.max_temporary_columns && num_columns > settings.max_temporary_columns)
         throw Exception(ErrorCodes::TOO_MANY_TEMPORARY_COLUMNS,
                         "Too many temporary columns: {}. Maximum: {}",
@@ -141,7 +143,7 @@ void ExpressionActions::linearizeActions()
 
         ExpressionActions::Arguments arguments;
         arguments.reserve(cur.node->children.size());
-        for (auto * child : cur.node->children)
+        for (const auto * child : cur.node->children)
         {
             auto & arg = data[reverse_index[child]];
 
@@ -258,15 +260,14 @@ std::string ExpressionActions::Action::toString() const
 
 void ExpressionActions::checkLimits(const ColumnsWithTypeAndName & columns) const
 {
-    auto max_temporary_non_const_columns = actions_dag->getSettings().max_temporary_non_const_columns;
-    if (max_temporary_non_const_columns)
+    if (settings.max_temporary_non_const_columns)
     {
         size_t non_const_columns = 0;
         for (const auto & column : columns)
             if (column.column && !isColumnConst(*column.column))
                 ++non_const_columns;
 
-        if (non_const_columns > max_temporary_non_const_columns)
+        if (non_const_columns > settings.max_temporary_non_const_columns)
         {
             WriteBufferFromOwnString list_of_non_const_columns;
             for (const auto & column : columns)
@@ -274,7 +275,7 @@ void ExpressionActions::checkLimits(const ColumnsWithTypeAndName & columns) cons
                     list_of_non_const_columns << "\n" << column.name;
 
             throw Exception("Too many temporary non-const columns:" + list_of_non_const_columns.str()
-                + ". Maximum: " + std::to_string(max_temporary_non_const_columns),
+                + ". Maximum: " + std::to_string(settings.max_temporary_non_const_columns),
                 ErrorCodes::TOO_MANY_TEMPORARY_NON_CONST_COLUMNS);
         }
     }
@@ -460,7 +461,7 @@ void ExpressionActions::execute(Block & block, size_t & num_rows, bool dry_run)
         }
     }
 
-    if (actions_dag->getSettings().project_input)
+    if (actions_dag->isInputProjected())
     {
         block.clear();
     }
@@ -521,6 +522,10 @@ std::string ExpressionActions::getSmallestColumn(const NamesAndTypesList & colum
 
     for (const auto & column : columns)
     {
+        /// Skip .sizeX and similar meta information
+        if (!column.getSubcolumnName().empty())
+            continue;
+
         /// @todo resolve evil constant
         size_t size = column.type->haveMaximumSizeOfValue() ? column.type->getMaximumSizeOfValueInMemory() : 100;
 
@@ -554,7 +559,7 @@ std::string ExpressionActions::dumpActions() const
     for (const auto & output_column : output_columns)
         ss << output_column.name << " " << output_column.type->getName() << "\n";
 
-    ss << "\nproject input: " << actions_dag->getSettings().project_input << "\noutput positions:";
+    ss << "\nproject input: " << actions_dag->isInputProjected() << "\noutput positions:";
     for (auto pos : result_positions)
         ss << " " << pos;
     ss << "\n";
@@ -621,11 +626,10 @@ void ExpressionActionsChain::finalize()
     /// Finalize all steps. Right to left to define unnecessary input columns.
     for (int i = static_cast<int>(steps.size()) - 1; i >= 0; --i)
     {
-        Names required_output = steps[i]->required_output;
-        std::unordered_map<String, size_t> required_output_indexes;
-        for (size_t j = 0; j < required_output.size(); ++j)
-            required_output_indexes[required_output[j]] = j;
-        auto & can_remove_required_output = steps[i]->can_remove_required_output;
+        auto & required_output = steps[i]->required_output;
+        NameSet required_names;
+        for (const auto & output : required_output)
+            required_names.insert(output.first);
 
         if (i + 1 < static_cast<int>(steps.size()))
         {
@@ -634,15 +638,15 @@ void ExpressionActionsChain::finalize()
             {
                 if (additional_input.count(it.name) == 0)
                 {
-                    auto iter = required_output_indexes.find(it.name);
-                    if (iter == required_output_indexes.end())
-                        required_output.push_back(it.name);
-                    else if (!can_remove_required_output.empty())
-                        can_remove_required_output[iter->second] = false;
+                    auto iter = required_output.find(it.name);
+                    if (iter == required_output.end())
+                        required_names.insert(it.name);
+                    else
+                        iter->second = false;
                 }
             }
         }
-        steps[i]->finalize(required_output);
+        steps[i]->finalize(required_names);
     }
 
     /// Adding the ejection of unnecessary columns to the beginning of each step.
@@ -666,8 +670,8 @@ std::string ExpressionActionsChain::dumpChain() const
     {
         ss << "step " << i << "\n";
         ss << "required output:\n";
-        for (const std::string & name : steps[i]->required_output)
-            ss << name << "\n";
+        for (const auto & it : steps[i]->required_output)
+            ss << it.first << "\n";
         ss << "\n" << steps[i]->dump() << "\n";
     }
 
@@ -693,20 +697,19 @@ ExpressionActionsChain::ArrayJoinStep::ArrayJoinStep(ArrayJoinActionPtr array_jo
     }
 }
 
-void ExpressionActionsChain::ArrayJoinStep::finalize(const Names & required_output_)
+void ExpressionActionsChain::ArrayJoinStep::finalize(const NameSet & required_output_)
 {
     NamesAndTypesList new_required_columns;
     ColumnsWithTypeAndName new_result_columns;
 
-    NameSet names(required_output_.begin(), required_output_.end());
     for (const auto & column : result_columns)
     {
-        if (array_join->columns.count(column.name) != 0 || names.count(column.name) != 0)
+        if (array_join->columns.count(column.name) != 0 || required_output_.count(column.name) != 0)
             new_result_columns.emplace_back(column);
     }
     for (const auto & column : required_columns)
     {
-        if (array_join->columns.count(column.name) != 0 || names.count(column.name) != 0)
+        if (array_join->columns.count(column.name) != 0 || required_output_.count(column.name) != 0)
             new_required_columns.emplace_back(column);
     }
 
@@ -726,17 +729,17 @@ ExpressionActionsChain::JoinStep::JoinStep(
     for (const auto & column : result_columns)
         required_columns.emplace_back(column.name, column.type);
 
-    analyzed_join->addJoinedColumnsAndCorrectNullability(result_columns);
+    analyzed_join->addJoinedColumnsAndCorrectTypes(result_columns);
 }
 
-void ExpressionActionsChain::JoinStep::finalize(const Names & required_output_)
+void ExpressionActionsChain::JoinStep::finalize(const NameSet & required_output_)
 {
     /// We need to update required and result columns by removing unused ones.
     NamesAndTypesList new_required_columns;
     ColumnsWithTypeAndName new_result_columns;
 
     /// That's an input columns we need.
-    NameSet required_names(required_output_.begin(), required_output_.end());
+    NameSet required_names = required_output_;
     for (const auto & name : analyzed_join->keyNamesLeft())
         required_names.emplace(name);
 
@@ -747,8 +750,8 @@ void ExpressionActionsChain::JoinStep::finalize(const Names & required_output_)
     }
 
     /// Result will also contain joined columns.
-    for (const auto & column : analyzed_join->columnsAddedByJoin())
-        required_names.emplace(column.name);
+    for (const auto & column_name : analyzed_join->columnsAddedByJoin())
+        required_names.emplace(column_name);
 
     for (const auto & column : result_columns)
     {
diff --git a/src/Interpreters/ExpressionActions.h b/src/Interpreters/ExpressionActions.h
index 947651beb0d..40a4cdcbc02 100644
--- a/src/Interpreters/ExpressionActions.h
+++ b/src/Interpreters/ExpressionActions.h
@@ -3,6 +3,7 @@
 #include <Core/Block.h>
 #include <Core/ColumnNumbers.h>
 #include <Interpreters/ActionsDAG.h>
+#include <Interpreters/ExpressionActionsSettings.h>
 
 #include <variant>
 
@@ -38,7 +39,6 @@ class ExpressionActions
 {
 public:
     using Node = ActionsDAG::Node;
-    using Index = ActionsDAG::Index;
 
     struct Argument
     {
@@ -78,10 +78,12 @@ private:
     ColumnNumbers result_positions;
     Block sample_block;
 
+    ExpressionActionsSettings settings;
+
 public:
     ExpressionActions() = delete;
     ~ExpressionActions();
-    explicit ExpressionActions(ActionsDAGPtr actions_dag_);
+    explicit ExpressionActions(ActionsDAGPtr actions_dag_, const ExpressionActionsSettings & settings_ = {});
     ExpressionActions(const ExpressionActions &) = default;
     ExpressionActions & operator=(const ExpressionActions &) = default;
 
@@ -89,6 +91,7 @@ public:
     const std::list<Node> & getNodes() const { return actions_dag->getNodes(); }
     const ActionsDAG & getActionsDAG() const { return *actions_dag; }
     const ColumnNumbers & getResultPositions() const { return result_positions; }
+    const ExpressionActionsSettings & getSettings() const { return settings; }
 
     /// Get a list of input columns.
     Names getRequiredColumns() const;
@@ -130,29 +133,34 @@ private:
   *     2) calculate the expression in the SELECT section,
   * and between the two steps do the filtering by value in the WHERE clause.
   */
-struct ExpressionActionsChain
+struct ExpressionActionsChain : WithContext
 {
-    explicit ExpressionActionsChain(const Context & context_) : context(context_) {}
+    explicit ExpressionActionsChain(ContextPtr context_) : WithContext(context_) {}
 
 
     struct Step
     {
         virtual ~Step() = default;
-        explicit Step(Names required_output_) : required_output(std::move(required_output_)) {}
+        explicit Step(Names required_output_)
+        {
+            for (const auto & name : required_output_)
+                required_output[name] = true;
+        }
 
         /// Columns were added to the block before current step in addition to prev step output.
         NameSet additional_input;
         /// Columns which are required in the result of current step.
-        Names required_output;
-        /// True if column from required_output is needed only for current step and not used in next actions
+        /// Flag is true if column from required_output is needed only for current step and not used in next actions
         /// (and can be removed from block). Example: filter column for where actions.
         /// If not empty, has the same size with required_output; is filled in finalize().
-        std::vector<bool> can_remove_required_output;
+        std::unordered_map<std::string, bool> required_output;
+
+        void addRequiredOutput(const std::string & name) { required_output[name] = true; }
 
         virtual NamesAndTypesList getRequiredColumns() const = 0;
         virtual ColumnsWithTypeAndName getResultColumns() const = 0;
         /// Remove unused result and update required columns
-        virtual void finalize(const Names & required_output_) = 0;
+        virtual void finalize(const NameSet & required_output_) = 0;
         /// Add projections to expression
         virtual void prependProjectInput() const = 0;
         virtual std::string dump() const = 0;
@@ -182,9 +190,9 @@ struct ExpressionActionsChain
             return actions_dag->getResultColumns();
         }
 
-        void finalize(const Names & required_output_) override
+        void finalize(const NameSet & required_output_) override
         {
-            if (!actions_dag->getSettings().projected_output)
+            if (!actions_dag->isOutputProjected())
                 actions_dag->removeUnusedActions(required_output_);
         }
 
@@ -209,7 +217,7 @@ struct ExpressionActionsChain
 
         NamesAndTypesList getRequiredColumns() const override { return required_columns; }
         ColumnsWithTypeAndName getResultColumns() const override { return result_columns; }
-        void finalize(const Names & required_output_) override;
+        void finalize(const NameSet & required_output_) override;
         void prependProjectInput() const override {} /// TODO: remove unused columns before ARRAY JOIN ?
         std::string dump() const override { return "ARRAY JOIN"; }
     };
@@ -225,7 +233,7 @@ struct ExpressionActionsChain
         JoinStep(std::shared_ptr<TableJoin> analyzed_join_, JoinPtr join_, ColumnsWithTypeAndName required_columns_);
         NamesAndTypesList getRequiredColumns() const override { return required_columns; }
         ColumnsWithTypeAndName getResultColumns() const override { return result_columns; }
-        void finalize(const Names & required_output_) override;
+        void finalize(const NameSet & required_output_) override;
         void prependProjectInput() const override {} /// TODO: remove unused columns before JOIN ?
         std::string dump() const override { return "JOIN"; }
     };
@@ -233,7 +241,6 @@ struct ExpressionActionsChain
     using StepPtr = std::unique_ptr<Step>;
     using Steps = std::vector<StepPtr>;
 
-    const Context & context;
     Steps steps;
 
     void addStep(NameSet non_constant_inputs = {});
diff --git a/src/Interpreters/ExpressionActionsSettings.cpp b/src/Interpreters/ExpressionActionsSettings.cpp
new file mode 100644
index 00000000000..a9495628d6f
--- /dev/null
+++ b/src/Interpreters/ExpressionActionsSettings.cpp
@@ -0,0 +1,25 @@
+#include <Interpreters/ExpressionActionsSettings.h>
+
+#include <Core/Settings.h>
+#include <Interpreters/Context.h>
+
+namespace DB
+{
+
+ExpressionActionsSettings ExpressionActionsSettings::fromSettings(const Settings & from)
+{
+    ExpressionActionsSettings settings;
+    settings.compile_expressions = from.compile_expressions;
+    settings.min_count_to_compile_expression = from.min_count_to_compile_expression;
+    settings.max_temporary_columns = from.max_temporary_columns;
+    settings.max_temporary_non_const_columns = from.max_temporary_non_const_columns;
+
+    return settings;
+}
+
+ExpressionActionsSettings ExpressionActionsSettings::fromContext(ContextPtr from)
+{
+    return fromSettings(from->getSettingsRef());
+}
+
+}
diff --git a/src/Interpreters/ExpressionActionsSettings.h b/src/Interpreters/ExpressionActionsSettings.h
new file mode 100644
index 00000000000..06351136a9a
--- /dev/null
+++ b/src/Interpreters/ExpressionActionsSettings.h
@@ -0,0 +1,24 @@
+#pragma once
+
+#include <Interpreters/Context_fwd.h>
+
+#include <cstddef>
+
+namespace DB
+{
+
+struct Settings;
+
+struct ExpressionActionsSettings
+{
+    bool compile_expressions = false;
+    size_t min_count_to_compile_expression = 0;
+
+    size_t max_temporary_columns = 0;
+    size_t max_temporary_non_const_columns = 0;
+
+    static ExpressionActionsSettings fromSettings(const Settings & from);
+    static ExpressionActionsSettings fromContext(ContextPtr from);
+};
+
+}
diff --git a/src/Interpreters/ExpressionAnalyzer.cpp b/src/Interpreters/ExpressionAnalyzer.cpp
index 660718549b3..1fa0f4eab7c 100644
--- a/src/Interpreters/ExpressionAnalyzer.cpp
+++ b/src/Interpreters/ExpressionAnalyzer.cpp
@@ -42,19 +42,18 @@
 
 #include <DataTypes/DataTypeFactory.h>
 #include <Parsers/parseQuery.h>
-#include <Interpreters/interpretSubquery.h>
-#include <Interpreters/DatabaseAndTableWithAlias.h>
-#include <Interpreters/misc.h>
 
 #include <Interpreters/ActionsVisitor.h>
-
-#include <Interpreters/GlobalSubqueriesVisitor.h>
 #include <Interpreters/GetAggregatesVisitor.h>
+#include <Interpreters/GlobalSubqueriesVisitor.h>
+#include <Interpreters/interpretSubquery.h>
+#include <Interpreters/join_common.h>
+#include <Interpreters/misc.h>
 
 #include <IO/Operators.h>
 #include <IO/WriteBufferFromString.h>
 
-#include <Processors/Executors/PullingPipelineExecutor.h>
+#include <Processors/Executors/PullingAsyncPipelineExecutor.h>
 #include <Parsers/formatAST.h>
 
 namespace DB
@@ -129,11 +128,12 @@ ExpressionAnalyzer::ExtractedSettings::ExtractedSettings(const Settings & settin
 ExpressionAnalyzer::ExpressionAnalyzer(
     const ASTPtr & query_,
     const TreeRewriterResultPtr & syntax_analyzer_result_,
-    const Context & context_,
+    ContextPtr context_,
     size_t subquery_depth_,
     bool do_global,
     SubqueriesForSets subqueries_for_sets_)
-    : query(query_), context(context_), settings(context.getSettings())
+    : WithContext(context_)
+    , query(query_), settings(getContext()->getSettings())
     , subquery_depth(subquery_depth_)
     , syntax(syntax_analyzer_result_)
 {
@@ -208,13 +208,12 @@ void ExpressionAnalyzer::analyzeAggregation()
         {
             getRootActionsNoMakeSet(analyzedJoin().leftKeysList(), true, temp_actions, false);
             auto sample_columns = temp_actions->getResultColumns();
-            analyzedJoin().addJoinedColumnsAndCorrectNullability(sample_columns);
+            analyzedJoin().addJoinedColumnsAndCorrectTypes(sample_columns);
             temp_actions = std::make_shared<ActionsDAG>(sample_columns);
         }
 
         columns_after_join = columns_after_array_join;
-        const auto & added_by_join = analyzedJoin().columnsAddedByJoin();
-        columns_after_join.insert(columns_after_join.end(), added_by_join.begin(), added_by_join.end());
+        analyzedJoin().addJoinedColumnsAndCorrectTypes(columns_after_join, false);
     }
 
     has_aggregation = makeAggregateDescriptions(temp_actions);
@@ -237,14 +236,10 @@ void ExpressionAnalyzer::analyzeAggregation()
                     getRootActionsNoMakeSet(group_asts[i], true, temp_actions, false);
 
                     const auto & column_name = group_asts[i]->getColumnName();
-                    const auto & index = temp_actions->getIndex();
-
-                    auto it = index.find(column_name);
-                    if (it == index.end())
+                    const auto * node = temp_actions->tryFindInIndex(column_name);
+                    if (!node)
                         throw Exception("Unknown identifier (in GROUP BY): " + column_name, ErrorCodes::UNKNOWN_IDENTIFIER);
 
-                    const auto & node = *it;
-
                     /// Constant expressions have non-null column pointer at this stage.
                     if (node->column && isColumnConst(*node->column))
                     {
@@ -298,14 +293,14 @@ void ExpressionAnalyzer::initGlobalSubqueriesAndExternalTables(bool do_global)
 {
     if (do_global)
     {
-        GlobalSubqueriesVisitor::Data subqueries_data(context, subquery_depth, isRemoteStorage(),
+        GlobalSubqueriesVisitor::Data subqueries_data(getContext(), subquery_depth, isRemoteStorage(),
                                                    external_tables, subqueries_for_sets, has_global_subqueries);
         GlobalSubqueriesVisitor(subqueries_data).visit(query);
     }
 }
 
 
-void SelectQueryExpressionAnalyzer::tryMakeSetForIndexFromSubquery(const ASTPtr & subquery_or_table_name)
+void ExpressionAnalyzer::tryMakeSetForIndexFromSubquery(const ASTPtr & subquery_or_table_name, const SelectQueryOptions & query_options)
 {
     auto set_key = PreparedSetKey::forSubquery(*subquery_or_table_name);
 
@@ -318,16 +313,19 @@ void SelectQueryExpressionAnalyzer::tryMakeSetForIndexFromSubquery(const ASTPtr
         return;
     }
 
-    auto interpreter_subquery = interpretSubquery(subquery_or_table_name, context, {}, query_options);
+    auto interpreter_subquery = interpretSubquery(subquery_or_table_name, getContext(), {}, query_options);
     auto io = interpreter_subquery->execute();
-    PullingPipelineExecutor executor(io.pipeline);
+    PullingAsyncPipelineExecutor executor(io.pipeline);
 
-    SetPtr set = std::make_shared<Set>(settings.size_limits_for_set, true, context.getSettingsRef().transform_null_in);
+    SetPtr set = std::make_shared<Set>(settings.size_limits_for_set, true, getContext()->getSettingsRef().transform_null_in);
     set->setHeader(executor.getHeader());
 
     Block block;
     while (executor.pull(block))
     {
+        if (block.rows() == 0)
+            continue;
+
         /// If the limits have been exceeded, give up and let the default subquery processing actions take place.
         if (!set->insertFromBlock(block))
             return;
@@ -338,13 +336,13 @@ void SelectQueryExpressionAnalyzer::tryMakeSetForIndexFromSubquery(const ASTPtr
     prepared_sets[set_key] = std::move(set);
 }
 
-SetPtr SelectQueryExpressionAnalyzer::isPlainStorageSetInSubquery(const ASTPtr & subquery_or_table_name)
+SetPtr ExpressionAnalyzer::isPlainStorageSetInSubquery(const ASTPtr & subquery_or_table_name)
 {
     const auto * table = subquery_or_table_name->as<ASTIdentifier>();
     if (!table)
         return nullptr;
-    auto table_id = context.resolveStorageID(subquery_or_table_name);
-    const auto storage = DatabaseCatalog::instance().getTable(table_id, context);
+    auto table_id = getContext()->resolveStorageID(subquery_or_table_name);
+    const auto storage = DatabaseCatalog::instance().getTable(table_id, getContext());
     if (storage->getName() != "Set")
         return nullptr;
     const auto storage_set = std::dynamic_pointer_cast<StorageSet>(storage);
@@ -378,21 +376,21 @@ void SelectQueryExpressionAnalyzer::makeSetsForIndex(const ASTPtr & node)
         const IAST & args = *func->arguments;
         const ASTPtr & left_in_operand = args.children.at(0);
 
-        if (storage()->mayBenefitFromIndexForIn(left_in_operand, context, metadata_snapshot))
+        if (storage()->mayBenefitFromIndexForIn(left_in_operand, getContext(), metadata_snapshot))
         {
             const ASTPtr & arg = args.children.at(1);
             if (arg->as<ASTSubquery>() || arg->as<ASTIdentifier>())
             {
                 if (settings.use_index_for_in_with_subqueries)
-                    tryMakeSetForIndexFromSubquery(arg);
+                    tryMakeSetForIndexFromSubquery(arg, query_options);
             }
             else
             {
                 auto temp_actions = std::make_shared<ActionsDAG>(columns_after_join);
                 getRootActions(left_in_operand, true, temp_actions);
 
-                if (temp_actions->getIndex().contains(left_in_operand->getColumnName()))
-                    makeExplicitSet(func, *temp_actions, true, context,
+                if (temp_actions->tryFindInIndex(left_in_operand->getColumnName()))
+                    makeExplicitSet(func, *temp_actions, true, getContext(),
                         settings.size_limits_for_set, prepared_sets);
             }
         }
@@ -403,7 +401,7 @@ void SelectQueryExpressionAnalyzer::makeSetsForIndex(const ASTPtr & node)
 void ExpressionAnalyzer::getRootActions(const ASTPtr & ast, bool no_subqueries, ActionsDAGPtr & actions, bool only_consts)
 {
     LogAST log;
-    ActionsVisitor::Data visitor_data(context, settings.size_limits_for_set, subquery_depth,
+    ActionsVisitor::Data visitor_data(getContext(), settings.size_limits_for_set, subquery_depth,
                                    sourceColumns(), std::move(actions), prepared_sets, subqueries_for_sets,
                                    no_subqueries, false, only_consts, !isRemoteStorage());
     ActionsVisitor(visitor_data, log.stream()).visit(ast);
@@ -414,7 +412,7 @@ void ExpressionAnalyzer::getRootActions(const ASTPtr & ast, bool no_subqueries,
 void ExpressionAnalyzer::getRootActionsNoMakeSet(const ASTPtr & ast, bool no_subqueries, ActionsDAGPtr & actions, bool only_consts)
 {
     LogAST log;
-    ActionsVisitor::Data visitor_data(context, settings.size_limits_for_set, subquery_depth,
+    ActionsVisitor::Data visitor_data(getContext(), settings.size_limits_for_set, subquery_depth,
                                    sourceColumns(), std::move(actions), prepared_sets, subqueries_for_sets,
                                    no_subqueries, true, only_consts, !isRemoteStorage());
     ActionsVisitor(visitor_data, log.stream()).visit(ast);
@@ -424,7 +422,7 @@ void ExpressionAnalyzer::getRootActionsNoMakeSet(const ASTPtr & ast, bool no_sub
 void ExpressionAnalyzer::getRootActionsForHaving(const ASTPtr & ast, bool no_subqueries, ActionsDAGPtr & actions, bool only_consts)
 {
     LogAST log;
-    ActionsVisitor::Data visitor_data(context, settings.size_limits_for_set, subquery_depth,
+    ActionsVisitor::Data visitor_data(getContext(), settings.size_limits_for_set, subquery_depth,
                                    sourceColumns(), std::move(actions), prepared_sets, subqueries_for_sets,
                                    no_subqueries, false, only_consts, true);
     ActionsVisitor(visitor_data, log.stream()).visit(ast);
@@ -437,7 +435,8 @@ bool ExpressionAnalyzer::makeAggregateDescriptions(ActionsDAGPtr & actions)
     for (const ASTFunction * node : aggregates())
     {
         AggregateDescription aggregate;
-        if (node->arguments) getRootActionsNoMakeSet(node->arguments, true, actions);
+        if (node->arguments)
+            getRootActionsNoMakeSet(node->arguments, true, actions);
 
         aggregate.column_name = node->getColumnName();
 
@@ -445,20 +444,18 @@ bool ExpressionAnalyzer::makeAggregateDescriptions(ActionsDAGPtr & actions)
         aggregate.argument_names.resize(arguments.size());
         DataTypes types(arguments.size());
 
-        const auto & index = actions->getIndex();
         for (size_t i = 0; i < arguments.size(); ++i)
         {
             const std::string & name = arguments[i]->getColumnName();
-
-            auto it = index.find(name);
-            if (it == index.end())
+            const auto * dag_node = actions->tryFindInIndex(name);
+            if (!dag_node)
             {
                 throw Exception(ErrorCodes::UNKNOWN_IDENTIFIER,
                     "Unknown identifier '{}' in aggregate function '{}'",
                     name, node->formatForErrorMessage());
             }
 
-            types[i] = (*it)->result_type;
+            types[i] = dag_node->result_type;
             aggregate.argument_names[i] = name;
         }
 
@@ -536,7 +533,7 @@ void ExpressionAnalyzer::makeWindowDescriptions(ActionsDAGPtr actions)
 {
     // Convenient to check here because at least we have the Context.
     if (!syntax->window_function_asts.empty() &&
-        !context.getSettingsRef().allow_experimental_window_functions)
+        !getContext()->getSettingsRef().allow_experimental_window_functions)
     {
         throw Exception(ErrorCodes::NOT_IMPLEMENTED,
             "The support for window functions is experimental and will change"
@@ -594,20 +591,19 @@ void ExpressionAnalyzer::makeWindowDescriptions(ActionsDAGPtr actions)
             = window_function.function_node->arguments->children;
         window_function.argument_types.resize(arguments.size());
         window_function.argument_names.resize(arguments.size());
-        const auto & index = actions->getIndex();
         for (size_t i = 0; i < arguments.size(); ++i)
         {
             const std::string & name = arguments[i]->getColumnName();
+            const auto * node = actions->tryFindInIndex(name);
 
-            auto it = index.find(name);
-            if (it == index.end())
+            if (!node)
             {
                 throw Exception(ErrorCodes::UNKNOWN_IDENTIFIER,
                     "Unknown identifier '{}' in window function '{}'",
                     name, window_function.function_node->formatForErrorMessage());
             }
 
-            window_function.argument_types[i] = (*it)->result_type;
+            window_function.argument_types[i] = node->result_type;
             window_function.argument_names[i] = name;
         }
 
@@ -681,13 +677,16 @@ ArrayJoinActionPtr ExpressionAnalyzer::addMultipleArrayJoinAction(ActionsDAGPtr
     {
         /// Assign new names to columns, if needed.
         if (result_source.first != result_source.second)
-            actions->addAlias(result_source.second, result_source.first);
+        {
+            const auto & node = actions->findInIndex(result_source.second);
+            actions->getIndex().push_back(&actions->addAlias(node, result_source.first));
+        }
 
         /// Make ARRAY JOIN (replace arrays with their insides) for the columns in these new names.
         result_columns.insert(result_source.first);
     }
 
-    return std::make_shared<ArrayJoinAction>(result_columns, array_join_is_left, context);
+    return std::make_shared<ArrayJoinAction>(result_columns, array_join_is_left, getContext());
 }
 
 ArrayJoinActionPtr SelectQueryExpressionAnalyzer::appendArrayJoin(ExpressionActionsChain & chain, ActionsDAGPtr & before_array_join, bool only_types)
@@ -724,13 +723,17 @@ bool SelectQueryExpressionAnalyzer::appendJoinLeftKeys(ExpressionActionsChain &
 
 JoinPtr SelectQueryExpressionAnalyzer::appendJoin(ExpressionActionsChain & chain)
 {
-    JoinPtr table_join = makeTableJoin(*syntax->ast_join);
+    const ColumnsWithTypeAndName & left_sample_columns = chain.getLastStep().getResultColumns();
+    JoinPtr table_join = makeTableJoin(*syntax->ast_join, left_sample_columns);
+
+    if (syntax->analyzed_join->needConvert())
+    {
+        chain.steps.push_back(std::make_unique<ExpressionActionsChain::ExpressionActionsStep>(syntax->analyzed_join->leftConvertingActions()));
+        chain.addStep();
+    }
 
     ExpressionActionsChain::Step & step = chain.lastStep(columns_after_array_join);
-
-    chain.steps.push_back(std::make_unique<ExpressionActionsChain::JoinStep>(
-            syntax->analyzed_join, table_join, step.getResultColumns()));
-
+    chain.steps.push_back(std::make_unique<ExpressionActionsChain::JoinStep>(syntax->analyzed_join, table_join, step.getResultColumns()));
     chain.addStep();
     return table_join;
 }
@@ -739,25 +742,25 @@ static JoinPtr tryGetStorageJoin(std::shared_ptr<TableJoin> analyzed_join)
 {
     if (auto * table = analyzed_join->joined_storage.get())
         if (auto * storage_join = dynamic_cast<StorageJoin *>(table))
-            return storage_join->getJoin(analyzed_join);
+            return storage_join->getJoinLocked(analyzed_join);
     return {};
 }
 
-static ExpressionActionsPtr createJoinedBlockActions(const Context & context, const TableJoin & analyzed_join)
+static ExpressionActionsPtr createJoinedBlockActions(ContextPtr context, const TableJoin & analyzed_join)
 {
     ASTPtr expression_list = analyzed_join.rightKeysList();
     auto syntax_result = TreeRewriter(context).analyze(expression_list, analyzed_join.columnsFromJoinedTable());
     return ExpressionAnalyzer(expression_list, syntax_result, context).getActions(true, false);
 }
 
-static bool allowDictJoin(StoragePtr joined_storage, const Context & context, String & dict_name, String & key_name)
+static bool allowDictJoin(StoragePtr joined_storage, ContextPtr context, String & dict_name, String & key_name)
 {
     const auto * dict = dynamic_cast<const StorageDictionary *>(joined_storage.get());
     if (!dict)
         return false;
 
-    dict_name = dict->resolvedDictionaryName();
-    auto dictionary = context.getExternalDictionariesLoader().getDictionary(dict_name);
+    dict_name = dict->dictionaryName();
+    auto dictionary = context->getExternalDictionariesLoader().getDictionary(dict_name, context);
     if (!dictionary)
         return false;
 
@@ -770,7 +773,7 @@ static bool allowDictJoin(StoragePtr joined_storage, const Context & context, St
     return false;
 }
 
-static std::shared_ptr<IJoin> makeJoin(std::shared_ptr<TableJoin> analyzed_join, const Block & sample_block, const Context & context)
+static std::shared_ptr<IJoin> makeJoin(std::shared_ptr<TableJoin> analyzed_join, const Block & sample_block, ContextPtr context)
 {
     bool allow_merge_join = analyzed_join->allowMergeJoin();
 
@@ -795,7 +798,8 @@ static std::shared_ptr<IJoin> makeJoin(std::shared_ptr<TableJoin> analyzed_join,
     return std::make_shared<JoinSwitcher>(analyzed_join, sample_block);
 }
 
-JoinPtr SelectQueryExpressionAnalyzer::makeTableJoin(const ASTTablesInSelectQueryElement & join_element)
+JoinPtr SelectQueryExpressionAnalyzer::makeTableJoin(
+    const ASTTablesInSelectQueryElement & join_element, const ColumnsWithTypeAndName & left_sample_columns)
 {
     /// Two JOINs are not supported with the same subquery, but different USINGs.
     auto join_hash = join_element.getTreeHash();
@@ -810,7 +814,7 @@ JoinPtr SelectQueryExpressionAnalyzer::makeTableJoin(const ASTTablesInSelectQuer
     if (!subquery_for_join.join)
     {
         /// Actions which need to be calculated on joined block.
-        ExpressionActionsPtr joined_block_actions = createJoinedBlockActions(context, analyzedJoin());
+        ExpressionActionsPtr joined_block_actions = createJoinedBlockActions(getContext(), analyzedJoin());
 
         Names original_right_columns;
         if (!subquery_for_join.source)
@@ -825,14 +829,22 @@ JoinPtr SelectQueryExpressionAnalyzer::makeTableJoin(const ASTTablesInSelectQuer
                 *   in the subquery_for_set object this subquery is exposed as source and the temporary table _data1 as the `table`.
                 * - this function shows the expression JOIN _data1.
                 */
-            auto interpreter = interpretSubquery(join_element.table_expression, context, original_right_columns, query_options);
+            auto interpreter = interpretSubquery(join_element.table_expression, getContext(), original_right_columns, query_options);
 
             subquery_for_join.makeSource(interpreter, std::move(required_columns_with_aliases));
         }
 
         /// TODO You do not need to set this up when JOIN is only needed on remote servers.
-        subquery_for_join.setJoinActions(joined_block_actions); /// changes subquery_for_join.sample_block inside
-        subquery_for_join.join = makeJoin(syntax->analyzed_join, subquery_for_join.sample_block, context);
+        subquery_for_join.addJoinActions(joined_block_actions); /// changes subquery_for_join.sample_block inside
+
+        const ColumnsWithTypeAndName & right_sample_columns = subquery_for_join.sample_block.getColumnsWithTypeAndName();
+        bool need_convert = syntax->analyzed_join->applyJoinKeyConvert(left_sample_columns, right_sample_columns);
+        if (need_convert)
+            subquery_for_join.addJoinActions(std::make_shared<ExpressionActions>(
+                syntax->analyzed_join->rightConvertingActions(),
+                ExpressionActionsSettings::fromContext(getContext())));
+
+        subquery_for_join.join = makeJoin(syntax->analyzed_join, subquery_for_join.sample_block, getContext());
 
         /// Do not make subquery for join over dictionary.
         if (syntax->analyzed_join->dictionary_reader)
@@ -842,6 +854,13 @@ JoinPtr SelectQueryExpressionAnalyzer::makeTableJoin(const ASTTablesInSelectQuer
             return join;
         }
     }
+    else
+    {
+        const ColumnsWithTypeAndName & right_sample_columns = subquery_for_join.sample_block.getColumnsWithTypeAndName();
+        bool need_convert = syntax->analyzed_join->applyJoinKeyConvert(left_sample_columns, right_sample_columns);
+        if (need_convert)
+            subquery_for_join.addJoinActions(std::make_shared<ExpressionActions>(syntax->analyzed_join->rightConvertingActions()));
+    }
 
     return subquery_for_join.join;
 }
@@ -855,18 +874,17 @@ ActionsDAGPtr SelectQueryExpressionAnalyzer::appendPrewhere(
     if (!select_query->prewhere())
         return prewhere_actions;
 
+    Names first_action_names;
+    if (!chain.steps.empty())
+        first_action_names = chain.steps.front()->getRequiredColumns().getNames();
+
     auto & step = chain.lastStep(sourceColumns());
     getRootActions(select_query->prewhere(), only_types, step.actions());
     String prewhere_column_name = select_query->prewhere()->getColumnName();
-    step.required_output.push_back(prewhere_column_name);
-    step.can_remove_required_output.push_back(true);
+    step.addRequiredOutput(prewhere_column_name);
 
-    const auto & index = step.actions()->getIndex();
-    auto it = index.find(prewhere_column_name);
-    if (it == index.end())
-        throw Exception(ErrorCodes::UNKNOWN_IDENTIFIER, "Unknown identifier: '{}'", prewhere_column_name);
-
-    auto filter_type = (*it)->result_type;
+    const auto & node = step.actions()->findInIndex(prewhere_column_name);
+    auto filter_type = node.result_type;
     if (!filter_type->canBeUsedInBooleanContext())
         throw Exception("Invalid type for filter in PREWHERE: " + filter_type->getName(),
                         ErrorCodes::ILLEGAL_TYPE_OF_COLUMN_FOR_FILTER);
@@ -875,20 +893,18 @@ ActionsDAGPtr SelectQueryExpressionAnalyzer::appendPrewhere(
         /// Remove unused source_columns from prewhere actions.
         auto tmp_actions_dag = std::make_shared<ActionsDAG>(sourceColumns());
         getRootActions(select_query->prewhere(), only_types, tmp_actions_dag);
-        tmp_actions_dag->removeUnusedActions({prewhere_column_name});
-        auto tmp_actions = std::make_shared<ExpressionActions>(tmp_actions_dag);
+        tmp_actions_dag->removeUnusedActions(NameSet{prewhere_column_name});
+        auto tmp_actions = std::make_shared<ExpressionActions>(tmp_actions_dag, ExpressionActionsSettings::fromContext(getContext()));
         auto required_columns = tmp_actions->getRequiredColumns();
         NameSet required_source_columns(required_columns.begin(), required_columns.end());
+        required_source_columns.insert(first_action_names.begin(), first_action_names.end());
 
         /// Add required columns to required output in order not to remove them after prewhere execution.
         /// TODO: add sampling and final execution to common chain.
         for (const auto & column : additional_required_columns)
         {
             if (required_source_columns.count(column))
-            {
-                step.required_output.push_back(column);
-                step.can_remove_required_output.push_back(true);
-            }
+                step.addRequiredOutput(column);
         }
 
         auto names = step.actions()->getNames();
@@ -945,8 +961,7 @@ void SelectQueryExpressionAnalyzer::appendPreliminaryFilter(ExpressionActionsCha
     // FIXME: assert(filter_info);
     auto * expression_step = typeid_cast<ExpressionActionsChain::ExpressionActionsStep *>(&step);
     expression_step->actions_dag = std::move(actions_dag);
-    step.required_output.push_back(std::move(column_name));
-    step.can_remove_required_output = {true};
+    step.addRequiredOutput(column_name);
 
     chain.addStep();
 }
@@ -963,15 +978,10 @@ bool SelectQueryExpressionAnalyzer::appendWhere(ExpressionActionsChain & chain,
     getRootActions(select_query->where(), only_types, step.actions());
 
     auto where_column_name = select_query->where()->getColumnName();
-    step.required_output.push_back(where_column_name);
-    step.can_remove_required_output = {true};
+    step.addRequiredOutput(where_column_name);
 
-    const auto & index = step.actions()->getIndex();
-    auto it = index.find(where_column_name);
-    if (it == index.end())
-        throw Exception(ErrorCodes::UNKNOWN_IDENTIFIER, "Unknown identifier: '{}'", where_column_name);
-
-    auto filter_type = (*it)->result_type;
+    const auto & node = step.actions()->findInIndex(where_column_name);
+    auto filter_type = node.result_type;
     if (!filter_type->canBeUsedInBooleanContext())
         throw Exception("Invalid type for filter in WHERE: " + filter_type->getName(),
                         ErrorCodes::ILLEGAL_TYPE_OF_COLUMN_FOR_FILTER);
@@ -992,7 +1002,7 @@ bool SelectQueryExpressionAnalyzer::appendGroupBy(ExpressionActionsChain & chain
     ASTs asts = select_query->groupBy()->children;
     for (const auto & ast : asts)
     {
-        step.required_output.emplace_back(ast->getColumnName());
+        step.addRequiredOutput(ast->getColumnName());
         getRootActions(ast, only_types, step.actions());
     }
 
@@ -1002,7 +1012,8 @@ bool SelectQueryExpressionAnalyzer::appendGroupBy(ExpressionActionsChain & chain
         {
             auto actions_dag = std::make_shared<ActionsDAG>(columns_after_join);
             getRootActions(child, only_types, actions_dag);
-            group_by_elements_actions.emplace_back(std::make_shared<ExpressionActions>(actions_dag));
+            group_by_elements_actions.emplace_back(
+                std::make_shared<ExpressionActions>(actions_dag, ExpressionActionsSettings::fromContext(getContext())));
         }
     }
 
@@ -1017,7 +1028,7 @@ void SelectQueryExpressionAnalyzer::appendAggregateFunctionsArguments(Expression
 
     for (const auto & desc : aggregate_descriptions)
         for (const auto & name : desc.argument_names)
-            step.required_output.emplace_back(name);
+            step.addRequiredOutput(name);
 
     /// Collect aggregates removing duplicates by node.getColumnName()
     /// It's not clear why we recollect aggregates (for query parts) while we're able to use previously collected ones (for entire query)
@@ -1074,14 +1085,14 @@ void SelectQueryExpressionAnalyzer::appendWindowFunctionsArguments(
             // (2b) Required function argument columns.
             for (const auto & a : f.function_node->arguments->children)
             {
-                step.required_output.push_back(a->getColumnName());
+                step.addRequiredOutput(a->getColumnName());
             }
         }
 
         // (2a) Required PARTITION BY and ORDER BY columns.
         for (const auto & c : w.full_sort_description)
         {
-            step.required_output.push_back(c.column_name);
+            step.addRequiredOutput(c.column_name);
         }
     }
 }
@@ -1096,7 +1107,7 @@ bool SelectQueryExpressionAnalyzer::appendHaving(ExpressionActionsChain & chain,
     ExpressionActionsChain::Step & step = chain.lastStep(aggregated_columns);
 
     getRootActionsForHaving(select_query->having(), only_types, step.actions());
-    step.required_output.push_back(select_query->having()->getColumnName());
+    step.addRequiredOutput(select_query->having()->getColumnName());
 
     return true;
 }
@@ -1120,7 +1131,7 @@ void SelectQueryExpressionAnalyzer::appendSelect(ExpressionActionsChain & chain,
             continue;
         }
 
-        step.required_output.push_back(child->getColumnName());
+        step.addRequiredOutput(child->getColumnName());
     }
 }
 
@@ -1148,7 +1159,7 @@ ActionsDAGPtr SelectQueryExpressionAnalyzer::appendOrderBy(ExpressionActionsChai
         if (!ast || ast->children.empty())
             throw Exception("Bad order expression AST", ErrorCodes::UNKNOWN_TYPE_OF_AST_NODE);
         ASTPtr order_expression = ast->children.at(0);
-        step.required_output.push_back(order_expression->getColumnName());
+        step.addRequiredOutput(order_expression->getColumnName());
 
         if (ast->with_fill)
             with_fill = true;
@@ -1160,7 +1171,8 @@ ActionsDAGPtr SelectQueryExpressionAnalyzer::appendOrderBy(ExpressionActionsChai
         {
             auto actions_dag = std::make_shared<ActionsDAG>(columns_after_join);
             getRootActions(child, only_types, actions_dag);
-            order_by_elements_actions.emplace_back(std::make_shared<ExpressionActions>(actions_dag));
+            order_by_elements_actions.emplace_back(
+                std::make_shared<ExpressionActions>(actions_dag, ExpressionActionsSettings::fromContext(getContext())));
         }
     }
 
@@ -1191,7 +1203,7 @@ bool SelectQueryExpressionAnalyzer::appendLimitBy(ExpressionActionsChain & chain
     NameSet aggregated_names;
     for (const auto & column : aggregated_columns)
     {
-        step.required_output.push_back(column.name);
+        step.addRequiredOutput(column.name);
         aggregated_names.insert(column.name);
     }
 
@@ -1199,7 +1211,7 @@ bool SelectQueryExpressionAnalyzer::appendLimitBy(ExpressionActionsChain & chain
     {
         auto child_name = child->getColumnName();
         if (!aggregated_names.count(child_name))
-            step.required_output.push_back(std::move(child_name));
+            step.addRequiredOutput(std::move(child_name));
     }
 
     return true;
@@ -1247,7 +1259,7 @@ ActionsDAGPtr SelectQueryExpressionAnalyzer::appendProjectResult(ExpressionActio
             }
 
             result_columns.emplace_back(source_name, result_name);
-            step.required_output.push_back(result_columns.back().second);
+            step.addRequiredOutput(result_columns.back().second);
         }
     }
 
@@ -1261,7 +1273,7 @@ void ExpressionAnalyzer::appendExpression(ExpressionActionsChain & chain, const
 {
     ExpressionActionsChain::Step & step = chain.lastStep(sourceColumns());
     getRootActions(expr, only_types, step.actions());
-    step.required_output.push_back(expr->getColumnName());
+    step.addRequiredOutput(expr->getColumnName());
 }
 
 
@@ -1301,32 +1313,41 @@ ActionsDAGPtr ExpressionAnalyzer::getActionsDAG(bool add_aliases, bool project_r
 
     if (!(add_aliases && project_result))
     {
+        NameSet name_set(result_names.begin(), result_names.end());
         /// We will not delete the original columns.
         for (const auto & column_name_type : sourceColumns())
-            result_names.push_back(column_name_type.name);
+        {
+            if (name_set.count(column_name_type.name) == 0)
+            {
+                result_names.push_back(column_name_type.name);
+                name_set.insert(column_name_type.name);
+            }
+        }
+
+        actions_dag->removeUnusedActions(name_set);
     }
 
-    actions_dag->removeUnusedActions(result_names);
     return actions_dag;
 }
 
 ExpressionActionsPtr ExpressionAnalyzer::getActions(bool add_aliases, bool project_result)
 {
-    return std::make_shared<ExpressionActions>(getActionsDAG(add_aliases, project_result));
+    return std::make_shared<ExpressionActions>(
+        getActionsDAG(add_aliases, project_result), ExpressionActionsSettings::fromContext(getContext()));
 }
 
 
-ExpressionActionsPtr ExpressionAnalyzer::getConstActions()
+ExpressionActionsPtr ExpressionAnalyzer::getConstActions(const ColumnsWithTypeAndName & constant_inputs)
 {
-    auto actions = std::make_shared<ActionsDAG>(NamesAndTypesList());
+    auto actions = std::make_shared<ActionsDAG>(constant_inputs);
 
     getRootActions(query, true, actions, true);
-    return std::make_shared<ExpressionActions>(actions);
+    return std::make_shared<ExpressionActions>(actions, ExpressionActionsSettings::fromContext(getContext()));
 }
 
 ActionsDAGPtr SelectQueryExpressionAnalyzer::simpleSelectActions()
 {
-    ExpressionActionsChain new_chain(context);
+    ExpressionActionsChain new_chain(getContext());
     appendSelect(new_chain, false);
     return new_chain.getLastActions();
 }
@@ -1337,7 +1358,7 @@ ExpressionAnalysisResult::ExpressionAnalysisResult(
         bool first_stage_,
         bool second_stage_,
         bool only_types,
-        const FilterInfoPtr & filter_info_,
+        const FilterDAGInfoPtr & filter_info_,
         const Block & source_header)
     : first_stage(first_stage_)
     , second_stage(second_stage_)
@@ -1353,8 +1374,8 @@ ExpressionAnalysisResult::ExpressionAnalysisResult(
         */
 
     const ASTSelectQuery & query = *query_analyzer.getSelectQuery();
-    const Context & context = query_analyzer.context;
-    const Settings & settings = context.getSettingsRef();
+    auto context = query_analyzer.getContext();
+    const Settings & settings = context->getSettingsRef();
     const ConstStoragePtr & storage = query_analyzer.storage();
 
     bool finalized = false;
@@ -1366,7 +1387,7 @@ ExpressionAnalysisResult::ExpressionAnalysisResult(
 
         if (!finalized)
         {
-            finalize(chain, where_step_num);
+            finalize(chain, where_step_num, query);
             finalized = true;
         }
 
@@ -1400,7 +1421,7 @@ ExpressionAnalysisResult::ExpressionAnalysisResult(
         if (storage && filter_info_)
         {
             filter_info = filter_info_;
-            query_analyzer.appendPreliminaryFilter(chain, filter_info->actions_dag, filter_info->column_name);
+            filter_info->do_remove_column = true;
         }
 
         if (auto actions = query_analyzer.appendPrewhere(chain, !first_stage, additional_required_columns_after_prewhere))
@@ -1412,7 +1433,9 @@ ExpressionAnalysisResult::ExpressionAnalysisResult(
                 Block before_prewhere_sample = source_header;
                 if (sanitizeBlock(before_prewhere_sample))
                 {
-                    ExpressionActions(prewhere_info->prewhere_actions).execute(before_prewhere_sample);
+                    ExpressionActions(
+                        prewhere_info->prewhere_actions,
+                        ExpressionActionsSettings::fromSettings(context->getSettingsRef())).execute(before_prewhere_sample);
                     auto & column_elem = before_prewhere_sample.getByName(query.prewhere()->getColumnName());
                     /// If the filter column is a constant, record it.
                     if (column_elem.column)
@@ -1426,9 +1449,9 @@ ExpressionAnalysisResult::ExpressionAnalysisResult(
         if (query_analyzer.hasTableJoin())
         {
             query_analyzer.appendJoinLeftKeys(chain, only_types || !first_stage);
-
             before_join = chain.getLastActions();
             join = query_analyzer.appendJoin(chain);
+            converting_join_columns = query_analyzer.analyzedJoin().leftConvertingActions();
             chain.addStep();
         }
 
@@ -1445,7 +1468,9 @@ ExpressionAnalysisResult::ExpressionAnalysisResult(
                     before_where_sample = source_header;
                 if (sanitizeBlock(before_where_sample))
                 {
-                    ExpressionActions(before_where).execute(before_where_sample);
+                    ExpressionActions(
+                        before_where,
+                        ExpressionActionsSettings::fromSettings(context->getSettingsRef())).execute(before_where_sample);
                     auto & column_elem = before_where_sample.getByName(query.where()->getColumnName());
                     /// If the filter column is a constant, record it.
                     if (column_elem.column)
@@ -1459,7 +1484,7 @@ ExpressionAnalysisResult::ExpressionAnalysisResult(
         {
             /// TODO correct conditions
             optimize_aggregation_in_order =
-                    context.getSettingsRef().optimize_aggregation_in_order
+                    context->getSettingsRef().optimize_aggregation_in_order
                     && storage && query.groupBy();
 
             query_analyzer.appendGroupBy(chain, only_types || !first_stage, optimize_aggregation_in_order, group_by_elements_actions);
@@ -1485,8 +1510,10 @@ ExpressionAnalysisResult::ExpressionAnalysisResult(
 
         optimize_read_in_order =
             settings.optimize_read_in_order
-            && storage && query.orderBy()
+            && storage
+            && query.orderBy()
             && !query_analyzer.hasAggregation()
+            && !query_analyzer.hasWindow()
             && !query.final()
             && join_allow_read_in_order;
 
@@ -1535,11 +1562,14 @@ ExpressionAnalysisResult::ExpressionAnalysisResult(
             const auto * select_query = query_analyzer.getSelectQuery();
             for (const auto & child : select_query->select()->children)
             {
-                step.required_output.push_back(child->getColumnName());
+                step.addRequiredOutput(child->getColumnName());
             }
         }
 
-        selected_columns = chain.getLastStep().required_output;
+        selected_columns.clear();
+        selected_columns.reserve(chain.getLastStep().required_output.size());
+        for (const auto & it : chain.getLastStep().required_output)
+            selected_columns.emplace_back(it.first);
 
         has_order_by = query.orderBy() != nullptr;
         before_order_by = query_analyzer.appendOrderBy(
@@ -1565,35 +1595,36 @@ ExpressionAnalysisResult::ExpressionAnalysisResult(
     checkActions();
 }
 
-void ExpressionAnalysisResult::finalize(const ExpressionActionsChain & chain, size_t where_step_num)
+void ExpressionAnalysisResult::finalize(const ExpressionActionsChain & chain, size_t where_step_num, const ASTSelectQuery & query)
 {
+    size_t next_step_i = 0;
+
     if (hasPrewhere())
     {
-        const ExpressionActionsChain::Step & step = *chain.steps.at(0);
-        prewhere_info->remove_prewhere_column = step.can_remove_required_output.at(0);
+        const ExpressionActionsChain::Step & step = *chain.steps.at(next_step_i++);
+        prewhere_info->prewhere_actions->projectInput(false);
 
         NameSet columns_to_remove;
-        for (size_t i = 1; i < step.required_output.size(); ++i)
+        for (const auto & [name, can_remove] : step.required_output)
         {
-            if (step.can_remove_required_output[i])
-                columns_to_remove.insert(step.required_output[i]);
+            if (name == prewhere_info->prewhere_column_name)
+                prewhere_info->remove_prewhere_column = can_remove;
+            else if (can_remove)
+                columns_to_remove.insert(name);
         }
 
         columns_to_remove_after_prewhere = std::move(columns_to_remove);
     }
-    else if (hasFilter())
-    {
-        /// Can't have prewhere and filter set simultaneously
-        filter_info->do_remove_column = chain.steps.at(0)->can_remove_required_output.at(0);
-    }
+
     if (hasWhere())
-        remove_where_filter = chain.steps.at(where_step_num)->can_remove_required_output.at(0);
+    {
+        auto where_column_name = query.where()->getColumnName();
+        remove_where_filter = chain.steps.at(where_step_num)->required_output.find(where_column_name)->second;
+    }
 }
 
 void ExpressionAnalysisResult::removeExtraColumns() const
 {
-    if (hasFilter())
-        filter_info->actions_dag->projectInput();
     if (hasWhere())
         before_where->projectInput();
     if (hasHaving())
diff --git a/src/Interpreters/ExpressionAnalyzer.h b/src/Interpreters/ExpressionAnalyzer.h
index 319be9c1409..fe53b44690e 100644
--- a/src/Interpreters/ExpressionAnalyzer.h
+++ b/src/Interpreters/ExpressionAnalyzer.h
@@ -1,21 +1,21 @@
 #pragma once
 
-#include <DataStreams/IBlockStream_fwd.h>
 #include <Columns/FilterDescription.h>
+#include <DataStreams/IBlockStream_fwd.h>
 #include <Interpreters/AggregateDescription.h>
-#include <Interpreters/WindowDescription.h>
-#include <Interpreters/TreeRewriter.h>
+#include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/SubqueryForSet.h>
+#include <Interpreters/TreeRewriter.h>
+#include <Interpreters/WindowDescription.h>
+#include <Interpreters/join_common.h>
 #include <Parsers/IAST_fwd.h>
 #include <Storages/IStorage_fwd.h>
 #include <Storages/SelectQueryInfo.h>
-#include <Interpreters/DatabaseCatalog.h>
 
 namespace DB
 {
 
 class Block;
-class Context;
 struct Settings;
 
 struct ExpressionActionsChain;
@@ -77,7 +77,7 @@ struct ExpressionAnalyzerData
   *
   * NOTE: if `ast` is a SELECT query from a table, the structure of this table should not change during the lifetime of ExpressionAnalyzer.
   */
-class ExpressionAnalyzer : protected ExpressionAnalyzerData, private boost::noncopyable
+class ExpressionAnalyzer : protected ExpressionAnalyzerData, private boost::noncopyable, protected WithContext
 {
 private:
     /// Extracts settings to enlight which are used (and avoid copy of others).
@@ -95,7 +95,7 @@ public:
     ExpressionAnalyzer(
         const ASTPtr & query_,
         const TreeRewriterResultPtr & syntax_analyzer_result_,
-        const Context & context_)
+        ContextPtr context_)
     :   ExpressionAnalyzer(query_, syntax_analyzer_result_, context_, 0, false, {})
     {}
 
@@ -110,7 +110,7 @@ public:
 
     /// Actions that can be performed on an empty block: adding constants and applying functions that depend only on constants.
     /// Does not execute subqueries.
-    ExpressionActionsPtr getConstActions();
+    ExpressionActionsPtr getConstActions(const ColumnsWithTypeAndName & constant_inputs = {});
 
     /** Sets that require a subquery to be create.
       * Only the sets needed to perform actions returned from already executed `append*` or `getActions`.
@@ -127,17 +127,29 @@ public:
 
     void makeWindowDescriptions(ActionsDAGPtr actions);
 
+    /**
+      * Create Set from a subquery or a table expression in the query. The created set is suitable for using the index.
+      * The set will not be created if its size hits the limit.
+      */
+    void tryMakeSetForIndexFromSubquery(const ASTPtr & subquery_or_table_name, const SelectQueryOptions & query_options = {});
+
+    /**
+      * Checks if subquery is not a plain StorageSet.
+      * Because while making set we will read data from StorageSet which is not allowed.
+      * Returns valid SetPtr from StorageSet if the latter is used after IN or nullptr otherwise.
+      */
+    SetPtr isPlainStorageSetInSubquery(const ASTPtr & subquery_or_table_name);
+
 protected:
     ExpressionAnalyzer(
         const ASTPtr & query_,
         const TreeRewriterResultPtr & syntax_analyzer_result_,
-        const Context & context_,
+        ContextPtr context_,
         size_t subquery_depth_,
         bool do_global_,
         SubqueriesForSets subqueries_for_sets_);
 
     ASTPtr query;
-    const Context & context;
     const ExtractedSettings settings;
     size_t subquery_depth;
 
@@ -199,6 +211,7 @@ struct ExpressionAnalysisResult
     ActionsDAGPtr before_array_join;
     ArrayJoinActionPtr array_join;
     ActionsDAGPtr before_join;
+    ActionsDAGPtr converting_join_columns;
     JoinPtr join;
     ActionsDAGPtr before_where;
     ActionsDAGPtr before_aggregation;
@@ -216,7 +229,7 @@ struct ExpressionAnalysisResult
     NameSet columns_to_remove_after_prewhere;
 
     PrewhereDAGInfoPtr prewhere_info;
-    FilterInfoPtr filter_info;
+    FilterDAGInfoPtr filter_info;
     ConstantFilterDescription prewhere_constant_filter_description;
     ConstantFilterDescription where_constant_filter_description;
     /// Actions by every element of ORDER BY
@@ -231,7 +244,7 @@ struct ExpressionAnalysisResult
         bool first_stage,
         bool second_stage,
         bool only_types,
-        const FilterInfoPtr & filter_info,
+        const FilterDAGInfoPtr & filter_info,
         const Block & source_header);
 
     /// Filter for row-level security.
@@ -245,7 +258,7 @@ struct ExpressionAnalysisResult
 
     void removeExtraColumns() const;
     void checkActions() const;
-    void finalize(const ExpressionActionsChain & chain, size_t where_step_num);
+    void finalize(const ExpressionActionsChain & chain, size_t where_step_num, const ASTSelectQuery & query);
 };
 
 /// SelectQuery specific ExpressionAnalyzer part.
@@ -257,7 +270,7 @@ public:
     SelectQueryExpressionAnalyzer(
         const ASTPtr & query_,
         const TreeRewriterResultPtr & syntax_analyzer_result_,
-        const Context & context_,
+        ContextPtr context_,
         const StorageMetadataPtr & metadata_snapshot_,
         const NameSet & required_result_columns_ = {},
         bool do_global_ = false,
@@ -297,23 +310,12 @@ private:
     NameSet required_result_columns;
     SelectQueryOptions query_options;
 
-    /**
-      * Create Set from a subquery or a table expression in the query. The created set is suitable for using the index.
-      * The set will not be created if its size hits the limit.
-      */
-    void tryMakeSetForIndexFromSubquery(const ASTPtr & subquery_or_table_name);
-
-    /**
-      * Checks if subquery is not a plain StorageSet.
-      * Because while making set we will read data from StorageSet which is not allowed.
-      * Returns valid SetPtr from StorageSet if the latter is used after IN or nullptr otherwise.
-      */
-    SetPtr isPlainStorageSetInSubquery(const ASTPtr & subquery_or_table_name);
-
     /// Create Set-s that we make from IN section to use index on them.
     void makeSetsForIndex(const ASTPtr & node);
 
-    JoinPtr makeTableJoin(const ASTTablesInSelectQueryElement & join_element);
+    JoinPtr makeTableJoin(
+        const ASTTablesInSelectQueryElement & join_element,
+        const ColumnsWithTypeAndName & left_sample_columns);
 
     const ASTSelectQuery * getAggregatingQuery() const;
 
diff --git a/src/Interpreters/ExpressionJIT.cpp b/src/Interpreters/ExpressionJIT.cpp
index ed3e1f59405..cc37025f699 100644
--- a/src/Interpreters/ExpressionJIT.cpp
+++ b/src/Interpreters/ExpressionJIT.cpp
@@ -596,8 +596,8 @@ static bool isCompilableFunction(const ActionsDAG::Node & node)
 }
 
 static LLVMFunction::CompileDAG getCompilableDAG(
-    ActionsDAG::Node * root,
-    std::vector<ActionsDAG::Node *> & children,
+    const ActionsDAG::Node * root,
+    ActionsDAG::NodeRawConstPtrs & children,
     const std::unordered_set<const ActionsDAG::Node *> & used_in_result)
 {
     LLVMFunction::CompileDAG dag;
@@ -605,7 +605,7 @@ static LLVMFunction::CompileDAG getCompilableDAG(
     std::unordered_map<const ActionsDAG::Node *, size_t> positions;
     struct Frame
     {
-        ActionsDAG::Node * node;
+        const ActionsDAG::Node * node;
         size_t next_child_to_visit = 0;
     };
 
@@ -621,7 +621,7 @@ static LLVMFunction::CompileDAG getCompilableDAG(
 
         while (is_compilable_function && frame.next_child_to_visit < frame.node->children.size())
         {
-            auto * child = frame.node->children[frame.next_child_to_visit];
+            const auto * child = frame.node->children[frame.next_child_to_visit];
 
             if (positions.count(child))
                 ++frame.next_child_to_visit;
@@ -743,8 +743,7 @@ UInt128 LLVMFunction::CompileDAG::hash() const
 
 static FunctionBasePtr compile(
     const LLVMFunction::CompileDAG & dag,
-    size_t min_count_to_compile_expression,
-    const std::shared_ptr<CompiledExpressionCache> & compilation_cache)
+    size_t min_count_to_compile_expression)
 {
     static std::unordered_map<UInt128, UInt32, UInt128Hash> counter;
     static std::mutex mutex;
@@ -769,7 +768,7 @@ static FunctionBasePtr compile(
     }
 
     FunctionBasePtr fn;
-    if (compilation_cache)
+    if (auto * compilation_cache = CompiledExpressionCacheFactory::instance().tryGetCache())
     {
         std::tie(fn, std::ignore) = compilation_cache->getOrSet(hash_key, [&dag] ()
         {
@@ -790,7 +789,7 @@ static FunctionBasePtr compile(
     return fn;
 }
 
-void ActionsDAG::compileFunctions()
+void ActionsDAG::compileFunctions(size_t min_count_to_compile_expression)
 {
     struct Data
     {
@@ -815,7 +814,7 @@ void ActionsDAG::compileFunctions()
 
     struct Frame
     {
-        Node * node;
+        const Node * node;
         size_t next_child_to_visit = 0;
     };
 
@@ -834,7 +833,7 @@ void ActionsDAG::compileFunctions()
 
             while (frame.next_child_to_visit < frame.node->children.size())
             {
-                auto * child = frame.node->children[frame.next_child_to_visit];
+                const auto * child = frame.node->children[frame.next_child_to_visit];
 
                 if (visited.count(child))
                     ++frame.next_child_to_visit;
@@ -864,17 +863,17 @@ void ActionsDAG::compileFunctions()
                     if (!used_in_result.count(frame.node) && cur.all_parents_compilable)
                         should_compile = false;
 
-                    /// There is not reason to inline single node.
+                    /// There is no reason to inline single node.
                     /// The result of compiling function in isolation is pretty much the same as its `execute` method.
                     if (cur.num_inlineable_nodes <= 1)
                         should_compile = false;
 
                     if (should_compile)
                     {
-                        std::vector<Node *> new_children;
+                        NodeRawConstPtrs new_children;
                         auto dag = getCompilableDAG(frame.node, new_children, used_in_result);
 
-                        if (auto fn = compile(dag, settings.min_count_to_compile_expression, compilation_cache))
+                        if (auto fn = compile(dag, min_count_to_compile_expression))
                         {
                             /// Replace current node to compilable function.
 
@@ -883,12 +882,13 @@ void ActionsDAG::compileFunctions()
                             for (const auto * child : new_children)
                                 arguments.emplace_back(child->column, child->result_type, child->result_name);
 
-                            frame.node->type = ActionsDAG::ActionType::FUNCTION;
-                            frame.node->function_base = fn;
-                            frame.node->function = fn->prepare(arguments);
-                            frame.node->children.swap(new_children);
-                            frame.node->is_function_compiled = true;
-                            frame.node->column = nullptr; /// Just in case.
+                            auto * frame_node = const_cast<Node *>(frame.node);
+                            frame_node->type = ActionsDAG::ActionType::FUNCTION;
+                            frame_node->function_base = fn;
+                            frame_node->function = fn->prepare(arguments);
+                            frame_node->children.swap(new_children);
+                            frame_node->is_function_compiled = true;
+                            frame_node->column = nullptr; /// Just in case.
                         }
                     }
                 }
@@ -900,6 +900,25 @@ void ActionsDAG::compileFunctions()
     }
 }
 
+CompiledExpressionCacheFactory & CompiledExpressionCacheFactory::instance()
+{
+    static CompiledExpressionCacheFactory factory;
+    return factory;
+}
+
+void CompiledExpressionCacheFactory::init(size_t cache_size)
+{
+    if (cache)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "CompiledExpressionCache was already initialized");
+
+    cache = std::make_unique<CompiledExpressionCache>(cache_size);
+}
+
+CompiledExpressionCache * CompiledExpressionCacheFactory::tryGetCache()
+{
+    return cache.get();
+}
+
 }
 
 #endif
diff --git a/src/Interpreters/ExpressionJIT.h b/src/Interpreters/ExpressionJIT.h
index 30e6e03854d..793c19b4fe7 100644
--- a/src/Interpreters/ExpressionJIT.h
+++ b/src/Interpreters/ExpressionJIT.h
@@ -100,6 +100,18 @@ public:
     using Base::Base;
 };
 
+class CompiledExpressionCacheFactory
+{
+private:
+    std::unique_ptr<CompiledExpressionCache> cache;
+
+public:
+    static CompiledExpressionCacheFactory & instance();
+
+    void init(size_t cache_size);
+    CompiledExpressionCache * tryGetCache();
+};
+
 }
 
 #endif
diff --git a/src/Interpreters/ExternalDictionariesLoader.cpp b/src/Interpreters/ExternalDictionariesLoader.cpp
index 4df4e5f8c1b..1fc0f95c846 100644
--- a/src/Interpreters/ExternalDictionariesLoader.cpp
+++ b/src/Interpreters/ExternalDictionariesLoader.cpp
@@ -1,6 +1,10 @@
 #include <Interpreters/ExternalDictionariesLoader.h>
+#include <Interpreters/DatabaseCatalog.h>
+#include <Interpreters/Context.h>
 #include <Dictionaries/DictionaryFactory.h>
 #include <Dictionaries/DictionaryStructure.h>
+#include <Databases/IDatabase.h>
+#include <Storages/IStorage.h>
 
 #if !defined(ARCADIA_BUILD)
 #    include "config_core.h"
@@ -13,10 +17,15 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+    extern const int BAD_ARGUMENTS;
+}
+
 /// Must not acquire Context lock in constructor to avoid possibility of deadlocks.
-ExternalDictionariesLoader::ExternalDictionariesLoader(Context & context_)
+ExternalDictionariesLoader::ExternalDictionariesLoader(ContextPtr global_context_)
     : ExternalLoader("external dictionary", &Poco::Logger::get("ExternalDictionariesLoader"))
-    , context(context_)
+    , WithContext(global_context_)
 {
     setConfigSettings({"dictionary", "name", "database", "uuid"});
     enableAsyncLoading(true);
@@ -31,9 +40,88 @@ ExternalLoader::LoadablePtr ExternalDictionariesLoader::create(
     /// For dictionaries from databases (created with DDL queries) we have to perform
     /// additional checks, so we identify them here.
     bool dictionary_from_database = !repository_name.empty();
-    return DictionaryFactory::instance().create(name, config, key_in_config, context, dictionary_from_database);
+    return DictionaryFactory::instance().create(name, config, key_in_config, getContext(), dictionary_from_database);
 }
 
+ExternalDictionariesLoader::DictPtr ExternalDictionariesLoader::getDictionary(const std::string & dictionary_name, ContextPtr local_context) const
+{
+    std::string resolved_dictionary_name = resolveDictionaryName(dictionary_name, local_context->getCurrentDatabase());
+    return std::static_pointer_cast<const IDictionary>(load(resolved_dictionary_name));
+}
+
+ExternalDictionariesLoader::DictPtr ExternalDictionariesLoader::tryGetDictionary(const std::string & dictionary_name, ContextPtr local_context) const
+{
+    std::string resolved_dictionary_name = resolveDictionaryName(dictionary_name, local_context->getCurrentDatabase());
+    return std::static_pointer_cast<const IDictionary>(tryLoad(resolved_dictionary_name));
+}
+
+
+void ExternalDictionariesLoader::reloadDictionary(const std::string & dictionary_name, ContextPtr local_context) const
+{
+    std::string resolved_dictionary_name = resolveDictionaryName(dictionary_name, local_context->getCurrentDatabase());
+    loadOrReload(resolved_dictionary_name);
+}
+
+DictionaryStructure ExternalDictionariesLoader::getDictionaryStructure(const std::string & dictionary_name, ContextPtr query_context) const
+{
+    std::string resolved_name = resolveDictionaryName(dictionary_name, query_context->getCurrentDatabase());
+
+    auto load_result = getLoadResult(resolved_name);
+    if (!load_result.config)
+        throw Exception("Dictionary " + backQuote(dictionary_name) + " config not found", ErrorCodes::BAD_ARGUMENTS);
+
+    return ExternalDictionariesLoader::getDictionaryStructure(*load_result.config);
+}
+
+std::string ExternalDictionariesLoader::resolveDictionaryName(const std::string & dictionary_name, const std::string & current_database_name) const
+{
+    std::string resolved_name = resolveDictionaryNameFromDatabaseCatalog(dictionary_name);
+    bool has_dictionary = has(resolved_name);
+
+    if (!has_dictionary)
+    {
+        /// If dictionary not found. And database was not implicitly specified
+        /// we can qualify dictionary name with current database name.
+        /// It will help if dictionary is created with DDL and is in current database.
+        if (dictionary_name.find('.') == std::string::npos)
+        {
+            String dictionary_name_with_database = current_database_name + '.' + dictionary_name;
+            resolved_name = resolveDictionaryNameFromDatabaseCatalog(dictionary_name_with_database);
+            has_dictionary = has(resolved_name);
+        }
+    }
+
+    if (!has_dictionary)
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Dictionary ({}) not found", backQuote(dictionary_name));
+
+    return resolved_name;
+}
+
+std::string ExternalDictionariesLoader::resolveDictionaryNameFromDatabaseCatalog(const std::string & name) const
+{
+    /// If it's dictionary from Atomic database, then we need to convert qualified name to UUID.
+    /// Try to split name and get id from associated StorageDictionary.
+    /// If something went wrong, return name as is.
+
+    auto pos = name.find('.');
+    if (pos == std::string::npos || name.find('.', pos + 1) != std::string::npos)
+        return name;
+
+    std::string maybe_database_name = name.substr(0, pos);
+    std::string maybe_table_name = name.substr(pos + 1);
+
+    auto [db, table] = DatabaseCatalog::instance().tryGetDatabaseAndTable({maybe_database_name, maybe_table_name}, getContext());
+    if (!db)
+        return name;
+    assert(table);
+
+    if (db->getUUID() == UUIDHelpers::Nil)
+        return name;
+    if (table->getName() != "Dictionary")
+        return name;
+
+    return toString(table->getStorageID().uuid);
+}
 
 DictionaryStructure
 ExternalDictionariesLoader::getDictionaryStructure(const Poco::Util::AbstractConfiguration & config, const std::string & key_in_config)
diff --git a/src/Interpreters/ExternalDictionariesLoader.h b/src/Interpreters/ExternalDictionariesLoader.h
index e69046706a3..06f64ef30c5 100644
--- a/src/Interpreters/ExternalDictionariesLoader.h
+++ b/src/Interpreters/ExternalDictionariesLoader.h
@@ -1,34 +1,36 @@
 #pragma once
 
 #include <Dictionaries/IDictionary.h>
+#include <Interpreters/Context_fwd.h>
 #include <Interpreters/ExternalLoader.h>
+#include <Common/quoteString.h>
+
 #include <memory>
 
 namespace DB
 {
-class Context;
+
 class IExternalLoaderConfigRepository;
 
 /// Manages user-defined dictionaries.
-class ExternalDictionariesLoader : public ExternalLoader
+class ExternalDictionariesLoader : public ExternalLoader, WithContext
 {
 public:
-    using DictPtr = std::shared_ptr<const IDictionaryBase>;
+    using DictPtr = std::shared_ptr<const IDictionary>;
 
     /// Dictionaries will be loaded immediately and then will be updated in separate thread, each 'reload_period' seconds.
-    ExternalDictionariesLoader(Context & context_);
+    explicit ExternalDictionariesLoader(ContextPtr global_context_);
 
-    DictPtr getDictionary(const std::string & name) const
-    {
-        return std::static_pointer_cast<const IDictionaryBase>(load(name));
-    }
+    DictPtr getDictionary(const std::string & dictionary_name, ContextPtr context) const;
 
-    DictPtr tryGetDictionary(const std::string & name) const
-    {
-        return std::static_pointer_cast<const IDictionaryBase>(tryLoad(name));
-    }
+    DictPtr tryGetDictionary(const std::string & dictionary_name, ContextPtr context) const;
+
+    void reloadDictionary(const std::string & dictionary_name, ContextPtr context) const;
+
+    DictionaryStructure getDictionaryStructure(const std::string & dictionary_name, ContextPtr context) const;
 
     static DictionaryStructure getDictionaryStructure(const Poco::Util::AbstractConfiguration & config, const std::string & key_in_config = "dictionary");
+
     static DictionaryStructure getDictionaryStructure(const ObjectConfig & config);
 
     static void resetAll();
@@ -37,11 +39,13 @@ protected:
     LoadablePtr create(const std::string & name, const Poco::Util::AbstractConfiguration & config,
             const std::string & key_in_config, const std::string & repository_name) const override;
 
+    std::string resolveDictionaryName(const std::string & dictionary_name, const std::string & current_database_name) const;
+
+    /// Try convert qualified dictionary name to persistent UUID
+    std::string resolveDictionaryNameFromDatabaseCatalog(const std::string & name) const;
+
     friend class StorageSystemDictionaries;
     friend class DatabaseDictionary;
-
-private:
-    Context & context;
 };
 
 }
diff --git a/src/Interpreters/ExternalLoader.cpp b/src/Interpreters/ExternalLoader.cpp
index e1713c7cbbb..853fe296d1c 100644
--- a/src/Interpreters/ExternalLoader.cpp
+++ b/src/Interpreters/ExternalLoader.cpp
@@ -625,6 +625,12 @@ public:
         return collectLoadResults<ReturnType>(filter);
     }
 
+    bool has(const String & name) const
+    {
+        std::lock_guard lock{mutex};
+        return infos.contains(name);
+    }
+
     /// Starts reloading all the object which update time is earlier than now.
     /// The function doesn't touch the objects which were never tried to load.
     void reloadOutdated()
@@ -812,12 +818,11 @@ private:
             if (!min_id)
                 min_id = getMinIDToFinishLoading(forced_to_reload);
 
-            if (info->state_id >= min_id)
-                return true; /// stop
-
             if (info->loading_id < min_id)
                 startLoading(*info, forced_to_reload, *min_id);
-            return false; /// wait for the next event
+
+            /// Wait for the next event if loading wasn't completed, or stop otherwise.
+            return (info->state_id >= min_id);
         };
 
         if (timeout == WAIT)
@@ -842,12 +847,10 @@ private:
                 if (filter && !filter(name))
                     continue;
 
-                if (info.state_id >= min_id)
-                    continue;
-
-                all_ready = false;
                 if (info.loading_id < min_id)
                     startLoading(info, forced_to_reload, *min_id);
+
+                all_ready &= (info.state_id >= min_id);
             }
             return all_ready;
         };
@@ -1391,6 +1394,11 @@ ReturnType ExternalLoader::reloadAllTriedToLoad() const
     return loadOrReload<ReturnType>([&names](const String & name) { return names.count(name); });
 }
 
+bool ExternalLoader::has(const String & name) const
+{
+    return loading_dispatcher->has(name);
+}
+
 Strings ExternalLoader::getAllTriedToLoadNames() const
 {
     return loading_dispatcher->getAllTriedToLoadNames();
diff --git a/src/Interpreters/ExternalLoader.h b/src/Interpreters/ExternalLoader.h
index 09915af2470..d1a39af962f 100644
--- a/src/Interpreters/ExternalLoader.h
+++ b/src/Interpreters/ExternalLoader.h
@@ -196,6 +196,9 @@ public:
     template <typename ReturnType = Loadables, typename = std::enable_if_t<is_vector_load_result_type<ReturnType>, void>>
     ReturnType reloadAllTriedToLoad() const;
 
+    /// Check if object with name exists in configuration
+    bool has(const String & name) const;
+
     /// Reloads all config repositories.
     void reloadConfig() const;
 
diff --git a/src/Interpreters/ExternalLoaderDatabaseConfigRepository.cpp b/src/Interpreters/ExternalLoaderDatabaseConfigRepository.cpp
index 41269b91b5f..a8b65a18983 100644
--- a/src/Interpreters/ExternalLoaderDatabaseConfigRepository.cpp
+++ b/src/Interpreters/ExternalLoaderDatabaseConfigRepository.cpp
@@ -17,7 +17,7 @@ namespace ErrorCodes
 namespace
 {
     String trimDatabaseName(const std::string & loadable_definition_name, const String & database_name,
-                            const IDatabase & database, const Context & global_context)
+                            const IDatabase & database, ContextPtr global_context)
     {
         bool is_atomic_database = database.getUUID() != UUIDHelpers::Nil;
         if (is_atomic_database)
@@ -42,8 +42,8 @@ namespace
 }
 
 
-ExternalLoaderDatabaseConfigRepository::ExternalLoaderDatabaseConfigRepository(IDatabase & database_, const Context & context_)
-    : global_context(context_.getGlobalContext())
+ExternalLoaderDatabaseConfigRepository::ExternalLoaderDatabaseConfigRepository(IDatabase & database_, ContextPtr context_)
+    : WithContext(context_->getGlobalContext())
     , database_name(database_.getDatabaseName())
     , database(database_)
 {
@@ -51,19 +51,19 @@ ExternalLoaderDatabaseConfigRepository::ExternalLoaderDatabaseConfigRepository(I
 
 LoadablesConfigurationPtr ExternalLoaderDatabaseConfigRepository::load(const std::string & loadable_definition_name)
 {
-    auto dict_name = trimDatabaseName(loadable_definition_name, database_name, database, global_context);
+    auto dict_name = trimDatabaseName(loadable_definition_name, database_name, database, getContext());
     return database.getDictionaryConfiguration(dict_name);
 }
 
 bool ExternalLoaderDatabaseConfigRepository::exists(const std::string & loadable_definition_name)
 {
-    auto dict_name = trimDatabaseName(loadable_definition_name, database_name, database, global_context);
+    auto dict_name = trimDatabaseName(loadable_definition_name, database_name, database, getContext());
     return database.isDictionaryExist(dict_name);
 }
 
 Poco::Timestamp ExternalLoaderDatabaseConfigRepository::getUpdateTime(const std::string & loadable_definition_name)
 {
-    auto dict_name = trimDatabaseName(loadable_definition_name, database_name, database, global_context);
+    auto dict_name = trimDatabaseName(loadable_definition_name, database_name, database, getContext());
     return database.getObjectMetadataModificationTime(dict_name);
 }
 
diff --git a/src/Interpreters/ExternalLoaderDatabaseConfigRepository.h b/src/Interpreters/ExternalLoaderDatabaseConfigRepository.h
index 59dad1274e0..baa99bc5610 100644
--- a/src/Interpreters/ExternalLoaderDatabaseConfigRepository.h
+++ b/src/Interpreters/ExternalLoaderDatabaseConfigRepository.h
@@ -9,10 +9,10 @@ namespace DB
 
 /// Repository from database, which stores dictionary definitions on disk.
 /// Tracks update time and existence of .sql files through IDatabase.
-class ExternalLoaderDatabaseConfigRepository : public IExternalLoaderConfigRepository
+class ExternalLoaderDatabaseConfigRepository : public IExternalLoaderConfigRepository, WithContext
 {
 public:
-    ExternalLoaderDatabaseConfigRepository(IDatabase & database_, const Context & global_context_);
+    ExternalLoaderDatabaseConfigRepository(IDatabase & database_, ContextPtr global_context_);
 
     const std::string & getName() const override { return database_name; }
 
@@ -25,7 +25,6 @@ public:
     LoadablesConfigurationPtr load(const std::string & loadable_definition_name) override;
 
 private:
-    const Context & global_context;
     const String database_name;
     IDatabase & database;
 };
diff --git a/src/Interpreters/ExternalModelsLoader.cpp b/src/Interpreters/ExternalModelsLoader.cpp
index 4e9ddb78241..317cf0bf1c9 100644
--- a/src/Interpreters/ExternalModelsLoader.cpp
+++ b/src/Interpreters/ExternalModelsLoader.cpp
@@ -10,9 +10,8 @@ namespace ErrorCodes
 }
 
 
-ExternalModelsLoader::ExternalModelsLoader(Context & context_)
-    : ExternalLoader("external model", &Poco::Logger::get("ExternalModelsLoader"))
-    , context(context_)
+ExternalModelsLoader::ExternalModelsLoader(ContextPtr context_)
+    : ExternalLoader("external model", &Poco::Logger::get("ExternalModelsLoader")), WithContext(context_)
 {
     setConfigSettings({"model", "name", {}, {}});
     enablePeriodicUpdates(true);
@@ -30,7 +29,7 @@ std::shared_ptr<const IExternalLoadable> ExternalModelsLoader::create(
     {
         return std::make_unique<CatBoostModel>(
                 name, config.getString(config_prefix + ".path"),
-                context.getConfigRef().getString("catboost_dynamic_library_path"),
+                getContext()->getConfigRef().getString("catboost_dynamic_library_path"),
                 lifetime
         );
     }
diff --git a/src/Interpreters/ExternalModelsLoader.h b/src/Interpreters/ExternalModelsLoader.h
index 3f09512338d..f0a7592f4d3 100644
--- a/src/Interpreters/ExternalModelsLoader.h
+++ b/src/Interpreters/ExternalModelsLoader.h
@@ -1,28 +1,33 @@
 #pragma once
 
 #include <Interpreters/CatBoostModel.h>
+#include <Interpreters/Context_fwd.h>
 #include <Interpreters/ExternalLoader.h>
 #include <common/logger_useful.h>
+
 #include <memory>
 
 
 namespace DB
 {
 
-class Context;
-
 /// Manages user-defined models.
-class ExternalModelsLoader : public ExternalLoader
+class ExternalModelsLoader : public ExternalLoader, WithContext
 {
 public:
     using ModelPtr = std::shared_ptr<const IModel>;
 
     /// Models will be loaded immediately and then will be updated in separate thread, each 'reload_period' seconds.
-    ExternalModelsLoader(Context & context_);
+    explicit ExternalModelsLoader(ContextPtr context_);
 
-    ModelPtr getModel(const std::string & name) const
+    ModelPtr getModel(const std::string & model_name) const
     {
-        return std::static_pointer_cast<const IModel>(load(name));
+        return std::static_pointer_cast<const IModel>(load(model_name));
+    }
+
+    void reloadModel(const std::string & model_name) const
+    {
+        loadOrReload(model_name);
     }
 
 protected:
@@ -30,9 +35,6 @@ protected:
             const std::string & config_prefix, const std::string & repository_name) const override;
 
     friend class StorageSystemModels;
-private:
-
-    Context & context;
 };
 
 }
diff --git a/src/Interpreters/ExtractExpressionInfoVisitor.cpp b/src/Interpreters/ExtractExpressionInfoVisitor.cpp
index 64c23cd4fd1..2d46fe08e95 100644
--- a/src/Interpreters/ExtractExpressionInfoVisitor.cpp
+++ b/src/Interpreters/ExtractExpressionInfoVisitor.cpp
@@ -40,7 +40,7 @@ void ExpressionInfoMatcher::visit(const ASTFunction & ast_function, const ASTPtr
     }
     else
     {
-        const auto & function = FunctionFactory::instance().tryGet(ast_function.name, data.context);
+        const auto & function = FunctionFactory::instance().tryGet(ast_function.name, data.getContext());
 
         /// Skip lambda, tuple and other special functions
         if (function)
@@ -82,11 +82,12 @@ bool ExpressionInfoMatcher::needChildVisit(const ASTPtr & node, const ASTPtr &)
     return !node->as<ASTSubquery>();
 }
 
-bool hasNonRewritableFunction(const ASTPtr & node, const Context & context)
+bool hasNonRewritableFunction(const ASTPtr & node, ContextPtr context)
 {
     for (const auto & select_expression : node->children)
     {
-        ExpressionInfoVisitor::Data expression_info{.context = context, .tables = {}};
+        TablesWithColumns tables;
+        ExpressionInfoVisitor::Data expression_info{WithContext{context}, tables};
         ExpressionInfoVisitor(expression_info).visit(select_expression);
 
         if (expression_info.is_stateful_function
diff --git a/src/Interpreters/ExtractExpressionInfoVisitor.h b/src/Interpreters/ExtractExpressionInfoVisitor.h
index d05415490e6..c84e243ce2e 100644
--- a/src/Interpreters/ExtractExpressionInfoVisitor.h
+++ b/src/Interpreters/ExtractExpressionInfoVisitor.h
@@ -1,21 +1,20 @@
 #pragma once
 
-#include <Parsers/IAST_fwd.h>
+#include <Interpreters/Context_fwd.h>
+#include <Interpreters/DatabaseAndTableWithAlias.h>
+#include <Interpreters/InDepthNodeVisitor.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTIdentifier.h>
-#include <Interpreters/InDepthNodeVisitor.h>
-#include <Interpreters/DatabaseAndTableWithAlias.h>
+#include <Parsers/IAST_fwd.h>
 
 namespace DB
 {
 
-class Context;
 
 struct ExpressionInfoMatcher
 {
-    struct Data
+    struct Data : public WithContext
     {
-        const Context & context;
         const TablesWithColumns & tables;
 
         bool is_array_join = false;
@@ -37,6 +36,6 @@ struct ExpressionInfoMatcher
 
 using ExpressionInfoVisitor = ConstInDepthNodeVisitor<ExpressionInfoMatcher, true>;
 
-bool hasNonRewritableFunction(const ASTPtr & node, const Context & context);
+bool hasNonRewritableFunction(const ASTPtr & node, ContextPtr context);
 
 }
diff --git a/src/Interpreters/GlobalSubqueriesVisitor.h b/src/Interpreters/GlobalSubqueriesVisitor.h
index 80d133ebea6..1aac27396ed 100644
--- a/src/Interpreters/GlobalSubqueriesVisitor.h
+++ b/src/Interpreters/GlobalSubqueriesVisitor.h
@@ -1,37 +1,36 @@
 #pragma once
 
-#include <Parsers/IAST.h>
-#include <Parsers/ASTSubquery.h>
-#include <Parsers/ASTLiteral.h>
-#include <Parsers/ASTFunction.h>
-#include <Parsers/ASTTablesInSelectQuery.h>
-#include <Parsers/ASTSelectQuery.h>
-#include <Parsers/ASTIdentifier.h>
-#include <Interpreters/interpretSubquery.h>
-#include <Common/typeid_cast.h>
 #include <Core/Block.h>
 #include <Core/NamesAndTypes.h>
 #include <Databases/IDatabase.h>
 #include <IO/WriteHelpers.h>
-#include <Interpreters/InDepthNodeVisitor.h>
-#include <Interpreters/IdentifierSemantic.h>
 #include <Interpreters/Context.h>
+#include <Interpreters/IdentifierSemantic.h>
+#include <Interpreters/InDepthNodeVisitor.h>
+#include <Interpreters/interpretSubquery.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTSelectQuery.h>
+#include <Parsers/ASTSubquery.h>
+#include <Parsers/ASTTablesInSelectQuery.h>
+#include <Parsers/IAST.h>
 #include <Processors/Executors/PullingPipelineExecutor.h>
+#include <Common/typeid_cast.h>
 
 namespace DB
 {
+
 namespace ErrorCodes
 {
     extern const int WRONG_GLOBAL_SUBQUERY;
 }
 
-
 class GlobalSubqueriesMatcher
 {
 public:
-    struct Data
+    struct Data : WithContext
     {
-        const Context & context;
         size_t subquery_depth;
         bool is_remote;
         size_t external_table_id;
@@ -39,16 +38,22 @@ public:
         SubqueriesForSets & subqueries_for_sets;
         bool & has_global_subqueries;
 
-        Data(const Context & context_, size_t subquery_depth_, bool is_remote_,
-             TemporaryTablesMapping & tables, SubqueriesForSets & subqueries_for_sets_, bool & has_global_subqueries_)
-        :   context(context_),
-            subquery_depth(subquery_depth_),
-            is_remote(is_remote_),
-            external_table_id(1),
-            external_tables(tables),
-            subqueries_for_sets(subqueries_for_sets_),
-            has_global_subqueries(has_global_subqueries_)
-        {}
+        Data(
+            ContextPtr context_,
+            size_t subquery_depth_,
+            bool is_remote_,
+            TemporaryTablesMapping & tables,
+            SubqueriesForSets & subqueries_for_sets_,
+            bool & has_global_subqueries_)
+            : WithContext(context_)
+            , subquery_depth(subquery_depth_)
+            , is_remote(is_remote_)
+            , external_table_id(1)
+            , external_tables(tables)
+            , subqueries_for_sets(subqueries_for_sets_)
+            , has_global_subqueries(has_global_subqueries_)
+        {
+        }
 
         void addExternalStorage(ASTPtr & ast, bool set_alias = false)
         {
@@ -80,7 +85,7 @@ public:
                 /// If this is already an external table, you do not need to add anything. Just remember its presence.
                 auto temporary_table_name = getIdentifierName(subquery_or_table_name);
                 bool exists_in_local_map = external_tables.end() != external_tables.find(temporary_table_name);
-                bool exists_in_context = context.tryResolveStorageID(StorageID("", temporary_table_name), Context::ResolveExternal);
+                bool exists_in_context = getContext()->tryResolveStorageID(StorageID("", temporary_table_name), Context::ResolveExternal);
                 if (exists_in_local_map || exists_in_context)
                     return;
             }
@@ -97,14 +102,17 @@ public:
                 }
             }
 
-            auto interpreter = interpretSubquery(subquery_or_table_name, context, subquery_depth, {});
+            auto interpreter = interpretSubquery(subquery_or_table_name, getContext(), subquery_depth, {});
 
             Block sample = interpreter->getSampleBlock();
             NamesAndTypesList columns = sample.getNamesAndTypesList();
 
             auto external_storage_holder = std::make_shared<TemporaryTableHolder>(
-                    context, ColumnsDescription{columns}, ConstraintsDescription{}, nullptr,
-                    /*create_for_global_subquery*/ true);
+                getContext(),
+                ColumnsDescription{columns},
+                ConstraintsDescription{},
+                nullptr,
+                /*create_for_global_subquery*/ true);
             StoragePtr external_storage = external_storage_holder->getTable();
 
             /** We replace the subquery with the name of the temporary table.
@@ -136,10 +144,10 @@ public:
 
             external_tables[external_table_name] = external_storage_holder;
 
-            if (context.getSettingsRef().use_index_for_in_with_subqueries)
+            if (getContext()->getSettingsRef().use_index_for_in_with_subqueries)
             {
                 auto external_table = external_storage_holder->getTable();
-                auto table_out = external_table->write({}, external_table->getInMemoryMetadataPtr(), context);
+                auto table_out = external_table->write({}, external_table->getInMemoryMetadataPtr(), getContext());
                 auto io = interpreter->execute();
                 PullingPipelineExecutor executor(io.pipeline);
 
@@ -176,9 +184,7 @@ public:
     static bool needChildVisit(ASTPtr &, const ASTPtr & child)
     {
         /// We do not go into subqueries.
-        if (child->as<ASTSelectQuery>())
-            return false;
-        return true;
+        return !child->as<ASTSelectQuery>();
     }
 
 private:
diff --git a/src/Interpreters/HashJoin.cpp b/src/Interpreters/HashJoin.cpp
index 5c50b53e2ca..fcd89aed84d 100644
--- a/src/Interpreters/HashJoin.cpp
+++ b/src/Interpreters/HashJoin.cpp
@@ -421,25 +421,12 @@ bool HashJoin::empty() const
     return data->type == Type::EMPTY;
 }
 
-size_t HashJoin::getTotalByteCount() const
-{
-    std::shared_lock lock(data->rwlock);
-    return getTotalByteCountLocked();
-}
-
-size_t HashJoin::getTotalRowCount() const
-{
-    std::shared_lock lock(data->rwlock);
-    return getTotalRowCountLocked();
-}
-
 bool HashJoin::alwaysReturnsEmptySet() const
 {
-    std::shared_lock lock(data->rwlock);
     return isInnerOrRight(getKind()) && data->empty && !overDictionary();
 }
 
-size_t HashJoin::getTotalRowCountLocked() const
+size_t HashJoin::getTotalRowCount() const
 {
     size_t res = 0;
 
@@ -456,7 +443,7 @@ size_t HashJoin::getTotalRowCountLocked() const
     return res;
 }
 
-size_t HashJoin::getTotalByteCountLocked() const
+size_t HashJoin::getTotalByteCount() const
 {
     size_t res = 0;
 
@@ -652,7 +639,9 @@ bool HashJoin::addJoinedBlock(const Block & source_block, bool check_limits)
     size_t total_bytes = 0;
 
     {
-        std::unique_lock lock(data->rwlock);
+        if (storage_join_lock.mutex())
+            throw DB::Exception("addJoinedBlock called when HashJoin locked to prevent updates",
+                                ErrorCodes::LOGICAL_ERROR);
 
         data->blocks.emplace_back(std::move(structured_block));
         Block * stored_block = &data->blocks.back();
@@ -677,8 +666,8 @@ bool HashJoin::addJoinedBlock(const Block & source_block, bool check_limits)
             return true;
 
         /// TODO: Do not calculate them every time
-        total_rows = getTotalRowCountLocked();
-        total_bytes = getTotalByteCountLocked();
+        total_rows = getTotalRowCount();
+        total_bytes = getTotalByteCount();
     }
 
     return table_join->sizeLimits().check(total_rows, total_bytes, "JOIN", ErrorCodes::SET_SIZE_LIMIT_EXCEEDED);
@@ -1216,11 +1205,8 @@ void HashJoin::joinBlockImplCross(Block & block, ExtraBlockPtr & not_processed)
     block = block.cloneWithColumns(std::move(dst_columns));
 }
 
-
 DataTypePtr HashJoin::joinGetCheckAndGetReturnType(const DataTypes & data_types, const String & column_name, bool or_null) const
 {
-    std::shared_lock lock(data->rwlock);
-
     size_t num_keys = data_types.size();
     if (right_table_keys.columns() != num_keys)
         throw Exception(
@@ -1232,8 +1218,8 @@ DataTypePtr HashJoin::joinGetCheckAndGetReturnType(const DataTypes & data_types,
     {
         const auto & left_type_origin = data_types[i];
         const auto & [c2, right_type_origin, right_name] = right_table_keys.safeGetByPosition(i);
-        auto left_type = removeNullable(left_type_origin);
-        auto right_type = removeNullable(right_type_origin);
+        auto left_type = removeNullable(recursiveRemoveLowCardinality(left_type_origin));
+        auto right_type = removeNullable(recursiveRemoveLowCardinality(right_type_origin));
         if (!left_type->equals(*right_type))
             throw Exception(
                 "Type mismatch in joinGet key " + toString(i) + ": found type " + left_type->getName() + ", while the needed type is "
@@ -1250,11 +1236,16 @@ DataTypePtr HashJoin::joinGetCheckAndGetReturnType(const DataTypes & data_types,
     return elem.type;
 }
 
-
-template <typename Maps>
-ColumnWithTypeAndName HashJoin::joinGetImpl(const Block & block, const Block & block_with_columns_to_add, const Maps & maps_) const
+/// TODO: return multiple columns as named tuple
+/// TODO: return array of values when strictness == ASTTableJoin::Strictness::All
+ColumnWithTypeAndName HashJoin::joinGet(const Block & block, const Block & block_with_columns_to_add) const
 {
-    // Assemble the key block with correct names.
+    bool is_valid = (strictness == ASTTableJoin::Strictness::Any || strictness == ASTTableJoin::Strictness::RightAny)
+        && kind == ASTTableJoin::Kind::Left;
+    if (!is_valid)
+        throw Exception("joinGet only supports StorageJoin of type Left Any", ErrorCodes::INCOMPATIBLE_TYPE_OF_JOIN);
+
+    /// Assemble the key block with correct names.
     Block keys;
     for (size_t i = 0; i < block.columns(); ++i)
     {
@@ -1263,32 +1254,15 @@ ColumnWithTypeAndName HashJoin::joinGetImpl(const Block & block, const Block & b
         keys.insert(std::move(key));
     }
 
+    static_assert(!MapGetter<ASTTableJoin::Kind::Left, ASTTableJoin::Strictness::Any>::flagged,
+                  "joinGet are not protected from hash table changes between block processing");
     joinBlockImpl<ASTTableJoin::Kind::Left, ASTTableJoin::Strictness::Any>(
-        keys, key_names_right, block_with_columns_to_add, maps_);
+        keys, key_names_right, block_with_columns_to_add, std::get<MapsOne>(data->maps));
     return keys.getByPosition(keys.columns() - 1);
 }
 
-
-// TODO: return multiple columns as named tuple
-// TODO: return array of values when strictness == ASTTableJoin::Strictness::All
-ColumnWithTypeAndName HashJoin::joinGet(const Block & block, const Block & block_with_columns_to_add) const
-{
-    std::shared_lock lock(data->rwlock);
-
-    if ((strictness == ASTTableJoin::Strictness::Any || strictness == ASTTableJoin::Strictness::RightAny) &&
-        kind == ASTTableJoin::Kind::Left)
-    {
-        return joinGetImpl(block, block_with_columns_to_add, std::get<MapsOne>(data->maps));
-    }
-    else
-        throw Exception("joinGet only supports StorageJoin of type Left Any", ErrorCodes::INCOMPATIBLE_TYPE_OF_JOIN);
-}
-
-
 void HashJoin::joinBlock(Block & block, ExtraBlockPtr & not_processed)
 {
-    std::shared_lock lock(data->rwlock);
-
     const Names & key_names_left = table_join->keyNamesLeft();
     JoinCommon::checkTypesOfKeys(block, key_names_left, right_table_keys, key_names_right);
 
@@ -1337,7 +1311,7 @@ void HashJoin::joinBlock(Block & block, ExtraBlockPtr & not_processed)
 
 void HashJoin::joinTotals(Block & block) const
 {
-    JoinCommon::joinTotals(totals, sample_block_with_columns_to_add, key_names_right, block);
+    JoinCommon::joinTotals(totals, sample_block_with_columns_to_add, *table_join, block);
 }
 
 
diff --git a/src/Interpreters/HashJoin.h b/src/Interpreters/HashJoin.h
index 06ce7559f31..7f70c397db9 100644
--- a/src/Interpreters/HashJoin.h
+++ b/src/Interpreters/HashJoin.h
@@ -134,6 +134,8 @@ class HashJoin : public IJoin
 public:
     HashJoin(std::shared_ptr<TableJoin> table_join_, const Block & right_sample_block, bool any_take_last_row_ = false);
 
+    const TableJoin & getTableJoin() const override { return *table_join; }
+
     /** Add block of data from right hand of JOIN to the map.
       * Returns false, if some limit was exceeded and you should not insert more data.
       */
@@ -306,10 +308,6 @@ public:
 
     struct RightTableData
     {
-        /// Protect state for concurrent use in insertFromBlock and joinBlock.
-        /// @note that these methods could be called simultaneously only while use of StorageJoin.
-        mutable std::shared_mutex rwlock;
-
         Type type = Type::EMPTY;
         bool empty = true;
 
@@ -322,6 +320,13 @@ public:
         Arena pool;
     };
 
+    /// We keep correspondence between used_flags and hash table internal buffer.
+    /// Hash table cannot be modified during HashJoin lifetime and must be protected with lock.
+    void setLock(std::shared_mutex & rwlock)
+    {
+        storage_join_lock = std::shared_lock<std::shared_mutex>(rwlock);
+    }
+
     void reuseJoinedData(const HashJoin & join);
 
     std::shared_ptr<RightTableData> getJoinedData() const
@@ -353,6 +358,8 @@ private:
     /// Flags that indicate that particular row already used in join.
     /// Flag is stored for every record in hash map.
     /// Number of this flags equals to hashtable buffer size (plus one for zero value).
+    /// Changes in hash table broke correspondence,
+    /// so we must guarantee constantness of hash table during HashJoin lifetime (using method setLock)
     mutable JoinStuff::JoinUsedFlags used_flags;
     Sizes key_sizes;
 
@@ -371,6 +378,10 @@ private:
 
     Block totals;
 
+    /// Should be set via setLock to protect hash table from modification from StorageJoin
+    /// If set HashJoin instance is not available for modification (addJoinedBlock)
+    std::shared_lock<std::shared_mutex> storage_join_lock;
+
     void init(Type type_);
 
     const Block & savedBlockSample() const { return data->sample_block; }
@@ -388,15 +399,8 @@ private:
 
     void joinBlockImplCross(Block & block, ExtraBlockPtr & not_processed) const;
 
-    template <typename Maps>
-    ColumnWithTypeAndName joinGetImpl(const Block & block, const Block & block_with_columns_to_add, const Maps & maps_) const;
-
     static Type chooseMethod(const ColumnRawPtrs & key_columns, Sizes & key_sizes);
 
-    /// Call with already locked rwlock.
-    size_t getTotalRowCountLocked() const;
-    size_t getTotalByteCountLocked() const;
-
     bool empty() const;
     bool overDictionary() const;
 };
diff --git a/src/Interpreters/IInterpreter.cpp b/src/Interpreters/IInterpreter.cpp
index b219a9cd923..1b0e9738429 100644
--- a/src/Interpreters/IInterpreter.cpp
+++ b/src/Interpreters/IInterpreter.cpp
@@ -4,7 +4,7 @@
 namespace DB
 {
 void IInterpreter::extendQueryLogElem(
-    QueryLogElement & elem, const ASTPtr & ast, const Context & context, const String & query_database, const String & query_table) const
+    QueryLogElement & elem, const ASTPtr & ast, ContextPtr context, const String & query_database, const String & query_table) const
 {
     if (!query_database.empty() && query_table.empty())
     {
@@ -12,7 +12,8 @@ void IInterpreter::extendQueryLogElem(
     }
     else if (!query_table.empty())
     {
-        auto quoted_database = query_database.empty() ? backQuoteIfNeed(context.getCurrentDatabase()) : backQuoteIfNeed(query_database);
+        auto quoted_database = query_database.empty() ? backQuoteIfNeed(context->getCurrentDatabase())
+                                                      : backQuoteIfNeed(query_database);
         elem.query_databases.insert(quoted_database);
         elem.query_tables.insert(quoted_database + "." + backQuoteIfNeed(query_table));
     }
diff --git a/src/Interpreters/IInterpreter.h b/src/Interpreters/IInterpreter.h
index aaecf735e60..1b4eada3c9f 100644
--- a/src/Interpreters/IInterpreter.h
+++ b/src/Interpreters/IInterpreter.h
@@ -1,13 +1,13 @@
 #pragma once
 
 #include <DataStreams/BlockIO.h>
+#include <Interpreters/Context_fwd.h>
 #include <Parsers/IAST_fwd.h>
 
 namespace DB
 {
 
 struct QueryLogElement;
-class Context;
 
 /** Interpreters interface for different queries.
   */
@@ -27,11 +27,11 @@ public:
     void extendQueryLogElem(
         QueryLogElement & elem,
         const ASTPtr & ast,
-        const Context & context,
+        ContextPtr context,
         const String & query_database,
         const String & query_table) const;
 
-    virtual void extendQueryLogElemImpl(QueryLogElement &, const ASTPtr &, const Context &) const {}
+    virtual void extendQueryLogElemImpl(QueryLogElement &, const ASTPtr &, ContextPtr) const {}
 
     virtual ~IInterpreter() = default;
 };
diff --git a/src/Interpreters/IInterpreterUnionOrSelectQuery.cpp b/src/Interpreters/IInterpreterUnionOrSelectQuery.cpp
index 833625a6f3e..7233ab332dd 100644
--- a/src/Interpreters/IInterpreterUnionOrSelectQuery.cpp
+++ b/src/Interpreters/IInterpreterUnionOrSelectQuery.cpp
@@ -4,7 +4,7 @@
 namespace DB
 {
 
-void IInterpreterUnionOrSelectQuery::extendQueryLogElemImpl(QueryLogElement & elem, const ASTPtr &, const Context &) const
+void IInterpreterUnionOrSelectQuery::extendQueryLogElemImpl(QueryLogElement & elem, const ASTPtr &, ContextPtr) const
 {
     elem.query_kind = "Select";
 }
diff --git a/src/Interpreters/IInterpreterUnionOrSelectQuery.h b/src/Interpreters/IInterpreterUnionOrSelectQuery.h
index 128072fb103..72723d68161 100644
--- a/src/Interpreters/IInterpreterUnionOrSelectQuery.h
+++ b/src/Interpreters/IInterpreterUnionOrSelectQuery.h
@@ -10,9 +10,9 @@ namespace DB
 class IInterpreterUnionOrSelectQuery : public IInterpreter
 {
 public:
-    IInterpreterUnionOrSelectQuery(const ASTPtr & query_ptr_, const Context & context_, const SelectQueryOptions & options_)
+    IInterpreterUnionOrSelectQuery(const ASTPtr & query_ptr_, ContextPtr context_, const SelectQueryOptions & options_)
         : query_ptr(query_ptr_)
-        , context(std::make_shared<Context>(context_))
+        , context(Context::createCopy(context_))
         , options(options_)
         , max_streams(context->getSettingsRef().max_threads)
     {
@@ -28,11 +28,11 @@ public:
 
     size_t getMaxStreams() const { return max_streams; }
 
-    void extendQueryLogElemImpl(QueryLogElement & elem, const ASTPtr &, const Context &) const override;
+    void extendQueryLogElemImpl(QueryLogElement & elem, const ASTPtr &, ContextPtr) const override;
 
 protected:
     ASTPtr query_ptr;
-    std::shared_ptr<Context> context;
+    ContextPtr context;
     Block result_header;
     SelectQueryOptions options;
     size_t max_streams = 1;
diff --git a/src/Interpreters/IJoin.h b/src/Interpreters/IJoin.h
index 3d313adcb6c..b326f06fa7e 100644
--- a/src/Interpreters/IJoin.h
+++ b/src/Interpreters/IJoin.h
@@ -14,11 +14,15 @@ class Block;
 struct ExtraBlock;
 using ExtraBlockPtr = std::shared_ptr<ExtraBlock>;
 
+class TableJoin;
+
 class IJoin
 {
 public:
     virtual ~IJoin() = default;
 
+    virtual const TableJoin & getTableJoin() const = 0;
+
     /// Add block of data from right hand of JOIN.
     /// @returns false, if some limit was exceeded and you should not insert more data.
     virtual bool addJoinedBlock(const Block & block, bool check_limits = true) = 0;
@@ -28,7 +32,9 @@ public:
     virtual void joinBlock(Block & block, std::shared_ptr<ExtraBlock> & not_processed) = 0;
 
     virtual bool hasTotals() const = 0;
+    /// Set totals for right table
     virtual void setTotals(const Block & block) = 0;
+    /// Add totals to block from left table
     virtual void joinTotals(Block & block) const = 0;
 
     virtual size_t getTotalRowCount() const = 0;
diff --git a/src/Interpreters/IdentifierSemantic.cpp b/src/Interpreters/IdentifierSemantic.cpp
index a1fc533eb7f..8b8eab219ba 100644
--- a/src/Interpreters/IdentifierSemantic.cpp
+++ b/src/Interpreters/IdentifierSemantic.cpp
@@ -3,6 +3,8 @@
 #include <Interpreters/IdentifierSemantic.h>
 #include <Interpreters/StorageID.h>
 
+#include <Parsers/ASTFunction.h>
+
 namespace DB
 {
 
@@ -209,7 +211,7 @@ IdentifierSemantic::ColumnMatch IdentifierSemantic::canReferColumnToTable(const
     return canReferColumnToTable(identifier, table_with_columns.table);
 }
 
-/// Strip qualificators from left side of column name.
+/// Strip qualifications from left side of column name.
 /// Example: 'database.table.name' -> 'name'.
 void IdentifierSemantic::setColumnShortName(ASTIdentifier & identifier, const DatabaseAndTableWithAlias & db_and_table)
 {
@@ -249,4 +251,86 @@ void IdentifierSemantic::setColumnLongName(ASTIdentifier & identifier, const Dat
     }
 }
 
+std::optional<size_t> IdentifierSemantic::getIdentMembership(const ASTIdentifier & ident, const std::vector<TableWithColumnNamesAndTypes> & tables)
+{
+    std::optional<size_t> table_pos = IdentifierSemantic::getMembership(ident);
+    if (table_pos)
+        return table_pos;
+    return IdentifierSemantic::chooseTableColumnMatch(ident, tables, true);
+}
+
+std::optional<size_t>
+IdentifierSemantic::getIdentsMembership(ASTPtr ast, const std::vector<TableWithColumnNamesAndTypes> & tables, const Aliases & aliases)
+{
+    auto idents = IdentifiersCollector::collect(ast);
+
+    std::optional<size_t> result;
+    for (const auto * ident : idents)
+    {
+        /// short name clashes with alias, ambiguous
+        if (ident->isShort() && aliases.count(ident->shortName()))
+            return {};
+        const auto pos = getIdentMembership(*ident, tables);
+        if (!pos)
+            return {};
+        /// identifiers from different tables
+        if (result && *pos != *result)
+            return {};
+        result = pos;
+    }
+    return result;
+}
+
+IdentifiersCollector::ASTIdentifiers IdentifiersCollector::collect(const ASTPtr & node)
+{
+    IdentifiersCollector::Data ident_data;
+    ConstInDepthNodeVisitor<IdentifiersCollector, true> ident_visitor(ident_data);
+    ident_visitor.visit(node);
+    return ident_data.idents;
+}
+
+bool IdentifiersCollector::needChildVisit(const ASTPtr &, const ASTPtr &)
+{
+    return true;
+}
+
+void IdentifiersCollector::visit(const ASTPtr & node, IdentifiersCollector::Data & data)
+{
+    if (const auto * ident = node->as<ASTIdentifier>())
+        data.idents.push_back(ident);
+}
+
+
+IdentifierMembershipCollector::IdentifierMembershipCollector(const ASTSelectQuery & select, ContextPtr context)
+{
+    if (ASTPtr with = select.with())
+        QueryAliasesNoSubqueriesVisitor(aliases).visit(with);
+    QueryAliasesNoSubqueriesVisitor(aliases).visit(select.select());
+
+    tables = getDatabaseAndTablesWithColumns(getTableExpressions(select), context);
+}
+
+std::optional<size_t> IdentifierMembershipCollector::getIdentsMembership(ASTPtr ast) const
+{
+    return IdentifierSemantic::getIdentsMembership(ast, tables, aliases);
+}
+
+static void collectConjunctions(const ASTPtr & node, std::vector<ASTPtr> & members)
+{
+    if (const auto * func = node->as<ASTFunction>(); func && func->name == "and")
+    {
+        for (const auto & child : func->arguments->children)
+            collectConjunctions(child, members);
+        return;
+    }
+    members.push_back(node);
+}
+
+std::vector<ASTPtr> collectConjunctions(const ASTPtr & node)
+{
+    std::vector<ASTPtr> members;
+    collectConjunctions(node, members);
+    return members;
+}
+
 }
diff --git a/src/Interpreters/IdentifierSemantic.h b/src/Interpreters/IdentifierSemantic.h
index 80b55ba0537..20ef3248f7c 100644
--- a/src/Interpreters/IdentifierSemantic.h
+++ b/src/Interpreters/IdentifierSemantic.h
@@ -2,8 +2,15 @@
 
 #include <optional>
 
-#include <Parsers/ASTIdentifier.h>
+#include <Interpreters/Aliases.h>
 #include <Interpreters/DatabaseAndTableWithAlias.h>
+#include <Interpreters/InDepthNodeVisitor.h>
+#include <Interpreters/QueryAliasesVisitor.h>
+#include <Interpreters/getHeaderForProcessingStage.h>
+#include <Interpreters/getTableExpressions.h>
+
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTSelectQuery.h>
 
 namespace DB
 {
@@ -59,9 +66,48 @@ struct IdentifierSemantic
     static std::optional<size_t> chooseTableColumnMatch(const ASTIdentifier &, const TablesWithColumns & tables,
                             bool allow_ambiguous = false);
 
+    static std::optional<size_t> getIdentMembership(const ASTIdentifier & ident, const std::vector<TableWithColumnNamesAndTypes> & tables);
+
+    /// Collect common table membership for identifiers in expression
+    /// If membership cannot be established or there are several identifies from different tables, return empty optional
+    static std::optional<size_t>
+    getIdentsMembership(ASTPtr ast, const std::vector<TableWithColumnNamesAndTypes> & tables, const Aliases & aliases);
+
 private:
     static bool doesIdentifierBelongTo(const ASTIdentifier & identifier, const String & database, const String & table);
     static bool doesIdentifierBelongTo(const ASTIdentifier & identifier, const String & table);
 };
 
+
+/// Collect all identifies from AST recursively
+class IdentifiersCollector
+{
+public:
+    using ASTIdentPtr = const ASTIdentifier *;
+    using ASTIdentifiers = std::vector<ASTIdentPtr>;
+    struct Data
+    {
+        ASTIdentifiers idents;
+    };
+
+    static void visit(const ASTPtr & node, Data & data);
+    static bool needChildVisit(const ASTPtr &, const ASTPtr &);
+    static ASTIdentifiers collect(const ASTPtr & node);
+};
+
+/// Collect identifier table membership considering aliases
+class IdentifierMembershipCollector
+{
+public:
+    IdentifierMembershipCollector(const ASTSelectQuery & select, ContextPtr context);
+    std::optional<size_t> getIdentsMembership(ASTPtr ast) const;
+
+private:
+    std::vector<TableWithColumnNamesAndTypes> tables;
+    Aliases aliases;
+};
+
+/// Split expression `expr_1 AND expr_2 AND ... AND expr_n` into vector `[expr_1, expr_2, ..., expr_n]`
+std::vector<ASTPtr> collectConjunctions(const ASTPtr & node);
+
 }
diff --git a/src/Interpreters/InJoinSubqueriesPreprocessor.cpp b/src/Interpreters/InJoinSubqueriesPreprocessor.cpp
index 2e922393131..8dc5d95bd89 100644
--- a/src/Interpreters/InJoinSubqueriesPreprocessor.cpp
+++ b/src/Interpreters/InJoinSubqueriesPreprocessor.cpp
@@ -25,9 +25,9 @@ namespace ErrorCodes
 namespace
 {
 
-StoragePtr tryGetTable(const ASTPtr & database_and_table, const Context & context)
+StoragePtr tryGetTable(const ASTPtr & database_and_table, ContextPtr context)
 {
-    auto table_id = context.tryResolveStorageID(database_and_table);
+    auto table_id = context->tryResolveStorageID(database_and_table);
     if (!table_id)
         return {};
     return DatabaseCatalog::instance().tryGetTable(table_id, context);
@@ -35,12 +35,21 @@ StoragePtr tryGetTable(const ASTPtr & database_and_table, const Context & contex
 
 using CheckShardsAndTables = InJoinSubqueriesPreprocessor::CheckShardsAndTables;
 
-struct NonGlobalTableData
+struct NonGlobalTableData : public WithContext
 {
     using TypeToVisit = ASTTableExpression;
 
+    NonGlobalTableData(
+        ContextPtr context_,
+        const CheckShardsAndTables & checker_,
+        std::vector<ASTPtr> & renamed_tables_,
+        ASTFunction * function_,
+        ASTTableJoin * table_join_)
+        : WithContext(context_), checker(checker_), renamed_tables(renamed_tables_), function(function_), table_join(table_join_)
+    {
+    }
+
     const CheckShardsAndTables & checker;
-    const Context & context;
     std::vector<ASTPtr> & renamed_tables;
     ASTFunction * function = nullptr;
     ASTTableJoin * table_join = nullptr;
@@ -55,9 +64,9 @@ struct NonGlobalTableData
 private:
     void renameIfNeeded(ASTPtr & database_and_table)
     {
-        const DistributedProductMode distributed_product_mode = context.getSettingsRef().distributed_product_mode;
+        const DistributedProductMode distributed_product_mode = getContext()->getSettingsRef().distributed_product_mode;
 
-        StoragePtr storage = tryGetTable(database_and_table, context);
+        StoragePtr storage = tryGetTable(database_and_table, getContext());
         if (!storage || !checker.hasAtLeastTwoShards(*storage))
             return;
 
@@ -119,11 +128,17 @@ using NonGlobalTableVisitor = InDepthNodeVisitor<NonGlobalTableMatcher, true>;
 class NonGlobalSubqueryMatcher
 {
 public:
-    struct Data
+    struct Data : public WithContext
     {
+        using RenamedTables = std::vector<std::pair<ASTPtr, std::vector<ASTPtr>>>;
+
+        Data(ContextPtr context_, const CheckShardsAndTables & checker_, RenamedTables & renamed_tables_)
+        : WithContext(context_), checker(checker_), renamed_tables(renamed_tables_)
+        {
+        }
+
         const CheckShardsAndTables & checker;
-        const Context & context;
-        std::vector<std::pair<ASTPtr, std::vector<ASTPtr>>> & renamed_tables;
+        RenamedTables & renamed_tables;
     };
 
     static void visit(ASTPtr & node, Data & data)
@@ -161,7 +176,7 @@ private:
             }
             auto & subquery = node.arguments->children.at(1);
             std::vector<ASTPtr> renamed;
-            NonGlobalTableVisitor::Data table_data{data.checker, data.context, renamed, &node, nullptr};
+            NonGlobalTableVisitor::Data table_data(data.getContext(), data.checker, renamed, &node, nullptr);
             NonGlobalTableVisitor(table_data).visit(subquery);
             if (!renamed.empty())
                 data.renamed_tables.emplace_back(subquery, std::move(renamed));
@@ -179,7 +194,7 @@ private:
             if (auto & subquery = node.table_expression->as<ASTTableExpression>()->subquery)
             {
                 std::vector<ASTPtr> renamed;
-                NonGlobalTableVisitor::Data table_data{data.checker, data.context, renamed, nullptr, table_join};
+                NonGlobalTableVisitor::Data table_data(data.getContext(), data.checker, renamed, nullptr, table_join);
                 NonGlobalTableVisitor(table_data).visit(subquery);
                 if (!renamed.empty())
                     data.renamed_tables.emplace_back(subquery, std::move(renamed));
@@ -202,7 +217,7 @@ void InJoinSubqueriesPreprocessor::visit(ASTPtr & ast) const
     if (!query || !query->tables())
         return;
 
-    if (context.getSettingsRef().distributed_product_mode == DistributedProductMode::ALLOW)
+    if (getContext()->getSettingsRef().distributed_product_mode == DistributedProductMode::ALLOW)
         return;
 
     const auto & tables_in_select_query = query->tables()->as<ASTTablesInSelectQuery &>();
@@ -221,12 +236,12 @@ void InJoinSubqueriesPreprocessor::visit(ASTPtr & ast) const
 
     /// If not really distributed table, skip it.
     {
-        StoragePtr storage = tryGetTable(table_expression->database_and_table_name, context);
+        StoragePtr storage = tryGetTable(table_expression->database_and_table_name, getContext());
         if (!storage || !checker->hasAtLeastTwoShards(*storage))
             return;
     }
 
-    NonGlobalSubqueryVisitor::Data visitor_data{*checker, context, renamed_tables};
+    NonGlobalSubqueryVisitor::Data visitor_data{getContext(), *checker, renamed_tables};
     NonGlobalSubqueryVisitor(visitor_data).visit(ast);
 }
 
diff --git a/src/Interpreters/InJoinSubqueriesPreprocessor.h b/src/Interpreters/InJoinSubqueriesPreprocessor.h
index 4d46fabfd99..92a408e7ae3 100644
--- a/src/Interpreters/InJoinSubqueriesPreprocessor.h
+++ b/src/Interpreters/InJoinSubqueriesPreprocessor.h
@@ -1,19 +1,18 @@
 #pragma once
 
-#include <common/types.h>
+#include <Interpreters/Context_fwd.h>
 #include <Parsers/IAST_fwd.h>
 #include <Storages/IStorage_fwd.h>
+#include <common/types.h>
 
-#include <string>
 #include <memory>
+#include <string>
 
 
 namespace DB
 {
 
 class ASTSelectQuery;
-class Context;
-
 
 /** Scheme of operation:
   *
@@ -32,7 +31,7 @@ class Context;
   * Do not recursively preprocess subqueries, as it will be done by calling code.
   */
 
-class InJoinSubqueriesPreprocessor
+class InJoinSubqueriesPreprocessor : WithContext
 {
 public:
     using SubqueryTables = std::vector<std::pair<ASTPtr, std::vector<ASTPtr>>>;  /// {subquery, renamed_tables}
@@ -47,17 +46,17 @@ public:
         virtual ~CheckShardsAndTables() {}
     };
 
-    InJoinSubqueriesPreprocessor(const Context & context_, SubqueryTables & renamed_tables_,
-                                 CheckShardsAndTables::Ptr _checker = std::make_unique<CheckShardsAndTables>())
-        : context(context_)
-        , renamed_tables(renamed_tables_)
-        , checker(std::move(_checker))
-    {}
+    InJoinSubqueriesPreprocessor(
+        ContextPtr context_,
+        SubqueryTables & renamed_tables_,
+        CheckShardsAndTables::Ptr _checker = std::make_unique<CheckShardsAndTables>())
+        : WithContext(context_), renamed_tables(renamed_tables_), checker(std::move(_checker))
+    {
+    }
 
     void visit(ASTPtr & ast) const;
 
 private:
-    const Context & context;
     SubqueryTables & renamed_tables;
     CheckShardsAndTables::Ptr checker;
 };
diff --git a/src/Interpreters/InterpreterAlterQuery.cpp b/src/Interpreters/InterpreterAlterQuery.cpp
index bf624507574..9553dc87c31 100644
--- a/src/Interpreters/InterpreterAlterQuery.cpp
+++ b/src/Interpreters/InterpreterAlterQuery.cpp
@@ -1,24 +1,27 @@
 #include <Interpreters/InterpreterAlterQuery.h>
-#include <Interpreters/executeDDLQueryOnCluster.h>
-#include <Interpreters/MutationsInterpreter.h>
+
+#include <Access/AccessRightsElement.h>
+#include <Databases/DatabaseFactory.h>
+#include <Databases/DatabaseReplicated.h>
+#include <Databases/IDatabase.h>
 #include <Interpreters/AddDefaultDatabaseVisitor.h>
 #include <Interpreters/Context.h>
+#include <Interpreters/MutationsInterpreter.h>
 #include <Interpreters/QueryLog.h>
+#include <Interpreters/executeDDLQueryOnCluster.h>
 #include <Parsers/ASTAlterQuery.h>
 #include <Parsers/ASTAssignment.h>
-#include <Storages/IStorage.h>
 #include <Storages/AlterCommands.h>
-#include <Storages/MutationCommands.h>
-#include <Storages/PartitionCommands.h>
+#include <Storages/IStorage.h>
 #include <Storages/LiveView/LiveViewCommands.h>
 #include <Storages/LiveView/StorageLiveView.h>
-#include <Access/AccessRightsElement.h>
+#include <Storages/MutationCommands.h>
+#include <Storages/PartitionCommands.h>
 #include <Common/typeid_cast.h>
+
 #include <boost/range/algorithm_ext/push_back.hpp>
+
 #include <algorithm>
-#include <Databases/IDatabase.h>
-#include <Databases/DatabaseReplicated.h>
-#include <Databases/DatabaseFactory.h>
 
 
 namespace DB
@@ -32,8 +35,7 @@ namespace ErrorCodes
 }
 
 
-InterpreterAlterQuery::InterpreterAlterQuery(const ASTPtr & query_ptr_, const Context & context_)
-    : query_ptr(query_ptr_), context(context_)
+InterpreterAlterQuery::InterpreterAlterQuery(const ASTPtr & query_ptr_, ContextPtr context_) : WithContext(context_), query_ptr(query_ptr_)
 {
 }
 
@@ -44,21 +46,23 @@ BlockIO InterpreterAlterQuery::execute()
 
 
     if (!alter.cluster.empty())
-        return executeDDLQueryOnCluster(query_ptr, context, getRequiredAccess());
+        return executeDDLQueryOnCluster(query_ptr, getContext(), getRequiredAccess());
 
-    context.checkAccess(getRequiredAccess());
-    auto table_id = context.resolveStorageID(alter, Context::ResolveOrdinary);
+    getContext()->checkAccess(getRequiredAccess());
+    auto table_id = getContext()->resolveStorageID(alter, Context::ResolveOrdinary);
+    query_ptr->as<ASTAlterQuery &>().database = table_id.database_name;
 
     DatabasePtr database = DatabaseCatalog::instance().getDatabase(table_id.database_name);
-    if (typeid_cast<DatabaseReplicated *>(database.get()) && context.getClientInfo().query_kind != ClientInfo::QueryKind::SECONDARY_QUERY)
+    if (typeid_cast<DatabaseReplicated *>(database.get())
+        && getContext()->getClientInfo().query_kind != ClientInfo::QueryKind::SECONDARY_QUERY)
     {
         auto guard = DatabaseCatalog::instance().getDDLGuard(table_id.database_name, table_id.table_name);
         guard->releaseTableLock();
-        return typeid_cast<DatabaseReplicated *>(database.get())->tryEnqueueReplicatedDDL(query_ptr, context);
+        return typeid_cast<DatabaseReplicated *>(database.get())->tryEnqueueReplicatedDDL(query_ptr, getContext());
     }
 
-    StoragePtr table = DatabaseCatalog::instance().getTable(table_id, context);
-    auto alter_lock = table->lockForAlter(context.getCurrentQueryId(), context.getSettingsRef().lock_acquire_timeout);
+    StoragePtr table = DatabaseCatalog::instance().getTable(table_id, getContext());
+    auto alter_lock = table->lockForAlter(getContext()->getCurrentQueryId(), getContext()->getSettingsRef().lock_acquire_timeout);
     auto metadata_snapshot = table->getInMemoryMetadataPtr();
 
     /// Add default database to table identifiers that we can encounter in e.g. default expressions,
@@ -104,14 +108,15 @@ BlockIO InterpreterAlterQuery::execute()
 
     if (!mutation_commands.empty())
     {
-        MutationsInterpreter(table, metadata_snapshot, mutation_commands, context, false).validate();
-        table->mutate(mutation_commands, context);
+        table->checkMutationIsPossible(mutation_commands, getContext()->getSettingsRef());
+        MutationsInterpreter(table, metadata_snapshot, mutation_commands, getContext(), false).validate();
+        table->mutate(mutation_commands, getContext());
     }
 
     if (!partition_commands.empty())
     {
-        table->checkAlterPartitionIsPossible(partition_commands, metadata_snapshot, context.getSettingsRef());
-        auto partition_commands_pipe = table->alterPartition(metadata_snapshot, partition_commands, context);
+        table->checkAlterPartitionIsPossible(partition_commands, metadata_snapshot, getContext()->getSettingsRef());
+        auto partition_commands_pipe = table->alterPartition(metadata_snapshot, partition_commands, getContext());
         if (!partition_commands_pipe.empty())
             res.pipeline.init(std::move(partition_commands_pipe));
     }
@@ -134,10 +139,10 @@ BlockIO InterpreterAlterQuery::execute()
     if (!alter_commands.empty())
     {
         StorageInMemoryMetadata metadata = table->getInMemoryMetadata();
-        alter_commands.validate(metadata, context);
+        alter_commands.validate(metadata, getContext());
         alter_commands.prepare(metadata);
-        table->checkAlterIsPossible(alter_commands, context.getSettingsRef());
-        table->alter(alter_commands, context, alter_lock);
+        table->checkAlterIsPossible(alter_commands, getContext());
+        table->alter(alter_commands, getContext(), alter_lock);
     }
 
     return res;
@@ -298,7 +303,9 @@ AccessRightsElements InterpreterAlterQuery::getRequiredAccessForCommand(const AS
             break;
         }
         case ASTAlterCommand::FREEZE_PARTITION: [[fallthrough]];
-        case ASTAlterCommand::FREEZE_ALL:
+        case ASTAlterCommand::FREEZE_ALL: [[fallthrough]];
+        case ASTAlterCommand::UNFREEZE_PARTITION: [[fallthrough]];
+        case ASTAlterCommand::UNFREEZE_ALL:
         {
             required_access.emplace_back(AccessType::ALTER_FREEZE_PARTITION, database, table);
             break;
@@ -324,7 +331,7 @@ AccessRightsElements InterpreterAlterQuery::getRequiredAccessForCommand(const AS
     return required_access;
 }
 
-void InterpreterAlterQuery::extendQueryLogElemImpl(QueryLogElement & elem, const ASTPtr & ast, const Context &) const
+void InterpreterAlterQuery::extendQueryLogElemImpl(QueryLogElement & elem, const ASTPtr & ast, ContextPtr) const
 {
     const auto & alter = ast->as<const ASTAlterQuery &>();
 
@@ -354,14 +361,14 @@ void InterpreterAlterQuery::extendQueryLogElemImpl(QueryLogElement & elem, const
 
             if (!command->from_table.empty())
             {
-                String database = command->from_database.empty() ? context.getCurrentDatabase() : command->from_database;
+                String database = command->from_database.empty() ? getContext()->getCurrentDatabase() : command->from_database;
                 elem.query_databases.insert(database);
                 elem.query_tables.insert(database + "." + command->from_table);
             }
 
             if (!command->to_table.empty())
             {
-                String database = command->to_database.empty() ? context.getCurrentDatabase() : command->to_database;
+                String database = command->to_database.empty() ? getContext()->getCurrentDatabase() : command->to_database;
                 elem.query_databases.insert(database);
                 elem.query_tables.insert(database + "." + command->to_table);
             }
diff --git a/src/Interpreters/InterpreterAlterQuery.h b/src/Interpreters/InterpreterAlterQuery.h
index 37084844f6c..ae9750b0b62 100644
--- a/src/Interpreters/InterpreterAlterQuery.h
+++ b/src/Interpreters/InterpreterAlterQuery.h
@@ -6,7 +6,7 @@
 
 namespace DB
 {
-class Context;
+
 class AccessRightsElements;
 class ASTAlterCommand;
 
@@ -14,23 +14,21 @@ class ASTAlterCommand;
 /** Allows you add or remove a column in the table.
   * It also allows you to manipulate the partitions of the MergeTree family tables.
   */
-class InterpreterAlterQuery : public IInterpreter
+class InterpreterAlterQuery : public IInterpreter, WithContext
 {
 public:
-    InterpreterAlterQuery(const ASTPtr & query_ptr_, const Context & context_);
+    InterpreterAlterQuery(const ASTPtr & query_ptr_, ContextPtr context_);
 
     BlockIO execute() override;
 
     static AccessRightsElements getRequiredAccessForCommand(const ASTAlterCommand & command, const String & database, const String & table);
 
-    void extendQueryLogElemImpl(QueryLogElement & elem, const ASTPtr & ast, const Context & context) const override;
+    void extendQueryLogElemImpl(QueryLogElement & elem, const ASTPtr & ast, ContextPtr context) const override;
 
 private:
     AccessRightsElements getRequiredAccess() const;
 
     ASTPtr query_ptr;
-
-    const Context & context;
 };
 
 }
diff --git a/src/Interpreters/InterpreterCheckQuery.cpp b/src/Interpreters/InterpreterCheckQuery.cpp
index b3cd807abe5..e8a4f884dd0 100644
--- a/src/Interpreters/InterpreterCheckQuery.cpp
+++ b/src/Interpreters/InterpreterCheckQuery.cpp
@@ -29,8 +29,7 @@ NamesAndTypes getBlockStructure()
 }
 
 
-InterpreterCheckQuery::InterpreterCheckQuery(const ASTPtr & query_ptr_, const Context & context_)
-    : query_ptr(query_ptr_), context(context_)
+InterpreterCheckQuery::InterpreterCheckQuery(const ASTPtr & query_ptr_, ContextPtr context_) : WithContext(context_), query_ptr(query_ptr_)
 {
 }
 
@@ -38,14 +37,14 @@ InterpreterCheckQuery::InterpreterCheckQuery(const ASTPtr & query_ptr_, const Co
 BlockIO InterpreterCheckQuery::execute()
 {
     const auto & check = query_ptr->as<ASTCheckQuery &>();
-    auto table_id = context.resolveStorageID(check, Context::ResolveOrdinary);
+    auto table_id = getContext()->resolveStorageID(check, Context::ResolveOrdinary);
 
-    context.checkAccess(AccessType::SHOW_TABLES, table_id);
-    StoragePtr table = DatabaseCatalog::instance().getTable(table_id, context);
-    auto check_results = table->checkData(query_ptr, context);
+    getContext()->checkAccess(AccessType::SHOW_TABLES, table_id);
+    StoragePtr table = DatabaseCatalog::instance().getTable(table_id, getContext());
+    auto check_results = table->checkData(query_ptr, getContext());
 
     Block block;
-    if (context.getSettingsRef().check_query_single_value_result)
+    if (getContext()->getSettingsRef().check_query_single_value_result)
     {
         bool result = std::all_of(check_results.begin(), check_results.end(), [] (const CheckResult & res) { return res.success; });
         auto column = ColumnUInt8::create();
diff --git a/src/Interpreters/InterpreterCheckQuery.h b/src/Interpreters/InterpreterCheckQuery.h
index c667ca74c22..557faddfe9c 100644
--- a/src/Interpreters/InterpreterCheckQuery.h
+++ b/src/Interpreters/InterpreterCheckQuery.h
@@ -7,20 +7,17 @@
 namespace DB
 {
 
-class Context;
 class Cluster;
 
-class InterpreterCheckQuery : public IInterpreter
+class InterpreterCheckQuery : public IInterpreter, WithContext
 {
 public:
-    InterpreterCheckQuery(const ASTPtr & query_ptr_, const Context & context_);
+    InterpreterCheckQuery(const ASTPtr & query_ptr_, ContextPtr context_);
 
     BlockIO execute() override;
 
 private:
     ASTPtr query_ptr;
-
-    const Context & context;
 };
 
 }
diff --git a/src/Interpreters/InterpreterCreateQuery.cpp b/src/Interpreters/InterpreterCreateQuery.cpp
index d1af86e7b11..d155a0eea4b 100644
--- a/src/Interpreters/InterpreterCreateQuery.cpp
+++ b/src/Interpreters/InterpreterCreateQuery.cpp
@@ -59,6 +59,7 @@
 #include <Interpreters/QueryLog.h>
 #include <Interpreters/addTypeConversionToAST.h>
 #include <Interpreters/FunctionNameNormalizer.h>
+#include <Interpreters/ApplyWithSubqueryVisitor.h>
 
 #include <TableFunctions/TableFunctionFactory.h>
 #include <common/logger_useful.h>
@@ -90,8 +91,8 @@ namespace ErrorCodes
 
 namespace fs = std::filesystem;
 
-InterpreterCreateQuery::InterpreterCreateQuery(const ASTPtr & query_ptr_, Context & context_)
-    : query_ptr(query_ptr_), context(context_)
+InterpreterCreateQuery::InterpreterCreateQuery(const ASTPtr & query_ptr_, ContextPtr context_)
+    : WithContext(context_), query_ptr(query_ptr_)
 {
 }
 
@@ -113,7 +114,7 @@ BlockIO InterpreterCreateQuery::createDatabase(ASTCreateQuery & create)
 
     /// Will write file with database metadata, if needed.
     String database_name_escaped = escapeForFileName(database_name);
-    fs::path metadata_path = fs::canonical(context.getPath());
+    fs::path metadata_path = fs::canonical(getContext()->getPath());
     fs::path metadata_file_tmp_path = metadata_path / "metadata" / (database_name_escaped + ".sql.tmp");
     fs::path metadata_file_path = metadata_path / "metadata" / (database_name_escaped + ".sql");
 
@@ -122,7 +123,7 @@ BlockIO InterpreterCreateQuery::createDatabase(ASTCreateQuery & create)
         if (!fs::exists(metadata_file_path))
             throw Exception("Database engine must be specified for ATTACH DATABASE query", ErrorCodes::UNKNOWN_DATABASE_ENGINE);
         /// Short syntax: try read database definition from file
-        auto ast = DatabaseOnDisk::parseQueryFromMetadata(nullptr, context, metadata_file_path);
+        auto ast = DatabaseOnDisk::parseQueryFromMetadata(nullptr, getContext(), metadata_file_path);
         create = ast->as<ASTCreateQuery &>();
         if (!create.table.empty() || !create.storage)
             throw Exception(ErrorCodes::INCORRECT_QUERY, "Metadata file {} contains incorrect CREATE DATABASE query", metadata_file_path.string());
@@ -136,7 +137,7 @@ BlockIO InterpreterCreateQuery::createDatabase(ASTCreateQuery & create)
         /// When attaching old-style database during server startup, we must always use Ordinary engine
         if (create.attach)
             throw Exception("Database engine must be specified for ATTACH DATABASE query", ErrorCodes::UNKNOWN_DATABASE_ENGINE);
-        bool old_style_database = context.getSettingsRef().default_database_engine.value == DefaultDatabaseEngine::Ordinary;
+        bool old_style_database = getContext()->getSettingsRef().default_database_engine.value == DefaultDatabaseEngine::Ordinary;
         auto engine = std::make_shared<ASTFunction>();
         auto storage = std::make_shared<ASTStorage>();
         engine->name = old_style_database ? "Ordinary" : "Atomic";
@@ -174,7 +175,7 @@ BlockIO InterpreterCreateQuery::createDatabase(ASTCreateQuery & create)
 
         if (create_from_user)
         {
-            const auto & default_engine = context.getSettingsRef().default_database_engine.value;
+            const auto & default_engine = getContext()->getSettingsRef().default_database_engine.value;
             if (create.uuid == UUIDHelpers::Nil && default_engine == DefaultDatabaseEngine::Atomic)
                 create.uuid = UUIDHelpers::generateV4();    /// Will enable Atomic engine for nested database
         }
@@ -194,7 +195,7 @@ BlockIO InterpreterCreateQuery::createDatabase(ASTCreateQuery & create)
     }
     else
     {
-        bool is_on_cluster = context.getClientInfo().query_kind == ClientInfo::QueryKind::SECONDARY_QUERY;
+        bool is_on_cluster = getContext()->getClientInfo().query_kind == ClientInfo::QueryKind::SECONDARY_QUERY;
         if (create.uuid != UUIDHelpers::Nil && !is_on_cluster)
             throw Exception("Ordinary database engine does not support UUID", ErrorCodes::INCORRECT_QUERY);
 
@@ -203,19 +204,20 @@ BlockIO InterpreterCreateQuery::createDatabase(ASTCreateQuery & create)
         metadata_path = metadata_path / "metadata" / database_name_escaped;
     }
 
-    if (create.storage->engine->name == "MaterializeMySQL" && !context.getSettingsRef().allow_experimental_database_materialize_mysql && !internal)
+    if (create.storage->engine->name == "MaterializeMySQL" && !getContext()->getSettingsRef().allow_experimental_database_materialize_mysql
+        && !internal)
     {
         throw Exception("MaterializeMySQL is an experimental database engine. "
                         "Enable allow_experimental_database_materialize_mysql to use it.", ErrorCodes::UNKNOWN_DATABASE_ENGINE);
     }
 
-    if (create.storage->engine->name == "Replicated" && !context.getSettingsRef().allow_experimental_database_replicated && !internal)
+    if (create.storage->engine->name == "Replicated" && !getContext()->getSettingsRef().allow_experimental_database_replicated && !internal)
     {
         throw Exception("Replicated is an experimental database engine. "
                         "Enable allow_experimental_database_replicated to use it.", ErrorCodes::UNKNOWN_DATABASE_ENGINE);
     }
 
-    DatabasePtr database = DatabaseFactory::get(create, metadata_path / "", context);
+    DatabasePtr database = DatabaseFactory::get(create, metadata_path / "", getContext());
 
     if (create.uuid != UUIDHelpers::Nil)
         create.database = TABLE_WITH_UUID_NAME_PLACEHOLDER;
@@ -237,7 +239,7 @@ BlockIO InterpreterCreateQuery::createDatabase(ASTCreateQuery & create)
         writeString(statement, out);
 
         out.next();
-        if (context.getSettingsRef().fsync_metadata)
+        if (getContext()->getSettingsRef().fsync_metadata)
             out.sync();
         out.close();
     }
@@ -260,7 +262,8 @@ BlockIO InterpreterCreateQuery::createDatabase(ASTCreateQuery & create)
             renamed = true;
         }
 
-        database->loadStoredObjects(context, has_force_restore_data_flag, create.attach && force_attach);
+        /// We use global context here, because storages lifetime is bigger than query context lifetime
+        database->loadStoredObjects(getContext()->getGlobalContext(), has_force_restore_data_flag, create.attach && force_attach);
     }
     catch (...)
     {
@@ -360,7 +363,7 @@ ASTPtr InterpreterCreateQuery::formatConstraints(const ConstraintsDescription &
 }
 
 ColumnsDescription InterpreterCreateQuery::getColumnsDescription(
-    const ASTExpressionList & columns_ast, const Context & context, bool sanity_check_compression_codecs)
+    const ASTExpressionList & columns_ast, ContextPtr context_, bool attach)
 {
     /// First, deduce implicit types.
 
@@ -369,6 +372,7 @@ ColumnsDescription InterpreterCreateQuery::getColumnsDescription(
 
     ASTPtr default_expr_list = std::make_shared<ASTExpressionList>();
     NamesAndTypesList column_names_and_types;
+    bool make_columns_nullable = !attach && context_->getSettingsRef().data_type_default_nullable;
 
     for (const auto & ast : columns_ast.children)
     {
@@ -387,7 +391,7 @@ ColumnsDescription InterpreterCreateQuery::getColumnsDescription(
                 if (*col_decl.null_modifier)
                     column_type = makeNullable(column_type);
             }
-            else if (context.getSettingsRef().data_type_default_nullable)
+            else if (make_columns_nullable)
             {
                 column_type = makeNullable(column_type);
             }
@@ -430,8 +434,9 @@ ColumnsDescription InterpreterCreateQuery::getColumnsDescription(
     Block defaults_sample_block;
     /// set missing types and wrap default_expression's in a conversion-function if necessary
     if (!default_expr_list->children.empty())
-        defaults_sample_block = validateColumnsDefaultsAndGetSampleBlock(default_expr_list, column_names_and_types, context);
+        defaults_sample_block = validateColumnsDefaultsAndGetSampleBlock(default_expr_list, column_names_and_types, context_);
 
+    bool sanity_check_compression_codecs = !attach && !context_->getSettingsRef().allow_suspicious_codecs;
     ColumnsDescription res;
     auto name_type_it = column_names_and_types.begin();
     for (auto ast_it = columns_ast.children.begin(); ast_it != columns_ast.children.end(); ++ast_it, ++name_type_it)
@@ -475,7 +480,7 @@ ColumnsDescription InterpreterCreateQuery::getColumnsDescription(
         res.add(std::move(column));
     }
 
-    if (context.getSettingsRef().flatten_nested)
+    if (context_->getSettingsRef().flatten_nested)
         res.flattenNested();
 
     if (res.getAllPhysical().empty())
@@ -507,24 +512,23 @@ InterpreterCreateQuery::TableProperties InterpreterCreateQuery::setProperties(AS
 
         if (create.columns_list->columns)
         {
-            bool sanity_check_compression_codecs = !create.attach && !context.getSettingsRef().allow_suspicious_codecs;
-            properties.columns = getColumnsDescription(*create.columns_list->columns, context, sanity_check_compression_codecs);
+            properties.columns = getColumnsDescription(*create.columns_list->columns, getContext(), create.attach);
         }
 
         if (create.columns_list->indices)
             for (const auto & index : create.columns_list->indices->children)
                 properties.indices.push_back(
-                    IndexDescription::getIndexFromAST(index->clone(), properties.columns, context));
+                    IndexDescription::getIndexFromAST(index->clone(), properties.columns, getContext()));
 
         properties.constraints = getConstraintsDescription(create.columns_list->constraints);
     }
     else if (!create.as_table.empty())
     {
-        String as_database_name = context.resolveDatabase(create.as_database);
-        StoragePtr as_storage = DatabaseCatalog::instance().getTable({as_database_name, create.as_table}, context);
+        String as_database_name = getContext()->resolveDatabase(create.as_database);
+        StoragePtr as_storage = DatabaseCatalog::instance().getTable({as_database_name, create.as_table}, getContext());
 
         /// as_storage->getColumns() and setEngine(...) must be called under structure lock of other_table for CREATE ... AS other_table.
-        as_storage_lock = as_storage->lockForShare(context.getCurrentQueryId(), context.getSettingsRef().lock_acquire_timeout);
+        as_storage_lock = as_storage->lockForShare(getContext()->getCurrentQueryId(), getContext()->getSettingsRef().lock_acquire_timeout);
         auto as_storage_metadata = as_storage->getInMemoryMetadataPtr();
         properties.columns = as_storage_metadata->getColumns();
 
@@ -537,14 +541,14 @@ InterpreterCreateQuery::TableProperties InterpreterCreateQuery::setProperties(AS
     }
     else if (create.select)
     {
-        Block as_select_sample = InterpreterSelectWithUnionQuery::getSampleBlock(create.select->clone(), context);
+        Block as_select_sample = InterpreterSelectWithUnionQuery::getSampleBlock(create.select->clone(), getContext());
         properties.columns = ColumnsDescription(as_select_sample.getNamesAndTypesList());
     }
     else if (create.as_table_function)
     {
         /// Table function without columns list.
-        auto table_function = TableFunctionFactory::instance().get(create.as_table_function, context);
-        properties.columns = table_function->getActualTableStructure(context);
+        auto table_function = TableFunctionFactory::instance().get(create.as_table_function, getContext());
+        properties.columns = table_function->getActualTableStructure(getContext());
         assert(!properties.columns.empty());
     }
     else
@@ -585,7 +589,7 @@ void InterpreterCreateQuery::validateTableStructure(const ASTCreateQuery & creat
             throw Exception("Column " + backQuoteIfNeed(column.name) + " already exists", ErrorCodes::DUPLICATE_COLUMN);
     }
 
-    const auto & settings = context.getSettingsRef();
+    const auto & settings = getContext()->getSettingsRef();
 
     /// Check low cardinality types in creating table if it was not allowed in setting
     if (!create.attach && !settings.allow_suspicious_low_cardinality_types && !create.is_materialized_view)
@@ -680,10 +684,10 @@ void InterpreterCreateQuery::setEngine(ASTCreateQuery & create) const
     {
         /// NOTE Getting the structure from the table specified in the AS is done not atomically with the creation of the table.
 
-        String as_database_name = context.resolveDatabase(create.as_database);
+        String as_database_name = getContext()->resolveDatabase(create.as_database);
         String as_table_name = create.as_table;
 
-        ASTPtr as_create_ptr = DatabaseCatalog::instance().getDatabase(as_database_name)->getCreateTableQuery(as_table_name, context);
+        ASTPtr as_create_ptr = DatabaseCatalog::instance().getDatabase(as_database_name)->getCreateTableQuery(as_table_name, getContext());
         const auto & as_create = as_create_ptr->as<ASTCreateQuery &>();
 
         const String qualified_name = backQuoteIfNeed(as_database_name) + "." + backQuoteIfNeed(as_table_name);
@@ -712,12 +716,26 @@ void InterpreterCreateQuery::setEngine(ASTCreateQuery & create) const
     }
 }
 
+static void generateUUIDForTable(ASTCreateQuery & create)
+{
+    if (create.uuid == UUIDHelpers::Nil)
+        create.uuid = UUIDHelpers::generateV4();
+
+    /// If destination table (to_table_id) is not specified for materialized view,
+    /// then MV will create inner table. We should generate UUID of inner table here,
+    /// so it will be the same on all hosts if query in ON CLUSTER or database engine is Replicated.
+    bool need_uuid_for_inner_table = !create.attach && create.is_materialized_view && !create.to_table_id;
+    if (need_uuid_for_inner_table && create.to_inner_uuid == UUIDHelpers::Nil)
+        create.to_inner_uuid = UUIDHelpers::generateV4();
+}
+
 void InterpreterCreateQuery::assertOrSetUUID(ASTCreateQuery & create, const DatabasePtr & database) const
 {
     const auto * kind = create.is_dictionary ? "Dictionary" : "Table";
     const auto * kind_upper = create.is_dictionary ? "DICTIONARY" : "TABLE";
 
-    if (database->getEngineName() == "Replicated" && context.getClientInfo().query_kind == ClientInfo::QueryKind::SECONDARY_QUERY && !internal)
+    if (database->getEngineName() == "Replicated" && getContext()->getClientInfo().query_kind == ClientInfo::QueryKind::SECONDARY_QUERY
+        && !internal)
     {
         if (create.uuid == UUIDHelpers::Nil)
             throw Exception("Table UUID is not specified in DDL log", ErrorCodes::LOGICAL_ERROR);
@@ -743,18 +761,19 @@ void InterpreterCreateQuery::assertOrSetUUID(ASTCreateQuery & create, const Data
                             kind_upper, create.table);
         }
 
-        if (create.uuid == UUIDHelpers::Nil)
-            create.uuid = UUIDHelpers::generateV4();
+        generateUUIDForTable(create);
     }
     else
     {
-        bool is_on_cluster = context.getClientInfo().query_kind == ClientInfo::QueryKind::SECONDARY_QUERY;
-        if (create.uuid != UUIDHelpers::Nil && !is_on_cluster)
+        bool is_on_cluster = getContext()->getClientInfo().query_kind == ClientInfo::QueryKind::SECONDARY_QUERY;
+        bool has_uuid = create.uuid != UUIDHelpers::Nil || create.to_inner_uuid != UUIDHelpers::Nil;
+        if (has_uuid && !is_on_cluster)
             throw Exception(ErrorCodes::INCORRECT_QUERY,
                             "{} UUID specified, but engine of database {} is not Atomic", kind, create.database);
 
         /// Ignore UUID if it's ON CLUSTER query
         create.uuid = UUIDHelpers::Nil;
+        create.to_inner_uuid = UUIDHelpers::Nil;
     }
 
     if (create.replace_table)
@@ -767,19 +786,19 @@ void InterpreterCreateQuery::assertOrSetUUID(ASTCreateQuery & create, const Data
         UUID uuid_of_table_to_replace;
         if (create.create_or_replace)
         {
-            uuid_of_table_to_replace = context.tryResolveStorageID(StorageID(create.database, create.table)).uuid;
+            uuid_of_table_to_replace = getContext()->tryResolveStorageID(StorageID(create.database, create.table)).uuid;
             if (uuid_of_table_to_replace == UUIDHelpers::Nil)
             {
                 /// Convert to usual CREATE
                 create.replace_table = false;
-                assert(!database->isTableExist(create.table, context));
+                assert(!database->isTableExist(create.table, getContext()));
             }
             else
                 create.table = "_tmp_replace_" + toString(uuid_of_table_to_replace);
         }
         else
         {
-            uuid_of_table_to_replace = context.resolveStorageID(StorageID(create.database, create.table)).uuid;
+            uuid_of_table_to_replace = getContext()->resolveStorageID(StorageID(create.database, create.table)).uuid;
             if (uuid_of_table_to_replace == UUIDHelpers::Nil)
                 throw Exception(ErrorCodes::UNKNOWN_TABLE, "Table {}.{} doesn't exist",
                                 backQuoteIfNeed(create.database), backQuoteIfNeed(create.table));
@@ -796,17 +815,28 @@ BlockIO InterpreterCreateQuery::createTable(ASTCreateQuery & create)
         throw Exception("Temporary tables cannot be inside a database. You should not specify a database for a temporary table.",
             ErrorCodes::BAD_DATABASE_FOR_TEMPORARY_TABLE);
 
-    String current_database = context.getCurrentDatabase();
+    String current_database = getContext()->getCurrentDatabase();
     auto database_name = create.database.empty() ? current_database : create.database;
 
     // If this is a stub ATTACH query, read the query definition from the database
     if (create.attach && !create.storage && !create.columns_list)
     {
         auto database = DatabaseCatalog::instance().getDatabase(database_name);
+        if (database->getEngineName() == "Replicated")
+        {
+            auto guard = DatabaseCatalog::instance().getDDLGuard(database_name, create.table);
+            if (typeid_cast<DatabaseReplicated *>(database.get()) && getContext()->getClientInfo().query_kind != ClientInfo::QueryKind::SECONDARY_QUERY)
+            {
+                create.database = database_name;
+                guard->releaseTableLock();
+                return typeid_cast<DatabaseReplicated *>(database.get())->tryEnqueueReplicatedDDL(query_ptr, getContext());
+            }
+        }
+
         bool if_not_exists = create.if_not_exists;
 
         // Table SQL definition is available even if the table is detached (even permanently)
-        auto query = database->getCreateTableQuery(create.table, context);
+        auto query = database->getCreateTableQuery(create.table, getContext());
         create = query->as<ASTCreateQuery &>(); // Copy the saved create query, but use ATTACH instead of CREATE
         if (create.is_dictionary)
             throw Exception(ErrorCodes::INCORRECT_QUERY,
@@ -821,10 +851,10 @@ BlockIO InterpreterCreateQuery::createTable(ASTCreateQuery & create)
 
     if (create.attach_from_path)
     {
-        fs::path user_files = fs::path(context.getUserFilesPath()).lexically_normal();
-        fs::path root_path = fs::path(context.getPath()).lexically_normal();
+        fs::path user_files = fs::path(getContext()->getUserFilesPath()).lexically_normal();
+        fs::path root_path = fs::path(getContext()->getPath()).lexically_normal();
 
-        if (context.getClientInfo().query_kind == ClientInfo::QueryKind::INITIAL_QUERY)
+        if (getContext()->getClientInfo().query_kind == ClientInfo::QueryKind::INITIAL_QUERY)
         {
             fs::path data_path = fs::path(*create.attach_from_path).lexically_normal();
             if (data_path.is_relative())
@@ -844,7 +874,7 @@ BlockIO InterpreterCreateQuery::createTable(ASTCreateQuery & create)
                                 "Data directory {} must be inside {} to attach it", String(data_path), String(user_files));
         }
     }
-    else if (create.attach && !create.attach_short_syntax && context.getClientInfo().query_kind != ClientInfo::QueryKind::SECONDARY_QUERY)
+    else if (create.attach && !create.attach_short_syntax && getContext()->getClientInfo().query_kind != ClientInfo::QueryKind::SECONDARY_QUERY)
     {
         auto * log = &Poco::Logger::get("InterpreterCreateQuery");
         LOG_WARNING(log, "ATTACH TABLE query with full table definition is not recommended: "
@@ -861,6 +891,8 @@ BlockIO InterpreterCreateQuery::createTable(ASTCreateQuery & create)
 
     if (create.select && create.isView())
     {
+        // Expand CTE before filling default database
+        ApplyWithSubqueryVisitor().visit(*create.select);
         AddDefaultDatabaseVisitor visitor(current_database);
         visitor.visit(*create.select);
     }
@@ -876,12 +908,11 @@ BlockIO InterpreterCreateQuery::createTable(ASTCreateQuery & create)
     if (need_add_to_database && database->getEngineName() == "Replicated")
     {
         auto guard = DatabaseCatalog::instance().getDDLGuard(create.database, create.table);
-        database = DatabaseCatalog::instance().getDatabase(create.database);
-        if (typeid_cast<DatabaseReplicated *>(database.get()) && context.getClientInfo().query_kind != ClientInfo::QueryKind::SECONDARY_QUERY)
+        if (typeid_cast<DatabaseReplicated *>(database.get()) && getContext()->getClientInfo().query_kind != ClientInfo::QueryKind::SECONDARY_QUERY)
         {
             assertOrSetUUID(create, database);
             guard->releaseTableLock();
-            return typeid_cast<DatabaseReplicated *>(database.get())->tryEnqueueReplicatedDDL(query_ptr, context);
+            return typeid_cast<DatabaseReplicated *>(database.get())->tryEnqueueReplicatedDDL(query_ptr, getContext());
         }
     }
 
@@ -917,7 +948,7 @@ bool InterpreterCreateQuery::doCreateTable(ASTCreateQuery & create,
         assertOrSetUUID(create, database);
 
         /// Table can be created before or it can be created concurrently in another thread, while we were waiting in DDLGuard.
-        if (database->isTableExist(create.table, context))
+        if (database->isTableExist(create.table, getContext()))
         {
             /// TODO Check structure of table
             if (create.if_not_exists)
@@ -930,7 +961,7 @@ bool InterpreterCreateQuery::doCreateTable(ASTCreateQuery & create,
                 drop_ast->table = create.table;
                 drop_ast->no_ddl_lock = true;
 
-                Context drop_context = context;
+                auto drop_context = Context::createCopy(context);
                 InterpreterDropQuery interpreter(drop_ast, drop_context);
                 interpreter.execute();
             }
@@ -939,17 +970,17 @@ bool InterpreterCreateQuery::doCreateTable(ASTCreateQuery & create,
         }
 
         data_path = database->getTableDataPath(create);
-        if (!create.attach && !data_path.empty() && fs::exists(fs::path{context.getPath()} / data_path))
+        if (!create.attach && !data_path.empty() && fs::exists(fs::path{getContext()->getPath()} / data_path))
             throw Exception(ErrorCodes::TABLE_ALREADY_EXISTS, "Directory for table data {} already exists", String(data_path));
     }
     else
     {
-        if (create.if_not_exists && context.tryResolveStorageID({"", create.table}, Context::ResolveExternal))
+        if (create.if_not_exists && getContext()->tryResolveStorageID({"", create.table}, Context::ResolveExternal))
             return false;
 
         String temporary_table_name = create.table;
-        auto temporary_table = TemporaryTableHolder(context, properties.columns, properties.constraints, query_ptr);
-        context.getSessionContext().addExternalTable(temporary_table_name, std::move(temporary_table));
+        auto temporary_table = TemporaryTableHolder(getContext(), properties.columns, properties.constraints, query_ptr);
+        getContext()->getSessionContext()->addExternalTable(temporary_table_name, std::move(temporary_table));
         return true;
     }
 
@@ -965,20 +996,34 @@ bool InterpreterCreateQuery::doCreateTable(ASTCreateQuery & create,
         create.attach_from_path = std::nullopt;
     }
 
+    if (create.attach)
+    {
+        /// If table was detached it's not possible to attach it back while some threads are using
+        /// old instance of the storage. For example, AsynchronousMetrics may cause ATTACH to fail,
+        /// so we allow waiting here. If database_atomic_wait_for_drop_and_detach_synchronously is disabled
+        /// and old storage instance still exists it will throw exception.
+        bool throw_if_table_in_use = getContext()->getSettingsRef().database_atomic_wait_for_drop_and_detach_synchronously;
+        if (throw_if_table_in_use)
+            database->checkDetachedTableNotInUse(create.uuid);
+        else
+            database->waitDetachedTableNotInUse(create.uuid);
+    }
+
     StoragePtr res;
     /// NOTE: CREATE query may be rewritten by Storage creator or table function
     if (create.as_table_function)
     {
         const auto & factory = TableFunctionFactory::instance();
-        res = factory.get(create.as_table_function, context)->execute(create.as_table_function, context, create.table, properties.columns);
+        auto table_func = factory.get(create.as_table_function, getContext());
+        res = table_func->execute(create.as_table_function, getContext(), create.table, properties.columns);
         res->renameInMemory({create.database, create.table, create.uuid});
     }
     else
     {
         res = StorageFactory::instance().get(create,
             data_path,
-            context,
-            context.getGlobalContext(),
+            getContext(),
+            getContext()->getGlobalContext(),
             properties.columns,
             properties.constraints,
             false);
@@ -989,7 +1034,7 @@ bool InterpreterCreateQuery::doCreateTable(ASTCreateQuery & create,
                         "ATTACH ... FROM ... query is not supported for {} table engine, "
                         "because such tables do not store any data on disk. Use CREATE instead.", res->getName());
 
-    database->createTable(context, create.table, res, query_ptr);
+    database->createTable(getContext(), create.table, res, query_ptr);
 
     /// Move table data to the proper place. Wo do not move data earlier to avoid situations
     /// when data directory moved, but table has not been created due to some error.
@@ -1041,10 +1086,10 @@ BlockIO InterpreterCreateQuery::doCreateOrReplaceTable(ASTCreateQuery & create,
         };
         ast_rename->elements.push_back(std::move(elem));
         ast_rename->exchange = true;
-        InterpreterRenameQuery(ast_rename, context).execute();
+        InterpreterRenameQuery(ast_rename, getContext()).execute();
         replaced = true;
 
-        InterpreterDropQuery(ast_drop, context).execute();
+        InterpreterDropQuery(ast_drop, getContext()).execute();
 
         create.table = table_to_replace_name;
         return fillTableIfNeeded(create);
@@ -1052,7 +1097,7 @@ BlockIO InterpreterCreateQuery::doCreateOrReplaceTable(ASTCreateQuery & create,
     catch (...)
     {
         if (created && create.replace_table && !replaced)
-            InterpreterDropQuery(ast_drop, context).execute();
+            InterpreterDropQuery(ast_drop, getContext()).execute();
         throw;
     }
 }
@@ -1067,12 +1112,12 @@ BlockIO InterpreterCreateQuery::fillTableIfNeeded(const ASTCreateQuery & create)
         insert->table_id = {create.database, create.table, create.uuid};
         insert->select = create.select->clone();
 
-        if (create.temporary && !context.getSessionContext().hasQueryContext())
-            context.getSessionContext().makeQueryContext();
+        if (create.temporary && !getContext()->getSessionContext()->hasQueryContext())
+            getContext()->getSessionContext()->makeQueryContext();
 
         return InterpreterInsertQuery(insert,
-            create.temporary ? context.getSessionContext() : context,
-            context.getSettingsRef().insert_allow_materialized_columns).execute();
+            create.temporary ? getContext()->getSessionContext() : getContext(),
+            getContext()->getSettingsRef().insert_allow_materialized_columns).execute();
     }
 
     return {};
@@ -1082,18 +1127,19 @@ BlockIO InterpreterCreateQuery::createDictionary(ASTCreateQuery & create)
 {
     String dictionary_name = create.table;
 
-    create.database = context.resolveDatabase(create.database);
+    create.database = getContext()->resolveDatabase(create.database);
     const String & database_name = create.database;
 
     auto guard = DatabaseCatalog::instance().getDDLGuard(database_name, dictionary_name);
     DatabasePtr database = DatabaseCatalog::instance().getDatabase(database_name);
 
-    if (typeid_cast<DatabaseReplicated *>(database.get()) && context.getClientInfo().query_kind != ClientInfo::QueryKind::SECONDARY_QUERY)
+    if (typeid_cast<DatabaseReplicated *>(database.get())
+        && getContext()->getClientInfo().query_kind != ClientInfo::QueryKind::SECONDARY_QUERY)
     {
         if (!create.attach)
             assertOrSetUUID(create, database);
         guard->releaseTableLock();
-        return typeid_cast<DatabaseReplicated *>(database.get())->tryEnqueueReplicatedDDL(query_ptr, context);
+        return typeid_cast<DatabaseReplicated *>(database.get())->tryEnqueueReplicatedDDL(query_ptr, getContext());
     }
 
     if (database->isDictionaryExist(dictionary_name))
@@ -1117,29 +1163,28 @@ BlockIO InterpreterCreateQuery::createDictionary(ASTCreateQuery & create)
 
     if (create.attach)
     {
-        auto config = getDictionaryConfigurationFromAST(create, context);
+        auto config = getDictionaryConfigurationFromAST(create, getContext());
         auto modification_time = database->getObjectMetadataModificationTime(dictionary_name);
         database->attachDictionary(dictionary_name, DictionaryAttachInfo{query_ptr, config, modification_time});
     }
     else
-        database->createDictionary(context, dictionary_name, query_ptr);
+        database->createDictionary(getContext(), dictionary_name, query_ptr);
 
     return {};
 }
 
-void InterpreterCreateQuery::prepareOnClusterQuery(ASTCreateQuery & create, const Context & context, const String & cluster_name)
+void InterpreterCreateQuery::prepareOnClusterQuery(ASTCreateQuery & create, ContextPtr local_context, const String & cluster_name)
 {
     if (create.attach)
         return;
 
     /// For CREATE query generate UUID on initiator, so it will be the same on all hosts.
     /// It will be ignored if database does not support UUIDs.
-    if (create.uuid == UUIDHelpers::Nil)
-        create.uuid = UUIDHelpers::generateV4();
+    generateUUIDForTable(create);
 
     /// For cross-replication cluster we cannot use UUID in replica path.
-    String cluster_name_expanded = context.getMacros()->expand(cluster_name);
-    ClusterPtr cluster = context.getCluster(cluster_name_expanded);
+    String cluster_name_expanded = local_context->getMacros()->expand(cluster_name);
+    ClusterPtr cluster = local_context->getCluster(cluster_name_expanded);
 
     if (cluster->maybeCrossReplication())
     {
@@ -1163,7 +1208,7 @@ void InterpreterCreateQuery::prepareOnClusterQuery(ASTCreateQuery & create, cons
             Macros::MacroExpansionInfo info;
             info.table_id.uuid = create.uuid;
             info.ignore_unknown = true;
-            context.getMacros()->expand(zk_path, info);
+            local_context->getMacros()->expand(zk_path, info);
             if (!info.expanded_uuid)
                 return;
         }
@@ -1181,11 +1226,11 @@ BlockIO InterpreterCreateQuery::execute()
     auto & create = query_ptr->as<ASTCreateQuery &>();
     if (!create.cluster.empty())
     {
-        prepareOnClusterQuery(create, context, create.cluster);
-        return executeDDLQueryOnCluster(query_ptr, context, getRequiredAccess());
+        prepareOnClusterQuery(create, getContext(), create.cluster);
+        return executeDDLQueryOnCluster(query_ptr, getContext(), getRequiredAccess());
     }
 
-    context.checkAccess(getRequiredAccess());
+    getContext()->checkAccess(getRequiredAccess());
 
     ASTQueryWithOutput::resetOutputASTIfExist(create);
 
@@ -1249,12 +1294,12 @@ AccessRightsElements InterpreterCreateQuery::getRequiredAccess() const
     return required_access;
 }
 
-void InterpreterCreateQuery::extendQueryLogElemImpl(QueryLogElement & elem, const ASTPtr &, const Context &) const
+void InterpreterCreateQuery::extendQueryLogElemImpl(QueryLogElement & elem, const ASTPtr &, ContextPtr) const
 {
     elem.query_kind = "Create";
     if (!as_table_saved.empty())
     {
-        String database = backQuoteIfNeed(as_database_saved.empty() ? context.getCurrentDatabase() : as_database_saved);
+        String database = backQuoteIfNeed(as_database_saved.empty() ? getContext()->getCurrentDatabase() : as_database_saved);
         elem.query_databases.insert(database);
         elem.query_tables.insert(database + "." + backQuoteIfNeed(as_table_saved));
     }
diff --git a/src/Interpreters/InterpreterCreateQuery.h b/src/Interpreters/InterpreterCreateQuery.h
index d88357fe412..f674bf19123 100644
--- a/src/Interpreters/InterpreterCreateQuery.h
+++ b/src/Interpreters/InterpreterCreateQuery.h
@@ -1,18 +1,17 @@
 #pragma once
 
+#include <Access/AccessRightsElement.h>
 #include <Interpreters/IInterpreter.h>
 #include <Storages/ColumnsDescription.h>
+#include <Storages/ConstraintsDescription.h>
 #include <Storages/IStorage_fwd.h>
 #include <Storages/StorageInMemoryMetadata.h>
-#include <Storages/ConstraintsDescription.h>
 #include <Common/ThreadPool.h>
-#include <Access/AccessRightsElement.h>
 
 
 namespace DB
 {
 
-class Context;
 class ASTCreateQuery;
 class ASTExpressionList;
 class ASTConstraintDeclaration;
@@ -23,10 +22,10 @@ using DatabasePtr = std::shared_ptr<IDatabase>;
 /** Allows to create new table or database,
   *  or create an object for existing table or database.
   */
-class InterpreterCreateQuery : public IInterpreter
+class InterpreterCreateQuery : public IInterpreter, WithContext
 {
 public:
-    InterpreterCreateQuery(const ASTPtr & query_ptr_, Context & context_);
+    InterpreterCreateQuery(const ASTPtr & query_ptr_, ContextPtr context_);
 
     BlockIO execute() override;
 
@@ -54,12 +53,12 @@ public:
 
     /// Obtain information about columns, their types, default values and column comments,
     ///  for case when columns in CREATE query is specified explicitly.
-    static ColumnsDescription getColumnsDescription(const ASTExpressionList & columns, const Context & context, bool sanity_check_compression_codecs);
+    static ColumnsDescription getColumnsDescription(const ASTExpressionList & columns, ContextPtr context, bool attach);
     static ConstraintsDescription getConstraintsDescription(const ASTExpressionList * constraints);
 
-    static void prepareOnClusterQuery(ASTCreateQuery & create, const Context & context, const String & cluster_name);
+    static void prepareOnClusterQuery(ASTCreateQuery & create, ContextPtr context, const String & cluster_name);
 
-    void extendQueryLogElemImpl(QueryLogElement & elem, const ASTPtr & ast, const Context &) const override;
+    void extendQueryLogElemImpl(QueryLogElement & elem, const ASTPtr & ast, ContextPtr) const override;
 
 private:
     struct TableProperties
@@ -88,7 +87,6 @@ private:
     void assertOrSetUUID(ASTCreateQuery & create, const DatabasePtr & database) const;
 
     ASTPtr query_ptr;
-    Context & context;
 
     /// Skip safety threshold when loading tables.
     bool has_force_restore_data_flag = false;
diff --git a/src/Interpreters/InterpreterCreateQuotaQuery.cpp b/src/Interpreters/InterpreterCreateQuotaQuery.cpp
index ff30a2fff47..223215624b3 100644
--- a/src/Interpreters/InterpreterCreateQuotaQuery.cpp
+++ b/src/Interpreters/InterpreterCreateQuotaQuery.cpp
@@ -73,18 +73,18 @@ namespace
 BlockIO InterpreterCreateQuotaQuery::execute()
 {
     auto & query = query_ptr->as<ASTCreateQuotaQuery &>();
-    auto & access_control = context.getAccessControlManager();
-    context.checkAccess(query.alter ? AccessType::ALTER_QUOTA : AccessType::CREATE_QUOTA);
+    auto & access_control = getContext()->getAccessControlManager();
+    getContext()->checkAccess(query.alter ? AccessType::ALTER_QUOTA : AccessType::CREATE_QUOTA);
 
     if (!query.cluster.empty())
     {
-        query.replaceCurrentUserTagWithName(context.getUserName());
-        return executeDDLQueryOnCluster(query_ptr, context);
+        query.replaceCurrentUserTag(getContext()->getUserName());
+        return executeDDLQueryOnCluster(query_ptr, getContext());
     }
 
     std::optional<RolesOrUsersSet> roles_from_query;
     if (query.roles)
-        roles_from_query = RolesOrUsersSet{*query.roles, access_control, context.getUserID()};
+        roles_from_query = RolesOrUsersSet{*query.roles, access_control, getContext()->getUserID()};
 
     if (query.alter)
     {
diff --git a/src/Interpreters/InterpreterCreateQuotaQuery.h b/src/Interpreters/InterpreterCreateQuotaQuery.h
index ca0e7b44713..d8edd24b2d9 100644
--- a/src/Interpreters/InterpreterCreateQuotaQuery.h
+++ b/src/Interpreters/InterpreterCreateQuotaQuery.h
@@ -2,19 +2,18 @@
 
 #include <Interpreters/IInterpreter.h>
 #include <Parsers/IAST_fwd.h>
-#include <optional>
 
 
 namespace DB
 {
+
 class ASTCreateQuotaQuery;
 struct Quota;
 
-
-class InterpreterCreateQuotaQuery : public IInterpreter
+class InterpreterCreateQuotaQuery : public IInterpreter, WithContext
 {
 public:
-    InterpreterCreateQuotaQuery(const ASTPtr & query_ptr_, Context & context_) : query_ptr(query_ptr_), context(context_) {}
+    InterpreterCreateQuotaQuery(const ASTPtr & query_ptr_, ContextPtr context_) : WithContext(context_), query_ptr(query_ptr_) {}
 
     BlockIO execute() override;
 
@@ -25,6 +24,6 @@ public:
 
 private:
     ASTPtr query_ptr;
-    Context & context;
 };
+
 }
diff --git a/src/Interpreters/InterpreterCreateRoleQuery.cpp b/src/Interpreters/InterpreterCreateRoleQuery.cpp
index 72ad3234b95..b9debc259be 100644
--- a/src/Interpreters/InterpreterCreateRoleQuery.cpp
+++ b/src/Interpreters/InterpreterCreateRoleQuery.cpp
@@ -34,14 +34,14 @@ namespace
 BlockIO InterpreterCreateRoleQuery::execute()
 {
     const auto & query = query_ptr->as<const ASTCreateRoleQuery &>();
-    auto & access_control = context.getAccessControlManager();
+    auto & access_control = getContext()->getAccessControlManager();
     if (query.alter)
-        context.checkAccess(AccessType::ALTER_ROLE);
+        getContext()->checkAccess(AccessType::ALTER_ROLE);
     else
-        context.checkAccess(AccessType::CREATE_ROLE);
+        getContext()->checkAccess(AccessType::CREATE_ROLE);
 
     if (!query.cluster.empty())
-        return executeDDLQueryOnCluster(query_ptr, context);
+        return executeDDLQueryOnCluster(query_ptr, getContext());
 
     std::optional<SettingsProfileElements> settings_from_query;
     if (query.settings)
diff --git a/src/Interpreters/InterpreterCreateRoleQuery.h b/src/Interpreters/InterpreterCreateRoleQuery.h
index 768fd6d1d6b..18b3f946837 100644
--- a/src/Interpreters/InterpreterCreateRoleQuery.h
+++ b/src/Interpreters/InterpreterCreateRoleQuery.h
@@ -6,14 +6,14 @@
 
 namespace DB
 {
+
 class ASTCreateRoleQuery;
 struct Role;
 
-
-class InterpreterCreateRoleQuery : public IInterpreter
+class InterpreterCreateRoleQuery : public IInterpreter, WithContext
 {
 public:
-    InterpreterCreateRoleQuery(const ASTPtr & query_ptr_, Context & context_) : query_ptr(query_ptr_), context(context_) {}
+    InterpreterCreateRoleQuery(const ASTPtr & query_ptr_, ContextPtr context_) : WithContext(context_), query_ptr(query_ptr_) {}
 
     BlockIO execute() override;
 
@@ -21,6 +21,6 @@ public:
 
 private:
     ASTPtr query_ptr;
-    Context & context;
 };
+
 }
diff --git a/src/Interpreters/InterpreterCreateRowPolicyQuery.cpp b/src/Interpreters/InterpreterCreateRowPolicyQuery.cpp
index 8f1c5b061e0..5e4b9b30e66 100644
--- a/src/Interpreters/InterpreterCreateRowPolicyQuery.cpp
+++ b/src/Interpreters/InterpreterCreateRowPolicyQuery.cpp
@@ -44,21 +44,21 @@ namespace
 BlockIO InterpreterCreateRowPolicyQuery::execute()
 {
     auto & query = query_ptr->as<ASTCreateRowPolicyQuery &>();
-    auto & access_control = context.getAccessControlManager();
-    context.checkAccess(query.alter ? AccessType::ALTER_ROW_POLICY : AccessType::CREATE_ROW_POLICY);
+    auto & access_control = getContext()->getAccessControlManager();
+    getContext()->checkAccess(query.alter ? AccessType::ALTER_ROW_POLICY : AccessType::CREATE_ROW_POLICY);
 
     if (!query.cluster.empty())
     {
-        query.replaceCurrentUserTagWithName(context.getUserName());
-        return executeDDLQueryOnCluster(query_ptr, context);
+        query.replaceCurrentUserTag(getContext()->getUserName());
+        return executeDDLQueryOnCluster(query_ptr, getContext());
     }
 
     assert(query.names->cluster.empty());
     std::optional<RolesOrUsersSet> roles_from_query;
     if (query.roles)
-        roles_from_query = RolesOrUsersSet{*query.roles, access_control, context.getUserID()};
+        roles_from_query = RolesOrUsersSet{*query.roles, access_control, getContext()->getUserID()};
 
-    query.replaceEmptyDatabaseWithCurrent(context.getCurrentDatabase());
+    query.replaceEmptyDatabase(getContext()->getCurrentDatabase());
 
     if (query.alter)
     {
diff --git a/src/Interpreters/InterpreterCreateRowPolicyQuery.h b/src/Interpreters/InterpreterCreateRowPolicyQuery.h
index feb583310c0..10167bac669 100644
--- a/src/Interpreters/InterpreterCreateRowPolicyQuery.h
+++ b/src/Interpreters/InterpreterCreateRowPolicyQuery.h
@@ -2,19 +2,18 @@
 
 #include <Interpreters/IInterpreter.h>
 #include <Parsers/IAST_fwd.h>
-#include <optional>
 
 
 namespace DB
 {
+
 class ASTCreateRowPolicyQuery;
 struct RowPolicy;
 
-
-class InterpreterCreateRowPolicyQuery : public IInterpreter
+class InterpreterCreateRowPolicyQuery : public IInterpreter, WithContext
 {
 public:
-    InterpreterCreateRowPolicyQuery(const ASTPtr & query_ptr_, Context & context_) : query_ptr(query_ptr_), context(context_) {}
+    InterpreterCreateRowPolicyQuery(const ASTPtr & query_ptr_, ContextPtr context_) : WithContext(context_), query_ptr(query_ptr_) {}
 
     BlockIO execute() override;
 
@@ -22,6 +21,6 @@ public:
 
 private:
     ASTPtr query_ptr;
-    Context & context;
 };
+
 }
diff --git a/src/Interpreters/InterpreterCreateSettingsProfileQuery.cpp b/src/Interpreters/InterpreterCreateSettingsProfileQuery.cpp
index b65225db16c..fb5fb258b10 100644
--- a/src/Interpreters/InterpreterCreateSettingsProfileQuery.cpp
+++ b/src/Interpreters/InterpreterCreateSettingsProfileQuery.cpp
@@ -42,16 +42,16 @@ namespace
 BlockIO InterpreterCreateSettingsProfileQuery::execute()
 {
     auto & query = query_ptr->as<ASTCreateSettingsProfileQuery &>();
-    auto & access_control = context.getAccessControlManager();
+    auto & access_control = getContext()->getAccessControlManager();
     if (query.alter)
-        context.checkAccess(AccessType::ALTER_SETTINGS_PROFILE);
+        getContext()->checkAccess(AccessType::ALTER_SETTINGS_PROFILE);
     else
-        context.checkAccess(AccessType::CREATE_SETTINGS_PROFILE);
+        getContext()->checkAccess(AccessType::CREATE_SETTINGS_PROFILE);
 
     if (!query.cluster.empty())
     {
-        query.replaceCurrentUserTagWithName(context.getUserName());
-        return executeDDLQueryOnCluster(query_ptr, context);
+        query.replaceCurrentUserTag(getContext()->getUserName());
+        return executeDDLQueryOnCluster(query_ptr, getContext());
     }
 
     std::optional<SettingsProfileElements> settings_from_query;
@@ -60,7 +60,7 @@ BlockIO InterpreterCreateSettingsProfileQuery::execute()
 
     std::optional<RolesOrUsersSet> roles_from_query;
     if (query.to_roles)
-        roles_from_query = RolesOrUsersSet{*query.to_roles, access_control, context.getUserID()};
+        roles_from_query = RolesOrUsersSet{*query.to_roles, access_control, getContext()->getUserID()};
 
     if (query.alter)
     {
diff --git a/src/Interpreters/InterpreterCreateSettingsProfileQuery.h b/src/Interpreters/InterpreterCreateSettingsProfileQuery.h
index fd420779cf4..9ef1f0354a9 100644
--- a/src/Interpreters/InterpreterCreateSettingsProfileQuery.h
+++ b/src/Interpreters/InterpreterCreateSettingsProfileQuery.h
@@ -6,14 +6,14 @@
 
 namespace DB
 {
+
 class ASTCreateSettingsProfileQuery;
 struct SettingsProfile;
 
-
-class InterpreterCreateSettingsProfileQuery : public IInterpreter
+class InterpreterCreateSettingsProfileQuery : public IInterpreter, WithContext
 {
 public:
-    InterpreterCreateSettingsProfileQuery(const ASTPtr & query_ptr_, Context & context_) : query_ptr(query_ptr_), context(context_) {}
+    InterpreterCreateSettingsProfileQuery(const ASTPtr & query_ptr_, ContextPtr context_) : WithContext(context_), query_ptr(query_ptr_) {}
 
     BlockIO execute() override;
 
@@ -21,6 +21,6 @@ public:
 
 private:
     ASTPtr query_ptr;
-    Context & context;
 };
+
 }
diff --git a/src/Interpreters/InterpreterCreateUserQuery.cpp b/src/Interpreters/InterpreterCreateUserQuery.cpp
index c9b087de5b4..7f4969ff9ef 100644
--- a/src/Interpreters/InterpreterCreateUserQuery.cpp
+++ b/src/Interpreters/InterpreterCreateUserQuery.cpp
@@ -20,7 +20,8 @@ namespace
         const ASTCreateUserQuery & query,
         const std::shared_ptr<ASTUserNameWithHost> & override_name,
         const std::optional<RolesOrUsersSet> & override_default_roles,
-        const std::optional<SettingsProfileElements> & override_settings)
+        const std::optional<SettingsProfileElements> & override_settings,
+        const std::optional<RolesOrUsersSet> & override_grantees)
     {
         if (override_name)
             user.setName(override_name->toString());
@@ -62,6 +63,11 @@ namespace
             user.settings = *override_settings;
         else if (query.settings)
             user.settings = *query.settings;
+
+        if (override_grantees)
+            user.grantees = *override_grantees;
+        else if (query.grantees)
+            user.grantees = *query.grantees;
     }
 }
 
@@ -69,8 +75,8 @@ namespace
 BlockIO InterpreterCreateUserQuery::execute()
 {
     const auto & query = query_ptr->as<const ASTCreateUserQuery &>();
-    auto & access_control = context.getAccessControlManager();
-    auto access = context.getAccess();
+    auto & access_control = getContext()->getAccessControlManager();
+    auto access = getContext()->getAccess();
     access->checkAccess(query.alter ? AccessType::ALTER_USER : AccessType::CREATE_USER);
 
     std::optional<RolesOrUsersSet> default_roles_from_query;
@@ -85,7 +91,7 @@ BlockIO InterpreterCreateUserQuery::execute()
     }
 
     if (!query.cluster.empty())
-        return executeDDLQueryOnCluster(query_ptr, context);
+        return executeDDLQueryOnCluster(query_ptr, getContext());
 
     std::optional<SettingsProfileElements> settings_from_query;
     if (query.settings)
@@ -93,12 +99,17 @@ BlockIO InterpreterCreateUserQuery::execute()
 
     if (query.alter)
     {
+        std::optional<RolesOrUsersSet> grantees_from_query;
+        if (query.grantees)
+            grantees_from_query = RolesOrUsersSet{*query.grantees, access_control};
+
         auto update_func = [&](const AccessEntityPtr & entity) -> AccessEntityPtr
         {
             auto updated_user = typeid_cast<std::shared_ptr<User>>(entity->clone());
-            updateUserFromQueryImpl(*updated_user, query, {}, default_roles_from_query, settings_from_query);
+            updateUserFromQueryImpl(*updated_user, query, {}, default_roles_from_query, settings_from_query, grantees_from_query);
             return updated_user;
         };
+
         Strings names = query.names->toStrings();
         if (query.if_exists)
         {
@@ -114,16 +125,28 @@ BlockIO InterpreterCreateUserQuery::execute()
         for (const auto & name : *query.names)
         {
             auto new_user = std::make_shared<User>();
-            updateUserFromQueryImpl(*new_user, query, name, default_roles_from_query, settings_from_query);
+            updateUserFromQueryImpl(*new_user, query, name, default_roles_from_query, settings_from_query, RolesOrUsersSet::AllTag{});
             new_users.emplace_back(std::move(new_user));
         }
 
+        std::vector<UUID> ids;
         if (query.if_not_exists)
-            access_control.tryInsert(new_users);
+            ids = access_control.tryInsert(new_users);
         else if (query.or_replace)
-            access_control.insertOrReplace(new_users);
+            ids = access_control.insertOrReplace(new_users);
         else
-            access_control.insert(new_users);
+            ids = access_control.insert(new_users);
+
+        if (query.grantees)
+        {
+            RolesOrUsersSet grantees_from_query = RolesOrUsersSet{*query.grantees, access_control};
+            access_control.update(ids, [&](const AccessEntityPtr & entity) -> AccessEntityPtr
+            {
+                auto updated_user = typeid_cast<std::shared_ptr<User>>(entity->clone());
+                updated_user->grantees = grantees_from_query;
+                return updated_user;
+            });
+        }
     }
 
     return {};
@@ -132,7 +155,7 @@ BlockIO InterpreterCreateUserQuery::execute()
 
 void InterpreterCreateUserQuery::updateUserFromQuery(User & user, const ASTCreateUserQuery & query)
 {
-    updateUserFromQueryImpl(user, query, {}, {}, {});
+    updateUserFromQueryImpl(user, query, {}, {}, {}, {});
 }
 
 }
diff --git a/src/Interpreters/InterpreterCreateUserQuery.h b/src/Interpreters/InterpreterCreateUserQuery.h
index e5b614b5cbb..e9f4e82e767 100644
--- a/src/Interpreters/InterpreterCreateUserQuery.h
+++ b/src/Interpreters/InterpreterCreateUserQuery.h
@@ -6,14 +6,14 @@
 
 namespace DB
 {
+
 class ASTCreateUserQuery;
 struct User;
 
-
-class InterpreterCreateUserQuery : public IInterpreter
+class InterpreterCreateUserQuery : public IInterpreter, WithContext
 {
 public:
-    InterpreterCreateUserQuery(const ASTPtr & query_ptr_, Context & context_) : query_ptr(query_ptr_), context(context_) {}
+    InterpreterCreateUserQuery(const ASTPtr & query_ptr_, ContextPtr context_) : WithContext(context_), query_ptr(query_ptr_) {}
 
     BlockIO execute() override;
 
@@ -21,6 +21,6 @@ public:
 
 private:
     ASTPtr query_ptr;
-    Context & context;
 };
+
 }
diff --git a/src/Interpreters/InterpreterDescribeQuery.cpp b/src/Interpreters/InterpreterDescribeQuery.cpp
index 27d8ac48bc8..705e52da72c 100644
--- a/src/Interpreters/InterpreterDescribeQuery.cpp
+++ b/src/Interpreters/InterpreterDescribeQuery.cpp
@@ -69,20 +69,20 @@ BlockInputStreamPtr InterpreterDescribeQuery::executeImpl()
     if (table_expression.subquery)
     {
         auto names_and_types = InterpreterSelectWithUnionQuery::getSampleBlock(
-            table_expression.subquery->children.at(0), context).getNamesAndTypesList();
+            table_expression.subquery->children.at(0), getContext()).getNamesAndTypesList();
         columns = ColumnsDescription(std::move(names_and_types));
     }
     else if (table_expression.table_function)
     {
-        TableFunctionPtr table_function_ptr = TableFunctionFactory::instance().get(table_expression.table_function, context);
-        columns = table_function_ptr->getActualTableStructure(context);
+        TableFunctionPtr table_function_ptr = TableFunctionFactory::instance().get(table_expression.table_function, getContext());
+        columns = table_function_ptr->getActualTableStructure(getContext());
     }
     else
     {
-        auto table_id = context.resolveStorageID(table_expression.database_and_table_name);
-        context.checkAccess(AccessType::SHOW_COLUMNS, table_id);
-        auto table = DatabaseCatalog::instance().getTable(table_id, context);
-        auto table_lock = table->lockForShare(context.getInitialQueryId(), context.getSettingsRef().lock_acquire_timeout);
+        auto table_id = getContext()->resolveStorageID(table_expression.database_and_table_name);
+        getContext()->checkAccess(AccessType::SHOW_COLUMNS, table_id);
+        auto table = DatabaseCatalog::instance().getTable(table_id, getContext());
+        auto table_lock = table->lockForShare(getContext()->getInitialQueryId(), getContext()->getSettingsRef().lock_acquire_timeout);
         auto metadata_snapshot = table->getInMemoryMetadataPtr();
         columns = metadata_snapshot->getColumns();
     }
diff --git a/src/Interpreters/InterpreterDescribeQuery.h b/src/Interpreters/InterpreterDescribeQuery.h
index 4fafe61f229..627d1ca0353 100644
--- a/src/Interpreters/InterpreterDescribeQuery.h
+++ b/src/Interpreters/InterpreterDescribeQuery.h
@@ -7,16 +7,12 @@
 namespace DB
 {
 
-class Context;
-
-
 /** Return names, types and other information about columns in specified table.
   */
-class InterpreterDescribeQuery : public IInterpreter
+class InterpreterDescribeQuery : public IInterpreter, WithContext
 {
 public:
-    InterpreterDescribeQuery(const ASTPtr & query_ptr_, const Context & context_)
-        : query_ptr(query_ptr_), context(context_) {}
+    InterpreterDescribeQuery(const ASTPtr & query_ptr_, ContextPtr context_) : WithContext(context_), query_ptr(query_ptr_) {}
 
     BlockIO execute() override;
 
@@ -24,7 +20,6 @@ public:
 
 private:
     ASTPtr query_ptr;
-    const Context & context;
 
     BlockInputStreamPtr executeImpl();
 };
diff --git a/src/Interpreters/InterpreterDropAccessEntityQuery.cpp b/src/Interpreters/InterpreterDropAccessEntityQuery.cpp
index e86f8361100..a9b8db6d74e 100644
--- a/src/Interpreters/InterpreterDropAccessEntityQuery.cpp
+++ b/src/Interpreters/InterpreterDropAccessEntityQuery.cpp
@@ -25,13 +25,13 @@ using EntityType = IAccessEntity::Type;
 BlockIO InterpreterDropAccessEntityQuery::execute()
 {
     auto & query = query_ptr->as<ASTDropAccessEntityQuery &>();
-    auto & access_control = context.getAccessControlManager();
-    context.checkAccess(getRequiredAccess());
+    auto & access_control = getContext()->getAccessControlManager();
+    getContext()->checkAccess(getRequiredAccess());
 
     if (!query.cluster.empty())
-        return executeDDLQueryOnCluster(query_ptr, context);
+        return executeDDLQueryOnCluster(query_ptr, getContext());
 
-    query.replaceEmptyDatabaseWithCurrent(context.getCurrentDatabase());
+    query.replaceEmptyDatabase(getContext()->getCurrentDatabase());
 
     auto do_drop = [&](const Strings & names)
     {
diff --git a/src/Interpreters/InterpreterDropAccessEntityQuery.h b/src/Interpreters/InterpreterDropAccessEntityQuery.h
index 0db68a0ad78..7f0f6348610 100644
--- a/src/Interpreters/InterpreterDropAccessEntityQuery.h
+++ b/src/Interpreters/InterpreterDropAccessEntityQuery.h
@@ -6,12 +6,13 @@
 
 namespace DB
 {
+
 class AccessRightsElements;
 
-class InterpreterDropAccessEntityQuery : public IInterpreter
+class InterpreterDropAccessEntityQuery : public IInterpreter, WithContext
 {
 public:
-    InterpreterDropAccessEntityQuery(const ASTPtr & query_ptr_, Context & context_) : query_ptr(query_ptr_), context(context_) {}
+    InterpreterDropAccessEntityQuery(const ASTPtr & query_ptr_, ContextPtr context_) : WithContext(context_), query_ptr(query_ptr_) {}
 
     BlockIO execute() override;
 
@@ -19,6 +20,6 @@ private:
     AccessRightsElements getRequiredAccess() const;
 
     ASTPtr query_ptr;
-    Context & context;
 };
+
 }
diff --git a/src/Interpreters/InterpreterDropQuery.cpp b/src/Interpreters/InterpreterDropQuery.cpp
index 33e93a79c41..8ac6a0ae3a8 100644
--- a/src/Interpreters/InterpreterDropQuery.cpp
+++ b/src/Interpreters/InterpreterDropQuery.cpp
@@ -43,16 +43,18 @@ static DatabasePtr tryGetDatabase(const String & database_name, bool if_exists)
 }
 
 
-InterpreterDropQuery::InterpreterDropQuery(const ASTPtr & query_ptr_, Context & context_) : query_ptr(query_ptr_), context(context_) {}
+InterpreterDropQuery::InterpreterDropQuery(const ASTPtr & query_ptr_, ContextPtr context_) : WithContext(context_), query_ptr(query_ptr_)
+{
+}
 
 
 BlockIO InterpreterDropQuery::execute()
 {
     auto & drop = query_ptr->as<ASTDropQuery &>();
     if (!drop.cluster.empty())
-        return executeDDLQueryOnCluster(query_ptr, context, getRequiredAccessForDDLOnCluster());
+        return executeDDLQueryOnCluster(query_ptr, getContext(), getRequiredAccessForDDLOnCluster());
 
-    if (context.getSettingsRef().database_atomic_wait_for_drop_and_detach_synchronously)
+    if (getContext()->getSettingsRef().database_atomic_wait_for_drop_and_detach_synchronously)
         drop.no_delay = true;
 
     if (!drop.table.empty())
@@ -82,7 +84,7 @@ void InterpreterDropQuery::waitForTableToBeActuallyDroppedOrDetached(const ASTDr
         db->waitDetachedTableNotInUse(uuid_to_wait);
 }
 
-BlockIO InterpreterDropQuery::executeToTable(const ASTDropQuery & query)
+BlockIO InterpreterDropQuery::executeToTable(ASTDropQuery & query)
 {
     DatabasePtr database;
     UUID table_to_wait_on = UUIDHelpers::Nil;
@@ -92,16 +94,16 @@ BlockIO InterpreterDropQuery::executeToTable(const ASTDropQuery & query)
     return res;
 }
 
-BlockIO InterpreterDropQuery::executeToTableImpl(const ASTDropQuery & query, DatabasePtr & db, UUID & uuid_to_wait)
+BlockIO InterpreterDropQuery::executeToTableImpl(ASTDropQuery & query, DatabasePtr & db, UUID & uuid_to_wait)
 {
     /// NOTE: it does not contain UUID, we will resolve it with locked DDLGuard
     auto table_id = StorageID(query);
     if (query.temporary || table_id.database_name.empty())
     {
-        if (context.tryResolveStorageID(table_id, Context::ResolveExternal))
+        if (getContext()->tryResolveStorageID(table_id, Context::ResolveExternal))
             return executeToTemporaryTable(table_id.getTableName(), query.kind);
         else
-            table_id.database_name = context.getCurrentDatabase();
+            query.database = table_id.database_name = getContext()->getCurrentDatabase();
     }
 
     if (query.temporary)
@@ -115,8 +117,8 @@ BlockIO InterpreterDropQuery::executeToTableImpl(const ASTDropQuery & query, Dat
     auto ddl_guard = (!query.no_ddl_lock ? DatabaseCatalog::instance().getDDLGuard(table_id.database_name, table_id.table_name) : nullptr);
 
     /// If table was already dropped by anyone, an exception will be thrown
-    auto [database, table] = query.if_exists ? DatabaseCatalog::instance().tryGetDatabaseAndTable(table_id, context)
-                                             : DatabaseCatalog::instance().getDatabaseAndTable(table_id, context);
+    auto [database, table] = query.if_exists ? DatabaseCatalog::instance().tryGetDatabaseAndTable(table_id, getContext())
+                                             : DatabaseCatalog::instance().getDatabaseAndTable(table_id, getContext());
 
     if (database && table)
     {
@@ -129,40 +131,36 @@ BlockIO InterpreterDropQuery::executeToTableImpl(const ASTDropQuery & query, Dat
         /// Prevents recursive drop from drop database query. The original query must specify a table.
         bool is_drop_or_detach_database = query_ptr->as<ASTDropQuery>()->table.empty();
         bool is_replicated_ddl_query = typeid_cast<DatabaseReplicated *>(database.get()) &&
-                                       context.getClientInfo().query_kind != ClientInfo::QueryKind::SECONDARY_QUERY &&
+                                       getContext()->getClientInfo().query_kind != ClientInfo::QueryKind::SECONDARY_QUERY &&
                                        !is_drop_or_detach_database;
         if (is_replicated_ddl_query)
         {
-            if (query.kind == ASTDropQuery::Kind::Detach && !query.permanently)
-                throw Exception(ErrorCodes::INCORRECT_QUERY, "DETACH TABLE is not allowed for Replicated databases. "
-                                                             "Use DETACH TABLE PERMANENTLY or SYSTEM RESTART REPLICA");
-
             if (query.kind == ASTDropQuery::Kind::Detach)
-                context.checkAccess(table->isView() ? AccessType::DROP_VIEW : AccessType::DROP_TABLE, table_id);
+                getContext()->checkAccess(table->isView() ? AccessType::DROP_VIEW : AccessType::DROP_TABLE, table_id);
             else if (query.kind == ASTDropQuery::Kind::Truncate)
-                context.checkAccess(AccessType::TRUNCATE, table_id);
+                getContext()->checkAccess(AccessType::TRUNCATE, table_id);
             else if (query.kind == ASTDropQuery::Kind::Drop)
-                context.checkAccess(table->isView() ? AccessType::DROP_VIEW : AccessType::DROP_TABLE, table_id);
+                getContext()->checkAccess(table->isView() ? AccessType::DROP_VIEW : AccessType::DROP_TABLE, table_id);
 
             ddl_guard->releaseTableLock();
             table.reset();
-            return typeid_cast<DatabaseReplicated *>(database.get())->tryEnqueueReplicatedDDL(query.clone(), context);
+            return typeid_cast<DatabaseReplicated *>(database.get())->tryEnqueueReplicatedDDL(query.clone(), getContext());
         }
 
         if (query.kind == ASTDropQuery::Kind::Detach)
         {
-            context.checkAccess(table->isView() ? AccessType::DROP_VIEW : AccessType::DROP_TABLE, table_id);
+            getContext()->checkAccess(table->isView() ? AccessType::DROP_VIEW : AccessType::DROP_TABLE, table_id);
             table->checkTableCanBeDetached();
             table->shutdown();
             TableExclusiveLockHolder table_lock;
 
             if (database->getUUID() == UUIDHelpers::Nil)
-                table_lock = table->lockExclusively(context.getCurrentQueryId(), context.getSettingsRef().lock_acquire_timeout);
+                table_lock = table->lockExclusively(getContext()->getCurrentQueryId(), getContext()->getSettingsRef().lock_acquire_timeout);
 
             if (query.permanently)
             {
                 /// Drop table from memory, don't touch data, metadata file renamed and will be skipped during server restart
-                database->detachTablePermanently(context, table_id.table_name);
+                database->detachTablePermanently(getContext(), table_id.table_name);
             }
             else
             {
@@ -172,26 +170,26 @@ BlockIO InterpreterDropQuery::executeToTableImpl(const ASTDropQuery & query, Dat
         }
         else if (query.kind == ASTDropQuery::Kind::Truncate)
         {
-            context.checkAccess(AccessType::TRUNCATE, table_id);
+            getContext()->checkAccess(AccessType::TRUNCATE, table_id);
             table->checkTableCanBeDropped();
 
-            auto table_lock = table->lockExclusively(context.getCurrentQueryId(), context.getSettingsRef().lock_acquire_timeout);
+            auto table_lock = table->lockExclusively(getContext()->getCurrentQueryId(), getContext()->getSettingsRef().lock_acquire_timeout);
             auto metadata_snapshot = table->getInMemoryMetadataPtr();
             /// Drop table data, don't touch metadata
-            table->truncate(query_ptr, metadata_snapshot, context, table_lock);
+            table->truncate(query_ptr, metadata_snapshot, getContext(), table_lock);
         }
         else if (query.kind == ASTDropQuery::Kind::Drop)
         {
-            context.checkAccess(table->isView() ? AccessType::DROP_VIEW : AccessType::DROP_TABLE, table_id);
+            getContext()->checkAccess(table->isView() ? AccessType::DROP_VIEW : AccessType::DROP_TABLE, table_id);
             table->checkTableCanBeDropped();
 
             table->shutdown();
 
             TableExclusiveLockHolder table_lock;
             if (database->getUUID() == UUIDHelpers::Nil)
-                table_lock = table->lockExclusively(context.getCurrentQueryId(), context.getSettingsRef().lock_acquire_timeout);
+                table_lock = table->lockExclusively(getContext()->getCurrentQueryId(), getContext()->getSettingsRef().lock_acquire_timeout);
 
-            database->dropTable(context, table_id.table_name, query.no_delay);
+            database->dropTable(getContext(), table_id.table_name, query.no_delay);
         }
 
         db = database;
@@ -213,25 +211,25 @@ BlockIO InterpreterDropQuery::executeToDictionary(
     if (is_temporary)
         throw Exception("Temporary dictionaries are not possible.", ErrorCodes::SYNTAX_ERROR);
 
-    String database_name = context.resolveDatabase(database_name_);
+    String database_name = getContext()->resolveDatabase(database_name_);
 
     auto ddl_guard = (!no_ddl_lock ? DatabaseCatalog::instance().getDDLGuard(database_name, dictionary_name) : nullptr);
-
+    query_ptr->as<ASTDropQuery>()->database = database_name;
     DatabasePtr database = tryGetDatabase(database_name, if_exists);
 
     bool is_drop_or_detach_database = query_ptr->as<ASTDropQuery>()->table.empty();
     bool is_replicated_ddl_query = typeid_cast<DatabaseReplicated *>(database.get()) &&
-                                   context.getClientInfo().query_kind != ClientInfo::QueryKind::SECONDARY_QUERY &&
+                                   getContext()->getClientInfo().query_kind != ClientInfo::QueryKind::SECONDARY_QUERY &&
                                    !is_drop_or_detach_database;
     if (is_replicated_ddl_query)
     {
         if (kind == ASTDropQuery::Kind::Detach)
             throw Exception(ErrorCodes::INCORRECT_QUERY, "DETACH DICTIONARY is not allowed for Replicated databases.");
 
-        context.checkAccess(AccessType::DROP_DICTIONARY, database_name, dictionary_name);
+        getContext()->checkAccess(AccessType::DROP_DICTIONARY, database_name, dictionary_name);
 
         ddl_guard->releaseTableLock();
-        return typeid_cast<DatabaseReplicated *>(database.get())->tryEnqueueReplicatedDDL(query_ptr, context);
+        return typeid_cast<DatabaseReplicated *>(database.get())->tryEnqueueReplicatedDDL(query_ptr, getContext());
     }
 
     if (!database || !database->isDictionaryExist(dictionary_name))
@@ -247,7 +245,7 @@ BlockIO InterpreterDropQuery::executeToDictionary(
     if (kind == ASTDropQuery::Kind::Detach)
     {
         /// Drop dictionary from memory, don't touch data and metadata
-        context.checkAccess(AccessType::DROP_DICTIONARY, database_name, dictionary_name);
+        getContext()->checkAccess(AccessType::DROP_DICTIONARY, database_name, dictionary_name);
         database->detachDictionary(dictionary_name);
     }
     else if (kind == ASTDropQuery::Kind::Truncate)
@@ -256,8 +254,8 @@ BlockIO InterpreterDropQuery::executeToDictionary(
     }
     else if (kind == ASTDropQuery::Kind::Drop)
     {
-        context.checkAccess(AccessType::DROP_DICTIONARY, database_name, dictionary_name);
-        database->removeDictionary(context, dictionary_name);
+        getContext()->checkAccess(AccessType::DROP_DICTIONARY, database_name, dictionary_name);
+        database->removeDictionary(getContext(), dictionary_name);
     }
     return {};
 }
@@ -268,23 +266,24 @@ BlockIO InterpreterDropQuery::executeToTemporaryTable(const String & table_name,
         throw Exception("Unable to detach temporary table.", ErrorCodes::SYNTAX_ERROR);
     else
     {
-        auto & context_handle = context.hasSessionContext() ? context.getSessionContext() : context;
-        auto resolved_id = context_handle.tryResolveStorageID(StorageID("", table_name), Context::ResolveExternal);
+        auto context_handle = getContext()->hasSessionContext() ? getContext()->getSessionContext() : getContext();
+        auto resolved_id = context_handle->tryResolveStorageID(StorageID("", table_name), Context::ResolveExternal);
         if (resolved_id)
         {
-            StoragePtr table = DatabaseCatalog::instance().getTable(resolved_id, context);
+            StoragePtr table = DatabaseCatalog::instance().getTable(resolved_id, getContext());
             if (kind == ASTDropQuery::Kind::Truncate)
             {
-                auto table_lock = table->lockExclusively(context.getCurrentQueryId(), context.getSettingsRef().lock_acquire_timeout);
+                auto table_lock
+                    = table->lockExclusively(getContext()->getCurrentQueryId(), getContext()->getSettingsRef().lock_acquire_timeout);
                 /// Drop table data, don't touch metadata
                 auto metadata_snapshot = table->getInMemoryMetadataPtr();
-                table->truncate(query_ptr, metadata_snapshot, context, table_lock);
+                table->truncate(query_ptr, metadata_snapshot, getContext(), table_lock);
             }
             else if (kind == ASTDropQuery::Kind::Drop)
             {
-                context_handle.removeExternalTable(table_name);
+                context_handle->removeExternalTable(table_name);
                 table->shutdown();
-                auto table_lock = table->lockExclusively(context.getCurrentQueryId(), context.getSettingsRef().lock_acquire_timeout);
+                auto table_lock = table->lockExclusively(getContext()->getCurrentQueryId(), getContext()->getSettingsRef().lock_acquire_timeout);
                 /// Delete table data
                 table->drop();
                 table->is_dropped = true;
@@ -338,7 +337,7 @@ BlockIO InterpreterDropQuery::executeToDatabaseImpl(const ASTDropQuery & query,
         else if (query.kind == ASTDropQuery::Kind::Detach || query.kind == ASTDropQuery::Kind::Drop)
         {
             bool drop = query.kind == ASTDropQuery::Kind::Drop;
-            context.checkAccess(AccessType::DROP_DATABASE, database_name);
+            getContext()->checkAccess(AccessType::DROP_DATABASE, database_name);
 
             if (query.kind == ASTDropQuery::Kind::Detach && query.permanently)
                 throw Exception("DETACH PERMANENTLY is not implemented for databases", ErrorCodes::NOT_IMPLEMENTED);
@@ -367,7 +366,7 @@ BlockIO InterpreterDropQuery::executeToDatabaseImpl(const ASTDropQuery & query,
                 query_for_table.database = database_name;
                 query_for_table.no_delay = query.no_delay;
 
-                for (auto iterator = database->getTablesIterator(context); iterator->isValid(); iterator->next())
+                for (auto iterator = database->getTablesIterator(getContext()); iterator->isValid(); iterator->next())
                 {
                     DatabasePtr db;
                     UUID table_to_wait = UUIDHelpers::Nil;
@@ -425,7 +424,7 @@ AccessRightsElements InterpreterDropQuery::getRequiredAccessForDDLOnCluster() co
     return required_access;
 }
 
-void InterpreterDropQuery::extendQueryLogElemImpl(QueryLogElement & elem, const ASTPtr &, const Context &) const
+void InterpreterDropQuery::extendQueryLogElemImpl(QueryLogElement & elem, const ASTPtr &, ContextPtr) const
 {
     elem.query_kind = "Drop";
 }
diff --git a/src/Interpreters/InterpreterDropQuery.h b/src/Interpreters/InterpreterDropQuery.h
index d51ce3293ec..8e8d577deec 100644
--- a/src/Interpreters/InterpreterDropQuery.h
+++ b/src/Interpreters/InterpreterDropQuery.h
@@ -16,26 +16,25 @@ class AccessRightsElements;
   * or remove information about table (just forget) from server (DETACH),
   * or just clear all data in table (TRUNCATE).
   */
-class InterpreterDropQuery : public IInterpreter
+class InterpreterDropQuery : public IInterpreter, WithContext
 {
 public:
-    InterpreterDropQuery(const ASTPtr & query_ptr_, Context & context_);
+    InterpreterDropQuery(const ASTPtr & query_ptr_, ContextPtr context_);
 
     /// Drop table or database.
     BlockIO execute() override;
 
-    void extendQueryLogElemImpl(QueryLogElement & elem, const ASTPtr &, const Context &) const override;
+    void extendQueryLogElemImpl(QueryLogElement & elem, const ASTPtr &, ContextPtr) const override;
 
 private:
     AccessRightsElements getRequiredAccessForDDLOnCluster() const;
     ASTPtr query_ptr;
-    Context & context;
 
     BlockIO executeToDatabase(const ASTDropQuery & query);
     BlockIO executeToDatabaseImpl(const ASTDropQuery & query, DatabasePtr & database, std::vector<UUID> & uuids_to_wait);
 
-    BlockIO executeToTable(const ASTDropQuery & query);
-    BlockIO executeToTableImpl(const ASTDropQuery & query, DatabasePtr & db, UUID & uuid_to_wait);
+    BlockIO executeToTable(ASTDropQuery & query);
+    BlockIO executeToTableImpl(ASTDropQuery & query, DatabasePtr & db, UUID & uuid_to_wait);
 
     static void waitForTableToBeActuallyDroppedOrDetached(const ASTDropQuery & query, const DatabasePtr & db, const UUID & uuid_to_wait);
 
diff --git a/src/Interpreters/InterpreterExistsQuery.cpp b/src/Interpreters/InterpreterExistsQuery.cpp
index 335ee452e39..cbdb8561920 100644
--- a/src/Interpreters/InterpreterExistsQuery.cpp
+++ b/src/Interpreters/InterpreterExistsQuery.cpp
@@ -44,34 +44,34 @@ BlockInputStreamPtr InterpreterExistsQuery::executeImpl()
     {
         if (exists_query->temporary)
         {
-            result = context.tryResolveStorageID({"", exists_query->table}, Context::ResolveExternal);
+            result = getContext()->tryResolveStorageID({"", exists_query->table}, Context::ResolveExternal);
         }
         else
         {
-            String database = context.resolveDatabase(exists_query->database);
-            context.checkAccess(AccessType::SHOW_TABLES, database, exists_query->table);
-            result = DatabaseCatalog::instance().isTableExist({database, exists_query->table}, context);
+            String database = getContext()->resolveDatabase(exists_query->database);
+            getContext()->checkAccess(AccessType::SHOW_TABLES, database, exists_query->table);
+            result = DatabaseCatalog::instance().isTableExist({database, exists_query->table}, getContext());
         }
     }
     else if ((exists_query = query_ptr->as<ASTExistsViewQuery>()))
     {
-        String database = context.resolveDatabase(exists_query->database);
-        context.checkAccess(AccessType::SHOW_TABLES, database, exists_query->table);
-        auto table = DatabaseCatalog::instance().tryGetTable({database, exists_query->table}, context);
+        String database = getContext()->resolveDatabase(exists_query->database);
+        getContext()->checkAccess(AccessType::SHOW_TABLES, database, exists_query->table);
+        auto table = DatabaseCatalog::instance().tryGetTable({database, exists_query->table}, getContext());
         result = table && table->isView();
     }
     else if ((exists_query = query_ptr->as<ASTExistsDatabaseQuery>()))
     {
-        String database = context.resolveDatabase(exists_query->database);
-        context.checkAccess(AccessType::SHOW_DATABASES, database);
+        String database = getContext()->resolveDatabase(exists_query->database);
+        getContext()->checkAccess(AccessType::SHOW_DATABASES, database);
         result = DatabaseCatalog::instance().isDatabaseExist(database);
     }
     else if ((exists_query = query_ptr->as<ASTExistsDictionaryQuery>()))
     {
         if (exists_query->temporary)
             throw Exception("Temporary dictionaries are not possible.", ErrorCodes::SYNTAX_ERROR);
-        String database = context.resolveDatabase(exists_query->database);
-        context.checkAccess(AccessType::SHOW_DICTIONARIES, database, exists_query->table);
+        String database = getContext()->resolveDatabase(exists_query->database);
+        getContext()->checkAccess(AccessType::SHOW_DICTIONARIES, database, exists_query->table);
         result = DatabaseCatalog::instance().isDictionaryExist({database, exists_query->table});
     }
 
diff --git a/src/Interpreters/InterpreterExistsQuery.h b/src/Interpreters/InterpreterExistsQuery.h
index 1860e1d0aa9..efc664f07c3 100644
--- a/src/Interpreters/InterpreterExistsQuery.h
+++ b/src/Interpreters/InterpreterExistsQuery.h
@@ -7,16 +7,12 @@
 namespace DB
 {
 
-class Context;
-
-
 /** Check that table exists. Return single row with single column "result" of type UInt8 and value 0 or 1.
   */
-class InterpreterExistsQuery : public IInterpreter
+class InterpreterExistsQuery : public IInterpreter, WithContext
 {
 public:
-    InterpreterExistsQuery(const ASTPtr & query_ptr_, const Context & context_)
-        : query_ptr(query_ptr_), context(context_) {}
+    InterpreterExistsQuery(const ASTPtr & query_ptr_, ContextPtr context_) : WithContext(context_), query_ptr(query_ptr_) { }
 
     BlockIO execute() override;
 
@@ -24,7 +20,6 @@ public:
 
 private:
     ASTPtr query_ptr;
-    const Context & context;
 
     BlockInputStreamPtr executeImpl();
 };
diff --git a/src/Interpreters/InterpreterExplainQuery.cpp b/src/Interpreters/InterpreterExplainQuery.cpp
index b13350d7ba2..e8578a07491 100644
--- a/src/Interpreters/InterpreterExplainQuery.cpp
+++ b/src/Interpreters/InterpreterExplainQuery.cpp
@@ -14,6 +14,8 @@
 
 #include <Storages/StorageView.h>
 #include <Processors/QueryPlan/QueryPlan.h>
+#include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
+#include <Processors/QueryPlan/BuildQueryPipelineSettings.h>
 #include <Processors/printPipeline.h>
 
 namespace DB
@@ -31,9 +33,9 @@ namespace
 {
     struct ExplainAnalyzedSyntaxMatcher
     {
-        struct Data
+        struct Data : public WithContext
         {
-            const Context & context;
+            explicit Data(ContextPtr context_) : WithContext(context_) {}
         };
 
         static bool needChildVisit(ASTPtr & node, ASTPtr &)
@@ -50,7 +52,7 @@ namespace
         static void visit(ASTSelectQuery & select, ASTPtr & node, Data & data)
         {
             InterpreterSelectQuery interpreter(
-                node, data.context, SelectQueryOptions(QueryProcessingStage::FetchColumns).analyze().modify());
+                node, data.getContext(), SelectQueryOptions(QueryProcessingStage::FetchColumns).analyze().modify());
 
             const SelectQueryInfo & query_info = interpreter.getQueryInfo();
             if (query_info.view_query)
@@ -117,7 +119,7 @@ struct QueryPlanSettings
 {
     QueryPlan::ExplainPlanOptions query_plan_options;
 
-    /// Apply query plan optimisations.
+    /// Apply query plan optimizations.
     bool optimize = true;
 
     constexpr static char name[] = "PLAN";
@@ -127,6 +129,7 @@ struct QueryPlanSettings
             {"header", query_plan_options.header},
             {"description", query_plan_options.description},
             {"actions", query_plan_options.actions},
+            {"indexes", query_plan_options.indexes},
             {"optimize", optimize},
     };
 };
@@ -234,7 +237,7 @@ BlockInputStreamPtr InterpreterExplainQuery::executeImpl()
         if (ast.getSettings())
             throw Exception("Settings are not supported for EXPLAIN SYNTAX query.", ErrorCodes::UNKNOWN_SETTING);
 
-        ExplainAnalyzedSyntaxVisitor::Data data{.context = context};
+        ExplainAnalyzedSyntaxVisitor::Data data(getContext());
         ExplainAnalyzedSyntaxVisitor(data).visit(query);
 
         ast.getExplainedQuery()->format(IAST::FormatSettings(buf, false));
@@ -247,11 +250,11 @@ BlockInputStreamPtr InterpreterExplainQuery::executeImpl()
         auto settings = checkAndGetSettings<QueryPlanSettings>(ast.getSettings());
         QueryPlan plan;
 
-        InterpreterSelectWithUnionQuery interpreter(ast.getExplainedQuery(), context, SelectQueryOptions());
+        InterpreterSelectWithUnionQuery interpreter(ast.getExplainedQuery(), getContext(), SelectQueryOptions());
         interpreter.buildQueryPlan(plan);
 
         if (settings.optimize)
-            plan.optimize();
+            plan.optimize(QueryPlanOptimizationSettings::fromContext(getContext()));
 
         plan.explainPlan(buf, settings.query_plan_options);
     }
@@ -263,9 +266,11 @@ BlockInputStreamPtr InterpreterExplainQuery::executeImpl()
         auto settings = checkAndGetSettings<QueryPipelineSettings>(ast.getSettings());
         QueryPlan plan;
 
-        InterpreterSelectWithUnionQuery interpreter(ast.getExplainedQuery(), context, SelectQueryOptions());
+        InterpreterSelectWithUnionQuery interpreter(ast.getExplainedQuery(), getContext(), SelectQueryOptions());
         interpreter.buildQueryPlan(plan);
-        auto pipeline = plan.buildQueryPipeline();
+        auto pipeline = plan.buildQueryPipeline(
+            QueryPlanOptimizationSettings::fromContext(getContext()),
+            BuildQueryPipelineSettings::fromContext(getContext()));
 
         if (settings.graph)
         {
diff --git a/src/Interpreters/InterpreterExplainQuery.h b/src/Interpreters/InterpreterExplainQuery.h
index fbc8a998f2c..f16b1a8f69d 100644
--- a/src/Interpreters/InterpreterExplainQuery.h
+++ b/src/Interpreters/InterpreterExplainQuery.h
@@ -7,15 +7,11 @@
 namespace DB
 {
 
-class Context;
-
 /// Returns single row with explain results
-class InterpreterExplainQuery : public IInterpreter
+class InterpreterExplainQuery : public IInterpreter, WithContext
 {
 public:
-    InterpreterExplainQuery(const ASTPtr & query_, const Context & context_)
-        : query(query_), context(context_)
-    {}
+    InterpreterExplainQuery(const ASTPtr & query_, ContextPtr context_) : WithContext(context_), query(query_) { }
 
     BlockIO execute() override;
 
@@ -23,7 +19,6 @@ public:
 
 private:
     ASTPtr query;
-    const Context & context;
 
     BlockInputStreamPtr executeImpl();
 };
diff --git a/src/Interpreters/InterpreterExternalDDLQuery.cpp b/src/Interpreters/InterpreterExternalDDLQuery.cpp
index 4a93c0fa753..8f9f0cf9ddb 100644
--- a/src/Interpreters/InterpreterExternalDDLQuery.cpp
+++ b/src/Interpreters/InterpreterExternalDDLQuery.cpp
@@ -26,8 +26,8 @@ namespace ErrorCodes
     extern const int BAD_ARGUMENTS;
 }
 
-InterpreterExternalDDLQuery::InterpreterExternalDDLQuery(const ASTPtr & query_, Context & context_)
-    : query(query_), context(context_)
+InterpreterExternalDDLQuery::InterpreterExternalDDLQuery(const ASTPtr & query_, ContextPtr context_)
+    : WithContext(context_), query(query_)
 {
 }
 
@@ -35,7 +35,7 @@ BlockIO InterpreterExternalDDLQuery::execute()
 {
     const ASTExternalDDLQuery & external_ddl_query = query->as<ASTExternalDDLQuery &>();
 
-    if (context.getClientInfo().query_kind != ClientInfo::QueryKind::SECONDARY_QUERY)
+    if (getContext()->getClientInfo().query_kind != ClientInfo::QueryKind::SECONDARY_QUERY)
         throw Exception("Cannot parse and execute EXTERNAL DDL FROM.", ErrorCodes::SYNTAX_ERROR);
 
     if (external_ddl_query.from->name == "MySQL")
@@ -48,19 +48,19 @@ BlockIO InterpreterExternalDDLQuery::execute()
 
         if (external_ddl_query.external_ddl->as<ASTDropQuery>())
             return MySQLInterpreter::InterpreterMySQLDropQuery(
-                external_ddl_query.external_ddl, context, getIdentifierName(arguments[0]),
+                external_ddl_query.external_ddl, getContext(), getIdentifierName(arguments[0]),
                 getIdentifierName(arguments[1])).execute();
         else if (external_ddl_query.external_ddl->as<ASTRenameQuery>())
             return MySQLInterpreter::InterpreterMySQLRenameQuery(
-                external_ddl_query.external_ddl, context, getIdentifierName(arguments[0]),
+                external_ddl_query.external_ddl, getContext(), getIdentifierName(arguments[0]),
                 getIdentifierName(arguments[1])).execute();
         else if (external_ddl_query.external_ddl->as<MySQLParser::ASTAlterQuery>())
             return MySQLInterpreter::InterpreterMySQLAlterQuery(
-                external_ddl_query.external_ddl, context, getIdentifierName(arguments[0]),
+                external_ddl_query.external_ddl, getContext(), getIdentifierName(arguments[0]),
                 getIdentifierName(arguments[1])).execute();
         else if (external_ddl_query.external_ddl->as<MySQLParser::ASTCreateQuery>())
             return MySQLInterpreter::InterpreterMySQLCreateQuery(
-                external_ddl_query.external_ddl, context, getIdentifierName(arguments[0]),
+                external_ddl_query.external_ddl, getContext(), getIdentifierName(arguments[0]),
                 getIdentifierName(arguments[1])).execute();
 #endif
     }
diff --git a/src/Interpreters/InterpreterExternalDDLQuery.h b/src/Interpreters/InterpreterExternalDDLQuery.h
index f6b29c20c70..15a842a2611 100644
--- a/src/Interpreters/InterpreterExternalDDLQuery.h
+++ b/src/Interpreters/InterpreterExternalDDLQuery.h
@@ -6,15 +6,15 @@
 namespace DB
 {
 
-class InterpreterExternalDDLQuery : public IInterpreter
+class InterpreterExternalDDLQuery : public IInterpreter, WithContext
 {
 public:
-    InterpreterExternalDDLQuery(const ASTPtr & query_, Context & context_);
+    InterpreterExternalDDLQuery(const ASTPtr & query_, ContextPtr context_);
 
     BlockIO execute() override;
+
 private:
     const ASTPtr query;
-    Context & context;
 
 };
 
diff --git a/src/Interpreters/InterpreterFactory.cpp b/src/Interpreters/InterpreterFactory.cpp
index 15e4c52f040..4af8b6ffa7d 100644
--- a/src/Interpreters/InterpreterFactory.cpp
+++ b/src/Interpreters/InterpreterFactory.cpp
@@ -92,7 +92,7 @@ namespace ErrorCodes
 }
 
 
-std::unique_ptr<IInterpreter> InterpreterFactory::get(ASTPtr & query, Context & context, const SelectQueryOptions & options)
+std::unique_ptr<IInterpreter> InterpreterFactory::get(ASTPtr & query, ContextPtr context, const SelectQueryOptions & options)
 {
     OpenTelemetrySpanHolder span("InterpreterFactory::get()");
 
@@ -112,7 +112,7 @@ std::unique_ptr<IInterpreter> InterpreterFactory::get(ASTPtr & query, Context &
     else if (query->as<ASTInsertQuery>())
     {
         ProfileEvents::increment(ProfileEvents::InsertQuery);
-        bool allow_materialized = static_cast<bool>(context.getSettingsRef().insert_allow_materialized_columns);
+        bool allow_materialized = static_cast<bool>(context->getSettingsRef().insert_allow_materialized_columns);
         return std::make_unique<InterpreterInsertQuery>(query, context, allow_materialized);
     }
     else if (query->as<ASTCreateQuery>())
diff --git a/src/Interpreters/InterpreterFactory.h b/src/Interpreters/InterpreterFactory.h
index 22a6ab7e8f3..c122fe11b7d 100644
--- a/src/Interpreters/InterpreterFactory.h
+++ b/src/Interpreters/InterpreterFactory.h
@@ -16,7 +16,7 @@ class InterpreterFactory
 public:
     static std::unique_ptr<IInterpreter> get(
         ASTPtr & query,
-        Context & context,
+        ContextPtr context,
         const SelectQueryOptions & options = {});
 };
 
diff --git a/src/Interpreters/InterpreterGrantQuery.cpp b/src/Interpreters/InterpreterGrantQuery.cpp
index dafe4d2e18c..7487ca79bde 100644
--- a/src/Interpreters/InterpreterGrantQuery.cpp
+++ b/src/Interpreters/InterpreterGrantQuery.cpp
@@ -1,4 +1,5 @@
 #include <Interpreters/InterpreterGrantQuery.h>
+#include <Interpreters/QueryLog.h>
 #include <Parsers/ASTGrantQuery.h>
 #include <Parsers/ASTRolesOrUsersSet.h>
 #include <Interpreters/Context.h>
@@ -11,13 +12,16 @@
 #include <boost/range/algorithm/copy.hpp>
 #include <boost/range/algorithm/set_algorithm.hpp>
 
-
 namespace DB
 {
+namespace ErrorCodes
+{
+    extern const int ACCESS_DENIED;
+    extern const int LOGICAL_ERROR;
+}
+
 namespace
 {
-    using Kind = ASTGrantQuery::Kind;
-
     template <typename T>
     void updateFromQueryTemplate(
         T & grantee,
@@ -26,38 +30,28 @@ namespace
     {
         if (!query.access_rights_elements.empty())
         {
-            if (query.kind == Kind::GRANT)
-            {
-                if (query.grant_option)
-                    grantee.access.grantWithGrantOption(query.access_rights_elements);
-                else
-                    grantee.access.grant(query.access_rights_elements);
-            }
+            if (query.is_revoke)
+                grantee.access.revoke(query.access_rights_elements);
             else
-            {
-                if (query.grant_option)
-                    grantee.access.revokeGrantOption(query.access_rights_elements);
-                else
-                    grantee.access.revoke(query.access_rights_elements);
-            }
+                grantee.access.grant(query.access_rights_elements);
         }
 
         if (!roles_to_grant_or_revoke.empty())
         {
-            if (query.kind == Kind::GRANT)
-            {
-                if (query.admin_option)
-                    grantee.granted_roles.grantWithAdminOption(roles_to_grant_or_revoke);
-                else
-                    grantee.granted_roles.grant(roles_to_grant_or_revoke);
-            }
-            else
+            if (query.is_revoke)
             {
                 if (query.admin_option)
                     grantee.granted_roles.revokeAdminOption(roles_to_grant_or_revoke);
                 else
                     grantee.granted_roles.revoke(roles_to_grant_or_revoke);
             }
+            else
+            {
+                if (query.admin_option)
+                    grantee.granted_roles.grantWithAdminOption(roles_to_grant_or_revoke);
+                else
+                    grantee.granted_roles.grant(roles_to_grant_or_revoke);
+            }
         }
     }
 
@@ -71,122 +65,210 @@ namespace
         else if (auto * role = typeid_cast<Role *>(&grantee))
             updateFromQueryTemplate(*role, query, roles_to_grant_or_revoke);
     }
+
+    void checkGranteeIsAllowed(const ContextAccess & access, const UUID & grantee_id, const IAccessEntity & grantee)
+    {
+        auto current_user = access.getUser();
+        if (current_user && !current_user->grantees.match(grantee_id))
+            throw Exception(grantee.outputTypeAndName() + " is not allowed as grantee", ErrorCodes::ACCESS_DENIED);
+    }
+
+    void checkGranteesAreAllowed(const AccessControlManager & access_control, const ContextAccess & access, const std::vector<UUID> & grantee_ids)
+    {
+        auto current_user = access.getUser();
+        if (!current_user || (current_user->grantees == RolesOrUsersSet::AllTag{}))
+            return;
+
+        for (const auto & id : grantee_ids)
+        {
+            auto entity = access_control.tryRead(id);
+            if (auto role = typeid_cast<RolePtr>(entity))
+                checkGranteeIsAllowed(access, id, *role);
+            else if (auto user = typeid_cast<UserPtr>(entity))
+                checkGranteeIsAllowed(access, id, *user);
+        }
+    }
+
+    void checkGrantOption(
+        const AccessControlManager & access_control,
+        const ContextAccess & access,
+        const ASTGrantQuery & query,
+        const std::vector<UUID> & grantees_from_query)
+    {
+        const auto & elements = query.access_rights_elements;
+        if (elements.empty())
+            return;
+
+        /// To execute the command GRANT the current user needs to have the access granted
+        /// with GRANT OPTION.
+        if (!query.is_revoke)
+        {
+            access.checkGrantOption(elements);
+            checkGranteesAreAllowed(access_control, access, grantees_from_query);
+            return;
+        }
+
+        if (access.hasGrantOption(elements))
+        {
+            checkGranteesAreAllowed(access_control, access, grantees_from_query);
+            return;
+        }
+
+        /// Special case for the command REVOKE: it's possible that the current user doesn't have
+        /// the access granted with GRANT OPTION but it's still ok because the roles or users
+        /// from whom the access rights will be revoked don't have the specified access granted either.
+        ///
+        /// For example, to execute
+        /// GRANT ALL ON mydb.* TO role1
+        /// REVOKE ALL ON *.* FROM role1
+        /// the current user needs to have grants only on the 'mydb' database.
+        AccessRights all_granted_access;
+        for (const auto & id : grantees_from_query)
+        {
+            auto entity = access_control.tryRead(id);
+            if (auto role = typeid_cast<RolePtr>(entity))
+            {
+                checkGranteeIsAllowed(access, id, *role);
+                all_granted_access.makeUnion(role->access);
+            }
+            else if (auto user = typeid_cast<UserPtr>(entity))
+            {
+                checkGranteeIsAllowed(access, id, *user);
+                all_granted_access.makeUnion(user->access);
+            }
+        }
+
+        AccessRights required_access;
+        if (elements[0].is_partial_revoke)
+        {
+            AccessRightsElements non_revoke_elements = elements;
+            std::for_each(non_revoke_elements.begin(), non_revoke_elements.end(), [&](AccessRightsElement & element) { element.is_partial_revoke = false; });
+            required_access.grant(non_revoke_elements);
+        }
+        else
+        {
+            required_access.grant(elements);
+        }
+        required_access.makeIntersection(all_granted_access);
+
+        for (auto & required_access_element : required_access.getElements())
+        {
+            if (!required_access_element.is_partial_revoke && (required_access_element.grant_option || !elements[0].grant_option))
+                access.checkGrantOption(required_access_element);
+        }
+    }
+
+
+    std::vector<UUID> getRoleIDsAndCheckAdminOption(
+        const AccessControlManager & access_control,
+        const ContextAccess & access,
+        const ASTGrantQuery & query,
+        const RolesOrUsersSet & roles_from_query,
+        const std::vector<UUID> & grantees_from_query)
+    {
+        std::vector<UUID> matching_ids;
+
+        if (!query.is_revoke)
+        {
+            matching_ids = roles_from_query.getMatchingIDs(access_control);
+            access.checkAdminOption(matching_ids);
+            checkGranteesAreAllowed(access_control, access, grantees_from_query);
+            return matching_ids;
+        }
+
+        if (!roles_from_query.all)
+        {
+            matching_ids = roles_from_query.getMatchingIDs();
+            if (access.hasAdminOption(matching_ids))
+            {
+                checkGranteesAreAllowed(access_control, access, grantees_from_query);
+                return matching_ids;
+            }
+        }
+
+        /// Special case for the command REVOKE: it's possible that the current user doesn't have the admin option
+        /// for some of the specified roles but it's still ok because the roles or users from whom the roles will be
+        /// revoked from don't have the specified roles granted either.
+        ///
+        /// For example, to execute
+        /// GRANT role2 TO role1
+        /// REVOKE ALL FROM role1
+        /// the current user needs to have only 'role2' to be granted with admin option (not all the roles).
+        GrantedRoles all_granted_roles;
+        for (const auto & id : grantees_from_query)
+        {
+            auto entity = access_control.tryRead(id);
+            if (auto role = typeid_cast<RolePtr>(entity))
+            {
+                checkGranteeIsAllowed(access, id, *role);
+                all_granted_roles.makeUnion(role->granted_roles);
+            }
+            else if (auto user = typeid_cast<UserPtr>(entity))
+            {
+                checkGranteeIsAllowed(access, id, *user);
+                all_granted_roles.makeUnion(user->granted_roles);
+            }
+        }
+
+        const auto & all_granted_roles_set = query.admin_option ? all_granted_roles.getGrantedWithAdminOption() : all_granted_roles.getGranted();
+        if (roles_from_query.all)
+            boost::range::set_difference(all_granted_roles_set, roles_from_query.except_ids, std::back_inserter(matching_ids));
+        else
+            boost::range::remove_erase_if(matching_ids, [&](const UUID & id) { return !all_granted_roles_set.count(id); });
+        access.checkAdminOption(matching_ids);
+        return matching_ids;
+    }
 }
 
 
 BlockIO InterpreterGrantQuery::execute()
 {
     auto & query = query_ptr->as<ASTGrantQuery &>();
-    query.replaceCurrentUserTagWithName(context.getUserName());
 
-    if (!query.cluster.empty())
-        return executeDDLQueryOnCluster(query_ptr, context, query.access_rights_elements, true);
+    query.replaceCurrentUserTag(getContext()->getUserName());
+    query.access_rights_elements.eraseNonGrantable();
 
-    auto access = context.getAccess();
-    auto & access_control = context.getAccessControlManager();
-    query.replaceEmptyDatabaseWithCurrent(context.getCurrentDatabase());
+    if (!query.access_rights_elements.sameOptions())
+        throw Exception("Elements of an ASTGrantQuery are expected to have the same options", ErrorCodes::LOGICAL_ERROR);
+    if (!query.access_rights_elements.empty() && query.access_rights_elements[0].is_partial_revoke && !query.is_revoke)
+        throw Exception("A partial revoke should be revoked, not granted", ErrorCodes::LOGICAL_ERROR);
 
-    RolesOrUsersSet roles_set;
+    auto & access_control = getContext()->getAccessControlManager();
+    std::optional<RolesOrUsersSet> roles_set;
     if (query.roles)
         roles_set = RolesOrUsersSet{*query.roles, access_control};
 
-    std::vector<UUID> to_roles = RolesOrUsersSet{*query.to_roles, access_control, context.getUserID()}.getMatchingIDs(access_control);
+    std::vector<UUID> grantees = RolesOrUsersSet{*query.grantees, access_control, getContext()->getUserID()}.getMatchingIDs(access_control);
+
+    /// Check if the current user has corresponding roles granted with admin option.
+    std::vector<UUID> roles;
+    if (roles_set)
+        roles = getRoleIDsAndCheckAdminOption(access_control, *getContext()->getAccess(), query, *roles_set, grantees);
+
+    if (!query.cluster.empty())
+    {
+        /// To execute the command GRANT the current user needs to have the access granted with GRANT OPTION.
+        auto required_access = query.access_rights_elements;
+        std::for_each(required_access.begin(), required_access.end(), [&](AccessRightsElement & element) { element.grant_option = true; });
+        checkGranteesAreAllowed(access_control, *getContext()->getAccess(), grantees);
+        return executeDDLQueryOnCluster(query_ptr, getContext(), std::move(required_access));
+    }
+
+    query.replaceEmptyDatabase(getContext()->getCurrentDatabase());
 
     /// Check if the current user has corresponding access rights with grant option.
     if (!query.access_rights_elements.empty())
-    {
-        query.access_rights_elements.removeNonGrantableFlags();
+        checkGrantOption(access_control, *getContext()->getAccess(), query, grantees);
 
-        /// Special case for REVOKE: it's possible that the current user doesn't have the grant option for all
-        /// the specified access rights and that's ok because the roles or users which the access rights
-        /// will be revoked from don't have the specified access rights either.
-        ///
-        /// For example, to execute
-        /// GRANT ALL ON mydb.* TO role1
-        /// REVOKE ALL ON *.* FROM role1
-        /// the current user needs to have access rights only for the 'mydb' database.
-        if ((query.kind == Kind::REVOKE) && !access->hasGrantOption(query.access_rights_elements))
-        {
-            AccessRights max_access;
-            for (const auto & id : to_roles)
-            {
-                auto entity = access_control.tryRead(id);
-                if (auto role = typeid_cast<RolePtr>(entity))
-                    max_access.makeUnion(role->access);
-                else if (auto user = typeid_cast<UserPtr>(entity))
-                    max_access.makeUnion(user->access);
-            }
-            AccessRights access_to_revoke;
-            if (query.grant_option)
-                access_to_revoke.grantWithGrantOption(query.access_rights_elements);
-            else
-                access_to_revoke.grant(query.access_rights_elements);
-            access_to_revoke.makeIntersection(max_access);
-            AccessRightsElements filtered_access_to_revoke;
-            for (auto & element : access_to_revoke.getElements())
-            {
-                if ((element.kind == Kind::GRANT) && (element.grant_option || !query.grant_option))
-                    filtered_access_to_revoke.emplace_back(std::move(element));
-            }
-            query.access_rights_elements = std::move(filtered_access_to_revoke);
-        }
-
-        access->checkGrantOption(query.access_rights_elements);
-    }
-
-    /// Check if the current user has corresponding roles granted with admin option.
-    std::vector<UUID> roles_to_grant_or_revoke;
-    if (!roles_set.empty())
-    {
-        bool all = roles_set.all;
-        if (!all)
-            roles_to_grant_or_revoke = roles_set.getMatchingIDs();
-
-        /// Special case for REVOKE: it's possible that the current user doesn't have the admin option for all
-        /// the specified roles and that's ok because the roles or users which the roles will be revoked from
-        /// don't have the specified roles granted either.
-        ///
-        /// For example, to execute
-        /// GRANT role2 TO role1
-        /// REVOKE ALL FROM role1
-        /// the current user needs to have only 'role2' to be granted with admin option (not all the roles).
-        if ((query.kind == Kind::REVOKE) && (roles_set.all || !access->hasAdminOption(roles_to_grant_or_revoke)))
-        {
-            auto & roles_to_revoke = roles_to_grant_or_revoke;
-            boost::container::flat_set<UUID> max_roles;
-            for (const auto & id : to_roles)
-            {
-                auto entity = access_control.tryRead(id);
-                auto add_to_max_roles = [&](const GrantedRoles & granted_roles)
-                {
-                    if (query.admin_option)
-                        max_roles.insert(granted_roles.roles_with_admin_option.begin(), granted_roles.roles_with_admin_option.end());
-                    else
-                        max_roles.insert(granted_roles.roles.begin(), granted_roles.roles.end());
-                };
-                if (auto role = typeid_cast<RolePtr>(entity))
-                    add_to_max_roles(role->granted_roles);
-                else if (auto user = typeid_cast<UserPtr>(entity))
-                    add_to_max_roles(user->granted_roles);
-            }
-            if (roles_set.all)
-                boost::range::set_difference(max_roles, roles_set.except_ids, std::back_inserter(roles_to_revoke));
-            else
-                boost::range::remove_erase_if(roles_to_revoke, [&](const UUID & id) { return !max_roles.count(id); });
-        }
-
-        access->checkAdminOption(roles_to_grant_or_revoke);
-    }
-
-    /// Update roles and users listed in `to_roles`.
+    /// Update roles and users listed in `grantees`.
     auto update_func = [&](const AccessEntityPtr & entity) -> AccessEntityPtr
     {
         auto clone = entity->clone();
-        updateFromQueryImpl(*clone, query, roles_to_grant_or_revoke);
+        updateFromQueryImpl(*clone, query, roles);
         return clone;
     };
 
-    access_control.update(to_roles, update_func);
+    access_control.update(grantees, update_func);
 
     return {};
 }
@@ -209,4 +291,13 @@ void InterpreterGrantQuery::updateRoleFromQuery(Role & role, const ASTGrantQuery
     updateFromQueryImpl(role, query, roles_to_grant_or_revoke);
 }
 
+void InterpreterGrantQuery::extendQueryLogElemImpl(QueryLogElement & elem, const ASTPtr & /*ast*/, ContextPtr) const
+{
+    auto & query = query_ptr->as<ASTGrantQuery &>();
+    if (query.is_revoke)
+        elem.query_kind = "Revoke";
+    else
+        elem.query_kind = "Grant";
+}
+
 }
diff --git a/src/Interpreters/InterpreterGrantQuery.h b/src/Interpreters/InterpreterGrantQuery.h
index 32810faecd2..f5939ff3cb7 100644
--- a/src/Interpreters/InterpreterGrantQuery.h
+++ b/src/Interpreters/InterpreterGrantQuery.h
@@ -1,29 +1,30 @@
 #pragma once
 
+#include <Core/UUID.h>
 #include <Interpreters/IInterpreter.h>
 #include <Parsers/IAST_fwd.h>
-#include <Core/UUID.h>
 
 
 namespace DB
 {
+
 class ASTGrantQuery;
 struct User;
 struct Role;
 
-
-class InterpreterGrantQuery : public IInterpreter
+class InterpreterGrantQuery : public IInterpreter, WithContext
 {
 public:
-    InterpreterGrantQuery(const ASTPtr & query_ptr_, Context & context_) : query_ptr(query_ptr_), context(context_) {}
+    InterpreterGrantQuery(const ASTPtr & query_ptr_, ContextPtr context_) : WithContext(context_), query_ptr(query_ptr_) {}
 
     BlockIO execute() override;
 
     static void updateUserFromQuery(User & user, const ASTGrantQuery & query);
     static void updateRoleFromQuery(Role & role, const ASTGrantQuery & query);
+    void extendQueryLogElemImpl(QueryLogElement &, const ASTPtr &, ContextPtr) const override;
 
 private:
     ASTPtr query_ptr;
-    Context & context;
 };
+
 }
diff --git a/src/Interpreters/InterpreterInsertQuery.cpp b/src/Interpreters/InterpreterInsertQuery.cpp
index 6b488a3edc3..33cfe4bf7a2 100644
--- a/src/Interpreters/InterpreterInsertQuery.cpp
+++ b/src/Interpreters/InterpreterInsertQuery.cpp
@@ -9,21 +9,17 @@
 #include <DataStreams/NullAndDoCopyBlockInputStream.h>
 #include <DataStreams/NullBlockOutputStream.h>
 #include <DataStreams/PushingToViewsBlockOutputStream.h>
-#include <DataStreams/RemoteBlockInputStream.h>
 #include <DataStreams/SquashingBlockOutputStream.h>
 #include <DataStreams/copyData.h>
 #include <IO/ConnectionTimeoutsContext.h>
 #include <Interpreters/InterpreterSelectWithUnionQuery.h>
 #include <Interpreters/InterpreterWatchQuery.h>
-#include <Interpreters/JoinedTables.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTInsertQuery.h>
 #include <Parsers/ASTSelectQuery.h>
 #include <Parsers/ASTSelectWithUnionQuery.h>
 #include <Parsers/ASTTablesInSelectQuery.h>
-#include <Parsers/queryToString.h>
-#include <Processors/NullSink.h>
 #include <Processors/Sources/SinkToOutputStream.h>
 #include <Processors/Sources/SourceFromInputStream.h>
 #include <Processors/Transforms/ExpressionTransform.h>
@@ -36,11 +32,6 @@
 #include <Interpreters/getTableExpressions.h>
 #include <Interpreters/processColumnTransformers.h>
 
-namespace
-{
-const UInt64 PARALLEL_DISTRIBUTED_INSERT_SELECT_ALL = 2;
-}
-
 
 namespace DB
 {
@@ -50,13 +41,12 @@ namespace ErrorCodes
     extern const int NO_SUCH_COLUMN_IN_TABLE;
     extern const int ILLEGAL_COLUMN;
     extern const int DUPLICATE_COLUMN;
-    extern const int LOGICAL_ERROR;
 }
 
 InterpreterInsertQuery::InterpreterInsertQuery(
-    const ASTPtr & query_ptr_, const Context & context_, bool allow_materialized_, bool no_squash_, bool no_destination_)
-    : query_ptr(query_ptr_)
-    , context(context_)
+    const ASTPtr & query_ptr_, ContextPtr context_, bool allow_materialized_, bool no_squash_, bool no_destination_)
+    : WithContext(context_)
+    , query_ptr(query_ptr_)
     , allow_materialized(allow_materialized_)
     , no_squash(no_squash_)
     , no_destination(no_destination_)
@@ -70,12 +60,12 @@ StoragePtr InterpreterInsertQuery::getTable(ASTInsertQuery & query)
     if (query.table_function)
     {
         const auto & factory = TableFunctionFactory::instance();
-        TableFunctionPtr table_function_ptr = factory.get(query.table_function, context);
-        return table_function_ptr->execute(query.table_function, context, table_function_ptr->getName());
+        TableFunctionPtr table_function_ptr = factory.get(query.table_function, getContext());
+        return table_function_ptr->execute(query.table_function, getContext(), table_function_ptr->getName());
     }
 
-    query.table_id = context.resolveStorageID(query.table_id);
-    return DatabaseCatalog::instance().getTable(query.table_id, context);
+    query.table_id = getContext()->resolveStorageID(query.table_id);
+    return DatabaseCatalog::instance().getTable(query.table_id, getContext());
 }
 
 Block InterpreterInsertQuery::getSampleBlock(
@@ -95,7 +85,7 @@ Block InterpreterInsertQuery::getSampleBlock(
 
     Block table_sample = metadata_snapshot->getSampleBlock();
 
-    const auto columns_ast = processColumnTransformers(context.getCurrentDatabase(), table, metadata_snapshot, query.columns);
+    const auto columns_ast = processColumnTransformers(getContext()->getCurrentDatabase(), table, metadata_snapshot, query.columns);
 
     /// Form the block based on the column names from the query
     Block res;
@@ -160,97 +150,28 @@ static bool isTrivialSelect(const ASTPtr & select)
 
 BlockIO InterpreterInsertQuery::execute()
 {
-    const Settings & settings = context.getSettingsRef();
+    const Settings & settings = getContext()->getSettingsRef();
     auto & query = query_ptr->as<ASTInsertQuery &>();
 
     BlockIO res;
 
     StoragePtr table = getTable(query);
-    auto table_lock = table->lockForShare(context.getInitialQueryId(), settings.lock_acquire_timeout);
+    auto table_lock = table->lockForShare(getContext()->getInitialQueryId(), settings.lock_acquire_timeout);
     auto metadata_snapshot = table->getInMemoryMetadataPtr();
 
     auto query_sample_block = getSampleBlock(query, table, metadata_snapshot);
     if (!query.table_function)
-        context.checkAccess(AccessType::INSERT, query.table_id, query_sample_block.getNames());
+        getContext()->checkAccess(AccessType::INSERT, query.table_id, query_sample_block.getNames());
 
     bool is_distributed_insert_select = false;
 
     if (query.select && table->isRemote() && settings.parallel_distributed_insert_select)
     {
         // Distributed INSERT SELECT
-        std::shared_ptr<StorageDistributed> storage_src;
-        auto & select = query.select->as<ASTSelectWithUnionQuery &>();
-        auto new_query = std::dynamic_pointer_cast<ASTInsertQuery>(query.clone());
-        if (select.list_of_selects->children.size() == 1)
-        {
-            if (auto * select_query = select.list_of_selects->children.at(0)->as<ASTSelectQuery>())
-            {
-                JoinedTables joined_tables(Context(context), *select_query);
-
-                if (joined_tables.tablesCount() == 1)
-                {
-                    storage_src = std::dynamic_pointer_cast<StorageDistributed>(joined_tables.getLeftTableStorage());
-                    if (storage_src)
-                    {
-                        const auto select_with_union_query = std::make_shared<ASTSelectWithUnionQuery>();
-                        select_with_union_query->list_of_selects = std::make_shared<ASTExpressionList>();
-
-                        auto new_select_query = std::dynamic_pointer_cast<ASTSelectQuery>(select_query->clone());
-                        select_with_union_query->list_of_selects->children.push_back(new_select_query);
-
-                        new_select_query->replaceDatabaseAndTable(storage_src->getRemoteDatabaseName(), storage_src->getRemoteTableName());
-
-                        new_query->select = select_with_union_query;
-                    }
-                }
-            }
-        }
-
-        auto storage_dst = std::dynamic_pointer_cast<StorageDistributed>(table);
-
-        if (storage_src && storage_dst && storage_src->cluster_name == storage_dst->cluster_name)
+        if (auto maybe_pipeline = table->distributedWrite(query, getContext()))
         {
+            res.pipeline = std::move(*maybe_pipeline);
             is_distributed_insert_select = true;
-
-            if (settings.parallel_distributed_insert_select == PARALLEL_DISTRIBUTED_INSERT_SELECT_ALL)
-            {
-                new_query->table_id = StorageID(storage_dst->getRemoteDatabaseName(), storage_dst->getRemoteTableName());
-            }
-
-            const auto & cluster = storage_src->getCluster();
-            const auto & shards_info = cluster->getShardsInfo();
-
-            std::vector<std::unique_ptr<QueryPipeline>> pipelines;
-
-            String new_query_str = queryToString(new_query);
-            for (size_t shard_index : ext::range(0, shards_info.size()))
-            {
-                const auto & shard_info = shards_info[shard_index];
-                if (shard_info.isLocal())
-                {
-                    InterpreterInsertQuery interpreter(new_query, context);
-                    pipelines.emplace_back(std::make_unique<QueryPipeline>(interpreter.execute().pipeline));
-                }
-                else
-                {
-                    auto timeouts = ConnectionTimeouts::getTCPTimeoutsWithFailover(settings);
-                    auto connections = shard_info.pool->getMany(timeouts, &settings, PoolMode::GET_ONE);
-                    if (connections.empty() || connections.front().isNull())
-                        throw Exception(
-                            "Expected exactly one connection for shard " + toString(shard_info.shard_num), ErrorCodes::LOGICAL_ERROR);
-
-                    ///  INSERT SELECT query returns empty block
-                    auto in_stream = std::make_shared<RemoteBlockInputStream>(std::move(connections), new_query_str, Block{}, context);
-                    pipelines.emplace_back(std::make_unique<QueryPipeline>());
-                    pipelines.back()->init(Pipe(std::make_shared<SourceFromInputStream>(std::move(in_stream))));
-                    pipelines.back()->setSinks([](const Block & header, QueryPipeline::StreamType) -> ProcessorPtr
-                    {
-                        return std::make_shared<EmptySink>(header);
-                    });
-                }
-            }
-
-            res.pipeline = QueryPipeline::unitePipelines(std::move(pipelines), {});
         }
     }
 
@@ -285,15 +206,15 @@ BlockIO InterpreterInsertQuery::execute()
                   * to avoid unnecessary squashing.
                   */
 
-                Settings new_settings = context.getSettings();
+                Settings new_settings = getContext()->getSettings();
 
                 new_settings.max_threads = std::max<UInt64>(1, settings.max_insert_threads);
 
                 if (settings.min_insert_block_size_rows && table->prefersLargeBlocks())
                     new_settings.max_block_size = settings.min_insert_block_size_rows;
 
-                Context new_context = context;
-                new_context.setSettings(new_settings);
+                auto new_context = Context::createCopy(context);
+                new_context->setSettings(new_settings);
 
                 InterpreterSelectWithUnionQuery interpreter_select{
                     query.select, new_context, SelectQueryOptions(QueryProcessingStage::Complete, 1)};
@@ -303,7 +224,7 @@ BlockIO InterpreterInsertQuery::execute()
             {
                 /// Passing 1 as subquery_depth will disable limiting size of intermediate result.
                 InterpreterSelectWithUnionQuery interpreter_select{
-                    query.select, context, SelectQueryOptions(QueryProcessingStage::Complete, 1)};
+                    query.select, getContext(), SelectQueryOptions(QueryProcessingStage::Complete, 1)};
                 res = interpreter_select.execute();
             }
 
@@ -314,7 +235,7 @@ BlockIO InterpreterInsertQuery::execute()
         }
         else if (query.watch)
         {
-            InterpreterWatchQuery interpreter_watch{ query.watch, context };
+            InterpreterWatchQuery interpreter_watch{ query.watch, getContext() };
             res = interpreter_watch.execute();
             res.pipeline.init(Pipe(std::make_shared<SourceFromInputStream>(std::move(res.in))));
         }
@@ -327,21 +248,21 @@ BlockIO InterpreterInsertQuery::execute()
             /// NOTE: we explicitly ignore bound materialized views when inserting into Kafka Storage.
             ///       Otherwise we'll get duplicates when MV reads same rows again from Kafka.
             if (table->noPushingToViews() && !no_destination)
-                out = table->write(query_ptr, metadata_snapshot, context);
+                out = table->write(query_ptr, metadata_snapshot, getContext());
             else
-                out = std::make_shared<PushingToViewsBlockOutputStream>(table, metadata_snapshot, context, query_ptr, no_destination);
+                out = std::make_shared<PushingToViewsBlockOutputStream>(table, metadata_snapshot, getContext(), query_ptr, no_destination);
 
             /// Note that we wrap transforms one on top of another, so we write them in reverse of data processing order.
 
             /// Checking constraints. It must be done after calculation of all defaults, so we can check them on calculated columns.
             if (const auto & constraints = metadata_snapshot->getConstraints(); !constraints.empty())
                 out = std::make_shared<CheckConstraintsBlockOutputStream>(
-                    query.table_id, out, out->getHeader(), metadata_snapshot->getConstraints(), context);
+                    query.table_id, out, out->getHeader(), metadata_snapshot->getConstraints(), getContext());
 
             /// Actually we don't know structure of input blocks from query/table,
             /// because some clients break insertion protocol (columns != header)
             out = std::make_shared<AddingDefaultBlockOutputStream>(
-                out, query_sample_block, metadata_snapshot->getColumns(), context);
+                out, query_sample_block, metadata_snapshot->getColumns(), getContext());
 
             /// It's important to squash blocks as early as possible (before other transforms),
             ///  because other transforms may work inefficient if block size is small.
@@ -360,7 +281,7 @@ BlockIO InterpreterInsertQuery::execute()
             }
 
             auto out_wrapper = std::make_shared<CountingBlockOutputStream>(out);
-            out_wrapper->setProcessListElement(context.getProcessListElement());
+            out_wrapper->setProcessListElement(getContext()->getProcessListElement());
             out = std::move(out_wrapper);
             out_streams.emplace_back(std::move(out));
         }
@@ -378,7 +299,7 @@ BlockIO InterpreterInsertQuery::execute()
                 res.pipeline.getHeader().getColumnsWithTypeAndName(),
                 header.getColumnsWithTypeAndName(),
                 ActionsDAG::MatchColumnsMode::Position);
-        auto actions = std::make_shared<ExpressionActions>(actions_dag);
+        auto actions = std::make_shared<ExpressionActions>(actions_dag, ExpressionActionsSettings::fromContext(getContext()));
 
         res.pipeline.addSimpleTransform([&](const Block & in_header) -> ProcessorPtr
         {
@@ -406,7 +327,7 @@ BlockIO InterpreterInsertQuery::execute()
     else if (query.data && !query.has_tail) /// can execute without additional data
     {
         // res.out = std::move(out_streams.at(0));
-        res.in = std::make_shared<InputStreamFromASTInsertQuery>(query_ptr, nullptr, query_sample_block, context, nullptr);
+        res.in = std::make_shared<InputStreamFromASTInsertQuery>(query_ptr, nullptr, query_sample_block, getContext(), nullptr);
         res.in = std::make_shared<NullAndDoCopyBlockInputStream>(res.in, out_streams.at(0));
     }
     else
@@ -429,10 +350,10 @@ StorageID InterpreterInsertQuery::getDatabaseTable() const
 }
 
 
-void InterpreterInsertQuery::extendQueryLogElemImpl(QueryLogElement & elem, const ASTPtr &, const Context & context_) const
+void InterpreterInsertQuery::extendQueryLogElemImpl(QueryLogElement & elem, const ASTPtr &, ContextPtr context_) const
 {
     elem.query_kind = "Insert";
-    const auto & insert_table = context_.getInsertionTable();
+    const auto & insert_table = context_->getInsertionTable();
     if (!insert_table.empty())
     {
         elem.query_databases.insert(insert_table.getDatabaseName());
diff --git a/src/Interpreters/InterpreterInsertQuery.h b/src/Interpreters/InterpreterInsertQuery.h
index 85178bc73ad..71b8c827702 100644
--- a/src/Interpreters/InterpreterInsertQuery.h
+++ b/src/Interpreters/InterpreterInsertQuery.h
@@ -9,17 +9,14 @@
 namespace DB
 {
 
-class Context;
-
-
 /** Interprets the INSERT query.
   */
-class InterpreterInsertQuery : public IInterpreter
+class InterpreterInsertQuery : public IInterpreter, WithContext
 {
 public:
     InterpreterInsertQuery(
         const ASTPtr & query_ptr_,
-        const Context & context_,
+        ContextPtr context_,
         bool allow_materialized_ = false,
         bool no_squash_ = false,
         bool no_destination_ = false);
@@ -33,14 +30,13 @@ public:
 
     StorageID getDatabaseTable() const;
 
-    void extendQueryLogElemImpl(QueryLogElement & elem, const ASTPtr & ast, const Context & context_) const override;
+    void extendQueryLogElemImpl(QueryLogElement & elem, const ASTPtr & ast, ContextPtr context_) const override;
 
 private:
     StoragePtr getTable(ASTInsertQuery & query);
     Block getSampleBlock(const ASTInsertQuery & query, const StoragePtr & table, const StorageMetadataPtr & metadata_snapshot) const;
 
     ASTPtr query_ptr;
-    const Context & context;
     const bool allow_materialized;
     const bool no_squash;
     const bool no_destination;
diff --git a/src/Interpreters/InterpreterKillQueryQuery.cpp b/src/Interpreters/InterpreterKillQueryQuery.cpp
index c50659c6c45..88ddfefef63 100644
--- a/src/Interpreters/InterpreterKillQueryQuery.cpp
+++ b/src/Interpreters/InterpreterKillQueryQuery.cpp
@@ -74,7 +74,7 @@ static void insertResultRow(size_t n, CancellationCode code, const Block & sourc
         columns[col_num]->insertFrom(*source.getByName(header.getByPosition(col_num).name).column, n);
 }
 
-static QueryDescriptors extractQueriesExceptMeAndCheckAccess(const Block & processes_block, Context & context)
+static QueryDescriptors extractQueriesExceptMeAndCheckAccess(const Block & processes_block, ContextPtr context)
 {
     QueryDescriptors res;
     size_t num_processes = processes_block.rows();
@@ -82,7 +82,7 @@ static QueryDescriptors extractQueriesExceptMeAndCheckAccess(const Block & proce
 
     const ColumnString & query_id_col = typeid_cast<const ColumnString &>(*processes_block.getByName("query_id").column);
     const ColumnString & user_col = typeid_cast<const ColumnString &>(*processes_block.getByName("user").column);
-    const ClientInfo & my_client = context.getProcessListElement()->getClientInfo();
+    const ClientInfo & my_client = context->getProcessListElement()->getClientInfo();
 
     bool access_denied = false;
     std::optional<bool> is_kill_query_granted_value;
@@ -90,7 +90,7 @@ static QueryDescriptors extractQueriesExceptMeAndCheckAccess(const Block & proce
     {
         if (!is_kill_query_granted_value)
         {
-            is_kill_query_granted_value = context.getAccess()->isGranted(AccessType::KILL_QUERY);
+            is_kill_query_granted_value = context->getAccess()->isGranted(AccessType::KILL_QUERY);
             if (!*is_kill_query_granted_value)
                 access_denied = true;
         }
@@ -195,7 +195,7 @@ BlockIO InterpreterKillQueryQuery::execute()
     const auto & query = query_ptr->as<ASTKillQueryQuery &>();
 
     if (!query.cluster.empty())
-        return executeDDLQueryOnCluster(query_ptr, context, getRequiredAccessForDDLOnCluster());
+        return executeDDLQueryOnCluster(query_ptr, getContext(), getRequiredAccessForDDLOnCluster());
 
     BlockIO res_io;
     switch (query.type)
@@ -206,8 +206,8 @@ BlockIO InterpreterKillQueryQuery::execute()
         if (!processes_block)
             return res_io;
 
-        ProcessList & process_list = context.getProcessList();
-        QueryDescriptors queries_to_stop = extractQueriesExceptMeAndCheckAccess(processes_block, context);
+        ProcessList & process_list = getContext()->getProcessList();
+        QueryDescriptors queries_to_stop = extractQueriesExceptMeAndCheckAccess(processes_block, getContext());
 
         auto header = processes_block.cloneEmpty();
         header.insert(0, {ColumnString::create(), std::make_shared<DataTypeString>(), "kill_status"});
@@ -248,7 +248,7 @@ BlockIO InterpreterKillQueryQuery::execute()
         MutableColumns res_columns = header.cloneEmptyColumns();
         auto table_id = StorageID::createEmpty();
         AccessRightsElements required_access_rights;
-        auto access = context.getAccess();
+        auto access = getContext()->getAccess();
         bool access_denied = false;
 
         for (size_t i = 0; i < mutations_block.rows(); ++i)
@@ -259,14 +259,16 @@ BlockIO InterpreterKillQueryQuery::execute()
             CancellationCode code = CancellationCode::Unknown;
             if (!query.test)
             {
-                auto storage = DatabaseCatalog::instance().tryGetTable(table_id, context);
+                auto storage = DatabaseCatalog::instance().tryGetTable(table_id, getContext());
                 if (!storage)
                     code = CancellationCode::NotFound;
                 else
                 {
                     ParserAlterCommand parser;
-                    auto command_ast = parseQuery(parser, command_col.getDataAt(i).toString(), 0, context.getSettingsRef().max_parser_depth);
-                    required_access_rights = InterpreterAlterQuery::getRequiredAccessForCommand(command_ast->as<const ASTAlterCommand &>(), table_id.database_name, table_id.table_name);
+                    auto command_ast
+                        = parseQuery(parser, command_col.getDataAt(i).toString(), 0, getContext()->getSettingsRef().max_parser_depth);
+                    required_access_rights = InterpreterAlterQuery::getRequiredAccessForCommand(
+                        command_ast->as<const ASTAlterCommand &>(), table_id.database_name, table_id.table_name);
                     if (!access->isGranted(required_access_rights))
                     {
                         access_denied = true;
@@ -300,7 +302,7 @@ Block InterpreterKillQueryQuery::getSelectResult(const String & columns, const S
     if (where_expression)
         select_query += " WHERE " + queryToString(where_expression);
 
-    auto stream = executeQuery(select_query, context.getGlobalContext(), true).getInputStream();
+    auto stream = executeQuery(select_query, getContext()->getGlobalContext(), true).getInputStream();
     Block res = stream->read();
 
     if (res && stream->read())
diff --git a/src/Interpreters/InterpreterKillQueryQuery.h b/src/Interpreters/InterpreterKillQueryQuery.h
index 788703f8e6d..5ffd9a525a2 100644
--- a/src/Interpreters/InterpreterKillQueryQuery.h
+++ b/src/Interpreters/InterpreterKillQueryQuery.h
@@ -8,15 +8,12 @@
 namespace DB
 {
 
-class Context;
 class AccessRightsElements;
 
-
-class InterpreterKillQueryQuery final : public IInterpreter
+class InterpreterKillQueryQuery final : public IInterpreter, WithContext
 {
 public:
-    InterpreterKillQueryQuery(const ASTPtr & query_ptr_, Context & context_)
-        : query_ptr(query_ptr_), context(context_) {}
+    InterpreterKillQueryQuery(const ASTPtr & query_ptr_, ContextPtr context_) : WithContext(context_), query_ptr(query_ptr_) { }
 
     BlockIO execute() override;
 
@@ -25,8 +22,6 @@ private:
     Block getSelectResult(const String & columns, const String & table);
 
     ASTPtr query_ptr;
-    Context & context;
 };
 
-
 }
diff --git a/src/Interpreters/InterpreterOptimizeQuery.cpp b/src/Interpreters/InterpreterOptimizeQuery.cpp
index d8e9013e397..64de5ee0479 100644
--- a/src/Interpreters/InterpreterOptimizeQuery.cpp
+++ b/src/Interpreters/InterpreterOptimizeQuery.cpp
@@ -25,12 +25,12 @@ BlockIO InterpreterOptimizeQuery::execute()
     const auto & ast = query_ptr->as<ASTOptimizeQuery &>();
 
     if (!ast.cluster.empty())
-        return executeDDLQueryOnCluster(query_ptr, context, getRequiredAccess());
+        return executeDDLQueryOnCluster(query_ptr, getContext(), getRequiredAccess());
 
-    context.checkAccess(getRequiredAccess());
+    getContext()->checkAccess(getRequiredAccess());
 
-    auto table_id = context.resolveStorageID(ast, Context::ResolveOrdinary);
-    StoragePtr table = DatabaseCatalog::instance().getTable(table_id, context);
+    auto table_id = getContext()->resolveStorageID(ast, Context::ResolveOrdinary);
+    StoragePtr table = DatabaseCatalog::instance().getTable(table_id, getContext());
     auto metadata_snapshot = table->getInMemoryMetadataPtr();
 
     // Empty list of names means we deduplicate by all columns, but user can explicitly state which columns to use.
@@ -40,7 +40,8 @@ BlockIO InterpreterOptimizeQuery::execute()
         // User requested custom set of columns for deduplication, possibly with Column Transformer expression.
         {
             // Expand asterisk, column transformers, etc into list of column names.
-            const auto cols = processColumnTransformers(context.getCurrentDatabase(), table, metadata_snapshot, ast.deduplicate_by_columns);
+            const auto cols
+                = processColumnTransformers(getContext()->getCurrentDatabase(), table, metadata_snapshot, ast.deduplicate_by_columns);
             for (const auto & col : cols->children)
                 column_names.emplace_back(col->getColumnName());
         }
@@ -68,7 +69,7 @@ BlockIO InterpreterOptimizeQuery::execute()
         }
     }
 
-    table->optimize(query_ptr, metadata_snapshot, ast.partition, ast.final, ast.deduplicate, column_names, context);
+    table->optimize(query_ptr, metadata_snapshot, ast.partition, ast.final, ast.deduplicate, column_names, getContext());
 
     return {};
 }
diff --git a/src/Interpreters/InterpreterOptimizeQuery.h b/src/Interpreters/InterpreterOptimizeQuery.h
index faf336a0e98..8491fe8df49 100644
--- a/src/Interpreters/InterpreterOptimizeQuery.h
+++ b/src/Interpreters/InterpreterOptimizeQuery.h
@@ -6,19 +6,15 @@
 
 namespace DB
 {
-class Context;
-class AccessRightsElements;
 
+class AccessRightsElements;
 
 /** Just call method "optimize" for table.
   */
-class InterpreterOptimizeQuery : public IInterpreter
+class InterpreterOptimizeQuery : public IInterpreter, WithContext
 {
 public:
-    InterpreterOptimizeQuery(const ASTPtr & query_ptr_, Context & context_)
-        : query_ptr(query_ptr_), context(context_)
-    {
-    }
+    InterpreterOptimizeQuery(const ASTPtr & query_ptr_, ContextPtr context_) : WithContext(context_), query_ptr(query_ptr_) {}
 
     BlockIO execute() override;
 
@@ -26,7 +22,6 @@ private:
     AccessRightsElements getRequiredAccess() const;
 
     ASTPtr query_ptr;
-    Context & context;
 };
 
 }
diff --git a/src/Interpreters/InterpreterRenameQuery.cpp b/src/Interpreters/InterpreterRenameQuery.cpp
index 923a342d9ea..515559ad903 100644
--- a/src/Interpreters/InterpreterRenameQuery.cpp
+++ b/src/Interpreters/InterpreterRenameQuery.cpp
@@ -18,8 +18,8 @@ namespace ErrorCodes
     extern const int NOT_IMPLEMENTED;
 }
 
-InterpreterRenameQuery::InterpreterRenameQuery(const ASTPtr & query_ptr_, Context & context_)
-    : query_ptr(query_ptr_), context(context_)
+InterpreterRenameQuery::InterpreterRenameQuery(const ASTPtr & query_ptr_, ContextPtr context_)
+    : WithContext(context_), query_ptr(query_ptr_)
 {
 }
 
@@ -29,12 +29,12 @@ BlockIO InterpreterRenameQuery::execute()
     const auto & rename = query_ptr->as<const ASTRenameQuery &>();
 
     if (!rename.cluster.empty())
-        return executeDDLQueryOnCluster(query_ptr, context, getRequiredAccess());
+        return executeDDLQueryOnCluster(query_ptr, getContext(), getRequiredAccess());
 
-    context.checkAccess(getRequiredAccess());
+    getContext()->checkAccess(getRequiredAccess());
 
-    String path = context.getPath();
-    String current_database = context.getCurrentDatabase();
+    String path = getContext()->getPath();
+    String current_database = getContext()->getCurrentDatabase();
 
     /** In case of error while renaming, it is possible that only part of tables was renamed
       *  or we will be in inconsistent state. (It is worth to be fixed.)
@@ -77,10 +77,11 @@ BlockIO InterpreterRenameQuery::executeToTables(const ASTRenameQuery & rename, c
     for (const auto & elem : descriptions)
     {
         if (!rename.exchange)
-            database_catalog.assertTableDoesntExist(StorageID(elem.to_database_name, elem.to_table_name), context);
+            database_catalog.assertTableDoesntExist(StorageID(elem.to_database_name, elem.to_table_name), getContext());
 
         DatabasePtr database = database_catalog.getDatabase(elem.from_database_name);
-        if (typeid_cast<DatabaseReplicated *>(database.get()) && context.getClientInfo().query_kind != ClientInfo::QueryKind::SECONDARY_QUERY)
+        if (typeid_cast<DatabaseReplicated *>(database.get())
+            && getContext()->getClientInfo().query_kind != ClientInfo::QueryKind::SECONDARY_QUERY)
         {
             if (1 < descriptions.size())
                 throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Database {} is Replicated, "
@@ -90,12 +91,12 @@ BlockIO InterpreterRenameQuery::executeToTables(const ASTRenameQuery & rename, c
             UniqueTableName to(elem.to_database_name, elem.to_table_name);
             ddl_guards[from]->releaseTableLock();
             ddl_guards[to]->releaseTableLock();
-            return typeid_cast<DatabaseReplicated *>(database.get())->tryEnqueueReplicatedDDL(query_ptr, context);
+            return typeid_cast<DatabaseReplicated *>(database.get())->tryEnqueueReplicatedDDL(query_ptr, getContext());
         }
         else
         {
             database->renameTable(
-                context,
+                getContext(),
                 elem.from_table_name,
                 *database_catalog.getDatabase(elem.to_database_name),
                 elem.to_table_name,
@@ -140,19 +141,19 @@ AccessRightsElements InterpreterRenameQuery::getRequiredAccess() const
     return required_access;
 }
 
-void InterpreterRenameQuery::extendQueryLogElemImpl(QueryLogElement & elem, const ASTPtr & ast, const Context &) const
+void InterpreterRenameQuery::extendQueryLogElemImpl(QueryLogElement & elem, const ASTPtr & ast, ContextPtr) const
 {
     elem.query_kind = "Rename";
     const auto & rename = ast->as<const ASTRenameQuery &>();
     for (const auto & element : rename.elements)
     {
         {
-            String database = backQuoteIfNeed(element.from.database.empty() ? context.getCurrentDatabase() : element.from.database);
+            String database = backQuoteIfNeed(element.from.database.empty() ? getContext()->getCurrentDatabase() : element.from.database);
             elem.query_databases.insert(database);
             elem.query_tables.insert(database + "." + backQuoteIfNeed(element.from.table));
         }
         {
-            String database = backQuoteIfNeed(element.to.database.empty() ? context.getCurrentDatabase() : element.to.database);
+            String database = backQuoteIfNeed(element.to.database.empty() ? getContext()->getCurrentDatabase() : element.to.database);
             elem.query_databases.insert(database);
             elem.query_tables.insert(database + "." + backQuoteIfNeed(element.to.table));
         }
diff --git a/src/Interpreters/InterpreterRenameQuery.h b/src/Interpreters/InterpreterRenameQuery.h
index 0da25f63e8d..49fdd50f52d 100644
--- a/src/Interpreters/InterpreterRenameQuery.h
+++ b/src/Interpreters/InterpreterRenameQuery.h
@@ -7,7 +7,6 @@
 namespace DB
 {
 
-class Context;
 class AccessRightsElements;
 class DDLGuard;
 
@@ -49,12 +48,12 @@ using TableGuards = std::map<UniqueTableName, std::unique_ptr<DDLGuard>>;
 /** Rename one table
   *  or rename many tables at once.
   */
-class InterpreterRenameQuery : public IInterpreter
+class InterpreterRenameQuery : public IInterpreter, WithContext
 {
 public:
-    InterpreterRenameQuery(const ASTPtr & query_ptr_, Context & context_);
+    InterpreterRenameQuery(const ASTPtr & query_ptr_, ContextPtr context_);
     BlockIO execute() override;
-    void extendQueryLogElemImpl(QueryLogElement & elem, const ASTPtr & ast, const Context &) const override;
+    void extendQueryLogElemImpl(QueryLogElement & elem, const ASTPtr & ast, ContextPtr) const override;
 
 private:
     BlockIO executeToTables(const ASTRenameQuery & rename, const RenameDescriptions & descriptions, TableGuards & ddl_guards);
@@ -63,7 +62,6 @@ private:
     AccessRightsElements getRequiredAccess() const;
 
     ASTPtr query_ptr;
-    Context & context;
 };
 
 }
diff --git a/src/Interpreters/InterpreterSelectQuery.cpp b/src/Interpreters/InterpreterSelectQuery.cpp
index da6ad7ab102..06922527eaa 100644
--- a/src/Interpreters/InterpreterSelectQuery.cpp
+++ b/src/Interpreters/InterpreterSelectQuery.cpp
@@ -37,7 +37,6 @@
 #include <Interpreters/replaceAliasColumnsInQuery.h>
 
 #include <Processors/Pipe.h>
-#include <Processors/QueryPlan/AddingDelayedSourceStep.h>
 #include <Processors/QueryPlan/AggregatingStep.h>
 #include <Processors/QueryPlan/ArrayJoinStep.h>
 #include <Processors/QueryPlan/CreatingSetsStep.h>
@@ -62,6 +61,7 @@
 #include <Processors/QueryPlan/SettingQuotaAndLimitsStep.h>
 #include <Processors/QueryPlan/TotalsHavingStep.h>
 #include <Processors/QueryPlan/WindowStep.h>
+#include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
 #include <Processors/Sources/NullSource.h>
 #include <Processors/Sources/SourceFromInputStream.h>
 #include <Processors/Transforms/AggregatingTransform.h>
@@ -81,7 +81,7 @@
 #include <Common/typeid_cast.h>
 #include <Common/checkStackSize.h>
 #include <ext/map.h>
-#include <ext/scope_guard.h>
+#include <ext/scope_guard_safe.h>
 #include <memory>
 
 
@@ -104,8 +104,7 @@ namespace ErrorCodes
 }
 
 /// Assumes `storage` is set and the table filter (row-level security) is not empty.
-String InterpreterSelectQuery::generateFilterActions(
-    ActionsDAGPtr & actions, const ASTPtr & row_policy_filter, const Names & prerequisite_columns) const
+String InterpreterSelectQuery::generateFilterActions(ActionsDAGPtr & actions, const Names & prerequisite_columns) const
 {
     const auto & db_name = table_id.getDatabaseName();
     const auto & table_name = table_id.getTableName();
@@ -138,16 +137,23 @@ String InterpreterSelectQuery::generateFilterActions(
     table_expr->children.push_back(table_expr->database_and_table_name);
 
     /// Using separate expression analyzer to prevent any possible alias injection
-    auto syntax_result = TreeRewriter(*context).analyzeSelect(query_ast, TreeRewriterResult({}, storage, metadata_snapshot));
-    SelectQueryExpressionAnalyzer analyzer(query_ast, syntax_result, *context, metadata_snapshot);
+    auto syntax_result = TreeRewriter(context).analyzeSelect(query_ast, TreeRewriterResult({}, storage, metadata_snapshot));
+    SelectQueryExpressionAnalyzer analyzer(query_ast, syntax_result, context, metadata_snapshot);
     actions = analyzer.simpleSelectActions();
 
-    return expr_list->children.at(0)->getColumnName();
+    auto column_name = expr_list->children.at(0)->getColumnName();
+    actions->removeUnusedActions(NameSet{column_name});
+    actions->projectInput(false);
+
+    for (const auto * node : actions->getInputs())
+        actions->getIndex().push_back(node);
+
+    return column_name;
 }
 
 InterpreterSelectQuery::InterpreterSelectQuery(
     const ASTPtr & query_ptr_,
-    const Context & context_,
+    ContextPtr context_,
     const SelectQueryOptions & options_,
     const Names & required_result_column_names_)
     : InterpreterSelectQuery(query_ptr_, context_, nullptr, std::nullopt, nullptr, options_, required_result_column_names_)
@@ -156,7 +162,7 @@ InterpreterSelectQuery::InterpreterSelectQuery(
 
 InterpreterSelectQuery::InterpreterSelectQuery(
     const ASTPtr & query_ptr_,
-    const Context & context_,
+    ContextPtr context_,
     const BlockInputStreamPtr & input_,
     const SelectQueryOptions & options_)
     : InterpreterSelectQuery(query_ptr_, context_, input_, std::nullopt, nullptr, options_.copy().noSubquery())
@@ -164,7 +170,7 @@ InterpreterSelectQuery::InterpreterSelectQuery(
 
 InterpreterSelectQuery::InterpreterSelectQuery(
         const ASTPtr & query_ptr_,
-        const Context & context_,
+        ContextPtr context_,
         Pipe input_pipe_,
         const SelectQueryOptions & options_)
         : InterpreterSelectQuery(query_ptr_, context_, nullptr, std::move(input_pipe_), nullptr, options_.copy().noSubquery())
@@ -172,7 +178,7 @@ InterpreterSelectQuery::InterpreterSelectQuery(
 
 InterpreterSelectQuery::InterpreterSelectQuery(
     const ASTPtr & query_ptr_,
-    const Context & context_,
+    ContextPtr context_,
     const StoragePtr & storage_,
     const StorageMetadataPtr & metadata_snapshot_,
     const SelectQueryOptions & options_)
@@ -185,19 +191,19 @@ InterpreterSelectQuery::~InterpreterSelectQuery() = default;
 /** There are no limits on the maximum size of the result for the subquery.
   *  Since the result of the query is not the result of the entire query.
   */
-static Context getSubqueryContext(const Context & context)
+static ContextPtr getSubqueryContext(ContextPtr context)
 {
-    Context subquery_context = context;
-    Settings subquery_settings = context.getSettings();
+    auto subquery_context = Context::createCopy(context);
+    Settings subquery_settings = context->getSettings();
     subquery_settings.max_result_rows = 0;
     subquery_settings.max_result_bytes = 0;
     /// The calculation of extremes does not make sense and is not necessary (if you do it, then the extremes of the subquery can be taken for whole query).
     subquery_settings.extremes = false;
-    subquery_context.setSettings(subquery_settings);
+    subquery_context->setSettings(subquery_settings);
     return subquery_context;
 }
 
-static void rewriteMultipleJoins(ASTPtr & query, const TablesWithColumns & tables, const String & database)
+static void rewriteMultipleJoins(ASTPtr & query, const TablesWithColumns & tables, const String & database, const Settings & settings)
 {
     ASTSelectQuery & select = query->as<ASTSelectQuery &>();
 
@@ -207,6 +213,7 @@ static void rewriteMultipleJoins(ASTPtr & query, const TablesWithColumns & table
     QueryAliasesNoSubqueriesVisitor(aliases).visit(select.select());
 
     CrossToInnerJoinVisitor::Data cross_to_inner{tables, aliases, database};
+    cross_to_inner.cross_to_inner_join_rewrite = settings.cross_to_inner_join_rewrite;
     CrossToInnerJoinVisitor(cross_to_inner).visit(query);
 
     JoinToSubqueryTransformVisitor::Data join_to_subs_data{tables, aliases};
@@ -215,7 +222,7 @@ static void rewriteMultipleJoins(ASTPtr & query, const TablesWithColumns & table
 
 /// Checks that the current user has the SELECT privilege.
 static void checkAccessRightsForSelect(
-    const Context & context,
+    ContextPtr context,
     const StorageID & table_id,
     const StorageMetadataPtr & table_metadata,
     const Strings & required_columns,
@@ -228,19 +235,19 @@ static void checkAccessRightsForSelect(
         /// In this case just checking access for `required_columns` doesn't work correctly
         /// because `required_columns` will contain the name of a column of minimum size (see TreeRewriterResult::collectUsedColumns())
         /// which is probably not the same column as the column the current user has access to.
-        auto access = context.getAccess();
+        auto access = context->getAccess();
         for (const auto & column : table_metadata->getColumns())
         {
             if (access->isGranted(AccessType::SELECT, table_id.database_name, table_id.table_name, column.name))
                 return;
         }
-        throw Exception(context.getUserName() + ": Not enough privileges. "
+        throw Exception(context->getUserName() + ": Not enough privileges. "
                         "To execute this query it's necessary to have grant SELECT for at least one column on " + table_id.getFullTableName(),
                         ErrorCodes::ACCESS_DENIED);
     }
 
     /// General check.
-    context.checkAccess(AccessType::SELECT, table_id, required_columns);
+    context->checkAccess(AccessType::SELECT, table_id, required_columns);
 }
 
 /// Returns true if we should ignore quotas and limits for a specified table in the system database.
@@ -257,7 +264,7 @@ static bool shouldIgnoreQuotaAndLimits(const StorageID & table_id)
 
 InterpreterSelectQuery::InterpreterSelectQuery(
     const ASTPtr & query_ptr_,
-    const Context & context_,
+    ContextPtr context_,
     const BlockInputStreamPtr & input_,
     std::optional<Pipe> input_pipe_,
     const StoragePtr & storage_,
@@ -301,7 +308,7 @@ InterpreterSelectQuery::InterpreterSelectQuery(
         ApplyWithSubqueryVisitor().visit(query_ptr);
     }
 
-    JoinedTables joined_tables(getSubqueryContext(*context), getSelectQuery());
+    JoinedTables joined_tables(getSubqueryContext(context), getSelectQuery());
 
     bool got_storage_from_query = false;
     if (!has_input && !storage)
@@ -324,7 +331,7 @@ InterpreterSelectQuery::InterpreterSelectQuery(
     /// Rewrite JOINs
     if (!has_input && joined_tables.tablesCount() > 1)
     {
-        rewriteMultipleJoins(query_ptr, joined_tables.tablesWithColumns(), context->getCurrentDatabase());
+        rewriteMultipleJoins(query_ptr, joined_tables.tablesWithColumns(), context->getCurrentDatabase(), context->getSettingsRef());
 
         joined_tables.reset(getSelectQuery());
         joined_tables.resolveTables();
@@ -352,7 +359,6 @@ InterpreterSelectQuery::InterpreterSelectQuery(
     ASTSelectQuery & query = getSelectQuery();
     std::shared_ptr<TableJoin> table_join = joined_tables.makeTableJoin(query);
 
-    ASTPtr row_policy_filter;
     if (storage)
         row_policy_filter = context->getRowPolicyCondition(table_id.getDatabaseName(), table_id.getTableName(), RowPolicy::SELECT_FILTER);
 
@@ -369,7 +375,7 @@ InterpreterSelectQuery::InterpreterSelectQuery(
         if (view)
             view->replaceWithSubquery(getSelectQuery(), view_table, metadata_snapshot);
 
-        syntax_analyzer_result = TreeRewriter(*context).analyzeSelect(
+        syntax_analyzer_result = TreeRewriter(context).analyzeSelect(
             query_ptr,
             TreeRewriterResult(source_header.getNamesAndTypesList(), storage, metadata_snapshot),
             options, joined_tables.tablesWithColumns(), required_result_column_names, table_join);
@@ -377,7 +383,7 @@ InterpreterSelectQuery::InterpreterSelectQuery(
         /// Save scalar sub queries's results in the query context
         if (!options.only_analyze && context->hasQueryContext())
             for (const auto & it : syntax_analyzer_result->getScalars())
-                context->getQueryContext().addScalar(it.first, it.second);
+                context->getQueryContext()->addScalar(it.first, it.second);
 
         if (view)
         {
@@ -386,7 +392,7 @@ InterpreterSelectQuery::InterpreterSelectQuery(
             view = nullptr;
         }
 
-        if (try_move_to_prewhere && storage && !row_policy_filter && query.where() && !query.prewhere() && !query.final())
+        if (try_move_to_prewhere && storage && query.where() && !query.prewhere())
         {
             /// PREWHERE optimization: transfer some condition from WHERE to PREWHERE if enabled and viable
             if (const auto & column_sizes = storage->getColumnSizes(); !column_sizes.empty())
@@ -400,12 +406,18 @@ InterpreterSelectQuery::InterpreterSelectQuery(
                 current_info.query = query_ptr;
                 current_info.syntax_analyzer_result = syntax_analyzer_result;
 
-                MergeTreeWhereOptimizer{current_info, *context, std::move(column_compressed_sizes), metadata_snapshot, syntax_analyzer_result->requiredSourceColumns(), log};
+                MergeTreeWhereOptimizer{
+                    current_info,
+                    context,
+                    std::move(column_compressed_sizes),
+                    metadata_snapshot,
+                    syntax_analyzer_result->requiredSourceColumns(),
+                    log};
             }
         }
 
         query_analyzer = std::make_unique<SelectQueryExpressionAnalyzer>(
-                query_ptr, syntax_analyzer_result, *context, metadata_snapshot,
+                query_ptr, syntax_analyzer_result, context, metadata_snapshot,
                 NameSet(required_result_column_names.begin(), required_result_column_names.end()),
                 !options.only_analyze, options, std::move(subquery_for_sets));
 
@@ -446,20 +458,23 @@ InterpreterSelectQuery::InterpreterSelectQuery(
 
         if (storage)
         {
-            source_header = metadata_snapshot->getSampleBlockForColumns(required_columns, storage->getVirtuals(), storage->getStorageID());
-
             /// Fix source_header for filter actions.
             if (row_policy_filter)
             {
-                filter_info = std::make_shared<FilterInfo>();
-                filter_info->column_name = generateFilterActions(filter_info->actions_dag, row_policy_filter, required_columns);
-                source_header = metadata_snapshot->getSampleBlockForColumns(
-                        filter_info->actions_dag->getRequiredColumns().getNames(), storage->getVirtuals(), storage->getStorageID());
-            }
-        }
+                filter_info = std::make_shared<FilterDAGInfo>();
+                filter_info->column_name = generateFilterActions(filter_info->actions, required_columns);
 
-        if (!options.only_analyze && storage && filter_info && query.prewhere())
-            throw Exception("PREWHERE is not supported if the table is filtered by row-level security expression", ErrorCodes::ILLEGAL_PREWHERE);
+                auto required_columns_from_filter = filter_info->actions->getRequiredColumns();
+
+                for (const auto & column : required_columns_from_filter)
+                {
+                    if (required_columns.end() == std::find(required_columns.begin(), required_columns.end(), column.name))
+                        required_columns.push_back(column.name);
+                }
+            }
+
+            source_header = metadata_snapshot->getSampleBlockForColumns(required_columns, storage->getVirtuals(), storage->getStorageID());
+        }
 
         /// Calculate structure of the result.
         result_header = getSampleBlockImpl();
@@ -493,7 +508,10 @@ InterpreterSelectQuery::InterpreterSelectQuery(
 
     if (need_analyze_again)
     {
-        subquery_for_sets = std::move(query_analyzer->getSubqueriesForSets());
+        LOG_TRACE(log, "Running 'analyze' second time");
+        query_analyzer->getSubqueriesForSets().clear();
+        subquery_for_sets = SubqueriesForSets();
+
         /// Do not try move conditions to PREWHERE for the second time.
         /// Otherwise, we won't be able to fallback from inefficient PREWHERE to WHERE later.
         analyze(/* try_move_to_prewhere = */ false);
@@ -507,7 +525,7 @@ InterpreterSelectQuery::InterpreterSelectQuery(
     {
         /// The current user should have the SELECT privilege.
         /// If this table_id is for a table function we don't check access rights here because in this case they have been already checked in ITableFunction::execute().
-        checkAccessRightsForSelect(*context, table_id, metadata_snapshot, required_columns, *syntax_analyzer_result);
+        checkAccessRightsForSelect(context, table_id, metadata_snapshot, required_columns, *syntax_analyzer_result);
 
         /// Remove limits for some tables in the `system` database.
         if (shouldIgnoreQuotaAndLimits(table_id) && (joined_tables.tablesCount() <= 1))
@@ -548,7 +566,9 @@ BlockIO InterpreterSelectQuery::execute()
 
     buildQueryPlan(query_plan);
 
-    res.pipeline = std::move(*query_plan.buildQueryPipeline());
+    res.pipeline = std::move(*query_plan.buildQueryPipeline(
+        QueryPlanOptimizationSettings::fromContext(context),
+        BuildQueryPipelineSettings::fromContext(context)));
     return res;
 }
 
@@ -559,7 +579,7 @@ Block InterpreterSelectQuery::getSampleBlockImpl()
     query_info.query = query_ptr;
 
     if (storage && !options.only_analyze)
-        from_stage = storage->getQueryProcessingStage(*context, options.to_stage, query_info);
+        from_stage = storage->getQueryProcessingStage(context, options.to_stage, query_info);
 
     /// Do I need to perform the first part of the pipeline?
     /// Running on remote servers during distributed processing or if query is not distributed.
@@ -593,7 +613,9 @@ Block InterpreterSelectQuery::getSampleBlockImpl()
 
         if (analysis_result.prewhere_info)
         {
-            ExpressionActions(analysis_result.prewhere_info->prewhere_actions).execute(header);
+            ExpressionActions(
+                analysis_result.prewhere_info->prewhere_actions,
+                ExpressionActionsSettings::fromContext(context)).execute(header);
             if (analysis_result.prewhere_info->remove_prewhere_column)
                 header.erase(analysis_result.prewhere_info->prewhere_column_name);
         }
@@ -639,7 +661,7 @@ Block InterpreterSelectQuery::getSampleBlockImpl()
     return analysis_result.final_projection->getResultColumns();
 }
 
-static Field getWithFillFieldValue(const ASTPtr & node, const Context & context)
+static Field getWithFillFieldValue(const ASTPtr & node, ContextPtr context)
 {
     const auto & [field, type] = evaluateConstantExpression(node, context);
 
@@ -649,7 +671,7 @@ static Field getWithFillFieldValue(const ASTPtr & node, const Context & context)
     return field;
 }
 
-static FillColumnDescription getWithFillDescription(const ASTOrderByElement & order_by_elem, const Context & context)
+static FillColumnDescription getWithFillDescription(const ASTOrderByElement & order_by_elem, ContextPtr context)
 {
     FillColumnDescription descr;
     if (order_by_elem.fill_from)
@@ -694,7 +716,7 @@ static FillColumnDescription getWithFillDescription(const ASTOrderByElement & or
     return descr;
 }
 
-static SortDescription getSortDescription(const ASTSelectQuery & query, const Context & context)
+static SortDescription getSortDescription(const ASTSelectQuery & query, ContextPtr context)
 {
     SortDescription order_descr;
     order_descr.reserve(query.orderBy()->children.size());
@@ -734,7 +756,7 @@ static SortDescription getSortDescriptionFromGroupBy(const ASTSelectQuery & quer
     return order_descr;
 }
 
-static UInt64 getLimitUIntValue(const ASTPtr & node, const Context & context, const std::string & expr)
+static UInt64 getLimitUIntValue(const ASTPtr & node, ContextPtr context, const std::string & expr)
 {
     const auto & [field, type] = evaluateConstantExpression(node, context);
 
@@ -749,7 +771,7 @@ static UInt64 getLimitUIntValue(const ASTPtr & node, const Context & context, co
 }
 
 
-static std::pair<UInt64, UInt64> getLimitLengthAndOffset(const ASTSelectQuery & query, const Context & context)
+static std::pair<UInt64, UInt64> getLimitLengthAndOffset(const ASTSelectQuery & query, ContextPtr context)
 {
     UInt64 length = 0;
     UInt64 offset = 0;
@@ -766,7 +788,7 @@ static std::pair<UInt64, UInt64> getLimitLengthAndOffset(const ASTSelectQuery &
 }
 
 
-static UInt64 getLimitForSorting(const ASTSelectQuery & query, const Context & context)
+static UInt64 getLimitForSorting(const ASTSelectQuery & query, ContextPtr context)
 {
     /// Partial sort can be done if there is LIMIT but no DISTINCT or LIMIT BY, neither ARRAY JOIN.
     if (!query.distinct && !query.limitBy() && !query.limit_with_ties && !query.arrayJoinExpressionList() && query.limitLength())
@@ -838,13 +860,64 @@ void InterpreterSelectQuery::executeImpl(QueryPlan & query_plan, const BlockInpu
     bool to_aggregation_stage = false;
     bool from_aggregation_stage = false;
 
+    if (expressions.filter_info)
+    {
+        if (!expressions.prewhere_info)
+        {
+            const bool does_storage_support_prewhere = !input && !input_pipe && storage && storage->supportsPrewhere();
+            if (does_storage_support_prewhere && settings.optimize_move_to_prewhere)
+            {
+                /// Execute row level filter in prewhere as a part of "move to prewhere" optimization.
+                expressions.prewhere_info = std::make_shared<PrewhereDAGInfo>(
+                    std::move(expressions.filter_info->actions),
+                    std::move(expressions.filter_info->column_name));
+                expressions.prewhere_info->prewhere_actions->projectInput(false);
+                expressions.prewhere_info->remove_prewhere_column = expressions.filter_info->do_remove_column;
+                expressions.prewhere_info->need_filter = true;
+                expressions.filter_info = nullptr;
+            }
+        }
+        else
+        {
+            /// Add row level security actions to prewhere.
+            expressions.prewhere_info->row_level_filter_actions = std::move(expressions.filter_info->actions);
+            expressions.prewhere_info->row_level_column_name = std::move(expressions.filter_info->column_name);
+            expressions.prewhere_info->row_level_filter_actions->projectInput(false);
+            expressions.filter_info = nullptr;
+        }
+    }
+
     if (options.only_analyze)
     {
         auto read_nothing = std::make_unique<ReadNothingStep>(source_header);
         query_plan.addStep(std::move(read_nothing));
 
+        if (expressions.filter_info)
+        {
+            auto row_level_security_step = std::make_unique<FilterStep>(
+                query_plan.getCurrentDataStream(),
+                expressions.filter_info->actions,
+                expressions.filter_info->column_name,
+                expressions.filter_info->do_remove_column);
+
+            row_level_security_step->setStepDescription("Row-level security filter");
+            query_plan.addStep(std::move(row_level_security_step));
+        }
+
         if (expressions.prewhere_info)
         {
+            if (expressions.prewhere_info->row_level_filter_actions)
+            {
+                auto row_level_filter_step = std::make_unique<FilterStep>(
+                    query_plan.getCurrentDataStream(),
+                    expressions.prewhere_info->row_level_filter_actions,
+                    expressions.prewhere_info->row_level_column_name,
+                    false);
+
+                row_level_filter_step->setStepDescription("Row-level security filter (PREWHERE)");
+                query_plan.addStep(std::move(row_level_filter_step));
+            }
+
             auto prewhere_step = std::make_unique<FilterStep>(
                     query_plan.getCurrentDataStream(),
                     expressions.prewhere_info->prewhere_actions,
@@ -893,11 +966,8 @@ void InterpreterSelectQuery::executeImpl(QueryPlan & query_plan, const BlockInpu
         if (options.to_stage == QueryProcessingStage::WithMergeableStateAfterAggregation)
             to_aggregation_stage = true;
 
-        if (storage && expressions.filter_info && expressions.prewhere_info)
-            throw Exception("PREWHERE is not supported if the table is filtered by row-level security expression", ErrorCodes::ILLEGAL_PREWHERE);
-
-        /** Read the data from Storage. from_stage - to what stage the request was completed in Storage. */
-        executeFetchColumns(from_stage, query_plan, expressions.prewhere_info, expressions.columns_to_remove_after_prewhere);
+        /// Read the data from Storage. from_stage - to what stage the request was completed in Storage.
+        executeFetchColumns(from_stage, query_plan);
 
         LOG_TRACE(log, "{} -> {}", QueryProcessingStage::toString(from_stage), QueryProcessingStage::toString(options.to_stage));
     }
@@ -962,11 +1032,11 @@ void InterpreterSelectQuery::executeImpl(QueryPlan & query_plan, const BlockInpu
 
         if (expressions.first_stage)
         {
-            if (expressions.hasFilter())
+            if (expressions.filter_info)
             {
                 auto row_level_security_step = std::make_unique<FilterStep>(
                         query_plan.getCurrentDataStream(),
-                        expressions.filter_info->actions_dag,
+                        expressions.filter_info->actions,
                         expressions.filter_info->column_name,
                         expressions.filter_info->do_remove_column);
 
@@ -1002,31 +1072,28 @@ void InterpreterSelectQuery::executeImpl(QueryPlan & query_plan, const BlockInpu
                 query_plan.addStep(std::move(before_join_step));
             }
 
+            /// Optional step to convert key columns to common supertype.
+            /// Columns with changed types will be returned to user,
+            ///  so its only suitable for `USING` join.
+            if (expressions.converting_join_columns)
+            {
+                QueryPlanStepPtr convert_join_step = std::make_unique<ExpressionStep>(
+                    query_plan.getCurrentDataStream(),
+                    expressions.converting_join_columns);
+                convert_join_step->setStepDescription("Convert JOIN columns");
+                query_plan.addStep(std::move(convert_join_step));
+            }
+
             if (expressions.hasJoin())
             {
-                Block join_result_sample;
-                JoinPtr join = expressions.join;
-
-                join_result_sample = JoiningTransform::transformHeader(
-                    query_plan.getCurrentDataStream().header, expressions.join);
-
                 QueryPlanStepPtr join_step = std::make_unique<JoinStep>(
                     query_plan.getCurrentDataStream(),
-                    expressions.join);
+                    expressions.join,
+                    expressions.join_has_delayed_stream,
+                    settings.max_block_size);
 
                 join_step->setStepDescription("JOIN");
                 query_plan.addStep(std::move(join_step));
-
-                if (expressions.join_has_delayed_stream)
-                {
-                    auto stream = std::make_shared<LazyNonJoinedBlockInputStream>(*join, join_result_sample, settings.max_block_size);
-                    auto source = std::make_shared<SourceFromInputStream>(std::move(stream));
-                    auto add_non_joined_rows_step = std::make_unique<AddingDelayedSourceStep>(
-                            query_plan.getCurrentDataStream(), std::move(source));
-
-                    add_non_joined_rows_step->setStepDescription("Add non-joined rows after JOIN");
-                    query_plan.addStep(std::move(add_non_joined_rows_step));
-                }
             }
 
             if (expressions.hasWhere())
@@ -1123,7 +1190,7 @@ void InterpreterSelectQuery::executeImpl(QueryPlan & query_plan, const BlockInpu
             bool has_withfill = false;
             if (query.orderBy())
             {
-                SortDescription order_descr = getSortDescription(query, *context);
+                SortDescription order_descr = getSortDescription(query, context);
                 for (auto & desc : order_descr)
                     if (desc.with_fill)
                     {
@@ -1225,11 +1292,27 @@ void InterpreterSelectQuery::addEmptySourceToQueryPlan(QueryPlan & query_plan, c
 
     if (query_info.prewhere_info)
     {
-        if (query_info.prewhere_info->alias_actions)
+        auto & prewhere_info = *query_info.prewhere_info;
+
+        if (prewhere_info.alias_actions)
         {
             pipe.addSimpleTransform([&](const Block & header)
             {
-                return std::make_shared<ExpressionTransform>(header, query_info.prewhere_info->alias_actions);
+                return std::make_shared<ExpressionTransform>(
+                    header,
+                    prewhere_info.alias_actions);
+            });
+        }
+
+        if (prewhere_info.row_level_filter)
+        {
+            pipe.addSimpleTransform([&](const Block & header)
+            {
+                return std::make_shared<FilterTransform>(
+                    header,
+                    prewhere_info.row_level_filter,
+                    prewhere_info.row_level_column_name,
+                    true);
             });
         }
 
@@ -1237,21 +1320,22 @@ void InterpreterSelectQuery::addEmptySourceToQueryPlan(QueryPlan & query_plan, c
         {
             return std::make_shared<FilterTransform>(
                 header,
-                query_info.prewhere_info->prewhere_actions,
-                query_info.prewhere_info->prewhere_column_name,
-                query_info.prewhere_info->remove_prewhere_column);
+                prewhere_info.prewhere_actions,
+                prewhere_info.prewhere_column_name,
+                prewhere_info.remove_prewhere_column);
         });
 
         // To remove additional columns
         // In some cases, we did not read any marks so that the pipeline.streams is empty
         // Thus, some columns in prewhere are not removed as expected
         // This leads to mismatched header in distributed table
-        if (query_info.prewhere_info->remove_columns_actions)
+        if (prewhere_info.remove_columns_actions)
         {
             pipe.addSimpleTransform([&](const Block & header)
             {
                 return std::make_shared<ExpressionTransform>(
-                        header, query_info.prewhere_info->remove_columns_actions);
+                    header,
+                    prewhere_info.remove_columns_actions);
             });
         }
     }
@@ -1261,12 +1345,13 @@ void InterpreterSelectQuery::addEmptySourceToQueryPlan(QueryPlan & query_plan, c
     query_plan.addStep(std::move(read_from_pipe));
 }
 
-void InterpreterSelectQuery::executeFetchColumns(
-    QueryProcessingStage::Enum processing_stage, QueryPlan & query_plan,
-    const PrewhereDAGInfoPtr & prewhere_info, const NameSet & columns_to_remove_after_prewhere)
+void InterpreterSelectQuery::executeFetchColumns(QueryProcessingStage::Enum processing_stage, QueryPlan & query_plan)
 {
     auto & query = getSelectQuery();
     const Settings & settings = context->getSettingsRef();
+    auto & expressions = analysis_result;
+    auto & prewhere_info = expressions.prewhere_info;
+    auto & columns_to_remove_after_prewhere = expressions.columns_to_remove_after_prewhere;
 
     /// Optimization for trivial query like SELECT count() FROM table.
     bool optimize_trivial_count =
@@ -1274,7 +1359,7 @@ void InterpreterSelectQuery::executeFetchColumns(
         && (settings.max_parallel_replicas <= 1)
         && storage
         && storage->getName() != "MaterializeMySQL"
-        && !filter_info
+        && !row_policy_filter
         && processing_stage == QueryProcessingStage::FetchColumns
         && query_analyzer->hasAggregation()
         && (query_analyzer->aggregates().size() == 1)
@@ -1297,7 +1382,7 @@ void InterpreterSelectQuery::executeFetchColumns(
             temp_query_info.syntax_analyzer_result = syntax_analyzer_result;
             temp_query_info.sets = query_analyzer->getPreparedSets();
 
-            num_rows = storage->totalRowsByPartitionPredicate(temp_query_info, *context);
+            num_rows = storage->totalRowsByPartitionPredicate(temp_query_info, context);
         }
 
         if (num_rows)
@@ -1309,7 +1394,7 @@ void InterpreterSelectQuery::executeFetchColumns(
             AggregateDataPtr place = state.data();
 
             agg_count.create(place);
-            SCOPE_EXIT(agg_count.destroy(place));
+            SCOPE_EXIT_MEMORY_SAFE(agg_count.destroy(place));
 
             agg_count.set(place, *num_rows);
 
@@ -1340,22 +1425,6 @@ void InterpreterSelectQuery::executeFetchColumns(
 
     if (storage)
     {
-        /// Append columns from the table filter to required
-        auto row_policy_filter = context->getRowPolicyCondition(table_id.getDatabaseName(), table_id.getTableName(), RowPolicy::SELECT_FILTER);
-        if (row_policy_filter)
-        {
-            auto initial_required_columns = required_columns;
-            ActionsDAGPtr actions_dag;
-            generateFilterActions(actions_dag, row_policy_filter, initial_required_columns);
-            auto required_columns_from_filter = actions_dag->getRequiredColumns();
-
-            for (const auto & column : required_columns_from_filter)
-            {
-                if (required_columns.end() == std::find(required_columns.begin(), required_columns.end(), column.name))
-                    required_columns.push_back(column.name);
-            }
-        }
-
         /// Detect, if ALIAS columns are required for query execution
         auto alias_columns_required = false;
         const ColumnsDescription & storage_columns = metadata_snapshot->getColumns();
@@ -1386,6 +1455,12 @@ void InterpreterSelectQuery::executeFetchColumns(
                 /// Get some columns directly from PREWHERE expression actions
                 auto prewhere_required_columns = prewhere_info->prewhere_actions->getRequiredColumns().getNames();
                 required_columns_from_prewhere.insert(prewhere_required_columns.begin(), prewhere_required_columns.end());
+
+                if (prewhere_info->row_level_filter_actions)
+                {
+                    auto row_level_required_columns = prewhere_info->row_level_filter_actions->getRequiredColumns().getNames();
+                    required_columns_from_prewhere.insert(row_level_required_columns.begin(), row_level_required_columns.end());
+                }
             }
 
             /// Expression, that contains all raw required columns
@@ -1406,9 +1481,9 @@ void InterpreterSelectQuery::executeFetchColumns(
                     auto column_decl = storage_columns.get(column);
                     column_expr = column_default->expression->clone();
                     // recursive visit for alias to alias
-                    replaceAliasColumnsInQuery(column_expr, metadata_snapshot->getColumns(), syntax_analyzer_result->getArrayJoinSourceNameSet(), *context);
+                    replaceAliasColumnsInQuery(column_expr, metadata_snapshot->getColumns(), syntax_analyzer_result->getArrayJoinSourceNameSet(), context);
 
-                    column_expr = addTypeConversionToAST(std::move(column_expr), column_decl.type->getName(), metadata_snapshot->getColumns().getAll(), *context);
+                    column_expr = addTypeConversionToAST(std::move(column_expr), column_decl.type->getName(), metadata_snapshot->getColumns().getAll(), context);
                     column_expr = setAlias(column_expr, column);
                 }
                 else
@@ -1453,8 +1528,8 @@ void InterpreterSelectQuery::executeFetchColumns(
                     = ext::map<NameSet>(required_columns_after_prewhere, [](const auto & it) { return it.name; });
             }
 
-            auto syntax_result = TreeRewriter(*context).analyze(required_columns_all_expr, required_columns_after_prewhere, storage, metadata_snapshot);
-            alias_actions = ExpressionAnalyzer(required_columns_all_expr, syntax_result, *context).getActionsDAG(true);
+            auto syntax_result = TreeRewriter(context).analyze(required_columns_all_expr, required_columns_after_prewhere, storage, metadata_snapshot);
+            alias_actions = ExpressionAnalyzer(required_columns_all_expr, syntax_result, context).getActionsDAG(true);
 
             /// The set of required columns could be added as a result of adding an action to calculate ALIAS.
             required_columns = alias_actions->getRequiredColumns().getNames();
@@ -1478,9 +1553,9 @@ void InterpreterSelectQuery::executeFetchColumns(
                     prewhere_info->prewhere_actions->tryRestoreColumn(name);
 
                 auto analyzed_result
-                    = TreeRewriter(*context).analyze(required_columns_from_prewhere_expr, metadata_snapshot->getColumns().getAllPhysical());
+                    = TreeRewriter(context).analyze(required_columns_from_prewhere_expr, metadata_snapshot->getColumns().getAllPhysical());
                 prewhere_info->alias_actions
-                    = ExpressionAnalyzer(required_columns_from_prewhere_expr, analyzed_result, *context).getActionsDAG(true, false);
+                    = ExpressionAnalyzer(required_columns_from_prewhere_expr, analyzed_result, context).getActionsDAG(true, false);
 
                 /// Add (physical?) columns required by alias actions.
                 auto required_columns_from_alias = prewhere_info->alias_actions->getRequiredColumns();
@@ -1526,7 +1601,7 @@ void InterpreterSelectQuery::executeFetchColumns(
 
     UInt64 max_block_size = settings.max_block_size;
 
-    auto [limit_length, limit_offset] = getLimitLengthAndOffset(query, *context);
+    auto [limit_length, limit_offset] = getLimitLengthAndOffset(query, context);
 
     /** Optimization - if not specified DISTINCT, WHERE, GROUP, HAVING, ORDER, LIMIT BY, WITH TIES but LIMIT is specified, and limit + offset < max_block_size,
      *  then as the block size we will use limit + offset (not to read more from the table than requested),
@@ -1542,6 +1617,7 @@ void InterpreterSelectQuery::executeFetchColumns(
         && !query.limitBy()
         && query.limitLength()
         && !query_analyzer->hasAggregation()
+        && !query_analyzer->hasWindow()
         && limit_length <= std::numeric_limits<UInt64>::max() - limit_offset
         && limit_length + limit_offset < max_block_size)
     {
@@ -1568,7 +1644,7 @@ void InterpreterSelectQuery::executeFetchColumns(
                 throw Exception("Subquery expected", ErrorCodes::LOGICAL_ERROR);
 
             interpreter_subquery = std::make_unique<InterpreterSelectWithUnionQuery>(
-                subquery, getSubqueryContext(*context),
+                subquery, getSubqueryContext(context),
                 options.copy().subquery().noModify(), required_columns);
 
             if (query_analyzer->hasAggregation())
@@ -1582,7 +1658,7 @@ void InterpreterSelectQuery::executeFetchColumns(
     {
         /// Table.
         if (max_streams == 0)
-            throw Exception("Logical error: zero number of streams requested", ErrorCodes::LOGICAL_ERROR);
+            max_streams = 1;
 
         /// If necessary, we request more sources than the number of threads - to distribute the work evenly over the threads.
         if (max_streams > 1 && !is_remote)
@@ -1590,19 +1666,23 @@ void InterpreterSelectQuery::executeFetchColumns(
 
         query_info.syntax_analyzer_result = syntax_analyzer_result;
         query_info.sets = query_analyzer->getPreparedSets();
+        auto actions_settings = ExpressionActionsSettings::fromContext(context);
 
         if (prewhere_info)
         {
-            query_info.prewhere_info = std::make_shared<PrewhereInfo>(
-                    std::make_shared<ExpressionActions>(prewhere_info->prewhere_actions),
-                    prewhere_info->prewhere_column_name);
+            query_info.prewhere_info = std::make_shared<PrewhereInfo>();
+            query_info.prewhere_info->prewhere_actions = std::make_shared<ExpressionActions>(prewhere_info->prewhere_actions, actions_settings);
 
+            if (prewhere_info->row_level_filter_actions)
+                query_info.prewhere_info->row_level_filter = std::make_shared<ExpressionActions>(prewhere_info->row_level_filter_actions, actions_settings);
             if (prewhere_info->alias_actions)
-                query_info.prewhere_info->alias_actions = std::make_shared<ExpressionActions>(prewhere_info->alias_actions);
+                query_info.prewhere_info->alias_actions = std::make_shared<ExpressionActions>(prewhere_info->alias_actions, actions_settings);
             if (prewhere_info->remove_columns_actions)
-                query_info.prewhere_info->remove_columns_actions = std::make_shared<ExpressionActions>(prewhere_info->remove_columns_actions);
+                query_info.prewhere_info->remove_columns_actions = std::make_shared<ExpressionActions>(prewhere_info->remove_columns_actions, actions_settings);
 
+            query_info.prewhere_info->prewhere_column_name = prewhere_info->prewhere_column_name;
             query_info.prewhere_info->remove_prewhere_column = prewhere_info->remove_prewhere_column;
+            query_info.prewhere_info->row_level_column_name = prewhere_info->row_level_column_name;
             query_info.prewhere_info->need_filter = prewhere_info->need_filter;
         }
 
@@ -1613,7 +1693,7 @@ void InterpreterSelectQuery::executeFetchColumns(
             if (analysis_result.optimize_read_in_order)
                 query_info.order_optimizer = std::make_shared<ReadInOrderOptimizer>(
                     analysis_result.order_by_elements_actions,
-                    getSortDescription(query, *context),
+                    getSortDescription(query, context),
                     query_info.syntax_analyzer_result);
             else
                 query_info.order_optimizer = std::make_shared<ReadInOrderOptimizer>(
@@ -1621,7 +1701,7 @@ void InterpreterSelectQuery::executeFetchColumns(
                     getSortDescriptionFromGroupBy(query),
                     query_info.syntax_analyzer_result);
 
-            query_info.input_order_info = query_info.order_optimizer->getInputOrder(metadata_snapshot, *context);
+            query_info.input_order_info = query_info.order_optimizer->getInputOrder(metadata_snapshot, context);
         }
 
         StreamLocalLimits limits;
@@ -1641,12 +1721,12 @@ void InterpreterSelectQuery::executeFetchColumns(
             quota = context->getQuota();
 
         storage->read(query_plan, required_columns, metadata_snapshot,
-                      query_info, *context, processing_stage, max_block_size, max_streams);
+                      query_info, context, processing_stage, max_block_size, max_streams);
 
         if (context->hasQueryContext() && !options.is_internal)
         {
             auto local_storage_id = storage->getStorageID();
-            context->getQueryContext().addQueryAccessInfo(
+            context->getQueryContext()->addQueryAccessInfo(
                 backQuoteIfNeed(local_storage_id.getDatabaseName()), local_storage_id.getFullTableName(), required_columns);
         }
 
@@ -1956,7 +2036,13 @@ void InterpreterSelectQuery::executeWindow(QueryPlan & query_plan)
     for (size_t i = 0; i < windows_sorted.size(); ++i)
     {
         const auto & w = *windows_sorted[i];
-        if (i == 0 || !sortIsPrefix(w, *windows_sorted[i - 1]))
+
+        // We don't need to sort again if the input from previous window already
+        // has suitable sorting. Also don't create sort steps when there are no
+        // columns to sort by, because the sort nodes are confused by this. It
+        // happens in case of `over ()`.
+        if (!w.full_sort_description.empty()
+            && (i == 0 || !sortIsPrefix(w, *windows_sorted[i - 1])))
         {
             auto partial_sorting = std::make_unique<PartialSortingStep>(
                 query_plan.getCurrentDataStream(),
@@ -2022,8 +2108,8 @@ void InterpreterSelectQuery::executeOrderOptimized(QueryPlan & query_plan, Input
 void InterpreterSelectQuery::executeOrder(QueryPlan & query_plan, InputOrderInfoPtr input_sorting_info)
 {
     auto & query = getSelectQuery();
-    SortDescription output_order_descr = getSortDescription(query, *context);
-    UInt64 limit = getLimitForSorting(query, *context);
+    SortDescription output_order_descr = getSortDescription(query, context);
+    UInt64 limit = getLimitForSorting(query, context);
 
     if (input_sorting_info)
     {
@@ -2071,8 +2157,8 @@ void InterpreterSelectQuery::executeOrder(QueryPlan & query_plan, InputOrderInfo
 void InterpreterSelectQuery::executeMergeSorted(QueryPlan & query_plan, const std::string & description)
 {
     auto & query = getSelectQuery();
-    SortDescription order_descr = getSortDescription(query, *context);
-    UInt64 limit = getLimitForSorting(query, *context);
+    SortDescription order_descr = getSortDescription(query, context);
+    UInt64 limit = getLimitForSorting(query, context);
 
     executeMergeSorted(query_plan, order_descr, limit, description);
 }
@@ -2106,7 +2192,7 @@ void InterpreterSelectQuery::executeDistinct(QueryPlan & query_plan, bool before
     {
         const Settings & settings = context->getSettingsRef();
 
-        auto [limit_length, limit_offset] = getLimitLengthAndOffset(query, *context);
+        auto [limit_length, limit_offset] = getLimitLengthAndOffset(query, context);
         UInt64 limit_for_distinct = 0;
 
         /// If after this stage of DISTINCT ORDER BY is not executed,
@@ -2135,7 +2221,7 @@ void InterpreterSelectQuery::executePreLimit(QueryPlan & query_plan, bool do_not
     /// If there is LIMIT
     if (query.limitLength())
     {
-        auto [limit_length, limit_offset] = getLimitLengthAndOffset(query, *context);
+        auto [limit_length, limit_offset] = getLimitLengthAndOffset(query, context);
 
         if (do_not_skip_offset)
         {
@@ -2163,8 +2249,8 @@ void InterpreterSelectQuery::executeLimitBy(QueryPlan & query_plan)
     for (const auto & elem : query.limitBy()->children)
         columns.emplace_back(elem->getColumnName());
 
-    UInt64 length = getLimitUIntValue(query.limitByLength(), *context, "LIMIT");
-    UInt64 offset = (query.limitByOffset() ? getLimitUIntValue(query.limitByOffset(), *context, "OFFSET") : 0);
+    UInt64 length = getLimitUIntValue(query.limitByLength(), context, "LIMIT");
+    UInt64 offset = (query.limitByOffset() ? getLimitUIntValue(query.limitByOffset(), context, "OFFSET") : 0);
 
     auto limit_by = std::make_unique<LimitByStep>(query_plan.getCurrentDataStream(), length, offset, columns);
     query_plan.addStep(std::move(limit_by));
@@ -2175,7 +2261,7 @@ void InterpreterSelectQuery::executeWithFill(QueryPlan & query_plan)
     auto & query = getSelectQuery();
     if (query.orderBy())
     {
-        SortDescription order_descr = getSortDescription(query, *context);
+        SortDescription order_descr = getSortDescription(query, context);
         SortDescription fill_descr;
         for (auto & desc : order_descr)
         {
@@ -2217,14 +2303,14 @@ void InterpreterSelectQuery::executeLimit(QueryPlan & query_plan)
 
         UInt64 limit_length;
         UInt64 limit_offset;
-        std::tie(limit_length, limit_offset) = getLimitLengthAndOffset(query, *context);
+        std::tie(limit_length, limit_offset) = getLimitLengthAndOffset(query, context);
 
         SortDescription order_descr;
         if (query.limit_with_ties)
         {
             if (!query.orderBy())
                 throw Exception("LIMIT WITH TIES without ORDER BY", ErrorCodes::LOGICAL_ERROR);
-            order_descr = getSortDescription(query, *context);
+            order_descr = getSortDescription(query, context);
         }
 
         auto limit = std::make_unique<LimitStep>(
@@ -2247,7 +2333,7 @@ void InterpreterSelectQuery::executeOffset(QueryPlan & query_plan)
     {
         UInt64 limit_length;
         UInt64 limit_offset;
-        std::tie(limit_length, limit_offset) = getLimitLengthAndOffset(query, *context);
+        std::tie(limit_length, limit_offset) = getLimitLengthAndOffset(query, context);
 
         auto offsets_step = std::make_unique<OffsetStep>(query_plan.getCurrentDataStream(), limit_offset);
         query_plan.addStep(std::move(offsets_step));
@@ -2271,7 +2357,7 @@ void InterpreterSelectQuery::executeSubqueriesInSetsAndJoins(QueryPlan & query_p
     const Settings & settings = context->getSettingsRef();
 
     SizeLimits limits(settings.max_rows_to_transfer, settings.max_bytes_to_transfer, settings.transfer_overflow_mode);
-    addCreatingSetsStep(query_plan, std::move(subqueries_for_sets), limits, *context);
+    addCreatingSetsStep(query_plan, std::move(subqueries_for_sets), limits, context);
 }
 
 
@@ -2285,7 +2371,7 @@ void InterpreterSelectQuery::initSettings()
 {
     auto & query = getSelectQuery();
     if (query.settings())
-        InterpreterSetQuery(query.settings(), *context).executeForCurrentContext();
+        InterpreterSetQuery(query.settings(), context).executeForCurrentContext();
 }
 
 }
diff --git a/src/Interpreters/InterpreterSelectQuery.h b/src/Interpreters/InterpreterSelectQuery.h
index 1fff316e1d4..66b3fc65eff 100644
--- a/src/Interpreters/InterpreterSelectQuery.h
+++ b/src/Interpreters/InterpreterSelectQuery.h
@@ -46,28 +46,28 @@ public:
 
     InterpreterSelectQuery(
         const ASTPtr & query_ptr_,
-        const Context & context_,
+        ContextPtr context_,
         const SelectQueryOptions &,
         const Names & required_result_column_names_ = Names{});
 
     /// Read data not from the table specified in the query, but from the prepared source `input`.
     InterpreterSelectQuery(
         const ASTPtr & query_ptr_,
-        const Context & context_,
+        ContextPtr context_,
         const BlockInputStreamPtr & input_,
         const SelectQueryOptions & = {});
 
     /// Read data not from the table specified in the query, but from the prepared pipe `input`.
     InterpreterSelectQuery(
             const ASTPtr & query_ptr_,
-            const Context & context_,
+            ContextPtr context_,
             Pipe input_pipe_,
             const SelectQueryOptions & = {});
 
     /// Read data not from the table specified in the query, but from the specified `storage_`.
     InterpreterSelectQuery(
         const ASTPtr & query_ptr_,
-        const Context & context_,
+        ContextPtr context_,
         const StoragePtr & storage_,
         const StorageMetadataPtr & metadata_snapshot_ = nullptr,
         const SelectQueryOptions & = {});
@@ -89,10 +89,12 @@ public:
 
     static void addEmptySourceToQueryPlan(QueryPlan & query_plan, const Block & source_header, const SelectQueryInfo & query_info);
 
+    Names getRequiredColumns() { return required_columns; }
+
 private:
     InterpreterSelectQuery(
         const ASTPtr & query_ptr_,
-        const Context & context_,
+        ContextPtr context_,
         const BlockInputStreamPtr & input_,
         std::optional<Pipe> input_pipe,
         const StoragePtr & storage_,
@@ -108,12 +110,7 @@ private:
 
     /// Different stages of query execution.
 
-    void executeFetchColumns(
-        QueryProcessingStage::Enum processing_stage,
-        QueryPlan & query_plan,
-        const PrewhereDAGInfoPtr & prewhere_info,
-        const NameSet & columns_to_remove_after_prewhere);
-
+    void executeFetchColumns(QueryProcessingStage::Enum processing_stage, QueryPlan & query_plan);
     void executeWhere(QueryPlan & query_plan, const ActionsDAGPtr & expression, bool remove_filter);
     void executeAggregation(QueryPlan & query_plan, const ActionsDAGPtr & expression, bool overflow_row, bool final, InputOrderInfoPtr group_by_info);
     void executeMergeAggregated(QueryPlan & query_plan, bool overflow_row, bool final);
@@ -136,8 +133,7 @@ private:
     void executeSubqueriesInSetsAndJoins(QueryPlan & query_plan, std::unordered_map<String, SubqueryForSet> & subqueries_for_sets);
     void executeMergeSorted(QueryPlan & query_plan, const SortDescription & sort_description, UInt64 limit, const std::string & description);
 
-    String generateFilterActions(
-            ActionsDAGPtr & actions, const ASTPtr & row_policy_filter, const Names & prerequisite_columns = {}) const;
+    String generateFilterActions(ActionsDAGPtr & actions, const Names & prerequisite_columns = {}) const;
 
     enum class Modificator
     {
@@ -162,7 +158,8 @@ private:
     /// Is calculated in getSampleBlock. Is used later in readImpl.
     ExpressionAnalysisResult analysis_result;
     /// For row-level security.
-    FilterInfoPtr filter_info;
+    ASTPtr row_policy_filter;
+    FilterDAGInfoPtr filter_info;
 
     QueryProcessingStage::Enum from_stage = QueryProcessingStage::FetchColumns;
 
diff --git a/src/Interpreters/InterpreterSelectWithUnionQuery.cpp b/src/Interpreters/InterpreterSelectWithUnionQuery.cpp
index 59fcff61936..3cf4a905d38 100644
--- a/src/Interpreters/InterpreterSelectWithUnionQuery.cpp
+++ b/src/Interpreters/InterpreterSelectWithUnionQuery.cpp
@@ -6,11 +6,13 @@
 #include <Parsers/ASTSelectWithUnionQuery.h>
 #include <Parsers/queryToString.h>
 #include <Processors/QueryPlan/DistinctStep.h>
+#include <Processors/QueryPlan/ExpressionStep.h>
 #include <Processors/QueryPlan/IQueryPlanStep.h>
 #include <Processors/QueryPlan/QueryPlan.h>
 #include <Processors/QueryPlan/UnionStep.h>
 #include <Processors/QueryPlan/LimitStep.h>
 #include <Processors/QueryPlan/OffsetStep.h>
+#include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
 #include <Common/typeid_cast.h>
 
 #include <Interpreters/InDepthNodeVisitor.h>
@@ -24,112 +26,10 @@ namespace ErrorCodes
 {
     extern const int LOGICAL_ERROR;
     extern const int UNION_ALL_RESULT_STRUCTURES_MISMATCH;
-    extern const int EXPECTED_ALL_OR_DISTINCT;
 }
 
-struct CustomizeASTSelectWithUnionQueryNormalize
-{
-    using TypeToVisit = ASTSelectWithUnionQuery;
-
-    const UnionMode & union_default_mode;
-
-    static void getSelectsFromUnionListNode(ASTPtr & ast_select, ASTs & selects)
-    {
-        if (auto * inner_union = ast_select->as<ASTSelectWithUnionQuery>())
-        {
-            for (auto & child : inner_union->list_of_selects->children)
-                getSelectsFromUnionListNode(child, selects);
-
-            return;
-        }
-
-        selects.push_back(std::move(ast_select));
-    }
-
-    void visit(ASTSelectWithUnionQuery & ast, ASTPtr &) const
-    {
-        auto & union_modes = ast.list_of_modes;
-        ASTs selects;
-        auto & select_list = ast.list_of_selects->children;
-
-        int i;
-        for (i = union_modes.size() - 1; i >= 0; --i)
-        {
-            /// Rewrite UNION Mode
-            if (union_modes[i] == ASTSelectWithUnionQuery::Mode::Unspecified)
-            {
-                if (union_default_mode == UnionMode::ALL)
-                    union_modes[i] = ASTSelectWithUnionQuery::Mode::ALL;
-                else if (union_default_mode == UnionMode::DISTINCT)
-                    union_modes[i] = ASTSelectWithUnionQuery::Mode::DISTINCT;
-                else
-                    throw Exception(
-                        "Expected ALL or DISTINCT in SelectWithUnion query, because setting (union_default_mode) is empty",
-                        DB::ErrorCodes::EXPECTED_ALL_OR_DISTINCT);
-            }
-
-            if (union_modes[i] == ASTSelectWithUnionQuery::Mode::ALL)
-            {
-                if (auto * inner_union = select_list[i + 1]->as<ASTSelectWithUnionQuery>())
-                {
-                    /// Inner_union is an UNION ALL list, just lift up
-                    for (auto child = inner_union->list_of_selects->children.rbegin();
-                         child != inner_union->list_of_selects->children.rend();
-                         ++child)
-                        selects.push_back(std::move(*child));
-                }
-                else
-                    selects.push_back(std::move(select_list[i + 1]));
-            }
-            /// flatten all left nodes and current node to a UNION DISTINCT list
-            else if (union_modes[i] == ASTSelectWithUnionQuery::Mode::DISTINCT)
-            {
-                auto distinct_list = std::make_shared<ASTSelectWithUnionQuery>();
-                distinct_list->list_of_selects = std::make_shared<ASTExpressionList>();
-                distinct_list->children.push_back(distinct_list->list_of_selects);
-
-                for (int j = 0; j <= i + 1; ++j)
-                {
-                    getSelectsFromUnionListNode(select_list[j], distinct_list->list_of_selects->children);
-                }
-
-                distinct_list->union_mode = ASTSelectWithUnionQuery::Mode::DISTINCT;
-                distinct_list->is_normalized = true;
-                selects.push_back(std::move(distinct_list));
-                break;
-            }
-        }
-
-        /// No UNION DISTINCT or only one child in select_list
-        if (i == -1)
-        {
-            if (auto * inner_union = select_list[0]->as<ASTSelectWithUnionQuery>())
-            {
-                /// Inner_union is an UNION ALL list, just lift it up
-                for (auto child = inner_union->list_of_selects->children.rbegin(); child != inner_union->list_of_selects->children.rend();
-                     ++child)
-                    selects.push_back(std::move(*child));
-            }
-            else
-                selects.push_back(std::move(select_list[0]));
-        }
-
-        // reverse children list
-        std::reverse(selects.begin(), selects.end());
-
-        ast.is_normalized = true;
-        ast.union_mode = ASTSelectWithUnionQuery::Mode::ALL;
-
-        ast.list_of_selects->children = std::move(selects);
-    }
-};
-
-/// We need normalize children first, so we should visit AST tree bottom up
-using CustomizeASTSelectWithUnionQueryNormalizeVisitor
-    = InDepthNodeVisitor<OneTypeMatcher<CustomizeASTSelectWithUnionQueryNormalize>, false>;
-
 InterpreterSelectWithUnionQuery::InterpreterSelectWithUnionQuery(
-    const ASTPtr & query_ptr_, const Context & context_, const SelectQueryOptions & options_, const Names & required_result_column_names)
+    const ASTPtr & query_ptr_, ContextPtr context_, const SelectQueryOptions & options_, const Names & required_result_column_names)
     : IInterpreterUnionOrSelectQuery(query_ptr_, context_, options_)
 {
     ASTSelectWithUnionQuery * ast = query_ptr->as<ASTSelectWithUnionQuery>();
@@ -138,21 +38,6 @@ InterpreterSelectWithUnionQuery::InterpreterSelectWithUnionQuery(
     if (options.subquery_depth == 0 && (settings.limit > 0 || settings.offset > 0))
         settings_limit_offset_needed = true;
 
-    /// Normalize AST Tree
-    if (!ast->is_normalized)
-    {
-        CustomizeASTSelectWithUnionQueryNormalizeVisitor::Data union_default_mode{settings.union_default_mode};
-        CustomizeASTSelectWithUnionQueryNormalizeVisitor(union_default_mode).visit(query_ptr);
-
-        /// After normalization, if it only has one ASTSelectWithUnionQuery child,
-        /// we can lift it up, this can reduce one unnecessary recursion later.
-        if (ast->list_of_selects->children.size() == 1 && ast->list_of_selects->children.at(0)->as<ASTSelectWithUnionQuery>())
-        {
-            query_ptr = std::move(ast->list_of_selects->children.at(0));
-            ast = query_ptr->as<ASTSelectWithUnionQuery>();
-        }
-    }
-
     size_t num_children = ast->list_of_selects->children.size();
     if (!num_children)
         throw Exception("Logical error: no children in ASTSelectWithUnionQuery", ErrorCodes::LOGICAL_ERROR);
@@ -312,26 +197,26 @@ Block InterpreterSelectWithUnionQuery::getCommonHeaderForUnion(const Blocks & he
 Block InterpreterSelectWithUnionQuery::getCurrentChildResultHeader(const ASTPtr & ast_ptr_, const Names & required_result_column_names)
 {
     if (ast_ptr_->as<ASTSelectWithUnionQuery>())
-        return InterpreterSelectWithUnionQuery(ast_ptr_, *context, options.copy().analyze().noModify(), required_result_column_names)
+        return InterpreterSelectWithUnionQuery(ast_ptr_, context, options.copy().analyze().noModify(), required_result_column_names)
             .getSampleBlock();
     else
-        return InterpreterSelectQuery(ast_ptr_, *context, options.copy().analyze().noModify()).getSampleBlock();
+        return InterpreterSelectQuery(ast_ptr_, context, options.copy().analyze().noModify()).getSampleBlock();
 }
 
 std::unique_ptr<IInterpreterUnionOrSelectQuery>
 InterpreterSelectWithUnionQuery::buildCurrentChildInterpreter(const ASTPtr & ast_ptr_, const Names & current_required_result_column_names)
 {
     if (ast_ptr_->as<ASTSelectWithUnionQuery>())
-        return std::make_unique<InterpreterSelectWithUnionQuery>(ast_ptr_, *context, options, current_required_result_column_names);
+        return std::make_unique<InterpreterSelectWithUnionQuery>(ast_ptr_, context, options, current_required_result_column_names);
     else
-        return std::make_unique<InterpreterSelectQuery>(ast_ptr_, *context, options, current_required_result_column_names);
+        return std::make_unique<InterpreterSelectQuery>(ast_ptr_, context, options, current_required_result_column_names);
 }
 
 InterpreterSelectWithUnionQuery::~InterpreterSelectWithUnionQuery() = default;
 
-Block InterpreterSelectWithUnionQuery::getSampleBlock(const ASTPtr & query_ptr_, const Context & context_, bool is_subquery)
+Block InterpreterSelectWithUnionQuery::getSampleBlock(const ASTPtr & query_ptr_, ContextPtr context_, bool is_subquery)
 {
-    auto & cache = context_.getSampleBlockCache();
+    auto & cache = context_->getSampleBlockCache();
     /// Using query string because query_ptr changes for every internal SELECT
     auto key = queryToString(query_ptr_);
     if (cache.find(key) != cache.end())
@@ -367,11 +252,23 @@ void InterpreterSelectWithUnionQuery::buildQueryPlan(QueryPlan & query_plan)
         {
             plans[i] = std::make_unique<QueryPlan>();
             nested_interpreters[i]->buildQueryPlan(*plans[i]);
+
+            if (!blocksHaveEqualStructure(plans[i]->getCurrentDataStream().header, result_header))
+            {
+                auto actions_dag = ActionsDAG::makeConvertingActions(
+                        plans[i]->getCurrentDataStream().header.getColumnsWithTypeAndName(),
+                        result_header.getColumnsWithTypeAndName(),
+                        ActionsDAG::MatchColumnsMode::Position);
+                auto converting_step = std::make_unique<ExpressionStep>(plans[i]->getCurrentDataStream(), std::move(actions_dag));
+                converting_step->setStepDescription("Conversion before UNION");
+                plans[i]->addStep(std::move(converting_step));
+            }
+
             data_streams[i] = plans[i]->getCurrentDataStream();
         }
 
         auto max_threads = context->getSettingsRef().max_threads;
-        auto union_step = std::make_unique<UnionStep>(std::move(data_streams), result_header, max_threads);
+        auto union_step = std::make_unique<UnionStep>(std::move(data_streams), max_threads);
 
         query_plan.unitePlans(std::move(union_step), std::move(plans));
 
@@ -413,7 +310,9 @@ BlockIO InterpreterSelectWithUnionQuery::execute()
     QueryPlan query_plan;
     buildQueryPlan(query_plan);
 
-    auto pipeline = query_plan.buildQueryPipeline();
+    auto pipeline = query_plan.buildQueryPipeline(
+        QueryPlanOptimizationSettings::fromContext(context),
+        BuildQueryPipelineSettings::fromContext(context));
 
     res.pipeline = std::move(*pipeline);
     res.pipeline.addInterpreterContext(context);
diff --git a/src/Interpreters/InterpreterSelectWithUnionQuery.h b/src/Interpreters/InterpreterSelectWithUnionQuery.h
index f4062b2005e..bd18b8e7907 100644
--- a/src/Interpreters/InterpreterSelectWithUnionQuery.h
+++ b/src/Interpreters/InterpreterSelectWithUnionQuery.h
@@ -6,7 +6,6 @@
 namespace DB
 {
 
-class Context;
 class InterpreterSelectQuery;
 class QueryPlan;
 
@@ -19,7 +18,7 @@ public:
 
     InterpreterSelectWithUnionQuery(
         const ASTPtr & query_ptr_,
-        const Context & context_,
+        ContextPtr context_,
         const SelectQueryOptions &,
         const Names & required_result_column_names = {});
 
@@ -35,7 +34,7 @@ public:
 
     static Block getSampleBlock(
         const ASTPtr & query_ptr_,
-        const Context & context_,
+        ContextPtr context_,
         bool is_subquery = false);
 
     virtual void ignoreWithTotals() override;
diff --git a/src/Interpreters/InterpreterSetQuery.cpp b/src/Interpreters/InterpreterSetQuery.cpp
index f92e9638822..1c6a4236bf6 100644
--- a/src/Interpreters/InterpreterSetQuery.cpp
+++ b/src/Interpreters/InterpreterSetQuery.cpp
@@ -9,8 +9,8 @@ namespace DB
 BlockIO InterpreterSetQuery::execute()
 {
     const auto & ast = query_ptr->as<ASTSetQuery &>();
-    context.checkSettingsConstraints(ast.changes);
-    context.getSessionContext().applySettingsChanges(ast.changes);
+    getContext()->checkSettingsConstraints(ast.changes);
+    getContext()->getSessionContext()->applySettingsChanges(ast.changes);
     return {};
 }
 
@@ -18,8 +18,8 @@ BlockIO InterpreterSetQuery::execute()
 void InterpreterSetQuery::executeForCurrentContext()
 {
     const auto & ast = query_ptr->as<ASTSetQuery &>();
-    context.checkSettingsConstraints(ast.changes);
-    context.applySettingsChanges(ast.changes);
+    getContext()->checkSettingsConstraints(ast.changes);
+    getContext()->applySettingsChanges(ast.changes);
 }
 
 }
diff --git a/src/Interpreters/InterpreterSetQuery.h b/src/Interpreters/InterpreterSetQuery.h
index 6e8e8b8b733..31519be6f29 100644
--- a/src/Interpreters/InterpreterSetQuery.h
+++ b/src/Interpreters/InterpreterSetQuery.h
@@ -7,17 +7,14 @@
 namespace DB
 {
 
-class Context;
 class ASTSetQuery;
 
-
 /** Change one or several settings for the session or just for the current context.
   */
-class InterpreterSetQuery : public IInterpreter
+class InterpreterSetQuery : public IInterpreter, WithContext
 {
 public:
-    InterpreterSetQuery(const ASTPtr & query_ptr_, Context & context_)
-        : query_ptr(query_ptr_), context(context_) {}
+    InterpreterSetQuery(const ASTPtr & query_ptr_, ContextPtr context_) : WithContext(context_), query_ptr(query_ptr_) {}
 
     /** Usual SET query. Set setting for the session.
       */
@@ -30,8 +27,6 @@ public:
 
 private:
     ASTPtr query_ptr;
-    Context & context;
 };
 
-
 }
diff --git a/src/Interpreters/InterpreterSetRoleQuery.cpp b/src/Interpreters/InterpreterSetRoleQuery.cpp
index f955c881b2e..057ccd447ef 100644
--- a/src/Interpreters/InterpreterSetRoleQuery.cpp
+++ b/src/Interpreters/InterpreterSetRoleQuery.cpp
@@ -28,44 +28,42 @@ BlockIO InterpreterSetRoleQuery::execute()
 
 void InterpreterSetRoleQuery::setRole(const ASTSetRoleQuery & query)
 {
-    auto & access_control = context.getAccessControlManager();
-    auto & session_context = context.getSessionContext();
-    auto user = session_context.getUser();
+    auto & access_control = getContext()->getAccessControlManager();
+    auto session_context = getContext()->getSessionContext();
+    auto user = session_context->getUser();
 
     if (query.kind == ASTSetRoleQuery::Kind::SET_ROLE_DEFAULT)
     {
-        session_context.setCurrentRolesDefault();
+        session_context->setCurrentRolesDefault();
     }
     else
     {
         RolesOrUsersSet roles_from_query{*query.roles, access_control};
-        boost::container::flat_set<UUID> new_current_roles;
+        std::vector<UUID> new_current_roles;
         if (roles_from_query.all)
         {
-            for (const auto & id : user->granted_roles.roles)
-                if (roles_from_query.match(id))
-                    new_current_roles.emplace(id);
+            new_current_roles = user->granted_roles.findGranted(roles_from_query);
         }
         else
         {
             for (const auto & id : roles_from_query.getMatchingIDs())
             {
-                if (!user->granted_roles.roles.count(id))
+                if (!user->granted_roles.isGranted(id))
                     throw Exception("Role should be granted to set current", ErrorCodes::SET_NON_GRANTED_ROLE);
-                new_current_roles.emplace(id);
+                new_current_roles.emplace_back(id);
             }
         }
-        session_context.setCurrentRoles(new_current_roles);
+        session_context->setCurrentRoles(new_current_roles);
     }
 }
 
 
 void InterpreterSetRoleQuery::setDefaultRole(const ASTSetRoleQuery & query)
 {
-    context.checkAccess(AccessType::ALTER_USER);
+    getContext()->checkAccess(AccessType::ALTER_USER);
 
-    auto & access_control = context.getAccessControlManager();
-    std::vector<UUID> to_users = RolesOrUsersSet{*query.to_users, access_control, context.getUserID()}.getMatchingIDs(access_control);
+    auto & access_control = getContext()->getAccessControlManager();
+    std::vector<UUID> to_users = RolesOrUsersSet{*query.to_users, access_control, getContext()->getUserID()}.getMatchingIDs(access_control);
     RolesOrUsersSet roles_from_query{*query.roles, access_control};
 
     auto update_func = [&](const AccessEntityPtr & entity) -> AccessEntityPtr
@@ -85,7 +83,7 @@ void InterpreterSetRoleQuery::updateUserSetDefaultRoles(User & user, const Roles
     {
         for (const auto & id : roles_from_query.getMatchingIDs())
         {
-            if (!user.granted_roles.roles.count(id))
+            if (!user.granted_roles.isGranted(id))
                 throw Exception("Role should be granted to set default", ErrorCodes::SET_NON_GRANTED_ROLE);
         }
     }
diff --git a/src/Interpreters/InterpreterSetRoleQuery.h b/src/Interpreters/InterpreterSetRoleQuery.h
index 0919b0f23f9..70ba3c381ab 100644
--- a/src/Interpreters/InterpreterSetRoleQuery.h
+++ b/src/Interpreters/InterpreterSetRoleQuery.h
@@ -7,16 +7,14 @@
 namespace DB
 {
 
-class Context;
 class ASTSetRoleQuery;
 struct RolesOrUsersSet;
 struct User;
 
-
-class InterpreterSetRoleQuery : public IInterpreter
+class InterpreterSetRoleQuery : public IInterpreter, WithContext
 {
 public:
-    InterpreterSetRoleQuery(const ASTPtr & query_ptr_, Context & context_) : query_ptr(query_ptr_), context(context_) {}
+    InterpreterSetRoleQuery(const ASTPtr & query_ptr_, ContextPtr context_) : WithContext(context_), query_ptr(query_ptr_) {}
 
     BlockIO execute() override;
 
@@ -27,6 +25,6 @@ private:
     void setDefaultRole(const ASTSetRoleQuery & query);
 
     ASTPtr query_ptr;
-    Context & context;
 };
+
 }
diff --git a/src/Interpreters/InterpreterShowAccessEntitiesQuery.cpp b/src/Interpreters/InterpreterShowAccessEntitiesQuery.cpp
index 009b9c580d3..afd685ea983 100644
--- a/src/Interpreters/InterpreterShowAccessEntitiesQuery.cpp
+++ b/src/Interpreters/InterpreterShowAccessEntitiesQuery.cpp
@@ -17,22 +17,22 @@ namespace ErrorCodes
 using EntityType = IAccessEntity::Type;
 
 
-InterpreterShowAccessEntitiesQuery::InterpreterShowAccessEntitiesQuery(const ASTPtr & query_ptr_, Context & context_)
-    : query_ptr(query_ptr_), context(context_)
+InterpreterShowAccessEntitiesQuery::InterpreterShowAccessEntitiesQuery(const ASTPtr & query_ptr_, ContextPtr context_)
+    : WithContext(context_), query_ptr(query_ptr_)
 {
 }
 
 
 BlockIO InterpreterShowAccessEntitiesQuery::execute()
 {
-    return executeQuery(getRewrittenQuery(), context, true);
+    return executeQuery(getRewrittenQuery(), getContext(), true);
 }
 
 
 String InterpreterShowAccessEntitiesQuery::getRewrittenQuery() const
 {
     auto & query = query_ptr->as<ASTShowAccessEntitiesQuery &>();
-    query.replaceEmptyDatabaseWithCurrent(context.getCurrentDatabase());
+    query.replaceEmptyDatabase(getContext()->getCurrentDatabase());
     String origin;
     String expr = "*";
     String filter, order;
diff --git a/src/Interpreters/InterpreterShowAccessEntitiesQuery.h b/src/Interpreters/InterpreterShowAccessEntitiesQuery.h
index 8fcd70919ba..7224f0d593b 100644
--- a/src/Interpreters/InterpreterShowAccessEntitiesQuery.h
+++ b/src/Interpreters/InterpreterShowAccessEntitiesQuery.h
@@ -6,12 +6,11 @@
 
 namespace DB
 {
-class Context;
 
-class InterpreterShowAccessEntitiesQuery : public IInterpreter
+class InterpreterShowAccessEntitiesQuery : public IInterpreter, WithContext
 {
 public:
-    InterpreterShowAccessEntitiesQuery(const ASTPtr & query_ptr_, Context & context_);
+    InterpreterShowAccessEntitiesQuery(const ASTPtr & query_ptr_, ContextPtr context_);
 
     BlockIO execute() override;
 
@@ -22,7 +21,6 @@ private:
     String getRewrittenQuery() const;
 
     ASTPtr query_ptr;
-    Context & context;
 };
 
 }
diff --git a/src/Interpreters/InterpreterShowAccessQuery.cpp b/src/Interpreters/InterpreterShowAccessQuery.cpp
index a1f8b5ed656..d2e21b71ae5 100644
--- a/src/Interpreters/InterpreterShowAccessQuery.cpp
+++ b/src/Interpreters/InterpreterShowAccessQuery.cpp
@@ -49,8 +49,8 @@ BlockInputStreamPtr InterpreterShowAccessQuery::executeImpl() const
 
 std::vector<AccessEntityPtr> InterpreterShowAccessQuery::getEntities() const
 {
-    const auto & access_control = context.getAccessControlManager();
-    context.checkAccess(AccessType::SHOW_ACCESS);
+    const auto & access_control = getContext()->getAccessControlManager();
+    getContext()->checkAccess(AccessType::SHOW_ACCESS);
 
     std::vector<AccessEntityPtr> entities;
     for (auto type : ext::range(EntityType::MAX))
@@ -71,7 +71,7 @@ std::vector<AccessEntityPtr> InterpreterShowAccessQuery::getEntities() const
 ASTs InterpreterShowAccessQuery::getCreateAndGrantQueries() const
 {
     auto entities = getEntities();
-    const auto & access_control = context.getAccessControlManager();
+    const auto & access_control = getContext()->getAccessControlManager();
 
     ASTs create_queries, grant_queries;
     for (const auto & entity : entities)
diff --git a/src/Interpreters/InterpreterShowAccessQuery.h b/src/Interpreters/InterpreterShowAccessQuery.h
index eb548c56241..d08d8962abc 100644
--- a/src/Interpreters/InterpreterShowAccessQuery.h
+++ b/src/Interpreters/InterpreterShowAccessQuery.h
@@ -6,17 +6,16 @@
 
 namespace DB
 {
-class Context;
+
 struct IAccessEntity;
 using AccessEntityPtr = std::shared_ptr<const IAccessEntity>;
 
 /** Return all queries for creating access entities and grants.
   */
-class InterpreterShowAccessQuery : public IInterpreter
+class InterpreterShowAccessQuery : public IInterpreter, WithContext
 {
 public:
-    InterpreterShowAccessQuery(const ASTPtr & query_ptr_, Context & context_)
-        : query_ptr(query_ptr_), context(context_) {}
+    InterpreterShowAccessQuery(const ASTPtr & query_ptr_, ContextPtr context_) : WithContext(context_), query_ptr(query_ptr_) {}
 
     BlockIO execute() override;
 
@@ -29,8 +28,6 @@ private:
     std::vector<AccessEntityPtr> getEntities() const;
 
     ASTPtr query_ptr;
-    Context & context;
 };
 
-
 }
diff --git a/src/Interpreters/InterpreterShowCreateAccessEntityQuery.cpp b/src/Interpreters/InterpreterShowCreateAccessEntityQuery.cpp
index 3135b0cfdf2..33e29d2b7bd 100644
--- a/src/Interpreters/InterpreterShowCreateAccessEntityQuery.cpp
+++ b/src/Interpreters/InterpreterShowCreateAccessEntityQuery.cpp
@@ -73,6 +73,15 @@ namespace
                 query->settings = user.settings.toASTWithNames(*manager);
         }
 
+        if (user.grantees != RolesOrUsersSet::AllTag{})
+        {
+            if (attach_mode)
+                query->grantees = user.grantees.toAST();
+            else
+                query->grantees = user.grantees.toASTWithNames(*manager);
+            query->grantees->use_keyword_any = true;
+        }
+
         return query;
     }
 
@@ -216,8 +225,8 @@ namespace
 }
 
 
-InterpreterShowCreateAccessEntityQuery::InterpreterShowCreateAccessEntityQuery(const ASTPtr & query_ptr_, const Context & context_)
-    : query_ptr(query_ptr_), context(context_)
+InterpreterShowCreateAccessEntityQuery::InterpreterShowCreateAccessEntityQuery(const ASTPtr & query_ptr_, ContextPtr context_)
+    : WithContext(context_), query_ptr(query_ptr_)
 {
 }
 
@@ -261,9 +270,9 @@ BlockInputStreamPtr InterpreterShowCreateAccessEntityQuery::executeImpl()
 std::vector<AccessEntityPtr> InterpreterShowCreateAccessEntityQuery::getEntities() const
 {
     auto & show_query = query_ptr->as<ASTShowCreateAccessEntityQuery &>();
-    const auto & access_control = context.getAccessControlManager();
-    context.checkAccess(getRequiredAccess());
-    show_query.replaceEmptyDatabaseWithCurrent(context.getCurrentDatabase());
+    const auto & access_control = getContext()->getAccessControlManager();
+    getContext()->checkAccess(getRequiredAccess());
+    show_query.replaceEmptyDatabase(getContext()->getCurrentDatabase());
     std::vector<AccessEntityPtr> entities;
 
     if (show_query.all)
@@ -277,12 +286,12 @@ std::vector<AccessEntityPtr> InterpreterShowCreateAccessEntityQuery::getEntities
     }
     else if (show_query.current_user)
     {
-        if (auto user = context.getUser())
+        if (auto user = getContext()->getUser())
             entities.push_back(user);
     }
     else if (show_query.current_quota)
     {
-        auto usage = context.getQuotaUsage();
+        auto usage = getContext()->getQuotaUsage();
         if (usage)
             entities.push_back(access_control.read<Quota>(usage->quota_id));
     }
@@ -332,7 +341,7 @@ ASTs InterpreterShowCreateAccessEntityQuery::getCreateQueries() const
     auto entities = getEntities();
 
     ASTs list;
-    const auto & access_control = context.getAccessControlManager();
+    const auto & access_control = getContext()->getAccessControlManager();
     for (const auto & entity : entities)
         list.push_back(getCreateQuery(*entity, access_control));
 
diff --git a/src/Interpreters/InterpreterShowCreateAccessEntityQuery.h b/src/Interpreters/InterpreterShowCreateAccessEntityQuery.h
index 5bacbd42988..6d026d2b81b 100644
--- a/src/Interpreters/InterpreterShowCreateAccessEntityQuery.h
+++ b/src/Interpreters/InterpreterShowCreateAccessEntityQuery.h
@@ -16,10 +16,10 @@ using AccessEntityPtr = std::shared_ptr<const IAccessEntity>;
 
 /** Returns a single item containing a statement which could be used to create a specified role.
   */
-class InterpreterShowCreateAccessEntityQuery : public IInterpreter
+class InterpreterShowCreateAccessEntityQuery : public IInterpreter, WithContext
 {
 public:
-    InterpreterShowCreateAccessEntityQuery(const ASTPtr & query_ptr_, const Context & context_);
+    InterpreterShowCreateAccessEntityQuery(const ASTPtr & query_ptr_, ContextPtr context_);
 
     BlockIO execute() override;
 
@@ -36,7 +36,6 @@ private:
     AccessRightsElements getRequiredAccess() const;
 
     ASTPtr query_ptr;
-    const Context & context;
 };
 
 
diff --git a/src/Interpreters/InterpreterShowCreateQuery.cpp b/src/Interpreters/InterpreterShowCreateQuery.cpp
index 10c8339c135..1a247dbf6e6 100644
--- a/src/Interpreters/InterpreterShowCreateQuery.cpp
+++ b/src/Interpreters/InterpreterShowCreateQuery.cpp
@@ -48,9 +48,9 @@ BlockInputStreamPtr InterpreterShowCreateQuery::executeImpl()
         (show_query = query_ptr->as<ASTShowCreateViewQuery>()))
     {
         auto resolve_table_type = show_query->temporary ? Context::ResolveExternal : Context::ResolveOrdinary;
-        auto table_id = context.resolveStorageID(*show_query, resolve_table_type);
-        context.checkAccess(AccessType::SHOW_COLUMNS, table_id);
-        create_query = DatabaseCatalog::instance().getDatabase(table_id.database_name)->getCreateTableQuery(table_id.table_name, context);
+        auto table_id = getContext()->resolveStorageID(*show_query, resolve_table_type);
+        getContext()->checkAccess(AccessType::SHOW_COLUMNS, table_id);
+        create_query = DatabaseCatalog::instance().getDatabase(table_id.database_name)->getCreateTableQuery(table_id.table_name, getContext());
         if (query_ptr->as<ASTShowCreateViewQuery>())
         {
             auto & ast_create_query = create_query->as<ASTCreateQuery &>();
@@ -62,26 +62,27 @@ BlockInputStreamPtr InterpreterShowCreateQuery::executeImpl()
     {
         if (show_query->temporary)
             throw Exception("Temporary databases are not possible.", ErrorCodes::SYNTAX_ERROR);
-        show_query->database = context.resolveDatabase(show_query->database);
-        context.checkAccess(AccessType::SHOW_DATABASES, show_query->database);
+        show_query->database = getContext()->resolveDatabase(show_query->database);
+        getContext()->checkAccess(AccessType::SHOW_DATABASES, show_query->database);
         create_query = DatabaseCatalog::instance().getDatabase(show_query->database)->getCreateDatabaseQuery();
     }
     else if ((show_query = query_ptr->as<ASTShowCreateDictionaryQuery>()))
     {
         if (show_query->temporary)
             throw Exception("Temporary dictionaries are not possible.", ErrorCodes::SYNTAX_ERROR);
-        show_query->database = context.resolveDatabase(show_query->database);
-        context.checkAccess(AccessType::SHOW_DICTIONARIES, show_query->database, show_query->table);
+        show_query->database = getContext()->resolveDatabase(show_query->database);
+        getContext()->checkAccess(AccessType::SHOW_DICTIONARIES, show_query->database, show_query->table);
         create_query = DatabaseCatalog::instance().getDatabase(show_query->database)->getCreateDictionaryQuery(show_query->table);
     }
 
     if (!create_query)
         throw Exception("Unable to show the create query of " + show_query->table + ". Maybe it was created by the system.", ErrorCodes::THERE_IS_NO_QUERY);
 
-    if (!context.getSettingsRef().show_table_uuid_in_table_create_query_if_not_nil)
+    if (!getContext()->getSettingsRef().show_table_uuid_in_table_create_query_if_not_nil)
     {
         auto & create = create_query->as<ASTCreateQuery &>();
         create.uuid = UUIDHelpers::Nil;
+        create.to_inner_uuid = UUIDHelpers::Nil;
     }
 
     WriteBufferFromOwnString buf;
diff --git a/src/Interpreters/InterpreterShowCreateQuery.h b/src/Interpreters/InterpreterShowCreateQuery.h
index 5ac98509b23..53f587d3e7d 100644
--- a/src/Interpreters/InterpreterShowCreateQuery.h
+++ b/src/Interpreters/InterpreterShowCreateQuery.h
@@ -7,16 +7,12 @@
 namespace DB
 {
 
-class Context;
-
-
 /** Return single row with single column "statement" of type String with text of query to CREATE specified table.
   */
-class InterpreterShowCreateQuery : public IInterpreter
+class InterpreterShowCreateQuery : public IInterpreter, WithContext
 {
 public:
-    InterpreterShowCreateQuery(const ASTPtr & query_ptr_, const Context & context_)
-        : query_ptr(query_ptr_), context(context_) {}
+    InterpreterShowCreateQuery(const ASTPtr & query_ptr_, ContextPtr context_) : WithContext(context_), query_ptr(query_ptr_) {}
 
     BlockIO execute() override;
 
@@ -24,7 +20,6 @@ public:
 
 private:
     ASTPtr query_ptr;
-    const Context & context;
 
     BlockInputStreamPtr executeImpl();
 };
diff --git a/src/Interpreters/InterpreterShowGrantsQuery.cpp b/src/Interpreters/InterpreterShowGrantsQuery.cpp
index a2ddc5eec27..f3e554122e1 100644
--- a/src/Interpreters/InterpreterShowGrantsQuery.cpp
+++ b/src/Interpreters/InterpreterShowGrantsQuery.cpp
@@ -32,56 +32,50 @@ namespace
     {
         ASTs res;
 
-        std::shared_ptr<ASTRolesOrUsersSet> to_roles = std::make_shared<ASTRolesOrUsersSet>();
-        to_roles->names.push_back(grantee.getName());
+        std::shared_ptr<ASTRolesOrUsersSet> grantees = std::make_shared<ASTRolesOrUsersSet>();
+        grantees->names.push_back(grantee.getName());
 
         std::shared_ptr<ASTGrantQuery> current_query = nullptr;
 
-        auto elements = grantee.access.getElements();
-        for (const auto & element : elements)
+        for (const auto & element : grantee.access.getElements())
         {
+            if (element.empty())
+                continue;
+
             if (current_query)
             {
                 const auto & prev_element = current_query->access_rights_elements.back();
-                bool continue_using_current_query = (element.database == prev_element.database)
-                    && (element.any_database == prev_element.any_database) && (element.table == prev_element.table)
-                    && (element.any_table == prev_element.any_table) && (element.grant_option == current_query->grant_option)
-                    && (element.kind == current_query->kind);
-                if (!continue_using_current_query)
+                bool continue_with_current_query = element.sameDatabaseAndTable(prev_element) && element.sameOptions(prev_element);
+                if (!continue_with_current_query)
                     current_query = nullptr;
             }
 
             if (!current_query)
             {
                 current_query = std::make_shared<ASTGrantQuery>();
-                current_query->kind = element.kind;
-                current_query->attach = attach_mode;
-                current_query->grant_option = element.grant_option;
-                current_query->to_roles = to_roles;
+                current_query->grantees = grantees;
+                current_query->attach_mode = attach_mode;
+                if (element.is_partial_revoke)
+                    current_query->is_revoke = true;
                 res.push_back(current_query);
             }
 
             current_query->access_rights_elements.emplace_back(std::move(element));
         }
 
-        auto grants_roles = grantee.granted_roles.getGrants();
-
-        for (bool admin_option : {false, true})
+        for (const auto & element : grantee.granted_roles.getElements())
         {
-            const auto & roles = admin_option ? grants_roles.grants_with_admin_option : grants_roles.grants;
-            if (roles.empty())
+            if (element.empty())
                 continue;
 
             auto grant_query = std::make_shared<ASTGrantQuery>();
-            using Kind = ASTGrantQuery::Kind;
-            grant_query->kind = Kind::GRANT;
-            grant_query->attach = attach_mode;
-            grant_query->admin_option = admin_option;
-            grant_query->to_roles = to_roles;
+            grant_query->grantees = grantees;
+            grant_query->admin_option = element.admin_option;
+            grant_query->attach_mode = attach_mode;
             if (attach_mode)
-                grant_query->roles = RolesOrUsersSet{roles}.toAST();
+                grant_query->roles = RolesOrUsersSet{element.ids}.toAST();
             else
-                grant_query->roles = RolesOrUsersSet{roles}.toASTWithNames(*manager);
+                grant_query->roles = RolesOrUsersSet{element.ids}.toASTWithNames(*manager);
             res.push_back(std::move(grant_query));
         }
 
@@ -142,8 +136,8 @@ BlockInputStreamPtr InterpreterShowGrantsQuery::executeImpl()
 std::vector<AccessEntityPtr> InterpreterShowGrantsQuery::getEntities() const
 {
     const auto & show_query = query_ptr->as<ASTShowGrantsQuery &>();
-    const auto & access_control = context.getAccessControlManager();
-    auto ids = RolesOrUsersSet{*show_query.for_roles, access_control, context.getUserID()}.getMatchingIDs(access_control);
+    const auto & access_control = getContext()->getAccessControlManager();
+    auto ids = RolesOrUsersSet{*show_query.for_roles, access_control, getContext()->getUserID()}.getMatchingIDs(access_control);
 
     std::vector<AccessEntityPtr> entities;
     for (const auto & id : ids)
@@ -161,7 +155,7 @@ std::vector<AccessEntityPtr> InterpreterShowGrantsQuery::getEntities() const
 ASTs InterpreterShowGrantsQuery::getGrantQueries() const
 {
     auto entities = getEntities();
-    const auto & access_control = context.getAccessControlManager();
+    const auto & access_control = getContext()->getAccessControlManager();
 
     ASTs grant_queries;
     for (const auto & entity : entities)
diff --git a/src/Interpreters/InterpreterShowGrantsQuery.h b/src/Interpreters/InterpreterShowGrantsQuery.h
index f5dbd110fd0..c23aa1e3b94 100644
--- a/src/Interpreters/InterpreterShowGrantsQuery.h
+++ b/src/Interpreters/InterpreterShowGrantsQuery.h
@@ -1,22 +1,22 @@
 #pragma once
 
+#include <Core/UUID.h>
 #include <Interpreters/IInterpreter.h>
 #include <Parsers/IAST_fwd.h>
-#include <Core/UUID.h>
 
 
 namespace DB
 {
+
 class AccessControlManager;
 class ASTShowGrantsQuery;
 struct IAccessEntity;
 using AccessEntityPtr = std::shared_ptr<const IAccessEntity>;
 
-
-class InterpreterShowGrantsQuery : public IInterpreter
+class InterpreterShowGrantsQuery : public IInterpreter, WithContext
 {
 public:
-    InterpreterShowGrantsQuery(const ASTPtr & query_ptr_, Context & context_) : query_ptr(query_ptr_), context(context_) {}
+    InterpreterShowGrantsQuery(const ASTPtr & query_ptr_, ContextPtr context_) : WithContext(context_), query_ptr(query_ptr_) {}
 
     BlockIO execute() override;
 
@@ -32,6 +32,6 @@ private:
     std::vector<AccessEntityPtr> getEntities() const;
 
     ASTPtr query_ptr;
-    Context & context;
 };
+
 }
diff --git a/src/Interpreters/InterpreterShowPrivilegesQuery.cpp b/src/Interpreters/InterpreterShowPrivilegesQuery.cpp
index e88b97d8671..c566d31e2fc 100644
--- a/src/Interpreters/InterpreterShowPrivilegesQuery.cpp
+++ b/src/Interpreters/InterpreterShowPrivilegesQuery.cpp
@@ -4,7 +4,7 @@
 
 namespace DB
 {
-InterpreterShowPrivilegesQuery::InterpreterShowPrivilegesQuery(const ASTPtr & query_ptr_, Context & context_)
+InterpreterShowPrivilegesQuery::InterpreterShowPrivilegesQuery(const ASTPtr & query_ptr_, ContextPtr context_)
     : query_ptr(query_ptr_), context(context_)
 {
 }
diff --git a/src/Interpreters/InterpreterShowPrivilegesQuery.h b/src/Interpreters/InterpreterShowPrivilegesQuery.h
index 0c1a30107c0..75989263405 100644
--- a/src/Interpreters/InterpreterShowPrivilegesQuery.h
+++ b/src/Interpreters/InterpreterShowPrivilegesQuery.h
@@ -11,7 +11,7 @@ class Context;
 class InterpreterShowPrivilegesQuery : public IInterpreter
 {
 public:
-    InterpreterShowPrivilegesQuery(const ASTPtr & query_ptr_, Context & context_);
+    InterpreterShowPrivilegesQuery(const ASTPtr & query_ptr_, ContextPtr context_);
 
     BlockIO execute() override;
 
@@ -20,7 +20,7 @@ public:
 
 private:
     ASTPtr query_ptr;
-    Context & context;
+    ContextPtr context;
 };
 
 }
diff --git a/src/Interpreters/InterpreterShowProcesslistQuery.cpp b/src/Interpreters/InterpreterShowProcesslistQuery.cpp
index 697b286fe75..780ba688a89 100644
--- a/src/Interpreters/InterpreterShowProcesslistQuery.cpp
+++ b/src/Interpreters/InterpreterShowProcesslistQuery.cpp
@@ -12,7 +12,7 @@ namespace DB
 
 BlockIO InterpreterShowProcesslistQuery::execute()
 {
-    return executeQuery("SELECT * FROM system.processes", context, true);
+    return executeQuery("SELECT * FROM system.processes", getContext(), true);
 }
 
 }
diff --git a/src/Interpreters/InterpreterShowProcesslistQuery.h b/src/Interpreters/InterpreterShowProcesslistQuery.h
index fa0bbf075bd..5eedb67595e 100644
--- a/src/Interpreters/InterpreterShowProcesslistQuery.h
+++ b/src/Interpreters/InterpreterShowProcesslistQuery.h
@@ -7,16 +7,13 @@
 namespace DB
 {
 
-class Context;
-
-
 /** Return list of currently executing queries.
   */
-class InterpreterShowProcesslistQuery : public IInterpreter
+class InterpreterShowProcesslistQuery : public IInterpreter, WithContext
 {
 public:
-    InterpreterShowProcesslistQuery(const ASTPtr & query_ptr_, Context & context_)
-        : query_ptr(query_ptr_), context(context_) {}
+    InterpreterShowProcesslistQuery(const ASTPtr & query_ptr_, ContextPtr context_)
+        : WithContext(context_), query_ptr(query_ptr_) {}
 
     BlockIO execute() override;
 
@@ -27,8 +24,6 @@ public:
 
 private:
     ASTPtr query_ptr;
-    Context & context;
 };
 
-
 }
diff --git a/src/Interpreters/InterpreterShowTablesQuery.cpp b/src/Interpreters/InterpreterShowTablesQuery.cpp
index 49c55fa3a93..901999f004f 100644
--- a/src/Interpreters/InterpreterShowTablesQuery.cpp
+++ b/src/Interpreters/InterpreterShowTablesQuery.cpp
@@ -18,8 +18,8 @@ namespace ErrorCodes
 }
 
 
-InterpreterShowTablesQuery::InterpreterShowTablesQuery(const ASTPtr & query_ptr_, Context & context_)
-    : query_ptr(query_ptr_), context(context_)
+InterpreterShowTablesQuery::InterpreterShowTablesQuery(const ASTPtr & query_ptr_, ContextPtr context_)
+    : WithContext(context_), query_ptr(query_ptr_)
 {
 }
 
@@ -102,7 +102,7 @@ String InterpreterShowTablesQuery::getRewrittenQuery()
     if (query.temporary && !query.from.empty())
         throw Exception("The `FROM` and `TEMPORARY` cannot be used together in `SHOW TABLES`", ErrorCodes::SYNTAX_ERROR);
 
-    String database = context.resolveDatabase(query.from);
+    String database = getContext()->resolveDatabase(query.from);
     DatabaseCatalog::instance().assertDatabaseExists(database);
 
     WriteBufferFromOwnString rewritten_query;
@@ -142,7 +142,7 @@ String InterpreterShowTablesQuery::getRewrittenQuery()
 
 BlockIO InterpreterShowTablesQuery::execute()
 {
-    return executeQuery(getRewrittenQuery(), context, true);
+    return executeQuery(getRewrittenQuery(), getContext(), true);
 }
 
 
diff --git a/src/Interpreters/InterpreterShowTablesQuery.h b/src/Interpreters/InterpreterShowTablesQuery.h
index 4f720e68622..b61be568e35 100644
--- a/src/Interpreters/InterpreterShowTablesQuery.h
+++ b/src/Interpreters/InterpreterShowTablesQuery.h
@@ -13,10 +13,10 @@ class Context;
 /** Return a list of tables or databases meets specified conditions.
   * Interprets a query through replacing it to SELECT query from system.tables or system.databases.
   */
-class InterpreterShowTablesQuery : public IInterpreter
+class InterpreterShowTablesQuery : public IInterpreter, WithContext
 {
 public:
-    InterpreterShowTablesQuery(const ASTPtr & query_ptr_, Context & context_);
+    InterpreterShowTablesQuery(const ASTPtr & query_ptr_, ContextPtr context_);
 
     BlockIO execute() override;
 
@@ -27,7 +27,6 @@ public:
 
 private:
     ASTPtr query_ptr;
-    Context & context;
 
     String getRewrittenQuery();
 };
diff --git a/src/Interpreters/InterpreterSystemQuery.cpp b/src/Interpreters/InterpreterSystemQuery.cpp
index ece3209621b..117aa0da2da 100644
--- a/src/Interpreters/InterpreterSystemQuery.cpp
+++ b/src/Interpreters/InterpreterSystemQuery.cpp
@@ -10,6 +10,7 @@
 #include <Interpreters/Context.h>
 #include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/ExternalDictionariesLoader.h>
+#include <Interpreters/ExternalModelsLoader.h>
 #include <Interpreters/EmbeddedDictionaries.h>
 #include <Interpreters/ActionLocksManager.h>
 #include <Interpreters/InterpreterDropQuery.h>
@@ -24,6 +25,7 @@
 #include <Interpreters/MetricLog.h>
 #include <Interpreters/AsynchronousMetricLog.h>
 #include <Interpreters/OpenTelemetrySpanLog.h>
+#include <Interpreters/ExpressionJIT.h>
 #include <Access/ContextAccess.h>
 #include <Access/AllowedClientHosts.h>
 #include <Databases/IDatabase.h>
@@ -133,7 +135,7 @@ AccessType getRequiredAccessType(StorageActionBlockType action_type)
 /// Implements SYSTEM [START|STOP] <something action from ActionLocks>
 void InterpreterSystemQuery::startStopAction(StorageActionBlockType action_type, bool start)
 {
-    auto manager = context.getActionLocksManager();
+    auto manager = getContext()->getActionLocksManager();
     manager->cleanExpired();
 
     if (volume_ptr && action_type == ActionLocks::PartsMerge)
@@ -142,7 +144,7 @@ void InterpreterSystemQuery::startStopAction(StorageActionBlockType action_type,
     }
     else if (table_id)
     {
-        auto table = DatabaseCatalog::instance().tryGetTable(table_id, context);
+        auto table = DatabaseCatalog::instance().tryGetTable(table_id, getContext());
         if (table)
         {
             if (start)
@@ -156,10 +158,10 @@ void InterpreterSystemQuery::startStopAction(StorageActionBlockType action_type,
     }
     else
     {
-        auto access = context.getAccess();
+        auto access = getContext()->getAccess();
         for (auto & elem : DatabaseCatalog::instance().getDatabases())
         {
-            for (auto iterator = elem.second->getTablesIterator(context); iterator->isValid(); iterator->next())
+            for (auto iterator = elem.second->getTablesIterator(getContext()); iterator->isValid(); iterator->next())
             {
                 StoragePtr table = iterator->table();
                 if (!table)
@@ -189,8 +191,8 @@ void InterpreterSystemQuery::startStopAction(StorageActionBlockType action_type,
 }
 
 
-InterpreterSystemQuery::InterpreterSystemQuery(const ASTPtr & query_ptr_, Context & context_)
-        : query_ptr(query_ptr_->clone()), context(context_), log(&Poco::Logger::get("InterpreterSystemQuery"))
+InterpreterSystemQuery::InterpreterSystemQuery(const ASTPtr & query_ptr_, ContextPtr context_)
+        : WithContext(context_), query_ptr(query_ptr_->clone()), log(&Poco::Logger::get("InterpreterSystemQuery"))
 {
 }
 
@@ -200,37 +202,37 @@ BlockIO InterpreterSystemQuery::execute()
     auto & query = query_ptr->as<ASTSystemQuery &>();
 
     if (!query.cluster.empty())
-        return executeDDLQueryOnCluster(query_ptr, context, getRequiredAccessForDDLOnCluster());
+        return executeDDLQueryOnCluster(query_ptr, getContext(), getRequiredAccessForDDLOnCluster());
 
     using Type = ASTSystemQuery::Type;
 
     /// Use global context with fresh system profile settings
-    Context system_context = context.getGlobalContext();
-    system_context.setSetting("profile", context.getSystemProfileName());
+    auto system_context = Context::createCopy(getContext()->getGlobalContext());
+    system_context->setSetting("profile", getContext()->getSystemProfileName());
 
     /// Make canonical query for simpler processing
     if (!query.table.empty())
-        table_id = context.resolveStorageID(StorageID(query.database, query.table), Context::ResolveOrdinary);
+        table_id = getContext()->resolveStorageID(StorageID(query.database, query.table), Context::ResolveOrdinary);
 
     if (!query.target_dictionary.empty() && !query.database.empty())
         query.target_dictionary = query.database + "." + query.target_dictionary;
 
     volume_ptr = {};
     if (!query.storage_policy.empty() && !query.volume.empty())
-        volume_ptr = context.getStoragePolicy(query.storage_policy)->getVolumeByName(query.volume);
+        volume_ptr = getContext()->getStoragePolicy(query.storage_policy)->getVolumeByName(query.volume);
 
     switch (query.type)
     {
         case Type::SHUTDOWN:
         {
-            context.checkAccess(AccessType::SYSTEM_SHUTDOWN);
+            getContext()->checkAccess(AccessType::SYSTEM_SHUTDOWN);
             if (kill(0, SIGTERM))
                 throwFromErrno("System call kill(0, SIGTERM) failed", ErrorCodes::CANNOT_KILL);
             break;
         }
         case Type::KILL:
         {
-            context.checkAccess(AccessType::SYSTEM_SHUTDOWN);
+            getContext()->checkAccess(AccessType::SYSTEM_SHUTDOWN);
             /// Exit with the same code as it is usually set by shell when process is terminated by SIGKILL.
             /// It's better than doing 'raise' or 'kill', because they have no effect for 'init' process (with pid = 0, usually in Docker).
             LOG_INFO(log, "Exit immediately as the SYSTEM KILL command has been issued.");
@@ -253,56 +255,80 @@ BlockIO InterpreterSystemQuery::execute()
         }
         case Type::DROP_DNS_CACHE:
         {
-            context.checkAccess(AccessType::SYSTEM_DROP_DNS_CACHE);
+            getContext()->checkAccess(AccessType::SYSTEM_DROP_DNS_CACHE);
             DNSResolver::instance().dropCache();
             /// Reinitialize clusters to update their resolved_addresses
-            system_context.reloadClusterConfig();
+            system_context->reloadClusterConfig();
             break;
         }
         case Type::DROP_MARK_CACHE:
-            context.checkAccess(AccessType::SYSTEM_DROP_MARK_CACHE);
-            system_context.dropMarkCache();
+            getContext()->checkAccess(AccessType::SYSTEM_DROP_MARK_CACHE);
+            system_context->dropMarkCache();
             break;
         case Type::DROP_UNCOMPRESSED_CACHE:
-            context.checkAccess(AccessType::SYSTEM_DROP_UNCOMPRESSED_CACHE);
-            system_context.dropUncompressedCache();
+            getContext()->checkAccess(AccessType::SYSTEM_DROP_UNCOMPRESSED_CACHE);
+            system_context->dropUncompressedCache();
+            break;
+        case Type::DROP_MMAP_CACHE:
+            getContext()->checkAccess(AccessType::SYSTEM_DROP_MMAP_CACHE);
+            system_context->dropMMappedFileCache();
             break;
 #if USE_EMBEDDED_COMPILER
         case Type::DROP_COMPILED_EXPRESSION_CACHE:
-            context.checkAccess(AccessType::SYSTEM_DROP_COMPILED_EXPRESSION_CACHE);
-            system_context.dropCompiledExpressionCache();
+            getContext()->checkAccess(AccessType::SYSTEM_DROP_COMPILED_EXPRESSION_CACHE);
+            if (auto * cache = CompiledExpressionCacheFactory::instance().tryGetCache())
+                cache->reset();
             break;
 #endif
         case Type::RELOAD_DICTIONARY:
         {
-            context.checkAccess(AccessType::SYSTEM_RELOAD_DICTIONARY);
-            system_context.getExternalDictionariesLoader().loadOrReload(
-                    DatabaseCatalog::instance().resolveDictionaryName(query.target_dictionary));
+            getContext()->checkAccess(AccessType::SYSTEM_RELOAD_DICTIONARY);
+
+            auto & external_dictionaries_loader = system_context->getExternalDictionariesLoader();
+            external_dictionaries_loader.reloadDictionary(query.target_dictionary, getContext());
+
+
             ExternalDictionariesLoader::resetAll();
             break;
         }
         case Type::RELOAD_DICTIONARIES:
         {
-            context.checkAccess(AccessType::SYSTEM_RELOAD_DICTIONARY);
+            getContext()->checkAccess(AccessType::SYSTEM_RELOAD_DICTIONARY);
             executeCommandsAndThrowIfError(
-                    [&] () { system_context.getExternalDictionariesLoader().reloadAllTriedToLoad(); },
-                    [&] () { system_context.getEmbeddedDictionaries().reload(); }
+                    [&] () { system_context->getExternalDictionariesLoader().reloadAllTriedToLoad(); },
+                    [&] () { system_context->getEmbeddedDictionaries().reload(); }
             );
             ExternalDictionariesLoader::resetAll();
             break;
         }
+        case Type::RELOAD_MODEL:
+        {
+            getContext()->checkAccess(AccessType::SYSTEM_RELOAD_MODEL);
+
+            auto & external_models_loader = system_context->getExternalModelsLoader();
+            external_models_loader.reloadModel(query.target_model);
+            break;
+        }
+        case Type::RELOAD_MODELS:
+        {
+            getContext()->checkAccess(AccessType::SYSTEM_RELOAD_MODEL);
+
+            auto & external_models_loader = system_context->getExternalModelsLoader();
+            external_models_loader.reloadAllTriedToLoad();
+            break;
+        }
         case Type::RELOAD_EMBEDDED_DICTIONARIES:
-            context.checkAccess(AccessType::SYSTEM_RELOAD_EMBEDDED_DICTIONARIES);
-            system_context.getEmbeddedDictionaries().reload();
+            getContext()->checkAccess(AccessType::SYSTEM_RELOAD_EMBEDDED_DICTIONARIES);
+            system_context->getEmbeddedDictionaries().reload();
             break;
         case Type::RELOAD_CONFIG:
-            context.checkAccess(AccessType::SYSTEM_RELOAD_CONFIG);
-            system_context.reloadConfig();
+            getContext()->checkAccess(AccessType::SYSTEM_RELOAD_CONFIG);
+            system_context->reloadConfig();
             break;
         case Type::RELOAD_SYMBOLS:
         {
 #if defined(__ELF__) && !defined(__FreeBSD__)
-            context.checkAccess(AccessType::SYSTEM_RELOAD_SYMBOLS);
+            getContext()->checkAccess(AccessType::SYSTEM_RELOAD_SYMBOLS);
             (void)SymbolIndex::instance(true);
             break;
 #else
@@ -370,16 +396,16 @@ BlockIO InterpreterSystemQuery::execute()
             break;
         case Type::FLUSH_LOGS:
         {
-            context.checkAccess(AccessType::SYSTEM_FLUSH_LOGS);
+            getContext()->checkAccess(AccessType::SYSTEM_FLUSH_LOGS);
             executeCommandsAndThrowIfError(
-                    [&] () { if (auto query_log = context.getQueryLog()) query_log->flush(true); },
-                    [&] () { if (auto part_log = context.getPartLog("")) part_log->flush(true); },
-                    [&] () { if (auto query_thread_log = context.getQueryThreadLog()) query_thread_log->flush(true); },
-                    [&] () { if (auto trace_log = context.getTraceLog()) trace_log->flush(true); },
-                    [&] () { if (auto text_log = context.getTextLog()) text_log->flush(true); },
-                    [&] () { if (auto metric_log = context.getMetricLog()) metric_log->flush(true); },
-                    [&] () { if (auto asynchronous_metric_log = context.getAsynchronousMetricLog()) asynchronous_metric_log->flush(true); },
-                    [&] () { if (auto opentelemetry_span_log = context.getOpenTelemetrySpanLog()) opentelemetry_span_log->flush(true); }
+                    [&] () { if (auto query_log = getContext()->getQueryLog()) query_log->flush(true); },
+                    [&] () { if (auto part_log = getContext()->getPartLog("")) part_log->flush(true); },
+                    [&] () { if (auto query_thread_log = getContext()->getQueryThreadLog()) query_thread_log->flush(true); },
+                    [&] () { if (auto trace_log = getContext()->getTraceLog()) trace_log->flush(true); },
+                    [&] () { if (auto text_log = getContext()->getTextLog()) text_log->flush(true); },
+                    [&] () { if (auto metric_log = getContext()->getMetricLog()) metric_log->flush(true); },
+                    [&] () { if (auto asynchronous_metric_log = getContext()->getAsynchronousMetricLog()) asynchronous_metric_log->flush(true); },
+                    [&] () { if (auto opentelemetry_span_log = getContext()->getOpenTelemetrySpanLog()) opentelemetry_span_log->flush(true); }
             );
             break;
         }
@@ -394,12 +420,12 @@ BlockIO InterpreterSystemQuery::execute()
 }
 
 
-StoragePtr InterpreterSystemQuery::tryRestartReplica(const StorageID & replica, Context & system_context, bool need_ddl_guard)
+StoragePtr InterpreterSystemQuery::tryRestartReplica(const StorageID & replica, ContextPtr system_context, bool need_ddl_guard)
 {
-    context.checkAccess(AccessType::SYSTEM_RESTART_REPLICA, replica);
+    getContext()->checkAccess(AccessType::SYSTEM_RESTART_REPLICA, replica);
 
     auto table_ddl_guard = need_ddl_guard ? DatabaseCatalog::instance().getDDLGuard(replica.getDatabaseName(), replica.getTableName()) : nullptr;
-    auto [database, table] = DatabaseCatalog::instance().tryGetDatabaseAndTable(replica, context);
+    auto [database, table] = DatabaseCatalog::instance().tryGetDatabaseAndTable(replica, getContext());
     ASTPtr create_ast;
 
     /// Detach actions
@@ -409,8 +435,8 @@ StoragePtr InterpreterSystemQuery::tryRestartReplica(const StorageID & replica,
     table->shutdown();
     {
         /// If table was already dropped by anyone, an exception will be thrown
-        auto table_lock = table->lockExclusively(context.getCurrentQueryId(), context.getSettingsRef().lock_acquire_timeout);
-        create_ast = database->getCreateTableQuery(replica.table_name, context);
+        auto table_lock = table->lockExclusively(getContext()->getCurrentQueryId(), getContext()->getSettingsRef().lock_acquire_timeout);
+        create_ast = database->getCreateTableQuery(replica.table_name, getContext());
 
         database->detachTable(replica.table_name);
     }
@@ -421,14 +447,14 @@ StoragePtr InterpreterSystemQuery::tryRestartReplica(const StorageID & replica,
     auto & create = create_ast->as<ASTCreateQuery &>();
     create.attach = true;
 
-    auto columns = InterpreterCreateQuery::getColumnsDescription(*create.columns_list->columns, system_context, false);
+    auto columns = InterpreterCreateQuery::getColumnsDescription(*create.columns_list->columns, system_context, true);
     auto constraints = InterpreterCreateQuery::getConstraintsDescription(create.columns_list->constraints);
     auto data_path = database->getTableDataPath(create);
 
     table = StorageFactory::instance().get(create,
         data_path,
         system_context,
-        system_context.getGlobalContext(),
+        system_context->getGlobalContext(),
         columns,
         constraints,
         false);
@@ -439,7 +465,7 @@ StoragePtr InterpreterSystemQuery::tryRestartReplica(const StorageID & replica,
     return table;
 }
 
-void InterpreterSystemQuery::restartReplicas(Context & system_context)
+void InterpreterSystemQuery::restartReplicas(ContextPtr system_context)
 {
     std::vector<StorageID> replica_names;
     auto & catalog = DatabaseCatalog::instance();
@@ -447,7 +473,7 @@ void InterpreterSystemQuery::restartReplicas(Context & system_context)
     for (auto & elem : catalog.getDatabases())
     {
         DatabasePtr & database = elem.second;
-        for (auto iterator = database->getTablesIterator(context); iterator->isValid(); iterator->next())
+        for (auto iterator = database->getTablesIterator(getContext()); iterator->isValid(); iterator->next())
         {
             if (auto table = iterator->table())
             {
@@ -482,43 +508,43 @@ void InterpreterSystemQuery::dropReplica(ASTSystemQuery & query)
 
     if (!table_id.empty())
     {
-        context.checkAccess(AccessType::SYSTEM_DROP_REPLICA, table_id);
-        StoragePtr table = DatabaseCatalog::instance().getTable(table_id, context);
+        getContext()->checkAccess(AccessType::SYSTEM_DROP_REPLICA, table_id);
+        StoragePtr table = DatabaseCatalog::instance().getTable(table_id, getContext());
 
         if (!dropReplicaImpl(query, table))
             throw Exception("Table " + table_id.getNameForLogs() + " is not replicated", ErrorCodes::BAD_ARGUMENTS);
     }
     else if (!query.database.empty())
     {
-        context.checkAccess(AccessType::SYSTEM_DROP_REPLICA, query.database);
+        getContext()->checkAccess(AccessType::SYSTEM_DROP_REPLICA, query.database);
         DatabasePtr database = DatabaseCatalog::instance().getDatabase(query.database);
-        for (auto iterator = database->getTablesIterator(context); iterator->isValid(); iterator->next())
+        for (auto iterator = database->getTablesIterator(getContext()); iterator->isValid(); iterator->next())
             dropReplicaImpl(query, iterator->table());
         LOG_TRACE(log, "Dropped replica {} from database {}", query.replica, backQuoteIfNeed(database->getDatabaseName()));
     }
     else if (query.is_drop_whole_replica)
     {
-        context.checkAccess(AccessType::SYSTEM_DROP_REPLICA);
+        getContext()->checkAccess(AccessType::SYSTEM_DROP_REPLICA);
         auto databases = DatabaseCatalog::instance().getDatabases();
 
         for (auto & elem : databases)
         {
             DatabasePtr & database = elem.second;
-            for (auto iterator = database->getTablesIterator(context); iterator->isValid(); iterator->next())
+            for (auto iterator = database->getTablesIterator(getContext()); iterator->isValid(); iterator->next())
                 dropReplicaImpl(query, iterator->table());
             LOG_TRACE(log, "Dropped replica {} from database {}", query.replica, backQuoteIfNeed(database->getDatabaseName()));
         }
     }
     else if (!query.replica_zk_path.empty())
     {
-        context.checkAccess(AccessType::SYSTEM_DROP_REPLICA);
+        getContext()->checkAccess(AccessType::SYSTEM_DROP_REPLICA);
         auto remote_replica_path = query.replica_zk_path  + "/replicas/" + query.replica;
 
         /// This check is actually redundant, but it may prevent from some user mistakes
         for (auto & elem : DatabaseCatalog::instance().getDatabases())
         {
             DatabasePtr & database = elem.second;
-            for (auto iterator = database->getTablesIterator(context); iterator->isValid(); iterator->next())
+            for (auto iterator = database->getTablesIterator(getContext()); iterator->isValid(); iterator->next())
             {
                 if (auto * storage_replicated = dynamic_cast<StorageReplicatedMergeTree *>(iterator->table().get()))
                 {
@@ -533,7 +559,7 @@ void InterpreterSystemQuery::dropReplica(ASTSystemQuery & query)
             }
         }
 
-        auto zookeeper = context.getZooKeeper();
+        auto zookeeper = getContext()->getZooKeeper();
 
         bool looks_like_table_path = zookeeper->exists(query.replica_zk_path + "/replicas") ||
                                      zookeeper->exists(query.replica_zk_path + "/dropped");
@@ -559,7 +585,7 @@ bool InterpreterSystemQuery::dropReplicaImpl(ASTSystemQuery & query, const Stora
         return false;
 
     StorageReplicatedMergeTree::Status status;
-    auto zookeeper = context.getZooKeeper();
+    auto zookeeper = getContext()->getZooKeeper();
     storage_replicated->getStatus(status);
 
     /// Do not allow to drop local replicas and active remote replicas
@@ -582,13 +608,13 @@ bool InterpreterSystemQuery::dropReplicaImpl(ASTSystemQuery & query, const Stora
 
 void InterpreterSystemQuery::syncReplica(ASTSystemQuery &)
 {
-    context.checkAccess(AccessType::SYSTEM_SYNC_REPLICA, table_id);
-    StoragePtr table = DatabaseCatalog::instance().getTable(table_id, context);
+    getContext()->checkAccess(AccessType::SYSTEM_SYNC_REPLICA, table_id);
+    StoragePtr table = DatabaseCatalog::instance().getTable(table_id, getContext());
 
     if (auto * storage_replicated = dynamic_cast<StorageReplicatedMergeTree *>(table.get()))
     {
         LOG_TRACE(log, "Synchronizing entries in replica's queue with table's log and waiting for it to become empty");
-        if (!storage_replicated->waitForShrinkingQueueSize(0, context.getSettingsRef().receive_timeout.totalMilliseconds()))
+        if (!storage_replicated->waitForShrinkingQueueSize(0, getContext()->getSettingsRef().receive_timeout.totalMilliseconds()))
         {
             LOG_ERROR(log, "SYNC REPLICA {}: Timed out!", table_id.getNameForLogs());
             throw Exception(
@@ -603,10 +629,10 @@ void InterpreterSystemQuery::syncReplica(ASTSystemQuery &)
 
 void InterpreterSystemQuery::flushDistributed(ASTSystemQuery &)
 {
-    context.checkAccess(AccessType::SYSTEM_FLUSH_DISTRIBUTED, table_id);
+    getContext()->checkAccess(AccessType::SYSTEM_FLUSH_DISTRIBUTED, table_id);
 
-    if (auto * storage_distributed = dynamic_cast<StorageDistributed *>(DatabaseCatalog::instance().getTable(table_id, context).get()))
-        storage_distributed->flushClusterNodesAllData(context);
+    if (auto * storage_distributed = dynamic_cast<StorageDistributed *>(DatabaseCatalog::instance().getTable(table_id, getContext()).get()))
+        storage_distributed->flushClusterNodesAllData(getContext());
     else
         throw Exception("Table " + table_id.getNameForLogs() + " is not distributed", ErrorCodes::BAD_ARGUMENTS);
 }
@@ -628,6 +654,7 @@ AccessRightsElements InterpreterSystemQuery::getRequiredAccessForDDLOnCluster()
         }
         case Type::DROP_DNS_CACHE: [[fallthrough]];
         case Type::DROP_MARK_CACHE: [[fallthrough]];
+        case Type::DROP_MMAP_CACHE: [[fallthrough]];
 #if USE_EMBEDDED_COMPILER
         case Type::DROP_COMPILED_EXPRESSION_CACHE: [[fallthrough]];
 #endif
@@ -643,6 +670,12 @@ AccessRightsElements InterpreterSystemQuery::getRequiredAccessForDDLOnCluster()
             required_access.emplace_back(AccessType::SYSTEM_RELOAD_DICTIONARY);
             break;
         }
+        case Type::RELOAD_MODEL: [[fallthrough]];
+        case Type::RELOAD_MODELS:
+        {
+            required_access.emplace_back(AccessType::SYSTEM_RELOAD_MODEL);
+            break;
+        }
         case Type::RELOAD_CONFIG:
         {
             required_access.emplace_back(AccessType::SYSTEM_RELOAD_CONFIG);
@@ -754,4 +787,9 @@ AccessRightsElements InterpreterSystemQuery::getRequiredAccessForDDLOnCluster()
     return required_access;
 }
 
+void InterpreterSystemQuery::extendQueryLogElemImpl(QueryLogElement & elem, const ASTPtr & /*ast*/, ContextPtr) const
+{
+    elem.query_kind = "System";
+}
+
 }
diff --git a/src/Interpreters/InterpreterSystemQuery.h b/src/Interpreters/InterpreterSystemQuery.h
index 6fa0a432191..d9f9e6c5d96 100644
--- a/src/Interpreters/InterpreterSystemQuery.h
+++ b/src/Interpreters/InterpreterSystemQuery.h
@@ -30,25 +30,24 @@ class ASTSystemQuery;
   * - start/stop actions for all existing tables.
   * Note that the actions for tables that will be created after this query will not be affected.
   */
-class InterpreterSystemQuery : public IInterpreter
+class InterpreterSystemQuery : public IInterpreter, WithContext
 {
 public:
-    InterpreterSystemQuery(const ASTPtr & query_ptr_, Context & context_);
+    InterpreterSystemQuery(const ASTPtr & query_ptr_, ContextPtr context_);
 
     BlockIO execute() override;
 
 private:
     ASTPtr query_ptr;
-    Context & context;
     Poco::Logger * log = nullptr;
     StorageID table_id = StorageID::createEmpty();      /// Will be set up if query contains table name
     VolumePtr volume_ptr;
 
     /// Tries to get a replicated table and restart it
     /// Returns pointer to a newly created table if the restart was successful
-    StoragePtr tryRestartReplica(const StorageID & replica, Context & context, bool need_ddl_guard = true);
+    StoragePtr tryRestartReplica(const StorageID & replica, ContextPtr context, bool need_ddl_guard = true);
 
-    void restartReplicas(Context & system_context);
+    void restartReplicas(ContextPtr system_context);
     void syncReplica(ASTSystemQuery & query);
     void dropReplica(ASTSystemQuery & query);
     bool dropReplicaImpl(ASTSystemQuery & query, const StoragePtr & table);
@@ -56,6 +55,8 @@ private:
 
     AccessRightsElements getRequiredAccessForDDLOnCluster() const;
     void startStopAction(StorageActionBlockType action_type, bool start);
+
+    void extendQueryLogElemImpl(QueryLogElement &, const ASTPtr &, ContextPtr) const override;
 };
 
 
diff --git a/src/Interpreters/InterpreterUseQuery.cpp b/src/Interpreters/InterpreterUseQuery.cpp
index 58f5b6c9a32..626d2f499c7 100644
--- a/src/Interpreters/InterpreterUseQuery.cpp
+++ b/src/Interpreters/InterpreterUseQuery.cpp
@@ -11,8 +11,8 @@ namespace DB
 BlockIO InterpreterUseQuery::execute()
 {
     const String & new_database = query_ptr->as<ASTUseQuery &>().database;
-    context.checkAccess(AccessType::SHOW_DATABASES, new_database);
-    context.getSessionContext().setCurrentDatabase(new_database);
+    getContext()->checkAccess(AccessType::SHOW_DATABASES, new_database);
+    getContext()->getSessionContext()->setCurrentDatabase(new_database);
     return {};
 }
 
diff --git a/src/Interpreters/InterpreterUseQuery.h b/src/Interpreters/InterpreterUseQuery.h
index ae409117afd..d1ce57dc64a 100644
--- a/src/Interpreters/InterpreterUseQuery.h
+++ b/src/Interpreters/InterpreterUseQuery.h
@@ -7,23 +7,17 @@
 namespace DB
 {
 
-class Context;
-
-
 /** Change default database for session.
   */
-class InterpreterUseQuery : public IInterpreter
+class InterpreterUseQuery : public IInterpreter, WithContext
 {
 public:
-    InterpreterUseQuery(const ASTPtr & query_ptr_, Context & context_)
-        : query_ptr(query_ptr_), context(context_) {}
+    InterpreterUseQuery(const ASTPtr & query_ptr_, ContextPtr context_) : WithContext(context_), query_ptr(query_ptr_) {}
 
     BlockIO execute() override;
 
 private:
     ASTPtr query_ptr;
-    Context & context;
 };
 
-
 }
diff --git a/src/Interpreters/InterpreterWatchQuery.cpp b/src/Interpreters/InterpreterWatchQuery.cpp
index 757a2d1738b..84959f2f624 100644
--- a/src/Interpreters/InterpreterWatchQuery.cpp
+++ b/src/Interpreters/InterpreterWatchQuery.cpp
@@ -32,15 +32,15 @@ namespace ErrorCodes
 
 BlockIO InterpreterWatchQuery::execute()
 {
-    if (!context.getSettingsRef().allow_experimental_live_view)
+    if (!getContext()->getSettingsRef().allow_experimental_live_view)
         throw Exception("Experimental LIVE VIEW feature is not enabled (the setting 'allow_experimental_live_view')", ErrorCodes::SUPPORT_IS_DISABLED);
 
     BlockIO res;
     const ASTWatchQuery & query = typeid_cast<const ASTWatchQuery &>(*query_ptr);
-    auto table_id = context.resolveStorageID(query, Context::ResolveOrdinary);
+    auto table_id = getContext()->resolveStorageID(query, Context::ResolveOrdinary);
 
     /// Get storage
-    storage = DatabaseCatalog::instance().tryGetTable(table_id, context);
+    storage = DatabaseCatalog::instance().tryGetTable(table_id, getContext());
 
     if (!storage)
         throw Exception("Table " + table_id.getNameForLogs() + " doesn't exist.",
@@ -48,10 +48,10 @@ BlockIO InterpreterWatchQuery::execute()
 
     /// List of columns to read to execute the query.
     Names required_columns = storage->getInMemoryMetadataPtr()->getColumns().getNamesOfPhysical();
-    context.checkAccess(AccessType::SELECT, table_id, required_columns);
+    getContext()->checkAccess(AccessType::SELECT, table_id, required_columns);
 
     /// Get context settings for this query
-    const Settings & settings = context.getSettingsRef();
+    const Settings & settings = getContext()->getSettingsRef();
 
     /// Limitation on the number of columns to read.
     if (settings.max_columns_to_read && required_columns.size() > settings.max_columns_to_read)
@@ -71,7 +71,7 @@ BlockIO InterpreterWatchQuery::execute()
     QueryProcessingStage::Enum from_stage = QueryProcessingStage::FetchColumns;
 
     /// Watch storage
-    streams = storage->watch(required_columns, query_info, context, from_stage, max_block_size, max_streams);
+    streams = storage->watch(required_columns, query_info, getContext(), from_stage, max_block_size, max_streams);
 
     /// Constraints on the result, the quota on the result, and also callback for progress.
     if (IBlockInputStream * stream = dynamic_cast<IBlockInputStream *>(streams[0].get()))
@@ -83,7 +83,7 @@ BlockIO InterpreterWatchQuery::execute()
         limits.size_limits.overflow_mode = settings.result_overflow_mode;
 
         stream->setLimits(limits);
-        stream->setQuota(context.getQuota());
+        stream->setQuota(getContext()->getQuota());
     }
 
     res.in = streams[0];
diff --git a/src/Interpreters/InterpreterWatchQuery.h b/src/Interpreters/InterpreterWatchQuery.h
index c4aa5b9ca99..45b61a18b66 100644
--- a/src/Interpreters/InterpreterWatchQuery.h
+++ b/src/Interpreters/InterpreterWatchQuery.h
@@ -14,30 +14,27 @@ limitations under the License. */
 #include <Core/QueryProcessingStage.h>
 #include <DataStreams/BlockIO.h>
 #include <DataStreams/IBlockInputStream.h>
-#include <Parsers/IAST_fwd.h>
 #include <Interpreters/IInterpreter.h>
-#include <Storages/SelectQueryInfo.h>
+#include <Parsers/IAST_fwd.h>
 #include <Storages/IStorage.h>
+#include <Storages/SelectQueryInfo.h>
 
 namespace DB
 {
 
-class Context;
 class IAST;
 using ASTPtr = std::shared_ptr<IAST>;
 using StoragePtr = std::shared_ptr<IStorage>;
 
-class InterpreterWatchQuery : public IInterpreter
+class InterpreterWatchQuery : public IInterpreter, WithContext
 {
 public:
-    InterpreterWatchQuery(const ASTPtr & query_ptr_, const Context & context_)
-        : query_ptr(query_ptr_), context(context_) {}
+    InterpreterWatchQuery(const ASTPtr & query_ptr_, ContextPtr context_) : WithContext(context_), query_ptr(query_ptr_) {}
 
     BlockIO execute() override;
 
 private:
     ASTPtr query_ptr;
-    const Context & context;
 
     /// Table from where to read data, if not subquery.
     StoragePtr storage;
@@ -45,5 +42,4 @@ private:
     BlockInputStreams streams;
 };
 
-
 }
diff --git a/src/Interpreters/InterserverCredentials.cpp b/src/Interpreters/InterserverCredentials.cpp
new file mode 100644
index 00000000000..e60d397eb02
--- /dev/null
+++ b/src/Interpreters/InterserverCredentials.cpp
@@ -0,0 +1,87 @@
+#include <Interpreters/InterserverCredentials.h>
+#include <common/logger_useful.h>
+#include <Common/StringUtils/StringUtils.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int NO_ELEMENTS_IN_CONFIG;
+}
+
+std::unique_ptr<InterserverCredentials>
+InterserverCredentials::make(const Poco::Util::AbstractConfiguration & config, const std::string & root_tag)
+{
+    if (config.has("user") && !config.has("password"))
+        throw Exception("Configuration parameter interserver_http_credentials.password can't be empty", ErrorCodes::NO_ELEMENTS_IN_CONFIG);
+
+    if (!config.has("user") && config.has("password"))
+        throw Exception("Configuration parameter interserver_http_credentials.user can't be empty if user specified", ErrorCodes::NO_ELEMENTS_IN_CONFIG);
+
+    /// They both can be empty
+    auto user = config.getString(root_tag + ".user", "");
+    auto password = config.getString(root_tag + ".password", "");
+
+    auto store = parseCredentialsFromConfig(user, password, config, root_tag);
+
+    return std::make_unique<InterserverCredentials>(user, password, store);
+}
+
+InterserverCredentials::CurrentCredentials InterserverCredentials::parseCredentialsFromConfig(
+    const std::string & current_user_,
+    const std::string & current_password_,
+    const Poco::Util::AbstractConfiguration & config,
+    const std::string & root_tag)
+{
+    auto * log = &Poco::Logger::get("InterserverCredentials");
+    CurrentCredentials store;
+    store.emplace_back(current_user_, current_password_);
+    if (config.getBool(root_tag + ".allow_empty", false))
+    {
+        LOG_DEBUG(log, "Allowing empty credentials");
+        /// Allow empty credential to support migrating from no auth
+        store.emplace_back("", "");
+    }
+
+    Poco::Util::AbstractConfiguration::Keys old_users;
+    config.keys(root_tag, old_users);
+
+    for (const auto & user_key : old_users)
+    {
+        if (startsWith(user_key, "old"))
+        {
+            std::string full_prefix = root_tag + "." + user_key;
+            std::string old_user_name = config.getString(full_prefix + ".user");
+            LOG_DEBUG(log, "Adding credentials for old user {}", old_user_name);
+
+            std::string old_user_password =  config.getString(full_prefix + ".password");
+
+            store.emplace_back(old_user_name, old_user_password);
+        }
+    }
+
+    return store;
+}
+
+InterserverCredentials::CheckResult InterserverCredentials::isValidUser(const UserWithPassword & credentials) const
+{
+    auto itr = std::find(all_users_store.begin(), all_users_store.end(), credentials);
+
+    if (itr == all_users_store.end())
+    {
+        if (credentials.first.empty())
+            return {"Server requires HTTP Basic authentication, but client doesn't provide it", false};
+
+        return {"Incorrect user or password in HTTP basic authentication: " + credentials.first, false};
+    }
+
+    return {"", true};
+}
+
+InterserverCredentials::CheckResult InterserverCredentials::isValidUser(const std::string & user, const std::string & password) const
+{
+    return isValidUser(std::make_pair(user, password));
+}
+
+}
diff --git a/src/Interpreters/InterserverCredentials.h b/src/Interpreters/InterserverCredentials.h
new file mode 100644
index 00000000000..ffe568868dd
--- /dev/null
+++ b/src/Interpreters/InterserverCredentials.h
@@ -0,0 +1,70 @@
+#pragma once
+
+#include <Poco/Util/AbstractConfiguration.h>
+#include <Common/Exception.h>
+#include <common/logger_useful.h>
+#include <unordered_set>
+
+namespace DB
+{
+
+/// InterserverCredentials implements authentication using a CurrentCredentials, which
+/// is configured, e.g.
+///    <interserver_http_credentials>
+///        <user>admin</user>
+///        <password>222</password>
+///        <!-- To support mix of un/authenticated clients -->
+///        <!-- <allow_empty>true</allow_empty> -->
+///        <old>
+///            <!-- Allow authentication using previous passwords during rotation -->
+///            <user>admin</user>
+///            <password>qqq</password>
+///        </old>
+///        <old>
+///            <!-- Allow authentication using previous users during rotation -->
+///            <user>johny</user>
+///            <password>333</password>
+///        </old>
+///    </interserver_http_credentials>
+class InterserverCredentials
+{
+public:
+    using UserWithPassword = std::pair<std::string, std::string>;
+    using CheckResult = std::pair<std::string, bool>;
+    using CurrentCredentials = std::vector<UserWithPassword>;
+
+    InterserverCredentials(const InterserverCredentials &) = delete;
+
+    static std::unique_ptr<InterserverCredentials> make(const Poco::Util::AbstractConfiguration & config, const std::string & root_tag);
+
+    InterserverCredentials(const std::string & current_user_, const std::string & current_password_, const CurrentCredentials & all_users_store_)
+        : current_user(current_user_)
+        , current_password(current_password_)
+        , all_users_store(all_users_store_)
+    {}
+
+    CheckResult isValidUser(const UserWithPassword & credentials) const;
+    CheckResult isValidUser(const std::string & user, const std::string & password) const;
+
+    std::string getUser() const { return current_user; }
+
+    std::string getPassword() const { return current_password; }
+
+
+private:
+    std::string current_user;
+    std::string current_password;
+
+    /// In common situation this store contains one record
+    CurrentCredentials all_users_store;
+
+    static CurrentCredentials parseCredentialsFromConfig(
+        const std::string & current_user_,
+        const std::string & current_password_,
+        const Poco::Util::AbstractConfiguration & config,
+        const std::string & root_tag);
+};
+
+using InterserverCredentialsPtr = std::shared_ptr<const InterserverCredentials>;
+
+}
diff --git a/src/Interpreters/InterserverIOHandler.h b/src/Interpreters/InterserverIOHandler.h
index db95a00d0f7..b0c95ed3835 100644
--- a/src/Interpreters/InterserverIOHandler.h
+++ b/src/Interpreters/InterserverIOHandler.h
@@ -9,13 +9,17 @@
 #include <Common/ActionBlocker.h>
 #include <common/types.h>
 
-#include <Poco/Net/HTMLForm.h>
-
 #include <atomic>
 #include <map>
 #include <shared_mutex>
 #include <utility>
 
+namespace zkutil
+{
+    class ZooKeeper;
+    using ZooKeeperPtr = std::shared_ptr<ZooKeeper>;
+}
+
 namespace DB
 {
 
diff --git a/src/Interpreters/JoinSwitcher.h b/src/Interpreters/JoinSwitcher.h
index 1fd719cd5dc..75ff7bb9b2c 100644
--- a/src/Interpreters/JoinSwitcher.h
+++ b/src/Interpreters/JoinSwitcher.h
@@ -19,6 +19,8 @@ class JoinSwitcher : public IJoin
 public:
     JoinSwitcher(std::shared_ptr<TableJoin> table_join_, const Block & right_sample_block_);
 
+    const TableJoin & getTableJoin() const override { return *table_join; }
+
     /// Add block of data from right hand of JOIN into current join object.
     /// If join-in-memory memory limit exceeded switches to join-on-disk and continue with it.
     /// @returns false, if join-on-disk disk limit exceeded
diff --git a/src/Interpreters/JoinedTables.cpp b/src/Interpreters/JoinedTables.cpp
index 17d7949e478..d947a3e2a48 100644
--- a/src/Interpreters/JoinedTables.cpp
+++ b/src/Interpreters/JoinedTables.cpp
@@ -1,25 +1,24 @@
 #include <Interpreters/JoinedTables.h>
-#include <Interpreters/TableJoin.h>
-#include <Interpreters/getTableExpressions.h>
-#include <Interpreters/InJoinSubqueriesPreprocessor.h>
+
 #include <Interpreters/IdentifierSemantic.h>
 #include <Interpreters/InDepthNodeVisitor.h>
-
-#include <Storages/IStorage.h>
-#include <Storages/ColumnsDescription.h>
-#include <Storages/StorageValues.h>
-#include <Storages/StorageJoin.h>
-#include <Storages/StorageDictionary.h>
-
+#include <Interpreters/InJoinSubqueriesPreprocessor.h>
+#include <Interpreters/TableJoin.h>
+#include <Interpreters/getTableExpressions.h>
 #include <Parsers/ASTFunction.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTQualifiedAsterisk.h>
 #include <Parsers/ASTSelectQuery.h>
 #include <Parsers/ASTSelectWithUnionQuery.h>
 #include <Parsers/ASTSubquery.h>
 #include <Parsers/ASTTablesInSelectQuery.h>
-#include <Parsers/ASTIdentifier.h>
-#include <Parsers/ASTQualifiedAsterisk.h>
 #include <Parsers/ParserTablesInSelectQuery.h>
 #include <Parsers/parseQuery.h>
+#include <Storages/ColumnsDescription.h>
+#include <Storages/IStorage.h>
+#include <Storages/StorageDictionary.h>
+#include <Storages/StorageJoin.h>
+#include <Storages/StorageValues.h>
 
 namespace DB
 {
@@ -129,7 +128,7 @@ using RenameQualifiedIdentifiersVisitor = InDepthNodeVisitor<RenameQualifiedIden
 
 }
 
-JoinedTables::JoinedTables(Context && context_, const ASTSelectQuery & select_query)
+JoinedTables::JoinedTables(ContextPtr context_, const ASTSelectQuery & select_query)
     : context(context_)
     , table_expressions(getTableExpressions(select_query))
     , left_table_expression(extractTableExpression(select_query, 0))
@@ -159,26 +158,26 @@ StoragePtr JoinedTables::getLeftTableStorage()
         return {};
 
     if (isLeftTableFunction())
-        return context.getQueryContext().executeTableFunction(left_table_expression);
+        return context->getQueryContext()->executeTableFunction(left_table_expression);
 
     StorageID table_id = StorageID::createEmpty();
     if (left_db_and_table)
     {
-        table_id = context.resolveStorageID(StorageID(left_db_and_table->database, left_db_and_table->table, left_db_and_table->uuid));
+        table_id = context->resolveStorageID(StorageID(left_db_and_table->database, left_db_and_table->table, left_db_and_table->uuid));
     }
     else /// If the table is not specified - use the table `system.one`.
     {
         table_id = StorageID("system", "one");
     }
 
-    if (auto view_source = context.getViewSource())
+    if (auto view_source = context->getViewSource())
     {
         const auto & storage_values = static_cast<const StorageValues &>(*view_source);
         auto tmp_table_id = storage_values.getStorageID();
         if (tmp_table_id.database_name == table_id.database_name && tmp_table_id.table_name == table_id.table_name)
         {
             /// Read from view source.
-            return context.getViewSource();
+            return context->getViewSource();
         }
     }
 
@@ -192,7 +191,7 @@ bool JoinedTables::resolveTables()
     if (tables_with_columns.size() != table_expressions.size())
         throw Exception("Unexpected tables count", ErrorCodes::LOGICAL_ERROR);
 
-    const auto & settings = context.getSettingsRef();
+    const auto & settings = context->getSettingsRef();
     if (settings.joined_subquery_requires_alias && tables_with_columns.size() > 1)
     {
         for (size_t i = 0; i < tables_with_columns.size(); ++i)
@@ -234,7 +233,7 @@ void JoinedTables::rewriteDistributedInAndJoins(ASTPtr & query)
 
     String database;
     if (!renamed_tables.empty())
-        database = context.getCurrentDatabase();
+        database = context->getCurrentDatabase();
 
     for (auto & [subquery, ast_tables] : renamed_tables)
     {
@@ -254,8 +253,8 @@ std::shared_ptr<TableJoin> JoinedTables::makeTableJoin(const ASTSelectQuery & se
     if (tables_with_columns.size() < 2)
         return {};
 
-    auto settings = context.getSettingsRef();
-    auto table_join = std::make_shared<TableJoin>(settings, context.getTemporaryVolume());
+    auto settings = context->getSettingsRef();
+    auto table_join = std::make_shared<TableJoin>(settings, context->getTemporaryVolume());
 
     const ASTTablesInSelectQueryElement * ast_join = select_query.join();
     const auto & table_to_join = ast_join->table_expression->as<ASTTableExpression &>();
@@ -263,7 +262,7 @@ std::shared_ptr<TableJoin> JoinedTables::makeTableJoin(const ASTSelectQuery & se
     /// TODO This syntax does not support specifying a database name.
     if (table_to_join.database_and_table_name)
     {
-        auto joined_table_id = context.resolveStorageID(table_to_join.database_and_table_name);
+        auto joined_table_id = context->resolveStorageID(table_to_join.database_and_table_name);
         StoragePtr table = DatabaseCatalog::instance().tryGetTable(joined_table_id, context);
         if (table)
         {
diff --git a/src/Interpreters/JoinedTables.h b/src/Interpreters/JoinedTables.h
index 812808fed61..52eb71e419d 100644
--- a/src/Interpreters/JoinedTables.h
+++ b/src/Interpreters/JoinedTables.h
@@ -22,11 +22,11 @@ using StorageMetadataPtr = std::shared_ptr<const StorageInMemoryMetadata>;
 class JoinedTables
 {
 public:
-    JoinedTables(Context && context, const ASTSelectQuery & select_query);
+    JoinedTables(ContextPtr context, const ASTSelectQuery & select_query);
 
     void reset(const ASTSelectQuery & select_query)
     {
-        *this = JoinedTables(std::move(context), select_query);
+        *this = JoinedTables(Context::createCopy(context), select_query);
     }
 
     StoragePtr getLeftTableStorage();
@@ -48,7 +48,7 @@ public:
     std::unique_ptr<InterpreterSelectWithUnionQuery> makeLeftTableSubquery(const SelectQueryOptions & select_options);
 
 private:
-    Context context;
+    ContextPtr context;
     std::vector<const ASTTableExpression *> table_expressions;
     TablesWithColumns tables_with_columns;
 
diff --git a/src/Interpreters/MergeJoin.cpp b/src/Interpreters/MergeJoin.cpp
index e1e4cd9e8a3..a9f50cdda0e 100644
--- a/src/Interpreters/MergeJoin.cpp
+++ b/src/Interpreters/MergeJoin.cpp
@@ -76,6 +76,7 @@ int nullableCompareAt(const IColumn & left_column, const IColumn & right_column,
     return left_column.compareAt(lhs_pos, rhs_pos, right_column, null_direction_hint);
 }
 
+/// Get first and last row from sorted block
 Block extractMinMax(const Block & block, const Block & keys)
 {
     if (block.rows() == 0)
@@ -86,7 +87,7 @@ Block extractMinMax(const Block & block, const Block & keys)
 
     for (size_t i = 0; i < columns.size(); ++i)
     {
-        const auto & src_column = block.getByName(keys.getByPosition(i).name);
+        const auto & src_column = block.getByName(min_max.getByPosition(i).name);
 
         columns[i]->insertFrom(*src_column.column, 0);
         columns[i]->insertFrom(*src_column.column, block.rows() - 1);
@@ -465,6 +466,7 @@ MergeJoin::MergeJoin(std::shared_ptr<TableJoin> table_join_, const Block & right
 
     table_join->splitAdditionalColumns(right_sample_block, right_table_keys, right_columns_to_add);
     JoinCommon::removeLowCardinalityInplace(right_table_keys);
+    JoinCommon::removeLowCardinalityInplace(right_sample_block, table_join->keyNamesRight());
 
     const NameSet required_right_keys = table_join->requiredRightKeys();
     for (const auto & column : right_table_keys)
@@ -485,6 +487,7 @@ MergeJoin::MergeJoin(std::shared_ptr<TableJoin> table_join_, const Block & right
             left_blocks_buffer = std::make_shared<SortedBlocksBuffer>(left_sort_description, max_bytes);
 }
 
+/// Has to be called even if totals are empty
 void MergeJoin::setTotals(const Block & totals_block)
 {
     totals = totals_block;
@@ -496,7 +499,7 @@ void MergeJoin::setTotals(const Block & totals_block)
 
 void MergeJoin::joinTotals(Block & block) const
 {
-    JoinCommon::joinTotals(totals, right_columns_to_add, table_join->keyNamesRight(), block);
+    JoinCommon::joinTotals(totals, right_columns_to_add, *table_join, block);
 }
 
 void MergeJoin::mergeRightBlocks()
diff --git a/src/Interpreters/MergeJoin.h b/src/Interpreters/MergeJoin.h
index a13d0304907..f286e74b385 100644
--- a/src/Interpreters/MergeJoin.h
+++ b/src/Interpreters/MergeJoin.h
@@ -23,6 +23,7 @@ class MergeJoin : public IJoin
 public:
     MergeJoin(std::shared_ptr<TableJoin> table_join_, const Block & right_sample_block);
 
+    const TableJoin & getTableJoin() const override { return *table_join; }
     bool addJoinedBlock(const Block & block, bool check_limits) override;
     void joinBlock(Block &, ExtraBlockPtr & not_processed) override;
     void joinTotals(Block &) const override;
@@ -76,12 +77,15 @@ private:
     Block right_table_keys;
     Block right_columns_to_add;
     SortedBlocksWriter::Blocks right_blocks;
+
+    /// Each block stores first and last row from corresponding sorted block on disk
     Blocks min_max_right_blocks;
     std::shared_ptr<SortedBlocksBuffer> left_blocks_buffer;
     std::shared_ptr<RowBitmaps> used_rows_bitmap;
     mutable std::unique_ptr<Cache> cached_right_blocks;
     std::vector<std::shared_ptr<Block>> loaded_right_blocks;
     std::unique_ptr<SortedBlocksWriter> disk_writer;
+    /// Set of files with sorted blocks
     SortedBlocksWriter::SortedFiles flushed_right_blocks;
     Block totals;
     std::atomic<bool> is_in_memory{true};
diff --git a/src/Interpreters/MetricLog.cpp b/src/Interpreters/MetricLog.cpp
index ce5d5793b87..fd1c120f18c 100644
--- a/src/Interpreters/MetricLog.cpp
+++ b/src/Interpreters/MetricLog.cpp
@@ -41,7 +41,7 @@ void MetricLogElement::appendToBlock(MutableColumns & columns) const
 {
     size_t column_idx = 0;
 
-    columns[column_idx++]->insert(DateLUT::instance().toDayNum(event_time));
+    columns[column_idx++]->insert(DateLUT::instance().toDayNum(event_time).toUnderType());
     columns[column_idx++]->insert(event_time);
     columns[column_idx++]->insert(event_time_microseconds);
     columns[column_idx++]->insert(milliseconds);
diff --git a/src/Interpreters/MonotonicityCheckVisitor.h b/src/Interpreters/MonotonicityCheckVisitor.h
index 87571a44eb0..350318047c7 100644
--- a/src/Interpreters/MonotonicityCheckVisitor.h
+++ b/src/Interpreters/MonotonicityCheckVisitor.h
@@ -26,7 +26,7 @@ public:
     struct Data
     {
         const TablesWithColumns & tables;
-        const Context & context;
+        ContextPtr context;
         const std::unordered_set<String> & group_by_function_hashes;
         Monotonicity monotonicity{true, true, true};
         ASTIdentifier * identifier = nullptr;
diff --git a/src/Interpreters/MutationsInterpreter.cpp b/src/Interpreters/MutationsInterpreter.cpp
index c393b214ee8..1315f9efa05 100644
--- a/src/Interpreters/MutationsInterpreter.cpp
+++ b/src/Interpreters/MutationsInterpreter.cpp
@@ -26,6 +26,7 @@
 #include <Parsers/formatAST.h>
 #include <IO/WriteHelpers.h>
 #include <Processors/QueryPlan/CreatingSetsStep.h>
+#include <DataTypes/NestedUtils.h>
 
 
 namespace DB
@@ -50,7 +51,7 @@ class FirstNonDeterministicFunctionMatcher
 public:
     struct Data
     {
-        const Context & context;
+        ContextPtr context;
         std::optional<String> nondeterministic_function_name;
     };
 
@@ -80,7 +81,7 @@ public:
 
 using FirstNonDeterministicFunctionFinder = InDepthNodeVisitor<FirstNonDeterministicFunctionMatcher, true>;
 
-std::optional<String> findFirstNonDeterministicFunctionName(const MutationCommand & command, const Context & context)
+std::optional<String> findFirstNonDeterministicFunctionName(const MutationCommand & command, ContextPtr context)
 {
     FirstNonDeterministicFunctionMatcher::Data finder_data{context, std::nullopt};
 
@@ -113,7 +114,7 @@ std::optional<String> findFirstNonDeterministicFunctionName(const MutationComman
     return {};
 }
 
-ASTPtr prepareQueryAffectedAST(const std::vector<MutationCommand> & commands, const StoragePtr & storage, const Context & context)
+ASTPtr prepareQueryAffectedAST(const std::vector<MutationCommand> & commands, const StoragePtr & storage, ContextPtr context)
 {
     /// Execute `SELECT count() FROM storage WHERE predicate1 OR predicate2 OR ...` query.
     /// The result can differ from the number of affected rows (e.g. if there is an UPDATE command that
@@ -178,7 +179,7 @@ bool isStorageTouchedByMutations(
     const StoragePtr & storage,
     const StorageMetadataPtr & metadata_snapshot,
     const std::vector<MutationCommand> & commands,
-    Context context_copy)
+    ContextPtr context_copy)
 {
     if (commands.empty())
         return false;
@@ -206,8 +207,8 @@ bool isStorageTouchedByMutations(
     if (all_commands_can_be_skipped)
         return false;
 
-    context_copy.setSetting("max_streams_to_max_threads_ratio", 1);
-    context_copy.setSetting("max_threads", 1);
+    context_copy->setSetting("max_streams_to_max_threads_ratio", 1);
+    context_copy->setSetting("max_threads", 1);
 
     ASTPtr select_query = prepareQueryAffectedAST(commands, storage, context_copy);
 
@@ -232,7 +233,7 @@ bool isStorageTouchedByMutations(
 ASTPtr getPartitionAndPredicateExpressionForMutationCommand(
     const MutationCommand & command,
     const StoragePtr & storage,
-    const Context & context
+    ContextPtr context
 )
 {
     ASTPtr partition_predicate_as_ast_func;
@@ -266,17 +267,16 @@ MutationsInterpreter::MutationsInterpreter(
     StoragePtr storage_,
     const StorageMetadataPtr & metadata_snapshot_,
     MutationCommands commands_,
-    const Context & context_,
+    ContextPtr context_,
     bool can_execute_)
     : storage(std::move(storage_))
     , metadata_snapshot(metadata_snapshot_)
     , commands(std::move(commands_))
     , context(context_)
     , can_execute(can_execute_)
+    , select_limits(SelectQueryOptions().analyze(!can_execute).ignoreLimits())
 {
     mutation_ast = prepare(!can_execute);
-    SelectQueryOptions limits = SelectQueryOptions().analyze(!can_execute).ignoreLimits();
-    select_interpreter = std::make_unique<InterpreterSelectQuery>(mutation_ast, context, storage, metadata_snapshot_, limits);
 }
 
 static NameSet getKeyColumns(const StoragePtr & storage, const StorageMetadataPtr & metadata_snapshot)
@@ -350,6 +350,35 @@ static void validateUpdateColumns(
     }
 }
 
+/// Returns ASTs of updated nested subcolumns, if all of subcolumns were updated.
+/// They are used to validate sizes of nested arrays.
+/// If some of subcolumns were updated and some weren't,
+/// it makes sense to validate only updated columns with their old versions,
+/// because their sizes couldn't change, since sizes of all nested subcolumns must be consistent.
+static std::optional<std::vector<ASTPtr>> getExpressionsOfUpdatedNestedSubcolumns(
+    const String & column_name,
+    const NamesAndTypesList & all_columns,
+    const std::unordered_map<String, ASTPtr> & column_to_update_expression)
+{
+    std::vector<ASTPtr> res;
+    auto source_name = Nested::splitName(column_name).first;
+
+    /// Check this nested subcolumn
+    for (const auto & column : all_columns)
+    {
+        auto split = Nested::splitName(column.name);
+        if (isArray(column.type) && split.first == source_name && !split.second.empty())
+        {
+            auto it = column_to_update_expression.find(column.name);
+            if (it == column_to_update_expression.end())
+                return {};
+
+            res.push_back(it->second);
+        }
+    }
+
+    return res;
+}
 
 ASTPtr MutationsInterpreter::prepare(bool dry_run)
 {
@@ -399,7 +428,7 @@ ASTPtr MutationsInterpreter::prepare(bool dry_run)
     auto dependencies = getAllColumnDependencies(metadata_snapshot, updated_columns);
 
     /// First, break a sequence of commands into stages.
-    for (const auto & command : commands)
+    for (auto & command : commands)
     {
         if (command.type == MutationCommand::DELETE)
         {
@@ -439,12 +468,43 @@ ASTPtr MutationsInterpreter::prepare(bool dry_run)
                 ///
                 /// Outer CAST is added just in case if we don't trust the returning type of 'if'.
 
-                auto type_literal = std::make_shared<ASTLiteral>(columns_desc.getPhysical(column).type->getName());
+                const auto & type = columns_desc.getPhysical(column).type;
+                auto type_literal = std::make_shared<ASTLiteral>(type->getName());
 
                 const auto & update_expr = kv.second;
+
+                ASTPtr condition = getPartitionAndPredicateExpressionForMutationCommand(command);
+
+                /// And new check validateNestedArraySizes for Nested subcolumns
+                if (isArray(type) && !Nested::splitName(column).second.empty())
+                {
+                    std::shared_ptr<ASTFunction> function = nullptr;
+
+                    auto nested_update_exprs = getExpressionsOfUpdatedNestedSubcolumns(column, all_columns, command.column_to_update_expression);
+                    if (!nested_update_exprs)
+                    {
+                        function = makeASTFunction("validateNestedArraySizes",
+                            condition,
+                            update_expr->clone(),
+                            std::make_shared<ASTIdentifier>(column));
+                        condition = makeASTFunction("and", condition, function);
+                    }
+                    else if (nested_update_exprs->size() > 1)
+                    {
+                        function = std::make_shared<ASTFunction>();
+                        function->name = "validateNestedArraySizes";
+                        function->arguments = std::make_shared<ASTExpressionList>();
+                        function->children.push_back(function->arguments);
+                        function->arguments->children.push_back(condition);
+                        for (const auto & it : *nested_update_exprs)
+                            function->arguments->children.push_back(it->clone());
+                        condition = makeASTFunction("and", condition, function);
+                    }
+                }
+
                 auto updated_column = makeASTFunction("CAST",
                     makeASTFunction("if",
-                        getPartitionAndPredicateExpressionForMutationCommand(command),
+                        condition,
                         makeASTFunction("CAST",
                             update_expr->clone(),
                             type_literal),
@@ -650,9 +710,9 @@ ASTPtr MutationsInterpreter::prepareInterpreterSelectQuery(std::vector<Stage> &
             all_asts->children.push_back(std::make_shared<ASTIdentifier>(column));
 
         auto syntax_result = TreeRewriter(context).analyze(all_asts, all_columns, storage, metadata_snapshot);
-        if (context.hasQueryContext())
+        if (context->hasQueryContext())
             for (const auto & it : syntax_result->getScalars())
-                context.getQueryContext().addScalar(it.first, it.second);
+                context->getQueryContext()->addScalar(it.first, it.second);
 
         stage.analyzer = std::make_unique<ExpressionAnalyzer>(all_asts, syntax_result, context);
 
@@ -674,16 +734,24 @@ ASTPtr MutationsInterpreter::prepareInterpreterSelectQuery(std::vector<Stage> &
             for (const auto & kv : stage.column_to_updated)
                 stage.analyzer->appendExpression(actions_chain, kv.second, dry_run);
 
+            auto & actions = actions_chain.getLastStep().actions();
+
             for (const auto & kv : stage.column_to_updated)
             {
-                actions_chain.getLastStep().actions()->addAlias(
-                        kv.second->getColumnName(), kv.first, /* can_replace = */ true);
+                auto column_name = kv.second->getColumnName();
+                const auto & dag_node = actions->findInIndex(column_name);
+                const auto & alias = actions->addAlias(dag_node, kv.first);
+                actions->addOrReplaceInIndex(alias);
             }
         }
 
         /// Remove all intermediate columns.
         actions_chain.addStep();
-        actions_chain.getLastStep().required_output.assign(stage.output_columns.begin(), stage.output_columns.end());
+        actions_chain.getLastStep().required_output.clear();
+        ActionsDAG::NodeRawConstPtrs new_index;
+        for (const auto & name : stage.output_columns)
+            actions_chain.getLastStep().addRequiredOutput(name);
+
         actions_chain.getLastActions();
 
         actions_chain.finalize();
@@ -749,14 +817,17 @@ QueryPipelinePtr MutationsInterpreter::addStreamsForLaterStages(const std::vecto
         SubqueriesForSets & subqueries_for_sets = stage.analyzer->getSubqueriesForSets();
         if (!subqueries_for_sets.empty())
         {
-            const Settings & settings = context.getSettingsRef();
+            const Settings & settings = context->getSettingsRef();
             SizeLimits network_transfer_limits(
                     settings.max_rows_to_transfer, settings.max_bytes_to_transfer, settings.transfer_overflow_mode);
             addCreatingSetsStep(plan, std::move(subqueries_for_sets), network_transfer_limits, context);
         }
     }
 
-    auto pipeline = plan.buildQueryPipeline();
+    auto pipeline = plan.buildQueryPipeline(
+        QueryPlanOptimizationSettings::fromContext(context),
+        BuildQueryPipelineSettings::fromContext(context));
+
     pipeline->addSimpleTransform([&](const Block & header)
     {
         return std::make_shared<MaterializingTransform>(header);
@@ -767,7 +838,10 @@ QueryPipelinePtr MutationsInterpreter::addStreamsForLaterStages(const std::vecto
 
 void MutationsInterpreter::validate()
 {
-    const Settings & settings = context.getSettingsRef();
+    if (!select_interpreter)
+        select_interpreter = std::make_unique<InterpreterSelectQuery>(mutation_ast, context, storage, metadata_snapshot, select_limits);
+
+    const Settings & settings = context->getSettingsRef();
 
     /// For Replicated* storages mutations cannot employ non-deterministic functions
     /// because that produces inconsistencies between replicas
@@ -794,6 +868,9 @@ BlockInputStreamPtr MutationsInterpreter::execute()
     if (!can_execute)
         throw Exception("Cannot execute mutations interpreter because can_execute flag set to false", ErrorCodes::LOGICAL_ERROR);
 
+    if (!select_interpreter)
+        select_interpreter = std::make_unique<InterpreterSelectQuery>(mutation_ast, context, storage, metadata_snapshot, select_limits);
+
     QueryPlan plan;
     select_interpreter->buildQueryPlan(plan);
 
diff --git a/src/Interpreters/MutationsInterpreter.h b/src/Interpreters/MutationsInterpreter.h
index 18658e605ad..34a9b61771d 100644
--- a/src/Interpreters/MutationsInterpreter.h
+++ b/src/Interpreters/MutationsInterpreter.h
@@ -23,13 +23,13 @@ bool isStorageTouchedByMutations(
     const StoragePtr & storage,
     const StorageMetadataPtr & metadata_snapshot,
     const std::vector<MutationCommand> & commands,
-    Context context_copy
+    ContextPtr context_copy
 );
 
 ASTPtr getPartitionAndPredicateExpressionForMutationCommand(
     const MutationCommand & command,
     const StoragePtr & storage,
-    const Context & context
+    ContextPtr context
 );
 
 /// Create an input stream that will read data from storage and apply mutation commands (UPDATEs, DELETEs, MATERIALIZEs)
@@ -43,7 +43,7 @@ public:
         StoragePtr storage_,
         const StorageMetadataPtr & metadata_snapshot_,
         MutationCommands commands_,
-        const Context & context_,
+        ContextPtr context_,
         bool can_execute_);
 
     void validate();
@@ -74,8 +74,9 @@ private:
     StoragePtr storage;
     StorageMetadataPtr metadata_snapshot;
     MutationCommands commands;
-    Context context;
+    ContextPtr context;
     bool can_execute;
+    SelectQueryOptions select_limits;
 
     ASTPtr mutation_ast;
 
@@ -100,7 +101,7 @@ private:
 
     struct Stage
     {
-        Stage(const Context & context_) : expressions_chain(context_) {}
+        explicit Stage(ContextPtr context_) : expressions_chain(context_) {}
 
         ASTs filters;
         std::unordered_map<String, ASTPtr> column_to_updated;
diff --git a/src/Interpreters/MySQL/InterpretersMySQLDDLQuery.cpp b/src/Interpreters/MySQL/InterpretersMySQLDDLQuery.cpp
index 7f4da0638d4..2420255c5c1 100644
--- a/src/Interpreters/MySQL/InterpretersMySQLDDLQuery.cpp
+++ b/src/Interpreters/MySQL/InterpretersMySQLDDLQuery.cpp
@@ -7,6 +7,7 @@
 #include <Parsers/ASTAlterQuery.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <Parsers/ASTColumnDeclaration.h>
+#include <Parsers/ASTIndexDeclaration.h>
 #include <Parsers/MySQL/ASTCreateQuery.h>
 #include <Parsers/MySQL/ASTAlterCommand.h>
 #include <Parsers/MySQL/ASTDeclareColumn.h>
@@ -40,7 +41,7 @@ namespace MySQLInterpreter
 {
 
 static inline String resolveDatabase(
-    const String & database_in_query, const String & replica_mysql_database, const String & replica_clickhouse_database, const Context & context)
+    const String & database_in_query, const String & replica_mysql_database, const String & replica_clickhouse_database, ContextPtr context)
 {
     if (!database_in_query.empty())
     {
@@ -62,7 +63,7 @@ static inline String resolveDatabase(
     /// context.getCurrentDatabase() is always return `default database`
     /// When USE replica_mysql_database; CREATE TABLE table_name;
     /// context.getCurrentDatabase() is always return replica_clickhouse_database
-    const String & current_database = context.getCurrentDatabase();
+    const String & current_database = context->getCurrentDatabase();
     return current_database != replica_clickhouse_database ? "" : replica_clickhouse_database;
 }
 
@@ -116,7 +117,7 @@ static inline NamesAndTypesList getColumnsList(ASTExpressionList * columns_defin
     return columns_name_and_type;
 }
 
-static NamesAndTypesList getNames(const ASTFunction & expr, const Context & context, const NamesAndTypesList & columns)
+static NamesAndTypesList getNames(const ASTFunction & expr, ContextPtr context, const NamesAndTypesList & columns)
 {
     if (expr.arguments->children.empty())
         return NamesAndTypesList{};
@@ -157,7 +158,7 @@ static NamesAndTypesList modifyPrimaryKeysToNonNullable(const NamesAndTypesList
 }
 
 static inline std::tuple<NamesAndTypesList, NamesAndTypesList, NamesAndTypesList, NameSet> getKeys(
-    ASTExpressionList * columns_define, ASTExpressionList * indices_define, const Context & context, NamesAndTypesList & columns)
+    ASTExpressionList * columns_define, ASTExpressionList * indices_define, ContextPtr context, NamesAndTypesList & columns)
 {
     NameSet increment_columns;
     auto keys = makeASTFunction("tuple");
@@ -369,7 +370,7 @@ static ASTPtr getOrderByPolicy(
     return order_by_expression;
 }
 
-void InterpreterCreateImpl::validate(const InterpreterCreateImpl::TQuery & create_query, const Context &)
+void InterpreterCreateImpl::validate(const InterpreterCreateImpl::TQuery & create_query, ContextPtr)
 {
     /// This is dangerous, because the like table may not exists in ClickHouse
     if (create_query.like_table)
@@ -382,7 +383,7 @@ void InterpreterCreateImpl::validate(const InterpreterCreateImpl::TQuery & creat
 }
 
 ASTs InterpreterCreateImpl::getRewrittenQueries(
-    const TQuery & create_query, const Context & context, const String & mapped_to_database, const String & mysql_database)
+    const TQuery & create_query, ContextPtr context, const String & mapped_to_database, const String & mysql_database)
 {
     auto rewritten_query = std::make_shared<ASTCreateQuery>();
     if (resolveDatabase(create_query.database, mysql_database, mapped_to_database, context) != mapped_to_database)
@@ -411,13 +412,26 @@ ASTs InterpreterCreateImpl::getRewrittenQueries(
         return column_declaration;
     };
 
-    /// Add _sign and _version column.
+    /// Add _sign and _version columns.
     String sign_column_name = getUniqueColumnName(columns_name_and_type, "_sign");
     String version_column_name = getUniqueColumnName(columns_name_and_type, "_version");
     columns->set(columns->columns, InterpreterCreateQuery::formatColumns(columns_name_and_type));
     columns->columns->children.emplace_back(create_materialized_column_declaration(sign_column_name, "Int8", UInt64(1)));
     columns->columns->children.emplace_back(create_materialized_column_declaration(version_column_name, "UInt64", UInt64(1)));
 
+    /// Add minmax skipping index for _version column.
+    auto version_index = std::make_shared<ASTIndexDeclaration>();
+    version_index->name = version_column_name;
+    auto index_expr = std::make_shared<ASTIdentifier>(version_column_name);
+    auto index_type = makeASTFunction("minmax");
+    index_type->no_empty_args = true;
+    version_index->set(version_index->expr, index_expr);
+    version_index->set(version_index->type, index_type);
+    version_index->granularity = 1;
+    ASTPtr indices = std::make_shared<ASTExpressionList>();
+    indices->children.push_back(version_index);
+    columns->set(columns->indices, indices);
+
     auto storage = std::make_shared<ASTStorage>();
 
     /// The `partition by` expression must use primary keys, otherwise the primary keys will not be merge.
@@ -439,12 +453,12 @@ ASTs InterpreterCreateImpl::getRewrittenQueries(
     return ASTs{rewritten_query};
 }
 
-void InterpreterDropImpl::validate(const InterpreterDropImpl::TQuery & /*query*/, const Context & /*context*/)
+void InterpreterDropImpl::validate(const InterpreterDropImpl::TQuery & /*query*/, ContextPtr /*context*/)
 {
 }
 
 ASTs InterpreterDropImpl::getRewrittenQueries(
-    const InterpreterDropImpl::TQuery & drop_query, const Context & context, const String & mapped_to_database, const String & mysql_database)
+    const InterpreterDropImpl::TQuery & drop_query, ContextPtr context, const String & mapped_to_database, const String & mysql_database)
 {
     const auto & database_name = resolveDatabase(drop_query.database, mysql_database, mapped_to_database, context);
 
@@ -457,14 +471,14 @@ ASTs InterpreterDropImpl::getRewrittenQueries(
     return ASTs{rewritten_query};
 }
 
-void InterpreterRenameImpl::validate(const InterpreterRenameImpl::TQuery & rename_query, const Context & /*context*/)
+void InterpreterRenameImpl::validate(const InterpreterRenameImpl::TQuery & rename_query, ContextPtr /*context*/)
 {
     if (rename_query.exchange)
         throw Exception("Cannot execute exchange for external ddl query.", ErrorCodes::NOT_IMPLEMENTED);
 }
 
 ASTs InterpreterRenameImpl::getRewrittenQueries(
-    const InterpreterRenameImpl::TQuery & rename_query, const Context & context, const String & mapped_to_database, const String & mysql_database)
+    const InterpreterRenameImpl::TQuery & rename_query, ContextPtr context, const String & mapped_to_database, const String & mysql_database)
 {
     ASTRenameQuery::Elements elements;
     for (const auto & rename_element : rename_query.elements)
@@ -493,12 +507,12 @@ ASTs InterpreterRenameImpl::getRewrittenQueries(
     return ASTs{rewritten_query};
 }
 
-void InterpreterAlterImpl::validate(const InterpreterAlterImpl::TQuery & /*query*/, const Context & /*context*/)
+void InterpreterAlterImpl::validate(const InterpreterAlterImpl::TQuery & /*query*/, ContextPtr /*context*/)
 {
 }
 
 ASTs InterpreterAlterImpl::getRewrittenQueries(
-    const InterpreterAlterImpl::TQuery & alter_query, const Context & context, const String & mapped_to_database, const String & mysql_database)
+    const InterpreterAlterImpl::TQuery & alter_query, ContextPtr context, const String & mapped_to_database, const String & mysql_database)
 {
     if (resolveDatabase(alter_query.database, mysql_database, mapped_to_database, context) != mapped_to_database)
         return {};
diff --git a/src/Interpreters/MySQL/InterpretersMySQLDDLQuery.h b/src/Interpreters/MySQL/InterpretersMySQLDDLQuery.h
index 497a661cc7f..3202612ac94 100644
--- a/src/Interpreters/MySQL/InterpretersMySQLDDLQuery.h
+++ b/src/Interpreters/MySQL/InterpretersMySQLDDLQuery.h
@@ -1,62 +1,66 @@
 #pragma once
 
-#include <Parsers/IAST_fwd.h>
-#include <Parsers/queryToString.h>
 #include <Interpreters/IInterpreter.h>
 #include <Interpreters/executeQuery.h>
 #include <Parsers/ASTDropQuery.h>
 #include <Parsers/ASTRenameQuery.h>
+#include <Parsers/IAST_fwd.h>
 #include <Parsers/MySQL/ASTAlterQuery.h>
 #include <Parsers/MySQL/ASTCreateQuery.h>
+#include <Parsers/queryToString.h>
 
 namespace DB
 {
 
 namespace MySQLInterpreter
 {
+    struct InterpreterDropImpl
+    {
+        using TQuery = ASTDropQuery;
 
-struct InterpreterDropImpl
-{
-    using TQuery = ASTDropQuery;
+        static void validate(const TQuery & query, ContextPtr context);
 
-    static void validate(const TQuery & query, const Context & context);
+        static ASTs getRewrittenQueries(
+            const TQuery & drop_query, ContextPtr context, const String & mapped_to_database, const String & mysql_database);
+    };
 
-    static ASTs getRewrittenQueries(const TQuery & drop_query, const Context & context, const String & mapped_to_database, const String & mysql_database);
-};
+    struct InterpreterAlterImpl
+    {
+        using TQuery = MySQLParser::ASTAlterQuery;
 
-struct InterpreterAlterImpl
-{
-    using TQuery = MySQLParser::ASTAlterQuery;
+        static void validate(const TQuery & query, ContextPtr context);
 
-    static void validate(const TQuery & query, const Context & context);
+        static ASTs getRewrittenQueries(
+            const TQuery & alter_query, ContextPtr context, const String & mapped_to_database, const String & mysql_database);
+    };
 
-    static ASTs getRewrittenQueries(const TQuery & alter_query, const Context & context, const String & mapped_to_database, const String & mysql_database);
-};
+    struct InterpreterRenameImpl
+    {
+        using TQuery = ASTRenameQuery;
 
-struct InterpreterRenameImpl
-{
-    using TQuery = ASTRenameQuery;
+        static void validate(const TQuery & query, ContextPtr context);
 
-    static void validate(const TQuery & query, const Context & context);
+        static ASTs getRewrittenQueries(
+            const TQuery & rename_query, ContextPtr context, const String & mapped_to_database, const String & mysql_database);
+    };
 
-    static ASTs getRewrittenQueries(const TQuery & rename_query, const Context & context, const String & mapped_to_database, const String & mysql_database);
-};
+    struct InterpreterCreateImpl
+    {
+        using TQuery = MySQLParser::ASTCreateQuery;
 
-struct InterpreterCreateImpl
-{
-    using TQuery = MySQLParser::ASTCreateQuery;
+        static void validate(const TQuery & query, ContextPtr context);
 
-    static void validate(const TQuery & query, const Context & context);
-
-    static ASTs getRewrittenQueries(const TQuery & create_query, const Context & context, const String & mapped_to_database, const String & mysql_database);
-};
+        static ASTs getRewrittenQueries(
+            const TQuery & create_query, ContextPtr context, const String & mapped_to_database, const String & mysql_database);
+    };
 
 template <typename InterpreterImpl>
-class InterpreterMySQLDDLQuery : public IInterpreter
+class InterpreterMySQLDDLQuery : public IInterpreter, WithContext
 {
 public:
-    InterpreterMySQLDDLQuery(const ASTPtr & query_ptr_, Context & context_, const String & mapped_to_database_, const String & mysql_database_)
-        : query_ptr(query_ptr_), context(context_), mapped_to_database(mapped_to_database_), mysql_database(mysql_database_)
+    InterpreterMySQLDDLQuery(
+        const ASTPtr & query_ptr_, ContextPtr context_, const String & mapped_to_database_, const String & mysql_database_)
+        : WithContext(context_), query_ptr(query_ptr_), mapped_to_database(mapped_to_database_), mysql_database(mysql_database_)
     {
     }
 
@@ -64,18 +68,17 @@ public:
     {
         const typename InterpreterImpl::TQuery & query = query_ptr->as<typename InterpreterImpl::TQuery &>();
 
-        InterpreterImpl::validate(query, context);
-        ASTs rewritten_queries = InterpreterImpl::getRewrittenQueries(query, context, mapped_to_database, mysql_database);
+        InterpreterImpl::validate(query, getContext());
+        ASTs rewritten_queries = InterpreterImpl::getRewrittenQueries(query, getContext(), mapped_to_database, mysql_database);
 
         for (const auto & rewritten_query : rewritten_queries)
-            executeQuery("/* Rewritten MySQL DDL Query */ " + queryToString(rewritten_query), context, true);
+            executeQuery("/* Rewritten MySQL DDL Query */ " + queryToString(rewritten_query), getContext(), true);
 
         return BlockIO{};
     }
 
 private:
     ASTPtr query_ptr;
-    Context & context;
     const String mapped_to_database;
     const String mysql_database;
 };
diff --git a/src/Interpreters/MySQL/tests/gtest_create_rewritten.cpp b/src/Interpreters/MySQL/tests/gtest_create_rewritten.cpp
index 0d8e57aafc5..77a14e780c5 100644
--- a/src/Interpreters/MySQL/tests/gtest_create_rewritten.cpp
+++ b/src/Interpreters/MySQL/tests/gtest_create_rewritten.cpp
@@ -18,7 +18,7 @@
 
 using namespace DB;
 
-static inline ASTPtr tryRewrittenCreateQuery(const String & query, const Context & context)
+static inline ASTPtr tryRewrittenCreateQuery(const String & query, ContextPtr context)
 {
     ParserExternalDDLQuery external_ddl_parser;
     ASTPtr ast = parseQuery(external_ddl_parser, "EXTERNAL DDL FROM MySQL(test_database, test_database) " + query, 0, 0);
@@ -28,6 +28,10 @@ static inline ASTPtr tryRewrittenCreateQuery(const String & query, const Context
         context, "test_database", "test_database")[0];
 }
 
+static const char MATERIALIZEMYSQL_TABLE_COLUMNS[] = ", `_sign` Int8() MATERIALIZED 1"
+                                                     ", `_version` UInt64() MATERIALIZED 1"
+                                                     ", INDEX _version _version TYPE minmax GRANULARITY 1";
+
 TEST(MySQLCreateRewritten, ColumnsDataType)
 {
     tryRegisterFunctions();
@@ -45,46 +49,46 @@ TEST(MySQLCreateRewritten, ColumnsDataType)
     {
         EXPECT_EQ(queryToString(tryRewrittenCreateQuery(
             "CREATE TABLE `test_database`.`test_table_1`(`key` INT NOT NULL PRIMARY KEY, test " + test_type + ")", context_holder.context)),
-            "CREATE TABLE test_database.test_table_1 (`key` Int32, `test` Nullable(" + mapped_type + ")"
-            ", `_sign` Int8() MATERIALIZED 1, `_version` UInt64() MATERIALIZED 1) ENGINE = "
+            "CREATE TABLE test_database.test_table_1 (`key` Int32, `test` Nullable(" + mapped_type + ")" +
+            MATERIALIZEMYSQL_TABLE_COLUMNS + ") ENGINE = "
             "ReplacingMergeTree(_version) PARTITION BY intDiv(key, 4294967) ORDER BY tuple(key)");
 
         EXPECT_EQ(queryToString(tryRewrittenCreateQuery(
             "CREATE TABLE `test_database`.`test_table_1`(`key` INT NOT NULL PRIMARY KEY, test " + test_type + " NOT NULL)", context_holder.context)),
             "CREATE TABLE test_database.test_table_1 (`key` Int32, `test` " + mapped_type +
-            ", `_sign` Int8() MATERIALIZED 1, `_version` UInt64() MATERIALIZED 1) ENGINE = "
+            MATERIALIZEMYSQL_TABLE_COLUMNS + ") ENGINE = "
             "ReplacingMergeTree(_version) PARTITION BY intDiv(key, 4294967) ORDER BY tuple(key)");
 
         EXPECT_EQ(queryToString(tryRewrittenCreateQuery(
             "CREATE TABLE `test_database`.`test_table_1`(`key` INT NOT NULL PRIMARY KEY, test " + test_type + " COMMENT 'test_comment' NOT NULL)", context_holder.context)),
             "CREATE TABLE test_database.test_table_1 (`key` Int32, `test` " + mapped_type +
-            ", `_sign` Int8() MATERIALIZED 1, `_version` UInt64() MATERIALIZED 1) ENGINE = "
+            MATERIALIZEMYSQL_TABLE_COLUMNS + ") ENGINE = "
             "ReplacingMergeTree(_version) PARTITION BY intDiv(key, 4294967) ORDER BY tuple(key)");
 
         if (Poco::toUpper(test_type).find("INT") != std::string::npos)
         {
             EXPECT_EQ(queryToString(tryRewrittenCreateQuery(
                 "CREATE TABLE `test_database`.`test_table_1`(`key` INT NOT NULL PRIMARY KEY, test " + test_type + " UNSIGNED)", context_holder.context)),
-                "CREATE TABLE test_database.test_table_1 (`key` Int32, `test` Nullable(U" + mapped_type + ")"
-                ", `_sign` Int8() MATERIALIZED 1, `_version` UInt64() MATERIALIZED 1) ENGINE = "
+                "CREATE TABLE test_database.test_table_1 (`key` Int32, `test` Nullable(U" + mapped_type + ")" +
+                MATERIALIZEMYSQL_TABLE_COLUMNS + ") ENGINE = "
                 "ReplacingMergeTree(_version) PARTITION BY intDiv(key, 4294967) ORDER BY tuple(key)");
 
             EXPECT_EQ(queryToString(tryRewrittenCreateQuery(
                 "CREATE TABLE `test_database`.`test_table_1`(`key` INT NOT NULL PRIMARY KEY, test " + test_type + " COMMENT 'test_comment' UNSIGNED)", context_holder.context)),
-                "CREATE TABLE test_database.test_table_1 (`key` Int32, `test` Nullable(U" + mapped_type + ")"
-                ", `_sign` Int8() MATERIALIZED 1, `_version` UInt64() MATERIALIZED 1) ENGINE = "
+                "CREATE TABLE test_database.test_table_1 (`key` Int32, `test` Nullable(U" + mapped_type + ")" +
+                MATERIALIZEMYSQL_TABLE_COLUMNS + ") ENGINE = "
                 "ReplacingMergeTree(_version) PARTITION BY intDiv(key, 4294967) ORDER BY tuple(key)");
 
             EXPECT_EQ(queryToString(tryRewrittenCreateQuery(
                 "CREATE TABLE `test_database`.`test_table_1`(`key` INT NOT NULL PRIMARY KEY, test " + test_type + " NOT NULL UNSIGNED)", context_holder.context)),
                 "CREATE TABLE test_database.test_table_1 (`key` Int32, `test` U" + mapped_type +
-                ", `_sign` Int8() MATERIALIZED 1, `_version` UInt64() MATERIALIZED 1) ENGINE = "
+                MATERIALIZEMYSQL_TABLE_COLUMNS + ") ENGINE = "
                 "ReplacingMergeTree(_version) PARTITION BY intDiv(key, 4294967) ORDER BY tuple(key)");
 
             EXPECT_EQ(queryToString(tryRewrittenCreateQuery(
                 "CREATE TABLE `test_database`.`test_table_1`(`key` INT NOT NULL PRIMARY KEY, test " + test_type + " COMMENT 'test_comment' UNSIGNED NOT NULL)", context_holder.context)),
                 "CREATE TABLE test_database.test_table_1 (`key` Int32, `test` U" + mapped_type +
-                ", `_sign` Int8() MATERIALIZED 1, `_version` UInt64() MATERIALIZED 1) ENGINE = "
+                MATERIALIZEMYSQL_TABLE_COLUMNS + ") ENGINE = "
                 "ReplacingMergeTree(_version) PARTITION BY intDiv(key, 4294967) ORDER BY tuple(key)");
         }
     }
@@ -109,13 +113,15 @@ TEST(MySQLCreateRewritten, PartitionPolicy)
     {
         EXPECT_EQ(queryToString(tryRewrittenCreateQuery(
             "CREATE TABLE `test_database`.`test_table_1` (`key` " + test_type + " PRIMARY KEY)", context_holder.context)),
-            "CREATE TABLE test_database.test_table_1 (`key` " + mapped_type + ", `_sign` Int8() MATERIALIZED 1, "
-            "`_version` UInt64() MATERIALIZED 1) ENGINE = ReplacingMergeTree(_version)" + partition_policy + " ORDER BY tuple(key)");
+            "CREATE TABLE test_database.test_table_1 (`key` " + mapped_type +
+            MATERIALIZEMYSQL_TABLE_COLUMNS +
+            ") ENGINE = ReplacingMergeTree(_version)" + partition_policy + " ORDER BY tuple(key)");
 
         EXPECT_EQ(queryToString(tryRewrittenCreateQuery(
             "CREATE TABLE `test_database`.`test_table_1` (`key` " + test_type + " NOT NULL PRIMARY KEY)", context_holder.context)),
-            "CREATE TABLE test_database.test_table_1 (`key` " + mapped_type + ", `_sign` Int8() MATERIALIZED 1, "
-            "`_version` UInt64() MATERIALIZED 1) ENGINE = ReplacingMergeTree(_version)" + partition_policy + " ORDER BY tuple(key)");
+            "CREATE TABLE test_database.test_table_1 (`key` " + mapped_type +
+            MATERIALIZEMYSQL_TABLE_COLUMNS +
+            ") ENGINE = ReplacingMergeTree(_version)" + partition_policy + " ORDER BY tuple(key)");
     }
 }
 
@@ -138,23 +144,27 @@ TEST(MySQLCreateRewritten, OrderbyPolicy)
     {
         EXPECT_EQ(queryToString(tryRewrittenCreateQuery(
             "CREATE TABLE `test_database`.`test_table_1` (`key` " + test_type + " PRIMARY KEY, `key2` " + test_type + " UNIQUE KEY)", context_holder.context)),
-            "CREATE TABLE test_database.test_table_1 (`key` " + mapped_type + ", `key2` Nullable(" + mapped_type + "), `_sign` Int8() MATERIALIZED 1, "
-            "`_version` UInt64() MATERIALIZED 1) ENGINE = ReplacingMergeTree(_version)" + partition_policy + " ORDER BY (key, assumeNotNull(key2))");
+            "CREATE TABLE test_database.test_table_1 (`key` " + mapped_type + ", `key2` Nullable(" + mapped_type + ")" +
+            MATERIALIZEMYSQL_TABLE_COLUMNS +
+            ") ENGINE = ReplacingMergeTree(_version)" + partition_policy + " ORDER BY (key, assumeNotNull(key2))");
 
         EXPECT_EQ(queryToString(tryRewrittenCreateQuery(
             "CREATE TABLE `test_database`.`test_table_1` (`key` " + test_type + " NOT NULL PRIMARY KEY, `key2` " + test_type + " NOT NULL UNIQUE KEY)", context_holder.context)),
-            "CREATE TABLE test_database.test_table_1 (`key` " + mapped_type + ", `key2` " + mapped_type + ", `_sign` Int8() MATERIALIZED 1, "
-            "`_version` UInt64() MATERIALIZED 1) ENGINE = ReplacingMergeTree(_version)" + partition_policy + " ORDER BY (key, key2)");
+            "CREATE TABLE test_database.test_table_1 (`key` " + mapped_type + ", `key2` " + mapped_type +
+            MATERIALIZEMYSQL_TABLE_COLUMNS +
+            ") ENGINE = ReplacingMergeTree(_version)" + partition_policy + " ORDER BY (key, key2)");
 
         EXPECT_EQ(queryToString(tryRewrittenCreateQuery(
             "CREATE TABLE `test_database`.`test_table_1` (`key` " + test_type + " KEY UNIQUE KEY)", context_holder.context)),
-            "CREATE TABLE test_database.test_table_1 (`key` " + mapped_type + ", `_sign` Int8() MATERIALIZED 1, "
-            "`_version` UInt64() MATERIALIZED 1) ENGINE = ReplacingMergeTree(_version)" + partition_policy + " ORDER BY tuple(key)");
+            "CREATE TABLE test_database.test_table_1 (`key` " + mapped_type +
+            MATERIALIZEMYSQL_TABLE_COLUMNS +
+            ") ENGINE = ReplacingMergeTree(_version)" + partition_policy + " ORDER BY tuple(key)");
 
         EXPECT_EQ(queryToString(tryRewrittenCreateQuery(
             "CREATE TABLE `test_database`.`test_table_1` (`key` " + test_type + ", `key2` " + test_type + " UNIQUE KEY, PRIMARY KEY(`key`, `key2`))", context_holder.context)),
-            "CREATE TABLE test_database.test_table_1 (`key` " + mapped_type + ", `key2` " + mapped_type + ", `_sign` Int8() MATERIALIZED 1, "
-            "`_version` UInt64() MATERIALIZED 1) ENGINE = ReplacingMergeTree(_version)" + partition_policy + " ORDER BY (key, key2)");
+            "CREATE TABLE test_database.test_table_1 (`key` " + mapped_type + ", `key2` " + mapped_type +
+            MATERIALIZEMYSQL_TABLE_COLUMNS +
+            ") ENGINE = ReplacingMergeTree(_version)" + partition_policy + " ORDER BY (key, key2)");
     }
 }
 
@@ -165,23 +175,27 @@ TEST(MySQLCreateRewritten, RewrittenQueryWithPrimaryKey)
 
     EXPECT_EQ(queryToString(tryRewrittenCreateQuery(
         "CREATE TABLE `test_database`.`test_table_1` (`key` int NOT NULL PRIMARY KEY) ENGINE=InnoDB DEFAULT CHARSET=utf8", context_holder.context)),
-        "CREATE TABLE test_database.test_table_1 (`key` Int32, `_sign` Int8() MATERIALIZED 1, `_version` UInt64() MATERIALIZED 1) ENGINE = ReplacingMergeTree(_version) "
-        "PARTITION BY intDiv(key, 4294967) ORDER BY tuple(key)");
+        "CREATE TABLE test_database.test_table_1 (`key` Int32" +
+        std::string(MATERIALIZEMYSQL_TABLE_COLUMNS) +
+        ") ENGINE = ReplacingMergeTree(_version) PARTITION BY intDiv(key, 4294967) ORDER BY tuple(key)");
 
     EXPECT_EQ(queryToString(tryRewrittenCreateQuery(
         "CREATE TABLE `test_database`.`test_table_1` (`key` int NOT NULL, PRIMARY KEY (`key`)) ENGINE=InnoDB DEFAULT CHARSET=utf8", context_holder.context)),
-        "CREATE TABLE test_database.test_table_1 (`key` Int32, `_sign` Int8() MATERIALIZED 1, `_version` UInt64() MATERIALIZED 1) ENGINE = ReplacingMergeTree(_version) "
-        "PARTITION BY intDiv(key, 4294967) ORDER BY tuple(key)");
+        "CREATE TABLE test_database.test_table_1 (`key` Int32" +
+        std::string(MATERIALIZEMYSQL_TABLE_COLUMNS) +
+        ") ENGINE = ReplacingMergeTree(_version) PARTITION BY intDiv(key, 4294967) ORDER BY tuple(key)");
 
     EXPECT_EQ(queryToString(tryRewrittenCreateQuery(
         "CREATE TABLE `test_database`.`test_table_1` (`key_1` int NOT NULL, key_2 INT NOT NULL, PRIMARY KEY (`key_1`, `key_2`)) ENGINE=InnoDB DEFAULT CHARSET=utf8", context_holder.context)),
-        "CREATE TABLE test_database.test_table_1 (`key_1` Int32, `key_2` Int32, `_sign` Int8() MATERIALIZED 1, `_version` UInt64() MATERIALIZED 1) ENGINE = "
-        "ReplacingMergeTree(_version) PARTITION BY intDiv(key_1, 4294967) ORDER BY (key_1, key_2)");
+        "CREATE TABLE test_database.test_table_1 (`key_1` Int32, `key_2` Int32" +
+        std::string(MATERIALIZEMYSQL_TABLE_COLUMNS) +
+        ") ENGINE = ReplacingMergeTree(_version) PARTITION BY intDiv(key_1, 4294967) ORDER BY (key_1, key_2)");
 
     EXPECT_EQ(queryToString(tryRewrittenCreateQuery(
         "CREATE TABLE `test_database`.`test_table_1` (`key_1` BIGINT NOT NULL, key_2 INT NOT NULL, PRIMARY KEY (`key_1`, `key_2`)) ENGINE=InnoDB DEFAULT CHARSET=utf8", context_holder.context)),
-        "CREATE TABLE test_database.test_table_1 (`key_1` Int64, `key_2` Int32, `_sign` Int8() MATERIALIZED 1, `_version` UInt64() MATERIALIZED 1) ENGINE = "
-        "ReplacingMergeTree(_version) PARTITION BY intDiv(key_2, 4294967) ORDER BY (key_1, key_2)");
+        "CREATE TABLE test_database.test_table_1 (`key_1` Int64, `key_2` Int32" +
+        std::string(MATERIALIZEMYSQL_TABLE_COLUMNS) +
+        ") ENGINE = ReplacingMergeTree(_version) PARTITION BY intDiv(key_2, 4294967) ORDER BY (key_1, key_2)");
 }
 
 TEST(MySQLCreateRewritten, RewrittenQueryWithPrefixKey)
@@ -191,7 +205,8 @@ TEST(MySQLCreateRewritten, RewrittenQueryWithPrefixKey)
 
     EXPECT_EQ(queryToString(tryRewrittenCreateQuery(
         "CREATE TABLE `test_database`.`test_table_1` (`key` int NOT NULL PRIMARY KEY, `prefix_key` varchar(200) NOT NULL, KEY prefix_key_index(prefix_key(2))) ENGINE=InnoDB DEFAULT CHARSET=utf8", context_holder.context)),
-        "CREATE TABLE test_database.test_table_1 (`key` Int32, `prefix_key` String, `_sign` Int8() MATERIALIZED 1, `_version` UInt64() MATERIALIZED 1) ENGINE = "
+        "CREATE TABLE test_database.test_table_1 (`key` Int32, `prefix_key` String" +
+        std::string(MATERIALIZEMYSQL_TABLE_COLUMNS) + ") ENGINE = "
         "ReplacingMergeTree(_version) PARTITION BY intDiv(key, 4294967) ORDER BY (key, prefix_key)");
 }
 
@@ -204,6 +219,7 @@ TEST(MySQLCreateRewritten, UniqueKeysConvert)
         "CREATE TABLE `test_database`.`test_table_1` (code varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,name varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,"
         " id bigint NOT NULL AUTO_INCREMENT, tenant_id bigint NOT NULL, PRIMARY KEY (id), UNIQUE KEY code_id (code, tenant_id), UNIQUE KEY name_id (name, tenant_id))"
         " ENGINE=InnoDB AUTO_INCREMENT=100 DEFAULT CHARSET=utf8 COLLATE=utf8_bin;", context_holder.context)),
-        "CREATE TABLE test_database.test_table_1 (`code` String, `name` String, `id` Int64, `tenant_id` Int64, `_sign` Int8() MATERIALIZED 1, `_version` UInt64() MATERIALIZED 1)"
-        " ENGINE = ReplacingMergeTree(_version) PARTITION BY intDiv(id, 18446744073709551) ORDER BY (code, name, tenant_id, id)");
+        "CREATE TABLE test_database.test_table_1 (`code` String, `name` String, `id` Int64, `tenant_id` Int64" +
+        std::string(MATERIALIZEMYSQL_TABLE_COLUMNS) +
+        ") ENGINE = ReplacingMergeTree(_version) PARTITION BY intDiv(id, 18446744073709551) ORDER BY (code, name, tenant_id, id)");
 }
diff --git a/src/Interpreters/NormalizeSelectWithUnionQueryVisitor.cpp b/src/Interpreters/NormalizeSelectWithUnionQueryVisitor.cpp
new file mode 100644
index 00000000000..d65755f98ba
--- /dev/null
+++ b/src/Interpreters/NormalizeSelectWithUnionQueryVisitor.cpp
@@ -0,0 +1,116 @@
+#include <Interpreters/NormalizeSelectWithUnionQueryVisitor.h>
+#include <Parsers/ASTExpressionList.h>
+#include <Common/typeid_cast.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int EXPECTED_ALL_OR_DISTINCT;
+}
+
+void NormalizeSelectWithUnionQueryMatcher::getSelectsFromUnionListNode(ASTPtr & ast_select, ASTs & selects)
+{
+    if (auto * inner_union = ast_select->as<ASTSelectWithUnionQuery>())
+    {
+        for (auto & child : inner_union->list_of_selects->children)
+            getSelectsFromUnionListNode(child, selects);
+
+        return;
+        }
+
+        selects.push_back(ast_select);
+}
+
+void NormalizeSelectWithUnionQueryMatcher::visit(ASTPtr & ast, Data & data)
+{
+    if (auto * select_union = ast->as<ASTSelectWithUnionQuery>())
+        visit(*select_union, data);
+}
+
+void NormalizeSelectWithUnionQueryMatcher::visit(ASTSelectWithUnionQuery & ast, Data & data)
+{
+    auto & union_modes = ast.list_of_modes;
+    ASTs selects;
+    auto & select_list = ast.list_of_selects->children;
+
+    int i;
+    for (i = union_modes.size() - 1; i >= 0; --i)
+    {
+        /// Rewrite UNION Mode
+        if (union_modes[i] == ASTSelectWithUnionQuery::Mode::Unspecified)
+        {
+            if (data.union_default_mode == UnionMode::ALL)
+                union_modes[i] = ASTSelectWithUnionQuery::Mode::ALL;
+            else if (data.union_default_mode == UnionMode::DISTINCT)
+                union_modes[i] = ASTSelectWithUnionQuery::Mode::DISTINCT;
+            else
+                throw Exception(
+                    "Expected ALL or DISTINCT in SelectWithUnion query, because setting (union_default_mode) is empty",
+                    DB::ErrorCodes::EXPECTED_ALL_OR_DISTINCT);
+        }
+
+        if (union_modes[i] == ASTSelectWithUnionQuery::Mode::ALL)
+        {
+            if (auto * inner_union = select_list[i + 1]->as<ASTSelectWithUnionQuery>();
+                inner_union && inner_union->union_mode == ASTSelectWithUnionQuery::Mode::ALL)
+            {
+                /// Inner_union is an UNION ALL list, just lift up
+                for (auto child = inner_union->list_of_selects->children.rbegin(); child != inner_union->list_of_selects->children.rend();
+                     ++child)
+                    selects.push_back(*child);
+            }
+            else
+                selects.push_back(select_list[i + 1]);
+        }
+        /// flatten all left nodes and current node to a UNION DISTINCT list
+        else if (union_modes[i] == ASTSelectWithUnionQuery::Mode::DISTINCT)
+        {
+            auto distinct_list = std::make_shared<ASTSelectWithUnionQuery>();
+            distinct_list->list_of_selects = std::make_shared<ASTExpressionList>();
+            distinct_list->children.push_back(distinct_list->list_of_selects);
+
+            for (int j = 0; j <= i + 1; ++j)
+            {
+                getSelectsFromUnionListNode(select_list[j], distinct_list->list_of_selects->children);
+            }
+
+            distinct_list->union_mode = ASTSelectWithUnionQuery::Mode::DISTINCT;
+            distinct_list->is_normalized = true;
+            selects.push_back(std::move(distinct_list));
+            break;
+        }
+    }
+
+    /// No UNION DISTINCT or only one child in select_list
+    if (i == -1)
+    {
+        if (auto * inner_union = select_list[0]->as<ASTSelectWithUnionQuery>();
+            inner_union && inner_union->union_mode == ASTSelectWithUnionQuery::Mode::ALL)
+        {
+            /// Inner_union is an UNION ALL list, just lift it up
+            for (auto child = inner_union->list_of_selects->children.rbegin(); child != inner_union->list_of_selects->children.rend();
+                 ++child)
+                selects.push_back(*child);
+        }
+        else
+            selects.push_back(select_list[0]);
+    }
+
+    /// Just one union type child, lift it up
+    if (selects.size() == 1 && selects[0]->as<ASTSelectWithUnionQuery>())
+    {
+        ast = *(selects[0]->as<ASTSelectWithUnionQuery>());
+        return;
+    }
+
+    // reverse children list
+    std::reverse(selects.begin(), selects.end());
+
+    ast.is_normalized = true;
+    ast.union_mode = ASTSelectWithUnionQuery::Mode::ALL;
+
+    ast.list_of_selects->children = std::move(selects);
+}
+}
diff --git a/src/Interpreters/NormalizeSelectWithUnionQueryVisitor.h b/src/Interpreters/NormalizeSelectWithUnionQueryVisitor.h
new file mode 100644
index 00000000000..cec2e4265e2
--- /dev/null
+++ b/src/Interpreters/NormalizeSelectWithUnionQueryVisitor.h
@@ -0,0 +1,34 @@
+#pragma once
+
+#include <unordered_set>
+
+#include <Parsers/IAST.h>
+#include <Interpreters/InDepthNodeVisitor.h>
+
+#include <Core/Settings.h>
+#include <Parsers/ASTSelectWithUnionQuery.h>
+
+namespace DB
+{
+
+class ASTFunction;
+
+class NormalizeSelectWithUnionQueryMatcher
+{
+public:
+    struct Data
+    {
+        const UnionMode & union_default_mode;
+    };
+
+    static void getSelectsFromUnionListNode(ASTPtr & ast_select, ASTs & selects);
+
+    static void visit(ASTPtr & ast, Data &);
+    static void visit(ASTSelectWithUnionQuery &, Data &);
+    static bool needChildVisit(const ASTPtr &, const ASTPtr &) { return true; }
+};
+
+/// We need normalize children first, so we should visit AST tree bottom up
+using NormalizeSelectWithUnionQueryVisitor
+    = InDepthNodeVisitor<NormalizeSelectWithUnionQueryMatcher, false>;
+}
diff --git a/src/Interpreters/OpenTelemetrySpanLog.cpp b/src/Interpreters/OpenTelemetrySpanLog.cpp
index e1df145cf51..c72b0f3d326 100644
--- a/src/Interpreters/OpenTelemetrySpanLog.cpp
+++ b/src/Interpreters/OpenTelemetrySpanLog.cpp
@@ -49,7 +49,7 @@ void OpenTelemetrySpanLogElement::appendToBlock(MutableColumns & columns) const
     columns[i++]->insert(operation_name);
     columns[i++]->insert(start_time_us);
     columns[i++]->insert(finish_time_us);
-    columns[i++]->insert(DateLUT::instance().toDayNum(finish_time_us / 1000000));
+    columns[i++]->insert(DateLUT::instance().toDayNum(finish_time_us / 1000000).toUnderType());
     columns[i++]->insert(attribute_names);
     // The user might add some ints values, and we will have Int Field, and the
     // insert will fail because the column requires Strings. Convert the fields
@@ -116,7 +116,7 @@ OpenTelemetrySpanHolder::~OpenTelemetrySpanHolder()
             return;
         }
 
-        auto * context = thread_group->query_context;
+        auto context = thread_group->query_context.lock();
         if (!context)
         {
             // Both global and query contexts can be null when executing a
diff --git a/src/Interpreters/OptimizeShardingKeyRewriteInVisitor.cpp b/src/Interpreters/OptimizeShardingKeyRewriteInVisitor.cpp
new file mode 100644
index 00000000000..399def00006
--- /dev/null
+++ b/src/Interpreters/OptimizeShardingKeyRewriteInVisitor.cpp
@@ -0,0 +1,124 @@
+#include <Interpreters/ExpressionActions.h>
+#include <Interpreters/convertFieldToType.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTIdentifier.h>
+#include <DataTypes/FieldToDataType.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Interpreters/OptimizeShardingKeyRewriteInVisitor.h>
+
+namespace
+{
+
+using namespace DB;
+
+Field executeFunctionOnField(
+    const Field & field, const std::string & name,
+    const ExpressionActionsPtr & sharding_expr,
+    const std::string & sharding_key_column_name)
+{
+    DataTypePtr type = applyVisitor(FieldToDataType{}, field);
+
+    ColumnWithTypeAndName column;
+    column.column = type->createColumnConst(1, field);
+    column.name = name;
+    column.type = type;
+
+    Block block{column};
+    size_t num_rows = 1;
+    sharding_expr->execute(block, num_rows);
+
+    ColumnWithTypeAndName & ret = block.getByName(sharding_key_column_name);
+    return (*ret.column)[0];
+}
+
+/// @param sharding_column_value - one of values from IN
+/// @param sharding_column_name - name of that column
+/// @param sharding_expr - expression of sharding_key for the Distributed() table
+/// @param sharding_key_column_name - name of the column for sharding_expr
+/// @param shard_info - info for the current shard (to compare shard_num with calculated)
+/// @param slots - weight -> shard mapping
+/// @return true if shard may contain such value (or it is unknown), otherwise false.
+bool shardContains(
+    const Field & sharding_column_value,
+    const std::string & sharding_column_name,
+    const ExpressionActionsPtr & sharding_expr,
+    const std::string & sharding_key_column_name,
+    const Cluster::ShardInfo & shard_info,
+    const Cluster::SlotToShard & slots)
+{
+    /// NULL is not allowed in sharding key,
+    /// so it should be safe to assume that shard cannot contain it.
+    if (sharding_column_value.isNull())
+        return false;
+
+    Field sharding_value = executeFunctionOnField(sharding_column_value, sharding_column_name, sharding_expr, sharding_key_column_name);
+    /// The value from IN can be non-numeric,
+    /// but in this case it should be convertible to numeric type, let's try.
+    sharding_value = convertFieldToType(sharding_value, DataTypeUInt64());
+    /// In case of conversion is not possible (NULL), shard cannot contain the value anyway.
+    if (sharding_value.isNull())
+        return false;
+
+    UInt64 value = sharding_value.get<UInt64>();
+    const auto shard_num = slots[value % slots.size()] + 1;
+    return shard_info.shard_num == shard_num;
+}
+
+}
+
+namespace DB
+{
+
+bool OptimizeShardingKeyRewriteInMatcher::needChildVisit(ASTPtr & /*node*/, const ASTPtr & /*child*/)
+{
+    return true;
+}
+
+void OptimizeShardingKeyRewriteInMatcher::visit(ASTPtr & node, Data & data)
+{
+    if (auto * function = node->as<ASTFunction>())
+        visit(*function, data);
+}
+
+void OptimizeShardingKeyRewriteInMatcher::visit(ASTFunction & function, Data & data)
+{
+    if (function.name != "in")
+        return;
+
+    auto * left = function.arguments->children.front().get();
+    auto * right = function.arguments->children.back().get();
+    auto * identifier = left->as<ASTIdentifier>();
+    if (!identifier)
+        return;
+
+    const auto & sharding_expr = data.sharding_key_expr;
+    const auto & sharding_key_column_name = data.sharding_key_column_name;
+
+    if (!sharding_expr->getRequiredColumnsWithTypes().contains(identifier->name()))
+        return;
+
+    /// NOTE: that we should not take care about empty tuple,
+    /// since after optimize_skip_unused_shards,
+    /// at least one element should match each shard.
+    if (auto * tuple_func = right->as<ASTFunction>(); tuple_func && tuple_func->name == "tuple")
+    {
+        auto * tuple_elements = tuple_func->children.front()->as<ASTExpressionList>();
+        std::erase_if(tuple_elements->children, [&](auto & child)
+        {
+            auto * literal = child->template as<ASTLiteral>();
+            return literal && !shardContains(literal->value, identifier->name(), sharding_expr, sharding_key_column_name, data.shard_info, data.slots);
+        });
+    }
+    else if (auto * tuple_literal = right->as<ASTLiteral>();
+        tuple_literal && tuple_literal->value.getType() == Field::Types::Tuple)
+    {
+        auto & tuple = tuple_literal->value.get<Tuple &>();
+        std::erase_if(tuple, [&](auto & child)
+        {
+            return !shardContains(child, identifier->name(), sharding_expr, sharding_key_column_name, data.shard_info, data.slots);
+        });
+    }
+}
+
+}
diff --git a/src/Interpreters/OptimizeShardingKeyRewriteInVisitor.h b/src/Interpreters/OptimizeShardingKeyRewriteInVisitor.h
new file mode 100644
index 00000000000..3087fb844ed
--- /dev/null
+++ b/src/Interpreters/OptimizeShardingKeyRewriteInVisitor.h
@@ -0,0 +1,41 @@
+#pragma once
+
+#include <Interpreters/InDepthNodeVisitor.h>
+#include <Interpreters/Cluster.h>
+
+namespace DB
+{
+
+class ExpressionActions;
+using ExpressionActionsPtr = std::shared_ptr<ExpressionActions>;
+
+class ASTFunction;
+
+/// Rewrite `sharding_key IN (...)` for specific shard,
+/// so that it will contain only values that belong to this specific shard.
+///
+/// See also:
+/// - evaluateExpressionOverConstantCondition()
+/// - StorageDistributed::createSelector()
+/// - createBlockSelector()
+struct OptimizeShardingKeyRewriteInMatcher
+{
+    /// Cluster::SlotToShard
+    using SlotToShard = std::vector<UInt64>;
+
+    struct Data
+    {
+        const ExpressionActionsPtr & sharding_key_expr;
+        const std::string & sharding_key_column_name;
+        const Cluster::ShardInfo & shard_info;
+        const Cluster::SlotToShard & slots;
+    };
+
+    static bool needChildVisit(ASTPtr & /*node*/, const ASTPtr & /*child*/);
+    static void visit(ASTPtr & node, Data & data);
+    static void visit(ASTFunction & function, Data & data);
+};
+
+using OptimizeShardingKeyRewriteInVisitor = InDepthNodeVisitor<OptimizeShardingKeyRewriteInMatcher, true>;
+
+}
diff --git a/src/Interpreters/PartLog.cpp b/src/Interpreters/PartLog.cpp
index 860666a0035..e4459399336 100644
--- a/src/Interpreters/PartLog.cpp
+++ b/src/Interpreters/PartLog.cpp
@@ -71,7 +71,7 @@ void PartLogElement::appendToBlock(MutableColumns & columns) const
 
     columns[i++]->insert(query_id);
     columns[i++]->insert(event_type);
-    columns[i++]->insert(DateLUT::instance().toDayNum(event_time));
+    columns[i++]->insert(DateLUT::instance().toDayNum(event_time).toUnderType());
     columns[i++]->insert(event_time);
     columns[i++]->insert(event_time_microseconds);
     columns[i++]->insert(duration_ms);
@@ -103,7 +103,7 @@ void PartLogElement::appendToBlock(MutableColumns & columns) const
 
 
 bool PartLog::addNewPart(
-    Context & current_context, const MutableDataPartPtr & part, UInt64 elapsed_ns, const ExecutionStatus & execution_status)
+    ContextPtr current_context, const MutableDataPartPtr & part, UInt64 elapsed_ns, const ExecutionStatus & execution_status)
 {
     return addNewParts(current_context, {part}, elapsed_ns, execution_status);
 }
@@ -120,7 +120,7 @@ inline UInt64 time_in_seconds(std::chrono::time_point<std::chrono::system_clock>
 }
 
 bool PartLog::addNewParts(
-    Context & current_context, const PartLog::MutableDataPartsVector & parts, UInt64 elapsed_ns, const ExecutionStatus & execution_status)
+    ContextPtr current_context, const PartLog::MutableDataPartsVector & parts, UInt64 elapsed_ns, const ExecutionStatus & execution_status)
 {
     if (parts.empty())
         return true;
@@ -130,7 +130,7 @@ bool PartLog::addNewParts(
     try
     {
         auto table_id = parts.front()->storage.getStorageID();
-        part_log = current_context.getPartLog(table_id.database_name); // assume parts belong to the same table
+        part_log = current_context->getPartLog(table_id.database_name); // assume parts belong to the same table
         if (!part_log)
             return false;
 
diff --git a/src/Interpreters/PartLog.h b/src/Interpreters/PartLog.h
index c946d6ce85f..edb6ab4a45f 100644
--- a/src/Interpreters/PartLog.h
+++ b/src/Interpreters/PartLog.h
@@ -69,9 +69,9 @@ class PartLog : public SystemLog<PartLogElement>
 
 public:
     /// Add a record about creation of new part.
-    static bool addNewPart(Context & context, const MutableDataPartPtr & part, UInt64 elapsed_ns,
+    static bool addNewPart(ContextPtr context, const MutableDataPartPtr & part, UInt64 elapsed_ns,
                            const ExecutionStatus & execution_status = {});
-    static bool addNewParts(Context & context, const MutableDataPartsVector & parts, UInt64 elapsed_ns,
+    static bool addNewParts(ContextPtr context, const MutableDataPartsVector & parts, UInt64 elapsed_ns,
                             const ExecutionStatus & execution_status = {});
 };
 
diff --git a/src/Interpreters/PredicateExpressionsOptimizer.cpp b/src/Interpreters/PredicateExpressionsOptimizer.cpp
index 00b47be408a..f2e55441fb6 100644
--- a/src/Interpreters/PredicateExpressionsOptimizer.cpp
+++ b/src/Interpreters/PredicateExpressionsOptimizer.cpp
@@ -19,11 +19,11 @@ namespace ErrorCodes
 }
 
 PredicateExpressionsOptimizer::PredicateExpressionsOptimizer(
-    const Context & context_, const TablesWithColumns & tables_with_columns_, const Settings & settings)
-    : enable_optimize_predicate_expression(settings.enable_optimize_predicate_expression)
+    ContextPtr context_, const TablesWithColumns & tables_with_columns_, const Settings & settings)
+    : WithContext(context_)
+    , enable_optimize_predicate_expression(settings.enable_optimize_predicate_expression)
     , enable_optimize_predicate_expression_to_final_subquery(settings.enable_optimize_predicate_expression_to_final_subquery)
     , allow_push_predicate_when_subquery_contains_with(settings.allow_push_predicate_when_subquery_contains_with)
-    , context(context_)
     , tables_with_columns(tables_with_columns_)
 {
 }
@@ -87,7 +87,7 @@ std::vector<ASTs> PredicateExpressionsOptimizer::extractTablesPredicates(const A
 
     for (const auto & predicate_expression : splitConjunctionPredicate({where, prewhere}))
     {
-        ExpressionInfoVisitor::Data expression_info{.context = context, .tables = tables_with_columns};
+        ExpressionInfoVisitor::Data expression_info{WithContext{getContext()}, tables_with_columns};
         ExpressionInfoVisitor(expression_info).visit(predicate_expression);
 
         if (expression_info.is_stateful_function
@@ -146,7 +146,7 @@ bool PredicateExpressionsOptimizer::tryRewritePredicatesToTables(ASTs & tables_e
                 break;  /// Skip left and right table optimization
 
             is_rewrite_tables |= tryRewritePredicatesToTable(tables_element[table_pos], tables_predicates[table_pos],
-                tables_with_columns[table_pos].columns.getNames());
+                tables_with_columns[table_pos]);
 
             if (table_element->table_join && isRight(table_element->table_join->as<ASTTableJoin>()->kind))
                 break;  /// Skip left table optimization
@@ -156,13 +156,13 @@ bool PredicateExpressionsOptimizer::tryRewritePredicatesToTables(ASTs & tables_e
     return is_rewrite_tables;
 }
 
-bool PredicateExpressionsOptimizer::tryRewritePredicatesToTable(ASTPtr & table_element, const ASTs & table_predicates, Names && table_columns) const
+bool PredicateExpressionsOptimizer::tryRewritePredicatesToTable(ASTPtr & table_element, const ASTs & table_predicates, const TableWithColumnNamesAndTypes & table_columns) const
 {
     if (!table_predicates.empty())
     {
         auto optimize_final = enable_optimize_predicate_expression_to_final_subquery;
         auto optimize_with = allow_push_predicate_when_subquery_contains_with;
-        PredicateRewriteVisitor::Data data(context, table_predicates, std::move(table_columns), optimize_final, optimize_with);
+        PredicateRewriteVisitor::Data data(getContext(), table_predicates, table_columns, optimize_final, optimize_with);
 
         PredicateRewriteVisitor(data).visit(table_element);
         return data.is_rewrite;
@@ -187,7 +187,8 @@ bool PredicateExpressionsOptimizer::tryMovePredicatesFromHavingToWhere(ASTSelect
 
     for (const auto & moving_predicate: splitConjunctionPredicate({select_query.having()}))
     {
-        ExpressionInfoVisitor::Data expression_info{.context = context, .tables = {}};
+        TablesWithColumns tables;
+        ExpressionInfoVisitor::Data expression_info{WithContext{getContext()}, tables};
         ExpressionInfoVisitor(expression_info).visit(moving_predicate);
 
         /// TODO: If there is no group by, where, and prewhere expression, we can push down the stateful function
diff --git a/src/Interpreters/PredicateExpressionsOptimizer.h b/src/Interpreters/PredicateExpressionsOptimizer.h
index 8cceda93164..a31b9907da6 100644
--- a/src/Interpreters/PredicateExpressionsOptimizer.h
+++ b/src/Interpreters/PredicateExpressionsOptimizer.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#include <Parsers/ASTSelectQuery.h>
+#include <Interpreters/Context_fwd.h>
 #include <Interpreters/DatabaseAndTableWithAlias.h>
+#include <Parsers/ASTSelectQuery.h>
 
 namespace DB
 {
 
-class Context;
 struct Settings;
 
 /** Predicate optimization based on rewriting ast rules
@@ -15,10 +15,10 @@ struct Settings;
  *      - Move predicates from having to where
  *      - Push the predicate down from the current query to the having of the subquery
  */
-class PredicateExpressionsOptimizer
+class PredicateExpressionsOptimizer : WithContext
 {
 public:
-    PredicateExpressionsOptimizer(const Context & context_, const TablesWithColumns & tables_with_columns_, const Settings & settings_);
+    PredicateExpressionsOptimizer(ContextPtr context_, const TablesWithColumns & tables_with_columns_, const Settings & settings_);
 
     bool optimize(ASTSelectQuery & select_query);
 
@@ -26,14 +26,14 @@ private:
     const bool enable_optimize_predicate_expression;
     const bool enable_optimize_predicate_expression_to_final_subquery;
     const bool allow_push_predicate_when_subquery_contains_with;
-    const Context & context;
     const TablesWithColumns & tables_with_columns;
 
     std::vector<ASTs> extractTablesPredicates(const ASTPtr & where, const ASTPtr & prewhere);
 
     bool tryRewritePredicatesToTables(ASTs & tables_element, const std::vector<ASTs> & tables_predicates);
 
-    bool tryRewritePredicatesToTable(ASTPtr & table_element, const ASTs & table_predicates, Names && table_columns) const;
+    bool tryRewritePredicatesToTable(
+        ASTPtr & table_element, const ASTs & table_predicates, const TableWithColumnNamesAndTypes & table_columns) const;
 
     bool tryMovePredicatesFromHavingToWhere(ASTSelectQuery & select_query);
 };
diff --git a/src/Interpreters/PredicateRewriteVisitor.cpp b/src/Interpreters/PredicateRewriteVisitor.cpp
index 9e6d5543f2f..092d37d78dd 100644
--- a/src/Interpreters/PredicateRewriteVisitor.cpp
+++ b/src/Interpreters/PredicateRewriteVisitor.cpp
@@ -17,8 +17,16 @@ namespace DB
 {
 
 PredicateRewriteVisitorData::PredicateRewriteVisitorData(
-    const Context & context_, const ASTs & predicates_, Names && column_names_, bool optimize_final_, bool optimize_with_)
-    : context(context_), predicates(predicates_), column_names(column_names_), optimize_final(optimize_final_), optimize_with(optimize_with_)
+    ContextPtr context_,
+    const ASTs & predicates_,
+    const TableWithColumnNamesAndTypes & table_columns_,
+    bool optimize_final_,
+    bool optimize_with_)
+    : WithContext(context_)
+    , predicates(predicates_)
+    , table_columns(table_columns_)
+    , optimize_final(optimize_final_)
+    , optimize_with(optimize_with_)
 {
 }
 
@@ -42,7 +50,8 @@ void PredicateRewriteVisitorData::visit(ASTSelectWithUnionQuery & union_select_q
 
 void PredicateRewriteVisitorData::visitFirstInternalSelect(ASTSelectQuery & select_query, ASTPtr &)
 {
-    is_rewrite |= rewriteSubquery(select_query, column_names, column_names);
+    /// In this case inner_columns same as outer_columns from table_columns
+    is_rewrite |= rewriteSubquery(select_query, table_columns.columns.getNames());
 }
 
 void PredicateRewriteVisitorData::visitOtherInternalSelect(ASTSelectQuery & select_query, ASTPtr &)
@@ -63,9 +72,9 @@ void PredicateRewriteVisitorData::visitOtherInternalSelect(ASTSelectQuery & sele
     }
 
     const Names & internal_columns = InterpreterSelectQuery(
-        temp_internal_select, context, SelectQueryOptions().analyze()).getSampleBlock().getNames();
+        temp_internal_select, getContext(), SelectQueryOptions().analyze()).getSampleBlock().getNames();
 
-    if (rewriteSubquery(*temp_select_query, column_names, internal_columns))
+    if (rewriteSubquery(*temp_select_query, internal_columns))
     {
         is_rewrite |= true;
         select_query.setExpression(ASTSelectQuery::Expression::SELECT, std::move(temp_select_query->refSelect()));
@@ -89,15 +98,16 @@ static void cleanAliasAndCollectIdentifiers(ASTPtr & predicate, std::vector<ASTI
         identifiers.emplace_back(identifier);
 }
 
-bool PredicateRewriteVisitorData::rewriteSubquery(ASTSelectQuery & subquery, const Names & outer_columns, const Names & inner_columns)
+bool PredicateRewriteVisitorData::rewriteSubquery(ASTSelectQuery & subquery, const Names & inner_columns)
 {
     if ((!optimize_final && subquery.final())
         || (!optimize_with && subquery.with())
         || subquery.withFill()
         || subquery.limitBy() || subquery.limitLength()
-        || hasNonRewritableFunction(subquery.select(), context))
+        || hasNonRewritableFunction(subquery.select(), getContext()))
         return false;
 
+    Names outer_columns = table_columns.columns.getNames();
     for (const auto & predicate : predicates)
     {
         std::vector<ASTIdentifier *> identifiers;
@@ -106,13 +116,16 @@ bool PredicateRewriteVisitorData::rewriteSubquery(ASTSelectQuery & subquery, con
 
         for (const auto & identifier : identifiers)
         {
-            const auto & column_name = identifier->shortName();
-            const auto & outer_column_iterator = std::find(outer_columns.begin(), outer_columns.end(), column_name);
+            IdentifierSemantic::setColumnShortName(*identifier, table_columns.table);
+            const auto & column_name = identifier->name();
 
             /// For lambda functions, we can't always find them in the list of columns
             /// For example: SELECT * FROM system.one WHERE arrayMap(x -> x, [dummy]) = [0]
+            const auto & outer_column_iterator = std::find(outer_columns.begin(), outer_columns.end(), column_name);
             if (outer_column_iterator != outer_columns.end())
+            {
                 identifier->setShortName(inner_columns[outer_column_iterator - outer_columns.begin()]);
+            }
         }
 
         /// We only need to push all the predicates to subquery having
diff --git a/src/Interpreters/PredicateRewriteVisitor.h b/src/Interpreters/PredicateRewriteVisitor.h
index 02c8b9ca422..fc076464925 100644
--- a/src/Interpreters/PredicateRewriteVisitor.h
+++ b/src/Interpreters/PredicateRewriteVisitor.h
@@ -1,14 +1,16 @@
 #pragma once
 
-#include <Parsers/IAST.h>
+#include <Interpreters/Context_fwd.h>
+#include <Interpreters/DatabaseAndTableWithAlias.h>
+#include <Interpreters/InDepthNodeVisitor.h>
 #include <Parsers/ASTSelectQuery.h>
 #include <Parsers/ASTSelectWithUnionQuery.h>
-#include <Interpreters/InDepthNodeVisitor.h>
+#include <Parsers/IAST.h>
 
 namespace DB
 {
 
-class PredicateRewriteVisitorData
+class PredicateRewriteVisitorData : WithContext
 {
 public:
     bool is_rewrite = false;
@@ -18,18 +20,19 @@ public:
 
     static bool needChild(const ASTPtr & node, const ASTPtr &)
     {
-        if (node && node->as<TypeToVisit>())
-            return false;
-
-        return true;
+        return !(node && node->as<TypeToVisit>());
     }
 
-    PredicateRewriteVisitorData(const Context & context_, const ASTs & predicates_, Names && column_names_, bool optimize_final_, bool optimize_with_);
+    PredicateRewriteVisitorData(
+        ContextPtr context_,
+        const ASTs & predicates_,
+        const TableWithColumnNamesAndTypes & table_columns_,
+        bool optimize_final_,
+        bool optimize_with_);
 
 private:
-    const Context & context;
     const ASTs & predicates;
-    const Names column_names;
+    const TableWithColumnNamesAndTypes & table_columns;
     bool optimize_final;
     bool optimize_with;
 
@@ -37,9 +40,10 @@ private:
 
     void visitOtherInternalSelect(ASTSelectQuery & select_query, ASTPtr &);
 
-    bool rewriteSubquery(ASTSelectQuery & subquery, const Names & outer_columns, const Names & inner_columns);
+    bool rewriteSubquery(ASTSelectQuery & subquery, const Names & inner_columns);
 };
 
 using PredicateRewriteMatcher = OneTypeMatcher<PredicateRewriteVisitorData, PredicateRewriteVisitorData::needChild>;
 using PredicateRewriteVisitor = InDepthNodeVisitor<PredicateRewriteMatcher, true>;
+
 }
diff --git a/src/Interpreters/ProcessList.cpp b/src/Interpreters/ProcessList.cpp
index 4e336a98787..951ff6420c4 100644
--- a/src/Interpreters/ProcessList.cpp
+++ b/src/Interpreters/ProcessList.cpp
@@ -60,12 +60,12 @@ static bool isUnlimitedQuery(const IAST * ast)
 }
 
 
-ProcessList::EntryPtr ProcessList::insert(const String & query_, const IAST * ast, Context & query_context)
+ProcessList::EntryPtr ProcessList::insert(const String & query_, const IAST * ast, ContextPtr query_context)
 {
     EntryPtr res;
 
-    const ClientInfo & client_info = query_context.getClientInfo();
-    const Settings & settings = query_context.getSettingsRef();
+    const ClientInfo & client_info = query_context->getClientInfo();
+    const Settings & settings = query_context->getSettingsRef();
 
     if (client_info.current_query_id.empty())
         throw Exception("Query id cannot be empty", ErrorCodes::LOGICAL_ERROR);
@@ -174,12 +174,10 @@ ProcessList::EntryPtr ProcessList::insert(const String & query_, const IAST * as
         }
 
         auto process_it = processes.emplace(processes.end(),
-            query_, client_info, priorities.insert(settings.priority));
+            query_context, query_, client_info, priorities.insert(settings.priority));
 
         res = std::make_shared<Entry>(*this, process_it);
 
-        process_it->query_context = &query_context;
-
         ProcessListForUser & user_process_list = user_to_queries[client_info.current_user];
         user_process_list.queries.emplace(client_info.current_query_id, &res->get());
 
@@ -201,7 +199,7 @@ ProcessList::EntryPtr ProcessList::insert(const String & query_, const IAST * as
             /// Set query-level memory trackers
             thread_group->memory_tracker.setOrRaiseHardLimit(settings.max_memory_usage);
 
-            if (query_context.hasTraceCollector())
+            if (query_context->hasTraceCollector())
             {
                 /// Set up memory profiling
                 thread_group->memory_tracker.setOrRaiseProfilerLimit(settings.memory_profiler_step);
@@ -290,14 +288,12 @@ ProcessListEntry::~ProcessListEntry()
 
 
 QueryStatus::QueryStatus(
-    const String & query_,
-    const ClientInfo & client_info_,
-    QueryPriorities::Handle && priority_handle_)
-    :
-    query(query_),
-    client_info(client_info_),
-    priority_handle(std::move(priority_handle_)),
-    num_queries_increment{CurrentMetrics::Query}
+    ContextPtr context_, const String & query_, const ClientInfo & client_info_, QueryPriorities::Handle && priority_handle_)
+    : WithContext(context_)
+    , query(query_)
+    , client_info(client_info_)
+    , priority_handle(std::move(priority_handle_))
+    , num_queries_increment{CurrentMetrics::Query}
 {
 }
 
@@ -454,8 +450,11 @@ QueryStatusInfo QueryStatus::getInfo(bool get_thread_list, bool get_profile_even
             res.profile_counters = std::make_shared<ProfileEvents::Counters>(thread_group->performance_counters.getPartiallyAtomicSnapshot());
     }
 
-    if (get_settings && query_context)
-        res.query_settings = std::make_shared<Settings>(query_context->getSettings());
+    if (get_settings && getContext())
+    {
+        res.query_settings = std::make_shared<Settings>(getContext()->getSettings());
+        res.current_database = getContext()->getCurrentDatabase();
+    }
 
     return res;
 }
diff --git a/src/Interpreters/ProcessList.h b/src/Interpreters/ProcessList.h
index f6151bb3429..3eeea9c8e5b 100644
--- a/src/Interpreters/ProcessList.h
+++ b/src/Interpreters/ProcessList.h
@@ -1,6 +1,5 @@
 #pragma once
 
-
 #include <Core/Defines.h>
 #include <DataStreams/BlockIO.h>
 #include <IO/Progress.h>
@@ -33,7 +32,6 @@ namespace CurrentMetrics
 namespace DB
 {
 
-class Context;
 struct Settings;
 class IAST;
 
@@ -68,10 +66,11 @@ struct QueryStatusInfo
     std::vector<UInt64> thread_ids;
     std::shared_ptr<ProfileEvents::Counters> profile_counters;
     std::shared_ptr<Settings> query_settings;
+    std::string current_database;
 };
 
 /// Query and information about its execution.
-class QueryStatus
+class QueryStatus : public WithContext
 {
 protected:
     friend class ProcessList;
@@ -82,9 +81,6 @@ protected:
     String query;
     ClientInfo client_info;
 
-    /// Is set once when init
-    Context * query_context = nullptr;
-
     /// Info about all threads involved in query execution
     ThreadGroupStatusPtr thread_group;
 
@@ -127,6 +123,7 @@ protected:
 public:
 
     QueryStatus(
+        ContextPtr context_,
         const String & query_,
         const ClientInfo & client_info_,
         QueryPriorities::Handle && priority_handle_);
@@ -171,9 +168,6 @@ public:
 
     QueryStatusInfo getInfo(bool get_thread_list = false, bool get_profile_events = false, bool get_settings = false) const;
 
-    Context * tryGetQueryContext() { return query_context; }
-    const Context * tryGetQueryContext() const { return query_context; }
-
     /// Copies pointers to in/out streams
     void setQueryStreams(const BlockIO & io);
 
@@ -304,7 +298,7 @@ public:
       * If timeout is passed - throw an exception.
       * Don't count KILL QUERY queries.
       */
-    EntryPtr insert(const String & query_, const IAST * ast, Context & query_context);
+    EntryPtr insert(const String & query_, const IAST * ast, ContextPtr query_context);
 
     /// Number of currently executing queries.
     size_t size() const { return processes.size(); }
diff --git a/src/Interpreters/QueryAliasesVisitor.cpp b/src/Interpreters/QueryAliasesVisitor.cpp
index d395bfc20e9..bd0b2e88d2f 100644
--- a/src/Interpreters/QueryAliasesVisitor.cpp
+++ b/src/Interpreters/QueryAliasesVisitor.cpp
@@ -15,15 +15,22 @@ namespace ErrorCodes
     extern const int MULTIPLE_EXPRESSIONS_FOR_ALIAS;
 }
 
-static String wrongAliasMessage(const ASTPtr & ast, const ASTPtr & prev_ast, const String & alias)
+namespace
 {
-    WriteBufferFromOwnString message;
-    message << "Different expressions with the same alias " << backQuoteIfNeed(alias) << ":\n";
-    formatAST(*ast, message, false, true);
-    message << "\nand\n";
-    formatAST(*prev_ast, message, false, true);
-    message << '\n';
-    return message.str();
+
+    constexpr auto dummy_subquery_name_prefix = "_subquery";
+
+    String wrongAliasMessage(const ASTPtr & ast, const ASTPtr & prev_ast, const String & alias)
+    {
+        WriteBufferFromOwnString message;
+        message << "Different expressions with the same alias " << backQuoteIfNeed(alias) << ":\n";
+        formatAST(*ast, message, false, true);
+        message << "\nand\n";
+        formatAST(*prev_ast, message, false, true);
+        message << '\n';
+        return message.str();
+    }
+
 }
 
 
@@ -99,7 +106,7 @@ void QueryAliasesMatcher<T>::visit(const ASTSubquery & const_subquery, const AST
         String alias;
         do
         {
-            alias = "_subquery" + std::to_string(++subquery_index);
+            alias = dummy_subquery_name_prefix + std::to_string(++subquery_index);
         }
         while (aliases.count(alias));
 
@@ -124,6 +131,30 @@ void QueryAliasesMatcher<T>::visitOther(const ASTPtr & ast, Data & data)
 
         aliases[alias] = ast;
     }
+
+    /** QueryAliasesVisitor is executed before ExecuteScalarSubqueriesVisitor.
+        For example we have subquery in our query (SELECT sum(number) FROM numbers(10)).
+
+        After running QueryAliasesVisitor it will be (SELECT sum(number) FROM numbers(10)) as _subquery_1
+        and prefer_alias_to_column_name for this subquery will be true.
+
+        After running ExecuteScalarSubqueriesVisitor it will be converted to (45 as _subquery_1)
+        and prefer_alias_to_column_name for ast literal will be true.
+
+        But if we send such query on remote host with Distributed engine for example we cannot send prefer_alias_to_column_name
+        information for our ast node with query string. And this alias will be dropped because prefer_alias_to_column_name for ASTWIthAlias
+        by default is false.
+
+        It is imporant that subquery can be converted to literal during ExecuteScalarSubqueriesVisitor.
+        And code below check if we previously set for subquery alias as _subquery, and if it is true
+        then set prefer_alias_to_column_name = true for node that was optimized during ExecuteScalarSubqueriesVisitor.
+     */
+
+    if (auto * ast_with_alias = dynamic_cast<ASTWithAlias *>(ast.get()))
+    {
+        if (startsWith(alias, dummy_subquery_name_prefix))
+            ast_with_alias->prefer_alias_to_column_name = true;
+    }
 }
 
 /// Explicit template instantiations
diff --git a/src/Interpreters/QueryLog.cpp b/src/Interpreters/QueryLog.cpp
index 82b957f895b..b6902468242 100644
--- a/src/Interpreters/QueryLog.cpp
+++ b/src/Interpreters/QueryLog.cpp
@@ -119,7 +119,7 @@ void QueryLogElement::appendToBlock(MutableColumns & columns) const
     size_t i = 0;
 
     columns[i++]->insert(type);
-    columns[i++]->insert(DateLUT::instance().toDayNum(event_time));
+    columns[i++]->insert(DateLUT::instance().toDayNum(event_time).toUnderType());
     columns[i++]->insert(event_time);
     columns[i++]->insert(event_time_microseconds);
     columns[i++]->insert(query_start_time);
diff --git a/src/Interpreters/QueryNormalizer.cpp b/src/Interpreters/QueryNormalizer.cpp
index 33d2e8d1ba1..0a2e6505558 100644
--- a/src/Interpreters/QueryNormalizer.cpp
+++ b/src/Interpreters/QueryNormalizer.cpp
@@ -72,6 +72,12 @@ void QueryNormalizer::visit(ASTIdentifier & node, ASTPtr & ast, Data & data)
     if (!IdentifierSemantic::getColumnName(node))
         return;
 
+    if (data.settings.prefer_column_name_to_alias)
+    {
+        if (data.source_columns_set.find(node.name()) != data.source_columns_set.end())
+            return;
+    }
+
     /// If it is an alias, but not a parent alias (for constructs like "SELECT column + 1 AS column").
     auto it_alias = data.aliases.find(node.name());
     if (it_alias != data.aliases.end() && current_alias != node.name())
@@ -131,8 +137,20 @@ static bool needVisitChild(const ASTPtr & child)
 void QueryNormalizer::visit(ASTSelectQuery & select, const ASTPtr &, Data & data)
 {
     for (auto & child : select.children)
-        if (needVisitChild(child))
+    {
+        if (child == select.groupBy() || child == select.orderBy() || child == select.having())
+        {
+            bool old_setting = data.settings.prefer_column_name_to_alias;
+            data.settings.prefer_column_name_to_alias = false;
             visit(child, data);
+            data.settings.prefer_column_name_to_alias = old_setting;
+        }
+        else
+        {
+            if (needVisitChild(child))
+                visit(child, data);
+        }
+    }
 
     /// If the WHERE clause or HAVING consists of a single alias, the reference must be replaced not only in children,
     /// but also in where_expression and having_expression.
diff --git a/src/Interpreters/QueryNormalizer.h b/src/Interpreters/QueryNormalizer.h
index e481f76ca8e..3dcccea1cfb 100644
--- a/src/Interpreters/QueryNormalizer.h
+++ b/src/Interpreters/QueryNormalizer.h
@@ -4,6 +4,7 @@
 
 #include <Parsers/IAST.h>
 #include <Interpreters/Aliases.h>
+#include <Core/Names.h>
 
 namespace DB
 {
@@ -21,12 +22,15 @@ class QueryNormalizer
     {
         const UInt64 max_ast_depth;
         const UInt64 max_expanded_ast_elements;
+        bool prefer_column_name_to_alias;
 
         template <typename T>
         ExtractedSettings(const T & settings)
-        :   max_ast_depth(settings.max_ast_depth),
-            max_expanded_ast_elements(settings.max_expanded_ast_elements)
-        {}
+            : max_ast_depth(settings.max_ast_depth)
+            , max_expanded_ast_elements(settings.max_expanded_ast_elements)
+            , prefer_column_name_to_alias(settings.prefer_column_name_to_alias)
+        {
+        }
     };
 
 public:
@@ -36,7 +40,8 @@ public:
         using MapOfASTs = std::map<ASTPtr, ASTPtr>;
 
         const Aliases & aliases;
-        const ExtractedSettings settings;
+        const NameSet & source_columns_set;
+        ExtractedSettings settings;
 
         /// tmp data
         size_t level;
@@ -44,8 +49,9 @@ public:
         SetOfASTs current_asts;     /// vertices in the current call stack of this method
         std::string current_alias;  /// the alias referencing to the ancestor of ast (the deepest ancestor with aliases)
 
-        Data(const Aliases & aliases_, ExtractedSettings && settings_)
+        Data(const Aliases & aliases_, const NameSet & source_columns_set_, ExtractedSettings && settings_)
             : aliases(aliases_)
+            , source_columns_set(source_columns_set_)
             , settings(settings_)
             , level(0)
         {}
diff --git a/src/Interpreters/QueryThreadLog.cpp b/src/Interpreters/QueryThreadLog.cpp
index f1cce1a3da9..31f1fddc87f 100644
--- a/src/Interpreters/QueryThreadLog.cpp
+++ b/src/Interpreters/QueryThreadLog.cpp
@@ -76,7 +76,7 @@ void QueryThreadLogElement::appendToBlock(MutableColumns & columns) const
 {
     size_t i = 0;
 
-    columns[i++]->insert(DateLUT::instance().toDayNum(event_time));
+    columns[i++]->insert(DateLUT::instance().toDayNum(event_time).toUnderType());
     columns[i++]->insert(event_time);
     columns[i++]->insert(event_time_microseconds);
     columns[i++]->insert(query_start_time);
diff --git a/src/Interpreters/RedundantFunctionsInOrderByVisitor.h b/src/Interpreters/RedundantFunctionsInOrderByVisitor.h
index d737e877f01..f807849fb86 100644
--- a/src/Interpreters/RedundantFunctionsInOrderByVisitor.h
+++ b/src/Interpreters/RedundantFunctionsInOrderByVisitor.h
@@ -16,7 +16,7 @@ public:
     struct Data
     {
         std::unordered_set<String> & keys;
-        const Context & context;
+        ContextPtr context;
         bool redundant = true;
         bool done = false;
 
diff --git a/src/Interpreters/RemoveInjectiveFunctionsVisitor.cpp b/src/Interpreters/RemoveInjectiveFunctionsVisitor.cpp
index ae575b8aae7..f46e80a6370 100644
--- a/src/Interpreters/RemoveInjectiveFunctionsVisitor.cpp
+++ b/src/Interpreters/RemoveInjectiveFunctionsVisitor.cpp
@@ -16,7 +16,7 @@ static bool isUniq(const ASTFunction & func)
 }
 
 /// Remove injective functions of one argument: replace with a child
-static bool removeInjectiveFunction(ASTPtr & ast, const Context & context, const FunctionFactory & function_factory)
+static bool removeInjectiveFunction(ASTPtr & ast, ContextPtr context, const FunctionFactory & function_factory)
 {
     const ASTFunction * func = ast->as<ASTFunction>();
     if (!func)
@@ -46,7 +46,7 @@ void RemoveInjectiveFunctionsMatcher::visit(ASTFunction & func, ASTPtr &, const
 
         for (auto & arg : func.arguments->children)
         {
-            while (removeInjectiveFunction(arg, data.context, function_factory))
+            while (removeInjectiveFunction(arg, data.getContext(), function_factory))
                 ;
         }
     }
diff --git a/src/Interpreters/RemoveInjectiveFunctionsVisitor.h b/src/Interpreters/RemoveInjectiveFunctionsVisitor.h
index 1adde0d35b0..a3bbd562407 100644
--- a/src/Interpreters/RemoveInjectiveFunctionsVisitor.h
+++ b/src/Interpreters/RemoveInjectiveFunctionsVisitor.h
@@ -1,7 +1,8 @@
 #pragma once
 
-#include <Parsers/IAST.h>
+#include <Interpreters/Context_fwd.h>
 #include <Interpreters/InDepthNodeVisitor.h>
+#include <Parsers/IAST.h>
 
 namespace DB
 {
@@ -12,9 +13,9 @@ class ASTFunction;
 class RemoveInjectiveFunctionsMatcher
 {
 public:
-    struct Data
+    struct Data : public WithContext
     {
-        const Context & context;
+        explicit Data(ContextPtr context_) : WithContext(context_) {}
     };
 
     static void visit(ASTPtr & ast, const Data & data);
diff --git a/src/Interpreters/ReplaceQueryParameterVisitor.cpp b/src/Interpreters/ReplaceQueryParameterVisitor.cpp
index 9b4223b8947..8d737f27e64 100644
--- a/src/Interpreters/ReplaceQueryParameterVisitor.cpp
+++ b/src/Interpreters/ReplaceQueryParameterVisitor.cpp
@@ -61,7 +61,7 @@ void ReplaceQueryParameterVisitor::visitQueryParameter(ASTPtr & ast)
     IColumn & temp_column = *temp_column_ptr;
     ReadBufferFromString read_buffer{value};
     FormatSettings format_settings;
-    data_type->deserializeAsTextEscaped(temp_column, read_buffer, format_settings);
+    data_type->getDefaultSerialization()->deserializeTextEscaped(temp_column, read_buffer, format_settings);
 
     if (!read_buffer.eof())
         throw Exception(ErrorCodes::BAD_QUERY_PARAMETER,
diff --git a/src/Interpreters/RequiredSourceColumnsVisitor.cpp b/src/Interpreters/RequiredSourceColumnsVisitor.cpp
index 54883043d30..2f2a68656bc 100644
--- a/src/Interpreters/RequiredSourceColumnsVisitor.cpp
+++ b/src/Interpreters/RequiredSourceColumnsVisitor.cpp
@@ -51,8 +51,10 @@ bool RequiredSourceColumnsMatcher::needChildVisit(const ASTPtr & node, const AST
 
     if (const auto * f = node->as<ASTFunction>())
     {
+        /// "indexHint" is a special function for index analysis.
+        /// Everything that is inside it is not calculated. See KeyCondition
         /// "lambda" visit children itself.
-        if (f->name == "lambda")
+        if (f->name == "indexHint" || f->name == "lambda")
             return false;
     }
 
diff --git a/src/Interpreters/StorageID.h b/src/Interpreters/StorageID.h
index ec5ccba37c2..2b2a8daa009 100644
--- a/src/Interpreters/StorageID.h
+++ b/src/Interpreters/StorageID.h
@@ -89,7 +89,7 @@ struct StorageID
                                           const String & config_prefix);
 
     /// If dictionary has UUID, then use it as dictionary name in ExternalLoader to allow dictionary renaming.
-    /// DatabaseCatalog::resolveDictionaryName(...) should be used to access such dictionaries by name.
+    /// ExternalDictnariesLoader::resolveDictionaryName(...) should be used to access such dictionaries by name.
     String getInternalDictionaryName() const;
 
 private:
diff --git a/src/Interpreters/SubqueryForSet.cpp b/src/Interpreters/SubqueryForSet.cpp
index 6ca0ecc50c8..a3a51210bf1 100644
--- a/src/Interpreters/SubqueryForSet.cpp
+++ b/src/Interpreters/SubqueryForSet.cpp
@@ -39,10 +39,20 @@ void SubqueryForSet::renameColumns(Block & block)
     }
 }
 
-void SubqueryForSet::setJoinActions(ExpressionActionsPtr actions)
+void SubqueryForSet::addJoinActions(ExpressionActionsPtr actions)
 {
     actions->execute(sample_block);
-    joined_block_actions = actions;
+    if (joined_block_actions == nullptr)
+    {
+        joined_block_actions = actions;
+    }
+    else
+    {
+        auto new_dag = ActionsDAG::merge(
+            std::move(*joined_block_actions->getActionsDAG().clone()),
+            std::move(*actions->getActionsDAG().clone()));
+        joined_block_actions = std::make_shared<ExpressionActions>(new_dag, actions->getSettings());
+    }
 }
 
 bool SubqueryForSet::insertJoinedBlock(Block & block)
diff --git a/src/Interpreters/SubqueryForSet.h b/src/Interpreters/SubqueryForSet.h
index fd073500dc2..a42bf296d6c 100644
--- a/src/Interpreters/SubqueryForSet.h
+++ b/src/Interpreters/SubqueryForSet.h
@@ -40,7 +40,7 @@ struct SubqueryForSet
     void makeSource(std::shared_ptr<InterpreterSelectWithUnionQuery> & interpreter,
                     NamesWithAliases && joined_block_aliases_);
 
-    void setJoinActions(ExpressionActionsPtr actions);
+    void addJoinActions(ExpressionActionsPtr actions);
 
     bool insertJoinedBlock(Block & block);
     void setTotals(Block totals);
diff --git a/src/Interpreters/SystemLog.cpp b/src/Interpreters/SystemLog.cpp
index 1667d845d77..31ceca8ec05 100644
--- a/src/Interpreters/SystemLog.cpp
+++ b/src/Interpreters/SystemLog.cpp
@@ -30,7 +30,7 @@ constexpr size_t DEFAULT_METRIC_LOG_COLLECT_INTERVAL_MILLISECONDS = 1000;
 /// Creates a system log with MergeTree engine using parameters from config
 template <typename TSystemLog>
 std::shared_ptr<TSystemLog> createSystemLog(
-    Context & context,
+    ContextPtr context,
     const String & default_database_name,
     const String & default_table_name,
     const Poco::Util::AbstractConfiguration & config,
@@ -88,7 +88,7 @@ std::shared_ptr<TSystemLog> createSystemLog(
 }
 
 
-SystemLogs::SystemLogs(Context & global_context, const Poco::Util::AbstractConfiguration & config)
+SystemLogs::SystemLogs(ContextPtr global_context, const Poco::Util::AbstractConfiguration & config)
 {
     query_log = createSystemLog<QueryLog>(global_context, "system", "query_log", config, "query_log");
     query_thread_log = createSystemLog<QueryThreadLog>(global_context, "system", "query_thread_log", config, "query_thread_log");
diff --git a/src/Interpreters/SystemLog.h b/src/Interpreters/SystemLog.h
index aa3dc113e44..aa01ca3517b 100644
--- a/src/Interpreters/SystemLog.h
+++ b/src/Interpreters/SystemLog.h
@@ -93,7 +93,7 @@ public:
 ///  because SystemLog destruction makes insert query while flushing data into underlying tables
 struct SystemLogs
 {
-    SystemLogs(Context & global_context, const Poco::Util::AbstractConfiguration & config);
+    SystemLogs(ContextPtr global_context, const Poco::Util::AbstractConfiguration & config);
     ~SystemLogs();
 
     void shutdown();
@@ -115,7 +115,7 @@ struct SystemLogs
 
 
 template <typename LogElement>
-class SystemLog : public ISystemLog, private boost::noncopyable
+class SystemLog : public ISystemLog, private boost::noncopyable, WithContext
 {
 public:
     using Self = SystemLog;
@@ -129,7 +129,7 @@ public:
       *   and new table get created - as if previous table was not exist.
       */
     SystemLog(
-        Context & context_,
+        ContextPtr context_,
         const String & database_name_,
         const String & table_name_,
         const String & storage_def_,
@@ -152,6 +152,8 @@ public:
     void shutdown() override
     {
         stopFlushThread();
+        if (table)
+            table->shutdown();
     }
 
     String getName() override
@@ -166,7 +168,6 @@ protected:
 
 private:
     /* Saving thread data */
-    Context & context;
     const StorageID table_id;
     const String storage_def;
     StoragePtr table;
@@ -184,12 +185,13 @@ private:
     // synchronous log flushing for SYSTEM FLUSH LOGS.
     uint64_t queue_front_index = 0;
     bool is_shutdown = false;
+    // A flag that says we must create the tables even if the queue is empty.
     bool is_force_prepare_tables = false;
     std::condition_variable flush_event;
     // Requested to flush logs up to this index, exclusive
-    uint64_t requested_flush_before = 0;
+    uint64_t requested_flush_up_to = 0;
     // Flushed log up to this index, exclusive
-    uint64_t flushed_before = 0;
+    uint64_t flushed_up_to = 0;
     // Logged overflow message at this queue front index
     uint64_t logged_queue_full_at_index = -1;
 
@@ -207,12 +209,13 @@ private:
 
 
 template <typename LogElement>
-SystemLog<LogElement>::SystemLog(Context & context_,
+SystemLog<LogElement>::SystemLog(
+    ContextPtr context_,
     const String & database_name_,
     const String & table_name_,
     const String & storage_def_,
     size_t flush_interval_milliseconds_)
-    : context(context_)
+    : WithContext(context_)
     , table_id(database_name_, table_name_)
     , storage_def(storage_def_)
     , flush_interval_milliseconds(flush_interval_milliseconds_)
@@ -267,8 +270,8 @@ void SystemLog<LogElement>::add(const LogElement & element)
             // It is enough to only wake the flushing thread once, after the message
             // count increases past half available size.
             const uint64_t queue_end = queue_front_index + queue.size();
-            if (requested_flush_before < queue_end)
-                requested_flush_before = queue_end;
+            if (requested_flush_up_to < queue_end)
+                requested_flush_up_to = queue_end;
 
             flush_event.notify_all();
         }
@@ -304,24 +307,36 @@ void SystemLog<LogElement>::add(const LogElement & element)
 template <typename LogElement>
 void SystemLog<LogElement>::flush(bool force)
 {
-    std::unique_lock lock(mutex);
+    uint64_t this_thread_requested_offset;
 
-    if (is_shutdown)
-        return;
-
-    const uint64_t queue_end = queue_front_index + queue.size();
-
-    is_force_prepare_tables = force;
-    if (requested_flush_before < queue_end || force)
     {
-        requested_flush_before = queue_end;
+        std::unique_lock lock(mutex);
+
+        if (is_shutdown)
+            return;
+
+        this_thread_requested_offset = queue_front_index + queue.size();
+
+        // Publish our flush request, taking care not to overwrite the requests
+        // made by other threads.
+        is_force_prepare_tables |= force;
+        requested_flush_up_to = std::max(requested_flush_up_to,
+            this_thread_requested_offset);
+
         flush_event.notify_all();
     }
 
-    // Use an arbitrary timeout to avoid endless waiting.
-    const int timeout_seconds = 60;
+    LOG_DEBUG(log, "Requested flush up to offset {}",
+        this_thread_requested_offset);
+
+    // Use an arbitrary timeout to avoid endless waiting. 60s proved to be
+    // too fast for our parallel functional tests, probably because they
+    // heavily load the disk.
+    const int timeout_seconds = 180;
+    std::unique_lock lock(mutex);
     bool result = flush_event.wait_for(lock, std::chrono::seconds(timeout_seconds),
-        [&] { return flushed_before >= queue_end && !is_force_prepare_tables; });
+        [&] { return flushed_up_to >= this_thread_requested_offset
+                && !is_force_prepare_tables; });
 
     if (!result)
     {
@@ -371,6 +386,8 @@ void SystemLog<LogElement>::savingThreadFunction()
             // The end index (exclusive, like std end()) of the messages we are
             // going to flush.
             uint64_t to_flush_end = 0;
+            // Should we prepare table even if there are no new messages.
+            bool should_prepare_tables_anyway = false;
 
             {
                 std::unique_lock lock(mutex);
@@ -378,7 +395,7 @@ void SystemLog<LogElement>::savingThreadFunction()
                     std::chrono::milliseconds(flush_interval_milliseconds),
                     [&] ()
                     {
-                        return requested_flush_before > flushed_before || is_shutdown || is_force_prepare_tables;
+                        return requested_flush_up_to > flushed_up_to || is_shutdown || is_force_prepare_tables;
                     }
                 );
 
@@ -389,18 +406,14 @@ void SystemLog<LogElement>::savingThreadFunction()
                 to_flush.resize(0);
                 queue.swap(to_flush);
 
+                should_prepare_tables_anyway = is_force_prepare_tables;
+
                 exit_this_thread = is_shutdown;
             }
 
             if (to_flush.empty())
             {
-                bool force;
-                {
-                    std::lock_guard lock(mutex);
-                    force = is_force_prepare_tables;
-                }
-
-                if (force)
+                if (should_prepare_tables_anyway)
                 {
                     prepareTable();
                     LOG_TRACE(log, "Table created (force)");
@@ -429,7 +442,8 @@ void SystemLog<LogElement>::flushImpl(const std::vector<LogElement> & to_flush,
 {
     try
     {
-        LOG_TRACE(log, "Flushing system log, {} entries to flush", to_flush.size());
+        LOG_TRACE(log, "Flushing system log, {} entries to flush up to offset {}",
+            to_flush.size(), to_flush_end);
 
         /// We check for existence of the table and create it as needed at every
         /// flush. This is done to allow user to drop the table at any moment
@@ -451,8 +465,8 @@ void SystemLog<LogElement>::flushImpl(const std::vector<LogElement> & to_flush,
         ASTPtr query_ptr(insert.release());
 
         // we need query context to do inserts to target table with MV containing subqueries or joins
-        Context insert_context(context);
-        insert_context.makeQueryContext();
+        auto insert_context = Context::createCopy(context);
+        insert_context->makeQueryContext();
 
         InterpreterInsertQuery interpreter(query_ptr, insert_context);
         BlockIO io = interpreter.execute();
@@ -468,12 +482,12 @@ void SystemLog<LogElement>::flushImpl(const std::vector<LogElement> & to_flush,
 
     {
         std::lock_guard lock(mutex);
-        flushed_before = to_flush_end;
+        flushed_up_to = to_flush_end;
         is_force_prepare_tables = false;
         flush_event.notify_all();
     }
 
-    LOG_TRACE(log, "Flushed system log");
+    LOG_TRACE(log, "Flushed system log up to offset {}", to_flush_end);
 }
 
 
@@ -482,7 +496,7 @@ void SystemLog<LogElement>::prepareTable()
 {
     String description = table_id.getNameForLogs();
 
-    table = DatabaseCatalog::instance().tryGetTable(table_id, context);
+    table = DatabaseCatalog::instance().tryGetTable(table_id, getContext());
 
     if (table)
     {
@@ -494,7 +508,8 @@ void SystemLog<LogElement>::prepareTable()
         {
             /// Rename the existing table.
             int suffix = 0;
-            while (DatabaseCatalog::instance().isTableExist({table_id.database_name, table_id.table_name + "_" + toString(suffix)}, context))
+            while (DatabaseCatalog::instance().isTableExist(
+                {table_id.database_name, table_id.table_name + "_" + toString(suffix)}, getContext()))
                 ++suffix;
 
             auto rename = std::make_shared<ASTRenameQuery>();
@@ -513,10 +528,14 @@ void SystemLog<LogElement>::prepareTable()
 
             rename->elements.emplace_back(elem);
 
-            LOG_DEBUG(log, "Existing table {} for system log has obsolete or different structure. Renaming it to {}", description, backQuoteIfNeed(to.table));
+            LOG_DEBUG(
+                log,
+                "Existing table {} for system log has obsolete or different structure. Renaming it to {}",
+                description,
+                backQuoteIfNeed(to.table));
 
-            Context query_context = context;
-            query_context.makeQueryContext();
+            auto query_context = Context::createCopy(context);
+            query_context->makeQueryContext();
             InterpreterRenameQuery(rename, query_context).execute();
 
             /// The required table will be created.
@@ -534,13 +553,14 @@ void SystemLog<LogElement>::prepareTable()
         auto create = getCreateTableQuery();
 
 
-        Context query_context = context;
-        query_context.makeQueryContext();
+        auto query_context = Context::createCopy(context);
+        query_context->makeQueryContext();
+
         InterpreterCreateQuery interpreter(create, query_context);
         interpreter.setInternal(true);
         interpreter.execute();
 
-        table = DatabaseCatalog::instance().getTable(table_id, context);
+        table = DatabaseCatalog::instance().getTable(table_id, getContext());
     }
 
     is_prepared = true;
diff --git a/src/Interpreters/TableJoin.cpp b/src/Interpreters/TableJoin.cpp
index c1777711d9e..c50c61c418c 100644
--- a/src/Interpreters/TableJoin.cpp
+++ b/src/Interpreters/TableJoin.cpp
@@ -1,5 +1,7 @@
 #include <Interpreters/TableJoin.h>
 
+#include <common/logger_useful.h>
+
 #include <Parsers/ASTExpressionList.h>
 
 #include <Core/Settings.h>
@@ -15,6 +17,11 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+    extern const int TYPE_MISMATCH;
+}
+
 TableJoin::TableJoin(const Settings & settings, VolumePtr tmp_volume_)
     : size_limits(SizeLimits{settings.max_rows_in_join, settings.max_bytes_in_join, settings.join_overflow_mode})
     , default_max_bytes(settings.default_max_bytes_in_join)
@@ -40,6 +47,10 @@ void TableJoin::resetCollected()
     columns_added_by_join.clear();
     original_names.clear();
     renames.clear();
+    left_type_map.clear();
+    right_type_map.clear();
+    left_converting_actions = nullptr;
+    right_converting_actions = nullptr;
 }
 
 void TableJoin::addUsingKey(const ASTPtr & ast)
@@ -105,14 +116,6 @@ void TableJoin::deduplicateAndQualifyColumnNames(const NameSet & left_table_colu
     columns_from_joined_table.swap(dedup_columns);
 }
 
-NameSet TableJoin::getQualifiedColumnsSet() const
-{
-    NameSet out;
-    for (const auto & names : original_names)
-        out.insert(names.first);
-    return out;
-}
-
 NamesWithAliases TableJoin::getNamesWithAliases(const NameSet & required_columns) const
 {
     NamesWithAliases out;
@@ -221,49 +224,54 @@ bool TableJoin::rightBecomeNullable(const DataTypePtr & column_type) const
 
 void TableJoin::addJoinedColumn(const NameAndTypePair & joined_column)
 {
-    if (rightBecomeNullable(joined_column.type))
-        columns_added_by_join.emplace_back(NameAndTypePair(joined_column.name, makeNullable(joined_column.type)));
-    else
-        columns_added_by_join.push_back(joined_column);
+    DataTypePtr type = joined_column.type;
+
+    if (hasUsing())
+    {
+        if (auto it = right_type_map.find(joined_column.name); it != right_type_map.end())
+            type = it->second;
+    }
+
+    if (rightBecomeNullable(type))
+        type = makeNullable(type);
+
+    columns_added_by_join.emplace_back(joined_column.name, type);
 }
 
-void TableJoin::addJoinedColumnsAndCorrectNullability(ColumnsWithTypeAndName & columns) const
+void TableJoin::addJoinedColumnsAndCorrectTypes(NamesAndTypesList & names_and_types, bool correct_nullability) const
+{
+    ColumnsWithTypeAndName columns;
+    for (auto & pair : names_and_types)
+        columns.emplace_back(nullptr, std::move(pair.type), std::move(pair.name));
+    names_and_types.clear();
+
+    addJoinedColumnsAndCorrectTypes(columns, correct_nullability);
+
+    for (auto & col : columns)
+        names_and_types.emplace_back(std::move(col.name), std::move(col.type));
+}
+
+void TableJoin::addJoinedColumnsAndCorrectTypes(ColumnsWithTypeAndName & columns, bool correct_nullability) const
 {
     for (auto & col : columns)
     {
-        if (leftBecomeNullable(col.type))
+        if (hasUsing())
+        {
+            if (auto it = left_type_map.find(col.name); it != left_type_map.end())
+                col.type = it->second;
+        }
+        if (correct_nullability && leftBecomeNullable(col.type))
         {
             /// No need to nullify constants
-            if (!(col.column && isColumnConst(*col.column)))
-            {
+            bool is_column_const = col.column && isColumnConst(*col.column);
+            if (!is_column_const)
                 col.type = makeNullable(col.type);
-            }
         }
     }
 
+    /// Types in columns_added_by_join already converted and set nullable if needed
     for (const auto & col : columns_added_by_join)
-    {
-        auto res_type = col.type;
-
-        if (rightBecomeNullable(res_type))
-            res_type = makeNullable(res_type);
-
-        columns.emplace_back(nullptr, res_type, col.name);
-    }
-}
-
-bool TableJoin::sameJoin(const TableJoin * x, const TableJoin * y)
-{
-    if (!x && !y)
-        return true;
-    if (!x || !y)
-        return false;
-
-    return x->table_join.kind == y->table_join.kind
-        && x->table_join.strictness == y->table_join.strictness
-        && x->key_names_left == y->key_names_left
-        && x->key_names_right == y->key_names_right
-        && x->columns_added_by_join == y->columns_added_by_join;
+        columns.emplace_back(nullptr, col.type, col.name);
 }
 
 bool TableJoin::sameStrictnessAndKind(ASTTableJoin::Strictness strictness_, ASTTableJoin::Kind kind_) const
@@ -336,4 +344,124 @@ bool TableJoin::allowDictJoin(const String & dict_key, const Block & sample_bloc
     return true;
 }
 
+bool TableJoin::applyJoinKeyConvert(const ColumnsWithTypeAndName & left_sample_columns, const ColumnsWithTypeAndName & right_sample_columns)
+{
+    bool need_convert = needConvert();
+    if (!need_convert && !hasUsing())
+    {
+        /// For `USING` we already inferred common type an syntax analyzer stage
+        NamesAndTypesList left_list;
+        NamesAndTypesList right_list;
+        for (const auto & col : left_sample_columns)
+            left_list.emplace_back(col.name, col.type);
+        for (const auto & col : right_sample_columns)
+            right_list.emplace_back(col.name, col.type);
+
+        need_convert = inferJoinKeyCommonType(left_list, right_list);
+    }
+
+    if (need_convert)
+    {
+        left_converting_actions = applyKeyConvertToTable(left_sample_columns, left_type_map, key_names_left);
+        right_converting_actions = applyKeyConvertToTable(right_sample_columns, right_type_map, key_names_right);
+    }
+
+    return need_convert;
+}
+
+bool TableJoin::inferJoinKeyCommonType(const NamesAndTypesList & left, const NamesAndTypesList & right)
+{
+    std::unordered_map<String, DataTypePtr> left_types;
+    for (const auto & col : left)
+    {
+        left_types[col.name] = col.type;
+    }
+
+    std::unordered_map<String, DataTypePtr> right_types;
+    for (const auto & col : right)
+    {
+        if (auto it = renames.find(col.name); it != renames.end())
+            right_types[it->second] = col.type;
+        else
+            right_types[col.name] = col.type;
+    }
+
+    for (size_t i = 0; i < key_names_left.size(); ++i)
+    {
+        auto ltype = left_types.find(key_names_left[i]);
+        auto rtype = right_types.find(key_names_right[i]);
+        if (ltype == left_types.end() || rtype == right_types.end())
+        {
+            /// Name mismatch, give up
+            left_type_map.clear();
+            right_type_map.clear();
+            return false;
+        }
+
+        if (JoinCommon::typesEqualUpToNullability(ltype->second, rtype->second))
+            continue;
+
+        DataTypePtr supertype;
+        try
+        {
+            supertype = DB::getLeastSupertype({ltype->second, rtype->second});
+        }
+        catch (DB::Exception & ex)
+        {
+            throw Exception(
+                "Type mismatch of columns to JOIN by: " +
+                    key_names_left[i] + ": " + ltype->second->getName() + " at left, " +
+                    key_names_right[i] + ": " + rtype->second->getName() + " at right. " +
+                    "Can't get supertype: " + ex.message(),
+                ErrorCodes::TYPE_MISMATCH);
+        }
+        left_type_map[key_names_left[i]] = right_type_map[key_names_right[i]] = supertype;
+    }
+
+    if (!left_type_map.empty() || !right_type_map.empty())
+    {
+        auto format_type_map = [](NameToTypeMap mapping) -> std::string
+        {
+            std::vector<std::string> text;
+            for (const auto & [k, v] : mapping)
+                text.push_back(k + ": " + v->getName());
+            return fmt::format("{}", fmt::join(text, ", "));
+        };
+        LOG_TRACE(
+            &Poco::Logger::get("TableJoin"),
+            "Infer supertype for joined columns. Left: [{}], Right: [{}]",
+            format_type_map(left_type_map),
+            format_type_map(right_type_map));
+    }
+
+    return !left_type_map.empty();
+}
+
+ActionsDAGPtr TableJoin::applyKeyConvertToTable(
+    const ColumnsWithTypeAndName & cols_src, const NameToTypeMap & type_mapping, Names & names_to_rename) const
+{
+    ColumnsWithTypeAndName cols_dst = cols_src;
+    for (auto & col : cols_dst)
+    {
+        if (auto it = type_mapping.find(col.name); it != type_mapping.end())
+        {
+            col.type = it->second;
+            col.column = nullptr;
+        }
+    }
+
+    NameToNameMap key_column_rename;
+    /// Returns converting actions for tables that need to be performed before join
+    auto dag = ActionsDAG::makeConvertingActions(
+        cols_src, cols_dst, ActionsDAG::MatchColumnsMode::Name, true, !hasUsing(), &key_column_rename);
+
+    for (auto & name : names_to_rename)
+    {
+        const auto it = key_column_rename.find(name);
+        if (it != key_column_rename.end())
+            name = it->second;
+    }
+    return dag;
+}
+
 }
diff --git a/src/Interpreters/TableJoin.h b/src/Interpreters/TableJoin.h
index 9dcbc30f07b..71a27849297 100644
--- a/src/Interpreters/TableJoin.h
+++ b/src/Interpreters/TableJoin.h
@@ -5,9 +5,11 @@
 #include <Core/SettingsEnums.h>
 #include <Parsers/ASTTablesInSelectQuery.h>
 #include <Interpreters/IJoin.h>
+#include <Interpreters/join_common.h>
 #include <Interpreters/asof.h>
 #include <DataStreams/IBlockStream_fwd.h>
 #include <DataStreams/SizeLimits.h>
+#include <DataTypes/getLeastSupertype.h>
 #include <Storages/IStorage_fwd.h>
 
 #include <utility>
@@ -32,6 +34,11 @@ using VolumePtr = std::shared_ptr<IVolume>;
 
 class TableJoin
 {
+
+public:
+    using NameToTypeMap = std::unordered_map<String, DataTypePtr>;
+
+private:
     /** Query of the form `SELECT expr(x) AS k FROM t1 ANY LEFT JOIN (SELECT expr(x) AS k FROM t2) USING k`
       * The join is made by column k.
       * During the JOIN,
@@ -59,23 +66,39 @@ class TableJoin
 
     Names key_names_left;
     Names key_names_right; /// Duplicating names are qualified.
+
     ASTs key_asts_left;
     ASTs key_asts_right;
     ASTTableJoin table_join;
+
     ASOF::Inequality asof_inequality = ASOF::Inequality::GreaterOrEquals;
 
     /// All columns which can be read from joined table. Duplicating names are qualified.
     NamesAndTypesList columns_from_joined_table;
-    /// Columns will be added to block by JOIN. It's a subset of columns_from_joined_table with corrected Nullability
+    /// Columns will be added to block by JOIN.
+    /// It's a subset of columns_from_joined_table with corrected Nullability and type (if inplace type conversion is required)
     NamesAndTypesList columns_added_by_join;
 
+    /// Target type to convert key columns before join
+    NameToTypeMap left_type_map;
+    NameToTypeMap right_type_map;
+
+    ActionsDAGPtr left_converting_actions;
+    ActionsDAGPtr right_converting_actions;
+
     /// Name -> original name. Names are the same as in columns_from_joined_table list.
     std::unordered_map<String, String> original_names;
-    /// Original name -> name. Only ranamed columns.
+    /// Original name -> name. Only renamed columns.
     std::unordered_map<String, String> renames;
 
     VolumePtr tmp_volume;
 
+    Names requiredJoinedNames() const;
+
+    /// Create converting actions and change key column names if required
+    ActionsDAGPtr applyKeyConvertToTable(
+        const ColumnsWithTypeAndName & cols_src, const NameToTypeMap & type_mapping, Names & names_to_rename) const;
+
 public:
     TableJoin() = default;
     TableJoin(const Settings &, VolumePtr tmp_volume);
@@ -125,7 +148,6 @@ public:
     bool hasUsing() const { return table_join.using_expression_list != nullptr; }
     bool hasOn() const { return table_join.on_expression != nullptr; }
 
-    NameSet getQualifiedColumnsSet() const;
     NamesWithAliases getNamesWithAliases(const NameSet & required_columns) const;
     NamesWithAliases getRequiredColumns(const Block & sample, const Names & action_required_columns) const;
 
@@ -136,7 +158,23 @@ public:
     bool leftBecomeNullable(const DataTypePtr & column_type) const;
     bool rightBecomeNullable(const DataTypePtr & column_type) const;
     void addJoinedColumn(const NameAndTypePair & joined_column);
-    void addJoinedColumnsAndCorrectNullability(ColumnsWithTypeAndName & columns) const;
+
+    void addJoinedColumnsAndCorrectTypes(NamesAndTypesList & names_and_types, bool correct_nullability = true) const;
+    void addJoinedColumnsAndCorrectTypes(ColumnsWithTypeAndName & columns, bool correct_nullability = true) const;
+
+    /// Calculates common supertypes for corresponding join key columns.
+    bool inferJoinKeyCommonType(const NamesAndTypesList & left, const NamesAndTypesList & right);
+
+    /// Calculate converting actions, rename key columns in required
+    /// For `USING` join we will convert key columns inplace and affect into types in the result table
+    /// For `JOIN ON` we will create new columns with converted keys to join by.
+    bool applyJoinKeyConvert(const ColumnsWithTypeAndName & left_sample_columns, const ColumnsWithTypeAndName & right_sample_columns);
+
+    bool needConvert() const { return !left_type_map.empty(); }
+
+    /// Key columns should be converted before join.
+    ActionsDAGPtr leftConvertingActions() const { return left_converting_actions; }
+    ActionsDAGPtr rightConvertingActions() const { return right_converting_actions; }
 
     void setAsofInequality(ASOF::Inequality inequality) { asof_inequality = inequality; }
     ASOF::Inequality getAsofInequality() { return asof_inequality; }
@@ -144,11 +182,16 @@ public:
     ASTPtr leftKeysList() const;
     ASTPtr rightKeysList() const; /// For ON syntax only
 
-    Names requiredJoinedNames() const;
     const Names & keyNamesLeft() const { return key_names_left; }
     const Names & keyNamesRight() const { return key_names_right; }
     const NamesAndTypesList & columnsFromJoinedTable() const { return columns_from_joined_table; }
-    const NamesAndTypesList & columnsAddedByJoin() const { return columns_added_by_join; }
+    Names columnsAddedByJoin() const
+    {
+        Names res;
+        for (const auto & col : columns_added_by_join)
+            res.push_back(col.name);
+        return res;
+    }
 
     /// StorageJoin overrides key names (cause of different names qualification)
     void setRightKeys(const Names & keys) { key_names_right = keys; }
@@ -156,8 +199,6 @@ public:
     /// Split key and other columns by keys name list
     void splitAdditionalColumns(const Block & sample_block, Block & block_keys, Block & block_others) const;
     Block getRequiredRightKeys(const Block & right_table_keys, std::vector<String> & keys_sources) const;
-
-    static bool sameJoin(const TableJoin * x, const TableJoin * y);
 };
 
 }
diff --git a/src/Interpreters/TextLog.cpp b/src/Interpreters/TextLog.cpp
index f60b6acae6f..f5a0ce51d49 100644
--- a/src/Interpreters/TextLog.cpp
+++ b/src/Interpreters/TextLog.cpp
@@ -55,7 +55,7 @@ void TextLogElement::appendToBlock(MutableColumns & columns) const
 {
     size_t i = 0;
 
-    columns[i++]->insert(DateLUT::instance().toDayNum(event_time));
+    columns[i++]->insert(DateLUT::instance().toDayNum(event_time).toUnderType());
     columns[i++]->insert(event_time);
     columns[i++]->insert(event_time_microseconds);
     columns[i++]->insert(microseconds);
@@ -74,7 +74,7 @@ void TextLogElement::appendToBlock(MutableColumns & columns) const
     columns[i++]->insert(source_line);
 }
 
-TextLog::TextLog(Context & context_, const String & database_name_,
+TextLog::TextLog(ContextPtr context_, const String & database_name_,
         const String & table_name_, const String & storage_def_,
         size_t flush_interval_milliseconds_)
   : SystemLog<TextLogElement>(context_, database_name_, table_name_,
diff --git a/src/Interpreters/TextLog.h b/src/Interpreters/TextLog.h
index da678868be3..7ff55128a90 100644
--- a/src/Interpreters/TextLog.h
+++ b/src/Interpreters/TextLog.h
@@ -33,7 +33,7 @@ class TextLog : public SystemLog<TextLogElement>
 {
 public:
     TextLog(
-        Context & context_,
+        ContextPtr context_,
         const String & database_name_,
         const String & table_name_,
         const String & storage_def_,
diff --git a/src/Interpreters/ThreadStatusExt.cpp b/src/Interpreters/ThreadStatusExt.cpp
index 8a979721290..c04534e11a1 100644
--- a/src/Interpreters/ThreadStatusExt.cpp
+++ b/src/Interpreters/ThreadStatusExt.cpp
@@ -33,9 +33,11 @@ namespace ErrorCodes
 
 void ThreadStatus::applyQuerySettings()
 {
-    const Settings & settings = query_context->getSettingsRef();
+    auto query_context_ptr = query_context.lock();
+    assert(query_context_ptr);
+    const Settings & settings = query_context_ptr->getSettingsRef();
 
-    query_id = query_context->getCurrentQueryId();
+    query_id = query_context_ptr->getCurrentQueryId();
     initQueryProfiler();
 
     untracked_memory_limit = settings.max_untracked_memory;
@@ -58,26 +60,26 @@ void ThreadStatus::applyQuerySettings()
 }
 
 
-void ThreadStatus::attachQueryContext(Context & query_context_)
+void ThreadStatus::attachQueryContext(ContextPtr query_context_)
 {
-    query_context = &query_context_;
+    query_context = query_context_;
 
-    if (!global_context)
-        global_context = &query_context->getGlobalContext();
+    if (global_context.expired())
+        global_context = query_context_->getGlobalContext();
 
     if (thread_group)
     {
         std::lock_guard lock(thread_group->mutex);
 
         thread_group->query_context = query_context;
-        if (!thread_group->global_context)
+        if (thread_group->global_context.expired())
             thread_group->global_context = global_context;
     }
 
     // Generate new span for thread manually here, because we can't depend
     // on OpenTelemetrySpanHolder due to link order issues.
     // FIXME why and how is this different from setupState()?
-    thread_trace_context = query_context->query_trace_context;
+    thread_trace_context = query_context_->query_trace_context;
     if (thread_trace_context.trace_id)
     {
         thread_trace_context.span_id = thread_local_rng();
@@ -113,17 +115,17 @@ void ThreadStatus::setupState(const ThreadGroupStatusPtr & thread_group_)
         fatal_error_callback = thread_group->fatal_error_callback;
         query_context = thread_group->query_context;
 
-        if (!global_context)
+        if (global_context.expired())
             global_context = thread_group->global_context;
     }
 
-    if (query_context)
+    if (auto query_context_ptr = query_context.lock())
     {
         applyQuerySettings();
 
         // Generate new span for thread manually here, because we can't depend
         // on OpenTelemetrySpanHolder due to link order issues.
-        thread_trace_context = query_context->query_trace_context;
+        thread_trace_context = query_context_ptr->query_trace_context;
         if (thread_trace_context.trace_id)
         {
             thread_trace_context.span_id = thread_local_rng();
@@ -201,9 +203,9 @@ void ThreadStatus::initPerformanceCounters()
     // query_start_time_nanoseconds cannot be used here since RUsageCounters expect CLOCK_MONOTONIC
     *last_rusage = RUsageCounters::current();
 
-    if (query_context)
+    if (auto query_context_ptr = query_context.lock())
     {
-        const Settings & settings = query_context->getSettingsRef();
+        const Settings & settings = query_context_ptr->getSettingsRef();
         if (settings.metrics_perf_events_enabled)
         {
             try
@@ -246,8 +248,8 @@ void ThreadStatus::finalizePerformanceCounters()
     // 'select 1 settings metrics_perf_events_enabled = 1', I still get
     // query_context->getSettingsRef().metrics_perf_events_enabled == 0 *shrug*.
     bool close_perf_descriptors = true;
-    if (query_context)
-        close_perf_descriptors = !query_context->getSettingsRef().metrics_perf_events_enabled;
+    if (auto query_context_ptr = query_context.lock())
+        close_perf_descriptors = !query_context_ptr->getSettingsRef().metrics_perf_events_enabled;
 
     try
     {
@@ -262,17 +264,19 @@ void ThreadStatus::finalizePerformanceCounters()
 
     try
     {
-        if (global_context && query_context)
+        auto global_context_ptr = global_context.lock();
+        auto query_context_ptr = query_context.lock();
+        if (global_context_ptr && query_context_ptr)
         {
-            const auto & settings = query_context->getSettingsRef();
+            const auto & settings = query_context_ptr->getSettingsRef();
             if (settings.log_queries && settings.log_query_threads)
             {
                 const auto now = std::chrono::system_clock::now();
                 Int64 query_duration_ms = (time_in_microseconds(now) - query_start_time_microseconds) / 1000;
                 if (query_duration_ms >= settings.log_queries_min_query_duration_ms.totalMilliseconds())
                 {
-                    if (auto thread_log = global_context->getQueryThreadLog())
-                        logToQueryThreadLog(*thread_log, query_context->getCurrentDatabase(), now);
+                    if (auto thread_log = global_context_ptr->getQueryThreadLog())
+                        logToQueryThreadLog(*thread_log, query_context_ptr->getCurrentDatabase(), now);
                 }
             }
         }
@@ -286,10 +290,13 @@ void ThreadStatus::finalizePerformanceCounters()
 void ThreadStatus::initQueryProfiler()
 {
     /// query profilers are useless without trace collector
-    if (!global_context || !global_context->hasTraceCollector())
+    auto global_context_ptr = global_context.lock();
+    if (!global_context_ptr || !global_context_ptr->hasTraceCollector())
         return;
 
-    const auto & settings = query_context->getSettingsRef();
+    auto query_context_ptr = query_context.lock();
+    assert(query_context_ptr);
+    const auto & settings = query_context_ptr->getSettingsRef();
 
     try
     {
@@ -316,6 +323,8 @@ void ThreadStatus::finalizeQueryProfiler()
 
 void ThreadStatus::detachQuery(bool exit_if_already_detached, bool thread_exits)
 {
+    MemoryTracker::LockExceptionInThread lock(VariableContext::Global);
+
     if (exit_if_already_detached && thread_state == ThreadState::DetachedFromQuery)
     {
         thread_state = thread_exits ? ThreadState::Died : ThreadState::DetachedFromQuery;
@@ -325,9 +334,10 @@ void ThreadStatus::detachQuery(bool exit_if_already_detached, bool thread_exits)
     assertState({ThreadState::AttachedToQuery}, __PRETTY_FUNCTION__);
 
     std::shared_ptr<OpenTelemetrySpanLog> opentelemetry_span_log;
-    if (thread_trace_context.trace_id && query_context)
+    auto query_context_ptr = query_context.lock();
+    if (thread_trace_context.trace_id && query_context_ptr)
     {
-        opentelemetry_span_log = query_context->getOpenTelemetrySpanLog();
+        opentelemetry_span_log = query_context_ptr->getOpenTelemetrySpanLog();
     }
 
     if (opentelemetry_span_log)
@@ -347,7 +357,8 @@ void ThreadStatus::detachQuery(bool exit_if_already_detached, bool thread_exits)
         // is going to fail, because we're going to reset it to zero later in
         // this function.
         span.span_id = thread_trace_context.span_id;
-        span.parent_span_id = query_context->query_trace_context.span_id;
+        assert(query_context_ptr);
+        span.parent_span_id = query_context_ptr->query_trace_context.span_id;
         span.operation_name = getThreadName();
         span.start_time_us = query_start_time_microseconds;
         span.finish_time_us =
@@ -370,7 +381,7 @@ void ThreadStatus::detachQuery(bool exit_if_already_detached, bool thread_exits)
     memory_tracker.setParent(thread_group->memory_tracker.getParent());
 
     query_id.clear();
-    query_context = nullptr;
+    query_context.reset();
     thread_trace_context.trace_id = 0;
     thread_trace_context.span_id = 0;
     thread_group.reset();
@@ -429,11 +440,12 @@ void ThreadStatus::logToQueryThreadLog(QueryThreadLog & thread_log, const String
         }
     }
 
-    if (query_context)
+    auto query_context_ptr = query_context.lock();
+    if (query_context_ptr)
     {
-        elem.client_info = query_context->getClientInfo();
+        elem.client_info = query_context_ptr->getClientInfo();
 
-        if (query_context->getSettingsRef().log_profile_events != 0)
+        if (query_context_ptr->getSettingsRef().log_profile_events != 0)
         {
             /// NOTE: Here we are in the same thread, so we can make memcpy()
             elem.profile_counters = std::make_shared<ProfileEvents::Counters>(performance_counters.getPartiallyAtomicSnapshot());
@@ -467,7 +479,7 @@ void CurrentThread::attachToIfDetached(const ThreadGroupStatusPtr & thread_group
     current_thread->deleter = CurrentThread::defaultThreadDeleter;
 }
 
-void CurrentThread::attachQueryContext(Context & query_context)
+void CurrentThread::attachQueryContext(ContextPtr query_context)
 {
     if (unlikely(!current_thread))
         return;
@@ -496,12 +508,12 @@ void CurrentThread::detachQueryIfNotDetached()
 }
 
 
-CurrentThread::QueryScope::QueryScope(Context & query_context)
+CurrentThread::QueryScope::QueryScope(ContextPtr query_context)
 {
     CurrentThread::initializeQuery();
     CurrentThread::attachQueryContext(query_context);
-    if (!query_context.hasQueryContext())
-        query_context.makeQueryContext();
+    if (!query_context->hasQueryContext())
+        query_context->makeQueryContext();
 }
 
 void CurrentThread::QueryScope::logPeakMemoryUsage()
diff --git a/src/Interpreters/TraceLog.cpp b/src/Interpreters/TraceLog.cpp
index 40bcc0db445..fe7512f2f00 100644
--- a/src/Interpreters/TraceLog.cpp
+++ b/src/Interpreters/TraceLog.cpp
@@ -42,7 +42,7 @@ void TraceLogElement::appendToBlock(MutableColumns & columns) const
 {
     size_t i = 0;
 
-    columns[i++]->insert(DateLUT::instance().toDayNum(event_time));
+    columns[i++]->insert(DateLUT::instance().toDayNum(event_time).toUnderType());
     columns[i++]->insert(event_time);
     columns[i++]->insert(event_time_microseconds);
     columns[i++]->insert(timestamp_ns);
diff --git a/src/Interpreters/TreeOptimizer.cpp b/src/Interpreters/TreeOptimizer.cpp
index 5c6f76c8c29..5b06c00435a 100644
--- a/src/Interpreters/TreeOptimizer.cpp
+++ b/src/Interpreters/TreeOptimizer.cpp
@@ -81,7 +81,7 @@ void appendUnusedGroupByColumn(ASTSelectQuery * select_query, const NameSet & so
 }
 
 /// Eliminates injective function calls and constant expressions from group by statement.
-void optimizeGroupBy(ASTSelectQuery * select_query, const NameSet & source_columns, const Context & context)
+void optimizeGroupBy(ASTSelectQuery * select_query, const NameSet & source_columns, ContextPtr context)
 {
     const FunctionFactory & function_factory = FunctionFactory::instance();
 
@@ -135,8 +135,7 @@ void optimizeGroupBy(ASTSelectQuery * select_query, const NameSet & source_colum
                 const auto & dict_name = dict_name_ast->value.safeGet<String>();
                 const auto & attr_name = attr_name_ast->value.safeGet<String>();
 
-                String resolved_name = DatabaseCatalog::instance().resolveDictionaryName(dict_name);
-                const auto & dict_ptr = context.getExternalDictionariesLoader().getDictionary(resolved_name);
+                const auto & dict_ptr = context->getExternalDictionariesLoader().getDictionary(dict_name, context);
                 if (!dict_ptr->isInjective(attr_name))
                 {
                     ++i;
@@ -271,7 +270,7 @@ void optimizeDuplicatesInOrderBy(const ASTSelectQuery * select_query)
 }
 
 /// Optimize duplicate ORDER BY
-void optimizeDuplicateOrderBy(ASTPtr & query, const Context & context)
+void optimizeDuplicateOrderBy(ASTPtr & query, ContextPtr context)
 {
     DuplicateOrderByVisitor::Data order_by_data{context};
     DuplicateOrderByVisitor(order_by_data).visit(query);
@@ -397,7 +396,7 @@ void optimizeDuplicateDistinct(ASTSelectQuery & select)
 
 /// Replace monotonous functions in ORDER BY if they don't participate in GROUP BY expression,
 /// has a single argument and not an aggregate functions.
-void optimizeMonotonousFunctionsInOrderBy(ASTSelectQuery * select_query, const Context & context,
+void optimizeMonotonousFunctionsInOrderBy(ASTSelectQuery * select_query, ContextPtr context,
                                           const TablesWithColumns & tables_with_columns,
                                           const Names & sorting_key_columns)
 {
@@ -449,7 +448,7 @@ void optimizeMonotonousFunctionsInOrderBy(ASTSelectQuery * select_query, const C
 /// Optimize ORDER BY x, y, f(x), g(x, y), f(h(x)), t(f(x), g(x)) into ORDER BY x, y
 /// in case if f(), g(), h(), t() are deterministic (in scope of query).
 /// Don't optimize ORDER BY f(x), g(x), x even if f(x) is bijection for x or g(x).
-void optimizeRedundantFunctionsInOrderBy(const ASTSelectQuery * select_query, const Context & context)
+void optimizeRedundantFunctionsInOrderBy(const ASTSelectQuery * select_query, ContextPtr context)
 {
     const auto & order_by = select_query->orderBy();
     if (!order_by)
@@ -562,9 +561,9 @@ void optimizeCountConstantAndSumOne(ASTPtr & query)
 }
 
 
-void optimizeInjectiveFunctionsInsideUniq(ASTPtr & query, const Context & context)
+void optimizeInjectiveFunctionsInsideUniq(ASTPtr & query, ContextPtr context)
 {
-    RemoveInjectiveFunctionsVisitor::Data data = {context};
+    RemoveInjectiveFunctionsVisitor::Data data(context);
     RemoveInjectiveFunctionsVisitor(data).visit(query);
 }
 
@@ -593,10 +592,10 @@ void TreeOptimizer::optimizeIf(ASTPtr & query, Aliases & aliases, bool if_chain_
 
 void TreeOptimizer::apply(ASTPtr & query, Aliases & aliases, const NameSet & source_columns_set,
                           const std::vector<TableWithColumnNamesAndTypes> & tables_with_columns,
-                          const Context & context, const StorageMetadataPtr & metadata_snapshot,
+                          ContextPtr context, const StorageMetadataPtr & metadata_snapshot,
                           bool & rewrite_subqueries)
 {
-    const auto & settings = context.getSettingsRef();
+    const auto & settings = context->getSettingsRef();
 
     auto * select_query = query->as<ASTSelectQuery>();
     if (!select_query)
diff --git a/src/Interpreters/TreeOptimizer.h b/src/Interpreters/TreeOptimizer.h
index a10dfc57451..b268b230f4e 100644
--- a/src/Interpreters/TreeOptimizer.h
+++ b/src/Interpreters/TreeOptimizer.h
@@ -1,13 +1,13 @@
 #pragma once
 
-#include <Parsers/IAST_fwd.h>
 #include <Interpreters/Aliases.h>
+#include <Interpreters/Context_fwd.h>
 #include <Interpreters/DatabaseAndTableWithAlias.h>
+#include <Parsers/IAST_fwd.h>
 
 namespace DB
 {
 
-class Context;
 struct StorageInMemoryMetadata;
 using StorageMetadataPtr = std::shared_ptr<const StorageInMemoryMetadata>;
 
@@ -16,10 +16,14 @@ using StorageMetadataPtr = std::shared_ptr<const StorageInMemoryMetadata>;
 class TreeOptimizer
 {
 public:
-    static void apply(ASTPtr & query, Aliases & aliases, const NameSet & source_columns_set,
-                      const std::vector<TableWithColumnNamesAndTypes> & tables_with_columns,
-                      const Context & context, const StorageMetadataPtr & metadata_snapshot,
-                      bool & rewrite_subqueries);
+    static void apply(
+        ASTPtr & query,
+        Aliases & aliases,
+        const NameSet & source_columns_set,
+        const std::vector<TableWithColumnNamesAndTypes> & tables_with_columns,
+        ContextPtr context,
+        const StorageMetadataPtr & metadata_snapshot,
+        bool & rewrite_subqueries);
 
     static void optimizeIf(ASTPtr & query, Aliases & aliases, bool if_chain_to_multiif);
 };
diff --git a/src/Interpreters/TreeRewriter.cpp b/src/Interpreters/TreeRewriter.cpp
index 37f49874e0a..324a773fbc2 100644
--- a/src/Interpreters/TreeRewriter.cpp
+++ b/src/Interpreters/TreeRewriter.cpp
@@ -26,6 +26,7 @@
 #include <Parsers/ASTSelectQuery.h>
 #include <Parsers/ASTTablesInSelectQuery.h>
 #include <Parsers/queryToString.h>
+#include <Parsers/ASTLiteral.h>
 
 #include <DataTypes/NestedUtils.h>
 #include <DataTypes/DataTypeNullable.h>
@@ -181,8 +182,72 @@ struct CustomizeAggregateFunctionsMoveSuffixData
     }
 };
 
+struct FuseSumCountAggregates
+{
+    std::vector<ASTFunction *> sums {};
+    std::vector<ASTFunction *> counts {};
+    std::vector<ASTFunction *> avgs {};
+
+    void addFuncNode(ASTFunction * func)
+    {
+        if (func->name == "sum")
+            sums.push_back(func);
+        else if (func->name == "count")
+            counts.push_back(func);
+        else
+        {
+            assert(func->name == "avg");
+            avgs.push_back(func);
+        }
+    }
+
+    bool canBeFused() const
+    {
+        // Need at least two different kinds of functions to fuse.
+        if (sums.empty() && counts.empty())
+            return false;
+        if (sums.empty() && avgs.empty())
+            return false;
+        if (counts.empty() && avgs.empty())
+            return false;
+        return true;
+    }
+};
+
+struct FuseSumCountAggregatesVisitorData
+{
+    using TypeToVisit = ASTFunction;
+
+    std::unordered_map<String, FuseSumCountAggregates> fuse_map;
+
+    void visit(ASTFunction & func, ASTPtr &)
+    {
+        if (func.name == "sum" || func.name == "avg" || func.name == "count")
+        {
+            if (func.arguments->children.empty())
+                return;
+
+            // Probably we can extend it to match count() for non-nullable argument
+            // to sum/avg with any other argument. Now we require strict match.
+            const auto argument = func.arguments->children.at(0)->getColumnName();
+            auto it = fuse_map.find(argument);
+            if (it != fuse_map.end())
+            {
+                it->second.addFuncNode(&func);
+            }
+            else
+            {
+                FuseSumCountAggregates funcs{};
+                funcs.addFuncNode(&func);
+                fuse_map[argument] = funcs;
+            }
+        }
+    }
+};
+
 using CustomizeAggregateFunctionsOrNullVisitor = InDepthNodeVisitor<OneTypeMatcher<CustomizeAggregateFunctionsSuffixData>, true>;
 using CustomizeAggregateFunctionsMoveOrNullVisitor = InDepthNodeVisitor<OneTypeMatcher<CustomizeAggregateFunctionsMoveSuffixData>, true>;
+using FuseSumCountAggregatesVisitor = InDepthNodeVisitor<OneTypeMatcher<FuseSumCountAggregatesVisitorData>, true>;
 
 /// Translate qualified names such as db.table.column, table.column, table_alias.column to names' normal form.
 /// Expand asterisks and qualified asterisks with column names.
@@ -200,6 +265,49 @@ void translateQualifiedNames(ASTPtr & query, const ASTSelectQuery & select_query
         throw Exception("Empty list of columns in SELECT query", ErrorCodes::EMPTY_LIST_OF_COLUMNS_QUERIED);
 }
 
+// Replaces one avg/sum/count function with an appropriate expression with
+// sumCount().
+void replaceWithSumCount(String column_name, ASTFunction & func)
+{
+    auto func_base = makeASTFunction("sumCount", std::make_shared<ASTIdentifier>(column_name));
+    auto exp_list = std::make_shared<ASTExpressionList>();
+    if (func.name == "sum" || func.name == "count")
+    {
+        /// Rewrite "sum" to sumCount().1, rewrite "count" to sumCount().2
+        UInt8 idx = (func.name == "sum" ? 1 : 2);
+        func.name = "tupleElement";
+        exp_list->children.push_back(func_base);
+        exp_list->children.push_back(std::make_shared<ASTLiteral>(idx));
+    }
+    else
+    {
+        /// Rewrite "avg" to sumCount().1 / sumCount().2
+        auto new_arg1 = makeASTFunction("tupleElement", func_base, std::make_shared<ASTLiteral>(UInt8(1)));
+        auto new_arg2 = makeASTFunction("tupleElement", func_base, std::make_shared<ASTLiteral>(UInt8(2)));
+        func.name = "divide";
+        exp_list->children.push_back(new_arg1);
+        exp_list->children.push_back(new_arg2);
+    }
+    func.arguments = exp_list;
+    func.children.push_back(func.arguments);
+}
+
+void fuseSumCountAggregates(std::unordered_map<String, FuseSumCountAggregates> & fuse_map)
+{
+    for (auto & it : fuse_map)
+    {
+        if (it.second.canBeFused())
+        {
+            for (auto & func: it.second.sums)
+                replaceWithSumCount(it.first, *func);
+            for (auto & func: it.second.avgs)
+                replaceWithSumCount(it.first, *func);
+            for (auto & func: it.second.counts)
+                replaceWithSumCount(it.first, *func);
+        }
+    }
+}
+
 bool hasArrayJoin(const ASTPtr & ast)
 {
     if (const ASTFunction * function = ast->as<ASTFunction>())
@@ -293,13 +401,11 @@ void removeUnneededColumnsFromSelectClause(const ASTSelectQuery * select_query,
         else
         {
             ASTFunction * func = elem->as<ASTFunction>();
+
+            /// Never remove untuple. It's result column may be in required columns.
+            /// It is not easy to analyze untuple here, because types were not calculated yes.
             if (func && func->name == "untuple")
-                for (const auto & col : required_result_columns)
-                    if (col.rfind("_ut_", 0) == 0)
-                    {
-                        new_elements.push_back(elem);
-                        break;
-                    }
+                new_elements.push_back(elem);
         }
     }
 
@@ -307,10 +413,10 @@ void removeUnneededColumnsFromSelectClause(const ASTSelectQuery * select_query,
 }
 
 /// Replacing scalar subqueries with constant values.
-void executeScalarSubqueries(ASTPtr & query, const Context & context, size_t subquery_depth, Scalars & scalars, bool only_analyze)
+void executeScalarSubqueries(ASTPtr & query, ContextPtr context, size_t subquery_depth, Scalars & scalars, bool only_analyze)
 {
     LogAST log;
-    ExecuteScalarSubqueriesVisitor::Data visitor_data{context, subquery_depth, scalars, only_analyze};
+    ExecuteScalarSubqueriesVisitor::Data visitor_data{WithContext{context}, subquery_depth, scalars, only_analyze};
     ExecuteScalarSubqueriesVisitor(visitor_data, log.stream()).visit(query);
 }
 
@@ -405,51 +511,41 @@ void setJoinStrictness(ASTSelectQuery & select_query, JoinStrictness join_defaul
 
 /// Find the columns that are obtained by JOIN.
 void collectJoinedColumns(TableJoin & analyzed_join, const ASTSelectQuery & select_query,
-                          const TablesWithColumns & tables, const Aliases & aliases, ASTPtr & new_where_conditions)
+                          const TablesWithColumns & tables, const Aliases & aliases)
 {
     const ASTTablesInSelectQueryElement * node = select_query.join();
-    if (!node)
+    if (!node || tables.size() < 2)
         return;
 
-    auto & table_join = node->table_join->as<ASTTableJoin &>();
+    const auto & table_join = node->table_join->as<ASTTableJoin &>();
 
     if (table_join.using_expression_list)
     {
         const auto & keys = table_join.using_expression_list->as<ASTExpressionList &>();
         for (const auto & key : keys.children)
             analyzed_join.addUsingKey(key);
+
+        /// `USING` semantic allows to have columns with changed types in result table.
+        /// `JOIN ON` should preserve types from original table
+        /// We can infer common type on syntax stage for `USING` because join is performed only by columns (not expressions)
+        /// We need to know  changed types in result tables because some analysis (e.g. analyzeAggregation) performed before join
+        /// For `JOIN ON expr1 == expr2` we will infer common type later in ExpressionAnalyzer, when types of expression will be known
+        analyzed_join.inferJoinKeyCommonType(tables[0].columns, tables[1].columns);
     }
     else if (table_join.on_expression)
     {
         bool is_asof = (table_join.strictness == ASTTableJoin::Strictness::Asof);
 
-        CollectJoinOnKeysVisitor::Data data{analyzed_join, tables[0], tables[1], aliases, is_asof, table_join.kind};
+        CollectJoinOnKeysVisitor::Data data{analyzed_join, tables[0], tables[1], aliases, is_asof};
         CollectJoinOnKeysVisitor(data).visit(table_join.on_expression);
         if (!data.has_some)
             throw Exception("Cannot get JOIN keys from JOIN ON section: " + queryToString(table_join.on_expression),
                             ErrorCodes::INVALID_JOIN_ON_EXPRESSION);
         if (is_asof)
-        {
             data.asofToJoinKeys();
-        }
-        else if (data.new_on_expression)
-        {
-            table_join.on_expression = data.new_on_expression;
-            new_where_conditions = data.new_where_conditions;
-        }
     }
 }
 
-/// Move joined key related to only one table to WHERE clause
-void moveJoinedKeyToWhere(ASTSelectQuery * select_query, ASTPtr & new_where_conditions)
-{
-    if (select_query->where())
-        select_query->setExpression(ASTSelectQuery::Expression::WHERE,
-            makeASTFunction("and", new_where_conditions, select_query->where()));
-    else
-        select_query->setExpression(ASTSelectQuery::Expression::WHERE, new_where_conditions->clone());
-}
-
 
 std::vector<const ASTFunction *> getAggregates(ASTPtr & query, const ASTSelectQuery & select_query)
 {
@@ -571,7 +667,6 @@ void TreeRewriterResult::collectUsedColumns(const ASTPtr & query, bool is_select
         source_column_names.insert(column.name);
 
     NameSet required = columns_context.requiredColumns();
-
     if (columns_context.has_table_join)
     {
         NameSet available_columns;
@@ -656,7 +751,10 @@ void TreeRewriterResult::collectUsedColumns(const ASTPtr & query, bool is_select
         const auto & partition_desc = metadata_snapshot->getPartitionKey();
         if (partition_desc.expression)
         {
-            const auto & partition_source_columns = partition_desc.expression->getRequiredColumns();
+            auto partition_source_columns = partition_desc.expression->getRequiredColumns();
+            partition_source_columns.push_back("_part");
+            partition_source_columns.push_back("_partition_id");
+            partition_source_columns.push_back("_part_uuid");
             optimize_trivial_count = true;
             for (const auto & required_column : required)
             {
@@ -715,18 +813,17 @@ void TreeRewriterResult::collectUsedColumns(const ASTPtr & query, bool is_select
 
         if (storage)
         {
-            String hint_name{};
+            std::vector<String> hint_name{};
             for (const auto & name : columns_context.requiredColumns())
             {
                 auto hints = storage->getHints(name);
-                if (!hints.empty())
-                    hint_name = hint_name + " '" + toString(hints) + "'";
+                hint_name.insert(hint_name.end(), hints.begin(), hints.end());
             }
 
             if (!hint_name.empty())
             {
                 ss << ", maybe you meant: ";
-                ss << hint_name;
+                ss << toString(hint_name);
             }
         }
         else
@@ -781,7 +878,7 @@ TreeRewriterResultPtr TreeRewriter::analyzeSelect(
     size_t subquery_depth = select_options.subquery_depth;
     bool remove_duplicates = select_options.remove_duplicates;
 
-    const auto & settings = context.getSettingsRef();
+    const auto & settings = getContext()->getSettingsRef();
 
     const NameSet & source_columns_set = result.source_columns_set;
 
@@ -808,7 +905,14 @@ TreeRewriterResultPtr TreeRewriter::analyzeSelect(
     /// Optimizes logical expressions.
     LogicalExpressionsOptimizer(select_query, settings.optimize_min_equality_disjunction_chain_length.value).perform();
 
-    normalize(query, result.aliases, settings);
+    NameSet all_source_columns_set = source_columns_set;
+    if (table_join)
+    {
+        for (const auto & [name, _] : table_join->columns_from_joined_table)
+            all_source_columns_set.insert(name);
+    }
+
+    normalize(query, result.aliases, all_source_columns_set, settings);
 
     /// Remove unneeded columns according to 'required_result_columns'.
     /// Leave all selected columns in case of DISTINCT; columns that contain arrayJoin function inside.
@@ -817,25 +921,22 @@ TreeRewriterResultPtr TreeRewriter::analyzeSelect(
     removeUnneededColumnsFromSelectClause(select_query, required_result_columns, remove_duplicates);
 
     /// Executing scalar subqueries - replacing them with constant values.
-    executeScalarSubqueries(query, context, subquery_depth, result.scalars, select_options.only_analyze);
+    executeScalarSubqueries(query, getContext(), subquery_depth, result.scalars, select_options.only_analyze);
 
-    TreeOptimizer::apply(query, result.aliases, source_columns_set, tables_with_columns, context, result.metadata_snapshot, result.rewrite_subqueries);
+    TreeOptimizer::apply(
+        query, result.aliases, source_columns_set, tables_with_columns, getContext(), result.metadata_snapshot, result.rewrite_subqueries);
 
     /// array_join_alias_to_name, array_join_result_to_source.
     getArrayJoinedColumns(query, result, select_query, result.source_columns, source_columns_set);
 
     setJoinStrictness(*select_query, settings.join_default_strictness, settings.any_join_distinct_right_table_keys,
                         result.analyzed_join->table_join);
-
-    ASTPtr new_where_condition = nullptr;
-    collectJoinedColumns(*result.analyzed_join, *select_query, tables_with_columns, result.aliases, new_where_condition);
-    if (new_where_condition)
-        moveJoinedKeyToWhere(select_query, new_where_condition);
+    collectJoinedColumns(*result.analyzed_join, *select_query, tables_with_columns, result.aliases);
 
     /// rewrite filters for select query, must go after getArrayJoinedColumns
     if (settings.optimize_respect_aliases && result.metadata_snapshot)
     {
-        replaceAliasColumnsInQuery(query, result.metadata_snapshot->getColumns(), result.getArrayJoinSourceNameSet(), context);
+        replaceAliasColumnsInQuery(query, result.metadata_snapshot->getColumns(), result.getArrayJoinSourceNameSet(), getContext());
     }
 
     result.aggregates = getAggregates(query, *select_query);
@@ -862,14 +963,14 @@ TreeRewriterResultPtr TreeRewriter::analyze(
     if (query->as<ASTSelectQuery>())
         throw Exception("Not select analyze for select asts.", ErrorCodes::LOGICAL_ERROR);
 
-    const auto & settings = context.getSettingsRef();
+    const auto & settings = getContext()->getSettingsRef();
 
     TreeRewriterResult result(source_columns, storage, metadata_snapshot, false);
 
-    normalize(query, result.aliases, settings);
+    normalize(query, result.aliases, result.source_columns_set, settings);
 
     /// Executing scalar subqueries. Column defaults could be a scalar subquery.
-    executeScalarSubqueries(query, context, 0, result.scalars, false);
+    executeScalarSubqueries(query, getContext(), 0, result.scalars, false);
 
     TreeOptimizer::optimizeIf(query, result.aliases, settings.optimize_if_chain_to_multiif);
 
@@ -891,7 +992,7 @@ TreeRewriterResultPtr TreeRewriter::analyze(
     return std::make_shared<const TreeRewriterResult>(result);
 }
 
-void TreeRewriter::normalize(ASTPtr & query, Aliases & aliases, const Settings & settings)
+void TreeRewriter::normalize(ASTPtr & query, Aliases & aliases, const NameSet & source_columns_set, const Settings & settings)
 {
     CustomizeCountDistinctVisitor::Data data_count_distinct{settings.count_distinct_implementation};
     CustomizeCountDistinctVisitor(data_count_distinct).visit(query);
@@ -917,7 +1018,18 @@ void TreeRewriter::normalize(ASTPtr & query, Aliases & aliases, const Settings &
         CustomizeGlobalNotInVisitor(data_global_not_null_in).visit(query);
     }
 
-    // Rewrite all aggregate functions to add -OrNull suffix to them
+    // Try to fuse sum/avg/count with identical arguments to one sumCount call,
+    // if we have at least two different functions. E.g. we will replace sum(x)
+    // and count(x) with sumCount(x).1 and sumCount(x).2, and sumCount() will
+    // be calculated only once because of CSE.
+    if (settings.optimize_fuse_sum_count_avg)
+    {
+        FuseSumCountAggregatesVisitor::Data data;
+        FuseSumCountAggregatesVisitor(data).visit(query);
+        fuseSumCountAggregates(data.fuse_map);
+    }
+
+    /// Rewrite all aggregate functions to add -OrNull suffix to them
     if (settings.aggregate_functions_null_for_empty)
     {
         CustomizeAggregateFunctionsOrNullVisitor::Data data_or_null{"OrNull"};
@@ -940,7 +1052,7 @@ void TreeRewriter::normalize(ASTPtr & query, Aliases & aliases, const Settings &
         FunctionNameNormalizer().visit(query.get());
 
     /// Common subexpression elimination. Rewrite rules.
-    QueryNormalizer::Data normalizer_data(aliases, settings);
+    QueryNormalizer::Data normalizer_data(aliases, source_columns_set, settings);
     QueryNormalizer(normalizer_data).visit(query);
 }
 
diff --git a/src/Interpreters/TreeRewriter.h b/src/Interpreters/TreeRewriter.h
index 1cb5ff26525..26cfaad1fbb 100644
--- a/src/Interpreters/TreeRewriter.h
+++ b/src/Interpreters/TreeRewriter.h
@@ -3,8 +3,9 @@
 #include <Core/Block.h>
 #include <Core/NamesAndTypes.h>
 #include <Interpreters/Aliases.h>
-#include <Interpreters/SelectQueryOptions.h>
+#include <Interpreters/Context_fwd.h>
 #include <Interpreters/DatabaseAndTableWithAlias.h>
+#include <Interpreters/SelectQueryOptions.h>
 #include <Storages/IStorage_fwd.h>
 
 namespace DB
@@ -13,7 +14,6 @@ namespace DB
 class ASTFunction;
 struct ASTTablesInSelectQueryElement;
 class TableJoin;
-class Context;
 struct Settings;
 struct SelectQueryOptions;
 using Scalars = std::map<String, Block>;
@@ -92,12 +92,10 @@ using TreeRewriterResultPtr = std::shared_ptr<const TreeRewriterResult>;
 ///  * scalar subqueries are executed replaced with constants
 ///  * unneeded columns are removed from SELECT clause
 ///  * duplicated columns are removed from ORDER BY, LIMIT BY, USING(...).
-class TreeRewriter
+class TreeRewriter : WithContext
 {
 public:
-    TreeRewriter(const Context & context_)
-        : context(context_)
-    {}
+    explicit TreeRewriter(ContextPtr context_) : WithContext(context_) {}
 
     /// Analyze and rewrite not select query
     TreeRewriterResultPtr analyze(
@@ -117,9 +115,7 @@ public:
         std::shared_ptr<TableJoin> table_join = {}) const;
 
 private:
-    const Context & context;
-
-    static void normalize(ASTPtr & query, Aliases & aliases, const Settings & settings);
+    static void normalize(ASTPtr & query, Aliases & aliases, const NameSet & source_columns_set, const Settings & settings);
 };
 
 }
diff --git a/src/Interpreters/WindowDescription.cpp b/src/Interpreters/WindowDescription.cpp
index e922f49c896..05d75d4647e 100644
--- a/src/Interpreters/WindowDescription.cpp
+++ b/src/Interpreters/WindowDescription.cpp
@@ -1,5 +1,6 @@
 #include <Interpreters/WindowDescription.h>
 
+#include <Core/Field.h>
 #include <IO/Operators.h>
 #include <Parsers/ASTFunction.h>
 
@@ -60,7 +61,7 @@ void WindowFrame::toString(WriteBuffer & buf) const
     }
     else
     {
-        buf << abs(begin_offset);
+        buf << applyVisitor(FieldVisitorToString(), begin_offset);
         buf << " "
             << (begin_preceding ? "PRECEDING" : "FOLLOWING");
     }
@@ -77,7 +78,7 @@ void WindowFrame::toString(WriteBuffer & buf) const
     }
     else
     {
-        buf << abs(end_offset);
+        buf << applyVisitor(FieldVisitorToString(), end_offset);
         buf << " "
             << (end_preceding ? "PRECEDING" : "FOLLOWING");
     }
@@ -85,6 +86,38 @@ void WindowFrame::toString(WriteBuffer & buf) const
 
 void WindowFrame::checkValid() const
 {
+    // Check the validity of offsets.
+    if (type == WindowFrame::FrameType::Rows
+        || type == WindowFrame::FrameType::Groups)
+    {
+        if (begin_type == BoundaryType::Offset
+            && !((begin_offset.getType() == Field::Types::UInt64
+                    || begin_offset.getType() == Field::Types::Int64)
+                && begin_offset.get<Int64>() >= 0
+                && begin_offset.get<Int64>() < INT_MAX))
+        {
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                "Frame start offset for '{}' frame must be a nonnegative 32-bit integer, '{}' of type '{}' given.",
+                toString(type),
+                applyVisitor(FieldVisitorToString(), begin_offset),
+                Field::Types::toString(begin_offset.getType()));
+        }
+
+        if (end_type == BoundaryType::Offset
+            && !((end_offset.getType() == Field::Types::UInt64
+                    || end_offset.getType() == Field::Types::Int64)
+                && end_offset.get<Int64>() >= 0
+                && end_offset.get<Int64>() < INT_MAX))
+        {
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                "Frame end offset for '{}' frame must be a nonnegative 32-bit integer, '{}' of type '{}' given.",
+                toString(type),
+                applyVisitor(FieldVisitorToString(), end_offset),
+                Field::Types::toString(end_offset.getType()));
+        }
+    }
+
+    // Check relative positioning of offsets.
     // UNBOUNDED PRECEDING end and UNBOUNDED FOLLOWING start should have been
     // forbidden at the parsing level.
     assert(!(begin_type == BoundaryType::Unbounded && !begin_preceding));
@@ -121,23 +154,33 @@ void WindowFrame::checkValid() const
     if (end_type == BoundaryType::Offset
         && begin_type == BoundaryType::Offset)
     {
-        // Frame starting with following rows can't have preceding rows.
-        if (!(end_preceding && !begin_preceding))
+        // Frame start offset must be less or equal that the frame end offset.
+        bool begin_less_equal_end;
+        if (begin_preceding && end_preceding)
         {
-            // Frame start offset must be less or equal that the frame end offset.
-            const bool begin_before_end
-                = begin_offset * (begin_preceding ? -1 : 1)
-                    <= end_offset * (end_preceding ? -1 : 1);
-
-            if (!begin_before_end)
-            {
-                throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                    "Frame start offset {} {} does not precede the frame end offset {} {}",
-                    begin_offset, begin_preceding ? "PRECEDING" : "FOLLOWING",
-                    end_offset, end_preceding ? "PRECEDING" : "FOLLOWING");
-            }
-            return;
+            begin_less_equal_end = begin_offset >= end_offset;
         }
+        else if (begin_preceding && !end_preceding)
+        {
+            begin_less_equal_end = true;
+        }
+        else if (!begin_preceding && end_preceding)
+        {
+            begin_less_equal_end = false;
+        }
+        else /* if (!begin_preceding && !end_preceding) */
+        {
+            begin_less_equal_end = begin_offset <= end_offset;
+        }
+
+        if (!begin_less_equal_end)
+        {
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                "Frame start offset {} {} does not precede the frame end offset {} {}",
+                begin_offset, begin_preceding ? "PRECEDING" : "FOLLOWING",
+                end_offset, end_preceding ? "PRECEDING" : "FOLLOWING");
+        }
+        return;
     }
 
     throw Exception(ErrorCodes::BAD_ARGUMENTS,
diff --git a/src/Interpreters/WindowDescription.h b/src/Interpreters/WindowDescription.h
index faad4649f91..70a4e0e44e0 100644
--- a/src/Interpreters/WindowDescription.h
+++ b/src/Interpreters/WindowDescription.h
@@ -44,14 +44,13 @@ struct WindowFrame
     // Offset might be both preceding and following, controlled by begin_preceding,
     // but the offset value must be positive.
     BoundaryType begin_type = BoundaryType::Unbounded;
-    // This should have been a Field but I'm getting some crazy linker errors.
-    int64_t begin_offset = 0;
+    Field begin_offset = 0;
     bool begin_preceding = true;
 
     // Here as well, Unbounded can only be UNBOUNDED FOLLOWING, and end_preceding
     // must be false.
     BoundaryType end_type = BoundaryType::Current;
-    int64_t end_offset = 0;
+    Field end_offset = 0;
     bool end_preceding = false;
 
 
diff --git a/src/Interpreters/addMissingDefaults.cpp b/src/Interpreters/addMissingDefaults.cpp
index 9e8ce1f75b4..ef3e4e095bc 100644
--- a/src/Interpreters/addMissingDefaults.cpp
+++ b/src/Interpreters/addMissingDefaults.cpp
@@ -19,11 +19,14 @@ ActionsDAGPtr addMissingDefaults(
     const Block & header,
     const NamesAndTypesList & required_columns,
     const ColumnsDescription & columns,
-    const Context & context)
+    ContextPtr context)
 {
+    auto actions = std::make_shared<ActionsDAG>(header.getColumnsWithTypeAndName());
+    auto & index = actions->getIndex();
+
     /// For missing columns of nested structure, you need to create not a column of empty arrays, but a column of arrays of correct lengths.
     /// First, remember the offset columns for all arrays in the block.
-    std::map<String, Names> nested_groups;
+    std::map<String, ActionsDAG::NodeRawConstPtrs> nested_groups;
 
     for (size_t i = 0, size = header.columns(); i < size; ++i)
     {
@@ -35,14 +38,12 @@ ActionsDAGPtr addMissingDefaults(
 
             auto & group = nested_groups[offsets_name];
             if (group.empty())
-                group.push_back({});
+                group.push_back(nullptr);
 
-            group.push_back(elem.name);
+            group.push_back(actions->getInputs()[i]);
         }
     }
 
-    auto actions = std::make_shared<ActionsDAG>(header.getColumnsWithTypeAndName());
-
     FunctionOverloadResolverPtr func_builder_replicate = FunctionFactory::instance().get("replicate", context);
 
     /// We take given columns from input block and missed columns without default value
@@ -61,11 +62,11 @@ ActionsDAGPtr addMissingDefaults(
 
             DataTypePtr nested_type = typeid_cast<const DataTypeArray &>(*column.type).getNestedType();
             ColumnPtr nested_column = nested_type->createColumnConstWithDefaultValue(0);
-            const auto & constant = actions->addColumn({std::move(nested_column), nested_type, column.name}, true);
+            const auto & constant = actions->addColumn({std::move(nested_column), nested_type, column.name});
 
             auto & group = nested_groups[offsets_name];
-            group[0] = constant.result_name;
-            actions->addFunction(func_builder_replicate, group, constant.result_name, context, true);
+            group[0] = &constant;
+            index.push_back(&actions->addFunction(func_builder_replicate, group, constant.result_name));
 
             continue;
         }
@@ -74,7 +75,8 @@ ActionsDAGPtr addMissingDefaults(
         *  it can be full (or the interpreter may decide that it is constant everywhere).
         */
         auto new_column = column.type->createColumnConstWithDefaultValue(0);
-        actions->addColumn({std::move(new_column), column.type, column.name}, true, true);
+        const auto * col = &actions->addColumn({std::move(new_column), column.type, column.name});
+        index.push_back(&actions->materializeNode(*col));
     }
 
     /// Computes explicitly specified values by default and materialized columns.
diff --git a/src/Interpreters/addMissingDefaults.h b/src/Interpreters/addMissingDefaults.h
index e746c7cc9e6..90376c41216 100644
--- a/src/Interpreters/addMissingDefaults.h
+++ b/src/Interpreters/addMissingDefaults.h
@@ -1,15 +1,16 @@
 #pragma once
 
-#include <unordered_map>
-#include <string>
+#include <Interpreters/Context_fwd.h>
+
 #include <memory>
+#include <string>
+#include <unordered_map>
 
 
 namespace DB
 {
 
 class Block;
-class Context;
 class NamesAndTypesList;
 class ColumnsDescription;
 
@@ -23,9 +24,5 @@ using ActionsDAGPtr = std::shared_ptr<ActionsDAG>;
   * All three types of columns are materialized (not constants).
   */
 ActionsDAGPtr addMissingDefaults(
-    const Block & header,
-    const NamesAndTypesList & required_columns,
-    const ColumnsDescription & columns,
-    const Context & context);
-
+    const Block & header, const NamesAndTypesList & required_columns, const ColumnsDescription & columns, ContextPtr context);
 }
diff --git a/src/Interpreters/addTypeConversionToAST.cpp b/src/Interpreters/addTypeConversionToAST.cpp
index 18591fd732c..73c95bd9a8c 100644
--- a/src/Interpreters/addTypeConversionToAST.cpp
+++ b/src/Interpreters/addTypeConversionToAST.cpp
@@ -32,7 +32,7 @@ ASTPtr addTypeConversionToAST(ASTPtr && ast, const String & type_name)
     return func;
 }
 
-ASTPtr addTypeConversionToAST(ASTPtr && ast, const String & type_name, const NamesAndTypesList & all_columns, const Context & context)
+ASTPtr addTypeConversionToAST(ASTPtr && ast, const String & type_name, const NamesAndTypesList & all_columns, ContextPtr context)
 {
     auto syntax_analyzer_result = TreeRewriter(context).analyze(ast, all_columns);
     const auto actions = ExpressionAnalyzer(ast, syntax_analyzer_result, context).getActions(true);
diff --git a/src/Interpreters/addTypeConversionToAST.h b/src/Interpreters/addTypeConversionToAST.h
index 16fa98f6e0c..eb391b2c749 100644
--- a/src/Interpreters/addTypeConversionToAST.h
+++ b/src/Interpreters/addTypeConversionToAST.h
@@ -1,17 +1,19 @@
 #pragma once
 
-#include <common/types.h>
+#include <Interpreters/Context_fwd.h>
 #include <Parsers/IAST_fwd.h>
+#include <common/types.h>
 
 
 namespace DB
 {
-class Context;
+
 class NamesAndTypesList;
+
 /// It will produce an expression with CAST to get an AST with the required type.
 ASTPtr addTypeConversionToAST(ASTPtr && ast, const String & type_name);
 
 // If same type, then ignore the wrapper of CAST function
-ASTPtr addTypeConversionToAST(ASTPtr && ast, const String & type_name, const NamesAndTypesList & all_columns, const Context & context);
+ASTPtr addTypeConversionToAST(ASTPtr && ast, const String & type_name, const NamesAndTypesList & all_columns, ContextPtr context);
 
 }
diff --git a/src/Interpreters/convertFieldToType.cpp b/src/Interpreters/convertFieldToType.cpp
index 73bf493fa65..ed920539bea 100644
--- a/src/Interpreters/convertFieldToType.cpp
+++ b/src/Interpreters/convertFieldToType.cpp
@@ -141,7 +141,7 @@ Field convertFieldToTypeImpl(const Field & src, const IDataType & type, const ID
     /// Conversion between Date and DateTime and vice versa.
     if (which_type.isDate() && which_from_type.isDateTime())
     {
-        return static_cast<const DataTypeDateTime &>(*from_type_hint).getTimeZone().toDayNum(src.get<UInt64>());
+        return static_cast<UInt16>(static_cast<const DataTypeDateTime &>(*from_type_hint).getTimeZone().toDayNum(src.get<UInt64>()).toUnderType());
     }
     else if (which_type.isDateTime() && which_from_type.isDate())
     {
@@ -276,6 +276,44 @@ Field convertFieldToTypeImpl(const Field & src, const IDataType & type, const ID
             return have_unconvertible_element ? Field(Null()) : Field(res);
         }
     }
+    else if (const DataTypeMap * type_map = typeid_cast<const DataTypeMap *>(&type))
+    {
+        if (src.getType() == Field::Types::Map)
+        {
+            const auto & key_type = *type_map->getKeyType();
+            const auto & value_type = *type_map->getValueType();
+
+            const auto & map = src.get<Map>();
+            size_t map_size = map.size();
+
+            Map res(map_size);
+
+            bool have_unconvertible_element = false;
+
+            for (size_t i = 0; i < map_size; ++i)
+            {
+                const auto & map_entry = map[i].get<Tuple>();
+
+                const auto & key = map_entry[0];
+                const auto & value = map_entry[1];
+
+                Tuple updated_entry(2);
+
+                updated_entry[0] = convertFieldToType(key, key_type);
+
+                if (updated_entry[0].isNull() && !key_type.isNullable())
+                    have_unconvertible_element = true;
+
+                updated_entry[1] = convertFieldToType(value, value_type);
+                if (updated_entry[1].isNull() && !value_type.isNullable())
+                    have_unconvertible_element = true;
+
+                res[i] = updated_entry;
+            }
+
+            return have_unconvertible_element ? Field(Null()) : Field(res);
+        }
+    }
     else if (const DataTypeAggregateFunction * agg_func_type = typeid_cast<const DataTypeAggregateFunction *>(&type))
     {
         if (src.getType() != Field::Types::AggregateFunctionState)
@@ -306,7 +344,7 @@ Field convertFieldToTypeImpl(const Field & src, const IDataType & type, const ID
         ReadBufferFromString in_buffer(src.get<String>());
         try
         {
-            type_to_parse->deserializeAsWholeText(*col, in_buffer, FormatSettings{});
+            type_to_parse->getDefaultSerialization()->deserializeWholeText(*col, in_buffer, FormatSettings{});
         }
         catch (Exception & e)
         {
@@ -339,6 +377,11 @@ Field convertFieldToType(const Field & from_value, const IDataType & to_type, co
     else if (const auto * nullable_type = typeid_cast<const DataTypeNullable *>(&to_type))
     {
         const IDataType & nested_type = *nullable_type->getNestedType();
+
+        /// NULL remains NULL after any conversion.
+        if (WhichDataType(nested_type).isNothing())
+            return {};
+
         if (from_type_hint && from_type_hint->equals(nested_type))
             return from_value;
         return convertFieldToTypeImpl(from_value, nested_type, from_type_hint);
@@ -354,8 +397,11 @@ Field convertFieldToTypeOrThrow(const Field & from_value, const IDataType & to_t
         throw Exception(ErrorCodes::TYPE_MISMATCH, "Cannot convert NULL to {}", to_type.getName());
     Field converted = convertFieldToType(from_value, to_type, from_type_hint);
     if (!is_null && converted.isNull())
-        throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND, "Cannot convert value{}: it cannot be represented as {}",
-                        from_type_hint ? " from " + from_type_hint->getName() : "", to_type.getName());
+        throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND,
+            "Cannot convert value '{}'{}: it cannot be represented as {}",
+            toString(from_value),
+            from_type_hint ? " from " + from_type_hint->getName() : "",
+            to_type.getName());
     return converted;
 }
 
diff --git a/src/Interpreters/evaluateConstantExpression.cpp b/src/Interpreters/evaluateConstantExpression.cpp
index 42e96bae07b..89924025c08 100644
--- a/src/Interpreters/evaluateConstantExpression.cpp
+++ b/src/Interpreters/evaluateConstantExpression.cpp
@@ -30,14 +30,14 @@ namespace ErrorCodes
 }
 
 
-std::pair<Field, std::shared_ptr<const IDataType>> evaluateConstantExpression(const ASTPtr & node, const Context & context)
+std::pair<Field, std::shared_ptr<const IDataType>> evaluateConstantExpression(const ASTPtr & node, ContextPtr context)
 {
     NamesAndTypesList source_columns = {{ "_dummy", std::make_shared<DataTypeUInt8>() }};
     auto ast = node->clone();
-    ReplaceQueryParameterVisitor param_visitor(context.getQueryParameters());
+    ReplaceQueryParameterVisitor param_visitor(context->getQueryParameters());
     param_visitor.visit(ast);
 
-    if (context.getSettingsRef().normalize_function_names)
+    if (context->getSettingsRef().normalize_function_names)
         FunctionNameNormalizer().visit(ast.get());
 
     String name = ast->getColumnName();
@@ -66,7 +66,7 @@ std::pair<Field, std::shared_ptr<const IDataType>> evaluateConstantExpression(co
 }
 
 
-ASTPtr evaluateConstantExpressionAsLiteral(const ASTPtr & node, const Context & context)
+ASTPtr evaluateConstantExpressionAsLiteral(const ASTPtr & node, ContextPtr context)
 {
     /// If it's already a literal.
     if (node->as<ASTLiteral>())
@@ -74,7 +74,7 @@ ASTPtr evaluateConstantExpressionAsLiteral(const ASTPtr & node, const Context &
     return std::make_shared<ASTLiteral>(evaluateConstantExpression(node, context).first);
 }
 
-ASTPtr evaluateConstantExpressionOrIdentifierAsLiteral(const ASTPtr & node, const Context & context)
+ASTPtr evaluateConstantExpressionOrIdentifierAsLiteral(const ASTPtr & node, ContextPtr context)
 {
     if (const auto * id = node->as<ASTIdentifier>())
         return std::make_shared<ASTLiteral>(id->name());
@@ -82,18 +82,18 @@ ASTPtr evaluateConstantExpressionOrIdentifierAsLiteral(const ASTPtr & node, cons
     return evaluateConstantExpressionAsLiteral(node, context);
 }
 
-ASTPtr evaluateConstantExpressionForDatabaseName(const ASTPtr & node, const Context & context)
+ASTPtr evaluateConstantExpressionForDatabaseName(const ASTPtr & node, ContextPtr context)
 {
     ASTPtr res = evaluateConstantExpressionOrIdentifierAsLiteral(node, context);
     auto & literal = res->as<ASTLiteral &>();
     if (literal.value.safeGet<String>().empty())
     {
-        String current_database = context.getCurrentDatabase();
+        String current_database = context->getCurrentDatabase();
         if (current_database.empty())
         {
             /// Table was created on older version of ClickHouse and CREATE contains not folded expression.
             /// Current database is not set yet during server startup, so we cannot evaluate it correctly.
-            literal.value = context.getConfigRef().getString("default_database", "default");
+            literal.value = context->getConfigRef().getString("default_database", "default");
         }
         else
             literal.value = current_database;
@@ -166,9 +166,9 @@ namespace
         return result;
     }
 
-    Disjunction analyzeFunction(const ASTFunction * fn, const ExpressionActionsPtr & expr)
+    Disjunction analyzeFunction(const ASTFunction * fn, const ExpressionActionsPtr & expr, size_t & limit)
     {
-        if (!fn)
+        if (!fn || !limit)
         {
             return {};
         }
@@ -182,6 +182,7 @@ namespace
             const auto * identifier = left->as<ASTIdentifier>() ? left->as<ASTIdentifier>() : right->as<ASTIdentifier>();
             const auto * literal = left->as<ASTLiteral>() ? left->as<ASTLiteral>() : right->as<ASTLiteral>();
 
+            --limit;
             return analyzeEquals(identifier, literal, expr);
         }
         else if (fn->name == "in")
@@ -192,6 +193,19 @@ namespace
 
             Disjunction result;
 
+            auto add_dnf = [&](const auto &dnf)
+            {
+                if (dnf.size() > limit)
+                {
+                    result.clear();
+                    return false;
+                }
+
+                result.insert(result.end(), dnf.begin(), dnf.end());
+                limit -= dnf.size();
+                return true;
+            };
+
             if (const auto * tuple_func = right->as<ASTFunction>(); tuple_func && tuple_func->name == "tuple")
             {
                 const auto * tuple_elements = tuple_func->children.front()->as<ASTExpressionList>();
@@ -205,7 +219,10 @@ namespace
                         return {};
                     }
 
-                    result.insert(result.end(), dnf.begin(), dnf.end());
+                    if (!add_dnf(dnf))
+                    {
+                        return {};
+                    }
                 }
             }
             else if (const auto * tuple_literal = right->as<ASTLiteral>();
@@ -221,7 +238,10 @@ namespace
                         return {};
                     }
 
-                    result.insert(result.end(), dnf.begin(), dnf.end());
+                    if (!add_dnf(dnf))
+                    {
+                        return {};
+                    }
                 }
             }
             else
@@ -244,13 +264,14 @@ namespace
 
             for (const auto & arg : args->children)
             {
-                const auto dnf = analyzeFunction(arg->as<ASTFunction>(), expr);
+                const auto dnf = analyzeFunction(arg->as<ASTFunction>(), expr, limit);
 
                 if (dnf.empty())
                 {
                     return {};
                 }
 
+                /// limit accounted in analyzeFunction()
                 result.insert(result.end(), dnf.begin(), dnf.end());
             }
 
@@ -269,13 +290,14 @@ namespace
 
             for (const auto & arg : args->children)
             {
-                const auto dnf = analyzeFunction(arg->as<ASTFunction>(), expr);
+                const auto dnf = analyzeFunction(arg->as<ASTFunction>(), expr, limit);
 
                 if (dnf.empty())
                 {
                     continue;
                 }
 
+                /// limit accounted in analyzeFunction()
                 result = andDNF(result, dnf);
             }
 
@@ -286,17 +308,15 @@ namespace
     }
 }
 
-std::optional<Blocks> evaluateExpressionOverConstantCondition(const ASTPtr & node, const ExpressionActionsPtr & target_expr)
+std::optional<Blocks> evaluateExpressionOverConstantCondition(const ASTPtr & node, const ExpressionActionsPtr & target_expr, size_t & limit)
 {
     Blocks result;
 
-    // TODO: `node` may be always-false literal.
-
     if (const auto * fn = node->as<ASTFunction>())
     {
-        const auto dnf = analyzeFunction(fn, target_expr);
+        const auto dnf = analyzeFunction(fn, target_expr, limit);
 
-        if (dnf.empty())
+        if (dnf.empty() || !limit)
         {
             return {};
         }
@@ -350,6 +370,14 @@ std::optional<Blocks> evaluateExpressionOverConstantCondition(const ASTPtr & nod
             }
         }
     }
+    else if (const auto * literal = node->as<ASTLiteral>())
+    {
+        // Check if it's always true or false.
+        if (literal->value.getType() == Field::Types::UInt64 && literal->value.get<UInt64>() == 0)
+            return {result};
+        else
+            return {};
+    }
 
     return {result};
 }
diff --git a/src/Interpreters/evaluateConstantExpression.h b/src/Interpreters/evaluateConstantExpression.h
index 8e3fa08a626..b95982f5b99 100644
--- a/src/Interpreters/evaluateConstantExpression.h
+++ b/src/Interpreters/evaluateConstantExpression.h
@@ -2,6 +2,7 @@
 
 #include <Core/Block.h>
 #include <Core/Field.h>
+#include <Interpreters/Context_fwd.h>
 #include <Parsers/IAST.h>
 #include <Parsers/IParser.h>
 
@@ -12,7 +13,6 @@
 namespace DB
 {
 
-class Context;
 class ExpressionActions;
 class IDataType;
 
@@ -23,33 +23,34 @@ using ExpressionActionsPtr = std::shared_ptr<ExpressionActions>;
   * Throws exception if it's not a constant expression.
   * Quite suboptimal.
   */
-std::pair<Field, std::shared_ptr<const IDataType>> evaluateConstantExpression(const ASTPtr & node, const Context & context);
+std::pair<Field, std::shared_ptr<const IDataType>> evaluateConstantExpression(const ASTPtr & node, ContextPtr context);
 
 
 /** Evaluate constant expression and returns ASTLiteral with its value.
   */
-ASTPtr evaluateConstantExpressionAsLiteral(const ASTPtr & node, const Context & context);
+ASTPtr evaluateConstantExpressionAsLiteral(const ASTPtr & node, ContextPtr context);
 
 
 /** Evaluate constant expression and returns ASTLiteral with its value.
   * Also, if AST is identifier, then return string literal with its name.
   * Useful in places where some name may be specified as identifier, or as result of a constant expression.
   */
-ASTPtr evaluateConstantExpressionOrIdentifierAsLiteral(const ASTPtr & node, const Context & context);
+ASTPtr evaluateConstantExpressionOrIdentifierAsLiteral(const ASTPtr & node, ContextPtr context);
 
 /** The same as evaluateConstantExpressionOrIdentifierAsLiteral(...),
  *  but if result is an empty string, replace it with current database name
  *  or default database name.
  */
-ASTPtr evaluateConstantExpressionForDatabaseName(const ASTPtr & node, const Context & context);
+ASTPtr evaluateConstantExpressionForDatabaseName(const ASTPtr & node, ContextPtr context);
 
 /** Try to fold condition to countable set of constant values.
   * @param node a condition that we try to fold.
   * @param target_expr expression evaluated over a set of constants.
+  * @param limit limit for number of values
   * @return optional blocks each with a single row and a single column for target expression,
   *         or empty blocks if condition is always false,
   *         or nothing if condition can't be folded to a set of constants.
   */
-std::optional<Blocks> evaluateExpressionOverConstantCondition(const ASTPtr & node, const ExpressionActionsPtr & target_expr);
+std::optional<Blocks> evaluateExpressionOverConstantCondition(const ASTPtr & node, const ExpressionActionsPtr & target_expr, size_t & limit);
 
 }
diff --git a/src/Interpreters/executeDDLQueryOnCluster.cpp b/src/Interpreters/executeDDLQueryOnCluster.cpp
index 1937fbaf905..99ece6bb14c 100644
--- a/src/Interpreters/executeDDLQueryOnCluster.cpp
+++ b/src/Interpreters/executeDDLQueryOnCluster.cpp
@@ -13,6 +13,9 @@
 #include <Common/ZooKeeper/ZooKeeper.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <DataStreams/NullBlockOutputStream.h>
+#include <DataStreams/copyData.h>
 #include <filesystem>
 
 namespace fs = std::filesystem;
@@ -45,17 +48,17 @@ bool isSupportedAlterType(int type)
 }
 
 
-BlockIO executeDDLQueryOnCluster(const ASTPtr & query_ptr_, const Context & context)
+BlockIO executeDDLQueryOnCluster(const ASTPtr & query_ptr_, ContextPtr context)
 {
     return executeDDLQueryOnCluster(query_ptr_, context, {});
 }
 
-BlockIO executeDDLQueryOnCluster(const ASTPtr & query_ptr, const Context & context, const AccessRightsElements & query_requires_access, bool query_requires_grant_option)
+BlockIO executeDDLQueryOnCluster(const ASTPtr & query_ptr, ContextPtr context, const AccessRightsElements & query_requires_access)
 {
-    return executeDDLQueryOnCluster(query_ptr, context, AccessRightsElements{query_requires_access}, query_requires_grant_option);
+    return executeDDLQueryOnCluster(query_ptr, context, AccessRightsElements{query_requires_access});
 }
 
-BlockIO executeDDLQueryOnCluster(const ASTPtr & query_ptr_, const Context & context, AccessRightsElements && query_requires_access, bool query_requires_grant_option)
+BlockIO executeDDLQueryOnCluster(const ASTPtr & query_ptr_, ContextPtr context, AccessRightsElements && query_requires_access)
 {
     /// Remove FORMAT <fmt> and INTO OUTFILE <file> if exists
     ASTPtr query_ptr = query_ptr_->clone();
@@ -68,7 +71,7 @@ BlockIO executeDDLQueryOnCluster(const ASTPtr & query_ptr_, const Context & cont
         throw Exception("Distributed execution is not supported for such DDL queries", ErrorCodes::NOT_IMPLEMENTED);
     }
 
-    if (!context.getSettingsRef().allow_distributed_ddl)
+    if (!context->getSettingsRef().allow_distributed_ddl)
         throw Exception("Distributed DDL queries are prohibited for the user", ErrorCodes::QUERY_IS_PROHIBITED);
 
     if (const auto * query_alter = query_ptr->as<ASTAlterQuery>())
@@ -80,9 +83,9 @@ BlockIO executeDDLQueryOnCluster(const ASTPtr & query_ptr_, const Context & cont
         }
     }
 
-    query->cluster = context.getMacros()->expand(query->cluster);
-    ClusterPtr cluster = context.getCluster(query->cluster);
-    DDLWorker & ddl_worker = context.getDDLWorker();
+    query->cluster = context->getMacros()->expand(query->cluster);
+    ClusterPtr cluster = context->getCluster(query->cluster);
+    DDLWorker & ddl_worker = context->getDDLWorker();
 
     /// Enumerate hosts which will be used to send query.
     Cluster::AddressesWithFailover shards = cluster->getShardsAddresses();
@@ -106,7 +109,7 @@ BlockIO executeDDLQueryOnCluster(const ASTPtr & query_ptr_, const Context & cont
            != query_requires_access.end());
 
     bool use_local_default_database = false;
-    const String & current_database = context.getCurrentDatabase();
+    const String & current_database = context->getCurrentDatabase();
 
     if (need_replace_current_database)
     {
@@ -154,47 +157,75 @@ BlockIO executeDDLQueryOnCluster(const ASTPtr & query_ptr_, const Context & cont
     visitor.visitDDL(query_ptr);
 
     /// Check access rights, assume that all servers have the same users config
-    if (query_requires_grant_option)
-        context.getAccess()->checkGrantOption(query_requires_access);
-    else
-        context.checkAccess(query_requires_access);
+    context->checkAccess(query_requires_access);
 
     DDLLogEntry entry;
     entry.hosts = std::move(hosts);
     entry.query = queryToString(query_ptr);
     entry.initiator = ddl_worker.getCommonHostID();
+    entry.setSettingsIfRequired(context);
     String node_path = ddl_worker.enqueueQuery(entry);
 
+    return getDistributedDDLStatus(node_path, entry, context);
+}
+
+BlockIO getDistributedDDLStatus(const String & node_path, const DDLLogEntry & entry, ContextPtr context, const std::optional<Strings> & hosts_to_wait)
+{
     BlockIO io;
-    if (context.getSettingsRef().distributed_ddl_task_timeout == 0)
+    if (context->getSettingsRef().distributed_ddl_task_timeout == 0)
         return io;
 
-    auto stream = std::make_shared<DDLQueryStatusInputStream>(node_path, entry, context);
-    io.in = std::move(stream);
+    auto stream = std::make_shared<DDLQueryStatusInputStream>(node_path, entry, context, hosts_to_wait);
+    if (context->getSettingsRef().distributed_ddl_output_mode == DistributedDDLOutputMode::NONE)
+    {
+        /// Wait for query to finish, but ignore output
+        NullBlockOutputStream output{Block{}};
+        copyData(*stream, output);
+    }
+    else
+    {
+        io.in = std::move(stream);
+    }
     return io;
 }
 
-
-DDLQueryStatusInputStream::DDLQueryStatusInputStream(const String & zk_node_path, const DDLLogEntry & entry, const Context & context_,
+DDLQueryStatusInputStream::DDLQueryStatusInputStream(const String & zk_node_path, const DDLLogEntry & entry, ContextPtr context_,
                                                      const std::optional<Strings> & hosts_to_wait)
     : node_path(zk_node_path)
     , context(context_)
     , watch(CLOCK_MONOTONIC_COARSE)
     , log(&Poco::Logger::get("DDLQueryStatusInputStream"))
 {
+    if (context->getSettingsRef().distributed_ddl_output_mode == DistributedDDLOutputMode::THROW ||
+        context->getSettingsRef().distributed_ddl_output_mode == DistributedDDLOutputMode::NONE)
+        throw_on_timeout = true;
+    else if (context->getSettingsRef().distributed_ddl_output_mode == DistributedDDLOutputMode::NULL_STATUS_ON_TIMEOUT ||
+             context->getSettingsRef().distributed_ddl_output_mode == DistributedDDLOutputMode::NEVER_THROW)
+        throw_on_timeout = false;
+    else
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Unknown output mode");
+
+    auto maybe_make_nullable = [&](const DataTypePtr & type) -> DataTypePtr
+    {
+        if (throw_on_timeout)
+            return type;
+        return std::make_shared<DataTypeNullable>(type);
+    };
+
     sample = Block{
-        {std::make_shared<DataTypeString>(),    "host"},
-        {std::make_shared<DataTypeUInt16>(),    "port"},
-        {std::make_shared<DataTypeInt64>(),     "status"},
-        {std::make_shared<DataTypeString>(),    "error"},
-        {std::make_shared<DataTypeUInt64>(),    "num_hosts_remaining"},
-        {std::make_shared<DataTypeUInt64>(),    "num_hosts_active"},
+        {std::make_shared<DataTypeString>(),                         "host"},
+        {std::make_shared<DataTypeUInt16>(),                         "port"},
+        {maybe_make_nullable(std::make_shared<DataTypeInt64>()),     "status"},
+        {maybe_make_nullable(std::make_shared<DataTypeString>()),    "error"},
+        {std::make_shared<DataTypeUInt64>(),                         "num_hosts_remaining"},
+        {std::make_shared<DataTypeUInt64>(),                         "num_hosts_active"},
     };
 
     if (hosts_to_wait)
     {
         waiting_hosts = NameSet(hosts_to_wait->begin(), hosts_to_wait->end());
         by_hostname = false;
+        sample.erase("port");
     }
     else
     {
@@ -204,28 +235,46 @@ DDLQueryStatusInputStream::DDLQueryStatusInputStream(const String & zk_node_path
 
     addTotalRowsApprox(waiting_hosts.size());
 
-    timeout_seconds = context.getSettingsRef().distributed_ddl_task_timeout;
+    timeout_seconds = context->getSettingsRef().distributed_ddl_task_timeout;
+}
+
+std::pair<String, UInt16> DDLQueryStatusInputStream::parseHostAndPort(const String & host_id) const
+{
+    String host = host_id;
+    UInt16 port = 0;
+    if (by_hostname)
+    {
+        auto host_and_port = Cluster::Address::fromString(host_id);
+        host = host_and_port.first;
+        port = host_and_port.second;
+    }
+    return {host, port};
 }
 
 Block DDLQueryStatusInputStream::readImpl()
 {
     Block res;
-    if (num_hosts_finished >= waiting_hosts.size())
+    bool all_hosts_finished = num_hosts_finished >= waiting_hosts.size();
+    /// Seems like num_hosts_finished cannot be strictly greater than waiting_hosts.size()
+    assert(num_hosts_finished <= waiting_hosts.size());
+    if (all_hosts_finished || timeout_exceeded)
     {
-        if (first_exception)
+        bool throw_if_error_on_host = context->getSettingsRef().distributed_ddl_output_mode != DistributedDDLOutputMode::NEVER_THROW;
+        if (first_exception && throw_if_error_on_host)
             throw Exception(*first_exception);
 
         return res;
     }
 
-    auto zookeeper = context.getZooKeeper();
+    auto zookeeper = context->getZooKeeper();
     size_t try_number = 0;
 
     while (res.rows() == 0)
     {
         if (isCancelled())
         {
-            if (first_exception)
+            bool throw_if_error_on_host = context->getSettingsRef().distributed_ddl_output_mode != DistributedDDLOutputMode::NEVER_THROW;
+            if (first_exception && throw_if_error_on_host)
                 throw Exception(*first_exception);
 
             return res;
@@ -236,11 +285,36 @@ Block DDLQueryStatusInputStream::readImpl()
             size_t num_unfinished_hosts = waiting_hosts.size() - num_hosts_finished;
             size_t num_active_hosts = current_active_hosts.size();
 
+            constexpr const char * msg_format = "Watching task {} is executing longer than distributed_ddl_task_timeout (={}) seconds. "
+                                                "There are {} unfinished hosts ({} of them are currently active), "
+                                                "they are going to execute the query in background";
+            if (throw_on_timeout)
+                throw Exception(ErrorCodes::TIMEOUT_EXCEEDED, msg_format,
+                                node_path, timeout_seconds, num_unfinished_hosts, num_active_hosts);
 
-            throw Exception(ErrorCodes::TIMEOUT_EXCEEDED,
-                            "Watching task {} is executing longer than distributed_ddl_task_timeout (={}) seconds. "
-                            "There are {} unfinished hosts ({} of them are currently active), they are going to execute the query in background",
-                            node_path, timeout_seconds, num_unfinished_hosts, num_active_hosts);
+            timeout_exceeded = true;
+            LOG_INFO(log, msg_format, node_path, timeout_seconds, num_unfinished_hosts, num_active_hosts);
+
+            NameSet unfinished_hosts = waiting_hosts;
+            for (const auto & host_id : finished_hosts)
+                unfinished_hosts.erase(host_id);
+
+            /// Query is not finished on the rest hosts, so fill the corresponding rows with NULLs.
+            MutableColumns columns = sample.cloneEmptyColumns();
+            for (const String & host_id : unfinished_hosts)
+            {
+                auto [host, port] = parseHostAndPort(host_id);
+                size_t num = 0;
+                columns[num++]->insert(host);
+                if (by_hostname)
+                    columns[num++]->insert(port);
+                columns[num++]->insert(Field{});
+                columns[num++]->insert(Field{});
+                columns[num++]->insert(num_unfinished_hosts);
+                columns[num++]->insert(num_active_hosts);
+            }
+            res = sample.cloneWithColumns(std::move(columns));
+            return res;
         }
 
         if (num_hosts_finished != 0 || try_number != 0)
@@ -272,26 +346,21 @@ Block DDLQueryStatusInputStream::readImpl()
                     status.tryDeserializeText(status_data);
             }
 
-            String host = host_id;
-            UInt16 port = 0;
-            if (by_hostname)
-            {
-                auto host_and_port = Cluster::Address::fromString(host_id);
-                host = host_and_port.first;
-                port = host_and_port.second;
-            }
+            auto [host, port] = parseHostAndPort(host_id);
 
             if (status.code != 0 && first_exception == nullptr)
                 first_exception = std::make_unique<Exception>(status.code, "There was an error on [{}:{}]: {}", host, port, status.message);
 
             ++num_hosts_finished;
 
-            columns[0]->insert(host);
-            columns[1]->insert(port);
-            columns[2]->insert(status.code);
-            columns[3]->insert(status.message);
-            columns[4]->insert(waiting_hosts.size() - num_hosts_finished);
-            columns[5]->insert(current_active_hosts.size());
+            size_t num = 0;
+            columns[num++]->insert(host);
+            if (by_hostname)
+                columns[num++]->insert(port);
+            columns[num++]->insert(status.code);
+            columns[num++]->insert(status.message);
+            columns[num++]->insert(waiting_hosts.size() - num_hosts_finished);
+            columns[num++]->insert(current_active_hosts.size());
         }
         res = sample.cloneWithColumns(std::move(columns));
     }
diff --git a/src/Interpreters/executeDDLQueryOnCluster.h b/src/Interpreters/executeDDLQueryOnCluster.h
index 2b272d3b0da..bbd39a6e8ec 100644
--- a/src/Interpreters/executeDDLQueryOnCluster.h
+++ b/src/Interpreters/executeDDLQueryOnCluster.h
@@ -1,5 +1,7 @@
 #pragma once
+
 #include <DataStreams/BlockIO.h>
+#include <Interpreters/Context_fwd.h>
 #include <Parsers/IAST_fwd.h>
 
 namespace zkutil
@@ -10,7 +12,6 @@ namespace zkutil
 namespace DB
 {
 
-class Context;
 class AccessRightsElements;
 struct DDLLogEntry;
 
@@ -20,15 +21,16 @@ bool isSupportedAlterType(int type);
 
 /// Pushes distributed DDL query to the queue.
 /// Returns DDLQueryStatusInputStream, which reads results of query execution on each host in the cluster.
-BlockIO executeDDLQueryOnCluster(const ASTPtr & query_ptr, const Context & context);
-BlockIO executeDDLQueryOnCluster(const ASTPtr & query_ptr, const Context & context, const AccessRightsElements & query_requires_access, bool query_requires_grant_option = false);
-BlockIO executeDDLQueryOnCluster(const ASTPtr & query_ptr, const Context & context, AccessRightsElements && query_requires_access, bool query_requires_grant_option = false);
+BlockIO executeDDLQueryOnCluster(const ASTPtr & query_ptr, ContextPtr context);
+BlockIO executeDDLQueryOnCluster(const ASTPtr & query_ptr, ContextPtr context, const AccessRightsElements & query_requires_access);
+BlockIO executeDDLQueryOnCluster(const ASTPtr & query_ptr, ContextPtr context, AccessRightsElements && query_requires_access);
 
+BlockIO getDistributedDDLStatus(const String & node_path, const DDLLogEntry & entry, ContextPtr context, const std::optional<Strings> & hosts_to_wait = {});
 
 class DDLQueryStatusInputStream final : public IBlockInputStream
 {
 public:
-    DDLQueryStatusInputStream(const String & zk_node_path, const DDLLogEntry & entry, const Context & context_, const std::optional<Strings> & hosts_to_wait = {});
+    DDLQueryStatusInputStream(const String & zk_node_path, const DDLLogEntry & entry, ContextPtr context_, const std::optional<Strings> & hosts_to_wait = {});
 
     String getName() const override { return "DDLQueryStatusInputStream"; }
 
@@ -44,8 +46,10 @@ private:
 
     Strings getNewAndUpdate(const Strings & current_list_of_finished_hosts);
 
+    std::pair<String, UInt16> parseHostAndPort(const String & host_id) const;
+
     String node_path;
-    const Context & context;
+    ContextPtr context;
     Stopwatch watch;
     Poco::Logger * log;
 
@@ -62,6 +66,8 @@ private:
 
     Int64 timeout_seconds = 120;
     bool by_hostname = true;
+    bool throw_on_timeout = true;
+    bool timeout_exceeded = false;
 };
 
 }
diff --git a/src/Interpreters/executeQuery.cpp b/src/Interpreters/executeQuery.cpp
index d786e1146be..5df245f9f26 100644
--- a/src/Interpreters/executeQuery.cpp
+++ b/src/Interpreters/executeQuery.cpp
@@ -39,16 +39,17 @@
 #include <Storages/StorageInput.h>
 
 #include <Access/EnabledQuota.h>
-#include <Interpreters/InterpreterFactory.h>
-#include <Interpreters/ProcessList.h>
-#include <Interpreters/OpenTelemetrySpanLog.h>
-#include <Interpreters/QueryLog.h>
-#include <Interpreters/InterpreterSetQuery.h>
 #include <Interpreters/ApplyWithGlobalVisitor.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/InterpreterFactory.h>
+#include <Interpreters/InterpreterSetQuery.h>
+#include <Interpreters/NormalizeSelectWithUnionQueryVisitor.h>
+#include <Interpreters/OpenTelemetrySpanLog.h>
+#include <Interpreters/ProcessList.h>
+#include <Interpreters/QueryLog.h>
 #include <Interpreters/ReplaceQueryParameterVisitor.h>
 #include <Interpreters/SelectQueryOptions.h>
 #include <Interpreters/executeQuery.h>
-#include <Interpreters/Context.h>
 #include <Common/ProfileEvents.h>
 
 #include <Common/SensitiveDataMasker.h>
@@ -120,7 +121,7 @@ static String joinLines(const String & query)
 }
 
 
-static String prepareQueryForLogging(const String & query, Context & context)
+static String prepareQueryForLogging(const String & query, ContextPtr context)
 {
     String res = query;
 
@@ -135,14 +136,14 @@ static String prepareQueryForLogging(const String & query, Context & context)
         }
     }
 
-    res = res.substr(0, context.getSettingsRef().log_queries_cut_to_length);
+    res = res.substr(0, context->getSettingsRef().log_queries_cut_to_length);
 
     return res;
 }
 
 
 /// Log query into text log (not into system table).
-static void logQuery(const String & query, const Context & context, bool internal)
+static void logQuery(const String & query, ContextPtr context, bool internal)
 {
     if (internal)
     {
@@ -150,14 +151,14 @@ static void logQuery(const String & query, const Context & context, bool interna
     }
     else
     {
-        const auto & client_info = context.getClientInfo();
+        const auto & client_info = context->getClientInfo();
 
         const auto & current_query_id = client_info.current_query_id;
         const auto & initial_query_id = client_info.initial_query_id;
         const auto & current_user = client_info.current_user;
 
-        String comment = context.getSettingsRef().log_comment;
-        size_t max_query_size = context.getSettingsRef().max_query_size;
+        String comment = context->getSettingsRef().log_comment;
+        size_t max_query_size = context->getSettingsRef().max_query_size;
 
         if (comment.size() > max_query_size)
             comment.resize(max_query_size);
@@ -169,7 +170,7 @@ static void logQuery(const String & query, const Context & context, bool interna
             client_info.current_address.toString(),
             (current_user != "default" ? ", user: " + current_user : ""),
             (!initial_query_id.empty() && current_query_id != initial_query_id ? ", initial_query_id: " + initial_query_id : std::string()),
-            (context.getSettingsRef().use_antlr_parser ? "experimental" : "production"),
+            (context->getSettingsRef().use_antlr_parser ? "experimental" : "production"),
             comment,
             joinLines(query));
 
@@ -203,19 +204,30 @@ static void setExceptionStackTrace(QueryLogElement & elem)
 
 
 /// Log exception (with query info) into text log (not into system table).
-static void logException(Context & context, QueryLogElement & elem)
+static void logException(ContextPtr context, QueryLogElement & elem)
 {
     String comment;
     if (!elem.log_comment.empty())
         comment = fmt::format(" (comment: {})", elem.log_comment);
 
     if (elem.stack_trace.empty())
-        LOG_ERROR(&Poco::Logger::get("executeQuery"), "{} (from {}){} (in query: {})",
-            elem.exception, context.getClientInfo().current_address.toString(), comment, joinLines(elem.query));
+        LOG_ERROR(
+            &Poco::Logger::get("executeQuery"),
+            "{} (from {}){} (in query: {})",
+            elem.exception,
+            context->getClientInfo().current_address.toString(),
+            comment,
+            joinLines(elem.query));
     else
-        LOG_ERROR(&Poco::Logger::get("executeQuery"), "{} (from {}){} (in query: {})"
+        LOG_ERROR(
+            &Poco::Logger::get("executeQuery"),
+            "{} (from {}){} (in query: {})"
             ", Stack trace (when copying this message, always include the lines below):\n\n{}",
-            elem.exception, context.getClientInfo().current_address.toString(), comment, joinLines(elem.query), elem.stack_trace);
+            elem.exception,
+            context->getClientInfo().current_address.toString(),
+            comment,
+            joinLines(elem.query),
+            elem.stack_trace);
 }
 
 inline UInt64 time_in_microseconds(std::chrono::time_point<std::chrono::system_clock> timepoint)
@@ -229,13 +241,13 @@ inline UInt64 time_in_seconds(std::chrono::time_point<std::chrono::system_clock>
     return std::chrono::duration_cast<std::chrono::seconds>(timepoint.time_since_epoch()).count();
 }
 
-static void onExceptionBeforeStart(const String & query_for_logging, Context & context, UInt64 current_time_us, ASTPtr ast)
+static void onExceptionBeforeStart(const String & query_for_logging, ContextPtr context, UInt64 current_time_us, ASTPtr ast)
 {
     /// Exception before the query execution.
-    if (auto quota = context.getQuota())
+    if (auto quota = context->getQuota())
         quota->used(Quota::ERRORS, 1, /* check_exceeded = */ false);
 
-    const Settings & settings = context.getSettingsRef();
+    const Settings & settings = context->getSettingsRef();
 
     /// Log the start of query execution into the table if necessary.
     QueryLogElement elem;
@@ -250,7 +262,7 @@ static void onExceptionBeforeStart(const String & query_for_logging, Context & c
     elem.query_start_time = current_time_us / 1000000;
     elem.query_start_time_microseconds = current_time_us;
 
-    elem.current_database = context.getCurrentDatabase();
+    elem.current_database = context->getCurrentDatabase();
     elem.query = query_for_logging;
     elem.normalized_query_hash = normalizedQueryHash<false>(query_for_logging);
 
@@ -259,7 +271,7 @@ static void onExceptionBeforeStart(const String & query_for_logging, Context & c
     elem.exception_code = getCurrentExceptionCode();
     elem.exception = getCurrentExceptionMessage(false);
 
-    elem.client_info = context.getClientInfo();
+    elem.client_info = context->getClientInfo();
 
     elem.log_comment = settings.log_comment;
     if (elem.log_comment.size() > settings.max_query_size)
@@ -273,17 +285,17 @@ static void onExceptionBeforeStart(const String & query_for_logging, Context & c
     CurrentThread::finalizePerformanceCounters();
 
     if (settings.log_queries && elem.type >= settings.log_queries_min_type && !settings.log_queries_min_query_duration_ms.totalMilliseconds())
-        if (auto query_log = context.getQueryLog())
+        if (auto query_log = context->getQueryLog())
             query_log->add(elem);
 
-    if (auto opentelemetry_span_log = context.getOpenTelemetrySpanLog();
-        context.query_trace_context.trace_id
+    if (auto opentelemetry_span_log = context->getOpenTelemetrySpanLog();
+        context->query_trace_context.trace_id
             && opentelemetry_span_log)
     {
         OpenTelemetrySpanLogElement span;
-        span.trace_id = context.query_trace_context.trace_id;
-        span.span_id = context.query_trace_context.span_id;
-        span.parent_span_id = context.getClientInfo().client_trace_context.span_id;
+        span.trace_id = context->query_trace_context.trace_id;
+        span.span_id = context->query_trace_context.span_id;
+        span.parent_span_id = context->getClientInfo().client_trace_context.span_id;
         span.operation_name = "query";
         span.start_time_us = current_time_us;
         span.finish_time_us = current_time_us;
@@ -298,11 +310,11 @@ static void onExceptionBeforeStart(const String & query_for_logging, Context & c
         span.attribute_names.push_back("clickhouse.query_id");
         span.attribute_values.push_back(elem.client_info.current_query_id);
 
-        if (!context.query_trace_context.tracestate.empty())
+        if (!context->query_trace_context.tracestate.empty())
         {
             span.attribute_names.push_back("clickhouse.tracestate");
             span.attribute_values.push_back(
-                context.query_trace_context.tracestate);
+                context->query_trace_context.tracestate);
         }
 
         opentelemetry_span_log->add(span);
@@ -323,19 +335,19 @@ static void onExceptionBeforeStart(const String & query_for_logging, Context & c
     }
 }
 
-static void setQuerySpecificSettings(ASTPtr & ast, Context & context)
+static void setQuerySpecificSettings(ASTPtr & ast, ContextPtr context)
 {
     if (auto * ast_insert_into = dynamic_cast<ASTInsertQuery *>(ast.get()))
     {
         if (ast_insert_into->watch)
-            context.setSetting("output_format_enable_streaming", 1);
+            context->setSetting("output_format_enable_streaming", 1);
     }
 }
 
 static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
     const char * begin,
     const char * end,
-    Context & context,
+    ContextPtr context,
     bool internal,
     QueryProcessingStage::Enum stage,
     bool has_query_tail,
@@ -348,7 +360,7 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
     assert(internal || CurrentThread::get().getQueryContext()->getCurrentQueryId() == CurrentThread::getQueryId());
 #endif
 
-    const Settings & settings = context.getSettingsRef();
+    const Settings & settings = context->getSettingsRef();
 
     ASTPtr ast;
     const char * query_end;
@@ -364,7 +376,7 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
 #if !defined(ARCADIA_BUILD)
         if (settings.use_antlr_parser)
         {
-            ast = parseQuery(begin, end, max_query_size, settings.max_parser_depth, context.getCurrentDatabase());
+            ast = parseQuery(begin, end, max_query_size, settings.max_parser_depth, context->getCurrentDatabase());
         }
         else
         {
@@ -455,9 +467,9 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
     try
     {
         /// Replace ASTQueryParameter with ASTLiteral for prepared statements.
-        if (context.hasQueryParameters())
+        if (context->hasQueryParameters())
         {
-            ReplaceQueryParameterVisitor visitor(context.getQueryParameters());
+            ReplaceQueryParameterVisitor visitor(context->getQueryParameters());
             visitor.visit(ast);
             query = serializeAST(*ast);
         }
@@ -472,9 +484,12 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
         if (settings.enable_global_with_statement)
         {
             ApplyWithGlobalVisitor().visit(ast);
-            query = serializeAST(*ast);
         }
 
+        /// Normalize SelectWithUnionQuery
+        NormalizeSelectWithUnionQueryVisitor::Data data{context->getSettingsRef().union_default_mode};
+        NormalizeSelectWithUnionQueryVisitor{data}.visit(ast);
+
         /// Check the limits.
         checkASTSizeLimits(*ast, settings);
 
@@ -483,12 +498,12 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
         if (!internal && !ast->as<ASTShowProcesslistQuery>())
         {
             /// processlist also has query masked now, to avoid secrets leaks though SHOW PROCESSLIST by other users.
-            process_list_entry = context.getProcessList().insert(query_for_logging, ast.get(), context);
-            context.setProcessListElement(&process_list_entry->get());
+            process_list_entry = context->getProcessList().insert(query_for_logging, ast.get(), context);
+            context->setProcessListElement(&process_list_entry->get());
         }
 
         /// Load external tables if they were provided
-        context.initializeExternalTablesIfSet();
+        context->initializeExternalTablesIfSet();
 
         auto * insert_query = ast->as<ASTInsertQuery>();
         if (insert_query && insert_query->select)
@@ -500,7 +515,7 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
                 insert_query->tryFindInputFunction(input_function);
                 if (input_function)
                 {
-                    StoragePtr storage = context.executeTableFunction(input_function);
+                    StoragePtr storage = context->executeTableFunction(input_function);
                     auto & input_storage = dynamic_cast<StorageInput &>(*storage);
                     auto input_metadata_snapshot = input_storage.getInMemoryMetadataPtr();
                     BlockInputStreamPtr input_stream = std::make_shared<InputStreamFromASTInsertQuery>(
@@ -511,14 +526,14 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
         }
         else
             /// reset Input callbacks if query is not INSERT SELECT
-            context.resetInputCallbacks();
+            context->resetInputCallbacks();
 
         auto interpreter = InterpreterFactory::get(ast, context, SelectQueryOptions(stage).setInternal(internal));
 
         std::shared_ptr<const EnabledQuota> quota;
         if (!interpreter->ignoreQuota())
         {
-            quota = context.getQuota();
+            quota = context->getQuota();
             if (quota)
             {
                 if (ast->as<ASTSelectQuery>() || ast->as<ASTSelectWithUnionQuery>())
@@ -554,7 +569,7 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
             /// Save insertion table (not table function). TODO: support remote() table function.
             auto table_id = insert_interpreter->getDatabaseTable();
             if (!table_id.empty())
-                context.setInsertionTable(std::move(table_id));
+                context->setInsertionTable(std::move(table_id));
         }
 
         if (process_list_entry)
@@ -574,8 +589,8 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
         {
             /// Limits on the result, the quota on the result, and also callback for progress.
             /// Limits apply only to the final result.
-            pipeline.setProgressCallback(context.getProgressCallback());
-            pipeline.setProcessListElement(context.getProcessListElement());
+            pipeline.setProgressCallback(context->getProgressCallback());
+            pipeline.setProcessListElement(context->getProcessListElement());
             if (stage == QueryProcessingStage::Complete && !pipeline.isCompleted())
             {
                 pipeline.resize(1);
@@ -593,8 +608,8 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
             /// Limits apply only to the final result.
             if (res.in)
             {
-                res.in->setProgressCallback(context.getProgressCallback());
-                res.in->setProcessListElement(context.getProcessListElement());
+                res.in->setProgressCallback(context->getProgressCallback());
+                res.in->setProcessListElement(context->getProcessListElement());
                 if (stage == QueryProcessingStage::Complete)
                 {
                     if (!interpreter->ignoreQuota())
@@ -608,7 +623,7 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
             {
                 if (auto * stream = dynamic_cast<CountingBlockOutputStream *>(res.out.get()))
                 {
-                    stream->setProcessListElement(context.getProcessListElement());
+                    stream->setProcessListElement(context->getProcessListElement());
                 }
             }
         }
@@ -624,11 +639,11 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
             elem.query_start_time = time_in_seconds(current_time);
             elem.query_start_time_microseconds = time_in_microseconds(current_time);
 
-            elem.current_database = context.getCurrentDatabase();
+            elem.current_database = context->getCurrentDatabase();
             elem.query = query_for_logging;
             elem.normalized_query_hash = normalizedQueryHash<false>(query_for_logging);
 
-            elem.client_info = context.getClientInfo();
+            elem.client_info = context->getClientInfo();
 
             bool log_queries = settings.log_queries && !internal;
 
@@ -637,7 +652,7 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
             {
                 if (use_processors)
                 {
-                    const auto & info = context.getQueryAccessInfo();
+                    const auto & info = context->getQueryAccessInfo();
                     elem.query_databases = info.databases;
                     elem.query_tables = info.tables;
                     elem.query_columns = info.columns;
@@ -646,7 +661,7 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
                 interpreter->extendQueryLogElem(elem, ast, context, query_database, query_table);
 
                 if (settings.log_query_settings)
-                    elem.query_settings = std::make_shared<Settings>(context.getSettingsRef());
+                    elem.query_settings = std::make_shared<Settings>(context->getSettingsRef());
 
                 elem.log_comment = settings.log_comment;
                 if (elem.log_comment.size() > settings.max_query_size)
@@ -654,7 +669,7 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
 
                 if (elem.type >= settings.log_queries_min_type && !settings.log_queries_min_query_duration_ms.totalMilliseconds())
                 {
-                    if (auto query_log = context.getQueryLog())
+                    if (auto query_log = context->getQueryLog())
                         query_log->add(elem);
                 }
             }
@@ -688,7 +703,7 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
             };
 
             /// Also make possible for caller to log successful query finish and exception during execution.
-            auto finish_callback = [elem, &context, ast,
+            auto finish_callback = [elem, context, ast,
                  log_queries,
                  log_queries_min_type = settings.log_queries_min_type,
                  log_queries_min_query_duration_ms = settings.log_queries_min_query_duration_ms.totalMilliseconds(),
@@ -696,7 +711,7 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
             ]
                 (IBlockInputStream * stream_in, IBlockOutputStream * stream_out, QueryPipeline * query_pipeline) mutable
             {
-                QueryStatus * process_list_elem = context.getProcessListElement();
+                QueryStatus * process_list_elem = context->getProcessListElement();
 
                 if (!process_list_elem)
                     return;
@@ -704,7 +719,7 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
                 /// Update performance counters before logging to query_log
                 CurrentThread::finalizePerformanceCounters();
 
-                QueryStatusInfo info = process_list_elem->getInfo(true, context.getSettingsRef().log_profile_events);
+                QueryStatusInfo info = process_list_elem->getInfo(true, context->getSettingsRef().log_profile_events);
 
                 double elapsed_seconds = info.elapsed_seconds;
 
@@ -717,7 +732,7 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
                 elem.event_time_microseconds = time_in_microseconds(finish_time);
                 status_info_to_query_log(elem, info, ast);
 
-                auto progress_callback = context.getProgressCallback();
+                auto progress_callback = context->getProgressCallback();
 
                 if (progress_callback)
                     progress_callback(Progress(WriteProgress(info.written_rows, info.written_bytes)));
@@ -759,7 +774,7 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
                 elem.thread_ids = std::move(info.thread_ids);
                 elem.profile_counters = std::move(info.profile_counters);
 
-                const auto & factories_info = context.getQueryFactoriesInfo();
+                const auto & factories_info = context->getQueryFactoriesInfo();
                 elem.used_aggregate_functions = factories_info.aggregate_functions;
                 elem.used_aggregate_function_combinators = factories_info.aggregate_function_combinators;
                 elem.used_database_engines = factories_info.database_engines;
@@ -772,18 +787,18 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
 
                 if (log_queries && elem.type >= log_queries_min_type && Int64(elem.query_duration_ms) >= log_queries_min_query_duration_ms)
                 {
-                    if (auto query_log = context.getQueryLog())
+                    if (auto query_log = context->getQueryLog())
                         query_log->add(elem);
                 }
 
-                if (auto opentelemetry_span_log = context.getOpenTelemetrySpanLog();
-                    context.query_trace_context.trace_id
+                if (auto opentelemetry_span_log = context->getOpenTelemetrySpanLog();
+                    context->query_trace_context.trace_id
                         && opentelemetry_span_log)
                 {
                     OpenTelemetrySpanLogElement span;
-                    span.trace_id = context.query_trace_context.trace_id;
-                    span.span_id = context.query_trace_context.span_id;
-                    span.parent_span_id = context.getClientInfo().client_trace_context.span_id;
+                    span.trace_id = context->query_trace_context.trace_id;
+                    span.span_id = context->query_trace_context.span_id;
+                    span.parent_span_id = context->getClientInfo().client_trace_context.span_id;
                     span.operation_name = "query";
                     span.start_time_us = elem.query_start_time_microseconds;
                     span.finish_time_us = time_in_microseconds(finish_time);
@@ -797,18 +812,18 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
 
                     span.attribute_names.push_back("clickhouse.query_id");
                     span.attribute_values.push_back(elem.client_info.current_query_id);
-                    if (!context.query_trace_context.tracestate.empty())
+                    if (!context->query_trace_context.tracestate.empty())
                     {
                         span.attribute_names.push_back("clickhouse.tracestate");
                         span.attribute_values.push_back(
-                            context.query_trace_context.tracestate);
+                            context->query_trace_context.tracestate);
                     }
 
                     opentelemetry_span_log->add(span);
                 }
             };
 
-            auto exception_callback = [elem, &context, ast,
+            auto exception_callback = [elem, context, ast,
                  log_queries,
                  log_queries_min_type = settings.log_queries_min_type,
                  log_queries_min_query_duration_ms = settings.log_queries_min_query_duration_ms.totalMilliseconds(),
@@ -829,8 +844,8 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
                 elem.exception_code = getCurrentExceptionCode();
                 elem.exception = getCurrentExceptionMessage(false);
 
-                QueryStatus * process_list_elem = context.getProcessListElement();
-                const Settings & current_settings = context.getSettingsRef();
+                QueryStatus * process_list_elem = context->getProcessListElement();
+                const Settings & current_settings = context->getSettingsRef();
 
                 /// Update performance counters before logging to query_log
                 CurrentThread::finalizePerformanceCounters();
@@ -848,7 +863,7 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
                 /// In case of exception we log internal queries also
                 if (log_queries && elem.type >= log_queries_min_type && Int64(elem.query_duration_ms) >= log_queries_min_query_duration_ms)
                 {
-                    if (auto query_log = context.getQueryLog())
+                    if (auto query_log = context->getQueryLog())
                         query_log->add(elem);
                 }
 
@@ -894,7 +909,7 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
 
 BlockIO executeQuery(
     const String & query,
-    Context & context,
+    ContextPtr context,
     bool internal,
     QueryProcessingStage::Enum stage,
     bool may_have_embedded_data)
@@ -908,7 +923,7 @@ BlockIO executeQuery(
     {
         String format_name = ast_query_with_output->format
                 ? getIdentifierName(ast_query_with_output->format)
-                : context.getDefaultFormat();
+                : context->getDefaultFormat();
 
         if (format_name == "Null")
             streams.null_format = true;
@@ -919,7 +934,7 @@ BlockIO executeQuery(
 
 BlockIO executeQuery(
     const String & query,
-    Context & context,
+    ContextPtr context,
     bool internal,
     QueryProcessingStage::Enum stage,
     bool may_have_embedded_data,
@@ -938,7 +953,7 @@ void executeQuery(
     ReadBuffer & istr,
     WriteBuffer & ostr,
     bool allow_into_outfile,
-    Context & context,
+    ContextPtr context,
     std::function<void(const String &, const String &, const String &, const String &)> set_result_details)
 {
     PODArray<char> parse_buf;
@@ -949,7 +964,7 @@ void executeQuery(
     if (!istr.hasPendingData())
         istr.next();
 
-    size_t max_query_size = context.getSettingsRef().max_query_size;
+    size_t max_query_size = context->getSettingsRef().max_query_size;
 
     bool may_have_tail;
     if (istr.buffer().end() - istr.position() > static_cast<ssize_t>(max_query_size))
@@ -1008,12 +1023,12 @@ void executeQuery(
 
             String format_name = ast_query_with_output && (ast_query_with_output->format != nullptr)
                 ? getIdentifierName(ast_query_with_output->format)
-                : context.getDefaultFormat();
+                : context->getDefaultFormat();
 
-            auto out = context.getOutputStream(format_name, *out_buf, streams.in->getHeader());
+            auto out = context->getOutputStreamParallelIfPossible(format_name, *out_buf, streams.in->getHeader());
 
             /// Save previous progress callback if any. TODO Do it more conveniently.
-            auto previous_progress_callback = context.getProgressCallback();
+            auto previous_progress_callback = context->getProgressCallback();
 
             /// NOTE Progress callback takes shared ownership of 'out'.
             streams.in->setProgressCallback([out, previous_progress_callback] (const Progress & progress)
@@ -1024,7 +1039,8 @@ void executeQuery(
             });
 
             if (set_result_details)
-                set_result_details(context.getClientInfo().current_query_id, out->getContentType(), format_name, DateLUT::instance().getTimeZone());
+                set_result_details(
+                    context->getClientInfo().current_query_id, out->getContentType(), format_name, DateLUT::instance().getTimeZone());
 
             copyData(*streams.in, *out, [](){ return false; }, [&out](const Block &) { out->flush(); });
         }
@@ -1046,7 +1062,7 @@ void executeQuery(
 
             String format_name = ast_query_with_output && (ast_query_with_output->format != nullptr)
                                  ? getIdentifierName(ast_query_with_output->format)
-                                 : context.getDefaultFormat();
+                                 : context->getDefaultFormat();
 
             if (!pipeline.isCompleted())
             {
@@ -1055,11 +1071,11 @@ void executeQuery(
                     return std::make_shared<MaterializingTransform>(header);
                 });
 
-                auto out = context.getOutputFormat(format_name, *out_buf, pipeline.getHeader());
+                auto out = context->getOutputFormatParallelIfPossible(format_name, *out_buf, pipeline.getHeader());
                 out->setAutoFlush();
 
                 /// Save previous progress callback if any. TODO Do it more conveniently.
-                auto previous_progress_callback = context.getProgressCallback();
+                auto previous_progress_callback = context->getProgressCallback();
 
                 /// NOTE Progress callback takes shared ownership of 'out'.
                 pipeline.setProgressCallback([out, previous_progress_callback] (const Progress & progress)
@@ -1070,13 +1086,14 @@ void executeQuery(
                 });
 
                 if (set_result_details)
-                    set_result_details(context.getClientInfo().current_query_id, out->getContentType(), format_name, DateLUT::instance().getTimeZone());
+                    set_result_details(
+                        context->getClientInfo().current_query_id, out->getContentType(), format_name, DateLUT::instance().getTimeZone());
 
                 pipeline.setOutputFormat(std::move(out));
             }
             else
             {
-                pipeline.setProgressCallback(context.getProgressCallback());
+                pipeline.setProgressCallback(context->getProgressCallback());
             }
 
             {
diff --git a/src/Interpreters/executeQuery.h b/src/Interpreters/executeQuery.h
index 2850bb3baf4..bdb1f877ce3 100644
--- a/src/Interpreters/executeQuery.h
+++ b/src/Interpreters/executeQuery.h
@@ -2,7 +2,6 @@
 
 #include <Core/QueryProcessingStage.h>
 #include <DataStreams/BlockIO.h>
-
 #include <Processors/QueryPipeline.h>
 
 namespace DB
@@ -10,7 +9,6 @@ namespace DB
 
 class ReadBuffer;
 class WriteBuffer;
-class Context;
 
 
 /// Parse and execute a query.
@@ -18,7 +16,7 @@ void executeQuery(
     ReadBuffer & istr,                  /// Where to read query from (and data for INSERT, if present).
     WriteBuffer & ostr,                 /// Where to write query output to.
     bool allow_into_outfile,            /// If true and the query contains INTO OUTFILE section, redirect output to that file.
-    Context & context,                  /// DB, tables, data types, storage engines, functions, aggregate functions...
+    ContextPtr context,                 /// DB, tables, data types, storage engines, functions, aggregate functions...
     std::function<void(const String &, const String &, const String &, const String &)> set_result_details /// If a non-empty callback is passed, it will be called with the query id, the content-type, the format, and the timezone.
 );
 
@@ -39,7 +37,7 @@ void executeQuery(
 /// must be done separately.
 BlockIO executeQuery(
     const String & query,     /// Query text without INSERT data. The latter must be written to BlockIO::out.
-    Context & context,        /// DB, tables, data types, storage engines, functions, aggregate functions...
+    ContextPtr context,       /// DB, tables, data types, storage engines, functions, aggregate functions...
     bool internal = false,    /// If true, this query is caused by another query and thus needn't be registered in the ProcessList.
     QueryProcessingStage::Enum stage = QueryProcessingStage::Complete,    /// To which stage the query must be executed.
     bool may_have_embedded_data = false /// If insert query may have embedded data
@@ -48,7 +46,7 @@ BlockIO executeQuery(
 /// Old interface with allow_processors flag. For compatibility.
 BlockIO executeQuery(
     const String & query,
-    Context & context,
+    ContextPtr context,
     bool internal,
     QueryProcessingStage::Enum stage,
     bool may_have_embedded_data,
diff --git a/src/Interpreters/getClusterName.cpp b/src/Interpreters/getClusterName.cpp
index 01e45e1d650..fee10e32d70 100644
--- a/src/Interpreters/getClusterName.cpp
+++ b/src/Interpreters/getClusterName.cpp
@@ -46,7 +46,7 @@ std::string getClusterName(const IAST & node)
 }
 
 
-String getClusterNameAndMakeLiteral(ASTPtr & node)
+std::string getClusterNameAndMakeLiteral(ASTPtr & node)
 {
     String cluster_name = getClusterName(*node);
     node = std::make_shared<ASTLiteral>(cluster_name);
diff --git a/src/Interpreters/getClusterName.h b/src/Interpreters/getClusterName.h
index 55b73ce3ccf..faf8975ede1 100644
--- a/src/Interpreters/getClusterName.h
+++ b/src/Interpreters/getClusterName.h
@@ -14,8 +14,8 @@ namespace DB
   * This name will be parsed as an expression with an operator minus - not at all what you need.
   * Therefore, consider this case separately.
   */
-String getClusterName(const IAST & node);
+std::string getClusterName(const IAST & node);
 
-String getClusterNameAndMakeLiteral(ASTPtr & node);
+std::string getClusterNameAndMakeLiteral(ASTPtr & node);
 
 }
diff --git a/src/Interpreters/getHeaderForProcessingStage.cpp b/src/Interpreters/getHeaderForProcessingStage.cpp
index e341a5637f4..9c7c86a0b88 100644
--- a/src/Interpreters/getHeaderForProcessingStage.cpp
+++ b/src/Interpreters/getHeaderForProcessingStage.cpp
@@ -12,21 +12,27 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
-/// Rewrite original query removing joined tables from it
-bool removeJoin(ASTSelectQuery & select)
+bool hasJoin(const ASTSelectQuery & select)
 {
     const auto & tables = select.tables();
     if (!tables || tables->children.size() < 2)
         return false;
 
     const auto & joined_table = tables->children[1]->as<ASTTablesInSelectQueryElement &>();
-    if (!joined_table.table_join)
-        return false;
+    return joined_table.table_join != nullptr;
+}
 
-    /// The most simple temporary solution: leave only the first table in query.
-    /// TODO: we also need to remove joined columns and related functions (taking in account aliases if any).
-    tables->children.resize(1);
-    return true;
+/// Rewrite original query removing joined tables from it
+bool removeJoin(ASTSelectQuery & select)
+{
+    if (hasJoin(select))
+    {
+        /// The most simple temporary solution: leave only the first table in query.
+        /// TODO: we also need to remove joined columns and related functions (taking in account aliases if any).
+        select.tables()->children.resize(1);
+        return true;
+    }
+    return false;
 }
 
 Block getHeaderForProcessingStage(
@@ -34,7 +40,7 @@ Block getHeaderForProcessingStage(
         const Names & column_names,
         const StorageMetadataPtr & metadata_snapshot,
         const SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage)
 {
     switch (processed_stage)
@@ -44,9 +50,19 @@ Block getHeaderForProcessingStage(
             Block header = metadata_snapshot->getSampleBlockForColumns(column_names, storage.getVirtuals(), storage.getStorageID());
             if (query_info.prewhere_info)
             {
-                query_info.prewhere_info->prewhere_actions->execute(header);
-                if (query_info.prewhere_info->remove_prewhere_column)
-                    header.erase(query_info.prewhere_info->prewhere_column_name);
+                auto & prewhere_info = *query_info.prewhere_info;
+
+                if (prewhere_info.row_level_filter)
+                {
+                    prewhere_info.row_level_filter->execute(header);
+                    header.erase(prewhere_info.row_level_column_name);
+                }
+
+                if (prewhere_info.prewhere_actions)
+                    prewhere_info.prewhere_actions->execute(header);
+
+                if (prewhere_info.remove_prewhere_column)
+                    header.erase(prewhere_info.prewhere_column_name);
             }
             return header;
         }
diff --git a/src/Interpreters/getHeaderForProcessingStage.h b/src/Interpreters/getHeaderForProcessingStage.h
index ec238edf774..75a89bc5d39 100644
--- a/src/Interpreters/getHeaderForProcessingStage.h
+++ b/src/Interpreters/getHeaderForProcessingStage.h
@@ -1,7 +1,9 @@
 #pragma once
+
 #include <Core/Block.h>
 #include <Core/Names.h>
 #include <Core/QueryProcessingStage.h>
+#include <Interpreters/Context_fwd.h>
 
 
 namespace DB
@@ -11,9 +13,9 @@ class IStorage;
 struct StorageInMemoryMetadata;
 using StorageMetadataPtr = std::shared_ptr<const StorageInMemoryMetadata>;
 struct SelectQueryInfo;
-class Context;
 class ASTSelectQuery;
 
+bool hasJoin(const ASTSelectQuery & select);
 bool removeJoin(ASTSelectQuery & select);
 
 Block getHeaderForProcessingStage(
@@ -21,7 +23,7 @@ Block getHeaderForProcessingStage(
         const Names & column_names,
         const StorageMetadataPtr & metadata_snapshot,
         const SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage);
 
 }
diff --git a/src/Interpreters/getTableExpressions.cpp b/src/Interpreters/getTableExpressions.cpp
index a4e971c302c..22eb307071c 100644
--- a/src/Interpreters/getTableExpressions.cpp
+++ b/src/Interpreters/getTableExpressions.cpp
@@ -75,7 +75,7 @@ ASTPtr extractTableExpression(const ASTSelectQuery & select, size_t table_number
 
 static NamesAndTypesList getColumnsFromTableExpression(
     const ASTTableExpression & table_expression,
-    const Context & context,
+    ContextPtr context,
     NamesAndTypesList & materialized,
     NamesAndTypesList & aliases,
     NamesAndTypesList & virtuals)
@@ -89,7 +89,7 @@ static NamesAndTypesList getColumnsFromTableExpression(
     else if (table_expression.table_function)
     {
         const auto table_function = table_expression.table_function;
-        auto * query_context = const_cast<Context *>(&context.getQueryContext());
+        auto query_context = context->getQueryContext();
         const auto & function_storage = query_context->executeTableFunction(table_function);
         auto function_metadata_snapshot = function_storage->getInMemoryMetadataPtr();
         const auto & columns = function_metadata_snapshot->getColumns();
@@ -100,7 +100,7 @@ static NamesAndTypesList getColumnsFromTableExpression(
     }
     else if (table_expression.database_and_table_name)
     {
-        auto table_id = context.resolveStorageID(table_expression.database_and_table_name);
+        auto table_id = context->resolveStorageID(table_expression.database_and_table_name);
         const auto & table = DatabaseCatalog::instance().getTable(table_id, context);
         auto table_metadata_snapshot = table->getInMemoryMetadataPtr();
         const auto & columns = table_metadata_snapshot->getColumns();
@@ -113,7 +113,7 @@ static NamesAndTypesList getColumnsFromTableExpression(
     return names_and_type_list;
 }
 
-NamesAndTypesList getColumnsFromTableExpression(const ASTTableExpression & table_expression, const Context & context)
+NamesAndTypesList getColumnsFromTableExpression(const ASTTableExpression & table_expression, ContextPtr context)
 {
     NamesAndTypesList materialized;
     NamesAndTypesList aliases;
@@ -121,15 +121,15 @@ NamesAndTypesList getColumnsFromTableExpression(const ASTTableExpression & table
     return getColumnsFromTableExpression(table_expression, context, materialized, aliases, virtuals);
 }
 
-TablesWithColumns getDatabaseAndTablesWithColumns(const std::vector<const ASTTableExpression *> & table_expressions, const Context & context)
+TablesWithColumns getDatabaseAndTablesWithColumns(const std::vector<const ASTTableExpression *> & table_expressions, ContextPtr context)
 {
     TablesWithColumns tables_with_columns;
 
     if (!table_expressions.empty())
     {
-        String current_database = context.getCurrentDatabase();
-        bool include_alias_cols = context.getSettingsRef().asterisk_include_alias_columns;
-        bool include_materialized_cols = context.getSettingsRef().asterisk_include_materialized_columns;
+        String current_database = context->getCurrentDatabase();
+        bool include_alias_cols = context->getSettingsRef().asterisk_include_alias_columns;
+        bool include_materialized_cols = context->getSettingsRef().asterisk_include_materialized_columns;
 
         for (const ASTTableExpression * table_expression : table_expressions)
         {
diff --git a/src/Interpreters/getTableExpressions.h b/src/Interpreters/getTableExpressions.h
index 9254fb9d6a0..961176437b5 100644
--- a/src/Interpreters/getTableExpressions.h
+++ b/src/Interpreters/getTableExpressions.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <Core/NamesAndTypes.h>
+#include <Interpreters/Context_fwd.h>
 #include <Interpreters/DatabaseAndTableWithAlias.h>
 
 namespace DB
@@ -8,7 +9,6 @@ namespace DB
 
 struct ASTTableExpression;
 class ASTSelectQuery;
-class Context;
 
 NameSet removeDuplicateColumns(NamesAndTypesList & columns);
 
@@ -16,7 +16,7 @@ std::vector<const ASTTableExpression *> getTableExpressions(const ASTSelectQuery
 const ASTTableExpression * getTableExpression(const ASTSelectQuery & select, size_t table_number);
 ASTPtr extractTableExpression(const ASTSelectQuery & select, size_t table_number);
 
-NamesAndTypesList getColumnsFromTableExpression(const ASTTableExpression & table_expression, const Context & context);
-TablesWithColumns getDatabaseAndTablesWithColumns(const std::vector<const ASTTableExpression *> & table_expressions, const Context & context);
+NamesAndTypesList getColumnsFromTableExpression(const ASTTableExpression & table_expression, ContextPtr context);
+TablesWithColumns getDatabaseAndTablesWithColumns(const std::vector<const ASTTableExpression *> & table_expressions, ContextPtr context);
 
 }
diff --git a/src/Interpreters/inplaceBlockConversions.cpp b/src/Interpreters/inplaceBlockConversions.cpp
index d06cde99425..ec625ff186e 100644
--- a/src/Interpreters/inplaceBlockConversions.cpp
+++ b/src/Interpreters/inplaceBlockConversions.cpp
@@ -92,7 +92,7 @@ ActionsDAGPtr createExpressions(
     ASTPtr expr_list,
     bool save_unneeded_columns,
     const NamesAndTypesList & required_columns,
-    const Context & context)
+    ContextPtr context)
 {
     if (!expr_list)
         return nullptr;
@@ -114,7 +114,7 @@ ActionsDAGPtr createExpressions(
 
 }
 
-void performRequiredConversions(Block & block, const NamesAndTypesList & required_columns, const Context & context)
+void performRequiredConversions(Block & block, const NamesAndTypesList & required_columns, ContextPtr context)
 {
     ASTPtr conversion_expr_list = convertRequiredExpressions(block, required_columns);
     if (conversion_expr_list->children.empty())
@@ -122,7 +122,7 @@ void performRequiredConversions(Block & block, const NamesAndTypesList & require
 
     if (auto dag = createExpressions(block, conversion_expr_list, true, required_columns, context))
     {
-        auto expression = std::make_shared<ExpressionActions>(std::move(dag));
+        auto expression = std::make_shared<ExpressionActions>(std::move(dag), ExpressionActionsSettings::fromContext(context));
         expression->execute(block);
     }
 }
@@ -131,7 +131,7 @@ ActionsDAGPtr evaluateMissingDefaults(
     const Block & header,
     const NamesAndTypesList & required_columns,
     const ColumnsDescription & columns,
-    const Context & context, bool save_unneeded_columns)
+    ContextPtr context, bool save_unneeded_columns)
 {
     if (!columns.hasDefaults())
         return nullptr;
diff --git a/src/Interpreters/inplaceBlockConversions.h b/src/Interpreters/inplaceBlockConversions.h
index 63540e2994d..3d46523fafb 100644
--- a/src/Interpreters/inplaceBlockConversions.h
+++ b/src/Interpreters/inplaceBlockConversions.h
@@ -1,15 +1,16 @@
 #pragma once
 
-#include <unordered_map>
-#include <string>
+#include <Interpreters/Context_fwd.h>
+
 #include <memory>
+#include <string>
+#include <unordered_map>
 
 
 namespace DB
 {
 
 class Block;
-class Context;
 class NamesAndTypesList;
 class ColumnsDescription;
 
@@ -22,10 +23,9 @@ ActionsDAGPtr evaluateMissingDefaults(
     const Block & header,
     const NamesAndTypesList & required_columns,
     const ColumnsDescription & columns,
-    const Context & context, bool save_unneeded_columns = true);
+    ContextPtr context, bool save_unneeded_columns = true);
 
 /// Tries to convert columns in block to required_columns
-void performRequiredConversions(Block & block,
-    const NamesAndTypesList & required_columns,
-    const Context & context);
+void performRequiredConversions(Block & block, const NamesAndTypesList & required_columns, ContextPtr context);
+
 }
diff --git a/src/Interpreters/interpretSubquery.cpp b/src/Interpreters/interpretSubquery.cpp
index cf343a4fda2..2fb2f390b67 100644
--- a/src/Interpreters/interpretSubquery.cpp
+++ b/src/Interpreters/interpretSubquery.cpp
@@ -22,14 +22,14 @@ namespace ErrorCodes
 }
 
 std::shared_ptr<InterpreterSelectWithUnionQuery> interpretSubquery(
-    const ASTPtr & table_expression, const Context & context, size_t subquery_depth, const Names & required_source_columns)
+    const ASTPtr & table_expression, ContextPtr context, size_t subquery_depth, const Names & required_source_columns)
 {
     auto subquery_options = SelectQueryOptions(QueryProcessingStage::Complete, subquery_depth);
     return interpretSubquery(table_expression, context, required_source_columns, subquery_options);
 }
 
 std::shared_ptr<InterpreterSelectWithUnionQuery> interpretSubquery(
-    const ASTPtr & table_expression, const Context & context, const Names & required_source_columns, const SelectQueryOptions & options)
+    const ASTPtr & table_expression, ContextPtr context, const Names & required_source_columns, const SelectQueryOptions & options)
 {
     if (auto * expr = table_expression->as<ASTTableExpression>())
     {
@@ -59,13 +59,13 @@ std::shared_ptr<InterpreterSelectWithUnionQuery> interpretSubquery(
       *  max_rows_in_join, max_bytes_in_join, join_overflow_mode,
       *  which are checked separately (in the Set, Join objects).
       */
-    Context subquery_context = context;
-    Settings subquery_settings = context.getSettings();
+    auto subquery_context = Context::createCopy(context);
+    Settings subquery_settings = context->getSettings();
     subquery_settings.max_result_rows = 0;
     subquery_settings.max_result_bytes = 0;
     /// The calculation of `extremes` does not make sense and is not necessary (if you do it, then the `extremes` of the subquery can be taken instead of the whole query).
     subquery_settings.extremes = false;
-    subquery_context.setSettings(subquery_settings);
+    subquery_context->setSettings(subquery_settings);
 
     auto subquery_options = options.subquery();
 
@@ -88,14 +88,14 @@ std::shared_ptr<InterpreterSelectWithUnionQuery> interpretSubquery(
         /// get columns list for target table
         if (function)
         {
-            auto * query_context = const_cast<Context *>(&context.getQueryContext());
+            auto query_context = context->getQueryContext();
             const auto & storage = query_context->executeTableFunction(table_expression);
             columns = storage->getInMemoryMetadataPtr()->getColumns().getOrdinary();
             select_query->addTableFunction(*const_cast<ASTPtr *>(&table_expression)); // XXX: const_cast should be avoided!
         }
         else
         {
-            auto table_id = context.resolveStorageID(table_expression);
+            auto table_id = context->resolveStorageID(table_expression);
             const auto & storage = DatabaseCatalog::instance().getTable(table_id, context);
             columns = storage->getInMemoryMetadataPtr()->getColumns().getOrdinary();
             select_query->replaceDatabaseAndTable(table_id);
diff --git a/src/Interpreters/interpretSubquery.h b/src/Interpreters/interpretSubquery.h
index 2aee6ffd81a..3836d1f7664 100644
--- a/src/Interpreters/interpretSubquery.h
+++ b/src/Interpreters/interpretSubquery.h
@@ -6,12 +6,10 @@
 namespace DB
 {
 
-class Context;
+std::shared_ptr<InterpreterSelectWithUnionQuery> interpretSubquery(
+    const ASTPtr & table_expression, ContextPtr context, size_t subquery_depth, const Names & required_source_columns);
 
 std::shared_ptr<InterpreterSelectWithUnionQuery> interpretSubquery(
-    const ASTPtr & table_expression, const Context & context, size_t subquery_depth, const Names & required_source_columns);
-
-std::shared_ptr<InterpreterSelectWithUnionQuery> interpretSubquery(
-    const ASTPtr & table_expression, const Context & context, const Names & required_source_columns, const SelectQueryOptions & options);
+    const ASTPtr & table_expression, ContextPtr context, const Names & required_source_columns, const SelectQueryOptions & options);
 
 }
diff --git a/src/Interpreters/join_common.cpp b/src/Interpreters/join_common.cpp
index a4c39a45efa..9a9253cee75 100644
--- a/src/Interpreters/join_common.cpp
+++ b/src/Interpreters/join_common.cpp
@@ -1,9 +1,11 @@
 #include <Interpreters/join_common.h>
 #include <Interpreters/TableJoin.h>
+#include <Interpreters/ActionsDAG.h>
 #include <Columns/ColumnNullable.h>
 #include <Columns/ColumnLowCardinality.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypeLowCardinality.h>
+#include <DataTypes/getLeastSupertype.h>
 #include <DataStreams/materializeBlock.h>
 #include <IO/WriteHelpers.h>
 
@@ -251,13 +253,27 @@ void createMissedColumns(Block & block)
     }
 }
 
-void joinTotals(const Block & totals, const Block & columns_to_add, const Names & key_names_right, Block & block)
+/// Append totals from right to left block, correct types if needed
+void joinTotals(const Block & totals, const Block & columns_to_add, const TableJoin & table_join, Block & block)
 {
+    if (table_join.forceNullableLeft())
+        convertColumnsToNullable(block);
+
     if (Block totals_without_keys = totals)
     {
-        for (const auto & name : key_names_right)
+        for (const auto & name : table_join.keyNamesRight())
             totals_without_keys.erase(totals_without_keys.getPositionByName(name));
 
+        for (auto & col : totals_without_keys)
+        {
+            if (table_join.rightBecomeNullable(col.type))
+                JoinCommon::convertColumnToNullable(col);
+
+            /// In case of arrayJoin it can be not one row
+            if (col.column->size() != 1)
+                col.column = col.column->cloneResized(1);
+        }
+
         for (size_t i = 0; i < totals_without_keys.columns(); ++i)
             block.insert(totals_without_keys.safeGetByPosition(i));
     }
@@ -283,6 +299,13 @@ void addDefaultValues(IColumn & column, const DataTypePtr & type, size_t count)
         type->insertDefaultInto(column);
 }
 
+bool typesEqualUpToNullability(DataTypePtr left_type, DataTypePtr right_type)
+{
+    DataTypePtr left_type_strict = removeNullable(recursiveRemoveLowCardinality(left_type));
+    DataTypePtr right_type_strict = removeNullable(recursiveRemoveLowCardinality(right_type));
+    return left_type_strict->equals(*right_type_strict);
+}
+
 }
 
 
@@ -297,19 +320,21 @@ NotJoined::NotJoined(const TableJoin & table_join, const Block & saved_block_sam
     table_join.splitAdditionalColumns(right_sample_block, right_table_keys, sample_block_with_columns_to_add);
     Block required_right_keys = table_join.getRequiredRightKeys(right_table_keys, tmp);
 
-    bool remap_keys = table_join.hasUsing();
     std::unordered_map<size_t, size_t> left_to_right_key_remap;
 
-    for (size_t i = 0; i < table_join.keyNamesLeft().size(); ++i)
+    if (table_join.hasUsing())
     {
-        const String & left_key_name = table_join.keyNamesLeft()[i];
-        const String & right_key_name = table_join.keyNamesRight()[i];
+        for (size_t i = 0; i < table_join.keyNamesLeft().size(); ++i)
+        {
+            const String & left_key_name = table_join.keyNamesLeft()[i];
+            const String & right_key_name = table_join.keyNamesRight()[i];
 
-        size_t left_key_pos = result_sample_block.getPositionByName(left_key_name);
-        size_t right_key_pos = saved_block_sample.getPositionByName(right_key_name);
+            size_t left_key_pos = result_sample_block.getPositionByName(left_key_name);
+            size_t right_key_pos = saved_block_sample.getPositionByName(right_key_name);
 
-        if (remap_keys && !required_right_keys.has(right_key_name))
-            left_to_right_key_remap[left_key_pos] = right_key_pos;
+            if (!required_right_keys.has(right_key_name))
+                left_to_right_key_remap[left_key_pos] = right_key_pos;
+        }
     }
 
     /// result_sample_block: left_sample_block + left expressions, right not key columns, required right keys
diff --git a/src/Interpreters/join_common.h b/src/Interpreters/join_common.h
index 6f9f7dd1210..cec41438448 100644
--- a/src/Interpreters/join_common.h
+++ b/src/Interpreters/join_common.h
@@ -2,6 +2,8 @@
 
 #include <Core/Block.h>
 #include <Interpreters/IJoin.h>
+#include <Interpreters/ActionsDAG.h>
+#include <Interpreters/ExpressionActions.h>
 
 namespace DB
 {
@@ -32,10 +34,12 @@ ColumnRawPtrs extractKeysForJoin(const Block & block_keys, const Names & key_nam
 void checkTypesOfKeys(const Block & block_left, const Names & key_names_left, const Block & block_right, const Names & key_names_right);
 
 void createMissedColumns(Block & block);
-void joinTotals(const Block & totals, const Block & columns_to_add, const Names & key_names_right, Block & block);
+void joinTotals(const Block & totals, const Block & columns_to_add, const TableJoin & table_join, Block & block);
 
 void addDefaultValues(IColumn & column, const DataTypePtr & type, size_t count);
 
+bool typesEqualUpToNullability(DataTypePtr left_type, DataTypePtr right_type);
+
 }
 
 /// Creates result from right table data in RIGHT and FULL JOIN when keys are not present in left table.
diff --git a/src/Interpreters/loadMetadata.cpp b/src/Interpreters/loadMetadata.cpp
index 71d3c7e6e5b..79076e57328 100644
--- a/src/Interpreters/loadMetadata.cpp
+++ b/src/Interpreters/loadMetadata.cpp
@@ -25,13 +25,14 @@ namespace DB
 
 static void executeCreateQuery(
     const String & query,
-    Context & context,
+    ContextPtr context,
     const String & database,
     const String & file_name,
     bool has_force_restore_data_flag)
 {
     ParserCreateQuery parser;
-    ASTPtr ast = parseQuery(parser, query.data(), query.data() + query.size(), "in file " + file_name, 0, context.getSettingsRef().max_parser_depth);
+    ASTPtr ast = parseQuery(
+        parser, query.data(), query.data() + query.size(), "in file " + file_name, 0, context->getSettingsRef().max_parser_depth);
 
     auto & ast_create_query = ast->as<ASTCreateQuery &>();
     ast_create_query.database = database;
@@ -45,7 +46,7 @@ static void executeCreateQuery(
 
 
 static void loadDatabase(
-    Context & context,
+    ContextPtr context,
     const String & database,
     const String & database_path,
     bool force_restore_data)
@@ -73,8 +74,7 @@ static void loadDatabase(
 
     try
     {
-        executeCreateQuery(database_attach_query, context, database,
-            database_metadata_file, force_restore_data);
+        executeCreateQuery(database_attach_query, context, database, database_metadata_file, force_restore_data);
     }
     catch (Exception & e)
     {
@@ -84,18 +84,18 @@ static void loadDatabase(
 }
 
 
-void loadMetadata(Context & context, const String & default_database_name)
+void loadMetadata(ContextPtr context, const String & default_database_name)
 {
     Poco::Logger * log = &Poco::Logger::get("loadMetadata");
 
-    String path = context.getPath() + "metadata";
+    String path = context->getPath() + "metadata";
 
     /** There may exist 'force_restore_data' file, that means,
       *  skip safety threshold on difference of data parts while initializing tables.
       * This file is deleted after successful loading of tables.
       * (flag is "one-shot")
       */
-    Poco::File force_restore_data_flag_file(context.getFlagsPath() + "force_restore_data");
+    Poco::File force_restore_data_flag_file(context->getFlagsPath() + "force_restore_data");
     bool has_force_restore_data_flag = force_restore_data_flag_file.exists();
 
     /// Loop over databases.
@@ -168,9 +168,9 @@ void loadMetadata(Context & context, const String & default_database_name)
 }
 
 
-void loadMetadataSystem(Context & context)
+void loadMetadataSystem(ContextPtr context)
 {
-    String path = context.getPath() + "metadata/" + DatabaseCatalog::SYSTEM_DATABASE;
+    String path = context->getPath() + "metadata/" + DatabaseCatalog::SYSTEM_DATABASE;
     String metadata_file = path + ".sql";
     if (Poco::File(path).exists() || Poco::File(metadata_file).exists())
     {
diff --git a/src/Interpreters/loadMetadata.h b/src/Interpreters/loadMetadata.h
index b23887d5282..047def84bba 100644
--- a/src/Interpreters/loadMetadata.h
+++ b/src/Interpreters/loadMetadata.h
@@ -1,16 +1,16 @@
 #pragma once
 
+#include <Interpreters/Context_fwd.h>
+
 
 namespace DB
 {
 
-class Context;
-
 /// Load tables from system database. Only real tables like query_log, part_log.
 /// You should first load system database, then attach system tables that you need into it, then load other databases.
-void loadMetadataSystem(Context & context);
+void loadMetadataSystem(ContextPtr context);
 
 /// Load tables from databases and add them to context. Database 'system' is ignored. Use separate function to load system tables.
-void loadMetadata(Context & context, const String & default_database_name = {});
+void loadMetadata(ContextPtr context, const String & default_database_name = {});
 
 }
diff --git a/src/Interpreters/replaceAliasColumnsInQuery.cpp b/src/Interpreters/replaceAliasColumnsInQuery.cpp
index 4daa787c397..4c8367b269a 100644
--- a/src/Interpreters/replaceAliasColumnsInQuery.cpp
+++ b/src/Interpreters/replaceAliasColumnsInQuery.cpp
@@ -6,7 +6,7 @@
 namespace DB
 {
 
-void replaceAliasColumnsInQuery(ASTPtr & ast, const ColumnsDescription & columns, const NameSet & forbidden_columns, const Context & context)
+void replaceAliasColumnsInQuery(ASTPtr & ast, const ColumnsDescription & columns, const NameSet & forbidden_columns, ContextPtr context)
 {
     ColumnAliasesVisitor::Data aliase_column_data(columns, forbidden_columns, context);
     ColumnAliasesVisitor aliase_column_visitor(aliase_column_data);
diff --git a/src/Interpreters/replaceAliasColumnsInQuery.h b/src/Interpreters/replaceAliasColumnsInQuery.h
index bf7143ba099..92d2686b45b 100644
--- a/src/Interpreters/replaceAliasColumnsInQuery.h
+++ b/src/Interpreters/replaceAliasColumnsInQuery.h
@@ -1,14 +1,15 @@
 #pragma once
 
-#include <common/types.h>
 #include <Core/Names.h>
+#include <Interpreters/Context_fwd.h>
 #include <Parsers/IAST_fwd.h>
+#include <common/types.h>
 
 namespace DB
 {
 
 class ColumnsDescription;
-class Context;
-void replaceAliasColumnsInQuery(ASTPtr & ast, const ColumnsDescription & columns, const NameSet & forbidden_columns, const Context & context);
+
+void replaceAliasColumnsInQuery(ASTPtr & ast, const ColumnsDescription & columns, const NameSet & forbidden_columns, ContextPtr context);
 
 }
diff --git a/src/Interpreters/tests/CMakeLists.txt b/src/Interpreters/tests/CMakeLists.txt
index 1bc9d7fbacb..8905d2fe6e6 100644
--- a/src/Interpreters/tests/CMakeLists.txt
+++ b/src/Interpreters/tests/CMakeLists.txt
@@ -38,7 +38,6 @@ target_link_libraries (two_level_hash_map PRIVATE dbms)
 
 add_executable (in_join_subqueries_preprocessor in_join_subqueries_preprocessor.cpp)
 target_link_libraries (in_join_subqueries_preprocessor PRIVATE clickhouse_aggregate_functions dbms clickhouse_parsers)
-add_check(in_join_subqueries_preprocessor)
 
 if (OS_LINUX)
     add_executable (internal_iotop internal_iotop.cpp)
diff --git a/src/Interpreters/tests/gtest_cycle_aliases.cpp b/src/Interpreters/tests/gtest_cycle_aliases.cpp
index 56e23c6a497..c13e98cd69f 100644
--- a/src/Interpreters/tests/gtest_cycle_aliases.cpp
+++ b/src/Interpreters/tests/gtest_cycle_aliases.cpp
@@ -20,6 +20,6 @@ TEST(QueryNormalizer, SimpleCycleAlias)
     aliases["b"] = parseQuery(parser, "a as b", 0, 0)->children[0];
 
     Settings settings;
-    QueryNormalizer::Data normalizer_data(aliases, settings);
+    QueryNormalizer::Data normalizer_data(aliases, {}, settings);
     EXPECT_THROW(QueryNormalizer(normalizer_data).visit(ast), Exception);
 }
diff --git a/src/Interpreters/tests/in_join_subqueries_preprocessor.cpp b/src/Interpreters/tests/in_join_subqueries_preprocessor.cpp
index 2b53277d02f..efe3882d086 100644
--- a/src/Interpreters/tests/in_join_subqueries_preprocessor.cpp
+++ b/src/Interpreters/tests/in_join_subqueries_preprocessor.cpp
@@ -1156,9 +1156,9 @@ static bool run()
 
 TestResult check(const TestEntry & entry)
 {
-    static DB::SharedContextHolder shared_context = DB::Context::createShared();
-    static DB::Context context = DB::Context::createGlobal(shared_context.get());
-    context.makeGlobalContext();
+    static auto shared_context = DB::Context::createShared();
+    static auto context = DB::Context::createGlobal(shared_context.get());
+    context->makeGlobalContext();
 
     try
     {
@@ -1170,8 +1170,8 @@ TestResult check(const TestEntry & entry)
         DB::DatabaseCatalog::instance().attachDatabase("test", database);
         database->attachTable("visits_all", storage_distributed_visits);
         database->attachTable("hits_all", storage_distributed_hits);
-        context.setCurrentDatabase("test");
-        context.setSetting("distributed_product_mode", entry.mode);
+        context->setCurrentDatabase("test");
+        context->setSetting("distributed_product_mode", entry.mode);
 
         /// Parse and process the incoming query.
         DB::ASTPtr ast_input;
diff --git a/src/Interpreters/ya.make b/src/Interpreters/ya.make
index 879333db507..90998077a5a 100644
--- a/src/Interpreters/ya.make
+++ b/src/Interpreters/ya.make
@@ -50,6 +50,7 @@ SRCS(
     EmbeddedDictionaries.cpp
     ExecuteScalarSubqueriesVisitor.cpp
     ExpressionActions.cpp
+    ExpressionActionsSettings.cpp
     ExpressionAnalyzer.cpp
     ExternalDictionariesLoader.cpp
     ExternalLoader.cpp
@@ -102,6 +103,7 @@ SRCS(
     InterpreterSystemQuery.cpp
     InterpreterUseQuery.cpp
     InterpreterWatchQuery.cpp
+    InterserverCredentials.cpp
     JoinSwitcher.cpp
     JoinToSubqueryTransformVisitor.cpp
     JoinedTables.cpp
@@ -111,10 +113,12 @@ SRCS(
     MetricLog.cpp
     MutationsInterpreter.cpp
     MySQL/InterpretersMySQLDDLQuery.cpp
+    NormalizeSelectWithUnionQueryVisitor.cpp
     NullableUtils.cpp
     OpenTelemetrySpanLog.cpp
     OptimizeIfChains.cpp
     OptimizeIfWithConstantConditionVisitor.cpp
+    OptimizeShardingKeyRewriteInVisitor.cpp
     PartLog.cpp
     PredicateExpressionsOptimizer.cpp
     PredicateRewriteVisitor.cpp
diff --git a/src/Parsers/ASTAlterQuery.cpp b/src/Parsers/ASTAlterQuery.cpp
index f24b26d5b54..5b052bae856 100644
--- a/src/Parsers/ASTAlterQuery.cpp
+++ b/src/Parsers/ASTAlterQuery.cpp
@@ -245,7 +245,7 @@ void ASTAlterCommand::formatImpl(
     else if (type == ASTAlterCommand::FETCH_PARTITION)
     {
         settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str << "FETCH "
-                      << "PARTITION " << (settings.hilite ? hilite_none : "");
+                      << (part ? "PART " : "PARTITION ") << (settings.hilite ? hilite_none : "");
         partition->formatImpl(settings, state, frame);
         settings.ostr << (settings.hilite ? hilite_keyword : "")
                       << " FROM " << (settings.hilite ? hilite_none : "") << DB::quote << from;
@@ -271,6 +271,27 @@ void ASTAlterCommand::formatImpl(
                           << " " << DB::quote << with_name;
         }
     }
+    else if (type == ASTAlterCommand::UNFREEZE_PARTITION)
+    {
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str << "UNFREEZE PARTITION " << (settings.hilite ? hilite_none : "");
+        partition->formatImpl(settings, state, frame);
+
+        if (!with_name.empty())
+        {
+            settings.ostr << " " << (settings.hilite ? hilite_keyword : "") << "WITH NAME" << (settings.hilite ? hilite_none : "")
+                          << " " << DB::quote << with_name;
+        }
+    }
+    else if (type == ASTAlterCommand::UNFREEZE_ALL)
+    {
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str << "UNFREEZE";
+
+        if (!with_name.empty())
+        {
+            settings.ostr << " " << (settings.hilite ? hilite_keyword : "") << "WITH NAME" << (settings.hilite ? hilite_none : "")
+                          << " " << DB::quote << with_name;
+        }
+    }
     else if (type == ASTAlterCommand::DELETE)
     {
         settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str << "DELETE" << (settings.hilite ? hilite_none : "");
@@ -368,7 +389,8 @@ bool ASTAlterQuery::isSettingsAlter() const
 
 bool ASTAlterQuery::isFreezeAlter() const
 {
-    return isOneCommandTypeOnly(ASTAlterCommand::FREEZE_PARTITION) || isOneCommandTypeOnly(ASTAlterCommand::FREEZE_ALL);
+    return isOneCommandTypeOnly(ASTAlterCommand::FREEZE_PARTITION) || isOneCommandTypeOnly(ASTAlterCommand::FREEZE_ALL)
+        || isOneCommandTypeOnly(ASTAlterCommand::UNFREEZE_PARTITION) || isOneCommandTypeOnly(ASTAlterCommand::UNFREEZE_ALL);
 }
 
 /** Get the text that identifies this element. */
diff --git a/src/Parsers/ASTAlterQuery.h b/src/Parsers/ASTAlterQuery.h
index 4cc01aa889e..8a2bfdb1960 100644
--- a/src/Parsers/ASTAlterQuery.h
+++ b/src/Parsers/ASTAlterQuery.h
@@ -54,6 +54,8 @@ public:
         FETCH_PARTITION,
         FREEZE_PARTITION,
         FREEZE_ALL,
+        UNFREEZE_PARTITION,
+        UNFREEZE_ALL,
 
         DELETE,
         UPDATE,
@@ -153,7 +155,9 @@ public:
      */
     String from;
 
-    /** For FREEZE PARTITION - place local backup to directory with specified name.
+    /**
+     * For FREEZE PARTITION - place local backup to directory with specified name.
+     * For UNFREEZE - delete local backup at directory with specified name.
      */
     String with_name;
 
diff --git a/src/Parsers/ASTCreateQuery.cpp b/src/Parsers/ASTCreateQuery.cpp
index 2af0d2d4a45..1192fcc6ebd 100644
--- a/src/Parsers/ASTCreateQuery.cpp
+++ b/src/Parsers/ASTCreateQuery.cpp
@@ -297,12 +297,20 @@ void ASTCreateQuery::formatQueryImpl(const FormatSettings & settings, FormatStat
 
     if (to_table_id)
     {
+        assert(is_materialized_view && to_inner_uuid == UUIDHelpers::Nil);
         settings.ostr
             << (settings.hilite ? hilite_keyword : "") << " TO " << (settings.hilite ? hilite_none : "")
             << (!to_table_id.database_name.empty() ? backQuoteIfNeed(to_table_id.database_name) + "." : "")
             << backQuoteIfNeed(to_table_id.table_name);
     }
 
+    if (to_inner_uuid != UUIDHelpers::Nil)
+    {
+        assert(is_materialized_view && !to_table_id);
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << " TO INNER UUID " << (settings.hilite ? hilite_none : "")
+                      << quoteString(toString(to_inner_uuid));
+    }
+
     if (!as_table.empty())
     {
         settings.ostr
diff --git a/src/Parsers/ASTCreateQuery.h b/src/Parsers/ASTCreateQuery.h
index c9a6251cb94..d6d5c22240c 100644
--- a/src/Parsers/ASTCreateQuery.h
+++ b/src/Parsers/ASTCreateQuery.h
@@ -66,6 +66,7 @@ public:
     ASTExpressionList * tables = nullptr;
 
     StorageID to_table_id = StorageID::createEmpty();   /// For CREATE MATERIALIZED VIEW mv TO table.
+    UUID to_inner_uuid = UUIDHelpers::Nil;      /// For materialized view with inner table
     ASTStorage * storage = nullptr;
     String as_database;
     String as_table;
diff --git a/src/Parsers/ASTCreateQuotaQuery.cpp b/src/Parsers/ASTCreateQuotaQuery.cpp
index 7e570b889e3..18f72d61319 100644
--- a/src/Parsers/ASTCreateQuotaQuery.cpp
+++ b/src/Parsers/ASTCreateQuotaQuery.cpp
@@ -185,10 +185,10 @@ void ASTCreateQuotaQuery::formatImpl(const FormatSettings & settings, FormatStat
 }
 
 
-void ASTCreateQuotaQuery::replaceCurrentUserTagWithName(const String & current_user_name) const
+void ASTCreateQuotaQuery::replaceCurrentUserTag(const String & current_user_name) const
 {
     if (roles)
-        roles->replaceCurrentUserTagWithName(current_user_name);
+        roles->replaceCurrentUserTag(current_user_name);
 }
 
 }
diff --git a/src/Parsers/ASTCreateQuotaQuery.h b/src/Parsers/ASTCreateQuotaQuery.h
index a1269afafa6..00984d4b4c9 100644
--- a/src/Parsers/ASTCreateQuotaQuery.h
+++ b/src/Parsers/ASTCreateQuotaQuery.h
@@ -56,7 +56,7 @@ public:
     String getID(char) const override;
     ASTPtr clone() const override;
     void formatImpl(const FormatSettings & settings, FormatState &, FormatStateStacked) const override;
-    void replaceCurrentUserTagWithName(const String & current_user_name) const;
+    void replaceCurrentUserTag(const String & current_user_name) const;
     ASTPtr getRewrittenASTWithoutOnCluster(const std::string &) const override { return removeOnCluster<ASTCreateQuotaQuery>(clone()); }
 };
 }
diff --git a/src/Parsers/ASTCreateRowPolicyQuery.cpp b/src/Parsers/ASTCreateRowPolicyQuery.cpp
index 30b001feeca..3b4c2484acf 100644
--- a/src/Parsers/ASTCreateRowPolicyQuery.cpp
+++ b/src/Parsers/ASTCreateRowPolicyQuery.cpp
@@ -169,15 +169,15 @@ void ASTCreateRowPolicyQuery::formatImpl(const FormatSettings & settings, Format
 }
 
 
-void ASTCreateRowPolicyQuery::replaceCurrentUserTagWithName(const String & current_user_name) const
+void ASTCreateRowPolicyQuery::replaceCurrentUserTag(const String & current_user_name) const
 {
     if (roles)
-        roles->replaceCurrentUserTagWithName(current_user_name);
+        roles->replaceCurrentUserTag(current_user_name);
 }
 
-void ASTCreateRowPolicyQuery::replaceEmptyDatabaseWithCurrent(const String & current_database) const
+void ASTCreateRowPolicyQuery::replaceEmptyDatabase(const String & current_database) const
 {
     if (names)
-        names->replaceEmptyDatabaseWithCurrent(current_database);
+        names->replaceEmptyDatabase(current_database);
 }
 }
diff --git a/src/Parsers/ASTCreateRowPolicyQuery.h b/src/Parsers/ASTCreateRowPolicyQuery.h
index 9d0e2fcce7b..46a7578726e 100644
--- a/src/Parsers/ASTCreateRowPolicyQuery.h
+++ b/src/Parsers/ASTCreateRowPolicyQuery.h
@@ -49,7 +49,7 @@ public:
     void formatImpl(const FormatSettings & settings, FormatState &, FormatStateStacked) const override;
     ASTPtr getRewrittenASTWithoutOnCluster(const std::string &) const override { return removeOnCluster<ASTCreateRowPolicyQuery>(clone()); }
 
-    void replaceCurrentUserTagWithName(const String & current_user_name) const;
-    void replaceEmptyDatabaseWithCurrent(const String & current_database) const;
+    void replaceCurrentUserTag(const String & current_user_name) const;
+    void replaceEmptyDatabase(const String & current_database) const;
 };
 }
diff --git a/src/Parsers/ASTCreateSettingsProfileQuery.cpp b/src/Parsers/ASTCreateSettingsProfileQuery.cpp
index 84f8309462e..e99c40ca681 100644
--- a/src/Parsers/ASTCreateSettingsProfileQuery.cpp
+++ b/src/Parsers/ASTCreateSettingsProfileQuery.cpp
@@ -86,9 +86,9 @@ void ASTCreateSettingsProfileQuery::formatImpl(const FormatSettings & format, Fo
 }
 
 
-void ASTCreateSettingsProfileQuery::replaceCurrentUserTagWithName(const String & current_user_name) const
+void ASTCreateSettingsProfileQuery::replaceCurrentUserTag(const String & current_user_name) const
 {
     if (to_roles)
-        to_roles->replaceCurrentUserTagWithName(current_user_name);
+        to_roles->replaceCurrentUserTag(current_user_name);
 }
 }
diff --git a/src/Parsers/ASTCreateSettingsProfileQuery.h b/src/Parsers/ASTCreateSettingsProfileQuery.h
index 119019093b2..df0a11456bc 100644
--- a/src/Parsers/ASTCreateSettingsProfileQuery.h
+++ b/src/Parsers/ASTCreateSettingsProfileQuery.h
@@ -39,7 +39,7 @@ public:
     String getID(char) const override;
     ASTPtr clone() const override;
     void formatImpl(const FormatSettings & format, FormatState &, FormatStateStacked) const override;
-    void replaceCurrentUserTagWithName(const String & current_user_name) const;
+    void replaceCurrentUserTag(const String & current_user_name) const;
     ASTPtr getRewrittenASTWithoutOnCluster(const std::string &) const override { return removeOnCluster<ASTCreateSettingsProfileQuery>(clone()); }
 };
 }
diff --git a/src/Parsers/ASTCreateUserQuery.cpp b/src/Parsers/ASTCreateUserQuery.cpp
index 4b2aa70785a..696b88ea9c1 100644
--- a/src/Parsers/ASTCreateUserQuery.cpp
+++ b/src/Parsers/ASTCreateUserQuery.cpp
@@ -34,9 +34,14 @@ namespace
         }
 
         String authentication_type_name = Authentication::TypeInfo::get(authentication_type).name;
+        String by_keyword = "BY";
         std::optional<String> by_value;
 
-        if (show_password || authentication_type == Authentication::LDAP_SERVER)
+        if (
+            show_password ||
+            authentication_type == Authentication::LDAP ||
+            authentication_type == Authentication::KERBEROS
+        )
         {
             switch (authentication_type)
             {
@@ -57,9 +62,18 @@ namespace
                     by_value = authentication.getPasswordHashHex();
                     break;
                 }
-                case Authentication::LDAP_SERVER:
+                case Authentication::LDAP:
                 {
-                    by_value = authentication.getServerName();
+                    by_keyword = "SERVER";
+                    by_value = authentication.getLDAPServerName();
+                    break;
+                }
+                case Authentication::KERBEROS:
+                {
+                    by_keyword = "REALM";
+                    const auto & realm = authentication.getKerberosRealm();
+                    if (!realm.empty())
+                        by_value = realm;
                     break;
                 }
 
@@ -71,9 +85,12 @@ namespace
 
         settings.ostr << (settings.hilite ? IAST::hilite_keyword : "") << " IDENTIFIED WITH " << authentication_type_name
                       << (settings.hilite ? IAST::hilite_none : "");
+
         if (by_value)
-            settings.ostr << (settings.hilite ? IAST::hilite_keyword : "") << " BY " << (settings.hilite ? IAST::hilite_none : "")
-                << quoteString(*by_value);
+        {
+            settings.ostr << (settings.hilite ? IAST::hilite_keyword : "") << " " << by_keyword << " "
+                          << (settings.hilite ? IAST::hilite_none : "") << quoteString(*by_value);
+        }
     }
 
 
@@ -186,6 +203,13 @@ namespace
         format.ostr << (format.hilite ? IAST::hilite_keyword : "") << " SETTINGS " << (format.hilite ? IAST::hilite_none : "");
         settings.format(format);
     }
+
+
+    void formatGrantees(const ASTRolesOrUsersSet & grantees, const IAST::FormatSettings & settings)
+    {
+        settings.ostr << (settings.hilite ? IAST::hilite_keyword : "") << " GRANTEES " << (settings.hilite ? IAST::hilite_none : "");
+        grantees.format(settings);
+    }
 }
 
 
@@ -243,5 +267,8 @@ void ASTCreateUserQuery::formatImpl(const FormatSettings & format, FormatState &
 
     if (settings && (!settings->empty() || alter))
         formatSettings(*settings, format);
+
+    if (grantees)
+        formatGrantees(*grantees, format);
 }
 }
diff --git a/src/Parsers/ASTCreateUserQuery.h b/src/Parsers/ASTCreateUserQuery.h
index 1fbe7eeeb4c..1612c213f34 100644
--- a/src/Parsers/ASTCreateUserQuery.h
+++ b/src/Parsers/ASTCreateUserQuery.h
@@ -13,17 +13,19 @@ class ASTRolesOrUsersSet;
 class ASTSettingsProfileElements;
 
 /** CREATE USER [IF NOT EXISTS | OR REPLACE] name
-  *     [NOT IDENTIFIED | IDENTIFIED [WITH {no_password|plaintext_password|sha256_password|sha256_hash|double_sha1_password|double_sha1_hash|ldap_server}] BY {'password'|'hash'|'server_name'}]
+  *     [NOT IDENTIFIED | IDENTIFIED {[WITH {no_password|plaintext_password|sha256_password|sha256_hash|double_sha1_password|double_sha1_hash}] BY {'password'|'hash'}}|{WITH ldap SERVER 'server_name'}|{WITH kerberos [REALM 'realm']}]
   *     [HOST {LOCAL | NAME 'name' | REGEXP 'name_regexp' | IP 'address' | LIKE 'pattern'} [,...] | ANY | NONE]
   *     [DEFAULT ROLE role [,...]]
   *     [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | PROFILE 'profile_name'] [,...]
+  *     [GRANTEES {user | role | ANY | NONE} [,...] [EXCEPT {user | role} [,...]]]
   *
   * ALTER USER [IF EXISTS] name
-  *      [RENAME TO new_name]
-  *      [NOT IDENTIFIED | IDENTIFIED [WITH {no_password|plaintext_password|sha256_password|sha256_hash|double_sha1_password|double_sha1_hash|ldap_server}] BY {'password'|'hash'|'server_name'}]
-  *      [[ADD|DROP] HOST {LOCAL | NAME 'name' | REGEXP 'name_regexp' | IP 'address' | LIKE 'pattern'} [,...] | ANY | NONE]
-  *      [DEFAULT ROLE role [,...] | ALL | ALL EXCEPT role [,...] ]
-  *      [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | PROFILE 'profile_name'] [,...]
+  *     [RENAME TO new_name]
+  *     [NOT IDENTIFIED | IDENTIFIED {[WITH {no_password|plaintext_password|sha256_password|sha256_hash|double_sha1_password|double_sha1_hash}] BY {'password'|'hash'}}|{WITH ldap SERVER 'server_name'}|{WITH kerberos [REALM 'realm']}]
+  *     [[ADD|DROP] HOST {LOCAL | NAME 'name' | REGEXP 'name_regexp' | IP 'address' | LIKE 'pattern'} [,...] | ANY | NONE]
+  *     [DEFAULT ROLE role [,...] | ALL | ALL EXCEPT role [,...] ]
+  *     [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | PROFILE 'profile_name'] [,...]
+  *     [GRANTEES {user | role | ANY | NONE} [,...] [EXCEPT {user | role} [,...]]]
   */
 class ASTCreateUserQuery : public IAST, public ASTQueryWithOnCluster
 {
@@ -46,8 +48,8 @@ public:
     std::optional<AllowedClientHosts> remove_hosts;
 
     std::shared_ptr<ASTRolesOrUsersSet> default_roles;
-
     std::shared_ptr<ASTSettingsProfileElements> settings;
+    std::shared_ptr<ASTRolesOrUsersSet> grantees;
 
     String getID(char) const override;
     ASTPtr clone() const override;
diff --git a/src/Parsers/ASTDropAccessEntityQuery.cpp b/src/Parsers/ASTDropAccessEntityQuery.cpp
index 1df176c24ec..6c19c9f8af3 100644
--- a/src/Parsers/ASTDropAccessEntityQuery.cpp
+++ b/src/Parsers/ASTDropAccessEntityQuery.cpp
@@ -54,9 +54,9 @@ void ASTDropAccessEntityQuery::formatImpl(const FormatSettings & settings, Forma
 }
 
 
-void ASTDropAccessEntityQuery::replaceEmptyDatabaseWithCurrent(const String & current_database) const
+void ASTDropAccessEntityQuery::replaceEmptyDatabase(const String & current_database) const
 {
     if (row_policy_names)
-        row_policy_names->replaceEmptyDatabaseWithCurrent(current_database);
+        row_policy_names->replaceEmptyDatabase(current_database);
 }
 }
diff --git a/src/Parsers/ASTDropAccessEntityQuery.h b/src/Parsers/ASTDropAccessEntityQuery.h
index 76a5f450566..df78acef6f4 100644
--- a/src/Parsers/ASTDropAccessEntityQuery.h
+++ b/src/Parsers/ASTDropAccessEntityQuery.h
@@ -30,6 +30,6 @@ public:
     void formatImpl(const FormatSettings & settings, FormatState &, FormatStateStacked) const override;
     ASTPtr getRewrittenASTWithoutOnCluster(const std::string &) const override { return removeOnCluster<ASTDropAccessEntityQuery>(clone()); }
 
-    void replaceEmptyDatabaseWithCurrent(const String & current_database) const;
+    void replaceEmptyDatabase(const String & current_database) const;
 };
 }
diff --git a/src/Parsers/ASTFunction.cpp b/src/Parsers/ASTFunction.cpp
index 806b8e6c5b9..6871a817351 100644
--- a/src/Parsers/ASTFunction.cpp
+++ b/src/Parsers/ASTFunction.cpp
@@ -3,6 +3,7 @@
 #include <Common/quoteString.h>
 #include <Common/SipHash.h>
 #include <Common/typeid_cast.h>
+#include <DataTypes/NumberTraits.h>
 #include <IO/Operators.h>
 #include <IO/WriteBufferFromString.h>
 #include <IO/WriteHelpers.h>
@@ -15,8 +16,16 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+    extern const int UNEXPECTED_EXPRESSION;
+}
+
 void ASTFunction::appendColumnNameImpl(WriteBuffer & ostr) const
 {
+    if (name == "view")
+        throw Exception("Table function view cannot be used as an expression", ErrorCodes::UNEXPECTED_EXPRESSION);
+
     writeString(name, ostr);
 
     if (parameters)
@@ -214,27 +223,77 @@ void ASTFunction::formatImplWithoutAlias(const FormatSettings & settings, Format
 
             for (const char ** func = operators; *func; func += 2)
             {
-                if (0 == strcmp(name.c_str(), func[0]))
+                if (strcmp(name.c_str(), func[0]) != 0)
                 {
-                    if (frame.need_parens)
-                        settings.ostr << '(';
-
-                    settings.ostr << (settings.hilite ? hilite_operator : "") << func[1] << (settings.hilite ? hilite_none : "");
-
-                    /** A particularly stupid case. If we have a unary minus before a literal that is a negative number
-                        * "-(-1)" or "- -1", this can not be formatted as `--1`, since this will be interpreted as a comment.
-                        * Instead, add a space.
-                        * PS. You can not just ask to add parentheses - see formatImpl for ASTLiteral.
-                        */
-                    if (name == "negate" && arguments->children[0]->as<ASTLiteral>())
-                        settings.ostr << ' ';
-
-                    arguments->formatImpl(settings, state, nested_need_parens);
-                    written = true;
-
-                    if (frame.need_parens)
-                        settings.ostr << ')';
+                    continue;
                 }
+
+                const auto * literal = arguments->children[0]->as<ASTLiteral>();
+                /* A particularly stupid case. If we have a unary minus before
+                 * a literal that is a negative number "-(-1)" or "- -1", this
+                 * can not be formatted as `--1`, since this will be
+                 * interpreted as a comment. Instead, negate the literal
+                 * in place. Another possible solution is to use parentheses,
+                 * but the old comment said it is impossible, without mentioning
+                 * the reason. We should also negate the nonnegative literals,
+                 * for symmetry. We print the negated value without parentheses,
+                 * because they are not needed around a single literal. Also we
+                 * use formatting from FieldVisitorToString, so that the type is
+                 * preserved (e.g. -0. is printed with trailing period).
+                 */
+                if (literal && name == "negate")
+                {
+                    written = applyVisitor(
+                        [&settings](const auto & value)
+                        // -INT_MAX is negated to -INT_MAX by the negate()
+                        // function, so we can implement this behavior here as
+                        // well. Technically it is an UB to perform such negation
+                        // w/o a cast to unsigned type.
+                        NO_SANITIZE_UNDEFINED
+                        {
+                            using ValueType = std::decay_t<decltype(value)>;
+                            if constexpr (isDecimalField<ValueType>())
+                            {
+                                // The parser doesn't create decimal literals, but
+                                // they can be produced by constant folding or the
+                                // fuzzer. Decimals are always signed, so no need
+                                // to deduce the result type like we do for ints.
+                                const auto int_value = value.getValue().value;
+                                settings.ostr << FieldVisitorToString{}(ValueType{
+                                    -int_value,
+                                    value.getScale()});
+                            }
+                            else if constexpr (std::is_arithmetic_v<ValueType>)
+                            {
+                                using ResultType = typename NumberTraits::ResultOfNegate<ValueType>::Type;
+                                settings.ostr << FieldVisitorToString{}(
+                                    -static_cast<ResultType>(value));
+                                return true;
+                            }
+
+                            return false;
+                        },
+                        literal->value);
+
+                    if (written)
+                    {
+                        break;
+                    }
+                }
+
+                // We don't need parentheses around a single literal.
+                if (!literal && frame.need_parens)
+                    settings.ostr << '(';
+
+                settings.ostr << (settings.hilite ? hilite_operator : "") << func[1] << (settings.hilite ? hilite_none : "");
+
+                arguments->formatImpl(settings, state, nested_need_parens);
+                written = true;
+
+                if (!literal && frame.need_parens)
+                    settings.ostr << ')';
+
+                break;
             }
         }
 
@@ -324,10 +383,14 @@ void ASTFunction::formatImplWithoutAlias(const FormatSettings & settings, Format
 
             if (!written && 0 == strcmp(name.c_str(), "tupleElement"))
             {
-                /// It can be printed in a form of 'x.1' only if right hand side is unsigned integer literal.
+                // It can be printed in a form of 'x.1' only if right hand side
+                // is an unsigned integer lineral. We also allow nonnegative
+                // signed integer literals, because the fuzzer sometimes inserts
+                // them, and we want to have consistent formatting.
                 if (const auto * lit = arguments->children[1]->as<ASTLiteral>())
                 {
-                    if (lit->value.getType() == Field::Types::UInt64)
+                    if (isInt64FieldType(lit->value.getType())
+                        && lit->value.get<Int64>() >= 0)
                     {
                         if (frame.need_parens)
                             settings.ostr << '(';
@@ -425,14 +488,14 @@ void ASTFunction::formatImplWithoutAlias(const FormatSettings & settings, Format
 
         if (!written && 0 == strcmp(name.c_str(), "map"))
         {
-            settings.ostr << (settings.hilite ? hilite_operator : "") << '{' << (settings.hilite ? hilite_none : "");
+            settings.ostr << (settings.hilite ? hilite_operator : "") << "map(" << (settings.hilite ? hilite_none : "");
             for (size_t i = 0; i < arguments->children.size(); ++i)
             {
                 if (i != 0)
                     settings.ostr << ", ";
                 arguments->children[i]->formatImpl(settings, state, nested_dont_need_parens);
             }
-            settings.ostr << (settings.hilite ? hilite_operator : "") << '}' << (settings.hilite ? hilite_none : "");
+            settings.ostr << (settings.hilite ? hilite_operator : "") << ')' << (settings.hilite ? hilite_none : "");
             written = true;
         }
     }
diff --git a/src/Parsers/ASTFunctionWithKeyValueArguments.h b/src/Parsers/ASTFunctionWithKeyValueArguments.h
index 88ab712cc04..f5eaa33bfc7 100644
--- a/src/Parsers/ASTFunctionWithKeyValueArguments.h
+++ b/src/Parsers/ASTFunctionWithKeyValueArguments.h
@@ -20,7 +20,7 @@ public:
     bool second_with_brackets;
 
 public:
-    ASTPair(bool second_with_brackets_)
+    explicit ASTPair(bool second_with_brackets_)
         : second_with_brackets(second_with_brackets_)
     {
     }
@@ -49,7 +49,7 @@ public:
     /// Has brackets around arguments
     bool has_brackets;
 
-    ASTFunctionWithKeyValueArguments(bool has_brackets_ = true)
+    explicit ASTFunctionWithKeyValueArguments(bool has_brackets_ = true)
         : has_brackets(has_brackets_)
     {
     }
diff --git a/src/Parsers/ASTGrantQuery.cpp b/src/Parsers/ASTGrantQuery.cpp
index 2610836c759..aca53868226 100644
--- a/src/Parsers/ASTGrantQuery.cpp
+++ b/src/Parsers/ASTGrantQuery.cpp
@@ -27,7 +27,26 @@ namespace
     }
 
 
-    void formatAccessRightsElements(const AccessRightsElements & elements, const IAST::FormatSettings & settings)
+    void formatONClause(const String & database, bool any_database, const String & table, bool any_table, const IAST::FormatSettings & settings)
+    {
+        settings.ostr << (settings.hilite ? IAST::hilite_keyword : "") << "ON " << (settings.hilite ? IAST::hilite_none : "");
+        if (any_database)
+        {
+            settings.ostr << "*.*";
+        }
+        else
+        {
+            if (!database.empty())
+                settings.ostr << backQuoteIfNeed(database) << ".";
+            if (any_table)
+                settings.ostr << "*";
+            else
+                settings.ostr << backQuoteIfNeed(table);
+        }
+    }
+
+
+    void formatElementsWithoutOptions(const AccessRightsElements & elements, const IAST::FormatSettings & settings)
     {
         bool no_output = true;
         for (size_t i = 0; i != elements.size(); ++i)
@@ -58,31 +77,14 @@ namespace
 
             if (!next_element_on_same_db_and_table)
             {
-                settings.ostr << (settings.hilite ? IAST::hilite_keyword : "") << " ON " << (settings.hilite ? IAST::hilite_none : "");
-                if (element.any_database)
-                    settings.ostr << "*.";
-                else if (!element.database.empty())
-                    settings.ostr << backQuoteIfNeed(element.database) + ".";
-
-                if (element.any_table)
-                    settings.ostr << "*";
-                else
-                    settings.ostr << backQuoteIfNeed(element.table);
+                settings.ostr << " ";
+                formatONClause(element.database, element.any_database, element.table, element.any_table, settings);
             }
         }
 
         if (no_output)
             settings.ostr << (settings.hilite ? IAST::hilite_keyword : "") << "USAGE ON " << (settings.hilite ? IAST::hilite_none : "") << "*.*";
     }
-
-
-    void formatToRoles(const ASTRolesOrUsersSet & to_roles, ASTGrantQuery::Kind kind, const IAST::FormatSettings & settings)
-    {
-        using Kind = ASTGrantQuery::Kind;
-        settings.ostr << (settings.hilite ? IAST::hilite_keyword : "") << ((kind == Kind::GRANT) ? " TO " : " FROM ")
-                      << (settings.hilite ? IAST::hilite_none : "");
-        to_roles.format(settings);
-    }
 }
 
 
@@ -100,12 +102,18 @@ ASTPtr ASTGrantQuery::clone() const
 
 void ASTGrantQuery::formatImpl(const FormatSettings & settings, FormatState &, FormatStateStacked) const
 {
-    settings.ostr << (settings.hilite ? IAST::hilite_keyword : "") << (attach ? "ATTACH " : "") << ((kind == Kind::GRANT) ? "GRANT" : "REVOKE")
+    settings.ostr << (settings.hilite ? IAST::hilite_keyword : "") << (attach_mode ? "ATTACH " : "") << (is_revoke ? "REVOKE" : "GRANT")
                   << (settings.hilite ? IAST::hilite_none : "");
 
+    if (!access_rights_elements.sameOptions())
+        throw Exception("Elements of an ASTGrantQuery are expected to have the same options", ErrorCodes::LOGICAL_ERROR);
+    if (!access_rights_elements.empty() &&  access_rights_elements[0].is_partial_revoke && !is_revoke)
+        throw Exception("A partial revoke should be revoked, not granted", ErrorCodes::LOGICAL_ERROR);
+    bool grant_option = !access_rights_elements.empty() && access_rights_elements[0].grant_option;
+
     formatOnCluster(settings);
 
-    if (kind == Kind::REVOKE)
+    if (is_revoke)
     {
         if (grant_option)
             settings.ostr << (settings.hilite ? hilite_keyword : "") << " GRANT OPTION FOR" << (settings.hilite ? hilite_none : "");
@@ -113,18 +121,21 @@ void ASTGrantQuery::formatImpl(const FormatSettings & settings, FormatState &, F
             settings.ostr << (settings.hilite ? hilite_keyword : "") << " ADMIN OPTION FOR" << (settings.hilite ? hilite_none : "");
     }
 
-    if (roles && !access_rights_elements.empty())
-        throw Exception("Either roles or access rights elements should be set", ErrorCodes::LOGICAL_ERROR);
-
     settings.ostr << " ";
     if (roles)
+    {
         roles->format(settings);
+        if (!access_rights_elements.empty())
+            throw Exception("ASTGrantQuery can contain either roles or access rights elements to grant or revoke, not both of them", ErrorCodes::LOGICAL_ERROR);
+    }
     else
-        formatAccessRightsElements(access_rights_elements, settings);
+        formatElementsWithoutOptions(access_rights_elements, settings);
 
-    formatToRoles(*to_roles, kind, settings);
+    settings.ostr << (settings.hilite ? IAST::hilite_keyword : "") << (is_revoke ? " FROM " : " TO ")
+                  << (settings.hilite ? IAST::hilite_none : "");
+    grantees->format(settings);
 
-    if (kind == Kind::GRANT)
+    if (!is_revoke)
     {
         if (grant_option)
             settings.ostr << (settings.hilite ? hilite_keyword : "") << " WITH GRANT OPTION" << (settings.hilite ? hilite_none : "");
@@ -134,16 +145,16 @@ void ASTGrantQuery::formatImpl(const FormatSettings & settings, FormatState &, F
 }
 
 
-void ASTGrantQuery::replaceEmptyDatabaseWithCurrent(const String & current_database)
+void ASTGrantQuery::replaceEmptyDatabase(const String & current_database)
 {
     access_rights_elements.replaceEmptyDatabase(current_database);
 }
 
 
-void ASTGrantQuery::replaceCurrentUserTagWithName(const String & current_user_name) const
+void ASTGrantQuery::replaceCurrentUserTag(const String & current_user_name) const
 {
-    if (to_roles)
-        to_roles->replaceCurrentUserTagWithName(current_user_name);
+    if (grantees)
+        grantees->replaceCurrentUserTag(current_user_name);
 }
 
 }
diff --git a/src/Parsers/ASTGrantQuery.h b/src/Parsers/ASTGrantQuery.h
index c36e42689a5..833c4db8ec6 100644
--- a/src/Parsers/ASTGrantQuery.h
+++ b/src/Parsers/ASTGrantQuery.h
@@ -19,20 +19,18 @@ class ASTRolesOrUsersSet;
 class ASTGrantQuery : public IAST, public ASTQueryWithOnCluster
 {
 public:
-    using Kind = AccessRightsElementWithOptions::Kind;
-    Kind kind = Kind::GRANT;
-    bool attach = false;
+    bool attach_mode = false;
+    bool is_revoke = false;
     AccessRightsElements access_rights_elements;
     std::shared_ptr<ASTRolesOrUsersSet> roles;
-    std::shared_ptr<ASTRolesOrUsersSet> to_roles;
-    bool grant_option = false;
     bool admin_option = false;
+    std::shared_ptr<ASTRolesOrUsersSet> grantees;
 
     String getID(char) const override;
     ASTPtr clone() const override;
     void formatImpl(const FormatSettings & settings, FormatState &, FormatStateStacked) const override;
-    void replaceEmptyDatabaseWithCurrent(const String & current_database);
-    void replaceCurrentUserTagWithName(const String & current_user_name) const;
+    void replaceEmptyDatabase(const String & current_database);
+    void replaceCurrentUserTag(const String & current_user_name) const;
     ASTPtr getRewrittenASTWithoutOnCluster(const std::string &) const override { return removeOnCluster<ASTGrantQuery>(clone()); }
 };
 }
diff --git a/src/Parsers/ASTRolesOrUsersSet.cpp b/src/Parsers/ASTRolesOrUsersSet.cpp
index 1e7cd79f527..fc5385e4a58 100644
--- a/src/Parsers/ASTRolesOrUsersSet.cpp
+++ b/src/Parsers/ASTRolesOrUsersSet.cpp
@@ -7,7 +7,7 @@ namespace DB
 {
 namespace
 {
-    void formatRoleNameOrID(const String & str, bool is_id, const IAST::FormatSettings & settings)
+    void formatNameOrID(const String & str, bool is_id, const IAST::FormatSettings & settings)
     {
         if (is_id)
         {
@@ -30,19 +30,21 @@ void ASTRolesOrUsersSet::formatImpl(const FormatSettings & settings, FormatState
     }
 
     bool need_comma = false;
+
     if (all)
     {
         if (std::exchange(need_comma, true))
             settings.ostr << ", ";
-        settings.ostr << (settings.hilite ? IAST::hilite_keyword : "") << "ALL" << (settings.hilite ? IAST::hilite_none : "");
+        settings.ostr << (settings.hilite ? IAST::hilite_keyword : "") << (use_keyword_any ? "ANY" : "ALL")
+                      << (settings.hilite ? IAST::hilite_none : "");
     }
     else
     {
-        for (const auto & role : names)
+        for (const auto & name : names)
         {
             if (std::exchange(need_comma, true))
                 settings.ostr << ", ";
-            formatRoleNameOrID(role, id_mode, settings);
+            formatNameOrID(name, id_mode, settings);
         }
 
         if (current_user)
@@ -58,11 +60,11 @@ void ASTRolesOrUsersSet::formatImpl(const FormatSettings & settings, FormatState
         settings.ostr << (settings.hilite ? IAST::hilite_keyword : "") << " EXCEPT " << (settings.hilite ? IAST::hilite_none : "");
         need_comma = false;
 
-        for (const auto & except_role : except_names)
+        for (const auto & name : except_names)
         {
             if (std::exchange(need_comma, true))
                 settings.ostr << ", ";
-            formatRoleNameOrID(except_role, id_mode, settings);
+            formatNameOrID(name, id_mode, settings);
         }
 
         if (except_current_user)
@@ -75,7 +77,7 @@ void ASTRolesOrUsersSet::formatImpl(const FormatSettings & settings, FormatState
 }
 
 
-void ASTRolesOrUsersSet::replaceCurrentUserTagWithName(const String & current_user_name)
+void ASTRolesOrUsersSet::replaceCurrentUserTag(const String & current_user_name)
 {
     if (current_user)
     {
diff --git a/src/Parsers/ASTRolesOrUsersSet.h b/src/Parsers/ASTRolesOrUsersSet.h
index f18aa0bdd73..15d42ee39a0 100644
--- a/src/Parsers/ASTRolesOrUsersSet.h
+++ b/src/Parsers/ASTRolesOrUsersSet.h
@@ -9,22 +9,24 @@ namespace DB
 using Strings = std::vector<String>;
 
 /// Represents a set of users/roles like
-/// {user_name | role_name | CURRENT_USER} [,...] | NONE | ALL | ALL EXCEPT {user_name | role_name | CURRENT_USER} [,...]
+/// {user_name | role_name | CURRENT_USER | ALL | NONE} [,...]
+/// [EXCEPT {user_name | role_name | CURRENT_USER | ALL | NONE} [,...]]
 class ASTRolesOrUsersSet : public IAST
 {
 public:
+    bool all = false;
     Strings names;
     bool current_user = false;
-    bool all = false;
     Strings except_names;
     bool except_current_user = false;
 
-    bool id_mode = false;         /// true if `names` and `except_names` keep UUIDs, not names.
-    bool allow_role_names = true; /// true if this set can contain names of roles.
-    bool allow_user_names = true; /// true if this set can contain names of users.
+    bool allow_users = true;      /// whether this set can contain names of users
+    bool allow_roles = true;      /// whether this set can contain names of roles
+    bool id_mode = false;         /// whether this set keep UUIDs instead of names
+    bool use_keyword_any = false; /// whether the keyword ANY should be used instead of the keyword ALL
 
     bool empty() const { return names.empty() && !current_user && !all; }
-    void replaceCurrentUserTagWithName(const String & current_user_name);
+    void replaceCurrentUserTag(const String & current_user_name);
 
     String getID(char) const override { return "RolesOrUsersSet"; }
     ASTPtr clone() const override { return std::make_shared<ASTRolesOrUsersSet>(*this); }
diff --git a/src/Parsers/ASTRowPolicyName.cpp b/src/Parsers/ASTRowPolicyName.cpp
index 3d1ac5621db..0b69c1a46b3 100644
--- a/src/Parsers/ASTRowPolicyName.cpp
+++ b/src/Parsers/ASTRowPolicyName.cpp
@@ -23,7 +23,7 @@ void ASTRowPolicyName::formatImpl(const FormatSettings & settings, FormatState &
 }
 
 
-void ASTRowPolicyName::replaceEmptyDatabaseWithCurrent(const String & current_database)
+void ASTRowPolicyName::replaceEmptyDatabase(const String & current_database)
 {
     if (name_parts.database.empty())
         name_parts.database = current_database;
@@ -125,7 +125,7 @@ Strings ASTRowPolicyNames::toStrings() const
 }
 
 
-void ASTRowPolicyNames::replaceEmptyDatabaseWithCurrent(const String & current_database)
+void ASTRowPolicyNames::replaceEmptyDatabase(const String & current_database)
 {
     for (auto & np : name_parts)
         if (np.database.empty())
diff --git a/src/Parsers/ASTRowPolicyName.h b/src/Parsers/ASTRowPolicyName.h
index ac2f84f5d8b..b195596225b 100644
--- a/src/Parsers/ASTRowPolicyName.h
+++ b/src/Parsers/ASTRowPolicyName.h
@@ -22,7 +22,7 @@ public:
     void formatImpl(const FormatSettings & settings, FormatState &, FormatStateStacked) const override;
     ASTPtr getRewrittenASTWithoutOnCluster(const std::string &) const override { return removeOnCluster<ASTRowPolicyName>(clone()); }
 
-    void replaceEmptyDatabaseWithCurrent(const String & current_database);
+    void replaceEmptyDatabase(const String & current_database);
 };
 
 
@@ -44,6 +44,6 @@ public:
     void formatImpl(const FormatSettings & settings, FormatState &, FormatStateStacked) const override;
     ASTPtr getRewrittenASTWithoutOnCluster(const std::string &) const override { return removeOnCluster<ASTRowPolicyNames>(clone()); }
 
-    void replaceEmptyDatabaseWithCurrent(const String & current_database);
+    void replaceEmptyDatabase(const String & current_database);
 };
 }
diff --git a/src/Parsers/ASTSelectQuery.cpp b/src/Parsers/ASTSelectQuery.cpp
index aa5508bf190..4715c7f201b 100644
--- a/src/Parsers/ASTSelectQuery.cpp
+++ b/src/Parsers/ASTSelectQuery.cpp
@@ -137,8 +137,8 @@ void ASTSelectQuery::formatImpl(const FormatSettings & s, FormatState & state, F
     if (window())
     {
         s.ostr << (s.hilite ? hilite_keyword : "") << s.nl_or_ws << indent_str <<
-            "WINDOW " << (s.hilite ? hilite_none : "");
-        window()->formatImpl(s, state, frame);
+            "WINDOW" << (s.hilite ? hilite_none : "");
+        window()->as<ASTExpressionList &>().formatImplMultiline(s, state, frame);
     }
 
     if (orderBy())
diff --git a/src/Parsers/ASTShowAccessEntitiesQuery.cpp b/src/Parsers/ASTShowAccessEntitiesQuery.cpp
index bacde098640..6dd53fd5cde 100644
--- a/src/Parsers/ASTShowAccessEntitiesQuery.cpp
+++ b/src/Parsers/ASTShowAccessEntitiesQuery.cpp
@@ -43,7 +43,7 @@ void ASTShowAccessEntitiesQuery::formatQueryImpl(const FormatSettings & settings
 }
 
 
-void ASTShowAccessEntitiesQuery::replaceEmptyDatabaseWithCurrent(const String & current_database)
+void ASTShowAccessEntitiesQuery::replaceEmptyDatabase(const String & current_database)
 {
     if (database_and_table_name)
     {
diff --git a/src/Parsers/ASTShowAccessEntitiesQuery.h b/src/Parsers/ASTShowAccessEntitiesQuery.h
index 7ccd76bfe5e..2be1e0b92f0 100644
--- a/src/Parsers/ASTShowAccessEntitiesQuery.h
+++ b/src/Parsers/ASTShowAccessEntitiesQuery.h
@@ -31,7 +31,7 @@ public:
     String getID(char) const override;
     ASTPtr clone() const override { return std::make_shared<ASTShowAccessEntitiesQuery>(*this); }
 
-    void replaceEmptyDatabaseWithCurrent(const String & current_database);
+    void replaceEmptyDatabase(const String & current_database);
 
 protected:
     void formatQueryImpl(const FormatSettings & settings, FormatState &, FormatStateStacked) const override;
diff --git a/src/Parsers/ASTShowCreateAccessEntityQuery.cpp b/src/Parsers/ASTShowCreateAccessEntityQuery.cpp
index f870c98071c..5ff51a47002 100644
--- a/src/Parsers/ASTShowCreateAccessEntityQuery.cpp
+++ b/src/Parsers/ASTShowCreateAccessEntityQuery.cpp
@@ -72,10 +72,10 @@ void ASTShowCreateAccessEntityQuery::formatQueryImpl(const FormatSettings & sett
 }
 
 
-void ASTShowCreateAccessEntityQuery::replaceEmptyDatabaseWithCurrent(const String & current_database)
+void ASTShowCreateAccessEntityQuery::replaceEmptyDatabase(const String & current_database)
 {
     if (row_policy_names)
-        row_policy_names->replaceEmptyDatabaseWithCurrent(current_database);
+        row_policy_names->replaceEmptyDatabase(current_database);
 
     if (database_and_table_name)
     {
diff --git a/src/Parsers/ASTShowCreateAccessEntityQuery.h b/src/Parsers/ASTShowCreateAccessEntityQuery.h
index 10c4c0ca511..e20bb4f022e 100644
--- a/src/Parsers/ASTShowCreateAccessEntityQuery.h
+++ b/src/Parsers/ASTShowCreateAccessEntityQuery.h
@@ -40,7 +40,7 @@ public:
     String getID(char) const override;
     ASTPtr clone() const override;
 
-    void replaceEmptyDatabaseWithCurrent(const String & current_database);
+    void replaceEmptyDatabase(const String & current_database);
 
 protected:
     String getKeyword() const;
diff --git a/src/Parsers/ASTSystemQuery.cpp b/src/Parsers/ASTSystemQuery.cpp
index f3a43d7f3fd..c929383a256 100644
--- a/src/Parsers/ASTSystemQuery.cpp
+++ b/src/Parsers/ASTSystemQuery.cpp
@@ -30,6 +30,8 @@ const char * ASTSystemQuery::typeToString(Type type)
             return "DROP MARK CACHE";
         case Type::DROP_UNCOMPRESSED_CACHE:
             return "DROP UNCOMPRESSED CACHE";
+        case Type::DROP_MMAP_CACHE:
+            return "DROP MMAP CACHE";
 #if USE_EMBEDDED_COMPILER
         case Type::DROP_COMPILED_EXPRESSION_CACHE:
             return "DROP COMPILED EXPRESSION CACHE";
@@ -52,6 +54,10 @@ const char * ASTSystemQuery::typeToString(Type type)
             return "RELOAD DICTIONARY";
         case Type::RELOAD_DICTIONARIES:
             return "RELOAD DICTIONARIES";
+        case Type::RELOAD_MODEL:
+            return "RELOAD MODEL";
+        case Type::RELOAD_MODELS:
+            return "RELOAD MODELS";
         case Type::RELOAD_EMBEDDED_DICTIONARIES:
             return "RELOAD EMBEDDED DICTIONARIES";
         case Type::RELOAD_CONFIG:
diff --git a/src/Parsers/ASTSystemQuery.h b/src/Parsers/ASTSystemQuery.h
index ad7eb664659..af3244573e4 100644
--- a/src/Parsers/ASTSystemQuery.h
+++ b/src/Parsers/ASTSystemQuery.h
@@ -24,6 +24,7 @@ public:
         DROP_DNS_CACHE,
         DROP_MARK_CACHE,
         DROP_UNCOMPRESSED_CACHE,
+        DROP_MMAP_CACHE,
 #if USE_EMBEDDED_COMPILER
         DROP_COMPILED_EXPRESSION_CACHE,
 #endif
@@ -35,6 +36,8 @@ public:
         SYNC_REPLICA,
         RELOAD_DICTIONARY,
         RELOAD_DICTIONARIES,
+        RELOAD_MODEL,
+        RELOAD_MODELS,
         RELOAD_EMBEDDED_DICTIONARIES,
         RELOAD_CONFIG,
         RELOAD_SYMBOLS,
@@ -62,6 +65,7 @@ public:
     Type type = Type::UNKNOWN;
 
     String target_dictionary;
+    String target_model;
     String database;
     String table;
     String replica;
diff --git a/src/Parsers/ASTWindowDefinition.cpp b/src/Parsers/ASTWindowDefinition.cpp
index dba2935e630..35374df6177 100644
--- a/src/Parsers/ASTWindowDefinition.cpp
+++ b/src/Parsers/ASTWindowDefinition.cpp
@@ -35,6 +35,8 @@ String ASTWindowDefinition::getID(char) const
 void ASTWindowDefinition::formatImpl(const FormatSettings & settings,
     FormatState & state, FormatStateStacked format_frame) const
 {
+    format_frame.expression_list_prepend_whitespace = false;
+
     if (partition_by)
     {
         settings.ostr << "PARTITION BY ";
@@ -70,7 +72,8 @@ void ASTWindowDefinition::formatImpl(const FormatSettings & settings,
         }
         else
         {
-            settings.ostr << abs(frame.begin_offset);
+            settings.ostr << applyVisitor(FieldVisitorToString(),
+                frame.begin_offset);
             settings.ostr << " "
                 << (!frame.begin_preceding ? "FOLLOWING" : "PRECEDING");
         }
@@ -81,11 +84,12 @@ void ASTWindowDefinition::formatImpl(const FormatSettings & settings,
         }
         else if (frame.end_type == WindowFrame::BoundaryType::Unbounded)
         {
-            settings.ostr << "UNBOUNDED PRECEDING";
+            settings.ostr << "UNBOUNDED FOLLOWING";
         }
         else
         {
-            settings.ostr << abs(frame.end_offset);
+            settings.ostr << applyVisitor(FieldVisitorToString(),
+                frame.end_offset);
             settings.ostr << " "
                 << (!frame.end_preceding ? "FOLLOWING" : "PRECEDING");
         }
diff --git a/src/Parsers/ExpressionElementParsers.cpp b/src/Parsers/ExpressionElementParsers.cpp
index 7a426e7774d..3e635b2accc 100644
--- a/src/Parsers/ExpressionElementParsers.cpp
+++ b/src/Parsers/ExpressionElementParsers.cpp
@@ -49,7 +49,6 @@ namespace ErrorCodes
     extern const int BAD_ARGUMENTS;
     extern const int SYNTAX_ERROR;
     extern const int LOGICAL_ERROR;
-    extern const int NOT_IMPLEMENTED;
 }
 
 
@@ -533,6 +532,7 @@ static bool tryParseFrameDefinition(ASTWindowDefinition * node, IParser::Pos & p
     ParserKeyword keyword_groups("GROUPS");
     ParserKeyword keyword_range("RANGE");
 
+    node->frame.is_default = false;
     if (keyword_rows.ignore(pos, expected))
     {
         node->frame.type = WindowFrame::FrameType::Rows;
@@ -548,6 +548,7 @@ static bool tryParseFrameDefinition(ASTWindowDefinition * node, IParser::Pos & p
     else
     {
         /* No frame clause. */
+        node->frame.is_default = true;
         return true;
     }
 
@@ -579,30 +580,8 @@ static bool tryParseFrameDefinition(ASTWindowDefinition * node, IParser::Pos & p
         else if (parser_literal.parse(pos, ast_literal, expected))
         {
             const Field & value = ast_literal->as<ASTLiteral &>().value;
-            if (!isInt64FieldType(value.getType()))
-            {
-                throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                    "Only integer frame offsets are supported, '{}' is not supported.",
-                    Field::Types::toString(value.getType()));
-            }
-            node->frame.begin_offset = value.get<Int64>();
+            node->frame.begin_offset = value;
             node->frame.begin_type = WindowFrame::BoundaryType::Offset;
-            // We can easily get a UINT64_MAX here, which doesn't even fit into
-            // int64_t. Not sure what checks we are going to need here after we
-            // support floats and dates.
-            if (node->frame.begin_offset > INT_MAX || node->frame.begin_offset < INT_MIN)
-            {
-                throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                    "Frame offset must be between {} and {}, but {} is given",
-                    INT_MAX, INT_MIN, node->frame.begin_offset);
-            }
-
-            if (node->frame.begin_offset < 0)
-            {
-                throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                    "Frame start offset must be greater than zero, {} given",
-                    node->frame.begin_offset);
-            }
         }
         else
         {
@@ -618,8 +597,8 @@ static bool tryParseFrameDefinition(ASTWindowDefinition * node, IParser::Pos & p
             node->frame.begin_preceding = false;
             if (node->frame.begin_type == WindowFrame::BoundaryType::Unbounded)
             {
-                throw Exception(ErrorCodes::NOT_IMPLEMENTED,
-                    "Frame start UNBOUNDED FOLLOWING is not implemented");
+                throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                    "Frame start cannot be UNBOUNDED FOLLOWING");
             }
         }
         else
@@ -650,28 +629,8 @@ static bool tryParseFrameDefinition(ASTWindowDefinition * node, IParser::Pos & p
             else if (parser_literal.parse(pos, ast_literal, expected))
             {
                 const Field & value = ast_literal->as<ASTLiteral &>().value;
-                if (!isInt64FieldType(value.getType()))
-                {
-                    throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                        "Only integer frame offsets are supported, '{}' is not supported.",
-                        Field::Types::toString(value.getType()));
-                }
-                node->frame.end_offset = value.get<Int64>();
+                node->frame.end_offset = value;
                 node->frame.end_type = WindowFrame::BoundaryType::Offset;
-
-                if (node->frame.end_offset > INT_MAX || node->frame.end_offset < INT_MIN)
-                {
-                    throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                        "Frame offset must be between {} and {}, but {} is given",
-                        INT_MAX, INT_MIN, node->frame.end_offset);
-                }
-
-                if (node->frame.end_offset < 0)
-                {
-                    throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                        "Frame end offset must be greater than zero, {} given",
-                        node->frame.end_offset);
-                }
             }
             else
             {
@@ -683,8 +642,8 @@ static bool tryParseFrameDefinition(ASTWindowDefinition * node, IParser::Pos & p
                 node->frame.end_preceding = true;
                 if (node->frame.end_type == WindowFrame::BoundaryType::Unbounded)
                 {
-                    throw Exception(ErrorCodes::NOT_IMPLEMENTED,
-                        "Frame end UNBOUNDED PRECEDING is not implemented");
+                    throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                        "Frame end cannot be UNBOUNDED PRECEDING");
                 }
             }
             else if (keyword_following.ignore(pos, expected))
@@ -699,11 +658,6 @@ static bool tryParseFrameDefinition(ASTWindowDefinition * node, IParser::Pos & p
         }
     }
 
-    if (!(node->frame == WindowFrame{}))
-    {
-        node->frame.is_default = false;
-    }
-
     return true;
 }
 
@@ -1998,7 +1952,6 @@ bool ParserExpressionElement::parseImpl(Pos & pos, ASTPtr & node, Expected & exp
 {
     return ParserSubquery().parse(pos, node, expected)
         || ParserTupleOfLiterals().parse(pos, node, expected)
-        || ParserMapOfLiterals().parse(pos, node, expected)
         || ParserParenthesisExpression().parse(pos, node, expected)
         || ParserArrayOfLiterals().parse(pos, node, expected)
         || ParserArray().parse(pos, node, expected)
diff --git a/src/Parsers/ExpressionElementParsers.h b/src/Parsers/ExpressionElementParsers.h
index b6194f981fe..f8b2408ac16 100644
--- a/src/Parsers/ExpressionElementParsers.h
+++ b/src/Parsers/ExpressionElementParsers.h
@@ -45,7 +45,7 @@ protected:
 class ParserIdentifier : public IParserBase
 {
 public:
-    ParserIdentifier(bool allow_query_parameter_ = false) : allow_query_parameter(allow_query_parameter_) {}
+    explicit ParserIdentifier(bool allow_query_parameter_ = false) : allow_query_parameter(allow_query_parameter_) {}
 protected:
     const char * getName() const override { return "identifier"; }
     bool parseImpl(Pos & pos, ASTPtr & node, Expected & expected) override;
@@ -59,7 +59,7 @@ protected:
 class ParserCompoundIdentifier : public IParserBase
 {
 public:
-    ParserCompoundIdentifier(bool table_name_with_optional_uuid_ = false, bool allow_query_parameter_ = false)
+    explicit ParserCompoundIdentifier(bool table_name_with_optional_uuid_ = false, bool allow_query_parameter_ = false)
         : table_name_with_optional_uuid(table_name_with_optional_uuid_), allow_query_parameter(allow_query_parameter_)
     {
     }
@@ -85,7 +85,7 @@ public:
     using ColumnTransformers = MultiEnum<ColumnTransformer, UInt8>;
     static constexpr auto AllTransformers = ColumnTransformers{ColumnTransformer::APPLY, ColumnTransformer::EXCEPT, ColumnTransformer::REPLACE};
 
-    ParserColumnsTransformers(ColumnTransformers allowed_transformers_ = AllTransformers, bool is_strict_ = false)
+    explicit ParserColumnsTransformers(ColumnTransformers allowed_transformers_ = AllTransformers, bool is_strict_ = false)
         : allowed_transformers(allowed_transformers_)
         , is_strict(is_strict_)
     {}
@@ -103,7 +103,7 @@ class ParserAsterisk : public IParserBase
 {
 public:
     using ColumnTransformers = ParserColumnsTransformers::ColumnTransformers;
-    ParserAsterisk(ColumnTransformers allowed_transformers_ = ParserColumnsTransformers::AllTransformers)
+    explicit ParserAsterisk(ColumnTransformers allowed_transformers_ = ParserColumnsTransformers::AllTransformers)
         : allowed_transformers(allowed_transformers_)
     {}
 
@@ -129,7 +129,7 @@ class ParserColumnsMatcher : public IParserBase
 {
 public:
     using ColumnTransformers = ParserColumnsTransformers::ColumnTransformers;
-    ParserColumnsMatcher(ColumnTransformers allowed_transformers_ = ParserColumnsTransformers::AllTransformers)
+    explicit ParserColumnsMatcher(ColumnTransformers allowed_transformers_ = ParserColumnsTransformers::AllTransformers)
         : allowed_transformers(allowed_transformers_)
     {}
 
@@ -149,7 +149,7 @@ protected:
 class ParserFunction : public IParserBase
 {
 public:
-    ParserFunction(bool allow_function_parameters_ = true, bool is_table_function_ = false)
+    explicit ParserFunction(bool allow_function_parameters_ = true, bool is_table_function_ = false)
         : allow_function_parameters(allow_function_parameters_), is_table_function(is_table_function_)
     {
     }
@@ -338,18 +338,6 @@ protected:
     }
 };
 
-class ParserMapOfLiterals : public IParserBase
-{
-public:
-    ParserCollectionOfLiterals<Map> map_parser{TokenType::OpeningCurlyBrace, TokenType::ClosingCurlyBrace};
-protected:
-    const char * getName() const override { return "map"; }
-    bool parseImpl(Pos & pos, ASTPtr & node, Expected & expected) override
-    {
-        return map_parser.parse(pos, node, expected);
-    }
-};
-
 class ParserArrayOfLiterals : public IParserBase
 {
 public:
diff --git a/src/Parsers/Lexer.cpp b/src/Parsers/Lexer.cpp
index ffa8250a3f3..1fa4d396113 100644
--- a/src/Parsers/Lexer.cpp
+++ b/src/Parsers/Lexer.cpp
@@ -275,7 +275,8 @@ Token Lexer::nextTokenImpl()
                         else
                             ++pos;
                     }
-                    return Token(TokenType::ErrorMultilineCommentIsNotClosed, token_begin, end);
+                    pos = end;
+                    return Token(TokenType::ErrorMultilineCommentIsNotClosed, token_begin, pos);
                 }
             }
             return Token(TokenType::Slash, token_begin, pos);
diff --git a/src/Parsers/New/AST/Identifier.cpp b/src/Parsers/New/AST/Identifier.cpp
index a5c41bf9876..3b931d19720 100644
--- a/src/Parsers/New/AST/Identifier.cpp
+++ b/src/Parsers/New/AST/Identifier.cpp
@@ -142,16 +142,19 @@ antlrcpp::Any ParseTreeVisitor::visitIdentifierOrNull(ClickHouseParser::Identifi
 
 antlrcpp::Any ParseTreeVisitor::visitInterval(ClickHouseParser::IntervalContext *)
 {
+    asm (""); // prevent symbol removal
     __builtin_unreachable();
 }
 
 antlrcpp::Any ParseTreeVisitor::visitKeyword(ClickHouseParser::KeywordContext *)
 {
+    asm (""); // prevent symbol removal
     __builtin_unreachable();
 }
 
 antlrcpp::Any ParseTreeVisitor::visitKeywordForAlias(ClickHouseParser::KeywordForAliasContext *)
 {
+    asm (""); // prevent symbol removal
     __builtin_unreachable();
 }
 
diff --git a/src/Parsers/New/ClickHouseLexer.h b/src/Parsers/New/ClickHouseLexer.h
index e925c5d271f..62de0792f3c 100644
--- a/src/Parsers/New/ClickHouseLexer.h
+++ b/src/Parsers/New/ClickHouseLexer.h
@@ -13,51 +13,51 @@ namespace DB {
 class  ClickHouseLexer : public antlr4::Lexer {
 public:
   enum {
-    ADD = 1, AFTER = 2, ALIAS = 3, ALL = 4, ALTER = 5, AND = 6, ANTI = 7, 
-    ANY = 8, ARRAY = 9, AS = 10, ASCENDING = 11, ASOF = 12, ASYNC = 13, 
-    ATTACH = 14, BETWEEN = 15, BOTH = 16, BY = 17, CASE = 18, CAST = 19, 
-    CHECK = 20, CLEAR = 21, CLUSTER = 22, CODEC = 23, COLLATE = 24, COLUMN = 25, 
-    COMMENT = 26, CONSTRAINT = 27, CREATE = 28, CROSS = 29, CUBE = 30, DATABASE = 31, 
-    DATABASES = 32, DATE = 33, DAY = 34, DEDUPLICATE = 35, DEFAULT = 36, 
-    DELAY = 37, DELETE = 38, DESC = 39, DESCENDING = 40, DESCRIBE = 41, 
-    DETACH = 42, DICTIONARIES = 43, DICTIONARY = 44, DISK = 45, DISTINCT = 46, 
-    DISTRIBUTED = 47, DROP = 48, ELSE = 49, END = 50, ENGINE = 51, EVENTS = 52, 
-    EXISTS = 53, EXPLAIN = 54, EXPRESSION = 55, EXTRACT = 56, FETCHES = 57, 
-    FINAL = 58, FIRST = 59, FLUSH = 60, FOR = 61, FORMAT = 62, FREEZE = 63, 
-    FROM = 64, FULL = 65, FUNCTION = 66, GLOBAL = 67, GRANULARITY = 68, 
-    GROUP = 69, HAVING = 70, HIERARCHICAL = 71, HOUR = 72, ID = 73, IF = 74, 
-    ILIKE = 75, IN = 76, INDEX = 77, INF = 78, INJECTIVE = 79, INNER = 80, 
-    INSERT = 81, INTERVAL = 82, INTO = 83, IS = 84, IS_OBJECT_ID = 85, JOIN = 86, 
-    KEY = 87, KILL = 88, LAST = 89, LAYOUT = 90, LEADING = 91, LEFT = 92, 
-    LIFETIME = 93, LIKE = 94, LIMIT = 95, LIVE = 96, LOCAL = 97, LOGS = 98, 
-    MATERIALIZED = 99, MAX = 100, MERGES = 101, MIN = 102, MINUTE = 103, 
-    MODIFY = 104, MONTH = 105, MOVE = 106, MUTATION = 107, NAN_SQL = 108, 
-    NO = 109, NOT = 110, NULL_SQL = 111, NULLS = 112, OFFSET = 113, ON = 114, 
-    OPTIMIZE = 115, OR = 116, ORDER = 117, OUTER = 118, OUTFILE = 119, PARTITION = 120, 
-    POPULATE = 121, PREWHERE = 122, PRIMARY = 123, QUARTER = 124, RANGE = 125, 
-    RELOAD = 126, REMOVE = 127, RENAME = 128, REPLACE = 129, REPLICA = 130, 
-    REPLICATED = 131, RIGHT = 132, ROLLUP = 133, SAMPLE = 134, SECOND = 135, 
-    SELECT = 136, SEMI = 137, SENDS = 138, SET = 139, SETTINGS = 140, SHOW = 141, 
-    SOURCE = 142, START = 143, STOP = 144, SUBSTRING = 145, SYNC = 146, 
-    SYNTAX = 147, SYSTEM = 148, TABLE = 149, TABLES = 150, TEMPORARY = 151, 
-    TEST = 152, THEN = 153, TIES = 154, TIMEOUT = 155, TIMESTAMP = 156, 
-    TO = 157, TOP = 158, TOTALS = 159, TRAILING = 160, TRIM = 161, TRUNCATE = 162, 
-    TTL = 163, TYPE = 164, UNION = 165, UPDATE = 166, USE = 167, USING = 168, 
-    UUID = 169, VALUES = 170, VIEW = 171, VOLUME = 172, WATCH = 173, WEEK = 174, 
-    WHEN = 175, WHERE = 176, WITH = 177, YEAR = 178, JSON_FALSE = 179, JSON_TRUE = 180, 
-    IDENTIFIER = 181, FLOATING_LITERAL = 182, OCTAL_LITERAL = 183, DECIMAL_LITERAL = 184, 
-    HEXADECIMAL_LITERAL = 185, STRING_LITERAL = 186, ARROW = 187, ASTERISK = 188, 
-    BACKQUOTE = 189, BACKSLASH = 190, COLON = 191, COMMA = 192, CONCAT = 193, 
-    DASH = 194, DOT = 195, EQ_DOUBLE = 196, EQ_SINGLE = 197, GE = 198, GT = 199, 
-    LBRACE = 200, LBRACKET = 201, LE = 202, LPAREN = 203, LT = 204, NOT_EQ = 205, 
-    PERCENT = 206, PLUS = 207, QUERY = 208, QUOTE_DOUBLE = 209, QUOTE_SINGLE = 210, 
-    RBRACE = 211, RBRACKET = 212, RPAREN = 213, SEMICOLON = 214, SLASH = 215, 
-    UNDERSCORE = 216, MULTI_LINE_COMMENT = 217, SINGLE_LINE_COMMENT = 218, 
+    ADD = 1, AFTER = 2, ALIAS = 3, ALL = 4, ALTER = 5, AND = 6, ANTI = 7,
+    ANY = 8, ARRAY = 9, AS = 10, ASCENDING = 11, ASOF = 12, ASYNC = 13,
+    ATTACH = 14, BETWEEN = 15, BOTH = 16, BY = 17, CASE = 18, CAST = 19,
+    CHECK = 20, CLEAR = 21, CLUSTER = 22, CODEC = 23, COLLATE = 24, COLUMN = 25,
+    COMMENT = 26, CONSTRAINT = 27, CREATE = 28, CROSS = 29, CUBE = 30, DATABASE = 31,
+    DATABASES = 32, DATE = 33, DAY = 34, DEDUPLICATE = 35, DEFAULT = 36,
+    DELAY = 37, DELETE = 38, DESC = 39, DESCENDING = 40, DESCRIBE = 41,
+    DETACH = 42, DICTIONARIES = 43, DICTIONARY = 44, DISK = 45, DISTINCT = 46,
+    DISTRIBUTED = 47, DROP = 48, ELSE = 49, END = 50, ENGINE = 51, EVENTS = 52,
+    EXISTS = 53, EXPLAIN = 54, EXPRESSION = 55, EXTRACT = 56, FETCHES = 57,
+    FINAL = 58, FIRST = 59, FLUSH = 60, FOR = 61, FORMAT = 62, FREEZE = 63,
+    FROM = 64, FULL = 65, FUNCTION = 66, GLOBAL = 67, GRANULARITY = 68,
+    GROUP = 69, HAVING = 70, HIERARCHICAL = 71, HOUR = 72, ID = 73, IF = 74,
+    ILIKE = 75, IN = 76, INDEX = 77, INF = 78, INJECTIVE = 79, INNER = 80,
+    INSERT = 81, INTERVAL = 82, INTO = 83, IS = 84, IS_OBJECT_ID = 85, JOIN = 86,
+    KEY = 87, KILL = 88, LAST = 89, LAYOUT = 90, LEADING = 91, LEFT = 92,
+    LIFETIME = 93, LIKE = 94, LIMIT = 95, LIVE = 96, LOCAL = 97, LOGS = 98,
+    MATERIALIZED = 99, MAX = 100, MERGES = 101, MIN = 102, MINUTE = 103,
+    MODIFY = 104, MONTH = 105, MOVE = 106, MUTATION = 107, NAN_SQL = 108,
+    NO = 109, NOT = 110, NULL_SQL = 111, NULLS = 112, OFFSET = 113, ON = 114,
+    OPTIMIZE = 115, OR = 116, ORDER = 117, OUTER = 118, OUTFILE = 119, PARTITION = 120,
+    POPULATE = 121, PREWHERE = 122, PRIMARY = 123, QUARTER = 124, RANGE = 125,
+    RELOAD = 126, REMOVE = 127, RENAME = 128, REPLACE = 129, REPLICA = 130,
+    REPLICATED = 131, RIGHT = 132, ROLLUP = 133, SAMPLE = 134, SECOND = 135,
+    SELECT = 136, SEMI = 137, SENDS = 138, SET = 139, SETTINGS = 140, SHOW = 141,
+    SOURCE = 142, START = 143, STOP = 144, SUBSTRING = 145, SYNC = 146,
+    SYNTAX = 147, SYSTEM = 148, TABLE = 149, TABLES = 150, TEMPORARY = 151,
+    TEST = 152, THEN = 153, TIES = 154, TIMEOUT = 155, TIMESTAMP = 156,
+    TO = 157, TOP = 158, TOTALS = 159, TRAILING = 160, TRIM = 161, TRUNCATE = 162,
+    TTL = 163, TYPE = 164, UNION = 165, UPDATE = 166, USE = 167, USING = 168,
+    UUID = 169, VALUES = 170, VIEW = 171, VOLUME = 172, WATCH = 173, WEEK = 174,
+    WHEN = 175, WHERE = 176, WITH = 177, YEAR = 178, JSON_FALSE = 179, JSON_TRUE = 180,
+    IDENTIFIER = 181, FLOATING_LITERAL = 182, OCTAL_LITERAL = 183, DECIMAL_LITERAL = 184,
+    HEXADECIMAL_LITERAL = 185, STRING_LITERAL = 186, ARROW = 187, ASTERISK = 188,
+    BACKQUOTE = 189, BACKSLASH = 190, COLON = 191, COMMA = 192, CONCAT = 193,
+    DASH = 194, DOT = 195, EQ_DOUBLE = 196, EQ_SINGLE = 197, GE = 198, GT = 199,
+    LBRACE = 200, LBRACKET = 201, LE = 202, LPAREN = 203, LT = 204, NOT_EQ = 205,
+    PERCENT = 206, PLUS = 207, QUERY = 208, QUOTE_DOUBLE = 209, QUOTE_SINGLE = 210,
+    RBRACE = 211, RBRACKET = 212, RPAREN = 213, SEMICOLON = 214, SLASH = 215,
+    UNDERSCORE = 216, MULTI_LINE_COMMENT = 217, SINGLE_LINE_COMMENT = 218,
     WHITESPACE = 219
   };
 
   ClickHouseLexer(antlr4::CharStream *input);
-  ~ClickHouseLexer();
+  ~ClickHouseLexer() override;
 
   virtual std::string getGrammarFileName() const override;
   virtual const std::vector<std::string>& getRuleNames() const override;
diff --git a/src/Parsers/New/ClickHouseParser.h b/src/Parsers/New/ClickHouseParser.h
index 11beadb182e..35e8d81d7f8 100644
--- a/src/Parsers/New/ClickHouseParser.h
+++ b/src/Parsers/New/ClickHouseParser.h
@@ -91,7 +91,7 @@ public:
   };
 
   ClickHouseParser(antlr4::TokenStream *input);
-  ~ClickHouseParser();
+  ~ClickHouseParser() override;
 
   virtual std::string getGrammarFileName() const override;
   virtual const antlr4::atn::ATN& getATN() const override { return _atn; };
diff --git a/src/Parsers/ParserAlterQuery.cpp b/src/Parsers/ParserAlterQuery.cpp
index 5d20e27e486..de524342fb4 100644
--- a/src/Parsers/ParserAlterQuery.cpp
+++ b/src/Parsers/ParserAlterQuery.cpp
@@ -61,8 +61,10 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
     ParserKeyword s_drop_detached_partition("DROP DETACHED PARTITION");
     ParserKeyword s_drop_detached_part("DROP DETACHED PART");
     ParserKeyword s_fetch_partition("FETCH PARTITION");
+    ParserKeyword s_fetch_part("FETCH PART");
     ParserKeyword s_replace_partition("REPLACE PARTITION");
     ParserKeyword s_freeze("FREEZE");
+    ParserKeyword s_unfreeze("UNFREEZE");
     ParserKeyword s_partition("PARTITION");
 
     ParserKeyword s_first("FIRST");
@@ -427,6 +429,21 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
             command->from = ast_from->as<ASTLiteral &>().value.get<const String &>();
             command->type = ASTAlterCommand::FETCH_PARTITION;
         }
+        else if (s_fetch_part.ignore(pos, expected))
+        {
+            if (!parser_string_literal.parse(pos, command->partition, expected))
+                return false;
+
+            if (!s_from.ignore(pos, expected))
+                return false;
+
+            ASTPtr ast_from;
+            if (!parser_string_literal.parse(pos, ast_from, expected))
+                return false;
+            command->from = ast_from->as<ASTLiteral &>().value.get<const String &>();
+            command->part = true;
+            command->type = ASTAlterCommand::FETCH_PARTITION;
+        }
         else if (s_freeze.ignore(pos, expected))
         {
             if (s_partition.ignore(pos, expected))
@@ -454,6 +471,37 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
                 command->with_name = ast_with_name->as<ASTLiteral &>().value.get<const String &>();
             }
         }
+        else if (s_unfreeze.ignore(pos, expected))
+        {
+            if (s_partition.ignore(pos, expected))
+            {
+                if (!parser_partition.parse(pos, command->partition, expected))
+                    return false;
+
+                command->type = ASTAlterCommand::UNFREEZE_PARTITION;
+            }
+            else
+            {
+                command->type = ASTAlterCommand::UNFREEZE_ALL;
+            }
+
+            /// WITH NAME 'name' - remove local backup to directory with specified name
+            if (s_with.ignore(pos, expected))
+            {
+                if (!s_name.ignore(pos, expected))
+                    return false;
+
+                ASTPtr ast_with_name;
+                if (!parser_string_literal.parse(pos, ast_with_name, expected))
+                    return false;
+
+                command->with_name = ast_with_name->as<ASTLiteral &>().value.get<const String &>();
+            }
+            else
+            {
+                return false;
+            }
+        }
         else if (s_modify_column.ignore(pos, expected))
         {
             if (s_if_exists.ignore(pos, expected))
diff --git a/src/Parsers/ParserCreateQuery.cpp b/src/Parsers/ParserCreateQuery.cpp
index 4cef79fdf42..bfd51b7633d 100644
--- a/src/Parsers/ParserCreateQuery.cpp
+++ b/src/Parsers/ParserCreateQuery.cpp
@@ -780,6 +780,7 @@ bool ParserCreateViewQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
 
     ASTPtr table;
     ASTPtr to_table;
+    ASTPtr to_inner_uuid;
     ASTPtr columns_list;
     ASTPtr storage;
     ASTPtr as_database;
@@ -830,9 +831,16 @@ bool ParserCreateViewQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
             return false;
     }
 
-    // TO [db.]table
-    if (ParserKeyword{"TO"}.ignore(pos, expected))
+
+    if (ParserKeyword{"TO INNER UUID"}.ignore(pos, expected))
     {
+        ParserLiteral literal_p;
+        if (!literal_p.parse(pos, to_inner_uuid, expected))
+            return false;
+    }
+    else if (ParserKeyword{"TO"}.ignore(pos, expected))
+    {
+        // TO [db.]table
         if (!table_name_p.parse(pos, to_table, expected))
             return false;
     }
@@ -883,6 +891,8 @@ bool ParserCreateViewQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
 
     if (to_table)
         query->to_table_id = getTableIdentifier(to_table);
+    if (to_inner_uuid)
+        query->to_inner_uuid = parseFromString<UUID>(to_inner_uuid->as<ASTLiteral>()->value.get<String>());
 
     query->set(query->columns_list, columns_list);
     query->set(query->storage, storage);
diff --git a/src/Parsers/ParserCreateQuotaQuery.cpp b/src/Parsers/ParserCreateQuotaQuery.cpp
index 68c53d2fc1d..a8779a68600 100644
--- a/src/Parsers/ParserCreateQuotaQuery.cpp
+++ b/src/Parsers/ParserCreateQuotaQuery.cpp
@@ -226,7 +226,7 @@ namespace
         {
             ASTPtr node;
             ParserRolesOrUsersSet roles_p;
-            roles_p.allowAll().allowRoleNames().allowUserNames().allowCurrentUser().useIDMode(id_mode);
+            roles_p.allowAll().allowRoles().allowUsers().allowCurrentUser().useIDMode(id_mode);
             if (!ParserKeyword{"TO"}.ignore(pos, expected) || !roles_p.parse(pos, node, expected))
                 return false;
 
diff --git a/src/Parsers/ParserCreateRowPolicyQuery.cpp b/src/Parsers/ParserCreateRowPolicyQuery.cpp
index fae5bd35b43..534f781a273 100644
--- a/src/Parsers/ParserCreateRowPolicyQuery.cpp
+++ b/src/Parsers/ParserCreateRowPolicyQuery.cpp
@@ -187,7 +187,7 @@ namespace
                 return false;
 
             ParserRolesOrUsersSet roles_p;
-            roles_p.allowAll().allowRoleNames().allowUserNames().allowCurrentUser().useIDMode(id_mode);
+            roles_p.allowAll().allowRoles().allowUsers().allowCurrentUser().useIDMode(id_mode);
             if (!roles_p.parse(pos, ast, expected))
                 return false;
 
diff --git a/src/Parsers/ParserCreateSettingsProfileQuery.cpp b/src/Parsers/ParserCreateSettingsProfileQuery.cpp
index 797379509e4..2d1e6824b50 100644
--- a/src/Parsers/ParserCreateSettingsProfileQuery.cpp
+++ b/src/Parsers/ParserCreateSettingsProfileQuery.cpp
@@ -53,7 +53,7 @@ namespace
                 return false;
 
             ParserRolesOrUsersSet roles_p;
-            roles_p.allowAll().allowRoleNames().allowUserNames().allowCurrentUser().useIDMode(id_mode);
+            roles_p.allowAll().allowRoles().allowUsers().allowCurrentUser().useIDMode(id_mode);
             if (!roles_p.parse(pos, ast, expected))
                 return false;
 
diff --git a/src/Parsers/ParserCreateUserQuery.cpp b/src/Parsers/ParserCreateUserQuery.cpp
index 98faa0b15eb..84bf60d56d3 100644
--- a/src/Parsers/ParserCreateUserQuery.cpp
+++ b/src/Parsers/ParserCreateUserQuery.cpp
@@ -49,7 +49,8 @@ namespace
             std::optional<Authentication::Type> type;
             bool expect_password = false;
             bool expect_hash = false;
-            bool expect_server_name = false;
+            bool expect_ldap_server_name = false;
+            bool expect_kerberos_realm = false;
 
             if (ParserKeyword{"WITH"}.ignore(pos, expected))
             {
@@ -59,8 +60,10 @@ namespace
                     {
                         type = check_type;
 
-                        if (check_type == Authentication::LDAP_SERVER)
-                            expect_server_name = true;
+                        if (check_type == Authentication::LDAP)
+                            expect_ldap_server_name = true;
+                        else if (check_type == Authentication::KERBEROS)
+                            expect_kerberos_realm = true;
                         else if (check_type != Authentication::NO_PASSWORD)
                             expect_password = true;
 
@@ -92,7 +95,7 @@ namespace
             }
 
             String value;
-            if (expect_password || expect_hash || expect_server_name)
+            if (expect_password || expect_hash)
             {
                 ASTPtr ast;
                 if (!ParserKeyword{"BY"}.ignore(pos, expected) || !ParserStringLiteral{}.parse(pos, ast, expected))
@@ -100,14 +103,35 @@ namespace
 
                 value = ast->as<const ASTLiteral &>().value.safeGet<String>();
             }
+            else if (expect_ldap_server_name)
+            {
+                ASTPtr ast;
+                if (!ParserKeyword{"SERVER"}.ignore(pos, expected) || !ParserStringLiteral{}.parse(pos, ast, expected))
+                    return false;
+
+                value = ast->as<const ASTLiteral &>().value.safeGet<String>();
+            }
+            else if (expect_kerberos_realm)
+            {
+                if (ParserKeyword{"REALM"}.ignore(pos, expected))
+                {
+                    ASTPtr ast;
+                    if (!ParserStringLiteral{}.parse(pos, ast, expected))
+                        return false;
+
+                    value = ast->as<const ASTLiteral &>().value.safeGet<String>();
+                }
+            }
 
             authentication = Authentication{*type};
             if (expect_password)
                 authentication.setPassword(value);
             else if (expect_hash)
                 authentication.setPasswordHashHex(value);
-            else if (expect_server_name)
-                authentication.setServerName(value);
+            else if (expect_ldap_server_name)
+                authentication.setLDAPServerName(value);
+            else if (expect_kerberos_realm)
+                authentication.setKerberosRealm(value);
 
             return true;
         });
@@ -222,12 +246,12 @@ namespace
 
             ASTPtr ast;
             ParserRolesOrUsersSet default_roles_p;
-            default_roles_p.allowAll().allowRoleNames().useIDMode(id_mode);
+            default_roles_p.allowAll().allowRoles().useIDMode(id_mode);
             if (!default_roles_p.parse(pos, ast, expected))
                 return false;
 
             default_roles = typeid_cast<std::shared_ptr<ASTRolesOrUsersSet>>(ast);
-            default_roles->allow_user_names = false;
+            default_roles->allow_users = false;
             return true;
         });
     }
@@ -251,6 +275,24 @@ namespace
         });
     }
 
+    bool parseGrantees(IParserBase::Pos & pos, Expected & expected, bool id_mode, std::shared_ptr<ASTRolesOrUsersSet> & grantees)
+    {
+        return IParserBase::wrapParseImpl(pos, [&]
+        {
+            if (!ParserKeyword{"GRANTEES"}.ignore(pos, expected))
+                return false;
+
+            ASTPtr ast;
+            ParserRolesOrUsersSet grantees_p;
+            grantees_p.allowAny().allowUsers().allowCurrentUser().allowRoles().useIDMode(id_mode);
+            if (!grantees_p.parse(pos, ast, expected))
+                return false;
+
+            grantees = typeid_cast<std::shared_ptr<ASTRolesOrUsersSet>>(ast);
+            return true;
+        });
+    }
+
     bool parseOnCluster(IParserBase::Pos & pos, Expected & expected, String & cluster)
     {
         return IParserBase::wrapParseImpl(pos, [&]
@@ -306,6 +348,7 @@ bool ParserCreateUserQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
     std::optional<AllowedClientHosts> remove_hosts;
     std::shared_ptr<ASTRolesOrUsersSet> default_roles;
     std::shared_ptr<ASTSettingsProfileElements> settings;
+    std::shared_ptr<ASTRolesOrUsersSet> grantees;
     String cluster;
 
     while (true)
@@ -344,6 +387,9 @@ bool ParserCreateUserQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
         if (cluster.empty() && parseOnCluster(pos, expected, cluster))
             continue;
 
+        if (!grantees && parseGrantees(pos, expected, attach_mode, grantees))
+            continue;
+
         if (alter)
         {
             if (new_name.empty() && (names->size() == 1) && parseRenameTo(pos, expected, new_name))
@@ -398,6 +444,7 @@ bool ParserCreateUserQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
     query->remove_hosts = std::move(remove_hosts);
     query->default_roles = std::move(default_roles);
     query->settings = std::move(settings);
+    query->grantees = std::move(grantees);
 
     return true;
 }
diff --git a/src/Parsers/ParserCreateUserQuery.h b/src/Parsers/ParserCreateUserQuery.h
index 69100d1211d..215133a777c 100644
--- a/src/Parsers/ParserCreateUserQuery.h
+++ b/src/Parsers/ParserCreateUserQuery.h
@@ -7,15 +7,19 @@ namespace DB
 {
 /** Parses queries like
   * CREATE USER [IF NOT EXISTS | OR REPLACE] name
-  *     [NOT IDENTIFIED | IDENTIFIED [WITH {no_password|plaintext_password|sha256_password|sha256_hash|double_sha1_password|double_sha1_hash|ldap_server}] BY {'password'|'hash'|'server_name'}]
+  *     [NOT IDENTIFIED | IDENTIFIED {[WITH {no_password|plaintext_password|sha256_password|sha256_hash|double_sha1_password|double_sha1_hash}] BY {'password'|'hash'}}|{WITH ldap SERVER 'server_name'}|{WITH kerberos [REALM 'realm']}]
   *     [HOST {LOCAL | NAME 'name' | REGEXP 'name_regexp' | IP 'address' | LIKE 'pattern'} [,...] | ANY | NONE]
+  *     [DEFAULT ROLE role [,...]]
   *     [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | PROFILE 'profile_name'] [,...]
+  *     [GRANTEES {user | role | ANY | NONE} [,...] [EXCEPT {user | role} [,...]]]
   *
   * ALTER USER [IF EXISTS] name
   *     [RENAME TO new_name]
-  *     [NOT IDENTIFIED | IDENTIFIED [WITH {no_password|plaintext_password|sha256_password|sha256_hash|double_sha1_password|double_sha1_hash|ldap_server}] BY {'password'|'hash'|'server_name'}]
+  *     [NOT IDENTIFIED | IDENTIFIED {[WITH {no_password|plaintext_password|sha256_password|sha256_hash|double_sha1_password|double_sha1_hash}] BY {'password'|'hash'}}|{WITH ldap SERVER 'server_name'}|{WITH kerberos [REALM 'realm']}]
   *     [[ADD|DROP] HOST {LOCAL | NAME 'name' | REGEXP 'name_regexp' | IP 'address' | LIKE 'pattern'} [,...] | ANY | NONE]
+  *     [DEFAULT ROLE role [,...] | ALL | ALL EXCEPT role [,...] ]
   *     [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | PROFILE 'profile_name'] [,...]
+  *     [GRANTEES {user | role | ANY | NONE} [,...] [EXCEPT {user | role} [,...]]]
   */
 class ParserCreateUserQuery : public IParserBase
 {
diff --git a/src/Parsers/ParserGrantQuery.cpp b/src/Parsers/ParserGrantQuery.cpp
index 7dd721c9af2..d3aa62e73da 100644
--- a/src/Parsers/ParserGrantQuery.cpp
+++ b/src/Parsers/ParserGrantQuery.cpp
@@ -8,6 +8,7 @@
 #include <Parsers/ParserRolesOrUsersSet.h>
 #include <Parsers/parseDatabaseAndTableName.h>
 #include <boost/algorithm/string/predicate.hpp>
+#include <boost/range/algorithm_ext/erase.hpp>
 
 
 namespace DB
@@ -20,8 +21,6 @@ namespace ErrorCodes
 
 namespace
 {
-    using Kind = ASTGrantQuery::Kind;
-
     bool parseAccessFlags(IParser::Pos & pos, Expected & expected, AccessFlags & access_flags)
     {
         static constexpr auto is_one_of_access_type_words = [](IParser::Pos & pos_)
@@ -87,7 +86,7 @@ namespace
         });
     }
 
-    bool parseAccessTypesWithColumns(IParser::Pos & pos, Expected & expected,
+    bool parseAccessFlagsWithColumns(IParser::Pos & pos, Expected & expected,
                                      std::vector<std::pair<AccessFlags, Strings>> & access_and_columns)
     {
         std::vector<std::pair<AccessFlags, Strings>> res;
@@ -112,7 +111,7 @@ namespace
     }
 
 
-    bool parseAccessRightsElements(IParser::Pos & pos, Expected & expected, AccessRightsElements & elements)
+    bool parseElementsWithoutOptions(IParser::Pos & pos, Expected & expected, AccessRightsElements & elements)
     {
         return IParserBase::wrapParseImpl(pos, [&]
         {
@@ -121,7 +120,7 @@ namespace
             auto parse_around_on = [&]
             {
                 std::vector<std::pair<AccessFlags, Strings>> access_and_columns;
-                if (!parseAccessTypesWithColumns(pos, expected, access_and_columns))
+                if (!parseAccessFlagsWithColumns(pos, expected, access_and_columns))
                     return false;
 
                 if (!ParserKeyword{"ON"}.ignore(pos, expected))
@@ -157,16 +156,16 @@ namespace
     }
 
 
-    void removeNonGrantableFlags(AccessRightsElements & elements)
+    void eraseNonGrantable(AccessRightsElements & elements)
     {
-        for (auto & element : elements)
+        boost::range::remove_erase_if(elements, [](AccessRightsElement & element)
         {
             if (element.empty())
-                continue;
+                return true;
             auto old_flags = element.access_flags;
-            element.removeNonGrantableFlags();
+            element.eraseNonGrantable();
             if (!element.empty())
-                continue;
+                return false;
 
             if (!element.any_column)
                 throw Exception(old_flags.toString() + " cannot be granted on the column level", ErrorCodes::INVALID_GRANT);
@@ -176,17 +175,17 @@ namespace
                 throw Exception(old_flags.toString() + " cannot be granted on the database level", ErrorCodes::INVALID_GRANT);
             else
                 throw Exception(old_flags.toString() + " cannot be granted", ErrorCodes::INVALID_GRANT);
-        }
+        });
     }
 
 
-    bool parseRoles(IParser::Pos & pos, Expected & expected, Kind kind, bool id_mode, std::shared_ptr<ASTRolesOrUsersSet> & roles)
+    bool parseRoles(IParser::Pos & pos, Expected & expected, bool is_revoke, bool id_mode, std::shared_ptr<ASTRolesOrUsersSet> & roles)
     {
         return IParserBase::wrapParseImpl(pos, [&]
         {
             ParserRolesOrUsersSet roles_p;
-            roles_p.allowRoleNames().useIDMode(id_mode);
-            if (kind == Kind::REVOKE)
+            roles_p.allowRoles().useIDMode(id_mode);
+            if (is_revoke)
                 roles_p.allowAll();
 
             ASTPtr ast;
@@ -199,28 +198,20 @@ namespace
     }
 
 
-    bool parseToRoles(IParser::Pos & pos, Expected & expected, ASTGrantQuery::Kind kind, std::shared_ptr<ASTRolesOrUsersSet> & to_roles)
+    bool parseToGrantees(IParser::Pos & pos, Expected & expected, bool is_revoke, std::shared_ptr<ASTRolesOrUsersSet> & grantees)
     {
         return IParserBase::wrapParseImpl(pos, [&]
         {
-            if (kind == Kind::GRANT)
-            {
-                if (!ParserKeyword{"TO"}.ignore(pos, expected))
-                    return false;
-            }
-            else
-            {
-                if (!ParserKeyword{"FROM"}.ignore(pos, expected))
-                    return false;
-            }
+            if (!ParserKeyword{is_revoke ? "FROM" : "TO"}.ignore(pos, expected))
+                return false;
 
             ASTPtr ast;
             ParserRolesOrUsersSet roles_p;
-            roles_p.allowRoleNames().allowUserNames().allowCurrentUser().allowAll(kind == Kind::REVOKE);
+            roles_p.allowRoles().allowUsers().allowCurrentUser().allowAll(is_revoke);
             if (!roles_p.parse(pos, ast, expected))
                 return false;
 
-            to_roles = typeid_cast<std::shared_ptr<ASTRolesOrUsersSet>>(ast);
+            grantees = typeid_cast<std::shared_ptr<ASTRolesOrUsersSet>>(ast);
             return true;
         });
     }
@@ -237,20 +228,13 @@ namespace
 
 bool ParserGrantQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
-    bool attach = false;
-    if (attach_mode)
-    {
-        if (!ParserKeyword{"ATTACH"}.ignore(pos, expected))
-            return false;
-        attach = true;
-    }
+    if (attach_mode && !ParserKeyword{"ATTACH"}.ignore(pos, expected))
+        return false;
 
-    Kind kind;
-    if (ParserKeyword{"GRANT"}.ignore(pos, expected))
-        kind = Kind::GRANT;
-    else if (ParserKeyword{"REVOKE"}.ignore(pos, expected))
-        kind = Kind::REVOKE;
-    else
+    bool is_revoke = false;
+    if (ParserKeyword{"REVOKE"}.ignore(pos, expected))
+        is_revoke = true;
+    else if (!ParserKeyword{"GRANT"}.ignore(pos, expected))
         return false;
 
     String cluster;
@@ -259,7 +243,7 @@ bool ParserGrantQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 
     bool grant_option = false;
     bool admin_option = false;
-    if (kind == Kind::REVOKE)
+    if (is_revoke)
     {
         if (ParserKeyword{"GRANT OPTION FOR"}.ignore(pos, expected))
             grant_option = true;
@@ -269,20 +253,20 @@ bool ParserGrantQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 
     AccessRightsElements elements;
     std::shared_ptr<ASTRolesOrUsersSet> roles;
-    if (!parseAccessRightsElements(pos, expected, elements) && !parseRoles(pos, expected, kind, attach, roles))
+    if (!parseElementsWithoutOptions(pos, expected, elements) && !parseRoles(pos, expected, is_revoke, attach_mode, roles))
         return false;
 
     if (cluster.empty())
         parseOnCluster(pos, expected, cluster);
 
-    std::shared_ptr<ASTRolesOrUsersSet> to_roles;
-    if (!parseToRoles(pos, expected, kind, to_roles))
+    std::shared_ptr<ASTRolesOrUsersSet> grantees;
+    if (!parseToGrantees(pos, expected, is_revoke, grantees))
         return false;
 
     if (cluster.empty())
         parseOnCluster(pos, expected, cluster);
 
-    if (kind == Kind::GRANT)
+    if (!is_revoke)
     {
         if (ParserKeyword{"WITH GRANT OPTION"}.ignore(pos, expected))
             grant_option = true;
@@ -298,19 +282,24 @@ bool ParserGrantQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     if (admin_option && !elements.empty())
         throw Exception("ADMIN OPTION should be specified for roles", ErrorCodes::SYNTAX_ERROR);
 
-    if (kind == Kind::GRANT)
-        removeNonGrantableFlags(elements);
+    if (grant_option)
+    {
+        for (auto & element : elements)
+            element.grant_option = true;
+    }
+
+    if (!is_revoke)
+        eraseNonGrantable(elements);
 
     auto query = std::make_shared<ASTGrantQuery>();
     node = query;
 
-    query->kind = kind;
-    query->attach = attach;
+    query->is_revoke = is_revoke;
+    query->attach_mode = attach_mode;
     query->cluster = std::move(cluster);
     query->access_rights_elements = std::move(elements);
     query->roles = std::move(roles);
-    query->to_roles = std::move(to_roles);
-    query->grant_option = grant_option;
+    query->grantees = std::move(grantees);
     query->admin_option = admin_option;
 
     return true;
diff --git a/src/Parsers/ParserRolesOrUsersSet.cpp b/src/Parsers/ParserRolesOrUsersSet.cpp
index 0f3ba3f0f84..41e9ee6501d 100644
--- a/src/Parsers/ParserRolesOrUsersSet.cpp
+++ b/src/Parsers/ParserRolesOrUsersSet.cpp
@@ -12,11 +12,7 @@ namespace DB
 {
 namespace
 {
-    bool parseRoleNameOrID(
-        IParserBase::Pos & pos,
-        Expected & expected,
-        bool id_mode,
-        String & res)
+    bool parseNameOrID(IParserBase::Pos & pos, Expected & expected, bool id_mode, String & res)
     {
         return IParserBase::wrapParseImpl(pos, [&]
         {
@@ -39,20 +35,21 @@ namespace
         });
     }
 
-
     bool parseBeforeExcept(
         IParserBase::Pos & pos,
         Expected & expected,
         bool id_mode,
         bool allow_all,
+        bool allow_any,
         bool allow_current_user,
-        Strings & names,
         bool & all,
+        Strings & names,
         bool & current_user)
     {
         bool res_all = false;
-        bool res_current_user = false;
         Strings res_names;
+        bool res_current_user = false;
+        Strings res_with_roles_names;
 
         auto parse_element = [&]
         {
@@ -65,6 +62,12 @@ namespace
                 return true;
             }
 
+            if (allow_any && ParserKeyword{"ANY"}.ignore(pos, expected))
+            {
+                res_all = true;
+                return true;
+            }
+
             if (allow_current_user && parseCurrentUserTag(pos, expected))
             {
                 res_current_user = true;
@@ -72,7 +75,7 @@ namespace
             }
 
             String name;
-            if (parseRoleNameOrID(pos, expected, id_mode, name))
+            if (parseNameOrID(pos, expected, id_mode, name))
             {
                 res_names.emplace_back(std::move(name));
                 return true;
@@ -85,8 +88,8 @@ namespace
             return false;
 
         names = std::move(res_names);
-        all = res_all;
         current_user = res_current_user;
+        all = res_all;
         return true;
     }
 
@@ -98,13 +101,12 @@ namespace
         Strings & except_names,
         bool & except_current_user)
     {
-        return IParserBase::wrapParseImpl(pos, [&]
-        {
+        return IParserBase::wrapParseImpl(pos, [&] {
             if (!ParserKeyword{"EXCEPT"}.ignore(pos, expected))
                 return false;
 
             bool unused;
-            return parseBeforeExcept(pos, expected, id_mode, false, allow_current_user, except_names, unused, except_current_user);
+            return parseBeforeExcept(pos, expected, id_mode, false, false, allow_current_user, unused, except_names, except_current_user);
         });
     }
 }
@@ -112,13 +114,13 @@ namespace
 
 bool ParserRolesOrUsersSet::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
+    bool all = false;
     Strings names;
     bool current_user = false;
-    bool all = false;
     Strings except_names;
     bool except_current_user = false;
 
-    if (!parseBeforeExcept(pos, expected, id_mode, allow_all, allow_current_user, names, all, current_user))
+    if (!parseBeforeExcept(pos, expected, id_mode, allow_all, allow_any, allow_current_user, all, names, current_user))
         return false;
 
     parseExceptAndAfterExcept(pos, expected, id_mode, allow_current_user, except_names, except_current_user);
@@ -132,9 +134,10 @@ bool ParserRolesOrUsersSet::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
     result->all = all;
     result->except_names = std::move(except_names);
     result->except_current_user = except_current_user;
+    result->allow_users = allow_users;
+    result->allow_roles = allow_roles;
     result->id_mode = id_mode;
-    result->allow_user_names = allow_user_names;
-    result->allow_role_names = allow_role_names;
+    result->use_keyword_any = all && allow_any && !allow_all;
     node = result;
     return true;
 }
diff --git a/src/Parsers/ParserRolesOrUsersSet.h b/src/Parsers/ParserRolesOrUsersSet.h
index c71012e874c..9ae9937e784 100644
--- a/src/Parsers/ParserRolesOrUsersSet.h
+++ b/src/Parsers/ParserRolesOrUsersSet.h
@@ -6,15 +6,17 @@
 namespace DB
 {
 /** Parses a string like this:
-  * {role|CURRENT_USER} [,...] | NONE | ALL | ALL EXCEPT {role|CURRENT_USER} [,...]
+  * {user_name | role_name | CURRENT_USER | ALL | NONE} [,...]
+  * [EXCEPT {user_name | role_name | CURRENT_USER | ALL | NONE} [,...]]
   */
 class ParserRolesOrUsersSet : public IParserBase
 {
 public:
     ParserRolesOrUsersSet & allowAll(bool allow_all_ = true) { allow_all = allow_all_; return *this; }
-    ParserRolesOrUsersSet & allowUserNames(bool allow_user_names_ = true) { allow_user_names = allow_user_names_; return *this; }
-    ParserRolesOrUsersSet & allowRoleNames(bool allow_role_names_ = true) { allow_role_names = allow_role_names_; return *this; }
+    ParserRolesOrUsersSet & allowAny(bool allow_any_ = true) { allow_any = allow_any_; return *this; }
+    ParserRolesOrUsersSet & allowUsers(bool allow_users_ = true) { allow_users = allow_users_; return *this; }
     ParserRolesOrUsersSet & allowCurrentUser(bool allow_current_user_ = true) { allow_current_user = allow_current_user_; return *this; }
+    ParserRolesOrUsersSet & allowRoles(bool allow_roles_ = true) { allow_roles = allow_roles_; return *this; }
     ParserRolesOrUsersSet & useIDMode(bool id_mode_ = true) { id_mode = id_mode_; return *this; }
 
 protected:
@@ -23,9 +25,10 @@ protected:
 
 private:
     bool allow_all = false;
-    bool allow_user_names = false;
-    bool allow_role_names = false;
+    bool allow_any = false;
+    bool allow_users = false;
     bool allow_current_user = false;
+    bool allow_roles = false;
     bool id_mode = false;
 };
 
diff --git a/src/Parsers/ParserSetRoleQuery.cpp b/src/Parsers/ParserSetRoleQuery.cpp
index e8734f8dfc1..678474af040 100644
--- a/src/Parsers/ParserSetRoleQuery.cpp
+++ b/src/Parsers/ParserSetRoleQuery.cpp
@@ -15,12 +15,12 @@ namespace
         {
             ASTPtr ast;
             ParserRolesOrUsersSet roles_p;
-            roles_p.allowRoleNames().allowAll();
+            roles_p.allowRoles().allowAll();
             if (!roles_p.parse(pos, ast, expected))
                 return false;
 
             roles = typeid_cast<std::shared_ptr<ASTRolesOrUsersSet>>(ast);
-            roles->allow_user_names = false;
+            roles->allow_users = false;
             return true;
         });
     }
@@ -34,12 +34,12 @@ namespace
 
             ASTPtr ast;
             ParserRolesOrUsersSet users_p;
-            users_p.allowUserNames().allowCurrentUser();
+            users_p.allowUsers().allowCurrentUser();
             if (!users_p.parse(pos, ast, expected))
                 return false;
 
             to_users = typeid_cast<std::shared_ptr<ASTRolesOrUsersSet>>(ast);
-            to_users->allow_role_names = false;
+            to_users->allow_roles = false;
             return true;
         });
     }
diff --git a/src/Parsers/ParserShowGrantsQuery.cpp b/src/Parsers/ParserShowGrantsQuery.cpp
index d25527754be..bd9e4012771 100644
--- a/src/Parsers/ParserShowGrantsQuery.cpp
+++ b/src/Parsers/ParserShowGrantsQuery.cpp
@@ -19,7 +19,7 @@ bool ParserShowGrantsQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
     {
         ASTPtr for_roles_ast;
         ParserRolesOrUsersSet for_roles_p;
-        for_roles_p.allowUserNames().allowRoleNames().allowAll().allowCurrentUser();
+        for_roles_p.allowUsers().allowRoles().allowAll().allowCurrentUser();
         if (!for_roles_p.parse(pos, for_roles_ast, expected))
             return false;
 
diff --git a/src/Parsers/ParserSystemQuery.cpp b/src/Parsers/ParserSystemQuery.cpp
index 491037da9a9..2fc168ea167 100644
--- a/src/Parsers/ParserSystemQuery.cpp
+++ b/src/Parsers/ParserSystemQuery.cpp
@@ -57,7 +57,35 @@ bool ParserSystemQuery::parseImpl(IParser::Pos & pos, ASTPtr & node, Expected &
                 return false;
             break;
         }
+        case Type::RELOAD_MODEL:
+        {
+            String cluster_str;
+            if (ParserKeyword{"ON"}.ignore(pos, expected))
+            {
+                if (!ASTQueryWithOnCluster::parse(pos, cluster_str, expected))
+                    return false;
+            }
+            res->cluster = cluster_str;
+            ASTPtr ast;
+            if (ParserStringLiteral{}.parse(pos, ast, expected))
+            {
+                res->target_model = ast->as<ASTLiteral &>().value.safeGet<String>();
+            }
+            else
+            {
+                ParserIdentifier model_parser;
+                ASTPtr model;
+                String target_model;
 
+                if (!model_parser.parse(pos, model, expected))
+                    return false;
+
+                if (!tryGetIdentifierNameInto(model, res->target_model))
+                    return false;
+            }
+
+            break;
+        }
         case Type::DROP_REPLICA:
         {
             ASTPtr ast;
diff --git a/src/Processors/DelayedPortsProcessor.cpp b/src/Processors/DelayedPortsProcessor.cpp
index ae4ba4659aa..8174619f8ce 100644
--- a/src/Processors/DelayedPortsProcessor.cpp
+++ b/src/Processors/DelayedPortsProcessor.cpp
@@ -8,9 +8,35 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
+InputPorts createInputPorts(
+    const Block & header,
+    size_t num_ports,
+    IProcessor::PortNumbers delayed_ports,
+    bool assert_main_ports_empty)
+{
+    if (!assert_main_ports_empty)
+        return InputPorts(num_ports, header);
+
+    InputPorts res;
+    std::sort(delayed_ports.begin(), delayed_ports.end());
+    size_t next_delayed_port = 0;
+    for (size_t i = 0; i < num_ports; ++i)
+    {
+        if (next_delayed_port < delayed_ports.size() && i == delayed_ports[next_delayed_port])
+        {
+            res.emplace_back(header);
+            ++next_delayed_port;
+        }
+        else
+            res.emplace_back(Block());
+    }
+
+    return res;
+}
+
 DelayedPortsProcessor::DelayedPortsProcessor(
     const Block & header, size_t num_ports, const PortNumbers & delayed_ports, bool assert_main_ports_empty)
-    : IProcessor(InputPorts(num_ports, header),
+    : IProcessor(createInputPorts(header, num_ports, delayed_ports, assert_main_ports_empty),
                  OutputPorts((assert_main_ports_empty ? delayed_ports.size() : num_ports), header))
     , num_delayed_ports(delayed_ports.size())
 {
diff --git a/src/Processors/Executors/PipelineExecutor.cpp b/src/Processors/Executors/PipelineExecutor.cpp
index a724f22ed31..b1751dfd030 100644
--- a/src/Processors/Executors/PipelineExecutor.cpp
+++ b/src/Processors/Executors/PipelineExecutor.cpp
@@ -1,14 +1,15 @@
-#include <Processors/Executors/PipelineExecutor.h>
 #include <queue>
 #include <IO/WriteBufferFromString.h>
-#include <Processors/printPipeline.h>
 #include <Common/EventCounter.h>
-#include <ext/scope_guard.h>
 #include <Common/CurrentThread.h>
-#include <Processors/ISource.h>
 #include <Common/setThreadName.h>
+#include <Common/MemoryTracker.h>
+#include <Processors/Executors/PipelineExecutor.h>
+#include <Processors/printPipeline.h>
+#include <Processors/ISource.h>
 #include <Interpreters/ProcessList.h>
 #include <Interpreters/OpenTelemetrySpanLog.h>
+#include <ext/scope_guard_safe.h>
 
 #ifndef NDEBUG
     #include <Common/Stopwatch.h>
@@ -740,7 +741,7 @@ void PipelineExecutor::executeImpl(size_t num_threads)
 
     bool finished_flag = false;
 
-    SCOPE_EXIT(
+    SCOPE_EXIT_SAFE(
         if (!finished_flag)
         {
             finish();
@@ -766,9 +767,9 @@ void PipelineExecutor::executeImpl(size_t num_threads)
                 if (thread_group)
                     CurrentThread::attachTo(thread_group);
 
-                SCOPE_EXIT(
-                        if (thread_group)
-                            CurrentThread::detachQueryIfNotDetached();
+                SCOPE_EXIT_SAFE(
+                    if (thread_group)
+                        CurrentThread::detachQueryIfNotDetached();
                 );
 
                 try
diff --git a/src/Processors/Executors/PollingQueue.cpp b/src/Processors/Executors/PollingQueue.cpp
index 3636fa82f73..a601d426a5d 100644
--- a/src/Processors/Executors/PollingQueue.cpp
+++ b/src/Processors/Executors/PollingQueue.cpp
@@ -23,24 +23,14 @@ namespace ErrorCodes
 
 PollingQueue::PollingQueue()
 {
-    epoll_fd = epoll_create(1);
-    if (-1 == epoll_fd)
-        throwFromErrno("Cannot create epoll descriptor", ErrorCodes::CANNOT_OPEN_FILE);
-
     if (-1 == pipe2(pipe_fd, O_NONBLOCK))
         throwFromErrno("Cannot create pipe", ErrorCodes::CANNOT_OPEN_FILE);
 
-    epoll_event socket_event;
-    socket_event.events = EPOLLIN | EPOLLPRI;
-    socket_event.data.ptr = pipe_fd;
-
-    if (-1 == epoll_ctl(epoll_fd, EPOLL_CTL_ADD, pipe_fd[0], &socket_event))
-        throwFromErrno("Cannot add pipe descriptor to epoll", ErrorCodes::CANNOT_OPEN_FILE);
+    epoll.add(pipe_fd[0], pipe_fd);
 }
 
 PollingQueue::~PollingQueue()
 {
-    close(epoll_fd);
     close(pipe_fd[0]);
     close(pipe_fd[1]);
 }
@@ -52,13 +42,7 @@ void PollingQueue::addTask(size_t thread_number, void * data, int fd)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Task {} was already added to task queue", key);
 
     tasks[key] = TaskData{thread_number, data, fd};
-
-    epoll_event socket_event;
-    socket_event.events = EPOLLIN | EPOLLPRI;
-    socket_event.data.ptr = data;
-
-    if (-1 == epoll_ctl(epoll_fd, EPOLL_CTL_ADD, fd, &socket_event))
-        throwFromErrno("Cannot add socket descriptor to epoll", ErrorCodes::CANNOT_OPEN_FILE);
+    epoll.add(fd, data);
 }
 
 static std::string dumpTasks(const std::unordered_map<std::uintptr_t, PollingQueue::TaskData> & tasks)
@@ -86,15 +70,7 @@ PollingQueue::TaskData PollingQueue::wait(std::unique_lock<std::mutex> & lock)
 
     epoll_event event;
     event.data.ptr = nullptr;
-    int num_events = 0;
-
-    while (num_events <= 0)
-    {
-        num_events = epoll_wait(epoll_fd, &event, 1, -1);
-
-        if (num_events == -1 && errno != EINTR)
-                throwFromErrno("Failed to epoll_wait", ErrorCodes::CANNOT_READ_FROM_SOCKET);
-    }
+    epoll.getManyReady(1, &event, true);
 
     lock.lock();
 
@@ -112,9 +88,7 @@ PollingQueue::TaskData PollingQueue::wait(std::unique_lock<std::mutex> & lock)
 
     auto res = it->second;
     tasks.erase(it);
-
-    if (-1 == epoll_ctl(epoll_fd, EPOLL_CTL_DEL, res.fd, &event))
-        throwFromErrno("Cannot remove socket descriptor to epoll", ErrorCodes::CANNOT_OPEN_FILE);
+    epoll.remove(res.fd);
 
     return res;
 }
diff --git a/src/Processors/Executors/PollingQueue.h b/src/Processors/Executors/PollingQueue.h
index 9d37bf0a2cc..0d306ddf2f7 100644
--- a/src/Processors/Executors/PollingQueue.h
+++ b/src/Processors/Executors/PollingQueue.h
@@ -4,6 +4,7 @@
 #include <mutex>
 #include <atomic>
 #include <unordered_map>
+#include <Common/Epoll.h>
 
 namespace DB
 {
@@ -25,7 +26,7 @@ public:
     };
 
 private:
-    int epoll_fd;
+    Epoll epoll;
     int pipe_fd[2];
     std::atomic_bool is_finished = false;
     std::unordered_map<std::uintptr_t, TaskData> tasks;
diff --git a/src/Processors/Executors/PullingAsyncPipelineExecutor.cpp b/src/Processors/Executors/PullingAsyncPipelineExecutor.cpp
index e4bcf6dc0ab..9f1999bc4a3 100644
--- a/src/Processors/Executors/PullingAsyncPipelineExecutor.cpp
+++ b/src/Processors/Executors/PullingAsyncPipelineExecutor.cpp
@@ -5,7 +5,7 @@
 #include <Processors/QueryPipeline.h>
 
 #include <Common/setThreadName.h>
-#include <ext/scope_guard.h>
+#include <ext/scope_guard_safe.h>
 
 namespace DB
 {
@@ -14,6 +14,7 @@ struct PullingAsyncPipelineExecutor::Data
 {
     PipelineExecutorPtr executor;
     std::exception_ptr exception;
+    LazyOutputFormat * lazy_format = nullptr;
     std::atomic_bool is_finished = false;
     std::atomic_bool has_exception = false;
     ThreadFromGlobalPool thread;
@@ -71,7 +72,7 @@ static void threadFunction(PullingAsyncPipelineExecutor::Data & data, ThreadGrou
         if (thread_group)
             CurrentThread::attachTo(thread_group);
 
-        SCOPE_EXIT(
+        SCOPE_EXIT_SAFE(
             if (thread_group)
                 CurrentThread::detachQueryIfNotDetached();
         );
@@ -82,6 +83,10 @@ static void threadFunction(PullingAsyncPipelineExecutor::Data & data, ThreadGrou
     {
         data.exception = std::current_exception();
         data.has_exception = true;
+
+        /// Finish lazy format in case of exception. Otherwise thread.join() may hung.
+        if (data.lazy_format)
+            data.lazy_format->finalize();
     }
 
     data.is_finished = true;
@@ -95,6 +100,7 @@ bool PullingAsyncPipelineExecutor::pull(Chunk & chunk, uint64_t milliseconds)
     {
         data = std::make_unique<Data>();
         data->executor = pipeline.execute();
+        data->lazy_format = lazy_format.get();
 
         auto func = [&, thread_group = CurrentThread::getGroup()]()
         {
@@ -104,15 +110,7 @@ bool PullingAsyncPipelineExecutor::pull(Chunk & chunk, uint64_t milliseconds)
         data->thread = ThreadFromGlobalPool(std::move(func));
     }
 
-    if (data->has_exception)
-    {
-        /// Finish lazy format in case of exception. Otherwise thread.join() may hung.
-        if (lazy_format)
-            lazy_format->finish();
-
-        data->has_exception = false;
-        std::rethrow_exception(std::move(data->exception));
-    }
+    data->rethrowExceptionIfHas();
 
     bool is_execution_finished = lazy_format ? lazy_format->isFinished()
                                              : data->is_finished.load();
@@ -121,7 +119,7 @@ bool PullingAsyncPipelineExecutor::pull(Chunk & chunk, uint64_t milliseconds)
     {
         /// If lazy format is finished, we don't cancel pipeline but wait for main thread to be finished.
         data->is_finished = true;
-        /// Wait thread ant rethrow exception if any.
+        /// Wait thread and rethrow exception if any.
         cancel();
         return false;
     }
@@ -133,7 +131,12 @@ bool PullingAsyncPipelineExecutor::pull(Chunk & chunk, uint64_t milliseconds)
     }
 
     chunk.clear();
-    data->finish_event.tryWait(milliseconds);
+
+    if (milliseconds)
+        data->finish_event.tryWait(milliseconds);
+    else
+        data->finish_event.wait();
+
     return true;
 }
 
diff --git a/src/Processors/Formats/IInputFormat.cpp b/src/Processors/Formats/IInputFormat.cpp
index 0fbc78ea8c0..5594e04dc74 100644
--- a/src/Processors/Formats/IInputFormat.cpp
+++ b/src/Processors/Formats/IInputFormat.cpp
@@ -5,21 +5,15 @@
 namespace DB
 {
 
-namespace ErrorCodes
-{
-    extern const int LOGICAL_ERROR;
-}
-
 IInputFormat::IInputFormat(Block header, ReadBuffer & in_)
     : ISource(std::move(header)), in(in_)
 {
+    column_mapping = std::make_shared<ColumnMapping>();
 }
 
 void IInputFormat::resetParser()
 {
-    if (in.hasPendingData())
-        throw Exception("Unread data in IInputFormat::resetParser. Most likely it's a bug.", ErrorCodes::LOGICAL_ERROR);
-
+    in.ignoreAll();
     // those are protected attributes from ISource (I didn't want to propagate resetParser up there)
     finished = false;
     got_exception = false;
diff --git a/src/Processors/Formats/IInputFormat.h b/src/Processors/Formats/IInputFormat.h
index e1537aff6c5..95910bf51e5 100644
--- a/src/Processors/Formats/IInputFormat.h
+++ b/src/Processors/Formats/IInputFormat.h
@@ -2,9 +2,29 @@
 
 #include <Processors/ISource.h>
 
+#include <memory>
+
 
 namespace DB
 {
+/// Used to pass info from header between different InputFormats in ParallelParsing
+struct ColumnMapping
+{
+    /// Non-atomic because there is strict `happens-before` between read and write access
+    /// See InputFormatParallelParsing
+    bool is_set;
+    /// Maps indexes of columns in the input file to indexes of table columns
+    using OptionalIndexes = std::vector<std::optional<size_t>>;
+    OptionalIndexes column_indexes_for_input_fields;
+
+    /// Tracks which columns we have read in a single read() call.
+    /// For columns that are never read, it is initialized to false when we
+    /// read the file header, and never changed afterwards.
+    /// For other columns, it is updated on each read() call.
+    std::vector<UInt8> read_columns;
+};
+
+using ColumnMappingPtr = std::shared_ptr<ColumnMapping>;
 
 class ReadBuffer;
 
@@ -39,9 +59,17 @@ public:
         return none;
     }
 
+    /// Must be called from ParallelParsingInputFormat after readSuffix
+    ColumnMappingPtr getColumnMapping() const { return column_mapping; }
+    /// Must be called from ParallelParsingInputFormat before readPrefix
+    void setColumnMapping(ColumnMappingPtr column_mapping_) { column_mapping = column_mapping_; }
+
     size_t getCurrentUnitNumber() const { return current_unit_number; }
     void setCurrentUnitNumber(size_t current_unit_number_) { current_unit_number = current_unit_number_; }
 
+protected:
+    ColumnMappingPtr column_mapping{};
+
 private:
     /// Number of currently parsed chunk (if parallel parsing is enabled)
     size_t current_unit_number = 0;
diff --git a/src/Processors/Formats/IRowInputFormat.cpp b/src/Processors/Formats/IRowInputFormat.cpp
index 79090ae2b89..52e64a9d90d 100644
--- a/src/Processors/Formats/IRowInputFormat.cpp
+++ b/src/Processors/Formats/IRowInputFormat.cpp
@@ -39,6 +39,16 @@ bool isParseError(int code)
         || code == ErrorCodes::INCORRECT_DATA;             /// For some ReadHelpers
 }
 
+IRowInputFormat::IRowInputFormat(Block header, ReadBuffer & in_, Params params_)
+    : IInputFormat(std::move(header), in_), params(params_)
+{
+    const auto & port_header = getPort().getHeader();
+    size_t num_columns = port_header.columns();
+    serializations.resize(num_columns);
+    for (size_t i = 0; i < num_columns; ++i)
+        serializations[i] = port_header.getByPosition(i).type->getDefaultSerialization();
+}
+
 
 Chunk IRowInputFormat::generate()
 {
@@ -180,7 +190,7 @@ Chunk IRowInputFormat::generate()
         if (num_errors && (params.allow_errors_num > 0 || params.allow_errors_ratio > 0))
         {
             Poco::Logger * log = &Poco::Logger::get("IRowInputFormat");
-            LOG_TRACE(log, "Skipped {} rows with errors while reading the input stream", num_errors);
+            LOG_DEBUG(log, "Skipped {} rows with errors while reading the input stream", num_errors);
         }
 
         readSuffix();
diff --git a/src/Processors/Formats/IRowInputFormat.h b/src/Processors/Formats/IRowInputFormat.h
index b7863704062..8c600ad7285 100644
--- a/src/Processors/Formats/IRowInputFormat.h
+++ b/src/Processors/Formats/IRowInputFormat.h
@@ -14,7 +14,7 @@ namespace DB
 /// Contains extra information about read data.
 struct RowReadExtension
 {
-    /// IRowInputStream.read() output. It contains non zero for columns that actually read from the source and zero otherwise.
+    /// IRowInputFormat::read output. It contains non zero for columns that actually read from the source and zero otherwise.
     /// It's used to attach defaults for partially filled rows.
     std::vector<UInt8> read_columns;
 };
@@ -40,13 +40,7 @@ class IRowInputFormat : public IInputFormat
 public:
     using Params = RowInputFormatParams;
 
-    IRowInputFormat(
-        Block header,
-        ReadBuffer & in_,
-        Params params_)
-        : IInputFormat(std::move(header), in_), params(params_)
-    {
-    }
+    IRowInputFormat(Block header, ReadBuffer & in_, Params params_);
 
     Chunk generate() override;
 
@@ -76,6 +70,8 @@ protected:
 
     size_t getTotalRows() const { return total_rows; }
 
+    Serializations serializations;
+
 private:
     Params params;
 
diff --git a/src/Processors/Formats/IRowOutputFormat.cpp b/src/Processors/Formats/IRowOutputFormat.cpp
index f5f01643f4e..b714844feea 100644
--- a/src/Processors/Formats/IRowOutputFormat.cpp
+++ b/src/Processors/Formats/IRowOutputFormat.cpp
@@ -10,6 +10,16 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
+IRowOutputFormat::IRowOutputFormat(const Block & header, WriteBuffer & out_, const Params & params_)
+    : IOutputFormat(header, out_)
+    , types(header.getDataTypes())
+    , params(params_)
+{
+    serializations.reserve(types.size());
+    for (const auto & type : types)
+        serializations.push_back(type->getDefaultSerialization());
+}
+
 void IRowOutputFormat::consume(DB::Chunk chunk)
 {
     writePrefixIfNot();
@@ -82,7 +92,7 @@ void IRowOutputFormat::write(const Columns & columns, size_t row_num)
         if (i != 0)
             writeFieldDelimiter();
 
-        writeField(*columns[i], *types[i], row_num);
+        writeField(*columns[i], *serializations[i], row_num);
     }
 
     writeRowEndDelimiter();
diff --git a/src/Processors/Formats/IRowOutputFormat.h b/src/Processors/Formats/IRowOutputFormat.h
index 4fb94f7b7f7..c35d93b6133 100644
--- a/src/Processors/Formats/IRowOutputFormat.h
+++ b/src/Processors/Formats/IRowOutputFormat.h
@@ -25,6 +25,7 @@ class IRowOutputFormat : public IOutputFormat
 {
 protected:
     DataTypes types;
+    Serializations serializations;
     bool first_row = true;
 
     void consume(Chunk chunk) override;
@@ -35,10 +36,7 @@ protected:
 public:
     using Params = RowOutputFormatParams;
 
-    IRowOutputFormat(const Block & header, WriteBuffer & out_, const Params & params_)
-        : IOutputFormat(header, out_), types(header.getDataTypes()), params(params_)
-    {
-    }
+    IRowOutputFormat(const Block & header, WriteBuffer & out_, const Params & params_);
 
     /** Write a row.
       * Default implementation calls methods to write single values and delimiters
@@ -50,7 +48,7 @@ public:
     virtual void writeTotals(const Columns & columns, size_t row_num);
 
     /** Write single value. */
-    virtual void writeField(const IColumn & column, const IDataType & type, size_t row_num) = 0;
+    virtual void writeField(const IColumn & column, const ISerialization & serialization, size_t row_num) = 0;
 
     /** Write delimiter. */
     virtual void writeFieldDelimiter() {}       /// delimiter between values
diff --git a/src/Processors/Formats/Impl/ArrowBlockInputFormat.cpp b/src/Processors/Formats/Impl/ArrowBlockInputFormat.cpp
index 4edef1f1365..1e6ffa57e2d 100644
--- a/src/Processors/Formats/Impl/ArrowBlockInputFormat.cpp
+++ b/src/Processors/Formats/Impl/ArrowBlockInputFormat.cpp
@@ -78,7 +78,7 @@ void ArrowBlockInputFormat::prepareReader()
 {
     if (stream)
     {
-        auto stream_reader_status = arrow::ipc::RecordBatchStreamReader::Open(asArrowFile(in));
+        auto stream_reader_status = arrow::ipc::RecordBatchStreamReader::Open(std::make_unique<ArrowInputStreamFromReadBuffer>(in));
         if (!stream_reader_status.ok())
             throw Exception(ErrorCodes::UNKNOWN_EXCEPTION,
                 "Error while opening a table: {}", stream_reader_status.status().ToString());
@@ -101,7 +101,7 @@ void ArrowBlockInputFormat::prepareReader()
     record_batch_current = 0;
 }
 
-void registerInputFormatProcessorArrow(FormatFactory &factory)
+void registerInputFormatProcessorArrow(FormatFactory & factory)
 {
     factory.registerInputFormatProcessor(
         "Arrow",
@@ -112,7 +112,7 @@ void registerInputFormatProcessorArrow(FormatFactory &factory)
         {
             return std::make_shared<ArrowBlockInputFormat>(buf, sample, false);
         });
-
+    factory.markFormatAsColumnOriented("Arrow");
     factory.registerInputFormatProcessor(
         "ArrowStream",
         [](ReadBuffer & buf,
diff --git a/src/Processors/Formats/Impl/ArrowBufferedStreams.cpp b/src/Processors/Formats/Impl/ArrowBufferedStreams.cpp
index c783e10debb..9582e0c3312 100644
--- a/src/Processors/Formats/Impl/ArrowBufferedStreams.cpp
+++ b/src/Processors/Formats/Impl/ArrowBufferedStreams.cpp
@@ -55,26 +55,23 @@ arrow::Status RandomAccessFileFromSeekableReadBuffer::Close()
 
 arrow::Result<int64_t> RandomAccessFileFromSeekableReadBuffer::Tell() const
 {
-    return arrow::Result<int64_t>(in.getPosition());
+    return in.getPosition();
 }
 
 arrow::Result<int64_t> RandomAccessFileFromSeekableReadBuffer::Read(int64_t nbytes, void * out)
 {
-    int64_t bytes_read = in.readBig(reinterpret_cast<char *>(out), nbytes);
-    return arrow::Result<int64_t>(bytes_read);
+    return in.readBig(reinterpret_cast<char *>(out), nbytes);
 }
 
 arrow::Result<std::shared_ptr<arrow::Buffer>> RandomAccessFileFromSeekableReadBuffer::Read(int64_t nbytes)
 {
-    auto buffer_status = arrow::AllocateBuffer(nbytes);
-    ARROW_RETURN_NOT_OK(buffer_status);
+    ARROW_ASSIGN_OR_RAISE(auto buffer, arrow::AllocateResizableBuffer(nbytes))
+    ARROW_ASSIGN_OR_RAISE(int64_t bytes_read, Read(nbytes, buffer->mutable_data()))
 
-    auto shared_buffer = std::shared_ptr<arrow::Buffer>(std::move(std::move(*buffer_status)));
+    if (bytes_read < nbytes)
+        RETURN_NOT_OK(buffer->Resize(bytes_read));
 
-    size_t n = in.readBig(reinterpret_cast<char *>(shared_buffer->mutable_data()), nbytes);
-
-    auto read_buffer = arrow::SliceBuffer(shared_buffer, 0, n);
-    return arrow::Result<std::shared_ptr<arrow::Buffer>>(shared_buffer);
+    return buffer;
 }
 
 arrow::Status RandomAccessFileFromSeekableReadBuffer::Seek(int64_t position)
@@ -83,6 +80,43 @@ arrow::Status RandomAccessFileFromSeekableReadBuffer::Seek(int64_t position)
     return arrow::Status::OK();
 }
 
+
+ArrowInputStreamFromReadBuffer::ArrowInputStreamFromReadBuffer(ReadBuffer & in_) : in(in_), is_open{true}
+{
+}
+
+arrow::Result<int64_t> ArrowInputStreamFromReadBuffer::Read(int64_t nbytes, void * out)
+{
+    return in.readBig(reinterpret_cast<char *>(out), nbytes);
+}
+
+arrow::Result<std::shared_ptr<arrow::Buffer>> ArrowInputStreamFromReadBuffer::Read(int64_t nbytes)
+{
+    ARROW_ASSIGN_OR_RAISE(auto buffer, arrow::AllocateResizableBuffer(nbytes))
+    ARROW_ASSIGN_OR_RAISE(int64_t bytes_read, Read(nbytes, buffer->mutable_data()))
+
+    if (bytes_read < nbytes)
+        RETURN_NOT_OK(buffer->Resize(bytes_read));
+
+    return buffer;
+}
+
+arrow::Status ArrowInputStreamFromReadBuffer::Abort()
+{
+    return arrow::Status();
+}
+
+arrow::Result<int64_t> ArrowInputStreamFromReadBuffer::Tell() const
+{
+    return in.count();
+}
+
+arrow::Status ArrowInputStreamFromReadBuffer::Close()
+{
+    is_open = false;
+    return arrow::Status();
+}
+
 std::shared_ptr<arrow::io::RandomAccessFile> asArrowFile(ReadBuffer & in)
 {
     if (auto * fd_in = dynamic_cast<ReadBufferFromFileDescriptor *>(&in))
diff --git a/src/Processors/Formats/Impl/ArrowBufferedStreams.h b/src/Processors/Formats/Impl/ArrowBufferedStreams.h
index bb94535549c..a10a5bcabdb 100644
--- a/src/Processors/Formats/Impl/ArrowBufferedStreams.h
+++ b/src/Processors/Formats/Impl/ArrowBufferedStreams.h
@@ -61,6 +61,24 @@ private:
     ARROW_DISALLOW_COPY_AND_ASSIGN(RandomAccessFileFromSeekableReadBuffer);
 };
 
+class ArrowInputStreamFromReadBuffer : public arrow::io::InputStream
+{
+public:
+    explicit ArrowInputStreamFromReadBuffer(ReadBuffer & in);
+    arrow::Result<int64_t> Read(int64_t nbytes, void* out) override;
+    arrow::Result<std::shared_ptr<arrow::Buffer>> Read(int64_t nbytes) override;
+    arrow::Status Abort() override;
+    arrow::Result<int64_t> Tell() const override;
+    arrow::Status Close() override;
+    bool closed() const override { return !is_open; }
+
+private:
+    ReadBuffer & in;
+    bool is_open = false;
+
+    ARROW_DISALLOW_COPY_AND_ASSIGN(ArrowInputStreamFromReadBuffer);
+};
+
 std::shared_ptr<arrow::io::RandomAccessFile> asArrowFile(ReadBuffer & in);
 
 }
diff --git a/src/Processors/Formats/Impl/AvroRowInputFormat.cpp b/src/Processors/Formats/Impl/AvroRowInputFormat.cpp
index a8d71790f41..95ee42b4d09 100644
--- a/src/Processors/Formats/Impl/AvroRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/AvroRowInputFormat.cpp
@@ -554,7 +554,7 @@ AvroDeserializer::Action AvroDeserializer::createAction(const Block & header, co
     }
 }
 
-AvroDeserializer::AvroDeserializer(const Block & header, avro::ValidSchema schema, const FormatSettings & format_settings)
+AvroDeserializer::AvroDeserializer(const Block & header, avro::ValidSchema schema, bool allow_missing_fields)
 {
     const auto & schema_root = schema.root();
     if (schema_root->type() != avro::AVRO_RECORD)
@@ -565,7 +565,7 @@ AvroDeserializer::AvroDeserializer(const Block & header, avro::ValidSchema schem
     column_found.resize(header.columns());
     row_action = createAction(header, schema_root);
     // fail on missing fields when allow_missing_fields = false
-    if (!format_settings.avro.allow_missing_fields)
+    if (!allow_missing_fields)
     {
         for (size_t i = 0; i < header.columns(); ++i)
         {
@@ -592,19 +592,24 @@ void AvroDeserializer::deserializeRow(MutableColumns & columns, avro::Decoder &
 
 
 AvroRowInputFormat::AvroRowInputFormat(const Block & header_, ReadBuffer & in_, Params params_, const FormatSettings & format_settings_)
-    : IRowInputFormat(header_, in_, params_)
-    , file_reader(std::make_unique<InputStreamReadBufferAdapter>(in_))
-    , deserializer(output.getHeader(), file_reader.dataSchema(), format_settings_)
+    : IRowInputFormat(header_, in_, params_),
+      allow_missing_fields(format_settings_.avro.allow_missing_fields)
 {
-    file_reader.init();
+}
+
+void AvroRowInputFormat::readPrefix()
+{
+    file_reader_ptr = std::make_unique<avro::DataFileReaderBase>(std::make_unique<InputStreamReadBufferAdapter>(in));
+    deserializer_ptr = std::make_unique<AvroDeserializer>(output.getHeader(), file_reader_ptr->dataSchema(), allow_missing_fields);
+    file_reader_ptr->init();
 }
 
 bool AvroRowInputFormat::readRow(MutableColumns & columns, RowReadExtension &ext)
 {
-    if (file_reader.hasMore())
+    if (file_reader_ptr->hasMore())
     {
-        file_reader.decr();
-        deserializer.deserializeRow(columns, file_reader.decoder(), ext);
+        file_reader_ptr->decr();
+        deserializer_ptr->deserializeRow(columns, file_reader_ptr->decoder(), ext);
         return true;
     }
     return false;
@@ -781,7 +786,7 @@ const AvroDeserializer & AvroConfluentRowInputFormat::getOrCreateDeserializer(Sc
     if (it == deserializer_cache.end())
     {
         auto schema = schema_registry->getSchema(schema_id);
-        AvroDeserializer deserializer(output.getHeader(), schema, format_settings);
+        AvroDeserializer deserializer(output.getHeader(), schema, format_settings.avro.allow_missing_fields);
         it = deserializer_cache.emplace(schema_id, deserializer).first;
     }
     return it->second;
diff --git a/src/Processors/Formats/Impl/AvroRowInputFormat.h b/src/Processors/Formats/Impl/AvroRowInputFormat.h
index e3de3bf59a7..5617b4a7661 100644
--- a/src/Processors/Formats/Impl/AvroRowInputFormat.h
+++ b/src/Processors/Formats/Impl/AvroRowInputFormat.h
@@ -25,7 +25,7 @@ namespace DB
 class AvroDeserializer
 {
 public:
-    AvroDeserializer(const Block & header, avro::ValidSchema schema, const FormatSettings & format_settings);
+    AvroDeserializer(const Block & header, avro::ValidSchema schema, bool allow_missing_fields);
     void deserializeRow(MutableColumns & columns, avro::Decoder & decoder, RowReadExtension & ext) const;
 
 private:
@@ -107,12 +107,15 @@ class AvroRowInputFormat : public IRowInputFormat
 {
 public:
     AvroRowInputFormat(const Block & header_, ReadBuffer & in_, Params params_, const FormatSettings & format_settings_);
-    virtual bool readRow(MutableColumns & columns, RowReadExtension & ext) override;
+    bool readRow(MutableColumns & columns, RowReadExtension & ext) override;
+    void readPrefix() override;
+
     String getName() const override { return "AvroRowInputFormat"; }
 
 private:
-    avro::DataFileReaderBase file_reader;
-    AvroDeserializer deserializer;
+    std::unique_ptr<avro::DataFileReaderBase> file_reader_ptr;
+    std::unique_ptr<AvroDeserializer> deserializer_ptr;
+    bool allow_missing_fields;
 };
 
 /// Confluent framing + Avro binary datum encoding. Mainly used for Kafka.
diff --git a/src/Processors/Formats/Impl/AvroRowOutputFormat.h b/src/Processors/Formats/Impl/AvroRowOutputFormat.h
index 08370154d9a..8d0581d3307 100644
--- a/src/Processors/Formats/Impl/AvroRowOutputFormat.h
+++ b/src/Processors/Formats/Impl/AvroRowOutputFormat.h
@@ -48,7 +48,7 @@ public:
 
     String getName() const override { return "AvroRowOutputFormat"; }
     void write(const Columns & columns, size_t row_num) override;
-    void writeField(const IColumn &, const IDataType &, size_t) override {}
+    void writeField(const IColumn &, const ISerialization &, size_t) override {}
     virtual void writePrefix() override;
     virtual void writeSuffix() override;
 
diff --git a/src/Processors/Formats/Impl/BinaryRowInputFormat.cpp b/src/Processors/Formats/Impl/BinaryRowInputFormat.cpp
index f49f521d474..36b57e242d7 100644
--- a/src/Processors/Formats/Impl/BinaryRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/BinaryRowInputFormat.cpp
@@ -20,7 +20,7 @@ bool BinaryRowInputFormat::readRow(MutableColumns & columns, RowReadExtension &)
 
     size_t num_columns = columns.size();
     for (size_t i = 0; i < num_columns; ++i)
-        getPort().getHeader().getByPosition(i).type->deserializeBinary(*columns[i], in);
+        serializations[i]->deserializeBinary(*columns[i], in);
 
     return true;
 }
diff --git a/src/Processors/Formats/Impl/BinaryRowOutputFormat.cpp b/src/Processors/Formats/Impl/BinaryRowOutputFormat.cpp
index d74a0a075fe..424eb375fa3 100644
--- a/src/Processors/Formats/Impl/BinaryRowOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/BinaryRowOutputFormat.cpp
@@ -41,9 +41,9 @@ void BinaryRowOutputFormat::writePrefix()
     }
 }
 
-void BinaryRowOutputFormat::writeField(const IColumn & column, const IDataType & type, size_t row_num)
+void BinaryRowOutputFormat::writeField(const IColumn & column, const ISerialization & serialization, size_t row_num)
 {
-    type.serializeBinary(column, row_num, out);
+    serialization.serializeBinary(column, row_num, out);
 }
 
 
diff --git a/src/Processors/Formats/Impl/BinaryRowOutputFormat.h b/src/Processors/Formats/Impl/BinaryRowOutputFormat.h
index 562ed7b18aa..36a62098b75 100644
--- a/src/Processors/Formats/Impl/BinaryRowOutputFormat.h
+++ b/src/Processors/Formats/Impl/BinaryRowOutputFormat.h
@@ -21,7 +21,7 @@ public:
 
     String getName() const override { return "BinaryRowOutputFormat"; }
 
-    void writeField(const IColumn & column, const IDataType & type, size_t row_num) override;
+    void writeField(const IColumn & column, const ISerialization & serialization, size_t row_num) override;
     void writePrefix() override;
 
     String getContentType() const override { return "application/octet-stream"; }
diff --git a/src/Processors/Formats/Impl/CSVRowInputFormat.cpp b/src/Processors/Formats/Impl/CSVRowInputFormat.cpp
index f7f08411dfa..4ccc0db4cfe 100644
--- a/src/Processors/Formats/Impl/CSVRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/CSVRowInputFormat.cpp
@@ -4,7 +4,7 @@
 #include <Formats/verbosePrintString.h>
 #include <Processors/Formats/Impl/CSVRowInputFormat.h>
 #include <Formats/FormatFactory.h>
-#include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/Serializations/SerializationNullable.h>
 #include <DataTypes/DataTypeNothing.h>
 
 
@@ -55,13 +55,13 @@ void CSVRowInputFormat::addInputColumn(const String & column_name)
     {
         if (format_settings.skip_unknown_fields)
         {
-            column_indexes_for_input_fields.push_back(std::nullopt);
+            column_mapping->column_indexes_for_input_fields.push_back(std::nullopt);
             return;
         }
 
         throw Exception(
                 "Unknown field found in CSV header: '" + column_name + "' " +
-                "at position " + std::to_string(column_indexes_for_input_fields.size()) +
+                "at position " + std::to_string(column_mapping->column_indexes_for_input_fields.size()) +
                 "\nSet the 'input_format_skip_unknown_fields' parameter explicitly to ignore and proceed",
                 ErrorCodes::INCORRECT_DATA
         );
@@ -69,11 +69,11 @@ void CSVRowInputFormat::addInputColumn(const String & column_name)
 
     const auto column_index = column_it->second;
 
-    if (read_columns[column_index])
+    if (column_mapping->read_columns[column_index])
         throw Exception("Duplicate field found while parsing CSV header: " + column_name, ErrorCodes::INCORRECT_DATA);
 
-    read_columns[column_index] = true;
-    column_indexes_for_input_fields.emplace_back(column_index);
+    column_mapping->read_columns[column_index] = true;
+    column_mapping->column_indexes_for_input_fields.emplace_back(column_index);
 }
 
 static void skipEndOfLine(ReadBuffer & in)
@@ -145,6 +145,16 @@ static void skipRow(ReadBuffer & in, const FormatSettings::CSV & settings, size_
     }
 }
 
+void CSVRowInputFormat::setupAllColumnsByTableSchema()
+{
+    const auto & header = getPort().getHeader();
+    column_mapping->read_columns.assign(header.columns(), true);
+    column_mapping->column_indexes_for_input_fields.resize(header.columns());
+
+    for (size_t i = 0; i < column_mapping->column_indexes_for_input_fields.size(); ++i)
+        column_mapping->column_indexes_for_input_fields[i] = i;
+}
+
 
 void CSVRowInputFormat::readPrefix()
 {
@@ -155,7 +165,9 @@ void CSVRowInputFormat::readPrefix()
     size_t num_columns = data_types.size();
     const auto & header = getPort().getHeader();
 
-    if (with_names)
+    /// This is a bit of abstraction leakage, but we have almost the same code in other places.
+    /// Thus, we check if this InputFormat is working with the "real" beginning of the data in case of parallel parsing.
+    if (with_names && getCurrentUnitNumber() == 0)
     {
         /// This CSV file has a header row with column names. Depending on the
         /// settings, use it or skip it.
@@ -163,7 +175,7 @@ void CSVRowInputFormat::readPrefix()
         {
             /// Look at the file header to see which columns we have there.
             /// The missing columns are filled with defaults.
-            read_columns.assign(header.columns(), false);
+            column_mapping->read_columns.assign(header.columns(), false);
             do
             {
                 String column_name;
@@ -177,7 +189,7 @@ void CSVRowInputFormat::readPrefix()
 
             skipDelimiter(in, format_settings.csv.delimiter, true);
 
-            for (auto read_column : read_columns)
+            for (auto read_column : column_mapping->read_columns)
             {
                 if (!read_column)
                 {
@@ -189,18 +201,13 @@ void CSVRowInputFormat::readPrefix()
             return;
         }
         else
+        {
             skipRow(in, format_settings.csv, num_columns);
+            setupAllColumnsByTableSchema();
+        }
     }
-
-    /// The default: map each column of the file to the column of the table with
-    /// the same index.
-    read_columns.assign(header.columns(), true);
-    column_indexes_for_input_fields.resize(header.columns());
-
-    for (size_t i = 0; i < column_indexes_for_input_fields.size(); ++i)
-    {
-        column_indexes_for_input_fields[i] = i;
-    }
+    else if (!column_mapping->is_set)
+        setupAllColumnsByTableSchema();
 }
 
 
@@ -216,17 +223,19 @@ bool CSVRowInputFormat::readRow(MutableColumns & columns, RowReadExtension & ext
     /// it doesn't have to check it.
     bool have_default_columns = have_always_default_columns;
 
-    ext.read_columns.assign(read_columns.size(), true);
+    ext.read_columns.assign(column_mapping->read_columns.size(), true);
     const auto delimiter = format_settings.csv.delimiter;
-    for (size_t file_column = 0; file_column < column_indexes_for_input_fields.size(); ++file_column)
+    for (size_t file_column = 0; file_column < column_mapping->column_indexes_for_input_fields.size(); ++file_column)
     {
-        const auto & table_column = column_indexes_for_input_fields[file_column];
-        const bool is_last_file_column = file_column + 1 == column_indexes_for_input_fields.size();
+        const auto & table_column = column_mapping->column_indexes_for_input_fields[file_column];
+        const bool is_last_file_column = file_column + 1 == column_mapping->column_indexes_for_input_fields.size();
 
         if (table_column)
         {
             skipWhitespacesAndTabs(in);
-            ext.read_columns[*table_column] = readField(*columns[*table_column], data_types[*table_column], is_last_file_column);
+            ext.read_columns[*table_column] = readField(*columns[*table_column], data_types[*table_column],
+                serializations[*table_column], is_last_file_column);
+
             if (!ext.read_columns[*table_column])
                 have_default_columns = true;
             skipWhitespacesAndTabs(in);
@@ -243,9 +252,9 @@ bool CSVRowInputFormat::readRow(MutableColumns & columns, RowReadExtension & ext
 
     if (have_default_columns)
     {
-        for (size_t i = 0; i < read_columns.size(); i++)
+        for (size_t i = 0; i < column_mapping->read_columns.size(); i++)
         {
-            if (!read_columns[i])
+            if (!column_mapping->read_columns[i])
             {
                 /// The column value for this row is going to be overwritten
                 /// with default by the caller, but the general assumption is
@@ -266,7 +275,7 @@ bool CSVRowInputFormat::parseRowAndPrintDiagnosticInfo(MutableColumns & columns,
 {
     const char delimiter = format_settings.csv.delimiter;
 
-    for (size_t file_column = 0; file_column < column_indexes_for_input_fields.size(); ++file_column)
+    for (size_t file_column = 0; file_column < column_mapping->column_indexes_for_input_fields.size(); ++file_column)
     {
         if (file_column == 0 && in.eof())
         {
@@ -275,10 +284,10 @@ bool CSVRowInputFormat::parseRowAndPrintDiagnosticInfo(MutableColumns & columns,
         }
 
         skipWhitespacesAndTabs(in);
-        if (column_indexes_for_input_fields[file_column].has_value())
+        if (column_mapping->column_indexes_for_input_fields[file_column].has_value())
         {
             const auto & header = getPort().getHeader();
-            size_t col_idx = column_indexes_for_input_fields[file_column].value();
+            size_t col_idx = column_mapping->column_indexes_for_input_fields[file_column].value();
             if (!deserializeFieldAndPrintDiagnosticInfo(header.getByPosition(col_idx).name, data_types[col_idx], *columns[col_idx],
                                                         out, file_column))
                 return false;
@@ -294,7 +303,7 @@ bool CSVRowInputFormat::parseRowAndPrintDiagnosticInfo(MutableColumns & columns,
         skipWhitespacesAndTabs(in);
 
         /// Delimiters
-        if (file_column + 1 == column_indexes_for_input_fields.size())
+        if (file_column + 1 == column_mapping->column_indexes_for_input_fields.size())
         {
             if (in.eof())
                 return false;
@@ -356,10 +365,11 @@ void CSVRowInputFormat::syncAfterError()
 
 void CSVRowInputFormat::tryDeserializeField(const DataTypePtr & type, IColumn & column, size_t file_column)
 {
-    if (column_indexes_for_input_fields[file_column])
+    const auto & index = column_mapping->column_indexes_for_input_fields[file_column];
+    if (index)
     {
-        const bool is_last_file_column = file_column + 1 == column_indexes_for_input_fields.size();
-        readField(column, type, is_last_file_column);
+        const bool is_last_file_column = file_column + 1 == column_mapping->column_indexes_for_input_fields.size();
+        readField(column, type, serializations[*index], is_last_file_column);
     }
     else
     {
@@ -368,7 +378,7 @@ void CSVRowInputFormat::tryDeserializeField(const DataTypePtr & type, IColumn &
     }
 }
 
-bool CSVRowInputFormat::readField(IColumn & column, const DataTypePtr & type, bool is_last_file_column)
+bool CSVRowInputFormat::readField(IColumn & column, const DataTypePtr & type, const SerializationPtr & serialization, bool is_last_file_column)
 {
     const bool at_delimiter = !in.eof() && *in.position() == format_settings.csv.delimiter;
     const bool at_last_column_line_end = is_last_file_column
@@ -391,12 +401,12 @@ bool CSVRowInputFormat::readField(IColumn & column, const DataTypePtr & type, bo
     else if (format_settings.null_as_default && !type->isNullable())
     {
         /// If value is null but type is not nullable then use default value instead.
-        return DataTypeNullable::deserializeTextCSV(column, in, format_settings, type);
+        return SerializationNullable::deserializeTextCSVImpl(column, in, format_settings, serialization);
     }
     else
     {
         /// Read the column normally.
-        type->deserializeAsTextCSV(column, in, format_settings);
+        serialization->deserializeTextCSV(column, in, format_settings);
         return true;
     }
 }
@@ -404,8 +414,8 @@ bool CSVRowInputFormat::readField(IColumn & column, const DataTypePtr & type, bo
 void CSVRowInputFormat::resetParser()
 {
     RowInputFormatWithDiagnosticInfo::resetParser();
-    column_indexes_for_input_fields.clear();
-    read_columns.clear();
+    column_mapping->column_indexes_for_input_fields.clear();
+    column_mapping->read_columns.clear();
     have_always_default_columns = false;
 }
 
@@ -492,6 +502,7 @@ static std::pair<bool, size_t> fileSegmentationEngineCSVImpl(ReadBuffer & in, DB
 void registerFileSegmentationEngineCSV(FormatFactory & factory)
 {
     factory.registerFileSegmentationEngine("CSV", &fileSegmentationEngineCSVImpl);
+    factory.registerFileSegmentationEngine("CSVWithNames", &fileSegmentationEngineCSVImpl);
 }
 
 }
diff --git a/src/Processors/Formats/Impl/CSVRowInputFormat.h b/src/Processors/Formats/Impl/CSVRowInputFormat.h
index c884eb6c3db..230acc51268 100644
--- a/src/Processors/Formats/Impl/CSVRowInputFormat.h
+++ b/src/Processors/Formats/Impl/CSVRowInputFormat.h
@@ -38,22 +38,13 @@ private:
     using IndexesMap = std::unordered_map<String, size_t>;
     IndexesMap column_indexes_by_names;
 
-    /// Maps indexes of columns in the input file to indexes of table columns
-    using OptionalIndexes = std::vector<std::optional<size_t>>;
-    OptionalIndexes column_indexes_for_input_fields;
-
-    /// Tracks which columns we have read in a single read() call.
-    /// For columns that are never read, it is initialized to false when we
-    /// read the file header, and never changed afterwards.
-    /// For other columns, it is updated on each read() call.
-    std::vector<UInt8> read_columns;
-
     /// Whether we have any columns that are not read from file at all,
     /// and must be always initialized with defaults.
     bool have_always_default_columns = false;
 
     void addInputColumn(const String & column_name);
 
+    void setupAllColumnsByTableSchema();
     bool parseRowAndPrintDiagnosticInfo(MutableColumns & columns, WriteBuffer & out) override;
     void tryDeserializeField(const DataTypePtr & type, IColumn & column, size_t file_column) override;
     bool isGarbageAfterField(size_t, ReadBuffer::Position pos) override
@@ -61,7 +52,7 @@ private:
         return *pos != '\n' && *pos != '\r' && *pos != format_settings.csv.delimiter && *pos != ' ' && *pos != '\t';
     }
 
-    bool readField(IColumn & column, const DataTypePtr & type, bool is_last_file_column);
+    bool readField(IColumn & column, const DataTypePtr & type, const SerializationPtr & serialization, bool is_last_file_column);
 };
 
 }
diff --git a/src/Processors/Formats/Impl/CSVRowOutputFormat.cpp b/src/Processors/Formats/Impl/CSVRowOutputFormat.cpp
index 90fc768d311..b9945ddec15 100644
--- a/src/Processors/Formats/Impl/CSVRowOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/CSVRowOutputFormat.cpp
@@ -40,9 +40,9 @@ void CSVRowOutputFormat::doWritePrefix()
 }
 
 
-void CSVRowOutputFormat::writeField(const IColumn & column, const IDataType & type, size_t row_num)
+void CSVRowOutputFormat::writeField(const IColumn & column, const ISerialization & serialization, size_t row_num)
 {
-    type.serializeAsTextCSV(column, row_num, out, format_settings);
+    serialization.serializeTextCSV(column, row_num, out, format_settings);
 }
 
 
diff --git a/src/Processors/Formats/Impl/CSVRowOutputFormat.h b/src/Processors/Formats/Impl/CSVRowOutputFormat.h
index 55803aeb53e..780a6c4d3ce 100644
--- a/src/Processors/Formats/Impl/CSVRowOutputFormat.h
+++ b/src/Processors/Formats/Impl/CSVRowOutputFormat.h
@@ -24,7 +24,7 @@ public:
 
     String getName() const override { return "CSVRowOutputFormat"; }
 
-    void writeField(const IColumn & column, const IDataType & type, size_t row_num) override;
+    void writeField(const IColumn & column, const ISerialization & serialization, size_t row_num) override;
     void writeFieldDelimiter() override;
     void writeRowEndDelimiter() override;
     void writeBeforeTotals() override;
diff --git a/src/Processors/Formats/Impl/ConstantExpressionTemplate.cpp b/src/Processors/Formats/Impl/ConstantExpressionTemplate.cpp
index 1685688f02d..288c6ee09ef 100644
--- a/src/Processors/Formats/Impl/ConstantExpressionTemplate.cpp
+++ b/src/Processors/Formats/Impl/ConstantExpressionTemplate.cpp
@@ -17,6 +17,7 @@
 #include <Interpreters/Context.h>
 #include <Interpreters/convertFieldToType.h>
 #include <Interpreters/ExpressionActions.h>
+#include <Interpreters/castColumn.h>
 #include <IO/ReadHelpers.h>
 #include <Parsers/ASTExpressionList.h>
 #include <Parsers/ASTFunction.h>
@@ -143,9 +144,9 @@ class ReplaceLiteralsVisitor
 {
 public:
     LiteralsInfo replaced_literals;
-    const Context & context;
+    ContextPtr context;
 
-    explicit ReplaceLiteralsVisitor(const Context & context_) : context(context_) { }
+    explicit ReplaceLiteralsVisitor(ContextPtr context_) : context(context_) { }
 
     void visit(ASTPtr & ast, bool force_nullable)
     {
@@ -209,6 +210,14 @@ private:
                 if (map.size() % 2)
                     return false;
             }
+            else if (literal->value.getType() == Field::Types::Tuple)
+            {
+                const Tuple & tuple = literal->value.get<Tuple>();
+
+                for (const auto & value : tuple)
+                    if (value.isNull())
+                        return true;
+            }
 
             String column_name = "_dummy_" + std::to_string(replaced_literals.size());
             replaced_literals.emplace_back(literal, column_name, force_nullable);
@@ -284,7 +293,7 @@ private:
 /// E.g. template of "position('some string', 'other string') != 0" is
 /// ["position", "(", DataTypeString, ",", DataTypeString, ")", "!=", DataTypeUInt64]
 ConstantExpressionTemplate::TemplateStructure::TemplateStructure(LiteralsInfo & replaced_literals, TokenIterator expression_begin, TokenIterator expression_end,
-                                                                 ASTPtr & expression, const IDataType & result_type, bool null_as_default_, const Context & context)
+                                                                 ASTPtr & expression, const IDataType & result_type, bool null_as_default_, ContextPtr context)
 {
     null_as_default = null_as_default_;
 
@@ -296,6 +305,7 @@ ConstantExpressionTemplate::TemplateStructure::TemplateStructure(LiteralsInfo &
     /// Make sequence of tokens and determine IDataType by Field::Types:Which for each literal.
     token_after_literal_idx.reserve(replaced_literals.size());
     special_parser.resize(replaced_literals.size());
+    serializations.resize(replaced_literals.size());
 
     TokenIterator prev_end = expression_begin;
     for (size_t i = 0; i < replaced_literals.size(); ++i)
@@ -316,6 +326,8 @@ ConstantExpressionTemplate::TemplateStructure::TemplateStructure(LiteralsInfo &
         literals.insert({nullptr, info.type, info.dummy_column_name});
 
         prev_end = info.literal->end.value();
+
+        serializations[i] = info.type->getDefaultSerialization();
     }
 
     while (prev_end < expression_end)
@@ -365,7 +377,7 @@ ConstantExpressionTemplate::Cache::getFromCacheOrConstruct(const DataTypePtr & r
                                                            TokenIterator expression_begin,
                                                            TokenIterator expression_end,
                                                            const ASTPtr & expression_,
-                                                           const Context & context,
+                                                           ContextPtr context,
                                                            bool * found_in_cache,
                                                            const String & salt)
 {
@@ -373,7 +385,7 @@ ConstantExpressionTemplate::Cache::getFromCacheOrConstruct(const DataTypePtr & r
     ASTPtr expression = expression_->clone();
     ReplaceLiteralsVisitor visitor(context);
     visitor.visit(expression, result_column_type->isNullable() || null_as_default);
-    ReplaceQueryParameterVisitor param_visitor(context.getQueryParameters());
+    ReplaceQueryParameterVisitor param_visitor(context->getQueryParameters());
     param_visitor.visit(expression);
 
     size_t template_hash = TemplateStructure::getTemplateHash(expression, visitor.replaced_literals, result_column_type, null_as_default, salt);
@@ -449,7 +461,7 @@ bool ConstantExpressionTemplate::tryParseExpression(ReadBuffer & istr, const For
                 return false;
         }
         else
-            type->deserializeAsTextQuoted(*columns[cur_column], istr, format_settings);
+            structure->serializations[cur_column]->deserializeTextQuoted(*columns[cur_column], istr, format_settings);
 
         ++cur_column;
     }
@@ -481,14 +493,12 @@ bool ConstantExpressionTemplate::parseLiteralAndAssertType(ReadBuffer & istr, co
         /// TODO faster way to check types without using Parsers
         ParserArrayOfLiterals parser_array;
         ParserTupleOfLiterals parser_tuple;
-        ParserMapOfLiterals parser_map;
 
         Tokens tokens_number(istr.position(), istr.buffer().end());
         IParser::Pos iterator(tokens_number, settings.max_parser_depth);
         Expected expected;
         ASTPtr ast;
-        if (!parser_array.parse(iterator, ast, expected) && !parser_tuple.parse(iterator, ast, expected)
-            && !parser_map.parse(iterator, ast, expected))
+        if (!parser_array.parse(iterator, ast, expected) && !parser_tuple.parse(iterator, ast, expected))
             return false;
 
         istr.position() = const_cast<char *>(iterator->begin);
@@ -581,7 +591,7 @@ bool ConstantExpressionTemplate::parseLiteralAndAssertType(ReadBuffer & istr, co
     }
 }
 
-ColumnPtr ConstantExpressionTemplate::evaluateAll(BlockMissingValues & nulls, size_t column_idx, size_t offset)
+ColumnPtr ConstantExpressionTemplate::evaluateAll(BlockMissingValues & nulls, size_t column_idx, const DataTypePtr & expected_type, size_t offset)
 {
     Block evaluated = structure->literals.cloneWithColumns(std::move(columns));
     columns = structure->literals.cloneEmptyColumns();
@@ -599,12 +609,13 @@ ColumnPtr ConstantExpressionTemplate::evaluateAll(BlockMissingValues & nulls, si
                         ErrorCodes::LOGICAL_ERROR);
 
     rows_count = 0;
-    ColumnPtr res = evaluated.getByName(structure->result_column_name).column->convertToFullColumnIfConst();
+    auto res = evaluated.getByName(structure->result_column_name);
+    res.column = res.column->convertToFullColumnIfConst();
     if (!structure->null_as_default)
-        return res;
+        return castColumn(res, expected_type);
 
     /// Extract column with evaluated expression and mask for NULLs
-    const auto & tuple = assert_cast<const ColumnTuple &>(*res);
+    const auto & tuple = assert_cast<const ColumnTuple &>(*res.column);
     if (tuple.tupleSize() != 2)
         throw Exception("Invalid tuple size, it'a a bug", ErrorCodes::LOGICAL_ERROR);
     const auto & is_null = assert_cast<const ColumnUInt8 &>(tuple.getColumn(1));
@@ -613,7 +624,9 @@ ColumnPtr ConstantExpressionTemplate::evaluateAll(BlockMissingValues & nulls, si
         if (is_null.getUInt(i))
             nulls.setBit(column_idx, offset + i);
 
-    return tuple.getColumnPtr(0);
+    res.column = tuple.getColumnPtr(0);
+    res.type = assert_cast<const DataTypeTuple &>(*res.type).getElements()[0];
+    return castColumn(res, expected_type);
 }
 
 void ConstantExpressionTemplate::TemplateStructure::addNodesToCastResult(const IDataType & result_column_type, ASTPtr & expr, bool null_as_default)
diff --git a/src/Processors/Formats/Impl/ConstantExpressionTemplate.h b/src/Processors/Formats/Impl/ConstantExpressionTemplate.h
index 931b05673c6..6659243df63 100644
--- a/src/Processors/Formats/Impl/ConstantExpressionTemplate.h
+++ b/src/Processors/Formats/Impl/ConstantExpressionTemplate.h
@@ -23,7 +23,7 @@ class ConstantExpressionTemplate : boost::noncopyable
     struct TemplateStructure : boost::noncopyable
     {
         TemplateStructure(LiteralsInfo & replaced_literals, TokenIterator expression_begin, TokenIterator expression_end,
-                          ASTPtr & expr, const IDataType & result_type, bool null_as_default_, const Context & context);
+                          ASTPtr & expr, const IDataType & result_type, bool null_as_default_, ContextPtr context);
 
         static void addNodesToCastResult(const IDataType & result_column_type, ASTPtr & expr, bool null_as_default);
         static size_t getTemplateHash(const ASTPtr & expression, const LiteralsInfo & replaced_literals,
@@ -36,6 +36,7 @@ class ConstantExpressionTemplate : boost::noncopyable
 
         Block literals;
         ExpressionActionsPtr actions_on_literals;
+        Serializations serializations;
 
         std::vector<SpecialParserType> special_parser;
         bool null_as_default;
@@ -58,7 +59,7 @@ public:
                                                      TokenIterator expression_begin,
                                                      TokenIterator expression_end,
                                                      const ASTPtr & expression_,
-                                                     const Context & context,
+                                                     ContextPtr context,
                                                      bool * found_in_cache = nullptr,
                                                      const String & salt = {});
     };
@@ -72,7 +73,7 @@ public:
 
     /// Evaluate batch of expressions were parsed using template.
     /// If template was deduced with null_as_default == true, set bits in nulls for NULL values in column_idx, starting from offset.
-    ColumnPtr evaluateAll(BlockMissingValues & nulls, size_t column_idx, size_t offset = 0);
+    ColumnPtr evaluateAll(BlockMissingValues & nulls, size_t column_idx, const DataTypePtr & expected_type, size_t offset = 0);
 
     size_t rowsCount() const { return rows_count; }
 
diff --git a/src/Processors/Formats/Impl/JSONCompactEachRowRowInputFormat.cpp b/src/Processors/Formats/Impl/JSONCompactEachRowRowInputFormat.cpp
index 1fc5041b1f3..682a4fbf69a 100644
--- a/src/Processors/Formats/Impl/JSONCompactEachRowRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/JSONCompactEachRowRowInputFormat.cpp
@@ -4,7 +4,7 @@
 #include <Processors/Formats/Impl/JSONCompactEachRowRowInputFormat.h>
 #include <Formats/FormatFactory.h>
 #include <DataTypes/NestedUtils.h>
-#include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/Serializations/SerializationNullable.h>
 
 namespace DB
 {
@@ -202,6 +202,7 @@ void JSONCompactEachRowRowInputFormat::readField(size_t index, MutableColumns &
     {
         read_columns[index] = true;
         const auto & type = data_types[index];
+        const auto & serialization = serializations[index];
 
         if (yield_strings)
         {
@@ -211,16 +212,16 @@ void JSONCompactEachRowRowInputFormat::readField(size_t index, MutableColumns &
             ReadBufferFromString buf(str);
 
             if (format_settings.null_as_default && !type->isNullable())
-                read_columns[index] = DataTypeNullable::deserializeWholeText(*columns[index], buf, format_settings, type);
+                read_columns[index] = SerializationNullable::deserializeWholeTextImpl(*columns[index], buf, format_settings, serialization);
             else
-                type->deserializeAsWholeText(*columns[index], buf, format_settings);
+                serialization->deserializeWholeText(*columns[index], buf, format_settings);
         }
         else
         {
             if (format_settings.null_as_default && !type->isNullable())
-                read_columns[index] = DataTypeNullable::deserializeTextJSON(*columns[index], in, format_settings, type);
+                read_columns[index] = SerializationNullable::deserializeTextJSONImpl(*columns[index], in, format_settings, serialization);
             else
-                type->deserializeAsTextJSON(*columns[index], in, format_settings);
+                serialization->deserializeTextJSON(*columns[index], in, format_settings);
         }
     }
     catch (Exception & e)
diff --git a/src/Processors/Formats/Impl/JSONCompactEachRowRowOutputFormat.cpp b/src/Processors/Formats/Impl/JSONCompactEachRowRowOutputFormat.cpp
index 11134499984..a3055873c01 100644
--- a/src/Processors/Formats/Impl/JSONCompactEachRowRowOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/JSONCompactEachRowRowOutputFormat.cpp
@@ -22,17 +22,17 @@ JSONCompactEachRowRowOutputFormat::JSONCompactEachRowRowOutputFormat(WriteBuffer
 }
 
 
-void JSONCompactEachRowRowOutputFormat::writeField(const IColumn & column, const IDataType & type, size_t row_num)
+void JSONCompactEachRowRowOutputFormat::writeField(const IColumn & column, const ISerialization & serialization, size_t row_num)
 {
     if (yield_strings)
     {
         WriteBufferFromOwnString buf;
 
-        type.serializeAsText(column, row_num, buf, settings);
+        serialization.serializeText(column, row_num, buf, settings);
         writeJSONString(buf.str(), out, settings);
     }
     else
-        type.serializeAsTextJSON(column, row_num, out, settings);
+        serialization.serializeTextJSON(column, row_num, out, settings);
 }
 
 
@@ -63,7 +63,7 @@ void JSONCompactEachRowRowOutputFormat::writeTotals(const Columns & columns, siz
         if (i != 0)
             JSONCompactEachRowRowOutputFormat::writeFieldDelimiter();
 
-        JSONCompactEachRowRowOutputFormat::writeField(*columns[i], *types[i], row_num);
+        JSONCompactEachRowRowOutputFormat::writeField(*columns[i], *serializations[i], row_num);
     }
     writeCString("]\n", out);
 }
diff --git a/src/Processors/Formats/Impl/JSONCompactEachRowRowOutputFormat.h b/src/Processors/Formats/Impl/JSONCompactEachRowRowOutputFormat.h
index 3d4b80247b8..792eb906f4b 100644
--- a/src/Processors/Formats/Impl/JSONCompactEachRowRowOutputFormat.h
+++ b/src/Processors/Formats/Impl/JSONCompactEachRowRowOutputFormat.h
@@ -31,7 +31,7 @@ public:
     void writeTotals(const Columns & columns, size_t row_num) override;
     void writeAfterTotals() override {}
 
-    void writeField(const IColumn & column, const IDataType & type, size_t row_num) override;
+    void writeField(const IColumn & column, const ISerialization & serialization, size_t row_num) override;
     void writeFieldDelimiter() override;
     void writeRowStartDelimiter() override;
     void writeRowEndDelimiter() override;
diff --git a/src/Processors/Formats/Impl/JSONCompactRowOutputFormat.cpp b/src/Processors/Formats/Impl/JSONCompactRowOutputFormat.cpp
index 97304afbebd..cefaded6912 100644
--- a/src/Processors/Formats/Impl/JSONCompactRowOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/JSONCompactRowOutputFormat.cpp
@@ -18,17 +18,17 @@ JSONCompactRowOutputFormat::JSONCompactRowOutputFormat(
 }
 
 
-void JSONCompactRowOutputFormat::writeField(const IColumn & column, const IDataType & type, size_t row_num)
+void JSONCompactRowOutputFormat::writeField(const IColumn & column, const ISerialization & serialization, size_t row_num)
 {
     if (yield_strings)
     {
         WriteBufferFromOwnString buf;
 
-        type.serializeAsText(column, row_num, buf, settings);
+        serialization.serializeText(column, row_num, buf, settings);
         writeJSONString(buf.str(), *ostr, settings);
     }
     else
-        type.serializeAsTextJSON(column, row_num, *ostr, settings);
+        serialization.serializeTextJSON(column, row_num, *ostr, settings);
 
     ++field_number;
 }
@@ -82,7 +82,7 @@ void JSONCompactRowOutputFormat::writeExtremesElement(const char * title, const
         if (i != 0)
             writeTotalsFieldDelimiter();
 
-        writeField(*columns[i], *types[i], row_num);
+        writeField(*columns[i], *serializations[i], row_num);
     }
 
     writeChar(']', *ostr);
diff --git a/src/Processors/Formats/Impl/JSONCompactRowOutputFormat.h b/src/Processors/Formats/Impl/JSONCompactRowOutputFormat.h
index 71ba3579837..9bb433c50b1 100644
--- a/src/Processors/Formats/Impl/JSONCompactRowOutputFormat.h
+++ b/src/Processors/Formats/Impl/JSONCompactRowOutputFormat.h
@@ -25,7 +25,7 @@ public:
 
     String getName() const override { return "JSONCompactRowOutputFormat"; }
 
-    void writeField(const IColumn & column, const IDataType & type, size_t row_num) override;
+    void writeField(const IColumn & column, const ISerialization & serialization, size_t row_num) override;
     void writeFieldDelimiter() override;
     void writeRowStartDelimiter() override;
     void writeRowEndDelimiter() override;
@@ -36,9 +36,9 @@ public:
 protected:
     void writeExtremesElement(const char * title, const Columns & columns, size_t row_num) override;
 
-    void writeTotalsField(const IColumn & column, const IDataType & type, size_t row_num) override
+    void writeTotalsField(const IColumn & column, const ISerialization & serialization, size_t row_num) override
     {
-        return writeField(column, type, row_num);
+        return writeField(column, serialization, row_num);
     }
 
     void writeTotalsFieldDelimiter() override;
diff --git a/src/Processors/Formats/Impl/JSONEachRowRowInputFormat.cpp b/src/Processors/Formats/Impl/JSONEachRowRowInputFormat.cpp
index 720b606be4f..e0f6514295b 100644
--- a/src/Processors/Formats/Impl/JSONEachRowRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/JSONEachRowRowInputFormat.cpp
@@ -5,7 +5,7 @@
 #include <Formats/JSONEachRowUtils.h>
 #include <Formats/FormatFactory.h>
 #include <DataTypes/NestedUtils.h>
-#include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/Serializations/SerializationNullable.h>
 
 namespace DB
 {
@@ -140,6 +140,7 @@ void JSONEachRowRowInputFormat::readField(size_t index, MutableColumns & columns
     {
         seen_columns[index] = read_columns[index] = true;
         const auto & type = getPort().getHeader().getByPosition(index).type;
+        const auto & serialization = serializations[index];
 
         if (yield_strings)
         {
@@ -149,16 +150,16 @@ void JSONEachRowRowInputFormat::readField(size_t index, MutableColumns & columns
             ReadBufferFromString buf(str);
 
             if (format_settings.null_as_default && !type->isNullable())
-                read_columns[index] = DataTypeNullable::deserializeWholeText(*columns[index], buf, format_settings, type);
+                read_columns[index] = SerializationNullable::deserializeWholeTextImpl(*columns[index], buf, format_settings, serialization);
             else
-                type->deserializeAsWholeText(*columns[index], buf, format_settings);
+                serialization->deserializeWholeText(*columns[index], buf, format_settings);
         }
         else
         {
             if (format_settings.null_as_default && !type->isNullable())
-                read_columns[index] = DataTypeNullable::deserializeTextJSON(*columns[index], in, format_settings, type);
+                read_columns[index] = SerializationNullable::deserializeTextJSONImpl(*columns[index], in, format_settings, serialization);
             else
-                type->deserializeAsTextJSON(*columns[index], in, format_settings);
+                serialization->deserializeTextJSON(*columns[index], in, format_settings);
         }
     }
     catch (Exception & e)
diff --git a/src/Processors/Formats/Impl/JSONEachRowRowOutputFormat.cpp b/src/Processors/Formats/Impl/JSONEachRowRowOutputFormat.cpp
index 30cd0660682..a69499de813 100644
--- a/src/Processors/Formats/Impl/JSONEachRowRowOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/JSONEachRowRowOutputFormat.cpp
@@ -28,7 +28,7 @@ JSONEachRowRowOutputFormat::JSONEachRowRowOutputFormat(
 }
 
 
-void JSONEachRowRowOutputFormat::writeField(const IColumn & column, const IDataType & type, size_t row_num)
+void JSONEachRowRowOutputFormat::writeField(const IColumn & column, const ISerialization & serialization, size_t row_num)
 {
     writeString(fields[field_number], out);
     writeChar(':', out);
@@ -37,11 +37,11 @@ void JSONEachRowRowOutputFormat::writeField(const IColumn & column, const IDataT
     {
         WriteBufferFromOwnString buf;
 
-        type.serializeAsText(column, row_num, buf, settings);
+        serialization.serializeText(column, row_num, buf, settings);
         writeJSONString(buf.str(), out, settings);
     }
     else
-        type.serializeAsTextJSON(column, row_num, out, settings);
+        serialization.serializeTextJSON(column, row_num, out, settings);
 
     ++field_number;
 }
diff --git a/src/Processors/Formats/Impl/JSONEachRowRowOutputFormat.h b/src/Processors/Formats/Impl/JSONEachRowRowOutputFormat.h
index 38760379056..10b15f3e7b2 100644
--- a/src/Processors/Formats/Impl/JSONEachRowRowOutputFormat.h
+++ b/src/Processors/Formats/Impl/JSONEachRowRowOutputFormat.h
@@ -23,7 +23,7 @@ public:
 
     String getName() const override { return "JSONEachRowRowOutputFormat"; }
 
-    void writeField(const IColumn & column, const IDataType & type, size_t row_num) override;
+    void writeField(const IColumn & column, const ISerialization & serialization, size_t row_num) override;
     void writeFieldDelimiter() override;
     void writeRowStartDelimiter() override;
     void writeRowEndDelimiter() override;
diff --git a/src/Processors/Formats/Impl/JSONRowOutputFormat.cpp b/src/Processors/Formats/Impl/JSONRowOutputFormat.cpp
index 517f126060f..38c6eefac1c 100644
--- a/src/Processors/Formats/Impl/JSONRowOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/JSONRowOutputFormat.cpp
@@ -71,7 +71,7 @@ void JSONRowOutputFormat::writePrefix()
 }
 
 
-void JSONRowOutputFormat::writeField(const IColumn & column, const IDataType & type, size_t row_num)
+void JSONRowOutputFormat::writeField(const IColumn & column, const ISerialization & serialization, size_t row_num)
 {
     writeCString("\t\t\t", *ostr);
     writeString(fields[field_number].name, *ostr);
@@ -81,16 +81,16 @@ void JSONRowOutputFormat::writeField(const IColumn & column, const IDataType & t
     {
         WriteBufferFromOwnString buf;
 
-        type.serializeAsText(column, row_num, buf, settings);
+        serialization.serializeText(column, row_num, buf, settings);
         writeJSONString(buf.str(), *ostr, settings);
     }
     else
-        type.serializeAsTextJSON(column, row_num, *ostr, settings);
+        serialization.serializeTextJSON(column, row_num, *ostr, settings);
 
     ++field_number;
 }
 
-void JSONRowOutputFormat::writeTotalsField(const IColumn & column, const IDataType & type, size_t row_num)
+void JSONRowOutputFormat::writeTotalsField(const IColumn & column, const ISerialization & serialization, size_t row_num)
 {
     writeCString("\t\t", *ostr);
     writeString(fields[field_number].name, *ostr);
@@ -100,11 +100,11 @@ void JSONRowOutputFormat::writeTotalsField(const IColumn & column, const IDataTy
     {
         WriteBufferFromOwnString buf;
 
-        type.serializeAsText(column, row_num, buf, settings);
+        serialization.serializeText(column, row_num, buf, settings);
         writeJSONString(buf.str(), *ostr, settings);
     }
     else
-        type.serializeAsTextJSON(column, row_num, *ostr, settings);
+        serialization.serializeTextJSON(column, row_num, *ostr, settings);
 
     ++field_number;
 }
@@ -159,7 +159,7 @@ void JSONRowOutputFormat::writeTotals(const Columns & columns, size_t row_num)
         if (i != 0)
             writeTotalsFieldDelimiter();
 
-        writeTotalsField(*columns[i], *types[i], row_num);
+        writeTotalsField(*columns[i], *serializations[i], row_num);
     }
 }
 
@@ -191,7 +191,7 @@ void JSONRowOutputFormat::writeExtremesElement(const char * title, const Columns
         if (i != 0)
             writeFieldDelimiter();
 
-        writeField(*columns[i], *types[i], row_num);
+        writeField(*columns[i], *serializations[i], row_num);
     }
 
     writeChar('\n', *ostr);
diff --git a/src/Processors/Formats/Impl/JSONRowOutputFormat.h b/src/Processors/Formats/Impl/JSONRowOutputFormat.h
index 88b74afbabd..75d4aa5d201 100644
--- a/src/Processors/Formats/Impl/JSONRowOutputFormat.h
+++ b/src/Processors/Formats/Impl/JSONRowOutputFormat.h
@@ -25,7 +25,7 @@ public:
 
     String getName() const override { return "JSONRowOutputFormat"; }
 
-    void writeField(const IColumn & column, const IDataType & type, size_t row_num) override;
+    void writeField(const IColumn & column, const ISerialization & serialization, size_t row_num) override;
     void writeFieldDelimiter() override;
     void writeRowStartDelimiter() override;
     void writeRowEndDelimiter() override;
@@ -63,7 +63,7 @@ public:
     String getContentType() const override { return "application/json; charset=UTF-8"; }
 
 protected:
-    virtual void writeTotalsField(const IColumn & column, const IDataType & type, size_t row_num);
+    virtual void writeTotalsField(const IColumn & column, const ISerialization & serialization, size_t row_num);
     virtual void writeExtremesElement(const char * title, const Columns & columns, size_t row_num);
     virtual void writeTotalsFieldDelimiter() { writeFieldDelimiter(); }
 
diff --git a/src/Processors/Formats/Impl/MarkdownRowOutputFormat.cpp b/src/Processors/Formats/Impl/MarkdownRowOutputFormat.cpp
index 51bba07d995..ee5d4193a45 100644
--- a/src/Processors/Formats/Impl/MarkdownRowOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/MarkdownRowOutputFormat.cpp
@@ -21,16 +21,13 @@ void MarkdownRowOutputFormat::writePrefix()
     }
     writeCString("\n|", out);
     String left_alignment = ":-|";
-    String central_alignment = ":-:|";
     String right_alignment = "-:|";
     for (size_t i = 0; i < columns; ++i)
     {
-        if (isInteger(types[i]))
+        if (types[i]->shouldAlignRightInPrettyFormats())
             writeString(right_alignment, out);
-        else if (isString(types[i]))
-            writeString(left_alignment, out);
         else
-            writeString(central_alignment, out);
+            writeString(left_alignment, out);
     }
     writeChar('\n', out);
 }
@@ -50,9 +47,9 @@ void MarkdownRowOutputFormat::writeRowEndDelimiter()
     writeCString(" |\n", out);
 }
 
-void MarkdownRowOutputFormat::writeField(const IColumn & column, const IDataType & type, size_t row_num)
+void MarkdownRowOutputFormat::writeField(const IColumn & column, const ISerialization & serialization, size_t row_num)
 {
-    type.serializeAsTextEscaped(column, row_num, out, format_settings);
+    serialization.serializeTextEscaped(column, row_num, out, format_settings);
 }
 
 void registerOutputFormatProcessorMarkdown(FormatFactory & factory)
diff --git a/src/Processors/Formats/Impl/MarkdownRowOutputFormat.h b/src/Processors/Formats/Impl/MarkdownRowOutputFormat.h
index 6bfb763d818..0b2a4dd0b23 100644
--- a/src/Processors/Formats/Impl/MarkdownRowOutputFormat.h
+++ b/src/Processors/Formats/Impl/MarkdownRowOutputFormat.h
@@ -28,7 +28,7 @@ public:
     /// Write '|\n' after each row
     void writeRowEndDelimiter() override ;
 
-    void writeField(const IColumn & column, const IDataType & type, size_t row_num) override;
+    void writeField(const IColumn & column, const ISerialization & serialization, size_t row_num) override;
     String getName() const override { return "MarkdownRowOutputFormat"; }
 
 protected:
diff --git a/src/Processors/Formats/Impl/MsgPackRowOutputFormat.h b/src/Processors/Formats/Impl/MsgPackRowOutputFormat.h
index b6764ed4a4f..9c66bb9d207 100644
--- a/src/Processors/Formats/Impl/MsgPackRowOutputFormat.h
+++ b/src/Processors/Formats/Impl/MsgPackRowOutputFormat.h
@@ -25,7 +25,7 @@ public:
     String getName() const override { return "MsgPackRowOutputFormat"; }
 
     void write(const Columns & columns, size_t row_num) override;
-    void writeField(const IColumn &, const IDataType &, size_t) override {}
+    void writeField(const IColumn &, const ISerialization &, size_t) override {}
     void serializeField(const IColumn & column, DataTypePtr data_type, size_t row_num);
 
 private:
diff --git a/src/Processors/Formats/Impl/MySQLOutputFormat.cpp b/src/Processors/Formats/Impl/MySQLOutputFormat.cpp
index f40261b4561..0f73349c271 100644
--- a/src/Processors/Formats/Impl/MySQLOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/MySQLOutputFormat.cpp
@@ -26,6 +26,10 @@ void MySQLOutputFormat::initialize()
     const auto & header = getPort(PortKind::Main).getHeader();
     data_types = header.getDataTypes();
 
+    serializations.reserve(data_types.size());
+    for (const auto & type : data_types)
+        serializations.emplace_back(type->getDefaultSerialization());
+
     if (header.columns())
     {
         packet_endpoint->sendPacket(LengthEncodedNumber(header.columns()));
@@ -36,7 +40,7 @@ void MySQLOutputFormat::initialize()
             packet_endpoint->sendPacket(getColumnDefinition(column_name, data_types[i]->getTypeId()));
         }
 
-        if (!(context->mysql.client_capabilities & Capability::CLIENT_DEPRECATE_EOF))
+        if (!(getContext()->mysql.client_capabilities & Capability::CLIENT_DEPRECATE_EOF))
         {
             packet_endpoint->sendPacket(EOFPacket(0, 0));
         }
@@ -51,7 +55,7 @@ void MySQLOutputFormat::consume(Chunk chunk)
 
     for (size_t i = 0; i < chunk.getNumRows(); i++)
     {
-        ProtocolText::ResultSetRow row_packet(data_types, chunk.getColumns(), i);
+        ProtocolText::ResultSetRow row_packet(serializations, chunk.getColumns(), i);
         packet_endpoint->sendPacket(row_packet);
     }
 }
@@ -60,7 +64,7 @@ void MySQLOutputFormat::finalize()
 {
     size_t affected_rows = 0;
     std::string human_readable_info;
-    if (QueryStatus * process_list_elem = context->getProcessListElement())
+    if (QueryStatus * process_list_elem = getContext()->getProcessListElement())
     {
         CurrentThread::finalizePerformanceCounters();
         QueryStatusInfo info = process_list_elem->getInfo();
@@ -74,10 +78,11 @@ void MySQLOutputFormat::finalize()
 
     const auto & header = getPort(PortKind::Main).getHeader();
     if (header.columns() == 0)
-        packet_endpoint->sendPacket(OKPacket(0x0, context->mysql.client_capabilities, affected_rows, 0, 0, "", human_readable_info), true);
-    else
-    if (context->mysql.client_capabilities & CLIENT_DEPRECATE_EOF)
-        packet_endpoint->sendPacket(OKPacket(0xfe, context->mysql.client_capabilities, affected_rows, 0, 0, "", human_readable_info), true);
+        packet_endpoint->sendPacket(
+            OKPacket(0x0, getContext()->mysql.client_capabilities, affected_rows, 0, 0, "", human_readable_info), true);
+    else if (getContext()->mysql.client_capabilities & CLIENT_DEPRECATE_EOF)
+        packet_endpoint->sendPacket(
+            OKPacket(0xfe, getContext()->mysql.client_capabilities, affected_rows, 0, 0, "", human_readable_info), true);
     else
         packet_endpoint->sendPacket(EOFPacket(0, 0), true);
 }
diff --git a/src/Processors/Formats/Impl/MySQLOutputFormat.h b/src/Processors/Formats/Impl/MySQLOutputFormat.h
index c0300675240..01a892410df 100644
--- a/src/Processors/Formats/Impl/MySQLOutputFormat.h
+++ b/src/Processors/Formats/Impl/MySQLOutputFormat.h
@@ -15,21 +15,20 @@ namespace DB
 class IColumn;
 class IDataType;
 class WriteBuffer;
-class Context;
 
 /** A stream for outputting data in a binary line-by-line format.
   */
-class MySQLOutputFormat final : public IOutputFormat
+class MySQLOutputFormat final : public IOutputFormat, WithConstContext
 {
 public:
     MySQLOutputFormat(WriteBuffer & out_, const Block & header_, const FormatSettings & settings_);
 
     String getName() const override { return "MySQLOutputFormat"; }
 
-    void setContext(const Context & context_)
+    void setContext(ContextConstPtr context_)
     {
-        context = &context_;
-        packet_endpoint = std::make_unique<MySQLProtocol::PacketEndpoint>(out, const_cast<uint8_t &>(context_.mysql.sequence_id)); /// TODO: fix it
+        context = context_;
+        packet_endpoint = std::make_unique<MySQLProtocol::PacketEndpoint>(out, const_cast<uint8_t &>(getContext()->mysql.sequence_id)); /// TODO: fix it
     }
 
     void consume(Chunk) override;
@@ -40,13 +39,12 @@ public:
     void initialize();
 
 private:
-
     bool initialized = false;
 
-    const Context * context = nullptr;
     std::unique_ptr<MySQLProtocol::PacketEndpoint> packet_endpoint;
     FormatSettings format_settings;
     DataTypes data_types;
+    Serializations serializations;
 };
 
 }
diff --git a/src/Processors/Formats/Impl/ODBCDriver2BlockOutputFormat.cpp b/src/Processors/Formats/Impl/ODBCDriver2BlockOutputFormat.cpp
index 3dd72a7a5c7..7a14966e220 100644
--- a/src/Processors/Formats/Impl/ODBCDriver2BlockOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/ODBCDriver2BlockOutputFormat.cpp
@@ -23,7 +23,7 @@ static void writeODBCString(WriteBuffer & out, const std::string & str)
     out.write(str.data(), str.size());
 }
 
-void ODBCDriver2BlockOutputFormat::writeRow(const Block & header, const Columns & columns, size_t row_idx, std::string & buffer)
+void ODBCDriver2BlockOutputFormat::writeRow(const Serializations & serializations, const Columns & columns, size_t row_idx, std::string & buffer)
 {
     size_t num_columns = columns.size();
     for (size_t column_idx = 0; column_idx < num_columns; ++column_idx)
@@ -39,7 +39,7 @@ void ODBCDriver2BlockOutputFormat::writeRow(const Block & header, const Columns
         {
             {
                 WriteBufferFromString text_out(buffer);
-                header.getByPosition(column_idx).type->serializeAsText(*column, row_idx, text_out, format_settings);
+                serializations[column_idx]->serializeText(*column, row_idx, text_out, format_settings);
             }
             writeODBCString(out, buffer);
         }
@@ -51,9 +51,15 @@ void ODBCDriver2BlockOutputFormat::write(Chunk chunk, PortKind port_kind)
     String text_value;
     const auto & header = getPort(port_kind).getHeader();
     const auto & columns = chunk.getColumns();
+
+    size_t num_columns = columns.size();
+    Serializations serializations(num_columns);
+    for (size_t i = 0; i < num_columns; ++i)
+        serializations[i] = header.getByPosition(i).type->getDefaultSerialization();
+
     const size_t rows = chunk.getNumRows();
     for (size_t i = 0; i < rows; ++i)
-        writeRow(header, columns, i, text_value);
+        writeRow(serializations, columns, i, text_value);
 }
 
 void ODBCDriver2BlockOutputFormat::consume(Chunk chunk)
diff --git a/src/Processors/Formats/Impl/ODBCDriver2BlockOutputFormat.h b/src/Processors/Formats/Impl/ODBCDriver2BlockOutputFormat.h
index 2a20c7a0619..4545e429cc2 100644
--- a/src/Processors/Formats/Impl/ODBCDriver2BlockOutputFormat.h
+++ b/src/Processors/Formats/Impl/ODBCDriver2BlockOutputFormat.h
@@ -45,7 +45,7 @@ private:
         prefix_written = true;
     }
 
-    void writeRow(const Block & header, const Columns & columns, size_t row_idx, std::string & buffer);
+    void writeRow(const Serializations & serializations, const Columns & columns, size_t row_idx, std::string & buffer);
     void write(Chunk chunk, PortKind port_kind);
     void writePrefix();
 };
diff --git a/src/Processors/Formats/Impl/ORCBlockInputFormat.cpp b/src/Processors/Formats/Impl/ORCBlockInputFormat.cpp
index 7776a904f1c..6f43addc4ed 100644
--- a/src/Processors/Formats/Impl/ORCBlockInputFormat.cpp
+++ b/src/Processors/Formats/Impl/ORCBlockInputFormat.cpp
@@ -19,6 +19,13 @@ namespace ErrorCodes
     extern const int CANNOT_READ_ALL_DATA;
 }
 
+#define THROW_ARROW_NOT_OK(status)                                     \
+    do                                                                 \
+    {                                                                  \
+        if (::arrow::Status _s = (status); !_s.ok())                   \
+            throw Exception(_s.ToString(), ErrorCodes::BAD_ARGUMENTS); \
+    } while (false)
+
 ORCBlockInputFormat::ORCBlockInputFormat(ReadBuffer & in_, Block header_) : IInputFormat(std::move(header_), in_)
 {
 }
@@ -28,21 +35,26 @@ Chunk ORCBlockInputFormat::generate()
     Chunk res;
     const Block & header = getPort().getHeader();
 
-    if (file_reader)
+    if (!file_reader)
+        prepareReader();
+
+    if (stripe_current >= stripe_total)
         return res;
 
-    arrow::Status open_status = arrow::adapters::orc::ORCFileReader::Open(asArrowFile(in), arrow::default_memory_pool(), &file_reader);
-    if (!open_status.ok())
-        throw Exception(open_status.ToString(), ErrorCodes::BAD_ARGUMENTS);
+    std::shared_ptr<arrow::RecordBatch> batch_result;
+    arrow::Status batch_status = file_reader->ReadStripe(stripe_current, include_indices, &batch_result);
+    if (!batch_status.ok())
+        throw ParsingException(ErrorCodes::CANNOT_READ_ALL_DATA,
+                               "Error while reading batch of ORC data: {}", batch_status.ToString());
 
-    std::shared_ptr<arrow::Table> table;
-    arrow::Status read_status = file_reader->Read(&table);
-    if (!read_status.ok())
-        throw ParsingException{"Error while reading ORC data: " + read_status.ToString(),
-                        ErrorCodes::CANNOT_READ_ALL_DATA};
+    auto table_result = arrow::Table::FromRecordBatches({batch_result});
+    if (!table_result.ok())
+        throw ParsingException(ErrorCodes::CANNOT_READ_ALL_DATA,
+                               "Error while reading batch of ORC data: {}", table_result.status().ToString());
 
-    ArrowColumnToCHColumn::arrowTableToCHChunk(res, table, header, "ORC");
+    ++stripe_current;
 
+    ArrowColumnToCHColumn::arrowTableToCHChunk(res, *table_result, header, "ORC");
     return res;
 }
 
@@ -51,6 +63,26 @@ void ORCBlockInputFormat::resetParser()
     IInputFormat::resetParser();
 
     file_reader.reset();
+    include_indices.clear();
+    stripe_current = 0;
+}
+
+void ORCBlockInputFormat::prepareReader()
+{
+    THROW_ARROW_NOT_OK(arrow::adapters::orc::ORCFileReader::Open(asArrowFile(in), arrow::default_memory_pool(), &file_reader));
+    stripe_total = file_reader->NumberOfStripes();
+    stripe_current = 0;
+
+    std::shared_ptr<arrow::Schema> schema;
+    THROW_ARROW_NOT_OK(file_reader->ReadSchema(&schema));
+
+    for (int i = 0; i < schema->num_fields(); ++i)
+    {
+        if (getPort().getHeader().has(schema->field(i)->name()))
+        {
+            include_indices.push_back(i+1);
+        }
+    }
 }
 
 void registerInputFormatProcessorORC(FormatFactory &factory)
@@ -64,6 +96,7 @@ void registerInputFormatProcessorORC(FormatFactory &factory)
             {
                 return std::make_shared<ORCBlockInputFormat>(buf, sample);
             });
+    factory.markFormatAsColumnOriented("ORC");
 }
 
 }
diff --git a/src/Processors/Formats/Impl/ORCBlockInputFormat.h b/src/Processors/Formats/Impl/ORCBlockInputFormat.h
index cff42560366..0c78290f3cc 100644
--- a/src/Processors/Formats/Impl/ORCBlockInputFormat.h
+++ b/src/Processors/Formats/Impl/ORCBlockInputFormat.h
@@ -25,6 +25,15 @@ private:
     // TODO: check that this class implements every part of its parent
 
     std::unique_ptr<arrow::adapters::orc::ORCFileReader> file_reader;
+
+    int stripe_total = 0;
+
+    int stripe_current = 0;
+
+    // indices of columns to read from ORC file
+    std::vector<int> include_indices;
+
+    void prepareReader();
 };
 
 }
diff --git a/src/Processors/Formats/Impl/ParallelFormattingOutputFormat.cpp b/src/Processors/Formats/Impl/ParallelFormattingOutputFormat.cpp
index 0ebca3661b4..ce7dd1abd51 100644
--- a/src/Processors/Formats/Impl/ParallelFormattingOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/ParallelFormattingOutputFormat.cpp
@@ -80,9 +80,11 @@ namespace DB
     }
 
 
-    void ParallelFormattingOutputFormat::collectorThreadFunction()
+    void ParallelFormattingOutputFormat::collectorThreadFunction(const ThreadGroupStatusPtr & thread_group)
     {
         setThreadName("Collector");
+        if (thread_group)
+            CurrentThread::attachToIfDetached(thread_group);
 
         try
         {
@@ -135,9 +137,11 @@ namespace DB
     }
 
 
-    void ParallelFormattingOutputFormat::formatterThreadFunction(size_t current_unit_number)
+    void ParallelFormattingOutputFormat::formatterThreadFunction(size_t current_unit_number, const ThreadGroupStatusPtr & thread_group)
     {
         setThreadName("Formatter");
+        if (thread_group)
+            CurrentThread::attachToIfDetached(thread_group);
 
         try
         {
diff --git a/src/Processors/Formats/Impl/ParallelFormattingOutputFormat.h b/src/Processors/Formats/Impl/ParallelFormattingOutputFormat.h
index 7e7c44a8aae..8b9e8293c69 100644
--- a/src/Processors/Formats/Impl/ParallelFormattingOutputFormat.h
+++ b/src/Processors/Formats/Impl/ParallelFormattingOutputFormat.h
@@ -6,6 +6,7 @@
 #include <Common/ThreadPool.h>
 #include <common/logger_useful.h>
 #include <Common/Exception.h>
+#include "IO/WriteBufferFromString.h"
 #include <Formats/FormatFactory.h>
 #include <Poco/Event.h>
 #include <IO/BufferWithOwnMemory.h>
@@ -75,7 +76,10 @@ public:
         /// Just heuristic. We need one thread for collecting, one thread for receiving chunks
         /// and n threads for formatting.
         processing_units.resize(params.max_threads_for_parallel_formatting + 2);
-        collector_thread = ThreadFromGlobalPool([&] { collectorThreadFunction(); });
+        collector_thread = ThreadFromGlobalPool([thread_group = CurrentThread::getGroup(), this]
+        {
+            collectorThreadFunction(thread_group);
+        });
         LOG_TRACE(&Poco::Logger::get("ParallelFormattingOutputFormat"), "Parallel formatting is being used");
     }
 
@@ -101,6 +105,15 @@ public:
         finishAndWait();
     }
 
+    /// There are no formats which support parallel formatting and progress writing at the same time
+    void onProgress(const Progress &) override {}
+
+    String getContentType() const override
+    {
+        WriteBufferFromOwnString buffer;
+        return internal_formatter_creator(buffer)->getContentType();
+    }
+
 protected:
     void consume(Chunk chunk) override final
     {
@@ -190,14 +203,17 @@ private:
 
     void scheduleFormatterThreadForUnitWithNumber(size_t ticket_number)
     {
-        pool.scheduleOrThrowOnError([this, ticket_number] { formatterThreadFunction(ticket_number); });
+        pool.scheduleOrThrowOnError([this, thread_group = CurrentThread::getGroup(), ticket_number]
+        {
+            formatterThreadFunction(ticket_number, thread_group);
+        });
     }
 
     /// Collects all temporary buffers into main WriteBuffer.
-    void collectorThreadFunction();
+    void collectorThreadFunction(const ThreadGroupStatusPtr & thread_group);
 
     /// This function is executed in ThreadPool and the only purpose of it is to format one Chunk into a continuous buffer in memory.
-    void formatterThreadFunction(size_t current_unit_number);
+    void formatterThreadFunction(size_t current_unit_number, const ThreadGroupStatusPtr & thread_group);
 };
 
 }
diff --git a/src/Processors/Formats/Impl/ParallelParsingInputFormat.cpp b/src/Processors/Formats/Impl/ParallelParsingInputFormat.cpp
index d1660b53019..f295fe00299 100644
--- a/src/Processors/Formats/Impl/ParallelParsingInputFormat.cpp
+++ b/src/Processors/Formats/Impl/ParallelParsingInputFormat.cpp
@@ -2,14 +2,14 @@
 #include <IO/ReadHelpers.h>
 #include <Common/CurrentThread.h>
 #include <Common/setThreadName.h>
-#include <ext/scope_guard.h>
+#include <ext/scope_guard_safe.h>
 
 namespace DB
 {
 
 void ParallelParsingInputFormat::segmentatorThreadFunction(ThreadGroupStatusPtr thread_group)
 {
-    SCOPE_EXIT(
+    SCOPE_EXIT_SAFE(
         if (thread_group)
             CurrentThread::detachQueryIfNotDetached();
     );
@@ -60,7 +60,7 @@ void ParallelParsingInputFormat::segmentatorThreadFunction(ThreadGroupStatusPtr
 
 void ParallelParsingInputFormat::parserThreadFunction(ThreadGroupStatusPtr thread_group, size_t current_ticket_number)
 {
-    SCOPE_EXIT(
+    SCOPE_EXIT_SAFE(
         if (thread_group)
             CurrentThread::detachQueryIfNotDetached();
     );
@@ -89,6 +89,11 @@ void ParallelParsingInputFormat::parserThreadFunction(ThreadGroupStatusPtr threa
         unit.chunk_ext.chunk.clear();
         unit.chunk_ext.block_missing_values.clear();
 
+        /// Propagate column_mapping to other parsers.
+        /// Note: column_mapping is used only for *WithNames types
+        if (current_ticket_number != 0)
+            input_format->setColumnMapping(column_mapping);
+
         // We don't know how many blocks will be. So we have to read them all
         // until an empty block occurred.
         Chunk chunk;
@@ -100,6 +105,14 @@ void ParallelParsingInputFormat::parserThreadFunction(ThreadGroupStatusPtr threa
             unit.chunk_ext.block_missing_values.emplace_back(parser.getMissingValues());
         }
 
+        /// Extract column_mapping from first parser to propagate it to others
+        if (current_ticket_number == 0)
+        {
+            column_mapping = input_format->getColumnMapping();
+            column_mapping->is_set = true;
+            first_parser_finished.set();
+        }
+
         // We suppose we will get at least some blocks for a non-empty buffer,
         // except at the end of file. Also see a matching assert in readImpl().
         assert(unit.is_last || !unit.chunk_ext.chunk.empty() || parsing_finished);
@@ -117,8 +130,6 @@ void ParallelParsingInputFormat::parserThreadFunction(ThreadGroupStatusPtr threa
 
 void ParallelParsingInputFormat::onBackgroundException(size_t offset)
 {
-    tryLogCurrentException(__PRETTY_FUNCTION__);
-
     std::unique_lock<std::mutex> lock(mutex);
     if (!background_exception)
     {
@@ -129,6 +140,7 @@ void ParallelParsingInputFormat::onBackgroundException(size_t offset)
     }
     tryLogCurrentException(__PRETTY_FUNCTION__);
     parsing_finished = true;
+    first_parser_finished.set();
     reader_condvar.notify_all();
     segmentator_condvar.notify_all();
 }
diff --git a/src/Processors/Formats/Impl/ParallelParsingInputFormat.h b/src/Processors/Formats/Impl/ParallelParsingInputFormat.h
index 9dda2dfe55d..559507055b9 100644
--- a/src/Processors/Formats/Impl/ParallelParsingInputFormat.h
+++ b/src/Processors/Formats/Impl/ParallelParsingInputFormat.h
@@ -10,6 +10,8 @@
 #include <IO/ReadBuffer.h>
 #include <Processors/Formats/IRowInputFormat.h>
 #include <Interpreters/Context.h>
+#include <common/logger_useful.h>
+#include <Poco/Event.h>
 
 namespace DB
 {
@@ -97,6 +99,8 @@ public:
 
         segmentator_thread = ThreadFromGlobalPool(
             &ParallelParsingInputFormat::segmentatorThreadFunction, this, CurrentThread::getGroup());
+
+        LOG_TRACE(&Poco::Logger::get("ParallelParsingInputFormat"), "Parallel parsing is used");
     }
 
     ~ParallelParsingInputFormat() override
@@ -199,6 +203,8 @@ private:
     std::condition_variable reader_condvar;
     std::condition_variable segmentator_condvar;
 
+    Poco::Event first_parser_finished;
+
     std::atomic<bool> parsing_finished{false};
 
     /// There are multiple "parsers", that's why we use thread pool.
@@ -250,6 +256,9 @@ private:
         {
             parserThreadFunction(group, ticket_number);
         });
+        /// We have to wait here to possibly extract ColumnMappingPtr from the first parser.
+        if (ticket_number == 0)
+            first_parser_finished.wait();
     }
 
     void finishAndWait()
diff --git a/src/Processors/Formats/Impl/ParquetBlockInputFormat.cpp b/src/Processors/Formats/Impl/ParquetBlockInputFormat.cpp
index bb55c71b7ca..162185e75b8 100644
--- a/src/Processors/Formats/Impl/ParquetBlockInputFormat.cpp
+++ b/src/Processors/Formats/Impl/ParquetBlockInputFormat.cpp
@@ -94,6 +94,7 @@ void registerInputFormatProcessorParquet(FormatFactory &factory)
             {
                 return std::make_shared<ParquetBlockInputFormat>(buf, sample);
             });
+    factory.markFormatAsColumnOriented("Parquet");
 }
 
 }
diff --git a/src/Processors/Formats/Impl/PostgreSQLOutputFormat.cpp b/src/Processors/Formats/Impl/PostgreSQLOutputFormat.cpp
index 50b3def929e..8c4da279fc5 100644
--- a/src/Processors/Formats/Impl/PostgreSQLOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/PostgreSQLOutputFormat.cpp
@@ -18,7 +18,7 @@ void PostgreSQLOutputFormat::doWritePrefix()
 
     initialized = true;
     const auto & header = getPort(PortKind::Main).getHeader();
-    data_types = header.getDataTypes();
+    auto data_types = header.getDataTypes();
 
     if (header.columns())
     {
@@ -29,6 +29,7 @@ void PostgreSQLOutputFormat::doWritePrefix()
         {
             const auto & column_name = header.getColumnsWithTypeAndName()[i].name;
             columns.emplace_back(column_name, data_types[i]->getTypeId());
+            serializations.emplace_back(data_types[i]->getDefaultSerialization());
         }
         message_transport.send(PostgreSQLProtocol::Messaging::RowDescription(columns));
     }
@@ -51,7 +52,7 @@ void PostgreSQLOutputFormat::consume(Chunk chunk)
             else
             {
                 WriteBufferFromOwnString ostr;
-                data_types[j]->serializeAsText(*columns[j], i, ostr, format_settings);
+                serializations[j]->serializeText(*columns[j], i, ostr, format_settings);
                 row.push_back(std::make_shared<PostgreSQLProtocol::Messaging::StringField>(std::move(ostr.str())));
             }
         }
diff --git a/src/Processors/Formats/Impl/PostgreSQLOutputFormat.h b/src/Processors/Formats/Impl/PostgreSQLOutputFormat.h
index 8ff5aae5067..257fbdff341 100644
--- a/src/Processors/Formats/Impl/PostgreSQLOutputFormat.h
+++ b/src/Processors/Formats/Impl/PostgreSQLOutputFormat.h
@@ -27,7 +27,7 @@ private:
 
     FormatSettings format_settings;
     PostgreSQLProtocol::Messaging::MessageTransport message_transport;
-    DataTypes data_types;
+    Serializations serializations;
 };
 
 }
diff --git a/src/Processors/Formats/Impl/PrettyBlockOutputFormat.cpp b/src/Processors/Formats/Impl/PrettyBlockOutputFormat.cpp
index 8bd4d36532d..0825d9f329e 100644
--- a/src/Processors/Formats/Impl/PrettyBlockOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/PrettyBlockOutputFormat.cpp
@@ -59,7 +59,8 @@ void PrettyBlockOutputFormat::calculateWidths(
         {
             {
                 WriteBufferFromString out_serialize(serialized_value);
-                elem.type->serializeAsText(*column, j, out_serialize, format_settings);
+                auto serialization = elem.type->getDefaultSerialization();
+                serialization->serializeText(*column, j, out_serialize, format_settings);
             }
 
             /// Avoid calculating width of too long strings by limiting the size in bytes.
@@ -154,6 +155,10 @@ void PrettyBlockOutputFormat::write(const Chunk & chunk, PortKind port_kind)
     const auto & columns = chunk.getColumns();
     const auto & header = getPort(port_kind).getHeader();
 
+    Serializations serializations(num_columns);
+    for (size_t i = 0; i < num_columns; ++i)
+        serializations[i] = header.getByPosition(i).type->getDefaultSerialization();
+
     WidthsPerColumn widths;
     Widths max_widths;
     Widths name_widths;
@@ -290,11 +295,10 @@ void PrettyBlockOutputFormat::write(const Chunk & chunk, PortKind port_kind)
         {
             if (j != 0)
                 writeCString(grid_symbols.bar, out);
-
             const auto & type = *header.getByPosition(j).type;
-            writeValueWithPadding(*columns[j], type, i,
+            writeValueWithPadding(*columns[j], *serializations[j], i,
                 widths[j].empty() ? max_widths[j] : widths[j][i],
-                max_widths[j]);
+                max_widths[j], type.shouldAlignRightInPrettyFormats());
         }
 
         writeCString(grid_symbols.bar, out);
@@ -313,12 +317,13 @@ void PrettyBlockOutputFormat::write(const Chunk & chunk, PortKind port_kind)
 
 
 void PrettyBlockOutputFormat::writeValueWithPadding(
-        const IColumn & column, const IDataType & type, size_t row_num, size_t value_width, size_t pad_to_width)
+    const IColumn & column, const ISerialization & serialization, size_t row_num,
+    size_t value_width, size_t pad_to_width, bool align_right)
 {
     String serialized_value = " ";
     {
         WriteBufferFromString out_serialize(serialized_value, WriteBufferFromString::AppendModeTag());
-        type.serializeAsText(column, row_num, out_serialize, format_settings);
+        serialization.serializeText(column, row_num, out_serialize, format_settings);
     }
 
     if (value_width > format_settings.pretty.max_value_width)
@@ -348,7 +353,7 @@ void PrettyBlockOutputFormat::writeValueWithPadding(
                 writeChar(' ', out);
     };
 
-    if (type.shouldAlignRightInPrettyFormats())
+    if (align_right)
     {
         write_padding();
         out.write(serialized_value.data(), serialized_value.size());
diff --git a/src/Processors/Formats/Impl/PrettyBlockOutputFormat.h b/src/Processors/Formats/Impl/PrettyBlockOutputFormat.h
index de79fe5ee2a..02b438d2571 100644
--- a/src/Processors/Formats/Impl/PrettyBlockOutputFormat.h
+++ b/src/Processors/Formats/Impl/PrettyBlockOutputFormat.h
@@ -57,7 +57,8 @@ protected:
         WidthsPerColumn & widths, Widths & max_padded_widths, Widths & name_widths);
 
     void writeValueWithPadding(
-        const IColumn & column, const IDataType & type, size_t row_num, size_t value_width, size_t pad_to_width);
+        const IColumn & column, const ISerialization & serialization, size_t row_num,
+        size_t value_width, size_t pad_to_width, bool align_right);
 };
 
 }
diff --git a/src/Processors/Formats/Impl/PrettyCompactBlockOutputFormat.cpp b/src/Processors/Formats/Impl/PrettyCompactBlockOutputFormat.cpp
index cfa669ae8ad..c4902ea4c26 100644
--- a/src/Processors/Formats/Impl/PrettyCompactBlockOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/PrettyCompactBlockOutputFormat.cpp
@@ -149,6 +149,7 @@ void PrettyCompactBlockOutputFormat::writeBottom(const Widths & max_widths)
 void PrettyCompactBlockOutputFormat::writeRow(
     size_t row_num,
     const Block & header,
+    const Serializations & serializations,
     const Columns & columns,
     const WidthsPerColumn & widths,
     const Widths & max_widths)
@@ -179,7 +180,7 @@ void PrettyCompactBlockOutputFormat::writeRow(
 
         const auto & type = *header.getByPosition(j).type;
         const auto & cur_widths = widths[j].empty() ? max_widths[j] : widths[j][row_num];
-        writeValueWithPadding(*columns[j], type, row_num, cur_widths, max_widths[j]);
+        writeValueWithPadding(*columns[j], *serializations[j], row_num, cur_widths, max_widths[j], type.shouldAlignRightInPrettyFormats());
     }
 
     writeCString(grid_symbols.bar, out);
@@ -240,8 +241,13 @@ void PrettyCompactBlockOutputFormat::writeChunk(const Chunk & chunk, PortKind po
 
     writeHeader(header, max_widths, name_widths);
 
+    size_t num_columns = header.columns();
+    Serializations serializations(num_columns);
+    for (size_t i = 0; i < num_columns; ++i)
+        serializations[i] = header.getByPosition(i).type->getDefaultSerialization();
+
     for (size_t i = 0; i < num_rows && total_rows + i < max_rows; ++i)
-        writeRow(i, header, columns, widths, max_widths);
+        writeRow(i, header, serializations, columns, widths, max_widths);
 
     writeBottom(max_widths);
 
diff --git a/src/Processors/Formats/Impl/PrettyCompactBlockOutputFormat.h b/src/Processors/Formats/Impl/PrettyCompactBlockOutputFormat.h
index 90c9d375192..96344397a0c 100644
--- a/src/Processors/Formats/Impl/PrettyCompactBlockOutputFormat.h
+++ b/src/Processors/Formats/Impl/PrettyCompactBlockOutputFormat.h
@@ -23,6 +23,7 @@ protected:
     void writeRow(
         size_t row_num,
         const Block & header,
+        const Serializations & serializations,
         const Columns & columns,
         const WidthsPerColumn & widths,
         const Widths & max_widths);
diff --git a/src/Processors/Formats/Impl/PrettySpaceBlockOutputFormat.cpp b/src/Processors/Formats/Impl/PrettySpaceBlockOutputFormat.cpp
index f3fb27a5558..fa987c6b949 100644
--- a/src/Processors/Formats/Impl/PrettySpaceBlockOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/PrettySpaceBlockOutputFormat.cpp
@@ -24,6 +24,10 @@ void PrettySpaceBlockOutputFormat::write(const Chunk & chunk, PortKind port_kind
     const auto & header = getPort(port_kind).getHeader();
     const auto & columns = chunk.getColumns();
 
+    Serializations serializations(num_columns);
+    for (size_t i = 0; i < num_columns; ++i)
+        serializations[i] = header.getByPosition(i).type->getDefaultSerialization();
+
     WidthsPerColumn widths;
     Widths max_widths;
     Widths name_widths;
@@ -87,7 +91,8 @@ void PrettySpaceBlockOutputFormat::write(const Chunk & chunk, PortKind port_kind
 
             const auto & type = *header.getByPosition(column).type;
             auto & cur_width = widths[column].empty() ? max_widths[column] : widths[column][row];
-            writeValueWithPadding(*columns[column], type, row, cur_width, max_widths[column]);
+            writeValueWithPadding(*columns[column], *serializations[column],
+                row, cur_width, max_widths[column], type.shouldAlignRightInPrettyFormats());
         }
 
         writeChar('\n', out);
diff --git a/src/Processors/Formats/Impl/ProtobufRowOutputFormat.h b/src/Processors/Formats/Impl/ProtobufRowOutputFormat.h
index 5f82950e891..54324490a3b 100644
--- a/src/Processors/Formats/Impl/ProtobufRowOutputFormat.h
+++ b/src/Processors/Formats/Impl/ProtobufRowOutputFormat.h
@@ -42,7 +42,7 @@ public:
     String getName() const override { return "ProtobufRowOutputFormat"; }
 
     void write(const Columns & columns, size_t row_num) override;
-    void writeField(const IColumn &, const IDataType &, size_t) override {}
+    void writeField(const IColumn &, const ISerialization &, size_t) override {}
     std::string getContentType() const override { return "application/octet-stream"; }
 
 private:
diff --git a/src/Processors/Formats/Impl/RawBLOBRowOutputFormat.cpp b/src/Processors/Formats/Impl/RawBLOBRowOutputFormat.cpp
index bcee94d8ad5..49f1159d48d 100644
--- a/src/Processors/Formats/Impl/RawBLOBRowOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/RawBLOBRowOutputFormat.cpp
@@ -15,7 +15,7 @@ RawBLOBRowOutputFormat::RawBLOBRowOutputFormat(
 }
 
 
-void RawBLOBRowOutputFormat::writeField(const IColumn & column, const IDataType &, size_t row_num)
+void RawBLOBRowOutputFormat::writeField(const IColumn & column, const ISerialization &, size_t row_num)
 {
     StringRef value = column.getDataAt(row_num);
     out.write(value.data, value.size);
diff --git a/src/Processors/Formats/Impl/RawBLOBRowOutputFormat.h b/src/Processors/Formats/Impl/RawBLOBRowOutputFormat.h
index 6a9a70bb12f..7a29c62e4d8 100644
--- a/src/Processors/Formats/Impl/RawBLOBRowOutputFormat.h
+++ b/src/Processors/Formats/Impl/RawBLOBRowOutputFormat.h
@@ -34,7 +34,7 @@ public:
 
     String getName() const override { return "RawBLOBRowOutputFormat"; }
 
-    void writeField(const IColumn & column, const IDataType &, size_t row_num) override;
+    void writeField(const IColumn & column, const ISerialization &, size_t row_num) override;
 };
 
 }
diff --git a/src/Processors/Formats/Impl/RegexpRowInputFormat.cpp b/src/Processors/Formats/Impl/RegexpRowInputFormat.cpp
index 108f4d9d321..555c79f8064 100644
--- a/src/Processors/Formats/Impl/RegexpRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/RegexpRowInputFormat.cpp
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <common/find_symbols.h>
 #include <Processors/Formats/Impl/RegexpRowInputFormat.h>
-#include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/Serializations/SerializationNullable.h>
 #include <IO/ReadHelpers.h>
 
 namespace DB
@@ -65,37 +65,38 @@ bool RegexpRowInputFormat::readField(size_t index, MutableColumns & columns)
     ReadBuffer field_buf(const_cast<char *>(matched_fields[index].data()), matched_fields[index].size(), 0);
     try
     {
+        const auto & serialization = serializations[index];
         switch (field_format)
         {
             case ColumnFormat::Escaped:
                 if (parse_as_nullable)
-                    read = DataTypeNullable::deserializeTextEscaped(*columns[index], field_buf, format_settings, type);
+                    read = SerializationNullable::deserializeTextEscapedImpl(*columns[index], field_buf, format_settings, serialization);
                 else
-                    type->deserializeAsTextEscaped(*columns[index], field_buf, format_settings);
+                    serialization->deserializeTextEscaped(*columns[index], field_buf, format_settings);
                 break;
             case ColumnFormat::Quoted:
                 if (parse_as_nullable)
-                    read = DataTypeNullable::deserializeTextQuoted(*columns[index], field_buf, format_settings, type);
+                    read = SerializationNullable::deserializeTextQuotedImpl(*columns[index], field_buf, format_settings, serialization);
                 else
-                    type->deserializeAsTextQuoted(*columns[index], field_buf, format_settings);
+                    serialization->deserializeTextQuoted(*columns[index], field_buf, format_settings);
                 break;
             case ColumnFormat::Csv:
                 if (parse_as_nullable)
-                    read = DataTypeNullable::deserializeTextCSV(*columns[index], field_buf, format_settings, type);
+                    read = SerializationNullable::deserializeTextCSVImpl(*columns[index], field_buf, format_settings, serialization);
                 else
-                    type->deserializeAsTextCSV(*columns[index], field_buf, format_settings);
+                    serialization->deserializeTextCSV(*columns[index], field_buf, format_settings);
                 break;
             case ColumnFormat::Json:
                 if (parse_as_nullable)
-                    read = DataTypeNullable::deserializeTextJSON(*columns[index], field_buf, format_settings, type);
+                    read = SerializationNullable::deserializeTextJSONImpl(*columns[index], field_buf, format_settings, serialization);
                 else
-                    type->deserializeAsTextJSON(*columns[index], field_buf, format_settings);
+                    serialization->deserializeTextJSON(*columns[index], field_buf, format_settings);
                 break;
             case ColumnFormat::Raw:
                 if (parse_as_nullable)
-                    read = DataTypeNullable::deserializeWholeText(*columns[index], field_buf, format_settings, type);
+                    read = SerializationNullable::deserializeWholeTextImpl(*columns[index], field_buf, format_settings, serialization);
                 else
-                    type->deserializeAsWholeText(*columns[index], field_buf, format_settings);
+                    serialization->deserializeWholeText(*columns[index], field_buf, format_settings);
                 break;
             default:
                 break;
diff --git a/src/Processors/Formats/Impl/TSKVRowInputFormat.cpp b/src/Processors/Formats/Impl/TSKVRowInputFormat.cpp
index 8d769cab346..ee6fce83358 100644
--- a/src/Processors/Formats/Impl/TSKVRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/TSKVRowInputFormat.cpp
@@ -1,7 +1,7 @@
 #include <IO/ReadHelpers.h>
 #include <Processors/Formats/Impl/TSKVRowInputFormat.h>
 #include <Formats/FormatFactory.h>
-#include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/Serializations/SerializationNullable.h>
 
 
 namespace DB
@@ -142,10 +142,11 @@ bool TSKVRowInputFormat::readRow(MutableColumns & columns, RowReadExtension & ex
 
                     seen_columns[index] = read_columns[index] = true;
                     const auto & type = getPort().getHeader().getByPosition(index).type;
+                    const auto & serialization = serializations[index];
                     if (format_settings.null_as_default && !type->isNullable())
-                        read_columns[index] = DataTypeNullable::deserializeTextEscaped(*columns[index], in, format_settings, type);
+                        read_columns[index] = SerializationNullable::deserializeTextEscapedImpl(*columns[index], in, format_settings, serialization);
                     else
-                        header.getByPosition(index).type->deserializeAsTextEscaped(*columns[index], in, format_settings);
+                        serialization->deserializeTextEscaped(*columns[index], in, format_settings);
                 }
             }
             else
diff --git a/src/Processors/Formats/Impl/TSKVRowOutputFormat.cpp b/src/Processors/Formats/Impl/TSKVRowOutputFormat.cpp
index 149ba3f0a2a..627ae67fa31 100644
--- a/src/Processors/Formats/Impl/TSKVRowOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/TSKVRowOutputFormat.cpp
@@ -24,10 +24,10 @@ TSKVRowOutputFormat::TSKVRowOutputFormat(WriteBuffer & out_, const Block & heade
 }
 
 
-void TSKVRowOutputFormat::writeField(const IColumn & column, const IDataType & type, size_t row_num)
+void TSKVRowOutputFormat::writeField(const IColumn & column, const ISerialization & serialization, size_t row_num)
 {
     writeString(fields[field_number].name, out);
-    type.serializeAsTextEscaped(column, row_num, out, format_settings);
+    serialization.serializeTextEscaped(column, row_num, out, format_settings);
     ++field_number;
 }
 
diff --git a/src/Processors/Formats/Impl/TSKVRowOutputFormat.h b/src/Processors/Formats/Impl/TSKVRowOutputFormat.h
index 1b341cbbc72..24c4e5ca866 100644
--- a/src/Processors/Formats/Impl/TSKVRowOutputFormat.h
+++ b/src/Processors/Formats/Impl/TSKVRowOutputFormat.h
@@ -18,7 +18,7 @@ public:
 
     String getName() const override { return "TSKVRowOutputFormat"; }
 
-    void writeField(const IColumn & column, const IDataType & type, size_t row_num) override;
+    void writeField(const IColumn & column, const ISerialization & serialization, size_t row_num) override;
     void writeRowEndDelimiter() override;
 
 protected:
diff --git a/src/Processors/Formats/Impl/TabSeparatedRawRowInputFormat.h b/src/Processors/Formats/Impl/TabSeparatedRawRowInputFormat.h
index bbcfec8e6da..07c8edf9e6e 100644
--- a/src/Processors/Formats/Impl/TabSeparatedRawRowInputFormat.h
+++ b/src/Processors/Formats/Impl/TabSeparatedRawRowInputFormat.h
@@ -31,7 +31,7 @@ public:
 
     String getName() const override { return "TabSeparatedRawRowInputFormat"; }
 
-    bool readField(IColumn & column, const DataTypePtr & type, bool) override
+    bool readField(IColumn & column, const DataTypePtr &, const SerializationPtr & serialization, bool) override
     {
         String tmp;
 
@@ -49,8 +49,7 @@ public:
         }
 
         ReadBufferFromString cell(tmp);
-
-        type->deserializeAsWholeText(column, cell, format_settings);
+        serialization->deserializeWholeText(column, cell, format_settings);
 
         return true;
     }
diff --git a/src/Processors/Formats/Impl/TabSeparatedRawRowOutputFormat.h b/src/Processors/Formats/Impl/TabSeparatedRawRowOutputFormat.h
index 6aa7f7bdfad..dc9312e53bc 100644
--- a/src/Processors/Formats/Impl/TabSeparatedRawRowOutputFormat.h
+++ b/src/Processors/Formats/Impl/TabSeparatedRawRowOutputFormat.h
@@ -26,9 +26,9 @@ public:
 
     String getName() const override { return "TabSeparatedRawRowOutputFormat"; }
 
-    void writeField(const IColumn & column, const IDataType & type, size_t row_num) override
+    void writeField(const IColumn & column, const ISerialization & serialization, size_t row_num) override
     {
-        type.serializeAsText(column, row_num, out, format_settings);
+        serialization.serializeText(column, row_num, out, format_settings);
     }
 };
 
diff --git a/src/Processors/Formats/Impl/TabSeparatedRowInputFormat.cpp b/src/Processors/Formats/Impl/TabSeparatedRowInputFormat.cpp
index 96b01a5bd9b..f89b76342a4 100644
--- a/src/Processors/Formats/Impl/TabSeparatedRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/TabSeparatedRowInputFormat.cpp
@@ -7,7 +7,8 @@
 #include <Formats/verbosePrintString.h>
 #include <Formats/FormatFactory.h>
 #include <DataTypes/DataTypeNothing.h>
-#include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/DataTypeLowCardinality.h>
+#include <DataTypes/Serializations/SerializationNullable.h>
 
 namespace DB
 {
@@ -62,19 +63,19 @@ TabSeparatedRowInputFormat::TabSeparatedRowInputFormat(const Block & header_, Re
         column_indexes_by_names.emplace(column_info.name, i);
     }
 
-    column_indexes_for_input_fields.reserve(num_columns);
-    read_columns.assign(num_columns, false);
+    column_mapping->column_indexes_for_input_fields.reserve(num_columns);
+    column_mapping->read_columns.assign(num_columns, false);
 }
 
 
 void TabSeparatedRowInputFormat::setupAllColumnsByTableSchema()
 {
     const auto & header = getPort().getHeader();
-    read_columns.assign(header.columns(), true);
-    column_indexes_for_input_fields.resize(header.columns());
+    column_mapping->read_columns.assign(header.columns(), true);
+    column_mapping->column_indexes_for_input_fields.resize(header.columns());
 
-    for (size_t i = 0; i < column_indexes_for_input_fields.size(); ++i)
-        column_indexes_for_input_fields[i] = i;
+    for (size_t i = 0; i < column_mapping->column_indexes_for_input_fields.size(); ++i)
+        column_mapping->column_indexes_for_input_fields[i] = i;
 }
 
 
@@ -85,13 +86,13 @@ void TabSeparatedRowInputFormat::addInputColumn(const String & column_name)
     {
         if (format_settings.skip_unknown_fields)
         {
-            column_indexes_for_input_fields.push_back(std::nullopt);
+            column_mapping->column_indexes_for_input_fields.push_back(std::nullopt);
             return;
         }
 
         throw Exception(
                 "Unknown field found in TSV header: '" + column_name + "' " +
-                "at position " + std::to_string(column_indexes_for_input_fields.size()) +
+                "at position " + std::to_string(column_mapping->column_indexes_for_input_fields.size()) +
                 "\nSet the 'input_format_skip_unknown_fields' parameter explicitly to ignore and proceed",
                 ErrorCodes::INCORRECT_DATA
         );
@@ -99,11 +100,11 @@ void TabSeparatedRowInputFormat::addInputColumn(const String & column_name)
 
     const auto column_index = column_it->second;
 
-    if (read_columns[column_index])
+    if (column_mapping->read_columns[column_index])
         throw Exception("Duplicate field found while parsing TSV header: " + column_name, ErrorCodes::INCORRECT_DATA);
 
-    read_columns[column_index] = true;
-    column_indexes_for_input_fields.emplace_back(column_index);
+    column_mapping->read_columns[column_index] = true;
+    column_mapping->column_indexes_for_input_fields.emplace_back(column_index);
 }
 
 
@@ -113,8 +114,8 @@ void TabSeparatedRowInputFormat::fillUnreadColumnsWithDefaults(MutableColumns &
     if (unlikely(row_num == 1))
     {
         columns_to_fill_with_default_values.clear();
-        for (size_t index = 0; index < read_columns.size(); ++index)
-            if (read_columns[index] == 0)
+        for (size_t index = 0; index < column_mapping->read_columns.size(); ++index)
+            if (column_mapping->read_columns[index] == 0)
                 columns_to_fill_with_default_values.push_back(index);
     }
 
@@ -136,7 +137,9 @@ void TabSeparatedRowInputFormat::readPrefix()
         skipBOMIfExists(in);
     }
 
-    if (with_names)
+    /// This is a bit of abstraction leakage, but we have almost the same code in other places.
+    /// Thus, we check if this InputFormat is working with the "real" beginning of the data in case of parallel parsing.
+    if (with_names && getCurrentUnitNumber() == 0)
     {
         if (format_settings.with_names_use_header)
         {
@@ -165,15 +168,15 @@ void TabSeparatedRowInputFormat::readPrefix()
         else
         {
             setupAllColumnsByTableSchema();
-            skipTSVRow(in, column_indexes_for_input_fields.size());
+            skipTSVRow(in, column_mapping->column_indexes_for_input_fields.size());
         }
     }
-    else
+    else if (!column_mapping->is_set)
         setupAllColumnsByTableSchema();
 
     if (with_types)
     {
-        skipTSVRow(in, column_indexes_for_input_fields.size());
+        skipTSVRow(in, column_mapping->column_indexes_for_input_fields.size());
     }
 }
 
@@ -185,15 +188,15 @@ bool TabSeparatedRowInputFormat::readRow(MutableColumns & columns, RowReadExtens
 
     updateDiagnosticInfo();
 
-    ext.read_columns.assign(read_columns.size(), true);
-    for (size_t file_column = 0; file_column < column_indexes_for_input_fields.size(); ++file_column)
+    ext.read_columns.assign(column_mapping->read_columns.size(), true);
+    for (size_t file_column = 0; file_column < column_mapping->column_indexes_for_input_fields.size(); ++file_column)
     {
-        const auto & column_index = column_indexes_for_input_fields[file_column];
-        const bool is_last_file_column = file_column + 1 == column_indexes_for_input_fields.size();
+        const auto & column_index = column_mapping->column_indexes_for_input_fields[file_column];
+        const bool is_last_file_column = file_column + 1 == column_mapping->column_indexes_for_input_fields.size();
         if (column_index)
         {
             const auto & type = data_types[*column_index];
-            ext.read_columns[*column_index] = readField(*columns[*column_index], type, is_last_file_column);
+            ext.read_columns[*column_index] = readField(*columns[*column_index], type, serializations[*column_index], is_last_file_column);
         }
         else
         {
@@ -202,7 +205,7 @@ bool TabSeparatedRowInputFormat::readRow(MutableColumns & columns, RowReadExtens
         }
 
         /// skip separators
-        if (file_column + 1 < column_indexes_for_input_fields.size())
+        if (file_column + 1 < column_mapping->column_indexes_for_input_fields.size())
         {
             assertChar('\t', in);
         }
@@ -221,24 +224,27 @@ bool TabSeparatedRowInputFormat::readRow(MutableColumns & columns, RowReadExtens
 }
 
 
-bool TabSeparatedRowInputFormat::readField(IColumn & column, const DataTypePtr & type, bool is_last_file_column)
+bool TabSeparatedRowInputFormat::readField(IColumn & column, const DataTypePtr & type,
+    const SerializationPtr & serialization, bool is_last_file_column)
 {
     const bool at_delimiter = !is_last_file_column && !in.eof() && *in.position() == '\t';
     const bool at_last_column_line_end = is_last_file_column && (in.eof() || *in.position() == '\n');
+
     if (format_settings.tsv.empty_as_default && (at_delimiter || at_last_column_line_end))
     {
         column.insertDefault();
         return false;
     }
     else if (format_settings.null_as_default && !type->isNullable())
-        return DataTypeNullable::deserializeTextEscaped(column, in, format_settings, type);
-    type->deserializeAsTextEscaped(column, in, format_settings);
+        return SerializationNullable::deserializeTextEscapedImpl(column, in, format_settings, serialization);
+
+    serialization->deserializeTextEscaped(column, in, format_settings);
     return true;
 }
 
 bool TabSeparatedRowInputFormat::parseRowAndPrintDiagnosticInfo(MutableColumns & columns, WriteBuffer & out)
 {
-    for (size_t file_column = 0; file_column < column_indexes_for_input_fields.size(); ++file_column)
+    for (size_t file_column = 0; file_column < column_mapping->column_indexes_for_input_fields.size(); ++file_column)
     {
         if (file_column == 0 && in.eof())
         {
@@ -246,10 +252,10 @@ bool TabSeparatedRowInputFormat::parseRowAndPrintDiagnosticInfo(MutableColumns &
             return false;
         }
 
-        if (column_indexes_for_input_fields[file_column].has_value())
+        if (column_mapping->column_indexes_for_input_fields[file_column].has_value())
         {
             const auto & header = getPort().getHeader();
-            size_t col_idx = column_indexes_for_input_fields[file_column].value();
+            size_t col_idx = column_mapping->column_indexes_for_input_fields[file_column].value();
             if (!deserializeFieldAndPrintDiagnosticInfo(header.getByPosition(col_idx).name, data_types[col_idx], *columns[col_idx],
                                                         out, file_column))
                 return false;
@@ -264,7 +270,7 @@ bool TabSeparatedRowInputFormat::parseRowAndPrintDiagnosticInfo(MutableColumns &
         }
 
         /// Delimiters
-        if (file_column + 1 == column_indexes_for_input_fields.size())
+        if (file_column + 1 == column_mapping->column_indexes_for_input_fields.size())
         {
             if (!in.eof())
             {
@@ -330,10 +336,13 @@ bool TabSeparatedRowInputFormat::parseRowAndPrintDiagnosticInfo(MutableColumns &
 
 void TabSeparatedRowInputFormat::tryDeserializeField(const DataTypePtr & type, IColumn & column, size_t file_column)
 {
-    if (column_indexes_for_input_fields[file_column])
+    const auto & index = column_mapping->column_indexes_for_input_fields[file_column];
+    if (index)
     {
+        bool can_be_parsed_as_null = removeLowCardinality(type)->isNullable();
+
         // check null value for type is not nullable. don't cross buffer bound for simplicity, so maybe missing some case
-        if (!type->isNullable() && !in.eof())
+        if (!can_be_parsed_as_null && !in.eof())
         {
             if (*in.position() == '\\' && in.available() >= 2)
             {
@@ -349,8 +358,9 @@ void TabSeparatedRowInputFormat::tryDeserializeField(const DataTypePtr & type, I
                 }
             }
         }
-        const bool is_last_file_column = file_column + 1 == column_indexes_for_input_fields.size();
-        readField(column, type, is_last_file_column);
+
+        const bool is_last_file_column = file_column + 1 == column_mapping->column_indexes_for_input_fields.size();
+        readField(column, type, serializations[*index], is_last_file_column);
     }
     else
     {
@@ -368,8 +378,8 @@ void TabSeparatedRowInputFormat::resetParser()
 {
     RowInputFormatWithDiagnosticInfo::resetParser();
     const auto & sample = getPort().getHeader();
-    read_columns.assign(sample.columns(), false);
-    column_indexes_for_input_fields.clear();
+    column_mapping->read_columns.assign(sample.columns(), false);
+    column_mapping->column_indexes_for_input_fields.clear();
     columns_to_fill_with_default_values.clear();
 }
 
@@ -463,7 +473,7 @@ static std::pair<bool, size_t> fileSegmentationEngineTabSeparatedImpl(ReadBuffer
 void registerFileSegmentationEngineTabSeparated(FormatFactory & factory)
 {
     // We can use the same segmentation engine for TSKV.
-    for (const auto * name : {"TabSeparated", "TSV", "TSKV"})
+    for (const auto & name : {"TabSeparated", "TSV", "TSKV", "TabSeparatedWithNames", "TSVWithNames"})
     {
         factory.registerFileSegmentationEngine(name, &fileSegmentationEngineTabSeparatedImpl);
     }
diff --git a/src/Processors/Formats/Impl/TabSeparatedRowInputFormat.h b/src/Processors/Formats/Impl/TabSeparatedRowInputFormat.h
index 0141d87403a..8127b5ceba7 100644
--- a/src/Processors/Formats/Impl/TabSeparatedRowInputFormat.h
+++ b/src/Processors/Formats/Impl/TabSeparatedRowInputFormat.h
@@ -33,7 +33,8 @@ protected:
     bool with_types;
     const FormatSettings format_settings;
 
-    virtual bool readField(IColumn & column, const DataTypePtr & type, bool is_last_file_column);
+    virtual bool readField(IColumn & column, const DataTypePtr & type,
+        const SerializationPtr & serialization, bool is_last_file_column);
 
 private:
     DataTypes data_types;
@@ -41,10 +42,6 @@ private:
     using IndexesMap = std::unordered_map<String, size_t>;
     IndexesMap column_indexes_by_names;
 
-    using OptionalIndexes = std::vector<std::optional<size_t>>;
-    OptionalIndexes column_indexes_for_input_fields;
-
-    std::vector<UInt8> read_columns;
     std::vector<size_t> columns_to_fill_with_default_values;
 
     void addInputColumn(const String & column_name);
diff --git a/src/Processors/Formats/Impl/TabSeparatedRowOutputFormat.cpp b/src/Processors/Formats/Impl/TabSeparatedRowOutputFormat.cpp
index dd3adfa40eb..3e99264785e 100644
--- a/src/Processors/Formats/Impl/TabSeparatedRowOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/TabSeparatedRowOutputFormat.cpp
@@ -43,9 +43,9 @@ void TabSeparatedRowOutputFormat::doWritePrefix()
 }
 
 
-void TabSeparatedRowOutputFormat::writeField(const IColumn & column, const IDataType & type, size_t row_num)
+void TabSeparatedRowOutputFormat::writeField(const IColumn & column, const ISerialization & serialization, size_t row_num)
 {
-    type.serializeAsTextEscaped(column, row_num, out, format_settings);
+    serialization.serializeTextEscaped(column, row_num, out, format_settings);
 }
 
 
diff --git a/src/Processors/Formats/Impl/TabSeparatedRowOutputFormat.h b/src/Processors/Formats/Impl/TabSeparatedRowOutputFormat.h
index 7985d6a1c86..e3190be70e8 100644
--- a/src/Processors/Formats/Impl/TabSeparatedRowOutputFormat.h
+++ b/src/Processors/Formats/Impl/TabSeparatedRowOutputFormat.h
@@ -28,7 +28,7 @@ public:
 
     String getName() const override { return "TabSeparatedRowOutputFormat"; }
 
-    void writeField(const IColumn & column, const IDataType & type, size_t row_num) override;
+    void writeField(const IColumn & column, const ISerialization & serialization, size_t row_num) override;
     void writeFieldDelimiter() override;
     void writeRowEndDelimiter() override;
     void writeBeforeTotals() override;
diff --git a/src/Processors/Formats/Impl/TemplateBlockOutputFormat.cpp b/src/Processors/Formats/Impl/TemplateBlockOutputFormat.cpp
index 6e33c7d90c9..d65f6dd9e38 100644
--- a/src/Processors/Formats/Impl/TemplateBlockOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/TemplateBlockOutputFormat.cpp
@@ -21,9 +21,9 @@ TemplateBlockOutputFormat::TemplateBlockOutputFormat(const Block & header_, Writ
 {
     const auto & sample = getPort(PortKind::Main).getHeader();
     size_t columns = sample.columns();
-    types.resize(columns);
+    serializations.resize(columns);
     for (size_t i = 0; i < columns; ++i)
-        types[i] = sample.safeGetByPosition(i).type;
+        serializations[i] = sample.safeGetByPosition(i).type->getDefaultSerialization();
 
     /// Validate format string for whole output
     size_t data_idx = format.format_idx_to_column_idx.size() + 1;
@@ -105,32 +105,32 @@ void TemplateBlockOutputFormat::writeRow(const Chunk & chunk, size_t row_num)
         writeString(row_format.delimiters[j], out);
 
         size_t col_idx = *row_format.format_idx_to_column_idx[j];
-        serializeField(*chunk.getColumns()[col_idx], *types[col_idx], row_num, row_format.formats[j]);
+        serializeField(*chunk.getColumns()[col_idx], *serializations[col_idx], row_num, row_format.formats[j]);
     }
     writeString(row_format.delimiters[columns], out);
 }
 
-void TemplateBlockOutputFormat::serializeField(const IColumn & column, const IDataType & type, size_t row_num, ColumnFormat col_format)
+void TemplateBlockOutputFormat::serializeField(const IColumn & column, const ISerialization & serialization, size_t row_num, ColumnFormat col_format)
 {
     switch (col_format)
     {
         case ColumnFormat::Escaped:
-            type.serializeAsTextEscaped(column, row_num, out, settings);
+            serialization.serializeTextEscaped(column, row_num, out, settings);
             break;
         case ColumnFormat::Quoted:
-            type.serializeAsTextQuoted(column, row_num, out, settings);
+            serialization.serializeTextQuoted(column, row_num, out, settings);
             break;
         case ColumnFormat::Csv:
-            type.serializeAsTextCSV(column, row_num, out, settings);
+            serialization.serializeTextCSV(column, row_num, out, settings);
             break;
         case ColumnFormat::Json:
-            type.serializeAsTextJSON(column, row_num, out, settings);
+            serialization.serializeTextJSON(column, row_num, out, settings);
             break;
         case ColumnFormat::Xml:
-            type.serializeAsTextXML(column, row_num, out, settings);
+            serialization.serializeTextXML(column, row_num, out, settings);
             break;
         case ColumnFormat::Raw:
-            type.serializeAsText(column, row_num, out, settings);
+            serialization.serializeText(column, row_num, out, settings);
             break;
         default:
             __builtin_unreachable();
@@ -142,7 +142,7 @@ template <typename U, typename V> void TemplateBlockOutputFormat::writeValue(U v
     auto type = std::make_unique<V>();
     auto col = type->createColumn();
     col->insert(value);
-    serializeField(*col, *type, 0, col_format);
+    serializeField(*col, *type->getDefaultSerialization(), 0, col_format);
 }
 
 void TemplateBlockOutputFormat::consume(Chunk chunk)
diff --git a/src/Processors/Formats/Impl/TemplateBlockOutputFormat.h b/src/Processors/Formats/Impl/TemplateBlockOutputFormat.h
index f29d31eb3f1..0d41b8888d4 100644
--- a/src/Processors/Formats/Impl/TemplateBlockOutputFormat.h
+++ b/src/Processors/Formats/Impl/TemplateBlockOutputFormat.h
@@ -47,12 +47,12 @@ protected:
     void finalize() override;
 
     void writeRow(const Chunk & chunk, size_t row_num);
-    void serializeField(const IColumn & column, const IDataType & type, size_t row_num, ColumnFormat format);
+    void serializeField(const IColumn & column, const ISerialization & serialization, size_t row_num, ColumnFormat format);
     template <typename U, typename V> void writeValue(U value, ColumnFormat col_format);
 
 protected:
     const FormatSettings settings;
-    DataTypes types;
+    Serializations serializations;
 
     ParsedTemplateFormatString format;
     ParsedTemplateFormatString row_format;
diff --git a/src/Processors/Formats/Impl/TemplateRowInputFormat.cpp b/src/Processors/Formats/Impl/TemplateRowInputFormat.cpp
index 6023b38e4de..0e5a962a037 100644
--- a/src/Processors/Formats/Impl/TemplateRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/TemplateRowInputFormat.cpp
@@ -4,7 +4,7 @@
 #include <IO/Operators.h>
 #include <DataTypes/DataTypeNothing.h>
 #include <Interpreters/Context.h>
-#include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/Serializations/SerializationNullable.h>
 
 namespace DB
 {
@@ -173,7 +173,7 @@ bool TemplateRowInputFormat::readRow(MutableColumns & columns, RowReadExtension
         if (row_format.format_idx_to_column_idx[i])
         {
             size_t col_idx = *row_format.format_idx_to_column_idx[i];
-            extra.read_columns[col_idx] = deserializeField(data_types[col_idx], *columns[col_idx], i);
+            extra.read_columns[col_idx] = deserializeField(data_types[col_idx], serializations[col_idx], *columns[col_idx], i);
         }
         else
             skipField(row_format.formats[i]);
@@ -189,7 +189,8 @@ bool TemplateRowInputFormat::readRow(MutableColumns & columns, RowReadExtension
     return true;
 }
 
-bool TemplateRowInputFormat::deserializeField(const DataTypePtr & type, IColumn & column, size_t file_column)
+bool TemplateRowInputFormat::deserializeField(const DataTypePtr & type,
+    const SerializationPtr & serialization, IColumn & column, size_t file_column)
 {
     ColumnFormat col_format = row_format.formats[file_column];
     bool read = true;
@@ -200,30 +201,30 @@ bool TemplateRowInputFormat::deserializeField(const DataTypePtr & type, IColumn
         {
             case ColumnFormat::Escaped:
                 if (parse_as_nullable)
-                    read = DataTypeNullable::deserializeTextEscaped(column, buf, settings, type);
+                    read = SerializationNullable::deserializeTextEscapedImpl(column, buf, settings, serialization);
                 else
-                    type->deserializeAsTextEscaped(column, buf, settings);
+                    serialization->deserializeTextEscaped(column, buf, settings);
                 break;
             case ColumnFormat::Quoted:
                 if (parse_as_nullable)
-                    read = DataTypeNullable::deserializeTextQuoted(column, buf, settings, type);
+                    read = SerializationNullable::deserializeTextQuotedImpl(column, buf, settings, serialization);
                 else
-                    type->deserializeAsTextQuoted(column, buf, settings);
+                    serialization->deserializeTextQuoted(column, buf, settings);
                 break;
             case ColumnFormat::Csv:
                 /// Will read unquoted string until settings.csv.delimiter
                 settings.csv.delimiter = row_format.delimiters[file_column + 1].empty() ? default_csv_delimiter :
                                                                                           row_format.delimiters[file_column + 1].front();
                 if (parse_as_nullable)
-                    read = DataTypeNullable::deserializeTextCSV(column, buf, settings, type);
+                    read = SerializationNullable::deserializeTextCSVImpl(column, buf, settings, serialization);
                 else
-                    type->deserializeAsTextCSV(column, buf, settings);
+                    serialization->deserializeTextCSV(column, buf, settings);
                 break;
             case ColumnFormat::Json:
                 if (parse_as_nullable)
-                    read = DataTypeNullable::deserializeTextJSON(column, buf, settings, type);
+                    read = SerializationNullable::deserializeTextJSONImpl(column, buf, settings, serialization);
                 else
-                    type->deserializeAsTextJSON(column, buf, settings);
+                    serialization->deserializeTextJSON(column, buf, settings);
                 break;
             default:
                 __builtin_unreachable();
@@ -412,8 +413,9 @@ void TemplateRowInputFormat::writeErrorStringForWrongDelimiter(WriteBuffer & out
 
 void TemplateRowInputFormat::tryDeserializeField(const DataTypePtr & type, IColumn & column, size_t file_column)
 {
-    if (row_format.format_idx_to_column_idx[file_column])
-        deserializeField(type, column, file_column);
+    const auto & index = row_format.format_idx_to_column_idx[file_column];
+    if (index)
+        deserializeField(type, serializations[*index], column, file_column);
     else
         skipField(row_format.formats[file_column]);
 }
diff --git a/src/Processors/Formats/Impl/TemplateRowInputFormat.h b/src/Processors/Formats/Impl/TemplateRowInputFormat.h
index 6adfe0a34b4..322f8570ab7 100644
--- a/src/Processors/Formats/Impl/TemplateRowInputFormat.h
+++ b/src/Processors/Formats/Impl/TemplateRowInputFormat.h
@@ -32,7 +32,9 @@ public:
     void resetParser() override;
 
 private:
-    bool deserializeField(const DataTypePtr & type, IColumn & column, size_t file_column);
+    bool deserializeField(const DataTypePtr & type,
+        const SerializationPtr & serialization, IColumn & column, size_t file_column);
+
     void skipField(ColumnFormat col_format);
     inline void skipSpaces() { if (ignore_spaces) skipWhitespaceIfAny(buf); }
 
@@ -43,6 +45,7 @@ private:
 
     bool parseRowAndPrintDiagnosticInfo(MutableColumns & columns, WriteBuffer & out) override;
     void tryDeserializeField(const DataTypePtr & type, IColumn & column, size_t file_column) override;
+
     bool isGarbageAfterField(size_t after_col_idx, ReadBuffer::Position pos) override;
     void writeErrorStringForWrongDelimiter(WriteBuffer & out, const String & description, const String & delim);
 
diff --git a/src/Processors/Formats/Impl/ValuesBlockInputFormat.cpp b/src/Processors/Formats/Impl/ValuesBlockInputFormat.cpp
index 34a4a98f16b..701385447b4 100644
--- a/src/Processors/Formats/Impl/ValuesBlockInputFormat.cpp
+++ b/src/Processors/Formats/Impl/ValuesBlockInputFormat.cpp
@@ -8,10 +8,15 @@
 #include <Formats/FormatFactory.h>
 #include <Common/FieldVisitors.h>
 #include <Core/Block.h>
-#include <Common/typeid_cast.h>
 #include <common/find_symbols.h>
+#include <Common/typeid_cast.h>
+#include <Common/checkStackSize.h>
 #include <Parsers/ASTLiteral.h>
+#include <DataTypes/Serializations/SerializationNullable.h>
 #include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/DataTypeTuple.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeMap.h>
 
 
 namespace DB
@@ -36,6 +41,9 @@ ValuesBlockInputFormat::ValuesBlockInputFormat(ReadBuffer & in_, const Block & h
           attempts_to_deduce_template(num_columns), attempts_to_deduce_template_cached(num_columns),
           rows_parsed_using_template(num_columns), templates(num_columns), types(header_.getDataTypes())
 {
+    serializations.resize(types.size());
+    for (size_t i = 0; i < types.size(); ++i)
+        serializations[i] = types[i]->getDefaultSerialization();
 }
 
 Chunk ValuesBlockInputFormat::generate()
@@ -69,11 +77,13 @@ Chunk ValuesBlockInputFormat::generate()
     {
         if (!templates[i] || !templates[i]->rowsCount())
             continue;
+
+        const auto & expected_type = header.getByPosition(i).type;
         if (columns[i]->empty())
-            columns[i] = IColumn::mutate(templates[i]->evaluateAll(block_missing_values, i));
+            columns[i] = IColumn::mutate(templates[i]->evaluateAll(block_missing_values, i, expected_type));
         else
         {
-            ColumnPtr evaluated = templates[i]->evaluateAll(block_missing_values, i, columns[i]->size());
+            ColumnPtr evaluated = templates[i]->evaluateAll(block_missing_values, i, expected_type, columns[i]->size());
             columns[i]->insertRangeFrom(*evaluated, 0, evaluated->size());
         }
     }
@@ -131,13 +141,16 @@ bool ValuesBlockInputFormat::tryParseExpressionUsingTemplate(MutableColumnPtr &
         return true;
     }
 
+    const auto & header = getPort().getHeader();
+    const auto & expected_type = header.getByPosition(column_idx).type;
+
     /// Expression in the current row is not match template deduced on the first row.
     /// Evaluate expressions, which were parsed using this template.
     if (column->empty())
-        column = IColumn::mutate(templates[column_idx]->evaluateAll(block_missing_values, column_idx));
+        column = IColumn::mutate(templates[column_idx]->evaluateAll(block_missing_values, column_idx, expected_type));
     else
     {
-        ColumnPtr evaluated = templates[column_idx]->evaluateAll(block_missing_values, column_idx, column->size());
+        ColumnPtr evaluated = templates[column_idx]->evaluateAll(block_missing_values, column_idx, expected_type, column->size());
         column->insertRangeFrom(*evaluated, 0, evaluated->size());
     }
     /// Do not use this template anymore
@@ -155,10 +168,12 @@ bool ValuesBlockInputFormat::tryReadValue(IColumn & column, size_t column_idx)
     {
         bool read = true;
         const auto & type = types[column_idx];
+        const auto & serialization = serializations[column_idx];
         if (format_settings.null_as_default && !type->isNullable())
-            read = DataTypeNullable::deserializeTextQuoted(column, buf, format_settings, type);
+            read = SerializationNullable::deserializeTextQuotedImpl(column, buf, format_settings, serialization);
         else
-            type->deserializeAsTextQuoted(column, buf, format_settings);
+            serialization->deserializeTextQuoted(column, buf, format_settings);
+
         rollback_on_exception = true;
 
         skipWhitespaceIfAny(buf);
@@ -181,6 +196,87 @@ bool ValuesBlockInputFormat::tryReadValue(IColumn & column, size_t column_idx)
     }
 }
 
+namespace
+{
+    void tryToReplaceNullFieldsInComplexTypesWithDefaultValues(Field & value, const IDataType & data_type)
+    {
+        checkStackSize();
+
+        WhichDataType type(data_type);
+
+        if (type.isTuple() && value.getType() == Field::Types::Tuple)
+        {
+            const DataTypeTuple & type_tuple = static_cast<const DataTypeTuple &>(data_type);
+
+            Tuple & tuple_value = value.get<Tuple>();
+
+            size_t src_tuple_size = tuple_value.size();
+            size_t dst_tuple_size = type_tuple.getElements().size();
+
+            if (src_tuple_size != dst_tuple_size)
+                throw Exception(fmt::format("Bad size of tuple. Expected size: {}, actual size: {}.",
+                    std::to_string(src_tuple_size), std::to_string(dst_tuple_size)), ErrorCodes::TYPE_MISMATCH);
+
+            for (size_t i = 0; i < src_tuple_size; ++i)
+            {
+                const auto & element_type = *(type_tuple.getElements()[i]);
+
+                if (tuple_value[i].isNull() && !element_type.isNullable())
+                    tuple_value[i] = element_type.getDefault();
+
+                tryToReplaceNullFieldsInComplexTypesWithDefaultValues(tuple_value[i], element_type);
+            }
+        }
+        else if (type.isArray() && value.getType() == Field::Types::Array)
+        {
+            const DataTypeArray & type_aray = static_cast<const DataTypeArray &>(data_type);
+            const auto & element_type = *(type_aray.getNestedType());
+
+            if (element_type.isNullable())
+                return;
+
+            Array & array_value = value.get<Array>();
+            size_t array_value_size = array_value.size();
+
+            for (size_t i = 0; i < array_value_size; ++i)
+            {
+                if (array_value[i].isNull())
+                    array_value[i] = element_type.getDefault();
+
+                tryToReplaceNullFieldsInComplexTypesWithDefaultValues(array_value[i], element_type);
+            }
+        }
+        else if (type.isMap() && value.getType() == Field::Types::Map)
+        {
+            const DataTypeMap & type_map = static_cast<const DataTypeMap &>(data_type);
+
+            const auto & key_type = *type_map.getKeyType();
+            const auto & value_type = *type_map.getValueType();
+
+            auto & map = value.get<Map>();
+            size_t map_size = map.size();
+
+            for (size_t i = 0; i < map_size; ++i)
+            {
+                auto & map_entry = map[i].get<Tuple>();
+
+                auto & entry_key = map_entry[0];
+                auto & entry_value = map_entry[1];
+
+                if (entry_key.isNull() && !key_type.isNullable())
+                    entry_key = key_type.getDefault();
+
+                tryToReplaceNullFieldsInComplexTypesWithDefaultValues(entry_key, key_type);
+
+                if (entry_value.isNull() && !value_type.isNullable())
+                    entry_value = value_type.getDefault();
+
+                tryToReplaceNullFieldsInComplexTypesWithDefaultValues(entry_value, value_type);
+            }
+        }
+    }
+}
+
 bool ValuesBlockInputFormat::parseExpression(IColumn & column, size_t column_idx)
 {
     const Block & header = getPort().getHeader();
@@ -220,7 +316,8 @@ bool ValuesBlockInputFormat::parseExpression(IColumn & column, size_t column_idx
         bool ok = false;
         try
         {
-            header.getByPosition(column_idx).type->deserializeAsTextQuoted(column, buf, format_settings);
+            const auto & serialization = serializations[column_idx];
+            serialization->deserializeTextQuoted(column, buf, format_settings);
             rollback_on_exception = true;
             skipWhitespaceIfAny(buf);
             if (checkDelimiterAfterValue(column_idx))
@@ -255,9 +352,15 @@ bool ValuesBlockInputFormat::parseExpression(IColumn & column, size_t column_idx
             bool found_in_cache = false;
             const auto & result_type = header.getByPosition(column_idx).type;
             const char * delimiter = (column_idx + 1 == num_columns) ? ")" : ",";
-            auto structure = templates_cache.getFromCacheOrConstruct(result_type, format_settings.null_as_default,
-                                                                     TokenIterator(tokens), token_iterator,
-                                                                     ast, *context, &found_in_cache, delimiter);
+            auto structure = templates_cache.getFromCacheOrConstruct(
+                result_type,
+                !result_type->isNullable() && format_settings.null_as_default,
+                TokenIterator(tokens),
+                token_iterator,
+                ast,
+                context,
+                &found_in_cache,
+                delimiter);
             templates[column_idx].emplace(structure);
             if (found_in_cache)
                 ++attempts_to_deduce_template_cached[column_idx];
@@ -297,8 +400,14 @@ bool ValuesBlockInputFormat::parseExpression(IColumn & column, size_t column_idx
     /// Try to evaluate single expression if other parsers don't work
     buf.position() = const_cast<char *>(token_iterator->begin);
 
-    std::pair<Field, DataTypePtr> value_raw = evaluateConstantExpression(ast, *context);
-    Field value = convertFieldToType(value_raw.first, type, value_raw.second.get());
+    std::pair<Field, DataTypePtr> value_raw = evaluateConstantExpression(ast, context);
+
+    Field & expression_value = value_raw.first;
+
+    if (format_settings.null_as_default)
+        tryToReplaceNullFieldsInComplexTypesWithDefaultValues(expression_value, type);
+
+    Field value = convertFieldToType(expression_value, type, value_raw.second.get());
 
     /// Check that we are indeed allowed to insert a NULL.
     if (value.isNull() && !type.isNullable())
diff --git a/src/Processors/Formats/Impl/ValuesBlockInputFormat.h b/src/Processors/Formats/Impl/ValuesBlockInputFormat.h
index 01deb2865bb..ea5ab9239e0 100644
--- a/src/Processors/Formats/Impl/ValuesBlockInputFormat.h
+++ b/src/Processors/Formats/Impl/ValuesBlockInputFormat.h
@@ -1,21 +1,19 @@
 #pragma once
 
 #include <Core/Block.h>
-#include <Processors/Formats/IInputFormat.h>
-#include <Processors/Formats/IRowInputFormat.h>
 #include <Formats/FormatSettings.h>
-#include <Processors/Formats/Impl/ConstantExpressionTemplate.h>
-
+#include <Interpreters/Context.h>
 #include <IO/PeekableReadBuffer.h>
 #include <Parsers/ExpressionListParsers.h>
+#include <Processors/Formats/IInputFormat.h>
+#include <Processors/Formats/IRowInputFormat.h>
+#include <Processors/Formats/Impl/ConstantExpressionTemplate.h>
 
 namespace DB
 {
 
-class Context;
 class ReadBuffer;
 
-
 /** Stream to read data in VALUES format (as in INSERT query).
   */
 class ValuesBlockInputFormat final : public IInputFormat
@@ -36,7 +34,7 @@ public:
     void resetParser() override;
 
     /// TODO: remove context somehow.
-    void setContext(const Context & context_) { context = std::make_unique<Context>(context_); }
+    void setContext(ContextConstPtr context_) { context = Context::createCopy(context_); }
 
     const BlockMissingValues & getMissingValues() const override { return block_missing_values; }
 
@@ -48,7 +46,7 @@ private:
         SingleExpressionEvaluation
     };
 
-    typedef std::vector<std::optional<ConstantExpressionTemplate>> ConstantExpressionTemplates;
+    using ConstantExpressionTemplates = std::vector<std::optional<ConstantExpressionTemplate>>;
 
     Chunk generate() override;
 
@@ -68,12 +66,11 @@ private:
 
     bool skipToNextRow(size_t min_chunk_bytes = 0, int balance = 0);
 
-private:
     PeekableReadBuffer buf;
 
     const RowInputFormatParams params;
 
-    std::unique_ptr<Context> context;   /// pimpl
+    ContextPtr context;   /// pimpl
     const FormatSettings format_settings;
 
     const size_t num_columns;
@@ -89,6 +86,7 @@ private:
     ConstantExpressionTemplate::Cache templates_cache;
 
     const DataTypes types;
+    Serializations serializations;
 
     BlockMissingValues block_missing_values;
 };
diff --git a/src/Processors/Formats/Impl/ValuesRowOutputFormat.cpp b/src/Processors/Formats/Impl/ValuesRowOutputFormat.cpp
index 7791e1296e0..e0152a7ffee 100644
--- a/src/Processors/Formats/Impl/ValuesRowOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/ValuesRowOutputFormat.cpp
@@ -15,9 +15,9 @@ ValuesRowOutputFormat::ValuesRowOutputFormat(WriteBuffer & out_, const Block & h
 {
 }
 
-void ValuesRowOutputFormat::writeField(const IColumn & column, const IDataType & type, size_t row_num)
+void ValuesRowOutputFormat::writeField(const IColumn & column, const ISerialization & serialization, size_t row_num)
 {
-    type.serializeAsTextQuoted(column, row_num, out, format_settings);
+    serialization.serializeTextQuoted(column, row_num, out, format_settings);
 }
 
 void ValuesRowOutputFormat::writeFieldDelimiter()
diff --git a/src/Processors/Formats/Impl/ValuesRowOutputFormat.h b/src/Processors/Formats/Impl/ValuesRowOutputFormat.h
index 73f91866f43..493ce458b1e 100644
--- a/src/Processors/Formats/Impl/ValuesRowOutputFormat.h
+++ b/src/Processors/Formats/Impl/ValuesRowOutputFormat.h
@@ -19,7 +19,7 @@ public:
 
     String getName() const override { return "ValuesRowOutputFormat"; }
 
-    void writeField(const IColumn & column, const IDataType & type, size_t row_num) override;
+    void writeField(const IColumn & column, const ISerialization & serialization, size_t row_num) override;
     void writeFieldDelimiter() override;
     void writeRowStartDelimiter() override;
     void writeRowEndDelimiter() override;
diff --git a/src/Processors/Formats/Impl/VerticalRowOutputFormat.cpp b/src/Processors/Formats/Impl/VerticalRowOutputFormat.cpp
index a3c71cbde59..c6f37d270b0 100644
--- a/src/Processors/Formats/Impl/VerticalRowOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/VerticalRowOutputFormat.cpp
@@ -50,22 +50,22 @@ VerticalRowOutputFormat::VerticalRowOutputFormat(
 }
 
 
-void VerticalRowOutputFormat::writeField(const IColumn & column, const IDataType & type, size_t row_num)
+void VerticalRowOutputFormat::writeField(const IColumn & column, const ISerialization & serialization, size_t row_num)
 {
     if (row_number > format_settings.pretty.max_rows)
         return;
 
     writeString(names_and_paddings[field_number], out);
-    writeValue(column, type, row_num);
+    writeValue(column, serialization, row_num);
     writeChar('\n', out);
 
     ++field_number;
 }
 
 
-void VerticalRowOutputFormat::writeValue(const IColumn & column, const IDataType & type, size_t row_num) const
+void VerticalRowOutputFormat::writeValue(const IColumn & column, const ISerialization & serialization, size_t row_num) const
 {
-    type.serializeAsText(column, row_num, out, format_settings);
+    serialization.serializeText(column, row_num, out, format_settings);
 }
 
 
@@ -123,26 +123,25 @@ void VerticalRowOutputFormat::writeBeforeExtremes()
 
 void VerticalRowOutputFormat::writeMinExtreme(const Columns & columns, size_t row_num)
 {
-    writeSpecialRow(columns, row_num, PortKind::Totals, "Min");
+    writeSpecialRow(columns, row_num, "Min");
 }
 
 void VerticalRowOutputFormat::writeMaxExtreme(const Columns & columns, size_t row_num)
 {
-    writeSpecialRow(columns, row_num, PortKind::Totals, "Max");
+    writeSpecialRow(columns, row_num, "Max");
 }
 
 void VerticalRowOutputFormat::writeTotals(const Columns & columns, size_t row_num)
 {
-    writeSpecialRow(columns, row_num, PortKind::Totals, "Totals");
+    writeSpecialRow(columns, row_num, "Totals");
     was_totals_written = true;
 }
 
-void VerticalRowOutputFormat::writeSpecialRow(const Columns & columns, size_t row_num, PortKind port_kind, const char * title)
+void VerticalRowOutputFormat::writeSpecialRow(const Columns & columns, size_t row_num, const char * title)
 {
     row_number = 0;
     field_number = 0;
 
-    const auto & header = getPort(port_kind).getHeader();
     size_t num_columns = columns.size();
 
     writeCString(title, out);
@@ -158,8 +157,7 @@ void VerticalRowOutputFormat::writeSpecialRow(const Columns & columns, size_t ro
         if (i != 0)
             writeFieldDelimiter();
 
-        const auto & col = header.getByPosition(i);
-        writeField(*columns[i], *col.type, row_num);
+        writeField(*columns[i], *serializations[i], row_num);
     }
 }
 
diff --git a/src/Processors/Formats/Impl/VerticalRowOutputFormat.h b/src/Processors/Formats/Impl/VerticalRowOutputFormat.h
index d372f5f611a..9e89f677f87 100644
--- a/src/Processors/Formats/Impl/VerticalRowOutputFormat.h
+++ b/src/Processors/Formats/Impl/VerticalRowOutputFormat.h
@@ -22,7 +22,7 @@ public:
 
     String getName() const override { return "VerticalRowOutputFormat"; }
 
-    void writeField(const IColumn & column, const IDataType & type, size_t row_num) override;
+    void writeField(const IColumn & column, const ISerialization & serialization, size_t row_num) override;
     void writeRowStartDelimiter() override;
     void writeRowBetweenDelimiter() override;
     void writeSuffix() override;
@@ -35,10 +35,10 @@ public:
     void writeBeforeExtremes() override;
 
 protected:
-    virtual void writeValue(const IColumn & column, const IDataType & type, size_t row_num) const;
+    virtual void writeValue(const IColumn & column, const ISerialization & serialization, size_t row_num) const;
 
     /// For totals and extremes.
-    void writeSpecialRow(const Columns & columns, size_t row_num, PortKind port_kind, const char * title);
+    void writeSpecialRow(const Columns & columns, size_t row_num, const char * title);
 
     const FormatSettings format_settings;
     size_t field_number = 0;
diff --git a/src/Processors/Formats/Impl/XMLRowOutputFormat.cpp b/src/Processors/Formats/Impl/XMLRowOutputFormat.cpp
index 6fd63a18147..893c4e229c7 100644
--- a/src/Processors/Formats/Impl/XMLRowOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/XMLRowOutputFormat.cpp
@@ -82,12 +82,12 @@ void XMLRowOutputFormat::writePrefix()
 }
 
 
-void XMLRowOutputFormat::writeField(const IColumn & column, const IDataType & type, size_t row_num)
+void XMLRowOutputFormat::writeField(const IColumn & column, const ISerialization & serialization, size_t row_num)
 {
     writeCString("\t\t\t<", *ostr);
     writeString(field_tag_names[field_number], *ostr);
     writeCString(">", *ostr);
-    type.serializeAsTextXML(column, row_num, *ostr, format_settings);
+    serialization.serializeTextXML(column, row_num, *ostr, format_settings);
     writeCString("</", *ostr);
     writeString(field_tag_names[field_number], *ostr);
     writeCString(">\n", *ostr);
@@ -132,7 +132,7 @@ void XMLRowOutputFormat::writeTotals(const Columns & columns, size_t row_num)
         writeCString("\t\t<", *ostr);
         writeString(field_tag_names[i], *ostr);
         writeCString(">", *ostr);
-        column.type->serializeAsTextXML(*columns[i], row_num, *ostr, format_settings);
+        column.type->getDefaultSerialization()->serializeTextXML(*columns[i], row_num, *ostr, format_settings);
         writeCString("</", *ostr);
         writeString(field_tag_names[i], *ostr);
         writeCString(">\n", *ostr);
@@ -181,7 +181,7 @@ void XMLRowOutputFormat::writeExtremesElement(const char * title, const Columns
         writeCString("\t\t\t<", *ostr);
         writeString(field_tag_names[i], *ostr);
         writeCString(">", *ostr);
-        column.type->serializeAsTextXML(*columns[i], row_num, *ostr, format_settings);
+        column.type->getDefaultSerialization()->serializeTextXML(*columns[i], row_num, *ostr, format_settings);
         writeCString("</", *ostr);
         writeString(field_tag_names[i], *ostr);
         writeCString(">\n", *ostr);
diff --git a/src/Processors/Formats/Impl/XMLRowOutputFormat.h b/src/Processors/Formats/Impl/XMLRowOutputFormat.h
index 233ee773c1c..8ca4721c459 100644
--- a/src/Processors/Formats/Impl/XMLRowOutputFormat.h
+++ b/src/Processors/Formats/Impl/XMLRowOutputFormat.h
@@ -20,7 +20,7 @@ public:
 
     String getName() const override { return "XMLRowOutputFormat"; }
 
-    void writeField(const IColumn & column, const IDataType & type, size_t row_num) override;
+    void writeField(const IColumn & column, const ISerialization & serialization, size_t row_num) override;
     void writeRowStartDelimiter() override;
     void writeRowEndDelimiter() override;
     void writePrefix() override;
diff --git a/src/Processors/Formats/LazyOutputFormat.cpp b/src/Processors/Formats/LazyOutputFormat.cpp
index 46287d1cce9..0663ff28f84 100644
--- a/src/Processors/Formats/LazyOutputFormat.cpp
+++ b/src/Processors/Formats/LazyOutputFormat.cpp
@@ -16,8 +16,13 @@ Chunk LazyOutputFormat::getChunk(UInt64 milliseconds)
     }
 
     Chunk chunk;
-    if (!queue.tryPop(chunk, milliseconds))
-        return {};
+    if (milliseconds)
+    {
+        if (!queue.tryPop(chunk, milliseconds))
+            return {};
+    }
+    else
+        queue.pop(chunk);
 
     if (chunk)
         info.update(chunk.getNumRows(), chunk.allocatedBytes());
diff --git a/src/Processors/Formats/LazyOutputFormat.h b/src/Processors/Formats/LazyOutputFormat.h
index 06ec116f3dd..15ea5022f82 100644
--- a/src/Processors/Formats/LazyOutputFormat.h
+++ b/src/Processors/Formats/LazyOutputFormat.h
@@ -36,6 +36,14 @@ public:
         queue.clear();
     }
 
+    void finalize() override
+    {
+        finished_processing = true;
+
+        /// In case we are waiting for result.
+        queue.emplace(Chunk());
+    }
+
 protected:
     void consume(Chunk chunk) override
     {
@@ -46,14 +54,6 @@ protected:
     void consumeTotals(Chunk chunk) override { totals = std::move(chunk); }
     void consumeExtremes(Chunk chunk) override { extremes = std::move(chunk); }
 
-    void finalize() override
-    {
-        finished_processing = true;
-
-        /// In case we are waiting for result.
-        queue.emplace(Chunk());
-    }
-
 private:
 
     ConcurrentBoundedQueue<Chunk> queue;
diff --git a/src/Processors/ISource.h b/src/Processors/ISource.h
index b7e2b5dce8e..db91c0c5bce 100644
--- a/src/Processors/ISource.h
+++ b/src/Processors/ISource.h
@@ -19,7 +19,7 @@ protected:
     virtual std::optional<Chunk> tryGenerate();
 
 public:
-    ISource(Block header);
+    explicit ISource(Block header);
 
     Status prepare() override;
     void work() override;
diff --git a/src/Processors/Merges/Algorithms/CollapsingSortedAlgorithm.cpp b/src/Processors/Merges/Algorithms/CollapsingSortedAlgorithm.cpp
index ccb66259e2e..0db99fc7b0e 100644
--- a/src/Processors/Merges/Algorithms/CollapsingSortedAlgorithm.cpp
+++ b/src/Processors/Merges/Algorithms/CollapsingSortedAlgorithm.cpp
@@ -66,14 +66,16 @@ void CollapsingSortedAlgorithm::insertRow(RowRef & row)
     merged_data.insertRow(*row.all_columns, row.row_num, row.owned_chunk->getNumRows());
 }
 
-void CollapsingSortedAlgorithm::insertRows()
+std::optional<Chunk> CollapsingSortedAlgorithm::insertRows()
 {
     if (count_positive == 0 && count_negative == 0)
     {
         /// No input rows have been read.
-        return;
+        return {};
     }
 
+    std::optional<Chunk> res;
+
     if (last_is_positive || count_positive != count_negative)
     {
         if (count_positive <= count_negative && !only_positive_sign)
@@ -86,6 +88,9 @@ void CollapsingSortedAlgorithm::insertRows()
 
         if (count_positive >= count_negative)
         {
+            if (merged_data.hasEnoughRows())
+                res = merged_data.pull();
+
             insertRow(last_positive_row);
 
             if (out_row_sources_buf)
@@ -107,10 +112,16 @@ void CollapsingSortedAlgorithm::insertRows()
         out_row_sources_buf->write(
                 reinterpret_cast<const char *>(current_row_sources.data()),
                 current_row_sources.size() * sizeof(RowSourcePart));
+
+    return res;
 }
 
 IMergingAlgorithm::Status CollapsingSortedAlgorithm::merge()
 {
+    /// Rare case, which may happen when index_granularity is 1, but we needed to insert 2 rows inside insertRows().
+    if (merged_data.hasEnoughRows())
+        return Status(merged_data.pull());
+
     /// Take rows in required order and put them into `merged_data`, while the rows are no more than `max_block_size`
     while (queue.isValid())
     {
@@ -132,15 +143,14 @@ IMergingAlgorithm::Status CollapsingSortedAlgorithm::merge()
             setRowRef(last_row, current);
 
         bool key_differs = !last_row.hasEqualSortColumnsWith(current_row);
-
-        /// if there are enough rows and the last one is calculated completely
-        if (key_differs && merged_data.hasEnoughRows())
-            return Status(merged_data.pull());
-
         if (key_differs)
         {
+            /// if there are enough rows and the last one is calculated completely
+            if (merged_data.hasEnoughRows())
+                return Status(merged_data.pull());
+
             /// We write data for the previous primary key.
-            insertRows();
+            auto res = insertRows();
 
             current_row.swap(last_row);
 
@@ -151,6 +161,12 @@ IMergingAlgorithm::Status CollapsingSortedAlgorithm::merge()
             first_negative_pos = 0;
             last_positive_pos = 0;
             current_row_sources.resize(0);
+
+            /// Here we can return ready chunk.
+            /// Next iteration, last_row == current_row, and all the counters are zeroed.
+            /// So, current_row should be correctly processed.
+            if (res)
+                return Status(std::move(*res));
         }
 
         /// Initially, skip all rows. On insert, unskip "corner" rows.
@@ -194,7 +210,15 @@ IMergingAlgorithm::Status CollapsingSortedAlgorithm::merge()
         }
     }
 
-    insertRows();
+    if (auto res = insertRows())
+    {
+        /// Queue is empty, and we have inserted all the rows.
+        /// Set counter to zero so that insertRows() will return immediately next time.
+        count_positive = 0;
+        count_negative = 0;
+        return Status(std::move(*res));
+    }
+
     return Status(merged_data.pull(), true);
 }
 
diff --git a/src/Processors/Merges/Algorithms/CollapsingSortedAlgorithm.h b/src/Processors/Merges/Algorithms/CollapsingSortedAlgorithm.h
index 028715f715b..18ebaad5596 100644
--- a/src/Processors/Merges/Algorithms/CollapsingSortedAlgorithm.h
+++ b/src/Processors/Merges/Algorithms/CollapsingSortedAlgorithm.h
@@ -66,7 +66,11 @@ private:
 
     void reportIncorrectData();
     void insertRow(RowRef & row);
-    void insertRows();
+
+    /// Insert ready rows into merged_data. We may want to insert 0, 1 or 2 rows.
+    /// It may happen that 2 rows is going to be inserted and, but merged data has free space only for 1 row.
+    /// In this case, Chunk with ready is pulled from merged_data before the second insertion.
+    std::optional<Chunk> insertRows();
 };
 
 }
diff --git a/src/Processors/Merges/Algorithms/FinishAggregatingInOrderAlgorithm.cpp b/src/Processors/Merges/Algorithms/FinishAggregatingInOrderAlgorithm.cpp
new file mode 100644
index 00000000000..3eb94ba78b7
--- /dev/null
+++ b/src/Processors/Merges/Algorithms/FinishAggregatingInOrderAlgorithm.cpp
@@ -0,0 +1,158 @@
+#include <Processors/Merges/Algorithms/FinishAggregatingInOrderAlgorithm.h>
+#include <Processors/Transforms/AggregatingTransform.h>
+#include <Core/SortCursor.h>
+
+#include <ext/range.h>
+
+namespace DB
+{
+
+FinishAggregatingInOrderAlgorithm::State::State(
+    const Chunk & chunk, const SortDescription & desc)
+    : num_rows(chunk.getNumRows())
+    , all_columns(chunk.getColumns())
+{
+    if (!chunk)
+        return;
+
+    sorting_columns.reserve(desc.size());
+    for (const auto & column_desc : desc)
+        sorting_columns.emplace_back(all_columns[column_desc.column_number].get());
+}
+
+FinishAggregatingInOrderAlgorithm::FinishAggregatingInOrderAlgorithm(
+    const Block & header_,
+    size_t num_inputs_,
+    AggregatingTransformParamsPtr params_,
+    SortDescription description_,
+    size_t max_block_size_)
+    : header(header_)
+    , num_inputs(num_inputs_)
+    , params(params_)
+    , description(std::move(description_))
+    , max_block_size(max_block_size_)
+{
+    /// Replace column names in description to positions.
+    for (auto & column_description : description)
+    {
+        if (!column_description.column_name.empty())
+        {
+            column_description.column_number = header_.getPositionByName(column_description.column_name);
+            column_description.column_name.clear();
+        }
+    }
+}
+
+void FinishAggregatingInOrderAlgorithm::initialize(Inputs inputs)
+{
+    current_inputs = std::move(inputs);
+    states.reserve(num_inputs);
+    for (size_t i = 0; i < num_inputs; ++i)
+        states.emplace_back(current_inputs[i].chunk, description);
+}
+
+void FinishAggregatingInOrderAlgorithm::consume(Input & input, size_t source_num)
+{
+    states[source_num] = State{input.chunk, description};
+}
+
+IMergingAlgorithm::Status FinishAggregatingInOrderAlgorithm::merge()
+{
+    if (!inputs_to_update.empty())
+    {
+        Status status(inputs_to_update.back());
+        inputs_to_update.pop_back();
+        return status;
+    }
+
+    /// Find the input with smallest last row.
+    std::optional<size_t> best_input;
+    for (size_t i = 0; i < num_inputs; ++i)
+    {
+        if (!states[i].isValid())
+            continue;
+
+        if (!best_input
+            || less(states[i].sorting_columns, states[*best_input].sorting_columns,
+                    states[i].num_rows - 1, states[*best_input].num_rows - 1, description))
+        {
+            best_input = i;
+        }
+    }
+
+    if (!best_input)
+        return Status{aggregate(), true};
+
+    /// Chunk at best_input will be aggregated entirely.
+    auto & best_state = states[*best_input];
+    best_state.to_row = states[*best_input].num_rows;
+
+    /// Find the positions up to which need to aggregate in other chunks.
+    for (size_t i = 0; i < num_inputs; ++i)
+    {
+        if (!states[i].isValid() || i == *best_input)
+            continue;
+
+        auto indices = ext::range(states[i].current_row, states[i].num_rows);
+        auto it = std::upper_bound(indices.begin(), indices.end(), best_state.num_rows - 1,
+            [&](size_t lhs_pos, size_t rhs_pos)
+            {
+                return less(best_state.sorting_columns, states[i].sorting_columns, lhs_pos, rhs_pos, description);
+            });
+
+        states[i].to_row = (it == indices.end() ? states[i].num_rows : *it);
+    }
+
+    addToAggregation();
+
+    /// At least one chunk should be fully aggregated.
+    assert(!inputs_to_update.empty());
+    Status status(inputs_to_update.back());
+    inputs_to_update.pop_back();
+
+    /// Do not merge blocks, if there are too few rows.
+    if (accumulated_rows >= max_block_size)
+        status.chunk = aggregate();
+
+    return status;
+}
+
+Chunk FinishAggregatingInOrderAlgorithm::aggregate()
+{
+    auto aggregated = params->aggregator.mergeBlocks(blocks, false);
+    blocks.clear();
+    accumulated_rows = 0;
+    return {aggregated.getColumns(), aggregated.rows()};
+}
+
+void FinishAggregatingInOrderAlgorithm::addToAggregation()
+{
+    for (size_t i = 0; i < num_inputs; ++i)
+    {
+        const auto & state = states[i];
+        if (!state.isValid() || state.current_row == state.to_row)
+            continue;
+
+        if (state.to_row - state.current_row == state.num_rows)
+        {
+            blocks.emplace_back(header.cloneWithColumns(state.all_columns));
+        }
+        else
+        {
+            Columns new_columns;
+            new_columns.reserve(state.all_columns.size());
+            for (const auto & column : state.all_columns)
+                new_columns.emplace_back(column->cut(state.current_row, state.to_row - state.current_row));
+
+            blocks.emplace_back(header.cloneWithColumns(new_columns));
+        }
+
+        states[i].current_row = states[i].to_row;
+        accumulated_rows += blocks.back().rows();
+
+        if (!states[i].isValid())
+            inputs_to_update.push_back(i);
+    }
+}
+
+}
diff --git a/src/Processors/Merges/Algorithms/FinishAggregatingInOrderAlgorithm.h b/src/Processors/Merges/Algorithms/FinishAggregatingInOrderAlgorithm.h
new file mode 100644
index 00000000000..119aefb0ab0
--- /dev/null
+++ b/src/Processors/Merges/Algorithms/FinishAggregatingInOrderAlgorithm.h
@@ -0,0 +1,80 @@
+#pragma once
+
+#include <Processors/Merges/Algorithms/IMergingAlgorithm.h>
+#include <Processors/Merges/Algorithms/MergedData.h>
+#include <Core/SortDescription.h>
+#include <Core/Block.h>
+
+namespace DB
+{
+
+struct AggregatingTransformParams;
+using AggregatingTransformParamsPtr = std::shared_ptr<AggregatingTransformParams>;
+
+/**
+ * The second step of aggregation in order of sorting key.
+ * The transform receives k inputs with partially aggregated data,
+ * sorted by group by key (prefix of sorting key).
+ * Then it merges aggregated data from inputs by the following algorithm:
+ *  - At each step find the smallest value X of the sorting key among last rows of current blocks of inputs.
+ *    Since the data is sorted in order of sorting key and has no duplicates in single input stream (because of aggregation),
+ *    X will never appear later in any of input streams.
+ *  - Aggregate all rows in current blocks of inputs up to the upper_bound of X using
+ *    regular hash table algorithm (Aggregator::mergeBlock).
+ * The hash table at one step will contain all keys <= X from all blocks.
+ * There is another, simpler algorithm (AggregatingSortedAlgorithm), that merges
+ * and aggregates sorted data for one key at a time, using one aggregation state.
+ * It is a simple k-way merge algorithm and it makes O(n*log(k)) comparisons,
+ * where * n -- number of rows, k -- number of parts. In comparison, this algorithm
+ * makes about * O(n + k * log(n)) operations, n -- for hash table, k * log(n)
+ * -- for finding positions in blocks. It is better than O(n*log(k)), when k is not
+ * too big and not too small (about 100-1000).
+ */
+class FinishAggregatingInOrderAlgorithm final : public IMergingAlgorithm
+{
+public:
+    FinishAggregatingInOrderAlgorithm(
+        const Block & header_,
+        size_t num_inputs_,
+        AggregatingTransformParamsPtr params_,
+        SortDescription description_,
+        size_t max_block_size_);
+
+    void initialize(Inputs inputs) override;
+    void consume(Input & input, size_t source_num) override;
+    Status merge() override;
+
+private:
+    Chunk aggregate();
+    void addToAggregation();
+
+    struct State
+    {
+        size_t num_rows;
+        Columns all_columns;
+        ColumnRawPtrs sorting_columns;
+
+        /// Number of row starting from which need to aggregate.
+        size_t current_row = 0;
+
+        /// Number of row up to which need to aggregate (not included).
+        size_t to_row = 0;
+
+        State(const Chunk & chunk, const SortDescription & description);
+        bool isValid() const { return current_row < num_rows; }
+    };
+
+    Block header;
+    size_t num_inputs;
+    AggregatingTransformParamsPtr params;
+    SortDescription description;
+    size_t max_block_size;
+
+    Inputs current_inputs;
+    std::vector<State> states;
+    std::vector<size_t> inputs_to_update;
+    BlocksList blocks;
+    size_t accumulated_rows = 0;
+};
+
+}
diff --git a/src/Processors/Merges/FinishAggregatingInOrderTransform.h b/src/Processors/Merges/FinishAggregatingInOrderTransform.h
new file mode 100644
index 00000000000..4f9e53bd7d5
--- /dev/null
+++ b/src/Processors/Merges/FinishAggregatingInOrderTransform.h
@@ -0,0 +1,34 @@
+#pragma once
+
+#include <Processors/Merges/IMergingTransform.h>
+#include <Processors/Merges/Algorithms/FinishAggregatingInOrderAlgorithm.h>
+
+namespace DB
+{
+
+class ColumnAggregateFunction;
+
+/// Implementation of IMergingTransform via FinishAggregatingInOrderAlgorithm.
+class FinishAggregatingInOrderTransform final : public IMergingTransform<FinishAggregatingInOrderAlgorithm>
+{
+public:
+    FinishAggregatingInOrderTransform(
+        const Block & header,
+        size_t num_inputs,
+        AggregatingTransformParamsPtr params,
+        SortDescription description,
+        size_t max_block_size)
+        : IMergingTransform(
+            num_inputs, header, header, true,
+            header,
+            num_inputs,
+            params,
+            std::move(description),
+            max_block_size)
+    {
+    }
+
+    String getName() const override { return "FinishAggregatingInOrderTransform"; }
+};
+
+}
diff --git a/src/Processors/Pipe.cpp b/src/Processors/Pipe.cpp
index 129bebf452a..044975448ad 100644
--- a/src/Processors/Pipe.cpp
+++ b/src/Processors/Pipe.cpp
@@ -8,6 +8,7 @@
 #include <Processors/Transforms/ExtremesTransform.h>
 #include <Processors/Formats/IOutputFormat.h>
 #include <Processors/Sources/NullSource.h>
+#include <Columns/ColumnConst.h>
 
 namespace DB
 {
@@ -250,12 +251,53 @@ static Pipes removeEmptyPipes(Pipes pipes)
     return res;
 }
 
-Pipe Pipe::unitePipes(Pipes pipes)
+/// Calculate common header for pipes.
+/// This function is needed only to remove ColumnConst from common header in case if some columns are const, and some not.
+/// E.g. if the first header is `x, const y, const z` and the second is `const x, y, const z`, the common header will be `x, y, const z`.
+static Block getCommonHeader(const Pipes & pipes)
 {
-    return Pipe::unitePipes(std::move(pipes), nullptr);
+    Block res;
+
+    for (const auto & pipe : pipes)
+    {
+        if (const auto & header = pipe.getHeader())
+        {
+            res = header;
+            break;
+        }
+    }
+
+    for (const auto & pipe : pipes)
+    {
+        const auto & header = pipe.getHeader();
+        for (size_t i = 0; i < res.columns(); ++i)
+        {
+            /// We do not check that headers are compatible here. Will do it later.
+
+            if (i >= header.columns())
+                break;
+
+            auto & common = res.getByPosition(i).column;
+            const auto & cur = header.getByPosition(i).column;
+
+            /// Only remove const from common header if it is not const for current pipe.
+            if (cur && common && !isColumnConst(*cur))
+            {
+                if (const auto * column_const = typeid_cast<const ColumnConst *>(common.get()))
+                    common = column_const->getDataColumnPtr();
+            }
+        }
+    }
+
+    return res;
 }
 
-Pipe Pipe::unitePipes(Pipes pipes, Processors * collected_processors)
+Pipe Pipe::unitePipes(Pipes pipes)
+{
+    return Pipe::unitePipes(std::move(pipes), nullptr, false);
+}
+
+Pipe Pipe::unitePipes(Pipes pipes, Processors * collected_processors, bool allow_empty_header)
 {
     Pipe res;
 
@@ -275,12 +317,14 @@ Pipe Pipe::unitePipes(Pipes pipes, Processors * collected_processors)
 
     OutputPortRawPtrs totals;
     OutputPortRawPtrs extremes;
-    res.header = pipes.front().header;
     res.collected_processors = collected_processors;
+    res.header = getCommonHeader(pipes);
 
     for (auto & pipe : pipes)
     {
-        assertBlocksHaveEqualStructure(res.header, pipe.header, "Pipe::unitePipes");
+        if (!allow_empty_header || pipe.header)
+            assertCompatibleHeader(pipe.header, res.header, "Pipe::unitePipes");
+
         res.processors.insert(res.processors.end(), pipe.processors.begin(), pipe.processors.end());
         res.output_ports.insert(res.output_ports.end(), pipe.output_ports.begin(), pipe.output_ports.end());
 
diff --git a/src/Processors/Pipe.h b/src/Processors/Pipe.h
index f21f4761977..4ba08787579 100644
--- a/src/Processors/Pipe.h
+++ b/src/Processors/Pipe.h
@@ -1,8 +1,9 @@
 #pragma once
+
 #include <Processors/IProcessor.h>
-#include <Processors/Sources/SourceWithProgress.h>
 #include <Processors/QueryPlan/QueryIdHolder.h>
 #include <Processors/QueryPlan/QueryPlan.h>
+#include <Processors/Sources/SourceWithProgress.h>
 
 namespace DB
 {
@@ -155,7 +156,7 @@ private:
     /// This methods are for QueryPipeline. It is allowed to complete graph only there.
     /// So, we may be sure that Pipe always has output port if not empty.
     bool isCompleted() const { return !empty() && output_ports.empty(); }
-    static Pipe unitePipes(Pipes pipes, Processors * collected_processors);
+    static Pipe unitePipes(Pipes pipes, Processors * collected_processors, bool allow_empty_header);
     void setSinks(const Pipe::ProcessorGetterWithStreamKind & getter);
     void setOutputFormat(ProcessorPtr output);
 
diff --git a/src/Processors/Port.cpp b/src/Processors/Port.cpp
index 7e7ccb1adad..0a6026b27f2 100644
--- a/src/Processors/Port.cpp
+++ b/src/Processors/Port.cpp
@@ -16,7 +16,7 @@ void connect(OutputPort & output, InputPort & input)
     auto out_name = output.getProcessor().getName();
     auto in_name = input.getProcessor().getName();
 
-    assertBlocksHaveEqualStructure(input.getHeader(), output.getHeader(), " function connect between " + out_name + " and " + in_name);
+    assertCompatibleHeader(output.getHeader(), input.getHeader(), " function connect between " + out_name + " and " + in_name);
 
     input.output_port = &output;
     output.input_port = &input;
diff --git a/src/Processors/QueryPipeline.cpp b/src/Processors/QueryPipeline.cpp
index 97d753bf5fb..1b803ec0886 100644
--- a/src/Processors/QueryPipeline.cpp
+++ b/src/Processors/QueryPipeline.cpp
@@ -211,10 +211,14 @@ void QueryPipeline::setOutputFormat(ProcessorPtr output)
 
 QueryPipeline QueryPipeline::unitePipelines(
     std::vector<std::unique_ptr<QueryPipeline>> pipelines,
-    const Block & common_header,
     size_t max_threads_limit,
     Processors * collected_processors)
 {
+    if (pipelines.empty())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot unite an empty set of pipelines");
+
+    Block common_header = pipelines.front()->getHeader();
+
     /// Should we limit the number of threads for united pipeline. True if all pipelines have max_threads != 0.
     /// If true, result max_threads will be sum(max_threads).
     /// Note: it may be > than settings.max_threads, so we should apply this limit again.
@@ -228,20 +232,6 @@ QueryPipeline QueryPipeline::unitePipelines(
         pipeline.checkInitialized();
         pipeline.pipe.collected_processors = collected_processors;
 
-        if (!pipeline.isCompleted())
-        {
-            auto actions_dag = ActionsDAG::makeConvertingActions(
-                    pipeline.getHeader().getColumnsWithTypeAndName(),
-                    common_header.getColumnsWithTypeAndName(),
-                    ActionsDAG::MatchColumnsMode::Position);
-            auto actions = std::make_shared<ExpressionActions>(actions_dag);
-
-            pipeline.addSimpleTransform([&](const Block & header)
-            {
-               return std::make_shared<ExpressionTransform>(header, actions);
-            });
-        }
-
         pipes.emplace_back(std::move(pipeline.pipe));
 
         max_threads += pipeline.max_threads;
@@ -254,7 +244,7 @@ QueryPipeline QueryPipeline::unitePipelines(
     }
 
     QueryPipeline pipeline;
-    pipeline.init(Pipe::unitePipes(std::move(pipes), collected_processors));
+    pipeline.init(Pipe::unitePipes(std::move(pipes), collected_processors, false));
 
     if (will_limit_max_threads)
     {
@@ -266,7 +256,7 @@ QueryPipeline QueryPipeline::unitePipelines(
 }
 
 
-void QueryPipeline::addCreatingSetsTransform(const Block & res_header, SubqueryForSet subquery_for_set, const SizeLimits & limits, const Context & context)
+void QueryPipeline::addCreatingSetsTransform(const Block & res_header, SubqueryForSet subquery_for_set, const SizeLimits & limits, ContextPtr context)
 {
     resize(1);
 
@@ -288,7 +278,9 @@ void QueryPipeline::addCreatingSetsTransform(const Block & res_header, SubqueryF
 void QueryPipeline::addPipelineBefore(QueryPipeline pipeline)
 {
     checkInitializedAndNotCompleted();
-    assertBlocksHaveEqualStructure(getHeader(), pipeline.getHeader(), "QueryPipeline");
+    if (pipeline.getHeader())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Pipeline for CreatingSets should have empty header. Got: {}",
+                        pipeline.getHeader().dumpStructure());
 
     IProcessor::PortNumbers delayed_streams(pipe.numOutputPorts());
     for (size_t i = 0; i < delayed_streams.size(); ++i)
@@ -299,7 +291,7 @@ void QueryPipeline::addPipelineBefore(QueryPipeline pipeline)
     Pipes pipes;
     pipes.emplace_back(std::move(pipe));
     pipes.emplace_back(QueryPipeline::getPipe(std::move(pipeline)));
-    pipe = Pipe::unitePipes(std::move(pipes), collected_processors);
+    pipe = Pipe::unitePipes(std::move(pipes), collected_processors, true);
 
     auto processor = std::make_shared<DelayedPortsProcessor>(getHeader(), pipe.numOutputPorts(), delayed_streams, true);
     addTransform(std::move(processor));
diff --git a/src/Processors/QueryPipeline.h b/src/Processors/QueryPipeline.h
index d459faae997..ac0777d22c6 100644
--- a/src/Processors/QueryPipeline.h
+++ b/src/Processors/QueryPipeline.h
@@ -1,19 +1,16 @@
 #pragma once
-#include <Processors/IProcessor.h>
-#include <Processors/Executors/PipelineExecutor.h>
-#include <Processors/Pipe.h>
 
 #include <DataStreams/IBlockInputStream.h>
 #include <DataStreams/IBlockOutputStream.h>
-
+#include <Processors/Executors/PipelineExecutor.h>
+#include <Processors/IProcessor.h>
+#include <Processors/Pipe.h>
 #include <Storages/IStorage_fwd.h>
 #include <Storages/TableLockHolder.h>
 
 namespace DB
 {
 
-class Context;
-
 class IOutputFormat;
 
 class QueryPipelineProcessorsCollector;
@@ -28,6 +25,8 @@ using SubqueriesForSets = std::unordered_map<String, SubqueryForSet>;
 
 struct SizeLimits;
 
+struct ExpressionActionsSettings;
+
 class QueryPipeline
 {
 public:
@@ -88,15 +87,15 @@ public:
     /// If collector is used, it will collect only newly-added processors, but not processors from pipelines.
     static QueryPipeline unitePipelines(
             std::vector<std::unique_ptr<QueryPipeline>> pipelines,
-            const Block & common_header,
             size_t max_threads_limit = 0,
             Processors * collected_processors = nullptr);
 
     /// Add other pipeline and execute it before current one.
-    /// Pipeline must have same header.
+    /// Pipeline must have empty header, it should not generate any chunk.
+    /// This is used for CreatingSets.
     void addPipelineBefore(QueryPipeline pipeline);
 
-    void addCreatingSetsTransform(const Block & res_header, SubqueryForSet subquery_for_set, const SizeLimits & limits, const Context & context);
+    void addCreatingSetsTransform(const Block & res_header, SubqueryForSet subquery_for_set, const SizeLimits & limits, ContextPtr context);
 
     PipelineExecutorPtr execute();
 
diff --git a/src/Processors/QueryPlan/AddingDelayedSourceStep.cpp b/src/Processors/QueryPlan/AddingDelayedSourceStep.cpp
deleted file mode 100644
index 99db95059a0..00000000000
--- a/src/Processors/QueryPlan/AddingDelayedSourceStep.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-#include <Processors/QueryPlan/AddingDelayedSourceStep.h>
-#include <Processors/QueryPipeline.h>
-
-namespace DB
-{
-
-static ITransformingStep::Traits getTraits()
-{
-    return ITransformingStep::Traits
-    {
-        {
-            .preserves_distinct_columns = false,
-            .returns_single_stream = false,
-            .preserves_number_of_streams = false,
-            .preserves_sorting = false,
-        },
-        {
-            .preserves_number_of_rows = false, /// New rows are added from delayed stream
-        }
-    };
-}
-
-AddingDelayedSourceStep::AddingDelayedSourceStep(
-    const DataStream & input_stream_,
-    ProcessorPtr source_)
-    : ITransformingStep(input_stream_, input_stream_.header, getTraits())
-    , source(std::move(source_))
-{
-}
-
-void AddingDelayedSourceStep::transformPipeline(QueryPipeline & pipeline)
-{
-    source->setQueryPlanStep(this);
-    pipeline.addDelayedStream(source);
-
-    /// Now, after adding delayed stream, it has implicit dependency on other port.
-    /// Here we add resize processor to remove this dependency.
-    /// Otherwise, if we add MergeSorting + MergingSorted transform to pipeline, we could get `Pipeline stuck`
-    pipeline.resize(pipeline.getNumStreams(), true);
-}
-
-}
diff --git a/src/Processors/QueryPlan/AddingDelayedSourceStep.h b/src/Processors/QueryPlan/AddingDelayedSourceStep.h
deleted file mode 100644
index 5ea8f23008b..00000000000
--- a/src/Processors/QueryPlan/AddingDelayedSourceStep.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#pragma once
-#include <Processors/QueryPlan/ITransformingStep.h>
-#include <DataStreams/SizeLimits.h>
-
-namespace DB
-{
-
-class IProcessor;
-using ProcessorPtr = std::shared_ptr<IProcessor>;
-
-/// Adds another source to pipeline. Data from this source will be read after data from all other sources.
-/// NOTE: tis step is needed because of non-joined data from JOIN. Remove this step after adding JoinStep.
-class AddingDelayedSourceStep : public ITransformingStep
-{
-public:
-    AddingDelayedSourceStep(
-            const DataStream & input_stream_,
-            ProcessorPtr source_);
-
-    String getName() const override { return "AddingDelayedSource"; }
-
-    void transformPipeline(QueryPipeline & pipeline) override;
-
-private:
-    ProcessorPtr source;
-};
-
-}
diff --git a/src/Processors/QueryPlan/AggregatingStep.cpp b/src/Processors/QueryPlan/AggregatingStep.cpp
index e8d4a262366..daa6e4981bb 100644
--- a/src/Processors/QueryPlan/AggregatingStep.cpp
+++ b/src/Processors/QueryPlan/AggregatingStep.cpp
@@ -3,6 +3,7 @@
 #include <Processors/Transforms/AggregatingTransform.h>
 #include <Processors/Transforms/AggregatingInOrderTransform.h>
 #include <Processors/Merges/AggregatingSortedTransform.h>
+#include <Processors/Merges/FinishAggregatingInOrderTransform.h>
 
 namespace DB
 {
@@ -45,7 +46,7 @@ AggregatingStep::AggregatingStep(
 {
 }
 
-void AggregatingStep::transformPipeline(QueryPipeline & pipeline)
+void AggregatingStep::transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &)
 {
     QueryPipelineProcessorsCollector collector(pipeline, this);
 
@@ -95,9 +96,10 @@ void AggregatingStep::transformPipeline(QueryPipeline & pipeline)
                     }
                 }
 
-                auto transform = std::make_shared<AggregatingSortedTransform>(
+                auto transform = std::make_shared<FinishAggregatingInOrderTransform>(
                     pipeline.getHeader(),
                     pipeline.getNumStreams(),
+                    transform_params,
                     group_by_sort_description,
                     max_block_size);
 
diff --git a/src/Processors/QueryPlan/AggregatingStep.h b/src/Processors/QueryPlan/AggregatingStep.h
index 853173895b3..c29a3cc2836 100644
--- a/src/Processors/QueryPlan/AggregatingStep.h
+++ b/src/Processors/QueryPlan/AggregatingStep.h
@@ -27,11 +27,13 @@ public:
 
     String getName() const override { return "Aggregating"; }
 
-    void transformPipeline(QueryPipeline & pipeline) override;
+    void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &) override;
 
     void describeActions(FormatSettings &) const override;
     void describePipeline(FormatSettings & settings) const override;
 
+    const Aggregator::Params & getParams() const { return params; }
+
 private:
     Aggregator::Params params;
     bool final;
diff --git a/src/Processors/QueryPlan/ArrayJoinStep.cpp b/src/Processors/QueryPlan/ArrayJoinStep.cpp
index b71d2176e52..7e82ec87353 100644
--- a/src/Processors/QueryPlan/ArrayJoinStep.cpp
+++ b/src/Processors/QueryPlan/ArrayJoinStep.cpp
@@ -46,7 +46,7 @@ void ArrayJoinStep::updateInputStream(DataStream input_stream, Block result_head
     res_header = std::move(result_header);
 }
 
-void ArrayJoinStep::transformPipeline(QueryPipeline & pipeline)
+void ArrayJoinStep::transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings & settings)
 {
     pipeline.addSimpleTransform([&](const Block & header, QueryPipeline::StreamType stream_type)
     {
@@ -60,7 +60,7 @@ void ArrayJoinStep::transformPipeline(QueryPipeline & pipeline)
                 pipeline.getHeader().getColumnsWithTypeAndName(),
                 res_header.getColumnsWithTypeAndName(),
                 ActionsDAG::MatchColumnsMode::Name);
-        auto actions = std::make_shared<ExpressionActions>(actions_dag);
+        auto actions = std::make_shared<ExpressionActions>(actions_dag, settings.getActionsSettings());
 
         pipeline.addSimpleTransform([&](const Block & header)
         {
diff --git a/src/Processors/QueryPlan/ArrayJoinStep.h b/src/Processors/QueryPlan/ArrayJoinStep.h
index 92c7e0a1304..db1b4187549 100644
--- a/src/Processors/QueryPlan/ArrayJoinStep.h
+++ b/src/Processors/QueryPlan/ArrayJoinStep.h
@@ -13,7 +13,7 @@ public:
     explicit ArrayJoinStep(const DataStream & input_stream_, ArrayJoinActionPtr array_join_);
     String getName() const override { return "ArrayJoin"; }
 
-    void transformPipeline(QueryPipeline & pipeline) override;
+    void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings & settings) override;
 
     void describeActions(FormatSettings & settings) const override;
 
diff --git a/src/Processors/QueryPlan/BuildQueryPipelineSettings.cpp b/src/Processors/QueryPlan/BuildQueryPipelineSettings.cpp
new file mode 100644
index 00000000000..9691da4a362
--- /dev/null
+++ b/src/Processors/QueryPlan/BuildQueryPipelineSettings.cpp
@@ -0,0 +1,21 @@
+#include <Processors/QueryPlan/BuildQueryPipelineSettings.h>
+#include <Core/Settings.h>
+#include <Interpreters/ExpressionActions.h>
+#include <Interpreters/Context.h>
+
+namespace DB
+{
+
+BuildQueryPipelineSettings BuildQueryPipelineSettings::fromSettings(const Settings & from)
+{
+    BuildQueryPipelineSettings settings;
+    settings.actions_settings = ExpressionActionsSettings::fromSettings(from);
+    return settings;
+}
+
+BuildQueryPipelineSettings BuildQueryPipelineSettings::fromContext(ContextPtr from)
+{
+    return fromSettings(from->getSettingsRef());
+}
+
+}
diff --git a/src/Processors/QueryPlan/BuildQueryPipelineSettings.h b/src/Processors/QueryPlan/BuildQueryPipelineSettings.h
new file mode 100644
index 00000000000..c3282d43778
--- /dev/null
+++ b/src/Processors/QueryPlan/BuildQueryPipelineSettings.h
@@ -0,0 +1,22 @@
+#pragma once
+
+#include <Interpreters/ExpressionActionsSettings.h>
+
+#include <cstddef>
+
+namespace DB
+{
+
+struct Settings;
+
+struct BuildQueryPipelineSettings
+{
+    ExpressionActionsSettings actions_settings;
+
+    const ExpressionActionsSettings & getActionsSettings() const { return actions_settings; }
+
+    static BuildQueryPipelineSettings fromSettings(const Settings & from);
+    static BuildQueryPipelineSettings fromContext(ContextPtr from);
+};
+
+}
diff --git a/src/Processors/QueryPlan/CreatingSetsStep.cpp b/src/Processors/QueryPlan/CreatingSetsStep.cpp
index 5868a7045f7..9ea8e7b237b 100644
--- a/src/Processors/QueryPlan/CreatingSetsStep.cpp
+++ b/src/Processors/QueryPlan/CreatingSetsStep.cpp
@@ -2,6 +2,7 @@
 #include <Processors/QueryPipeline.h>
 #include <Processors/Transforms/CreatingSetsTransform.h>
 #include <IO/Operators.h>
+#include <Interpreters/ExpressionActions.h>
 
 namespace DB
 {
@@ -29,22 +30,21 @@ static ITransformingStep::Traits getTraits()
 
 CreatingSetStep::CreatingSetStep(
     const DataStream & input_stream_,
-    Block header,
     String description_,
     SubqueryForSet subquery_for_set_,
     SizeLimits network_transfer_limits_,
-    const Context & context_)
-    : ITransformingStep(input_stream_, header, getTraits())
+    ContextPtr context_)
+    : ITransformingStep(input_stream_, Block{}, getTraits())
+    , WithContext(context_)
     , description(std::move(description_))
     , subquery_for_set(std::move(subquery_for_set_))
     , network_transfer_limits(std::move(network_transfer_limits_))
-    , context(context_)
 {
 }
 
-void CreatingSetStep::transformPipeline(QueryPipeline & pipeline)
+void CreatingSetStep::transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &)
 {
-    pipeline.addCreatingSetsTransform(getOutputStream().header, std::move(subquery_for_set), network_transfer_limits, context);
+    pipeline.addCreatingSetsTransform(getOutputStream().header, std::move(subquery_for_set), network_transfer_limits, getContext());
 }
 
 void CreatingSetStep::describeActions(FormatSettings & settings) const
@@ -69,10 +69,12 @@ CreatingSetsStep::CreatingSetsStep(DataStreams input_streams_)
     output_stream = input_streams.front();
 
     for (size_t i = 1; i < input_streams.size(); ++i)
-        assertBlocksHaveEqualStructure(output_stream->header, input_streams[i].header, "CreatingSets");
+        if (input_streams[i].header)
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Creating set input must have empty header. Got: {}",
+                            input_streams[i].header.dumpStructure());
 }
 
-QueryPipelinePtr CreatingSetsStep::updatePipeline(QueryPipelines pipelines)
+QueryPipelinePtr CreatingSetsStep::updatePipeline(QueryPipelines pipelines, const BuildQueryPipelineSettings &)
 {
     if (pipelines.empty())
         throw Exception("CreatingSetsStep cannot be created with no inputs", ErrorCodes::LOGICAL_ERROR);
@@ -81,14 +83,13 @@ QueryPipelinePtr CreatingSetsStep::updatePipeline(QueryPipelines pipelines)
     if (pipelines.size() == 1)
         return main_pipeline;
 
-    std::swap(pipelines.front(), pipelines.back());
-    pipelines.pop_back();
+    pipelines.erase(pipelines.begin());
 
     QueryPipeline delayed_pipeline;
     if (pipelines.size() > 1)
     {
         QueryPipelineProcessorsCollector collector(delayed_pipeline, this);
-        delayed_pipeline = QueryPipeline::unitePipelines(std::move(pipelines), output_stream->header);
+        delayed_pipeline = QueryPipeline::unitePipelines(std::move(pipelines));
         processors = collector.detachProcessors();
     }
     else
@@ -108,7 +109,7 @@ void CreatingSetsStep::describePipeline(FormatSettings & settings) const
 }
 
 void addCreatingSetsStep(
-    QueryPlan & query_plan, SubqueriesForSets subqueries_for_sets, const SizeLimits & limits, const Context & context)
+    QueryPlan & query_plan, SubqueriesForSets subqueries_for_sets, const SizeLimits & limits, ContextPtr context)
 {
     DataStreams input_streams;
     input_streams.emplace_back(query_plan.getCurrentDataStream());
@@ -128,7 +129,6 @@ void addCreatingSetsStep(
 
         auto creating_set = std::make_unique<CreatingSetStep>(
                 plan->getCurrentDataStream(),
-                input_streams.front().header,
                 std::move(description),
                 std::move(set),
                 limits,
diff --git a/src/Processors/QueryPlan/CreatingSetsStep.h b/src/Processors/QueryPlan/CreatingSetsStep.h
index ec13ab2052e..c2b452ecdf5 100644
--- a/src/Processors/QueryPlan/CreatingSetsStep.h
+++ b/src/Processors/QueryPlan/CreatingSetsStep.h
@@ -1,26 +1,27 @@
 #pragma once
+
 #include <Processors/QueryPlan/ITransformingStep.h>
 #include <DataStreams/SizeLimits.h>
 #include <Interpreters/SubqueryForSet.h>
+#include <Interpreters/Context_fwd.h>
 
 namespace DB
 {
 
 /// Creates sets for subqueries and JOIN. See CreatingSetsTransform.
-class CreatingSetStep : public ITransformingStep
+class CreatingSetStep : public ITransformingStep, WithContext
 {
 public:
     CreatingSetStep(
             const DataStream & input_stream_,
-            Block header,
             String description_,
             SubqueryForSet subquery_for_set_,
             SizeLimits network_transfer_limits_,
-            const Context & context_);
+            ContextPtr context_);
 
     String getName() const override { return "CreatingSet"; }
 
-    void transformPipeline(QueryPipeline & pipeline) override;
+    void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &) override;
 
     void describeActions(FormatSettings & settings) const override;
 
@@ -28,17 +29,16 @@ private:
     String description;
     SubqueryForSet subquery_for_set;
     SizeLimits network_transfer_limits;
-    const Context & context;
 };
 
 class CreatingSetsStep : public IQueryPlanStep
 {
 public:
-    CreatingSetsStep(DataStreams input_streams_);
+    explicit CreatingSetsStep(DataStreams input_streams_);
 
     String getName() const override { return "CreatingSets"; }
 
-    QueryPipelinePtr updatePipeline(QueryPipelines pipelines) override;
+    QueryPipelinePtr updatePipeline(QueryPipelines pipelines, const BuildQueryPipelineSettings &) override;
 
     void describePipeline(FormatSettings & settings) const override;
 
@@ -50,6 +50,6 @@ void addCreatingSetsStep(
     QueryPlan & query_plan,
     SubqueriesForSets subqueries_for_sets,
     const SizeLimits & limits,
-    const Context & context);
+    ContextPtr context);
 
 }
diff --git a/src/Processors/QueryPlan/CubeStep.cpp b/src/Processors/QueryPlan/CubeStep.cpp
index de8bb2b3d43..1a3016b7106 100644
--- a/src/Processors/QueryPlan/CubeStep.cpp
+++ b/src/Processors/QueryPlan/CubeStep.cpp
@@ -30,7 +30,7 @@ CubeStep::CubeStep(const DataStream & input_stream_, AggregatingTransformParamsP
         output_stream->distinct_columns.insert(params->params.src_header.getByPosition(key).name);
 }
 
-void CubeStep::transformPipeline(QueryPipeline & pipeline)
+void CubeStep::transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &)
 {
     pipeline.resize(1);
 
@@ -43,4 +43,9 @@ void CubeStep::transformPipeline(QueryPipeline & pipeline)
     });
 }
 
+const Aggregator::Params & CubeStep::getParams() const
+{
+    return params->params;
+}
+
 }
diff --git a/src/Processors/QueryPlan/CubeStep.h b/src/Processors/QueryPlan/CubeStep.h
index 707f62ce7d6..0e06ffc598a 100644
--- a/src/Processors/QueryPlan/CubeStep.h
+++ b/src/Processors/QueryPlan/CubeStep.h
@@ -1,6 +1,7 @@
 #pragma once
 #include <Processors/QueryPlan/ITransformingStep.h>
 #include <DataStreams/SizeLimits.h>
+#include <Interpreters/Aggregator.h>
 
 namespace DB
 {
@@ -16,8 +17,9 @@ public:
 
     String getName() const override { return "Cube"; }
 
-    void transformPipeline(QueryPipeline & pipeline) override;
+    void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &) override;
 
+    const Aggregator::Params & getParams() const;
 private:
     AggregatingTransformParamsPtr params;
 };
diff --git a/src/Processors/QueryPlan/DistinctStep.cpp b/src/Processors/QueryPlan/DistinctStep.cpp
index 60966b08beb..ecd7918118b 100644
--- a/src/Processors/QueryPlan/DistinctStep.cpp
+++ b/src/Processors/QueryPlan/DistinctStep.cpp
@@ -62,7 +62,7 @@ DistinctStep::DistinctStep(
     }
 }
 
-void DistinctStep::transformPipeline(QueryPipeline & pipeline)
+void DistinctStep::transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &)
 {
     if (checkColumnsAlreadyDistinct(columns, input_streams.front().distinct_columns))
         return;
diff --git a/src/Processors/QueryPlan/DistinctStep.h b/src/Processors/QueryPlan/DistinctStep.h
index 4bfd73ce044..f4a5647fbc7 100644
--- a/src/Processors/QueryPlan/DistinctStep.h
+++ b/src/Processors/QueryPlan/DistinctStep.h
@@ -18,7 +18,7 @@ public:
 
     String getName() const override { return "Distinct"; }
 
-    void transformPipeline(QueryPipeline & pipeline) override;
+    void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &) override;
 
     void describeActions(FormatSettings & settings) const override;
 
diff --git a/src/Processors/QueryPlan/ExpressionStep.cpp b/src/Processors/QueryPlan/ExpressionStep.cpp
index e23954cc063..c85092edf05 100644
--- a/src/Processors/QueryPlan/ExpressionStep.cpp
+++ b/src/Processors/QueryPlan/ExpressionStep.cpp
@@ -4,6 +4,8 @@
 #include <Processors/Transforms/JoiningTransform.h>
 #include <Interpreters/ExpressionActions.h>
 #include <IO/Operators.h>
+#include <Processors/Sources/SourceFromInputStream.h>
+#include <Interpreters/JoinSwitcher.h>
 
 namespace DB
 {
@@ -43,7 +45,7 @@ static ITransformingStep::Traits getJoinTraits()
 ExpressionStep::ExpressionStep(const DataStream & input_stream_, ActionsDAGPtr actions_dag_)
     : ITransformingStep(
         input_stream_,
-        Transform::transformHeader(input_stream_.header, std::make_shared<ExpressionActions>(actions_dag_)),
+        Transform::transformHeader(input_stream_.header, std::make_shared<ExpressionActions>(actions_dag_, ExpressionActionsSettings{})),
         getTraits(actions_dag_))
     , actions_dag(std::move(actions_dag_))
 {
@@ -54,7 +56,8 @@ ExpressionStep::ExpressionStep(const DataStream & input_stream_, ActionsDAGPtr a
 void ExpressionStep::updateInputStream(DataStream input_stream, bool keep_header)
 {
     Block out_header = keep_header ? std::move(output_stream->header)
-                                   : Transform::transformHeader(input_stream.header, std::make_shared<ExpressionActions>(actions_dag));
+                                   : Transform::transformHeader(input_stream.header,
+                                                                std::make_shared<ExpressionActions>(actions_dag, ExpressionActionsSettings{}));
     output_stream = createOutputStream(
             input_stream,
             std::move(out_header),
@@ -64,9 +67,9 @@ void ExpressionStep::updateInputStream(DataStream input_stream, bool keep_header
     input_streams.emplace_back(std::move(input_stream));
 }
 
-void ExpressionStep::transformPipeline(QueryPipeline & pipeline)
+void ExpressionStep::transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings & settings)
 {
-    auto expression = std::make_shared<ExpressionActions>(actions_dag);
+    auto expression = std::make_shared<ExpressionActions>(actions_dag, settings.getActionsSettings());
     pipeline.addSimpleTransform([&](const Block & header)
     {
         return std::make_shared<Transform>(header, expression);
@@ -78,7 +81,7 @@ void ExpressionStep::transformPipeline(QueryPipeline & pipeline)
                 pipeline.getHeader().getColumnsWithTypeAndName(),
                 output_stream->header.getColumnsWithTypeAndName(),
                 ActionsDAG::MatchColumnsMode::Name);
-        auto convert_actions = std::make_shared<ExpressionActions>(convert_actions_dag);
+        auto convert_actions = std::make_shared<ExpressionActions>(convert_actions_dag, settings.getActionsSettings());
 
         pipeline.addSimpleTransform([&](const Block & header)
         {
@@ -92,7 +95,7 @@ void ExpressionStep::describeActions(FormatSettings & settings) const
     String prefix(settings.offset, ' ');
     bool first = true;
 
-    auto expression = std::make_shared<ExpressionActions>(actions_dag);
+    auto expression = std::make_shared<ExpressionActions>(actions_dag, ExpressionActionsSettings{});
     for (const auto & action : expression->getActions())
     {
         settings.out << prefix << (first ? "Actions: "
@@ -107,16 +110,18 @@ void ExpressionStep::describeActions(FormatSettings & settings) const
     settings.out << '\n';
 }
 
-JoinStep::JoinStep(const DataStream & input_stream_, JoinPtr join_)
+JoinStep::JoinStep(const DataStream & input_stream_, JoinPtr join_, bool has_non_joined_rows_, size_t max_block_size_)
     : ITransformingStep(
         input_stream_,
         Transform::transformHeader(input_stream_.header, join_),
         getJoinTraits())
     , join(std::move(join_))
+    , has_non_joined_rows(has_non_joined_rows_)
+    , max_block_size(max_block_size_)
 {
 }
 
-void JoinStep::transformPipeline(QueryPipeline & pipeline)
+void JoinStep::transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &)
 {
     /// In case joined subquery has totals, and we don't, add default chunk to totals.
     bool add_default_totals = false;
@@ -131,6 +136,21 @@ void JoinStep::transformPipeline(QueryPipeline & pipeline)
         bool on_totals = stream_type == QueryPipeline::StreamType::Totals;
         return std::make_shared<Transform>(header, join, on_totals, add_default_totals);
     });
+
+    if (has_non_joined_rows)
+    {
+        const Block & join_result_sample = pipeline.getHeader();
+        auto stream = std::make_shared<LazyNonJoinedBlockInputStream>(*join, join_result_sample, max_block_size);
+        auto source = std::make_shared<SourceFromInputStream>(std::move(stream));
+
+        source->setQueryPlanStep(this);
+        pipeline.addDelayedStream(source);
+
+        /// Now, after adding delayed stream, it has implicit dependency on other port.
+        /// Here we add resize processor to remove this dependency.
+        /// Otherwise, if we add MergeSorting + MergingSorted transform to pipeline, we could get `Pipeline stuck`
+        pipeline.resize(pipeline.getNumStreams(), true);
+    }
 }
 
 }
diff --git a/src/Processors/QueryPlan/ExpressionStep.h b/src/Processors/QueryPlan/ExpressionStep.h
index 60f186688b0..bcc1b0ef7b6 100644
--- a/src/Processors/QueryPlan/ExpressionStep.h
+++ b/src/Processors/QueryPlan/ExpressionStep.h
@@ -22,7 +22,7 @@ public:
     explicit ExpressionStep(const DataStream & input_stream_, ActionsDAGPtr actions_dag_);
     String getName() const override { return "Expression"; }
 
-    void transformPipeline(QueryPipeline & pipeline) override;
+    void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings & settings) override;
 
     void updateInputStream(DataStream input_stream, bool keep_header);
 
@@ -40,13 +40,17 @@ class JoinStep : public ITransformingStep
 public:
     using Transform = JoiningTransform;
 
-    explicit JoinStep(const DataStream & input_stream_, JoinPtr join_);
+    explicit JoinStep(const DataStream & input_stream_, JoinPtr join_, bool has_non_joined_rows_, size_t max_block_size_);
     String getName() const override { return "Join"; }
 
-    void transformPipeline(QueryPipeline & pipeline) override;
+    void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &) override;
+
+    const JoinPtr & getJoin() const { return join; }
 
 private:
     JoinPtr join;
+    bool has_non_joined_rows;
+    size_t max_block_size;
 };
 
 }
diff --git a/src/Processors/QueryPlan/ExtremesStep.cpp b/src/Processors/QueryPlan/ExtremesStep.cpp
index 59dce0b40b7..d3ec403f37e 100644
--- a/src/Processors/QueryPlan/ExtremesStep.cpp
+++ b/src/Processors/QueryPlan/ExtremesStep.cpp
@@ -25,7 +25,7 @@ ExtremesStep::ExtremesStep(const DataStream & input_stream_)
 {
 }
 
-void ExtremesStep::transformPipeline(QueryPipeline & pipeline)
+void ExtremesStep::transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &)
 {
     pipeline.addExtremesTransform();
 }
diff --git a/src/Processors/QueryPlan/ExtremesStep.h b/src/Processors/QueryPlan/ExtremesStep.h
index cd6f27228f9..960b046b955 100644
--- a/src/Processors/QueryPlan/ExtremesStep.h
+++ b/src/Processors/QueryPlan/ExtremesStep.h
@@ -11,7 +11,7 @@ public:
 
     String getName() const override { return "Extremes"; }
 
-    void transformPipeline(QueryPipeline & pipeline) override;
+    void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &) override;
 };
 
 }
diff --git a/src/Processors/QueryPlan/FillingStep.cpp b/src/Processors/QueryPlan/FillingStep.cpp
index 1a8fba97ee2..1bdd4fc468c 100644
--- a/src/Processors/QueryPlan/FillingStep.cpp
+++ b/src/Processors/QueryPlan/FillingStep.cpp
@@ -35,7 +35,7 @@ FillingStep::FillingStep(const DataStream & input_stream_, SortDescription sort_
         throw Exception("FillingStep expects single input", ErrorCodes::LOGICAL_ERROR);
 }
 
-void FillingStep::transformPipeline(QueryPipeline & pipeline)
+void FillingStep::transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &)
 {
     pipeline.addSimpleTransform([&](const Block & header)
     {
diff --git a/src/Processors/QueryPlan/FillingStep.h b/src/Processors/QueryPlan/FillingStep.h
index 85736464a6c..20eb132b7a6 100644
--- a/src/Processors/QueryPlan/FillingStep.h
+++ b/src/Processors/QueryPlan/FillingStep.h
@@ -13,10 +13,12 @@ public:
 
     String getName() const override { return "Filling"; }
 
-    void transformPipeline(QueryPipeline & pipeline) override;
+    void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &) override;
 
     void describeActions(FormatSettings & settings) const override;
 
+    const SortDescription & getSortDescription() const { return sort_description; }
+
 private:
     SortDescription sort_description;
 };
diff --git a/src/Processors/QueryPlan/FilterStep.cpp b/src/Processors/QueryPlan/FilterStep.cpp
index 921c1351511..6930d9563f9 100644
--- a/src/Processors/QueryPlan/FilterStep.cpp
+++ b/src/Processors/QueryPlan/FilterStep.cpp
@@ -31,7 +31,11 @@ FilterStep::FilterStep(
     bool remove_filter_column_)
     : ITransformingStep(
         input_stream_,
-        FilterTransform::transformHeader(input_stream_.header, std::make_shared<ExpressionActions>(actions_dag_), filter_column_name_, remove_filter_column_),
+        FilterTransform::transformHeader(
+            input_stream_.header,
+            std::make_shared<ExpressionActions>(actions_dag_, ExpressionActionsSettings{}),
+            filter_column_name_,
+            remove_filter_column_),
         getTraits(actions_dag_))
     , actions_dag(std::move(actions_dag_))
     , filter_column_name(std::move(filter_column_name_))
@@ -45,7 +49,11 @@ void FilterStep::updateInputStream(DataStream input_stream, bool keep_header)
 {
     Block out_header = std::move(output_stream->header);
     if (keep_header)
-        out_header = FilterTransform::transformHeader(input_stream.header, std::make_shared<ExpressionActions>(actions_dag), filter_column_name, remove_filter_column);
+        out_header = FilterTransform::transformHeader(
+            input_stream.header,
+            std::make_shared<ExpressionActions>(actions_dag, ExpressionActionsSettings{}),
+            filter_column_name,
+            remove_filter_column);
 
     output_stream = createOutputStream(
             input_stream,
@@ -56,9 +64,9 @@ void FilterStep::updateInputStream(DataStream input_stream, bool keep_header)
     input_streams.emplace_back(std::move(input_stream));
 }
 
-void FilterStep::transformPipeline(QueryPipeline & pipeline)
+void FilterStep::transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings & settings)
 {
-    auto expression = std::make_shared<ExpressionActions>(actions_dag);
+    auto expression = std::make_shared<ExpressionActions>(actions_dag, settings.getActionsSettings());
     pipeline.addSimpleTransform([&](const Block & header, QueryPipeline::StreamType stream_type)
     {
         bool on_totals = stream_type == QueryPipeline::StreamType::Totals;
@@ -71,7 +79,7 @@ void FilterStep::transformPipeline(QueryPipeline & pipeline)
                 pipeline.getHeader().getColumnsWithTypeAndName(),
                 output_stream->header.getColumnsWithTypeAndName(),
                 ActionsDAG::MatchColumnsMode::Name);
-        auto convert_actions = std::make_shared<ExpressionActions>(convert_actions_dag);
+        auto convert_actions = std::make_shared<ExpressionActions>(convert_actions_dag, settings.getActionsSettings());
 
         pipeline.addSimpleTransform([&](const Block & header)
         {
@@ -90,7 +98,7 @@ void FilterStep::describeActions(FormatSettings & settings) const
     settings.out << '\n';
 
     bool first = true;
-    auto expression = std::make_shared<ExpressionActions>(actions_dag);
+    auto expression = std::make_shared<ExpressionActions>(actions_dag, ExpressionActionsSettings{});
     for (const auto & action : expression->getActions())
     {
         settings.out << prefix << (first ? "Actions: "
diff --git a/src/Processors/QueryPlan/FilterStep.h b/src/Processors/QueryPlan/FilterStep.h
index 72b02624faa..0cd48691261 100644
--- a/src/Processors/QueryPlan/FilterStep.h
+++ b/src/Processors/QueryPlan/FilterStep.h
@@ -18,7 +18,7 @@ public:
         bool remove_filter_column_);
 
     String getName() const override { return "Filter"; }
-    void transformPipeline(QueryPipeline & pipeline) override;
+    void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings & settings) override;
 
     void updateInputStream(DataStream input_stream, bool keep_header);
 
diff --git a/src/Processors/QueryPlan/FinishSortingStep.cpp b/src/Processors/QueryPlan/FinishSortingStep.cpp
index d883bd0e0dd..d30e0bf9145 100644
--- a/src/Processors/QueryPlan/FinishSortingStep.cpp
+++ b/src/Processors/QueryPlan/FinishSortingStep.cpp
@@ -51,7 +51,7 @@ void FinishSortingStep::updateLimit(size_t limit_)
     }
 }
 
-void FinishSortingStep::transformPipeline(QueryPipeline & pipeline)
+void FinishSortingStep::transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &)
 {
     bool need_finish_sorting = (prefix_description.size() < result_description.size());
     if (pipeline.getNumStreams() > 1)
diff --git a/src/Processors/QueryPlan/FinishSortingStep.h b/src/Processors/QueryPlan/FinishSortingStep.h
index 4bb62037faa..c89f8fee40d 100644
--- a/src/Processors/QueryPlan/FinishSortingStep.h
+++ b/src/Processors/QueryPlan/FinishSortingStep.h
@@ -18,7 +18,7 @@ public:
 
     String getName() const override { return "FinishSorting"; }
 
-    void transformPipeline(QueryPipeline & pipeline) override;
+    void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &) override;
 
     void describeActions(FormatSettings & settings) const override;
 
diff --git a/src/Processors/QueryPlan/IQueryPlanStep.h b/src/Processors/QueryPlan/IQueryPlanStep.h
index dfdbc9df442..2974891e2bf 100644
--- a/src/Processors/QueryPlan/IQueryPlanStep.h
+++ b/src/Processors/QueryPlan/IQueryPlanStep.h
@@ -1,6 +1,7 @@
 #pragma once
 #include <Core/Block.h>
 #include <Core/SortDescription.h>
+#include <Processors/QueryPlan/BuildQueryPipelineSettings.h>
 
 namespace DB
 {
@@ -75,7 +76,7 @@ public:
     ///   * header from each pipeline is the same as header from corresponding input_streams
     /// Result pipeline must contain any number of streams with compatible output header is hasOutputStream(),
     ///   or pipeline should be completed otherwise.
-    virtual QueryPipelinePtr updatePipeline(QueryPipelines pipelines) = 0;
+    virtual QueryPipelinePtr updatePipeline(QueryPipelines pipelines, const BuildQueryPipelineSettings & settings) = 0;
 
     const DataStreams & getInputStreams() const { return input_streams; }
 
@@ -98,6 +99,9 @@ public:
     /// Get detailed description of step actions. This is shown in EXPLAIN query with options `actions = 1`.
     virtual void describeActions(FormatSettings & /*settings*/) const {}
 
+    /// Get detailed description of read-from-storage step indexes (if any). Shown in with options `indexes = 1`.
+    virtual void describeIndexes(FormatSettings & /*settings*/) const {}
+
     /// Get description of processors added in current step. Should be called after updatePipeline().
     virtual void describePipeline(FormatSettings & /*settings*/) const {}
 
diff --git a/src/Processors/QueryPlan/ISourceStep.cpp b/src/Processors/QueryPlan/ISourceStep.cpp
index 1796f033896..ec82e42fa34 100644
--- a/src/Processors/QueryPlan/ISourceStep.cpp
+++ b/src/Processors/QueryPlan/ISourceStep.cpp
@@ -9,11 +9,11 @@ ISourceStep::ISourceStep(DataStream output_stream_)
     output_stream = std::move(output_stream_);
 }
 
-QueryPipelinePtr ISourceStep::updatePipeline(QueryPipelines)
+QueryPipelinePtr ISourceStep::updatePipeline(QueryPipelines, const BuildQueryPipelineSettings & settings)
 {
     auto pipeline = std::make_unique<QueryPipeline>();
     QueryPipelineProcessorsCollector collector(*pipeline, this);
-    initializePipeline(*pipeline);
+    initializePipeline(*pipeline, settings);
     auto added_processors = collector.detachProcessors();
     processors.insert(processors.end(), added_processors.begin(), added_processors.end());
     return pipeline;
diff --git a/src/Processors/QueryPlan/ISourceStep.h b/src/Processors/QueryPlan/ISourceStep.h
index fdb3dd566cb..fbef0fcce38 100644
--- a/src/Processors/QueryPlan/ISourceStep.h
+++ b/src/Processors/QueryPlan/ISourceStep.h
@@ -10,9 +10,9 @@ class ISourceStep : public IQueryPlanStep
 public:
     explicit ISourceStep(DataStream output_stream_);
 
-    QueryPipelinePtr updatePipeline(QueryPipelines pipelines) override;
+    QueryPipelinePtr updatePipeline(QueryPipelines pipelines, const BuildQueryPipelineSettings & settings) override;
 
-    virtual void initializePipeline(QueryPipeline & pipeline) = 0;
+    virtual void initializePipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings & settings) = 0;
 
     void describePipeline(FormatSettings & settings) const override;
 
diff --git a/src/Processors/QueryPlan/ITransformingStep.cpp b/src/Processors/QueryPlan/ITransformingStep.cpp
index cb27bf38278..e71afd94c46 100644
--- a/src/Processors/QueryPlan/ITransformingStep.cpp
+++ b/src/Processors/QueryPlan/ITransformingStep.cpp
@@ -36,16 +36,16 @@ DataStream ITransformingStep::createOutputStream(
 }
 
 
-QueryPipelinePtr ITransformingStep::updatePipeline(QueryPipelines pipelines)
+QueryPipelinePtr ITransformingStep::updatePipeline(QueryPipelines pipelines, const BuildQueryPipelineSettings & settings)
 {
     if (collect_processors)
     {
         QueryPipelineProcessorsCollector collector(*pipelines.front(), this);
-        transformPipeline(*pipelines.front());
+        transformPipeline(*pipelines.front(), settings);
         processors = collector.detachProcessors();
     }
     else
-        transformPipeline(*pipelines.front());
+        transformPipeline(*pipelines.front(), settings);
 
     return std::move(pipelines.front());
 }
diff --git a/src/Processors/QueryPlan/ITransformingStep.h b/src/Processors/QueryPlan/ITransformingStep.h
index bd99478ec37..9abe025729d 100644
--- a/src/Processors/QueryPlan/ITransformingStep.h
+++ b/src/Processors/QueryPlan/ITransformingStep.h
@@ -48,9 +48,9 @@ public:
 
     ITransformingStep(DataStream input_stream, Block output_header, Traits traits, bool collect_processors_ = true);
 
-    QueryPipelinePtr updatePipeline(QueryPipelines pipelines) override;
+    QueryPipelinePtr updatePipeline(QueryPipelines pipelines, const BuildQueryPipelineSettings & settings) override;
 
-    virtual void transformPipeline(QueryPipeline & pipeline) = 0;
+    virtual void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings & settings) = 0;
 
     const TransformTraits & getTransformTraits() const { return transform_traits; }
     const DataStreamTraits & getDataStreamTraits() const { return data_stream_traits; }
diff --git a/src/Processors/QueryPlan/LimitByStep.cpp b/src/Processors/QueryPlan/LimitByStep.cpp
index 9fcf5b60164..78f96d75949 100644
--- a/src/Processors/QueryPlan/LimitByStep.cpp
+++ b/src/Processors/QueryPlan/LimitByStep.cpp
@@ -33,7 +33,7 @@ LimitByStep::LimitByStep(
 }
 
 
-void LimitByStep::transformPipeline(QueryPipeline & pipeline)
+void LimitByStep::transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &)
 {
     pipeline.resize(1);
 
diff --git a/src/Processors/QueryPlan/LimitByStep.h b/src/Processors/QueryPlan/LimitByStep.h
index 9320735640c..7b978286e48 100644
--- a/src/Processors/QueryPlan/LimitByStep.h
+++ b/src/Processors/QueryPlan/LimitByStep.h
@@ -14,7 +14,7 @@ public:
 
     String getName() const override { return "LimitBy"; }
 
-    void transformPipeline(QueryPipeline & pipeline) override;
+    void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &) override;
 
     void describeActions(FormatSettings & settings) const override;
 
diff --git a/src/Processors/QueryPlan/LimitStep.cpp b/src/Processors/QueryPlan/LimitStep.cpp
index 565d05956e5..4c6b4523a54 100644
--- a/src/Processors/QueryPlan/LimitStep.cpp
+++ b/src/Processors/QueryPlan/LimitStep.cpp
@@ -42,7 +42,7 @@ void LimitStep::updateInputStream(DataStream input_stream)
     output_stream = createOutputStream(input_streams.front(), output_stream->header, getDataStreamTraits());
 }
 
-void LimitStep::transformPipeline(QueryPipeline & pipeline)
+void LimitStep::transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &)
 {
     auto transform = std::make_shared<LimitTransform>(
         pipeline.getHeader(), limit, offset, pipeline.getNumStreams(), always_read_till_end, with_ties, description);
diff --git a/src/Processors/QueryPlan/LimitStep.h b/src/Processors/QueryPlan/LimitStep.h
index eea186fea4a..4428acb9ef0 100644
--- a/src/Processors/QueryPlan/LimitStep.h
+++ b/src/Processors/QueryPlan/LimitStep.h
@@ -18,7 +18,7 @@ public:
 
     String getName() const override { return "Limit"; }
 
-    void transformPipeline(QueryPipeline & pipeline) override;
+    void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &) override;
 
     void describeActions(FormatSettings & settings) const override;
 
diff --git a/src/Processors/QueryPlan/MaterializingStep.cpp b/src/Processors/QueryPlan/MaterializingStep.cpp
deleted file mode 100644
index f5313369020..00000000000
--- a/src/Processors/QueryPlan/MaterializingStep.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-#include <Processors/QueryPlan/MaterializingStep.h>
-#include <Processors/QueryPipeline.h>
-#include <Processors/Transforms/MaterializingTransform.h>
-
-#include <DataStreams/materializeBlock.h>
-
-namespace DB
-{
-
-static ITransformingStep::Traits getTraits()
-{
-    return ITransformingStep::Traits
-    {
-        {
-            .preserves_distinct_columns = true,
-            .returns_single_stream = false,
-            .preserves_number_of_streams = true,
-            .preserves_sorting = true,
-        },
-        {
-            .preserves_number_of_rows = true,
-        }
-    };
-}
-
-MaterializingStep::MaterializingStep(const DataStream & input_stream_)
-    : ITransformingStep(input_stream_, materializeBlock(input_stream_.header), getTraits())
-{
-}
-
-void MaterializingStep::transformPipeline(QueryPipeline & pipeline)
-{
-    pipeline.addSimpleTransform([&](const Block & header)
-    {
-        return std::make_shared<MaterializingTransform>(header);
-    });
-}
-
-}
diff --git a/src/Processors/QueryPlan/MaterializingStep.h b/src/Processors/QueryPlan/MaterializingStep.h
deleted file mode 100644
index 72b3133dfe4..00000000000
--- a/src/Processors/QueryPlan/MaterializingStep.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-#include <Processors/QueryPlan/ITransformingStep.h>
-
-namespace DB
-{
-
-/// Materialize constants. See MaterializingTransform.
-class MaterializingStep : public ITransformingStep
-{
-public:
-    explicit MaterializingStep(const DataStream & input_stream_);
-
-    String getName() const override { return "Materializing"; }
-
-    void transformPipeline(QueryPipeline & pipeline) override;
-};
-
-}
diff --git a/src/Processors/QueryPlan/MergeSortingStep.cpp b/src/Processors/QueryPlan/MergeSortingStep.cpp
index b30286130b1..0c5c5cec4e9 100644
--- a/src/Processors/QueryPlan/MergeSortingStep.cpp
+++ b/src/Processors/QueryPlan/MergeSortingStep.cpp
@@ -56,7 +56,7 @@ void MergeSortingStep::updateLimit(size_t limit_)
     }
 }
 
-void MergeSortingStep::transformPipeline(QueryPipeline & pipeline)
+void MergeSortingStep::transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &)
 {
     pipeline.addSimpleTransform([&](const Block & header, QueryPipeline::StreamType stream_type) -> ProcessorPtr
     {
diff --git a/src/Processors/QueryPlan/MergeSortingStep.h b/src/Processors/QueryPlan/MergeSortingStep.h
index a385a8a3e93..9802d1a760e 100644
--- a/src/Processors/QueryPlan/MergeSortingStep.h
+++ b/src/Processors/QueryPlan/MergeSortingStep.h
@@ -24,7 +24,7 @@ public:
 
     String getName() const override { return "MergeSorting"; }
 
-    void transformPipeline(QueryPipeline & pipeline) override;
+    void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &) override;
 
     void describeActions(FormatSettings & settings) const override;
 
diff --git a/src/Processors/QueryPlan/MergingAggregatedStep.cpp b/src/Processors/QueryPlan/MergingAggregatedStep.cpp
index 85bbbeab59a..56e91dcbd71 100644
--- a/src/Processors/QueryPlan/MergingAggregatedStep.cpp
+++ b/src/Processors/QueryPlan/MergingAggregatedStep.cpp
@@ -40,7 +40,7 @@ MergingAggregatedStep::MergingAggregatedStep(
         output_stream->distinct_columns.insert(params->params.intermediate_header.getByPosition(key).name);
 }
 
-void MergingAggregatedStep::transformPipeline(QueryPipeline & pipeline)
+void MergingAggregatedStep::transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &)
 {
     if (!memory_efficient_aggregation)
     {
diff --git a/src/Processors/QueryPlan/MergingAggregatedStep.h b/src/Processors/QueryPlan/MergingAggregatedStep.h
index 5ffceb7f938..2742a040708 100644
--- a/src/Processors/QueryPlan/MergingAggregatedStep.h
+++ b/src/Processors/QueryPlan/MergingAggregatedStep.h
@@ -21,7 +21,7 @@ public:
 
     String getName() const override { return "MergingAggregated"; }
 
-    void transformPipeline(QueryPipeline & pipeline) override;
+    void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &) override;
 
     void describeActions(FormatSettings & settings) const override;
 
diff --git a/src/Processors/QueryPlan/MergingFinal.cpp b/src/Processors/QueryPlan/MergingFinal.cpp
index c1dec231f11..4109c5e7274 100644
--- a/src/Processors/QueryPlan/MergingFinal.cpp
+++ b/src/Processors/QueryPlan/MergingFinal.cpp
@@ -53,7 +53,7 @@ MergingFinal::MergingFinal(
 //    output_stream->sort_mode = DataStream::SortMode::Stream;
 }
 
-void MergingFinal::transformPipeline(QueryPipeline & pipeline)
+void MergingFinal::transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &)
 {
     const auto & header = pipeline.getHeader();
     size_t num_outputs = pipeline.getNumStreams();
diff --git a/src/Processors/QueryPlan/MergingFinal.h b/src/Processors/QueryPlan/MergingFinal.h
index c01f5c7f9a1..5b621e9f4b2 100644
--- a/src/Processors/QueryPlan/MergingFinal.h
+++ b/src/Processors/QueryPlan/MergingFinal.h
@@ -20,7 +20,7 @@ public:
 
     String getName() const override { return "MergingFinal"; }
 
-    void transformPipeline(QueryPipeline & pipeline) override;
+    void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &) override;
 
     void describeActions(FormatSettings & settings) const override;
 
diff --git a/src/Processors/QueryPlan/MergingSortedStep.cpp b/src/Processors/QueryPlan/MergingSortedStep.cpp
index c59540b009f..2c3006dc637 100644
--- a/src/Processors/QueryPlan/MergingSortedStep.cpp
+++ b/src/Processors/QueryPlan/MergingSortedStep.cpp
@@ -46,7 +46,7 @@ void MergingSortedStep::updateLimit(size_t limit_)
     }
 }
 
-void MergingSortedStep::transformPipeline(QueryPipeline & pipeline)
+void MergingSortedStep::transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &)
 {
     /// If there are several streams, then we merge them into one
     if (pipeline.getNumStreams() > 1)
diff --git a/src/Processors/QueryPlan/MergingSortedStep.h b/src/Processors/QueryPlan/MergingSortedStep.h
index 483cfa5e8a7..ac5a7f666c8 100644
--- a/src/Processors/QueryPlan/MergingSortedStep.h
+++ b/src/Processors/QueryPlan/MergingSortedStep.h
@@ -19,7 +19,7 @@ public:
 
     String getName() const override { return "MergingSorted"; }
 
-    void transformPipeline(QueryPipeline & pipeline) override;
+    void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &) override;
 
     void describeActions(FormatSettings & settings) const override;
 
diff --git a/src/Processors/QueryPlan/OffsetStep.cpp b/src/Processors/QueryPlan/OffsetStep.cpp
index 7ac3d3f2110..b455a32d5af 100644
--- a/src/Processors/QueryPlan/OffsetStep.cpp
+++ b/src/Processors/QueryPlan/OffsetStep.cpp
@@ -28,7 +28,7 @@ OffsetStep::OffsetStep(const DataStream & input_stream_, size_t offset_)
 {
 }
 
-void OffsetStep::transformPipeline(QueryPipeline & pipeline)
+void OffsetStep::transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &)
 {
     auto transform = std::make_shared<OffsetTransform>(
             pipeline.getHeader(), offset, pipeline.getNumStreams());
diff --git a/src/Processors/QueryPlan/OffsetStep.h b/src/Processors/QueryPlan/OffsetStep.h
index 17949371edf..c278744ff50 100644
--- a/src/Processors/QueryPlan/OffsetStep.h
+++ b/src/Processors/QueryPlan/OffsetStep.h
@@ -13,7 +13,7 @@ public:
 
     String getName() const override { return "Offset"; }
 
-    void transformPipeline(QueryPipeline & pipeline) override;
+    void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &) override;
 
     void describeActions(FormatSettings & settings) const override;
 
diff --git a/src/Processors/QueryPlan/Optimizations/Optimizations.h b/src/Processors/QueryPlan/Optimizations/Optimizations.h
index 454eab9649a..7e946a71fad 100644
--- a/src/Processors/QueryPlan/Optimizations/Optimizations.h
+++ b/src/Processors/QueryPlan/Optimizations/Optimizations.h
@@ -1,5 +1,6 @@
 #pragma once
 #include <Processors/QueryPlan/QueryPlan.h>
+#include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
 #include <array>
 
 namespace DB
@@ -9,7 +10,7 @@ namespace QueryPlanOptimizations
 {
 
 /// This is the main function which optimizes the whole QueryPlan tree.
-void optimizeTree(QueryPlan::Node & root, QueryPlan::Nodes & nodes);
+void optimizeTree(const QueryPlanOptimizationSettings & settings, QueryPlan::Node & root, QueryPlan::Nodes & nodes);
 
 /// Optimization is a function applied to QueryPlan::Node.
 /// It can read and update subtree of specified node.
@@ -23,6 +24,7 @@ struct Optimization
     using Function = size_t (*)(QueryPlan::Node *, QueryPlan::Nodes &);
     const Function apply = nullptr;
     const char * name;
+    const bool QueryPlanOptimizationSettings::* const is_enabled;
 };
 
 /// Move ARRAY JOIN up if possible.
@@ -38,14 +40,19 @@ size_t trySplitFilter(QueryPlan::Node * node, QueryPlan::Nodes & nodes);
 /// Replace chain `FilterStep -> ExpressionStep` to single FilterStep
 size_t tryMergeExpressions(QueryPlan::Node * parent_node, QueryPlan::Nodes &);
 
+/// Move FilterStep down if possible.
+/// May split FilterStep and push down only part of it.
+size_t tryPushDownFilter(QueryPlan::Node * parent_node, QueryPlan::Nodes & nodes);
+
 inline const auto & getOptimizations()
 {
-    static const std::array<Optimization, 4> optimizations =
+    static const std::array<Optimization, 5> optimizations =
     {{
-        {tryLiftUpArrayJoin, "liftUpArrayJoin"},
-        {tryPushDownLimit, "pushDownLimit"},
-        {trySplitFilter, "splitFilter"},
-        {tryMergeExpressions, "mergeExpressions"},
+        {tryLiftUpArrayJoin, "liftUpArrayJoin", &QueryPlanOptimizationSettings::optimize_plan},
+        {tryPushDownLimit, "pushDownLimit", &QueryPlanOptimizationSettings::optimize_plan},
+        {trySplitFilter, "splitFilter", &QueryPlanOptimizationSettings::optimize_plan},
+        {tryMergeExpressions, "mergeExpressions", &QueryPlanOptimizationSettings::optimize_plan},
+        {tryPushDownFilter, "pushDownFilter", &QueryPlanOptimizationSettings::filter_push_down},
      }};
 
     return optimizations;
diff --git a/src/Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.cpp b/src/Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.cpp
new file mode 100644
index 00000000000..1472fb87a89
--- /dev/null
+++ b/src/Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.cpp
@@ -0,0 +1,22 @@
+#include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
+#include <Core/Settings.h>
+#include <Interpreters/Context.h>
+
+namespace DB
+{
+
+QueryPlanOptimizationSettings QueryPlanOptimizationSettings::fromSettings(const Settings & from)
+{
+    QueryPlanOptimizationSettings settings;
+    settings.optimize_plan = from.query_plan_enable_optimizations;
+    settings.max_optimizations_to_apply = from.query_plan_max_optimizations_to_apply;
+    settings.filter_push_down = from.query_plan_filter_push_down;
+    return settings;
+}
+
+QueryPlanOptimizationSettings QueryPlanOptimizationSettings::fromContext(ContextPtr from)
+{
+    return fromSettings(from->getSettingsRef());
+}
+
+}
diff --git a/src/Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h b/src/Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h
new file mode 100644
index 00000000000..b5a37bf69d6
--- /dev/null
+++ b/src/Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h
@@ -0,0 +1,28 @@
+#pragma once
+
+#include <Interpreters/Context_fwd.h>
+
+#include <cstddef>
+
+namespace DB
+{
+
+struct Settings;
+
+struct QueryPlanOptimizationSettings
+{
+    /// If not zero, throw if too many optimizations were applied to query plan.
+    /// It helps to avoid infinite optimization loop.
+    size_t max_optimizations_to_apply = 0;
+
+    /// If disabled, no optimization applied.
+    bool optimize_plan = true;
+
+    /// If filter push down optimization is enabled.
+    bool filter_push_down = true;
+
+    static QueryPlanOptimizationSettings fromSettings(const Settings & from);
+    static QueryPlanOptimizationSettings fromContext(ContextPtr from);
+};
+
+}
diff --git a/src/Processors/QueryPlan/Optimizations/filterPushDown.cpp b/src/Processors/QueryPlan/Optimizations/filterPushDown.cpp
new file mode 100644
index 00000000000..20813e9f548
--- /dev/null
+++ b/src/Processors/QueryPlan/Optimizations/filterPushDown.cpp
@@ -0,0 +1,293 @@
+#include <Processors/QueryPlan/Optimizations/Optimizations.h>
+#include <Processors/QueryPlan/ITransformingStep.h>
+#include <Processors/QueryPlan/FilterStep.h>
+#include <Processors/QueryPlan/AggregatingStep.h>
+#include <Processors/QueryPlan/ExpressionStep.h>
+#include <Processors/QueryPlan/ArrayJoinStep.h>
+#include <Processors/QueryPlan/CreatingSetsStep.h>
+#include <Processors/QueryPlan/CubeStep.h>
+#include <Processors/QueryPlan/FinishSortingStep.h>
+#include <Processors/QueryPlan/MergeSortingStep.h>
+#include <Processors/QueryPlan/MergingSortedStep.h>
+#include <Processors/QueryPlan/PartialSortingStep.h>
+#include <Processors/QueryPlan/TotalsHavingStep.h>
+#include <Processors/QueryPlan/DistinctStep.h>
+#include <Processors/QueryPlan/UnionStep.h>
+#include <Interpreters/ActionsDAG.h>
+#include <Interpreters/ArrayJoinAction.h>
+#include <Interpreters/TableJoin.h>
+#include <Common/typeid_cast.h>
+#include <DataTypes/DataTypeAggregateFunction.h>
+
+#include <Columns/IColumn.h>
+
+namespace DB::ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+namespace DB::QueryPlanOptimizations
+{
+
+static size_t tryAddNewFilterStep(
+    QueryPlan::Node * parent_node,
+    QueryPlan::Nodes & nodes,
+    const Names & allowed_inputs)
+{
+    QueryPlan::Node * child_node = parent_node->children.front();
+
+    auto & parent = parent_node->step;
+    auto & child = child_node->step;
+
+    auto * filter = static_cast<FilterStep *>(parent.get());
+    const auto & expression = filter->getExpression();
+    const auto & filter_column_name = filter->getFilterColumnName();
+    bool removes_filter = filter->removesFilterColumn();
+
+    // std::cerr << "Filter: \n" << expression->dumpDAG() << std::endl;
+
+    const auto & all_inputs = child->getInputStreams().front().header.getColumnsWithTypeAndName();
+
+    auto split_filter = expression->cloneActionsForFilterPushDown(filter_column_name, removes_filter, allowed_inputs, all_inputs);
+    if (!split_filter)
+        return 0;
+
+    // std::cerr << "===============\n" << expression->dumpDAG() << std::endl;
+    // std::cerr << "---------------\n" << split_filter->dumpDAG() << std::endl;
+
+    const auto * filter_node = expression->tryFindInIndex(filter_column_name);
+    if (!filter_node && !removes_filter)
+        throw Exception(ErrorCodes::LOGICAL_ERROR,
+                        "Filter column {} was removed from ActionsDAG but it is needed in result. DAG:\n{}",
+                        filter_column_name, expression->dumpDAG());
+
+    /// Filter column was replaced to constant.
+    const bool filter_is_constant = filter_node && filter_node->column && isColumnConst(*filter_node->column);
+
+    if (!filter_node || filter_is_constant)
+        /// This means that all predicates of filter were pushed down.
+        /// Replace current actions to expression, as we don't need to filter anything.
+        parent = std::make_unique<ExpressionStep>(child->getOutputStream(), expression);
+
+    /// Add new Filter step before Aggregating.
+    /// Expression/Filter -> Aggregating -> Something
+    auto & node = nodes.emplace_back();
+    node.children.swap(child_node->children);
+    child_node->children.emplace_back(&node);
+    /// Expression/Filter -> Aggregating -> Filter -> Something
+
+    /// New filter column is the first one.
+    auto split_filter_column_name = (*split_filter->getIndex().begin())->result_name;
+    node.step = std::make_unique<FilterStep>(
+            node.children.at(0)->step->getOutputStream(),
+            std::move(split_filter), std::move(split_filter_column_name), true);
+
+    return 3;
+}
+
+static Names getAggregatingKeys(const Aggregator::Params & params)
+{
+    Names keys;
+    keys.reserve(params.keys.size());
+    for (auto pos : params.keys)
+        keys.push_back(params.src_header.getByPosition(pos).name);
+
+    return keys;
+}
+
+size_t tryPushDownFilter(QueryPlan::Node * parent_node, QueryPlan::Nodes & nodes)
+{
+    if (parent_node->children.size() != 1)
+        return 0;
+
+    QueryPlan::Node * child_node = parent_node->children.front();
+
+    auto & parent = parent_node->step;
+    auto & child = child_node->step;
+    auto * filter = typeid_cast<FilterStep *>(parent.get());
+
+    if (!filter)
+        return 0;
+
+    if (filter->getExpression()->hasStatefulFunctions())
+        return 0;
+
+    if (auto * aggregating = typeid_cast<AggregatingStep *>(child.get()))
+    {
+        const auto & params = aggregating->getParams();
+        Names keys = getAggregatingKeys(params);
+
+        if (auto updated_steps = tryAddNewFilterStep(parent_node, nodes, keys))
+            return updated_steps;
+    }
+
+    if (typeid_cast<CreatingSetsStep *>(child.get()))
+    {
+        /// CreatingSets does not change header.
+        /// We can push down filter and update header.
+        ///                       - Something
+        /// Filter - CreatingSets - CreatingSet
+        ///                       - CreatingSet
+        auto input_streams = child->getInputStreams();
+        input_streams.front() = filter->getOutputStream();
+        child = std::make_unique<CreatingSetsStep>(input_streams);
+        std::swap(parent, child);
+        std::swap(parent_node->children, child_node->children);
+        std::swap(parent_node->children.front(), child_node->children.front());
+        ///              - Filter - Something
+        /// CreatingSets - CreatingSet
+        ///              - CreatingSet
+        return 2;
+    }
+
+    if (auto * totals_having = typeid_cast<TotalsHavingStep *>(child.get()))
+    {
+        /// If totals step has HAVING expression, skip it for now.
+        /// TODO:
+        /// We can merge HAVING expression with current filer.
+        /// Also, we can push down part of HAVING which depend only on aggregation keys.
+        if (totals_having->getActions())
+            return 0;
+
+        Names keys;
+        const auto & header = totals_having->getInputStreams().front().header;
+        for (const auto & column : header)
+            if (typeid_cast<const DataTypeAggregateFunction *>(column.type.get()) == nullptr)
+                keys.push_back(column.name);
+
+        /// NOTE: this optimization changes TOTALS value. Example:
+        ///   `select * from (select y, sum(x) from (
+        ///        select number as x, number % 4 as y from numbers(10)
+        ///    ) group by y with totals) where y != 2`
+        /// Optimization will replace totals row `y, sum(x)` from `(0, 45)` to `(0, 37)`.
+        /// It is expected to ok, cause AST optimization `enable_optimize_predicate_expression = 1` also brakes it.
+        if (auto updated_steps = tryAddNewFilterStep(parent_node, nodes, keys))
+            return updated_steps;
+    }
+
+    if (auto * array_join = typeid_cast<ArrayJoinStep *>(child.get()))
+    {
+        const auto & array_join_actions = array_join->arrayJoin();
+        const auto & keys = array_join_actions->columns;
+        const auto & array_join_header = array_join->getInputStreams().front().header;
+
+        Names allowed_inputs;
+        for (const auto & column : array_join_header)
+            if (keys.count(column.name) == 0)
+                allowed_inputs.push_back(column.name);
+
+        // for (const auto & name : allowed_inputs)
+        //     std::cerr << name << std::endl;
+
+        if (auto updated_steps = tryAddNewFilterStep(parent_node, nodes, allowed_inputs))
+            return updated_steps;
+    }
+
+    if (auto * distinct = typeid_cast<DistinctStep *>(child.get()))
+    {
+        Names allowed_inputs = distinct->getOutputStream().header.getNames();
+        if (auto updated_steps = tryAddNewFilterStep(parent_node, nodes, allowed_inputs))
+            return updated_steps;
+    }
+
+    if (auto * join = typeid_cast<JoinStep *>(child.get()))
+    {
+        const auto & table_join  = join->getJoin()->getTableJoin();
+        /// Push down is for left table only. We need to update JoinStep for push down into right.
+        /// Only inner and left join are supported. Other types may generate default values for left table keys.
+        /// So, if we push down a condition like `key != 0`, not all rows may be filtered.
+        if (table_join.kind() == ASTTableJoin::Kind::Inner || table_join.kind() == ASTTableJoin::Kind::Left)
+        {
+            const auto & left_header = join->getInputStreams().front().header;
+            const auto & res_header = join->getOutputStream().header;
+            Names allowed_keys;
+            for (const auto & name : table_join.keyNamesLeft())
+            {
+                /// Skip key if it is renamed.
+                /// I don't know if it is possible. Just in case.
+                if (!left_header.has(name) || !res_header.has(name))
+                    continue;
+
+                /// Skip if type is changed. Push down expression expect equal types.
+                if (!left_header.getByName(name).type->equals(*res_header.getByName(name).type))
+                    continue;
+
+                allowed_keys.push_back(name);
+            }
+
+            if (auto updated_steps = tryAddNewFilterStep(parent_node, nodes, allowed_keys))
+                return updated_steps;
+        }
+    }
+
+    /// TODO.
+    /// We can filter earlier if expression does not depend on WITH FILL columns.
+    /// But we cannot just push down condition, because other column may be filled with defaults.
+    ///
+    /// It is possible to filter columns before and after WITH FILL, but such change is not idempotent.
+    /// So, appliying this to pair (Filter -> Filling) several times will create several similar filters.
+    // if (auto * filling = typeid_cast<FillingStep *>(child.get()))
+    // {
+    // }
+
+    /// Same reason for Cube
+    // if (auto * cube = typeid_cast<CubeStep *>(child.get()))
+    // {
+    // }
+
+    if (typeid_cast<PartialSortingStep *>(child.get())
+        || typeid_cast<MergeSortingStep *>(child.get())
+        || typeid_cast<MergingSortedStep *>(child.get())
+        || typeid_cast<FinishSortingStep *>(child.get()))
+    {
+        Names allowed_inputs = child->getOutputStream().header.getNames();
+        if (auto updated_steps = tryAddNewFilterStep(parent_node, nodes, allowed_inputs))
+            return updated_steps;
+    }
+
+    if (auto * union_step = typeid_cast<UnionStep *>(child.get()))
+    {
+        /// Union does not change header.
+        /// We can push down filter and update header.
+        auto union_input_streams = child->getInputStreams();
+        for (auto & input_stream : union_input_streams)
+            input_stream.header = filter->getOutputStream().header;
+
+        ///                - Something
+        /// Filter - Union - Something
+        ///                - Something
+
+        child = std::make_unique<UnionStep>(union_input_streams, union_step->getMaxThreads());
+
+        std::swap(parent, child);
+        std::swap(parent_node->children, child_node->children);
+        std::swap(parent_node->children.front(), child_node->children.front());
+
+        ///       - Filter - Something
+        /// Union - Something
+        ///       - Something
+
+        for (size_t i = 1; i < parent_node->children.size(); ++i)
+        {
+            auto & filter_node = nodes.emplace_back();
+            filter_node.children.push_back(parent_node->children[i]);
+            parent_node->children[i] = &filter_node;
+
+            filter_node.step = std::make_unique<FilterStep>(
+                filter_node.children.front()->step->getOutputStream(),
+                filter->getExpression()->clone(),
+                filter->getFilterColumnName(),
+                filter->removesFilterColumn());
+        }
+
+        ///       - Filter - Something
+        /// Union - Filter - Something
+        ///       - Filter - Something
+
+        return 3;
+    }
+
+    return 0;
+}
+
+}
diff --git a/src/Processors/QueryPlan/Optimizations/mergeExpressions.cpp b/src/Processors/QueryPlan/Optimizations/mergeExpressions.cpp
index dfd15a2a929..a5cb5972bd8 100644
--- a/src/Processors/QueryPlan/Optimizations/mergeExpressions.cpp
+++ b/src/Processors/QueryPlan/Optimizations/mergeExpressions.cpp
@@ -50,8 +50,10 @@ size_t tryMergeExpressions(QueryPlan::Node * parent_node, QueryPlan::Nodes &)
 
         auto merged = ActionsDAG::merge(std::move(*child_actions), std::move(*parent_actions));
 
-        auto filter = std::make_unique<FilterStep>(child_expr->getInputStreams().front(), merged,
-                                                   parent_filter->getFilterColumnName(), parent_filter->removesFilterColumn());
+        auto filter = std::make_unique<FilterStep>(child_expr->getInputStreams().front(),
+                                                   merged,
+                                                   parent_filter->getFilterColumnName(),
+                                                   parent_filter->removesFilterColumn());
         filter->setStepDescription("(" + parent_filter->getStepDescription() + " + " + child_expr->getStepDescription() + ")");
 
         parent_node->step = std::move(filter);
diff --git a/src/Processors/QueryPlan/Optimizations/optimizeTree.cpp b/src/Processors/QueryPlan/Optimizations/optimizeTree.cpp
index e5ccc173ed8..da9b1e26f68 100644
--- a/src/Processors/QueryPlan/Optimizations/optimizeTree.cpp
+++ b/src/Processors/QueryPlan/Optimizations/optimizeTree.cpp
@@ -1,11 +1,24 @@
 #include <Processors/QueryPlan/Optimizations/Optimizations.h>
+#include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
+#include <Common/Exception.h>
 #include <stack>
 
-namespace DB::QueryPlanOptimizations
+namespace DB
 {
 
-void optimizeTree(QueryPlan::Node & root, QueryPlan::Nodes & nodes)
+namespace ErrorCodes
 {
+    extern const int TOO_MANY_QUERY_PLAN_OPTIMIZATIONS;
+}
+
+namespace QueryPlanOptimizations
+{
+
+void optimizeTree(const QueryPlanOptimizationSettings & settings, QueryPlan::Node & root, QueryPlan::Nodes & nodes)
+{
+    if (!settings.optimize_plan)
+        return;
+
     const auto & optimizations = getOptimizations();
 
     struct Frame
@@ -23,6 +36,9 @@ void optimizeTree(QueryPlan::Node & root, QueryPlan::Nodes & nodes)
     std::stack<Frame> stack;
     stack.push(Frame{.node = &root});
 
+    size_t max_optimizations_to_apply = settings.max_optimizations_to_apply;
+    size_t total_applied_optimizations = 0;
+
     while (!stack.empty())
     {
         auto & frame = stack.top();
@@ -50,12 +66,22 @@ void optimizeTree(QueryPlan::Node & root, QueryPlan::Nodes & nodes)
         /// Apply all optimizations.
         for (const auto & optimization : optimizations)
         {
+            if (!(settings.*(optimization.is_enabled)))
+                continue;
+
             /// Just in case, skip optimization if it is not initialized.
             if (!optimization.apply)
                 continue;
 
+            if (max_optimizations_to_apply && max_optimizations_to_apply < total_applied_optimizations)
+                throw Exception(ErrorCodes::TOO_MANY_QUERY_PLAN_OPTIMIZATIONS,
+                                "Too many optimizations applied to query plan. Current limit {}",
+                                max_optimizations_to_apply);
+
             /// Try to apply optimization.
             auto update_depth = optimization.apply(frame.node, nodes);
+            if (update_depth)
+                ++total_applied_optimizations;
             max_update_depth = std::max<size_t>(max_update_depth, update_depth);
         }
 
@@ -73,3 +99,4 @@ void optimizeTree(QueryPlan::Node & root, QueryPlan::Nodes & nodes)
 }
 
 }
+}
diff --git a/src/Processors/QueryPlan/PartialSortingStep.cpp b/src/Processors/QueryPlan/PartialSortingStep.cpp
index ce34eca9112..bb8b2c8a26b 100644
--- a/src/Processors/QueryPlan/PartialSortingStep.cpp
+++ b/src/Processors/QueryPlan/PartialSortingStep.cpp
@@ -46,7 +46,7 @@ void PartialSortingStep::updateLimit(size_t limit_)
     }
 }
 
-void PartialSortingStep::transformPipeline(QueryPipeline & pipeline)
+void PartialSortingStep::transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &)
 {
     pipeline.addSimpleTransform([&](const Block & header, QueryPipeline::StreamType stream_type) -> ProcessorPtr
     {
diff --git a/src/Processors/QueryPlan/PartialSortingStep.h b/src/Processors/QueryPlan/PartialSortingStep.h
index 172ef25c300..e93e9e8ef93 100644
--- a/src/Processors/QueryPlan/PartialSortingStep.h
+++ b/src/Processors/QueryPlan/PartialSortingStep.h
@@ -18,7 +18,7 @@ public:
 
     String getName() const override { return "PartialSorting"; }
 
-    void transformPipeline(QueryPipeline & pipeline) override;
+    void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &) override;
 
     void describeActions(FormatSettings & settings) const override;
 
diff --git a/src/Processors/QueryPlan/QueryPlan.cpp b/src/Processors/QueryPlan/QueryPlan.cpp
index 755944fdf9f..ad3649385fd 100644
--- a/src/Processors/QueryPlan/QueryPlan.cpp
+++ b/src/Processors/QueryPlan/QueryPlan.cpp
@@ -7,6 +7,8 @@
 #include <Interpreters/ArrayJoinAction.h>
 #include <stack>
 #include <Processors/QueryPlan/Optimizations/Optimizations.h>
+#include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
+#include <Processors/QueryPlan/BuildQueryPipelineSettings.h>
 
 namespace DB
 {
@@ -130,10 +132,12 @@ void QueryPlan::addStep(QueryPlanStepPtr step)
                     " input expected", ErrorCodes::LOGICAL_ERROR);
 }
 
-QueryPipelinePtr QueryPlan::buildQueryPipeline()
+QueryPipelinePtr QueryPlan::buildQueryPipeline(
+    const QueryPlanOptimizationSettings & optimization_settings,
+    const BuildQueryPipelineSettings & build_pipeline_settings)
 {
     checkInitialized();
-    optimize();
+    optimize(optimization_settings);
 
     struct Frame
     {
@@ -160,7 +164,7 @@ QueryPipelinePtr QueryPlan::buildQueryPipeline()
         if (next_child == frame.node->children.size())
         {
             bool limit_max_threads = frame.pipelines.empty();
-            last_pipeline = frame.node->step->updatePipeline(std::move(frame.pipelines));
+            last_pipeline = frame.node->step->updatePipeline(std::move(frame.pipelines), build_pipeline_settings);
 
             if (limit_max_threads && max_threads)
                 last_pipeline->limitMaxThreads(max_threads);
@@ -177,7 +181,9 @@ QueryPipelinePtr QueryPlan::buildQueryPipeline()
     return last_pipeline;
 }
 
-Pipe QueryPlan::convertToPipe()
+Pipe QueryPlan::convertToPipe(
+    const QueryPlanOptimizationSettings & optimization_settings,
+    const BuildQueryPipelineSettings & build_pipeline_settings)
 {
     if (!isInitialized())
         return {};
@@ -185,7 +191,7 @@ Pipe QueryPlan::convertToPipe()
     if (isCompleted())
         throw Exception("Cannot convert completed QueryPlan to Pipe", ErrorCodes::LOGICAL_ERROR);
 
-    return QueryPipeline::getPipe(std::move(*buildQueryPipeline()));
+    return QueryPipeline::getPipe(std::move(*buildQueryPipeline(optimization_settings, build_pipeline_settings)));
 }
 
 void QueryPlan::addInterpreterContext(std::shared_ptr<Context> context)
@@ -237,6 +243,9 @@ static void explainStep(
 
     if (options.actions)
         step.describeActions(settings);
+
+    if (options.indexes)
+        step.describeIndexes(settings);
 }
 
 std::string debugExplainStep(const IQueryPlanStep & step)
@@ -333,9 +342,9 @@ void QueryPlan::explainPipeline(WriteBuffer & buffer, const ExplainPipelineOptio
     }
 }
 
-void QueryPlan::optimize()
+void QueryPlan::optimize(const QueryPlanOptimizationSettings & optimization_settings)
 {
-    QueryPlanOptimizations::optimizeTree(*root, nodes);
+    QueryPlanOptimizations::optimizeTree(optimization_settings, *root, nodes);
 }
 
 }
diff --git a/src/Processors/QueryPlan/QueryPlan.h b/src/Processors/QueryPlan/QueryPlan.h
index 9d2d7d93a36..901d83c3ab8 100644
--- a/src/Processors/QueryPlan/QueryPlan.h
+++ b/src/Processors/QueryPlan/QueryPlan.h
@@ -1,10 +1,12 @@
 #pragma once
-#include <memory>
-#include <list>
-#include <vector>
-#include <set>
 
 #include <Core/Names.h>
+#include <Interpreters/Context_fwd.h>
+
+#include <list>
+#include <memory>
+#include <set>
+#include <vector>
 
 namespace DB
 {
@@ -17,7 +19,6 @@ using QueryPlanStepPtr = std::unique_ptr<IQueryPlanStep>;
 class QueryPipeline;
 using QueryPipelinePtr = std::unique_ptr<QueryPipeline>;
 
-class Context;
 class WriteBuffer;
 
 class QueryPlan;
@@ -25,9 +26,12 @@ using QueryPlanPtr = std::unique_ptr<QueryPlan>;
 
 class Pipe;
 
+struct QueryPlanOptimizationSettings;
+struct BuildQueryPipelineSettings;
+
 /// A tree of query steps.
 /// The goal of QueryPlan is to build QueryPipeline.
-/// QueryPlan let delay pipeline creation which is helpful for pipeline-level optimisations.
+/// QueryPlan let delay pipeline creation which is helpful for pipeline-level optimizations.
 class QueryPlan
 {
 public:
@@ -43,12 +47,16 @@ public:
     bool isCompleted() const; /// Tree is not empty and root hasOutputStream()
     const DataStream & getCurrentDataStream() const; /// Checks that (isInitialized() && !isCompleted())
 
-    void optimize();
+    void optimize(const QueryPlanOptimizationSettings & optimization_settings);
 
-    QueryPipelinePtr buildQueryPipeline();
+    QueryPipelinePtr buildQueryPipeline(
+        const QueryPlanOptimizationSettings & optimization_settings,
+        const BuildQueryPipelineSettings & build_pipeline_settings);
 
     /// If initialized, build pipeline and convert to pipe. Otherwise, return empty pipe.
-    Pipe convertToPipe();
+    Pipe convertToPipe(
+        const QueryPlanOptimizationSettings & optimization_settings,
+        const BuildQueryPipelineSettings & build_pipeline_settings);
 
     struct ExplainPlanOptions
     {
@@ -58,6 +66,8 @@ public:
         bool description = true;
         /// Add detailed information about step actions.
         bool actions = false;
+        /// Add information about indexes actions.
+        bool indexes = false;
     };
 
     struct ExplainPipelineOptions
diff --git a/src/Processors/QueryPlan/ReadFromMergeTree.cpp b/src/Processors/QueryPlan/ReadFromMergeTree.cpp
new file mode 100644
index 00000000000..ebf9c9e4121
--- /dev/null
+++ b/src/Processors/QueryPlan/ReadFromMergeTree.cpp
@@ -0,0 +1,249 @@
+#include <Processors/QueryPlan/ReadFromMergeTree.h>
+#include <Processors/QueryPipeline.h>
+#include <Processors/ConcatProcessor.h>
+#include <Processors/Transforms/ReverseTransform.h>
+#include <Storages/MergeTree/MergeTreeSelectProcessor.h>
+#include <Storages/MergeTree/MergeTreeReverseSelectProcessor.h>
+#include <Storages/MergeTree/MergeTreeThreadSelectBlockInputProcessor.h>
+#include <common/logger_useful.h>
+
+namespace DB
+{
+
+ReadFromMergeTree::ReadFromMergeTree(
+    const MergeTreeData & storage_,
+    StorageMetadataPtr metadata_snapshot_,
+    String query_id_,
+    Names required_columns_,
+    RangesInDataParts parts_,
+    IndexStatPtr index_stats_,
+    PrewhereInfoPtr prewhere_info_,
+    Names virt_column_names_,
+    Settings settings_,
+    size_t num_streams_,
+    ReadType read_type_)
+    : ISourceStep(DataStream{.header = MergeTreeBaseSelectProcessor::transformHeader(
+        metadata_snapshot_->getSampleBlockForColumns(required_columns_, storage_.getVirtuals(), storage_.getStorageID()),
+        prewhere_info_,
+        virt_column_names_)})
+    , storage(storage_)
+    , metadata_snapshot(std::move(metadata_snapshot_))
+    , query_id(std::move(query_id_))
+    , required_columns(std::move(required_columns_))
+    , parts(std::move(parts_))
+    , index_stats(std::move(index_stats_))
+    , prewhere_info(std::move(prewhere_info_))
+    , virt_column_names(std::move(virt_column_names_))
+    , settings(std::move(settings_))
+    , num_streams(num_streams_)
+    , read_type(read_type_)
+{
+}
+
+Pipe ReadFromMergeTree::readFromPool()
+{
+    Pipes pipes;
+    size_t sum_marks = 0;
+    size_t total_rows = 0;
+
+    for (const auto & part : parts)
+    {
+        sum_marks += part.getMarksCount();
+        total_rows += part.getRowsCount();
+    }
+
+    auto pool = std::make_shared<MergeTreeReadPool>(
+        num_streams,
+        sum_marks,
+        settings.min_marks_for_concurrent_read,
+        std::move(parts),
+        storage,
+        metadata_snapshot,
+        prewhere_info,
+        true,
+        required_columns,
+        settings.backoff_settings,
+        settings.preferred_block_size_bytes,
+        false);
+
+    auto * logger = &Poco::Logger::get(storage.getLogName() + " (SelectExecutor)");
+    LOG_DEBUG(logger, "Reading approx. {} rows with {} streams", total_rows, num_streams);
+
+    for (size_t i = 0; i < num_streams; ++i)
+    {
+        auto source = std::make_shared<MergeTreeThreadSelectBlockInputProcessor>(
+            i, pool, settings.min_marks_for_concurrent_read, settings.max_block_size,
+            settings.preferred_block_size_bytes, settings.preferred_max_column_in_block_size_bytes,
+            storage, metadata_snapshot, settings.use_uncompressed_cache,
+            prewhere_info, settings.reader_settings, virt_column_names);
+
+        if (i == 0)
+        {
+            /// Set the approximate number of rows for the first source only
+            source->addTotalRowsApprox(total_rows);
+        }
+
+        pipes.emplace_back(std::move(source));
+    }
+
+    return Pipe::unitePipes(std::move(pipes));
+}
+
+template<typename TSource>
+ProcessorPtr ReadFromMergeTree::createSource(const RangesInDataPart & part)
+{
+    return std::make_shared<TSource>(
+            storage, metadata_snapshot, part.data_part, settings.max_block_size, settings.preferred_block_size_bytes,
+            settings.preferred_max_column_in_block_size_bytes, required_columns, part.ranges, settings.use_uncompressed_cache,
+            prewhere_info, true, settings.reader_settings, virt_column_names, part.part_index_in_query);
+}
+
+Pipe ReadFromMergeTree::readInOrder()
+{
+    Pipes pipes;
+    for (const auto & part : parts)
+    {
+        auto source = read_type == ReadType::InReverseOrder
+                    ? createSource<MergeTreeReverseSelectProcessor>(part)
+                    : createSource<MergeTreeSelectProcessor>(part);
+
+        pipes.emplace_back(std::move(source));
+    }
+
+    auto pipe = Pipe::unitePipes(std::move(pipes));
+
+    if (read_type == ReadType::InReverseOrder)
+    {
+        pipe.addSimpleTransform([&](const Block & header)
+        {
+            return std::make_shared<ReverseTransform>(header);
+        });
+    }
+
+    return pipe;
+}
+
+Pipe ReadFromMergeTree::read()
+{
+    if (read_type == ReadType::Default && num_streams > 1)
+        return readFromPool();
+
+    auto pipe = readInOrder();
+
+    /// Use ConcatProcessor to concat sources together.
+    /// It is needed to read in parts order (and so in PK order) if single thread is used.
+    if (read_type == ReadType::Default && pipe.numOutputPorts() > 1)
+        pipe.addTransform(std::make_shared<ConcatProcessor>(pipe.getHeader(), pipe.numOutputPorts()));
+
+    return pipe;
+}
+
+void ReadFromMergeTree::initializePipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &)
+{
+    Pipe pipe = read();
+
+    for (const auto & processor : pipe.getProcessors())
+        processors.emplace_back(processor);
+
+    // Attach QueryIdHolder if needed
+    if (!query_id.empty())
+        pipe.addQueryIdHolder(std::make_shared<QueryIdHolder>(query_id, storage));
+
+    pipeline.init(std::move(pipe));
+}
+
+static const char * indexTypeToString(ReadFromMergeTree::IndexType type)
+{
+    switch (type)
+    {
+        case ReadFromMergeTree::IndexType::None:
+            return "None";
+        case ReadFromMergeTree::IndexType::MinMax:
+            return "MinMax";
+        case ReadFromMergeTree::IndexType::Partition:
+            return "Partition";
+        case ReadFromMergeTree::IndexType::PrimaryKey:
+            return "PrimaryKey";
+        case ReadFromMergeTree::IndexType::Skip:
+            return "Skip";
+    }
+
+    __builtin_unreachable();
+}
+
+static const char * readTypeToString(ReadFromMergeTree::ReadType type)
+{
+    switch (type)
+    {
+        case ReadFromMergeTree::ReadType::Default:
+            return "Default";
+        case ReadFromMergeTree::ReadType::InOrder:
+            return "InOrder";
+        case ReadFromMergeTree::ReadType::InReverseOrder:
+            return "InReverseOrder";
+    }
+
+    __builtin_unreachable();
+}
+
+void ReadFromMergeTree::describeActions(FormatSettings & format_settings) const
+{
+    std::string prefix(format_settings.offset, format_settings.indent_char);
+    format_settings.out << prefix << "ReadType: " << readTypeToString(read_type) << '\n';
+
+    if (index_stats && !index_stats->empty())
+    {
+        format_settings.out << prefix << "Parts: " << index_stats->back().num_parts_after << '\n';
+        format_settings.out << prefix << "Granules: " << index_stats->back().num_granules_after << '\n';
+    }
+}
+
+void ReadFromMergeTree::describeIndexes(FormatSettings & format_settings) const
+{
+    std::string prefix(format_settings.offset, format_settings.indent_char);
+    if (index_stats && !index_stats->empty())
+    {
+        std::string indent(format_settings.indent, format_settings.indent_char);
+
+        /// Do not print anything if no indexes is applied.
+        if (index_stats->size() > 1 || index_stats->front().type != IndexType::None)
+            format_settings.out << prefix << "Indexes:\n";
+
+        for (size_t i = 0; i < index_stats->size(); ++i)
+        {
+            const auto & stat = (*index_stats)[i];
+            if (stat.type == IndexType::None)
+                continue;
+
+            format_settings.out << prefix << indent << indexTypeToString(stat.type) << '\n';
+
+            if (!stat.name.empty())
+                format_settings.out << prefix << indent << indent << "Name: " << stat.name << '\n';
+
+            if (!stat.description.empty())
+                format_settings.out << prefix << indent << indent << "Description: " << stat.description << '\n';
+
+            if (!stat.used_keys.empty())
+            {
+                format_settings.out << prefix << indent << indent << "Keys: " << stat.name << '\n';
+                for (const auto & used_key : stat.used_keys)
+                    format_settings.out << prefix << indent << indent << indent << used_key << '\n';
+            }
+
+            if (!stat.condition.empty())
+                format_settings.out << prefix << indent << indent << "Condition: " << stat.condition << '\n';
+
+            format_settings.out << prefix << indent << indent << "Parts: " << stat.num_parts_after;
+            if (i)
+                format_settings.out << '/' << (*index_stats)[i - 1].num_parts_after;
+            format_settings.out << '\n';
+
+            format_settings.out << prefix << indent << indent << "Granules: " << stat.num_granules_after;
+            if (i)
+                format_settings.out << '/' << (*index_stats)[i - 1].num_granules_after;
+            format_settings.out << '\n';
+        }
+    }
+}
+
+}
diff --git a/src/Processors/QueryPlan/ReadFromMergeTree.h b/src/Processors/QueryPlan/ReadFromMergeTree.h
new file mode 100644
index 00000000000..1d6a4491588
--- /dev/null
+++ b/src/Processors/QueryPlan/ReadFromMergeTree.h
@@ -0,0 +1,113 @@
+#pragma once
+#include <Processors/QueryPlan/ISourceStep.h>
+#include <Processors/Pipe.h>
+#include <Storages/MergeTree/RangesInDataPart.h>
+#include <Storages/MergeTree/MergeTreeReadPool.h>
+
+namespace DB
+{
+
+/// This step is created to read from MergeTree* table.
+/// For now, it takes a list of parts and creates source from it.
+class ReadFromMergeTree final : public ISourceStep
+{
+public:
+
+    enum class IndexType
+    {
+        None,
+        MinMax,
+        Partition,
+        PrimaryKey,
+        Skip,
+    };
+
+    /// This is a struct with information about applied indexes.
+    /// Is used for introspection only, in EXPLAIN query.
+    struct IndexStat
+    {
+        IndexType type;
+        std::string name;
+        std::string description;
+        std::string condition;
+        std::vector<std::string> used_keys;
+        size_t num_parts_after;
+        size_t num_granules_after;
+    };
+
+    using IndexStats = std::vector<IndexStat>;
+    using IndexStatPtr = std::unique_ptr<IndexStats>;
+
+    /// Part of settings which are needed for reading.
+    struct Settings
+    {
+        UInt64 max_block_size;
+        size_t preferred_block_size_bytes;
+        size_t preferred_max_column_in_block_size_bytes;
+        size_t min_marks_for_concurrent_read;
+        bool use_uncompressed_cache;
+
+        MergeTreeReaderSettings reader_settings;
+        MergeTreeReadPool::BackoffSettings backoff_settings;
+    };
+
+    enum class ReadType
+    {
+        /// By default, read will use MergeTreeReadPool and return pipe with num_streams outputs.
+        /// If num_streams == 1, will read without pool, in order specified in parts.
+        Default,
+        /// Read in sorting key order.
+        /// Returned pipe will have the number of ports equals to parts.size().
+        /// Parameter num_streams_ is ignored in this case.
+        /// User should add MergingSorted itself if needed.
+        InOrder,
+        /// The same as InOrder, but in reverse order.
+        /// For every part, read ranges and granules from end to begin. Also add ReverseTransform.
+        InReverseOrder,
+    };
+
+    ReadFromMergeTree(
+        const MergeTreeData & storage_,
+        StorageMetadataPtr metadata_snapshot_,
+        String query_id_,
+        Names required_columns_,
+        RangesInDataParts parts_,
+        IndexStatPtr index_stats_,
+        PrewhereInfoPtr prewhere_info_,
+        Names virt_column_names_,
+        Settings settings_,
+        size_t num_streams_,
+        ReadType read_type_
+    );
+
+    String getName() const override { return "ReadFromMergeTree"; }
+
+    void initializePipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &) override;
+
+    void describeActions(FormatSettings & format_settings) const override;
+    void describeIndexes(FormatSettings & format_settings) const override;
+
+private:
+    const MergeTreeData & storage;
+    StorageMetadataPtr metadata_snapshot;
+    String query_id;
+
+    Names required_columns;
+    RangesInDataParts parts;
+    IndexStatPtr index_stats;
+    PrewhereInfoPtr prewhere_info;
+    Names virt_column_names;
+    Settings settings;
+
+    size_t num_streams;
+    ReadType read_type;
+
+    Pipe read();
+    Pipe readFromPool();
+    Pipe readInOrder();
+
+    template<typename TSource>
+    ProcessorPtr createSource(const RangesInDataPart & part);
+};
+
+}
diff --git a/src/Processors/QueryPlan/ReadFromPreparedSource.cpp b/src/Processors/QueryPlan/ReadFromPreparedSource.cpp
index 2d4b759b637..d7711abb3e1 100644
--- a/src/Processors/QueryPlan/ReadFromPreparedSource.cpp
+++ b/src/Processors/QueryPlan/ReadFromPreparedSource.cpp
@@ -11,7 +11,7 @@ ReadFromPreparedSource::ReadFromPreparedSource(Pipe pipe_, std::shared_ptr<Conte
 {
 }
 
-void ReadFromPreparedSource::initializePipeline(QueryPipeline & pipeline)
+void ReadFromPreparedSource::initializePipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &)
 {
     for (const auto & processor : pipe.getProcessors())
         processors.emplace_back(processor);
diff --git a/src/Processors/QueryPlan/ReadFromPreparedSource.h b/src/Processors/QueryPlan/ReadFromPreparedSource.h
index 4f193617eec..69297c3c9ae 100644
--- a/src/Processors/QueryPlan/ReadFromPreparedSource.h
+++ b/src/Processors/QueryPlan/ReadFromPreparedSource.h
@@ -13,7 +13,7 @@ public:
 
     String getName() const override { return "ReadFromPreparedSource"; }
 
-    void initializePipeline(QueryPipeline & pipeline) override;
+    void initializePipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &) override;
 
 private:
     Pipe pipe;
diff --git a/src/Processors/QueryPlan/ReadNothingStep.cpp b/src/Processors/QueryPlan/ReadNothingStep.cpp
index 9316ecab481..c0c97e5d523 100644
--- a/src/Processors/QueryPlan/ReadNothingStep.cpp
+++ b/src/Processors/QueryPlan/ReadNothingStep.cpp
@@ -10,7 +10,7 @@ ReadNothingStep::ReadNothingStep(Block output_header)
 {
 }
 
-void ReadNothingStep::initializePipeline(QueryPipeline & pipeline)
+void ReadNothingStep::initializePipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &)
 {
     pipeline.init(Pipe(std::make_shared<NullSource>(getOutputStream().header)));
 }
diff --git a/src/Processors/QueryPlan/ReadNothingStep.h b/src/Processors/QueryPlan/ReadNothingStep.h
index da4740574da..4c5b4adb7ce 100644
--- a/src/Processors/QueryPlan/ReadNothingStep.h
+++ b/src/Processors/QueryPlan/ReadNothingStep.h
@@ -12,7 +12,7 @@ public:
 
     String getName() const override { return "ReadNothing"; }
 
-    void initializePipeline(QueryPipeline & pipeline) override;
+    void initializePipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &) override;
 };
 
 }
diff --git a/src/Processors/QueryPlan/ReverseRowsStep.cpp b/src/Processors/QueryPlan/ReverseRowsStep.cpp
deleted file mode 100644
index 32e16937611..00000000000
--- a/src/Processors/QueryPlan/ReverseRowsStep.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-#include <Processors/QueryPlan/ReverseRowsStep.h>
-#include <Processors/QueryPipeline.h>
-#include <Processors/Transforms/ReverseTransform.h>
-
-namespace DB
-{
-
-static ITransformingStep::Traits getTraits()
-{
-    return ITransformingStep::Traits
-    {
-        {
-            .preserves_distinct_columns = true,
-            .returns_single_stream = false,
-            .preserves_number_of_streams = true,
-            .preserves_sorting = false,
-        },
-        {
-            .preserves_number_of_rows = true,
-        }
-    };
-}
-
-ReverseRowsStep::ReverseRowsStep(const DataStream & input_stream_)
-    : ITransformingStep(input_stream_, input_stream_.header, getTraits())
-{
-}
-
-void ReverseRowsStep::transformPipeline(QueryPipeline & pipeline)
-{
-    pipeline.addSimpleTransform([&](const Block & header)
-    {
-        return std::make_shared<ReverseTransform>(header);
-    });
-}
-
-}
diff --git a/src/Processors/QueryPlan/ReverseRowsStep.h b/src/Processors/QueryPlan/ReverseRowsStep.h
deleted file mode 100644
index 955d022cde0..00000000000
--- a/src/Processors/QueryPlan/ReverseRowsStep.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-#include <Processors/QueryPlan/ITransformingStep.h>
-
-namespace DB
-{
-
-/// Reverse rows in chunk.
-class ReverseRowsStep : public ITransformingStep
-{
-public:
-    ReverseRowsStep(const DataStream & input_stream_);
-
-    String getName() const override { return "ReverseRows"; }
-
-    void transformPipeline(QueryPipeline & pipeline) override;
-};
-
-}
diff --git a/src/Processors/QueryPlan/RollupStep.cpp b/src/Processors/QueryPlan/RollupStep.cpp
index 5f9931030c7..45573b352d6 100644
--- a/src/Processors/QueryPlan/RollupStep.cpp
+++ b/src/Processors/QueryPlan/RollupStep.cpp
@@ -30,7 +30,7 @@ RollupStep::RollupStep(const DataStream & input_stream_, AggregatingTransformPar
         output_stream->distinct_columns.insert(params->params.src_header.getByPosition(key).name);
 }
 
-void RollupStep::transformPipeline(QueryPipeline & pipeline)
+void RollupStep::transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &)
 {
     pipeline.resize(1);
 
diff --git a/src/Processors/QueryPlan/RollupStep.h b/src/Processors/QueryPlan/RollupStep.h
index b6d9b2af5bf..21faf539990 100644
--- a/src/Processors/QueryPlan/RollupStep.h
+++ b/src/Processors/QueryPlan/RollupStep.h
@@ -16,7 +16,7 @@ public:
 
     String getName() const override { return "Rollup"; }
 
-    void transformPipeline(QueryPipeline & pipeline) override;
+    void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &) override;
 
 private:
     AggregatingTransformParamsPtr params;
diff --git a/src/Processors/QueryPlan/SettingQuotaAndLimitsStep.cpp b/src/Processors/QueryPlan/SettingQuotaAndLimitsStep.cpp
index 588dd7599a1..734e6db318d 100644
--- a/src/Processors/QueryPlan/SettingQuotaAndLimitsStep.cpp
+++ b/src/Processors/QueryPlan/SettingQuotaAndLimitsStep.cpp
@@ -28,7 +28,7 @@ SettingQuotaAndLimitsStep::SettingQuotaAndLimitsStep(
     StreamLocalLimits & limits_,
     SizeLimits & leaf_limits_,
     std::shared_ptr<const EnabledQuota> quota_,
-    std::shared_ptr<Context> context_)
+    ContextPtr context_)
     : ITransformingStep(input_stream_, input_stream_.header, getTraits())
     , context(std::move(context_))
     , storage(std::move(storage_))
@@ -39,7 +39,7 @@ SettingQuotaAndLimitsStep::SettingQuotaAndLimitsStep(
 {
 }
 
-void SettingQuotaAndLimitsStep::transformPipeline(QueryPipeline & pipeline)
+void SettingQuotaAndLimitsStep::transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &)
 {
     /// Table lock is stored inside pipeline here.
     pipeline.setLimits(limits);
diff --git a/src/Processors/QueryPlan/SettingQuotaAndLimitsStep.h b/src/Processors/QueryPlan/SettingQuotaAndLimitsStep.h
index 66e44e18cd4..3c73c208b70 100644
--- a/src/Processors/QueryPlan/SettingQuotaAndLimitsStep.h
+++ b/src/Processors/QueryPlan/SettingQuotaAndLimitsStep.h
@@ -1,4 +1,6 @@
 #pragma once
+
+#include <Interpreters/Context_fwd.h>
 #include <Processors/QueryPlan/ITransformingStep.h>
 #include <Storages/TableLockHolder.h>
 #include <DataStreams/StreamLocalLimits.h>
@@ -26,14 +28,14 @@ public:
         StreamLocalLimits & limits_,
         SizeLimits & leaf_limits_,
         std::shared_ptr<const EnabledQuota> quota_,
-        std::shared_ptr<Context> context_);
+        ContextPtr context_);
 
     String getName() const override { return "SettingQuotaAndLimits"; }
 
-    void transformPipeline(QueryPipeline & pipeline) override;
+    void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &) override;
 
 private:
-    std::shared_ptr<Context> context;
+    ContextPtr context;
     StoragePtr storage;
     TableLockHolder table_lock;
     StreamLocalLimits limits;
diff --git a/src/Processors/QueryPlan/TotalsHavingStep.cpp b/src/Processors/QueryPlan/TotalsHavingStep.cpp
index 9947875e679..7a60f0a6f36 100644
--- a/src/Processors/QueryPlan/TotalsHavingStep.cpp
+++ b/src/Processors/QueryPlan/TotalsHavingStep.cpp
@@ -36,7 +36,7 @@ TotalsHavingStep::TotalsHavingStep(
             input_stream_,
             TotalsHavingTransform::transformHeader(
                     input_stream_.header,
-                    (actions_dag_ ? std::make_shared<ExpressionActions>(actions_dag_) : nullptr),
+                    (actions_dag_ ? std::make_shared<ExpressionActions>(actions_dag_, ExpressionActionsSettings{}) : nullptr),
                     final_),
             getTraits(!filter_column_.empty()))
     , overflow_row(overflow_row_)
@@ -48,10 +48,11 @@ TotalsHavingStep::TotalsHavingStep(
 {
 }
 
-void TotalsHavingStep::transformPipeline(QueryPipeline & pipeline)
+void TotalsHavingStep::transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings & settings)
 {
     auto totals_having = std::make_shared<TotalsHavingTransform>(
-            pipeline.getHeader(), overflow_row, (actions_dag ? std::make_shared<ExpressionActions>(actions_dag) : nullptr),
+            pipeline.getHeader(), overflow_row,
+            (actions_dag ? std::make_shared<ExpressionActions>(actions_dag, settings.getActionsSettings()) : nullptr),
             filter_column_name, totals_mode, auto_include_threshold, final);
 
     pipeline.addTotalsHavingTransform(std::move(totals_having));
@@ -83,7 +84,7 @@ void TotalsHavingStep::describeActions(FormatSettings & settings) const
     if (actions_dag)
     {
         bool first = true;
-        auto expression = std::make_shared<ExpressionActions>(actions_dag);
+        auto expression = std::make_shared<ExpressionActions>(actions_dag, ExpressionActionsSettings{});
         for (const auto & action : expression->getActions())
         {
             settings.out << prefix << (first ? "Actions: "
diff --git a/src/Processors/QueryPlan/TotalsHavingStep.h b/src/Processors/QueryPlan/TotalsHavingStep.h
index 7c1638013e5..4041960de28 100644
--- a/src/Processors/QueryPlan/TotalsHavingStep.h
+++ b/src/Processors/QueryPlan/TotalsHavingStep.h
@@ -24,10 +24,12 @@ public:
 
     String getName() const override { return "TotalsHaving"; }
 
-    void transformPipeline(QueryPipeline & pipeline) override;
+    void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings & settings) override;
 
     void describeActions(FormatSettings & settings) const override;
 
+    const ActionsDAGPtr & getActions() const { return actions_dag; }
+
 private:
     bool overflow_row;
     ActionsDAGPtr actions_dag;
diff --git a/src/Processors/QueryPlan/UnionStep.cpp b/src/Processors/QueryPlan/UnionStep.cpp
index 630ff53f47d..7403dd0a12a 100644
--- a/src/Processors/QueryPlan/UnionStep.cpp
+++ b/src/Processors/QueryPlan/UnionStep.cpp
@@ -1,13 +1,30 @@
 #include <Processors/QueryPlan/UnionStep.h>
 #include <Processors/QueryPipeline.h>
 #include <Processors/Sources/NullSource.h>
-#include <Interpreters/Context.h>
+#include <Interpreters/ExpressionActions.h>
 
 namespace DB
 {
 
-UnionStep::UnionStep(DataStreams input_streams_, Block result_header, size_t max_threads_)
-    : header(std::move(result_header))
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+static Block checkHeaders(const DataStreams & input_streams)
+{
+    if (input_streams.empty())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot unite an empty set of query plan steps");
+
+    Block res = input_streams.front().header;
+    for (const auto & stream : input_streams)
+        assertBlocksHaveEqualStructure(stream.header, res, "UnionStep");
+
+    return res;
+}
+
+UnionStep::UnionStep(DataStreams input_streams_, size_t max_threads_)
+    : header(checkHeaders(input_streams_))
     , max_threads(max_threads_)
 {
     input_streams = std::move(input_streams_);
@@ -18,7 +35,7 @@ UnionStep::UnionStep(DataStreams input_streams_, Block result_header, size_t max
         output_stream = DataStream{.header = header};
 }
 
-QueryPipelinePtr UnionStep::updatePipeline(QueryPipelines pipelines)
+QueryPipelinePtr UnionStep::updatePipeline(QueryPipelines pipelines, const BuildQueryPipelineSettings &)
 {
     auto pipeline = std::make_unique<QueryPipeline>();
     QueryPipelineProcessorsCollector collector(*pipeline, this);
@@ -30,7 +47,7 @@ QueryPipelinePtr UnionStep::updatePipeline(QueryPipelines pipelines)
         return pipeline;
     }
 
-    *pipeline = QueryPipeline::unitePipelines(std::move(pipelines), output_stream->header, max_threads);
+    *pipeline = QueryPipeline::unitePipelines(std::move(pipelines), max_threads);
 
     processors = collector.detachProcessors();
     return pipeline;
diff --git a/src/Processors/QueryPlan/UnionStep.h b/src/Processors/QueryPlan/UnionStep.h
index e2e1f2c9efa..81bd033d045 100644
--- a/src/Processors/QueryPlan/UnionStep.h
+++ b/src/Processors/QueryPlan/UnionStep.h
@@ -9,14 +9,16 @@ class UnionStep : public IQueryPlanStep
 {
 public:
     /// max_threads is used to limit the number of threads for result pipeline.
-    UnionStep(DataStreams input_streams_, Block result_header, size_t max_threads_ = 0);
+    explicit UnionStep(DataStreams input_streams_, size_t max_threads_ = 0);
 
     String getName() const override { return "Union"; }
 
-    QueryPipelinePtr updatePipeline(QueryPipelines pipelines) override;
+    QueryPipelinePtr updatePipeline(QueryPipelines pipelines, const BuildQueryPipelineSettings &) override;
 
     void describePipeline(FormatSettings & settings) const override;
 
+    size_t getMaxThreads() const { return max_threads; }
+
 private:
     Block header;
     size_t max_threads;
diff --git a/src/Processors/QueryPlan/WindowStep.cpp b/src/Processors/QueryPlan/WindowStep.cpp
index 2b824f91b45..66c329acb4b 100644
--- a/src/Processors/QueryPlan/WindowStep.cpp
+++ b/src/Processors/QueryPlan/WindowStep.cpp
@@ -62,8 +62,13 @@ WindowStep::WindowStep(const DataStream & input_stream_,
 
 }
 
-void WindowStep::transformPipeline(QueryPipeline & pipeline)
+void WindowStep::transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &)
 {
+    // This resize is needed for cases such as `over ()` when we don't have a
+    // sort node, and the input might have multiple streams. The sort node would
+    // have resized it.
+    pipeline.resize(1);
+
     pipeline.addSimpleTransform([&](const Block & /*header*/)
     {
         return std::make_shared<WindowTransform>(input_header,
diff --git a/src/Processors/QueryPlan/WindowStep.h b/src/Processors/QueryPlan/WindowStep.h
index ffd5e78df67..9e3c18c0b16 100644
--- a/src/Processors/QueryPlan/WindowStep.h
+++ b/src/Processors/QueryPlan/WindowStep.h
@@ -20,7 +20,7 @@ public:
 
     String getName() const override { return "Window"; }
 
-    void transformPipeline(QueryPipeline & pipeline) override;
+    void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &) override;
 
     void describeActions(FormatSettings & settings) const override;
 
diff --git a/src/Processors/Transforms/AggregatingInOrderTransform.cpp b/src/Processors/Transforms/AggregatingInOrderTransform.cpp
index 0db95bc3b20..d8b7742cdf4 100644
--- a/src/Processors/Transforms/AggregatingInOrderTransform.cpp
+++ b/src/Processors/Transforms/AggregatingInOrderTransform.cpp
@@ -1,5 +1,7 @@
 #include <Processors/Transforms/AggregatingInOrderTransform.h>
 #include <DataTypes/DataTypeLowCardinality.h>
+#include <Core/SortCursor.h>
+#include <ext/range.h>
 
 namespace DB
 {
@@ -46,21 +48,6 @@ AggregatingInOrderTransform::AggregatingInOrderTransform(
 
 AggregatingInOrderTransform::~AggregatingInOrderTransform() = default;
 
-static bool less(const MutableColumns & lhs, const Columns & rhs, size_t i, size_t j, const SortDescription & descr)
-{
-    for (const auto & elem : descr)
-    {
-        size_t ind = elem.column_number;
-        int res = elem.direction * lhs[ind]->compareAt(i, j, *rhs[ind], elem.nulls_direction);
-        if (res < 0)
-            return true;
-        else if (res > 0)
-            return false;
-    }
-    return false;
-}
-
-
 void AggregatingInOrderTransform::consume(Chunk chunk)
 {
     size_t rows = chunk.getNumRows();
@@ -72,6 +59,7 @@ void AggregatingInOrderTransform::consume(Chunk chunk)
         LOG_TRACE(log, "Aggregating in order");
         is_consume_started = true;
     }
+
     src_rows += rows;
     src_bytes += chunk.bytes();
 
@@ -96,57 +84,55 @@ void AggregatingInOrderTransform::consume(Chunk chunk)
         res_aggregate_columns.resize(params->params.aggregates_size);
 
         for (size_t i = 0; i < params->params.keys_size; ++i)
-        {
             res_key_columns[i] = res_header.safeGetByPosition(i).type->createColumn();
-        }
+
         for (size_t i = 0; i < params->params.aggregates_size; ++i)
-        {
             res_aggregate_columns[i] = res_header.safeGetByPosition(i + params->params.keys_size).type->createColumn();
-        }
+
         params->aggregator.createStatesAndFillKeyColumnsWithSingleKey(variants, key_columns, key_begin, res_key_columns);
+        params->aggregator.addArenasToAggregateColumns(variants, res_aggregate_columns);
         ++cur_block_size;
     }
-    ssize_t mid = 0;
-    ssize_t high = 0;
-    ssize_t low = -1;
+
+
     /// Will split block into segments with the same key
     while (key_end != rows)
     {
-        high = rows;
         /// Find the first position of new (not current) key in current chunk
-        while (high - low > 1)
-        {
-            mid = (low + high) / 2;
-            if (!less(res_key_columns, key_columns, cur_block_size - 1, mid, group_by_description))
-                low = mid;
-            else
-                high = mid;
-        }
-        key_end = high;
+        auto indices = ext::range(key_begin, rows);
+        auto it = std::upper_bound(indices.begin(), indices.end(), cur_block_size - 1,
+            [&](size_t lhs_row, size_t rhs_row)
+            {
+                return less(res_key_columns, key_columns, lhs_row, rhs_row, group_by_description);
+            });
+
+        key_end = (it == indices.end() ? rows : *it);
+
         /// Add data to aggr. state if interval is not empty. Empty when haven't found current key in new block.
         if (key_begin != key_end)
-        {
             params->aggregator.executeOnIntervalWithoutKeyImpl(variants.without_key, key_begin, key_end, aggregate_function_instructions.data(), variants.aggregates_pool);
-        }
 
-        low = key_begin = key_end;
         /// We finalize last key aggregation state if a new key found.
-        if (key_begin != rows)
+        if (key_end != rows)
         {
-            params->aggregator.fillAggregateColumnsWithSingleKey(variants, res_aggregate_columns);
+            params->aggregator.addSingleKeyToAggregateColumns(variants, res_aggregate_columns);
+
             /// If res_block_size is reached we have to stop consuming and generate the block. Save the extra rows into new chunk.
             if (cur_block_size == res_block_size)
             {
                 Columns source_columns = chunk.detachColumns();
 
                 for (auto & source_column : source_columns)
-                    source_column = source_column->cut(key_begin, rows - key_begin);
+                    source_column = source_column->cut(key_end, rows - key_end);
 
-                current_chunk = Chunk(source_columns, rows - key_begin);
+                current_chunk = Chunk(source_columns, rows - key_end);
+                src_rows -= current_chunk.getNumRows();
                 block_end_reached = true;
                 need_generate = true;
                 cur_block_size = 0;
 
+                variants.without_key = nullptr;
+
                 /// Arenas cannot be destroyed here, since later, in FinalizingSimpleTransform
                 /// there will be finalizeChunk(), but even after
                 /// finalizeChunk() we cannot destroy arena, since some memory
@@ -168,10 +154,13 @@ void AggregatingInOrderTransform::consume(Chunk chunk)
             }
 
             /// We create a new state for the new key and update res_key_columns
-            params->aggregator.createStatesAndFillKeyColumnsWithSingleKey(variants, key_columns, key_begin, res_key_columns);
+            params->aggregator.createStatesAndFillKeyColumnsWithSingleKey(variants, key_columns, key_end, res_key_columns);
             ++cur_block_size;
         }
+
+        key_begin = key_end;
     }
+
     block_end_reached = false;
 }
 
@@ -225,8 +214,8 @@ IProcessor::Status AggregatingInOrderTransform::prepare()
         {
             output.push(std::move(to_push_chunk));
             output.finish();
-            LOG_TRACE(log, "Aggregated. {} to {} rows (from {})", src_rows, res_rows,
-                                        formatReadableSizeWithBinarySuffix(src_bytes));
+            LOG_DEBUG(log, "Aggregated. {} to {} rows (from {})",
+                src_rows, res_rows, formatReadableSizeWithBinarySuffix(src_bytes));
             return Status::Finished;
         }
         if (input.isFinished())
@@ -247,7 +236,10 @@ IProcessor::Status AggregatingInOrderTransform::prepare()
 void AggregatingInOrderTransform::generate()
 {
     if (cur_block_size && is_consume_finished)
-        params->aggregator.fillAggregateColumnsWithSingleKey(variants, res_aggregate_columns);
+    {
+        params->aggregator.addSingleKeyToAggregateColumns(variants, res_aggregate_columns);
+        variants.without_key = nullptr;
+    }
 
     Block res = res_header.cloneEmpty();
 
diff --git a/src/Processors/Transforms/AggregatingTransform.cpp b/src/Processors/Transforms/AggregatingTransform.cpp
index c6907202d31..3400d06dae3 100644
--- a/src/Processors/Transforms/AggregatingTransform.cpp
+++ b/src/Processors/Transforms/AggregatingTransform.cpp
@@ -541,7 +541,7 @@ void AggregatingTransform::initGenerate()
     double elapsed_seconds = watch.elapsedSeconds();
     size_t rows = variants.sizeWithoutOverflowRow();
 
-    LOG_TRACE(log, "Aggregated. {} to {} rows (from {}) in {} sec. ({} rows/sec., {}/sec.)",
+    LOG_DEBUG(log, "Aggregated. {} to {} rows (from {}) in {} sec. ({} rows/sec., {}/sec.)",
         src_rows, rows, ReadableSize(src_bytes),
         elapsed_seconds, src_rows / elapsed_seconds,
         ReadableSize(src_bytes / elapsed_seconds));
@@ -599,7 +599,7 @@ void AggregatingTransform::initGenerate()
             pipe = Pipe::unitePipes(std::move(pipes));
         }
 
-        LOG_TRACE(log, "Will merge {} temporary files of size {} compressed, {} uncompressed.", files.files.size(), ReadableSize(files.sum_size_compressed), ReadableSize(files.sum_size_uncompressed));
+        LOG_DEBUG(log, "Will merge {} temporary files of size {} compressed, {} uncompressed.", files.files.size(), ReadableSize(files.sum_size_compressed), ReadableSize(files.sum_size_uncompressed));
 
         addMergingAggregatedMemoryEfficientTransform(pipe, params, temporary_data_merge_threads);
 
diff --git a/src/Processors/Transforms/CreatingSetsTransform.cpp b/src/Processors/Transforms/CreatingSetsTransform.cpp
index c5fb4f3a952..a5b5958eff1 100644
--- a/src/Processors/Transforms/CreatingSetsTransform.cpp
+++ b/src/Processors/Transforms/CreatingSetsTransform.cpp
@@ -25,11 +25,11 @@ CreatingSetsTransform::CreatingSetsTransform(
     Block out_header_,
     SubqueryForSet subquery_for_set_,
     SizeLimits network_transfer_limits_,
-    const Context & context_)
+    ContextPtr context_)
     : IAccumulatingTransform(std::move(in_header_), std::move(out_header_))
+    , WithContext(context_)
     , subquery(std::move(subquery_for_set_))
     , network_transfer_limits(std::move(network_transfer_limits_))
-    , context(context_)
 {
 }
 
@@ -51,7 +51,7 @@ void CreatingSetsTransform::startSubquery()
         LOG_TRACE(log, "Filling temporary table.");
 
     if (subquery.table)
-        table_out = subquery.table->write({}, subquery.table->getInMemoryMetadataPtr(), context);
+        table_out = subquery.table->write({}, subquery.table->getInMemoryMetadataPtr(), getContext());
 
     done_with_set = !subquery.set;
     done_with_join = !subquery.join;
diff --git a/src/Processors/Transforms/CreatingSetsTransform.h b/src/Processors/Transforms/CreatingSetsTransform.h
index 3452de63ea0..a5787b0a5f5 100644
--- a/src/Processors/Transforms/CreatingSetsTransform.h
+++ b/src/Processors/Transforms/CreatingSetsTransform.h
@@ -1,9 +1,12 @@
 #pragma once
-#include <Poco/Logger.h>
-#include <Processors/IAccumulatingTransform.h>
-#include <Interpreters/SubqueryForSet.h>
-#include <Common/Stopwatch.h>
+
 #include <DataStreams/SizeLimits.h>
+#include <Interpreters/Context_fwd.h>
+#include <Interpreters/SubqueryForSet.h>
+#include <Processors/IAccumulatingTransform.h>
+#include <Common/Stopwatch.h>
+
+#include <Poco/Logger.h>
 
 namespace DB
 {
@@ -16,7 +19,7 @@ using ProgressCallback = std::function<void(const Progress & progress)>;
 /// Don't return any data. Sets are created when Finish status is returned.
 /// In general, several work() methods need to be called to finish.
 /// Independent processors is created for each subquery.
-class CreatingSetsTransform : public IAccumulatingTransform
+class CreatingSetsTransform : public IAccumulatingTransform, WithContext
 {
 public:
     CreatingSetsTransform(
@@ -24,7 +27,7 @@ public:
         Block out_header_,
         SubqueryForSet subquery_for_set_,
         SizeLimits network_transfer_limits_,
-        const Context & context_);
+        ContextPtr context_);
 
     String getName() const override { return "CreatingSetsTransform"; }
 
@@ -44,7 +47,6 @@ private:
     bool done_with_table = true;
 
     SizeLimits network_transfer_limits;
-    const Context & context;
 
     size_t rows_to_transfer = 0;
     size_t bytes_to_transfer = 0;
diff --git a/src/Processors/Transforms/FinishSortingTransform.cpp b/src/Processors/Transforms/FinishSortingTransform.cpp
index 29d0170d907..763ed9ecc49 100644
--- a/src/Processors/Transforms/FinishSortingTransform.cpp
+++ b/src/Processors/Transforms/FinishSortingTransform.cpp
@@ -37,20 +37,6 @@ FinishSortingTransform::FinishSortingTransform(
     description_sorted.assign(description.begin(), description.begin() + prefix_size);
 }
 
-static bool less(const Columns & lhs, const Columns & rhs, size_t i, size_t j, const SortDescription & descr)
-{
-    for (const auto & elem : descr)
-    {
-        size_t ind = elem.column_number;
-        int res = elem.direction * lhs[ind]->compareAt(i, j, *rhs[ind], elem.nulls_direction);
-        if (res < 0)
-            return true;
-        else if (res > 0)
-            return false;
-    }
-    return false;
-}
-
 void FinishSortingTransform::consume(Chunk chunk)
 {
     generated_prefix = false;
diff --git a/src/Processors/Transforms/JoiningTransform.cpp b/src/Processors/Transforms/JoiningTransform.cpp
index 26630f80b17..dea887fd7d7 100644
--- a/src/Processors/Transforms/JoiningTransform.cpp
+++ b/src/Processors/Transforms/JoiningTransform.cpp
@@ -38,7 +38,11 @@ void JoiningTransform::transform(Chunk & chunk)
     if (on_totals)
     {
         /// We have to make chunk empty before return
-        block = getInputPort().getHeader().cloneWithColumns(chunk.detachColumns());
+        /// In case of using `arrayJoin` we can get more or less rows than one
+        auto cols = chunk.detachColumns();
+        for (auto & col : cols)
+            col = col->cloneResized(1);
+        block = getInputPort().getHeader().cloneWithColumns(std::move(cols));
 
         /// Drop totals if both out stream and joined stream doesn't have ones.
         /// See comment in ExpressionTransform.h
diff --git a/src/Processors/Transforms/MergingAggregatedTransform.cpp b/src/Processors/Transforms/MergingAggregatedTransform.cpp
index 1a04f85fd9c..ddc58d830da 100644
--- a/src/Processors/Transforms/MergingAggregatedTransform.cpp
+++ b/src/Processors/Transforms/MergingAggregatedTransform.cpp
@@ -52,7 +52,7 @@ Chunk MergingAggregatedTransform::generate()
     if (!generate_started)
     {
         generate_started = true;
-        LOG_TRACE(log, "Read {} blocks of partially aggregated data, total {} rows.", total_input_blocks, total_input_rows);
+        LOG_DEBUG(log, "Read {} blocks of partially aggregated data, total {} rows.", total_input_blocks, total_input_rows);
 
         /// Exception safety. Make iterator valid in case any method below throws.
         next_block = blocks.begin();
diff --git a/src/Processors/Transforms/PartialSortingTransform.cpp b/src/Processors/Transforms/PartialSortingTransform.cpp
index 2fd0a64ee92..3a75571872f 100644
--- a/src/Processors/Transforms/PartialSortingTransform.cpp
+++ b/src/Processors/Transforms/PartialSortingTransform.cpp
@@ -10,6 +10,8 @@ PartialSortingTransform::PartialSortingTransform(
     : ISimpleTransform(header_, header_, false)
     , description(description_), limit(limit_)
 {
+    // Sorting by no columns doesn't make sense.
+    assert(!description.empty());
 }
 
 static ColumnRawPtrs extractColumns(const Block & block, const SortDescription & description)
@@ -91,6 +93,14 @@ size_t getFilterMask(const ColumnRawPtrs & lhs, const ColumnRawPtrs & rhs, size_
 
 void PartialSortingTransform::transform(Chunk & chunk)
 {
+    if (chunk.getNumRows())
+    {
+        // The following code works with Blocks and will lose the number of
+        // rows when there are no columns. We shouldn't get such block, because
+        // we have to sort by at least one column.
+        assert(chunk.getNumColumns());
+    }
+
     if (read_rows)
         read_rows->add(chunk.getNumRows());
 
diff --git a/src/Processors/Transforms/WindowTransform.cpp b/src/Processors/Transforms/WindowTransform.cpp
index 0013e0061e2..0521912402c 100644
--- a/src/Processors/Transforms/WindowTransform.cpp
+++ b/src/Processors/Transforms/WindowTransform.cpp
@@ -2,7 +2,9 @@
 
 #include <AggregateFunctions/AggregateFunctionFactory.h>
 #include <Common/Arena.h>
+#include <Common/FieldVisitorsAccurateComparison.h>
 #include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/getLeastSupertype.h>
 #include <Interpreters/ExpressionActions.h>
 #include <Interpreters/convertFieldToType.h>
 
@@ -27,7 +29,8 @@ public:
     virtual ~IWindowFunction() = default;
 
     // Must insert the result for current_row.
-    virtual void windowInsertResultInto(IColumn & to, const WindowTransform * transform) = 0;
+    virtual void windowInsertResultInto(const WindowTransform * transform,
+        size_t function_index) = 0;
 };
 
 // Compares ORDER BY column values at given rows to find the boundaries of frame:
@@ -37,7 +40,7 @@ template <typename ColumnType>
 static int compareValuesWithOffset(const IColumn * _compared_column,
     size_t compared_row, const IColumn * _reference_column,
     size_t reference_row,
-    uint64_t _offset,
+    const Field & _offset,
     bool offset_is_preceding)
 {
     // Casting the columns to the known type here makes it faster, probably
@@ -46,7 +49,11 @@ static int compareValuesWithOffset(const IColumn * _compared_column,
         _compared_column);
     const auto * reference_column = assert_cast<const ColumnType *>(
         _reference_column);
-    const auto offset = static_cast<typename ColumnType::ValueType>(_offset);
+    // Note that the storage type of offset returned by get<> is different, so
+    // we need to specify the type explicitly.
+    const typename ColumnType::ValueType offset
+            = _offset.get<typename ColumnType::ValueType>();
+    assert(offset >= 0);
 
     const auto compared_value_data = compared_column->getDataAt(compared_row);
     assert(compared_value_data.size == sizeof(typename ColumnType::ValueType));
@@ -59,32 +66,32 @@ static int compareValuesWithOffset(const IColumn * _compared_column,
         reference_value_data.data);
 
     bool is_overflow;
-    bool overflow_to_negative;
     if (offset_is_preceding)
     {
         is_overflow = __builtin_sub_overflow(reference_value, offset,
             &reference_value);
-        overflow_to_negative = offset > 0;
     }
     else
     {
         is_overflow = __builtin_add_overflow(reference_value, offset,
             &reference_value);
-        overflow_to_negative = offset < 0;
     }
 
 //    fmt::print(stderr,
-//        "compared [{}] = {}, ref [{}] = {}, offset {} preceding {} overflow {} to negative {}\n",
+//        "compared [{}] = {}, old ref {}, shifted ref [{}] = {}, offset {} preceding {} overflow {} to negative {}\n",
 //        compared_row, toString(compared_value),
+//        // fmt doesn't like char8_t.
+//        static_cast<Int64>(unalignedLoad<typename ColumnType::ValueType>(reference_value_data.data)),
 //        reference_row, toString(reference_value),
 //        toString(offset), offset_is_preceding,
-//        is_overflow, overflow_to_negative);
+//        is_overflow, offset_is_preceding);
 
     if (is_overflow)
     {
-        if (overflow_to_negative)
+        if (offset_is_preceding)
         {
             // Overflow to the negative, [compared] must be greater.
+            // We know that because offset is >= 0.
             return 1;
         }
         else
@@ -101,6 +108,53 @@ static int compareValuesWithOffset(const IColumn * _compared_column,
     }
 }
 
+// A specialization of compareValuesWithOffset for floats.
+template <typename ColumnType>
+static int compareValuesWithOffsetFloat(const IColumn * _compared_column,
+    size_t compared_row, const IColumn * _reference_column,
+    size_t reference_row,
+    const Field & _offset,
+    bool offset_is_preceding)
+{
+    // Casting the columns to the known type here makes it faster, probably
+    // because the getData call can be devirtualized.
+    const auto * compared_column = assert_cast<const ColumnType *>(
+        _compared_column);
+    const auto * reference_column = assert_cast<const ColumnType *>(
+        _reference_column);
+    const auto offset = _offset.get<typename ColumnType::ValueType>();
+    assert(offset >= 0);
+
+    const auto compared_value_data = compared_column->getDataAt(compared_row);
+    assert(compared_value_data.size == sizeof(typename ColumnType::ValueType));
+    auto compared_value = unalignedLoad<typename ColumnType::ValueType>(
+        compared_value_data.data);
+
+    const auto reference_value_data = reference_column->getDataAt(reference_row);
+    assert(reference_value_data.size == sizeof(typename ColumnType::ValueType));
+    auto reference_value = unalignedLoad<typename ColumnType::ValueType>(
+        reference_value_data.data);
+
+    // Floats overflow to Inf and the comparison will work normally, so we don't
+    // have to do anything.
+    if (offset_is_preceding)
+    {
+        reference_value -= offset;
+    }
+    else
+    {
+        reference_value += offset;
+    }
+
+    const auto result =  compared_value < reference_value ? -1
+        : compared_value == reference_value ? 0 : 1;
+
+//    fmt::print(stderr, "compared {}, offset {}, reference {}, result {}\n",
+//        compared_value, offset, reference_value, result);
+
+    return result;
+}
+
 // Helper macros to dispatch on type of the ORDER BY column
 #define APPLY_FOR_ONE_TYPE(FUNCTION, TYPE) \
 else if (typeid_cast<const TYPE *>(column)) \
@@ -114,14 +168,20 @@ if (false) /* NOLINT */ \
 { \
     /* Do nothing, a starter condition. */ \
 } \
-APPLY_FOR_ONE_TYPE(FUNCTION, ColumnVector<Int8>) \
 APPLY_FOR_ONE_TYPE(FUNCTION, ColumnVector<UInt8>) \
-APPLY_FOR_ONE_TYPE(FUNCTION, ColumnVector<Int16>) \
 APPLY_FOR_ONE_TYPE(FUNCTION, ColumnVector<UInt16>) \
-APPLY_FOR_ONE_TYPE(FUNCTION, ColumnVector<Int32>) \
 APPLY_FOR_ONE_TYPE(FUNCTION, ColumnVector<UInt32>) \
-APPLY_FOR_ONE_TYPE(FUNCTION, ColumnVector<Int64>) \
 APPLY_FOR_ONE_TYPE(FUNCTION, ColumnVector<UInt64>) \
+\
+APPLY_FOR_ONE_TYPE(FUNCTION, ColumnVector<Int8>) \
+APPLY_FOR_ONE_TYPE(FUNCTION, ColumnVector<Int16>) \
+APPLY_FOR_ONE_TYPE(FUNCTION, ColumnVector<Int32>) \
+APPLY_FOR_ONE_TYPE(FUNCTION, ColumnVector<Int64>) \
+APPLY_FOR_ONE_TYPE(FUNCTION, ColumnVector<Int128>) \
+\
+APPLY_FOR_ONE_TYPE(FUNCTION##Float, ColumnVector<Float32>) \
+APPLY_FOR_ONE_TYPE(FUNCTION##Float, ColumnVector<Float64>) \
+\
 else \
 { \
     throw Exception(ErrorCodes::NOT_IMPLEMENTED, \
@@ -193,9 +253,43 @@ WindowTransform::WindowTransform(const Block & input_header_,
                 == WindowFrame::BoundaryType::Offset))
     {
         assert(order_by_indices.size() == 1);
-        const IColumn * column = input_header.getByPosition(
-            order_by_indices[0]).column.get();
+        const auto & entry = input_header.getByPosition(order_by_indices[0]);
+        const IColumn * column = entry.column.get();
         APPLY_FOR_TYPES(compareValuesWithOffset)
+
+        // Convert the offsets to the ORDER BY column type. We can't just check
+        // that the type matches, because e.g. the int literals are always
+        // (U)Int64, but the column might be Int8 and so on.
+        if (window_description.frame.begin_type
+            == WindowFrame::BoundaryType::Offset)
+        {
+            window_description.frame.begin_offset = convertFieldToTypeOrThrow(
+                window_description.frame.begin_offset,
+                *entry.type);
+
+            if (applyVisitor(FieldVisitorAccurateLess{},
+                window_description.frame.begin_offset, Field(0)))
+            {
+                throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                    "Window frame start offset must be nonnegative, {} given",
+                    window_description.frame.begin_offset);
+            }
+        }
+        if (window_description.frame.end_type
+            == WindowFrame::BoundaryType::Offset)
+        {
+            window_description.frame.end_offset = convertFieldToTypeOrThrow(
+                window_description.frame.end_offset,
+                *entry.type);
+
+            if (applyVisitor(FieldVisitorAccurateLess{},
+                window_description.frame.end_offset, Field(0)))
+            {
+                throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                    "Window frame start offset must be nonnegative, {} given",
+                    window_description.frame.end_offset);
+            }
+        }
     }
 }
 
@@ -340,6 +434,9 @@ auto WindowTransform::moveRowNumberNoCheck(const RowNumber & _x, int offset) con
             assertValid(x);
             assert(offset <= 0);
 
+            // abs(offset) is less than INT_MAX, as checked in the parser, so
+            // this negation should always work.
+            assert(offset >= -INT_MAX);
             if (x.row >= static_cast<uint64_t>(-offset))
             {
                 x.row -= -offset;
@@ -391,7 +488,7 @@ void WindowTransform::advanceFrameStartRowsOffset()
 {
     // Just recalculate it each time by walking blocks.
     const auto [moved_row, offset_left] = moveRowNumber(current_row,
-        window_description.frame.begin_offset
+        window_description.frame.begin_offset.get<UInt64>()
             * (window_description.frame.begin_preceding ? -1 : 1));
 
     frame_start = moved_row;
@@ -638,7 +735,7 @@ void WindowTransform::advanceFrameEndRowsOffset()
     // Walk the specified offset from the current row. The "+1" is needed
     // because the frame_end is a past-the-end pointer.
     const auto [moved_row, offset_left] = moveRowNumber(current_row,
-        window_description.frame.end_offset
+        window_description.frame.end_offset.get<UInt64>()
             * (window_description.frame.end_preceding ? -1 : 1)
             + 1);
 
@@ -852,14 +949,14 @@ void WindowTransform::writeOutCurrentRow()
     for (size_t wi = 0; wi < workspaces.size(); ++wi)
     {
         auto & ws = workspaces[wi];
-        IColumn * result_column = block.output_columns[wi].get();
 
         if (ws.window_function_impl)
         {
-            ws.window_function_impl->windowInsertResultInto(*result_column, this);
+            ws.window_function_impl->windowInsertResultInto(this, wi);
         }
         else
         {
+            IColumn * result_column = block.output_columns[wi].get();
             const auto * a = ws.aggregate_function.get();
             auto * buf = ws.aggregate_function_state.data();
             // FIXME does it also allocate the result on the arena?
@@ -881,12 +978,13 @@ void WindowTransform::appendChunk(Chunk & chunk)
         assert(chunk.hasRows());
         blocks.push_back({});
         auto & block = blocks.back();
+        // Use the number of rows from the Chunk, because it is correct even in
+        // the case where the Chunk has no columns. Not sure if this actually
+        // happens, because even in the case of `count() over ()` we have a dummy
+        // input column.
+        block.rows = chunk.getNumRows();
         block.input_columns = chunk.detachColumns();
 
-        // Even in case of `count() over ()` we should have a dummy input column.
-        // Not sure how reliable this is...
-        block.rows = block.input_columns[0]->size();
-
         for (auto & ws : workspaces)
         {
             // Aggregate functions can't work with constant columns, so we have to
@@ -1109,9 +1207,7 @@ IProcessor::Status WindowTransform::prepare()
         if (output.canPush())
         {
             // Output the ready block.
-//            fmt::print(stderr, "output block {}\n", next_output_block_number);
             const auto i = next_output_block_number - first_block_number;
-            ++next_output_block_number;
             auto & block = blocks[i];
             auto columns = block.input_columns;
             for (auto & res : block.output_columns)
@@ -1120,6 +1216,12 @@ IProcessor::Status WindowTransform::prepare()
             }
             output_data.chunk.setColumns(columns, block.rows);
 
+//            fmt::print(stderr, "output block {} as chunk '{}'\n",
+//                next_output_block_number,
+//                output_data.chunk.dumpStructure());
+
+            ++next_output_block_number;
+
             output.pushData(std::move(output_data));
         }
 
@@ -1275,8 +1377,13 @@ struct WindowFunctionRank final : public WindowFunction
     DataTypePtr getReturnType() const override
     { return std::make_shared<DataTypeUInt64>(); }
 
-    void windowInsertResultInto(IColumn & to, const WindowTransform * transform) override
+    bool allocatesMemoryInArena() const override { return false; }
+
+    void windowInsertResultInto(const WindowTransform * transform,
+        size_t function_index) override
     {
+        IColumn & to = *transform->blockAt(transform->current_row)
+            .output_columns[function_index];
         assert_cast<ColumnUInt64 &>(to).getData().push_back(
             transform->peer_group_start_row_number);
     }
@@ -1292,8 +1399,13 @@ struct WindowFunctionDenseRank final : public WindowFunction
     DataTypePtr getReturnType() const override
     { return std::make_shared<DataTypeUInt64>(); }
 
-    void windowInsertResultInto(IColumn & to, const WindowTransform * transform) override
+    bool allocatesMemoryInArena() const override { return false; }
+
+    void windowInsertResultInto(const WindowTransform * transform,
+        size_t function_index) override
     {
+        IColumn & to = *transform->blockAt(transform->current_row)
+            .output_columns[function_index];
         assert_cast<ColumnUInt64 &>(to).getData().push_back(
             transform->peer_group_number);
     }
@@ -1309,13 +1421,133 @@ struct WindowFunctionRowNumber final : public WindowFunction
     DataTypePtr getReturnType() const override
     { return std::make_shared<DataTypeUInt64>(); }
 
-    void windowInsertResultInto(IColumn & to, const WindowTransform * transform) override
+    bool allocatesMemoryInArena() const override { return false; }
+
+    void windowInsertResultInto(const WindowTransform * transform,
+        size_t function_index) override
     {
+        IColumn & to = *transform->blockAt(transform->current_row)
+            .output_columns[function_index];
         assert_cast<ColumnUInt64 &>(to).getData().push_back(
             transform->current_row_number);
     }
 };
 
+// ClickHouse-specific variant of lag/lead that respects the window frame.
+template <bool is_lead>
+struct WindowFunctionLagLeadInFrame final : public WindowFunction
+{
+    WindowFunctionLagLeadInFrame(const std::string & name_,
+            const DataTypes & argument_types_, const Array & parameters_)
+        : WindowFunction(name_, argument_types_, parameters_)
+    {
+        if (!parameters.empty())
+        {
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                "Function {} cannot be parameterized", name_);
+        }
+
+        if (argument_types.empty())
+        {
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                "Function {} takes at least one argument", name_);
+        }
+
+        if (argument_types.size() == 1)
+        {
+            return;
+        }
+
+        if (!isInt64FieldType(argument_types[1]->getDefault().getType()))
+        {
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                "Offset must be an integer, '{}' given",
+                argument_types[1]->getName());
+        }
+
+        if (argument_types.size() == 2)
+        {
+            return;
+        }
+
+        if (!getLeastSupertype({argument_types[0], argument_types[2]}))
+        {
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                "The default value type '{}' is not convertible to the argument type '{}'",
+                argument_types[2]->getName(),
+                argument_types[0]->getName());
+        }
+
+        if (argument_types.size() > 3)
+        {
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                "Function '{}' accepts at most 3 arguments, {} given",
+                name, argument_types.size());
+        }
+    }
+
+    DataTypePtr getReturnType() const override
+    { return argument_types[0]; }
+
+    bool allocatesMemoryInArena() const override { return false; }
+
+    void windowInsertResultInto(const WindowTransform * transform,
+        size_t function_index) override
+    {
+        const auto & current_block = transform->blockAt(transform->current_row);
+        IColumn & to = *current_block.output_columns[function_index];
+        const auto & workspace = transform->workspaces[function_index];
+
+        int offset = 1;
+        if (argument_types.size() > 1)
+        {
+            offset = (*current_block.input_columns[
+                    workspace.argument_column_indices[1]])[
+                        transform->current_row.row].get<Int64>();
+            if (offset < 0)
+            {
+                throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                    "The offset for function {} must be nonnegative, {} given",
+                    getName(), offset);
+            }
+            if (offset > INT_MAX)
+            {
+                throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                    "The offset for function {} must be less than {}, {} given",
+                    getName(), INT_MAX, offset);
+            }
+        }
+
+        const auto [target_row, offset_left] = transform->moveRowNumber(
+            transform->current_row, offset * (is_lead ? 1 : -1));
+
+        if (offset_left != 0
+            || target_row < transform->frame_start
+            || transform->frame_end <= target_row)
+        {
+            // Offset is outside the frame.
+            if (argument_types.size() > 2)
+            {
+                // Column with default values is specified.
+                to.insertFrom(*current_block.input_columns[
+                            workspace.argument_column_indices[2]],
+                    transform->current_row.row);
+            }
+            else
+            {
+                to.insertDefault();
+            }
+        }
+        else
+        {
+            // Offset is inside the frame.
+            to.insertFrom(*transform->blockAt(target_row).input_columns[
+                    workspace.argument_column_indices[0]],
+                target_row.row);
+        }
+    }
+};
+
 void registerWindowFunctions(AggregateFunctionFactory & factory)
 {
     // Why didn't I implement lag/lead yet? Because they are a mess. I imagine
@@ -1327,9 +1559,10 @@ void registerWindowFunctions(AggregateFunctionFactory & factory)
     // the whole partition like Postgres does, because using a linear amount
     // of additional memory is not an option when we have a lot of data. We must
     // be able to process at least the lag/lead in streaming fashion.
-    // Our best bet is probably rewriting, say `lag(value, offset)` to
-    // `any(value) over (rows between offset preceding and offset preceding)`,
-    // at the query planning stage.
+    // A partial solution for constant offsets is rewriting, say `lag(value, offset)
+    // to `any(value) over (rows between offset preceding and offset preceding)`.
+    // We also implement non-standard functions `lag/leadInFrame`, that are
+    // analogous to `lag/lead`, but respect the frame.
     // Functions like cume_dist() do require materializing the entire
     // partition, but it's probably also simpler to implement them by rewriting
     // to a (rows between unbounded preceding and unbounded following) frame,
@@ -1355,6 +1588,20 @@ void registerWindowFunctions(AggregateFunctionFactory & factory)
             return std::make_shared<WindowFunctionRowNumber>(name, argument_types,
                 parameters);
         });
+
+    factory.registerFunction("lagInFrame", [](const std::string & name,
+            const DataTypes & argument_types, const Array & parameters)
+        {
+            return std::make_shared<WindowFunctionLagLeadInFrame<false>>(
+                name, argument_types, parameters);
+        });
+
+    factory.registerFunction("leadInFrame", [](const std::string & name,
+            const DataTypes & argument_types, const Array & parameters)
+        {
+            return std::make_shared<WindowFunctionLagLeadInFrame<true>>(
+                name, argument_types, parameters);
+        });
 }
 
 }
diff --git a/src/Processors/Transforms/WindowTransform.h b/src/Processors/Transforms/WindowTransform.h
index 5001b984e9a..882bf429c0a 100644
--- a/src/Processors/Transforms/WindowTransform.h
+++ b/src/Processors/Transforms/WindowTransform.h
@@ -110,7 +110,9 @@ public:
     Status prepare() override;
     void work() override;
 
-private:
+    /*
+     * Implementation details.
+     */
     void advancePartitionEnd();
 
     bool arePeers(const RowNumber & x, const RowNumber & y) const;
@@ -321,10 +323,7 @@ public:
     int (* compare_values_with_offset) (
         const IColumn * compared_column, size_t compared_row,
         const IColumn * reference_column, size_t reference_row,
-        // We can make it a Field later if we need the Decimals. Now we only
-        // have ints and datetime, and the underlying Field type for them is
-        // uint64_t anyway.
-        uint64_t offset,
+        const Field & offset,
         bool offset_is_preceding);
 };
 
diff --git a/src/Processors/ya.make b/src/Processors/ya.make
index 34ff61d03c5..18f285e60a2 100644
--- a/src/Processors/ya.make
+++ b/src/Processors/ya.make
@@ -79,6 +79,7 @@ SRCS(
     LimitTransform.cpp
     Merges/Algorithms/AggregatingSortedAlgorithm.cpp
     Merges/Algorithms/CollapsingSortedAlgorithm.cpp
+    Merges/Algorithms/FinishAggregatingInOrderAlgorithm.cpp
     Merges/Algorithms/GraphiteRollupSortedAlgorithm.cpp
     Merges/Algorithms/IMergingAlgorithmWithDelayedChunk.cpp
     Merges/Algorithms/IMergingAlgorithmWithSharedChunks.cpp
@@ -92,9 +93,9 @@ SRCS(
     Pipe.cpp
     Port.cpp
     QueryPipeline.cpp
-    QueryPlan/AddingDelayedSourceStep.cpp
     QueryPlan/AggregatingStep.cpp
     QueryPlan/ArrayJoinStep.cpp
+    QueryPlan/BuildQueryPipelineSettings.cpp
     QueryPlan/CreatingSetsStep.cpp
     QueryPlan/CubeStep.cpp
     QueryPlan/DistinctStep.cpp
@@ -108,12 +109,13 @@ SRCS(
     QueryPlan/ITransformingStep.cpp
     QueryPlan/LimitByStep.cpp
     QueryPlan/LimitStep.cpp
-    QueryPlan/MaterializingStep.cpp
     QueryPlan/MergeSortingStep.cpp
     QueryPlan/MergingAggregatedStep.cpp
     QueryPlan/MergingFinal.cpp
     QueryPlan/MergingSortedStep.cpp
     QueryPlan/OffsetStep.cpp
+    QueryPlan/Optimizations/QueryPlanOptimizationSettings.cpp
+    QueryPlan/Optimizations/filterPushDown.cpp
     QueryPlan/Optimizations/liftUpArrayJoin.cpp
     QueryPlan/Optimizations/limitPushDown.cpp
     QueryPlan/Optimizations/mergeExpressions.cpp
@@ -122,9 +124,9 @@ SRCS(
     QueryPlan/PartialSortingStep.cpp
     QueryPlan/QueryIdHolder.cpp
     QueryPlan/QueryPlan.cpp
+    QueryPlan/ReadFromMergeTree.cpp
     QueryPlan/ReadFromPreparedSource.cpp
     QueryPlan/ReadNothingStep.cpp
-    QueryPlan/ReverseRowsStep.cpp
     QueryPlan/RollupStep.cpp
     QueryPlan/SettingQuotaAndLimitsStep.cpp
     QueryPlan/TotalsHavingStep.cpp
diff --git a/src/Server/GRPCServer.cpp b/src/Server/GRPCServer.cpp
index ede9bbff063..6f0f2d30123 100644
--- a/src/Server/GRPCServer.cpp
+++ b/src/Server/GRPCServer.cpp
@@ -521,7 +521,7 @@ namespace
         Poco::Logger * log = nullptr;
 
         std::shared_ptr<NamedSession> session;
-        std::optional<Context> query_context;
+        ContextPtr query_context;
         std::optional<CurrentThread::QueryScope> query_scope;
         String query_text;
         ASTPtr ast;
@@ -651,7 +651,7 @@ namespace
         }
 
         /// Create context.
-        query_context.emplace(iserver.context());
+        query_context = Context::createCopy(iserver.context());
 
         /// Authentication.
         query_context->setUser(user, password, user_address);
@@ -665,11 +665,11 @@ namespace
         {
             session = query_context->acquireNamedSession(
                 query_info.session_id(), getSessionTimeout(query_info, iserver.config()), query_info.session_check());
-            query_context = session->context;
+            query_context = Context::createCopy(session->context);
             query_context->setSessionContext(session->context);
         }
 
-        query_scope.emplace(*query_context);
+        query_scope.emplace(query_context);
 
         /// Set client info.
         ClientInfo & client_info = query_context->getClientInfo();
@@ -741,26 +741,26 @@ namespace
             output_format = query_context->getDefaultFormat();
 
         /// Set callback to create and fill external tables
-        query_context->setExternalTablesInitializer([this] (Context & context)
+        query_context->setExternalTablesInitializer([this] (ContextPtr context)
         {
-            if (&context != &*query_context)
+            if (context != query_context)
                 throw Exception("Unexpected context in external tables initializer", ErrorCodes::LOGICAL_ERROR);
             createExternalTables();
         });
 
         /// Set callbacks to execute function input().
-        query_context->setInputInitializer([this] (Context & context, const StoragePtr & input_storage)
+        query_context->setInputInitializer([this] (ContextPtr context, const StoragePtr & input_storage)
         {
-            if (&context != &query_context.value())
+            if (context != query_context)
                 throw Exception("Unexpected context in Input initializer", ErrorCodes::LOGICAL_ERROR);
             input_function_is_used = true;
             initializeBlockInputStream(input_storage->getInMemoryMetadataPtr()->getSampleBlock());
             block_input_stream->readPrefix();
         });
 
-        query_context->setInputBlocksReaderCallback([this](Context & context) -> Block
+        query_context->setInputBlocksReaderCallback([this](ContextPtr context) -> Block
         {
-            if (&context != &query_context.value())
+            if (context != query_context)
                 throw Exception("Unexpected context in InputBlocksReader", ErrorCodes::LOGICAL_ERROR);
             auto block = block_input_stream->read();
             if (!block)
@@ -775,7 +775,7 @@ namespace
             query_end = insert_query->data;
         }
         String query(begin, query_end);
-        io = ::DB::executeQuery(query, *query_context, false, QueryProcessingStage::Complete, true, true);
+        io = ::DB::executeQuery(query, query_context, false, QueryProcessingStage::Complete, true, true);
     }
 
     void Call::processInput()
@@ -783,8 +783,6 @@ namespace
         if (!io.out)
             return;
 
-        initializeBlockInputStream(io.out->getHeader());
-
         bool has_data_to_insert = (insert_query && insert_query->data)
                                   || !query_info.input_data().empty() || query_info.next_query_info();
         if (!has_data_to_insert)
@@ -795,6 +793,10 @@ namespace
                 throw Exception("No data to insert", ErrorCodes::NO_DATA_TO_INSERT);
         }
 
+        /// This is significant, because parallel parsing may be used.
+        /// So we mustn't touch the input stream from other thread.
+        initializeBlockInputStream(io.out->getHeader());
+
         block_input_stream->readPrefix();
         io.out->writePrefix();
 
@@ -876,10 +878,10 @@ namespace
                 auto table_id = query_context->resolveStorageID(insert_query->table_id, Context::ResolveOrdinary);
                 if (query_context->getSettingsRef().input_format_defaults_for_omitted_fields && table_id)
                 {
-                    StoragePtr storage = DatabaseCatalog::instance().getTable(table_id, *query_context);
+                    StoragePtr storage = DatabaseCatalog::instance().getTable(table_id, query_context);
                     const auto & columns = storage->getInMemoryMetadataPtr()->getColumns();
                     if (!columns.empty())
-                        block_input_stream = std::make_shared<AddingDefaultsBlockInputStream>(block_input_stream, columns, *query_context);
+                        block_input_stream = std::make_shared<AddingDefaultsBlockInputStream>(block_input_stream, columns, query_context);
                 }
             }
         }
@@ -901,7 +903,7 @@ namespace
                 StoragePtr storage;
                 if (auto resolved = query_context->tryResolveStorageID(temporary_id, Context::ResolveExternal))
                 {
-                    storage = DatabaseCatalog::instance().getTable(resolved, *query_context);
+                    storage = DatabaseCatalog::instance().getTable(resolved, query_context);
                 }
                 else
                 {
@@ -916,7 +918,7 @@ namespace
                         column.type = DataTypeFactory::instance().get(name_and_type.type());
                         columns.emplace_back(std::move(column));
                     }
-                    auto temporary_table = TemporaryTableHolder(*query_context, ColumnsDescription{columns}, {});
+                    auto temporary_table = TemporaryTableHolder(query_context, ColumnsDescription{columns}, {});
                     storage = temporary_table.getTable();
                     query_context->addExternalTable(temporary_id.table_name, std::move(temporary_table));
                 }
@@ -925,17 +927,17 @@ namespace
                 {
                     /// The data will be written directly to the table.
                     auto metadata_snapshot = storage->getInMemoryMetadataPtr();
-                    auto out_stream = storage->write(ASTPtr(), metadata_snapshot, *query_context);
+                    auto out_stream = storage->write(ASTPtr(), metadata_snapshot, query_context);
                     ReadBufferFromMemory data(external_table.data().data(), external_table.data().size());
                     String format = external_table.format();
                     if (format.empty())
                         format = "TabSeparated";
-                    Context * external_table_context = &*query_context;
-                    std::optional<Context> temp_context;
+                    ContextPtr external_table_context = query_context;
+                    ContextPtr temp_context;
                     if (!external_table.settings().empty())
                     {
-                        temp_context = *query_context;
-                        external_table_context = &*temp_context;
+                        temp_context = Context::createCopy(query_context);
+                        external_table_context = temp_context;
                         SettingsChanges settings_changes;
                         for (const auto & [key, value] : external_table.settings())
                             settings_changes.push_back({key, value});
diff --git a/src/Server/HTTP/HTMLForm.cpp b/src/Server/HTTP/HTMLForm.cpp
index ca407858c33..7a87f484b5c 100644
--- a/src/Server/HTTP/HTMLForm.cpp
+++ b/src/Server/HTTP/HTMLForm.cpp
@@ -71,23 +71,6 @@ HTMLForm::HTMLForm(const Poco::URI & uri) : field_limit(DFL_FIELD_LIMIT), value_
 }
 
 
-void HTMLForm::setEncoding(const std::string & encoding_)
-{
-    encoding = encoding_;
-}
-
-
-void HTMLForm::addPart(const std::string & name, Poco::Net::PartSource * source)
-{
-    poco_check_ptr(source);
-
-    Part part;
-    part.name = name;
-    part.source = std::unique_ptr<Poco::Net::PartSource>(source);
-    parts.push_back(std::move(part));
-}
-
-
 void HTMLForm::load(const Poco::Net::HTTPRequest & request, ReadBuffer & requestBody, PartHandler & handler)
 {
     clear();
@@ -126,36 +109,12 @@ void HTMLForm::load(const Poco::Net::HTTPRequest & request, ReadBuffer & request
 }
 
 
-void HTMLForm::load(const Poco::Net::HTTPRequest & request)
-{
-    NullPartHandler nah;
-    EmptyReadBuffer nis;
-    load(request, nis, nah);
-}
-
-
-void HTMLForm::read(ReadBuffer & in, PartHandler & handler)
-{
-    if (encoding == ENCODING_URL)
-        readQuery(in);
-    else
-        readMultipart(in, handler);
-}
-
-
 void HTMLForm::read(ReadBuffer & in)
 {
     readQuery(in);
 }
 
 
-void HTMLForm::read(const std::string & queryString)
-{
-    ReadBufferFromString istr(queryString);
-    readQuery(istr);
-}
-
-
 void HTMLForm::readQuery(ReadBuffer & in)
 {
     size_t fields = 0;
@@ -269,22 +228,6 @@ void HTMLForm::readMultipart(ReadBuffer & in_, PartHandler & handler)
 }
 
 
-void HTMLForm::setFieldLimit(int limit)
-{
-    poco_assert(limit >= 0);
-
-    field_limit = limit;
-}
-
-
-void HTMLForm::setValueLengthLimit(int limit)
-{
-    poco_assert(limit >= 0);
-
-    value_length_limit = limit;
-}
-
-
 HTMLForm::MultipartReadBuffer::MultipartReadBuffer(ReadBuffer & in_, const std::string & boundary_)
     : ReadBuffer(nullptr, 0), in(in_), boundary("--" + boundary_)
 {
@@ -369,6 +312,11 @@ bool HTMLForm::MultipartReadBuffer::nextImpl()
     else
         boundary_hit = startsWith(line, boundary);
 
+    if (!line.empty())
+        /// If we don't make sure that memory is contiguous then situation may happen, when part of the line is inside internal memory
+        /// and other part is inside sub-buffer, thus we'll be unable to setup our working buffer properly.
+        in.makeContinuousMemoryFromCheckpointToPos();
+
     in.rollbackToCheckpoint(true);
 
     /// Rolling back to checkpoint may change underlying buffers.
diff --git a/src/Server/HTTP/HTMLForm.h b/src/Server/HTTP/HTMLForm.h
index 27be712e1d5..8d8fb0d1719 100644
--- a/src/Server/HTTP/HTMLForm.h
+++ b/src/Server/HTTP/HTMLForm.h
@@ -52,24 +52,6 @@ public:
         return (it != end()) ? DB::parse<T>(it->second) : default_value;
     }
 
-    template <typename T>
-    T getParsed(const std::string & key)
-    {
-        return DB::parse<T>(get(key));
-    }
-
-    /// Sets the encoding used for posting the form.
-    /// Encoding must be either "application/x-www-form-urlencoded" (which is the default) or "multipart/form-data".
-    void setEncoding(const std::string & encoding);
-
-    /// Returns the encoding used for posting the form.
-    const std::string & getEncoding() const { return encoding; }
-
-    /// Adds an part/attachment (file upload) to the form.
-    /// The form takes ownership of the PartSource and deletes it when it is no longer needed.
-    /// The part will only be sent if the encoding set for the form is "multipart/form-data"
-    void addPart(const std::string & name, Poco::Net::PartSource * pSource);
-
     /// Reads the form data from the given HTTP request.
     /// Uploaded files are passed to the given PartHandler.
     void load(const Poco::Net::HTTPRequest & request, ReadBuffer & requestBody, PartHandler & handler);
@@ -78,41 +60,10 @@ public:
     /// Uploaded files are silently discarded.
     void load(const Poco::Net::HTTPRequest & request, ReadBuffer & requestBody);
 
-    /// Reads the form data from the given HTTP request.
-    /// The request must be a GET request and the form data must be in the query string (URL encoded).
-    /// For POST requests, you must use one of the overloads taking an additional input stream for the request body.
-    void load(const Poco::Net::HTTPRequest & request);
-
-    /// Reads the form data from the given input stream.
-    /// The form data read from the stream must be in the encoding specified for the form.
-    /// Note that read() does not clear the form before reading the new values.
-    void read(ReadBuffer & in, PartHandler & handler);
-
     /// Reads the URL-encoded form data from the given input stream.
     /// Note that read() does not clear the form before reading the new values.
     void read(ReadBuffer & in);
 
-    /// Reads the form data from the given HTTP query string.
-    /// Note that read() does not clear the form before reading the new values.
-    void read(const std::string & queryString);
-
-    /// Returns the MIME boundary used for writing multipart form data.
-    const std::string & getBoundary() const { return boundary; }
-
-    /// Returns the maximum number of header fields allowed.
-    /// See setFieldLimit() for more information.
-    int getFieldLimit() const { return field_limit; }
-
-    /// Sets the maximum number of header fields allowed. This limit is used to defend certain kinds of denial-of-service attacks.
-    /// Specify 0 for unlimited (not recommended). The default limit is 100.
-    void setFieldLimit(int limit);
-
-    /// Sets the maximum size for form field values stored as strings.
-    void setValueLengthLimit(int limit);
-
-    /// Returns the maximum size for form field values stored as strings.
-    int getValueLengthLimit() const { return value_length_limit; }
-
     static const std::string ENCODING_URL; /// "application/x-www-form-urlencoded"
     static const std::string ENCODING_MULTIPART; /// "multipart/form-data"
     static const int UNKNOWN_CONTENT_LENGTH;
diff --git a/src/Server/HTTP/HTTPServer.cpp b/src/Server/HTTP/HTTPServer.cpp
index 3e050080bdd..42e6467d0af 100644
--- a/src/Server/HTTP/HTTPServer.cpp
+++ b/src/Server/HTTP/HTTPServer.cpp
@@ -6,16 +6,16 @@
 namespace DB
 {
 HTTPServer::HTTPServer(
-    const Context & context,
+    ContextPtr context,
     HTTPRequestHandlerFactoryPtr factory_,
-    UInt16 portNumber,
+    UInt16 port_number,
     Poco::Net::HTTPServerParams::Ptr params)
-    : TCPServer(new HTTPServerConnectionFactory(context, params, factory_), portNumber, params), factory(factory_)
+    : TCPServer(new HTTPServerConnectionFactory(context, params, factory_), port_number, params), factory(factory_)
 {
 }
 
 HTTPServer::HTTPServer(
-    const Context & context,
+    ContextPtr context,
     HTTPRequestHandlerFactoryPtr factory_,
     const Poco::Net::ServerSocket & socket,
     Poco::Net::HTTPServerParams::Ptr params)
@@ -24,12 +24,12 @@ HTTPServer::HTTPServer(
 }
 
 HTTPServer::HTTPServer(
-    const Context & context,
+    ContextPtr context,
     HTTPRequestHandlerFactoryPtr factory_,
-    Poco::ThreadPool & threadPool,
+    Poco::ThreadPool & thread_pool,
     const Poco::Net::ServerSocket & socket,
     Poco::Net::HTTPServerParams::Ptr params)
-    : TCPServer(new HTTPServerConnectionFactory(context, params, factory_), threadPool, socket, params), factory(factory_)
+    : TCPServer(new HTTPServerConnectionFactory(context, params, factory_), thread_pool, socket, params), factory(factory_)
 {
 }
 
diff --git a/src/Server/HTTP/HTTPServer.h b/src/Server/HTTP/HTTPServer.h
index 1ce62c65ca2..d95bdff0baa 100644
--- a/src/Server/HTTP/HTTPServer.h
+++ b/src/Server/HTTP/HTTPServer.h
@@ -17,27 +17,27 @@ class HTTPServer : public Poco::Net::TCPServer
 {
 public:
     explicit HTTPServer(
-        const Context & context,
+        ContextPtr context,
         HTTPRequestHandlerFactoryPtr factory,
-        UInt16 portNumber = 80,
+        UInt16 port_number = 80,
         Poco::Net::HTTPServerParams::Ptr params = new Poco::Net::HTTPServerParams);
 
     HTTPServer(
-        const Context & context,
+        ContextPtr context,
         HTTPRequestHandlerFactoryPtr factory,
         const Poco::Net::ServerSocket & socket,
         Poco::Net::HTTPServerParams::Ptr params);
 
     HTTPServer(
-        const Context & context,
+        ContextPtr context,
         HTTPRequestHandlerFactoryPtr factory,
-        Poco::ThreadPool & threadPool,
+        Poco::ThreadPool & thread_pool,
         const Poco::Net::ServerSocket & socket,
         Poco::Net::HTTPServerParams::Ptr params);
 
     ~HTTPServer() override;
 
-    void stopAll(bool abortCurrent = false);
+    void stopAll(bool abort_current = false);
 
 private:
     HTTPRequestHandlerFactoryPtr factory;
diff --git a/src/Server/HTTP/HTTPServerConnection.cpp b/src/Server/HTTP/HTTPServerConnection.cpp
index e2ee4c8882b..19985949005 100644
--- a/src/Server/HTTP/HTTPServerConnection.cpp
+++ b/src/Server/HTTP/HTTPServerConnection.cpp
@@ -6,11 +6,11 @@ namespace DB
 {
 
 HTTPServerConnection::HTTPServerConnection(
-    const Context & context_,
+    ContextPtr context_,
     const Poco::Net::StreamSocket & socket,
     Poco::Net::HTTPServerParams::Ptr params_,
     HTTPRequestHandlerFactoryPtr factory_)
-    : TCPServerConnection(socket), context(context_), params(params_), factory(factory_), stopped(false)
+    : TCPServerConnection(socket), context(Context::createCopy(context_)), params(params_), factory(factory_), stopped(false)
 {
     poco_check_ptr(factory);
 }
@@ -67,15 +67,15 @@ void HTTPServerConnection::run()
                 }
             }
         }
-        catch (Poco::Net::NoMessageException &)
+        catch (const Poco::Net::NoMessageException &)
         {
             break;
         }
-        catch (Poco::Net::MessageException &)
+        catch (const Poco::Net::MessageException &)
         {
             sendErrorResponse(session, Poco::Net::HTTPResponse::HTTP_BAD_REQUEST);
         }
-        catch (Poco::Exception &)
+        catch (const Poco::Exception &)
         {
             if (session.networkException())
             {
@@ -98,31 +98,4 @@ void HTTPServerConnection::sendErrorResponse(Poco::Net::HTTPServerSession & sess
     session.setKeepAlive(false);
 }
 
-void HTTPServerConnection::onServerStopped(const bool & abortCurrent)
-{
-    stopped = true;
-    if (abortCurrent)
-    {
-        try
-        {
-            socket().shutdown();
-        }
-        catch (...)
-        {
-        }
-    }
-    else
-    {
-        std::unique_lock<std::mutex> lock(mutex);
-
-        try
-        {
-            socket().shutdown();
-        }
-        catch (...)
-        {
-        }
-    }
-}
-
 }
diff --git a/src/Server/HTTP/HTTPServerConnection.h b/src/Server/HTTP/HTTPServerConnection.h
index 589c33025bf..1c7ae6cd2b7 100644
--- a/src/Server/HTTP/HTTPServerConnection.h
+++ b/src/Server/HTTP/HTTPServerConnection.h
@@ -14,7 +14,7 @@ class HTTPServerConnection : public Poco::Net::TCPServerConnection
 {
 public:
     HTTPServerConnection(
-        const Context & context,
+        ContextPtr context,
         const Poco::Net::StreamSocket & socket,
         Poco::Net::HTTPServerParams::Ptr params,
         HTTPRequestHandlerFactoryPtr factory);
@@ -23,10 +23,9 @@ public:
 
 protected:
     static void sendErrorResponse(Poco::Net::HTTPServerSession & session, Poco::Net::HTTPResponse::HTTPStatus status);
-    void onServerStopped(const bool & abortCurrent);
 
 private:
-    Context context;
+    ContextPtr context;
     Poco::Net::HTTPServerParams::Ptr params;
     HTTPRequestHandlerFactoryPtr factory;
     bool stopped;
diff --git a/src/Server/HTTP/HTTPServerConnectionFactory.cpp b/src/Server/HTTP/HTTPServerConnectionFactory.cpp
index 876ccb9096b..0e4fb6cfcec 100644
--- a/src/Server/HTTP/HTTPServerConnectionFactory.cpp
+++ b/src/Server/HTTP/HTTPServerConnectionFactory.cpp
@@ -5,8 +5,8 @@
 namespace DB
 {
 HTTPServerConnectionFactory::HTTPServerConnectionFactory(
-    const Context & context_, Poco::Net::HTTPServerParams::Ptr params_, HTTPRequestHandlerFactoryPtr factory_)
-    : context(context_), params(params_), factory(factory_)
+    ContextPtr context_, Poco::Net::HTTPServerParams::Ptr params_, HTTPRequestHandlerFactoryPtr factory_)
+    : context(Context::createCopy(context_)), params(params_), factory(factory_)
 {
     poco_check_ptr(factory);
 }
diff --git a/src/Server/HTTP/HTTPServerConnectionFactory.h b/src/Server/HTTP/HTTPServerConnectionFactory.h
index 4f8ca43cbfb..3f11eca0f69 100644
--- a/src/Server/HTTP/HTTPServerConnectionFactory.h
+++ b/src/Server/HTTP/HTTPServerConnectionFactory.h
@@ -12,12 +12,12 @@ namespace DB
 class HTTPServerConnectionFactory : public Poco::Net::TCPServerConnectionFactory
 {
 public:
-    HTTPServerConnectionFactory(const Context & context, Poco::Net::HTTPServerParams::Ptr params, HTTPRequestHandlerFactoryPtr factory);
+    HTTPServerConnectionFactory(ContextPtr context, Poco::Net::HTTPServerParams::Ptr params, HTTPRequestHandlerFactoryPtr factory);
 
     Poco::Net::TCPServerConnection * createConnection(const Poco::Net::StreamSocket & socket) override;
 
 private:
-    Context context;
+    ContextPtr context;
     Poco::Net::HTTPServerParams::Ptr params;
     HTTPRequestHandlerFactoryPtr factory;
 };
diff --git a/src/Server/HTTP/HTTPServerRequest.cpp b/src/Server/HTTP/HTTPServerRequest.cpp
index bdba6a51d91..69dc8d4dbda 100644
--- a/src/Server/HTTP/HTTPServerRequest.cpp
+++ b/src/Server/HTTP/HTTPServerRequest.cpp
@@ -15,8 +15,8 @@
 
 namespace DB
 {
-
-HTTPServerRequest::HTTPServerRequest(const Context & context, HTTPServerResponse & response, Poco::Net::HTTPServerSession & session)
+HTTPServerRequest::HTTPServerRequest(ContextPtr context, HTTPServerResponse & response, Poco::Net::HTTPServerSession & session)
+    : max_uri_size(context->getSettingsRef().http_max_uri_size)
 {
     response.attachRequest(this);
 
@@ -24,9 +24,8 @@ HTTPServerRequest::HTTPServerRequest(const Context & context, HTTPServerResponse
     client_address = session.clientAddress();
     server_address = session.serverAddress();
 
-    auto receive_timeout = context.getSettingsRef().http_receive_timeout;
-    auto send_timeout = context.getSettingsRef().http_send_timeout;
-    auto max_query_size = context.getSettingsRef().max_query_size;
+    auto receive_timeout = context->getSettingsRef().http_receive_timeout;
+    auto send_timeout = context->getSettingsRef().http_send_timeout;
 
     session.socket().setReceiveTimeout(receive_timeout);
     session.socket().setSendTimeout(send_timeout);
@@ -37,7 +36,7 @@ HTTPServerRequest::HTTPServerRequest(const Context & context, HTTPServerResponse
     readRequest(*in);  /// Try parse according to RFC7230
 
     if (getChunkedTransferEncoding())
-        stream = std::make_unique<HTTPChunkedReadBuffer>(std::move(in), max_query_size);
+        stream = std::make_unique<HTTPChunkedReadBuffer>(std::move(in));
     else if (hasContentLength())
         stream = std::make_unique<LimitReadBuffer>(std::move(in), getContentLength(), false);
     else if (getMethod() != HTTPRequest::HTTP_GET && getMethod() != HTTPRequest::HTTP_HEAD && getMethod() != HTTPRequest::HTTP_DELETE)
@@ -93,10 +92,10 @@ void HTTPServerRequest::readRequest(ReadBuffer & in)
 
     skipWhitespaceIfAny(in);
 
-    while (in.read(ch) && !Poco::Ascii::isSpace(ch) && uri.size() <= MAX_URI_LENGTH)
+    while (in.read(ch) && !Poco::Ascii::isSpace(ch) && uri.size() <= max_uri_size)
         uri += ch;
 
-    if (uri.size() > MAX_URI_LENGTH)
+    if (uri.size() > max_uri_size)
         throw Poco::Net::MessageException("HTTP request URI invalid or too long");
 
     skipWhitespaceIfAny(in);
diff --git a/src/Server/HTTP/HTTPServerRequest.h b/src/Server/HTTP/HTTPServerRequest.h
index 7fd54850212..a560f907cf0 100644
--- a/src/Server/HTTP/HTTPServerRequest.h
+++ b/src/Server/HTTP/HTTPServerRequest.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <Interpreters/Context_fwd.h>
 #include <IO/ReadBuffer.h>
 #include <Server/HTTP/HTTPRequest.h>
 
@@ -8,14 +9,13 @@
 namespace DB
 {
 
-class Context;
 class HTTPServerResponse;
 class ReadBufferFromPocoSocket;
 
 class HTTPServerRequest : public HTTPRequest
 {
 public:
-    HTTPServerRequest(const Context & context, HTTPServerResponse & response, Poco::Net::HTTPServerSession & session);
+    HTTPServerRequest(ContextPtr context, HTTPServerResponse & response, Poco::Net::HTTPServerSession & session);
 
     /// FIXME: it's a little bit inconvenient interface. The rationale is that all other ReadBuffer's wrap each other
     ///        via unique_ptr - but we can't inherit HTTPServerRequest from ReadBuffer and pass it around,
@@ -43,11 +43,12 @@ private:
         MAX_NAME_LENGTH = 256,
         MAX_VALUE_LENGTH = 8192,
         MAX_METHOD_LENGTH = 32,
-        MAX_URI_LENGTH = 16384,
         MAX_VERSION_LENGTH = 8,
         MAX_FIELDS_NUMBER = 100,
     };
 
+    const size_t max_uri_size;
+
     std::unique_ptr<ReadBuffer> stream;
     Poco::Net::SocketImpl * socket;
     Poco::Net::SocketAddress client_address;
diff --git a/src/Server/HTTP/HTTPServerResponse.cpp b/src/Server/HTTP/HTTPServerResponse.cpp
index e3d52fffa80..db5cfb132e3 100644
--- a/src/Server/HTTP/HTTPServerResponse.cpp
+++ b/src/Server/HTTP/HTTPServerResponse.cpp
@@ -94,32 +94,6 @@ std::pair<std::shared_ptr<std::ostream>, std::shared_ptr<std::ostream>> HTTPServ
     return std::make_pair(header_stream, stream);
 }
 
-void HTTPServerResponse::sendFile(const std::string & path, const std::string & mediaType)
-{
-    poco_assert(!stream);
-
-    Poco::File f(path);
-    Poco::Timestamp date_time = f.getLastModified();
-    Poco::File::FileSize length = f.getSize();
-    set("Last-Modified", Poco::DateTimeFormatter::format(date_time, Poco::DateTimeFormat::HTTP_FORMAT));
-    setContentLength64(length);
-    setContentType(mediaType);
-    setChunkedTransferEncoding(false);
-
-    Poco::FileInputStream istr(path);
-    if (istr.good())
-    {
-        stream = std::make_shared<Poco::Net::HTTPHeaderOutputStream>(session);
-        write(*stream);
-        if (request && request->getMethod() != HTTPRequest::HTTP_HEAD)
-        {
-            Poco::StreamCopier::copyStream(istr, *stream);
-        }
-    }
-    else
-        throw Poco::OpenFileException(path);
-}
-
 void HTTPServerResponse::sendBuffer(const void * buffer, std::size_t length)
 {
     poco_assert(!stream);
@@ -135,20 +109,6 @@ void HTTPServerResponse::sendBuffer(const void * buffer, std::size_t length)
     }
 }
 
-void HTTPServerResponse::redirect(const std::string & uri, HTTPStatus status)
-{
-    poco_assert(!stream);
-
-    setContentLength(0);
-    setChunkedTransferEncoding(false);
-
-    setStatusAndReason(status);
-    set("Location", uri);
-
-    stream = std::make_shared<Poco::Net::HTTPHeaderOutputStream>(session);
-    write(*stream);
-}
-
 void HTTPServerResponse::requireAuthentication(const std::string & realm)
 {
     poco_assert(!stream);
diff --git a/src/Server/HTTP/HTTPServerResponse.h b/src/Server/HTTP/HTTPServerResponse.h
index 82221ce3a83..f5b7a70dc79 100644
--- a/src/Server/HTTP/HTTPServerResponse.h
+++ b/src/Server/HTTP/HTTPServerResponse.h
@@ -36,17 +36,6 @@ public:
     /// or redirect() has been called.
     std::pair<std::shared_ptr<std::ostream>, std::shared_ptr<std::ostream>> beginSend(); /// TODO: use some WriteBuffer implementation here.
 
-    /// Sends the response header to the client, followed
-    /// by the content of the given file.
-    ///
-    /// Must not be called after send(), sendBuffer()
-    /// or redirect() has been called.
-    ///
-    /// Throws a FileNotFoundException if the file
-    /// cannot be found, or an OpenFileException if
-    /// the file cannot be opened.
-    void sendFile(const std::string & path, const std::string & mediaType);
-
     /// Sends the response header to the client, followed
     /// by the contents of the given buffer.
     ///
@@ -61,16 +50,6 @@ public:
     /// or redirect() has been called.
     void sendBuffer(const void * pBuffer, std::size_t length); /// FIXME: do we need this one?
 
-    /// Sets the status code, which must be one of
-    /// HTTP_MOVED_PERMANENTLY (301), HTTP_FOUND (302),
-    /// or HTTP_SEE_OTHER (303),
-    /// and sets the "Location" header field
-    /// to the given URI, which according to
-    /// the HTTP specification, must be absolute.
-    ///
-    /// Must not be called after send() has been called.
-    void redirect(const std::string & uri, Poco::Net::HTTPResponse::HTTPStatus status = Poco::Net::HTTPResponse::HTTP_FOUND);
-
     void requireAuthentication(const std::string & realm);
     /// Sets the status code to 401 (Unauthorized)
     /// and sets the "WWW-Authenticate" header field
@@ -83,7 +62,7 @@ public:
 
 private:
     Poco::Net::HTTPServerSession & session;
-    HTTPServerRequest * request;
+    HTTPServerRequest * request = nullptr;
     std::shared_ptr<std::ostream> stream;
     std::shared_ptr<std::ostream> header_stream;
 };
diff --git a/src/Server/HTTP/README.md b/src/Server/HTTP/README.md
new file mode 100644
index 00000000000..71730962780
--- /dev/null
+++ b/src/Server/HTTP/README.md
@@ -0,0 +1,3 @@
+# Notice
+
+The source code located in this folder is based on some files from the POCO project, from here `contrib/poco/Net/src`.
diff --git a/src/Server/HTTP/ReadHeaders.cpp b/src/Server/HTTP/ReadHeaders.cpp
index 77ec48c11b1..2fc2de8321a 100644
--- a/src/Server/HTTP/ReadHeaders.cpp
+++ b/src/Server/HTTP/ReadHeaders.cpp
@@ -51,7 +51,7 @@ void readHeaders(
             if (name.size() > max_name_length)
                 throw Poco::Net::MessageException("Field name is too long");
             if (ch != ':')
-                throw Poco::Net::MessageException("Field name is invalid or no colon found");
+                throw Poco::Net::MessageException(fmt::format("Field name is invalid or no colon found: \"{}\"", name));
         }
 
         in.ignore();
diff --git a/src/Server/HTTP/WriteBufferFromHTTPServerResponse.cpp b/src/Server/HTTP/WriteBufferFromHTTPServerResponse.cpp
index 81f8cc30468..a4fe3649e6f 100644
--- a/src/Server/HTTP/WriteBufferFromHTTPServerResponse.cpp
+++ b/src/Server/HTTP/WriteBufferFromHTTPServerResponse.cpp
@@ -171,6 +171,8 @@ void WriteBufferFromHTTPServerResponse::finalize()
     try
     {
         next();
+        if (out)
+            out->finalize();
         out.reset();
     }
     catch (...)
@@ -194,7 +196,7 @@ void WriteBufferFromHTTPServerResponse::finalize()
 WriteBufferFromHTTPServerResponse::~WriteBufferFromHTTPServerResponse()
 {
     /// FIXME move final flush into the caller
-    MemoryTracker::LockExceptionInThread lock;
+    MemoryTracker::LockExceptionInThread lock(VariableContext::Global);
     finalize();
 }
 
diff --git a/src/Server/HTTPHandler.cpp b/src/Server/HTTPHandler.cpp
index d200ee7421f..8aed5d20f74 100644
--- a/src/Server/HTTPHandler.cpp
+++ b/src/Server/HTTPHandler.cpp
@@ -1,5 +1,8 @@
 #include <Server/HTTPHandler.h>
 
+#include <Access/Authentication.h>
+#include <Access/Credentials.h>
+#include <Access/ExternalAuthenticators.h>
 #include <Compression/CompressedReadBuffer.h>
 #include <Compression/CompressedWriteBuffer.h>
 #include <Core/ExternalTable.h>
@@ -34,13 +37,19 @@
 #    include <Common/config.h>
 #endif
 
+#include <Poco/Base64Decoder.h>
+#include <Poco/Base64Encoder.h>
 #include <Poco/File.h>
 #include <Poco/Net/HTTPBasicCredentials.h>
 #include <Poco/Net/HTTPStream.h>
 #include <Poco/Net/NetException.h>
+#include <Poco/MemoryStream.h>
+#include <Poco/StreamCopier.h>
+#include <Poco/String.h>
 
 #include <chrono>
 #include <iomanip>
+#include <sstream>
 
 
 namespace DB
@@ -93,12 +102,32 @@ namespace ErrorCodes
     extern const int UNKNOWN_USER;
     extern const int WRONG_PASSWORD;
     extern const int REQUIRED_PASSWORD;
+    extern const int AUTHENTICATION_FAILED;
 
     extern const int BAD_REQUEST_PARAMETER;
     extern const int INVALID_SESSION_TIMEOUT;
     extern const int HTTP_LENGTH_REQUIRED;
 }
 
+static String base64Decode(const String & encoded)
+{
+    String decoded;
+    Poco::MemoryInputStream istr(encoded.data(), encoded.size());
+    Poco::Base64Decoder decoder(istr);
+    Poco::StreamCopier::copyToString(decoder, decoded);
+    return decoded;
+}
+
+static String base64Encode(const String & decoded)
+{
+    std::ostringstream ostr; // STYLE_CHECK_ALLOW_STD_STRING_STREAM
+    ostr.exceptions(std::ios::failbit);
+    Poco::Base64Encoder encoder(ostr);
+    encoder.rdbuf()->setLineLength(0);
+    encoder << decoded;
+    encoder.close();
+    return ostr.str();
+}
 
 static Poco::Net::HTTPResponse::HTTPStatus exceptionCodeToHTTPStatus(int exception_code)
 {
@@ -108,6 +137,12 @@ static Poco::Net::HTTPResponse::HTTPStatus exceptionCodeToHTTPStatus(int excepti
     {
         return HTTPResponse::HTTP_UNAUTHORIZED;
     }
+    else if (exception_code == ErrorCodes::UNKNOWN_USER ||
+             exception_code == ErrorCodes::WRONG_PASSWORD ||
+             exception_code == ErrorCodes::AUTHENTICATION_FAILED)
+    {
+        return HTTPResponse::HTTP_FORBIDDEN;
+    }
     else if (exception_code == ErrorCodes::CANNOT_PARSE_TEXT ||
              exception_code == ErrorCodes::CANNOT_PARSE_ESCAPE_SEQUENCE ||
              exception_code == ErrorCodes::CANNOT_PARSE_QUOTED_STRING ||
@@ -233,15 +268,21 @@ HTTPHandler::HTTPHandler(IServer & server_, const std::string & name)
 }
 
 
-void HTTPHandler::processQuery(
-    Context & context,
+/// We need d-tor to be present in this translation unit to make it play well with some
+/// forward decls in the header. Other than that, the default d-tor would be OK.
+HTTPHandler::~HTTPHandler()
+{
+    (void)this;
+}
+
+
+bool HTTPHandler::authenticateUser(
+    ContextPtr context,
     HTTPServerRequest & request,
     HTMLForm & params,
-    HTTPServerResponse & response,
-    Output & used_output,
-    std::optional<CurrentThread::QueryScope> & query_scope)
+    HTTPServerResponse & response)
 {
-    LOG_TRACE(log, "Request URI: {}", request.getURI());
+    using namespace Poco::Net;
 
     /// The user and password can be passed by headers (similar to X-Auth-*),
     /// which is used by load balancers to pass authentication information.
@@ -249,16 +290,39 @@ void HTTPHandler::processQuery(
     std::string password = request.get("X-ClickHouse-Key", "");
     std::string quota_key = request.get("X-ClickHouse-Quota", "");
 
+    std::string spnego_challenge;
+
     if (user.empty() && password.empty() && quota_key.empty())
     {
         /// User name and password can be passed using query parameters
         /// or using HTTP Basic auth (both methods are insecure).
         if (request.hasCredentials())
         {
-            Poco::Net::HTTPBasicCredentials credentials(request);
+            /// It is prohibited to mix different authorization schemes.
+            if (params.has("user") || params.has("password"))
+                throw Exception("Invalid authentication: it is not allowed to use Authorization HTTP header and authentication via parameters simultaneously", ErrorCodes::AUTHENTICATION_FAILED);
 
-            user = credentials.getUsername();
-            password = credentials.getPassword();
+            std::string scheme;
+            std::string auth_info;
+            request.getCredentials(scheme, auth_info);
+
+            if (Poco::icompare(scheme, "Basic") == 0)
+            {
+                HTTPBasicCredentials credentials(auth_info);
+                user = credentials.getUsername();
+                password = credentials.getPassword();
+            }
+            else if (Poco::icompare(scheme, "Negotiate") == 0)
+            {
+                spnego_challenge = auth_info;
+
+                if (spnego_challenge.empty())
+                    throw Exception("Invalid authentication: SPNEGO challenge is empty", ErrorCodes::AUTHENTICATION_FAILED);
+            }
+            else
+            {
+                throw Exception("Invalid authentication: '" + scheme + "' HTTP Authorization scheme is not supported", ErrorCodes::AUTHENTICATION_FAILED);
+            }
         }
         else
         {
@@ -271,18 +335,53 @@ void HTTPHandler::processQuery(
     else
     {
         /// It is prohibited to mix different authorization schemes.
-        if (request.hasCredentials()
-            || params.has("user")
-            || params.has("password")
-            || params.has("quota_key"))
+        if (request.hasCredentials() || params.has("user") || params.has("password") || params.has("quota_key"))
+            throw Exception("Invalid authentication: it is not allowed to use X-ClickHouse HTTP headers and other authentication methods simultaneously", ErrorCodes::AUTHENTICATION_FAILED);
+    }
+
+    if (spnego_challenge.empty()) // I.e., now using user name and password strings ("Basic").
+    {
+        if (!request_credentials)
+            request_credentials = std::make_unique<BasicCredentials>();
+
+        auto * basic_credentials = dynamic_cast<BasicCredentials *>(request_credentials.get());
+        if (!basic_credentials)
+            throw Exception("Invalid authentication: unexpected 'Basic' HTTP Authorization scheme", ErrorCodes::AUTHENTICATION_FAILED);
+
+        basic_credentials->setUserName(user);
+        basic_credentials->setPassword(password);
+    }
+    else
+    {
+        if (!request_credentials)
+            request_credentials = request_context->makeGSSAcceptorContext();
+
+        auto * gss_acceptor_context = dynamic_cast<GSSAcceptorContext *>(request_credentials.get());
+        if (!gss_acceptor_context)
+            throw Exception("Invalid authentication: unexpected 'Negotiate' HTTP Authorization scheme expected", ErrorCodes::AUTHENTICATION_FAILED);
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunreachable-code"
+        const auto spnego_response = base64Encode(gss_acceptor_context->processToken(base64Decode(spnego_challenge), log));
+#pragma GCC diagnostic pop
+
+        if (!spnego_response.empty())
+            response.set("WWW-Authenticate", "Negotiate " + spnego_response);
+
+        if (!gss_acceptor_context->isFailed() && !gss_acceptor_context->isReady())
         {
-            throw Exception("Invalid authentication: it is not allowed to use X-ClickHouse HTTP headers and other authentication methods simultaneously", ErrorCodes::REQUIRED_PASSWORD);
+            if (spnego_response.empty())
+                throw Exception("Invalid authentication: 'Negotiate' HTTP Authorization failure", ErrorCodes::AUTHENTICATION_FAILED);
+
+            response.setStatusAndReason(HTTPResponse::HTTP_UNAUTHORIZED);
+            response.send();
+            return false;
         }
     }
 
     /// Set client info. It will be used for quota accounting parameters in 'setUser' method.
 
-    ClientInfo & client_info = context.getClientInfo();
+    ClientInfo & client_info = context->getClientInfo();
     client_info.query_kind = ClientInfo::QueryKind::INITIAL_QUERY;
     client_info.interface = ClientInfo::Interface::HTTP;
 
@@ -297,15 +396,65 @@ void HTTPHandler::processQuery(
     client_info.http_referer = request.get("Referer", "");
     client_info.forwarded_for = request.get("X-Forwarded-For", "");
 
-    /// This will also set client_info.current_user and current_address
-    context.setUser(user, password, request.clientAddress());
+    try
+    {
+        context->setUser(*request_credentials, request.clientAddress());
+    }
+    catch (const Authentication::Require<BasicCredentials> & required_credentials)
+    {
+        request_credentials = std::make_unique<BasicCredentials>();
+
+        if (required_credentials.getRealm().empty())
+            response.set("WWW-Authenticate", "Basic");
+        else
+            response.set("WWW-Authenticate", "Basic realm=\"" + required_credentials.getRealm() + "\"");
+
+        response.setStatusAndReason(HTTPResponse::HTTP_UNAUTHORIZED);
+        response.send();
+        return false;
+    }
+    catch (const Authentication::Require<GSSAcceptorContext> & required_credentials)
+    {
+        request_credentials = request_context->makeGSSAcceptorContext();
+
+        if (required_credentials.getRealm().empty())
+            response.set("WWW-Authenticate", "Negotiate");
+        else
+            response.set("WWW-Authenticate", "Negotiate realm=\"" + required_credentials.getRealm() + "\"");
+
+        response.setStatusAndReason(HTTPResponse::HTTP_UNAUTHORIZED);
+        response.send();
+        return false;
+    }
+
+    request_credentials.reset();
+
     if (!quota_key.empty())
-        context.setQuotaKey(quota_key);
+        context->setQuotaKey(quota_key);
 
     /// Query sent through HTTP interface is initial.
     client_info.initial_user = client_info.current_user;
     client_info.initial_address = client_info.current_address;
 
+    return true;
+}
+
+
+void HTTPHandler::processQuery(
+    ContextPtr context,
+    HTTPServerRequest & request,
+    HTMLForm & params,
+    HTTPServerResponse & response,
+    Output & used_output,
+    std::optional<CurrentThread::QueryScope> & query_scope)
+{
+    using namespace Poco::Net;
+
+    LOG_TRACE(log, "Request URI: {}", request.getURI());
+
+    if (!authenticateUser(context, request, params, response))
+        return; // '401 Unauthorized' response with 'Negotiate' has been sent at this point.
+
     /// The user could specify session identifier and session timeout.
     /// It allows to modify settings, create temporary tables and reuse them in subsequent requests.
 
@@ -321,10 +470,10 @@ void HTTPHandler::processQuery(
         session_timeout = parseSessionTimeout(config, params);
         std::string session_check = params.get("session_check", "");
 
-        session = context.acquireNamedSession(session_id, session_timeout, session_check == "1");
+        session = context->acquireNamedSession(session_id, session_timeout, session_check == "1");
 
-        context = session->context;
-        context.setSessionContext(session->context);
+        context->copyFrom(session->context);  /// FIXME: maybe move this part to HandleRequest(), copyFrom() is used only here.
+        context->setSessionContext(session->context);
     }
 
     SCOPE_EXIT({
@@ -340,7 +489,7 @@ void HTTPHandler::processQuery(
     {
         std::string opentelemetry_traceparent = request.get("traceparent");
         std::string error;
-        if (!context.getClientInfo().client_trace_context.parseTraceparentHeader(
+        if (!context->getClientInfo().client_trace_context.parseTraceparentHeader(
             opentelemetry_traceparent, error))
         {
             throw Exception(ErrorCodes::BAD_REQUEST_PARAMETER,
@@ -348,13 +497,14 @@ void HTTPHandler::processQuery(
                 opentelemetry_traceparent, error);
         }
 
-        context.getClientInfo().client_trace_context.tracestate = request.get("tracestate", "");
+        context->getClientInfo().client_trace_context.tracestate = request.get("tracestate", "");
     }
 #endif
 
     // Set the query id supplied by the user, if any, and also update the OpenTelemetry fields.
-    context.setCurrentQueryId(params.get("query_id", request.get("X-ClickHouse-Query-Id", "")));
+    context->setCurrentQueryId(params.get("query_id", request.get("X-ClickHouse-Query-Id", "")));
 
+    ClientInfo & client_info = context->getClientInfo();
     client_info.initial_query_id = client_info.current_query_id;
 
     /// The client can pass a HTTP header indicating supported compression method (gzip or deflate).
@@ -400,7 +550,7 @@ void HTTPHandler::processQuery(
 
     used_output.out = std::make_shared<WriteBufferFromHTTPServerResponse>(
         response,
-        request.getMethod() == Poco::Net::HTTPRequest::HTTP_HEAD,
+        request.getMethod() == HTTPRequest::HTTP_HEAD,
         keep_alive_timeout,
         client_supports_http_compression,
         http_response_compression_method);
@@ -420,7 +570,7 @@ void HTTPHandler::processQuery(
 
         if (buffer_until_eof)
         {
-            const std::string tmp_path(context.getTemporaryVolume()->getDisk()->getPath());
+            const std::string tmp_path(context->getTemporaryVolume()->getDisk()->getPath());
             const std::string tmp_path_template(tmp_path + "http_buffers/");
 
             auto create_tmp_disk_buffer = [tmp_path_template] (const WriteBufferPtr &)
@@ -508,13 +658,13 @@ void HTTPHandler::processQuery(
 
     /// In theory if initially readonly = 0, the client can change any setting and then set readonly
     /// to some other value.
-    const auto & settings = context.getSettingsRef();
+    const auto & settings = context->getSettingsRef();
 
     /// Only readonly queries are allowed for HTTP GET requests.
     if (request.getMethod() == HTTPServerRequest::HTTP_GET)
     {
         if (settings.readonly == 0)
-            context.setSetting("readonly", 2);
+            context->setSetting("readonly", 2);
     }
 
     bool has_external_data = startsWith(request.getContentType(), "multipart/form-data");
@@ -557,14 +707,14 @@ void HTTPHandler::processQuery(
     }
 
     if (!database.empty())
-        context.setCurrentDatabase(database);
+        context->setCurrentDatabase(database);
 
     if (!default_format.empty())
-        context.setDefaultFormat(default_format);
+        context->setDefaultFormat(default_format);
 
     /// For external data we also want settings
-    context.checkSettingsConstraints(settings_changes);
-    context.applySettingsChanges(settings_changes);
+    context->checkSettingsConstraints(settings_changes);
+    context->applySettingsChanges(settings_changes);
 
     const auto & query = getQuery(request, params, context);
     std::unique_ptr<ReadBuffer> in_param = std::make_unique<ReadBufferFromString>(query);
@@ -587,11 +737,11 @@ void HTTPHandler::processQuery(
     /// Origin header.
     used_output.out->addHeaderCORS(settings.add_http_cors_header && !request.get("Origin", "").empty());
 
-    auto append_callback = [&context] (ProgressCallback callback)
+    auto append_callback = [context] (ProgressCallback callback)
     {
-        auto prev = context.getProgressCallback();
+        auto prev = context->getProgressCallback();
 
-        context.setProgressCallback([prev, callback] (const Progress & progress)
+        context->setProgressCallback([prev, callback] (const Progress & progress)
         {
             if (prev)
                 prev(progress);
@@ -606,12 +756,12 @@ void HTTPHandler::processQuery(
 
     if (settings.readonly > 0 && settings.cancel_http_readonly_queries_on_client_close)
     {
-        append_callback([&context, &request](const Progress &)
+        append_callback([context, &request](const Progress &)
         {
             /// Assume that at the point this method is called no one is reading data from the socket any more:
             /// should be true for read-only queries.
             if (!request.checkPeerConnected())
-                context.killCurrentQuery();
+                context->killCurrentQuery();
         });
     }
 
@@ -659,11 +809,7 @@ void HTTPHandler::trySendExceptionToClient(
             request.getStream().ignoreAll();
         }
 
-        bool auth_fail = exception_code == ErrorCodes::UNKNOWN_USER ||
-                         exception_code == ErrorCodes::WRONG_PASSWORD ||
-                         exception_code == ErrorCodes::REQUIRED_PASSWORD;
-
-        if (auth_fail)
+        if (exception_code == ErrorCodes::REQUIRED_PASSWORD)
         {
             response.requireAuthentication("ClickHouse server HTTP API");
         }
@@ -720,12 +866,23 @@ void HTTPHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse
     setThreadName("HTTPHandler");
     ThreadStatus thread_status;
 
-    /// Should be initialized before anything,
-    /// For correct memory accounting.
-    Context context = server.context();
+    SCOPE_EXIT({
+        // If there is no request_credentials instance waiting for the next round, then the request is processed,
+        // so no need to preserve request_context either.
+        // Needs to be performed with respect to the other destructors in the scope though.
+        if (!request_credentials)
+            request_context.reset();
+    });
+
+    if (!request_context)
+    {
+        // Context should be initialized before anything, for correct memory accounting.
+        request_context = Context::createCopy(server.context());
+        request_credentials.reset();
+    }
+
     /// Cannot be set here, since query_id is unknown.
     std::optional<CurrentThread::QueryScope> query_scope;
-
     Output used_output;
 
     /// In case of exception, send stack trace to client.
@@ -742,6 +899,7 @@ void HTTPHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse
         HTMLForm params(request);
         with_stacktrace = params.getParsed<bool>("stacktrace", false);
 
+        /// FIXME: maybe this check is already unnecessary.
         /// Workaround. Poco does not detect 411 Length Required case.
         if (request.getMethod() == HTTPRequest::HTTP_POST && !request.getChunkedTransferEncoding() && !request.hasContentLength())
         {
@@ -750,11 +908,15 @@ void HTTPHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse
                 ErrorCodes::HTTP_LENGTH_REQUIRED);
         }
 
-        processQuery(context, request, params, response, used_output, query_scope);
-        LOG_DEBUG(log, "Done processing query");
+        processQuery(request_context, request, params, response, used_output, query_scope);
+        LOG_DEBUG(log, (request_credentials ? "Authentication in progress..." : "Done processing query"));
     }
     catch (...)
     {
+        SCOPE_EXIT({
+            request_credentials.reset(); // ...so that the next requests on the connection have to always start afresh in case of exceptions.
+        });
+
         tryLogCurrentException(log);
 
         /** If exception is received from remote server, then stack trace is embedded in message.
@@ -775,7 +937,7 @@ DynamicQueryHandler::DynamicQueryHandler(IServer & server_, const std::string &
 {
 }
 
-bool DynamicQueryHandler::customizeQueryParam(Context & context, const std::string & key, const std::string & value)
+bool DynamicQueryHandler::customizeQueryParam(ContextPtr context, const std::string & key, const std::string & value)
 {
     if (key == param_name)
         return true;    /// do nothing
@@ -784,14 +946,14 @@ bool DynamicQueryHandler::customizeQueryParam(Context & context, const std::stri
     {
         /// Save name and values of substitution in dictionary.
         const String parameter_name = key.substr(strlen("param_"));
-        context.setQueryParameter(parameter_name, value);
+        context->setQueryParameter(parameter_name, value);
         return true;
     }
 
     return false;
 }
 
-std::string DynamicQueryHandler::getQuery(HTTPServerRequest & request, HTMLForm & params, Context & context)
+std::string DynamicQueryHandler::getQuery(HTTPServerRequest & request, HTMLForm & params, ContextPtr context)
 {
     if (likely(!startsWith(request.getContentType(), "multipart/form-data")))
     {
@@ -817,25 +979,31 @@ std::string DynamicQueryHandler::getQuery(HTTPServerRequest & request, HTMLForm
 }
 
 PredefinedQueryHandler::PredefinedQueryHandler(
-    IServer & server_, const NameSet & receive_params_, const std::string & predefined_query_
-    , const CompiledRegexPtr & url_regex_, const std::unordered_map<String, CompiledRegexPtr> & header_name_with_regex_)
-    : HTTPHandler(server_, "PredefinedQueryHandler"), receive_params(receive_params_), predefined_query(predefined_query_)
-    , url_regex(url_regex_), header_name_with_capture_regex(header_name_with_regex_)
+    IServer & server_,
+    const NameSet & receive_params_,
+    const std::string & predefined_query_,
+    const CompiledRegexPtr & url_regex_,
+    const std::unordered_map<String, CompiledRegexPtr> & header_name_with_regex_)
+    : HTTPHandler(server_, "PredefinedQueryHandler")
+    , receive_params(receive_params_)
+    , predefined_query(predefined_query_)
+    , url_regex(url_regex_)
+    , header_name_with_capture_regex(header_name_with_regex_)
 {
 }
 
-bool PredefinedQueryHandler::customizeQueryParam(Context & context, const std::string & key, const std::string & value)
+bool PredefinedQueryHandler::customizeQueryParam(ContextPtr context, const std::string & key, const std::string & value)
 {
     if (receive_params.count(key))
     {
-        context.setQueryParameter(key, value);
+        context->setQueryParameter(key, value);
         return true;
     }
 
     return false;
 }
 
-void PredefinedQueryHandler::customizeContext(HTTPServerRequest & request, DB::Context & context)
+void PredefinedQueryHandler::customizeContext(HTTPServerRequest & request, ContextPtr context)
 {
     /// If in the configuration file, the handler's header is regex and contains named capture group
     /// We will extract regex named capture groups as query parameters
@@ -853,7 +1021,7 @@ void PredefinedQueryHandler::customizeContext(HTTPServerRequest & request, DB::C
                 const auto & capturing_value = matches[capturing_index];
 
                 if (capturing_value.data())
-                    context.setQueryParameter(capturing_name, String(capturing_value.data(), capturing_value.size()));
+                    context->setQueryParameter(capturing_name, String(capturing_value.data(), capturing_value.size()));
             }
         }
     };
@@ -871,7 +1039,7 @@ void PredefinedQueryHandler::customizeContext(HTTPServerRequest & request, DB::C
     }
 }
 
-std::string PredefinedQueryHandler::getQuery(HTTPServerRequest & request, HTMLForm & params, Context & context)
+std::string PredefinedQueryHandler::getQuery(HTTPServerRequest & request, HTMLForm & params, ContextPtr context)
 {
     if (unlikely(startsWith(request.getContentType(), "multipart/form-data")))
     {
diff --git a/src/Server/HTTPHandler.h b/src/Server/HTTPHandler.h
index e903fbfbff7..4715949cb87 100644
--- a/src/Server/HTTPHandler.h
+++ b/src/Server/HTTPHandler.h
@@ -18,6 +18,7 @@ namespace Poco { class Logger; }
 namespace DB
 {
 
+class Credentials;
 class IServer;
 class WriteBufferFromHTTPServerResponse;
 
@@ -27,15 +28,16 @@ class HTTPHandler : public HTTPRequestHandler
 {
 public:
     HTTPHandler(IServer & server_, const std::string & name);
+    virtual ~HTTPHandler() override;
 
     void handleRequest(HTTPServerRequest & request, HTTPServerResponse & response) override;
 
     /// This method is called right before the query execution.
-    virtual void customizeContext(HTTPServerRequest & /* request */, Context & /* context */) {}
+    virtual void customizeContext(HTTPServerRequest & /* request */, ContextPtr /* context */) {}
 
-    virtual bool customizeQueryParam(Context & context, const std::string & key, const std::string & value) = 0;
+    virtual bool customizeQueryParam(ContextPtr context, const std::string & key, const std::string & value) = 0;
 
-    virtual std::string getQuery(HTTPServerRequest & request, HTMLForm & params, Context & context) = 0;
+    virtual std::string getQuery(HTTPServerRequest & request, HTMLForm & params, ContextPtr context) = 0;
 
 private:
     struct Output
@@ -69,9 +71,25 @@ private:
 
     CurrentMetrics::Increment metric_increment{CurrentMetrics::HTTPConnection};
 
+    // The request_context and the request_credentials instances may outlive a single request/response loop.
+    // This happens only when the authentication mechanism requires more than a single request/response exchange (e.g., SPNEGO).
+    ContextPtr request_context;
+    std::unique_ptr<Credentials> request_credentials;
+
+    // Returns true when the user successfully authenticated,
+    //  the request_context instance will be configured accordingly, and the request_credentials instance will be dropped.
+    // Returns false when the user is not authenticated yet, and the 'Negotiate' response is sent,
+    //  the request_context and request_credentials instances are preserved.
+    // Throws an exception if authentication failed.
+    bool authenticateUser(
+        ContextPtr context,
+        HTTPServerRequest & request,
+        HTMLForm & params,
+        HTTPServerResponse & response);
+
     /// Also initializes 'used_output'.
     void processQuery(
-        Context & context,
+        ContextPtr context,
         HTTPServerRequest & request,
         HTMLForm & params,
         HTTPServerResponse & response,
@@ -95,9 +113,9 @@ private:
 public:
     explicit DynamicQueryHandler(IServer & server_, const std::string & param_name_ = "query");
 
-    std::string getQuery(HTTPServerRequest & request, HTMLForm & params, Context & context) override;
+    std::string getQuery(HTTPServerRequest & request, HTMLForm & params, ContextPtr context) override;
 
-    bool customizeQueryParam(Context &context, const std::string &key, const std::string &value) override;
+    bool customizeQueryParam(ContextPtr context, const std::string &key, const std::string &value) override;
 };
 
 class PredefinedQueryHandler : public HTTPHandler
@@ -112,11 +130,11 @@ public:
         IServer & server_, const NameSet & receive_params_, const std::string & predefined_query_
         , const CompiledRegexPtr & url_regex_, const std::unordered_map<String, CompiledRegexPtr> & header_name_with_regex_);
 
-    virtual void customizeContext(HTTPServerRequest & request, Context & context) override;
+    virtual void customizeContext(HTTPServerRequest & request, ContextPtr context) override;
 
-    std::string getQuery(HTTPServerRequest & request, HTMLForm & params, Context & context) override;
+    std::string getQuery(HTTPServerRequest & request, HTMLForm & params, ContextPtr context) override;
 
-    bool customizeQueryParam(Context & context, const std::string & key, const std::string & value) override;
+    bool customizeQueryParam(ContextPtr context, const std::string & key, const std::string & value) override;
 };
 
 }
diff --git a/src/Server/HTTPHandlerFactory.cpp b/src/Server/HTTPHandlerFactory.cpp
index db80750beb8..1e3d02b85ab 100644
--- a/src/Server/HTTPHandlerFactory.cpp
+++ b/src/Server/HTTPHandlerFactory.cpp
@@ -2,6 +2,8 @@
 
 #include <Server/HTTP/HTTPRequestHandler.h>
 #include <Server/IServer.h>
+#include <Access/Credentials.h>
+#include <Interpreters/Context.h>
 
 #include <Poco/Util/LayeredConfiguration.h>
 
diff --git a/src/Server/IServer.h b/src/Server/IServer.h
index 131e7443646..80736fda3ea 100644
--- a/src/Server/IServer.h
+++ b/src/Server/IServer.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <Interpreters/Context_fwd.h>
+
 namespace Poco
 {
 
@@ -7,6 +9,7 @@ namespace Util
 {
 class LayeredConfiguration;
 }
+
 class Logger;
 
 }
@@ -15,8 +18,6 @@ class Logger;
 namespace DB
 {
 
-class Context;
-
 class IServer
 {
 public:
@@ -27,12 +28,12 @@ public:
     virtual Poco::Logger & logger() const = 0;
 
     /// Returns global application's context.
-    virtual Context & context() const = 0;
+    virtual ContextPtr context() const = 0;
 
     /// Returns true if shutdown signaled.
     virtual bool isCancelled() const = 0;
 
-    virtual ~IServer() {}
+    virtual ~IServer() = default;
 };
 
 }
diff --git a/src/Server/InterserverIOHTTPHandler.cpp b/src/Server/InterserverIOHTTPHandler.cpp
index 740072e8e9f..64af8860b23 100644
--- a/src/Server/InterserverIOHTTPHandler.cpp
+++ b/src/Server/InterserverIOHTTPHandler.cpp
@@ -25,29 +25,26 @@ namespace ErrorCodes
 
 std::pair<String, bool> InterserverIOHTTPHandler::checkAuthentication(HTTPServerRequest & request) const
 {
-    const auto & config = server.config();
-
-    if (config.has("interserver_http_credentials.user"))
+    auto server_credentials = server.context()->getInterserverCredentials();
+    if (server_credentials)
     {
         if (!request.hasCredentials())
-            return {"Server requires HTTP Basic authentication, but client doesn't provide it", false};
+            return server_credentials->isValidUser("", "");
+
         String scheme, info;
         request.getCredentials(scheme, info);
 
         if (scheme != "Basic")
             return {"Server requires HTTP Basic authentication but client provides another method", false};
 
-        String user = config.getString("interserver_http_credentials.user");
-        String password = config.getString("interserver_http_credentials.password", "");
-
         Poco::Net::HTTPBasicCredentials credentials(info);
-        if (std::make_pair(user, password) != std::make_pair(credentials.getUsername(), credentials.getPassword()))
-            return {"Incorrect user or password in HTTP Basic authentication", false};
+        return server_credentials->isValidUser(credentials.getUsername(), credentials.getPassword());
     }
     else if (request.hasCredentials())
     {
         return {"Client requires HTTP Basic authentication, but server doesn't provide it", false};
     }
+
     return {"", true};
 }
 
@@ -62,7 +59,7 @@ void InterserverIOHTTPHandler::processQuery(HTTPServerRequest & request, HTTPSer
 
     auto & body = request.getStream();
 
-    auto endpoint = server.context().getInterserverIOHandler().getEndpoint(endpoint_name);
+    auto endpoint = server.context()->getInterserverIOHandler().getEndpoint(endpoint_name);
     /// Locked for read while query processing
     std::shared_lock lock(endpoint->rwlock);
     if (endpoint->blocker.isCancelled())
@@ -107,6 +104,7 @@ void InterserverIOHTTPHandler::handleRequest(HTTPServerRequest & request, HTTPSe
         }
         catch (...)
         {
+            tryLogCurrentException(log);
             out.finalize();
         }
     };
@@ -116,6 +114,7 @@ void InterserverIOHTTPHandler::handleRequest(HTTPServerRequest & request, HTTPSe
         if (auto [message, success] = checkAuthentication(request); success)
         {
             processQuery(request, response, used_output);
+            used_output.out->finalize();
             LOG_DEBUG(log, "Done processing query");
         }
         else
diff --git a/src/Server/InterserverIOHTTPHandler.h b/src/Server/InterserverIOHTTPHandler.h
index 47892aa678f..c0d776115e1 100644
--- a/src/Server/InterserverIOHTTPHandler.h
+++ b/src/Server/InterserverIOHTTPHandler.h
@@ -2,10 +2,12 @@
 
 #include <Server/HTTP/HTTPRequestHandler.h>
 #include <Common/CurrentMetrics.h>
+#include <Interpreters/InterserverCredentials.h>
 
 #include <Poco/Logger.h>
 
 #include <memory>
+#include <string>
 
 
 namespace CurrentMetrics
diff --git a/src/Server/NuKeeperTCPHandler.cpp b/src/Server/KeeperTCPHandler.cpp
similarity index 64%
rename from src/Server/NuKeeperTCPHandler.cpp
rename to src/Server/KeeperTCPHandler.cpp
index e855e2c68f7..1dadd3437f7 100644
--- a/src/Server/NuKeeperTCPHandler.cpp
+++ b/src/Server/KeeperTCPHandler.cpp
@@ -1,4 +1,4 @@
-#include <Server/NuKeeperTCPHandler.h>
+#include <Server/KeeperTCPHandler.h>
 
 #if USE_NURAFT
 
@@ -40,7 +40,7 @@ namespace ErrorCodes
 
 struct PollResult
 {
-    size_t ready_responses_count{0};
+    size_t responses_count{0};
     bool has_requests{false};
     bool error{false};
 };
@@ -70,14 +70,14 @@ struct SocketInterruptablePollWrapper
         if (epollfd < 0)
             throwFromErrno("Cannot epoll_create", ErrorCodes::SYSTEM_ERROR);
 
-        socket_event.events = EPOLLIN | EPOLLERR;
+        socket_event.events = EPOLLIN | EPOLLERR | EPOLLPRI;
         socket_event.data.fd = sockfd;
         if (epoll_ctl(epollfd, EPOLL_CTL_ADD, sockfd, &socket_event) < 0)
         {
             ::close(epollfd);
             throwFromErrno("Cannot insert socket into epoll queue", ErrorCodes::SYSTEM_ERROR);
         }
-        pipe_event.events = EPOLLIN | EPOLLERR;
+        pipe_event.events = EPOLLIN | EPOLLERR | EPOLLPRI;
         pipe_event.data.fd = pipe.fds_rw[0];
         if (epoll_ctl(epollfd, EPOLL_CTL_ADD, pipe.fds_rw[0], &pipe_event) < 0)
         {
@@ -92,97 +92,92 @@ struct SocketInterruptablePollWrapper
         return pipe.fds_rw[1];
     }
 
-    PollResult poll(Poco::Timespan remaining_time)
+    PollResult poll(Poco::Timespan remaining_time, const std::shared_ptr<ReadBufferFromPocoSocket> & in)
     {
-        std::array<int, 2> outputs = {-1, -1};
+
+        bool socket_ready = false;
+        bool fd_ready = false;
+
+        if (in->available() != 0)
+            socket_ready = true;
+
+        if (response_in.available() != 0)
+            fd_ready = true;
+
+        int rc = 0;
+        if (!fd_ready)
+        {
 #if defined(POCO_HAVE_FD_EPOLL)
-        int rc;
-        epoll_event evout[2];
-        memset(evout, 0, sizeof(evout));
-        do
-        {
-            Poco::Timestamp start;
-            rc = epoll_wait(epollfd, evout, 2, remaining_time.totalMilliseconds());
-            if (rc < 0 && errno == EINTR)
+            epoll_event evout[2];
+            evout[0].data.fd = evout[1].data.fd = -1;
+            do
             {
-                Poco::Timestamp end;
-                Poco::Timespan waited = end - start;
-                if (waited < remaining_time)
-                    remaining_time -= waited;
-                else
-                    remaining_time = 0;
-            }
-        }
-        while (rc < 0 && errno == EINTR);
-
-        if (rc >= 1 && evout[0].events & EPOLLIN)
-            outputs[0] = evout[0].data.fd;
-        if (rc == 2 && evout[1].events & EPOLLIN)
-            outputs[1] = evout[1].data.fd;
-#else
-        pollfd poll_buf[2];
-        poll_buf[0].fd = sockfd;
-        poll_buf[0].events = POLLIN;
-        poll_buf[1].fd = pipe.fds_rw[0];
-        poll_buf[1].events = POLLIN;
-
-        int rc;
-        do
-        {
-            Poco::Timestamp start;
-            rc = ::poll(poll_buf, 2, remaining_time.totalMilliseconds());
-            if (rc < 0 && errno == POCO_EINTR)
-            {
-                Poco::Timestamp end;
-                Poco::Timespan waited = end - start;
-                if (waited < remaining_time)
-                    remaining_time -= waited;
-                else
-                    remaining_time = 0;
-            }
-        }
-        while (rc < 0 && errno == POCO_EINTR);
-        if (rc >= 1 && poll_buf[0].revents & POLLIN)
-            outputs[0] = sockfd;
-        if (rc == 2 && poll_buf[1].revents & POLLIN)
-            outputs[1] = pipe.fds_rw[0];
-#endif
-
-        PollResult result{};
-        if (rc < 0)
-        {
-            result.error = true;
-            return result;
-        }
-        else if (rc == 0)
-        {
-            return result;
-        }
-        else
-        {
-            for (auto fd : outputs)
-            {
-                if (fd != -1)
+                Poco::Timestamp start;
+                rc = epoll_wait(epollfd, evout, 2, remaining_time.totalMilliseconds());
+                if (rc < 0 && errno == EINTR)
                 {
-                    if (fd == sockfd)
-                        result.has_requests = true;
+                    Poco::Timestamp end;
+                    Poco::Timespan waited = end - start;
+                    if (waited < remaining_time)
+                        remaining_time -= waited;
                     else
-                    {
-                        UInt8 dummy;
-                        do
-                        {
-                            /// All ready responses stored in responses queue,
-                            /// but we have to count amount of ready responses in pipe
-                            /// and process them only. Otherwise states of response_in
-                            /// and response queue will be inconsistent and race condition is possible.
-                            readIntBinary(dummy, response_in);
-                            result.ready_responses_count++;
-                        }
-                        while (response_in.available());
-                    }
+                        remaining_time = 0;
                 }
             }
+            while (rc < 0 && errno == EINTR);
+
+            for (int i = 0; i < rc; ++i)
+            {
+                if (evout[i].data.fd == sockfd)
+                    socket_ready = true;
+                if (evout[i].data.fd == pipe.fds_rw[0])
+                    fd_ready = true;
+            }
+#else
+            pollfd poll_buf[2];
+            poll_buf[0].fd = sockfd;
+            poll_buf[0].events = POLLIN;
+            poll_buf[1].fd = pipe.fds_rw[0];
+            poll_buf[1].events = POLLIN;
+
+            do
+            {
+                Poco::Timestamp start;
+                rc = ::poll(poll_buf, 2, remaining_time.totalMilliseconds());
+                if (rc < 0 && errno == POCO_EINTR)
+                {
+                    Poco::Timestamp end;
+                    Poco::Timespan waited = end - start;
+                    if (waited < remaining_time)
+                        remaining_time -= waited;
+                    else
+                        remaining_time = 0;
+                }
+            }
+            while (rc < 0 && errno == POCO_EINTR);
+
+            if (rc >= 1 && poll_buf[0].revents & POLLIN)
+                socket_ready = true;
+            if (rc >= 1 && poll_buf[1].revents & POLLIN)
+                fd_ready = true;
+#endif
         }
+
+        PollResult result{};
+        result.has_requests = socket_ready;
+        if (fd_ready)
+        {
+            UInt8 dummy;
+            readIntBinary(dummy, response_in);
+            result.responses_count = 1;
+            auto available = response_in.available();
+            response_in.ignore(available);
+            result.responses_count += available;
+        }
+
+        if (rc < 0)
+            result.error = true;
+
         return result;
     }
 
@@ -194,20 +189,20 @@ struct SocketInterruptablePollWrapper
 #endif
 };
 
-NuKeeperTCPHandler::NuKeeperTCPHandler(IServer & server_, const Poco::Net::StreamSocket & socket_)
+KeeperTCPHandler::KeeperTCPHandler(IServer & server_, const Poco::Net::StreamSocket & socket_)
     : Poco::Net::TCPServerConnection(socket_)
     , server(server_)
     , log(&Poco::Logger::get("NuKeeperTCPHandler"))
-    , global_context(server.context())
-    , nu_keeper_storage_dispatcher(global_context.getNuKeeperStorageDispatcher())
-    , operation_timeout(0, global_context.getConfigRef().getUInt("test_keeper_server.operation_timeout_ms", Coordination::DEFAULT_OPERATION_TIMEOUT_MS) * 1000)
-    , session_timeout(0, global_context.getConfigRef().getUInt("test_keeper_server.session_timeout_ms", Coordination::DEFAULT_SESSION_TIMEOUT_MS) * 1000)
+    , global_context(Context::createCopy(server.context()))
+    , nu_keeper_storage_dispatcher(global_context->getKeeperStorageDispatcher())
+    , operation_timeout(0, global_context->getConfigRef().getUInt("test_keeper_server.operation_timeout_ms", Coordination::DEFAULT_OPERATION_TIMEOUT_MS) * 1000)
+    , session_timeout(0, global_context->getConfigRef().getUInt("test_keeper_server.session_timeout_ms", Coordination::DEFAULT_SESSION_TIMEOUT_MS) * 1000)
     , poll_wrapper(std::make_unique<SocketInterruptablePollWrapper>(socket_))
     , responses(std::make_unique<ThreadSafeResponseQueue>())
 {
 }
 
-void NuKeeperTCPHandler::sendHandshake(bool has_leader)
+void KeeperTCPHandler::sendHandshake(bool has_leader)
 {
     Coordination::write(Coordination::SERVER_HANDSHAKE_LENGTH, *out);
     if (has_leader)
@@ -222,12 +217,12 @@ void NuKeeperTCPHandler::sendHandshake(bool has_leader)
     out->next();
 }
 
-void NuKeeperTCPHandler::run()
+void KeeperTCPHandler::run()
 {
     runImpl();
 }
 
-Poco::Timespan NuKeeperTCPHandler::receiveHandshake()
+Poco::Timespan KeeperTCPHandler::receiveHandshake()
 {
     int32_t handshake_length;
     int32_t protocol_version;
@@ -245,16 +240,10 @@ Poco::Timespan NuKeeperTCPHandler::receiveHandshake()
         throw Exception("Unexpected protocol version: " + toString(protocol_version), ErrorCodes::UNEXPECTED_PACKET_FROM_CLIENT);
 
     Coordination::read(last_zxid_seen, *in);
-
-    if (last_zxid_seen != 0)
-        throw Exception("Non zero last_zxid_seen is not supported", ErrorCodes::UNEXPECTED_PACKET_FROM_CLIENT);
-
     Coordination::read(timeout_ms, *in);
+
+    /// TODO Stop ignoring this value
     Coordination::read(previous_session_id, *in);
-
-    if (previous_session_id != 0)
-        throw Exception("Non zero previous session id is not supported", ErrorCodes::UNEXPECTED_PACKET_FROM_CLIENT);
-
     Coordination::read(passwd, *in);
 
     int8_t readonly;
@@ -265,12 +254,12 @@ Poco::Timespan NuKeeperTCPHandler::receiveHandshake()
 }
 
 
-void NuKeeperTCPHandler::runImpl()
+void KeeperTCPHandler::runImpl()
 {
     setThreadName("TstKprHandler");
     ThreadStatus thread_status;
-    auto global_receive_timeout = global_context.getSettingsRef().receive_timeout;
-    auto global_send_timeout = global_context.getSettingsRef().send_timeout;
+    auto global_receive_timeout = global_context->getSettingsRef().receive_timeout;
+    auto global_send_timeout = global_context->getSettingsRef().send_timeout;
 
     socket().setReceiveTimeout(global_receive_timeout);
     socket().setSendTimeout(global_send_timeout);
@@ -339,43 +328,42 @@ void NuKeeperTCPHandler::runImpl()
         {
             using namespace std::chrono_literals;
 
-            PollResult result = poll_wrapper->poll(session_timeout);
+            PollResult result = poll_wrapper->poll(session_timeout, in);
             if (result.has_requests && !close_received)
             {
-                do
-                {
-                    auto [received_op, received_xid] = receiveRequest();
+                auto [received_op, received_xid] = receiveRequest();
 
-                    if (received_op == Coordination::OpNum::Close)
-                    {
-                        LOG_DEBUG(log, "Received close event with xid {} for session id #{}", received_xid, session_id);
-                        close_xid = received_xid;
-                        close_received = true;
-                        break;
-                    }
-                    else if (received_op == Coordination::OpNum::Heartbeat)
-                    {
-                        LOG_TRACE(log, "Received heartbeat for session #{}", session_id);
-                        session_stopwatch.restart();
-                    }
+                if (received_op == Coordination::OpNum::Close)
+                {
+                    LOG_DEBUG(log, "Received close event with xid {} for session id #{}", received_xid, session_id);
+                    close_xid = received_xid;
+                    close_received = true;
                 }
-                while (in->available());
+                else if (received_op == Coordination::OpNum::Heartbeat)
+                {
+                    LOG_TRACE(log, "Received heartbeat for session #{}", session_id);
+                }
+
+                /// Each request restarts session stopwatch
+                session_stopwatch.restart();
             }
 
             /// Process exact amount of responses from pipe
             /// otherwise state of responses queue and signaling pipe
             /// became inconsistent and race condition is possible.
-            while (result.ready_responses_count != 0)
+            while (result.responses_count != 0)
             {
                 Coordination::ZooKeeperResponsePtr response;
+
                 if (!responses->tryPop(response))
-                    throw Exception(ErrorCodes::LOGICAL_ERROR, "We must have at least {} ready responses, but queue is empty. It's a bug.", result.ready_responses_count);
+                    throw Exception(ErrorCodes::LOGICAL_ERROR, "We must have ready response, but queue is empty. It's a bug.");
 
                 if (response->xid == close_xid)
                 {
                     LOG_DEBUG(log, "Session #{} successfully closed", session_id);
                     return;
                 }
+
                 response->write(*out);
                 if (response->error == Coordination::Error::ZSESSIONEXPIRED)
                 {
@@ -383,7 +371,8 @@ void NuKeeperTCPHandler::runImpl()
                     nu_keeper_storage_dispatcher->finishSession(session_id);
                     return;
                 }
-                result.ready_responses_count--;
+
+                result.responses_count--;
             }
 
             if (result.error)
@@ -404,7 +393,7 @@ void NuKeeperTCPHandler::runImpl()
     }
 }
 
-std::pair<Coordination::OpNum, Coordination::XID> NuKeeperTCPHandler::receiveRequest()
+std::pair<Coordination::OpNum, Coordination::XID> KeeperTCPHandler::receiveRequest()
 {
     int32_t length;
     Coordination::read(length, *in);
diff --git a/src/Server/NuKeeperTCPHandler.h b/src/Server/KeeperTCPHandler.h
similarity index 83%
rename from src/Server/NuKeeperTCPHandler.h
rename to src/Server/KeeperTCPHandler.h
index 03a857ad1d7..6c3929198c0 100644
--- a/src/Server/NuKeeperTCPHandler.h
+++ b/src/Server/KeeperTCPHandler.h
@@ -13,7 +13,7 @@
 #include <Interpreters/Context.h>
 #include <Common/ZooKeeper/ZooKeeperCommon.h>
 #include <Common/ZooKeeper/ZooKeeperConstants.h>
-#include <Coordination/NuKeeperStorageDispatcher.h>
+#include <Coordination/KeeperStorageDispatcher.h>
 #include <IO/WriteBufferFromPocoSocket.h>
 #include <IO/ReadBufferFromPocoSocket.h>
 #include <Coordination/ThreadSafeQueue.h>
@@ -29,16 +29,16 @@ using ThreadSafeResponseQueue = ThreadSafeQueue<Coordination::ZooKeeperResponseP
 
 using ThreadSafeResponseQueuePtr = std::unique_ptr<ThreadSafeResponseQueue>;
 
-class NuKeeperTCPHandler : public Poco::Net::TCPServerConnection
+class KeeperTCPHandler : public Poco::Net::TCPServerConnection
 {
 public:
-    NuKeeperTCPHandler(IServer & server_, const Poco::Net::StreamSocket & socket_);
+    KeeperTCPHandler(IServer & server_, const Poco::Net::StreamSocket & socket_);
     void run() override;
 private:
     IServer & server;
     Poco::Logger * log;
-    Context global_context;
-    std::shared_ptr<NuKeeperStorageDispatcher> nu_keeper_storage_dispatcher;
+    ContextPtr global_context;
+    std::shared_ptr<KeeperStorageDispatcher> nu_keeper_storage_dispatcher;
     Poco::Timespan operation_timeout;
     Poco::Timespan session_timeout;
     int64_t session_id{-1};
diff --git a/src/Server/NuKeeperTCPHandlerFactory.h b/src/Server/KeeperTCPHandlerFactory.h
similarity index 65%
rename from src/Server/NuKeeperTCPHandlerFactory.h
rename to src/Server/KeeperTCPHandlerFactory.h
index 0fd86ebc21f..132a8b96c23 100644
--- a/src/Server/NuKeeperTCPHandlerFactory.h
+++ b/src/Server/KeeperTCPHandlerFactory.h
@@ -1,15 +1,16 @@
 #pragma once
 
-#include <Server/NuKeeperTCPHandler.h>
+#include <Server/KeeperTCPHandler.h>
 #include <Poco/Net/TCPServerConnectionFactory.h>
 #include <Poco/Net/NetException.h>
 #include <common/logger_useful.h>
 #include <Server/IServer.h>
+#include <string>
 
 namespace DB
 {
 
-class NuKeeperTCPHandlerFactory : public Poco::Net::TCPServerConnectionFactory
+class KeeperTCPHandlerFactory : public Poco::Net::TCPServerConnectionFactory
 {
 private:
     IServer & server;
@@ -21,9 +22,9 @@ private:
         void run() override {}
     };
 public:
-    NuKeeperTCPHandlerFactory(IServer & server_)
+    KeeperTCPHandlerFactory(IServer & server_, bool secure)
         : server(server_)
-        , log(&Poco::Logger::get("NuKeeperTCPHandlerFactory"))
+        , log(&Poco::Logger::get(std::string{"KeeperTCP"} + (secure ? "S" : "") + "HandlerFactory"))
     {
     }
 
@@ -31,8 +32,8 @@ public:
     {
         try
         {
-            LOG_TRACE(log, "NuKeeper request. Address: {}", socket.peerAddress().toString());
-            return new NuKeeperTCPHandler(server, socket);
+            LOG_TRACE(log, "Keeper request. Address: {}", socket.peerAddress().toString());
+            return new KeeperTCPHandler(server, socket);
         }
         catch (const Poco::Net::NetException &)
         {
diff --git a/src/Server/MySQLHandler.cpp b/src/Server/MySQLHandler.cpp
index ea2813cf639..7b1df092aa1 100644
--- a/src/Server/MySQLHandler.cpp
+++ b/src/Server/MySQLHandler.cpp
@@ -72,7 +72,7 @@ MySQLHandler::MySQLHandler(IServer & server_, const Poco::Net::StreamSocket & so
     : Poco::Net::TCPServerConnection(socket_)
     , server(server_)
     , log(&Poco::Logger::get("MySQLHandler"))
-    , connection_context(server.context())
+    , connection_context(Context::createCopy(server.context()))
     , connection_id(connection_id_)
     , auth_plugin(new MySQLProtocol::Authentication::Native41())
 {
@@ -89,13 +89,14 @@ void MySQLHandler::run()
 {
     setThreadName("MySQLHandler");
     ThreadStatus thread_status;
-    connection_context.makeSessionContext();
-    connection_context.getClientInfo().interface = ClientInfo::Interface::MYSQL;
-    connection_context.setDefaultFormat("MySQLWire");
+    connection_context->makeSessionContext();
+    connection_context->getClientInfo().interface = ClientInfo::Interface::MYSQL;
+    connection_context->setDefaultFormat("MySQLWire");
+    connection_context->getClientInfo().connection_id = connection_id;
 
     in = std::make_shared<ReadBufferFromPocoSocket>(socket());
     out = std::make_shared<WriteBufferFromPocoSocket>(socket());
-    packet_endpoint = std::make_shared<PacketEndpoint>(*in, *out, connection_context.mysql.sequence_id);
+    packet_endpoint = std::make_shared<PacketEndpoint>(*in, *out, connection_context->mysql.sequence_id);
 
     try
     {
@@ -107,11 +108,11 @@ void MySQLHandler::run()
 
         HandshakeResponse handshake_response;
         finishHandshake(handshake_response);
-        connection_context.mysql.client_capabilities = handshake_response.capability_flags;
+        connection_context->mysql.client_capabilities = handshake_response.capability_flags;
         if (handshake_response.max_packet_size)
-            connection_context.mysql.max_packet_size = handshake_response.max_packet_size;
-        if (!connection_context.mysql.max_packet_size)
-            connection_context.mysql.max_packet_size = MAX_PACKET_LENGTH;
+            connection_context->mysql.max_packet_size = handshake_response.max_packet_size;
+        if (!connection_context->mysql.max_packet_size)
+            connection_context->mysql.max_packet_size = MAX_PACKET_LENGTH;
 
         LOG_TRACE(log,
             "Capabilities: {}, max_packet_size: {}, character_set: {}, user: {}, auth_response length: {}, database: {}, auth_plugin_name: {}",
@@ -132,8 +133,8 @@ void MySQLHandler::run()
         try
         {
             if (!handshake_response.database.empty())
-                connection_context.setCurrentDatabase(handshake_response.database);
-            connection_context.setCurrentQueryId(Poco::format("mysql:%lu", connection_id));
+                connection_context->setCurrentDatabase(handshake_response.database);
+            connection_context->setCurrentQueryId(Poco::format("mysql:%lu", connection_id));
 
         }
         catch (const Exception & exc)
@@ -251,7 +252,7 @@ void MySQLHandler::authenticate(const String & user_name, const String & auth_pl
     try
     {
         // For compatibility with JavaScript MySQL client, Native41 authentication plugin is used when possible (if password is specified using double SHA1). Otherwise SHA256 plugin is used.
-        auto user = connection_context.getAccessControlManager().read<User>(user_name);
+        auto user = connection_context->getAccessControlManager().read<User>(user_name);
         const DB::Authentication::Type user_auth_type = user->authentication.getType();
         if (user_auth_type == DB::Authentication::SHA256_PASSWORD)
         {
@@ -275,7 +276,7 @@ void MySQLHandler::comInitDB(ReadBuffer & payload)
     String database;
     readStringUntilEOF(database, payload);
     LOG_DEBUG(log, "Setting current database to {}", database);
-    connection_context.setCurrentDatabase(database);
+    connection_context->setCurrentDatabase(database);
     packet_endpoint->sendPacket(OKPacket(0, client_capability_flags, 0, 0, 1), true);
 }
 
@@ -283,7 +284,7 @@ void MySQLHandler::comFieldList(ReadBuffer & payload)
 {
     ComFieldList packet;
     packet.readPayloadWithUnpacked(payload);
-    String database = connection_context.getCurrentDatabase();
+    String database = connection_context->getCurrentDatabase();
     StoragePtr table_ptr = DatabaseCatalog::instance().getTable({database, packet.table}, connection_context);
     auto metadata_snapshot = table_ptr->getInMemoryMetadataPtr();
     for (const NameAndTypePair & column : metadata_snapshot->getColumns().getAll())
@@ -331,11 +332,11 @@ void MySQLHandler::comQuery(ReadBuffer & payload)
 
         ReadBufferFromString replacement(replacement_query);
 
-        Context query_context = connection_context;
+        auto query_context = Context::createCopy(connection_context);
 
         std::atomic<size_t> affected_rows {0};
-        auto prev = query_context.getProgressCallback();
-        query_context.setProgressCallback([&, prev = prev](const Progress & progress)
+        auto prev = query_context->getProgressCallback();
+        query_context->setProgressCallback([&, prev = prev](const Progress & progress)
         {
             if (prev)
                 prev(progress);
@@ -390,14 +391,14 @@ void MySQLHandlerSSL::finishHandshakeSSL(
     ReadBufferFromMemory payload(buf, pos);
     payload.ignore(PACKET_HEADER_SIZE);
     ssl_request.readPayloadWithUnpacked(payload);
-    connection_context.mysql.client_capabilities = ssl_request.capability_flags;
-    connection_context.mysql.max_packet_size = ssl_request.max_packet_size ? ssl_request.max_packet_size : MAX_PACKET_LENGTH;
+    connection_context->mysql.client_capabilities = ssl_request.capability_flags;
+    connection_context->mysql.max_packet_size = ssl_request.max_packet_size ? ssl_request.max_packet_size : MAX_PACKET_LENGTH;
     secure_connection = true;
     ss = std::make_shared<SecureStreamSocket>(SecureStreamSocket::attach(socket(), SSLManager::instance().defaultServerContext()));
     in = std::make_shared<ReadBufferFromPocoSocket>(*ss);
     out = std::make_shared<WriteBufferFromPocoSocket>(*ss);
-    connection_context.mysql.sequence_id = 2;
-    packet_endpoint = std::make_shared<PacketEndpoint>(*in, *out, connection_context.mysql.sequence_id);
+    connection_context->mysql.sequence_id = 2;
+    packet_endpoint = std::make_shared<PacketEndpoint>(*in, *out, connection_context->mysql.sequence_id);
     packet_endpoint->receivePacket(packet); /// Reading HandshakeResponse from secure socket.
 }
 
diff --git a/src/Server/MySQLHandler.h b/src/Server/MySQLHandler.h
index 5568805cdfe..f5fb82b5bef 100644
--- a/src/Server/MySQLHandler.h
+++ b/src/Server/MySQLHandler.h
@@ -56,12 +56,12 @@ private:
 protected:
     Poco::Logger * log;
 
-    Context connection_context;
+    ContextPtr connection_context;
 
     std::shared_ptr<MySQLProtocol::PacketEndpoint> packet_endpoint;
 
 private:
-    size_t connection_id = 0;
+    UInt64 connection_id = 0;
 
     size_t server_capability_flags = 0;
     size_t client_capability_flags = 0;
diff --git a/src/Server/PostgreSQLHandler.cpp b/src/Server/PostgreSQLHandler.cpp
index b3a3bbf2aaa..01887444c65 100644
--- a/src/Server/PostgreSQLHandler.cpp
+++ b/src/Server/PostgreSQLHandler.cpp
@@ -33,7 +33,7 @@ PostgreSQLHandler::PostgreSQLHandler(
     std::vector<std::shared_ptr<PostgreSQLProtocol::PGAuthentication::AuthenticationMethod>> & auth_methods_)
     : Poco::Net::TCPServerConnection(socket_)
     , server(server_)
-    , connection_context(server.context())
+    , connection_context(Context::createCopy(server.context()))
     , ssl_enabled(ssl_enabled_)
     , connection_id(connection_id_)
     , authentication_manager(auth_methods_)
@@ -52,9 +52,9 @@ void PostgreSQLHandler::run()
 {
     setThreadName("PostgresHandler");
     ThreadStatus thread_status;
-    connection_context.makeSessionContext();
-    connection_context.getClientInfo().interface = ClientInfo::Interface::POSTGRESQL;
-    connection_context.setDefaultFormat("PostgreSQLWire");
+    connection_context->makeSessionContext();
+    connection_context->getClientInfo().interface = ClientInfo::Interface::POSTGRESQL;
+    connection_context->setDefaultFormat("PostgreSQLWire");
 
     try
     {
@@ -132,8 +132,8 @@ bool PostgreSQLHandler::startup()
     try
     {
         if (!start_up_msg->database.empty())
-            connection_context.setCurrentDatabase(start_up_msg->database);
-        connection_context.setCurrentQueryId(Poco::format("postgres:%d:%d", connection_id, secret_key));
+            connection_context->setCurrentDatabase(start_up_msg->database);
+        connection_context->setCurrentQueryId(Poco::format("postgres:%d:%d", connection_id, secret_key));
     }
     catch (const Exception & exc)
     {
@@ -213,8 +213,8 @@ void PostgreSQLHandler::sendParameterStatusData(PostgreSQLProtocol::Messaging::S
 
 void PostgreSQLHandler::cancelRequest()
 {
-    connection_context.setCurrentQueryId("");
-    connection_context.setDefaultFormat("Null");
+    connection_context->setCurrentQueryId("");
+    connection_context->setDefaultFormat("Null");
 
     std::unique_ptr<PostgreSQLProtocol::Messaging::CancelRequest> msg =
         message_transport->receiveWithPayloadSize<PostgreSQLProtocol::Messaging::CancelRequest>(8);
@@ -268,7 +268,7 @@ void PostgreSQLHandler::processQuery()
             return;
         }
 
-        const auto & settings = connection_context.getSettingsRef();
+        const auto & settings = connection_context->getSettingsRef();
         std::vector<String> queries;
         auto parse_res = splitMultipartQuery(query->query, queries, settings.max_query_size, settings.max_parser_depth);
         if (!parse_res.second)
diff --git a/src/Server/PostgreSQLHandler.h b/src/Server/PostgreSQLHandler.h
index 697aa9b6744..cc30c85d8bb 100644
--- a/src/Server/PostgreSQLHandler.h
+++ b/src/Server/PostgreSQLHandler.h
@@ -37,7 +37,7 @@ private:
     Poco::Logger * log = &Poco::Logger::get("PostgreSQLHandler");
 
     IServer & server;
-    Context connection_context;
+    ContextPtr connection_context;
     bool ssl_enabled;
     Int32 connection_id;
     Int32 secret_key;
diff --git a/src/Server/ReplicasStatusHandler.cpp b/src/Server/ReplicasStatusHandler.cpp
index 778f9827131..86295cc5170 100644
--- a/src/Server/ReplicasStatusHandler.cpp
+++ b/src/Server/ReplicasStatusHandler.cpp
@@ -34,7 +34,7 @@ void ReplicasStatusHandler::handleRequest(HTTPServerRequest & request, HTTPServe
         /// Even if lag is small, output detailed information about the lag.
         bool verbose = params.get("verbose", "") == "1";
 
-        const MergeTreeSettings & settings = context.getReplicatedMergeTreeSettings();
+        const MergeTreeSettings & settings = context->getReplicatedMergeTreeSettings();
 
         bool ok = true;
         WriteBufferFromOwnString message;
@@ -73,7 +73,7 @@ void ReplicasStatusHandler::handleRequest(HTTPServerRequest & request, HTTPServe
             }
         }
 
-        const auto & config = context.getConfigRef();
+        const auto & config = context->getConfigRef();
         setResponseDefaultHeaders(response, config.getUInt("keep_alive_timeout", 10));
 
         if (!ok)
diff --git a/src/Server/ReplicasStatusHandler.h b/src/Server/ReplicasStatusHandler.h
index 8a790b13ad6..eda0b15ed6f 100644
--- a/src/Server/ReplicasStatusHandler.h
+++ b/src/Server/ReplicasStatusHandler.h
@@ -12,7 +12,7 @@ class IServer;
 class ReplicasStatusHandler : public HTTPRequestHandler
 {
 private:
-    Context & context;
+    ContextPtr context;
 
 public:
     explicit ReplicasStatusHandler(IServer & server_);
diff --git a/src/Server/StaticRequestHandler.cpp b/src/Server/StaticRequestHandler.cpp
index 9f959239be9..169d6859b43 100644
--- a/src/Server/StaticRequestHandler.cpp
+++ b/src/Server/StaticRequestHandler.cpp
@@ -137,7 +137,7 @@ void StaticRequestHandler::writeResponse(WriteBuffer & out)
 
     if (startsWith(response_expression, file_prefix))
     {
-        const auto & user_files_absolute_path = Poco::Path(server.context().getUserFilesPath()).makeAbsolute().makeDirectory().toString();
+        const auto & user_files_absolute_path = Poco::Path(server.context()->getUserFilesPath()).makeAbsolute().makeDirectory().toString();
         const auto & file_name = response_expression.substr(file_prefix.size(), response_expression.size() - file_prefix.size());
 
         const auto & file_path = Poco::Path(user_files_absolute_path, file_name).makeAbsolute().toString();
diff --git a/src/Server/TCPHandler.cpp b/src/Server/TCPHandler.cpp
index d2ce2a409a9..36bc8d0e391 100644
--- a/src/Server/TCPHandler.cpp
+++ b/src/Server/TCPHandler.cpp
@@ -25,6 +25,7 @@
 #include <Interpreters/OpenTelemetrySpanLog.h>
 #include <Storages/StorageReplicatedMergeTree.h>
 #include <Storages/MergeTree/MergeTreeDataPartUUID.h>
+#include <Storages/StorageS3Cluster.h>
 #include <Core/ExternalTable.h>
 #include <Storages/ColumnDefault.h>
 #include <DataTypes/DataTypeLowCardinality.h>
@@ -33,6 +34,7 @@
 
 #include <Processors/Executors/PullingAsyncPipelineExecutor.h>
 
+#include "Core/Protocol.h"
 #include "TCPHandler.h"
 
 #if !defined(ARCADIA_BUILD)
@@ -55,6 +57,7 @@ namespace ErrorCodes
     extern const int SOCKET_TIMEOUT;
     extern const int UNEXPECTED_PACKET_FROM_CLIENT;
     extern const int SUPPORT_IS_DISABLED;
+    extern const int UNKNOWN_PROTOCOL;
 }
 
 TCPHandler::TCPHandler(IServer & server_, const Poco::Net::StreamSocket & socket_, bool parse_proxy_protocol_, std::string server_display_name_)
@@ -62,8 +65,8 @@ TCPHandler::TCPHandler(IServer & server_, const Poco::Net::StreamSocket & socket
     , server(server_)
     , parse_proxy_protocol(parse_proxy_protocol_)
     , log(&Poco::Logger::get("TCPHandler"))
-    , connection_context(server.context())
-    , query_context(server.context())
+    , connection_context(Context::createCopy(server.context()))
+    , query_context(Context::createCopy(server.context()))
     , server_display_name(std::move(server_display_name_))
 {
 }
@@ -72,7 +75,8 @@ TCPHandler::~TCPHandler()
     try
     {
         state.reset();
-        out->next();
+        if (out)
+            out->next();
     }
     catch (...)
     {
@@ -85,13 +89,13 @@ void TCPHandler::runImpl()
     setThreadName("TCPHandler");
     ThreadStatus thread_status;
 
-    connection_context = server.context();
-    connection_context.makeSessionContext();
+    connection_context = Context::createCopy(server.context());
+    connection_context->makeSessionContext();
 
     /// These timeouts can be changed after receiving query.
 
-    auto global_receive_timeout = connection_context.getSettingsRef().receive_timeout;
-    auto global_send_timeout = connection_context.getSettingsRef().send_timeout;
+    auto global_receive_timeout = connection_context->getSettingsRef().receive_timeout;
+    auto global_send_timeout = connection_context->getSettingsRef().send_timeout;
 
     socket().setReceiveTimeout(global_receive_timeout);
     socket().setSendTimeout(global_send_timeout);
@@ -132,7 +136,7 @@ void TCPHandler::runImpl()
         try
         {
             /// We try to send error information to the client.
-            sendException(e, connection_context.getSettingsRef().calculate_text_stack_trace);
+            sendException(e, connection_context->getSettingsRef().calculate_text_stack_trace);
         }
         catch (...) {}
 
@@ -146,28 +150,30 @@ void TCPHandler::runImpl()
         {
             Exception e("Database " + backQuote(default_database) + " doesn't exist", ErrorCodes::UNKNOWN_DATABASE);
             LOG_ERROR(log, "Code: {}, e.displayText() = {}, Stack trace:\n\n{}", e.code(), e.displayText(), e.getStackTraceString());
-            sendException(e, connection_context.getSettingsRef().calculate_text_stack_trace);
+            sendException(e, connection_context->getSettingsRef().calculate_text_stack_trace);
             return;
         }
 
-        connection_context.setCurrentDatabase(default_database);
+        connection_context->setCurrentDatabase(default_database);
     }
 
-    Settings connection_settings = connection_context.getSettings();
+    Settings connection_settings = connection_context->getSettings();
+    UInt64 idle_connection_timeout = connection_settings.idle_connection_timeout;
+    UInt64 poll_interval = connection_settings.poll_interval;
 
     sendHello();
 
-    connection_context.setProgressCallback([this] (const Progress & value) { return this->updateProgress(value); });
+    connection_context->setProgressCallback([this] (const Progress & value) { return this->updateProgress(value); });
 
     while (true)
     {
         /// We are waiting for a packet from the client. Thus, every `poll_interval` seconds check whether we need to shut down.
         {
             Stopwatch idle_time;
-            while (!server.isCancelled() && !static_cast<ReadBufferFromPocoSocket &>(*in).poll(
-                std::min(connection_settings.poll_interval, connection_settings.idle_connection_timeout) * 1000000))
+            UInt64 timeout_ms = std::min(poll_interval, idle_connection_timeout) * 1000000;
+            while (!server.isCancelled() && !static_cast<ReadBufferFromPocoSocket &>(*in).poll(timeout_ms))
             {
-                if (idle_time.elapsedSeconds() > connection_settings.idle_connection_timeout)
+                if (idle_time.elapsedSeconds() > idle_connection_timeout)
                 {
                     LOG_TRACE(log, "Closing idle connection");
                     return;
@@ -180,7 +186,7 @@ void TCPHandler::runImpl()
             break;
 
         /// Set context of request.
-        query_context = connection_context;
+        query_context = Context::createCopy(connection_context);
 
         Stopwatch watch;
         state.reset();
@@ -208,12 +214,21 @@ void TCPHandler::runImpl()
             if (!receivePacket())
                 continue;
 
+            /** If Query received, then settings in query_context has been updated
+             *  So, update some other connection settings, for flexibility.
+             */
+            {
+                const Settings & settings = query_context->getSettingsRef();
+                idle_connection_timeout = settings.idle_connection_timeout;
+                poll_interval = settings.poll_interval;
+            }
+
             /** If part_uuids got received in previous packet, trying to read again.
               */
             if (state.empty() && state.part_uuids && !receivePacket())
                 continue;
 
-            query_scope.emplace(*query_context);
+            query_scope.emplace(query_context);
 
             send_exception_with_stack_trace = query_context->getSettingsRef().calculate_text_stack_trace;
 
@@ -228,9 +243,9 @@ void TCPHandler::runImpl()
                 CurrentThread::setFatalErrorCallback([this]{ sendLogs(); });
             }
 
-            query_context->setExternalTablesInitializer([&connection_settings, this] (Context & context)
+            query_context->setExternalTablesInitializer([&connection_settings, this] (ContextPtr context)
             {
-                if (&context != &*query_context)
+                if (context != query_context)
                     throw Exception("Unexpected context in external tables initializer", ErrorCodes::LOGICAL_ERROR);
 
                 /// Get blocks of temporary tables
@@ -245,9 +260,9 @@ void TCPHandler::runImpl()
             });
 
             /// Send structure of columns to client for function input()
-            query_context->setInputInitializer([this] (Context & context, const StoragePtr & input_storage)
+            query_context->setInputInitializer([this] (ContextPtr context, const StoragePtr & input_storage)
             {
-                if (&context != &query_context.value())
+                if (context != query_context)
                     throw Exception("Unexpected context in Input initializer", ErrorCodes::LOGICAL_ERROR);
 
                 auto metadata_snapshot = input_storage->getInMemoryMetadataPtr();
@@ -265,15 +280,15 @@ void TCPHandler::runImpl()
                 sendData(state.input_header);
             });
 
-            query_context->setInputBlocksReaderCallback([&connection_settings, this] (Context & context) -> Block
+            query_context->setInputBlocksReaderCallback([&connection_settings, this] (ContextPtr context) -> Block
             {
-                if (&context != &query_context.value())
+                if (context != query_context)
                     throw Exception("Unexpected context in InputBlocksReader", ErrorCodes::LOGICAL_ERROR);
 
-                size_t poll_interval;
+                size_t poll_interval_ms;
                 int receive_timeout;
-                std::tie(poll_interval, receive_timeout) = getReadTimeouts(connection_settings);
-                if (!readDataNext(poll_interval, receive_timeout))
+                std::tie(poll_interval_ms, receive_timeout) = getReadTimeouts(connection_settings);
+                if (!readDataNext(poll_interval_ms, receive_timeout))
                 {
                     state.block_in.reset();
                     state.maybe_compressed_in.reset();
@@ -282,11 +297,21 @@ void TCPHandler::runImpl()
                 return state.block_for_input;
             });
 
-            customizeContext(*query_context);
+            customizeContext(query_context);
+
+            /// This callback is needed for requesting read tasks inside pipeline for distributed processing
+            query_context->setReadTaskCallback([this]() -> String
+            {
+                std::lock_guard lock(task_callback_mutex);
+                sendReadTaskRequestAssumeLocked();
+                return receiveReadTaskResponseAssumeLocked();
+            });
 
             bool may_have_embedded_data = client_tcp_protocol_version >= DBMS_MIN_REVISION_WITH_CLIENT_SUPPORT_EMBEDDED_DATA;
             /// Processing Query
-            state.io = executeQuery(state.query, *query_context, false, state.stage, may_have_embedded_data);
+            state.io = executeQuery(state.query, query_context, false, state.stage, may_have_embedded_data);
+
+            unknown_packet_in_send_data = query_context->getSettingsRef().unknown_packet_in_send_data;
 
             after_check_cancelled.restart();
             after_send_progress.restart();
@@ -536,7 +561,7 @@ void TCPHandler::processInsertQuery(const Settings & connection_settings)
         {
             if (!table_id.empty())
             {
-                auto storage_ptr = DatabaseCatalog::instance().getTable(table_id, *query_context);
+                auto storage_ptr = DatabaseCatalog::instance().getTable(table_id, query_context);
                 sendTableColumns(storage_ptr->getInMemoryMetadataPtr()->getColumns());
             }
         }
@@ -643,6 +668,8 @@ void TCPHandler::processOrdinaryQueryWithProcessors()
         Block block;
         while (executor.pull(block, query_context->getSettingsRef().interactive_delay / 1000))
         {
+            std::lock_guard lock(task_callback_mutex);
+
             if (isQueryCancelled())
             {
                 /// A packet was received requesting to stop execution of the request.
@@ -700,7 +727,7 @@ void TCPHandler::processTablesStatusRequest()
     TablesStatusResponse response;
     for (const QualifiedTableName & table_name: request.tables)
     {
-        auto resolved_id = connection_context.tryResolveStorageID({table_name.database, table_name.table});
+        auto resolved_id = connection_context->tryResolveStorageID({table_name.database, table_name.table});
         StoragePtr table = DatabaseCatalog::instance().tryGetTable(resolved_id, connection_context);
         if (!table)
             continue;
@@ -717,7 +744,18 @@ void TCPHandler::processTablesStatusRequest()
         response.table_states_by_id.emplace(table_name, std::move(status));
     }
 
+
     writeVarUInt(Protocol::Server::TablesStatusResponse, *out);
+
+    /// For testing hedged requests
+    const Settings & settings = query_context->getSettingsRef();
+    if (settings.sleep_in_send_tables_status_ms.totalMilliseconds())
+    {
+        out->next();
+        std::chrono::milliseconds ms(settings.sleep_in_send_tables_status_ms.totalMilliseconds());
+        std::this_thread::sleep_for(ms);
+    }
+
     response.write(*out, client_tcp_protocol_version);
 }
 
@@ -743,6 +781,13 @@ void TCPHandler::sendPartUUIDs()
     }
 }
 
+
+void TCPHandler::sendReadTaskRequestAssumeLocked()
+{
+    writeVarUInt(Protocol::Server::ReadTaskRequest, *out);
+    out->next();
+}
+
 void TCPHandler::sendProfileInfo(const BlockStreamProfileInfo & info)
 {
     writeVarUInt(Protocol::Server::ProfileInfo, *out);
@@ -850,7 +895,7 @@ bool TCPHandler::receiveProxyHeader()
     }
 
     LOG_TRACE(log, "Forwarded client address from PROXY header: {}", forwarded_address);
-    connection_context.getClientInfo().forwarded_for = forwarded_address;
+    connection_context->getClientInfo().forwarded_for = forwarded_address;
     return true;
 }
 
@@ -903,7 +948,7 @@ void TCPHandler::receiveHello()
 
     if (user != USER_INTERSERVER_MARKER)
     {
-        connection_context.setUser(user, password, socket().peerAddress());
+        connection_context->setUser(user, password, socket().peerAddress());
     }
     else
     {
@@ -951,8 +996,6 @@ bool TCPHandler::receivePacket()
     UInt64 packet_type = 0;
     readVarUInt(packet_type, *in);
 
-//    std::cerr << "Server got packet: " << Protocol::Client::toString(packet_type) << "\n";
-
     switch (packet_type)
     {
         case Protocol::Client::IgnoredPartUUIDs:
@@ -1004,6 +1047,34 @@ void TCPHandler::receiveIgnoredPartUUIDs()
         query_context->getIgnoredPartUUIDs()->add(uuids);
 }
 
+
+String TCPHandler::receiveReadTaskResponseAssumeLocked()
+{
+    UInt64 packet_type = 0;
+    readVarUInt(packet_type, *in);
+    if (packet_type != Protocol::Client::ReadTaskResponse)
+    {
+        if (packet_type == Protocol::Client::Cancel)
+        {
+            state.is_cancelled = true;
+            return {};
+        }
+        else
+        {
+            throw Exception(fmt::format("Received {} packet after requesting read task",
+                    Protocol::Client::toString(packet_type)), ErrorCodes::UNEXPECTED_PACKET_FROM_CLIENT);
+        }
+    }
+    UInt64 version;
+    readVarUInt(version, *in);
+    if (version != DBMS_CLUSTER_PROCESSING_PROTOCOL_VERSION)
+        throw Exception("Protocol version for distributed processing mismatched", ErrorCodes::UNKNOWN_PROTOCOL);
+    String response;
+    readStringBinary(response, *in);
+    return response;
+}
+
+
 void TCPHandler::receiveClusterNameAndSalt()
 {
     readStringBinary(cluster, *in);
@@ -1021,7 +1092,7 @@ void TCPHandler::receiveClusterNameAndSalt()
         try
         {
             /// We try to send error information to the client.
-            sendException(e, connection_context.getSettingsRef().calculate_text_stack_trace);
+            sendException(e, connection_context->getSettingsRef().calculate_text_stack_trace);
         }
         catch (...) {}
 
@@ -1224,18 +1295,18 @@ bool TCPHandler::receiveData(bool scalar)
             /// If such a table does not exist, create it.
             if (resolved)
             {
-                storage = DatabaseCatalog::instance().getTable(resolved, *query_context);
+                storage = DatabaseCatalog::instance().getTable(resolved, query_context);
             }
             else
             {
                 NamesAndTypesList columns = block.getNamesAndTypesList();
-                auto temporary_table = TemporaryTableHolder(*query_context, ColumnsDescription{columns}, {});
+                auto temporary_table = TemporaryTableHolder(query_context, ColumnsDescription{columns}, {});
                 storage = temporary_table.getTable();
                 query_context->addExternalTable(temporary_id.table_name, std::move(temporary_table));
             }
             auto metadata_snapshot = storage->getInMemoryMetadataPtr();
             /// The data will be written directly to the table.
-            auto temporary_table_out = storage->write(ASTPtr(), metadata_snapshot, *query_context);
+            auto temporary_table_out = storage->write(ASTPtr(), metadata_snapshot, query_context);
             temporary_table_out->write(block);
             temporary_table_out->writeSuffix();
 
@@ -1334,7 +1405,7 @@ void TCPHandler::initBlockOutput(const Block & block)
             *state.maybe_compressed_out,
             client_tcp_protocol_version,
             block.cloneEmpty(),
-            !connection_context.getSettingsRef().low_cardinality_allow_in_native_format);
+            !connection_context->getSettingsRef().low_cardinality_allow_in_native_format);
     }
 }
 
@@ -1347,7 +1418,7 @@ void TCPHandler::initLogsBlockOutput(const Block & block)
             *out,
             client_tcp_protocol_version,
             block.cloneEmpty(),
-            !connection_context.getSettingsRef().low_cardinality_allow_in_native_format);
+            !connection_context->getSettingsRef().low_cardinality_allow_in_native_format);
     }
 }
 
@@ -1398,13 +1469,57 @@ void TCPHandler::sendData(const Block & block)
 {
     initBlockOutput(block);
 
-    writeVarUInt(Protocol::Server::Data, *out);
-    /// Send external table name (empty name is the main table)
-    writeStringBinary("", *out);
+    auto prev_bytes_written_out = out->count();
+    auto prev_bytes_written_compressed_out = state.maybe_compressed_out->count();
 
-    state.block_out->write(block);
-    state.maybe_compressed_out->next();
-    out->next();
+    try
+    {
+        /// For testing hedged requests
+        if (unknown_packet_in_send_data)
+        {
+            --unknown_packet_in_send_data;
+            if (unknown_packet_in_send_data == 0)
+                writeVarUInt(UInt64(-1), *out);
+        }
+
+        writeVarUInt(Protocol::Server::Data, *out);
+        /// Send external table name (empty name is the main table)
+        writeStringBinary("", *out);
+
+        /// For testing hedged requests
+        const Settings & settings = query_context->getSettingsRef();
+        if (block.rows() > 0 && settings.sleep_in_send_data_ms.totalMilliseconds())
+        {
+            out->next();
+            std::chrono::milliseconds ms(settings.sleep_in_send_data_ms.totalMilliseconds());
+            std::this_thread::sleep_for(ms);
+        }
+
+        state.block_out->write(block);
+        state.maybe_compressed_out->next();
+        out->next();
+    }
+    catch (...)
+    {
+        /// In case of unsuccessful write, if the buffer with written data was not flushed,
+        ///  we will rollback write to avoid breaking the protocol.
+        /// (otherwise the client will not be able to receive exception after unfinished data
+        ///  as it will expect the continuation of the data).
+        /// It looks like hangs on client side or a message like "Data compressed with different methods".
+
+        if (state.compression == Protocol::Compression::Enable)
+        {
+            auto extra_bytes_written_compressed = state.maybe_compressed_out->count() - prev_bytes_written_compressed_out;
+            if (state.maybe_compressed_out->offset() >= extra_bytes_written_compressed)
+                state.maybe_compressed_out->position() -= extra_bytes_written_compressed;
+        }
+
+        auto extra_bytes_written_out = out->count() - prev_bytes_written_out;
+        if (out->offset() >= extra_bytes_written_out)
+            out->position() -= extra_bytes_written_out;
+
+        throw;
+    }
 }
 
 
diff --git a/src/Server/TCPHandler.h b/src/Server/TCPHandler.h
index ee2f7c96b5a..ce0a4cee3ff 100644
--- a/src/Server/TCPHandler.h
+++ b/src/Server/TCPHandler.h
@@ -8,10 +8,10 @@
 #include <Core/Protocol.h>
 #include <Core/QueryProcessingStage.h>
 #include <IO/Progress.h>
+#include <IO/TimeoutSetter.h>
 #include <DataStreams/BlockIO.h>
 #include <Interpreters/InternalTextLogsQueue.h>
 #include <Interpreters/Context.h>
-#include <Client/TimeoutSetter.h>
 
 #include "IServer.h"
 
@@ -89,7 +89,7 @@ struct QueryState
         *this = QueryState();
     }
 
-    bool empty()
+    bool empty() const
     {
         return is_empty;
     }
@@ -113,14 +113,13 @@ public:
       *  because it allows to check the IP ranges of the trusted proxy.
       * Proxy-forwarded (original client) IP address is used for quota accounting if quota is keyed by forwarded IP.
       */
-    TCPHandler(IServer & server_, const Poco::Net::StreamSocket & socket_, bool parse_proxy_protocol_,
-        std::string server_display_name_);
+    TCPHandler(IServer & server_, const Poco::Net::StreamSocket & socket_, bool parse_proxy_protocol_, std::string server_display_name_);
     ~TCPHandler() override;
 
     void run() override;
 
     /// This method is called right before the query execution.
-    virtual void customizeContext(DB::Context & /*context*/) {}
+    virtual void customizeContext(ContextPtr /*context*/) {}
 
 private:
     IServer & server;
@@ -133,8 +132,10 @@ private:
     UInt64 client_version_patch = 0;
     UInt64 client_tcp_protocol_version = 0;
 
-    Context connection_context;
-    std::optional<Context> query_context;
+    ContextPtr connection_context;
+    ContextPtr query_context;
+
+    size_t unknown_packet_in_send_data = 0;
 
     /// Streams for reading/writing from/to client connection socket.
     std::shared_ptr<ReadBuffer> in;
@@ -151,6 +152,7 @@ private:
     String cluster;
     String cluster_secret;
 
+    std::mutex task_callback_mutex;
 
     /// At the moment, only one ongoing query in the connection is supported at a time.
     QueryState state;
@@ -170,9 +172,11 @@ private:
     bool receivePacket();
     void receiveQuery();
     void receiveIgnoredPartUUIDs();
+    String receiveReadTaskResponseAssumeLocked();
     bool receiveData(bool scalar);
     bool readDataNext(const size_t & poll_interval, const int & receive_timeout);
     void readData(const Settings & connection_settings);
+    void receiveClusterNameAndSalt();
     std::tuple<size_t, int> getReadTimeouts(const Settings & connection_settings);
 
     [[noreturn]] void receiveUnexpectedData();
@@ -199,12 +203,11 @@ private:
     void sendLogs();
     void sendEndOfStream();
     void sendPartUUIDs();
+    void sendReadTaskRequestAssumeLocked();
     void sendProfileInfo(const BlockStreamProfileInfo & info);
     void sendTotals(const Block & totals);
     void sendExtremes(const Block & extremes);
 
-    void receiveClusterNameAndSalt();
-
     /// Creates state.block_in/block_out for blocks read/write, depending on whether compression is enabled.
     void initBlockInput();
     void initBlockOutput(const Block & block);
diff --git a/src/Server/ya.make b/src/Server/ya.make
index ef5ef6d5f57..6a6a442fce8 100644
--- a/src/Server/ya.make
+++ b/src/Server/ya.make
@@ -22,10 +22,10 @@ SRCS(
     HTTPHandler.cpp
     HTTPHandlerFactory.cpp
     InterserverIOHTTPHandler.cpp
+    KeeperTCPHandler.cpp
     MySQLHandler.cpp
     MySQLHandlerFactory.cpp
     NotFoundHandler.cpp
-    NuKeeperTCPHandler.cpp
     PostgreSQLHandler.cpp
     PostgreSQLHandlerFactory.cpp
     PrometheusMetricsWriter.cpp
diff --git a/src/Storages/AlterCommands.cpp b/src/Storages/AlterCommands.cpp
index 7043a32760b..e3177c167c5 100644
--- a/src/Storages/AlterCommands.cpp
+++ b/src/Storages/AlterCommands.cpp
@@ -299,7 +299,7 @@ std::optional<AlterCommand> AlterCommand::parse(const ASTAlterCommand * command_
 }
 
 
-void AlterCommand::apply(StorageInMemoryMetadata & metadata, const Context & context) const
+void AlterCommand::apply(StorageInMemoryMetadata & metadata, ContextPtr context) const
 {
     if (type == ADD_COLUMN)
     {
@@ -320,7 +320,7 @@ void AlterCommand::apply(StorageInMemoryMetadata & metadata, const Context & con
         metadata.columns.add(column, after_column, first);
 
         /// Slow, because each time a list is copied
-        if (context.getSettingsRef().flatten_nested)
+        if (context->getSettingsRef().flatten_nested)
             metadata.columns.flattenNested();
     }
     else if (type == DROP_COLUMN)
@@ -702,7 +702,7 @@ bool AlterCommand::isRemovingProperty() const
     return to_remove != RemoveProperty::NO_PROPERTY;
 }
 
-std::optional<MutationCommand> AlterCommand::tryConvertToMutationCommand(StorageInMemoryMetadata & metadata, const Context & context) const
+std::optional<MutationCommand> AlterCommand::tryConvertToMutationCommand(StorageInMemoryMetadata & metadata, ContextPtr context) const
 {
     if (!isRequireMutationStage(metadata))
         return {};
@@ -788,7 +788,7 @@ String alterTypeToString(const AlterCommand::Type type)
     __builtin_unreachable();
 }
 
-void AlterCommands::apply(StorageInMemoryMetadata & metadata, const Context & context) const
+void AlterCommands::apply(StorageInMemoryMetadata & metadata, ContextPtr context) const
 {
     if (!prepared)
         throw DB::Exception("Alter commands is not prepared. Cannot apply. It's a bug", ErrorCodes::LOGICAL_ERROR);
@@ -880,7 +880,7 @@ void AlterCommands::prepare(const StorageInMemoryMetadata & metadata)
     prepared = true;
 }
 
-void AlterCommands::validate(const StorageInMemoryMetadata & metadata, const Context & context) const
+void AlterCommands::validate(const StorageInMemoryMetadata & metadata, ContextPtr context) const
 {
     auto all_columns = metadata.columns;
     /// Default expression for all added/modified columns
@@ -907,7 +907,7 @@ void AlterCommands::validate(const StorageInMemoryMetadata & metadata, const Con
                                 ErrorCodes::BAD_ARGUMENTS};
 
             if (command.codec)
-                CompressionCodecFactory::instance().validateCodecAndGetPreprocessedAST(command.codec, command.data_type, !context.getSettingsRef().allow_suspicious_codecs);
+                CompressionCodecFactory::instance().validateCodecAndGetPreprocessedAST(command.codec, command.data_type, !context->getSettingsRef().allow_suspicious_codecs);
 
             all_columns.add(ColumnDescription(column_name, command.data_type));
         }
@@ -927,7 +927,7 @@ void AlterCommands::validate(const StorageInMemoryMetadata & metadata, const Con
                                 ErrorCodes::NOT_IMPLEMENTED};
 
             if (command.codec)
-                CompressionCodecFactory::instance().validateCodecAndGetPreprocessedAST(command.codec, command.data_type, !context.getSettingsRef().allow_suspicious_codecs);
+                CompressionCodecFactory::instance().validateCodecAndGetPreprocessedAST(command.codec, command.data_type, !context->getSettingsRef().allow_suspicious_codecs);
             auto column_default = all_columns.getDefault(column_name);
             if (column_default)
             {
@@ -1172,7 +1172,7 @@ static MutationCommand createMaterializeTTLCommand()
     return command;
 }
 
-MutationCommands AlterCommands::getMutationCommands(StorageInMemoryMetadata metadata, bool materialize_ttl, const Context & context) const
+MutationCommands AlterCommands::getMutationCommands(StorageInMemoryMetadata metadata, bool materialize_ttl, ContextPtr context) const
 {
     MutationCommands result;
     for (const auto & alter_cmd : *this)
diff --git a/src/Storages/AlterCommands.h b/src/Storages/AlterCommands.h
index c973b0b6a6f..d6c80bc5ed4 100644
--- a/src/Storages/AlterCommands.h
+++ b/src/Storages/AlterCommands.h
@@ -128,7 +128,7 @@ struct AlterCommand
 
     static std::optional<AlterCommand> parse(const ASTAlterCommand * command);
 
-    void apply(StorageInMemoryMetadata & metadata, const Context & context) const;
+    void apply(StorageInMemoryMetadata & metadata, ContextPtr context) const;
 
     /// Check that alter command require data modification (mutation) to be
     /// executed. For example, cast from Date to UInt16 type can be executed
@@ -151,7 +151,7 @@ struct AlterCommand
     /// If possible, convert alter command to mutation command. In other case
     /// return empty optional. Some storages may execute mutations after
     /// metadata changes.
-    std::optional<MutationCommand> tryConvertToMutationCommand(StorageInMemoryMetadata & metadata, const Context & context) const;
+    std::optional<MutationCommand> tryConvertToMutationCommand(StorageInMemoryMetadata & metadata, ContextPtr context) const;
 };
 
 /// Return string representation of AlterCommand::Type
@@ -170,7 +170,7 @@ public:
     /// Checks that all columns exist and dependencies between them.
     /// This check is lightweight and base only on metadata.
     /// More accurate check have to be performed with storage->checkAlterIsPossible.
-    void validate(const StorageInMemoryMetadata & metadata, const Context & context) const;
+    void validate(const StorageInMemoryMetadata & metadata, ContextPtr context) const;
 
     /// Prepare alter commands. Set ignore flag to some of them and set some
     /// parts to commands from storage's metadata (for example, absent default)
@@ -178,7 +178,7 @@ public:
 
     /// Apply all alter command in sequential order to storage metadata.
     /// Commands have to be prepared before apply.
-    void apply(StorageInMemoryMetadata & metadata, const Context & context) const;
+    void apply(StorageInMemoryMetadata & metadata, ContextPtr context) const;
 
     /// At least one command modify settings.
     bool isSettingsAlter() const;
@@ -190,7 +190,7 @@ public:
     /// alter. If alter can be performed as pure metadata update, than result is
     /// empty. If some TTL changes happened than, depending on materialize_ttl
     /// additional mutation command (MATERIALIZE_TTL) will be returned.
-    MutationCommands getMutationCommands(StorageInMemoryMetadata metadata, bool materialize_ttl, const Context & context) const;
+    MutationCommands getMutationCommands(StorageInMemoryMetadata metadata, bool materialize_ttl, ContextPtr context) const;
 };
 
 }
diff --git a/src/Storages/ColumnDefault.h b/src/Storages/ColumnDefault.h
index 1035bfcc834..38b61415a9a 100644
--- a/src/Storages/ColumnDefault.h
+++ b/src/Storages/ColumnDefault.h
@@ -1,10 +1,10 @@
 #pragma once
 
+#include <Parsers/IAST.h>
+
 #include <string>
 #include <unordered_map>
 
-#include <Parsers/IAST.h>
-
 
 namespace DB
 {
@@ -18,7 +18,7 @@ enum class ColumnDefaultKind
 
 
 ColumnDefaultKind columnDefaultKindFromString(const std::string & str);
-std::string toString(const ColumnDefaultKind kind);
+std::string toString(ColumnDefaultKind kind);
 
 
 struct ColumnDefault
diff --git a/src/Storages/ColumnsDescription.cpp b/src/Storages/ColumnsDescription.cpp
index fc6bb661986..545911f1465 100644
--- a/src/Storages/ColumnsDescription.cpp
+++ b/src/Storages/ColumnsDescription.cpp
@@ -582,7 +582,7 @@ void ColumnsDescription::removeSubcolumns(const String & name_in_storage, const
         subcolumns.erase(name_in_storage + "." + subcolumn_name);
 }
 
-Block validateColumnsDefaultsAndGetSampleBlock(ASTPtr default_expr_list, const NamesAndTypesList & all_columns, const Context & context)
+Block validateColumnsDefaultsAndGetSampleBlock(ASTPtr default_expr_list, const NamesAndTypesList & all_columns, ContextPtr context)
 {
     for (const auto & child : default_expr_list->children)
         if (child->as<ASTSelectQuery>() || child->as<ASTSelectWithUnionQuery>() || child->as<ASTSubquery>())
diff --git a/src/Storages/ColumnsDescription.h b/src/Storages/ColumnsDescription.h
index 26e30004544..7fff22abf71 100644
--- a/src/Storages/ColumnsDescription.h
+++ b/src/Storages/ColumnsDescription.h
@@ -1,18 +1,20 @@
 #pragma once
 
-#include <Core/NamesAndTypes.h>
-#include <Core/Names.h>
-#include <Core/Block.h>
-#include <Common/Exception.h>
-#include <Storages/ColumnDefault.h>
-#include <Storages/ColumnCodec.h>
-#include <optional>
 #include <Compression/CompressionFactory.h>
+#include <Core/Block.h>
+#include <Core/Names.h>
+#include <Core/NamesAndTypes.h>
+#include <Interpreters/Context_fwd.h>
+#include <Storages/ColumnCodec.h>
+#include <Storages/ColumnDefault.h>
+#include <Common/Exception.h>
 
-#include <boost/multi_index_container.hpp>
-#include <boost/multi_index/sequenced_index.hpp>
-#include <boost/multi_index/ordered_index.hpp>
 #include <boost/multi_index/member.hpp>
+#include <boost/multi_index/ordered_index.hpp>
+#include <boost/multi_index/sequenced_index.hpp>
+#include <boost/multi_index_container.hpp>
+
+#include <optional>
 
 
 namespace DB
@@ -159,5 +161,5 @@ private:
 /// default expression result can be casted to column_type. Also checks, that we
 /// don't have strange constructions in default expression like SELECT query or
 /// arrayJoin function.
-Block validateColumnsDefaultsAndGetSampleBlock(ASTPtr default_expr_list, const NamesAndTypesList & all_columns, const Context & context);
+Block validateColumnsDefaultsAndGetSampleBlock(ASTPtr default_expr_list, const NamesAndTypesList & all_columns, ContextPtr context);
 }
diff --git a/src/Storages/ConstraintsDescription.cpp b/src/Storages/ConstraintsDescription.cpp
index e6315872a66..1e86a17523b 100644
--- a/src/Storages/ConstraintsDescription.cpp
+++ b/src/Storages/ConstraintsDescription.cpp
@@ -41,7 +41,7 @@ ConstraintsDescription ConstraintsDescription::parse(const String & str)
     return res;
 }
 
-ConstraintsExpressions ConstraintsDescription::getExpressions(const DB::Context & context,
+ConstraintsExpressions ConstraintsDescription::getExpressions(const DB::ContextPtr context,
                                                               const DB::NamesAndTypesList & source_columns_) const
 {
     ConstraintsExpressions res;
diff --git a/src/Storages/ConstraintsDescription.h b/src/Storages/ConstraintsDescription.h
index d6d2baefbd2..5e6416822bb 100644
--- a/src/Storages/ConstraintsDescription.h
+++ b/src/Storages/ConstraintsDescription.h
@@ -19,7 +19,7 @@ struct ConstraintsDescription
 
     static ConstraintsDescription parse(const String & str);
 
-    ConstraintsExpressions getExpressions(const Context & context, const NamesAndTypesList & source_columns_) const;
+    ConstraintsExpressions getExpressions(ContextPtr context, const NamesAndTypesList & source_columns_) const;
 
     ConstraintsDescription(const ConstraintsDescription & other);
     ConstraintsDescription & operator=(const ConstraintsDescription & other);
diff --git a/src/Storages/Distributed/DirectoryMonitor.cpp b/src/Storages/Distributed/DirectoryMonitor.cpp
index 6fe98c53b3e..e3b0b0d581c 100644
--- a/src/Storages/Distributed/DirectoryMonitor.cpp
+++ b/src/Storages/Distributed/DirectoryMonitor.cpp
@@ -9,6 +9,8 @@
 #include <Common/quoteString.h>
 #include <Common/hex.h>
 #include <Common/ActionBlocker.h>
+#include <Common/formatReadable.h>
+#include <Common/Stopwatch.h>
 #include <common/StringRef.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/Cluster.h>
@@ -104,12 +106,14 @@ namespace
         size_t rows = 0;
         size_t bytes = 0;
 
-        std::string header;
+        /// dumpStructure() of the header -- obsolete
+        std::string block_header_string;
+        Block block_header;
     };
 
-    DistributedHeader readDistributedHeader(ReadBuffer & in, Poco::Logger * log)
+    DistributedHeader readDistributedHeader(ReadBufferFromFile & in, Poco::Logger * log)
     {
-        DistributedHeader header;
+        DistributedHeader distributed_header;
 
         UInt64 query_size;
         readVarUInt(query_size, in);
@@ -135,17 +139,25 @@ namespace
                 LOG_WARNING(log, "ClickHouse shard version is older than ClickHouse initiator version. It may lack support for new features.");
             }
 
-            readStringBinary(header.insert_query, header_buf);
-            header.insert_settings.read(header_buf);
+            readStringBinary(distributed_header.insert_query, header_buf);
+            distributed_header.insert_settings.read(header_buf);
 
             if (header_buf.hasPendingData())
-                header.client_info.read(header_buf, initiator_revision);
+                distributed_header.client_info.read(header_buf, initiator_revision);
 
             if (header_buf.hasPendingData())
             {
-                readVarUInt(header.rows, header_buf);
-                readVarUInt(header.bytes, header_buf);
-                readStringBinary(header.header, header_buf);
+                readVarUInt(distributed_header.rows, header_buf);
+                readVarUInt(distributed_header.bytes, header_buf);
+                readStringBinary(distributed_header.block_header_string, header_buf);
+            }
+
+            if (header_buf.hasPendingData())
+            {
+                NativeBlockInputStream header_block_in(header_buf, DBMS_TCP_PROTOCOL_VERSION);
+                distributed_header.block_header = header_block_in.read();
+                if (!distributed_header.block_header)
+                    throw Exception(ErrorCodes::CANNOT_READ_ALL_DATA, "Cannot read header from the {} batch", in.getFileName());
             }
 
             /// Add handling new data here, for example:
@@ -155,20 +167,20 @@ namespace
             ///
             /// And note that it is safe, because we have checksum and size for header.
 
-            return header;
+            return distributed_header;
         }
 
         if (query_size == DBMS_DISTRIBUTED_SIGNATURE_HEADER_OLD_FORMAT)
         {
-            header.insert_settings.read(in, SettingsWriteFormat::BINARY);
-            readStringBinary(header.insert_query, in);
-            return header;
+            distributed_header.insert_settings.read(in, SettingsWriteFormat::BINARY);
+            readStringBinary(distributed_header.insert_query, in);
+            return distributed_header;
         }
 
-        header.insert_query.resize(query_size);
-        in.readStrict(header.insert_query.data(), query_size);
+        distributed_header.insert_query.resize(query_size);
+        in.readStrict(distributed_header.insert_query.data(), query_size);
 
-        return header;
+        return distributed_header;
     }
 
     /// remote_error argument is used to decide whether some errors should be
@@ -200,35 +212,71 @@ namespace
         return nullptr;
     }
 
-    void writeRemoteConvert(const DistributedHeader & header, RemoteBlockOutputStream & remote, ReadBufferFromFile & in, Poco::Logger * log)
+    void writeAndConvert(RemoteBlockOutputStream & remote, ReadBufferFromFile & in)
     {
-        if (remote.getHeader() && header.header != remote.getHeader().dumpStructure())
+        CompressedReadBuffer decompressing_in(in);
+        NativeBlockInputStream block_in(decompressing_in, DBMS_TCP_PROTOCOL_VERSION);
+        block_in.readPrefix();
+
+        while (Block block = block_in.read())
         {
-            LOG_WARNING(log,
-                "Structure does not match (remote: {}, local: {}), implicit conversion will be done",
-                remote.getHeader().dumpStructure(), header.header);
-
-            CompressedReadBuffer decompressing_in(in);
-            /// Lack of header, requires to read blocks
-            NativeBlockInputStream block_in(decompressing_in, DBMS_TCP_PROTOCOL_VERSION);
-
-            block_in.readPrefix();
-            while (Block block = block_in.read())
-            {
-                ConvertingBlockInputStream convert(
-                    std::make_shared<OneBlockInputStream>(block),
-                    remote.getHeader(),
-                    ConvertingBlockInputStream::MatchColumnsMode::Name);
-                auto adopted_block = convert.read();
-                remote.write(adopted_block);
-            }
-            block_in.readSuffix();
+            ConvertingBlockInputStream convert(
+                std::make_shared<OneBlockInputStream>(block),
+                remote.getHeader(),
+                ConvertingBlockInputStream::MatchColumnsMode::Name);
+            auto adopted_block = convert.read();
+            remote.write(adopted_block);
         }
-        else
+
+        block_in.readSuffix();
+    }
+
+    void writeRemoteConvert(
+        const DistributedHeader & distributed_header,
+        RemoteBlockOutputStream & remote,
+        bool compression_expected,
+        ReadBufferFromFile & in,
+        Poco::Logger * log)
+    {
+        if (!remote.getHeader())
         {
             CheckingCompressedReadBuffer checking_in(in);
             remote.writePrepared(checking_in);
+            return;
         }
+
+        /// This is old format, that does not have header for the block in the file header,
+        /// applying ConvertingBlockInputStream in this case is not a big overhead.
+        ///
+        /// Anyway we can get header only from the first block, which contain all rows anyway.
+        if (!distributed_header.block_header)
+        {
+            LOG_TRACE(log, "Processing batch {} with old format (no header)", in.getFileName());
+
+            writeAndConvert(remote, in);
+            return;
+        }
+
+        if (!blocksHaveEqualStructure(distributed_header.block_header, remote.getHeader()))
+        {
+            LOG_WARNING(log,
+                "Structure does not match (remote: {}, local: {}), implicit conversion will be done",
+                remote.getHeader().dumpStructure(), distributed_header.block_header.dumpStructure());
+
+            writeAndConvert(remote, in);
+            return;
+        }
+
+        /// If connection does not use compression, we have to uncompress the data.
+        if (!compression_expected)
+        {
+            writeAndConvert(remote, in);
+            return;
+        }
+
+        /// Otherwise write data as it was already prepared (more efficient path).
+        CheckingCompressedReadBuffer checking_in(in);
+        remote.writePrepared(checking_in);
     }
 }
 
@@ -245,14 +293,14 @@ StorageDistributedDirectoryMonitor::StorageDistributedDirectoryMonitor(
     , disk(disk_)
     , relative_path(relative_path_)
     , path(disk->getPath() + relative_path + '/')
-    , should_batch_inserts(storage.global_context.getSettingsRef().distributed_directory_monitor_batch_inserts)
+    , should_batch_inserts(storage.getContext()->getSettingsRef().distributed_directory_monitor_batch_inserts)
     , dir_fsync(storage.getDistributedSettingsRef().fsync_directories)
-    , min_batched_block_size_rows(storage.global_context.getSettingsRef().min_insert_block_size_rows)
-    , min_batched_block_size_bytes(storage.global_context.getSettingsRef().min_insert_block_size_bytes)
+    , min_batched_block_size_rows(storage.getContext()->getSettingsRef().min_insert_block_size_rows)
+    , min_batched_block_size_bytes(storage.getContext()->getSettingsRef().min_insert_block_size_bytes)
     , current_batch_file_path(path + "current_batch.txt")
-    , default_sleep_time(storage.global_context.getSettingsRef().distributed_directory_monitor_sleep_time_ms.totalMilliseconds())
+    , default_sleep_time(storage.getContext()->getSettingsRef().distributed_directory_monitor_sleep_time_ms.totalMilliseconds())
     , sleep_time(default_sleep_time)
-    , max_sleep_time(storage.global_context.getSettingsRef().distributed_directory_monitor_max_sleep_time_ms.totalMilliseconds())
+    , max_sleep_time(storage.getContext()->getSettingsRef().distributed_directory_monitor_max_sleep_time_ms.totalMilliseconds())
     , log(&Poco::Logger::get(getLoggerName()))
     , monitor_blocker(monitor_blocker_)
     , metric_pending_files(CurrentMetrics::DistributedFilesToInsert, 0)
@@ -276,7 +324,7 @@ void StorageDistributedDirectoryMonitor::flushAllData()
     if (quit)
         return;
 
-    std::unique_lock lock{mutex};
+    std::lock_guard lock{mutex};
 
     const auto & files = getFiles();
     if (!files.empty())
@@ -303,7 +351,7 @@ void StorageDistributedDirectoryMonitor::shutdownAndDropAllData()
 
 void StorageDistributedDirectoryMonitor::run()
 {
-    std::unique_lock lock{mutex};
+    std::lock_guard lock{mutex};
 
     bool do_sleep = false;
     while (!quit)
@@ -320,12 +368,12 @@ void StorageDistributedDirectoryMonitor::run()
             {
                 do_sleep = !processFiles(files);
 
-                std::unique_lock metrics_lock(metrics_mutex);
+                std::lock_guard metrics_lock(metrics_mutex);
                 last_exception = std::exception_ptr{};
             }
             catch (...)
             {
-                std::unique_lock metrics_lock(metrics_mutex);
+                std::lock_guard metrics_lock(metrics_mutex);
 
                 do_sleep = true;
                 ++error_count;
@@ -344,7 +392,7 @@ void StorageDistributedDirectoryMonitor::run()
         const auto now = std::chrono::system_clock::now();
         if (now - last_decrease_time > decrease_error_count_period)
         {
-            std::unique_lock metrics_lock(metrics_mutex);
+            std::lock_guard metrics_lock(metrics_mutex);
 
             error_count /= 2;
             last_decrease_time = now;
@@ -427,7 +475,7 @@ ConnectionPoolPtr StorageDistributedDirectoryMonitor::createPool(const std::stri
 
     auto pools = createPoolsForAddresses(name, pool_factory, storage.log);
 
-    const auto settings = storage.global_context.getSettings();
+    const auto settings = storage.getContext()->getSettings();
     return pools.size() == 1 ? pools.front() : std::make_shared<ConnectionPoolWithFailover>(pools,
         settings.load_balancing,
         settings.distributed_replica_error_half_life.totalSeconds(),
@@ -453,10 +501,15 @@ std::map<UInt64, std::string> StorageDistributedDirectoryMonitor::getFiles()
         }
     }
 
-    metric_pending_files.changeTo(files.size());
-
     {
-        std::unique_lock metrics_lock(metrics_mutex);
+        std::lock_guard metrics_lock(metrics_mutex);
+
+        if (files_count != files.size())
+            LOG_TRACE(log, "Files set to {} (was {})", files.size(), files_count);
+        if (bytes_count != new_bytes_count)
+            LOG_TRACE(log, "Bytes set to {} (was {})", new_bytes_count, bytes_count);
+
+        metric_pending_files.changeTo(files.size());
         files_count = files.size();
         bytes_count = new_bytes_count;
     }
@@ -485,21 +538,28 @@ bool StorageDistributedDirectoryMonitor::processFiles(const std::map<UInt64, std
 
 void StorageDistributedDirectoryMonitor::processFile(const std::string & file_path)
 {
-    LOG_TRACE(log, "Started processing `{}`", file_path);
-    auto timeouts = ConnectionTimeouts::getTCPTimeoutsWithFailover(storage.global_context.getSettingsRef());
+    Stopwatch watch;
+    auto timeouts = ConnectionTimeouts::getTCPTimeoutsWithFailover(storage.getContext()->getSettingsRef());
 
     try
     {
         CurrentMetrics::Increment metric_increment{CurrentMetrics::DistributedSend};
 
         ReadBufferFromFile in(file_path);
-        const auto & header = readDistributedHeader(in, log);
+        const auto & distributed_header = readDistributedHeader(in, log);
 
-        auto connection = pool->get(timeouts, &header.insert_settings);
+        LOG_DEBUG(log, "Started processing `{}` ({} rows, {} bytes)", file_path,
+            formatReadableQuantity(distributed_header.rows),
+            formatReadableSizeWithBinarySuffix(distributed_header.bytes));
+
+        auto connection = pool->get(timeouts, &distributed_header.insert_settings);
         RemoteBlockOutputStream remote{*connection, timeouts,
-            header.insert_query, header.insert_settings, header.client_info};
+            distributed_header.insert_query,
+            distributed_header.insert_settings,
+            distributed_header.client_info};
         remote.writePrefix();
-        writeRemoteConvert(header, remote, in, log);
+        bool compression_expected = connection->getCompression() == Protocol::Compression::Enable;
+        writeRemoteConvert(distributed_header, remote, compression_expected, in, log);
         remote.writeSuffix();
     }
     catch (const Exception & e)
@@ -509,10 +569,8 @@ void StorageDistributedDirectoryMonitor::processFile(const std::string & file_pa
     }
 
     auto dir_sync_guard = getDirectorySyncGuard(dir_fsync, disk, relative_path);
-    Poco::File{file_path}.remove();
-    metric_pending_files.sub();
-
-    LOG_TRACE(log, "Finished processing `{}`", file_path);
+    markAsSend(file_path);
+    LOG_TRACE(log, "Finished processing `{}` (took {} ms)", file_path, watch.elapsedMilliseconds());
 }
 
 struct StorageDistributedDirectoryMonitor::BatchHeader
@@ -520,20 +578,21 @@ struct StorageDistributedDirectoryMonitor::BatchHeader
     Settings settings;
     String query;
     ClientInfo client_info;
-    String sample_block_structure;
+    Block header;
 
-    BatchHeader(Settings settings_, String query_, ClientInfo client_info_, String sample_block_structure_)
+    BatchHeader(Settings settings_, String query_, ClientInfo client_info_, Block header_)
         : settings(std::move(settings_))
         , query(std::move(query_))
         , client_info(std::move(client_info_))
-        , sample_block_structure(std::move(sample_block_structure_))
+        , header(std::move(header_))
     {
     }
 
     bool operator==(const BatchHeader & other) const
     {
-        return std::tie(settings, query, client_info.query_kind, sample_block_structure) ==
-               std::tie(other.settings, other.query, other.client_info.query_kind, other.sample_block_structure);
+        return std::tie(settings, query, client_info.query_kind) ==
+               std::tie(other.settings, other.query, other.client_info.query_kind) &&
+               blocksHaveEqualStructure(header, other.header);
     }
 
     struct Hash
@@ -542,7 +601,7 @@ struct StorageDistributedDirectoryMonitor::BatchHeader
         {
             SipHash hash_state;
             hash_state.update(batch_header.query.data(), batch_header.query.size());
-            hash_state.update(batch_header.sample_block_structure.data(), batch_header.sample_block_structure.size());
+            batch_header.header.updateHash(hash_state);
             return hash_state.get64();
         }
     };
@@ -584,6 +643,12 @@ struct StorageDistributedDirectoryMonitor::Batch
 
         CurrentMetrics::Increment metric_increment{CurrentMetrics::DistributedSend};
 
+        Stopwatch watch;
+
+        LOG_DEBUG(parent.log, "Sending a batch of {} files ({} rows, {} bytes).", file_indices.size(),
+            formatReadableQuantity(total_rows),
+            formatReadableSizeWithBinarySuffix(total_bytes));
+
         if (!recovered)
         {
             /// For deduplication in Replicated tables to work, in case of error
@@ -610,7 +675,7 @@ struct StorageDistributedDirectoryMonitor::Batch
 
             Poco::File{tmp_file}.renameTo(parent.current_batch_file_path);
         }
-        auto timeouts = ConnectionTimeouts::getTCPTimeoutsWithFailover(parent.storage.global_context.getSettingsRef());
+        auto timeouts = ConnectionTimeouts::getTCPTimeoutsWithFailover(parent.storage.getContext()->getSettingsRef());
         auto connection = parent.pool->get(timeouts);
 
         bool batch_broken = false;
@@ -629,16 +694,18 @@ struct StorageDistributedDirectoryMonitor::Batch
                 }
 
                 ReadBufferFromFile in(file_path->second);
-                const auto & header = readDistributedHeader(in, parent.log);
+                const auto & distributed_header = readDistributedHeader(in, parent.log);
 
                 if (!remote)
                 {
                     remote = std::make_unique<RemoteBlockOutputStream>(*connection, timeouts,
-                        header.insert_query, header.insert_settings, header.client_info);
+                        distributed_header.insert_query,
+                        distributed_header.insert_settings,
+                        distributed_header.client_info);
                     remote->writePrefix();
                 }
-
-                writeRemoteConvert(header, *remote, in, parent.log);
+                bool compression_expected = connection->getCompression() == Protocol::Compression::Enable;
+                writeRemoteConvert(distributed_header, *remote, compression_expected, in, parent.log);
             }
 
             if (remote)
@@ -657,11 +724,11 @@ struct StorageDistributedDirectoryMonitor::Batch
 
         if (!batch_broken)
         {
-            LOG_TRACE(parent.log, "Sent a batch of {} files.", file_indices.size());
+            LOG_TRACE(parent.log, "Sent a batch of {} files (took {} ms).", file_indices.size(), watch.elapsedMilliseconds());
 
             auto dir_sync_guard = getDirectorySyncGuard(dir_fsync, parent.disk, parent.relative_path);
             for (UInt64 file_index : file_indices)
-                Poco::File{file_index_to_path.at(file_index)}.remove();
+                parent.markAsSend(file_index_to_path.at(file_index));
         }
         else
         {
@@ -747,16 +814,24 @@ BlockInputStreamPtr StorageDistributedDirectoryMonitor::createStreamFromFile(con
     return std::make_shared<DirectoryMonitorBlockInputStream>(file_name);
 }
 
-bool StorageDistributedDirectoryMonitor::scheduleAfter(size_t ms)
+bool StorageDistributedDirectoryMonitor::addAndSchedule(size_t file_size, size_t ms)
 {
     if (quit)
         return false;
+
+    {
+        std::lock_guard metrics_lock(metrics_mutex);
+        metric_pending_files.add();
+        bytes_count += file_size;
+        ++files_count;
+    }
+
     return task_handle->scheduleAfter(ms, false);
 }
 
-StorageDistributedDirectoryMonitor::Status StorageDistributedDirectoryMonitor::getStatus() const
+StorageDistributedDirectoryMonitor::Status StorageDistributedDirectoryMonitor::getStatus()
 {
-    std::unique_lock metrics_lock(metrics_mutex);
+    std::lock_guard metrics_lock(metrics_mutex);
 
     return Status{
         path,
@@ -780,7 +855,6 @@ void StorageDistributedDirectoryMonitor::processFilesWithBatching(const std::map
         batch.readText(in);
         file_indices_to_skip.insert(batch.file_indices.begin(), batch.file_indices.end());
         batch.send();
-        metric_pending_files.sub(batch.file_indices.size());
     }
 
     std::unordered_map<BatchHeader, Batch, BatchHeader::Hash> header_to_batch;
@@ -798,22 +872,27 @@ void StorageDistributedDirectoryMonitor::processFilesWithBatching(const std::map
 
         size_t total_rows = 0;
         size_t total_bytes = 0;
-        std::string sample_block_structure;
-        DistributedHeader header;
+        Block header;
+        DistributedHeader distributed_header;
         try
         {
             /// Determine metadata of the current file and check if it is not broken.
             ReadBufferFromFile in{file_path};
-            header = readDistributedHeader(in, log);
+            distributed_header = readDistributedHeader(in, log);
 
-            if (header.rows)
+            if (distributed_header.rows)
             {
-                total_rows += header.rows;
-                total_bytes += header.bytes;
-                sample_block_structure = header.header;
+                total_rows += distributed_header.rows;
+                total_bytes += distributed_header.bytes;
             }
-            else
+
+            if (distributed_header.block_header)
+                header = distributed_header.block_header;
+
+            if (!total_rows || !header)
             {
+                LOG_DEBUG(log, "Processing batch {} with old format (no header/rows)", in.getFileName());
+
                 CompressedReadBuffer decompressing_in(in);
                 NativeBlockInputStream block_in(decompressing_in, DBMS_TCP_PROTOCOL_VERSION);
                 block_in.readPrefix();
@@ -823,8 +902,8 @@ void StorageDistributedDirectoryMonitor::processFilesWithBatching(const std::map
                     total_rows += block.rows();
                     total_bytes += block.bytes();
 
-                    if (sample_block_structure.empty())
-                        sample_block_structure = block.cloneEmpty().dumpStructure();
+                    if (!header)
+                        header = block.cloneEmpty();
                 }
                 block_in.readSuffix();
             }
@@ -840,7 +919,12 @@ void StorageDistributedDirectoryMonitor::processFilesWithBatching(const std::map
                 throw;
         }
 
-        BatchHeader batch_header(std::move(header.insert_settings), std::move(header.insert_query), std::move(header.client_info), std::move(sample_block_structure));
+        BatchHeader batch_header(
+            std::move(distributed_header.insert_settings),
+            std::move(distributed_header.insert_query),
+            std::move(distributed_header.client_info),
+            std::move(header)
+        );
         Batch & batch = header_to_batch.try_emplace(batch_header, *this, files).first->second;
 
         batch.file_indices.push_back(file_idx);
@@ -850,7 +934,6 @@ void StorageDistributedDirectoryMonitor::processFilesWithBatching(const std::map
         if (batch.isEnoughSize())
         {
             batch.send();
-            metric_pending_files.sub(batch.file_indices.size());
         }
     }
 
@@ -858,7 +941,6 @@ void StorageDistributedDirectoryMonitor::processFilesWithBatching(const std::map
     {
         Batch & batch = kv.second;
         batch.send();
-        metric_pending_files.sub(batch.file_indices.size());
     }
 
     {
@@ -871,7 +953,7 @@ void StorageDistributedDirectoryMonitor::processFilesWithBatching(const std::map
     }
 }
 
-void StorageDistributedDirectoryMonitor::markAsBroken(const std::string & file_path) const
+void StorageDistributedDirectoryMonitor::markAsBroken(const std::string & file_path)
 {
     const auto last_path_separator_pos = file_path.rfind('/');
     const auto & base_path = file_path.substr(0, last_path_separator_pos + 1);
@@ -884,12 +966,37 @@ void StorageDistributedDirectoryMonitor::markAsBroken(const std::string & file_p
     auto dir_sync_guard = getDirectorySyncGuard(dir_fsync, disk, relative_path);
     auto broken_dir_sync_guard = getDirectorySyncGuard(dir_fsync, disk, relative_path + "/broken/");
 
-    Poco::File{file_path}.renameTo(broken_file_path);
+    Poco::File file(file_path);
+
+    {
+        std::lock_guard metrics_lock(metrics_mutex);
+
+        size_t file_size = file.getSize();
+        --files_count;
+        bytes_count -= file_size;
+    }
+
+    file.renameTo(broken_file_path);
 
     LOG_ERROR(log, "Renamed `{}` to `{}`", file_path, broken_file_path);
 }
+void StorageDistributedDirectoryMonitor::markAsSend(const std::string & file_path)
+{
+    Poco::File file(file_path);
 
-bool StorageDistributedDirectoryMonitor::maybeMarkAsBroken(const std::string & file_path, const Exception & e) const
+    size_t file_size = file.getSize();
+
+    {
+        std::lock_guard metrics_lock(metrics_mutex);
+        metric_pending_files.sub();
+        --files_count;
+        bytes_count -= file_size;
+    }
+
+    file.remove();
+}
+
+bool StorageDistributedDirectoryMonitor::maybeMarkAsBroken(const std::string & file_path, const Exception & e)
 {
     /// mark file as broken if necessary
     if (isFileBrokenErrorCode(e.code(), e.isRemoteException()))
@@ -912,7 +1019,7 @@ void StorageDistributedDirectoryMonitor::updatePath(const std::string & new_rela
     std::lock_guard lock{mutex};
 
     {
-        std::unique_lock metrics_lock(metrics_mutex);
+        std::lock_guard metrics_lock(metrics_mutex);
         relative_path = new_relative_path;
         path = disk->getPath() + relative_path + '/';
     }
diff --git a/src/Storages/Distributed/DirectoryMonitor.h b/src/Storages/Distributed/DirectoryMonitor.h
index c73b79761ca..1ccac4522d7 100644
--- a/src/Storages/Distributed/DirectoryMonitor.h
+++ b/src/Storages/Distributed/DirectoryMonitor.h
@@ -48,7 +48,7 @@ public:
     static BlockInputStreamPtr createStreamFromFile(const String & file_name);
 
     /// For scheduling via DistributedBlockOutputStream
-    bool scheduleAfter(size_t ms);
+    bool addAndSchedule(size_t file_size, size_t ms);
 
     /// system.distribution_queue interface
     struct Status
@@ -60,7 +60,7 @@ public:
         size_t bytes_count;
         bool is_blocked;
     };
-    Status getStatus() const;
+    Status getStatus();
 
 private:
     void run();
@@ -70,8 +70,9 @@ private:
     void processFile(const std::string & file_path);
     void processFilesWithBatching(const std::map<UInt64, std::string> & files);
 
-    void markAsBroken(const std::string & file_path) const;
-    bool maybeMarkAsBroken(const std::string & file_path, const Exception & e) const;
+    void markAsBroken(const std::string & file_path);
+    void markAsSend(const std::string & file_path);
+    bool maybeMarkAsBroken(const std::string & file_path, const Exception & e);
 
     std::string getLoggerName() const;
 
@@ -91,7 +92,7 @@ private:
     struct BatchHeader;
     struct Batch;
 
-    mutable std::mutex metrics_mutex;
+    std::mutex metrics_mutex;
     size_t error_count = 0;
     size_t files_count = 0;
     size_t bytes_count = 0;
diff --git a/src/Storages/Distributed/DistributedBlockOutputStream.cpp b/src/Storages/Distributed/DistributedBlockOutputStream.cpp
index 51bd6d83105..d05fbae60d9 100644
--- a/src/Storages/Distributed/DistributedBlockOutputStream.cpp
+++ b/src/Storages/Distributed/DistributedBlockOutputStream.cpp
@@ -58,6 +58,7 @@ namespace ErrorCodes
 {
     extern const int LOGICAL_ERROR;
     extern const int TIMEOUT_EXCEEDED;
+    extern const int TOO_LARGE_DISTRIBUTED_DEPTH;
 }
 
 static Block adoptBlock(const Block & header, const Block & block, Poco::Logger * log)
@@ -86,14 +87,14 @@ static void writeBlockConvert(const BlockOutputStreamPtr & out, const Block & bl
 
 
 DistributedBlockOutputStream::DistributedBlockOutputStream(
-    const Context & context_,
+    ContextPtr context_,
     StorageDistributed & storage_,
     const StorageMetadataPtr & metadata_snapshot_,
     const ASTPtr & query_ast_,
     const ClusterPtr & cluster_,
     bool insert_sync_,
     UInt64 insert_timeout_)
-    : context(context_)
+    : context(Context::createCopy(context_))
     , storage(storage_)
     , metadata_snapshot(metadata_snapshot_)
     , query_ast(query_ast_)
@@ -103,6 +104,10 @@ DistributedBlockOutputStream::DistributedBlockOutputStream(
     , insert_timeout(insert_timeout_)
     , log(&Poco::Logger::get("DistributedBlockOutputStream"))
 {
+    const auto & settings = context->getSettingsRef();
+    if (settings.max_distributed_depth && context->getClientInfo().distributed_depth > settings.max_distributed_depth)
+        throw Exception("Maximum distributed depth exceeded", ErrorCodes::TOO_LARGE_DISTRIBUTED_DEPTH);
+    context->getClientInfo().distributed_depth += 1;
 }
 
 
@@ -114,6 +119,7 @@ Block DistributedBlockOutputStream::getHeader() const
 
 void DistributedBlockOutputStream::writePrefix()
 {
+    storage.delayInsertOrThrowIfNeeded();
 }
 
 
@@ -142,7 +148,7 @@ void DistributedBlockOutputStream::write(const Block & block)
 
 void DistributedBlockOutputStream::writeAsync(const Block & block)
 {
-    const Settings & settings = context.getSettingsRef();
+    const Settings & settings = context->getSettingsRef();
     bool random_shard_insert = settings.insert_distributed_one_random_shard && !storage.has_sharding_key;
 
     if (random_shard_insert)
@@ -193,7 +199,7 @@ std::string DistributedBlockOutputStream::getCurrentStateDescription()
 
 void DistributedBlockOutputStream::initWritingJobs(const Block & first_block, size_t start, size_t end)
 {
-    const Settings & settings = context.getSettingsRef();
+    const Settings & settings = context->getSettingsRef();
     const auto & addresses_with_failovers = cluster->getShardsAddresses();
     const auto & shards_info = cluster->getShardsInfo();
     size_t num_shards = end - start;
@@ -302,7 +308,7 @@ DistributedBlockOutputStream::runWritingJob(DistributedBlockOutputStream::JobRep
         }
 
         const Block & shard_block = (num_shards > 1) ? job.current_shard_block : current_block;
-        const Settings & settings = context.getSettingsRef();
+        const Settings & settings = context->getSettingsRef();
 
         /// Do not initiate INSERT for empty block.
         if (shard_block.rows() == 0)
@@ -342,7 +348,8 @@ DistributedBlockOutputStream::runWritingJob(DistributedBlockOutputStream::JobRep
                 if (throttler)
                     job.connection_entry->setThrottler(throttler);
 
-                job.stream = std::make_shared<RemoteBlockOutputStream>(*job.connection_entry, timeouts, query_string, settings, context.getClientInfo());
+                job.stream = std::make_shared<RemoteBlockOutputStream>(
+                    *job.connection_entry, timeouts, query_string, settings, context->getClientInfo());
                 job.stream->writePrefix();
             }
 
@@ -356,7 +363,7 @@ DistributedBlockOutputStream::runWritingJob(DistributedBlockOutputStream::JobRep
             if (!job.stream)
             {
                 /// Forward user settings
-                job.local_context = std::make_unique<Context>(context);
+                job.local_context = Context::createCopy(context);
 
                 /// Copying of the query AST is required to avoid race,
                 /// in case of INSERT into multiple local shards.
@@ -366,7 +373,7 @@ DistributedBlockOutputStream::runWritingJob(DistributedBlockOutputStream::JobRep
                 /// to resolve tables (in InterpreterInsertQuery::getTable())
                 auto copy_query_ast = query_ast->clone();
 
-                InterpreterInsertQuery interp(copy_query_ast, *job.local_context);
+                InterpreterInsertQuery interp(copy_query_ast, job.local_context);
                 auto block_io = interp.execute();
 
                 job.stream = block_io.out;
@@ -384,7 +391,7 @@ DistributedBlockOutputStream::runWritingJob(DistributedBlockOutputStream::JobRep
 
 void DistributedBlockOutputStream::writeSync(const Block & block)
 {
-    const Settings & settings = context.getSettingsRef();
+    const Settings & settings = context->getSettingsRef();
     const auto & shards_info = cluster->getShardsInfo();
     bool random_shard_insert = settings.insert_distributed_one_random_shard && !storage.has_sharding_key;
     size_t start = 0;
@@ -561,7 +568,7 @@ void DistributedBlockOutputStream::writeSplitAsync(const Block & block)
 void DistributedBlockOutputStream::writeAsyncImpl(const Block & block, size_t shard_id)
 {
     const auto & shard_info = cluster->getShardsInfo()[shard_id];
-    const auto & settings = context.getSettingsRef();
+    const auto & settings = context->getSettingsRef();
 
     if (shard_info.hasInternalReplication())
     {
@@ -609,7 +616,7 @@ void DistributedBlockOutputStream::writeToLocal(const Block & block, size_t repe
 
 void DistributedBlockOutputStream::writeToShard(const Block & block, const std::vector<std::string> & dir_names)
 {
-    const auto & settings = context.getSettingsRef();
+    const auto & settings = context->getSettingsRef();
     const auto & distributed_settings = storage.getDistributedSettingsRef();
 
     bool fsync = distributed_settings.fsync_after_insert;
@@ -674,11 +681,17 @@ void DistributedBlockOutputStream::writeToShard(const Block & block, const std::
             WriteBufferFromOwnString header_buf;
             writeVarUInt(DBMS_TCP_PROTOCOL_VERSION, header_buf);
             writeStringBinary(query_string, header_buf);
-            context.getSettingsRef().write(header_buf);
-            context.getClientInfo().write(header_buf, DBMS_TCP_PROTOCOL_VERSION);
+            context->getSettingsRef().write(header_buf);
+            context->getClientInfo().write(header_buf, DBMS_TCP_PROTOCOL_VERSION);
             writeVarUInt(block.rows(), header_buf);
             writeVarUInt(block.bytes(), header_buf);
-            writeStringBinary(block.cloneEmpty().dumpStructure(), header_buf);
+            writeStringBinary(block.cloneEmpty().dumpStructure(), header_buf); /// obsolete
+            /// Write block header separately in the batch header.
+            /// It is required for checking does conversion is required or not.
+            {
+                NativeBlockOutputStream header_stream{header_buf, DBMS_TCP_PROTOCOL_VERSION, block.cloneEmpty()};
+                header_stream.write(block.cloneEmpty());
+            }
 
             /// Add new fields here, for example:
             /// writeVarUInt(my_new_data, header_buf);
@@ -717,18 +730,18 @@ void DistributedBlockOutputStream::writeToShard(const Block & block, const std::
         auto dir_sync_guard = make_directory_sync_guard(*it);
     }
 
+    auto file_size = Poco::File(first_file_tmp_path).getSize();
     /// remove the temporary file, enabling the OS to reclaim inode after all threads
     /// have removed their corresponding files
     Poco::File(first_file_tmp_path).remove();
 
     /// Notify
-    auto sleep_ms = context.getSettingsRef().distributed_directory_monitor_sleep_time_ms;
+    auto sleep_ms = context->getSettingsRef().distributed_directory_monitor_sleep_time_ms;
     for (const auto & dir_name : dir_names)
     {
         auto & directory_monitor = storage.requireDirectoryMonitor(disk, dir_name);
-        directory_monitor.scheduleAfter(sleep_ms.totalMilliseconds());
+        directory_monitor.addAndSchedule(file_size, sleep_ms.totalMilliseconds());
     }
 }
 
-
 }
diff --git a/src/Storages/Distributed/DistributedBlockOutputStream.h b/src/Storages/Distributed/DistributedBlockOutputStream.h
index ca57ad46fbb..a9425a98ebf 100644
--- a/src/Storages/Distributed/DistributedBlockOutputStream.h
+++ b/src/Storages/Distributed/DistributedBlockOutputStream.h
@@ -38,7 +38,7 @@ class DistributedBlockOutputStream : public IBlockOutputStream
 {
 public:
     DistributedBlockOutputStream(
-        const Context & context_,
+        ContextPtr context_,
         StorageDistributed & storage_,
         const StorageMetadataPtr & metadata_snapshot_,
         const ASTPtr & query_ast_,
@@ -83,8 +83,7 @@ private:
     /// Returns the number of blocks was written for each cluster node. Uses during exception handling.
     std::string getCurrentStateDescription();
 
-private:
-    const Context & context;
+    ContextPtr context;
     StorageDistributed & storage;
     StorageMetadataPtr metadata_snapshot;
     ASTPtr query_ast;
@@ -115,7 +114,7 @@ private:
         Block current_shard_block;
 
         ConnectionPool::Entry connection_entry;
-        std::unique_ptr<Context> local_context;
+        ContextPtr local_context;
         BlockOutputStreamPtr stream;
 
         UInt64 blocks_written = 0;
diff --git a/src/Storages/Distributed/DistributedSettings.h b/src/Storages/Distributed/DistributedSettings.h
index 9df787428df..7296fa11ffd 100644
--- a/src/Storages/Distributed/DistributedSettings.h
+++ b/src/Storages/Distributed/DistributedSettings.h
@@ -17,6 +17,10 @@ class ASTStorage;
 #define LIST_OF_DISTRIBUTED_SETTINGS(M) \
     M(Bool, fsync_after_insert, false, "Do fsync for every inserted. Will decreases performance of inserts (only for async INSERT, i.e. insert_distributed_sync=false)", 0) \
     M(Bool, fsync_directories, false, "Do fsync for temporary directory (that is used for async INSERT only) after all part operations (writes, renames, etc.).", 0) \
+    /** Inserts settings. */ \
+    M(UInt64, bytes_to_throw_insert, 0, "If more than this number of compressed bytes will be pending for async INSERT, an exception will be thrown. 0 - do not throw.", 0) \
+    M(UInt64, bytes_to_delay_insert, 0, "If more than this number of compressed bytes will be pending for async INSERT, the query will be delayed. 0 - do not delay.", 0) \
+    M(UInt64, max_delay_to_insert, 60, "Max delay of inserting data into Distributed table in seconds, if there are a lot of pending bytes for async send.", 0) \
 
 DECLARE_SETTINGS_TRAITS(DistributedSettingsTraits, LIST_OF_DISTRIBUTED_SETTINGS)
 
diff --git a/src/Storages/HDFS/HDFSCommon.cpp b/src/Storages/HDFS/HDFSCommon.cpp
index e5ec8a06139..40f52921008 100644
--- a/src/Storages/HDFS/HDFSCommon.cpp
+++ b/src/Storages/HDFS/HDFSCommon.cpp
@@ -9,14 +9,15 @@
 #include <IO/Operators.h>
 #include <common/logger_useful.h>
 
+
 namespace DB
 {
 namespace ErrorCodes
 {
-extern const int BAD_ARGUMENTS;
-extern const int NETWORK_ERROR;
-extern const int EXCESSIVE_ELEMENT_IN_CONFIG;
-extern const int NO_ELEMENTS_IN_CONFIG;
+    extern const int BAD_ARGUMENTS;
+    extern const int NETWORK_ERROR;
+    extern const int EXCESSIVE_ELEMENT_IN_CONFIG;
+    extern const int NO_ELEMENTS_IN_CONFIG;
 }
 
 const String HDFSBuilderWrapper::CONFIG_PREFIX = "hdfs";
diff --git a/src/Storages/HDFS/HDFSCommon.h b/src/Storages/HDFS/HDFSCommon.h
index fa1ca88464e..154c253a76b 100644
--- a/src/Storages/HDFS/HDFSCommon.h
+++ b/src/Storages/HDFS/HDFSCommon.h
@@ -17,6 +17,7 @@
 
 namespace DB
 {
+
 namespace detail
 {
     struct HDFSFsDeleter
@@ -28,16 +29,14 @@ namespace detail
     };
 }
 
+
 struct HDFSFileInfo
 {
     hdfsFileInfo * file_info;
     int length;
 
-    HDFSFileInfo()
-        : file_info(nullptr)
-        , length(0)
-    {
-    }
+    HDFSFileInfo() : file_info(nullptr) , length(0) {}
+
     HDFSFileInfo(const HDFSFileInfo & other) = delete;
     HDFSFileInfo(HDFSFileInfo && other) = default;
     HDFSFileInfo & operator=(const HDFSFileInfo & other) = delete;
@@ -49,17 +48,30 @@ struct HDFSFileInfo
     }
 };
 
+
 class HDFSBuilderWrapper
 {
-    hdfsBuilder * hdfs_builder;
-    String hadoop_kerberos_keytab;
-    String hadoop_kerberos_principal;
-    String hadoop_kerberos_kinit_command = "kinit";
-    String hadoop_security_kerberos_ticket_cache_path;
 
-    static std::mutex kinit_mtx;
+friend HDFSBuilderWrapper createHDFSBuilder(const String & uri_str, const Poco::Util::AbstractConfiguration &);
 
-    std::vector<std::pair<String, String>> config_stor;
+static const String CONFIG_PREFIX;
+
+public:
+    HDFSBuilderWrapper() : hdfs_builder(hdfsNewBuilder()) {}
+
+    ~HDFSBuilderWrapper() { hdfsFreeBuilder(hdfs_builder); }
+
+    HDFSBuilderWrapper(const HDFSBuilderWrapper &) = delete;
+    HDFSBuilderWrapper(HDFSBuilderWrapper &&) = default;
+
+    hdfsBuilder * get() { return hdfs_builder; }
+
+private:
+    void loadFromConfig(const Poco::Util::AbstractConfiguration & config, const String & config_path, bool isUser = false);
+
+    String getKinitCmd();
+
+    void runKinit();
 
     // hdfs builder relies on an external config data storage
     std::pair<String, String>& keep(const String & k, const String & v)
@@ -67,48 +79,24 @@ class HDFSBuilderWrapper
         return config_stor.emplace_back(std::make_pair(k, v));
     }
 
+    hdfsBuilder * hdfs_builder;
+    String hadoop_kerberos_keytab;
+    String hadoop_kerberos_principal;
+    String hadoop_kerberos_kinit_command = "kinit";
+    String hadoop_security_kerberos_ticket_cache_path;
+
+    static std::mutex kinit_mtx;
+    std::vector<std::pair<String, String>> config_stor;
     bool need_kinit{false};
-
-    static const String CONFIG_PREFIX;
-
-private:
-
-    void loadFromConfig(const Poco::Util::AbstractConfiguration & config, const String & config_path, bool isUser = false);
-
-    String getKinitCmd();
-
-    void runKinit();
-
-public:
-
-    hdfsBuilder *
-    get()
-    {
-        return hdfs_builder;
-    }
-
-    HDFSBuilderWrapper()
-        : hdfs_builder(hdfsNewBuilder())
-    {
-    }
-
-    ~HDFSBuilderWrapper()
-    {
-        hdfsFreeBuilder(hdfs_builder);
-
-    }
-
-    HDFSBuilderWrapper(const HDFSBuilderWrapper &) = delete;
-    HDFSBuilderWrapper(HDFSBuilderWrapper &&) = default;
-
-    friend HDFSBuilderWrapper createHDFSBuilder(const String & uri_str, const Poco::Util::AbstractConfiguration &);
 };
 
 using HDFSFSPtr = std::unique_ptr<std::remove_pointer_t<hdfsFS>, detail::HDFSFsDeleter>;
 
+
 // set read/connect timeout, default value in libhdfs3 is about 1 hour, and too large
 /// TODO Allow to tune from query Settings.
 HDFSBuilderWrapper createHDFSBuilder(const String & uri_str, const Poco::Util::AbstractConfiguration &);
 HDFSFSPtr createHDFSFS(hdfsBuilder * builder);
+
 }
 #endif
diff --git a/src/Storages/HDFS/ReadBufferFromHDFS.cpp b/src/Storages/HDFS/ReadBufferFromHDFS.cpp
index f3b0e3022f1..29ea46c7590 100644
--- a/src/Storages/HDFS/ReadBufferFromHDFS.cpp
+++ b/src/Storages/HDFS/ReadBufferFromHDFS.cpp
@@ -8,6 +8,7 @@
 
 namespace DB
 {
+
 namespace ErrorCodes
 {
     extern const int NETWORK_ERROR;
@@ -21,34 +22,39 @@ struct ReadBufferFromHDFS::ReadBufferFromHDFSImpl
     /// HDFS create/open functions are not thread safe
     static std::mutex hdfs_init_mutex;
 
-    std::string hdfs_uri;
+    String hdfs_uri;
+    String hdfs_file_path;
+
     hdfsFile fin;
     HDFSBuilderWrapper builder;
     HDFSFSPtr fs;
 
-    explicit ReadBufferFromHDFSImpl(const std::string & hdfs_name_,
+    explicit ReadBufferFromHDFSImpl(
+        const std::string & hdfs_uri_,
+        const std::string & hdfs_file_path_,
         const Poco::Util::AbstractConfiguration & config_)
-        : hdfs_uri(hdfs_name_),
-          builder(createHDFSBuilder(hdfs_uri, config_))
+        : hdfs_uri(hdfs_uri_)
+        , hdfs_file_path(hdfs_file_path_)
+        , builder(createHDFSBuilder(hdfs_uri_, config_))
     {
         std::lock_guard lock(hdfs_init_mutex);
 
         fs = createHDFSFS(builder.get());
-        const size_t begin_of_path = hdfs_uri.find('/', hdfs_uri.find("//") + 2);
-        const std::string path = hdfs_uri.substr(begin_of_path);
-        fin = hdfsOpenFile(fs.get(), path.c_str(), O_RDONLY, 0, 0, 0);
+        fin = hdfsOpenFile(fs.get(), hdfs_file_path.c_str(), O_RDONLY, 0, 0, 0);
 
         if (fin == nullptr)
-            throw Exception("Unable to open HDFS file: " + path + " error: " + std::string(hdfsGetLastError()),
-                ErrorCodes::CANNOT_OPEN_FILE);
+            throw Exception(ErrorCodes::CANNOT_OPEN_FILE,
+                "Unable to open HDFS file: {}. Error: {}",
+                hdfs_uri + hdfs_file_path, std::string(hdfsGetLastError()));
     }
 
     int read(char * start, size_t size) const
     {
         int bytes_read = hdfsRead(fs.get(), fin, start, size);
         if (bytes_read < 0)
-            throw Exception("Fail to read HDFS file: " + hdfs_uri + " " + std::string(hdfsGetLastError()),
-                ErrorCodes::NETWORK_ERROR);
+            throw Exception(ErrorCodes::NETWORK_ERROR,
+                "Fail to read from HDFS: {}, file path: {}. Error: {}",
+                hdfs_uri, hdfs_file_path, std::string(hdfsGetLastError()));
         return bytes_read;
     }
 
@@ -62,11 +68,13 @@ struct ReadBufferFromHDFS::ReadBufferFromHDFSImpl
 
 std::mutex ReadBufferFromHDFS::ReadBufferFromHDFSImpl::hdfs_init_mutex;
 
-ReadBufferFromHDFS::ReadBufferFromHDFS(const std::string & hdfs_name_,
-    const Poco::Util::AbstractConfiguration & config_,
-    size_t buf_size_)
+ReadBufferFromHDFS::ReadBufferFromHDFS(
+        const String & hdfs_uri_,
+        const String & hdfs_file_path_,
+        const Poco::Util::AbstractConfiguration & config_,
+        size_t buf_size_)
     : BufferWithOwnMemory<ReadBuffer>(buf_size_)
-    , impl(std::make_unique<ReadBufferFromHDFSImpl>(hdfs_name_, config_))
+    , impl(std::make_unique<ReadBufferFromHDFSImpl>(hdfs_uri_, hdfs_file_path_, config_))
 {
 }
 
diff --git a/src/Storages/HDFS/ReadBufferFromHDFS.h b/src/Storages/HDFS/ReadBufferFromHDFS.h
index 8d26c001b2e..bd14e3d3792 100644
--- a/src/Storages/HDFS/ReadBufferFromHDFS.h
+++ b/src/Storages/HDFS/ReadBufferFromHDFS.h
@@ -7,11 +7,8 @@
 #include <IO/BufferWithOwnMemory.h>
 #include <string>
 #include <memory>
-
 #include <hdfs/hdfs.h>
-
 #include <common/types.h>
-
 #include <Interpreters/Context.h>
 
 
@@ -22,13 +19,19 @@ namespace DB
  */
 class ReadBufferFromHDFS : public BufferWithOwnMemory<ReadBuffer>
 {
-    struct ReadBufferFromHDFSImpl;
-    std::unique_ptr<ReadBufferFromHDFSImpl> impl;
+struct ReadBufferFromHDFSImpl;
+
 public:
-    ReadBufferFromHDFS(const std::string & hdfs_name_, const Poco::Util::AbstractConfiguration &, size_t buf_size_ = DBMS_DEFAULT_BUFFER_SIZE);
+    ReadBufferFromHDFS(const String & hdfs_uri_, const String & hdfs_file_path_,
+        const Poco::Util::AbstractConfiguration &, size_t buf_size_ = DBMS_DEFAULT_BUFFER_SIZE);
+
     ~ReadBufferFromHDFS() override;
 
     bool nextImpl() override;
+
+private:
+    std::unique_ptr<ReadBufferFromHDFSImpl> impl;
 };
 }
+
 #endif
diff --git a/src/Storages/HDFS/StorageHDFS.cpp b/src/Storages/HDFS/StorageHDFS.cpp
index f7afd4a497d..ad2a63c44b1 100644
--- a/src/Storages/HDFS/StorageHDFS.cpp
+++ b/src/Storages/HDFS/StorageHDFS.cpp
@@ -40,15 +40,15 @@ StorageHDFS::StorageHDFS(const String & uri_,
     const String & format_name_,
     const ColumnsDescription & columns_,
     const ConstraintsDescription & constraints_,
-    Context & context_,
+    ContextPtr context_,
     const String & compression_method_ = "")
     : IStorage(table_id_)
+    , WithContext(context_)
     , uri(uri_)
     , format_name(format_name_)
-    , context(context_)
     , compression_method(compression_method_)
 {
-    context.getRemoteHostFilter().checkURL(Poco::URI(uri));
+    context_->getRemoteHostFilter().checkURL(Poco::URI(uri));
 
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(columns_);
@@ -59,7 +59,7 @@ StorageHDFS::StorageHDFS(const String & uri_,
 namespace
 {
 
-class HDFSSource : public SourceWithProgress
+class HDFSSource : public SourceWithProgress, WithContext
 {
 public:
     struct SourcesInfo
@@ -90,16 +90,16 @@ public:
         String format_,
         String compression_method_,
         Block sample_block_,
-        const Context & context_,
+        ContextPtr context_,
         UInt64 max_block_size_)
         : SourceWithProgress(getHeader(sample_block_, source_info_->need_path_column, source_info_->need_file_column))
+        , WithContext(context_)
         , source_info(std::move(source_info_))
         , uri(std::move(uri_))
         , format(std::move(format_))
         , compression_method(compression_method_)
         , max_block_size(max_block_size_)
         , sample_block(std::move(sample_block_))
-        , context(context_)
     {
     }
 
@@ -122,8 +122,8 @@ public:
                 current_path = uri + path;
 
                 auto compression = chooseCompressionMethod(path, compression_method);
-                auto read_buf = wrapReadBufferWithCompressionMethod(std::make_unique<ReadBufferFromHDFS>(current_path, context.getGlobalContext().getConfigRef()), compression);
-                auto input_format = FormatFactory::instance().getInput(format, *read_buf, sample_block, context, max_block_size);
+                auto read_buf = wrapReadBufferWithCompressionMethod(std::make_unique<ReadBufferFromHDFS>(uri, path, getContext()->getGlobalContext()->getConfigRef()), compression);
+                auto input_format = FormatFactory::instance().getInput(format, *read_buf, sample_block, getContext(), max_block_size);
                 auto input_stream = std::make_shared<InputStreamFromInputFormat>(input_format);
 
                 reader = std::make_shared<OwningBlockInputStream<ReadBuffer>>(input_stream, std::move(read_buf));
@@ -169,7 +169,6 @@ private:
 
     UInt64 max_block_size;
     Block sample_block;
-    const Context & context;
 };
 
 class HDFSBlockOutputStream : public IBlockOutputStream
@@ -178,12 +177,12 @@ public:
     HDFSBlockOutputStream(const String & uri,
         const String & format,
         const Block & sample_block_,
-        const Context & context,
+        ContextPtr context,
         const CompressionMethod compression_method)
         : sample_block(sample_block_)
     {
-        write_buf = wrapWriteBufferWithCompressionMethod(std::make_unique<WriteBufferFromHDFS>(uri, context.getGlobalContext().getConfigRef()), compression_method, 3);
-        writer = FormatFactory::instance().getOutputStream(format, *write_buf, sample_block, context);
+        write_buf = wrapWriteBufferWithCompressionMethod(std::make_unique<WriteBufferFromHDFS>(uri, context->getGlobalContext()->getConfigRef()), compression_method, 3);
+        writer = FormatFactory::instance().getOutputStreamParallelIfPossible(format, *write_buf, sample_block, context);
     }
 
     Block getHeader() const override
@@ -267,21 +266,32 @@ Pipe StorageHDFS::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & /*query_info*/,
-    const Context & context_,
+    ContextPtr context_,
     QueryProcessingStage::Enum /*processed_stage*/,
     size_t max_block_size,
     unsigned num_streams)
 {
-    const size_t begin_of_path = uri.find('/', uri.find("//") + 2);
+    size_t begin_of_path;
+    /// This uri is checked for correctness in constructor of StorageHDFS and never modified afterwards
+    auto two_slash = uri.find("//");
+
+    if (two_slash == std::string::npos)
+        begin_of_path = uri.find('/');
+    else
+        begin_of_path = uri.find('/', two_slash + 2);
+
     const String path_from_uri = uri.substr(begin_of_path);
     const String uri_without_path = uri.substr(0, begin_of_path);
 
-    HDFSBuilderWrapper builder = createHDFSBuilder(uri_without_path + "/", context_.getGlobalContext().getConfigRef());
+    HDFSBuilderWrapper builder = createHDFSBuilder(uri_without_path + "/", context_->getGlobalContext()->getConfigRef());
     HDFSFSPtr fs = createHDFSFS(builder.get());
 
     auto sources_info = std::make_shared<HDFSSource::SourcesInfo>();
     sources_info->uris = LSWithRegexpMatching("/", fs, path_from_uri);
 
+    if (sources_info->uris.empty())
+        LOG_WARNING(log, "No file in HDFS matches the path: {}", uri);
+
     for (const auto & column : column_names)
     {
         if (column == "_path")
@@ -302,12 +312,12 @@ Pipe StorageHDFS::read(
     return Pipe::unitePipes(std::move(pipes));
 }
 
-BlockOutputStreamPtr StorageHDFS::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, const Context & /*context*/)
+BlockOutputStreamPtr StorageHDFS::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, ContextPtr /*context*/)
 {
     return std::make_shared<HDFSBlockOutputStream>(uri,
         format_name,
         metadata_snapshot->getSampleBlock(),
-        context,
+        getContext(),
         chooseCompressionMethod(uri, compression_method));
 }
 
@@ -321,22 +331,22 @@ void registerStorageHDFS(StorageFactory & factory)
             throw Exception(
                 "Storage HDFS requires 2 or 3 arguments: url, name of used format and optional compression method.", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
 
-        engine_args[0] = evaluateConstantExpressionOrIdentifierAsLiteral(engine_args[0], args.local_context);
+        engine_args[0] = evaluateConstantExpressionOrIdentifierAsLiteral(engine_args[0], args.getLocalContext());
 
         String url = engine_args[0]->as<ASTLiteral &>().value.safeGet<String>();
 
-        engine_args[1] = evaluateConstantExpressionOrIdentifierAsLiteral(engine_args[1], args.local_context);
+        engine_args[1] = evaluateConstantExpressionOrIdentifierAsLiteral(engine_args[1], args.getLocalContext());
 
         String format_name = engine_args[1]->as<ASTLiteral &>().value.safeGet<String>();
 
         String compression_method;
         if (engine_args.size() == 3)
         {
-            engine_args[2] = evaluateConstantExpressionOrIdentifierAsLiteral(engine_args[2], args.local_context);
+            engine_args[2] = evaluateConstantExpressionOrIdentifierAsLiteral(engine_args[2], args.getLocalContext());
             compression_method = engine_args[2]->as<ASTLiteral &>().value.safeGet<String>();
         } else compression_method = "auto";
 
-        return StorageHDFS::create(url, args.table_id, format_name, args.columns, args.constraints, args.context, compression_method);
+        return StorageHDFS::create(url, args.table_id, format_name, args.columns, args.constraints, args.getContext(), compression_method);
     },
     {
         .source_access_type = AccessType::HDFS,
diff --git a/src/Storages/HDFS/StorageHDFS.h b/src/Storages/HDFS/StorageHDFS.h
index 4172bce1cd1..e3f235296ac 100644
--- a/src/Storages/HDFS/StorageHDFS.h
+++ b/src/Storages/HDFS/StorageHDFS.h
@@ -13,7 +13,7 @@ namespace DB
  * This class represents table engine for external hdfs files.
  * Read method is supported for now.
  */
-class StorageHDFS final : public ext::shared_ptr_helper<StorageHDFS>, public IStorage
+class StorageHDFS final : public ext::shared_ptr_helper<StorageHDFS>, public IStorage, WithContext
 {
     friend struct ext::shared_ptr_helper<StorageHDFS>;
 public:
@@ -23,12 +23,12 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
 
-    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, const Context & context) override;
+    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, ContextPtr context) override;
 
     NamesAndTypesList getVirtuals() const override;
 
@@ -38,13 +38,12 @@ protected:
         const String & format_name_,
         const ColumnsDescription & columns_,
         const ConstraintsDescription & constraints_,
-        Context & context_,
+        ContextPtr context_,
         const String & compression_method_);
 
 private:
-    String uri;
+    const String uri;
     String format_name;
-    Context & context;
     String compression_method;
 
     Poco::Logger * log = &Poco::Logger::get("StorageHDFS");
diff --git a/src/Storages/IStorage.cpp b/src/Storages/IStorage.cpp
index 5f500518516..f7fb359432e 100644
--- a/src/Storages/IStorage.cpp
+++ b/src/Storages/IStorage.cpp
@@ -1,8 +1,5 @@
 #include <Storages/IStorage.h>
 
-#include <sparsehash/dense_hash_map>
-#include <sparsehash/dense_hash_set>
-
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/quoteString.h>
 #include <IO/Operators.h>
@@ -87,7 +84,7 @@ Pipe IStorage::read(
     const Names & /*column_names*/,
     const StorageMetadataPtr & /*metadata_snapshot*/,
     SelectQueryInfo & /*query_info*/,
-    const Context & /*context*/,
+    ContextPtr /*context*/,
     QueryProcessingStage::Enum /*processed_stage*/,
     size_t /*max_block_size*/,
     unsigned /*num_streams*/)
@@ -100,7 +97,7 @@ void IStorage::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & query_info,
-    const Context & context,
+    ContextPtr context,
     QueryProcessingStage::Enum processed_stage,
     size_t max_block_size,
     unsigned num_streams)
@@ -119,12 +116,12 @@ void IStorage::read(
 }
 
 Pipe IStorage::alterPartition(
-    const StorageMetadataPtr & /* metadata_snapshot */, const PartitionCommands & /* commands */, const Context & /* context */)
+    const StorageMetadataPtr & /* metadata_snapshot */, const PartitionCommands & /* commands */, ContextPtr /* context */)
 {
     throw Exception("Partition operations are not supported by storage " + getName(), ErrorCodes::NOT_IMPLEMENTED);
 }
 
-void IStorage::alter(const AlterCommands & params, const Context & context, TableLockHolder &)
+void IStorage::alter(const AlterCommands & params, ContextPtr context, TableLockHolder &)
 {
     auto table_id = getStorageID();
     StorageInMemoryMetadata new_metadata = getInMemoryMetadata();
@@ -134,7 +131,7 @@ void IStorage::alter(const AlterCommands & params, const Context & context, Tabl
 }
 
 
-void IStorage::checkAlterIsPossible(const AlterCommands & commands, const Settings & /* settings */) const
+void IStorage::checkAlterIsPossible(const AlterCommands & commands, ContextPtr /* context */) const
 {
     for (const auto & command : commands)
     {
@@ -145,6 +142,11 @@ void IStorage::checkAlterIsPossible(const AlterCommands & commands, const Settin
     }
 }
 
+void IStorage::checkMutationIsPossible(const MutationCommands & /*commands*/, const Settings & /*settings*/) const
+{
+    throw Exception("Table engine " + getName() + " doesn't support mutations", ErrorCodes::NOT_IMPLEMENTED);
+}
+
 void IStorage::checkAlterPartitionIsPossible(
     const PartitionCommands & /*commands*/, const StorageMetadataPtr & /*metadata_snapshot*/, const Settings & /*settings*/) const
 {
@@ -177,6 +179,24 @@ Names IStorage::getAllRegisteredNames() const
     return result;
 }
 
+NameDependencies IStorage::getDependentViewsByColumn(ContextPtr context) const
+{
+    NameDependencies name_deps;
+    auto dependencies = DatabaseCatalog::instance().getDependencies(storage_id);
+    for (const auto & depend_id : dependencies)
+    {
+        auto depend_table = DatabaseCatalog::instance().getTable(depend_id, context);
+        if (depend_table->getInMemoryMetadataPtr()->select.inner_query)
+        {
+            const auto & select_query = depend_table->getInMemoryMetadataPtr()->select.inner_query;
+            auto required_columns = InterpreterSelectQuery(select_query, context, SelectQueryOptions{}.noModify()).getRequiredColumns();
+            for (const auto & col_name : required_columns)
+                name_deps[col_name].push_back(depend_id.table_name);
+        }
+    }
+    return name_deps;
+}
+
 std::string PrewhereDAGInfo::dump() const
 {
     WriteBufferFromOwnString ss;
@@ -203,14 +223,14 @@ std::string PrewhereDAGInfo::dump() const
     return ss.str();
 }
 
-std::string FilterInfo::dump() const
+std::string FilterDAGInfo::dump() const
 {
     WriteBufferFromOwnString ss;
-    ss << "FilterInfo for column '" << column_name <<"', do_remove_column "
+    ss << "FilterDAGInfo for column '" << column_name <<"', do_remove_column "
        << do_remove_column << "\n";
-    if (actions_dag)
+    if (actions)
     {
-        ss << "actions_dag " << actions_dag->dumpDAG() << "\n";
+        ss << "actions " << actions->dumpDAG() << "\n";
     }
 
     return ss.str();
diff --git a/src/Storages/IStorage.h b/src/Storages/IStorage.h
index 651688f41bb..e48e9e49919 100644
--- a/src/Storages/IStorage.h
+++ b/src/Storages/IStorage.h
@@ -5,13 +5,15 @@
 #include <DataStreams/IBlockStream_fwd.h>
 #include <Databases/IDatabase.h>
 #include <Interpreters/CancellationCode.h>
-#include <Storages/IStorage_fwd.h>
+#include <Interpreters/Context_fwd.h>
 #include <Interpreters/StorageID.h>
-#include <Storages/TableLockHolder.h>
+#include <Processors/QueryPipeline.h>
 #include <Storages/CheckResults.h>
-#include <Storages/StorageInMemoryMetadata.h>
 #include <Storages/ColumnDependency.h>
+#include <Storages/IStorage_fwd.h>
 #include <Storages/SelectQueryDescription.h>
+#include <Storages/StorageInMemoryMetadata.h>
+#include <Storages/TableLockHolder.h>
 #include <Common/ActionLock.h>
 #include <Common/Exception.h>
 #include <Common/RWLock.h>
@@ -29,11 +31,10 @@ namespace ErrorCodes
     extern const int NOT_IMPLEMENTED;
 }
 
-class Context;
-
 using StorageActionBlockType = size_t;
 
 class ASTCreateQuery;
+class ASTInsertQuery;
 
 struct Settings;
 
@@ -50,6 +51,9 @@ class Pipe;
 class QueryPlan;
 using QueryPlanPtr = std::unique_ptr<QueryPlan>;
 
+class QueryPipeline;
+using QueryPipelinePtr = std::unique_ptr<QueryPipeline>;
+
 class IStoragePolicy;
 using StoragePolicyPtr = std::shared_ptr<const IStoragePolicy>;
 
@@ -57,6 +61,8 @@ struct StreamLocalLimits;
 class EnabledQuota;
 struct SelectQueryInfo;
 
+using NameDependencies = std::unordered_map<String, std::vector<String>>;
+
 struct ColumnSize
 {
     size_t marks = 0;
@@ -173,8 +179,10 @@ public:
     virtual NamesAndTypesList getVirtuals() const;
 
     Names getAllRegisteredNames() const override;
-protected:
 
+    NameDependencies getDependentViewsByColumn(ContextPtr context) const;
+
+protected:
     /// Returns whether the column is virtual - by default all columns are real.
     /// Initially reserved virtual column name may be shadowed by real column.
     bool isVirtualColumn(const String & column_name, const StorageMetadataPtr & metadata_snapshot) const;
@@ -222,7 +230,7 @@ public:
       * QueryProcessingStage::Enum required for Distributed over Distributed,
       * since it cannot return Complete for intermediate queries never.
       */
-    virtual QueryProcessingStage::Enum getQueryProcessingStage(const Context &, QueryProcessingStage::Enum /*to_stage*/, SelectQueryInfo &) const
+    virtual QueryProcessingStage::Enum getQueryProcessingStage(ContextPtr, QueryProcessingStage::Enum /*to_stage*/, SelectQueryInfo &) const
     {
         return QueryProcessingStage::FetchColumns;
     }
@@ -249,7 +257,7 @@ public:
     virtual BlockInputStreams watch(
         const Names & /*column_names*/,
         const SelectQueryInfo & /*query_info*/,
-        const Context & /*context*/,
+        ContextPtr /*context*/,
         QueryProcessingStage::Enum & /*processed_stage*/,
         size_t /*max_block_size*/,
         unsigned /*num_streams*/)
@@ -281,7 +289,7 @@ public:
         const Names & /*column_names*/,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & /*query_info*/,
-        const Context & /*context*/,
+        ContextPtr /*context*/,
         QueryProcessingStage::Enum /*processed_stage*/,
         size_t /*max_block_size*/,
         unsigned /*num_streams*/);
@@ -293,7 +301,7 @@ public:
         const Names & /*column_names*/,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & /*query_info*/,
-        const Context & /*context*/,
+        ContextPtr /*context*/,
         QueryProcessingStage::Enum /*processed_stage*/,
         size_t /*max_block_size*/,
         unsigned /*num_streams*/);
@@ -310,11 +318,24 @@ public:
     virtual BlockOutputStreamPtr write(
         const ASTPtr & /*query*/,
         const StorageMetadataPtr & /*metadata_snapshot*/,
-        const Context & /*context*/)
+        ContextPtr /*context*/)
     {
         throw Exception("Method write is not supported by storage " + getName(), ErrorCodes::NOT_IMPLEMENTED);
     }
 
+    /** Writes the data to a table in distributed manner.
+      * It is supposed that implementation looks into SELECT part of the query and executes distributed
+      * INSERT SELECT if it is possible with current storage as a receiver and query SELECT part as a producer.
+      *
+      * Returns query pipeline if distributed writing is possible, and nullptr otherwise.
+      */
+    virtual QueryPipelinePtr distributedWrite(
+        const ASTInsertQuery & /*query*/,
+        ContextPtr /*context*/)
+    {
+        return nullptr;
+    }
+
     /** Delete the table data. Called before deleting the directory with the data.
       * The method can be called only after detaching table from Context (when no queries are performed with table).
       * The table is not usable during and after call to this method.
@@ -329,7 +350,7 @@ public:
     virtual void truncate(
         const ASTPtr & /*query*/,
         const StorageMetadataPtr & /* metadata_snapshot */,
-        const Context & /* context */,
+        ContextPtr /* context */,
         TableExclusiveLockHolder &)
     {
         throw Exception("Truncate is not supported by storage " + getName(), ErrorCodes::NOT_IMPLEMENTED);
@@ -357,12 +378,17 @@ public:
     /** ALTER tables in the form of column changes that do not affect the change
       * to Storage or its parameters. Executes under alter lock (lockForAlter).
       */
-    virtual void alter(const AlterCommands & params, const Context & context, TableLockHolder & alter_lock_holder);
+    virtual void alter(const AlterCommands & params, ContextPtr context, TableLockHolder & alter_lock_holder);
 
     /** Checks that alter commands can be applied to storage. For example, columns can be modified,
       * or primary key can be changes, etc.
       */
-    virtual void checkAlterIsPossible(const AlterCommands & commands, const Settings & settings) const;
+    virtual void checkAlterIsPossible(const AlterCommands & commands, ContextPtr context) const;
+
+    /**
+      * Checks that mutation commands can be applied to storage.
+      */
+    virtual void checkMutationIsPossible(const MutationCommands & commands, const Settings & settings) const;
 
     /** ALTER tables with regard to its partitions.
       * Should handle locks for each command on its own.
@@ -370,7 +396,7 @@ public:
     virtual Pipe alterPartition(
         const StorageMetadataPtr & /* metadata_snapshot */,
         const PartitionCommands & /* commands */,
-        const Context & /* context */);
+        ContextPtr /* context */);
 
     /// Checks that partition commands can be applied to storage.
     virtual void checkAlterPartitionIsPossible(const PartitionCommands & commands, const StorageMetadataPtr & metadata_snapshot, const Settings & settings) const;
@@ -385,13 +411,13 @@ public:
         bool /*final*/,
         bool /*deduplicate*/,
         const Names & /* deduplicate_by_columns */,
-        const Context & /*context*/)
+        ContextPtr /*context*/)
     {
         throw Exception("Method optimize is not supported by storage " + getName(), ErrorCodes::NOT_IMPLEMENTED);
     }
 
     /// Mutate the table contents
-    virtual void mutate(const MutationCommands &, const Context &)
+    virtual void mutate(const MutationCommands &, ContextPtr)
     {
         throw Exception("Mutations are not supported by storage " + getName(), ErrorCodes::NOT_IMPLEMENTED);
     }
@@ -435,10 +461,10 @@ public:
     virtual bool supportsIndexForIn() const { return false; }
 
     /// Provides a hint that the storage engine may evaluate the IN-condition by using an index.
-    virtual bool mayBenefitFromIndexForIn(const ASTPtr & /* left_in_operand */, const Context & /* query_context */, const StorageMetadataPtr & /* metadata_snapshot */) const { return false; }
+    virtual bool mayBenefitFromIndexForIn(const ASTPtr & /* left_in_operand */, ContextPtr /* query_context */, const StorageMetadataPtr & /* metadata_snapshot */) const { return false; }
 
     /// Checks validity of the data
-    virtual CheckResults checkData(const ASTPtr & /* query */, const Context & /* context */) { throw Exception("Check query is not supported for " + getName() + " storage", ErrorCodes::NOT_IMPLEMENTED); }
+    virtual CheckResults checkData(const ASTPtr & /* query */, ContextPtr /* context */) { throw Exception("Check query is not supported for " + getName() + " storage", ErrorCodes::NOT_IMPLEMENTED); }
 
     /// Checks that table could be dropped right now
     /// Otherwise - throws an exception with detailed information.
@@ -471,7 +497,7 @@ public:
     virtual std::optional<UInt64> totalRows(const Settings &) const { return {}; }
 
     /// Same as above but also take partition predicate into account.
-    virtual std::optional<UInt64> totalRowsByPartitionPredicate(const SelectQueryInfo &, const Context &) const { return {}; }
+    virtual std::optional<UInt64> totalRowsByPartitionPredicate(const SelectQueryInfo &, ContextPtr) const { return {}; }
 
     /// If it is possible to quickly determine exact number of bytes for the table on storage:
     /// - memory (approximated, resident)
diff --git a/src/Storages/IndicesDescription.cpp b/src/Storages/IndicesDescription.cpp
index dbc95615383..3147ad70696 100644
--- a/src/Storages/IndicesDescription.cpp
+++ b/src/Storages/IndicesDescription.cpp
@@ -67,7 +67,7 @@ IndexDescription & IndexDescription::operator=(const IndexDescription & other)
     return *this;
 }
 
-IndexDescription IndexDescription::getIndexFromAST(const ASTPtr & definition_ast, const ColumnsDescription & columns, const Context & context)
+IndexDescription IndexDescription::getIndexFromAST(const ASTPtr & definition_ast, const ColumnsDescription & columns, ContextPtr context)
 {
     const auto * index_definition = definition_ast->as<ASTIndexDeclaration>();
     if (!index_definition)
@@ -118,7 +118,7 @@ IndexDescription IndexDescription::getIndexFromAST(const ASTPtr & definition_ast
     return result;
 }
 
-void IndexDescription::recalculateWithNewColumns(const ColumnsDescription & new_columns, const Context & context)
+void IndexDescription::recalculateWithNewColumns(const ColumnsDescription & new_columns, ContextPtr context)
 {
     *this = getIndexFromAST(definition_ast, new_columns, context);
 }
@@ -144,7 +144,7 @@ String IndicesDescription::toString() const
 }
 
 
-IndicesDescription IndicesDescription::parse(const String & str, const ColumnsDescription & columns, const Context & context)
+IndicesDescription IndicesDescription::parse(const String & str, const ColumnsDescription & columns, ContextPtr context)
 {
     IndicesDescription result;
     if (str.empty())
@@ -160,7 +160,7 @@ IndicesDescription IndicesDescription::parse(const String & str, const ColumnsDe
 }
 
 
-ExpressionActionsPtr IndicesDescription::getSingleExpressionForIndices(const ColumnsDescription & columns, const Context & context) const
+ExpressionActionsPtr IndicesDescription::getSingleExpressionForIndices(const ColumnsDescription & columns, ContextPtr context) const
 {
     ASTPtr combined_expr_list = std::make_shared<ASTExpressionList>();
     for (const auto & index : *this)
diff --git a/src/Storages/IndicesDescription.h b/src/Storages/IndicesDescription.h
index f383029837e..d9c7efdb75c 100644
--- a/src/Storages/IndicesDescription.h
+++ b/src/Storages/IndicesDescription.h
@@ -46,7 +46,7 @@ struct IndexDescription
     size_t granularity;
 
     /// Parse index from definition AST
-    static IndexDescription getIndexFromAST(const ASTPtr & definition_ast, const ColumnsDescription & columns, const Context & context);
+    static IndexDescription getIndexFromAST(const ASTPtr & definition_ast, const ColumnsDescription & columns, ContextPtr context);
 
     IndexDescription() = default;
 
@@ -57,7 +57,7 @@ struct IndexDescription
 
     /// Recalculate index with new columns because index expression may change
     /// if something change in columns.
-    void recalculateWithNewColumns(const ColumnsDescription & new_columns, const Context & context);
+    void recalculateWithNewColumns(const ColumnsDescription & new_columns, ContextPtr context);
 };
 
 /// All secondary indices in storage
@@ -68,10 +68,10 @@ struct IndicesDescription : public std::vector<IndexDescription>
     /// Convert description to string
     String toString() const;
     /// Parse description from string
-    static IndicesDescription parse(const String & str, const ColumnsDescription & columns, const Context & context);
+    static IndicesDescription parse(const String & str, const ColumnsDescription & columns, ContextPtr context);
 
     /// Return common expression for all stored indices
-    ExpressionActionsPtr getSingleExpressionForIndices(const ColumnsDescription & columns, const Context & context) const;
+    ExpressionActionsPtr getSingleExpressionForIndices(const ColumnsDescription & columns, ContextPtr context) const;
 };
 
 }
diff --git a/src/Storages/Kafka/KafkaBlockInputStream.cpp b/src/Storages/Kafka/KafkaBlockInputStream.cpp
index bf985902b4d..5d9b19b1972 100644
--- a/src/Storages/Kafka/KafkaBlockInputStream.cpp
+++ b/src/Storages/Kafka/KafkaBlockInputStream.cpp
@@ -35,8 +35,8 @@ KafkaBlockInputStream::KafkaBlockInputStream(
     , max_block_size(max_block_size_)
     , commit_in_suffix(commit_in_suffix_)
     , non_virtual_header(metadata_snapshot->getSampleBlockNonMaterialized())
-    , virtual_header(metadata_snapshot->getSampleBlockForColumns(
-            {"_topic", "_key", "_offset", "_partition", "_timestamp", "_timestamp_ms", "_headers.name", "_headers.value"}, storage.getVirtuals(), storage.getStorageID()))
+    , virtual_header(metadata_snapshot->getSampleBlockForColumns(storage.getVirtualColumnNames(), storage.getVirtuals(), storage.getStorageID()))
+    , handle_error_mode(storage.getHandleKafkaErrorMode())
 {
 }
 
@@ -78,21 +78,22 @@ Block KafkaBlockInputStream::readImpl()
     // now it's one-time usage InputStream
     // one block of the needed size (or with desired flush timeout) is formed in one internal iteration
     // otherwise external iteration will reuse that and logic will became even more fuzzy
-
     MutableColumns result_columns  = non_virtual_header.cloneEmptyColumns();
     MutableColumns virtual_columns = virtual_header.cloneEmptyColumns();
 
+    auto put_error_to_stream = handle_error_mode == HandleKafkaErrorMode::STREAM;
+
     auto input_format = FormatFactory::instance().getInputFormat(
-        storage.getFormatName(), *buffer, non_virtual_header, *context, max_block_size);
+        storage.getFormatName(), *buffer, non_virtual_header, context, max_block_size);
 
     InputPort port(input_format->getPort().getHeader(), input_format.get());
     connect(input_format->getPort(), port);
     port.setNeeded();
 
+    std::optional<std::string> exception_message;
     auto read_kafka_message = [&]
     {
         size_t new_rows = 0;
-
         while (true)
         {
             auto status = input_format->prepare();
@@ -136,7 +137,41 @@ Block KafkaBlockInputStream::readImpl()
 
     while (true)
     {
-        auto new_rows = buffer->poll() ? read_kafka_message() : 0;
+        size_t new_rows = 0;
+        exception_message.reset();
+        if (buffer->poll())
+        {
+            try
+            {
+                new_rows = read_kafka_message();
+            }
+            catch (Exception & e)
+            {
+                if (put_error_to_stream)
+                {
+                    input_format->resetParser();
+                    exception_message = e.message();
+                    for (auto & column : result_columns)
+                    {
+                        // read_kafka_message could already push some rows to result_columns
+                        // before exception, we need to fix it.
+                        auto cur_rows = column->size();
+                        if (cur_rows > total_rows)
+                        {
+                            column->popBack(cur_rows - total_rows);
+                        }
+                        // all data columns will get default value in case of error
+                        column->insertDefault();
+                    }
+                    new_rows = 1;
+                }
+                else
+                {
+                    e.addMessage("while parsing Kafka message (topic: {}, partition: {}, offset: {})'", buffer->currentTopic(), buffer->currentPartition(), buffer->currentOffset());
+                    throw;
+                }
+            }
+        }
 
         if (new_rows)
         {
@@ -189,6 +224,20 @@ Block KafkaBlockInputStream::readImpl()
                 }
                 virtual_columns[6]->insert(headers_names);
                 virtual_columns[7]->insert(headers_values);
+                if (put_error_to_stream)
+                {
+                    if (exception_message)
+                    {
+                        auto payload = buffer->currentPayload();
+                        virtual_columns[8]->insert(payload);
+                        virtual_columns[9]->insert(*exception_message);
+                    }
+                    else
+                    {
+                        virtual_columns[8]->insertDefault();
+                        virtual_columns[9]->insertDefault();
+                    }
+                }
             }
 
             total_rows = total_rows + new_rows;
diff --git a/src/Storages/Kafka/KafkaBlockInputStream.h b/src/Storages/Kafka/KafkaBlockInputStream.h
index 517df6ecaf7..98e4b8982e0 100644
--- a/src/Storages/Kafka/KafkaBlockInputStream.h
+++ b/src/Storages/Kafka/KafkaBlockInputStream.h
@@ -39,7 +39,7 @@ public:
 private:
     StorageKafka & storage;
     StorageMetadataPtr metadata_snapshot;
-    const std::shared_ptr<Context> context;
+    ContextPtr context;
     Names column_names;
     Poco::Logger * log;
     UInt64 max_block_size;
@@ -51,6 +51,7 @@ private:
 
     const Block non_virtual_header;
     const Block virtual_header;
+    const HandleKafkaErrorMode handle_error_mode;
 };
 
 }
diff --git a/src/Storages/Kafka/KafkaBlockOutputStream.cpp b/src/Storages/Kafka/KafkaBlockOutputStream.cpp
index 2cb0fd98c71..21de27708b4 100644
--- a/src/Storages/Kafka/KafkaBlockOutputStream.cpp
+++ b/src/Storages/Kafka/KafkaBlockOutputStream.cpp
@@ -9,7 +9,7 @@ namespace DB
 KafkaBlockOutputStream::KafkaBlockOutputStream(
     StorageKafka & storage_,
     const StorageMetadataPtr & metadata_snapshot_,
-    const std::shared_ptr<Context> & context_)
+    const ContextPtr & context_)
     : storage(storage_)
     , metadata_snapshot(metadata_snapshot_)
     , context(context_)
@@ -25,11 +25,11 @@ void KafkaBlockOutputStream::writePrefix()
 {
     buffer = storage.createWriteBuffer(getHeader());
 
-    auto format_settings = getFormatSettings(*context);
+    auto format_settings = getFormatSettings(context);
     format_settings.protobuf.allow_multiple_rows_without_delimiter = true;
 
     child = FormatFactory::instance().getOutputStream(storage.getFormatName(), *buffer,
-        getHeader(), *context,
+        getHeader(), context,
         [this](const Columns & columns, size_t row)
         {
             buffer->countRow(columns, row);
diff --git a/src/Storages/Kafka/KafkaSettings.h b/src/Storages/Kafka/KafkaSettings.h
index 1df10d16339..1010c486abb 100644
--- a/src/Storages/Kafka/KafkaSettings.h
+++ b/src/Storages/Kafka/KafkaSettings.h
@@ -29,7 +29,8 @@ class ASTStorage;
     M(Char, kafka_row_delimiter, '\0', "The character to be considered as a delimiter in Kafka message.", 0) \
     M(String, kafka_schema, "", "Schema identifier (used by schema-based formats) for Kafka engine", 0) \
     M(UInt64, kafka_skip_broken_messages, 0, "Skip at least this number of broken messages from Kafka topic per block", 0) \
-    M(Bool, kafka_thread_per_consumer, false, "Provide independent thread for each consumer", 0)
+    M(Bool, kafka_thread_per_consumer, false, "Provide independent thread for each consumer", 0) \
+    M(HandleKafkaErrorMode, kafka_handle_error_mode, HandleKafkaErrorMode::DEFAULT, "How to handle errors for Kafka engine. Passible values: default, stream.", 0) \
 
     /** TODO: */
     /* https://github.com/edenhill/librdkafka/blob/master/CONFIGURATION.md */
diff --git a/src/Storages/Kafka/ReadBufferFromKafkaConsumer.h b/src/Storages/Kafka/ReadBufferFromKafkaConsumer.h
index 1d889655941..49d3df0e180 100644
--- a/src/Storages/Kafka/ReadBufferFromKafkaConsumer.h
+++ b/src/Storages/Kafka/ReadBufferFromKafkaConsumer.h
@@ -63,6 +63,7 @@ public:
     auto currentPartition() const { return current[-1].get_partition(); }
     auto currentTimestamp() const { return current[-1].get_timestamp(); }
     const auto & currentHeaderList() const { return current[-1].get_header_list(); }
+    String currentPayload() const { return current[-1].get_payload(); }
 
 private:
     using Messages = std::vector<cppkafka::Message>;
diff --git a/src/Storages/Kafka/StorageKafka.cpp b/src/Storages/Kafka/StorageKafka.cpp
index 45e4ec538a1..15dd5b553b0 100644
--- a/src/Storages/Kafka/StorageKafka.cpp
+++ b/src/Storages/Kafka/StorageKafka.cpp
@@ -28,6 +28,7 @@
 #include <Poco/Util/AbstractConfiguration.h>
 #include <Common/Exception.h>
 #include <Common/Macros.h>
+#include <Common/formatReadable.h>
 #include <Common/config_version.h>
 #include <Common/setThreadName.h>
 #include <Common/typeid_cast.h>
@@ -169,20 +170,19 @@ namespace
 }
 
 StorageKafka::StorageKafka(
-    const StorageID & table_id_,
-    const Context & context_,
-    const ColumnsDescription & columns_,
-    std::unique_ptr<KafkaSettings> kafka_settings_)
+    const StorageID & table_id_, ContextPtr context_, const ColumnsDescription & columns_, std::unique_ptr<KafkaSettings> kafka_settings_)
     : IStorage(table_id_)
-    , global_context(context_.getGlobalContext())
+    , WithContext(context_->getGlobalContext())
     , kafka_settings(std::move(kafka_settings_))
-    , topics(parseTopics(global_context.getMacros()->expand(kafka_settings->kafka_topic_list.value)))
-    , brokers(global_context.getMacros()->expand(kafka_settings->kafka_broker_list.value))
-    , group(global_context.getMacros()->expand(kafka_settings->kafka_group_name.value))
-    , client_id(kafka_settings->kafka_client_id.value.empty() ? getDefaultClientId(table_id_) : global_context.getMacros()->expand(kafka_settings->kafka_client_id.value))
-    , format_name(global_context.getMacros()->expand(kafka_settings->kafka_format.value))
+    , topics(parseTopics(getContext()->getMacros()->expand(kafka_settings->kafka_topic_list.value)))
+    , brokers(getContext()->getMacros()->expand(kafka_settings->kafka_broker_list.value))
+    , group(getContext()->getMacros()->expand(kafka_settings->kafka_group_name.value))
+    , client_id(
+          kafka_settings->kafka_client_id.value.empty() ? getDefaultClientId(table_id_)
+                                                        : getContext()->getMacros()->expand(kafka_settings->kafka_client_id.value))
+    , format_name(getContext()->getMacros()->expand(kafka_settings->kafka_format.value))
     , row_delimiter(kafka_settings->kafka_row_delimiter.value)
-    , schema_name(global_context.getMacros()->expand(kafka_settings->kafka_schema.value))
+    , schema_name(getContext()->getMacros()->expand(kafka_settings->kafka_schema.value))
     , num_consumers(kafka_settings->kafka_num_consumers.value)
     , log(&Poco::Logger::get("StorageKafka (" + table_id_.table_name + ")"))
     , semaphore(0, num_consumers)
@@ -190,13 +190,18 @@ StorageKafka::StorageKafka(
     , settings_adjustments(createSettingsAdjustments())
     , thread_per_consumer(kafka_settings->kafka_thread_per_consumer.value)
 {
+    if (kafka_settings->kafka_handle_error_mode == HandleKafkaErrorMode::STREAM)
+    {
+        kafka_settings->input_format_allow_errors_num = 0;
+        kafka_settings->input_format_allow_errors_ratio = 0;
+    }
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(columns_);
     setInMemoryMetadata(storage_metadata);
     auto task_count = thread_per_consumer ? num_consumers : 1;
     for (size_t i = 0; i < task_count; ++i)
     {
-        auto task = global_context.getMessageBrokerSchedulePool().createTask(log->name(), [this, i]{ threadFunc(i); });
+        auto task = getContext()->getMessageBrokerSchedulePool().createTask(log->name(), [this, i]{ threadFunc(i); });
         task->deactivate();
         tasks.emplace_back(std::make_shared<TaskContext>(std::move(task)));
     }
@@ -255,7 +260,7 @@ Pipe StorageKafka::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & /* query_info */,
-    const Context & context,
+    ContextPtr local_context,
     QueryProcessingStage::Enum /* processed_stage */,
     size_t /* max_block_size */,
     unsigned /* num_streams */)
@@ -266,7 +271,7 @@ Pipe StorageKafka::read(
     /// Always use all consumers at once, otherwise SELECT may not read messages from all partitions.
     Pipes pipes;
     pipes.reserve(num_created_consumers);
-    auto modified_context = std::make_shared<Context>(context);
+    auto modified_context = Context::createCopy(local_context);
     modified_context->applySettingsChanges(settings_adjustments);
 
     // Claim as many consumers as requested, but don't block
@@ -284,9 +289,9 @@ Pipe StorageKafka::read(
 }
 
 
-BlockOutputStreamPtr StorageKafka::write(const ASTPtr &, const StorageMetadataPtr & metadata_snapshot, const Context & context)
+BlockOutputStreamPtr StorageKafka::write(const ASTPtr &, const StorageMetadataPtr & metadata_snapshot, ContextPtr local_context)
 {
-    auto modified_context = std::make_shared<Context>(context);
+    auto modified_context = Context::createCopy(local_context);
     modified_context->applySettingsChanges(settings_adjustments);
 
     if (topics.size() > 1)
@@ -382,7 +387,7 @@ ProducerBufferPtr StorageKafka::createWriteBuffer(const Block & header)
     updateConfiguration(conf);
 
     auto producer = std::make_shared<cppkafka::Producer>(conf);
-    const Settings & settings = global_context.getSettingsRef();
+    const Settings & settings = getContext()->getSettingsRef();
     size_t poll_timeout = settings.stream_poll_timeout_ms.totalMilliseconds();
 
     return std::make_shared<WriteBufferToKafkaProducer>(
@@ -438,14 +443,14 @@ size_t StorageKafka::getMaxBlockSize() const
 {
     return kafka_settings->kafka_max_block_size.changed
         ? kafka_settings->kafka_max_block_size.value
-        : (global_context.getSettingsRef().max_insert_block_size.value / num_consumers);
+        : (getContext()->getSettingsRef().max_insert_block_size.value / num_consumers);
 }
 
 size_t StorageKafka::getPollMaxBatchSize() const
 {
     size_t batch_size = kafka_settings->kafka_poll_max_batch_size.changed
                         ? kafka_settings->kafka_poll_max_batch_size.value
-                        : global_context.getSettingsRef().max_block_size.value;
+                        : getContext()->getSettingsRef().max_block_size.value;
 
     return std::min(batch_size,getMaxBlockSize());
 }
@@ -454,13 +459,13 @@ size_t StorageKafka::getPollTimeoutMillisecond() const
 {
     return kafka_settings->kafka_poll_timeout_ms.changed
         ? kafka_settings->kafka_poll_timeout_ms.totalMilliseconds()
-        : global_context.getSettingsRef().stream_poll_timeout_ms.totalMilliseconds();
+        : getContext()->getSettingsRef().stream_poll_timeout_ms.totalMilliseconds();
 }
 
 void StorageKafka::updateConfiguration(cppkafka::Configuration & conf)
 {
     // Update consumer configuration from the configuration
-    const auto & config = global_context.getConfigRef();
+    const auto & config = getContext()->getConfigRef();
     if (config.has(CONFIG_PREFIX))
         loadFromConfig(conf, config, CONFIG_PREFIX);
 
@@ -512,7 +517,7 @@ bool StorageKafka::checkDependencies(const StorageID & table_id)
     // Check the dependencies are ready?
     for (const auto & db_tab : dependencies)
     {
-        auto table = DatabaseCatalog::instance().tryGetTable(db_tab, global_context);
+        auto table = DatabaseCatalog::instance().tryGetTable(db_tab, getContext());
         if (!table)
             return false;
 
@@ -581,8 +586,10 @@ void StorageKafka::threadFunc(size_t idx)
 
 bool StorageKafka::streamToViews()
 {
+    Stopwatch watch;
+
     auto table_id = getStorageID();
-    auto table = DatabaseCatalog::instance().getTable(table_id, global_context);
+    auto table = DatabaseCatalog::instance().getTable(table_id, getContext());
     if (!table)
         throw Exception("Engine table " + table_id.getNameForLogs() + " doesn't exist.", ErrorCodes::LOGICAL_ERROR);
     auto metadata_snapshot = getInMemoryMetadataPtr();
@@ -593,13 +600,13 @@ bool StorageKafka::streamToViews()
 
     size_t block_size = getMaxBlockSize();
 
-    auto kafka_context = std::make_shared<Context>(global_context);
+    auto kafka_context = Context::createCopy(getContext());
     kafka_context->makeQueryContext();
     kafka_context->applySettingsChanges(settings_adjustments);
 
     // Create a stream for each consumer and join them in a union stream
     // Only insert into dependent views and expect that input blocks contain virtual columns
-    InterpreterInsertQuery interpreter(insert, *kafka_context, false, true, true);
+    InterpreterInsertQuery interpreter(insert, kafka_context, false, true, true);
     auto block_io = interpreter.execute();
 
     // Create a stream for each consumer and join them in a union stream
@@ -617,7 +624,7 @@ bool StorageKafka::streamToViews()
 
         limits.speed_limits.max_execution_time = kafka_settings->kafka_flush_interval_ms.changed
                                                  ? kafka_settings->kafka_flush_interval_ms
-                                                 : global_context.getSettingsRef().stream_flush_interval_ms;
+                                                 : getContext()->getSettingsRef().stream_flush_interval_ms;
 
         limits.timeout_overflow_mode = OverflowMode::BREAK;
         stream->setLimits(limits);
@@ -633,7 +640,11 @@ bool StorageKafka::streamToViews()
     // We can't cancel during copyData, as it's not aware of commits and other kafka-related stuff.
     // It will be cancelled on underlying layer (kafka buffer)
     std::atomic<bool> stub = {false};
-    copyData(*in, *block_io.out, &stub);
+    size_t rows = 0;
+    copyData(*in, *block_io.out, [&rows](const Block & block)
+    {
+        rows += block.rows();
+    }, &stub);
 
     bool some_stream_is_stalled = false;
     for (auto & stream : streams)
@@ -642,6 +653,10 @@ bool StorageKafka::streamToViews()
         stream->as<KafkaBlockInputStream>()->commit();
     }
 
+    UInt64 milliseconds = watch.elapsedMilliseconds();
+    LOG_DEBUG(log, "Pushing {} rows to {} took {} ms.",
+        formatReadableQuantity(rows), table_id.getNameForLogs(), milliseconds);
+
     return some_stream_is_stalled;
 }
 
@@ -690,14 +705,14 @@ void registerStorageKafka(StorageFactory & factory)
                         engine_args[(ARG_NUM)-1] =                          \
                             evaluateConstantExpressionAsLiteral(            \
                                 engine_args[(ARG_NUM)-1],                   \
-                                args.local_context);                        \
+                                args.getLocalContext());                    \
                     }                                                       \
                     if ((EVAL) == 2)                                        \
                     {                                                       \
                         engine_args[(ARG_NUM)-1] =                          \
                            evaluateConstantExpressionOrIdentifierAsLiteral( \
                                 engine_args[(ARG_NUM)-1],                   \
-                                args.local_context);                        \
+                                args.getLocalContext());                    \
                     }                                                       \
                     kafka_settings->PAR_NAME =                              \
                         engine_args[(ARG_NUM)-1]->as<ASTLiteral &>().value; \
@@ -752,7 +767,7 @@ void registerStorageKafka(StorageFactory & factory)
             throw Exception("kafka_poll_max_batch_size can not be lower than 1", ErrorCodes::BAD_ARGUMENTS);
         }
 
-        return StorageKafka::create(args.table_id, args.context, args.columns, std::move(kafka_settings));
+        return StorageKafka::create(args.table_id, args.getContext(), args.columns, std::move(kafka_settings));
     };
 
     factory.registerStorage("Kafka", creator_fn, StorageFactory::StorageFeatures{ .supports_settings = true, });
@@ -760,7 +775,7 @@ void registerStorageKafka(StorageFactory & factory)
 
 NamesAndTypesList StorageKafka::getVirtuals() const
 {
-    return NamesAndTypesList{
+    auto result = NamesAndTypesList{
         {"_topic", std::make_shared<DataTypeString>()},
         {"_key", std::make_shared<DataTypeString>()},
         {"_offset", std::make_shared<DataTypeUInt64>()},
@@ -770,6 +785,32 @@ NamesAndTypesList StorageKafka::getVirtuals() const
         {"_headers.name", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())},
         {"_headers.value", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())}
     };
+    if (kafka_settings->kafka_handle_error_mode == HandleKafkaErrorMode::STREAM)
+    {
+        result.push_back({"_raw_message", std::make_shared<DataTypeString>()});
+        result.push_back({"_error", std::make_shared<DataTypeString>()});
+    }
+    return result;
+}
+
+Names StorageKafka::getVirtualColumnNames() const
+{
+    auto result = Names {
+        "_topic",
+        "_key",
+        "_offset",
+        "_partition",
+        "_timestamp",
+        "_timestamp_ms",
+        "_headers.name",
+        "_headers.value",
+    };
+    if (kafka_settings->kafka_handle_error_mode == HandleKafkaErrorMode::STREAM)
+    {
+        result.push_back({"_raw_message"});
+        result.push_back({"_error"});
+    }
+    return result;
 }
 
 }
diff --git a/src/Storages/Kafka/StorageKafka.h b/src/Storages/Kafka/StorageKafka.h
index 53871990810..b09b2ecd39e 100644
--- a/src/Storages/Kafka/StorageKafka.h
+++ b/src/Storages/Kafka/StorageKafka.h
@@ -28,7 +28,7 @@ struct StorageKafkaInterceptors;
 /** Implements a Kafka queue table engine that can be used as a persistent queue / buffer,
   * or as a basic building block for creating pipelines with a continuous insertion / ETL.
   */
-class StorageKafka final : public ext::shared_ptr_helper<StorageKafka>, public IStorage
+class StorageKafka final : public ext::shared_ptr_helper<StorageKafka>, public IStorage, WithContext
 {
     friend struct ext::shared_ptr_helper<StorageKafka>;
     friend struct StorageKafkaInterceptors;
@@ -45,7 +45,7 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
@@ -53,7 +53,7 @@ public:
     BlockOutputStreamPtr write(
         const ASTPtr & query,
         const StorageMetadataPtr & /*metadata_snapshot*/,
-        const Context & context) override;
+        ContextPtr context) override;
 
     void pushReadBuffer(ConsumerBufferPtr buf);
     ConsumerBufferPtr popReadBuffer();
@@ -64,16 +64,17 @@ public:
     const auto & getFormatName() const { return format_name; }
 
     NamesAndTypesList getVirtuals() const override;
+    Names getVirtualColumnNames() const;
+    HandleKafkaErrorMode getHandleKafkaErrorMode() const { return kafka_settings->kafka_handle_error_mode; }
 protected:
     StorageKafka(
         const StorageID & table_id_,
-        const Context & context_,
+        ContextPtr context_,
         const ColumnsDescription & columns_,
         std::unique_ptr<KafkaSettings> kafka_settings_);
 
 private:
     // Configuration and state
-    const Context & global_context;
     std::unique_ptr<KafkaSettings> kafka_settings;
     const Names topics;
     const String brokers;
@@ -112,6 +113,9 @@ private:
     std::mutex thread_statuses_mutex;
     std::list<std::shared_ptr<ThreadStatus>> thread_statuses;
 
+    /// Handle error mode
+    HandleKafkaErrorMode handle_error_mode;
+
     SettingsChanges createSettingsAdjustments();
     ConsumerBufferPtr createReadBuffer(const size_t consumer_number);
 
diff --git a/src/Storages/KeyDescription.cpp b/src/Storages/KeyDescription.cpp
index ee4a20bfc4f..be327313b4d 100644
--- a/src/Storages/KeyDescription.cpp
+++ b/src/Storages/KeyDescription.cpp
@@ -66,14 +66,14 @@ KeyDescription & KeyDescription::operator=(const KeyDescription & other)
 void KeyDescription::recalculateWithNewAST(
     const ASTPtr & new_ast,
     const ColumnsDescription & columns,
-    const Context & context)
+    ContextPtr context)
 {
     *this = getSortingKeyFromAST(new_ast, columns, context, additional_column);
 }
 
 void KeyDescription::recalculateWithNewColumns(
     const ColumnsDescription & new_columns,
-    const Context & context)
+    ContextPtr context)
 {
     *this = getSortingKeyFromAST(definition_ast, new_columns, context, additional_column);
 }
@@ -81,7 +81,7 @@ void KeyDescription::recalculateWithNewColumns(
 KeyDescription KeyDescription::getKeyFromAST(
     const ASTPtr & definition_ast,
     const ColumnsDescription & columns,
-    const Context & context)
+    ContextPtr context)
 {
     return getSortingKeyFromAST(definition_ast, columns, context, {});
 }
@@ -89,7 +89,7 @@ KeyDescription KeyDescription::getKeyFromAST(
 KeyDescription KeyDescription::getSortingKeyFromAST(
     const ASTPtr & definition_ast,
     const ColumnsDescription & columns,
-    const Context & context,
+    ContextPtr context,
     const std::optional<String> & additional_column)
 {
     KeyDescription result;
diff --git a/src/Storages/KeyDescription.h b/src/Storages/KeyDescription.h
index 7d1e7efb55f..194aad4d5b2 100644
--- a/src/Storages/KeyDescription.h
+++ b/src/Storages/KeyDescription.h
@@ -40,28 +40,28 @@ struct KeyDescription
     static KeyDescription getKeyFromAST(
         const ASTPtr & definition_ast,
         const ColumnsDescription & columns,
-        const Context & context);
+        ContextPtr context);
 
     /// Sorting key can contain additional column defined by storage type (like
     /// Version column in VersionedCollapsingMergeTree).
     static KeyDescription getSortingKeyFromAST(
         const ASTPtr & definition_ast,
         const ColumnsDescription & columns,
-        const Context & context,
+        ContextPtr context,
         const std::optional<String> & additional_column);
 
     /// Recalculate all expressions and fields for key with new columns without
     /// changes in constant fields. Just wrapper for static methods.
     void recalculateWithNewColumns(
         const ColumnsDescription & new_columns,
-        const Context & context);
+        ContextPtr context);
 
     /// Recalculate all expressions and fields for key with new ast without
     /// changes in constant fields. Just wrapper for static methods.
     void recalculateWithNewAST(
         const ASTPtr & new_ast,
         const ColumnsDescription & columns,
-        const Context & context);
+        ContextPtr context);
 
     KeyDescription() = default;
 
diff --git a/src/Storages/LiveView/StorageBlocks.h b/src/Storages/LiveView/StorageBlocks.h
index 4ad0ffb93ca..f4ba8d7b09c 100644
--- a/src/Storages/LiveView/StorageBlocks.h
+++ b/src/Storages/LiveView/StorageBlocks.h
@@ -33,13 +33,13 @@ public:
     bool supportsSampling() const override { return true; }
     bool supportsFinal() const override { return true; }
 
-    QueryProcessingStage::Enum getQueryProcessingStage(const Context &, QueryProcessingStage::Enum /*to_stage*/, SelectQueryInfo &) const override { return to_stage; }
+    QueryProcessingStage::Enum getQueryProcessingStage(ContextPtr, QueryProcessingStage::Enum /*to_stage*/, SelectQueryInfo &) const override { return to_stage; }
 
     Pipe read(
         const Names & /*column_names*/,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & /*query_info*/,
-        const Context & /*context*/,
+        ContextPtr /*context*/,
         QueryProcessingStage::Enum /*processed_stage*/,
         size_t /*max_block_size*/,
         unsigned /*num_streams*/) override
diff --git a/src/Storages/LiveView/StorageLiveView.cpp b/src/Storages/LiveView/StorageLiveView.cpp
index bfec7bffc8c..1d81405ec26 100644
--- a/src/Storages/LiveView/StorageLiveView.cpp
+++ b/src/Storages/LiveView/StorageLiveView.cpp
@@ -56,13 +56,13 @@ namespace ErrorCodes
 }
 
 
-static StorageID extractDependentTable(ASTPtr & query, Context & context, const String & table_name, ASTPtr & inner_subquery)
+static StorageID extractDependentTable(ASTPtr & query, ContextPtr context, const String & table_name, ASTPtr & inner_subquery)
 {
     ASTSelectQuery & select_query = typeid_cast<ASTSelectQuery &>(*query);
 
     if (auto db_and_table = getDatabaseAndTable(select_query, 0))
     {
-        String select_database_name = context.getCurrentDatabase();
+        String select_database_name = context->getCurrentDatabase();
         String select_table_name = db_and_table->table;
 
         if (db_and_table->database.empty())
@@ -98,7 +98,7 @@ static StorageID extractDependentTable(ASTPtr & query, Context & context, const
     }
 }
 
-MergeableBlocksPtr StorageLiveView::collectMergeableBlocks(const Context & context)
+MergeableBlocksPtr StorageLiveView::collectMergeableBlocks(ContextPtr local_context)
 {
     ASTPtr mergeable_query = inner_query;
 
@@ -109,7 +109,7 @@ MergeableBlocksPtr StorageLiveView::collectMergeableBlocks(const Context & conte
     BlocksPtrs new_blocks = std::make_shared<std::vector<BlocksPtr>>();
     BlocksPtr base_blocks = std::make_shared<Blocks>();
 
-    InterpreterSelectQuery interpreter(mergeable_query->clone(), context, SelectQueryOptions(QueryProcessingStage::WithMergeableState), Names());
+    InterpreterSelectQuery interpreter(mergeable_query->clone(), local_context, SelectQueryOptions(QueryProcessingStage::WithMergeableState), Names());
 
     auto view_mergeable_stream = std::make_shared<MaterializingBlockInputStream>(interpreter.execute().getInputStream());
 
@@ -137,7 +137,7 @@ Pipes StorageLiveView::blocksToPipes(BlocksPtrs blocks, Block & sample_block)
 BlockInputStreamPtr StorageLiveView::completeQuery(Pipes pipes)
 {
     //FIXME it's dangerous to create Context on stack
-    auto block_context = std::make_unique<Context>(global_context);
+    auto block_context = Context::createCopy(getContext());
     block_context->makeQueryContext();
 
     auto creator = [&](const StorageID & blocks_id_global)
@@ -147,17 +147,17 @@ BlockInputStreamPtr StorageLiveView::completeQuery(Pipes pipes)
             blocks_id_global, parent_table_metadata->getColumns(),
             std::move(pipes), QueryProcessingStage::WithMergeableState);
     };
-    block_context->addExternalTable(getBlocksTableName(), TemporaryTableHolder(global_context, creator));
+    block_context->addExternalTable(getBlocksTableName(), TemporaryTableHolder(getContext(), creator));
 
-    InterpreterSelectQuery select(getInnerBlocksQuery(), *block_context, StoragePtr(), nullptr, SelectQueryOptions(QueryProcessingStage::Complete));
+    InterpreterSelectQuery select(getInnerBlocksQuery(), block_context, StoragePtr(), nullptr, SelectQueryOptions(QueryProcessingStage::Complete));
     BlockInputStreamPtr data = std::make_shared<MaterializingBlockInputStream>(select.execute().getInputStream());
 
     /// Squashing is needed here because the view query can generate a lot of blocks
     /// even when only one block is inserted into the parent table (e.g. if the query is a GROUP BY
     /// and two-level aggregation is triggered).
     data = std::make_shared<SquashingBlockInputStream>(
-        data, global_context.getSettingsRef().min_insert_block_size_rows,
-        global_context.getSettingsRef().min_insert_block_size_bytes);
+        data, getContext()->getSettingsRef().min_insert_block_size_rows,
+        getContext()->getSettingsRef().min_insert_block_size_bytes);
 
     return data;
 }
@@ -165,7 +165,7 @@ BlockInputStreamPtr StorageLiveView::completeQuery(Pipes pipes)
 void StorageLiveView::writeIntoLiveView(
     StorageLiveView & live_view,
     const Block & block,
-    const Context & context)
+    ContextPtr local_context)
 {
     BlockOutputStreamPtr output = std::make_shared<LiveViewBlockOutputStream>(live_view);
 
@@ -190,9 +190,9 @@ void StorageLiveView::writeIntoLiveView(
         std::lock_guard lock(live_view.mutex);
 
         mergeable_blocks = live_view.getMergeableBlocks();
-        if (!mergeable_blocks || mergeable_blocks->blocks->size() >= context.getGlobalContext().getSettingsRef().max_live_view_insert_blocks_before_refresh)
+        if (!mergeable_blocks || mergeable_blocks->blocks->size() >= local_context->getGlobalContext()->getSettingsRef().max_live_view_insert_blocks_before_refresh)
         {
-            mergeable_blocks = live_view.collectMergeableBlocks(context);
+            mergeable_blocks = live_view.collectMergeableBlocks(local_context);
             live_view.setMergeableBlocks(mergeable_blocks);
             from = live_view.blocksToPipes(mergeable_blocks->blocks, mergeable_blocks->sample_block);
             is_block_processed = true;
@@ -216,9 +216,9 @@ void StorageLiveView::writeIntoLiveView(
                 blocks_id_global, parent_metadata->getColumns(),
                 std::move(pipes), QueryProcessingStage::FetchColumns);
         };
-        TemporaryTableHolder blocks_storage(context, creator);
+        TemporaryTableHolder blocks_storage(local_context, creator);
 
-        InterpreterSelectQuery select_block(mergeable_query, context, blocks_storage.getTable(), blocks_storage.getTable()->getInMemoryMetadataPtr(),
+        InterpreterSelectQuery select_block(mergeable_query, local_context, blocks_storage.getTable(), blocks_storage.getTable()->getInMemoryMetadataPtr(),
             QueryProcessingStage::WithMergeableState);
 
         auto data_mergeable_stream = std::make_shared<MaterializingBlockInputStream>(
@@ -246,13 +246,13 @@ void StorageLiveView::writeIntoLiveView(
 
 StorageLiveView::StorageLiveView(
     const StorageID & table_id_,
-    Context & local_context,
+    ContextPtr context_,
     const ASTCreateQuery & query,
     const ColumnsDescription & columns_)
     : IStorage(table_id_)
-    , global_context(local_context.getGlobalContext())
+    , WithContext(context_->getGlobalContext())
 {
-    live_view_context = std::make_unique<Context>(global_context);
+    live_view_context = Context::createCopy(getContext());
     live_view_context->makeQueryContext();
 
     log = &Poco::Logger::get("StorageLiveView (" + table_id_.database_name + "." + table_id_.table_name + ")");
@@ -271,7 +271,7 @@ StorageLiveView::StorageLiveView(
     inner_query = query.select->list_of_selects->children.at(0);
 
     auto inner_query_tmp = inner_query->clone();
-    select_table_id = extractDependentTable(inner_query_tmp, global_context, table_id_.table_name, inner_subquery);
+    select_table_id = extractDependentTable(inner_query_tmp, getContext(), table_id_.table_name, inner_subquery);
 
     DatabaseCatalog::instance().addDependency(select_table_id, table_id_);
 
@@ -291,7 +291,7 @@ StorageLiveView::StorageLiveView(
     blocks_metadata_ptr = std::make_shared<BlocksMetadataPtr>();
     active_ptr = std::make_shared<bool>(true);
 
-    periodic_refresh_task = global_context.getSchedulePool().createTask("LieViewPeriodicRefreshTask", [this]{ periodicRefreshTaskFunc(); });
+    periodic_refresh_task = getContext()->getSchedulePool().createTask("LieViewPeriodicRefreshTask", [this]{ periodicRefreshTaskFunc(); });
     periodic_refresh_task->deactivate();
 }
 
@@ -301,7 +301,7 @@ Block StorageLiveView::getHeader() const
 
     if (!sample_block)
     {
-        sample_block = InterpreterSelectQuery(inner_query->clone(), *live_view_context, SelectQueryOptions(QueryProcessingStage::Complete)).getSampleBlock();
+        sample_block = InterpreterSelectQuery(inner_query->clone(), live_view_context, SelectQueryOptions(QueryProcessingStage::Complete)).getSampleBlock();
         sample_block.insert({DataTypeUInt64().createColumnConst(
             sample_block.rows(), 0)->convertToFullColumnIfConst(),
             std::make_shared<DataTypeUInt64>(),
@@ -318,7 +318,7 @@ Block StorageLiveView::getHeader() const
 
 StoragePtr StorageLiveView::getParentStorage() const
 {
-    return DatabaseCatalog::instance().getTable(select_table_id, global_context);
+    return DatabaseCatalog::instance().getTable(select_table_id, getContext());
 }
 
 ASTPtr StorageLiveView::getInnerBlocksQuery()
@@ -330,9 +330,9 @@ ASTPtr StorageLiveView::getInnerBlocksQuery()
         /// Rewrite inner query with right aliases for JOIN.
         /// It cannot be done in constructor or startup() because InterpreterSelectQuery may access table,
         /// which is not loaded yet during server startup, so we do it lazily
-        InterpreterSelectQuery(inner_blocks_query, *live_view_context, SelectQueryOptions().modify().analyze()); // NOLINT
+        InterpreterSelectQuery(inner_blocks_query, live_view_context, SelectQueryOptions().modify().analyze()); // NOLINT
         auto table_id = getStorageID();
-        extractDependentTable(inner_blocks_query, global_context, table_id.table_name, inner_subquery);
+        extractDependentTable(inner_blocks_query, getContext(), table_id.table_name, inner_subquery);
     }
     return inner_blocks_query->clone();
 }
@@ -350,7 +350,7 @@ bool StorageLiveView::getNewBlocks()
     /// called before writeIntoLiveView function is called which can lead to
     /// the same block added twice to the mergeable_blocks leading to
     /// inserted data to be duplicated
-    auto new_mergeable_blocks = collectMergeableBlocks(*live_view_context);
+    auto new_mergeable_blocks = collectMergeableBlocks(live_view_context);
     Pipes from = blocksToPipes(new_mergeable_blocks->blocks, new_mergeable_blocks->sample_block);
     BlockInputStreamPtr data = completeQuery(std::move(from));
 
@@ -500,7 +500,7 @@ Pipe StorageLiveView::read(
     const Names & /*column_names*/,
     const StorageMetadataPtr & /*metadata_snapshot*/,
     SelectQueryInfo & /*query_info*/,
-    const Context & /*context*/,
+    ContextPtr /*context*/,
     QueryProcessingStage::Enum /*processed_stage*/,
     const size_t /*max_block_size*/,
     const unsigned /*num_streams*/)
@@ -525,7 +525,7 @@ Pipe StorageLiveView::read(
 BlockInputStreams StorageLiveView::watch(
     const Names & /*column_names*/,
     const SelectQueryInfo & query_info,
-    const Context & context,
+    ContextPtr local_context,
     QueryProcessingStage::Enum & processed_stage,
     size_t /*max_block_size*/,
     const unsigned /*num_streams*/)
@@ -546,12 +546,12 @@ BlockInputStreams StorageLiveView::watch(
         reader = std::make_shared<LiveViewEventsBlockInputStream>(
             std::static_pointer_cast<StorageLiveView>(shared_from_this()),
             blocks_ptr, blocks_metadata_ptr, active_ptr, has_limit, limit,
-            context.getSettingsRef().live_view_heartbeat_interval.totalSeconds());
+            local_context->getSettingsRef().live_view_heartbeat_interval.totalSeconds());
     else
         reader = std::make_shared<LiveViewBlockInputStream>(
             std::static_pointer_cast<StorageLiveView>(shared_from_this()),
             blocks_ptr, blocks_metadata_ptr, active_ptr, has_limit, limit,
-            context.getSettingsRef().live_view_heartbeat_interval.totalSeconds());
+            local_context->getSettingsRef().live_view_heartbeat_interval.totalSeconds());
 
     {
         std::lock_guard lock(mutex);
@@ -578,10 +578,12 @@ void registerStorageLiveView(StorageFactory & factory)
 {
     factory.registerStorage("LiveView", [](const StorageFactory::Arguments & args)
     {
-        if (!args.attach && !args.local_context.getSettingsRef().allow_experimental_live_view)
-            throw Exception("Experimental LIVE VIEW feature is not enabled (the setting 'allow_experimental_live_view')", ErrorCodes::SUPPORT_IS_DISABLED);
+        if (!args.attach && !args.getLocalContext()->getSettingsRef().allow_experimental_live_view)
+            throw Exception(
+                "Experimental LIVE VIEW feature is not enabled (the setting 'allow_experimental_live_view')",
+                ErrorCodes::SUPPORT_IS_DISABLED);
 
-        return StorageLiveView::create(args.table_id, args.local_context, args.query, args.columns);
+        return StorageLiveView::create(args.table_id, args.getLocalContext(), args.query, args.columns);
     });
 }
 
diff --git a/src/Storages/LiveView/StorageLiveView.h b/src/Storages/LiveView/StorageLiveView.h
index e30a8f51705..df09316f333 100644
--- a/src/Storages/LiveView/StorageLiveView.h
+++ b/src/Storages/LiveView/StorageLiveView.h
@@ -49,7 +49,7 @@ class Pipe;
 using Pipes = std::vector<Pipe>;
 
 
-class StorageLiveView final : public ext::shared_ptr_helper<StorageLiveView>, public IStorage
+class StorageLiveView final : public ext::shared_ptr_helper<StorageLiveView>, public IStorage, WithContext
 {
 friend struct ext::shared_ptr_helper<StorageLiveView>;
 friend class LiveViewBlockInputStream;
@@ -142,13 +142,13 @@ public:
     void startup() override;
     void shutdown() override;
 
-    void refresh(const bool grab_lock = true);
+    void refresh(bool grab_lock = true);
 
     Pipe read(
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
@@ -156,7 +156,7 @@ public:
     BlockInputStreams watch(
         const Names & column_names,
         const SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum & processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
@@ -165,7 +165,7 @@ public:
     MergeableBlocksPtr getMergeableBlocks() { return mergeable_blocks; }
 
     /// Collect mergeable blocks and their sample. Must be called holding mutex
-    MergeableBlocksPtr collectMergeableBlocks(const Context & context);
+    MergeableBlocksPtr collectMergeableBlocks(ContextPtr context);
     /// Complete query using input streams from mergeable blocks
     BlockInputStreamPtr completeQuery(Pipes pipes);
 
@@ -183,7 +183,7 @@ public:
     static void writeIntoLiveView(
         StorageLiveView & live_view,
         const Block & block,
-        const Context & context);
+        ContextPtr context);
 
 private:
     /// TODO move to common struct SelectQueryDescription
@@ -191,8 +191,7 @@ private:
     ASTPtr inner_query; /// stored query : SELECT * FROM ( SELECT a FROM A)
     ASTPtr inner_subquery; /// stored query's innermost subquery if any
     ASTPtr inner_blocks_query; /// query over the mergeable blocks to produce final result
-    Context & global_context;
-    std::unique_ptr<Context> live_view_context;
+    ContextPtr live_view_context;
 
     Poco::Logger * log;
 
@@ -231,7 +230,7 @@ private:
 
     StorageLiveView(
         const StorageID & table_id_,
-        Context & local_context,
+        ContextPtr context_,
         const ASTCreateQuery & query,
         const ColumnsDescription & columns
     );
diff --git a/src/Storages/LiveView/TemporaryLiveViewCleaner.cpp b/src/Storages/LiveView/TemporaryLiveViewCleaner.cpp
index 143e7460cc3..7294b82f10d 100644
--- a/src/Storages/LiveView/TemporaryLiveViewCleaner.cpp
+++ b/src/Storages/LiveView/TemporaryLiveViewCleaner.cpp
@@ -1,8 +1,9 @@
 #include <Storages/LiveView/TemporaryLiveViewCleaner.h>
-#include <Storages/LiveView/StorageLiveView.h>
+
 #include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/InterpreterDropQuery.h>
 #include <Parsers/ASTDropQuery.h>
+#include <Storages/LiveView/StorageLiveView.h>
 
 
 namespace DB
@@ -15,7 +16,7 @@ namespace ErrorCodes
 
 namespace
 {
-    void executeDropQuery(const StorageID & storage_id, Context & context)
+    void executeDropQuery(const StorageID & storage_id, ContextPtr context)
     {
         if (!DatabaseCatalog::instance().isTableExist(storage_id, context))
             return;
@@ -41,45 +42,20 @@ namespace
 std::unique_ptr<TemporaryLiveViewCleaner> TemporaryLiveViewCleaner::the_instance;
 
 
-void TemporaryLiveViewCleaner::init(Context & global_context_)
+void TemporaryLiveViewCleaner::init(ContextPtr global_context_)
 {
     if (the_instance)
         throw Exception("TemporaryLiveViewCleaner already initialized", ErrorCodes::LOGICAL_ERROR);
     the_instance.reset(new TemporaryLiveViewCleaner(global_context_));
 }
 
-void TemporaryLiveViewCleaner::startupIfNecessary()
+void TemporaryLiveViewCleaner::startup()
 {
+    background_thread_can_start = true;
+
     std::lock_guard lock{mutex};
-    if (background_thread_should_exit)
-        return;
     if (!views.empty())
-        startupIfNecessaryImpl(lock);
-    else
-        can_start_background_thread = true;
-}
-
-void TemporaryLiveViewCleaner::startupIfNecessaryImpl(const std::lock_guard<std::mutex> &)
-{
-    /// If views.empty() the background thread isn't running or it's going to stop right now.
-    /// If can_start_background_thread is false, then the thread has not been started previously.
-    bool background_thread_is_running;
-    if (can_start_background_thread)
-    {
-        background_thread_is_running = !views.empty();
-    }
-    else
-    {
-        can_start_background_thread = true;
-        background_thread_is_running = false;
-    }
-
-    if (!background_thread_is_running)
-    {
-        if (background_thread.joinable())
-            background_thread.join();
-        background_thread = ThreadFromGlobalPool{&TemporaryLiveViewCleaner::backgroundThreadFunc, this};
-    }
+        startBackgroundThread();
 }
 
 void TemporaryLiveViewCleaner::shutdown()
@@ -87,13 +63,10 @@ void TemporaryLiveViewCleaner::shutdown()
     the_instance.reset();
 }
 
-
-TemporaryLiveViewCleaner::TemporaryLiveViewCleaner(Context & global_context_)
-    : global_context(global_context_)
+TemporaryLiveViewCleaner::TemporaryLiveViewCleaner(ContextPtr global_context_) : WithContext(global_context_)
 {
 }
 
-
 TemporaryLiveViewCleaner::~TemporaryLiveViewCleaner()
 {
     stopBackgroundThread();
@@ -108,27 +81,29 @@ void TemporaryLiveViewCleaner::addView(const std::shared_ptr<StorageLiveView> &
     auto current_time = std::chrono::system_clock::now();
     auto time_of_next_check = current_time + view->getTimeout();
 
-    std::lock_guard lock{mutex};
-    if (background_thread_should_exit)
-        return;
-
-    if (can_start_background_thread)
-        startupIfNecessaryImpl(lock);
-
     /// Keep the vector `views` sorted by time of next check.
     StorageAndTimeOfCheck storage_and_time_of_check{view, time_of_next_check};
+    std::lock_guard lock{mutex};
     views.insert(std::upper_bound(views.begin(), views.end(), storage_and_time_of_check), storage_and_time_of_check);
 
-    background_thread_wake_up.notify_one();
+    if (background_thread_can_start)
+    {
+        startBackgroundThread();
+        background_thread_wake_up.notify_one();
+    }
 }
 
 
 void TemporaryLiveViewCleaner::backgroundThreadFunc()
 {
     std::unique_lock lock{mutex};
-    while (!background_thread_should_exit && !views.empty())
+    while (!background_thread_should_exit)
     {
-        background_thread_wake_up.wait_until(lock, views.front().time_of_check);
+        if (views.empty())
+            background_thread_wake_up.wait(lock);
+        else
+            background_thread_wake_up.wait_until(lock, views.front().time_of_check);
+
         if (background_thread_should_exit)
             break;
 
@@ -167,20 +142,24 @@ void TemporaryLiveViewCleaner::backgroundThreadFunc()
 
         lock.unlock();
         for (const auto & storage_id : storages_to_drop)
-            executeDropQuery(storage_id, global_context);
+            executeDropQuery(storage_id, getContext());
         lock.lock();
     }
 }
 
 
+void TemporaryLiveViewCleaner::startBackgroundThread()
+{
+    if (!background_thread.joinable() && background_thread_can_start && !background_thread_should_exit)
+        background_thread = ThreadFromGlobalPool{&TemporaryLiveViewCleaner::backgroundThreadFunc, this};
+}
+
 void TemporaryLiveViewCleaner::stopBackgroundThread()
 {
+    background_thread_should_exit = true;
+    background_thread_wake_up.notify_one();
     if (background_thread.joinable())
-    {
-        background_thread_should_exit = true;
-        background_thread_wake_up.notify_one();
         background_thread.join();
-    }
 }
 
 }
diff --git a/src/Storages/LiveView/TemporaryLiveViewCleaner.h b/src/Storages/LiveView/TemporaryLiveViewCleaner.h
index 8d57aa9fbfa..9b31bf9c999 100644
--- a/src/Storages/LiveView/TemporaryLiveViewCleaner.h
+++ b/src/Storages/LiveView/TemporaryLiveViewCleaner.h
@@ -1,17 +1,20 @@
 #pragma once
 
+#include <Interpreters/Context_fwd.h>
 #include <Common/ThreadPool.h>
+
 #include <chrono>
 
 
 namespace DB
 {
+
 class StorageLiveView;
 struct StorageID;
 
 /// This class removes temporary live views in the background thread when it's possible.
 /// There should only a single instance of this class.
-class TemporaryLiveViewCleaner
+class TemporaryLiveViewCleaner : WithContext
 {
 public:
     static TemporaryLiveViewCleaner & instance() { return *the_instance; }
@@ -20,19 +23,19 @@ public:
     void addView(const std::shared_ptr<StorageLiveView> & view);
 
     /// Should be called once.
-    static void init(Context & global_context_);
+    static void init(ContextPtr global_context_);
     static void shutdown();
 
-    void startupIfNecessary();
-    void startupIfNecessaryImpl(const std::lock_guard<std::mutex> &);
+    void startup();
 
 private:
     friend std::unique_ptr<TemporaryLiveViewCleaner>::deleter_type;
 
-    TemporaryLiveViewCleaner(Context & global_context_);
+    TemporaryLiveViewCleaner(ContextPtr global_context_);
     ~TemporaryLiveViewCleaner();
 
     void backgroundThreadFunc();
+    void startBackgroundThread();
     void stopBackgroundThread();
 
     struct StorageAndTimeOfCheck
@@ -43,11 +46,10 @@ private:
     };
 
     static std::unique_ptr<TemporaryLiveViewCleaner> the_instance;
-    Context & global_context;
     std::mutex mutex;
     std::vector<StorageAndTimeOfCheck> views;
     ThreadFromGlobalPool background_thread;
-    bool can_start_background_thread = false;
+    std::atomic<bool> background_thread_can_start = false;
     std::atomic<bool> background_thread_should_exit = false;
     std::condition_variable background_thread_wake_up;
 };
diff --git a/src/Storages/MergeTree/BackgroundJobsExecutor.cpp b/src/Storages/MergeTree/BackgroundJobsExecutor.cpp
index 8e5a0e8a3b8..ae06721b43d 100644
--- a/src/Storages/MergeTree/BackgroundJobsExecutor.cpp
+++ b/src/Storages/MergeTree/BackgroundJobsExecutor.cpp
@@ -16,10 +16,10 @@ namespace DB
 {
 
 IBackgroundJobExecutor::IBackgroundJobExecutor(
-        Context & global_context_,
+        ContextPtr global_context_,
         const BackgroundTaskSchedulingSettings & sleep_settings_,
         const std::vector<PoolConfig> & pools_configs_)
-    : global_context(global_context_)
+    : WithContext(global_context_)
     , sleep_settings(sleep_settings_)
     , rng(randomSeed())
 {
@@ -155,7 +155,7 @@ void IBackgroundJobExecutor::start()
     std::lock_guard lock(scheduling_task_mutex);
     if (!scheduling_task)
     {
-        scheduling_task = global_context.getSchedulePool().createTask(
+        scheduling_task = getContext()->getSchedulePool().createTask(
             getBackgroundTaskName(), [this]{ jobExecutingTask(); });
     }
 
@@ -187,12 +187,12 @@ IBackgroundJobExecutor::~IBackgroundJobExecutor()
 
 BackgroundJobsExecutor::BackgroundJobsExecutor(
        MergeTreeData & data_,
-       Context & global_context_)
+       ContextPtr global_context_)
     : IBackgroundJobExecutor(
         global_context_,
-        global_context_.getBackgroundProcessingTaskSchedulingSettings(),
-        {PoolConfig{PoolType::MERGE_MUTATE, global_context_.getSettingsRef().background_pool_size, CurrentMetrics::BackgroundPoolTask},
-         PoolConfig{PoolType::FETCH, global_context_.getSettingsRef().background_fetches_pool_size, CurrentMetrics::BackgroundFetchesPoolTask}})
+        global_context_->getBackgroundProcessingTaskSchedulingSettings(),
+        {PoolConfig{PoolType::MERGE_MUTATE, global_context_->getSettingsRef().background_pool_size, CurrentMetrics::BackgroundPoolTask},
+         PoolConfig{PoolType::FETCH, global_context_->getSettingsRef().background_fetches_pool_size, CurrentMetrics::BackgroundFetchesPoolTask}})
     , data(data_)
 {
 }
@@ -209,11 +209,11 @@ std::optional<JobAndPool> BackgroundJobsExecutor::getBackgroundJob()
 
 BackgroundMovesExecutor::BackgroundMovesExecutor(
        MergeTreeData & data_,
-       Context & global_context_)
+       ContextPtr global_context_)
     : IBackgroundJobExecutor(
         global_context_,
-        global_context_.getBackgroundMoveTaskSchedulingSettings(),
-      {PoolConfig{PoolType::MOVE, global_context_.getSettingsRef().background_move_pool_size, CurrentMetrics::BackgroundMovePoolTask}})
+        global_context_->getBackgroundMoveTaskSchedulingSettings(),
+      {PoolConfig{PoolType::MOVE, global_context_->getSettingsRef().background_move_pool_size, CurrentMetrics::BackgroundMovePoolTask}})
     , data(data_)
 {
 }
diff --git a/src/Storages/MergeTree/BackgroundJobsExecutor.h b/src/Storages/MergeTree/BackgroundJobsExecutor.h
index da22c752e1b..e9cefc7a6b0 100644
--- a/src/Storages/MergeTree/BackgroundJobsExecutor.h
+++ b/src/Storages/MergeTree/BackgroundJobsExecutor.h
@@ -50,11 +50,9 @@ struct JobAndPool
 /// Consists of two important parts:
 /// 1) Task in background scheduling pool which receives new jobs from storages and put them into required pool.
 /// 2) One or more ThreadPool objects, which execute background jobs.
-class IBackgroundJobExecutor
+class IBackgroundJobExecutor : protected WithContext
 {
 protected:
-    Context & global_context;
-
     /// Configuration for single background ThreadPool
     struct PoolConfig
     {
@@ -106,7 +104,7 @@ public:
 
 protected:
     IBackgroundJobExecutor(
-        Context & global_context_,
+        ContextPtr global_context_,
         const BackgroundTaskSchedulingSettings & sleep_settings_,
         const std::vector<PoolConfig> & pools_configs_);
 
@@ -134,7 +132,7 @@ private:
 public:
     BackgroundJobsExecutor(
         MergeTreeData & data_,
-        Context & global_context_);
+        ContextPtr global_context_);
 
 protected:
     String getBackgroundTaskName() const override;
@@ -150,7 +148,7 @@ private:
 public:
     BackgroundMovesExecutor(
         MergeTreeData & data_,
-        Context & global_context_);
+        ContextPtr global_context_);
 
 protected:
     String getBackgroundTaskName() const override;
diff --git a/src/Storages/MergeTree/DataPartsExchange.cpp b/src/Storages/MergeTree/DataPartsExchange.cpp
index f80020991b0..205d57f533e 100644
--- a/src/Storages/MergeTree/DataPartsExchange.cpp
+++ b/src/Storages/MergeTree/DataPartsExchange.cpp
@@ -11,6 +11,7 @@
 #include <Storages/MergeTree/ReplicatedFetchList.h>
 #include <Common/CurrentMetrics.h>
 #include <Common/NetException.h>
+#include <IO/createReadBufferFromFileBase.h>
 #include <ext/scope_guard.h>
 
 #include <Poco/File.h>
@@ -36,6 +37,8 @@ namespace ErrorCodes
     extern const int INSECURE_PATH;
     extern const int CORRUPTED_DATA;
     extern const int LOGICAL_ERROR;
+    extern const int S3_ERROR;
+    extern const int INCORRECT_PART_TYPE;
 }
 
 namespace DataPartsExchange
@@ -48,6 +51,7 @@ constexpr auto REPLICATION_PROTOCOL_VERSION_WITH_PARTS_SIZE_AND_TTL_INFOS = 2;
 constexpr auto REPLICATION_PROTOCOL_VERSION_WITH_PARTS_TYPE = 3;
 constexpr auto REPLICATION_PROTOCOL_VERSION_WITH_PARTS_DEFAULT_COMPRESSION = 4;
 constexpr auto REPLICATION_PROTOCOL_VERSION_WITH_PARTS_UUID = 5;
+constexpr auto REPLICATION_PROTOCOL_VERSION_WITH_PARTS_S3_COPY = 6;
 
 
 std::string getEndpointId(const std::string & node_id)
@@ -112,7 +116,7 @@ void Service::processQuery(const HTMLForm & params, ReadBuffer & /*body*/, Write
     }
 
     /// We pretend to work as older server version, to be sure that client will correctly process our version
-    response.addCookie({"server_protocol_version", toString(std::min(client_protocol_version, REPLICATION_PROTOCOL_VERSION_WITH_PARTS_UUID))});
+    response.addCookie({"server_protocol_version", toString(std::min(client_protocol_version, REPLICATION_PROTOCOL_VERSION_WITH_PARTS_S3_COPY))});
 
     ++total_sends;
     SCOPE_EXIT({--total_sends;});
@@ -148,7 +152,30 @@ void Service::processQuery(const HTMLForm & params, ReadBuffer & /*body*/, Write
             sendPartFromMemory(part, out);
         else
         {
-            sendPartFromDisk(part, out, client_protocol_version);
+            bool try_use_s3_copy = false;
+
+            if (data_settings->allow_s3_zero_copy_replication
+                    && client_protocol_version >= REPLICATION_PROTOCOL_VERSION_WITH_PARTS_S3_COPY)
+            { /// if source and destination are in the same S3 storage we try to use S3 CopyObject request first
+                int send_s3_metadata = parse<int>(params.get("send_s3_metadata", "0"));
+                if (send_s3_metadata == 1)
+                {
+                    auto disk = part->volume->getDisk();
+                    if (disk->getType() == DB::DiskType::Type::S3)
+                    {
+                        try_use_s3_copy = true;
+                    }
+                }
+            }
+            if (try_use_s3_copy)
+            {
+                response.addCookie({"send_s3_metadata", "1"});
+                sendPartS3Metadata(part, out);
+            }
+            else
+            {
+                sendPartFromDisk(part, out, client_protocol_version);
+            }
         }
     }
     catch (const NetException &)
@@ -229,6 +256,55 @@ void Service::sendPartFromDisk(const MergeTreeData::DataPartPtr & part, WriteBuf
     part->checksums.checkEqual(data_checksums, false);
 }
 
+void Service::sendPartS3Metadata(const MergeTreeData::DataPartPtr & part, WriteBuffer & out)
+{
+    /// We'll take a list of files from the list of checksums.
+    MergeTreeData::DataPart::Checksums checksums = part->checksums;
+    /// Add files that are not in the checksum list.
+    auto file_names_without_checksums = part->getFileNamesWithoutChecksums();
+    for (const auto & file_name : file_names_without_checksums)
+        checksums.files[file_name] = {};
+
+    auto disk = part->volume->getDisk();
+    if (disk->getType() != DB::DiskType::Type::S3)
+        throw Exception("S3 disk is not S3 anymore", ErrorCodes::LOGICAL_ERROR);
+
+    part->storage.lockSharedData(*part);
+
+    String part_id = part->getUniqueId();
+    writeStringBinary(part_id, out);
+
+    writeBinary(checksums.files.size(), out);
+    for (const auto & it : checksums.files)
+    {
+        String file_name = it.first;
+
+        String metadata_file = disk->getPath() + part->getFullRelativePath() + file_name;
+
+        Poco::File metadata(metadata_file);
+
+        if (!metadata.exists())
+            throw Exception("S3 metadata '" + file_name + "' is not exists", ErrorCodes::CORRUPTED_DATA);
+        if (!metadata.isFile())
+            throw Exception("S3 metadata '" + file_name + "' is not a file", ErrorCodes::CORRUPTED_DATA);
+        UInt64 file_size = metadata.getSize();
+
+        writeStringBinary(it.first, out);
+        writeBinary(file_size, out);
+
+        auto file_in = createReadBufferFromFileBase(metadata_file, 0, 0, 0, nullptr, DBMS_DEFAULT_BUFFER_SIZE);
+        HashingWriteBuffer hashing_out(out);
+        copyData(*file_in, hashing_out, blocker.getCounter());
+        if (blocker.isCancelled())
+            throw Exception("Transferring part to replica was cancelled", ErrorCodes::ABORTED);
+
+        if (hashing_out.count() != file_size)
+            throw Exception("Unexpected size of file " + metadata_file, ErrorCodes::BAD_SIZE_OF_FILE_IN_DATA_PART);
+
+        writePODBinary(hashing_out.getHash(), out);
+    }
+}
+
 MergeTreeData::DataPartPtr Service::findPart(const String & name)
 {
     /// It is important to include PreCommitted and Outdated parts here because remote replicas cannot reliably
@@ -252,7 +328,10 @@ MergeTreeData::MutableDataPartPtr Fetcher::fetchPart(
     const String & password,
     const String & interserver_scheme,
     bool to_detached,
-    const String & tmp_prefix_)
+    const String & tmp_prefix_,
+    std::optional<CurrentlySubmergingEmergingTagger> * tagger_ptr,
+    bool try_use_s3_copy,
+    const DiskPtr disk_s3)
 {
     if (blocker.isCancelled())
         throw Exception("Fetching of part was cancelled", ErrorCodes::ABORTED);
@@ -269,10 +348,36 @@ MergeTreeData::MutableDataPartPtr Fetcher::fetchPart(
     {
         {"endpoint",                getEndpointId(replica_path)},
         {"part",                    part_name},
-        {"client_protocol_version", toString(REPLICATION_PROTOCOL_VERSION_WITH_PARTS_UUID)},
+        {"client_protocol_version", toString(REPLICATION_PROTOCOL_VERSION_WITH_PARTS_S3_COPY)},
         {"compress",                "false"}
     });
 
+    if (try_use_s3_copy && disk_s3 && disk_s3->getType() != DB::DiskType::Type::S3)
+        throw Exception("Try to fetch shared s3 part on non-s3 disk", ErrorCodes::LOGICAL_ERROR);
+
+    Disks disks_s3;
+
+    if (!data_settings->allow_s3_zero_copy_replication)
+        try_use_s3_copy = false;
+
+    if (try_use_s3_copy)
+    {
+        if (disk_s3)
+            disks_s3.push_back(disk_s3);
+        else
+        {
+            disks_s3 = data.getDisksByType(DiskType::Type::S3);
+
+            if (disks_s3.empty())
+                try_use_s3_copy = false;
+        }
+    }
+
+    if (try_use_s3_copy)
+    {
+        uri.addQueryParameter("send_s3_metadata", "1");
+    }
+
     Poco::Net::HTTPBasicCredentials creds{};
     if (!user.empty())
     {
@@ -293,6 +398,44 @@ MergeTreeData::MutableDataPartPtr Fetcher::fetchPart(
 
     int server_protocol_version = parse<int>(in.getResponseCookie("server_protocol_version", "0"));
 
+    int send_s3 = parse<int>(in.getResponseCookie("send_s3_metadata", "0"));
+
+    if (send_s3 == 1)
+    {
+        if (server_protocol_version < REPLICATION_PROTOCOL_VERSION_WITH_PARTS_S3_COPY)
+            throw Exception("Got 'send_s3_metadata' cookie with old protocol version", ErrorCodes::LOGICAL_ERROR);
+        if (!try_use_s3_copy)
+            throw Exception("Got 'send_s3_metadata' cookie when was not requested", ErrorCodes::LOGICAL_ERROR);
+
+        size_t sum_files_size = 0;
+        readBinary(sum_files_size, in);
+        IMergeTreeDataPart::TTLInfos ttl_infos;
+        /// Skip ttl infos, not required for S3 metadata
+        String ttl_infos_string;
+        readBinary(ttl_infos_string, in);
+        String part_type = "Wide";
+        readStringBinary(part_type, in);
+        if (part_type == "InMemory")
+            throw Exception("Got 'send_s3_metadata' cookie for in-memory part", ErrorCodes::INCORRECT_PART_TYPE);
+
+        UUID part_uuid = UUIDHelpers::Nil;
+        if (server_protocol_version >= REPLICATION_PROTOCOL_VERSION_WITH_PARTS_UUID)
+            readUUIDText(part_uuid, in);
+
+        try
+        {
+            return downloadPartToS3(part_name, replica_path, to_detached, tmp_prefix_, std::move(disks_s3), in);
+        }
+        catch (const Exception & e)
+        {
+            if (e.code() != ErrorCodes::S3_ERROR)
+                throw;
+            /// Try again but without S3 copy
+            return fetchPart(metadata_snapshot, part_name, replica_path, host, port, timeouts,
+                user, password, interserver_scheme, to_detached, tmp_prefix_, nullptr, false);
+        }
+    }
+
     ReservationPtr reservation;
     size_t sum_files_size = 0;
     if (server_protocol_version >= REPLICATION_PROTOCOL_VERSION_WITH_PARTS_SIZE)
@@ -306,10 +449,18 @@ MergeTreeData::MutableDataPartPtr Fetcher::fetchPart(
             ReadBufferFromString ttl_infos_buffer(ttl_infos_string);
             assertString("ttl format version: 1\n", ttl_infos_buffer);
             ttl_infos.read(ttl_infos_buffer);
-            reservation = data.reserveSpacePreferringTTLRules(metadata_snapshot, sum_files_size, ttl_infos, std::time(nullptr), 0, true);
+            reservation
+                = data.balancedReservation(metadata_snapshot, sum_files_size, 0, part_name, part_info, {}, tagger_ptr, &ttl_infos, true);
+            if (!reservation)
+                reservation
+                    = data.reserveSpacePreferringTTLRules(metadata_snapshot, sum_files_size, ttl_infos, std::time(nullptr), 0, true);
         }
         else
-            reservation = data.reserveSpace(sum_files_size);
+        {
+            reservation = data.balancedReservation(metadata_snapshot, sum_files_size, 0, part_name, part_info, {}, tagger_ptr, nullptr);
+            if (!reservation)
+                reservation = data.reserveSpace(sum_files_size);
+        }
     }
     else
     {
@@ -330,7 +481,7 @@ MergeTreeData::MutableDataPartPtr Fetcher::fetchPart(
 
     auto storage_id = data.getStorageID();
     String new_part_path = part_type == "InMemory" ? "memory" : data.getFullPathOnDisk(reservation->getDisk()) + part_name + "/";
-    auto entry = data.global_context.getReplicatedFetchList().insert(
+    auto entry = data.getContext()->getReplicatedFetchList().insert(
         storage_id.getDatabaseName(), storage_id.getTableName(),
         part_info.partition_id, part_name, new_part_path,
         replica_path, uri, to_detached, sum_files_size);
@@ -363,7 +514,7 @@ MergeTreeData::MutableDataPartPtr Fetcher::downloadPartToMemory(
     new_data_part->uuid = part_uuid;
     new_data_part->is_temp = true;
     new_data_part->setColumns(block.getNamesAndTypesList());
-    new_data_part->minmax_idx.update(block, data.minmax_idx_columns);
+    new_data_part->minmax_idx.update(block, data.getMinMaxColumnsNames(metadata_snapshot->getPartitionKey()));
     new_data_part->partition.create(metadata_snapshot, block, 0);
 
     MergedBlockOutputStream part_out(new_data_part, metadata_snapshot, block.getNamesAndTypesList(), {}, CompressionCodecFactory::instance().get("NONE", {}));
@@ -392,11 +543,22 @@ MergeTreeData::MutableDataPartPtr Fetcher::downloadPartToDisk(
     static const String TMP_PREFIX = "tmp_fetch_";
     String tmp_prefix = tmp_prefix_.empty() ? TMP_PREFIX : tmp_prefix_;
 
+    /// We will remove directory if it's already exists. Make precautions.
+    if (tmp_prefix.empty()
+        || part_name.empty()
+        || std::string::npos != tmp_prefix.find_first_of("/.")
+        || std::string::npos != part_name.find_first_of("/."))
+        throw Exception("Logical error: tmp_prefix and part_name cannot be empty or contain '.' or '/' characters.", ErrorCodes::LOGICAL_ERROR);
+
     String part_relative_path = String(to_detached ? "detached/" : "") + tmp_prefix + part_name;
     String part_download_path = data.getRelativeDataPath() + part_relative_path + "/";
 
     if (disk->exists(part_download_path))
-        throw Exception("Directory " + fullPath(disk, part_download_path) + " already exists.", ErrorCodes::DIRECTORY_ALREADY_EXISTS);
+    {
+        LOG_WARNING(log, "Directory {} already exists, probably result of a failed fetch. Will remove it before fetching part.",
+            fullPath(disk, part_download_path));
+        disk->removeRecursive(part_download_path);
+    }
 
     disk->createDirectories(part_download_path);
 
@@ -462,6 +624,100 @@ MergeTreeData::MutableDataPartPtr Fetcher::downloadPartToDisk(
     return new_data_part;
 }
 
+MergeTreeData::MutableDataPartPtr Fetcher::downloadPartToS3(
+    const String & part_name,
+    const String & replica_path,
+    bool to_detached,
+    const String & tmp_prefix_,
+    const Disks & disks_s3,
+    PooledReadWriteBufferFromHTTP & in
+    )
+{
+    if (disks_s3.empty())
+        throw Exception("No S3 disks anymore", ErrorCodes::LOGICAL_ERROR);
+
+    String part_id;
+    readStringBinary(part_id, in);
+
+    DiskPtr disk = disks_s3[0];
+
+    for (const auto & disk_s3 : disks_s3)
+    {
+        if (disk_s3->checkUniqueId(part_id))
+        {
+            disk = disk_s3;
+            break;
+        }
+    }
+
+    static const String TMP_PREFIX = "tmp_fetch_";
+    String tmp_prefix = tmp_prefix_.empty() ? TMP_PREFIX : tmp_prefix_;
+
+    String part_relative_path = String(to_detached ? "detached/" : "") + tmp_prefix + part_name;
+    String part_download_path = data.getRelativeDataPath() + part_relative_path + "/";
+
+    if (disk->exists(part_download_path))
+        throw Exception("Directory " + fullPath(disk, part_download_path) + " already exists.", ErrorCodes::DIRECTORY_ALREADY_EXISTS);
+
+    CurrentMetrics::Increment metric_increment{CurrentMetrics::ReplicatedFetch};
+
+    disk->createDirectories(part_download_path);
+
+    size_t files;
+    readBinary(files, in);
+
+    auto volume = std::make_shared<SingleDiskVolume>("volume_" + part_name, disk);
+    MergeTreeData::MutableDataPartPtr new_data_part = data.createPart(part_name, volume, part_relative_path);
+
+    for (size_t i = 0; i < files; ++i)
+    {
+        String file_name;
+        UInt64 file_size;
+
+        readStringBinary(file_name, in);
+        readBinary(file_size, in);
+
+        String data_path = new_data_part->getFullRelativePath() + file_name;
+        String metadata_file = fullPath(disk, data_path);
+
+        {
+            auto file_out = std::make_unique<WriteBufferFromFile>(metadata_file, DBMS_DEFAULT_BUFFER_SIZE, -1, 0666, nullptr, 0);
+
+            HashingWriteBuffer hashing_out(*file_out);
+
+            copyData(in, hashing_out, file_size, blocker.getCounter());
+
+            if (blocker.isCancelled())
+            {
+                /// NOTE The is_cancelled flag also makes sense to check every time you read over the network,
+                /// performing a poll with a not very large timeout.
+                /// And now we check it only between read chunks (in the `copyData` function).
+                disk->removeSharedRecursive(part_download_path, true);
+                throw Exception("Fetching of part was cancelled", ErrorCodes::ABORTED);
+            }
+
+            MergeTreeDataPartChecksum::uint128 expected_hash;
+            readPODBinary(expected_hash, in);
+
+            if (expected_hash != hashing_out.getHash())
+            {
+                throw Exception("Checksum mismatch for file " + metadata_file + " transferred from " + replica_path,
+                    ErrorCodes::CHECKSUM_DOESNT_MATCH);
+            }
+        }
+    }
+
+    assertEOF(in);
+
+    new_data_part->is_temp = true;
+    new_data_part->modification_time = time(nullptr);
+    new_data_part->loadColumnsChecksumsIndexes(true, false);
+
+    new_data_part->storage.lockSharedData(*new_data_part);
+
+    return new_data_part;
+}
+
 }
 
 }
diff --git a/src/Storages/MergeTree/DataPartsExchange.h b/src/Storages/MergeTree/DataPartsExchange.h
index 834fed1182f..e9b3d443fcd 100644
--- a/src/Storages/MergeTree/DataPartsExchange.h
+++ b/src/Storages/MergeTree/DataPartsExchange.h
@@ -9,6 +9,12 @@
 #include <IO/ReadWriteBufferFromHTTP.h>
 
 
+namespace zkutil
+{
+    class ZooKeeper;
+    using ZooKeeperPtr = std::shared_ptr<ZooKeeper>;
+}
+
 namespace DB
 {
 
@@ -32,6 +38,7 @@ private:
     MergeTreeData::DataPartPtr findPart(const String & name);
     void sendPartFromMemory(const MergeTreeData::DataPartPtr & part, WriteBuffer & out);
     void sendPartFromDisk(const MergeTreeData::DataPartPtr & part, WriteBuffer & out, int client_protocol_version);
+    void sendPartS3Metadata(const MergeTreeData::DataPartPtr & part, WriteBuffer & out);
 
     /// StorageReplicatedMergeTree::shutdown() waits for all parts exchange handlers to finish,
     /// so Service will never access dangling reference to storage
@@ -58,7 +65,10 @@ public:
         const String & password,
         const String & interserver_scheme,
         bool to_detached = false,
-        const String & tmp_prefix_ = "");
+        const String & tmp_prefix_ = "",
+        std::optional<CurrentlySubmergingEmergingTagger> * tagger_ptr = nullptr,
+        bool try_use_s3_copy = true,
+        const DiskPtr disk_s3 = nullptr);
 
     /// You need to stop the data transfer.
     ActionBlocker blocker;
@@ -80,6 +90,14 @@ private:
             ReservationPtr reservation,
             PooledReadWriteBufferFromHTTP & in);
 
+    MergeTreeData::MutableDataPartPtr downloadPartToS3(
+            const String & part_name,
+            const String & replica_path,
+            bool to_detached,
+            const String & tmp_prefix_,
+            const Disks & disks_s3,
+            PooledReadWriteBufferFromHTTP & in);
+
     MergeTreeData & data;
     Poco::Logger * log;
 };
diff --git a/src/Storages/MergeTree/IMergeTreeDataPart.cpp b/src/Storages/MergeTree/IMergeTreeDataPart.cpp
index 2f6513bbb12..36032f9208f 100644
--- a/src/Storages/MergeTree/IMergeTreeDataPart.cpp
+++ b/src/Storages/MergeTree/IMergeTreeDataPart.cpp
@@ -9,8 +9,10 @@
 #include <Storages/MergeTree/MergeTreeData.h>
 #include <Storages/MergeTree/localBackup.h>
 #include <Storages/MergeTree/checkDataPart.h>
+#include <Storages/StorageReplicatedMergeTree.h>
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/escapeForFileName.h>
+#include <Common/ZooKeeper/ZooKeeper.h>
 #include <Common/CurrentMetrics.h>
 #include <common/JSON.h>
 #include <common/logger_useful.h>
@@ -35,6 +37,7 @@ namespace CurrentMetrics
 
 namespace DB
 {
+
 namespace ErrorCodes
 {
     extern const int DIRECTORY_ALREADY_EXISTS;
@@ -57,18 +60,23 @@ static std::unique_ptr<ReadBufferFromFileBase> openForReading(const DiskPtr & di
 
 void IMergeTreeDataPart::MinMaxIndex::load(const MergeTreeData & data, const DiskPtr & disk_, const String & part_path)
 {
-    size_t minmax_idx_size = data.minmax_idx_column_types.size();
+    auto metadata_snapshot = data.getInMemoryMetadataPtr();
+    const auto & partition_key = metadata_snapshot->getPartitionKey();
+
+    auto minmax_column_names = data.getMinMaxColumnsNames(partition_key);
+    auto minmax_column_types = data.getMinMaxColumnsTypes(partition_key);
+    size_t minmax_idx_size = minmax_column_types.size();
     hyperrectangle.reserve(minmax_idx_size);
     for (size_t i = 0; i < minmax_idx_size; ++i)
     {
-        String file_name = part_path + "minmax_" + escapeForFileName(data.minmax_idx_columns[i]) + ".idx";
+        String file_name = part_path + "minmax_" + escapeForFileName(minmax_column_names[i]) + ".idx";
         auto file = openForReading(disk_, file_name);
-        const DataTypePtr & data_type = data.minmax_idx_column_types[i];
+        auto serialization = minmax_column_types[i]->getDefaultSerialization();
 
         Field min_val;
-        data_type->deserializeBinary(min_val, *file);
+        serialization->deserializeBinary(min_val, *file);
         Field max_val;
-        data_type->deserializeBinary(max_val, *file);
+        serialization->deserializeBinary(max_val, *file);
 
         hyperrectangle.emplace_back(min_val, true, max_val, true);
     }
@@ -78,7 +86,13 @@ void IMergeTreeDataPart::MinMaxIndex::load(const MergeTreeData & data, const Dis
 void IMergeTreeDataPart::MinMaxIndex::store(
     const MergeTreeData & data, const DiskPtr & disk_, const String & part_path, Checksums & out_checksums) const
 {
-    store(data.minmax_idx_columns, data.minmax_idx_column_types, disk_, part_path, out_checksums);
+    auto metadata_snapshot = data.getInMemoryMetadataPtr();
+    const auto & partition_key = metadata_snapshot->getPartitionKey();
+
+    auto minmax_column_names = data.getMinMaxColumnsNames(partition_key);
+    auto minmax_column_types = data.getMinMaxColumnsTypes(partition_key);
+
+    store(minmax_column_names, minmax_column_types, disk_, part_path, out_checksums);
 }
 
 void IMergeTreeDataPart::MinMaxIndex::store(
@@ -95,12 +109,12 @@ void IMergeTreeDataPart::MinMaxIndex::store(
     for (size_t i = 0; i < column_names.size(); ++i)
     {
         String file_name = "minmax_" + escapeForFileName(column_names[i]) + ".idx";
-        const DataTypePtr & data_type = data_types.at(i);
+        auto serialization = data_types.at(i)->getDefaultSerialization();
 
         auto out = disk_->writeFile(part_path + file_name);
         HashingWriteBuffer out_hashing(*out);
-        data_type->serializeBinary(hyperrectangle[i].left, out_hashing);
-        data_type->serializeBinary(hyperrectangle[i].right, out_hashing);
+        serialization->serializeBinary(hyperrectangle[i].left, out_hashing);
+        serialization->serializeBinary(hyperrectangle[i].right, out_hashing);
         out_hashing.next();
         out_checksums.files[file_name].file_size = out_hashing.count();
         out_checksums.files[file_name].file_hash = out_hashing.getHash();
@@ -319,40 +333,49 @@ IMergeTreeDataPart::State IMergeTreeDataPart::getState() const
 }
 
 
-DayNum IMergeTreeDataPart::getMinDate() const
+std::pair<DayNum, DayNum> IMergeTreeDataPart::getMinMaxDate() const
 {
     if (storage.minmax_idx_date_column_pos != -1 && minmax_idx.initialized)
-        return DayNum(minmax_idx.hyperrectangle[storage.minmax_idx_date_column_pos].left.get<UInt64>());
+    {
+        const auto & hyperrectangle = minmax_idx.hyperrectangle[storage.minmax_idx_date_column_pos];
+        return {DayNum(hyperrectangle.left.get<UInt64>()), DayNum(hyperrectangle.right.get<UInt64>())};
+    }
     else
-        return DayNum();
+        return {};
 }
 
-
-DayNum IMergeTreeDataPart::getMaxDate() const
-{
-    if (storage.minmax_idx_date_column_pos != -1 && minmax_idx.initialized)
-        return DayNum(minmax_idx.hyperrectangle[storage.minmax_idx_date_column_pos].right.get<UInt64>());
-    else
-        return DayNum();
-}
-
-time_t IMergeTreeDataPart::getMinTime() const
+std::pair<time_t, time_t> IMergeTreeDataPart::getMinMaxTime() const
 {
     if (storage.minmax_idx_time_column_pos != -1 && minmax_idx.initialized)
-        return minmax_idx.hyperrectangle[storage.minmax_idx_time_column_pos].left.get<UInt64>();
+    {
+        const auto & hyperrectangle = minmax_idx.hyperrectangle[storage.minmax_idx_time_column_pos];
+
+        /// The case of DateTime
+        if (hyperrectangle.left.getType() == Field::Types::UInt64)
+        {
+            assert(hyperrectangle.right.getType() == Field::Types::UInt64);
+            return {hyperrectangle.left.get<UInt64>(), hyperrectangle.right.get<UInt64>()};
+        }
+        /// The case of DateTime64
+        else if (hyperrectangle.left.getType() == Field::Types::Decimal64)
+        {
+            assert(hyperrectangle.right.getType() == Field::Types::Decimal64);
+
+            auto left = hyperrectangle.left.get<DecimalField<Decimal64>>();
+            auto right = hyperrectangle.right.get<DecimalField<Decimal64>>();
+
+            assert(left.getScale() == right.getScale());
+
+            return { left.getValue() / left.getScaleMultiplier(), right.getValue() / right.getScaleMultiplier() };
+        }
+        else
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Part minmax index by time is neither DateTime or DateTime64");
+    }
     else
-        return 0;
+        return {};
 }
 
 
-time_t IMergeTreeDataPart::getMaxTime() const
-{
-    if (storage.minmax_idx_time_column_pos != -1 && minmax_idx.initialized)
-        return minmax_idx.hyperrectangle[storage.minmax_idx_time_column_pos].right.get<UInt64>();
-    else
-        return 0;
-}
-
 void IMergeTreeDataPart::setColumns(const NamesAndTypesList & new_columns)
 {
     columns = new_columns;
@@ -393,7 +416,7 @@ void IMergeTreeDataPart::removeIfNeeded()
                 }
             }
 
-            remove();
+            remove(false);
 
             if (state == State::DeleteOnDestroy)
             {
@@ -586,9 +609,13 @@ void IMergeTreeDataPart::loadIndex()
 
         size_t marks_count = index_granularity.getMarksCount();
 
+        Serializations serializations(key_size);
+        for (size_t j = 0; j < key_size; ++j)
+            serializations[j] = primary_key.data_types[j]->getDefaultSerialization();
+
         for (size_t i = 0; i < marks_count; ++i) //-V756
             for (size_t j = 0; j < key_size; ++j)
-                primary_key.data_types[j]->deserializeBinary(*loaded_index[j], *index_file);
+                serializations[j]->deserializeBinary(*loaded_index[j], *index_file);
 
         for (size_t i = 0; i < key_size; ++i)
         {
@@ -679,12 +706,18 @@ CompressionCodecPtr IMergeTreeDataPart::detectDefaultCompressionCodec() const
         auto column_size = getColumnSize(part_column.name, *part_column.type);
         if (column_size.data_compressed != 0 && !storage_columns.hasCompressionCodec(part_column.name))
         {
+            auto serialization = IDataType::getSerialization(part_column,
+                [&](const String & stream_name)
+                {
+                    return volume->getDisk()->exists(stream_name + IMergeTreeDataPart::DATA_FILE_EXTENSION);
+                });
+
             String path_to_data_file;
-            part_column.type->enumerateStreams([&](const IDataType::SubstreamPath & substream_path, const IDataType & /* substream_type */)
+            serialization->enumerateStreams([&](const ISerialization::SubstreamPath & substream_path)
             {
                 if (path_to_data_file.empty())
                 {
-                    String candidate_path = getFullRelativePath() + IDataType::getFileNameForStream(part_column, substream_path) + ".bin";
+                    String candidate_path = getFullRelativePath() + ISerialization::getFileNameForStream(part_column, substream_path) + ".bin";
 
                     /// We can have existing, but empty .bin files. Example: LowCardinality(Nullable(...)) columns and column_name.dict.null.bin file.
                     if (volume->getDisk()->exists(candidate_path) && volume->getDisk()->getFileSize(candidate_path) != 0)
@@ -740,7 +773,8 @@ void IMergeTreeDataPart::loadPartitionAndMinMaxIndex()
 
 void IMergeTreeDataPart::loadChecksums(bool require)
 {
-    String path = getFullRelativePath() + "checksums.txt";
+    const String path = getFullRelativePath() + "checksums.txt";
+
     if (volume->getDisk()->exists(path))
     {
         auto buf = openForReading(volume->getDisk(), path);
@@ -755,12 +789,14 @@ void IMergeTreeDataPart::loadChecksums(bool require)
     else
     {
         if (require)
-            throw Exception("No checksums.txt in part " + name, ErrorCodes::NO_FILE_IN_DATA_PART);
+            throw Exception(ErrorCodes::NO_FILE_IN_DATA_PART, "No checksums.txt in part {}", name);
 
         /// If the checksums file is not present, calculate the checksums and write them to disk.
         /// Check the data while we are at it.
         LOG_WARNING(storage.log, "Checksums for part {} not found. Will calculate them from data on disk.", name);
+
         checksums = checkDataPart(shared_from_this(), false);
+
         {
             auto out = volume->getDisk()->writeFile(getFullRelativePath() + "checksums.txt.tmp", 4096);
             checksums.write(*out);
@@ -923,7 +959,8 @@ void IMergeTreeDataPart::loadColumns(bool require)
     {
         /// We can get list of columns only from columns.txt in compact parts.
         if (require || part_type == Type::COMPACT)
-            throw Exception("No columns.txt in part " + name, ErrorCodes::NO_FILE_IN_DATA_PART);
+            throw Exception("No columns.txt in part " + name + ", expected path " + path + " on drive " + volume->getDisk()->getName(),
+                ErrorCodes::NO_FILE_IN_DATA_PART);
 
         /// If there is no file with a list of columns, write it down.
         for (const NameAndTypePair & column : metadata_snapshot->getColumns().getAllPhysical())
@@ -998,16 +1035,18 @@ void IMergeTreeDataPart::renameTo(const String & new_relative_path, bool remove_
     }
 
     volume->getDisk()->setLastModified(from, Poco::Timestamp::fromEpochTime(time(nullptr)));
-    volume->getDisk()->moveFile(from, to);
+    volume->getDisk()->moveDirectory(from, to);
     relative_path = new_relative_path;
 
     SyncGuardPtr sync_guard;
     if (storage.getSettings()->fsync_part_directory)
         sync_guard = volume->getDisk()->getDirectorySyncGuard(to);
+
+    storage.lockSharedData(*this);
 }
 
 
-void IMergeTreeDataPart::remove() const
+void IMergeTreeDataPart::remove(bool keep_s3) const
 {
     if (!isStoredOnDisk())
         return;
@@ -1037,7 +1076,7 @@ void IMergeTreeDataPart::remove() const
 
         try
         {
-            volume->getDisk()->removeRecursive(to + "/");
+            volume->getDisk()->removeSharedRecursive(to + "/", keep_s3);
         }
         catch (...)
         {
@@ -1048,7 +1087,7 @@ void IMergeTreeDataPart::remove() const
 
     try
     {
-        volume->getDisk()->moveFile(from, to);
+        volume->getDisk()->moveDirectory(from, to);
     }
     catch (const Poco::FileNotFoundException &)
     {
@@ -1060,7 +1099,7 @@ void IMergeTreeDataPart::remove() const
     if (checksums.empty())
     {
         /// If the part is not completely written, we cannot use fast path by listing files.
-        volume->getDisk()->removeRecursive(to + "/");
+        volume->getDisk()->removeSharedRecursive(to + "/", keep_s3);
     }
     else
     {
@@ -1068,21 +1107,21 @@ void IMergeTreeDataPart::remove() const
         {
             /// Remove each expected file in directory, then remove directory itself.
 
-    #if !__clang__
+    #if !defined(__clang__)
     #    pragma GCC diagnostic push
     #    pragma GCC diagnostic ignored "-Wunused-variable"
     #endif
             for (const auto & [file, _] : checksums.files)
-                volume->getDisk()->removeFile(to + "/" + file);
-    #if !__clang__
+                volume->getDisk()->removeSharedFile(to + "/" + file, keep_s3);
+    #if !defined(__clang__)
     #    pragma GCC diagnostic pop
     #endif
 
             for (const auto & file : {"checksums.txt", "columns.txt"})
-                volume->getDisk()->removeFile(to + "/" + file);
+                volume->getDisk()->removeSharedFile(to + "/" + file, keep_s3);
 
-            volume->getDisk()->removeFileIfExists(to + "/" + DEFAULT_COMPRESSION_CODEC_FILE_NAME);
-            volume->getDisk()->removeFileIfExists(to + "/" + DELETE_ON_DESTROY_MARKER_FILE_NAME);
+            volume->getDisk()->removeSharedFileIfExists(to + "/" + DEFAULT_COMPRESSION_CODEC_FILE_NAME, keep_s3);
+            volume->getDisk()->removeSharedFileIfExists(to + "/" + DELETE_ON_DESTROY_MARKER_FILE_NAME, keep_s3);
 
             volume->getDisk()->removeDirectory(to);
         }
@@ -1092,7 +1131,7 @@ void IMergeTreeDataPart::remove() const
 
             LOG_ERROR(storage.log, "Cannot quickly remove directory {} by removing files; fallback to recursive removal. Reason: {}", fullPath(volume->getDisk(), to), getCurrentExceptionMessage(false));
 
-            volume->getDisk()->removeRecursive(to + "/");
+            volume->getDisk()->removeSharedRecursive(to + "/", keep_s3);
         }
     }
 }
@@ -1157,7 +1196,6 @@ void IMergeTreeDataPart::makeCloneOnDisk(const DiskPtr & disk, const String & di
         disk->removeRecursive(path_to_clone + relative_path + '/');
     }
     disk->createDirectories(path_to_clone);
-
     volume->getDisk()->copy(getFullRelativePath(), disk, path_to_clone);
     volume->getDisk()->removeFileIfExists(path_to_clone + '/' + DELETE_ON_DESTROY_MARKER_FILE_NAME);
 }
@@ -1168,6 +1206,7 @@ void IMergeTreeDataPart::checkConsistencyBase() const
 
     auto metadata_snapshot = storage.getInMemoryMetadataPtr();
     const auto & pk = metadata_snapshot->getPrimaryKey();
+    const auto & partition_key = metadata_snapshot->getPartitionKey();
     if (!checksums.empty())
     {
         if (!pk.column_names.empty() && !checksums.files.count("primary.idx"))
@@ -1183,7 +1222,7 @@ void IMergeTreeDataPart::checkConsistencyBase() const
 
             if (!isEmpty())
             {
-                for (const String & col_name : storage.minmax_idx_columns)
+                for (const String & col_name : storage.getMinMaxColumnsNames(partition_key))
                 {
                     if (!checksums.files.count("minmax_" + escapeForFileName(col_name) + ".idx"))
                         throw Exception("No minmax idx file checksum for column " + col_name, ErrorCodes::NO_FILE_IN_DATA_PART);
@@ -1214,7 +1253,7 @@ void IMergeTreeDataPart::checkConsistencyBase() const
             if (metadata_snapshot->hasPartitionKey())
                 check_file_not_empty(volume->getDisk(), path + "partition.dat");
 
-            for (const String & col_name : storage.minmax_idx_columns)
+            for (const String & col_name : storage.getMinMaxColumnsNames(partition_key))
                 check_file_not_empty(volume->getDisk(), path + "minmax_" + escapeForFileName(col_name) + ".idx");
         }
     }
@@ -1293,6 +1332,48 @@ bool IMergeTreeDataPart::checkAllTTLCalculated(const StorageMetadataPtr & metada
     return true;
 }
 
+SerializationPtr IMergeTreeDataPart::getSerializationForColumn(const NameAndTypePair & column) const
+{
+    return IDataType::getSerialization(column,
+        [&](const String & stream_name)
+        {
+            return checksums.files.count(stream_name + DATA_FILE_EXTENSION) != 0;
+        });
+}
+
+String IMergeTreeDataPart::getUniqueId() const
+{
+    String id;
+
+    auto disk = volume->getDisk();
+
+    if (disk->getType() == DB::DiskType::Type::S3)
+        id = disk->getUniqueId(getFullRelativePath() + "checksums.txt");
+
+    if (id.empty())
+        throw Exception("Can't get unique S3 object", ErrorCodes::LOGICAL_ERROR);
+
+    return id;
+}
+
+
+String IMergeTreeDataPart::getZeroLevelPartBlockID() const
+{
+    if (info.level != 0)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Trying to get block id for non zero level part {}", name);
+
+    SipHash hash;
+    checksums.computeTotalChecksumDataOnly(hash);
+    union
+    {
+        char bytes[16];
+        UInt64 words[2];
+    } hash_value;
+    hash.get128(hash_value.bytes);
+
+    return info.partition_id + "_" + toString(hash_value.words[0]) + "_" + toString(hash_value.words[1]);
+}
+
 bool isCompactPart(const MergeTreeDataPartPtr & data_part)
 {
     return (data_part && data_part->getType() == MergeTreeDataPartType::COMPACT);
diff --git a/src/Storages/MergeTree/IMergeTreeDataPart.h b/src/Storages/MergeTree/IMergeTreeDataPart.h
index 2f531bd8391..4e531826c98 100644
--- a/src/Storages/MergeTree/IMergeTreeDataPart.h
+++ b/src/Storages/MergeTree/IMergeTreeDataPart.h
@@ -16,12 +16,17 @@
 #include <Storages/MergeTree/MergeTreeDataPartTTLInfo.h>
 #include <Storages/MergeTree/MergeTreeIOSettings.h>
 #include <Storages/MergeTree/KeyCondition.h>
-#include <Columns/IColumn.h>
 
 #include <Poco/Path.h>
 
 #include <shared_mutex>
 
+namespace zkutil
+{
+    class ZooKeeper;
+    using ZooKeeperPtr = std::shared_ptr<ZooKeeper>;
+}
+
 namespace DB
 {
 
@@ -48,6 +53,8 @@ namespace ErrorCodes
 class IMergeTreeDataPart : public std::enable_shared_from_this<IMergeTreeDataPart>
 {
 public:
+    static constexpr auto DATA_FILE_EXTENSION = ".bin";
+
     using Checksums = MergeTreeDataPartChecksums;
     using Checksum = MergeTreeDataPartChecksums::Checksum;
     using ValueSizeMap = std::map<std::string, double>;
@@ -56,7 +63,7 @@ public:
     using MergeTreeWriterPtr = std::unique_ptr<IMergeTreeDataPartWriter>;
 
     using ColumnSizeByName = std::unordered_map<std::string, ColumnSize>;
-    using NameToPosition = std::unordered_map<std::string, size_t>;
+    using NameToNumber = std::unordered_map<std::string, size_t>;
 
     using Type = MergeTreeDataPartType;
 
@@ -124,7 +131,7 @@ public:
     /// Throws an exception if part is not stored in on-disk format.
     void assertOnDisk() const;
 
-    void remove() const;
+    void remove(bool keep_s3 = false) const;
 
     /// Initialize columns (from columns.txt if exists, or create from column files if not).
     /// Load checksums from checksums.txt if exists. Load index if required.
@@ -149,16 +156,17 @@ public:
 
     bool contains(const IMergeTreeDataPart & other) const { return info.contains(other.info); }
 
-    /// If the partition key includes date column (a common case), these functions will return min and max values for this column.
-    DayNum getMinDate() const;
-    DayNum getMaxDate() const;
+    /// If the partition key includes date column (a common case), this function will return min and max values for that column.
+    std::pair<DayNum, DayNum> getMinMaxDate() const;
 
-    /// otherwise, if the partition key includes dateTime column (also a common case), these functions will return min and max values for this column.
-    time_t getMinTime() const;
-    time_t getMaxTime() const;
+    /// otherwise, if the partition key includes dateTime column (also a common case), this function will return min and max values for that column.
+    std::pair<time_t, time_t> getMinMaxTime() const;
 
     bool isEmpty() const { return rows_count == 0; }
 
+    /// Compute part block id for zero level part. Otherwise throws an exception.
+    String getZeroLevelPartBlockID() const;
+
     const MergeTreeData & storage;
 
     String name;
@@ -198,8 +206,8 @@ public:
      *
      * Possible state transitions:
      * Temporary -> Precommitted:   we are trying to commit a fetched, inserted or merged part to active set
-     * Precommitted -> Outdated:    we could not to add a part to active set and doing a rollback (for example it is duplicated part)
-     * Precommitted -> Committed:    we successfully committed a part to active dataset
+     * Precommitted -> Outdated:    we could not add a part to active set and are doing a rollback (for example it is duplicated part)
+     * Precommitted -> Committed:   we successfully committed a part to active dataset
      * Precommitted -> Outdated:    a part was replaced by a covering part or DROP PARTITION
      * Outdated -> Deleting:        a cleaner selected this part for deletion
      * Deleting -> Outdated:        if an ZooKeeper error occurred during the deletion, we will retry deletion
@@ -361,6 +369,13 @@ public:
     /// part creation (using alter query with materialize_ttl setting).
     bool checkAllTTLCalculated(const StorageMetadataPtr & metadata_snapshot) const;
 
+    /// Returns serialization for column according to files in which column is written in part.
+    SerializationPtr getSerializationForColumn(const NameAndTypePair & column) const;
+
+    /// Return some uniq string for file
+    /// Required for distinguish different copies of the same part on S3
+    String getUniqueId() const;
+
 protected:
 
     /// Total size of all columns, calculated once in calcuateColumnSizesOnDisk
@@ -390,7 +405,7 @@ protected:
 
 private:
     /// In compact parts order of columns is necessary
-    NameToPosition column_name_to_position;
+    NameToNumber column_name_to_position;
 
     /// Reads part unique identifier (if exists) from uuid.txt
     void loadUUID();
diff --git a/src/Storages/MergeTree/IMergeTreeReader.cpp b/src/Storages/MergeTree/IMergeTreeReader.cpp
index f28ca28b124..52d3e7ca9ab 100644
--- a/src/Storages/MergeTree/IMergeTreeReader.cpp
+++ b/src/Storages/MergeTree/IMergeTreeReader.cpp
@@ -187,10 +187,12 @@ void IMergeTreeReader::evaluateMissingDefaults(Block additional_columns, Columns
         }
 
         auto dag = DB::evaluateMissingDefaults(
-                additional_columns, columns, metadata_snapshot->getColumns(), storage.global_context);
+                additional_columns, columns, metadata_snapshot->getColumns(), storage.getContext());
         if (dag)
         {
-            auto actions = std::make_shared<ExpressionActions>(std::move(dag));
+            auto actions = std::make_shared<
+                ExpressionActions>(std::move(dag),
+                ExpressionActionsSettings::fromSettings(storage.getContext()->getSettingsRef()));
             actions->execute(additional_columns);
         }
 
@@ -229,8 +231,9 @@ NameAndTypePair IMergeTreeReader::getColumnFromPart(const NameAndTypePair & requ
     {
         auto subcolumn_name = required_column.getSubcolumnName();
         auto subcolumn_type = it->second->tryGetSubcolumnType(subcolumn_name);
+
         if (!subcolumn_type)
-            subcolumn_type = required_column.type;
+            return required_column;
 
         return {it->first, subcolumn_name, it->second, subcolumn_type};
     }
@@ -267,7 +270,7 @@ void IMergeTreeReader::performRequiredConversions(Columns & res_columns)
             copy_block.insert({res_columns[pos], getColumnFromPart(*name_and_type).type, name_and_type->name});
         }
 
-        DB::performRequiredConversions(copy_block, columns, storage.global_context);
+        DB::performRequiredConversions(copy_block, columns, storage.getContext());
 
         /// Move columns from block.
         name_and_type = columns.begin();
diff --git a/src/Storages/MergeTree/IMergeTreeReader.h b/src/Storages/MergeTree/IMergeTreeReader.h
index d192339432f..0771bc3d5cb 100644
--- a/src/Storages/MergeTree/IMergeTreeReader.h
+++ b/src/Storages/MergeTree/IMergeTreeReader.h
@@ -16,7 +16,7 @@ class IMergeTreeReader : private boost::noncopyable
 {
 public:
     using ValueSizeMap = std::map<std::string, double>;
-    using DeserializeBinaryBulkStateMap = std::map<std::string, IDataType::DeserializeBinaryBulkStatePtr>;
+    using DeserializeBinaryBulkStateMap = std::map<std::string, ISerialization::DeserializeBinaryBulkStatePtr>;
 
     IMergeTreeReader(
         const MergeTreeData::DataPartPtr & data_part_,
diff --git a/src/Storages/MergeTree/IMergedBlockOutputStream.cpp b/src/Storages/MergeTree/IMergedBlockOutputStream.cpp
index 7e562ae03d6..e334cd486ef 100644
--- a/src/Storages/MergeTree/IMergedBlockOutputStream.cpp
+++ b/src/Storages/MergeTree/IMergedBlockOutputStream.cpp
@@ -30,10 +30,11 @@ NameSet IMergedBlockOutputStream::removeEmptyColumnsFromPart(
     std::map<String, size_t> stream_counts;
     for (const NameAndTypePair & column : columns)
     {
-        column.type->enumerateStreams(
-            [&](const IDataType::SubstreamPath & substream_path, const IDataType & /* substream_path */)
+        auto serialization = data_part->getSerializationForColumn(column);
+        serialization->enumerateStreams(
+            [&](const ISerialization::SubstreamPath & substream_path)
             {
-                ++stream_counts[IDataType::getFileNameForStream(column, substream_path)];
+                ++stream_counts[ISerialization::getFileNameForStream(column, substream_path)];
             },
             {});
     }
@@ -46,9 +47,9 @@ NameSet IMergedBlockOutputStream::removeEmptyColumnsFromPart(
         if (!column_with_type)
            continue;
 
-        IDataType::StreamCallback callback = [&](const IDataType::SubstreamPath & substream_path, const IDataType & /* substream_path */)
+        ISerialization::StreamCallback callback = [&](const ISerialization::SubstreamPath & substream_path)
         {
-            String stream_name = IDataType::getFileNameForStream(*column_with_type, substream_path);
+            String stream_name = ISerialization::getFileNameForStream(*column_with_type, substream_path);
             /// Delete files if they are no longer shared with another column.
             if (--stream_counts[stream_name] == 0)
             {
@@ -57,8 +58,8 @@ NameSet IMergedBlockOutputStream::removeEmptyColumnsFromPart(
             }
         };
 
-        IDataType::SubstreamPath stream_path;
-        column_with_type->type->enumerateStreams(callback, stream_path);
+        auto serialization = data_part->getSerializationForColumn(*column_with_type);
+        serialization->enumerateStreams(callback);
     }
 
     /// Remove files on disk and checksums
diff --git a/src/Storages/MergeTree/IMergedBlockOutputStream.h b/src/Storages/MergeTree/IMergedBlockOutputStream.h
index ed8da4d334b..b2ad5309017 100644
--- a/src/Storages/MergeTree/IMergedBlockOutputStream.h
+++ b/src/Storages/MergeTree/IMergedBlockOutputStream.h
@@ -24,9 +24,9 @@ public:
     }
 
 protected:
-    using SerializationState = IDataType::SerializeBinaryBulkStatePtr;
+    // using SerializationState = ISerialization::SerializeBinaryBulkStatePtr;
 
-    IDataType::OutputStreamGetter createStreamGetter(const String & name, WrittenOffsetColumns & offset_columns);
+    // ISerialization::OutputStreamGetter createStreamGetter(const String & name, WrittenOffsetColumns & offset_columns);
 
     /// Remove all columns marked expired in data_part. Also, clears checksums
     /// and columns array. Return set of removed files names.
diff --git a/src/Storages/MergeTree/KeyCondition.cpp b/src/Storages/MergeTree/KeyCondition.cpp
index 8f5dec8077d..da36b7008bd 100644
--- a/src/Storages/MergeTree/KeyCondition.cpp
+++ b/src/Storages/MergeTree/KeyCondition.cpp
@@ -309,11 +309,11 @@ static const std::map<std::string, std::string> inverse_relations = {
 
 bool isLogicalOperator(const String & func_name)
 {
-    return (func_name == "and" || func_name == "or" || func_name == "not");
+    return (func_name == "and" || func_name == "or" || func_name == "not" || func_name == "indexHint");
 }
 
 /// The node can be one of:
-///   - Logical operator (AND, OR, NOT)
+///   - Logical operator (AND, OR, NOT and indexHint() - logical NOOP)
 ///   - An "atom" (relational operator, constant, expression)
 ///   - A logical constant expression
 ///   - Any other function
@@ -330,7 +330,8 @@ ASTPtr cloneASTWithInversionPushDown(const ASTPtr node, const bool need_inversio
 
         const auto result_node = makeASTFunction(func->name);
 
-        if (need_inversion)
+        /// indexHint() is a special case - logical NOOP function
+        if (result_node->name != "indexHint" && need_inversion)
         {
             result_node->name = (result_node->name == "and") ? "or" : "and";
         }
@@ -370,7 +371,7 @@ inline bool Range::less(const Field & lhs, const Field & rhs) { return applyVisi
   * For index to work when something like "WHERE Date = toDate(now())" is written.
   */
 Block KeyCondition::getBlockWithConstants(
-    const ASTPtr & query, const TreeRewriterResultPtr & syntax_analyzer_result, const Context & context)
+    const ASTPtr & query, const TreeRewriterResultPtr & syntax_analyzer_result, ContextPtr context)
 {
     Block result
     {
@@ -387,7 +388,7 @@ Block KeyCondition::getBlockWithConstants(
 
 KeyCondition::KeyCondition(
     const SelectQueryInfo & query_info,
-    const Context & context,
+    ContextPtr context,
     const Names & key_column_names,
     const ExpressionActionsPtr & key_expr_,
     bool single_point_,
@@ -444,7 +445,8 @@ bool KeyCondition::addCondition(const String & column, const Range & range)
   */
 bool KeyCondition::getConstant(const ASTPtr & expr, Block & block_with_constants, Field & out_value, DataTypePtr & out_type)
 {
-    String column_name = expr->getColumnNameWithoutAlias();
+    // Constant expr should use alias names if any
+    String column_name = expr->getColumnName();
 
     if (const auto * lit = expr->as<ASTLiteral>())
     {
@@ -555,7 +557,7 @@ static FieldRef applyFunction(const FunctionBasePtr & func, const DataTypePtr &
     return {field.columns, field.row_idx, result_idx};
 }
 
-void KeyCondition::traverseAST(const ASTPtr & node, const Context & context, Block & block_with_constants)
+void KeyCondition::traverseAST(const ASTPtr & node, ContextPtr context, Block & block_with_constants)
 {
     RPNElement element;
 
@@ -607,7 +609,8 @@ bool KeyCondition::canConstantBeWrappedByMonotonicFunctions(
     if (strict)
         return false;
 
-    String expr_name = node->getColumnNameWithoutAlias();
+    // Constant expr should use alias names if any
+    String expr_name = node->getColumnName();
     const auto & sample_block = key_expr->getSampleBlock();
     if (!sample_block.has(expr_name))
         return false;
@@ -675,7 +678,8 @@ bool KeyCondition::canConstantBeWrappedByFunctions(
     if (strict)
         return false;
 
-    String expr_name = ast->getColumnNameWithoutAlias();
+    // Constant expr should use alias names if any
+    String expr_name = ast->getColumnName();
     const auto & sample_block = key_expr->getSampleBlock();
     if (!sample_block.has(expr_name))
         return false;
@@ -783,7 +787,7 @@ bool KeyCondition::canConstantBeWrappedByFunctions(
 
 bool KeyCondition::tryPrepareSetIndex(
     const ASTs & args,
-    const Context & context,
+    ContextPtr context,
     RPNElement & out,
     size_t & out_key_column_num)
 {
@@ -935,6 +939,9 @@ public:
         return func->getMonotonicityForRange(type, left, right);
     }
 
+    Kind getKind() const { return kind; }
+    const ColumnWithTypeAndName & getConstArg() const { return const_arg; }
+
 private:
     FunctionBasePtr func;
     ColumnWithTypeAndName const_arg;
@@ -944,7 +951,7 @@ private:
 
 bool KeyCondition::isKeyPossiblyWrappedByMonotonicFunctions(
     const ASTPtr & node,
-    const Context & context,
+    ContextPtr context,
     size_t & out_key_column_num,
     DataTypePtr & out_key_res_column_type,
     MonotonicFunctionsChain & out_functions_chain)
@@ -959,6 +966,8 @@ bool KeyCondition::isKeyPossiblyWrappedByMonotonicFunctions(
     {
         const auto & args = (*it)->arguments->children;
         auto func_builder = FunctionFactory::instance().tryGet((*it)->name, context);
+        if (!func_builder)
+            return false;
         ColumnsWithTypeAndName arguments;
         ColumnWithTypeAndName const_arg;
         FunctionWithOptionalConstArg::Kind kind = FunctionWithOptionalConstArg::Kind::NO_CONST;
@@ -1011,6 +1020,8 @@ bool KeyCondition::isKeyPossiblyWrappedByMonotonicFunctionsImpl(
       * Therefore, use the full name of the expression for search.
       */
     const auto & sample_block = key_expr->getSampleBlock();
+
+    // Key columns should use canonical names for index analysis
     String name = node->getColumnNameWithoutAlias();
 
     auto it = key_columns.find(name);
@@ -1070,7 +1081,7 @@ static void castValueToType(const DataTypePtr & desired_type, Field & src_value,
 }
 
 
-bool KeyCondition::tryParseAtomFromAST(const ASTPtr & node, const Context & context, Block & block_with_constants, RPNElement & out)
+bool KeyCondition::tryParseAtomFromAST(const ASTPtr & node, ContextPtr context, Block & block_with_constants, RPNElement & out)
 {
     /** Functions < > = != <= >= in `notIn`, where one argument is a constant, and the other is one of columns of key,
       *  or itself, wrapped in a chain of possibly-monotonic functions,
@@ -1269,6 +1280,8 @@ bool KeyCondition::tryParseAtomFromAST(const ASTPtr & node, const Context & cont
 bool KeyCondition::tryParseLogicalOperatorFromAST(const ASTFunction * func, RPNElement & out)
 {
     /// Functions AND, OR, NOT.
+    /// Also a special function `indexHint` - works as if instead of calling a function there are just parentheses
+    /// (or, the same thing - calling the function `and` from one argument).
     const ASTs & args = func->arguments->children;
 
     if (func->name == "not")
@@ -1280,7 +1293,7 @@ bool KeyCondition::tryParseLogicalOperatorFromAST(const ASTFunction * func, RPNE
     }
     else
     {
-        if (func->name == "and")
+        if (func->name == "and" || func->name == "indexHint")
             out.function = RPNElement::FUNCTION_AND;
         else if (func->name == "or")
             out.function = RPNElement::FUNCTION_OR;
@@ -1303,6 +1316,235 @@ String KeyCondition::toString() const
     return res;
 }
 
+KeyCondition::Description KeyCondition::getDescription() const
+{
+    /// This code may seem to be too difficult.
+    /// Here we want to convert RPN back to tree, and also simplify some logical expressions like `and(x, true) -> x`.
+    Description description;
+
+    /// That's a binary tree. Explicit.
+    /// Build and optimize it simultaneously.
+    struct Node
+    {
+        enum class Type
+        {
+            /// Leaf, which is RPNElement.
+            Leaf,
+            /// Leafs, which are logical constants.
+            True,
+            False,
+            /// Binary operators.
+            And,
+            Or,
+        };
+
+        Type type;
+
+        /// Only for Leaf
+        const RPNElement * element = nullptr;
+        /// This means that logical NOT is applied to leaf.
+        bool negate = false;
+
+        std::unique_ptr<Node> left = nullptr;
+        std::unique_ptr<Node> right = nullptr;
+    };
+
+    /// The algorithm is the same as in KeyCondition::checkInHyperrectangle
+    /// We build a pair of trees on stack. For checking if key condition may be true, and if it may be false.
+    /// We need only `can_be_true` in result.
+    struct Frame
+    {
+        std::unique_ptr<Node> can_be_true;
+        std::unique_ptr<Node> can_be_false;
+    };
+
+    /// Combine two subtrees using logical operator.
+    auto combine = [](std::unique_ptr<Node> left, std::unique_ptr<Node> right, Node::Type type)
+    {
+        /// Simplify operators with for one constant condition.
+
+        if (type == Node::Type::And)
+        {
+            /// false AND right
+            if (left->type == Node::Type::False)
+                return left;
+
+            /// left AND false
+            if (right->type == Node::Type::False)
+                return right;
+
+            /// true AND right
+            if (left->type == Node::Type::True)
+                return right;
+
+            /// left AND true
+            if (right->type == Node::Type::True)
+                return left;
+        }
+
+        if (type == Node::Type::Or)
+        {
+            /// false OR right
+            if (left->type == Node::Type::False)
+                return right;
+
+            /// left OR false
+            if (right->type == Node::Type::False)
+                return left;
+
+            /// true OR right
+            if (left->type == Node::Type::True)
+                return left;
+
+            /// left OR true
+            if (right->type == Node::Type::True)
+                return right;
+        }
+
+        return std::make_unique<Node>(Node{
+                .type = type,
+                .left = std::move(left),
+                .right = std::move(right)
+            });
+    };
+
+    std::vector<Frame> rpn_stack;
+    for (const auto & element : rpn)
+    {
+        if (element.function == RPNElement::FUNCTION_UNKNOWN)
+        {
+            auto can_be_true = std::make_unique<Node>(Node{.type = Node::Type::True});
+            auto can_be_false = std::make_unique<Node>(Node{.type = Node::Type::True});
+            rpn_stack.emplace_back(Frame{.can_be_true = std::move(can_be_true), .can_be_false = std::move(can_be_false)});
+        }
+        else if (
+               element.function == RPNElement::FUNCTION_IN_RANGE
+            || element.function == RPNElement::FUNCTION_NOT_IN_RANGE
+            || element.function == RPNElement::FUNCTION_IN_SET
+            || element.function == RPNElement::FUNCTION_NOT_IN_SET)
+        {
+            auto can_be_true = std::make_unique<Node>(Node{.type = Node::Type::Leaf, .element = &element, .negate = false});
+            auto can_be_false = std::make_unique<Node>(Node{.type = Node::Type::Leaf, .element = &element, .negate = true});
+            rpn_stack.emplace_back(Frame{.can_be_true = std::move(can_be_true), .can_be_false = std::move(can_be_false)});
+        }
+        else if (element.function == RPNElement::FUNCTION_NOT)
+        {
+            assert(!rpn_stack.empty());
+
+            std::swap(rpn_stack.back().can_be_true, rpn_stack.back().can_be_false);
+        }
+        else if (element.function == RPNElement::FUNCTION_AND)
+        {
+            assert(!rpn_stack.empty());
+            auto arg1 = std::move(rpn_stack.back());
+
+            rpn_stack.pop_back();
+
+            assert(!rpn_stack.empty());
+            auto arg2 = std::move(rpn_stack.back());
+
+            Frame frame;
+            frame.can_be_true = combine(std::move(arg1.can_be_true), std::move(arg2.can_be_true), Node::Type::And);
+            frame.can_be_false = combine(std::move(arg1.can_be_false), std::move(arg2.can_be_false), Node::Type::Or);
+
+            rpn_stack.back() = std::move(frame);
+        }
+        else if (element.function == RPNElement::FUNCTION_OR)
+        {
+            assert(!rpn_stack.empty());
+            auto arg1 = std::move(rpn_stack.back());
+
+            rpn_stack.pop_back();
+
+            assert(!rpn_stack.empty());
+            auto arg2 = std::move(rpn_stack.back());
+
+            Frame frame;
+            frame.can_be_true = combine(std::move(arg1.can_be_true), std::move(arg2.can_be_true), Node::Type::Or);
+            frame.can_be_false = combine(std::move(arg1.can_be_false), std::move(arg2.can_be_false), Node::Type::And);
+
+            rpn_stack.back() = std::move(frame);
+        }
+        else if (element.function == RPNElement::ALWAYS_FALSE)
+        {
+            auto can_be_true = std::make_unique<Node>(Node{.type = Node::Type::False});
+            auto can_be_false = std::make_unique<Node>(Node{.type = Node::Type::True});
+
+            rpn_stack.emplace_back(Frame{.can_be_true = std::move(can_be_true), .can_be_false = std::move(can_be_false)});
+        }
+        else if (element.function == RPNElement::ALWAYS_TRUE)
+        {
+            auto can_be_true = std::make_unique<Node>(Node{.type = Node::Type::True});
+            auto can_be_false = std::make_unique<Node>(Node{.type = Node::Type::False});
+            rpn_stack.emplace_back(Frame{.can_be_true = std::move(can_be_true), .can_be_false = std::move(can_be_false)});
+        }
+        else
+            throw Exception("Unexpected function type in KeyCondition::RPNElement", ErrorCodes::LOGICAL_ERROR);
+    }
+
+    if (rpn_stack.size() != 1)
+        throw Exception("Unexpected stack size in KeyCondition::checkInRange", ErrorCodes::LOGICAL_ERROR);
+
+    std::vector<std::string_view> key_names(key_columns.size());
+    std::vector<bool> is_key_used(key_columns.size(), false);
+
+    for (const auto & key : key_columns)
+        key_names[key.second] = key.first;
+
+    WriteBufferFromOwnString buf;
+
+    std::function<void(const Node *)> describe;
+    describe = [&describe, &key_names, &is_key_used, &buf](const Node * node)
+    {
+        switch (node->type)
+        {
+            case Node::Type::Leaf:
+            {
+                is_key_used[node->element->key_column] = true;
+
+                /// Note: for condition with double negation, like `not(x not in set)`,
+                /// we can replace it to `x in set` here.
+                /// But I won't do it, because `cloneASTWithInversionPushDown` already push down `not`.
+                /// So, this seem to be impossible for `can_be_true` tree.
+                if (node->negate)
+                    buf << "not(";
+                buf << node->element->toString(key_names[node->element->key_column], true);
+                if (node->negate)
+                    buf << ")";
+                break;
+            }
+            case Node::Type::True:
+                buf << "true";
+                break;
+            case Node::Type::False:
+                buf << "false";
+                break;
+            case Node::Type::And:
+                buf << "and(";
+                describe(node->left.get());
+                buf << ", ";
+                describe(node->right.get());
+                buf << ")";
+                break;
+            case Node::Type::Or:
+                buf << "or(";
+                describe(node->left.get());
+                buf << ", ";
+                describe(node->right.get());
+                buf << ")";
+                break;
+        }
+    };
+
+    describe(rpn_stack.front().can_be_true.get());
+    description.condition = std::move(buf.str());
+
+    for (size_t i = 0; i < key_names.size(); ++i)
+        if (is_key_used[i])
+            description.used_keys.emplace_back(key_names[i]);
+
+    return description;
+}
 
 /** Index is the value of key every `index_granularity` rows.
   * This value is called a "mark". That is, the index consists of marks.
@@ -1321,11 +1563,12 @@ String KeyCondition::toString() const
   * The set of all possible tuples can be considered as an n-dimensional space, where n is the size of the tuple.
   * A range of tuples specifies some subset of this space.
   *
-  * Hyperrectangles (you can also find the term "rail")
-  *  will be the subrange of an n-dimensional space that is a direct product of one-dimensional ranges.
-  * In this case, the one-dimensional range can be: a period, a segment, an interval, a half-interval, unlimited on the left, unlimited on the right ...
+  * Hyperrectangles will be the subrange of an n-dimensional space that is a direct product of one-dimensional ranges.
+  * In this case, the one-dimensional range can be:
+  * a point, a segment, an open interval, a half-open interval;
+  * unlimited on the left, unlimited on the right ...
   *
-  * The range of tuples can always be represented as a combination of hyperrectangles.
+  * The range of tuples can always be represented as a combination (union) of hyperrectangles.
   * For example, the range [ x1 y1 .. x2 y2 ] given x1 != x2 is equal to the union of the following three hyperrectangles:
   * [x1]       x [y1 .. +inf)
   * (x1 .. x2) x (-inf .. +inf)
@@ -1727,18 +1970,38 @@ bool KeyCondition::mayBeTrueAfter(
     return checkInRange(used_key_size, left_key, nullptr, data_types, false, BoolMask::consider_only_can_be_true).can_be_true;
 }
 
-
-String KeyCondition::RPNElement::toString() const
+String KeyCondition::RPNElement::toString() const { return toString("column " + std::to_string(key_column), false); }
+String KeyCondition::RPNElement::toString(const std::string_view & column_name, bool print_constants) const
 {
-    auto print_wrapped_column = [this](WriteBuffer & buf)
+    auto print_wrapped_column = [this, &column_name, print_constants](WriteBuffer & buf)
     {
         for (auto it = monotonic_functions_chain.rbegin(); it != monotonic_functions_chain.rend(); ++it)
+        {
             buf << (*it)->getName() << "(";
+            if (print_constants)
+            {
+                if (const auto * func = typeid_cast<const FunctionWithOptionalConstArg *>(it->get()))
+                {
+                    if (func->getKind() == FunctionWithOptionalConstArg::Kind::LEFT_CONST)
+                        buf << applyVisitor(FieldVisitorToString(), (*func->getConstArg().column)[0]) << ", ";
+                }
+            }
+        }
 
-        buf << "column " << key_column;
+        buf << column_name;
 
         for (auto it = monotonic_functions_chain.rbegin(); it != monotonic_functions_chain.rend(); ++it)
+        {
+            if (print_constants)
+            {
+                if (const auto * func = typeid_cast<const FunctionWithOptionalConstArg *>(it->get()))
+                {
+                    if (func->getKind() == FunctionWithOptionalConstArg::Kind::RIGHT_CONST)
+                        buf << ", " << applyVisitor(FieldVisitorToString(), (*func->getConstArg().column)[0]);
+                }
+            }
             buf << ")";
+        }
     };
 
     WriteBufferFromOwnString buf;
diff --git a/src/Storages/MergeTree/KeyCondition.h b/src/Storages/MergeTree/KeyCondition.h
index b8167f406bd..bd51769ad1f 100644
--- a/src/Storages/MergeTree/KeyCondition.h
+++ b/src/Storages/MergeTree/KeyCondition.h
@@ -229,7 +229,7 @@ public:
     /// Does not take into account the SAMPLE section. all_columns - the set of all columns of the table.
     KeyCondition(
         const SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         const Names & key_column_names,
         const ExpressionActionsPtr & key_expr,
         bool single_point_ = false,
@@ -293,6 +293,16 @@ public:
 
     String toString() const;
 
+    /// Condition description for EXPLAIN query.
+    struct Description
+    {
+        /// Which columns from PK were used, in PK order.
+        std::vector<std::string> used_keys;
+        /// Condition which was applied, mostly human-readable.
+        std::string condition;
+    };
+
+    Description getDescription() const;
 
     /** A chain of possibly monotone functions.
       * If the key column is wrapped in functions that can be monotonous in some value ranges
@@ -307,7 +317,7 @@ public:
             const ASTPtr & expr, Block & block_with_constants, Field & out_value, DataTypePtr & out_type);
 
     static Block getBlockWithConstants(
-        const ASTPtr & query, const TreeRewriterResultPtr & syntax_analyzer_result, const Context & context);
+        const ASTPtr & query, const TreeRewriterResultPtr & syntax_analyzer_result, ContextPtr context);
 
     static std::optional<Range> applyMonotonicFunctionsChainToRange(
         Range key_range,
@@ -345,6 +355,7 @@ private:
             : function(function_), range(range_), key_column(key_column_) {}
 
         String toString() const;
+        String toString(const std::string_view & column_name, bool print_constants) const;
 
         Function function = FUNCTION_UNKNOWN;
 
@@ -375,8 +386,8 @@ private:
         bool right_bounded,
         BoolMask initial_mask) const;
 
-    void traverseAST(const ASTPtr & node, const Context & context, Block & block_with_constants);
-    bool tryParseAtomFromAST(const ASTPtr & node, const Context & context, Block & block_with_constants, RPNElement & out);
+    void traverseAST(const ASTPtr & node, ContextPtr context, Block & block_with_constants);
+    bool tryParseAtomFromAST(const ASTPtr & node, ContextPtr context, Block & block_with_constants, RPNElement & out);
     static bool tryParseLogicalOperatorFromAST(const ASTFunction * func, RPNElement & out);
 
     /** Is node the key column
@@ -387,7 +398,7 @@ private:
       */
     bool isKeyPossiblyWrappedByMonotonicFunctions(
         const ASTPtr & node,
-        const Context & context,
+        ContextPtr context,
         size_t & out_key_column_num,
         DataTypePtr & out_key_res_column_type,
         MonotonicFunctionsChain & out_functions_chain);
@@ -413,7 +424,7 @@ private:
     /// do it and return true.
     bool tryPrepareSetIndex(
         const ASTs & args,
-        const Context & context,
+        ContextPtr context,
         RPNElement & out,
         size_t & out_key_column_num);
 
diff --git a/src/Storages/MergeTree/MergeTreeBaseSelectProcessor.cpp b/src/Storages/MergeTree/MergeTreeBaseSelectProcessor.cpp
index ce60856505e..41ad71c89ce 100644
--- a/src/Storages/MergeTree/MergeTreeBaseSelectProcessor.cpp
+++ b/src/Storages/MergeTree/MergeTreeBaseSelectProcessor.cpp
@@ -30,7 +30,7 @@ MergeTreeBaseSelectProcessor::MergeTreeBaseSelectProcessor(
     const MergeTreeReaderSettings & reader_settings_,
     bool use_uncompressed_cache_,
     const Names & virt_column_names_)
-    : SourceWithProgress(getHeader(std::move(header), prewhere_info_, virt_column_names_))
+    : SourceWithProgress(transformHeader(std::move(header), prewhere_info_, virt_column_names_))
     , storage(storage_)
     , metadata_snapshot(metadata_snapshot_)
     , prewhere_info(prewhere_info_)
@@ -337,12 +337,28 @@ void MergeTreeBaseSelectProcessor::executePrewhereActions(Block & block, const P
         if (prewhere_info->alias_actions)
             prewhere_info->alias_actions->execute(block);
 
-        prewhere_info->prewhere_actions->execute(block);
-        auto & prewhere_column = block.getByName(prewhere_info->prewhere_column_name);
+        if (prewhere_info->row_level_filter)
+        {
+            prewhere_info->row_level_filter->execute(block);
+            auto & row_level_column = block.getByName(prewhere_info->row_level_column_name);
+            if (!row_level_column.type->canBeUsedInBooleanContext())
+            {
+                throw Exception("Invalid type for filter in PREWHERE: " + row_level_column.type->getName(),
+                    ErrorCodes::LOGICAL_ERROR);
+            }
 
+            block.erase(prewhere_info->row_level_column_name);
+        }
+
+        if (prewhere_info->prewhere_actions)
+            prewhere_info->prewhere_actions->execute(block);
+
+        auto & prewhere_column = block.getByName(prewhere_info->prewhere_column_name);
         if (!prewhere_column.type->canBeUsedInBooleanContext())
+        {
             throw Exception("Invalid type for filter in PREWHERE: " + prewhere_column.type->getName(),
-                            ErrorCodes::LOGICAL_ERROR);
+                ErrorCodes::LOGICAL_ERROR);
+        }
 
         if (prewhere_info->remove_prewhere_column)
             block.erase(prewhere_info->prewhere_column_name);
@@ -354,7 +370,7 @@ void MergeTreeBaseSelectProcessor::executePrewhereActions(Block & block, const P
     }
 }
 
-Block MergeTreeBaseSelectProcessor::getHeader(
+Block MergeTreeBaseSelectProcessor::transformHeader(
     Block block, const PrewhereInfoPtr & prewhere_info, const Names & virtual_columns)
 {
     executePrewhereActions(block, prewhere_info);
diff --git a/src/Storages/MergeTree/MergeTreeBaseSelectProcessor.h b/src/Storages/MergeTree/MergeTreeBaseSelectProcessor.h
index 00ef131ae45..a4c55cbae45 100644
--- a/src/Storages/MergeTree/MergeTreeBaseSelectProcessor.h
+++ b/src/Storages/MergeTree/MergeTreeBaseSelectProcessor.h
@@ -33,6 +33,8 @@ public:
 
     ~MergeTreeBaseSelectProcessor() override;
 
+    static Block transformHeader(Block block, const PrewhereInfoPtr & prewhere_info, const Names & virtual_columns);
+
     static void executePrewhereActions(Block & block, const PrewhereInfoPtr & prewhere_info);
 
 protected:
@@ -49,8 +51,6 @@ protected:
     static void injectVirtualColumns(Block & block, MergeTreeReadTask * task, const Names & virtual_columns);
     static void injectVirtualColumns(Chunk & chunk, MergeTreeReadTask * task, const Names & virtual_columns);
 
-    static Block getHeader(Block block, const PrewhereInfoPtr & prewhere_info, const Names & virtual_columns);
-
     void initializeRangeReaders(MergeTreeReadTask & task);
 
 protected:
diff --git a/src/Storages/MergeTree/MergeTreeBlockOutputStream.cpp b/src/Storages/MergeTree/MergeTreeBlockOutputStream.cpp
index 904081cc1df..bc91e29d900 100644
--- a/src/Storages/MergeTree/MergeTreeBlockOutputStream.cpp
+++ b/src/Storages/MergeTree/MergeTreeBlockOutputStream.cpp
@@ -29,12 +29,20 @@ void MergeTreeBlockOutputStream::write(const Block & block)
         Stopwatch watch;
 
         MergeTreeData::MutableDataPartPtr part = storage.writer.writeTempPart(current_block, metadata_snapshot, optimize_on_insert);
-        storage.renameTempPartAndAdd(part, &storage.increment);
 
-        PartLog::addNewPart(storage.global_context, part, watch.elapsed());
+        /// If optimize_on_insert setting is true, current_block could become empty after merge
+        /// and we didn't create part.
+        if (!part)
+            continue;
 
-        /// Initiate async merge - it will be done if it's good time for merge and if there are space in 'background_pool'.
-        storage.background_executor.triggerTask();
+        /// Part can be deduplicated, so increment counters and add to part log only if it's really added
+        if (storage.renameTempPartAndAdd(part, &storage.increment, nullptr, storage.getDeduplicationLog()))
+        {
+            PartLog::addNewPart(storage.getContext(), part, watch.elapsed());
+
+            /// Initiate async merge - it will be done if it's good time for merge and if there are space in 'background_pool'.
+            storage.background_executor.triggerTask();
+        }
     }
 }
 
diff --git a/src/Storages/MergeTree/MergeTreeBlockReadUtils.cpp b/src/Storages/MergeTree/MergeTreeBlockReadUtils.cpp
index f8b5e0a9c0a..10ce061a864 100644
--- a/src/Storages/MergeTree/MergeTreeBlockReadUtils.cpp
+++ b/src/Storages/MergeTree/MergeTreeBlockReadUtils.cpp
@@ -272,8 +272,21 @@ MergeTreeReadTaskColumns getReadTaskColumns(
         if (prewhere_info->alias_actions)
             pre_column_names = prewhere_info->alias_actions->getRequiredColumns();
         else
+        {
             pre_column_names = prewhere_info->prewhere_actions->getRequiredColumns();
 
+            if (prewhere_info->row_level_filter)
+            {
+                NameSet names(pre_column_names.begin(), pre_column_names.end());
+
+                for (auto & name : prewhere_info->row_level_filter->getRequiredColumns())
+                {
+                    if (names.count(name) == 0)
+                        pre_column_names.push_back(name);
+                }
+            }
+        }
+
         if (pre_column_names.empty())
             pre_column_names.push_back(column_names[0]);
 
diff --git a/src/Storages/MergeTree/MergeTreeData.cpp b/src/Storages/MergeTree/MergeTreeData.cpp
index a0d23b8ab22..f28d87bb9be 100644
--- a/src/Storages/MergeTree/MergeTreeData.cpp
+++ b/src/Storages/MergeTree/MergeTreeData.cpp
@@ -4,23 +4,23 @@
 #include <DataTypes/DataTypeDate.h>
 #include <DataTypes/DataTypeDateTime.h>
 #include <DataTypes/DataTypeEnum.h>
-#include <DataTypes/DataTypeUUID.h>
-#include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypeLowCardinality.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/DataTypeUUID.h>
 #include <DataTypes/NestedUtils.h>
 #include <Formats/FormatFactory.h>
-#include <Processors/Formats/InputStreamFromInputFormat.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/IFunction.h>
 #include <IO/ConcatReadBuffer.h>
-#include <IO/HexWriteBuffer.h>
 #include <IO/Operators.h>
 #include <IO/ReadBufferFromMemory.h>
 #include <IO/WriteBufferFromString.h>
+#include <Interpreters/Context.h>
 #include <Interpreters/ExpressionAnalyzer.h>
+#include <Interpreters/InterpreterSelectQuery.h>
 #include <Interpreters/PartLog.h>
 #include <Interpreters/TreeRewriter.h>
-#include <Interpreters/Context.h>
+#include <Interpreters/inplaceBlockConversions.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTLiteral.h>
 #include <Parsers/ASTNameTypePair.h>
@@ -29,10 +29,11 @@
 #include <Parsers/ExpressionListParsers.h>
 #include <Parsers/parseQuery.h>
 #include <Parsers/queryToString.h>
+#include <Processors/Formats/InputStreamFromInputFormat.h>
 #include <Storages/AlterCommands.h>
 #include <Storages/MergeTree/MergeTreeData.h>
-#include <Storages/MergeTree/MergeTreeDataPartInMemory.h>
 #include <Storages/MergeTree/MergeTreeDataPartCompact.h>
+#include <Storages/MergeTree/MergeTreeDataPartInMemory.h>
 #include <Storages/MergeTree/MergeTreeDataPartWide.h>
 #include <Storages/MergeTree/MergeTreeSequentialSource.h>
 #include <Storages/MergeTree/MergedBlockOutputStream.h>
@@ -41,6 +42,7 @@
 #include <Storages/MergeTree/localBackup.h>
 #include <Storages/StorageMergeTree.h>
 #include <Storages/StorageReplicatedMergeTree.h>
+#include <Storages/VirtualColumnUtils.h>
 #include <Common/Increment.h>
 #include <Common/SimpleIncrement.h>
 #include <Common/Stopwatch.h>
@@ -54,6 +56,8 @@
 #include <boost/range/adaptor/filtered.hpp>
 #include <boost/algorithm/string/join.hpp>
 
+#include <ext/scope_guard_safe.h>
+
 #include <algorithm>
 #include <iomanip>
 #include <optional>
@@ -69,6 +73,7 @@ namespace ProfileEvents
     extern const Event RejectedInserts;
     extern const Event DelayedInserts;
     extern const Event DelayedInsertsMilliseconds;
+    extern const Event DuplicatedInsertedBlocks;
 }
 
 namespace CurrentMetrics
@@ -130,7 +135,7 @@ MergeTreeData::MergeTreeData(
     const StorageID & table_id_,
     const String & relative_data_path_,
     const StorageInMemoryMetadata & metadata_,
-    Context & context_,
+    ContextPtr context_,
     const String & date_column_name,
     const MergingParams & merging_params_,
     std::unique_ptr<MergeTreeSettings> storage_settings_,
@@ -138,7 +143,7 @@ MergeTreeData::MergeTreeData(
     bool attach,
     BrokenPartCallback broken_part_callback_)
     : IStorage(table_id_)
-    , global_context(context_.getGlobalContext())
+    , WithContext(context_->getGlobalContext())
     , merging_params(merging_params_)
     , require_part_metadata(require_part_metadata_)
     , relative_data_path(relative_data_path_)
@@ -158,14 +163,16 @@ MergeTreeData::MergeTreeData(
 
     /// Check sanity of MergeTreeSettings. Only when table is created.
     if (!attach)
-        settings->sanityCheck(global_context.getSettingsRef());
+        settings->sanityCheck(getContext()->getSettingsRef());
 
     MergeTreeDataFormatVersion min_format_version(0);
     if (!date_column_name.empty())
     {
         try
         {
+
             checkPartitionKeyAndInitMinMax(metadata_.partition_key);
+            setProperties(metadata_, metadata_, attach);
             if (minmax_idx_date_column_pos == -1)
                 throw Exception("Could not find Date column", ErrorCodes::BAD_TYPE_OF_FIELD);
         }
@@ -182,7 +189,6 @@ MergeTreeData::MergeTreeData(
         checkPartitionKeyAndInitMinMax(metadata_.partition_key);
         min_format_version = MERGE_TREE_DATA_MIN_FORMAT_VERSION_WITH_CUSTOM_PARTITIONING;
     }
-
     setProperties(metadata_, metadata_, attach);
 
     /// NOTE: using the same columns list as is read when performing actual merges.
@@ -202,8 +208,8 @@ MergeTreeData::MergeTreeData(
     for (const auto & [path, disk] : getRelativeDataPathsWithDisks())
     {
         disk->createDirectories(path);
-        disk->createDirectories(path + "detached");
-        auto current_version_file_path = path + "format_version.txt";
+        disk->createDirectories(path + MergeTreeData::DETACHED_DIR_NAME);
+        auto current_version_file_path = path + MergeTreeData::FORMAT_VERSION_FILE_NAME;
         if (disk->exists(current_version_file_path))
         {
             if (!version_file.first.empty())
@@ -217,7 +223,7 @@ MergeTreeData::MergeTreeData(
 
     /// If not choose any
     if (version_file.first.empty())
-        version_file = {relative_data_path + "format_version.txt", getStoragePolicy()->getAnyDisk()};
+        version_file = {relative_data_path + MergeTreeData::FORMAT_VERSION_FILE_NAME, getStoragePolicy()->getAnyDisk()};
 
     bool version_file_exists = version_file.second->exists(version_file.first);
 
@@ -227,7 +233,7 @@ MergeTreeData::MergeTreeData(
         format_version = min_format_version;
         auto buf = version_file.second->writeFile(version_file.first);
         writeIntText(format_version.toUnderType(), *buf);
-        if (global_context.getSettingsRef().fsync_metadata)
+        if (getContext()->getSettingsRef().fsync_metadata)
             buf->sync();
     }
     else
@@ -256,7 +262,7 @@ MergeTreeData::MergeTreeData(
 
 StoragePolicyPtr MergeTreeData::getStoragePolicy() const
 {
-    return global_context.getStoragePolicy(getSettings()->storage_policy);
+    return getContext()->getStoragePolicy(getSettings()->storage_policy);
 }
 
 static void checkKeyExpression(const ExpressionActions & expr, const Block & sample_block, const String & key_name, bool allow_nullable_key)
@@ -313,8 +319,8 @@ void MergeTreeData::checkProperties(
         {
             const String & pk_column = new_primary_key.column_names[i];
             if (pk_column != sorting_key_column)
-                throw Exception("Primary key must be a prefix of the sorting key, but in position "
-                    + toString(i) + " its column is " + pk_column + ", not " + sorting_key_column,
+                throw Exception("Primary key must be a prefix of the sorting key, but the column in the position "
+                    + toString(i) + " is " + sorting_key_column +", not " + pk_column,
                     ErrorCodes::BAD_ARGUMENTS);
 
             if (!primary_key_columns_set.emplace(pk_column).second)
@@ -351,7 +357,7 @@ void MergeTreeData::checkProperties(
 
         if (!added_key_column_expr_list->children.empty())
         {
-            auto syntax = TreeRewriter(global_context).analyze(added_key_column_expr_list, all_columns);
+            auto syntax = TreeRewriter(getContext()).analyze(added_key_column_expr_list, all_columns);
             Names used_columns = syntax->requiredSourceColumns();
 
             NamesAndTypesList deleted_columns;
@@ -408,7 +414,7 @@ ExpressionActionsPtr getCombinedIndicesExpression(
     const KeyDescription & key,
     const IndicesDescription & indices,
     const ColumnsDescription & columns,
-    const Context & context)
+    ContextPtr context)
 {
     ASTPtr combined_expr_list = key.expression_list_ast->clone();
 
@@ -422,14 +428,37 @@ ExpressionActionsPtr getCombinedIndicesExpression(
 
 }
 
+ExpressionActionsPtr MergeTreeData::getMinMaxExpr(const KeyDescription & partition_key, const ExpressionActionsSettings & settings)
+{
+    NamesAndTypesList partition_key_columns;
+    if (!partition_key.column_names.empty())
+        partition_key_columns = partition_key.expression->getRequiredColumnsWithTypes();
+
+    return std::make_shared<ExpressionActions>(std::make_shared<ActionsDAG>(partition_key_columns), settings);
+}
+
+Names MergeTreeData::getMinMaxColumnsNames(const KeyDescription & partition_key)
+{
+    if (!partition_key.column_names.empty())
+        return partition_key.expression->getRequiredColumns();
+    return {};
+}
+
+DataTypes MergeTreeData::getMinMaxColumnsTypes(const KeyDescription & partition_key)
+{
+    if (!partition_key.column_names.empty())
+        return partition_key.expression->getRequiredColumnsWithTypes().getTypes();
+    return {};
+}
+
 ExpressionActionsPtr MergeTreeData::getPrimaryKeyAndSkipIndicesExpression(const StorageMetadataPtr & metadata_snapshot) const
 {
-    return getCombinedIndicesExpression(metadata_snapshot->getPrimaryKey(), metadata_snapshot->getSecondaryIndices(), metadata_snapshot->getColumns(), global_context);
+    return getCombinedIndicesExpression(metadata_snapshot->getPrimaryKey(), metadata_snapshot->getSecondaryIndices(), metadata_snapshot->getColumns(), getContext());
 }
 
 ExpressionActionsPtr MergeTreeData::getSortingKeyAndSkipIndicesExpression(const StorageMetadataPtr & metadata_snapshot) const
 {
-    return getCombinedIndicesExpression(metadata_snapshot->getSortingKey(), metadata_snapshot->getSecondaryIndices(), metadata_snapshot->getColumns(), global_context);
+    return getCombinedIndicesExpression(metadata_snapshot->getSortingKey(), metadata_snapshot->getSecondaryIndices(), metadata_snapshot->getColumns(), getContext());
 }
 
 
@@ -441,24 +470,22 @@ void MergeTreeData::checkPartitionKeyAndInitMinMax(const KeyDescription & new_pa
     checkKeyExpression(*new_partition_key.expression, new_partition_key.sample_block, "Partition", allow_nullable_key);
 
     /// Add all columns used in the partition key to the min-max index.
-    const NamesAndTypesList & minmax_idx_columns_with_types = new_partition_key.expression->getRequiredColumnsWithTypes();
-    minmax_idx_expr = std::make_shared<ExpressionActions>(std::make_shared<ActionsDAG>(minmax_idx_columns_with_types));
-    for (const NameAndTypePair & column : minmax_idx_columns_with_types)
-    {
-        minmax_idx_columns.emplace_back(column.name);
-        minmax_idx_column_types.emplace_back(column.type);
-    }
+    DataTypes minmax_idx_columns_types = getMinMaxColumnsTypes(new_partition_key);
 
     /// Try to find the date column in columns used by the partition key (a common case).
-    bool encountered_date_column = false;
-    for (size_t i = 0; i < minmax_idx_column_types.size(); ++i)
+    /// If there are no - DateTime or DateTime64 would also suffice.
+
+    bool has_date_column = false;
+    bool has_datetime_column = false;
+
+    for (size_t i = 0; i < minmax_idx_columns_types.size(); ++i)
     {
-        if (typeid_cast<const DataTypeDate *>(minmax_idx_column_types[i].get()))
+        if (isDate(minmax_idx_columns_types[i]))
         {
-            if (!encountered_date_column)
+            if (!has_date_column)
             {
                 minmax_idx_date_column_pos = i;
-                encountered_date_column = true;
+                has_date_column = true;
             }
             else
             {
@@ -467,21 +494,23 @@ void MergeTreeData::checkPartitionKeyAndInitMinMax(const KeyDescription & new_pa
             }
         }
     }
-    if (!encountered_date_column)
+    if (!has_date_column)
     {
-        for (size_t i = 0; i < minmax_idx_column_types.size(); ++i)
+        for (size_t i = 0; i < minmax_idx_columns_types.size(); ++i)
         {
-            if (typeid_cast<const DataTypeDateTime *>(minmax_idx_column_types[i].get()))
+            if (isDateTime(minmax_idx_columns_types[i])
+                || isDateTime64(minmax_idx_columns_types[i])
+            )
             {
-                if (!encountered_date_column)
+                if (!has_datetime_column)
                 {
                     minmax_idx_time_column_pos = i;
-                    encountered_date_column = true;
+                    has_datetime_column = true;
                 }
                 else
                 {
                     /// There is more than one DateTime column in partition key and we don't know which one to choose.
-                   minmax_idx_time_column_pos = -1;
+                    minmax_idx_time_column_pos = -1;
                 }
             }
         }
@@ -656,6 +685,41 @@ void MergeTreeData::MergingParams::check(const StorageInMemoryMetadata & metadat
 }
 
 
+std::optional<UInt64> MergeTreeData::totalRowsByPartitionPredicateImpl(
+    const SelectQueryInfo & query_info, ContextPtr local_context, const DataPartsVector & parts) const
+{
+    auto metadata_snapshot = getInMemoryMetadataPtr();
+    ASTPtr expression_ast;
+    Block virtual_columns_block = MergeTreeDataSelectExecutor::getSampleBlockWithVirtualPartColumns();
+
+    // Generate valid expressions for filtering
+    bool valid = VirtualColumnUtils::prepareFilterBlockWithQuery(query_info.query, local_context, virtual_columns_block, expression_ast);
+
+    PartitionPruner partition_pruner(metadata_snapshot->getPartitionKey(), query_info, local_context, true /* strict */);
+    if (partition_pruner.isUseless() && !valid)
+        return {};
+
+    std::unordered_set<String> part_values;
+    if (valid && expression_ast)
+    {
+        MergeTreeDataSelectExecutor::fillBlockWithVirtualPartColumns(parts, virtual_columns_block);
+        VirtualColumnUtils::filterBlockWithQuery(query_info.query, virtual_columns_block, local_context, expression_ast);
+        part_values = VirtualColumnUtils::extractSingleValueFromBlock<String>(virtual_columns_block, "_part");
+        if (part_values.empty())
+            return 0;
+    }
+    // At this point, empty `part_values` means all parts.
+
+    size_t res = 0;
+    for (const auto & part : parts)
+    {
+        if ((part_values.empty() || part_values.find(part->name) != part_values.end()) && !partition_pruner.canBePruned(part))
+            res += part->rows_count;
+    }
+    return res;
+}
+
+
 String MergeTreeData::MergingParams::getModeName() const
 {
     switch (mode)
@@ -704,7 +768,7 @@ void MergeTreeData::loadDataParts(bool skip_sanity_checks)
         for (const auto & disk_ptr : disks)
             defined_disk_names.insert(disk_ptr->getName());
 
-        for (const auto & [disk_name, disk] : global_context.getDisksMap())
+        for (const auto & [disk_name, disk] : getContext()->getDisksMap())
         {
             if (defined_disk_names.count(disk_name) == 0 && disk->exists(relative_data_path))
             {
@@ -725,8 +789,8 @@ void MergeTreeData::loadDataParts(bool skip_sanity_checks)
         auto disk_ptr = *disk_it;
         for (auto it = disk_ptr->iterateDirectory(relative_data_path); it->isValid(); it->next())
         {
-            /// Skip temporary directories.
-            if (startsWith(it->name(), "tmp"))
+            /// Skip temporary directories, file 'format_version.txt' and directory 'detached'.
+            if (startsWith(it->name(), "tmp") || it->name() == MergeTreeData::FORMAT_VERSION_FILE_NAME || it->name() == MergeTreeData::DETACHED_DIR_NAME)
                 continue;
 
             if (!startsWith(it->name(), MergeTreeWriteAheadLog::WAL_FILE_NAME))
@@ -752,7 +816,7 @@ void MergeTreeData::loadDataParts(bool skip_sanity_checks)
 
     if (part_names_with_disks.empty() && parts_from_wal.empty())
     {
-        LOG_DEBUG(log, "There is no data parts");
+        LOG_DEBUG(log, "There are no data parts");
         return;
     }
 
@@ -1107,7 +1171,7 @@ void MergeTreeData::removePartsFinally(const MergeTreeData::DataPartsVector & pa
     /// NOTE: There is no need to log parts deletion somewhere else, all deleting parts pass through this function and pass away
 
     auto table_id = getStorageID();
-    if (auto part_log = global_context.getPartLog(table_id.database_name))
+    if (auto part_log = getContext()->getPartLog(table_id.database_name))
     {
         PartLogElement part_log_elem;
 
@@ -1135,6 +1199,11 @@ void MergeTreeData::clearOldPartsFromFilesystem(bool force)
     DataPartsVector parts_to_remove = grabOldParts(force);
     clearPartsFromFilesystem(parts_to_remove);
     removePartsFinally(parts_to_remove);
+
+    /// This is needed to close files to avoid they reside on disk after being deleted.
+    /// NOTE: we can drop files from cache more selectively but this is good enough.
+    if (!parts_to_remove.empty())
+        getContext()->dropMMappedFileCache();
 }
 
 void MergeTreeData::clearPartsFromFilesystem(const DataPartsVector & parts_to_remove)
@@ -1144,14 +1213,21 @@ void MergeTreeData::clearPartsFromFilesystem(const DataPartsVector & parts_to_re
     {
         /// Parallel parts removal.
 
-        size_t num_threads = std::min(size_t(settings->max_part_removal_threads), parts_to_remove.size());
+        size_t num_threads = std::min<size_t>(settings->max_part_removal_threads, parts_to_remove.size());
         ThreadPool pool(num_threads);
 
         /// NOTE: Under heavy system load you may get "Cannot schedule a task" from ThreadPool.
         for (const DataPartPtr & part : parts_to_remove)
         {
-            pool.scheduleOrThrowOnError([&]
+            pool.scheduleOrThrowOnError([&, thread_group = CurrentThread::getGroup()]
             {
+                SCOPE_EXIT_SAFE(
+                    if (thread_group)
+                        CurrentThread::detachQueryIfNotDetached();
+                );
+                if (thread_group)
+                    CurrentThread::attachTo(thread_group);
+
                 LOG_DEBUG(log, "Removing part from filesystem {}", part->name);
                 part->remove();
             });
@@ -1236,7 +1312,7 @@ void MergeTreeData::clearEmptyParts()
         {
             ASTPtr literal = std::make_shared<ASTLiteral>(part->name);
             /// If another replica has already started drop, it's ok, no need to throw.
-            dropPartition(literal, /* detach = */ false, /*drop_part = */ true, global_context, /* throw_if_noop = */ false);
+            dropPartition(literal, /* detach = */ false, /*drop_part = */ true, getContext(), /* throw_if_noop = */ false);
         }
     }
 }
@@ -1259,7 +1335,7 @@ void MergeTreeData::rename(const String & new_table_path, const StorageID & new_
     }
 
     if (!getStorageID().hasUUID())
-        global_context.dropCaches();
+        getContext()->dropCaches();
 
     relative_data_path = new_table_path;
     renameInMemory(new_table_id);
@@ -1281,7 +1357,7 @@ void MergeTreeData::dropAllData()
     /// Tables in atomic databases have UUID and stored in persistent locations.
     /// No need to drop caches (that are keyed by filesystem path) because collision is not possible.
     if (!getStorageID().hasUUID())
-        global_context.dropCaches();
+        getContext()->dropCaches();
 
     LOG_TRACE(log, "dropAllData: removing data from filesystem.");
 
@@ -1318,8 +1394,8 @@ void MergeTreeData::dropIfEmpty()
     for (const auto & [path, disk] : getRelativeDataPathsWithDisks())
     {
         /// Non recursive, exception is thrown if there are more files.
-        disk->removeFile(path + "format_version.txt");
-        disk->removeDirectory(path + "detached");
+        disk->removeFile(path + MergeTreeData::FORMAT_VERSION_FILE_NAME);
+        disk->removeDirectory(path + MergeTreeData::DETACHED_DIR_NAME);
         disk->removeDirectory(path);
     }
 }
@@ -1406,21 +1482,23 @@ void checkVersionColumnTypesConversion(const IDataType * old_type, const IDataTy
 
 }
 
-void MergeTreeData::checkAlterIsPossible(const AlterCommands & commands, const Settings & settings) const
+void MergeTreeData::checkAlterIsPossible(const AlterCommands & commands, ContextPtr local_context) const
 {
     /// Check that needed transformations can be applied to the list of columns without considering type conversions.
     StorageInMemoryMetadata new_metadata = getInMemoryMetadata();
     StorageInMemoryMetadata old_metadata = getInMemoryMetadata();
 
+    const auto & settings = local_context->getSettingsRef();
+
     if (!settings.allow_non_metadata_alters)
     {
 
-        auto mutation_commands = commands.getMutationCommands(new_metadata, settings.materialize_ttl_after_modify, global_context);
+        auto mutation_commands = commands.getMutationCommands(new_metadata, settings.materialize_ttl_after_modify, getContext());
 
         if (!mutation_commands.empty())
             throw Exception(ErrorCodes::ALTER_OF_COLUMN_IS_FORBIDDEN, "The following alter commands: '{}' will modify data on disk, but setting `allow_non_metadata_alters` is disabled", queryToString(mutation_commands.ast()));
     }
-    commands.apply(new_metadata, global_context);
+    commands.apply(new_metadata, getContext());
 
     /// Set of columns that shouldn't be altered.
     NameSet columns_alter_type_forbidden;
@@ -1482,12 +1560,14 @@ void MergeTreeData::checkAlterIsPossible(const AlterCommands & commands, const S
     for (const auto & column : old_metadata.getColumns().getAllPhysical())
         old_types.emplace(column.name, column.type.get());
 
+    NamesAndTypesList columns_to_check_conversion;
+    auto name_deps = getDependentViewsByColumn(local_context);
     for (const AlterCommand & command : commands)
     {
         /// Just validate partition expression
         if (command.partition)
         {
-            getPartitionIDFromQuery(command.partition, global_context);
+            getPartitionIDFromQuery(command.partition, getContext());
         }
 
         if (command.column_name == merging_params.version_column)
@@ -1561,6 +1641,16 @@ void MergeTreeData::checkAlterIsPossible(const AlterCommands & commands, const S
                     "Trying to ALTER DROP key " + backQuoteIfNeed(command.column_name) + " column which is a part of key expression",
                     ErrorCodes::ALTER_OF_COLUMN_IS_FORBIDDEN);
             }
+
+            const auto & deps_mv = name_deps[command.column_name];
+            if (!deps_mv.empty())
+            {
+                throw Exception(
+                    "Trying to ALTER DROP column " + backQuoteIfNeed(command.column_name) + " which is referenced by materialized view "
+                        + toString(deps_mv),
+                    ErrorCodes::ALTER_OF_COLUMN_IS_FORBIDDEN);
+            }
+
             dropped_columns.emplace(command.column_name);
         }
         else if (command.isRequireMutationStage(getInMemoryMetadata()))
@@ -1571,9 +1661,9 @@ void MergeTreeData::checkAlterIsPossible(const AlterCommands & commands, const S
                 throw Exception("ALTER of key column " + backQuoteIfNeed(command.column_name) + " is forbidden",
                     ErrorCodes::ALTER_OF_COLUMN_IS_FORBIDDEN);
 
-            if (columns_alter_type_check_safe_for_partition.count(command.column_name))
+            if (command.type == AlterCommand::MODIFY_COLUMN)
             {
-                if (command.type == AlterCommand::MODIFY_COLUMN)
+                if (columns_alter_type_check_safe_for_partition.count(command.column_name))
                 {
                     auto it = old_types.find(command.column_name);
 
@@ -1584,11 +1674,8 @@ void MergeTreeData::checkAlterIsPossible(const AlterCommands & commands, const S
                                 + " is not safe because it can change the representation of partition key",
                             ErrorCodes::ALTER_OF_COLUMN_IS_FORBIDDEN);
                 }
-            }
 
-            if (columns_alter_type_metadata_only.count(command.column_name))
-            {
-                if (command.type == AlterCommand::MODIFY_COLUMN)
+                if (columns_alter_type_metadata_only.count(command.column_name))
                 {
                     auto it = old_types.find(command.column_name);
                     assert(it != old_types.end());
@@ -1598,6 +1685,12 @@ void MergeTreeData::checkAlterIsPossible(const AlterCommands & commands, const S
                                     + " is not safe because it can change the representation of primary key",
                             ErrorCodes::ALTER_OF_COLUMN_IS_FORBIDDEN);
                 }
+
+                if (old_metadata.getColumns().has(command.column_name))
+                {
+                    columns_to_check_conversion.push_back(
+                        new_metadata.getColumns().getPhysical(command.column_name));
+                }
             }
         }
     }
@@ -1605,6 +1698,12 @@ void MergeTreeData::checkAlterIsPossible(const AlterCommands & commands, const S
     checkProperties(new_metadata, old_metadata);
     checkTTLExpressions(new_metadata, old_metadata);
 
+    if (!columns_to_check_conversion.empty())
+    {
+        auto old_header = old_metadata.getSampleBlock();
+        performRequiredConversions(old_header, columns_to_check_conversion, getContext());
+    }
+
     if (old_metadata.hasSettingsChanges())
     {
         const auto current_changes = old_metadata.getSettingsChanges()->as<const ASTSetQuery &>().changes;
@@ -1633,7 +1732,7 @@ void MergeTreeData::checkAlterIsPossible(const AlterCommands & commands, const S
             }
 
             if (setting_name == "storage_policy")
-                checkStoragePolicy(global_context.getStoragePolicy(new_value.safeGet<String>()));
+                checkStoragePolicy(getContext()->getStoragePolicy(new_value.safeGet<String>()));
         }
     }
 
@@ -1659,6 +1758,12 @@ void MergeTreeData::checkAlterIsPossible(const AlterCommands & commands, const S
     }
 }
 
+
+void MergeTreeData::checkMutationIsPossible(const MutationCommands & /*commands*/, const Settings & /*settings*/) const
+{
+    /// Some validation will be added
+}
+
 MergeTreeDataPartType MergeTreeData::choosePartType(size_t bytes_uncompressed, size_t rows_count) const
 {
     const auto settings = getSettings();
@@ -1752,7 +1857,7 @@ void MergeTreeData::changeSettings(
         {
             if (change.name == "storage_policy")
             {
-                StoragePolicyPtr new_storage_policy = global_context.getStoragePolicy(change.value.safeGet<String>());
+                StoragePolicyPtr new_storage_policy = getContext()->getStoragePolicy(change.value.safeGet<String>());
                 StoragePolicyPtr old_storage_policy = getStoragePolicy();
 
                 /// StoragePolicy of different version or name is guaranteed to have different pointer
@@ -1777,7 +1882,7 @@ void MergeTreeData::changeSettings(
                     {
                         auto disk = new_storage_policy->getDiskByName(disk_name);
                         disk->createDirectories(relative_data_path);
-                        disk->createDirectories(relative_data_path + "detached");
+                        disk->createDirectories(relative_data_path + MergeTreeData::DETACHED_DIR_NAME);
                     }
                     /// FIXME how would that be done while reloading configuration???
 
@@ -1789,7 +1894,7 @@ void MergeTreeData::changeSettings(
         MergeTreeSettings copy = *getSettings();
         copy.applyChanges(new_changes);
 
-        copy.sanityCheck(global_context.getSettingsRef());
+        copy.sanityCheck(getContext()->getSettingsRef());
 
         storage_settings.set(std::make_unique<const MergeTreeSettings>(copy));
         StorageInMemoryMetadata new_metadata = getInMemoryMetadata();
@@ -1801,11 +1906,6 @@ void MergeTreeData::changeSettings(
     }
 }
 
-PartitionCommandsResultInfo MergeTreeData::freezeAll(const String & with_name, const StorageMetadataPtr & metadata_snapshot, const Context & context, TableLockHolder &)
-{
-    return freezePartitionsByMatcher([] (const DataPartPtr &) { return true; }, metadata_snapshot, with_name, context);
-}
-
 void MergeTreeData::PartsTemporaryRename::addPart(const String & old_name, const String & new_name)
 {
     old_and_new_names.push_back({old_name, new_name});
@@ -1932,7 +2032,7 @@ MergeTreeData::DataPartsVector MergeTreeData::getActivePartsToReplace(
 }
 
 
-bool MergeTreeData::renameTempPartAndAdd(MutableDataPartPtr & part, SimpleIncrement * increment, Transaction * out_transaction)
+bool MergeTreeData::renameTempPartAndAdd(MutableDataPartPtr & part, SimpleIncrement * increment, Transaction * out_transaction, MergeTreeDeduplicationLog * deduplication_log)
 {
     if (out_transaction && &out_transaction->data != this)
         throw Exception("MergeTreeData::Transaction for one table cannot be used with another. It is a bug.",
@@ -1941,7 +2041,7 @@ bool MergeTreeData::renameTempPartAndAdd(MutableDataPartPtr & part, SimpleIncrem
     DataPartsVector covered_parts;
     {
         auto lock = lockParts();
-        if (!renameTempPartAndReplace(part, increment, out_transaction, lock, &covered_parts))
+        if (!renameTempPartAndReplace(part, increment, out_transaction, lock, &covered_parts, deduplication_log))
             return false;
     }
     if (!covered_parts.empty())
@@ -1954,7 +2054,7 @@ bool MergeTreeData::renameTempPartAndAdd(MutableDataPartPtr & part, SimpleIncrem
 
 bool MergeTreeData::renameTempPartAndReplace(
     MutableDataPartPtr & part, SimpleIncrement * increment, Transaction * out_transaction,
-    std::unique_lock<std::mutex> & lock, DataPartsVector * out_covered_parts)
+    std::unique_lock<std::mutex> & lock, DataPartsVector * out_covered_parts, MergeTreeDeduplicationLog * deduplication_log)
 {
     if (out_transaction && &out_transaction->data != this)
         throw Exception("MergeTreeData::Transaction for one table cannot be used with another. It is a bug.",
@@ -2009,6 +2109,22 @@ bool MergeTreeData::renameTempPartAndReplace(
         return false;
     }
 
+    /// Deduplication log used only from non-replicated MergeTree. Replicated
+    /// tables have their own mechanism. We try to deduplicate at such deep
+    /// level, because only here we know real part name which is required for
+    /// deduplication.
+    if (deduplication_log)
+    {
+        String block_id = part->getZeroLevelPartBlockID();
+        auto res = deduplication_log->addPart(block_id, part_info);
+        if (!res.second)
+        {
+            ProfileEvents::increment(ProfileEvents::DuplicatedInsertedBlocks);
+            LOG_INFO(log, "Block with ID {} already exists as part {}; ignoring it", block_id, res.first.getPartName());
+            return false;
+        }
+    }
+
     /// All checks are passed. Now we can rename the part on disk.
     /// So, we maintain invariant: if a non-temporary part in filesystem then it is in data_parts
     ///
@@ -2065,7 +2181,7 @@ bool MergeTreeData::renameTempPartAndReplace(
 }
 
 MergeTreeData::DataPartsVector MergeTreeData::renameTempPartAndReplace(
-    MutableDataPartPtr & part, SimpleIncrement * increment, Transaction * out_transaction)
+    MutableDataPartPtr & part, SimpleIncrement * increment, Transaction * out_transaction, MergeTreeDeduplicationLog * deduplication_log)
 {
     if (out_transaction && &out_transaction->data != this)
         throw Exception("MergeTreeData::Transaction for one table cannot be used with another. It is a bug.",
@@ -2074,7 +2190,7 @@ MergeTreeData::DataPartsVector MergeTreeData::renameTempPartAndReplace(
     DataPartsVector covered_parts;
     {
         auto lock = lockParts();
-        renameTempPartAndReplace(part, increment, out_transaction, lock, &covered_parts);
+        renameTempPartAndReplace(part, increment, out_transaction, lock, &covered_parts, deduplication_log);
     }
     return covered_parts;
 }
@@ -2190,7 +2306,7 @@ MergeTreeData::DataPartsVector MergeTreeData::removePartsInRangeFromWorkingSet(c
 void MergeTreeData::forgetPartAndMoveToDetached(const MergeTreeData::DataPartPtr & part_to_detach, const String & prefix, bool
 restore_covered)
 {
-    LOG_INFO(log, "Renaming {} to {}{} and forgiving it.", part_to_detach->relative_path, prefix, part_to_detach->name);
+    LOG_INFO(log, "Renaming {} to {}{} and forgetting it.", part_to_detach->relative_path, prefix, part_to_detach->name);
 
     auto lock = lockParts();
 
@@ -2431,7 +2547,7 @@ void MergeTreeData::delayInsertOrThrowIfNeeded(Poco::Event * until) const
     if (settings->inactive_parts_to_throw_insert > 0 || settings->inactive_parts_to_delay_insert > 0)
     {
         size_t inactive_parts_count_in_partition = getMaxInactivePartsCountForPartition();
-        if (inactive_parts_count_in_partition >= settings->inactive_parts_to_throw_insert)
+        if (settings->inactive_parts_to_throw_insert > 0 && inactive_parts_count_in_partition >= settings->inactive_parts_to_throw_insert)
         {
             ProfileEvents::increment(ProfileEvents::RejectedInserts);
             throw Exception(
@@ -2447,7 +2563,7 @@ void MergeTreeData::delayInsertOrThrowIfNeeded(Poco::Event * until) const
         ProfileEvents::increment(ProfileEvents::RejectedInserts);
         throw Exception(
             ErrorCodes::TOO_MANY_PARTS,
-            "Too many parts ({}). Parts cleaning are processing significantly slower than inserts",
+            "Too many parts ({}). Merges are processing significantly slower than inserts",
             parts_count_in_partition);
     }
 
@@ -2642,45 +2758,8 @@ void MergeTreeData::removePartContributionToColumnSizes(const DataPartPtr & part
     }
 }
 
-
-PartitionCommandsResultInfo MergeTreeData::freezePartition(const ASTPtr & partition_ast, const StorageMetadataPtr & metadata_snapshot, const String & with_name, const Context & context, TableLockHolder &)
-{
-    std::optional<String> prefix;
-    String partition_id;
-
-    if (format_version < MERGE_TREE_DATA_MIN_FORMAT_VERSION_WITH_CUSTOM_PARTITIONING)
-    {
-        /// Month-partitioning specific - partition value can represent a prefix of the partition to freeze.
-        if (const auto * partition_lit = partition_ast->as<ASTPartition &>().value->as<ASTLiteral>())
-            prefix = partition_lit->value.getType() == Field::Types::UInt64
-                ? toString(partition_lit->value.get<UInt64>())
-                : partition_lit->value.safeGet<String>();
-        else
-            partition_id = getPartitionIDFromQuery(partition_ast, context);
-    }
-    else
-        partition_id = getPartitionIDFromQuery(partition_ast, context);
-
-    if (prefix)
-        LOG_DEBUG(log, "Freezing parts with prefix {}", *prefix);
-    else
-        LOG_DEBUG(log, "Freezing parts with partition ID {}", partition_id);
-
-
-    return freezePartitionsByMatcher(
-        [&prefix, &partition_id](const DataPartPtr & part)
-        {
-            if (prefix)
-                return startsWith(part->info.partition_id, *prefix);
-            else
-                return part->info.partition_id == partition_id;
-        },
-        metadata_snapshot,
-        with_name,
-        context);
-}
-
-void MergeTreeData::checkAlterPartitionIsPossible(const PartitionCommands & commands, const StorageMetadataPtr & /*metadata_snapshot*/, const Settings & settings) const
+void MergeTreeData::checkAlterPartitionIsPossible(
+    const PartitionCommands & commands, const StorageMetadataPtr & /*metadata_snapshot*/, const Settings & settings) const
 {
     for (const auto & command : commands)
     {
@@ -2694,13 +2773,13 @@ void MergeTreeData::checkAlterPartitionIsPossible(const PartitionCommands & comm
             if (command.part)
             {
                 auto part_name = command.partition->as<ASTLiteral &>().value.safeGet<String>();
-                /// We able to parse it
+                /// We are able to parse it
                 MergeTreePartInfo::fromPartName(part_name, format_version);
             }
             else
             {
-                /// We able to parse it
-                getPartitionIDFromQuery(command.partition, global_context);
+                /// We are able to parse it
+                getPartitionIDFromQuery(command.partition, getContext());
             }
         }
     }
@@ -2708,7 +2787,7 @@ void MergeTreeData::checkAlterPartitionIsPossible(const PartitionCommands & comm
 
 void MergeTreeData::checkPartitionCanBeDropped(const ASTPtr & partition)
 {
-    const String partition_id = getPartitionIDFromQuery(partition, global_context);
+    const String partition_id = getPartitionIDFromQuery(partition, getContext());
     auto parts_to_remove = getDataPartsVectorInPartition(MergeTreeDataPartState::Committed, partition_id);
 
     UInt64 partition_size = 0;
@@ -2717,7 +2796,7 @@ void MergeTreeData::checkPartitionCanBeDropped(const ASTPtr & partition)
         partition_size += part->getBytesOnDisk();
 
     auto table_id = getStorageID();
-    global_context.checkPartitionCanBeDropped(table_id.database_name, table_id.table_name, partition_size);
+    getContext()->checkPartitionCanBeDropped(table_id.database_name, table_id.table_name, partition_size);
 }
 
 void MergeTreeData::checkPartCanBeDropped(const ASTPtr & part_ast)
@@ -2728,17 +2807,17 @@ void MergeTreeData::checkPartCanBeDropped(const ASTPtr & part_ast)
         throw Exception(ErrorCodes::NO_SUCH_DATA_PART, "No part {} in committed state", part_name);
 
     auto table_id = getStorageID();
-    global_context.checkPartitionCanBeDropped(table_id.database_name, table_id.table_name, part->getBytesOnDisk());
+    getContext()->checkPartitionCanBeDropped(table_id.database_name, table_id.table_name, part->getBytesOnDisk());
 }
 
-void MergeTreeData::movePartitionToDisk(const ASTPtr & partition, const String & name, bool moving_part, const Context & context)
+void MergeTreeData::movePartitionToDisk(const ASTPtr & partition, const String & name, bool moving_part, ContextPtr local_context)
 {
     String partition_id;
 
     if (moving_part)
         partition_id = partition->as<ASTLiteral &>().value.safeGet<String>();
     else
-        partition_id = getPartitionIDFromQuery(partition, context);
+        partition_id = getPartitionIDFromQuery(partition, local_context);
 
     DataPartsVector parts;
     if (moving_part)
@@ -2776,14 +2855,14 @@ void MergeTreeData::movePartitionToDisk(const ASTPtr & partition, const String &
 }
 
 
-void MergeTreeData::movePartitionToVolume(const ASTPtr & partition, const String & name, bool moving_part, const Context & context)
+void MergeTreeData::movePartitionToVolume(const ASTPtr & partition, const String & name, bool moving_part, ContextPtr local_context)
 {
     String partition_id;
 
     if (moving_part)
         partition_id = partition->as<ASTLiteral &>().value.safeGet<String>();
     else
-        partition_id = getPartitionIDFromQuery(partition, context);
+        partition_id = getPartitionIDFromQuery(partition, local_context);
 
     DataPartsVector parts;
     if (moving_part)
@@ -2801,7 +2880,7 @@ void MergeTreeData::movePartitionToVolume(const ASTPtr & partition, const String
         throw Exception("Volume " + name + " does not exists on policy " + getStoragePolicy()->getName(), ErrorCodes::UNKNOWN_DISK);
 
     if (parts.empty())
-        throw Exception("Nothing to move", ErrorCodes::NO_SUCH_DATA_PART);
+        throw Exception("Nothing to move (сheck that the partition exists).", ErrorCodes::NO_SUCH_DATA_PART);
 
     parts.erase(std::remove_if(parts.begin(), parts.end(), [&](auto part_ptr)
         {
@@ -2830,7 +2909,12 @@ void MergeTreeData::movePartitionToVolume(const ASTPtr & partition, const String
         throw Exception("Cannot move parts because moves are manually disabled", ErrorCodes::ABORTED);
 }
 
-void MergeTreeData::fetchPartition(const ASTPtr & /*partition*/, const StorageMetadataPtr & /*metadata_snapshot*/, const String & /*from*/, const Context & /*query_context*/)
+void MergeTreeData::fetchPartition(
+    const ASTPtr & /*partition*/,
+    const StorageMetadataPtr & /*metadata_snapshot*/,
+    const String & /*from*/,
+    bool /*fetch_part*/,
+    ContextPtr /*query_context*/)
 {
     throw Exception(ErrorCodes::NOT_IMPLEMENTED, "FETCH PARTITION is not supported by storage {}", getName());
 }
@@ -2838,7 +2922,7 @@ void MergeTreeData::fetchPartition(const ASTPtr & /*partition*/, const StorageMe
 Pipe MergeTreeData::alterPartition(
     const StorageMetadataPtr & metadata_snapshot,
     const PartitionCommands & commands,
-    const Context & query_context)
+    ContextPtr query_context)
 {
     PartitionCommandsResultInfo result;
     for (const PartitionCommand & command : commands)
@@ -2875,7 +2959,7 @@ Pipe MergeTreeData::alterPartition(
 
                     case PartitionCommand::MoveDestinationType::TABLE:
                         checkPartitionCanBeDropped(command.partition);
-                        String dest_database = query_context.resolveDatabase(command.to_database);
+                        String dest_database = query_context->resolveDatabase(command.to_database);
                         auto dest_storage = DatabaseCatalog::instance().getTable({dest_database, command.to_table}, query_context);
                         movePartitionToTable(dest_storage, command.partition, query_context);
                         break;
@@ -2886,42 +2970,57 @@ Pipe MergeTreeData::alterPartition(
             case PartitionCommand::REPLACE_PARTITION:
             {
                 checkPartitionCanBeDropped(command.partition);
-                String from_database = query_context.resolveDatabase(command.from_database);
+                String from_database = query_context->resolveDatabase(command.from_database);
                 auto from_storage = DatabaseCatalog::instance().getTable({from_database, command.from_table}, query_context);
                 replacePartitionFrom(from_storage, command.partition, command.replace, query_context);
             }
             break;
 
             case PartitionCommand::FETCH_PARTITION:
-                fetchPartition(command.partition, metadata_snapshot, command.from_zookeeper_path, query_context);
+                fetchPartition(command.partition, metadata_snapshot, command.from_zookeeper_path, command.part, query_context);
                 break;
 
             case PartitionCommand::FREEZE_PARTITION:
             {
-                auto lock = lockForShare(query_context.getCurrentQueryId(), query_context.getSettingsRef().lock_acquire_timeout);
+                auto lock = lockForShare(query_context->getCurrentQueryId(), query_context->getSettingsRef().lock_acquire_timeout);
                 current_command_results = freezePartition(command.partition, metadata_snapshot, command.with_name, query_context, lock);
             }
             break;
 
             case PartitionCommand::FREEZE_ALL_PARTITIONS:
             {
-                auto lock = lockForShare(query_context.getCurrentQueryId(), query_context.getSettingsRef().lock_acquire_timeout);
+                auto lock = lockForShare(query_context->getCurrentQueryId(), query_context->getSettingsRef().lock_acquire_timeout);
                 current_command_results = freezeAll(command.with_name, metadata_snapshot, query_context, lock);
             }
             break;
+
+            case PartitionCommand::UNFREEZE_PARTITION:
+            {
+                auto lock = lockForShare(query_context->getCurrentQueryId(), query_context->getSettingsRef().lock_acquire_timeout);
+                current_command_results = unfreezePartition(command.partition, command.with_name, query_context, lock);
+            }
+            break;
+
+            case PartitionCommand::UNFREEZE_ALL_PARTITIONS:
+            {
+                auto lock = lockForShare(query_context->getCurrentQueryId(), query_context->getSettingsRef().lock_acquire_timeout);
+                current_command_results = unfreezeAll(command.with_name, query_context, lock);
+            }
+
+            break;
         }
         for (auto & command_result : current_command_results)
             command_result.command_type = command.typeToString();
         result.insert(result.end(), current_command_results.begin(), current_command_results.end());
     }
 
-    if (query_context.getSettingsRef().alter_partition_verbose_result)
+    if (query_context->getSettingsRef().alter_partition_verbose_result)
         return convertCommandsResultToSource(result);
 
     return {};
 }
 
-String MergeTreeData::getPartitionIDFromQuery(const ASTPtr & ast, const Context & context) const
+String MergeTreeData::getPartitionIDFromQuery(const ASTPtr & ast, ContextPtr local_context) const
 {
     const auto & partition_ast = ast->as<ASTPartition &>();
 
@@ -2963,7 +3062,12 @@ String MergeTreeData::getPartitionIDFromQuery(const ASTPtr & ast, const Context
         ReadBufferFromMemory right_paren_buf(")", 1);
         ConcatReadBuffer buf({&left_paren_buf, &fields_buf, &right_paren_buf});
 
-        auto input_format = FormatFactory::instance().getInput("Values", buf, metadata_snapshot->getPartitionKey().sample_block, context, context.getSettingsRef().max_block_size);
+        auto input_format = FormatFactory::instance().getInput(
+            "Values",
+            buf,
+            metadata_snapshot->getPartitionKey().sample_block,
+            local_context,
+            local_context->getSettingsRef().max_block_size);
         auto input_stream = std::make_shared<InputStreamFromInputFormat>(input_format);
 
         auto block = input_stream->read();
@@ -3048,7 +3152,7 @@ MergeTreeData::getDetachedParts() const
 
     for (const auto & [path, disk] : getRelativeDataPathsWithDisks())
     {
-        for (auto it = disk->iterateDirectory(path + "detached"); it->isValid(); it->next())
+        for (auto it = disk->iterateDirectory(path + MergeTreeData::DETACHED_DIR_NAME); it->isValid(); it->next())
         {
             res.emplace_back();
             auto & part = res.back();
@@ -3076,7 +3180,7 @@ void MergeTreeData::validateDetachedPartName(const String & name) const
                             ErrorCodes::BAD_DATA_PART_NAME);
 }
 
-void MergeTreeData::dropDetached(const ASTPtr & partition, bool part, const Context & context)
+void MergeTreeData::dropDetached(const ASTPtr & partition, bool part, ContextPtr local_context)
 {
     PartsTemporaryRename renamed_parts(*this, "detached/");
 
@@ -3088,7 +3192,7 @@ void MergeTreeData::dropDetached(const ASTPtr & partition, bool part, const Cont
     }
     else
     {
-        String partition_id = getPartitionIDFromQuery(partition, context);
+        String partition_id = getPartitionIDFromQuery(partition, local_context);
         DetachedPartsInfo detached_parts = getDetachedParts();
         for (const auto & part_info : detached_parts)
             if (part_info.valid_name && part_info.partition_id == partition_id
@@ -3110,33 +3214,38 @@ void MergeTreeData::dropDetached(const ASTPtr & partition, bool part, const Cont
 }
 
 MergeTreeData::MutableDataPartsVector MergeTreeData::tryLoadPartsToAttach(const ASTPtr & partition, bool attach_part,
-        const Context & context, PartsTemporaryRename & renamed_parts)
+        ContextPtr local_context, PartsTemporaryRename & renamed_parts)
 {
-    String source_dir = "detached/";
+    const String source_dir = "detached/";
 
     std::map<String, DiskPtr> name_to_disk;
+
     /// Let's compose a list of parts that should be added.
     if (attach_part)
     {
-        String part_id = partition->as<ASTLiteral &>().value.safeGet<String>();
+        const String part_id = partition->as<ASTLiteral &>().value.safeGet<String>();
+
         validateDetachedPartName(part_id);
         renamed_parts.addPart(part_id, "attaching_" + part_id);
+
         if (MergeTreePartInfo::tryParsePartName(part_id, nullptr, format_version))
             name_to_disk[part_id] = getDiskForPart(part_id, source_dir);
     }
     else
     {
-        String partition_id = getPartitionIDFromQuery(partition, context);
+        String partition_id = getPartitionIDFromQuery(partition, local_context);
         LOG_DEBUG(log, "Looking for parts for partition {} in {}", partition_id, source_dir);
         ActiveDataPartSet active_parts(format_version);
 
         const auto disks = getStoragePolicy()->getDisks();
+
         for (const auto & disk : disks)
         {
             for (auto it = disk->iterateDirectory(relative_data_path + source_dir); it->isValid(); it->next())
             {
                 const String & name = it->name();
                 MergeTreePartInfo part_info;
+
                 // TODO what if name contains "_tryN" suffix?
                 /// Parts with prefix in name (e.g. attaching_1_3_3_0, deleting_1_3_3_0) will be ignored
                 if (!MergeTreePartInfo::tryParsePartName(name, &part_info, format_version)
@@ -3144,21 +3253,23 @@ MergeTreeData::MutableDataPartsVector MergeTreeData::tryLoadPartsToAttach(const
                 {
                     continue;
                 }
+
                 LOG_DEBUG(log, "Found part {}", name);
                 active_parts.add(name);
                 name_to_disk[name] = disk;
             }
         }
         LOG_DEBUG(log, "{} of them are active", active_parts.size());
-        /// Inactive parts rename so they can not be attached in case of repeated ATTACH.
+
+        /// Inactive parts are renamed so they can not be attached in case of repeated ATTACH.
         for (const auto & [name, disk] : name_to_disk)
         {
-            String containing_part = active_parts.getContainingPart(name);
+            const String containing_part = active_parts.getContainingPart(name);
+
             if (!containing_part.empty() && containing_part != name)
-            {
                 // TODO maybe use PartsTemporaryRename here?
-                disk->moveDirectory(relative_data_path + source_dir + name, relative_data_path + source_dir + "inactive_" + name);
-            }
+                disk->moveDirectory(relative_data_path + source_dir + name,
+                    relative_data_path + source_dir + "inactive_" + name);
             else
                 renamed_parts.addPart(name, "attaching_" + name);
         }
@@ -3173,11 +3284,13 @@ MergeTreeData::MutableDataPartsVector MergeTreeData::tryLoadPartsToAttach(const
     MutableDataPartsVector loaded_parts;
     loaded_parts.reserve(renamed_parts.old_and_new_names.size());
 
-    for (const auto & part_names : renamed_parts.old_and_new_names)
+    for (const auto & [old_name, new_name] : renamed_parts.old_and_new_names)
     {
-        LOG_DEBUG(log, "Checking part {}", part_names.second);
-        auto single_disk_volume = std::make_shared<SingleDiskVolume>("volume_" + part_names.first, name_to_disk[part_names.first], 0);
-        MutableDataPartPtr part = createPart(part_names.first, single_disk_volume, source_dir + part_names.second);
+        LOG_DEBUG(log, "Checking part {}", new_name);
+
+        auto single_disk_volume = std::make_shared<SingleDiskVolume>("volume_" + old_name, name_to_disk[old_name]);
+        MutableDataPartPtr part = createPart(old_name, single_disk_volume, source_dir + new_name);
+
         loadPartAndFixMetadataImpl(part);
         loaded_parts.push_back(part);
     }
@@ -3223,11 +3336,13 @@ ReservationPtr MergeTreeData::reserveSpacePreferringTTLRules(
     const IMergeTreeDataPart::TTLInfos & ttl_infos,
     time_t time_of_move,
     size_t min_volume_index,
-    bool is_insert) const
+    bool is_insert,
+    DiskPtr selected_disk) const
 {
     expected_size = std::max(RESERVATION_MIN_ESTIMATION_SIZE, expected_size);
 
-    ReservationPtr reservation = tryReserveSpacePreferringTTLRules(metadata_snapshot, expected_size, ttl_infos, time_of_move, min_volume_index, is_insert);
+    ReservationPtr reservation = tryReserveSpacePreferringTTLRules(
+        metadata_snapshot, expected_size, ttl_infos, time_of_move, min_volume_index, is_insert, selected_disk);
 
     return checkAndReturnReservation(expected_size, std::move(reservation));
 }
@@ -3238,7 +3353,8 @@ ReservationPtr MergeTreeData::tryReserveSpacePreferringTTLRules(
     const IMergeTreeDataPart::TTLInfos & ttl_infos,
     time_t time_of_move,
     size_t min_volume_index,
-    bool is_insert) const
+    bool is_insert,
+    DiskPtr selected_disk) const
 {
     expected_size = std::max(RESERVATION_MIN_ESTIMATION_SIZE, expected_size);
 
@@ -3273,7 +3389,12 @@ ReservationPtr MergeTreeData::tryReserveSpacePreferringTTLRules(
         }
     }
 
-    reservation = getStoragePolicy()->reserve(expected_size, min_volume_index);
+    // Prefer selected_disk
+    if (selected_disk)
+        reservation = selected_disk->reserve(expected_size);
+
+    if (!reservation)
+        reservation = getStoragePolicy()->reserve(expected_size, min_volume_index);
 
     return reservation;
 }
@@ -3338,7 +3459,7 @@ CompressionCodecPtr MergeTreeData::getCompressionCodecForPart(size_t part_size_c
     if (best_ttl_entry)
         return CompressionCodecFactory::instance().get(best_ttl_entry->recompression_codec, {});
 
-    return global_context.chooseCompressionCodec(
+    return getContext()->chooseCompressionCodec(
         part_size_compressed,
         static_cast<double>(part_size_compressed) / getTotalActiveSizeInBytes());
 }
@@ -3487,7 +3608,7 @@ bool MergeTreeData::isPrimaryOrMinMaxKeyColumnPossiblyWrappedInFunctions(
         if (column_name == name)
             return true;
 
-    for (const auto & name : minmax_idx_columns)
+    for (const auto & name : getMinMaxColumnsNames(metadata_snapshot->getPartitionKey()))
         if (column_name == name)
             return true;
 
@@ -3499,7 +3620,7 @@ bool MergeTreeData::isPrimaryOrMinMaxKeyColumnPossiblyWrappedInFunctions(
 }
 
 bool MergeTreeData::mayBenefitFromIndexForIn(
-    const ASTPtr & left_in_operand, const Context &, const StorageMetadataPtr & metadata_snapshot) const
+    const ASTPtr & left_in_operand, ContextPtr, const StorageMetadataPtr & metadata_snapshot) const
 {
     /// Make sure that the left side of the IN operator contain part of the key.
     /// If there is a tuple on the left side of the IN operator, at least one item of the tuple
@@ -3663,9 +3784,62 @@ MergeTreeData::PathsWithDisks MergeTreeData::getRelativeDataPathsWithDisks() con
     return res;
 }
 
-PartitionCommandsResultInfo MergeTreeData::freezePartitionsByMatcher(MatcherFn matcher, const StorageMetadataPtr & metadata_snapshot, const String & with_name, const Context & context)
+MergeTreeData::MatcherFn MergeTreeData::getPartitionMatcher(const ASTPtr & partition_ast, ContextPtr local_context) const
 {
-    String clickhouse_path = Poco::Path(context.getPath()).makeAbsolute().toString();
+    bool prefixed = false;
+    String id;
+
+    if (format_version < MERGE_TREE_DATA_MIN_FORMAT_VERSION_WITH_CUSTOM_PARTITIONING)
+    {
+        /// Month-partitioning specific - partition value can represent a prefix of the partition to freeze.
+        if (const auto * partition_lit = partition_ast->as<ASTPartition &>().value->as<ASTLiteral>())
+        {
+            id = partition_lit->value.getType() == Field::Types::UInt64
+                 ? toString(partition_lit->value.get<UInt64>())
+                 : partition_lit->value.safeGet<String>();
+            prefixed = true;
+        }
+        else
+            id = getPartitionIDFromQuery(partition_ast, local_context);
+    }
+    else
+        id = getPartitionIDFromQuery(partition_ast, local_context);
+
+    return [prefixed, id](const String & partition_id)
+    {
+        if (prefixed)
+            return startsWith(partition_id, id);
+        else
+            return id == partition_id;
+    };
+}
+
+PartitionCommandsResultInfo MergeTreeData::freezePartition(
+    const ASTPtr & partition_ast,
+    const StorageMetadataPtr & metadata_snapshot,
+    const String & with_name,
+    ContextPtr local_context,
+    TableLockHolder &)
+{
+    return freezePartitionsByMatcher(getPartitionMatcher(partition_ast, local_context), metadata_snapshot, with_name, local_context);
+}
+
+PartitionCommandsResultInfo MergeTreeData::freezeAll(
+    const String & with_name,
+    const StorageMetadataPtr & metadata_snapshot,
+    ContextPtr local_context,
+    TableLockHolder &)
+{
+    return freezePartitionsByMatcher([] (const String &) { return true; }, metadata_snapshot, with_name, local_context);
+}
+
+PartitionCommandsResultInfo MergeTreeData::freezePartitionsByMatcher(
+    MatcherFn matcher,
+    const StorageMetadataPtr & metadata_snapshot,
+    const String & with_name,
+    ContextPtr local_context)
+{
+    String clickhouse_path = Poco::Path(local_context->getPath()).makeAbsolute().toString();
     String default_shadow_path = clickhouse_path + "shadow/";
     Poco::File(default_shadow_path).createDirectories();
     auto increment = Increment(default_shadow_path + "increment.txt").get(true);
@@ -3686,7 +3860,7 @@ PartitionCommandsResultInfo MergeTreeData::freezePartitionsByMatcher(MatcherFn m
     size_t parts_processed = 0;
     for (const auto & part : data_parts)
     {
-        if (!matcher(part))
+        if (!matcher(part->info.partition_id))
             continue;
 
         LOG_DEBUG(log, "Freezing part {} snapshot will be placed at {}", part->name, backup_path);
@@ -3716,6 +3890,70 @@ PartitionCommandsResultInfo MergeTreeData::freezePartitionsByMatcher(MatcherFn m
     return result;
 }
 
+PartitionCommandsResultInfo MergeTreeData::unfreezePartition(
+    const ASTPtr & partition,
+    const String & backup_name,
+    ContextPtr local_context,
+    TableLockHolder &)
+{
+    return unfreezePartitionsByMatcher(getPartitionMatcher(partition, local_context), backup_name, local_context);
+}
+
+PartitionCommandsResultInfo MergeTreeData::unfreezeAll(
+    const String & backup_name,
+    ContextPtr local_context,
+    TableLockHolder &)
+{
+    return unfreezePartitionsByMatcher([] (const String &) { return true; }, backup_name, local_context);
+}
+
+PartitionCommandsResultInfo MergeTreeData::unfreezePartitionsByMatcher(MatcherFn matcher, const String & backup_name, ContextPtr)
+{
+    auto backup_path = std::filesystem::path("shadow") / escapeForFileName(backup_name) / relative_data_path;
+
+    LOG_DEBUG(log, "Unfreezing parts by path {}", backup_path.generic_string());
+
+    PartitionCommandsResultInfo result;
+
+    for (const auto & disk : getStoragePolicy()->getDisks())
+    {
+        if (!disk->exists(backup_path))
+            continue;
+
+        for (auto it = disk->iterateDirectory(backup_path); it->isValid(); it->next())
+        {
+            const auto & partition_directory = it->name();
+
+            /// Partition ID is prefix of part directory name: <partition id>_<rest of part directory name>
+            auto found = partition_directory.find('_');
+            if (found == std::string::npos)
+                continue;
+            auto partition_id = partition_directory.substr(0, found);
+
+            if (!matcher(partition_id))
+                continue;
+
+            const auto & path = it->path();
+
+            disk->removeRecursive(path);
+
+            result.push_back(PartitionCommandResultInfo{
+                .partition_id = partition_id,
+                .part_name = partition_directory,
+                .backup_path = disk->getPath() + backup_path.generic_string(),
+                .part_backup_path = disk->getPath() + path,
+                .backup_name = backup_name,
+            });
+
+            LOG_DEBUG(log, "Unfreezed part by path {}", disk->getPath() + path);
+        }
+    }
+
+    LOG_DEBUG(log, "Unfreezed {} parts", result.size());
+
+    return result;
+}
+
 bool MergeTreeData::canReplacePartition(const DataPartPtr & src_part) const
 {
     const auto settings = getSettings();
@@ -3752,7 +3990,7 @@ void MergeTreeData::writePartLog(
 try
 {
     auto table_id = getStorageID();
-    auto part_log = global_context.getPartLog(table_id.database_name);
+    auto part_log = getContext()->getPartLog(table_id.database_name);
     if (!part_log)
         return;
 
@@ -4019,7 +4257,7 @@ NamesAndTypesList MergeTreeData::getVirtuals() const
 
 size_t MergeTreeData::getTotalMergesWithTTLInMergeList() const
 {
-    return global_context.getMergeList().getMergesWithTTLCount();
+    return getContext()->getMergeList().getMergesWithTTLCount();
 }
 
 void MergeTreeData::addPartContributionToDataVolume(const DataPartPtr & part)
@@ -4072,4 +4310,187 @@ void MergeTreeData::removeQueryId(const String & query_id) const
     else
         query_id_set.erase(query_id);
 }
+
+ReservationPtr MergeTreeData::balancedReservation(
+    const StorageMetadataPtr & metadata_snapshot,
+    size_t part_size,
+    size_t max_volume_index,
+    const String & part_name,
+    const MergeTreePartInfo & part_info,
+    MergeTreeData::DataPartsVector covered_parts,
+    std::optional<CurrentlySubmergingEmergingTagger> * tagger_ptr,
+    const IMergeTreeDataPart::TTLInfos * ttl_infos,
+    bool is_insert)
+{
+    ReservationPtr reserved_space;
+    auto min_bytes_to_rebalance_partition_over_jbod = getSettings()->min_bytes_to_rebalance_partition_over_jbod;
+    if (tagger_ptr && min_bytes_to_rebalance_partition_over_jbod > 0 && part_size >= min_bytes_to_rebalance_partition_over_jbod)
+    try
+    {
+        const auto & disks = getStoragePolicy()->getVolume(max_volume_index)->getDisks();
+        std::map<String, size_t> disk_occupation;
+        std::map<String, std::vector<String>> disk_parts_for_logging;
+        for (const auto & disk : disks)
+            disk_occupation.emplace(disk->getName(), 0);
+
+        std::set<String> committed_big_parts_from_partition;
+        std::set<String> submerging_big_parts_from_partition;
+        std::lock_guard lock(currently_submerging_emerging_mutex);
+
+        for (const auto & part : currently_submerging_big_parts)
+        {
+            if (part_info.partition_id == part->info.partition_id)
+                submerging_big_parts_from_partition.insert(part->name);
+        }
+
+        {
+            auto lock_parts = lockParts();
+            if (covered_parts.empty())
+            {
+                // It's a part fetch. Calculate `covered_parts` here.
+                MergeTreeData::DataPartPtr covering_part;
+                covered_parts = getActivePartsToReplace(part_info, part_name, covering_part, lock_parts);
+            }
+
+            // Remove irrelevant parts.
+            covered_parts.erase(
+                std::remove_if(
+                    covered_parts.begin(),
+                    covered_parts.end(),
+                    [min_bytes_to_rebalance_partition_over_jbod](const auto & part)
+                    {
+                        return !(part->isStoredOnDisk() && part->getBytesOnDisk() >= min_bytes_to_rebalance_partition_over_jbod);
+                    }),
+                covered_parts.end());
+
+            // Include current submerging big parts which are not yet in `currently_submerging_big_parts`
+            for (const auto & part : covered_parts)
+                submerging_big_parts_from_partition.insert(part->name);
+
+            for (const auto & part : getDataPartsStateRange(MergeTreeData::DataPartState::Committed))
+            {
+                if (part->isStoredOnDisk() && part->getBytesOnDisk() >= min_bytes_to_rebalance_partition_over_jbod
+                    && part_info.partition_id == part->info.partition_id)
+                {
+                    auto name = part->volume->getDisk()->getName();
+                    auto it = disk_occupation.find(name);
+                    if (it != disk_occupation.end())
+                    {
+                        if (submerging_big_parts_from_partition.find(part->name) == submerging_big_parts_from_partition.end())
+                        {
+                            it->second += part->getBytesOnDisk();
+                            disk_parts_for_logging[name].push_back(formatReadableSizeWithBinarySuffix(part->getBytesOnDisk()));
+                            committed_big_parts_from_partition.insert(part->name);
+                        }
+                        else
+                        {
+                            disk_parts_for_logging[name].push_back(formatReadableSizeWithBinarySuffix(part->getBytesOnDisk()) + " (submerging)");
+                        }
+                    }
+                    else
+                    {
+                        // Part is on different volume. Ignore it.
+                    }
+                }
+            }
+        }
+
+        for (const auto & [name, emerging_part] : currently_emerging_big_parts)
+        {
+            // It's possible that the emerging big parts are committed and get added twice. Thus a set is used to deduplicate.
+            if (committed_big_parts_from_partition.find(name) == committed_big_parts_from_partition.end()
+                && part_info.partition_id == emerging_part.partition_id)
+            {
+                auto it = disk_occupation.find(emerging_part.disk_name);
+                if (it != disk_occupation.end())
+                {
+                    it->second += emerging_part.estimate_bytes;
+                    disk_parts_for_logging[emerging_part.disk_name].push_back(
+                        formatReadableSizeWithBinarySuffix(emerging_part.estimate_bytes) + " (emerging)");
+                }
+                else
+                {
+                    // Part is on different volume. Ignore it.
+                }
+            }
+        }
+
+        size_t min_occupation_size = std::numeric_limits<size_t>::max();
+        std::vector<String> candidates;
+        for (const auto & [disk_name, size] : disk_occupation)
+        {
+            if (size < min_occupation_size)
+            {
+                min_occupation_size = size;
+                candidates = {disk_name};
+            }
+            else if (size == min_occupation_size)
+            {
+                candidates.push_back(disk_name);
+            }
+        }
+
+        if (!candidates.empty())
+        {
+            // Random pick one disk from best candidates
+            std::shuffle(candidates.begin(), candidates.end(), thread_local_rng);
+            String selected_disk_name = candidates.front();
+            WriteBufferFromOwnString log_str;
+            writeCString("\nbalancer: \n", log_str);
+            for (const auto & [disk_name, per_disk_parts] : disk_parts_for_logging)
+                writeString(fmt::format("  {}: [{}]\n", disk_name, fmt::join(per_disk_parts, ", ")), log_str);
+            LOG_DEBUG(log, log_str.str());
+
+            if (ttl_infos)
+                reserved_space = tryReserveSpacePreferringTTLRules(
+                    metadata_snapshot,
+                    part_size,
+                    *ttl_infos,
+                    time(nullptr),
+                    max_volume_index,
+                    is_insert,
+                    getStoragePolicy()->getDiskByName(selected_disk_name));
+            else
+                reserved_space = tryReserveSpace(part_size, getStoragePolicy()->getDiskByName(selected_disk_name));
+
+            if (reserved_space)
+            {
+                currently_emerging_big_parts.emplace(
+                    part_name, EmergingPartInfo{reserved_space->getDisk(0)->getName(), part_info.partition_id, part_size});
+
+                for (const auto & part : covered_parts)
+                {
+                    if (currently_submerging_big_parts.count(part))
+                        LOG_WARNING(log, "currently_submerging_big_parts contains duplicates. JBOD might lose balance");
+                    else
+                        currently_submerging_big_parts.insert(part);
+                }
+
+                // Record submerging big parts in the tagger to clean them up.
+                tagger_ptr->emplace(*this, part_name, std::move(covered_parts), log);
+            }
+        }
+    }
+    catch (...)
+    {
+        LOG_DEBUG(log, "JBOD balancer encounters an error. Fallback to random disk selection");
+        tryLogCurrentException(log);
+    }
+    return reserved_space;
+}
+
+CurrentlySubmergingEmergingTagger::~CurrentlySubmergingEmergingTagger()
+{
+    std::lock_guard lock(storage.currently_submerging_emerging_mutex);
+
+    for (const auto & part : submerging_parts)
+    {
+        if (!storage.currently_submerging_big_parts.count(part))
+            LOG_WARNING(log, "currently_submerging_big_parts doesn't contain part {} to erase. This is a bug", part->name);
+        else
+            storage.currently_submerging_big_parts.erase(part);
+    }
+    storage.currently_emerging_big_parts.erase(emerging_part_name);
+}
+
 }
diff --git a/src/Storages/MergeTree/MergeTreeData.h b/src/Storages/MergeTree/MergeTreeData.h
index 2aefa66ac58..46c0014d9f7 100644
--- a/src/Storages/MergeTree/MergeTreeData.h
+++ b/src/Storages/MergeTree/MergeTreeData.h
@@ -41,9 +41,20 @@ class MutationCommands;
 class Context;
 struct JobAndPool;
 
+/// Auxiliary struct holding information about the future merged or mutated part.
+struct EmergingPartInfo
+{
+    String disk_name;
+    String partition_id;
+    size_t estimate_bytes;
+};
+
+struct CurrentlySubmergingEmergingTagger;
+
 class ExpressionActions;
 using ExpressionActionsPtr = std::shared_ptr<ExpressionActions>;
 using ManyExpressionActions = std::vector<ExpressionActionsPtr>;
+class MergeTreeDeduplicationLog;
 
 namespace ErrorCodes
 {
@@ -100,7 +111,7 @@ namespace ErrorCodes
 /// - MergeTreeDataWriter
 /// - MergeTreeDataMergerMutator
 
-class MergeTreeData : public IStorage
+class MergeTreeData : public IStorage, public WithContext
 {
 public:
     /// Function to call if the part is suspected to contain corrupt data.
@@ -116,6 +127,9 @@ public:
     using DataPartStates = std::initializer_list<DataPartState>;
     using DataPartStateVector = std::vector<DataPartState>;
 
+    constexpr static auto FORMAT_VERSION_FILE_NAME = "format_version.txt";
+    constexpr static auto DETACHED_DIR_NAME = "detached";
+
     /// Auxiliary structure for index comparison. Keep in mind lifetime of MergeTreePartInfo.
     struct DataPartStateAndInfo
     {
@@ -335,7 +349,7 @@ public:
     MergeTreeData(const StorageID & table_id_,
                   const String & relative_data_path_,
                   const StorageInMemoryMetadata & metadata_,
-                  Context & context_,
+                  ContextPtr context_,
                   const String & date_column_name,
                   const MergingParams & merging_params_,
                   std::unique_ptr<MergeTreeSettings> settings_,
@@ -361,7 +375,7 @@ public:
 
     NamesAndTypesList getVirtuals() const override;
 
-    bool mayBenefitFromIndexForIn(const ASTPtr & left_in_operand, const Context &, const StorageMetadataPtr & metadata_snapshot) const override;
+    bool mayBenefitFromIndexForIn(const ASTPtr & left_in_operand, ContextPtr, const StorageMetadataPtr & metadata_snapshot) const override;
 
     /// Load the set of data parts from disk. Call once - immediately after the object is created.
     void loadDataParts(bool skip_sanity_checks);
@@ -384,10 +398,10 @@ public:
 
     void validateDetachedPartName(const String & name) const;
 
-    void dropDetached(const ASTPtr & partition, bool part, const Context & context);
+    void dropDetached(const ASTPtr & partition, bool part, ContextPtr context);
 
     MutableDataPartsVector tryLoadPartsToAttach(const ASTPtr & partition, bool attach_part,
-            const Context & context, PartsTemporaryRename & renamed_parts);
+            ContextPtr context, PartsTemporaryRename & renamed_parts);
 
     /// Returns Committed parts
     DataParts getDataParts() const;
@@ -434,23 +448,23 @@ public:
     /// active set later with out_transaction->commit()).
     /// Else, commits the part immediately.
     /// Returns true if part was added. Returns false if part is covered by bigger part.
-    bool renameTempPartAndAdd(MutableDataPartPtr & part, SimpleIncrement * increment = nullptr, Transaction * out_transaction = nullptr);
+    bool renameTempPartAndAdd(MutableDataPartPtr & part, SimpleIncrement * increment = nullptr, Transaction * out_transaction = nullptr, MergeTreeDeduplicationLog * deduplication_log = nullptr);
 
     /// The same as renameTempPartAndAdd but the block range of the part can contain existing parts.
     /// Returns all parts covered by the added part (in ascending order).
     /// If out_transaction == nullptr, marks covered parts as Outdated.
     DataPartsVector renameTempPartAndReplace(
-        MutableDataPartPtr & part, SimpleIncrement * increment = nullptr, Transaction * out_transaction = nullptr);
+        MutableDataPartPtr & part, SimpleIncrement * increment = nullptr, Transaction * out_transaction = nullptr, MergeTreeDeduplicationLog * deduplication_log = nullptr);
 
     /// Low-level version of previous one, doesn't lock mutex
     bool renameTempPartAndReplace(
             MutableDataPartPtr & part, SimpleIncrement * increment, Transaction * out_transaction, DataPartsLock & lock,
-            DataPartsVector * out_covered_parts = nullptr);
+            DataPartsVector * out_covered_parts = nullptr, MergeTreeDeduplicationLog * deduplication_log = nullptr);
 
 
     /// Remove parts from working set immediately (without wait for background
     /// process). Transfer part state to temporary. Have very limited usage only
-    /// for new parts which don't already present in table.
+    /// for new parts which aren't already present in table.
     void removePartsFromWorkingSetImmediatelyAndSetTemporaryState(const DataPartsVector & remove);
 
     /// Removes parts from the working set parts.
@@ -517,7 +531,11 @@ public:
     /// - all type conversions can be done.
     /// - columns corresponding to primary key, indices, sign, sampling expression and date are not affected.
     /// If something is wrong, throws an exception.
-    void checkAlterIsPossible(const AlterCommands & commands, const Settings & settings) const override;
+    void checkAlterIsPossible(const AlterCommands & commands, ContextPtr context) const override;
+
+    /// Checks if the Mutation can be performed.
+    /// (currently no additional checks: always ok)
+    void checkMutationIsPossible(const MutationCommands & commands, const Settings & settings) const override;
 
     /// Checks that partition name in all commands is valid
     void checkAlterPartitionIsPossible(const PartitionCommands & commands, const StorageMetadataPtr & metadata_snapshot, const Settings & settings) const override;
@@ -527,13 +545,6 @@ public:
         const ASTPtr & new_settings,
         TableLockHolder & table_lock_holder);
 
-    /// Freezes all parts.
-    PartitionCommandsResultInfo freezeAll(
-        const String & with_name,
-        const StorageMetadataPtr & metadata_snapshot,
-        const Context & context,
-        TableLockHolder & table_lock_holder);
-
     /// Should be called if part data is suspected to be corrupted.
     void reportBrokenPart(const String & name) const
     {
@@ -551,15 +562,38 @@ public:
       * Backup is created in directory clickhouse_dir/shadow/i/, where i - incremental number,
       *  or if 'with_name' is specified - backup is created in directory with specified name.
       */
-    PartitionCommandsResultInfo freezePartition(const ASTPtr & partition, const StorageMetadataPtr & metadata_snapshot, const String & with_name, const Context & context, TableLockHolder & table_lock_holder);
+    PartitionCommandsResultInfo freezePartition(
+        const ASTPtr & partition,
+        const StorageMetadataPtr & metadata_snapshot,
+        const String & with_name,
+        ContextPtr context,
+        TableLockHolder & table_lock_holder);
 
+    /// Freezes all parts.
+    PartitionCommandsResultInfo freezeAll(
+        const String & with_name,
+        const StorageMetadataPtr & metadata_snapshot,
+        ContextPtr context,
+        TableLockHolder & table_lock_holder);
+
+    /// Unfreezes particular partition.
+    PartitionCommandsResultInfo unfreezePartition(
+        const ASTPtr & partition,
+        const String & backup_name,
+        ContextPtr context,
+        TableLockHolder & table_lock_holder);
+
+    /// Unfreezes all parts.
+    PartitionCommandsResultInfo unfreezeAll(
+        const String & backup_name,
+        ContextPtr context,
+        TableLockHolder & table_lock_holder);
 
-public:
     /// Moves partition to specified Disk
-    void movePartitionToDisk(const ASTPtr & partition, const String & name, bool moving_part, const Context & context);
+    void movePartitionToDisk(const ASTPtr & partition, const String & name, bool moving_part, ContextPtr context);
 
     /// Moves partition to specified Volume
-    void movePartitionToVolume(const ASTPtr & partition, const String & name, bool moving_part, const Context & context);
+    void movePartitionToVolume(const ASTPtr & partition, const String & name, bool moving_part, ContextPtr context);
 
     void checkPartitionCanBeDropped(const ASTPtr & partition) override;
 
@@ -568,7 +602,7 @@ public:
     Pipe alterPartition(
         const StorageMetadataPtr & metadata_snapshot,
         const PartitionCommands & commands,
-        const Context & query_context) override;
+        ContextPtr query_context) override;
 
     size_t getColumnCompressedSize(const std::string & name) const
     {
@@ -584,7 +618,7 @@ public:
     }
 
     /// For ATTACH/DETACH/DROP PARTITION.
-    String getPartitionIDFromQuery(const ASTPtr & ast, const Context & context) const;
+    String getPartitionIDFromQuery(const ASTPtr & ast, ContextPtr context) const;
 
     /// Extracts MergeTreeData of other *MergeTree* storage
     ///  and checks that their structure suitable for ALTER TABLE ATTACH PARTITION FROM
@@ -647,7 +681,8 @@ public:
         const IMergeTreeDataPart::TTLInfos & ttl_infos,
         time_t time_of_move,
         size_t min_volume_index = 0,
-        bool is_insert = false) const;
+        bool is_insert = false,
+        DiskPtr selected_disk = nullptr) const;
 
     ReservationPtr tryReserveSpacePreferringTTLRules(
         const StorageMetadataPtr & metadata_snapshot,
@@ -655,14 +690,31 @@ public:
         const IMergeTreeDataPart::TTLInfos & ttl_infos,
         time_t time_of_move,
         size_t min_volume_index = 0,
-        bool is_insert = false) const;
+        bool is_insert = false,
+        DiskPtr selected_disk = nullptr) const;
+
+    /// Reserves space for the part based on the distribution of "big parts" in the same partition.
+    /// Parts with estimated size larger than `min_bytes_to_rebalance_partition_over_jbod` are
+    /// considered as big. The priority is lower than TTL. If reservation fails, return nullptr.
+    ReservationPtr balancedReservation(
+        const StorageMetadataPtr & metadata_snapshot,
+        size_t part_size,
+        size_t max_volume_index,
+        const String & part_name,
+        const MergeTreePartInfo & part_info,
+        MergeTreeData::DataPartsVector covered_parts,
+        std::optional<CurrentlySubmergingEmergingTagger> * tagger_ptr,
+        const IMergeTreeDataPart::TTLInfos * ttl_infos,
+        bool is_insert = false);
 
     /// Choose disk with max available free space
     /// Reserves 0 bytes
-    ReservationPtr makeEmptyReservationOnLargestDisk() { return getStoragePolicy()->makeEmptyReservationOnLargestDisk(); }
+    ReservationPtr makeEmptyReservationOnLargestDisk() const { return getStoragePolicy()->makeEmptyReservationOnLargestDisk(); }
+
+    Disks getDisksByType(DiskType::Type type) const { return getStoragePolicy()->getDisksByType(type); }
 
     /// Return alter conversions for part which must be applied on fly.
-    AlterConversions getAlterConversionsForPart(const MergeTreeDataPartPtr part) const;
+    AlterConversions getAlterConversionsForPart(MergeTreeDataPartPtr part) const;
     /// Returns destination disk or volume for the TTL rule according to current storage policy
     /// 'is_insert' - is TTL move performed on new data part insert.
     SpacePtr getDestinationForMoveTTL(const TTLDescription & move_ttl, bool is_insert = false) const;
@@ -681,19 +733,22 @@ public:
 
     MergeTreeDataFormatVersion format_version;
 
-    Context & global_context;
-
     /// Merging params - what additional actions to perform during merge.
     const MergingParams merging_params;
 
     bool is_custom_partitioned = false;
 
-    ExpressionActionsPtr minmax_idx_expr;
-    Names minmax_idx_columns;
-    DataTypes minmax_idx_column_types;
+    /// Used only for old syntax tables. Never changes after init.
     Int64 minmax_idx_date_column_pos = -1; /// In a common case minmax index includes a date column.
     Int64 minmax_idx_time_column_pos = -1; /// In other cases, minmax index often includes a dateTime column.
 
+    /// Get partition key expression on required columns
+    static ExpressionActionsPtr getMinMaxExpr(const KeyDescription & partition_key, const ExpressionActionsSettings & settings);
+    /// Get column names required for partition key
+    static Names getMinMaxColumnsNames(const KeyDescription & partition_key);
+    /// Get column types required for partition key
+    static DataTypes getMinMaxColumnsTypes(const KeyDescription & partition_key);
+
     ExpressionActionsPtr getPrimaryKeyAndSkipIndicesExpression(const StorageMetadataPtr & metadata_snapshot) const;
     ExpressionActionsPtr getSortingKeyAndSkipIndicesExpression(const StorageMetadataPtr & metadata_snapshot) const;
 
@@ -732,6 +787,26 @@ public:
     std::optional<JobAndPool> getDataMovingJob();
     bool areBackgroundMovesNeeded() const;
 
+    /// Lock part in zookeeper for use common S3 data in several nodes
+    /// Overridden in StorageReplicatedMergeTree
+    virtual void lockSharedData(const IMergeTreeDataPart &) const {}
+
+    /// Unlock common S3 data part in zookeeper
+    /// Overridden in StorageReplicatedMergeTree
+    virtual bool unlockSharedData(const IMergeTreeDataPart &) const { return true; }
+
+    /// Fetch part only if some replica has it on shared storage like S3
+    /// Overridden in StorageReplicatedMergeTree
+    virtual bool tryToFetchIfShared(const IMergeTreeDataPart &, const DiskPtr &, const String &) { return false; }
+
+    /// Parts that currently submerging (merging to bigger parts) or emerging
+    /// (to be appeared after merging finished). These two variables have to be used
+    /// with `currently_submerging_emerging_mutex`.
+    DataParts currently_submerging_big_parts;
+    std::map<String, EmergingPartInfo> currently_emerging_big_parts;
+    /// Mutex for currently_submerging_parts and currently_emerging_parts
+    mutable std::mutex currently_submerging_emerging_mutex;
+
 protected:
 
     friend class IMergeTreeDataPart;
@@ -816,6 +891,9 @@ protected:
         return {begin, end};
     }
 
+    std::optional<UInt64> totalRowsByPartitionPredicateImpl(
+        const SelectQueryInfo & query_info, ContextPtr context, const DataPartsVector & parts) const;
+
     static decltype(auto) getStateModifier(DataPartState state)
     {
         return [state] (const DataPartPtr & part) { part->setState(state); };
@@ -879,19 +957,25 @@ protected:
     bool isPrimaryOrMinMaxKeyColumnPossiblyWrappedInFunctions(const ASTPtr & node, const StorageMetadataPtr & metadata_snapshot) const;
 
     /// Common part for |freezePartition()| and |freezeAll()|.
-    using MatcherFn = std::function<bool(const DataPartPtr &)>;
-    PartitionCommandsResultInfo freezePartitionsByMatcher(MatcherFn matcher, const StorageMetadataPtr & metadata_snapshot, const String & with_name, const Context & context);
+    using MatcherFn = std::function<bool(const String &)>;
+    PartitionCommandsResultInfo freezePartitionsByMatcher(MatcherFn matcher, const StorageMetadataPtr & metadata_snapshot, const String & with_name, ContextPtr context);
+    PartitionCommandsResultInfo unfreezePartitionsByMatcher(MatcherFn matcher, const String & backup_name, ContextPtr context);
 
     // Partition helpers
     bool canReplacePartition(const DataPartPtr & src_part) const;
 
-    virtual void dropPartition(const ASTPtr & partition, bool detach, bool drop_part, const Context & context, bool throw_if_noop = true) = 0;
-    virtual PartitionCommandsResultInfo attachPartition(const ASTPtr & partition, const StorageMetadataPtr & metadata_snapshot, bool part, const Context & context) = 0;
-    virtual void replacePartitionFrom(const StoragePtr & source_table, const ASTPtr & partition, bool replace, const Context & context) = 0;
-    virtual void movePartitionToTable(const StoragePtr & dest_table, const ASTPtr & partition, const Context & context) = 0;
+    virtual void dropPartition(const ASTPtr & partition, bool detach, bool drop_part, ContextPtr context, bool throw_if_noop = true) = 0;
+    virtual PartitionCommandsResultInfo attachPartition(const ASTPtr & partition, const StorageMetadataPtr & metadata_snapshot, bool part, ContextPtr context) = 0;
+    virtual void replacePartitionFrom(const StoragePtr & source_table, const ASTPtr & partition, bool replace, ContextPtr context) = 0;
+    virtual void movePartitionToTable(const StoragePtr & dest_table, const ASTPtr & partition, ContextPtr context) = 0;
 
     /// Makes sense only for replicated tables
-    virtual void fetchPartition(const ASTPtr & partition, const StorageMetadataPtr & metadata_snapshot, const String & from, const Context & query_context);
+    virtual void fetchPartition(
+        const ASTPtr & partition,
+        const StorageMetadataPtr & metadata_snapshot,
+        const String & from,
+        bool fetch_part,
+        ContextPtr query_context);
 
     void writePartLog(
         PartLogElement::Type type,
@@ -964,6 +1048,27 @@ private:
     // Record all query ids which access the table. It's guarded by `query_id_set_mutex` and is always mutable.
     mutable std::set<String> query_id_set;
     mutable std::mutex query_id_set_mutex;
+
+    // Get partition matcher for FREEZE / UNFREEZE queries.
+    MatcherFn getPartitionMatcher(const ASTPtr & partition, ContextPtr context) const;
+};
+
+/// RAII struct to record big parts that are submerging or emerging.
+/// It's used to calculate the balanced statistics of JBOD array.
+struct CurrentlySubmergingEmergingTagger
+{
+    MergeTreeData & storage;
+    String emerging_part_name;
+    MergeTreeData::DataPartsVector submerging_parts;
+    Poco::Logger * log;
+
+    CurrentlySubmergingEmergingTagger(
+        MergeTreeData & storage_, const String & name_, MergeTreeData::DataPartsVector && parts_, Poco::Logger * log_)
+        : storage(storage_), emerging_part_name(name_), submerging_parts(std::move(parts_)), log(log_)
+    {
+    }
+
+    ~CurrentlySubmergingEmergingTagger();
 };
 
 }
diff --git a/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp b/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp
index c571a53d4c8..dfebd88abe9 100644
--- a/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp
@@ -637,7 +637,7 @@ public:
     }
 };
 
-static bool needSyncPart(const size_t input_rows, size_t input_bytes, const MergeTreeSettings & settings)
+static bool needSyncPart(size_t input_rows, size_t input_bytes, const MergeTreeSettings & settings)
 {
     return ((settings.min_rows_to_fsync_after_merge && input_rows >= settings.min_rows_to_fsync_after_merge)
         || (settings.min_compressed_bytes_to_fsync_after_merge && input_bytes >= settings.min_compressed_bytes_to_fsync_after_merge));
@@ -651,7 +651,7 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataMergerMutator::mergePartsToTempor
     MergeList::Entry & merge_entry,
     TableLockHolder &,
     time_t time_of_merge,
-    const Context & context,
+    ContextPtr context,
     const ReservationPtr & space_reservation,
     bool deduplicate,
     const Names & deduplicate_by_columns)
@@ -751,12 +751,14 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataMergerMutator::mergePartsToTempor
     /// deadlock is impossible.
     auto compression_codec = data.getCompressionCodecForPart(merge_entry->total_size_bytes_compressed, new_data_part->ttl_infos, time_of_merge);
 
-    auto tmp_disk = context.getTemporaryVolume()->getDisk();
+    auto tmp_disk = context->getTemporaryVolume()->getDisk();
     String rows_sources_file_path;
     std::unique_ptr<WriteBufferFromFileBase> rows_sources_uncompressed_write_buf;
     std::unique_ptr<WriteBuffer> rows_sources_write_buf;
     std::optional<ColumnSizeEstimator> column_sizes;
 
+    SyncGuardPtr sync_guard;
+
     if (chosen_merge_algorithm == MergeAlgorithm::Vertical)
     {
         tmp_disk->createDirectories(new_part_tmp_path);
@@ -769,6 +771,9 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataMergerMutator::mergePartsToTempor
             part->accumulateColumnSizes(merged_column_to_size);
 
         column_sizes = ColumnSizeEstimator(merged_column_to_size, merging_column_names, gathering_column_names);
+
+        if (data.getSettings()->fsync_part_directory)
+            sync_guard = disk->getDirectorySyncGuard(new_part_tmp_path);
     }
     else
     {
@@ -778,10 +783,6 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataMergerMutator::mergePartsToTempor
         gathering_column_names.clear();
     }
 
-    SyncGuardPtr sync_guard;
-    if (data.getSettings()->fsync_part_directory)
-        sync_guard = disk->getDirectorySyncGuard(new_part_tmp_path);
-
     /** Read from all parts, merge and write into a new one.
       * In passing, we calculate expression for sorting.
       */
@@ -909,7 +910,7 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataMergerMutator::mergePartsToTempor
     {
         const auto & indices = metadata_snapshot->getSecondaryIndices();
         merged_stream = std::make_shared<ExpressionBlockInputStream>(
-            merged_stream, indices.getSingleExpressionForIndices(metadata_snapshot->getColumns(), data.global_context));
+            merged_stream, indices.getSingleExpressionForIndices(metadata_snapshot->getColumns(), data.getContext()));
         merged_stream = std::make_shared<MaterializingBlockInputStream>(merged_stream);
     }
 
@@ -1098,7 +1099,7 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataMergerMutator::mutatePartToTempor
     const MutationCommands & commands,
     MergeListEntry & merge_entry,
     time_t time_of_mutation,
-    const Context & context,
+    ContextPtr context,
     const ReservationPtr & space_reservation,
     TableLockHolder &)
 {
@@ -1112,12 +1113,12 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataMergerMutator::mutatePartToTempor
     const auto & source_part = future_part.parts[0];
     auto storage_from_source_part = StorageFromMergeTreeDataPart::create(source_part);
 
-    auto context_for_reading = context;
-    context_for_reading.setSetting("max_streams_to_max_threads_ratio", 1);
-    context_for_reading.setSetting("max_threads", 1);
+    auto context_for_reading = Context::createCopy(context);
+    context_for_reading->setSetting("max_streams_to_max_threads_ratio", 1);
+    context_for_reading->setSetting("max_threads", 1);
     /// Allow mutations to work when force_index_by_date or force_primary_key is on.
-    context_for_reading.setSetting("force_index_by_date", Field(0));
-    context_for_reading.setSetting("force_primary_key", Field(0));
+    context_for_reading->setSetting("force_index_by_date", Field(0));
+    context_for_reading->setSetting("force_primary_key", Field(0));
 
     MutationCommands commands_for_part;
     for (const auto & command : commands)
@@ -1128,7 +1129,7 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataMergerMutator::mutatePartToTempor
     }
 
     if (source_part->isStoredOnDisk() && !isStorageTouchedByMutations(
-        storage_from_source_part, metadata_snapshot, commands_for_part, context_for_reading))
+        storage_from_source_part, metadata_snapshot, commands_for_part, Context::createCopy(context_for_reading)))
     {
         LOG_TRACE(log, "Part {} doesn't change up to mutation version {}", source_part->name, future_part.part_info.mutation);
         return data.cloneAndLoadDataPartOnSameDisk(source_part, "tmp_clone_", future_part.part_info, metadata_snapshot);
@@ -1488,10 +1489,11 @@ NameToNameVector MergeTreeDataMergerMutator::collectFilesForRenames(
     std::map<String, size_t> stream_counts;
     for (const NameAndTypePair & column : source_part->getColumns())
     {
-        column.type->enumerateStreams(
-            [&](const IDataType::SubstreamPath & substream_path, const IDataType & /* substream_type */)
+        auto serialization = source_part->getSerializationForColumn(column);
+        serialization->enumerateStreams(
+            [&](const ISerialization::SubstreamPath & substream_path)
             {
-                ++stream_counts[IDataType::getFileNameForStream(column, substream_path)];
+                ++stream_counts[ISerialization::getFileNameForStream(column, substream_path)];
             },
             {});
     }
@@ -1507,9 +1509,9 @@ NameToNameVector MergeTreeDataMergerMutator::collectFilesForRenames(
         }
         else if (command.type == MutationCommand::Type::DROP_COLUMN)
         {
-            IDataType::StreamCallback callback = [&](const IDataType::SubstreamPath & substream_path, const IDataType & /* substream_type */)
+            ISerialization::StreamCallback callback = [&](const ISerialization::SubstreamPath & substream_path)
             {
-                String stream_name = IDataType::getFileNameForStream({command.column_name, command.data_type}, substream_path);
+                String stream_name = ISerialization::getFileNameForStream({command.column_name, command.data_type}, substream_path);
                 /// Delete files if they are no longer shared with another column.
                 if (--stream_counts[stream_name] == 0)
                 {
@@ -1518,19 +1520,21 @@ NameToNameVector MergeTreeDataMergerMutator::collectFilesForRenames(
                 }
             };
 
-            IDataType::SubstreamPath stream_path;
             auto column = source_part->getColumns().tryGetByName(command.column_name);
             if (column)
-                column->type->enumerateStreams(callback, stream_path);
+            {
+                auto serialization = source_part->getSerializationForColumn(*column);
+                serialization->enumerateStreams(callback);
+            }
         }
         else if (command.type == MutationCommand::Type::RENAME_COLUMN)
         {
             String escaped_name_from = escapeForFileName(command.column_name);
             String escaped_name_to = escapeForFileName(command.rename_to);
 
-            IDataType::StreamCallback callback = [&](const IDataType::SubstreamPath & substream_path, const IDataType & /* substream_type */)
+            ISerialization::StreamCallback callback = [&](const ISerialization::SubstreamPath & substream_path)
             {
-                String stream_from = IDataType::getFileNameForStream({command.column_name, command.data_type}, substream_path);
+                String stream_from = ISerialization::getFileNameForStream({command.column_name, command.data_type}, substream_path);
 
                 String stream_to = boost::replace_first_copy(stream_from, escaped_name_from, escaped_name_to);
 
@@ -1540,10 +1544,13 @@ NameToNameVector MergeTreeDataMergerMutator::collectFilesForRenames(
                     rename_vector.emplace_back(stream_from + mrk_extension, stream_to + mrk_extension);
                 }
             };
-            IDataType::SubstreamPath stream_path;
+
             auto column = source_part->getColumns().tryGetByName(command.column_name);
             if (column)
-                column->type->enumerateStreams(callback, stream_path);
+            {
+                auto serialization = source_part->getSerializationForColumn(*column);
+                serialization->enumerateStreams(callback);
+            }
         }
     }
 
@@ -1561,15 +1568,15 @@ NameSet MergeTreeDataMergerMutator::collectFilesToSkip(
     /// Skip updated files
     for (const auto & entry : updated_header)
     {
-        IDataType::StreamCallback callback = [&](const IDataType::SubstreamPath & substream_path, const IDataType & /* substream_type */)
+        ISerialization::StreamCallback callback = [&](const ISerialization::SubstreamPath & substream_path)
         {
-            String stream_name = IDataType::getFileNameForStream({entry.name, entry.type}, substream_path);
+            String stream_name = ISerialization::getFileNameForStream({entry.name, entry.type}, substream_path);
             files_to_skip.insert(stream_name + ".bin");
             files_to_skip.insert(stream_name + mrk_extension);
         };
 
-        IDataType::SubstreamPath stream_path;
-        entry.type->enumerateStreams(callback, stream_path);
+        auto serialization = source_part->getSerializationForColumn({entry.name, entry.type});
+        serialization->enumerateStreams(callback);
     }
     for (const auto & index : indices_to_recalc)
     {
@@ -1683,7 +1690,7 @@ std::set<MergeTreeIndexPtr> MergeTreeDataMergerMutator::getIndicesToRecalculate(
     BlockInputStreamPtr & input_stream,
     const NamesAndTypesList & updated_columns,
     const StorageMetadataPtr & metadata_snapshot,
-    const Context & context)
+    ContextPtr context)
 {
     /// Checks if columns used in skipping indexes modified.
     const auto & index_factory = MergeTreeIndexFactory::instance();
@@ -1779,7 +1786,7 @@ void MergeTreeDataMergerMutator::mutateAllPartColumns(
     Block block;
     while (checkOperationIsNotCanceled(merge_entry) && (block = mutating_stream->read()))
     {
-        minmax_idx.update(block, data.minmax_idx_columns);
+        minmax_idx.update(block, data.getMinMaxColumnsNames(metadata_snapshot->getPartitionKey()));
         out.write(block);
 
         merge_entry->rows_written += block.rows();
@@ -1894,9 +1901,9 @@ void MergeTreeDataMergerMutator::finalizeMutatedPart(
         MergeTreeData::DataPart::calculateTotalSizeOnDisk(new_data_part->volume->getDisk(), new_data_part->getFullRelativePath()));
     new_data_part->default_codec = codec;
     new_data_part->calculateColumnsSizesOnDisk();
+    new_data_part->storage.lockSharedData(*new_data_part);
 }
 
-
 bool MergeTreeDataMergerMutator::checkOperationIsNotCanceled(const MergeListEntry & merge_entry) const
 {
     if (merges_blocker.isCancelled() || merge_entry->is_cancelled)
diff --git a/src/Storages/MergeTree/MergeTreeDataMergerMutator.h b/src/Storages/MergeTree/MergeTreeDataMergerMutator.h
index 2f3a898ba84..d4dc0ce8499 100644
--- a/src/Storages/MergeTree/MergeTreeDataMergerMutator.h
+++ b/src/Storages/MergeTree/MergeTreeDataMergerMutator.h
@@ -125,7 +125,7 @@ public:
         MergeListEntry & merge_entry,
         TableLockHolder & table_lock_holder,
         time_t time_of_merge,
-        const Context & context,
+        ContextPtr context,
         const ReservationPtr & space_reservation,
         bool deduplicate,
         const Names & deduplicate_by_columns);
@@ -137,7 +137,7 @@ public:
         const MutationCommands & commands,
         MergeListEntry & merge_entry,
         time_t time_of_mutation,
-        const Context & context,
+        ContextPtr context,
         const ReservationPtr & space_reservation,
         TableLockHolder & table_lock_holder);
 
@@ -199,7 +199,7 @@ private:
         BlockInputStreamPtr & input_stream,
         const NamesAndTypesList & updated_columns,
         const StorageMetadataPtr & metadata_snapshot,
-        const Context & context);
+        ContextPtr context);
 
     /// Override all columns of new part using mutating_stream
     void mutateAllPartColumns(
diff --git a/src/Storages/MergeTree/MergeTreeDataPartChecksum.cpp b/src/Storages/MergeTree/MergeTreeDataPartChecksum.cpp
index dd141a68248..b0eb1cbea70 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartChecksum.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataPartChecksum.cpp
@@ -293,11 +293,8 @@ String MergeTreeDataPartChecksums::getTotalChecksumHex() const
 {
     SipHash hash_of_all_files;
 
-    for (const auto & elem : files)
+    for (const auto & [name, checksum] : files)
     {
-        const String & name = elem.first;
-        const auto & checksum = elem.second;
-
         updateHash(hash_of_all_files, name);
         hash_of_all_files.update(checksum.file_hash);
     }
@@ -376,11 +373,8 @@ void MinimalisticDataPartChecksums::computeTotalChecksums(const MergeTreeDataPar
     SipHash hash_of_uncompressed_files_state;
     SipHash uncompressed_hash_of_compressed_files_state;
 
-    for (const auto & elem : full_checksums_.files)
+    for (const auto & [name, checksum] : full_checksums_.files)
     {
-        const String & name = elem.first;
-        const auto & checksum = elem.second;
-
         updateHash(hash_of_all_files_state, name);
         hash_of_all_files_state.update(checksum.file_hash);
 
diff --git a/src/Storages/MergeTree/MergeTreeDataPartCompact.h b/src/Storages/MergeTree/MergeTreeDataPartCompact.h
index 2c0c4020bb0..564d59c9198 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartCompact.h
+++ b/src/Storages/MergeTree/MergeTreeDataPartCompact.h
@@ -19,7 +19,6 @@ class MergeTreeDataPartCompact : public IMergeTreeDataPart
 {
 public:
     static constexpr auto DATA_FILE_NAME = "data";
-    static constexpr auto DATA_FILE_EXTENSION = ".bin";
     static constexpr auto DATA_FILE_NAME_WITH_EXTENSION = "data.bin";
 
     MergeTreeDataPartCompact(
diff --git a/src/Storages/MergeTree/MergeTreeDataPartInMemory.cpp b/src/Storages/MergeTree/MergeTreeDataPartInMemory.cpp
index 96fa411339c..045ab488ada 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartInMemory.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataPartInMemory.cpp
@@ -88,7 +88,7 @@ void MergeTreeDataPartInMemory::flushToDisk(const String & base_path, const Stri
 
     disk->createDirectories(destination_path);
 
-    auto compression_codec = storage.global_context.chooseCompressionCodec(0, 0);
+    auto compression_codec = storage.getContext()->chooseCompressionCodec(0, 0);
     auto indices = MergeTreeIndexFactory::instance().getMany(metadata_snapshot->getSecondaryIndices());
     MergedBlockOutputStream out(new_data_part, metadata_snapshot, columns, indices, compression_codec);
     out.writePrefix();
diff --git a/src/Storages/MergeTree/MergeTreeDataPartWide.cpp b/src/Storages/MergeTree/MergeTreeDataPartWide.cpp
index 5dd8c26f224..1da115efa70 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartWide.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataPartWide.cpp
@@ -82,9 +82,10 @@ ColumnSize MergeTreeDataPartWide::getColumnSizeImpl(
     if (checksums.empty())
         return size;
 
-    column.type->enumerateStreams([&](const IDataType::SubstreamPath & substream_path, const IDataType & /* substream_type */)
+    auto serialization = getSerializationForColumn(column);
+    serialization->enumerateStreams([&](const ISerialization::SubstreamPath & substream_path)
     {
-        String file_name = IDataType::getFileNameForStream(column, substream_path);
+        String file_name = ISerialization::getFileNameForStream(column, substream_path);
 
         if (processed_substreams && !processed_substreams->insert(file_name).second)
             return;
@@ -159,19 +160,19 @@ void MergeTreeDataPartWide::checkConsistency(bool require_part_metadata) const
         {
             for (const NameAndTypePair & name_type : columns)
             {
-                IDataType::SubstreamPath stream_path;
-                name_type.type->enumerateStreams([&](const IDataType::SubstreamPath & substream_path, const IDataType & /* substream_type */)
+                auto serialization = getSerializationForColumn(name_type);
+                serialization->enumerateStreams([&](const ISerialization::SubstreamPath & substream_path)
                 {
-                    String file_name = IDataType::getFileNameForStream(name_type, substream_path);
+                    String file_name = ISerialization::getFileNameForStream(name_type, substream_path);
                     String mrk_file_name = file_name + index_granularity_info.marks_file_extension;
-                    String bin_file_name = file_name + ".bin";
+                    String bin_file_name = file_name + DATA_FILE_EXTENSION;
                     if (!checksums.files.count(mrk_file_name))
                         throw Exception("No " + mrk_file_name + " file checksum for column " + name_type.name + " in part " + fullPath(volume->getDisk(), path),
                             ErrorCodes::NO_FILE_IN_DATA_PART);
                     if (!checksums.files.count(bin_file_name))
                         throw Exception("No " + bin_file_name + " file checksum for column " + name_type.name + " in part " + fullPath(volume->getDisk(), path),
                             ErrorCodes::NO_FILE_IN_DATA_PART);
-                }, stream_path);
+                });
             }
         }
 
@@ -182,9 +183,15 @@ void MergeTreeDataPartWide::checkConsistency(bool require_part_metadata) const
         std::optional<UInt64> marks_size;
         for (const NameAndTypePair & name_type : columns)
         {
-            name_type.type->enumerateStreams([&](const IDataType::SubstreamPath & substream_path, const IDataType & /* substream_type */)
+            auto serialization = IDataType::getSerialization(name_type,
+                [&](const String & stream_name)
+                {
+                    return volume->getDisk()->exists(stream_name + DATA_FILE_EXTENSION);
+                });
+
+            serialization->enumerateStreams([&](const ISerialization::SubstreamPath & substream_path)
             {
-                auto file_path = path + IDataType::getFileNameForStream(name_type, substream_path) + index_granularity_info.marks_file_extension;
+                auto file_path = path + ISerialization::getFileNameForStream(name_type, substream_path) + index_granularity_info.marks_file_extension;
 
                 /// Missing file is Ok for case when new column was added.
                 if (volume->getDisk()->exists(file_path))
@@ -208,18 +215,22 @@ void MergeTreeDataPartWide::checkConsistency(bool require_part_metadata) const
 
 bool MergeTreeDataPartWide::hasColumnFiles(const NameAndTypePair & column) const
 {
-    bool res = true;
-
-    column.type->enumerateStreams([&](const IDataType::SubstreamPath & substream_path, const IDataType & /* substream_type */)
+    auto check_stream_exists = [this](const String & stream_name)
     {
-        String file_name = IDataType::getFileNameForStream(column, substream_path);
+        auto bin_checksum = checksums.files.find(stream_name + DATA_FILE_EXTENSION);
+        auto mrk_checksum = checksums.files.find(stream_name + index_granularity_info.marks_file_extension);
 
-        auto bin_checksum = checksums.files.find(file_name + ".bin");
-        auto mrk_checksum = checksums.files.find(file_name + index_granularity_info.marks_file_extension);
+        return bin_checksum != checksums.files.end() && mrk_checksum != checksums.files.end();
+    };
 
-        if (bin_checksum == checksums.files.end() || mrk_checksum == checksums.files.end())
+    bool res = true;
+    auto serialization = IDataType::getSerialization(column, check_stream_exists);
+    serialization->enumerateStreams([&](const ISerialization::SubstreamPath & substream_path)
+    {
+        String file_name = ISerialization::getFileNameForStream(column, substream_path);
+        if (!check_stream_exists(file_name))
             res = false;
-    }, {});
+    });
 
     return res;
 }
@@ -227,10 +238,11 @@ bool MergeTreeDataPartWide::hasColumnFiles(const NameAndTypePair & column) const
 String MergeTreeDataPartWide::getFileNameForColumn(const NameAndTypePair & column) const
 {
     String filename;
-    column.type->enumerateStreams([&](const IDataType::SubstreamPath & substream_path, const IDataType & /* substream_type */)
+    auto serialization = column.type->getDefaultSerialization();
+    serialization->enumerateStreams([&](const ISerialization::SubstreamPath & substream_path)
     {
         if (filename.empty())
-            filename = IDataType::getFileNameForStream(column, substream_path);
+            filename = ISerialization::getFileNameForStream(column, substream_path);
     });
     return filename;
 }
diff --git a/src/Storages/MergeTree/MergeTreeDataPartWriterCompact.cpp b/src/Storages/MergeTree/MergeTreeDataPartWriterCompact.cpp
index 7ec5cf8920c..2efda206cf9 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartWriterCompact.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataPartWriterCompact.cpp
@@ -39,9 +39,9 @@ MergeTreeDataPartWriterCompact::MergeTreeDataPartWriterCompact(
 
 void MergeTreeDataPartWriterCompact::addStreams(const NameAndTypePair & column, const ASTPtr & effective_codec_desc)
 {
-    IDataType::StreamCallback callback = [&] (const IDataType::SubstreamPath & substream_path, const IDataType & substream_type)
+    IDataType::StreamCallbackWithType callback = [&] (const ISerialization::SubstreamPath & substream_path, const IDataType & substream_type)
     {
-        String stream_name = IDataType::getFileNameForStream(column, substream_path);
+        String stream_name = ISerialization::getFileNameForStream(column, substream_path);
 
         /// Shared offsets for Nested type.
         if (compressed_streams.count(stream_name))
@@ -50,7 +50,7 @@ void MergeTreeDataPartWriterCompact::addStreams(const NameAndTypePair & column,
         CompressionCodecPtr compression_codec;
 
         /// If we can use special codec than just get it
-        if (IDataType::isSpecialCompressionAllowed(substream_path))
+        if (ISerialization::isSpecialCompressionAllowed(substream_path))
             compression_codec = CompressionCodecFactory::instance().get(effective_codec_desc, &substream_type, default_codec);
         else /// otherwise return only generic codecs and don't use info about data_type
             compression_codec = CompressionCodecFactory::instance().get(effective_codec_desc, nullptr, default_codec, true);
@@ -63,8 +63,7 @@ void MergeTreeDataPartWriterCompact::addStreams(const NameAndTypePair & column,
         compressed_streams.emplace(stream_name, stream);
     };
 
-    IDataType::SubstreamPath stream_path;
-    column.type->enumerateStreams(callback, stream_path);
+    column.type->enumerateStreams(serializations[column.name], callback);
 }
 
 namespace
@@ -106,20 +105,21 @@ Granules getGranulesToWrite(const MergeTreeIndexGranularity & index_granularity,
 /// Write single granule of one column (rows between 2 marks)
 void writeColumnSingleGranule(
     const ColumnWithTypeAndName & column,
-    IDataType::OutputStreamGetter stream_getter,
+    const SerializationPtr & serialization,
+    ISerialization::OutputStreamGetter stream_getter,
     size_t from_row,
     size_t number_of_rows)
 {
-    IDataType::SerializeBinaryBulkStatePtr state;
-    IDataType::SerializeBinaryBulkSettings serialize_settings;
+    ISerialization::SerializeBinaryBulkStatePtr state;
+    ISerialization::SerializeBinaryBulkSettings serialize_settings;
 
     serialize_settings.getter = stream_getter;
     serialize_settings.position_independent_encoding = true;
     serialize_settings.low_cardinality_max_dictionary_size = 0;
 
-    column.type->serializeBinaryBulkStatePrefix(serialize_settings, state);
-    column.type->serializeBinaryBulkWithMultipleStreams(*column.column, from_row, number_of_rows, serialize_settings, state);
-    column.type->serializeBinaryBulkStateSuffix(serialize_settings, state);
+    serialization->serializeBinaryBulkStatePrefix(serialize_settings, state);
+    serialization->serializeBinaryBulkWithMultipleStreams(*column.column, from_row, number_of_rows, serialize_settings, state);
+    serialization->serializeBinaryBulkStateSuffix(serialize_settings, state);
 }
 
 }
@@ -181,9 +181,9 @@ void MergeTreeDataPartWriterCompact::writeDataBlock(const Block & block, const G
             /// So we flush each stream (using next()) before using new one, because otherwise we will override
             /// data in result file.
             CompressedStreamPtr prev_stream;
-            auto stream_getter = [&, this](const IDataType::SubstreamPath & substream_path) -> WriteBuffer *
+            auto stream_getter = [&, this](const ISerialization::SubstreamPath & substream_path) -> WriteBuffer *
             {
-                String stream_name = IDataType::getFileNameForStream(*name_and_type, substream_path);
+                String stream_name = ISerialization::getFileNameForStream(*name_and_type, substream_path);
 
                 auto & result_stream = compressed_streams[stream_name];
                 /// Write one compressed block per column in granule for more optimal reading.
@@ -203,7 +203,9 @@ void MergeTreeDataPartWriterCompact::writeDataBlock(const Block & block, const G
             writeIntBinary(plain_hashing.count(), marks);
             writeIntBinary(UInt64(0), marks);
 
-            writeColumnSingleGranule(block.getByName(name_and_type->name), stream_getter, granule.start_row, granule.rows_to_write);
+            writeColumnSingleGranule(
+                block.getByName(name_and_type->name), serializations[name_and_type->name],
+                stream_getter, granule.start_row, granule.rows_to_write);
 
             /// Each type always have at least one substream
             prev_stream->hashing_buf.next(); //-V522
diff --git a/src/Storages/MergeTree/MergeTreeDataPartWriterOnDisk.cpp b/src/Storages/MergeTree/MergeTreeDataPartWriterOnDisk.cpp
index fcc4f92be24..9902add9847 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartWriterOnDisk.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataPartWriterOnDisk.cpp
@@ -90,6 +90,9 @@ MergeTreeDataPartWriterOnDisk::MergeTreeDataPartWriterOnDisk(
     if (!disk->exists(part_path))
         disk->createDirectories(part_path);
 
+    for (const auto & column : columns_list)
+        serializations.emplace(column.name, column.type->getDefaultSerialization());
+
     if (settings.rewrite_primary_key)
         initPrimaryIndex();
     initSkipIndices();
@@ -200,7 +203,7 @@ void MergeTreeDataPartWriterOnDisk::calculateAndSerializePrimaryIndex(const Bloc
                 {
                     const auto & primary_column = primary_index_block.getByPosition(j);
                     index_columns[j]->insertFrom(*primary_column.column, granule.start_row);
-                    primary_column.type->serializeBinary(*primary_column.column, granule.start_row, *index_stream);
+                    primary_column.type->getDefaultSerialization()->serializeBinary(*primary_column.column, granule.start_row, *index_stream);
                 }
             }
         }
@@ -265,7 +268,7 @@ void MergeTreeDataPartWriterOnDisk::finishPrimaryIndexSerialization(
                 const auto & column = *last_block_index_columns[j];
                 size_t last_row_number = column.size() - 1;
                 index_columns[j]->insertFrom(column, last_row_number);
-                index_types[j]->serializeBinary(column, last_row_number, *index_stream);
+                index_types[j]->getDefaultSerialization()->serializeBinary(column, last_row_number, *index_stream);
             }
             last_block_index_columns.clear();
         }
diff --git a/src/Storages/MergeTree/MergeTreeDataPartWriterOnDisk.h b/src/Storages/MergeTree/MergeTreeDataPartWriterOnDisk.h
index 704b38ba6d5..d952950e461 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartWriterOnDisk.h
+++ b/src/Storages/MergeTree/MergeTreeDataPartWriterOnDisk.h
@@ -132,6 +132,9 @@ protected:
     MergeTreeIndexAggregators skip_indices_aggregators;
     std::vector<size_t> skip_index_accumulated_marks;
 
+    using SerializationsMap = std::unordered_map<String, SerializationPtr>;
+    SerializationsMap serializations;
+
     std::unique_ptr<WriteBufferFromFileBase> index_file_stream;
     std::unique_ptr<HashingWriteBuffer> index_stream;
     DataTypes index_types;
diff --git a/src/Storages/MergeTree/MergeTreeDataPartWriterWide.cpp b/src/Storages/MergeTree/MergeTreeDataPartWriterWide.cpp
index f2bbf53bd97..57e8cca46cd 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartWriterWide.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataPartWriterWide.cpp
@@ -2,6 +2,8 @@
 #include <Interpreters/Context.h>
 #include <Compression/CompressionFactory.h>
 #include <Compression/CompressedReadBufferFromFile.h>
+#include <DataTypes/Serializations/ISerialization.h>
+#include <Common/escapeForFileName.h>
 
 namespace DB
 {
@@ -88,18 +90,18 @@ void MergeTreeDataPartWriterWide::addStreams(
     const NameAndTypePair & column,
     const ASTPtr & effective_codec_desc)
 {
-    IDataType::StreamCallback callback = [&] (const IDataType::SubstreamPath & substream_path, const IDataType & substream_type)
+    IDataType::StreamCallbackWithType callback = [&] (const ISerialization::SubstreamPath & substream_path, const IDataType & substream_type)
     {
-        String stream_name = IDataType::getFileNameForStream(column, substream_path);
+        String stream_name = ISerialization::getFileNameForStream(column, substream_path);
         /// Shared offsets for Nested type.
         if (column_streams.count(stream_name))
             return;
 
         CompressionCodecPtr compression_codec;
         /// If we can use special codec then just get it
-        if (IDataType::isSpecialCompressionAllowed(substream_path))
+        if (ISerialization::isSpecialCompressionAllowed(substream_path))
             compression_codec = CompressionCodecFactory::instance().get(effective_codec_desc, &substream_type, default_codec);
-        else /// otherwise return only generic codecs and don't use info about the data_type
+        else /// otherwise return only generic codecs and don't use info about the` data_type
             compression_codec = CompressionCodecFactory::instance().get(effective_codec_desc, nullptr, default_codec, true);
 
         column_streams[stream_name] = std::make_unique<Stream>(
@@ -111,19 +113,18 @@ void MergeTreeDataPartWriterWide::addStreams(
             settings.max_compress_block_size);
     };
 
-    IDataType::SubstreamPath stream_path;
-    column.type->enumerateStreams(callback, stream_path);
+    column.type->enumerateStreams(serializations[column.name], callback);
 }
 
 
-IDataType::OutputStreamGetter MergeTreeDataPartWriterWide::createStreamGetter(
+ISerialization::OutputStreamGetter MergeTreeDataPartWriterWide::createStreamGetter(
         const NameAndTypePair & column, WrittenOffsetColumns & offset_columns) const
 {
-    return [&, this] (const IDataType::SubstreamPath & substream_path) -> WriteBuffer *
+    return [&, this] (const ISerialization::SubstreamPath & substream_path) -> WriteBuffer *
     {
-        bool is_offsets = !substream_path.empty() && substream_path.back().type == IDataType::Substream::ArraySizes;
+        bool is_offsets = !substream_path.empty() && substream_path.back().type == ISerialization::Substream::ArraySizes;
 
-        String stream_name = IDataType::getFileNameForStream(column, substream_path);
+        String stream_name = ISerialization::getFileNameForStream(column, substream_path);
 
         /// Don't write offsets more than one time for Nested type.
         if (is_offsets && offset_columns.count(stream_name))
@@ -242,7 +243,7 @@ void MergeTreeDataPartWriterWide::writeSingleMark(
     const NameAndTypePair & column,
     WrittenOffsetColumns & offset_columns,
     size_t number_of_rows,
-    DB::IDataType::SubstreamPath & path)
+    ISerialization::SubstreamPath & path)
 {
     StreamsWithMarks marks = getCurrentMarksForColumn(column, offset_columns, path);
     for (const auto & mark : marks)
@@ -261,14 +262,14 @@ void MergeTreeDataPartWriterWide::flushMarkToFile(const StreamNameAndMark & stre
 StreamsWithMarks MergeTreeDataPartWriterWide::getCurrentMarksForColumn(
     const NameAndTypePair & column,
     WrittenOffsetColumns & offset_columns,
-    DB::IDataType::SubstreamPath & path)
+    ISerialization::SubstreamPath & path)
 {
     StreamsWithMarks result;
-    column.type->enumerateStreams([&] (const IDataType::SubstreamPath & substream_path, const IDataType & /* substream_type */)
+    serializations[column.name]->enumerateStreams([&] (const ISerialization::SubstreamPath & substream_path)
     {
-        bool is_offsets = !substream_path.empty() && substream_path.back().type == IDataType::Substream::ArraySizes;
+        bool is_offsets = !substream_path.empty() && substream_path.back().type == ISerialization::Substream::ArraySizes;
 
-        String stream_name = IDataType::getFileNameForStream(column, substream_path);
+        String stream_name = ISerialization::getFileNameForStream(column, substream_path);
 
         /// Don't write offsets more than one time for Nested type.
         if (is_offsets && offset_columns.count(stream_name))
@@ -295,18 +296,19 @@ void MergeTreeDataPartWriterWide::writeSingleGranule(
     const NameAndTypePair & name_and_type,
     const IColumn & column,
     WrittenOffsetColumns & offset_columns,
-    IDataType::SerializeBinaryBulkStatePtr & serialization_state,
-    IDataType::SerializeBinaryBulkSettings & serialize_settings,
+    ISerialization::SerializeBinaryBulkStatePtr & serialization_state,
+    ISerialization::SerializeBinaryBulkSettings & serialize_settings,
     const Granule & granule)
 {
-    name_and_type.type->serializeBinaryBulkWithMultipleStreams(column, granule.start_row, granule.rows_to_write, serialize_settings, serialization_state);
+    const auto & serialization = serializations[name_and_type.name];
+    serialization->serializeBinaryBulkWithMultipleStreams(column, granule.start_row, granule.rows_to_write, serialize_settings, serialization_state);
 
     /// So that instead of the marks pointing to the end of the compressed block, there were marks pointing to the beginning of the next one.
-    name_and_type.type->enumerateStreams([&] (const IDataType::SubstreamPath & substream_path, const IDataType & /* substream_type */)
+    serialization->enumerateStreams([&] (const ISerialization::SubstreamPath & substream_path)
     {
-        bool is_offsets = !substream_path.empty() && substream_path.back().type == IDataType::Substream::ArraySizes;
+        bool is_offsets = !substream_path.empty() && substream_path.back().type == ISerialization::Substream::ArraySizes;
 
-        String stream_name = IDataType::getFileNameForStream(name_and_type, substream_path);
+        String stream_name = ISerialization::getFileNameForStream(name_and_type, substream_path);
 
         /// Don't write offsets more than one time for Nested type.
         if (is_offsets && offset_columns.count(stream_name))
@@ -331,13 +333,13 @@ void MergeTreeDataPartWriterWide::writeColumn(
 
     if (inserted)
     {
-        IDataType::SerializeBinaryBulkSettings serialize_settings;
+        ISerialization::SerializeBinaryBulkSettings serialize_settings;
         serialize_settings.getter = createStreamGetter(name_and_type, offset_columns);
-        type->serializeBinaryBulkStatePrefix(serialize_settings, it->second);
+        serializations[name]->serializeBinaryBulkStatePrefix(serialize_settings, it->second);
     }
 
-    const auto & global_settings = storage.global_context.getSettingsRef();
-    IDataType::SerializeBinaryBulkSettings serialize_settings;
+    const auto & global_settings = storage.getContext()->getSettingsRef();
+    ISerialization::SerializeBinaryBulkSettings serialize_settings;
     serialize_settings.getter = createStreamGetter(name_and_type, offset_columns);
     serialize_settings.low_cardinality_max_dictionary_size = global_settings.low_cardinality_max_dictionary_size;
     serialize_settings.low_cardinality_use_single_dictionary_for_part = global_settings.low_cardinality_use_single_dictionary_for_part != 0;
@@ -374,12 +376,12 @@ void MergeTreeDataPartWriterWide::writeColumn(
         }
     }
 
-    name_and_type.type->enumerateStreams([&] (const IDataType::SubstreamPath & substream_path, const IDataType & /* substream_type */)
+    serializations[name]->enumerateStreams([&] (const ISerialization::SubstreamPath & substream_path)
     {
-        bool is_offsets = !substream_path.empty() && substream_path.back().type == IDataType::Substream::ArraySizes;
+        bool is_offsets = !substream_path.empty() && substream_path.back().type == ISerialization::Substream::ArraySizes;
         if (is_offsets)
         {
-            String stream_name = IDataType::getFileNameForStream(name_and_type, substream_path);
+            String stream_name = ISerialization::getFileNameForStream(name_and_type, substream_path);
             offset_columns.insert(stream_name);
         }
     }, serialize_settings.path);
@@ -392,10 +394,11 @@ void MergeTreeDataPartWriterWide::validateColumnOfFixedSize(const String & name,
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot validate column of non fixed type {}", type.getName());
 
     auto disk = data_part->volume->getDisk();
-    String mrk_path = fullPath(disk, part_path + name + marks_file_extension);
-    String bin_path = fullPath(disk, part_path + name + DATA_FILE_EXTENSION);
+    String escaped_name = escapeForFileName(name);
+    String mrk_path = fullPath(disk, part_path + escaped_name + marks_file_extension);
+    String bin_path = fullPath(disk, part_path + escaped_name + DATA_FILE_EXTENSION);
     DB::ReadBufferFromFile mrk_in(mrk_path);
-    DB::CompressedReadBufferFromFile bin_in(bin_path, 0, 0, 0);
+    DB::CompressedReadBufferFromFile bin_in(bin_path, 0, 0, 0, nullptr);
     bool must_be_last = false;
     UInt64 offset_in_compressed_file = 0;
     UInt64 offset_in_decompressed_block = 0;
@@ -403,6 +406,7 @@ void MergeTreeDataPartWriterWide::validateColumnOfFixedSize(const String & name,
 
     size_t mark_num;
 
+    const auto & serialization = serializations[name];
     for (mark_num = 0; !mrk_in.eof(); ++mark_num)
     {
         if (mark_num > index_granularity.getMarksCount())
@@ -430,7 +434,7 @@ void MergeTreeDataPartWriterWide::validateColumnOfFixedSize(const String & name,
         {
             auto column = type.createColumn();
 
-            type.deserializeBinaryBulk(*column, bin_in, 1000000000, 0.0);
+            serialization->deserializeBinaryBulk(*column, bin_in, 1000000000, 0.0);
 
             throw Exception(ErrorCodes::LOGICAL_ERROR,
                         "Still have {} rows in bin stream, last mark #{} index granularity size {}, last rows {}", column->size(), mark_num, index_granularity.getMarksCount(), index_granularity_rows);
@@ -450,7 +454,7 @@ void MergeTreeDataPartWriterWide::validateColumnOfFixedSize(const String & name,
 
         auto column = type.createColumn();
 
-        type.deserializeBinaryBulk(*column, bin_in, index_granularity_rows, 0.0);
+        serialization->deserializeBinaryBulk(*column, bin_in, index_granularity_rows, 0.0);
 
         if (bin_in.eof())
         {
@@ -489,7 +493,7 @@ void MergeTreeDataPartWriterWide::validateColumnOfFixedSize(const String & name,
     {
         auto column = type.createColumn();
 
-        type.deserializeBinaryBulk(*column, bin_in, 1000000000, 0.0);
+        serialization->deserializeBinaryBulk(*column, bin_in, 1000000000, 0.0);
 
         throw Exception(ErrorCodes::LOGICAL_ERROR,
                         "Still have {} rows in bin stream, last mark #{} index granularity size {}, last rows {}", column->size(), mark_num, index_granularity.getMarksCount(), index_granularity_rows);
@@ -499,8 +503,8 @@ void MergeTreeDataPartWriterWide::validateColumnOfFixedSize(const String & name,
 
 void MergeTreeDataPartWriterWide::finishDataSerialization(IMergeTreeDataPart::Checksums & checksums, bool sync)
 {
-    const auto & global_settings = storage.global_context.getSettingsRef();
-    IDataType::SerializeBinaryBulkSettings serialize_settings;
+    const auto & global_settings = storage.getContext()->getSettingsRef();
+    ISerialization::SerializeBinaryBulkSettings serialize_settings;
     serialize_settings.low_cardinality_max_dictionary_size = global_settings.low_cardinality_max_dictionary_size;
     serialize_settings.low_cardinality_use_single_dictionary_for_part = global_settings.low_cardinality_use_single_dictionary_for_part != 0;
     WrittenOffsetColumns offset_columns;
@@ -523,7 +527,7 @@ void MergeTreeDataPartWriterWide::finishDataSerialization(IMergeTreeDataPart::Ch
             if (!serialization_states.empty())
             {
                 serialize_settings.getter = createStreamGetter(*it, written_offset_columns ? *written_offset_columns : offset_columns);
-                it->type->serializeBinaryBulkStateSuffix(serialize_settings, serialization_states[it->name]);
+                serializations[it->name]->serializeBinaryBulkStateSuffix(serialize_settings, serialization_states[it->name]);
             }
 
             if (write_final_mark)
@@ -565,16 +569,16 @@ void MergeTreeDataPartWriterWide::finish(IMergeTreeDataPart::Checksums & checksu
 void MergeTreeDataPartWriterWide::writeFinalMark(
     const NameAndTypePair & column,
     WrittenOffsetColumns & offset_columns,
-    DB::IDataType::SubstreamPath & path)
+    ISerialization::SubstreamPath & path)
 {
     writeSingleMark(column, offset_columns, 0, path);
     /// Memoize information about offsets
-    column.type->enumerateStreams([&] (const IDataType::SubstreamPath & substream_path, const IDataType & /* substream_type */)
+    serializations[column.name]->enumerateStreams([&] (const ISerialization::SubstreamPath & substream_path)
     {
-        bool is_offsets = !substream_path.empty() && substream_path.back().type == IDataType::Substream::ArraySizes;
+        bool is_offsets = !substream_path.empty() && substream_path.back().type == ISerialization::Substream::ArraySizes;
         if (is_offsets)
         {
-            String stream_name = IDataType::getFileNameForStream(column, substream_path);
+            String stream_name = ISerialization::getFileNameForStream(column, substream_path);
             offset_columns.insert(stream_name);
         }
     }, path);
diff --git a/src/Storages/MergeTree/MergeTreeDataPartWriterWide.h b/src/Storages/MergeTree/MergeTreeDataPartWriterWide.h
index e6f96f3f146..5eaaa0c1bbe 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartWriterWide.h
+++ b/src/Storages/MergeTree/MergeTreeDataPartWriterWide.h
@@ -50,15 +50,15 @@ private:
         const NameAndTypePair & name_and_type,
         const IColumn & column,
         WrittenOffsetColumns & offset_columns,
-        IDataType::SerializeBinaryBulkStatePtr & serialization_state,
-        IDataType::SerializeBinaryBulkSettings & serialize_settings,
+        ISerialization::SerializeBinaryBulkStatePtr & serialization_state,
+        ISerialization::SerializeBinaryBulkSettings & serialize_settings,
         const Granule & granule);
 
     /// Take offsets from column and return as MarkInCompressed file with stream name
     StreamsWithMarks getCurrentMarksForColumn(
         const NameAndTypePair & column,
         WrittenOffsetColumns & offset_columns,
-        DB::IDataType::SubstreamPath & path);
+        ISerialization::SubstreamPath & path);
 
     /// Write mark to disk using stream and rows count
     void flushMarkToFile(
@@ -70,12 +70,12 @@ private:
         const NameAndTypePair & column,
         WrittenOffsetColumns & offset_columns,
         size_t number_of_rows,
-        DB::IDataType::SubstreamPath & path);
+        ISerialization::SubstreamPath & path);
 
     void writeFinalMark(
         const NameAndTypePair & column,
         WrittenOffsetColumns & offset_columns,
-        DB::IDataType::SubstreamPath & path);
+        ISerialization::SubstreamPath & path);
 
     void addStreams(
         const NameAndTypePair & column,
@@ -100,15 +100,16 @@ private:
     /// Also useful to have exact amount of rows in last (non-final) mark.
     void adjustLastMarkIfNeedAndFlushToDisk(size_t new_rows_in_last_mark);
 
-    IDataType::OutputStreamGetter createStreamGetter(const NameAndTypePair & column, WrittenOffsetColumns & offset_columns) const;
+    ISerialization::OutputStreamGetter createStreamGetter(const NameAndTypePair & column, WrittenOffsetColumns & offset_columns) const;
 
-    using SerializationState = IDataType::SerializeBinaryBulkStatePtr;
+    using SerializationState = ISerialization::SerializeBinaryBulkStatePtr;
     using SerializationStates = std::unordered_map<String, SerializationState>;
 
     SerializationStates serialization_states;
 
     using ColumnStreams = std::map<String, StreamPtr>;
     ColumnStreams column_streams;
+
     /// Non written marks to disk (for each column). Waiting until all rows for
     /// this marks will be written to disk.
     using MarksForColumns = std::unordered_map<String, StreamsWithMarks>;
diff --git a/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp b/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
index d23413f4a84..1340332350f 100644
--- a/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
@@ -1,5 +1,5 @@
 #include <boost/rational.hpp>   /// For calculations related to sampling coefficients.
-#include <ext/scope_guard.h>
+#include <ext/scope_guard_safe.h>
 #include <optional>
 #include <unordered_set>
 
@@ -28,7 +28,7 @@
 #include <Processors/QueryPlan/FilterStep.h>
 #include <Processors/QueryPlan/ExpressionStep.h>
 #include <Processors/QueryPlan/ReadFromPreparedSource.h>
-#include <Processors/QueryPlan/ReverseRowsStep.h>
+#include <Processors/QueryPlan/ReadFromMergeTree.h>
 #include <Processors/QueryPlan/MergingSortedStep.h>
 #include <Processors/QueryPlan/UnionStep.h>
 #include <Processors/QueryPlan/MergingFinal.h>
@@ -71,28 +71,30 @@ MergeTreeDataSelectExecutor::MergeTreeDataSelectExecutor(const MergeTreeData & d
 }
 
 
-/// Construct a block consisting only of possible values of virtual columns
-static Block getBlockWithVirtualPartColumns(const MergeTreeData::DataPartsVector & parts, bool with_uuid)
+Block MergeTreeDataSelectExecutor::getSampleBlockWithVirtualPartColumns()
 {
-    auto part_column = ColumnString::create();
-    auto part_uuid_column = ColumnUUID::create();
+    return Block(std::initializer_list<ColumnWithTypeAndName>{
+        ColumnWithTypeAndName(ColumnString::create(), std::make_shared<DataTypeString>(), "_part"),
+        ColumnWithTypeAndName(ColumnString::create(), std::make_shared<DataTypeString>(), "_partition_id"),
+        ColumnWithTypeAndName(ColumnUUID::create(), std::make_shared<DataTypeUUID>(), "_part_uuid")});
+}
+
+void MergeTreeDataSelectExecutor::fillBlockWithVirtualPartColumns(const MergeTreeData::DataPartsVector & parts, Block & block)
+{
+    MutableColumns columns = block.mutateColumns();
+
+    auto & part_column = columns[0];
+    auto & partition_id_column = columns[1];
+    auto & part_uuid_column = columns[2];
 
     for (const auto & part : parts)
     {
         part_column->insert(part->name);
-        if (with_uuid)
-            part_uuid_column->insert(part->uuid);
+        partition_id_column->insert(part->info.partition_id);
+        part_uuid_column->insert(part->uuid);
     }
 
-    if (with_uuid)
-    {
-        return Block(std::initializer_list<ColumnWithTypeAndName>{
-            ColumnWithTypeAndName(std::move(part_column), std::make_shared<DataTypeString>(), "_part"),
-            ColumnWithTypeAndName(std::move(part_uuid_column), std::make_shared<DataTypeUUID>(), "_part_uuid"),
-        });
-    }
-
-    return Block{ColumnWithTypeAndName(std::move(part_column), std::make_shared<DataTypeString>(), "_part")};
+    block.setColumns(std::move(columns));
 }
 
 
@@ -149,7 +151,7 @@ QueryPlanPtr MergeTreeDataSelectExecutor::read(
     const Names & column_names_to_return,
     const StorageMetadataPtr & metadata_snapshot,
     const SelectQueryInfo & query_info,
-    const Context & context,
+    ContextPtr context,
     const UInt64 max_block_size,
     const unsigned num_streams,
     const PartitionIdToMaxBlock * max_block_numbers_to_read) const
@@ -165,7 +167,7 @@ QueryPlanPtr MergeTreeDataSelectExecutor::readFromParts(
     const Names & column_names_to_return,
     const StorageMetadataPtr & metadata_snapshot,
     const SelectQueryInfo & query_info,
-    const Context & context,
+    ContextPtr context,
     const UInt64 max_block_size,
     const unsigned num_streams,
     const PartitionIdToMaxBlock * max_block_numbers_to_read) const
@@ -176,8 +178,6 @@ QueryPlanPtr MergeTreeDataSelectExecutor::readFromParts(
     Names real_column_names;
 
     size_t total_parts = parts.size();
-    bool part_column_queried = false;
-    bool part_uuid_column_queried = false;
 
     bool sample_factor_column_queried = false;
     Float64 used_sample_factor = 1;
@@ -186,7 +186,6 @@ QueryPlanPtr MergeTreeDataSelectExecutor::readFromParts(
     {
         if (name == "_part")
         {
-            part_column_queried = true;
             virt_column_names.push_back(name);
         }
         else if (name == "_part_index")
@@ -199,7 +198,6 @@ QueryPlanPtr MergeTreeDataSelectExecutor::readFromParts(
         }
         else if (name == "_part_uuid")
         {
-            part_uuid_column_queried = true;
             virt_column_names.push_back(name);
         }
         else if (name == "_sample_factor")
@@ -219,16 +217,27 @@ QueryPlanPtr MergeTreeDataSelectExecutor::readFromParts(
     if (real_column_names.empty())
         real_column_names.push_back(ExpressionActions::getSmallestColumn(available_real_columns));
 
-    /// If `_part` or `_part_uuid` virtual columns are requested, we try to filter out data by them.
-    Block virtual_columns_block = getBlockWithVirtualPartColumns(parts, part_uuid_column_queried);
-    if (part_column_queried || part_uuid_column_queried)
-        VirtualColumnUtils::filterBlockWithQuery(query_info.query, virtual_columns_block, context);
+    std::unordered_set<String> part_values;
+    ASTPtr expression_ast;
+    auto virtual_columns_block = getSampleBlockWithVirtualPartColumns();
 
-    auto part_values = VirtualColumnUtils::extractSingleValueFromBlock<String>(virtual_columns_block, "_part");
+    // Generate valid expressions for filtering
+    VirtualColumnUtils::prepareFilterBlockWithQuery(query_info.query, context, virtual_columns_block, expression_ast);
+
+    // If there is still something left, fill the virtual block and do the filtering.
+    if (expression_ast)
+    {
+        fillBlockWithVirtualPartColumns(parts, virtual_columns_block);
+        VirtualColumnUtils::filterBlockWithQuery(query_info.query, virtual_columns_block, context, expression_ast);
+        part_values = VirtualColumnUtils::extractSingleValueFromBlock<String>(virtual_columns_block, "_part");
+        if (part_values.empty())
+            return std::make_unique<QueryPlan>();
+    }
+    // At this point, empty `part_values` means all parts.
 
     metadata_snapshot->check(real_column_names, data.getVirtuals(), data.getStorageID());
 
-    const Settings & settings = context.getSettingsRef();
+    const Settings & settings = context->getSettingsRef();
     const auto & primary_key = metadata_snapshot->getPrimaryKey();
     Names primary_key_columns = primary_key.column_names;
 
@@ -242,16 +251,21 @@ QueryPlanPtr MergeTreeDataSelectExecutor::readFromParts(
 
     std::optional<KeyCondition> minmax_idx_condition;
     std::optional<PartitionPruner> partition_pruner;
-    if (data.minmax_idx_expr)
+    DataTypes minmax_columns_types;
+    if (metadata_snapshot->hasPartitionKey())
     {
-        minmax_idx_condition.emplace(query_info, context, data.minmax_idx_columns, data.minmax_idx_expr);
+        const auto & partition_key = metadata_snapshot->getPartitionKey();
+        auto minmax_columns_names = data.getMinMaxColumnsNames(partition_key);
+        minmax_columns_types = data.getMinMaxColumnsTypes(partition_key);
+
+        minmax_idx_condition.emplace(query_info, context, minmax_columns_names, data.getMinMaxExpr(partition_key, ExpressionActionsSettings::fromContext(context)));
         partition_pruner.emplace(metadata_snapshot->getPartitionKey(), query_info, context, false /* strict */);
 
         if (settings.force_index_by_date && (minmax_idx_condition->alwaysUnknownOrTrue() && partition_pruner->isUseless()))
         {
             String msg = "Neither MinMax index by columns (";
             bool first = true;
-            for (const String & col : data.minmax_idx_columns)
+            for (const String & col : minmax_columns_names)
             {
                 if (first)
                     first = false;
@@ -265,13 +279,42 @@ QueryPlanPtr MergeTreeDataSelectExecutor::readFromParts(
         }
     }
 
-    const Context & query_context = context.hasQueryContext() ? context.getQueryContext() : context;
+    auto query_context = context->hasQueryContext() ? context->getQueryContext() : context;
 
-    if (query_context.getSettingsRef().allow_experimental_query_deduplication)
-        selectPartsToReadWithUUIDFilter(parts, part_values, minmax_idx_condition, partition_pruner, max_block_numbers_to_read, query_context);
+    PartFilterCounters part_filter_counters;
+    auto index_stats = std::make_unique<ReadFromMergeTree::IndexStats>();
+
+    if (query_context->getSettingsRef().allow_experimental_query_deduplication)
+        selectPartsToReadWithUUIDFilter(parts, part_values, minmax_idx_condition, minmax_columns_types, partition_pruner, max_block_numbers_to_read, query_context, part_filter_counters);
     else
-        selectPartsToRead(parts, part_values, minmax_idx_condition, partition_pruner, max_block_numbers_to_read);
+        selectPartsToRead(parts, part_values, minmax_idx_condition, minmax_columns_types, partition_pruner, max_block_numbers_to_read, part_filter_counters);
 
+    index_stats->emplace_back(ReadFromMergeTree::IndexStat{
+        .type = ReadFromMergeTree::IndexType::None,
+        .num_parts_after = part_filter_counters.num_initial_selected_parts,
+        .num_granules_after = part_filter_counters.num_initial_selected_granules});
+
+    if (minmax_idx_condition)
+    {
+        auto description = minmax_idx_condition->getDescription();
+        index_stats->emplace_back(ReadFromMergeTree::IndexStat{
+            .type = ReadFromMergeTree::IndexType::MinMax,
+            .condition = std::move(description.condition),
+            .used_keys = std::move(description.used_keys),
+            .num_parts_after = part_filter_counters.num_parts_after_minmax,
+            .num_granules_after = part_filter_counters.num_granules_after_minmax});
+    }
+
+    if (partition_pruner)
+    {
+        auto description = partition_pruner->getKeyCondition().getDescription();
+        index_stats->emplace_back(ReadFromMergeTree::IndexStat{
+            .type = ReadFromMergeTree::IndexType::Partition,
+            .condition = std::move(description.condition),
+            .used_keys = std::move(description.used_keys),
+            .num_parts_after = part_filter_counters.num_parts_after_partition_pruner,
+            .num_granules_after = part_filter_counters.num_granules_after_partition_pruner});
+    }
 
     /// Sampling.
     Names column_names_to_read = real_column_names;
@@ -368,7 +411,7 @@ QueryPlanPtr MergeTreeDataSelectExecutor::readFromParts(
     {
         LOG_DEBUG(log, "Will use no data on this replica because parallel replicas processing has been requested"
             " (the setting 'max_parallel_replicas') but the table does not support sampling and this replica is not the first.");
-        return {};
+        return std::make_unique<QueryPlan>();
     }
 
     bool use_sampling = relative_sample_size > 0 || (settings.parallel_replicas_count > 1 && data.supportsSampling());
@@ -541,29 +584,26 @@ QueryPlanPtr MergeTreeDataSelectExecutor::readFromParts(
     {
         .min_bytes_to_use_direct_io = settings.min_bytes_to_use_direct_io,
         .min_bytes_to_use_mmap_io = settings.min_bytes_to_use_mmap_io,
+        .mmap_cache = context->getMMappedFileCache(),
         .max_read_buffer_size = settings.max_read_buffer_size,
         .save_marks_in_cache = true,
         .checksum_on_read = settings.checksum_on_read,
     };
 
-    /// PREWHERE
-    String prewhere_column;
-    if (select.prewhere())
-        prewhere_column = select.prewhere()->getColumnName();
-
     struct DataSkippingIndexAndCondition
     {
         MergeTreeIndexPtr index;
         MergeTreeIndexConditionPtr condition;
-        std::atomic<size_t> total_granules;
-        std::atomic<size_t> granules_dropped;
+        std::atomic<size_t> total_granules{0};
+        std::atomic<size_t> granules_dropped{0};
+        std::atomic<size_t> total_parts{0};
+        std::atomic<size_t> parts_dropped{0};
 
         DataSkippingIndexAndCondition(MergeTreeIndexPtr index_, MergeTreeIndexConditionPtr condition_)
             : index(index_)
             , condition(condition_)
-            , total_granules(0)
-            , granules_dropped(0)
-        {}
+        {
+        }
     };
     std::list<DataSkippingIndexAndCondition> useful_indices;
 
@@ -610,6 +650,7 @@ QueryPlanPtr MergeTreeDataSelectExecutor::readFromParts(
     RangesInDataParts parts_with_ranges(parts.size());
     size_t sum_marks = 0;
     std::atomic<size_t> sum_marks_pk = 0;
+    std::atomic<size_t> sum_parts_pk = 0;
     std::atomic<size_t> total_marks_pk = 0;
 
     size_t sum_ranges = 0;
@@ -632,25 +673,29 @@ QueryPlanPtr MergeTreeDataSelectExecutor::readFromParts(
 
             RangesInDataPart ranges(part, part_index);
 
-            total_marks_pk.fetch_add(part->index_granularity.getMarksCount(), std::memory_order_relaxed);
+            size_t total_marks_count = part->getMarksCount();
+            if (total_marks_count && part->index_granularity.hasFinalMark())
+                --total_marks_count;
+
+            total_marks_pk.fetch_add(total_marks_count, std::memory_order_relaxed);
 
             if (metadata_snapshot->hasPrimaryKey())
                 ranges.ranges = markRangesFromPKRange(part, metadata_snapshot, key_condition, settings, log);
-            else
-            {
-                size_t total_marks_count = part->getMarksCount();
-                if (total_marks_count)
-                {
-                    if (part->index_granularity.hasFinalMark())
-                        --total_marks_count;
-                    ranges.ranges = MarkRanges{MarkRange{0, total_marks_count}};
-                }
-            }
+            else if (total_marks_count)
+                ranges.ranges = MarkRanges{MarkRange{0, total_marks_count}};
 
             sum_marks_pk.fetch_add(ranges.getMarksCount(), std::memory_order_relaxed);
 
+            if (!ranges.ranges.empty())
+                sum_parts_pk.fetch_add(1, std::memory_order_relaxed);
+
             for (auto & index_and_condition : useful_indices)
             {
+                if (ranges.ranges.empty())
+                    break;
+
+                index_and_condition.total_parts.fetch_add(1, std::memory_order_relaxed);
+
                 size_t total_granules = 0;
                 size_t granules_dropped = 0;
                 ranges.ranges = filterMarksUsingIndex(
@@ -662,6 +707,9 @@ QueryPlanPtr MergeTreeDataSelectExecutor::readFromParts(
 
                 index_and_condition.total_granules.fetch_add(total_granules, std::memory_order_relaxed);
                 index_and_condition.granules_dropped.fetch_add(granules_dropped, std::memory_order_relaxed);
+
+                if (ranges.ranges.empty())
+                    index_and_condition.parts_dropped.fetch_add(1, std::memory_order_relaxed);
             }
 
             if (!ranges.ranges.empty())
@@ -694,7 +742,7 @@ QueryPlanPtr MergeTreeDataSelectExecutor::readFromParts(
 
             for (size_t part_index = 0; part_index < parts.size(); ++part_index)
                 pool.scheduleOrThrowOnError([&, part_index, thread_group = CurrentThread::getGroup()] {
-                    SCOPE_EXIT(
+                    SCOPE_EXIT_SAFE(
                         if (thread_group)
                             CurrentThread::detachQueryIfNotDetached();
                     );
@@ -727,12 +775,34 @@ QueryPlanPtr MergeTreeDataSelectExecutor::readFromParts(
         parts_with_ranges.resize(next_part);
     }
 
+    if (metadata_snapshot->hasPrimaryKey())
+    {
+        auto description = key_condition.getDescription();
+
+        index_stats->emplace_back(ReadFromMergeTree::IndexStat{
+            .type = ReadFromMergeTree::IndexType::PrimaryKey,
+            .condition = std::move(description.condition),
+            .used_keys = std::move(description.used_keys),
+            .num_parts_after = sum_parts_pk.load(std::memory_order_relaxed),
+            .num_granules_after = sum_marks_pk.load(std::memory_order_relaxed)});
+    }
+
     for (const auto & index_and_condition : useful_indices)
     {
         const auto & index_name = index_and_condition.index->index.name;
         LOG_DEBUG(log, "Index {} has dropped {}/{} granules.",
             backQuote(index_name),
             index_and_condition.granules_dropped, index_and_condition.total_granules);
+
+        std::string description = index_and_condition.index->index.type
+            + " GRANULARITY " + std::to_string(index_and_condition.index->index.granularity);
+
+        index_stats->emplace_back(ReadFromMergeTree::IndexStat{
+            .type = ReadFromMergeTree::IndexType::Skip,
+            .name = index_name,
+            .description = std::move(description),
+            .num_parts_after = index_and_condition.total_parts - index_and_condition.parts_dropped,
+            .num_granules_after = index_and_condition.total_granules - index_and_condition.granules_dropped});
     }
 
     LOG_DEBUG(log, "Selected {}/{} parts by partition key, {} parts by primary key, {}/{} marks by primary key, {} marks to read from {} ranges",
@@ -766,7 +836,7 @@ QueryPlanPtr MergeTreeDataSelectExecutor::readFromParts(
         if (data_settings->min_marks_to_honor_max_concurrent_queries > 0
             && sum_marks >= data_settings->min_marks_to_honor_max_concurrent_queries)
         {
-            query_id = context.getCurrentQueryId();
+            query_id = context->getCurrentQueryId();
             if (!query_id.empty())
                 data.insertQueryIdOrThrow(query_id, data_settings->max_concurrent_queries);
         }
@@ -799,6 +869,7 @@ QueryPlanPtr MergeTreeDataSelectExecutor::readFromParts(
 
         plan = spreadMarkRangesAmongStreamsFinal(
             std::move(parts_with_ranges),
+            std::move(index_stats),
             num_streams,
             column_names_to_read,
             metadata_snapshot,
@@ -822,6 +893,7 @@ QueryPlanPtr MergeTreeDataSelectExecutor::readFromParts(
 
         plan = spreadMarkRangesAmongStreamsWithOrder(
             std::move(parts_with_ranges),
+            std::move(index_stats),
             num_streams,
             column_names_to_read,
             metadata_snapshot,
@@ -839,6 +911,7 @@ QueryPlanPtr MergeTreeDataSelectExecutor::readFromParts(
     {
         plan = spreadMarkRangesAmongStreams(
             std::move(parts_with_ranges),
+            std::move(index_stats),
             num_streams,
             column_names_to_read,
             metadata_snapshot,
@@ -950,25 +1023,9 @@ size_t minMarksForConcurrentRead(
 
 }
 
-static QueryPlanPtr createPlanFromPipe(Pipe pipe, const String & query_id, const MergeTreeData & data, const std::string & description = "")
-{
-    auto plan = std::make_unique<QueryPlan>();
-
-    std::string storage_name = "MergeTree";
-    if (!description.empty())
-        storage_name += ' ' + description;
-
-    // Attach QueryIdHolder if needed
-    if (!query_id.empty())
-        pipe.addQueryIdHolder(std::make_shared<QueryIdHolder>(query_id, data));
-
-    auto step = std::make_unique<ReadFromStorageStep>(std::move(pipe), storage_name);
-    plan->addStep(std::move(step));
-    return plan;
-}
-
 QueryPlanPtr MergeTreeDataSelectExecutor::spreadMarkRangesAmongStreams(
     RangesInDataParts && parts,
+    ReadFromMergeTree::IndexStatPtr index_stats,
     size_t num_streams,
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
@@ -1020,75 +1077,32 @@ QueryPlanPtr MergeTreeDataSelectExecutor::spreadMarkRangesAmongStreams(
     if (0 == sum_marks)
         return {};
 
+    ReadFromMergeTree::Settings step_settings
+    {
+        .max_block_size = max_block_size,
+        .preferred_block_size_bytes = settings.preferred_block_size_bytes,
+        .preferred_max_column_in_block_size_bytes = settings.preferred_max_column_in_block_size_bytes,
+        .min_marks_for_concurrent_read = min_marks_for_concurrent_read,
+        .use_uncompressed_cache = use_uncompressed_cache,
+        .reader_settings = reader_settings,
+        .backoff_settings = MergeTreeReadPool::BackoffSettings(settings),
+    };
+
     if (num_streams > 1)
     {
-        /// Parallel query execution.
-        Pipes res;
-
         /// Reduce the number of num_streams if the data is small.
         if (sum_marks < num_streams * min_marks_for_concurrent_read && parts.size() < num_streams)
             num_streams = std::max((sum_marks + min_marks_for_concurrent_read - 1) / min_marks_for_concurrent_read, parts.size());
-
-        MergeTreeReadPoolPtr pool = std::make_shared<MergeTreeReadPool>(
-            num_streams,
-            sum_marks,
-            min_marks_for_concurrent_read,
-            std::move(parts),
-            data,
-            metadata_snapshot,
-            query_info.prewhere_info,
-            true,
-            column_names,
-            MergeTreeReadPool::BackoffSettings(settings),
-            settings.preferred_block_size_bytes,
-            false);
-
-        /// Let's estimate total number of rows for progress bar.
-        LOG_TRACE(log, "Reading approx. {} rows with {} streams", total_rows, num_streams);
-
-        for (size_t i = 0; i < num_streams; ++i)
-        {
-            auto source = std::make_shared<MergeTreeThreadSelectBlockInputProcessor>(
-                i, pool, min_marks_for_concurrent_read, max_block_size,
-                settings.preferred_block_size_bytes, settings.preferred_max_column_in_block_size_bytes,
-                data, metadata_snapshot, use_uncompressed_cache,
-                query_info.prewhere_info, reader_settings, virt_columns);
-
-            if (i == 0)
-            {
-                /// Set the approximate number of rows for the first source only
-                source->addTotalRowsApprox(total_rows);
-            }
-
-            res.emplace_back(std::move(source));
-        }
-
-        return createPlanFromPipe(Pipe::unitePipes(std::move(res)), query_id, data);
     }
-    else
-    {
-        /// Sequential query execution.
-        Pipes res;
 
-        for (const auto & part : parts)
-        {
-            auto source = std::make_shared<MergeTreeSelectProcessor>(
-                data, metadata_snapshot, part.data_part, max_block_size, settings.preferred_block_size_bytes,
-                settings.preferred_max_column_in_block_size_bytes, column_names, part.ranges, use_uncompressed_cache,
-                query_info.prewhere_info, true, reader_settings, virt_columns, part.part_index_in_query);
+    auto plan = std::make_unique<QueryPlan>();
+    auto step = std::make_unique<ReadFromMergeTree>(
+        data, metadata_snapshot, query_id,
+        column_names, std::move(parts), std::move(index_stats), query_info.prewhere_info, virt_columns,
+        step_settings, num_streams, ReadFromMergeTree::ReadType::Default);
 
-            res.emplace_back(std::move(source));
-        }
-
-        auto pipe = Pipe::unitePipes(std::move(res));
-
-        /// Use ConcatProcessor to concat sources together.
-        /// It is needed to read in parts order (and so in PK order) if single thread is used.
-        if (pipe.numOutputPorts() > 1)
-            pipe.addTransform(std::make_shared<ConcatProcessor>(pipe.getHeader(), pipe.numOutputPorts()));
-
-        return createPlanFromPipe(std::move(pipe), query_id, data);
-    }
+    plan->addStep(std::move(step));
+    return plan;
 }
 
 static ActionsDAGPtr createProjection(const Block & header)
@@ -1101,6 +1115,7 @@ static ActionsDAGPtr createProjection(const Block & header)
 
 QueryPlanPtr MergeTreeDataSelectExecutor::spreadMarkRangesAmongStreamsWithOrder(
     RangesInDataParts && parts,
+    ReadFromMergeTree::IndexStatPtr index_stats,
     size_t num_streams,
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
@@ -1208,8 +1223,7 @@ QueryPlanPtr MergeTreeDataSelectExecutor::spreadMarkRangesAmongStreamsWithOrder(
     for (size_t i = 0; i < num_streams && !parts.empty(); ++i)
     {
         size_t need_marks = min_marks_per_stream;
-
-        Pipes pipes;
+        RangesInDataParts new_parts;
 
         /// Loop over parts.
         /// We will iteratively take part or some subrange of a part from the back
@@ -1264,53 +1278,31 @@ QueryPlanPtr MergeTreeDataSelectExecutor::spreadMarkRangesAmongStreamsWithOrder(
                 parts.emplace_back(part);
             }
             ranges_to_get_from_part = split_ranges(ranges_to_get_from_part, input_order_info->direction);
-
-            if (input_order_info->direction == 1)
-            {
-                pipes.emplace_back(std::make_shared<MergeTreeSelectProcessor>(
-                    data,
-                    metadata_snapshot,
-                    part.data_part,
-                    max_block_size,
-                    settings.preferred_block_size_bytes,
-                    settings.preferred_max_column_in_block_size_bytes,
-                    column_names,
-                    ranges_to_get_from_part,
-                    use_uncompressed_cache,
-                    query_info.prewhere_info,
-                    true,
-                    reader_settings,
-                    virt_columns,
-                    part.part_index_in_query));
-            }
-            else
-            {
-                pipes.emplace_back(std::make_shared<MergeTreeReverseSelectProcessor>(
-                    data,
-                    metadata_snapshot,
-                    part.data_part,
-                    max_block_size,
-                    settings.preferred_block_size_bytes,
-                    settings.preferred_max_column_in_block_size_bytes,
-                    column_names,
-                    ranges_to_get_from_part,
-                    use_uncompressed_cache,
-                    query_info.prewhere_info,
-                    true,
-                    reader_settings,
-                    virt_columns,
-                    part.part_index_in_query));
-            }
+            new_parts.emplace_back(part.data_part, part.part_index_in_query, std::move(ranges_to_get_from_part));
         }
 
-        auto plan = createPlanFromPipe(Pipe::unitePipes(std::move(pipes)), query_id, data, "with order");
-
-        if (input_order_info->direction != 1)
+        ReadFromMergeTree::Settings step_settings
         {
-            auto reverse_step = std::make_unique<ReverseRowsStep>(plan->getCurrentDataStream());
-            plan->addStep(std::move(reverse_step));
-        }
+            .max_block_size = max_block_size,
+            .preferred_block_size_bytes = settings.preferred_block_size_bytes,
+            .preferred_max_column_in_block_size_bytes = settings.preferred_max_column_in_block_size_bytes,
+            .min_marks_for_concurrent_read = min_marks_for_concurrent_read,
+            .use_uncompressed_cache = use_uncompressed_cache,
+            .reader_settings = reader_settings,
+            .backoff_settings = MergeTreeReadPool::BackoffSettings(settings),
+        };
 
+        auto read_type = input_order_info->direction == 1
+                       ? ReadFromMergeTree::ReadType::InOrder
+                       : ReadFromMergeTree::ReadType::InReverseOrder;
+
+        auto plan = std::make_unique<QueryPlan>();
+        auto step = std::make_unique<ReadFromMergeTree>(
+            data, metadata_snapshot, query_id,
+            column_names, std::move(new_parts), std::move(index_stats), query_info.prewhere_info, virt_columns,
+            step_settings, num_streams, read_type);
+
+        plan->addStep(std::move(step));
         plans.emplace_back(std::move(plan));
     }
 
@@ -1350,8 +1342,7 @@ QueryPlanPtr MergeTreeDataSelectExecutor::spreadMarkRangesAmongStreamsWithOrder(
     for (const auto & plan : plans)
         input_streams.emplace_back(plan->getCurrentDataStream());
 
-    const auto & common_header = plans.front()->getCurrentDataStream().header;
-    auto union_step = std::make_unique<UnionStep>(std::move(input_streams), common_header);
+    auto union_step = std::make_unique<UnionStep>(std::move(input_streams));
 
     auto plan = std::make_unique<QueryPlan>();
     plan->unitePlans(std::move(union_step), std::move(plans));
@@ -1362,6 +1353,7 @@ QueryPlanPtr MergeTreeDataSelectExecutor::spreadMarkRangesAmongStreamsWithOrder(
 
 QueryPlanPtr MergeTreeDataSelectExecutor::spreadMarkRangesAmongStreamsFinal(
     RangesInDataParts && parts,
+    ReadFromMergeTree::IndexStatPtr index_stats,
     size_t num_streams,
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
@@ -1403,7 +1395,7 @@ QueryPlanPtr MergeTreeDataSelectExecutor::spreadMarkRangesAmongStreamsFinal(
         num_streams = settings.max_final_threads;
 
     /// If setting do_not_merge_across_partitions_select_final is true than we won't merge parts from different partitions.
-    /// We have all parts in parts vector, where parts with same partition are nerby.
+    /// We have all parts in parts vector, where parts with same partition are nearby.
     /// So we will store iterators pointed to the beginning of each partition range (and parts.end()),
     /// then we will create a pipe for each partition that will run selecting processor and merging processor
     /// for the parts with this partition. In the end we will unite all the pipes.
@@ -1442,7 +1434,7 @@ QueryPlanPtr MergeTreeDataSelectExecutor::spreadMarkRangesAmongStreamsFinal(
         QueryPlanPtr plan;
 
         {
-            Pipes pipes;
+            RangesInDataParts new_parts;
 
             /// If do_not_merge_across_partitions_select_final is true and there is only one part in partition
             /// with level > 0 then we won't postprocess this part and if num_streams > 1 we
@@ -1461,36 +1453,35 @@ QueryPlanPtr MergeTreeDataSelectExecutor::spreadMarkRangesAmongStreamsFinal(
             {
                 for (auto part_it = parts_to_merge_ranges[range_index]; part_it != parts_to_merge_ranges[range_index + 1]; ++part_it)
                 {
-                    auto source_processor = std::make_shared<MergeTreeSelectProcessor>(
-                        data,
-                        metadata_snapshot,
-                        part_it->data_part,
-                        max_block_size,
-                        settings.preferred_block_size_bytes,
-                        settings.preferred_max_column_in_block_size_bytes,
-                        column_names,
-                        part_it->ranges,
-                        use_uncompressed_cache,
-                        query_info.prewhere_info,
-                        true,
-                        reader_settings,
-                        virt_columns,
-                        part_it->part_index_in_query);
-
-                    pipes.emplace_back(std::move(source_processor));
+                    new_parts.emplace_back(part_it->data_part, part_it->part_index_in_query, part_it->ranges);
                 }
             }
 
-            if (pipes.empty())
+            if (new_parts.empty())
                 continue;
 
-            auto pipe = Pipe::unitePipes(std::move(pipes));
+            ReadFromMergeTree::Settings step_settings
+            {
+                .max_block_size = max_block_size,
+                .preferred_block_size_bytes = settings.preferred_block_size_bytes,
+                .preferred_max_column_in_block_size_bytes = settings.preferred_max_column_in_block_size_bytes,
+                .min_marks_for_concurrent_read = 0, /// this setting is not used for reading in order
+                .use_uncompressed_cache = use_uncompressed_cache,
+                .reader_settings = reader_settings,
+                .backoff_settings = MergeTreeReadPool::BackoffSettings(settings),
+            };
+
+            plan = std::make_unique<QueryPlan>();
+            auto step = std::make_unique<ReadFromMergeTree>(
+                data, metadata_snapshot, query_id,
+                column_names, std::move(new_parts), std::move(index_stats), query_info.prewhere_info, virt_columns,
+                step_settings, num_streams, ReadFromMergeTree::ReadType::InOrder);
+
+            plan->addStep(std::move(step));
 
             /// Drop temporary columns, added by 'sorting_key_expr'
             if (!out_projection)
-                out_projection = createProjection(pipe.getHeader());
-
-            plan = createPlanFromPipe(std::move(pipe), query_id, data, "with final");
+                out_projection = createProjection(plan->getCurrentDataStream().header);
         }
 
         auto expression_step = std::make_unique<ExpressionStep>(
@@ -1537,7 +1528,7 @@ QueryPlanPtr MergeTreeDataSelectExecutor::spreadMarkRangesAmongStreamsFinal(
 
     if (!lonely_parts.empty())
     {
-        Pipes pipes;
+        RangesInDataParts new_parts;
 
         size_t num_streams_for_lonely_parts = num_streams * lonely_parts.size();
 
@@ -1552,41 +1543,28 @@ QueryPlanPtr MergeTreeDataSelectExecutor::spreadMarkRangesAmongStreamsFinal(
         if (sum_marks_in_lonely_parts < num_streams_for_lonely_parts * min_marks_for_concurrent_read && lonely_parts.size() < num_streams_for_lonely_parts)
             num_streams_for_lonely_parts = std::max((sum_marks_in_lonely_parts + min_marks_for_concurrent_read - 1) / min_marks_for_concurrent_read, lonely_parts.size());
 
-
-        MergeTreeReadPoolPtr pool = std::make_shared<MergeTreeReadPool>(
-            num_streams_for_lonely_parts,
-            sum_marks_in_lonely_parts,
-            min_marks_for_concurrent_read,
-            std::move(lonely_parts),
-            data,
-            metadata_snapshot,
-            query_info.prewhere_info,
-            true,
-            column_names,
-            MergeTreeReadPool::BackoffSettings(settings),
-            settings.preferred_block_size_bytes,
-            false);
-
-        LOG_TRACE(log, "Reading approx. {} rows with {} streams", total_rows_in_lonely_parts, num_streams_for_lonely_parts);
-
-        for (size_t i = 0; i < num_streams_for_lonely_parts; ++i)
+        ReadFromMergeTree::Settings step_settings
         {
-            auto source = std::make_shared<MergeTreeThreadSelectBlockInputProcessor>(
-                i, pool, min_marks_for_concurrent_read, max_block_size,
-                settings.preferred_block_size_bytes, settings.preferred_max_column_in_block_size_bytes,
-                data, metadata_snapshot, use_uncompressed_cache,
-                query_info.prewhere_info, reader_settings, virt_columns);
+            .max_block_size = max_block_size,
+            .preferred_block_size_bytes = settings.preferred_block_size_bytes,
+            .preferred_max_column_in_block_size_bytes = settings.preferred_max_column_in_block_size_bytes,
+            .min_marks_for_concurrent_read = min_marks_for_concurrent_read,
+            .use_uncompressed_cache = use_uncompressed_cache,
+            .reader_settings = reader_settings,
+            .backoff_settings = MergeTreeReadPool::BackoffSettings(settings),
+        };
 
-            pipes.emplace_back(std::move(source));
-        }
+        auto plan = std::make_unique<QueryPlan>();
+        auto step = std::make_unique<ReadFromMergeTree>(
+            data, metadata_snapshot, query_id,
+            column_names, std::move(lonely_parts), std::move(index_stats), query_info.prewhere_info, virt_columns,
+            step_settings, num_streams_for_lonely_parts, ReadFromMergeTree::ReadType::Default);
 
-        auto pipe = Pipe::unitePipes(std::move(pipes));
+        plan->addStep(std::move(step));
 
         /// Drop temporary columns, added by 'sorting_key_expr'
         if (!out_projection)
-            out_projection = createProjection(pipe.getHeader());
-
-        QueryPlanPtr plan = createPlanFromPipe(std::move(pipe), query_id, data, "with final");
+            out_projection = createProjection(plan->getCurrentDataStream().header);
 
         auto expression_step = std::make_unique<ExpressionStep>(
             plan->getCurrentDataStream(),
@@ -1885,30 +1863,22 @@ void MergeTreeDataSelectExecutor::selectPartsToRead(
     MergeTreeData::DataPartsVector & parts,
     const std::unordered_set<String> & part_values,
     const std::optional<KeyCondition> & minmax_idx_condition,
+    const DataTypes & minmax_columns_types,
     std::optional<PartitionPruner> & partition_pruner,
-    const PartitionIdToMaxBlock * max_block_numbers_to_read) const
+    const PartitionIdToMaxBlock * max_block_numbers_to_read,
+    PartFilterCounters & counters)
 {
     auto prev_parts = parts;
     parts.clear();
 
     for (const auto & part : prev_parts)
     {
-        if (part_values.find(part->name) == part_values.end())
+        if (!part_values.empty() && part_values.find(part->name) == part_values.end())
             continue;
 
         if (part->isEmpty())
             continue;
 
-        if (minmax_idx_condition && !minmax_idx_condition->checkInHyperrectangle(
-                part->minmax_idx.hyperrectangle, data.minmax_idx_column_types).can_be_true)
-            continue;
-
-        if (partition_pruner)
-        {
-            if (partition_pruner->canBePruned(part))
-                continue;
-        }
-
         if (max_block_numbers_to_read)
         {
             auto blocks_iterator = max_block_numbers_to_read->find(part->info.partition_id);
@@ -1916,6 +1886,29 @@ void MergeTreeDataSelectExecutor::selectPartsToRead(
                 continue;
         }
 
+        size_t num_granules = part->getMarksCount();
+        if (num_granules && part->index_granularity.hasFinalMark())
+            --num_granules;
+
+        counters.num_initial_selected_parts += 1;
+        counters.num_initial_selected_granules += num_granules;
+
+        if (minmax_idx_condition && !minmax_idx_condition->checkInHyperrectangle(
+                part->minmax_idx.hyperrectangle, minmax_columns_types).can_be_true)
+            continue;
+
+        counters.num_parts_after_minmax += 1;
+        counters.num_granules_after_minmax += num_granules;
+
+        if (partition_pruner)
+        {
+            if (partition_pruner->canBePruned(part))
+                continue;
+        }
+
+        counters.num_parts_after_partition_pruner += 1;
+        counters.num_granules_after_partition_pruner += num_granules;
+
         parts.push_back(part);
     }
 }
@@ -1924,18 +1917,17 @@ void MergeTreeDataSelectExecutor::selectPartsToReadWithUUIDFilter(
     MergeTreeData::DataPartsVector & parts,
     const std::unordered_set<String> & part_values,
     const std::optional<KeyCondition> & minmax_idx_condition,
+    const DataTypes & minmax_columns_types,
     std::optional<PartitionPruner> & partition_pruner,
     const PartitionIdToMaxBlock * max_block_numbers_to_read,
-    const Context & query_context) const
+    ContextPtr query_context,
+    PartFilterCounters & counters) const
 {
-    /// const_cast to add UUIDs to context. Bad practice.
-    Context & non_const_context = const_cast<Context &>(query_context);
-
     /// process_parts prepare parts that have to be read for the query,
     /// returns false if duplicated parts' UUID have been met
     auto select_parts = [&] (MergeTreeData::DataPartsVector & selected_parts) -> bool
     {
-        auto ignored_part_uuids = non_const_context.getIgnoredPartUUIDs();
+        auto ignored_part_uuids = query_context->getIgnoredPartUUIDs();
         std::unordered_set<UUID> temp_part_uuids;
 
         auto prev_parts = selected_parts;
@@ -1943,23 +1935,12 @@ void MergeTreeDataSelectExecutor::selectPartsToReadWithUUIDFilter(
 
         for (const auto & part : prev_parts)
         {
-            if (part_values.find(part->name) == part_values.end())
+            if (!part_values.empty() && part_values.find(part->name) == part_values.end())
                 continue;
 
             if (part->isEmpty())
                 continue;
 
-            if (minmax_idx_condition
-                && !minmax_idx_condition->checkInHyperrectangle(part->minmax_idx.hyperrectangle, data.minmax_idx_column_types)
-                        .can_be_true)
-                continue;
-
-            if (partition_pruner)
-            {
-                if (partition_pruner->canBePruned(part))
-                    continue;
-            }
-
             if (max_block_numbers_to_read)
             {
                 auto blocks_iterator = max_block_numbers_to_read->find(part->info.partition_id);
@@ -1967,13 +1948,37 @@ void MergeTreeDataSelectExecutor::selectPartsToReadWithUUIDFilter(
                     continue;
             }
 
+            /// Skip the part if its uuid is meant to be excluded
+            if (part->uuid != UUIDHelpers::Nil && ignored_part_uuids->has(part->uuid))
+                continue;
+
+            size_t num_granules = part->getMarksCount();
+            if (num_granules && part->index_granularity.hasFinalMark())
+                --num_granules;
+
+            counters.num_initial_selected_parts += 1;
+            counters.num_initial_selected_granules += num_granules;
+
+            if (minmax_idx_condition
+                && !minmax_idx_condition->checkInHyperrectangle(part->minmax_idx.hyperrectangle, minmax_columns_types)
+                        .can_be_true)
+                continue;
+
+            counters.num_parts_after_minmax += 1;
+            counters.num_granules_after_minmax += num_granules;
+
+            if (partition_pruner)
+            {
+                if (partition_pruner->canBePruned(part))
+                    continue;
+            }
+
+            counters.num_parts_after_partition_pruner += 1;
+            counters.num_granules_after_partition_pruner += num_granules;
+
             /// populate UUIDs and exclude ignored parts if enabled
             if (part->uuid != UUIDHelpers::Nil)
             {
-                /// Skip the part if its uuid is meant to be excluded
-                if (ignored_part_uuids->has(part->uuid))
-                    continue;
-
                 auto result = temp_part_uuids.insert(part->uuid);
                 if (!result.second)
                     throw Exception("Found a part with the same UUID on the same replica.", ErrorCodes::LOGICAL_ERROR);
@@ -1984,12 +1989,12 @@ void MergeTreeDataSelectExecutor::selectPartsToReadWithUUIDFilter(
 
         if (!temp_part_uuids.empty())
         {
-            auto duplicates = non_const_context.getPartUUIDs()->add(std::vector<UUID>{temp_part_uuids.begin(), temp_part_uuids.end()});
+            auto duplicates = query_context->getPartUUIDs()->add(std::vector<UUID>{temp_part_uuids.begin(), temp_part_uuids.end()});
             if (!duplicates.empty())
             {
                 /// on a local replica with prefer_localhost_replica=1 if any duplicates appeared during the first pass,
                 /// adding them to the exclusion, so they will be skipped on second pass
-                non_const_context.getIgnoredPartUUIDs()->add(duplicates);
+                query_context->getIgnoredPartUUIDs()->add(duplicates);
                 return false;
             }
         }
@@ -2005,6 +2010,8 @@ void MergeTreeDataSelectExecutor::selectPartsToReadWithUUIDFilter(
     {
         LOG_DEBUG(log, "Found duplicate uuids locally, will retry part selection without them");
 
+        counters = PartFilterCounters();
+
         /// Second attempt didn't help, throw an exception
         if (!select_parts(parts))
             throw Exception("Found duplicate UUIDs while processing query.", ErrorCodes::DUPLICATED_PART_UUIDS);
diff --git a/src/Storages/MergeTree/MergeTreeDataSelectExecutor.h b/src/Storages/MergeTree/MergeTreeDataSelectExecutor.h
index 7692424dfb5..4129b3ea2a0 100644
--- a/src/Storages/MergeTree/MergeTreeDataSelectExecutor.h
+++ b/src/Storages/MergeTree/MergeTreeDataSelectExecutor.h
@@ -5,6 +5,7 @@
 #include <Storages/MergeTree/MergeTreeData.h>
 #include <Storages/MergeTree/RangesInDataPart.h>
 #include <Storages/MergeTree/PartitionPruner.h>
+#include <Processors/QueryPlan/ReadFromMergeTree.h>
 
 
 namespace DB
@@ -29,7 +30,7 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & metadata_snapshot,
         const SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         UInt64 max_block_size,
         unsigned num_streams,
         const PartitionIdToMaxBlock * max_block_numbers_to_read = nullptr) const;
@@ -39,11 +40,17 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & metadata_snapshot,
         const SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         UInt64 max_block_size,
         unsigned num_streams,
         const PartitionIdToMaxBlock * max_block_numbers_to_read = nullptr) const;
 
+    /// Construct a sample block consisting only of possible virtual columns for part pruning.
+    static Block getSampleBlockWithVirtualPartColumns();
+
+    /// Fill in values of possible virtual columns for part pruning.
+    static void fillBlockWithVirtualPartColumns(const MergeTreeData::DataPartsVector & parts, Block & block);
+
 private:
     const MergeTreeData & data;
 
@@ -51,6 +58,7 @@ private:
 
     QueryPlanPtr spreadMarkRangesAmongStreams(
         RangesInDataParts && parts,
+        ReadFromMergeTree::IndexStatPtr index_stats,
         size_t num_streams,
         const Names & column_names,
         const StorageMetadataPtr & metadata_snapshot,
@@ -65,6 +73,7 @@ private:
     /// out_projection - save projection only with columns, requested to read
     QueryPlanPtr spreadMarkRangesAmongStreamsWithOrder(
         RangesInDataParts && parts,
+        ReadFromMergeTree::IndexStatPtr index_stats,
         size_t num_streams,
         const Names & column_names,
         const StorageMetadataPtr & metadata_snapshot,
@@ -80,6 +89,7 @@ private:
 
     QueryPlanPtr spreadMarkRangesAmongStreamsFinal(
         RangesInDataParts && parts,
+        ReadFromMergeTree::IndexStatPtr index_stats,
         size_t num_streams,
         const Names & column_names,
         const StorageMetadataPtr & metadata_snapshot,
@@ -117,23 +127,37 @@ private:
         size_t & granules_dropped,
         Poco::Logger * log);
 
+    struct PartFilterCounters
+    {
+        size_t num_initial_selected_parts = 0;
+        size_t num_initial_selected_granules = 0;
+        size_t num_parts_after_minmax = 0;
+        size_t num_granules_after_minmax = 0;
+        size_t num_parts_after_partition_pruner = 0;
+        size_t num_granules_after_partition_pruner = 0;
+    };
+
     /// Select the parts in which there can be data that satisfy `minmax_idx_condition` and that match the condition on `_part`,
     ///  as well as `max_block_number_to_read`.
-    void selectPartsToRead(
+    static void selectPartsToRead(
         MergeTreeData::DataPartsVector & parts,
         const std::unordered_set<String> & part_values,
         const std::optional<KeyCondition> & minmax_idx_condition,
+        const DataTypes & minmax_columns_types,
         std::optional<PartitionPruner> & partition_pruner,
-        const PartitionIdToMaxBlock * max_block_numbers_to_read) const;
+        const PartitionIdToMaxBlock * max_block_numbers_to_read,
+        PartFilterCounters & counters);
 
     /// Same as previous but also skip parts uuids if any to the query context, or skip parts which uuids marked as excluded.
     void selectPartsToReadWithUUIDFilter(
         MergeTreeData::DataPartsVector & parts,
         const std::unordered_set<String> & part_values,
         const std::optional<KeyCondition> & minmax_idx_condition,
+        const DataTypes & minmax_columns_types,
         std::optional<PartitionPruner> & partition_pruner,
         const PartitionIdToMaxBlock * max_block_numbers_to_read,
-        const Context & query_context) const;
+        ContextPtr query_context,
+        PartFilterCounters & counters) const;
 };
 
 }
diff --git a/src/Storages/MergeTree/MergeTreeDataWriter.cpp b/src/Storages/MergeTree/MergeTreeDataWriter.cpp
index 5a9bdd90bc8..79d95eb03ee 100644
--- a/src/Storages/MergeTree/MergeTreeDataWriter.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataWriter.cpp
@@ -268,7 +268,7 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataWriter::writeTempPart(BlockWithPa
     Int64 temp_index = data.insert_increment.get();
 
     IMergeTreeDataPart::MinMaxIndex minmax_idx;
-    minmax_idx.update(block, data.minmax_idx_columns);
+    minmax_idx.update(block, data.getMinMaxColumnsNames(metadata_snapshot->getPartitionKey()));
 
     MergeTreePartition partition(std::move(block_with_partition.partition));
 
@@ -327,6 +327,11 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataWriter::writeTempPart(BlockWithPa
     /// Size of part would not be greater than block.bytes() + epsilon
     size_t expected_size = block.bytes();
 
+    /// If optimize_on_insert is true, block may become empty after merge.
+    /// There is no need to create empty part.
+    if (expected_size == 0)
+        return nullptr;
+
     DB::IMergeTreeDataPart::TTLInfos move_ttl_infos;
     const auto & move_ttl_entries = metadata_snapshot->getMoveTTLs();
     for (const auto & ttl_entry : move_ttl_entries)
@@ -347,6 +352,7 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataWriter::writeTempPart(BlockWithPa
         new_data_part->uuid = UUIDHelpers::generateV4();
 
     new_data_part->setColumns(columns);
+    new_data_part->rows_count = block.rows();
     new_data_part->partition = std::move(partition);
     new_data_part->minmax_idx = std::move(minmax_idx);
     new_data_part->is_temp = true;
@@ -390,7 +396,7 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataWriter::writeTempPart(BlockWithPa
 
     /// This effectively chooses minimal compression method:
     ///  either default lz4 or compression method with zero thresholds on absolute and relative part size.
-    auto compression_codec = data.global_context.chooseCompressionCodec(0, 0);
+    auto compression_codec = data.getContext()->chooseCompressionCodec(0, 0);
 
     const auto & index_factory = MergeTreeIndexFactory::instance();
     MergedBlockOutputStream out(new_data_part, metadata_snapshot, columns, index_factory.getMany(metadata_snapshot->getSecondaryIndices()), compression_codec);
diff --git a/src/Storages/MergeTree/MergeTreeDeduplicationLog.cpp b/src/Storages/MergeTree/MergeTreeDeduplicationLog.cpp
new file mode 100644
index 00000000000..33960e2e1ff
--- /dev/null
+++ b/src/Storages/MergeTree/MergeTreeDeduplicationLog.cpp
@@ -0,0 +1,311 @@
+#include <Storages/MergeTree/MergeTreeDeduplicationLog.h>
+#include <filesystem>
+#include <boost/algorithm/string/split.hpp>
+#include <boost/algorithm/string/join.hpp>
+#include <boost/algorithm/string/trim.hpp>
+#include <IO/ReadBufferFromFile.h>
+#include <IO/WriteHelpers.h>
+#include <IO/ReadHelpers.h>
+
+namespace DB
+{
+
+namespace
+{
+
+/// Deduplication operation part was dropped or added
+enum class MergeTreeDeduplicationOp : uint8_t
+{
+    ADD = 1,
+    DROP = 2,
+};
+
+/// Record for deduplication on disk
+struct MergeTreeDeduplicationLogRecord
+{
+    MergeTreeDeduplicationOp operation;
+    std::string part_name;
+    std::string block_id;
+};
+
+void writeRecord(const MergeTreeDeduplicationLogRecord & record, WriteBuffer & out)
+{
+    writeIntText(static_cast<uint8_t>(record.operation), out);
+    writeChar('\t', out);
+    writeString(record.part_name, out);
+    writeChar('\t', out);
+    writeString(record.block_id, out);
+    writeChar('\n', out);
+    out.next();
+}
+
+void readRecord(MergeTreeDeduplicationLogRecord & record, ReadBuffer & in)
+{
+    uint8_t op;
+    readIntText(op, in);
+    record.operation = static_cast<MergeTreeDeduplicationOp>(op);
+    assertChar('\t', in);
+    readString(record.part_name, in);
+    assertChar('\t', in);
+    readString(record.block_id, in);
+    assertChar('\n', in);
+}
+
+
+std::string getLogPath(const std::string & prefix, size_t number)
+{
+    std::filesystem::path path(prefix);
+    path /= std::filesystem::path(std::string{"deduplication_log_"} + std::to_string(number) + ".txt");
+    return path;
+}
+
+size_t getLogNumber(const std::string & path_str)
+{
+    std::filesystem::path path(path_str);
+    std::string filename = path.stem();
+    Strings filename_parts;
+    boost::split(filename_parts, filename, boost::is_any_of("_"));
+
+    return parse<size_t>(filename_parts[2]);
+}
+
+}
+
+MergeTreeDeduplicationLog::MergeTreeDeduplicationLog(
+    const std::string & logs_dir_,
+    size_t deduplication_window_,
+    const MergeTreeDataFormatVersion & format_version_)
+    : logs_dir(logs_dir_)
+    , deduplication_window(deduplication_window_)
+    , rotate_interval(deduplication_window_ * 2) /// actually it doesn't matter
+    , format_version(format_version_)
+    , deduplication_map(deduplication_window)
+{
+    namespace fs = std::filesystem;
+    if (deduplication_window != 0 && !fs::exists(logs_dir))
+        fs::create_directories(logs_dir);
+}
+
+void MergeTreeDeduplicationLog::load()
+{
+    namespace fs = std::filesystem;
+    if (!fs::exists(logs_dir))
+        return;
+
+    for (const auto & p : fs::directory_iterator(logs_dir))
+    {
+        const auto & path = p.path();
+        auto log_number = getLogNumber(path);
+        existing_logs[log_number] = {path, 0};
+    }
+
+    /// We should know which logs are exist even in case
+    /// of deduplication_window = 0
+    if (!existing_logs.empty())
+        current_log_number = existing_logs.rbegin()->first;
+
+    if (deduplication_window != 0)
+    {
+        /// Order important, we load history from the begging to the end
+        for (auto & [log_number, desc] : existing_logs)
+        {
+            try
+            {
+                desc.entries_count = loadSingleLog(desc.path);
+            }
+            catch (...)
+            {
+                tryLogCurrentException(__PRETTY_FUNCTION__, "Error while loading MergeTree deduplication log on path " + desc.path);
+            }
+        }
+
+        /// Start new log, drop previous
+        rotateAndDropIfNeeded();
+
+        /// Can happen in case we have unfinished log
+        if (!current_writer)
+            current_writer = std::make_unique<WriteBufferFromFile>(existing_logs.rbegin()->second.path, DBMS_DEFAULT_BUFFER_SIZE, O_APPEND | O_CREAT | O_WRONLY);
+    }
+}
+
+size_t MergeTreeDeduplicationLog::loadSingleLog(const std::string & path)
+{
+    ReadBufferFromFile read_buf(path);
+
+    size_t total_entries = 0;
+    while (!read_buf.eof())
+    {
+        MergeTreeDeduplicationLogRecord record;
+        readRecord(record, read_buf);
+        if (record.operation == MergeTreeDeduplicationOp::DROP)
+            deduplication_map.erase(record.block_id);
+        else
+            deduplication_map.insert(record.block_id, MergeTreePartInfo::fromPartName(record.part_name, format_version));
+        total_entries++;
+    }
+    return total_entries;
+}
+
+void MergeTreeDeduplicationLog::rotate()
+{
+    /// We don't deduplicate anything so we don't need any writers
+    if (deduplication_window == 0)
+        return;
+
+    current_log_number++;
+    auto new_path = getLogPath(logs_dir, current_log_number);
+    MergeTreeDeduplicationLogNameDescription log_description{new_path, 0};
+    existing_logs.emplace(current_log_number, log_description);
+
+    if (current_writer)
+        current_writer->sync();
+
+    current_writer = std::make_unique<WriteBufferFromFile>(log_description.path, DBMS_DEFAULT_BUFFER_SIZE, O_APPEND | O_CREAT | O_WRONLY);
+}
+
+void MergeTreeDeduplicationLog::dropOutdatedLogs()
+{
+    size_t current_sum = 0;
+    size_t remove_from_value = 0;
+    /// Go from end to the beginning
+    for (auto itr = existing_logs.rbegin(); itr != existing_logs.rend(); ++itr)
+    {
+        if (current_sum > deduplication_window)
+        {
+            /// We have more logs than required, all older files (including current) can be dropped
+            remove_from_value = itr->first;
+            break;
+        }
+
+        auto & description = itr->second;
+        current_sum += description.entries_count;
+    }
+
+    /// If we found some logs to drop
+    if (remove_from_value != 0)
+    {
+        /// Go from the beginning to the end and drop all outdated logs
+        for (auto itr = existing_logs.begin(); itr != existing_logs.end();)
+        {
+            size_t number = itr->first;
+            std::filesystem::remove(itr->second.path);
+            itr = existing_logs.erase(itr);
+            if (remove_from_value == number)
+                break;
+        }
+    }
+
+}
+
+void MergeTreeDeduplicationLog::rotateAndDropIfNeeded()
+{
+    /// If we don't have logs at all or already have enough records in current
+    if (existing_logs.empty() || existing_logs[current_log_number].entries_count >= rotate_interval)
+    {
+        rotate();
+        dropOutdatedLogs();
+    }
+}
+
+std::pair<MergeTreePartInfo, bool> MergeTreeDeduplicationLog::addPart(const std::string & block_id, const MergeTreePartInfo & part_info)
+{
+    std::lock_guard lock(state_mutex);
+
+    /// We support zero case because user may want to disable deduplication with
+    /// ALTER MODIFY SETTING query. It's much more simpler to handle zero case
+    /// here then destroy whole object, check for null pointer from different
+    /// threads and so on.
+    if (deduplication_window == 0)
+        return std::make_pair(part_info, true);
+
+    /// If we already have this block let's deduplicate it
+    if (deduplication_map.contains(block_id))
+    {
+        auto info = deduplication_map.get(block_id);
+        return std::make_pair(info, false);
+    }
+
+    assert(current_writer != nullptr);
+
+    /// Create new record
+    MergeTreeDeduplicationLogRecord record;
+    record.operation = MergeTreeDeduplicationOp::ADD;
+    record.part_name = part_info.getPartName();
+    record.block_id = block_id;
+    /// Write it to disk
+    writeRecord(record, *current_writer);
+    /// We have one more record in current log
+    existing_logs[current_log_number].entries_count++;
+    /// Add to deduplication map
+    deduplication_map.insert(record.block_id, part_info);
+    /// Rotate and drop old logs if needed
+    rotateAndDropIfNeeded();
+
+    return std::make_pair(part_info, true);
+}
+
+void MergeTreeDeduplicationLog::dropPart(const MergeTreePartInfo & drop_part_info)
+{
+    std::lock_guard lock(state_mutex);
+
+    /// We support zero case because user may want to disable deduplication with
+    /// ALTER MODIFY SETTING query. It's much more simpler to handle zero case
+    /// here then destroy whole object, check for null pointer from different
+    /// threads and so on.
+    if (deduplication_window == 0)
+        return;
+
+    assert(current_writer != nullptr);
+
+    for (auto itr = deduplication_map.begin(); itr != deduplication_map.end(); /* no increment here, we erasing from map */)
+    {
+        const auto & part_info = itr->value;
+        /// Part is covered by dropped part, let's remove it from
+        /// deduplication history
+        if (drop_part_info.contains(part_info))
+        {
+            /// Create drop record
+            MergeTreeDeduplicationLogRecord record;
+            record.operation = MergeTreeDeduplicationOp::DROP;
+            record.part_name = part_info.getPartName();
+            record.block_id = itr->key;
+            /// Write it to disk
+            writeRecord(record, *current_writer);
+            /// We have one more record on disk
+            existing_logs[current_log_number].entries_count++;
+
+            /// Increment itr before erase, otherwise it will invalidated
+            ++itr;
+            /// Remove block_id from in-memory table
+            deduplication_map.erase(record.block_id);
+
+            /// Rotate and drop old logs if needed
+            rotateAndDropIfNeeded();
+        }
+        else
+        {
+            ++itr;
+        }
+    }
+}
+
+void MergeTreeDeduplicationLog::setDeduplicationWindowSize(size_t deduplication_window_)
+{
+    std::lock_guard lock(state_mutex);
+
+    deduplication_window = deduplication_window_;
+    rotate_interval = deduplication_window * 2;
+
+    /// If settings was set for the first time with ALTER MODIFY SETTING query
+    if (deduplication_window != 0 && !std::filesystem::exists(logs_dir))
+        std::filesystem::create_directories(logs_dir);
+
+    deduplication_map.setMaxSize(deduplication_window);
+    rotateAndDropIfNeeded();
+
+    /// Can happen in case we have unfinished log
+    if (!current_writer)
+        current_writer = std::make_unique<WriteBufferFromFile>(existing_logs.rbegin()->second.path, DBMS_DEFAULT_BUFFER_SIZE, O_APPEND | O_CREAT | O_WRONLY);
+}
+
+}
diff --git a/src/Storages/MergeTree/MergeTreeDeduplicationLog.h b/src/Storages/MergeTree/MergeTreeDeduplicationLog.h
new file mode 100644
index 00000000000..281a76050a2
--- /dev/null
+++ b/src/Storages/MergeTree/MergeTreeDeduplicationLog.h
@@ -0,0 +1,192 @@
+#pragma once
+#include <Core/Types.h>
+#include <common/StringRef.h>
+#include <IO/WriteBufferFromFile.h>
+#include <Storages/MergeTree/MergeTreePartInfo.h>
+#include <map>
+#include <list>
+#include <mutex>
+#include <string>
+#include <unordered_map>
+
+namespace DB
+{
+
+/// Description of dedupliction log
+struct MergeTreeDeduplicationLogNameDescription
+{
+    /// Path to log
+    std::string path;
+
+    /// How many entries we have in log
+    size_t entries_count;
+};
+
+/// Simple string-key HashTable with fixed size based on STL containers.
+/// Preserves order using linked list and remove elements
+/// on overflow in FIFO order.
+template <typename V>
+class LimitedOrderedHashMap
+{
+private:
+    struct ListNode
+    {
+        std::string key;
+        V value;
+    };
+    using Queue = std::list<ListNode>;
+    using IndexMap = std::unordered_map<StringRef, typename Queue::iterator, StringRefHash>;
+
+    Queue queue;
+    IndexMap map;
+    size_t max_size;
+public:
+    using iterator = typename Queue::iterator;
+    using const_iterator = typename Queue::const_iterator;
+    using reverse_iterator = typename Queue::reverse_iterator;
+    using const_reverse_iterator = typename Queue::const_reverse_iterator;
+
+    explicit LimitedOrderedHashMap(size_t max_size_)
+        : max_size(max_size_)
+    {}
+
+    bool contains(const std::string & key) const
+    {
+        return map.find(key) != map.end();
+    }
+
+    V get(const std::string & key) const
+    {
+        return map.at(key)->value;
+    }
+
+    size_t size() const
+    {
+        return queue.size();
+    }
+
+    void setMaxSize(size_t max_size_)
+    {
+        max_size = max_size_;
+        while (size() > max_size)
+        {
+            map.erase(queue.front().key);
+            queue.pop_front();
+        }
+    }
+
+    bool erase(const std::string & key)
+    {
+        auto it = map.find(key);
+        if (it == map.end())
+            return false;
+
+        auto queue_itr = it->second;
+        map.erase(it);
+        queue.erase(queue_itr);
+
+        return true;
+    }
+
+    bool insert(const std::string & key, const V & value)
+    {
+        auto it = map.find(key);
+        if (it != map.end())
+            return false;
+
+        if (size() == max_size)
+        {
+            map.erase(queue.front().key);
+            queue.pop_front();
+        }
+
+        ListNode elem{key, value};
+        auto itr = queue.insert(queue.end(), elem);
+        map.emplace(itr->key, itr);
+        return true;
+    }
+
+    void clear()
+    {
+        map.clear();
+        queue.clear();
+    }
+
+    iterator begin() { return queue.begin(); }
+    const_iterator begin() const { return queue.cbegin(); }
+    iterator end() { return queue.end(); }
+    const_iterator end() const { return queue.cend(); }
+
+    reverse_iterator rbegin() { return queue.rbegin(); }
+    const_reverse_iterator rbegin() const { return queue.crbegin(); }
+    reverse_iterator rend() { return queue.rend(); }
+    const_reverse_iterator rend() const { return queue.crend(); }
+};
+
+/// Fixed-size log for deduplication in non-replicated MergeTree.
+/// Stores records on disk for zero-level parts in human-readable format:
+///  operation   part_name       partition_id_check_sum
+///  1           88_18_18_0      88_10619499460461868496_9553701830997749308
+///  2           77_14_14_0      77_15147918179036854170_6725063583757244937
+///  2           77_15_15_0      77_14977227047908934259_8047656067364802772
+///  1           77_20_20_0      77_15147918179036854170_6725063583757244937
+/// Also stores them in memory in hash table with limited size.
+class MergeTreeDeduplicationLog
+{
+public:
+    MergeTreeDeduplicationLog(
+        const std::string & logs_dir_,
+        size_t deduplication_window_,
+        const MergeTreeDataFormatVersion & format_version_);
+
+    /// Add part into in-memory hash table and to disk
+    /// Return true and part info if insertion was successful.
+    /// Otherwise, in case of duplicate, return false and previous part name with same hash (useful for logging)
+    std::pair<MergeTreePartInfo, bool> addPart(const std::string & block_id, const MergeTreePartInfo & part);
+
+    /// Remove all covered parts from in memory table and add DROP records to the disk
+    void dropPart(const MergeTreePartInfo & drop_part_info);
+
+    /// Load history from disk. Ignores broken logs.
+    void load();
+
+    void setDeduplicationWindowSize(size_t deduplication_window_);
+private:
+    const std::string logs_dir;
+    /// Size of deduplication window
+    size_t deduplication_window;
+
+    /// How often we create new logs. Not very important,
+    /// default value equals deduplication_window * 2
+    size_t rotate_interval;
+    const MergeTreeDataFormatVersion format_version;
+
+    /// Current log number. Always growing number.
+    size_t current_log_number = 0;
+
+    /// All existing logs in order of their numbers
+    std::map<size_t, MergeTreeDeduplicationLogNameDescription> existing_logs;
+
+    /// In memory hash-table
+    LimitedOrderedHashMap<MergeTreePartInfo> deduplication_map;
+
+    /// Writer to the current log file
+    std::unique_ptr<WriteBufferFromFile> current_writer;
+
+    /// Overall mutex because we can have a lot of cocurrent inserts
+    std::mutex state_mutex;
+
+    /// Start new log
+    void rotate();
+
+    /// Remove all old logs with non-needed records for deduplication_window
+    void dropOutdatedLogs();
+
+    /// Execute both previous methods if needed
+    void rotateAndDropIfNeeded();
+
+    /// Load single log from disk. In case of corruption throws exceptions
+    size_t loadSingleLog(const std::string & path);
+};
+
+}
diff --git a/src/Storages/MergeTree/MergeTreeIOSettings.h b/src/Storages/MergeTree/MergeTreeIOSettings.h
index f2469494792..dd241cfd591 100644
--- a/src/Storages/MergeTree/MergeTreeIOSettings.h
+++ b/src/Storages/MergeTree/MergeTreeIOSettings.h
@@ -3,13 +3,19 @@
 #include <Core/Settings.h>
 #include <Storages/MergeTree/MergeTreeSettings.h>
 
+
 namespace DB
 {
 
+class MMappedFileCache;
+using MMappedFileCachePtr = std::shared_ptr<MMappedFileCache>;
+
+
 struct MergeTreeReaderSettings
 {
     size_t min_bytes_to_use_direct_io = 0;
     size_t min_bytes_to_use_mmap_io = 0;
+    MMappedFileCachePtr mmap_cache;
     size_t max_read_buffer_size = DBMS_DEFAULT_BUFFER_SIZE;
     /// If save_marks_in_cache is false, then, if marks are not in cache,
     ///  we will load them but won't save in the cache, to avoid evicting other data.
diff --git a/src/Storages/MergeTree/MergeTreeIndexAggregatorBloomFilter.h b/src/Storages/MergeTree/MergeTreeIndexAggregatorBloomFilter.h
index ebbe9865313..9877db8ee30 100644
--- a/src/Storages/MergeTree/MergeTreeIndexAggregatorBloomFilter.h
+++ b/src/Storages/MergeTree/MergeTreeIndexAggregatorBloomFilter.h
@@ -6,7 +6,7 @@
 namespace DB
 {
 
-class MergeTreeIndexAggregatorBloomFilter : public IMergeTreeIndexAggregator
+class MergeTreeIndexAggregatorBloomFilter final : public IMergeTreeIndexAggregator
 {
 public:
     MergeTreeIndexAggregatorBloomFilter(size_t bits_per_row_, size_t hash_functions_, const Names & columns_name_);
diff --git a/src/Storages/MergeTree/MergeTreeIndexBloomFilter.cpp b/src/Storages/MergeTree/MergeTreeIndexBloomFilter.cpp
index a98ba16978d..c37d710ec8f 100644
--- a/src/Storages/MergeTree/MergeTreeIndexBloomFilter.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexBloomFilter.cpp
@@ -67,7 +67,7 @@ MergeTreeIndexAggregatorPtr MergeTreeIndexBloomFilter::createIndexAggregator() c
     return std::make_shared<MergeTreeIndexAggregatorBloomFilter>(bits_per_row, hash_functions, index.column_names);
 }
 
-MergeTreeIndexConditionPtr MergeTreeIndexBloomFilter::createIndexCondition(const SelectQueryInfo & query_info, const Context & context) const
+MergeTreeIndexConditionPtr MergeTreeIndexBloomFilter::createIndexCondition(const SelectQueryInfo & query_info, ContextPtr context) const
 {
     return std::make_shared<MergeTreeIndexConditionBloomFilter>(query_info, context, index.sample_block, hash_functions);
 }
diff --git a/src/Storages/MergeTree/MergeTreeIndexBloomFilter.h b/src/Storages/MergeTree/MergeTreeIndexBloomFilter.h
index b0d9a295bcd..9112f23ee64 100644
--- a/src/Storages/MergeTree/MergeTreeIndexBloomFilter.h
+++ b/src/Storages/MergeTree/MergeTreeIndexBloomFilter.h
@@ -8,7 +8,7 @@
 namespace DB
 {
 
-class MergeTreeIndexBloomFilter : public IMergeTreeIndex
+class MergeTreeIndexBloomFilter final : public IMergeTreeIndex
 {
 public:
     MergeTreeIndexBloomFilter(
@@ -20,7 +20,7 @@ public:
 
     MergeTreeIndexAggregatorPtr createIndexAggregator() const override;
 
-    MergeTreeIndexConditionPtr createIndexCondition(const SelectQueryInfo & query_info, const Context & context) const override;
+    MergeTreeIndexConditionPtr createIndexCondition(const SelectQueryInfo & query_info, ContextPtr context) const override;
 
     bool mayBenefitFromIndexForIn(const ASTPtr & node) const override;
 
diff --git a/src/Storages/MergeTree/MergeTreeIndexConditionBloomFilter.cpp b/src/Storages/MergeTree/MergeTreeIndexConditionBloomFilter.cpp
index a9915f01645..031129a35f4 100644
--- a/src/Storages/MergeTree/MergeTreeIndexConditionBloomFilter.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexConditionBloomFilter.cpp
@@ -87,11 +87,11 @@ bool maybeTrueOnBloomFilter(const IColumn * hash_column, const BloomFilterPtr &
 }
 
 MergeTreeIndexConditionBloomFilter::MergeTreeIndexConditionBloomFilter(
-    const SelectQueryInfo & info_, const Context & context_, const Block & header_, size_t hash_functions_)
-    : header(header_), context(context_), query_info(info_), hash_functions(hash_functions_)
+    const SelectQueryInfo & info_, ContextPtr context_, const Block & header_, size_t hash_functions_)
+    : WithContext(context_), header(header_), query_info(info_), hash_functions(hash_functions_)
 {
-    auto atom_from_ast = [this](auto & node, auto &, auto & constants, auto & out) { return traverseAtomAST(node, constants, out); };
-    rpn = std::move(RPNBuilder<RPNElement>(info_, context, atom_from_ast).extractRPN());
+    auto atom_from_ast = [this](auto & node, auto, auto & constants, auto & out) { return traverseAtomAST(node, constants, out); };
+    rpn = std::move(RPNBuilder<RPNElement>(info_, getContext(), atom_from_ast).extractRPN());
 }
 
 bool MergeTreeIndexConditionBloomFilter::alwaysUnknownOrTrue() const
diff --git a/src/Storages/MergeTree/MergeTreeIndexConditionBloomFilter.h b/src/Storages/MergeTree/MergeTreeIndexConditionBloomFilter.h
index 34fb45c86a5..61e796fb6f7 100644
--- a/src/Storages/MergeTree/MergeTreeIndexConditionBloomFilter.h
+++ b/src/Storages/MergeTree/MergeTreeIndexConditionBloomFilter.h
@@ -13,7 +13,7 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
-class MergeTreeIndexConditionBloomFilter : public IMergeTreeIndexCondition
+class MergeTreeIndexConditionBloomFilter final : public IMergeTreeIndexCondition, WithContext
 {
 public:
     struct RPNElement
@@ -42,7 +42,7 @@ public:
         std::vector<std::pair<size_t, ColumnPtr>> predicate;
     };
 
-    MergeTreeIndexConditionBloomFilter(const SelectQueryInfo & info_, const Context & context_, const Block & header_, size_t hash_functions_);
+    MergeTreeIndexConditionBloomFilter(const SelectQueryInfo & info_, ContextPtr context_, const Block & header_, size_t hash_functions_);
 
     bool alwaysUnknownOrTrue() const override;
 
@@ -56,7 +56,6 @@ public:
 
 private:
     const Block & header;
-    const Context & context;
     const SelectQueryInfo & query_info;
     const size_t hash_functions;
     std::vector<RPNElement> rpn;
diff --git a/src/Storages/MergeTree/MergeTreeIndexFullText.cpp b/src/Storages/MergeTree/MergeTreeIndexFullText.cpp
index 3e8b9cc704b..10136cd1069 100644
--- a/src/Storages/MergeTree/MergeTreeIndexFullText.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexFullText.cpp
@@ -43,15 +43,29 @@ namespace ErrorCodes
 
 /// Adds all tokens from string to bloom filter.
 static void stringToBloomFilter(
+    const String & string, TokenExtractorPtr token_extractor, BloomFilter & bloom_filter)
+{
+    const char * data = string.data();
+    size_t size = string.size();
+
+    size_t cur = 0;
+    size_t token_start = 0;
+    size_t token_len = 0;
+    while (cur < size && token_extractor->nextInField(data, size, &cur, &token_start, &token_len))
+        bloom_filter.add(data + token_start, token_len);
+}
+
+static void columnToBloomFilter(
     const char * data, size_t size, TokenExtractorPtr token_extractor, BloomFilter & bloom_filter)
 {
     size_t cur = 0;
     size_t token_start = 0;
     size_t token_len = 0;
-    while (cur < size && token_extractor->next(data, size, &cur, &token_start, &token_len))
+    while (cur < size && token_extractor->nextInColumn(data, size, &cur, &token_start, &token_len))
         bloom_filter.add(data + token_start, token_len);
 }
 
+
 /// Adds all tokens from like pattern string to bloom filter. (Because like pattern can contain `\%` and `\_`.)
 static void likeStringToBloomFilter(
     const String & data, TokenExtractorPtr token_extractor, BloomFilter & bloom_filter)
@@ -61,15 +75,14 @@ static void likeStringToBloomFilter(
     while (cur < data.size() && token_extractor->nextLike(data, &cur, token))
         bloom_filter.add(token.c_str(), token.size());
 }
+
 /// Unified condition for equals, startsWith and endsWith
 bool MergeTreeConditionFullText::createFunctionEqualsCondition(
     RPNElement & out, const Field & value, const BloomFilterParameters & params, TokenExtractorPtr token_extractor)
 {
     out.function = RPNElement::FUNCTION_EQUALS;
     out.bloom_filter = std::make_unique<BloomFilter>(params);
-
-    const auto & str = value.get<String>();
-    stringToBloomFilter(str.c_str(), str.size(), token_extractor, *out.bloom_filter);
+    stringToBloomFilter(value.get<String>(), token_extractor, *out.bloom_filter);
     return true;
 }
 
@@ -143,7 +156,7 @@ void MergeTreeIndexAggregatorFullText::update(const Block & block, size_t * pos,
         for (size_t i = 0; i < rows_read; ++i)
         {
             auto ref = column->getDataAt(*pos + i);
-            stringToBloomFilter(ref.data, ref.size, token_extractor, granule->bloom_filters[col]);
+            columnToBloomFilter(ref.data, ref.size, token_extractor, granule->bloom_filters[col]);
         }
     }
     granule->has_elems = true;
@@ -153,7 +166,7 @@ void MergeTreeIndexAggregatorFullText::update(const Block & block, size_t * pos,
 
 MergeTreeConditionFullText::MergeTreeConditionFullText(
     const SelectQueryInfo & query_info,
-    const Context & context,
+    ContextPtr context,
     const Block & index_sample_block,
     const BloomFilterParameters & params_,
     TokenExtractorPtr token_extactor_)
@@ -166,7 +179,7 @@ MergeTreeConditionFullText::MergeTreeConditionFullText(
     rpn = std::move(
             RPNBuilder<RPNElement>(
                     query_info, context,
-                    [this] (const ASTPtr & node, const Context & /* context */, Block & block_with_constants, RPNElement & out) -> bool
+                    [this] (const ASTPtr & node, ContextPtr /* context */, Block & block_with_constants, RPNElement & out) -> bool
                     {
                         return this->atomFromAST(node, block_with_constants, out);
                     }).extractRPN());
@@ -367,9 +380,7 @@ bool MergeTreeConditionFullText::atomFromAST(
             out.key_column = key_column_num;
             out.function = RPNElement::FUNCTION_NOT_EQUALS;
             out.bloom_filter = std::make_unique<BloomFilter>(params);
-
-            const auto & str = const_value.get<String>();
-            stringToBloomFilter(str.c_str(), str.size(), token_extractor, *out.bloom_filter);
+            stringToBloomFilter(const_value.get<String>(), token_extractor, *out.bloom_filter);
             return true;
         }
         else if (func_name == "equals")
@@ -382,9 +393,7 @@ bool MergeTreeConditionFullText::atomFromAST(
             out.key_column = key_column_num;
             out.function = RPNElement::FUNCTION_EQUALS;
             out.bloom_filter = std::make_unique<BloomFilter>(params);
-
-            const auto & str = const_value.get<String>();
-            likeStringToBloomFilter(str, token_extractor, *out.bloom_filter);
+            likeStringToBloomFilter(const_value.get<String>(), token_extractor, *out.bloom_filter);
             return true;
         }
         else if (func_name == "notLike")
@@ -392,9 +401,7 @@ bool MergeTreeConditionFullText::atomFromAST(
             out.key_column = key_column_num;
             out.function = RPNElement::FUNCTION_NOT_EQUALS;
             out.bloom_filter = std::make_unique<BloomFilter>(params);
-
-            const auto & str = const_value.get<String>();
-            likeStringToBloomFilter(str, token_extractor, *out.bloom_filter);
+            likeStringToBloomFilter(const_value.get<String>(), token_extractor, *out.bloom_filter);
             return true;
         }
         else if (func_name == "hasToken")
@@ -402,9 +409,7 @@ bool MergeTreeConditionFullText::atomFromAST(
             out.key_column = key_column_num;
             out.function = RPNElement::FUNCTION_EQUALS;
             out.bloom_filter = std::make_unique<BloomFilter>(params);
-
-            const auto & str = const_value.get<String>();
-            stringToBloomFilter(str.c_str(), str.size(), token_extractor, *out.bloom_filter);
+            stringToBloomFilter(const_value.get<String>(), token_extractor, *out.bloom_filter);
             return true;
         }
         else if (func_name == "startsWith")
@@ -431,8 +436,7 @@ bool MergeTreeConditionFullText::atomFromAST(
                     return false;
 
                 bloom_filters.back().emplace_back(params);
-                const auto & str = element.get<String>();
-                stringToBloomFilter(str.c_str(), str.size(), token_extractor, bloom_filters.back().back());
+                stringToBloomFilter(element.get<String>(), token_extractor, bloom_filters.back().back());
             }
             out.set_bloom_filters = std::move(bloom_filters);
             return true;
@@ -541,7 +545,7 @@ bool MergeTreeConditionFullText::tryPrepareSetBloomFilter(
         {
             bloom_filters.back().emplace_back(params);
             auto ref = column->getDataAt(row);
-            stringToBloomFilter(ref.data, ref.size, token_extractor, bloom_filters.back().back());
+            columnToBloomFilter(ref.data, ref.size, token_extractor, bloom_filters.back().back());
         }
     }
 
@@ -562,7 +566,7 @@ MergeTreeIndexAggregatorPtr MergeTreeIndexFullText::createIndexAggregator() cons
 }
 
 MergeTreeIndexConditionPtr MergeTreeIndexFullText::createIndexCondition(
-        const SelectQueryInfo & query, const Context & context) const
+        const SelectQueryInfo & query, ContextPtr context) const
 {
     return std::make_shared<MergeTreeConditionFullText>(query, context, index.sample_block, params, token_extractor.get());
 };
@@ -573,7 +577,7 @@ bool MergeTreeIndexFullText::mayBenefitFromIndexForIn(const ASTPtr & node) const
 }
 
 
-bool NgramTokenExtractor::next(const char * data, size_t len, size_t * pos, size_t * token_start, size_t * token_len) const
+bool NgramTokenExtractor::nextInField(const char * data, size_t len, size_t * pos, size_t * token_start, size_t * token_len) const
 {
     *token_start = *pos;
     *token_len = 0;
@@ -635,7 +639,33 @@ bool NgramTokenExtractor::nextLike(const String & str, size_t * pos, String & to
     return false;
 }
 
-bool SplitTokenExtractor::next(const char * data, size_t len, size_t * pos, size_t * token_start, size_t * token_len) const
+
+bool SplitTokenExtractor::nextInField(const char * data, size_t len, size_t * pos, size_t * token_start, size_t * token_len) const
+{
+    *token_start = *pos;
+    *token_len = 0;
+
+    while (*pos < len)
+    {
+        if (isASCII(data[*pos]) && !isAlphaNumericASCII(data[*pos]))
+        {
+            /// Finish current token if any
+            if (*token_len > 0)
+                return true;
+            *token_start = ++*pos;
+        }
+        else
+        {
+            /// Note that UTF-8 sequence is completely consisted of non-ASCII bytes.
+            ++*pos;
+            ++*token_len;
+        }
+    }
+
+    return *token_len > 0;
+}
+
+bool SplitTokenExtractor::nextInColumn(const char * data, size_t len, size_t * pos, size_t * token_start, size_t * token_len) const
 {
     *token_start = *pos;
     *token_len = 0;
diff --git a/src/Storages/MergeTree/MergeTreeIndexFullText.h b/src/Storages/MergeTree/MergeTreeIndexFullText.h
index c3c1ff8de8b..1385621f97f 100644
--- a/src/Storages/MergeTree/MergeTreeIndexFullText.h
+++ b/src/Storages/MergeTree/MergeTreeIndexFullText.h
@@ -14,10 +14,18 @@ namespace DB
 struct ITokenExtractor
 {
     virtual ~ITokenExtractor() = default;
+
     /// Fast inplace implementation for regular use.
     /// Gets string (data ptr and len) and start position for extracting next token (state of extractor).
     /// Returns false if parsing is finished, otherwise returns true.
-    virtual bool next(const char * data, size_t len, size_t * pos, size_t * token_start, size_t * token_len) const = 0;
+    virtual bool nextInField(const char * data, size_t len, size_t * pos, size_t * token_start, size_t * token_len) const = 0;
+
+    /// Optimized version that can assume at least 15 padding bytes after data + len (as our Columns provide).
+    virtual bool nextInColumn(const char * data, size_t len, size_t * pos, size_t * token_start, size_t * token_len) const
+    {
+        return nextInField(data, len, pos, token_start, token_len);
+    }
+
     /// Special implementation for creating bloom filter for LIKE function.
     /// It skips unescaped `%` and `_` and supports escaping symbols, but it is less lightweight.
     virtual bool nextLike(const String & str, size_t * pos, String & out) const = 0;
@@ -27,7 +35,7 @@ struct ITokenExtractor
 
 using TokenExtractorPtr = const ITokenExtractor *;
 
-struct MergeTreeIndexGranuleFullText : public IMergeTreeIndexGranule
+struct MergeTreeIndexGranuleFullText final : public IMergeTreeIndexGranule
 {
     explicit MergeTreeIndexGranuleFullText(
         const String & index_name_,
@@ -50,7 +58,7 @@ struct MergeTreeIndexGranuleFullText : public IMergeTreeIndexGranule
 
 using MergeTreeIndexGranuleFullTextPtr = std::shared_ptr<MergeTreeIndexGranuleFullText>;
 
-struct MergeTreeIndexAggregatorFullText : IMergeTreeIndexAggregator
+struct MergeTreeIndexAggregatorFullText final : IMergeTreeIndexAggregator
 {
     explicit MergeTreeIndexAggregatorFullText(
         const Names & index_columns_,
@@ -74,12 +82,12 @@ struct MergeTreeIndexAggregatorFullText : IMergeTreeIndexAggregator
 };
 
 
-class MergeTreeConditionFullText : public IMergeTreeIndexCondition
+class MergeTreeConditionFullText final : public IMergeTreeIndexCondition
 {
 public:
     MergeTreeConditionFullText(
             const SelectQueryInfo & query_info,
-            const Context & context,
+            ContextPtr context,
             const Block & index_sample_block,
             const BloomFilterParameters & params_,
             TokenExtractorPtr token_extactor_);
@@ -156,13 +164,13 @@ private:
 
 
 /// Parser extracting all ngrams from string.
-struct NgramTokenExtractor : public ITokenExtractor
+struct NgramTokenExtractor final : public ITokenExtractor
 {
     NgramTokenExtractor(size_t n_) : n(n_) {}
 
     static String getName() { return "ngrambf_v1"; }
 
-    bool next(const char * data, size_t len, size_t * pos, size_t * token_start, size_t * token_len) const override;
+    bool nextInField(const char * data, size_t len, size_t * pos, size_t * token_start, size_t * token_len) const override;
     bool nextLike(const String & str, size_t * pos, String & token) const override;
 
     bool supportLike() const override { return true; }
@@ -171,18 +179,19 @@ struct NgramTokenExtractor : public ITokenExtractor
 };
 
 /// Parser extracting tokens (sequences of numbers and ascii letters).
-struct SplitTokenExtractor : public ITokenExtractor
+struct SplitTokenExtractor final : public ITokenExtractor
 {
     static String getName() { return "tokenbf_v1"; }
 
-    bool next(const char * data, size_t len, size_t * pos, size_t * token_start, size_t * token_len) const override;
+    bool nextInField(const char * data, size_t len, size_t * pos, size_t * token_start, size_t * token_len) const override;
+    bool nextInColumn(const char * data, size_t len, size_t * pos, size_t * token_start, size_t * token_len) const override;
     bool nextLike(const String & str, size_t * pos, String & token) const override;
 
     bool supportLike() const override { return true; }
 };
 
 
-class MergeTreeIndexFullText : public IMergeTreeIndex
+class MergeTreeIndexFullText final : public IMergeTreeIndex
 {
 public:
     MergeTreeIndexFullText(
@@ -199,7 +208,7 @@ public:
     MergeTreeIndexAggregatorPtr createIndexAggregator() const override;
 
     MergeTreeIndexConditionPtr createIndexCondition(
-            const SelectQueryInfo & query, const Context & context) const override;
+            const SelectQueryInfo & query, ContextPtr context) const override;
 
     bool mayBenefitFromIndexForIn(const ASTPtr & node) const override;
 
diff --git a/src/Storages/MergeTree/MergeTreeIndexGranuleBloomFilter.h b/src/Storages/MergeTree/MergeTreeIndexGranuleBloomFilter.h
index 54e2c105db8..cdd4b92f80c 100644
--- a/src/Storages/MergeTree/MergeTreeIndexGranuleBloomFilter.h
+++ b/src/Storages/MergeTree/MergeTreeIndexGranuleBloomFilter.h
@@ -6,7 +6,7 @@
 namespace DB
 {
 
-class MergeTreeIndexGranuleBloomFilter : public IMergeTreeIndexGranule
+class MergeTreeIndexGranuleBloomFilter final : public IMergeTreeIndexGranule
 {
 public:
     MergeTreeIndexGranuleBloomFilter(size_t bits_per_row_, size_t hash_functions_, size_t index_columns_);
diff --git a/src/Storages/MergeTree/MergeTreeIndexMinMax.cpp b/src/Storages/MergeTree/MergeTreeIndexMinMax.cpp
index de89a27ab46..099d561cf80 100644
--- a/src/Storages/MergeTree/MergeTreeIndexMinMax.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexMinMax.cpp
@@ -37,10 +37,12 @@ void MergeTreeIndexGranuleMinMax::serializeBinary(WriteBuffer & ostr) const
     for (size_t i = 0; i < index_sample_block.columns(); ++i)
     {
         const DataTypePtr & type = index_sample_block.getByPosition(i).type;
+        auto serialization = type->getDefaultSerialization();
+
         if (!type->isNullable())
         {
-            type->serializeBinary(hyperrectangle[i].left, ostr);
-            type->serializeBinary(hyperrectangle[i].right, ostr);
+            serialization->serializeBinary(hyperrectangle[i].left, ostr);
+            serialization->serializeBinary(hyperrectangle[i].right, ostr);
         }
         else
         {
@@ -48,8 +50,8 @@ void MergeTreeIndexGranuleMinMax::serializeBinary(WriteBuffer & ostr) const
             writeBinary(is_null, ostr);
             if (!is_null)
             {
-                type->serializeBinary(hyperrectangle[i].left, ostr);
-                type->serializeBinary(hyperrectangle[i].right, ostr);
+                serialization->serializeBinary(hyperrectangle[i].left, ostr);
+                serialization->serializeBinary(hyperrectangle[i].right, ostr);
             }
         }
     }
@@ -60,13 +62,17 @@ void MergeTreeIndexGranuleMinMax::deserializeBinary(ReadBuffer & istr)
     hyperrectangle.clear();
     Field min_val;
     Field max_val;
+
+
     for (size_t i = 0; i < index_sample_block.columns(); ++i)
     {
         const DataTypePtr & type = index_sample_block.getByPosition(i).type;
+        auto serialization = type->getDefaultSerialization();
+
         if (!type->isNullable())
         {
-            type->deserializeBinary(min_val, istr);
-            type->deserializeBinary(max_val, istr);
+            serialization->deserializeBinary(min_val, istr);
+            serialization->deserializeBinary(max_val, istr);
         }
         else
         {
@@ -74,8 +80,8 @@ void MergeTreeIndexGranuleMinMax::deserializeBinary(ReadBuffer & istr)
             readBinary(is_null, istr);
             if (!is_null)
             {
-                type->deserializeBinary(min_val, istr);
-                type->deserializeBinary(max_val, istr);
+                serialization->deserializeBinary(min_val, istr);
+                serialization->deserializeBinary(max_val, istr);
             }
             else
             {
@@ -132,7 +138,7 @@ void MergeTreeIndexAggregatorMinMax::update(const Block & block, size_t * pos, s
 MergeTreeIndexConditionMinMax::MergeTreeIndexConditionMinMax(
     const IndexDescription & index,
     const SelectQueryInfo & query,
-    const Context & context)
+    ContextPtr context)
     : index_data_types(index.data_types)
     , condition(query, context, index.column_names, index.expression)
 {
@@ -169,7 +175,7 @@ MergeTreeIndexAggregatorPtr MergeTreeIndexMinMax::createIndexAggregator() const
 }
 
 MergeTreeIndexConditionPtr MergeTreeIndexMinMax::createIndexCondition(
-    const SelectQueryInfo & query, const Context & context) const
+    const SelectQueryInfo & query, ContextPtr context) const
 {
     return std::make_shared<MergeTreeIndexConditionMinMax>(index, query, context);
 };
diff --git a/src/Storages/MergeTree/MergeTreeIndexMinMax.h b/src/Storages/MergeTree/MergeTreeIndexMinMax.h
index 3956b1d9f9a..97b9b874484 100644
--- a/src/Storages/MergeTree/MergeTreeIndexMinMax.h
+++ b/src/Storages/MergeTree/MergeTreeIndexMinMax.h
@@ -10,7 +10,7 @@
 namespace DB
 {
 
-struct MergeTreeIndexGranuleMinMax : public IMergeTreeIndexGranule
+struct MergeTreeIndexGranuleMinMax final : public IMergeTreeIndexGranule
 {
     MergeTreeIndexGranuleMinMax(const String & index_name_, const Block & index_sample_block_);
     MergeTreeIndexGranuleMinMax(
@@ -31,7 +31,7 @@ struct MergeTreeIndexGranuleMinMax : public IMergeTreeIndexGranule
 };
 
 
-struct MergeTreeIndexAggregatorMinMax : IMergeTreeIndexAggregator
+struct MergeTreeIndexAggregatorMinMax final : IMergeTreeIndexAggregator
 {
     MergeTreeIndexAggregatorMinMax(const String & index_name_, const Block & index_sample_block);
     ~MergeTreeIndexAggregatorMinMax() override = default;
@@ -46,13 +46,13 @@ struct MergeTreeIndexAggregatorMinMax : IMergeTreeIndexAggregator
 };
 
 
-class MergeTreeIndexConditionMinMax : public IMergeTreeIndexCondition
+class MergeTreeIndexConditionMinMax final : public IMergeTreeIndexCondition
 {
 public:
     MergeTreeIndexConditionMinMax(
         const IndexDescription & index,
         const SelectQueryInfo & query,
-        const Context & context);
+        ContextPtr context);
 
     bool alwaysUnknownOrTrue() const override;
 
@@ -78,7 +78,7 @@ public:
     MergeTreeIndexAggregatorPtr createIndexAggregator() const override;
 
     MergeTreeIndexConditionPtr createIndexCondition(
-        const SelectQueryInfo & query, const Context & context) const override;
+        const SelectQueryInfo & query, ContextPtr context) const override;
 
     bool mayBenefitFromIndexForIn(const ASTPtr & node) const override;
 };
diff --git a/src/Storages/MergeTree/MergeTreeIndexSet.cpp b/src/Storages/MergeTree/MergeTreeIndexSet.cpp
index b6706367bfa..ff875b185e9 100644
--- a/src/Storages/MergeTree/MergeTreeIndexSet.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexSet.cpp
@@ -52,28 +52,31 @@ void MergeTreeIndexGranuleSet::serializeBinary(WriteBuffer & ostr) const
             "Attempt to write empty set index " + backQuote(index_name), ErrorCodes::LOGICAL_ERROR);
 
     const auto & size_type = DataTypePtr(std::make_shared<DataTypeUInt64>());
+    auto size_serialization = size_type->getDefaultSerialization();
 
     if (max_rows != 0 && size() > max_rows)
     {
-        size_type->serializeBinary(0, ostr);
+        size_serialization->serializeBinary(0, ostr);
         return;
     }
 
-    size_type->serializeBinary(size(), ostr);
+    size_serialization->serializeBinary(size(), ostr);
 
     for (size_t i = 0; i < index_sample_block.columns(); ++i)
     {
         const auto & type = index_sample_block.getByPosition(i).type;
 
-        IDataType::SerializeBinaryBulkSettings settings;
-        settings.getter = [&ostr](IDataType::SubstreamPath) -> WriteBuffer * { return &ostr; };
+        ISerialization::SerializeBinaryBulkSettings settings;
+        settings.getter = [&ostr](ISerialization::SubstreamPath) -> WriteBuffer * { return &ostr; };
         settings.position_independent_encoding = false;
         settings.low_cardinality_max_dictionary_size = 0;
 
-        IDataType::SerializeBinaryBulkStatePtr state;
-        type->serializeBinaryBulkStatePrefix(settings, state);
-        type->serializeBinaryBulkWithMultipleStreams(*block.getByPosition(i).column, 0, size(), settings, state);
-        type->serializeBinaryBulkStateSuffix(settings, state);
+        auto serialization = type->getDefaultSerialization();
+        ISerialization::SerializeBinaryBulkStatePtr state;
+
+        serialization->serializeBinaryBulkStatePrefix(settings, state);
+        serialization->serializeBinaryBulkWithMultipleStreams(*block.getByPosition(i).column, 0, size(), settings, state);
+        serialization->serializeBinaryBulkStateSuffix(settings, state);
     }
 }
 
@@ -83,7 +86,7 @@ void MergeTreeIndexGranuleSet::deserializeBinary(ReadBuffer & istr)
 
     Field field_rows;
     const auto & size_type = DataTypePtr(std::make_shared<DataTypeUInt64>());
-    size_type->deserializeBinary(field_rows, istr);
+    size_type->getDefaultSerialization()->deserializeBinary(field_rows, istr);
     size_t rows_to_read = field_rows.get<size_t>();
 
     if (rows_to_read == 0)
@@ -95,13 +98,16 @@ void MergeTreeIndexGranuleSet::deserializeBinary(ReadBuffer & istr)
         const auto & type = column.type;
         ColumnPtr new_column = type->createColumn();
 
-        IDataType::DeserializeBinaryBulkSettings settings;
-        settings.getter = [&](IDataType::SubstreamPath) -> ReadBuffer * { return &istr; };
+
+        ISerialization::DeserializeBinaryBulkSettings settings;
+        settings.getter = [&](ISerialization::SubstreamPath) -> ReadBuffer * { return &istr; };
         settings.position_independent_encoding = false;
 
-        IDataType::DeserializeBinaryBulkStatePtr state;
-        type->deserializeBinaryBulkStatePrefix(settings, state);
-        type->deserializeBinaryBulkWithMultipleStreams(new_column, rows_to_read, settings, state);
+        ISerialization::DeserializeBinaryBulkStatePtr state;
+        auto serialization = type->getDefaultSerialization();
+
+        serialization->deserializeBinaryBulkStatePrefix(settings, state);
+        serialization->deserializeBinaryBulkWithMultipleStreams(new_column, rows_to_read, settings, state, nullptr);
 
         block.insert(ColumnWithTypeAndName(new_column, type, column.name));
     }
@@ -235,7 +241,7 @@ MergeTreeIndexConditionSet::MergeTreeIndexConditionSet(
     const Block & index_sample_block_,
     size_t max_rows_,
     const SelectQueryInfo & query,
-    const Context & context)
+    ContextPtr context)
     : index_name(index_name_)
     , max_rows(max_rows_)
     , index_sample_block(index_sample_block_)
@@ -293,6 +299,10 @@ bool MergeTreeIndexConditionSet::mayBeTrueOnGranule(MergeTreeIndexGranulePtr idx
 
     auto column
         = result.getByName(expression_ast->getColumnName()).column->convertToFullColumnIfConst()->convertToFullColumnIfLowCardinality();
+
+    if (column->onlyNull())
+        return false;
+
     const auto * col_uint8 = typeid_cast<const ColumnUInt8 *>(column.get());
 
     const NullMap * null_map = nullptr;
@@ -382,7 +392,7 @@ bool MergeTreeIndexConditionSet::operatorFromAST(ASTPtr & node)
 
         func->name = "__bitSwapLastTwo";
     }
-    else if (func->name == "and")
+    else if (func->name == "and" || func->name == "indexHint")
     {
         auto last_arg = args.back();
         args.pop_back();
@@ -438,7 +448,7 @@ bool MergeTreeIndexConditionSet::checkASTUseless(const ASTPtr & node, bool atomi
 
         const ASTs & args = func->arguments->children;
 
-        if (func->name == "and")
+        if (func->name == "and" || func->name == "indexHint")
             return checkASTUseless(args[0], atomic) && checkASTUseless(args[1], atomic);
         else if (func->name == "or")
             return checkASTUseless(args[0], atomic) || checkASTUseless(args[1], atomic);
@@ -468,7 +478,7 @@ MergeTreeIndexAggregatorPtr MergeTreeIndexSet::createIndexAggregator() const
 }
 
 MergeTreeIndexConditionPtr MergeTreeIndexSet::createIndexCondition(
-    const SelectQueryInfo & query, const Context & context) const
+    const SelectQueryInfo & query, ContextPtr context) const
 {
     return std::make_shared<MergeTreeIndexConditionSet>(index.name, index.sample_block, max_rows, query, context);
 };
diff --git a/src/Storages/MergeTree/MergeTreeIndexSet.h b/src/Storages/MergeTree/MergeTreeIndexSet.h
index d84991f5e85..28afe4f714d 100644
--- a/src/Storages/MergeTree/MergeTreeIndexSet.h
+++ b/src/Storages/MergeTree/MergeTreeIndexSet.h
@@ -14,7 +14,7 @@ namespace DB
 
 class MergeTreeIndexSet;
 
-struct MergeTreeIndexGranuleSet : public IMergeTreeIndexGranule
+struct MergeTreeIndexGranuleSet final : public IMergeTreeIndexGranule
 {
     explicit MergeTreeIndexGranuleSet(
         const String & index_name_,
@@ -42,7 +42,7 @@ struct MergeTreeIndexGranuleSet : public IMergeTreeIndexGranule
 };
 
 
-struct MergeTreeIndexAggregatorSet : IMergeTreeIndexAggregator
+struct MergeTreeIndexAggregatorSet final : IMergeTreeIndexAggregator
 {
     explicit MergeTreeIndexAggregatorSet(
         const String & index_name_,
@@ -79,7 +79,7 @@ private:
 };
 
 
-class MergeTreeIndexConditionSet : public IMergeTreeIndexCondition
+class MergeTreeIndexConditionSet final : public IMergeTreeIndexCondition
 {
 public:
     MergeTreeIndexConditionSet(
@@ -87,7 +87,7 @@ public:
         const Block & index_sample_block_,
         size_t max_rows_,
         const SelectQueryInfo & query,
-        const Context & context);
+        ContextPtr context);
 
     bool alwaysUnknownOrTrue() const override;
 
@@ -113,7 +113,7 @@ private:
 };
 
 
-class MergeTreeIndexSet : public IMergeTreeIndex
+class MergeTreeIndexSet final : public IMergeTreeIndex
 {
 public:
     MergeTreeIndexSet(
@@ -129,7 +129,7 @@ public:
     MergeTreeIndexAggregatorPtr createIndexAggregator() const override;
 
     MergeTreeIndexConditionPtr createIndexCondition(
-            const SelectQueryInfo & query, const Context & context) const override;
+            const SelectQueryInfo & query, ContextPtr context) const override;
 
     bool mayBenefitFromIndexForIn(const ASTPtr & node) const override;
 
diff --git a/src/Storages/MergeTree/MergeTreeIndices.h b/src/Storages/MergeTree/MergeTreeIndices.h
index c7b9dfb123e..674daeb480d 100644
--- a/src/Storages/MergeTree/MergeTreeIndices.h
+++ b/src/Storages/MergeTree/MergeTreeIndices.h
@@ -84,7 +84,7 @@ struct IMergeTreeIndex
     virtual MergeTreeIndexAggregatorPtr createIndexAggregator() const = 0;
 
     virtual MergeTreeIndexConditionPtr createIndexCondition(
-            const SelectQueryInfo & query_info, const Context & context) const = 0;
+            const SelectQueryInfo & query_info, ContextPtr context) const = 0;
 
     Names getColumnsRequiredForIndexCalc() const { return index.expression->getRequiredColumns(); }
 
diff --git a/src/Storages/MergeTree/MergeTreeMutationEntry.cpp b/src/Storages/MergeTree/MergeTreeMutationEntry.cpp
index 44c4b3c4d10..49c4e93eb1d 100644
--- a/src/Storages/MergeTree/MergeTreeMutationEntry.cpp
+++ b/src/Storages/MergeTree/MergeTreeMutationEntry.cpp
@@ -75,7 +75,9 @@ MergeTreeMutationEntry::MergeTreeMutationEntry(DiskPtr disk_, const String & pat
 
     LocalDateTime create_time_dt;
     *buf >> "create time: " >> create_time_dt >> "\n";
-    create_time = create_time_dt;
+    create_time = DateLUT::instance().makeDateTime(
+        create_time_dt.year(), create_time_dt.month(), create_time_dt.day(),
+        create_time_dt.hour(), create_time_dt.minute(), create_time_dt.second());
 
     *buf >> "commands: ";
     commands.readText(*buf);
diff --git a/src/Storages/MergeTree/MergeTreePartition.cpp b/src/Storages/MergeTree/MergeTreePartition.cpp
index 9b02b9f1fd8..897b868db25 100644
--- a/src/Storages/MergeTree/MergeTreePartition.cpp
+++ b/src/Storages/MergeTree/MergeTreePartition.cpp
@@ -102,7 +102,7 @@ void MergeTreePartition::serializeText(const MergeTreeData & storage, WriteBuffe
         const DataTypePtr & type = partition_key_sample.getByPosition(0).type;
         auto column = type->createColumn();
         column->insert(value[0]);
-        type->serializeAsText(*column, 0, out, format_settings);
+        type->getDefaultSerialization()->serializeText(*column, 0, out, format_settings);
     }
     else
     {
@@ -117,9 +117,9 @@ void MergeTreePartition::serializeText(const MergeTreeData & storage, WriteBuffe
             columns.push_back(std::move(column));
         }
 
-        DataTypeTuple tuple_type(types);
+        auto tuple_serialization = DataTypeTuple(types).getDefaultSerialization();
         auto tuple_column = ColumnTuple::create(columns);
-        tuple_type.serializeText(*tuple_column, 0, out, format_settings);
+        tuple_serialization->serializeText(*tuple_column, 0, out, format_settings);
     }
 }
 
@@ -134,7 +134,7 @@ void MergeTreePartition::load(const MergeTreeData & storage, const DiskPtr & dis
     auto file = openForReading(disk, partition_file_path);
     value.resize(partition_key_sample.columns());
     for (size_t i = 0; i < partition_key_sample.columns(); ++i)
-        partition_key_sample.getByPosition(i).type->deserializeBinary(value[i], *file);
+        partition_key_sample.getByPosition(i).type->getDefaultSerialization()->deserializeBinary(value[i], *file);
 }
 
 void MergeTreePartition::store(const MergeTreeData & storage, const DiskPtr & disk, const String & part_path, MergeTreeDataPartChecksums & checksums) const
@@ -152,7 +152,7 @@ void MergeTreePartition::store(const Block & partition_key_sample, const DiskPtr
     auto out = disk->writeFile(part_path + "partition.dat");
     HashingWriteBuffer out_hashing(*out);
     for (size_t i = 0; i < value.size(); ++i)
-        partition_key_sample.getByPosition(i).type->serializeBinary(value[i], out_hashing);
+        partition_key_sample.getByPosition(i).type->getDefaultSerialization()->serializeBinary(value[i], out_hashing);
     out_hashing.next();
     checksums.files["partition.dat"].file_size = out_hashing.count();
     checksums.files["partition.dat"].file_hash = out_hashing.getHash();
diff --git a/src/Storages/MergeTree/MergeTreePartsMover.cpp b/src/Storages/MergeTree/MergeTreePartsMover.cpp
index 7b8c88b1bff..f9e3883d5e2 100644
--- a/src/Storages/MergeTree/MergeTreePartsMover.cpp
+++ b/src/Storages/MergeTree/MergeTreePartsMover.cpp
@@ -182,7 +182,7 @@ bool MergeTreePartsMover::selectPartsForMove(
 
     if (!parts_to_move.empty())
     {
-        LOG_TRACE(log, "Selected {} parts to move according to storage policy rules and {} parts according to TTL rules, {} total", parts_to_move_by_policy_rules, parts_to_move_by_ttl_rules, ReadableSize(parts_to_move_total_size_bytes));
+        LOG_DEBUG(log, "Selected {} parts to move according to storage policy rules and {} parts according to TTL rules, {} total", parts_to_move_by_policy_rules, parts_to_move_by_ttl_rules, ReadableSize(parts_to_move_total_size_bytes));
         return true;
     }
     else
@@ -194,15 +194,40 @@ MergeTreeData::DataPartPtr MergeTreePartsMover::clonePart(const MergeTreeMoveEnt
     if (moves_blocker.isCancelled())
         throw Exception("Cancelled moving parts.", ErrorCodes::ABORTED);
 
-    LOG_TRACE(log, "Cloning part {}", moving_part.part->name);
+    auto settings = data->getSettings();
 
+    auto part = moving_part.part;
+    LOG_TRACE(log, "Cloning part {}", part->name);
+
+    auto disk = moving_part.reserved_space->getDisk();
     const String directory_to_move = "moving";
-    moving_part.part->makeCloneOnDisk(moving_part.reserved_space->getDisk(), directory_to_move);
+    if (settings->allow_s3_zero_copy_replication)
+    {
+        /// Try to fetch part from S3 without copy and fallback to default copy
+        /// if it's not possible
+        moving_part.part->assertOnDisk();
+        String path_to_clone = data->getRelativeDataPath() + directory_to_move + "/";
+        String relative_path = part->relative_path;
+        if (disk->exists(path_to_clone + relative_path))
+        {
+            LOG_WARNING(log, "Path " + fullPath(disk, path_to_clone + relative_path) + " already exists. Will remove it and clone again.");
+            disk->removeRecursive(path_to_clone + relative_path + "/");
+        }
+        disk->createDirectories(path_to_clone);
+        bool is_fetched = data->tryToFetchIfShared(*part, disk, path_to_clone + "/" + part->name);
+        if (!is_fetched)
+            part->volume->getDisk()->copy(data->getRelativeDataPath() + relative_path + "/", disk, path_to_clone);
+        part->volume->getDisk()->removeFileIfExists(path_to_clone + "/" + IMergeTreeDataPart::DELETE_ON_DESTROY_MARKER_FILE_NAME);
+    }
+    else
+    {
+        part->makeCloneOnDisk(disk, directory_to_move);
+    }
 
-    auto single_disk_volume = std::make_shared<SingleDiskVolume>("volume_" + moving_part.part->name, moving_part.reserved_space->getDisk(), 0);
+    auto single_disk_volume = std::make_shared<SingleDiskVolume>("volume_" + part->name, moving_part.reserved_space->getDisk(), 0);
     MergeTreeData::MutableDataPartPtr cloned_part =
-        data->createPart(moving_part.part->name, single_disk_volume, directory_to_move + '/' + moving_part.part->name);
-    LOG_TRACE(log, "Part {} was cloned to {}", moving_part.part->name, cloned_part->getFullPath());
+        data->createPart(part->name, single_disk_volume, directory_to_move + '/' + part->name);
+    LOG_TRACE(log, "Part {} was cloned to {}", part->name, cloned_part->getFullPath());
 
     cloned_part->loadColumnsChecksumsIndexes(true, true);
     return cloned_part;
diff --git a/src/Storages/MergeTree/MergeTreeRangeReader.cpp b/src/Storages/MergeTree/MergeTreeRangeReader.cpp
index 6d4d8737f10..d373c004d10 100644
--- a/src/Storages/MergeTree/MergeTreeRangeReader.cpp
+++ b/src/Storages/MergeTree/MergeTreeRangeReader.cpp
@@ -33,6 +33,25 @@ static void filterColumns(Columns & columns, const IColumn::Filter & filter)
     }
 }
 
+static void filterColumns(Columns & columns, const ColumnPtr & filter)
+{
+    ConstantFilterDescription const_descr(*filter);
+    if (const_descr.always_true)
+        return;
+
+    if (const_descr.always_false)
+    {
+        for (auto & col : columns)
+            if (col)
+                col = col->cloneEmpty();
+
+        return;
+    }
+
+    FilterDescription descr(*filter);
+    filterColumns(columns, *descr.data);
+}
+
 
 MergeTreeRangeReader::DelayedStream::DelayedStream(
         size_t from_mark, IMergeTreeReader * merge_tree_reader_)
@@ -284,6 +303,13 @@ void MergeTreeRangeReader::ReadResult::shrink(Columns & old_columns)
     {
         if (!column)
             continue;
+
+        if (const auto * column_const = typeid_cast<const ColumnConst *>(column.get()))
+        {
+            column = column_const->cloneResized(total_rows_per_granule);
+            continue;
+        }
+
         auto new_column = column->cloneEmpty();
         new_column->reserve(total_rows_per_granule);
         for (size_t j = 0, pos = 0; j < rows_per_granule_original.size(); pos += rows_per_granule_original[j++])
@@ -308,7 +334,7 @@ void MergeTreeRangeReader::ReadResult::setFilterConstFalse()
     num_rows = 0;
 }
 
-void MergeTreeRangeReader::ReadResult::optimize(bool can_read_incomplete_granules)
+void MergeTreeRangeReader::ReadResult::optimize(bool can_read_incomplete_granules, bool allow_filter_columns)
 {
     if (total_rows_per_granule == 0 || filter == nullptr)
         return;
@@ -340,7 +366,7 @@ void MergeTreeRangeReader::ReadResult::optimize(bool can_read_incomplete_granule
         filter_holder_original = std::move(filter_holder);
 
         /// Check if const 1 after shrink
-        if (countBytesInResultFilter(filter->getData()) + total_zero_rows_in_tails == total_rows_per_granule)
+        if (allow_filter_columns && countBytesInResultFilter(filter->getData()) + total_zero_rows_in_tails == total_rows_per_granule)
         {
             total_rows_per_granule = total_rows_per_granule - total_zero_rows_in_tails;
             num_rows = total_rows_per_granule;
@@ -460,9 +486,13 @@ void MergeTreeRangeReader::ReadResult::setFilter(const ColumnPtr & new_filter)
 
     ConstantFilterDescription const_description(*new_filter);
     if (const_description.always_true)
+    {
         setFilterConstTrue();
+    }
     else if (const_description.always_false)
+    {
         clear();
+    }
     else
     {
         FilterDescription filter_description(*new_filter);
@@ -490,11 +520,14 @@ size_t MergeTreeRangeReader::ReadResult::countBytesInResultFilter(const IColumn:
 MergeTreeRangeReader::MergeTreeRangeReader(
     IMergeTreeReader * merge_tree_reader_,
     MergeTreeRangeReader * prev_reader_,
-    const PrewhereInfoPtr & prewhere_,
+    const PrewhereInfoPtr & prewhere_info_,
     bool last_reader_in_chain_)
     : merge_tree_reader(merge_tree_reader_)
-    , index_granularity(&(merge_tree_reader->data_part->index_granularity)), prev_reader(prev_reader_)
-    , prewhere(prewhere_), last_reader_in_chain(last_reader_in_chain_), is_initialized(true)
+    , index_granularity(&(merge_tree_reader->data_part->index_granularity))
+    , prev_reader(prev_reader_)
+    , prewhere_info(prewhere_info_)
+    , last_reader_in_chain(last_reader_in_chain_)
+    , is_initialized(true)
 {
     if (prev_reader)
         sample_block = prev_reader->getSampleBlock();
@@ -502,16 +535,22 @@ MergeTreeRangeReader::MergeTreeRangeReader(
     for (const auto & name_and_type : merge_tree_reader->getColumns())
         sample_block.insert({name_and_type.type->createColumn(), name_and_type.type, name_and_type.name});
 
-    if (prewhere)
+    if (prewhere_info)
     {
-        if (prewhere->alias_actions)
-            prewhere->alias_actions->execute(sample_block, true);
+        if (prewhere_info->alias_actions)
+            prewhere_info->alias_actions->execute(sample_block, true);
 
-        if (prewhere->prewhere_actions)
-            prewhere->prewhere_actions->execute(sample_block, true);
+        if (prewhere_info->row_level_filter)
+        {
+            prewhere_info->row_level_filter->execute(sample_block, true);
+            sample_block.erase(prewhere_info->row_level_column_name);
+        }
 
-        if (prewhere->remove_prewhere_column)
-            sample_block.erase(prewhere->prewhere_column_name);
+        if (prewhere_info->prewhere_actions)
+            prewhere_info->prewhere_actions->execute(sample_block, true);
+
+        if (prewhere_info->remove_prewhere_column)
+            sample_block.erase(prewhere_info->prewhere_column_name);
     }
 }
 
@@ -799,9 +838,63 @@ Columns MergeTreeRangeReader::continueReadingChain(ReadResult & result, size_t &
     return columns;
 }
 
+static void checkCombindeFiltersSize(size_t bytes_in_first_filter, size_t second_filter_size)
+{
+    if (bytes_in_first_filter != second_filter_size)
+        throw Exception(ErrorCodes::LOGICAL_ERROR,
+            "Cannot combine filters because number of bytes in a first filter ({}) "
+            "does not match second filter size ({})", bytes_in_first_filter, second_filter_size);
+}
+
+static ColumnPtr combineFilters(ColumnPtr first, ColumnPtr second)
+{
+    ConstantFilterDescription firsrt_const_descr(*first);
+
+    if (firsrt_const_descr.always_true)
+    {
+        checkCombindeFiltersSize(first->size(), second->size());
+        return second;
+    }
+
+    if (firsrt_const_descr.always_false)
+    {
+        checkCombindeFiltersSize(0, second->size());
+        return first;
+    }
+
+    auto mut_first = IColumn::mutate(std::move(first));
+    FilterDescription firsrt_descr(*mut_first);
+
+    size_t bytes_in_first_filter = countBytesInFilter(*firsrt_descr.data);
+    checkCombindeFiltersSize(bytes_in_first_filter, second->size());
+
+    ConstantFilterDescription second_const_descr(*second);
+
+    if (second_const_descr.always_true)
+        return mut_first;
+
+    if (second_const_descr.always_false)
+        return second->cloneResized(mut_first->size());
+
+    FilterDescription second_descr(*second);
+    auto & first_data = const_cast<IColumn::Filter &>(*firsrt_descr.data);
+    const auto * second_data = second_descr.data->data();
+
+    for (auto & val : first_data)
+    {
+        if (val)
+        {
+            val = *second_data;
+            ++second_data;
+        }
+    }
+
+    return mut_first;
+}
+
 void MergeTreeRangeReader::executePrewhereActionsAndFilterColumns(ReadResult & result)
 {
-    if (!prewhere)
+    if (!prewhere_info)
         return;
 
     const auto & header = merge_tree_reader->getColumns();
@@ -813,6 +906,7 @@ void MergeTreeRangeReader::executePrewhereActionsAndFilterColumns(ReadResult & r
                         "got " + toString(result.columns.size()), ErrorCodes::LOGICAL_ERROR);
 
     ColumnPtr filter;
+    ColumnPtr row_level_filter;
     size_t prewhere_column_pos;
 
     {
@@ -832,14 +926,27 @@ void MergeTreeRangeReader::executePrewhereActionsAndFilterColumns(ReadResult & r
         for (auto name_and_type = header.begin(); pos < num_columns; ++pos, ++name_and_type)
             block.insert({result.columns[pos], name_and_type->type, name_and_type->name});
 
-        if (prewhere->alias_actions)
-            prewhere->alias_actions->execute(block);
+        if (prewhere_info->alias_actions)
+            prewhere_info->alias_actions->execute(block);
 
         /// Columns might be projected out. We need to store them here so that default columns can be evaluated later.
         result.block_before_prewhere = block;
-        prewhere->prewhere_actions->execute(block);
 
-        prewhere_column_pos = block.getPositionByName(prewhere->prewhere_column_name);
+        if (prewhere_info->row_level_filter)
+        {
+            prewhere_info->row_level_filter->execute(block);
+            auto row_level_filter_pos = block.getPositionByName(prewhere_info->row_level_column_name);
+            row_level_filter = block.getByPosition(row_level_filter_pos).column;
+            block.erase(row_level_filter_pos);
+
+            auto columns = block.getColumns();
+            filterColumns(columns, row_level_filter);
+            block.setColumns(columns);
+        }
+
+        prewhere_info->prewhere_actions->execute(block);
+
+        prewhere_column_pos = block.getPositionByName(prewhere_info->prewhere_column_name);
 
         result.columns.clear();
         result.columns.reserve(block.columns());
@@ -857,17 +964,24 @@ void MergeTreeRangeReader::executePrewhereActionsAndFilterColumns(ReadResult & r
                         ErrorCodes::LOGICAL_ERROR);
     }
 
-    result.setFilter(filter);
+    if (filter && row_level_filter)
+    {
+        row_level_filter = combineFilters(std::move(row_level_filter), filter);
+        result.setFilter(row_level_filter);
+
+    }
+    else
+        result.setFilter(filter);
 
     /// If there is a WHERE, we filter in there, and only optimize IO and shrink columns here
     if (!last_reader_in_chain)
-        result.optimize(merge_tree_reader->canReadIncompleteGranules());
+        result.optimize(merge_tree_reader->canReadIncompleteGranules(), prewhere_info->row_level_filter == nullptr);
 
     /// If we read nothing or filter gets optimized to nothing
     if (result.totalRowsPerGranule() == 0)
         result.setFilterConstFalse();
     /// If we need to filter in PREWHERE
-    else if (prewhere->need_filter || result.need_filter || prewhere->remove_prewhere_column)
+    else if (prewhere_info->need_filter || result.need_filter || prewhere_info->row_level_filter)
     {
         /// If there is a filter and without optimized
         if (result.getFilter() && last_reader_in_chain)
@@ -886,7 +1000,12 @@ void MergeTreeRangeReader::executePrewhereActionsAndFilterColumns(ReadResult & r
         {
             /// filter might be shrunk while columns not
             const auto * result_filter = result.getFilterOriginal();
-            filterColumns(result.columns, result_filter->getData());
+
+            if (row_level_filter)
+                filterColumns(result.columns, filter);
+            else
+                filterColumns(result.columns, result_filter->getData());
+
             result.need_filter = true;
 
             bool has_column = false;
@@ -908,11 +1027,11 @@ void MergeTreeRangeReader::executePrewhereActionsAndFilterColumns(ReadResult & r
         /// Check if the PREWHERE column is needed
         if (!result.columns.empty())
         {
-            if (prewhere->remove_prewhere_column)
+            if (prewhere_info->remove_prewhere_column)
                 result.columns.erase(result.columns.begin() + prewhere_column_pos);
             else
                 result.columns[prewhere_column_pos] =
-                        getSampleBlock().getByName(prewhere->prewhere_column_name).type->
+                        getSampleBlock().getByName(prewhere_info->prewhere_column_name).type->
                                 createColumnConst(result.num_rows, 1u)->convertToFullColumnIfConst();
         }
     }
@@ -920,7 +1039,7 @@ void MergeTreeRangeReader::executePrewhereActionsAndFilterColumns(ReadResult & r
     else
     {
         result.columns[prewhere_column_pos] = result.getFilterHolder()->convertToFullColumnIfConst();
-        if (getSampleBlock().getByName(prewhere->prewhere_column_name).type->isNullable())
+        if (getSampleBlock().getByName(prewhere_info->prewhere_column_name).type->isNullable())
             result.columns[prewhere_column_pos] = makeNullable(std::move(result.columns[prewhere_column_pos]));
         result.clearFilter(); // Acting as a flag to not filter in PREWHERE
     }
diff --git a/src/Storages/MergeTree/MergeTreeRangeReader.h b/src/Storages/MergeTree/MergeTreeRangeReader.h
index 381b87ecffd..18075e52bdd 100644
--- a/src/Storages/MergeTree/MergeTreeRangeReader.h
+++ b/src/Storages/MergeTree/MergeTreeRangeReader.h
@@ -24,7 +24,7 @@ public:
     MergeTreeRangeReader(
         IMergeTreeReader * merge_tree_reader_,
         MergeTreeRangeReader * prev_reader_,
-        const PrewhereInfoPtr & prewhere_,
+        const PrewhereInfoPtr & prewhere_info_,
         bool last_reader_in_chain_);
 
     MergeTreeRangeReader() = default;
@@ -156,7 +156,7 @@ public:
         /// Set filter or replace old one. Filter must have more zeroes than previous.
         void setFilter(const ColumnPtr & new_filter);
         /// For each granule calculate the number of filtered rows at the end. Remove them and update filter.
-        void optimize(bool can_read_incomplete_granules);
+        void optimize(bool can_read_incomplete_granules, bool allow_filter_columns);
         /// Remove all rows from granules.
         void clear();
 
@@ -217,7 +217,7 @@ private:
     IMergeTreeReader * merge_tree_reader = nullptr;
     const MergeTreeIndexGranularity * index_granularity = nullptr;
     MergeTreeRangeReader * prev_reader = nullptr; /// If not nullptr, read from prev_reader firstly.
-    PrewhereInfoPtr prewhere;
+    PrewhereInfoPtr prewhere_info;
 
     Stream stream;
 
diff --git a/src/Storages/MergeTree/MergeTreeReadPool.h b/src/Storages/MergeTree/MergeTreeReadPool.h
index 366e9a2381a..9949bdf86f8 100644
--- a/src/Storages/MergeTree/MergeTreeReadPool.h
+++ b/src/Storages/MergeTree/MergeTreeReadPool.h
@@ -100,7 +100,7 @@ private:
 
     const MergeTreeData & data;
     StorageMetadataPtr metadata_snapshot;
-    Names column_names;
+    const Names column_names;
     bool do_not_steal_tasks;
     bool predict_block_size_bytes;
     std::vector<NameSet> per_part_column_name_set;
diff --git a/src/Storages/MergeTree/MergeTreeReaderCompact.cpp b/src/Storages/MergeTree/MergeTreeReaderCompact.cpp
index 67268e8afd8..da28f75b57f 100644
--- a/src/Storages/MergeTree/MergeTreeReaderCompact.cpp
+++ b/src/Storages/MergeTree/MergeTreeReaderCompact.cpp
@@ -84,7 +84,8 @@ MergeTreeReaderCompact::MergeTreeReaderCompact(
                         buffer_size,
                         0,
                         settings.min_bytes_to_use_direct_io,
-                        settings.min_bytes_to_use_mmap_io);
+                        settings.min_bytes_to_use_mmap_io,
+                        settings.mmap_cache.get());
                 },
                 uncompressed_cache,
                 /* allow_different_codecs = */ true);
@@ -103,7 +104,12 @@ MergeTreeReaderCompact::MergeTreeReaderCompact(
             auto buffer =
                 std::make_unique<CompressedReadBufferFromFile>(
                     data_part->volume->getDisk()->readFile(
-                        full_data_path, buffer_size, 0, settings.min_bytes_to_use_direct_io, settings.min_bytes_to_use_mmap_io),
+                        full_data_path,
+                        buffer_size,
+                        0,
+                        settings.min_bytes_to_use_direct_io,
+                        settings.min_bytes_to_use_mmap_io,
+                        settings.mmap_cache.get()),
                     /* allow_different_codecs = */ true);
 
             if (profile_callback_)
@@ -200,16 +206,16 @@ void MergeTreeReaderCompact::readData(
     if (!isContinuousReading(from_mark, column_position))
         seekToMark(from_mark, column_position);
 
-    auto buffer_getter = [&](const IDataType::SubstreamPath & substream_path) -> ReadBuffer *
+    auto buffer_getter = [&](const ISerialization::SubstreamPath & substream_path) -> ReadBuffer *
     {
-        if (only_offsets && (substream_path.size() != 1 || substream_path[0].type != IDataType::Substream::ArraySizes))
+        if (only_offsets && (substream_path.size() != 1 || substream_path[0].type != ISerialization::Substream::ArraySizes))
             return nullptr;
 
         return data_buffer;
     };
 
-    IDataType::DeserializeBinaryBulkStatePtr state;
-    IDataType::DeserializeBinaryBulkSettings deserialize_settings;
+    ISerialization::DeserializeBinaryBulkStatePtr state;
+    ISerialization::DeserializeBinaryBulkSettings deserialize_settings;
     deserialize_settings.getter = buffer_getter;
     deserialize_settings.avg_value_size_hint = avg_value_size_hints[name];
 
@@ -218,14 +224,16 @@ void MergeTreeReaderCompact::readData(
         auto type_in_storage = name_and_type.getTypeInStorage();
         ColumnPtr temp_column = type_in_storage->createColumn();
 
-        type_in_storage->deserializeBinaryBulkStatePrefix(deserialize_settings, state);
-        type_in_storage->deserializeBinaryBulkWithMultipleStreams(temp_column, rows_to_read, deserialize_settings, state);
+        auto serialization = type_in_storage->getDefaultSerialization();
+        serialization->deserializeBinaryBulkStatePrefix(deserialize_settings, state);
+        serialization->deserializeBinaryBulkWithMultipleStreams(temp_column, rows_to_read, deserialize_settings, state, nullptr);
         column = type_in_storage->getSubcolumn(name_and_type.getSubcolumnName(), *temp_column);
     }
     else
     {
-        type->deserializeBinaryBulkStatePrefix(deserialize_settings, state);
-        type->deserializeBinaryBulkWithMultipleStreams(column, rows_to_read, deserialize_settings, state);
+        auto serialization = type->getDefaultSerialization();
+        serialization->deserializeBinaryBulkStatePrefix(deserialize_settings, state);
+        serialization->deserializeBinaryBulkWithMultipleStreams(column, rows_to_read, deserialize_settings, state, nullptr);
     }
 
     /// The buffer is left in inconsistent state after reading single offsets
diff --git a/src/Storages/MergeTree/MergeTreeReaderStream.cpp b/src/Storages/MergeTree/MergeTreeReaderStream.cpp
index fd251497d7c..774c5bcf3d8 100644
--- a/src/Storages/MergeTree/MergeTreeReaderStream.cpp
+++ b/src/Storages/MergeTree/MergeTreeReaderStream.cpp
@@ -89,7 +89,8 @@ MergeTreeReaderStream::MergeTreeReaderStream(
                     buffer_size,
                     sum_mark_range_bytes,
                     settings.min_bytes_to_use_direct_io,
-                    settings.min_bytes_to_use_mmap_io);
+                    settings.min_bytes_to_use_mmap_io,
+                    settings.mmap_cache.get());
             },
             uncompressed_cache);
 
@@ -105,8 +106,13 @@ MergeTreeReaderStream::MergeTreeReaderStream(
     else
     {
         auto buffer = std::make_unique<CompressedReadBufferFromFile>(
-            disk->readFile(path_prefix + data_file_extension, buffer_size,
-                sum_mark_range_bytes, settings.min_bytes_to_use_direct_io, settings.min_bytes_to_use_mmap_io)
+            disk->readFile(
+                path_prefix + data_file_extension,
+                buffer_size,
+                sum_mark_range_bytes,
+                settings.min_bytes_to_use_direct_io,
+                settings.min_bytes_to_use_mmap_io,
+                settings.mmap_cache.get())
         );
 
         if (profile_callback)
diff --git a/src/Storages/MergeTree/MergeTreeReaderWide.cpp b/src/Storages/MergeTree/MergeTreeReaderWide.cpp
index 30db54fc8e0..0da2f643eb0 100644
--- a/src/Storages/MergeTree/MergeTreeReaderWide.cpp
+++ b/src/Storages/MergeTree/MergeTreeReaderWide.cpp
@@ -72,7 +72,7 @@ size_t MergeTreeReaderWide::readRows(size_t from_mark, bool continue_reading, si
         /// If append is true, then the value will be equal to nullptr and will be used only to
         /// check that the offsets column has been already read.
         OffsetColumns offset_columns;
-        std::unordered_map<String, IDataType::SubstreamsCache> caches;
+        std::unordered_map<String, ISerialization::SubstreamsCache> caches;
 
         auto name_and_type = columns.begin();
         for (size_t pos = 0; pos < num_columns; ++pos, ++name_and_type)
@@ -137,9 +137,9 @@ size_t MergeTreeReaderWide::readRows(size_t from_mark, bool continue_reading, si
 void MergeTreeReaderWide::addStreams(const NameAndTypePair & name_and_type,
     const ReadBufferFromFileBase::ProfileCallback & profile_callback, clockid_t clock_type)
 {
-    IDataType::StreamCallback callback = [&] (const IDataType::SubstreamPath & substream_path, const IDataType & /* substream_type */)
+    ISerialization::StreamCallback callback = [&] (const ISerialization::SubstreamPath & substream_path)
     {
-        String stream_name = IDataType::getFileNameForStream(name_and_type, substream_path);
+        String stream_name = ISerialization::getFileNameForStream(name_and_type, substream_path);
 
         if (streams.count(stream_name))
             return;
@@ -160,25 +160,26 @@ void MergeTreeReaderWide::addStreams(const NameAndTypePair & name_and_type,
             profile_callback, clock_type));
     };
 
-    IDataType::SubstreamPath substream_path;
-    name_and_type.type->enumerateStreams(callback, substream_path);
+    auto serialization = data_part->getSerializationForColumn(name_and_type);
+    serialization->enumerateStreams(callback);
+    serializations.emplace(name_and_type.name, std::move(serialization));
 }
 
 
 void MergeTreeReaderWide::readData(
     const NameAndTypePair & name_and_type, ColumnPtr & column,
     size_t from_mark, bool continue_reading, size_t max_rows_to_read,
-    IDataType::SubstreamsCache & cache)
+    ISerialization::SubstreamsCache & cache)
 {
-    auto get_stream_getter = [&](bool stream_for_prefix) -> IDataType::InputStreamGetter
+    auto get_stream_getter = [&](bool stream_for_prefix) -> ISerialization::InputStreamGetter
     {
-        return [&, stream_for_prefix](const IDataType::SubstreamPath & substream_path) -> ReadBuffer *
+        return [&, stream_for_prefix](const ISerialization::SubstreamPath & substream_path) -> ReadBuffer *
         {
             /// If substream have already been read.
-            if (cache.count(IDataType::getSubcolumnNameForStream(substream_path)))
+            if (cache.count(ISerialization::getSubcolumnNameForStream(substream_path)))
                 return nullptr;
 
-            String stream_name = IDataType::getFileNameForStream(name_and_type, substream_path);
+            String stream_name = ISerialization::getFileNameForStream(name_and_type, substream_path);
 
             auto it = streams.find(stream_name);
             if (it == streams.end())
@@ -199,19 +200,23 @@ void MergeTreeReaderWide::readData(
     };
 
     double & avg_value_size_hint = avg_value_size_hints[name_and_type.name];
-    IDataType::DeserializeBinaryBulkSettings deserialize_settings;
+    ISerialization::DeserializeBinaryBulkSettings deserialize_settings;
     deserialize_settings.avg_value_size_hint = avg_value_size_hint;
 
-    if (deserialize_binary_bulk_state_map.count(name_and_type.name) == 0)
+    const auto & name = name_and_type.name;
+    auto serialization = serializations[name];
+
+    if (deserialize_binary_bulk_state_map.count(name) == 0)
     {
         deserialize_settings.getter = get_stream_getter(true);
-        name_and_type.type->deserializeBinaryBulkStatePrefix(deserialize_settings, deserialize_binary_bulk_state_map[name_and_type.name]);
+        serialization->deserializeBinaryBulkStatePrefix(deserialize_settings, deserialize_binary_bulk_state_map[name]);
     }
 
     deserialize_settings.getter = get_stream_getter(false);
     deserialize_settings.continuous_reading = continue_reading;
-    auto & deserialize_state = deserialize_binary_bulk_state_map[name_and_type.name];
-    name_and_type.type->deserializeBinaryBulkWithMultipleStreams(column, max_rows_to_read, deserialize_settings, deserialize_state, &cache);
+    auto & deserialize_state = deserialize_binary_bulk_state_map[name];
+
+    serializations[name]->deserializeBinaryBulkWithMultipleStreams(column, max_rows_to_read, deserialize_settings, deserialize_state, &cache);
     IDataType::updateAvgValueSizeHint(*column, avg_value_size_hint);
 }
 
diff --git a/src/Storages/MergeTree/MergeTreeReaderWide.h b/src/Storages/MergeTree/MergeTreeReaderWide.h
index bf9e97035d0..1afbca4bf41 100644
--- a/src/Storages/MergeTree/MergeTreeReaderWide.h
+++ b/src/Storages/MergeTree/MergeTreeReaderWide.h
@@ -34,8 +34,10 @@ public:
 
 private:
     using FileStreams = std::map<std::string, std::unique_ptr<MergeTreeReaderStream>>;
+    using Serializations = std::map<std::string, SerializationPtr>;
 
     FileStreams streams;
+    Serializations serializations;
 
     void addStreams(const NameAndTypePair & name_and_type,
         const ReadBufferFromFileBase::ProfileCallback & profile_callback, clockid_t clock_type);
@@ -43,7 +45,7 @@ private:
     void readData(
         const NameAndTypePair & name_and_type, ColumnPtr & column,
         size_t from_mark, bool continue_reading, size_t max_rows_to_read,
-        IDataType::SubstreamsCache & cache);
+        ISerialization::SubstreamsCache & cache);
 };
 
 }
diff --git a/src/Storages/MergeTree/MergeTreeReverseSelectProcessor.cpp b/src/Storages/MergeTree/MergeTreeReverseSelectProcessor.cpp
index ee0a77ba3cf..e9527efaa4a 100644
--- a/src/Storages/MergeTree/MergeTreeReverseSelectProcessor.cpp
+++ b/src/Storages/MergeTree/MergeTreeReverseSelectProcessor.cpp
@@ -44,12 +44,11 @@ MergeTreeReverseSelectProcessor::MergeTreeReverseSelectProcessor(
     for (const auto & range : all_mark_ranges)
         total_marks_count += range.end - range.begin;
 
-    size_t total_rows = data_part->index_granularity.getTotalRows();
+    size_t total_rows = data_part->index_granularity.getRowsCountInRanges(all_mark_ranges);
 
     if (!quiet)
-        LOG_TRACE(log, "Reading {} ranges in reverse order from part {}, approx. {}, up to {} rows starting from {}",
+        LOG_DEBUG(log, "Reading {} ranges in reverse order from part {}, approx. {} rows starting from {}",
             all_mark_ranges.size(), data_part->name, total_rows,
-            data_part->index_granularity.getRowsCountInRanges(all_mark_ranges),
             data_part->index_granularity.getMarkStartingRow(all_mark_ranges.front().begin));
 
     addTotalRowsApprox(total_rows);
@@ -63,9 +62,9 @@ MergeTreeReverseSelectProcessor::MergeTreeReverseSelectProcessor(
     column_name_set = NameSet{column_names.begin(), column_names.end()};
 
     if (use_uncompressed_cache)
-        owned_uncompressed_cache = storage.global_context.getUncompressedCache();
+        owned_uncompressed_cache = storage.getContext()->getUncompressedCache();
 
-    owned_mark_cache = storage.global_context.getMarkCache();
+    owned_mark_cache = storage.getContext()->getMarkCache();
 
     reader = data_part->getReader(task_columns.columns, metadata_snapshot,
         all_mark_ranges, owned_uncompressed_cache.get(),
diff --git a/src/Storages/MergeTree/MergeTreeSelectProcessor.cpp b/src/Storages/MergeTree/MergeTreeSelectProcessor.cpp
index 65f9b1eba3b..980afa170e9 100644
--- a/src/Storages/MergeTree/MergeTreeSelectProcessor.cpp
+++ b/src/Storages/MergeTree/MergeTreeSelectProcessor.cpp
@@ -47,7 +47,7 @@ MergeTreeSelectProcessor::MergeTreeSelectProcessor(
     size_t total_rows = data_part->index_granularity.getRowsCountInRanges(all_mark_ranges);
 
     if (!quiet)
-        LOG_TRACE(log, "Reading {} ranges from part {}, approx. {} rows starting from {}",
+        LOG_DEBUG(log, "Reading {} ranges from part {}, approx. {} rows starting from {}",
             all_mark_ranges.size(), data_part->name, total_rows,
             data_part->index_granularity.getMarkStartingRow(all_mark_ranges.front().begin));
 
@@ -87,9 +87,9 @@ try
     if (!reader)
     {
         if (use_uncompressed_cache)
-            owned_uncompressed_cache = storage.global_context.getUncompressedCache();
+            owned_uncompressed_cache = storage.getContext()->getUncompressedCache();
 
-        owned_mark_cache = storage.global_context.getMarkCache();
+        owned_mark_cache = storage.getContext()->getMarkCache();
 
         reader = data_part->getReader(task_columns.columns, metadata_snapshot, all_mark_ranges,
             owned_uncompressed_cache.get(), owned_mark_cache.get(), reader_settings);
diff --git a/src/Storages/MergeTree/MergeTreeSequentialSource.cpp b/src/Storages/MergeTree/MergeTreeSequentialSource.cpp
index edd63aadd29..e82b1966461 100644
--- a/src/Storages/MergeTree/MergeTreeSequentialSource.cpp
+++ b/src/Storages/MergeTree/MergeTreeSequentialSource.cpp
@@ -23,16 +23,16 @@ MergeTreeSequentialSource::MergeTreeSequentialSource(
     , data_part(std::move(data_part_))
     , columns_to_read(std::move(columns_to_read_))
     , read_with_direct_io(read_with_direct_io_)
-    , mark_cache(storage.global_context.getMarkCache())
+    , mark_cache(storage.getContext()->getMarkCache())
 {
     if (!quiet)
     {
         /// Print column name but don't pollute logs in case of many columns.
         if (columns_to_read.size() == 1)
-            LOG_TRACE(log, "Reading {} marks from part {}, total {} rows starting from the beginning of the part, column {}",
+            LOG_DEBUG(log, "Reading {} marks from part {}, total {} rows starting from the beginning of the part, column {}",
                 data_part->getMarksCount(), data_part->name, data_part->rows_count, columns_to_read.front());
         else
-            LOG_TRACE(log, "Reading {} marks from part {}, total {} rows starting from the beginning of the part",
+            LOG_DEBUG(log, "Reading {} marks from part {}, total {} rows starting from the beginning of the part",
                 data_part->getMarksCount(), data_part->name, data_part->rows_count);
     }
 
diff --git a/src/Storages/MergeTree/MergeTreeSettings.cpp b/src/Storages/MergeTree/MergeTreeSettings.cpp
index e77668e8900..dfaaf4a942b 100644
--- a/src/Storages/MergeTree/MergeTreeSettings.cpp
+++ b/src/Storages/MergeTree/MergeTreeSettings.cpp
@@ -98,6 +98,31 @@ void MergeTreeSettings::sanityCheck(const Settings & query_settings) const
             number_of_free_entries_in_pool_to_lower_max_size_of_merge,
             query_settings.background_pool_size);
     }
-}
 
+    // The min_index_granularity_bytes value is 1024 b and index_granularity_bytes is 10 mb by default.
+    // If index_granularity_bytes is not disabled i.e > 0 b, then always ensure that it's greater than
+    // min_index_granularity_bytes. This is mainly a safeguard against accidents whereby a really low
+    // index_granularity_bytes SETTING of 1b can create really large parts with large marks.
+    if (index_granularity_bytes > 0 && index_granularity_bytes < min_index_granularity_bytes)
+    {
+        throw Exception(
+            ErrorCodes::BAD_ARGUMENTS,
+            "index_granularity_bytes: {} is lower than specified min_index_granularity_bytes: {}",
+            index_granularity_bytes,
+            min_index_granularity_bytes);
+    }
+
+    // If min_bytes_to_rebalance_partition_over_jbod is not disabled i.e > 0 b, then always ensure that
+    // it's not less than min_bytes_to_rebalance_partition_over_jbod. This is a safeguard to avoid tiny
+    // parts to participate JBOD balancer which will slow down the merge process.
+    if (min_bytes_to_rebalance_partition_over_jbod > 0
+        && min_bytes_to_rebalance_partition_over_jbod < max_bytes_to_merge_at_max_space_in_pool / 1024)
+    {
+        throw Exception(
+            ErrorCodes::BAD_ARGUMENTS,
+            "min_bytes_to_rebalance_partition_over_jbod: {} is lower than specified max_bytes_to_merge_at_max_space_in_pool / 150: {}",
+            min_bytes_to_rebalance_partition_over_jbod,
+            max_bytes_to_merge_at_max_space_in_pool / 1024);
+    }
+}
 }
diff --git a/src/Storages/MergeTree/MergeTreeSettings.h b/src/Storages/MergeTree/MergeTreeSettings.h
index 16657b4083d..f422f00f4dc 100644
--- a/src/Storages/MergeTree/MergeTreeSettings.h
+++ b/src/Storages/MergeTree/MergeTreeSettings.h
@@ -2,6 +2,7 @@
 
 #include <Core/Defines.h>
 #include <Core/BaseSettings.h>
+#include <Storages/MergeTree/MergeTreeDataFormatVersion.h>
 
 
 namespace Poco::Util
@@ -54,6 +55,7 @@ struct Settings;
     M(UInt64, write_ahead_log_bytes_to_fsync, 100ULL * 1024 * 1024, "Amount of bytes, accumulated in WAL to do fsync.", 0) \
     M(UInt64, write_ahead_log_interval_ms_to_fsync, 100, "Interval in milliseconds after which fsync for WAL is being done.", 0) \
     M(Bool, in_memory_parts_insert_sync, false, "If true insert of part with in-memory format will wait for fsync of WAL", 0) \
+    M(UInt64, non_replicated_deduplication_window, 0, "How many last blocks of hashes should be kept on disk (0 - disabled).", 0) \
     \
     /** Inserts settings. */ \
     M(UInt64, parts_to_delay_insert, 150, "If table contains at least that many active parts in single partition, artificially slow down insert into table.", 0) \
@@ -71,6 +73,7 @@ struct Settings;
     M(Seconds, prefer_fetch_merged_part_time_threshold, 3600, "If time passed after replication log entry creation exceeds this threshold and sum size of parts is greater than \"prefer_fetch_merged_part_size_threshold\", prefer fetching merged part from replica instead of doing merge locally. To speed up very long merges.", 0) \
     M(UInt64, prefer_fetch_merged_part_size_threshold, 10ULL * 1024 * 1024 * 1024, "If sum size of parts exceeds this threshold and time passed after replication log entry creation is greater than \"prefer_fetch_merged_part_time_threshold\", prefer fetching merged part from replica instead of doing merge locally. To speed up very long merges.", 0) \
     M(Seconds, execute_merges_on_single_replica_time_threshold, 0, "When greater than zero only a single replica starts the merge immediately, others wait up to that amount of time to download the result instead of doing merges locally. If the chosen replica doesn't finish the merge during that amount of time, fallback to standard behavior happens.", 0) \
+    M(Seconds, s3_execute_merges_on_single_replica_time_threshold, 3 * 60 * 60, "When greater than zero only a single replica starts the merge immediatelys when merged part on S3 storage and 'allow_s3_zero_copy_replication' is enabled.", 0) \
     M(Seconds, try_fetch_recompressed_part_timeout, 7200, "Recompression works slow in most cases, so we don't start merge with recompression until this timeout and trying to fetch recompressed part from replica which assigned this merge with recompression.", 0) \
     M(Bool, always_fetch_merged_part, 0, "If true, replica never merge parts and always download merged parts from other replicas.", 0) \
     M(UInt64, max_suspicious_broken_parts, 10, "Max broken parts, if more - deny automatic deletion.", 0) \
@@ -82,6 +85,9 @@ struct Settings;
     M(UInt64, replicated_max_parallel_fetches_for_host, DEFAULT_COUNT_OF_HTTP_CONNECTIONS_PER_ENDPOINT, "Limit parallel fetches from endpoint (actually pool size).", 0) \
     M(UInt64, replicated_max_parallel_sends, 0, "Limit parallel sends.", 0) \
     M(UInt64, replicated_max_parallel_sends_for_table, 0, "Limit parallel sends for one table.", 0) \
+    M(Seconds, replicated_fetches_http_connection_timeout, 0, "HTTP connection timeout for part fetch requests. Inherited from default profile `http_connection_timeout` if not set explicitly.", 0) \
+    M(Seconds, replicated_fetches_http_send_timeout, 0, "HTTP send timeout for part fetch requests. Inherited from default profile `http_send_timeout` if not set explicitly.", 0) \
+    M(Seconds, replicated_fetches_http_receive_timeout, 0, "HTTP receive timeout for fetch part requests. Inherited from default profile `http_receive_timeout` if not set explicitly.", 0) \
     M(Bool, replicated_can_become_leader, true, "If true, Replicated tables replicas on this node will try to acquire leadership.", 0) \
     M(Seconds, zookeeper_session_expiration_check_period, 60, "ZooKeeper session expiration check period, in seconds.", 0) \
     M(Bool, detach_old_local_parts_when_cloning_replica, 1, "Do not remove old local parts when repairing lost replica.", 0) \
@@ -114,11 +120,13 @@ struct Settings;
     M(UInt64, concurrent_part_removal_threshold, 100, "Activate concurrent part removal (see 'max_part_removal_threads') only if the number of inactive data parts is at least this.", 0) \
     M(String, storage_policy, "default", "Name of storage disk policy", 0) \
     M(Bool, allow_nullable_key, false, "Allow Nullable types as primary keys.", 0) \
+    M(Bool, allow_s3_zero_copy_replication, false, "Allow Zero-copy replication over S3", 0) \
     M(Bool, remove_empty_parts, true, "Remove empty parts after they were pruned by TTL, mutation, or collapsing merge algorithm", 0) \
     M(Bool, assign_part_uuids, false, "Generate UUIDs for parts. Before enabling check that all replicas support new format.", 0) \
     M(Int64, max_partitions_to_read, -1, "Limit the max number of partitions that can be accessed in one query. <= 0 means unlimited. This setting is the default that can be overridden by the query-level setting with the same name.", 0) \
     M(UInt64, max_concurrent_queries, 0, "Max number of concurrently executed queries related to the MergeTree table (0 - disabled). Queries will still be limited by other max_concurrent_queries settings.", 0) \
     M(UInt64, min_marks_to_honor_max_concurrent_queries, 0, "Minimal number of marks to honor the MergeTree-level's max_concurrent_queries (0 - disabled). Queries will still be limited by other max_concurrent_queries settings.", 0) \
+    M(UInt64, min_bytes_to_rebalance_partition_over_jbod, 0, "Minimal amount of bytes to enable part rebalance over JBOD array (0 - disabled).", 0) \
     \
     /** Obsolete settings. Kept for backward compatibility only. */ \
     M(UInt64, min_relative_delay_to_yield_leadership, 120, "Obsolete setting, does nothing.", 0) \
diff --git a/src/Storages/MergeTree/MergeTreeThreadSelectBlockInputProcessor.cpp b/src/Storages/MergeTree/MergeTreeThreadSelectBlockInputProcessor.cpp
index f57247e39ab..ba9216ac1b0 100644
--- a/src/Storages/MergeTree/MergeTreeThreadSelectBlockInputProcessor.cpp
+++ b/src/Storages/MergeTree/MergeTreeThreadSelectBlockInputProcessor.cpp
@@ -71,8 +71,8 @@ bool MergeTreeThreadSelectBlockInputProcessor::getNewTask()
         auto rest_mark_ranges = pool->getRestMarks(*task->data_part, task->mark_ranges[0]);
 
         if (use_uncompressed_cache)
-            owned_uncompressed_cache = storage.global_context.getUncompressedCache();
-        owned_mark_cache = storage.global_context.getMarkCache();
+            owned_uncompressed_cache = storage.getContext()->getUncompressedCache();
+        owned_mark_cache = storage.getContext()->getMarkCache();
 
         reader = task->data_part->getReader(task->columns, metadata_snapshot, rest_mark_ranges,
             owned_uncompressed_cache.get(), owned_mark_cache.get(), reader_settings,
diff --git a/src/Storages/MergeTree/MergeTreeWhereOptimizer.cpp b/src/Storages/MergeTree/MergeTreeWhereOptimizer.cpp
index 34cac56d74c..3e2e77d5de7 100644
--- a/src/Storages/MergeTree/MergeTreeWhereOptimizer.cpp
+++ b/src/Storages/MergeTree/MergeTreeWhereOptimizer.cpp
@@ -29,7 +29,7 @@ static constexpr auto threshold = 2;
 
 MergeTreeWhereOptimizer::MergeTreeWhereOptimizer(
     SelectQueryInfo & query_info,
-    const Context & context,
+    ContextPtr context,
     std::unordered_map<std::string, UInt64> column_sizes_,
     const StorageMetadataPtr & metadata_snapshot,
     const Names & queried_columns_,
@@ -37,7 +37,9 @@ MergeTreeWhereOptimizer::MergeTreeWhereOptimizer(
     : table_columns{ext::map<std::unordered_set>(
         metadata_snapshot->getColumns().getAllPhysical(), [](const NameAndTypePair & col) { return col.name; })}
     , queried_columns{queried_columns_}
-    , block_with_constants{KeyCondition::getBlockWithConstants(query_info.query, query_info.syntax_analyzer_result, context)}
+    , sorting_key_names{NameSet(
+          metadata_snapshot->getSortingKey().column_names.begin(), metadata_snapshot->getSortingKey().column_names.end())}
+    , block_with_constants{KeyCondition::getBlockWithConstants(query_info.query->clone(), query_info.syntax_analyzer_result, context)}
     , log{log_}
     , column_sizes{std::move(column_sizes_)}
 {
@@ -114,12 +116,12 @@ static bool isConditionGood(const ASTPtr & condition)
 }
 
 
-void MergeTreeWhereOptimizer::analyzeImpl(Conditions & res, const ASTPtr & node) const
+void MergeTreeWhereOptimizer::analyzeImpl(Conditions & res, const ASTPtr & node, bool is_final) const
 {
     if (const auto * func_and = node->as<ASTFunction>(); func_and && func_and->name == "and")
     {
         for (const auto & elem : func_and->arguments->children)
-            analyzeImpl(res, elem);
+            analyzeImpl(res, elem, is_final);
     }
     else
     {
@@ -133,7 +135,7 @@ void MergeTreeWhereOptimizer::analyzeImpl(Conditions & res, const ASTPtr & node)
         cond.viable =
             /// Condition depend on some column. Constant expressions are not moved.
             !cond.identifiers.empty()
-            && !cannotBeMoved(node)
+            && !cannotBeMoved(node, is_final)
             /// Do not take into consideration the conditions consisting only of the first primary key column
             && !hasPrimaryKeyAtoms(node)
             /// Only table columns are considered. Not array joined columns. NOTE We're assuming that aliases was expanded.
@@ -149,10 +151,10 @@ void MergeTreeWhereOptimizer::analyzeImpl(Conditions & res, const ASTPtr & node)
 }
 
 /// Transform conjunctions chain in WHERE expression to Conditions list.
-MergeTreeWhereOptimizer::Conditions MergeTreeWhereOptimizer::analyze(const ASTPtr & expression) const
+MergeTreeWhereOptimizer::Conditions MergeTreeWhereOptimizer::analyze(const ASTPtr & expression, bool is_final) const
 {
     Conditions res;
-    analyzeImpl(res, expression);
+    analyzeImpl(res, expression, is_final);
     return res;
 }
 
@@ -183,7 +185,7 @@ void MergeTreeWhereOptimizer::optimize(ASTSelectQuery & select) const
     if (!select.where() || select.prewhere())
         return;
 
-    Conditions where_conditions = analyze(select.where());
+    Conditions where_conditions = analyze(select.where(), select.final());
     Conditions prewhere_conditions;
 
     UInt64 total_size_of_moved_conditions = 0;
@@ -300,6 +302,12 @@ bool MergeTreeWhereOptimizer::isPrimaryKeyAtom(const ASTPtr & ast) const
 }
 
 
+bool MergeTreeWhereOptimizer::isSortingKey(const String & column_name) const
+{
+    return sorting_key_names.count(column_name);
+}
+
+
 bool MergeTreeWhereOptimizer::isConstant(const ASTPtr & expr) const
 {
     const auto column_name = expr->getColumnName();
@@ -319,7 +327,7 @@ bool MergeTreeWhereOptimizer::isSubsetOfTableColumns(const NameSet & identifiers
 }
 
 
-bool MergeTreeWhereOptimizer::cannotBeMoved(const ASTPtr & ptr) const
+bool MergeTreeWhereOptimizer::cannotBeMoved(const ASTPtr & ptr, bool is_final) const
 {
     if (const auto * function_ptr = ptr->as<ASTFunction>())
     {
@@ -331,17 +339,22 @@ bool MergeTreeWhereOptimizer::cannotBeMoved(const ASTPtr & ptr) const
         if ("globalIn" == function_ptr->name
             || "globalNotIn" == function_ptr->name)
             return true;
+
+        /// indexHint is a special function that it does not make sense to transfer to PREWHERE
+        if ("indexHint" == function_ptr->name)
+            return true;
     }
     else if (auto opt_name = IdentifierSemantic::getColumnName(ptr))
     {
         /// disallow moving result of ARRAY JOIN to PREWHERE
         if (array_joined_names.count(*opt_name) ||
-            array_joined_names.count(Nested::extractTableName(*opt_name)))
+            array_joined_names.count(Nested::extractTableName(*opt_name)) ||
+            (is_final && !isSortingKey(*opt_name)))
             return true;
     }
 
     for (const auto & child : ptr->children)
-        if (cannotBeMoved(child))
+        if (cannotBeMoved(child, is_final))
             return true;
 
     return false;
diff --git a/src/Storages/MergeTree/MergeTreeWhereOptimizer.h b/src/Storages/MergeTree/MergeTreeWhereOptimizer.h
index cad77fb9eed..0559fdee2ae 100644
--- a/src/Storages/MergeTree/MergeTreeWhereOptimizer.h
+++ b/src/Storages/MergeTree/MergeTreeWhereOptimizer.h
@@ -1,12 +1,15 @@
 #pragma once
 
-#include <memory>
-#include <unordered_map>
-#include <set>
-#include <boost/noncopyable.hpp>
 #include <Core/Block.h>
+#include <Interpreters/Context_fwd.h>
 #include <Storages/SelectQueryInfo.h>
 
+#include <boost/noncopyable.hpp>
+
+#include <memory>
+#include <set>
+#include <unordered_map>
+
 
 namespace Poco { class Logger; }
 
@@ -32,7 +35,7 @@ class MergeTreeWhereOptimizer : private boost::noncopyable
 public:
     MergeTreeWhereOptimizer(
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         std::unordered_map<std::string, UInt64> column_sizes_,
         const StorageMetadataPtr & metadata_snapshot,
         const Names & queried_columns_,
@@ -67,10 +70,10 @@ private:
 
     using Conditions = std::list<Condition>;
 
-    void analyzeImpl(Conditions & res, const ASTPtr & node) const;
+    void analyzeImpl(Conditions & res, const ASTPtr & node, bool is_final) const;
 
     /// Transform conjunctions chain in WHERE expression to Conditions list.
-    Conditions analyze(const ASTPtr & expression) const;
+    Conditions analyze(const ASTPtr & expression, bool is_final) const;
 
     /// Transform Conditions list to WHERE or PREWHERE expression.
     static ASTPtr reconstruct(const Conditions & conditions);
@@ -85,6 +88,8 @@ private:
 
     bool isPrimaryKeyAtom(const ASTPtr & ast) const;
 
+    bool isSortingKey(const String & column_name) const;
+
     bool isConstant(const ASTPtr & expr) const;
 
     bool isSubsetOfTableColumns(const NameSet & identifiers) const;
@@ -95,7 +100,7 @@ private:
       *
       * Also, disallow moving expressions with GLOBAL [NOT] IN.
       */
-    bool cannotBeMoved(const ASTPtr & ptr) const;
+    bool cannotBeMoved(const ASTPtr & ptr, bool is_final) const;
 
     void determineArrayJoinedNames(ASTSelectQuery & select);
 
@@ -104,6 +109,7 @@ private:
     String first_primary_key_column;
     const StringSet table_columns;
     const Names queried_columns;
+    const NameSet sorting_key_names;
     const Block block_with_constants;
     Poco::Logger * log;
     std::unordered_map<std::string, UInt64> column_sizes;
diff --git a/src/Storages/MergeTree/MergeTreeWriteAheadLog.cpp b/src/Storages/MergeTree/MergeTreeWriteAheadLog.cpp
index e726f0ffd51..4c92d4f6136 100644
--- a/src/Storages/MergeTree/MergeTreeWriteAheadLog.cpp
+++ b/src/Storages/MergeTree/MergeTreeWriteAheadLog.cpp
@@ -30,7 +30,7 @@ MergeTreeWriteAheadLog::MergeTreeWriteAheadLog(
     , disk(disk_)
     , name(name_)
     , path(storage.getRelativeDataPath() + name_)
-    , pool(storage.global_context.getSchedulePool())
+    , pool(storage.getContext()->getSchedulePool())
 {
     init();
     sync_task = pool.createTask("MergeTreeWriteAheadLog::sync", [this]
@@ -147,7 +147,6 @@ MergeTreeData::MutableDataPartsVector MergeTreeWriteAheadLog::restore(const Stor
             }
             else if (action_type == ActionType::ADD_PART)
             {
-                auto part_disk = storage.reserveSpace(0)->getDisk();
                 auto single_disk_volume = std::make_shared<SingleDiskVolume>("volume_" + part_name, disk, 0);
 
                 part = storage.createPart(
@@ -192,7 +191,7 @@ MergeTreeData::MutableDataPartsVector MergeTreeWriteAheadLog::restore(const Stor
         {
             MergedBlockOutputStream part_out(part, metadata_snapshot, block.getNamesAndTypesList(), {}, CompressionCodecFactory::instance().get("NONE", {}));
 
-            part->minmax_idx.update(block, storage.minmax_idx_columns);
+            part->minmax_idx.update(block, storage.getMinMaxColumnsNames(metadata_snapshot->getPartitionKey()));
             part->partition.create(metadata_snapshot, block, 0);
             if (metadata_snapshot->hasSortingKey())
                 metadata_snapshot->getSortingKey().expression->execute(block);
diff --git a/src/Storages/MergeTree/MergedBlockOutputStream.cpp b/src/Storages/MergeTree/MergedBlockOutputStream.cpp
index 1605ec693cb..ab364e0e5aa 100644
--- a/src/Storages/MergeTree/MergedBlockOutputStream.cpp
+++ b/src/Storages/MergeTree/MergedBlockOutputStream.cpp
@@ -26,7 +26,7 @@ MergedBlockOutputStream::MergedBlockOutputStream(
     , default_codec(default_codec_)
 {
     MergeTreeWriterSettings writer_settings(
-        storage.global_context.getSettings(),
+        storage.getContext()->getSettings(),
         storage.getSettings(),
         data_part->index_granularity_info.is_adaptive,
         /* rewrite_primary_key = */ true,
@@ -91,6 +91,7 @@ void MergedBlockOutputStream::writeSuffixAndFinalizePart(
     new_part->calculateColumnsSizesOnDisk();
     if (default_codec != nullptr)
         new_part->default_codec = default_codec;
+    new_part->storage.lockSharedData(*new_part);
 }
 
 void MergedBlockOutputStream::finalizePartOnDisk(
@@ -185,7 +186,6 @@ void MergedBlockOutputStream::writeImpl(const Block & block, const IColumn::Perm
         return;
 
     writer->write(block, permutation);
-
     rows_count += rows;
 }
 
diff --git a/src/Storages/MergeTree/MergedColumnOnlyOutputStream.cpp b/src/Storages/MergeTree/MergedColumnOnlyOutputStream.cpp
index 41479f104f3..298c550d496 100644
--- a/src/Storages/MergeTree/MergedColumnOnlyOutputStream.cpp
+++ b/src/Storages/MergeTree/MergedColumnOnlyOutputStream.cpp
@@ -21,7 +21,7 @@ MergedColumnOnlyOutputStream::MergedColumnOnlyOutputStream(
     : IMergedBlockOutputStream(data_part, metadata_snapshot_)
     , header(header_)
 {
-    const auto & global_settings = data_part->storage.global_context.getSettings();
+    const auto & global_settings = data_part->storage.getContext()->getSettings();
     const auto & storage_settings = data_part->storage.getSettings();
 
     MergeTreeWriterSettings writer_settings(
diff --git a/src/Storages/MergeTree/PartitionPruner.h b/src/Storages/MergeTree/PartitionPruner.h
index 3cb7552c427..a4035087b89 100644
--- a/src/Storages/MergeTree/PartitionPruner.h
+++ b/src/Storages/MergeTree/PartitionPruner.h
@@ -21,7 +21,7 @@ private:
     using DataPartPtr = std::shared_ptr<const DataPart>;
 
 public:
-    PartitionPruner(const KeyDescription & partition_key_, const SelectQueryInfo & query_info, const Context & context, bool strict)
+    PartitionPruner(const KeyDescription & partition_key_, const SelectQueryInfo & query_info, ContextPtr context, bool strict)
         : partition_key(partition_key_)
         , partition_condition(
               query_info, context, partition_key.column_names, partition_key.expression, true /* single_point */, strict)
@@ -32,6 +32,8 @@ public:
     bool canBePruned(const DataPartPtr & part);
 
     bool isUseless() const { return useless; }
+
+    const KeyCondition & getKeyCondition() const { return partition_condition; }
 };
 
 }
diff --git a/src/Storages/MergeTree/RPNBuilder.h b/src/Storages/MergeTree/RPNBuilder.h
index 292a120d28a..d63781db67d 100644
--- a/src/Storages/MergeTree/RPNBuilder.h
+++ b/src/Storages/MergeTree/RPNBuilder.h
@@ -1,35 +1,34 @@
 #pragma once
 
-#include <Common/typeid_cast.h>
 #include <Core/Block.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <Parsers/ASTExpressionList.h>
-#include <Parsers/ASTSelectQuery.h>
 #include <Parsers/ASTFunction.h>
-#include <Storages/SelectQueryInfo.h>
+#include <Parsers/ASTSelectQuery.h>
 #include <Storages/MergeTree/KeyCondition.h>
+#include <Storages/SelectQueryInfo.h>
+#include <Common/typeid_cast.h>
 
 
 namespace DB
 {
-class Context;
 
 /// Builds reverse polish notation
 template <typename RPNElement>
-class RPNBuilder
+class RPNBuilder : WithContext
 {
 public:
     using RPN = std::vector<RPNElement>;
     using AtomFromASTFunc = std::function<
-            bool(const ASTPtr & node, const Context & context, Block & block_with_constants, RPNElement & out)>;
+            bool(const ASTPtr & node, ContextPtr context, Block & block_with_constants, RPNElement & out)>;
 
-    RPNBuilder(const SelectQueryInfo & query_info, const Context & context_, const AtomFromASTFunc & atomFromAST_)
-        : context(context_), atomFromAST(atomFromAST_)
+    RPNBuilder(const SelectQueryInfo & query_info, ContextPtr context_, const AtomFromASTFunc & atomFromAST_)
+        : WithContext(context_), atomFromAST(atomFromAST_)
     {
         /** Evaluation of expressions that depend only on constants.
           * For the index to be used, if it is written, for example `WHERE Date = toDate(now())`.
           */
-        block_with_constants = KeyCondition::getBlockWithConstants(query_info.query, query_info.syntax_analyzer_result, context);
+        block_with_constants = KeyCondition::getBlockWithConstants(query_info.query, query_info.syntax_analyzer_result, getContext());
 
         /// Transform WHERE section to Reverse Polish notation
         const ASTSelectQuery & select = typeid_cast<const ASTSelectQuery &>(*query_info.query);
@@ -80,7 +79,7 @@ private:
             }
         }
 
-        if (!atomFromAST(node, context, block_with_constants, element))
+        if (!atomFromAST(node, getContext(), block_with_constants, element))
         {
             element.function = RPNElement::FUNCTION_UNKNOWN;
         }
@@ -91,6 +90,8 @@ private:
     bool operatorFromAST(const ASTFunction * func, RPNElement & out)
     {
         /// Functions AND, OR, NOT.
+        /// Also a special function `indexHint` - works as if instead of calling a function there are just parentheses
+        /// (or, the same thing - calling the function `and` from one argument).
         const ASTs & args = typeid_cast<const ASTExpressionList &>(*func->arguments).children;
 
         if (func->name == "not")
@@ -102,7 +103,7 @@ private:
         }
         else
         {
-            if (func->name == "and")
+            if (func->name == "and" || func->name == "indexHint")
                 out.function = RPNElement::FUNCTION_AND;
             else if (func->name == "or")
                 out.function = RPNElement::FUNCTION_OR;
@@ -113,7 +114,6 @@ private:
         return true;
     }
 
-    const Context & context;
     const AtomFromASTFunc & atomFromAST;
     Block block_with_constants;
     RPN rpn;
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeBlockOutputStream.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeBlockOutputStream.cpp
index 7046a510f75..df4f9124980 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeBlockOutputStream.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeBlockOutputStream.cpp
@@ -41,12 +41,14 @@ ReplicatedMergeTreeBlockOutputStream::ReplicatedMergeTreeBlockOutputStream(
     size_t max_parts_per_block_,
     bool quorum_parallel_,
     bool deduplicate_,
-    bool optimize_on_insert_)
+    bool optimize_on_insert_,
+    bool is_attach_)
     : storage(storage_)
     , metadata_snapshot(metadata_snapshot_)
     , quorum(quorum_)
     , quorum_timeout_ms(quorum_timeout_ms_)
     , max_parts_per_block(max_parts_per_block_)
+    , is_attach(is_attach_)
     , quorum_parallel(quorum_parallel_)
     , deduplicate(deduplicate_)
     , log(&Poco::Logger::get(storage.getLogName() + " (Replicated OutputStream)"))
@@ -144,22 +146,18 @@ void ReplicatedMergeTreeBlockOutputStream::write(const Block & block)
 
         MergeTreeData::MutableDataPartPtr part = storage.writer.writeTempPart(current_block, metadata_snapshot, optimize_on_insert);
 
+        /// If optimize_on_insert setting is true, current_block could become empty after merge
+        /// and we didn't create part.
+        if (!part)
+            continue;
+
         String block_id;
 
         if (deduplicate)
         {
-            SipHash hash;
-            part->checksums.computeTotalChecksumDataOnly(hash);
-            union
-            {
-                char bytes[16];
-                UInt64 words[2];
-            } hash_value;
-            hash.get128(hash_value.bytes);
-
             /// We add the hash from the data and partition identifier to deduplication ID.
             /// That is, do not insert the same data to the same partition twice.
-            block_id = part->info.partition_id + "_" + toString(hash_value.words[0]) + "_" + toString(hash_value.words[1]);
+            block_id = part->getZeroLevelPartBlockID();
 
             LOG_DEBUG(log, "Wrote block with ID '{}', {} rows", block_id, current_block.block.rows());
         }
@@ -174,11 +172,11 @@ void ReplicatedMergeTreeBlockOutputStream::write(const Block & block)
 
             /// Set a special error code if the block is duplicate
             int error = (deduplicate && last_block_is_duplicate) ? ErrorCodes::INSERT_WAS_DEDUPLICATED : 0;
-            PartLog::addNewPart(storage.global_context, part, watch.elapsed(), ExecutionStatus(error));
+            PartLog::addNewPart(storage.getContext(), part, watch.elapsed(), ExecutionStatus(error));
         }
         catch (...)
         {
-            PartLog::addNewPart(storage.global_context, part, watch.elapsed(), ExecutionStatus::fromCurrentException(__PRETTY_FUNCTION__));
+            PartLog::addNewPart(storage.getContext(), part, watch.elapsed(), ExecutionStatus::fromCurrentException(__PRETTY_FUNCTION__));
             throw;
         }
     }
@@ -202,11 +200,11 @@ void ReplicatedMergeTreeBlockOutputStream::writeExistingPart(MergeTreeData::Muta
     try
     {
         commitPart(zookeeper, part, "");
-        PartLog::addNewPart(storage.global_context, part, watch.elapsed());
+        PartLog::addNewPart(storage.getContext(), part, watch.elapsed());
     }
     catch (...)
     {
-        PartLog::addNewPart(storage.global_context, part, watch.elapsed(), ExecutionStatus::fromCurrentException(__PRETTY_FUNCTION__));
+        PartLog::addNewPart(storage.getContext(), part, watch.elapsed(), ExecutionStatus::fromCurrentException(__PRETTY_FUNCTION__));
         throw;
     }
 }
@@ -258,10 +256,20 @@ void ReplicatedMergeTreeBlockOutputStream::commitPart(
 
             part->name = part->getNewName(part->info);
 
-            /// Will add log entry about new part.
-
             StorageReplicatedMergeTree::LogEntry log_entry;
-            log_entry.type = StorageReplicatedMergeTree::LogEntry::GET_PART;
+
+            if (is_attach)
+            {
+                log_entry.type = StorageReplicatedMergeTree::LogEntry::ATTACH_PART;
+
+                /// We don't need to involve ZooKeeper to obtain the checksums as by the time we get
+                /// the MutableDataPartPtr here, we already have the data thus being able to
+                /// calculate the checksums.
+                log_entry.part_checksum = part->checksums.getTotalChecksumHex();
+            }
+            else
+                log_entry.type = StorageReplicatedMergeTree::LogEntry::GET_PART;
+
             log_entry.create_time = time(nullptr);
             log_entry.source_replica = storage.replica_name;
             log_entry.new_part_name = part->name;
@@ -333,13 +341,28 @@ void ReplicatedMergeTreeBlockOutputStream::commitPart(
             /// If it exists on our replica, ignore it.
             if (storage.getActiveContainingPart(existing_part_name))
             {
-                LOG_INFO(log, "Block with ID {} already exists locally as part {}; ignoring it.", block_id, existing_part_name);
                 part->is_duplicate = true;
                 last_block_is_duplicate = true;
                 ProfileEvents::increment(ProfileEvents::DuplicatedInsertedBlocks);
+                if (quorum)
+                {
+                    LOG_INFO(log, "Block with ID {} already exists locally as part {}; ignoring it, but checking quorum.", block_id, existing_part_name);
+
+                    std::string quorum_path;
+                    if (quorum_parallel)
+                        quorum_path = storage.zookeeper_path + "/quorum/parallel/" + existing_part_name;
+                    else
+                        quorum_path = storage.zookeeper_path + "/quorum/status";
+
+                    waitForQuorum(zookeeper, existing_part_name, quorum_path, quorum_info.is_active_node_value);
+                }
+                else
+                {
+                    LOG_INFO(log, "Block with ID {} already exists locally as part {}; ignoring it.", block_id, existing_part_name);
+                }
+
                 return;
             }
-
             LOG_INFO(log, "Block with ID {} already exists on other replicas as part {}; will write it locally with that name.",
                 block_id, existing_part_name);
 
@@ -478,50 +501,7 @@ void ReplicatedMergeTreeBlockOutputStream::commitPart(
                 storage.updateQuorum(part->name, false);
         }
 
-        /// We are waiting for quorum to be satisfied.
-        LOG_TRACE(log, "Waiting for quorum");
-
-        try
-        {
-            while (true)
-            {
-                zkutil::EventPtr event = std::make_shared<Poco::Event>();
-
-                std::string value;
-                /// `get` instead of `exists` so that `watch` does not leak if the node is no longer there.
-                if (!zookeeper->tryGet(quorum_info.status_path, value, nullptr, event))
-                    break;
-
-                LOG_TRACE(log, "Quorum node {} still exists, will wait for updates", quorum_info.status_path);
-
-                ReplicatedMergeTreeQuorumEntry quorum_entry(value);
-
-                /// If the node has time to disappear, and then appear again for the next insert.
-                if (quorum_entry.part_name != part->name)
-                    break;
-
-                if (!event->tryWait(quorum_timeout_ms))
-                    throw Exception("Timeout while waiting for quorum", ErrorCodes::TIMEOUT_EXCEEDED);
-
-                LOG_TRACE(log, "Quorum {} updated, will check quorum node still exists", quorum_info.status_path);
-            }
-
-            /// And what if it is possible that the current replica at this time has ceased to be active
-            /// and the quorum is marked as failed and deleted?
-            String value;
-            if (!zookeeper->tryGet(storage.replica_path + "/is_active", value, nullptr)
-                || value != quorum_info.is_active_node_value)
-                throw Exception("Replica become inactive while waiting for quorum", ErrorCodes::NO_ACTIVE_REPLICAS);
-        }
-        catch (...)
-        {
-            /// We do not know whether or not data has been inserted
-            /// - whether other replicas have time to download the part and mark the quorum as done.
-            throw Exception("Unknown status, client must retry. Reason: " + getCurrentExceptionMessage(false),
-                ErrorCodes::UNKNOWN_STATUS_OF_INSERT);
-        }
-
-        LOG_TRACE(log, "Quorum satisfied");
+        waitForQuorum(zookeeper, part->name, quorum_info.status_path, quorum_info.is_active_node_value);
     }
 }
 
@@ -533,4 +513,57 @@ void ReplicatedMergeTreeBlockOutputStream::writePrefix()
 }
 
 
+void ReplicatedMergeTreeBlockOutputStream::waitForQuorum(
+    zkutil::ZooKeeperPtr & zookeeper,
+    const std::string & part_name,
+    const std::string & quorum_path,
+    const std::string & is_active_node_value) const
+{
+    /// We are waiting for quorum to be satisfied.
+    LOG_TRACE(log, "Waiting for quorum");
+
+    try
+    {
+        while (true)
+        {
+            zkutil::EventPtr event = std::make_shared<Poco::Event>();
+
+            std::string value;
+            /// `get` instead of `exists` so that `watch` does not leak if the node is no longer there.
+            if (!zookeeper->tryGet(quorum_path, value, nullptr, event))
+                break;
+
+            LOG_TRACE(log, "Quorum node {} still exists, will wait for updates", quorum_path);
+
+            ReplicatedMergeTreeQuorumEntry quorum_entry(value);
+
+            /// If the node has time to disappear, and then appear again for the next insert.
+            if (quorum_entry.part_name != part_name)
+                break;
+
+            if (!event->tryWait(quorum_timeout_ms))
+                throw Exception("Timeout while waiting for quorum", ErrorCodes::TIMEOUT_EXCEEDED);
+
+            LOG_TRACE(log, "Quorum {} updated, will check quorum node still exists", quorum_path);
+        }
+
+        /// And what if it is possible that the current replica at this time has ceased to be active
+        /// and the quorum is marked as failed and deleted?
+        String value;
+        if (!zookeeper->tryGet(storage.replica_path + "/is_active", value, nullptr)
+            || value != is_active_node_value)
+            throw Exception("Replica become inactive while waiting for quorum", ErrorCodes::NO_ACTIVE_REPLICAS);
+    }
+    catch (...)
+    {
+        /// We do not know whether or not data has been inserted
+        /// - whether other replicas have time to download the part and mark the quorum as done.
+        throw Exception("Unknown status, client must retry. Reason: " + getCurrentExceptionMessage(false),
+            ErrorCodes::UNKNOWN_STATUS_OF_INSERT);
+    }
+
+    LOG_TRACE(log, "Quorum satisfied");
+}
+
+
 }
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeBlockOutputStream.h b/src/Storages/MergeTree/ReplicatedMergeTreeBlockOutputStream.h
index 3ac2c4bcfcb..6ea16491d64 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeBlockOutputStream.h
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeBlockOutputStream.h
@@ -30,7 +30,10 @@ public:
         size_t max_parts_per_block_,
         bool quorum_parallel_,
         bool deduplicate_,
-        bool optimize_on_insert);
+        bool optimize_on_insert,
+        // special flag to determine the ALTER TABLE ATTACH PART without the query context,
+        // needed to set the special LogEntryType::ATTACH_PART
+        bool is_attach_ = false);
 
     Block getHeader() const override;
     void writePrefix() override;
@@ -60,12 +63,19 @@ private:
     /// Rename temporary part and commit to ZooKeeper.
     void commitPart(zkutil::ZooKeeperPtr & zookeeper, MergeTreeData::MutableDataPartPtr & part, const String & block_id);
 
+    /// Wait for quorum to be satisfied on path (quorum_path) form part (part_name)
+    /// Also checks that replica still alive.
+    void waitForQuorum(
+        zkutil::ZooKeeperPtr & zookeeper, const std::string & part_name,
+        const std::string & quorum_path, const std::string & is_active_node_value) const;
+
     StorageReplicatedMergeTree & storage;
     StorageMetadataPtr metadata_snapshot;
     size_t quorum;
     size_t quorum_timeout_ms;
     size_t max_parts_per_block;
 
+    bool is_attach = false;
     bool quorum_parallel = false;
     bool deduplicate = true;
     bool last_block_is_duplicate = false;
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.cpp
index 701cb2fa1ed..502c6215a9a 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.cpp
@@ -24,7 +24,7 @@ ReplicatedMergeTreeCleanupThread::ReplicatedMergeTreeCleanupThread(StorageReplic
     , log_name(storage.getStorageID().getFullTableName() + " (ReplicatedMergeTreeCleanupThread)")
     , log(&Poco::Logger::get(log_name))
 {
-    task = storage.global_context.getSchedulePool().createTask(log_name, [this]{ run(); });
+    task = storage.getContext()->getSchedulePool().createTask(log_name, [this]{ run(); });
 }
 
 void ReplicatedMergeTreeCleanupThread::run()
@@ -342,6 +342,15 @@ void ReplicatedMergeTreeCleanupThread::clearOldBlocks()
         timed_blocks.begin(), timed_blocks.end(), block_threshold, NodeWithStat::greaterByTime);
     auto first_outdated_block = std::min(first_outdated_block_fixed_threshold, first_outdated_block_time_threshold);
 
+    auto num_nodes_to_delete = timed_blocks.end() - first_outdated_block;
+    if (!num_nodes_to_delete)
+        return;
+
+    auto last_outdated_block = timed_blocks.end() - 1;
+    LOG_TRACE(log, "Will clear {} old blocks from {} (ctime {}) to {} (ctime {})", num_nodes_to_delete,
+              first_outdated_block->node, first_outdated_block->ctime,
+              last_outdated_block->node, last_outdated_block->ctime);
+
     zkutil::AsyncResponses<Coordination::RemoveResponse> try_remove_futures;
     for (auto it = first_outdated_block; it != timed_blocks.end(); ++it)
     {
@@ -372,9 +381,7 @@ void ReplicatedMergeTreeCleanupThread::clearOldBlocks()
         first_outdated_block++;
     }
 
-    auto num_nodes_to_delete = timed_blocks.end() - first_outdated_block;
-    if (num_nodes_to_delete)
-        LOG_TRACE(log, "Cleared {} old blocks from ZooKeeper", num_nodes_to_delete);
+    LOG_TRACE(log, "Cleared {} old blocks from ZooKeeper", num_nodes_to_delete);
 }
 
 
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.cpp
index 9a9f25fd470..7d8ba0e4a30 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.cpp
@@ -1,4 +1,5 @@
 #include <Common/ZooKeeper/Types.h>
+#include "Access/IAccessEntity.h"
 
 #include <Storages/MergeTree/ReplicatedMergeTreeLogEntry.h>
 #include <Storages/MergeTree/ReplicatedMergeTreeTableMetadata.h>
@@ -52,6 +53,11 @@ void ReplicatedMergeTreeLogEntryData::writeText(WriteBuffer & out) const
             out << "get\n" << new_part_name;
             break;
 
+        case ATTACH_PART:
+            out << "attach\n" << new_part_name << "\n"
+                << "part_checksum: " << part_checksum;
+            break;
+
         case MERGE_PARTS:
             out << "merge\n";
             for (const String & s : source_parts)
@@ -136,7 +142,7 @@ void ReplicatedMergeTreeLogEntryData::writeText(WriteBuffer & out) const
             break;
 
         default:
-            throw Exception("Unknown log entry type: " + DB::toString<int>(type), ErrorCodes::LOGICAL_ERROR);
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Unknown log entry type: {}", static_cast<int>(type));
     }
 
     out << '\n';
@@ -156,13 +162,16 @@ void ReplicatedMergeTreeLogEntryData::readText(ReadBuffer & in)
     in >> "format version: " >> format_version >> "\n";
 
     if (format_version < 1 || format_version >= FORMAT_LAST)
-        throw Exception("Unknown ReplicatedMergeTreeLogEntry format version: " + DB::toString(format_version), ErrorCodes::UNKNOWN_FORMAT_VERSION);
+        throw Exception(ErrorCodes::UNKNOWN_FORMAT_VERSION, "Unknown ReplicatedMergeTreeLogEntry format version: {}",
+                DB::toString(format_version));
 
     if (format_version >= FORMAT_WITH_CREATE_TIME)
     {
         LocalDateTime create_time_dt;
         in >> "create_time: " >> create_time_dt >> "\n";
-        create_time = create_time_dt;
+        create_time = DateLUT::instance().makeDateTime(
+            create_time_dt.year(), create_time_dt.month(), create_time_dt.day(),
+            create_time_dt.hour(), create_time_dt.minute(), create_time_dt.second());
     }
 
     in >> "source replica: " >> source_replica >> "\n";
@@ -175,11 +184,17 @@ void ReplicatedMergeTreeLogEntryData::readText(ReadBuffer & in)
     in >> type_str >> "\n";
 
     bool trailing_newline_found = false;
+
     if (type_str == "get")
     {
         type = GET_PART;
         in >> new_part_name;
     }
+    else if (type_str == "attach")
+    {
+        type = ATTACH_PART;
+        in >> new_part_name >> "\npart_checksum: " >> part_checksum;
+    }
     else if (type_str == "merge")
     {
         type = MERGE_PARTS;
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.h b/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.h
index cdf5a40d5a9..309120560e7 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.h
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.h
@@ -6,6 +6,7 @@
 #include <IO/WriteHelpers.h>
 #include <Storages/MergeTree/MergeTreeDataPartType.h>
 #include <Storages/MergeTree/MergeType.h>
+#include <Disks/IDisk.h>
 
 #include <mutex>
 #include <condition_variable>
@@ -31,6 +32,8 @@ struct ReplicatedMergeTreeLogEntryData
     {
         EMPTY,          /// Not used.
         GET_PART,       /// Get the part from another replica.
+        ATTACH_PART,    /// Attach the part, possibly from our own replica (if found in /detached folder).
+                        /// You may think of it as a GET_PART with some optimisations as they're nearly identical.
         MERGE_PARTS,    /// Merge the parts.
         DROP_RANGE,     /// Delete the parts in the specified partition in the specified number range.
         CLEAR_COLUMN,   /// NOTE: Deprecated. Drop specific column from specified partition.
@@ -45,6 +48,7 @@ struct ReplicatedMergeTreeLogEntryData
         switch (type)
         {
             case ReplicatedMergeTreeLogEntryData::GET_PART:         return "GET_PART";
+            case ReplicatedMergeTreeLogEntryData::ATTACH_PART:      return "ATTACH_PART";
             case ReplicatedMergeTreeLogEntryData::MERGE_PARTS:      return "MERGE_PARTS";
             case ReplicatedMergeTreeLogEntryData::DROP_RANGE:       return "DROP_RANGE";
             case ReplicatedMergeTreeLogEntryData::CLEAR_COLUMN:     return "CLEAR_COLUMN";
@@ -71,6 +75,8 @@ struct ReplicatedMergeTreeLogEntryData
     Type type = EMPTY;
     String source_replica; /// Empty string means that this entry was added to the queue immediately, and not copied from the log.
 
+    String part_checksum; /// Part checksum for ATTACH_PART, empty otherwise.
+
     /// The name of resulting part for GET_PART and MERGE_PARTS
     /// Part range for DROP_RANGE and CLEAR_COLUMN
     String new_part_name;
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeMergeStrategyPicker.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeMergeStrategyPicker.cpp
index d90183abd95..65da6080e86 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeMergeStrategyPicker.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeMergeStrategyPicker.cpp
@@ -56,6 +56,17 @@ bool ReplicatedMergeTreeMergeStrategyPicker::shouldMergeOnSingleReplica(const Re
 }
 
 
+bool ReplicatedMergeTreeMergeStrategyPicker::shouldMergeOnSingleReplicaS3Shared(const ReplicatedMergeTreeLogEntryData & entry) const
+{
+    time_t threshold = s3_execute_merges_on_single_replica_time_threshold;
+    return (
+        threshold > 0       /// feature turned on
+        && entry.type == ReplicatedMergeTreeLogEntry::MERGE_PARTS /// it is a merge log entry
+        && entry.create_time + threshold > time(nullptr)          /// not too much time waited
+    );
+}
+
+
 /// that will return the same replica name for ReplicatedMergeTreeLogEntry on all the replicas (if the replica set is the same).
 /// that way each replica knows who is responsible for doing a certain merge.
 
@@ -90,18 +101,23 @@ std::optional<String> ReplicatedMergeTreeMergeStrategyPicker::pickReplicaToExecu
 void ReplicatedMergeTreeMergeStrategyPicker::refreshState()
 {
     auto threshold = storage.getSettings()->execute_merges_on_single_replica_time_threshold.totalSeconds();
+    auto threshold_s3 = 0;
+    if (storage.getSettings()->allow_s3_zero_copy_replication)
+        threshold_s3 = storage.getSettings()->s3_execute_merges_on_single_replica_time_threshold.totalSeconds();
 
     if (threshold == 0)
-    {
         /// we can reset the settings w/o lock (it's atomic)
         execute_merges_on_single_replica_time_threshold = threshold;
+    if (threshold_s3 == 0)
+        s3_execute_merges_on_single_replica_time_threshold = threshold_s3;
+    if (threshold == 0 && threshold_s3 == 0)
         return;
-    }
 
     auto now = time(nullptr);
 
     /// the setting was already enabled, and last state refresh was done recently
-    if (execute_merges_on_single_replica_time_threshold != 0
+    if (((threshold != 0 && execute_merges_on_single_replica_time_threshold != 0)
+        || (threshold_s3 != 0 && s3_execute_merges_on_single_replica_time_threshold != 0))
         && now - last_refresh_time < REFRESH_STATE_MINIMUM_INTERVAL_SECONDS)
         return;
 
@@ -130,11 +146,15 @@ void ReplicatedMergeTreeMergeStrategyPicker::refreshState()
         LOG_WARNING(storage.log, "Can't find current replica in the active replicas list, or too few active replicas to use execute_merges_on_single_replica_time_threshold!");
         /// we can reset the settings w/o lock (it's atomic)
         execute_merges_on_single_replica_time_threshold = 0;
+        s3_execute_merges_on_single_replica_time_threshold = 0;
         return;
     }
 
     std::lock_guard lock(mutex);
-    execute_merges_on_single_replica_time_threshold = threshold;
+    if (threshold != 0) /// Zeros already reset
+        execute_merges_on_single_replica_time_threshold = threshold;
+    if (threshold_s3 != 0)
+        s3_execute_merges_on_single_replica_time_threshold = threshold_s3;
     last_refresh_time = now;
     current_replica_index = current_replica_index_tmp;
     active_replicas = active_replicas_tmp;
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeMergeStrategyPicker.h b/src/Storages/MergeTree/ReplicatedMergeTreeMergeStrategyPicker.h
index 02a760d1ace..8adf206676a 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeMergeStrategyPicker.h
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeMergeStrategyPicker.h
@@ -52,6 +52,10 @@ public:
     /// and we may need to do a fetch (or postpone) instead of merge
     bool shouldMergeOnSingleReplica(const ReplicatedMergeTreeLogEntryData & entry) const;
 
+    /// return true if s3_execute_merges_on_single_replica_time_threshold feature is active
+    /// and we may need to do a fetch (or postpone) instead of merge
+    bool shouldMergeOnSingleReplicaS3Shared(const ReplicatedMergeTreeLogEntryData & entry) const;
+
     /// returns the replica name
     /// and it's not current replica should do the merge
     /// used in shouldExecuteLogEntry and in tryExecuteMerge
@@ -68,6 +72,7 @@ private:
     uint64_t getEntryHash(const ReplicatedMergeTreeLogEntryData & entry) const;
 
     std::atomic<time_t> execute_merges_on_single_replica_time_threshold = 0;
+    std::atomic<time_t> s3_execute_merges_on_single_replica_time_threshold = 0;
     std::atomic<time_t> last_refresh_time = 0;
 
     std::mutex mutex;
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeMutationEntry.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeMutationEntry.cpp
index b2299b2cbbd..c617befe9c4 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeMutationEntry.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeMutationEntry.cpp
@@ -37,7 +37,9 @@ void ReplicatedMergeTreeMutationEntry::readText(ReadBuffer & in)
 
     LocalDateTime create_time_dt;
     in >> "create time: " >> create_time_dt >> "\n";
-    create_time = create_time_dt;
+    create_time = DateLUT::instance().makeDateTime(
+        create_time_dt.year(), create_time_dt.month(), create_time_dt.day(),
+        create_time_dt.hour(), create_time_dt.minute(), create_time_dt.second());
 
     in >> "source replica: " >> source_replica >> "\n";
 
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.cpp b/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.cpp
index b2a144ca748..09b2a23767c 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.cpp
@@ -28,7 +28,7 @@ ReplicatedMergeTreePartCheckThread::ReplicatedMergeTreePartCheckThread(StorageRe
     , log_name(storage.getStorageID().getFullTableName() + " (ReplicatedMergeTreePartCheckThread)")
     , log(&Poco::Logger::get(log_name))
 {
-    task = storage.global_context.getSchedulePool().createTask(log_name, [this] { run(); });
+    task = storage.getContext()->getSchedulePool().createTask(log_name, [this] { run(); });
     task->schedule();
 }
 
@@ -213,7 +213,7 @@ std::pair<bool, MergeTreeDataPartPtr> ReplicatedMergeTreePartCheckThread::findLo
     /// because our checks of local storage and zookeeper are not consistent.
     /// If part exists in zookeeper and doesn't exists in local storage definitely require
     /// to fetch this part. But if we check local storage first and than check zookeeper
-    /// some background process can successfully commit part between this checks (both to the local stoarge and zookeeper),
+    /// some background process can successfully commit part between this checks (both to the local storage and zookeeper),
     /// but checker thread will remove part from zookeeper and queue fetch.
     bool exists_in_zookeeper = zookeeper->exists(part_path);
 
@@ -234,6 +234,8 @@ CheckResult ReplicatedMergeTreePartCheckThread::checkPart(const String & part_na
 
     auto [exists_in_zookeeper, part] = findLocalPart(part_name);
 
+    LOG_TRACE(log, "Part {} in zookeeper: {}, locally: {}", part_name, exists_in_zookeeper, part != nullptr);
+
     /// We do not have this or a covering part.
     if (!part)
     {
@@ -250,6 +252,9 @@ CheckResult ReplicatedMergeTreePartCheckThread::checkPart(const String & part_na
         auto local_part_header = ReplicatedMergeTreePartHeader::fromColumnsAndChecksums(
             part->getColumns(), part->checksums);
 
+        /// The double get scheme is needed to retain compatibility with very old parts that were created
+        /// before the ReplicatedMergeTreePartHeader was introduced.
+
         String part_path = storage.replica_path + "/parts/" + part_name;
         String part_znode;
         /// If the part is in ZooKeeper, check its data with its checksums, and them with ZooKeeper.
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
index 26a916d2356..ad41bbe1a08 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
@@ -145,7 +145,7 @@ void ReplicatedMergeTreeQueue::insertUnlocked(
     else
         queue.push_front(entry);
 
-    if (entry->type == LogEntry::GET_PART)
+    if (entry->type == LogEntry::GET_PART || entry->type == LogEntry::ATTACH_PART)
     {
         inserts_by_time.insert(entry);
 
@@ -184,7 +184,7 @@ void ReplicatedMergeTreeQueue::updateStateOnQueueEntryRemoval(
     std::unique_lock<std::mutex> & state_lock)
 {
     /// Update insert times.
-    if (entry->type == LogEntry::GET_PART)
+    if (entry->type == LogEntry::GET_PART || entry->type == LogEntry::ATTACH_PART)
     {
         inserts_by_time.erase(entry);
 
@@ -563,7 +563,7 @@ int32_t ReplicatedMergeTreeQueue::pullLogsToQueue(zkutil::ZooKeeperPtr zookeeper
                     replica_path + "/queue/queue-", res.data, zkutil::CreateMode::PersistentSequential));
 
                 const auto & entry = *copied_entries.back();
-                if (entry.type == LogEntry::GET_PART)
+                if (entry.type == LogEntry::GET_PART || entry.type == LogEntry::ATTACH_PART)
                 {
                     std::lock_guard state_lock(state_mutex);
                     if (entry.create_time && (!min_unprocessed_insert_time || entry.create_time < min_unprocessed_insert_time))
@@ -871,7 +871,12 @@ ReplicatedMergeTreeQueue::StringSet ReplicatedMergeTreeQueue::moveSiblingPartsFo
             if (it0 == merge_entry)
                 break;
 
-            if (((*it0)->type == LogEntry::MERGE_PARTS || (*it0)->type == LogEntry::GET_PART || (*it0)->type == LogEntry::MUTATE_PART)
+            const auto t = (*it0)->type;
+
+            if ((t == LogEntry::MERGE_PARTS ||
+                 t == LogEntry::GET_PART  ||
+                 t == LogEntry::ATTACH_PART ||
+                 t == LogEntry::MUTATE_PART)
                 && parts_for_merge.count((*it0)->new_part_name))
             {
                 queue.splice(queue.end(), queue, it0, it);
@@ -921,7 +926,10 @@ void ReplicatedMergeTreeQueue::removePartProducingOpsInRange(
     {
         auto type = (*it)->type;
 
-        if (((type == LogEntry::GET_PART || type == LogEntry::MERGE_PARTS || type == LogEntry::MUTATE_PART)
+        if (((type == LogEntry::GET_PART ||
+              type == LogEntry::ATTACH_PART ||
+              type == LogEntry::MERGE_PARTS ||
+              type == LogEntry::MUTATE_PART)
              && part_info.contains(MergeTreePartInfo::fromPartName((*it)->new_part_name, format_version)))
             || checkReplaceRangeCanBeRemoved(part_info, *it, current))
         {
@@ -1066,6 +1074,7 @@ bool ReplicatedMergeTreeQueue::shouldExecuteLogEntry(
     /// some other entry which is currently executing, then we can postpone this entry.
     if (entry.type == LogEntry::MERGE_PARTS
         || entry.type == LogEntry::GET_PART
+        || entry.type == LogEntry::ATTACH_PART
         || entry.type == LogEntry::MUTATE_PART)
     {
         for (const String & new_part_name : entry.getBlockingPartNames())
@@ -1076,7 +1085,8 @@ bool ReplicatedMergeTreeQueue::shouldExecuteLogEntry(
     }
 
     /// Check that fetches pool is not overloaded
-    if (entry.type == LogEntry::GET_PART && !storage.canExecuteFetch(entry, out_postpone_reason))
+    if ((entry.type == LogEntry::GET_PART || entry.type == LogEntry::ATTACH_PART)
+        && !storage.canExecuteFetch(entry, out_postpone_reason))
     {
         /// Don't print log message about this, because we can have a lot of fetches,
         /// for example during replica recovery.
@@ -1643,7 +1653,7 @@ ReplicatedMergeTreeQueue::Status ReplicatedMergeTreeQueue::getStatus() const
         if (entry->create_time && (!res.queue_oldest_time || entry->create_time < res.queue_oldest_time))
             res.queue_oldest_time = entry->create_time;
 
-        if (entry->type == LogEntry::GET_PART)
+        if (entry->type == LogEntry::GET_PART || entry->type == LogEntry::ATTACH_PART)
         {
             ++res.inserts_in_queue;
 
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp
index b3cb7c92def..ca6ea3103d1 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp
@@ -47,7 +47,7 @@ ReplicatedMergeTreeRestartingThread::ReplicatedMergeTreeRestartingThread(Storage
     const auto storage_settings = storage.getSettings();
     check_period_ms = storage_settings->zookeeper_session_expiration_check_period.totalSeconds() * 1000;
 
-    task = storage.global_context.getSchedulePool().createTask(log_name, [this]{ run(); });
+    task = storage.getContext()->getSchedulePool().createTask(log_name, [this]{ run(); });
 }
 
 void ReplicatedMergeTreeRestartingThread::run()
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeTableMetadata.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeTableMetadata.cpp
index d06706f9109..de72ad1168b 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeTableMetadata.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeTableMetadata.cpp
@@ -26,7 +26,10 @@ static String formattedAST(const ASTPtr & ast)
 ReplicatedMergeTreeTableMetadata::ReplicatedMergeTreeTableMetadata(const MergeTreeData & data, const StorageMetadataPtr & metadata_snapshot)
 {
     if (data.format_version < MERGE_TREE_DATA_MIN_FORMAT_VERSION_WITH_CUSTOM_PARTITIONING)
-        date_column = data.minmax_idx_columns[data.minmax_idx_date_column_pos];
+    {
+        auto minmax_idx_column_names = data.getMinMaxColumnsNames(metadata_snapshot->getPartitionKey());
+        date_column = minmax_idx_column_names[data.minmax_idx_date_column_pos];
+    }
 
     const auto data_settings = data.getSettings();
     sampling_expression = formattedAST(metadata_snapshot->getSamplingKeyAST());
@@ -202,7 +205,7 @@ void ReplicatedMergeTreeTableMetadata::checkImmutableFieldsEquals(const Replicat
 
 }
 
-void ReplicatedMergeTreeTableMetadata::checkEquals(const ReplicatedMergeTreeTableMetadata & from_zk, const ColumnsDescription & columns, const Context & context) const
+void ReplicatedMergeTreeTableMetadata::checkEquals(const ReplicatedMergeTreeTableMetadata & from_zk, const ColumnsDescription & columns, ContextPtr context) const
 {
 
     checkImmutableFieldsEquals(from_zk);
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeTableMetadata.h b/src/Storages/MergeTree/ReplicatedMergeTreeTableMetadata.h
index c1c34637664..f398547e992 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeTableMetadata.h
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeTableMetadata.h
@@ -63,7 +63,7 @@ struct ReplicatedMergeTreeTableMetadata
         }
     };
 
-    void checkEquals(const ReplicatedMergeTreeTableMetadata & from_zk, const ColumnsDescription & columns, const Context & context) const;
+    void checkEquals(const ReplicatedMergeTreeTableMetadata & from_zk, const ColumnsDescription & columns, ContextPtr context) const;
 
     Diff checkAndFindDiff(const ReplicatedMergeTreeTableMetadata & from_zk) const;
 
diff --git a/src/Storages/MergeTree/StorageFromMergeTreeDataPart.h b/src/Storages/MergeTree/StorageFromMergeTreeDataPart.h
index 98e1880de54..9f1a28a1522 100644
--- a/src/Storages/MergeTree/StorageFromMergeTreeDataPart.h
+++ b/src/Storages/MergeTree/StorageFromMergeTreeDataPart.h
@@ -4,6 +4,8 @@
 #include <Storages/MergeTree/IMergeTreeDataPart.h>
 #include <Storages/MergeTree/MergeTreeDataSelectExecutor.h>
 #include <Processors/QueryPlan/QueryPlan.h>
+#include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
+#include <Processors/QueryPlan/BuildQueryPipelineSettings.h>
 #include <Processors/QueryPipeline.h>
 #include <Core/Defines.h>
 
@@ -24,7 +26,7 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & metadata_snapshot,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum /*processed_stage*/,
         size_t max_block_size,
         unsigned num_streams) override
@@ -33,14 +35,14 @@ public:
             std::move(*MergeTreeDataSelectExecutor(part->storage)
                       .readFromParts({part}, column_names, metadata_snapshot, query_info, context, max_block_size, num_streams));
 
-        return query_plan.convertToPipe();
+        return query_plan.convertToPipe(QueryPlanOptimizationSettings::fromContext(context), BuildQueryPipelineSettings::fromContext(context));
     }
 
 
     bool supportsIndexForIn() const override { return true; }
 
     bool mayBenefitFromIndexForIn(
-        const ASTPtr & left_in_operand, const Context & query_context, const StorageMetadataPtr & metadata_snapshot) const override
+        const ASTPtr & left_in_operand, ContextPtr query_context, const StorageMetadataPtr & metadata_snapshot) const override
     {
         return part->storage.mayBenefitFromIndexForIn(left_in_operand, query_context, metadata_snapshot);
     }
@@ -55,7 +57,7 @@ public:
         return part->info.partition_id;
     }
 
-    String getPartitionIDFromQuery(const ASTPtr & ast, const Context & context) const
+    String getPartitionIDFromQuery(const ASTPtr & ast, ContextPtr context) const
     {
         return part->storage.getPartitionIDFromQuery(ast, context);
     }
diff --git a/src/Storages/MergeTree/checkDataPart.cpp b/src/Storages/MergeTree/checkDataPart.cpp
index c9da156dc97..ac28f84db43 100644
--- a/src/Storages/MergeTree/checkDataPart.cpp
+++ b/src/Storages/MergeTree/checkDataPart.cpp
@@ -120,9 +120,15 @@ IMergeTreeDataPart::Checksums checkDataPart(
     {
         for (const auto & column : columns_list)
         {
-            column.type->enumerateStreams([&](const IDataType::SubstreamPath & substream_path, const IDataType & /* substream_type */)
+            auto serialization = IDataType::getSerialization(column,
+                [&](const String & stream_name)
+                {
+                    return disk->exists(stream_name + IMergeTreeDataPart::DATA_FILE_EXTENSION);
+                });
+
+            serialization->enumerateStreams([&](const ISerialization::SubstreamPath & substream_path)
             {
-                String file_name = IDataType::getFileNameForStream(column, substream_path) + ".bin";
+                String file_name = ISerialization::getFileNameForStream(column, substream_path) + ".bin";
                 checksums_data.files[file_name] = checksum_compressed_file(disk, path + file_name);
             }, {});
         }
diff --git a/src/Storages/MergeTree/registerStorageMergeTree.cpp b/src/Storages/MergeTree/registerStorageMergeTree.cpp
index 10ebfa5ce1d..862747abcb9 100644
--- a/src/Storages/MergeTree/registerStorageMergeTree.cpp
+++ b/src/Storages/MergeTree/registerStorageMergeTree.cpp
@@ -20,6 +20,7 @@
 #include <AggregateFunctions/parseAggregateFunctionParameters.h>
 
 #include <Interpreters/Context.h>
+#include <Interpreters/evaluateConstantExpression.h>
 
 
 namespace DB
@@ -60,6 +61,27 @@ static Names extractColumnNames(const ASTPtr & node)
     }
 }
 
+/** Is used to order Graphite::Retentions by age and precision descending.
+  * Throws exception if not both age and precision are less or greater then another.
+  */
+static bool compareRetentions(const Graphite::Retention & a, const Graphite::Retention & b)
+{
+    if (a.age > b.age && a.precision > b.precision)
+    {
+        return true;
+    }
+    else if (a.age < b.age && a.precision < b.precision)
+    {
+        return false;
+    }
+    String error_msg = "age and precision should only grow up: "
+        + std::to_string(a.age) + ":" + std::to_string(a.precision) + " vs "
+        + std::to_string(b.age) + ":" + std::to_string(b.precision);
+    throw Exception(
+        error_msg,
+        ErrorCodes::BAD_ARGUMENTS);
+}
+
 /** Read the settings for Graphite rollup from config.
   * Example
   *
@@ -157,15 +179,14 @@ appendGraphitePattern(const Poco::Util::AbstractConfiguration & config, const St
 
     /// retention should be in descending order of age.
     if (pattern.type & pattern.TypeRetention) /// TypeRetention or TypeAll
-        std::sort(pattern.retentions.begin(), pattern.retentions.end(),
-            [] (const Graphite::Retention & a, const Graphite::Retention & b) { return a.age > b.age; });
+        std::sort(pattern.retentions.begin(), pattern.retentions.end(), compareRetentions);
 
     patterns.emplace_back(pattern);
 }
 
-static void setGraphitePatternsFromConfig(const Context & context, const String & config_element, Graphite::Params & params)
+static void setGraphitePatternsFromConfig(ContextPtr context, const String & config_element, Graphite::Params & params)
 {
-    const auto & config = context.getConfigRef();
+    const auto & config = context->getConfigRef();
 
     if (!config.has(config_element))
         throw Exception("No '" + config_element + "' element in configuration file", ErrorCodes::NO_ELEMENTS_IN_CONFIG);
@@ -390,6 +411,35 @@ static StoragePtr create(const StorageFactory::Arguments & args)
         throw Exception(msg, ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
     }
 
+    if (is_extended_storage_def)
+    {
+        /// Allow expressions in engine arguments.
+        /// In new syntax argument can be literal or identifier or array/tuple of identifiers.
+        size_t arg_idx = 0;
+        try
+        {
+            for (; arg_idx < engine_args.size(); ++arg_idx)
+            {
+                auto & arg = engine_args[arg_idx];
+                auto * arg_func = arg->as<ASTFunction>();
+                if (!arg_func)
+                    continue;
+
+                /// If we got ASTFunction, let's evaluate it and replace with ASTLiteral.
+                /// Do not try evaluate array or tuple, because it's array or tuple of column identifiers.
+                if (arg_func->name == "array" || arg_func->name == "tuple")
+                    continue;
+                Field value = evaluateConstantExpression(arg, args.getLocalContext()).first;
+                arg = std::make_shared<ASTLiteral>(value);
+            }
+        }
+        catch (Exception & e)
+        {
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Cannot evaluate engine argument {}: {} {}",
+                            arg_idx, e.message(), getMergeTreeVerboseHelp(is_extended_storage_def));
+        }
+    }
+
     /// For Replicated.
     String zookeeper_path;
     String replica_name;
@@ -427,13 +477,13 @@ static StoragePtr create(const StorageFactory::Arguments & args)
                     "No replica name in config" + getMergeTreeVerboseHelp(is_extended_storage_def), ErrorCodes::NO_REPLICA_NAME_GIVEN);
             ++arg_num;
         }
-        else if (is_extended_storage_def && arg_cnt == 0)
+        else if (is_extended_storage_def && (arg_cnt == 0 || !engine_args[arg_num]->as<ASTLiteral>() || (arg_cnt == 1 && merging_params.mode == MergeTreeData::MergingParams::Graphite)))
         {
             /// Try use default values if arguments are not specified.
             /// Note: {uuid} macro works for ON CLUSTER queries when database engine is Atomic.
-            zookeeper_path = args.context.getConfigRef().getString("default_replica_path", "/clickhouse/tables/{uuid}/{shard}");
+            zookeeper_path = args.getContext()->getConfigRef().getString("default_replica_path", "/clickhouse/tables/{uuid}/{shard}");
             /// TODO maybe use hostname if {replica} is not defined?
-            replica_name = args.context.getConfigRef().getString("default_replica_name", "{replica}");
+            replica_name = args.getContext()->getConfigRef().getString("default_replica_name", "{replica}");
 
             /// Modify query, so default values will be written to metadata
             assert(arg_num == 0);
@@ -453,8 +503,8 @@ static StoragePtr create(const StorageFactory::Arguments & args)
             throw Exception("Expected two string literal arguments: zookeeper_path and replica_name", ErrorCodes::BAD_ARGUMENTS);
 
         /// Allow implicit {uuid} macros only for zookeeper_path in ON CLUSTER queries
-        bool is_on_cluster = args.local_context.getClientInfo().query_kind == ClientInfo::QueryKind::SECONDARY_QUERY;
-        bool is_replicated_database = args.local_context.getClientInfo().query_kind == ClientInfo::QueryKind::SECONDARY_QUERY &&
+        bool is_on_cluster = args.getLocalContext()->getClientInfo().query_kind == ClientInfo::QueryKind::SECONDARY_QUERY;
+        bool is_replicated_database = args.getLocalContext()->getClientInfo().query_kind == ClientInfo::QueryKind::SECONDARY_QUERY &&
                                       DatabaseCatalog::instance().getDatabase(args.table_id.database_name)->getEngineName() == "Replicated";
         bool allow_uuid_macro = is_on_cluster || is_replicated_database || args.query.attach;
 
@@ -471,11 +521,11 @@ static StoragePtr create(const StorageFactory::Arguments & args)
             info.table_id = args.table_id;
             if (!allow_uuid_macro)
                 info.table_id.uuid = UUIDHelpers::Nil;
-            zookeeper_path = args.context.getMacros()->expand(zookeeper_path, info);
+            zookeeper_path = args.getContext()->getMacros()->expand(zookeeper_path, info);
 
             info.level = 0;
             info.table_id.uuid = UUIDHelpers::Nil;
-            replica_name = args.context.getMacros()->expand(replica_name, info);
+            replica_name = args.getContext()->getMacros()->expand(replica_name, info);
         }
 
         ast_zk_path->value = zookeeper_path;
@@ -487,11 +537,11 @@ static StoragePtr create(const StorageFactory::Arguments & args)
         info.table_id = args.table_id;
         if (!allow_uuid_macro)
             info.table_id.uuid = UUIDHelpers::Nil;
-        zookeeper_path = args.context.getMacros()->expand(zookeeper_path, info);
+        zookeeper_path = args.getContext()->getMacros()->expand(zookeeper_path, info);
 
         info.level = 0;
         info.table_id.uuid = UUIDHelpers::Nil;
-        replica_name = args.context.getMacros()->expand(replica_name, info);
+        replica_name = args.getContext()->getMacros()->expand(replica_name, info);
 
         /// We do not allow renaming table with these macros in metadata, because zookeeper_path will be broken after RENAME TABLE.
         /// NOTE: it may happen if table was created by older version of ClickHouse (< 20.10) and macros was not unfolded on table creation
@@ -550,7 +600,7 @@ static StoragePtr create(const StorageFactory::Arguments & args)
             throw Exception(error_msg, ErrorCodes::BAD_ARGUMENTS);
 
         --arg_cnt;
-        setGraphitePatternsFromConfig(args.context, graphite_config_name, merging_params.graphite_params);
+        setGraphitePatternsFromConfig(args.getContext(), graphite_config_name, merging_params.graphite_params);
     }
     else if (merging_params.mode == MergeTreeData::MergingParams::VersionedCollapsing)
     {
@@ -579,9 +629,9 @@ static StoragePtr create(const StorageFactory::Arguments & args)
 
     std::unique_ptr<MergeTreeSettings> storage_settings;
     if (replicated)
-        storage_settings = std::make_unique<MergeTreeSettings>(args.context.getReplicatedMergeTreeSettings());
+        storage_settings = std::make_unique<MergeTreeSettings>(args.getContext()->getReplicatedMergeTreeSettings());
     else
-        storage_settings = std::make_unique<MergeTreeSettings>(args.context.getMergeTreeSettings());
+        storage_settings = std::make_unique<MergeTreeSettings>(args.getContext()->getMergeTreeSettings());
 
     if (is_extended_storage_def)
     {
@@ -592,7 +642,7 @@ static StoragePtr create(const StorageFactory::Arguments & args)
         /// Partition key may be undefined, but despite this we store it's empty
         /// value in partition_key structure. MergeTree checks this case and use
         /// single default partition with name "all".
-        metadata.partition_key = KeyDescription::getKeyFromAST(partition_by_key, metadata.columns, args.context);
+        metadata.partition_key = KeyDescription::getKeyFromAST(partition_by_key, metadata.columns, args.getContext());
 
         /// PRIMARY KEY without ORDER BY is allowed and considered as ORDER BY.
         if (!args.storage_def->order_by && args.storage_def->primary_key)
@@ -610,33 +660,33 @@ static StoragePtr create(const StorageFactory::Arguments & args)
         /// before storage creation. After that storage will just copy this
         /// column if sorting key will be changed.
         metadata.sorting_key = KeyDescription::getSortingKeyFromAST(
-            args.storage_def->order_by->ptr(), metadata.columns, args.context, merging_param_key_arg);
+            args.storage_def->order_by->ptr(), metadata.columns, args.getContext(), merging_param_key_arg);
 
         /// If primary key explicitly defined, than get it from AST
         if (args.storage_def->primary_key)
         {
-            metadata.primary_key = KeyDescription::getKeyFromAST(args.storage_def->primary_key->ptr(), metadata.columns, args.context);
+            metadata.primary_key = KeyDescription::getKeyFromAST(args.storage_def->primary_key->ptr(), metadata.columns, args.getContext());
         }
         else /// Otherwise we don't have explicit primary key and copy it from order by
         {
-            metadata.primary_key = KeyDescription::getKeyFromAST(args.storage_def->order_by->ptr(), metadata.columns, args.context);
+            metadata.primary_key = KeyDescription::getKeyFromAST(args.storage_def->order_by->ptr(), metadata.columns, args.getContext());
             /// and set it's definition_ast to nullptr (so isPrimaryKeyDefined()
             /// will return false but hasPrimaryKey() will return true.
             metadata.primary_key.definition_ast = nullptr;
         }
 
         if (args.storage_def->sample_by)
-            metadata.sampling_key = KeyDescription::getKeyFromAST(args.storage_def->sample_by->ptr(), metadata.columns, args.context);
+            metadata.sampling_key = KeyDescription::getKeyFromAST(args.storage_def->sample_by->ptr(), metadata.columns, args.getContext());
 
         if (args.storage_def->ttl_table)
         {
             metadata.table_ttl = TTLTableDescription::getTTLForTableFromAST(
-                args.storage_def->ttl_table->ptr(), metadata.columns, args.context, metadata.primary_key);
+                args.storage_def->ttl_table->ptr(), metadata.columns, args.getContext(), metadata.primary_key);
         }
 
         if (args.query.columns_list && args.query.columns_list->indices)
             for (auto & index : args.query.columns_list->indices->children)
-                metadata.secondary_indices.push_back(IndexDescription::getIndexFromAST(index, args.columns, args.context));
+                metadata.secondary_indices.push_back(IndexDescription::getIndexFromAST(index, args.columns, args.getContext()));
 
         if (args.query.columns_list && args.query.columns_list->constraints)
             for (auto & constraint : args.query.columns_list->constraints->children)
@@ -645,7 +695,7 @@ static StoragePtr create(const StorageFactory::Arguments & args)
         auto column_ttl_asts = args.columns.getColumnTTLs();
         for (const auto & [name, ast] : column_ttl_asts)
         {
-            auto new_ttl_entry = TTLDescription::getTTLFromAST(ast, args.columns, args.context, metadata.primary_key);
+            auto new_ttl_entry = TTLDescription::getTTLFromAST(ast, args.columns, args.getContext(), metadata.primary_key);
             metadata.column_ttls_by_name[name] = new_ttl_entry;
         }
 
@@ -654,25 +704,6 @@ static StoragePtr create(const StorageFactory::Arguments & args)
         // updates the default storage_settings with settings specified via SETTINGS arg in a query
         if (args.storage_def->settings)
             metadata.settings_changes = args.storage_def->settings->ptr();
-
-        size_t index_granularity_bytes = 0;
-        size_t min_index_granularity_bytes = 0;
-
-        index_granularity_bytes = storage_settings->index_granularity_bytes;
-        min_index_granularity_bytes = storage_settings->min_index_granularity_bytes;
-
-        /* the min_index_granularity_bytes value is 1024 b and index_granularity_bytes is 10 mb by default
-         * if index_granularity_bytes is not disabled i.e > 0 b, then always ensure that it's greater than
-         * min_index_granularity_bytes. This is mainly a safeguard against accidents whereby a really low
-         * index_granularity_bytes SETTING of 1b can create really large parts with large marks.
-        */
-        if (index_granularity_bytes > 0 && index_granularity_bytes < min_index_granularity_bytes)
-        {
-            throw Exception(
-                "index_granularity_bytes: " + std::to_string(index_granularity_bytes)
-                    + " is lesser than specified min_index_granularity_bytes: " + std::to_string(min_index_granularity_bytes),
-                ErrorCodes::BAD_ARGUMENTS);
-        }
     }
     else
     {
@@ -685,7 +716,7 @@ static StoragePtr create(const StorageFactory::Arguments & args)
 
         auto partition_by_ast = makeASTFunction("toYYYYMM", std::make_shared<ASTIdentifier>(date_column_name));
 
-        metadata.partition_key = KeyDescription::getKeyFromAST(partition_by_ast, metadata.columns, args.context);
+        metadata.partition_key = KeyDescription::getKeyFromAST(partition_by_ast, metadata.columns, args.getContext());
 
 
         ++arg_num;
@@ -693,7 +724,7 @@ static StoragePtr create(const StorageFactory::Arguments & args)
         /// If there is an expression for sampling
         if (arg_cnt - arg_num == 3)
         {
-            metadata.sampling_key = KeyDescription::getKeyFromAST(engine_args[arg_num], metadata.columns, args.context);
+            metadata.sampling_key = KeyDescription::getKeyFromAST(engine_args[arg_num], metadata.columns, args.getContext());
             ++arg_num;
         }
 
@@ -703,10 +734,10 @@ static StoragePtr create(const StorageFactory::Arguments & args)
         /// before storage creation. After that storage will just copy this
         /// column if sorting key will be changed.
         metadata.sorting_key
-            = KeyDescription::getSortingKeyFromAST(engine_args[arg_num], metadata.columns, args.context, merging_param_key_arg);
+            = KeyDescription::getSortingKeyFromAST(engine_args[arg_num], metadata.columns, args.getContext(), merging_param_key_arg);
 
         /// In old syntax primary_key always equals to sorting key.
-        metadata.primary_key = KeyDescription::getKeyFromAST(engine_args[arg_num], metadata.columns, args.context);
+        metadata.primary_key = KeyDescription::getKeyFromAST(engine_args[arg_num], metadata.columns, args.getContext());
         /// But it's not explicitly defined, so we evaluate definition to
         /// nullptr
         metadata.primary_key.definition_ast = nullptr;
@@ -746,7 +777,7 @@ static StoragePtr create(const StorageFactory::Arguments & args)
             args.table_id,
             args.relative_data_path,
             metadata,
-            args.context,
+            args.getContext(),
             date_column_name,
             merging_params,
             std::move(storage_settings),
@@ -758,7 +789,7 @@ static StoragePtr create(const StorageFactory::Arguments & args)
             args.relative_data_path,
             metadata,
             args.attach,
-            args.context,
+            args.getContext(),
             date_column_name,
             merging_params,
             std::move(storage_settings),
diff --git a/src/Storages/PartitionCommands.cpp b/src/Storages/PartitionCommands.cpp
index 76c2af17256..f09f60887e8 100644
--- a/src/Storages/PartitionCommands.cpp
+++ b/src/Storages/PartitionCommands.cpp
@@ -82,6 +82,7 @@ std::optional<PartitionCommand> PartitionCommand::parse(const ASTAlterCommand *
         res.type = FETCH_PARTITION;
         res.partition = command_ast->partition;
         res.from_zookeeper_path = command_ast->from;
+        res.part = command_ast->part;
         return res;
     }
     else if (command_ast->type == ASTAlterCommand::FREEZE_PARTITION)
@@ -94,10 +95,25 @@ std::optional<PartitionCommand> PartitionCommand::parse(const ASTAlterCommand *
     }
     else if (command_ast->type == ASTAlterCommand::FREEZE_ALL)
     {
-        PartitionCommand command;
-        command.type = PartitionCommand::FREEZE_ALL_PARTITIONS;
-        command.with_name = command_ast->with_name;
-        return command;
+        PartitionCommand res;
+        res.type = PartitionCommand::FREEZE_ALL_PARTITIONS;
+        res.with_name = command_ast->with_name;
+        return res;
+    }
+    else if (command_ast->type == ASTAlterCommand::UNFREEZE_PARTITION)
+    {
+        PartitionCommand res;
+        res.type = PartitionCommand::UNFREEZE_PARTITION;
+        res.partition = command_ast->partition;
+        res.with_name = command_ast->with_name;
+        return res;
+    }
+    else if (command_ast->type == ASTAlterCommand::UNFREEZE_ALL)
+    {
+        PartitionCommand res;
+        res.type = PartitionCommand::UNFREEZE_ALL_PARTITIONS;
+        res.with_name = command_ast->with_name;
+        return res;
     }
     else
         return {};
@@ -125,11 +141,18 @@ std::string PartitionCommand::typeToString() const
         else
             return "DROP DETACHED PARTITION";
     case PartitionCommand::Type::FETCH_PARTITION:
-        return "FETCH PARTITION";
+        if (part)
+            return "FETCH PART";
+        else
+            return "FETCH PARTITION";
     case PartitionCommand::Type::FREEZE_ALL_PARTITIONS:
         return "FREEZE ALL";
     case PartitionCommand::Type::FREEZE_PARTITION:
         return "FREEZE PARTITION";
+    case PartitionCommand::Type::UNFREEZE_PARTITION:
+        return "UNFREEZE PARTITION";
+    case PartitionCommand::Type::UNFREEZE_ALL_PARTITIONS:
+        return "UNFREEZE ALL";
     case PartitionCommand::Type::REPLACE_PARTITION:
         return "REPLACE PARTITION";
     }
diff --git a/src/Storages/PartitionCommands.h b/src/Storages/PartitionCommands.h
index e4f70305dbd..9f89d44bd4e 100644
--- a/src/Storages/PartitionCommands.h
+++ b/src/Storages/PartitionCommands.h
@@ -27,6 +27,8 @@ struct PartitionCommand
         FETCH_PARTITION,
         FREEZE_ALL_PARTITIONS,
         FREEZE_PARTITION,
+        UNFREEZE_ALL_PARTITIONS,
+        UNFREEZE_PARTITION,
         REPLACE_PARTITION,
     };
 
@@ -52,7 +54,7 @@ struct PartitionCommand
     /// For FETCH PARTITION - path in ZK to the shard, from which to download the partition.
     String from_zookeeper_path;
 
-    /// For FREEZE PARTITION
+    /// For FREEZE PARTITION and UNFREEZE
     String with_name;
 
     enum MoveDestinationType
diff --git a/src/Storages/PostgreSQL/PostgreSQLConnection.cpp b/src/Storages/PostgreSQL/PostgreSQLConnection.cpp
index 668550ec721..53cf5159c5a 100644
--- a/src/Storages/PostgreSQL/PostgreSQLConnection.cpp
+++ b/src/Storages/PostgreSQL/PostgreSQLConnection.cpp
@@ -3,36 +3,68 @@
 #endif
 
 #if USE_LIBPQXX
-#include <Storages/PostgreSQL/PostgreSQLConnection.h>
-#include <IO/WriteBufferFromString.h>
+#include "PostgreSQLConnection.h"
+#include <common/logger_useful.h>
 #include <IO/Operators.h>
 
 
-namespace DB
+namespace postgres
 {
 
-PostgreSQLConnection::ConnectionPtr PostgreSQLConnection::conn()
+Connection::Connection(
+        const String & connection_str_,
+        const String & address_)
+    : connection_str(connection_str_)
+    , address(address_)
 {
-    checkUpdateConnection();
+}
+
+
+pqxx::ConnectionPtr Connection::get()
+{
+    connectIfNeeded();
     return connection;
 }
 
-void PostgreSQLConnection::checkUpdateConnection()
+
+pqxx::ConnectionPtr Connection::tryGet()
 {
-    if (!connection || !connection->is_open())
-        connection = std::make_unique<pqxx::connection>(connection_str);
+    if (tryConnectIfNeeded())
+        return connection;
+    return nullptr;
 }
 
-std::string PostgreSQLConnection::formatConnectionString(
-    std::string dbname, std::string host, UInt16 port, std::string user, std::string password)
+
+void Connection::connectIfNeeded()
 {
-    WriteBufferFromOwnString out;
-    out << "dbname=" << quote << dbname
-        << " host=" << quote << host
-        << " port=" << port
-        << " user=" << quote << user
-        << " password=" << quote << password;
-    return out.str();
+    if (!connection || !connection->is_open())
+    {
+        LOG_DEBUG(&Poco::Logger::get("PostgreSQLConnection"), "New connection to {}", getAddress());
+        connection = std::make_shared<pqxx::connection>(connection_str);
+    }
+}
+
+
+bool Connection::tryConnectIfNeeded()
+{
+    try
+    {
+        connectIfNeeded();
+    }
+    catch (const pqxx::broken_connection & pqxx_error)
+    {
+        LOG_ERROR(
+            &Poco::Logger::get("PostgreSQLConnection"),
+            "Unable to setup connection to {}, reason: {}",
+            getAddress(), pqxx_error.what());
+        return false;
+    }
+    catch (...)
+    {
+        throw;
+    }
+
+    return true;
 }
 
 }
diff --git a/src/Storages/PostgreSQL/PostgreSQLConnection.h b/src/Storages/PostgreSQL/PostgreSQLConnection.h
index ae79a3436e0..488f45a068d 100644
--- a/src/Storages/PostgreSQL/PostgreSQLConnection.h
+++ b/src/Storages/PostgreSQL/PostgreSQLConnection.h
@@ -7,42 +7,76 @@
 #if USE_LIBPQXX
 #include <pqxx/pqxx> // Y_IGNORE
 #include <Core/Types.h>
+#include <Common/ConcurrentBoundedQueue.h>
 
 
-namespace DB
-{
-
-/// Tiny connection class to make it more convenient to use.
-/// Connection is not made until actually used.
-class PostgreSQLConnection
+namespace pqxx
 {
     using ConnectionPtr = std::shared_ptr<pqxx::connection>;
+}
+
+namespace postgres
+{
+
+class Connection
+{
 
 public:
-    PostgreSQLConnection(std::string dbname, std::string host, UInt16 port, std::string user, std::string password)
-        : connection_str(formatConnectionString(std::move(dbname), std::move(host), port, std::move(user), std::move(password))) {}
+    Connection(
+        const String & connection_str_,
+        const String & address_);
 
-    PostgreSQLConnection(const std::string & connection_str_) : connection_str(connection_str_) {}
+    Connection(const Connection & other) = delete;
 
-    PostgreSQLConnection(const PostgreSQLConnection &) = delete;
-    PostgreSQLConnection operator =(const PostgreSQLConnection &) = delete;
+    pqxx::ConnectionPtr get();
 
-    ConnectionPtr conn();
+    pqxx::ConnectionPtr tryGet();
 
-    std::string & conn_str() { return connection_str; }
+    bool isConnected() { return tryConnectIfNeeded(); }
+
+private:
+    void connectIfNeeded();
+
+    bool tryConnectIfNeeded();
+
+    const std::string & getAddress() { return address; }
+
+    pqxx::ConnectionPtr connection;
+    std::string connection_str, address;
+};
+
+using ConnectionPtr = std::shared_ptr<Connection>;
+
+
+class ConnectionHolder
+{
+
+using Pool = ConcurrentBoundedQueue<ConnectionPtr>;
+static constexpr inline auto POSTGRESQL_POOL_WAIT_MS = 50;
+
+public:
+    ConnectionHolder(ConnectionPtr connection_, Pool & pool_)
+        : connection(std::move(connection_))
+        , pool(pool_)
+    {
+    }
+
+    ConnectionHolder(const ConnectionHolder & other) = delete;
+
+    ~ConnectionHolder() { pool.tryPush(connection, POSTGRESQL_POOL_WAIT_MS); }
+
+    pqxx::connection & conn() const { return *connection->get(); }
+
+    bool isConnected() { return connection->isConnected(); }
 
 private:
     ConnectionPtr connection;
-    std::string connection_str;
-
-    static std::string formatConnectionString(
-        std::string dbname, std::string host, UInt16 port, std::string user, std::string password);
-
-    void checkUpdateConnection();
+    Pool & pool;
 };
 
-using PostgreSQLConnectionPtr = std::shared_ptr<PostgreSQLConnection>;
+using ConnectionHolderPtr = std::shared_ptr<ConnectionHolder>;
 
 }
 
+
 #endif
diff --git a/src/Storages/PostgreSQL/PostgreSQLConnectionPool.cpp b/src/Storages/PostgreSQL/PostgreSQLConnectionPool.cpp
new file mode 100644
index 00000000000..42c716dcf14
--- /dev/null
+++ b/src/Storages/PostgreSQL/PostgreSQLConnectionPool.cpp
@@ -0,0 +1,96 @@
+#if !defined(ARCADIA_BUILD)
+#include "config_core.h"
+#endif
+
+#if USE_LIBPQXX
+#include <IO/WriteBufferFromString.h>
+#include <IO/Operators.h>
+#include "PostgreSQLConnectionPool.h"
+#include "PostgreSQLConnection.h"
+#include <common/logger_useful.h>
+
+
+namespace postgres
+{
+
+ConnectionPool::ConnectionPool(
+        std::string dbname,
+        std::string host,
+        UInt16 port,
+        std::string user,
+        std::string password,
+        size_t pool_size_,
+        int64_t pool_wait_timeout_)
+        : pool(std::make_shared<Pool>(pool_size_))
+        , pool_size(pool_size_)
+        , pool_wait_timeout(pool_wait_timeout_)
+        , block_on_empty_pool(pool_wait_timeout == -1)
+{
+    LOG_INFO(
+        &Poco::Logger::get("PostgreSQLConnectionPool"),
+        "New connection pool. Size: {}, blocks on empty pool: {}",
+        pool_size, block_on_empty_pool);
+
+    address = host + ':' + std::to_string(port);
+    connection_str = formatConnectionString(std::move(dbname), std::move(host), port, std::move(user), std::move(password));
+    initialize();
+}
+
+
+ConnectionPool::ConnectionPool(const ConnectionPool & other)
+        : pool(std::make_shared<Pool>(other.pool_size))
+        , connection_str(other.connection_str)
+        , address(other.address)
+        , pool_size(other.pool_size)
+        , pool_wait_timeout(other.pool_wait_timeout)
+        , block_on_empty_pool(other.block_on_empty_pool)
+{
+    initialize();
+}
+
+
+void ConnectionPool::initialize()
+{
+    /// No connection is made, just fill pool with non-connected connection objects.
+    for (size_t i = 0; i < pool_size; ++i)
+        pool->push(std::make_shared<Connection>(connection_str, address));
+}
+
+
+std::string ConnectionPool::formatConnectionString(
+    std::string dbname, std::string host, UInt16 port, std::string user, std::string password)
+{
+    DB::WriteBufferFromOwnString out;
+    out << "dbname=" << DB::quote << dbname
+        << " host=" << DB::quote << host
+        << " port=" << port
+        << " user=" << DB::quote << user
+        << " password=" << DB::quote << password;
+    return out.str();
+}
+
+
+ConnectionHolderPtr ConnectionPool::get()
+{
+    ConnectionPtr connection;
+
+    /// Always blocks by default.
+    if (block_on_empty_pool)
+    {
+        /// pop to ConcurrentBoundedQueue will block until it is non-empty.
+        pool->pop(connection);
+        return std::make_shared<ConnectionHolder>(connection, *pool);
+    }
+
+    if (pool->tryPop(connection, pool_wait_timeout))
+    {
+        return std::make_shared<ConnectionHolder>(connection, *pool);
+    }
+
+    connection = std::make_shared<Connection>(connection_str, address);
+    return std::make_shared<ConnectionHolder>(connection, *pool);
+}
+
+}
+
+#endif
diff --git a/src/Storages/PostgreSQL/PostgreSQLConnectionPool.h b/src/Storages/PostgreSQL/PostgreSQLConnectionPool.h
new file mode 100644
index 00000000000..f1239fc78b5
--- /dev/null
+++ b/src/Storages/PostgreSQL/PostgreSQLConnectionPool.h
@@ -0,0 +1,64 @@
+#pragma once
+
+#if !defined(ARCADIA_BUILD)
+#include "config_core.h"
+#endif
+
+#if USE_LIBPQXX
+#include "PostgreSQLConnection.h"
+
+
+namespace postgres
+{
+
+class PoolWithFailover;
+
+/// Connection pool size is defined by user with setting `postgresql_connection_pool_size` (default 16).
+/// If pool is empty, it will block until there are available connections.
+/// If setting `connection_pool_wait_timeout` is defined, it will not block on empty pool and will
+/// wait until the timeout and then create a new connection. (only for storage/db engine)
+class ConnectionPool
+{
+
+friend class PoolWithFailover;
+
+static constexpr inline auto POSTGRESQL_POOL_DEFAULT_SIZE = 16;
+
+public:
+
+    ConnectionPool(
+        std::string dbname,
+        std::string host,
+        UInt16 port,
+        std::string user,
+        std::string password,
+        size_t pool_size_ = POSTGRESQL_POOL_DEFAULT_SIZE,
+        int64_t pool_wait_timeout_ = -1);
+
+    ConnectionPool(const ConnectionPool & other);
+
+    ConnectionPool operator =(const ConnectionPool &) = delete;
+
+    ConnectionHolderPtr get();
+
+private:
+    using Pool = ConcurrentBoundedQueue<ConnectionPtr>;
+    using PoolPtr = std::shared_ptr<Pool>;
+
+    static std::string formatConnectionString(
+        std::string dbname, std::string host, UInt16 port, std::string user, std::string password);
+
+    void initialize();
+
+    PoolPtr pool;
+    std::string connection_str, address;
+    size_t pool_size;
+    int64_t pool_wait_timeout;
+    bool block_on_empty_pool;
+};
+
+using ConnectionPoolPtr = std::shared_ptr<ConnectionPool>;
+
+}
+
+#endif
diff --git a/src/Storages/PostgreSQL/PostgreSQLPoolWithFailover.cpp b/src/Storages/PostgreSQL/PostgreSQLPoolWithFailover.cpp
new file mode 100644
index 00000000000..6230bb4bc3b
--- /dev/null
+++ b/src/Storages/PostgreSQL/PostgreSQLPoolWithFailover.cpp
@@ -0,0 +1,110 @@
+#include "PostgreSQLPoolWithFailover.h"
+#include "PostgreSQLConnection.h"
+#include <Common/parseRemoteDescription.h>
+#include <Common/Exception.h>
+#include <common/logger_useful.h>
+
+
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int POSTGRESQL_CONNECTION_FAILURE;
+}
+}
+
+namespace postgres
+{
+
+PoolWithFailover::PoolWithFailover(
+        const Poco::Util::AbstractConfiguration & config,
+        const std::string & config_prefix,
+        const size_t max_tries_)
+        : max_tries(max_tries_)
+{
+    auto db = config.getString(config_prefix + ".db", "");
+    auto host = config.getString(config_prefix + ".host", "");
+    auto port = config.getUInt(config_prefix + ".port", 0);
+    auto user = config.getString(config_prefix + ".user", "");
+    auto password = config.getString(config_prefix + ".password", "");
+
+    if (config.has(config_prefix + ".replica"))
+    {
+        Poco::Util::AbstractConfiguration::Keys config_keys;
+        config.keys(config_prefix, config_keys);
+
+        for (const auto & config_key : config_keys)
+        {
+            if (config_key.starts_with("replica"))
+            {
+                std::string replica_name = config_prefix + "." + config_key;
+                size_t priority = config.getInt(replica_name + ".priority", 0);
+
+                auto replica_host = config.getString(replica_name + ".host", host);
+                auto replica_port = config.getUInt(replica_name + ".port", port);
+                auto replica_user = config.getString(replica_name + ".user", user);
+                auto replica_password = config.getString(replica_name + ".password", password);
+
+                replicas_with_priority[priority].emplace_back(std::make_shared<ConnectionPool>(db, replica_host, replica_port, replica_user, replica_password));
+            }
+        }
+    }
+    else
+    {
+        replicas_with_priority[0].emplace_back(std::make_shared<ConnectionPool>(db, host, port, user, password));
+    }
+}
+
+
+PoolWithFailover::PoolWithFailover(
+        const std::string & database,
+        const RemoteDescription & addresses,
+        const std::string & user,
+        const std::string & password,
+        size_t pool_size,
+        int64_t pool_wait_timeout,
+        size_t max_tries_)
+    : max_tries(max_tries_)
+{
+    /// Replicas have the same priority, but traversed replicas are moved to the end of the queue.
+    for (const auto & [host, port] : addresses)
+    {
+        LOG_DEBUG(&Poco::Logger::get("PostgreSQLPoolWithFailover"), "Adding address host: {}, port: {} to connection pool", host, port);
+        replicas_with_priority[0].emplace_back(std::make_shared<ConnectionPool>(database, host, port, user, password, pool_size, pool_wait_timeout));
+    }
+}
+
+
+PoolWithFailover::PoolWithFailover(const PoolWithFailover & other)
+        : replicas_with_priority(other.replicas_with_priority)
+        , max_tries(other.max_tries)
+{
+}
+
+
+ConnectionHolderPtr PoolWithFailover::get()
+{
+    std::lock_guard lock(mutex);
+
+    for (size_t try_idx = 0; try_idx < max_tries; ++try_idx)
+    {
+        for (auto & priority : replicas_with_priority)
+        {
+            auto & replicas = priority.second;
+            for (size_t i = 0; i < replicas.size(); ++i)
+            {
+                auto connection = replicas[i]->get();
+                if (connection->isConnected())
+                {
+                    /// Move all traversed replicas to the end.
+                    std::rotate(replicas.begin(), replicas.begin() + i + 1, replicas.end());
+                    return connection;
+                }
+            }
+        }
+    }
+
+    throw DB::Exception(DB::ErrorCodes::POSTGRESQL_CONNECTION_FAILURE, "Unable to connect to any of the replicas");
+}
+
+}
diff --git a/src/Storages/PostgreSQL/PostgreSQLPoolWithFailover.h b/src/Storages/PostgreSQL/PostgreSQLPoolWithFailover.h
new file mode 100644
index 00000000000..8f6027c2c0d
--- /dev/null
+++ b/src/Storages/PostgreSQL/PostgreSQLPoolWithFailover.h
@@ -0,0 +1,51 @@
+#pragma once
+
+#include <Core/Types.h>
+#include <Poco/Util/AbstractConfiguration.h>
+#include "PostgreSQLConnectionPool.h"
+
+
+namespace postgres
+{
+
+class PoolWithFailover
+{
+
+using RemoteDescription = std::vector<std::pair<String, uint16_t>>;
+
+public:
+    static constexpr inline auto POSTGRESQL_POOL_WITH_FAILOVER_DEFAULT_MAX_TRIES = 5;
+    static constexpr inline auto POSTGRESQL_POOL_DEFAULT_SIZE = 16;
+
+    PoolWithFailover(
+        const Poco::Util::AbstractConfiguration & config,
+        const std::string & config_prefix,
+        const size_t max_tries_ = POSTGRESQL_POOL_WITH_FAILOVER_DEFAULT_MAX_TRIES);
+
+    PoolWithFailover(
+        const std::string & database,
+        const RemoteDescription & addresses,
+        const std::string & user,
+        const std::string & password,
+        size_t pool_size = POSTGRESQL_POOL_DEFAULT_SIZE,
+        int64_t pool_wait_timeout = -1,
+        size_t max_tries_ = POSTGRESQL_POOL_WITH_FAILOVER_DEFAULT_MAX_TRIES);
+
+    PoolWithFailover(const PoolWithFailover & other);
+
+    ConnectionHolderPtr get();
+
+
+private:
+    /// Highest priority is 0, the bigger the number in map, the less the priority
+    using Replicas = std::vector<ConnectionPoolPtr>;
+    using ReplicasWithPriority = std::map<size_t, Replicas>;
+
+    ReplicasWithPriority replicas_with_priority;
+    size_t max_tries;
+    std::mutex mutex;
+};
+
+using PoolWithFailoverPtr = std::shared_ptr<PoolWithFailover>;
+
+}
diff --git a/src/Storages/PostgreSQL/PostgreSQLReplicaConnection.h b/src/Storages/PostgreSQL/PostgreSQLReplicaConnection.h
new file mode 100644
index 00000000000..1ed442873a2
--- /dev/null
+++ b/src/Storages/PostgreSQL/PostgreSQLReplicaConnection.h
@@ -0,0 +1,39 @@
+#pragma once
+
+#include <Core/Types.h>
+#include <Poco/Util/AbstractConfiguration.h>
+#include "PostgreSQLConnectionPool.h"
+#include <mutex>
+
+
+namespace DB
+{
+
+class PostgreSQLReplicaConnection
+{
+
+public:
+    static constexpr inline auto POSTGRESQL_CONNECTION_DEFAULT_RETRIES_NUM = 5;
+
+    PostgreSQLReplicaConnection(
+        const Poco::Util::AbstractConfiguration & config,
+        const String & config_prefix,
+        const size_t num_retries_ = POSTGRESQL_CONNECTION_DEFAULT_RETRIES_NUM);
+
+    PostgreSQLReplicaConnection(const PostgreSQLReplicaConnection & other);
+
+    PostgreSQLConnectionHolderPtr get();
+
+
+private:
+    /// Highest priority is 0, the bigger the number in map, the less the priority
+    using ReplicasByPriority = std::map<size_t, PostgreSQLConnectionPoolPtr>;
+
+    ReplicasByPriority replicas;
+    size_t num_retries;
+    std::mutex mutex;
+};
+
+using PostgreSQLReplicaConnectionPtr = std::shared_ptr<PostgreSQLReplicaConnection>;
+
+}
diff --git a/src/Storages/RabbitMQ/RabbitMQBlockInputStream.cpp b/src/Storages/RabbitMQ/RabbitMQBlockInputStream.cpp
index c5c43440228..6c3d3a53c21 100644
--- a/src/Storages/RabbitMQ/RabbitMQBlockInputStream.cpp
+++ b/src/Storages/RabbitMQ/RabbitMQBlockInputStream.cpp
@@ -16,7 +16,7 @@ namespace DB
 RabbitMQBlockInputStream::RabbitMQBlockInputStream(
     StorageRabbitMQ & storage_,
     const StorageMetadataPtr & metadata_snapshot_,
-    std::shared_ptr<Context> context_,
+    ContextPtr context_,
     const Names & columns,
     size_t max_block_size_,
     bool ack_in_suffix_)
@@ -91,7 +91,7 @@ Block RabbitMQBlockInputStream::readImpl()
     MutableColumns virtual_columns = virtual_header.cloneEmptyColumns();
 
     auto input_format = FormatFactory::instance().getInputFormat(
-            storage.getFormatName(), *buffer, non_virtual_header, *context, max_block_size);
+            storage.getFormatName(), *buffer, non_virtual_header, context, max_block_size);
 
     InputPort port(input_format->getPort().getHeader(), input_format.get());
     connect(input_format->getPort(), port);
diff --git a/src/Storages/RabbitMQ/RabbitMQBlockInputStream.h b/src/Storages/RabbitMQ/RabbitMQBlockInputStream.h
index 8b93ca4e911..5ce1c96bf33 100644
--- a/src/Storages/RabbitMQ/RabbitMQBlockInputStream.h
+++ b/src/Storages/RabbitMQ/RabbitMQBlockInputStream.h
@@ -15,7 +15,7 @@ public:
     RabbitMQBlockInputStream(
             StorageRabbitMQ & storage_,
             const StorageMetadataPtr & metadata_snapshot_,
-            std::shared_ptr<Context> context_,
+            ContextPtr context_,
             const Names & columns,
             size_t max_block_size_,
             bool ack_in_suffix = true);
@@ -38,7 +38,7 @@ public:
 private:
     StorageRabbitMQ & storage;
     StorageMetadataPtr metadata_snapshot;
-    std::shared_ptr<Context> context;
+    ContextPtr context;
     Names column_names;
     const size_t max_block_size;
     bool ack_in_suffix;
diff --git a/src/Storages/RabbitMQ/RabbitMQBlockOutputStream.cpp b/src/Storages/RabbitMQ/RabbitMQBlockOutputStream.cpp
index a987fff3c64..3c837cb95b1 100644
--- a/src/Storages/RabbitMQ/RabbitMQBlockOutputStream.cpp
+++ b/src/Storages/RabbitMQ/RabbitMQBlockOutputStream.cpp
@@ -11,7 +11,7 @@ namespace DB
 RabbitMQBlockOutputStream::RabbitMQBlockOutputStream(
     StorageRabbitMQ & storage_,
     const StorageMetadataPtr & metadata_snapshot_,
-    const Context & context_)
+    ContextPtr context_)
     : storage(storage_)
     , metadata_snapshot(metadata_snapshot_)
     , context(context_)
diff --git a/src/Storages/RabbitMQ/RabbitMQBlockOutputStream.h b/src/Storages/RabbitMQ/RabbitMQBlockOutputStream.h
index 7e5c22f9f39..3941875ea86 100644
--- a/src/Storages/RabbitMQ/RabbitMQBlockOutputStream.h
+++ b/src/Storages/RabbitMQ/RabbitMQBlockOutputStream.h
@@ -11,7 +11,7 @@ class RabbitMQBlockOutputStream : public IBlockOutputStream
 {
 
 public:
-    explicit RabbitMQBlockOutputStream(StorageRabbitMQ & storage_, const StorageMetadataPtr & metadata_snapshot_, const Context & context_);
+    explicit RabbitMQBlockOutputStream(StorageRabbitMQ & storage_, const StorageMetadataPtr & metadata_snapshot_, ContextPtr context_);
 
     Block getHeader() const override;
 
@@ -22,7 +22,7 @@ public:
 private:
     StorageRabbitMQ & storage;
     StorageMetadataPtr metadata_snapshot;
-    const Context & context;
+    ContextPtr context;
     ProducerBufferPtr buffer;
     BlockOutputStreamPtr child;
 };
diff --git a/src/Storages/RabbitMQ/StorageRabbitMQ.cpp b/src/Storages/RabbitMQ/StorageRabbitMQ.cpp
index 48305ab1b61..55629f2a205 100644
--- a/src/Storages/RabbitMQ/StorageRabbitMQ.cpp
+++ b/src/Storages/RabbitMQ/StorageRabbitMQ.cpp
@@ -70,56 +70,54 @@ namespace ExchangeType
 
 StorageRabbitMQ::StorageRabbitMQ(
         const StorageID & table_id_,
-        const Context & context_,
+        ContextPtr context_,
         const ColumnsDescription & columns_,
         std::unique_ptr<RabbitMQSettings> rabbitmq_settings_)
         : IStorage(table_id_)
-        , global_context(context_.getGlobalContext())
+        , WithContext(context_->getGlobalContext())
         , rabbitmq_settings(std::move(rabbitmq_settings_))
-        , exchange_name(global_context.getMacros()->expand(rabbitmq_settings->rabbitmq_exchange_name.value))
-        , format_name(global_context.getMacros()->expand(rabbitmq_settings->rabbitmq_format.value))
-        , exchange_type(defineExchangeType(global_context.getMacros()->expand(rabbitmq_settings->rabbitmq_exchange_type.value)))
-        , routing_keys(parseRoutingKeys(global_context.getMacros()->expand(rabbitmq_settings->rabbitmq_routing_key_list.value)))
+        , exchange_name(getContext()->getMacros()->expand(rabbitmq_settings->rabbitmq_exchange_name.value))
+        , format_name(getContext()->getMacros()->expand(rabbitmq_settings->rabbitmq_format.value))
+        , exchange_type(defineExchangeType(getContext()->getMacros()->expand(rabbitmq_settings->rabbitmq_exchange_type.value)))
+        , routing_keys(parseRoutingKeys(getContext()->getMacros()->expand(rabbitmq_settings->rabbitmq_routing_key_list.value)))
         , row_delimiter(rabbitmq_settings->rabbitmq_row_delimiter.value)
-        , schema_name(global_context.getMacros()->expand(rabbitmq_settings->rabbitmq_schema.value))
+        , schema_name(getContext()->getMacros()->expand(rabbitmq_settings->rabbitmq_schema.value))
         , num_consumers(rabbitmq_settings->rabbitmq_num_consumers.value)
         , num_queues(rabbitmq_settings->rabbitmq_num_queues.value)
-        , queue_base(global_context.getMacros()->expand(rabbitmq_settings->rabbitmq_queue_base.value))
-        , deadletter_exchange(global_context.getMacros()->expand(rabbitmq_settings->rabbitmq_deadletter_exchange.value))
+        , queue_base(getContext()->getMacros()->expand(rabbitmq_settings->rabbitmq_queue_base.value))
+        , deadletter_exchange(getContext()->getMacros()->expand(rabbitmq_settings->rabbitmq_deadletter_exchange.value))
         , persistent(rabbitmq_settings->rabbitmq_persistent.value)
         , hash_exchange(num_consumers > 1 || num_queues > 1)
         , log(&Poco::Logger::get("StorageRabbitMQ (" + table_id_.table_name + ")"))
-        , address(global_context.getMacros()->expand(rabbitmq_settings->rabbitmq_host_port.value))
+        , address(getContext()->getMacros()->expand(rabbitmq_settings->rabbitmq_host_port.value))
         , parsed_address(parseAddress(address, 5672))
         , login_password(std::make_pair(
-                    global_context.getConfigRef().getString("rabbitmq.username"),
-                    global_context.getConfigRef().getString("rabbitmq.password")))
-        , vhost(global_context.getConfigRef().getString("rabbitmq.vhost", "/"))
+                    getContext()->getConfigRef().getString("rabbitmq.username"),
+                    getContext()->getConfigRef().getString("rabbitmq.password")))
+        , vhost(getContext()->getConfigRef().getString("rabbitmq.vhost", "/"))
         , semaphore(0, num_consumers)
         , unique_strbase(getRandomName())
         , queue_size(std::max(QUEUE_SIZE, static_cast<uint32_t>(getMaxBlockSize())))
 {
-    loop = std::make_unique<uv_loop_t>();
-    uv_loop_init(loop.get());
-    event_handler = std::make_shared<RabbitMQHandler>(loop.get(), log);
+    event_handler = std::make_shared<RabbitMQHandler>(loop.getLoop(), log);
     restoreConnection(false);
 
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(columns_);
     setInMemoryMetadata(storage_metadata);
 
-    rabbitmq_context = addSettings(global_context);
+    rabbitmq_context = addSettings(getContext());
     rabbitmq_context->makeQueryContext();
 
     /// One looping task for all consumers as they share the same connection == the same handler == the same event loop
     event_handler->updateLoopState(Loop::STOP);
-    looping_task = global_context.getMessageBrokerSchedulePool().createTask("RabbitMQLoopingTask", [this]{ loopingFunc(); });
+    looping_task = getContext()->getMessageBrokerSchedulePool().createTask("RabbitMQLoopingTask", [this]{ loopingFunc(); });
     looping_task->deactivate();
 
-    streaming_task = global_context.getMessageBrokerSchedulePool().createTask("RabbitMQStreamingTask", [this]{ streamingToViewsFunc(); });
+    streaming_task = getContext()->getMessageBrokerSchedulePool().createTask("RabbitMQStreamingTask", [this]{ streamingToViewsFunc(); });
     streaming_task->deactivate();
 
-    connection_task = global_context.getMessageBrokerSchedulePool().createTask("RabbitMQConnectionTask", [this]{ connectionFunc(); });
+    connection_task = getContext()->getMessageBrokerSchedulePool().createTask("RabbitMQConnectionTask", [this]{ connectionFunc(); });
     connection_task->deactivate();
 
     if (queue_base.empty())
@@ -190,9 +188,9 @@ String StorageRabbitMQ::getTableBasedName(String name, const StorageID & table_i
 }
 
 
-std::shared_ptr<Context> StorageRabbitMQ::addSettings(const Context & context) const
+std::shared_ptr<Context> StorageRabbitMQ::addSettings(ContextPtr local_context) const
 {
-    auto modified_context = std::make_shared<Context>(context);
+    auto modified_context = Context::createCopy(local_context);
     modified_context->setSetting("input_format_skip_unknown_fields", true);
     modified_context->setSetting("input_format_allow_errors_ratio", 0.);
     modified_context->setSetting("input_format_allow_errors_num", rabbitmq_settings->rabbitmq_skip_broken_messages.value);
@@ -255,7 +253,7 @@ size_t StorageRabbitMQ::getMaxBlockSize() const
  {
      return rabbitmq_settings->rabbitmq_max_block_size.changed
          ? rabbitmq_settings->rabbitmq_max_block_size.value
-         : (global_context.getSettingsRef().max_insert_block_size.value / num_consumers);
+         : (getContext()->getSettingsRef().max_insert_block_size.value / num_consumers);
  }
 
 
@@ -482,7 +480,7 @@ bool StorageRabbitMQ::restoreConnection(bool reconnecting)
         /* Connection is not closed immediately (firstly, all pending operations are completed, and then
          * an AMQP closing-handshake is  performed). But cannot open a new connection until previous one is properly closed
          */
-        while (!connection->closed() && ++cnt_retries != RETRIES_MAX)
+        while (!connection->closed() && cnt_retries++ != RETRIES_MAX)
             event_handler->iterateLoop();
 
         /// This will force immediate closure if not yet closed
@@ -498,7 +496,7 @@ bool StorageRabbitMQ::restoreConnection(bool reconnecting)
                 AMQP::Login(login_password.first, login_password.second), vhost));
 
     cnt_retries = 0;
-    while (!connection->ready() && !stream_cancelled && ++cnt_retries != RETRIES_MAX)
+    while (!connection->ready() && !stream_cancelled && cnt_retries++ != RETRIES_MAX)
     {
         event_handler->iterateLoop();
         std::this_thread::sleep_for(std::chrono::milliseconds(CONNECT_SLEEP));
@@ -564,7 +562,7 @@ Pipe StorageRabbitMQ::read(
         const Names & column_names,
         const StorageMetadataPtr & metadata_snapshot,
         SelectQueryInfo & /* query_info */,
-        const Context & context,
+        ContextPtr local_context,
         QueryProcessingStage::Enum /* processed_stage */,
         size_t /* max_block_size */,
         unsigned /* num_streams */)
@@ -576,7 +574,7 @@ Pipe StorageRabbitMQ::read(
         return {};
 
     auto sample_block = metadata_snapshot->getSampleBlockForColumns(column_names, getVirtuals(), getStorageID());
-    auto modified_context = addSettings(context);
+    auto modified_context = addSettings(local_context);
     auto block_size = getMaxBlockSize();
 
     if (!event_handler->connectionRunning())
@@ -609,9 +607,9 @@ Pipe StorageRabbitMQ::read(
 }
 
 
-BlockOutputStreamPtr StorageRabbitMQ::write(const ASTPtr &, const StorageMetadataPtr & metadata_snapshot, const Context & context)
+BlockOutputStreamPtr StorageRabbitMQ::write(const ASTPtr &, const StorageMetadataPtr & metadata_snapshot, ContextPtr local_context)
 {
-    return std::make_shared<RabbitMQBlockOutputStream>(*this, metadata_snapshot, context);
+    return std::make_shared<RabbitMQBlockOutputStream>(*this, metadata_snapshot, local_context);
 }
 
 
@@ -653,7 +651,7 @@ void StorageRabbitMQ::shutdown()
     connection->close();
 
     size_t cnt_retries = 0;
-    while (!connection->closed() && ++cnt_retries != RETRIES_MAX)
+    while (!connection->closed() && cnt_retries++ != RETRIES_MAX)
         event_handler->iterateLoop();
 
     /// Should actually force closure, if not yet closed, but it generates distracting error logs
@@ -714,7 +712,7 @@ ConsumerBufferPtr StorageRabbitMQ::createReadBuffer()
 ProducerBufferPtr StorageRabbitMQ::createWriteBuffer()
 {
     return std::make_shared<WriteBufferToRabbitMQProducer>(
-        parsed_address, global_context, login_password, vhost, routing_keys, exchange_name, exchange_type,
+        parsed_address, getContext(), login_password, vhost, routing_keys, exchange_name, exchange_type,
         producer_id.fetch_add(1), persistent, wait_confirm, log,
         row_delimiter ? std::optional<char>{row_delimiter} : std::nullopt, 1, 1024);
 }
@@ -730,7 +728,7 @@ bool StorageRabbitMQ::checkDependencies(const StorageID & table_id)
     // Check the dependencies are ready?
     for (const auto & db_tab : dependencies)
     {
-        auto table = DatabaseCatalog::instance().tryGetTable(db_tab, global_context);
+        auto table = DatabaseCatalog::instance().tryGetTable(db_tab, getContext());
         if (!table)
             return false;
 
@@ -800,7 +798,7 @@ void StorageRabbitMQ::streamingToViewsFunc()
 bool StorageRabbitMQ::streamToViews()
 {
     auto table_id = getStorageID();
-    auto table = DatabaseCatalog::instance().getTable(table_id, global_context);
+    auto table = DatabaseCatalog::instance().getTable(table_id, getContext());
     if (!table)
         throw Exception("Engine table " + table_id.getNameForLogs() + " doesn't exist.", ErrorCodes::LOGICAL_ERROR);
 
@@ -809,7 +807,7 @@ bool StorageRabbitMQ::streamToViews()
     insert->table_id = table_id;
 
     // Only insert into dependent views and expect that input blocks contain virtual columns
-    InterpreterInsertQuery interpreter(insert, *rabbitmq_context, false, true, true);
+    InterpreterInsertQuery interpreter(insert, rabbitmq_context, false, true, true);
     auto block_io = interpreter.execute();
 
     auto metadata_snapshot = getInMemoryMetadataPtr();
@@ -833,7 +831,7 @@ bool StorageRabbitMQ::streamToViews()
 
         limits.speed_limits.max_execution_time = rabbitmq_settings->rabbitmq_flush_interval_ms.changed
                                                   ? rabbitmq_settings->rabbitmq_flush_interval_ms
-                                                  : global_context.getSettingsRef().stream_flush_interval_ms;
+                                                  : getContext()->getSettingsRef().stream_flush_interval_ms;
 
         limits.timeout_overflow_mode = OverflowMode::BREAK;
 
@@ -992,7 +990,7 @@ void registerStorageRabbitMQ(StorageFactory & factory)
 
         #undef CHECK_RABBITMQ_STORAGE_ARGUMENT
 
-        return StorageRabbitMQ::create(args.table_id, args.context, args.columns, std::move(rabbitmq_settings));
+        return StorageRabbitMQ::create(args.table_id, args.getContext(), args.columns, std::move(rabbitmq_settings));
     };
 
     factory.registerStorage("RabbitMQ", creator_fn, StorageFactory::StorageFeatures{ .supports_settings = true, });
diff --git a/src/Storages/RabbitMQ/StorageRabbitMQ.h b/src/Storages/RabbitMQ/StorageRabbitMQ.h
index aa316e7a842..eeda6b9fdca 100644
--- a/src/Storages/RabbitMQ/StorageRabbitMQ.h
+++ b/src/Storages/RabbitMQ/StorageRabbitMQ.h
@@ -9,6 +9,7 @@
 #include <Storages/RabbitMQ/Buffer_fwd.h>
 #include <Storages/RabbitMQ/RabbitMQHandler.h>
 #include <Storages/RabbitMQ/RabbitMQSettings.h>
+#include <Storages/RabbitMQ/UVLoop.h>
 #include <Common/thread_local_rng.h>
 #include <amqpcpp/libuv.h>
 #include <uv.h>
@@ -18,11 +19,9 @@
 namespace DB
 {
 
-class Context;
-
 using ChannelPtr = std::shared_ptr<AMQP::TcpChannel>;
 
-class StorageRabbitMQ final: public ext::shared_ptr_helper<StorageRabbitMQ>, public IStorage
+class StorageRabbitMQ final: public ext::shared_ptr_helper<StorageRabbitMQ>, public IStorage, WithContext
 {
     friend struct ext::shared_ptr_helper<StorageRabbitMQ>;
 
@@ -39,7 +38,7 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & metadata_snapshot,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
@@ -47,7 +46,7 @@ public:
     BlockOutputStreamPtr write(
         const ASTPtr & query,
         const StorageMetadataPtr & metadata_snapshot,
-        const Context & context) override;
+        ContextPtr context) override;
 
     void pushReadBuffer(ConsumerBufferPtr buf);
     ConsumerBufferPtr popReadBuffer();
@@ -58,7 +57,7 @@ public:
     const String & getFormatName() const { return format_name; }
     NamesAndTypesList getVirtuals() const override;
 
-    const String getExchange() const { return exchange_name; }
+    String getExchange() const { return exchange_name; }
     void unbindExchange();
     bool exchangeRemoved() { return exchange_removed.load(); }
 
@@ -68,13 +67,12 @@ public:
 protected:
     StorageRabbitMQ(
             const StorageID & table_id_,
-            const Context & context_,
+            ContextPtr context_,
             const ColumnsDescription & columns_,
             std::unique_ptr<RabbitMQSettings> rabbitmq_settings_);
 
 private:
-    const Context & global_context;
-    std::shared_ptr<Context> rabbitmq_context;
+    ContextPtr rabbitmq_context;
     std::unique_ptr<RabbitMQSettings> rabbitmq_settings;
 
     const String exchange_name;
@@ -96,7 +94,7 @@ private:
     std::pair<String, String> login_password;
     String vhost;
 
-    std::unique_ptr<uv_loop_t> loop;
+    UVLoop loop;
     std::shared_ptr<RabbitMQHandler> event_handler;
     std::unique_ptr<AMQP::TcpConnection> connection; /// Connection for all consumers
 
@@ -138,7 +136,7 @@ private:
     static AMQP::ExchangeType defineExchangeType(String exchange_type_);
     static String getTableBasedName(String name, const StorageID & table_id);
 
-    std::shared_ptr<Context> addSettings(const Context & context) const;
+    std::shared_ptr<Context> addSettings(ContextPtr context) const;
     size_t getMaxBlockSize() const;
     void deactivateTask(BackgroundSchedulePool::TaskHolder & task, bool wait, bool stop_loop);
 
diff --git a/src/Storages/RabbitMQ/UVLoop.h b/src/Storages/RabbitMQ/UVLoop.h
new file mode 100644
index 00000000000..4de67cbc206
--- /dev/null
+++ b/src/Storages/RabbitMQ/UVLoop.h
@@ -0,0 +1,44 @@
+#pragma once
+
+#include <memory>
+
+#include <boost/noncopyable.hpp>
+#include <uv.h>
+
+#include <Common/Exception.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int SYSTEM_ERROR;
+}
+
+/// RAII wrapper around uv event loop
+class UVLoop : public boost::noncopyable
+{
+public:
+    UVLoop(): loop_ptr(new uv_loop_t())
+    {
+        int res = uv_loop_init(loop_ptr.get());
+
+        if (res != 0)
+            throw Exception("UVLoop could not initialize", ErrorCodes::SYSTEM_ERROR);
+    }
+
+    ~UVLoop()
+    {
+        if (loop_ptr)
+            uv_loop_close(loop_ptr.get());
+    }
+
+    inline uv_loop_t * getLoop() { return loop_ptr.get(); }
+
+    inline const uv_loop_t * getLoop() const { return loop_ptr.get(); }
+
+private:
+    std::unique_ptr<uv_loop_t> loop_ptr;
+};
+
+}
diff --git a/src/Storages/RabbitMQ/WriteBufferToRabbitMQProducer.cpp b/src/Storages/RabbitMQ/WriteBufferToRabbitMQProducer.cpp
index ac1b253b4bb..b9af60eb66f 100644
--- a/src/Storages/RabbitMQ/WriteBufferToRabbitMQProducer.cpp
+++ b/src/Storages/RabbitMQ/WriteBufferToRabbitMQProducer.cpp
@@ -27,7 +27,7 @@ namespace ErrorCodes
 
 WriteBufferToRabbitMQProducer::WriteBufferToRabbitMQProducer(
         std::pair<String, UInt16> & parsed_address_,
-        const Context & global_context,
+        ContextPtr global_context,
         const std::pair<String, String> & login_password_,
         const String & vhost_,
         const Names & routing_keys_,
@@ -57,9 +57,7 @@ WriteBufferToRabbitMQProducer::WriteBufferToRabbitMQProducer(
         , max_rows(rows_per_message)
         , chunk_size(chunk_size_)
 {
-    loop = std::make_unique<uv_loop_t>();
-    uv_loop_init(loop.get());
-    event_handler = std::make_unique<RabbitMQHandler>(loop.get(), log);
+    event_handler = std::make_unique<RabbitMQHandler>(loop.getLoop(), log);
 
     if (setupConnection(false))
     {
@@ -74,7 +72,7 @@ WriteBufferToRabbitMQProducer::WriteBufferToRabbitMQProducer(
                 ErrorCodes::CANNOT_CONNECT_RABBITMQ);
     }
 
-    writing_task = global_context.getSchedulePool().createTask("RabbitMQWritingTask", [this]{ writingFunc(); });
+    writing_task = global_context->getSchedulePool().createTask("RabbitMQWritingTask", [this]{ writingFunc(); });
     writing_task->deactivate();
 
     if (exchange_type == AMQP::ExchangeType::headers)
@@ -97,7 +95,7 @@ WriteBufferToRabbitMQProducer::~WriteBufferToRabbitMQProducer()
     connection->close();
 
     size_t cnt_retries = 0;
-    while (!connection->closed() && ++cnt_retries != RETRIES_MAX)
+    while (!connection->closed() && cnt_retries++ != RETRIES_MAX)
     {
         event_handler->iterateLoop();
         std::this_thread::sleep_for(std::chrono::milliseconds(CONNECT_SLEEP));
@@ -189,11 +187,12 @@ void WriteBufferToRabbitMQProducer::setupChannel()
         /// Delivery tags are scoped per channel.
         delivery_record.clear();
         delivery_tag = 0;
+        producer_ready = false;
     });
 
     producer_channel->onReady([&]()
     {
-        channel_id = channel_id_base + std::to_string(channel_id_counter++);
+        channel_id = channel_id_base + "_" + std::to_string(channel_id_counter++);
         LOG_DEBUG(log, "Producer's channel {} is ready", channel_id);
 
         /* if persistent == true, onAck is received when message is persisted to disk or when it is consumed on every queue. If fails,
@@ -211,6 +210,7 @@ void WriteBufferToRabbitMQProducer::setupChannel()
         {
             removeRecord(nacked_delivery_tag, multiple, true);
         });
+        producer_ready = true;
     });
 }
 
@@ -218,30 +218,27 @@ void WriteBufferToRabbitMQProducer::setupChannel()
 void WriteBufferToRabbitMQProducer::removeRecord(UInt64 received_delivery_tag, bool multiple, bool republish)
 {
     auto record_iter = delivery_record.find(received_delivery_tag);
+    assert(record_iter != delivery_record.end());
 
-    if (record_iter != delivery_record.end())
+    if (multiple)
     {
-        if (multiple)
-        {
-            /// If multiple is true, then all delivery tags up to and including current are confirmed (with ack or nack).
-            ++record_iter;
+        /// If multiple is true, then all delivery tags up to and including current are confirmed (with ack or nack).
+        ++record_iter;
 
-            if (republish)
-                for (auto record = delivery_record.begin(); record != record_iter; ++record)
-                    returned.tryPush(record->second);
+        if (republish)
+            for (auto record = delivery_record.begin(); record != record_iter; ++record)
+                returned.tryPush(record->second);
 
-            /// Delete the records even in case when republished because new delivery tags will be assigned by the server.
-            delivery_record.erase(delivery_record.begin(), record_iter);
-        }
-        else
-        {
-            if (republish)
-                returned.tryPush(record_iter->second);
-
-            delivery_record.erase(record_iter);
-        }
+        /// Delete the records even in case when republished because new delivery tags will be assigned by the server.
+        delivery_record.erase(delivery_record.begin(), record_iter);
+    }
+    else
+    {
+        if (republish)
+            returned.tryPush(record_iter->second);
+
+        delivery_record.erase(record_iter);
     }
-    /// else is theoretically not possible
 }
 
 
@@ -308,13 +305,18 @@ void WriteBufferToRabbitMQProducer::writingFunc()
 {
     while ((!payloads.empty() || wait_all) && wait_confirm.load())
     {
-        /* Publish main paylods only when there are no returned messages. This way it is ensured that returned messages are republished
-         * as fast as possible and no new publishes are made before returned messages are handled
-         */
-        if (!returned.empty() && producer_channel->usable())
-            publish(returned, true);
-        else if (!payloads.empty() && producer_channel->usable())
-            publish(payloads, false);
+        /// If onReady callback is not received, producer->usable() will anyway return true,
+        /// but must publish only after onReady callback.
+        if (producer_ready)
+        {
+            /* Publish main paylods only when there are no returned messages. This way it is ensured that returned messages are republished
+             * as fast as possible and no new publishes are made before returned messages are handled
+             */
+            if (!returned.empty() && producer_channel->usable())
+                publish(returned, true);
+            else if (!payloads.empty() && producer_channel->usable())
+                publish(payloads, false);
+        }
 
         iterateEventLoop();
 
diff --git a/src/Storages/RabbitMQ/WriteBufferToRabbitMQProducer.h b/src/Storages/RabbitMQ/WriteBufferToRabbitMQProducer.h
index e88f92239ca..452cc38d751 100644
--- a/src/Storages/RabbitMQ/WriteBufferToRabbitMQProducer.h
+++ b/src/Storages/RabbitMQ/WriteBufferToRabbitMQProducer.h
@@ -7,6 +7,7 @@
 #include <atomic>
 #include <amqpcpp.h>
 #include <Storages/RabbitMQ/RabbitMQHandler.h>
+#include <Storages/RabbitMQ/UVLoop.h>
 #include <Common/ConcurrentBoundedQueue.h>
 #include <Core/BackgroundSchedulePool.h>
 #include <Core/Names.h>
@@ -19,7 +20,7 @@ class WriteBufferToRabbitMQProducer : public WriteBuffer
 public:
     WriteBufferToRabbitMQProducer(
             std::pair<String, UInt16> & parsed_address_,
-            const Context & global_context,
+            ContextPtr global_context,
             const std::pair<String, String> & login_password_,
             const String & vhost_,
             const Names & routing_keys_,
@@ -69,10 +70,11 @@ private:
     AMQP::Table key_arguments;
     BackgroundSchedulePool::TaskHolder writing_task;
 
-    std::unique_ptr<uv_loop_t> loop;
+    UVLoop loop;
     std::unique_ptr<RabbitMQHandler> event_handler;
     std::unique_ptr<AMQP::TcpConnection> connection;
     std::unique_ptr<AMQP::TcpChannel> producer_channel;
+    bool producer_ready = false;
 
     /// Channel errors lead to channel closure, need to count number of recreated channels to update channel id
     UInt64 channel_id_counter = 0;
diff --git a/src/Storages/ReadInOrderOptimizer.cpp b/src/Storages/ReadInOrderOptimizer.cpp
index 2b751329208..3bb7034b588 100644
--- a/src/Storages/ReadInOrderOptimizer.cpp
+++ b/src/Storages/ReadInOrderOptimizer.cpp
@@ -34,7 +34,7 @@ ReadInOrderOptimizer::ReadInOrderOptimizer(
     forbidden_columns = syntax_result->getArrayJoinSourceNameSet();
 }
 
-InputOrderInfoPtr ReadInOrderOptimizer::getInputOrder(const StorageMetadataPtr & metadata_snapshot, const Context & context) const
+InputOrderInfoPtr ReadInOrderOptimizer::getInputOrder(const StorageMetadataPtr & metadata_snapshot, ContextPtr context) const
 {
     Names sorting_key_columns = metadata_snapshot->getSortingKeyColumns();
     if (!metadata_snapshot->hasSortingKey())
@@ -44,7 +44,7 @@ InputOrderInfoPtr ReadInOrderOptimizer::getInputOrder(const StorageMetadataPtr &
     int read_direction = required_sort_description.at(0).direction;
 
     size_t prefix_size = std::min(required_sort_description.size(), sorting_key_columns.size());
-    auto aliase_columns = metadata_snapshot->getColumns().getAliases();
+    auto aliased_columns = metadata_snapshot->getColumns().getAliases();
 
     for (size_t i = 0; i < prefix_size; ++i)
     {
@@ -55,13 +55,18 @@ InputOrderInfoPtr ReadInOrderOptimizer::getInputOrder(const StorageMetadataPtr &
         ///  or in some simple cases when order key element is wrapped into monotonic function.
         auto apply_order_judge = [&] (const ExpressionActions::Actions & actions, const String & sort_column)
         {
+            /// If required order depend on collation, it cannot be matched with primary key order.
+            /// Because primary keys cannot have collations.
+            if (required_sort_description[i].collator)
+                return false;
+
             int current_direction = required_sort_description[i].direction;
-            /// For the path:  order by (sort_column, ...)
+            /// For the path: order by (sort_column, ...)
             if (sort_column == sorting_key_columns[i] && current_direction == read_direction)
             {
                 return true;
             }
-            /// For the path:  order by (function(sort_column), ...)
+            /// For the path: order by (function(sort_column), ...)
             /// Allow only one simple monotonic functions with one argument
             /// Why not allow multi monotonic functions?
             else
@@ -125,7 +130,7 @@ InputOrderInfoPtr ReadInOrderOptimizer::getInputOrder(const StorageMetadataPtr &
         /// currently we only support alias column without any function wrapper
         /// ie: `order by aliased_column` can have this optimization, but `order by function(aliased_column)` can not.
         /// This suits most cases.
-        if (context.getSettingsRef().optimize_respect_aliases && aliase_columns.contains(required_sort_description[i].column_name))
+        if (context->getSettingsRef().optimize_respect_aliases && aliased_columns.contains(required_sort_description[i].column_name))
         {
             auto column_expr = metadata_snapshot->getColumns().get(required_sort_description[i].column_name).default_desc.expression->clone();
             replaceAliasColumnsInQuery(column_expr, metadata_snapshot->getColumns(), forbidden_columns, context);
diff --git a/src/Storages/ReadInOrderOptimizer.h b/src/Storages/ReadInOrderOptimizer.h
index 3676f4cc88c..0af1121db32 100644
--- a/src/Storages/ReadInOrderOptimizer.h
+++ b/src/Storages/ReadInOrderOptimizer.h
@@ -22,7 +22,7 @@ public:
         const SortDescription & required_sort_description,
         const TreeRewriterResultPtr & syntax_result);
 
-    InputOrderInfoPtr getInputOrder(const StorageMetadataPtr & metadata_snapshot, const Context & context) const;
+    InputOrderInfoPtr getInputOrder(const StorageMetadataPtr & metadata_snapshot, ContextPtr context) const;
 
 private:
     /// Actions for every element of order expression to analyze functions for monotonicity
diff --git a/src/Storages/RocksDB/EmbeddedRocksDBBlockInputStream.cpp b/src/Storages/RocksDB/EmbeddedRocksDBBlockInputStream.cpp
index 35c41cabd8b..4900e17ad91 100644
--- a/src/Storages/RocksDB/EmbeddedRocksDBBlockInputStream.cpp
+++ b/src/Storages/RocksDB/EmbeddedRocksDBBlockInputStream.cpp
@@ -48,7 +48,8 @@ Block EmbeddedRocksDBBlockInputStream::readImpl()
         size_t idx = 0;
         for (const auto & elem : sample_block)
         {
-            elem.type->deserializeBinary(*columns[idx], idx == primary_key_pos ? key_buffer : value_buffer);
+            auto serialization = elem.type->getDefaultSerialization();
+            serialization->deserializeBinary(*columns[idx], idx == primary_key_pos ? key_buffer : value_buffer);
             ++idx;
         }
     }
diff --git a/src/Storages/RocksDB/EmbeddedRocksDBBlockOutputStream.cpp b/src/Storages/RocksDB/EmbeddedRocksDBBlockOutputStream.cpp
index 1edbdc25942..d7b125cb41f 100644
--- a/src/Storages/RocksDB/EmbeddedRocksDBBlockOutputStream.cpp
+++ b/src/Storages/RocksDB/EmbeddedRocksDBBlockOutputStream.cpp
@@ -51,7 +51,7 @@ void EmbeddedRocksDBBlockOutputStream::write(const Block & block)
         size_t idx = 0;
         for (const auto & elem : block)
         {
-            elem.type->serializeBinary(*elem.column, i, idx == primary_key_pos ? wb_key : wb_value);
+            elem.type->getDefaultSerialization()->serializeBinary(*elem.column, i, idx == primary_key_pos ? wb_key : wb_value);
             ++idx;
         }
         status = batch.Put(wb_key.str(), wb_value.str());
diff --git a/src/Storages/RocksDB/StorageEmbeddedRocksDB.cpp b/src/Storages/RocksDB/StorageEmbeddedRocksDB.cpp
index d7456966467..9173c23ec5a 100644
--- a/src/Storages/RocksDB/StorageEmbeddedRocksDB.cpp
+++ b/src/Storages/RocksDB/StorageEmbeddedRocksDB.cpp
@@ -198,7 +198,7 @@ public:
         while (it < end && rows_processed < max_block_size)
         {
             WriteBufferFromString wb(serialized_keys[rows_processed]);
-            key_column.type->serializeBinary(*it, wb);
+            key_column.type->getDefaultSerialization()->serializeBinary(*it, wb);
             wb.finalize();
             slices_keys[rows_processed] = std::move(serialized_keys[rows_processed]);
 
@@ -219,7 +219,7 @@ public:
                 size_t idx = 0;
                 for (const auto & elem : sample_block)
                 {
-                    elem.type->deserializeBinary(*columns[idx], idx == primary_key_pos ? key_buffer : value_buffer);
+                    elem.type->getDefaultSerialization()->deserializeBinary(*columns[idx], idx == primary_key_pos ? key_buffer : value_buffer);
                     ++idx;
                 }
             }
@@ -245,12 +245,12 @@ StorageEmbeddedRocksDB::StorageEmbeddedRocksDB(const StorageID & table_id_,
         const String & relative_data_path_,
         const StorageInMemoryMetadata & metadata_,
         bool attach,
-        Context & context_,
+        ContextPtr context_,
         const String & primary_key_)
     : IStorage(table_id_), primary_key{primary_key_}
 {
     setInMemoryMetadata(metadata_);
-    rocksdb_dir = context_.getPath() + relative_data_path_;
+    rocksdb_dir = context_->getPath() + relative_data_path_;
     if (!attach)
     {
         Poco::File(rocksdb_dir).createDirectories();
@@ -258,7 +258,7 @@ StorageEmbeddedRocksDB::StorageEmbeddedRocksDB(const StorageID & table_id_,
     initDb();
 }
 
-void StorageEmbeddedRocksDB::truncate(const ASTPtr &, const StorageMetadataPtr & , const Context &, TableExclusiveLockHolder &)
+void StorageEmbeddedRocksDB::truncate(const ASTPtr &, const StorageMetadataPtr & , ContextPtr, TableExclusiveLockHolder &)
 {
     rocksdb_ptr->Close();
     Poco::File(rocksdb_dir).remove(true);
@@ -284,7 +284,7 @@ Pipe StorageEmbeddedRocksDB::read(
         const Names & column_names,
         const StorageMetadataPtr & metadata_snapshot,
         SelectQueryInfo & query_info,
-        const Context & /*context*/,
+        ContextPtr /*context*/,
         QueryProcessingStage::Enum /*processed_stage*/,
         size_t max_block_size,
         unsigned num_streams)
@@ -331,7 +331,7 @@ Pipe StorageEmbeddedRocksDB::read(
 }
 
 BlockOutputStreamPtr StorageEmbeddedRocksDB::write(
-    const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, const Context & /*context*/)
+    const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, ContextPtr /*context*/)
 {
     return std::make_shared<EmbeddedRocksDBBlockOutputStream>(*this, metadata_snapshot);
 }
@@ -352,13 +352,13 @@ static StoragePtr create(const StorageFactory::Arguments & args)
     if (!args.storage_def->primary_key)
         throw Exception("StorageEmbeddedRocksDB must require one column in primary key", ErrorCodes::BAD_ARGUMENTS);
 
-    metadata.primary_key = KeyDescription::getKeyFromAST(args.storage_def->primary_key->ptr(), metadata.columns, args.context);
+    metadata.primary_key = KeyDescription::getKeyFromAST(args.storage_def->primary_key->ptr(), metadata.columns, args.getContext());
     auto primary_key_names = metadata.getColumnsRequiredForPrimaryKey();
     if (primary_key_names.size() != 1)
     {
         throw Exception("StorageEmbeddedRocksDB must require one column in primary key", ErrorCodes::BAD_ARGUMENTS);
     }
-    return StorageEmbeddedRocksDB::create(args.table_id, args.relative_data_path, metadata, args.attach, args.context, primary_key_names[0]);
+    return StorageEmbeddedRocksDB::create(args.table_id, args.relative_data_path, metadata, args.attach, args.getContext(), primary_key_names[0]);
 }
 
 
diff --git a/src/Storages/RocksDB/StorageEmbeddedRocksDB.h b/src/Storages/RocksDB/StorageEmbeddedRocksDB.h
index bd700a35809..64255392c35 100644
--- a/src/Storages/RocksDB/StorageEmbeddedRocksDB.h
+++ b/src/Storages/RocksDB/StorageEmbeddedRocksDB.h
@@ -29,28 +29,31 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & metadata_snapshot,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
 
-    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, const Context & context) override;
-    void truncate(const ASTPtr &, const StorageMetadataPtr & metadata_snapshot, const Context &, TableExclusiveLockHolder &) override;
+    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, ContextPtr context) override;
+    void truncate(const ASTPtr &, const StorageMetadataPtr & metadata_snapshot, ContextPtr, TableExclusiveLockHolder &) override;
 
     bool supportsParallelInsert() const override { return true; }
     bool supportsIndexForIn() const override { return true; }
     bool mayBenefitFromIndexForIn(
-        const ASTPtr & node, const Context & /*query_context*/, const StorageMetadataPtr & /*metadata_snapshot*/) const override
+        const ASTPtr & node, ContextPtr /*query_context*/, const StorageMetadataPtr & /*metadata_snapshot*/) const override
     {
         return node->getColumnName() == primary_key;
     }
 
+    bool storesDataOnDisk() const override { return true; }
+    Strings getDataPaths() const override { return {rocksdb_dir}; }
+
 protected:
     StorageEmbeddedRocksDB(const StorageID & table_id_,
         const String & relative_data_path_,
         const StorageInMemoryMetadata & metadata,
         bool attach,
-        Context & context_,
+        ContextPtr context_,
         const String & primary_key_);
 
 private:
diff --git a/src/Storages/SelectQueryDescription.cpp b/src/Storages/SelectQueryDescription.cpp
index c11e6bd74f8..05747a9a260 100644
--- a/src/Storages/SelectQueryDescription.cpp
+++ b/src/Storages/SelectQueryDescription.cpp
@@ -44,11 +44,11 @@ SelectQueryDescription & SelectQueryDescription::SelectQueryDescription::operato
 namespace
 {
 
-StorageID extractDependentTableFromSelectQuery(ASTSelectQuery & query, const Context & context, bool add_default_db = true)
+StorageID extractDependentTableFromSelectQuery(ASTSelectQuery & query, ContextPtr context, bool add_default_db = true)
 {
     if (add_default_db)
     {
-        AddDefaultDatabaseVisitor visitor(context.getCurrentDatabase(), false, nullptr);
+        AddDefaultDatabaseVisitor visitor(context->getCurrentDatabase(), false, nullptr);
         visitor.visit(query);
     }
 
@@ -114,7 +114,7 @@ static bool isSingleSelect(const ASTPtr & select, ASTPtr & res)
         return isSingleSelect(new_inner_query, res);
 }
 
-SelectQueryDescription SelectQueryDescription::getSelectQueryFromASTForMatView(const ASTPtr & select, const Context & context)
+SelectQueryDescription SelectQueryDescription::getSelectQueryFromASTForMatView(const ASTPtr & select, ContextPtr context)
 {
     ASTPtr new_inner_query;
 
diff --git a/src/Storages/SelectQueryDescription.h b/src/Storages/SelectQueryDescription.h
index ce3ca44c147..28a0a186a07 100644
--- a/src/Storages/SelectQueryDescription.h
+++ b/src/Storages/SelectQueryDescription.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <Interpreters/Context_fwd.h>
 #include <Interpreters/StorageID.h>
 
 namespace DB
@@ -17,7 +18,7 @@ struct SelectQueryDescription
 
     /// Parse description from select query for materialized view. Also
     /// validates query.
-    static SelectQueryDescription getSelectQueryFromASTForMatView(const ASTPtr & select, const Context & context);
+    static SelectQueryDescription getSelectQueryFromASTForMatView(const ASTPtr & select, ContextPtr context);
 
     SelectQueryDescription() = default;
     SelectQueryDescription(const SelectQueryDescription & other);
diff --git a/src/Storages/SelectQueryInfo.h b/src/Storages/SelectQueryInfo.h
index 5a3ada6288b..b4ac07c612a 100644
--- a/src/Storages/SelectQueryInfo.h
+++ b/src/Storages/SelectQueryInfo.h
@@ -15,29 +15,55 @@ using ExpressionActionsPtr = std::shared_ptr<ExpressionActions>;
 class ActionsDAG;
 using ActionsDAGPtr = std::shared_ptr<ActionsDAG>;
 
+struct PrewhereInfo;
+using PrewhereInfoPtr = std::shared_ptr<PrewhereInfo>;
+
+struct PrewhereDAGInfo;
+using PrewhereDAGInfoPtr = std::shared_ptr<PrewhereDAGInfo>;
+
+struct FilterInfo;
+using FilterInfoPtr = std::shared_ptr<FilterInfo>;
+
+struct FilterDAGInfo;
+using FilterDAGInfoPtr = std::shared_ptr<FilterDAGInfo>;
+
+struct InputOrderInfo;
+using InputOrderInfoPtr = std::shared_ptr<const InputOrderInfo>;
+
+struct TreeRewriterResult;
+using TreeRewriterResultPtr = std::shared_ptr<const TreeRewriterResult>;
+
+class ReadInOrderOptimizer;
+using ReadInOrderOptimizerPtr = std::shared_ptr<const ReadInOrderOptimizer>;
+
+class Cluster;
+using ClusterPtr = std::shared_ptr<Cluster>;
+
 struct PrewhereInfo
 {
     /// Actions which are executed in order to alias columns are used for prewhere actions.
     ExpressionActionsPtr alias_actions;
+    /// Actions for row level security filter. Applied separately before prewhere_actions.
+    /// This actions are separate because prewhere condition should not be executed over filtered rows.
+    ExpressionActionsPtr row_level_filter;
     /// Actions which are executed on block in order to get filter column for prewhere step.
     ExpressionActionsPtr prewhere_actions;
     /// Actions which are executed after reading from storage in order to remove unused columns.
     ExpressionActionsPtr remove_columns_actions;
+    String row_level_column_name;
     String prewhere_column_name;
     bool remove_prewhere_column = false;
     bool need_filter = false;
-
-    PrewhereInfo() = default;
-    explicit PrewhereInfo(ExpressionActionsPtr prewhere_actions_, String prewhere_column_name_)
-        : prewhere_actions(std::move(prewhere_actions_)), prewhere_column_name(std::move(prewhere_column_name_)) {}
 };
 
-/// Same as PrewhereInfo, but with ActionsDAG
+/// Same as PrewhereInfo, but with ActionsDAG.
 struct PrewhereDAGInfo
 {
     ActionsDAGPtr alias_actions;
+    ActionsDAGPtr row_level_filter_actions;
     ActionsDAGPtr prewhere_actions;
     ActionsDAGPtr remove_columns_actions;
+    String row_level_column_name;
     String prewhere_column_name;
     bool remove_prewhere_column = false;
     bool need_filter = false;
@@ -52,7 +78,16 @@ struct PrewhereDAGInfo
 /// Helper struct to store all the information about the filter expression.
 struct FilterInfo
 {
-    ActionsDAGPtr actions_dag;
+    ExpressionActionsPtr alias_actions;
+    ExpressionActionsPtr actions;
+    String column_name;
+    bool do_remove_column = false;
+};
+
+/// Same as FilterInfo, but with ActionsDAG.
+struct FilterDAGInfo
+{
+    ActionsDAGPtr actions;
     String column_name;
     bool do_remove_column = false;
 
@@ -75,20 +110,6 @@ struct InputOrderInfo
     bool operator !=(const InputOrderInfo & other) const { return !(*this == other); }
 };
 
-using PrewhereInfoPtr = std::shared_ptr<PrewhereInfo>;
-using PrewhereDAGInfoPtr = std::shared_ptr<PrewhereDAGInfo>;
-using FilterInfoPtr = std::shared_ptr<FilterInfo>;
-using InputOrderInfoPtr = std::shared_ptr<const InputOrderInfo>;
-
-struct TreeRewriterResult;
-using TreeRewriterResultPtr = std::shared_ptr<const TreeRewriterResult>;
-
-class ReadInOrderOptimizer;
-using ReadInOrderOptimizerPtr = std::shared_ptr<const ReadInOrderOptimizer>;
-
-class Cluster;
-using ClusterPtr = std::shared_ptr<Cluster>;
-
 /** Query along with some additional data,
   *  that can be used during query processing
   *  inside storage engines.
@@ -98,9 +119,13 @@ struct SelectQueryInfo
     ASTPtr query;
     ASTPtr view_query; /// Optimized VIEW query
 
-    /// For optimize_skip_unused_shards.
-    /// Can be modified in getQueryProcessingStage()
+    /// Cluster for the query.
     ClusterPtr cluster;
+    /// Optimized cluster for the query.
+    /// In case of optimize_skip_unused_shards it may differs from original cluster.
+    ///
+    /// Configured in StorageDistributed::getQueryProcessingStage()
+    ClusterPtr optimized_cluster;
 
     TreeRewriterResultPtr syntax_analyzer_result;
 
@@ -113,6 +138,8 @@ struct SelectQueryInfo
     /// Prepared sets are used for indices by storage engine.
     /// Example: x IN (1, 2, 3)
     PreparedSets sets;
+
+    ClusterPtr getCluster() const { return !optimized_cluster ? cluster : optimized_cluster; }
 };
 
 }
diff --git a/src/Storages/StorageBuffer.cpp b/src/Storages/StorageBuffer.cpp
index e28d5f4d6d1..afe37d0bcbe 100644
--- a/src/Storages/StorageBuffer.cpp
+++ b/src/Storages/StorageBuffer.cpp
@@ -29,7 +29,8 @@
 #include <Processors/QueryPlan/SettingQuotaAndLimitsStep.h>
 #include <Processors/QueryPlan/ReadFromPreparedSource.h>
 #include <Processors/QueryPlan/UnionStep.h>
-
+#include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
+#include <Processors/QueryPlan/BuildQueryPipelineSettings.h>
 
 namespace ProfileEvents
 {
@@ -39,6 +40,11 @@ namespace ProfileEvents
     extern const Event StorageBufferPassedTimeMaxThreshold;
     extern const Event StorageBufferPassedRowsMaxThreshold;
     extern const Event StorageBufferPassedBytesMaxThreshold;
+    extern const Event StorageBufferPassedTimeFlushThreshold;
+    extern const Event StorageBufferPassedRowsFlushThreshold;
+    extern const Event StorageBufferPassedBytesFlushThreshold;
+    extern const Event StorageBufferLayerLockReadersWaitMilliseconds;
+    extern const Event StorageBufferLayerLockWritersWaitMilliseconds;
 }
 
 namespace CurrentMetrics
@@ -58,6 +64,37 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
     extern const int INFINITE_LOOP;
     extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+    extern const int ALTER_OF_COLUMN_IS_FORBIDDEN;
+}
+
+
+std::unique_lock<std::mutex> StorageBuffer::Buffer::lockForReading() const
+{
+    return lockImpl(/* read= */true);
+}
+std::unique_lock<std::mutex> StorageBuffer::Buffer::lockForWriting() const
+{
+    return lockImpl(/* read= */false);
+}
+std::unique_lock<std::mutex> StorageBuffer::Buffer::tryLock() const
+{
+    std::unique_lock lock(mutex, std::try_to_lock);
+    return lock;
+}
+std::unique_lock<std::mutex> StorageBuffer::Buffer::lockImpl(bool read) const
+{
+    std::unique_lock lock(mutex, std::defer_lock);
+
+    Stopwatch watch(CLOCK_MONOTONIC_COARSE);
+    lock.lock();
+    UInt64 elapsed = watch.elapsedMilliseconds();
+
+    if (read)
+        ProfileEvents::increment(ProfileEvents::StorageBufferLayerLockReadersWaitMilliseconds, elapsed);
+    else
+        ProfileEvents::increment(ProfileEvents::StorageBufferLayerLockWritersWaitMilliseconds, elapsed);
+
+    return lock;
 }
 
 
@@ -65,21 +102,23 @@ StorageBuffer::StorageBuffer(
     const StorageID & table_id_,
     const ColumnsDescription & columns_,
     const ConstraintsDescription & constraints_,
-    const Context & context_,
+    ContextPtr context_,
     size_t num_shards_,
     const Thresholds & min_thresholds_,
     const Thresholds & max_thresholds_,
+    const Thresholds & flush_thresholds_,
     const StorageID & destination_id_,
     bool allow_materialized_)
     : IStorage(table_id_)
-    , buffer_context(context_.getBufferContext())
+    , WithContext(context_->getBufferContext())
     , num_shards(num_shards_), buffers(num_shards_)
     , min_thresholds(min_thresholds_)
     , max_thresholds(max_thresholds_)
+    , flush_thresholds(flush_thresholds_)
     , destination_id(destination_id_)
     , allow_materialized(allow_materialized_)
     , log(&Poco::Logger::get("StorageBuffer (" + table_id_.getFullTableName() + ")"))
-    , bg_pool(buffer_context.getBufferFlushSchedulePool())
+    , bg_pool(getContext()->getBufferFlushSchedulePool())
 {
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(columns_);
@@ -109,7 +148,7 @@ protected:
             return res;
         has_been_read = true;
 
-        std::lock_guard lock(buffer.mutex);
+        std::unique_lock lock(buffer.lockForReading());
 
         if (!buffer.data.rows())
             return res;
@@ -139,16 +178,16 @@ private:
 };
 
 
-QueryProcessingStage::Enum StorageBuffer::getQueryProcessingStage(const Context & context, QueryProcessingStage::Enum to_stage, SelectQueryInfo & query_info) const
+QueryProcessingStage::Enum StorageBuffer::getQueryProcessingStage(ContextPtr local_context, QueryProcessingStage::Enum to_stage, SelectQueryInfo & query_info) const
 {
     if (destination_id)
     {
-        auto destination = DatabaseCatalog::instance().getTable(destination_id, context);
+        auto destination = DatabaseCatalog::instance().getTable(destination_id, local_context);
 
         if (destination.get() == this)
             throw Exception("Destination table is myself. Read will cause infinite loop.", ErrorCodes::INFINITE_LOOP);
 
-        return destination->getQueryProcessingStage(context, to_stage, query_info);
+        return destination->getQueryProcessingStage(local_context, to_stage, query_info);
     }
 
     return QueryProcessingStage::FetchColumns;
@@ -159,14 +198,16 @@ Pipe StorageBuffer::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & query_info,
-    const Context & context,
+    ContextPtr local_context,
     QueryProcessingStage::Enum processed_stage,
     const size_t max_block_size,
     const unsigned num_streams)
 {
     QueryPlan plan;
-    read(plan, column_names, metadata_snapshot, query_info, context, processed_stage, max_block_size, num_streams);
-    return plan.convertToPipe();
+    read(plan, column_names, metadata_snapshot, query_info, local_context, processed_stage, max_block_size, num_streams);
+    return plan.convertToPipe(
+        QueryPlanOptimizationSettings::fromContext(local_context),
+        BuildQueryPipelineSettings::fromContext(local_context));
 }
 
 void StorageBuffer::read(
@@ -174,19 +215,19 @@ void StorageBuffer::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & query_info,
-    const Context & context,
+    ContextPtr local_context,
     QueryProcessingStage::Enum processed_stage,
     size_t max_block_size,
     unsigned num_streams)
 {
     if (destination_id)
     {
-        auto destination = DatabaseCatalog::instance().getTable(destination_id, context);
+        auto destination = DatabaseCatalog::instance().getTable(destination_id, local_context);
 
         if (destination.get() == this)
             throw Exception("Destination table is myself. Read will cause infinite loop.", ErrorCodes::INFINITE_LOOP);
 
-        auto destination_lock = destination->lockForShare(context.getCurrentQueryId(), context.getSettingsRef().lock_acquire_timeout);
+        auto destination_lock = destination->lockForShare(local_context->getCurrentQueryId(), local_context->getSettingsRef().lock_acquire_timeout);
 
         auto destination_metadata_snapshot = destination->getInMemoryMetadataPtr();
 
@@ -201,12 +242,12 @@ void StorageBuffer::read(
         if (dst_has_same_structure)
         {
             if (query_info.order_optimizer)
-                query_info.input_order_info = query_info.order_optimizer->getInputOrder(destination_metadata_snapshot, context);
+                query_info.input_order_info = query_info.order_optimizer->getInputOrder(destination_metadata_snapshot, local_context);
 
             /// The destination table has the same structure of the requested columns and we can simply read blocks from there.
             destination->read(
                 query_plan, column_names, destination_metadata_snapshot, query_info,
-                context, processed_stage, max_block_size, num_streams);
+                local_context, processed_stage, max_block_size, num_streams);
         }
         else
         {
@@ -241,7 +282,7 @@ void StorageBuffer::read(
             {
                 destination->read(
                         query_plan, columns_intersection, destination_metadata_snapshot, query_info,
-                        context, processed_stage, max_block_size, num_streams);
+                        local_context, processed_stage, max_block_size, num_streams);
 
                 if (query_plan.isInitialized())
                 {
@@ -250,7 +291,7 @@ void StorageBuffer::read(
                             query_plan.getCurrentDataStream().header,
                             header_after_adding_defaults.getNamesAndTypesList(),
                             metadata_snapshot->getColumns(),
-                            context);
+                            local_context);
 
                     auto adding_missed = std::make_unique<ExpressionStep>(
                             query_plan.getCurrentDataStream(),
@@ -313,7 +354,7 @@ void StorageBuffer::read(
     if (processed_stage > QueryProcessingStage::FetchColumns)
     {
         auto interpreter = InterpreterSelectQuery(
-                query_info.query, context, std::move(pipe_from_buffers),
+                query_info.query, local_context, std::move(pipe_from_buffers),
                 SelectQueryOptions(processed_stage));
         interpreter.buildQueryPlan(buffers_plan);
     }
@@ -321,20 +362,36 @@ void StorageBuffer::read(
     {
         if (query_info.prewhere_info)
         {
-            pipe_from_buffers.addSimpleTransform([&](const Block & header)
-            {
-                return std::make_shared<FilterTransform>(
-                        header, query_info.prewhere_info->prewhere_actions,
-                        query_info.prewhere_info->prewhere_column_name, query_info.prewhere_info->remove_prewhere_column);
-            });
-
             if (query_info.prewhere_info->alias_actions)
             {
                 pipe_from_buffers.addSimpleTransform([&](const Block & header)
                 {
-                    return std::make_shared<ExpressionTransform>(header, query_info.prewhere_info->alias_actions);
+                    return std::make_shared<ExpressionTransform>(
+                        header,
+                        query_info.prewhere_info->alias_actions);
                 });
             }
+
+            if (query_info.prewhere_info->row_level_filter)
+            {
+                pipe_from_buffers.addSimpleTransform([&](const Block & header)
+                {
+                    return std::make_shared<FilterTransform>(
+                            header,
+                            query_info.prewhere_info->row_level_filter,
+                            query_info.prewhere_info->row_level_column_name,
+                            false);
+                });
+            }
+
+            pipe_from_buffers.addSimpleTransform([&](const Block & header)
+            {
+                return std::make_shared<FilterTransform>(
+                        header,
+                        query_info.prewhere_info->prewhere_actions,
+                        query_info.prewhere_info->prewhere_column_name,
+                        query_info.prewhere_info->remove_prewhere_column);
+            });
         }
 
         auto read_from_buffers = std::make_unique<ReadFromPreparedSource>(std::move(pipe_from_buffers));
@@ -371,7 +428,7 @@ void StorageBuffer::read(
     plans.emplace_back(std::make_unique<QueryPlan>(std::move(buffers_plan)));
     query_plan = QueryPlan();
 
-    auto union_step = std::make_unique<UnionStep>(std::move(input_streams), result_header);
+    auto union_step = std::make_unique<UnionStep>(std::move(input_streams));
     union_step->setStepDescription("Unite sources from Buffer table");
     query_plan.unitePlans(std::move(union_step), std::move(plans));
 }
@@ -475,7 +532,7 @@ public:
         StoragePtr destination;
         if (storage.destination_id)
         {
-            destination = DatabaseCatalog::instance().tryGetTable(storage.destination_id, storage.buffer_context);
+            destination = DatabaseCatalog::instance().tryGetTable(storage.destination_id, storage.getContext());
             if (destination.get() == &storage)
                 throw Exception("Destination table is myself. Write will cause infinite loop.", ErrorCodes::INFINITE_LOOP);
         }
@@ -490,7 +547,7 @@ public:
         {
             if (storage.destination_id)
             {
-                LOG_TRACE(storage.log, "Writing block with {} rows, {} bytes directly.", rows, bytes);
+                LOG_DEBUG(storage.log, "Writing block with {} rows, {} bytes directly.", rows, bytes);
                 storage.writeBlockToDestination(block, destination);
             }
             return;
@@ -508,7 +565,7 @@ public:
 
         for (size_t try_no = 0; try_no < storage.num_shards; ++try_no)
         {
-            std::unique_lock lock(storage.buffers[shard_num].mutex, std::try_to_lock);
+            std::unique_lock lock(storage.buffers[shard_num].tryLock());
 
             if (lock.owns_lock())
             {
@@ -528,7 +585,7 @@ public:
         if (!least_busy_buffer)
         {
             least_busy_buffer = &storage.buffers[start_shard_num];
-            least_busy_lock = std::unique_lock(least_busy_buffer->mutex);
+            least_busy_lock = least_busy_buffer->lockForWriting();
         }
         insertIntoBuffer(block, *least_busy_buffer);
         least_busy_lock.unlock();
@@ -550,7 +607,7 @@ private:
         {
             buffer.data = sorted_block.cloneEmpty();
         }
-        else if (storage.checkThresholds(buffer, current_time, sorted_block.rows(), sorted_block.bytes()))
+        else if (storage.checkThresholds(buffer, /* direct= */true, current_time, sorted_block.rows(), sorted_block.bytes()))
         {
             /** If, after inserting the buffer, the constraints are exceeded, then we will reset the buffer.
               * This also protects against unlimited consumption of RAM, since if it is impossible to write to the table,
@@ -568,14 +625,14 @@ private:
 };
 
 
-BlockOutputStreamPtr StorageBuffer::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, const Context & /*context*/)
+BlockOutputStreamPtr StorageBuffer::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, ContextPtr /*context*/)
 {
     return std::make_shared<BufferBlockOutputStream>(*this, metadata_snapshot);
 }
 
 
 bool StorageBuffer::mayBenefitFromIndexForIn(
-    const ASTPtr & left_in_operand, const Context & query_context, const StorageMetadataPtr & /*metadata_snapshot*/) const
+    const ASTPtr & left_in_operand, ContextPtr query_context, const StorageMetadataPtr & /*metadata_snapshot*/) const
 {
     if (!destination_id)
         return false;
@@ -591,7 +648,7 @@ bool StorageBuffer::mayBenefitFromIndexForIn(
 
 void StorageBuffer::startup()
 {
-    if (buffer_context.getSettingsRef().readonly)
+    if (getContext()->getSettingsRef().readonly)
     {
         LOG_WARNING(log, "Storage {} is run with readonly settings, it will not be able to insert data. Set appropriate buffer_profile to fix this.", getName());
     }
@@ -610,7 +667,7 @@ void StorageBuffer::shutdown()
 
     try
     {
-        optimize(nullptr /*query*/, getInMemoryMetadataPtr(), {} /*partition*/, false /*final*/, false /*deduplicate*/, {}, buffer_context);
+        optimize(nullptr /*query*/, getInMemoryMetadataPtr(), {} /*partition*/, false /*final*/, false /*deduplicate*/, {}, getContext());
     }
     catch (...)
     {
@@ -636,7 +693,7 @@ bool StorageBuffer::optimize(
     bool final,
     bool deduplicate,
     const Names & /* deduplicate_by_columns */,
-    const Context & /*context*/)
+    ContextPtr /*context*/)
 {
     if (partition)
         throw Exception("Partition cannot be specified when optimizing table of type Buffer", ErrorCodes::NOT_IMPLEMENTED);
@@ -655,13 +712,13 @@ bool StorageBuffer::supportsPrewhere() const
 {
     if (!destination_id)
         return false;
-    auto dest = DatabaseCatalog::instance().tryGetTable(destination_id, buffer_context);
+    auto dest = DatabaseCatalog::instance().tryGetTable(destination_id, getContext());
     if (dest && dest.get() != this)
         return dest->supportsPrewhere();
     return false;
 }
 
-bool StorageBuffer::checkThresholds(const Buffer & buffer, time_t current_time, size_t additional_rows, size_t additional_bytes) const
+bool StorageBuffer::checkThresholds(const Buffer & buffer, bool direct, time_t current_time, size_t additional_rows, size_t additional_bytes) const
 {
     time_t time_passed = 0;
     if (buffer.first_write_time)
@@ -670,11 +727,11 @@ bool StorageBuffer::checkThresholds(const Buffer & buffer, time_t current_time,
     size_t rows = buffer.data.rows() + additional_rows;
     size_t bytes = buffer.data.bytes() + additional_bytes;
 
-    return checkThresholdsImpl(rows, bytes, time_passed);
+    return checkThresholdsImpl(direct, rows, bytes, time_passed);
 }
 
 
-bool StorageBuffer::checkThresholdsImpl(size_t rows, size_t bytes, time_t time_passed) const
+bool StorageBuffer::checkThresholdsImpl(bool direct, size_t rows, size_t bytes, time_t time_passed) const
 {
     if (time_passed > min_thresholds.time && rows > min_thresholds.rows && bytes > min_thresholds.bytes)
     {
@@ -700,6 +757,27 @@ bool StorageBuffer::checkThresholdsImpl(size_t rows, size_t bytes, time_t time_p
         return true;
     }
 
+    if (!direct)
+    {
+        if (flush_thresholds.time && time_passed > flush_thresholds.time)
+        {
+            ProfileEvents::increment(ProfileEvents::StorageBufferPassedTimeFlushThreshold);
+            return true;
+        }
+
+        if (flush_thresholds.rows && rows > flush_thresholds.rows)
+        {
+            ProfileEvents::increment(ProfileEvents::StorageBufferPassedRowsFlushThreshold);
+            return true;
+        }
+
+        if (flush_thresholds.bytes && bytes > flush_thresholds.bytes)
+        {
+            ProfileEvents::increment(ProfileEvents::StorageBufferPassedBytesFlushThreshold);
+            return true;
+        }
+    }
+
     return false;
 }
 
@@ -720,9 +798,9 @@ void StorageBuffer::flushBuffer(Buffer & buffer, bool check_thresholds, bool loc
     size_t bytes = 0;
     time_t time_passed = 0;
 
-    std::unique_lock lock(buffer.mutex, std::defer_lock);
+    std::optional<std::unique_lock<std::mutex>> lock;
     if (!locked)
-        lock.lock();
+        lock.emplace(buffer.lockForReading());
 
     block_to_write = buffer.data.cloneEmpty();
 
@@ -733,7 +811,7 @@ void StorageBuffer::flushBuffer(Buffer & buffer, bool check_thresholds, bool loc
 
     if (check_thresholds)
     {
-        if (!checkThresholdsImpl(rows, bytes, time_passed))
+        if (!checkThresholdsImpl(/* direct= */false, rows, bytes, time_passed))
             return;
     }
     else
@@ -752,7 +830,7 @@ void StorageBuffer::flushBuffer(Buffer & buffer, bool check_thresholds, bool loc
 
     if (!destination_id)
     {
-        LOG_TRACE(log, "Flushing buffer with {} rows (discarded), {} bytes, age {} seconds {}.", rows, bytes, time_passed, (check_thresholds ? "(bg)" : "(direct)"));
+        LOG_DEBUG(log, "Flushing buffer with {} rows (discarded), {} bytes, age {} seconds {}.", rows, bytes, time_passed, (check_thresholds ? "(bg)" : "(direct)"));
         return;
     }
 
@@ -766,7 +844,7 @@ void StorageBuffer::flushBuffer(Buffer & buffer, bool check_thresholds, bool loc
     Stopwatch watch;
     try
     {
-        writeBlockToDestination(block_to_write, DatabaseCatalog::instance().tryGetTable(destination_id, buffer_context));
+        writeBlockToDestination(block_to_write, DatabaseCatalog::instance().tryGetTable(destination_id, getContext()));
         if (reset_block_structure)
             buffer.data.clear();
     }
@@ -789,7 +867,7 @@ void StorageBuffer::flushBuffer(Buffer & buffer, bool check_thresholds, bool loc
     }
 
     UInt64 milliseconds = watch.elapsedMilliseconds();
-    LOG_TRACE(log, "Flushing buffer with {} rows, {} bytes, age {} seconds, took {} ms {}.", rows, bytes, time_passed, milliseconds, (check_thresholds ? "(bg)" : "(direct)"));
+    LOG_DEBUG(log, "Flushing buffer with {} rows, {} bytes, age {} seconds, took {} ms {}.", rows, bytes, time_passed, milliseconds, (check_thresholds ? "(bg)" : "(direct)"));
 }
 
 
@@ -848,8 +926,8 @@ void StorageBuffer::writeBlockToDestination(const Block & block, StoragePtr tabl
     for (const auto & column : block_to_write)
         list_of_columns->children.push_back(std::make_shared<ASTIdentifier>(column.name));
 
-    auto insert_context = Context(buffer_context);
-    insert_context.makeQueryContext();
+    auto insert_context = Context::createCopy(getContext());
+    insert_context->makeQueryContext();
 
     InterpreterInsertQuery interpreter{insert, insert_context, allow_materialized};
 
@@ -890,7 +968,7 @@ void StorageBuffer::reschedule()
         /// try_to_lock is also ok for background flush, since if there is
         /// INSERT contended, then the reschedule will be done after
         /// INSERT will be done.
-        std::unique_lock lock(buffer.mutex, std::try_to_lock);
+        std::unique_lock lock(buffer.tryLock());
         if (lock.owns_lock())
         {
             min_first_write_time = buffer.first_write_time;
@@ -910,8 +988,9 @@ void StorageBuffer::reschedule()
     flush_handle->scheduleAfter(std::min(min, max) * 1000);
 }
 
-void StorageBuffer::checkAlterIsPossible(const AlterCommands & commands, const Settings & /* settings */) const
+void StorageBuffer::checkAlterIsPossible(const AlterCommands & commands, ContextPtr local_context) const
 {
+    auto name_deps = getDependentViewsByColumn(local_context);
     for (const auto & command : commands)
     {
         if (command.type != AlterCommand::Type::ADD_COLUMN && command.type != AlterCommand::Type::MODIFY_COLUMN
@@ -919,13 +998,24 @@ void StorageBuffer::checkAlterIsPossible(const AlterCommands & commands, const S
             throw Exception(
                 "Alter of type '" + alterTypeToString(command.type) + "' is not supported by storage " + getName(),
                 ErrorCodes::NOT_IMPLEMENTED);
+        if (command.type == AlterCommand::Type::DROP_COLUMN)
+        {
+            const auto & deps_mv = name_deps[command.column_name];
+            if (!deps_mv.empty())
+            {
+                throw Exception(
+                    "Trying to ALTER DROP column " + backQuoteIfNeed(command.column_name) + " which is referenced by materialized view "
+                        + toString(deps_mv),
+                    ErrorCodes::ALTER_OF_COLUMN_IS_FORBIDDEN);
+            }
+        }
     }
 }
 
 std::optional<UInt64> StorageBuffer::totalRows(const Settings & settings) const
 {
     std::optional<UInt64> underlying_rows;
-    auto underlying = DatabaseCatalog::instance().tryGetTable(destination_id, buffer_context);
+    auto underlying = DatabaseCatalog::instance().tryGetTable(destination_id, getContext());
 
     if (underlying)
         underlying_rows = underlying->totalRows(settings);
@@ -935,7 +1025,7 @@ std::optional<UInt64> StorageBuffer::totalRows(const Settings & settings) const
     UInt64 rows = 0;
     for (const auto & buffer : buffers)
     {
-        std::lock_guard lock(buffer.mutex);
+        const auto lock(buffer.lockForReading());
         rows += buffer.data.rows();
     }
     return rows + *underlying_rows;
@@ -946,26 +1036,26 @@ std::optional<UInt64> StorageBuffer::totalBytes(const Settings & /*settings*/) c
     UInt64 bytes = 0;
     for (const auto & buffer : buffers)
     {
-        std::lock_guard lock(buffer.mutex);
+        const auto lock(buffer.lockForReading());
         bytes += buffer.data.allocatedBytes();
     }
     return bytes;
 }
 
-void StorageBuffer::alter(const AlterCommands & params, const Context & context, TableLockHolder &)
+void StorageBuffer::alter(const AlterCommands & params, ContextPtr local_context, TableLockHolder &)
 {
     auto table_id = getStorageID();
-    checkAlterIsPossible(params, context.getSettingsRef());
+    checkAlterIsPossible(params, local_context);
     auto metadata_snapshot = getInMemoryMetadataPtr();
 
     /// Flush all buffers to storages, so that no non-empty blocks of the old
     /// structure remain. Structure of empty blocks will be updated during first
     /// insert.
-    optimize({} /*query*/, metadata_snapshot, {} /*partition_id*/, false /*final*/, false /*deduplicate*/, {}, context);
+    optimize({} /*query*/, metadata_snapshot, {} /*partition_id*/, false /*final*/, false /*deduplicate*/, {}, local_context);
 
     StorageInMemoryMetadata new_metadata = *metadata_snapshot;
-    params.apply(new_metadata, context);
-    DatabaseCatalog::instance().getDatabase(table_id.database_name)->alterTable(context, table_id, new_metadata);
+    params.apply(new_metadata, local_context);
+    DatabaseCatalog::instance().getDatabase(table_id.database_name)->alterTable(local_context, table_id, new_metadata);
     setInMemoryMetadata(new_metadata);
 }
 
@@ -976,25 +1066,26 @@ void registerStorageBuffer(StorageFactory & factory)
       *
       * db, table - in which table to put data from buffer.
       * num_buckets - level of parallelism.
-      * min_time, max_time, min_rows, max_rows, min_bytes, max_bytes - conditions for flushing the buffer.
+      * min_time, max_time, min_rows, max_rows, min_bytes, max_bytes - conditions for flushing the buffer,
+      * flush_time, flush_rows, flush_bytes - conditions for flushing.
       */
 
     factory.registerStorage("Buffer", [](const StorageFactory::Arguments & args)
     {
         ASTs & engine_args = args.engine_args;
 
-        if (engine_args.size() != 9)
-            throw Exception("Storage Buffer requires 9 parameters: "
-                " destination_database, destination_table, num_buckets, min_time, max_time, min_rows, max_rows, min_bytes, max_bytes.",
+        if (engine_args.size() < 9 || engine_args.size() > 12)
+            throw Exception("Storage Buffer requires from 9 to 12 parameters: "
+                " destination_database, destination_table, num_buckets, min_time, max_time, min_rows, max_rows, min_bytes, max_bytes[, flush_time, flush_rows, flush_bytes].",
                 ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
 
         // Table and database name arguments accept expressions, evaluate them.
-        engine_args[0] = evaluateConstantExpressionForDatabaseName(engine_args[0], args.local_context);
-        engine_args[1] = evaluateConstantExpressionOrIdentifierAsLiteral(engine_args[1], args.local_context);
+        engine_args[0] = evaluateConstantExpressionForDatabaseName(engine_args[0], args.getLocalContext());
+        engine_args[1] = evaluateConstantExpressionOrIdentifierAsLiteral(engine_args[1], args.getLocalContext());
 
         // After we evaluated all expressions, check that all arguments are
         // literals.
-        for (size_t i = 0; i < 9; i++)
+        for (size_t i = 0; i < engine_args.size(); i++)
         {
             if (!typeid_cast<ASTLiteral *>(engine_args[i].get()))
             {
@@ -1004,23 +1095,35 @@ void registerStorageBuffer(StorageFactory & factory)
             }
         }
 
-        String destination_database = engine_args[0]->as<ASTLiteral &>().value.safeGet<String>();
-        String destination_table = engine_args[1]->as<ASTLiteral &>().value.safeGet<String>();
+        size_t i = 0;
 
-        UInt64 num_buckets = applyVisitor(FieldVisitorConvertToNumber<UInt64>(), engine_args[2]->as<ASTLiteral &>().value);
+        String destination_database = engine_args[i++]->as<ASTLiteral &>().value.safeGet<String>();
+        String destination_table = engine_args[i++]->as<ASTLiteral &>().value.safeGet<String>();
 
-        Int64 min_time = applyVisitor(FieldVisitorConvertToNumber<Int64>(), engine_args[3]->as<ASTLiteral &>().value);
-        Int64 max_time = applyVisitor(FieldVisitorConvertToNumber<Int64>(), engine_args[4]->as<ASTLiteral &>().value);
-        UInt64 min_rows = applyVisitor(FieldVisitorConvertToNumber<UInt64>(), engine_args[5]->as<ASTLiteral &>().value);
-        UInt64 max_rows = applyVisitor(FieldVisitorConvertToNumber<UInt64>(), engine_args[6]->as<ASTLiteral &>().value);
-        UInt64 min_bytes = applyVisitor(FieldVisitorConvertToNumber<UInt64>(), engine_args[7]->as<ASTLiteral &>().value);
-        UInt64 max_bytes = applyVisitor(FieldVisitorConvertToNumber<UInt64>(), engine_args[8]->as<ASTLiteral &>().value);
+        UInt64 num_buckets = applyVisitor(FieldVisitorConvertToNumber<UInt64>(), engine_args[i++]->as<ASTLiteral &>().value);
+
+        StorageBuffer::Thresholds min;
+        StorageBuffer::Thresholds max;
+        StorageBuffer::Thresholds flush;
+
+        min.time = applyVisitor(FieldVisitorConvertToNumber<UInt64>(), engine_args[i++]->as<ASTLiteral &>().value);
+        max.time = applyVisitor(FieldVisitorConvertToNumber<UInt64>(), engine_args[i++]->as<ASTLiteral &>().value);
+        min.rows = applyVisitor(FieldVisitorConvertToNumber<UInt64>(), engine_args[i++]->as<ASTLiteral &>().value);
+        max.rows = applyVisitor(FieldVisitorConvertToNumber<UInt64>(), engine_args[i++]->as<ASTLiteral &>().value);
+        min.bytes = applyVisitor(FieldVisitorConvertToNumber<UInt64>(), engine_args[i++]->as<ASTLiteral &>().value);
+        max.bytes = applyVisitor(FieldVisitorConvertToNumber<UInt64>(), engine_args[i++]->as<ASTLiteral &>().value);
+        if (engine_args.size() > i)
+            flush.time = applyVisitor(FieldVisitorConvertToNumber<UInt64>(), engine_args[i++]->as<ASTLiteral &>().value);
+        if (engine_args.size() > i)
+            flush.rows = applyVisitor(FieldVisitorConvertToNumber<UInt64>(), engine_args[i++]->as<ASTLiteral &>().value);
+        if (engine_args.size() > i)
+            flush.bytes = applyVisitor(FieldVisitorConvertToNumber<UInt64>(), engine_args[i++]->as<ASTLiteral &>().value);
 
         /// If destination_id is not set, do not write data from the buffer, but simply empty the buffer.
         StorageID destination_id = StorageID::createEmpty();
         if (!destination_table.empty())
         {
-            destination_id.database_name = args.context.resolveDatabase(destination_database);
+            destination_id.database_name = args.getContext()->resolveDatabase(destination_database);
             destination_id.table_name = destination_table;
         }
 
@@ -1028,12 +1131,11 @@ void registerStorageBuffer(StorageFactory & factory)
             args.table_id,
             args.columns,
             args.constraints,
-            args.context,
+            args.getContext(),
             num_buckets,
-            StorageBuffer::Thresholds{min_time, min_rows, min_bytes},
-            StorageBuffer::Thresholds{max_time, max_rows, max_bytes},
+            min, max, flush,
             destination_id,
-            static_cast<bool>(args.local_context.getSettingsRef().insert_allow_materialized_columns));
+            static_cast<bool>(args.getLocalContext()->getSettingsRef().insert_allow_materialized_columns));
     },
     {
         .supports_parallel_insert = true,
diff --git a/src/Storages/StorageBuffer.h b/src/Storages/StorageBuffer.h
index 46907ca196b..1747c024a74 100644
--- a/src/Storages/StorageBuffer.h
+++ b/src/Storages/StorageBuffer.h
@@ -1,15 +1,17 @@
 #pragma once
 
-#include <mutex>
-#include <atomic>
-#include <thread>
-#include <ext/shared_ptr_helper.h>
-#include <Core/NamesAndTypes.h>
 #include <Core/BackgroundSchedulePool.h>
-#include <Storages/IStorage.h>
+#include <Core/NamesAndTypes.h>
 #include <DataStreams/IBlockOutputStream.h>
+#include <Storages/IStorage.h>
+#include <ext/shared_ptr_helper.h>
+
 #include <Poco/Event.h>
 
+#include <atomic>
+#include <mutex>
+#include <thread>
+
 
 namespace Poco { class Logger; }
 
@@ -33,33 +35,36 @@ namespace DB
   * Thresholds can be exceeded. For example, if max_rows = 1 000 000, the buffer already had 500 000 rows,
   *  and a part of 800 000 rows is added, then there will be 1 300 000 rows in the buffer, and then such a block will be written to the subordinate table.
   *
+  * There are also separate thresholds for flush, those thresholds are checked only for non-direct flush.
+  * This maybe useful if you do not want to add extra latency for INSERT queries,
+  * so you can set max_rows=1e6 and flush_rows=500e3, then each 500e3 rows buffer will be flushed in background only.
+  *
   * When you destroy a Buffer table, all remaining data is flushed to the subordinate table.
   * The data in the buffer is not replicated, not logged to disk, not indexed. With a rough restart of the server, the data is lost.
   */
-class StorageBuffer final : public ext::shared_ptr_helper<StorageBuffer>, public IStorage
+class StorageBuffer final : public ext::shared_ptr_helper<StorageBuffer>, public IStorage, WithContext
 {
 friend struct ext::shared_ptr_helper<StorageBuffer>;
 friend class BufferSource;
 friend class BufferBlockOutputStream;
 
 public:
-    /// Thresholds.
     struct Thresholds
     {
-        time_t time;    /// The number of seconds from the insertion of the first row into the block.
-        size_t rows;    /// The number of rows in the block.
-        size_t bytes;   /// The number of (uncompressed) bytes in the block.
+        time_t time = 0;  /// The number of seconds from the insertion of the first row into the block.
+        size_t rows = 0;  /// The number of rows in the block.
+        size_t bytes = 0; /// The number of (uncompressed) bytes in the block.
     };
 
     std::string getName() const override { return "Buffer"; }
 
-    QueryProcessingStage::Enum getQueryProcessingStage(const Context &, QueryProcessingStage::Enum /*to_stage*/, SelectQueryInfo &) const override;
+    QueryProcessingStage::Enum getQueryProcessingStage(ContextPtr, QueryProcessingStage::Enum /*to_stage*/, SelectQueryInfo &) const override;
 
     Pipe read(
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
@@ -69,7 +74,7 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & metadata_snapshot,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
@@ -78,7 +83,7 @@ public:
 
     bool supportsSubcolumns() const override { return true; }
 
-    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, const Context & context) override;
+    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, ContextPtr context) override;
 
     void startup() override;
     /// Flush all buffers into the subordinate table and stop background thread.
@@ -90,19 +95,19 @@ public:
         bool final,
         bool deduplicate,
         const Names & deduplicate_by_columns,
-        const Context & context) override;
+        ContextPtr context) override;
 
     bool supportsSampling() const override { return true; }
     bool supportsPrewhere() const override;
     bool supportsFinal() const override { return true; }
     bool supportsIndexForIn() const override { return true; }
 
-    bool mayBenefitFromIndexForIn(const ASTPtr & left_in_operand, const Context & query_context, const StorageMetadataPtr & metadata_snapshot) const override;
+    bool mayBenefitFromIndexForIn(const ASTPtr & left_in_operand, ContextPtr query_context, const StorageMetadataPtr & metadata_snapshot) const override;
 
-    void checkAlterIsPossible(const AlterCommands & commands, const Settings & /* settings */) const override;
+    void checkAlterIsPossible(const AlterCommands & commands, ContextPtr context) const override;
 
     /// The structure of the subordinate table is not checked and does not change.
-    void alter(const AlterCommands & params, const Context & context, TableLockHolder & table_lock_holder) override;
+    void alter(const AlterCommands & params, ContextPtr context, TableLockHolder & table_lock_holder) override;
 
     std::optional<UInt64> totalRows(const Settings & settings) const override;
     std::optional<UInt64> totalBytes(const Settings & settings) const override;
@@ -112,13 +117,19 @@ public:
 
 
 private:
-    const Context & buffer_context;
-
     struct Buffer
     {
         time_t first_write_time = 0;
         Block data;
+
+        std::unique_lock<std::mutex> lockForReading() const;
+        std::unique_lock<std::mutex> lockForWriting() const;
+        std::unique_lock<std::mutex> tryLock() const;
+
+    private:
         mutable std::mutex mutex;
+
+        std::unique_lock<std::mutex> lockImpl(bool read) const;
     };
 
     /// There are `num_shards` of independent buffers.
@@ -127,6 +138,7 @@ private:
 
     const Thresholds min_thresholds;
     const Thresholds max_thresholds;
+    const Thresholds flush_thresholds;
 
     StorageID destination_id;
     bool allow_materialized;
@@ -145,8 +157,8 @@ private:
     /// are exceeded. If reset_block_structure is set - clears inner block
     /// structure inside buffer (useful in OPTIMIZE and ALTER).
     void flushBuffer(Buffer & buffer, bool check_thresholds, bool locked = false, bool reset_block_structure = false);
-    bool checkThresholds(const Buffer & buffer, time_t current_time, size_t additional_rows = 0, size_t additional_bytes = 0) const;
-    bool checkThresholdsImpl(size_t rows, size_t bytes, time_t time_passed) const;
+    bool checkThresholds(const Buffer & buffer, bool direct, time_t current_time, size_t additional_rows = 0, size_t additional_bytes = 0) const;
+    bool checkThresholdsImpl(bool direct, size_t rows, size_t bytes, time_t time_passed) const;
 
     /// `table` argument is passed, as it is sometimes evaluated beforehand. It must match the `destination`.
     void writeBlockToDestination(const Block & block, StoragePtr table);
@@ -165,10 +177,11 @@ protected:
         const StorageID & table_id_,
         const ColumnsDescription & columns_,
         const ConstraintsDescription & constraints_,
-        const Context & context_,
+        ContextPtr context_,
         size_t num_shards_,
         const Thresholds & min_thresholds_,
         const Thresholds & max_thresholds_,
+        const Thresholds & flush_thresholds_,
         const StorageID & destination_id,
         bool allow_materialized_);
 };
diff --git a/src/Storages/StorageDictionary.cpp b/src/Storages/StorageDictionary.cpp
index 32fe7b4c026..e2cab153092 100644
--- a/src/Storages/StorageDictionary.cpp
+++ b/src/Storages/StorageDictionary.cpp
@@ -89,13 +89,6 @@ String StorageDictionary::generateNamesAndTypesDescription(const NamesAndTypesLi
     return ss.str();
 }
 
-String StorageDictionary::resolvedDictionaryName() const
-{
-    if (location == Location::SameDatabaseAndNameAsDictionary)
-        return dictionary_name;
-    return DatabaseCatalog::instance().resolveDictionaryName(dictionary_name);
-}
-
 StorageDictionary::StorageDictionary(
     const StorageID & table_id_,
     const String & dictionary_name_,
@@ -135,12 +128,12 @@ Pipe StorageDictionary::read(
     const Names & column_names,
     const StorageMetadataPtr & /*metadata_snapshot*/,
     SelectQueryInfo & /*query_info*/,
-    const Context & context,
+    ContextPtr context,
     QueryProcessingStage::Enum /*processed_stage*/,
     const size_t max_block_size,
     const unsigned /*threads*/)
 {
-    auto dictionary = context.getExternalDictionariesLoader().getDictionary(resolvedDictionaryName());
+    auto dictionary = context->getExternalDictionariesLoader().getDictionary(dictionary_name, context);
     auto stream = dictionary->getBlockInputStream(column_names, max_block_size);
     /// TODO: update dictionary interface for processors.
     return Pipe(std::make_shared<SourceFromInputStream>(stream));
@@ -155,13 +148,12 @@ void registerStorageDictionary(StorageFactory & factory)
             throw Exception("Storage Dictionary requires single parameter: name of dictionary",
                 ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
 
-        args.engine_args[0] = evaluateConstantExpressionOrIdentifierAsLiteral(args.engine_args[0], args.local_context);
+        args.engine_args[0] = evaluateConstantExpressionOrIdentifierAsLiteral(args.engine_args[0], args.getLocalContext());
         String dictionary_name = args.engine_args[0]->as<ASTLiteral &>().value.safeGet<String>();
 
         if (!args.attach)
         {
-            auto resolved = DatabaseCatalog::instance().resolveDictionaryName(dictionary_name);
-            const auto & dictionary = args.context.getExternalDictionariesLoader().getDictionary(resolved);
+            const auto & dictionary = args.getContext()->getExternalDictionariesLoader().getDictionary(dictionary_name, args.getContext());
             const DictionaryStructure & dictionary_structure = dictionary->getStructure();
             checkNamesAndTypesCompatibleWithDictionary(dictionary_name, args.columns, dictionary_structure);
         }
diff --git a/src/Storages/StorageDictionary.h b/src/Storages/StorageDictionary.h
index 589ff7d4654..9e8564d4349 100644
--- a/src/Storages/StorageDictionary.h
+++ b/src/Storages/StorageDictionary.h
@@ -7,10 +7,12 @@
 namespace DB
 {
 struct DictionaryStructure;
+class TableFunctionDictionary;
 
 class StorageDictionary final : public ext::shared_ptr_helper<StorageDictionary>, public IStorage
 {
     friend struct ext::shared_ptr_helper<StorageDictionary>;
+    friend class TableFunctionDictionary;
 public:
     std::string getName() const override { return "Dictionary"; }
 
@@ -21,7 +23,7 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned threads) override;
@@ -30,7 +32,6 @@ public:
     static String generateNamesAndTypesDescription(const NamesAndTypesList & list);
 
     const String & dictionaryName() const { return dictionary_name; }
-    String resolvedDictionaryName() const;
 
     /// Specifies where the table is located relative to the dictionary.
     enum class Location
diff --git a/src/Storages/StorageDistributed.cpp b/src/Storages/StorageDistributed.cpp
index c08dc38fa2d..3d96796a79b 100644
--- a/src/Storages/StorageDistributed.cpp
+++ b/src/Storages/StorageDistributed.cpp
@@ -1,8 +1,11 @@
 #include <Storages/StorageDistributed.h>
 
 #include <Databases/IDatabase.h>
+
 #include <Disks/IDisk.h>
 
+#include <DataStreams/RemoteBlockInputStream.h>
+
 #include <DataTypes/DataTypeFactory.h>
 #include <DataTypes/DataTypeUUID.h>
 #include <DataTypes/DataTypesNumber.h>
@@ -14,10 +17,12 @@
 #include <Columns/ColumnConst.h>
 
 #include <Common/Macros.h>
+#include <Common/ProfileEvents.h>
 #include <Common/escapeForFileName.h>
 #include <Common/typeid_cast.h>
 #include <Common/quoteString.h>
 #include <Common/randomSeed.h>
+#include <Common/formatReadable.h>
 
 #include <Parsers/ASTDropQuery.h>
 #include <Parsers/ASTExpressionList.h>
@@ -29,6 +34,7 @@
 #include <Parsers/ParserAlterQuery.h>
 #include <Parsers/TablePropertiesQueriesASTs.h>
 #include <Parsers/parseQuery.h>
+#include <Parsers/queryToString.h>
 
 #include <Interpreters/ClusterProxy/SelectStreamFactory.h>
 #include <Interpreters/ClusterProxy/executeQuery.h>
@@ -37,6 +43,7 @@
 #include <Interpreters/InterpreterAlterQuery.h>
 #include <Interpreters/InterpreterDescribeQuery.h>
 #include <Interpreters/InterpreterSelectQuery.h>
+#include <Interpreters/JoinedTables.h>
 #include <Interpreters/TranslateQualifiedNamesVisitor.h>
 #include <Interpreters/TreeRewriter.h>
 #include <Interpreters/Context.h>
@@ -46,12 +53,20 @@
 #include <Interpreters/getTableExpressions.h>
 #include <Functions/IFunction.h>
 
+#include <Processors/QueryPlan/BuildQueryPipelineSettings.h>
+#include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
+#include <Processors/QueryPlan/ReadFromPreparedSource.h>
+#include <Processors/Sources/NullSource.h>
+#include <Processors/Sources/SourceFromInputStream.h>
+#include <Processors/NullSink.h>
+
 #include <Core/Field.h>
 #include <Core/Settings.h>
 
 #include <IO/ReadHelpers.h>
 #include <IO/WriteBufferFromString.h>
 #include <IO/Operators.h>
+#include <IO/ConnectionTimeoutsContext.h>
 
 #include <Poco/DirectoryIterator.h>
 
@@ -67,6 +82,15 @@ const UInt64 FORCE_OPTIMIZE_SKIP_UNUSED_SHARDS_HAS_SHARDING_KEY = 1;
 const UInt64 FORCE_OPTIMIZE_SKIP_UNUSED_SHARDS_ALWAYS           = 2;
 
 const UInt64 DISTRIBUTED_GROUP_BY_NO_MERGE_AFTER_AGGREGATION = 2;
+
+const UInt64 PARALLEL_DISTRIBUTED_INSERT_SELECT_ALL = 2;
+}
+
+namespace ProfileEvents
+{
+    extern const Event DistributedRejectedInserts;
+    extern const Event DistributedDelayedInserts;
+    extern const Event DistributedDelayedInsertsMilliseconds;
 }
 
 namespace DB
@@ -74,6 +98,7 @@ namespace DB
 
 namespace ErrorCodes
 {
+    extern const int LOGICAL_ERROR;
     extern const int NOT_IMPLEMENTED;
     extern const int STORAGE_REQUIRES_PARAMETER;
     extern const int BAD_ARGUMENTS;
@@ -84,6 +109,9 @@ namespace ErrorCodes
     extern const int TOO_MANY_ROWS;
     extern const int UNABLE_TO_SKIP_UNUSED_SHARDS;
     extern const int INVALID_SHARD_ID;
+    extern const int ALTER_OF_COLUMN_IS_FORBIDDEN;
+    extern const int DISTRIBUTED_TOO_MANY_PENDING_BYTES;
+    extern const int ARGUMENT_OUT_OF_BOUND;
 }
 
 namespace ActionLocks
@@ -193,7 +221,7 @@ std::string makeFormattedListOfShards(const ClusterPtr & cluster)
     return buf.str();
 }
 
-ExpressionActionsPtr buildShardingKeyExpression(const ASTPtr & sharding_key, const Context & context, const NamesAndTypesList & columns, bool project)
+ExpressionActionsPtr buildShardingKeyExpression(const ASTPtr & sharding_key, ContextPtr context, const NamesAndTypesList & columns, bool project)
 {
     ASTPtr query = sharding_key;
     auto syntax_result = TreeRewriter(context).analyze(query, columns);
@@ -241,7 +269,7 @@ public:
 
 void replaceConstantExpressions(
     ASTPtr & node,
-    const Context & context,
+    ContextPtr context,
     const NamesAndTypesList & columns,
     ConstStoragePtr storage,
     const StorageMetadataPtr & metadata_snapshot)
@@ -361,7 +389,7 @@ StorageDistributed::StorageDistributed(
     const String & remote_database_,
     const String & remote_table_,
     const String & cluster_name_,
-    const Context & context_,
+    ContextPtr context_,
     const ASTPtr & sharding_key_,
     const String & storage_policy_name_,
     const String & relative_data_path_,
@@ -369,12 +397,12 @@ StorageDistributed::StorageDistributed(
     bool attach_,
     ClusterPtr owned_cluster_)
     : IStorage(id_)
+    , WithContext(context_->getGlobalContext())
     , remote_database(remote_database_)
     , remote_table(remote_table_)
-    , global_context(context_.getGlobalContext())
     , log(&Poco::Logger::get("StorageDistributed (" + id_.table_name + ")"))
     , owned_cluster(std::move(owned_cluster_))
-    , cluster_name(global_context.getMacros()->expand(cluster_name_))
+    , cluster_name(getContext()->getMacros()->expand(cluster_name_))
     , has_sharding_key(sharding_key_)
     , relative_data_path(relative_data_path_)
     , distributed_settings(distributed_settings_)
@@ -387,14 +415,14 @@ StorageDistributed::StorageDistributed(
 
     if (sharding_key_)
     {
-        sharding_key_expr = buildShardingKeyExpression(sharding_key_, global_context, storage_metadata.getColumns().getAllPhysical(), false);
+        sharding_key_expr = buildShardingKeyExpression(sharding_key_, getContext(), storage_metadata.getColumns().getAllPhysical(), false);
         sharding_key_column_name = sharding_key_->getColumnName();
         sharding_key_is_deterministic = isExpressionActionsDeterministics(sharding_key_expr);
     }
 
     if (!relative_data_path.empty())
     {
-        storage_policy = global_context.getStoragePolicy(storage_policy_name_);
+        storage_policy = getContext()->getStoragePolicy(storage_policy_name_);
         data_volume = storage_policy->getVolume(0);
         if (storage_policy->getVolumes().size() > 1)
             LOG_WARNING(log, "Storage policy for Distributed table has multiple volumes. "
@@ -404,7 +432,7 @@ StorageDistributed::StorageDistributed(
     /// Sanity check. Skip check if the table is already created to allow the server to start.
     if (!attach_ && !cluster_name.empty())
     {
-        size_t num_local_shards = global_context.getCluster(cluster_name)->getLocalShardCount();
+        size_t num_local_shards = getContext()->getCluster(cluster_name)->getLocalShardCount();
         if (num_local_shards && remote_database == id_.database_name && remote_table == id_.table_name)
             throw Exception("Distributed table " + id_.table_name + " looks at itself", ErrorCodes::INFINITE_LOOP);
     }
@@ -417,22 +445,23 @@ StorageDistributed::StorageDistributed(
     const ConstraintsDescription & constraints_,
     ASTPtr remote_table_function_ptr_,
     const String & cluster_name_,
-    const Context & context_,
+    ContextPtr context_,
     const ASTPtr & sharding_key_,
     const String & storage_policy_name_,
     const String & relative_data_path_,
     const DistributedSettings & distributed_settings_,
     bool attach,
     ClusterPtr owned_cluster_)
-    : StorageDistributed(id_, columns_, constraints_, String{}, String{}, cluster_name_, context_, sharding_key_, storage_policy_name_, relative_data_path_, distributed_settings_, attach, std::move(owned_cluster_))
+    : StorageDistributed(id_, columns_, constraints_, String{}, String{}, cluster_name_, context_, sharding_key_,
+    storage_policy_name_, relative_data_path_, distributed_settings_, attach, std::move(owned_cluster_))
 {
     remote_table_function_ptr = std::move(remote_table_function_ptr_);
 }
 
 QueryProcessingStage::Enum StorageDistributed::getQueryProcessingStage(
-    const Context & context, QueryProcessingStage::Enum to_stage, SelectQueryInfo & query_info) const
+    ContextPtr local_context, QueryProcessingStage::Enum to_stage, SelectQueryInfo & query_info) const
 {
-    const auto & settings = context.getSettingsRef();
+    const auto & settings = local_context->getSettingsRef();
     auto metadata_snapshot = getInMemoryMetadataPtr();
 
     ClusterPtr cluster = getCluster();
@@ -440,18 +469,20 @@ QueryProcessingStage::Enum StorageDistributed::getQueryProcessingStage(
 
     /// Always calculate optimized cluster here, to avoid conditions during read()
     /// (Anyway it will be calculated in the read())
-    if (settings.optimize_skip_unused_shards)
+    if (getClusterQueriedNodes(settings, cluster) > 1 && settings.optimize_skip_unused_shards)
     {
-        ClusterPtr optimized_cluster = getOptimizedCluster(context, metadata_snapshot, query_info.query);
+        ClusterPtr optimized_cluster = getOptimizedCluster(local_context, metadata_snapshot, query_info.query);
         if (optimized_cluster)
         {
-            LOG_DEBUG(log, "Skipping irrelevant shards - the query will be sent to the following shards of the cluster (shard numbers): {}", makeFormattedListOfShards(optimized_cluster));
+            LOG_DEBUG(log, "Skipping irrelevant shards - the query will be sent to the following shards of the cluster (shard numbers): {}",
+                    makeFormattedListOfShards(optimized_cluster));
             cluster = optimized_cluster;
-            query_info.cluster = cluster;
+            query_info.optimized_cluster = cluster;
         }
         else
         {
-            LOG_DEBUG(log, "Unable to figure out irrelevant shards from WHERE/PREWHERE clauses - the query will be sent to all shards of the cluster{}", has_sharding_key ? "" : " (no sharding key)");
+            LOG_DEBUG(log, "Unable to figure out irrelevant shards from WHERE/PREWHERE clauses - the query will be sent to all shards of the cluster{}",
+                    has_sharding_key ? "" : " (no sharding key)");
         }
     }
 
@@ -494,14 +525,16 @@ Pipe StorageDistributed::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & query_info,
-    const Context & context,
+    ContextPtr local_context,
     QueryProcessingStage::Enum processed_stage,
     const size_t max_block_size,
     const unsigned num_streams)
 {
     QueryPlan plan;
-    read(plan, column_names, metadata_snapshot, query_info, context, processed_stage, max_block_size, num_streams);
-    return plan.convertToPipe();
+    read(plan, column_names, metadata_snapshot, query_info, local_context, processed_stage, max_block_size, num_streams);
+    return plan.convertToPipe(
+        QueryPlanOptimizationSettings::fromContext(local_context),
+        BuildQueryPipelineSettings::fromContext(local_context));
 }
 
 void StorageDistributed::read(
@@ -509,7 +542,7 @@ void StorageDistributed::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & query_info,
-    const Context & context,
+    ContextPtr local_context,
     QueryProcessingStage::Enum processed_stage,
     const size_t /*max_block_size*/,
     const unsigned /*num_streams*/)
@@ -518,9 +551,20 @@ void StorageDistributed::read(
         query_info.query, remote_database, remote_table, remote_table_function_ptr);
 
     Block header =
-        InterpreterSelectQuery(query_info.query, context, SelectQueryOptions(processed_stage)).getSampleBlock();
+        InterpreterSelectQuery(query_info.query, local_context, SelectQueryOptions(processed_stage).analyze()).getSampleBlock();
 
-    const Scalars & scalars = context.hasQueryContext() ? context.getQueryContext().getScalars() : Scalars{};
+    /// Return directly (with correct header) if no shard to query.
+    if (query_info.getCluster()->getShardsInfo().empty())
+    {
+        Pipe pipe(std::make_shared<NullSource>(header));
+        auto read_from_pipe = std::make_unique<ReadFromPreparedSource>(std::move(pipe));
+        read_from_pipe->setStepDescription("Read from NullSource (Distributed)");
+        query_plan.addStep(std::move(read_from_pipe));
+
+        return;
+    }
+
+    const Scalars & scalars = local_context->hasQueryContext() ? local_context->getQueryContext()->getScalars() : Scalars{};
 
     bool has_virtual_shard_num_column = std::find(column_names.begin(), column_names.end(), "_shard_num") != column_names.end();
     if (has_virtual_shard_num_column && !isVirtualColumn("_shard_num", metadata_snapshot))
@@ -528,19 +572,30 @@ void StorageDistributed::read(
 
     ClusterProxy::SelectStreamFactory select_stream_factory = remote_table_function_ptr
         ? ClusterProxy::SelectStreamFactory(
-            header, processed_stage, remote_table_function_ptr, scalars, has_virtual_shard_num_column, context.getExternalTables())
+            header, processed_stage, remote_table_function_ptr, scalars, has_virtual_shard_num_column, local_context->getExternalTables())
         : ClusterProxy::SelectStreamFactory(
-            header, processed_stage, StorageID{remote_database, remote_table}, scalars, has_virtual_shard_num_column, context.getExternalTables());
+            header,
+            processed_stage,
+            StorageID{remote_database, remote_table},
+            scalars,
+            has_virtual_shard_num_column,
+            local_context->getExternalTables());
 
     ClusterProxy::executeQuery(query_plan, select_stream_factory, log,
-        modified_query_ast, context, query_info);
+        modified_query_ast, local_context, query_info,
+        sharding_key_expr, sharding_key_column_name,
+        getCluster());
+
+    /// This is a bug, it is possible only when there is no shards to query, and this is handled earlier.
+    if (!query_plan.isInitialized())
+        throw Exception("Pipeline is not initialized", ErrorCodes::LOGICAL_ERROR);
 }
 
 
-BlockOutputStreamPtr StorageDistributed::write(const ASTPtr &, const StorageMetadataPtr & metadata_snapshot, const Context & context)
+BlockOutputStreamPtr StorageDistributed::write(const ASTPtr &, const StorageMetadataPtr & metadata_snapshot, ContextPtr local_context)
 {
     auto cluster = getCluster();
-    const auto & settings = context.getSettingsRef();
+    const auto & settings = local_context->getSettingsRef();
 
     /// Ban an attempt to make async insert into the table belonging to DatabaseMemory
     if (!storage_policy && !owned_cluster && !settings.insert_distributed_sync && !settings.insert_shard_id)
@@ -570,15 +625,94 @@ BlockOutputStreamPtr StorageDistributed::write(const ASTPtr &, const StorageMeta
 
     /// DistributedBlockOutputStream will not own cluster, but will own ConnectionPools of the cluster
     return std::make_shared<DistributedBlockOutputStream>(
-        context, *this, metadata_snapshot,
+        local_context, *this, metadata_snapshot,
         createInsertToRemoteTableQuery(
             remote_database, remote_table, metadata_snapshot->getSampleBlockNonMaterialized()),
         cluster, insert_sync, timeout);
 }
 
 
-void StorageDistributed::checkAlterIsPossible(const AlterCommands & commands, const Settings & /* settings */) const
+QueryPipelinePtr StorageDistributed::distributedWrite(const ASTInsertQuery & query, ContextPtr local_context)
 {
+    const Settings & settings = local_context->getSettingsRef();
+    std::shared_ptr<StorageDistributed> storage_src;
+    auto & select = query.select->as<ASTSelectWithUnionQuery &>();
+    auto new_query = std::dynamic_pointer_cast<ASTInsertQuery>(query.clone());
+    if (select.list_of_selects->children.size() == 1)
+    {
+        if (auto * select_query = select.list_of_selects->children.at(0)->as<ASTSelectQuery>())
+        {
+            JoinedTables joined_tables(Context::createCopy(local_context), *select_query);
+
+            if (joined_tables.tablesCount() == 1)
+            {
+                storage_src = std::dynamic_pointer_cast<StorageDistributed>(joined_tables.getLeftTableStorage());
+                if (storage_src)
+                {
+                    const auto select_with_union_query = std::make_shared<ASTSelectWithUnionQuery>();
+                    select_with_union_query->list_of_selects = std::make_shared<ASTExpressionList>();
+
+                    auto new_select_query = std::dynamic_pointer_cast<ASTSelectQuery>(select_query->clone());
+                    select_with_union_query->list_of_selects->children.push_back(new_select_query);
+
+                    new_select_query->replaceDatabaseAndTable(storage_src->getRemoteDatabaseName(), storage_src->getRemoteTableName());
+
+                    new_query->select = select_with_union_query;
+                }
+            }
+        }
+    }
+
+    if (!storage_src || storage_src->getClusterName() != getClusterName())
+    {
+        return nullptr;
+    }
+
+    if (settings.parallel_distributed_insert_select == PARALLEL_DISTRIBUTED_INSERT_SELECT_ALL)
+    {
+        new_query->table_id = StorageID(getRemoteDatabaseName(), getRemoteTableName());
+    }
+
+    const auto & cluster = getCluster();
+    const auto & shards_info = cluster->getShardsInfo();
+
+    std::vector<std::unique_ptr<QueryPipeline>> pipelines;
+
+    String new_query_str = queryToString(new_query);
+    for (size_t shard_index : ext::range(0, shards_info.size()))
+    {
+        const auto & shard_info = shards_info[shard_index];
+        if (shard_info.isLocal())
+        {
+            InterpreterInsertQuery interpreter(new_query, local_context);
+            pipelines.emplace_back(std::make_unique<QueryPipeline>(interpreter.execute().pipeline));
+        }
+        else
+        {
+            auto timeouts = ConnectionTimeouts::getTCPTimeoutsWithFailover(settings);
+            auto connections = shard_info.pool->getMany(timeouts, &settings, PoolMode::GET_ONE);
+            if (connections.empty() || connections.front().isNull())
+                throw Exception(
+                    "Expected exactly one connection for shard " + toString(shard_info.shard_num), ErrorCodes::LOGICAL_ERROR);
+
+            ///  INSERT SELECT query returns empty block
+            auto in_stream = std::make_shared<RemoteBlockInputStream>(std::move(connections), new_query_str, Block{}, local_context);
+            pipelines.emplace_back(std::make_unique<QueryPipeline>());
+            pipelines.back()->init(Pipe(std::make_shared<SourceFromInputStream>(std::move(in_stream))));
+            pipelines.back()->setSinks([](const Block & header, QueryPipeline::StreamType) -> ProcessorPtr
+            {
+                return std::make_shared<EmptySink>(header);
+            });
+        }
+    }
+
+    return std::make_unique<QueryPipeline>(QueryPipeline::unitePipelines(std::move(pipelines)));
+}
+
+
+void StorageDistributed::checkAlterIsPossible(const AlterCommands & commands, ContextPtr local_context) const
+{
+    auto name_deps = getDependentViewsByColumn(local_context);
     for (const auto & command : commands)
     {
         if (command.type != AlterCommand::Type::ADD_COLUMN
@@ -589,24 +723,35 @@ void StorageDistributed::checkAlterIsPossible(const AlterCommands & commands, co
 
             throw Exception("Alter of type '" + alterTypeToString(command.type) + "' is not supported by storage " + getName(),
                 ErrorCodes::NOT_IMPLEMENTED);
+        if (command.type == AlterCommand::DROP_COLUMN)
+        {
+            const auto & deps_mv = name_deps[command.column_name];
+            if (!deps_mv.empty())
+            {
+                throw Exception(
+                    "Trying to ALTER DROP column " + backQuoteIfNeed(command.column_name) + " which is referenced by materialized view "
+                        + toString(deps_mv),
+                    ErrorCodes::ALTER_OF_COLUMN_IS_FORBIDDEN);
+            }
+        }
     }
 }
 
-void StorageDistributed::alter(const AlterCommands & params, const Context & context, TableLockHolder &)
+void StorageDistributed::alter(const AlterCommands & params, ContextPtr local_context, TableLockHolder &)
 {
     auto table_id = getStorageID();
 
-    checkAlterIsPossible(params, context.getSettingsRef());
+    checkAlterIsPossible(params, local_context);
     StorageInMemoryMetadata new_metadata = getInMemoryMetadata();
-    params.apply(new_metadata, context);
-    DatabaseCatalog::instance().getDatabase(table_id.database_name)->alterTable(context, table_id, new_metadata);
+    params.apply(new_metadata, local_context);
+    DatabaseCatalog::instance().getDatabase(table_id.database_name)->alterTable(local_context, table_id, new_metadata);
     setInMemoryMetadata(new_metadata);
 }
 
 
 void StorageDistributed::startup()
 {
-    if (remote_database.empty() && !remote_table_function_ptr)
+    if (remote_database.empty() && !remote_table_function_ptr && !getCluster()->maybeCrossReplication())
         LOG_WARNING(log, "Name of remote database is empty. Default database will be used implicitly.");
 
     if (!storage_policy)
@@ -673,7 +818,7 @@ Strings StorageDistributed::getDataPaths() const
     return paths;
 }
 
-void StorageDistributed::truncate(const ASTPtr &, const StorageMetadataPtr &, const Context &, TableExclusiveLockHolder &)
+void StorageDistributed::truncate(const ASTPtr &, const StorageMetadataPtr &, ContextPtr, TableExclusiveLockHolder &)
 {
     std::lock_guard lock(cluster_nodes_mutex);
 
@@ -740,7 +885,7 @@ StorageDistributedDirectoryMonitor& StorageDistributed::requireDirectoryMonitor(
             *this, disk, relative_data_path + name,
             node_data.connection_pool,
             monitors_blocker,
-            global_context.getDistributedSchedulePool());
+            getContext()->getDistributedSchedulePool());
     }
     return *node_data.directory_monitor;
 }
@@ -755,6 +900,14 @@ std::vector<StorageDistributedDirectoryMonitor::Status> StorageDistributed::getD
     return statuses;
 }
 
+std::optional<UInt64> StorageDistributed::totalBytes(const Settings &) const
+{
+    UInt64 total_bytes = 0;
+    for (const auto & status : getDirectoryMonitorsStatuses())
+        total_bytes += status.bytes_count;
+    return total_bytes;
+}
+
 size_t StorageDistributed::getShardCount() const
 {
     return getCluster()->getShardCount();
@@ -762,19 +915,20 @@ size_t StorageDistributed::getShardCount() const
 
 ClusterPtr StorageDistributed::getCluster() const
 {
-    return owned_cluster ? owned_cluster : global_context.getCluster(cluster_name);
+    return owned_cluster ? owned_cluster : getContext()->getCluster(cluster_name);
 }
 
-ClusterPtr StorageDistributed::getOptimizedCluster(const Context & context, const StorageMetadataPtr & metadata_snapshot, const ASTPtr & query_ptr) const
+ClusterPtr StorageDistributed::getOptimizedCluster(
+    ContextPtr local_context, const StorageMetadataPtr & metadata_snapshot, const ASTPtr & query_ptr) const
 {
     ClusterPtr cluster = getCluster();
-    const Settings & settings = context.getSettingsRef();
+    const Settings & settings = local_context->getSettingsRef();
 
     bool sharding_key_is_usable = settings.allow_nondeterministic_optimize_skip_unused_shards || sharding_key_is_deterministic;
 
     if (has_sharding_key && sharding_key_is_usable)
     {
-        ClusterPtr optimized = skipUnusedShards(cluster, query_ptr, metadata_snapshot, context);
+        ClusterPtr optimized = skipUnusedShards(cluster, query_ptr, metadata_snapshot, local_context);
         if (optimized)
             return optimized;
     }
@@ -796,7 +950,7 @@ ClusterPtr StorageDistributed::getOptimizedCluster(const Context & context, cons
             throw Exception(exception_message.str(), ErrorCodes::UNABLE_TO_SKIP_UNUSED_SHARDS);
     }
 
-    return cluster;
+    return {};
 }
 
 IColumn::Selector StorageDistributed::createSelector(const ClusterPtr cluster, const ColumnWithTypeAndName & result)
@@ -831,7 +985,7 @@ ClusterPtr StorageDistributed::skipUnusedShards(
     ClusterPtr cluster,
     const ASTPtr & query_ptr,
     const StorageMetadataPtr & metadata_snapshot,
-    const Context & context) const
+    ContextPtr local_context) const
 {
     const auto & select = query_ptr->as<ASTSelectQuery &>();
 
@@ -850,8 +1004,25 @@ ClusterPtr StorageDistributed::skipUnusedShards(
         condition_ast = select.prewhere() ? select.prewhere()->clone() : select.where()->clone();
     }
 
-    replaceConstantExpressions(condition_ast, context, metadata_snapshot->getColumns().getAll(), shared_from_this(), metadata_snapshot);
-    const auto blocks = evaluateExpressionOverConstantCondition(condition_ast, sharding_key_expr);
+    replaceConstantExpressions(condition_ast, local_context, metadata_snapshot->getColumns().getAll(), shared_from_this(), metadata_snapshot);
+
+    size_t limit = local_context->getSettingsRef().optimize_skip_unused_shards_limit;
+    if (!limit || limit > SSIZE_MAX)
+    {
+        throw Exception("optimize_skip_unused_shards_limit out of range (0, {}]", ErrorCodes::ARGUMENT_OUT_OF_BOUND, SSIZE_MAX);
+    }
+    // To interpret limit==0 as limit is reached
+    ++limit;
+    const auto blocks = evaluateExpressionOverConstantCondition(condition_ast, sharding_key_expr, limit);
+
+    if (!limit)
+    {
+        LOG_TRACE(log,
+            "Number of values for sharding key exceeds optimize_skip_unused_shards_limit={}, "
+            "try to increase it, but note that this may increase query processing time.",
+            local_context->getSettingsRef().optimize_skip_unused_shards_limit);
+        return nullptr;
+    }
 
     // Can't get definite answer if we can skip any shards
     if (!blocks)
@@ -882,10 +1053,10 @@ ActionLock StorageDistributed::getActionLock(StorageActionBlockType type)
     return {};
 }
 
-void StorageDistributed::flushClusterNodesAllData(const Context & context)
+void StorageDistributed::flushClusterNodesAllData(ContextPtr local_context)
 {
     /// Sync SYSTEM FLUSH DISTRIBUTED with TRUNCATE
-    auto table_lock = lockForShare(context.getCurrentQueryId(), context.getSettingsRef().lock_acquire_timeout);
+    auto table_lock = lockForShare(local_context->getCurrentQueryId(), local_context->getSettingsRef().lock_acquire_timeout);
 
     std::vector<std::shared_ptr<StorageDistributedDirectoryMonitor>> directory_monitors;
 
@@ -954,6 +1125,54 @@ void StorageDistributed::renameOnDisk(const String & new_path_to_table_data)
     relative_data_path = new_path_to_table_data;
 }
 
+void StorageDistributed::delayInsertOrThrowIfNeeded() const
+{
+    if (!distributed_settings.bytes_to_throw_insert &&
+        !distributed_settings.bytes_to_delay_insert)
+        return;
+
+    UInt64 total_bytes = *totalBytes(getContext()->getSettingsRef());
+
+    if (distributed_settings.bytes_to_throw_insert && total_bytes > distributed_settings.bytes_to_throw_insert)
+    {
+        ProfileEvents::increment(ProfileEvents::DistributedRejectedInserts);
+        throw Exception(ErrorCodes::DISTRIBUTED_TOO_MANY_PENDING_BYTES,
+            "Too many bytes pending for async INSERT: {} (bytes_to_throw_insert={})",
+            formatReadableSizeWithBinarySuffix(total_bytes),
+            formatReadableSizeWithBinarySuffix(distributed_settings.bytes_to_throw_insert));
+    }
+
+    if (distributed_settings.bytes_to_delay_insert && total_bytes > distributed_settings.bytes_to_delay_insert)
+    {
+        /// Step is 5% of the delay and minimal one second.
+        /// NOTE: max_delay_to_insert is in seconds, and step is in ms.
+        const size_t step_ms = std::min<double>(1., double(distributed_settings.max_delay_to_insert) * 1'000 * 0.05);
+        UInt64 delayed_ms = 0;
+
+        do {
+            delayed_ms += step_ms;
+            std::this_thread::sleep_for(std::chrono::milliseconds(step_ms));
+        } while (*totalBytes(getContext()->getSettingsRef()) > distributed_settings.bytes_to_delay_insert && delayed_ms < distributed_settings.max_delay_to_insert*1000);
+
+        ProfileEvents::increment(ProfileEvents::DistributedDelayedInserts);
+        ProfileEvents::increment(ProfileEvents::DistributedDelayedInsertsMilliseconds, delayed_ms);
+
+        UInt64 new_total_bytes = *totalBytes(getContext()->getSettingsRef());
+        LOG_INFO(log, "Too many bytes pending for async INSERT: was {}, now {}, INSERT was delayed to {} ms",
+            formatReadableSizeWithBinarySuffix(total_bytes),
+            formatReadableSizeWithBinarySuffix(new_total_bytes),
+            delayed_ms);
+
+        if (new_total_bytes > distributed_settings.bytes_to_delay_insert)
+        {
+            ProfileEvents::increment(ProfileEvents::DistributedRejectedInserts);
+            throw Exception(ErrorCodes::DISTRIBUTED_TOO_MANY_PENDING_BYTES,
+                "Too many bytes pending for async INSERT: {} (bytes_to_delay_insert={})",
+                formatReadableSizeWithBinarySuffix(new_total_bytes),
+                formatReadableSizeWithBinarySuffix(distributed_settings.bytes_to_delay_insert));
+        }
+    }
+}
 
 void registerStorageDistributed(StorageFactory & factory)
 {
@@ -988,8 +1207,8 @@ void registerStorageDistributed(StorageFactory & factory)
 
         String cluster_name = getClusterNameAndMakeLiteral(engine_args[0]);
 
-        engine_args[1] = evaluateConstantExpressionOrIdentifierAsLiteral(engine_args[1], args.local_context);
-        engine_args[2] = evaluateConstantExpressionOrIdentifierAsLiteral(engine_args[2], args.local_context);
+        engine_args[1] = evaluateConstantExpressionOrIdentifierAsLiteral(engine_args[1], args.getLocalContext());
+        engine_args[2] = evaluateConstantExpressionOrIdentifierAsLiteral(engine_args[2], args.getLocalContext());
 
         String remote_database = engine_args[1]->as<ASTLiteral &>().value.safeGet<String>();
         String remote_table = engine_args[2]->as<ASTLiteral &>().value.safeGet<String>();
@@ -1000,7 +1219,7 @@ void registerStorageDistributed(StorageFactory & factory)
         /// Check that sharding_key exists in the table and has numeric type.
         if (sharding_key)
         {
-            auto sharding_expr = buildShardingKeyExpression(sharding_key, args.context, args.columns.getAllPhysical(), true);
+            auto sharding_expr = buildShardingKeyExpression(sharding_key, args.getContext(), args.columns.getAllPhysical(), true);
             const Block & block = sharding_expr->getSampleBlock();
 
             if (block.columns() != 1)
@@ -1020,10 +1239,21 @@ void registerStorageDistributed(StorageFactory & factory)
             distributed_settings.loadFromQuery(*args.storage_def);
         }
 
+        if (distributed_settings.max_delay_to_insert < 1)
+            throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND,
+                "max_delay_to_insert cannot be less then 1");
+
+        if (distributed_settings.bytes_to_throw_insert && distributed_settings.bytes_to_delay_insert &&
+            distributed_settings.bytes_to_throw_insert <= distributed_settings.bytes_to_delay_insert)
+        {
+            throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND,
+                "bytes_to_throw_insert cannot be less or equal to bytes_to_delay_insert (since it is handled first)");
+        }
+
         return StorageDistributed::create(
             args.table_id, args.columns, args.constraints,
             remote_database, remote_table, cluster_name,
-            args.context,
+            args.getContext(),
             sharding_key,
             storage_policy,
             args.relative_data_path,
diff --git a/src/Storages/StorageDistributed.h b/src/Storages/StorageDistributed.h
index 4d3869f7c5c..886a8e032de 100644
--- a/src/Storages/StorageDistributed.h
+++ b/src/Storages/StorageDistributed.h
@@ -36,11 +36,12 @@ using ExpressionActionsPtr = std::shared_ptr<ExpressionActions>;
   * You can pass one address, not several.
   * In this case, the table can be considered remote, rather than distributed.
   */
-class StorageDistributed final : public ext::shared_ptr_helper<StorageDistributed>, public IStorage
+class StorageDistributed final : public ext::shared_ptr_helper<StorageDistributed>, public IStorage, WithContext
 {
     friend struct ext::shared_ptr_helper<StorageDistributed>;
     friend class DistributedBlockOutputStream;
     friend class StorageDistributedDirectoryMonitor;
+    friend class StorageSystemDistributionQueue;
 
 public:
     ~StorageDistributed() override;
@@ -54,13 +55,13 @@ public:
 
     bool isRemote() const override { return true; }
 
-    QueryProcessingStage::Enum getQueryProcessingStage(const Context &, QueryProcessingStage::Enum /*to_stage*/, SelectQueryInfo &) const override;
+    QueryProcessingStage::Enum getQueryProcessingStage(ContextPtr, QueryProcessingStage::Enum /*to_stage*/, SelectQueryInfo &) const override;
 
     Pipe read(
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
@@ -70,26 +71,28 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & metadata_snapshot,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t /*max_block_size*/,
         unsigned /*num_streams*/) override;
 
     bool supportsParallelInsert() const override { return true; }
+    std::optional<UInt64> totalBytes(const Settings &) const override;
 
-    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, const Context & context) override;
+    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, ContextPtr context) override;
+
+    QueryPipelinePtr distributedWrite(const ASTInsertQuery & query, ContextPtr context) override;
 
     /// Removes temporary data in local filesystem.
-    void truncate(const ASTPtr &, const StorageMetadataPtr &, const Context &, TableExclusiveLockHolder &) override;
+    void truncate(const ASTPtr &, const StorageMetadataPtr &, ContextPtr, TableExclusiveLockHolder &) override;
 
     void rename(const String & new_path_to_table_data, const StorageID & new_table_id) override;
-    void renameOnDisk(const String & new_path_to_table_data);
 
-    void checkAlterIsPossible(const AlterCommands & commands, const Settings & /* settings */) const override;
+    void checkAlterIsPossible(const AlterCommands & commands, ContextPtr context) const override;
 
     /// in the sub-tables, you need to manually add and delete columns
     /// the structure of the sub-table is not checked
-    void alter(const AlterCommands & params, const Context & context, TableLockHolder & table_lock_holder) override;
+    void alter(const AlterCommands & params, ContextPtr context, TableLockHolder & table_lock_holder) override;
 
     void startup() override;
     void shutdown() override;
@@ -98,46 +101,88 @@ public:
     bool storesDataOnDisk() const override { return true; }
     Strings getDataPaths() const override;
 
-    const ExpressionActionsPtr & getShardingKeyExpr() const { return sharding_key_expr; }
-    const String & getShardingKeyColumnName() const { return sharding_key_column_name; }
-    size_t getShardCount() const;
-    const String & getRelativeDataPath() const { return relative_data_path; }
+    ActionLock getActionLock(StorageActionBlockType type) override;
+
+    NamesAndTypesList getVirtuals() const override;
+
+    /// Used by InterpreterInsertQuery
     std::string getRemoteDatabaseName() const { return remote_database; }
     std::string getRemoteTableName() const { return remote_table; }
-    std::string getClusterName() const { return cluster_name; } /// Returns empty string if tables is used by TableFunctionRemote
+    /// Returns empty string if tables is used by TableFunctionRemote
+    std::string getClusterName() const { return cluster_name; }
+    ClusterPtr getCluster() const;
+
+    /// Used by InterpreterSystemQuery
+    void flushClusterNodesAllData(ContextPtr context);
+
+    /// Used by ClusterCopier
+    size_t getShardCount() const;
+
+private:
+    StorageDistributed(
+        const StorageID & id_,
+        const ColumnsDescription & columns_,
+        const ConstraintsDescription & constraints_,
+        const String & remote_database_,
+        const String & remote_table_,
+        const String & cluster_name_,
+        ContextPtr context_,
+        const ASTPtr & sharding_key_,
+        const String & storage_policy_name_,
+        const String & relative_data_path_,
+        const DistributedSettings & distributed_settings_,
+        bool attach_,
+        ClusterPtr owned_cluster_ = {});
+
+    StorageDistributed(
+        const StorageID & id_,
+        const ColumnsDescription & columns_,
+        const ConstraintsDescription & constraints_,
+        ASTPtr remote_table_function_ptr_,
+        const String & cluster_name_,
+        ContextPtr context_,
+        const ASTPtr & sharding_key_,
+        const String & storage_policy_name_,
+        const String & relative_data_path_,
+        const DistributedSettings & distributed_settings_,
+        bool attach,
+        ClusterPtr owned_cluster_ = {});
+
+    void renameOnDisk(const String & new_path_to_table_data);
+
+    const ExpressionActionsPtr & getShardingKeyExpr() const { return sharding_key_expr; }
+    const String & getShardingKeyColumnName() const { return sharding_key_column_name; }
+    const String & getRelativeDataPath() const { return relative_data_path; }
 
     /// create directory monitors for each existing subdirectory
     void createDirectoryMonitors(const DiskPtr & disk);
     /// ensure directory monitor thread and connectoin pool creation by disk and subdirectory name
     StorageDistributedDirectoryMonitor & requireDirectoryMonitor(const DiskPtr & disk, const std::string & name);
+
     /// Return list of metrics for all created monitors
     /// (note that monitors are created lazily, i.e. until at least one INSERT executed)
+    ///
+    /// Used by StorageSystemDistributionQueue
     std::vector<StorageDistributedDirectoryMonitor::Status> getDirectoryMonitorsStatuses() const;
 
-    void flushClusterNodesAllData(const Context & context);
-
-    ClusterPtr getCluster() const;
-
-    static IColumn::Selector createSelector(const ClusterPtr cluster, const ColumnWithTypeAndName & result);
+    static IColumn::Selector createSelector(ClusterPtr cluster, const ColumnWithTypeAndName & result);
     /// Apply the following settings:
     /// - optimize_skip_unused_shards
     /// - force_optimize_skip_unused_shards
-    ClusterPtr getOptimizedCluster(const Context &, const StorageMetadataPtr & metadata_snapshot, const ASTPtr & query_ptr) const;
-    ClusterPtr skipUnusedShards(ClusterPtr cluster, const ASTPtr & query_ptr, const StorageMetadataPtr & metadata_snapshot, const Context & context) const;
-
-    ActionLock getActionLock(StorageActionBlockType type) override;
-
-    NamesAndTypesList getVirtuals() const override;
+    ClusterPtr getOptimizedCluster(ContextPtr, const StorageMetadataPtr & metadata_snapshot, const ASTPtr & query_ptr) const;
+    ClusterPtr
+    skipUnusedShards(ClusterPtr cluster, const ASTPtr & query_ptr, const StorageMetadataPtr & metadata_snapshot, ContextPtr context) const;
 
     size_t getRandomShardIndex(const Cluster::ShardsInfo & shards);
 
     const DistributedSettings & getDistributedSettingsRef() const { return distributed_settings; }
 
+    void delayInsertOrThrowIfNeeded() const;
+
     String remote_database;
     String remote_table;
     ASTPtr remote_table_function_ptr;
 
-    const Context & global_context;
     Poco::Logger * log;
 
     /// Used to implement TableFunctionRemote.
@@ -156,36 +201,6 @@ public:
 
     ActionBlocker monitors_blocker;
 
-protected:
-    StorageDistributed(
-        const StorageID & id_,
-        const ColumnsDescription & columns_,
-        const ConstraintsDescription & constraints_,
-        const String & remote_database_,
-        const String & remote_table_,
-        const String & cluster_name_,
-        const Context & context_,
-        const ASTPtr & sharding_key_,
-        const String & storage_policy_name_,
-        const String & relative_data_path_,
-        const DistributedSettings & distributed_settings_,
-        bool attach_,
-        ClusterPtr owned_cluster_ = {});
-
-    StorageDistributed(
-        const StorageID & id_,
-        const ColumnsDescription & columns_,
-        const ConstraintsDescription & constraints_,
-        ASTPtr remote_table_function_ptr_,
-        const String & cluster_name_,
-        const Context & context_,
-        const ASTPtr & sharding_key_,
-        const String & storage_policy_name_,
-        const String & relative_data_path_,
-        const DistributedSettings & distributed_settings_,
-        bool attach,
-        ClusterPtr owned_cluster_ = {});
-
     String relative_data_path;
 
     /// Can be empty if relative_data_path is empty. In this case, a directory for the data to be sent is not created.
diff --git a/src/Storages/StorageExternalDistributed.cpp b/src/Storages/StorageExternalDistributed.cpp
new file mode 100644
index 00000000000..3489de0161a
--- /dev/null
+++ b/src/Storages/StorageExternalDistributed.cpp
@@ -0,0 +1,189 @@
+#include "StorageExternalDistributed.h"
+
+#if USE_MYSQL || USE_LIBPQXX
+
+#include <Storages/StorageFactory.h>
+#include <Interpreters/evaluateConstantExpression.h>
+#include <Core/Settings.h>
+#include <Interpreters/Context.h>
+#include <DataTypes/DataTypeString.h>
+#include <Formats/FormatFactory.h>
+#include <Parsers/ASTLiteral.h>
+#include <Common/parseAddress.h>
+#include <Processors/Pipe.h>
+#include <Common/parseRemoteDescription.h>
+#include <Storages/StorageMySQL.h>
+#include <Storages/StoragePostgreSQL.h>
+#include <common/logger_useful.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+    extern const int BAD_ARGUMENTS;
+}
+
+StorageExternalDistributed::StorageExternalDistributed(
+    const StorageID & table_id_,
+    ExternalStorageEngine table_engine,
+    const String & cluster_description,
+    const String & remote_database,
+    const String & remote_table,
+    const String & username,
+    const String & password,
+    const ColumnsDescription & columns_,
+    const ConstraintsDescription & constraints_,
+    ContextPtr context)
+    : IStorage(table_id_)
+{
+    StorageInMemoryMetadata storage_metadata;
+    storage_metadata.setColumns(columns_);
+    storage_metadata.setConstraints(constraints_);
+    setInMemoryMetadata(storage_metadata);
+
+    size_t max_addresses = context->getSettingsRef().glob_expansion_max_elements;
+    std::vector<String> shards_descriptions = parseRemoteDescription(cluster_description, 0, cluster_description.size(), ',', max_addresses);
+    std::vector<std::pair<std::string, UInt16>> addresses;
+
+    /// For each shard pass replicas description into storage, replicas are managed by storage's PoolWithFailover.
+    for (const auto & shard_description : shards_descriptions)
+    {
+        StoragePtr shard;
+
+        switch (table_engine)
+        {
+#if USE_MYSQL
+            case ExternalStorageEngine::MySQL:
+            {
+                addresses = parseRemoteDescriptionForExternalDatabase(shard_description, max_addresses, 3306);
+
+                mysqlxx::PoolWithFailover pool(
+                    remote_database,
+                    addresses,
+                    username, password);
+
+                shard = StorageMySQL::create(
+                    table_id_,
+                    std::move(pool),
+                    remote_database,
+                    remote_table,
+                    /* replace_query = */ false,
+                    /* on_duplicate_clause = */ "",
+                    columns_, constraints_,
+                    context);
+                break;
+            }
+#endif
+#if USE_LIBPQXX
+
+            case ExternalStorageEngine::PostgreSQL:
+            {
+                addresses = parseRemoteDescriptionForExternalDatabase(shard_description, max_addresses, 5432);
+
+                postgres::PoolWithFailover pool(
+                    remote_database,
+                    addresses,
+                    username, password,
+                    context->getSettingsRef().postgresql_connection_pool_size,
+                    context->getSettingsRef().postgresql_connection_pool_wait_timeout);
+
+                shard = StoragePostgreSQL::create(
+                    table_id_,
+                    std::move(pool),
+                    remote_table,
+                    columns_, constraints_,
+                    context);
+                break;
+            }
+#endif
+            default:
+                throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                    "Unsupported table engine. Supported engines are: MySQL, PostgreSQL");
+        }
+
+        shards.emplace(std::move(shard));
+    }
+}
+
+
+Pipe StorageExternalDistributed::read(
+    const Names & column_names,
+    const StorageMetadataPtr & metadata_snapshot,
+    SelectQueryInfo & query_info,
+    ContextPtr context,
+    QueryProcessingStage::Enum processed_stage,
+    size_t max_block_size,
+    unsigned num_streams)
+{
+    Pipes pipes;
+    for (const auto & shard : shards)
+    {
+        pipes.emplace_back(shard->read(
+            column_names,
+            metadata_snapshot,
+            query_info,
+            context,
+            processed_stage,
+            max_block_size,
+            num_streams
+        ));
+    }
+
+    return Pipe::unitePipes(std::move(pipes));
+}
+
+
+void registerStorageExternalDistributed(StorageFactory & factory)
+{
+    factory.registerStorage("ExternalDistributed", [](const StorageFactory::Arguments & args)
+    {
+        ASTs & engine_args = args.engine_args;
+
+        if (engine_args.size() != 6)
+            throw Exception(
+                "Storage MySQLiDistributed requires 5 parameters: ExternalDistributed('engine_name', 'cluster_description', database, table, 'user', 'password').",
+                ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
+
+        for (auto & engine_arg : engine_args)
+            engine_arg = evaluateConstantExpressionOrIdentifierAsLiteral(engine_arg, args.getLocalContext());
+
+        const String & engine_name = engine_args[0]->as<ASTLiteral &>().value.safeGet<String>();
+        const String & cluster_description = engine_args[1]->as<ASTLiteral &>().value.safeGet<String>();
+        const String & remote_database = engine_args[2]->as<ASTLiteral &>().value.safeGet<String>();
+        const String & remote_table = engine_args[3]->as<ASTLiteral &>().value.safeGet<String>();
+        const String & username = engine_args[4]->as<ASTLiteral &>().value.safeGet<String>();
+        const String & password = engine_args[5]->as<ASTLiteral &>().value.safeGet<String>();
+
+        StorageExternalDistributed::ExternalStorageEngine table_engine;
+        if (engine_name == "MySQL")
+            table_engine = StorageExternalDistributed::ExternalStorageEngine::MySQL;
+        else if (engine_name == "PostgreSQL")
+            table_engine = StorageExternalDistributed::ExternalStorageEngine::PostgreSQL;
+        else
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                "External storage engine {} is not supported for StorageExternalDistributed. Supported engines are: MySQL, PostgreSQL",
+                engine_name);
+
+        return StorageExternalDistributed::create(
+            args.table_id,
+            table_engine,
+            cluster_description,
+            remote_database,
+            remote_table,
+            username,
+            password,
+            args.columns,
+            args.constraints,
+            args.getContext());
+    },
+    {
+        .source_access_type = AccessType::MYSQL,
+    });
+}
+
+}
+
+#endif
diff --git a/src/Storages/StorageExternalDistributed.h b/src/Storages/StorageExternalDistributed.h
new file mode 100644
index 00000000000..71022f5eaa3
--- /dev/null
+++ b/src/Storages/StorageExternalDistributed.h
@@ -0,0 +1,65 @@
+#pragma once
+
+#if !defined(ARCADIA_BUILD)
+#include "config_core.h"
+#endif
+
+#if USE_MYSQL || USE_LIBPQXX
+
+#include <ext/shared_ptr_helper.h>
+#include <Storages/IStorage.h>
+#include <mysqlxx/PoolWithFailover.h>
+
+
+namespace DB
+{
+
+/// Storages MySQL and PostgreSQL use ConnectionPoolWithFailover and support multiple replicas.
+/// This class unites multiple storages with replicas into multiple shards with replicas.
+/// A query to external database is passed to one replica on each shard, the result is united.
+/// Replicas on each shard have the same priority, traversed replicas are moved to the end of the queue.
+/// TODO: try `load_balancing` setting for replicas priorities same way as for table function `remote`
+class StorageExternalDistributed final : public ext::shared_ptr_helper<StorageExternalDistributed>, public DB::IStorage
+{
+    friend struct ext::shared_ptr_helper<StorageExternalDistributed>;
+
+public:
+    enum class ExternalStorageEngine
+    {
+        MySQL,
+        PostgreSQL,
+        Default
+    };
+
+    std::string getName() const override { return "ExternalDistributed"; }
+
+    Pipe read(
+        const Names & column_names,
+        const StorageMetadataPtr & /*metadata_snapshot*/,
+        SelectQueryInfo & query_info,
+        ContextPtr context,
+        QueryProcessingStage::Enum processed_stage,
+        size_t max_block_size,
+        unsigned num_streams) override;
+
+protected:
+    StorageExternalDistributed(
+        const StorageID & table_id_,
+        ExternalStorageEngine table_engine,
+        const String & cluster_description,
+        const String & remote_database_,
+        const String & remote_table_,
+        const String & username,
+        const String & password,
+        const ColumnsDescription & columns_,
+        const ConstraintsDescription & constraints_,
+        ContextPtr context_);
+
+private:
+    using Shards = std::unordered_set<StoragePtr>;
+    Shards shards;
+};
+
+}
+
+#endif
diff --git a/src/Storages/StorageFactory.cpp b/src/Storages/StorageFactory.cpp
index 85f3bea9e0c..3a57c8ab4f6 100644
--- a/src/Storages/StorageFactory.cpp
+++ b/src/Storages/StorageFactory.cpp
@@ -31,6 +31,23 @@ static void checkAllTypesAreAllowedInTable(const NamesAndTypesList & names_and_t
 }
 
 
+ContextPtr StorageFactory::Arguments::getContext() const
+{
+    auto ptr = context.lock();
+    if (!ptr)
+        throw Exception("Context has expired", ErrorCodes::LOGICAL_ERROR);
+    return ptr;
+}
+
+ContextPtr StorageFactory::Arguments::getLocalContext() const
+{
+    auto ptr = local_context.lock();
+    if (!ptr)
+        throw Exception("Context has expired", ErrorCodes::LOGICAL_ERROR);
+    return ptr;
+}
+
+
 void StorageFactory::registerStorage(const std::string & name, CreatorFn creator_fn, StorageFeatures features)
 {
     if (!storages.emplace(name, Creator{std::move(creator_fn), features}).second)
@@ -42,8 +59,8 @@ void StorageFactory::registerStorage(const std::string & name, CreatorFn creator
 StoragePtr StorageFactory::get(
     const ASTCreateQuery & query,
     const String & relative_data_path,
-    Context & local_context,
-    Context & context,
+    ContextPtr local_context,
+    ContextPtr context,
     const ColumnsDescription & columns,
     const ConstraintsDescription & constraints,
     bool has_force_restore_data_flag) const
@@ -179,6 +196,7 @@ StoragePtr StorageFactory::get(
         .attach = query.attach,
         .has_force_restore_data_flag = has_force_restore_data_flag
     };
+    assert(arguments.getContext() == arguments.getContext()->getGlobalContext());
 
     auto res = storages.at(name).creator_fn(arguments);
     if (!empty_engine_args.empty())
@@ -190,8 +208,8 @@ StoragePtr StorageFactory::get(
         storage_def->engine->arguments->children = empty_engine_args;
     }
 
-    if (local_context.hasQueryContext() && context.getSettingsRef().log_queries)
-        local_context.getQueryContext().addQueryFactoriesInfo(Context::QueryLogFactories::Storage, name);
+    if (local_context->hasQueryContext() && context->getSettingsRef().log_queries)
+        local_context->getQueryContext()->addQueryFactoriesInfo(Context::QueryLogFactories::Storage, name);
 
     return res;
 }
diff --git a/src/Storages/StorageFactory.h b/src/Storages/StorageFactory.h
index 18dd24e10db..43f6a6d6f7d 100644
--- a/src/Storages/StorageFactory.h
+++ b/src/Storages/StorageFactory.h
@@ -39,12 +39,15 @@ public:
         /// Relative to <path> from server config (possibly <path> of some <disk> of some <volume> for *MergeTree)
         const String & relative_data_path;
         const StorageID & table_id;
-        Context & local_context;
-        Context & context;
+        ContextWeakPtr local_context;
+        ContextWeakPtr context;
         const ColumnsDescription & columns;
         const ConstraintsDescription & constraints;
         bool attach;
         bool has_force_restore_data_flag;
+
+        ContextPtr getContext() const;
+        ContextPtr getLocalContext() const;
     };
 
     /// Analog of the IStorage::supports*() helpers
@@ -76,8 +79,8 @@ public:
     StoragePtr get(
         const ASTCreateQuery & query,
         const String & relative_data_path,
-        Context & local_context,
-        Context & context,
+        ContextPtr local_context,
+        ContextPtr context,
         const ColumnsDescription & columns,
         const ConstraintsDescription & constraints,
         bool has_force_restore_data_flag) const;
diff --git a/src/Storages/StorageFile.cpp b/src/Storages/StorageFile.cpp
index 5524569e1f0..14b91d29805 100644
--- a/src/Storages/StorageFile.cpp
+++ b/src/Storages/StorageFile.cpp
@@ -22,6 +22,8 @@
 #include <Common/escapeForFileName.h>
 #include <Common/typeid_cast.h>
 #include <Common/parseGlobs.h>
+#include <Storages/ColumnsDescription.h>
+#include <Storages/StorageInMemoryMetadata.h>
 
 #include <fcntl.h>
 #include <unistd.h>
@@ -114,9 +116,9 @@ std::string getTablePath(const std::string & table_dir_path, const std::string &
 }
 
 /// Both db_dir_path and table_path must be converted to absolute paths (in particular, path cannot contain '..').
-void checkCreationIsAllowed(const Context & context_global, const std::string & db_dir_path, const std::string & table_path)
+void checkCreationIsAllowed(ContextPtr context_global, const std::string & db_dir_path, const std::string & table_path)
 {
-    if (context_global.getApplicationType() != Context::ApplicationType::SERVER)
+    if (context_global->getApplicationType() != Context::ApplicationType::SERVER)
         return;
 
     /// "/dev/null" is allowed for perf testing
@@ -129,7 +131,7 @@ void checkCreationIsAllowed(const Context & context_global, const std::string &
 }
 }
 
-Strings StorageFile::getPathsList(const String & table_path, const String & user_files_path, const Context & context)
+Strings StorageFile::getPathsList(const String & table_path, const String & user_files_path, ContextPtr context)
 {
     String user_files_absolute_path = Poco::Path(user_files_path).makeAbsolute().makeDirectory().toString();
     Poco::Path poco_path = Poco::Path(table_path);
@@ -149,10 +151,15 @@ Strings StorageFile::getPathsList(const String & table_path, const String & user
     return paths;
 }
 
+bool StorageFile::isColumnOriented() const
+{
+    return format_name != "Distributed" && FormatFactory::instance().checkIfFormatIsColumnOriented(format_name);
+}
+
 StorageFile::StorageFile(int table_fd_, CommonArguments args)
     : StorageFile(args)
 {
-    if (args.context.getApplicationType() == Context::ApplicationType::SERVER)
+    if (args.getContext()->getApplicationType() == Context::ApplicationType::SERVER)
         throw Exception("Using file descriptor as source of storage isn't allowed for server daemons", ErrorCodes::DATABASE_ACCESS_DENIED);
     if (args.format_name == "Distributed")
         throw Exception("Distributed format is allowed only with explicit file path", ErrorCodes::INCORRECT_FILE_NAME);
@@ -170,7 +177,7 @@ StorageFile::StorageFile(const std::string & table_path_, const std::string & us
     : StorageFile(args)
 {
     is_db_table = false;
-    paths = getPathsList(table_path_, user_files_path, args.context);
+    paths = getPathsList(table_path_, user_files_path, args.getContext());
 
     if (args.format_name == "Distributed")
     {
@@ -207,7 +214,7 @@ StorageFile::StorageFile(CommonArguments args)
     , format_name(args.format_name)
     , format_settings(args.format_settings)
     , compression_method(args.compression_method)
-    , base_path(args.context.getPath())
+    , base_path(args.getContext()->getPath())
 {
     StorageInMemoryMetadata storage_metadata;
     if (args.format_name != "Distributed")
@@ -218,15 +225,17 @@ StorageFile::StorageFile(CommonArguments args)
 }
 
 
-static std::chrono::seconds getLockTimeout(const Context & context)
+static std::chrono::seconds getLockTimeout(ContextPtr context)
 {
-    const Settings & settings = context.getSettingsRef();
+    const Settings & settings = context->getSettingsRef();
     Int64 lock_timeout = settings.lock_acquire_timeout.totalSeconds();
     if (settings.max_execution_time.totalSeconds() != 0 && settings.max_execution_time.totalSeconds() < lock_timeout)
         lock_timeout = settings.max_execution_time.totalSeconds();
     return std::chrono::seconds{lock_timeout};
 }
 
+using StorageFilePtr = std::shared_ptr<StorageFile>;
+
 
 class StorageFileSource : public SourceWithProgress
 {
@@ -257,14 +266,26 @@ public:
         return header;
     }
 
+    static Block getBlockForSource(
+        const StorageFilePtr & storage,
+        const StorageMetadataPtr & metadata_snapshot,
+        const ColumnsDescription & columns_description,
+        const FilesInfoPtr & files_info)
+    {
+        if (storage->isColumnOriented())
+            return metadata_snapshot->getSampleBlockForColumns(columns_description.getNamesOfPhysical(), storage->getVirtuals(), storage->getStorageID());
+        else
+            return getHeader(metadata_snapshot, files_info->need_path_column, files_info->need_file_column);
+    }
+
     StorageFileSource(
         std::shared_ptr<StorageFile> storage_,
         const StorageMetadataPtr & metadata_snapshot_,
-        const Context & context_,
+        ContextPtr context_,
         UInt64 max_block_size_,
         FilesInfoPtr files_info_,
         ColumnsDescription columns_description_)
-        : SourceWithProgress(getHeader(metadata_snapshot_, files_info_->need_path_column, files_info_->need_file_column))
+        : SourceWithProgress(getBlockForSource(storage_, metadata_snapshot_, columns_description_, files_info_))
         , storage(std::move(storage_))
         , metadata_snapshot(metadata_snapshot_)
         , files_info(std::move(files_info_))
@@ -344,8 +365,16 @@ public:
                 }
 
                 read_buf = wrapReadBufferWithCompressionMethod(std::move(nested_buffer), method);
+
+                auto get_block_for_format = [&]() -> Block
+                {
+                    if (storage->isColumnOriented())
+                        return metadata_snapshot->getSampleBlockForColumns(columns_description.getNamesOfPhysical());
+                    return metadata_snapshot->getSampleBlock();
+                };
+
                 auto format = FormatFactory::instance().getInput(
-                        storage->format_name, *read_buf, metadata_snapshot->getSampleBlock(), context, max_block_size, storage->format_settings);
+                    storage->format_name, *read_buf, get_block_for_format(), context, max_block_size, storage->format_settings);
 
                 reader = std::make_shared<InputStreamFromInputFormat>(format);
 
@@ -403,7 +432,7 @@ private:
 
     ColumnsDescription columns_description;
 
-    const Context & context;    /// TODO Untangle potential issues with context lifetime.
+    ContextPtr context;    /// TODO Untangle potential issues with context lifetime.
     UInt64 max_block_size;
 
     bool finished_generate = false;
@@ -412,12 +441,11 @@ private:
     std::unique_lock<std::shared_timed_mutex> unique_lock;
 };
 
-
 Pipe StorageFile::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & /*query_info*/,
-    const Context & context,
+    ContextPtr context,
     QueryProcessingStage::Enum /*processed_stage*/,
     size_t max_block_size,
     unsigned num_streams)
@@ -429,7 +457,7 @@ Pipe StorageFile::read(
     else
         if (paths.size() == 1 && !Poco::File(paths[0]).exists())
         {
-            if (context.getSettingsRef().engine_file_empty_if_not_exists)
+            if (context->getSettingsRef().engine_file_empty_if_not_exists)
                 return Pipe(std::make_shared<NullSource>(metadata_snapshot->getSampleBlockForColumns(column_names, getVirtuals(), getStorageID())));
             else
                 throw Exception("File " + paths[0] + " doesn't exist", ErrorCodes::FILE_DOESNT_EXIST);
@@ -457,9 +485,16 @@ Pipe StorageFile::read(
 
     for (size_t i = 0; i < num_streams; ++i)
     {
+        const auto get_columns_for_format = [&]() -> ColumnsDescription
+        {
+            if (isColumnOriented())
+                return ColumnsDescription{
+                    metadata_snapshot->getSampleBlockForColumns(column_names, getVirtuals(), getStorageID()).getNamesAndTypesList()};
+            else
+                return metadata_snapshot->getColumns();
+        };
         pipes.emplace_back(std::make_shared<StorageFileSource>(
-            this_ptr, metadata_snapshot, context, max_block_size, files_info,
-            metadata_snapshot->getColumns()));
+            this_ptr, metadata_snapshot, context, max_block_size, files_info, get_columns_for_format()));
     }
 
     return Pipe::unitePipes(std::move(pipes));
@@ -474,7 +509,7 @@ public:
         const StorageMetadataPtr & metadata_snapshot_,
         std::unique_lock<std::shared_timed_mutex> && lock_,
         const CompressionMethod compression_method,
-        const Context & context,
+        ContextPtr context,
         const std::optional<FormatSettings> & format_settings,
         int & flags)
         : storage(storage_)
@@ -549,7 +584,7 @@ private:
 BlockOutputStreamPtr StorageFile::write(
     const ASTPtr & /*query*/,
     const StorageMetadataPtr & metadata_snapshot,
-    const Context & context)
+    ContextPtr context)
 {
     if (format_name == "Distributed")
         throw Exception("Method write is not implemented for Distributed format", ErrorCodes::NOT_IMPLEMENTED);
@@ -557,7 +592,7 @@ BlockOutputStreamPtr StorageFile::write(
     int flags = 0;
 
     std::string path;
-    if (context.getSettingsRef().engine_file_truncate_on_insert)
+    if (context->getSettingsRef().engine_file_truncate_on_insert)
         flags |= O_TRUNC;
 
     if (!paths.empty())
@@ -610,7 +645,7 @@ void StorageFile::rename(const String & new_path_to_table_data, const StorageID
 void StorageFile::truncate(
     const ASTPtr & /*query*/,
     const StorageMetadataPtr & /* metadata_snapshot */,
-    const Context & /* context */,
+    ContextPtr /* context */,
     TableExclusiveLockHolder &)
 {
     if (paths.size() != 1)
@@ -643,11 +678,15 @@ void registerStorageFile(StorageFactory & factory)
         "File",
         [](const StorageFactory::Arguments & factory_args)
         {
-            StorageFile::CommonArguments storage_args{
-                .table_id = factory_args.table_id,
-                .columns = factory_args.columns,
-                .constraints = factory_args.constraints,
-                .context = factory_args.context
+            StorageFile::CommonArguments storage_args
+            {
+                WithContext(factory_args.getContext()),
+                factory_args.table_id,
+                {},
+                {},
+                {},
+                factory_args.columns,
+                factory_args.constraints,
             };
 
             ASTs & engine_args_ast = factory_args.engine_args;
@@ -657,7 +696,7 @@ void registerStorageFile(StorageFactory & factory)
                     "Storage File requires from 1 to 3 arguments: name of used format, source and compression_method.",
                     ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
 
-            engine_args_ast[0] = evaluateConstantExpressionOrIdentifierAsLiteral(engine_args_ast[0], factory_args.local_context);
+            engine_args_ast[0] = evaluateConstantExpressionOrIdentifierAsLiteral(engine_args_ast[0], factory_args.getLocalContext());
             storage_args.format_name = engine_args_ast[0]->as<ASTLiteral &>().value.safeGet<String>();
 
             // Use format settings from global server context + settings from
@@ -669,7 +708,7 @@ void registerStorageFile(StorageFactory & factory)
 
                 // Apply changed settings from global context, but ignore the
                 // unknown ones, because we only have the format settings here.
-                const auto & changes = factory_args.context.getSettingsRef().changes();
+                const auto & changes = factory_args.getContext()->getSettingsRef().changes();
                 for (const auto & change : changes)
                 {
                     if (user_format_settings.has(change.name))
@@ -683,12 +722,12 @@ void registerStorageFile(StorageFactory & factory)
                     factory_args.storage_def->settings->changes);
 
                 storage_args.format_settings = getFormatSettings(
-                    factory_args.context, user_format_settings);
+                    factory_args.getContext(), user_format_settings);
             }
             else
             {
                 storage_args.format_settings = getFormatSettings(
-                    factory_args.context);
+                    factory_args.getContext());
             }
 
             if (engine_args_ast.size() == 1) /// Table in database
@@ -725,7 +764,7 @@ void registerStorageFile(StorageFactory & factory)
 
             if (engine_args_ast.size() == 3)
             {
-                engine_args_ast[2] = evaluateConstantExpressionOrIdentifierAsLiteral(engine_args_ast[2], factory_args.local_context);
+                engine_args_ast[2] = evaluateConstantExpressionOrIdentifierAsLiteral(engine_args_ast[2], factory_args.getLocalContext());
                 storage_args.compression_method = engine_args_ast[2]->as<ASTLiteral &>().value.safeGet<String>();
             }
             else
@@ -734,7 +773,7 @@ void registerStorageFile(StorageFactory & factory)
             if (0 <= source_fd) /// File descriptor
                 return StorageFile::create(source_fd, storage_args);
             else /// User's file
-                return StorageFile::create(source_path, factory_args.context.getUserFilesPath(), storage_args);
+                return StorageFile::create(source_path, factory_args.getContext()->getUserFilesPath(), storage_args);
         },
         storage_features);
 }
diff --git a/src/Storages/StorageFile.h b/src/Storages/StorageFile.h
index c316412f808..a277dda7cc0 100644
--- a/src/Storages/StorageFile.h
+++ b/src/Storages/StorageFile.h
@@ -28,7 +28,7 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
@@ -36,12 +36,12 @@ public:
     BlockOutputStreamPtr write(
         const ASTPtr & query,
         const StorageMetadataPtr & /*metadata_snapshot*/,
-        const Context & context) override;
+        ContextPtr context) override;
 
     void truncate(
         const ASTPtr & /*query*/,
         const StorageMetadataPtr & /* metadata_snapshot */,
-        const Context & /* context */,
+        ContextPtr /* context */,
         TableExclusiveLockHolder &) override;
 
     void rename(const String & new_path_to_table_data, const StorageID & new_table_id) override;
@@ -49,7 +49,7 @@ public:
     bool storesDataOnDisk() const override;
     Strings getDataPaths() const override;
 
-    struct CommonArguments
+    struct CommonArguments : public WithContext
     {
         StorageID table_id;
         std::string format_name;
@@ -57,12 +57,17 @@ public:
         std::string compression_method;
         const ColumnsDescription & columns;
         const ConstraintsDescription & constraints;
-        const Context & context;
     };
 
     NamesAndTypesList getVirtuals() const override;
 
-    static Strings getPathsList(const String & table_path, const String & user_files_path, const Context & context);
+    static Strings getPathsList(const String & table_path, const String & user_files_path, ContextPtr context);
+
+    /// Check if the format is column-oriented.
+    /// Is is useful because column oriented formats could effectively skip unknown columns
+    /// So we can create a header of only required columns in read method and ask
+    /// format to read only them. Note: this hack cannot be done with ordinary formats like TSV.
+    bool isColumnOriented() const;
 
 protected:
     friend class StorageFileSource;
diff --git a/src/Storages/StorageGenerateRandom.cpp b/src/Storages/StorageGenerateRandom.cpp
index fd10691ecc4..bc158c38f37 100644
--- a/src/Storages/StorageGenerateRandom.cpp
+++ b/src/Storages/StorageGenerateRandom.cpp
@@ -65,7 +65,7 @@ ColumnPtr fillColumnWithRandomData(
     UInt64 max_array_length,
     UInt64 max_string_length,
     pcg64 & rng,
-    const Context & context)
+    ContextPtr context)
 {
     TypeIndex idx = type->getTypeId();
 
@@ -215,7 +215,7 @@ ColumnPtr fillColumnWithRandomData(
             column->getData().resize(limit);
 
             for (size_t i = 0; i < limit; ++i)
-                column->getData()[i] = rng() % (DATE_LUT_MAX_DAY_NUM + 1);   /// Slow
+                column->getData()[i] = rng() % (DATE_LUT_MAX_DAY_NUM + 1);
 
             return column;
         }
@@ -339,7 +339,7 @@ ColumnPtr fillColumnWithRandomData(
 class GenerateSource : public SourceWithProgress
 {
 public:
-    GenerateSource(UInt64 block_size_, UInt64 max_array_length_, UInt64 max_string_length_, UInt64 random_seed_, Block block_header_, const Context & context_)
+    GenerateSource(UInt64 block_size_, UInt64 max_array_length_, UInt64 max_string_length_, UInt64 random_seed_, Block block_header_, ContextPtr context_)
         : SourceWithProgress(Nested::flatten(prepareBlockToFill(block_header_)))
         , block_size(block_size_), max_array_length(max_array_length_), max_string_length(max_string_length_)
         , block_to_fill(std::move(block_header_)), rng(random_seed_), context(context_) {}
@@ -367,7 +367,7 @@ private:
 
     pcg64 rng;
 
-    const Context & context;
+    ContextPtr context;
 
     static Block & prepareBlockToFill(Block & block)
     {
@@ -442,7 +442,7 @@ Pipe StorageGenerateRandom::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & /*query_info*/,
-    const Context & context,
+    ContextPtr context,
     QueryProcessingStage::Enum /*processed_stage*/,
     size_t max_block_size,
     unsigned num_streams)
diff --git a/src/Storages/StorageGenerateRandom.h b/src/Storages/StorageGenerateRandom.h
index 965c5b3a9d3..d9c2acb782b 100644
--- a/src/Storages/StorageGenerateRandom.h
+++ b/src/Storages/StorageGenerateRandom.h
@@ -19,7 +19,7 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
diff --git a/src/Storages/StorageInMemoryMetadata.cpp b/src/Storages/StorageInMemoryMetadata.cpp
index 871ff38c07f..2f4a24a5c60 100644
--- a/src/Storages/StorageInMemoryMetadata.cpp
+++ b/src/Storages/StorageInMemoryMetadata.cpp
@@ -291,9 +291,10 @@ Block StorageInMemoryMetadata::getSampleBlockForColumns(
 {
     Block res;
 
-    std::unordered_map<String, DataTypePtr> columns_map;
-
     auto all_columns = getColumns().getAllWithSubcolumns();
+    std::unordered_map<String, DataTypePtr> columns_map;
+    columns_map.reserve(all_columns.size());
+
     for (const auto & elem : all_columns)
         columns_map.emplace(elem.name, elem.type);
 
@@ -306,15 +307,11 @@ Block StorageInMemoryMetadata::getSampleBlockForColumns(
     {
         auto it = columns_map.find(name);
         if (it != columns_map.end())
-        {
             res.insert({it->second->createColumn(), it->second, it->first});
-        }
         else
-        {
             throw Exception(
-                "Column " + backQuote(name) + " not found in table " + storage_id.getNameForLogs(),
+                "Column " + backQuote(name) + " not found in table " + (storage_id.empty() ? "" : storage_id.getNameForLogs()),
                 ErrorCodes::NOT_FOUND_COLUMN_IN_BLOCK);
-        }
     }
 
     return res;
diff --git a/src/Storages/StorageInMemoryMetadata.h b/src/Storages/StorageInMemoryMetadata.h
index 038416aff7d..00fb944c0b5 100644
--- a/src/Storages/StorageInMemoryMetadata.h
+++ b/src/Storages/StorageInMemoryMetadata.h
@@ -85,9 +85,10 @@ struct StorageInMemoryMetadata
 
     /// Returns combined set of columns
     const ColumnsDescription & getColumns() const;
-    /// Returns secondary indices
 
+    /// Returns secondary indices
     const IndicesDescription & getSecondaryIndices() const;
+
     /// Has at least one non primary index
     bool hasSecondaryIndices() const;
 
@@ -146,8 +147,7 @@ struct StorageInMemoryMetadata
     /// Storage metadata. StorageID required only for more clear exception
     /// message.
     Block getSampleBlockForColumns(
-        const Names & column_names, const NamesAndTypesList & virtuals, const StorageID & storage_id) const;
-
+        const Names & column_names, const NamesAndTypesList & virtuals = {}, const StorageID & storage_id = StorageID::createEmpty()) const;
     /// Returns structure with partition key.
     const KeyDescription & getPartitionKey() const;
     /// Returns ASTExpressionList of partition key expression for storage or nullptr if there is none.
diff --git a/src/Storages/StorageInput.cpp b/src/Storages/StorageInput.cpp
index 1f881bccf07..63b440aff08 100644
--- a/src/Storages/StorageInput.cpp
+++ b/src/Storages/StorageInput.cpp
@@ -27,17 +27,14 @@ StorageInput::StorageInput(const StorageID & table_id, const ColumnsDescription
 }
 
 
-class StorageInputSource : public SourceWithProgress
+class StorageInputSource : public SourceWithProgress, WithContext
 {
 public:
-    StorageInputSource(Context & context_, Block sample_block)
-        : SourceWithProgress(std::move(sample_block)), context(context_)
-    {
-    }
+    StorageInputSource(ContextPtr context_, Block sample_block) : SourceWithProgress(std::move(sample_block)), WithContext(context_) {}
 
     Chunk generate() override
     {
-        auto block = context.getInputBlocksReaderCallback()(context);
+        auto block = getContext()->getInputBlocksReaderCallback()(getContext());
         if (!block)
             return {};
 
@@ -46,9 +43,6 @@ public:
     }
 
     String getName() const override { return "Input"; }
-
-private:
-    Context & context;
 };
 
 
@@ -62,18 +56,18 @@ Pipe StorageInput::read(
     const Names & /*column_names*/,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & /*query_info*/,
-    const Context & context,
+    ContextPtr context,
     QueryProcessingStage::Enum /*processed_stage*/,
     size_t /*max_block_size*/,
     unsigned /*num_streams*/)
 {
     Pipes pipes;
-    Context & query_context = const_cast<Context &>(context).getQueryContext();
+    auto query_context = context->getQueryContext();
     /// It is TCP request if we have callbacks for input().
-    if (query_context.getInputBlocksReaderCallback())
+    if (query_context->getInputBlocksReaderCallback())
     {
         /// Send structure to the client.
-        query_context.initializeInput(shared_from_this());
+        query_context->initializeInput(shared_from_this());
         return Pipe(std::make_shared<StorageInputSource>(query_context, metadata_snapshot->getSampleBlock()));
     }
 
diff --git a/src/Storages/StorageInput.h b/src/Storages/StorageInput.h
index 3cb64993d45..106c22db385 100644
--- a/src/Storages/StorageInput.h
+++ b/src/Storages/StorageInput.h
@@ -21,7 +21,7 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
diff --git a/src/Storages/StorageJoin.cpp b/src/Storages/StorageJoin.cpp
index 8d4f0b3b3be..983b9213a35 100644
--- a/src/Storages/StorageJoin.cpp
+++ b/src/Storages/StorageJoin.cpp
@@ -68,7 +68,7 @@ StorageJoin::StorageJoin(
 
 
 void StorageJoin::truncate(
-    const ASTPtr &, const StorageMetadataPtr & metadata_snapshot, const Context &, TableExclusiveLockHolder&)
+    const ASTPtr &, const StorageMetadataPtr & metadata_snapshot, ContextPtr, TableExclusiveLockHolder&)
 {
     disk->removeRecursive(path);
     disk->createDirectories(path);
@@ -79,7 +79,7 @@ void StorageJoin::truncate(
 }
 
 
-HashJoinPtr StorageJoin::getJoin(std::shared_ptr<TableJoin> analyzed_join) const
+HashJoinPtr StorageJoin::getJoinLocked(std::shared_ptr<TableJoin> analyzed_join) const
 {
     auto metadata_snapshot = getInMemoryMetadataPtr();
     if (!analyzed_join->sameStrictnessAndKind(strictness, kind))
@@ -96,17 +96,47 @@ HashJoinPtr StorageJoin::getJoin(std::shared_ptr<TableJoin> analyzed_join) const
     analyzed_join->setRightKeys(key_names);
 
     HashJoinPtr join_clone = std::make_shared<HashJoin>(analyzed_join, metadata_snapshot->getSampleBlock().sortColumns());
+    join_clone->setLock(rwlock);
     join_clone->reuseJoinedData(*join);
+
     return join_clone;
 }
 
 
-void StorageJoin::insertBlock(const Block & block) { join->addJoinedBlock(block, true); }
+void StorageJoin::insertBlock(const Block & block)
+{
+    std::unique_lock<std::shared_mutex> lock(rwlock);
+    join->addJoinedBlock(block, true);
+}
 
-size_t StorageJoin::getSize() const { return join->getTotalRowCount(); }
-std::optional<UInt64> StorageJoin::totalRows(const Settings &) const { return join->getTotalRowCount(); }
-std::optional<UInt64> StorageJoin::totalBytes(const Settings &) const { return join->getTotalByteCount(); }
+size_t StorageJoin::getSize() const
+{
+    std::shared_lock<std::shared_mutex> lock(rwlock);
+    return join->getTotalRowCount();
+}
 
+std::optional<UInt64> StorageJoin::totalRows(const Settings &) const
+{
+    std::shared_lock<std::shared_mutex> lock(rwlock);
+    return join->getTotalRowCount();
+}
+
+std::optional<UInt64> StorageJoin::totalBytes(const Settings &) const
+{
+    std::shared_lock<std::shared_mutex> lock(rwlock);
+    return join->getTotalByteCount();
+}
+
+DataTypePtr StorageJoin::joinGetCheckAndGetReturnType(const DataTypes & data_types, const String & column_name, bool or_null) const
+{
+    return join->joinGetCheckAndGetReturnType(data_types, column_name, or_null);
+}
+
+ColumnWithTypeAndName StorageJoin::joinGet(const Block & block, const Block & block_with_columns_to_add) const
+{
+    std::shared_lock<std::shared_mutex> lock(rwlock);
+    return join->joinGet(block, block_with_columns_to_add);
+}
 
 void registerStorageJoin(StorageFactory & factory)
 {
@@ -116,7 +146,7 @@ void registerStorageJoin(StorageFactory & factory)
 
         ASTs & engine_args = args.engine_args;
 
-        const auto & settings = args.context.getSettingsRef();
+        const auto & settings = args.getContext()->getSettingsRef();
 
         auto join_use_nulls = settings.join_use_nulls;
         auto max_rows_in_join = settings.max_rows_in_join;
@@ -156,7 +186,7 @@ void registerStorageJoin(StorageFactory & factory)
             }
         }
 
-        DiskPtr disk = args.context.getDisk(disk_name);
+        DiskPtr disk = args.getContext()->getDisk(disk_name);
 
         if (engine_args.size() < 3)
             throw Exception(
@@ -264,24 +294,24 @@ size_t rawSize(const StringRef & t)
 class JoinSource : public SourceWithProgress
 {
 public:
-    JoinSource(const HashJoin & parent_, UInt64 max_block_size_, Block sample_block_)
+    JoinSource(HashJoinPtr join_, std::shared_mutex & rwlock, UInt64 max_block_size_, Block sample_block_)
         : SourceWithProgress(sample_block_)
-        , parent(parent_)
-        , lock(parent.data->rwlock)
+        , join(join_)
+        , lock(rwlock)
         , max_block_size(max_block_size_)
         , sample_block(std::move(sample_block_))
     {
         column_indices.resize(sample_block.columns());
 
-        auto & saved_block = parent.getJoinedData()->sample_block;
+        auto & saved_block = join->getJoinedData()->sample_block;
 
         for (size_t i = 0; i < sample_block.columns(); ++i)
         {
             auto & [_, type, name] = sample_block.getByPosition(i);
-            if (parent.right_table_keys.has(name))
+            if (join->right_table_keys.has(name))
             {
                 key_pos = i;
-                const auto & column = parent.right_table_keys.getByName(name);
+                const auto & column = join->right_table_keys.getByName(name);
                 restored_block.insert(column);
             }
             else
@@ -300,19 +330,20 @@ public:
 protected:
     Chunk generate() override
     {
-        if (parent.data->blocks.empty())
+        if (join->data->blocks.empty())
             return {};
 
         Chunk chunk;
-        if (!joinDispatch(parent.kind, parent.strictness, parent.data->maps,
+        if (!joinDispatch(join->kind, join->strictness, join->data->maps,
                 [&](auto kind, auto strictness, auto & map) { chunk = createChunk<kind, strictness>(map); }))
             throw Exception("Logical error: unknown JOIN strictness", ErrorCodes::LOGICAL_ERROR);
         return chunk;
     }
 
 private:
-    const HashJoin & parent;
+    HashJoinPtr join;
     std::shared_lock<std::shared_mutex> lock;
+
     UInt64 max_block_size;
     Block sample_block;
     Block restored_block; /// sample_block with parent column types
@@ -330,7 +361,7 @@ private:
 
         size_t rows_added = 0;
 
-        switch (parent.data->type)
+        switch (join->data->type)
         {
 #define M(TYPE)                                           \
     case HashJoin::Type::TYPE:                                \
@@ -340,7 +371,7 @@ private:
 #undef M
 
             default:
-                throw Exception("Unsupported JOIN keys in StorageJoin. Type: " + toString(static_cast<UInt32>(parent.data->type)),
+                throw Exception("Unsupported JOIN keys in StorageJoin. Type: " + toString(static_cast<UInt32>(join->data->type)),
                                 ErrorCodes::UNSUPPORTED_JOIN_KEYS);
         }
 
@@ -461,14 +492,15 @@ Pipe StorageJoin::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & /*query_info*/,
-    const Context & /*context*/,
+    ContextPtr /*context*/,
     QueryProcessingStage::Enum /*processed_stage*/,
     size_t max_block_size,
     unsigned /*num_streams*/)
 {
     metadata_snapshot->check(column_names, getVirtuals(), getStorageID());
 
-    return Pipe(std::make_shared<JoinSource>(*join, max_block_size, metadata_snapshot->getSampleBlockForColumns(column_names, getVirtuals(), getStorageID())));
+    Block source_sample_block = metadata_snapshot->getSampleBlockForColumns(column_names, getVirtuals(), getStorageID());
+    return Pipe(std::make_shared<JoinSource>(join, rwlock, max_block_size, source_sample_block));
 }
 
 }
diff --git a/src/Storages/StorageJoin.h b/src/Storages/StorageJoin.h
index c453c036b65..4baac53c69c 100644
--- a/src/Storages/StorageJoin.h
+++ b/src/Storages/StorageJoin.h
@@ -14,7 +14,6 @@ class TableJoin;
 class HashJoin;
 using HashJoinPtr = std::shared_ptr<HashJoin>;
 
-
 /** Allows you save the state for later use on the right side of the JOIN.
   * When inserted into a table, the data will be inserted into the state,
   *  and also written to the backup file, to restore after the restart.
@@ -28,20 +27,25 @@ class StorageJoin final : public ext::shared_ptr_helper<StorageJoin>, public Sto
 public:
     String getName() const override { return "Join"; }
 
-    void truncate(const ASTPtr &, const StorageMetadataPtr & metadata_snapshot, const Context &, TableExclusiveLockHolder &) override;
+    void truncate(const ASTPtr &, const StorageMetadataPtr & metadata_snapshot, ContextPtr, TableExclusiveLockHolder &) override;
 
-    /// Access the innards.
-    HashJoinPtr & getJoin() { return join; }
-    HashJoinPtr getJoin(std::shared_ptr<TableJoin> analyzed_join) const;
+    /// Return instance of HashJoin holding lock that protects from insertions to StorageJoin.
+    /// HashJoin relies on structure of hash table that's why we need to return it with locked mutex.
+    HashJoinPtr getJoinLocked(std::shared_ptr<TableJoin> analyzed_join) const;
 
-    /// Verify that the data structure is suitable for implementing this type of JOIN.
-    void assertCompatible(ASTTableJoin::Kind kind_, ASTTableJoin::Strictness strictness_) const;
+    /// Get result type for function "joinGet(OrNull)"
+    DataTypePtr joinGetCheckAndGetReturnType(const DataTypes & data_types, const String & column_name, bool or_null) const;
+
+    /// Execute function "joinGet(OrNull)" on data block.
+    /// Takes rwlock for read to prevent parallel StorageJoin updates during processing data block
+    /// (but not during processing whole query, it's safe for joinGet that doesn't involve `used_flags` from HashJoin)
+    ColumnWithTypeAndName joinGet(const Block & block, const Block & block_with_columns_to_add) const;
 
     Pipe read(
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
@@ -61,6 +65,10 @@ private:
     std::shared_ptr<TableJoin> table_join;
     HashJoinPtr join;
 
+    /// Protect state for concurrent use in insertFromBlock and joinBlock.
+    /// Lock is stored in HashJoin instance during query and blocks concurrent insertions.
+    mutable std::shared_mutex rwlock;
+
     void insertBlock(const Block & block) override;
     void finishInsert() override {}
     size_t getSize() const override;
diff --git a/src/Storages/StorageLog.cpp b/src/Storages/StorageLog.cpp
index 02172517eb1..8ed68e0b44d 100644
--- a/src/Storages/StorageLog.cpp
+++ b/src/Storages/StorageLog.cpp
@@ -87,6 +87,8 @@ private:
     size_t rows_read = 0;
     size_t max_read_buffer_size;
 
+    std::unordered_map<String, SerializationPtr> serializations;
+
     struct Stream
     {
         Stream(const DiskPtr & disk, const String & data_path, size_t offset, size_t max_read_buffer_size_)
@@ -104,11 +106,11 @@ private:
     using FileStreams = std::map<String, Stream>;
     FileStreams streams;
 
-    using DeserializeState = IDataType::DeserializeBinaryBulkStatePtr;
+    using DeserializeState = ISerialization::DeserializeBinaryBulkStatePtr;
     using DeserializeStates = std::map<String, DeserializeState>;
     DeserializeStates deserialize_states;
 
-    void readData(const NameAndTypePair & name_and_type, ColumnPtr & column, size_t max_rows_to_read, IDataType::SubstreamsCache & cache);
+    void readData(const NameAndTypePair & name_and_type, ColumnPtr & column, size_t max_rows_to_read, ISerialization::SubstreamsCache & cache);
 };
 
 
@@ -124,7 +126,7 @@ Chunk LogSource::generate()
 
     /// How many rows to read for the next block.
     size_t max_rows_to_read = std::min(block_size, rows_limit - rows_read);
-    std::unordered_map<String, IDataType::SubstreamsCache> caches;
+    std::unordered_map<String, ISerialization::SubstreamsCache> caches;
 
     for (const auto & name_type : columns)
     {
@@ -162,19 +164,20 @@ Chunk LogSource::generate()
 
 
 void LogSource::readData(const NameAndTypePair & name_and_type, ColumnPtr & column,
-    size_t max_rows_to_read, IDataType::SubstreamsCache & cache)
+    size_t max_rows_to_read, ISerialization::SubstreamsCache & cache)
 {
-    IDataType::DeserializeBinaryBulkSettings settings; /// TODO Use avg_value_size_hint.
+    ISerialization::DeserializeBinaryBulkSettings settings; /// TODO Use avg_value_size_hint.
     const auto & [name, type] = name_and_type;
+    auto serialization = IDataType::getSerialization(name_and_type);
 
     auto create_stream_getter = [&](bool stream_for_prefix)
     {
-        return [&, stream_for_prefix] (const IDataType::SubstreamPath & path) -> ReadBuffer *
+        return [&, stream_for_prefix] (const ISerialization::SubstreamPath & path) -> ReadBuffer *
         {
-            if (cache.count(IDataType::getSubcolumnNameForStream(path)))
+            if (cache.count(ISerialization::getSubcolumnNameForStream(path)))
                 return nullptr;
 
-            String stream_name = IDataType::getFileNameForStream(name_and_type, path);
+            String stream_name = ISerialization::getFileNameForStream(name_and_type, path);
             const auto & file_it = storage.files.find(stream_name);
             if (storage.files.end() == file_it)
                 throw Exception("Logical error: no information about file " + stream_name + " in StorageLog", ErrorCodes::LOGICAL_ERROR);
@@ -193,11 +196,11 @@ void LogSource::readData(const NameAndTypePair & name_and_type, ColumnPtr & colu
     if (deserialize_states.count(name) == 0)
     {
         settings.getter = create_stream_getter(true);
-        type->deserializeBinaryBulkStatePrefix(settings, deserialize_states[name]);
+        serialization->deserializeBinaryBulkStatePrefix(settings, deserialize_states[name]);
     }
 
     settings.getter = create_stream_getter(false);
-    type->deserializeBinaryBulkWithMultipleStreams(column, max_rows_to_read, settings, deserialize_states[name], &cache);
+    serialization->deserializeBinaryBulkWithMultipleStreams(column, max_rows_to_read, settings, deserialize_states[name], &cache);
 }
 
 
@@ -282,11 +285,11 @@ private:
 
     std::unique_ptr<WriteBuffer> marks_stream; /// Declared below `lock` to make the file open when rwlock is captured.
 
-    using SerializeState = IDataType::SerializeBinaryBulkStatePtr;
+    using SerializeState = ISerialization::SerializeBinaryBulkStatePtr;
     using SerializeStates = std::map<String, SerializeState>;
     SerializeStates serialize_states;
 
-    IDataType::OutputStreamGetter createStreamGetter(const NameAndTypePair & name_and_type, WrittenStreams & written_streams);
+    ISerialization::OutputStreamGetter createStreamGetter(const NameAndTypePair & name_and_type, WrittenStreams & written_streams);
 
     void writeData(
         const NameAndTypePair & name_and_type,
@@ -324,14 +327,15 @@ void LogBlockOutputStream::writeSuffix()
         return;
 
     WrittenStreams written_streams;
-    IDataType::SerializeBinaryBulkSettings settings;
+    ISerialization::SerializeBinaryBulkSettings settings;
     for (const auto & column : getHeader())
     {
         auto it = serialize_states.find(column.name);
         if (it != serialize_states.end())
         {
             settings.getter = createStreamGetter(NameAndTypePair(column.name, column.type), written_streams);
-            column.type->serializeBinaryBulkStateSuffix(settings, it->second);
+            auto serialization = column.type->getDefaultSerialization();
+            serialization->serializeBinaryBulkStateSuffix(settings, it->second);
         }
     }
 
@@ -353,15 +357,20 @@ void LogBlockOutputStream::writeSuffix()
 
     streams.clear();
     done = true;
+
+    /// unlock should be done from the same thread as lock, and dtor may be
+    /// called from different thread, so it should be done here (at least in
+    /// case of no exceptions occurred)
+    lock.unlock();
 }
 
 
-IDataType::OutputStreamGetter LogBlockOutputStream::createStreamGetter(const NameAndTypePair & name_and_type,
+ISerialization::OutputStreamGetter LogBlockOutputStream::createStreamGetter(const NameAndTypePair & name_and_type,
                                                                        WrittenStreams & written_streams)
 {
-    return [&] (const IDataType::SubstreamPath & path) -> WriteBuffer *
+    return [&] (const ISerialization::SubstreamPath & path) -> WriteBuffer *
     {
-        String stream_name = IDataType::getFileNameForStream(name_and_type, path);
+        String stream_name = ISerialization::getFileNameForStream(name_and_type, path);
         if (written_streams.count(stream_name))
             return nullptr;
 
@@ -377,12 +386,13 @@ IDataType::OutputStreamGetter LogBlockOutputStream::createStreamGetter(const Nam
 void LogBlockOutputStream::writeData(const NameAndTypePair & name_and_type, const IColumn & column,
     MarksForColumns & out_marks, WrittenStreams & written_streams)
 {
-    IDataType::SerializeBinaryBulkSettings settings;
+    ISerialization::SerializeBinaryBulkSettings settings;
     const auto & [name, type] = name_and_type;
+    auto serialization = type->getDefaultSerialization();
 
-    type->enumerateStreams([&] (const IDataType::SubstreamPath & path, const IDataType & /* substream_type */)
+    serialization->enumerateStreams([&] (const ISerialization::SubstreamPath & path)
     {
-        String stream_name = IDataType::getFileNameForStream(name_and_type, path);
+        String stream_name = ISerialization::getFileNameForStream(name_and_type, path);
         if (written_streams.count(stream_name))
             return;
 
@@ -398,11 +408,11 @@ void LogBlockOutputStream::writeData(const NameAndTypePair & name_and_type, cons
     settings.getter = createStreamGetter(name_and_type, written_streams);
 
     if (serialize_states.count(name) == 0)
-         type->serializeBinaryBulkStatePrefix(settings, serialize_states[name]);
+         serialization->serializeBinaryBulkStatePrefix(settings, serialize_states[name]);
 
-    type->enumerateStreams([&] (const IDataType::SubstreamPath & path, const IDataType & /* substream_type */)
+    serialization->enumerateStreams([&] (const ISerialization::SubstreamPath & path)
     {
-        String stream_name = IDataType::getFileNameForStream(name_and_type, path);
+        String stream_name = ISerialization::getFileNameForStream(name_and_type, path);
         if (written_streams.count(stream_name))
             return;
 
@@ -416,11 +426,11 @@ void LogBlockOutputStream::writeData(const NameAndTypePair & name_and_type, cons
         out_marks.emplace_back(file.column_index, mark);
     }, settings.path);
 
-    type->serializeBinaryBulkWithMultipleStreams(column, 0, 0, settings, serialize_states[name]);
+    serialization->serializeBinaryBulkWithMultipleStreams(column, 0, 0, settings, serialize_states[name]);
 
-    type->enumerateStreams([&] (const IDataType::SubstreamPath & path, const IDataType & /* substream_type */)
+    serialization->enumerateStreams([&] (const ISerialization::SubstreamPath & path)
     {
-        String stream_name = IDataType::getFileNameForStream(name_and_type, path);
+        String stream_name = ISerialization::getFileNameForStream(name_and_type, path);
         if (!written_streams.emplace(stream_name).second)
             return;
 
@@ -501,9 +511,9 @@ void StorageLog::addFiles(const NameAndTypePair & column)
         throw Exception("Duplicate column with name " + column.name + " in constructor of StorageLog.",
             ErrorCodes::DUPLICATE_COLUMN);
 
-    IDataType::StreamCallback stream_callback = [&] (const IDataType::SubstreamPath & substream_path, const IDataType & /* substream_type */)
+    ISerialization::StreamCallback stream_callback = [&] (const ISerialization::SubstreamPath & substream_path)
     {
-        String stream_name = IDataType::getFileNameForStream(column, substream_path);
+        String stream_name = ISerialization::getFileNameForStream(column, substream_path);
 
         if (!files.count(stream_name))
         {
@@ -516,8 +526,8 @@ void StorageLog::addFiles(const NameAndTypePair & column)
         }
     };
 
-    IDataType::SubstreamPath substream_path;
-    column.type->enumerateStreams(stream_callback, substream_path);
+    auto serialization = column.type->getDefaultSerialization();
+    serialization->enumerateStreams(stream_callback);
 }
 
 
@@ -581,7 +591,7 @@ void StorageLog::rename(const String & new_path_to_table_data, const StorageID &
     renameInMemory(new_table_id);
 }
 
-void StorageLog::truncate(const ASTPtr &, const StorageMetadataPtr & metadata_snapshot, const Context &, TableExclusiveLockHolder &)
+void StorageLog::truncate(const ASTPtr &, const StorageMetadataPtr & metadata_snapshot, ContextPtr, TableExclusiveLockHolder &)
 {
     files.clear();
     file_count = 0;
@@ -607,11 +617,12 @@ const StorageLog::Marks & StorageLog::getMarksWithRealRowCount(const StorageMeta
       * If this is a data type with multiple stream, get the first stream, that we assume have real row count.
       * (Example: for Array data type, first stream is array sizes; and number of array sizes is the number of arrays).
       */
-    IDataType::SubstreamPath substream_root_path;
-    column.type->enumerateStreams([&](const IDataType::SubstreamPath & substream_path, const IDataType & /* substream_type */)
+    ISerialization::SubstreamPath substream_root_path;
+    auto serialization = column.type->getDefaultSerialization();
+    serialization->enumerateStreams([&](const ISerialization::SubstreamPath & substream_path)
     {
         if (filename.empty())
-            filename = IDataType::getFileNameForStream(column, substream_path);
+            filename = ISerialization::getFileNameForStream(column, substream_path);
     }, substream_root_path);
 
     Files::const_iterator it = files.find(filename);
@@ -622,9 +633,9 @@ const StorageLog::Marks & StorageLog::getMarksWithRealRowCount(const StorageMeta
 }
 
 
-static std::chrono::seconds getLockTimeout(const Context & context)
+static std::chrono::seconds getLockTimeout(ContextPtr context)
 {
-    const Settings & settings = context.getSettingsRef();
+    const Settings & settings = context->getSettingsRef();
     Int64 lock_timeout = settings.lock_acquire_timeout.totalSeconds();
     if (settings.max_execution_time.totalSeconds() != 0 && settings.max_execution_time.totalSeconds() < lock_timeout)
         lock_timeout = settings.max_execution_time.totalSeconds();
@@ -636,7 +647,7 @@ Pipe StorageLog::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & /*query_info*/,
-    const Context & context,
+    ContextPtr context,
     QueryProcessingStage::Enum /*processed_stage*/,
     size_t max_block_size,
     unsigned num_streams)
@@ -661,7 +672,7 @@ Pipe StorageLog::read(
     if (num_streams > marks_size)
         num_streams = marks_size;
 
-    size_t max_read_buffer_size = context.getSettingsRef().max_read_buffer_size;
+    size_t max_read_buffer_size = context->getSettingsRef().max_read_buffer_size;
 
     for (size_t stream = 0; stream < num_streams; ++stream)
     {
@@ -684,7 +695,7 @@ Pipe StorageLog::read(
     return Pipe::unitePipes(std::move(pipes));
 }
 
-BlockOutputStreamPtr StorageLog::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, const Context & context)
+BlockOutputStreamPtr StorageLog::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, ContextPtr context)
 {
     auto lock_timeout = getLockTimeout(context);
     loadMarks(lock_timeout);
@@ -696,7 +707,7 @@ BlockOutputStreamPtr StorageLog::write(const ASTPtr & /*query*/, const StorageMe
     return std::make_shared<LogBlockOutputStream>(*this, metadata_snapshot, std::move(lock));
 }
 
-CheckResults StorageLog::checkData(const ASTPtr & /* query */, const Context & context)
+CheckResults StorageLog::checkData(const ASTPtr & /* query */, ContextPtr context)
 {
     std::shared_lock lock(rwlock, getLockTimeout(context));
     if (!lock)
@@ -720,11 +731,11 @@ void registerStorageLog(StorageFactory & factory)
                 ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
 
         String disk_name = getDiskName(*args.storage_def);
-        DiskPtr disk = args.context.getDisk(disk_name);
+        DiskPtr disk = args.getContext()->getDisk(disk_name);
 
         return StorageLog::create(
             disk, args.relative_data_path, args.table_id, args.columns, args.constraints,
-            args.attach, args.context.getSettings().max_compress_block_size);
+            args.attach, args.getContext()->getSettings().max_compress_block_size);
     }, features);
 }
 
diff --git a/src/Storages/StorageLog.h b/src/Storages/StorageLog.h
index acb03658182..4fbaf53529f 100644
--- a/src/Storages/StorageLog.h
+++ b/src/Storages/StorageLog.h
@@ -29,18 +29,18 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & metadata_snapshot,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
 
-    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, const Context & context) override;
+    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, ContextPtr context) override;
 
     void rename(const String & new_path_to_table_data, const StorageID & new_table_id) override;
 
-    CheckResults checkData(const ASTPtr & /* query */, const Context & /* context */) override;
+    CheckResults checkData(const ASTPtr & /* query */, ContextPtr /* context */) override;
 
-    void truncate(const ASTPtr &, const StorageMetadataPtr & metadata_snapshot, const Context &, TableExclusiveLockHolder &) override;
+    void truncate(const ASTPtr &, const StorageMetadataPtr & metadata_snapshot, ContextPtr, TableExclusiveLockHolder &) override;
 
     bool storesDataOnDisk() const override { return true; }
     Strings getDataPaths() const override { return {DB::fullPath(disk, table_path)}; }
@@ -86,7 +86,7 @@ private:
     DiskPtr disk;
     String table_path;
 
-    mutable std::shared_timed_mutex rwlock;
+    std::shared_timed_mutex rwlock;
 
     Files files;
 
diff --git a/src/Storages/StorageMaterializeMySQL.cpp b/src/Storages/StorageMaterializeMySQL.cpp
index e59f1e22958..8e6f2e1ad63 100644
--- a/src/Storages/StorageMaterializeMySQL.cpp
+++ b/src/Storages/StorageMaterializeMySQL.cpp
@@ -39,7 +39,7 @@ Pipe StorageMaterializeMySQL::read(
     const Names & column_names,
     const StorageMetadataPtr & /*metadata_snapshot*/,
     SelectQueryInfo & query_info,
-    const Context & context,
+    ContextPtr context,
     QueryProcessingStage::Enum processed_stage,
     size_t max_block_size,
     unsigned int num_streams)
@@ -48,7 +48,7 @@ Pipe StorageMaterializeMySQL::read(
     rethrowSyncExceptionIfNeed(database);
 
     NameSet column_names_set = NameSet(column_names.begin(), column_names.end());
-    auto lock = nested_storage->lockForShare(context.getCurrentQueryId(), context.getSettingsRef().lock_acquire_timeout);
+    auto lock = nested_storage->lockForShare(context->getCurrentQueryId(), context->getSettingsRef().lock_acquire_timeout);
     const StorageMetadataPtr & nested_metadata = nested_storage->getInMemoryMetadataPtr();
 
     Block nested_header = nested_metadata->getSampleBlock();
@@ -92,7 +92,7 @@ Pipe StorageMaterializeMySQL::read(
     {
         Block pipe_header = pipe.getHeader();
         auto syntax = TreeRewriter(context).analyze(expressions, pipe_header.getNamesAndTypesList());
-        ExpressionActionsPtr expression_actions = ExpressionAnalyzer(expressions, syntax, context).getActions(true);
+        ExpressionActionsPtr expression_actions = ExpressionAnalyzer(expressions, syntax, context).getActions(true /* add_aliases */, false /* project_result */);
 
         pipe.addSimpleTransform([&](const Block & header)
         {
diff --git a/src/Storages/StorageMaterializeMySQL.h b/src/Storages/StorageMaterializeMySQL.h
index f787470e2d2..8a4b88cbbb4 100644
--- a/src/Storages/StorageMaterializeMySQL.h
+++ b/src/Storages/StorageMaterializeMySQL.h
@@ -26,9 +26,9 @@ public:
 
     Pipe read(
         const Names & column_names, const StorageMetadataPtr & metadata_snapshot, SelectQueryInfo & query_info,
-        const Context & context, QueryProcessingStage::Enum processed_stage, size_t max_block_size, unsigned num_streams) override;
+        ContextPtr context, QueryProcessingStage::Enum processed_stage, size_t max_block_size, unsigned num_streams) override;
 
-    BlockOutputStreamPtr write(const ASTPtr &, const StorageMetadataPtr &, const Context &) override { throwNotAllowed(); }
+    BlockOutputStreamPtr write(const ASTPtr &, const StorageMetadataPtr &, ContextPtr) override { throwNotAllowed(); }
 
     NamesAndTypesList getVirtuals() const override;
     ColumnSizeByName getColumnSizes() const override;
diff --git a/src/Storages/StorageMaterializedView.cpp b/src/Storages/StorageMaterializedView.cpp
index 325bf3d2f74..89b8bc72526 100644
--- a/src/Storages/StorageMaterializedView.cpp
+++ b/src/Storages/StorageMaterializedView.cpp
@@ -26,7 +26,8 @@
 #include <Processors/Sources/SourceFromInputStream.h>
 #include <Processors/QueryPlan/SettingQuotaAndLimitsStep.h>
 #include <Processors/QueryPlan/ExpressionStep.h>
-
+#include <Processors/QueryPlan/BuildQueryPipelineSettings.h>
+#include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
 
 namespace DB
 {
@@ -49,11 +50,11 @@ static inline String generateInnerTableName(const StorageID & view_id)
 
 StorageMaterializedView::StorageMaterializedView(
     const StorageID & table_id_,
-    Context & local_context,
+    ContextPtr local_context,
     const ASTCreateQuery & query,
     const ColumnsDescription & columns_,
     bool attach_)
-    : IStorage(table_id_), global_context(local_context.getGlobalContext())
+    : IStorage(table_id_), WithContext(local_context->getGlobalContext())
 {
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(columns_);
@@ -75,24 +76,30 @@ StorageMaterializedView::StorageMaterializedView(
     storage_metadata.setSelectQuery(select);
     setInMemoryMetadata(storage_metadata);
 
+    bool point_to_itself_by_uuid = has_inner_table && query.to_inner_uuid != UUIDHelpers::Nil
+                                                   && query.to_inner_uuid == table_id_.uuid;
+    bool point_to_itself_by_name = !has_inner_table && query.to_table_id.database_name == table_id_.database_name
+                                                    && query.to_table_id.table_name == table_id_.table_name;
+    if (point_to_itself_by_uuid || point_to_itself_by_name)
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Materialized view {} cannot point to itself", table_id_.getFullTableName());
+
     if (!has_inner_table)
     {
-        if (query.to_table_id.database_name == table_id_.database_name && query.to_table_id.table_name == table_id_.table_name)
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Materialized view {} cannot point to itself", table_id_.getFullTableName());
         target_table_id = query.to_table_id;
     }
     else if (attach_)
     {
         /// If there is an ATTACH request, then the internal table must already be created.
-        target_table_id = StorageID(getStorageID().database_name, generateInnerTableName(getStorageID()));
+        target_table_id = StorageID(getStorageID().database_name, generateInnerTableName(getStorageID()), query.to_inner_uuid);
     }
     else
     {
         /// We will create a query to create an internal table.
-        auto create_context = Context(local_context);
+        auto create_context = Context::createCopy(local_context);
         auto manual_create_query = std::make_shared<ASTCreateQuery>();
         manual_create_query->database = getStorageID().database_name;
         manual_create_query->table = generateInnerTableName(getStorageID());
+        manual_create_query->uuid = query.to_inner_uuid;
 
         auto new_columns_list = std::make_shared<ASTColumns>();
         new_columns_list->set(new_columns_list->columns, query.columns_list->columns->ptr());
@@ -104,30 +111,33 @@ StorageMaterializedView::StorageMaterializedView(
         create_interpreter.setInternal(true);
         create_interpreter.execute();
 
-        target_table_id = DatabaseCatalog::instance().getTable({manual_create_query->database, manual_create_query->table}, global_context)->getStorageID();
+        target_table_id = DatabaseCatalog::instance().getTable({manual_create_query->database, manual_create_query->table}, getContext())->getStorageID();
     }
 
     if (!select.select_table_id.empty())
         DatabaseCatalog::instance().addDependency(select.select_table_id, getStorageID());
 }
 
-QueryProcessingStage::Enum StorageMaterializedView::getQueryProcessingStage(const Context & context, QueryProcessingStage::Enum to_stage, SelectQueryInfo & query_info) const
+QueryProcessingStage::Enum StorageMaterializedView::getQueryProcessingStage(
+    ContextPtr local_context, QueryProcessingStage::Enum to_stage, SelectQueryInfo & query_info) const
 {
-    return getTargetTable()->getQueryProcessingStage(context, to_stage, query_info);
+    return getTargetTable()->getQueryProcessingStage(local_context, to_stage, query_info);
 }
 
 Pipe StorageMaterializedView::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & query_info,
-    const Context & context,
+    ContextPtr local_context,
     QueryProcessingStage::Enum processed_stage,
     const size_t max_block_size,
     const unsigned num_streams)
 {
     QueryPlan plan;
-    read(plan, column_names, metadata_snapshot, query_info, context, processed_stage, max_block_size, num_streams);
-    return plan.convertToPipe();
+    read(plan, column_names, metadata_snapshot, query_info, local_context, processed_stage, max_block_size, num_streams);
+    return plan.convertToPipe(
+        QueryPlanOptimizationSettings::fromContext(local_context),
+        BuildQueryPipelineSettings::fromContext(local_context));
 }
 
 void StorageMaterializedView::read(
@@ -135,23 +145,23 @@ void StorageMaterializedView::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & query_info,
-    const Context & context,
+    ContextPtr local_context,
     QueryProcessingStage::Enum processed_stage,
     const size_t max_block_size,
     const unsigned num_streams)
 {
     auto storage = getTargetTable();
-    auto lock = storage->lockForShare(context.getCurrentQueryId(), context.getSettingsRef().lock_acquire_timeout);
+    auto lock = storage->lockForShare(local_context->getCurrentQueryId(), local_context->getSettingsRef().lock_acquire_timeout);
     auto target_metadata_snapshot = storage->getInMemoryMetadataPtr();
 
     if (query_info.order_optimizer)
-        query_info.input_order_info = query_info.order_optimizer->getInputOrder(target_metadata_snapshot, context);
+        query_info.input_order_info = query_info.order_optimizer->getInputOrder(target_metadata_snapshot, local_context);
 
-    storage->read(query_plan, column_names, target_metadata_snapshot, query_info, context, processed_stage, max_block_size, num_streams);
+    storage->read(query_plan, column_names, target_metadata_snapshot, query_info, local_context, processed_stage, max_block_size, num_streams);
 
     if (query_plan.isInitialized())
     {
-        auto mv_header = getHeaderForProcessingStage(*this, column_names, metadata_snapshot, query_info, context, processed_stage);
+        auto mv_header = getHeaderForProcessingStage(*this, column_names, metadata_snapshot, query_info, local_context, processed_stage);
         auto target_header = query_plan.getCurrentDataStream().header;
         if (!blocksHaveEqualStructure(mv_header, target_header))
         {
@@ -181,20 +191,20 @@ void StorageMaterializedView::read(
     }
 }
 
-BlockOutputStreamPtr StorageMaterializedView::write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, const Context & context)
+BlockOutputStreamPtr StorageMaterializedView::write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, ContextPtr local_context)
 {
     auto storage = getTargetTable();
-    auto lock = storage->lockForShare(context.getCurrentQueryId(), context.getSettingsRef().lock_acquire_timeout);
+    auto lock = storage->lockForShare(local_context->getCurrentQueryId(), local_context->getSettingsRef().lock_acquire_timeout);
 
     auto metadata_snapshot = storage->getInMemoryMetadataPtr();
-    auto stream = storage->write(query, metadata_snapshot, context);
+    auto stream = storage->write(query, metadata_snapshot, local_context);
 
     stream->addTableLock(lock);
     return stream;
 }
 
 
-static void executeDropQuery(ASTDropQuery::Kind kind, const Context & global_context, const Context & current_context, const StorageID & target_table_id, bool no_delay)
+static void executeDropQuery(ASTDropQuery::Kind kind, ContextPtr global_context, ContextPtr current_context, const StorageID & target_table_id, bool no_delay)
 {
     if (DatabaseCatalog::instance().tryGetTable(target_table_id, current_context))
     {
@@ -210,13 +220,13 @@ static void executeDropQuery(ASTDropQuery::Kind kind, const Context & global_con
         /// to avoid "Not enough privileges" error if current user has only DROP VIEW ON mat_view_name privilege
         /// and not allowed to drop inner table explicitly. Allowing to drop inner table without explicit grant
         /// looks like expected behaviour and we have tests for it.
-        auto drop_context = Context(global_context);
-        drop_context.getClientInfo().query_kind = ClientInfo::QueryKind::SECONDARY_QUERY;
-        if (auto txn = current_context.getZooKeeperMetadataTransaction())
+        auto drop_context = Context::createCopy(global_context);
+        drop_context->getClientInfo().query_kind = ClientInfo::QueryKind::SECONDARY_QUERY;
+        if (auto txn = current_context->getZooKeeperMetadataTransaction())
         {
             /// For Replicated database
-            drop_context.setQueryContext(const_cast<Context &>(current_context));
-            drop_context.initZooKeeperMetadataTransaction(txn, true);
+            drop_context->setQueryContext(current_context);
+            drop_context->initZooKeeperMetadataTransaction(txn, true);
         }
         InterpreterDropQuery drop_interpreter(ast_drop_query, drop_context);
         drop_interpreter.execute();
@@ -231,19 +241,19 @@ void StorageMaterializedView::drop()
     if (!select_query.select_table_id.empty())
         DatabaseCatalog::instance().removeDependency(select_query.select_table_id, table_id);
 
-    dropInnerTable(true, global_context);
+    dropInnerTable(true, getContext());
 }
 
-void StorageMaterializedView::dropInnerTable(bool no_delay, const Context & context)
+void StorageMaterializedView::dropInnerTable(bool no_delay, ContextPtr local_context)
 {
     if (has_inner_table && tryGetTargetTable())
-        executeDropQuery(ASTDropQuery::Kind::Drop, global_context, context, target_table_id, no_delay);
+        executeDropQuery(ASTDropQuery::Kind::Drop, getContext(), local_context, target_table_id, no_delay);
 }
 
-void StorageMaterializedView::truncate(const ASTPtr &, const StorageMetadataPtr &, const Context & context, TableExclusiveLockHolder &)
+void StorageMaterializedView::truncate(const ASTPtr &, const StorageMetadataPtr &, ContextPtr local_context, TableExclusiveLockHolder &)
 {
     if (has_inner_table)
-        executeDropQuery(ASTDropQuery::Kind::Truncate, global_context, context, target_table_id, true);
+        executeDropQuery(ASTDropQuery::Kind::Truncate, getContext(), local_context, target_table_id, true);
 }
 
 void StorageMaterializedView::checkStatementCanBeForwarded() const
@@ -261,26 +271,26 @@ bool StorageMaterializedView::optimize(
     bool final,
     bool deduplicate,
     const Names & deduplicate_by_columns,
-    const Context & context)
+    ContextPtr local_context)
 {
     checkStatementCanBeForwarded();
     auto storage_ptr = getTargetTable();
     auto metadata_snapshot = storage_ptr->getInMemoryMetadataPtr();
-    return getTargetTable()->optimize(query, metadata_snapshot, partition, final, deduplicate, deduplicate_by_columns, context);
+    return getTargetTable()->optimize(query, metadata_snapshot, partition, final, deduplicate, deduplicate_by_columns, local_context);
 }
 
 void StorageMaterializedView::alter(
     const AlterCommands & params,
-    const Context & context,
+    ContextPtr local_context,
     TableLockHolder &)
 {
     auto table_id = getStorageID();
     StorageInMemoryMetadata new_metadata = getInMemoryMetadata();
     StorageInMemoryMetadata old_metadata = getInMemoryMetadata();
-    params.apply(new_metadata, context);
+    params.apply(new_metadata, local_context);
 
     /// start modify query
-    if (context.getSettingsRef().allow_experimental_alter_materialized_view_structure)
+    if (local_context->getSettingsRef().allow_experimental_alter_materialized_view_structure)
     {
         const auto & new_select = new_metadata.select;
         const auto & old_select = old_metadata.getSelectQuery();
@@ -291,13 +301,14 @@ void StorageMaterializedView::alter(
     }
     /// end modify query
 
-    DatabaseCatalog::instance().getDatabase(table_id.database_name)->alterTable(context, table_id, new_metadata);
+    DatabaseCatalog::instance().getDatabase(table_id.database_name)->alterTable(local_context, table_id, new_metadata);
     setInMemoryMetadata(new_metadata);
 }
 
 
-void StorageMaterializedView::checkAlterIsPossible(const AlterCommands & commands, const Settings & settings) const
+void StorageMaterializedView::checkAlterIsPossible(const AlterCommands & commands, ContextPtr local_context) const
 {
+    const auto & settings = local_context->getSettingsRef();
     if (settings.allow_experimental_alter_materialized_view_structure)
     {
         for (const auto & command : commands)
@@ -320,11 +331,17 @@ void StorageMaterializedView::checkAlterIsPossible(const AlterCommands & command
     }
 }
 
-Pipe StorageMaterializedView::alterPartition(
-    const StorageMetadataPtr & metadata_snapshot, const PartitionCommands & commands, const Context & context)
+void StorageMaterializedView::checkMutationIsPossible(const MutationCommands & commands, const Settings & settings) const
 {
     checkStatementCanBeForwarded();
-    return getTargetTable()->alterPartition(metadata_snapshot, commands, context);
+    getTargetTable()->checkMutationIsPossible(commands, settings);
+}
+
+Pipe StorageMaterializedView::alterPartition(
+    const StorageMetadataPtr & metadata_snapshot, const PartitionCommands & commands, ContextPtr local_context)
+{
+    checkStatementCanBeForwarded();
+    return getTargetTable()->alterPartition(metadata_snapshot, commands, local_context);
 }
 
 void StorageMaterializedView::checkAlterPartitionIsPossible(
@@ -334,10 +351,10 @@ void StorageMaterializedView::checkAlterPartitionIsPossible(
     getTargetTable()->checkAlterPartitionIsPossible(commands, metadata_snapshot, settings);
 }
 
-void StorageMaterializedView::mutate(const MutationCommands & commands, const Context & context)
+void StorageMaterializedView::mutate(const MutationCommands & commands, ContextPtr local_context)
 {
     checkStatementCanBeForwarded();
-    getTargetTable()->mutate(commands, context);
+    getTargetTable()->mutate(commands, local_context);
 }
 
 void StorageMaterializedView::renameInMemory(const StorageID & new_table_id)
@@ -364,7 +381,7 @@ void StorageMaterializedView::renameInMemory(const StorageID & new_table_id)
         elem.to = to;
         rename->elements.emplace_back(elem);
 
-        InterpreterRenameQuery(rename, global_context).execute();
+        InterpreterRenameQuery(rename, getContext()).execute();
         target_table_id.table_name = new_target_table_name;
     }
 
@@ -386,13 +403,13 @@ void StorageMaterializedView::shutdown()
 StoragePtr StorageMaterializedView::getTargetTable() const
 {
     checkStackSize();
-    return DatabaseCatalog::instance().getTable(target_table_id, global_context);
+    return DatabaseCatalog::instance().getTable(target_table_id, getContext());
 }
 
 StoragePtr StorageMaterializedView::tryGetTargetTable() const
 {
     checkStackSize();
-    return DatabaseCatalog::instance().tryGetTable(target_table_id, global_context);
+    return DatabaseCatalog::instance().tryGetTable(target_table_id, getContext());
 }
 
 Strings StorageMaterializedView::getDataPaths() const
@@ -402,32 +419,6 @@ Strings StorageMaterializedView::getDataPaths() const
     return {};
 }
 
-void StorageMaterializedView::checkTableCanBeDropped() const
-{
-    /// Don't drop the target table if it was created manually via 'TO inner_table' statement
-    if (!has_inner_table)
-        return;
-
-    auto target_table = tryGetTargetTable();
-    if (!target_table)
-        return;
-
-    target_table->checkTableCanBeDropped();
-}
-
-void StorageMaterializedView::checkPartitionCanBeDropped(const ASTPtr & partition)
-{
-    /// Don't drop the partition in target table if it was created manually via 'TO inner_table' statement
-    if (!has_inner_table)
-        return;
-
-    auto target_table = tryGetTargetTable();
-    if (!target_table)
-        return;
-
-    target_table->checkPartitionCanBeDropped(partition);
-}
-
 ActionLock StorageMaterializedView::getActionLock(StorageActionBlockType type)
 {
     return has_inner_table ? getTargetTable()->getActionLock(type) : ActionLock{};
@@ -439,7 +430,7 @@ void registerStorageMaterializedView(StorageFactory & factory)
     {
         /// Pass local_context here to convey setting for inner table
         return StorageMaterializedView::create(
-            args.table_id, args.local_context, args.query,
+            args.table_id, args.getLocalContext(), args.query,
             args.columns, args.attach);
     });
 }
diff --git a/src/Storages/StorageMaterializedView.h b/src/Storages/StorageMaterializedView.h
index 94e4295cd34..cda8112a8c3 100644
--- a/src/Storages/StorageMaterializedView.h
+++ b/src/Storages/StorageMaterializedView.h
@@ -12,7 +12,7 @@
 namespace DB
 {
 
-class StorageMaterializedView final : public ext::shared_ptr_helper<StorageMaterializedView>, public IStorage
+class StorageMaterializedView final : public ext::shared_ptr_helper<StorageMaterializedView>, public IStorage, WithContext
 {
     friend struct ext::shared_ptr_helper<StorageMaterializedView>;
 public:
@@ -27,19 +27,19 @@ public:
     bool supportsIndexForIn() const override { return getTargetTable()->supportsIndexForIn(); }
     bool supportsParallelInsert() const override { return getTargetTable()->supportsParallelInsert(); }
     bool supportsSubcolumns() const override { return getTargetTable()->supportsSubcolumns(); }
-    bool mayBenefitFromIndexForIn(const ASTPtr & left_in_operand, const Context & query_context, const StorageMetadataPtr & /* metadata_snapshot */) const override
+    bool mayBenefitFromIndexForIn(const ASTPtr & left_in_operand, ContextPtr query_context, const StorageMetadataPtr & /* metadata_snapshot */) const override
     {
         auto target_table = getTargetTable();
         auto metadata_snapshot = target_table->getInMemoryMetadataPtr();
         return target_table->mayBenefitFromIndexForIn(left_in_operand, query_context, metadata_snapshot);
     }
 
-    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, const Context & context) override;
+    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, ContextPtr context) override;
 
     void drop() override;
-    void dropInnerTable(bool no_delay, const Context & context);
+    void dropInnerTable(bool no_delay, ContextPtr context);
 
-    void truncate(const ASTPtr &, const StorageMetadataPtr &, const Context &, TableExclusiveLockHolder &) override;
+    void truncate(const ASTPtr &, const StorageMetadataPtr &, ContextPtr, TableExclusiveLockHolder &) override;
 
     bool optimize(
         const ASTPtr & query,
@@ -48,26 +48,25 @@ public:
         bool final,
         bool deduplicate,
         const Names & deduplicate_by_columns,
-        const Context & context) override;
+        ContextPtr context) override;
 
-    void alter(const AlterCommands & params, const Context & context, TableLockHolder & table_lock_holder) override;
+    void alter(const AlterCommands & params, ContextPtr context, TableLockHolder & table_lock_holder) override;
 
-    void checkAlterIsPossible(const AlterCommands & commands, const Settings & settings) const override;
+    void checkMutationIsPossible(const MutationCommands & commands, const Settings & settings) const override;
 
-    Pipe alterPartition(const StorageMetadataPtr & metadata_snapshot, const PartitionCommands & commands, const Context & context) override;
+    void checkAlterIsPossible(const AlterCommands & commands, ContextPtr context) const override;
+
+    Pipe alterPartition(const StorageMetadataPtr & metadata_snapshot, const PartitionCommands & commands, ContextPtr context) override;
 
     void checkAlterPartitionIsPossible(const PartitionCommands & commands, const StorageMetadataPtr & metadata_snapshot, const Settings & settings) const override;
 
-    void mutate(const MutationCommands & commands, const Context & context) override;
+    void mutate(const MutationCommands & commands, ContextPtr context) override;
 
     void renameInMemory(const StorageID & new_table_id) override;
 
     void shutdown() override;
 
-    void checkTableCanBeDropped() const override;
-    void checkPartitionCanBeDropped(const ASTPtr & partition) override;
-
-    QueryProcessingStage::Enum getQueryProcessingStage(const Context &, QueryProcessingStage::Enum /*to_stage*/, SelectQueryInfo &) const override;
+    QueryProcessingStage::Enum getQueryProcessingStage(ContextPtr, QueryProcessingStage::Enum /*to_stage*/, SelectQueryInfo &) const override;
 
     StoragePtr getTargetTable() const;
     StoragePtr tryGetTargetTable() const;
@@ -78,7 +77,7 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
@@ -88,7 +87,7 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & metadata_snapshot,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
@@ -99,7 +98,6 @@ private:
     /// Will be initialized in constructor
     StorageID target_table_id = StorageID::createEmpty();
 
-    Context & global_context;
     bool has_inner_table = false;
 
     void checkStatementCanBeForwarded() const;
@@ -107,7 +105,7 @@ private:
 protected:
     StorageMaterializedView(
         const StorageID & table_id_,
-        Context & local_context,
+        ContextPtr local_context,
         const ASTCreateQuery & query,
         const ColumnsDescription & columns_,
         bool attach_);
diff --git a/src/Storages/StorageMemory.cpp b/src/Storages/StorageMemory.cpp
index d7b0ae055ab..4cae7367606 100644
--- a/src/Storages/StorageMemory.cpp
+++ b/src/Storages/StorageMemory.cpp
@@ -26,10 +26,6 @@ class MemorySource : public SourceWithProgress
 {
     using InitializerFunc = std::function<void(std::shared_ptr<const Blocks> &)>;
 public:
-    /// Blocks are stored in std::list which may be appended in another thread.
-    /// We use pointer to the beginning of the list and its current size.
-    /// We don't need synchronisation in this reader, because while we hold SharedLock on storage,
-    /// only new elements can be added to the back of the list, so our iterators remain valid
 
     MemorySource(
         Names column_names_,
@@ -59,7 +55,7 @@ protected:
 
         size_t current_index = getAndIncrementExecutionIndex();
 
-        if (current_index >= data->size())
+        if (!data || current_index >= data->size())
         {
             return {};
         }
@@ -182,7 +178,7 @@ Pipe StorageMemory::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & /*query_info*/,
-    const Context & /*context*/,
+    ContextPtr /*context*/,
     QueryProcessingStage::Enum /*processed_stage*/,
     size_t /*max_block_size*/,
     unsigned num_streams)
@@ -230,7 +226,7 @@ Pipe StorageMemory::read(
 }
 
 
-BlockOutputStreamPtr StorageMemory::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, const Context & /*context*/)
+BlockOutputStreamPtr StorageMemory::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, ContextPtr /*context*/)
 {
     return std::make_shared<MemoryBlockOutputStream>(*this, metadata_snapshot);
 }
@@ -253,7 +249,12 @@ static inline void updateBlockData(Block & old_block, const Block & new_block)
     }
 }
 
-void StorageMemory::mutate(const MutationCommands & commands, const Context & context)
+void StorageMemory::checkMutationIsPossible(const MutationCommands & /*commands*/, const Settings & /*settings*/) const
+{
+    /// Some validation will be added
+}
+
+void StorageMemory::mutate(const MutationCommands & commands, ContextPtr context)
 {
     std::lock_guard lock(mutex);
     auto metadata_snapshot = getInMemoryMetadataPtr();
@@ -315,7 +316,7 @@ void StorageMemory::mutate(const MutationCommands & commands, const Context & co
 
 
 void StorageMemory::truncate(
-    const ASTPtr &, const StorageMetadataPtr &, const Context &, TableExclusiveLockHolder &)
+    const ASTPtr &, const StorageMetadataPtr &, ContextPtr, TableExclusiveLockHolder &)
 {
     data.set(std::make_unique<Blocks>());
     total_size_bytes.store(0, std::memory_order_relaxed);
diff --git a/src/Storages/StorageMemory.h b/src/Storages/StorageMemory.h
index db71c13ca99..1118474deee 100644
--- a/src/Storages/StorageMemory.h
+++ b/src/Storages/StorageMemory.h
@@ -34,7 +34,7 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
@@ -47,13 +47,14 @@ public:
 
     bool hasEvenlyDistributedRead() const override { return true; }
 
-    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & metadata_snapshot, const Context & context) override;
+    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & metadata_snapshot, ContextPtr context) override;
 
     void drop() override;
 
-    void mutate(const MutationCommands & commands, const Context & context) override;
+    void checkMutationIsPossible(const MutationCommands & commands, const Settings & settings) const override;
+    void mutate(const MutationCommands & commands, ContextPtr context) override;
 
-    void truncate(const ASTPtr &, const StorageMetadataPtr &, const Context &, TableExclusiveLockHolder &) override;
+    void truncate(const ASTPtr &, const StorageMetadataPtr &, ContextPtr, TableExclusiveLockHolder &) override;
 
     std::optional<UInt64> totalRows(const Settings &) const override;
     std::optional<UInt64> totalBytes(const Settings &) const override;
@@ -96,7 +97,7 @@ public:
     void delayReadForGlobalSubqueries() { delay_read_for_global_subqueries = true; }
 
 private:
-    /// MultiVersion data storage, so that we can copy the list of blocks to readers.
+    /// MultiVersion data storage, so that we can copy the vector of blocks to readers.
 
     MultiVersion<Blocks> data;
 
diff --git a/src/Storages/StorageMerge.cpp b/src/Storages/StorageMerge.cpp
index 91ebfaa3a27..6ad7b0bce6e 100644
--- a/src/Storages/StorageMerge.cpp
+++ b/src/Storages/StorageMerge.cpp
@@ -9,6 +9,7 @@
 #include <Interpreters/ExpressionActions.h>
 #include <Interpreters/evaluateConstantExpression.h>
 #include <Interpreters/InterpreterSelectQuery.h>
+#include <Interpreters/IdentifierSemantic.h>
 #include <Interpreters/getHeaderForProcessingStage.h>
 #include <Parsers/ASTSelectQuery.h>
 #include <Parsers/ASTLiteral.h>
@@ -37,17 +38,21 @@ namespace ErrorCodes
     extern const int ILLEGAL_PREWHERE;
     extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
     extern const int SAMPLING_NOT_SUPPORTED;
+    extern const int ALTER_OF_COLUMN_IS_FORBIDDEN;
 }
 
 namespace
 {
 
-void modifySelect(ASTSelectQuery & select, const TreeRewriterResult & rewriter_result)
+TreeRewriterResult modifySelect(ASTSelectQuery & select, const TreeRewriterResult & rewriter_result, ContextPtr context)
 {
+
+    TreeRewriterResult new_rewriter_result = rewriter_result;
     if (removeJoin(select))
     {
         /// Also remove GROUP BY cause ExpressionAnalyzer would check if it has all aggregate columns but joined columns would be missed.
         select.setExpression(ASTSelectQuery::Expression::GROUP_BY, {});
+        new_rewriter_result.aggregates.clear();
 
         /// Replace select list to remove joined columns
         auto select_list = std::make_shared<ASTExpressionList>();
@@ -56,12 +61,40 @@ void modifySelect(ASTSelectQuery & select, const TreeRewriterResult & rewriter_r
 
         select.setExpression(ASTSelectQuery::Expression::SELECT, select_list);
 
-        /// TODO: keep WHERE/PREWHERE. We have to remove joined columns and their expressions but keep others.
-        select.setExpression(ASTSelectQuery::Expression::WHERE, {});
-        select.setExpression(ASTSelectQuery::Expression::PREWHERE, {});
+        const DB::IdentifierMembershipCollector membership_collector{select, context};
+
+        /// Remove unknown identifiers from where, leave only ones from left table
+        auto replace_where = [&membership_collector](ASTSelectQuery & query, ASTSelectQuery::Expression expr)
+        {
+            auto where = query.getExpression(expr, false);
+            if (!where)
+                return;
+
+            const size_t left_table_pos = 0;
+            /// Test each argument of `and` function and select ones related to only left table
+            std::shared_ptr<ASTFunction> new_conj = makeASTFunction("and");
+            for (const auto & node : collectConjunctions(where))
+            {
+                if (membership_collector.getIdentsMembership(node) == left_table_pos)
+                    new_conj->arguments->children.push_back(std::move(node));
+            }
+
+            if (new_conj->arguments->children.empty())
+                /// No identifiers from left table
+                query.setExpression(expr, {});
+            else if (new_conj->arguments->children.size() == 1)
+                /// Only one expression, lift from `and`
+                query.setExpression(expr, std::move(new_conj->arguments->children[0]));
+            else
+                /// Set new expression
+                query.setExpression(expr, std::move(new_conj));
+        };
+        replace_where(select,ASTSelectQuery::Expression::WHERE);
+        replace_where(select,ASTSelectQuery::Expression::PREWHERE);
         select.setExpression(ASTSelectQuery::Expression::HAVING, {});
         select.setExpression(ASTSelectQuery::Expression::ORDER_BY, {});
     }
+    return new_rewriter_result;
 }
 
 }
@@ -71,11 +104,11 @@ StorageMerge::StorageMerge(
     const ColumnsDescription & columns_,
     const String & source_database_,
     const Strings & source_tables_,
-    const Context & context_)
+    ContextPtr context_)
     : IStorage(table_id_)
+    , WithContext(context_->getGlobalContext())
     , source_database(source_database_)
     , source_tables(std::in_place, source_tables_.begin(), source_tables_.end())
-    , global_context(context_.getGlobalContext())
 {
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(columns_);
@@ -87,11 +120,11 @@ StorageMerge::StorageMerge(
     const ColumnsDescription & columns_,
     const String & source_database_,
     const String & source_table_regexp_,
-    const Context & context_)
+    ContextPtr context_)
     : IStorage(table_id_)
+    , WithContext(context_->getGlobalContext())
     , source_database(source_database_)
     , source_table_regexp(source_table_regexp_)
-    , global_context(context_.getGlobalContext())
 {
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(columns_);
@@ -101,7 +134,7 @@ StorageMerge::StorageMerge(
 template <typename F>
 StoragePtr StorageMerge::getFirstTable(F && predicate) const
 {
-    auto iterator = getDatabaseIterator(global_context);
+    auto iterator = getDatabaseIterator(getContext());
 
     while (iterator->isValid())
     {
@@ -123,11 +156,10 @@ bool StorageMerge::isRemote() const
 }
 
 
-bool StorageMerge::mayBenefitFromIndexForIn(const ASTPtr & left_in_operand, const Context & query_context, const StorageMetadataPtr & /*metadata_snapshot*/) const
+bool StorageMerge::mayBenefitFromIndexForIn(const ASTPtr & left_in_operand, ContextPtr query_context, const StorageMetadataPtr & /*metadata_snapshot*/) const
 {
     /// It's beneficial if it is true for at least one table.
-    StorageListWithLocks selected_tables = getSelectedTables(
-            query_context.getCurrentQueryId(), query_context.getSettingsRef());
+    StorageListWithLocks selected_tables = getSelectedTables(query_context);
 
     size_t i = 0;
     for (const auto & table : selected_tables)
@@ -147,10 +179,9 @@ bool StorageMerge::mayBenefitFromIndexForIn(const ASTPtr & left_in_operand, cons
 }
 
 
-QueryProcessingStage::Enum StorageMerge::getQueryProcessingStage(const Context & context, QueryProcessingStage::Enum to_stage, SelectQueryInfo & query_info) const
+QueryProcessingStage::Enum
+StorageMerge::getQueryProcessingStage(ContextPtr local_context, QueryProcessingStage::Enum to_stage, SelectQueryInfo & query_info) const
 {
-    ASTPtr modified_query = query_info.query->clone();
-    auto & modified_select = modified_query->as<ASTSelectQuery &>();
     /// In case of JOIN the first stage (which includes JOIN)
     /// should be done on the initiator always.
     ///
@@ -158,12 +189,12 @@ QueryProcessingStage::Enum StorageMerge::getQueryProcessingStage(const Context &
     /// (see modifySelect()/removeJoin())
     ///
     /// And for this we need to return FetchColumns.
-    if (removeJoin(modified_select))
+    if (const auto * select = query_info.query->as<ASTSelectQuery>(); select && hasJoin(*select))
         return QueryProcessingStage::FetchColumns;
 
     auto stage_in_source_tables = QueryProcessingStage::FetchColumns;
 
-    DatabaseTablesIteratorPtr iterator = getDatabaseIterator(context);
+    DatabaseTablesIteratorPtr iterator = getDatabaseIterator(local_context);
 
     size_t selected_table_size = 0;
 
@@ -173,7 +204,7 @@ QueryProcessingStage::Enum StorageMerge::getQueryProcessingStage(const Context &
         if (table && table.get() != this)
         {
             ++selected_table_size;
-            stage_in_source_tables = std::max(stage_in_source_tables, table->getQueryProcessingStage(context, to_stage, query_info));
+            stage_in_source_tables = std::max(stage_in_source_tables, table->getQueryProcessingStage(local_context, to_stage, query_info));
         }
 
         iterator->next();
@@ -187,7 +218,7 @@ Pipe StorageMerge::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & query_info,
-    const Context & context,
+    ContextPtr local_context,
     QueryProcessingStage::Enum processed_stage,
     const size_t max_block_size,
     unsigned num_streams)
@@ -209,17 +240,16 @@ Pipe StorageMerge::read(
     /** Just in case, turn off optimization "transfer to PREWHERE",
       * since there is no certainty that it works when one of table is MergeTree and other is not.
       */
-    auto modified_context = std::make_shared<Context>(context);
+    auto modified_context = Context::createCopy(local_context);
     modified_context->setSetting("optimize_move_to_prewhere", false);
 
     /// What will be result structure depending on query processed stage in source tables?
-    Block header = getHeaderForProcessingStage(*this, column_names, metadata_snapshot, query_info, context, processed_stage);
+    Block header = getHeaderForProcessingStage(*this, column_names, metadata_snapshot, query_info, local_context, processed_stage);
 
     /** First we make list of selected tables to find out its size.
       * This is necessary to correctly pass the recommended number of threads to each table.
       */
-    StorageListWithLocks selected_tables = getSelectedTables(
-        query_info.query, has_table_virtual_column, context.getCurrentQueryId(), context.getSettingsRef());
+    StorageListWithLocks selected_tables = getSelectedTables(local_context, query_info.query, has_table_virtual_column);
 
     if (selected_tables.empty())
         /// FIXME: do we support sampling in this case?
@@ -227,7 +257,8 @@ Pipe StorageMerge::read(
             {}, query_info, processed_stage, max_block_size, header, {}, real_column_names, modified_context, 0, has_table_virtual_column);
 
     size_t tables_count = selected_tables.size();
-    Float64 num_streams_multiplier = std::min(unsigned(tables_count), std::max(1U, unsigned(context.getSettingsRef().max_streams_multiplier_for_merge_tables)));
+    Float64 num_streams_multiplier
+        = std::min(unsigned(tables_count), std::max(1U, unsigned(local_context->getSettingsRef().max_streams_multiplier_for_merge_tables)));
     num_streams *= num_streams_multiplier;
     size_t remaining_streams = num_streams;
 
@@ -238,7 +269,7 @@ Pipe StorageMerge::read(
         {
             auto storage_ptr = std::get<0>(*it);
             auto storage_metadata_snapshot = storage_ptr->getInMemoryMetadataPtr();
-            auto current_info = query_info.order_optimizer->getInputOrder(storage_metadata_snapshot, context);
+            auto current_info = query_info.order_optimizer->getInputOrder(storage_metadata_snapshot, local_context);
             if (it == selected_tables.begin())
                 input_sorting_info = current_info;
             else if (!current_info || (input_sorting_info && *current_info != *input_sorting_info))
@@ -292,7 +323,7 @@ Pipe StorageMerge::createSources(
     const Block & header,
     const StorageWithLockAndName & storage_with_lock,
     Names & real_column_names,
-    const std::shared_ptr<Context> & modified_context,
+    ContextPtr modified_context,
     size_t streams_num,
     bool has_table_virtual_column,
     bool concat_streams)
@@ -303,7 +334,8 @@ Pipe StorageMerge::createSources(
 
     /// Original query could contain JOIN but we need only the first joined table and its columns.
     auto & modified_select = modified_query_info.query->as<ASTSelectQuery &>();
-    modifySelect(modified_select, *query_info.syntax_analyzer_result);
+    auto new_analyzer_res = modifySelect(modified_select, *query_info.syntax_analyzer_result, modified_context);
+    modified_query_info.syntax_analyzer_result = std::make_shared<TreeRewriterResult>(std::move(new_analyzer_res));
 
     VirtualColumnUtils::rewriteEntityInAst(modified_query_info.query, "_table", table_name);
 
@@ -312,7 +344,7 @@ Pipe StorageMerge::createSources(
     if (!storage)
     {
         pipe = QueryPipeline::getPipe(InterpreterSelectQuery(
-            modified_query_info.query, *modified_context,
+            modified_query_info.query, modified_context,
             std::make_shared<OneBlockInputStream>(header),
             SelectQueryOptions(processed_stage).analyze()).execute().pipeline);
 
@@ -320,15 +352,21 @@ Pipe StorageMerge::createSources(
         return pipe;
     }
 
-    auto storage_stage = storage->getQueryProcessingStage(*modified_context, QueryProcessingStage::Complete, modified_query_info);
+    auto storage_stage = storage->getQueryProcessingStage(modified_context, QueryProcessingStage::Complete, modified_query_info);
     if (processed_stage <= storage_stage)
     {
         /// If there are only virtual columns in query, you must request at least one other column.
         if (real_column_names.empty())
             real_column_names.push_back(ExpressionActions::getSmallestColumn(metadata_snapshot->getColumns().getAllPhysical()));
 
-
-        pipe = storage->read(real_column_names, metadata_snapshot, modified_query_info, *modified_context, processed_stage, max_block_size, UInt32(streams_num));
+        pipe = storage->read(
+            real_column_names,
+            metadata_snapshot,
+            modified_query_info,
+            modified_context,
+            processed_stage,
+            max_block_size,
+            UInt32(streams_num));
     }
     else if (processed_stage > storage_stage)
     {
@@ -338,7 +376,7 @@ Pipe StorageMerge::createSources(
         modified_context->setSetting("max_threads", streams_num);
         modified_context->setSetting("max_streams_to_max_threads_ratio", 1);
 
-        InterpreterSelectQuery interpreter{modified_query_info.query, *modified_context, SelectQueryOptions(processed_stage)};
+        InterpreterSelectQuery interpreter{modified_query_info.query, modified_context, SelectQueryOptions(processed_stage)};
 
 
         pipe = QueryPipeline::getPipe(interpreter.execute().pipeline);
@@ -365,7 +403,9 @@ Pipe StorageMerge::createSources(
             column.column = column.type->createColumnConst(0, Field(table_name));
 
             auto adding_column_dag = ActionsDAG::makeAddingColumnActions(std::move(column));
-            auto adding_column_actions = std::make_shared<ExpressionActions>(std::move(adding_column_dag));
+            auto adding_column_actions = std::make_shared<ExpressionActions>(
+                std::move(adding_column_dag),
+                ExpressionActionsSettings::fromContext(modified_context));
 
             pipe.addSimpleTransform([&](const Block & stream_header)
             {
@@ -375,7 +415,7 @@ Pipe StorageMerge::createSources(
 
         /// Subordinary tables could have different but convertible types, like numeric types of different width.
         /// We must return streams with structure equals to structure of Merge table.
-        convertingSourceStream(header, metadata_snapshot, *modified_context, modified_query_info.query, pipe, processed_stage);
+        convertingSourceStream(header, metadata_snapshot, modified_context, modified_query_info.query, pipe, processed_stage);
 
         pipe.addTableLock(struct_lock);
         pipe.addStorageHolder(storage);
@@ -385,33 +425,20 @@ Pipe StorageMerge::createSources(
     return pipe;
 }
 
-
-StorageMerge::StorageListWithLocks StorageMerge::getSelectedTables(const String & query_id, const Settings & settings) const
-{
-    StorageListWithLocks selected_tables;
-    auto iterator = getDatabaseIterator(global_context);
-
-    while (iterator->isValid())
-    {
-        const auto & table = iterator->table();
-        if (table && table.get() != this)
-            selected_tables.emplace_back(
-                    table, table->lockForShare(query_id, settings.lock_acquire_timeout), iterator->name());
-
-        iterator->next();
-    }
-
-    return selected_tables;
-}
-
-
 StorageMerge::StorageListWithLocks StorageMerge::getSelectedTables(
-        const ASTPtr & query, bool has_virtual_column, const String & query_id, const Settings & settings) const
+        ContextPtr query_context,
+        const ASTPtr & query /* = nullptr */,
+        bool filter_by_virtual_column /* = false */) const
 {
-    StorageListWithLocks selected_tables;
-    DatabaseTablesIteratorPtr iterator = getDatabaseIterator(global_context);
+    assert(!filter_by_virtual_column || query);
 
-    auto virtual_column = ColumnString::create();
+    const Settings & settings = query_context->getSettingsRef();
+    StorageListWithLocks selected_tables;
+    DatabaseTablesIteratorPtr iterator = getDatabaseIterator(getContext());
+
+    MutableColumnPtr table_name_virtual_column;
+    if (filter_by_virtual_column)
+        table_name_virtual_column = ColumnString::create();
 
     while (iterator->isValid())
     {
@@ -424,18 +451,20 @@ StorageMerge::StorageListWithLocks StorageMerge::getSelectedTables(
 
         if (storage.get() != this)
         {
-            selected_tables.emplace_back(
-                    storage, storage->lockForShare(query_id, settings.lock_acquire_timeout), iterator->name());
-            virtual_column->insert(iterator->name());
+            auto table_lock = storage->lockForShare(query_context->getCurrentQueryId(), settings.lock_acquire_timeout);
+            selected_tables.emplace_back(storage, std::move(table_lock), iterator->name());
+            if (filter_by_virtual_column)
+                table_name_virtual_column->insert(iterator->name());
         }
 
         iterator->next();
     }
 
-    if (has_virtual_column)
+    if (filter_by_virtual_column)
     {
-        Block virtual_columns_block = Block{ColumnWithTypeAndName(std::move(virtual_column), std::make_shared<DataTypeString>(), "_table")};
-        VirtualColumnUtils::filterBlockWithQuery(query, virtual_columns_block, global_context);
+        /// Filter names of selected tables if there is a condition on "_table" virtual column in WHERE clause
+        Block virtual_columns_block = Block{ColumnWithTypeAndName(std::move(table_name_virtual_column), std::make_shared<DataTypeString>(), "_table")};
+        VirtualColumnUtils::filterBlockWithQuery(query, virtual_columns_block, query_context);
         auto values = VirtualColumnUtils::extractSingleValueFromBlock<String>(virtual_columns_block, "_table");
 
         /// Remove unused tables from the list
@@ -445,8 +474,7 @@ StorageMerge::StorageListWithLocks StorageMerge::getSelectedTables(
     return selected_tables;
 }
 
-
-DatabaseTablesIteratorPtr StorageMerge::getDatabaseIterator(const Context & context) const
+DatabaseTablesIteratorPtr StorageMerge::getDatabaseIterator(ContextPtr local_context) const
 {
     try
     {
@@ -468,12 +496,13 @@ DatabaseTablesIteratorPtr StorageMerge::getDatabaseIterator(const Context & cont
             return source_table_regexp->match(table_name_);
     };
 
-    return database->getTablesIterator(context, table_name_match);
+    return database->getTablesIterator(local_context, table_name_match);
 }
 
 
-void StorageMerge::checkAlterIsPossible(const AlterCommands & commands, const Settings & /* settings */) const
+void StorageMerge::checkAlterIsPossible(const AlterCommands & commands, ContextPtr local_context) const
 {
+    auto name_deps = getDependentViewsByColumn(local_context);
     for (const auto & command : commands)
     {
         if (command.type != AlterCommand::Type::ADD_COLUMN && command.type != AlterCommand::Type::MODIFY_COLUMN
@@ -481,24 +510,35 @@ void StorageMerge::checkAlterIsPossible(const AlterCommands & commands, const Se
             throw Exception(
                 "Alter of type '" + alterTypeToString(command.type) + "' is not supported by storage " + getName(),
                 ErrorCodes::NOT_IMPLEMENTED);
+        if (command.type == AlterCommand::Type::DROP_COLUMN)
+        {
+            const auto & deps_mv = name_deps[command.column_name];
+            if (!deps_mv.empty())
+            {
+                throw Exception(
+                    "Trying to ALTER DROP column " + backQuoteIfNeed(command.column_name) + " which is referenced by materialized view "
+                        + toString(deps_mv),
+                    ErrorCodes::ALTER_OF_COLUMN_IS_FORBIDDEN);
+            }
+        }
     }
 }
 
 void StorageMerge::alter(
-    const AlterCommands & params, const Context & context, TableLockHolder &)
+    const AlterCommands & params, ContextPtr local_context, TableLockHolder &)
 {
     auto table_id = getStorageID();
 
     StorageInMemoryMetadata storage_metadata = getInMemoryMetadata();
-    params.apply(storage_metadata, context);
-    DatabaseCatalog::instance().getDatabase(table_id.database_name)->alterTable(context, table_id, storage_metadata);
+    params.apply(storage_metadata, local_context);
+    DatabaseCatalog::instance().getDatabase(table_id.database_name)->alterTable(local_context, table_id, storage_metadata);
     setInMemoryMetadata(storage_metadata);
 }
 
 void StorageMerge::convertingSourceStream(
     const Block & header,
     const StorageMetadataPtr & metadata_snapshot,
-    const Context & context,
+    ContextPtr local_context,
     ASTPtr & query,
     Pipe & pipe,
     QueryProcessingStage::Enum processed_stage)
@@ -509,7 +549,7 @@ void StorageMerge::convertingSourceStream(
             pipe.getHeader().getColumnsWithTypeAndName(),
             header.getColumnsWithTypeAndName(),
             ActionsDAG::MatchColumnsMode::Name);
-    auto convert_actions = std::make_shared<ExpressionActions>(convert_actions_dag);
+    auto convert_actions = std::make_shared<ExpressionActions>(convert_actions_dag, ExpressionActionsSettings::fromContext(local_context));
 
     pipe.addSimpleTransform([&](const Block & stream_header)
     {
@@ -533,8 +573,8 @@ void StorageMerge::convertingSourceStream(
             NamesAndTypesList source_columns = metadata_snapshot->getSampleBlock().getNamesAndTypesList();
             auto virtual_column = *getVirtuals().tryGetByName("_table");
             source_columns.emplace_back(NameAndTypePair{virtual_column.name, virtual_column.type});
-            auto syntax_result = TreeRewriter(context).analyze(where_expression, source_columns);
-            ExpressionActionsPtr actions = ExpressionAnalyzer{where_expression, syntax_result, context}.getActions(false, false);
+            auto syntax_result = TreeRewriter(local_context).analyze(where_expression, source_columns);
+            ExpressionActionsPtr actions = ExpressionAnalyzer{where_expression, syntax_result, local_context}.getActions(false, false);
             Names required_columns = actions->getRequiredColumns();
 
             for (const auto & required_column : required_columns)
@@ -571,15 +611,15 @@ void registerStorageMerge(StorageFactory & factory)
                 " - name of source database and regexp for table names.",
                 ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
 
-        engine_args[0] = evaluateConstantExpressionForDatabaseName(engine_args[0], args.local_context);
-        engine_args[1] = evaluateConstantExpressionAsLiteral(engine_args[1], args.local_context);
+        engine_args[0] = evaluateConstantExpressionForDatabaseName(engine_args[0], args.getLocalContext());
+        engine_args[1] = evaluateConstantExpressionAsLiteral(engine_args[1], args.getLocalContext());
 
         String source_database = engine_args[0]->as<ASTLiteral &>().value.safeGet<String>();
         String table_name_regexp = engine_args[1]->as<ASTLiteral &>().value.safeGet<String>();
 
         return StorageMerge::create(
             args.table_id, args.columns,
-            source_database, table_name_regexp, args.context);
+            source_database, table_name_regexp, args.getContext());
     });
 }
 
diff --git a/src/Storages/StorageMerge.h b/src/Storages/StorageMerge.h
index 3ac251fbe52..ff016952686 100644
--- a/src/Storages/StorageMerge.h
+++ b/src/Storages/StorageMerge.h
@@ -12,7 +12,7 @@ namespace DB
 /** A table that represents the union of an arbitrary number of other tables.
   * All tables must have the same structure.
   */
-class StorageMerge final : public ext::shared_ptr_helper<StorageMerge>, public IStorage
+class StorageMerge final : public ext::shared_ptr_helper<StorageMerge>, public IStorage, WithContext
 {
     friend struct ext::shared_ptr_helper<StorageMerge>;
 public:
@@ -27,44 +27,41 @@ public:
     bool supportsIndexForIn() const override { return true; }
     bool supportsSubcolumns() const override { return true; }
 
-    QueryProcessingStage::Enum getQueryProcessingStage(const Context &, QueryProcessingStage::Enum /*to_stage*/, SelectQueryInfo &) const override;
+    QueryProcessingStage::Enum getQueryProcessingStage(ContextPtr, QueryProcessingStage::Enum /*to_stage*/, SelectQueryInfo &) const override;
 
     Pipe read(
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
 
-    void checkAlterIsPossible(const AlterCommands & commands, const Settings & /* settings */) const override;
+    void checkAlterIsPossible(const AlterCommands & commands, ContextPtr context) const override;
 
     /// you need to add and remove columns in the sub-tables manually
     /// the structure of sub-tables is not checked
-    void alter(const AlterCommands & params, const Context & context, TableLockHolder & table_lock_holder) override;
+    void alter(const AlterCommands & params, ContextPtr context, TableLockHolder & table_lock_holder) override;
 
     bool mayBenefitFromIndexForIn(
-        const ASTPtr & left_in_operand, const Context & query_context, const StorageMetadataPtr & metadata_snapshot) const override;
+        const ASTPtr & left_in_operand, ContextPtr query_context, const StorageMetadataPtr & metadata_snapshot) const override;
 
 private:
     String source_database;
     std::optional<std::unordered_set<String>> source_tables;
     std::optional<OptimizedRegularExpression> source_table_regexp;
-    const Context & global_context;
 
     using StorageWithLockAndName = std::tuple<StoragePtr, TableLockHolder, String>;
     using StorageListWithLocks = std::list<StorageWithLockAndName>;
 
-    StorageListWithLocks getSelectedTables(const String & query_id, const Settings & settings) const;
-
     StorageMerge::StorageListWithLocks getSelectedTables(
-            const ASTPtr & query, bool has_virtual_column, const String & query_id, const Settings & settings) const;
+            ContextPtr query_context, const ASTPtr & query = nullptr, bool filter_by_virtual_column = false) const;
 
     template <typename F>
     StoragePtr getFirstTable(F && predicate) const;
 
-    DatabaseTablesIteratorPtr getDatabaseIterator(const Context & context) const;
+    DatabaseTablesIteratorPtr getDatabaseIterator(ContextPtr context) const;
 
     NamesAndTypesList getVirtuals() const override;
     ColumnSizeByName getColumnSizes() const override;
@@ -75,31 +72,31 @@ protected:
         const ColumnsDescription & columns_,
         const String & source_database_,
         const Strings & source_tables_,
-        const Context & context_);
+        ContextPtr context_);
 
     StorageMerge(
         const StorageID & table_id_,
         const ColumnsDescription & columns_,
         const String & source_database_,
         const String & source_table_regexp_,
-        const Context & context_);
+        ContextPtr context_);
 
     Pipe createSources(
         const StorageMetadataPtr & metadata_snapshot,
         SelectQueryInfo & query_info,
         const QueryProcessingStage::Enum & processed_stage,
-        const UInt64 max_block_size,
+        UInt64 max_block_size,
         const Block & header,
         const StorageWithLockAndName & storage_with_lock,
         Names & real_column_names,
-        const std::shared_ptr<Context> & modified_context,
+        ContextPtr modified_context,
         size_t streams_num,
         bool has_table_virtual_column,
         bool concat_streams = false);
 
     void convertingSourceStream(
         const Block & header, const StorageMetadataPtr & metadata_snapshot,
-        const Context & context, ASTPtr & query,
+        ContextPtr context, ASTPtr & query,
         Pipe & pipe, QueryProcessingStage::Enum processed_stage);
 };
 
diff --git a/src/Storages/StorageMergeTree.cpp b/src/Storages/StorageMergeTree.cpp
index 202e909af0f..4d7f7d8c887 100644
--- a/src/Storages/StorageMergeTree.cpp
+++ b/src/Storages/StorageMergeTree.cpp
@@ -25,6 +25,8 @@
 #include <Storages/MergeTree/MergeList.h>
 #include <Storages/MergeTree/checkDataPart.h>
 #include <Processors/Pipe.h>
+#include <Processors/QueryPlan/BuildQueryPipelineSettings.h>
+#include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
 #include <optional>
 
 namespace CurrentMetrics
@@ -61,7 +63,7 @@ StorageMergeTree::StorageMergeTree(
     const String & relative_data_path_,
     const StorageInMemoryMetadata & metadata_,
     bool attach,
-    Context & context_,
+    ContextPtr context_,
     const String & date_column_name,
     const MergingParams & merging_params_,
     std::unique_ptr<MergeTreeSettings> storage_settings_,
@@ -78,9 +80,9 @@ StorageMergeTree::StorageMergeTree(
         attach)
     , reader(*this)
     , writer(*this)
-    , merger_mutator(*this, global_context.getSettingsRef().background_pool_size)
-    , background_executor(*this, global_context)
-    , background_moves_executor(*this, global_context)
+    , merger_mutator(*this, getContext()->getSettingsRef().background_pool_size)
+    , background_executor(*this, getContext())
+    , background_moves_executor(*this, getContext())
 
 {
     loadDataParts(has_force_restore_data_flag);
@@ -91,6 +93,8 @@ StorageMergeTree::StorageMergeTree(
     increment.set(getMaxBlockNumber());
 
     loadMutations();
+
+    loadDeduplicationLog();
 }
 
 
@@ -178,12 +182,12 @@ void StorageMergeTree::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & query_info,
-    const Context & context,
+    ContextPtr local_context,
     QueryProcessingStage::Enum /*processed_stage*/,
     size_t max_block_size,
     unsigned num_streams)
 {
-    if (auto plan = reader.read(column_names, metadata_snapshot, query_info, context, max_block_size, num_streams))
+    if (auto plan = reader.read(column_names, metadata_snapshot, query_info, local_context, max_block_size, num_streams))
         query_plan = std::move(*plan);
 }
 
@@ -191,14 +195,16 @@ Pipe StorageMergeTree::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & query_info,
-    const Context & context,
+    ContextPtr local_context,
     QueryProcessingStage::Enum processed_stage,
     const size_t max_block_size,
     const unsigned num_streams)
 {
     QueryPlan plan;
-    read(plan, column_names, metadata_snapshot, query_info, context, processed_stage, max_block_size, num_streams);
-    return plan.convertToPipe();
+    read(plan, column_names, metadata_snapshot, query_info, local_context, processed_stage, max_block_size, num_streams);
+    return plan.convertToPipe(
+        QueryPlanOptimizationSettings::fromContext(local_context),
+        BuildQueryPipelineSettings::fromContext(local_context));
 }
 
 std::optional<UInt64> StorageMergeTree::totalRows(const Settings &) const
@@ -206,20 +212,10 @@ std::optional<UInt64> StorageMergeTree::totalRows(const Settings &) const
     return getTotalActiveSizeInRows();
 }
 
-std::optional<UInt64> StorageMergeTree::totalRowsByPartitionPredicate(const SelectQueryInfo & query_info, const Context & context) const
+std::optional<UInt64> StorageMergeTree::totalRowsByPartitionPredicate(const SelectQueryInfo & query_info, ContextPtr local_context) const
 {
-    auto metadata_snapshot = getInMemoryMetadataPtr();
-    PartitionPruner partition_pruner(metadata_snapshot->getPartitionKey(), query_info, context, true /* strict */);
-    if (partition_pruner.isUseless())
-        return {};
-    size_t res = 0;
-    auto lock = lockParts();
-    for (const auto & part : getDataPartsStateRange(DataPartState::Committed))
-    {
-        if (!partition_pruner.canBePruned(part))
-            res += part->rows_count;
-    }
-    return res;
+    auto parts = getDataPartsVector({DataPartState::Committed});
+    return totalRowsByPartitionPredicateImpl(query_info, local_context, parts);
 }
 
 std::optional<UInt64> StorageMergeTree::totalBytes(const Settings &) const
@@ -227,18 +223,18 @@ std::optional<UInt64> StorageMergeTree::totalBytes(const Settings &) const
     return getTotalActiveSizeInBytes();
 }
 
-BlockOutputStreamPtr StorageMergeTree::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, const Context & context)
+BlockOutputStreamPtr
+StorageMergeTree::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, ContextPtr local_context)
 {
-
-    const auto & settings = context.getSettingsRef();
+    const auto & settings = local_context->getSettingsRef();
     return std::make_shared<MergeTreeBlockOutputStream>(
-        *this, metadata_snapshot, settings.max_partitions_per_insert_block, context.getSettingsRef().optimize_on_insert);
+        *this, metadata_snapshot, settings.max_partitions_per_insert_block, local_context->getSettingsRef().optimize_on_insert);
 }
 
 void StorageMergeTree::checkTableCanBeDropped() const
 {
     auto table_id = getStorageID();
-    global_context.checkTableCanBeDropped(table_id.database_name, table_id.table_name, getTotalActiveSizeInBytes());
+    getContext()->checkTableCanBeDropped(table_id.database_name, table_id.table_name, getTotalActiveSizeInBytes());
 }
 
 void StorageMergeTree::drop()
@@ -247,7 +243,7 @@ void StorageMergeTree::drop()
     dropAllData();
 }
 
-void StorageMergeTree::truncate(const ASTPtr &, const StorageMetadataPtr &, const Context &, TableExclusiveLockHolder &)
+void StorageMergeTree::truncate(const ASTPtr &, const StorageMetadataPtr &, ContextPtr, TableExclusiveLockHolder &)
 {
     {
         /// Asks to complete merges and does not allow them to start.
@@ -267,24 +263,25 @@ void StorageMergeTree::truncate(const ASTPtr &, const StorageMetadataPtr &, cons
 
 void StorageMergeTree::alter(
     const AlterCommands & commands,
-    const Context & context,
+    ContextPtr local_context,
     TableLockHolder & table_lock_holder)
 {
     auto table_id = getStorageID();
+    auto old_storage_settings = getSettings();
 
     StorageInMemoryMetadata new_metadata = getInMemoryMetadata();
     StorageInMemoryMetadata old_metadata = getInMemoryMetadata();
-    auto maybe_mutation_commands = commands.getMutationCommands(new_metadata, context.getSettingsRef().materialize_ttl_after_modify, context);
+    auto maybe_mutation_commands = commands.getMutationCommands(new_metadata, local_context->getSettingsRef().materialize_ttl_after_modify, local_context);
     String mutation_file_name;
     Int64 mutation_version = -1;
-    commands.apply(new_metadata, context);
+    commands.apply(new_metadata, local_context);
 
     /// This alter can be performed at new_metadata level only
     if (commands.isSettingsAlter())
     {
         changeSettings(new_metadata.settings_changes, table_lock_holder);
 
-        DatabaseCatalog::instance().getDatabase(table_id.database_name)->alterTable(context, table_id, new_metadata);
+        DatabaseCatalog::instance().getDatabase(table_id.database_name)->alterTable(local_context, table_id, new_metadata);
     }
     else
     {
@@ -294,7 +291,7 @@ void StorageMergeTree::alter(
             /// Reinitialize primary key because primary key column types might have changed.
             setProperties(new_metadata, old_metadata);
 
-            DatabaseCatalog::instance().getDatabase(table_id.database_name)->alterTable(context, table_id, new_metadata);
+            DatabaseCatalog::instance().getDatabase(table_id.database_name)->alterTable(local_context, table_id, new_metadata);
 
             if (!maybe_mutation_commands.empty())
                 mutation_version = startMutation(maybe_mutation_commands, mutation_file_name);
@@ -305,6 +302,21 @@ void StorageMergeTree::alter(
         if (!maybe_mutation_commands.empty())
             waitForMutation(mutation_version, mutation_file_name);
     }
+
+    {
+        /// Some additional changes in settings
+        auto new_storage_settings = getSettings();
+
+        if (old_storage_settings->non_replicated_deduplication_window != new_storage_settings->non_replicated_deduplication_window)
+        {
+            /// We cannot place this check into settings sanityCheck because it depends on format_version.
+            /// sanityCheck must work event without storage.
+            if (new_storage_settings->non_replicated_deduplication_window != 0 && format_version < MERGE_TREE_DATA_MIN_FORMAT_VERSION_WITH_CUSTOM_PARTITIONING)
+                throw Exception("Deduplication for non-replicated MergeTree in old syntax is not supported", ErrorCodes::BAD_ARGUMENTS);
+
+            deduplication_log->setDeduplicationWindowSize(new_storage_settings->non_replicated_deduplication_window);
+        }
+    }
 }
 
 
@@ -332,12 +344,25 @@ StorageMergeTree::CurrentlyMergingPartsTagger::CurrentlyMergingPartsTagger(
             max_volume_index = std::max(max_volume_index, storage.getStoragePolicy()->getVolumeIndexByDisk(part_ptr->volume->getDisk()));
         }
 
-        reserved_space = storage.tryReserveSpacePreferringTTLRules(metadata_snapshot, total_size, ttl_infos, time(nullptr), max_volume_index);
+        reserved_space = storage.balancedReservation(
+            metadata_snapshot,
+            total_size,
+            max_volume_index,
+            future_part.name,
+            future_part.part_info,
+            future_part.parts,
+            &tagger,
+            &ttl_infos);
+
+        if (!reserved_space)
+            reserved_space
+                = storage.tryReserveSpacePreferringTTLRules(metadata_snapshot, total_size, ttl_infos, time(nullptr), max_volume_index);
     }
+
     if (!reserved_space)
     {
         if (is_mutation)
-            throw Exception("Not enough space for mutating part '" + future_part_.parts[0]->name + "'", ErrorCodes::NOT_ENOUGH_SPACE);
+            throw Exception("Not enough space for mutating part '" + future_part.parts[0]->name + "'", ErrorCodes::NOT_ENOUGH_SPACE);
         else
             throw Exception("Not enough space for merging parts", ErrorCodes::NOT_ENOUGH_SPACE);
     }
@@ -454,12 +479,12 @@ void StorageMergeTree::waitForMutation(Int64 version, const String & file_name)
     LOG_INFO(log, "Mutation {} done", file_name);
 }
 
-void StorageMergeTree::mutate(const MutationCommands & commands, const Context & query_context)
+void StorageMergeTree::mutate(const MutationCommands & commands, ContextPtr query_context)
 {
     String mutation_file_name;
     Int64 version = startMutation(commands, mutation_file_name);
 
-    if (query_context.getSettingsRef().mutations_sync > 0)
+    if (query_context->getSettingsRef().mutations_sync > 0)
         waitForMutation(version, mutation_file_name);
 }
 
@@ -593,7 +618,7 @@ CancellationCode StorageMergeTree::killMutation(const String & mutation_id)
     if (!to_kill)
         return CancellationCode::NotFound;
 
-    global_context.getMergeList().cancelPartMutations({}, to_kill->block_number);
+    getContext()->getMergeList().cancelPartMutations({}, to_kill->block_number);
     to_kill->removeFile();
     LOG_TRACE(log, "Cancelled part mutations and removed mutation file {}", mutation_id);
     {
@@ -607,6 +632,16 @@ CancellationCode StorageMergeTree::killMutation(const String & mutation_id)
     return CancellationCode::CancelSent;
 }
 
+void StorageMergeTree::loadDeduplicationLog()
+{
+    auto settings = getSettings();
+    if (settings->non_replicated_deduplication_window != 0 && format_version < MERGE_TREE_DATA_MIN_FORMAT_VERSION_WITH_CUSTOM_PARTITIONING)
+        throw Exception("Deduplication for non-replicated MergeTree in old syntax is not supported", ErrorCodes::BAD_ARGUMENTS);
+
+    std::string path = getDataPaths()[0] + "/deduplication_logs";
+    deduplication_log = std::make_unique<MergeTreeDeduplicationLog>(path, settings->non_replicated_deduplication_window, format_version);
+    deduplication_log->load();
+}
 
 void StorageMergeTree::loadMutations()
 {
@@ -733,7 +768,7 @@ std::shared_ptr<StorageMergeTree::MergeMutateSelectedEntry> StorageMergeTree::se
 
     /// Account TTL merge here to avoid exceeding the max_number_of_merges_with_ttl_in_pool limit
     if (isTTLMergeType(future_part.merge_type))
-        global_context.getMergeList().bookMergeWithTTL();
+        getContext()->getMergeList().bookMergeWithTTL();
 
     merging_tagger = std::make_unique<CurrentlyMergingPartsTagger>(future_part, MergeTreeDataMergerMutator::estimateNeededDiskSpace(future_part.parts), *this, metadata_snapshot, false);
     return std::make_shared<MergeMutateSelectedEntry>(future_part, std::move(merging_tagger), MutationCommands{});
@@ -777,7 +812,7 @@ bool StorageMergeTree::mergeSelectedParts(
     MutableDataPartPtr new_part;
     auto table_id = getStorageID();
 
-    auto merge_list_entry = global_context.getMergeList().insert(table_id.database_name, table_id.table_name, future_part);
+    auto merge_list_entry = getContext()->getMergeList().insert(table_id.database_name, table_id.table_name, future_part);
 
     auto write_part_log = [&] (const ExecutionStatus & execution_status)
     {
@@ -795,7 +830,7 @@ bool StorageMergeTree::mergeSelectedParts(
     {
         new_part = merger_mutator.mergePartsToTemporaryPart(
             future_part, metadata_snapshot, *(merge_list_entry), table_lock_holder, time(nullptr),
-            global_context, merge_mutate_entry.tagger->reserved_space, deduplicate, deduplicate_by_columns);
+            getContext(), merge_mutate_entry.tagger->reserved_space, deduplicate, deduplicate_by_columns);
 
         merger_mutator.renameMergedTemporaryPart(new_part, future_part.parts, nullptr);
         write_part_log({});
@@ -819,7 +854,7 @@ std::shared_ptr<StorageMergeTree::MergeMutateSelectedEntry> StorageMergeTree::se
     const StorageMetadataPtr & metadata_snapshot, String * /* disable_reason */, TableLockHolder & /* table_lock_holder */)
 {
     std::lock_guard lock(currently_processing_in_background_mutex);
-    size_t max_ast_elements = global_context.getSettingsRef().max_expanded_ast_elements;
+    size_t max_ast_elements = getContext()->getSettingsRef().max_expanded_ast_elements;
 
     FutureMergedMutatedPart future_part;
     if (storage_settings.get()->assign_part_uuids)
@@ -874,7 +909,7 @@ std::shared_ptr<StorageMergeTree::MergeMutateSelectedEntry> StorageMergeTree::se
             if (!commands_for_size_validation.empty())
             {
                 MutationsInterpreter interpreter(
-                    shared_from_this(), metadata_snapshot, commands_for_size_validation, global_context, false);
+                    shared_from_this(), metadata_snapshot, commands_for_size_validation, getContext(), false);
                 commands_size += interpreter.evaluateCommandsSize();
             }
 
@@ -904,7 +939,7 @@ bool StorageMergeTree::mutateSelectedPart(const StorageMetadataPtr & metadata_sn
     auto & future_part = merge_mutate_entry.future_part;
     auto table_id = getStorageID();
 
-    auto merge_list_entry = global_context.getMergeList().insert(table_id.database_name, table_id.table_name, future_part);
+    auto merge_list_entry = getContext()->getMergeList().insert(table_id.database_name, table_id.table_name, future_part);
     Stopwatch stopwatch;
     MutableDataPartPtr new_part;
 
@@ -924,7 +959,7 @@ bool StorageMergeTree::mutateSelectedPart(const StorageMetadataPtr & metadata_sn
     {
         new_part = merger_mutator.mutatePartToTemporaryPart(
             future_part, metadata_snapshot, merge_mutate_entry.commands, *(merge_list_entry),
-            time(nullptr), global_context, merge_mutate_entry.tagger->reserved_space, table_lock_holder);
+            time(nullptr), getContext(), merge_mutate_entry.tagger->reserved_space, table_lock_holder);
 
         renameTempPartAndReplace(new_part);
 
@@ -1049,7 +1084,7 @@ bool StorageMergeTree::optimize(
     bool final,
     bool deduplicate,
     const Names & deduplicate_by_columns,
-    const Context & context)
+    ContextPtr local_context)
 {
     if (deduplicate)
     {
@@ -1070,14 +1105,21 @@ bool StorageMergeTree::optimize(
 
         for (const String & partition_id : partition_ids)
         {
-            if (!merge(true, partition_id, true, deduplicate, deduplicate_by_columns, &disable_reason, context.getSettingsRef().optimize_skip_merged_partitions))
+            if (!merge(
+                    true,
+                    partition_id,
+                    true,
+                    deduplicate,
+                    deduplicate_by_columns,
+                    &disable_reason,
+                    local_context->getSettingsRef().optimize_skip_merged_partitions))
             {
                 constexpr const char * message = "Cannot OPTIMIZE table: {}";
                 if (disable_reason.empty())
                     disable_reason = "unknown reason";
                 LOG_INFO(log, message, disable_reason);
 
-                if (context.getSettingsRef().optimize_throw_if_noop)
+                if (local_context->getSettingsRef().optimize_throw_if_noop)
                     throw Exception(ErrorCodes::CANNOT_ASSIGN_OPTIMIZE, message, disable_reason);
                 return false;
             }
@@ -1087,16 +1129,23 @@ bool StorageMergeTree::optimize(
     {
         String partition_id;
         if (partition)
-            partition_id = getPartitionIDFromQuery(partition, context);
+            partition_id = getPartitionIDFromQuery(partition, local_context);
 
-        if (!merge(true, partition_id, final, deduplicate, deduplicate_by_columns, &disable_reason, context.getSettingsRef().optimize_skip_merged_partitions))
+        if (!merge(
+                true,
+                partition_id,
+                final,
+                deduplicate,
+                deduplicate_by_columns,
+                &disable_reason,
+                local_context->getSettingsRef().optimize_skip_merged_partitions))
         {
             constexpr const char * message = "Cannot OPTIMIZE table: {}";
             if (disable_reason.empty())
                 disable_reason = "unknown reason";
             LOG_INFO(log, message, disable_reason);
 
-            if (context.getSettingsRef().optimize_throw_if_noop)
+            if (local_context->getSettingsRef().optimize_throw_if_noop)
                 throw Exception(ErrorCodes::CANNOT_ASSIGN_OPTIMIZE, message, disable_reason);
             return false;
         }
@@ -1164,7 +1213,7 @@ MergeTreeDataPartPtr StorageMergeTree::outdatePart(const String & part_name, boo
     }
 }
 
-void StorageMergeTree::dropPartition(const ASTPtr & partition, bool detach, bool drop_part, const Context & context, bool throw_if_noop)
+void StorageMergeTree::dropPartition(const ASTPtr & partition, bool detach, bool drop_part, ContextPtr local_context, bool throw_if_noop)
 {
     {
         MergeTreeData::DataPartsVector parts_to_remove;
@@ -1184,7 +1233,7 @@ void StorageMergeTree::dropPartition(const ASTPtr & partition, bool detach, bool
             /// Asks to complete merges and does not allow them to start.
             /// This protects against "revival" of data for a removed partition after completion of merge.
             auto merge_blocker = stopMergesAndWait();
-            String partition_id = getPartitionIDFromQuery(partition, context);
+            String partition_id = getPartitionIDFromQuery(partition, local_context);
             parts_to_remove = getDataPartsVectorInPartition(MergeTreeDataPartState::Committed, partition_id);
 
             /// TODO should we throw an exception if parts_to_remove is empty?
@@ -1202,6 +1251,12 @@ void StorageMergeTree::dropPartition(const ASTPtr & partition, bool detach, bool
             }
         }
 
+        if (deduplication_log)
+        {
+            for (const auto & part : parts_to_remove)
+                deduplication_log->dropPart(part->info);
+        }
+
         if (detach)
             LOG_INFO(log, "Detached {} parts.", parts_to_remove.size());
         else
@@ -1214,11 +1269,11 @@ void StorageMergeTree::dropPartition(const ASTPtr & partition, bool detach, bool
 
 PartitionCommandsResultInfo StorageMergeTree::attachPartition(
     const ASTPtr & partition, const StorageMetadataPtr & /* metadata_snapshot */,
-    bool attach_part, const Context & context)
+    bool attach_part, ContextPtr local_context)
 {
     PartitionCommandsResultInfo results;
     PartsTemporaryRename renamed_parts(*this, "detached/");
-    MutableDataPartsVector loaded_parts = tryLoadPartsToAttach(partition, attach_part, context, renamed_parts);
+    MutableDataPartsVector loaded_parts = tryLoadPartsToAttach(partition, attach_part, local_context, renamed_parts);
 
     for (size_t i = 0; i < loaded_parts.size(); ++i)
     {
@@ -1237,20 +1292,20 @@ PartitionCommandsResultInfo StorageMergeTree::attachPartition(
     }
 
     /// New parts with other data may appear in place of deleted parts.
-    context.dropCaches();
+    local_context->dropCaches();
     return results;
 }
 
-void StorageMergeTree::replacePartitionFrom(const StoragePtr & source_table, const ASTPtr & partition, bool replace, const Context & context)
+void StorageMergeTree::replacePartitionFrom(const StoragePtr & source_table, const ASTPtr & partition, bool replace, ContextPtr local_context)
 {
-    auto lock1 = lockForShare(context.getCurrentQueryId(), context.getSettingsRef().lock_acquire_timeout);
-    auto lock2 = source_table->lockForShare(context.getCurrentQueryId(), context.getSettingsRef().lock_acquire_timeout);
+    auto lock1 = lockForShare(local_context->getCurrentQueryId(), local_context->getSettingsRef().lock_acquire_timeout);
+    auto lock2 = source_table->lockForShare(local_context->getCurrentQueryId(), local_context->getSettingsRef().lock_acquire_timeout);
     auto source_metadata_snapshot = source_table->getInMemoryMetadataPtr();
     auto my_metadata_snapshot = getInMemoryMetadataPtr();
 
     Stopwatch watch;
     MergeTreeData & src_data = checkStructureAndGetMergeTreeData(source_table, source_metadata_snapshot, my_metadata_snapshot);
-    String partition_id = getPartitionIDFromQuery(partition, context);
+    String partition_id = getPartitionIDFromQuery(partition, local_context);
 
     DataPartsVector src_parts = src_data.getDataPartsVectorInPartition(MergeTreeDataPartState::Committed, partition_id);
     MutableDataPartsVector dst_parts;
@@ -1305,19 +1360,19 @@ void StorageMergeTree::replacePartitionFrom(const StoragePtr & source_table, con
                 removePartsInRangeFromWorkingSet(drop_range, true, false, data_parts_lock);
         }
 
-        PartLog::addNewParts(global_context, dst_parts, watch.elapsed());
+        PartLog::addNewParts(getContext(), dst_parts, watch.elapsed());
     }
     catch (...)
     {
-        PartLog::addNewParts(global_context, dst_parts, watch.elapsed(), ExecutionStatus::fromCurrentException());
+        PartLog::addNewParts(getContext(), dst_parts, watch.elapsed(), ExecutionStatus::fromCurrentException());
         throw;
     }
 }
 
-void StorageMergeTree::movePartitionToTable(const StoragePtr & dest_table, const ASTPtr & partition, const Context & context)
+void StorageMergeTree::movePartitionToTable(const StoragePtr & dest_table, const ASTPtr & partition, ContextPtr local_context)
 {
-    auto lock1 = lockForShare(context.getCurrentQueryId(), context.getSettingsRef().lock_acquire_timeout);
-    auto lock2 = dest_table->lockForShare(context.getCurrentQueryId(), context.getSettingsRef().lock_acquire_timeout);
+    auto lock1 = lockForShare(local_context->getCurrentQueryId(), local_context->getSettingsRef().lock_acquire_timeout);
+    auto lock2 = dest_table->lockForShare(local_context->getCurrentQueryId(), local_context->getSettingsRef().lock_acquire_timeout);
 
     auto dest_table_storage = std::dynamic_pointer_cast<StorageMergeTree>(dest_table);
     if (!dest_table_storage)
@@ -1334,7 +1389,7 @@ void StorageMergeTree::movePartitionToTable(const StoragePtr & dest_table, const
     Stopwatch watch;
 
     MergeTreeData & src_data = dest_table_storage->checkStructureAndGetMergeTreeData(*this, metadata_snapshot, dest_metadata_snapshot);
-    String partition_id = getPartitionIDFromQuery(partition, context);
+    String partition_id = getPartitionIDFromQuery(partition, local_context);
 
     DataPartsVector src_parts = src_data.getDataPartsVectorInPartition(MergeTreeDataPartState::Committed, partition_id);
     MutableDataPartsVector dst_parts;
@@ -1372,7 +1427,7 @@ void StorageMergeTree::movePartitionToTable(const StoragePtr & dest_table, const
             DataPartsLock lock(mutex);
 
             for (MutableDataPartPtr & part : dst_parts)
-                dest_table_storage->renameTempPartAndReplace(part, &increment, &transaction, lock);
+                dest_table_storage->renameTempPartAndReplace(part, &dest_table_storage->increment, &transaction, lock);
 
             removePartsFromWorkingSet(src_parts, true, lock);
             transaction.commit(&lock);
@@ -1381,11 +1436,11 @@ void StorageMergeTree::movePartitionToTable(const StoragePtr & dest_table, const
         clearOldMutations(true);
         clearOldPartsFromFilesystem();
 
-        PartLog::addNewParts(global_context, dst_parts, watch.elapsed());
+        PartLog::addNewParts(getContext(), dst_parts, watch.elapsed());
     }
     catch (...)
     {
-        PartLog::addNewParts(global_context, dst_parts, watch.elapsed(), ExecutionStatus::fromCurrentException());
+        PartLog::addNewParts(getContext(), dst_parts, watch.elapsed(), ExecutionStatus::fromCurrentException());
         throw;
     }
 }
@@ -1410,13 +1465,13 @@ void StorageMergeTree::onActionLockRemove(StorageActionBlockType action_type)
         background_moves_executor.triggerTask();
 }
 
-CheckResults StorageMergeTree::checkData(const ASTPtr & query, const Context & context)
+CheckResults StorageMergeTree::checkData(const ASTPtr & query, ContextPtr local_context)
 {
     CheckResults results;
     DataPartsVector data_parts;
     if (const auto & check_query = query->as<ASTCheckQuery &>(); check_query.partition)
     {
-        String partition_id = getPartitionIDFromQuery(check_query.partition, context);
+        String partition_id = getPartitionIDFromQuery(check_query.partition, local_context);
         data_parts = getDataPartsVectorInPartition(MergeTreeDataPartState::Committed, partition_id);
     }
     else
diff --git a/src/Storages/StorageMergeTree.h b/src/Storages/StorageMergeTree.h
index 9dd62439814..2a50cb33912 100644
--- a/src/Storages/StorageMergeTree.h
+++ b/src/Storages/StorageMergeTree.h
@@ -12,6 +12,8 @@
 #include <Storages/MergeTree/MergeTreePartsMover.h>
 #include <Storages/MergeTree/MergeTreeMutationEntry.h>
 #include <Storages/MergeTree/MergeTreeMutationStatus.h>
+#include <Storages/MergeTree/MergeTreeDeduplicationLog.h>
+
 #include <Disks/StoragePolicy.h>
 #include <Common/SimpleIncrement.h>
 #include <Storages/MergeTree/BackgroundJobsExecutor.h>
@@ -40,7 +42,7 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
@@ -50,16 +52,16 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
 
     std::optional<UInt64> totalRows(const Settings &) const override;
-    std::optional<UInt64> totalRowsByPartitionPredicate(const SelectQueryInfo &, const Context &) const override;
+    std::optional<UInt64> totalRowsByPartitionPredicate(const SelectQueryInfo &, ContextPtr) const override;
     std::optional<UInt64> totalBytes(const Settings &) const override;
 
-    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, const Context & context) override;
+    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, ContextPtr context) override;
 
     /** Perform the next step in combining the parts.
       */
@@ -70,9 +72,9 @@ public:
         bool final,
         bool deduplicate,
         const Names & deduplicate_by_columns,
-        const Context & context) override;
+        ContextPtr context) override;
 
-    void mutate(const MutationCommands & commands, const Context & context) override;
+    void mutate(const MutationCommands & commands, ContextPtr context) override;
 
     /// Return introspection information about currently processing or recently processed mutations.
     std::vector<MergeTreeMutationStatus> getMutationsStatus() const override;
@@ -80,9 +82,9 @@ public:
     CancellationCode killMutation(const String & mutation_id) override;
 
     void drop() override;
-    void truncate(const ASTPtr &, const StorageMetadataPtr &, const Context &, TableExclusiveLockHolder &) override;
+    void truncate(const ASTPtr &, const StorageMetadataPtr &, ContextPtr, TableExclusiveLockHolder &) override;
 
-    void alter(const AlterCommands & commands, const Context & context, TableLockHolder & table_lock_holder) override;
+    void alter(const AlterCommands & commands, ContextPtr context, TableLockHolder & table_lock_holder) override;
 
     void checkTableCanBeDropped() const override;
 
@@ -90,9 +92,11 @@ public:
 
     void onActionLockRemove(StorageActionBlockType action_type) override;
 
-    CheckResults checkData(const ASTPtr & query, const Context & context) override;
+    CheckResults checkData(const ASTPtr & query, ContextPtr context) override;
 
     std::optional<JobAndPool> getDataProcessingJob() override;
+
+    MergeTreeDeduplicationLog * getDeduplicationLog() { return deduplication_log.get(); }
 private:
 
     /// Mutex and condvar for synchronous mutations wait
@@ -105,6 +109,8 @@ private:
     BackgroundJobsExecutor background_executor;
     BackgroundMovesExecutor background_moves_executor;
 
+    std::unique_ptr<MergeTreeDeduplicationLog> deduplication_log;
+
     /// For block numbers.
     SimpleIncrement increment;
 
@@ -128,6 +134,10 @@ private:
 
     void loadMutations();
 
+    /// Load and initialize deduplication logs. Even if deduplication setting
+    /// equals zero creates object with deduplication window equals zero.
+    void loadDeduplicationLog();
+
     /** Determines what parts should be merged and merges it.
       * If aggressive - when selects parts don't takes into account their ratio size and novelty (used for OPTIMIZE query).
       * Returns true if merge is finished successfully.
@@ -150,8 +160,9 @@ private:
     {
         FutureMergedMutatedPart future_part;
         ReservationPtr reserved_space;
-
         StorageMergeTree & storage;
+        // Optional tagger to maintain volatile parts for the JBOD balancer
+        std::optional<CurrentlySubmergingEmergingTagger> tagger;
 
         CurrentlyMergingPartsTagger(
             FutureMergedMutatedPart & future_part_,
@@ -200,11 +211,11 @@ private:
     void clearOldMutations(bool truncate = false);
 
     // Partition helpers
-    void dropPartition(const ASTPtr & partition, bool detach, bool drop_part, const Context & context, bool throw_if_noop) override;
-    PartitionCommandsResultInfo attachPartition(const ASTPtr & partition, const StorageMetadataPtr & metadata_snapshot, bool part, const Context & context) override;
+    void dropPartition(const ASTPtr & partition, bool detach, bool drop_part, ContextPtr context, bool throw_if_noop) override;
+    PartitionCommandsResultInfo attachPartition(const ASTPtr & partition, const StorageMetadataPtr & metadata_snapshot, bool part, ContextPtr context) override;
 
-    void replacePartitionFrom(const StoragePtr & source_table, const ASTPtr & partition, bool replace, const Context & context) override;
-    void movePartitionToTable(const StoragePtr & dest_table, const ASTPtr & partition, const Context & context) override;
+    void replacePartitionFrom(const StoragePtr & source_table, const ASTPtr & partition, bool replace, ContextPtr context) override;
+    void movePartitionToTable(const StoragePtr & dest_table, const ASTPtr & partition, ContextPtr context) override;
     bool partIsAssignedToBackgroundOperation(const DataPartPtr & part) const override;
     /// Update mutation entries after part mutation execution. May reset old
     /// errors if mutation was successful. Otherwise update last_failed* fields
@@ -238,7 +249,7 @@ protected:
         const String & relative_data_path_,
         const StorageInMemoryMetadata & metadata,
         bool attach,
-        Context & context_,
+        ContextPtr context_,
         const String & date_column_name,
         const MergingParams & merging_params_,
         std::unique_ptr<MergeTreeSettings> settings_,
diff --git a/src/Storages/StorageMongoDB.cpp b/src/Storages/StorageMongoDB.cpp
index 09fd413af75..2b0200f3643 100644
--- a/src/Storages/StorageMongoDB.cpp
+++ b/src/Storages/StorageMongoDB.cpp
@@ -74,7 +74,7 @@ Pipe StorageMongoDB::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & /*query_info*/,
-    const Context & /*context*/,
+    ContextPtr /*context*/,
     QueryProcessingStage::Enum /*processed_stage*/,
     size_t max_block_size,
     unsigned)
@@ -106,7 +106,7 @@ void registerStorageMongoDB(StorageFactory & factory)
                 ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
 
         for (auto & engine_arg : engine_args)
-            engine_arg = evaluateConstantExpressionOrIdentifierAsLiteral(engine_arg, args.local_context);
+            engine_arg = evaluateConstantExpressionOrIdentifierAsLiteral(engine_arg, args.getLocalContext());
 
         /// 27017 is the default MongoDB port.
         auto parsed_host_port = parseAddress(engine_args[0]->as<ASTLiteral &>().value.safeGet<String>(), 27017);
diff --git a/src/Storages/StorageMongoDB.h b/src/Storages/StorageMongoDB.h
index 589ab276539..5e96d1543a2 100644
--- a/src/Storages/StorageMongoDB.h
+++ b/src/Storages/StorageMongoDB.h
@@ -35,7 +35,7 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & metadata_snapshot,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
diff --git a/src/Storages/StorageMySQL.cpp b/src/Storages/StorageMySQL.cpp
index caac7c5d95e..35eb85e41d2 100644
--- a/src/Storages/StorageMySQL.cpp
+++ b/src/Storages/StorageMySQL.cpp
@@ -18,6 +18,7 @@
 #include <mysqlxx/Transaction.h>
 #include <Processors/Sources/SourceFromInputStream.h>
 #include <Processors/Pipe.h>
+#include <Common/parseRemoteDescription.h>
 
 
 namespace DB
@@ -41,21 +42,21 @@ static String backQuoteMySQL(const String & x)
 
 StorageMySQL::StorageMySQL(
     const StorageID & table_id_,
-    mysqlxx::Pool && pool_,
+    mysqlxx::PoolWithFailover && pool_,
     const std::string & remote_database_name_,
     const std::string & remote_table_name_,
     const bool replace_query_,
     const std::string & on_duplicate_clause_,
     const ColumnsDescription & columns_,
     const ConstraintsDescription & constraints_,
-    const Context & context_)
+    ContextPtr context_)
     : IStorage(table_id_)
+    , WithContext(context_->getGlobalContext())
     , remote_database_name(remote_database_name_)
     , remote_table_name(remote_table_name_)
     , replace_query{replace_query_}
     , on_duplicate_clause{on_duplicate_clause_}
-    , pool(std::move(pool_))
-    , global_context(context_.getGlobalContext())
+    , pool(std::make_shared<mysqlxx::PoolWithFailover>(pool_))
 {
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(columns_);
@@ -68,9 +69,9 @@ Pipe StorageMySQL::read(
     const Names & column_names_,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & query_info_,
-    const Context & context_,
+    ContextPtr context_,
     QueryProcessingStage::Enum /*processed_stage*/,
-    size_t max_block_size_,
+    size_t /*max_block_size*/,
     unsigned)
 {
     metadata_snapshot->check(column_names_, getVirtuals(), getStorageID());
@@ -94,9 +95,10 @@ Pipe StorageMySQL::read(
         sample_block.insert({ column_data.type, column_data.name });
     }
 
-    /// TODO: rewrite MySQLBlockInputStream
+
+    StreamSettings mysql_input_stream_settings(context_->getSettingsRef(), true, false);
     return Pipe(std::make_shared<SourceFromInputStream>(
-            std::make_shared<MySQLLazyBlockInputStream>(pool, query, sample_block, max_block_size_, /* auto_close = */ true)));
+            std::make_shared<MySQLWithFailoverBlockInputStream>(pool, query, sample_block, mysql_input_stream_settings)));
 }
 
 
@@ -144,10 +146,12 @@ public:
     {
         WriteBufferFromOwnString sqlbuf;
         sqlbuf << (storage.replace_query ? "REPLACE" : "INSERT") << " INTO ";
-        sqlbuf << backQuoteMySQL(remote_database_name) << "." << backQuoteMySQL(remote_table_name);
+        if (!remote_database_name.empty())
+            sqlbuf << backQuoteMySQL(remote_database_name) << ".";
+        sqlbuf << backQuoteMySQL(remote_table_name);
         sqlbuf << " (" << dumpNamesWithBackQuote(block) << ") VALUES ";
 
-        auto writer = FormatFactory::instance().getOutputStream("Values", sqlbuf, metadata_snapshot->getSampleBlock(), storage.global_context);
+        auto writer = FormatFactory::instance().getOutputStream("Values", sqlbuf, metadata_snapshot->getSampleBlock(), storage.getContext());
         writer->write(block);
 
         if (!storage.on_duplicate_clause.empty())
@@ -211,9 +215,15 @@ private:
 };
 
 
-BlockOutputStreamPtr StorageMySQL::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, const Context & context)
+BlockOutputStreamPtr StorageMySQL::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, ContextPtr local_context)
 {
-    return std::make_shared<StorageMySQLBlockOutputStream>(*this, metadata_snapshot, remote_database_name, remote_table_name, pool.get(), context.getSettingsRef().mysql_max_rows_to_insert);
+    return std::make_shared<StorageMySQLBlockOutputStream>(
+        *this,
+        metadata_snapshot,
+        remote_database_name,
+        remote_table_name,
+        pool->get(),
+        local_context->getSettingsRef().mysql_max_rows_to_insert);
 }
 
 void registerStorageMySQL(StorageFactory & factory)
@@ -224,21 +234,22 @@ void registerStorageMySQL(StorageFactory & factory)
 
         if (engine_args.size() < 5 || engine_args.size() > 7)
             throw Exception(
-                "Storage MySQL requires 5-7 parameters: MySQL('host:port', database, table, 'user', 'password'[, replace_query, 'on_duplicate_clause']).",
+                "Storage MySQL requires 5-7 parameters: MySQL('host:port' (or 'addresses_pattern'), database, table, 'user', 'password'[, replace_query, 'on_duplicate_clause']).",
                 ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
 
         for (auto & engine_arg : engine_args)
-            engine_arg = evaluateConstantExpressionOrIdentifierAsLiteral(engine_arg, args.local_context);
+            engine_arg = evaluateConstantExpressionOrIdentifierAsLiteral(engine_arg, args.getLocalContext());
 
         /// 3306 is the default MySQL port.
-        auto parsed_host_port = parseAddress(engine_args[0]->as<ASTLiteral &>().value.safeGet<String>(), 3306);
-
+        const String & host_port = engine_args[0]->as<ASTLiteral &>().value.safeGet<String>();
         const String & remote_database = engine_args[1]->as<ASTLiteral &>().value.safeGet<String>();
         const String & remote_table = engine_args[2]->as<ASTLiteral &>().value.safeGet<String>();
         const String & username = engine_args[3]->as<ASTLiteral &>().value.safeGet<String>();
         const String & password = engine_args[4]->as<ASTLiteral &>().value.safeGet<String>();
+        size_t max_addresses = args.getContext()->getSettingsRef().glob_expansion_max_elements;
 
-        mysqlxx::Pool pool(remote_database, parsed_host_port.first, username, password, parsed_host_port.second);
+        auto addresses = parseRemoteDescriptionForExternalDatabase(host_port, max_addresses, 3306);
+        mysqlxx::PoolWithFailover pool(remote_database, addresses, username, password);
 
         bool replace_query = false;
         std::string on_duplicate_clause;
@@ -261,7 +272,7 @@ void registerStorageMySQL(StorageFactory & factory)
             on_duplicate_clause,
             args.columns,
             args.constraints,
-            args.context);
+            args.getContext());
     },
     {
         .source_access_type = AccessType::MYSQL,
diff --git a/src/Storages/StorageMySQL.h b/src/Storages/StorageMySQL.h
index 645f3600eee..a68c06c1abe 100644
--- a/src/Storages/StorageMySQL.h
+++ b/src/Storages/StorageMySQL.h
@@ -1,15 +1,15 @@
 #pragma once
 
 #if !defined(ARCADIA_BUILD)
-#    include "config_core.h"
+#include "config_core.h"
 #endif
 
 #if USE_MYSQL
 
-#    include <ext/shared_ptr_helper.h>
+#include <ext/shared_ptr_helper.h>
 
-#    include <Storages/IStorage.h>
-#    include <mysqlxx/Pool.h>
+#include <Storages/IStorage.h>
+#include <mysqlxx/PoolWithFailover.h>
 
 
 namespace DB
@@ -19,20 +19,20 @@ namespace DB
   * Use ENGINE = mysql(host_port, database_name, table_name, user_name, password)
   * Read only.
   */
-class StorageMySQL final : public ext::shared_ptr_helper<StorageMySQL>, public IStorage
+class StorageMySQL final : public ext::shared_ptr_helper<StorageMySQL>, public IStorage, WithContext
 {
     friend struct ext::shared_ptr_helper<StorageMySQL>;
 public:
     StorageMySQL(
         const StorageID & table_id_,
-        mysqlxx::Pool && pool_,
+        mysqlxx::PoolWithFailover && pool_,
         const std::string & remote_database_name_,
         const std::string & remote_table_name_,
-        const bool replace_query_,
+        bool replace_query_,
         const std::string & on_duplicate_clause_,
         const ColumnsDescription & columns_,
         const ConstraintsDescription & constraints_,
-        const Context & context_);
+        ContextPtr context_);
 
     std::string getName() const override { return "MySQL"; }
 
@@ -40,12 +40,12 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
 
-    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, const Context & context) override;
+    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, ContextPtr context) override;
 
 private:
     friend class StorageMySQLBlockOutputStream;
@@ -55,8 +55,7 @@ private:
     bool replace_query;
     std::string on_duplicate_clause;
 
-    mysqlxx::Pool pool;
-    const Context & global_context;
+    mysqlxx::PoolWithFailoverPtr pool;
 };
 
 }
diff --git a/src/Storages/StorageNull.cpp b/src/Storages/StorageNull.cpp
index f324d502834..46f88bbc7ac 100644
--- a/src/Storages/StorageNull.cpp
+++ b/src/Storages/StorageNull.cpp
@@ -16,6 +16,7 @@ namespace ErrorCodes
 {
     extern const int NOT_IMPLEMENTED;
     extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+    extern const int ALTER_OF_COLUMN_IS_FORBIDDEN;
 }
 
 
@@ -35,8 +36,9 @@ void registerStorageNull(StorageFactory & factory)
     });
 }
 
-void StorageNull::checkAlterIsPossible(const AlterCommands & commands, const Settings & /* settings */) const
+void StorageNull::checkAlterIsPossible(const AlterCommands & commands, ContextPtr context) const
 {
+    auto name_deps = getDependentViewsByColumn(context);
     for (const auto & command : commands)
     {
         if (command.type != AlterCommand::Type::ADD_COLUMN && command.type != AlterCommand::Type::MODIFY_COLUMN
@@ -44,11 +46,22 @@ void StorageNull::checkAlterIsPossible(const AlterCommands & commands, const Set
             throw Exception(
                 "Alter of type '" + alterTypeToString(command.type) + "' is not supported by storage " + getName(),
                 ErrorCodes::NOT_IMPLEMENTED);
+        if (command.type == AlterCommand::DROP_COLUMN)
+        {
+            const auto & deps_mv = name_deps[command.column_name];
+            if (!deps_mv.empty())
+            {
+                throw Exception(
+                    "Trying to ALTER DROP column " + backQuoteIfNeed(command.column_name) + " which is referenced by materialized view "
+                        + toString(deps_mv),
+                    ErrorCodes::ALTER_OF_COLUMN_IS_FORBIDDEN);
+            }
+        }
     }
 }
 
 
-void StorageNull::alter(const AlterCommands & params, const Context & context, TableLockHolder &)
+void StorageNull::alter(const AlterCommands & params, ContextPtr context, TableLockHolder &)
 {
     auto table_id = getStorageID();
 
diff --git a/src/Storages/StorageNull.h b/src/Storages/StorageNull.h
index 7d3d15f1b0f..7fe65eb25dc 100644
--- a/src/Storages/StorageNull.h
+++ b/src/Storages/StorageNull.h
@@ -25,7 +25,7 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & metadata_snapshot,
         SelectQueryInfo &,
-        const Context & /*context*/,
+        ContextPtr /*context*/,
         QueryProcessingStage::Enum /*processing_stage*/,
         size_t,
         unsigned) override
@@ -36,14 +36,14 @@ public:
 
     bool supportsParallelInsert() const override { return true; }
 
-    BlockOutputStreamPtr write(const ASTPtr &, const StorageMetadataPtr & metadata_snapshot, const Context &) override
+    BlockOutputStreamPtr write(const ASTPtr &, const StorageMetadataPtr & metadata_snapshot, ContextPtr) override
     {
         return std::make_shared<NullBlockOutputStream>(metadata_snapshot->getSampleBlock());
     }
 
-    void checkAlterIsPossible(const AlterCommands & commands, const Settings & /* settings */) const override;
+    void checkAlterIsPossible(const AlterCommands & commands, ContextPtr context) const override;
 
-    void alter(const AlterCommands & params, const Context & context, TableLockHolder & table_lock_holder) override;
+    void alter(const AlterCommands & params, ContextPtr context, TableLockHolder & table_lock_holder) override;
 
     std::optional<UInt64> totalRows(const Settings &) const override
     {
diff --git a/src/Storages/StoragePostgreSQL.cpp b/src/Storages/StoragePostgreSQL.cpp
index 78ec8c34e41..a99568c0036 100644
--- a/src/Storages/StoragePostgreSQL.cpp
+++ b/src/Storages/StoragePostgreSQL.cpp
@@ -26,6 +26,7 @@
 #include <Formats/FormatFactory.h>
 #include <Formats/FormatSettings.h>
 #include <Processors/Sources/SourceFromInputStream.h>
+#include <Common/parseRemoteDescription.h>
 #include <Processors/Pipe.h>
 #include <IO/WriteHelpers.h>
 
@@ -41,15 +42,17 @@ namespace ErrorCodes
 
 StoragePostgreSQL::StoragePostgreSQL(
     const StorageID & table_id_,
+    const postgres::PoolWithFailover & pool_,
     const String & remote_table_name_,
-    PostgreSQLConnectionPtr connection_,
     const ColumnsDescription & columns_,
     const ConstraintsDescription & constraints_,
-    const Context & context_)
+    ContextPtr context_,
+    const String & remote_table_schema_)
     : IStorage(table_id_)
     , remote_table_name(remote_table_name_)
+    , remote_table_schema(remote_table_schema_)
     , global_context(context_)
-    , connection(std::move(connection_))
+    , pool(std::make_shared<postgres::PoolWithFailover>(pool_))
 {
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(columns_);
@@ -62,16 +65,18 @@ Pipe StoragePostgreSQL::read(
     const Names & column_names_,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & query_info_,
-    const Context & context_,
+    ContextPtr context_,
     QueryProcessingStage::Enum /*processed_stage*/,
     size_t max_block_size_,
     unsigned)
 {
     metadata_snapshot->check(column_names_, getVirtuals(), getStorageID());
 
+    /// Connection is already made to the needed database, so it should not be present in the query;
+    /// remote_table_schema is empty if it is not specified, will access only table_name.
     String query = transformQueryForExternalDatabase(
         query_info_, metadata_snapshot->getColumns().getOrdinary(),
-        IdentifierQuotingStyle::DoubleQuotes, "", remote_table_name, context_);
+        IdentifierQuotingStyle::DoubleQuotes, remote_table_schema, remote_table_name, context_);
 
     Block sample_block;
     for (const String & column_name : column_names_)
@@ -84,7 +89,7 @@ Pipe StoragePostgreSQL::read(
     }
 
     return Pipe(std::make_shared<SourceFromInputStream>(
-            std::make_shared<PostgreSQLBlockInputStream>(connection->conn(), query, sample_block, max_block_size_)));
+            std::make_shared<PostgreSQLBlockInputStream>(pool->get(), query, sample_block, max_block_size_)));
 }
 
 
@@ -93,10 +98,10 @@ class PostgreSQLBlockOutputStream : public IBlockOutputStream
 public:
     explicit PostgreSQLBlockOutputStream(
         const StorageMetadataPtr & metadata_snapshot_,
-        ConnectionPtr connection_,
+        postgres::ConnectionHolderPtr connection_,
         const std::string & remote_table_name_)
         : metadata_snapshot(metadata_snapshot_)
-        , connection(connection_)
+        , connection(std::move(connection_))
         , remote_table_name(remote_table_name_)
     {
     }
@@ -106,7 +111,7 @@ public:
 
     void writePrefix() override
     {
-        work = std::make_unique<pqxx::work>(*connection);
+        work = std::make_unique<pqxx::work>(connection->conn());
     }
 
 
@@ -143,7 +148,7 @@ public:
                     }
                     else
                     {
-                        data_types[j]->serializeAsText(*columns[j], i, ostr, FormatSettings{});
+                        data_types[j]->getDefaultSerialization()->serializeText(*columns[j], i, ostr, FormatSettings{});
                     }
 
                     row[j] = ostr.str();
@@ -210,7 +215,7 @@ public:
         auto array_column = ColumnArray::create(createNested(nested));
         array_column->insert(array_field);
         WriteBufferFromOwnString ostr;
-        data_type->serializeAsText(*array_column, 0, ostr, FormatSettings{});
+        data_type->getDefaultSerialization()->serializeText(*array_column, 0, ostr, FormatSettings{});
 
         /// ostr is guaranteed to be at least '[]', i.e. size is at least 2 and 2 only if ostr.str() == '[]'
         assert(ostr.str().size() >= 2);
@@ -272,7 +277,7 @@ public:
 
 private:
     StorageMetadataPtr metadata_snapshot;
-    ConnectionPtr connection;
+    postgres::ConnectionHolderPtr connection;
     std::string remote_table_name;
 
     std::unique_ptr<pqxx::work> work;
@@ -281,9 +286,9 @@ private:
 
 
 BlockOutputStreamPtr StoragePostgreSQL::write(
-        const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, const Context & /* context */)
+        const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, ContextPtr /* context */)
 {
-    return std::make_shared<PostgreSQLBlockOutputStream>(metadata_snapshot, connection->conn(), remote_table_name);
+    return std::make_shared<PostgreSQLBlockOutputStream>(metadata_snapshot, pool->get(), remote_table_name);
 }
 
 
@@ -293,26 +298,39 @@ void registerStoragePostgreSQL(StorageFactory & factory)
     {
         ASTs & engine_args = args.engine_args;
 
-        if (engine_args.size() != 5)
-            throw Exception("Storage PostgreSQL requires 5 parameters: "
-                            "PostgreSQL('host:port', 'database', 'table', 'username', 'password'.",
+        if (engine_args.size() < 5 || engine_args.size() > 6)
+            throw Exception("Storage PostgreSQL requires from 5 to 6 parameters: "
+                            "PostgreSQL('host:port', 'database', 'table', 'username', 'password' [, 'schema']",
                 ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
 
         for (auto & engine_arg : engine_args)
-            engine_arg = evaluateConstantExpressionOrIdentifierAsLiteral(engine_arg, args.local_context);
+            engine_arg = evaluateConstantExpressionOrIdentifierAsLiteral(engine_arg, args.getLocalContext());
 
-        auto parsed_host_port = parseAddress(engine_args[0]->as<ASTLiteral &>().value.safeGet<String>(), 5432);
+        auto host_port = engine_args[0]->as<ASTLiteral &>().value.safeGet<String>();
+        /// Split into replicas if needed.
+        size_t max_addresses = args.getContext()->getSettingsRef().glob_expansion_max_elements;
+        auto addresses = parseRemoteDescriptionForExternalDatabase(host_port, max_addresses, 5432);
+
+        const String & remote_database = engine_args[1]->as<ASTLiteral &>().value.safeGet<String>();
         const String & remote_table = engine_args[2]->as<ASTLiteral &>().value.safeGet<String>();
+        const String & username = engine_args[3]->as<ASTLiteral &>().value.safeGet<String>();
+        const String & password = engine_args[4]->as<ASTLiteral &>().value.safeGet<String>();
 
-        auto connection = std::make_shared<PostgreSQLConnection>(
-            engine_args[1]->as<ASTLiteral &>().value.safeGet<String>(),
-            parsed_host_port.first,
-            parsed_host_port.second,
-            engine_args[3]->as<ASTLiteral &>().value.safeGet<String>(),
-            engine_args[4]->as<ASTLiteral &>().value.safeGet<String>());
+        String remote_table_schema;
+        if (engine_args.size() == 6)
+            remote_table_schema = engine_args[5]->as<ASTLiteral &>().value.safeGet<String>();
+
+        postgres::PoolWithFailover pool(
+            remote_database,
+            addresses,
+            username,
+            password,
+            args.getContext()->getSettingsRef().postgresql_connection_pool_size,
+            args.getContext()->getSettingsRef().postgresql_connection_pool_wait_timeout);
 
         return StoragePostgreSQL::create(
-            args.table_id, remote_table, connection, args.columns, args.constraints, args.context);
+            args.table_id, pool, remote_table,
+            args.columns, args.constraints, args.getContext(), remote_table_schema);
     },
     {
         .source_access_type = AccessType::POSTGRES,
diff --git a/src/Storages/StoragePostgreSQL.h b/src/Storages/StoragePostgreSQL.h
index 8aebae5896b..e4ab59f7a06 100644
--- a/src/Storages/StoragePostgreSQL.h
+++ b/src/Storages/StoragePostgreSQL.h
@@ -9,14 +9,12 @@
 #include <Interpreters/Context.h>
 #include <Storages/IStorage.h>
 #include <DataStreams/IBlockOutputStream.h>
-#include <pqxx/pqxx>
+#include <Storages/PostgreSQL/PostgreSQLPoolWithFailover.h>
 
 
 namespace DB
 {
 
-class PostgreSQLConnection;
-using PostgreSQLConnectionPtr = std::shared_ptr<PostgreSQLConnection>;
 
 class StoragePostgreSQL final : public ext::shared_ptr_helper<StoragePostgreSQL>, public IStorage
 {
@@ -24,11 +22,12 @@ class StoragePostgreSQL final : public ext::shared_ptr_helper<StoragePostgreSQL>
 public:
     StoragePostgreSQL(
         const StorageID & table_id_,
-        const std::string & remote_table_name_,
-        PostgreSQLConnectionPtr connection_,
+        const postgres::PoolWithFailover & pool_,
+        const String & remote_table_name_,
         const ColumnsDescription & columns_,
         const ConstraintsDescription & constraints_,
-        const Context & context_);
+        ContextPtr context_,
+        const std::string & remote_table_schema_ = "");
 
     String getName() const override { return "PostgreSQL"; }
 
@@ -36,19 +35,20 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
 
-    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, const Context & context) override;
+    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, ContextPtr context) override;
 
 private:
     friend class PostgreSQLBlockOutputStream;
 
     String remote_table_name;
-    Context global_context;
-    PostgreSQLConnectionPtr connection;
+    String remote_table_schema;
+    ContextPtr global_context;
+    postgres::PoolWithFailoverPtr pool;
 };
 
 }
diff --git a/src/Storages/StorageProxy.h b/src/Storages/StorageProxy.h
index fed9dd04e76..2c3e9d610b0 100644
--- a/src/Storages/StorageProxy.h
+++ b/src/Storages/StorageProxy.h
@@ -11,7 +11,7 @@ class StorageProxy : public IStorage
 {
 public:
 
-    StorageProxy(const StorageID & table_id_) : IStorage(table_id_) {}
+    explicit StorageProxy(const StorageID & table_id_) : IStorage(table_id_) {}
 
     virtual StoragePtr getNested() const = 0;
 
@@ -32,7 +32,7 @@ public:
     NamesAndTypesList getVirtuals() const override { return getNested()->getVirtuals(); }
 
     QueryProcessingStage::Enum getQueryProcessingStage(
-        const Context & context, QueryProcessingStage::Enum to_stage, SelectQueryInfo & ast) const override
+        ContextPtr context, QueryProcessingStage::Enum to_stage, SelectQueryInfo & ast) const override
     {
         return getNested()->getQueryProcessingStage(context, to_stage, ast);
     }
@@ -40,7 +40,7 @@ public:
     BlockInputStreams watch(
         const Names & column_names,
         const SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum & processed_stage,
         size_t max_block_size,
         unsigned num_streams) override
@@ -52,7 +52,7 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & metadata_snapshot,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override
@@ -60,10 +60,7 @@ public:
         return getNested()->read(column_names, metadata_snapshot, query_info, context, processed_stage, max_block_size, num_streams);
     }
 
-    BlockOutputStreamPtr write(
-        const ASTPtr & query,
-        const StorageMetadataPtr & metadata_snapshot,
-        const Context & context) override
+    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & metadata_snapshot, ContextPtr context) override
     {
         return getNested()->write(query, metadata_snapshot, context);
     }
@@ -73,7 +70,7 @@ public:
     void truncate(
         const ASTPtr & query,
         const StorageMetadataPtr & metadata_snapshot,
-        const Context & context,
+        ContextPtr context,
         TableExclusiveLockHolder & lock) override
     {
         getNested()->truncate(query, metadata_snapshot, context, lock);
@@ -91,21 +88,21 @@ public:
         IStorage::renameInMemory(new_table_id);
     }
 
-    void alter(const AlterCommands & params, const Context & context, TableLockHolder & alter_lock_holder) override
+    void alter(const AlterCommands & params, ContextPtr context, TableLockHolder & alter_lock_holder) override
     {
         getNested()->alter(params, context, alter_lock_holder);
         IStorage::setInMemoryMetadata(getNested()->getInMemoryMetadata());
     }
 
-    void checkAlterIsPossible(const AlterCommands & commands, const Settings & settings) const override
+    void checkAlterIsPossible(const AlterCommands & commands, ContextPtr context) const override
     {
-        getNested()->checkAlterIsPossible(commands, settings);
+        getNested()->checkAlterIsPossible(commands, context);
     }
 
     Pipe alterPartition(
             const StorageMetadataPtr & metadata_snapshot,
             const PartitionCommands & commands,
-            const Context & context) override
+            ContextPtr context) override
     {
         return getNested()->alterPartition(metadata_snapshot, commands, context);
     }
@@ -122,12 +119,12 @@ public:
             bool final,
             bool deduplicate,
             const Names & deduplicate_by_columns,
-            const Context & context) override
+            ContextPtr context) override
     {
         return getNested()->optimize(query, metadata_snapshot, partition, final, deduplicate, deduplicate_by_columns, context);
     }
 
-    void mutate(const MutationCommands & commands, const Context & context) override { getNested()->mutate(commands, context); }
+    void mutate(const MutationCommands & commands, ContextPtr context) override { getNested()->mutate(commands, context); }
 
     CancellationCode killMutation(const String & mutation_id) override { return getNested()->killMutation(mutation_id); }
 
@@ -137,12 +134,12 @@ public:
     ActionLock getActionLock(StorageActionBlockType action_type) override { return getNested()->getActionLock(action_type); }
 
     bool supportsIndexForIn() const override { return getNested()->supportsIndexForIn(); }
-    bool mayBenefitFromIndexForIn(const ASTPtr & left_in_operand, const Context & query_context, const StorageMetadataPtr & metadata_snapshot) const override
+    bool mayBenefitFromIndexForIn(const ASTPtr & left_in_operand, ContextPtr query_context, const StorageMetadataPtr & metadata_snapshot) const override
     {
         return getNested()->mayBenefitFromIndexForIn(left_in_operand, query_context, metadata_snapshot);
     }
 
-    CheckResults checkData(const ASTPtr & query , const Context & context) override { return getNested()->checkData(query, context); }
+    CheckResults checkData(const ASTPtr & query , ContextPtr context) override { return getNested()->checkData(query, context); }
     void checkTableCanBeDropped() const override { getNested()->checkTableCanBeDropped(); }
     void checkPartitionCanBeDropped(const ASTPtr & partition) override { getNested()->checkPartitionCanBeDropped(partition); }
     bool storesDataOnDisk() const override { return getNested()->storesDataOnDisk(); }
diff --git a/src/Storages/StorageReplicatedMergeTree.cpp b/src/Storages/StorageReplicatedMergeTree.cpp
index f2c88cdedd9..3b4a1ec4e16 100644
--- a/src/Storages/StorageReplicatedMergeTree.cpp
+++ b/src/Storages/StorageReplicatedMergeTree.cpp
@@ -26,6 +26,7 @@
 #include <Storages/MergeTree/ReplicatedMergeTreeQuorumAddedParts.h>
 #include <Storages/MergeTree/ReplicatedMergeTreePartHeader.h>
 #include <Storages/VirtualColumnUtils.h>
+#include <Storages/MergeTree/MergeTreeReaderCompact.h>
 
 
 #include <Databases/IDatabase.h>
@@ -39,6 +40,9 @@
 #include <Parsers/ASTCheckQuery.h>
 #include <Parsers/ASTSetQuery.h>
 
+#include <Processors/QueryPlan/BuildQueryPipelineSettings.h>
+#include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
+
 #include <IO/ReadBufferFromString.h>
 #include <IO/Operators.h>
 #include <IO/ConnectionTimeouts.h>
@@ -48,6 +52,7 @@
 #include <Interpreters/PartLog.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/DDLTask.h>
+#include <Interpreters/InterserverCredentials.h>
 
 #include <DataStreams/RemoteBlockInputStream.h>
 #include <DataStreams/copyData.h>
@@ -56,6 +61,7 @@
 
 #include <ext/range.h>
 #include <ext/scope_guard.h>
+#include <ext/scope_guard_safe.h>
 
 #include <ctime>
 #include <thread>
@@ -124,6 +130,7 @@ namespace ErrorCodes
     extern const int UNKNOWN_POLICY;
     extern const int NO_SUCH_DATA_PART;
     extern const int INTERSERVER_SCHEME_DOESNT_MATCH;
+    extern const int DUPLICATE_DATA_PART;
 }
 
 namespace ActionLocks
@@ -142,16 +149,26 @@ static const auto MERGE_SELECTING_SLEEP_MS           = 5 * 1000;
 static const auto MUTATIONS_FINALIZING_SLEEP_MS      = 1 * 1000;
 static const auto MUTATIONS_FINALIZING_IDLE_SLEEP_MS = 5 * 1000;
 
+
+std::atomic_uint StorageReplicatedMergeTree::total_fetches {0};
+
+
 void StorageReplicatedMergeTree::setZooKeeper()
 {
+    /// Every ReplicatedMergeTree table is using only one ZooKeeper session.
+    /// But if several ReplicatedMergeTree tables are using different
+    /// ZooKeeper sessions, some queries like ATTACH PARTITION FROM may have
+    /// strange effects. So we always use only one session for all tables.
+    /// (excluding auxiliary zookeepers)
+
     std::lock_guard lock(current_zookeeper_mutex);
     if (zookeeper_name == default_zookeeper_name)
     {
-        current_zookeeper = global_context.getZooKeeper();
+        current_zookeeper = getContext()->getZooKeeper();
     }
     else
     {
-        current_zookeeper = global_context.getAuxiliaryZooKeeper(zookeeper_name);
+        current_zookeeper = getContext()->getAuxiliaryZooKeeper(zookeeper_name);
     }
 }
 
@@ -215,7 +232,7 @@ StorageReplicatedMergeTree::StorageReplicatedMergeTree(
     const StorageID & table_id_,
     const String & relative_data_path_,
     const StorageInMemoryMetadata & metadata_,
-    Context & context_,
+    ContextPtr context_,
     const String & date_column_name,
     const MergingParams & merging_params_,
     std::unique_ptr<MergeTreeSettings> settings_,
@@ -237,34 +254,34 @@ StorageReplicatedMergeTree::StorageReplicatedMergeTree(
     , replica_path(zookeeper_path + "/replicas/" + replica_name_)
     , reader(*this)
     , writer(*this)
-    , merger_mutator(*this, global_context.getSettingsRef().background_pool_size)
+    , merger_mutator(*this, getContext()->getSettingsRef().background_pool_size)
     , merge_strategy_picker(*this)
     , queue(*this, merge_strategy_picker)
     , fetcher(*this)
-    , background_executor(*this, global_context)
-    , background_moves_executor(*this, global_context)
+    , background_executor(*this, getContext())
+    , background_moves_executor(*this, getContext())
     , cleanup_thread(*this)
     , part_check_thread(*this)
     , restarting_thread(*this)
     , allow_renaming(allow_renaming_)
-    , replicated_fetches_pool_size(global_context.getSettingsRef().background_fetches_pool_size)
+    , replicated_fetches_pool_size(getContext()->getSettingsRef().background_fetches_pool_size)
 {
-    queue_updating_task = global_context.getSchedulePool().createTask(
+    queue_updating_task = getContext()->getSchedulePool().createTask(
         getStorageID().getFullTableName() + " (StorageReplicatedMergeTree::queueUpdatingTask)", [this]{ queueUpdatingTask(); });
 
-    mutations_updating_task = global_context.getSchedulePool().createTask(
+    mutations_updating_task = getContext()->getSchedulePool().createTask(
         getStorageID().getFullTableName() + " (StorageReplicatedMergeTree::mutationsUpdatingTask)", [this]{ mutationsUpdatingTask(); });
 
-    merge_selecting_task = global_context.getSchedulePool().createTask(
+    merge_selecting_task = getContext()->getSchedulePool().createTask(
         getStorageID().getFullTableName() + " (StorageReplicatedMergeTree::mergeSelectingTask)", [this] { mergeSelectingTask(); });
 
     /// Will be activated if we win leader election.
     merge_selecting_task->deactivate();
 
-    mutations_finalizing_task = global_context.getSchedulePool().createTask(
+    mutations_finalizing_task = getContext()->getSchedulePool().createTask(
         getStorageID().getFullTableName() + " (StorageReplicatedMergeTree::mutationsFinalizingTask)", [this] { mutationsFinalizingTask(); });
 
-    if (global_context.hasZooKeeper() || global_context.hasAuxiliaryZooKeeper(zookeeper_name))
+    if (getContext()->hasZooKeeper() || getContext()->hasAuxiliaryZooKeeper(zookeeper_name))
     {
         /// It's possible for getZooKeeper() to timeout if  zookeeper host(s) can't
         /// be reached. In such cases Poco::Exception is thrown after a connection
@@ -283,11 +300,11 @@ StorageReplicatedMergeTree::StorageReplicatedMergeTree(
         {
             if (zookeeper_name == default_zookeeper_name)
             {
-                current_zookeeper = global_context.getZooKeeper();
+                current_zookeeper = getContext()->getZooKeeper();
             }
             else
             {
-                current_zookeeper = global_context.getAuxiliaryZooKeeper(zookeeper_name);
+                current_zookeeper = getContext()->getAuxiliaryZooKeeper(zookeeper_name);
             }
         }
         catch (...)
@@ -441,12 +458,12 @@ void StorageReplicatedMergeTree::waitMutationToFinishOnReplicas(
     if (replicas.empty())
         return;
 
-    zkutil::EventPtr wait_event = std::make_shared<Poco::Event>();
 
     std::set<String> inactive_replicas;
     for (const String & replica : replicas)
     {
         LOG_DEBUG(log, "Waiting for {} to apply mutation {}", replica, mutation_id);
+        zkutil::EventPtr wait_event = std::make_shared<Poco::Event>();
 
         while (!partial_shutdown_called)
         {
@@ -470,9 +487,8 @@ void StorageReplicatedMergeTree::waitMutationToFinishOnReplicas(
 
             String mutation_pointer = zookeeper_path + "/replicas/" + replica + "/mutation_pointer";
             std::string mutation_pointer_value;
-            Coordination::Stat get_stat;
             /// Replica could be removed
-            if (!zookeeper->tryGet(mutation_pointer, mutation_pointer_value, &get_stat, wait_event))
+            if (!zookeeper->tryGet(mutation_pointer, mutation_pointer_value, nullptr, wait_event))
             {
                 LOG_WARNING(log, "Replica {} was removed", replica);
                 break;
@@ -482,8 +498,10 @@ void StorageReplicatedMergeTree::waitMutationToFinishOnReplicas(
 
             /// Replica can become inactive, so wait with timeout and recheck it
             if (wait_event->tryWait(1000))
-                break;
+                continue;
 
+            /// Here we check mutation for errors or kill on local replica. If they happen on this replica
+            /// they will happen on each replica, so we can check only in-memory info.
             auto mutation_status = queue.getIncompleteMutationsStatus(mutation_id);
             if (!mutation_status || !mutation_status->latest_fail_reason.empty())
                 break;
@@ -500,6 +518,8 @@ void StorageReplicatedMergeTree::waitMutationToFinishOnReplicas(
         std::set<String> mutation_ids;
         mutation_ids.insert(mutation_id);
 
+        /// Here we check mutation for errors or kill on local replica. If they happen on this replica
+        /// they will happen on each replica, so we can check only in-memory info.
         auto mutation_status = queue.getIncompleteMutationsStatus(mutation_id, &mutation_ids);
         checkMutationStatus(mutation_status, mutation_ids);
 
@@ -533,6 +553,13 @@ void StorageReplicatedMergeTree::createNewZooKeeperNodes()
     /// Mutations
     zookeeper->createIfNotExists(zookeeper_path + "/mutations", String());
     zookeeper->createIfNotExists(replica_path + "/mutation_pointer", String());
+
+    /// Nodes for zero-copy S3 replication
+    if (storage_settings.get()->allow_s3_zero_copy_replication)
+    {
+        zookeeper->createIfNotExists(zookeeper_path + "/zero_copy_s3", String());
+        zookeeper->createIfNotExists(zookeeper_path + "/zero_copy_s3/shared", String());
+    }
 }
 
 
@@ -558,42 +585,24 @@ bool StorageReplicatedMergeTree::createTableIfNotExists(const StorageMetadataPtr
             /// This is Ok because another replica is definitely going to drop the table.
 
             LOG_WARNING(log, "Removing leftovers from table {} (this might take several minutes)", zookeeper_path);
+            String drop_lock_path = zookeeper_path + "/dropped/lock";
+            Coordination::Error code = zookeeper->tryCreate(drop_lock_path, "", zkutil::CreateMode::Ephemeral);
 
-            Strings children;
-            Coordination::Error code = zookeeper->tryGetChildren(zookeeper_path, children);
-            if (code == Coordination::Error::ZNONODE)
+            if (code == Coordination::Error::ZNONODE || code == Coordination::Error::ZNODEEXISTS)
             {
-                LOG_WARNING(log, "Table {} is already finished removing by another replica right now", replica_path);
+                LOG_WARNING(log, "The leftovers from table {} were removed by another replica", zookeeper_path);
+            }
+            else if (code != Coordination::Error::ZOK)
+            {
+                throw Coordination::Exception(code, drop_lock_path);
             }
             else
             {
-                for (const auto & child : children)
-                    if (child != "dropped")
-                        zookeeper->tryRemoveRecursive(zookeeper_path + "/" + child);
-
-                Coordination::Requests ops;
-                Coordination::Responses responses;
-                ops.emplace_back(zkutil::makeRemoveRequest(zookeeper_path + "/dropped", -1));
-                ops.emplace_back(zkutil::makeRemoveRequest(zookeeper_path, -1));
-                code = zookeeper->tryMulti(ops, responses);
-
-                if (code == Coordination::Error::ZNONODE)
+                auto metadata_drop_lock = zkutil::EphemeralNodeHolder::existing(drop_lock_path, *zookeeper);
+                if (!removeTableNodesFromZooKeeper(zookeeper, zookeeper_path, metadata_drop_lock, log))
                 {
-                    LOG_WARNING(log, "Table {} is already finished removing by another replica right now", replica_path);
-                }
-                else if (code == Coordination::Error::ZNOTEMPTY)
-                {
-                    throw Exception(fmt::format(
-                        "The old table was not completely removed from ZooKeeper, {} still exists and may contain some garbage. But it should never happen according to the logic of operations (it's a bug).", zookeeper_path), ErrorCodes::LOGICAL_ERROR);
-                }
-                else if (code != Coordination::Error::ZOK)
-                {
-                    /// It is still possible that ZooKeeper session is expired or server is killed in the middle of the delete operation.
-                    zkutil::KeeperMultiException::check(code, ops, responses);
-                }
-                else
-                {
-                    LOG_WARNING(log, "The leftovers from table {} was successfully removed from ZooKeeper", zookeeper_path);
+                    /// Someone is recursively removing table right now, we cannot create new table until old one is removed
+                    continue;
                 }
             }
         }
@@ -606,10 +615,6 @@ bool StorageReplicatedMergeTree::createTableIfNotExists(const StorageMetadataPtr
         Coordination::Requests ops;
         ops.emplace_back(zkutil::makeCreateRequest(zookeeper_path, "", zkutil::CreateMode::Persistent));
 
-        /// Check that the table is not being dropped right now.
-        ops.emplace_back(zkutil::makeCreateRequest(zookeeper_path + "/dropped", "", zkutil::CreateMode::Persistent));
-        ops.emplace_back(zkutil::makeRemoveRequest(zookeeper_path + "/dropped", -1));
-
         ops.emplace_back(zkutil::makeCreateRequest(zookeeper_path + "/metadata", metadata_str,
             zkutil::CreateMode::Persistent));
         ops.emplace_back(zkutil::makeCreateRequest(zookeeper_path + "/columns", metadata_snapshot->getColumns().toString(),
@@ -749,8 +754,12 @@ void StorageReplicatedMergeTree::drop()
     if (has_metadata_in_zookeeper)
     {
         /// Table can be shut down, restarting thread is not active
-        /// and calling StorageReplicatedMergeTree::getZooKeeper() won't suffice.
-        auto zookeeper = global_context.getZooKeeper();
+        /// and calling StorageReplicatedMergeTree::getZooKeeper()/getAuxiliaryZooKeeper() won't suffice.
+        zkutil::ZooKeeperPtr zookeeper;
+        if (zookeeper_name == default_zookeeper_name)
+            zookeeper = getContext()->getZooKeeper();
+        else
+            zookeeper = getContext()->getAuxiliaryZooKeeper(zookeeper_name);
 
         /// If probably there is metadata in ZooKeeper, we don't allow to drop the table.
         if (!zookeeper)
@@ -793,10 +802,18 @@ void StorageReplicatedMergeTree::dropReplica(zkutil::ZooKeeperPtr zookeeper, con
       * because table creation is executed in single transaction that will conflict with remaining nodes.
       */
 
+    /// Node /dropped works like a lock that protects from concurrent removal of old table and creation of new table.
+    /// But recursive removal may fail in the middle of operation leaving some garbage in zookeeper_path, so
+    /// we remove it on table creation if there is /dropped node. Creating thread may remove /dropped node created by
+    /// removing thread, and it causes race condition if removing thread is not finished yet.
+    /// To avoid this we also create ephemeral child before starting recursive removal.
+    /// (The existence of child node does not allow to remove parent node).
     Coordination::Requests ops;
     Coordination::Responses responses;
+    String drop_lock_path = zookeeper_path + "/dropped/lock";
     ops.emplace_back(zkutil::makeRemoveRequest(zookeeper_path + "/replicas", -1));
     ops.emplace_back(zkutil::makeCreateRequest(zookeeper_path + "/dropped", "", zkutil::CreateMode::Persistent));
+    ops.emplace_back(zkutil::makeCreateRequest(drop_lock_path, "", zkutil::CreateMode::Ephemeral));
     Coordination::Error code = zookeeper->tryMulti(ops, responses);
 
     if (code == Coordination::Error::ZNONODE || code == Coordination::Error::ZNODEEXISTS)
@@ -813,48 +830,57 @@ void StorageReplicatedMergeTree::dropReplica(zkutil::ZooKeeperPtr zookeeper, con
     }
     else
     {
+        auto metadata_drop_lock = zkutil::EphemeralNodeHolder::existing(drop_lock_path, *zookeeper);
         LOG_INFO(logger, "Removing table {} (this might take several minutes)", zookeeper_path);
-
-        Strings children;
-        code = zookeeper->tryGetChildren(zookeeper_path, children);
-        if (code == Coordination::Error::ZNONODE)
-        {
-            LOG_WARNING(logger, "Table {} is already finished removing by another replica right now", remote_replica_path);
-        }
-        else
-        {
-            for (const auto & child : children)
-                if (child != "dropped")
-                    zookeeper->tryRemoveRecursive(zookeeper_path + "/" + child);
-
-            ops.clear();
-            responses.clear();
-            ops.emplace_back(zkutil::makeRemoveRequest(zookeeper_path + "/dropped", -1));
-            ops.emplace_back(zkutil::makeRemoveRequest(zookeeper_path, -1));
-            code = zookeeper->tryMulti(ops, responses);
-
-            if (code == Coordination::Error::ZNONODE)
-            {
-                LOG_WARNING(logger, "Table {} is already finished removing by another replica right now", remote_replica_path);
-            }
-            else if (code == Coordination::Error::ZNOTEMPTY)
-            {
-                LOG_ERROR(logger, "Table was not completely removed from ZooKeeper, {} still exists and may contain some garbage.",
-                          zookeeper_path);
-            }
-            else if (code != Coordination::Error::ZOK)
-            {
-                /// It is still possible that ZooKeeper session is expired or server is killed in the middle of the delete operation.
-                zkutil::KeeperMultiException::check(code, ops, responses);
-            }
-            else
-            {
-                LOG_INFO(logger, "Table {} was successfully removed from ZooKeeper", zookeeper_path);
-            }
-        }
+        removeTableNodesFromZooKeeper(zookeeper, zookeeper_path, metadata_drop_lock, logger);
     }
 }
 
+bool StorageReplicatedMergeTree::removeTableNodesFromZooKeeper(zkutil::ZooKeeperPtr zookeeper,
+        const String & zookeeper_path, const zkutil::EphemeralNodeHolder::Ptr & metadata_drop_lock, Poco::Logger * logger)
+{
+    bool completely_removed = false;
+    Strings children;
+    Coordination::Error code = zookeeper->tryGetChildren(zookeeper_path, children);
+    if (code == Coordination::Error::ZNONODE)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "There is a race condition between creation and removal of replicated table. It's a bug");
+
+
+    for (const auto & child : children)
+        if (child != "dropped")
+            zookeeper->tryRemoveRecursive(zookeeper_path + "/" + child);
+
+    Coordination::Requests ops;
+    Coordination::Responses responses;
+    ops.emplace_back(zkutil::makeRemoveRequest(metadata_drop_lock->getPath(), -1));
+    ops.emplace_back(zkutil::makeRemoveRequest(zookeeper_path + "/dropped", -1));
+    ops.emplace_back(zkutil::makeRemoveRequest(zookeeper_path, -1));
+    code = zookeeper->tryMulti(ops, responses);
+
+    if (code == Coordination::Error::ZNONODE)
+    {
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "There is a race condition between creation and removal of replicated table. It's a bug");
+    }
+    else if (code == Coordination::Error::ZNOTEMPTY)
+    {
+        LOG_ERROR(logger, "Table was not completely removed from ZooKeeper, {} still exists and may contain some garbage,"
+                          "but someone is removing it right now.", zookeeper_path);
+    }
+    else if (code != Coordination::Error::ZOK)
+    {
+        /// It is still possible that ZooKeeper session is expired or server is killed in the middle of the delete operation.
+        zkutil::KeeperMultiException::check(code, ops, responses);
+    }
+    else
+    {
+        metadata_drop_lock->setAlreadyRemoved();
+        completely_removed = true;
+        LOG_INFO(logger, "Table {} was successfully removed from ZooKeeper", zookeeper_path);
+    }
+
+    return completely_removed;
+}
+
 
 /** Verify that list of columns and table storage_settings_ptr match those specified in ZK (/metadata).
   * If not, throw an exception.
@@ -868,7 +894,7 @@ void StorageReplicatedMergeTree::checkTableStructure(const String & zookeeper_pr
     Coordination::Stat metadata_stat;
     String metadata_str = zookeeper->get(zookeeper_prefix + "/metadata", &metadata_stat);
     auto metadata_from_zk = ReplicatedMergeTreeTableMetadata::parse(metadata_str);
-    old_metadata.checkEquals(metadata_from_zk, metadata_snapshot->getColumns(), global_context);
+    old_metadata.checkEquals(metadata_from_zk, metadata_snapshot->getColumns(), getContext());
 
     Coordination::Stat columns_stat;
     auto columns_from_zk = ColumnsDescription::parse(zookeeper->get(zookeeper_prefix + "/columns", &columns_stat));
@@ -886,21 +912,7 @@ void StorageReplicatedMergeTree::setTableStructure(
     StorageInMemoryMetadata new_metadata = getInMemoryMetadata();
     StorageInMemoryMetadata old_metadata = getInMemoryMetadata();
 
-    if (new_columns != new_metadata.columns)
-    {
-        new_metadata.columns = new_columns;
-
-        new_metadata.column_ttls_by_name.clear();
-        for (const auto & [name, ast] : new_metadata.columns.getColumnTTLs())
-        {
-            auto new_ttl_entry = TTLDescription::getTTLFromAST(ast, new_metadata.columns, global_context, new_metadata.primary_key);
-            new_metadata.column_ttls_by_name[name] = new_ttl_entry;
-        }
-
-        /// The type of partition key expression may change
-        if (new_metadata.partition_key.definition_ast != nullptr)
-            new_metadata.partition_key.recalculateWithNewColumns(new_metadata.columns, global_context);
-    }
+    new_metadata.columns = new_columns;
 
     if (!metadata_diff.empty())
     {
@@ -927,7 +939,7 @@ void StorageReplicatedMergeTree::setTableStructure(
             auto & sorting_key = new_metadata.sorting_key;
             auto & primary_key = new_metadata.primary_key;
 
-            sorting_key.recalculateWithNewAST(order_by_ast, new_metadata.columns, global_context);
+            sorting_key.recalculateWithNewAST(order_by_ast, new_metadata.columns, getContext());
 
             if (primary_key.definition_ast == nullptr)
             {
@@ -935,18 +947,18 @@ void StorageReplicatedMergeTree::setTableStructure(
                 /// save the old ORDER BY expression as the new primary key.
                 auto old_sorting_key_ast = old_metadata.getSortingKey().definition_ast;
                 primary_key = KeyDescription::getKeyFromAST(
-                    old_sorting_key_ast, new_metadata.columns, global_context);
+                    old_sorting_key_ast, new_metadata.columns, getContext());
             }
         }
 
         if (metadata_diff.sampling_expression_changed)
         {
             auto sample_by_ast = parse_key_expr(metadata_diff.new_sampling_expression);
-            new_metadata.sampling_key.recalculateWithNewAST(sample_by_ast, new_metadata.columns, global_context);
+            new_metadata.sampling_key.recalculateWithNewAST(sample_by_ast, new_metadata.columns, getContext());
         }
 
         if (metadata_diff.skip_indices_changed)
-            new_metadata.secondary_indices = IndicesDescription::parse(metadata_diff.new_skip_indices, new_columns, global_context);
+            new_metadata.secondary_indices = IndicesDescription::parse(metadata_diff.new_skip_indices, new_columns, getContext());
 
         if (metadata_diff.constraints_changed)
             new_metadata.constraints = ConstraintsDescription::parse(metadata_diff.new_constraints);
@@ -958,7 +970,7 @@ void StorageReplicatedMergeTree::setTableStructure(
                 ParserTTLExpressionList parser;
                 auto ttl_for_table_ast = parseQuery(parser, metadata_diff.new_ttl_table, 0, DBMS_DEFAULT_MAX_PARSER_DEPTH);
                 new_metadata.table_ttl = TTLTableDescription::getTTLForTableFromAST(
-                    ttl_for_table_ast, new_metadata.columns, global_context, new_metadata.primary_key);
+                    ttl_for_table_ast, new_metadata.columns, getContext(), new_metadata.primary_key);
             }
             else /// TTL was removed
             {
@@ -967,13 +979,51 @@ void StorageReplicatedMergeTree::setTableStructure(
         }
     }
 
+    /// Changes in columns may affect following metadata fields
+    new_metadata.column_ttls_by_name.clear();
+    for (const auto & [name, ast] : new_metadata.columns.getColumnTTLs())
+    {
+        auto new_ttl_entry = TTLDescription::getTTLFromAST(ast, new_metadata.columns, getContext(), new_metadata.primary_key);
+        new_metadata.column_ttls_by_name[name] = new_ttl_entry;
+    }
+
+    if (new_metadata.partition_key.definition_ast != nullptr)
+        new_metadata.partition_key.recalculateWithNewColumns(new_metadata.columns, getContext());
+
+    if (!metadata_diff.sorting_key_changed) /// otherwise already updated
+        new_metadata.sorting_key.recalculateWithNewColumns(new_metadata.columns, getContext());
+
+    /// Primary key is special, it exists even if not defined
+    if (new_metadata.primary_key.definition_ast != nullptr)
+    {
+        new_metadata.primary_key.recalculateWithNewColumns(new_metadata.columns, getContext());
+    }
+    else
+    {
+        new_metadata.primary_key = KeyDescription::getKeyFromAST(new_metadata.sorting_key.definition_ast, new_metadata.columns, getContext());
+        new_metadata.primary_key.definition_ast = nullptr;
+    }
+
+    if (!metadata_diff.sampling_expression_changed && new_metadata.sampling_key.definition_ast != nullptr)
+        new_metadata.sampling_key.recalculateWithNewColumns(new_metadata.columns, getContext());
+
+    if (!metadata_diff.skip_indices_changed) /// otherwise already updated
+    {
+        for (auto & index : new_metadata.secondary_indices)
+            index.recalculateWithNewColumns(new_metadata.columns, getContext());
+    }
+
+    if (!metadata_diff.ttl_table_changed && new_metadata.table_ttl.definition_ast != nullptr)
+        new_metadata.table_ttl = TTLTableDescription::getTTLForTableFromAST(
+            new_metadata.table_ttl.definition_ast, new_metadata.columns, getContext(), new_metadata.primary_key);
+
     /// Even if the primary/sorting/partition keys didn't change we must reinitialize it
     /// because primary/partition key column types might have changed.
     checkTTLExpressions(new_metadata, old_metadata);
     setProperties(new_metadata, old_metadata);
 
     auto table_id = getStorageID();
-    DatabaseCatalog::instance().getDatabase(table_id.database_name)->alterTable(global_context, table_id, new_metadata);
+    DatabaseCatalog::instance().getDatabase(table_id.database_name)->alterTable(getContext(), table_id, new_metadata);
 }
 
 
@@ -1305,6 +1355,48 @@ String StorageReplicatedMergeTree::getChecksumsForZooKeeper(const MergeTreeDataP
         getSettings()->use_minimalistic_checksums_in_zookeeper);
 }
 
+MergeTreeData::MutableDataPartPtr StorageReplicatedMergeTree::attachPartHelperFoundValidPart(const LogEntry& entry) const
+{
+    const MergeTreePartInfo actual_part_info = MergeTreePartInfo::fromPartName(entry.new_part_name, format_version);
+    const String part_new_name = actual_part_info.getPartName();
+
+    for (const DiskPtr & disk : getStoragePolicy()->getDisks())
+        for (const auto it = disk->iterateDirectory(relative_data_path + "detached/"); it->isValid(); it->next())
+        {
+            MergeTreePartInfo part_info;
+
+            if (!MergeTreePartInfo::tryParsePartName(it->name(), &part_info, format_version) ||
+                part_info.partition_id != actual_part_info.partition_id)
+                continue;
+
+            const String part_old_name = part_info.getPartName();
+            const String part_path = "detached/" + part_old_name;
+
+            const VolumePtr volume = std::make_shared<SingleDiskVolume>("volume_" + part_old_name, disk);
+
+            /// actual_part_info is more recent than part_info so we use it
+            MergeTreeData::MutableDataPartPtr part = createPart(part_new_name, actual_part_info, volume, part_path);
+
+            try
+            {
+                part->loadColumnsChecksumsIndexes(true, true);
+            }
+            catch (const Exception&)
+            {
+                /// This method throws if the part data is corrupted or partly missing. In this case, we simply don't
+                /// process the part.
+                continue;
+            }
+
+            if (entry.part_checksum == part->checksums.getTotalChecksumHex())
+            {
+                part->modification_time = disk->getLastModified(part->getFullRelativePath()).epochTime();
+                return part;
+            }
+        }
+
+    return {};
+}
 
 bool StorageReplicatedMergeTree::executeLogEntry(LogEntry & entry)
 {
@@ -1320,32 +1412,54 @@ bool StorageReplicatedMergeTree::executeLogEntry(LogEntry & entry)
         return true;
     }
 
-    if (entry.type == LogEntry::GET_PART ||
-        entry.type == LogEntry::MERGE_PARTS ||
-        entry.type == LogEntry::MUTATE_PART)
+    const bool is_get_or_attach = entry.type == LogEntry::GET_PART || entry.type == LogEntry::ATTACH_PART;
+
+    if (is_get_or_attach || entry.type == LogEntry::MERGE_PARTS || entry.type == LogEntry::MUTATE_PART)
     {
         /// If we already have this part or a part covering it, we do not need to do anything.
         /// The part may be still in the PreCommitted -> Committed transition so we first search
         /// among PreCommitted parts to definitely find the desired part if it exists.
         DataPartPtr existing_part = getPartIfExists(entry.new_part_name, {MergeTreeDataPartState::PreCommitted});
+
         if (!existing_part)
             existing_part = getActiveContainingPart(entry.new_part_name);
 
-        /// Even if the part is locally, it (in exceptional cases) may not be in ZooKeeper. Let's check that it is there.
+        /// Even if the part is local, it (in exceptional cases) may not be in ZooKeeper. Let's check that it is there.
         if (existing_part && getZooKeeper()->exists(replica_path + "/parts/" + existing_part->name))
         {
-            if (!(entry.type == LogEntry::GET_PART && entry.source_replica == replica_name))
-            {
-                LOG_DEBUG(log, "Skipping action for part {} because part {} already exists.", entry.new_part_name, existing_part->name);
-            }
+            if (!is_get_or_attach || entry.source_replica != replica_name)
+                LOG_DEBUG(log, "Skipping action for part {} because part {} already exists.",
+                    entry.new_part_name, existing_part->name);
+
             return true;
         }
     }
 
-    if (entry.type == LogEntry::GET_PART && entry.source_replica == replica_name)
+    if (entry.type == LogEntry::ATTACH_PART)
+    {
+        if (MutableDataPartPtr part = attachPartHelperFoundValidPart(entry); part)
+        {
+            LOG_TRACE(log, "Found valid part to attach from local data, preparing the transaction");
+
+            Transaction transaction(*this);
+
+            renameTempPartAndReplace(part, nullptr, &transaction);
+            checkPartChecksumsAndCommit(transaction, part);
+
+            writePartLog(PartLogElement::Type::NEW_PART, {}, 0 /** log entry is fake so we don't measure the time */,
+                part->name, part, {} /** log entry is fake so there are no initial parts */, nullptr);
+
+            return true;
+        }
+
+        LOG_TRACE(log, "Didn't find part with the correct checksums, will fetch it from other replica");
+    }
+
+    if (is_get_or_attach && entry.source_replica == replica_name)
         LOG_WARNING(log, "Part {} from own log doesn't exist.", entry.new_part_name);
 
-    /// Perhaps we don't need this part, because during write with quorum, the quorum has failed (see below about `/quorum/failed_parts`).
+    /// Perhaps we don't need this part, because during write with quorum, the quorum has failed
+    /// (see below about `/quorum/failed_parts`).
     if (entry.quorum && getZooKeeper()->exists(zookeeper_path + "/quorum/failed_parts/" + entry.new_part_name))
     {
         LOG_DEBUG(log, "Skipping action for part {} because quorum for that part was failed.", entry.new_part_name);
@@ -1353,28 +1467,28 @@ bool StorageReplicatedMergeTree::executeLogEntry(LogEntry & entry)
     }
 
     bool do_fetch = false;
-    if (entry.type == LogEntry::GET_PART)
+
+    switch (entry.type)
     {
-        do_fetch = true;
-    }
-    else if (entry.type == LogEntry::MERGE_PARTS)
-    {
-        /// Sometimes it's better to fetch merged part instead of merge
-        /// For example when we don't have all source parts for merge
-        do_fetch = !tryExecuteMerge(entry);
-    }
-    else if (entry.type == LogEntry::MUTATE_PART)
-    {
-        /// Sometimes it's better to fetch mutated part instead of merge
-        do_fetch = !tryExecutePartMutation(entry);
-    }
-    else if (entry.type == LogEntry::ALTER_METADATA)
-    {
-        return executeMetadataAlter(entry);
-    }
-    else
-    {
-        throw Exception("Unexpected log entry type: " + toString(static_cast<int>(entry.type)), ErrorCodes::LOGICAL_ERROR);
+        case LogEntry::ATTACH_PART:
+            /// We surely don't have this part locally as we've checked it before, so download it.
+            [[fallthrough]];
+        case LogEntry::GET_PART:
+            do_fetch = true;
+            break;
+        case LogEntry::MERGE_PARTS:
+            /// Sometimes it's better to fetch the merged part instead of merging,
+            /// e.g when we don't have all the source parts.
+            do_fetch = !tryExecuteMerge(entry);
+            break;
+        case LogEntry::MUTATE_PART:
+            /// Sometimes it's better to fetch mutated part instead of merging.
+            do_fetch = !tryExecutePartMutation(entry);
+            break;
+        case LogEntry::ALTER_METADATA:
+            return executeMetadataAlter(entry);
+        default:
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected log entry type: {}", static_cast<int>(entry.type));
     }
 
     if (do_fetch)
@@ -1385,7 +1499,8 @@ bool StorageReplicatedMergeTree::executeLogEntry(LogEntry & entry)
 
 bool StorageReplicatedMergeTree::tryExecuteMerge(const LogEntry & entry)
 {
-    LOG_TRACE(log, "Executing log entry to merge parts {} to {}", boost::algorithm::join(entry.source_parts, ", "), entry.new_part_name);
+    LOG_TRACE(log, "Executing log entry to merge parts {} to {}",
+        fmt::join(entry.source_parts, ", "), entry.new_part_name);
 
     const auto storage_settings_ptr = getSettings();
 
@@ -1401,29 +1516,38 @@ bool StorageReplicatedMergeTree::tryExecuteMerge(const LogEntry & entry)
     {
         LOG_INFO(log, "Will try to fetch part {} until '{}' because this part assigned to recompression merge. "
             "Source replica {} will try to merge this part first", entry.new_part_name,
-            LocalDateTime(entry.create_time + storage_settings_ptr->try_fetch_recompressed_part_timeout.totalSeconds()), entry.source_replica);
+            DateLUT::instance().timeToString(entry.create_time + storage_settings_ptr->try_fetch_recompressed_part_timeout.totalSeconds()), entry.source_replica);
         return false;
     }
 
     /// In some use cases merging can be more expensive than fetching
     /// and it may be better to spread merges tasks across the replicas
     /// instead of doing exactly the same merge cluster-wise
+    std::optional<String> replica_to_execute_merge;
+    bool replica_to_execute_merge_picked = false;
+
     if (merge_strategy_picker.shouldMergeOnSingleReplica(entry))
     {
-        auto replica_to_execute_merge = merge_strategy_picker.pickReplicaToExecuteMerge(entry);
+        replica_to_execute_merge = merge_strategy_picker.pickReplicaToExecuteMerge(entry);
+        replica_to_execute_merge_picked = true;
 
         if (replica_to_execute_merge)
         {
-            LOG_DEBUG(log, "Prefer fetching part {} from replica {} due execute_merges_on_single_replica_time_threshold", entry.new_part_name, replica_to_execute_merge.value());
+            LOG_DEBUG(log,
+                "Prefer fetching part {} from replica {} due to execute_merges_on_single_replica_time_threshold",
+                entry.new_part_name, replica_to_execute_merge.value());
+
             return false;
         }
     }
 
     DataPartsVector parts;
     bool have_all_parts = true;
+
     for (const String & name : entry.source_parts)
     {
         DataPartPtr part = getActiveContainingPart(name);
+
         if (!part)
         {
             have_all_parts = false;
@@ -1478,26 +1602,60 @@ bool StorageReplicatedMergeTree::tryExecuteMerge(const LogEntry & entry)
     auto table_lock = lockForShare(RWLockImpl::NO_QUERY, storage_settings_ptr->lock_acquire_timeout_for_background_operations);
 
     StorageMetadataPtr metadata_snapshot = getInMemoryMetadataPtr();
-    ReservationPtr reserved_space = reserveSpacePreferringTTLRules(
-        metadata_snapshot, estimated_space_for_merge, ttl_infos, time(nullptr), max_volume_index);
-
     FutureMergedMutatedPart future_merged_part(parts, entry.new_part_type);
     if (future_merged_part.name != entry.new_part_name)
     {
         throw Exception("Future merged part name " + backQuote(future_merged_part.name) + " differs from part name in log entry: "
             + backQuote(entry.new_part_name), ErrorCodes::BAD_DATA_PART_NAME);
     }
+
+    std::optional<CurrentlySubmergingEmergingTagger> tagger;
+    ReservationPtr reserved_space = balancedReservation(
+        metadata_snapshot,
+        estimated_space_for_merge,
+        max_volume_index,
+        future_merged_part.name,
+        future_merged_part.part_info,
+        future_merged_part.parts,
+        &tagger,
+        &ttl_infos);
+
+    if (!reserved_space)
+        reserved_space
+            = reserveSpacePreferringTTLRules(metadata_snapshot, estimated_space_for_merge, ttl_infos, time(nullptr), max_volume_index);
+
     future_merged_part.uuid = entry.new_part_uuid;
     future_merged_part.updatePath(*this, reserved_space);
     future_merged_part.merge_type = entry.merge_type;
 
+    if (storage_settings_ptr->allow_s3_zero_copy_replication)
+    {
+        if (auto disk = reserved_space->getDisk(); disk->getType() == DB::DiskType::Type::S3)
+        {
+            if (merge_strategy_picker.shouldMergeOnSingleReplicaS3Shared(entry))
+            {
+                if (!replica_to_execute_merge_picked)
+                    replica_to_execute_merge = merge_strategy_picker.pickReplicaToExecuteMerge(entry);
+
+                if (replica_to_execute_merge)
+                {
+                    LOG_DEBUG(log,
+                        "Prefer fetching part {} from replica {} due s3_execute_merges_on_single_replica_time_threshold",
+                        entry.new_part_name, replica_to_execute_merge.value());
+                    return false;
+                }
+            }
+        }
+    }
+
     /// Account TTL merge
     if (isTTLMergeType(future_merged_part.merge_type))
-        global_context.getMergeList().bookMergeWithTTL();
+        getContext()->getMergeList().bookMergeWithTTL();
 
     auto table_id = getStorageID();
+
     /// Add merge to list
-    MergeList::EntryPtr merge_entry = global_context.getMergeList().insert(table_id.database_name, table_id.table_name, future_merged_part);
+    MergeList::EntryPtr merge_entry = getContext()->getMergeList().insert(table_id.database_name, table_id.table_name, future_merged_part);
 
     Transaction transaction(*this);
     MutableDataPartPtr part;
@@ -1515,7 +1673,7 @@ bool StorageReplicatedMergeTree::tryExecuteMerge(const LogEntry & entry)
     {
         part = merger_mutator.mergePartsToTemporaryPart(
             future_merged_part, metadata_snapshot, *merge_entry,
-            table_lock, entry.create_time, global_context, reserved_space, entry.deduplicate, entry.deduplicate_by_columns);
+            table_lock, entry.create_time, getContext(), reserved_space, entry.deduplicate, entry.deduplicate_by_columns);
 
         merger_mutator.renameMergedTemporaryPart(part, parts, &transaction);
 
@@ -1531,7 +1689,16 @@ bool StorageReplicatedMergeTree::tryExecuteMerge(const LogEntry & entry)
 
                 ProfileEvents::increment(ProfileEvents::DataAfterMergeDiffersFromReplica);
 
-                LOG_ERROR(log, "{}. Data after merge is not byte-identical to data on another replicas. There could be several reasons: 1. Using newer version of compression library after server update. 2. Using another compression method. 3. Non-deterministic compression algorithm (highly unlikely). 4. Non-deterministic merge algorithm due to logical error in code. 5. Data corruption in memory due to bug in code. 6. Data corruption in memory due to hardware issue. 7. Manual modification of source data after server startup. 8. Manual modification of checksums stored in ZooKeeper. 9. Part format related settings like 'enable_mixed_granularity_parts' are different on different replicas. We will download merged part from replica to force byte-identical result.", getCurrentExceptionMessage(false));
+                LOG_ERROR(log,
+                    "{}. Data after merge is not byte-identical to data on another replicas. There could be several"
+                    " reasons: 1. Using newer version of compression library after server update. 2. Using another"
+                    " compression method. 3. Non-deterministic compression algorithm (highly unlikely). 4."
+                    " Non-deterministic merge algorithm due to logical error in code. 5. Data corruption in memory due"
+                    " to bug in code. 6. Data corruption in memory due to hardware issue. 7. Manual modification of"
+                    " source data after server startup. 8. Manual modification of checksums stored in ZooKeeper. 9."
+                    " Part format related settings like 'enable_mixed_granularity_parts' are different on different"
+                    " replicas. We will download merged part from replica to force byte-identical result.",
+                    getCurrentExceptionMessage(false));
 
                 write_part_log(ExecutionStatus::fromCurrentException());
 
@@ -1580,9 +1747,10 @@ bool StorageReplicatedMergeTree::tryExecutePartMutation(const StorageReplicatedM
 
     if (source_part->name != source_part_name)
     {
-        throw Exception("Part " + source_part_name + " is covered by " + source_part->name
-            + " but should be mutated to " + entry.new_part_name + ". This is a bug.",
-            ErrorCodes::LOGICAL_ERROR);
+        LOG_WARNING(log, "Part " + source_part_name + " is covered by " + source_part->name
+                    + " but should be mutated to " + entry.new_part_name + ". "
+                    + "Possibly the mutation of this part is not needed and will be skipped. This shouldn't happen often.");
+        return false;
     }
 
     /// TODO - some better heuristic?
@@ -1625,7 +1793,7 @@ bool StorageReplicatedMergeTree::tryExecutePartMutation(const StorageReplicatedM
     future_mutated_part.type = source_part->getType();
 
     auto table_id = getStorageID();
-    MergeList::EntryPtr merge_entry = global_context.getMergeList().insert(
+    MergeList::EntryPtr merge_entry = getContext()->getMergeList().insert(
         table_id.database_name, table_id.table_name, future_mutated_part);
 
     Stopwatch stopwatch;
@@ -1641,7 +1809,7 @@ bool StorageReplicatedMergeTree::tryExecutePartMutation(const StorageReplicatedM
     {
         new_part = merger_mutator.mutatePartToTemporaryPart(
             future_mutated_part, metadata_snapshot, commands, *merge_entry,
-            entry.create_time, global_context, reserved_space, table_lock);
+            entry.create_time, getContext(), reserved_space, table_lock);
         renameTempPartAndReplace(new_part, nullptr, &transaction);
 
         try
@@ -1694,22 +1862,18 @@ bool StorageReplicatedMergeTree::executeFetch(LogEntry & entry)
     const auto storage_settings_ptr = getSettings();
     auto metadata_snapshot = getInMemoryMetadataPtr();
 
-    static std::atomic_uint total_fetches {0};
-    if (storage_settings_ptr->replicated_max_parallel_fetches && total_fetches >= storage_settings_ptr->replicated_max_parallel_fetches)
-    {
-        throw Exception("Too many total fetches from replicas, maximum: " + storage_settings_ptr->replicated_max_parallel_fetches.toString(),
-            ErrorCodes::TOO_MANY_FETCHES);
-    }
+    if (storage_settings_ptr->replicated_max_parallel_fetches &&
+        total_fetches >= storage_settings_ptr->replicated_max_parallel_fetches)
+        throw Exception(ErrorCodes::TOO_MANY_FETCHES, "Too many total fetches from replicas, maximum: {} ",
+            storage_settings_ptr->replicated_max_parallel_fetches.toString());
 
     ++total_fetches;
     SCOPE_EXIT({--total_fetches;});
 
     if (storage_settings_ptr->replicated_max_parallel_fetches_for_table
         && current_table_fetches >= storage_settings_ptr->replicated_max_parallel_fetches_for_table)
-    {
-        throw Exception("Too many fetches from replicas for table, maximum: " + storage_settings_ptr->replicated_max_parallel_fetches_for_table.toString(),
-            ErrorCodes::TOO_MANY_FETCHES);
-    }
+        throw Exception(ErrorCodes::TOO_MANY_FETCHES, "Too many fetches from replicas for table, maximum: {}",
+            storage_settings_ptr->replicated_max_parallel_fetches_for_table.toString());
 
     ++current_table_fetches;
     SCOPE_EXIT({--current_table_fetches;});
@@ -1882,6 +2046,57 @@ bool StorageReplicatedMergeTree::executeFetch(LogEntry & entry)
 }
 
 
+bool StorageReplicatedMergeTree::executeFetchShared(
+    const String & source_replica,
+    const String & new_part_name,
+    const DiskPtr & disk,
+    const String & path)
+{
+    if (source_replica.empty())
+    {
+        LOG_INFO(log, "No active replica has part {} on S3.", new_part_name);
+        return false;
+    }
+
+    const auto storage_settings_ptr = getSettings();
+    auto metadata_snapshot = getInMemoryMetadataPtr();
+
+    if (storage_settings_ptr->replicated_max_parallel_fetches && total_fetches >= storage_settings_ptr->replicated_max_parallel_fetches)
+    {
+        throw Exception("Too many total fetches from replicas, maximum: " + storage_settings_ptr->replicated_max_parallel_fetches.toString(),
+            ErrorCodes::TOO_MANY_FETCHES);
+    }
+
+    ++total_fetches;
+    SCOPE_EXIT({--total_fetches;});
+
+    if (storage_settings_ptr->replicated_max_parallel_fetches_for_table
+        && current_table_fetches >= storage_settings_ptr->replicated_max_parallel_fetches_for_table)
+    {
+        throw Exception("Too many fetches from replicas for table, maximum: " + storage_settings_ptr->replicated_max_parallel_fetches_for_table.toString(),
+            ErrorCodes::TOO_MANY_FETCHES);
+    }
+
+    ++current_table_fetches;
+    SCOPE_EXIT({--current_table_fetches;});
+
+    try
+    {
+        if (!fetchExistsPart(new_part_name, metadata_snapshot, zookeeper_path + "/replicas/" + source_replica, disk, path))
+            return false;
+    }
+    catch (Exception & e)
+    {
+        if (e.code() == ErrorCodes::RECEIVED_ERROR_TOO_MANY_REQUESTS)
+            e.addMessage("Too busy replica. Will try later.");
+        tryLogCurrentException(log, __PRETTY_FUNCTION__);
+        throw;
+    }
+
+    return true;
+}
+
+
 void StorageReplicatedMergeTree::executeDropRange(const LogEntry & entry)
 {
     auto drop_range_info = MergeTreePartInfo::fromPartName(entry.new_part_name, format_version);
@@ -1944,12 +2159,20 @@ bool StorageReplicatedMergeTree::executeReplaceRange(const LogEntry & entry)
 
     struct PartDescription
     {
-        PartDescription(size_t index_, const String & src_part_name_, const String & new_part_name_, const String & checksum_hex_,
-                        MergeTreeDataFormatVersion format_version)
-            : index(index_),
-            src_part_name(src_part_name_), src_part_info(MergeTreePartInfo::fromPartName(src_part_name_, format_version)),
-            new_part_name(new_part_name_), new_part_info(MergeTreePartInfo::fromPartName(new_part_name_, format_version)),
-            checksum_hex(checksum_hex_) {}
+        PartDescription(
+            size_t index_,
+            const String & src_part_name_,
+            const String & new_part_name_,
+            const String & checksum_hex_,
+            MergeTreeDataFormatVersion format_version)
+            : index(index_)
+            , src_part_name(src_part_name_)
+            , src_part_info(MergeTreePartInfo::fromPartName(src_part_name_, format_version))
+            , new_part_name(new_part_name_)
+            , new_part_info(MergeTreePartInfo::fromPartName(new_part_name_, format_version))
+            , checksum_hex(checksum_hex_)
+        {
+        }
 
         size_t index; // in log entry arrays
         String src_part_name;
@@ -2024,7 +2247,7 @@ bool StorageReplicatedMergeTree::executeReplaceRange(const LogEntry & entry)
 
     auto clone_data_parts_from_source_table = [&] () -> size_t
     {
-        source_table = DatabaseCatalog::instance().tryGetTable(source_table_id, global_context);
+        source_table = DatabaseCatalog::instance().tryGetTable(source_table_id, getContext());
         if (!source_table)
         {
             LOG_DEBUG(log, "Can't use {} as source table for REPLACE PARTITION command. It does not exist.", source_table_id.getNameForLogs());
@@ -2180,16 +2403,17 @@ bool StorageReplicatedMergeTree::executeReplaceRange(const LogEntry & entry)
         {
             String source_replica_path = zookeeper_path + "/replicas/" + part_desc->replica;
             ReplicatedMergeTreeAddress address(getZooKeeper()->get(source_replica_path + "/host"));
-            auto timeouts = ConnectionTimeouts::getHTTPTimeouts(global_context);
-            auto [user, password] = global_context.getInterserverCredentials();
-            String interserver_scheme = global_context.getInterserverScheme();
+            auto timeouts = getFetchPartHTTPTimeouts(getContext());
+
+            auto credentials = getContext()->getInterserverCredentials();
+            String interserver_scheme = getContext()->getInterserverScheme();
 
             if (interserver_scheme != address.scheme)
                 throw Exception("Interserver schemas are different '" + interserver_scheme + "' != '" + address.scheme + "', can't fetch part from " + address.host, ErrorCodes::LOGICAL_ERROR);
 
             part_desc->res_part = fetcher.fetchPart(
                 metadata_snapshot, part_desc->found_new_part_name, source_replica_path,
-                address.host, address.replication_port, timeouts, user, password, interserver_scheme, false, TMP_PREFIX + "fetch_");
+                address.host, address.replication_port, timeouts, credentials->getUser(), credentials->getPassword(), interserver_scheme, false, TMP_PREFIX + "fetch_");
 
             /// TODO: check columns_version of fetched part
 
@@ -2238,11 +2462,11 @@ bool StorageReplicatedMergeTree::executeReplaceRange(const LogEntry & entry)
                 parts_to_remove = removePartsInRangeFromWorkingSet(drop_range, true, false, data_parts_lock);
         }
 
-        PartLog::addNewParts(global_context, res_parts, watch.elapsed());
+        PartLog::addNewParts(getContext(), res_parts, watch.elapsed());
     }
     catch (...)
     {
-        PartLog::addNewParts(global_context, res_parts, watch.elapsed(), ExecutionStatus::fromCurrentException());
+        PartLog::addNewParts(getContext(), res_parts, watch.elapsed(), ExecutionStatus::fromCurrentException());
         throw;
     }
 
@@ -3077,7 +3301,7 @@ void StorageReplicatedMergeTree::enterLeaderElection()
     try
     {
         leader_election = std::make_shared<zkutil::LeaderElection>(
-            global_context.getSchedulePool(),
+            getContext()->getSchedulePool(),
             zookeeper_path + "/leader_election",
             *current_zookeeper,    /// current_zookeeper lives for the lifetime of leader_election,
                                    ///  since before changing `current_zookeeper`, `leader_election` object is destroyed in `partialShutdown` method.
@@ -3113,6 +3337,23 @@ void StorageReplicatedMergeTree::exitLeaderElection()
     leader_election = nullptr;
 }
 
+ConnectionTimeouts StorageReplicatedMergeTree::getFetchPartHTTPTimeouts(ContextPtr local_context)
+{
+    auto timeouts = ConnectionTimeouts::getHTTPTimeouts(local_context);
+    auto settings = getSettings();
+
+    if (settings->replicated_fetches_http_connection_timeout.changed)
+        timeouts.connection_timeout = settings->replicated_fetches_http_connection_timeout;
+
+    if (settings->replicated_fetches_http_send_timeout.changed)
+        timeouts.send_timeout = settings->replicated_fetches_http_send_timeout;
+
+    if (settings->replicated_fetches_http_receive_timeout.changed)
+        timeouts.receive_timeout = settings->replicated_fetches_http_receive_timeout;
+
+    return timeouts;
+}
+
 bool StorageReplicatedMergeTree::checkReplicaHavePart(const String & replica, const String & part_name)
 {
     auto zookeeper = getZooKeeper();
@@ -3127,12 +3368,16 @@ String StorageReplicatedMergeTree::findReplicaHavingPart(const String & part_nam
     /// Select replicas in uniformly random order.
     std::shuffle(replicas.begin(), replicas.end(), thread_local_rng);
 
+    LOG_TRACE(log, "Candidate replicas: {}", replicas.size());
+
     for (const String & replica : replicas)
     {
-        /// We don't interested in ourself.
+        /// We aren't interested in ourself.
         if (replica == replica_name)
             continue;
 
+        LOG_TRACE(log, "Candidate replica: {}", replica);
+
         if (checkReplicaHavePart(replica, part_name) &&
             (!active || zookeeper->exists(zookeeper_path + "/replicas/" + replica + "/is_active")))
             return replica;
@@ -3143,7 +3388,6 @@ String StorageReplicatedMergeTree::findReplicaHavingPart(const String & part_nam
     return {};
 }
 
-
 String StorageReplicatedMergeTree::findReplicaHavingCoveringPart(LogEntry & entry, bool active)
 {
     auto zookeeper = getZooKeeper();
@@ -3405,6 +3649,7 @@ bool StorageReplicatedMergeTree::partIsInsertingWithParallelQuorum(const MergeTr
     return zookeeper->exists(zookeeper_path + "/quorum/parallel/" + part_info.getPartName());
 }
 
+
 bool StorageReplicatedMergeTree::partIsLastQuorumPart(const MergeTreePartInfo & part_info) const
 {
     auto zookeeper = getZooKeeper();
@@ -3426,6 +3671,7 @@ bool StorageReplicatedMergeTree::partIsLastQuorumPart(const MergeTreePartInfo &
     return partition_it->second == part_info.getPartName();
 }
 
+
 bool StorageReplicatedMergeTree::fetchPart(const String & part_name, const StorageMetadataPtr & metadata_snapshot,
     const String & source_replica_path, bool to_detached, size_t quorum, zkutil::ZooKeeper::Ptr zookeeper_)
 {
@@ -3452,7 +3698,7 @@ bool StorageReplicatedMergeTree::fetchPart(const String & part_name, const Stora
         }
     }
 
-    SCOPE_EXIT
+    SCOPE_EXIT_MEMORY
     ({
         std::lock_guard lock(currently_fetching_parts_mutex);
         currently_fetching_parts.erase(part_name);
@@ -3511,7 +3757,13 @@ bool StorageReplicatedMergeTree::fetchPart(const String & part_name, const Stora
 
     }
 
+    ReplicatedMergeTreeAddress address;
+    ConnectionTimeouts timeouts;
+    String interserver_scheme;
+    InterserverCredentialsPtr credentials;
+    std::optional<CurrentlySubmergingEmergingTagger> tagger_ptr;
     std::function<MutableDataPartPtr()> get_part;
+
     if (part_to_clone)
     {
         get_part = [&, part_to_clone]()
@@ -3521,12 +3773,13 @@ bool StorageReplicatedMergeTree::fetchPart(const String & part_name, const Stora
     }
     else
     {
-        ReplicatedMergeTreeAddress address(zookeeper->get(source_replica_path + "/host"));
-        auto timeouts = ConnectionTimeouts::getHTTPTimeouts(global_context);
-        auto user_password = global_context.getInterserverCredentials();
-        String interserver_scheme = global_context.getInterserverScheme();
+        address.fromString(zookeeper->get(source_replica_path + "/host"));
+        timeouts = getFetchPartHTTPTimeouts(getContext());
 
-        get_part = [&, address, timeouts, user_password, interserver_scheme]()
+        credentials = getContext()->getInterserverCredentials();
+        interserver_scheme = getContext()->getInterserverScheme();
+
+        get_part = [&, address, timeouts, credentials, interserver_scheme]()
         {
             if (interserver_scheme != address.scheme)
                 throw Exception("Interserver schemes are different: '" + interserver_scheme
@@ -3534,9 +3787,19 @@ bool StorageReplicatedMergeTree::fetchPart(const String & part_name, const Stora
                     ErrorCodes::INTERSERVER_SCHEME_DOESNT_MATCH);
 
             return fetcher.fetchPart(
-                metadata_snapshot, part_name, source_replica_path,
-                address.host, address.replication_port,
-                timeouts, user_password.first, user_password.second, interserver_scheme, to_detached);
+                metadata_snapshot,
+                part_name,
+                source_replica_path,
+                address.host,
+                address.replication_port,
+                timeouts,
+                credentials->getUser(),
+                credentials->getPassword(),
+                interserver_scheme,
+                to_detached,
+                "",
+                &tagger_ptr,
+                true);
         };
     }
 
@@ -3549,11 +3812,6 @@ bool StorageReplicatedMergeTree::fetchPart(const String & part_name, const Stora
             Transaction transaction(*this);
             renameTempPartAndReplace(part, nullptr, &transaction);
 
-            /** NOTE
-              * Here, an error occurs if ALTER occurred with a change in the column type or column deletion,
-              *  and the part on remote server has not yet been modified.
-              * After a while, one of the following attempts to make `fetchPart` succeed.
-              */
             replaced_parts = checkPartChecksumsAndCommit(transaction, part);
 
             /** If a quorum is tracked for this part, you must update it.
@@ -3625,6 +3883,104 @@ bool StorageReplicatedMergeTree::fetchPart(const String & part_name, const Stora
 }
 
 
+bool StorageReplicatedMergeTree::fetchExistsPart(const String & part_name, const StorageMetadataPtr & metadata_snapshot,
+    const String & source_replica_path, DiskPtr replaced_disk, String replaced_part_path)
+{
+    auto zookeeper = getZooKeeper();
+    const auto part_info = MergeTreePartInfo::fromPartName(part_name, format_version);
+
+    if (auto part = getPartIfExists(part_info, {IMergeTreeDataPart::State::Outdated, IMergeTreeDataPart::State::Deleting}))
+    {
+        LOG_DEBUG(log, "Part {} should be deleted after previous attempt before fetch", part->name);
+        /// Force immediate parts cleanup to delete the part that was left from the previous fetch attempt.
+        cleanup_thread.wakeup();
+        return false;
+    }
+
+    {
+        std::lock_guard lock(currently_fetching_parts_mutex);
+        if (!currently_fetching_parts.insert(part_name).second)
+        {
+            LOG_DEBUG(log, "Part {} is already fetching right now", part_name);
+            return false;
+        }
+    }
+
+    SCOPE_EXIT_MEMORY
+    ({
+        std::lock_guard lock(currently_fetching_parts_mutex);
+        currently_fetching_parts.erase(part_name);
+    });
+
+    LOG_DEBUG(log, "Fetching part {} from {}", part_name, source_replica_path);
+
+    TableLockHolder table_lock_holder = lockForShare(RWLockImpl::NO_QUERY, getSettings()->lock_acquire_timeout_for_background_operations);
+
+    /// Logging
+    Stopwatch stopwatch;
+    MutableDataPartPtr part;
+    DataPartsVector replaced_parts;
+
+    auto write_part_log = [&] (const ExecutionStatus & execution_status)
+    {
+        writePartLog(
+            PartLogElement::DOWNLOAD_PART, execution_status, stopwatch.elapsed(),
+            part_name, part, replaced_parts, nullptr);
+    };
+
+    std::function<MutableDataPartPtr()> get_part;
+
+    ReplicatedMergeTreeAddress address(zookeeper->get(source_replica_path + "/host"));
+    auto timeouts = ConnectionTimeouts::getHTTPTimeouts(getContext());
+    auto credentials = getContext()->getInterserverCredentials();
+    String interserver_scheme = getContext()->getInterserverScheme();
+
+    get_part = [&, address, timeouts, interserver_scheme, credentials]()
+    {
+        if (interserver_scheme != address.scheme)
+            throw Exception("Interserver schemes are different: '" + interserver_scheme
+                + "' != '" + address.scheme + "', can't fetch part from " + address.host,
+                ErrorCodes::INTERSERVER_SCHEME_DOESNT_MATCH);
+
+        return fetcher.fetchPart(
+            metadata_snapshot, part_name, source_replica_path,
+            address.host, address.replication_port,
+            timeouts, credentials->getUser(), credentials->getPassword(), interserver_scheme, false, "", nullptr, true,
+            replaced_disk);
+    };
+
+    try
+    {
+        part = get_part();
+
+        if (part->volume->getDisk()->getName() != replaced_disk->getName())
+            throw Exception("Part " + part->name + " fetched on wrong disk " + part->volume->getDisk()->getName(), ErrorCodes::LOGICAL_ERROR);
+        replaced_disk->removeFileIfExists(replaced_part_path);
+        replaced_disk->moveDirectory(part->getFullRelativePath(), replaced_part_path);
+    }
+    catch (const Exception & e)
+    {
+        /// The same part is being written right now (but probably it's not committed yet).
+        /// We will check the need for fetch later.
+        if (e.code() == ErrorCodes::DIRECTORY_ALREADY_EXISTS)
+            return false;
+
+        throw;
+    }
+    catch (...)
+    {
+        write_part_log(ExecutionStatus::fromCurrentException());
+        throw;
+    }
+
+    ProfileEvents::increment(ProfileEvents::ReplicatedPartFetches);
+
+    LOG_DEBUG(log, "Fetched part {} from {}", part_name, source_replica_path);
+
+    return true;
+}
+
+
 void StorageReplicatedMergeTree::startup()
 {
     if (is_readonly)
@@ -3637,7 +3993,7 @@ void StorageReplicatedMergeTree::startup()
         InterserverIOEndpointPtr data_parts_exchange_ptr = std::make_shared<DataPartsExchange::Service>(*this);
         [[maybe_unused]] auto prev_ptr = std::atomic_exchange(&data_parts_exchange_endpoint, data_parts_exchange_ptr);
         assert(prev_ptr == nullptr);
-        global_context.getInterserverIOHandler().addEndpoint(data_parts_exchange_ptr->getId(replica_path), data_parts_exchange_ptr);
+        getContext()->getInterserverIOHandler().addEndpoint(data_parts_exchange_ptr->getId(replica_path), data_parts_exchange_ptr);
 
         /// In this thread replica will be activated.
         restarting_thread.start();
@@ -3692,7 +4048,7 @@ void StorageReplicatedMergeTree::shutdown()
     auto data_parts_exchange_ptr = std::atomic_exchange(&data_parts_exchange_endpoint, InterserverIOEndpointPtr{});
     if (data_parts_exchange_ptr)
     {
-        global_context.getInterserverIOHandler().removeEndpointIfExists(data_parts_exchange_ptr->getId(replica_path));
+        getContext()->getInterserverIOHandler().removeEndpointIfExists(data_parts_exchange_ptr->getId(replica_path));
         /// Ask all parts exchange handlers to finish asap. New ones will fail to start
         data_parts_exchange_ptr->blocker.cancelForever();
         /// Wait for all of them
@@ -3778,7 +4134,7 @@ void StorageReplicatedMergeTree::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & query_info,
-    const Context & context,
+    ContextPtr local_context,
     QueryProcessingStage::Enum /*processed_stage*/,
     const size_t max_block_size,
     const unsigned num_streams)
@@ -3788,15 +4144,15 @@ void StorageReplicatedMergeTree::read(
     * 2. Do not read parts that have not yet been written to the quorum of the replicas.
     * For this you have to synchronously go to ZooKeeper.
     */
-    if (context.getSettingsRef().select_sequential_consistency)
+    if (local_context->getSettingsRef().select_sequential_consistency)
     {
         auto max_added_blocks = getMaxAddedBlocks();
-        if (auto plan = reader.read(column_names, metadata_snapshot, query_info, context, max_block_size, num_streams, &max_added_blocks))
+        if (auto plan = reader.read(column_names, metadata_snapshot, query_info, local_context, max_block_size, num_streams, &max_added_blocks))
             query_plan = std::move(*plan);
         return;
     }
 
-    if (auto plan = reader.read(column_names, metadata_snapshot, query_info, context, max_block_size, num_streams))
+    if (auto plan = reader.read(column_names, metadata_snapshot, query_info, local_context, max_block_size, num_streams))
         query_plan = std::move(*plan);
 }
 
@@ -3804,14 +4160,16 @@ Pipe StorageReplicatedMergeTree::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & query_info,
-    const Context & context,
+    ContextPtr local_context,
     QueryProcessingStage::Enum processed_stage,
     const size_t max_block_size,
     const unsigned num_streams)
 {
     QueryPlan plan;
-    read(plan, column_names, metadata_snapshot, query_info, context, processed_stage, max_block_size, num_streams);
-    return plan.convertToPipe();
+    read(plan, column_names, metadata_snapshot, query_info, local_context, processed_stage, max_block_size, num_streams);
+    return plan.convertToPipe(
+        QueryPlanOptimizationSettings::fromContext(local_context),
+        BuildQueryPipelineSettings::fromContext(local_context));
 }
 
 
@@ -3850,19 +4208,11 @@ std::optional<UInt64> StorageReplicatedMergeTree::totalRows(const Settings & set
     return res;
 }
 
-std::optional<UInt64> StorageReplicatedMergeTree::totalRowsByPartitionPredicate(const SelectQueryInfo & query_info, const Context & context) const
+std::optional<UInt64> StorageReplicatedMergeTree::totalRowsByPartitionPredicate(const SelectQueryInfo & query_info, ContextPtr local_context) const
 {
-    auto metadata_snapshot = getInMemoryMetadataPtr();
-    PartitionPruner partition_pruner(metadata_snapshot->getPartitionKey(), query_info, context, true /* strict */);
-    if (partition_pruner.isUseless())
-        return {};
-    size_t res = 0;
-    foreachCommittedParts([&](auto & part)
-    {
-        if (!partition_pruner.canBePruned(part))
-            res += part->rows_count;
-    }, context.getSettingsRef().select_sequential_consistency);
-    return res;
+    DataPartsVector parts;
+    foreachCommittedParts([&](auto & part) { parts.push_back(part); }, local_context->getSettingsRef().select_sequential_consistency);
+    return totalRowsByPartitionPredicateImpl(query_info, local_context, parts);
 }
 
 std::optional<UInt64> StorageReplicatedMergeTree::totalBytes(const Settings & settings) const
@@ -3880,12 +4230,12 @@ void StorageReplicatedMergeTree::assertNotReadonly() const
 }
 
 
-BlockOutputStreamPtr StorageReplicatedMergeTree::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, const Context & context)
+BlockOutputStreamPtr StorageReplicatedMergeTree::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, ContextPtr local_context)
 {
     const auto storage_settings_ptr = getSettings();
     assertNotReadonly();
 
-    const Settings & query_settings = context.getSettingsRef();
+    const Settings & query_settings = local_context->getSettingsRef();
     bool deduplicate = storage_settings_ptr->replicated_deduplication_window != 0 && query_settings.insert_deduplicate;
 
     // TODO: should we also somehow pass list of columns to deduplicate on to the ReplicatedMergeTreeBlockOutputStream ?
@@ -3895,7 +4245,7 @@ BlockOutputStreamPtr StorageReplicatedMergeTree::write(const ASTPtr & /*query*/,
         query_settings.max_partitions_per_insert_block,
         query_settings.insert_quorum_parallel,
         deduplicate,
-        context.getSettingsRef().optimize_on_insert);
+        local_context->getSettingsRef().optimize_on_insert);
 }
 
 
@@ -3906,8 +4256,12 @@ bool StorageReplicatedMergeTree::optimize(
     bool final,
     bool deduplicate,
     const Names & deduplicate_by_columns,
-    const Context & query_context)
+    ContextPtr query_context)
 {
+    /// NOTE: exclusive lock cannot be used here, since this may lead to deadlock (see comments below),
+    /// but it should be safe to use non-exclusive to avoid dropping parts that may be required for processing queue.
+    auto table_lock = lockForShare(query_context->getCurrentQueryId(), query_context->getSettingsRef().lock_acquire_timeout);
+
     assertNotReadonly();
 
     if (!is_leader)
@@ -3921,7 +4275,7 @@ bool StorageReplicatedMergeTree::optimize(
 
         auto handle_noop = [&] (const String & message)
         {
-            if (query_context.getSettingsRef().optimize_throw_if_noop)
+            if (query_context->getSettingsRef().optimize_throw_if_noop)
                 throw Exception(message, ErrorCodes::CANNOT_ASSIGN_OPTIMIZE);
             return false;
         };
@@ -3955,7 +4309,7 @@ bool StorageReplicatedMergeTree::optimize(
                         future_merged_part.uuid = UUIDHelpers::generateV4();
 
                     SelectPartsDecision select_decision = merger_mutator.selectAllPartsToMergeWithinPartition(
-                        future_merged_part, disk_space, can_merge, partition_id, true, metadata_snapshot, nullptr, query_context.getSettingsRef().optimize_skip_merged_partitions);
+                        future_merged_part, disk_space, can_merge, partition_id, true, metadata_snapshot, nullptr, query_context->getSettingsRef().optimize_skip_merged_partitions);
 
                     if (select_decision != SelectPartsDecision::SELECTED)
                         break;
@@ -4006,7 +4360,7 @@ bool StorageReplicatedMergeTree::optimize(
                     UInt64 disk_space = getStoragePolicy()->getMaxUnreservedFreeSpace();
                     String partition_id = getPartitionIDFromQuery(partition, query_context);
                     select_decision = merger_mutator.selectAllPartsToMergeWithinPartition(
-                        future_merged_part, disk_space, can_merge, partition_id, final, metadata_snapshot, &disable_reason, query_context.getSettingsRef().optimize_skip_merged_partitions);
+                        future_merged_part, disk_space, can_merge, partition_id, final, metadata_snapshot, &disable_reason, query_context->getSettingsRef().optimize_skip_merged_partitions);
                 }
 
                 /// If there is nothing to merge then we treat this merge as successful (needed for optimize final optimization)
@@ -4044,7 +4398,7 @@ bool StorageReplicatedMergeTree::optimize(
         }
     }
 
-    if (query_context.getSettingsRef().replication_alter_partitions_sync != 0)
+    if (query_context->getSettingsRef().replication_alter_partitions_sync != 0)
     {
         /// NOTE Table lock must not be held while waiting. Some combination of R-W-R locks from different threads will yield to deadlock.
         for (auto & merge_entry : merge_entries)
@@ -4089,7 +4443,7 @@ bool StorageReplicatedMergeTree::executeMetadataAlter(const StorageReplicatedMer
 
 
 std::set<String> StorageReplicatedMergeTree::getPartitionIdsAffectedByCommands(
-    const MutationCommands & commands, const Context & query_context) const
+    const MutationCommands & commands, ContextPtr query_context) const
 {
     std::set<String> affected_partition_ids;
 
@@ -4111,7 +4465,7 @@ std::set<String> StorageReplicatedMergeTree::getPartitionIdsAffectedByCommands(
 
 
 PartitionBlockNumbersHolder StorageReplicatedMergeTree::allocateBlockNumbersInAffectedPartitions(
-    const MutationCommands & commands, const Context & query_context, const zkutil::ZooKeeperPtr & zookeeper) const
+    const MutationCommands & commands, ContextPtr query_context, const zkutil::ZooKeeperPtr & zookeeper) const
 {
     const std::set<String> mutation_affected_partition_ids = getPartitionIdsAffectedByCommands(commands, query_context);
 
@@ -4143,7 +4497,7 @@ PartitionBlockNumbersHolder StorageReplicatedMergeTree::allocateBlockNumbersInAf
 
 
 void StorageReplicatedMergeTree::alter(
-    const AlterCommands & commands, const Context & query_context, TableLockHolder & table_lock_holder)
+    const AlterCommands & commands, ContextPtr query_context, TableLockHolder & table_lock_holder)
 {
     assertNotReadonly();
 
@@ -4250,7 +4604,7 @@ void StorageReplicatedMergeTree::alter(
         alter_entry->create_time = time(nullptr);
 
         auto maybe_mutation_commands = commands.getMutationCommands(
-            *current_metadata, query_context.getSettingsRef().materialize_ttl_after_modify, query_context);
+            *current_metadata, query_context->getSettingsRef().materialize_ttl_after_modify, query_context);
         alter_entry->have_mutation = !maybe_mutation_commands.empty();
 
         alter_path_idx = ops.size();
@@ -4282,7 +4636,7 @@ void StorageReplicatedMergeTree::alter(
                 zkutil::makeCreateRequest(mutations_path + "/", mutation_entry.toString(), zkutil::CreateMode::PersistentSequential));
         }
 
-        if (auto txn = query_context.getZooKeeperMetadataTransaction())
+        if (auto txn = query_context->getZooKeeperMetadataTransaction())
         {
             txn->moveOpsTo(ops);
             /// NOTE: IDatabase::alterTable(...) is called when executing ALTER_METADATA queue entry without query context,
@@ -4338,12 +4692,12 @@ void StorageReplicatedMergeTree::alter(
     table_lock_holder.reset();
 
     std::vector<String> unwaited;
-    if (query_context.getSettingsRef().replication_alter_partitions_sync == 2)
+    if (query_context->getSettingsRef().replication_alter_partitions_sync == 2)
     {
         LOG_DEBUG(log, "Updated shared metadata nodes in ZooKeeper. Waiting for replicas to apply changes.");
         unwaited = waitForAllReplicasToProcessLogEntry(*alter_entry, false);
     }
-    else if (query_context.getSettingsRef().replication_alter_partitions_sync == 1)
+    else if (query_context->getSettingsRef().replication_alter_partitions_sync == 1)
     {
         LOG_DEBUG(log, "Updated shared metadata nodes in ZooKeeper. Waiting for replicas to apply changes.");
         waitForReplicaToProcessLogEntry(replica_name, *alter_entry);
@@ -4355,7 +4709,7 @@ void StorageReplicatedMergeTree::alter(
     if (mutation_znode)
     {
         LOG_DEBUG(log, "Metadata changes applied. Will wait for data changes.");
-        waitMutation(*mutation_znode, query_context.getSettingsRef().replication_alter_partitions_sync);
+        waitMutation(*mutation_znode, query_context->getSettingsRef().replication_alter_partitions_sync);
         LOG_DEBUG(log, "Data changes applied.");
     }
 }
@@ -4369,7 +4723,7 @@ static String getPartNamePossiblyFake(MergeTreeDataFormatVersion format_version,
         /// The date range is all month long.
         const auto & lut = DateLUT::instance();
         time_t start_time = lut.YYYYMMDDToDate(parse<UInt32>(part_info.partition_id + "01"));
-        DayNum left_date = lut.toDayNum(start_time);
+        DayNum left_date = DayNum(lut.toDayNum(start_time).toUnderType());
         DayNum right_date = DayNum(static_cast<size_t>(left_date) + lut.daysInMonth(start_time) - 1);
         return part_info.getPartNameV0(left_date, right_date);
     }
@@ -4419,7 +4773,7 @@ bool StorageReplicatedMergeTree::getFakePartCoveringAllPartsInPartition(const St
 }
 
 
-void StorageReplicatedMergeTree::dropPartition(const ASTPtr & partition, bool detach, bool drop_part, const Context & query_context, bool throw_if_noop)
+void StorageReplicatedMergeTree::dropPartition(const ASTPtr & partition, bool detach, bool drop_part, ContextPtr query_context, bool throw_if_noop)
 {
     assertNotReadonly();
     if (!is_leader)
@@ -4444,9 +4798,9 @@ void StorageReplicatedMergeTree::dropPartition(const ASTPtr & partition, bool de
     if (did_drop)
     {
         /// If necessary, wait until the operation is performed on itself or on all replicas.
-        if (query_context.getSettingsRef().replication_alter_partitions_sync != 0)
+        if (query_context->getSettingsRef().replication_alter_partitions_sync != 0)
         {
-            if (query_context.getSettingsRef().replication_alter_partitions_sync == 1)
+            if (query_context->getSettingsRef().replication_alter_partitions_sync == 1)
                 waitForReplicaToProcessLogEntry(replica_name, entry);
             else
                 waitForAllReplicasToProcessLogEntry(entry);
@@ -4462,7 +4816,7 @@ void StorageReplicatedMergeTree::dropPartition(const ASTPtr & partition, bool de
 
 
 void StorageReplicatedMergeTree::truncate(
-    const ASTPtr &, const StorageMetadataPtr &, const Context & query_context, TableExclusiveLockHolder & table_lock)
+    const ASTPtr &, const StorageMetadataPtr &, ContextPtr query_context, TableExclusiveLockHolder & table_lock)
 {
     table_lock.release();   /// Truncate is done asynchronously.
 
@@ -4488,7 +4842,7 @@ PartitionCommandsResultInfo StorageReplicatedMergeTree::attachPartition(
     const ASTPtr & partition,
     const StorageMetadataPtr & metadata_snapshot,
     bool attach_part,
-    const Context & query_context)
+    ContextPtr query_context)
 {
     assertNotReadonly();
 
@@ -4496,13 +4850,20 @@ PartitionCommandsResultInfo StorageReplicatedMergeTree::attachPartition(
     PartsTemporaryRename renamed_parts(*this, "detached/");
     MutableDataPartsVector loaded_parts = tryLoadPartsToAttach(partition, attach_part, query_context, renamed_parts);
 
-    ReplicatedMergeTreeBlockOutputStream output(*this, metadata_snapshot, 0, 0, 0, false, false, false);   /// TODO Allow to use quorum here.
+    /// TODO Allow to use quorum here.
+    ReplicatedMergeTreeBlockOutputStream output(*this, metadata_snapshot, 0, 0, 0, false, false, false,
+        /*is_attach*/true);
+
     for (size_t i = 0; i < loaded_parts.size(); ++i)
     {
-        String old_name = loaded_parts[i]->name;
+        const String old_name = loaded_parts[i]->name;
+
         output.writeExistingPart(loaded_parts[i]);
+
         renamed_parts.old_and_new_names[i].first.clear();
+
         LOG_DEBUG(log, "Attached part {} as {}", old_name, loaded_parts[i]->name);
+
         results.push_back(PartitionCommandResultInfo{
             .partition_id = loaded_parts[i]->info.partition_id,
             .part_name = loaded_parts[i]->name,
@@ -4516,7 +4877,7 @@ PartitionCommandsResultInfo StorageReplicatedMergeTree::attachPartition(
 void StorageReplicatedMergeTree::checkTableCanBeDropped() const
 {
     auto table_id = getStorageID();
-    global_context.checkTableCanBeDropped(table_id.database_name, table_id.table_name, getTotalActiveSizeInBytes());
+    getContext()->checkTableCanBeDropped(table_id.database_name, table_id.table_name, getTotalActiveSizeInBytes());
 }
 
 void StorageReplicatedMergeTree::checkTableCanBeRenamed() const
@@ -4684,7 +5045,7 @@ bool StorageReplicatedMergeTree::waitForTableReplicaToProcessLogEntry(
 
     const auto & stop_waiting = [&]()
     {
-        bool stop_waiting_itself = waiting_itself && is_dropped;
+        bool stop_waiting_itself = waiting_itself && (partial_shutdown_called || is_dropped);
         bool stop_waiting_non_active = !wait_for_non_active && !getZooKeeper()->exists(table_zookeeper_path + "/replicas/" + replica + "/is_active");
         return stop_waiting_itself || stop_waiting_non_active;
     };
@@ -4991,57 +5352,71 @@ void StorageReplicatedMergeTree::getReplicaDelays(time_t & out_absolute_delay, t
     }
 }
 
-
 void StorageReplicatedMergeTree::fetchPartition(
     const ASTPtr & partition,
     const StorageMetadataPtr & metadata_snapshot,
     const String & from_,
-    const Context & query_context)
+    bool fetch_part,
+    ContextPtr query_context)
 {
     Macros::MacroExpansionInfo info;
     info.expand_special_macros_only = false;
     info.table_id = getStorageID();
     info.table_id.uuid = UUIDHelpers::Nil;
-    auto expand_from = query_context.getMacros()->expand(from_, info);
+    auto expand_from = query_context->getMacros()->expand(from_, info);
     String auxiliary_zookeeper_name = extractZooKeeperName(expand_from);
     String from = extractZooKeeperPath(expand_from);
     if (from.empty())
         throw Exception("ZooKeeper path should not be empty", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
 
-    String partition_id = getPartitionIDFromQuery(partition, query_context);
     zkutil::ZooKeeperPtr zookeeper;
     if (auxiliary_zookeeper_name != default_zookeeper_name)
-    {
-        zookeeper = global_context.getAuxiliaryZooKeeper(auxiliary_zookeeper_name);
-
-        LOG_INFO(log, "Will fetch partition {} from shard {} (auxiliary zookeeper '{}')", partition_id, from_, auxiliary_zookeeper_name);
-    }
+        zookeeper = getContext()->getAuxiliaryZooKeeper(auxiliary_zookeeper_name);
     else
-    {
         zookeeper = getZooKeeper();
 
-        LOG_INFO(log, "Will fetch partition {} from shard {}", partition_id, from_);
-    }
-
     if (from.back() == '/')
         from.resize(from.size() - 1);
 
+    if (fetch_part)
+    {
+        String part_name = partition->as<ASTLiteral &>().value.safeGet<String>();
+        auto part_path = findReplicaHavingPart(part_name, from, zookeeper);
+
+        if (part_path.empty())
+            throw Exception(ErrorCodes::NO_REPLICA_HAS_PART, "Part {} does not exist on any replica", part_name);
+        /** Let's check that there is no such part in the `detached` directory (where we will write the downloaded parts).
+          * Unreliable (there is a race condition) - such a part may appear a little later.
+          */
+        if (checkIfDetachedPartExists(part_name))
+            throw Exception(ErrorCodes::DUPLICATE_DATA_PART, "Detached part " + part_name + " already exists.");
+        LOG_INFO(log, "Will fetch part {} from shard {} (zookeeper '{}')", part_name, from_, auxiliary_zookeeper_name);
+
+        try
+        {
+            /// part name , metadata, part_path , true, 0, zookeeper
+            if (!fetchPart(part_name, metadata_snapshot, part_path, true, 0, zookeeper))
+                throw Exception(ErrorCodes::UNFINISHED, "Failed to fetch part {} from {}", part_name, from_);
+        }
+        catch (const DB::Exception & e)
+        {
+            if (e.code() != ErrorCodes::RECEIVED_ERROR_FROM_REMOTE_IO_SERVER && e.code() != ErrorCodes::RECEIVED_ERROR_TOO_MANY_REQUESTS
+                && e.code() != ErrorCodes::CANNOT_READ_ALL_DATA)
+                throw;
+
+            LOG_INFO(log, e.displayText());
+        }
+        return;
+    }
+
+    String partition_id = getPartitionIDFromQuery(partition, query_context);
+    LOG_INFO(log, "Will fetch partition {} from shard {} (zookeeper '{}')", partition_id, from_, auxiliary_zookeeper_name);
 
     /** Let's check that there is no such partition in the `detached` directory (where we will write the downloaded parts).
       * Unreliable (there is a race condition) - such a partition may appear a little later.
       */
-    Poco::DirectoryIterator dir_end;
-    for (const std::string & path : getDataPaths())
-    {
-        for (Poco::DirectoryIterator dir_it{path + "detached/"}; dir_it != dir_end; ++dir_it)
-        {
-            MergeTreePartInfo part_info;
-            if (MergeTreePartInfo::tryParsePartName(dir_it.name(), &part_info, format_version)
-                && part_info.partition_id == partition_id)
-                throw Exception("Detached partition " + partition_id + " already exists.", ErrorCodes::PARTITION_ALREADY_EXISTS);
-        }
-
-    }
+    if (checkIfDetachedPartitionExists(partition_id))
+        throw Exception("Detached partition " + partition_id + " already exists.", ErrorCodes::PARTITION_ALREADY_EXISTS);
 
     zkutil::Strings replicas;
     zkutil::Strings active_replicas;
@@ -5113,7 +5488,7 @@ void StorageReplicatedMergeTree::fetchPartition(
         if (try_no)
             LOG_INFO(log, "Some of parts ({}) are missing. Will try to fetch covering parts.", missing_parts.size());
 
-        if (try_no >= query_context.getSettings().max_fetch_partition_retries_count)
+        if (try_no >= query_context->getSettings().max_fetch_partition_retries_count)
             throw Exception("Too many retries to fetch parts from " + best_replica_path, ErrorCodes::TOO_MANY_RETRIES_TO_FETCH_PARTS);
 
         Strings parts = zookeeper->getChildren(best_replica_path + "/parts");
@@ -5178,7 +5553,7 @@ void StorageReplicatedMergeTree::fetchPartition(
 }
 
 
-void StorageReplicatedMergeTree::mutate(const MutationCommands & commands, const Context & query_context)
+void StorageReplicatedMergeTree::mutate(const MutationCommands & commands, ContextPtr query_context)
 {
     /// Overview of the mutation algorithm.
     ///
@@ -5262,7 +5637,7 @@ void StorageReplicatedMergeTree::mutate(const MutationCommands & commands, const
         requests.emplace_back(zkutil::makeCreateRequest(
             mutations_path + "/", mutation_entry.toString(), zkutil::CreateMode::PersistentSequential));
 
-        if (auto txn = query_context.getZooKeeperMetadataTransaction())
+        if (auto txn = query_context->getZooKeeperMetadataTransaction())
             txn->moveOpsTo(requests);
 
         Coordination::Responses responses;
@@ -5287,7 +5662,7 @@ void StorageReplicatedMergeTree::mutate(const MutationCommands & commands, const
             throw Coordination::Exception("Unable to create a mutation znode", rc);
     }
 
-    waitMutation(mutation_entry.znode_name, query_context.getSettingsRef().mutations_sync);
+    waitMutation(mutation_entry.znode_name, query_context->getSettingsRef().mutations_sync);
 }
 
 void StorageReplicatedMergeTree::waitMutation(const String & znode_name, size_t mutations_sync) const
@@ -5331,11 +5706,61 @@ CancellationCode StorageReplicatedMergeTree::killMutation(const String & mutatio
     {
         const String & partition_id = pair.first;
         Int64 block_number = pair.second;
-        global_context.getMergeList().cancelPartMutations(partition_id, block_number);
+        getContext()->getMergeList().cancelPartMutations(partition_id, block_number);
     }
     return CancellationCode::CancelSent;
 }
 
+void StorageReplicatedMergeTree::removePartsFromFilesystem(const DataPartsVector & parts)
+{
+    auto remove_part = [&](const auto & part)
+    {
+        LOG_DEBUG(log, "Removing part from filesystem {}", part.name);
+        try
+        {
+            bool keep_s3 = !this->unlockSharedData(part);
+            part.remove(keep_s3);
+        }
+        catch (...)
+        {
+            tryLogCurrentException(log, "There is a problem with deleting part " + part.name + " from filesystem");
+        }
+    };
+
+    const auto settings = getSettings();
+    if (settings->max_part_removal_threads > 1 && parts.size() > settings->concurrent_part_removal_threshold)
+    {
+        /// Parallel parts removal.
+
+        size_t num_threads = std::min<size_t>(settings->max_part_removal_threads, parts.size());
+        ThreadPool pool(num_threads);
+
+        /// NOTE: Under heavy system load you may get "Cannot schedule a task" from ThreadPool.
+        for (const DataPartPtr & part : parts)
+        {
+            pool.scheduleOrThrowOnError([&, thread_group = CurrentThread::getGroup()]
+            {
+                SCOPE_EXIT_SAFE(
+                    if (thread_group)
+                        CurrentThread::detachQueryIfNotDetached();
+                );
+                if (thread_group)
+                    CurrentThread::attachTo(thread_group);
+
+                remove_part(*part);
+            });
+        }
+
+        pool.wait();
+    }
+    else
+    {
+        for (const DataPartPtr & part : parts)
+        {
+            remove_part(*part);
+        }
+    }
+}
 
 void StorageReplicatedMergeTree::clearOldPartsAndRemoveFromZK()
 {
@@ -5361,25 +5786,10 @@ void StorageReplicatedMergeTree::clearOldPartsAndRemoveFromZK()
     }
     parts.clear();
 
-    auto remove_parts_from_filesystem = [log=log] (const DataPartsVector & parts_to_remove)
-    {
-        for (const auto & part : parts_to_remove)
-        {
-            try
-            {
-                part->remove();
-            }
-            catch (...)
-            {
-                tryLogCurrentException(log, "There is a problem with deleting part " + part->name + " from filesystem");
-            }
-        }
-    };
-
     /// Delete duplicate parts from filesystem
     if (!parts_to_delete_only_from_filesystem.empty())
     {
-        remove_parts_from_filesystem(parts_to_delete_only_from_filesystem);
+        removePartsFromFilesystem(parts_to_delete_only_from_filesystem);
         removePartsFinally(parts_to_delete_only_from_filesystem);
 
         LOG_DEBUG(log, "Removed {} old duplicate parts", parts_to_delete_only_from_filesystem.size());
@@ -5424,7 +5834,7 @@ void StorageReplicatedMergeTree::clearOldPartsAndRemoveFromZK()
     /// Remove parts from filesystem and finally from data_parts
     if (!parts_to_remove_from_filesystem.empty())
     {
-        remove_parts_from_filesystem(parts_to_remove_from_filesystem);
+        removePartsFromFilesystem(parts_to_remove_from_filesystem);
         removePartsFinally(parts_to_remove_from_filesystem);
 
         LOG_DEBUG(log, "Removed {} old parts", parts_to_remove_from_filesystem.size());
@@ -5629,18 +6039,18 @@ void StorageReplicatedMergeTree::clearBlocksInPartition(
 }
 
 void StorageReplicatedMergeTree::replacePartitionFrom(
-    const StoragePtr & source_table, const ASTPtr & partition, bool replace, const Context & context)
+    const StoragePtr & source_table, const ASTPtr & partition, bool replace, ContextPtr query_context)
 {
     /// First argument is true, because we possibly will add new data to current table.
-    auto lock1 = lockForShare(context.getCurrentQueryId(), context.getSettingsRef().lock_acquire_timeout);
-    auto lock2 = source_table->lockForShare(context.getCurrentQueryId(), context.getSettingsRef().lock_acquire_timeout);
+    auto lock1 = lockForShare(query_context->getCurrentQueryId(), query_context->getSettingsRef().lock_acquire_timeout);
+    auto lock2 = source_table->lockForShare(query_context->getCurrentQueryId(), query_context->getSettingsRef().lock_acquire_timeout);
 
     auto source_metadata_snapshot = source_table->getInMemoryMetadataPtr();
     auto metadata_snapshot = getInMemoryMetadataPtr();
 
     Stopwatch watch;
     MergeTreeData & src_data = checkStructureAndGetMergeTreeData(source_table, source_metadata_snapshot, metadata_snapshot);
-    String partition_id = getPartitionIDFromQuery(partition, context);
+    String partition_id = getPartitionIDFromQuery(partition, query_context);
 
     DataPartsVector src_all_parts = src_data.getDataPartsVectorInPartition(MergeTreeDataPartState::Committed, partition_id);
     DataPartsVector src_parts;
@@ -5766,7 +6176,7 @@ void StorageReplicatedMergeTree::replacePartitionFrom(
             }
         }
 
-        if (auto txn = context.getZooKeeperMetadataTransaction())
+        if (auto txn = query_context->getZooKeeperMetadataTransaction())
             txn->moveOpsTo(ops);
 
         ops.emplace_back(zkutil::makeSetRequest(zookeeper_path + "/log", "", -1));  /// Just update version
@@ -5790,11 +6200,11 @@ void StorageReplicatedMergeTree::replacePartitionFrom(
                 parts_to_remove = removePartsInRangeFromWorkingSet(drop_range, true, false, data_parts_lock);
         }
 
-        PartLog::addNewParts(global_context, dst_parts, watch.elapsed());
+        PartLog::addNewParts(getContext(), dst_parts, watch.elapsed());
     }
     catch (...)
     {
-        PartLog::addNewParts(global_context, dst_parts, watch.elapsed(), ExecutionStatus::fromCurrentException());
+        PartLog::addNewParts(getContext(), dst_parts, watch.elapsed(), ExecutionStatus::fromCurrentException());
         throw;
     }
 
@@ -5812,7 +6222,7 @@ void StorageReplicatedMergeTree::replacePartitionFrom(
     cleanup_thread.wakeup();
 
     /// If necessary, wait until the operation is performed on all replicas.
-    if (context.getSettingsRef().replication_alter_partitions_sync > 1)
+    if (query_context->getSettingsRef().replication_alter_partitions_sync > 1)
     {
         lock2.reset();
         lock1.reset();
@@ -5820,10 +6230,10 @@ void StorageReplicatedMergeTree::replacePartitionFrom(
     }
 }
 
-void StorageReplicatedMergeTree::movePartitionToTable(const StoragePtr & dest_table, const ASTPtr & partition, const Context & query_context)
+void StorageReplicatedMergeTree::movePartitionToTable(const StoragePtr & dest_table, const ASTPtr & partition, ContextPtr query_context)
 {
-    auto lock1 = lockForShare(query_context.getCurrentQueryId(), query_context.getSettingsRef().lock_acquire_timeout);
-    auto lock2 = dest_table->lockForShare(query_context.getCurrentQueryId(), query_context.getSettingsRef().lock_acquire_timeout);
+    auto lock1 = lockForShare(query_context->getCurrentQueryId(), query_context->getSettingsRef().lock_acquire_timeout);
+    auto lock2 = dest_table->lockForShare(query_context->getCurrentQueryId(), query_context->getSettingsRef().lock_acquire_timeout);
 
     auto dest_table_storage = std::dynamic_pointer_cast<StorageReplicatedMergeTree>(dest_table);
     if (!dest_table_storage)
@@ -5976,11 +6386,11 @@ void StorageReplicatedMergeTree::movePartitionToTable(const StoragePtr & dest_ta
             transaction.commit(&lock);
         }
 
-        PartLog::addNewParts(global_context, dst_parts, watch.elapsed());
+        PartLog::addNewParts(getContext(), dst_parts, watch.elapsed());
     }
     catch (...)
     {
-        PartLog::addNewParts(global_context, dst_parts, watch.elapsed(), ExecutionStatus::fromCurrentException());
+        PartLog::addNewParts(getContext(), dst_parts, watch.elapsed(), ExecutionStatus::fromCurrentException());
         throw;
     }
 
@@ -5995,7 +6405,7 @@ void StorageReplicatedMergeTree::movePartitionToTable(const StoragePtr & dest_ta
     parts_to_remove.clear();
     cleanup_thread.wakeup();
 
-    if (query_context.getSettingsRef().replication_alter_partitions_sync > 1)
+    if (query_context->getSettingsRef().replication_alter_partitions_sync > 1)
     {
         lock2.reset();
         dest_table_storage->waitForAllReplicasToProcessLogEntry(entry);
@@ -6012,7 +6422,7 @@ void StorageReplicatedMergeTree::movePartitionToTable(const StoragePtr & dest_ta
     log_znode_path = dynamic_cast<const Coordination::CreateResponse &>(*op_results.front()).path_created;
     entry_delete.znode_name = log_znode_path.substr(log_znode_path.find_last_of('/') + 1);
 
-    if (query_context.getSettingsRef().replication_alter_partitions_sync > 1)
+    if (query_context->getSettingsRef().replication_alter_partitions_sync > 1)
     {
         lock1.reset();
         waitForAllReplicasToProcessLogEntry(entry_delete);
@@ -6067,16 +6477,16 @@ void StorageReplicatedMergeTree::getCommitPartOps(
 
 ReplicatedMergeTreeAddress StorageReplicatedMergeTree::getReplicatedMergeTreeAddress() const
 {
-    auto host_port = global_context.getInterserverIOAddress();
+    auto host_port = getContext()->getInterserverIOAddress();
     auto table_id = getStorageID();
 
     ReplicatedMergeTreeAddress res;
     res.host = host_port.first;
     res.replication_port = host_port.second;
-    res.queries_port = global_context.getTCPPort();
+    res.queries_port = getContext()->getTCPPort();
     res.database = table_id.database_name;
     res.table = table_id.table_name;
-    res.scheme = global_context.getInterserverScheme();
+    res.scheme = getContext()->getInterserverScheme();
     return res;
 }
 
@@ -6237,7 +6647,7 @@ bool StorageReplicatedMergeTree::dropPart(
 }
 
 bool StorageReplicatedMergeTree::dropAllPartsInPartition(
-    zkutil::ZooKeeper & zookeeper, String & partition_id, LogEntry & entry, const Context & query_context, bool detach)
+    zkutil::ZooKeeper & zookeeper, String & partition_id, LogEntry & entry, ContextPtr query_context, bool detach)
 {
     MergeTreePartInfo drop_range_info;
     if (!getFakePartCoveringAllPartsInPartition(partition_id, drop_range_info))
@@ -6269,7 +6679,7 @@ bool StorageReplicatedMergeTree::dropAllPartsInPartition(
     Coordination::Requests ops;
     ops.emplace_back(zkutil::makeCreateRequest(zookeeper_path + "/log/log-", entry.toString(), zkutil::CreateMode::PersistentSequential));
     ops.emplace_back(zkutil::makeSetRequest(zookeeper_path + "/log", "", -1));  /// Just update version.
-    if (auto txn = query_context.getZooKeeperMetadataTransaction())
+    if (auto txn = query_context->getZooKeeperMetadataTransaction())
         txn->moveOpsTo(ops);
     Coordination::Responses responses = zookeeper.multi(ops);
 
@@ -6280,13 +6690,13 @@ bool StorageReplicatedMergeTree::dropAllPartsInPartition(
 }
 
 
-CheckResults StorageReplicatedMergeTree::checkData(const ASTPtr & query, const Context & context)
+CheckResults StorageReplicatedMergeTree::checkData(const ASTPtr & query, ContextPtr local_context)
 {
     CheckResults results;
     DataPartsVector data_parts;
     if (const auto & check_query = query->as<ASTCheckQuery &>(); check_query.partition)
     {
-        String partition_id = getPartitionIDFromQuery(check_query.partition, context);
+        String partition_id = getPartitionIDFromQuery(check_query.partition, local_context);
         data_parts = getDataPartsVectorInPartition(MergeTreeDataPartState::Committed, partition_id);
     }
     else
@@ -6306,6 +6716,7 @@ CheckResults StorageReplicatedMergeTree::checkData(const ASTPtr & query, const C
     return results;
 }
 
+
 bool StorageReplicatedMergeTree::canUseAdaptiveGranularity() const
 {
     const auto storage_settings_ptr = getSettings();
@@ -6320,10 +6731,238 @@ MutationCommands StorageReplicatedMergeTree::getFirstAlterMutationCommandsForPar
     return queue.getFirstAlterMutationCommandsForPart(part);
 }
 
+
 void StorageReplicatedMergeTree::startBackgroundMovesIfNeeded()
 {
     if (areBackgroundMovesNeeded())
         background_moves_executor.start();
 }
 
+
+void StorageReplicatedMergeTree::lockSharedData(const IMergeTreeDataPart & part) const
+{
+    if (!part.volume)
+        return;
+    DiskPtr disk = part.volume->getDisk();
+    if (!disk)
+        return;
+    if (disk->getType() != DB::DiskType::Type::S3)
+        return;
+
+    zkutil::ZooKeeperPtr zookeeper = tryGetZooKeeper();
+    if (!zookeeper)
+        return;
+
+    String id = part.getUniqueId();
+    boost::replace_all(id, "/", "_");
+
+    String zookeeper_node = zookeeper_path + "/zero_copy_s3/shared/" + part.name + "/" + id + "/" + replica_name;
+
+    LOG_TRACE(log, "Set zookeeper lock {}", zookeeper_node);
+
+    /// In rare case other replica can remove path between createAncestors and createIfNotExists
+    /// So we make up to 5 attempts
+    for (int attempts = 5; attempts > 0; --attempts)
+    {
+        try
+        {
+            zookeeper->createAncestors(zookeeper_node);
+            zookeeper->createIfNotExists(zookeeper_node, "lock");
+            break;
+        }
+        catch (const zkutil::KeeperException & e)
+        {
+            if (e.code == Coordination::Error::ZNONODE)
+                continue;
+            throw;
+        }
+    }
+}
+
+
+bool StorageReplicatedMergeTree::unlockSharedData(const IMergeTreeDataPart & part) const
+{
+    if (!part.volume)
+        return true;
+    DiskPtr disk = part.volume->getDisk();
+    if (!disk)
+        return true;
+    if (disk->getType() != DB::DiskType::Type::S3)
+        return true;
+
+    zkutil::ZooKeeperPtr zookeeper = tryGetZooKeeper();
+    if (!zookeeper)
+        return true;
+
+    String id = part.getUniqueId();
+    boost::replace_all(id, "/", "_");
+
+    String zookeeper_part_node = zookeeper_path + "/zero_copy_s3/shared/" + part.name;
+    String zookeeper_part_uniq_node = zookeeper_part_node + "/" + id;
+    String zookeeper_node = zookeeper_part_uniq_node + "/" + replica_name;
+
+    LOG_TRACE(log, "Remove zookeeper lock {}", zookeeper_node);
+
+    zookeeper->tryRemove(zookeeper_node);
+
+    Strings children;
+    zookeeper->tryGetChildren(zookeeper_part_uniq_node, children);
+
+    if (!children.empty())
+    {
+        LOG_TRACE(log, "Found zookeper locks for {}", zookeeper_part_uniq_node);
+        return false;
+    }
+
+    zookeeper->tryRemove(zookeeper_part_uniq_node);
+
+    /// Even when we have lock with same part name, but with different uniq, we can remove files on S3
+    children.clear();
+    zookeeper->tryGetChildren(zookeeper_part_node, children);
+    if (children.empty())
+        /// Cleanup after last uniq removing
+        zookeeper->tryRemove(zookeeper_part_node);
+
+    return true;
+}
+
+
+bool StorageReplicatedMergeTree::tryToFetchIfShared(
+    const IMergeTreeDataPart & part,
+    const DiskPtr & disk,
+    const String & path)
+{
+    const auto data_settings = getSettings();
+    if (!data_settings->allow_s3_zero_copy_replication)
+        return false;
+
+    if (disk->getType() != DB::DiskType::Type::S3)
+        return false;
+
+    String replica = getSharedDataReplica(part);
+
+    /// We can't fetch part when none replicas have this part on S3
+    if (replica.empty())
+        return false;
+
+    return executeFetchShared(replica, part.name, disk, path);
+}
+
+
+String StorageReplicatedMergeTree::getSharedDataReplica(
+    const IMergeTreeDataPart & part) const
+{
+    String best_replica;
+
+    zkutil::ZooKeeperPtr zookeeper = tryGetZooKeeper();
+    if (!zookeeper)
+        return best_replica;
+
+    String zookeeper_part_node = zookeeper_path + "/zero_copy_s3/shared/" + part.name;
+
+    Strings ids;
+    zookeeper->tryGetChildren(zookeeper_part_node, ids);
+
+    Strings replicas;
+    for (const auto & id : ids)
+    {
+        String zookeeper_part_uniq_node = zookeeper_part_node + "/" + id;
+        Strings id_replicas;
+        zookeeper->tryGetChildren(zookeeper_part_uniq_node, id_replicas);
+        LOG_TRACE(log, "Found zookeper replicas for {}: {}", zookeeper_part_uniq_node, id_replicas.size());
+        replicas.insert(replicas.end(), id_replicas.begin(), id_replicas.end());
+    }
+
+    LOG_TRACE(log, "Found zookeper replicas for part {}: {}", part.name, replicas.size());
+
+    Strings active_replicas;
+
+    /// TODO: Move best replica choose in common method (here is the same code as in StorageReplicatedMergeTree::fetchPartition)
+
+    /// Leave only active replicas.
+    active_replicas.reserve(replicas.size());
+
+    for (const String & replica : replicas)
+        if ((replica != replica_name) && (zookeeper->exists(zookeeper_path + "/replicas/" + replica + "/is_active")))
+            active_replicas.push_back(replica);
+
+    LOG_TRACE(log, "Found zookeper active replicas for part {}: {}", part.name, active_replicas.size());
+
+    if (active_replicas.empty())
+        return best_replica;
+
+    /** You must select the best (most relevant) replica.
+    * This is a replica with the maximum `log_pointer`, then with the minimum `queue` size.
+    * NOTE This is not exactly the best criteria. It does not make sense to download old partitions,
+    *  and it would be nice to be able to choose the replica closest by network.
+    * NOTE Of course, there are data races here. You can solve it by retrying.
+    */
+    Int64 max_log_pointer = -1;
+    UInt64 min_queue_size = std::numeric_limits<UInt64>::max();
+
+    for (const String & replica : active_replicas)
+    {
+        String current_replica_path = zookeeper_path + "/replicas/" + replica;
+
+        String log_pointer_str = zookeeper->get(current_replica_path + "/log_pointer");
+        Int64 log_pointer = log_pointer_str.empty() ? 0 : parse<UInt64>(log_pointer_str);
+
+        Coordination::Stat stat;
+        zookeeper->get(current_replica_path + "/queue", &stat);
+        size_t queue_size = stat.numChildren;
+
+        if (log_pointer > max_log_pointer
+            || (log_pointer == max_log_pointer && queue_size < min_queue_size))
+        {
+            max_log_pointer = log_pointer;
+            min_queue_size = queue_size;
+            best_replica = replica;
+        }
+    }
+
+    return best_replica;
+}
+
+String StorageReplicatedMergeTree::findReplicaHavingPart(
+    const String & part_name, const String & zookeeper_path_, zkutil::ZooKeeper::Ptr zookeeper_)
+{
+    Strings replicas = zookeeper_->getChildren(zookeeper_path_ + "/replicas");
+
+    /// Select replicas in uniformly random order.
+    std::shuffle(replicas.begin(), replicas.end(), thread_local_rng);
+
+    for (const String & replica : replicas)
+    {
+        if (zookeeper_->exists(zookeeper_path_ + "/replicas/" + replica + "/parts/" + part_name)
+            && zookeeper_->exists(zookeeper_path_ + "/replicas/" + replica + "/is_active"))
+            return zookeeper_path_ + "/replicas/" + replica;
+    }
+
+    return {};
+}
+
+bool StorageReplicatedMergeTree::checkIfDetachedPartExists(const String & part_name)
+{
+    Poco::DirectoryIterator dir_end;
+    for (const std::string & path : getDataPaths())
+        for (Poco::DirectoryIterator dir_it{path + "detached/"}; dir_it != dir_end; ++dir_it)
+            if (dir_it.name() == part_name)
+                return true;
+    return false;
+}
+
+bool StorageReplicatedMergeTree::checkIfDetachedPartitionExists(const String & partition_name)
+{
+    Poco::DirectoryIterator dir_end;
+    for (const std::string & path : getDataPaths())
+    {
+        for (Poco::DirectoryIterator dir_it{path + "detached/"}; dir_it != dir_end; ++dir_it)
+        {
+            MergeTreePartInfo part_info;
+            if (MergeTreePartInfo::tryParsePartName(dir_it.name(), &part_info, format_version) && part_info.partition_id == partition_name)
+                return true;
+        }
+    }
+    return false;
+}
 }
diff --git a/src/Storages/StorageReplicatedMergeTree.h b/src/Storages/StorageReplicatedMergeTree.h
index a1a70ada9b2..c70556f40df 100644
--- a/src/Storages/StorageReplicatedMergeTree.h
+++ b/src/Storages/StorageReplicatedMergeTree.h
@@ -39,13 +39,14 @@ namespace DB
   * - the structure of the table (/metadata, /columns)
   * - action log with data (/log/log-...,/replicas/replica_name/queue/queue-...);
   * - a replica list (/replicas), and replica activity tag (/replicas/replica_name/is_active), replica addresses (/replicas/replica_name/host);
-  * - select the leader replica (/leader_election) - these are the replicas that assigning merges, mutations and partition manipulations
+  * - the leader replica election (/leader_election) - these are the replicas that assign merges, mutations
+  *   and partition manipulations.
   *   (after ClickHouse version 20.5 we allow multiple leaders to act concurrently);
   * - a set of parts of data on each replica (/replicas/replica_name/parts);
   * - list of the last N blocks of data with checksum, for deduplication (/blocks);
   * - the list of incremental block numbers (/block_numbers) that we are about to insert,
   *   to ensure the linear order of data insertion and data merge only on the intervals in this sequence;
-  * - coordinates writes with quorum (/quorum).
+  * - coordinate writes with quorum (/quorum).
   * - Storage of mutation entries (ALTER DELETE, ALTER UPDATE etc.) to execute (/mutations).
   *   See comments in StorageReplicatedMergeTree::mutate() for details.
   */
@@ -65,6 +66,8 @@ namespace DB
   * - if the part is corrupt (removePartAndEnqueueFetch) or absent during the check (at start - checkParts, while running - searchForMissingPart),
   *   actions are put on GET from other replicas;
   *
+  * TODO Update the GET part after rewriting the code (search locally).
+  *
   * The replica to which INSERT was made in the queue will also have an entry of the GET of this data.
   * Such an entry is considered to be executed as soon as the queue handler sees it.
   *
@@ -93,7 +96,7 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
@@ -103,16 +106,16 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
 
     std::optional<UInt64> totalRows(const Settings & settings) const override;
-    std::optional<UInt64> totalRowsByPartitionPredicate(const SelectQueryInfo & query_info, const Context & context) const override;
+    std::optional<UInt64> totalRowsByPartitionPredicate(const SelectQueryInfo & query_info, ContextPtr context) const override;
     std::optional<UInt64> totalBytes(const Settings & settings) const override;
 
-    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, const Context & context) override;
+    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, ContextPtr context) override;
 
     bool optimize(
         const ASTPtr & query,
@@ -121,11 +124,11 @@ public:
         bool final,
         bool deduplicate,
         const Names & deduplicate_by_columns,
-        const Context & query_context) override;
+        ContextPtr query_context) override;
 
-    void alter(const AlterCommands & commands, const Context & query_context, TableLockHolder & table_lock_holder) override;
+    void alter(const AlterCommands & commands, ContextPtr query_context, TableLockHolder & table_lock_holder) override;
 
-    void mutate(const MutationCommands & commands, const Context & context) override;
+    void mutate(const MutationCommands & commands, ContextPtr context) override;
     void waitMutation(const String & znode_name, size_t mutations_sync) const;
     std::vector<MergeTreeMutationStatus> getMutationsStatus() const override;
     CancellationCode killMutation(const String & mutation_id) override;
@@ -134,7 +137,7 @@ public:
       */
     void drop() override;
 
-    void truncate(const ASTPtr &, const StorageMetadataPtr &, const Context & query_context, TableExclusiveLockHolder &) override;
+    void truncate(const ASTPtr &, const StorageMetadataPtr &, ContextPtr query_context, TableExclusiveLockHolder &) override;
 
     void checkTableCanBeRenamed() const override;
 
@@ -194,7 +197,7 @@ public:
         part_check_thread.enqueuePart(part_name, delay_to_check_seconds);
     }
 
-    CheckResults checkData(const ASTPtr & query, const Context & context) override;
+    CheckResults checkData(const ASTPtr & query, ContextPtr context) override;
 
     /// Checks ability to use granularity
     bool canUseAdaptiveGranularity() const override;
@@ -205,6 +208,10 @@ public:
      */
     static void dropReplica(zkutil::ZooKeeperPtr zookeeper, const String & zookeeper_path, const String & replica, Poco::Logger * logger);
 
+    /// Removes table from ZooKeeper after the last replica was dropped
+    static bool removeTableNodesFromZooKeeper(zkutil::ZooKeeperPtr zookeeper, const String & zookeeper_path,
+                                              const zkutil::EphemeralNodeHolder::Ptr & metadata_drop_lock, Poco::Logger * logger);
+
     /// Get job to execute in background pool (merge, mutate, drop range and so on)
     std::optional<JobAndPool> getDataProcessingJob() override;
 
@@ -212,6 +219,23 @@ public:
     /// is not overloaded
     bool canExecuteFetch(const ReplicatedMergeTreeLogEntry & entry, String & disable_reason) const;
 
+    /// Fetch part only when it stored on shared storage like S3
+    bool executeFetchShared(const String & source_replica, const String & new_part_name, const DiskPtr & disk, const String & path);
+
+    /// Lock part in zookeeper for use common S3 data in several nodes
+    void lockSharedData(const IMergeTreeDataPart & part) const override;
+
+    /// Unlock common S3 data part in zookeeper
+    /// Return true if data unlocked
+    /// Return false if data is still used by another node
+    bool unlockSharedData(const IMergeTreeDataPart & part) const override;
+
+    /// Fetch part only if some replica has it on shared storage like S3
+    bool tryToFetchIfShared(const IMergeTreeDataPart & part, const DiskPtr & disk, const String & path) override;
+
+    /// Get best replica having this partition on S3
+    String getSharedDataReplica(const IMergeTreeDataPart & part) const;
+
 private:
     /// Get a sequential consistent view of current parts.
     ReplicatedMergeTreeQuorumAddedParts::PartitionIdToMaxBlock getMaxAddedBlocks() const;
@@ -234,6 +258,8 @@ private:
     using LogEntry = ReplicatedMergeTreeLogEntry;
     using LogEntryPtr = LogEntry::Ptr;
 
+    using MergeTreeData::MutableDataPartPtr;
+
     zkutil::ZooKeeperPtr current_zookeeper;        /// Use only the methods below.
     mutable std::mutex current_zookeeper_mutex;    /// To recreate the session in the background thread.
 
@@ -289,6 +315,9 @@ private:
     /// Event that is signalled (and is reset) by the restarting_thread when the ZooKeeper session expires.
     Poco::Event partial_shutdown_event {false};     /// Poco::Event::EVENT_MANUALRESET
 
+    /// Limiting parallel fetches per node
+    static std::atomic_uint total_fetches;
+
     /// Limiting parallel fetches per one table
     std::atomic_uint current_table_fetches {0};
 
@@ -370,8 +399,7 @@ private:
     String getChecksumsForZooKeeper(const MergeTreeDataPartChecksums & checksums) const;
 
     /// Accepts a PreComitted part, atomically checks its checksums with ones on other replicas and commit the part
-    DataPartsVector checkPartChecksumsAndCommit(Transaction & transaction,
-                                                               const DataPartPtr & part);
+    DataPartsVector checkPartChecksumsAndCommit(Transaction & transaction, const DataPartPtr & part);
 
     bool partIsAssignedToBackgroundOperation(const DataPartPtr & part) const override;
 
@@ -384,6 +412,8 @@ private:
     /// Just removes part from ZooKeeper using previous method
     void removePartFromZooKeeper(const String & part_name);
 
+    void removePartsFromFilesystem(const DataPartsVector & parts);
+
     /// Quickly removes big set of parts from ZooKeeper (using async multi queries)
     void removePartsFromZooKeeper(zkutil::ZooKeeperPtr & zookeeper, const Strings & part_names,
                                   NameSet * parts_should_be_retried = nullptr);
@@ -401,6 +431,9 @@ private:
       */
     bool executeLogEntry(LogEntry & entry);
 
+    /// Lookup the part for the entry in the detached/ folder.
+    /// returns nullptr if the part is corrupt or missing.
+    MutableDataPartPtr attachPartHelperFoundValidPart(const LogEntry& entry) const;
 
     void executeDropRange(const LogEntry & entry);
 
@@ -488,11 +521,16 @@ private:
 
     /// Exchange parts.
 
+    ConnectionTimeouts getFetchPartHTTPTimeouts(ContextPtr context);
+
     /** Returns an empty string if no one has a part.
       */
     String findReplicaHavingPart(const String & part_name, bool active);
+    static String findReplicaHavingPart(const String & part_name, const String & zookeeper_path_, zkutil::ZooKeeper::Ptr zookeeper_);
 
     bool checkReplicaHavePart(const String & replica, const String & part_name);
+    bool checkIfDetachedPartExists(const String & part_name);
+    bool checkIfDetachedPartitionExists(const String & partition_name);
 
     /** Find replica having specified part or any part that covers it.
       * If active = true, consider only active replicas.
@@ -515,6 +553,17 @@ private:
         size_t quorum,
         zkutil::ZooKeeper::Ptr zookeeper_ = nullptr);
 
+    /** Download the specified part from the specified replica.
+      * Used for replace local part on the same s3-shared part in hybrid storage.
+      * Returns false if part is already fetching right now.
+      */
+    bool fetchExistsPart(
+        const String & part_name,
+        const StorageMetadataPtr & metadata_snapshot,
+        const String & replica_path,
+        DiskPtr replaced_disk,
+        String replaced_part_path);
+
     /// Required only to avoid races between executeLogEntry and fetchPartition
     std::unordered_set<String> currently_fetching_parts;
     std::mutex currently_fetching_parts_mutex;
@@ -577,14 +626,19 @@ private:
 
     bool dropPart(zkutil::ZooKeeperPtr & zookeeper, String part_name, LogEntry & entry, bool detach, bool throw_if_noop);
     bool dropAllPartsInPartition(
-        zkutil::ZooKeeper & zookeeper, String & partition_id, LogEntry & entry, const Context & query_context, bool detach);
+        zkutil::ZooKeeper & zookeeper, String & partition_id, LogEntry & entry, ContextPtr query_context, bool detach);
 
     // Partition helpers
-    void dropPartition(const ASTPtr & partition, bool detach, bool drop_part, const Context & query_context, bool throw_if_noop) override;
-    PartitionCommandsResultInfo attachPartition(const ASTPtr & partition, const StorageMetadataPtr & metadata_snapshot, bool part, const Context & query_context) override;
-    void replacePartitionFrom(const StoragePtr & source_table, const ASTPtr & partition, bool replace, const Context & query_context) override;
-    void movePartitionToTable(const StoragePtr & dest_table, const ASTPtr & partition, const Context & query_context) override;
-    void fetchPartition(const ASTPtr & partition, const StorageMetadataPtr & metadata_snapshot, const String & from, const Context & query_context) override;
+    void dropPartition(const ASTPtr & partition, bool detach, bool drop_part, ContextPtr query_context, bool throw_if_noop) override;
+    PartitionCommandsResultInfo attachPartition(const ASTPtr & partition, const StorageMetadataPtr & metadata_snapshot, bool part, ContextPtr query_context) override;
+    void replacePartitionFrom(const StoragePtr & source_table, const ASTPtr & partition, bool replace, ContextPtr query_context) override;
+    void movePartitionToTable(const StoragePtr & dest_table, const ASTPtr & partition, ContextPtr query_context) override;
+    void fetchPartition(
+        const ASTPtr & partition,
+        const StorageMetadataPtr & metadata_snapshot,
+        const String & from,
+        bool fetch_part,
+        ContextPtr query_context) override;
 
     /// Check granularity of already existing replicated table in zookeeper if it exists
     /// return true if it's fixed
@@ -598,9 +652,9 @@ private:
 
     void startBackgroundMovesIfNeeded() override;
 
-    std::set<String> getPartitionIdsAffectedByCommands(const MutationCommands & commands, const Context & query_context) const;
+    std::set<String> getPartitionIdsAffectedByCommands(const MutationCommands & commands, ContextPtr query_context) const;
     PartitionBlockNumbersHolder allocateBlockNumbersInAffectedPartitions(
-        const MutationCommands & commands, const Context & query_context, const zkutil::ZooKeeperPtr & zookeeper) const;
+        const MutationCommands & commands, ContextPtr query_context, const zkutil::ZooKeeperPtr & zookeeper) const;
 
 protected:
     /** If not 'attach', either creates a new table in ZK, or adds a replica to an existing table.
@@ -612,7 +666,7 @@ protected:
         const StorageID & table_id_,
         const String & relative_data_path_,
         const StorageInMemoryMetadata & metadata_,
-        Context & context_,
+        ContextPtr context_,
         const String & date_column_name,
         const MergingParams & merging_params_,
         std::unique_ptr<MergeTreeSettings> settings_,
diff --git a/src/Storages/StorageS3.cpp b/src/Storages/StorageS3.cpp
index d0e3b70d900..8a42caf41b1 100644
--- a/src/Storages/StorageS3.cpp
+++ b/src/Storages/StorageS3.cpp
@@ -45,258 +45,300 @@ namespace ErrorCodes
     extern const int UNEXPECTED_EXPRESSION;
     extern const int S3_ERROR;
 }
-
-
-namespace
+class StorageS3Source::DisclosedGlobIterator::Impl
 {
-    class StorageS3Source : public SourceWithProgress
+
+public:
+    Impl(Aws::S3::S3Client & client_, const S3::URI & globbed_uri_)
+        : client(client_), globbed_uri(globbed_uri_)
     {
-    public:
+        std::lock_guard lock(mutex);
 
-        static Block getHeader(Block sample_block, bool with_path_column, bool with_file_column)
+        if (globbed_uri.bucket.find_first_of("*?{") != globbed_uri.bucket.npos)
+            throw Exception("Expression can not have wildcards inside bucket name", ErrorCodes::UNEXPECTED_EXPRESSION);
+
+        const String key_prefix = globbed_uri.key.substr(0, globbed_uri.key.find_first_of("*?{"));
+
+        /// We don't have to list bucket, because there is no asterics.
+        if (key_prefix.size() == globbed_uri.key.size())
         {
-            if (with_path_column)
-                sample_block.insert({DataTypeString().createColumn(), std::make_shared<DataTypeString>(), "_path"});
-            if (with_file_column)
-                sample_block.insert({DataTypeString().createColumn(), std::make_shared<DataTypeString>(), "_file"});
-
-            return sample_block;
+            buffer.emplace_back(globbed_uri.key);
+            buffer_iter = buffer.begin();
+            is_finished = true;
+            return;
         }
 
-        StorageS3Source(
-            bool need_path,
-            bool need_file,
-            const String & format,
-            String name_,
-            const Block & sample_block,
-            const Context & context,
-            const ColumnsDescription & columns,
-            UInt64 max_block_size,
-            const CompressionMethod compression_method,
-            const std::shared_ptr<Aws::S3::S3Client> & client,
-            const String & bucket,
-            const String & key)
-            : SourceWithProgress(getHeader(sample_block, need_path, need_file))
-            , name(std::move(name_))
-            , with_file_column(need_file)
-            , with_path_column(need_path)
-            , file_path(bucket + "/" + key)
-        {
-            read_buf = wrapReadBufferWithCompressionMethod(std::make_unique<ReadBufferFromS3>(client, bucket, key), compression_method);
-            auto input_format = FormatFactory::instance().getInput(format, *read_buf, sample_block, context, max_block_size);
-            reader = std::make_shared<InputStreamFromInputFormat>(input_format);
+        request.SetBucket(globbed_uri.bucket);
+        request.SetPrefix(key_prefix);
+        matcher = std::make_unique<re2::RE2>(makeRegexpPatternFromGlobs(globbed_uri.key));
+        fillInternalBufferAssumeLocked();
+    }
 
-            if (columns.hasDefaults())
-                reader = std::make_shared<AddingDefaultsBlockInputStream>(reader, columns, context);
+    String next()
+    {
+        std::lock_guard lock(mutex);
+        return nextAssumeLocked();
+    }
+
+private:
+
+    String nextAssumeLocked()
+    {
+        if (buffer_iter != buffer.end())
+        {
+            auto answer = *buffer_iter;
+            ++buffer_iter;
+            return answer;
         }
 
-        String getName() const override
-        {
-            return name;
-        }
-
-        Chunk generate() override
-        {
-            if (!reader)
-                return {};
-
-            if (!initialized)
-            {
-                reader->readSuffix();
-                initialized = true;
-            }
-
-            if (auto block = reader->read())
-            {
-                auto columns = block.getColumns();
-                UInt64 num_rows = block.rows();
-
-                if (with_path_column)
-                    columns.push_back(DataTypeString().createColumnConst(num_rows, file_path)->convertToFullColumnIfConst());
-                if (with_file_column)
-                {
-                    size_t last_slash_pos = file_path.find_last_of('/');
-                    columns.push_back(DataTypeString().createColumnConst(num_rows, file_path.substr(
-                            last_slash_pos + 1))->convertToFullColumnIfConst());
-                }
-
-                return Chunk(std::move(columns), num_rows);
-            }
-
-            reader.reset();
-
+        if (is_finished)
             return {};
-        }
 
-    private:
-        String name;
-        std::unique_ptr<ReadBuffer> read_buf;
-        BlockInputStreamPtr reader;
-        bool initialized = false;
-        bool with_file_column = false;
-        bool with_path_column = false;
-        String file_path;
-    };
+        fillInternalBufferAssumeLocked();
 
-    class StorageS3BlockOutputStream : public IBlockOutputStream
+        return nextAssumeLocked();
+    }
+
+    void fillInternalBufferAssumeLocked()
     {
-    public:
-        StorageS3BlockOutputStream(
-            const String & format,
-            const Block & sample_block_,
-            const Context & context,
-            const CompressionMethod compression_method,
-            const std::shared_ptr<Aws::S3::S3Client> & client,
-            const String & bucket,
-            const String & key,
-            size_t min_upload_part_size,
-            size_t max_single_part_upload_size)
-            : sample_block(sample_block_)
-        {
-            write_buf = wrapWriteBufferWithCompressionMethod(
-                std::make_unique<WriteBufferFromS3>(client, bucket, key, min_upload_part_size, max_single_part_upload_size), compression_method, 3);
-            writer = FormatFactory::instance().getOutputStream(format, *write_buf, sample_block, context);
-        }
+        buffer.clear();
 
-        Block getHeader() const override
-        {
-            return sample_block;
-        }
+        outcome = client.ListObjectsV2(request);
+        if (!outcome.IsSuccess())
+            throw Exception(ErrorCodes::S3_ERROR, "Could not list objects in bucket {} with prefix {}, S3 exception: {}, message: {}",
+                            quoteString(request.GetBucket()), quoteString(request.GetPrefix()),
+                            backQuote(outcome.GetError().GetExceptionName()), quoteString(outcome.GetError().GetMessage()));
 
-        void write(const Block & block) override
-        {
-            writer->write(block);
-        }
+        const auto & result_batch = outcome.GetResult().GetContents();
 
-        void writePrefix() override
+        buffer.reserve(result_batch.size());
+        for (const auto & row : result_batch)
         {
-            writer->writePrefix();
+            String key = row.GetKey();
+            if (re2::RE2::FullMatch(key, *matcher))
+                buffer.emplace_back(std::move(key));
         }
+        /// Set iterator only after the whole batch is processed
+        buffer_iter = buffer.begin();
 
-        void writeSuffix() override
-        {
-            writer->writeSuffix();
-            writer->flush();
-            write_buf->finalize();
-        }
+        request.SetContinuationToken(outcome.GetResult().GetNextContinuationToken());
 
-    private:
-        Block sample_block;
-        std::unique_ptr<WriteBuffer> write_buf;
-        BlockOutputStreamPtr writer;
-    };
+        /// It returns false when all objects were returned
+        is_finished = !outcome.GetResult().GetIsTruncated();
+    }
+
+    std::mutex mutex;
+    Strings buffer;
+    Strings::iterator buffer_iter;
+    Aws::S3::S3Client client;
+    S3::URI globbed_uri;
+    Aws::S3::Model::ListObjectsV2Request request;
+    Aws::S3::Model::ListObjectsV2Outcome outcome;
+    std::unique_ptr<re2::RE2> matcher;
+    bool is_finished{false};
+};
+
+StorageS3Source::DisclosedGlobIterator::DisclosedGlobIterator(Aws::S3::S3Client & client_, const S3::URI & globbed_uri_)
+    : pimpl(std::make_shared<StorageS3Source::DisclosedGlobIterator::Impl>(client_, globbed_uri_)) {}
+
+String StorageS3Source::DisclosedGlobIterator::next()
+{
+    return pimpl->next();
 }
 
 
+Block StorageS3Source::getHeader(Block sample_block, bool with_path_column, bool with_file_column)
+{
+    if (with_path_column)
+        sample_block.insert({DataTypeString().createColumn(), std::make_shared<DataTypeString>(), "_path"});
+    if (with_file_column)
+        sample_block.insert({DataTypeString().createColumn(), std::make_shared<DataTypeString>(), "_file"});
+
+    return sample_block;
+}
+
+StorageS3Source::StorageS3Source(
+    bool need_path,
+    bool need_file,
+    const String & format_,
+    String name_,
+    const Block & sample_block_,
+    ContextPtr context_,
+    const ColumnsDescription & columns_,
+    UInt64 max_block_size_,
+    UInt64 s3_max_single_read_retries_,
+    const String compression_hint_,
+    const std::shared_ptr<Aws::S3::S3Client> & client_,
+    const String & bucket_,
+    std::shared_ptr<IteratorWrapper> file_iterator_)
+    : SourceWithProgress(getHeader(sample_block_, need_path, need_file))
+    , WithContext(context_)
+    , name(std::move(name_))
+    , bucket(bucket_)
+    , format(format_)
+    , columns_desc(columns_)
+    , max_block_size(max_block_size_)
+    , s3_max_single_read_retries(s3_max_single_read_retries_)
+    , compression_hint(compression_hint_)
+    , client(client_)
+    , sample_block(sample_block_)
+    , with_file_column(need_file)
+    , with_path_column(need_path)
+    , file_iterator(file_iterator_)
+{
+    initialize();
+}
+
+
+bool StorageS3Source::initialize()
+{
+    String current_key = (*file_iterator)();
+    if (current_key.empty())
+        return false;
+
+    file_path = bucket + "/" + current_key;
+
+    read_buf = wrapReadBufferWithCompressionMethod(
+        std::make_unique<ReadBufferFromS3>(client, bucket, current_key, s3_max_single_read_retries), chooseCompressionMethod(current_key, compression_hint));
+    auto input_format = FormatFactory::instance().getInput(format, *read_buf, sample_block, getContext(), max_block_size);
+    reader = std::make_shared<InputStreamFromInputFormat>(input_format);
+
+    if (columns_desc.hasDefaults())
+        reader = std::make_shared<AddingDefaultsBlockInputStream>(reader, columns_desc, getContext());
+
+    initialized = false;
+    return true;
+}
+
+String StorageS3Source::getName() const
+{
+    return name;
+}
+
+Chunk StorageS3Source::generate()
+{
+    if (!reader)
+        return {};
+
+    if (!initialized)
+    {
+        reader->readPrefix();
+        initialized = true;
+    }
+
+    if (auto block = reader->read())
+    {
+        auto columns = block.getColumns();
+        UInt64 num_rows = block.rows();
+
+        if (with_path_column)
+            columns.push_back(DataTypeString().createColumnConst(num_rows, file_path)->convertToFullColumnIfConst());
+        if (with_file_column)
+        {
+            size_t last_slash_pos = file_path.find_last_of('/');
+            columns.push_back(DataTypeString().createColumnConst(num_rows, file_path.substr(
+                    last_slash_pos + 1))->convertToFullColumnIfConst());
+        }
+
+        return Chunk(std::move(columns), num_rows);
+    }
+
+    reader->readSuffix();
+    reader.reset();
+    read_buf.reset();
+
+    if (!initialize())
+        return {};
+
+    return generate();
+}
+
+
+class StorageS3BlockOutputStream : public IBlockOutputStream
+{
+public:
+    StorageS3BlockOutputStream(
+        const String & format,
+        const Block & sample_block_,
+        ContextPtr context,
+        const CompressionMethod compression_method,
+        const std::shared_ptr<Aws::S3::S3Client> & client,
+        const String & bucket,
+        const String & key,
+        size_t min_upload_part_size,
+        size_t max_single_part_upload_size)
+        : sample_block(sample_block_)
+    {
+        write_buf = wrapWriteBufferWithCompressionMethod(
+            std::make_unique<WriteBufferFromS3>(client, bucket, key, min_upload_part_size, max_single_part_upload_size), compression_method, 3);
+        writer = FormatFactory::instance().getOutputStreamParallelIfPossible(format, *write_buf, sample_block, context);
+    }
+
+    Block getHeader() const override
+    {
+        return sample_block;
+    }
+
+    void write(const Block & block) override
+    {
+        writer->write(block);
+    }
+
+    void writePrefix() override
+    {
+        writer->writePrefix();
+    }
+
+    void flush() override
+    {
+        writer->flush();
+    }
+
+    void writeSuffix() override
+    {
+        writer->writeSuffix();
+        writer->flush();
+        write_buf->finalize();
+    }
+
+private:
+    Block sample_block;
+    std::unique_ptr<WriteBuffer> write_buf;
+    BlockOutputStreamPtr writer;
+};
+
+
 StorageS3::StorageS3(
     const S3::URI & uri_,
     const String & access_key_id_,
     const String & secret_access_key_,
     const StorageID & table_id_,
     const String & format_name_,
+    UInt64 s3_max_single_read_retries_,
     UInt64 min_upload_part_size_,
     UInt64 max_single_part_upload_size_,
     UInt64 max_connections_,
     const ColumnsDescription & columns_,
     const ConstraintsDescription & constraints_,
-    const Context & context_,
-    const String & compression_method_)
+    ContextPtr context_,
+    const String & compression_method_,
+    bool distributed_processing_)
     : IStorage(table_id_)
-    , uri(uri_)
-    , global_context(context_.getGlobalContext())
+    , client_auth{uri_, access_key_id_, secret_access_key_, max_connections_, {}, {}} /// Client and settings will be updated later
     , format_name(format_name_)
+    , s3_max_single_read_retries(s3_max_single_read_retries_)
     , min_upload_part_size(min_upload_part_size_)
     , max_single_part_upload_size(max_single_part_upload_size_)
     , compression_method(compression_method_)
     , name(uri_.storage_name)
+    , distributed_processing(distributed_processing_)
 {
-    global_context.getRemoteHostFilter().checkURL(uri_.uri);
+    context_->getGlobalContext()->getRemoteHostFilter().checkURL(uri_.uri);
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(columns_);
     storage_metadata.setConstraints(constraints_);
     setInMemoryMetadata(storage_metadata);
-
-    auto settings = context_.getStorageS3Settings().getSettings(uri.uri.toString());
-
-    Aws::Auth::AWSCredentials credentials(access_key_id_, secret_access_key_);
-    if (access_key_id_.empty())
-        credentials = Aws::Auth::AWSCredentials(std::move(settings.access_key_id), std::move(settings.secret_access_key));
-
-    S3::PocoHTTPClientConfiguration client_configuration = S3::ClientFactory::instance().createClientConfiguration(
-        context_.getRemoteHostFilter(),
-        context_.getGlobalContext().getSettingsRef().s3_max_redirects);
-
-    client_configuration.endpointOverride = uri_.endpoint;
-    client_configuration.maxConnections = max_connections_;
-
-    client = S3::ClientFactory::instance().create(
-        client_configuration,
-        uri_.is_virtual_hosted_style,
-        credentials.GetAWSAccessKeyId(),
-        credentials.GetAWSSecretKey(),
-        settings.server_side_encryption_customer_key_base64,
-        std::move(settings.headers),
-        settings.use_environment_credentials.value_or(global_context.getConfigRef().getBool("s3.use_environment_credentials", false))
-    );
-}
-
-
-namespace
-{
-    /* "Recursive" directory listing with matched paths as a result.
- * Have the same method in StorageFile.
- */
-Strings listFilesWithRegexpMatching(Aws::S3::S3Client & client, const S3::URI & globbed_uri)
-{
-    if (globbed_uri.bucket.find_first_of("*?{") != globbed_uri.bucket.npos)
-    {
-        throw Exception("Expression can not have wildcards inside bucket name", ErrorCodes::UNEXPECTED_EXPRESSION);
-    }
-
-    const String key_prefix = globbed_uri.key.substr(0, globbed_uri.key.find_first_of("*?{"));
-    if (key_prefix.size() == globbed_uri.key.size())
-    {
-        return {globbed_uri.key};
-    }
-
-    Aws::S3::Model::ListObjectsV2Request request;
-    request.SetBucket(globbed_uri.bucket);
-    request.SetPrefix(key_prefix);
-
-    re2::RE2 matcher(makeRegexpPatternFromGlobs(globbed_uri.key));
-    Strings result;
-    Aws::S3::Model::ListObjectsV2Outcome outcome;
-    int page = 0;
-    do
-    {
-        ++page;
-        outcome = client.ListObjectsV2(request);
-        if (!outcome.IsSuccess())
-        {
-            if (page > 1)
-                throw Exception(ErrorCodes::S3_ERROR, "Could not list objects in bucket {} with prefix {}, page {}, S3 exception: {}, message: {}",
-                            quoteString(request.GetBucket()), quoteString(request.GetPrefix()), page,
-                            backQuote(outcome.GetError().GetExceptionName()), quoteString(outcome.GetError().GetMessage()));
-
-            throw Exception(ErrorCodes::S3_ERROR, "Could not list objects in bucket {} with prefix {}, S3 exception: {}, message: {}",
-                            quoteString(request.GetBucket()), quoteString(request.GetPrefix()),
-                            backQuote(outcome.GetError().GetExceptionName()), quoteString(outcome.GetError().GetMessage()));
-        }
-
-        for (const auto & row : outcome.GetResult().GetContents())
-        {
-            String key = row.GetKey();
-            if (re2::RE2::FullMatch(key, matcher))
-                result.emplace_back(std::move(key));
-        }
-
-        request.SetContinuationToken(outcome.GetResult().GetNextContinuationToken());
-    }
-    while (outcome.GetResult().GetIsTruncated());
-
-    return result;
-}
-
+    updateClientAndAuthSettings(context_, client_auth);
 }
 
 
@@ -304,11 +346,13 @@ Pipe StorageS3::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & /*query_info*/,
-    const Context & context,
+    ContextPtr local_context,
     QueryProcessingStage::Enum /*processed_stage*/,
     size_t max_block_size,
     unsigned num_streams)
 {
+    updateClientAndAuthSettings(local_context, client_auth);
+
     Pipes pipes;
     bool need_path_column = false;
     bool need_file_column = false;
@@ -320,42 +364,95 @@ Pipe StorageS3::read(
             need_file_column = true;
     }
 
-    for (const String & key : listFilesWithRegexpMatching(*client, uri))
+    std::shared_ptr<StorageS3Source::IteratorWrapper> iterator_wrapper{nullptr};
+    if (distributed_processing)
+    {
+        iterator_wrapper = std::make_shared<StorageS3Source::IteratorWrapper>(
+            [callback = local_context->getReadTaskCallback()]() -> String {
+                return callback();
+        });
+    }
+    else
+    {
+        /// Iterate through disclosed globs and make a source for each file
+        auto glob_iterator = std::make_shared<StorageS3Source::DisclosedGlobIterator>(*client_auth.client, client_auth.uri);
+        iterator_wrapper = std::make_shared<StorageS3Source::IteratorWrapper>([glob_iterator]()
+        {
+            return glob_iterator->next();
+        });
+    }
+
+    for (size_t i = 0; i < num_streams; ++i)
+    {
         pipes.emplace_back(std::make_shared<StorageS3Source>(
             need_path_column,
             need_file_column,
             format_name,
             getName(),
             metadata_snapshot->getSampleBlock(),
-            context,
+            local_context,
             metadata_snapshot->getColumns(),
             max_block_size,
-            chooseCompressionMethod(uri.key, compression_method),
-            client,
-            uri.bucket,
-            key));
-
+            s3_max_single_read_retries,
+            compression_method,
+            client_auth.client,
+            client_auth.uri.bucket,
+            iterator_wrapper));
+    }
     auto pipe = Pipe::unitePipes(std::move(pipes));
-    // It's possible to have many buckets read from s3, resize(num_streams) might open too many handles at the same time.
-    // Using narrowPipe instead.
+
     narrowPipe(pipe, num_streams);
     return pipe;
 }
 
-BlockOutputStreamPtr StorageS3::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, const Context & /*context*/)
+BlockOutputStreamPtr StorageS3::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, ContextPtr local_context)
 {
+    updateClientAndAuthSettings(local_context, client_auth);
     return std::make_shared<StorageS3BlockOutputStream>(
         format_name,
         metadata_snapshot->getSampleBlock(),
-        global_context,
-        chooseCompressionMethod(uri.key, compression_method),
-        client,
-        uri.bucket,
-        uri.key,
+        local_context,
+        chooseCompressionMethod(client_auth.uri.key, compression_method),
+        client_auth.client,
+        client_auth.uri.bucket,
+        client_auth.uri.key,
         min_upload_part_size,
         max_single_part_upload_size);
 }
 
+void StorageS3::updateClientAndAuthSettings(ContextPtr ctx, StorageS3::ClientAuthentificaiton & upd)
+{
+    auto settings = ctx->getStorageS3Settings().getSettings(upd.uri.uri.toString());
+    if (upd.client && (!upd.access_key_id.empty() || settings == upd.auth_settings))
+        return;
+
+    Aws::Auth::AWSCredentials credentials(upd.access_key_id, upd.secret_access_key);
+    HeaderCollection headers;
+    if (upd.access_key_id.empty())
+    {
+        credentials = Aws::Auth::AWSCredentials(settings.access_key_id, settings.secret_access_key);
+        headers = settings.headers;
+    }
+
+    S3::PocoHTTPClientConfiguration client_configuration = S3::ClientFactory::instance().createClientConfiguration(
+        ctx->getRemoteHostFilter(), ctx->getGlobalContext()->getSettingsRef().s3_max_redirects);
+
+    client_configuration.endpointOverride = upd.uri.endpoint;
+    client_configuration.maxConnections = upd.max_connections;
+
+    upd.client = S3::ClientFactory::instance().create(
+        client_configuration,
+        upd.uri.is_virtual_hosted_style,
+        credentials.GetAWSAccessKeyId(),
+        credentials.GetAWSSecretKey(),
+        settings.server_side_encryption_customer_key_base64,
+        std::move(headers),
+        settings.use_environment_credentials.value_or(ctx->getConfigRef().getBool("s3.use_environment_credentials", false)),
+        settings.use_insecure_imds_request.value_or(ctx->getConfigRef().getBool("s3.use_insecure_imds_request", false)));
+
+    upd.auth_settings = std::move(settings);
+}
+
 void registerStorageS3Impl(const String & name, StorageFactory & factory)
 {
     factory.registerStorage(name, [](const StorageFactory::Arguments & args)
@@ -364,10 +461,11 @@ void registerStorageS3Impl(const String & name, StorageFactory & factory)
 
         if (engine_args.size() < 2 || engine_args.size() > 5)
             throw Exception(
-                "Storage S3 requires 2 to 5 arguments: url, [access_key_id, secret_access_key], name of used format and [compression_method].", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
+                "Storage S3 requires 2 to 5 arguments: url, [access_key_id, secret_access_key], name of used format and [compression_method].",
+                ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
 
         for (auto & engine_arg : engine_args)
-            engine_arg = evaluateConstantExpressionOrIdentifierAsLiteral(engine_arg, args.local_context);
+            engine_arg = evaluateConstantExpressionOrIdentifierAsLiteral(engine_arg, args.getLocalContext());
 
         String url = engine_args[0]->as<ASTLiteral &>().value.safeGet<String>();
         Poco::URI uri (url);
@@ -381,9 +479,10 @@ void registerStorageS3Impl(const String & name, StorageFactory & factory)
             secret_access_key = engine_args[2]->as<ASTLiteral &>().value.safeGet<String>();
         }
 
-        UInt64 min_upload_part_size = args.local_context.getSettingsRef().s3_min_upload_part_size;
-        UInt64 max_single_part_upload_size = args.local_context.getSettingsRef().s3_max_single_part_upload_size;
-        UInt64 max_connections = args.local_context.getSettingsRef().s3_max_connections;
+        UInt64 s3_max_single_read_retries = args.getLocalContext()->getSettingsRef().s3_max_single_read_retries;
+        UInt64 min_upload_part_size = args.getLocalContext()->getSettingsRef().s3_min_upload_part_size;
+        UInt64 max_single_part_upload_size = args.getLocalContext()->getSettingsRef().s3_max_single_part_upload_size;
+        UInt64 max_connections = args.getLocalContext()->getSettingsRef().s3_max_connections;
 
         String compression_method;
         String format_name;
@@ -404,12 +503,13 @@ void registerStorageS3Impl(const String & name, StorageFactory & factory)
             secret_access_key,
             args.table_id,
             format_name,
+            s3_max_single_read_retries,
             min_upload_part_size,
             max_single_part_upload_size,
             max_connections,
             args.columns,
             args.constraints,
-            args.context,
+            args.getContext(),
             compression_method
         );
     },
diff --git a/src/Storages/StorageS3.h b/src/Storages/StorageS3.h
index f006de39c99..b068f82cfb1 100644
--- a/src/Storages/StorageS3.h
+++ b/src/Storages/StorageS3.h
@@ -4,10 +4,20 @@
 
 #if USE_AWS_S3
 
+#include <Core/Types.h>
+
+#include <Compression/CompressionInfo.h>
+
 #include <Storages/IStorage.h>
+#include <Storages/StorageS3Settings.h>
+
+#include <Processors/Sources/SourceWithProgress.h>
 #include <Poco/URI.h>
 #include <common/logger_useful.h>
 #include <ext/shared_ptr_helper.h>
+#include <IO/S3Common.h>
+#include <IO/CompressionMethod.h>
+#include <Interpreters/Context.h>
 
 namespace Aws::S3
 {
@@ -17,12 +27,74 @@ namespace Aws::S3
 namespace DB
 {
 
+class StorageS3SequentialSource;
+class StorageS3Source : public SourceWithProgress, WithContext
+{
+public:
+    class DisclosedGlobIterator
+    {
+        public:
+            DisclosedGlobIterator(Aws::S3::S3Client &, const S3::URI &);
+            String next();
+        private:
+            class Impl;
+            /// shared_ptr to have copy constructor
+            std::shared_ptr<Impl> pimpl;
+    };
+
+    using IteratorWrapper = std::function<String()>;
+
+    static Block getHeader(Block sample_block, bool with_path_column, bool with_file_column);
+
+    StorageS3Source(
+        bool need_path,
+        bool need_file,
+        const String & format,
+        String name_,
+        const Block & sample_block,
+        ContextPtr context_,
+        const ColumnsDescription & columns_,
+        UInt64 max_block_size_,
+        UInt64 s3_max_single_read_retries_,
+        const String compression_hint_,
+        const std::shared_ptr<Aws::S3::S3Client> & client_,
+        const String & bucket,
+        std::shared_ptr<IteratorWrapper> file_iterator_);
+
+    String getName() const override;
+
+    Chunk generate() override;
+
+private:
+    String name;
+    String bucket;
+    String file_path;
+    String format;
+    ColumnsDescription columns_desc;
+    UInt64 max_block_size;
+    UInt64 s3_max_single_read_retries;
+    String compression_hint;
+    std::shared_ptr<Aws::S3::S3Client> client;
+    Block sample_block;
+
+
+    std::unique_ptr<ReadBuffer> read_buf;
+    BlockInputStreamPtr reader;
+    bool initialized = false;
+    bool with_file_column = false;
+    bool with_path_column = false;
+    std::shared_ptr<IteratorWrapper> file_iterator;
+
+    /// Recreate ReadBuffer and BlockInputStream for each file.
+    bool initialize();
+};
+
 /**
  * This class represents table engine for external S3 urls.
  * It sends HTTP GET to server when select is called and
  * HTTP PUT when insert is called.
  */
-class StorageS3 : public ext::shared_ptr_helper<StorageS3>, public IStorage
+class StorageS3 : public ext::shared_ptr_helper<StorageS3>, public IStorage, WithContext
 {
 public:
     StorageS3(const S3::URI & uri,
@@ -30,13 +102,15 @@ public:
         const String & secret_access_key,
         const StorageID & table_id_,
         const String & format_name_,
+        UInt64 s3_max_single_read_retries_,
         UInt64 min_upload_part_size_,
         UInt64 max_single_part_upload_size_,
         UInt64 max_connections_,
         const ColumnsDescription & columns_,
         const ConstraintsDescription & constraints_,
-        const Context & context_,
-        const String & compression_method_ = "");
+        ContextPtr context_,
+        const String & compression_method_ = "",
+        bool distributed_processing_ = false);
 
     String getName() const override
     {
@@ -47,25 +121,41 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
 
-    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, const Context & context) override;
+    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, ContextPtr context) override;
 
     NamesAndTypesList getVirtuals() const override;
 
 private:
-    S3::URI uri;
-    const Context & global_context;
+
+    friend class StorageS3Cluster;
+    friend class TableFunctionS3Cluster;
+
+    struct ClientAuthentificaiton
+    {
+        const S3::URI uri;
+        const String access_key_id;
+        const String secret_access_key;
+        const UInt64 max_connections;
+        std::shared_ptr<Aws::S3::S3Client> client;
+        S3AuthSettings auth_settings;
+    };
+
+    ClientAuthentificaiton client_auth;
 
     String format_name;
+    UInt64 s3_max_single_read_retries;
     size_t min_upload_part_size;
     size_t max_single_part_upload_size;
     String compression_method;
-    std::shared_ptr<Aws::S3::S3Client> client;
     String name;
+    const bool distributed_processing;
+
+    static void updateClientAndAuthSettings(ContextPtr, ClientAuthentificaiton &);
 };
 
 }
diff --git a/src/Storages/StorageS3Cluster.cpp b/src/Storages/StorageS3Cluster.cpp
new file mode 100644
index 00000000000..8afc0e44023
--- /dev/null
+++ b/src/Storages/StorageS3Cluster.cpp
@@ -0,0 +1,166 @@
+#include "Storages/StorageS3Cluster.h"
+
+#if !defined(ARCADIA_BUILD)
+#include <Common/config.h>
+#endif
+
+#if USE_AWS_S3
+
+#include "Common/Exception.h"
+#include <Common/Throttler.h>
+#include "Client/Connection.h"
+#include "Core/QueryProcessingStage.h"
+#include <Core/UUID.h>
+#include "DataStreams/RemoteBlockInputStream.h"
+#include <Columns/ColumnsNumber.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeString.h>
+#include <IO/ReadBufferFromS3.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteBufferFromS3.h>
+#include <IO/WriteHelpers.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/getHeaderForProcessingStage.h>
+#include <Interpreters/SelectQueryOptions.h>
+#include <Interpreters/InterpreterSelectQuery.h>
+#include <Interpreters/getTableExpressions.h>
+#include <Formats/FormatFactory.h>
+#include <DataStreams/IBlockOutputStream.h>
+#include <DataStreams/AddingDefaultsBlockInputStream.h>
+#include <DataStreams/narrowBlockInputStreams.h>
+#include <Processors/Formats/InputStreamFromInputFormat.h>
+#include <Processors/Pipe.h>
+#include <Processors/Sources/SourceFromInputStream.h>
+#include "Processors/Sources/SourceWithProgress.h"
+#include <Processors/Sources/RemoteSource.h>
+#include <Parsers/queryToString.h>
+#include <Parsers/ASTTablesInSelectQuery.h>
+#include <Storages/IStorage.h>
+#include <Storages/SelectQueryInfo.h>
+#include <common/logger_useful.h>
+
+#include <aws/core/auth/AWSCredentials.h>
+#include <aws/s3/S3Client.h>
+#include <aws/s3/model/ListObjectsV2Request.h>
+
+#include <ios>
+#include <memory>
+#include <string>
+#include <thread>
+#include <cassert>
+
+namespace DB
+{
+
+
+StorageS3Cluster::StorageS3Cluster(
+    const String & filename_,
+    const String & access_key_id_,
+    const String & secret_access_key_,
+    const StorageID & table_id_,
+    String cluster_name_,
+    const String & format_name_,
+    UInt64 max_connections_,
+    const ColumnsDescription & columns_,
+    const ConstraintsDescription & constraints_,
+    ContextPtr context_,
+    const String & compression_method_)
+    : IStorage(table_id_)
+    , client_auth{S3::URI{Poco::URI{filename_}}, access_key_id_, secret_access_key_, max_connections_, {}, {}}
+    , filename(filename_)
+    , cluster_name(cluster_name_)
+    , format_name(format_name_)
+    , compression_method(compression_method_)
+{
+    StorageInMemoryMetadata storage_metadata;
+    storage_metadata.setColumns(columns_);
+    storage_metadata.setConstraints(constraints_);
+    setInMemoryMetadata(storage_metadata);
+    StorageS3::updateClientAndAuthSettings(context_, client_auth);
+}
+
+/// The code executes on initiator
+Pipe StorageS3Cluster::read(
+    const Names & column_names,
+    const StorageMetadataPtr & metadata_snapshot,
+    SelectQueryInfo & query_info,
+    ContextPtr context,
+    QueryProcessingStage::Enum processed_stage,
+    size_t /*max_block_size*/,
+    unsigned /*num_streams*/)
+{
+    StorageS3::updateClientAndAuthSettings(context, client_auth);
+
+    auto cluster = context->getCluster(cluster_name)->getClusterWithReplicasAsShards(context->getSettings());
+    S3::URI s3_uri(Poco::URI{filename});
+    StorageS3::updateClientAndAuthSettings(context, client_auth);
+
+    auto iterator = std::make_shared<StorageS3Source::DisclosedGlobIterator>(*client_auth.client, client_auth.uri);
+    auto callback = std::make_shared<StorageS3Source::IteratorWrapper>([iterator]() mutable -> String
+    {
+        return iterator->next();
+    });
+
+    /// Calculate the header. This is significant, because some columns could be thrown away in some cases like query with count(*)
+    Block header =
+        InterpreterSelectQuery(query_info.query, context, SelectQueryOptions(processed_stage).analyze()).getSampleBlock();
+
+    const Scalars & scalars = context->hasQueryContext() ? context->getQueryContext()->getScalars() : Scalars{};
+
+    Pipes pipes;
+    connections.reserve(cluster->getShardCount());
+
+    const bool add_agg_info = processed_stage == QueryProcessingStage::WithMergeableState;
+
+    for (const auto & replicas : cluster->getShardsAddresses())
+    {
+        /// There will be only one replica, because we consider each replica as a shard
+        for (const auto & node : replicas)
+        {
+            connections.emplace_back(std::make_shared<Connection>(
+                node.host_name, node.port, context->getGlobalContext()->getCurrentDatabase(),
+                node.user, node.password, node.cluster, node.cluster_secret,
+                "S3ClusterInititiator",
+                node.compression,
+                node.secure
+            ));
+
+            /// For unknown reason global context is passed to IStorage::read() method
+            /// So, task_identifier is passed as constructor argument. It is more obvious.
+            auto remote_query_executor = std::make_shared<RemoteQueryExecutor>(
+                    *connections.back(), queryToString(query_info.query), header, context,
+                    /*throttler=*/nullptr, scalars, Tables(), processed_stage, callback);
+
+            pipes.emplace_back(std::make_shared<RemoteSource>(remote_query_executor, add_agg_info, false));
+        }
+    }
+
+    metadata_snapshot->check(column_names, getVirtuals(), getStorageID());
+    return Pipe::unitePipes(std::move(pipes));
+}
+
+QueryProcessingStage::Enum StorageS3Cluster::getQueryProcessingStage(
+    ContextPtr context, QueryProcessingStage::Enum to_stage, SelectQueryInfo &) const
+{
+    /// Initiator executes query on remote node.
+    if (context->getClientInfo().query_kind == ClientInfo::QueryKind::INITIAL_QUERY)
+        if (to_stage >= QueryProcessingStage::Enum::WithMergeableState)
+            return QueryProcessingStage::Enum::WithMergeableState;
+
+    /// Follower just reads the data.
+    return QueryProcessingStage::Enum::FetchColumns;
+}
+
+
+NamesAndTypesList StorageS3Cluster::getVirtuals() const
+{
+    return NamesAndTypesList{
+        {"_path", std::make_shared<DataTypeString>()},
+        {"_file", std::make_shared<DataTypeString>()}
+    };
+}
+
+
+}
+
+#endif
diff --git a/src/Storages/StorageS3Cluster.h b/src/Storages/StorageS3Cluster.h
new file mode 100644
index 00000000000..c98840d62fc
--- /dev/null
+++ b/src/Storages/StorageS3Cluster.h
@@ -0,0 +1,63 @@
+#pragma once
+
+#if !defined(ARCADIA_BUILD)
+#include <Common/config.h>
+#endif
+
+#if USE_AWS_S3
+
+#include "Client/Connection.h"
+#include <Interpreters/Cluster.h>
+#include <IO/S3Common.h>
+#include <Storages/StorageS3.h>
+
+#include <memory>
+#include <optional>
+#include "ext/shared_ptr_helper.h"
+
+namespace DB
+{
+
+class Context;
+
+struct ClientAuthentificationBuilder
+{
+    String access_key_id;
+    String secret_access_key;
+    UInt64 max_connections;
+};
+
+class StorageS3Cluster : public ext::shared_ptr_helper<StorageS3Cluster>, public IStorage
+{
+    friend struct ext::shared_ptr_helper<StorageS3Cluster>;
+public:
+    std::string getName() const override { return "S3Cluster"; }
+
+    Pipe read(const Names &, const StorageMetadataPtr &, SelectQueryInfo &,
+        ContextPtr, QueryProcessingStage::Enum, size_t /*max_block_size*/, unsigned /*num_streams*/) override;
+
+    QueryProcessingStage::Enum getQueryProcessingStage(ContextPtr, QueryProcessingStage::Enum, SelectQueryInfo &) const override;
+
+    NamesAndTypesList getVirtuals() const override;
+
+protected:
+    StorageS3Cluster(
+        const String & filename_, const String & access_key_id_, const String & secret_access_key_, const StorageID & table_id_,
+        String cluster_name_, const String & format_name_, UInt64 max_connections_, const ColumnsDescription & columns_,
+        const ConstraintsDescription & constraints_, ContextPtr context_, const String & compression_method_);
+
+private:
+    /// Connections from initiator to other nodes
+    std::vector<std::shared_ptr<Connection>> connections;
+    StorageS3::ClientAuthentificaiton client_auth;
+
+    String filename;
+    String cluster_name;
+    String format_name;
+    String compression_method;
+};
+
+
+}
+
+#endif
diff --git a/src/Storages/StorageS3Settings.cpp b/src/Storages/StorageS3Settings.cpp
index 6d97e6fae95..8aafc12a688 100644
--- a/src/Storages/StorageS3Settings.cpp
+++ b/src/Storages/StorageS3Settings.cpp
@@ -36,6 +36,11 @@ void StorageS3Settings::loadFromConfig(const String & config_elem, const Poco::U
             {
                 use_environment_credentials = config.getBool(config_elem + "." + key + ".use_environment_credentials");
             }
+            std::optional<bool> use_insecure_imds_request;
+            if (config.has(config_elem + "." + key + ".use_insecure_imds_request"))
+            {
+                use_insecure_imds_request = config.getBool(config_elem + "." + key + ".use_insecure_imds_request");
+            }
 
             HeaderCollection headers;
             Poco::Util::AbstractConfiguration::Keys subconfig_keys;
@@ -52,7 +57,7 @@ void StorageS3Settings::loadFromConfig(const String & config_elem, const Poco::U
                 }
             }
 
-            settings.emplace(endpoint, S3AuthSettings{std::move(access_key_id), std::move(secret_access_key), std::move(server_side_encryption_customer_key_base64), std::move(headers), use_environment_credentials});
+            settings.emplace(endpoint, S3AuthSettings{std::move(access_key_id), std::move(secret_access_key), std::move(server_side_encryption_customer_key_base64), std::move(headers), use_environment_credentials, use_insecure_imds_request});
         }
     }
 }
diff --git a/src/Storages/StorageS3Settings.h b/src/Storages/StorageS3Settings.h
index 59b98ebdfdd..66e776dbea2 100644
--- a/src/Storages/StorageS3Settings.h
+++ b/src/Storages/StorageS3Settings.h
@@ -14,24 +14,34 @@ class AbstractConfiguration;
 
 namespace DB
 {
-
 struct HttpHeader
 {
-    const String name;
-    const String value;
+    String name;
+    String value;
+
+    inline bool operator==(const HttpHeader & other) const { return name == other.name && value == other.value; }
 };
 
 using HeaderCollection = std::vector<HttpHeader>;
 
 struct S3AuthSettings
 {
-    const String access_key_id;
-    const String secret_access_key;
-    const String server_side_encryption_customer_key_base64;
+    String access_key_id;
+    String secret_access_key;
+    String server_side_encryption_customer_key_base64;
 
-    const HeaderCollection headers;
+    HeaderCollection headers;
 
     std::optional<bool> use_environment_credentials;
+    std::optional<bool> use_insecure_imds_request;
+
+    inline bool operator==(const S3AuthSettings & other) const
+    {
+        return access_key_id == other.access_key_id && secret_access_key == other.secret_access_key
+            && server_side_encryption_customer_key_base64 == other.server_side_encryption_customer_key_base64 && headers == other.headers
+            && use_environment_credentials == other.use_environment_credentials
+            && use_insecure_imds_request == other.use_insecure_imds_request;
+    }
 };
 
 /// Settings for the StorageS3.
diff --git a/src/Storages/StorageSet.cpp b/src/Storages/StorageSet.cpp
index d64042f0c1e..34bbfed874f 100644
--- a/src/Storages/StorageSet.cpp
+++ b/src/Storages/StorageSet.cpp
@@ -99,7 +99,7 @@ void SetOrJoinBlockOutputStream::writeSuffix()
 }
 
 
-BlockOutputStreamPtr StorageSetOrJoinBase::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, const Context & /*context*/)
+BlockOutputStreamPtr StorageSetOrJoinBase::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, ContextPtr /*context*/)
 {
     UInt64 id = ++increment;
     return std::make_shared<SetOrJoinBlockOutputStream>(*this, metadata_snapshot, path, path + "tmp/", toString(id) + ".bin", persistent);
@@ -156,7 +156,7 @@ size_t StorageSet::getSize() const { return set->getTotalRowCount(); }
 std::optional<UInt64> StorageSet::totalRows(const Settings &) const { return set->getTotalRowCount(); }
 std::optional<UInt64> StorageSet::totalBytes(const Settings &) const { return set->getTotalByteCount(); }
 
-void StorageSet::truncate(const ASTPtr &, const StorageMetadataPtr & metadata_snapshot, const Context &, TableExclusiveLockHolder &)
+void StorageSet::truncate(const ASTPtr &, const StorageMetadataPtr & metadata_snapshot, ContextPtr, TableExclusiveLockHolder &)
 {
     disk->removeRecursive(path);
     disk->createDirectories(path);
@@ -246,7 +246,7 @@ void registerStorageSet(StorageFactory & factory)
         if (has_settings)
             set_settings.loadFromQuery(*args.storage_def);
 
-        DiskPtr disk = args.context.getDisk(set_settings.disk);
+        DiskPtr disk = args.getContext()->getDisk(set_settings.disk);
         return StorageSet::create(disk, args.relative_data_path, args.table_id, args.columns, args.constraints, set_settings.persistent);
     }, StorageFactory::StorageFeatures{ .supports_settings = true, });
 }
diff --git a/src/Storages/StorageSet.h b/src/Storages/StorageSet.h
index 9b9078f7dd5..b87dcf21a23 100644
--- a/src/Storages/StorageSet.h
+++ b/src/Storages/StorageSet.h
@@ -23,7 +23,7 @@ class StorageSetOrJoinBase : public IStorage
 public:
     void rename(const String & new_path_to_table_data, const StorageID & new_table_id) override;
 
-    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, const Context & context) override;
+    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, ContextPtr context) override;
 
     bool storesDataOnDisk() const override { return true; }
     Strings getDataPaths() const override { return {path}; }
@@ -72,7 +72,7 @@ public:
     /// Access the insides.
     SetPtr & getSet() { return set; }
 
-    void truncate(const ASTPtr &, const StorageMetadataPtr & metadata_snapshot, const Context &, TableExclusiveLockHolder &) override;
+    void truncate(const ASTPtr &, const StorageMetadataPtr & metadata_snapshot, ContextPtr, TableExclusiveLockHolder &) override;
 
     std::optional<UInt64> totalRows(const Settings & settings) const override;
     std::optional<UInt64> totalBytes(const Settings & settings) const override;
diff --git a/src/Storages/StorageStripeLog.cpp b/src/Storages/StorageStripeLog.cpp
index db4fbff78cd..d845dfb71f2 100644
--- a/src/Storages/StorageStripeLog.cpp
+++ b/src/Storages/StorageStripeLog.cpp
@@ -228,6 +228,11 @@ public:
         storage.file_checker.save();
 
         done = true;
+
+        /// unlock should be done from the same thread as lock, and dtor may be
+        /// called from different thread, so it should be done here (at least in
+        /// case of no exceptions occurred)
+        lock.unlock();
     }
 
 private:
@@ -302,9 +307,9 @@ void StorageStripeLog::rename(const String & new_path_to_table_data, const Stora
 }
 
 
-static std::chrono::seconds getLockTimeout(const Context & context)
+static std::chrono::seconds getLockTimeout(ContextPtr context)
 {
-    const Settings & settings = context.getSettingsRef();
+    const Settings & settings = context->getSettingsRef();
     Int64 lock_timeout = settings.lock_acquire_timeout.totalSeconds();
     if (settings.max_execution_time.totalSeconds() != 0 && settings.max_execution_time.totalSeconds() < lock_timeout)
         lock_timeout = settings.max_execution_time.totalSeconds();
@@ -316,7 +321,7 @@ Pipe StorageStripeLog::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & /*query_info*/,
-    const Context & context,
+    ContextPtr context,
     QueryProcessingStage::Enum /*processed_stage*/,
     const size_t /*max_block_size*/,
     unsigned num_streams)
@@ -353,7 +358,7 @@ Pipe StorageStripeLog::read(
         std::advance(end, (stream + 1) * size / num_streams);
 
         pipes.emplace_back(std::make_shared<StripeLogSource>(
-            *this, metadata_snapshot, column_names, context.getSettingsRef().max_read_buffer_size, index, begin, end));
+            *this, metadata_snapshot, column_names, context->getSettingsRef().max_read_buffer_size, index, begin, end));
     }
 
     /// We do not keep read lock directly at the time of reading, because we read ranges of data that do not change.
@@ -362,7 +367,7 @@ Pipe StorageStripeLog::read(
 }
 
 
-BlockOutputStreamPtr StorageStripeLog::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, const Context & context)
+BlockOutputStreamPtr StorageStripeLog::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, ContextPtr context)
 {
     std::unique_lock lock(rwlock, getLockTimeout(context));
     if (!lock)
@@ -372,7 +377,7 @@ BlockOutputStreamPtr StorageStripeLog::write(const ASTPtr & /*query*/, const Sto
 }
 
 
-CheckResults StorageStripeLog::checkData(const ASTPtr & /* query */, const Context & context)
+CheckResults StorageStripeLog::checkData(const ASTPtr & /* query */, ContextPtr context)
 {
     std::shared_lock lock(rwlock, getLockTimeout(context));
     if (!lock)
@@ -381,7 +386,7 @@ CheckResults StorageStripeLog::checkData(const ASTPtr & /* query */, const Conte
     return file_checker.check();
 }
 
-void StorageStripeLog::truncate(const ASTPtr &, const StorageMetadataPtr &, const Context &, TableExclusiveLockHolder &)
+void StorageStripeLog::truncate(const ASTPtr &, const StorageMetadataPtr &, ContextPtr, TableExclusiveLockHolder &)
 {
     disk->clearDirectory(table_path);
     file_checker = FileChecker{disk, table_path + "sizes.json"};
@@ -402,11 +407,11 @@ void registerStorageStripeLog(StorageFactory & factory)
                 ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
 
         String disk_name = getDiskName(*args.storage_def);
-        DiskPtr disk = args.context.getDisk(disk_name);
+        DiskPtr disk = args.getContext()->getDisk(disk_name);
 
         return StorageStripeLog::create(
             disk, args.relative_data_path, args.table_id, args.columns, args.constraints,
-            args.attach, args.context.getSettings().max_compress_block_size);
+            args.attach, args.getContext()->getSettings().max_compress_block_size);
     }, features);
 }
 
diff --git a/src/Storages/StorageStripeLog.h b/src/Storages/StorageStripeLog.h
index 5782e2526d3..7fad94870dc 100644
--- a/src/Storages/StorageStripeLog.h
+++ b/src/Storages/StorageStripeLog.h
@@ -29,21 +29,21 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
 
-    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, const Context & context) override;
+    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, ContextPtr context) override;
 
     void rename(const String & new_path_to_table_data, const StorageID & new_table_id) override;
 
-    CheckResults checkData(const ASTPtr & /* query */, const Context & /* context */) override;
+    CheckResults checkData(const ASTPtr & /* query */, ContextPtr /* context */) override;
 
     bool storesDataOnDisk() const override { return true; }
     Strings getDataPaths() const override { return {DB::fullPath(disk, table_path)}; }
 
-    void truncate(const ASTPtr &, const StorageMetadataPtr &, const Context &, TableExclusiveLockHolder&) override;
+    void truncate(const ASTPtr &, const StorageMetadataPtr &, ContextPtr, TableExclusiveLockHolder&) override;
 
 protected:
     StorageStripeLog(
@@ -68,7 +68,7 @@ private:
     size_t max_compress_block_size;
 
     FileChecker file_checker;
-    mutable std::shared_timed_mutex rwlock;
+    std::shared_timed_mutex rwlock;
 
     Poco::Logger * log;
 };
diff --git a/src/Storages/StorageTableFunction.h b/src/Storages/StorageTableFunction.h
index 7bdd6469ebc..7d909165d5f 100644
--- a/src/Storages/StorageTableFunction.h
+++ b/src/Storages/StorageTableFunction.h
@@ -73,7 +73,7 @@ public:
             const Names & column_names,
             const StorageMetadataPtr & metadata_snapshot,
             SelectQueryInfo & query_info,
-            const Context & context,
+            ContextPtr context,
             QueryProcessingStage::Enum processed_stage,
             size_t max_block_size,
             unsigned num_streams) override
@@ -94,7 +94,9 @@ public:
                     pipe.getHeader().getColumnsWithTypeAndName(),
                     to_header.getColumnsWithTypeAndName(),
                     ActionsDAG::MatchColumnsMode::Name);
-            auto convert_actions = std::make_shared<ExpressionActions>(convert_actions_dag);
+            auto convert_actions = std::make_shared<ExpressionActions>(
+                convert_actions_dag,
+                ExpressionActionsSettings::fromSettings(context->getSettingsRef()));
 
             pipe.addSimpleTransform([&](const Block & header)
             {
@@ -107,7 +109,7 @@ public:
     BlockOutputStreamPtr write(
             const ASTPtr & query,
             const StorageMetadataPtr & metadata_snapshot,
-            const Context & context) override
+            ContextPtr context) override
     {
         auto storage = getNested();
         auto cached_structure = metadata_snapshot->getSampleBlock();
diff --git a/src/Storages/StorageTinyLog.cpp b/src/Storages/StorageTinyLog.cpp
index 06e2c21b1a8..41c2961e929 100644
--- a/src/Storages/StorageTinyLog.cpp
+++ b/src/Storages/StorageTinyLog.cpp
@@ -109,11 +109,11 @@ private:
     using FileStreams = std::map<String, std::unique_ptr<Stream>>;
     FileStreams streams;
 
-    using DeserializeState = IDataType::DeserializeBinaryBulkStatePtr;
+    using DeserializeState = ISerialization::DeserializeBinaryBulkStatePtr;
     using DeserializeStates = std::map<String, DeserializeState>;
     DeserializeStates deserialize_states;
 
-    void readData(const NameAndTypePair & name_and_type, ColumnPtr & column, UInt64 limit, IDataType::SubstreamsCache & cache);
+    void readData(const NameAndTypePair & name_and_type, ColumnPtr & column, UInt64 limit, ISerialization::SubstreamsCache & cache);
 };
 
 
@@ -132,7 +132,7 @@ Chunk TinyLogSource::generate()
         return {};
     }
 
-    std::unordered_map<String, IDataType::SubstreamsCache> caches;
+    std::unordered_map<String, ISerialization::SubstreamsCache> caches;
     for (const auto & name_type : columns)
     {
         ColumnPtr column;
@@ -162,16 +162,18 @@ Chunk TinyLogSource::generate()
 
 
 void TinyLogSource::readData(const NameAndTypePair & name_and_type,
-    ColumnPtr & column, UInt64 limit, IDataType::SubstreamsCache & cache)
+    ColumnPtr & column, UInt64 limit, ISerialization::SubstreamsCache & cache)
 {
-    IDataType::DeserializeBinaryBulkSettings settings; /// TODO Use avg_value_size_hint.
+    ISerialization::DeserializeBinaryBulkSettings settings; /// TODO Use avg_value_size_hint.
     const auto & [name, type] = name_and_type;
-    settings.getter = [&] (const IDataType::SubstreamPath & path) -> ReadBuffer *
+    auto serialization = IDataType::getSerialization(name_and_type);
+
+    settings.getter = [&] (const ISerialization::SubstreamPath & path) -> ReadBuffer *
     {
-        if (cache.count(IDataType::getSubcolumnNameForStream(path)))
+        if (cache.count(ISerialization::getSubcolumnNameForStream(path)))
             return nullptr;
 
-        String stream_name = IDataType::getFileNameForStream(name_and_type, path);
+        String stream_name = ISerialization::getFileNameForStream(name_and_type, path);
         auto & stream = streams[stream_name];
         if (!stream)
         {
@@ -184,9 +186,9 @@ void TinyLogSource::readData(const NameAndTypePair & name_and_type,
     };
 
     if (deserialize_states.count(name) == 0)
-         type->deserializeBinaryBulkStatePrefix(settings, deserialize_states[name]);
+         serialization->deserializeBinaryBulkStatePrefix(settings, deserialize_states[name]);
 
-    type->deserializeBinaryBulkWithMultipleStreams(column, limit, settings, deserialize_states[name], &cache);
+    serialization->deserializeBinaryBulkWithMultipleStreams(column, limit, settings, deserialize_states[name], &cache);
 }
 
 
@@ -261,24 +263,24 @@ private:
     using FileStreams = std::map<String, std::unique_ptr<Stream>>;
     FileStreams streams;
 
-    using SerializeState = IDataType::SerializeBinaryBulkStatePtr;
+    using SerializeState = ISerialization::SerializeBinaryBulkStatePtr;
     using SerializeStates = std::map<String, SerializeState>;
     SerializeStates serialize_states;
 
     using WrittenStreams = std::set<String>;
 
-    IDataType::OutputStreamGetter createStreamGetter(const NameAndTypePair & column, WrittenStreams & written_streams);
+    ISerialization::OutputStreamGetter createStreamGetter(const NameAndTypePair & column, WrittenStreams & written_streams);
     void writeData(const NameAndTypePair & name_and_type, const IColumn & column, WrittenStreams & written_streams);
 };
 
 
-IDataType::OutputStreamGetter TinyLogBlockOutputStream::createStreamGetter(
+ISerialization::OutputStreamGetter TinyLogBlockOutputStream::createStreamGetter(
     const NameAndTypePair & column,
     WrittenStreams & written_streams)
 {
-    return [&] (const IDataType::SubstreamPath & path) -> WriteBuffer *
+    return [&] (const ISerialization::SubstreamPath & path) -> WriteBuffer *
     {
-        String stream_name = IDataType::getFileNameForStream(column, path);
+        String stream_name = ISerialization::getFileNameForStream(column, path);
 
         if (!written_streams.insert(stream_name).second)
             return nullptr;
@@ -298,8 +300,9 @@ IDataType::OutputStreamGetter TinyLogBlockOutputStream::createStreamGetter(
 
 void TinyLogBlockOutputStream::writeData(const NameAndTypePair & name_and_type, const IColumn & column, WrittenStreams & written_streams)
 {
-    IDataType::SerializeBinaryBulkSettings settings;
+    ISerialization::SerializeBinaryBulkSettings settings;
     const auto & [name, type] = name_and_type;
+    auto serialization = type->getDefaultSerialization();
 
     if (serialize_states.count(name) == 0)
     {
@@ -307,11 +310,11 @@ void TinyLogBlockOutputStream::writeData(const NameAndTypePair & name_and_type,
         /// Use different WrittenStreams set, or we get nullptr for them in `serializeBinaryBulkWithMultipleStreams`
         WrittenStreams prefix_written_streams;
         settings.getter = createStreamGetter(name_and_type, prefix_written_streams);
-        type->serializeBinaryBulkStatePrefix(settings, serialize_states[name]);
+        serialization->serializeBinaryBulkStatePrefix(settings, serialize_states[name]);
     }
 
     settings.getter = createStreamGetter(name_and_type, written_streams);
-    type->serializeBinaryBulkWithMultipleStreams(column, 0, 0, settings, serialize_states[name]);
+    serialization->serializeBinaryBulkWithMultipleStreams(column, 0, 0, settings, serialize_states[name]);
 }
 
 
@@ -328,14 +331,15 @@ void TinyLogBlockOutputStream::writeSuffix()
     }
 
     WrittenStreams written_streams;
-    IDataType::SerializeBinaryBulkSettings settings;
+    ISerialization::SerializeBinaryBulkSettings settings;
     for (const auto & column : getHeader())
     {
         auto it = serialize_states.find(column.name);
         if (it != serialize_states.end())
         {
             settings.getter = createStreamGetter(NameAndTypePair(column.name, column.type), written_streams);
-            column.type->serializeBinaryBulkStateSuffix(settings, it->second);
+            auto serialization = column.type->getDefaultSerialization();
+            serialization->serializeBinaryBulkStateSuffix(settings, it->second);
         }
     }
 
@@ -353,6 +357,11 @@ void TinyLogBlockOutputStream::writeSuffix()
     for (const auto & file : column_files)
         storage.file_checker.update(file);
     storage.file_checker.save();
+
+    /// unlock should be done from the same thread as lock, and dtor may be
+    /// called from different thread, so it should be done here (at least in
+    /// case of no exceptions occurred)
+    lock.unlock();
 }
 
 
@@ -423,9 +432,9 @@ void StorageTinyLog::addFiles(const NameAndTypePair & column)
         throw Exception("Duplicate column with name " + name + " in constructor of StorageTinyLog.",
             ErrorCodes::DUPLICATE_COLUMN);
 
-    IDataType::StreamCallback stream_callback = [&] (const IDataType::SubstreamPath & substream_path, const IDataType & /* substream_type */)
+    ISerialization::StreamCallback stream_callback = [&] (const ISerialization::SubstreamPath & substream_path)
     {
-        String stream_name = IDataType::getFileNameForStream(column, substream_path);
+        String stream_name = ISerialization::getFileNameForStream(column, substream_path);
         if (!files.count(stream_name))
         {
             ColumnData column_data;
@@ -434,8 +443,9 @@ void StorageTinyLog::addFiles(const NameAndTypePair & column)
         }
     };
 
-    IDataType::SubstreamPath substream_path;
-    type->enumerateStreams(stream_callback, substream_path);
+    ISerialization::SubstreamPath substream_path;
+    auto serialization = type->getDefaultSerialization();
+    serialization->enumerateStreams(stream_callback, substream_path);
 }
 
 
@@ -455,9 +465,9 @@ void StorageTinyLog::rename(const String & new_path_to_table_data, const Storage
 }
 
 
-static std::chrono::seconds getLockTimeout(const Context & context)
+static std::chrono::seconds getLockTimeout(ContextPtr context)
 {
-    const Settings & settings = context.getSettingsRef();
+    const Settings & settings = context->getSettingsRef();
     Int64 lock_timeout = settings.lock_acquire_timeout.totalSeconds();
     if (settings.max_execution_time.totalSeconds() != 0 && settings.max_execution_time.totalSeconds() < lock_timeout)
         lock_timeout = settings.max_execution_time.totalSeconds();
@@ -469,7 +479,7 @@ Pipe StorageTinyLog::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & /*query_info*/,
-    const Context & context,
+    ContextPtr context,
     QueryProcessingStage::Enum /*processed_stage*/,
     const size_t max_block_size,
     const unsigned /*num_streams*/)
@@ -480,7 +490,7 @@ Pipe StorageTinyLog::read(
 
     // When reading, we lock the entire storage, because we only have one file
     // per column and can't modify it concurrently.
-    const Settings & settings = context.getSettingsRef();
+    const Settings & settings = context->getSettingsRef();
 
     std::shared_lock lock{rwlock, getLockTimeout(context)};
     if (!lock)
@@ -496,13 +506,13 @@ Pipe StorageTinyLog::read(
 }
 
 
-BlockOutputStreamPtr StorageTinyLog::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, const Context & context)
+BlockOutputStreamPtr StorageTinyLog::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, ContextPtr context)
 {
     return std::make_shared<TinyLogBlockOutputStream>(*this, metadata_snapshot, std::unique_lock{rwlock, getLockTimeout(context)});
 }
 
 
-CheckResults StorageTinyLog::checkData(const ASTPtr & /* query */, const Context & context)
+CheckResults StorageTinyLog::checkData(const ASTPtr & /* query */, ContextPtr context)
 {
     std::shared_lock lock(rwlock, getLockTimeout(context));
     if (!lock)
@@ -512,7 +522,7 @@ CheckResults StorageTinyLog::checkData(const ASTPtr & /* query */, const Context
 }
 
 void StorageTinyLog::truncate(
-    const ASTPtr &, const StorageMetadataPtr & metadata_snapshot, const Context &, TableExclusiveLockHolder &)
+    const ASTPtr &, const StorageMetadataPtr & metadata_snapshot, ContextPtr, TableExclusiveLockHolder &)
 {
     disk->clearDirectory(table_path);
 
@@ -538,11 +548,11 @@ void registerStorageTinyLog(StorageFactory & factory)
                 ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
 
         String disk_name = getDiskName(*args.storage_def);
-        DiskPtr disk = args.context.getDisk(disk_name);
+        DiskPtr disk = args.getContext()->getDisk(disk_name);
 
         return StorageTinyLog::create(
             disk, args.relative_data_path, args.table_id, args.columns, args.constraints,
-            args.attach, args.context.getSettings().max_compress_block_size);
+            args.attach, args.getContext()->getSettings().max_compress_block_size);
     }, features);
 }
 
diff --git a/src/Storages/StorageTinyLog.h b/src/Storages/StorageTinyLog.h
index b76e8e34dfb..01652169b62 100644
--- a/src/Storages/StorageTinyLog.h
+++ b/src/Storages/StorageTinyLog.h
@@ -28,22 +28,22 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
 
-    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, const Context & context) override;
+    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, ContextPtr context) override;
 
     void rename(const String & new_path_to_table_data, const StorageID & new_table_id) override;
 
-    CheckResults checkData(const ASTPtr & /* query */, const Context & /* context */) override;
+    CheckResults checkData(const ASTPtr & /* query */, ContextPtr /* context */) override;
 
     bool storesDataOnDisk() const override { return true; }
     Strings getDataPaths() const override { return {DB::fullPath(disk, table_path)}; }
     bool supportsSubcolumns() const override { return true; }
 
-    void truncate(const ASTPtr &, const StorageMetadataPtr & metadata_snapshot, const Context &, TableExclusiveLockHolder &) override;
+    void truncate(const ASTPtr &, const StorageMetadataPtr & metadata_snapshot, ContextPtr, TableExclusiveLockHolder &) override;
 
 protected:
     StorageTinyLog(
@@ -70,7 +70,7 @@ private:
     Files files;
 
     FileChecker file_checker;
-    mutable std::shared_timed_mutex rwlock;
+    std::shared_timed_mutex rwlock;
 
     Poco::Logger * log;
 
diff --git a/src/Storages/StorageURL.cpp b/src/Storages/StorageURL.cpp
index ca984f9ece9..8b6d7839de0 100644
--- a/src/Storages/StorageURL.cpp
+++ b/src/Storages/StorageURL.cpp
@@ -33,7 +33,7 @@ namespace ErrorCodes
 
 IStorageURLBase::IStorageURLBase(
     const Poco::URI & uri_,
-    const Context & context_,
+    ContextPtr /*context_*/,
     const StorageID & table_id_,
     const String & format_name_,
     const std::optional<FormatSettings> & format_settings_,
@@ -42,13 +42,10 @@ IStorageURLBase::IStorageURLBase(
     const String & compression_method_)
     : IStorage(table_id_)
     , uri(uri_)
-    , context_global(context_)
     , compression_method(compression_method_)
     , format_name(format_name_)
     , format_settings(format_settings_)
 {
-    context_global.getRemoteHostFilter().checkURL(uri);
-
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(columns_);
     storage_metadata.setConstraints(constraints_);
@@ -67,7 +64,7 @@ namespace
             const std::optional<FormatSettings> & format_settings,
             String name_,
             const Block & sample_block,
-            const Context & context,
+            ContextPtr context,
             const ColumnsDescription & columns,
             UInt64 max_block_size,
             const ConnectionTimeouts & timeouts,
@@ -99,11 +96,11 @@ namespace
                     method,
                     std::move(callback),
                     timeouts,
-                    context.getSettingsRef().max_http_get_redirects,
+                    context->getSettingsRef().max_http_get_redirects,
                     Poco::Net::HTTPBasicCredentials{},
                     DBMS_DEFAULT_BUFFER_SIZE,
                     header,
-                    context.getRemoteHostFilter()),
+                    context->getRemoteHostFilter()),
                 compression_method);
 
             auto input_format = FormatFactory::instance().getInput(format, *read_buf, sample_block, context, max_block_size, format_settings);
@@ -147,7 +144,7 @@ StorageURLBlockOutputStream::StorageURLBlockOutputStream(const Poco::URI & uri,
         const String & format,
         const std::optional<FormatSettings> & format_settings,
         const Block & sample_block_,
-        const Context & context,
+        ContextPtr context,
         const ConnectionTimeouts & timeouts,
         const CompressionMethod compression_method)
         : sample_block(sample_block_)
@@ -187,7 +184,7 @@ std::vector<std::pair<std::string, std::string>> IStorageURLBase::getReadURIPara
     const Names & /*column_names*/,
     const StorageMetadataPtr & /*metadata_snapshot*/,
     const SelectQueryInfo & /*query_info*/,
-    const Context & /*context*/,
+    ContextPtr /*context*/,
     QueryProcessingStage::Enum & /*processed_stage*/,
     size_t /*max_block_size*/) const
 {
@@ -198,7 +195,7 @@ std::function<void(std::ostream &)> IStorageURLBase::getReadPOSTDataCallback(
     const Names & /*column_names*/,
     const StorageMetadataPtr & /*metadata_snapshot*/,
     const SelectQueryInfo & /*query_info*/,
-    const Context & /*context*/,
+    ContextPtr /*context*/,
     QueryProcessingStage::Enum & /*processed_stage*/,
     size_t /*max_block_size*/) const
 {
@@ -210,13 +207,13 @@ Pipe IStorageURLBase::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & query_info,
-    const Context & context,
+    ContextPtr local_context,
     QueryProcessingStage::Enum processed_stage,
     size_t max_block_size,
     unsigned /*num_streams*/)
 {
     auto request_uri = uri;
-    auto params = getReadURIParams(column_names, metadata_snapshot, query_info, context, processed_stage, max_block_size);
+    auto params = getReadURIParams(column_names, metadata_snapshot, query_info, local_context, processed_stage, max_block_size);
     for (const auto & [param, value] : params)
         request_uri.addQueryParameter(param, value);
 
@@ -225,26 +222,40 @@ Pipe IStorageURLBase::read(
         getReadMethod(),
         getReadPOSTDataCallback(
             column_names, metadata_snapshot, query_info,
-            context, processed_stage, max_block_size),
+            local_context, processed_stage, max_block_size),
         format_name,
         format_settings,
         getName(),
         getHeaderBlock(column_names, metadata_snapshot),
-        context,
+        local_context,
         metadata_snapshot->getColumns(),
         max_block_size,
-        ConnectionTimeouts::getHTTPTimeouts(context),
+        ConnectionTimeouts::getHTTPTimeouts(local_context),
         chooseCompressionMethod(request_uri.getPath(), compression_method)));
 }
 
-BlockOutputStreamPtr IStorageURLBase::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, const Context & /*context*/)
+BlockOutputStreamPtr IStorageURLBase::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, ContextPtr context)
 {
     return std::make_shared<StorageURLBlockOutputStream>(uri, format_name,
-        format_settings, metadata_snapshot->getSampleBlock(), context_global,
-        ConnectionTimeouts::getHTTPTimeouts(context_global),
+        format_settings, metadata_snapshot->getSampleBlock(), context,
+        ConnectionTimeouts::getHTTPTimeouts(context),
         chooseCompressionMethod(uri.toString(), compression_method));
 }
 
+StorageURL::StorageURL(const Poco::URI & uri_,
+           const StorageID & table_id_,
+           const String & format_name_,
+           const std::optional<FormatSettings> & format_settings_,
+           const ColumnsDescription & columns_,
+           const ConstraintsDescription & constraints_,
+           ContextPtr context_,
+           const String & compression_method_)
+    : IStorageURLBase(uri_, context_, table_id_, format_name_,
+                      format_settings_, columns_, constraints_, compression_method_)
+{
+    context_->getRemoteHostFilter().checkURL(uri);
+}
+
 void registerStorageURL(StorageFactory & factory)
 {
     factory.registerStorage("URL", [](const StorageFactory::Arguments & args)
@@ -255,19 +266,19 @@ void registerStorageURL(StorageFactory & factory)
             throw Exception(
                 "Storage URL requires 2 or 3 arguments: url, name of used format and optional compression method.", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
 
-        engine_args[0] = evaluateConstantExpressionOrIdentifierAsLiteral(engine_args[0], args.local_context);
+        engine_args[0] = evaluateConstantExpressionOrIdentifierAsLiteral(engine_args[0], args.getLocalContext());
 
         String url = engine_args[0]->as<ASTLiteral &>().value.safeGet<String>();
         Poco::URI uri(url);
 
-        engine_args[1] = evaluateConstantExpressionOrIdentifierAsLiteral(engine_args[1], args.local_context);
+        engine_args[1] = evaluateConstantExpressionOrIdentifierAsLiteral(engine_args[1], args.getLocalContext());
 
         String format_name = engine_args[1]->as<ASTLiteral &>().value.safeGet<String>();
 
         String compression_method;
         if (engine_args.size() == 3)
         {
-            engine_args[2] = evaluateConstantExpressionOrIdentifierAsLiteral(engine_args[2], args.local_context);
+            engine_args[2] = evaluateConstantExpressionOrIdentifierAsLiteral(engine_args[2], args.getLocalContext());
             compression_method = engine_args[2]->as<ASTLiteral &>().value.safeGet<String>();
         }
         else
@@ -285,7 +296,7 @@ void registerStorageURL(StorageFactory & factory)
 
             // Apply changed settings from global context, but ignore the
             // unknown ones, because we only have the format settings here.
-            const auto & changes = args.context.getSettingsRef().changes();
+            const auto & changes = args.getContext()->getSettingsRef().changes();
             for (const auto & change : changes)
             {
                 if (user_format_settings.has(change.name))
@@ -297,12 +308,12 @@ void registerStorageURL(StorageFactory & factory)
             // Apply changes from SETTINGS clause, with validation.
             user_format_settings.applyChanges(args.storage_def->settings->changes);
 
-            format_settings = getFormatSettings(args.context,
+            format_settings = getFormatSettings(args.getContext(),
                 user_format_settings);
         }
         else
         {
-            format_settings = getFormatSettings(args.context);
+            format_settings = getFormatSettings(args.getContext());
         }
 
         return StorageURL::create(
@@ -310,7 +321,7 @@ void registerStorageURL(StorageFactory & factory)
             args.table_id,
             format_name,
             format_settings,
-            args.columns, args.constraints, args.context,
+            args.columns, args.constraints, args.getContext(),
             compression_method);
     },
     {
diff --git a/src/Storages/StorageURL.h b/src/Storages/StorageURL.h
index 21b2e3e27a1..6fc1a6006ec 100644
--- a/src/Storages/StorageURL.h
+++ b/src/Storages/StorageURL.h
@@ -26,17 +26,17 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
 
-    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, const Context & context) override;
+    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, ContextPtr context) override;
 
 protected:
     IStorageURLBase(
         const Poco::URI & uri_,
-        const Context & context_,
+        ContextPtr context_,
         const StorageID & id_,
         const String & format_name_,
         const std::optional<FormatSettings> & format_settings_,
@@ -45,7 +45,6 @@ protected:
         const String & compression_method_);
 
     Poco::URI uri;
-    const Context & context_global;
     String compression_method;
     String format_name;
     // For URL engine, we use format settings from server context + `SETTINGS`
@@ -61,7 +60,7 @@ private:
         const Names & column_names,
         const StorageMetadataPtr & metadata_snapshot,
         const SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum & processed_stage,
         size_t max_block_size) const;
 
@@ -69,7 +68,7 @@ private:
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         const SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum & processed_stage,
         size_t max_block_size) const;
 
@@ -84,9 +83,9 @@ public:
         const String & format,
         const std::optional<FormatSettings> & format_settings,
         const Block & sample_block_,
-        const Context & context,
+        ContextPtr context,
         const ConnectionTimeouts & timeouts,
-        const CompressionMethod compression_method);
+        CompressionMethod compression_method);
 
     Block getHeader() const override
     {
@@ -113,12 +112,8 @@ public:
             const std::optional<FormatSettings> & format_settings_,
             const ColumnsDescription & columns_,
             const ConstraintsDescription & constraints_,
-            Context & context_,
-            const String & compression_method_)
-        : IStorageURLBase(uri_, context_, table_id_, format_name_,
-            format_settings_, columns_, constraints_, compression_method_)
-    {
-    }
+            ContextPtr context_,
+            const String & compression_method_);
 
     String getName() const override
     {
diff --git a/src/Storages/StorageValues.cpp b/src/Storages/StorageValues.cpp
index 500deac5f25..ace5ca3667c 100644
--- a/src/Storages/StorageValues.cpp
+++ b/src/Storages/StorageValues.cpp
@@ -24,7 +24,7 @@ Pipe StorageValues::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & /*query_info*/,
-    const Context & /*context*/,
+    ContextPtr /*context*/,
     QueryProcessingStage::Enum /*processed_stage*/,
     size_t /*max_block_size*/,
     unsigned /*num_streams*/)
diff --git a/src/Storages/StorageValues.h b/src/Storages/StorageValues.h
index 5729f245149..6ae33ed70f1 100644
--- a/src/Storages/StorageValues.h
+++ b/src/Storages/StorageValues.h
@@ -19,7 +19,7 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
diff --git a/src/Storages/StorageView.cpp b/src/Storages/StorageView.cpp
index 38349ef8df9..75bd4b2967f 100644
--- a/src/Storages/StorageView.cpp
+++ b/src/Storages/StorageView.cpp
@@ -15,9 +15,10 @@
 
 #include <Processors/Pipe.h>
 #include <Processors/Transforms/MaterializingTransform.h>
-#include <Processors/QueryPlan/MaterializingStep.h>
 #include <Processors/QueryPlan/ExpressionStep.h>
 #include <Processors/QueryPlan/SettingQuotaAndLimitsStep.h>
+#include <Processors/QueryPlan/BuildQueryPipelineSettings.h>
+#include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
 
 namespace DB
 {
@@ -53,14 +54,16 @@ Pipe StorageView::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & query_info,
-    const Context & context,
+    ContextPtr context,
     QueryProcessingStage::Enum processed_stage,
     const size_t max_block_size,
     const unsigned num_streams)
 {
     QueryPlan plan;
     read(plan, column_names, metadata_snapshot, query_info, context, processed_stage, max_block_size, num_streams);
-    return plan.convertToPipe();
+    return plan.convertToPipe(
+        QueryPlanOptimizationSettings::fromContext(context),
+        BuildQueryPipelineSettings::fromContext(context));
 }
 
 void StorageView::read(
@@ -68,7 +71,7 @@ void StorageView::read(
         const Names & column_names,
         const StorageMetadataPtr & metadata_snapshot,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum /*processed_stage*/,
         const size_t /*max_block_size*/,
         const unsigned /*num_streams*/)
@@ -87,7 +90,10 @@ void StorageView::read(
 
     /// It's expected that the columns read from storage are not constant.
     /// Because method 'getSampleBlockForColumns' is used to obtain a structure of result in InterpreterSelectQuery.
-    auto materializing = std::make_unique<MaterializingStep>(query_plan.getCurrentDataStream());
+    auto materializing_actions = std::make_shared<ActionsDAG>(query_plan.getCurrentDataStream().header.getColumnsWithTypeAndName());
+    materializing_actions->addMaterializingOutputActions();
+
+    auto materializing = std::make_unique<ExpressionStep>(query_plan.getCurrentDataStream(), std::move(materializing_actions));
     materializing->setStepDescription("Materialize constants after VIEW subquery");
     query_plan.addStep(std::move(materializing));
 
@@ -105,6 +111,9 @@ void StorageView::read(
 
 static ASTTableExpression * getFirstTableExpression(ASTSelectQuery & select_query)
 {
+    if (!select_query.tables() || select_query.tables()->children.empty())
+        throw Exception("Logical error: no table expression in view select AST", ErrorCodes::LOGICAL_ERROR);
+
     auto * select_element = select_query.tables()->children[0]->as<ASTTablesInSelectQueryElement>();
 
     if (!select_element->table_expression)
diff --git a/src/Storages/StorageView.h b/src/Storages/StorageView.h
index 6f894ce2775..fa11472218d 100644
--- a/src/Storages/StorageView.h
+++ b/src/Storages/StorageView.h
@@ -25,7 +25,7 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
@@ -35,7 +35,7 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & metadata_snapshot,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
diff --git a/src/Storages/StorageXDBC.cpp b/src/Storages/StorageXDBC.cpp
index f2f8cdb23f5..f94696c716b 100644
--- a/src/Storages/StorageXDBC.cpp
+++ b/src/Storages/StorageXDBC.cpp
@@ -14,6 +14,8 @@
 #include <Storages/StorageURL.h>
 #include <Storages/transformQueryForExternalDatabase.h>
 #include <common/logger_useful.h>
+#include <Common/escapeForFileName.h>
+
 
 namespace DB
 {
@@ -28,7 +30,7 @@ StorageXDBC::StorageXDBC(
     const std::string & remote_database_name_,
     const std::string & remote_table_name_,
     const ColumnsDescription & columns_,
-    const Context & context_,
+    ContextPtr context_,
     const BridgeHelperPtr bridge_helper_)
     /// Please add support for constraints as soon as StorageODBC or JDBC will support insertion.
     : IStorageURLBase(Poco::URI(),
@@ -53,27 +55,21 @@ std::string StorageXDBC::getReadMethod() const
 }
 
 std::vector<std::pair<std::string, std::string>> StorageXDBC::getReadURIParams(
-    const Names & column_names,
-    const StorageMetadataPtr & metadata_snapshot,
+    const Names & /* column_names */,
+    const StorageMetadataPtr & /* metadata_snapshot */,
     const SelectQueryInfo & /*query_info*/,
-    const Context & /*context*/,
+    ContextPtr /*context*/,
     QueryProcessingStage::Enum & /*processed_stage*/,
     size_t max_block_size) const
 {
-    NamesAndTypesList cols;
-    for (const String & name : column_names)
-    {
-        auto column_data = metadata_snapshot->getColumns().getPhysical(name);
-        cols.emplace_back(column_data.name, column_data.type);
-    }
-    return bridge_helper->getURLParams(cols.toString(), max_block_size);
+    return bridge_helper->getURLParams(max_block_size);
 }
 
 std::function<void(std::ostream &)> StorageXDBC::getReadPOSTDataCallback(
-    const Names & /*column_names*/,
+    const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     const SelectQueryInfo & query_info,
-    const Context & context,
+    ContextPtr local_context,
     QueryProcessingStage::Enum & /*processed_stage*/,
     size_t /*max_block_size*/) const
 {
@@ -82,16 +78,30 @@ std::function<void(std::ostream &)> StorageXDBC::getReadPOSTDataCallback(
         bridge_helper->getIdentifierQuotingStyle(),
         remote_database_name,
         remote_table_name,
-        context);
+        local_context);
 
-    return [query](std::ostream & os) { os << "query=" << query; };
+    NamesAndTypesList cols;
+    for (const String & name : column_names)
+    {
+        auto column_data = metadata_snapshot->getColumns().getPhysical(name);
+        cols.emplace_back(column_data.name, column_data.type);
+    }
+
+    auto write_body_callback = [query, cols](std::ostream & os)
+    {
+        os << "sample_block=" << escapeForFileName(cols.toString());
+        os << "&";
+        os << "query=" << escapeForFileName(query);
+    };
+
+    return write_body_callback;
 }
 
 Pipe StorageXDBC::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & query_info,
-    const Context & context,
+    ContextPtr local_context,
     QueryProcessingStage::Enum processed_stage,
     size_t max_block_size,
     unsigned num_streams)
@@ -99,35 +109,32 @@ Pipe StorageXDBC::read(
     metadata_snapshot->check(column_names, getVirtuals(), getStorageID());
 
     bridge_helper->startBridgeSync();
-    return IStorageURLBase::read(column_names, metadata_snapshot, query_info, context, processed_stage, max_block_size, num_streams);
+    return IStorageURLBase::read(column_names, metadata_snapshot, query_info, local_context, processed_stage, max_block_size, num_streams);
 }
 
-BlockOutputStreamPtr StorageXDBC::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, const Context & context)
+BlockOutputStreamPtr StorageXDBC::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, ContextPtr local_context)
 {
     bridge_helper->startBridgeSync();
 
-    NamesAndTypesList cols;
     Poco::URI request_uri = uri;
     request_uri.setPath("/write");
-    for (const String & name : metadata_snapshot->getSampleBlock().getNames())
-    {
-        auto column_data = metadata_snapshot->getColumns().getPhysical(name);
-        cols.emplace_back(column_data.name, column_data.type);
-    }
-    auto url_params = bridge_helper->getURLParams(cols.toString(), 65536);
+
+    auto url_params = bridge_helper->getURLParams(65536);
     for (const auto & [param, value] : url_params)
         request_uri.addQueryParameter(param, value);
+
     request_uri.addQueryParameter("db_name", remote_database_name);
     request_uri.addQueryParameter("table_name", remote_table_name);
     request_uri.addQueryParameter("format_name", format_name);
+    request_uri.addQueryParameter("sample_block", metadata_snapshot->getSampleBlock().getNamesAndTypesList().toString());
 
     return std::make_shared<StorageURLBlockOutputStream>(
         request_uri,
         format_name,
-        getFormatSettings(context),
+        getFormatSettings(local_context),
         metadata_snapshot->getSampleBlock(),
-        context,
-        ConnectionTimeouts::getHTTPTimeouts(context),
+        local_context,
+        ConnectionTimeouts::getHTTPTimeouts(local_context),
         chooseCompressionMethod(uri.toString(), compression_method));
 }
 
@@ -155,16 +162,16 @@ namespace
                     ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
 
             for (size_t i = 0; i < 3; ++i)
-                engine_args[i] = evaluateConstantExpressionOrIdentifierAsLiteral(engine_args[i], args.local_context);
+                engine_args[i] = evaluateConstantExpressionOrIdentifierAsLiteral(engine_args[i], args.getLocalContext());
 
-            BridgeHelperPtr bridge_helper = std::make_shared<XDBCBridgeHelper<BridgeHelperMixin>>(args.context,
-                args.context.getSettingsRef().http_receive_timeout.value,
+            BridgeHelperPtr bridge_helper = std::make_shared<XDBCBridgeHelper<BridgeHelperMixin>>(args.getContext(),
+                args.getContext()->getSettingsRef().http_receive_timeout.value,
                 engine_args[0]->as<ASTLiteral &>().value.safeGet<String>());
             return std::make_shared<StorageXDBC>(args.table_id,
                 engine_args[1]->as<ASTLiteral &>().value.safeGet<String>(),
                 engine_args[2]->as<ASTLiteral &>().value.safeGet<String>(),
                 args.columns,
-                args.context,
+                args.getContext(),
                 bridge_helper);
 
         },
diff --git a/src/Storages/StorageXDBC.h b/src/Storages/StorageXDBC.h
index 8524a03503a..064912fda92 100644
--- a/src/Storages/StorageXDBC.h
+++ b/src/Storages/StorageXDBC.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Storages/StorageURL.h>
-#include <Common/XDBCBridgeHelper.h>
+#include <Bridge/XDBCBridgeHelper.h>
 
 
 namespace DB
@@ -19,7 +19,7 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
@@ -29,10 +29,10 @@ public:
         const std::string & remote_database_name,
         const std::string & remote_table_name,
         const ColumnsDescription & columns_,
-        const Context & context_,
+        ContextPtr context_,
         BridgeHelperPtr bridge_helper_);
 
-    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, const Context & context) override;
+    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, ContextPtr context) override;
 
     std::string getName() const override;
 private:
@@ -49,7 +49,7 @@ private:
         const Names & column_names,
         const StorageMetadataPtr & metadata_snapshot,
         const SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum & processed_stage,
         size_t max_block_size) const override;
 
@@ -57,7 +57,7 @@ private:
         const Names & column_names,
         const StorageMetadataPtr & metadata_snapshot,
         const SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum & processed_stage,
         size_t max_block_size) const override;
 
diff --git a/src/Storages/System/IStorageSystemOneBlock.h b/src/Storages/System/IStorageSystemOneBlock.h
index d83a71c2592..36e92d5a1f4 100644
--- a/src/Storages/System/IStorageSystemOneBlock.h
+++ b/src/Storages/System/IStorageSystemOneBlock.h
@@ -18,7 +18,7 @@ template <typename Self>
 class IStorageSystemOneBlock : public IStorage
 {
 protected:
-    virtual void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const = 0;
+    virtual void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const = 0;
 
 public:
 #if defined(ARCADIA_BUILD)
@@ -36,7 +36,7 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & metadata_snapshot,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum /*processed_stage*/,
         size_t /*max_block_size*/,
         unsigned /*num_streams*/) override
diff --git a/src/Storages/System/StorageSystemAggregateFunctionCombinators.cpp b/src/Storages/System/StorageSystemAggregateFunctionCombinators.cpp
index c0dd5cc85d3..c2d82c6cd7c 100644
--- a/src/Storages/System/StorageSystemAggregateFunctionCombinators.cpp
+++ b/src/Storages/System/StorageSystemAggregateFunctionCombinators.cpp
@@ -12,13 +12,13 @@ NamesAndTypesList StorageSystemAggregateFunctionCombinators::getNamesAndTypes()
     };
 }
 
-void StorageSystemAggregateFunctionCombinators::fillData(MutableColumns & res_columns, const Context &, const SelectQueryInfo &) const
+void StorageSystemAggregateFunctionCombinators::fillData(MutableColumns & res_columns, ContextPtr, const SelectQueryInfo &) const
 {
     const auto & combinators = AggregateFunctionCombinatorFactory::instance().getAllAggregateFunctionCombinators();
     for (const auto & pair : combinators)
     {
-        res_columns[0]->insert(pair.first);
-        res_columns[1]->insert(pair.second->isForInternalUsageOnly());
+        res_columns[0]->insert(pair.name);
+        res_columns[1]->insert(pair.combinator_ptr->isForInternalUsageOnly());
     }
 }
 
diff --git a/src/Storages/System/StorageSystemAggregateFunctionCombinators.h b/src/Storages/System/StorageSystemAggregateFunctionCombinators.h
index 8d204020160..a978bfbface 100644
--- a/src/Storages/System/StorageSystemAggregateFunctionCombinators.h
+++ b/src/Storages/System/StorageSystemAggregateFunctionCombinators.h
@@ -12,7 +12,7 @@ class StorageSystemAggregateFunctionCombinators final : public ext::shared_ptr_h
 {
     friend struct ext::shared_ptr_helper<StorageSystemAggregateFunctionCombinators>;
 protected:
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
 
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 public:
diff --git a/src/Storages/System/StorageSystemAsynchronousMetrics.cpp b/src/Storages/System/StorageSystemAsynchronousMetrics.cpp
index 8dabac4fb49..70e12440678 100644
--- a/src/Storages/System/StorageSystemAsynchronousMetrics.cpp
+++ b/src/Storages/System/StorageSystemAsynchronousMetrics.cpp
@@ -21,7 +21,7 @@ StorageSystemAsynchronousMetrics::StorageSystemAsynchronousMetrics(const Storage
 {
 }
 
-void StorageSystemAsynchronousMetrics::fillData(MutableColumns & res_columns, const Context &, const SelectQueryInfo &) const
+void StorageSystemAsynchronousMetrics::fillData(MutableColumns & res_columns, ContextPtr, const SelectQueryInfo &) const
 {
     auto async_metrics_values = async_metrics.getValues();
     for (const auto & name_value : async_metrics_values)
diff --git a/src/Storages/System/StorageSystemAsynchronousMetrics.h b/src/Storages/System/StorageSystemAsynchronousMetrics.h
index a2a92d248d8..eee029bbe51 100644
--- a/src/Storages/System/StorageSystemAsynchronousMetrics.h
+++ b/src/Storages/System/StorageSystemAsynchronousMetrics.h
@@ -33,7 +33,7 @@ protected:
 #endif
     StorageSystemAsynchronousMetrics(const StorageID & table_id_, const AsynchronousMetrics & async_metrics_);
 
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemBuildOptions.cpp b/src/Storages/System/StorageSystemBuildOptions.cpp
index a63afcf4ce5..01a60a0235c 100644
--- a/src/Storages/System/StorageSystemBuildOptions.cpp
+++ b/src/Storages/System/StorageSystemBuildOptions.cpp
@@ -16,7 +16,7 @@ NamesAndTypesList StorageSystemBuildOptions::getNamesAndTypes()
     };
 }
 
-void StorageSystemBuildOptions::fillData(MutableColumns & res_columns, const Context &, const SelectQueryInfo &) const
+void StorageSystemBuildOptions::fillData(MutableColumns & res_columns, ContextPtr, const SelectQueryInfo &) const
 {
 #if !defined(ARCADIA_BUILD)
     for (auto * it = auto_config_build; *it; it += 2)
diff --git a/src/Storages/System/StorageSystemBuildOptions.generated.cpp.in b/src/Storages/System/StorageSystemBuildOptions.generated.cpp.in
index f68e40a41b8..8ece4219d0c 100644
--- a/src/Storages/System/StorageSystemBuildOptions.generated.cpp.in
+++ b/src/Storages/System/StorageSystemBuildOptions.generated.cpp.in
@@ -57,6 +57,7 @@ const char * auto_config_build[]
     "USE_GRPC", "@USE_GRPC@",
     "USE_LDAP", "@USE_LDAP@",
     "TZDATA_VERSION", "@TZDATA_VERSION@",
+    "USE_KRB5", "@USE_KRB5@",
 
     nullptr, nullptr
 };
diff --git a/src/Storages/System/StorageSystemBuildOptions.h b/src/Storages/System/StorageSystemBuildOptions.h
index afd27f00bcc..8a22a3dcb45 100644
--- a/src/Storages/System/StorageSystemBuildOptions.h
+++ b/src/Storages/System/StorageSystemBuildOptions.h
@@ -16,7 +16,7 @@ class StorageSystemBuildOptions final : public ext::shared_ptr_helper<StorageSys
 {
     friend struct ext::shared_ptr_helper<StorageSystemBuildOptions>;
 protected:
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
 
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
diff --git a/src/Storages/System/StorageSystemClusters.cpp b/src/Storages/System/StorageSystemClusters.cpp
index 7e16deb6d22..8a3227aafdb 100644
--- a/src/Storages/System/StorageSystemClusters.cpp
+++ b/src/Storages/System/StorageSystemClusters.cpp
@@ -23,21 +23,36 @@ NamesAndTypesList StorageSystemClusters::getNamesAndTypes()
         {"user", std::make_shared<DataTypeString>()},
         {"default_database", std::make_shared<DataTypeString>()},
         {"errors_count", std::make_shared<DataTypeUInt32>()},
+        {"slowdowns_count", std::make_shared<DataTypeUInt32>()},
         {"estimated_recovery_time", std::make_shared<DataTypeUInt32>()}
     };
 }
 
 
-void StorageSystemClusters::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const
+void StorageSystemClusters::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
-    for (const auto & name_and_cluster : context.getClusters().getContainer())
+    for (const auto & name_and_cluster : context->getClusters().getContainer())
         writeCluster(res_columns, name_and_cluster);
 
     const auto databases = DatabaseCatalog::instance().getDatabases();
     for (const auto & name_and_database : databases)
     {
         if (const auto * replicated = typeid_cast<const DatabaseReplicated *>(name_and_database.second.get()))
-            writeCluster(res_columns, {name_and_database.first, replicated->getCluster()});
+        {
+            // A quick fix for stateless tests with DatabaseReplicated. Its ZK
+            // node can be destroyed at any time. If another test lists
+            // system.clusters to get client command line suggestions, it will
+            // get an error when trying to get the info about DB from ZK.
+            // Just ignore these inaccessible databases. A good example of a
+            // failing test is `01526_client_start_and_exit`.
+            try {
+                writeCluster(res_columns, {name_and_database.first, replicated->getCluster()});
+            }
+            catch (...)
+            {
+                tryLogCurrentException(__PRETTY_FUNCTION__);
+            }
+        }
     }
 }
 
@@ -71,6 +86,7 @@ void StorageSystemClusters::writeCluster(MutableColumns & res_columns, const Nam
             res_columns[i++]->insert(address.user);
             res_columns[i++]->insert(address.default_database);
             res_columns[i++]->insert(pool_status[replica_index].error_count);
+            res_columns[i++]->insert(pool_status[replica_index].slowdown_count);
             res_columns[i++]->insert(pool_status[replica_index].estimated_recovery_time.count());
         }
     }
diff --git a/src/Storages/System/StorageSystemClusters.h b/src/Storages/System/StorageSystemClusters.h
index 4f2a843999f..81aefaff1c4 100644
--- a/src/Storages/System/StorageSystemClusters.h
+++ b/src/Storages/System/StorageSystemClusters.h
@@ -28,7 +28,7 @@ protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
     using NameAndCluster = std::pair<String, std::shared_ptr<Cluster>>;
 
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
     static void writeCluster(MutableColumns & res_columns, const NameAndCluster & name_and_cluster);
 };
 
diff --git a/src/Storages/System/StorageSystemCollations.cpp b/src/Storages/System/StorageSystemCollations.cpp
index a870a7c7c78..c9343ccd146 100644
--- a/src/Storages/System/StorageSystemCollations.cpp
+++ b/src/Storages/System/StorageSystemCollations.cpp
@@ -13,7 +13,7 @@ NamesAndTypesList StorageSystemCollations::getNamesAndTypes()
     };
 }
 
-void StorageSystemCollations::fillData(MutableColumns & res_columns, const Context &, const SelectQueryInfo &) const
+void StorageSystemCollations::fillData(MutableColumns & res_columns, ContextPtr, const SelectQueryInfo &) const
 {
     for (const auto & [locale, lang]: AvailableCollationLocales::instance().getAvailableCollations())
     {
diff --git a/src/Storages/System/StorageSystemCollations.h b/src/Storages/System/StorageSystemCollations.h
index 133acd937a1..454fd968511 100644
--- a/src/Storages/System/StorageSystemCollations.h
+++ b/src/Storages/System/StorageSystemCollations.h
@@ -10,7 +10,7 @@ class StorageSystemCollations final : public ext::shared_ptr_helper<StorageSyste
 {
     friend struct ext::shared_ptr_helper<StorageSystemCollations>;
 protected:
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
 
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 public:
diff --git a/src/Storages/System/StorageSystemColumns.cpp b/src/Storages/System/StorageSystemColumns.cpp
index 6726d502071..8f65147bb11 100644
--- a/src/Storages/System/StorageSystemColumns.cpp
+++ b/src/Storages/System/StorageSystemColumns.cpp
@@ -65,12 +65,12 @@ public:
         ColumnPtr databases_,
         ColumnPtr tables_,
         Storages storages_,
-        const Context & context)
+        ContextPtr context)
         : SourceWithProgress(header_)
         , columns_mask(std::move(columns_mask_)), max_block_size(max_block_size_)
         , databases(std::move(databases_)), tables(std::move(tables_)), storages(std::move(storages_))
-        , total_tables(tables->size()), access(context.getAccess())
-        , query_id(context.getCurrentQueryId()), lock_acquire_timeout(context.getSettingsRef().lock_acquire_timeout)
+        , total_tables(tables->size()), access(context->getAccess())
+        , query_id(context->getCurrentQueryId()), lock_acquire_timeout(context->getSettingsRef().lock_acquire_timeout)
     {
     }
 
@@ -243,7 +243,7 @@ Pipe StorageSystemColumns::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & query_info,
-    const Context & context,
+    ContextPtr context,
     QueryProcessingStage::Enum /*processed_stage*/,
     const size_t max_block_size,
     const unsigned /*num_streams*/)
@@ -289,9 +289,9 @@ Pipe StorageSystemColumns::read(
         }
 
         Tables external_tables;
-        if (context.hasSessionContext())
+        if (context->hasSessionContext())
         {
-            external_tables = context.getSessionContext().getExternalTables();
+            external_tables = context->getSessionContext()->getExternalTables();
             if (!external_tables.empty())
                 database_column_mut->insertDefault(); /// Empty database for external tables.
         }
diff --git a/src/Storages/System/StorageSystemColumns.h b/src/Storages/System/StorageSystemColumns.h
index c4f35485612..5cd8c5b38fd 100644
--- a/src/Storages/System/StorageSystemColumns.h
+++ b/src/Storages/System/StorageSystemColumns.h
@@ -21,7 +21,7 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
diff --git a/src/Storages/System/StorageSystemContributors.cpp b/src/Storages/System/StorageSystemContributors.cpp
index cd0f31975cc..ed28be2a4ab 100644
--- a/src/Storages/System/StorageSystemContributors.cpp
+++ b/src/Storages/System/StorageSystemContributors.cpp
@@ -16,7 +16,7 @@ NamesAndTypesList StorageSystemContributors::getNamesAndTypes()
     };
 }
 
-void StorageSystemContributors::fillData(MutableColumns & res_columns, const Context &, const SelectQueryInfo &) const
+void StorageSystemContributors::fillData(MutableColumns & res_columns, ContextPtr, const SelectQueryInfo &) const
 {
     std::vector<const char *> contributors;
     for (auto * it = auto_contributors; *it; ++it)
diff --git a/src/Storages/System/StorageSystemContributors.generated.cpp b/src/Storages/System/StorageSystemContributors.generated.cpp
index d9f4a2a7dd0..b8741e6951c 100644
--- a/src/Storages/System/StorageSystemContributors.generated.cpp
+++ b/src/Storages/System/StorageSystemContributors.generated.cpp
@@ -4,6 +4,7 @@ const char * auto_contributors[] {
     "20018712",
     "243f6a88 85a308d3",
     "243f6a8885a308d313198a2e037",
+    "3ldar-nasyrov",
     "821008736@qq.com",
     "Akazz",
     "Alain BERRIER",
@@ -13,9 +14,12 @@ const char * auto_contributors[] {
     "Aleksandra (Ася)",
     "Aleksandrov Vladimir",
     "Aleksei Levushkin",
+    "Aleksei Semiglazov",
     "Aleksey",
     "Aleksey Akulovich",
+    "Alex",
     "Alex Bocharov",
+    "Alex Karo",
     "Alex Krash",
     "Alex Ryndin",
     "Alex Zatelepin",
@@ -56,6 +60,7 @@ const char * auto_contributors[] {
     "Alexey Vasiliev",
     "Alexey Zatelepin",
     "Alexsey Shestakov",
+    "Ali Demirci",
     "Aliaksandr Pliutau",
     "Aliaksandr Shylau",
     "Amos Bird",
@@ -81,8 +86,10 @@ const char * auto_contributors[] {
     "Andrey Skobtsov",
     "Andrey Urusov",
     "Andy Yang",
+    "Anmol Arora",
     "Anna",
     "Anna Shakhova",
+    "Anthony N. Simon",
     "Anton Ivashkin",
     "Anton Kobzev",
     "Anton Kvasha",
@@ -134,15 +141,18 @@ const char * auto_contributors[] {
     "Brett Hoerner",
     "Bulat Gaifullin",
     "Carbyn",
+    "Chao Ma",
     "Chao Wang",
     "Chen Yufei",
     "Chienlung Cheung",
+    "Christian",
     "Ciprian Hacman",
     "Clement Rodriguez",
     "Clément Rodriguez",
     "Colum",
     "Constantin S. Pan",
     "CurtizJ",
+    "DIAOZHAFENG",
     "Daniel Bershatsky",
     "Daniel Dao",
     "Daniel Qin",
@@ -167,6 +177,7 @@ const char * auto_contributors[] {
     "Dmitry Belyavtsev",
     "Dmitry Bilunov",
     "Dmitry Galuza",
+    "Dmitry Krylov",
     "Dmitry Luhtionov",
     "Dmitry Moskowski",
     "Dmitry Muzyka",
@@ -177,6 +188,7 @@ const char * auto_contributors[] {
     "Dongdong Yang",
     "DoomzD",
     "Dr. Strange Looker",
+    "Egor O'Sten",
     "Ekaterina",
     "Eldar Zaitov",
     "Elena Baskakova",
@@ -203,6 +215,7 @@ const char * auto_contributors[] {
     "Fan()",
     "FawnD2",
     "FeehanG",
+    "FgoDt",
     "Filipe Caixeta",
     "Flowyi",
     "Francisco Barón",
@@ -224,7 +237,10 @@ const char * auto_contributors[] {
     "Grigory Buteyko",
     "Grigory Pervakov",
     "Guillaume Tassery",
+    "Haavard Kvaalen",
+    "Habibullah Oladepo",
     "Hamoon",
+    "Hasitha Kanchana",
     "Hasnat",
     "Hiroaki Nakamura",
     "HuFuwang",
@@ -249,6 +265,7 @@ const char * auto_contributors[] {
     "Ilya Skrypitsa",
     "Ilya Yatsishin",
     "ImgBotApp",
+    "Islam Israfilov",
     "Islam Israfilov (Islam93)",
     "Ivan",
     "Ivan A. Torgashov",
@@ -261,6 +278,7 @@ const char * auto_contributors[] {
     "Ivan Remen",
     "Ivan Starkov",
     "Ivan Zhukov",
+    "JackyWoo",
     "Jacob Hayes",
     "JaosnHsieh",
     "Jason",
@@ -271,6 +289,8 @@ const char * auto_contributors[] {
     "Jiang Tao",
     "Jochen Schalanda",
     "John",
+    "John Hummel",
+    "John Skopis",
     "Jonatas Freitas",
     "Kang Liu",
     "Karl Pietrzak",
@@ -304,6 +324,7 @@ const char * auto_contributors[] {
     "Luis Bosque",
     "Lv Feng",
     "Léo Ercolanelli",
+    "M0r64n",
     "Maks Skorokhod",
     "Maksim",
     "Maksim Fedotov",
@@ -317,9 +338,11 @@ const char * auto_contributors[] {
     "Mark Frost",
     "Mark Papadakis",
     "Maroun Maroun",
+    "Marquitos",
     "Marsel Arduanov",
     "Marti Raudsepp",
     "Martijn Bakker",
+    "Marvin Taschenberger",
     "Masha",
     "Matthew Peveler",
     "Matwey V. Kornilov",
@@ -338,6 +361,7 @@ const char * auto_contributors[] {
     "Maxim Smirnov",
     "Maxim Ulanovskiy",
     "MaximAL",
+    "Mc.Spring",
     "MeiK",
     "Metehan Çetinkaya",
     "Metikov Vadim",
@@ -352,6 +376,7 @@ const char * auto_contributors[] {
     "Mikahil Nacharov",
     "Mike",
     "Mike F",
+    "Mike Kot",
     "Mikhail",
     "Mikhail Cheshkov",
     "Mikhail Fandyushin",
@@ -363,6 +388,7 @@ const char * auto_contributors[] {
     "Mikhail Salosin",
     "Mikhail Surin",
     "Mikhail f. Shiryaev",
+    "MikuSugar",
     "Milad Arabi",
     "Mohammad Hossein Sekhavat",
     "MovElb",
@@ -373,6 +399,8 @@ const char * auto_contributors[] {
     "Narek Galstyan",
     "NeZeD [Mac Pro]",
     "Neeke Gao",
+    "Neng Liu",
+    "Nickolay Yastrebov",
     "Nico Mandery",
     "Nico Piderman",
     "Nicolae Vartolomei",
@@ -386,6 +414,7 @@ const char * auto_contributors[] {
     "Nikita Vasilev",
     "Nikolai Kochetov",
     "Nikolai Sorokin",
+    "Nikolay",
     "Nikolay Degterinsky",
     "Nikolay Kirsh",
     "Nikolay Semyachkin",
@@ -423,6 +452,7 @@ const char * auto_contributors[] {
     "Philippe Ombredanne",
     "Potya",
     "Pradeep Chhetri",
+    "Pysaoke",
     "Quid37",
     "Rafael David Tinoco",
     "Ramazan Polat",
@@ -439,6 +469,8 @@ const char * auto_contributors[] {
     "Roman Peshkurov",
     "Roman Tsisyk",
     "Ruslan",
+    "Ruslan Savchenko",
+    "Russ Frank",
     "Ruzal Ibragimov",
     "S.M.A. Djawadi",
     "Sabyanin Maxim",
@@ -446,11 +478,13 @@ const char * auto_contributors[] {
     "Sami Kerola",
     "Samuel Chou",
     "Saulius Valatka",
+    "Serg Kulakov",
     "Serge Rider",
     "Sergei Bocharov",
     "Sergei Semin",
     "Sergei Shtykov",
     "Sergei Tsetlin (rekub)",
+    "Sergey Demurin",
     "Sergey Elantsev",
     "Sergey Fedorov",
     "Sergey Kononenko",
@@ -461,12 +495,15 @@ const char * auto_contributors[] {
     "Sergey Shtykov",
     "Sergey V. Galtsev",
     "Sergey Zaikin",
+    "Sergi Almacellas Abellana",
     "Sergi Vladykin",
     "SevaCode",
     "Sherry Wang",
     "Silviu Caragea",
+    "Simeon Emanuilov",
     "Simon Liu",
     "Simon Podlipsky",
+    "Sina",
     "Sjoerd Mulder",
     "Slach",
     "Snow",
@@ -485,7 +522,9 @@ const char * auto_contributors[] {
     "TCeason",
     "Tagir Kuskarov",
     "Tai White",
+    "Taleh Zaliyev",
     "Tangaev",
+    "Tatiana Kirillova",
     "Tema Novikov",
     "The-Alchemist",
     "TiunovNN",
@@ -502,6 +541,7 @@ const char * auto_contributors[] {
     "Vadim Plakhtinskiy",
     "Vadim Skipin",
     "VadimPE",
+    "Val",
     "Valera Ryaboshapko",
     "Vasily Kozhukhovskiy",
     "Vasily Morozov",
@@ -514,6 +554,7 @@ const char * auto_contributors[] {
     "Veselkov Konstantin",
     "Victor Tarnavsky",
     "Viktor Taranenko",
+    "Vitaliy Fedorchenko",
     "Vitaliy Karnienko",
     "Vitaliy Kozlovskiy",
     "Vitaliy Lyudvichenko",
@@ -525,6 +566,7 @@ const char * auto_contributors[] {
     "Vlad Arkhipov",
     "Vladimir",
     "Vladimir Bunchuk",
+    "Vladimir Ch",
     "Vladimir Chebotarev",
     "Vladimir Golovchenko",
     "Vladimir Goncharov",
@@ -545,6 +587,7 @@ const char * auto_contributors[] {
     "William Shallum",
     "Winter Zhang",
     "Xianda Ke",
+    "Xiang Zhou",
     "Y Lu",
     "Yangkuan Liu",
     "Yatsishin Ilya",
@@ -570,6 +613,7 @@ const char * auto_contributors[] {
     "abyss7",
     "achimbab",
     "achulkov2",
+    "adevyatova",
     "ageraab",
     "akazz",
     "akonyaev",
@@ -595,6 +639,7 @@ const char * auto_contributors[] {
     "artpaul",
     "asiana21",
     "avasiliev",
+    "avogar",
     "avsharapov",
     "awesomeleo",
     "benamazing",
@@ -611,6 +656,8 @@ const char * auto_contributors[] {
     "centos7",
     "champtar",
     "chang.chen",
+    "changvvb",
+    "chasingegg",
     "chengy8934",
     "chenqi",
     "chenxing-xc",
@@ -662,11 +709,14 @@ const char * auto_contributors[] {
     "frank",
     "franklee",
     "fredchenbj",
+    "fuqi",
+    "fuwhu",
     "g-arslan",
     "ggerogery",
     "giordyb",
     "glockbender",
     "glushkovds",
+    "guoleiyi",
     "gyuton",
     "hao.he",
     "hchen9",
@@ -675,10 +725,13 @@ const char * auto_contributors[] {
     "hexiaoting",
     "hotid",
     "hustnn",
+    "idfer",
     "igor",
     "igor.lapko",
+    "ikarishinjieva",
     "ikopylov",
     "imgbot[bot]",
+    "ip",
     "it1804",
     "ivan-kush",
     "ivanzhukov",
@@ -686,9 +739,13 @@ const char * auto_contributors[] {
     "javartisan",
     "javi",
     "javi santana",
+    "jennyma",
     "jetgm",
     "jianmei zhang",
     "jyz0309",
+    "keenwolf",
+    "kevin wan",
+    "kirillikoff",
     "kmeaw",
     "koshachy",
     "kreuzerkrieg",
@@ -697,6 +754,7 @@ const char * auto_contributors[] {
     "kssenii",
     "l",
     "lalex",
+    "lehasm",
     "leozhang",
     "levushkin aleksej",
     "levysh",
@@ -717,16 +775,19 @@ const char * auto_contributors[] {
     "malkfilipp",
     "manmitya",
     "maqroll",
+    "mastertheknife",
     "maxim",
     "maxim-babenko",
     "maxkuzn",
     "maxulan",
+    "mehanizm",
     "melin",
     "memo",
     "meo",
     "mergify[bot]",
     "mf5137",
     "mfridental",
+    "michon470",
     "miha-g",
     "mikepop7",
     "millb",
@@ -764,6 +825,7 @@ const char * auto_contributors[] {
     "r1j1k",
     "rainbowsysu",
     "ritaank",
+    "robert",
     "robot-clickhouse",
     "robot-metrika-test",
     "rodrigargar",
@@ -781,6 +843,8 @@ const char * auto_contributors[] {
     "shangshujie",
     "shedx",
     "simon-says",
+    "songenjie",
+    "spff",
     "spongedc",
     "spyros87",
     "stavrolia",
@@ -799,6 +863,7 @@ const char * auto_contributors[] {
     "tiger.yan",
     "tison",
     "topvisor",
+    "turbo jason",
     "tyrionhuang",
     "ubuntu",
     "unegare",
@@ -820,6 +885,8 @@ const char * auto_contributors[] {
     "yangshuai",
     "ygrek",
     "yhgcn",
+    "yiguolei",
+    "yingjinghan",
     "ylchou",
     "yonesko",
     "yuefoo",
@@ -829,8 +896,11 @@ const char * auto_contributors[] {
     "zhang2014",
     "zhangshengyu",
     "zhangxiao018",
+    "zhangxiao871",
     "zhen ni",
     "zhukai",
+    "zlx19950903",
+    "zvonand",
     "zvrr",
     "zvvr",
     "zzsmdfj",
@@ -847,6 +917,7 @@ const char * auto_contributors[] {
     "张健",
     "张风啸",
     "徐炘",
+    "曲正鹏",
     "极客青年",
     "谢磊",
     "贾顺名(Jarvis)",
diff --git a/src/Storages/System/StorageSystemContributors.h b/src/Storages/System/StorageSystemContributors.h
index 0fd77f78655..c4a50263c5b 100644
--- a/src/Storages/System/StorageSystemContributors.h
+++ b/src/Storages/System/StorageSystemContributors.h
@@ -16,7 +16,7 @@ class StorageSystemContributors final : public ext::shared_ptr_helper<StorageSys
 {
     friend struct ext::shared_ptr_helper<StorageSystemContributors>;
 protected:
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
 
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
diff --git a/src/Storages/System/StorageSystemCurrentRoles.cpp b/src/Storages/System/StorageSystemCurrentRoles.cpp
index b0667f2f3ca..a5b3566f5f7 100644
--- a/src/Storages/System/StorageSystemCurrentRoles.cpp
+++ b/src/Storages/System/StorageSystemCurrentRoles.cpp
@@ -22,10 +22,10 @@ NamesAndTypesList StorageSystemCurrentRoles::getNamesAndTypes()
 }
 
 
-void StorageSystemCurrentRoles::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const
+void StorageSystemCurrentRoles::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
-    auto roles_info = context.getRolesInfo();
-    auto user = context.getUser();
+    auto roles_info = context->getRolesInfo();
+    auto user = context->getUser();
     if (!roles_info || !user)
         return;
 
diff --git a/src/Storages/System/StorageSystemCurrentRoles.h b/src/Storages/System/StorageSystemCurrentRoles.h
index 807db661371..77ab95547fa 100644
--- a/src/Storages/System/StorageSystemCurrentRoles.h
+++ b/src/Storages/System/StorageSystemCurrentRoles.h
@@ -18,7 +18,7 @@ public:
 protected:
     friend struct ext::shared_ptr_helper<StorageSystemCurrentRoles>;
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemDDLWorkerQueue.cpp b/src/Storages/System/StorageSystemDDLWorkerQueue.cpp
index 04321544f5d..98b15bfa6e2 100644
--- a/src/Storages/System/StorageSystemDDLWorkerQueue.cpp
+++ b/src/Storages/System/StorageSystemDDLWorkerQueue.cpp
@@ -95,7 +95,7 @@ NamesAndTypesList StorageSystemDDLWorkerQueue::getNamesAndTypes()
     };
 }
 
-static String clusterNameFromDDLQuery(const Context & context, const DDLLogEntry & entry)
+static String clusterNameFromDDLQuery(ContextPtr context, const DDLLogEntry & entry)
 {
     const char * begin = entry.query.data();
     const char * end = begin + entry.query.size();
@@ -104,15 +104,15 @@ static String clusterNameFromDDLQuery(const Context & context, const DDLLogEntry
     String cluster_name;
     ParserQuery parser_query(end);
     String description;
-    query = parseQuery(parser_query, begin, end, description, 0, context.getSettingsRef().max_parser_depth);
+    query = parseQuery(parser_query, begin, end, description, 0, context->getSettingsRef().max_parser_depth);
     if (query && (query_on_cluster = dynamic_cast<ASTQueryWithOnCluster *>(query.get())))
         cluster_name = query_on_cluster->cluster;
     return cluster_name;
 }
 
-void StorageSystemDDLWorkerQueue::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const
+void StorageSystemDDLWorkerQueue::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
-    zkutil::ZooKeeperPtr zookeeper = context.getZooKeeper();
+    zkutil::ZooKeeperPtr zookeeper = context->getZooKeeper();
     Coordination::Error zk_exception_code = Coordination::Error::ZOK;
     String ddl_zookeeper_path = config.getString("distributed_ddl.path", "/clickhouse/task_queue/ddl/");
     String ddl_query_path;
@@ -130,7 +130,7 @@ void StorageSystemDDLWorkerQueue::fillData(MutableColumns & res_columns, const C
     if (code != Coordination::Error::ZOK && code != Coordination::Error::ZNONODE)
         zk_exception_code = code;
 
-    const auto & clusters = context.getClusters();
+    const auto & clusters = context->getClusters();
     for (const auto & name_and_cluster : clusters.getContainer())
     {
         const ClusterPtr & cluster = name_and_cluster.second;
diff --git a/src/Storages/System/StorageSystemDDLWorkerQueue.h b/src/Storages/System/StorageSystemDDLWorkerQueue.h
index 9326d4dcb26..d1afa2d546a 100644
--- a/src/Storages/System/StorageSystemDDLWorkerQueue.h
+++ b/src/Storages/System/StorageSystemDDLWorkerQueue.h
@@ -22,7 +22,7 @@ class StorageSystemDDLWorkerQueue final : public ext::shared_ptr_helper<StorageS
     Poco::Util::LayeredConfiguration & config = Poco::Util::Application::instance().config();
 
 protected:
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
 
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
diff --git a/src/Storages/System/StorageSystemDataTypeFamilies.cpp b/src/Storages/System/StorageSystemDataTypeFamilies.cpp
index 0957e8f8349..c34589d85b1 100644
--- a/src/Storages/System/StorageSystemDataTypeFamilies.cpp
+++ b/src/Storages/System/StorageSystemDataTypeFamilies.cpp
@@ -16,7 +16,7 @@ NamesAndTypesList StorageSystemDataTypeFamilies::getNamesAndTypes()
     };
 }
 
-void StorageSystemDataTypeFamilies::fillData(MutableColumns & res_columns, const Context &, const SelectQueryInfo &) const
+void StorageSystemDataTypeFamilies::fillData(MutableColumns & res_columns, ContextPtr, const SelectQueryInfo &) const
 {
     const auto & factory = DataTypeFactory::instance();
     auto names = factory.getAllRegisteredNames();
diff --git a/src/Storages/System/StorageSystemDataTypeFamilies.h b/src/Storages/System/StorageSystemDataTypeFamilies.h
index 2a89ae77647..4de2ed99252 100644
--- a/src/Storages/System/StorageSystemDataTypeFamilies.h
+++ b/src/Storages/System/StorageSystemDataTypeFamilies.h
@@ -11,7 +11,7 @@ class StorageSystemDataTypeFamilies final : public ext::shared_ptr_helper<Storag
 {
     friend struct ext::shared_ptr_helper<StorageSystemDataTypeFamilies>;
 protected:
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
 
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
diff --git a/src/Storages/System/StorageSystemDatabases.cpp b/src/Storages/System/StorageSystemDatabases.cpp
index 88ac987014d..e09e47d8baf 100644
--- a/src/Storages/System/StorageSystemDatabases.cpp
+++ b/src/Storages/System/StorageSystemDatabases.cpp
@@ -20,9 +20,9 @@ NamesAndTypesList StorageSystemDatabases::getNamesAndTypes()
     };
 }
 
-void StorageSystemDatabases::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const
+void StorageSystemDatabases::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
-    const auto access = context.getAccess();
+    const auto access = context->getAccess();
     const bool check_access_for_databases = !access->isGranted(AccessType::SHOW_DATABASES);
 
     const auto databases = DatabaseCatalog::instance().getDatabases();
@@ -36,7 +36,7 @@ void StorageSystemDatabases::fillData(MutableColumns & res_columns, const Contex
 
         res_columns[0]->insert(database_name);
         res_columns[1]->insert(database->getEngineName());
-        res_columns[2]->insert(context.getPath() + database->getDataPath());
+        res_columns[2]->insert(context->getPath() + database->getDataPath());
         res_columns[3]->insert(database->getMetadataPath());
         res_columns[4]->insert(database->getUUID());
    }
diff --git a/src/Storages/System/StorageSystemDatabases.h b/src/Storages/System/StorageSystemDatabases.h
index fe517c0f651..33f91fee837 100644
--- a/src/Storages/System/StorageSystemDatabases.h
+++ b/src/Storages/System/StorageSystemDatabases.h
@@ -26,7 +26,7 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemDetachedParts.cpp b/src/Storages/System/StorageSystemDetachedParts.cpp
index f96566026b1..56644620f97 100644
--- a/src/Storages/System/StorageSystemDetachedParts.cpp
+++ b/src/Storages/System/StorageSystemDetachedParts.cpp
@@ -33,7 +33,7 @@ Pipe StorageSystemDetachedParts::read(
     const Names & /* column_names */,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & query_info,
-    const Context & context,
+    ContextPtr context,
     QueryProcessingStage::Enum /*processed_stage*/,
     const size_t /*max_block_size*/,
     const unsigned /*num_streams*/)
diff --git a/src/Storages/System/StorageSystemDetachedParts.h b/src/Storages/System/StorageSystemDetachedParts.h
index 4c6970dadd6..18a6f5576d6 100644
--- a/src/Storages/System/StorageSystemDetachedParts.h
+++ b/src/Storages/System/StorageSystemDetachedParts.h
@@ -26,7 +26,7 @@ protected:
             const Names & /* column_names */,
             const StorageMetadataPtr & metadata_snapshot,
             SelectQueryInfo & query_info,
-            const Context & context,
+            ContextPtr context,
             QueryProcessingStage::Enum /*processed_stage*/,
             const size_t /*max_block_size*/,
             const unsigned /*num_streams*/) override;
diff --git a/src/Storages/System/StorageSystemDictionaries.cpp b/src/Storages/System/StorageSystemDictionaries.cpp
index 6661f51b02f..a362e6a44e3 100644
--- a/src/Storages/System/StorageSystemDictionaries.cpp
+++ b/src/Storages/System/StorageSystemDictionaries.cpp
@@ -30,7 +30,8 @@ NamesAndTypesList StorageSystemDictionaries::getNamesAndTypes()
         {"status", std::make_shared<DataTypeEnum8>(getStatusEnumAllPossibleValues())},
         {"origin", std::make_shared<DataTypeString>()},
         {"type", std::make_shared<DataTypeString>()},
-        {"key", std::make_shared<DataTypeString>()},
+        {"key.names", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())},
+        {"key.types", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())},
         {"attribute.names", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())},
         {"attribute.types", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())},
         {"bytes_allocated", std::make_shared<DataTypeUInt64>()},
@@ -49,15 +50,16 @@ NamesAndTypesList StorageSystemDictionaries::getNamesAndTypes()
     };
 }
 
-void StorageSystemDictionaries::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & /*query_info*/) const
+void StorageSystemDictionaries::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & /*query_info*/) const
 {
-    const auto access = context.getAccess();
+    const auto access = context->getAccess();
     const bool check_access_for_dictionaries = !access->isGranted(AccessType::SHOW_DICTIONARIES);
 
-    const auto & external_dictionaries = context.getExternalDictionariesLoader();
+    const auto & external_dictionaries = context->getExternalDictionariesLoader();
     for (const auto & load_result : external_dictionaries.getLoadResults())
     {
-        const auto dict_ptr = std::dynamic_pointer_cast<const IDictionaryBase>(load_result.object);
+        const auto dict_ptr = std::dynamic_pointer_cast<const IDictionary>(load_result.object);
+        DictionaryStructure dictionary_structure = ExternalDictionariesLoader::getDictionaryStructure(*load_result.config);
 
         StorageID dict_id = StorageID::createEmpty();
         if (dict_ptr)
@@ -82,13 +84,22 @@ void StorageSystemDictionaries::fillData(MutableColumns & res_columns, const Con
         std::exception_ptr last_exception = load_result.exception;
 
         if (dict_ptr)
-        {
             res_columns[i++]->insert(dict_ptr->getTypeName());
+        else
+            res_columns[i++]->insertDefault();
 
-            const auto & dict_struct = dict_ptr->getStructure();
-            res_columns[i++]->insert(dict_struct.getKeyDescription());
-            res_columns[i++]->insert(ext::map<Array>(dict_struct.attributes, [] (auto & attr) { return attr.name; }));
-            res_columns[i++]->insert(ext::map<Array>(dict_struct.attributes, [] (auto & attr) { return attr.type->getName(); }));
+        res_columns[i++]->insert(ext::map<Array>(dictionary_structure.getKeysNames(), [] (auto & name) { return name; }));
+
+        if (dictionary_structure.id)
+            res_columns[i++]->insert(Array({"UInt64"}));
+        else
+            res_columns[i++]->insert(ext::map<Array>(*dictionary_structure.key, [] (auto & attr) { return attr.type->getName(); }));
+
+        res_columns[i++]->insert(ext::map<Array>(dictionary_structure.attributes, [] (auto & attr) { return attr.name; }));
+        res_columns[i++]->insert(ext::map<Array>(dictionary_structure.attributes, [] (auto & attr) { return attr.type->getName(); }));
+
+        if (dict_ptr)
+        {
             res_columns[i++]->insert(dict_ptr->getBytesAllocated());
             res_columns[i++]->insert(dict_ptr->getQueryCount());
             res_columns[i++]->insert(dict_ptr->getHitRate());
@@ -104,7 +115,7 @@ void StorageSystemDictionaries::fillData(MutableColumns & res_columns, const Con
         }
         else
         {
-            for (size_t j = 0; j != 12; ++j) // Number of empty fields if dict_ptr is null
+            for (size_t j = 0; j != 8; ++j) // Number of empty fields if dict_ptr is null
                 res_columns[i++]->insertDefault();
         }
 
diff --git a/src/Storages/System/StorageSystemDictionaries.h b/src/Storages/System/StorageSystemDictionaries.h
index 5139ce3c5f6..63b33adaaff 100644
--- a/src/Storages/System/StorageSystemDictionaries.h
+++ b/src/Storages/System/StorageSystemDictionaries.h
@@ -21,7 +21,7 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemDisks.cpp b/src/Storages/System/StorageSystemDisks.cpp
index b04d24cc705..5d7628acb2a 100644
--- a/src/Storages/System/StorageSystemDisks.cpp
+++ b/src/Storages/System/StorageSystemDisks.cpp
@@ -30,7 +30,7 @@ Pipe StorageSystemDisks::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & /*query_info*/,
-    const Context & context,
+    ContextPtr context,
     QueryProcessingStage::Enum /*processed_stage*/,
     const size_t /*max_block_size*/,
     const unsigned /*num_streams*/)
@@ -44,7 +44,7 @@ Pipe StorageSystemDisks::read(
     MutableColumnPtr col_keep = ColumnUInt64::create();
     MutableColumnPtr col_type = ColumnString::create();
 
-    for (const auto & [disk_name, disk_ptr] : context.getDisksMap())
+    for (const auto & [disk_name, disk_ptr] : context->getDisksMap())
     {
         col_name->insert(disk_name);
         col_path->insert(disk_ptr->getPath());
diff --git a/src/Storages/System/StorageSystemDisks.h b/src/Storages/System/StorageSystemDisks.h
index cff05242019..fa0f6fe4b8a 100644
--- a/src/Storages/System/StorageSystemDisks.h
+++ b/src/Storages/System/StorageSystemDisks.h
@@ -24,7 +24,7 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
diff --git a/src/Storages/System/StorageSystemDistributionQueue.cpp b/src/Storages/System/StorageSystemDistributionQueue.cpp
index db649e7e1ba..9c0f8818011 100644
--- a/src/Storages/System/StorageSystemDistributionQueue.cpp
+++ b/src/Storages/System/StorageSystemDistributionQueue.cpp
@@ -103,9 +103,9 @@ NamesAndTypesList StorageSystemDistributionQueue::getNamesAndTypes()
 }
 
 
-void StorageSystemDistributionQueue::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const
+void StorageSystemDistributionQueue::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const
 {
-    const auto access = context.getAccess();
+    const auto access = context->getAccess();
     const bool check_access_for_databases = !access->isGranted(AccessType::SHOW_TABLES);
 
     std::map<String, std::map<String, StoragePtr>> tables;
diff --git a/src/Storages/System/StorageSystemDistributionQueue.h b/src/Storages/System/StorageSystemDistributionQueue.h
index 88e7fa45cf5..9314418d242 100644
--- a/src/Storages/System/StorageSystemDistributionQueue.h
+++ b/src/Storages/System/StorageSystemDistributionQueue.h
@@ -23,7 +23,7 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemEnabledRoles.cpp b/src/Storages/System/StorageSystemEnabledRoles.cpp
index 27a42ca6f8b..99370dd647d 100644
--- a/src/Storages/System/StorageSystemEnabledRoles.cpp
+++ b/src/Storages/System/StorageSystemEnabledRoles.cpp
@@ -23,10 +23,10 @@ NamesAndTypesList StorageSystemEnabledRoles::getNamesAndTypes()
 }
 
 
-void StorageSystemEnabledRoles::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const
+void StorageSystemEnabledRoles::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
-    auto roles_info = context.getRolesInfo();
-    auto user = context.getUser();
+    auto roles_info = context->getRolesInfo();
+    auto user = context->getUser();
     if (!roles_info || !user)
         return;
 
diff --git a/src/Storages/System/StorageSystemEnabledRoles.h b/src/Storages/System/StorageSystemEnabledRoles.h
index 18df31c646a..13b0533b790 100644
--- a/src/Storages/System/StorageSystemEnabledRoles.h
+++ b/src/Storages/System/StorageSystemEnabledRoles.h
@@ -18,7 +18,7 @@ public:
 protected:
     friend struct ext::shared_ptr_helper<StorageSystemEnabledRoles>;
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemErrors.cpp b/src/Storages/System/StorageSystemErrors.cpp
index 89df058900b..d08ffd730ac 100644
--- a/src/Storages/System/StorageSystemErrors.cpp
+++ b/src/Storages/System/StorageSystemErrors.cpp
@@ -1,5 +1,7 @@
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <DataTypes/DataTypeArray.h>
 #include <Storages/System/StorageSystemErrors.h>
 #include <Common/ErrorCodes.h>
 #include <Interpreters/Context.h>
@@ -10,30 +12,51 @@ namespace DB
 NamesAndTypesList StorageSystemErrors::getNamesAndTypes()
 {
     return {
-        { "name",              std::make_shared<DataTypeString>() },
-        { "code",              std::make_shared<DataTypeInt32>() },
-        { "value",             std::make_shared<DataTypeUInt64>() },
+        { "name",                    std::make_shared<DataTypeString>() },
+        { "code",                    std::make_shared<DataTypeInt32>() },
+        { "value",                   std::make_shared<DataTypeUInt64>() },
+        { "last_error_time",         std::make_shared<DataTypeDateTime>() },
+        { "last_error_message",      std::make_shared<DataTypeString>() },
+        { "last_error_trace",        std::make_shared<DataTypeArray>(std::make_shared<DataTypeUInt64>()) },
+        { "remote",                  std::make_shared<DataTypeUInt8>() },
     };
 }
 
 
-void StorageSystemErrors::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const
+void StorageSystemErrors::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
+    auto add_row = [&](std::string_view name, size_t code, const auto & error, bool remote)
+    {
+        if (error.count || context->getSettingsRef().system_events_show_zero_values)
+        {
+            size_t col_num = 0;
+            res_columns[col_num++]->insert(name);
+            res_columns[col_num++]->insert(code);
+            res_columns[col_num++]->insert(error.count);
+            res_columns[col_num++]->insert(error.error_time_ms / 1000);
+            res_columns[col_num++]->insert(error.message);
+            {
+                Array trace_array;
+                trace_array.reserve(error.trace.size());
+                for (size_t i = 0; i < error.trace.size(); ++i)
+                    trace_array.emplace_back(reinterpret_cast<intptr_t>(error.trace[i]));
+
+                res_columns[col_num++]->insert(trace_array);
+            }
+            res_columns[col_num++]->insert(remote);
+        }
+    };
+
     for (size_t i = 0, end = ErrorCodes::end(); i < end; ++i)
     {
-        UInt64 value = ErrorCodes::values[i];
+        const auto & error = ErrorCodes::values[i].get();
         std::string_view name = ErrorCodes::getName(i);
 
         if (name.empty())
             continue;
 
-        if (value || context.getSettingsRef().system_events_show_zero_values)
-        {
-            size_t col_num = 0;
-            res_columns[col_num++]->insert(name);
-            res_columns[col_num++]->insert(i);
-            res_columns[col_num++]->insert(value);
-        }
+        add_row(name, i, error.local,  /* remote= */ false);
+        add_row(name, i, error.remote, /* remote= */ true);
     }
 }
 
diff --git a/src/Storages/System/StorageSystemErrors.h b/src/Storages/System/StorageSystemErrors.h
index 569a7a998b7..ff3af11d251 100644
--- a/src/Storages/System/StorageSystemErrors.h
+++ b/src/Storages/System/StorageSystemErrors.h
@@ -25,7 +25,7 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, const Context &, const SelectQueryInfo &) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr, const SelectQueryInfo &) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemEvents.cpp b/src/Storages/System/StorageSystemEvents.cpp
index ddb00659473..be2d3f8d49e 100644
--- a/src/Storages/System/StorageSystemEvents.cpp
+++ b/src/Storages/System/StorageSystemEvents.cpp
@@ -16,13 +16,13 @@ NamesAndTypesList StorageSystemEvents::getNamesAndTypes()
     };
 }
 
-void StorageSystemEvents::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const
+void StorageSystemEvents::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
     for (size_t i = 0, end = ProfileEvents::end(); i < end; ++i)
     {
         UInt64 value = ProfileEvents::global_counters[i];
 
-        if (0 != value || context.getSettingsRef().system_events_show_zero_values)
+        if (0 != value || context->getSettingsRef().system_events_show_zero_values)
         {
             res_columns[0]->insert(ProfileEvents::getName(ProfileEvents::Event(i)));
             res_columns[1]->insert(value);
diff --git a/src/Storages/System/StorageSystemEvents.h b/src/Storages/System/StorageSystemEvents.h
index f1687e42233..6071cb7b2b3 100644
--- a/src/Storages/System/StorageSystemEvents.h
+++ b/src/Storages/System/StorageSystemEvents.h
@@ -22,7 +22,7 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemFormats.cpp b/src/Storages/System/StorageSystemFormats.cpp
index 7048ab98a0d..86e0212a523 100644
--- a/src/Storages/System/StorageSystemFormats.cpp
+++ b/src/Storages/System/StorageSystemFormats.cpp
@@ -15,7 +15,7 @@ NamesAndTypesList StorageSystemFormats::getNamesAndTypes()
     };
 }
 
-void StorageSystemFormats::fillData(MutableColumns & res_columns, const Context &, const SelectQueryInfo &) const
+void StorageSystemFormats::fillData(MutableColumns & res_columns, ContextPtr, const SelectQueryInfo &) const
 {
     const auto & formats = FormatFactory::instance().getAllFormats();
     for (const auto & pair : formats)
diff --git a/src/Storages/System/StorageSystemFormats.h b/src/Storages/System/StorageSystemFormats.h
index f90839e44e9..ed65cd2af88 100644
--- a/src/Storages/System/StorageSystemFormats.h
+++ b/src/Storages/System/StorageSystemFormats.h
@@ -9,7 +9,7 @@ class StorageSystemFormats final : public ext::shared_ptr_helper<StorageSystemFo
 {
     friend struct ext::shared_ptr_helper<StorageSystemFormats>;
 protected:
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
 
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 public:
diff --git a/src/Storages/System/StorageSystemFunctions.cpp b/src/Storages/System/StorageSystemFunctions.cpp
index e46b7007dc2..973bf493cd1 100644
--- a/src/Storages/System/StorageSystemFunctions.cpp
+++ b/src/Storages/System/StorageSystemFunctions.cpp
@@ -34,7 +34,7 @@ NamesAndTypesList StorageSystemFunctions::getNamesAndTypes()
     };
 }
 
-void StorageSystemFunctions::fillData(MutableColumns & res_columns, const Context &, const SelectQueryInfo &) const
+void StorageSystemFunctions::fillData(MutableColumns & res_columns, ContextPtr, const SelectQueryInfo &) const
 {
     const auto & functions_factory = FunctionFactory::instance();
     const auto & function_names = functions_factory.getAllRegisteredNames();
diff --git a/src/Storages/System/StorageSystemFunctions.h b/src/Storages/System/StorageSystemFunctions.h
index f62d731f288..62942721995 100644
--- a/src/Storages/System/StorageSystemFunctions.h
+++ b/src/Storages/System/StorageSystemFunctions.h
@@ -24,7 +24,7 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemGrants.cpp b/src/Storages/System/StorageSystemGrants.cpp
index 360256c1f45..1ba5e6d96a4 100644
--- a/src/Storages/System/StorageSystemGrants.cpp
+++ b/src/Storages/System/StorageSystemGrants.cpp
@@ -18,7 +18,6 @@
 namespace DB
 {
 using EntityType = IAccessEntity::Type;
-using Kind = AccessRightsElementWithOptions::Kind;
 
 NamesAndTypesList StorageSystemGrants::getNamesAndTypes()
 {
@@ -36,10 +35,10 @@ NamesAndTypesList StorageSystemGrants::getNamesAndTypes()
 }
 
 
-void StorageSystemGrants::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const
+void StorageSystemGrants::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
-    context.checkAccess(AccessType::SHOW_USERS | AccessType::SHOW_ROLES);
-    const auto & access_control = context.getAccessControlManager();
+    context->checkAccess(AccessType::SHOW_USERS | AccessType::SHOW_ROLES);
+    const auto & access_control = context->getAccessControlManager();
     std::vector<UUID> ids = access_control.findAll<User>();
     boost::range::push_back(ids, access_control.findAll<Role>());
 
@@ -64,7 +63,7 @@ void StorageSystemGrants::fillData(MutableColumns & res_columns, const Context &
                        const String * database,
                        const String * table,
                        const String * column,
-                       Kind kind,
+                       bool is_partial_revoke,
                        bool grant_option)
     {
         if (grantee_type == EntityType::USER)
@@ -119,13 +118,13 @@ void StorageSystemGrants::fillData(MutableColumns & res_columns, const Context &
             column_column_null_map.push_back(true);
         }
 
-        column_is_partial_revoke.push_back(kind == Kind::REVOKE);
+        column_is_partial_revoke.push_back(is_partial_revoke);
         column_grant_option.push_back(grant_option);
     };
 
     auto add_rows = [&](const String & grantee_name,
                         IAccessEntity::Type grantee_type,
-                        const AccessRightsElementsWithOptions & elements)
+                        const AccessRightsElements & elements)
     {
         for (const auto & element : elements)
         {
@@ -139,13 +138,13 @@ void StorageSystemGrants::fillData(MutableColumns & res_columns, const Context &
             if (element.any_column)
             {
                 for (const auto & access_type : access_types)
-                    add_row(grantee_name, grantee_type, access_type, database, table, nullptr, element.kind, element.grant_option);
+                    add_row(grantee_name, grantee_type, access_type, database, table, nullptr, element.is_partial_revoke, element.grant_option);
             }
             else
             {
                 for (const auto & access_type : access_types)
                     for (const auto & column : element.columns)
-                        add_row(grantee_name, grantee_type, access_type, database, table, &column, element.kind, element.grant_option);
+                        add_row(grantee_name, grantee_type, access_type, database, table, &column, element.is_partial_revoke, element.grant_option);
             }
         }
     };
diff --git a/src/Storages/System/StorageSystemGrants.h b/src/Storages/System/StorageSystemGrants.h
index 39c38deed85..8c8a0f9f7bf 100644
--- a/src/Storages/System/StorageSystemGrants.h
+++ b/src/Storages/System/StorageSystemGrants.h
@@ -18,7 +18,7 @@ public:
 protected:
     friend struct ext::shared_ptr_helper<StorageSystemGrants>;
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemGraphite.cpp b/src/Storages/System/StorageSystemGraphite.cpp
index 93bc16785b2..dd592600d18 100644
--- a/src/Storages/System/StorageSystemGraphite.cpp
+++ b/src/Storages/System/StorageSystemGraphite.cpp
@@ -25,7 +25,7 @@ NamesAndTypesList StorageSystemGraphite::getNamesAndTypes()
 /*
  * Looking for (Replicated)*GraphiteMergeTree and get all configuration parameters for them
  */
-static StorageSystemGraphite::Configs getConfigs(const Context & context)
+static StorageSystemGraphite::Configs getConfigs(ContextPtr context)
 {
     const Databases databases = DatabaseCatalog::instance().getDatabases();
     StorageSystemGraphite::Configs graphite_configs;
@@ -73,7 +73,7 @@ static StorageSystemGraphite::Configs getConfigs(const Context & context)
     return graphite_configs;
 }
 
-void StorageSystemGraphite::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const
+void StorageSystemGraphite::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
     Configs graphite_configs = getConfigs(context);
 
diff --git a/src/Storages/System/StorageSystemGraphite.h b/src/Storages/System/StorageSystemGraphite.h
index 703db41dc39..256ad50e472 100644
--- a/src/Storages/System/StorageSystemGraphite.h
+++ b/src/Storages/System/StorageSystemGraphite.h
@@ -32,7 +32,7 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemLicenses.cpp b/src/Storages/System/StorageSystemLicenses.cpp
index 894c861de29..6f880f03e10 100644
--- a/src/Storages/System/StorageSystemLicenses.cpp
+++ b/src/Storages/System/StorageSystemLicenses.cpp
@@ -18,7 +18,7 @@ NamesAndTypesList StorageSystemLicenses::getNamesAndTypes()
     };
 }
 
-void StorageSystemLicenses::fillData(MutableColumns & res_columns, const Context &, const SelectQueryInfo &) const
+void StorageSystemLicenses::fillData(MutableColumns & res_columns, ContextPtr, const SelectQueryInfo &) const
 {
     for (const auto * it = library_licenses; *it; it += 4)
     {
diff --git a/src/Storages/System/StorageSystemLicenses.h b/src/Storages/System/StorageSystemLicenses.h
index cee48abacab..43bb1c20c22 100644
--- a/src/Storages/System/StorageSystemLicenses.h
+++ b/src/Storages/System/StorageSystemLicenses.h
@@ -17,7 +17,7 @@ class StorageSystemLicenses final :
 {
     friend struct ext::shared_ptr_helper<StorageSystemLicenses>;
 protected:
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
 
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
diff --git a/src/Storages/System/StorageSystemMacros.cpp b/src/Storages/System/StorageSystemMacros.cpp
index 8e6420add8b..576fbc69039 100644
--- a/src/Storages/System/StorageSystemMacros.cpp
+++ b/src/Storages/System/StorageSystemMacros.cpp
@@ -14,9 +14,9 @@ NamesAndTypesList StorageSystemMacros::getNamesAndTypes()
     };
 }
 
-void StorageSystemMacros::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const
+void StorageSystemMacros::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
-    auto macros = context.getMacros();
+    auto macros = context->getMacros();
 
     for (const auto & macro : macros->getMacroMap())
     {
diff --git a/src/Storages/System/StorageSystemMacros.h b/src/Storages/System/StorageSystemMacros.h
index 52336bd6f69..298aa488265 100644
--- a/src/Storages/System/StorageSystemMacros.h
+++ b/src/Storages/System/StorageSystemMacros.h
@@ -24,7 +24,7 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemMergeTreeSettings.cpp b/src/Storages/System/StorageSystemMergeTreeSettings.cpp
index 19cbf76f252..626319af63f 100644
--- a/src/Storages/System/StorageSystemMergeTreeSettings.cpp
+++ b/src/Storages/System/StorageSystemMergeTreeSettings.cpp
@@ -20,9 +20,9 @@ NamesAndTypesList SystemMergeTreeSettings<replicated>::getNamesAndTypes()
 }
 
 template <bool replicated>
-void SystemMergeTreeSettings<replicated>::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const
+void SystemMergeTreeSettings<replicated>::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
-    const auto & settings = replicated ? context.getReplicatedMergeTreeSettings().all() : context.getMergeTreeSettings().all();
+    const auto & settings = replicated ? context->getReplicatedMergeTreeSettings().all() : context->getMergeTreeSettings().all();
     for (const auto & setting : settings)
     {
         res_columns[0]->insert(setting.getName());
diff --git a/src/Storages/System/StorageSystemMergeTreeSettings.h b/src/Storages/System/StorageSystemMergeTreeSettings.h
index 9f61fa6f780..b02b191fb69 100644
--- a/src/Storages/System/StorageSystemMergeTreeSettings.h
+++ b/src/Storages/System/StorageSystemMergeTreeSettings.h
@@ -28,7 +28,7 @@ public:
 protected:
     using IStorageSystemOneBlock<SystemMergeTreeSettings<replicated>>::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemMerges.cpp b/src/Storages/System/StorageSystemMerges.cpp
index b61324818e4..b29836206d0 100644
--- a/src/Storages/System/StorageSystemMerges.cpp
+++ b/src/Storages/System/StorageSystemMerges.cpp
@@ -36,12 +36,12 @@ NamesAndTypesList StorageSystemMerges::getNamesAndTypes()
 }
 
 
-void StorageSystemMerges::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const
+void StorageSystemMerges::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
-    const auto access = context.getAccess();
+    const auto access = context->getAccess();
     const bool check_access_for_tables = !access->isGranted(AccessType::SHOW_TABLES);
 
-    for (const auto & merge : context.getMergeList().get())
+    for (const auto & merge : context->getMergeList().get())
     {
         if (check_access_for_tables && !access->isGranted(AccessType::SHOW_TABLES, merge.database, merge.table))
             continue;
diff --git a/src/Storages/System/StorageSystemMerges.h b/src/Storages/System/StorageSystemMerges.h
index 81c03c4e397..5898bf62825 100644
--- a/src/Storages/System/StorageSystemMerges.h
+++ b/src/Storages/System/StorageSystemMerges.h
@@ -24,7 +24,7 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemMetrics.cpp b/src/Storages/System/StorageSystemMetrics.cpp
index b2332c52817..6007c8a7c71 100644
--- a/src/Storages/System/StorageSystemMetrics.cpp
+++ b/src/Storages/System/StorageSystemMetrics.cpp
@@ -17,7 +17,7 @@ NamesAndTypesList StorageSystemMetrics::getNamesAndTypes()
     };
 }
 
-void StorageSystemMetrics::fillData(MutableColumns & res_columns, const Context &, const SelectQueryInfo &) const
+void StorageSystemMetrics::fillData(MutableColumns & res_columns, ContextPtr, const SelectQueryInfo &) const
 {
     for (size_t i = 0, end = CurrentMetrics::end(); i < end; ++i)
     {
diff --git a/src/Storages/System/StorageSystemMetrics.h b/src/Storages/System/StorageSystemMetrics.h
index c47bcea656f..af5d32ec46b 100644
--- a/src/Storages/System/StorageSystemMetrics.h
+++ b/src/Storages/System/StorageSystemMetrics.h
@@ -23,7 +23,7 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemModels.cpp b/src/Storages/System/StorageSystemModels.cpp
index 9fae9803b96..3df48e830bb 100644
--- a/src/Storages/System/StorageSystemModels.cpp
+++ b/src/Storages/System/StorageSystemModels.cpp
@@ -25,9 +25,9 @@ NamesAndTypesList StorageSystemModels::getNamesAndTypes()
     };
 }
 
-void StorageSystemModels::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const
+void StorageSystemModels::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
-    const auto & external_models_loader = context.getExternalModelsLoader();
+    const auto & external_models_loader = context->getExternalModelsLoader();
     auto load_results = external_models_loader.getLoadResults();
 
     for (const auto & load_result : load_results)
diff --git a/src/Storages/System/StorageSystemModels.h b/src/Storages/System/StorageSystemModels.h
index cee5200e7de..832a9d550db 100644
--- a/src/Storages/System/StorageSystemModels.h
+++ b/src/Storages/System/StorageSystemModels.h
@@ -21,7 +21,7 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemMutations.cpp b/src/Storages/System/StorageSystemMutations.cpp
index f66f57ef5d1..fa521c632b8 100644
--- a/src/Storages/System/StorageSystemMutations.cpp
+++ b/src/Storages/System/StorageSystemMutations.cpp
@@ -35,9 +35,9 @@ NamesAndTypesList StorageSystemMutations::getNamesAndTypes()
 }
 
 
-void StorageSystemMutations::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const
+void StorageSystemMutations::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const
 {
-    const auto access = context.getAccess();
+    const auto access = context->getAccess();
     const bool check_access_for_databases = !access->isGranted(AccessType::SHOW_TABLES);
 
     /// Collect a set of *MergeTree tables.
diff --git a/src/Storages/System/StorageSystemMutations.h b/src/Storages/System/StorageSystemMutations.h
index f7bc5f6f33c..1f41ff6051b 100644
--- a/src/Storages/System/StorageSystemMutations.h
+++ b/src/Storages/System/StorageSystemMutations.h
@@ -23,7 +23,7 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemNumbers.cpp b/src/Storages/System/StorageSystemNumbers.cpp
index 677e0c02400..f8a0e94bf98 100644
--- a/src/Storages/System/StorageSystemNumbers.cpp
+++ b/src/Storages/System/StorageSystemNumbers.cpp
@@ -126,7 +126,7 @@ Pipe StorageSystemNumbers::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo &,
-    const Context & /*context*/,
+    ContextPtr /*context*/,
     QueryProcessingStage::Enum /*processed_stage*/,
     size_t max_block_size,
     unsigned num_streams)
diff --git a/src/Storages/System/StorageSystemNumbers.h b/src/Storages/System/StorageSystemNumbers.h
index d12c28c1ce2..708ace7a4cd 100644
--- a/src/Storages/System/StorageSystemNumbers.h
+++ b/src/Storages/System/StorageSystemNumbers.h
@@ -33,7 +33,7 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
diff --git a/src/Storages/System/StorageSystemOne.cpp b/src/Storages/System/StorageSystemOne.cpp
index c456b22e97b..7c28f897121 100644
--- a/src/Storages/System/StorageSystemOne.cpp
+++ b/src/Storages/System/StorageSystemOne.cpp
@@ -24,7 +24,7 @@ Pipe StorageSystemOne::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo &,
-    const Context & /*context*/,
+    ContextPtr /*context*/,
     QueryProcessingStage::Enum /*processed_stage*/,
     const size_t /*max_block_size*/,
     const unsigned /*num_streams*/)
diff --git a/src/Storages/System/StorageSystemOne.h b/src/Storages/System/StorageSystemOne.h
index 8228ce465e0..a14d5e15726 100644
--- a/src/Storages/System/StorageSystemOne.h
+++ b/src/Storages/System/StorageSystemOne.h
@@ -25,13 +25,13 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
 
 protected:
-    StorageSystemOne(const StorageID & table_id_);
+    explicit StorageSystemOne(const StorageID & table_id_);
 };
 
 }
diff --git a/src/Storages/System/StorageSystemParts.cpp b/src/Storages/System/StorageSystemParts.cpp
index 45e1663cb93..6a643dbe1b9 100644
--- a/src/Storages/System/StorageSystemParts.cpp
+++ b/src/Storages/System/StorageSystemParts.cpp
@@ -81,7 +81,8 @@ StorageSystemParts::StorageSystemParts(const StorageID & table_id_)
 {
 }
 
-void StorageSystemParts::processNextStorage(MutableColumns & columns_, const StoragesInfo & info, bool has_state_column)
+void StorageSystemParts::processNextStorage(
+    MutableColumns & columns, std::vector<UInt8> & columns_mask, const StoragesInfo & info, bool has_state_column)
 {
     using State = IMergeTreeDataPart::State;
     MergeTreeData::DataPartStateVector all_parts_state;
@@ -96,97 +97,157 @@ void StorageSystemParts::processNextStorage(MutableColumns & columns_, const Sto
 
         ColumnSize columns_size = part->getTotalColumnsSize();
 
-        size_t i = 0;
+        size_t src_index = 0, res_index = 0;
+        if (columns_mask[src_index++])
         {
             WriteBufferFromOwnString out;
             part->partition.serializeText(*info.data, out, format_settings);
-            columns_[i++]->insert(out.str());
+            columns[res_index++]->insert(out.str());
         }
-        columns_[i++]->insert(part->name);
-        columns_[i++]->insert(part->uuid);
-        columns_[i++]->insert(part->getTypeName());
-        columns_[i++]->insert(part_state == State::Committed);
-        columns_[i++]->insert(part->getMarksCount());
-        columns_[i++]->insert(part->rows_count);
-        columns_[i++]->insert(part->getBytesOnDisk());
-        columns_[i++]->insert(columns_size.data_compressed);
-        columns_[i++]->insert(columns_size.data_uncompressed);
-        columns_[i++]->insert(columns_size.marks);
-        columns_[i++]->insert(static_cast<UInt64>(part->modification_time));
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(part->name);
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(part->uuid);
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(part->getTypeName());
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(part_state == State::Committed);
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(part->getMarksCount());
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(part->rows_count);
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(part->getBytesOnDisk());
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(columns_size.data_compressed);
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(columns_size.data_uncompressed);
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(columns_size.marks);
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(static_cast<UInt64>(part->modification_time));
 
-        time_t remove_time = part->remove_time.load(std::memory_order_relaxed);
-        columns_[i++]->insert(static_cast<UInt64>(remove_time == std::numeric_limits<time_t>::max() ? 0 : remove_time));
+        if (columns_mask[src_index++])
+        {
+            time_t remove_time = part->remove_time.load(std::memory_order_relaxed);
+            columns[res_index++]->insert(static_cast<UInt64>(remove_time == std::numeric_limits<time_t>::max() ? 0 : remove_time));
+        }
 
         /// For convenience, in returned refcount, don't add references that was due to local variables in this method: all_parts, active_parts.
-        columns_[i++]->insert(static_cast<UInt64>(part.use_count() - 1));
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(static_cast<UInt64>(part.use_count() - 1));
 
-        columns_[i++]->insert(part->getMinDate());
-        columns_[i++]->insert(part->getMaxDate());
-        columns_[i++]->insert(static_cast<UInt32>(part->getMinTime()));
-        columns_[i++]->insert(static_cast<UInt32>(part->getMaxTime()));
-        columns_[i++]->insert(part->info.partition_id);
-        columns_[i++]->insert(part->info.min_block);
-        columns_[i++]->insert(part->info.max_block);
-        columns_[i++]->insert(part->info.level);
-        columns_[i++]->insert(static_cast<UInt64>(part->info.getDataVersion()));
-        columns_[i++]->insert(part->getIndexSizeInBytes());
-        columns_[i++]->insert(part->getIndexSizeInAllocatedBytes());
-        columns_[i++]->insert(part->is_frozen.load(std::memory_order_relaxed));
+        auto min_max_date = part->getMinMaxDate();
+        auto min_max_time = part->getMinMaxTime();
+
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(min_max_date.first);
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(min_max_date.second);
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(static_cast<UInt32>(min_max_time.first));
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(static_cast<UInt32>(min_max_time.second));
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(part->info.partition_id);
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(part->info.min_block);
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(part->info.max_block);
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(part->info.level);
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(static_cast<UInt64>(part->info.getDataVersion()));
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(part->getIndexSizeInBytes());
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(part->getIndexSizeInAllocatedBytes());
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(part->is_frozen.load(std::memory_order_relaxed));
+
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(info.database);
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(info.table);
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(info.engine);
 
-        columns_[i++]->insert(info.database);
-        columns_[i++]->insert(info.table);
-        columns_[i++]->insert(info.engine);
         if (part->isStoredOnDisk())
         {
-            columns_[i++]->insert(part->volume->getDisk()->getName());
-            columns_[i++]->insert(part->getFullPath());
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(part->volume->getDisk()->getName());
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(part->getFullPath());
         }
         else
         {
-            columns_[i++]->insertDefault();
-            columns_[i++]->insertDefault();
+            if (columns_mask[src_index++])
+                columns[res_index++]->insertDefault();
+            if (columns_mask[src_index++])
+                columns[res_index++]->insertDefault();
         }
 
-        MinimalisticDataPartChecksums helper;
-        helper.computeTotalChecksums(part->checksums);
 
-        auto checksum = helper.hash_of_all_files;
-        columns_[i++]->insert(getHexUIntLowercase(checksum.first) + getHexUIntLowercase(checksum.second));
+        {
+            MinimalisticDataPartChecksums helper;
+            if (columns_mask[src_index] || columns_mask[src_index + 1] || columns_mask[src_index + 2])
+                helper.computeTotalChecksums(part->checksums);
 
-        checksum = helper.hash_of_uncompressed_files;
-        columns_[i++]->insert(getHexUIntLowercase(checksum.first) + getHexUIntLowercase(checksum.second));
-
-        checksum = helper.uncompressed_hash_of_compressed_files;
-        columns_[i++]->insert(getHexUIntLowercase(checksum.first) + getHexUIntLowercase(checksum.second));
+            if (columns_mask[src_index++])
+            {
+                auto checksum = helper.hash_of_all_files;
+                columns[res_index++]->insert(getHexUIntLowercase(checksum.first) + getHexUIntLowercase(checksum.second));
+            }
+            if (columns_mask[src_index++])
+            {
+                auto checksum = helper.hash_of_uncompressed_files;
+                columns[res_index++]->insert(getHexUIntLowercase(checksum.first) + getHexUIntLowercase(checksum.second));
+            }
+            if (columns_mask[src_index++])
+            {
+                auto checksum = helper.uncompressed_hash_of_compressed_files;
+                columns[res_index++]->insert(getHexUIntLowercase(checksum.first) + getHexUIntLowercase(checksum.second));
+            }
+        }
 
         /// delete_ttl_info
-        {
-            columns_[i++]->insert(static_cast<UInt32>(part->ttl_infos.table_ttl.min));
-            columns_[i++]->insert(static_cast<UInt32>(part->ttl_infos.table_ttl.max));
-        }
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(static_cast<UInt32>(part->ttl_infos.table_ttl.min));
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(static_cast<UInt32>(part->ttl_infos.table_ttl.max));
 
         auto add_ttl_info_map = [&](const TTLInfoMap & ttl_info_map)
         {
             Array expression_array;
             Array min_array;
             Array max_array;
-            expression_array.reserve(ttl_info_map.size());
-            min_array.reserve(ttl_info_map.size());
-            max_array.reserve(ttl_info_map.size());
+            if (columns_mask[src_index])
+                expression_array.reserve(ttl_info_map.size());
+            if (columns_mask[src_index + 1])
+                min_array.reserve(ttl_info_map.size());
+            if (columns_mask[src_index + 2])
+                max_array.reserve(ttl_info_map.size());
             for (const auto & [expression, ttl_info] : ttl_info_map)
             {
-                expression_array.emplace_back(expression);
-                min_array.push_back(static_cast<UInt32>(ttl_info.min));
-                max_array.push_back(static_cast<UInt32>(ttl_info.max));
+                if (columns_mask[src_index])
+                    expression_array.emplace_back(expression);
+                if (columns_mask[src_index + 1])
+                    min_array.push_back(static_cast<UInt32>(ttl_info.min));
+                if (columns_mask[src_index + 2])
+                    max_array.push_back(static_cast<UInt32>(ttl_info.max));
             }
-            columns_[i++]->insert(expression_array);
-            columns_[i++]->insert(min_array);
-            columns_[i++]->insert(max_array);
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(expression_array);
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(min_array);
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(max_array);
         };
 
         add_ttl_info_map(part->ttl_infos.moves_ttl);
 
-        columns_[i++]->insert(queryToString(part->default_codec->getCodecDesc()));
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(queryToString(part->default_codec->getCodecDesc()));
 
         add_ttl_info_map(part->ttl_infos.recompression_ttl);
         add_ttl_info_map(part->ttl_infos.group_by_ttl);
@@ -195,7 +256,7 @@ void StorageSystemParts::processNextStorage(MutableColumns & columns_, const Sto
         /// _state column should be the latest.
         /// Do not use part->getState*, it can be changed from different thread
         if (has_state_column)
-            columns_[i++]->insert(IMergeTreeDataPart::stateToString(part_state));
+            columns[res_index++]->insert(IMergeTreeDataPart::stateToString(part_state));
     }
 }
 
diff --git a/src/Storages/System/StorageSystemParts.h b/src/Storages/System/StorageSystemParts.h
index 2de4cd3f3a4..d67e62049cd 100644
--- a/src/Storages/System/StorageSystemParts.h
+++ b/src/Storages/System/StorageSystemParts.h
@@ -20,7 +20,8 @@ public:
 
 protected:
     explicit StorageSystemParts(const StorageID & table_id_);
-    void processNextStorage(MutableColumns & columns, const StoragesInfo & info, bool has_state_column) override;
+    void processNextStorage(
+        MutableColumns & columns, std::vector<UInt8> & columns_mask, const StoragesInfo & info, bool has_state_column) override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemPartsBase.cpp b/src/Storages/System/StorageSystemPartsBase.cpp
index 9b5bf5a4b48..f1c82aa4c63 100644
--- a/src/Storages/System/StorageSystemPartsBase.cpp
+++ b/src/Storages/System/StorageSystemPartsBase.cpp
@@ -62,8 +62,8 @@ StoragesInfo::getParts(MergeTreeData::DataPartStateVector & state, bool has_stat
     return data->getDataPartsVector({State::Committed}, &state);
 }
 
-StoragesInfoStream::StoragesInfoStream(const SelectQueryInfo & query_info, const Context & context)
-    : query_id(context.getCurrentQueryId()), settings(context.getSettings())
+StoragesInfoStream::StoragesInfoStream(const SelectQueryInfo & query_info, ContextPtr context)
+    : query_id(context->getCurrentQueryId()), settings(context->getSettings())
 {
     /// Will apply WHERE to subset of columns and then add more columns.
     /// This is kind of complicated, but we use WHERE to do less work.
@@ -74,7 +74,7 @@ StoragesInfoStream::StoragesInfoStream(const SelectQueryInfo & query_info, const
     MutableColumnPtr engine_column_mut = ColumnString::create();
     MutableColumnPtr active_column_mut = ColumnUInt8::create();
 
-    const auto access = context.getAccess();
+    const auto access = context->getAccess();
     const bool check_access_for_tables = !access->isGranted(AccessType::SHOW_TABLES);
 
     {
@@ -84,7 +84,7 @@ StoragesInfoStream::StoragesInfoStream(const SelectQueryInfo & query_info, const
         MutableColumnPtr database_column_mut = ColumnString::create();
         for (const auto & database : databases)
         {
-            /// Checck if database can contain MergeTree tables,
+            /// Check if database can contain MergeTree tables,
             /// if not it's unnecessary to load all tables of database just to filter all of them.
             if (database.second->canContainMergeTreeTables())
                 database_column_mut->insert(database.first);
@@ -234,7 +234,7 @@ Pipe StorageSystemPartsBase::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & query_info,
-    const Context & context,
+    ContextPtr context,
     QueryProcessingStage::Enum /*processed_stage*/,
     const size_t /*max_block_size*/,
     const unsigned /*num_streams*/)
@@ -245,16 +245,29 @@ Pipe StorageSystemPartsBase::read(
 
     /// Create the result.
 
-    MutableColumns res_columns = metadata_snapshot->getSampleBlock().cloneEmptyColumns();
+    NameSet names_set(column_names.begin(), column_names.end());
+
+    Block sample = metadata_snapshot->getSampleBlock();
+    Block header;
+
+    std::vector<UInt8> columns_mask(sample.columns());
+    for (size_t i = 0; i < sample.columns(); ++i)
+    {
+        if (names_set.count(sample.getByPosition(i).name))
+        {
+            columns_mask[i] = 1;
+            header.insert(sample.getByPosition(i));
+        }
+    }
+    MutableColumns res_columns = header.cloneEmptyColumns();
     if (has_state_column)
         res_columns.push_back(ColumnString::create());
 
     while (StoragesInfo info = stream.next())
     {
-        processNextStorage(res_columns, info, has_state_column);
+        processNextStorage(res_columns, columns_mask, info, has_state_column);
     }
 
-    Block header = metadata_snapshot->getSampleBlock();
     if (has_state_column)
         header.insert(ColumnWithTypeAndName(std::make_shared<DataTypeString>(), "_state"));
 
diff --git a/src/Storages/System/StorageSystemPartsBase.h b/src/Storages/System/StorageSystemPartsBase.h
index eec6d5ab331..33f82d04252 100644
--- a/src/Storages/System/StorageSystemPartsBase.h
+++ b/src/Storages/System/StorageSystemPartsBase.h
@@ -31,7 +31,7 @@ struct StoragesInfo
 class StoragesInfoStream
 {
 public:
-    StoragesInfoStream(const SelectQueryInfo & query_info, const Context & context);
+    StoragesInfoStream(const SelectQueryInfo & query_info, ContextPtr context);
     StoragesInfo next();
 
 private:
@@ -59,7 +59,7 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & metadata_snapshot,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
@@ -74,7 +74,8 @@ protected:
 
     StorageSystemPartsBase(const StorageID & table_id_, NamesAndTypesList && columns_);
 
-    virtual void processNextStorage(MutableColumns & columns, const StoragesInfo & info, bool has_state_column) = 0;
+    virtual void
+    processNextStorage(MutableColumns & columns, std::vector<UInt8> & columns_mask, const StoragesInfo & info, bool has_state_column) = 0;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemPartsColumns.cpp b/src/Storages/System/StorageSystemPartsColumns.cpp
index c570cc85e8b..703de70d17f 100644
--- a/src/Storages/System/StorageSystemPartsColumns.cpp
+++ b/src/Storages/System/StorageSystemPartsColumns.cpp
@@ -32,6 +32,8 @@ StorageSystemPartsColumns::StorageSystemPartsColumns(const StorageID & table_id_
         {"refcount",                                   std::make_shared<DataTypeUInt32>()},
         {"min_date",                                   std::make_shared<DataTypeDate>()},
         {"max_date",                                   std::make_shared<DataTypeDate>()},
+        {"min_time",                                   std::make_shared<DataTypeDateTime>()},
+        {"max_time",                                   std::make_shared<DataTypeDateTime>()},
         {"partition_id",                               std::make_shared<DataTypeString>()},
         {"min_block_number",                           std::make_shared<DataTypeInt64>()},
         {"max_block_number",                           std::make_shared<DataTypeInt64>()},
@@ -60,7 +62,8 @@ StorageSystemPartsColumns::StorageSystemPartsColumns(const StorageID & table_id_
 {
 }
 
-void StorageSystemPartsColumns::processNextStorage(MutableColumns & columns_, const StoragesInfo & info, bool has_state_column)
+void StorageSystemPartsColumns::processNextStorage(
+    MutableColumns & columns, std::vector<UInt8> & columns_mask, const StoragesInfo & info, bool has_state_column)
 {
     /// Prepare information about columns in storage.
     struct ColumnInfo
@@ -94,8 +97,10 @@ void StorageSystemPartsColumns::processNextStorage(MutableColumns & columns_, co
 
         /// For convenience, in returned refcount, don't add references that was due to local variables in this method: all_parts, active_parts.
         auto use_count = part.use_count() - 1;
-        auto min_date = part->getMinDate();
-        auto max_date = part->getMaxDate();
+
+        auto min_max_date = part->getMinMaxDate();
+        auto min_max_time = part->getMinMaxTime();
+
         auto index_size_in_bytes = part->getIndexSizeInBytes();
         auto index_size_in_allocated_bytes = part->getIndexSizeInAllocatedBytes();
 
@@ -105,67 +110,110 @@ void StorageSystemPartsColumns::processNextStorage(MutableColumns & columns_, co
         for (const auto & column : part->getColumns())
         {
             ++column_position;
-            size_t j = 0;
+            size_t src_index = 0, res_index = 0;
+            if (columns_mask[src_index++])
             {
                 WriteBufferFromOwnString out;
                 part->partition.serializeText(*info.data, out, format_settings);
-                columns_[j++]->insert(out.str());
+                columns[res_index++]->insert(out.str());
             }
-            columns_[j++]->insert(part->name);
-            columns_[j++]->insert(part->getTypeName());
-            columns_[j++]->insert(part_state == State::Committed);
-            columns_[j++]->insert(part->getMarksCount());
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(part->name);
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(part->getTypeName());
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(part_state == State::Committed);
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(part->getMarksCount());
 
-            columns_[j++]->insert(part->rows_count);
-            columns_[j++]->insert(part->getBytesOnDisk());
-            columns_[j++]->insert(columns_size.data_compressed);
-            columns_[j++]->insert(columns_size.data_uncompressed);
-            columns_[j++]->insert(columns_size.marks);
-            columns_[j++]->insert(UInt64(part->modification_time));
-            columns_[j++]->insert(UInt64(part->remove_time.load(std::memory_order_relaxed)));
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(part->rows_count);
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(part->getBytesOnDisk());
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(columns_size.data_compressed);
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(columns_size.data_uncompressed);
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(columns_size.marks);
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(UInt64(part->modification_time));
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(UInt64(part->remove_time.load(std::memory_order_relaxed)));
 
-            columns_[j++]->insert(UInt64(use_count));
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(UInt64(use_count));
 
-            columns_[j++]->insert(min_date);
-            columns_[j++]->insert(max_date);
-            columns_[j++]->insert(part->info.partition_id);
-            columns_[j++]->insert(part->info.min_block);
-            columns_[j++]->insert(part->info.max_block);
-            columns_[j++]->insert(part->info.level);
-            columns_[j++]->insert(UInt64(part->info.getDataVersion()));
-            columns_[j++]->insert(index_size_in_bytes);
-            columns_[j++]->insert(index_size_in_allocated_bytes);
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(min_max_date.first);
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(min_max_date.second);
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(static_cast<UInt32>(min_max_time.first));
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(static_cast<UInt32>(min_max_time.second));
 
-            columns_[j++]->insert(info.database);
-            columns_[j++]->insert(info.table);
-            columns_[j++]->insert(info.engine);
-            columns_[j++]->insert(part->volume->getDisk()->getName());
-            columns_[j++]->insert(part->getFullPath());
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(part->info.partition_id);
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(part->info.min_block);
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(part->info.max_block);
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(part->info.level);
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(UInt64(part->info.getDataVersion()));
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(index_size_in_bytes);
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(index_size_in_allocated_bytes);
 
-            columns_[j++]->insert(column.name);
-            columns_[j++]->insert(column.type->getName());
-            columns_[j++]->insert(column_position);
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(info.database);
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(info.table);
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(info.engine);
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(part->volume->getDisk()->getName());
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(part->getFullPath());
+
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(column.name);
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(column.type->getName());
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(column_position);
 
             auto column_info_it = columns_info.find(column.name);
             if (column_info_it != columns_info.end())
             {
-                columns_[j++]->insert(column_info_it->second.default_kind);
-                columns_[j++]->insert(column_info_it->second.default_expression);
+                if (columns_mask[src_index++])
+                    columns[res_index++]->insert(column_info_it->second.default_kind);
+                if (columns_mask[src_index++])
+                    columns[res_index++]->insert(column_info_it->second.default_expression);
             }
             else
             {
-                columns_[j++]->insertDefault();
-                columns_[j++]->insertDefault();
+                if (columns_mask[src_index++])
+                    columns[res_index++]->insertDefault();
+                if (columns_mask[src_index++])
+                    columns[res_index++]->insertDefault();
             }
 
             ColumnSize column_size = part->getColumnSize(column.name, *column.type);
-            columns_[j++]->insert(column_size.data_compressed + column_size.marks);
-            columns_[j++]->insert(column_size.data_compressed);
-            columns_[j++]->insert(column_size.data_uncompressed);
-            columns_[j++]->insert(column_size.marks);
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(column_size.data_compressed + column_size.marks);
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(column_size.data_compressed);
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(column_size.data_uncompressed);
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(column_size.marks);
 
             if (has_state_column)
-                columns_[j++]->insert(part->stateString());
+                columns[res_index++]->insert(part->stateString());
         }
     }
 }
diff --git a/src/Storages/System/StorageSystemPartsColumns.h b/src/Storages/System/StorageSystemPartsColumns.h
index 6347a418875..ec12a608cd1 100644
--- a/src/Storages/System/StorageSystemPartsColumns.h
+++ b/src/Storages/System/StorageSystemPartsColumns.h
@@ -22,7 +22,8 @@ public:
 
 protected:
     StorageSystemPartsColumns(const StorageID & table_id_);
-    void processNextStorage(MutableColumns & columns, const StoragesInfo & info, bool has_state_column) override;
+    void processNextStorage(
+        MutableColumns & columns, std::vector<UInt8> & columns_mask, const StoragesInfo & info, bool has_state_column) override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemPrivileges.cpp b/src/Storages/System/StorageSystemPrivileges.cpp
index 5dda0caf201..ca369efe43a 100644
--- a/src/Storages/System/StorageSystemPrivileges.cpp
+++ b/src/Storages/System/StorageSystemPrivileges.cpp
@@ -74,7 +74,7 @@ NamesAndTypesList StorageSystemPrivileges::getNamesAndTypes()
 }
 
 
-void StorageSystemPrivileges::fillData(MutableColumns & res_columns, const Context &, const SelectQueryInfo &) const
+void StorageSystemPrivileges::fillData(MutableColumns & res_columns, ContextPtr, const SelectQueryInfo &) const
 {
     size_t column_index = 0;
     auto & column_access_type = assert_cast<ColumnInt8 &>(*res_columns[column_index++]).getData();
diff --git a/src/Storages/System/StorageSystemPrivileges.h b/src/Storages/System/StorageSystemPrivileges.h
index 8540e3d7ec3..618e1c91597 100644
--- a/src/Storages/System/StorageSystemPrivileges.h
+++ b/src/Storages/System/StorageSystemPrivileges.h
@@ -19,7 +19,7 @@ public:
 protected:
     friend struct ext::shared_ptr_helper<StorageSystemPrivileges>;
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemProcesses.cpp b/src/Storages/System/StorageSystemProcesses.cpp
index b397d941786..785b4c0df11 100644
--- a/src/Storages/System/StorageSystemProcesses.cpp
+++ b/src/Storages/System/StorageSystemProcesses.cpp
@@ -64,13 +64,15 @@ NamesAndTypesList StorageSystemProcesses::getNamesAndTypes()
         {"ProfileEvents.Values", std::make_shared<DataTypeArray>(std::make_shared<DataTypeUInt64>())},
         {"Settings.Names", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())},
         {"Settings.Values", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())},
+
+        {"current_database", std::make_shared<DataTypeString>()},
     };
 }
 
 
-void StorageSystemProcesses::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const
+void StorageSystemProcesses::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
-    ProcessList::Info info = context.getProcessList().getInfo(true, true, true);
+    ProcessList::Info info = context->getProcessList().getInfo(true, true, true);
 
     for (const auto & process : info)
     {
@@ -149,6 +151,8 @@ void StorageSystemProcesses::fillData(MutableColumns & res_columns, const Contex
                 column_settings_values->insertDefault();
             }
         }
+
+        res_columns[i++]->insert(process.current_database);
     }
 }
 
diff --git a/src/Storages/System/StorageSystemProcesses.h b/src/Storages/System/StorageSystemProcesses.h
index 62c568970e7..4f876348a4b 100644
--- a/src/Storages/System/StorageSystemProcesses.h
+++ b/src/Storages/System/StorageSystemProcesses.h
@@ -23,7 +23,7 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemQuotaLimits.cpp b/src/Storages/System/StorageSystemQuotaLimits.cpp
index c6e99cc9203..63a419e213c 100644
--- a/src/Storages/System/StorageSystemQuotaLimits.cpp
+++ b/src/Storages/System/StorageSystemQuotaLimits.cpp
@@ -69,10 +69,10 @@ NamesAndTypesList StorageSystemQuotaLimits::getNamesAndTypes()
 }
 
 
-void StorageSystemQuotaLimits::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const
+void StorageSystemQuotaLimits::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
-    context.checkAccess(AccessType::SHOW_QUOTAS);
-    const auto & access_control = context.getAccessControlManager();
+    context->checkAccess(AccessType::SHOW_QUOTAS);
+    const auto & access_control = context->getAccessControlManager();
     std::vector<UUID> ids = access_control.findAll<Quota>();
 
     size_t column_index = 0;
diff --git a/src/Storages/System/StorageSystemQuotaLimits.h b/src/Storages/System/StorageSystemQuotaLimits.h
index e9ae7fc09d0..8f496734e0f 100644
--- a/src/Storages/System/StorageSystemQuotaLimits.h
+++ b/src/Storages/System/StorageSystemQuotaLimits.h
@@ -18,7 +18,7 @@ public:
 protected:
     friend struct ext::shared_ptr_helper<StorageSystemQuotaLimits>;
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemQuotaUsage.cpp b/src/Storages/System/StorageSystemQuotaUsage.cpp
index 6d6e22e7be6..a25a130bf6c 100644
--- a/src/Storages/System/StorageSystemQuotaUsage.cpp
+++ b/src/Storages/System/StorageSystemQuotaUsage.cpp
@@ -81,10 +81,10 @@ NamesAndTypesList StorageSystemQuotaUsage::getNamesAndTypesImpl(bool add_column_
 }
 
 
-void StorageSystemQuotaUsage::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const
+void StorageSystemQuotaUsage::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
-    context.checkAccess(AccessType::SHOW_QUOTAS);
-    auto usage = context.getQuotaUsage();
+    context->checkAccess(AccessType::SHOW_QUOTAS);
+    auto usage = context->getQuotaUsage();
     if (!usage)
         return;
 
@@ -94,7 +94,7 @@ void StorageSystemQuotaUsage::fillData(MutableColumns & res_columns, const Conte
 
 void StorageSystemQuotaUsage::fillDataImpl(
     MutableColumns & res_columns,
-    const Context & context,
+    ContextPtr context,
     bool add_column_is_current,
     const std::vector<QuotaUsage> & quotas_usage)
 {
@@ -128,7 +128,7 @@ void StorageSystemQuotaUsage::fillDataImpl(
     std::optional<UUID> current_quota_id;
     if (add_column_is_current)
     {
-        if (auto current_usage = context.getQuotaUsage())
+        if (auto current_usage = context->getQuotaUsage())
             current_quota_id = current_usage->quota_id;
     }
 
diff --git a/src/Storages/System/StorageSystemQuotaUsage.h b/src/Storages/System/StorageSystemQuotaUsage.h
index abb9505eb5a..806c3eb3f4a 100644
--- a/src/Storages/System/StorageSystemQuotaUsage.h
+++ b/src/Storages/System/StorageSystemQuotaUsage.h
@@ -20,12 +20,12 @@ public:
     static NamesAndTypesList getNamesAndTypes();
 
     static NamesAndTypesList getNamesAndTypesImpl(bool add_column_is_current);
-    static void fillDataImpl(MutableColumns & res_columns, const Context & context, bool add_column_is_current, const std::vector<QuotaUsage> & quotas_usage);
+    static void fillDataImpl(MutableColumns & res_columns, ContextPtr context, bool add_column_is_current, const std::vector<QuotaUsage> & quotas_usage);
 
 protected:
     friend struct ext::shared_ptr_helper<StorageSystemQuotaUsage>;
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemQuotas.cpp b/src/Storages/System/StorageSystemQuotas.cpp
index fab6384e6a8..4bba082f66e 100644
--- a/src/Storages/System/StorageSystemQuotas.cpp
+++ b/src/Storages/System/StorageSystemQuotas.cpp
@@ -52,10 +52,10 @@ NamesAndTypesList StorageSystemQuotas::getNamesAndTypes()
 }
 
 
-void StorageSystemQuotas::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const
+void StorageSystemQuotas::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
-    context.checkAccess(AccessType::SHOW_QUOTAS);
-    const auto & access_control = context.getAccessControlManager();
+    context->checkAccess(AccessType::SHOW_QUOTAS);
+    const auto & access_control = context->getAccessControlManager();
     std::vector<UUID> ids = access_control.findAll<Quota>();
 
     size_t column_index = 0;
diff --git a/src/Storages/System/StorageSystemQuotas.h b/src/Storages/System/StorageSystemQuotas.h
index 8d1da53d641..fb74ea9b05f 100644
--- a/src/Storages/System/StorageSystemQuotas.h
+++ b/src/Storages/System/StorageSystemQuotas.h
@@ -19,7 +19,7 @@ public:
 protected:
     friend struct ext::shared_ptr_helper<StorageSystemQuotas>;
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemQuotasUsage.cpp b/src/Storages/System/StorageSystemQuotasUsage.cpp
index 5c6879cd143..363562bce19 100644
--- a/src/Storages/System/StorageSystemQuotasUsage.cpp
+++ b/src/Storages/System/StorageSystemQuotasUsage.cpp
@@ -13,10 +13,10 @@ NamesAndTypesList StorageSystemQuotasUsage::getNamesAndTypes()
     return StorageSystemQuotaUsage::getNamesAndTypesImpl(/* add_column_is_current = */ true);
 }
 
-void StorageSystemQuotasUsage::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const
+void StorageSystemQuotasUsage::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
-    context.checkAccess(AccessType::SHOW_QUOTAS);
-    auto all_quotas_usage = context.getAccessControlManager().getAllQuotasUsage();
+    context->checkAccess(AccessType::SHOW_QUOTAS);
+    auto all_quotas_usage = context->getAccessControlManager().getAllQuotasUsage();
     StorageSystemQuotaUsage::fillDataImpl(res_columns, context, /* add_column_is_current = */ true, all_quotas_usage);
 }
 }
diff --git a/src/Storages/System/StorageSystemQuotasUsage.h b/src/Storages/System/StorageSystemQuotasUsage.h
index d4fd93b577d..1f29ea9b886 100644
--- a/src/Storages/System/StorageSystemQuotasUsage.h
+++ b/src/Storages/System/StorageSystemQuotasUsage.h
@@ -20,7 +20,7 @@ public:
 protected:
     friend struct ext::shared_ptr_helper<StorageSystemQuotasUsage>;
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemReplicas.cpp b/src/Storages/System/StorageSystemReplicas.cpp
index 0af67ab6986..fc33c6b421b 100644
--- a/src/Storages/System/StorageSystemReplicas.cpp
+++ b/src/Storages/System/StorageSystemReplicas.cpp
@@ -60,14 +60,14 @@ Pipe StorageSystemReplicas::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & query_info,
-    const Context & context,
+    ContextPtr context,
     QueryProcessingStage::Enum /*processed_stage*/,
     const size_t /*max_block_size*/,
     const unsigned /*num_streams*/)
 {
     metadata_snapshot->check(column_names, getVirtuals(), getStorageID());
 
-    const auto access = context.getAccess();
+    const auto access = context->getAccess();
     const bool check_access_for_databases = !access->isGranted(AccessType::SHOW_TABLES);
 
     /// We collect a set of replicated tables.
diff --git a/src/Storages/System/StorageSystemReplicas.h b/src/Storages/System/StorageSystemReplicas.h
index d9e364a28c0..2352d7ccdf2 100644
--- a/src/Storages/System/StorageSystemReplicas.h
+++ b/src/Storages/System/StorageSystemReplicas.h
@@ -22,7 +22,7 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
diff --git a/src/Storages/System/StorageSystemReplicatedFetches.cpp b/src/Storages/System/StorageSystemReplicatedFetches.cpp
index 53bec5aa42f..453568e3b86 100644
--- a/src/Storages/System/StorageSystemReplicatedFetches.cpp
+++ b/src/Storages/System/StorageSystemReplicatedFetches.cpp
@@ -30,12 +30,12 @@ NamesAndTypesList StorageSystemReplicatedFetches::getNamesAndTypes()
     };
 }
 
-void StorageSystemReplicatedFetches::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const
+void StorageSystemReplicatedFetches::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
-    const auto access = context.getAccess();
+    const auto access = context->getAccess();
     const bool check_access_for_tables = !access->isGranted(AccessType::SHOW_TABLES);
 
-    for (const auto & fetch : context.getReplicatedFetchList().get())
+    for (const auto & fetch : context->getReplicatedFetchList().get())
     {
         if (check_access_for_tables && !access->isGranted(AccessType::SHOW_TABLES, fetch.database, fetch.table))
             continue;
diff --git a/src/Storages/System/StorageSystemReplicatedFetches.h b/src/Storages/System/StorageSystemReplicatedFetches.h
index 34081923e4f..ed25e75eb70 100644
--- a/src/Storages/System/StorageSystemReplicatedFetches.h
+++ b/src/Storages/System/StorageSystemReplicatedFetches.h
@@ -22,7 +22,7 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemReplicationQueue.cpp b/src/Storages/System/StorageSystemReplicationQueue.cpp
index 9cd5e8b8ff3..8acd192eac4 100644
--- a/src/Storages/System/StorageSystemReplicationQueue.cpp
+++ b/src/Storages/System/StorageSystemReplicationQueue.cpp
@@ -47,9 +47,9 @@ NamesAndTypesList StorageSystemReplicationQueue::getNamesAndTypes()
 }
 
 
-void StorageSystemReplicationQueue::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const
+void StorageSystemReplicationQueue::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const
 {
-    const auto access = context.getAccess();
+    const auto access = context->getAccess();
     const bool check_access_for_databases = !access->isGranted(AccessType::SHOW_TABLES);
 
     std::map<String, std::map<String, StoragePtr>> replicated_tables;
diff --git a/src/Storages/System/StorageSystemReplicationQueue.h b/src/Storages/System/StorageSystemReplicationQueue.h
index 36841fb9be9..f85f23a2b20 100644
--- a/src/Storages/System/StorageSystemReplicationQueue.h
+++ b/src/Storages/System/StorageSystemReplicationQueue.h
@@ -23,7 +23,7 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemRoleGrants.cpp b/src/Storages/System/StorageSystemRoleGrants.cpp
index 0f0fcd831d9..32984afcfc5 100644
--- a/src/Storages/System/StorageSystemRoleGrants.cpp
+++ b/src/Storages/System/StorageSystemRoleGrants.cpp
@@ -31,10 +31,10 @@ NamesAndTypesList StorageSystemRoleGrants::getNamesAndTypes()
 }
 
 
-void StorageSystemRoleGrants::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const
+void StorageSystemRoleGrants::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
-    context.checkAccess(AccessType::SHOW_USERS | AccessType::SHOW_ROLES);
-    const auto & access_control = context.getAccessControlManager();
+    context->checkAccess(AccessType::SHOW_USERS | AccessType::SHOW_ROLES);
+    const auto & access_control = context->getAccessControlManager();
     std::vector<UUID> ids = access_control.findAll<User>();
     boost::range::push_back(ids, access_control.findAll<Role>());
 
@@ -80,15 +80,17 @@ void StorageSystemRoleGrants::fillData(MutableColumns & res_columns, const Conte
                         const GrantedRoles & granted_roles,
                         const RolesOrUsersSet * default_roles)
     {
-        for (const auto & role_id : granted_roles.roles)
+        for (const auto & element : granted_roles.getElements())
         {
-            auto role_name = access_control.tryReadName(role_id);
-            if (!role_name)
-                continue;
+            for (const auto & role_id : element.ids)
+            {
+                auto role_name = access_control.tryReadName(role_id);
+                if (!role_name)
+                    continue;
 
-            bool is_default = !default_roles || default_roles->match(role_id);
-            bool with_admin_option = granted_roles.roles_with_admin_option.count(role_id);
-            add_row(grantee_name, grantee_type, *role_name, is_default, with_admin_option);
+                bool is_default = !default_roles || default_roles->match(role_id);
+                add_row(grantee_name, grantee_type, *role_name, is_default, element.admin_option);
+            }
         }
     };
 
diff --git a/src/Storages/System/StorageSystemRoleGrants.h b/src/Storages/System/StorageSystemRoleGrants.h
index 0a02303abc3..a290dcf320d 100644
--- a/src/Storages/System/StorageSystemRoleGrants.h
+++ b/src/Storages/System/StorageSystemRoleGrants.h
@@ -18,7 +18,7 @@ public:
 protected:
     friend struct ext::shared_ptr_helper<StorageSystemRoleGrants>;
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemRoles.cpp b/src/Storages/System/StorageSystemRoles.cpp
index c560bc2bc6e..65ae74887a7 100644
--- a/src/Storages/System/StorageSystemRoles.cpp
+++ b/src/Storages/System/StorageSystemRoles.cpp
@@ -23,10 +23,10 @@ NamesAndTypesList StorageSystemRoles::getNamesAndTypes()
 }
 
 
-void StorageSystemRoles::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const
+void StorageSystemRoles::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
-    context.checkAccess(AccessType::SHOW_ROLES);
-    const auto & access_control = context.getAccessControlManager();
+    context->checkAccess(AccessType::SHOW_ROLES);
+    const auto & access_control = context->getAccessControlManager();
     std::vector<UUID> ids = access_control.findAll<Role>();
 
     size_t column_index = 0;
diff --git a/src/Storages/System/StorageSystemRoles.h b/src/Storages/System/StorageSystemRoles.h
index fb44194baff..38c7ed05f1e 100644
--- a/src/Storages/System/StorageSystemRoles.h
+++ b/src/Storages/System/StorageSystemRoles.h
@@ -18,7 +18,7 @@ public:
 protected:
     friend struct ext::shared_ptr_helper<StorageSystemRoles>;
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemRowPolicies.cpp b/src/Storages/System/StorageSystemRowPolicies.cpp
index 9b11a781d6f..f9d6b14957e 100644
--- a/src/Storages/System/StorageSystemRowPolicies.cpp
+++ b/src/Storages/System/StorageSystemRowPolicies.cpp
@@ -52,10 +52,10 @@ NamesAndTypesList StorageSystemRowPolicies::getNamesAndTypes()
 }
 
 
-void StorageSystemRowPolicies::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const
+void StorageSystemRowPolicies::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
-    context.checkAccess(AccessType::SHOW_ROW_POLICIES);
-    const auto & access_control = context.getAccessControlManager();
+    context->checkAccess(AccessType::SHOW_ROW_POLICIES);
+    const auto & access_control = context->getAccessControlManager();
     std::vector<UUID> ids = access_control.findAll<RowPolicy>();
 
     size_t column_index = 0;
diff --git a/src/Storages/System/StorageSystemRowPolicies.h b/src/Storages/System/StorageSystemRowPolicies.h
index b81020b421c..3b9ebfcc25a 100644
--- a/src/Storages/System/StorageSystemRowPolicies.h
+++ b/src/Storages/System/StorageSystemRowPolicies.h
@@ -20,7 +20,7 @@ public:
 protected:
     friend struct ext::shared_ptr_helper<StorageSystemRowPolicies>;
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemSettings.cpp b/src/Storages/System/StorageSystemSettings.cpp
index 07a2d450b12..1aca7e45190 100644
--- a/src/Storages/System/StorageSystemSettings.cpp
+++ b/src/Storages/System/StorageSystemSettings.cpp
@@ -26,10 +26,10 @@ NamesAndTypesList StorageSystemSettings::getNamesAndTypes()
 #pragma GCC optimize("-fno-var-tracking-assignments")
 #endif
 
-void StorageSystemSettings::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const
+void StorageSystemSettings::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
-    const Settings & settings = context.getSettingsRef();
-    auto settings_constraints = context.getSettingsConstraints();
+    const Settings & settings = context->getSettingsRef();
+    auto settings_constraints = context->getSettingsConstraints();
     for (const auto & setting : settings.all())
     {
         const auto & setting_name = setting.getName();
diff --git a/src/Storages/System/StorageSystemSettings.h b/src/Storages/System/StorageSystemSettings.h
index 6cb5e18e1d7..d93c09d3f80 100644
--- a/src/Storages/System/StorageSystemSettings.h
+++ b/src/Storages/System/StorageSystemSettings.h
@@ -23,7 +23,7 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemSettingsProfileElements.cpp b/src/Storages/System/StorageSystemSettingsProfileElements.cpp
index cf47416e188..fa824091238 100644
--- a/src/Storages/System/StorageSystemSettingsProfileElements.cpp
+++ b/src/Storages/System/StorageSystemSettingsProfileElements.cpp
@@ -37,10 +37,10 @@ NamesAndTypesList StorageSystemSettingsProfileElements::getNamesAndTypes()
 }
 
 
-void StorageSystemSettingsProfileElements::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const
+void StorageSystemSettingsProfileElements::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
-    context.checkAccess(AccessType::SHOW_SETTINGS_PROFILES);
-    const auto & access_control = context.getAccessControlManager();
+    context->checkAccess(AccessType::SHOW_SETTINGS_PROFILES);
+    const auto & access_control = context->getAccessControlManager();
     std::vector<UUID> ids = access_control.findAll<User>();
     boost::range::push_back(ids, access_control.findAll<Role>());
     boost::range::push_back(ids, access_control.findAll<SettingsProfile>());
diff --git a/src/Storages/System/StorageSystemSettingsProfileElements.h b/src/Storages/System/StorageSystemSettingsProfileElements.h
index 2dc79fed0e7..2262ea96dde 100644
--- a/src/Storages/System/StorageSystemSettingsProfileElements.h
+++ b/src/Storages/System/StorageSystemSettingsProfileElements.h
@@ -18,7 +18,7 @@ public:
 protected:
     friend struct ext::shared_ptr_helper<StorageSystemSettingsProfileElements>;
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemSettingsProfiles.cpp b/src/Storages/System/StorageSystemSettingsProfiles.cpp
index a678290d447..c726f54a324 100644
--- a/src/Storages/System/StorageSystemSettingsProfiles.cpp
+++ b/src/Storages/System/StorageSystemSettingsProfiles.cpp
@@ -30,10 +30,10 @@ NamesAndTypesList StorageSystemSettingsProfiles::getNamesAndTypes()
 }
 
 
-void StorageSystemSettingsProfiles::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const
+void StorageSystemSettingsProfiles::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
-    context.checkAccess(AccessType::SHOW_SETTINGS_PROFILES);
-    const auto & access_control = context.getAccessControlManager();
+    context->checkAccess(AccessType::SHOW_SETTINGS_PROFILES);
+    const auto & access_control = context->getAccessControlManager();
     std::vector<UUID> ids = access_control.findAll<SettingsProfile>();
 
     size_t column_index = 0;
diff --git a/src/Storages/System/StorageSystemSettingsProfiles.h b/src/Storages/System/StorageSystemSettingsProfiles.h
index c6b887c99df..580430dc28b 100644
--- a/src/Storages/System/StorageSystemSettingsProfiles.h
+++ b/src/Storages/System/StorageSystemSettingsProfiles.h
@@ -18,7 +18,7 @@ public:
 protected:
     friend struct ext::shared_ptr_helper<StorageSystemSettingsProfiles>;
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemStackTrace.cpp b/src/Storages/System/StorageSystemStackTrace.cpp
index e74d56108ad..a6651aff8be 100644
--- a/src/Storages/System/StorageSystemStackTrace.cpp
+++ b/src/Storages/System/StorageSystemStackTrace.cpp
@@ -183,7 +183,7 @@ NamesAndTypesList StorageSystemStackTrace::getNamesAndTypes()
 }
 
 
-void StorageSystemStackTrace::fillData(MutableColumns & res_columns, const Context &, const SelectQueryInfo &) const
+void StorageSystemStackTrace::fillData(MutableColumns & res_columns, ContextPtr, const SelectQueryInfo &) const
 {
     /// It shouldn't be possible to do concurrent reads from this table.
     std::lock_guard lock(mutex);
diff --git a/src/Storages/System/StorageSystemStackTrace.h b/src/Storages/System/StorageSystemStackTrace.h
index 582618d2ecd..7f10e309775 100644
--- a/src/Storages/System/StorageSystemStackTrace.h
+++ b/src/Storages/System/StorageSystemStackTrace.h
@@ -31,7 +31,7 @@ public:
 
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
 
     mutable std::mutex mutex;
 
diff --git a/src/Storages/System/StorageSystemStoragePolicies.cpp b/src/Storages/System/StorageSystemStoragePolicies.cpp
index 7a10b986c11..48dfadd2b3c 100644
--- a/src/Storages/System/StorageSystemStoragePolicies.cpp
+++ b/src/Storages/System/StorageSystemStoragePolicies.cpp
@@ -39,7 +39,7 @@ Pipe StorageSystemStoragePolicies::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & /*query_info*/,
-    const Context & context,
+    ContextPtr context,
     QueryProcessingStage::Enum /*processed_stage*/,
     const size_t /*max_block_size*/,
     const unsigned /*num_streams*/)
@@ -55,7 +55,7 @@ Pipe StorageSystemStoragePolicies::read(
     MutableColumnPtr col_move_factor = ColumnFloat32::create();
     MutableColumnPtr col_prefer_not_to_merge = ColumnUInt8::create();
 
-    for (const auto & [policy_name, policy_ptr] : context.getPoliciesMap())
+    for (const auto & [policy_name, policy_ptr] : context->getPoliciesMap())
     {
         const auto & volumes = policy_ptr->getVolumes();
         for (size_t i = 0; i != volumes.size(); ++i)
diff --git a/src/Storages/System/StorageSystemStoragePolicies.h b/src/Storages/System/StorageSystemStoragePolicies.h
index afd5e672d66..70053ebc1bc 100644
--- a/src/Storages/System/StorageSystemStoragePolicies.h
+++ b/src/Storages/System/StorageSystemStoragePolicies.h
@@ -24,7 +24,7 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
diff --git a/src/Storages/System/StorageSystemTableEngines.cpp b/src/Storages/System/StorageSystemTableEngines.cpp
index 3f06faf6736..bc33cd9189c 100644
--- a/src/Storages/System/StorageSystemTableEngines.cpp
+++ b/src/Storages/System/StorageSystemTableEngines.cpp
@@ -20,7 +20,7 @@ NamesAndTypesList StorageSystemTableEngines::getNamesAndTypes()
     };
 }
 
-void StorageSystemTableEngines::fillData(MutableColumns & res_columns, const Context &, const SelectQueryInfo &) const
+void StorageSystemTableEngines::fillData(MutableColumns & res_columns, ContextPtr, const SelectQueryInfo &) const
 {
     for (const auto & pair : StorageFactory::instance().getAllStorages())
     {
diff --git a/src/Storages/System/StorageSystemTableEngines.h b/src/Storages/System/StorageSystemTableEngines.h
index 1c080c3040b..37f7f354073 100644
--- a/src/Storages/System/StorageSystemTableEngines.h
+++ b/src/Storages/System/StorageSystemTableEngines.h
@@ -12,7 +12,7 @@ class StorageSystemTableEngines final : public ext::shared_ptr_helper<StorageSys
 {
     friend struct ext::shared_ptr_helper<StorageSystemTableEngines>;
 protected:
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
 
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
diff --git a/src/Storages/System/StorageSystemTableFunctions.cpp b/src/Storages/System/StorageSystemTableFunctions.cpp
index 65b1dc41879..2824e1726e9 100644
--- a/src/Storages/System/StorageSystemTableFunctions.cpp
+++ b/src/Storages/System/StorageSystemTableFunctions.cpp
@@ -9,7 +9,7 @@ NamesAndTypesList StorageSystemTableFunctions::getNamesAndTypes()
     return {{"name", std::make_shared<DataTypeString>()}};
 }
 
-void StorageSystemTableFunctions::fillData(MutableColumns & res_columns, const Context &, const SelectQueryInfo &) const
+void StorageSystemTableFunctions::fillData(MutableColumns & res_columns, ContextPtr, const SelectQueryInfo &) const
 {
     const auto & functions_names = TableFunctionFactory::instance().getAllRegisteredNames();
     for (const auto & function_name : functions_names)
diff --git a/src/Storages/System/StorageSystemTableFunctions.h b/src/Storages/System/StorageSystemTableFunctions.h
index 95e025b9881..a5db5450d20 100644
--- a/src/Storages/System/StorageSystemTableFunctions.h
+++ b/src/Storages/System/StorageSystemTableFunctions.h
@@ -14,7 +14,7 @@ protected:
 
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
 
 public:
 
diff --git a/src/Storages/System/StorageSystemTables.cpp b/src/Storages/System/StorageSystemTables.cpp
index 132ed234323..9602339f381 100644
--- a/src/Storages/System/StorageSystemTables.cpp
+++ b/src/Storages/System/StorageSystemTables.cpp
@@ -62,7 +62,7 @@ StorageSystemTables::StorageSystemTables(const StorageID & table_id_)
 }
 
 
-static ColumnPtr getFilteredDatabases(const ASTPtr & query, const Context & context)
+static ColumnPtr getFilteredDatabases(const SelectQueryInfo & query_info, ContextPtr context)
 {
     MutableColumnPtr column = ColumnString::create();
 
@@ -76,7 +76,7 @@ static ColumnPtr getFilteredDatabases(const ASTPtr & query, const Context & cont
     }
 
     Block block { ColumnWithTypeAndName(std::move(column), std::make_shared<DataTypeString>(), "database") };
-    VirtualColumnUtils::filterBlockWithQuery(query, block, context);
+    VirtualColumnUtils::filterBlockWithQuery(query_info.query, block, context);
     return block.getByPosition(0).column;
 }
 
@@ -104,12 +104,12 @@ public:
         Block header,
         UInt64 max_block_size_,
         ColumnPtr databases_,
-        const Context & context_)
+        ContextPtr context_)
         : SourceWithProgress(std::move(header))
         , columns_mask(std::move(columns_mask_))
         , max_block_size(max_block_size_)
         , databases(std::move(databases_))
-        , context(context_) {}
+        , context(Context::createCopy(context_)) {}
 
     String getName() const override { return "Tables"; }
 
@@ -121,7 +121,7 @@ protected:
 
         MutableColumns res_columns = getPort().getHeader().cloneEmptyColumns();
 
-        const auto access = context.getAccess();
+        const auto access = context->getAccess();
         const bool check_access_for_databases = !access->isGranted(AccessType::SHOW_TABLES);
 
         size_t rows_count = 0;
@@ -148,9 +148,9 @@ protected:
             /// This is for temporary tables. They are output in single block regardless to max_block_size.
             if (database_idx >= databases->size())
             {
-                if (context.hasSessionContext())
+                if (context->hasSessionContext())
                 {
-                    Tables external_tables = context.getSessionContext().getExternalTables();
+                    Tables external_tables = context->getSessionContext()->getExternalTables();
 
                     for (auto & table : external_tables)
                     {
@@ -278,7 +278,7 @@ protected:
                     }
                     try
                     {
-                        lock = table->lockForShare(context.getCurrentQueryId(), context.getSettingsRef().lock_acquire_timeout);
+                        lock = table->lockForShare(context->getCurrentQueryId(), context->getSettingsRef().lock_acquire_timeout);
                     }
                     catch (const Exception & e)
                     {
@@ -355,10 +355,11 @@ protected:
                 {
                     ASTPtr ast = database->tryGetCreateTableQuery(table_name, context);
 
-                    if (ast && !context.getSettingsRef().show_table_uuid_in_table_create_query_if_not_nil)
+                    if (ast && !context->getSettingsRef().show_table_uuid_in_table_create_query_if_not_nil)
                     {
                         auto & create = ast->as<ASTCreateQuery &>();
                         create.uuid = UUIDHelpers::Nil;
+                        create.to_inner_uuid = UUIDHelpers::Nil;
                     }
 
                     if (columns_mask[src_index++])
@@ -441,7 +442,7 @@ protected:
                 if (columns_mask[src_index++])
                 {
                     assert(table != nullptr);
-                    auto total_rows = table->totalRows(context.getSettingsRef());
+                    auto total_rows = table->totalRows(context->getSettingsRef());
                     if (total_rows)
                         res_columns[res_index++]->insert(*total_rows);
                     else
@@ -451,7 +452,7 @@ protected:
                 if (columns_mask[src_index++])
                 {
                     assert(table != nullptr);
-                    auto total_bytes = table->totalBytes(context.getSettingsRef());
+                    auto total_bytes = table->totalBytes(context->getSettingsRef());
                     if (total_bytes)
                         res_columns[res_index++]->insert(*total_bytes);
                     else
@@ -489,7 +490,7 @@ private:
     ColumnPtr databases;
     size_t database_idx = 0;
     DatabaseTablesIteratorPtr tables_it;
-    const Context context;
+    ContextPtr context;
     bool done = false;
     DatabasePtr database;
     std::string database_name;
@@ -500,7 +501,7 @@ Pipe StorageSystemTables::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & query_info,
-    const Context & context,
+    ContextPtr context,
     QueryProcessingStage::Enum /*processed_stage*/,
     const size_t max_block_size,
     const unsigned /*num_streams*/)
@@ -524,7 +525,7 @@ Pipe StorageSystemTables::read(
         }
     }
 
-    ColumnPtr filtered_databases_column = getFilteredDatabases(query_info.query, context);
+    ColumnPtr filtered_databases_column = getFilteredDatabases(query_info, context);
 
     return Pipe(std::make_shared<TablesBlockSource>(
         std::move(columns_mask), std::move(res_block), max_block_size, std::move(filtered_databases_column), context));
diff --git a/src/Storages/System/StorageSystemTables.h b/src/Storages/System/StorageSystemTables.h
index 2e0b3386f8c..da5e236b33f 100644
--- a/src/Storages/System/StorageSystemTables.h
+++ b/src/Storages/System/StorageSystemTables.h
@@ -22,7 +22,7 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
diff --git a/src/Storages/System/StorageSystemTimeZones.cpp b/src/Storages/System/StorageSystemTimeZones.cpp
index e5523f54caf..dc3711812a6 100644
--- a/src/Storages/System/StorageSystemTimeZones.cpp
+++ b/src/Storages/System/StorageSystemTimeZones.cpp
@@ -15,7 +15,7 @@ NamesAndTypesList StorageSystemTimeZones::getNamesAndTypes()
     };
 }
 
-void StorageSystemTimeZones::fillData(MutableColumns & res_columns, const Context &, const SelectQueryInfo &) const
+void StorageSystemTimeZones::fillData(MutableColumns & res_columns, ContextPtr, const SelectQueryInfo &) const
 {
     for (auto * it = auto_time_zones; *it; ++it)
         res_columns[0]->insert(String(*it));
diff --git a/src/Storages/System/StorageSystemTimeZones.h b/src/Storages/System/StorageSystemTimeZones.h
index b7544ecb16d..0f68b2de293 100644
--- a/src/Storages/System/StorageSystemTimeZones.h
+++ b/src/Storages/System/StorageSystemTimeZones.h
@@ -17,7 +17,7 @@ class StorageSystemTimeZones final : public ext::shared_ptr_helper<StorageSystem
     friend struct ext::shared_ptr_helper<StorageSystemTimeZones>;
 
 protected:
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
 
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
diff --git a/src/Storages/System/StorageSystemUserDirectories.cpp b/src/Storages/System/StorageSystemUserDirectories.cpp
index 519f0c0dcb0..7858af25365 100644
--- a/src/Storages/System/StorageSystemUserDirectories.cpp
+++ b/src/Storages/System/StorageSystemUserDirectories.cpp
@@ -22,9 +22,9 @@ NamesAndTypesList StorageSystemUserDirectories::getNamesAndTypes()
 }
 
 
-void StorageSystemUserDirectories::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const
+void StorageSystemUserDirectories::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
-    const auto & access_control = context.getAccessControlManager();
+    const auto & access_control = context->getAccessControlManager();
     auto storages = access_control.getStorages();
 
     size_t column_index = 0;
diff --git a/src/Storages/System/StorageSystemUserDirectories.h b/src/Storages/System/StorageSystemUserDirectories.h
index 902c890fe29..0ddb0ad49d8 100644
--- a/src/Storages/System/StorageSystemUserDirectories.h
+++ b/src/Storages/System/StorageSystemUserDirectories.h
@@ -18,7 +18,7 @@ public:
 protected:
     friend struct ext::shared_ptr_helper<StorageSystemUserDirectories>;
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemUsers.cpp b/src/Storages/System/StorageSystemUsers.cpp
index 675fee84746..e60f1372df9 100644
--- a/src/Storages/System/StorageSystemUsers.cpp
+++ b/src/Storages/System/StorageSystemUsers.cpp
@@ -47,15 +47,18 @@ NamesAndTypesList StorageSystemUsers::getNamesAndTypes()
         {"default_roles_all", std::make_shared<DataTypeUInt8>()},
         {"default_roles_list", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())},
         {"default_roles_except", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())},
+        {"grantees_any", std::make_shared<DataTypeUInt8>()},
+        {"grantees_list", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())},
+        {"grantees_except", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())},
     };
     return names_and_types;
 }
 
 
-void StorageSystemUsers::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const
+void StorageSystemUsers::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
-    context.checkAccess(AccessType::SHOW_USERS);
-    const auto & access_control = context.getAccessControlManager();
+    context->checkAccess(AccessType::SHOW_USERS);
+    const auto & access_control = context->getAccessControlManager();
     std::vector<UUID> ids = access_control.findAll<User>();
 
     size_t column_index = 0;
@@ -77,24 +80,36 @@ void StorageSystemUsers::fillData(MutableColumns & res_columns, const Context &
     auto & column_default_roles_list_offsets = assert_cast<ColumnArray &>(*res_columns[column_index++]).getOffsets();
     auto & column_default_roles_except = assert_cast<ColumnString &>(assert_cast<ColumnArray &>(*res_columns[column_index]).getData());
     auto & column_default_roles_except_offsets = assert_cast<ColumnArray &>(*res_columns[column_index++]).getOffsets();
+    auto & column_grantees_any = assert_cast<ColumnUInt8 &>(*res_columns[column_index++]).getData();
+    auto & column_grantees_list = assert_cast<ColumnString &>(assert_cast<ColumnArray &>(*res_columns[column_index]).getData());
+    auto & column_grantees_list_offsets = assert_cast<ColumnArray &>(*res_columns[column_index++]).getOffsets();
+    auto & column_grantees_except = assert_cast<ColumnString &>(assert_cast<ColumnArray &>(*res_columns[column_index]).getData());
+    auto & column_grantees_except_offsets = assert_cast<ColumnArray &>(*res_columns[column_index++]).getOffsets();
 
     auto add_row = [&](const String & name,
                        const UUID & id,
                        const String & storage_name,
                        const Authentication & authentication,
                        const AllowedClientHosts & allowed_hosts,
-                       const RolesOrUsersSet & default_roles)
+                       const RolesOrUsersSet & default_roles,
+                       const RolesOrUsersSet & grantees)
     {
         column_name.insertData(name.data(), name.length());
         column_id.push_back(id);
         column_storage.insertData(storage_name.data(), storage_name.length());
         column_auth_type.push_back(static_cast<Int8>(authentication.getType()));
 
-        if (authentication.getType() == Authentication::Type::LDAP_SERVER)
+        if (
+            authentication.getType() == Authentication::Type::LDAP ||
+            authentication.getType() == Authentication::Type::KERBEROS
+        )
         {
             Poco::JSON::Object auth_params_json;
 
-            auth_params_json.set("server", authentication.getServerName());
+            if (authentication.getType() == Authentication::Type::LDAP)
+                auth_params_json.set("server", authentication.getLDAPServerName());
+            else if (authentication.getType() == Authentication::Type::KERBEROS)
+                auth_params_json.set("realm", authentication.getKerberosRealm());
 
             std::ostringstream oss;         // STYLE_CHECK_ALLOW_STD_STRING_STREAM
             oss.exceptions(std::ios::failbit);
@@ -150,14 +165,21 @@ void StorageSystemUsers::fillData(MutableColumns & res_columns, const Context &
 
         auto default_roles_ast = default_roles.toASTWithNames(access_control);
         column_default_roles_all.push_back(default_roles_ast->all);
-
         for (const auto & role_name : default_roles_ast->names)
             column_default_roles_list.insertData(role_name.data(), role_name.length());
         column_default_roles_list_offsets.push_back(column_default_roles_list.size());
-
-        for (const auto & role_name : default_roles_ast->except_names)
-            column_default_roles_except.insertData(role_name.data(), role_name.length());
+        for (const auto & except_name : default_roles_ast->except_names)
+            column_default_roles_except.insertData(except_name.data(), except_name.length());
         column_default_roles_except_offsets.push_back(column_default_roles_except.size());
+
+        auto grantees_ast = grantees.toASTWithNames(access_control);
+        column_grantees_any.push_back(grantees_ast->all);
+        for (const auto & grantee_name : grantees_ast->names)
+            column_grantees_list.insertData(grantee_name.data(), grantee_name.length());
+        column_grantees_list_offsets.push_back(column_grantees_list.size());
+        for (const auto & except_name : grantees_ast->except_names)
+            column_grantees_except.insertData(except_name.data(), except_name.length());
+        column_grantees_except_offsets.push_back(column_grantees_except.size());
     };
 
     for (const auto & id : ids)
@@ -170,7 +192,7 @@ void StorageSystemUsers::fillData(MutableColumns & res_columns, const Context &
         if (!storage)
             continue;
 
-        add_row(user->getName(), id, storage->getStorageName(), user->authentication, user->allowed_client_hosts, user->default_roles);
+        add_row(user->getName(), id, storage->getStorageName(), user->authentication, user->allowed_client_hosts, user->default_roles, user->grantees);
     }
 }
 
diff --git a/src/Storages/System/StorageSystemUsers.h b/src/Storages/System/StorageSystemUsers.h
index 707ea94591d..3c463a23db9 100644
--- a/src/Storages/System/StorageSystemUsers.h
+++ b/src/Storages/System/StorageSystemUsers.h
@@ -18,7 +18,7 @@ public:
 protected:
     friend struct ext::shared_ptr_helper<StorageSystemUsers>;
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemZeros.cpp b/src/Storages/System/StorageSystemZeros.cpp
index ed5ab93369a..d1456d72685 100644
--- a/src/Storages/System/StorageSystemZeros.cpp
+++ b/src/Storages/System/StorageSystemZeros.cpp
@@ -94,7 +94,7 @@ Pipe StorageSystemZeros::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo &,
-    const Context & /*context*/,
+    ContextPtr /*context*/,
     QueryProcessingStage::Enum /*processed_stage*/,
     size_t max_block_size,
     unsigned num_streams)
diff --git a/src/Storages/System/StorageSystemZeros.h b/src/Storages/System/StorageSystemZeros.h
index 04733f550c1..2ccdcf9c944 100644
--- a/src/Storages/System/StorageSystemZeros.h
+++ b/src/Storages/System/StorageSystemZeros.h
@@ -24,7 +24,7 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
diff --git a/src/Storages/System/StorageSystemZooKeeper.cpp b/src/Storages/System/StorageSystemZooKeeper.cpp
index 8fa5ccbd630..1a8aac3b277 100644
--- a/src/Storages/System/StorageSystemZooKeeper.cpp
+++ b/src/Storages/System/StorageSystemZooKeeper.cpp
@@ -63,7 +63,7 @@ static String pathCorrected(const String & path)
 }
 
 
-static bool extractPathImpl(const IAST & elem, Paths & res, const Context & context)
+static bool extractPathImpl(const IAST & elem, Paths & res, ContextPtr context)
 {
     const auto * function = elem.as<ASTFunction>();
     if (!function)
@@ -94,8 +94,8 @@ static bool extractPathImpl(const IAST & elem, Paths & res, const Context & cont
         {
             auto interpreter_subquery = interpretSubquery(value, context, {}, {});
             auto stream = interpreter_subquery->execute().getInputStream();
-            SizeLimits limites(context.getSettingsRef().max_rows_in_set, context.getSettingsRef().max_bytes_in_set, OverflowMode::THROW);
-            Set set(limites, true, context.getSettingsRef().transform_null_in);
+            SizeLimits limites(context->getSettingsRef().max_rows_in_set, context->getSettingsRef().max_bytes_in_set, OverflowMode::THROW);
+            Set set(limites, true, context->getSettingsRef().transform_null_in);
             set.setHeader(stream->getHeader());
 
             stream->readPrefix();
@@ -165,7 +165,7 @@ static bool extractPathImpl(const IAST & elem, Paths & res, const Context & cont
 
 /** Retrieve from the query a condition of the form `path = 'path'`, from conjunctions in the WHERE clause.
   */
-static Paths extractPath(const ASTPtr & query, const Context & context)
+static Paths extractPath(const ASTPtr & query, ContextPtr context)
 {
     const auto & select = query->as<ASTSelectQuery &>();
     if (!select.where())
@@ -176,13 +176,13 @@ static Paths extractPath(const ASTPtr & query, const Context & context)
 }
 
 
-void StorageSystemZooKeeper::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const
+void StorageSystemZooKeeper::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const
 {
     const Paths & paths = extractPath(query_info.query, context);
     if (paths.empty())
         throw Exception("SELECT from system.zookeeper table must contain condition like path = 'path' or path IN ('path1','path2'...) or path IN (subquery) in WHERE clause.", ErrorCodes::BAD_ARGUMENTS);
 
-    zkutil::ZooKeeperPtr zookeeper = context.getZooKeeper();
+    zkutil::ZooKeeperPtr zookeeper = context->getZooKeeper();
 
     std::unordered_set<String> paths_corrected;
     for (const auto & path : paths)
diff --git a/src/Storages/System/StorageSystemZooKeeper.h b/src/Storages/System/StorageSystemZooKeeper.h
index 06611f61dae..226ca79facf 100644
--- a/src/Storages/System/StorageSystemZooKeeper.h
+++ b/src/Storages/System/StorageSystemZooKeeper.h
@@ -23,7 +23,7 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
 };
 
 }
diff --git a/src/Storages/TTLDescription.cpp b/src/Storages/TTLDescription.cpp
index 41c20b2714b..95ea4f07f18 100644
--- a/src/Storages/TTLDescription.cpp
+++ b/src/Storages/TTLDescription.cpp
@@ -162,7 +162,7 @@ TTLDescription & TTLDescription::operator=(const TTLDescription & other)
 TTLDescription TTLDescription::getTTLFromAST(
     const ASTPtr & definition_ast,
     const ColumnsDescription & columns,
-    const Context & context,
+    ContextPtr context,
     const KeyDescription & primary_key)
 {
     TTLDescription result;
@@ -289,7 +289,7 @@ TTLDescription TTLDescription::getTTLFromAST(
         {
             result.recompression_codec =
                 CompressionCodecFactory::instance().validateCodecAndGetPreprocessedAST(
-                    ttl_element->recompression_codec, {}, !context.getSettingsRef().allow_suspicious_codecs);
+                    ttl_element->recompression_codec, {}, !context->getSettingsRef().allow_suspicious_codecs);
         }
     }
 
@@ -330,7 +330,7 @@ TTLTableDescription & TTLTableDescription::operator=(const TTLTableDescription &
 TTLTableDescription TTLTableDescription::getTTLForTableFromAST(
     const ASTPtr & definition_ast,
     const ColumnsDescription & columns,
-    const Context & context,
+    ContextPtr context,
     const KeyDescription & primary_key)
 {
     TTLTableDescription result;
diff --git a/src/Storages/TTLDescription.h b/src/Storages/TTLDescription.h
index a2340ad6bcd..6288098b3c5 100644
--- a/src/Storages/TTLDescription.h
+++ b/src/Storages/TTLDescription.h
@@ -80,7 +80,7 @@ struct TTLDescription
 
     /// Parse TTL structure from definition. Able to parse both column and table
     /// TTLs.
-    static TTLDescription getTTLFromAST(const ASTPtr & definition_ast, const ColumnsDescription & columns, const Context & context, const KeyDescription & primary_key);
+    static TTLDescription getTTLFromAST(const ASTPtr & definition_ast, const ColumnsDescription & columns, ContextPtr context, const KeyDescription & primary_key);
 
     TTLDescription() = default;
     TTLDescription(const TTLDescription & other);
@@ -117,7 +117,7 @@ struct TTLTableDescription
     TTLTableDescription & operator=(const TTLTableDescription & other);
 
     static TTLTableDescription getTTLForTableFromAST(
-        const ASTPtr & definition_ast, const ColumnsDescription & columns, const Context & context, const KeyDescription & primary_key);
+        const ASTPtr & definition_ast, const ColumnsDescription & columns, ContextPtr context, const KeyDescription & primary_key);
 };
 
 }
diff --git a/src/Storages/VirtualColumnUtils.cpp b/src/Storages/VirtualColumnUtils.cpp
index 6b99dc25e37..a6a68f598c7 100644
--- a/src/Storages/VirtualColumnUtils.cpp
+++ b/src/Storages/VirtualColumnUtils.cpp
@@ -5,12 +5,14 @@
 #include <Interpreters/ExpressionAnalyzer.h>
 #include <Interpreters/ExpressionActions.h>
 #include <Interpreters/IdentifierSemantic.h>
+#include <Interpreters/misc.h>
 
 #include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTExpressionList.h>
 #include <Parsers/ASTLiteral.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTSelectQuery.h>
+#include <Parsers/ASTSubquery.h>
 
 #include <Columns/ColumnsNumber.h>
 #include <Columns/ColumnsCommon.h>
@@ -19,6 +21,7 @@
 #include <Storages/VirtualColumnUtils.h>
 #include <IO/WriteHelpers.h>
 #include <Common/typeid_cast.h>
+#include <Interpreters/ActionsVisitor.h>
 
 
 namespace DB
@@ -28,31 +31,36 @@ namespace
 {
 
 /// Verifying that the function depends only on the specified columns
-bool isValidFunction(const ASTPtr & expression, const NameSet & columns)
+bool isValidFunction(const ASTPtr & expression, const std::function<bool(const ASTPtr &)> & is_constant)
 {
-    for (const auto & child : expression->children)
-        if (!isValidFunction(child, columns))
-            return false;
-
-    if (auto opt_name = IdentifierSemantic::getColumnName(expression))
-        return columns.count(*opt_name);
-
-    return true;
+    const auto * function = expression->as<ASTFunction>();
+    if (function && functionIsInOrGlobalInOperator(function->name))
+    {
+        // Second argument of IN can be a scalar subquery
+        return isValidFunction(function->arguments->children[0], is_constant);
+    }
+    else
+        return is_constant(expression);
 }
 
 /// Extract all subfunctions of the main conjunction, but depending only on the specified columns
-void extractFunctions(const ASTPtr & expression, const NameSet & columns, std::vector<ASTPtr> & result)
+bool extractFunctions(const ASTPtr & expression, const std::function<bool(const ASTPtr &)> & is_constant, std::vector<ASTPtr> & result)
 {
     const auto * function = expression->as<ASTFunction>();
-    if (function && function->name == "and")
+    if (function && (function->name == "and" || function->name == "indexHint"))
     {
+        bool ret = true;
         for (const auto & child : function->arguments->children)
-            extractFunctions(child, columns, result);
+            ret &= extractFunctions(child, is_constant, result);
+        return ret;
     }
-    else if (isValidFunction(expression, columns))
+    else if (isValidFunction(expression, is_constant))
     {
         result.push_back(expression->clone());
+        return true;
     }
+    else
+        return false;
 }
 
 /// Construct a conjunction from given functions
@@ -65,6 +73,25 @@ ASTPtr buildWhereExpression(const ASTs & functions)
     return makeASTFunction("and", functions);
 }
 
+void buildSets(const ASTPtr & expression, ExpressionAnalyzer & analyzer)
+{
+    const auto * func = expression->as<ASTFunction>();
+    if (func && functionIsInOrGlobalInOperator(func->name))
+    {
+        const IAST & args = *func->arguments;
+        const ASTPtr & arg = args.children.at(1);
+        if (arg->as<ASTSubquery>() || arg->as<ASTIdentifier>())
+        {
+            analyzer.tryMakeSetForIndexFromSubquery(arg);
+        }
+    }
+    else
+    {
+        for (const auto & child : expression->children)
+            buildSets(child, analyzer);
+    }
+}
+
 }
 
 namespace VirtualColumnUtils
@@ -76,7 +103,6 @@ void rewriteEntityInAst(ASTPtr ast, const String & column_name, const Field & va
     if (!select.with())
         select.setExpression(ASTSelectQuery::Expression::WITH, std::make_shared<ASTExpressionList>());
 
-
     if (func.empty())
     {
         auto literal = std::make_shared<ASTLiteral>(value);
@@ -96,30 +122,63 @@ void rewriteEntityInAst(ASTPtr ast, const String & column_name, const Field & va
     }
 }
 
-void filterBlockWithQuery(const ASTPtr & query, Block & block, const Context & context)
+bool prepareFilterBlockWithQuery(const ASTPtr & query, ContextPtr context, Block block, ASTPtr & expression_ast)
 {
+    bool unmodified = true;
     const auto & select = query->as<ASTSelectQuery &>();
     if (!select.where() && !select.prewhere())
-        return;
+        return unmodified;
 
-    NameSet columns;
-    for (const auto & it : block.getNamesAndTypesList())
-        columns.insert(it.name);
+    ASTPtr condition_ast;
+    if (select.prewhere() && select.where())
+        condition_ast = makeASTFunction("and", select.prewhere()->clone(), select.where()->clone());
+    else
+        condition_ast = select.prewhere() ? select.prewhere()->clone() : select.where()->clone();
 
-    /// We will create an expression that evaluates the expressions in WHERE and PREWHERE, depending only on the existing columns.
+    // Prepare a constant block with valid expressions
+    for (size_t i = 0; i < block.columns(); ++i)
+        block.getByPosition(i).column = block.getByPosition(i).type->createColumnConstWithDefaultValue(1);
+
+    // Provide input columns as constant columns to check if an expression is constant.
+    std::function<bool(const ASTPtr &)> is_constant = [&block, &context](const ASTPtr & node)
+    {
+        auto actions = std::make_shared<ActionsDAG>(block.getColumnsWithTypeAndName());
+        PreparedSets prepared_sets;
+        SubqueriesForSets subqueries_for_sets;
+        ActionsVisitor::Data visitor_data(
+            context, SizeLimits{}, 1, {}, std::move(actions), prepared_sets, subqueries_for_sets, true, true, true, false);
+        ActionsVisitor(visitor_data).visit(node);
+        actions = visitor_data.getActions();
+        auto expression_actions = std::make_shared<ExpressionActions>(actions);
+        auto block_with_constants = block;
+        expression_actions->execute(block_with_constants);
+        auto column_name = node->getColumnName();
+        return block_with_constants.has(column_name) && isColumnConst(*block_with_constants.getByName(column_name).column);
+    };
+
+    /// Create an expression that evaluates the expressions in WHERE and PREWHERE, depending only on the existing columns.
     std::vector<ASTPtr> functions;
     if (select.where())
-        extractFunctions(select.where(), columns, functions);
+        unmodified &= extractFunctions(select.where(), is_constant, functions);
     if (select.prewhere())
-        extractFunctions(select.prewhere(), columns, functions);
+        unmodified &= extractFunctions(select.prewhere(), is_constant, functions);
+
+    expression_ast = buildWhereExpression(functions);
+    return unmodified;
+}
+
+void filterBlockWithQuery(const ASTPtr & query, Block & block, ContextPtr context, ASTPtr expression_ast)
+{
+    if (!expression_ast)
+        prepareFilterBlockWithQuery(query, context, block, expression_ast);
 
-    ASTPtr expression_ast = buildWhereExpression(functions);
     if (!expression_ast)
         return;
 
-    /// Let's analyze and calculate the expression.
+    /// Let's analyze and calculate the prepared expression.
     auto syntax_result = TreeRewriter(context).analyze(expression_ast, block.getNamesAndTypesList());
     ExpressionAnalyzer analyzer(expression_ast, syntax_result, context);
+    buildSets(expression_ast, analyzer);
     ExpressionActionsPtr actions = analyzer.getActions(false);
 
     Block block_with_filter = block;
@@ -132,10 +191,15 @@ void filterBlockWithQuery(const ASTPtr & query, Block & block, const Context & c
     ConstantFilterDescription constant_filter(*filter_column);
 
     if (constant_filter.always_true)
+    {
         return;
+    }
 
     if (constant_filter.always_false)
+    {
         block = block.cloneEmpty();
+        return;
+    }
 
     FilterDescription filter(*filter_column);
 
diff --git a/src/Storages/VirtualColumnUtils.h b/src/Storages/VirtualColumnUtils.h
index 445a996ab87..15783f6e79f 100644
--- a/src/Storages/VirtualColumnUtils.h
+++ b/src/Storages/VirtualColumnUtils.h
@@ -1,15 +1,16 @@
 #pragma once
 
-#include <unordered_set>
-
 #include <Core/Block.h>
+#include <Interpreters/Context_fwd.h>
 #include <Parsers/IAST_fwd.h>
+#include <Storages/SelectQueryInfo.h>
+
+#include <unordered_set>
 
 
 namespace DB
 {
 
-class Context;
 class NamesAndTypesList;
 
 
@@ -24,9 +25,14 @@ namespace VirtualColumnUtils
 /// - `WITH toUInt16(9000) as _port`.
 void rewriteEntityInAst(ASTPtr ast, const String & column_name, const Field & value, const String & func = "");
 
+/// Prepare `expression_ast` to filter block. Returns true if `expression_ast` is not trimmed, that is,
+/// `block` provides all needed columns for `expression_ast`, else return false.
+bool prepareFilterBlockWithQuery(const ASTPtr & query, ContextPtr context, Block block, ASTPtr & expression_ast);
+
 /// Leave in the block only the rows that fit under the WHERE clause and the PREWHERE clause of the query.
 /// Only elements of the outer conjunction are considered, depending only on the columns present in the block.
-void filterBlockWithQuery(const ASTPtr & query, Block & block, const Context & context);
+/// If `expression_ast` is passed, use it to filter block.
+void filterBlockWithQuery(const ASTPtr & query, Block & block, ContextPtr context, ASTPtr expression_ast = {});
 
 /// Extract from the input stream a set of `name` column values
 template <typename T>
diff --git a/src/Storages/getStructureOfRemoteTable.cpp b/src/Storages/getStructureOfRemoteTable.cpp
index de5f3924ca9..fb828b8f744 100644
--- a/src/Storages/getStructureOfRemoteTable.cpp
+++ b/src/Storages/getStructureOfRemoteTable.cpp
@@ -29,7 +29,7 @@ ColumnsDescription getStructureOfRemoteTableInShard(
     const Cluster & cluster,
     const Cluster::ShardInfo & shard_info,
     const StorageID & table_id,
-    const Context & context,
+    ContextPtr context,
     const ASTPtr & table_func_ptr)
 {
     String query;
@@ -59,7 +59,7 @@ ColumnsDescription getStructureOfRemoteTableInShard(
 
     ColumnsDescription res;
 
-    auto new_context = ClusterProxy::updateSettingsForCluster(cluster, context, context.getSettingsRef());
+    auto new_context = ClusterProxy::updateSettingsForCluster(cluster, context, context->getSettingsRef());
 
     /// Expect only needed columns from the result of DESC TABLE. NOTE 'comment' column is ignored for compatibility reasons.
     Block sample_block
@@ -71,7 +71,7 @@ ColumnsDescription getStructureOfRemoteTableInShard(
     };
 
     /// Execute remote query without restrictions (because it's not real user query, but part of implementation)
-    auto input = std::make_shared<RemoteBlockInputStream>(shard_info.pool, query, sample_block, *new_context);
+    auto input = std::make_shared<RemoteBlockInputStream>(shard_info.pool, query, sample_block, new_context);
     input->setPoolMode(PoolMode::GET_ONE);
     if (!table_func_ptr)
         input->setMainTable(table_id);
@@ -104,7 +104,7 @@ ColumnsDescription getStructureOfRemoteTableInShard(
                 column.default_desc.kind = columnDefaultKindFromString(kind_name);
                 String expr_str = (*default_expr)[i].get<const String &>();
                 column.default_desc.expression = parseQuery(
-                    expr_parser, expr_str.data(), expr_str.data() + expr_str.size(), "default expression", 0, context.getSettingsRef().max_parser_depth);
+                    expr_parser, expr_str.data(), expr_str.data() + expr_str.size(), "default expression", 0, context->getSettingsRef().max_parser_depth);
             }
 
             res.add(column);
@@ -117,7 +117,7 @@ ColumnsDescription getStructureOfRemoteTableInShard(
 ColumnsDescription getStructureOfRemoteTable(
     const Cluster & cluster,
     const StorageID & table_id,
-    const Context & context,
+    ContextPtr context,
     const ASTPtr & table_func_ptr)
 {
     const auto & shards_info = cluster.getShardsInfo();
diff --git a/src/Storages/getStructureOfRemoteTable.h b/src/Storages/getStructureOfRemoteTable.h
index af418144cb0..3f77236c756 100644
--- a/src/Storages/getStructureOfRemoteTable.h
+++ b/src/Storages/getStructureOfRemoteTable.h
@@ -16,7 +16,7 @@ struct StorageID;
 ColumnsDescription getStructureOfRemoteTable(
     const Cluster & cluster,
     const StorageID & table_id,
-    const Context & context,
+    ContextPtr context,
     const ASTPtr & table_func_ptr = nullptr);
 
 }
diff --git a/src/Storages/registerStorages.cpp b/src/Storages/registerStorages.cpp
index 0022ee6bd4f..7100afa6909 100644
--- a/src/Storages/registerStorages.cpp
+++ b/src/Storages/registerStorages.cpp
@@ -62,6 +62,10 @@ void registerStorageEmbeddedRocksDB(StorageFactory & factory);
 void registerStoragePostgreSQL(StorageFactory & factory);
 #endif
 
+#if USE_MYSQL || USE_LIBPQXX
+void registerStorageExternalDistributed(StorageFactory & factory);
+#endif
+
 void registerStorages()
 {
     auto & factory = StorageFactory::instance();
@@ -118,6 +122,10 @@ void registerStorages()
     #if USE_LIBPQXX
     registerStoragePostgreSQL(factory);
     #endif
+
+    #if USE_MYSQL || USE_LIBPQXX
+    registerStorageExternalDistributed(factory);
+    #endif
 }
 
 }
diff --git a/src/Storages/tests/CMakeLists.txt b/src/Storages/tests/CMakeLists.txt
index b58fed9edf5..59d44829363 100644
--- a/src/Storages/tests/CMakeLists.txt
+++ b/src/Storages/tests/CMakeLists.txt
@@ -1,6 +1,3 @@
-add_executable (part_name part_name.cpp)
-target_link_libraries (part_name PRIVATE dbms)
-
 add_executable (remove_symlink_directory remove_symlink_directory.cpp)
 target_link_libraries (remove_symlink_directory PRIVATE dbms)
 
diff --git a/src/Storages/tests/gtest_SplitTokenExtractor.cpp b/src/Storages/tests/gtest_SplitTokenExtractor.cpp
index b5a26c9cd8e..ee6a55f50b8 100644
--- a/src/Storages/tests/gtest_SplitTokenExtractor.cpp
+++ b/src/Storages/tests/gtest_SplitTokenExtractor.cpp
@@ -61,12 +61,12 @@ TEST_P(SplitTokenExtractorTest, next)
     for (const auto & expected_token : param.tokens)
     {
         SCOPED_TRACE(++i);
-        ASSERT_TRUE(token_extractor.next(data->data(), data->size(), &pos, &token_start, &token_len));
+        ASSERT_TRUE(token_extractor.nextInColumn(data->data(), data->size(), &pos, &token_start, &token_len));
 
         EXPECT_EQ(expected_token, std::string_view(data->data() + token_start, token_len))
                 << " token_start:" << token_start << " token_len: " << token_len;
     }
-    ASSERT_FALSE(token_extractor.next(data->data(), data->size(), &pos, &token_start, &token_len))
+    ASSERT_FALSE(token_extractor.nextInColumn(data->data(), data->size(), &pos, &token_start, &token_len))
             << "\n\t=> \"" << param.source.substr(token_start, token_len) << "\""
             << "\n\t" << token_start << ", " << token_len << ", " << pos << ", " << data->size();
 }
diff --git a/src/Storages/tests/gtest_background_executor.cpp b/src/Storages/tests/gtest_background_executor.cpp
index 0ddf2d9ea2a..283cdf3fbf8 100644
--- a/src/Storages/tests/gtest_background_executor.cpp
+++ b/src/Storages/tests/gtest_background_executor.cpp
@@ -17,9 +17,9 @@ static std::atomic<Int64> counter{0};
 class TestJobExecutor : public IBackgroundJobExecutor
 {
 public:
-    explicit TestJobExecutor(Context & context)
+    explicit TestJobExecutor(ContextPtr local_context)
         :IBackgroundJobExecutor(
-            context,
+            local_context,
             BackgroundTaskSchedulingSettings{},
             {PoolConfig{PoolType::MERGE_MUTATE, 4, CurrentMetrics::BackgroundPoolTask}})
         {}
@@ -43,7 +43,7 @@ TEST(BackgroundExecutor, TestMetric)
     const auto & context_holder = getContext();
     std::vector<TestExecutorPtr> executors;
     for (size_t i = 0; i < 100; ++i)
-        executors.emplace_back(std::make_unique<TestJobExecutor>(const_cast<Context &>(context_holder.context)));
+        executors.emplace_back(std::make_unique<TestJobExecutor>(context_holder.context));
 
     for (size_t i = 0; i < 100; ++i)
         executors[i]->start();
diff --git a/src/Storages/tests/gtest_storage_log.cpp b/src/Storages/tests/gtest_storage_log.cpp
index cbb894c7420..41c1b6ac75a 100644
--- a/src/Storages/tests/gtest_storage_log.cpp
+++ b/src/Storages/tests/gtest_storage_log.cpp
@@ -19,7 +19,7 @@
 #include <Processors/Executors/PipelineExecutingBlockInputStream.h>
 #include <Processors/QueryPipeline.h>
 
-#if !__clang__
+#if !defined(__clang__)
 #    pragma GCC diagnostic push
 #    pragma GCC diagnostic ignored "-Wsuggest-override"
 #endif
@@ -70,7 +70,7 @@ using DiskImplementations = testing::Types<DB::DiskMemory, DB::DiskLocal>;
 TYPED_TEST_SUITE(StorageLogTest, DiskImplementations);
 
 // Returns data written to table in Values format.
-std::string writeData(int rows, DB::StoragePtr & table, const DB::Context & context)
+std::string writeData(int rows, DB::StoragePtr & table, const DB::ContextPtr context)
 {
     using namespace DB;
     auto metadata_snapshot = table->getInMemoryMetadataPtr();
@@ -108,7 +108,7 @@ std::string writeData(int rows, DB::StoragePtr & table, const DB::Context & cont
 }
 
 // Returns all table data in Values format.
-std::string readData(DB::StoragePtr & table, const DB::Context & context)
+std::string readData(DB::StoragePtr & table, const DB::ContextPtr context)
 {
     using namespace DB;
     auto metadata_snapshot = table->getInMemoryMetadataPtr();
diff --git a/src/Storages/tests/gtest_transform_query_for_external_database.cpp b/src/Storages/tests/gtest_transform_query_for_external_database.cpp
index 99dfc55ed69..d774fd144cf 100644
--- a/src/Storages/tests/gtest_transform_query_for_external_database.cpp
+++ b/src/Storages/tests/gtest_transform_query_for_external_database.cpp
@@ -22,16 +22,7 @@ struct State
 {
     State(const State&) = delete;
 
-    Context context;
-    NamesAndTypesList columns{
-        {"column", std::make_shared<DataTypeUInt8>()},
-        {"apply_id", std::make_shared<DataTypeUInt64>()},
-        {"apply_type", std::make_shared<DataTypeUInt8>()},
-        {"apply_status", std::make_shared<DataTypeUInt8>()},
-        {"create_time", std::make_shared<DataTypeDateTime>()},
-        {"field", std::make_shared<DataTypeString>()},
-        {"value", std::make_shared<DataTypeString>()},
-    };
+    ContextPtr context;
 
     static const State & instance()
     {
@@ -39,27 +30,83 @@ struct State
         return state;
     }
 
+    const NamesAndTypesList & getColumns() const
+    {
+        return tables[0].columns;
+    }
+
+    std::vector<TableWithColumnNamesAndTypes> getTables(size_t num = 0) const
+    {
+        std::vector<TableWithColumnNamesAndTypes> res;
+        for (size_t i = 0; i < std::min(num, tables.size()); ++i)
+            res.push_back(tables[i]);
+        return res;
+    }
+
 private:
+
+    static DatabaseAndTableWithAlias createDBAndTable(String table_name)
+    {
+        DatabaseAndTableWithAlias res;
+        res.database = "test";
+        res.table = table_name;
+        return res;
+    }
+
+    const std::vector<TableWithColumnNamesAndTypes> tables{
+        TableWithColumnNamesAndTypes(
+            createDBAndTable("table"),
+            {
+                {"column", std::make_shared<DataTypeUInt8>()},
+                {"apply_id", std::make_shared<DataTypeUInt64>()},
+                {"apply_type", std::make_shared<DataTypeUInt8>()},
+                {"apply_status", std::make_shared<DataTypeUInt8>()},
+                {"create_time", std::make_shared<DataTypeDateTime>()},
+                {"field", std::make_shared<DataTypeString>()},
+                {"value", std::make_shared<DataTypeString>()},
+            }),
+        TableWithColumnNamesAndTypes(
+            createDBAndTable("table2"),
+            {
+                {"num", std::make_shared<DataTypeUInt8>()},
+                {"attr", std::make_shared<DataTypeString>()},
+            }),
+    };
+
     explicit State()
-        : context(getContext().context)
+        : context(Context::createCopy(getContext().context))
     {
         tryRegisterFunctions();
         DatabasePtr database = std::make_shared<DatabaseMemory>("test", context);
-        database->attachTable("table", StorageMemory::create(StorageID("test", "table"), ColumnsDescription{columns}, ConstraintsDescription{}));
-        DatabaseCatalog::instance().attachDatabase("test", database);
-        context.setCurrentDatabase("test");
+
+        for (const auto & tab : tables)
+        {
+            const auto & table_name = tab.table.table;
+            const auto & db_name = tab.table.database;
+            database->attachTable(
+                table_name,
+                StorageMemory::create(StorageID(db_name, table_name), ColumnsDescription{getColumns()}, ConstraintsDescription{}));
+        }
+        DatabaseCatalog::instance().attachDatabase(database->getDatabaseName(), database);
+        context->setCurrentDatabase("test");
     }
 };
 
-
-static void check(const std::string & query, const std::string & expected, const Context & context, const NamesAndTypesList & columns)
+static void check(
+    const State & state,
+    size_t table_num,
+    const std::string & query,
+    const std::string & expected)
 {
     ParserSelectQuery parser;
     ASTPtr ast = parseQuery(parser, query, 1000, 1000);
     SelectQueryInfo query_info;
-    query_info.syntax_analyzer_result = TreeRewriter(context).analyzeSelect(ast, columns);
+    SelectQueryOptions select_options;
+    query_info.syntax_analyzer_result
+        = TreeRewriter(state.context).analyzeSelect(ast, state.getColumns(), select_options, state.getTables(table_num));
     query_info.query = ast;
-    std::string transformed_query = transformQueryForExternalDatabase(query_info, columns, IdentifierQuotingStyle::DoubleQuotes, "test", "table", context);
+    std::string transformed_query = transformQueryForExternalDatabase(
+        query_info, state.getColumns(), IdentifierQuotingStyle::DoubleQuotes, "test", "table", state.context);
 
     EXPECT_EQ(transformed_query, expected);
 }
@@ -69,82 +116,93 @@ TEST(TransformQueryForExternalDatabase, InWithSingleElement)
 {
     const State & state = State::instance();
 
-    check("SELECT column FROM test.table WHERE 1 IN (1)",
-          R"(SELECT "column" FROM "test"."table" WHERE 1)",
-          state.context, state.columns);
-    check("SELECT column FROM test.table WHERE column IN (1, 2)",
-          R"(SELECT "column" FROM "test"."table" WHERE "column" IN (1, 2))",
-          state.context, state.columns);
-    check("SELECT column FROM test.table WHERE column NOT IN ('hello', 'world')",
-          R"(SELECT "column" FROM "test"."table" WHERE "column" NOT IN ('hello', 'world'))",
-          state.context, state.columns);
+    check(state, 1,
+          "SELECT column FROM test.table WHERE 1 IN (1)",
+          R"(SELECT "column" FROM "test"."table" WHERE 1)");
+    check(state, 1,
+          "SELECT column FROM test.table WHERE column IN (1, 2)",
+          R"(SELECT "column" FROM "test"."table" WHERE "column" IN (1, 2))");
+    check(state, 1,
+          "SELECT column FROM test.table WHERE column NOT IN ('hello', 'world')",
+          R"(SELECT "column" FROM "test"."table" WHERE "column" NOT IN ('hello', 'world'))");
 }
 
 TEST(TransformQueryForExternalDatabase, InWithTable)
 {
     const State & state = State::instance();
 
-    check("SELECT column FROM test.table WHERE 1 IN external_table",
-          R"(SELECT "column" FROM "test"."table")",
-          state.context, state.columns);
-    check("SELECT column FROM test.table WHERE 1 IN (x)",
-          R"(SELECT "column" FROM "test"."table")",
-          state.context, state.columns);
-    check("SELECT column, field, value FROM test.table WHERE column IN (field, value)",
-          R"(SELECT "column", "field", "value" FROM "test"."table" WHERE "column" IN ("field", "value"))",
-          state.context, state.columns);
-    check("SELECT column FROM test.table WHERE column NOT IN hello AND column = 123",
-          R"(SELECT "column" FROM "test"."table" WHERE ("column" = 123))",
-          state.context, state.columns);
+    check(state, 1,
+          "SELECT column FROM test.table WHERE 1 IN external_table",
+          R"(SELECT "column" FROM "test"."table")");
+    check(state, 1,
+          "SELECT column FROM test.table WHERE 1 IN (x)",
+          R"(SELECT "column" FROM "test"."table")");
+    check(state, 1,
+          "SELECT column, field, value FROM test.table WHERE column IN (field, value)",
+          R"(SELECT "column", "field", "value" FROM "test"."table" WHERE "column" IN ("field", "value"))");
+    check(state, 1,
+          "SELECT column FROM test.table WHERE column NOT IN hello AND column = 123",
+          R"(SELECT "column" FROM "test"."table" WHERE "column" = 123)");
 }
 
 TEST(TransformQueryForExternalDatabase, Like)
 {
     const State & state = State::instance();
 
-    check("SELECT column FROM test.table WHERE column LIKE '%hello%'",
-          R"(SELECT "column" FROM "test"."table" WHERE "column" LIKE '%hello%')",
-          state.context, state.columns);
-    check("SELECT column FROM test.table WHERE column NOT LIKE 'w%rld'",
-          R"(SELECT "column" FROM "test"."table" WHERE "column" NOT LIKE 'w%rld')",
-          state.context, state.columns);
+    check(state, 1,
+          "SELECT column FROM test.table WHERE column LIKE '%hello%'",
+          R"(SELECT "column" FROM "test"."table" WHERE "column" LIKE '%hello%')");
+    check(state, 1,
+          "SELECT column FROM test.table WHERE column NOT LIKE 'w%rld'",
+          R"(SELECT "column" FROM "test"."table" WHERE "column" NOT LIKE 'w%rld')");
 }
 
 TEST(TransformQueryForExternalDatabase, Substring)
 {
     const State & state = State::instance();
 
-    check("SELECT column FROM test.table WHERE left(column, 10) = RIGHT(column, 10) AND SUBSTRING(column FROM 1 FOR 2) = 'Hello'",
-          R"(SELECT "column" FROM "test"."table")",
-          state.context, state.columns);
+    check(state, 1,
+          "SELECT column FROM test.table WHERE left(column, 10) = RIGHT(column, 10) AND SUBSTRING(column FROM 1 FOR 2) = 'Hello'",
+          R"(SELECT "column" FROM "test"."table")");
 }
 
 TEST(TransformQueryForExternalDatabase, MultipleAndSubqueries)
 {
     const State & state = State::instance();
 
-    check("SELECT column FROM test.table WHERE 1 = 1 AND toString(column) = '42' AND column = 42 AND left(column, 10) = RIGHT(column, 10) AND column IN (1, 42) AND SUBSTRING(column FROM 1 FOR 2) = 'Hello' AND column != 4",
-          R"(SELECT "column" FROM "test"."table" WHERE 1 AND ("column" = 42) AND ("column" IN (1, 42)) AND ("column" != 4))",
-          state.context, state.columns);
-    check("SELECT column FROM test.table WHERE toString(column) = '42' AND left(column, 10) = RIGHT(column, 10) AND column = 42",
-          R"(SELECT "column" FROM "test"."table" WHERE ("column" = 42))",
-          state.context, state.columns);
+    check(state, 1,
+          "SELECT column FROM test.table WHERE 1 = 1 AND toString(column) = '42' AND column = 42 AND left(column, 10) = RIGHT(column, 10) AND column IN (1, 42) AND SUBSTRING(column FROM 1 FOR 2) = 'Hello' AND column != 4",
+          R"(SELECT "column" FROM "test"."table" WHERE 1 AND ("column" = 42) AND ("column" IN (1, 42)) AND ("column" != 4))");
+    check(state, 1,
+          "SELECT column FROM test.table WHERE toString(column) = '42' AND left(column, 10) = RIGHT(column, 10) AND column = 42",
+          R"(SELECT "column" FROM "test"."table" WHERE ("column" = 42))");
 }
 
 TEST(TransformQueryForExternalDatabase, Issue7245)
 {
     const State & state = State::instance();
 
-    check("select apply_id from test.table where apply_type = 2 and create_time > addDays(toDateTime('2019-01-01 01:02:03'),-7) and apply_status in (3,4)",
-          R"(SELECT "apply_id", "apply_type", "apply_status", "create_time" FROM "test"."table" WHERE ("apply_type" = 2) AND ("create_time" > '2018-12-25 01:02:03') AND ("apply_status" IN (3, 4)))",
-          state.context, state.columns);
+    check(state, 1,
+          "SELECT apply_id FROM test.table WHERE apply_type = 2 AND create_time > addDays(toDateTime('2019-01-01 01:02:03'),-7) AND apply_status IN (3,4)",
+          R"(SELECT "apply_id", "apply_type", "apply_status", "create_time" FROM "test"."table" WHERE ("apply_type" = 2) AND ("create_time" > '2018-12-25 01:02:03') AND ("apply_status" IN (3, 4)))");
 }
 
 TEST(TransformQueryForExternalDatabase, Aliases)
 {
     const State & state = State::instance();
 
-    check("SELECT field AS value, field AS display WHERE field NOT IN ('') AND display LIKE '%test%'",
-          R"(SELECT "field" FROM "test"."table" WHERE ("field" NOT IN ('')) AND ("field" LIKE '%test%'))",
-          state.context, state.columns);
+    check(state, 1,
+          "SELECT field AS value, field AS display WHERE field NOT IN ('') AND display LIKE '%test%'",
+          R"(SELECT "field" FROM "test"."table" WHERE ("field" NOT IN ('')) AND ("field" LIKE '%test%'))");
+}
+
+TEST(TransformQueryForExternalDatabase, ForeignColumnInWhere)
+{
+    const State & state = State::instance();
+
+    check(state, 2,
+          "SELECT column FROM test.table "
+          "JOIN test.table2 AS table2 ON (test.table.apply_id = table2.num) "
+          "WHERE column > 2 AND (apply_id = 1 OR table2.num = 1) AND table2.attr != ''",
+          R"(SELECT "column", "apply_id" FROM "test"."table" WHERE ("column" > 2) AND ("apply_id" = 1))");
 }
diff --git a/src/Storages/tests/part_name.cpp b/src/Storages/tests/part_name.cpp
deleted file mode 100644
index 79c5578a8ca..00000000000
--- a/src/Storages/tests/part_name.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <IO/ReadHelpers.h>
-#include <Storages/MergeTree/MergeTreePartInfo.h>
-#include <common/LocalDateTime.h>
-
-
-int main(int, char **)
-{
-    DayNum today = DateLUT::instance().toDayNum(time(nullptr));
-
-    for (DayNum date = today; DayNum(date + 10) > today; --date)
-    {
-        DB::MergeTreePartInfo part_info("partition", 0, 0, 0);
-        std::string name = part_info.getPartNameV0(date, date);
-        std::cerr << name << '\n';
-
-        time_t time = DateLUT::instance().YYYYMMDDToDate(DB::parse<UInt32>(name));
-        std::cerr << LocalDateTime(time) << '\n';
-    }
-
-    return 0;
-}
diff --git a/src/Storages/transformQueryForExternalDatabase.cpp b/src/Storages/transformQueryForExternalDatabase.cpp
index 42daf8cfc26..b3fe788d874 100644
--- a/src/Storages/transformQueryForExternalDatabase.cpp
+++ b/src/Storages/transformQueryForExternalDatabase.cpp
@@ -63,7 +63,7 @@ public:
                 const IColumn & inner_column = assert_cast<const ColumnConst &>(*result.column).getDataColumn();
 
                 WriteBufferFromOwnString out;
-                result.type->serializeAsText(inner_column, 0, out, FormatSettings());
+                result.type->getDefaultSerialization()->serializeText(inner_column, 0, out, FormatSettings());
                 node = std::make_shared<ASTLiteral>(out.str());
             }
         }
@@ -88,7 +88,7 @@ public:
     }
 };
 
-void replaceConstantExpressions(ASTPtr & node, const Context & context, const NamesAndTypesList & all_columns)
+void replaceConstantExpressions(ASTPtr & node, ContextPtr context, const NamesAndTypesList & all_columns)
 {
     auto syntax_result = TreeRewriter(context).analyze(node, all_columns);
     Block block_with_constants = KeyCondition::getBlockWithConstants(node, syntax_result, context);
@@ -160,8 +160,78 @@ bool isCompatible(const IAST & node)
     return node.as<ASTIdentifier>();
 }
 
+bool removeUnknownSubexpressions(ASTPtr & node, const NameSet & known_names);
+
+void removeUnknownChildren(ASTs & children, const NameSet & known_names)
+{
+
+    ASTs new_children;
+    for (auto & child : children)
+    {
+        bool leave_child = removeUnknownSubexpressions(child, known_names);
+        if (leave_child)
+            new_children.push_back(child);
+    }
+    children = std::move(new_children);
 }
 
+/// return `true` if we should leave node in tree
+bool removeUnknownSubexpressions(ASTPtr & node, const NameSet & known_names)
+{
+    if (const auto * ident = node->as<ASTIdentifier>())
+        return known_names.contains(ident->name());
+
+    if (node->as<ASTLiteral>() != nullptr)
+        return true;
+
+    auto * func = node->as<ASTFunction>();
+    if (func && (func->name == "and" || func->name == "or"))
+    {
+        removeUnknownChildren(func->arguments->children, known_names);
+        /// all children removed, current node can be removed too
+        if (func->arguments->children.size() == 1)
+        {
+            /// if only one child left, pull it on top level
+            node = func->arguments->children[0];
+            return true;
+        }
+        return !func->arguments->children.empty();
+    }
+
+    bool leave_child = true;
+    for (auto & child : node->children)
+    {
+        leave_child = leave_child && removeUnknownSubexpressions(child, known_names);
+        if (!leave_child)
+            break;
+    }
+    return leave_child;
+}
+
+// When a query references an external table such as table from MySQL database,
+// the corresponding table storage has to execute the relevant part of the query. We
+// send the query to the storage as AST. Before that, we have to remove the conditions
+// that reference other tables from `WHERE`, so that the external engine is not confused
+// by the unknown columns.
+bool removeUnknownSubexpressionsFromWhere(ASTPtr & node, const NamesAndTypesList & available_columns)
+{
+    if (!node)
+        return false;
+
+    NameSet known_names;
+    for (const auto & col : available_columns)
+        known_names.insert(col.name);
+
+    if (auto * expr_list = node->as<ASTExpressionList>(); expr_list && !expr_list->children.empty())
+    {
+        /// traverse expression list on top level
+        removeUnknownChildren(expr_list->children, known_names);
+        return !expr_list->children.empty();
+    }
+    return removeUnknownSubexpressions(node, known_names);
+}
+
+}
 
 String transformQueryForExternalDatabase(
     const SelectQueryInfo & query_info,
@@ -169,7 +239,7 @@ String transformQueryForExternalDatabase(
     IdentifierQuotingStyle identifier_quoting_style,
     const String & database,
     const String & table,
-    const Context & context)
+    ContextPtr context)
 {
     auto clone_query = query_info.query->clone();
     const Names used_columns = query_info.syntax_analyzer_result->requiredSourceColumns();
@@ -191,7 +261,8 @@ String transformQueryForExternalDatabase(
       */
 
     ASTPtr original_where = clone_query->as<ASTSelectQuery &>().where();
-    if (original_where)
+    bool where_has_known_columns = removeUnknownSubexpressionsFromWhere(original_where, available_columns);
+    if (original_where && where_has_known_columns)
     {
         replaceConstantExpressions(original_where, context, available_columns);
 
diff --git a/src/Storages/transformQueryForExternalDatabase.h b/src/Storages/transformQueryForExternalDatabase.h
index c760c628970..215afab8b30 100644
--- a/src/Storages/transformQueryForExternalDatabase.h
+++ b/src/Storages/transformQueryForExternalDatabase.h
@@ -4,13 +4,13 @@
 #include <Core/NamesAndTypes.h>
 #include <Parsers/IdentifierQuotingStyle.h>
 #include <Storages/SelectQueryInfo.h>
+#include <Interpreters/Context_fwd.h>
 
 
 namespace DB
 {
 
 class IAST;
-class Context;
 
 /** For given ClickHouse query,
   * creates another query in a form of
@@ -29,6 +29,6 @@ String transformQueryForExternalDatabase(
     IdentifierQuotingStyle identifier_quoting_style,
     const String & database,
     const String & table,
-    const Context & context);
+    ContextPtr context);
 
 }
diff --git a/src/Storages/ya.make b/src/Storages/ya.make
index e3e1807c566..ba294b05857 100644
--- a/src/Storages/ya.make
+++ b/src/Storages/ya.make
@@ -57,6 +57,7 @@ SRCS(
     MergeTree/MergeTreeDataPartWriterWide.cpp
     MergeTree/MergeTreeDataSelectExecutor.cpp
     MergeTree/MergeTreeDataWriter.cpp
+    MergeTree/MergeTreeDeduplicationLog.cpp
     MergeTree/MergeTreeIndexAggregatorBloomFilter.cpp
     MergeTree/MergeTreeIndexBloomFilter.cpp
     MergeTree/MergeTreeIndexConditionBloomFilter.cpp
@@ -117,6 +118,7 @@ SRCS(
     StorageBuffer.cpp
     StorageDictionary.cpp
     StorageDistributed.cpp
+    StorageExternalDistributed.cpp
     StorageFactory.cpp
     StorageFile.cpp
     StorageGenerateRandom.cpp
diff --git a/src/TableFunctions/ITableFunction.cpp b/src/TableFunctions/ITableFunction.cpp
index 804a5b232ec..218d86fe4a2 100644
--- a/src/TableFunctions/ITableFunction.cpp
+++ b/src/TableFunctions/ITableFunction.cpp
@@ -14,18 +14,26 @@ namespace ProfileEvents
 namespace DB
 {
 
-StoragePtr ITableFunction::execute(const ASTPtr & ast_function, const Context & context, const std::string & table_name,
+StoragePtr ITableFunction::execute(const ASTPtr & ast_function, ContextPtr context, const std::string & table_name,
                                    ColumnsDescription cached_columns) const
 {
     ProfileEvents::increment(ProfileEvents::TableFunctionExecute);
-    context.checkAccess(AccessType::CREATE_TEMPORARY_TABLE | StorageFactory::instance().getSourceAccessType(getStorageTypeName()));
+    context->checkAccess(AccessType::CREATE_TEMPORARY_TABLE | StorageFactory::instance().getSourceAccessType(getStorageTypeName()));
 
-    if (cached_columns.empty() || (hasStaticStructure() && cached_columns == getActualTableStructure(context)))
+    if (cached_columns.empty())
         return executeImpl(ast_function, context, table_name, std::move(cached_columns));
 
-    auto get_storage = [=, tf = shared_from_this()]() -> StoragePtr
+    /// We have table structure, so it's CREATE AS table_function().
+    /// We should use global context here because there will be no query context on server startup
+    /// and because storage lifetime is bigger than query context lifetime.
+    auto global_context = context->getGlobalContext();
+    if (hasStaticStructure() && cached_columns == getActualTableStructure(context))
+        return executeImpl(ast_function, global_context, table_name, std::move(cached_columns));
+
+    auto this_table_function = shared_from_this();
+    auto get_storage = [=]() -> StoragePtr
     {
-        return tf->executeImpl(ast_function, context, table_name, cached_columns);
+        return this_table_function->executeImpl(ast_function, global_context, table_name, cached_columns);
     };
 
     /// It will request actual table structure and create underlying storage lazily
diff --git a/src/TableFunctions/ITableFunction.h b/src/TableFunctions/ITableFunction.h
index 4a73adbdf80..56147ffd598 100644
--- a/src/TableFunctions/ITableFunction.h
+++ b/src/TableFunctions/ITableFunction.h
@@ -47,18 +47,20 @@ public:
     /// Returns false if storage returned by table function supports type conversion (e.g. StorageDistributed)
     virtual bool needStructureConversion() const { return true; }
 
-    virtual void parseArguments(const ASTPtr & /*ast_function*/, const Context & /*context*/) {}
+    virtual void parseArguments(const ASTPtr & /*ast_function*/, ContextPtr /*context*/) {}
 
     /// Returns actual table structure probably requested from remote server, may fail
-    virtual ColumnsDescription getActualTableStructure(const Context & /*context*/) const = 0;
+    virtual ColumnsDescription getActualTableStructure(ContextPtr /*context*/) const = 0;
 
     /// Create storage according to the query.
-    StoragePtr execute(const ASTPtr & ast_function, const Context & context, const std::string & table_name, ColumnsDescription cached_columns_ = {}) const;
+    StoragePtr
+    execute(const ASTPtr & ast_function, ContextPtr context, const std::string & table_name, ColumnsDescription cached_columns_ = {}) const;
 
-    virtual ~ITableFunction() {}
+    virtual ~ITableFunction() = default;
 
 private:
-    virtual StoragePtr executeImpl(const ASTPtr & ast_function, const Context & context, const std::string & table_name, ColumnsDescription cached_columns) const = 0;
+    virtual StoragePtr executeImpl(
+        const ASTPtr & ast_function, ContextPtr context, const std::string & table_name, ColumnsDescription cached_columns) const = 0;
     virtual const char * getStorageTypeName() const = 0;
 };
 
diff --git a/src/TableFunctions/ITableFunctionFileLike.cpp b/src/TableFunctions/ITableFunctionFileLike.cpp
index 1349c166474..44a917a0f00 100644
--- a/src/TableFunctions/ITableFunctionFileLike.cpp
+++ b/src/TableFunctions/ITableFunctionFileLike.cpp
@@ -26,7 +26,7 @@ namespace ErrorCodes
     extern const int BAD_ARGUMENTS;
 }
 
-void ITableFunctionFileLike::parseArguments(const ASTPtr & ast_function, const Context & context)
+void ITableFunctionFileLike::parseArguments(const ASTPtr & ast_function, ContextPtr context)
 {
     /// Parse args
     ASTs & args_func = ast_function->children;
@@ -64,20 +64,20 @@ void ITableFunctionFileLike::parseArguments(const ASTPtr & ast_function, const C
         compression_method = args[3]->as<ASTLiteral &>().value.safeGet<String>();
 }
 
-StoragePtr ITableFunctionFileLike::executeImpl(const ASTPtr & /*ast_function*/, const Context & context, const std::string & table_name, ColumnsDescription /*cached_columns*/) const
+StoragePtr ITableFunctionFileLike::executeImpl(const ASTPtr & /*ast_function*/, ContextPtr context, const std::string & table_name, ColumnsDescription /*cached_columns*/) const
 {
     auto columns = getActualTableStructure(context);
-    StoragePtr storage = getStorage(filename, format, columns, const_cast<Context &>(context), table_name, compression_method);
+    StoragePtr storage = getStorage(filename, format, columns, context, table_name, compression_method);
     storage->startup();
     return storage;
 }
 
-ColumnsDescription ITableFunctionFileLike::getActualTableStructure(const Context & context) const
+ColumnsDescription ITableFunctionFileLike::getActualTableStructure(ContextPtr context) const
 {
     if (structure.empty())
     {
         assert(getName() == "file" && format == "Distributed");
-        Strings paths = StorageFile::getPathsList(filename, context.getUserFilesPath(), context);
+        Strings paths = StorageFile::getPathsList(filename, context->getUserFilesPath(), context);
         if (paths.empty())
             throw Exception("Cannot get table structure from file, because no files match specified name", ErrorCodes::INCORRECT_FILE_NAME);
         auto read_stream = StorageDistributedDirectoryMonitor::createStreamFromFile(paths[0]);
diff --git a/src/TableFunctions/ITableFunctionFileLike.h b/src/TableFunctions/ITableFunctionFileLike.h
index f1c648ac0aa..7c96ce610b3 100644
--- a/src/TableFunctions/ITableFunctionFileLike.h
+++ b/src/TableFunctions/ITableFunctionFileLike.h
@@ -13,15 +13,15 @@ class Context;
 class ITableFunctionFileLike : public ITableFunction
 {
 private:
-    StoragePtr executeImpl(const ASTPtr & ast_function, const Context & context, const std::string & table_name, ColumnsDescription cached_columns) const override;
+    StoragePtr executeImpl(const ASTPtr & ast_function, ContextPtr context, const std::string & table_name, ColumnsDescription cached_columns) const override;
 
     virtual StoragePtr getStorage(
-        const String & source, const String & format, const ColumnsDescription & columns, Context & global_context,
+        const String & source, const String & format, const ColumnsDescription & columns, ContextPtr global_context,
         const std::string & table_name, const String & compression_method) const = 0;
 
-    ColumnsDescription getActualTableStructure(const Context & context) const override;
+    ColumnsDescription getActualTableStructure(ContextPtr context) const override;
 
-    void parseArguments(const ASTPtr & ast_function, const Context & context) override;
+    void parseArguments(const ASTPtr & ast_function, ContextPtr context) override;
 
     bool hasStaticStructure() const override { return true; }
 
diff --git a/src/TableFunctions/ITableFunctionXDBC.cpp b/src/TableFunctions/ITableFunctionXDBC.cpp
index e04a86b5abf..51431a1e3a6 100644
--- a/src/TableFunctions/ITableFunctionXDBC.cpp
+++ b/src/TableFunctions/ITableFunctionXDBC.cpp
@@ -28,7 +28,7 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
-void ITableFunctionXDBC::parseArguments(const ASTPtr & ast_function, const Context & context)
+void ITableFunctionXDBC::parseArguments(const ASTPtr & ast_function, ContextPtr context)
 {
     const auto & args_func = ast_function->as<ASTFunction &>();
 
@@ -55,15 +55,21 @@ void ITableFunctionXDBC::parseArguments(const ASTPtr & ast_function, const Conte
         connection_string = args[0]->as<ASTLiteral &>().value.safeGet<String>();
         remote_table_name = args[1]->as<ASTLiteral &>().value.safeGet<String>();
     }
-
-    /// Have to const_cast, because bridges store their commands inside context
-    helper = createBridgeHelper(const_cast<Context &>(context), context.getSettingsRef().http_receive_timeout.value, connection_string);
-    helper->startBridgeSync();
 }
 
-ColumnsDescription ITableFunctionXDBC::getActualTableStructure(const Context & context) const
+void ITableFunctionXDBC::startBridgeIfNot(ContextPtr context) const
 {
-    assert(helper);
+    if (!helper)
+    {
+        /// Have to const_cast, because bridges store their commands inside context
+        helper = createBridgeHelper(context, context->getSettingsRef().http_receive_timeout.value, connection_string);
+        helper->startBridgeSync();
+    }
+}
+
+ColumnsDescription ITableFunctionXDBC::getActualTableStructure(ContextPtr context) const
+{
+    startBridgeIfNot(context);
 
     /* Infer external table structure */
     Poco::URI columns_info_uri = helper->getColumnsInfoURI();
@@ -72,7 +78,7 @@ ColumnsDescription ITableFunctionXDBC::getActualTableStructure(const Context & c
         columns_info_uri.addQueryParameter("schema", schema_name);
     columns_info_uri.addQueryParameter("table", remote_table_name);
 
-    const auto use_nulls = context.getSettingsRef().external_table_functions_use_nulls;
+    const auto use_nulls = context->getSettingsRef().external_table_functions_use_nulls;
     columns_info_uri.addQueryParameter("external_table_functions_use_nulls",
                                        Poco::NumberFormatter::format(use_nulls));
 
@@ -85,9 +91,9 @@ ColumnsDescription ITableFunctionXDBC::getActualTableStructure(const Context & c
     return ColumnsDescription{columns};
 }
 
-StoragePtr ITableFunctionXDBC::executeImpl(const ASTPtr & /*ast_function*/, const Context & context, const std::string & table_name, ColumnsDescription /*cached_columns*/) const
+StoragePtr ITableFunctionXDBC::executeImpl(const ASTPtr & /*ast_function*/, ContextPtr context, const std::string & table_name, ColumnsDescription /*cached_columns*/) const
 {
-    assert(helper);
+    startBridgeIfNot(context);
     auto columns = getActualTableStructure(context);
     auto result = std::make_shared<StorageXDBC>(StorageID(getDatabaseName(), table_name), schema_name, remote_table_name, columns, context, helper);
     result->startup();
diff --git a/src/TableFunctions/ITableFunctionXDBC.h b/src/TableFunctions/ITableFunctionXDBC.h
index fb0a0fd1185..a58d574513f 100644
--- a/src/TableFunctions/ITableFunctionXDBC.h
+++ b/src/TableFunctions/ITableFunctionXDBC.h
@@ -3,7 +3,7 @@
 #include <Storages/StorageXDBC.h>
 #include <TableFunctions/ITableFunction.h>
 #include <Poco/Util/AbstractConfiguration.h>
-#include <Common/XDBCBridgeHelper.h>
+#include <Bridge/XDBCBridgeHelper.h>
 
 #if !defined(ARCADIA_BUILD)
 #    include <Common/config.h>
@@ -18,21 +18,23 @@ namespace DB
 class ITableFunctionXDBC : public ITableFunction
 {
 private:
-    StoragePtr executeImpl(const ASTPtr & ast_function, const Context & context, const std::string & table_name, ColumnsDescription cached_columns) const override;
+    StoragePtr executeImpl(const ASTPtr & ast_function, ContextPtr context, const std::string & table_name, ColumnsDescription cached_columns) const override;
 
     /* A factory method to create bridge helper, that will assist in remote interaction */
-    virtual BridgeHelperPtr createBridgeHelper(Context & context,
+    virtual BridgeHelperPtr createBridgeHelper(ContextPtr context,
         const Poco::Timespan & http_timeout_,
         const std::string & connection_string_) const = 0;
 
-    ColumnsDescription getActualTableStructure(const Context & context) const override;
+    ColumnsDescription getActualTableStructure(ContextPtr context) const override;
 
-    void parseArguments(const ASTPtr & ast_function, const Context & context) override;
+    void parseArguments(const ASTPtr & ast_function, ContextPtr context) override;
+
+    void startBridgeIfNot(ContextPtr context) const;
 
     String connection_string;
     String schema_name;
     String remote_table_name;
-    BridgeHelperPtr helper;
+    mutable BridgeHelperPtr helper;
 };
 
 class TableFunctionJDBC : public ITableFunctionXDBC
@@ -45,7 +47,7 @@ public:
     }
 
 private:
-    BridgeHelperPtr createBridgeHelper(Context & context,
+    BridgeHelperPtr createBridgeHelper(ContextPtr context,
         const Poco::Timespan & http_timeout_,
         const std::string & connection_string_) const override
     {
@@ -65,7 +67,7 @@ public:
     }
 
 private:
-    BridgeHelperPtr createBridgeHelper(Context & context,
+    BridgeHelperPtr createBridgeHelper(ContextPtr context,
         const Poco::Timespan & http_timeout_,
         const std::string & connection_string_) const override
     {
diff --git a/src/TableFunctions/TableFunctionDictionary.cpp b/src/TableFunctions/TableFunctionDictionary.cpp
new file mode 100644
index 00000000000..46d3183bba9
--- /dev/null
+++ b/src/TableFunctions/TableFunctionDictionary.cpp
@@ -0,0 +1,63 @@
+#include <TableFunctions/TableFunctionDictionary.h>
+
+#include <Parsers/ASTLiteral.h>
+
+#include <Interpreters/Context.h>
+#include <Interpreters/ExternalDictionariesLoader.h>
+#include <Interpreters/evaluateConstantExpression.h>
+
+#include <Storages/StorageDictionary.h>
+
+#include <TableFunctions/TableFunctionFactory.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+}
+
+void TableFunctionDictionary::parseArguments(const ASTPtr & ast_function, ContextPtr context)
+{
+    // Parse args
+    ASTs & args_func = ast_function->children;
+
+    if (args_func.size() != 1)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Table function ({}) must have arguments.", quoteString(getName()));
+
+    ASTs & args = args_func.at(0)->children;
+
+    if (args.size() != 1)
+        throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Table function ({}) requires 1 arguments", quoteString(getName()));
+
+    for (auto & arg : args)
+        arg = evaluateConstantExpressionOrIdentifierAsLiteral(arg, context);
+
+    dictionary_name = args[0]->as<ASTLiteral &>().value.safeGet<String>();
+}
+
+ColumnsDescription TableFunctionDictionary::getActualTableStructure(ContextPtr context) const
+{
+    const ExternalDictionariesLoader & external_loader = context->getExternalDictionariesLoader();
+    auto dictionary_structure = external_loader.getDictionaryStructure(dictionary_name, context);
+    auto result = ColumnsDescription(StorageDictionary::getNamesAndTypes(dictionary_structure));
+
+    return result;
+}
+
+StoragePtr TableFunctionDictionary::executeImpl(
+    const ASTPtr &, ContextPtr context, const std::string & table_name, ColumnsDescription) const
+{
+    StorageID dict_id(getDatabaseName(), table_name);
+    auto dictionary_table_structure = getActualTableStructure(context);
+    return StorageDictionary::create(dict_id, dictionary_name, std::move(dictionary_table_structure), StorageDictionary::Location::Custom);
+}
+
+void registerTableFunctionDictionary(TableFunctionFactory & factory)
+{
+    factory.registerFunction<TableFunctionDictionary>();
+}
+
+}
diff --git a/src/TableFunctions/TableFunctionDictionary.h b/src/TableFunctions/TableFunctionDictionary.h
new file mode 100644
index 00000000000..aed435bebfd
--- /dev/null
+++ b/src/TableFunctions/TableFunctionDictionary.h
@@ -0,0 +1,34 @@
+#pragma once
+
+#include <TableFunctions/ITableFunction.h>
+
+namespace DB
+{
+class Context;
+
+/* file(path, format, structure) - creates a temporary storage from file
+ *
+ * The file must be in the clickhouse data directory.
+ * The relative path begins with the clickhouse data directory.
+ */
+class TableFunctionDictionary final : public ITableFunction
+{
+public:
+    static constexpr auto name = "dictionary";
+    std::string getName() const override
+    {
+        return name;
+    }
+
+    void parseArguments(const ASTPtr & ast_function, ContextPtr context) override;
+
+    ColumnsDescription getActualTableStructure(ContextPtr context) const override;
+
+    StoragePtr executeImpl(const ASTPtr & ast_function, ContextPtr context, const std::string & table_name, ColumnsDescription) const override;
+
+    const char * getStorageTypeName() const override { return "Dictionary"; }
+
+private:
+    String dictionary_name;
+    ColumnsDescription dictionary_columns;
+};}
diff --git a/src/TableFunctions/TableFunctionFactory.cpp b/src/TableFunctions/TableFunctionFactory.cpp
index e8f844e8074..15e61354f6d 100644
--- a/src/TableFunctions/TableFunctionFactory.cpp
+++ b/src/TableFunctions/TableFunctionFactory.cpp
@@ -31,7 +31,7 @@ void TableFunctionFactory::registerFunction(const std::string & name, Value crea
 
 TableFunctionPtr TableFunctionFactory::get(
     const ASTPtr & ast_function,
-    const Context & context) const
+    ContextPtr context) const
 {
     const auto * table_function = ast_function->as<ASTFunction>();
     auto res = tryGet(table_function->name, context);
@@ -50,7 +50,7 @@ TableFunctionPtr TableFunctionFactory::get(
 
 TableFunctionPtr TableFunctionFactory::tryGet(
         const std::string & name_param,
-        const Context &) const
+        ContextPtr) const
 {
     String name = getAliasToOrName(name_param);
     TableFunctionPtr res;
@@ -70,7 +70,7 @@ TableFunctionPtr TableFunctionFactory::tryGet(
 
     if (CurrentThread::isInitialized())
     {
-        const auto * query_context = CurrentThread::get().getQueryContext();
+        auto query_context = CurrentThread::get().getQueryContext();
         if (query_context && query_context->getSettingsRef().log_queries)
             query_context->addQueryFactoriesInfo(Context::QueryLogFactories::TableFunction, name);
     }
diff --git a/src/TableFunctions/TableFunctionFactory.h b/src/TableFunctions/TableFunctionFactory.h
index 820b5eb1c7b..59b4ffb9fd5 100644
--- a/src/TableFunctions/TableFunctionFactory.h
+++ b/src/TableFunctions/TableFunctionFactory.h
@@ -41,10 +41,10 @@ public:
     }
 
     /// Throws an exception if not found.
-    TableFunctionPtr get(const ASTPtr & ast_function, const Context & context) const;
+    TableFunctionPtr get(const ASTPtr & ast_function, ContextPtr context) const;
 
     /// Returns nullptr if not found.
-    TableFunctionPtr tryGet(const std::string & name, const Context & context) const;
+    TableFunctionPtr tryGet(const std::string & name, ContextPtr context) const;
 
     bool isTableFunctionName(const std::string & name) const;
 
diff --git a/src/TableFunctions/TableFunctionFile.cpp b/src/TableFunctions/TableFunctionFile.cpp
index 13ac6dc2145..6ecb5606d56 100644
--- a/src/TableFunctions/TableFunctionFile.cpp
+++ b/src/TableFunctions/TableFunctionFile.cpp
@@ -12,20 +12,23 @@ namespace DB
 {
 StoragePtr TableFunctionFile::getStorage(const String & source,
     const String & format_, const ColumnsDescription & columns,
-    Context & global_context, const std::string & table_name,
+    ContextPtr global_context, const std::string & table_name,
     const std::string & compression_method_) const
 {
     // For `file` table function, we are going to use format settings from the
     // query context.
-    StorageFile::CommonArguments args{StorageID(getDatabaseName(), table_name),
+    StorageFile::CommonArguments args
+    {
+        WithContext(global_context),
+        StorageID(getDatabaseName(), table_name),
         format_,
         std::nullopt /*format settings*/,
         compression_method_,
         columns,
         ConstraintsDescription{},
-        global_context};
+    };
 
-    return StorageFile::create(source, global_context.getUserFilesPath(), args);
+    return StorageFile::create(source, global_context->getUserFilesPath(), args);
 }
 
 void registerTableFunctionFile(TableFunctionFactory & factory)
diff --git a/src/TableFunctions/TableFunctionFile.h b/src/TableFunctions/TableFunctionFile.h
index 02704e4bf7f..460656a7218 100644
--- a/src/TableFunctions/TableFunctionFile.h
+++ b/src/TableFunctions/TableFunctionFile.h
@@ -5,7 +5,6 @@
 
 namespace DB
 {
-class Context;
 
 /* file(path, format, structure) - creates a temporary storage from file
  *
@@ -23,7 +22,7 @@ public:
 
 private:
     StoragePtr getStorage(
-        const String & source, const String & format_, const ColumnsDescription & columns, Context & global_context,
+        const String & source, const String & format_, const ColumnsDescription & columns, ContextPtr global_context,
         const std::string & table_name, const std::string & compression_method_) const override;
     const char * getStorageTypeName() const override { return "File"; }
 };}
diff --git a/src/TableFunctions/TableFunctionGenerateRandom.cpp b/src/TableFunctions/TableFunctionGenerateRandom.cpp
index 15c2c2bfa1f..b19be7bd7a3 100644
--- a/src/TableFunctions/TableFunctionGenerateRandom.cpp
+++ b/src/TableFunctions/TableFunctionGenerateRandom.cpp
@@ -26,7 +26,7 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
-void TableFunctionGenerateRandom::parseArguments(const ASTPtr & ast_function, const Context & /*context*/)
+void TableFunctionGenerateRandom::parseArguments(const ASTPtr & ast_function, ContextPtr /*context*/)
 {
     ASTs & args_func = ast_function->children;
 
@@ -74,12 +74,12 @@ void TableFunctionGenerateRandom::parseArguments(const ASTPtr & ast_function, co
         max_array_length = args[3]->as<const ASTLiteral &>().value.safeGet<UInt64>();
 }
 
-ColumnsDescription TableFunctionGenerateRandom::getActualTableStructure(const Context & context) const
+ColumnsDescription TableFunctionGenerateRandom::getActualTableStructure(ContextPtr context) const
 {
     return parseColumnsListFromString(structure, context);
 }
 
-StoragePtr TableFunctionGenerateRandom::executeImpl(const ASTPtr & /*ast_function*/, const Context & context, const std::string & table_name, ColumnsDescription /*cached_columns*/) const
+StoragePtr TableFunctionGenerateRandom::executeImpl(const ASTPtr & /*ast_function*/, ContextPtr context, const std::string & table_name, ColumnsDescription /*cached_columns*/) const
 {
     auto columns = getActualTableStructure(context);
     auto res = StorageGenerateRandom::create(StorageID(getDatabaseName(), table_name), columns, max_array_length, max_string_length, random_seed);
diff --git a/src/TableFunctions/TableFunctionGenerateRandom.h b/src/TableFunctions/TableFunctionGenerateRandom.h
index 1d8839ba6d4..bcad11156be 100644
--- a/src/TableFunctions/TableFunctionGenerateRandom.h
+++ b/src/TableFunctions/TableFunctionGenerateRandom.h
@@ -15,11 +15,11 @@ public:
     std::string getName() const override { return name; }
     bool hasStaticStructure() const override { return true; }
 private:
-    StoragePtr executeImpl(const ASTPtr & ast_function, const Context & context, const std::string & table_name, ColumnsDescription cached_columns) const override;
+    StoragePtr executeImpl(const ASTPtr & ast_function, ContextPtr context, const std::string & table_name, ColumnsDescription cached_columns) const override;
     const char * getStorageTypeName() const override { return "GenerateRandom"; }
 
-    ColumnsDescription getActualTableStructure(const Context & context) const override;
-    void parseArguments(const ASTPtr & ast_function, const Context & context) override;
+    ColumnsDescription getActualTableStructure(ContextPtr context) const override;
+    void parseArguments(const ASTPtr & ast_function, ContextPtr context) override;
 
     String structure;
     UInt64 max_string_length = 10;
diff --git a/src/TableFunctions/TableFunctionHDFS.cpp b/src/TableFunctions/TableFunctionHDFS.cpp
index 700cb93ca06..714c6ea1f59 100644
--- a/src/TableFunctions/TableFunctionHDFS.cpp
+++ b/src/TableFunctions/TableFunctionHDFS.cpp
@@ -10,7 +10,7 @@
 namespace DB
 {
 StoragePtr TableFunctionHDFS::getStorage(
-    const String & source, const String & format_, const ColumnsDescription & columns, Context & global_context,
+    const String & source, const String & format_, const ColumnsDescription & columns, ContextPtr global_context,
     const std::string & table_name, const String & compression_method_) const
 {
     return StorageHDFS::create(
diff --git a/src/TableFunctions/TableFunctionHDFS.h b/src/TableFunctions/TableFunctionHDFS.h
index 47e040f7593..d9ee9b47868 100644
--- a/src/TableFunctions/TableFunctionHDFS.h
+++ b/src/TableFunctions/TableFunctionHDFS.h
@@ -26,7 +26,7 @@ public:
 
 private:
     StoragePtr getStorage(
-        const String & source, const String & format_, const ColumnsDescription & columns, Context & global_context,
+        const String & source, const String & format_, const ColumnsDescription & columns, ContextPtr global_context,
         const std::string & table_name, const String & compression_method_) const override;
     const char * getStorageTypeName() const override { return "HDFS"; }
 };
diff --git a/src/TableFunctions/TableFunctionInput.cpp b/src/TableFunctions/TableFunctionInput.cpp
index 41c41835434..677a6ff3ce4 100644
--- a/src/TableFunctions/TableFunctionInput.cpp
+++ b/src/TableFunctions/TableFunctionInput.cpp
@@ -22,7 +22,7 @@ namespace ErrorCodes
     extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
 }
 
-void TableFunctionInput::parseArguments(const ASTPtr & ast_function, const Context & context)
+void TableFunctionInput::parseArguments(const ASTPtr & ast_function, ContextPtr context)
 {
     const auto * function = ast_function->as<ASTFunction>();
 
@@ -38,12 +38,12 @@ void TableFunctionInput::parseArguments(const ASTPtr & ast_function, const Conte
     structure = evaluateConstantExpressionOrIdentifierAsLiteral(args[0], context)->as<ASTLiteral &>().value.safeGet<String>();
 }
 
-ColumnsDescription TableFunctionInput::getActualTableStructure(const Context & context) const
+ColumnsDescription TableFunctionInput::getActualTableStructure(ContextPtr context) const
 {
     return parseColumnsListFromString(structure, context);
 }
 
-StoragePtr TableFunctionInput::executeImpl(const ASTPtr & /*ast_function*/, const Context & context, const std::string & table_name, ColumnsDescription /*cached_columns*/) const
+StoragePtr TableFunctionInput::executeImpl(const ASTPtr & /*ast_function*/, ContextPtr context, const std::string & table_name, ColumnsDescription /*cached_columns*/) const
 {
     auto storage = StorageInput::create(StorageID(getDatabaseName(), table_name), getActualTableStructure(context));
     storage->startup();
diff --git a/src/TableFunctions/TableFunctionInput.h b/src/TableFunctions/TableFunctionInput.h
index 5809d48a77c..5953693e711 100644
--- a/src/TableFunctions/TableFunctionInput.h
+++ b/src/TableFunctions/TableFunctionInput.h
@@ -18,11 +18,11 @@ public:
     bool hasStaticStructure() const override { return true; }
 
 private:
-    StoragePtr executeImpl(const ASTPtr & ast_function, const Context & context, const std::string & table_name, ColumnsDescription cached_columns) const override;
+    StoragePtr executeImpl(const ASTPtr & ast_function, ContextPtr context, const std::string & table_name, ColumnsDescription cached_columns) const override;
     const char * getStorageTypeName() const override { return "Input"; }
 
-    ColumnsDescription getActualTableStructure(const Context & context) const override;
-    void parseArguments(const ASTPtr & ast_function, const Context & context) override;
+    ColumnsDescription getActualTableStructure(ContextPtr context) const override;
+    void parseArguments(const ASTPtr & ast_function, ContextPtr context) override;
 
     String structure;
 };
diff --git a/src/TableFunctions/TableFunctionMerge.cpp b/src/TableFunctions/TableFunctionMerge.cpp
index c5fb9a7686d..6d10b0d04b6 100644
--- a/src/TableFunctions/TableFunctionMerge.cpp
+++ b/src/TableFunctions/TableFunctionMerge.cpp
@@ -33,7 +33,7 @@ namespace
 }
 
 
-void TableFunctionMerge::parseArguments(const ASTPtr & ast_function, const Context & context)
+void TableFunctionMerge::parseArguments(const ASTPtr & ast_function, ContextPtr context)
 {
     ASTs & args_func = ast_function->children;
 
@@ -57,7 +57,7 @@ void TableFunctionMerge::parseArguments(const ASTPtr & ast_function, const Conte
 }
 
 
-const Strings & TableFunctionMerge::getSourceTables(const Context & context) const
+const Strings & TableFunctionMerge::getSourceTables(ContextPtr context) const
 {
     if (source_tables)
         return *source_tables;
@@ -67,7 +67,7 @@ const Strings & TableFunctionMerge::getSourceTables(const Context & context) con
     OptimizedRegularExpression re(source_table_regexp);
     auto table_name_match = [&](const String & table_name_) { return re.match(table_name_); };
 
-    auto access = context.getAccess();
+    auto access = context->getAccess();
     bool granted_show_on_all_tables = access->isGranted(AccessType::SHOW_TABLES, source_database);
     bool granted_select_on_all_tables = access->isGranted(AccessType::SELECT, source_database);
 
@@ -91,7 +91,7 @@ const Strings & TableFunctionMerge::getSourceTables(const Context & context) con
 }
 
 
-ColumnsDescription TableFunctionMerge::getActualTableStructure(const Context & context) const
+ColumnsDescription TableFunctionMerge::getActualTableStructure(ContextPtr context) const
 {
     for (const auto & table_name : getSourceTables(context))
     {
@@ -104,7 +104,7 @@ ColumnsDescription TableFunctionMerge::getActualTableStructure(const Context & c
 }
 
 
-StoragePtr TableFunctionMerge::executeImpl(const ASTPtr & /*ast_function*/, const Context & context, const std::string & table_name, ColumnsDescription /*cached_columns*/) const
+StoragePtr TableFunctionMerge::executeImpl(const ASTPtr & /*ast_function*/, ContextPtr context, const std::string & table_name, ColumnsDescription /*cached_columns*/) const
 {
     auto res = StorageMerge::create(
         StorageID(getDatabaseName(), table_name),
diff --git a/src/TableFunctions/TableFunctionMerge.h b/src/TableFunctions/TableFunctionMerge.h
index 8f9f4522d17..04027b9d76a 100644
--- a/src/TableFunctions/TableFunctionMerge.h
+++ b/src/TableFunctions/TableFunctionMerge.h
@@ -16,12 +16,12 @@ public:
     static constexpr auto name = "merge";
     std::string getName() const override { return name; }
 private:
-    StoragePtr executeImpl(const ASTPtr & ast_function, const Context & context, const std::string & table_name, ColumnsDescription cached_columns) const override;
+    StoragePtr executeImpl(const ASTPtr & ast_function, ContextPtr context, const std::string & table_name, ColumnsDescription cached_columns) const override;
     const char * getStorageTypeName() const override { return "Merge"; }
 
-    const Strings & getSourceTables(const Context & context) const;
-    ColumnsDescription getActualTableStructure(const Context & context) const override;
-    void parseArguments(const ASTPtr & ast_function, const Context & context) override;
+    const Strings & getSourceTables(ContextPtr context) const;
+    ColumnsDescription getActualTableStructure(ContextPtr context) const override;
+    void parseArguments(const ASTPtr & ast_function, ContextPtr context) override;
 
     String source_database;
     String source_table_regexp;
diff --git a/src/TableFunctions/TableFunctionMySQL.cpp b/src/TableFunctions/TableFunctionMySQL.cpp
index d6a62dc68b4..7d3fca58451 100644
--- a/src/TableFunctions/TableFunctionMySQL.cpp
+++ b/src/TableFunctions/TableFunctionMySQL.cpp
@@ -1,29 +1,30 @@
 #if !defined(ARCADIA_BUILD)
-#    include "config_core.h"
+#include "config_core.h"
 #endif
 
 #if USE_MYSQL
-#    include <Core/Defines.h>
-#    include <Databases/MySQL/FetchTablesColumnsList.h>
-#    include <DataTypes/DataTypeString.h>
-#    include <DataTypes/DataTypesNumber.h>
-#    include <DataTypes/convertMySQLDataType.h>
-#    include <Formats/MySQLBlockInputStream.h>
-#    include <IO/Operators.h>
-#    include <Interpreters/Context.h>
-#    include <Interpreters/evaluateConstantExpression.h>
-#    include <Parsers/ASTFunction.h>
-#    include <Parsers/ASTLiteral.h>
-#    include <Storages/StorageMySQL.h>
-#    include <TableFunctions/ITableFunction.h>
-#    include <TableFunctions/TableFunctionFactory.h>
-#    include <TableFunctions/TableFunctionMySQL.h>
-#    include <Common/Exception.h>
-#    include <Common/parseAddress.h>
-#    include <Common/quoteString.h>
-#    include "registerTableFunctions.h"
+#include <Core/Defines.h>
+#include <Databases/MySQL/FetchTablesColumnsList.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/convertMySQLDataType.h>
+#include <Formats/MySQLBlockInputStream.h>
+#include <IO/Operators.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/evaluateConstantExpression.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTLiteral.h>
+#include <Storages/StorageMySQL.h>
+#include <TableFunctions/ITableFunction.h>
+#include <TableFunctions/TableFunctionFactory.h>
+#include <TableFunctions/TableFunctionMySQL.h>
+#include <Common/Exception.h>
+#include <Common/parseAddress.h>
+#include <Common/quoteString.h>
+#include "registerTableFunctions.h"
 
-#    include <Databases/MySQL/DatabaseConnectionMySQL.h> // for fetchTablesColumnsList
+#include <Databases/MySQL/DatabaseConnectionMySQL.h> // for fetchTablesColumnsList
+#include <Common/parseRemoteDescription.h>
 
 
 namespace DB
@@ -37,7 +38,7 @@ namespace ErrorCodes
     extern const int UNKNOWN_TABLE;
 }
 
-void TableFunctionMySQL::parseArguments(const ASTPtr & ast_function, const Context & context)
+void TableFunctionMySQL::parseArguments(const ASTPtr & ast_function, ContextPtr context)
 {
     const auto & args_func = ast_function->as<ASTFunction &>();
 
@@ -59,6 +60,11 @@ void TableFunctionMySQL::parseArguments(const ASTPtr & ast_function, const Conte
     user_name = args[3]->as<ASTLiteral &>().value.safeGet<String>();
     password = args[4]->as<ASTLiteral &>().value.safeGet<String>();
 
+    /// Split into replicas if needed. 3306 is the default MySQL port number
+    size_t max_addresses = context->getSettingsRef().glob_expansion_max_elements;
+    auto addresses = parseRemoteDescriptionForExternalDatabase(host_port, max_addresses, 3306);
+    pool.emplace(remote_database_name, addresses, user_name, password);
+
     if (args.size() >= 6)
         replace_query = args[5]->as<ASTLiteral &>().value.safeGet<UInt64>() > 0;
     if (args.size() == 7)
@@ -68,33 +74,27 @@ void TableFunctionMySQL::parseArguments(const ASTPtr & ast_function, const Conte
         throw Exception(
             "Only one of 'replace_query' and 'on_duplicate_clause' can be specified, or none of them",
             ErrorCodes::BAD_ARGUMENTS);
-
-    /// 3306 is the default MySQL port number
-    parsed_host_port = parseAddress(host_port, 3306);
 }
 
-ColumnsDescription TableFunctionMySQL::getActualTableStructure(const Context & context) const
+ColumnsDescription TableFunctionMySQL::getActualTableStructure(ContextPtr context) const
 {
-    assert(!parsed_host_port.first.empty());
-    if (!pool)
-        pool.emplace(remote_database_name, parsed_host_port.first, user_name, password, parsed_host_port.second);
-
-    const auto & settings = context.getSettingsRef();
-    const auto tables_and_columns = fetchTablesColumnsList(*pool, remote_database_name, {remote_table_name}, settings.external_table_functions_use_nulls, settings.mysql_datatypes_support_level);
+    const auto & settings = context->getSettingsRef();
+    const auto tables_and_columns = fetchTablesColumnsList(*pool, remote_database_name, {remote_table_name}, settings, settings.mysql_datatypes_support_level);
 
     const auto columns = tables_and_columns.find(remote_table_name);
     if (columns == tables_and_columns.end())
-        throw Exception("MySQL table " + backQuoteIfNeed(remote_database_name) + "." + backQuoteIfNeed(remote_table_name) + " doesn't exist.", ErrorCodes::UNKNOWN_TABLE);
+        throw Exception("MySQL table " + (remote_database_name.empty() ? "" : (backQuote(remote_database_name) + "."))
+            + backQuote(remote_table_name) + " doesn't exist.", ErrorCodes::UNKNOWN_TABLE);
 
     return ColumnsDescription{columns->second};
 }
 
-StoragePtr TableFunctionMySQL::executeImpl(const ASTPtr & /*ast_function*/, const Context & context, const std::string & table_name, ColumnsDescription /*cached_columns*/) const
+StoragePtr TableFunctionMySQL::executeImpl(
+    const ASTPtr & /*ast_function*/,
+    ContextPtr context,
+    const std::string & table_name,
+    ColumnsDescription /*cached_columns*/) const
 {
-    assert(!parsed_host_port.first.empty());
-    if (!pool)
-        pool.emplace(remote_database_name, parsed_host_port.first, user_name, password, parsed_host_port.second);
-
     auto columns = getActualTableStructure(context);
 
     auto res = StorageMySQL::create(
diff --git a/src/TableFunctions/TableFunctionMySQL.h b/src/TableFunctions/TableFunctionMySQL.h
index 1fe5a4aa4ac..64c7d56cf2a 100644
--- a/src/TableFunctions/TableFunctionMySQL.h
+++ b/src/TableFunctions/TableFunctionMySQL.h
@@ -24,13 +24,12 @@ public:
         return name;
     }
 private:
-    StoragePtr executeImpl(const ASTPtr & ast_function, const Context & context, const std::string & table_name, ColumnsDescription cached_columns) const override;
+    StoragePtr executeImpl(const ASTPtr & ast_function, ContextPtr context, const std::string & table_name, ColumnsDescription cached_columns) const override;
     const char * getStorageTypeName() const override { return "MySQL"; }
 
-    ColumnsDescription getActualTableStructure(const Context & context) const override;
-    void parseArguments(const ASTPtr & ast_function, const Context & context) override;
+    ColumnsDescription getActualTableStructure(ContextPtr context) const override;
+    void parseArguments(const ASTPtr & ast_function, ContextPtr context) override;
 
-    std::pair<std::string, UInt16> parsed_host_port;
     String remote_database_name;
     String remote_table_name;
     String user_name;
@@ -38,7 +37,7 @@ private:
     bool replace_query = false;
     String on_duplicate_clause;
 
-    mutable std::optional<mysqlxx::Pool> pool;
+    mutable std::optional<mysqlxx::PoolWithFailover> pool;
 };
 
 }
diff --git a/src/TableFunctions/TableFunctionNull.cpp b/src/TableFunctions/TableFunctionNull.cpp
index 6abe0319394..334d7c3dcbd 100644
--- a/src/TableFunctions/TableFunctionNull.cpp
+++ b/src/TableFunctions/TableFunctionNull.cpp
@@ -17,7 +17,7 @@ namespace ErrorCodes
     extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
 }
 
-void TableFunctionNull::parseArguments(const ASTPtr & ast_function, const Context & context)
+void TableFunctionNull::parseArguments(const ASTPtr & ast_function, ContextPtr context)
 {
     const auto * function = ast_function->as<ASTFunction>();
     if (!function || !function->arguments)
@@ -30,12 +30,12 @@ void TableFunctionNull::parseArguments(const ASTPtr & ast_function, const Contex
     structure = evaluateConstantExpressionOrIdentifierAsLiteral(arguments[0], context)->as<ASTLiteral>()->value.safeGet<String>();
 }
 
-ColumnsDescription TableFunctionNull::getActualTableStructure(const Context & context) const
+ColumnsDescription TableFunctionNull::getActualTableStructure(ContextPtr context) const
 {
     return parseColumnsListFromString(structure, context);
 }
 
-StoragePtr TableFunctionNull::executeImpl(const ASTPtr & /*ast_function*/, const Context & context, const std::string & table_name, ColumnsDescription /*cached_columns*/) const
+StoragePtr TableFunctionNull::executeImpl(const ASTPtr & /*ast_function*/, ContextPtr context, const std::string & table_name, ColumnsDescription /*cached_columns*/) const
 {
     auto columns = getActualTableStructure(context);
     auto res = StorageNull::create(StorageID(getDatabaseName(), table_name), columns, ConstraintsDescription());
diff --git a/src/TableFunctions/TableFunctionNull.h b/src/TableFunctions/TableFunctionNull.h
index 4d4cecb0292..6734fb8efb6 100644
--- a/src/TableFunctions/TableFunctionNull.h
+++ b/src/TableFunctions/TableFunctionNull.h
@@ -17,11 +17,11 @@ public:
     static constexpr auto name = "null";
     std::string getName() const override { return name; }
 private:
-    StoragePtr executeImpl(const ASTPtr & ast_function, const Context & context, const String & table_name, ColumnsDescription cached_columns) const override;
+    StoragePtr executeImpl(const ASTPtr & ast_function, ContextPtr context, const String & table_name, ColumnsDescription cached_columns) const override;
     const char * getStorageTypeName() const override { return "Null"; }
 
-    void parseArguments(const ASTPtr & ast_function, const Context & context) override;
-    ColumnsDescription getActualTableStructure(const Context & context) const override;
+    void parseArguments(const ASTPtr & ast_function, ContextPtr context) override;
+    ColumnsDescription getActualTableStructure(ContextPtr context) const override;
 
     String structure;
 };
diff --git a/src/TableFunctions/TableFunctionNumbers.cpp b/src/TableFunctions/TableFunctionNumbers.cpp
index 594075b1c82..01ffd2b2e3d 100644
--- a/src/TableFunctions/TableFunctionNumbers.cpp
+++ b/src/TableFunctions/TableFunctionNumbers.cpp
@@ -23,14 +23,14 @@ namespace ErrorCodes
 
 
 template <bool multithreaded>
-ColumnsDescription TableFunctionNumbers<multithreaded>::getActualTableStructure(const Context & /*context*/) const
+ColumnsDescription TableFunctionNumbers<multithreaded>::getActualTableStructure(ContextPtr /*context*/) const
 {
     /// NOTE: https://bugs.llvm.org/show_bug.cgi?id=47418
     return ColumnsDescription{{{"number", std::make_shared<DataTypeUInt64>()}}};
 }
 
 template <bool multithreaded>
-StoragePtr TableFunctionNumbers<multithreaded>::executeImpl(const ASTPtr & ast_function, const Context & context, const std::string & table_name, ColumnsDescription /*cached_columns*/) const
+StoragePtr TableFunctionNumbers<multithreaded>::executeImpl(const ASTPtr & ast_function, ContextPtr context, const std::string & table_name, ColumnsDescription /*cached_columns*/) const
 {
     if (const auto * function = ast_function->as<ASTFunction>())
     {
@@ -56,7 +56,7 @@ void registerTableFunctionNumbers(TableFunctionFactory & factory)
 }
 
 template <bool multithreaded>
-UInt64 TableFunctionNumbers<multithreaded>::evaluateArgument(const Context & context, ASTPtr & argument) const
+UInt64 TableFunctionNumbers<multithreaded>::evaluateArgument(ContextPtr context, ASTPtr & argument) const
 {
     const auto & [field, type] = evaluateConstantExpression(argument, context);
 
diff --git a/src/TableFunctions/TableFunctionNumbers.h b/src/TableFunctions/TableFunctionNumbers.h
index c27bb7319ba..6cee752390e 100644
--- a/src/TableFunctions/TableFunctionNumbers.h
+++ b/src/TableFunctions/TableFunctionNumbers.h
@@ -19,12 +19,12 @@ public:
     std::string getName() const override { return name; }
     bool hasStaticStructure() const override { return true; }
 private:
-    StoragePtr executeImpl(const ASTPtr & ast_function, const Context & context, const std::string & table_name, ColumnsDescription cached_columns) const override;
+    StoragePtr executeImpl(const ASTPtr & ast_function, ContextPtr context, const std::string & table_name, ColumnsDescription cached_columns) const override;
     const char * getStorageTypeName() const override { return "SystemNumbers"; }
 
-    UInt64 evaluateArgument(const Context & context, ASTPtr & argument) const;
+    UInt64 evaluateArgument(ContextPtr context, ASTPtr & argument) const;
 
-    ColumnsDescription getActualTableStructure(const Context & context) const override;
+    ColumnsDescription getActualTableStructure(ContextPtr context) const override;
 };
 
 
diff --git a/src/TableFunctions/TableFunctionPostgreSQL.cpp b/src/TableFunctions/TableFunctionPostgreSQL.cpp
index eefdff1fa87..6e7ba1825fc 100644
--- a/src/TableFunctions/TableFunctionPostgreSQL.cpp
+++ b/src/TableFunctions/TableFunctionPostgreSQL.cpp
@@ -11,6 +11,8 @@
 #include "registerTableFunctions.h"
 #include <Databases/PostgreSQL/fetchPostgreSQLTableStructure.h>
 #include <Storages/PostgreSQL/PostgreSQLConnection.h>
+#include <Common/quoteString.h>
+#include <Common/parseRemoteDescription.h>
 
 
 namespace DB
@@ -24,28 +26,32 @@ namespace ErrorCodes
 
 
 StoragePtr TableFunctionPostgreSQL::executeImpl(const ASTPtr & /*ast_function*/,
-        const Context & context, const std::string & table_name, ColumnsDescription /*cached_columns*/) const
+        ContextPtr context, const std::string & table_name, ColumnsDescription /*cached_columns*/) const
 {
     auto columns = getActualTableStructure(context);
     auto result = std::make_shared<StoragePostgreSQL>(
-            StorageID(getDatabaseName(), table_name), remote_table_name,
-            connection, columns, ConstraintsDescription{}, context);
+            StorageID(getDatabaseName(), table_name), *connection_pool, remote_table_name,
+            columns, ConstraintsDescription{}, context, remote_table_schema);
 
     result->startup();
     return result;
 }
 
 
-ColumnsDescription TableFunctionPostgreSQL::getActualTableStructure(const Context & context) const
+ColumnsDescription TableFunctionPostgreSQL::getActualTableStructure(ContextPtr context) const
 {
-    const bool use_nulls = context.getSettingsRef().external_table_functions_use_nulls;
-    auto columns = fetchPostgreSQLTableStructure(connection->conn(), remote_table_name, use_nulls);
+    const bool use_nulls = context->getSettingsRef().external_table_functions_use_nulls;
+    auto columns = fetchPostgreSQLTableStructure(
+            connection_pool->get(),
+            remote_table_schema.empty() ? doubleQuoteString(remote_table_name)
+                                        : doubleQuoteString(remote_table_schema) + '.' + doubleQuoteString(remote_table_name),
+            use_nulls);
 
     return ColumnsDescription{*columns};
 }
 
 
-void TableFunctionPostgreSQL::parseArguments(const ASTPtr & ast_function, const Context & context)
+void TableFunctionPostgreSQL::parseArguments(const ASTPtr & ast_function, ContextPtr context)
 {
     const auto & func_args = ast_function->as<ASTFunction &>();
 
@@ -54,21 +60,27 @@ void TableFunctionPostgreSQL::parseArguments(const ASTPtr & ast_function, const
 
     ASTs & args = func_args.arguments->children;
 
-    if (args.size() != 5)
-        throw Exception("Table function 'PostgreSQL' requires 5 parameters: "
-                        "PostgreSQL('host:port', 'database', 'table', 'user', 'password').",
+    if (args.size() < 5 || args.size() > 6)
+        throw Exception("Table function 'PostgreSQL' requires from 5 to 6 parameters: "
+                        "PostgreSQL('host:port', 'database', 'table', 'user', 'password', [, 'schema']).",
             ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
 
     for (auto & arg : args)
         arg = evaluateConstantExpressionOrIdentifierAsLiteral(arg, context);
 
-    auto parsed_host_port = parseAddress(args[0]->as<ASTLiteral &>().value.safeGet<String>(), 5432);
+    /// Split into replicas if needed. 5432 is a default postgresql port.
+    const auto & host_port = args[0]->as<ASTLiteral &>().value.safeGet<String>();
+    size_t max_addresses = context->getSettingsRef().glob_expansion_max_elements;
+    auto addresses = parseRemoteDescriptionForExternalDatabase(host_port, max_addresses, 5432);
+
     remote_table_name = args[2]->as<ASTLiteral &>().value.safeGet<String>();
 
-    connection = std::make_shared<PostgreSQLConnection>(
+    if (args.size() == 6)
+        remote_table_schema = args[5]->as<ASTLiteral &>().value.safeGet<String>();
+
+    connection_pool = std::make_shared<postgres::PoolWithFailover>(
         args[1]->as<ASTLiteral &>().value.safeGet<String>(),
-        parsed_host_port.first,
-        parsed_host_port.second,
+        addresses,
         args[3]->as<ASTLiteral &>().value.safeGet<String>(),
         args[4]->as<ASTLiteral &>().value.safeGet<String>());
 }
diff --git a/src/TableFunctions/TableFunctionPostgreSQL.h b/src/TableFunctions/TableFunctionPostgreSQL.h
index e625cbd9bf6..44f804fbb30 100644
--- a/src/TableFunctions/TableFunctionPostgreSQL.h
+++ b/src/TableFunctions/TableFunctionPostgreSQL.h
@@ -5,14 +5,12 @@
 
 #if USE_LIBPQXX
 #include <TableFunctions/ITableFunction.h>
+#include <Storages/PostgreSQL/PostgreSQLPoolWithFailover.h>
 
 
 namespace DB
 {
 
-class PostgreSQLConnection;
-using PostgreSQLConnectionPtr = std::shared_ptr<PostgreSQLConnection>;
-
 class TableFunctionPostgreSQL : public ITableFunction
 {
 public:
@@ -21,17 +19,17 @@ public:
 
 private:
     StoragePtr executeImpl(
-            const ASTPtr & ast_function, const Context & context,
+            const ASTPtr & ast_function, ContextPtr context,
             const std::string & table_name, ColumnsDescription cached_columns) const override;
 
     const char * getStorageTypeName() const override { return "PostgreSQL"; }
 
-    ColumnsDescription getActualTableStructure(const Context & context) const override;
-    void parseArguments(const ASTPtr & ast_function, const Context & context) override;
+    ColumnsDescription getActualTableStructure(ContextPtr context) const override;
+    void parseArguments(const ASTPtr & ast_function, ContextPtr context) override;
 
     String connection_str;
-    String remote_table_name;
-    PostgreSQLConnectionPtr connection;
+    String remote_table_name, remote_table_schema;
+    postgres::PoolWithFailoverPtr connection_pool;
 };
 
 }
diff --git a/src/TableFunctions/TableFunctionRemote.cpp b/src/TableFunctions/TableFunctionRemote.cpp
index 0e7623c0ac3..ab2458b64f4 100644
--- a/src/TableFunctions/TableFunctionRemote.cpp
+++ b/src/TableFunctions/TableFunctionRemote.cpp
@@ -28,7 +28,7 @@ namespace ErrorCodes
 }
 
 
-void TableFunctionRemote::parseArguments(const ASTPtr & ast_function, const Context & context)
+void TableFunctionRemote::parseArguments(const ASTPtr & ast_function, ContextPtr context)
 {
     ASTs & args_func = ast_function->children;
 
@@ -162,14 +162,14 @@ void TableFunctionRemote::parseArguments(const ASTPtr & ast_function, const Cont
     {
         /// Use an existing cluster from the main config
         if (name != "clusterAllReplicas")
-            cluster = context.getCluster(cluster_name);
+            cluster = context->getCluster(cluster_name);
         else
-            cluster = context.getCluster(cluster_name)->getClusterWithReplicasAsShards(context.getSettings());
+            cluster = context->getCluster(cluster_name)->getClusterWithReplicasAsShards(context->getSettings());
     }
     else
     {
         /// Create new cluster from the scratch
-        size_t max_addresses = context.getSettingsRef().table_function_remote_max_addresses;
+        size_t max_addresses = context->getSettingsRef().table_function_remote_max_addresses;
         std::vector<String> shards = parseRemoteDescription(cluster_description, 0, cluster_description.size(), ',', max_addresses);
 
         std::vector<std::vector<String>> names;
@@ -180,7 +180,7 @@ void TableFunctionRemote::parseArguments(const ASTPtr & ast_function, const Cont
         if (names.empty())
             throw Exception("Shard list is empty after parsing first argument", ErrorCodes::BAD_ARGUMENTS);
 
-        auto maybe_secure_port = context.getTCPPortSecure();
+        auto maybe_secure_port = context->getTCPPortSecure();
 
         /// Check host and port on affiliation allowed hosts.
         for (const auto & hosts : names)
@@ -189,20 +189,20 @@ void TableFunctionRemote::parseArguments(const ASTPtr & ast_function, const Cont
             {
                 size_t colon = host.find(':');
                 if (colon == String::npos)
-                    context.getRemoteHostFilter().checkHostAndPort(
+                    context->getRemoteHostFilter().checkHostAndPort(
                         host,
-                        toString((secure ? (maybe_secure_port ? *maybe_secure_port : DBMS_DEFAULT_SECURE_PORT) : context.getTCPPort())));
+                        toString((secure ? (maybe_secure_port ? *maybe_secure_port : DBMS_DEFAULT_SECURE_PORT) : context->getTCPPort())));
                 else
-                    context.getRemoteHostFilter().checkHostAndPort(host.substr(0, colon), host.substr(colon + 1));
+                    context->getRemoteHostFilter().checkHostAndPort(host.substr(0, colon), host.substr(colon + 1));
             }
         }
 
         cluster = std::make_shared<Cluster>(
-            context.getSettings(),
+            context->getSettings(),
             names,
             username,
             password,
-            (secure ? (maybe_secure_port ? *maybe_secure_port : DBMS_DEFAULT_SECURE_PORT) : context.getTCPPort()),
+            (secure ? (maybe_secure_port ? *maybe_secure_port : DBMS_DEFAULT_SECURE_PORT) : context->getTCPPort()),
             false,
             secure);
     }
@@ -214,7 +214,7 @@ void TableFunctionRemote::parseArguments(const ASTPtr & ast_function, const Cont
     remote_table_id.table_name = remote_table;
 }
 
-StoragePtr TableFunctionRemote::executeImpl(const ASTPtr & /*ast_function*/, const Context & context, const std::string & table_name, ColumnsDescription cached_columns) const
+StoragePtr TableFunctionRemote::executeImpl(const ASTPtr & /*ast_function*/, ContextPtr context, const std::string & table_name, ColumnsDescription cached_columns) const
 {
     /// StorageDistributed supports mismatching structure of remote table, so we can use outdated structure for CREATE ... AS remote(...)
     /// without additional conversion in StorageTableFunctionProxy
@@ -255,7 +255,7 @@ StoragePtr TableFunctionRemote::executeImpl(const ASTPtr & /*ast_function*/, con
     return res;
 }
 
-ColumnsDescription TableFunctionRemote::getActualTableStructure(const Context & context) const
+ColumnsDescription TableFunctionRemote::getActualTableStructure(ContextPtr context) const
 {
     assert(cluster);
     return getStructureOfRemoteTable(*cluster, remote_table_id, context, remote_table_function_ptr);
diff --git a/src/TableFunctions/TableFunctionRemote.h b/src/TableFunctions/TableFunctionRemote.h
index d485440d604..845c36182dc 100644
--- a/src/TableFunctions/TableFunctionRemote.h
+++ b/src/TableFunctions/TableFunctionRemote.h
@@ -18,19 +18,19 @@ namespace DB
 class TableFunctionRemote : public ITableFunction
 {
 public:
-    TableFunctionRemote(const std::string & name_, bool secure_ = false);
+    explicit TableFunctionRemote(const std::string & name_, bool secure_ = false);
 
     std::string getName() const override { return name; }
 
-    ColumnsDescription getActualTableStructure(const Context & context) const override;
+    ColumnsDescription getActualTableStructure(ContextPtr context) const override;
 
     bool needStructureConversion() const override { return false; }
 
 private:
-    StoragePtr executeImpl(const ASTPtr & ast_function, const Context & context, const std::string & table_name, ColumnsDescription cached_columns) const override;
+    StoragePtr executeImpl(const ASTPtr & ast_function, ContextPtr context, const std::string & table_name, ColumnsDescription cached_columns) const override;
     const char * getStorageTypeName() const override { return "Distributed"; }
 
-    void parseArguments(const ASTPtr & ast_function, const Context & context) override;
+    void parseArguments(const ASTPtr & ast_function, ContextPtr context) override;
 
     std::string name;
     bool is_cluster_function;
diff --git a/src/TableFunctions/TableFunctionS3.cpp b/src/TableFunctions/TableFunctionS3.cpp
index 6dc9230ca46..973899d2101 100644
--- a/src/TableFunctions/TableFunctionS3.cpp
+++ b/src/TableFunctions/TableFunctionS3.cpp
@@ -17,58 +17,76 @@ namespace DB
 
 namespace ErrorCodes
 {
-    extern const int LOGICAL_ERROR;
     extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
 }
 
-void TableFunctionS3::parseArguments(const ASTPtr & ast_function, const Context & context)
+void TableFunctionS3::parseArguments(const ASTPtr & ast_function, ContextPtr context)
 {
     /// Parse args
     ASTs & args_func = ast_function->children;
 
+    const auto message = fmt::format(
+        "The signature of table function {} could be the following:\n" \
+        " - url, format, structure\n" \
+        " - url, format, structure, compression_method\n" \
+        " - url, access_key_id, secret_access_key, format, structure\n" \
+        " - url, access_key_id, secret_access_key, format, structure, compression_method",
+        getName());
+
     if (args_func.size() != 1)
-        throw Exception("Table function '" + getName() + "' must have arguments.", ErrorCodes::LOGICAL_ERROR);
+        throw Exception("Table function '" + getName() + "' must have arguments.", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
 
     ASTs & args = args_func.at(0)->children;
 
     if (args.size() < 3 || args.size() > 6)
-        throw Exception("Table function '" + getName() + "' requires 3 to 6 arguments: url, [access_key_id, secret_access_key,] format, structure and [compression_method].",
-            ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
+        throw Exception(message, ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
 
     for (auto & arg : args)
         arg = evaluateConstantExpressionOrIdentifierAsLiteral(arg, context);
 
+    /// Size -> argument indexes
+    static auto size_to_args = std::map<size_t, std::map<String, size_t>>
+    {
+        {3, {{"format", 1}, {"structure", 2}}},
+        {4, {{"format", 1}, {"structure", 2}, {"compression_method", 3}}},
+        {5, {{"access_key_id", 1}, {"secret_access_key", 2}, {"format", 3}, {"structure", 4}}},
+        {6, {{"access_key_id", 1}, {"secret_access_key", 2}, {"format", 3}, {"structure", 4}, {"compression_method", 5}}}
+    };
+
+    /// This argument is always the first
     filename = args[0]->as<ASTLiteral &>().value.safeGet<String>();
 
-    if (args.size() < 5)
-    {
-        format = args[1]->as<ASTLiteral &>().value.safeGet<String>();
-        structure = args[2]->as<ASTLiteral &>().value.safeGet<String>();
-    }
-    else
-    {
-        access_key_id = args[1]->as<ASTLiteral &>().value.safeGet<String>();
-        secret_access_key = args[2]->as<ASTLiteral &>().value.safeGet<String>();
-        format = args[3]->as<ASTLiteral &>().value.safeGet<String>();
-        structure = args[4]->as<ASTLiteral &>().value.safeGet<String>();
-    }
+    auto & args_to_idx = size_to_args[args.size()];
 
-    if (args.size() == 4 || args.size() == 6)
-        compression_method = args.back()->as<ASTLiteral &>().value.safeGet<String>();
+    if (args_to_idx.contains("format"))
+        format = args[args_to_idx["format"]]->as<ASTLiteral &>().value.safeGet<String>();
+
+    if (args_to_idx.contains("structure"))
+        structure = args[args_to_idx["structure"]]->as<ASTLiteral &>().value.safeGet<String>();
+
+    if (args_to_idx.contains("compression_method"))
+        compression_method = args[args_to_idx["compression_method"]]->as<ASTLiteral &>().value.safeGet<String>();
+
+    if (args_to_idx.contains("access_key_id"))
+        access_key_id = args[args_to_idx["access_key_id"]]->as<ASTLiteral &>().value.safeGet<String>();
+
+    if (args_to_idx.contains("secret_access_key"))
+        secret_access_key = args[args_to_idx["secret_access_key"]]->as<ASTLiteral &>().value.safeGet<String>();
 }
 
-ColumnsDescription TableFunctionS3::getActualTableStructure(const Context & context) const
+ColumnsDescription TableFunctionS3::getActualTableStructure(ContextPtr context) const
 {
     return parseColumnsListFromString(structure, context);
 }
 
-StoragePtr TableFunctionS3::executeImpl(const ASTPtr & /*ast_function*/, const Context & context, const std::string & table_name, ColumnsDescription /*cached_columns*/) const
+StoragePtr TableFunctionS3::executeImpl(const ASTPtr & /*ast_function*/, ContextPtr context, const std::string & table_name, ColumnsDescription /*cached_columns*/) const
 {
     Poco::URI uri (filename);
     S3::URI s3_uri (uri);
-    UInt64 min_upload_part_size = context.getSettingsRef().s3_min_upload_part_size;
-    UInt64 max_single_part_upload_size = context.getSettingsRef().s3_max_single_part_upload_size;
-    UInt64 max_connections = context.getSettingsRef().s3_max_connections;
+    UInt64 s3_max_single_read_retries = context->getSettingsRef().s3_max_single_read_retries;
+    UInt64 min_upload_part_size = context->getSettingsRef().s3_min_upload_part_size;
+    UInt64 max_single_part_upload_size = context->getSettingsRef().s3_max_single_part_upload_size;
+    UInt64 max_connections = context->getSettingsRef().s3_max_connections;
 
     StoragePtr storage = StorageS3::create(
             s3_uri,
@@ -76,12 +94,13 @@ StoragePtr TableFunctionS3::executeImpl(const ASTPtr & /*ast_function*/, const C
             secret_access_key,
             StorageID(getDatabaseName(), table_name),
             format,
+            s3_max_single_read_retries,
             min_upload_part_size,
             max_single_part_upload_size,
             max_connections,
             getActualTableStructure(context),
             ConstraintsDescription{},
-            const_cast<Context &>(context),
+            context,
             compression_method);
 
     storage->startup();
diff --git a/src/TableFunctions/TableFunctionS3.h b/src/TableFunctions/TableFunctionS3.h
index 722fb9eb23c..1835fa3daa9 100644
--- a/src/TableFunctions/TableFunctionS3.h
+++ b/src/TableFunctions/TableFunctionS3.h
@@ -27,14 +27,14 @@ public:
 protected:
     StoragePtr executeImpl(
         const ASTPtr & ast_function,
-        const Context & context,
+        ContextPtr context,
         const std::string & table_name,
         ColumnsDescription cached_columns) const override;
 
     const char * getStorageTypeName() const override { return "S3"; }
 
-    ColumnsDescription getActualTableStructure(const Context & context) const override;
-    void parseArguments(const ASTPtr & ast_function, const Context & context) override;
+    ColumnsDescription getActualTableStructure(ContextPtr context) const override;
+    void parseArguments(const ASTPtr & ast_function, ContextPtr context) override;
 
     String filename;
     String format;
diff --git a/src/TableFunctions/TableFunctionS3Cluster.cpp b/src/TableFunctions/TableFunctionS3Cluster.cpp
new file mode 100644
index 00000000000..16f48c70608
--- /dev/null
+++ b/src/TableFunctions/TableFunctionS3Cluster.cpp
@@ -0,0 +1,149 @@
+#if !defined(ARCADIA_BUILD)
+#include <Common/config.h>
+#endif
+
+#if USE_AWS_S3
+
+#include <Storages/StorageS3Cluster.h>
+
+#include <DataTypes/DataTypeString.h>
+#include <DataStreams/RemoteBlockInputStream.h>
+#include <IO/S3Common.h>
+#include <Storages/StorageS3.h>
+#include <Interpreters/evaluateConstantExpression.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/ClientInfo.h>
+#include <TableFunctions/TableFunctionFactory.h>
+#include <TableFunctions/TableFunctionS3.h>
+#include <TableFunctions/TableFunctionS3Cluster.h>
+#include <TableFunctions/parseColumnsListForTableFunction.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTExpressionList.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/IAST_fwd.h>
+#include <Processors/Sources/SourceFromInputStream.h>
+
+#include "registerTableFunctions.h"
+
+#include <memory>
+#include <thread>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+}
+
+
+void TableFunctionS3Cluster::parseArguments(const ASTPtr & ast_function, ContextPtr context)
+{
+    /// Parse args
+    ASTs & args_func = ast_function->children;
+
+    if (args_func.size() != 1)
+        throw Exception("Table function '" + getName() + "' must have arguments.", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
+
+    ASTs & args = args_func.at(0)->children;
+
+    const auto message = fmt::format(
+        "The signature of table function {} could be the following:\n" \
+        " - cluster, url, format, structure\n" \
+        " - cluster, url, format, structure, compression_method\n" \
+        " - cluster, url, access_key_id, secret_access_key, format, structure\n" \
+        " - cluster, url, access_key_id, secret_access_key, format, structure, compression_method",
+        getName());
+
+    if (args.size() < 4 || args.size() > 7)
+        throw Exception(message, ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
+
+    for (auto & arg : args)
+        arg = evaluateConstantExpressionOrIdentifierAsLiteral(arg, context);
+
+    /// This arguments are always the first
+    cluster_name = args[0]->as<ASTLiteral &>().value.safeGet<String>();
+    filename = args[1]->as<ASTLiteral &>().value.safeGet<String>();
+
+    /// Size -> argument indexes
+    static auto size_to_args = std::map<size_t, std::map<String, size_t>>
+    {
+        {4, {{"format", 2}, {"structure", 3}}},
+        {5, {{"format", 2}, {"structure", 3}, {"compression_method", 4}}},
+        {6, {{"access_key_id", 2}, {"secret_access_key", 3}, {"format", 4}, {"structure", 5}}},
+        {7, {{"access_key_id", 2}, {"secret_access_key", 3}, {"format", 4}, {"structure", 5}, {"compression_method", 6}}}
+    };
+
+    auto & args_to_idx = size_to_args[args.size()];
+
+    if (args_to_idx.contains("format"))
+        format = args[args_to_idx["format"]]->as<ASTLiteral &>().value.safeGet<String>();
+
+    if (args_to_idx.contains("structure"))
+        structure = args[args_to_idx["structure"]]->as<ASTLiteral &>().value.safeGet<String>();
+
+    if (args_to_idx.contains("compression_method"))
+        compression_method = args[args_to_idx["compression_method"]]->as<ASTLiteral &>().value.safeGet<String>();
+
+    if (args_to_idx.contains("access_key_id"))
+        access_key_id = args[args_to_idx["access_key_id"]]->as<ASTLiteral &>().value.safeGet<String>();
+
+    if (args_to_idx.contains("secret_access_key"))
+        secret_access_key = args[args_to_idx["secret_access_key"]]->as<ASTLiteral &>().value.safeGet<String>();
+}
+
+
+ColumnsDescription TableFunctionS3Cluster::getActualTableStructure(ContextPtr context) const
+{
+    return parseColumnsListFromString(structure, context);
+}
+
+StoragePtr TableFunctionS3Cluster::executeImpl(
+    const ASTPtr & /*function*/, ContextPtr context,
+    const std::string & table_name, ColumnsDescription /*cached_columns*/) const
+{
+    StoragePtr storage;
+    if (context->getClientInfo().query_kind == ClientInfo::QueryKind::SECONDARY_QUERY)
+    {
+        /// On worker node this filename won't contains globs
+        Poco::URI uri (filename);
+        S3::URI s3_uri (uri);
+        /// Actually this parameters are not used
+        UInt64 s3_max_single_read_retries = context->getSettingsRef().s3_max_single_read_retries;
+        UInt64 min_upload_part_size = context->getSettingsRef().s3_min_upload_part_size;
+        UInt64 max_single_part_upload_size = context->getSettingsRef().s3_max_single_part_upload_size;
+        UInt64 max_connections = context->getSettingsRef().s3_max_connections;
+        storage = StorageS3::create(
+            s3_uri, access_key_id, secret_access_key, StorageID(getDatabaseName(), table_name),
+            format,
+            s3_max_single_read_retries,
+            min_upload_part_size,
+            max_single_part_upload_size,
+            max_connections,
+            getActualTableStructure(context), ConstraintsDescription{},
+            context, compression_method, /*distributed_processing=*/true);
+    }
+    else
+    {
+        storage = StorageS3Cluster::create(
+            filename, access_key_id, secret_access_key, StorageID(getDatabaseName(), table_name),
+            cluster_name, format, context->getSettingsRef().s3_max_connections,
+            getActualTableStructure(context), ConstraintsDescription{},
+            context, compression_method);
+    }
+
+    storage->startup();
+
+    return storage;
+}
+
+
+void registerTableFunctionS3Cluster(TableFunctionFactory & factory)
+{
+    factory.registerFunction<TableFunctionS3Cluster>();
+}
+
+
+}
+
+#endif
diff --git a/src/TableFunctions/TableFunctionS3Cluster.h b/src/TableFunctions/TableFunctionS3Cluster.h
new file mode 100644
index 00000000000..cc857725ce6
--- /dev/null
+++ b/src/TableFunctions/TableFunctionS3Cluster.h
@@ -0,0 +1,56 @@
+#pragma once
+
+#include <Common/config.h>
+
+#if USE_AWS_S3
+
+#include <TableFunctions/ITableFunction.h>
+
+
+namespace DB
+{
+
+class Context;
+
+/**
+ * s3Cluster(cluster_name, source, [access_key_id, secret_access_key,] format, structure)
+ * A table function, which allows to process many files from S3 on a specific cluster
+ * On initiator it creates a connection to _all_ nodes in cluster, discloses asterics
+ * in S3 file path and dispatch each file dynamically.
+ * On worker node it asks initiator about next task to process, processes it.
+ * This is repeated until the tasks are finished.
+ */
+class TableFunctionS3Cluster : public ITableFunction
+{
+public:
+    static constexpr auto name = "s3Cluster";
+    std::string getName() const override
+    {
+        return name;
+    }
+    bool hasStaticStructure() const override { return true; }
+
+protected:
+    StoragePtr executeImpl(
+        const ASTPtr & ast_function,
+        ContextPtr context,
+        const std::string & table_name,
+        ColumnsDescription cached_columns) const override;
+
+    const char * getStorageTypeName() const override { return "S3Cluster"; }
+
+    ColumnsDescription getActualTableStructure(ContextPtr) const override;
+    void parseArguments(const ASTPtr &, ContextPtr) override;
+
+    String cluster_name;
+    String filename;
+    String format;
+    String structure;
+    String access_key_id;
+    String secret_access_key;
+    String compression_method = "auto";
+};
+
+}
+
+#endif
diff --git a/src/TableFunctions/TableFunctionURL.cpp b/src/TableFunctions/TableFunctionURL.cpp
index 1c0109e892b..a77b9140508 100644
--- a/src/TableFunctions/TableFunctionURL.cpp
+++ b/src/TableFunctions/TableFunctionURL.cpp
@@ -12,7 +12,7 @@
 namespace DB
 {
 StoragePtr TableFunctionURL::getStorage(
-    const String & source, const String & format_, const ColumnsDescription & columns, Context & global_context,
+    const String & source, const String & format_, const ColumnsDescription & columns, ContextPtr global_context,
     const std::string & table_name, const String & compression_method_) const
 {
     Poco::URI uri(source);
diff --git a/src/TableFunctions/TableFunctionURL.h b/src/TableFunctions/TableFunctionURL.h
index 5eb027e2b8a..fde361e8bbb 100644
--- a/src/TableFunctions/TableFunctionURL.h
+++ b/src/TableFunctions/TableFunctionURL.h
@@ -21,7 +21,7 @@ public:
 
 private:
     StoragePtr getStorage(
-        const String & source, const String & format_, const ColumnsDescription & columns, Context & global_context,
+        const String & source, const String & format_, const ColumnsDescription & columns, ContextPtr global_context,
         const std::string & table_name, const String & compression_method_) const override;
     const char * getStorageTypeName() const override { return "URL"; }
 };
diff --git a/src/TableFunctions/TableFunctionValues.cpp b/src/TableFunctions/TableFunctionValues.cpp
index 4127a30892f..c66ebe7322e 100644
--- a/src/TableFunctions/TableFunctionValues.cpp
+++ b/src/TableFunctions/TableFunctionValues.cpp
@@ -30,7 +30,7 @@ namespace ErrorCodes
     extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
 }
 
-static void parseAndInsertValues(MutableColumns & res_columns, const ASTs & args, const Block & sample_block, const Context & context)
+static void parseAndInsertValues(MutableColumns & res_columns, const ASTs & args, const Block & sample_block, ContextPtr context)
 {
     if (res_columns.size() == 1) /// Parsing arguments as Fields
     {
@@ -68,7 +68,7 @@ static void parseAndInsertValues(MutableColumns & res_columns, const ASTs & args
     }
 }
 
-void TableFunctionValues::parseArguments(const ASTPtr & ast_function, const Context & /*context*/)
+void TableFunctionValues::parseArguments(const ASTPtr & ast_function, ContextPtr /*context*/)
 {
     ASTs & args_func = ast_function->children;
 
@@ -93,12 +93,12 @@ void TableFunctionValues::parseArguments(const ASTPtr & ast_function, const Cont
     structure = args[0]->as<ASTLiteral &>().value.safeGet<String>();
 }
 
-ColumnsDescription TableFunctionValues::getActualTableStructure(const Context & context) const
+ColumnsDescription TableFunctionValues::getActualTableStructure(ContextPtr context) const
 {
     return parseColumnsListFromString(structure, context);
 }
 
-StoragePtr TableFunctionValues::executeImpl(const ASTPtr & ast_function, const Context & context, const std::string & table_name, ColumnsDescription /*cached_columns*/) const
+StoragePtr TableFunctionValues::executeImpl(const ASTPtr & ast_function, ContextPtr context, const std::string & table_name, ColumnsDescription /*cached_columns*/) const
 {
     auto columns = getActualTableStructure(context);
 
diff --git a/src/TableFunctions/TableFunctionValues.h b/src/TableFunctions/TableFunctionValues.h
index 549fa2de507..058f5f1d2ed 100644
--- a/src/TableFunctions/TableFunctionValues.h
+++ b/src/TableFunctions/TableFunctionValues.h
@@ -14,11 +14,11 @@ public:
     std::string getName() const override { return name; }
     bool hasStaticStructure() const override { return true; }
 private:
-    StoragePtr executeImpl(const ASTPtr & ast_function, const Context & context, const std::string & table_name, ColumnsDescription cached_columns) const override;
+    StoragePtr executeImpl(const ASTPtr & ast_function, ContextPtr context, const std::string & table_name, ColumnsDescription cached_columns) const override;
     const char * getStorageTypeName() const override { return "Values"; }
 
-    ColumnsDescription getActualTableStructure(const Context & context) const override;
-    void parseArguments(const ASTPtr & ast_function, const Context & context) override;
+    ColumnsDescription getActualTableStructure(ContextPtr context) const override;
+    void parseArguments(const ASTPtr & ast_function, ContextPtr context) override;
 
     String structure;
 };
diff --git a/src/TableFunctions/TableFunctionView.cpp b/src/TableFunctions/TableFunctionView.cpp
index 62a833dabc4..3f51e0bbc95 100644
--- a/src/TableFunctions/TableFunctionView.cpp
+++ b/src/TableFunctions/TableFunctionView.cpp
@@ -15,7 +15,7 @@ namespace ErrorCodes
     extern const int BAD_ARGUMENTS;
 }
 
-void TableFunctionView::parseArguments(const ASTPtr & ast_function, const Context & /*context*/)
+void TableFunctionView::parseArguments(const ASTPtr & ast_function, ContextPtr /*context*/)
 {
     const auto * function = ast_function->as<ASTFunction>();
     if (function)
@@ -29,7 +29,7 @@ void TableFunctionView::parseArguments(const ASTPtr & ast_function, const Contex
     throw Exception("Table function '" + getName() + "' requires a query argument.", ErrorCodes::BAD_ARGUMENTS);
 }
 
-ColumnsDescription TableFunctionView::getActualTableStructure(const Context & context) const
+ColumnsDescription TableFunctionView::getActualTableStructure(ContextPtr context) const
 {
     assert(create.select);
     assert(create.children.size() == 1);
@@ -39,7 +39,7 @@ ColumnsDescription TableFunctionView::getActualTableStructure(const Context & co
 }
 
 StoragePtr TableFunctionView::executeImpl(
-    const ASTPtr & /*ast_function*/, const Context & context, const std::string & table_name, ColumnsDescription /*cached_columns*/) const
+    const ASTPtr & /*ast_function*/, ContextPtr context, const std::string & table_name, ColumnsDescription /*cached_columns*/) const
 {
     auto columns = getActualTableStructure(context);
     auto res = StorageView::create(StorageID(getDatabaseName(), table_name), create, columns);
diff --git a/src/TableFunctions/TableFunctionView.h b/src/TableFunctions/TableFunctionView.h
index 0ed66ff712c..9ef634746eb 100644
--- a/src/TableFunctions/TableFunctionView.h
+++ b/src/TableFunctions/TableFunctionView.h
@@ -17,11 +17,11 @@ public:
     static constexpr auto name = "view";
     std::string getName() const override { return name; }
 private:
-    StoragePtr executeImpl(const ASTPtr & ast_function, const Context & context, const String & table_name, ColumnsDescription cached_columns) const override;
+    StoragePtr executeImpl(const ASTPtr & ast_function, ContextPtr context, const String & table_name, ColumnsDescription cached_columns) const override;
     const char * getStorageTypeName() const override { return "View"; }
 
-    void parseArguments(const ASTPtr & ast_function, const Context & context) override;
-    ColumnsDescription getActualTableStructure(const Context & context) const override;
+    void parseArguments(const ASTPtr & ast_function, ContextPtr context) override;
+    ColumnsDescription getActualTableStructure(ContextPtr context) const override;
 
     ASTCreateQuery create;
 };
diff --git a/src/TableFunctions/TableFunctionZeros.cpp b/src/TableFunctions/TableFunctionZeros.cpp
index 9b0c6c6e78b..9fd14eec4af 100644
--- a/src/TableFunctions/TableFunctionZeros.cpp
+++ b/src/TableFunctions/TableFunctionZeros.cpp
@@ -20,14 +20,14 @@ extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
 
 
 template <bool multithreaded>
-ColumnsDescription TableFunctionZeros<multithreaded>::getActualTableStructure(const Context & /*context*/) const
+ColumnsDescription TableFunctionZeros<multithreaded>::getActualTableStructure(ContextPtr /*context*/) const
 {
     /// NOTE: https://bugs.llvm.org/show_bug.cgi?id=47418
     return ColumnsDescription{{{"zero", std::make_shared<DataTypeUInt8>()}}};
 }
 
 template <bool multithreaded>
-StoragePtr TableFunctionZeros<multithreaded>::executeImpl(const ASTPtr & ast_function, const Context & context, const std::string & table_name, ColumnsDescription /*cached_columns*/) const
+StoragePtr TableFunctionZeros<multithreaded>::executeImpl(const ASTPtr & ast_function, ContextPtr context, const std::string & table_name, ColumnsDescription /*cached_columns*/) const
 {
     if (const auto * function = ast_function->as<ASTFunction>())
     {
@@ -53,7 +53,7 @@ void registerTableFunctionZeros(TableFunctionFactory & factory)
 }
 
 template <bool multithreaded>
-UInt64 TableFunctionZeros<multithreaded>::evaluateArgument(const Context & context, ASTPtr & argument) const
+UInt64 TableFunctionZeros<multithreaded>::evaluateArgument(ContextPtr context, ASTPtr & argument) const
 {
     return evaluateConstantExpressionOrIdentifierAsLiteral(argument, context)->as<ASTLiteral &>().value.safeGet<UInt64>();
 }
diff --git a/src/TableFunctions/TableFunctionZeros.h b/src/TableFunctions/TableFunctionZeros.h
index 48a2d8019f6..0407eff2f78 100644
--- a/src/TableFunctions/TableFunctionZeros.h
+++ b/src/TableFunctions/TableFunctionZeros.h
@@ -19,12 +19,12 @@ public:
     std::string getName() const override { return name; }
     bool hasStaticStructure() const override { return true; }
 private:
-    StoragePtr executeImpl(const ASTPtr & ast_function, const Context & context, const std::string & table_name, ColumnsDescription cached_columns) const override;
+    StoragePtr executeImpl(const ASTPtr & ast_function, ContextPtr context, const std::string & table_name, ColumnsDescription cached_columns) const override;
     const char * getStorageTypeName() const override { return "SystemZeros"; }
 
-    UInt64 evaluateArgument(const Context & context, ASTPtr & argument) const;
+    UInt64 evaluateArgument(ContextPtr context, ASTPtr & argument) const;
 
-    ColumnsDescription getActualTableStructure(const Context & context) const override;
+    ColumnsDescription getActualTableStructure(ContextPtr context) const override;
 };
 
 
diff --git a/src/TableFunctions/parseColumnsListForTableFunction.cpp b/src/TableFunctions/parseColumnsListForTableFunction.cpp
index 5221d96e086..08e80ef425a 100644
--- a/src/TableFunctions/parseColumnsListForTableFunction.cpp
+++ b/src/TableFunctions/parseColumnsListForTableFunction.cpp
@@ -14,10 +14,10 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
-ColumnsDescription parseColumnsListFromString(const std::string & structure, const Context & context)
+ColumnsDescription parseColumnsListFromString(const std::string & structure, ContextPtr context)
 {
     ParserColumnDeclarationList parser;
-    const Settings & settings = context.getSettingsRef();
+    const Settings & settings = context->getSettingsRef();
 
     ASTPtr columns_list_raw = parseQuery(parser, structure, "columns declaration list", settings.max_query_size, settings.max_parser_depth);
 
@@ -25,7 +25,7 @@ ColumnsDescription parseColumnsListFromString(const std::string & structure, con
     if (!columns_list)
         throw Exception("Could not cast AST to ASTExpressionList", ErrorCodes::LOGICAL_ERROR);
 
-    return InterpreterCreateQuery::getColumnsDescription(*columns_list, context, !settings.allow_suspicious_codecs);
+    return InterpreterCreateQuery::getColumnsDescription(*columns_list, context, false);
 }
 
 }
diff --git a/src/TableFunctions/parseColumnsListForTableFunction.h b/src/TableFunctions/parseColumnsListForTableFunction.h
index d077d308e37..e0130a2618d 100644
--- a/src/TableFunctions/parseColumnsListForTableFunction.h
+++ b/src/TableFunctions/parseColumnsListForTableFunction.h
@@ -10,6 +10,6 @@ namespace DB
 class Context;
 
 /// Parses a common argument for table functions such as table structure given in string
-ColumnsDescription parseColumnsListFromString(const std::string & structure, const Context & context);
+ColumnsDescription parseColumnsListFromString(const std::string & structure, ContextPtr context);
 
 }
diff --git a/src/TableFunctions/registerTableFunctions.cpp b/src/TableFunctions/registerTableFunctions.cpp
index a6640bbb0e9..6cf40c4f090 100644
--- a/src/TableFunctions/registerTableFunctions.cpp
+++ b/src/TableFunctions/registerTableFunctions.cpp
@@ -21,6 +21,7 @@ void registerTableFunctions()
 
 #if USE_AWS_S3
     registerTableFunctionS3(factory);
+    registerTableFunctionS3Cluster(factory);
     registerTableFunctionCOS(factory);
 #endif
 
@@ -40,6 +41,8 @@ void registerTableFunctions()
 #if USE_LIBPQXX
     registerTableFunctionPostgreSQL(factory);
 #endif
+
+    registerTableFunctionDictionary(factory);
 }
 
 }
diff --git a/src/TableFunctions/registerTableFunctions.h b/src/TableFunctions/registerTableFunctions.h
index 7e9a8ab5b61..c49fafc5f86 100644
--- a/src/TableFunctions/registerTableFunctions.h
+++ b/src/TableFunctions/registerTableFunctions.h
@@ -21,6 +21,7 @@ void registerTableFunctionGenerate(TableFunctionFactory & factory);
 
 #if USE_AWS_S3
 void registerTableFunctionS3(TableFunctionFactory & factory);
+void registerTableFunctionS3Cluster(TableFunctionFactory & factory);
 void registerTableFunctionCOS(TableFunctionFactory & factory);
 #endif
 
@@ -41,6 +42,8 @@ void registerTableFunctionMySQL(TableFunctionFactory & factory);
 void registerTableFunctionPostgreSQL(TableFunctionFactory & factory);
 #endif
 
+void registerTableFunctionDictionary(TableFunctionFactory & factory);
+
 void registerTableFunctions();
 
 }
diff --git a/src/TableFunctions/ya.make b/src/TableFunctions/ya.make
index 7bcf5fc53b3..f50e345f2d8 100644
--- a/src/TableFunctions/ya.make
+++ b/src/TableFunctions/ya.make
@@ -12,6 +12,7 @@ SRCS(
     ITableFunction.cpp
     ITableFunctionFileLike.cpp
     ITableFunctionXDBC.cpp
+    TableFunctionDictionary.cpp
     TableFunctionFactory.cpp
     TableFunctionFile.cpp
     TableFunctionGenerateRandom.cpp
diff --git a/src/ya.make b/src/ya.make
index 5361c8a5695..6537f67d66f 100644
--- a/src/ya.make
+++ b/src/ya.make
@@ -5,6 +5,7 @@ LIBRARY()
 PEERDIR(
     clickhouse/src/Access
     clickhouse/src/AggregateFunctions
+    clickhouse/src/Bridge
     clickhouse/src/Client
     clickhouse/src/Columns
     clickhouse/src/Common
diff --git a/tests/clickhouse-test b/tests/clickhouse-test
index 64a93416c41..5ae894cc55f 100755
--- a/tests/clickhouse-test
+++ b/tests/clickhouse-test
@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
 
+import shutil
 import sys
 import os
 import os.path
@@ -107,18 +108,21 @@ def remove_control_characters(s):
 
 def get_db_engine(args, database_name):
     if args.replicated_database:
-        return " ENGINE=Replicated('/test/clickhouse/db/{}', 's1', 'r1')".format(database_name)
+        return " ON CLUSTER test_cluster_database_replicated ENGINE=Replicated('/test/clickhouse/db/{}', '{{shard}}', '{{replica}}')".format(database_name)
     if args.db_engine:
         return " ENGINE=" + args.db_engine
     return ""   # Will use default engine
 
-def run_single_test(args, ext, server_logs_level, client_options, case_file, stdout_file, stderr_file):
+def run_single_test(args, ext, server_logs_level, client_options, case_file, stdout_file, stderr_file, suite_tmp_dir):
     # print(client_options)
 
+    client = f"{args.client} --log_comment='{case_file}'"
+
     start_time = datetime.now()
     if args.database:
         database = args.database
         os.environ.setdefault("CLICKHOUSE_DATABASE", database)
+        os.environ.setdefault("CLICKHOUSE_TMP", suite_tmp_dir)
 
     else:
         # If --database is not specified, we will create temporary database with unique name
@@ -128,7 +132,7 @@ def run_single_test(args, ext, server_logs_level, client_options, case_file, std
             return ''.join(random.choice(alphabet) for _ in range(length))
         database = 'test_{suffix}'.format(suffix=random_str())
 
-        clickhouse_proc_create = Popen(shlex.split(args.client), stdin=PIPE, stdout=PIPE, stderr=PIPE, universal_newlines=True)
+        clickhouse_proc_create = Popen(shlex.split(client), stdin=PIPE, stdout=PIPE, stderr=None, universal_newlines=True)
         try:
             clickhouse_proc_create.communicate(("CREATE DATABASE " + database + get_db_engine(args, database)), timeout=args.timeout)
         except TimeoutExpired:
@@ -136,12 +140,18 @@ def run_single_test(args, ext, server_logs_level, client_options, case_file, std
             return clickhouse_proc_create, "", "Timeout creating database {} before test".format(database), total_time
 
         os.environ["CLICKHOUSE_DATABASE"] = database
+        # Set temporary directory to match the randomly generated database,
+        # because .sh tests also use it for temporary files and we want to avoid
+        # collisions.
+        test_tmp_dir = os.path.join(suite_tmp_dir, database)
+        os.mkdir(test_tmp_dir)
+        os.environ.setdefault("CLICKHOUSE_TMP", test_tmp_dir)
 
     # This is for .sh tests
-    os.environ.setdefault("CLICKHOUSE_LOG_COMMENT", case_file)
+    os.environ["CLICKHOUSE_LOG_COMMENT"] = case_file
 
     params = {
-        'client': args.client + ' --database=' + database,
+        'client': client + ' --database=' + database,
         'logs_level': server_logs_level,
         'options': client_options,
         'test': case_file,
@@ -152,7 +162,7 @@ def run_single_test(args, ext, server_logs_level, client_options, case_file, std
     pattern = '{test} > {stdout} 2> {stderr}'
 
     if ext == '.sql':
-        pattern = "{client} --send_logs_level={logs_level} --testmode --multiquery {options} --log_comment='{test}' < " + pattern
+        pattern = "{client} --send_logs_level={logs_level} --testmode --multiquery {options} < " + pattern
 
     command = pattern.format(**params)
 
@@ -169,10 +179,13 @@ def run_single_test(args, ext, server_logs_level, client_options, case_file, std
         need_drop_database = not maybe_passed
 
     if need_drop_database:
-        clickhouse_proc_create = Popen(shlex.split(args.client), stdin=PIPE, stdout=PIPE, stderr=PIPE, universal_newlines=True)
-        seconds_left = max(args.timeout - (datetime.now() - start_time).total_seconds(), 10)
+        clickhouse_proc_create = Popen(shlex.split(client), stdin=PIPE, stdout=PIPE, stderr=None, universal_newlines=True)
+        seconds_left = max(args.timeout - (datetime.now() - start_time).total_seconds(), 20)
         try:
-            clickhouse_proc_create.communicate(("DROP DATABASE " + database), timeout=seconds_left)
+            drop_database_query = "DROP DATABASE " + database
+            if args.replicated_database:
+                drop_database_query += " ON CLUSTER test_cluster_database_replicated"
+            clickhouse_proc_create.communicate((drop_database_query), timeout=seconds_left)
         except TimeoutExpired:
             # kill test process because it can also hung
             if proc.returncode is None:
@@ -185,12 +198,17 @@ def run_single_test(args, ext, server_logs_level, client_options, case_file, std
             total_time = (datetime.now() - start_time).total_seconds()
             return clickhouse_proc_create, "", "Timeout dropping database {} after test".format(database), total_time
 
+        shutil.rmtree(test_tmp_dir)
+
     total_time = (datetime.now() - start_time).total_seconds()
 
     # Normalize randomized database names in stdout, stderr files.
     os.system("LC_ALL=C sed -i -e 's/{test_db}/default/g' {file}".format(test_db=database, file=stdout_file))
     if not args.show_db_name:
         os.system("LC_ALL=C sed -i -e 's/{test_db}/default/g' {file}".format(test_db=database, file=stderr_file))
+    if args.replicated_database:
+        os.system("LC_ALL=C sed -i -e 's|/auto_{{shard}}||g' {file}".format(file=stdout_file))
+        os.system("LC_ALL=C sed -i -e 's|auto_{{replica}}||g' {file}".format(file=stdout_file))
 
     stdout = open(stdout_file, 'rb').read() if os.path.exists(stdout_file) else b''
     stdout = str(stdout, errors='replace', encoding='utf-8')
@@ -206,8 +224,12 @@ def need_retry(stderr):
 
 def get_processlist(args):
     try:
+        query = b"SHOW PROCESSLIST FORMAT Vertical"
+        if args.replicated_database:
+            query = b"SELECT materialize((hostName(), tcpPort())) as host, * " \
+                    b"FROM clusterAllReplicas('r', system.processes) WHERE query NOT LIKE '%system.processes%' FORMAT Vertical"
         clickhouse_proc = Popen(shlex.split(args.client), stdin=PIPE, stdout=PIPE, stderr=PIPE)
-        (stdout, _) = clickhouse_proc.communicate((b"SHOW PROCESSLIST FORMAT Vertical"), timeout=10)
+        (stdout, _) = clickhouse_proc.communicate((query), timeout=20)
         return False, stdout.decode('utf-8')
     except Exception as ex:
         print("Exception", ex)
@@ -216,11 +238,12 @@ def get_processlist(args):
 
 # collect server stacktraces using gdb
 def get_stacktraces_from_gdb(server_pid):
-    cmd = "gdb -batch -ex 'thread apply all backtrace' -p {}".format(server_pid)
     try:
+        cmd = "gdb -batch -ex 'thread apply all backtrace' -p {}".format(server_pid)
         return subprocess.check_output(cmd, shell=True).decode('utf-8')
     except Exception as ex:
-        return "Error occured while receiving stack traces from gdb: {}".format(str(ex))
+        print("Error occured while receiving stack traces from gdb: {}".format(str(ex)))
+        return None
 
 
 # collect server stacktraces from system.stack_trace table
@@ -230,21 +253,26 @@ def get_stacktraces_from_clickhouse(client):
         return subprocess.check_output("{} --allow_introspection_functions=1 --query "
                "\"SELECT arrayStringConcat(arrayMap(x, y -> concat(x, ': ', y), arrayMap(x -> addressToLine(x), trace), "
                "arrayMap(x -> demangle(addressToSymbol(x)), trace)), '\n') as trace "
-               "FROM system.stack_trace format Vertical\"".format(client), shell=True).decode('utf-8')
+               "FROM system.stack_trace format Vertical\"".format(client), shell=True, stderr=subprocess.STDOUT).decode('utf-8')
     except Exception as ex:
-        return "Error occured while receiving stack traces from client: {}".format(str(ex))
+        print("Error occured while receiving stack traces from client: {}".format(str(ex)))
+        return None
 
 
 def get_server_pid(server_tcp_port):
-    cmd = "lsof -i tcp:{port} -s tcp:LISTEN -Fp | awk '/^p[0-9]+$/{{print substr($0, 2)}}'".format(port=server_tcp_port)
-    try:
-        output = subprocess.check_output(cmd, shell=True)
-        if output:
-            return int(output)
-        else:
-            return None # server dead
-    except Exception:
-        return None
+    # lsof does not work in stress tests for some reason
+    cmd_lsof = "lsof -i tcp:{port} -s tcp:LISTEN -Fp | awk '/^p[0-9]+$/{{print substr($0, 2)}}'".format(port=server_tcp_port)
+    cmd_pidof = "pidof -s clickhouse-server"
+    commands = [cmd_lsof, cmd_pidof]
+    output = None
+    for cmd in commands:
+        try:
+            output = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True)
+            if output:
+                return int(output)
+        except Exception as e:
+            print("Cannot get server pid with {}, got {}: {}".format(cmd, output, e))
+    return None # most likely server dead
 
 
 def colored(text, args, color=None, on_color=None, attrs=None):
@@ -279,6 +307,9 @@ def run_tests_array(all_tests_with_params):
     failures_total = 0
     failures = 0
     failures_chain = 0
+    start_time = datetime.now()
+
+    is_concurrent = multiprocessing.current_process().name != "MainProcess"
 
     client_options = get_additional_client_options(args)
 
@@ -289,7 +320,7 @@ def run_tests_array(all_tests_with_params):
             return ''
 
     if all_tests:
-        print("\nRunning {} {} tests.".format(len(all_tests), suite) + "\n")
+        print(f"\nRunning {len(all_tests)} {suite} tests ({multiprocessing.current_process().name}).\n")
 
     for case in all_tests:
         if SERVER_DIED:
@@ -304,7 +335,6 @@ def run_tests_array(all_tests_with_params):
 
         try:
             status = ''
-            is_concurrent = multiprocessing.current_process().name != "MainProcess"
             if not is_concurrent:
                 sys.stdout.flush()
                 sys.stdout.write("{0:72}".format(name + ": "))
@@ -346,7 +376,7 @@ def run_tests_array(all_tests_with_params):
                         clickhouse_proc = Popen(shlex.split(args.client), stdin=PIPE, stdout=PIPE, stderr=PIPE, universal_newlines=True)
                         failed_to_check = False
                         try:
-                            clickhouse_proc.communicate(("SELECT 'Running test {suite}/{case} from pid={pid}';".format(pid = os.getpid(), case = case, suite = suite)), timeout=10)
+                            clickhouse_proc.communicate(("SELECT 'Running test {suite}/{case} from pid={pid}';".format(pid = os.getpid(), case = case, suite = suite)), timeout=20)
                         except:
                             failed_to_check = True
 
@@ -361,7 +391,7 @@ def run_tests_array(all_tests_with_params):
                     stdout_file = os.path.join(suite_tmp_dir, name) + file_suffix + '.stdout'
                     stderr_file = os.path.join(suite_tmp_dir, name) + file_suffix + '.stderr'
 
-                    proc, stdout, stderr, total_time = run_single_test(args, ext, server_logs_level, client_options, case_file, stdout_file, stderr_file)
+                    proc, stdout, stderr, total_time = run_single_test(args, ext, server_logs_level, client_options, case_file, stdout_file, stderr_file, suite_tmp_dir)
 
                     if proc.returncode is None:
                         try:
@@ -378,8 +408,8 @@ def run_tests_array(all_tests_with_params):
                             status += stderr
                     else:
                         counter = 1
-                        while proc.returncode != 0 and need_retry(stderr):
-                            proc, stdout, stderr, total_time = run_single_test(args, ext, server_logs_level, client_options, case_file, stdout_file, stderr_file)
+                        while need_retry(stderr):
+                            proc, stdout, stderr, total_time = run_single_test(args, ext, server_logs_level, client_options, case_file, stdout_file, stderr_file, suite_tmp_dir)
                             sleep(2**counter)
                             counter += 1
                             if counter > 6:
@@ -442,7 +472,7 @@ def run_tests_array(all_tests_with_params):
                                     failures_chain += 1
                                     status += MSG_FAIL
                                     status += print_test_time(total_time)
-                                    status += " - Long test not marked as 'long'"
+                                    status += " - Test runs too long (> 30s). Make it faster."
                                 else:
                                     passed_total += 1
                                     failures_chain = 0
@@ -473,12 +503,18 @@ def run_tests_array(all_tests_with_params):
     failures_total = failures_total + failures
 
     if failures_total > 0:
-        print(colored("\nHaving {failures_total} errors! {passed_total} tests passed. {skipped_total} tests skipped.".format(
-            passed_total = passed_total, skipped_total = skipped_total, failures_total = failures_total), args, "red", attrs=["bold"]))
+        print(colored(f"\nHaving {failures_total} errors! {passed_total} tests passed."
+            f" {skipped_total} tests skipped. {(datetime.now() - start_time).total_seconds():.2f} s elapsed"
+            f' ({multiprocessing.current_process().name}).',
+            args, "red", attrs=["bold"]))
         exit_code = 1
     else:
-        print(colored("\n{passed_total} tests passed. {skipped_total} tests skipped.".format(
-            passed_total = passed_total, skipped_total = skipped_total), args, "green", attrs=["bold"]))
+        print(colored(f"\n{passed_total} tests passed. {skipped_total} tests skipped."
+            f" {(datetime.now() - start_time).total_seconds():.2f} s elapsed"
+            f' ({multiprocessing.current_process().name}).',
+            args, "green", attrs=["bold"]))
+
+    sys.stdout.flush()
 
 
 server_logs_level = "warning"
@@ -643,7 +679,6 @@ def main(args):
     os.environ.setdefault("CLICKHOUSE_CONFIG", args.configserver)
     if args.configclient:
         os.environ.setdefault("CLICKHOUSE_CONFIG_CLIENT", args.configclient)
-    os.environ.setdefault("CLICKHOUSE_TMP", tmp_dir)
 
     # Force to print server warnings in stderr
     # Shell scripts could change logging level
@@ -671,10 +706,10 @@ def main(args):
             args.shard = False
 
     if args.database and args.database != "test":
-        clickhouse_proc_create = Popen(shlex.split(args.client), stdin=PIPE, stdout=PIPE, stderr=PIPE, universal_newlines=True)
+        clickhouse_proc_create = Popen(shlex.split(args.client), stdin=PIPE, stdout=PIPE, stderr=None, universal_newlines=True)
         clickhouse_proc_create.communicate(("CREATE DATABASE IF NOT EXISTS " + args.database + get_db_engine(args, args.database)))
 
-    clickhouse_proc_create = Popen(shlex.split(args.client), stdin=PIPE, stdout=PIPE, stderr=PIPE, universal_newlines=True)
+    clickhouse_proc_create = Popen(shlex.split(args.client), stdin=PIPE, stdout=PIPE, stderr=None, universal_newlines=True)
     clickhouse_proc_create.communicate(("CREATE DATABASE IF NOT EXISTS test" + get_db_engine(args, 'test')))
 
     def is_test_from_dir(suite_dir, case):
@@ -774,7 +809,8 @@ def main(args):
                 if jobs > run_total:
                     run_total = jobs
 
-                batch_size = len(parallel_tests) // jobs
+                # Create two batches per process for more uniform execution time.
+                batch_size = max(1, len(parallel_tests) // (jobs * 2))
                 parallel_tests_array = []
                 for i in range(0, len(parallel_tests), batch_size):
                     parallel_tests_array.append((parallel_tests[i:i+batch_size], suite, suite_dir, suite_tmp_dir))
@@ -806,21 +842,26 @@ def main(args):
 
             clickhouse_tcp_port = os.getenv("CLICKHOUSE_PORT_TCP", '9000')
             server_pid = get_server_pid(clickhouse_tcp_port)
+            bt = None
             if server_pid:
                 print("\nLocated ClickHouse server process {} listening at TCP port {}".format(server_pid, clickhouse_tcp_port))
-
-                # It does not work in Sandbox
-                #print("\nCollecting stacktraces from system.stacktraces table:")
-                #print(get_stacktraces_from_clickhouse(args.client))
-
                 print("\nCollecting stacktraces from all running threads with gdb:")
-                print(get_stacktraces_from_gdb(server_pid))
-            else:
+                bt = get_stacktraces_from_gdb(server_pid)
+                if len(bt) < 1000:
+                    print("Got suspiciously small stacktraces: ", bt)
+                    bt = None
+            if bt is None:
+                print("\nCollecting stacktraces from system.stacktraces table:")
+                bt = get_stacktraces_from_clickhouse(args.client)
+            if bt is None:
                 print(
                     colored(
                         "\nUnable to locate ClickHouse server process listening at TCP port {}. "
                         "It must have crashed or exited prematurely!".format(clickhouse_tcp_port),
                         args, "red", attrs=["bold"]))
+            else:
+                print(bt)
+
 
             exit_code = 1
         else:
@@ -829,6 +870,8 @@ def main(args):
     if total_tests_run == 0:
         print("No tests were run.")
         sys.exit(1)
+    else:
+        print("All tests have finished.")
 
     sys.exit(exit_code)
 
diff --git a/tests/clickhouse-test-server b/tests/clickhouse-test-server
index a6b6bd86dfa..4087468b597 100755
--- a/tests/clickhouse-test-server
+++ b/tests/clickhouse-test-server
@@ -60,6 +60,7 @@ if [ "$DATA_DIR_PATTERN" != "$DATA_DIR" ]; then
     cat ${CONFIG_SERVER_DIR}/ints_dictionary.xml | sed -e s!9000!$CLICKHOUSE_PORT_TCP! > $DATA_DIR/etc/ints_dictionary.xml
     cat ${CONFIG_SERVER_DIR}/strings_dictionary.xml | sed -e s!9000!$CLICKHOUSE_PORT_TCP! > $DATA_DIR/etc/strings_dictionary.xml
     cat ${CONFIG_SERVER_DIR}/decimals_dictionary.xml | sed -e s!9000!$CLICKHOUSE_PORT_TCP! > $DATA_DIR/etc/decimals_dictionary.xml
+    cat ${CONFIG_SERVER_DIR}/executable_pool_dictionary.xml | sed -e s!9000!$CLICKHOUSE_PORT_TCP! > $DATA_DIR/etc/executable_pool_dictionary.xml
 fi
 
 CLICKHOUSE_EXTRACT_CONFIG=${CLICKHOUSE_EXTRACT_CONFIG:="${CLICKHOUSE_EXTRACT} --config=$CLICKHOUSE_CONFIG"}
diff --git a/tests/config/config.d/clusters.xml b/tests/config/config.d/clusters.xml
index c0babf0ff89..86dba46e07a 100644
--- a/tests/config/config.d/clusters.xml
+++ b/tests/config/config.d/clusters.xml
@@ -16,5 +16,17 @@
                  </replica>
              </shard>
          </test_cluster_two_shards_different_databases>
+	    <test_cluster_one_shard_two_replicas>
+           <shard>
+               <replica>
+                   <host>127.0.0.1</host>
+                   <port>9000</port>
+               </replica>
+               <replica>
+                   <host>127.0.0.2</host>
+                   <port>9000</port>
+               </replica>
+           </shard>
+        </test_cluster_one_shard_two_replicas>
     </remote_servers>
-</yandex>
\ No newline at end of file
+</yandex>
diff --git a/tests/config/config.d/database_replicated.xml b/tests/config/config.d/database_replicated.xml
new file mode 100644
index 00000000000..9a3b4d68ea6
--- /dev/null
+++ b/tests/config/config.d/database_replicated.xml
@@ -0,0 +1,82 @@
+<yandex>
+    <zookeeper>
+        <node index="1">
+            <host>localhost</host>
+            <port>9181</port>
+        </node>
+        <node index="2">
+            <host>localhost</host>
+            <port>19181</port>
+        </node>
+        <node index="3">
+            <host>localhost</host>
+            <port>29181</port>
+        </node>
+    </zookeeper>
+
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>1</server_id>
+
+        <coordination_settings>
+            <operation_timeout_ms>10000</operation_timeout_ms>
+            <session_timeout_ms>30000</session_timeout_ms>
+            <heart_beat_interval_ms>1000</heart_beat_interval_ms>
+            <election_timeout_lower_bound_ms>2000</election_timeout_lower_bound_ms>
+            <election_timeout_upper_bound_ms>4000</election_timeout_upper_bound_ms>
+            <raft_logs_level>trace</raft_logs_level>
+            <force_sync>false</force_sync>
+            <!-- we want all logs for complex problems investigation -->
+            <reserved_log_items>1000000000000000</reserved_log_items>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>localhost</hostname>
+                <port>44444</port>
+                <can_become_leader>true</can_become_leader>
+                <priority>3</priority>
+            </server>
+            <server>
+                <id>2</id>
+                <hostname>localhost</hostname>
+                <port>44445</port>
+                <can_become_leader>true</can_become_leader>
+                <start_as_follower>true</start_as_follower>
+                <priority>2</priority>
+            </server>
+            <server>
+                <id>3</id>
+                <hostname>localhost</hostname>
+                <port>44446</port>
+                <can_become_leader>true</can_become_leader>
+                <start_as_follower>true</start_as_follower>
+                <priority>1</priority>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+
+    <remote_servers>
+        <test_cluster_database_replicated>
+            <shard>
+                <replica>
+                    <host>localhost</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>localhost</host>
+                    <port>19000</port>
+                </replica>
+            </shard>
+            <shard>
+                <replica>
+                    <host>localhost</host>
+                    <port>29000</port>
+                </replica>
+            </shard>
+        </test_cluster_database_replicated>
+    </remote_servers>
+
+    <_functional_tests_helper_database_replicated_replace_args_macros>1</_functional_tests_helper_database_replicated_replace_args_macros>
+</yandex>
diff --git a/tests/config/config.d/test_keeper_port.xml b/tests/config/config.d/keeper_port.xml
similarity index 63%
rename from tests/config/config.d/test_keeper_port.xml
rename to tests/config/config.d/keeper_port.xml
index 97c6d7c2e33..b21df47bc85 100644
--- a/tests/config/config.d/test_keeper_port.xml
+++ b/tests/config/config.d/keeper_port.xml
@@ -1,13 +1,15 @@
 <yandex>
-    <test_keeper_server>
+    <keeper_server>
         <tcp_port>9181</tcp_port>
         <server_id>1</server_id>
 
         <coordination_settings>
             <operation_timeout_ms>10000</operation_timeout_ms>
             <session_timeout_ms>30000</session_timeout_ms>
-            <snapshot_distance>0</snapshot_distance>
-            <reserved_log_items>0</reserved_log_items>
+            <force_sync>false</force_sync>
+            <startup_timeout>60000</startup_timeout>
+            <!-- we want all logs for complex problems investigation -->
+            <reserved_log_items>1000000000000000</reserved_log_items>
         </coordination_settings>
 
         <raft_configuration>
@@ -17,5 +19,5 @@
                 <port>44444</port>
             </server>
         </raft_configuration>
-    </test_keeper_server>
+    </keeper_server>
 </yandex>
diff --git a/tests/config/executable_pool_dictionary.xml b/tests/config/executable_pool_dictionary.xml
new file mode 100644
index 00000000000..13f34f0048e
--- /dev/null
+++ b/tests/config/executable_pool_dictionary.xml
@@ -0,0 +1,154 @@
+<dictionaries>
+
+<dictionary>
+    <name>executable_pool_simple</name>
+
+    <structure>
+        <id>
+            <name>x</name>
+        </id>
+        <attribute>
+            <name>a</name>
+            <type>String</type>
+            <null_value></null_value>
+        </attribute>
+        <attribute>
+            <name>b</name>
+            <type>String</type>
+            <null_value></null_value>
+        </attribute>
+    </structure>
+
+    <source>
+        <executable_pool>
+            <format>TabSeparated</format>
+            <command>while read read_data; do printf "$read_data\t$read_data a\t$read_data b\n"; done</command>
+            <size>5</size>
+        </executable_pool>
+    </source>
+
+    <layout>
+        <direct />
+    </layout>
+
+    <lifetime>300</lifetime>
+</dictionary>
+
+<dictionary>
+    <name>executable_pool_complex</name>
+
+    <structure>
+        <key>
+            <attribute>
+                <name>x</name>
+                <type>String</type>
+            </attribute>
+            <attribute>
+                <name>y</name>
+                <type>String</type>
+            </attribute>
+        </key>
+        <attribute>
+            <name>a</name>
+            <type>String</type>
+            <null_value></null_value>
+        </attribute>
+        <attribute>
+            <name>b</name>
+            <type>String</type>
+            <null_value></null_value>
+        </attribute>
+    </structure>
+
+    <source>
+        <executable>
+            <format>TabSeparated</format>
+            <command>while read read_data; do printf "$read_data\tvalue a\tvalue b\n"; done</command>
+        </executable>
+    </source>
+
+    <layout>
+        <complex_key_direct />
+    </layout>
+
+    <lifetime>300</lifetime>
+</dictionary>
+
+<dictionary>
+    <name>executable_pool_simple_implicit_key</name>
+
+    <structure>
+        <id>
+            <name>x</name>
+        </id>
+        <attribute>
+            <name>a</name>
+            <type>String</type>
+            <null_value></null_value>
+        </attribute>
+        <attribute>
+            <name>b</name>
+            <type>String</type>
+            <null_value></null_value>
+        </attribute>
+    </structure>
+
+    <source>
+        <executable_pool>
+            <format>TabSeparated</format>
+            <command>while read read_data; do printf "$read_data a\t$read_data b\n"; done</command>
+            <size>5</size>
+            <implicit_key>true</implicit_key>
+        </executable_pool>
+    </source>
+
+    <layout>
+        <direct />
+    </layout>
+
+    <lifetime>300</lifetime>
+</dictionary>
+
+<dictionary>
+    <name>executable_pool_complex_implicit_key</name>
+
+    <structure>
+        <key>
+            <attribute>
+                <name>x</name>
+                <type>String</type>
+            </attribute>
+            <attribute>
+                <name>y</name>
+                <type>String</type>
+            </attribute>
+        </key>
+        <attribute>
+            <name>a</name>
+            <type>String</type>
+            <null_value></null_value>
+        </attribute>
+        <attribute>
+            <name>b</name>
+            <type>String</type>
+            <null_value></null_value>
+        </attribute>
+    </structure>
+
+    <source>
+        <executable_pool>
+            <format>TabSeparated</format>
+            <command>while read read_data; do printf "data a\tdata b\n"; done</command>
+            <size>5</size>
+            <implicit_key>true</implicit_key>
+        </executable_pool>
+    </source>
+
+    <layout>
+        <complex_key_direct />
+    </layout>
+
+    <lifetime>300</lifetime>
+</dictionary>
+
+</dictionaries>
diff --git a/tests/config/install.sh b/tests/config/install.sh
index de6ba2a7a09..7e01860e241 100755
--- a/tests/config/install.sh
+++ b/tests/config/install.sh
@@ -29,7 +29,7 @@ ln -sf $SRC_PATH/config.d/graphite.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/database_atomic.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/max_concurrent_queries.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/test_cluster_with_incorrect_pw.xml $DEST_SERVER_PATH/config.d/
-ln -sf $SRC_PATH/config.d/test_keeper_port.xml $DEST_SERVER_PATH/config.d/
+ln -sf $SRC_PATH/config.d/keeper_port.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/logging_no_rotate.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/tcp_with_proxy.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/top_level_domains_lists.xml $DEST_SERVER_PATH/config.d/
@@ -39,11 +39,13 @@ ln -sf $SRC_PATH/users.d/readonly.xml $DEST_SERVER_PATH/users.d/
 ln -sf $SRC_PATH/users.d/access_management.xml $DEST_SERVER_PATH/users.d/
 ln -sf $SRC_PATH/users.d/database_atomic_drop_detach_sync.xml $DEST_SERVER_PATH/users.d/
 ln -sf $SRC_PATH/users.d/opentelemetry.xml $DEST_SERVER_PATH/users.d/
+ln -sf $SRC_PATH/users.d/remote_queries.xml $DEST_SERVER_PATH/users.d/
 
 ln -sf $SRC_PATH/ints_dictionary.xml $DEST_SERVER_PATH/
 ln -sf $SRC_PATH/strings_dictionary.xml $DEST_SERVER_PATH/
 ln -sf $SRC_PATH/decimals_dictionary.xml $DEST_SERVER_PATH/
 ln -sf $SRC_PATH/executable_dictionary.xml $DEST_SERVER_PATH/
+ln -sf $SRC_PATH/executable_pool_dictionary.xml $DEST_SERVER_PATH/
 
 ln -sf $SRC_PATH/top_level_domains $DEST_SERVER_PATH/
 
@@ -63,6 +65,31 @@ if [[ -n "$USE_DATABASE_ORDINARY" ]] && [[ "$USE_DATABASE_ORDINARY" -eq 1 ]]; th
 fi
 if [[ -n "$USE_DATABASE_REPLICATED" ]] && [[ "$USE_DATABASE_REPLICATED" -eq 1 ]]; then
     ln -sf $SRC_PATH/users.d/database_replicated.xml $DEST_SERVER_PATH/users.d/
+    ln -sf $SRC_PATH/config.d/database_replicated.xml $DEST_SERVER_PATH/config.d/
+    rm /etc/clickhouse-server/config.d/zookeeper.xml
+    rm /etc/clickhouse-server/config.d/keeper_port.xml
+
+    # There is a bug in config reloading, so we cannot override macros using --macros.replica r2
+    # And we have to copy configs...
+    mkdir -p /etc/clickhouse-server1
+    mkdir -p /etc/clickhouse-server2
+    chown clickhouse /etc/clickhouse-server1
+    chown clickhouse /etc/clickhouse-server2
+    chgrp clickhouse /etc/clickhouse-server1
+    chgrp clickhouse /etc/clickhouse-server2
+    sudo -u clickhouse cp -r /etc/clickhouse-server/* /etc/clickhouse-server1
+    sudo -u clickhouse cp -r /etc/clickhouse-server/* /etc/clickhouse-server2
+    rm /etc/clickhouse-server1/config.d/macros.xml
+    rm /etc/clickhouse-server2/config.d/macros.xml
+    sudo -u clickhouse cat /etc/clickhouse-server/config.d/macros.xml | sed "s|<replica>r1</replica>|<replica>r2</replica>|" > /etc/clickhouse-server1/config.d/macros.xml
+    sudo -u clickhouse cat /etc/clickhouse-server/config.d/macros.xml | sed "s|<shard>s1</shard>|<shard>s2</shard>|" > /etc/clickhouse-server2/config.d/macros.xml
+
+    sudo mkdir -p /var/lib/clickhouse1
+    sudo mkdir -p /var/lib/clickhouse2
+    sudo chown clickhouse /var/lib/clickhouse1
+    sudo chown clickhouse /var/lib/clickhouse2
+    sudo chgrp clickhouse /var/lib/clickhouse1
+    sudo chgrp clickhouse /var/lib/clickhouse2
 fi
 
 ln -sf $SRC_PATH/client_config.xml $DEST_CLIENT_PATH/config.xml
diff --git a/tests/config/users.d/database_replicated.xml b/tests/config/users.d/database_replicated.xml
index 23801d00154..903b8a64e22 100644
--- a/tests/config/users.d/database_replicated.xml
+++ b/tests/config/users.d/database_replicated.xml
@@ -2,9 +2,11 @@
     <profiles>
         <default>
             <allow_experimental_database_replicated>1</allow_experimental_database_replicated>
-            <database_replicated_ddl_output>0</database_replicated_ddl_output>
+            <distributed_ddl_output_mode>none</distributed_ddl_output_mode>
             <database_replicated_initial_query_timeout_sec>30</database_replicated_initial_query_timeout_sec>
             <distributed_ddl_task_timeout>30</distributed_ddl_task_timeout>
+            <database_replicated_always_detach_permanently>1</database_replicated_always_detach_permanently>
+            <distributed_ddl_entry_format_version>2</distributed_ddl_entry_format_version>
         </default>
     </profiles>
 </yandex>
diff --git a/tests/config/users.d/remote_queries.xml b/tests/config/users.d/remote_queries.xml
new file mode 100644
index 00000000000..97060780fa4
--- /dev/null
+++ b/tests/config/users.d/remote_queries.xml
@@ -0,0 +1,13 @@
+<yandex>
+    <profiles>
+        <default>
+            <!-- Avoid "Connection failed at try №1" messages. -->
+            <connect_timeout_with_failover_ms>2000</connect_timeout_with_failover_ms>
+            <connect_timeout_with_failover_secure_ms>3000</connect_timeout_with_failover_secure_ms>
+            <!-- Avoid this logic in tests to avoid EOF (10 hours is enough for tests)-->
+            <idle_connection_timeout>36000</idle_connection_timeout>
+            <!-- NOTE: instead of tunning idle_connection_timeout,
+                 SYSTEM RELOAD CONFIG can be executed before each test -->
+        </default>
+    </profiles>
+</yandex>
diff --git a/tests/fuzz/ast.dict b/tests/fuzz/ast.dict
index 8327f276b31..7befb36c840 100644
--- a/tests/fuzz/ast.dict
+++ b/tests/fuzz/ast.dict
@@ -156,6 +156,7 @@
 "extractURLParameterNames"
 "extractURLParameters"
 "FETCH PARTITION"
+"FETCH PART"
 "FINAL"
 "FIRST"
 "firstSignificantSubdomain"
diff --git a/tests/integration/README.md b/tests/integration/README.md
index cdfb6b1a70a..e4073f96449 100644
--- a/tests/integration/README.md
+++ b/tests/integration/README.md
@@ -12,7 +12,7 @@ You must install latest Docker from
 https://docs.docker.com/engine/installation/linux/docker-ce/ubuntu/#set-up-the-repository
 Don't use Docker from your system repository.
 
-* [pip](https://pypi.python.org/pypi/pip) and `libpq-dev`. To install: `sudo apt-get install python3-pip libpq-dev zlib1g-dev libcrypto++-dev libssl-dev`
+* [pip](https://pypi.python.org/pypi/pip) and `libpq-dev`. To install: `sudo apt-get install python3-pip libpq-dev zlib1g-dev libcrypto++-dev libssl-dev libkrb5-dev`
 * [py.test](https://docs.pytest.org/) testing framework. To install: `sudo -H pip install pytest`
 * [docker-compose](https://docs.docker.com/compose/) and additional python libraries. To install:
 
@@ -39,7 +39,8 @@ sudo -H pip install \
     redis \
     tzlocal \
     urllib3 \
-    requests-kerberos
+    requests-kerberos \
+    dict2xml
 ```
 
 (highly not recommended) If you really want to use OS packages on modern debian/ubuntu instead of "pip": `sudo apt install -y docker docker-compose python3-pytest python3-dicttoxml python3-docker python3-pymysql python3-pymongo python3-tzlocal python3-kazoo python3-psycopg2 kafka-python python3-pytest-timeout python3-minio`
diff --git a/tests/integration/ci-runner.py b/tests/integration/ci-runner.py
new file mode 100755
index 00000000000..a21f3d344ba
--- /dev/null
+++ b/tests/integration/ci-runner.py
@@ -0,0 +1,568 @@
+#!/usr/bin/env python3
+
+import logging
+import subprocess
+import os
+import time
+import shutil
+from collections import defaultdict
+import random
+import json
+import csv
+
+
+MAX_RETRY = 2
+SLEEP_BETWEEN_RETRIES = 5
+CLICKHOUSE_BINARY_PATH = "/usr/bin/clickhouse"
+CLICKHOUSE_ODBC_BRIDGE_BINARY_PATH = "/usr/bin/clickhouse-odbc-bridge"
+CLICKHOUSE_LIBRARY_BRIDGE_BINARY_PATH = "/usr/bin/clickhouse-library-bridge"
+
+TRIES_COUNT = 10
+MAX_TIME_SECONDS = 3600
+
+MAX_TIME_IN_SANDBOX = 20 * 60   # 20 minutes
+TASK_TIMEOUT = 8 * 60 * 60      # 8 hours
+
+def get_tests_to_run(pr_info):
+    result = set([])
+    changed_files = pr_info['changed_files']
+
+    if changed_files is None:
+        return []
+
+    for fpath in changed_files:
+        if 'tests/integration/test_' in fpath:
+            logging.info('File %s changed and seems like integration test', fpath)
+            result.add(fpath.split('/')[2])
+    return list(result)
+
+
+def filter_existing_tests(tests_to_run, repo_path):
+    result = []
+    for relative_test_path in tests_to_run:
+        if os.path.exists(os.path.join(repo_path, 'tests/integration', relative_test_path)):
+            result.append(relative_test_path)
+        else:
+            logging.info("Skipping test %s, seems like it was removed", relative_test_path)
+    return result
+
+
+def _get_deselect_option(tests):
+    return ' '.join(['--deselect {}'.format(t) for t in tests])
+
+
+def parse_test_results_output(fname):
+    read = False
+    description_output = []
+    with open(fname, 'r') as out:
+        for line in out:
+            if read and line.strip() and not line.startswith('=='):
+                description_output.append(line.strip())
+            if 'short test summary info' in line:
+                read = True
+    return description_output
+
+
+def get_counters(output):
+    counters = {
+        "ERROR": set([]),
+        "PASSED": set([]),
+        "FAILED": set([]),
+    }
+
+    for line in output:
+        if '.py' in line:
+            line_arr = line.strip().split(' ')
+            state = line_arr[0]
+            test_name = ' '.join(line_arr[1:])
+            if ' - ' in test_name:
+                test_name = test_name[:test_name.find(' - ')]
+            if state in counters:
+                counters[state].add(test_name)
+            else:
+                logging.info("Strange line %s", line)
+        else:
+            logging.info("Strange line %s")
+    return {k: list(v) for k, v in counters.items()}
+
+
+def parse_test_times(fname):
+    read = False
+    description_output = []
+    with open(fname, 'r') as out:
+        for line in out:
+            if read and '==' in line:
+                break
+            if read and line.strip():
+                description_output.append(line.strip())
+            if 'slowest durations' in line:
+                read = True
+    return description_output
+
+
+def get_test_times(output):
+    result = defaultdict(float)
+    for line in output:
+        if '.py' in line:
+            line_arr = line.strip().split(' ')
+            test_time = line_arr[0]
+            test_name = ' '.join([elem for elem in line_arr[2:] if elem])
+            if test_name not in result:
+                result[test_name] = 0.0
+            result[test_name] += float(test_time[:-1])
+    return result
+
+
+def clear_ip_tables_and_restart_daemons():
+    logging.info("Dump iptables after run %s", subprocess.check_output("iptables -L", shell=True))
+    try:
+        logging.info("Killing all alive docker containers")
+        subprocess.check_output("docker kill $(docker ps -q)", shell=True)
+    except subprocess.CalledProcessError as err:
+        logging.info("docker kill excepted: " + str(err))
+
+    try:
+        logging.info("Removing all docker containers")
+        subprocess.check_output("docker rm $(docker ps -a -q) --force", shell=True)
+    except subprocess.CalledProcessError as err:
+        logging.info("docker rm excepted: " + str(err))
+
+    try:
+        logging.info("Stopping docker daemon")
+        subprocess.check_output("service docker stop", shell=True)
+    except subprocess.CalledProcessError as err:
+        logging.info("docker stop excepted: " + str(err))
+
+    try:
+        for i in range(200):
+            try:
+                logging.info("Restarting docker %s", i)
+                subprocess.check_output("service docker start", shell=True)
+                subprocess.check_output("docker ps", shell=True)
+                break
+            except subprocess.CalledProcessError as err:
+                time.sleep(0.5)
+                logging.info("Waiting docker to start, current %s", str(err))
+        else:
+            raise Exception("Docker daemon doesn't responding")
+    except subprocess.CalledProcessError as err:
+        logging.info("Can't reload docker: " + str(err))
+
+    iptables_iter = 0
+    try:
+        for i in range(1000):
+            iptables_iter = i
+            # when rules will be empty, it will raise exception
+            subprocess.check_output("iptables -D DOCKER-USER 1", shell=True)
+    except subprocess.CalledProcessError as err:
+        logging.info("All iptables rules cleared, " + str(iptables_iter) + "iterations, last error: " + str(err))
+
+
+class ClickhouseIntegrationTestsRunner:
+
+    def __init__(self, result_path, params):
+        self.result_path = result_path
+        self.params = params
+
+        self.image_versions = self.params['docker_images_with_versions']
+        self.shuffle_groups = self.params['shuffle_test_groups']
+        self.flaky_check = 'flaky check' in self.params['context_name']
+        self.start_time = time.time()
+        self.soft_deadline_time = self.start_time + (TASK_TIMEOUT - MAX_TIME_IN_SANDBOX)
+
+    def path(self):
+        return self.result_path
+
+    def base_path(self):
+        return os.path.join(str(self.result_path), '../')
+
+    def should_skip_tests(self):
+        return []
+
+    def get_image_with_version(self, name):
+        if name in self.image_versions:
+            return name + ":" + self.image_versions[name]
+        logging.warn("Cannot find image %s in params list %s", name, self.image_versions)
+        if ':' not in name:
+            return name + ":latest"
+        return name
+
+    def get_single_image_version(self):
+        name = self.get_images_names()[0]
+        if name in self.image_versions:
+            return self.image_versions[name]
+        logging.warn("Cannot find image %s in params list %s", name, self.image_versions)
+        return 'latest'
+
+    def shuffle_test_groups(self):
+        return self.shuffle_groups != 0
+
+    @staticmethod
+    def get_images_names():
+        return ["yandex/clickhouse-integration-tests-runner", "yandex/clickhouse-mysql-golang-client",
+                "yandex/clickhouse-mysql-java-client", "yandex/clickhouse-mysql-js-client",
+                "yandex/clickhouse-mysql-php-client", "yandex/clickhouse-postgresql-java-client",
+                "yandex/clickhouse-integration-test", "yandex/clickhouse-kerberos-kdc",
+                "yandex/clickhouse-integration-helper", ]
+
+
+    def _can_run_with(self, path, opt):
+        with open(path, 'r') as script:
+            for line in script:
+                if opt in line:
+                    return True
+        return False
+
+    def _install_clickhouse(self, debs_path):
+        for package in ('clickhouse-common-static_', 'clickhouse-server_', 'clickhouse-client', 'clickhouse-common-static-dbg_'):  # order matters
+            logging.info("Installing package %s", package)
+            for f in os.listdir(debs_path):
+                if package in f:
+                    full_path = os.path.join(debs_path, f)
+                    logging.info("Package found in %s", full_path)
+                    log_name = "install_" + f + ".log"
+                    log_path = os.path.join(str(self.path()), log_name)
+                    with open(log_path, 'w') as log:
+                        cmd = "dpkg -i {}".format(full_path)
+                        logging.info("Executing installation cmd %s", cmd)
+                        retcode = subprocess.Popen(cmd, shell=True, stderr=log, stdout=log).wait()
+                        if retcode == 0:
+                            logging.info("Instsallation of %s successfull", full_path)
+                        else:
+                            raise Exception("Installation of %s failed", full_path)
+                    break
+            else:
+                raise Exception("Package with {} not found".format(package))
+        logging.info("Unstripping binary")
+        # logging.info("Unstring %s", subprocess.check_output("eu-unstrip /usr/bin/clickhouse {}".format(CLICKHOUSE_BINARY_PATH), shell=True))
+
+        logging.info("All packages installed")
+        os.chmod(CLICKHOUSE_BINARY_PATH, 0o777)
+        os.chmod(CLICKHOUSE_ODBC_BRIDGE_BINARY_PATH, 0o777)
+        os.chmod(CLICKHOUSE_LIBRARY_BRIDGE_BINARY_PATH, 0o777)
+        result_path_bin = os.path.join(str(self.base_path()), "clickhouse")
+        result_path_odbc_bridge = os.path.join(str(self.base_path()), "clickhouse-odbc-bridge")
+        result_path_library_bridge = os.path.join(str(self.base_path()), "clickhouse-library-bridge")
+        shutil.copy(CLICKHOUSE_BINARY_PATH, result_path_bin)
+        shutil.copy(CLICKHOUSE_ODBC_BRIDGE_BINARY_PATH, result_path_odbc_bridge)
+        shutil.copy(CLICKHOUSE_LIBRARY_BRIDGE_BINARY_PATH, result_path_library_bridge)
+        return None, None
+
+    def _compress_logs(self, path, result_path):
+        subprocess.check_call("tar czf {} -C {} .".format(result_path, path), shell=True)  # STYLE_CHECK_ALLOW_SUBPROCESS_CHECK_CALL
+
+    def _get_all_tests(self, repo_path):
+        image_cmd = self._get_runner_image_cmd(repo_path)
+        cmd = "cd {}/tests/integration && ./runner {} ' --setup-plan' | grep '::' | sed 's/ (fixtures used:.*//g' | sed 's/^ *//g' > all_tests.txt".format(repo_path, image_cmd)
+        logging.info("Getting all tests with cmd '%s'", cmd)
+        subprocess.check_call(cmd, shell=True)  # STYLE_CHECK_ALLOW_SUBPROCESS_CHECK_CALL
+
+        all_tests_file_path = "{}/tests/integration/all_tests.txt".format(repo_path)
+        if not os.path.isfile(all_tests_file_path) or os.path.getsize(all_tests_file_path) == 0:
+            raise Exception("There is something wrong with getting all tests list: file '{}' is empty or does not exist.".format(all_tests_file_path))
+
+        all_tests = []
+        with open(all_tests_file_path, "r") as all_tests_file:
+            for line in all_tests_file:
+                all_tests.append(line.strip())
+        return list(sorted(all_tests))
+
+    def group_test_by_file(self, tests):
+        result = {}
+        for test in tests:
+            test_file = test.split('::')[0]
+            if test_file not in result:
+                result[test_file] = []
+            result[test_file].append(test)
+        return result
+
+    def _update_counters(self, main_counters, current_counters):
+        for test in current_counters["PASSED"]:
+            if test not in main_counters["PASSED"] and test not in main_counters["FLAKY"]:
+                is_flaky = False
+                if test in main_counters["FAILED"]:
+                    main_counters["FAILED"].remove(test)
+                    is_flaky = True
+                if test in main_counters["ERROR"]:
+                    main_counters["ERROR"].remove(test)
+                    is_flaky = True
+
+                if is_flaky:
+                    main_counters["FLAKY"].append(test)
+                else:
+                    main_counters["PASSED"].append(test)
+
+        for state in ("ERROR", "FAILED"):
+            for test in current_counters[state]:
+                if test in main_counters["FLAKY"]:
+                    continue
+                if test in main_counters["PASSED"]:
+                    main_counters["PASSED"].remove(test)
+                    main_counters["FLAKY"].append(test)
+                    continue
+                if test not in main_counters[state]:
+                    main_counters[state].append(test)
+
+    def _get_runner_image_cmd(self, repo_path):
+        image_cmd = ''
+        if self._can_run_with(os.path.join(repo_path, "tests/integration", "runner"), '--docker-image-version'):
+            for img in self.get_images_names():
+                if img == "yandex/clickhouse-integration-tests-runner":
+                    runner_version = self.get_single_image_version()
+                    logging.info("Can run with custom docker image version %s", runner_version)
+                    image_cmd += ' --docker-image-version={} '.format(runner_version)
+                else:
+                    if self._can_run_with(os.path.join(repo_path, "tests/integration", "runner"), '--docker-compose-images-tags'):
+                        image_cmd += '--docker-compose-images-tags={} '.format(self.get_image_with_version(img))
+        else:
+            image_cmd = ''
+            logging.info("Cannot run with custom docker image version :(")
+        return image_cmd
+
+    def run_test_group(self, repo_path, test_group, tests_in_group, num_tries):
+        counters = {
+            "ERROR": [],
+            "PASSED": [],
+            "FAILED": [],
+            "SKIPPED": [],
+            "FLAKY": [],
+        }
+        tests_times = defaultdict(float)
+
+        if self.soft_deadline_time < time.time():
+            for test in tests_in_group:
+                logging.info("Task timeout exceeded, skipping %s", test)
+                counters["SKIPPED"].append(test)
+                tests_times[test] = 0
+            return counters, tests_times, []
+
+        image_cmd = self._get_runner_image_cmd(repo_path)
+        test_group_str = test_group.replace('/', '_').replace('.', '_')
+        log_paths = []
+
+        for i in range(num_tries):
+            logging.info("Running test group %s for the %s retry", test_group, i)
+            clear_ip_tables_and_restart_daemons()
+
+            output_path = os.path.join(str(self.path()), "test_output_" + test_group_str + "_" + str(i) + ".log")
+            log_name = "integration_run_" + test_group_str + "_" + str(i) + ".txt"
+            log_path = os.path.join(str(self.path()), log_name)
+            log_paths.append(log_path)
+            logging.info("Will wait output inside %s", output_path)
+
+            test_names = set([])
+            for test_name in tests_in_group:
+                if test_name not in counters["PASSED"]:
+                    if '[' in test_name:
+                        test_names.add(test_name[:test_name.find('[')])
+                    else:
+                        test_names.add(test_name)
+
+            test_cmd = ' '.join([test for test in sorted(test_names)])
+            cmd = "cd {}/tests/integration && ./runner {} '-ss {} -rfEp --color=no --durations=0 {}' | tee {}".format(
+                repo_path, image_cmd, test_cmd, _get_deselect_option(self.should_skip_tests()), output_path)
+
+            with open(log_path, 'w') as log:
+                logging.info("Executing cmd: %s", cmd)
+                retcode = subprocess.Popen(cmd, shell=True, stderr=log, stdout=log).wait()
+                if retcode == 0:
+                    logging.info("Run %s group successfully", test_group)
+                else:
+                    logging.info("Some tests failed")
+
+            if os.path.exists(output_path):
+                lines = parse_test_results_output(output_path)
+                new_counters = get_counters(lines)
+                times_lines = parse_test_times(output_path)
+                new_tests_times = get_test_times(times_lines)
+                self._update_counters(counters, new_counters)
+                for test_name, test_time in new_tests_times.items():
+                    tests_times[test_name] = test_time
+                os.remove(output_path)
+            if len(counters["PASSED"]) + len(counters["FLAKY"]) == len(tests_in_group):
+                logging.info("All tests from group %s passed", test_group)
+                break
+            if len(counters["PASSED"]) + len(counters["FLAKY"]) >= 0 and len(counters["FAILED"]) == 0 and len(counters["ERROR"]) == 0:
+                logging.info("Seems like all tests passed but some of them are skipped or deselected. Ignoring them and finishing group.")
+                break
+        else:
+            for test in tests_in_group:
+                if test not in counters["PASSED"] and test not in counters["ERROR"] and test not in counters["FAILED"]:
+                    counters["ERROR"].append(test)
+
+        return counters, tests_times, log_paths
+
+    def run_flaky_check(self, repo_path, build_path):
+        pr_info = self.params['pr_info']
+
+        # pytest swears, if we require to run some tests which was renamed or deleted
+        tests_to_run = filter_existing_tests(get_tests_to_run(pr_info), repo_path)
+        if not tests_to_run:
+            logging.info("No tests to run found")
+            return 'success', 'Nothing to run', [('Nothing to run', 'OK')], ''
+
+        self._install_clickhouse(build_path)
+        logging.info("Found '%s' tests to run", ' '.join(tests_to_run))
+        result_state = "success"
+        description_prefix = "No flaky tests: "
+        start = time.time()
+        logging.info("Starting check with retries")
+        final_retry = 0
+        logs = []
+        for i in range(TRIES_COUNT):
+            final_retry += 1
+            logging.info("Running tests for the %s time", i)
+            counters, tests_times, log_paths = self.run_test_group(repo_path, "flaky", tests_to_run, 1)
+            logs += log_paths
+            if counters["FAILED"]:
+                logging.info("Found failed tests: %s", ' '.join(counters["FAILED"]))
+                description_prefix = "Flaky tests found: "
+                result_state = "failure"
+                break
+            if counters["ERROR"]:
+                description_prefix = "Flaky tests found: "
+                logging.info("Found error tests: %s", ' '.join(counters["ERROR"]))
+                # NOTE "error" result state will restart the whole test task, so we use "failure" here
+                result_state = "failure"
+                break
+            assert len(counters["FLAKY"]) == 0
+            logging.info("Try is OK, all tests passed, going to clear env")
+            clear_ip_tables_and_restart_daemons()
+            logging.info("And going to sleep for some time")
+            if time.time() - start > MAX_TIME_SECONDS:
+                logging.info("Timeout reached, going to finish flaky check")
+                break
+            time.sleep(5)
+
+        logging.info("Finally all tests done, going to compress test dir")
+        test_logs = os.path.join(str(self.path()), "./test_dir.tar.gz")
+        self._compress_logs("{}/tests/integration".format(repo_path), test_logs)
+        logging.info("Compression finished")
+
+        test_result = []
+        for state in ("ERROR", "FAILED", "PASSED", "SKIPPED", "FLAKY"):
+            if state == "PASSED":
+                text_state = "OK"
+            elif state == "FAILED":
+                text_state = "FAIL"
+            else:
+                text_state = state
+            test_result += [(c + ' (✕' + str(final_retry) + ')', text_state, "{:.2f}".format(tests_times[c])) for c in counters[state]]
+        status_text = description_prefix + ', '.join([str(n).lower().replace('failed', 'fail') + ': ' + str(len(c)) for n, c in counters.items()])
+
+        return result_state, status_text, test_result, [test_logs] + logs
+
+    def run_impl(self, repo_path, build_path):
+        if self.flaky_check:
+            return self.run_flaky_check(repo_path, build_path)
+
+        self._install_clickhouse(build_path)
+        logging.info("Dump iptables before run %s", subprocess.check_output("iptables -L", shell=True))
+        all_tests = self._get_all_tests(repo_path)
+        logging.info("Found %s tests first 3 %s", len(all_tests), ' '.join(all_tests[:3]))
+        grouped_tests = self.group_test_by_file(all_tests)
+        logging.info("Found %s tests groups", len(grouped_tests))
+
+        counters = {
+            "ERROR": [],
+            "PASSED": [],
+            "FAILED": [],
+            "SKIPPED": [],
+            "FLAKY": [],
+        }
+        tests_times = defaultdict(float)
+        tests_log_paths = defaultdict(list)
+
+        items_to_run = list(grouped_tests.items())
+
+        logging.info("Total test groups %s", len(items_to_run))
+        if self.shuffle_test_groups():
+            logging.info("Shuffling test groups")
+            random.shuffle(items_to_run)
+
+        for group, tests in items_to_run:
+            logging.info("Running test group %s countaining %s tests", group, len(tests))
+            group_counters, group_test_times, log_paths = self.run_test_group(repo_path, group, tests, MAX_RETRY)
+            total_tests = 0
+            for counter, value in group_counters.items():
+                logging.info("Tests from group %s stats, %s count %s", group, counter, len(value))
+                counters[counter] += value
+                logging.info("Totally have %s with status %s", len(counters[counter]), counter)
+                total_tests += len(counters[counter])
+            logging.info("Totally finished tests %s/%s", total_tests, len(all_tests))
+
+            for test_name, test_time in group_test_times.items():
+                tests_times[test_name] = test_time
+                tests_log_paths[test_name] = log_paths
+
+            if len(counters["FAILED"]) + len(counters["ERROR"]) >= 20:
+                logging.info("Collected more than 20 failed/error tests, stopping")
+                break
+
+        logging.info("Finally all tests done, going to compress test dir")
+        test_logs = os.path.join(str(self.path()), "./test_dir.tar.gz")
+        self._compress_logs("{}/tests/integration".format(repo_path), test_logs)
+        logging.info("Compression finished")
+
+        if counters["FAILED"] or counters["ERROR"]:
+            logging.info("Overall status failure, because we have tests in FAILED or ERROR state")
+            result_state = "failure"
+        else:
+            logging.info("Overall success!")
+            result_state = "success"
+
+        test_result = []
+        for state in ("ERROR", "FAILED", "PASSED", "SKIPPED", "FLAKY"):
+            if state == "PASSED":
+                text_state = "OK"
+            elif state == "FAILED":
+                text_state = "FAIL"
+            else:
+                text_state = state
+            test_result += [(c, text_state, "{:.2f}".format(tests_times[c]), tests_log_paths[c]) for c in counters[state]]
+
+        failed_sum = len(counters['FAILED']) + len(counters['ERROR'])
+        status_text = "fail: {}, passed: {}, flaky: {}".format(failed_sum, len(counters['PASSED']), len(counters['FLAKY']))
+
+        if self.soft_deadline_time < time.time():
+            status_text = "Timeout, " + status_text
+            result_state = "failure"
+
+        counters['FLAKY'] = []
+        if not counters or sum(len(counter) for counter in counters.values()) == 0:
+            status_text = "No tests found for some reason! It's a bug"
+            result_state = "failure"
+
+        if '(memory)' in self.params['context_name']:
+            result_state = "success"
+
+        return result_state, status_text, test_result, [test_logs]
+
+def write_results(results_file, status_file, results, status):
+    with open(results_file, 'w') as f:
+        out = csv.writer(f, delimiter='\t')
+        out.writerows(results)
+    with open(status_file, 'w') as f:
+        out = csv.writer(f, delimiter='\t')
+        out.writerow(status)
+
+if __name__ == "__main__":
+    logging.basicConfig(level=logging.INFO, format='%(asctime)s %(message)s')
+
+    repo_path = os.environ.get("CLICKHOUSE_TESTS_REPO_PATH")
+    build_path = os.environ.get("CLICKHOUSE_TESTS_BUILD_PATH")
+    result_path = os.environ.get("CLICKHOUSE_TESTS_RESULT_PATH")
+    params_path = os.environ.get("CLICKHOUSE_TESTS_JSON_PARAMS_PATH")
+
+    params = json.loads(open(params_path, 'r').read())
+    runner = ClickhouseIntegrationTestsRunner(result_path, params)
+
+    logging.info("Running tests")
+    state, description, test_results, _ = runner.run_impl(repo_path, build_path)
+    logging.info("Tests finished")
+
+    status = (state, description)
+    out_results_file = os.path.join(str(runner.path()), "test_results.tsv")
+    out_status_file = os.path.join(str(runner.path()), "check_status.tsv")
+    write_results(out_results_file, out_status_file, test_results, status)
+    logging.info("Result written")
diff --git a/tests/integration/helpers/cluster.py b/tests/integration/helpers/cluster.py
index 16ceb823f2e..69a66a50b6d 100644
--- a/tests/integration/helpers/cluster.py
+++ b/tests/integration/helpers/cluster.py
@@ -13,6 +13,7 @@ import subprocess
 import time
 import traceback
 import urllib.parse
+import shlex
 
 import cassandra.cluster
 import docker
@@ -53,6 +54,26 @@ def run_and_check(args, env=None, shell=False, stdout=subprocess.PIPE, stderr=su
         raise Exception('Command {} return non-zero code {}: {}'.format(args, res.returncode, res.stderr.decode('utf-8')))
 
 
+def retry_exception(num, delay, func, exception=Exception, *args, **kwargs):
+    """
+    Retry if `func()` throws, `num` times.
+
+    :param func: func to run
+    :param num: number of retries
+
+    :throws StopIteration
+    """
+    i = 0
+    while i <= num:
+        try:
+            func(*args, **kwargs)
+            time.sleep(delay)
+        except exception: # pylint: disable=broad-except
+            i += 1
+            continue
+        return
+    raise StopIteration('Function did not finished successfully')
+
 def subprocess_check_call(args):
     # Uncomment for debugging
     # print('run:', ' ' . join(args))
@@ -74,6 +95,15 @@ def get_odbc_bridge_path():
             return '/usr/bin/clickhouse-odbc-bridge'
     return path
 
+def get_library_bridge_path():
+    path = os.environ.get('CLICKHOUSE_TESTS_LIBRARY_BRIDGE_BIN_PATH')
+    if path is None:
+        server_path = os.environ.get('CLICKHOUSE_TESTS_SERVER_BIN_PATH')
+        if server_path is not None:
+            return os.path.join(os.path.dirname(server_path), 'clickhouse-library-bridge')
+        else:
+            return '/usr/bin/clickhouse-library-bridge'
+    return path
 
 def get_docker_compose_path():
     compose_path = os.environ.get('DOCKER_COMPOSE_DIR')
@@ -97,7 +127,7 @@ class ClickHouseCluster:
     """
 
     def __init__(self, base_path, name=None, base_config_dir=None, server_bin_path=None, client_bin_path=None,
-                 odbc_bridge_bin_path=None, zookeeper_config_path=None, custom_dockerd_host=None):
+                 odbc_bridge_bin_path=None, library_bridge_bin_path=None, zookeeper_config_path=None, custom_dockerd_host=None):
         for param in list(os.environ.keys()):
             print("ENV %40s %s" % (param, os.environ[param]))
         self.base_dir = p.dirname(base_path)
@@ -108,6 +138,7 @@ class ClickHouseCluster:
         self.server_bin_path = p.realpath(
             server_bin_path or os.environ.get('CLICKHOUSE_TESTS_SERVER_BIN_PATH', '/usr/bin/clickhouse'))
         self.odbc_bridge_bin_path = p.realpath(odbc_bridge_bin_path or get_odbc_bridge_path())
+        self.library_bridge_bin_path = p.realpath(library_bridge_bin_path or get_library_bridge_path())
         self.client_bin_path = p.realpath(
             client_bin_path or os.environ.get('CLICKHOUSE_TESTS_CLIENT_BIN_PATH', '/usr/bin/clickhouse-client'))
         self.zookeeper_config_path = p.join(self.base_dir, zookeeper_config_path) if zookeeper_config_path else p.join(
@@ -138,7 +169,9 @@ class ClickHouseCluster:
         self.instances = {}
         self.with_zookeeper = False
         self.with_mysql = False
+        self.with_mysql_cluster = False
         self.with_postgres = False
+        self.with_postgres_cluster = False
         self.with_kafka = False
         self.with_kerberized_kafka = False
         self.with_rabbitmq = False
@@ -179,9 +212,9 @@ class ClickHouseCluster:
 
     def add_instance(self, name, base_config_dir=None, main_configs=None, user_configs=None, dictionaries=None,
                      macros=None,
-                     with_zookeeper=False, with_mysql=False, with_kafka=False, with_kerberized_kafka=False, with_rabbitmq=False,
+                     with_zookeeper=False, with_mysql=False, with_mysql_cluster=False, with_kafka=False, with_kerberized_kafka=False, with_rabbitmq=False,
                      clickhouse_path_dir=None,
-                     with_odbc_drivers=False, with_postgres=False, with_hdfs=False, with_kerberized_hdfs=False, with_mongo=False,
+                     with_odbc_drivers=False, with_postgres=False, with_postgres_cluster=False, with_hdfs=False, with_kerberized_hdfs=False, with_mongo=False,
                      with_redis=False, with_minio=False, with_cassandra=False,
                      hostname=None, env_variables=None, image="yandex/clickhouse-integration-test", tag=None,
                      stay_alive=False, ipv4_address=None, ipv6_address=None, with_installed_binary=False, tmpfs=None,
@@ -222,6 +255,7 @@ class ClickHouseCluster:
             with_zookeeper=with_zookeeper,
             zookeeper_config_path=self.zookeeper_config_path,
             with_mysql=with_mysql,
+            with_mysql_cluster=with_mysql_cluster,
             with_kafka=with_kafka,
             with_kerberized_kafka=with_kerberized_kafka,
             with_rabbitmq=with_rabbitmq,
@@ -232,6 +266,7 @@ class ClickHouseCluster:
             with_cassandra=with_cassandra,
             server_bin_path=self.server_bin_path,
             odbc_bridge_bin_path=self.odbc_bridge_bin_path,
+            library_bridge_bin_path=self.library_bridge_bin_path,
             clickhouse_path_dir=clickhouse_path_dir,
             with_odbc_drivers=with_odbc_drivers,
             hostname=hostname,
@@ -273,6 +308,14 @@ class ClickHouseCluster:
 
             cmds.append(self.base_mysql_cmd)
 
+        if with_mysql_cluster and not self.with_mysql_cluster:
+            self.with_mysql_cluster = True
+            self.base_cmd.extend(['--file', p.join(docker_compose_yml_dir, 'docker_compose_mysql_cluster.yml')])
+            self.base_mysql_cluster_cmd = ['docker-compose', '--project-name', self.project_name,
+                                   '--file', p.join(docker_compose_yml_dir, 'docker_compose_mysql_cluster.yml')]
+
+            cmds.append(self.base_mysql_cluster_cmd)
+
         if with_postgres and not self.with_postgres:
             self.with_postgres = True
             self.base_cmd.extend(['--file', p.join(docker_compose_yml_dir, 'docker_compose_postgres.yml')])
@@ -280,6 +323,13 @@ class ClickHouseCluster:
                                       '--file', p.join(docker_compose_yml_dir, 'docker_compose_postgres.yml')]
             cmds.append(self.base_postgres_cmd)
 
+        if with_postgres_cluster and not self.with_postgres_cluster:
+            self.with_postgres_cluster = True
+            self.base_cmd.extend(['--file', p.join(docker_compose_yml_dir, 'docker_compose_postgres.yml')])
+            self.base_postgres_cluster_cmd = ['docker-compose', '--project-name', self.project_name,
+                                      '--file', p.join(docker_compose_yml_dir, 'docker_compose_postgres_cluster.yml')]
+            cmds.append(self.base_postgres_cluster_cmd)
+
         if with_odbc_drivers and not self.with_odbc_drivers:
             self.with_odbc_drivers = True
             if not self.with_mysql:
@@ -448,11 +498,11 @@ class ClickHouseCluster:
                                    ["bash", "-c", "echo {} | base64 --decode > {}".format(encodedStr, dest_path)],
                                    user='root')
 
-    def wait_mysql_to_start(self, timeout=60):
+    def wait_mysql_to_start(self, timeout=60, port=3308):
         start = time.time()
         while time.time() - start < timeout:
             try:
-                conn = pymysql.connect(user='root', password='clickhouse', host='127.0.0.1', port=3308)
+                conn = pymysql.connect(user='root', password='clickhouse', host='127.0.0.1', port=port)
                 conn.close()
                 print("Mysql Started")
                 return
@@ -463,11 +513,11 @@ class ClickHouseCluster:
         subprocess_call(['docker-compose', 'ps', '--services', '--all'])
         raise Exception("Cannot wait MySQL container")
 
-    def wait_postgres_to_start(self, timeout=60):
+    def wait_postgres_to_start(self, timeout=60, port=5432):
         start = time.time()
         while time.time() - start < timeout:
             try:
-                conn_string = "host='localhost' user='postgres' password='mysecretpassword'"
+                conn_string = "host='localhost' port={} user='postgres' password='mysecretpassword'".format(port)
                 conn = psycopg2.connect(conn_string)
                 conn.close()
                 print("Postgres Started")
@@ -573,7 +623,7 @@ class ClickHouseCluster:
         raise Exception("Can't wait Minio to start")
 
     def wait_schema_registry_to_start(self, timeout=10):
-        sr_client = CachedSchemaRegistryClient('http://localhost:8081')
+        sr_client = CachedSchemaRegistryClient({"url":'http://localhost:8081'})
         start = time.time()
         while time.time() - start < timeout:
             try:
@@ -602,16 +652,6 @@ class ClickHouseCluster:
         if self.is_up:
             return
 
-        # Just in case kill unstopped containers from previous launch
-        try:
-            print("Trying to kill unstopped containers...")
-
-            if not subprocess_call(['docker-compose', 'kill']):
-                subprocess_call(['docker-compose', 'down', '--volumes'])
-            print("Unstopped containers killed")
-        except:
-            pass
-
         try:
             if destroy_dirs and p.exists(self.instances_dir):
                 print(("Removing instances dir %s", self.instances_dir))
@@ -621,9 +661,24 @@ class ClickHouseCluster:
                 print(('Setup directory for instance: {} destroy_dirs: {}'.format(instance.name, destroy_dirs)))
                 instance.create_dir(destroy_dir=destroy_dirs)
 
+            # In case of multiple cluster we should not stop compose services.
+            if destroy_dirs:
+                # Just in case kill unstopped containers from previous launch
+                try:
+                    print("Trying to kill unstopped containers...")
+                    subprocess_call(['docker-compose', 'kill'])
+                    subprocess_call(self.base_cmd + ['down', '--volumes', '--remove-orphans'])
+                    print("Unstopped containers killed")
+                except:
+                    pass
+
+            clickhouse_pull_cmd = self.base_cmd + ['pull']
+            print(f"Pulling images for {self.base_cmd}")
+            retry_exception(10, 5, subprocess_check_call, Exception, clickhouse_pull_cmd)
+
             self.docker_client = docker.from_env(version=self.docker_api_version)
 
-            common_opts = ['up', '-d', '--force-recreate']
+            common_opts = ['up', '-d']
 
             if self.with_zookeeper and self.base_zookeeper_cmd:
                 print('Setup ZooKeeper')
@@ -649,11 +704,25 @@ class ClickHouseCluster:
                 subprocess_check_call(self.base_mysql_cmd + common_opts)
                 self.wait_mysql_to_start(120)
 
+            if self.with_mysql_cluster and self.base_mysql_cluster_cmd:
+                print('Setup MySQL')
+                subprocess_check_call(self.base_mysql_cluster_cmd + common_opts)
+                self.wait_mysql_to_start(120, port=3348)
+                self.wait_mysql_to_start(120, port=3368)
+                self.wait_mysql_to_start(120, port=3388)
+
             if self.with_postgres and self.base_postgres_cmd:
                 print('Setup Postgres')
                 subprocess_check_call(self.base_postgres_cmd + common_opts)
                 self.wait_postgres_to_start(120)
 
+            if self.with_postgres_cluster and self.base_postgres_cluster_cmd:
+                print('Setup Postgres')
+                subprocess_check_call(self.base_postgres_cluster_cmd + common_opts)
+                self.wait_postgres_to_start(120, port=5421)
+                self.wait_postgres_to_start(120, port=5441)
+                self.wait_postgres_to_start(120, port=5461)
+
             if self.with_kafka and self.base_kafka_cmd:
                 print('Setup Kafka')
                 subprocess_check_call(self.base_kafka_cmd + common_opts + ['--renew-anon-volumes'])
@@ -691,7 +760,7 @@ class ClickHouseCluster:
 
             if self.with_redis and self.base_redis_cmd:
                 print('Setup Redis')
-                subprocess_check_call(self.base_redis_cmd + ['up', '-d', '--force-recreate'])
+                subprocess_check_call(self.base_redis_cmd + ['up', '-d'])
                 time.sleep(10)
 
             if self.with_minio and self.base_minio_cmd:
@@ -725,7 +794,7 @@ class ClickHouseCluster:
                             os.environ.pop('SSL_CERT_FILE')
 
             if self.with_cassandra and self.base_cassandra_cmd:
-                subprocess_check_call(self.base_cassandra_cmd + ['up', '-d', '--force-recreate'])
+                subprocess_check_call(self.base_cassandra_cmd + ['up', '-d'])
                 self.wait_cassandra_to_start()
 
             clickhouse_start_cmd = self.base_cmd + ['up', '-d', '--no-recreate']
@@ -860,6 +929,7 @@ services:
             - /etc/passwd:/etc/passwd:ro
             {binary_volume}
             {odbc_bridge_volume}
+            {library_bridge_volume}
             {odbc_ini_path}
             {keytab_path}
             {krb5_conf}
@@ -868,6 +938,8 @@ services:
         cap_add:
             - SYS_PTRACE
             - NET_ADMIN
+            - IPC_LOCK
+            - SYS_NICE
         depends_on: {depends_on}
         user: '{user}'
         env_file:
@@ -893,9 +965,9 @@ class ClickHouseInstance:
     def __init__(
             self, cluster, base_path, name, base_config_dir, custom_main_configs, custom_user_configs,
             custom_dictionaries,
-            macros, with_zookeeper, zookeeper_config_path, with_mysql, with_kafka, with_kerberized_kafka, with_rabbitmq, with_kerberized_hdfs,
+            macros, with_zookeeper, zookeeper_config_path, with_mysql, with_mysql_cluster, with_kafka, with_kerberized_kafka, with_rabbitmq, with_kerberized_hdfs,
             with_mongo, with_redis, with_minio,
-            with_cassandra, server_bin_path, odbc_bridge_bin_path, clickhouse_path_dir, with_odbc_drivers,
+            with_cassandra, server_bin_path, odbc_bridge_bin_path, library_bridge_bin_path, clickhouse_path_dir, with_odbc_drivers,
             hostname=None, env_variables=None,
             image="yandex/clickhouse-integration-test", tag="latest",
             stay_alive=False, ipv4_address=None, ipv6_address=None, with_installed_binary=False, tmpfs=None):
@@ -919,8 +991,10 @@ class ClickHouseInstance:
 
         self.server_bin_path = server_bin_path
         self.odbc_bridge_bin_path = odbc_bridge_bin_path
+        self.library_bridge_bin_path = library_bridge_bin_path
 
         self.with_mysql = with_mysql
+        self.with_mysql_cluster = with_mysql_cluster
         self.with_kafka = with_kafka
         self.with_kerberized_kafka = with_kerberized_kafka
         self.with_rabbitmq = with_rabbitmq
@@ -1050,23 +1124,28 @@ class ClickHouseInstance:
         return self.http_query(sql=sql, data=data, params=params, user=user, password=password,
                                expect_fail_and_get_error=True)
 
-    def stop_clickhouse(self, start_wait_sec=5, kill=False):
+    def stop_clickhouse(self, stop_wait_sec=30, kill=False):
         if not self.stay_alive:
             raise Exception("clickhouse can be stopped only with stay_alive=True instance")
 
         self.exec_in_container(["bash", "-c", "pkill {} clickhouse".format("-9" if kill else "")], user='root')
-        time.sleep(start_wait_sec)
+        deadline = time.time() + stop_wait_sec
+        while time.time() < deadline:
+            time.sleep(0.5)
+            if self.get_process_pid("clickhouse") is None:
+                break
+        assert self.get_process_pid("clickhouse") is None, "ClickHouse was not stopped"
 
-    def start_clickhouse(self, stop_wait_sec=5):
+    def start_clickhouse(self, start_wait_sec=30):
         if not self.stay_alive:
             raise Exception("clickhouse can be started again only with stay_alive=True instance")
 
         self.exec_in_container(["bash", "-c", "{} --daemon".format(CLICKHOUSE_START_COMMAND)], user=str(os.getuid()))
         # wait start
         from helpers.test_tools import assert_eq_with_retry
-        assert_eq_with_retry(self, "select 1", "1", retry_count=int(stop_wait_sec / 0.5), sleep_time=0.5)
+        assert_eq_with_retry(self, "select 1", "1", retry_count=int(start_wait_sec / 0.5), sleep_time=0.5)
 
-    def restart_clickhouse(self, stop_start_wait_sec=5, kill=False):
+    def restart_clickhouse(self, stop_start_wait_sec=30, kill=False):
         self.stop_clickhouse(stop_start_wait_sec, kill)
         self.start_clickhouse(stop_start_wait_sec)
 
@@ -1079,6 +1158,28 @@ class ClickHouseInstance:
             ["bash", "-c", 'grep "{}" /var/log/clickhouse-server/clickhouse-server.log || true'.format(substring)])
         return len(result) > 0
 
+    def count_in_log(self, substring):
+        result = self.exec_in_container(
+            ["bash", "-c", 'grep "{}" /var/log/clickhouse-server/clickhouse-server.log | wc -l'.format(substring)])
+        return result
+
+    def wait_for_log_line(self, regexp, filename='/var/log/clickhouse-server/clickhouse-server.log', timeout=30, repetitions=1, look_behind_lines=100):
+        start_time = time.time()
+        result = self.exec_in_container(
+            ["bash", "-c", 'timeout {} tail -Fn{} "{}" | grep -Em {} {}'.format(timeout, look_behind_lines, filename, repetitions, shlex.quote(regexp))])
+
+        # if repetitions>1 grep will return success even if not enough lines were collected,
+        if repetitions>1 and len(result.splitlines()) < repetitions:
+            print("wait_for_log_line: those lines were found during {} seconds:".format(timeout))
+            print(result)
+            raise Exception("wait_for_log_line: Not enough repetitions: {} found, while {} expected".format(len(result.splitlines()), repetitions))
+
+        wait_duration = time.time() - start_time
+
+        print('{} log line matching "{}" appeared in a {} seconds'.format(repetitions, regexp, wait_duration))
+        return wait_duration
+
+
     def file_exists(self, path):
         return self.exec_in_container(
             ["bash", "-c", "echo $(if [ -e '{}' ]; then echo 'yes'; else echo 'no'; fi)".format(path)]) == 'yes\n'
@@ -1364,9 +1465,11 @@ class ClickHouseInstance:
         if not self.with_installed_binary:
             binary_volume = "- " + self.server_bin_path + ":/usr/bin/clickhouse"
             odbc_bridge_volume = "- " + self.odbc_bridge_bin_path + ":/usr/bin/clickhouse-odbc-bridge"
+            library_bridge_volume = "- " + self.library_bridge_bin_path + ":/usr/bin/clickhouse-library-bridge"
         else:
             binary_volume = "- " + self.server_bin_path + ":/usr/share/clickhouse_fresh"
             odbc_bridge_volume = "- " + self.odbc_bridge_bin_path + ":/usr/share/clickhouse-odbc-bridge_fresh"
+            library_bridge_volume = "- " + self.library_bridge_bin_path + ":/usr/share/clickhouse-library-bridge_fresh"
 
         with open(self.docker_compose_path, 'w') as docker_compose:
             docker_compose.write(DOCKER_COMPOSE_TEMPLATE.format(
@@ -1376,6 +1479,7 @@ class ClickHouseInstance:
                 hostname=self.hostname,
                 binary_volume=binary_volume,
                 odbc_bridge_volume=odbc_bridge_volume,
+                library_bridge_volume=library_bridge_volume,
                 instance_config_dir=instance_config_dir,
                 config_d_dir=self.config_d_dir,
                 db_dir=db_dir,
diff --git a/tests/integration/helpers/corrupt_part_data_on_disk.py b/tests/integration/helpers/corrupt_part_data_on_disk.py
new file mode 100644
index 00000000000..1a6f384da9e
--- /dev/null
+++ b/tests/integration/helpers/corrupt_part_data_on_disk.py
@@ -0,0 +1,14 @@
+def corrupt_part_data_on_disk(node, table, part_name):
+    part_path = node.query("SELECT path FROM system.parts WHERE table = '{}' and name = '{}'"
+        .format(table, part_name)).strip()
+
+    corrupt_part_data_by_path(node, part_path)
+
+def corrupt_part_data_by_path(node, part_path):
+    print("Corrupting part", part_path, "at", node.name)
+    print("Will corrupt: ",
+        node.exec_in_container(['bash', '-c', 'cd {p} && ls *.bin | head -n 1'.format(p=part_path)]))
+
+    node.exec_in_container(['bash', '-c',
+                            'cd {p} && ls *.bin | head -n 1 | xargs -I{{}} sh -c \'echo "1" >> $1\' -- {{}}'.format(
+                                p=part_path)], privileged=True)
diff --git a/tests/integration/helpers/dictionary.py b/tests/integration/helpers/dictionary.py
index b3f7a729777..41d87180c8a 100644
--- a/tests/integration/helpers/dictionary.py
+++ b/tests/integration/helpers/dictionary.py
@@ -7,12 +7,12 @@ class Layout(object):
         'flat': '<flat/>',
         'hashed': '<hashed/>',
         'cache': '<cache><size_in_cells>128</size_in_cells></cache>',
-        'ssd_cache': '<ssd_cache><path>/etc/clickhouse/dictionaries/all</path><max_stored_keys>128</max_stored_keys></ssd_cache>',
+        'ssd_cache': '<ssd_cache><path>/etc/clickhouse/dictionaries/all</path></ssd_cache>',
         'complex_key_hashed': '<complex_key_hashed/>',
         'complex_key_hashed_one_key': '<complex_key_hashed/>',
         'complex_key_hashed_two_keys': '<complex_key_hashed/>',
         'complex_key_cache': '<complex_key_cache><size_in_cells>128</size_in_cells></complex_key_cache>',
-        'complex_key_ssd_cache': '<complex_key_ssd_cache><path>/etc/clickhouse/dictionaries/all</path><max_stored_keys>128</max_stored_keys></complex_key_ssd_cache>',
+        'complex_key_ssd_cache': '<complex_key_ssd_cache><path>/etc/clickhouse/dictionaries/all</path></complex_key_ssd_cache>',
         'range_hashed': '<range_hashed/>',
         'direct': '<direct/>',
         'complex_key_direct': '<complex_key_direct/>'
diff --git a/tests/integration/runner b/tests/integration/runner
index 6dca7663310..e89e10fbc21 100755
--- a/tests/integration/runner
+++ b/tests/integration/runner
@@ -33,10 +33,15 @@ def check_args_and_update_paths(args):
     if not os.path.isabs(args.binary):
         args.binary = os.path.abspath(os.path.join(CURRENT_WORK_DIR, args.binary))
 
-    if not args.bridge_binary:
-        args.bridge_binary = os.path.join(os.path.dirname(args.binary), 'clickhouse-odbc-bridge')
-    elif not os.path.isabs(args.bridge_binary):
-        args.bridge_binary = os.path.abspath(os.path.join(CURRENT_WORK_DIR, args.bridge_binary))
+    if not args.odbc_bridge_binary:
+        args.odbc_bridge_binary = os.path.join(os.path.dirname(args.binary), 'clickhouse-odbc-bridge')
+    elif not os.path.isabs(args.odbc_bridge_binary):
+        args.odbc_bridge_binary = os.path.abspath(os.path.join(CURRENT_WORK_DIR, args.odbc_bridge_binary))
+
+    if not args.library_bridge_binary:
+        args.library_bridge_binary = os.path.join(os.path.dirname(args.binary), 'clickhouse-library-bridge')
+    elif not os.path.isabs(args.library_bridge_binary):
+        args.library_bridge_binary = os.path.abspath(os.path.join(CURRENT_WORK_DIR, args.library_bridge_binary))
 
     if args.base_configs_dir:
         if not os.path.isabs(args.base_configs_dir):
@@ -61,7 +66,7 @@ def check_args_and_update_paths(args):
 
     logging.info("base_configs_dir: {},  binary: {}, cases_dir: {} ".format(args.base_configs_dir, args.binary, args.cases_dir))
 
-    for path in [args.binary, args.bridge_binary, args.base_configs_dir, args.cases_dir, CLICKHOUSE_ROOT]:
+    for path in [args.binary, args.odbc_bridge_binary, args.library_bridge_binary, args.base_configs_dir, args.cases_dir, CLICKHOUSE_ROOT]:
         if not os.path.exists(path):
             raise Exception("Path {} doesn't exist".format(path))
 
@@ -82,7 +87,8 @@ signal.signal(signal.SIGINT, docker_kill_handler_handler)
 # To run integration tests following artfacts should be sufficient:
 #   - clickhouse binaries (env CLICKHOUSE_TESTS_SERVER_BIN_PATH or --binary arg)
 #   - clickhouse default configs(config.xml, users.xml) from same version as binary (env CLICKHOUSE_TESTS_BASE_CONFIG_DIR or --base-configs-dir arg)
-#   - odbc bridge binary (env CLICKHOUSE_TESTS_ODBC_BRIDGE_BIN_PATH or --bridge-binary arg)
+#   - odbc bridge binary (env CLICKHOUSE_TESTS_ODBC_BRIDGE_BIN_PATH or --odbc-bridge-binary arg)
+#   - library bridge binary (env CLICKHOUSE_TESTS_LIBRARY_BRIDGE_BIN_PATH or --library-bridge-binary)
 #   - tests/integration directory with all test cases and configs (env CLICKHOUSE_TESTS_INTEGRATION_PATH or --cases-dir)
 #
 # 1) --clickhouse-root is only used to determine other paths on default places
@@ -98,10 +104,15 @@ if __name__ == "__main__":
         help="Path to clickhouse binary. For example /usr/bin/clickhouse")
 
     parser.add_argument(
-        "--bridge-binary",
+        "--odbc-bridge-binary",
         default=os.environ.get("CLICKHOUSE_TESTS_ODBC_BRIDGE_BIN_PATH", ""),
         help="Path to clickhouse-odbc-bridge binary. Defaults to clickhouse-odbc-bridge in the same dir as clickhouse.")
 
+    parser.add_argument(
+        "--library-bridge-binary",
+        default=os.environ.get("CLICKHOUSE_TESTS_LIBRARY_BRIDGE_BIN_PATH", ""),
+        help="Path to clickhouse-library-bridge binary. Defaults to clickhouse-library-bridge in the same dir as clickhouse.")
+
     parser.add_argument(
         "--base-configs-dir",
         default=os.environ.get("CLICKHOUSE_TESTS_BASE_CONFIG_DIR"),
@@ -185,14 +196,17 @@ if __name__ == "__main__":
     if sys.stdout.isatty() and sys.stdin.isatty():
         tty = "-it"
 
-    cmd = "docker run {net} {tty} --rm --name {name} --privileged --volume={bridge_bin}:/clickhouse-odbc-bridge --volume={bin}:/clickhouse \
+    cmd = "docker run {net} {tty} --rm --name {name} --privileged \
+        --volume={odbc_bridge_bin}:/clickhouse-odbc-bridge --volume={bin}:/clickhouse \
+        --volume={library_bridge_bin}:/clickhouse-library-bridge --volume={bin}:/clickhouse \
         --volume={base_cfg}:/clickhouse-config --volume={cases_dir}:/ClickHouse/tests/integration \
         --volume={src_dir}/Server/grpc_protos:/ClickHouse/src/Server/grpc_protos \
         --volume={name}_volume:/var/lib/docker {env_tags} -e PYTEST_OPTS='{opts}' {img} {command}".format(
         net=net,
         tty=tty,
         bin=args.binary,
-        bridge_bin=args.bridge_binary,
+        odbc_bridge_bin=args.odbc_bridge_binary,
+        library_bridge_bin=args.library_bridge_binary,
         base_cfg=args.base_configs_dir,
         cases_dir=args.cases_dir,
         src_dir=args.src_dir,
diff --git a/tests/integration/test_allowed_url_from_config/test.py b/tests/integration/test_allowed_url_from_config/test.py
index 6442937c8f4..8001af35913 100644
--- a/tests/integration/test_allowed_url_from_config/test.py
+++ b/tests/integration/test_allowed_url_from_config/test.py
@@ -5,7 +5,8 @@ cluster = ClickHouseCluster(__file__)
 node1 = cluster.add_instance('node1', main_configs=['configs/config_with_hosts.xml'])
 node2 = cluster.add_instance('node2', main_configs=['configs/config_with_only_primary_hosts.xml'])
 node3 = cluster.add_instance('node3', main_configs=['configs/config_with_only_regexp_hosts.xml'])
-node4 = cluster.add_instance('node4', main_configs=['configs/config_without_allowed_hosts.xml'])
+node4 = cluster.add_instance('node4', main_configs=[]) # No `remote_url_allow_hosts` at all.
+node5 = cluster.add_instance('node5', main_configs=['configs/config_without_allowed_hosts.xml'])
 node6 = cluster.add_instance('node6', main_configs=['configs/config_for_remote.xml'])
 node7 = cluster.add_instance('node7', main_configs=['configs/config_for_redirect.xml'], with_hdfs=True)
 
@@ -50,11 +51,25 @@ def test_config_with_only_regexp_hosts(start_cluster):
         "CREATE TABLE table_test_3_4 (word String) Engine=URL('https://yandex2.ru', S3)")
 
 
-def test_config_without_allowed_hosts(start_cluster):
+def test_config_without_allowed_hosts_section(start_cluster):
     assert node4.query("CREATE TABLE table_test_4_1 (word String) Engine=URL('https://host:80', CSV)") == ""
-    assert node4.query("CREATE TABLE table_test_4_2 (word String) Engine=URL('https://host', HDFS)") == ""
-    assert node4.query("CREATE TABLE table_test_4_3 (word String) Engine=URL('https://yandex.ru', CSV)") == ""
-    assert node4.query("CREATE TABLE table_test_4_4 (word String) Engine=URL('ftp://something.com', S3)") == ""
+    assert node4.query("CREATE TABLE table_test_4_2 (word String) Engine=S3('https://host:80/bucket/key', CSV)") == ""
+    assert node4.query("CREATE TABLE table_test_4_3 (word String) Engine=URL('https://host', HDFS)") == ""
+    assert node4.query("CREATE TABLE table_test_4_4 (word String) Engine=URL('https://yandex.ru', CSV)") == ""
+    assert node4.query("CREATE TABLE table_test_4_5 (word String) Engine=URL('ftp://something.com', S3)") == ""
+
+
+def test_config_without_allowed_hosts(start_cluster):
+    assert "not allowed" in node5.query_and_get_error(
+        "CREATE TABLE table_test_5_1 (word String) Engine=URL('https://host:80', CSV)")
+    assert "not allowed" in node5.query_and_get_error(
+        "CREATE TABLE table_test_5_2 (word String) Engine=S3('https://host:80/bucket/key', CSV)")
+    assert "not allowed" in node5.query_and_get_error(
+        "CREATE TABLE table_test_5_3 (word String) Engine=URL('https://host', HDFS)")
+    assert "not allowed" in node5.query_and_get_error(
+        "CREATE TABLE table_test_5_4 (word String) Engine=URL('https://yandex.ru', CSV)")
+    assert "not allowed" in node5.query_and_get_error(
+        "CREATE TABLE table_test_5_5 (word String) Engine=URL('ftp://something.com', S3)")
 
 
 def test_table_function_remote(start_cluster):
diff --git a/programs/server/data/default/.gitignore b/tests/integration/test_attach_without_fetching/__init__.py
similarity index 100%
rename from programs/server/data/default/.gitignore
rename to tests/integration/test_attach_without_fetching/__init__.py
diff --git a/tests/integration/test_attach_without_fetching/configs/remote_servers.xml b/tests/integration/test_attach_without_fetching/configs/remote_servers.xml
new file mode 100644
index 00000000000..7978f921b2e
--- /dev/null
+++ b/tests/integration/test_attach_without_fetching/configs/remote_servers.xml
@@ -0,0 +1,21 @@
+<yandex>
+    <remote_servers>
+        <test_cluster>
+            <shard>
+                <internal_replication>true</internal_replication>
+                <replica>
+                    <host>node_1_1</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>node_1_2</host>
+                    <port>9000</port>
+                </replica>
+                 <replica>
+                    <host>node_1_3</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </test_cluster>
+    </remote_servers>
+</yandex>
diff --git a/tests/integration/test_attach_without_fetching/test.py b/tests/integration/test_attach_without_fetching/test.py
new file mode 100644
index 00000000000..8b0c1ffbc5c
--- /dev/null
+++ b/tests/integration/test_attach_without_fetching/test.py
@@ -0,0 +1,130 @@
+import time
+import pytest
+
+from helpers.cluster import ClickHouseCluster
+from helpers.test_tools import assert_eq_with_retry
+from helpers.network import PartitionManager
+from helpers.corrupt_part_data_on_disk import corrupt_part_data_by_path
+
+def fill_node(node):
+    node.query(
+    '''
+        CREATE TABLE test(n UInt32)
+        ENGINE = ReplicatedMergeTree('/clickhouse/tables/test', '{replica}')
+        ORDER BY n PARTITION BY n % 10;
+    '''.format(replica=node.name))
+
+cluster = ClickHouseCluster(__file__)
+configs =["configs/remote_servers.xml"]
+
+node_1 = cluster.add_instance('replica1', with_zookeeper=True, main_configs=configs)
+node_2 = cluster.add_instance('replica2', with_zookeeper=True, main_configs=configs)
+node_3 = cluster.add_instance('replica3', with_zookeeper=True, main_configs=configs)
+
+@pytest.fixture(scope="module")
+def start_cluster():
+    try:
+        cluster.start()
+        fill_node(node_1)
+        fill_node(node_2)
+        # the third node is filled after the DETACH query
+        yield cluster
+
+    except Exception as ex:
+        print(ex)
+
+    finally:
+        cluster.shutdown()
+
+def check_data(nodes, detached_parts):
+    for node in nodes:
+        print("> Replication queue for", node.name, "\n> table\treplica_name\tsource_replica\ttype\tposition\n",
+            node.query("SELECT table, replica_name, source_replica, type, position FROM system.replication_queue"))
+
+        node.query("SYSTEM SYNC REPLICA test")
+
+        print("> Checking data integrity for", node.name)
+
+        for i in range(10):
+            assert_eq_with_retry(node, "SELECT count() FROM test WHERE n % 10 == " + str(i),
+                "0\n" if i in detached_parts else "10\n")
+
+        assert_eq_with_retry(node, "SELECT count() FROM system.parts WHERE table='test'",
+            str(10 - len(detached_parts)) + "\n")
+
+        res: str = node.query("SELECT * FROM test ORDER BY n")
+
+        for other in nodes:
+            if other != node:
+                print("> Checking data consistency,", other.name, "vs", node.name)
+                assert_eq_with_retry(other, "SELECT * FROM test ORDER BY n", res)
+
+
+# 1. Check that ALTER TABLE ATTACH PART|PARTITION does not fetch data from other replicas if it's present in the
+# detached/ folder.
+# 2. Check that ALTER TABLE ATTACH PART|PARTITION downloads the data from other replicas if the detached/ folder
+# does not contain the part with the correct checksums.
+def test_attach_without_fetching(start_cluster):
+    # Note here requests are used for both PARTITION and PART. This is done for better test diversity.
+    # The partition and part are used interchangeably which is not true in most cases.
+    # 0. Insert data on two replicas
+    node_1.query("INSERT INTO test SELECT * FROM numbers(100)")
+
+    check_data([node_1, node_2], detached_parts=[])
+
+    # 1.
+    # This part will be fetched from other replicas as it would be missing in the detached/ folder and
+    # also attached locally.
+    node_1.query("ALTER TABLE test DETACH PART '0_0_0_0'")
+    # This partition will be just fetched from other replicas as the checksums won't match
+    # (we'll manually break the data).
+    node_1.query("ALTER TABLE test DETACH PARTITION 1")
+    # This partition will be just fetched from other replicas as the part data will be corrupted with one of the
+    # files missing.
+    node_1.query("ALTER TABLE test DETACH PARTITION 2")
+
+
+    check_data([node_1, node_2], detached_parts=[0, 1, 2])
+
+    # 2. Create the third replica
+    fill_node(node_3)
+
+    # 3. Break the part data on the second node to corrupt the checksums.
+    # Replica 3 should download the data from replica 1 as there is no local data.
+    # Replica 2 should also download the data from 1 as the checksums won't match.
+    print("Checking attach with corrupted part data with files missing")
+
+    print("Before deleting:", node_2.exec_in_container(['bash', '-c',
+                            'cd {p} && ls *.bin'.format(
+                                p="/var/lib/clickhouse/data/default/test/detached/2_0_0_0")], privileged=True))
+
+    node_2.exec_in_container(['bash', '-c',
+                            'cd {p} && rm -fr *.bin'.format(
+                                p="/var/lib/clickhouse/data/default/test/detached/2_0_0_0")], privileged=True)
+
+    node_1.query("ALTER TABLE test ATTACH PARTITION 2")
+    check_data([node_1, node_2, node_3], detached_parts=[0, 1])
+
+    # 4. Break the part data on the second node to corrupt the checksums.
+    # Replica 3 should download the data from replica 1 as there is no local data.
+    # Replica 2 should also download the data from 1 as the checksums won't match.
+    print("Checking attach with corrupted part data with all of the files present")
+
+    corrupt_part_data_by_path(node_2, "/var/lib/clickhouse/data/default/test/detached/1_0_0_0")
+
+    node_1.query("ALTER TABLE test ATTACH PARTITION 1")
+    check_data([node_1, node_2, node_3], detached_parts=[0])
+
+    # 5. Attach the first part and check if it has been fetched correctly.
+    # Replica 2 should attach the local data from detached/.
+    # Replica 3 should download the data from replica 2 as there is no local data and other connections are broken.
+    print("Checking attach with valid checksums")
+
+    with PartitionManager() as pm:
+        # If something goes wrong and replica 2 wants to fetch data, the test will fail.
+        pm.partition_instances(node_2, node_1, action='REJECT --reject-with tcp-reset')
+        pm.partition_instances(node_1, node_3, action='REJECT --reject-with tcp-reset')
+
+        node_1.query("ALTER TABLE test ATTACH PART '0_0_0_0'")
+
+        check_data([node_1, node_2, node_3], detached_parts=[])
diff --git a/tests/integration/test_broken_part_during_merge/test.py b/tests/integration/test_broken_part_during_merge/test.py
index 33719166f4a..910dbc1d1a9 100644
--- a/tests/integration/test_broken_part_during_merge/test.py
+++ b/tests/integration/test_broken_part_during_merge/test.py
@@ -3,6 +3,7 @@ import pytest
 from helpers.cluster import ClickHouseCluster
 from multiprocessing.dummy import Pool
 from helpers.network import PartitionManager
+from helpers.corrupt_part_data_on_disk import corrupt_part_data_on_disk
 import time
 
 cluster = ClickHouseCluster(__file__)
@@ -25,13 +26,6 @@ def started_cluster():
     finally:
         cluster.shutdown()
 
-def corrupt_data_part_on_disk(node, table, part_name):
-    part_path = node.query(
-        "SELECT path FROM system.parts WHERE table = '{}' and name = '{}'".format(table, part_name)).strip()
-    node.exec_in_container(['bash', '-c',
-                            'cd {p} && ls *.bin | head -n 1 | xargs -I{{}} sh -c \'echo "1" >> $1\' -- {{}}'.format(
-                                p=part_path)], privileged=True)
-
 
 def test_merge_and_part_corruption(started_cluster):
     node1.query("SYSTEM STOP REPLICATION QUEUES replicated_mt")
@@ -43,7 +37,7 @@ def test_merge_and_part_corruption(started_cluster):
     # Need to corrupt "border part" (left or right). If we will corrupt something in the middle
     # clickhouse will not consider merge as broken, because we have parts with the same min and max
     # block numbers.
-    corrupt_data_part_on_disk(node1, 'replicated_mt', 'all_3_3_0')
+    corrupt_part_data_on_disk(node1, 'replicated_mt', 'all_3_3_0')
 
     with Pool(1) as p:
         def optimize_with_delay(x):
diff --git a/programs/server/metadata/default/.gitignore b/tests/integration/test_catboost_model_config_reload/__init__.py
similarity index 100%
rename from programs/server/metadata/default/.gitignore
rename to tests/integration/test_catboost_model_config_reload/__init__.py
diff --git a/tests/integration/test_catboost_model_config_reload/config/catboost_lib.xml b/tests/integration/test_catboost_model_config_reload/config/catboost_lib.xml
new file mode 100644
index 00000000000..745be7cebe6
--- /dev/null
+++ b/tests/integration/test_catboost_model_config_reload/config/catboost_lib.xml
@@ -0,0 +1,3 @@
+<yandex>
+    <catboost_dynamic_library_path>/etc/clickhouse-server/model/libcatboostmodel.so</catboost_dynamic_library_path>
+</yandex>
diff --git a/tests/integration/test_catboost_model_config_reload/config/models_config.xml b/tests/integration/test_catboost_model_config_reload/config/models_config.xml
new file mode 100644
index 00000000000..7e62283a83c
--- /dev/null
+++ b/tests/integration/test_catboost_model_config_reload/config/models_config.xml
@@ -0,0 +1,2 @@
+<yandex>
+</yandex>
diff --git a/tests/integration/test_catboost_model_config_reload/model/libcatboostmodel.so b/tests/integration/test_catboost_model_config_reload/model/libcatboostmodel.so
new file mode 100755
index 00000000000..388d9f887b4
Binary files /dev/null and b/tests/integration/test_catboost_model_config_reload/model/libcatboostmodel.so differ
diff --git a/tests/integration/test_catboost_model_config_reload/model/model.bin b/tests/integration/test_catboost_model_config_reload/model/model.bin
new file mode 100644
index 00000000000..118e099d176
Binary files /dev/null and b/tests/integration/test_catboost_model_config_reload/model/model.bin differ
diff --git a/tests/integration/test_catboost_model_config_reload/model/model_config.xml b/tests/integration/test_catboost_model_config_reload/model/model_config.xml
new file mode 100644
index 00000000000..af9778097fa
--- /dev/null
+++ b/tests/integration/test_catboost_model_config_reload/model/model_config.xml
@@ -0,0 +1,8 @@
+<models>
+    <model>
+        <type>catboost</type>
+        <name>model1</name>
+        <path>/etc/clickhouse-server/model/model.bin</path>
+        <lifetime>0</lifetime>
+    </model>
+</models>
diff --git a/tests/integration/test_catboost_model_config_reload/model/model_config2.xml b/tests/integration/test_catboost_model_config_reload/model/model_config2.xml
new file mode 100644
index 00000000000..b81120ec900
--- /dev/null
+++ b/tests/integration/test_catboost_model_config_reload/model/model_config2.xml
@@ -0,0 +1,8 @@
+<models>
+    <model>
+        <type>catboost</type>
+        <name>model2</name>
+        <path>/etc/clickhouse-server/model/model.bin</path>
+        <lifetime>0</lifetime>
+    </model>
+</models>
diff --git a/tests/integration/test_catboost_model_config_reload/test.py b/tests/integration/test_catboost_model_config_reload/test.py
new file mode 100644
index 00000000000..34da1cda2d5
--- /dev/null
+++ b/tests/integration/test_catboost_model_config_reload/test.py
@@ -0,0 +1,58 @@
+import os
+import sys
+import time
+
+import pytest
+
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
+
+from helpers.cluster import ClickHouseCluster
+
+cluster = ClickHouseCluster(__file__)
+node = cluster.add_instance('node', stay_alive=True, main_configs=['config/models_config.xml', 'config/catboost_lib.xml'])
+
+
+def copy_file_to_container(local_path, dist_path, container_id):
+    os.system("docker cp {local} {cont_id}:{dist}".format(local=local_path, cont_id=container_id, dist=dist_path))
+
+
+config = '''<yandex>
+    <models_config>/etc/clickhouse-server/model/{model_config}</models_config>
+</yandex>'''
+
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+
+        copy_file_to_container(os.path.join(SCRIPT_DIR, 'model/.'), '/etc/clickhouse-server/model', node.docker_id)
+        node.restart_clickhouse()
+
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+
+def change_config(model_config):
+    node.replace_config("/etc/clickhouse-server/config.d/models_config.xml", config.format(model_config=model_config))
+    node.query("SYSTEM RELOAD CONFIG;")
+
+
+def test(started_cluster):
+    # Set config with the path to the first model.
+    change_config("model_config.xml")
+
+    node.query("SELECT modelEvaluate('model1', 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11);")
+
+    # Change path to the second model in config.
+    change_config("model_config2.xml")
+
+    # Check that the new model is loaded.
+    node.query("SELECT modelEvaluate('model2', 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11);")
+
+    # Check that the old model was unloaded.
+    node.query_and_get_error("SELECT modelEvaluate('model1', 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11);")
+
diff --git a/tests/queries/0_stateless/00992_system_parts_race_condition_zookeeper.reference b/tests/integration/test_catboost_model_first_evaluate/__init__.py
similarity index 100%
rename from tests/queries/0_stateless/00992_system_parts_race_condition_zookeeper.reference
rename to tests/integration/test_catboost_model_first_evaluate/__init__.py
diff --git a/tests/integration/test_catboost_model_first_evaluate/config/models_config.xml b/tests/integration/test_catboost_model_first_evaluate/config/models_config.xml
new file mode 100644
index 00000000000..eab1458031b
--- /dev/null
+++ b/tests/integration/test_catboost_model_first_evaluate/config/models_config.xml
@@ -0,0 +1,4 @@
+<yandex>
+    <catboost_dynamic_library_path>/etc/clickhouse-server/model/libcatboostmodel.so</catboost_dynamic_library_path>
+    <models_config>/etc/clickhouse-server/model/model_config.xml</models_config>
+</yandex>
diff --git a/tests/integration/test_catboost_model_first_evaluate/model/libcatboostmodel.so b/tests/integration/test_catboost_model_first_evaluate/model/libcatboostmodel.so
new file mode 100755
index 00000000000..388d9f887b4
Binary files /dev/null and b/tests/integration/test_catboost_model_first_evaluate/model/libcatboostmodel.so differ
diff --git a/tests/integration/test_catboost_model_first_evaluate/model/model.bin b/tests/integration/test_catboost_model_first_evaluate/model/model.bin
new file mode 100644
index 00000000000..118e099d176
Binary files /dev/null and b/tests/integration/test_catboost_model_first_evaluate/model/model.bin differ
diff --git a/tests/integration/test_catboost_model_first_evaluate/model/model_config.xml b/tests/integration/test_catboost_model_first_evaluate/model/model_config.xml
new file mode 100644
index 00000000000..2c328167a94
--- /dev/null
+++ b/tests/integration/test_catboost_model_first_evaluate/model/model_config.xml
@@ -0,0 +1,8 @@
+<models>
+    <model>
+        <type>catboost</type>
+        <name>titanic</name>
+        <path>/etc/clickhouse-server/model/model.bin</path>
+        <lifetime>0</lifetime>
+    </model>
+</models>
diff --git a/tests/integration/test_catboost_model_first_evaluate/test.py b/tests/integration/test_catboost_model_first_evaluate/test.py
new file mode 100644
index 00000000000..1c3723b9d06
--- /dev/null
+++ b/tests/integration/test_catboost_model_first_evaluate/test.py
@@ -0,0 +1,36 @@
+import os
+import sys
+import time
+
+import pytest
+
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
+
+from helpers.cluster import ClickHouseCluster
+
+cluster = ClickHouseCluster(__file__)
+node = cluster.add_instance('node', stay_alive=True, main_configs=['config/models_config.xml'])
+
+
+def copy_file_to_container(local_path, dist_path, container_id):
+    os.system("docker cp {local} {cont_id}:{dist}".format(local=local_path, cont_id=container_id, dist=dist_path))
+
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+
+        copy_file_to_container(os.path.join(SCRIPT_DIR, 'model/.'), '/etc/clickhouse-server/model', node.docker_id)
+        node.restart_clickhouse()
+
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+
+def test(started_cluster):
+    node.query("select modelEvaluate('titanic', 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11);")
+    
diff --git a/tests/queries/0_stateless/01671_ddl_hang_timeout.reference b/tests/integration/test_catboost_model_reload/__init__.py
similarity index 100%
rename from tests/queries/0_stateless/01671_ddl_hang_timeout.reference
rename to tests/integration/test_catboost_model_reload/__init__.py
diff --git a/tests/integration/test_catboost_model_reload/config/catboost_lib.xml b/tests/integration/test_catboost_model_reload/config/catboost_lib.xml
new file mode 100644
index 00000000000..745be7cebe6
--- /dev/null
+++ b/tests/integration/test_catboost_model_reload/config/catboost_lib.xml
@@ -0,0 +1,3 @@
+<yandex>
+    <catboost_dynamic_library_path>/etc/clickhouse-server/model/libcatboostmodel.so</catboost_dynamic_library_path>
+</yandex>
diff --git a/tests/integration/test_catboost_model_reload/config/models_config.xml b/tests/integration/test_catboost_model_reload/config/models_config.xml
new file mode 100644
index 00000000000..e84ca8b5285
--- /dev/null
+++ b/tests/integration/test_catboost_model_reload/config/models_config.xml
@@ -0,0 +1,3 @@
+<yandex>
+    <models_config>/etc/clickhouse-server/model/model_config.xml</models_config>
+</yandex>
diff --git a/tests/integration/test_catboost_model_reload/model/conjunction.cbm b/tests/integration/test_catboost_model_reload/model/conjunction.cbm
new file mode 100644
index 00000000000..7b75fb5f886
Binary files /dev/null and b/tests/integration/test_catboost_model_reload/model/conjunction.cbm differ
diff --git a/tests/integration/test_catboost_model_reload/model/disjunction.cbm b/tests/integration/test_catboost_model_reload/model/disjunction.cbm
new file mode 100644
index 00000000000..8145c24637f
Binary files /dev/null and b/tests/integration/test_catboost_model_reload/model/disjunction.cbm differ
diff --git a/tests/integration/test_catboost_model_reload/model/libcatboostmodel.so b/tests/integration/test_catboost_model_reload/model/libcatboostmodel.so
new file mode 100755
index 00000000000..388d9f887b4
Binary files /dev/null and b/tests/integration/test_catboost_model_reload/model/libcatboostmodel.so differ
diff --git a/tests/integration/test_catboost_model_reload/model/model_config.xml b/tests/integration/test_catboost_model_reload/model/model_config.xml
new file mode 100644
index 00000000000..7cbda165ce9
--- /dev/null
+++ b/tests/integration/test_catboost_model_reload/model/model_config.xml
@@ -0,0 +1,8 @@
+<models>
+    <model>
+        <type>catboost</type>
+        <name>model</name>
+        <path>/etc/clickhouse-server/model/model.cbm</path>
+        <lifetime>0</lifetime>
+    </model>
+</models>
diff --git a/tests/integration/test_catboost_model_reload/test.py b/tests/integration/test_catboost_model_reload/test.py
new file mode 100644
index 00000000000..8283e6af975
--- /dev/null
+++ b/tests/integration/test_catboost_model_reload/test.py
@@ -0,0 +1,74 @@
+import os
+import sys
+import time
+
+import pytest
+
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
+
+from helpers.cluster import ClickHouseCluster
+
+cluster = ClickHouseCluster(__file__)
+node = cluster.add_instance('node', stay_alive=True, main_configs=['config/models_config.xml', 'config/catboost_lib.xml'])
+
+def copy_file_to_container(local_path, dist_path, container_id):
+    os.system("docker cp {local} {cont_id}:{dist}".format(local=local_path, cont_id=container_id, dist=dist_path))
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+
+        copy_file_to_container(os.path.join(SCRIPT_DIR, 'model/.'), '/etc/clickhouse-server/model', node.docker_id)
+        node.query("CREATE TABLE binary (x UInt64, y UInt64) ENGINE = TinyLog()")
+        node.query("INSERT INTO binary VALUES (1, 1), (1, 0), (0, 1), (0, 0)")
+
+        node.restart_clickhouse()
+
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+def test_model_reload(started_cluster):
+    node.exec_in_container(["bash", "-c", "rm -f /etc/clickhouse-server/model/model.cbm"])
+    node.exec_in_container(["bash", "-c", "ln /etc/clickhouse-server/model/conjunction.cbm /etc/clickhouse-server/model/model.cbm"])
+    node.query("SYSTEM RELOAD MODEL model")
+
+    result = node.query("""
+        WITH modelEvaluate('model', toFloat64(x), toFloat64(y)) as prediction, exp(prediction) / (1 + exp(prediction)) as probability
+        SELECT if(probability > 0.5, 1, 0) FROM binary;
+        """)
+    assert result == '1\n0\n0\n0\n'
+
+    node.exec_in_container(["bash", "-c", "rm /etc/clickhouse-server/model/model.cbm"])
+    node.exec_in_container(["bash", "-c", "ln /etc/clickhouse-server/model/disjunction.cbm /etc/clickhouse-server/model/model.cbm"])
+    node.query("SYSTEM RELOAD MODEL model")
+
+    result = node.query("""
+        WITH modelEvaluate('model', toFloat64(x), toFloat64(y)) as prediction, exp(prediction) / (1 + exp(prediction)) as probability
+        SELECT if(probability > 0.5, 1, 0) FROM binary;
+        """)
+    assert result == '1\n1\n1\n0\n'
+
+def test_models_reload(started_cluster):
+    node.exec_in_container(["bash", "-c", "rm -f /etc/clickhouse-server/model/model.cbm"])
+    node.exec_in_container(["bash", "-c", "ln /etc/clickhouse-server/model/conjunction.cbm /etc/clickhouse-server/model/model.cbm"])
+    node.query("SYSTEM RELOAD MODELS")
+
+    result = node.query("""
+        WITH modelEvaluate('model', toFloat64(x), toFloat64(y)) as prediction, exp(prediction) / (1 + exp(prediction)) as probability
+        SELECT if(probability > 0.5, 1, 0) FROM binary;
+        """)
+    assert result == '1\n0\n0\n0\n'
+
+    node.exec_in_container(["bash", "-c", "rm /etc/clickhouse-server/model/model.cbm"])
+    node.exec_in_container(["bash", "-c", "ln /etc/clickhouse-server/model/disjunction.cbm /etc/clickhouse-server/model/model.cbm"])
+    node.query("SYSTEM RELOAD MODELS")
+
+    result = node.query("""
+        WITH modelEvaluate('model', toFloat64(x), toFloat64(y)) as prediction, exp(prediction) / (1 + exp(prediction)) as probability
+        SELECT if(probability > 0.5, 1, 0) FROM binary;
+        """)
+    assert result == '1\n1\n1\n0\n'
\ No newline at end of file
diff --git a/tests/integration/test_cluster_copier/configs/users.xml b/tests/integration/test_cluster_copier/configs/users.xml
index e742d4f05a6..d27ca56eec7 100644
--- a/tests/integration/test_cluster_copier/configs/users.xml
+++ b/tests/integration/test_cluster_copier/configs/users.xml
@@ -17,6 +17,14 @@
             <profile>default</profile>
             <quota>default</quota>
         </default>
+        <dbuser>
+            <password>12345678</password>
+            <networks incl="networks" replace="replace">
+                <ip>::/0</ip>
+            </networks>
+            <profile>default</profile>
+            <quota>default</quota>
+        </dbuser>
     </users>
 
     <quotas>
diff --git a/tests/integration/test_cluster_copier/task_self_copy.xml b/tests/integration/test_cluster_copier/task_self_copy.xml
new file mode 100644
index 00000000000..e0e35ccfe99
--- /dev/null
+++ b/tests/integration/test_cluster_copier/task_self_copy.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0"?>
+<yandex>
+    <tcp_port_secure>9440</tcp_port_secure>
+    <remote_servers>
+        <source_cluster>
+            <shard>
+                <internal_replication>false</internal_replication>
+                <replica>
+                    <host>s0_0_0</host>
+                    <port>9000</port>
+                    <user>dbuser</user>
+                    <password>12345678</password>
+                    <secure>0</secure>
+                </replica>
+            </shard>
+        </source_cluster>
+
+        <destination_cluster>
+            <shard>
+                <internal_replication>false</internal_replication>
+                <replica>
+                    <host>s0_0_0</host>
+                    <port>9000</port>
+                    <user>dbuser</user>
+                    <password>12345678</password>
+                    <secure>0</secure>
+                </replica>
+            </shard>
+        </destination_cluster>
+    </remote_servers>
+
+    <max_workers>2</max_workers>
+
+    <settings_pull>
+        <readonly>1</readonly>
+    </settings_pull>
+
+    <settings_push>
+        <readonly>0</readonly>
+    </settings_push>
+
+    <settings>
+        <connect_timeout>3</connect_timeout>
+        <insert_distributed_sync>1</insert_distributed_sync>
+    </settings>
+
+    <tables>
+        <table1>
+            <cluster_pull>source_cluster</cluster_pull>
+    	    <database_pull>db1</database_pull>
+            <table_pull>source_table</table_pull>
+
+            <cluster_push>destination_cluster</cluster_push>
+            <database_push>db2</database_push>
+            <table_push>destination_table</table_push>
+
+            <engine>
+	            ENGINE = MergeTree PARTITION BY a ORDER BY a SETTINGS index_granularity = 8192
+	        </engine>
+
+    	    <sharding_key>rand()</sharding_key>
+        </table1>
+    </tables>
+</yandex>
\ No newline at end of file
diff --git a/tests/integration/test_cluster_copier/test.py b/tests/integration/test_cluster_copier/test.py
index d87969630cd..57f9d150c8d 100644
--- a/tests/integration/test_cluster_copier/test.py
+++ b/tests/integration/test_cluster_copier/test.py
@@ -251,6 +251,31 @@ class Task_non_partitioned_table:
         instance = cluster.instances['s1_1_0']
         instance.query("DROP TABLE copier_test1_1")
 
+class Task_self_copy:
+
+    def __init__(self, cluster):
+        self.cluster = cluster
+        self.zk_task_path = "/clickhouse-copier/task_self_copy"
+        self.copier_task_config = open(os.path.join(CURRENT_TEST_DIR, 'task_self_copy.xml'), 'r').read()
+
+    def start(self):
+        instance = cluster.instances['s0_0_0']
+        instance.query("CREATE DATABASE db1;")
+        instance.query(
+            "CREATE TABLE db1.source_table (`a` Int8, `b` String, `c` Int8) ENGINE = MergeTree PARTITION BY a ORDER BY a SETTINGS index_granularity = 8192")
+        instance.query("CREATE DATABASE db2;")
+        instance.query(
+            "CREATE TABLE db2.destination_table (`a` Int8, `b` String, `c` Int8) ENGINE = MergeTree PARTITION BY a ORDER BY a SETTINGS index_granularity = 8192")
+        instance.query("INSERT INTO db1.source_table VALUES (1, 'ClickHouse', 1);")
+        instance.query("INSERT INTO db1.source_table VALUES (2, 'Copier', 2);")
+
+    def check(self):
+        instance = cluster.instances['s0_0_0']
+        assert TSV(instance.query("SELECT * FROM db2.destination_table ORDER BY a")) == TSV(instance.query("SELECT * FROM db1.source_table ORDER BY a"))
+        instance = cluster.instances['s0_0_0']
+        instance.query("DROP DATABASE db1 SYNC")
+        instance.query("DROP DATABASE db2 SYNC")
+
 
 def execute_task(task, cmd_options):
     task.start()
@@ -380,9 +405,14 @@ def test_no_index(started_cluster):
 def test_no_arg(started_cluster):
     execute_task(Task_no_arg(started_cluster), [])
 
+
 def test_non_partitioned_table(started_cluster):
     execute_task(Task_non_partitioned_table(started_cluster), [])
 
+
+def test_self_copy(started_cluster):
+    execute_task(Task_self_copy(started_cluster), [])
+
 if __name__ == '__main__':
     with contextmanager(started_cluster)() as cluster:
         for name, instance in list(cluster.instances.items()):
diff --git a/tests/integration/test_dictionaries_complex_key_cache_string/configs/dictionaries/ssd_complex_key_cache_string.xml b/tests/integration/test_dictionaries_complex_key_cache_string/configs/dictionaries/ssd_complex_key_cache_string.xml
index 85f811d2d85..c8fdbcbe0ef 100644
--- a/tests/integration/test_dictionaries_complex_key_cache_string/configs/dictionaries/ssd_complex_key_cache_string.xml
+++ b/tests/integration/test_dictionaries_complex_key_cache_string/configs/dictionaries/ssd_complex_key_cache_string.xml
@@ -42,7 +42,6 @@
                 <read_buffer_size>131072</read_buffer_size>
                 <write_buffer_size>1048576</write_buffer_size>
 		        <path>/etc/clickhouse/dictionaries/radars</path>
-                <max_stored_keys>1048576</max_stored_keys>
             </complex_key_ssd_cache>
         </layout>
         <lifetime>1</lifetime>
diff --git a/tests/integration/test_dictionaries_postgresql/configs/dictionaries/postgres_dict.xml b/tests/integration/test_dictionaries_postgresql/configs/dictionaries/postgres_dict.xml
new file mode 100644
index 00000000000..4ee07d0972a
--- /dev/null
+++ b/tests/integration/test_dictionaries_postgresql/configs/dictionaries/postgres_dict.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0"?>
+<yandex>
+   <dictionary>
+      <name>dict0</name>
+      <source>
+         <postgresql>
+            <db>clickhouse</db>
+            <host>postgres1</host>
+            <port>5432</port>
+            <user>postgres</user>
+            <password>mysecretpassword</password>
+            <table>test0</table>
+            <invalidate_query>SELECT value FROM test0 WHERE id = 0</invalidate_query>
+         </postgresql>
+      </source>
+      <layout>
+         <hashed/>
+      </layout>
+      <structure>
+         <id>
+            <name>id</name>
+            <type>UInt32</type>
+         </id>
+         <attribute>
+            <name>id</name>
+            <type>UInt32</type>
+            <null_value></null_value>
+         </attribute>
+         <attribute>
+            <name>value</name>
+            <type>UInt32</type>
+            <null_value></null_value>
+         </attribute>
+      </structure>
+      <lifetime>1</lifetime>
+  </dictionary>
+  <dictionary>
+      <name>dict1</name>
+      <source>
+         <postgresql>
+            <db>clickhouse</db>
+            <user>postgres</user>
+            <password>mysecretpassword</password>
+            <table>test1</table>
+            <replica>
+                 <host>postgres1</host>
+                 <priority>3</priority>
+                 <port>5432</port>
+            </replica>
+            <replica>
+                 <host>postgres2</host>
+                 <port>5433</port>
+                 <priority>1</priority>
+            </replica>
+            <replica>
+                 <host>postgres2</host>
+                 <port>5432</port>
+                 <priority>2</priority>
+            </replica>
+         </postgresql>
+      </source>
+      <layout>
+         <hashed/>
+      </layout>
+      <structure>
+         <id>
+            <name>id</name>
+            <type>UInt32</type>
+         </id>
+         <attribute>
+            <name>id</name>
+            <type>UInt32</type>
+            <null_value></null_value>
+         </attribute>
+         <attribute>
+            <name>value</name>
+            <type>UInt32</type>
+            <null_value></null_value>
+         </attribute>
+      </structure>
+      <lifetime>1</lifetime>
+  </dictionary>
+</yandex>
diff --git a/tests/integration/test_dictionaries_postgresql/configs/postgres_dict.xml b/tests/integration/test_dictionaries_postgresql/configs/postgres_dict.xml
deleted file mode 100644
index 2572930a798..00000000000
--- a/tests/integration/test_dictionaries_postgresql/configs/postgres_dict.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-<yandex>
-   <dictionary>
-      <name>dict0</name>
-      <source>
-         <postgresql>
-            <db>clickhouse</db>
-            <host>postgres1</host>
-            <port>5432</port>
-            <user>postgres</user>
-            <password>mysecretpassword</password>
-            <table>test0</table>
-            <invalidate_query>SELECT value FROM test0 WHERE id = 0</invalidate_query>
-         </postgresql>
-      </source>
-      <layout>
-         <hashed/>
-      </layout>
-      <structure>
-         <id>
-            <name>id</name>
-            <type>UInt32</type>
-         </id>
-         <attribute>
-            <name>id</name>
-            <type>UInt32</type>
-            <null_value></null_value>
-         </attribute>
-         <attribute>
-            <name>value</name>
-            <type>UInt32</type>
-            <null_value></null_value>
-         </attribute>
-      </structure>
-      <lifetime>1</lifetime>
-  </dictionary>
-</yandex>
diff --git a/tests/integration/test_dictionaries_postgresql/test.py b/tests/integration/test_dictionaries_postgresql/test.py
index b83c00409af..5b3b5a5aa45 100644
--- a/tests/integration/test_dictionaries_postgresql/test.py
+++ b/tests/integration/test_dictionaries_postgresql/test.py
@@ -6,7 +6,10 @@ from helpers.cluster import ClickHouseCluster
 from psycopg2.extensions import ISOLATION_LEVEL_AUTOCOMMIT
 
 cluster = ClickHouseCluster(__file__)
-node1 = cluster.add_instance('node1', main_configs=['configs/config.xml', 'configs/postgres_dict.xml', 'configs/log_conf.xml'], with_postgres=True)
+node1 = cluster.add_instance('node1', main_configs=[
+    'configs/config.xml',
+    'configs/dictionaries/postgres_dict.xml',
+    'configs/log_conf.xml'], with_postgres=True, with_postgres_cluster=True)
 
 postgres_dict_table_template = """
     CREATE TABLE IF NOT EXISTS {} (
@@ -18,11 +21,12 @@ click_dict_table_template = """
     ) ENGINE = Dictionary({})
     """
 
-def get_postgres_conn(database=False):
+def get_postgres_conn(port=5432, database=False):
     if database == True:
-        conn_string = "host='localhost' dbname='clickhouse' user='postgres' password='mysecretpassword'"
+        conn_string = "host='localhost' port={} dbname='clickhouse' user='postgres' password='mysecretpassword'".format(port)
     else:
-        conn_string = "host='localhost' user='postgres' password='mysecretpassword'"
+        conn_string = "host='localhost' port={} user='postgres' password='mysecretpassword'".format(port)
+
     conn = psycopg2.connect(conn_string)
     conn.set_isolation_level(ISOLATION_LEVEL_AUTOCOMMIT)
     conn.autocommit = True
@@ -32,15 +36,13 @@ def create_postgres_db(conn, name):
     cursor = conn.cursor()
     cursor.execute("CREATE DATABASE {}".format(name))
 
-def create_postgres_table(conn, table_name):
-    cursor = conn.cursor()
+def create_postgres_table(cursor, table_name):
     cursor.execute(postgres_dict_table_template.format(table_name))
 
-def create_and_fill_postgres_table(table_name):
-    conn = get_postgres_conn(True)
-    create_postgres_table(conn, table_name)
+def create_and_fill_postgres_table(cursor, table_name, host='postgres1', port=5432):
+    create_postgres_table(cursor, table_name)
     # Fill postgres table using clickhouse postgres table function and check
-    table_func = '''postgresql('postgres1:5432', 'clickhouse', '{}', 'postgres', 'mysecretpassword')'''.format(table_name)
+    table_func = '''postgresql('{}:{}', 'clickhouse', '{}', 'postgres', 'mysecretpassword')'''.format(host, port, table_name)
     node1.query('''INSERT INTO TABLE FUNCTION {} SELECT number, number from numbers(10000)
             '''.format(table_func, table_name))
     result = node1.query("SELECT count() FROM {}".format(table_func))
@@ -54,10 +56,16 @@ def create_dict(table_name, index=0):
 def started_cluster():
     try:
         cluster.start()
-        postgres_conn = get_postgres_conn()
         node1.query("CREATE DATABASE IF NOT EXISTS test")
-        print("postgres connected")
+
+        postgres_conn = get_postgres_conn(port=5432)
+        print("postgres1 connected")
         create_postgres_db(postgres_conn, 'clickhouse')
+
+        postgres_conn = get_postgres_conn(port=5421)
+        print("postgres2 connected")
+        create_postgres_db(postgres_conn, 'clickhouse')
+
         yield cluster
 
     finally:
@@ -65,25 +73,28 @@ def started_cluster():
 
 
 def test_load_dictionaries(started_cluster):
-    conn = get_postgres_conn(True)
+    conn = get_postgres_conn(database=True)
     cursor = conn.cursor()
     table_name = 'test0'
-    create_and_fill_postgres_table(table_name)
+    create_and_fill_postgres_table(cursor, table_name)
     create_dict(table_name)
     dict_name = 'dict0'
 
-    node1.query("SYSTEM RELOAD DICTIONARIES")
+    node1.query("SYSTEM RELOAD DICTIONARY {}".format(dict_name))
     assert node1.query("SELECT count() FROM `test`.`dict_table_{}`".format(table_name)).rstrip() == '10000'
     assert node1.query("SELECT dictGetUInt32('{}', 'id', toUInt64(0))".format(dict_name)) == '0\n'
     assert node1.query("SELECT dictGetUInt32('{}', 'value', toUInt64(9999))".format(dict_name)) == '9999\n'
+
     cursor.execute("DROP TABLE IF EXISTS {}".format(table_name))
+    node1.query("DROP TABLE IF EXISTS {}".format(table_name))
+    node1.query("DROP DICTIONARY IF EXISTS {}".format(dict_name))
 
 
 def test_invalidate_query(started_cluster):
-    conn = get_postgres_conn(True)
+    conn = get_postgres_conn(database=True)
     cursor = conn.cursor()
     table_name = 'test0'
-    create_and_fill_postgres_table(table_name)
+    create_and_fill_postgres_table(cursor, table_name)
 
     # invalidate query: SELECT value FROM test0 WHERE id = 0
     dict_name = 'dict0'
@@ -112,6 +123,40 @@ def test_invalidate_query(started_cluster):
     assert node1.query("SELECT dictGetUInt32('{}', 'value', toUInt64(0))".format(dict_name)) == '2\n'
     assert node1.query("SELECT dictGetUInt32('{}', 'value', toUInt64(1))".format(dict_name)) == '2\n'
 
+    node1.query("DROP TABLE IF EXISTS {}".format(table_name))
+    node1.query("DROP DICTIONARY IF EXISTS {}".format(dict_name))
+    cursor.execute("DROP TABLE IF EXISTS {}".format(table_name))
+
+
+def test_dictionary_with_replicas(started_cluster):
+    conn1 = get_postgres_conn(port=5432, database=True)
+    cursor1 = conn1.cursor()
+    conn2 = get_postgres_conn(port=5421, database=True)
+    cursor2 = conn2.cursor()
+
+    create_postgres_table(cursor1, 'test1')
+    create_postgres_table(cursor2, 'test1')
+
+    cursor1.execute('INSERT INTO test1 select i, i from generate_series(0, 99) as t(i);');
+    cursor2.execute('INSERT INTO test1 select i, i from generate_series(100, 199) as t(i);');
+
+    create_dict('test1', 1)
+    result = node1.query("SELECT * FROM `test`.`dict_table_test1` ORDER BY id")
+
+    # priority 0 - non running port
+    assert node1.contains_in_log('Unable to setup connection to postgres2:5433*')
+
+    # priority 1 - postgres2, table contains rows with values 100-200
+    # priority 2 - postgres1, table contains rows with values 0-100
+    expected = node1.query("SELECT number, number FROM numbers(100, 100)")
+    assert(result == expected)
+
+    cursor1.execute("DROP TABLE IF EXISTS test1")
+    cursor2.execute("DROP TABLE IF EXISTS test1")
+
+    node1.query("DROP TABLE IF EXISTS test1")
+    node1.query("DROP DICTIONARY IF EXISTS dict1")
+
 
 if __name__ == '__main__':
     cluster.start()
diff --git a/tests/integration/test_dictionaries_update_and_reload/test.py b/tests/integration/test_dictionaries_update_and_reload/test.py
index 5c8abcda38e..533a29dc245 100644
--- a/tests/integration/test_dictionaries_update_and_reload/test.py
+++ b/tests/integration/test_dictionaries_update_and_reload/test.py
@@ -141,7 +141,8 @@ def test_reload_after_loading(started_cluster):
     time.sleep(1)  # see the comment above
     replace_in_file_in_container('/etc/clickhouse-server/config.d/executable.xml', '81', '82')
     replace_in_file_in_container('/etc/clickhouse-server/config.d/file.txt', '101', '102')
-    query("SYSTEM RELOAD DICTIONARIES")
+    query("SYSTEM RELOAD DICTIONARY 'file'")
+    query("SYSTEM RELOAD DICTIONARY 'executable'")
     assert query("SELECT dictGetInt32('executable', 'a', toUInt64(7))") == "82\n"
     assert query("SELECT dictGetInt32('file', 'a', toUInt64(9))") == "102\n"
 
diff --git a/tests/integration/test_distributed_ddl/test.py b/tests/integration/test_distributed_ddl/test.py
index 58e1d0d06f7..9af27738eed 100755
--- a/tests/integration/test_distributed_ddl/test.py
+++ b/tests/integration/test_distributed_ddl/test.py
@@ -343,6 +343,12 @@ def test_replicated_without_arguments(test_cluster):
                                  "EXCHANGE TABLES test_atomic.rmt AND test_atomic.rmt_renamed ON CLUSTER cluster")
     assert instance.query("SELECT countDistinct(uuid) from clusterAllReplicas('cluster', 'system', 'databases') WHERE uuid != 0 AND name='test_atomic'") == "1\n"
     assert instance.query("SELECT countDistinct(uuid) from clusterAllReplicas('cluster', 'system', 'tables') WHERE uuid != 0 AND name='rmt'") == "1\n"
+    test_cluster.ddl_check_query(instance,
+                                 "CREATE TABLE test_atomic.rrmt ON CLUSTER cluster (n UInt64, m UInt64) ENGINE=ReplicatedReplacingMergeTree(m) ORDER BY n")
+    test_cluster.ddl_check_query(instance,
+                                 "CREATE TABLE test_atomic.rsmt ON CLUSTER cluster (n UInt64, m UInt64, k UInt64) ENGINE=ReplicatedSummingMergeTree((m, k)) ORDER BY n")
+    test_cluster.ddl_check_query(instance,
+                                 "CREATE TABLE test_atomic.rvcmt ON CLUSTER cluster (n UInt64, m Int8, k UInt64) ENGINE=ReplicatedVersionedCollapsingMergeTree(m, k) ORDER BY n")
     test_cluster.ddl_check_query(instance, "DROP DATABASE test_atomic ON CLUSTER cluster")
 
     test_cluster.ddl_check_query(instance, "CREATE DATABASE test_ordinary ON CLUSTER cluster ENGINE=Ordinary")
diff --git a/tests/integration/test_distributed_ddl_parallel/configs/ddl_a.xml b/tests/integration/test_distributed_ddl_parallel/configs/ddl_a.xml
new file mode 100644
index 00000000000..b926f99c687
--- /dev/null
+++ b/tests/integration/test_distributed_ddl_parallel/configs/ddl_a.xml
@@ -0,0 +1,5 @@
+<yandex>
+    <distributed_ddl>
+        <pool_size replace="1">2</pool_size>
+    </distributed_ddl>
+</yandex>
diff --git a/tests/integration/test_distributed_ddl_parallel/configs/ddl_b.xml b/tests/integration/test_distributed_ddl_parallel/configs/ddl_b.xml
new file mode 100644
index 00000000000..2f038919032
--- /dev/null
+++ b/tests/integration/test_distributed_ddl_parallel/configs/ddl_b.xml
@@ -0,0 +1,5 @@
+<yandex>
+    <distributed_ddl>
+        <pool_size replace="1">20</pool_size>
+    </distributed_ddl>
+</yandex>
diff --git a/tests/integration/test_distributed_ddl_parallel/configs/dict.xml b/tests/integration/test_distributed_ddl_parallel/configs/dict.xml
index 610d55841a0..d94b3f61dd9 100644
--- a/tests/integration/test_distributed_ddl_parallel/configs/dict.xml
+++ b/tests/integration/test_distributed_ddl_parallel/configs/dict.xml
@@ -1,26 +1,50 @@
 <?xml version="1.0"?>
 <yandex>
-   <dictionary>
-      <name>slow_dict</name>
-      <source>
-         <executable>
-             <command>sleep 7</command>
-             <format>TabSeparated</format>
-         </executable>
-      </source>
-      <layout>
-         <flat/>
-      </layout>
-      <structure>
-         <id>
-            <name>id</name>
-         </id>
-         <attribute>
-            <name>value</name>
-            <type>String</type>
-            <null_value></null_value>
-         </attribute>
-      </structure>
-      <lifetime>0</lifetime>
-  </dictionary>
+    <dictionary>
+        <name>slow_dict_7</name>
+        <source>
+           <executable>
+               <command>sleep 7</command>
+               <format>TabSeparated</format>
+           </executable>
+        </source>
+        <layout>
+           <flat/>
+        </layout>
+        <structure>
+           <id>
+              <name>id</name>
+           </id>
+           <attribute>
+              <name>value</name>
+              <type>String</type>
+              <null_value></null_value>
+           </attribute>
+        </structure>
+        <lifetime>0</lifetime>
+    </dictionary>
+
+    <dictionary>
+        <name>slow_dict_3</name>
+        <source>
+           <executable>
+               <command>sleep 3</command>
+               <format>TabSeparated</format>
+           </executable>
+        </source>
+        <layout>
+           <flat/>
+        </layout>
+        <structure>
+           <id>
+              <name>id</name>
+           </id>
+           <attribute>
+              <name>value</name>
+              <type>String</type>
+              <null_value></null_value>
+           </attribute>
+        </structure>
+        <lifetime>0</lifetime>
+    </dictionary>
 </yandex>
diff --git a/tests/integration/test_distributed_ddl_parallel/configs/remote_servers.xml b/tests/integration/test_distributed_ddl_parallel/configs/remote_servers.xml
index 8ffa9f024d7..eb0ee60186b 100644
--- a/tests/integration/test_distributed_ddl_parallel/configs/remote_servers.xml
+++ b/tests/integration/test_distributed_ddl_parallel/configs/remote_servers.xml
@@ -1,6 +1,6 @@
 <yandex>
 <remote_servers>
-    <cluster>
+    <cluster_a>
         <shard>
             <replica>
                 <host>n1</host>
@@ -13,6 +13,20 @@
                 <port>9000</port>
             </replica>
         </shard>
-    </cluster>
+    </cluster_a>
+    <cluster_b>
+        <shard>
+            <replica>
+                <host>n3</host>
+                <port>9000</port>
+            </replica>
+        </shard>
+        <shard>
+            <replica>
+                <host>n4</host>
+                <port>9000</port>
+            </replica>
+        </shard>
+    </cluster_b>
 </remote_servers>
 </yandex>
diff --git a/tests/integration/test_distributed_ddl_parallel/test.py b/tests/integration/test_distributed_ddl_parallel/test.py
index 96530b111cb..44971ca3d9e 100644
--- a/tests/integration/test_distributed_ddl_parallel/test.py
+++ b/tests/integration/test_distributed_ddl_parallel/test.py
@@ -10,11 +10,31 @@ from helpers.cluster import ClickHouseCluster
 
 cluster = ClickHouseCluster(__file__)
 
-def add_instance(name):
+# By default the exceptions that was throwed in threads will be ignored
+# (they will not mark the test as failed, only printed to stderr).
+#
+# Wrap thrading.Thread and re-throw exception on join()
+class SafeThread(threading.Thread):
+    def __init__(self, target):
+        super().__init__()
+        self.target = target
+        self.exception = None
+    def run(self):
+        try:
+            self.target()
+        except Exception as e: # pylint: disable=broad-except
+            self.exception = e
+    def join(self, timeout=None):
+        super().join(timeout)
+        if self.exception:
+            raise self.exception
+
+def add_instance(name, ddl_config=None):
     main_configs=[
-        'configs/ddl.xml',
         'configs/remote_servers.xml',
     ]
+    if ddl_config:
+        main_configs.append(ddl_config)
     dictionaries=[
         'configs/dict.xml',
     ]
@@ -24,8 +44,12 @@ def add_instance(name):
         with_zookeeper=True)
 
 initiator = add_instance('initiator')
-n1 = add_instance('n1')
-n2 = add_instance('n2')
+# distributed_ddl.pool_size = 2
+n1 = add_instance('n1', 'configs/ddl_a.xml')
+n2 = add_instance('n2', 'configs/ddl_a.xml')
+# distributed_ddl.pool_size = 20
+n3 = add_instance('n3', 'configs/ddl_b.xml')
+n4 = add_instance('n4', 'configs/ddl_b.xml')
 
 @pytest.fixture(scope='module', autouse=True)
 def start_cluster():
@@ -49,17 +73,32 @@ def longer_then(sec):
         return inner
     return wrapper
 
-# It takes 7 seconds to load slow_dict.
-def thread_reload_dictionary():
-    initiator.query('SYSTEM RELOAD DICTIONARY ON CLUSTER cluster slow_dict')
+# It takes 7 seconds to load slow_dict_7.
+def execute_reload_dictionary_slow_dict_7():
+    initiator.query('SYSTEM RELOAD DICTIONARY ON CLUSTER cluster_a slow_dict_7', settings={
+        'distributed_ddl_task_timeout': 60,
+    })
+def execute_reload_dictionary_slow_dict_3():
+    initiator.query('SYSTEM RELOAD DICTIONARY ON CLUSTER cluster_b slow_dict_3', settings={
+        'distributed_ddl_task_timeout': 60,
+    })
+def execute_smoke_query():
+    initiator.query('DROP DATABASE IF EXISTS foo ON CLUSTER cluster_b', settings={
+        'distributed_ddl_task_timeout': 60,
+    })
+
+def check_log():
+    # ensure that none of tasks processed multiple times
+    for _, instance in list(cluster.instances.items()):
+        assert not instance.contains_in_log('Coordination::Exception: Node exists')
 
 # NOTE: uses inner function to exclude slow start_cluster() from timeout.
 
-def test_dict_load():
+def test_slow_dict_load_7():
     @pytest.mark.timeout(10)
     @longer_then(7)
     def inner_test():
-        initiator.query('SYSTEM RELOAD DICTIONARY slow_dict')
+        initiator.query('SYSTEM RELOAD DICTIONARY slow_dict_7')
     inner_test()
 
 def test_all_in_parallel():
@@ -68,12 +107,13 @@ def test_all_in_parallel():
     def inner_test():
         threads = []
         for _ in range(2):
-            threads.append(threading.Thread(target=thread_reload_dictionary))
+            threads.append(SafeThread(target=execute_reload_dictionary_slow_dict_7))
         for thread in threads:
             thread.start()
         for thread in threads:
-            thread.join()
+            thread.join(70)
     inner_test()
+    check_log()
 
 def test_two_in_parallel_two_queued():
     @pytest.mark.timeout(19)
@@ -81,9 +121,35 @@ def test_two_in_parallel_two_queued():
     def inner_test():
         threads = []
         for _ in range(4):
-            threads.append(threading.Thread(target=thread_reload_dictionary))
+            threads.append(SafeThread(target=execute_reload_dictionary_slow_dict_7))
         for thread in threads:
             thread.start()
         for thread in threads:
-            thread.join()
+            thread.join(70)
     inner_test()
+    check_log()
+
+def test_smoke():
+    for _ in range(100):
+        execute_smoke_query()
+    check_log()
+
+def test_smoke_parallel():
+    threads = []
+    for _ in range(100):
+        threads.append(SafeThread(target=execute_smoke_query))
+    for thread in threads:
+        thread.start()
+    for thread in threads:
+        thread.join(70)
+    check_log()
+
+def test_smoke_parallel_dict_reload():
+    threads = []
+    for _ in range(100):
+        threads.append(SafeThread(target=execute_reload_dictionary_slow_dict_3))
+    for thread in threads:
+        thread.start()
+    for thread in threads:
+        thread.join(70)
+    check_log()
diff --git a/tests/integration/test_distributed_inter_server_secret/test.py b/tests/integration/test_distributed_inter_server_secret/test.py
index b1daf2271d0..1a0e5a3dd91 100644
--- a/tests/integration/test_distributed_inter_server_secret/test.py
+++ b/tests/integration/test_distributed_inter_server_secret/test.py
@@ -97,12 +97,14 @@ def test_insecure():
     n1.query('SELECT * FROM dist_insecure')
 
 def test_insecure_insert_async():
+    n1.query("TRUNCATE TABLE data")
     n1.query('INSERT INTO dist_insecure SELECT * FROM numbers(2)')
     n1.query('SYSTEM FLUSH DISTRIBUTED ON CLUSTER insecure dist_insecure')
     assert int(n1.query('SELECT count() FROM dist_insecure')) == 2
     n1.query('TRUNCATE TABLE data ON CLUSTER insecure')
 
 def test_insecure_insert_sync():
+    n1.query("TRUNCATE TABLE data")
     n1.query('INSERT INTO dist_insecure SELECT * FROM numbers(2)', settings={'insert_distributed_sync': 1})
     assert int(n1.query('SELECT count() FROM dist_insecure')) == 2
     n1.query('TRUNCATE TABLE data ON CLUSTER secure')
@@ -111,12 +113,14 @@ def test_secure():
     n1.query('SELECT * FROM dist_secure')
 
 def test_secure_insert_async():
+    n1.query("TRUNCATE TABLE data")
     n1.query('INSERT INTO dist_secure SELECT * FROM numbers(2)')
     n1.query('SYSTEM FLUSH DISTRIBUTED ON CLUSTER secure dist_secure')
     assert int(n1.query('SELECT count() FROM dist_secure')) == 2
     n1.query('TRUNCATE TABLE data ON CLUSTER secure')
 
 def test_secure_insert_sync():
+    n1.query("TRUNCATE TABLE data")
     n1.query('INSERT INTO dist_secure SELECT * FROM numbers(2)', settings={'insert_distributed_sync': 1})
     assert int(n1.query('SELECT count() FROM dist_secure')) == 2
     n1.query('TRUNCATE TABLE data ON CLUSTER secure')
@@ -126,6 +130,7 @@ def test_secure_insert_sync():
 # Buffer() flush happens with global context, that does not have user
 # And so Context::user/ClientInfo::current_user/ClientInfo::initial_user will be empty
 def test_secure_insert_buffer_async():
+    n1.query("TRUNCATE TABLE data")
     n1.query('INSERT INTO dist_secure_buffer SELECT * FROM numbers(2)')
     n1.query('SYSTEM FLUSH DISTRIBUTED ON CLUSTER secure dist_secure')
     # no Buffer flush happened
@@ -141,6 +146,7 @@ def test_secure_disagree():
         n1.query('SELECT * FROM dist_secure_disagree')
 
 def test_secure_disagree_insert():
+    n1.query("TRUNCATE TABLE data")
     n1.query('INSERT INTO dist_secure_disagree SELECT * FROM numbers(2)')
     with pytest.raises(QueryRuntimeException, match='.*Hash mismatch.*'):
         n1.query('SYSTEM FLUSH DISTRIBUTED ON CLUSTER secure_disagree dist_secure_disagree')
diff --git a/tests/integration/test_distributed_load_balancing/configs/users.xml b/tests/integration/test_distributed_load_balancing/configs/users.xml
new file mode 100644
index 00000000000..b2dcdbcd8f3
--- /dev/null
+++ b/tests/integration/test_distributed_load_balancing/configs/users.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<yandex>
+    <profiles>
+        <default>
+            <use_hedged_requests>0</use_hedged_requests>
+        </default>
+    </profiles>
+</yandex>
diff --git a/tests/integration/test_distributed_load_balancing/test.py b/tests/integration/test_distributed_load_balancing/test.py
index df7b74fcae1..d3ac5c132cd 100644
--- a/tests/integration/test_distributed_load_balancing/test.py
+++ b/tests/integration/test_distributed_load_balancing/test.py
@@ -166,6 +166,7 @@ def test_load_balancing_priority_round_robin(dist_table):
 
 def test_distributed_replica_max_ignored_errors():
     settings = {
+        'use_hedged_requests' : 0,
         'load_balancing': 'in_order',
         'prefer_localhost_replica': 0,
         'connect_timeout': 2,
diff --git a/tests/queries/0_stateless/01676_clickhouse_client_autocomplete.reference b/tests/integration/test_distributed_queries_stress/__init__.py
similarity index 100%
rename from tests/queries/0_stateless/01676_clickhouse_client_autocomplete.reference
rename to tests/integration/test_distributed_queries_stress/__init__.py
diff --git a/tests/integration/test_distributed_queries_stress/configs/remote_servers.xml b/tests/integration/test_distributed_queries_stress/configs/remote_servers.xml
new file mode 100644
index 00000000000..7d00cebccfc
--- /dev/null
+++ b/tests/integration/test_distributed_queries_stress/configs/remote_servers.xml
@@ -0,0 +1,42 @@
+<yandex>
+    <max_concurrent_queries>1000</max_concurrent_queries>
+
+    <remote_servers>
+        <one_shard>
+            <shard>
+                <internal_replication>true</internal_replication>
+                <replica>
+                    <host>node1_r1</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>node1_r2</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </one_shard>
+        <two_shards>
+            <shard>
+                <internal_replication>true</internal_replication>
+                <replica>
+                    <host>node1_r1</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>node1_r2</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+            <shard>
+                <replica>
+                    <host>node2_r1</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>node2_r2</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </two_shards>
+    </remote_servers>
+</yandex>
diff --git a/tests/integration/test_distributed_queries_stress/test.py b/tests/integration/test_distributed_queries_stress/test.py
new file mode 100644
index 00000000000..dcc4943f7e6
--- /dev/null
+++ b/tests/integration/test_distributed_queries_stress/test.py
@@ -0,0 +1,103 @@
+# pylint: disable=redefined-outer-name
+# pylint: disable=unused-argument
+# pylint: disable=line-too-long
+
+import shlex
+import itertools
+import pytest
+from helpers.cluster import ClickHouseCluster
+
+cluster = ClickHouseCluster(__file__)
+node1_r1 = cluster.add_instance('node1_r1', main_configs=['configs/remote_servers.xml'])
+node2_r1 = cluster.add_instance('node2_r1', main_configs=['configs/remote_servers.xml'])
+node1_r2 = cluster.add_instance('node1_r2', main_configs=['configs/remote_servers.xml'])
+node2_r2 = cluster.add_instance('node2_r2', main_configs=['configs/remote_servers.xml'])
+
+def run_benchmark(payload, settings):
+    node1_r1.exec_in_container([
+        'bash', '-c', 'echo {} | '.format(shlex.quote(payload.strip())) + ' '.join([
+            'clickhouse', 'benchmark',
+            '--concurrency=100',
+            '--cumulative',
+            '--delay=0',
+            # NOTE: with current matrix even 3 seconds it huge...
+            '--timelimit=3',
+            # tune some basic timeouts
+            '--hedged_connection_timeout_ms=200',
+            '--connect_timeout_with_failover_ms=200',
+            '--connections_with_failover_max_tries=5',
+            *settings,
+        ])
+    ])
+
+@pytest.fixture(scope='module')
+def started_cluster():
+    try:
+        cluster.start()
+
+        for _, instance in cluster.instances.items():
+            instance.query("""
+            create table if not exists data (
+                key Int,
+                /* just to increase block size */
+                v1 UInt64,
+                v2 UInt64,
+                v3 UInt64,
+                v4 UInt64,
+                v5 UInt64,
+                v6 UInt64,
+                v7 UInt64,
+                v8 UInt64,
+                v9 UInt64,
+                v10 UInt64,
+                v11 UInt64,
+                v12 UInt64
+            ) Engine=MergeTree() order by key partition by key%5;
+            insert into data (key) select * from numbers(10);
+
+            create table if not exists dist_one           as data engine=Distributed(one_shard, currentDatabase(), data, key);
+            create table if not exists dist_one_over_dist as data engine=Distributed(one_shard, currentDatabase(), dist_one, yandexConsistentHash(key, 2));
+
+            create table if not exists dist_two as data           engine=Distributed(two_shards, currentDatabase(), data, key);
+            create table if not exists dist_two_over_dist as data engine=Distributed(two_shards, currentDatabase(), dist_two, yandexConsistentHash(key, 2));
+            """)
+        yield cluster
+    finally:
+        cluster.shutdown()
+
+# since it includes started_cluster fixture at first start
+@pytest.mark.timeout(60)
+@pytest.mark.parametrize('table,settings', itertools.product(
+    [ # tables
+        'dist_one',
+        'dist_one_over_dist',
+        'dist_two',
+        'dist_two_over_dist',
+    ],
+    [ # settings
+        *list(itertools.combinations([
+            '', # defaults
+            '--prefer_localhost_replica=0',
+            '--async_socket_for_remote=0',
+            '--use_hedged_requests=0',
+            '--optimize_skip_unused_shards=1',
+            '--distributed_group_by_no_merge=2',
+            '--optimize_distributed_group_by_sharding_key=1',
+
+            # TODO: enlarge test matrix (but first those values to accept ms):
+            #
+            # - sleep_in_send_tables_status
+            # - sleep_in_send_data
+        ], 2))
+        # TODO: more combinations that just 2
+    ],
+))
+def test_stress_distributed(table, settings, started_cluster):
+    payload = f'''
+    select * from {table} where key = 0;
+    select * from {table} where key = 1;
+    select * from {table} where key = 2;
+    select * from {table} where key = 3;
+    select * from {table};
+    '''
+    run_benchmark(payload, settings)
diff --git a/tests/integration/test_distributed_respect_user_timeouts/test.py b/tests/integration/test_distributed_respect_user_timeouts/test.py
index c19323b2049..662bf7fa6de 100644
--- a/tests/integration/test_distributed_respect_user_timeouts/test.py
+++ b/tests/integration/test_distributed_respect_user_timeouts/test.py
@@ -78,6 +78,7 @@ def _check_exception(exception, expected_tries=3):
         expected_lines = (
             'Code: 209, ' + EXCEPTION_NETWORK + EXCEPTION_TIMEOUT,
             'Code: 209, ' + EXCEPTION_NETWORK + EXCEPTION_CONNECT,
+            EXCEPTION_TIMEOUT,
         )
 
         assert any(line.startswith(expected) for expected in expected_lines), \
diff --git a/tests/integration/test_drop_replica/test.py b/tests/integration/test_drop_replica/test.py
index f3af9dcb980..eb67a25f9f5 100644
--- a/tests/integration/test_drop_replica/test.py
+++ b/tests/integration/test_drop_replica/test.py
@@ -49,7 +49,6 @@ def fill_nodes(nodes, shard):
 
 
 cluster = ClickHouseCluster(__file__)
-
 node_1_1 = cluster.add_instance('node_1_1', with_zookeeper=True, main_configs=['configs/remote_servers.xml'])
 node_1_2 = cluster.add_instance('node_1_2', with_zookeeper=True, main_configs=['configs/remote_servers.xml'])
 node_1_3 = cluster.add_instance('node_1_3', with_zookeeper=True, main_configs=['configs/remote_servers.xml'])
@@ -72,12 +71,11 @@ def start_cluster():
 
 
 def test_drop_replica(start_cluster):
-    for i in range(100):
-        node_1_1.query("INSERT INTO test.test_table VALUES (1, {})".format(i))
-        node_1_1.query("INSERT INTO test1.test_table VALUES (1, {})".format(i))
-        node_1_1.query("INSERT INTO test2.test_table VALUES (1, {})".format(i))
-        node_1_1.query("INSERT INTO test3.test_table VALUES (1, {})".format(i))
-        node_1_1.query("INSERT INTO test4.test_table VALUES (1, {})".format(i))
+    node_1_1.query("INSERT INTO test.test_table SELECT number, toString(number) FROM numbers(100)")
+    node_1_1.query("INSERT INTO test1.test_table SELECT number, toString(number) FROM numbers(100)")
+    node_1_1.query("INSERT INTO test2.test_table SELECT number, toString(number) FROM numbers(100)")
+    node_1_1.query("INSERT INTO test3.test_table SELECT number, toString(number) FROM numbers(100)")
+    node_1_1.query("INSERT INTO test4.test_table SELECT number, toString(number) FROM numbers(100)")
 
     zk = cluster.get_kazoo_client('zoo1')
     assert "can't drop local replica" in node_1_1.query_and_get_error("SYSTEM DROP REPLICA 'node_1_1'")
@@ -103,53 +101,52 @@ def test_drop_replica(start_cluster):
     assert "does not look like a table path" in \
            node_1_3.query_and_get_error("SYSTEM DROP REPLICA 'node_1_1' FROM ZKPATH '/clickhouse/tables/test'")
 
-    with PartitionManager() as pm:
-        ## make node_1_1 dead
-        pm.drop_instance_zk_connections(node_1_1)
-        time.sleep(10)
+    node_1_1.query("DETACH DATABASE test")
+    for i in range(1, 5):
+        node_1_1.query("DETACH DATABASE test{}".format(i))
 
-        assert "doesn't exist" in node_1_3.query_and_get_error(
-            "SYSTEM DROP REPLICA 'node_1_1' FROM TABLE test.test_table")
+    assert "doesn't exist" in node_1_3.query_and_get_error(
+        "SYSTEM DROP REPLICA 'node_1_1' FROM TABLE test.test_table")
 
-        assert "doesn't exist" in node_1_3.query_and_get_error("SYSTEM DROP REPLICA 'node_1_1' FROM DATABASE test1")
+    assert "doesn't exist" in node_1_3.query_and_get_error("SYSTEM DROP REPLICA 'node_1_1' FROM DATABASE test1")
 
-        node_1_3.query("SYSTEM DROP REPLICA 'node_1_1'")
-        exists_replica_1_1 = zk.exists(
-            "/clickhouse/tables/test3/{shard}/replicated/test_table/replicas/{replica}".format(shard=1,
-                                                                                               replica='node_1_1'))
-        assert (exists_replica_1_1 != None)
+    node_1_3.query("SYSTEM DROP REPLICA 'node_1_1'")
+    exists_replica_1_1 = zk.exists(
+        "/clickhouse/tables/test3/{shard}/replicated/test_table/replicas/{replica}".format(shard=1,
+                                                                                           replica='node_1_1'))
+    assert (exists_replica_1_1 != None)
 
-        ## If you want to drop a inactive/stale replicate table that does not have a local replica, you can following syntax(ZKPATH):
-        node_1_3.query(
-            "SYSTEM DROP REPLICA 'node_1_1' FROM ZKPATH '/clickhouse/tables/test2/{shard}/replicated/test_table'".format(
-                shard=1))
-        exists_replica_1_1 = zk.exists(
-            "/clickhouse/tables/test2/{shard}/replicated/test_table/replicas/{replica}".format(shard=1,
-                                                                                               replica='node_1_1'))
-        assert (exists_replica_1_1 == None)
+    ## If you want to drop a inactive/stale replicate table that does not have a local replica, you can following syntax(ZKPATH):
+    node_1_3.query(
+        "SYSTEM DROP REPLICA 'node_1_1' FROM ZKPATH '/clickhouse/tables/test2/{shard}/replicated/test_table'".format(
+            shard=1))
+    exists_replica_1_1 = zk.exists(
+        "/clickhouse/tables/test2/{shard}/replicated/test_table/replicas/{replica}".format(shard=1,
+                                                                                           replica='node_1_1'))
+    assert (exists_replica_1_1 == None)
 
-        node_1_2.query("SYSTEM DROP REPLICA 'node_1_1' FROM TABLE test.test_table")
-        exists_replica_1_1 = zk.exists(
-            "/clickhouse/tables/test/{shard}/replicated/test_table/replicas/{replica}".format(shard=1,
-                                                                                              replica='node_1_1'))
-        assert (exists_replica_1_1 == None)
+    node_1_2.query("SYSTEM DROP REPLICA 'node_1_1' FROM TABLE test.test_table")
+    exists_replica_1_1 = zk.exists(
+        "/clickhouse/tables/test/{shard}/replicated/test_table/replicas/{replica}".format(shard=1,
+                                                                                          replica='node_1_1'))
+    assert (exists_replica_1_1 == None)
 
-        node_1_2.query("SYSTEM DROP REPLICA 'node_1_1' FROM DATABASE test1")
-        exists_replica_1_1 = zk.exists(
-            "/clickhouse/tables/test1/{shard}/replicated/test_table/replicas/{replica}".format(shard=1,
-                                                                                               replica='node_1_1'))
-        assert (exists_replica_1_1 == None)
+    node_1_2.query("SYSTEM DROP REPLICA 'node_1_1' FROM DATABASE test1")
+    exists_replica_1_1 = zk.exists(
+        "/clickhouse/tables/test1/{shard}/replicated/test_table/replicas/{replica}".format(shard=1,
+                                                                                           replica='node_1_1'))
+    assert (exists_replica_1_1 == None)
 
-        node_1_3.query(
-            "SYSTEM DROP REPLICA 'node_1_1' FROM ZKPATH '/clickhouse/tables/test3/{shard}/replicated/test_table'".format(
-                shard=1))
-        exists_replica_1_1 = zk.exists(
-            "/clickhouse/tables/test3/{shard}/replicated/test_table/replicas/{replica}".format(shard=1,
-                                                                                               replica='node_1_1'))
-        assert (exists_replica_1_1 == None)
+    node_1_3.query(
+        "SYSTEM DROP REPLICA 'node_1_1' FROM ZKPATH '/clickhouse/tables/test3/{shard}/replicated/test_table'".format(
+            shard=1))
+    exists_replica_1_1 = zk.exists(
+        "/clickhouse/tables/test3/{shard}/replicated/test_table/replicas/{replica}".format(shard=1,
+                                                                                           replica='node_1_1'))
+    assert (exists_replica_1_1 == None)
 
-        node_1_2.query("SYSTEM DROP REPLICA 'node_1_1'")
-        exists_replica_1_1 = zk.exists(
-            "/clickhouse/tables/test4/{shard}/replicated/test_table/replicas/{replica}".format(shard=1,
-                                                                                               replica='node_1_1'))
-        assert (exists_replica_1_1 == None)
+    node_1_2.query("SYSTEM DROP REPLICA 'node_1_1'")
+    exists_replica_1_1 = zk.exists(
+        "/clickhouse/tables/test4/{shard}/replicated/test_table/replicas/{replica}".format(shard=1,
+                                                                                           replica='node_1_1'))
+    assert (exists_replica_1_1 == None)
diff --git a/tests/integration/test_fetch_partition_from_auxiliary_zookeeper/test.py b/tests/integration/test_fetch_partition_from_auxiliary_zookeeper/test.py
index f9c10d68fe3..7bce2d50011 100644
--- a/tests/integration/test_fetch_partition_from_auxiliary_zookeeper/test.py
+++ b/tests/integration/test_fetch_partition_from_auxiliary_zookeeper/test.py
@@ -1,5 +1,3 @@
-
-
 import pytest
 from helpers.client import QueryRuntimeException
 from helpers.cluster import ClickHouseCluster
@@ -18,23 +16,33 @@ def start_cluster():
         cluster.shutdown()
 
 
-def test_fetch_part_from_allowed_zookeeper(start_cluster):
+@pytest.mark.parametrize(
+    ('part', 'date', 'part_name'),
+    [
+        ('PARTITION', '2020-08-27', '2020-08-27'),
+        ('PART', '2020-08-28', '20200828_0_0_0'),
+    ]
+)
+def test_fetch_part_from_allowed_zookeeper(start_cluster, part, date, part_name):
     node.query(
-        "CREATE TABLE simple (date Date, id UInt32) ENGINE = ReplicatedMergeTree('/clickhouse/tables/0/simple', 'node') ORDER BY tuple() PARTITION BY date;"
+        "CREATE TABLE IF NOT EXISTS simple (date Date, id UInt32) ENGINE = ReplicatedMergeTree('/clickhouse/tables/0/simple', 'node') ORDER BY tuple() PARTITION BY date;"
     )
-    node.query("INSERT INTO simple VALUES ('2020-08-27', 1)")
+
+    node.query("""INSERT INTO simple VALUES ('{date}', 1)""".format(date=date))
 
     node.query(
-        "CREATE TABLE simple2 (date Date, id UInt32) ENGINE = ReplicatedMergeTree('/clickhouse/tables/1/simple', 'node') ORDER BY tuple() PARTITION BY date;"
+        "CREATE TABLE IF NOT EXISTS simple2 (date Date, id UInt32) ENGINE = ReplicatedMergeTree('/clickhouse/tables/1/simple', 'node') ORDER BY tuple() PARTITION BY date;"
     )
+
     node.query(
-        "ALTER TABLE simple2 FETCH PARTITION '2020-08-27' FROM 'zookeeper2:/clickhouse/tables/0/simple';"
-    )
-    node.query("ALTER TABLE simple2 ATTACH PARTITION '2020-08-27';")
+        """ALTER TABLE simple2 FETCH {part} '{part_name}' FROM 'zookeeper2:/clickhouse/tables/0/simple';""".format(
+            part=part, part_name=part_name))
+
+    node.query("""ALTER TABLE simple2 ATTACH {part} '{part_name}';""".format(part=part, part_name=part_name))
 
     with pytest.raises(QueryRuntimeException):
         node.query(
-            "ALTER TABLE simple2 FETCH PARTITION '2020-08-27' FROM 'zookeeper:/clickhouse/tables/0/simple';"
-        )
+            """ALTER TABLE simple2 FETCH {part} '{part_name}' FROM 'zookeeper:/clickhouse/tables/0/simple';""".format(
+                part=part, part_name=part_name))
 
-    assert node.query("SELECT id FROM simple2").strip() == "1"
+    assert node.query("""SELECT id FROM simple2 where date = '{date}'""".format(date=date)).strip() == "1"
diff --git a/tests/queries/0_stateless/01709_inactive_parts_to_delay_throw.reference b/tests/integration/test_force_drop_table/__init__.py
similarity index 100%
rename from tests/queries/0_stateless/01709_inactive_parts_to_delay_throw.reference
rename to tests/integration/test_force_drop_table/__init__.py
diff --git a/tests/integration/test_force_drop_table/configs/config.xml b/tests/integration/test_force_drop_table/configs/config.xml
new file mode 100644
index 00000000000..e5f133953a6
--- /dev/null
+++ b/tests/integration/test_force_drop_table/configs/config.xml
@@ -0,0 +1,4 @@
+<yandex>
+    <max_table_size_to_drop>1</max_table_size_to_drop>
+    <max_partition_size_to_drop>1</max_partition_size_to_drop>
+</yandex>
diff --git a/tests/integration/test_force_drop_table/test.py b/tests/integration/test_force_drop_table/test.py
new file mode 100644
index 00000000000..ad8316493e4
--- /dev/null
+++ b/tests/integration/test_force_drop_table/test.py
@@ -0,0 +1,49 @@
+import pytest
+
+from helpers.cluster import ClickHouseCluster
+
+cluster = ClickHouseCluster(__file__)
+node = cluster.add_instance('node', main_configs=["configs/config.xml"], with_zookeeper=True)
+
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+        yield cluster
+    finally:
+        cluster.shutdown()
+
+def create_force_drop_flag(node):
+    force_drop_flag_path = "/var/lib/clickhouse/flags/force_drop_table"
+    node.exec_in_container(["bash", "-c", "touch {} && chmod a=rw {}".format(force_drop_flag_path, force_drop_flag_path)], user="root")
+
+@pytest.mark.parametrize("engine", ['Ordinary', 'Atomic'])
+def test_drop_materialized_view(started_cluster, engine):
+    node.query("CREATE DATABASE d ENGINE={}".format(engine))
+    node.query("CREATE TABLE d.rmt (n UInt64) ENGINE=ReplicatedMergeTree('/test/rmt', 'r1') ORDER BY n PARTITION BY n % 2")
+    node.query("CREATE MATERIALIZED VIEW d.mv (n UInt64, s String) ENGINE=MergeTree ORDER BY n PARTITION BY n % 2 AS SELECT n, toString(n) AS s FROM d.rmt")
+    node.query("INSERT INTO d.rmt VALUES (1), (2)")
+    assert "is greater than max" in node.query_and_get_error("DROP TABLE d.rmt")
+    assert "is greater than max" in node.query_and_get_error("DROP TABLE d.mv")
+    assert "is greater than max" in node.query_and_get_error("TRUNCATE TABLE d.rmt")
+    assert "is greater than max" in node.query_and_get_error("TRUNCATE TABLE d.mv")
+    assert "is greater than max" in node.query_and_get_error("ALTER TABLE d.rmt DROP PARTITION '0'")
+    assert node.query("SELECT * FROM d.rmt ORDER BY n") == "1\n2\n"
+    assert node.query("SELECT * FROM d.mv ORDER BY n") == "1\t1\n2\t2\n"
+
+    create_force_drop_flag(node)
+    node.query("ALTER TABLE d.rmt DROP PARTITION '0'")
+    assert node.query("SELECT * FROM d.rmt ORDER BY n") == "1\n"
+    assert "is greater than max" in node.query_and_get_error("ALTER TABLE d.mv DROP PARTITION '0'")
+    create_force_drop_flag(node)
+    node.query("ALTER TABLE d.mv DROP PARTITION '0'")
+    assert node.query("SELECT * FROM d.mv ORDER BY n") == "1\t1\n"
+    assert "is greater than max" in node.query_and_get_error("DROP TABLE d.rmt SYNC")
+    create_force_drop_flag(node)
+    node.query("DROP TABLE d.rmt SYNC")
+    assert "is greater than max" in node.query_and_get_error("DROP TABLE d.mv SYNC")
+    create_force_drop_flag(node)
+    node.query("DROP TABLE d.mv SYNC")
+    node.query("DROP DATABASE d")
+
diff --git a/tests/integration/test_grant_and_revoke/test.py b/tests/integration/test_grant_and_revoke/test.py
index e29d63c9e0b..c1be16fe17d 100644
--- a/tests/integration/test_grant_and_revoke/test.py
+++ b/tests/integration/test_grant_and_revoke/test.py
@@ -26,7 +26,7 @@ def cleanup_after_test():
     try:
         yield
     finally:
-        instance.query("DROP USER IF EXISTS A, B")
+        instance.query("DROP USER IF EXISTS A, B, C")
         instance.query("DROP TABLE IF EXISTS test.view_1")
 
 
@@ -106,6 +106,46 @@ def test_revoke_requires_grant_option():
     assert instance.query("SHOW GRANTS FOR B") == ""
 
 
+def test_allowed_grantees():
+    instance.query("CREATE USER A")
+    instance.query("CREATE USER B")
+
+    instance.query('GRANT SELECT ON test.table TO A WITH GRANT OPTION')
+    instance.query("GRANT SELECT ON test.table TO B", user='A')
+    assert instance.query("SELECT * FROM test.table", user='B') == "1\t5\n2\t10\n"
+    instance.query("REVOKE SELECT ON test.table FROM B", user='A')
+
+    instance.query('ALTER USER A GRANTEES NONE')
+    expected_error = "user `B` is not allowed as grantee"
+    assert expected_error in instance.query_and_get_error("GRANT SELECT ON test.table TO B", user='A')
+
+    instance.query('ALTER USER A GRANTEES ANY EXCEPT B')
+    assert instance.query('SHOW CREATE USER A') == "CREATE USER A GRANTEES ANY EXCEPT B\n"
+    expected_error = "user `B` is not allowed as grantee"
+    assert expected_error in instance.query_and_get_error("GRANT SELECT ON test.table TO B", user='A')
+
+    instance.query('ALTER USER A GRANTEES B')
+    instance.query("GRANT SELECT ON test.table TO B", user='A')
+    assert instance.query("SELECT * FROM test.table", user='B') == "1\t5\n2\t10\n"
+    instance.query("REVOKE SELECT ON test.table FROM B", user='A')
+
+    instance.query('ALTER USER A GRANTEES ANY')
+    assert instance.query('SHOW CREATE USER A') == "CREATE USER A\n"
+    instance.query("GRANT SELECT ON test.table TO B", user='A')
+    assert instance.query("SELECT * FROM test.table", user='B') == "1\t5\n2\t10\n"
+
+    instance.query('ALTER USER A GRANTEES NONE')
+    expected_error = "user `B` is not allowed as grantee"
+    assert expected_error in instance.query_and_get_error("REVOKE SELECT ON test.table FROM B", user='A')
+
+    instance.query("CREATE USER C GRANTEES ANY EXCEPT C")
+    assert instance.query('SHOW CREATE USER C') == "CREATE USER C GRANTEES ANY EXCEPT C\n"
+    instance.query('GRANT SELECT ON test.table TO C WITH GRANT OPTION')
+    assert instance.query("SELECT * FROM test.table", user='C') == "1\t5\n2\t10\n"
+    expected_error = "user `C` is not allowed as grantee"
+    assert expected_error in instance.query_and_get_error("REVOKE SELECT ON test.table FROM C", user='C')
+
+
 def test_grant_all_on_table():
     instance.query("CREATE USER A, B")
     instance.query("GRANT ALL ON test.table TO A WITH GRANT OPTION")
diff --git a/tests/integration/test_graphite_merge_tree/configs/graphite_rollup.xml b/tests/integration/test_graphite_merge_tree/configs/graphite_rollup.xml
index 6d1907f3da7..f5206c8827a 100644
--- a/tests/integration/test_graphite_merge_tree/configs/graphite_rollup.xml
+++ b/tests/integration/test_graphite_merge_tree/configs/graphite_rollup.xml
@@ -94,4 +94,25 @@
             </retention>
         </default>
     </graphite_rollup_broken>
+    <graphite_rollup_wrong_age_precision>
+        <path_column_name>metric</path_column_name>
+        <time_column_name>timestamp</time_column_name>
+        <value_column_name>value</value_column_name>
+        <version_column_name>updated</version_column_name>
+        <default>
+            <function>avg</function>
+            <retention>
+                <age>0</age>
+                <precision>60</precision>
+            </retention>
+            <retention>
+                <age>36000</age>
+                <precision>600</precision>
+            </retention>
+            <retention>
+                <age>72000</age>
+                <precision>300</precision>
+            </retention>
+        </default>
+    </graphite_rollup_wrong_age_precision>
 </yandex>
diff --git a/tests/integration/test_graphite_merge_tree/test.py b/tests/integration/test_graphite_merge_tree/test.py
index ee8a18f1ca5..7628211551d 100644
--- a/tests/integration/test_graphite_merge_tree/test.py
+++ b/tests/integration/test_graphite_merge_tree/test.py
@@ -3,6 +3,7 @@ import os.path as p
 import time
 
 import pytest
+from helpers.client import QueryRuntimeException
 from helpers.cluster import ClickHouseCluster
 from helpers.test_tools import TSV
 
@@ -442,3 +443,20 @@ SELECT * FROM test.graphite;
 ''')
 
     assert TSV(result) == TSV(expected)
+
+
+def test_wrong_rollup_config(graphite_table):
+    with pytest.raises(QueryRuntimeException) as exc:
+        q('''
+CREATE TABLE test.graphite_not_created
+    (metric String, value Float64, timestamp UInt32, date Date, updated UInt32)
+    ENGINE = GraphiteMergeTree('graphite_rollup_wrong_age_precision')
+    PARTITION BY toYYYYMM(date)
+    ORDER BY (metric, timestamp)
+    SETTINGS index_granularity=1;
+        ''')
+
+    # The order of retentions is not guaranteed
+    assert ("age and precision should only grow up: " in str(exc.value))
+    assert ("36000:600" in str(exc.value))
+    assert ("72000:300" in str(exc.value))
diff --git a/tests/integration/test_hedged_requests/__init__.py b/tests/integration/test_hedged_requests/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/integration/test_hedged_requests/configs/remote_servers.xml b/tests/integration/test_hedged_requests/configs/remote_servers.xml
new file mode 100644
index 00000000000..9d753ca2b6a
--- /dev/null
+++ b/tests/integration/test_hedged_requests/configs/remote_servers.xml
@@ -0,0 +1,22 @@
+<yandex>
+    <remote_servers>
+        <test_cluster>
+            <shard>
+                <internal_replication>true</internal_replication>
+                <replica>
+                    <host>node_1</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>node_2</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>node_3</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </test_cluster>
+    </remote_servers>
+</yandex>
+
diff --git a/tests/integration/test_hedged_requests/configs/users.xml b/tests/integration/test_hedged_requests/configs/users.xml
new file mode 100644
index 00000000000..ac42155a18a
--- /dev/null
+++ b/tests/integration/test_hedged_requests/configs/users.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<yandex>
+    <profiles>
+        <default>
+            <load_balancing>in_order</load_balancing>
+            <hedged_connection_timeout_ms>100</hedged_connection_timeout_ms>
+            <receive_data_timeout_ms>2000</receive_data_timeout_ms>
+            <async_socket_for_remote>1</async_socket_for_remote>
+            <use_hedged_requests>1</use_hedged_requests>
+        </default>
+    </profiles>
+</yandex>
diff --git a/tests/integration/test_hedged_requests/configs/users1.xml b/tests/integration/test_hedged_requests/configs/users1.xml
new file mode 100644
index 00000000000..2a54396feca
--- /dev/null
+++ b/tests/integration/test_hedged_requests/configs/users1.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<yandex>
+    <profiles>
+        <default>
+        </default>
+    </profiles>
+</yandex>
diff --git a/tests/integration/test_hedged_requests/test.py b/tests/integration/test_hedged_requests/test.py
new file mode 100644
index 00000000000..e40b3109c44
--- /dev/null
+++ b/tests/integration/test_hedged_requests/test.py
@@ -0,0 +1,224 @@
+import os
+import sys
+import time
+
+import pytest
+
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
+from helpers.cluster import ClickHouseCluster
+from helpers.network import PartitionManager
+from helpers.test_tools import TSV
+
+cluster = ClickHouseCluster(__file__)
+NODES = {'node_' + str(i): None for i in (1, 2, 3)}
+
+NODES['node'] = None
+
+# Sleep time in milliseconds.
+sleep_time = 30000
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    NODES['node'] = cluster.add_instance(
+    'node', stay_alive=True, main_configs=['configs/remote_servers.xml'], user_configs=['configs/users.xml'])
+
+    for name in NODES:
+        if name != 'node':
+            NODES[name] = cluster.add_instance(name, user_configs=['configs/users1.xml'])
+
+    try:
+        cluster.start()
+
+        for node_id, node in list(NODES.items()):
+            node.query('''CREATE TABLE test_hedged (id UInt32, date Date) ENGINE =
+            MergeTree()  ORDER BY id PARTITION BY toYYYYMM(date)''')
+
+            node.query("INSERT INTO test_hedged select number, toDate(number) from numbers(100);")
+
+
+        NODES['node'].query('''CREATE TABLE distributed (id UInt32, date Date) ENGINE =
+            Distributed('test_cluster', 'default', 'test_hedged')''')
+
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+
+config = '''<yandex>
+    <profiles>
+        <default>
+            <sleep_in_send_tables_status_ms>{sleep_in_send_tables_status_ms}</sleep_in_send_tables_status_ms>
+            <sleep_in_send_data_ms>{sleep_in_send_data_ms}</sleep_in_send_data_ms>
+        </default>
+    </profiles>
+</yandex>'''
+
+
+def check_query(expected_replica, receive_timeout=300):
+    NODES['node'].restart_clickhouse()
+    
+    # Without hedged requests select query will last more than 30 seconds,
+    # with hedged requests it will last just around 1-2 second
+
+    start = time.time()
+    result = NODES['node'].query("SELECT hostName(), id FROM distributed ORDER BY id LIMIT 1 SETTINGS receive_timeout={}".format(receive_timeout));
+    query_time = time.time() - start
+
+    assert TSV(result) == TSV(expected_replica + "\t0")
+
+    print("Query time:", query_time)
+    assert query_time < 10
+
+
+def check_settings(node_name, sleep_in_send_tables_status_ms, sleep_in_send_data_ms):
+    attempts = 0
+    while attempts < 1000:
+        setting1 = NODES[node_name].http_query("SELECT value FROM system.settings WHERE name='sleep_in_send_tables_status_ms'")
+        setting2 = NODES[node_name].http_query("SELECT value FROM system.settings WHERE name='sleep_in_send_data_ms'")
+        if int(setting1) == sleep_in_send_tables_status_ms and int(setting2) == sleep_in_send_data_ms:
+            return
+        time.sleep(0.1)
+        attempts += 1
+
+    assert attempts < 1000
+
+
+def check_changing_replica_events(expected_count):
+    result = NODES['node'].query("SELECT value FROM system.events WHERE event='HedgedRequestsChangeReplica'")
+
+    # If server load is high we can see more than expected
+    # replica change events, but never less than expected
+    assert int(result) >= expected_count
+
+
+def update_configs(node_1_sleep_in_send_tables_status=0, node_1_sleep_in_send_data=0,
+                    node_2_sleep_in_send_tables_status=0, node_2_sleep_in_send_data=0,
+                    node_3_sleep_in_send_tables_status=0, node_3_sleep_in_send_data=0):
+    NODES['node_1'].replace_config(
+        '/etc/clickhouse-server/users.d/users1.xml',
+        config.format(sleep_in_send_tables_status_ms=node_1_sleep_in_send_tables_status, sleep_in_send_data_ms=node_1_sleep_in_send_data))
+
+    NODES['node_2'].replace_config(
+        '/etc/clickhouse-server/users.d/users1.xml',
+        config.format(sleep_in_send_tables_status_ms=node_2_sleep_in_send_tables_status, sleep_in_send_data_ms=node_2_sleep_in_send_data))
+
+    NODES['node_3'].replace_config(
+        '/etc/clickhouse-server/users.d/users1.xml',
+        config.format(sleep_in_send_tables_status_ms=node_3_sleep_in_send_tables_status, sleep_in_send_data_ms=node_3_sleep_in_send_data))
+
+    check_settings('node_1', node_1_sleep_in_send_tables_status, node_1_sleep_in_send_data)
+    check_settings('node_2', node_2_sleep_in_send_tables_status, node_2_sleep_in_send_data)
+    check_settings('node_3', node_3_sleep_in_send_tables_status, node_3_sleep_in_send_data)
+
+
+def test_stuck_replica(started_cluster):
+    update_configs()
+
+    cluster.pause_container("node_1")
+
+    check_query(expected_replica="node_2")
+    check_changing_replica_events(1)
+
+    result = NODES['node'].query("SELECT slowdowns_count FROM system.clusters WHERE cluster='test_cluster' and host_name='node_1'")
+
+    assert TSV(result) == TSV("1")
+
+    result = NODES['node'].query("SELECT hostName(), id FROM distributed ORDER BY id LIMIT 1");
+
+    assert TSV(result) == TSV("node_2\t0")
+
+    # Check that we didn't choose node_1 first again and slowdowns_count didn't increase.
+    result = NODES['node'].query("SELECT slowdowns_count FROM system.clusters WHERE cluster='test_cluster' and host_name='node_1'")
+
+    assert TSV(result) == TSV("1")
+
+    cluster.unpause_container("node_1")
+
+
+def test_long_query(started_cluster):
+    update_configs()
+
+    # Restart to reset pool states.
+    NODES['node'].restart_clickhouse()
+
+    result = NODES['node'].query("select hostName(), max(id + sleep(1.5)) from distributed settings max_block_size = 1, max_threads = 1;")
+    assert TSV(result) == TSV("node_1\t99")
+
+    NODES['node'].query("INSERT INTO distributed select number, toDate(number) from numbers(100);")
+
+
+def test_send_table_status_sleep(started_cluster):
+    update_configs(node_1_sleep_in_send_tables_status=sleep_time)
+    check_query(expected_replica="node_2")
+    check_changing_replica_events(1)
+
+
+def test_send_table_status_sleep2(started_cluster):
+    update_configs(node_1_sleep_in_send_tables_status=sleep_time, node_2_sleep_in_send_tables_status=sleep_time)
+    check_query(expected_replica="node_3")
+    check_changing_replica_events(2)
+
+
+def test_send_data(started_cluster):
+    update_configs(node_1_sleep_in_send_data=sleep_time)
+    check_query(expected_replica="node_2")
+    check_changing_replica_events(1)
+
+
+def test_send_data2(started_cluster):
+    update_configs(node_1_sleep_in_send_data=sleep_time, node_2_sleep_in_send_data=sleep_time)
+    check_query(expected_replica="node_3")
+    check_changing_replica_events(2)
+
+
+def test_combination1(started_cluster):
+    update_configs(node_1_sleep_in_send_tables_status=sleep_time, node_2_sleep_in_send_data=sleep_time)
+    check_query(expected_replica="node_3")
+    check_changing_replica_events(2)
+
+
+def test_combination2(started_cluster):
+    update_configs(node_1_sleep_in_send_data=sleep_time, node_2_sleep_in_send_tables_status=sleep_time)
+    check_query(expected_replica="node_3")
+    check_changing_replica_events(2)
+
+
+def test_combination3(started_cluster):
+    update_configs(node_1_sleep_in_send_data=sleep_time,
+                    node_2_sleep_in_send_tables_status=1000,
+                    node_3_sleep_in_send_data=sleep_time)
+    check_query(expected_replica="node_2")
+    check_changing_replica_events(3)
+
+
+def test_combination4(started_cluster):
+    update_configs(node_1_sleep_in_send_tables_status=1000,
+                    node_1_sleep_in_send_data=sleep_time,
+                    node_2_sleep_in_send_tables_status=1000,
+                    node_3_sleep_in_send_tables_status=1000)
+    check_query(expected_replica="node_2")
+    check_changing_replica_events(4)
+
+
+def test_receive_timeout1(started_cluster):
+    # Check the situation when first two replicas get receive timeout
+    # in establishing connection, but the third replica is ok.
+    update_configs(node_1_sleep_in_send_tables_status=3000,
+                    node_2_sleep_in_send_tables_status=3000,
+                    node_3_sleep_in_send_data=1000)
+    check_query(expected_replica="node_3", receive_timeout=2)
+    check_changing_replica_events(2)
+
+
+def test_receive_timeout2(started_cluster):
+    # Check the situation when first replica get receive timeout
+    # in packet receiving but there are replicas in process of
+    # connection establishing.
+    update_configs(node_1_sleep_in_send_data=4000,
+                    node_2_sleep_in_send_tables_status=2000,
+                    node_3_sleep_in_send_tables_status=2000)
+    check_query(expected_replica="node_2", receive_timeout=3)
+    check_changing_replica_events(3)
+
diff --git a/tests/integration/test_hedged_requests_parallel/__init__.py b/tests/integration/test_hedged_requests_parallel/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/integration/test_hedged_requests_parallel/configs/remote_servers.xml b/tests/integration/test_hedged_requests_parallel/configs/remote_servers.xml
new file mode 100644
index 00000000000..63767185b34
--- /dev/null
+++ b/tests/integration/test_hedged_requests_parallel/configs/remote_servers.xml
@@ -0,0 +1,26 @@
+<yandex>
+    <remote_servers>
+        <test_cluster>
+            <shard>
+                <internal_replication>true</internal_replication>
+                <replica>
+                    <host>node_1</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>node_2</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>node_3</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>node_4</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </test_cluster>
+    </remote_servers>
+</yandex>
+
diff --git a/tests/integration/test_hedged_requests_parallel/configs/users.xml b/tests/integration/test_hedged_requests_parallel/configs/users.xml
new file mode 100644
index 00000000000..9600c0c7124
--- /dev/null
+++ b/tests/integration/test_hedged_requests_parallel/configs/users.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<yandex>
+    <profiles>
+        <default>
+            <load_balancing>in_order</load_balancing>
+            <max_parallel_replicas>2</max_parallel_replicas>
+            <hedged_connection_timeout_ms>100</hedged_connection_timeout_ms>
+            <receive_data_timeout_ms>2000</receive_data_timeout_ms>
+            <async_socket_for_remote>1</async_socket_for_remote>
+            <use_hedged_requests>1</use_hedged_requests>
+        </default>
+    </profiles>
+</yandex>
diff --git a/tests/integration/test_hedged_requests_parallel/configs/users1.xml b/tests/integration/test_hedged_requests_parallel/configs/users1.xml
new file mode 100644
index 00000000000..2a54396feca
--- /dev/null
+++ b/tests/integration/test_hedged_requests_parallel/configs/users1.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<yandex>
+    <profiles>
+        <default>
+        </default>
+    </profiles>
+</yandex>
diff --git a/tests/integration/test_hedged_requests_parallel/test.py b/tests/integration/test_hedged_requests_parallel/test.py
new file mode 100644
index 00000000000..7abc2eb1d2a
--- /dev/null
+++ b/tests/integration/test_hedged_requests_parallel/test.py
@@ -0,0 +1,161 @@
+import os
+import sys
+import time
+
+import pytest
+
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
+from helpers.cluster import ClickHouseCluster
+from helpers.network import PartitionManager
+
+cluster = ClickHouseCluster(__file__)
+
+NODES = {'node_' + str(i): None for i in (1, 2, 3, 4)}
+NODES['node'] = None
+
+# Cleep time in milliseconds.
+sleep_time = 30000
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    cluster = ClickHouseCluster(__file__)
+    NODES['node'] = cluster.add_instance(
+    'node', stay_alive=True, main_configs=['configs/remote_servers.xml'], user_configs=['configs/users.xml'])
+
+    for name in NODES:
+        if name != 'node':
+            NODES[name] = cluster.add_instance(name, user_configs=['configs/users1.xml'])
+    
+    try:
+        cluster.start()
+
+        for node_id, node in list(NODES.items()):
+            node.query('''CREATE TABLE test_hedged (id UInt32, date Date) ENGINE =
+            MergeTree()  ORDER BY id PARTITION BY toYYYYMM(date)''')
+
+            node.query("INSERT INTO test_hedged SELECT number, toDateTime(number) FROM numbers(100)")
+
+        NODES['node'].query('''CREATE TABLE distributed (id UInt32, date Date) ENGINE =
+            Distributed('test_cluster', 'default', 'test_hedged')''')
+
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+
+config = '''<yandex>
+    <profiles>
+        <default>
+            <sleep_in_send_tables_status_ms>{sleep_in_send_tables_status_ms}</sleep_in_send_tables_status_ms>
+            <sleep_in_send_data_ms>{sleep_in_send_data_ms}</sleep_in_send_data_ms>
+        </default>
+    </profiles>
+</yandex>'''
+
+
+QUERY_1 = "SELECT count() FROM distributed"
+QUERY_2 = "SELECT * FROM distributed"
+
+
+def check_query(query=QUERY_1):
+    NODES['node'].restart_clickhouse()
+
+    # Without hedged requests select query will last more than 30 seconds,
+    # with hedged requests it will last just around 1-2 second
+
+    start = time.time()
+    NODES['node'].query(query);
+    query_time = time.time() - start
+    print("Query time:", query_time)
+
+    assert query_time < 5
+
+
+def check_settings(node_name, sleep_in_send_tables_status_ms, sleep_in_send_data_ms):
+    attempts = 0
+    while attempts < 1000:
+        setting1 = NODES[node_name].http_query("SELECT value FROM system.settings WHERE name='sleep_in_send_tables_status_ms'")
+        setting2 = NODES[node_name].http_query("SELECT value FROM system.settings WHERE name='sleep_in_send_data_ms'")
+        if int(setting1) == sleep_in_send_tables_status_ms and int(setting2) == sleep_in_send_data_ms:
+            return
+        time.sleep(0.1)
+        attempts += 1
+
+    assert attempts < 1000
+
+
+def check_changing_replica_events(expected_count):
+    result = NODES['node'].query("SELECT value FROM system.events WHERE event='HedgedRequestsChangeReplica'")
+
+    # If server load is high we can see more than expected
+    # replica change events, but never less than expected
+    assert int(result) >= expected_count
+
+
+def update_configs(node_1_sleep_in_send_tables_status=0, node_1_sleep_in_send_data=0,
+                    node_2_sleep_in_send_tables_status=0, node_2_sleep_in_send_data=0,
+                    node_3_sleep_in_send_tables_status=0, node_3_sleep_in_send_data=0,
+                    node_4_sleep_in_send_tables_status=0, node_4_sleep_in_send_data=0):
+    NODES['node_1'].replace_config(
+        '/etc/clickhouse-server/users.d/users1.xml',
+        config.format(sleep_in_send_tables_status_ms=node_1_sleep_in_send_tables_status, sleep_in_send_data_ms=node_1_sleep_in_send_data))
+
+    NODES['node_2'].replace_config(
+        '/etc/clickhouse-server/users.d/users1.xml',
+        config.format(sleep_in_send_tables_status_ms=node_2_sleep_in_send_tables_status, sleep_in_send_data_ms=node_2_sleep_in_send_data))
+
+    NODES['node_3'].replace_config(
+        '/etc/clickhouse-server/users.d/users1.xml',
+        config.format(sleep_in_send_tables_status_ms=node_3_sleep_in_send_tables_status, sleep_in_send_data_ms=node_3_sleep_in_send_data))
+
+    NODES['node_4'].replace_config(
+        '/etc/clickhouse-server/users.d/users1.xml',
+        config.format(sleep_in_send_tables_status_ms=node_4_sleep_in_send_tables_status, sleep_in_send_data_ms=node_4_sleep_in_send_data))
+
+    check_settings('node_1', node_1_sleep_in_send_tables_status, node_1_sleep_in_send_data)
+    check_settings('node_2', node_2_sleep_in_send_tables_status, node_2_sleep_in_send_data)
+    check_settings('node_3', node_3_sleep_in_send_tables_status, node_3_sleep_in_send_data)
+    check_settings('node_4', node_4_sleep_in_send_tables_status, node_4_sleep_in_send_data)
+
+
+def test_send_table_status_sleep(started_cluster):
+    update_configs(node_1_sleep_in_send_tables_status=sleep_time, node_2_sleep_in_send_tables_status=sleep_time)
+    check_query()
+    check_changing_replica_events(2)
+
+
+def test_send_data(started_cluster):
+    update_configs(node_1_sleep_in_send_data=sleep_time, node_2_sleep_in_send_data=sleep_time)
+    check_query()
+    check_changing_replica_events(2)
+
+
+def test_combination1(started_cluster):
+    update_configs(node_1_sleep_in_send_tables_status=1000,
+                    node_2_sleep_in_send_tables_status=1000,
+                    node_3_sleep_in_send_data=sleep_time)
+    check_query()
+    check_changing_replica_events(3)
+
+
+def test_combination2(started_cluster):
+    update_configs(node_1_sleep_in_send_data=sleep_time,
+                    node_2_sleep_in_send_tables_status=1000,
+                    node_3_sleep_in_send_data=sleep_time,
+                    node_4_sleep_in_send_tables_status=1000)
+    check_query()
+    check_changing_replica_events(4)
+
+
+def test_query_with_no_data_to_sample(started_cluster):
+    update_configs(node_1_sleep_in_send_data=sleep_time,
+                    node_2_sleep_in_send_data=sleep_time)
+
+    # When there is no way to sample data, the whole query will be performed by
+    # the first replica and the second replica will just send EndOfStream,
+    # so we will change only the first replica here.
+    check_query(query=QUERY_2)
+    check_changing_replica_events(1)
+
diff --git a/tests/integration/test_jbod_balancer/__init__.py b/tests/integration/test_jbod_balancer/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/integration/test_jbod_balancer/configs/config.d/storage_configuration.xml b/tests/integration/test_jbod_balancer/configs/config.d/storage_configuration.xml
new file mode 100644
index 00000000000..62b0ffacaf0
--- /dev/null
+++ b/tests/integration/test_jbod_balancer/configs/config.d/storage_configuration.xml
@@ -0,0 +1,29 @@
+<yandex>
+    <storage_configuration>
+        <disks>
+            <default>
+                <keep_free_space_bytes>1024</keep_free_space_bytes>
+            </default>
+            <jbod1>
+                <path>/jbod1/</path>
+            </jbod1>
+            <jbod2>
+                <path>/jbod2/</path>
+            </jbod2>
+            <jbod3>
+                <path>/jbod3/</path>
+            </jbod3>
+        </disks>
+        <policies>
+            <jbod>
+                <volumes>
+                    <jbod_volume>
+                        <disk>jbod1</disk>
+                        <disk>jbod2</disk>
+                        <disk>jbod3</disk>
+                    </jbod_volume>
+                </volumes>
+            </jbod>
+        </policies>
+    </storage_configuration>
+</yandex>
diff --git a/tests/integration/test_jbod_balancer/test.py b/tests/integration/test_jbod_balancer/test.py
new file mode 100644
index 00000000000..abc6a0bff11
--- /dev/null
+++ b/tests/integration/test_jbod_balancer/test.py
@@ -0,0 +1,182 @@
+import json
+import random
+import re
+import string
+import threading
+import time
+from multiprocessing.dummy import Pool
+
+import pytest
+from helpers.client import QueryRuntimeException
+from helpers.cluster import ClickHouseCluster
+
+cluster = ClickHouseCluster(__file__)
+
+node1 = cluster.add_instance(
+    "node1",
+    main_configs=["configs/config.d/storage_configuration.xml",],
+    with_zookeeper=True,
+    stay_alive=True,
+    tmpfs=["/jbod1:size=100M", "/jbod2:size=100M", "/jbod3:size=100M"],
+    macros={"shard": 0, "replica": 1},
+)
+
+
+node2 = cluster.add_instance(
+    "node2",
+    main_configs=["configs/config.d/storage_configuration.xml"],
+    with_zookeeper=True,
+    stay_alive=True,
+    tmpfs=["/jbod1:size=100M", "/jbod2:size=100M", "/jbod3:size=100M"],
+    macros={"shard": 0, "replica": 2},
+)
+
+
+@pytest.fixture(scope="module")
+def start_cluster():
+    try:
+        cluster.start()
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+
+def check_balance(node, table):
+
+    partitions = node.query(
+        """
+        WITH
+            arraySort(groupArray(c)) AS array_c,
+            arrayEnumerate(array_c) AS array_i,
+            sum(c) AS sum_c,
+            count() AS n,
+            if(sum_c = 0, 0, (((2. * arraySum(arrayMap((c, i) -> (c * i), array_c, array_i))) / n) / sum_c) - (((n + 1) * 1.) / n)) AS gini
+        SELECT
+            partition
+        FROM
+        (
+            SELECT
+                partition,
+                disk_name,
+                sum(bytes_on_disk) AS c
+            FROM system.parts
+            WHERE active AND level > 0 AND disk_name like 'jbod%' AND table = '{}'
+            GROUP BY
+                partition, disk_name
+        )
+        GROUP BY partition
+        HAVING gini < 0.1
+        """.format(
+            table
+        )
+    ).splitlines()
+
+    assert set(partitions) == set(["0", "1"])
+
+
+def test_jbod_balanced_merge(start_cluster):
+    try:
+        node1.query(
+            """
+            CREATE TABLE tbl (p UInt8, d String)
+            ENGINE = MergeTree
+            PARTITION BY p
+            ORDER BY tuple()
+            SETTINGS
+                storage_policy = 'jbod',
+                min_bytes_to_rebalance_partition_over_jbod = 1024,
+                max_bytes_to_merge_at_max_space_in_pool = 4096
+        """
+        )
+        node1.query("create table tmp1 as tbl")
+        node1.query("create table tmp2 as tbl")
+
+        for i in range(200):
+            # around 1k per block
+            node1.query(
+                "insert into tbl select randConstant() % 2, randomPrintableASCII(16) from numbers(50)"
+            )
+            node1.query(
+                "insert into tmp1 select randConstant() % 2, randomPrintableASCII(16) from numbers(50)"
+            )
+            node1.query(
+                "insert into tmp2 select randConstant() % 2, randomPrintableASCII(16) from numbers(50)"
+            )
+
+        time.sleep(1)
+
+        check_balance(node1, "tbl")
+
+    finally:
+        node1.query(f"DROP TABLE IF EXISTS tbl SYNC")
+        node1.query(f"DROP TABLE IF EXISTS tmp1 SYNC")
+        node1.query(f"DROP TABLE IF EXISTS tmp2 SYNC")
+
+
+def test_replicated_balanced_merge_fetch(start_cluster):
+    try:
+        for i, node in enumerate([node1, node2]):
+            node.query(
+                """
+                CREATE TABLE tbl (p UInt8, d String)
+                ENGINE = ReplicatedMergeTree('/clickhouse/tbl', '{}')
+                PARTITION BY p
+                ORDER BY tuple()
+                SETTINGS
+                    storage_policy = 'jbod',
+                    old_parts_lifetime = 1,
+                    cleanup_delay_period = 1,
+                    cleanup_delay_period_random_add = 2,
+                    min_bytes_to_rebalance_partition_over_jbod = 1024,
+                    max_bytes_to_merge_at_max_space_in_pool = 4096
+            """.format(
+                    i
+                )
+            )
+
+            node.query(
+                """
+                CREATE TABLE tmp1 (p UInt8, d String)
+                ENGINE = MergeTree
+                PARTITION BY p
+                ORDER BY tuple()
+                SETTINGS
+                    storage_policy = 'jbod',
+                    min_bytes_to_rebalance_partition_over_jbod = 1024,
+                    max_bytes_to_merge_at_max_space_in_pool = 4096
+            """
+            )
+
+            node.query("create table tmp2 as tmp1")
+
+        node2.query("alter table tbl modify setting always_fetch_merged_part = 1")
+
+        for i in range(200):
+            # around 1k per block
+            node1.query(
+                "insert into tbl select randConstant() % 2, randomPrintableASCII(16) from numbers(50)"
+            )
+            node1.query(
+                "insert into tmp1 select randConstant() % 2, randomPrintableASCII(16) from numbers(50)"
+            )
+            node1.query(
+                "insert into tmp2 select randConstant() % 2, randomPrintableASCII(16) from numbers(50)"
+            )
+            node2.query(
+                "insert into tmp1 select randConstant() % 2, randomPrintableASCII(16) from numbers(50)"
+            )
+            node2.query(
+                "insert into tmp2 select randConstant() % 2, randomPrintableASCII(16) from numbers(50)"
+            )
+
+        node2.query("SYSTEM SYNC REPLICA tbl", timeout=10)
+
+        check_balance(node1, "tbl")
+        check_balance(node2, "tbl")
+
+    finally:
+        for node in [node1, node2]:
+            node.query("DROP TABLE IF EXISTS tbl SYNC")
+            node.query("DROP TABLE IF EXISTS tmp1 SYNC")
+            node.query("DROP TABLE IF EXISTS tmp2 SYNC")
diff --git a/tests/integration/test_testkeeper_back_to_back/__init__.py b/tests/integration/test_keeper_back_to_back/__init__.py
similarity index 100%
rename from tests/integration/test_testkeeper_back_to_back/__init__.py
rename to tests/integration/test_keeper_back_to_back/__init__.py
diff --git a/tests/integration/test_keeper_back_to_back/configs/enable_keeper.xml b/tests/integration/test_keeper_back_to_back/configs/enable_keeper.xml
new file mode 100644
index 00000000000..dc8d3a8dfc9
--- /dev/null
+++ b/tests/integration/test_keeper_back_to_back/configs/enable_keeper.xml
@@ -0,0 +1,23 @@
+<yandex>
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>1</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+
+        <coordination_settings>
+            <operation_timeout_ms>5000</operation_timeout_ms>
+            <session_timeout_ms>10000</session_timeout_ms>
+            <raft_logs_level>trace</raft_logs_level>
+            <force_sync>false</force_sync>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>localhost</hostname>
+                <port>44444</port>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</yandex>
diff --git a/tests/integration/test_testkeeper_back_to_back/configs/logs_conf.xml b/tests/integration/test_keeper_back_to_back/configs/logs_conf.xml
similarity index 100%
rename from tests/integration/test_testkeeper_back_to_back/configs/logs_conf.xml
rename to tests/integration/test_keeper_back_to_back/configs/logs_conf.xml
diff --git a/tests/integration/test_keeper_back_to_back/configs/use_keeper.xml b/tests/integration/test_keeper_back_to_back/configs/use_keeper.xml
new file mode 100644
index 00000000000..12dc7fd9447
--- /dev/null
+++ b/tests/integration/test_keeper_back_to_back/configs/use_keeper.xml
@@ -0,0 +1,8 @@
+<yandex>
+    <zookeeper>
+            <node index="1">
+            <host>node1</host>
+            <port>9181</port>
+        </node>
+    </zookeeper>
+</yandex>
diff --git a/tests/integration/test_keeper_back_to_back/test.py b/tests/integration/test_keeper_back_to_back/test.py
new file mode 100644
index 00000000000..8abd4321fd9
--- /dev/null
+++ b/tests/integration/test_keeper_back_to_back/test.py
@@ -0,0 +1,550 @@
+import pytest
+from helpers.cluster import ClickHouseCluster
+import random
+import string
+import os
+import time
+from multiprocessing.dummy import Pool
+
+cluster = ClickHouseCluster(__file__)
+node = cluster.add_instance('node', main_configs=['configs/enable_keeper.xml', 'configs/logs_conf.xml'], with_zookeeper=True)
+from kazoo.client import KazooClient, KazooState, KeeperState
+
+def get_genuine_zk():
+    print("Zoo1", cluster.get_instance_ip("zoo1"))
+    return cluster.get_kazoo_client('zoo1')
+
+def get_fake_zk():
+    print("node", cluster.get_instance_ip("node"))
+    _fake_zk_instance =  KazooClient(hosts=cluster.get_instance_ip("node") + ":9181", timeout=30.0)
+    def reset_last_zxid_listener(state):
+        print("Fake zk callback called for state", state)
+        nonlocal _fake_zk_instance
+        if state != KazooState.CONNECTED:
+            _fake_zk_instance._reset()
+
+    _fake_zk_instance.add_listener(reset_last_zxid_listener)
+    _fake_zk_instance.start()
+    return _fake_zk_instance
+
+def random_string(length):
+    return ''.join(random.choices(string.ascii_lowercase + string.digits, k=length))
+
+def create_random_path(prefix="", depth=1):
+    if depth == 0:
+        return prefix
+    return create_random_path(os.path.join(prefix, random_string(3)), depth - 1)
+
+def stop_zk(zk):
+    try:
+        if zk:
+            zk.stop()
+            zk.close()
+    except:
+        pass
+
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+
+def test_simple_commands(started_cluster):
+    try:
+        genuine_zk = get_genuine_zk()
+        fake_zk = get_fake_zk()
+
+        for zk in [genuine_zk, fake_zk]:
+            zk.create("/test_simple_commands", b"")
+            zk.create("/test_simple_commands/somenode1", b"hello")
+            zk.set("/test_simple_commands/somenode1", b"world")
+
+        for zk in [genuine_zk, fake_zk]:
+            assert zk.exists("/test_simple_commands")
+            assert zk.exists("/test_simple_commands/somenode1")
+            print(zk.get("/test_simple_commands/somenode1"))
+            assert zk.get("/test_simple_commands/somenode1")[0] == b"world"
+    finally:
+        for zk in [genuine_zk, fake_zk]:
+            stop_zk(zk)
+
+
+def test_sequential_nodes(started_cluster):
+    try:
+        genuine_zk = get_genuine_zk()
+        fake_zk = get_fake_zk()
+        genuine_zk.create("/test_sequential_nodes")
+        fake_zk.create("/test_sequential_nodes")
+        for i in range(1, 11):
+            genuine_zk.create("/test_sequential_nodes/" + ("a" * i) + "-", sequence=True)
+            genuine_zk.create("/test_sequential_nodes/" + ("b" * i))
+            fake_zk.create("/test_sequential_nodes/" + ("a" * i) + "-", sequence=True)
+            fake_zk.create("/test_sequential_nodes/" + ("b" * i))
+
+        genuine_childs = list(sorted(genuine_zk.get_children("/test_sequential_nodes")))
+        fake_childs = list(sorted(fake_zk.get_children("/test_sequential_nodes")))
+        assert genuine_childs == fake_childs
+    finally:
+        for zk in [genuine_zk, fake_zk]:
+            stop_zk(zk)
+
+
+def assert_eq_stats(stat1, stat2):
+    assert stat1.version == stat2.version
+    assert stat1.cversion == stat2.cversion
+    assert stat1.aversion == stat2.aversion
+    assert stat1.aversion == stat2.aversion
+    assert stat1.dataLength == stat2.dataLength
+    assert stat1.numChildren == stat2.numChildren
+
+def test_stats(started_cluster):
+    try:
+        genuine_zk = get_genuine_zk()
+        fake_zk = get_fake_zk()
+        genuine_zk.create("/test_stats_nodes")
+        fake_zk.create("/test_stats_nodes")
+        genuine_stats = genuine_zk.exists("/test_stats_nodes")
+        fake_stats = fake_zk.exists("/test_stats_nodes")
+        assert_eq_stats(genuine_stats, fake_stats)
+        for i in range(1, 11):
+            genuine_zk.create("/test_stats_nodes/" + ("a" * i) + "-", sequence=True)
+            genuine_zk.create("/test_stats_nodes/" + ("b" * i))
+            fake_zk.create("/test_stats_nodes/" + ("a" * i) + "-", sequence=True)
+            fake_zk.create("/test_stats_nodes/" + ("b" * i))
+
+        genuine_stats = genuine_zk.exists("/test_stats_nodes")
+        fake_stats = fake_zk.exists("/test_stats_nodes")
+        assert_eq_stats(genuine_stats, fake_stats)
+        for i in range(1, 11):
+            print("/test_stats_nodes/" + ("a" * i) + "-" + "{:010d}".format((i - 1) * 2))
+            genuine_zk.delete("/test_stats_nodes/" + ("a" * i) + "-" + "{:010d}".format((i - 1) * 2))
+            genuine_zk.delete("/test_stats_nodes/" + ("b" * i))
+            fake_zk.delete("/test_stats_nodes/" + ("a" * i) + "-" + "{:010d}".format((i - 1) * 2))
+            fake_zk.delete("/test_stats_nodes/" + ("b" * i))
+
+        genuine_stats = genuine_zk.exists("/test_stats_nodes")
+        fake_stats = fake_zk.exists("/test_stats_nodes")
+        print(genuine_stats)
+        print(fake_stats)
+        assert_eq_stats(genuine_stats, fake_stats)
+        for i in range(100):
+            genuine_zk.set("/test_stats_nodes", ("q" * i).encode())
+            fake_zk.set("/test_stats_nodes", ("q" * i).encode())
+
+        genuine_stats = genuine_zk.exists("/test_stats_nodes")
+        fake_stats = fake_zk.exists("/test_stats_nodes")
+        print(genuine_stats)
+        print(fake_stats)
+        assert_eq_stats(genuine_stats, fake_stats)
+    finally:
+        for zk in [genuine_zk, fake_zk]:
+            stop_zk(zk)
+
+def test_watchers(started_cluster):
+    try:
+        genuine_zk = get_genuine_zk()
+        fake_zk = get_fake_zk()
+        genuine_zk.create("/test_data_watches")
+        fake_zk.create("/test_data_watches")
+        genuine_data_watch_data = None
+
+        def genuine_callback(event):
+            print("Genuine data watch called")
+            nonlocal genuine_data_watch_data
+            genuine_data_watch_data = event
+
+        fake_data_watch_data = None
+        def fake_callback(event):
+            print("Fake data watch called")
+            nonlocal fake_data_watch_data
+            fake_data_watch_data = event
+
+        genuine_zk.get("/test_data_watches", watch=genuine_callback)
+        fake_zk.get("/test_data_watches", watch=fake_callback)
+
+        print("Calling set genuine")
+        genuine_zk.set("/test_data_watches", b"a")
+        print("Calling set fake")
+        fake_zk.set("/test_data_watches", b"a")
+        time.sleep(3)
+
+        print("Genuine data", genuine_data_watch_data)
+        print("Fake data", fake_data_watch_data)
+        assert genuine_data_watch_data == fake_data_watch_data
+
+        genuine_children = None
+        def genuine_child_callback(event):
+            print("Genuine child watch called")
+            nonlocal genuine_children
+            genuine_children = event
+
+        fake_children = None
+        def fake_child_callback(event):
+            print("Fake child watch called")
+            nonlocal fake_children
+            fake_children = event
+
+        genuine_zk.get_children("/test_data_watches", watch=genuine_child_callback)
+        fake_zk.get_children("/test_data_watches", watch=fake_child_callback)
+
+        print("Calling genuine child")
+        genuine_zk.create("/test_data_watches/child", b"b")
+        print("Calling fake child")
+        fake_zk.create("/test_data_watches/child", b"b")
+
+        time.sleep(3)
+
+        print("Genuine children", genuine_children)
+        print("Fake children", fake_children)
+        assert genuine_children == fake_children
+    finally:
+        for zk in [genuine_zk, fake_zk]:
+            stop_zk(zk)
+
+def test_multitransactions(started_cluster):
+    try:
+        genuine_zk = get_genuine_zk()
+        fake_zk = get_fake_zk()
+        for zk in [genuine_zk, fake_zk]:
+            zk.create('/test_multitransactions')
+            t = zk.transaction()
+            t.create('/test_multitransactions/freddy')
+            t.create('/test_multitransactions/fred', ephemeral=True)
+            t.create('/test_multitransactions/smith', sequence=True)
+            results = t.commit()
+            assert len(results) == 3
+            assert results[0] == '/test_multitransactions/freddy'
+            assert results[2].startswith('/test_multitransactions/smith0') is True
+
+        from kazoo.exceptions import RolledBackError, NoNodeError
+        for i, zk in enumerate([genuine_zk, fake_zk]):
+            print("Processing ZK", i)
+            t = zk.transaction()
+            t.create('/test_multitransactions/q')
+            t.delete('/test_multitransactions/a')
+            t.create('/test_multitransactions/x')
+            results = t.commit()
+            print("Results", results)
+            assert results[0].__class__ == RolledBackError
+            assert results[1].__class__ == NoNodeError
+            assert zk.exists('/test_multitransactions/q') is None
+            assert zk.exists('/test_multitransactions/a') is None
+            assert zk.exists('/test_multitransactions/x') is None
+    finally:
+        for zk in [genuine_zk, fake_zk]:
+            stop_zk(zk)
+
+def exists(zk, path):
+    result = zk.exists(path)
+    return result is not None
+
+def get(zk, path):
+    result = zk.get(path)
+    return result[0]
+
+def get_children(zk, path):
+    return [elem for elem in list(sorted(zk.get_children(path))) if elem not in ('clickhouse', 'zookeeper')]
+
+READ_REQUESTS = [
+    ("exists", exists),
+    ("get", get),
+    ("get_children", get_children),
+]
+
+
+def create(zk, path, data):
+    zk.create(path, data.encode())
+
+
+def set_data(zk, path, data):
+    zk.set(path, data.encode())
+
+
+WRITE_REQUESTS = [
+    ("create", create),
+    ("set_data", set_data),
+]
+
+
+def delete(zk, path):
+    zk.delete(path)
+
+DELETE_REQUESTS = [
+    ("delete", delete)
+]
+
+
+class Request(object):
+    def __init__(self, name, arguments, callback, is_return):
+        self.name = name
+        self.arguments = arguments
+        self.callback = callback
+        self.is_return = is_return
+
+    def __str__(self):
+        arg_str = ', '.join([str(k) + "=" + str(v) for k, v in self.arguments.items()])
+        return "ZKRequest name {} with arguments {}".format(self.name, arg_str)
+
+def generate_requests(prefix="/", iters=1):
+    requests = []
+    existing_paths = []
+    for i in range(iters):
+        for _ in range(100):
+            rand_length = random.randint(0, 10)
+            path = prefix
+            for j in range(1, rand_length):
+                path = create_random_path(path, 1)
+                existing_paths.append(path)
+                value = random_string(1000)
+                request = Request("create", {"path" : path, "value": value[0:10]}, lambda zk, path=path, value=value: create(zk, path, value), False)
+                requests.append(request)
+
+        for _ in range(100):
+            path = random.choice(existing_paths)
+            value = random_string(100)
+            request = Request("set", {"path": path, "value": value[0:10]}, lambda zk, path=path, value=value: set_data(zk, path, value), False)
+            requests.append(request)
+
+        for _ in range(100):
+            path = random.choice(existing_paths)
+            callback = random.choice(READ_REQUESTS)
+            def read_func1(zk, path=path, callback=callback):
+                return callback[1](zk, path)
+
+            request = Request(callback[0], {"path": path}, read_func1, True)
+            requests.append(request)
+
+        for _ in range(30):
+            path = random.choice(existing_paths)
+            request = Request("delete", {"path": path}, lambda zk, path=path: delete(zk, path), False)
+
+        for _ in range(100):
+            path = random.choice(existing_paths)
+            callback = random.choice(READ_REQUESTS)
+            def read_func2(zk, path=path, callback=callback):
+                return callback[1](zk, path)
+            request = Request(callback[0], {"path": path}, read_func2, True)
+            requests.append(request)
+    return requests
+
+
+def test_random_requests(started_cluster):
+    try:
+        requests = generate_requests("/test_random_requests", 10)
+        print("Generated", len(requests), "requests")
+        genuine_zk = get_genuine_zk()
+        fake_zk = get_fake_zk()
+        genuine_zk.create("/test_random_requests")
+        fake_zk.create("/test_random_requests")
+        for i, request in enumerate(requests):
+            genuine_throw = False
+            fake_throw = False
+            fake_result = None
+            genuine_result = None
+            try:
+                genuine_result = request.callback(genuine_zk)
+            except Exception as ex:
+                print("i", i, "request", request)
+                print("Genuine exception", str(ex))
+                genuine_throw = True
+
+            try:
+                fake_result = request.callback(fake_zk)
+            except Exception as ex:
+                print("i", i, "request", request)
+                print("Fake exception", str(ex))
+                fake_throw = True
+
+            assert fake_throw == genuine_throw, "Fake throw genuine not or vise versa request {}"
+            assert fake_result == genuine_result, "Zookeeper results differ"
+        root_children_genuine = [elem for elem in list(sorted(genuine_zk.get_children("/test_random_requests"))) if elem not in ('clickhouse', 'zookeeper')]
+        root_children_fake = [elem for elem in list(sorted(fake_zk.get_children("/test_random_requests"))) if elem not in ('clickhouse', 'zookeeper')]
+        assert root_children_fake == root_children_genuine
+    finally:
+        for zk in [genuine_zk, fake_zk]:
+            stop_zk(zk)
+
+def test_end_of_session(started_cluster):
+
+    fake_zk1 = None
+    fake_zk2 = None
+    genuine_zk1 = None
+    genuine_zk2 = None
+
+    try:
+        fake_zk1 = KazooClient(hosts=cluster.get_instance_ip("node") + ":9181")
+        fake_zk1.start()
+        fake_zk2 = KazooClient(hosts=cluster.get_instance_ip("node") + ":9181")
+        fake_zk2.start()
+        genuine_zk1 = cluster.get_kazoo_client('zoo1')
+        genuine_zk1.start()
+        genuine_zk2 = cluster.get_kazoo_client('zoo1')
+        genuine_zk2.start()
+
+        fake_zk1.create("/test_end_of_session")
+        genuine_zk1.create("/test_end_of_session")
+        fake_ephemeral_event = None
+        def fake_ephemeral_callback(event):
+            print("Fake watch triggered")
+            nonlocal fake_ephemeral_event
+            fake_ephemeral_event = event
+
+        genuine_ephemeral_event = None
+        def genuine_ephemeral_callback(event):
+            print("Genuine watch triggered")
+            nonlocal genuine_ephemeral_event
+            genuine_ephemeral_event = event
+
+        assert fake_zk2.exists("/test_end_of_session") is not None
+        assert genuine_zk2.exists("/test_end_of_session") is not None
+
+        fake_zk1.create("/test_end_of_session/ephemeral_node", ephemeral=True)
+        genuine_zk1.create("/test_end_of_session/ephemeral_node", ephemeral=True)
+
+        assert fake_zk2.exists("/test_end_of_session/ephemeral_node", watch=fake_ephemeral_callback) is not None
+        assert genuine_zk2.exists("/test_end_of_session/ephemeral_node", watch=genuine_ephemeral_callback) is not None
+
+        print("Stopping genuine zk")
+        genuine_zk1.stop()
+        print("Closing genuine zk")
+        genuine_zk1.close()
+
+        print("Stopping fake zk")
+        fake_zk1.stop()
+        print("Closing fake zk")
+        fake_zk1.close()
+
+        assert fake_zk2.exists("/test_end_of_session/ephemeral_node") is None
+        assert genuine_zk2.exists("/test_end_of_session/ephemeral_node") is None
+
+        assert fake_ephemeral_event == genuine_ephemeral_event
+
+    finally:
+        for zk in [fake_zk1, fake_zk2, genuine_zk1, genuine_zk2]:
+            stop_zk(zk)
+
+def test_end_of_watches_session(started_cluster):
+    fake_zk1 = None
+    fake_zk2 = None
+    try:
+        fake_zk1 = KazooClient(hosts=cluster.get_instance_ip("node") + ":9181")
+        fake_zk1.start()
+
+        fake_zk2 = KazooClient(hosts=cluster.get_instance_ip("node") + ":9181")
+        fake_zk2.start()
+
+        fake_zk1.create("/test_end_of_watches_session")
+
+        dummy_set = 0
+        def dummy_callback(event):
+            nonlocal dummy_set
+            dummy_set += 1
+            print(event)
+
+        for child_node in range(100):
+            fake_zk1.create("/test_end_of_watches_session/" + str(child_node))
+            fake_zk1.get_children("/test_end_of_watches_session/" + str(child_node), watch=dummy_callback)
+
+        fake_zk2.get_children("/test_end_of_watches_session/" + str(0), watch=dummy_callback)
+        fake_zk2.get_children("/test_end_of_watches_session/" + str(1), watch=dummy_callback)
+
+        fake_zk1.stop()
+        fake_zk1.close()
+
+        for child_node in range(100):
+            fake_zk2.create("/test_end_of_watches_session/" + str(child_node) + "/" + str(child_node), b"somebytes")
+
+        assert dummy_set == 2
+    finally:
+        for zk in [fake_zk1, fake_zk2]:
+            stop_zk(zk)
+
+def test_concurrent_watches(started_cluster):
+    try:
+        fake_zk = get_fake_zk()
+        fake_zk.restart()
+        global_path = "/test_concurrent_watches_0"
+        fake_zk.create(global_path)
+
+        dumb_watch_triggered_counter = 0
+        all_paths_triggered = []
+
+        existing_path = []
+        all_paths_created = []
+        watches_created = 0
+        def create_path_and_watch(i):
+            nonlocal watches_created
+            nonlocal all_paths_created
+            fake_zk.ensure_path(global_path + "/" + str(i))
+            # new function each time
+            def dumb_watch(event):
+                nonlocal dumb_watch_triggered_counter
+                dumb_watch_triggered_counter += 1
+                nonlocal all_paths_triggered
+                all_paths_triggered.append(event.path)
+
+            fake_zk.get(global_path + "/" + str(i), watch=dumb_watch)
+            all_paths_created.append(global_path + "/" + str(i))
+            watches_created += 1
+            existing_path.append(i)
+
+        trigger_called = 0
+        def trigger_watch(i):
+            nonlocal trigger_called
+            trigger_called += 1
+            fake_zk.set(global_path + "/" + str(i), b"somevalue")
+            try:
+                existing_path.remove(i)
+            except:
+                pass
+
+        def call(total):
+            for i in range(total):
+                create_path_and_watch(random.randint(0, 1000))
+                time.sleep(random.random() % 0.5)
+                try:
+                    rand_num = random.choice(existing_path)
+                    trigger_watch(rand_num)
+                except:
+                    pass
+            while existing_path:
+                try:
+                    rand_num = random.choice(existing_path)
+                    trigger_watch(rand_num)
+                except:
+                    pass
+
+        p = Pool(10)
+        arguments = [100] * 10
+        watches_must_be_created = sum(arguments)
+        watches_trigger_must_be_called = sum(arguments)
+        watches_must_be_triggered = sum(arguments)
+        p.map(call, arguments)
+        p.close()
+
+        # waiting for late watches
+        for i in range(50):
+            if dumb_watch_triggered_counter == watches_must_be_triggered:
+                break
+
+            time.sleep(0.1)
+
+        assert watches_created == watches_must_be_created
+        assert trigger_called >= watches_trigger_must_be_called
+        assert len(existing_path) == 0
+        if dumb_watch_triggered_counter != watches_must_be_triggered:
+            print("All created paths", all_paths_created)
+            print("All triggerred paths", all_paths_triggered)
+            print("All paths len", len(all_paths_created))
+            print("All triggered len", len(all_paths_triggered))
+            print("Diff", list(set(all_paths_created) - set(all_paths_triggered)))
+
+        assert dumb_watch_triggered_counter == watches_must_be_triggered
+    finally:
+        stop_zk(fake_zk)
diff --git a/tests/integration/test_testkeeper_multinode_blocade_leader/__init__.py b/tests/integration/test_keeper_internal_secure/__init__.py
similarity index 100%
rename from tests/integration/test_testkeeper_multinode_blocade_leader/__init__.py
rename to tests/integration/test_keeper_internal_secure/__init__.py
diff --git a/tests/integration/test_keeper_internal_secure/configs/enable_secure_keeper1.xml b/tests/integration/test_keeper_internal_secure/configs/enable_secure_keeper1.xml
new file mode 100644
index 00000000000..ecbd50c72a6
--- /dev/null
+++ b/tests/integration/test_keeper_internal_secure/configs/enable_secure_keeper1.xml
@@ -0,0 +1,42 @@
+<yandex>
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>1</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+
+        <coordination_settings>
+            <operation_timeout_ms>5000</operation_timeout_ms>
+            <session_timeout_ms>10000</session_timeout_ms>
+            <snapshot_distance>75</snapshot_distance>
+            <raft_logs_level>trace</raft_logs_level>
+        </coordination_settings>
+
+        <raft_configuration>
+            <secure>true</secure>
+            <server>
+                <id>1</id>
+                <hostname>node1</hostname>
+                <port>44444</port>
+                <can_become_leader>true</can_become_leader>
+                <priority>3</priority>
+            </server>
+            <server>
+                <id>2</id>
+                <hostname>node2</hostname>
+                <port>44444</port>
+                <can_become_leader>true</can_become_leader>
+                <start_as_follower>true</start_as_follower>
+                <priority>2</priority>
+            </server>
+            <server>
+                <id>3</id>
+                <hostname>node3</hostname>
+                <port>44444</port>
+                <can_become_leader>true</can_become_leader>
+                <start_as_follower>true</start_as_follower>
+                <priority>1</priority>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</yandex>
diff --git a/tests/integration/test_keeper_internal_secure/configs/enable_secure_keeper2.xml b/tests/integration/test_keeper_internal_secure/configs/enable_secure_keeper2.xml
new file mode 100644
index 00000000000..53129ae0a75
--- /dev/null
+++ b/tests/integration/test_keeper_internal_secure/configs/enable_secure_keeper2.xml
@@ -0,0 +1,42 @@
+<yandex>
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>2</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+
+        <coordination_settings>
+            <operation_timeout_ms>5000</operation_timeout_ms>
+            <session_timeout_ms>10000</session_timeout_ms>
+            <snapshot_distance>75</snapshot_distance>
+            <raft_logs_level>trace</raft_logs_level>
+        </coordination_settings>
+
+        <raft_configuration>
+            <secure>true</secure>
+            <server>
+                <id>1</id>
+                <hostname>node1</hostname>
+                <port>44444</port>
+                <can_become_leader>true</can_become_leader>
+                <priority>3</priority>
+            </server>
+            <server>
+                <id>2</id>
+                <hostname>node2</hostname>
+                <port>44444</port>
+                <can_become_leader>true</can_become_leader>
+                <start_as_follower>true</start_as_follower>
+                <priority>2</priority>
+            </server>
+            <server>
+                <id>3</id>
+                <hostname>node3</hostname>
+                <port>44444</port>
+                <can_become_leader>true</can_become_leader>
+                <start_as_follower>true</start_as_follower>
+                <priority>1</priority>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</yandex>
diff --git a/tests/integration/test_keeper_internal_secure/configs/enable_secure_keeper3.xml b/tests/integration/test_keeper_internal_secure/configs/enable_secure_keeper3.xml
new file mode 100644
index 00000000000..4c685764ec0
--- /dev/null
+++ b/tests/integration/test_keeper_internal_secure/configs/enable_secure_keeper3.xml
@@ -0,0 +1,42 @@
+<yandex>
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>3</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+
+        <coordination_settings>
+            <operation_timeout_ms>5000</operation_timeout_ms>
+            <session_timeout_ms>10000</session_timeout_ms>
+            <snapshot_distance>75</snapshot_distance>
+            <raft_logs_level>trace</raft_logs_level>
+        </coordination_settings>
+
+        <raft_configuration>
+            <secure>true</secure>
+            <server>
+                <id>1</id>
+                <hostname>node1</hostname>
+                <port>44444</port>
+                <can_become_leader>true</can_become_leader>
+                <priority>3</priority>
+            </server>
+            <server>
+                <id>2</id>
+                <hostname>node2</hostname>
+                <port>44444</port>
+                <can_become_leader>true</can_become_leader>
+                <start_as_follower>true</start_as_follower>
+                <priority>2</priority>
+            </server>
+            <server>
+                <id>3</id>
+                <hostname>node3</hostname>
+                <port>44444</port>
+                <can_become_leader>true</can_become_leader>
+                <start_as_follower>true</start_as_follower>
+                <priority>1</priority>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</yandex>
diff --git a/tests/integration/test_keeper_internal_secure/configs/rootCA.pem b/tests/integration/test_keeper_internal_secure/configs/rootCA.pem
new file mode 100644
index 00000000000..ec16533d98a
--- /dev/null
+++ b/tests/integration/test_keeper_internal_secure/configs/rootCA.pem
@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDazCCAlOgAwIBAgIUUiyhAav08YhTLfUIXLN/0Ln09n4wDQYJKoZIhvcNAQEL
+BQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
+GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAeFw0yMTA0MTIxMTQ1MjBaFw0yMTA1
+MTIxMTQ1MjBaMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEw
+HwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQDK0Ww4voPlkePBPS2MsEi7e1ePS+CDxTdDuOwWWEA7
+JiOyqIGqdyL6AE2EqjL3sSdVFVxytpGQWDuM6JHXdb01AnMngBuql9Jkiln7i267
+v54HtMWdm8o3rik/b/mB+kkn/sP715tI49Ybh/RobtvtK16ZgHr1ombkq6rXiom2
+8GmSmpYFwZtZsXtm2JwbZVayupQpWwdu3KrTXKBtVyKVvvWdgkf47DWYtWDS3vqE
+cShM1H97G4DvI+4RX1WtQevQ0yCx1aFTg4xMHFkpUxlP8iW6mQaQPqy9rnI57e3L
+RHc2I/B56xa43R3GmQ2S7bE4hvm1SrZDtVgrZLf4nvwNAgMBAAGjUzBRMB0GA1Ud
+DgQWBBQ4+o0x1FzK7nRbcnm2pNLwaywCdzAfBgNVHSMEGDAWgBQ4+o0x1FzK7nRb
+cnm2pNLwaywCdzAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQDE
+YmM8MH6RKcaqMqCBefWLj0LTcZ/Wm4G/eCFC51PkAIsf7thnzViemBHRXUSF8wzc
+1MBPD6II6OB1F0i7ntGjtlhnL2WcPYbo2Np59p7fo9SMbYwF49OZ40twsuKeeoAp
+pfow+y/EBZqa99MY2q6FU6FDA3Rpv0Sdk+/5PHdsSP6cgeMszFBUS0tCQEvEl83n
+FJUb0vjEX4x3J64XO/0DKXyCxFyF77OwHG2ZV5BeCpIhGXu+d/e221LJkGI2orKR
+kgsaUwrkS8HQt3Hd0gYpLI1Opx/JlRpB0VLYLzRGj7kDpbAcTj3SMEUp/FAZmlXR
+Iiebt73eE3rOWVFgyY9f
+-----END CERTIFICATE-----
diff --git a/tests/integration/test_keeper_internal_secure/configs/server.crt b/tests/integration/test_keeper_internal_secure/configs/server.crt
new file mode 100644
index 00000000000..dfa32da5444
--- /dev/null
+++ b/tests/integration/test_keeper_internal_secure/configs/server.crt
@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIDETCCAfkCFHL+gKBQnU0P73/nrFrGaVPauTPmMA0GCSqGSIb3DQEBCwUAMEUx
+CzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRl
+cm5ldCBXaWRnaXRzIFB0eSBMdGQwHhcNMjEwNDEyMTE0NzI5WhcNMjEwNTEyMTE0
+NzI5WjBFMQswCQYDVQQGEwJBVTETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UE
+CgwYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEA1iPeYn1Vy4QnQi6uNVqQnFLr0u3qdrMjGEBNAOuGmtIdhIn8
+rMCzaehNr3y2YTMRbZAqmv28P/wOXpzR1uQaFlQzTOjmsn/HOZ9JX2hv5sBUv7SU
+UiPJS7UtptKDPbLv3N/v1dOXbY+vVyzo8U1Q9OS1J5yhYW6KtxP++hfSrOsFu669
+d1pqWFWaNBsmf0zF+ETvi6lywhyTFA1/PazcStP5GntcDL7eDvGq+DDsRC40oRpy
+S4xRQRSteCTtGGmWpx+Jmt+90wFnLgruUbWT0veCoLxLvz0tJUk3ueUVnMkrxBQG
+Fz+IWm+SQppNU5LlAcBcu9wJfo3h34BXp0NFNQIDAQABMA0GCSqGSIb3DQEBCwUA
+A4IBAQCUnvQsv+GsPwGnIWqH9iiFVhgDx5QbSTW94Fyqk8dcIJBzWAiCshmLBWPJ
+pfy4y2nxJbzovFsd9DA49pxqqILeLjue99yma2DVKeo+XDLDN3OX5faIMTBd7AnL
+0MKqW7gUSLRUZrNOvFciAY8xRezgBQQBo4mcmmMbAbk5wKndGY6ZZOcY+JwXlqGB
+5hyi6ishO8ciiZi3GMFNWWk9ViSfo27IqjKdSkQq1pr3FULvepd6SkdX+NvfZTAH
+rG+CSoFGiJcOBbhDkvpY32cAJEnJOA1vHpFxfnGP8/1haeVZHqSwH1cySD78HVtF
+fBs000wGHzBYWNI2KkwjNtYf06P4
+-----END CERTIFICATE-----
diff --git a/tests/integration/test_keeper_internal_secure/configs/server.key b/tests/integration/test_keeper_internal_secure/configs/server.key
new file mode 100644
index 00000000000..7e57c8b6b34
--- /dev/null
+++ b/tests/integration/test_keeper_internal_secure/configs/server.key
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEA1iPeYn1Vy4QnQi6uNVqQnFLr0u3qdrMjGEBNAOuGmtIdhIn8
+rMCzaehNr3y2YTMRbZAqmv28P/wOXpzR1uQaFlQzTOjmsn/HOZ9JX2hv5sBUv7SU
+UiPJS7UtptKDPbLv3N/v1dOXbY+vVyzo8U1Q9OS1J5yhYW6KtxP++hfSrOsFu669
+d1pqWFWaNBsmf0zF+ETvi6lywhyTFA1/PazcStP5GntcDL7eDvGq+DDsRC40oRpy
+S4xRQRSteCTtGGmWpx+Jmt+90wFnLgruUbWT0veCoLxLvz0tJUk3ueUVnMkrxBQG
+Fz+IWm+SQppNU5LlAcBcu9wJfo3h34BXp0NFNQIDAQABAoIBAHYDso2o8V2F6XTp
+8QxqawQcFudaQztDonW9CjMVmks8vRPMUDqMwNP/OMEcBA8xa8tsBm8Ao3zH1suB
+tYuujkn8AYHDYVDCZvN0u6UfE3yiRpKYXJ2gJ1HX+d7UaYvZT6P0rmKzh+LTqxhq
+Ib7Kk3FDkirQgYgGueAH3x/JfUvaAGvFrq+HvvlhHOs7M7iFU4nJA8jNfBolpTnG
+v5MMI+f8/GHGreVICJUoclE+4V/4LDHUlrc3l1kQk0keeD6ECw/pl48TNL6ncXKu
+baez1rfKbMPjhLUy2q5UZa93oW+olchEOXs1nUNKUhIOOr0f0YweYhUHNTineVM9
+yTecMIkCgYEA7CFQMyeLVeBA6C9AHBe8Zf/k64cMPyr0lUz6548ulil580PNPbvW
+kd2vIKfUMgCO5lMA47ArL4bXZ7cjTvJmPYE1Yv8z+F0Tk03fnTrudHOSBEiGXAu3
+MPTxCDU7Se5Dwj0Fq81aFRtCHl8Rrss+WiBD8eRoxb/vwXKFc6VUAWMCgYEA6CjZ
+XrZz11lySBhjkyVXcdLj89hDZ+bPxA7b3VB7TfCxsn5xVck7U3TFkg5Z9XwEQ7Ob
+XFAPuwT9GKm7QPp6L8T2RltoJ3ys40UH1RtcNLz2aIo/xSP7lopPdAfWHef5r4y9
+kRw+Gh4NP/l5wefXsRz/D0jY3+t+QnwnhuCKbocCgYEAiR6bPOlkvzyXVH1DxEyA
+Sdb8b00f7nqaRyzJsrfxvJ9fQsWHpKa0ZkYOUW9ECLlMQjHHHXEK0vGBmqe9qDWY
+63RhtRgvbLVYDb018k7rc9I846Hd7AudmJ9UbIjE4hyrWlsnNOntur32ej6IvTEn
+Bx0fd5NEyDi6GGLRXiOOkbMCgYAressLE/yqDlR68CZl/o5cAPU0TAKDyRSMUYQX
+9OTC+hstpMSxHlkADlSaQBnVAf8CdvbX2R65FfwYzGEHkGGl5KuDDcd57b2rathG
+rzMbpXA4r/u1fkG2Nf0fbABL5ZA7so4mSTXQSmSM4LpO+I7K2vVh9XC4rzAcX4g/
+mHoUrQKBgBf3rxp5h9P3HWoZYjzBDo2FqXUjKLLjE9ed5e/VqecqfHIkmueuNHlN
+xifHr7lpsYu6IXkTnlK14pvLoPuwP59dCIOUYwAFz8RlH4MSUGNhYeGA8cqRrhmJ
+tYk3OKExuN/+O12kUPVTy6BMH1hBdRJP+7y7lapWsRhZt18y+8Za
+-----END RSA PRIVATE KEY-----
diff --git a/tests/integration/test_keeper_internal_secure/configs/ssl_conf.xml b/tests/integration/test_keeper_internal_secure/configs/ssl_conf.xml
new file mode 100644
index 00000000000..babc7cf0f18
--- /dev/null
+++ b/tests/integration/test_keeper_internal_secure/configs/ssl_conf.xml
@@ -0,0 +1,15 @@
+
+<yandex>
+    <openSSL>
+        <server>
+            <certificateFile>/etc/clickhouse-server/config.d/server.crt</certificateFile>
+            <privateKeyFile>/etc/clickhouse-server/config.d/server.key</privateKeyFile>
+            <caConfig>/etc/clickhouse-server/config.d/rootCA.pem</caConfig>
+            <loadDefaultCAFile>true</loadDefaultCAFile>
+            <verificationMode>none</verificationMode>
+            <cacheSessions>true</cacheSessions>
+            <disableProtocols>sslv2,sslv3</disableProtocols>
+            <preferServerCiphers>true</preferServerCiphers>
+        </server>
+    </openSSL>
+</yandex>
diff --git a/tests/integration/test_keeper_internal_secure/test.py b/tests/integration/test_keeper_internal_secure/test.py
new file mode 100644
index 00000000000..d9fbca624e1
--- /dev/null
+++ b/tests/integration/test_keeper_internal_secure/test.py
@@ -0,0 +1,58 @@
+#!/usr/bin/env python3
+
+import pytest
+from helpers.cluster import ClickHouseCluster
+import random
+import string
+import os
+import time
+
+cluster = ClickHouseCluster(__file__)
+node1 = cluster.add_instance('node1', main_configs=['configs/enable_secure_keeper1.xml', 'configs/ssl_conf.xml', 'configs/server.crt', 'configs/server.key', 'configs/rootCA.pem'])
+node2 = cluster.add_instance('node2', main_configs=['configs/enable_secure_keeper2.xml', 'configs/ssl_conf.xml', 'configs/server.crt', 'configs/server.key', 'configs/rootCA.pem'])
+node3 = cluster.add_instance('node3', main_configs=['configs/enable_secure_keeper3.xml', 'configs/ssl_conf.xml', 'configs/server.crt', 'configs/server.key', 'configs/rootCA.pem'])
+
+from kazoo.client import KazooClient, KazooState
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+def get_fake_zk(nodename, timeout=30.0):
+    _fake_zk_instance = KazooClient(hosts=cluster.get_instance_ip(nodename) + ":9181", timeout=timeout)
+    def reset_listener(state):
+        nonlocal _fake_zk_instance
+        print("Fake zk callback called for state", state)
+        if state != KazooState.CONNECTED:
+            _fake_zk_instance._reset()
+
+    _fake_zk_instance.add_listener(reset_listener)
+    _fake_zk_instance.start()
+    return _fake_zk_instance
+
+def test_secure_raft_works(started_cluster):
+    try:
+        node1_zk = get_fake_zk("node1")
+        node2_zk = get_fake_zk("node2")
+        node3_zk = get_fake_zk("node3")
+
+        node1_zk.create("/test_node", b"somedata1")
+        node2_zk.sync("/test_node")
+        node3_zk.sync("/test_node")
+
+        assert node1_zk.exists("/test_node") is not None
+        assert node2_zk.exists("/test_node") is not None
+        assert node3_zk.exists("/test_node") is not None
+    finally:
+        try:
+            for zk_conn in [node1_zk, node2_zk, node3_zk]:
+                zk_conn.stop()
+                zk_conn.close()
+        except:
+            pass
diff --git a/tests/integration/test_testkeeper_multinode_simple/__init__.py b/tests/integration/test_keeper_multinode_blocade_leader/__init__.py
similarity index 100%
rename from tests/integration/test_testkeeper_multinode_simple/__init__.py
rename to tests/integration/test_keeper_multinode_blocade_leader/__init__.py
diff --git a/tests/integration/test_testkeeper_multinode_blocade_leader/configs/enable_test_keeper1.xml b/tests/integration/test_keeper_multinode_blocade_leader/configs/enable_keeper1.xml
similarity index 81%
rename from tests/integration/test_testkeeper_multinode_blocade_leader/configs/enable_test_keeper1.xml
rename to tests/integration/test_keeper_multinode_blocade_leader/configs/enable_keeper1.xml
index 4ad76889d1e..5a75bf524ec 100644
--- a/tests/integration/test_testkeeper_multinode_blocade_leader/configs/enable_test_keeper1.xml
+++ b/tests/integration/test_keeper_multinode_blocade_leader/configs/enable_keeper1.xml
@@ -1,11 +1,14 @@
 <yandex>
-    <test_keeper_server>
+    <keeper_server>
         <tcp_port>9181</tcp_port>
         <server_id>1</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
 
         <coordination_settings>
             <operation_timeout_ms>5000</operation_timeout_ms>
             <session_timeout_ms>10000</session_timeout_ms>
+            <snapshot_distance>75</snapshot_distance>
             <raft_logs_level>trace</raft_logs_level>
         </coordination_settings>
 
@@ -34,5 +37,5 @@
                 <priority>1</priority>
             </server>
         </raft_configuration>
-    </test_keeper_server>
+    </keeper_server>
 </yandex>
diff --git a/tests/integration/test_testkeeper_multinode_blocade_leader/configs/enable_test_keeper2.xml b/tests/integration/test_keeper_multinode_blocade_leader/configs/enable_keeper2.xml
similarity index 81%
rename from tests/integration/test_testkeeper_multinode_blocade_leader/configs/enable_test_keeper2.xml
rename to tests/integration/test_keeper_multinode_blocade_leader/configs/enable_keeper2.xml
index a1954a1e639..246fb08c9e7 100644
--- a/tests/integration/test_testkeeper_multinode_blocade_leader/configs/enable_test_keeper2.xml
+++ b/tests/integration/test_keeper_multinode_blocade_leader/configs/enable_keeper2.xml
@@ -1,11 +1,14 @@
 <yandex>
-    <test_keeper_server>
+    <keeper_server>
         <tcp_port>9181</tcp_port>
         <server_id>2</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
 
         <coordination_settings>
             <operation_timeout_ms>5000</operation_timeout_ms>
             <session_timeout_ms>10000</session_timeout_ms>
+            <snapshot_distance>75</snapshot_distance>
             <raft_logs_level>trace</raft_logs_level>
         </coordination_settings>
 
@@ -34,5 +37,5 @@
                 <priority>1</priority>
             </server>
         </raft_configuration>
-    </test_keeper_server>
+    </keeper_server>
 </yandex>
diff --git a/tests/integration/test_testkeeper_multinode_blocade_leader/configs/enable_test_keeper3.xml b/tests/integration/test_keeper_multinode_blocade_leader/configs/enable_keeper3.xml
similarity index 81%
rename from tests/integration/test_testkeeper_multinode_blocade_leader/configs/enable_test_keeper3.xml
rename to tests/integration/test_keeper_multinode_blocade_leader/configs/enable_keeper3.xml
index 88d2358138f..b5958dd7f41 100644
--- a/tests/integration/test_testkeeper_multinode_blocade_leader/configs/enable_test_keeper3.xml
+++ b/tests/integration/test_keeper_multinode_blocade_leader/configs/enable_keeper3.xml
@@ -1,11 +1,14 @@
 <yandex>
-    <test_keeper_server>
+    <keeper_server>
         <tcp_port>9181</tcp_port>
         <server_id>3</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
 
         <coordination_settings>
             <operation_timeout_ms>5000</operation_timeout_ms>
             <session_timeout_ms>10000</session_timeout_ms>
+            <snapshot_distance>75</snapshot_distance>
             <raft_logs_level>trace</raft_logs_level>
         </coordination_settings>
 
@@ -34,5 +37,5 @@
                 <priority>1</priority>
             </server>
         </raft_configuration>
-    </test_keeper_server>
+    </keeper_server>
 </yandex>
diff --git a/tests/integration/test_testkeeper_multinode_blocade_leader/configs/log_conf.xml b/tests/integration/test_keeper_multinode_blocade_leader/configs/log_conf.xml
similarity index 100%
rename from tests/integration/test_testkeeper_multinode_blocade_leader/configs/log_conf.xml
rename to tests/integration/test_keeper_multinode_blocade_leader/configs/log_conf.xml
diff --git a/tests/integration/test_testkeeper_multinode_blocade_leader/configs/use_test_keeper.xml b/tests/integration/test_keeper_multinode_blocade_leader/configs/use_keeper.xml
similarity index 100%
rename from tests/integration/test_testkeeper_multinode_blocade_leader/configs/use_test_keeper.xml
rename to tests/integration/test_keeper_multinode_blocade_leader/configs/use_keeper.xml
diff --git a/tests/integration/test_testkeeper_multinode_blocade_leader/test.py b/tests/integration/test_keeper_multinode_blocade_leader/test.py
similarity index 68%
rename from tests/integration/test_testkeeper_multinode_blocade_leader/test.py
rename to tests/integration/test_keeper_multinode_blocade_leader/test.py
index 3b2867ef3c7..e74ccc80fe8 100644
--- a/tests/integration/test_testkeeper_multinode_blocade_leader/test.py
+++ b/tests/integration/test_keeper_multinode_blocade_leader/test.py
@@ -6,14 +6,27 @@ import os
 import time
 from multiprocessing.dummy import Pool
 from helpers.network import PartitionManager
+from helpers.test_tools import assert_eq_with_retry
 
 cluster = ClickHouseCluster(__file__)
-node1 = cluster.add_instance('node1', main_configs=['configs/enable_test_keeper1.xml', 'configs/log_conf.xml', 'configs/use_test_keeper.xml'], stay_alive=True)
-node2 = cluster.add_instance('node2', main_configs=['configs/enable_test_keeper2.xml', 'configs/log_conf.xml', 'configs/use_test_keeper.xml'], stay_alive=True)
-node3 = cluster.add_instance('node3', main_configs=['configs/enable_test_keeper3.xml', 'configs/log_conf.xml', 'configs/use_test_keeper.xml'], stay_alive=True)
+node1 = cluster.add_instance('node1', main_configs=['configs/enable_keeper1.xml', 'configs/log_conf.xml', 'configs/use_keeper.xml'], stay_alive=True)
+node2 = cluster.add_instance('node2', main_configs=['configs/enable_keeper2.xml', 'configs/log_conf.xml', 'configs/use_keeper.xml'], stay_alive=True)
+node3 = cluster.add_instance('node3', main_configs=['configs/enable_keeper3.xml', 'configs/log_conf.xml', 'configs/use_keeper.xml'], stay_alive=True)
 
 from kazoo.client import KazooClient, KazooState
 
+"""
+In this test, we blockade RAFT leader and check that the whole system is
+able to recover. It's not a good test because we use ClickHouse's replicated
+tables to check connectivity, but they may require special operations (or a long
+wait) after session expiration. We don't use kazoo, because this client pretends
+to be very smart: SUSPEND sessions, try to recover them, and so on. The test
+will be even less predictable than with ClickHouse tables.
+
+TODO find (or write) not so smart python client.
+TODO remove this when jepsen tests will be written.
+"""
+
 @pytest.fixture(scope="module")
 def started_cluster():
     try:
@@ -55,7 +68,6 @@ def get_fake_zk(nodename, timeout=30.0):
     _fake_zk_instance = KazooClient(hosts=cluster.get_instance_ip(nodename) + ":9181", timeout=timeout)
     def reset_listener(state):
         nonlocal _fake_zk_instance
-        print("Fake zk callback called for state", state)
         if state != KazooState.CONNECTED:
             _fake_zk_instance._reset()
 
@@ -67,19 +79,25 @@ def get_fake_zk(nodename, timeout=30.0):
 # in extremely rare case it can take more than 5 minutes in debug build with sanitizer
 @pytest.mark.timeout(600)
 def test_blocade_leader(started_cluster):
-    wait_nodes()
-    for i, node in enumerate([node1, node2, node3]):
-        node.query("CREATE DATABASE IF NOT EXISTS ordinary ENGINE=Ordinary")
-        node.query("CREATE TABLE ordinary.t1 (value UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/t1', '{}') ORDER BY tuple()".format(i + 1))
+    for i in range(100):
+        wait_nodes()
+        try:
+            for i, node in enumerate([node1, node2, node3]):
+                node.query("CREATE DATABASE IF NOT EXISTS ordinary ENGINE=Ordinary")
+                node.query("CREATE TABLE IF NOT EXISTS ordinary.t1 (value UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/t1', '{}') ORDER BY tuple()".format(i + 1))
+            break
+        except Exception as ex:
+            print("Got exception from node", smaller_exception(ex))
+            time.sleep(0.1)
 
     node2.query("INSERT INTO ordinary.t1 SELECT number FROM numbers(10)")
 
     node1.query("SYSTEM SYNC REPLICA ordinary.t1", timeout=10)
     node3.query("SYSTEM SYNC REPLICA ordinary.t1", timeout=10)
 
-    assert node1.query("SELECT COUNT() FROM ordinary.t1") == "10\n"
-    assert node2.query("SELECT COUNT() FROM ordinary.t1") == "10\n"
-    assert node3.query("SELECT COUNT() FROM ordinary.t1") == "10\n"
+    assert_eq_with_retry(node1, "SELECT COUNT() FROM ordinary.t1", "10")
+    assert_eq_with_retry(node2, "SELECT COUNT() FROM ordinary.t1", "10")
+    assert_eq_with_retry(node3, "SELECT COUNT() FROM ordinary.t1", "10")
 
     with PartitionManager() as pm:
         pm.partition_instances(node2, node1)
@@ -87,7 +105,7 @@ def test_blocade_leader(started_cluster):
 
         for i in range(100):
             try:
-                node2.query("SYSTEM RESTART REPLICA ordinary.t1")
+                restart_replica_for_sure(node2, "ordinary.t1", "/clickhouse/t1/replicas/2")
                 node2.query("INSERT INTO ordinary.t1 SELECT rand() FROM numbers(100)")
                 break
             except Exception as ex:
@@ -104,7 +122,7 @@ def test_blocade_leader(started_cluster):
 
         for i in range(100):
             try:
-                node3.query("SYSTEM RESTART REPLICA ordinary.t1")
+                restart_replica_for_sure(node3, "ordinary.t1", "/clickhouse/t1/replicas/3")
                 node3.query("INSERT INTO ordinary.t1 SELECT rand() FROM numbers(100)")
                 break
             except Exception as ex:
@@ -122,7 +140,7 @@ def test_blocade_leader(started_cluster):
     for n, node in enumerate([node1, node2, node3]):
         for i in range(100):
             try:
-                node.query("SYSTEM RESTART REPLICA ordinary.t1")
+                restart_replica_for_sure(node, "ordinary.t1", "/clickhouse/t1/replicas/{}".format(n + 1))
                 break
             except Exception as ex:
                 try:
@@ -150,7 +168,7 @@ def test_blocade_leader(started_cluster):
     for n, node in enumerate([node1, node2, node3]):
         for i in range(100):
             try:
-                node.query("SYSTEM RESTART REPLICA ordinary.t1")
+                restart_replica_for_sure(node, "ordinary.t1", "/clickhouse/t1/replicas/{}".format(n + 1))
                 node.query("SYSTEM SYNC REPLICA ordinary.t1", timeout=10)
                 break
             except Exception as ex:
@@ -170,9 +188,9 @@ def test_blocade_leader(started_cluster):
         for num, node in enumerate([node1, node2, node3]):
             dump_zk(node, '/clickhouse/t1', '/clickhouse/t1/replicas/{}'.format(num + 1))
 
-    assert node1.query("SELECT COUNT() FROM ordinary.t1") == "310\n"
-    assert node2.query("SELECT COUNT() FROM ordinary.t1") == "310\n"
-    assert node3.query("SELECT COUNT() FROM ordinary.t1") == "310\n"
+    assert_eq_with_retry(node1, "SELECT COUNT() FROM ordinary.t1", "310")
+    assert_eq_with_retry(node2, "SELECT COUNT() FROM ordinary.t1", "310")
+    assert_eq_with_retry(node3, "SELECT COUNT() FROM ordinary.t1", "310")
 
 
 def dump_zk(node, zk_path, replica_path):
@@ -188,22 +206,47 @@ def dump_zk(node, zk_path, replica_path):
     print("Parts")
     print(node.query("SELECT name FROM system.zookeeper WHERE path = '{}/parts' FORMAT Vertical".format(replica_path)))
 
+def restart_replica_for_sure(node, table_name, zk_replica_path):
+    fake_zk = None
+    try:
+        node.query("DETACH TABLE {}".format(table_name))
+        fake_zk = get_fake_zk(node.name)
+        if fake_zk.exists(zk_replica_path + "/is_active") is not None:
+            fake_zk.delete(zk_replica_path + "/is_active")
+
+        node.query("ATTACH TABLE {}".format(table_name))
+    except Exception as ex:
+        print("Exception", ex)
+        raise ex
+    finally:
+        if fake_zk:
+            fake_zk.stop()
+            fake_zk.close()
+
+
+
 # in extremely rare case it can take more than 5 minutes in debug build with sanitizer
 @pytest.mark.timeout(600)
 def test_blocade_leader_twice(started_cluster):
-    wait_nodes()
-    for i, node in enumerate([node1, node2, node3]):
-        node.query("CREATE DATABASE IF NOT EXISTS ordinary ENGINE=Ordinary")
-        node.query("CREATE TABLE ordinary.t2 (value UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/t2', '{}') ORDER BY tuple()".format(i + 1))
+    for i in range(100):
+        wait_nodes()
+        try:
+            for i, node in enumerate([node1, node2, node3]):
+                node.query("CREATE DATABASE IF NOT EXISTS ordinary ENGINE=Ordinary")
+                node.query("CREATE TABLE IF NOT EXISTS ordinary.t2 (value UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/t2', '{}') ORDER BY tuple()".format(i + 1))
+            break
+        except Exception as ex:
+            print("Got exception from node", smaller_exception(ex))
+            time.sleep(0.1)
 
     node2.query("INSERT INTO ordinary.t2 SELECT number FROM numbers(10)")
 
     node1.query("SYSTEM SYNC REPLICA ordinary.t2", timeout=10)
     node3.query("SYSTEM SYNC REPLICA ordinary.t2", timeout=10)
 
-    assert node1.query("SELECT COUNT() FROM ordinary.t2") == "10\n"
-    assert node2.query("SELECT COUNT() FROM ordinary.t2") == "10\n"
-    assert node3.query("SELECT COUNT() FROM ordinary.t2") == "10\n"
+    assert_eq_with_retry(node1, "SELECT COUNT() FROM ordinary.t2", "10")
+    assert_eq_with_retry(node2, "SELECT COUNT() FROM ordinary.t2", "10")
+    assert_eq_with_retry(node3, "SELECT COUNT() FROM ordinary.t2", "10")
 
     with PartitionManager() as pm:
         pm.partition_instances(node2, node1)
@@ -211,7 +254,7 @@ def test_blocade_leader_twice(started_cluster):
 
         for i in range(100):
             try:
-                node2.query("SYSTEM RESTART REPLICA ordinary.t2")
+                restart_replica_for_sure(node2, "ordinary.t2", "/clickhouse/t2/replicas/2")
                 node2.query("INSERT INTO ordinary.t2 SELECT rand() FROM numbers(100)")
                 break
             except Exception as ex:
@@ -228,7 +271,8 @@ def test_blocade_leader_twice(started_cluster):
 
         for i in range(100):
             try:
-                node3.query("SYSTEM RESTART REPLICA ordinary.t2")
+                restart_replica_for_sure(node3, "ordinary.t2", "/clickhouse/t2/replicas/3")
+                node3.query("SYSTEM SYNC REPLICA ordinary.t2", timeout=10)
                 node3.query("INSERT INTO ordinary.t2 SELECT rand() FROM numbers(100)")
                 break
             except Exception as ex:
@@ -243,6 +287,10 @@ def test_blocade_leader_twice(started_cluster):
                 dump_zk(node, '/clickhouse/t2', '/clickhouse/t2/replicas/{}'.format(num + 1))
             assert False, "Cannot reconnect for node3"
 
+        node2.query("SYSTEM SYNC REPLICA ordinary.t2", timeout=10)
+
+        assert_eq_with_retry(node2, "SELECT COUNT() FROM ordinary.t2", "210")
+        assert_eq_with_retry(node3, "SELECT COUNT() FROM ordinary.t2", "210")
 
         # Total network partition
         pm.partition_instances(node3, node2)
@@ -261,11 +309,10 @@ def test_blocade_leader_twice(started_cluster):
             except Exception as ex:
                 time.sleep(0.5)
 
-
     for n, node in enumerate([node1, node2, node3]):
         for i in range(100):
             try:
-                node.query("SYSTEM RESTART REPLICA ordinary.t2")
+                restart_replica_for_sure(node, "ordinary.t2", "/clickhouse/t2/replicas/{}".format(n + 1))
                 break
             except Exception as ex:
                 try:
@@ -293,29 +340,34 @@ def test_blocade_leader_twice(started_cluster):
                 dump_zk(node, '/clickhouse/t2', '/clickhouse/t2/replicas/{}'.format(num + 1))
             assert False, "Cannot reconnect for node{}".format(n + 1)
 
-    for n, node in enumerate([node1, node2, node3]):
         for i in range(100):
-            try:
-                node.query("SYSTEM RESTART REPLICA ordinary.t2")
-                node.query("SYSTEM SYNC REPLICA ordinary.t2", timeout=10)
-                break
-            except Exception as ex:
+            all_done = True
+            for n, node in enumerate([node1, node2, node3]):
                 try:
-                    node.query("ATTACH TABLE ordinary.t2")
-                except Exception as attach_ex:
-                    print("Got exception node{}".format(n + 1), smaller_exception(attach_ex))
+                    restart_replica_for_sure(node, "ordinary.t2", "/clickhouse/t2/replicas/{}".format(n + 1))
+                    node.query("SYSTEM SYNC REPLICA ordinary.t2", timeout=10)
+                    break
+                except Exception as ex:
+                    all_done = False
+                    try:
+                        node.query("ATTACH TABLE ordinary.t2")
+                    except Exception as attach_ex:
+                        print("Got exception node{}".format(n + 1), smaller_exception(attach_ex))
 
-                print("Got exception node{}".format(n + 1), smaller_exception(ex))
-                time.sleep(0.5)
+                    print("Got exception node{}".format(n + 1), smaller_exception(ex))
+                    time.sleep(0.5)
+
+            if all_done:
+                break
         else:
             for num, node in enumerate([node1, node2, node3]):
                 dump_zk(node, '/clickhouse/t2', '/clickhouse/t2/replicas/{}'.format(num + 1))
-            assert False, "Cannot reconnect for node{}".format(n + 1)
+            assert False, "Cannot reconnect in i {} retries".format(i)
 
-    assert node1.query("SELECT COUNT() FROM ordinary.t2") == "510\n"
+    assert_eq_with_retry(node1, "SELECT COUNT() FROM ordinary.t2", "510")
     if node2.query("SELECT COUNT() FROM ordinary.t2") != "510\n":
         for num, node in enumerate([node1, node2, node3]):
             dump_zk(node, '/clickhouse/t2', '/clickhouse/t2/replicas/{}'.format(num + 1))
 
-    assert node2.query("SELECT COUNT() FROM ordinary.t2") == "510\n"
-    assert node3.query("SELECT COUNT() FROM ordinary.t2") == "510\n"
+    assert_eq_with_retry(node2, "SELECT COUNT() FROM ordinary.t2", "510")
+    assert_eq_with_retry(node3, "SELECT COUNT() FROM ordinary.t2", "510")
diff --git a/tests/integration/test_keeper_multinode_simple/__init__.py b/tests/integration/test_keeper_multinode_simple/__init__.py
new file mode 100644
index 00000000000..e5a0d9b4834
--- /dev/null
+++ b/tests/integration/test_keeper_multinode_simple/__init__.py
@@ -0,0 +1 @@
+#!/usr/bin/env python3
diff --git a/tests/integration/test_keeper_multinode_simple/configs/enable_keeper1.xml b/tests/integration/test_keeper_multinode_simple/configs/enable_keeper1.xml
new file mode 100644
index 00000000000..5a75bf524ec
--- /dev/null
+++ b/tests/integration/test_keeper_multinode_simple/configs/enable_keeper1.xml
@@ -0,0 +1,41 @@
+<yandex>
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>1</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+
+        <coordination_settings>
+            <operation_timeout_ms>5000</operation_timeout_ms>
+            <session_timeout_ms>10000</session_timeout_ms>
+            <snapshot_distance>75</snapshot_distance>
+            <raft_logs_level>trace</raft_logs_level>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>node1</hostname>
+                <port>44444</port>
+                <can_become_leader>true</can_become_leader>
+                <priority>3</priority>
+            </server>
+            <server>
+                <id>2</id>
+                <hostname>node2</hostname>
+                <port>44444</port>
+                <can_become_leader>true</can_become_leader>
+                <start_as_follower>true</start_as_follower>
+                <priority>2</priority>
+            </server>
+            <server>
+                <id>3</id>
+                <hostname>node3</hostname>
+                <port>44444</port>
+                <can_become_leader>true</can_become_leader>
+                <start_as_follower>true</start_as_follower>
+                <priority>1</priority>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</yandex>
diff --git a/tests/integration/test_keeper_multinode_simple/configs/enable_keeper2.xml b/tests/integration/test_keeper_multinode_simple/configs/enable_keeper2.xml
new file mode 100644
index 00000000000..246fb08c9e7
--- /dev/null
+++ b/tests/integration/test_keeper_multinode_simple/configs/enable_keeper2.xml
@@ -0,0 +1,41 @@
+<yandex>
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>2</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+
+        <coordination_settings>
+            <operation_timeout_ms>5000</operation_timeout_ms>
+            <session_timeout_ms>10000</session_timeout_ms>
+            <snapshot_distance>75</snapshot_distance>
+            <raft_logs_level>trace</raft_logs_level>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>node1</hostname>
+                <port>44444</port>
+                <can_become_leader>true</can_become_leader>
+                <priority>3</priority>
+            </server>
+            <server>
+                <id>2</id>
+                <hostname>node2</hostname>
+                <port>44444</port>
+                <can_become_leader>true</can_become_leader>
+                <start_as_follower>true</start_as_follower>
+                <priority>2</priority>
+            </server>
+            <server>
+                <id>3</id>
+                <hostname>node3</hostname>
+                <port>44444</port>
+                <can_become_leader>true</can_become_leader>
+                <start_as_follower>true</start_as_follower>
+                <priority>1</priority>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</yandex>
diff --git a/tests/integration/test_keeper_multinode_simple/configs/enable_keeper3.xml b/tests/integration/test_keeper_multinode_simple/configs/enable_keeper3.xml
new file mode 100644
index 00000000000..b5958dd7f41
--- /dev/null
+++ b/tests/integration/test_keeper_multinode_simple/configs/enable_keeper3.xml
@@ -0,0 +1,41 @@
+<yandex>
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>3</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+
+        <coordination_settings>
+            <operation_timeout_ms>5000</operation_timeout_ms>
+            <session_timeout_ms>10000</session_timeout_ms>
+            <snapshot_distance>75</snapshot_distance>
+            <raft_logs_level>trace</raft_logs_level>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>node1</hostname>
+                <port>44444</port>
+                <can_become_leader>true</can_become_leader>
+                <priority>3</priority>
+            </server>
+            <server>
+                <id>2</id>
+                <hostname>node2</hostname>
+                <port>44444</port>
+                <can_become_leader>true</can_become_leader>
+                <start_as_follower>true</start_as_follower>
+                <priority>2</priority>
+            </server>
+            <server>
+                <id>3</id>
+                <hostname>node3</hostname>
+                <port>44444</port>
+                <can_become_leader>true</can_become_leader>
+                <start_as_follower>true</start_as_follower>
+                <priority>1</priority>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</yandex>
diff --git a/tests/integration/test_testkeeper_multinode_simple/configs/log_conf.xml b/tests/integration/test_keeper_multinode_simple/configs/log_conf.xml
similarity index 100%
rename from tests/integration/test_testkeeper_multinode_simple/configs/log_conf.xml
rename to tests/integration/test_keeper_multinode_simple/configs/log_conf.xml
diff --git a/tests/integration/test_testkeeper_multinode_simple/configs/use_test_keeper.xml b/tests/integration/test_keeper_multinode_simple/configs/use_keeper.xml
similarity index 100%
rename from tests/integration/test_testkeeper_multinode_simple/configs/use_test_keeper.xml
rename to tests/integration/test_keeper_multinode_simple/configs/use_keeper.xml
diff --git a/tests/integration/test_testkeeper_multinode_simple/test.py b/tests/integration/test_keeper_multinode_simple/test.py
similarity index 93%
rename from tests/integration/test_testkeeper_multinode_simple/test.py
rename to tests/integration/test_keeper_multinode_simple/test.py
index a7ece4bbd56..18420c9910d 100644
--- a/tests/integration/test_testkeeper_multinode_simple/test.py
+++ b/tests/integration/test_keeper_multinode_simple/test.py
@@ -6,11 +6,12 @@ import os
 import time
 from multiprocessing.dummy import Pool
 from helpers.network import PartitionManager
+from helpers.test_tools import assert_eq_with_retry
 
 cluster = ClickHouseCluster(__file__)
-node1 = cluster.add_instance('node1', main_configs=['configs/enable_test_keeper1.xml', 'configs/log_conf.xml', 'configs/use_test_keeper.xml'], stay_alive=True)
-node2 = cluster.add_instance('node2', main_configs=['configs/enable_test_keeper2.xml', 'configs/log_conf.xml', 'configs/use_test_keeper.xml'], stay_alive=True)
-node3 = cluster.add_instance('node3', main_configs=['configs/enable_test_keeper3.xml', 'configs/log_conf.xml', 'configs/use_test_keeper.xml'], stay_alive=True)
+node1 = cluster.add_instance('node1', main_configs=['configs/enable_keeper1.xml', 'configs/log_conf.xml', 'configs/use_keeper.xml'], stay_alive=True)
+node2 = cluster.add_instance('node2', main_configs=['configs/enable_keeper2.xml', 'configs/log_conf.xml', 'configs/use_keeper.xml'], stay_alive=True)
+node3 = cluster.add_instance('node3', main_configs=['configs/enable_keeper3.xml', 'configs/log_conf.xml', 'configs/use_keeper.xml'], stay_alive=True)
 
 from kazoo.client import KazooClient, KazooState
 
@@ -234,6 +235,6 @@ def test_simple_replicated_table(started_cluster):
     node1.query("SYSTEM SYNC REPLICA t", timeout=10)
     node3.query("SYSTEM SYNC REPLICA t", timeout=10)
 
-    assert node1.query("SELECT COUNT() FROM t") == "10\n"
-    assert node2.query("SELECT COUNT() FROM t") == "10\n"
-    assert node3.query("SELECT COUNT() FROM t") == "10\n"
+    assert_eq_with_retry(node1, "SELECT COUNT() FROM t", "10")
+    assert_eq_with_retry(node2, "SELECT COUNT() FROM t", "10")
+    assert_eq_with_retry(node3, "SELECT COUNT() FROM t", "10")
diff --git a/tests/integration/test_keeper_persistent_log/__init__.py b/tests/integration/test_keeper_persistent_log/__init__.py
new file mode 100644
index 00000000000..e5a0d9b4834
--- /dev/null
+++ b/tests/integration/test_keeper_persistent_log/__init__.py
@@ -0,0 +1 @@
+#!/usr/bin/env python3
diff --git a/tests/integration/test_testkeeper_back_to_back/configs/enable_test_keeper.xml b/tests/integration/test_keeper_persistent_log/configs/enable_keeper.xml
similarity index 70%
rename from tests/integration/test_testkeeper_back_to_back/configs/enable_test_keeper.xml
rename to tests/integration/test_keeper_persistent_log/configs/enable_keeper.xml
index 1a441909998..13fb98a0e7a 100644
--- a/tests/integration/test_testkeeper_back_to_back/configs/enable_test_keeper.xml
+++ b/tests/integration/test_keeper_persistent_log/configs/enable_keeper.xml
@@ -1,7 +1,9 @@
 <yandex>
-    <test_keeper_server>
+    <keeper_server>
         <tcp_port>9181</tcp_port>
         <server_id>1</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
 
         <coordination_settings>
             <operation_timeout_ms>5000</operation_timeout_ms>
@@ -16,5 +18,5 @@
                 <port>44444</port>
             </server>
         </raft_configuration>
-    </test_keeper_server>
+    </keeper_server>
 </yandex>
diff --git a/tests/integration/test_keeper_persistent_log/configs/logs_conf.xml b/tests/integration/test_keeper_persistent_log/configs/logs_conf.xml
new file mode 100644
index 00000000000..318a6bca95d
--- /dev/null
+++ b/tests/integration/test_keeper_persistent_log/configs/logs_conf.xml
@@ -0,0 +1,12 @@
+<yandex>
+    <shutdown_wait_unfinished>3</shutdown_wait_unfinished>
+    <logger>
+        <level>trace</level>
+        <log>/var/log/clickhouse-server/log.log</log>
+        <errorlog>/var/log/clickhouse-server/log.err.log</errorlog>
+        <size>1000M</size>
+        <count>10</count>
+        <stderr>/var/log/clickhouse-server/stderr.log</stderr>
+        <stdout>/var/log/clickhouse-server/stdout.log</stdout>
+    </logger>
+</yandex>
diff --git a/tests/integration/test_keeper_persistent_log/configs/use_keeper.xml b/tests/integration/test_keeper_persistent_log/configs/use_keeper.xml
new file mode 100644
index 00000000000..2e48e91bca5
--- /dev/null
+++ b/tests/integration/test_keeper_persistent_log/configs/use_keeper.xml
@@ -0,0 +1,8 @@
+<yandex>
+    <zookeeper>
+            <node index="1">
+            <host>node</host>
+            <port>9181</port>
+        </node>
+    </zookeeper>
+</yandex>
diff --git a/tests/integration/test_keeper_persistent_log/test.py b/tests/integration/test_keeper_persistent_log/test.py
new file mode 100644
index 00000000000..36ee20ae9e7
--- /dev/null
+++ b/tests/integration/test_keeper_persistent_log/test.py
@@ -0,0 +1,124 @@
+#!/usr/bin/env python3
+import pytest
+from helpers.cluster import ClickHouseCluster
+import random
+import string
+import os
+import time
+from kazoo.client import KazooClient, KazooState
+
+
+cluster = ClickHouseCluster(__file__)
+
+node = cluster.add_instance('node', main_configs=['configs/enable_keeper.xml', 'configs/logs_conf.xml', 'configs/use_keeper.xml'], stay_alive=True)
+
+
+def random_string(length):
+    return ''.join(random.choices(string.ascii_lowercase + string.digits, k=length))
+
+def create_random_path(prefix="", depth=1):
+    if depth == 0:
+        return prefix
+    return create_random_path(os.path.join(prefix, random_string(3)), depth - 1)
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+def get_connection_zk(nodename, timeout=30.0):
+    _fake_zk_instance = KazooClient(hosts=cluster.get_instance_ip(nodename) + ":9181", timeout=timeout)
+    def reset_listener(state):
+        nonlocal _fake_zk_instance
+        print("Fake zk callback called for state", state)
+        if state != KazooState.CONNECTED:
+            _fake_zk_instance._reset()
+
+    _fake_zk_instance.add_listener(reset_listener)
+    _fake_zk_instance.start()
+    return _fake_zk_instance
+
+def test_state_after_restart(started_cluster):
+    try:
+        node_zk = None
+        node_zk2 = None
+        node_zk = get_connection_zk("node")
+
+        node_zk.create("/test_state_after_restart", b"somevalue")
+        strs = []
+        for i in range(100):
+            strs.append(random_string(123).encode())
+            node_zk.create("/test_state_after_restart/node" + str(i), strs[i])
+
+        for i in range(100):
+            if i % 7 == 0:
+                node_zk.delete("/test_state_after_restart/node" + str(i))
+
+        node.restart_clickhouse(kill=True)
+
+        node_zk2 = get_connection_zk("node")
+
+        assert node_zk2.get("/test_state_after_restart")[0] == b"somevalue"
+        for i in range(100):
+            if i % 7 == 0:
+                assert node_zk2.exists("/test_state_after_restart/node" + str(i)) is None
+            else:
+                assert len(node_zk2.get("/test_state_after_restart/node" + str(i))[0]) == 123
+                assert node_zk2.get("/test_state_after_restart/node" + str(i))[0] == strs[i]
+    finally:
+        try:
+            if node_zk is not None:
+                node_zk.stop()
+                node_zk.close()
+
+            if node_zk2 is not None:
+                node_zk2.stop()
+                node_zk2.close()
+        except:
+            pass
+
+
+# http://zookeeper-user.578899.n2.nabble.com/Why-are-ephemeral-nodes-written-to-disk-tp7583403p7583418.html
+def test_ephemeral_after_restart(started_cluster):
+    try:
+        node_zk = None
+        node_zk2 = None
+        node_zk = get_connection_zk("node")
+
+        node_zk.create("/test_ephemeral_after_restart", b"somevalue")
+        strs = []
+        for i in range(100):
+            strs.append(random_string(123).encode())
+            node_zk.create("/test_ephemeral_after_restart/node" + str(i), strs[i], ephemeral=True)
+
+        for i in range(100):
+            if i % 7 == 0:
+                node_zk.delete("/test_ephemeral_after_restart/node" + str(i))
+
+        node.restart_clickhouse(kill=True)
+
+        node_zk2 = get_connection_zk("node")
+
+        assert node_zk2.get("/test_ephemeral_after_restart")[0] == b"somevalue"
+        for i in range(100):
+            if i % 7 == 0:
+                assert node_zk2.exists("/test_ephemeral_after_restart/node" + str(i)) is None
+            else:
+                assert len(node_zk2.get("/test_ephemeral_after_restart/node" + str(i))[0]) == 123
+                assert node_zk2.get("/test_ephemeral_after_restart/node" + str(i))[0] == strs[i]
+    finally:
+        try:
+            if node_zk is not None:
+                node_zk.stop()
+                node_zk.close()
+
+            if node_zk2 is not None:
+                node_zk2.stop()
+                node_zk2.close()
+        except:
+            pass
diff --git a/tests/integration/test_keeper_persistent_log_multinode/__init__.py b/tests/integration/test_keeper_persistent_log_multinode/__init__.py
new file mode 100644
index 00000000000..e5a0d9b4834
--- /dev/null
+++ b/tests/integration/test_keeper_persistent_log_multinode/__init__.py
@@ -0,0 +1 @@
+#!/usr/bin/env python3
diff --git a/tests/integration/test_testkeeper_multinode_simple/configs/enable_test_keeper1.xml b/tests/integration/test_keeper_persistent_log_multinode/configs/enable_keeper1.xml
similarity index 84%
rename from tests/integration/test_testkeeper_multinode_simple/configs/enable_test_keeper1.xml
rename to tests/integration/test_keeper_persistent_log_multinode/configs/enable_keeper1.xml
index 4ad76889d1e..073616695cd 100644
--- a/tests/integration/test_testkeeper_multinode_simple/configs/enable_test_keeper1.xml
+++ b/tests/integration/test_keeper_persistent_log_multinode/configs/enable_keeper1.xml
@@ -1,7 +1,9 @@
 <yandex>
-    <test_keeper_server>
+    <keeper_server>
         <tcp_port>9181</tcp_port>
         <server_id>1</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
 
         <coordination_settings>
             <operation_timeout_ms>5000</operation_timeout_ms>
@@ -34,5 +36,5 @@
                 <priority>1</priority>
             </server>
         </raft_configuration>
-    </test_keeper_server>
+    </keeper_server>
 </yandex>
diff --git a/tests/integration/test_testkeeper_multinode_simple/configs/enable_test_keeper2.xml b/tests/integration/test_keeper_persistent_log_multinode/configs/enable_keeper2.xml
similarity index 84%
rename from tests/integration/test_testkeeper_multinode_simple/configs/enable_test_keeper2.xml
rename to tests/integration/test_keeper_persistent_log_multinode/configs/enable_keeper2.xml
index a1954a1e639..c94b6c953fd 100644
--- a/tests/integration/test_testkeeper_multinode_simple/configs/enable_test_keeper2.xml
+++ b/tests/integration/test_keeper_persistent_log_multinode/configs/enable_keeper2.xml
@@ -1,7 +1,9 @@
 <yandex>
-    <test_keeper_server>
+    <keeper_server>
         <tcp_port>9181</tcp_port>
         <server_id>2</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
 
         <coordination_settings>
             <operation_timeout_ms>5000</operation_timeout_ms>
@@ -34,5 +36,5 @@
                 <priority>1</priority>
             </server>
         </raft_configuration>
-    </test_keeper_server>
+    </keeper_server>
 </yandex>
diff --git a/tests/integration/test_testkeeper_multinode_simple/configs/enable_test_keeper3.xml b/tests/integration/test_keeper_persistent_log_multinode/configs/enable_keeper3.xml
similarity index 84%
rename from tests/integration/test_testkeeper_multinode_simple/configs/enable_test_keeper3.xml
rename to tests/integration/test_keeper_persistent_log_multinode/configs/enable_keeper3.xml
index 88d2358138f..10955abab02 100644
--- a/tests/integration/test_testkeeper_multinode_simple/configs/enable_test_keeper3.xml
+++ b/tests/integration/test_keeper_persistent_log_multinode/configs/enable_keeper3.xml
@@ -1,7 +1,9 @@
 <yandex>
-    <test_keeper_server>
+    <keeper_server>
         <tcp_port>9181</tcp_port>
         <server_id>3</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
 
         <coordination_settings>
             <operation_timeout_ms>5000</operation_timeout_ms>
@@ -34,5 +36,5 @@
                 <priority>1</priority>
             </server>
         </raft_configuration>
-    </test_keeper_server>
+    </keeper_server>
 </yandex>
diff --git a/tests/integration/test_keeper_persistent_log_multinode/configs/log_conf.xml b/tests/integration/test_keeper_persistent_log_multinode/configs/log_conf.xml
new file mode 100644
index 00000000000..318a6bca95d
--- /dev/null
+++ b/tests/integration/test_keeper_persistent_log_multinode/configs/log_conf.xml
@@ -0,0 +1,12 @@
+<yandex>
+    <shutdown_wait_unfinished>3</shutdown_wait_unfinished>
+    <logger>
+        <level>trace</level>
+        <log>/var/log/clickhouse-server/log.log</log>
+        <errorlog>/var/log/clickhouse-server/log.err.log</errorlog>
+        <size>1000M</size>
+        <count>10</count>
+        <stderr>/var/log/clickhouse-server/stderr.log</stderr>
+        <stdout>/var/log/clickhouse-server/stdout.log</stdout>
+    </logger>
+</yandex>
diff --git a/tests/integration/test_keeper_persistent_log_multinode/configs/use_keeper.xml b/tests/integration/test_keeper_persistent_log_multinode/configs/use_keeper.xml
new file mode 100644
index 00000000000..b6139005d2f
--- /dev/null
+++ b/tests/integration/test_keeper_persistent_log_multinode/configs/use_keeper.xml
@@ -0,0 +1,16 @@
+<yandex>
+    <zookeeper>
+        <node index="1">
+            <host>node1</host>
+            <port>9181</port>
+        </node>
+        <node index="2">
+            <host>node2</host>
+            <port>9181</port>
+        </node>
+        <node index="3">
+            <host>node3</host>
+            <port>9181</port>
+        </node>
+    </zookeeper>
+</yandex>
diff --git a/tests/integration/test_keeper_persistent_log_multinode/test.py b/tests/integration/test_keeper_persistent_log_multinode/test.py
new file mode 100644
index 00000000000..052f38b0bff
--- /dev/null
+++ b/tests/integration/test_keeper_persistent_log_multinode/test.py
@@ -0,0 +1,98 @@
+#!/usr/bin/env python3
+import pytest
+from helpers.cluster import ClickHouseCluster
+import random
+import string
+import os
+import time
+
+cluster = ClickHouseCluster(__file__)
+node1 = cluster.add_instance('node1', main_configs=['configs/enable_keeper1.xml', 'configs/log_conf.xml', 'configs/use_keeper.xml'], stay_alive=True)
+node2 = cluster.add_instance('node2', main_configs=['configs/enable_keeper2.xml', 'configs/log_conf.xml', 'configs/use_keeper.xml'], stay_alive=True)
+node3 = cluster.add_instance('node3', main_configs=['configs/enable_keeper3.xml', 'configs/log_conf.xml', 'configs/use_keeper.xml'], stay_alive=True)
+
+from kazoo.client import KazooClient, KazooState
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+def get_fake_zk(nodename, timeout=30.0):
+    _fake_zk_instance = KazooClient(hosts=cluster.get_instance_ip(nodename) + ":9181", timeout=timeout)
+    def reset_listener(state):
+        nonlocal _fake_zk_instance
+        print("Fake zk callback called for state", state)
+        if state != KazooState.CONNECTED:
+            _fake_zk_instance._reset()
+
+    _fake_zk_instance.add_listener(reset_listener)
+    _fake_zk_instance.start()
+    return _fake_zk_instance
+
+def stop_zk(zk):
+    try:
+        if zk:
+            zk.stop()
+            zk.close()
+    except:
+        pass
+
+def test_restart_multinode(started_cluster):
+    try:
+        node1_zk = node2_zk = node3_zk = None
+
+        node1_zk = get_fake_zk("node1")
+        node2_zk = get_fake_zk("node2")
+        node3_zk = get_fake_zk("node3")
+
+        for i in range(100):
+            node1_zk.create("/test_read_write_multinode_node" + str(i), ("somedata" + str(i)).encode())
+
+        for i in range(100):
+            if i % 10 == 0:
+                node1_zk.delete("/test_read_write_multinode_node" + str(i))
+
+        node2_zk.sync("/test_read_write_multinode_node0")
+        node3_zk.sync("/test_read_write_multinode_node0")
+
+        for i in range(100):
+            if i % 10 != 0:
+                assert node2_zk.get("/test_read_write_multinode_node" + str(i))[0] == ("somedata" + str(i)).encode()
+                assert node3_zk.get("/test_read_write_multinode_node" + str(i))[0] == ("somedata" + str(i)).encode()
+            else:
+                assert node2_zk.exists("/test_read_write_multinode_node" + str(i)) is None
+                assert node3_zk.exists("/test_read_write_multinode_node" + str(i)) is None
+
+    finally:
+        for zk in [node1_zk, node2_zk, node3_zk]:
+            stop_zk(zk)
+
+    node1.restart_clickhouse(kill=True)
+    node2.restart_clickhouse(kill=True)
+    node3.restart_clickhouse(kill=True)
+    for i in range(100):
+        try:
+            node1_zk = get_fake_zk("node1")
+            node2_zk = get_fake_zk("node2")
+            node3_zk = get_fake_zk("node3")
+            for i in range(100):
+                if i % 10 != 0:
+                    assert node1_zk.get("/test_read_write_multinode_node" + str(i))[0] == ("somedata" + str(i)).encode()
+                    assert node2_zk.get("/test_read_write_multinode_node" + str(i))[0] == ("somedata" + str(i)).encode()
+                    assert node3_zk.get("/test_read_write_multinode_node" + str(i))[0] == ("somedata" + str(i)).encode()
+                else:
+                    assert node1_zk.exists("/test_read_write_multinode_node" + str(i)) is None
+                    assert node2_zk.exists("/test_read_write_multinode_node" + str(i)) is None
+                    assert node3_zk.exists("/test_read_write_multinode_node" + str(i)) is None
+            break
+        except Exception as ex:
+            print("Got exception as ex", ex)
+        finally:
+            for zk in [node1_zk, node2_zk, node3_zk]:
+                stop_zk(zk)
diff --git a/tests/integration/test_keeper_restore_from_snapshot/__init__.py b/tests/integration/test_keeper_restore_from_snapshot/__init__.py
new file mode 100644
index 00000000000..e5a0d9b4834
--- /dev/null
+++ b/tests/integration/test_keeper_restore_from_snapshot/__init__.py
@@ -0,0 +1 @@
+#!/usr/bin/env python3
diff --git a/tests/integration/test_keeper_restore_from_snapshot/configs/enable_keeper1.xml b/tests/integration/test_keeper_restore_from_snapshot/configs/enable_keeper1.xml
new file mode 100644
index 00000000000..526ff259d40
--- /dev/null
+++ b/tests/integration/test_keeper_restore_from_snapshot/configs/enable_keeper1.xml
@@ -0,0 +1,43 @@
+<yandex>
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>1</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+
+        <coordination_settings>
+            <operation_timeout_ms>5000</operation_timeout_ms>
+            <session_timeout_ms>10000</session_timeout_ms>
+            <raft_logs_level>trace</raft_logs_level>
+            <snapshot_distance>100</snapshot_distance>
+            <stale_log_gap>10</stale_log_gap>
+            <reserved_log_items>1</reserved_log_items>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>node1</hostname>
+                <port>44444</port>
+                <can_become_leader>true</can_become_leader>
+                <priority>70</priority>
+            </server>
+            <server>
+                <id>2</id>
+                <hostname>node2</hostname>
+                <port>44444</port>
+                <can_become_leader>true</can_become_leader>
+                <start_as_follower>true</start_as_follower>
+                <priority>20</priority>
+            </server>
+            <server>
+                <id>3</id>
+                <hostname>node3</hostname>
+                <port>44444</port>
+                <can_become_leader>true</can_become_leader>
+                <start_as_follower>true</start_as_follower>
+                <priority>10</priority>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</yandex>
diff --git a/tests/integration/test_keeper_restore_from_snapshot/configs/enable_keeper2.xml b/tests/integration/test_keeper_restore_from_snapshot/configs/enable_keeper2.xml
new file mode 100644
index 00000000000..0c1d3781c3a
--- /dev/null
+++ b/tests/integration/test_keeper_restore_from_snapshot/configs/enable_keeper2.xml
@@ -0,0 +1,43 @@
+<yandex>
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>2</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+
+        <coordination_settings>
+            <operation_timeout_ms>5000</operation_timeout_ms>
+            <session_timeout_ms>10000</session_timeout_ms>
+            <raft_logs_level>trace</raft_logs_level>
+            <snapshot_distance>100</snapshot_distance>
+            <stale_log_gap>10</stale_log_gap>
+            <reserved_log_items>1</reserved_log_items>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>node1</hostname>
+                <port>44444</port>
+                <can_become_leader>true</can_become_leader>
+                <priority>70</priority>
+            </server>
+            <server>
+                <id>2</id>
+                <hostname>node2</hostname>
+                <port>44444</port>
+                <can_become_leader>true</can_become_leader>
+                <start_as_follower>true</start_as_follower>
+                <priority>20</priority>
+            </server>
+            <server>
+                <id>3</id>
+                <hostname>node3</hostname>
+                <port>44444</port>
+                <can_become_leader>true</can_become_leader>
+                <start_as_follower>true</start_as_follower>
+                <priority>10</priority>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</yandex>
diff --git a/tests/integration/test_keeper_restore_from_snapshot/configs/enable_keeper3.xml b/tests/integration/test_keeper_restore_from_snapshot/configs/enable_keeper3.xml
new file mode 100644
index 00000000000..b0694540292
--- /dev/null
+++ b/tests/integration/test_keeper_restore_from_snapshot/configs/enable_keeper3.xml
@@ -0,0 +1,43 @@
+<yandex>
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>3</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+
+        <coordination_settings>
+            <operation_timeout_ms>5000</operation_timeout_ms>
+            <session_timeout_ms>10000</session_timeout_ms>
+            <raft_logs_level>trace</raft_logs_level>
+            <snapshot_distance>100</snapshot_distance>
+            <stale_log_gap>10</stale_log_gap>
+            <reserved_log_items>1</reserved_log_items>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>node1</hostname>
+                <port>44444</port>
+                <can_become_leader>true</can_become_leader>
+                <priority>70</priority>
+            </server>
+            <server>
+                <id>2</id>
+                <hostname>node2</hostname>
+                <port>44444</port>
+                <can_become_leader>true</can_become_leader>
+                <start_as_follower>true</start_as_follower>
+                <priority>20</priority>
+            </server>
+            <server>
+                <id>3</id>
+                <hostname>node3</hostname>
+                <port>44444</port>
+                <can_become_leader>true</can_become_leader>
+                <start_as_follower>true</start_as_follower>
+                <priority>10</priority>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</yandex>
diff --git a/tests/integration/test_keeper_restore_from_snapshot/configs/log_conf.xml b/tests/integration/test_keeper_restore_from_snapshot/configs/log_conf.xml
new file mode 100644
index 00000000000..318a6bca95d
--- /dev/null
+++ b/tests/integration/test_keeper_restore_from_snapshot/configs/log_conf.xml
@@ -0,0 +1,12 @@
+<yandex>
+    <shutdown_wait_unfinished>3</shutdown_wait_unfinished>
+    <logger>
+        <level>trace</level>
+        <log>/var/log/clickhouse-server/log.log</log>
+        <errorlog>/var/log/clickhouse-server/log.err.log</errorlog>
+        <size>1000M</size>
+        <count>10</count>
+        <stderr>/var/log/clickhouse-server/stderr.log</stderr>
+        <stdout>/var/log/clickhouse-server/stdout.log</stdout>
+    </logger>
+</yandex>
diff --git a/tests/integration/test_keeper_restore_from_snapshot/test.py b/tests/integration/test_keeper_restore_from_snapshot/test.py
new file mode 100644
index 00000000000..eee49f8a319
--- /dev/null
+++ b/tests/integration/test_keeper_restore_from_snapshot/test.py
@@ -0,0 +1,106 @@
+#!/usr/bin/env python3
+import pytest
+from helpers.cluster import ClickHouseCluster
+import random
+import string
+import os
+import time
+
+cluster = ClickHouseCluster(__file__)
+node1 = cluster.add_instance('node1', main_configs=['configs/enable_keeper1.xml', 'configs/log_conf.xml'], stay_alive=True)
+node2 = cluster.add_instance('node2', main_configs=['configs/enable_keeper2.xml', 'configs/log_conf.xml'], stay_alive=True)
+node3 = cluster.add_instance('node3', main_configs=['configs/enable_keeper3.xml', 'configs/log_conf.xml'], stay_alive=True)
+
+from kazoo.client import KazooClient, KazooState
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+def get_fake_zk(nodename, timeout=30.0):
+    _fake_zk_instance = KazooClient(hosts=cluster.get_instance_ip(nodename) + ":9181", timeout=timeout)
+    def reset_listener(state):
+        nonlocal _fake_zk_instance
+        print("Fake zk callback called for state", state)
+        if state != KazooState.CONNECTED:
+            _fake_zk_instance._reset()
+
+    _fake_zk_instance.add_listener(reset_listener)
+    _fake_zk_instance.start()
+    return _fake_zk_instance
+
+def stop_zk(zk):
+    try:
+        if zk:
+            zk.stop()
+            zk.close()
+    except:
+        pass
+
+
+def test_recover_from_snapshot(started_cluster):
+    try:
+        node1_zk = node2_zk = node3_zk = None
+        node1_zk = get_fake_zk("node1")
+        node2_zk = get_fake_zk("node2")
+        node3_zk = get_fake_zk("node3")
+
+        node1_zk.create("/test_snapshot_multinode_recover", "somedata".encode())
+
+        node2_zk.sync("/test_snapshot_multinode_recover")
+        node3_zk.sync("/test_snapshot_multinode_recover")
+
+        assert node1_zk.get("/test_snapshot_multinode_recover")[0] == b"somedata"
+        assert node2_zk.get("/test_snapshot_multinode_recover")[0] == b"somedata"
+        assert node3_zk.get("/test_snapshot_multinode_recover")[0] == b"somedata"
+
+        node3.stop_clickhouse(kill=True)
+
+        # at least we will have 2 snapshots
+        for i in range(435):
+            node1_zk.create("/test_snapshot_multinode_recover" + str(i), ("somedata" + str(i)).encode())
+
+        for i in range(435):
+            if i % 10 == 0:
+                node1_zk.delete("/test_snapshot_multinode_recover" + str(i))
+
+    finally:
+        for zk in [node1_zk, node2_zk, node3_zk]:
+            stop_zk(zk)
+
+    # stale node should recover from leader's snapshot
+    # with some sanitizers can start longer than 5 seconds
+    node3.start_clickhouse(20)
+
+    try:
+        node1_zk = node2_zk = node3_zk = None
+        node1_zk = get_fake_zk("node1")
+        node2_zk = get_fake_zk("node2")
+        node3_zk = get_fake_zk("node3")
+
+        node1_zk.sync("/test_snapshot_multinode_recover")
+        node2_zk.sync("/test_snapshot_multinode_recover")
+        node3_zk.sync("/test_snapshot_multinode_recover")
+
+        assert node1_zk.get("/test_snapshot_multinode_recover")[0] == b"somedata"
+        assert node2_zk.get("/test_snapshot_multinode_recover")[0] == b"somedata"
+        assert node3_zk.get("/test_snapshot_multinode_recover")[0] == b"somedata"
+
+        for i in range(435):
+            if i % 10 != 0:
+                assert node1_zk.get("/test_snapshot_multinode_recover" + str(i))[0] == ("somedata" + str(i)).encode()
+                assert node2_zk.get("/test_snapshot_multinode_recover" + str(i))[0] == ("somedata" + str(i)).encode()
+                assert node3_zk.get("/test_snapshot_multinode_recover" + str(i))[0] == ("somedata" + str(i)).encode()
+            else:
+                assert node1_zk.exists("/test_snapshot_multinode_recover" + str(i)) is None
+                assert node2_zk.exists("/test_snapshot_multinode_recover" + str(i)) is None
+                assert node3_zk.exists("/test_snapshot_multinode_recover" + str(i)) is None
+    finally:
+        for zk in [node1_zk, node2_zk, node3_zk]:
+            stop_zk(zk)
diff --git a/tests/integration/test_keeper_secure_client/__init__.py b/tests/integration/test_keeper_secure_client/__init__.py
new file mode 100644
index 00000000000..e5a0d9b4834
--- /dev/null
+++ b/tests/integration/test_keeper_secure_client/__init__.py
@@ -0,0 +1 @@
+#!/usr/bin/env python3
diff --git a/tests/integration/test_keeper_secure_client/configs/dhparam.pem b/tests/integration/test_keeper_secure_client/configs/dhparam.pem
new file mode 100644
index 00000000000..2e6cee0798d
--- /dev/null
+++ b/tests/integration/test_keeper_secure_client/configs/dhparam.pem
@@ -0,0 +1,8 @@
+-----BEGIN DH PARAMETERS-----
+MIIBCAKCAQEAua92DDli13gJ+//ZXyGaggjIuidqB0crXfhUlsrBk9BV1hH3i7fR
+XGP9rUdk2ubnB3k2ejBStL5oBrkHm9SzUFSQHqfDjLZjKoUpOEmuDc4cHvX1XTR5
+Pr1vf5cd0yEncJWG5W4zyUB8k++SUdL2qaeslSs+f491HBLDYn/h8zCgRbBvxhxb
+9qeho1xcbnWeqkN6Kc9bgGozA16P9NLuuLttNnOblkH+lMBf42BSne/TWt3AlGZf
+slKmmZcySUhF8aKfJnLKbkBCFqOtFRh8zBA9a7g+BT/lSANATCDPaAk1YVih2EKb
+dpc3briTDbRsiqg2JKMI7+VdULY9bh3EawIBAg==
+-----END DH PARAMETERS-----
diff --git a/tests/integration/test_keeper_secure_client/configs/enable_secure_keeper.xml b/tests/integration/test_keeper_secure_client/configs/enable_secure_keeper.xml
new file mode 100644
index 00000000000..af815f4a3bc
--- /dev/null
+++ b/tests/integration/test_keeper_secure_client/configs/enable_secure_keeper.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<yandex>
+    <keeper_server>
+        <tcp_port_secure>10181</tcp_port_secure>
+        <server_id>1</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+
+        <coordination_settings>
+            <operation_timeout_ms>10000</operation_timeout_ms>
+            <session_timeout_ms>30000</session_timeout_ms>
+            <raft_logs_level>trace</raft_logs_level>
+            <force_sync>false</force_sync>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>localhost</hostname>
+                <port>44444</port>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</yandex>
diff --git a/tests/integration/test_keeper_secure_client/configs/server.crt b/tests/integration/test_keeper_secure_client/configs/server.crt
new file mode 100644
index 00000000000..7ade2d96273
--- /dev/null
+++ b/tests/integration/test_keeper_secure_client/configs/server.crt
@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIC/TCCAeWgAwIBAgIJANjx1QSR77HBMA0GCSqGSIb3DQEBCwUAMBQxEjAQBgNV
+BAMMCWxvY2FsaG9zdDAgFw0xODA3MzAxODE2MDhaGA8yMjkyMDUxNDE4MTYwOFow
+FDESMBAGA1UEAwwJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAs9uSo6lJG8o8pw0fbVGVu0tPOljSWcVSXH9uiJBwlZLQnhN4SFSFohfI
+4K8U1tBDTnxPLUo/V1K9yzoLiRDGMkwVj6+4+hE2udS2ePTQv5oaMeJ9wrs+5c9T
+4pOtlq3pLAdm04ZMB1nbrEysceVudHRkQbGHzHp6VG29Fw7Ga6YpqyHQihRmEkTU
+7UCYNA+Vk7aDPdMS/khweyTpXYZimaK9f0ECU3/VOeG3fH6Sp2X6FN4tUj/aFXEj
+sRmU5G2TlYiSIUMF2JPdhSihfk1hJVALrHPTU38SOL+GyyBRWdNcrIwVwbpvsvPg
+pryMSNxnpr0AK0dFhjwnupIv5hJIOQIDAQABo1AwTjAdBgNVHQ4EFgQUjPLb3uYC
+kcamyZHK4/EV8jAP0wQwHwYDVR0jBBgwFoAUjPLb3uYCkcamyZHK4/EV8jAP0wQw
+DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAM/ocuDvfPus/KpMVD51j
+4IdlU8R0vmnYLQ+ygzOAo7+hUWP5j0yvq4ILWNmQX6HNvUggCgFv9bjwDFhb/5Vr
+85ieWfTd9+LTjrOzTw4avdGwpX9G+6jJJSSq15tw5ElOIFb/qNA9O4dBiu8vn03C
+L/zRSXrARhSqTW5w/tZkUcSTT+M5h28+Lgn9ysx4Ff5vi44LJ1NnrbJbEAIYsAAD
++UA+4MBFKx1r6hHINULev8+lCfkpwIaeS8RL+op4fr6kQPxnULw8wT8gkuc8I4+L
+P9gg/xDHB44T3ADGZ5Ib6O0DJaNiToO6rnoaaxs0KkotbvDWvRoxEytSbXKoYjYp
+0g==
+-----END CERTIFICATE-----
diff --git a/tests/integration/test_keeper_secure_client/configs/server.key b/tests/integration/test_keeper_secure_client/configs/server.key
new file mode 100644
index 00000000000..f0fb61ac443
--- /dev/null
+++ b/tests/integration/test_keeper_secure_client/configs/server.key
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCz25KjqUkbyjyn
+DR9tUZW7S086WNJZxVJcf26IkHCVktCeE3hIVIWiF8jgrxTW0ENOfE8tSj9XUr3L
+OguJEMYyTBWPr7j6ETa51LZ49NC/mhox4n3Cuz7lz1Pik62WreksB2bThkwHWdus
+TKxx5W50dGRBsYfMenpUbb0XDsZrpimrIdCKFGYSRNTtQJg0D5WTtoM90xL+SHB7
+JOldhmKZor1/QQJTf9U54bd8fpKnZfoU3i1SP9oVcSOxGZTkbZOViJIhQwXYk92F
+KKF+TWElUAusc9NTfxI4v4bLIFFZ01ysjBXBum+y8+CmvIxI3GemvQArR0WGPCe6
+ki/mEkg5AgMBAAECggEATrbIBIxwDJOD2/BoUqWkDCY3dGevF8697vFuZKIiQ7PP
+TX9j4vPq0DfsmDjHvAPFkTHiTQXzlroFik3LAp+uvhCCVzImmHq0IrwvZ9xtB43f
+7Pkc5P6h1l3Ybo8HJ6zRIY3TuLtLxuPSuiOMTQSGRL0zq3SQ5DKuGwkz+kVjHXUN
+MR2TECFwMHKQ5VLrC+7PMpsJYyOMlDAWhRfUalxC55xOXTpaN8TxNnwQ8K2ISVY5
+212Jz/a4hn4LdwxSz3Tiu95PN072K87HLWx3EdT6vW4Ge5P/A3y+smIuNAlanMnu
+plHBRtpATLiTxZt/n6npyrfQVbYjSH7KWhB8hBHtaQKBgQDh9Cq1c/KtqDtE0Ccr
+/r9tZNTUwBE6VP+3OJeKdEdtsfuxjOCkS1oAjgBJiSDOiWPh1DdoDeVZjPKq6pIu
+Mq12OE3Doa8znfCXGbkSzEKOb2unKZMJxzrz99kXt40W5DtrqKPNb24CNqTiY8Aa
+CjtcX+3weat82VRXvph6U8ltMwKBgQDLxjiQQzNoY7qvg7CwJCjf9qq8jmLK766g
+1FHXopqS+dTxDLM8eJSRrpmxGWJvNeNc1uPhsKsKgotqAMdBUQTf7rSTbt4MyoH5
+bUcRLtr+0QTK9hDWMOOvleqNXha68vATkohWYfCueNsC60qD44o8RZAS6UNy3ENq
+cM1cxqe84wKBgQDKkHutWnooJtajlTxY27O/nZKT/HA1bDgniMuKaz4R4Gr1PIez
+on3YW3V0d0P7BP6PWRIm7bY79vkiMtLEKdiKUGWeyZdo3eHvhDb/3DCawtau8L2K
+GZsHVp2//mS1Lfz7Qh8/L/NedqCQ+L4iWiPnZ3THjjwn3CoZ05ucpvrAMwKBgB54
+nay039MUVq44Owub3KDg+dcIU62U+cAC/9oG7qZbxYPmKkc4oL7IJSNecGHA5SbU
+2268RFdl/gLz6tfRjbEOuOHzCjFPdvAdbysanpTMHLNc6FefJ+zxtgk9sJh0C4Jh
+vxFrw9nTKKzfEl12gQ1SOaEaUIO0fEBGbe8ZpauRAoGAMAlGV+2/K4ebvAJKOVTa
+dKAzQ+TD2SJmeR1HZmKDYddNqwtZlzg3v4ZhCk4eaUmGeC1Bdh8MDuB3QQvXz4Dr
+vOIP4UVaOr+uM+7TgAgVnP4/K6IeJGzUDhX93pmpWhODfdu/oojEKVcpCojmEmS1
+KCBtmIrQLqzMpnBpLNuSY+Q=
+-----END PRIVATE KEY-----
diff --git a/tests/integration/test_keeper_secure_client/configs/ssl_conf.xml b/tests/integration/test_keeper_secure_client/configs/ssl_conf.xml
new file mode 100644
index 00000000000..7ca51acde22
--- /dev/null
+++ b/tests/integration/test_keeper_secure_client/configs/ssl_conf.xml
@@ -0,0 +1,26 @@
+<yandex>
+    <openSSL>
+        <server>
+            <certificateFile>/etc/clickhouse-server/config.d/server.crt</certificateFile>
+            <privateKeyFile>/etc/clickhouse-server/config.d/server.key</privateKeyFile>
+            <dhParamsFile>/etc/clickhouse-server/config.d/dhparam.pem</dhParamsFile>
+            <verificationMode>none</verificationMode>
+            <loadDefaultCAFile>true</loadDefaultCAFile>
+            <cacheSessions>true</cacheSessions>
+            <disableProtocols>sslv2,sslv3</disableProtocols>
+            <preferServerCiphers>true</preferServerCiphers>
+        </server>
+        <client>
+            <certificateFile>/etc/clickhouse-server/config.d/server.crt</certificateFile>
+            <privateKeyFile>/etc/clickhouse-server/config.d/server.key</privateKeyFile>
+            <loadDefaultCAFile>true</loadDefaultCAFile>
+            <cacheSessions>true</cacheSessions>
+            <disableProtocols>sslv2,sslv3</disableProtocols>
+            <preferServerCiphers>true</preferServerCiphers>
+            <verificationMode>none</verificationMode>
+            <invalidCertificateHandler>
+                <name>RejectCertificateHandler</name>
+            </invalidCertificateHandler>
+        </client>
+    </openSSL>
+</yandex>
diff --git a/tests/integration/test_keeper_secure_client/configs/use_secure_keeper.xml b/tests/integration/test_keeper_secure_client/configs/use_secure_keeper.xml
new file mode 100644
index 00000000000..a0d19300022
--- /dev/null
+++ b/tests/integration/test_keeper_secure_client/configs/use_secure_keeper.xml
@@ -0,0 +1,9 @@
+<yandex>
+    <zookeeper>
+        <node index="1">
+            <host>node1</host>
+            <port>10181</port>
+            <secure>1</secure>
+        </node>
+    </zookeeper>
+</yandex>
diff --git a/tests/integration/test_keeper_secure_client/test.py b/tests/integration/test_keeper_secure_client/test.py
new file mode 100644
index 00000000000..fe03ed8dcf8
--- /dev/null
+++ b/tests/integration/test_keeper_secure_client/test.py
@@ -0,0 +1,26 @@
+#!/usr/bin/env python3
+import pytest
+from helpers.cluster import ClickHouseCluster
+import string
+import os
+import time
+
+cluster = ClickHouseCluster(__file__)
+node1 = cluster.add_instance('node1', main_configs=['configs/enable_secure_keeper.xml', 'configs/ssl_conf.xml', "configs/dhparam.pem", "configs/server.crt", "configs/server.key"])
+node2 = cluster.add_instance('node2', main_configs=['configs/use_secure_keeper.xml', 'configs/ssl_conf.xml', "configs/server.crt", "configs/server.key"])
+
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+
+def test_connection(started_cluster):
+    # just nothrow
+    node2.query("SELECT * FROM system.zookeeper WHERE path = '/'")
diff --git a/tests/integration/test_keeper_snapshots/__init__.py b/tests/integration/test_keeper_snapshots/__init__.py
new file mode 100644
index 00000000000..e5a0d9b4834
--- /dev/null
+++ b/tests/integration/test_keeper_snapshots/__init__.py
@@ -0,0 +1 @@
+#!/usr/bin/env python3
diff --git a/tests/integration/test_keeper_snapshots/configs/enable_keeper.xml b/tests/integration/test_keeper_snapshots/configs/enable_keeper.xml
new file mode 100644
index 00000000000..11039882f8c
--- /dev/null
+++ b/tests/integration/test_keeper_snapshots/configs/enable_keeper.xml
@@ -0,0 +1,24 @@
+<yandex>
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>1</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+
+        <coordination_settings>
+            <snapshot_distance>10</snapshot_distance>
+            <reserved_log_items>5</reserved_log_items>
+            <operation_timeout_ms>5000</operation_timeout_ms>
+            <session_timeout_ms>10000</session_timeout_ms>
+            <raft_logs_level>trace</raft_logs_level>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>localhost</hostname>
+                <port>44444</port>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</yandex>
diff --git a/tests/integration/test_keeper_snapshots/configs/logs_conf.xml b/tests/integration/test_keeper_snapshots/configs/logs_conf.xml
new file mode 100644
index 00000000000..318a6bca95d
--- /dev/null
+++ b/tests/integration/test_keeper_snapshots/configs/logs_conf.xml
@@ -0,0 +1,12 @@
+<yandex>
+    <shutdown_wait_unfinished>3</shutdown_wait_unfinished>
+    <logger>
+        <level>trace</level>
+        <log>/var/log/clickhouse-server/log.log</log>
+        <errorlog>/var/log/clickhouse-server/log.err.log</errorlog>
+        <size>1000M</size>
+        <count>10</count>
+        <stderr>/var/log/clickhouse-server/stderr.log</stderr>
+        <stdout>/var/log/clickhouse-server/stdout.log</stdout>
+    </logger>
+</yandex>
diff --git a/tests/integration/test_keeper_snapshots/test.py b/tests/integration/test_keeper_snapshots/test.py
new file mode 100644
index 00000000000..9879c0003be
--- /dev/null
+++ b/tests/integration/test_keeper_snapshots/test.py
@@ -0,0 +1,140 @@
+#!/usr/bin/env python3
+
+#!/usr/bin/env python3
+import pytest
+from helpers.cluster import ClickHouseCluster
+import random
+import string
+import os
+import time
+from kazoo.client import KazooClient, KazooState
+
+
+cluster = ClickHouseCluster(__file__)
+
+# clickhouse itself will use external zookeeper
+node = cluster.add_instance('node', main_configs=['configs/enable_keeper.xml', 'configs/logs_conf.xml'], stay_alive=True, with_zookeeper=True)
+
+def random_string(length):
+    return ''.join(random.choices(string.ascii_lowercase + string.digits, k=length))
+
+def create_random_path(prefix="", depth=1):
+    if depth == 0:
+        return prefix
+    return create_random_path(os.path.join(prefix, random_string(3)), depth - 1)
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+def get_connection_zk(nodename, timeout=30.0):
+    _fake_zk_instance = KazooClient(hosts=cluster.get_instance_ip(nodename) + ":9181", timeout=timeout)
+    def reset_listener(state):
+        nonlocal _fake_zk_instance
+        print("Fake zk callback called for state", state)
+        if state != KazooState.CONNECTED:
+            _fake_zk_instance._reset()
+
+    _fake_zk_instance.add_listener(reset_listener)
+    _fake_zk_instance.start()
+    return _fake_zk_instance
+
+def test_state_after_restart(started_cluster):
+    try:
+        node_zk = None
+        node_zk2 = None
+        node_zk = get_connection_zk("node")
+
+        node_zk.create("/test_state_after_restart", b"somevalue")
+        strs = []
+        for i in range(100):
+            strs.append(random_string(123).encode())
+            node_zk.create("/test_state_after_restart/node" + str(i), strs[i])
+
+        existing_children = []
+        for i in range(100):
+            if i % 7 == 0:
+                node_zk.delete("/test_state_after_restart/node" + str(i))
+            else:
+                existing_children.append("node" + str(i))
+
+
+        node.restart_clickhouse(kill=True)
+
+        node_zk2 = get_connection_zk("node")
+
+        assert node_zk2.get("/test_state_after_restart")[0] == b"somevalue"
+        for i in range(100):
+            if i % 7 == 0:
+                assert node_zk2.exists("/test_state_after_restart/node" + str(i)) is None
+            else:
+                data, stat = node_zk2.get("/test_state_after_restart/node" + str(i))
+                assert len(data) == 123
+                assert data == strs[i]
+                assert stat.ephemeralOwner == 0
+
+        assert list(sorted(existing_children)) == list(sorted(node_zk2.get_children("/test_state_after_restart")))
+    finally:
+        try:
+            if node_zk is not None:
+                node_zk.stop()
+                node_zk.close()
+
+            if node_zk2 is not None:
+                node_zk2.stop()
+                node_zk2.close()
+        except:
+            pass
+
+
+def test_ephemeral_after_restart(started_cluster):
+    try:
+        node_zk = None
+        node_zk2 = None
+        node_zk = get_connection_zk("node")
+
+        session_id = node_zk._session_id
+        node_zk.create("/test_ephemeral_after_restart", b"somevalue")
+        strs = []
+        for i in range(100):
+            strs.append(random_string(123).encode())
+            node_zk.create("/test_ephemeral_after_restart/node" + str(i), strs[i], ephemeral=True)
+
+        existing_children = []
+        for i in range(100):
+            if i % 7 == 0:
+                node_zk.delete("/test_ephemeral_after_restart/node" + str(i))
+            else:
+                existing_children.append("node" + str(i))
+
+        node.restart_clickhouse(kill=True)
+
+        node_zk2 = get_connection_zk("node")
+
+        assert node_zk2.get("/test_ephemeral_after_restart")[0] == b"somevalue"
+        for i in range(100):
+            if i % 7 == 0:
+                assert node_zk2.exists("/test_ephemeral_after_restart/node" + str(i)) is None
+            else:
+                data, stat = node_zk2.get("/test_ephemeral_after_restart/node" + str(i))
+                assert len(data) == 123
+                assert data == strs[i]
+                assert stat.ephemeralOwner == session_id
+        assert list(sorted(existing_children)) == list(sorted(node_zk2.get_children("/test_ephemeral_after_restart")))
+    finally:
+        try:
+            if node_zk is not None:
+                node_zk.stop()
+                node_zk.close()
+
+            if node_zk2 is not None:
+                node_zk2.stop()
+                node_zk2.close()
+        except:
+            pass
diff --git a/tests/integration/test_keeper_snapshots_multinode/__init__.py b/tests/integration/test_keeper_snapshots_multinode/__init__.py
new file mode 100644
index 00000000000..e5a0d9b4834
--- /dev/null
+++ b/tests/integration/test_keeper_snapshots_multinode/__init__.py
@@ -0,0 +1 @@
+#!/usr/bin/env python3
diff --git a/tests/integration/test_keeper_snapshots_multinode/configs/enable_keeper1.xml b/tests/integration/test_keeper_snapshots_multinode/configs/enable_keeper1.xml
new file mode 100644
index 00000000000..6826d762652
--- /dev/null
+++ b/tests/integration/test_keeper_snapshots_multinode/configs/enable_keeper1.xml
@@ -0,0 +1,42 @@
+<yandex>
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>1</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+
+        <coordination_settings>
+            <snapshot_distance>10</snapshot_distance>
+            <reserved_log_items>5</reserved_log_items>
+            <operation_timeout_ms>5000</operation_timeout_ms>
+            <session_timeout_ms>10000</session_timeout_ms>
+            <raft_logs_level>trace</raft_logs_level>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>node1</hostname>
+                <port>44444</port>
+                <can_become_leader>true</can_become_leader>
+                <priority>3</priority>
+            </server>
+            <server>
+                <id>2</id>
+                <hostname>node2</hostname>
+                <port>44444</port>
+                <can_become_leader>true</can_become_leader>
+                <start_as_follower>true</start_as_follower>
+                <priority>2</priority>
+            </server>
+            <server>
+                <id>3</id>
+                <hostname>node3</hostname>
+                <port>44444</port>
+                <can_become_leader>true</can_become_leader>
+                <start_as_follower>true</start_as_follower>
+                <priority>1</priority>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</yandex>
diff --git a/tests/integration/test_keeper_snapshots_multinode/configs/enable_keeper2.xml b/tests/integration/test_keeper_snapshots_multinode/configs/enable_keeper2.xml
new file mode 100644
index 00000000000..7f9bdde59da
--- /dev/null
+++ b/tests/integration/test_keeper_snapshots_multinode/configs/enable_keeper2.xml
@@ -0,0 +1,42 @@
+<yandex>
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>2</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+
+        <coordination_settings>
+            <snapshot_distance>10</snapshot_distance>
+            <reserved_log_items>5</reserved_log_items>
+            <operation_timeout_ms>5000</operation_timeout_ms>
+            <session_timeout_ms>10000</session_timeout_ms>
+            <raft_logs_level>trace</raft_logs_level>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>node1</hostname>
+                <port>44444</port>
+                <can_become_leader>true</can_become_leader>
+                <priority>3</priority>
+            </server>
+            <server>
+                <id>2</id>
+                <hostname>node2</hostname>
+                <port>44444</port>
+                <can_become_leader>true</can_become_leader>
+                <start_as_follower>true</start_as_follower>
+                <priority>2</priority>
+            </server>
+            <server>
+                <id>3</id>
+                <hostname>node3</hostname>
+                <port>44444</port>
+                <can_become_leader>true</can_become_leader>
+                <start_as_follower>true</start_as_follower>
+                <priority>1</priority>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</yandex>
diff --git a/tests/integration/test_keeper_snapshots_multinode/configs/enable_keeper3.xml b/tests/integration/test_keeper_snapshots_multinode/configs/enable_keeper3.xml
new file mode 100644
index 00000000000..32e2743e7b8
--- /dev/null
+++ b/tests/integration/test_keeper_snapshots_multinode/configs/enable_keeper3.xml
@@ -0,0 +1,42 @@
+<yandex>
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>3</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+
+        <coordination_settings>
+            <snapshot_distance>10</snapshot_distance>
+            <reserved_log_items>5</reserved_log_items>
+            <operation_timeout_ms>5000</operation_timeout_ms>
+            <session_timeout_ms>10000</session_timeout_ms>
+            <raft_logs_level>trace</raft_logs_level>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>node1</hostname>
+                <port>44444</port>
+                <can_become_leader>true</can_become_leader>
+                <priority>3</priority>
+            </server>
+            <server>
+                <id>2</id>
+                <hostname>node2</hostname>
+                <port>44444</port>
+                <can_become_leader>true</can_become_leader>
+                <start_as_follower>true</start_as_follower>
+                <priority>2</priority>
+            </server>
+            <server>
+                <id>3</id>
+                <hostname>node3</hostname>
+                <port>44444</port>
+                <can_become_leader>true</can_become_leader>
+                <start_as_follower>true</start_as_follower>
+                <priority>1</priority>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</yandex>
diff --git a/tests/integration/test_keeper_snapshots_multinode/configs/log_conf.xml b/tests/integration/test_keeper_snapshots_multinode/configs/log_conf.xml
new file mode 100644
index 00000000000..318a6bca95d
--- /dev/null
+++ b/tests/integration/test_keeper_snapshots_multinode/configs/log_conf.xml
@@ -0,0 +1,12 @@
+<yandex>
+    <shutdown_wait_unfinished>3</shutdown_wait_unfinished>
+    <logger>
+        <level>trace</level>
+        <log>/var/log/clickhouse-server/log.log</log>
+        <errorlog>/var/log/clickhouse-server/log.err.log</errorlog>
+        <size>1000M</size>
+        <count>10</count>
+        <stderr>/var/log/clickhouse-server/stderr.log</stderr>
+        <stdout>/var/log/clickhouse-server/stdout.log</stdout>
+    </logger>
+</yandex>
diff --git a/tests/integration/test_keeper_snapshots_multinode/test.py b/tests/integration/test_keeper_snapshots_multinode/test.py
new file mode 100644
index 00000000000..b4e82d62f09
--- /dev/null
+++ b/tests/integration/test_keeper_snapshots_multinode/test.py
@@ -0,0 +1,98 @@
+#!/usr/bin/env python3
+import pytest
+from helpers.cluster import ClickHouseCluster
+import random
+import string
+import os
+import time
+
+cluster = ClickHouseCluster(__file__)
+node1 = cluster.add_instance('node1', main_configs=['configs/enable_keeper1.xml', 'configs/log_conf.xml'], stay_alive=True)
+node2 = cluster.add_instance('node2', main_configs=['configs/enable_keeper2.xml', 'configs/log_conf.xml'], stay_alive=True)
+node3 = cluster.add_instance('node3', main_configs=['configs/enable_keeper3.xml', 'configs/log_conf.xml'], stay_alive=True)
+
+from kazoo.client import KazooClient, KazooState
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+def get_fake_zk(nodename, timeout=30.0):
+    _fake_zk_instance = KazooClient(hosts=cluster.get_instance_ip(nodename) + ":9181", timeout=timeout)
+    def reset_listener(state):
+        nonlocal _fake_zk_instance
+        print("Fake zk callback called for state", state)
+        if state != KazooState.CONNECTED:
+            _fake_zk_instance._reset()
+
+    _fake_zk_instance.add_listener(reset_listener)
+    _fake_zk_instance.start()
+    return _fake_zk_instance
+
+def stop_zk(zk):
+    try:
+        if zk:
+            zk.stop()
+            zk.close()
+    except:
+        pass
+
+def test_restart_multinode(started_cluster):
+    try:
+        node1_zk = node2_zk = node3_zk = None
+
+        node1_zk = get_fake_zk("node1")
+        node2_zk = get_fake_zk("node2")
+        node3_zk = get_fake_zk("node3")
+
+        for i in range(100):
+            node1_zk.create("/test_read_write_multinode_node" + str(i), ("somedata" + str(i)).encode())
+
+        for i in range(100):
+            if i % 10 == 0:
+                node1_zk.delete("/test_read_write_multinode_node" + str(i))
+
+        node2_zk.sync("/test_read_write_multinode_node0")
+        node3_zk.sync("/test_read_write_multinode_node0")
+
+        for i in range(100):
+            if i % 10 != 0:
+                assert node2_zk.get("/test_read_write_multinode_node" + str(i))[0] == ("somedata" + str(i)).encode()
+                assert node3_zk.get("/test_read_write_multinode_node" + str(i))[0] == ("somedata" + str(i)).encode()
+            else:
+                assert node2_zk.exists("/test_read_write_multinode_node" + str(i)) is None
+                assert node3_zk.exists("/test_read_write_multinode_node" + str(i)) is None
+
+    finally:
+        for zk in [node1_zk, node2_zk, node3_zk]:
+            stop_zk(zk)
+
+    node1.restart_clickhouse(kill=True)
+    node2.restart_clickhouse(kill=True)
+    node3.restart_clickhouse(kill=True)
+    for i in range(100):
+        try:
+            node1_zk = get_fake_zk("node1")
+            node2_zk = get_fake_zk("node2")
+            node3_zk = get_fake_zk("node3")
+            for i in range(100):
+                if i % 10 != 0:
+                    assert node1_zk.get("/test_read_write_multinode_node" + str(i))[0] == ("somedata" + str(i)).encode()
+                    assert node2_zk.get("/test_read_write_multinode_node" + str(i))[0] == ("somedata" + str(i)).encode()
+                    assert node3_zk.get("/test_read_write_multinode_node" + str(i))[0] == ("somedata" + str(i)).encode()
+                else:
+                    assert node1_zk.exists("/test_read_write_multinode_node" + str(i)) is None
+                    assert node2_zk.exists("/test_read_write_multinode_node" + str(i)) is None
+                    assert node3_zk.exists("/test_read_write_multinode_node" + str(i)) is None
+            break
+        except Exception as ex:
+            print("Got exception as ex", ex)
+        finally:
+            for zk in [node1_zk, node2_zk, node3_zk]:
+                stop_zk(zk)
diff --git a/tests/integration/test_library_bridge/__init__.py b/tests/integration/test_library_bridge/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/integration/test_library_bridge/configs/config.d/config.xml b/tests/integration/test_library_bridge/configs/config.d/config.xml
new file mode 100644
index 00000000000..9bea75fbb6f
--- /dev/null
+++ b/tests/integration/test_library_bridge/configs/config.d/config.xml
@@ -0,0 +1,12 @@
+<yandex>
+    <dictionaries_lib_path>/etc/clickhouse-server/config.d/dictionaries_lib</dictionaries_lib_path>
+    <logger>
+        <level>trace</level>
+        <log>/var/log/clickhouse-server/log.log</log>
+        <errorlog>/var/log/clickhouse-server/log.err.log</errorlog>
+        <size>1000M</size>
+        <count>10</count>
+        <stderr>/var/log/clickhouse-server/stderr.log</stderr>
+        <stdout>/var/log/clickhouse-server/stdout.log</stdout>
+    </logger>
+</yandex>
diff --git a/tests/integration/test_library_bridge/configs/dict_lib.cpp b/tests/integration/test_library_bridge/configs/dict_lib.cpp
new file mode 100644
index 00000000000..be25804ed64
--- /dev/null
+++ b/tests/integration/test_library_bridge/configs/dict_lib.cpp
@@ -0,0 +1,298 @@
+/// c++ sample dictionary library
+
+#include <cstdint>
+#include <functional>
+#include <iostream>
+#include <memory>
+#include <sstream>
+#include <vector>
+
+namespace ClickHouseLibrary
+{
+using CString = const char *;
+using ColumnName = CString;
+using ColumnNames = ColumnName[];
+
+struct CStrings
+{
+    CString * data = nullptr;
+    uint64_t size = 0;
+};
+
+struct VectorUInt64
+{
+    const uint64_t * data = nullptr;
+    uint64_t size = 0;
+};
+
+struct ColumnsUInt64
+{
+    VectorUInt64 * data = nullptr;
+    uint64_t size = 0;
+};
+
+struct Field
+{
+    const void * data = nullptr;
+    uint64_t size = 0;
+};
+
+struct Row
+{
+    const Field * data = nullptr;
+    uint64_t size = 0;
+};
+
+struct Table
+{
+    const Row * data = nullptr;
+    uint64_t size = 0;
+    uint64_t error_code = 0; // 0 = ok; !0 = error, with message in error_string
+    const char * error_string = nullptr;
+};
+
+enum LogLevel
+{
+    FATAL = 1,
+    CRITICAL,
+    ERROR,
+    WARNING,
+    NOTICE,
+    INFORMATION,
+    DEBUG,
+    TRACE,
+};
+
+void log(LogLevel level, CString msg);
+}
+
+
+#define LOG(logger, message)                                             \
+    do                                                                   \
+    {                                                                    \
+        std::stringstream builder;                                       \
+        builder << message;                                              \
+        (logger)(ClickHouseLibrary::INFORMATION, builder.str().c_str()); \
+    } while (false)
+
+
+struct LibHolder
+{
+    std::function<void(ClickHouseLibrary::LogLevel, ClickHouseLibrary::CString)> log;
+};
+
+
+struct DataHolder
+{
+    std::vector<std::vector<uint64_t>> dataHolder; // Actual data storage
+    std::vector<std::vector<ClickHouseLibrary::Field>> fieldHolder; // Pointers and sizes of data
+    std::unique_ptr<ClickHouseLibrary::Row[]> rowHolder;
+    ClickHouseLibrary::Table ctable; // Result data prepared for transfer via c-style interface
+    LibHolder * lib = nullptr;
+
+    size_t num_rows;
+    size_t num_cols;
+};
+
+
+template <typename T>
+void MakeColumnsFromVector(T * ptr)
+{
+    if (ptr->dataHolder.empty())
+    {
+        LOG(ptr->lib->log, "generating null values, cols: " << ptr->num_cols);
+        std::vector<ClickHouseLibrary::Field> fields;
+        for (size_t i = 0; i < ptr->num_cols; ++i)
+            fields.push_back({nullptr, 0});
+        ptr->fieldHolder.push_back(fields);
+    }
+    else
+    {
+        for (const auto & row : ptr->dataHolder)
+        {
+            std::vector<ClickHouseLibrary::Field> fields;
+            for (const auto & field : row)
+                fields.push_back({&field, sizeof(field)});
+            ptr->fieldHolder.push_back(fields);
+        }
+    }
+
+    const auto rows_num = ptr->fieldHolder.size();
+    ptr->rowHolder = std::make_unique<ClickHouseLibrary::Row[]>(rows_num);
+    size_t i = 0;
+    for (auto & row : ptr->fieldHolder)
+    {
+        ptr->rowHolder[i].size = row.size();
+        ptr->rowHolder[i].data = row.data();
+        ++i;
+    }
+    ptr->ctable.size = rows_num;
+    ptr->ctable.data = ptr->rowHolder.get();
+}
+
+
+extern "C"
+{
+
+void * ClickHouseDictionary_v3_loadIds(void * data_ptr,
+    ClickHouseLibrary::CStrings * settings,
+    ClickHouseLibrary::CStrings * columns,
+    const struct ClickHouseLibrary::VectorUInt64 * ids)
+{
+    auto ptr = static_cast<DataHolder *>(data_ptr);
+
+    if (ids)
+        LOG(ptr->lib->log, "loadIds lib call ptr=" << data_ptr << " => " << ptr << " size=" << ids->size);
+
+    if (!ptr)
+        return nullptr;
+
+    if (settings)
+    {
+        LOG(ptr->lib->log, "settings passed: " << settings->size);
+        for (size_t i = 0; i < settings->size; ++i)
+        {
+            LOG(ptr->lib->log, "setting " << i << " :" << settings->data[i]);
+        }
+    }
+
+    if (columns)
+    {
+        LOG(ptr->lib->log, "columns passed:" << columns->size);
+        for (size_t i = 0; i < columns->size; ++i)
+        {
+            LOG(ptr->lib->log, "column " << i << " :" << columns->data[i]);
+        }
+    }
+
+    if (ids)
+    {
+        LOG(ptr->lib->log, "ids passed: " << ids->size);
+        for (size_t i = 0; i < ids->size; ++i)
+        {
+            LOG(ptr->lib->log, "id " << i << " :" << ids->data[i] << " generating.");
+            ptr->dataHolder.emplace_back(std::vector<uint64_t>{ids->data[i], ids->data[i] + 100, ids->data[i] + 200, ids->data[i] + 300});
+        }
+    }
+
+    MakeColumnsFromVector(ptr);
+    return static_cast<void *>(&ptr->ctable);
+}
+
+
+void * ClickHouseDictionary_v3_loadAll(void * data_ptr, ClickHouseLibrary::CStrings * settings, ClickHouseLibrary::CStrings * /*columns*/)
+{
+    auto ptr = static_cast<DataHolder *>(data_ptr);
+
+    LOG(ptr->lib->log, "loadAll lib call ptr=" << data_ptr << " => " << ptr);
+
+    if (!ptr)
+        return nullptr;
+
+    size_t num_rows = 0, num_cols = 4;
+    std::string test_type;
+    std::vector<std::string> settings_values;
+    if (settings)
+    {
+        LOG(ptr->lib->log, "settings size: " << settings->size);
+
+        for (size_t i = 0; i < settings->size; ++i)
+        {
+            std::string setting_name = settings->data[i];
+            std::string setting_value = settings->data[++i];
+            LOG(ptr->lib->log, "setting " + std::to_string(i) + " name " + setting_name + " value " + setting_value);
+
+            if (setting_name == "num_rows")
+                num_rows = std::atoi(setting_value.data());
+            else if (setting_name == "num_cols")
+                num_cols = std::atoi(setting_value.data());
+            else if (setting_name == "test_type")
+                test_type = setting_value;
+            else
+            {
+                LOG(ptr->lib->log, "Adding setting " + setting_name);
+                settings_values.push_back(setting_value);
+            }
+        }
+    }
+
+    if (test_type == "test_simple")
+    {
+        for (size_t i = 0; i < 10; ++i)
+        {
+            LOG(ptr->lib->log, "id " << i << " :" << " generating.");
+            ptr->dataHolder.emplace_back(std::vector<uint64_t>{i, i + 10, i + 20, i + 30});
+        }
+    }
+    else if (test_type == "test_many_rows" && num_rows)
+    {
+        for (size_t i = 0; i < num_rows; ++i)
+        {
+            ptr->dataHolder.emplace_back(std::vector<uint64_t>{i, i, i, i});
+        }
+    }
+
+    ptr->num_cols = num_cols;
+    ptr->num_rows = num_rows;
+
+    MakeColumnsFromVector(ptr);
+    return static_cast<void *>(&ptr->ctable);
+}
+
+
+void * ClickHouseDictionary_v3_loadKeys(void * data_ptr, ClickHouseLibrary::CStrings * settings, ClickHouseLibrary::Table * requested_keys)
+{
+    auto ptr = static_cast<DataHolder *>(data_ptr);
+    LOG(ptr->lib->log, "loadKeys lib call ptr=" << data_ptr << " => " << ptr);
+    if (settings)
+    {
+        LOG(ptr->lib->log, "settings passed: " << settings->size);
+        for (size_t i = 0; i < settings->size; ++i)
+        {
+            LOG(ptr->lib->log, "setting " << i << " :" << settings->data[i]);
+        }
+    }
+    if (requested_keys)
+    {
+        LOG(ptr->lib->log, "requested_keys columns passed: " << requested_keys->size);
+        for (size_t i = 0; i < requested_keys->size; ++i)
+        {
+            LOG(ptr->lib->log, "requested_keys at column " << i << " passed: " << requested_keys->data[i].size);
+            ptr->dataHolder.emplace_back(std::vector<uint64_t>{i, i + 100, i + 200, i + 300});
+        }
+    }
+
+    MakeColumnsFromVector(ptr);
+    return static_cast<void *>(&ptr->ctable);
+}
+
+void * ClickHouseDictionary_v3_libNew(
+    ClickHouseLibrary::CStrings * /*settings*/, void (*logFunc)(ClickHouseLibrary::LogLevel, ClickHouseLibrary::CString))
+{
+    auto lib_ptr = new LibHolder;
+    lib_ptr->log = logFunc;
+    return lib_ptr;
+}
+
+void ClickHouseDictionary_v3_libDelete(void * lib_ptr)
+{
+    auto ptr = static_cast<LibHolder *>(lib_ptr);
+    delete ptr;
+    return;
+}
+
+void * ClickHouseDictionary_v3_dataNew(void * lib_ptr)
+{
+    auto data_ptr = new DataHolder;
+    data_ptr->lib = static_cast<decltype(data_ptr->lib)>(lib_ptr);
+    return data_ptr;
+}
+
+void ClickHouseDictionary_v3_dataDelete(void * /*lib_ptr*/, void * data_ptr)
+{
+    auto ptr = static_cast<DataHolder *>(data_ptr);
+    delete ptr;
+    return;
+}
+
+}
diff --git a/tests/integration/test_library_bridge/configs/dictionaries/dict1.xml b/tests/integration/test_library_bridge/configs/dictionaries/dict1.xml
new file mode 100644
index 00000000000..9be21aea1e3
--- /dev/null
+++ b/tests/integration/test_library_bridge/configs/dictionaries/dict1.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0"?>
+<yandex>
+    <dictionary>
+        <name>dict1</name>
+        <source>
+            <library>
+                <path>/etc/clickhouse-server/config.d/dictionaries_lib/dict_lib.so</path>
+                <settings>
+                    <test_type>test_simple</test_type>
+                    <key>nice key</key>
+                    <value>interesting, nice value</value>
+                    <table>//home/interesting-path/to-/interesting_data</table>
+                    <pass>11</pass>
+                    <user>user-u -user</user>
+                </settings>
+            </library>
+        </source>
+        <layout>
+            <hashed/>
+        </layout>
+        <lifetime>
+            <max>1</max>
+            <min>1</min>
+        </lifetime>
+        <structure>
+            <id>
+                <name>key</name>
+                <type>UInt64</type>
+            </id>
+            <attribute>
+                <name>value1</name>
+                <null_value></null_value>
+                <type>UInt64</type>
+            </attribute>
+            <attribute>
+                <name>value2</name>
+                <null_value></null_value>
+                <type>UInt64</type>
+            </attribute>
+            <attribute>
+                <name>value3</name>
+                <null_value></null_value>
+                <type>UInt64</type>
+            </attribute>
+        </structure>
+    </dictionary>
+    <dictionary>
+        <name>dict2</name>
+        <source>
+            <library>
+                <path>/etc/clickhouse-server/config.d/dictionaries_lib/dict_lib.so</path>
+                <settings>
+                    <test_type>test_nulls</test_type>
+                </settings>
+            </library>
+        </source>
+        <layout>
+            <hashed/>
+        </layout>
+        <lifetime>
+            <max>1</max>
+            <min>1</min>
+        </lifetime>
+        <structure>
+            <id>
+                <name>key</name>
+                <type>UInt64</type>
+            </id>
+            <attribute>
+                <name>value1</name>
+                <null_value>12</null_value>
+                <type>UInt64</type>
+            </attribute>
+            <attribute>
+                <name>value2</name>
+                <null_value>12</null_value>
+                <type>UInt64</type>
+            </attribute>
+            <attribute>
+                <name>value3</name>
+                <null_value>12</null_value>
+                <type>UInt64</type>
+            </attribute>
+        </structure>
+    </dictionary>
+</yandex>
diff --git a/tests/integration/test_library_bridge/configs/enable_dict.xml b/tests/integration/test_library_bridge/configs/enable_dict.xml
new file mode 100644
index 00000000000..264f1f667b1
--- /dev/null
+++ b/tests/integration/test_library_bridge/configs/enable_dict.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<yandex>
+    <dictionaries_config>/etc/clickhouse-server/config.d/dict*.xml</dictionaries_config>
+</yandex>
diff --git a/tests/integration/test_library_bridge/configs/log_conf.xml b/tests/integration/test_library_bridge/configs/log_conf.xml
new file mode 100644
index 00000000000..eed7a435b68
--- /dev/null
+++ b/tests/integration/test_library_bridge/configs/log_conf.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<yandex>
+    <logger>
+        <level>trace</level>
+        <log>/var/log/clickhouse-server/log.log</log>
+        <errorlog>/var/log/clickhouse-server/log.err.log</errorlog>
+        <size>1000M</size>
+        <count>10</count>
+        <stderr>/var/log/clickhouse-server/stderr.log</stderr>
+        <stdout>/var/log/clickhouse-server/stdout.log</stdout>
+        <library_bridge_log>/var/log/clickhouse-server/clickhouse-library-bridge.log</library_bridge_log>
+        <library_bridge_errlog>/var/log/clickhouse-server/clickhouse-library-bridge.err.log</library_bridge_errlog>
+        <library_bridge_stdout>/var/log/clickhouse-server/clickhouse-library-bridge.stdout</library_bridge_stdout>
+        <library_bridge_stderr>/var/log/clickhouse-server/clickhouse-library-bridge.stderr</library_bridge_stderr>
+        <library_bridge_level>trace</library_bridge_level>
+    </logger>
+</yandex>
diff --git a/tests/integration/test_library_bridge/test.py b/tests/integration/test_library_bridge/test.py
new file mode 100644
index 00000000000..f0aeb85a52b
--- /dev/null
+++ b/tests/integration/test_library_bridge/test.py
@@ -0,0 +1,154 @@
+import os
+import os.path as p
+import pytest
+import time
+
+from helpers.cluster import ClickHouseCluster, run_and_check
+
+cluster = ClickHouseCluster(__file__)
+
+instance = cluster.add_instance('instance',
+        main_configs=[
+            'configs/enable_dict.xml',
+            'configs/config.d/config.xml',
+            'configs/dictionaries/dict1.xml',
+            'configs/log_conf.xml'])
+
+@pytest.fixture(scope="module")
+def ch_cluster():
+    try:
+        cluster.start()
+        instance.query('CREATE DATABASE test')
+        container_lib_path = '/etc/clickhouse-server/config.d/dictionarites_lib/dict_lib.cpp'
+
+        instance.copy_file_to_container(os.path.join(os.path.dirname(os.path.realpath(__file__)), "configs/dict_lib.cpp"),
+                                                        "/etc/clickhouse-server/config.d/dictionaries_lib/dict_lib.cpp")
+
+        instance.query("SYSTEM RELOAD CONFIG")
+
+        instance.exec_in_container(
+                ['bash', '-c',
+                '/usr/bin/g++ -shared -o /etc/clickhouse-server/config.d/dictionaries_lib/dict_lib.so -fPIC /etc/clickhouse-server/config.d/dictionaries_lib/dict_lib.cpp'],
+                user='root')
+
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+
+@pytest.fixture(autouse=True)
+def setup_teardown():
+    yield  # run test
+
+
+def test_load_all(ch_cluster):
+    instance.query('''
+        CREATE DICTIONARY lib_dict (key UInt64, value1 UInt64, value2 UInt64, value3 UInt64)
+        PRIMARY KEY key
+        SOURCE(library(
+            PATH '/etc/clickhouse-server/config.d/dictionaries_lib/dict_lib.so'
+            SETTINGS (test_type test_simple)))
+        LAYOUT(HASHED())
+        LIFETIME (MIN 0 MAX 10)
+    ''')
+
+    result = instance.query('SELECT * FROM lib_dict ORDER BY key')
+    expected = (
+"0\t10\t20\t30\n" +
+"1\t11\t21\t31\n" +
+"2\t12\t22\t32\n" +
+"3\t13\t23\t33\n" +
+"4\t14\t24\t34\n" +
+"5\t15\t25\t35\n" +
+"6\t16\t26\t36\n" +
+"7\t17\t27\t37\n" +
+"8\t18\t28\t38\n" +
+"9\t19\t29\t39\n"
+)
+    instance.query('SYSTEM RELOAD DICTIONARY dict1')
+    instance.query('DROP DICTIONARY lib_dict')
+    assert(result == expected)
+
+    instance.query("""
+        CREATE TABLE IF NOT EXISTS `dict1_table` (
+             key UInt64, value1 UInt64, value2 UInt64, value3 UInt64
+        ) ENGINE = Dictionary(dict1)
+        """)
+
+    result = instance.query('SELECT * FROM dict1_table ORDER BY key')
+    assert(result == expected)
+
+
+def test_load_ids(ch_cluster):
+    instance.query('''
+        CREATE DICTIONARY lib_dict_c (key UInt64, value1 UInt64, value2 UInt64, value3 UInt64)
+        PRIMARY KEY key SOURCE(library(PATH '/etc/clickhouse-server/config.d/dictionaries_lib/dict_lib.so'))
+        LAYOUT(CACHE(
+        SIZE_IN_CELLS 10000000
+        BLOCK_SIZE 4096
+        FILE_SIZE 16777216
+        READ_BUFFER_SIZE 1048576
+        MAX_STORED_KEYS 1048576))
+        LIFETIME(2) ;
+    ''')
+
+    result = instance.query('''select dictGet(lib_dict_c, 'value1', toUInt64(0));''')
+    assert(result.strip() == '100')
+    result = instance.query('''select dictGet(lib_dict_c, 'value1', toUInt64(1));''')
+    assert(result.strip() == '101')
+    instance.query('DROP DICTIONARY lib_dict_c')
+
+
+def test_load_keys(ch_cluster):
+    instance.query('''
+        CREATE DICTIONARY lib_dict_ckc (key UInt64, value1 UInt64, value2 UInt64, value3 UInt64)
+        PRIMARY KEY key
+        SOURCE(library(PATH '/etc/clickhouse-server/config.d/dictionaries_lib/dict_lib.so'))
+        LAYOUT(COMPLEX_KEY_CACHE( SIZE_IN_CELLS 10000000))
+        LIFETIME(2);
+    ''')
+
+    result = instance.query('''select dictGet(lib_dict_ckc, 'value1', tuple(toUInt64(0)));''')
+    assert(result.strip() == '100')
+    result = instance.query('''select dictGet(lib_dict_ckc, 'value2', tuple(toUInt64(0)));''')
+    assert(result.strip() == '200')
+    instance.query('DROP DICTIONARY lib_dict_ckc')
+
+
+def test_load_all_many_rows(ch_cluster):
+    num_rows = [1000, 10000, 100000, 1000000]
+    for num in num_rows:
+        instance.query('''
+            CREATE DICTIONARY lib_dict (key UInt64, value1 UInt64, value2 UInt64, value3 UInt64)
+            PRIMARY KEY key
+            SOURCE(library(
+                PATH '/etc/clickhouse-server/config.d/dictionaries_lib/dict_lib.so'
+                SETTINGS (num_rows {} test_type test_many_rows)))
+            LAYOUT(HASHED())
+            LIFETIME (MIN 0 MAX 10)
+        '''.format(num))
+
+        result = instance.query('SELECT * FROM lib_dict ORDER BY key')
+        expected = instance.query('SELECT number, number, number, number FROM numbers({})'.format(num))
+        instance.query('DROP DICTIONARY lib_dict')
+        assert(result == expected)
+
+
+def test_null_values(ch_cluster):
+    instance.query('SYSTEM RELOAD DICTIONARY dict2')
+    instance.query("""
+        CREATE TABLE IF NOT EXISTS `dict2_table` (
+             key UInt64, value1 UInt64, value2 UInt64, value3 UInt64
+        ) ENGINE = Dictionary(dict2)
+        """)
+
+    result = instance.query('SELECT * FROM dict2_table ORDER BY key')
+    expected = "0\t12\t12\t12\n"
+    assert(result == expected)
+
+
+if __name__ == '__main__':
+    cluster.start()
+    input("Cluster created, press any key to destroy...")
+    cluster.shutdown()
diff --git a/tests/integration/test_limited_replicated_fetches/configs/custom_settings.xml b/tests/integration/test_limited_replicated_fetches/configs/custom_settings.xml
new file mode 100644
index 00000000000..b5e6bb80891
--- /dev/null
+++ b/tests/integration/test_limited_replicated_fetches/configs/custom_settings.xml
@@ -0,0 +1,7 @@
+<yandex>
+    <profiles>
+        <default>
+            <background_fetches_pool_size>3</background_fetches_pool_size>
+        </default>
+    </profiles>
+</yandex>
diff --git a/tests/integration/test_limited_replicated_fetches/test.py b/tests/integration/test_limited_replicated_fetches/test.py
index 9b9b8befd67..7b0c7aed15d 100644
--- a/tests/integration/test_limited_replicated_fetches/test.py
+++ b/tests/integration/test_limited_replicated_fetches/test.py
@@ -6,12 +6,14 @@ from helpers.cluster import ClickHouseCluster
 from helpers.network import PartitionManager
 import random
 import string
+import os
 
 cluster = ClickHouseCluster(__file__)
-node1 = cluster.add_instance('node1', with_zookeeper=True)
-node2 = cluster.add_instance('node2', with_zookeeper=True)
+SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
+node1 = cluster.add_instance('node1', user_configs=['configs/custom_settings.xml'], with_zookeeper=True)
+node2 = cluster.add_instance('node2', user_configs=['configs/custom_settings.xml'], with_zookeeper=True)
 
-DEFAULT_MAX_THREADS_FOR_FETCH = 3
+MAX_THREADS_FOR_FETCH = 3
 
 @pytest.fixture(scope="module")
 def started_cluster():
@@ -64,11 +66,11 @@ def test_limited_fetches(started_cluster):
                 time.sleep(0.1)
 
     for concurrently_fetching_parts in fetches_result:
-        if len(concurrently_fetching_parts) > DEFAULT_MAX_THREADS_FOR_FETCH:
-            assert False, "Found more than {} concurrently fetching parts: {}".format(DEFAULT_MAX_THREADS_FOR_FETCH, ', '.join(concurrently_fetching_parts))
+        if len(concurrently_fetching_parts) > MAX_THREADS_FOR_FETCH:
+            assert False, "Found more than {} concurrently fetching parts: {}".format(MAX_THREADS_FOR_FETCH, ', '.join(concurrently_fetching_parts))
 
     assert max([len(parts) for parts in fetches_result]) == 3, "Strange, but we don't utilize max concurrent threads for fetches"
     assert(max(background_fetches_metric)) == 3, "Just checking metric consistent with table"
 
     node1.query("DROP TABLE IF EXISTS t SYNC")
-    node2.query("DROP TABLE IF EXISTS t SYNC")
\ No newline at end of file
+    node2.query("DROP TABLE IF EXISTS t SYNC")
diff --git a/tests/integration/test_materialize_mysql_database/configs/users_disable_bytes_settings.xml b/tests/integration/test_materialize_mysql_database/configs/users_disable_bytes_settings.xml
new file mode 100644
index 00000000000..4516cb80c17
--- /dev/null
+++ b/tests/integration/test_materialize_mysql_database/configs/users_disable_bytes_settings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<yandex>
+    <profiles>
+        <default>
+            <allow_experimental_database_materialize_mysql>1</allow_experimental_database_materialize_mysql>
+            <default_database_engine>Atomic</default_database_engine>
+            <external_storage_max_read_rows>1</external_storage_max_read_rows>
+            <external_storage_max_read_bytes>0</external_storage_max_read_bytes>
+        </default>
+    </profiles>
+
+    <users>
+        <default>
+            <password></password>
+            <networks incl="networks" replace="replace">
+                <ip>::/0</ip>
+            </networks>
+            <profile>default</profile>
+        </default>
+    </users>
+</yandex>
diff --git a/tests/integration/test_materialize_mysql_database/configs/users_disable_rows_settings.xml b/tests/integration/test_materialize_mysql_database/configs/users_disable_rows_settings.xml
new file mode 100644
index 00000000000..dea20eb9e12
--- /dev/null
+++ b/tests/integration/test_materialize_mysql_database/configs/users_disable_rows_settings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<yandex>
+    <profiles>
+        <default>
+            <allow_experimental_database_materialize_mysql>1</allow_experimental_database_materialize_mysql>
+            <default_database_engine>Atomic</default_database_engine>
+            <external_storage_max_read_rows>0</external_storage_max_read_rows>
+            <external_storage_max_read_bytes>1</external_storage_max_read_bytes>
+        </default>
+    </profiles>
+
+    <users>
+        <default>
+            <password></password>
+            <networks incl="networks" replace="replace">
+                <ip>::/0</ip>
+            </networks>
+            <profile>default</profile>
+        </default>
+    </users>
+</yandex>
diff --git a/tests/integration/test_materialize_mysql_database/materialize_with_ddl.py b/tests/integration/test_materialize_mysql_database/materialize_with_ddl.py
index c9be2387fc7..813a654add3 100644
--- a/tests/integration/test_materialize_mysql_database/materialize_with_ddl.py
+++ b/tests/integration/test_materialize_mysql_database/materialize_with_ddl.py
@@ -117,6 +117,45 @@ def dml_with_materialize_mysql_database(clickhouse_node, mysql_node, service_nam
     mysql_node.query("DROP DATABASE test_database")
 
 
+def materialize_mysql_database_with_views(clickhouse_node, mysql_node, service_name):
+    mysql_node.query("DROP DATABASE IF EXISTS test_database")
+    clickhouse_node.query("DROP DATABASE IF EXISTS test_database")
+    mysql_node.query("CREATE DATABASE test_database DEFAULT CHARACTER SET 'utf8'")
+    # existed before the mapping was created
+
+    mysql_node.query("CREATE TABLE test_database.test_table_1 ("
+                     "`key` INT NOT NULL PRIMARY KEY, "
+                     "unsigned_tiny_int TINYINT UNSIGNED, tiny_int TINYINT, "
+                     "unsigned_small_int SMALLINT UNSIGNED, small_int SMALLINT, "
+                     "unsigned_medium_int MEDIUMINT UNSIGNED, medium_int MEDIUMINT, "
+                     "unsigned_int INT UNSIGNED, _int INT, "
+                     "unsigned_integer INTEGER UNSIGNED, _integer INTEGER, "
+                     "unsigned_bigint BIGINT UNSIGNED, _bigint BIGINT, "
+                     "/* Need ClickHouse support read mysql decimal unsigned_decimal DECIMAL(19, 10) UNSIGNED, _decimal DECIMAL(19, 10), */"
+                     "unsigned_float FLOAT UNSIGNED, _float FLOAT, "
+                     "unsigned_double DOUBLE UNSIGNED, _double DOUBLE, "
+                     "_varchar VARCHAR(10), _char CHAR(10), binary_col BINARY(8), "
+                     "/* Need ClickHouse support Enum('a', 'b', 'v') _enum ENUM('a', 'b', 'c'), */"
+                     "_date Date, _datetime DateTime, _timestamp TIMESTAMP, _bool BOOLEAN) ENGINE = InnoDB;")
+
+    mysql_node.query("CREATE VIEW test_database.test_table_1_view AS SELECT SUM(tiny_int) FROM test_database.test_table_1 GROUP BY _date;")
+
+    # it already has some data
+    mysql_node.query("""
+        INSERT INTO test_database.test_table_1 VALUES(1, 1, -1, 2, -2, 3, -3, 4, -4, 5, -5, 6, -6, 3.2, -3.2, 3.4, -3.4, 'varchar', 'char', 'binary',
+        '2020-01-01', '2020-01-01 00:00:00', '2020-01-01 00:00:00', true);
+        """)
+    clickhouse_node.query(
+        "CREATE DATABASE test_database ENGINE = MaterializeMySQL('{}:3306', 'test_database', 'root', 'clickhouse')".format(
+            service_name))
+
+    assert "test_database" in clickhouse_node.query("SHOW DATABASES")
+    check_query(clickhouse_node, "SHOW TABLES FROM test_database FORMAT TSV", "test_table_1\n")
+
+    clickhouse_node.query("DROP DATABASE test_database")
+    mysql_node.query("DROP DATABASE test_database")
+
+
 def materialize_mysql_database_with_datetime_and_decimal(clickhouse_node, mysql_node, service_name):
     mysql_node.query("DROP DATABASE IF EXISTS test_database")
     clickhouse_node.query("DROP DATABASE IF EXISTS test_database")
@@ -471,12 +510,14 @@ def select_without_columns(clickhouse_node, mysql_node, service_name):
     mysql_node.query("CREATE DATABASE db")
     mysql_node.query("CREATE TABLE db.t (a INT PRIMARY KEY, b INT)")
     clickhouse_node.query(
-        "CREATE DATABASE db ENGINE = MaterializeMySQL('{}:3306', 'db', 'root', 'clickhouse')".format(service_name))
+        "CREATE DATABASE db ENGINE = MaterializeMySQL('{}:3306', 'db', 'root', 'clickhouse') SETTINGS max_flush_data_time = 100000".format(service_name))
     check_query(clickhouse_node, "SHOW TABLES FROM db FORMAT TSV", "t\n")
     clickhouse_node.query("SYSTEM STOP MERGES db.t")
     clickhouse_node.query("CREATE VIEW v AS SELECT * FROM db.t")
     mysql_node.query("INSERT INTO db.t VALUES (1, 1), (2, 2)")
-    mysql_node.query("DELETE FROM db.t WHERE a=2;")
+    mysql_node.query("DELETE FROM db.t WHERE a = 2;")
+    # We need to execute a DDL for flush data buffer
+    mysql_node.query("CREATE TABLE db.temporary(a INT PRIMARY KEY, b INT)")
 
     optimize_on_insert = clickhouse_node.query("SELECT value FROM system.settings WHERE name='optimize_on_insert'").strip()
     if optimize_on_insert == "0":
@@ -577,13 +618,13 @@ def err_sync_user_privs_with_materialize_mysql_database(clickhouse_node, mysql_n
     mysql_node.query("DROP USER 'test'@'%'")
 
 
-def restore_instance_mysql_connections(clickhouse_node, pm, action='DROP'):
+def restore_instance_mysql_connections(clickhouse_node, pm, action='REJECT'):
     pm._check_instance(clickhouse_node)
     pm._delete_rule({'source': clickhouse_node.ip_address, 'destination_port': 3306, 'action': action})
     pm._delete_rule({'destination': clickhouse_node.ip_address, 'source_port': 3306, 'action': action})
     time.sleep(5)
 
-def drop_instance_mysql_connections(clickhouse_node, pm, action='DROP'):
+def drop_instance_mysql_connections(clickhouse_node, pm, action='REJECT'):
     pm._check_instance(clickhouse_node)
     pm._add_rule({'source': clickhouse_node.ip_address, 'destination_port': 3306, 'action': action})
     pm._add_rule({'destination': clickhouse_node.ip_address, 'source_port': 3306, 'action': action})
@@ -616,8 +657,6 @@ def network_partition_test(clickhouse_node, mysql_node, service_name):
 
         restore_instance_mysql_connections(clickhouse_node, pm)
 
-        clickhouse_node.query("DETACH DATABASE test_database")
-        clickhouse_node.query("ATTACH DATABASE test_database")
         check_query(clickhouse_node, "SELECT * FROM test_database.test_table FORMAT TSV", '1\n')
 
         clickhouse_node.query(
@@ -635,17 +674,35 @@ def network_partition_test(clickhouse_node, mysql_node, service_name):
 
 def mysql_kill_sync_thread_restore_test(clickhouse_node, mysql_node, service_name):
     clickhouse_node.query("DROP DATABASE IF EXISTS test_database;")
+    clickhouse_node.query("DROP DATABASE IF EXISTS test_database_auto;")
+
     mysql_node.query("DROP DATABASE IF EXISTS test_database;")
     mysql_node.query("CREATE DATABASE test_database;")
     mysql_node.query("CREATE TABLE test_database.test_table ( `id` int(11) NOT NULL, PRIMARY KEY (`id`) ) ENGINE=InnoDB;")
     mysql_node.query("INSERT INTO test_database.test_table VALUES (1)")
 
-    clickhouse_node.query("CREATE DATABASE test_database ENGINE = MaterializeMySQL('{}:3306', 'test_database', 'root', 'clickhouse')".format(service_name))
+    mysql_node.query("DROP DATABASE IF EXISTS test_database_auto;")
+    mysql_node.query("CREATE DATABASE test_database_auto;")
+    mysql_node.query("CREATE TABLE test_database_auto.test_table ( `id` int(11) NOT NULL, PRIMARY KEY (`id`) ) ENGINE=InnoDB;")
+    mysql_node.query("INSERT INTO test_database_auto.test_table VALUES (11)")
+
+    clickhouse_node.query("CREATE DATABASE test_database ENGINE = MaterializeMySQL('{}:3306', 'test_database', 'root', 'clickhouse') SETTINGS max_wait_time_when_mysql_unavailable=-1".format(service_name))
+    clickhouse_node.query("CREATE DATABASE test_database_auto ENGINE = MaterializeMySQL('{}:3306', 'test_database_auto', 'root', 'clickhouse')".format(service_name))
+
     check_query(clickhouse_node, "SELECT * FROM test_database.test_table FORMAT TSV", '1\n')
+    check_query(clickhouse_node, "SELECT * FROM test_database_auto.test_table FORMAT TSV", '11\n')
+
+
+    # When ClickHouse dump all history data we can query it on ClickHouse
+    # but it don't mean that the sync thread is already to connect to MySQL.
+    # So After ClickHouse can query data, insert some rows to MySQL. Use this to re-check sync successed.
+    mysql_node.query("INSERT INTO test_database_auto.test_table VALUES (22)")
+    mysql_node.query("INSERT INTO test_database.test_table VALUES (2)")
+    check_query(clickhouse_node, "SELECT * FROM test_database.test_table ORDER BY id FORMAT TSV", '1\n2\n')
+    check_query(clickhouse_node, "SELECT * FROM test_database_auto.test_table ORDER BY id FORMAT TSV", '11\n22\n')
 
     get_sync_id_query = "select id from information_schema.processlist where STATE='Master has sent all binlog to slave; waiting for more updates'"
     result = mysql_node.query_and_get_data(get_sync_id_query)
-
     for row in result:
         row_result = {}
         query = "kill " + str(row[0]) + ";"
@@ -656,17 +713,22 @@ def mysql_kill_sync_thread_restore_test(clickhouse_node, mysql_node, service_nam
         # When you use KILL, a thread-specific kill flag is set for the thread. In most cases, it might take some time for the thread to die because the kill flag is checked only at specific intervals:
         time.sleep(3)
         clickhouse_node.query("SELECT * FROM test_database.test_table")
-    assert "Cannot read all data" in str(exception.value)
+        assert "Cannot read all data" in str(exception.value)
 
     clickhouse_node.query("DETACH DATABASE test_database")
     clickhouse_node.query("ATTACH DATABASE test_database")
-    check_query(clickhouse_node, "SELECT * FROM test_database.test_table FORMAT TSV", '1\n')
-
-    mysql_node.query("INSERT INTO test_database.test_table VALUES (2)")
     check_query(clickhouse_node, "SELECT * FROM test_database.test_table ORDER BY id FORMAT TSV", '1\n2\n')
 
+    mysql_node.query("INSERT INTO test_database.test_table VALUES (3)")
+    check_query(clickhouse_node, "SELECT * FROM test_database.test_table ORDER BY id FORMAT TSV", '1\n2\n3\n')
+
+    mysql_node.query("INSERT INTO test_database_auto.test_table VALUES (33)")
+    check_query(clickhouse_node, "SELECT * FROM test_database_auto.test_table ORDER BY id FORMAT TSV", '11\n22\n33\n')
+
     clickhouse_node.query("DROP DATABASE test_database")
+    clickhouse_node.query("DROP DATABASE test_database_auto")
     mysql_node.query("DROP DATABASE test_database")
+    mysql_node.query("DROP DATABASE test_database_auto")
 
 
 def mysql_killed_while_insert(clickhouse_node, mysql_node, service_name):
@@ -687,10 +749,9 @@ def mysql_killed_while_insert(clickhouse_node, mysql_node, service_name):
         run_and_check(
             ['docker-compose', '-p', mysql_node.project_name, '-f', mysql_node.docker_compose, 'stop'])
     finally:
-        with pytest.raises(QueryRuntimeException) as execption:
+        with pytest.raises(QueryRuntimeException) as exception:
             time.sleep(5)
             clickhouse_node.query("SELECT count() FROM kill_mysql_while_insert.test")
-        assert "Master maybe lost." in str(execption.value)
 
         run_and_check(
             ['docker-compose', '-p', mysql_node.project_name, '-f', mysql_node.docker_compose, 'start'])
@@ -741,6 +802,7 @@ def utf8mb4_test(clickhouse_node, mysql_node, service_name):
     mysql_node.query("CREATE TABLE utf8mb4_test.test (id INT(11) NOT NULL PRIMARY KEY, name VARCHAR(255)) ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4")
     mysql_node.query("INSERT INTO utf8mb4_test.test VALUES(1, '🦄'),(2, '\u2601')")
     clickhouse_node.query("CREATE DATABASE utf8mb4_test ENGINE = MaterializeMySQL('{}:3306', 'utf8mb4_test', 'root', 'clickhouse')".format(service_name))
+    check_query(clickhouse_node, "SHOW TABLES FROM utf8mb4_test FORMAT TSV", "test\n")
     check_query(clickhouse_node, "SELECT id, name FROM utf8mb4_test.test ORDER BY id", "1\t\U0001F984\n2\t\u2601\n")
 
 def system_parts_test(clickhouse_node, mysql_node, service_name):
@@ -780,3 +842,31 @@ def system_tables_test(clickhouse_node, mysql_node, service_name):
     mysql_node.query("CREATE TABLE system_tables_test.test (id int NOT NULL PRIMARY KEY) ENGINE=InnoDB")
     clickhouse_node.query("CREATE DATABASE system_tables_test ENGINE = MaterializeMySQL('{}:3306', 'system_tables_test', 'root', 'clickhouse')".format(service_name))
     check_query(clickhouse_node, "SELECT partition_key, sorting_key, primary_key FROM system.tables WHERE database = 'system_tables_test' AND name = 'test'", "intDiv(id, 4294967)\tid\tid\n")
+
+def move_to_prewhere_and_column_filtering(clickhouse_node, mysql_node, service_name):
+    clickhouse_node.query("DROP DATABASE IF EXISTS cond_on_key_col")
+    mysql_node.query("DROP DATABASE IF EXISTS cond_on_key_col")
+    mysql_node.query("CREATE DATABASE cond_on_key_col")
+    clickhouse_node.query("CREATE DATABASE cond_on_key_col ENGINE = MaterializeMySQL('{}:3306', 'cond_on_key_col', 'root', 'clickhouse')".format(service_name))
+    mysql_node.query("create table cond_on_key_col.products (id int primary key, product_id int not null, catalog_id int not null, brand_id int not null, name text)")
+    mysql_node.query("insert into cond_on_key_col.products (id, name, catalog_id, brand_id, product_id) values (915, 'ertyui', 5287, 15837, 0), (990, 'wer', 1053, 24390, 1), (781, 'qwerty', 1041, 1176, 2);")
+    check_query(clickhouse_node, "SELECT DISTINCT P.id, P.name, P.catalog_id FROM cond_on_key_col.products P WHERE P.name ILIKE '%e%' and P.catalog_id=5287", '915\tertyui\t5287\n')
+    clickhouse_node.query("DROP DATABASE cond_on_key_col")
+    mysql_node.query("DROP DATABASE cond_on_key_col")
+
+def mysql_settings_test(clickhouse_node, mysql_node, service_name):
+    mysql_node.query("DROP DATABASE IF EXISTS test_database")
+    clickhouse_node.query("DROP DATABASE IF EXISTS test_database")
+    mysql_node.query("CREATE DATABASE test_database")
+    mysql_node.query("CREATE TABLE test_database.a (id INT(11) NOT NULL PRIMARY KEY, value VARCHAR(255))")
+    mysql_node.query("INSERT INTO test_database.a VALUES(1, 'foo')")
+    mysql_node.query("INSERT INTO test_database.a VALUES(2, 'bar')")
+
+    clickhouse_node.query("CREATE DATABASE test_database ENGINE = MaterializeMySQL('{}:3306', 'test_database', 'root', 'clickhouse')".format(service_name))
+    check_query(clickhouse_node, "SELECT COUNT() FROM test_database.a FORMAT TSV", "2\n")
+
+    assert clickhouse_node.query("SELECT COUNT(DISTINCT  blockNumber()) FROM test_database.a FORMAT TSV") == "2\n"
+
+    clickhouse_node.query("DROP DATABASE test_database")
+    mysql_node.query("DROP DATABASE test_database")
+
diff --git a/tests/integration/test_materialize_mysql_database/test.py b/tests/integration/test_materialize_mysql_database/test.py
index ced9a978d02..6c777c7e6f8 100644
--- a/tests/integration/test_materialize_mysql_database/test.py
+++ b/tests/integration/test_materialize_mysql_database/test.py
@@ -16,7 +16,8 @@ cluster = ClickHouseCluster(__file__)
 
 node_db_ordinary = cluster.add_instance('node1', user_configs=["configs/users.xml"], with_mysql=False, stay_alive=True)
 node_db_atomic = cluster.add_instance('node2', user_configs=["configs/users_db_atomic.xml"], with_mysql=False, stay_alive=True)
-
+node_disable_bytes_settings = cluster.add_instance('node3', user_configs=["configs/users_disable_bytes_settings.xml"], with_mysql=False, stay_alive=True)
+node_disable_rows_settings = cluster.add_instance('node4', user_configs=["configs/users_disable_rows_settings.xml"], with_mysql=False, stay_alive=True)
 
 @pytest.fixture(scope="module")
 def started_cluster():
@@ -42,7 +43,7 @@ class MySQLNodeInstance:
         if not os.path.exists(self.instances_dir):
             os.mkdir(self.instances_dir)
         self.docker_logs_path = p.join(self.instances_dir, 'docker_mysql.log')
-
+        self.start_up = False
 
     def alloc_connection(self):
         if self.mysql_connection is None:
@@ -78,12 +79,16 @@ class MySQLNodeInstance:
             return cursor.fetchall()
 
     def start_and_wait(self):
+        if self.start_up:
+            return
+
         run_and_check(['docker-compose',
-            '-p', cluster.project_name,
-            '-f', self.docker_compose,
-            'up', '--no-recreate', '-d',
-        ])
+                       '-p', cluster.project_name,
+                       '-f', self.docker_compose,
+                       'up', '--no-recreate', '-d',
+                       ])
         self.wait_mysql_to_start(120)
+        self.start_up = True
 
     def close(self):
         if self.mysql_connection is not None:
@@ -99,6 +104,8 @@ class MySQLNodeInstance:
             except Exception as e:
                 print("Unable to get logs from docker mysql.")
 
+        self.start_up = False
+
     def wait_mysql_to_start(self, timeout=60):
         start = time.time()
         while time.time() - start < timeout:
@@ -113,43 +120,49 @@ class MySQLNodeInstance:
         run_and_check(['docker-compose', 'ps', '--services', 'all'])
         raise Exception("Cannot wait MySQL container")
 
+
+mysql_5_7_docker_compose = os.path.join(DOCKER_COMPOSE_PATH, 'docker_compose_mysql_5_7_for_materialize_mysql.yml')
+mysql_5_7_node = MySQLNodeInstance('root', 'clickhouse', '127.0.0.1', 3308, mysql_5_7_docker_compose)
+
+mysql_8_0_docker_compose = os.path.join(DOCKER_COMPOSE_PATH, 'docker_compose_mysql_8_0_for_materialize_mysql.yml')
+mysql_8_0_node = MySQLNodeInstance('root', 'clickhouse', '127.0.0.1', 33308, mysql_8_0_docker_compose)
+
+
 @pytest.fixture(scope="module")
 def started_mysql_5_7():
-    docker_compose = os.path.join(DOCKER_COMPOSE_PATH, 'docker_compose_mysql_5_7_for_materialize_mysql.yml')
-    mysql_node = MySQLNodeInstance('root', 'clickhouse', '127.0.0.1', 3308, docker_compose)
-
     try:
-        mysql_node.start_and_wait()
-        yield mysql_node
+        mysql_5_7_node.start_and_wait()
+        yield mysql_5_7_node
     finally:
-        mysql_node.close()
-        run_and_check(['docker-compose', '-p', cluster.project_name, '-f', docker_compose, 'down', '--volumes',
-                               '--remove-orphans'])
+        mysql_5_7_node.close()
+        run_and_check(['docker-compose', '-p', cluster.project_name, '-f', mysql_5_7_docker_compose, 'down', '--volumes', '--remove-orphans'])
 
 
 @pytest.fixture(scope="module")
 def started_mysql_8_0():
-    docker_compose = os.path.join(DOCKER_COMPOSE_PATH, 'docker_compose_mysql_8_0_for_materialize_mysql.yml')
-    mysql_node = MySQLNodeInstance('root', 'clickhouse', '127.0.0.1', 33308, docker_compose)
-
     try:
-        mysql_node.start_and_wait()
-        yield mysql_node
+        mysql_8_0_node.start_and_wait()
+        yield mysql_8_0_node
     finally:
-        mysql_node.close()
-        run_and_check(['docker-compose', '-p', cluster.project_name, '-f', docker_compose, 'down', '--volumes',
-                               '--remove-orphans'])
+        mysql_8_0_node.close()
+        run_and_check(['docker-compose', '-p', cluster.project_name, '-f', mysql_8_0_docker_compose, 'down', '--volumes', '--remove-orphans'])
 
 
 @pytest.mark.parametrize(('clickhouse_node'), [node_db_ordinary, node_db_atomic])
 def test_materialize_database_dml_with_mysql_5_7(started_cluster, started_mysql_5_7, clickhouse_node):
     materialize_with_ddl.dml_with_materialize_mysql_database(clickhouse_node, started_mysql_5_7, "mysql1")
+    materialize_with_ddl.materialize_mysql_database_with_views(clickhouse_node, started_mysql_5_7, "mysql1")
     materialize_with_ddl.materialize_mysql_database_with_datetime_and_decimal(clickhouse_node, started_mysql_5_7, "mysql1")
+    materialize_with_ddl.move_to_prewhere_and_column_filtering(clickhouse_node, started_mysql_5_7, "mysql1")
+
 
 @pytest.mark.parametrize(('clickhouse_node'), [node_db_ordinary, node_db_atomic])
 def test_materialize_database_dml_with_mysql_8_0(started_cluster, started_mysql_8_0, clickhouse_node):
     materialize_with_ddl.dml_with_materialize_mysql_database(clickhouse_node, started_mysql_8_0, "mysql8_0")
+    materialize_with_ddl.materialize_mysql_database_with_views(clickhouse_node, started_mysql_8_0, "mysql8_0")
     materialize_with_ddl.materialize_mysql_database_with_datetime_and_decimal(clickhouse_node, started_mysql_8_0, "mysql8_0")
+    materialize_with_ddl.move_to_prewhere_and_column_filtering(clickhouse_node, started_mysql_8_0, "mysql8_0")
+
 
 @pytest.mark.parametrize(('clickhouse_node'), [node_db_ordinary, node_db_atomic])
 def test_materialize_database_ddl_with_mysql_5_7(started_cluster, started_mysql_5_7, clickhouse_node):
@@ -163,6 +176,7 @@ def test_materialize_database_ddl_with_mysql_5_7(started_cluster, started_mysql_
     materialize_with_ddl.alter_rename_table_with_materialize_mysql_database(clickhouse_node, started_mysql_5_7, "mysql1")
     materialize_with_ddl.alter_modify_column_with_materialize_mysql_database(clickhouse_node, started_mysql_5_7, "mysql1")
 
+
 @pytest.mark.parametrize(('clickhouse_node'), [node_db_ordinary, node_db_atomic])
 def test_materialize_database_ddl_with_mysql_8_0(started_cluster, started_mysql_8_0, clickhouse_node):
     materialize_with_ddl.drop_table_with_materialize_mysql_database(clickhouse_node, started_mysql_8_0, "mysql8_0")
@@ -179,10 +193,12 @@ def test_materialize_database_ddl_with_mysql_8_0(started_cluster, started_mysql_
     materialize_with_ddl.alter_modify_column_with_materialize_mysql_database(clickhouse_node, started_mysql_8_0,
                                                                              "mysql8_0")
 
+
 @pytest.mark.parametrize(('clickhouse_node'), [node_db_ordinary, node_db_atomic])
 def test_materialize_database_ddl_with_empty_transaction_5_7(started_cluster, started_mysql_5_7, clickhouse_node):
     materialize_with_ddl.query_event_with_empty_transaction(clickhouse_node, started_mysql_5_7, "mysql1")
 
+
 @pytest.mark.parametrize(('clickhouse_node'), [node_db_ordinary, node_db_atomic])
 def test_materialize_database_ddl_with_empty_transaction_8_0(started_cluster, started_mysql_8_0, clickhouse_node):
     materialize_with_ddl.query_event_with_empty_transaction(clickhouse_node, started_mysql_8_0, "mysql8_0")
@@ -217,52 +233,71 @@ def test_materialize_database_err_sync_user_privs_5_7(started_cluster, started_m
 def test_materialize_database_err_sync_user_privs_8_0(started_cluster, started_mysql_8_0, clickhouse_node):
     materialize_with_ddl.err_sync_user_privs_with_materialize_mysql_database(clickhouse_node, started_mysql_8_0, "mysql8_0")
 
+
 @pytest.mark.parametrize(('clickhouse_node'), [node_db_ordinary, node_db_atomic])
 def test_network_partition_5_7(started_cluster, started_mysql_5_7, clickhouse_node):
     materialize_with_ddl.network_partition_test(clickhouse_node, started_mysql_5_7, "mysql1")
 
+
 @pytest.mark.parametrize(('clickhouse_node'), [node_db_ordinary, node_db_atomic])
 def test_network_partition_8_0(started_cluster, started_mysql_8_0, clickhouse_node):
     materialize_with_ddl.network_partition_test(clickhouse_node, started_mysql_8_0, "mysql8_0")
 
+
 @pytest.mark.parametrize(('clickhouse_node'), [node_db_ordinary, node_db_atomic])
 def test_mysql_kill_sync_thread_restore_5_7(started_cluster, started_mysql_5_7, clickhouse_node):
     materialize_with_ddl.mysql_kill_sync_thread_restore_test(clickhouse_node, started_mysql_5_7, "mysql1")
 
+
 @pytest.mark.parametrize(('clickhouse_node'), [node_db_ordinary, node_db_atomic])
 def test_mysql_kill_sync_thread_restore_8_0(started_cluster, started_mysql_8_0, clickhouse_node):
     materialize_with_ddl.mysql_kill_sync_thread_restore_test(clickhouse_node, started_mysql_8_0, "mysql8_0")
 
+
 @pytest.mark.parametrize(('clickhouse_node'), [node_db_ordinary, node_db_atomic])
 def test_mysql_killed_while_insert_5_7(started_cluster, started_mysql_5_7, clickhouse_node):
     materialize_with_ddl.mysql_killed_while_insert(clickhouse_node, started_mysql_5_7, "mysql1")
 
+
 @pytest.mark.parametrize(('clickhouse_node'), [node_db_ordinary, node_db_atomic])
 def test_mysql_killed_while_insert_8_0(started_cluster, started_mysql_8_0, clickhouse_node):
     materialize_with_ddl.mysql_killed_while_insert(clickhouse_node, started_mysql_8_0, "mysql8_0")
 
+
 @pytest.mark.parametrize(('clickhouse_node'), [node_db_ordinary, node_db_atomic])
 def test_clickhouse_killed_while_insert_5_7(started_cluster, started_mysql_5_7, clickhouse_node):
     materialize_with_ddl.clickhouse_killed_while_insert(clickhouse_node, started_mysql_5_7, "mysql1")
 
+
 @pytest.mark.parametrize(('clickhouse_node'), [node_db_ordinary, node_db_atomic])
 def test_clickhouse_killed_while_insert_8_0(started_cluster, started_mysql_8_0, clickhouse_node):
     materialize_with_ddl.clickhouse_killed_while_insert(clickhouse_node, started_mysql_8_0, "mysql8_0")
 
+
 @pytest.mark.parametrize(('clickhouse_node'), [node_db_ordinary, node_db_ordinary])
 def test_utf8mb4(started_cluster, started_mysql_8_0, started_mysql_5_7, clickhouse_node):
     materialize_with_ddl.utf8mb4_test(clickhouse_node, started_mysql_5_7, "mysql1")
     materialize_with_ddl.utf8mb4_test(clickhouse_node, started_mysql_8_0, "mysql8_0")
 
+
 @pytest.mark.parametrize(('clickhouse_node'), [node_db_ordinary, node_db_ordinary])
 def test_system_parts_table(started_cluster, started_mysql_8_0, clickhouse_node):
     materialize_with_ddl.system_parts_test(clickhouse_node, started_mysql_8_0, "mysql8_0")
 
+
 @pytest.mark.parametrize(('clickhouse_node'), [node_db_ordinary, node_db_ordinary])
 def test_multi_table_update(started_cluster, started_mysql_8_0, started_mysql_5_7, clickhouse_node):
     materialize_with_ddl.multi_table_update_test(clickhouse_node, started_mysql_5_7, "mysql1")
     materialize_with_ddl.multi_table_update_test(clickhouse_node, started_mysql_8_0, "mysql8_0")
 
+
 @pytest.mark.parametrize(('clickhouse_node'), [node_db_ordinary, node_db_ordinary])
-def test_system_tables_table(started_cluster, started_mysql_8_0, clickhouse_node):
+def test_system_tables_table(started_cluster, started_mysql_8_0, started_mysql_5_7, clickhouse_node):
+    materialize_with_ddl.system_tables_test(clickhouse_node, started_mysql_5_7, "mysql1")
     materialize_with_ddl.system_tables_test(clickhouse_node, started_mysql_8_0, "mysql8_0")
+
+
+@pytest.mark.parametrize(('clickhouse_node'), [node_disable_bytes_settings, node_disable_rows_settings])
+def test_mysql_settings(started_cluster, started_mysql_8_0, started_mysql_5_7, clickhouse_node):
+    materialize_with_ddl.mysql_settings_test(clickhouse_node, started_mysql_5_7, "mysql1")
+    materialize_with_ddl.mysql_settings_test(clickhouse_node, started_mysql_8_0, "mysql8_0")
diff --git a/tests/integration/test_max_http_connections_for_replication/test.py b/tests/integration/test_max_http_connections_for_replication/test.py
index 2dc4e2a8810..634697c8668 100644
--- a/tests/integration/test_max_http_connections_for_replication/test.py
+++ b/tests/integration/test_max_http_connections_for_replication/test.py
@@ -43,6 +43,8 @@ def start_small_cluster():
 
 
 def test_single_endpoint_connections_count(start_small_cluster):
+    node1.query("TRUNCATE TABLE test_table")
+    node2.query("SYSTEM SYNC REPLICA test_table")
     def task(count):
         print(("Inserting ten times from {}".format(count)))
         for i in range(count, count + 10):
@@ -58,9 +60,11 @@ def test_single_endpoint_connections_count(start_small_cluster):
 
 
 def test_keepalive_timeout(start_small_cluster):
-    current_count = int(node1.query("select count() from test_table").strip())
+    node1.query("TRUNCATE TABLE test_table")
+    node2.query("SYSTEM SYNC REPLICA test_table")
+
     node1.query("insert into test_table values ('2017-06-16', 777, 0)")
-    assert_eq_with_retry(node2, "select count() from test_table", str(current_count + 1))
+    assert_eq_with_retry(node2, "select count() from test_table", str(1))
     # Server keepAliveTimeout is 3 seconds, default client session timeout is 8
     # lets sleep in that interval
     time.sleep(4)
@@ -69,7 +73,7 @@ def test_keepalive_timeout(start_small_cluster):
 
     time.sleep(3)
 
-    assert_eq_with_retry(node2, "select count() from test_table", str(current_count + 2))
+    assert_eq_with_retry(node2, "select count() from test_table", str(2))
 
     assert not node2.contains_in_log("No message received"), "Found 'No message received' in clickhouse-server.log"
 
diff --git a/tests/integration/test_merge_tree_s3/test.py b/tests/integration/test_merge_tree_s3/test.py
index 45b3c3c65f0..4b685542170 100644
--- a/tests/integration/test_merge_tree_s3/test.py
+++ b/tests/integration/test_merge_tree_s3/test.py
@@ -68,6 +68,16 @@ def create_table(cluster, table_name, additional_settings=None):
     node.query(create_table_statement)
 
 
+def wait_for_delete_s3_objects(cluster, expected, timeout=30):
+    minio = cluster.minio_client
+    while timeout > 0:
+        if len(list(minio.list_objects(cluster.minio_bucket, 'data/'))) == expected:
+            return
+        timeout -= 1
+        time.sleep(1)
+    assert(len(list(minio.list_objects(cluster.minio_bucket, 'data/'))) == expected)
+
+
 @pytest.fixture(autouse=True)
 def drop_table(cluster):
     yield
@@ -75,8 +85,9 @@ def drop_table(cluster):
     minio = cluster.minio_client
 
     node.query("DROP TABLE IF EXISTS s3_test NO DELAY")
+
     try:
-        assert len(list(minio.list_objects(cluster.minio_bucket, 'data/'))) == 0
+        wait_for_delete_s3_objects(cluster, 0)
     finally:
         # Remove extra objects to prevent tests cascade failing
         for obj in list(minio.list_objects(cluster.minio_bucket, 'data/')):
@@ -137,12 +148,21 @@ def test_insert_same_partition_and_merge(cluster, merge_vertical):
         list(minio.list_objects(cluster.minio_bucket, 'data/'))) == FILES_OVERHEAD_PER_PART_WIDE * 6 + FILES_OVERHEAD
 
     node.query("SYSTEM START MERGES s3_test")
+
     # Wait for merges and old parts deletion
-    time.sleep(3)
+    for attempt in range(0, 10):
+        parts_count = node.query("SELECT COUNT(*) FROM system.parts WHERE table = 's3_test' FORMAT Values")
+        if parts_count == "(1)":
+            break
+
+        if attempt == 9:
+            assert parts_count == "(1)"
+
+        time.sleep(1)
 
     assert node.query("SELECT sum(id) FROM s3_test FORMAT Values") == "(0)"
     assert node.query("SELECT count(distinct(id)) FROM s3_test FORMAT Values") == "(8192)"
-    assert len(list(minio.list_objects(cluster.minio_bucket, 'data/'))) == FILES_OVERHEAD_PER_PART_WIDE + FILES_OVERHEAD
+    wait_for_delete_s3_objects(cluster, FILES_OVERHEAD_PER_PART_WIDE + FILES_OVERHEAD)
 
 
 def test_alter_table_columns(cluster):
@@ -158,32 +178,20 @@ def test_alter_table_columns(cluster):
     # To ensure parts have merged
     node.query("OPTIMIZE TABLE s3_test")
 
-    # Wait for merges, mutations and old parts deletion
-    time.sleep(3)
-
     assert node.query("SELECT sum(col1) FROM s3_test FORMAT Values") == "(8192)"
     assert node.query("SELECT sum(col1) FROM s3_test WHERE id > 0 FORMAT Values") == "(4096)"
-    assert len(list(minio.list_objects(cluster.minio_bucket,
-                                       'data/'))) == FILES_OVERHEAD + FILES_OVERHEAD_PER_PART_WIDE + FILES_OVERHEAD_PER_COLUMN
+    wait_for_delete_s3_objects(cluster, FILES_OVERHEAD + FILES_OVERHEAD_PER_PART_WIDE + FILES_OVERHEAD_PER_COLUMN)
 
     node.query("ALTER TABLE s3_test MODIFY COLUMN col1 String", settings={"mutations_sync": 2})
 
-    # Wait for old parts deletion
-    time.sleep(3)
-
     assert node.query("SELECT distinct(col1) FROM s3_test FORMAT Values") == "('1')"
     # and file with mutation
-    assert len(list(minio.list_objects(cluster.minio_bucket, 'data/'))) == (
-            FILES_OVERHEAD + FILES_OVERHEAD_PER_PART_WIDE + FILES_OVERHEAD_PER_COLUMN + 1)
+    wait_for_delete_s3_objects(cluster, FILES_OVERHEAD + FILES_OVERHEAD_PER_PART_WIDE + FILES_OVERHEAD_PER_COLUMN + 1)
 
     node.query("ALTER TABLE s3_test DROP COLUMN col1", settings={"mutations_sync": 2})
 
-    # Wait for old parts deletion
-    time.sleep(3)
-
     # and 2 files with mutations
-    assert len(
-        list(minio.list_objects(cluster.minio_bucket, 'data/'))) == FILES_OVERHEAD + FILES_OVERHEAD_PER_PART_WIDE + 2
+    wait_for_delete_s3_objects(cluster, FILES_OVERHEAD + FILES_OVERHEAD_PER_PART_WIDE + 2)
 
 
 def test_attach_detach_partition(cluster):
@@ -311,9 +319,7 @@ def test_move_replace_partition_to_another_table(cluster):
     assert node.query("SELECT count(*) FROM s3_clone FORMAT Values") == "(8192)"
 
     # Wait for outdated partitions deletion.
-    time.sleep(3)
-    assert len(list(
-        minio.list_objects(cluster.minio_bucket, 'data/'))) == FILES_OVERHEAD * 2 + FILES_OVERHEAD_PER_PART_WIDE * 4
+    wait_for_delete_s3_objects(cluster, FILES_OVERHEAD * 2 + FILES_OVERHEAD_PER_PART_WIDE * 4)
 
     node.query("DROP TABLE s3_clone NO DELAY")
     assert node.query("SELECT sum(id) FROM s3_test FORMAT Values") == "(0)"
@@ -329,7 +335,33 @@ def test_move_replace_partition_to_another_table(cluster):
 
     node.query("DROP TABLE s3_test NO DELAY")
     # Backup data should remain in S3.
-    assert len(list(minio.list_objects(cluster.minio_bucket, 'data/'))) == FILES_OVERHEAD_PER_PART_WIDE * 4
+
+    wait_for_delete_s3_objects(cluster, FILES_OVERHEAD_PER_PART_WIDE * 4)
 
     for obj in list(minio.list_objects(cluster.minio_bucket, 'data/')):
         minio.remove_object(cluster.minio_bucket, obj.object_name)
+
+
+def test_freeze_unfreeze(cluster):
+    create_table(cluster, "s3_test")
+
+    node = cluster.instances["node"]
+    minio = cluster.minio_client
+
+    node.query("INSERT INTO s3_test VALUES {}".format(generate_values('2020-01-03', 4096)))
+    node.query("ALTER TABLE s3_test FREEZE WITH NAME 'backup1'")
+    node.query("INSERT INTO s3_test VALUES {}".format(generate_values('2020-01-04', 4096)))
+    node.query("ALTER TABLE s3_test FREEZE WITH NAME 'backup2'")
+
+    node.query("TRUNCATE TABLE s3_test")
+    assert len(
+        list(minio.list_objects(cluster.minio_bucket, 'data/'))) == FILES_OVERHEAD + FILES_OVERHEAD_PER_PART_WIDE * 2
+
+    # Unfreeze single partition from backup1.
+    node.query("ALTER TABLE s3_test UNFREEZE PARTITION '2020-01-03' WITH NAME 'backup1'")
+    # Unfreeze all partitions from backup2.
+    node.query("ALTER TABLE s3_test UNFREEZE WITH NAME 'backup2'")
+
+    # Data should be removed from S3.
+    assert len(
+        list(minio.list_objects(cluster.minio_bucket, 'data/'))) == FILES_OVERHEAD
diff --git a/tests/integration/test_merge_tree_s3_restore/configs/config.d/clusters.xml b/tests/integration/test_merge_tree_s3_restore/configs/config.d/clusters.xml
new file mode 100644
index 00000000000..4808ae4bc4a
--- /dev/null
+++ b/tests/integration/test_merge_tree_s3_restore/configs/config.d/clusters.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<yandex>
+    <remote_servers>
+        <node>
+            <shard>
+                <internal_replication>true</internal_replication>
+                <replica>
+                    <host>node</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </node>
+        <node_another_bucket>
+            <shard>
+                <internal_replication>true</internal_replication>
+                <replica>
+                    <host>node_another_bucket</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </node_another_bucket>
+    </remote_servers>
+</yandex>
diff --git a/tests/integration/test_merge_tree_s3_restore/configs/config.d/storage_conf_not_restorable.xml b/tests/integration/test_merge_tree_s3_restore/configs/config.d/storage_conf_not_restorable.xml
new file mode 100644
index 00000000000..c682ddae785
--- /dev/null
+++ b/tests/integration/test_merge_tree_s3_restore/configs/config.d/storage_conf_not_restorable.xml
@@ -0,0 +1,35 @@
+<yandex>
+    <storage_configuration>
+        <disks>
+            <s3>
+                <type>s3</type>
+                <endpoint>http://minio1:9001/root/another_data/</endpoint>
+                <access_key_id>minio</access_key_id>
+                <secret_access_key>minio123</secret_access_key>
+                <send_metadata>false</send_metadata>
+                <list_object_keys_size>1</list_object_keys_size> <!-- To effectively test restore parallelism -->
+                <retry_attempts>0</retry_attempts>
+            </s3>
+            <hdd>
+                <type>local</type>
+                <path>/</path>
+            </hdd>
+        </disks>
+        <policies>
+            <s3>
+                <volumes>
+                    <main>
+                        <disk>s3</disk>
+                    </main>
+                    <external>
+                        <disk>hdd</disk>
+                    </external>
+                </volumes>
+            </s3>
+        </policies>
+    </storage_configuration>
+
+    <merge_tree>
+        <min_bytes_for_wide_part>0</min_bytes_for_wide_part>
+    </merge_tree>
+</yandex>
diff --git a/tests/integration/test_merge_tree_s3_restore/test.py b/tests/integration/test_merge_tree_s3_restore/test.py
index 346d9aced3f..0781f0b9ce9 100644
--- a/tests/integration/test_merge_tree_s3_restore/test.py
+++ b/tests/integration/test_merge_tree_s3_restore/test.py
@@ -1,3 +1,4 @@
+import os
 import logging
 import random
 import string
@@ -6,26 +7,45 @@ import time
 import pytest
 from helpers.cluster import ClickHouseCluster
 
+
 logging.getLogger().setLevel(logging.INFO)
 logging.getLogger().addHandler(logging.StreamHandler())
 
+SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
+NOT_RESTORABLE_CONFIG_PATH = os.path.join(SCRIPT_DIR, './_instances/node_not_restorable/configs/config.d/storage_conf_not_restorable.xml')
+COMMON_CONFIGS = ["configs/config.d/bg_processing_pool_conf.xml", "configs/config.d/log_conf.xml", "configs/config.d/clusters.xml"]
+
+
+def replace_config(old, new):
+    config = open(NOT_RESTORABLE_CONFIG_PATH, 'r')
+    config_lines = config.readlines()
+    config.close()
+    config_lines = [line.replace(old, new) for line in config_lines]
+    config = open(NOT_RESTORABLE_CONFIG_PATH, 'w')
+    config.writelines(config_lines)
+    config.close()
+
 
 @pytest.fixture(scope="module")
 def cluster():
     try:
         cluster = ClickHouseCluster(__file__)
-        cluster.add_instance("node", main_configs=[
-            "configs/config.d/storage_conf.xml",
-            "configs/config.d/bg_processing_pool_conf.xml",
-            "configs/config.d/log_conf.xml"], user_configs=[], with_minio=True, stay_alive=True)
-        cluster.add_instance("node_another_bucket", main_configs=[
-            "configs/config.d/storage_conf_another_bucket.xml",
-            "configs/config.d/bg_processing_pool_conf.xml",
-            "configs/config.d/log_conf.xml"], user_configs=[], stay_alive=True)
-        cluster.add_instance("node_another_bucket_path", main_configs=[
-            "configs/config.d/storage_conf_another_bucket_path.xml",
-            "configs/config.d/bg_processing_pool_conf.xml",
-            "configs/config.d/log_conf.xml"], user_configs=[], stay_alive=True)
+
+        cluster.add_instance("node",
+                             main_configs=COMMON_CONFIGS + ["configs/config.d/storage_conf.xml"],
+                             macros={"cluster": "node", "replica": "0"},
+                             with_minio=True, with_zookeeper=True, stay_alive=True)
+        cluster.add_instance("node_another_bucket",
+                             main_configs=COMMON_CONFIGS + ["configs/config.d/storage_conf_another_bucket.xml"],
+                             macros={"cluster": "node_another_bucket", "replica": "0"},
+                             with_zookeeper=True, stay_alive=True)
+        cluster.add_instance("node_another_bucket_path",
+                             main_configs=COMMON_CONFIGS + ["configs/config.d/storage_conf_another_bucket_path.xml"],
+                             stay_alive=True)
+        cluster.add_instance("node_not_restorable",
+                             main_configs=COMMON_CONFIGS + ["configs/config.d/storage_conf_not_restorable.xml"],
+                             stay_alive=True)
+
         logging.info("Starting cluster...")
         cluster.start()
         logging.info("Cluster started")
@@ -46,28 +66,26 @@ def generate_values(date_str, count, sign=1):
     return ",".join(["('{}',{},'{}',{})".format(x, y, z, 0) for x, y, z in data])
 
 
-def create_table(node, table_name, additional_settings=None):
+def create_table(node, table_name, replicated=False):
     node.query("CREATE DATABASE IF NOT EXISTS s3 ENGINE = Ordinary")
 
     create_table_statement = """
-        CREATE TABLE s3.{} (
+        CREATE TABLE s3.{table_name} {on_cluster} (
             dt Date,
             id Int64,
             data String,
             counter Int64,
             INDEX min_max (id) TYPE minmax GRANULARITY 3
-        ) ENGINE=MergeTree()
+        ) ENGINE={engine}
         PARTITION BY dt
         ORDER BY (dt, id)
         SETTINGS
             storage_policy='s3',
             old_parts_lifetime=600,
             index_granularity=512
-        """.format(table_name)
-
-    if additional_settings:
-        create_table_statement += ","
-        create_table_statement += additional_settings
+        """.format(table_name=table_name,
+                   on_cluster="ON CLUSTER '{}'".format(node.name) if replicated else "",
+                   engine="ReplicatedMergeTree('/clickhouse/tables/{cluster}/test', '{replica}')" if replicated else "MergeTree()")
 
     node.query(create_table_statement)
 
@@ -75,6 +93,8 @@ def create_table(node, table_name, additional_settings=None):
 def purge_s3(cluster, bucket):
     minio = cluster.minio_client
     for obj in list(minio.list_objects(bucket, recursive=True)):
+        if str(obj.object_name).find(".SCHEMA_VERSION") != -1:
+            continue
         minio.remove_object(bucket, obj.object_name)
 
 
@@ -86,28 +106,35 @@ def drop_shadow_information(node):
     node.exec_in_container(['bash', '-c', 'rm -rf /var/lib/clickhouse/shadow/*'], user='root')
 
 
-def create_restore_file(node, revision=0, bucket=None, path=None):
-    add_restore_option = 'echo -en "{}\n" >> /var/lib/clickhouse/disks/s3/restore'
-    node.exec_in_container(['bash', '-c', add_restore_option.format(revision)], user='root')
+def create_restore_file(node, revision=None, bucket=None, path=None, detached=None):
+    node.exec_in_container(['bash', '-c', 'touch /var/lib/clickhouse/disks/s3/restore'], user='root')
+
+    add_restore_option = 'echo -en "{}={}\n" >> /var/lib/clickhouse/disks/s3/restore'
+    if revision:
+        node.exec_in_container(['bash', '-c', add_restore_option.format('revision', revision)], user='root')
     if bucket:
-        node.exec_in_container(['bash', '-c', add_restore_option.format(bucket)], user='root')
+        node.exec_in_container(['bash', '-c', add_restore_option.format('source_bucket', bucket)], user='root')
     if path:
-        node.exec_in_container(['bash', '-c', add_restore_option.format(path)], user='root')
+        node.exec_in_container(['bash', '-c', add_restore_option.format('source_path', path)], user='root')
+    if detached:
+        node.exec_in_container(['bash', '-c', add_restore_option.format('detached', 'true')], user='root')
 
 
 def get_revision_counter(node, backup_number):
-    return int(node.exec_in_container(['bash', '-c', 'cat /var/lib/clickhouse/disks/s3/shadow/{}/revision.txt'.format(backup_number)], user='root'))
+    return int(node.exec_in_container(
+        ['bash', '-c', 'cat /var/lib/clickhouse/disks/s3/shadow/{}/revision.txt'.format(backup_number)], user='root'))
 
 
 @pytest.fixture(autouse=True)
 def drop_table(cluster):
     yield
 
-    node_names = ["node", "node_another_bucket", "node_another_bucket_path"]
+    node_names = ["node", "node_another_bucket", "node_another_bucket_path", "node_not_restorable"]
 
     for node_name in node_names:
         node = cluster.instances[node_name]
-        node.query("DROP TABLE IF EXISTS s3.test NO DELAY")
+        node.query("DROP TABLE IF EXISTS s3.test SYNC")
+        node.query("DROP DATABASE IF EXISTS s3 SYNC")
 
         drop_s3_metadata(node)
         drop_shadow_information(node)
@@ -117,32 +144,23 @@ def drop_table(cluster):
         purge_s3(cluster, bucket)
 
 
-def test_full_restore(cluster):
+@pytest.mark.parametrize(
+   "replicated", [False, True]
+)
+def test_full_restore(cluster, replicated):
     node = cluster.instances["node"]
 
-    create_table(node, "test")
+    create_table(node, "test", replicated)
 
     node.query("INSERT INTO s3.test VALUES {}".format(generate_values('2020-01-03', 4096)))
     node.query("INSERT INTO s3.test VALUES {}".format(generate_values('2020-01-04', 4096, -1)))
     node.query("INSERT INTO s3.test VALUES {}".format(generate_values('2020-01-05', 4096)))
     node.query("INSERT INTO s3.test VALUES {}".format(generate_values('2020-01-05', 4096, -1)))
 
-    # To ensure parts have merged
-    node.query("OPTIMIZE TABLE s3.test")
-
-    assert node.query("SELECT count(*) FROM s3.test FORMAT Values") == "({})".format(4096 * 4)
-    assert node.query("SELECT sum(id) FROM s3.test FORMAT Values") == "({})".format(0)
-
     node.stop_clickhouse()
     drop_s3_metadata(node)
-    node.start_clickhouse()
-
-    # All data is removed.
-    assert node.query("SELECT count(*) FROM s3.test FORMAT Values") == "({})".format(0)
-
-    node.stop_clickhouse()
     create_restore_file(node)
-    node.start_clickhouse(10)
+    node.start_clickhouse()
 
     assert node.query("SELECT count(*) FROM s3.test FORMAT Values") == "({})".format(4096 * 4)
     assert node.query("SELECT sum(id) FROM s3.test FORMAT Values") == "({})".format(0)
@@ -170,7 +188,7 @@ def test_restore_another_bucket_path(cluster):
 
     node_another_bucket.stop_clickhouse()
     create_restore_file(node_another_bucket, bucket="root")
-    node_another_bucket.start_clickhouse(10)
+    node_another_bucket.start_clickhouse()
 
     assert node_another_bucket.query("SELECT count(*) FROM s3.test FORMAT Values") == "({})".format(4096 * 4)
     assert node_another_bucket.query("SELECT sum(id) FROM s3.test FORMAT Values") == "({})".format(0)
@@ -181,7 +199,7 @@ def test_restore_another_bucket_path(cluster):
 
     node_another_bucket_path.stop_clickhouse()
     create_restore_file(node_another_bucket_path, bucket="root2", path="data")
-    node_another_bucket_path.start_clickhouse(10)
+    node_another_bucket_path.start_clickhouse()
 
     assert node_another_bucket_path.query("SELECT count(*) FROM s3.test FORMAT Values") == "({})".format(4096 * 4)
     assert node_another_bucket_path.query("SELECT sum(id) FROM s3.test FORMAT Values") == "({})".format(0)
@@ -223,7 +241,7 @@ def test_restore_different_revisions(cluster):
     drop_s3_metadata(node_another_bucket)
     purge_s3(cluster, cluster.minio_bucket_2)
     create_restore_file(node_another_bucket, revision=revision1, bucket="root")
-    node_another_bucket.start_clickhouse(10)
+    node_another_bucket.start_clickhouse()
 
     assert node_another_bucket.query("SELECT count(*) FROM s3.test FORMAT Values") == "({})".format(4096 * 2)
     assert node_another_bucket.query("SELECT sum(id) FROM s3.test FORMAT Values") == "({})".format(0)
@@ -234,7 +252,7 @@ def test_restore_different_revisions(cluster):
     drop_s3_metadata(node_another_bucket)
     purge_s3(cluster, cluster.minio_bucket_2)
     create_restore_file(node_another_bucket, revision=revision2, bucket="root")
-    node_another_bucket.start_clickhouse(10)
+    node_another_bucket.start_clickhouse()
 
     assert node_another_bucket.query("SELECT count(*) FROM s3.test FORMAT Values") == "({})".format(4096 * 4)
     assert node_another_bucket.query("SELECT sum(id) FROM s3.test FORMAT Values") == "({})".format(0)
@@ -245,7 +263,7 @@ def test_restore_different_revisions(cluster):
     drop_s3_metadata(node_another_bucket)
     purge_s3(cluster, cluster.minio_bucket_2)
     create_restore_file(node_another_bucket, revision=revision3, bucket="root")
-    node_another_bucket.start_clickhouse(10)
+    node_another_bucket.start_clickhouse()
 
     assert node_another_bucket.query("SELECT count(*) FROM s3.test FORMAT Values") == "({})".format(4096 * 4)
     assert node_another_bucket.query("SELECT sum(id) FROM s3.test FORMAT Values") == "({})".format(0)
@@ -277,7 +295,7 @@ def test_restore_mutations(cluster):
     drop_s3_metadata(node_another_bucket)
     purge_s3(cluster, cluster.minio_bucket_2)
     create_restore_file(node_another_bucket, revision=revision_before_mutation, bucket="root")
-    node_another_bucket.start_clickhouse(10)
+    node_another_bucket.start_clickhouse()
 
     assert node_another_bucket.query("SELECT count(*) FROM s3.test FORMAT Values") == "({})".format(4096 * 2)
     assert node_another_bucket.query("SELECT sum(id) FROM s3.test FORMAT Values") == "({})".format(0)
@@ -288,7 +306,7 @@ def test_restore_mutations(cluster):
     drop_s3_metadata(node_another_bucket)
     purge_s3(cluster, cluster.minio_bucket_2)
     create_restore_file(node_another_bucket, revision=revision_after_mutation, bucket="root")
-    node_another_bucket.start_clickhouse(10)
+    node_another_bucket.start_clickhouse()
 
     assert node_another_bucket.query("SELECT count(*) FROM s3.test FORMAT Values") == "({})".format(4096 * 2)
     assert node_another_bucket.query("SELECT sum(id) FROM s3.test FORMAT Values") == "({})".format(0)
@@ -302,7 +320,7 @@ def test_restore_mutations(cluster):
     purge_s3(cluster, cluster.minio_bucket_2)
     revision = (revision_before_mutation + revision_after_mutation) // 2
     create_restore_file(node_another_bucket, revision=revision, bucket="root")
-    node_another_bucket.start_clickhouse(10)
+    node_another_bucket.start_clickhouse()
 
     # Wait for unfinished mutation completion.
     time.sleep(3)
@@ -311,3 +329,90 @@ def test_restore_mutations(cluster):
     assert node_another_bucket.query("SELECT sum(id) FROM s3.test FORMAT Values") == "({})".format(0)
     assert node_another_bucket.query("SELECT sum(counter) FROM s3.test FORMAT Values") == "({})".format(4096 * 2)
     assert node_another_bucket.query("SELECT sum(counter) FROM s3.test WHERE id > 0 FORMAT Values") == "({})".format(4096)
+
+
+def test_migrate_to_restorable_schema(cluster):
+    node = cluster.instances["node_not_restorable"]
+
+    create_table(node, "test")
+
+    node.query("INSERT INTO s3.test VALUES {}".format(generate_values('2020-01-03', 4096)))
+    node.query("INSERT INTO s3.test VALUES {}".format(generate_values('2020-01-04', 4096, -1)))
+    node.query("INSERT INTO s3.test VALUES {}".format(generate_values('2020-01-05', 4096)))
+    node.query("INSERT INTO s3.test VALUES {}".format(generate_values('2020-01-05', 4096, -1)))
+
+    replace_config("<send_metadata>false</send_metadata>", "<send_metadata>true</send_metadata>")
+
+    node.restart_clickhouse()
+
+    node.query("INSERT INTO s3.test VALUES {}".format(generate_values('2020-01-06', 4096)))
+    node.query("INSERT INTO s3.test VALUES {}".format(generate_values('2020-01-06', 4096, -1)))
+
+    node.query("ALTER TABLE s3.test FREEZE")
+    revision = get_revision_counter(node, 1)
+
+    assert revision != 0
+
+    node_another_bucket = cluster.instances["node_another_bucket"]
+
+    create_table(node_another_bucket, "test")
+
+    # Restore to revision before mutation.
+    node_another_bucket.stop_clickhouse()
+    drop_s3_metadata(node_another_bucket)
+    purge_s3(cluster, cluster.minio_bucket_2)
+    create_restore_file(node_another_bucket, revision=revision, bucket="root", path="another_data")
+    node_another_bucket.start_clickhouse()
+
+    assert node_another_bucket.query("SELECT count(*) FROM s3.test FORMAT Values") == "({})".format(4096 * 6)
+    assert node_another_bucket.query("SELECT sum(id) FROM s3.test FORMAT Values") == "({})".format(0)
+
+
+@pytest.mark.parametrize(
+    "replicated", [False, True]
+)
+def test_restore_to_detached(cluster, replicated):
+    node = cluster.instances["node"]
+
+    create_table(node, "test", replicated)
+
+    node.query("INSERT INTO s3.test VALUES {}".format(generate_values('2020-01-03', 4096)))
+    node.query("INSERT INTO s3.test VALUES {}".format(generate_values('2020-01-04', 4096, -1)))
+    node.query("INSERT INTO s3.test VALUES {}".format(generate_values('2020-01-05', 4096)))
+    node.query("INSERT INTO s3.test VALUES {}".format(generate_values('2020-01-06', 4096, -1)))
+    node.query("INSERT INTO s3.test VALUES {}".format(generate_values('2020-01-07', 4096, 0)))
+
+    # Add some mutation.
+    node.query("ALTER TABLE s3.test UPDATE counter = 1 WHERE 1", settings={"mutations_sync": 2})
+
+    # Detach some partition.
+    node.query("ALTER TABLE s3.test DETACH PARTITION '2020-01-07'")
+
+    node.query("ALTER TABLE s3.test FREEZE")
+    revision = get_revision_counter(node, 1)
+
+    node_another_bucket = cluster.instances["node_another_bucket"]
+
+    create_table(node_another_bucket, "test", replicated)
+
+    node_another_bucket.stop_clickhouse()
+    create_restore_file(node_another_bucket, revision=revision, bucket="root", path="data", detached=True)
+    node_another_bucket.start_clickhouse()
+
+    assert node_another_bucket.query("SELECT count(*) FROM s3.test FORMAT Values") == "({})".format(0)
+
+    node_another_bucket.query("ALTER TABLE s3.test ATTACH PARTITION '2020-01-03'")
+    node_another_bucket.query("ALTER TABLE s3.test ATTACH PARTITION '2020-01-04'")
+    node_another_bucket.query("ALTER TABLE s3.test ATTACH PARTITION '2020-01-05'")
+    node_another_bucket.query("ALTER TABLE s3.test ATTACH PARTITION '2020-01-06'")
+
+    assert node_another_bucket.query("SELECT count(*) FROM s3.test FORMAT Values") == "({})".format(4096 * 4)
+    assert node_another_bucket.query("SELECT sum(id) FROM s3.test FORMAT Values") == "({})".format(0)
+    assert node_another_bucket.query("SELECT sum(counter) FROM s3.test FORMAT Values") == "({})".format(4096 * 4)
+
+    # Attach partition that was already detached before backup-restore.
+    node_another_bucket.query("ALTER TABLE s3.test ATTACH PARTITION '2020-01-07'")
+
+    assert node_another_bucket.query("SELECT count(*) FROM s3.test FORMAT Values") == "({})".format(4096 * 5)
+    assert node_another_bucket.query("SELECT sum(id) FROM s3.test FORMAT Values") == "({})".format(0)
+    assert node_another_bucket.query("SELECT sum(counter) FROM s3.test FORMAT Values") == "({})".format(4096 * 5)
diff --git a/tests/integration/test_mysql_database_engine/test.py b/tests/integration/test_mysql_database_engine/test.py
index 4d10e2ea6f5..f4b0bb1b2fc 100644
--- a/tests/integration/test_mysql_database_engine/test.py
+++ b/tests/integration/test_mysql_database_engine/test.py
@@ -146,10 +146,14 @@ def test_clickhouse_join_for_mysql_database(started_cluster):
             "CREATE TABLE default.t1_remote_mysql AS mysql('mysql1:3306','test','t1_mysql_local','root','clickhouse')")
         clickhouse_node.query(
             "CREATE TABLE default.t2_remote_mysql AS mysql('mysql1:3306','test','t2_mysql_local','root','clickhouse')")
+        clickhouse_node.query("INSERT INTO `default`.`t1_remote_mysql` VALUES ('EN','A',''),('RU','B','AAA')")
+        clickhouse_node.query("INSERT INTO `default`.`t2_remote_mysql` VALUES ('A','AAA'),('Z','')")
+        
         assert clickhouse_node.query("SELECT s.pays "
                                      "FROM default.t1_remote_mysql AS s "
                                      "LEFT JOIN default.t1_remote_mysql AS s_ref "
-                                     "ON (s_ref.opco = s.opco AND s_ref.service = s.service)") == ''
+                                     "ON (s_ref.opco = s.opco AND s_ref.service = s.service) "
+                                     "WHERE s_ref.opco != '' AND s.opco != '' ").rstrip() == 'RU'
         mysql_node.query("DROP DATABASE test")
 
 
diff --git a/tests/integration/test_mysql_protocol/test.py b/tests/integration/test_mysql_protocol/test.py
index 7f7d59674bc..43daeebeaf5 100644
--- a/tests/integration/test_mysql_protocol/test.py
+++ b/tests/integration/test_mysql_protocol/test.py
@@ -149,8 +149,8 @@ def test_mysql_client_exception(mysql_client, server_address):
         -e "CREATE TABLE default.t1_remote_mysql AS mysql('127.0.0.1:10086','default','t1_local','default','');"
     '''.format(host=server_address, port=server_port), demux=True)
 
-    assert stderr[0:266].decode() == "mysql: [Warning] Using a password on the command line interface can be insecure.\n" \
-                            "ERROR 1000 (00000) at line 1: Poco::Exception. Code: 1000, e.code() = 2002, e.displayText() = mysqlxx::ConnectionFailed: Can't connect to MySQL server on '127.0.0.1' (115) ((nullptr):0)"
+    assert stderr[0:258].decode() == "mysql: [Warning] Using a password on the command line interface can be insecure.\n" \
+            "ERROR 1000 (00000) at line 1: Poco::Exception. Code: 1000, e.code() = 0, e.displayText() = Exception: Connections to all replicas failed: default@127.0.0.1:10086 as user default"
 
 
 def test_mysql_affected_rows(mysql_client, server_address):
diff --git a/tests/integration/test_odbc_interaction/test.py b/tests/integration/test_odbc_interaction/test.py
index 6bb6a6ee777..47d01389530 100644
--- a/tests/integration/test_odbc_interaction/test.py
+++ b/tests/integration/test_odbc_interaction/test.py
@@ -6,6 +6,7 @@ import pytest
 from helpers.cluster import ClickHouseCluster
 from helpers.test_tools import assert_eq_with_retry
 from psycopg2.extensions import ISOLATION_LEVEL_AUTOCOMMIT
+from multiprocessing.dummy import Pool
 
 cluster = ClickHouseCluster(__file__)
 node1 = cluster.add_instance('node1', with_odbc_drivers=True, with_mysql=True,
@@ -74,6 +75,9 @@ def started_cluster():
         node1.exec_in_container(
             ["bash", "-c", "echo 'CREATE TABLE t4(X INTEGER PRIMARY KEY ASC, Y, Z);' | sqlite3 {}".format(sqlite_db)],
             privileged=True, user='root')
+        node1.exec_in_container(
+            ["bash", "-c", "echo 'CREATE TABLE tf1(x INTEGER PRIMARY KEY ASC, y, z);' | sqlite3 {}".format(sqlite_db)],
+            privileged=True, user='root')
         print("sqlite tables created")
         mysql_conn = get_mysql_conn()
         print("mysql connection received")
@@ -177,6 +181,21 @@ def test_sqlite_simple_select_function_works(started_cluster):
     assert node1.query(
         "select count(), sum(x) from odbc('DSN={}', '{}') group by x".format(sqlite_setup["DSN"], 't1')) == "1\t1\n"
 
+def test_sqlite_table_function(started_cluster):
+    sqlite_setup = node1.odbc_drivers["SQLite3"]
+    sqlite_db = sqlite_setup["Database"]
+
+    node1.exec_in_container(["bash", "-c", "echo 'INSERT INTO tf1 values(1, 2, 3);' | sqlite3 {}".format(sqlite_db)],
+                            privileged=True, user='root')
+    node1.query("create table odbc_tf as odbc('DSN={}', '{}')".format(sqlite_setup["DSN"], 'tf1'))
+    assert node1.query("select * from odbc_tf") == "1\t2\t3\n"
+
+    assert node1.query("select y from odbc_tf") == "2\n"
+    assert node1.query("select z from odbc_tf") == "3\n"
+    assert node1.query("select x from odbc_tf") == "1\n"
+    assert node1.query("select x, y from odbc_tf") == "1\t2\n"
+    assert node1.query("select z, x, y from odbc_tf") == "3\t1\t2\n"
+    assert node1.query("select count(), sum(x) from odbc_tf group by x") == "1\t1\n"
 
 def test_sqlite_simple_select_storage_works(started_cluster):
     sqlite_setup = node1.odbc_drivers["SQLite3"]
@@ -251,7 +270,7 @@ def test_sqlite_odbc_cached_dictionary(started_cluster):
     node1.exec_in_container(["bash", "-c", "chmod a+rw /tmp"], privileged=True, user='root')
     node1.exec_in_container(["bash", "-c", "chmod a+rw {}".format(sqlite_db)], privileged=True, user='root')
 
-    node1.query("insert into table function odbc('DSN={};', '', 't3') values (200, 2, 7)".format(
+    node1.query("insert into table function odbc('DSN={};ReadOnly=0', '', 't3') values (200, 2, 7)".format(
         node1.odbc_drivers["SQLite3"]["DSN"]))
 
     assert node1.query("select dictGetUInt8('sqlite3_odbc_cached', 'Z', toUInt64(200))") == "7\n"  # new value
@@ -342,6 +361,7 @@ def test_bridge_dies_with_parent(started_cluster):
 
     assert clickhouse_pid is None
     assert bridge_pid is None
+    node1.start_clickhouse(20)
 
 
 def test_odbc_postgres_date_data_type(started_cluster):
@@ -362,5 +382,182 @@ def test_odbc_postgres_date_data_type(started_cluster):
     expected = '1\t2020-12-01\n2\t2020-12-02\n3\t2020-12-03\n'
     result = node1.query('SELECT * FROM test_date');
     assert(result == expected)
+    cursor.execute("DROP TABLE IF EXISTS clickhouse.test_date")
+    node1.query("DROP TABLE IF EXISTS test_date")
 
 
+def test_odbc_postgres_conversions(started_cluster):
+    conn = get_postgres_conn()
+    cursor = conn.cursor()
+
+    cursor.execute(
+        '''CREATE TABLE IF NOT EXISTS clickhouse.test_types (
+        a smallint, b integer, c bigint, d real, e double precision, f serial, g bigserial,
+        h timestamp)''')
+
+    node1.query('''
+        INSERT INTO TABLE FUNCTION
+        odbc('DSN=postgresql_odbc; Servername=postgre-sql.local', 'clickhouse', 'test_types')
+        VALUES (-32768, -2147483648, -9223372036854775808, 1.12345, 1.1234567890, 2147483647, 9223372036854775807, '2000-05-12 12:12:12')''')
+
+    result = node1.query('''
+        SELECT a, b, c, d, e, f, g, h
+        FROM odbc('DSN=postgresql_odbc; Servername=postgre-sql.local', 'clickhouse', 'test_types')
+        ''')
+
+    assert(result == '-32768\t-2147483648\t-9223372036854775808\t1.12345\t1.123456789\t2147483647\t9223372036854775807\t2000-05-12 12:12:12\n')
+    cursor.execute("DROP TABLE IF EXISTS clickhouse.test_types")
+
+    cursor.execute("""CREATE TABLE IF NOT EXISTS clickhouse.test_types (column1 Timestamp, column2 Numeric)""")
+
+    node1.query(
+        '''
+        CREATE TABLE test_types (column1 DateTime64, column2 Decimal(5, 1))
+        ENGINE=ODBC('DSN=postgresql_odbc; Servername=postgre-sql.local', 'clickhouse', 'test_types')''')
+
+    node1.query(
+        """INSERT INTO test_types
+        SELECT toDateTime64('2019-01-01 00:00:00', 3, 'Europe/Moscow'), toDecimal32(1.1, 1)""")
+
+    expected = node1.query("SELECT toDateTime64('2019-01-01 00:00:00', 3, 'Europe/Moscow'), toDecimal32(1.1, 1)")
+    result = node1.query("SELECT * FROM test_types")
+    print(result)
+    cursor.execute("DROP TABLE IF EXISTS clickhouse.test_types")
+    assert(result == expected)
+
+
+def test_odbc_cyrillic_with_varchar(started_cluster):
+    conn = get_postgres_conn()
+    cursor = conn.cursor()
+
+    cursor.execute("DROP TABLE IF EXISTS clickhouse.test_cyrillic")
+    cursor.execute("CREATE TABLE clickhouse.test_cyrillic (name varchar(11))")
+
+    node1.query('''
+        CREATE TABLE test_cyrillic (name String)
+        ENGINE = ODBC('DSN=postgresql_odbc; Servername=postgre-sql.local', 'clickhouse', 'test_cyrillic')''')
+
+    cursor.execute("INSERT INTO clickhouse.test_cyrillic VALUES ('A-nice-word')")
+    cursor.execute("INSERT INTO clickhouse.test_cyrillic VALUES ('Красивенько')")
+
+    result = node1.query(''' SELECT * FROM test_cyrillic ORDER BY name''')
+    assert(result == 'A-nice-word\nКрасивенько\n')
+    result = node1.query(''' SELECT name FROM odbc('DSN=postgresql_odbc; Servername=postgre-sql.local', 'clickhouse', 'test_cyrillic') ''')
+    assert(result == 'A-nice-word\nКрасивенько\n')
+
+
+def test_many_connections(started_cluster):
+    conn = get_postgres_conn()
+    cursor = conn.cursor()
+
+    cursor.execute('DROP TABLE IF EXISTS clickhouse.test_pg_table')
+    cursor.execute('CREATE TABLE clickhouse.test_pg_table (key integer, value integer)')
+
+    node1.query('''
+        DROP TABLE IF EXISTS test_pg_table;
+        CREATE TABLE test_pg_table (key UInt32, value UInt32)
+        ENGINE = ODBC('DSN=postgresql_odbc; Servername=postgre-sql.local', 'clickhouse', 'test_pg_table')''')
+
+    node1.query("INSERT INTO test_pg_table SELECT number, number FROM numbers(10)")
+
+    query = "SELECT count() FROM ("
+    for i in range (24):
+        query += "SELECT key FROM {t} UNION ALL "
+    query += "SELECT key FROM {t})"
+
+    assert node1.query(query.format(t='test_pg_table')) == '250\n'
+
+
+def test_concurrent_queries(started_cluster):
+    conn = get_postgres_conn()
+    cursor = conn.cursor()
+
+    node1.query('''
+        DROP TABLE IF EXISTS test_pg_table;
+        CREATE TABLE test_pg_table (key UInt32, value UInt32)
+        ENGINE = ODBC('DSN=postgresql_odbc; Servername=postgre-sql.local', 'clickhouse', 'test_pg_table')''')
+
+    cursor.execute('DROP TABLE IF EXISTS clickhouse.test_pg_table')
+    cursor.execute('CREATE TABLE clickhouse.test_pg_table (key integer, value integer)')
+
+    def node_insert(_):
+        for i in range(5):
+            node1.query("INSERT INTO test_pg_table SELECT number, number FROM numbers(1000)", user='default')
+
+    busy_pool = Pool(5)
+    p = busy_pool.map_async(node_insert, range(5))
+    p.wait()
+    result = node1.query("SELECT count() FROM test_pg_table", user='default')
+    print(result)
+    assert(int(result) == 5 * 5 * 1000)
+
+    def node_insert_select(_):
+        for i in range(5):
+            result = node1.query("INSERT INTO test_pg_table SELECT number, number FROM numbers(1000)", user='default')
+            result = node1.query("SELECT * FROM test_pg_table LIMIT 100", user='default')
+
+    busy_pool = Pool(5)
+    p = busy_pool.map_async(node_insert_select, range(5))
+    p.wait()
+    result = node1.query("SELECT count() FROM test_pg_table", user='default')
+    print(result)
+    assert(int(result) == 5 * 5 * 1000  * 2)
+
+    node1.query('DROP TABLE test_pg_table;')
+    cursor.execute('DROP TABLE clickhouse.test_pg_table;')
+
+
+def test_odbc_long_column_names(started_cluster):
+    conn = get_postgres_conn();
+    cursor = conn.cursor()
+
+    column_name = "column" * 8
+    create_table = "CREATE TABLE clickhouse.test_long_column_names ("
+    for i in range(1000):
+        if i != 0:
+            create_table += ", "
+        create_table += "{} integer".format(column_name + str(i))
+    create_table += ")"
+    cursor.execute(create_table)
+    insert = "INSERT INTO clickhouse.test_long_column_names SELECT i" + ", i" * 999 + " FROM generate_series(0, 99) as t(i)"
+    cursor.execute(insert)
+    conn.commit()
+
+    create_table = "CREATE TABLE test_long_column_names ("
+    for i in range(1000):
+        if i != 0:
+            create_table += ", "
+        create_table += "{} UInt32".format(column_name + str(i))
+    create_table += ") ENGINE=ODBC('DSN=postgresql_odbc; Servername=postgre-sql.local', 'clickhouse', 'test_long_column_names')"
+    result = node1.query(create_table);
+
+    result = node1.query('SELECT * FROM test_long_column_names');
+    expected = node1.query("SELECT number" + ", number" * 999 + " FROM numbers(100)")
+    assert(result == expected)
+
+    cursor.execute("DROP TABLE IF EXISTS clickhouse.test_long_column_names")
+    node1.query("DROP TABLE IF EXISTS test_long_column_names")
+
+
+def test_odbc_long_text(started_cluster):
+    conn = get_postgres_conn()
+    cursor = conn.cursor()
+    cursor.execute("drop table if exists clickhouse.test_long_text")
+    cursor.execute("create table clickhouse.test_long_text(flen int, field1 text)");
+
+    # sample test from issue 9363
+    text_from_issue = """BEGIN These examples only show the order that data is arranged in. The values from different columns are stored separately, and data from the same column is stored together.      Examples of a column-oriented DBMS: Vertica, Paraccel (Actian Matrix and Amazon Redshift), Sybase IQ, Exasol, Infobright, InfiniDB, MonetDB (VectorWise and Actian Vector), LucidDB, SAP HANA, Google Dremel, Google PowerDrill, Druid, and kdb+.      Different orders for storing data are better suited to different scenarios. The data access scenario refers to what queries are made, how often, and in what proportion; how much data is read for each type of query – rows, columns, and bytes; the relationship between reading and updating data; the working size of the data and how locally it is used; whether transactions are used, and how isolated they are; requirements for data replication and logical integrity; requirements for latency and throughput for each type of query, and so on.      The higher the load on the system, the more important it is to customize the system set up to match the requirements of the usage scenario, and the more fine grained this customization becomes. There is no system that is equally well-suited to significantly different scenarios. If a system is adaptable to a wide set of scenarios, under a high load, the system will handle all the scenarios equally poorly, or will work well for just one or few of possible scenarios.   Key Properties of OLAP Scenario¶          The vast majority of requests are for read access.       Data is updated in fairly large batches (> 1000 rows), not by single rows; or it is not updated at all.       Data is added to the DB but is not modified.       For reads, quite a large number of rows are extracted from the DB, but only a small subset of columns.       Tables are "wide," meaning they contain a large number of columns.       Queries are relatively rare (usually hundreds of queries per server or less per second).       For simple queries, latencies around 50 ms are allowed.       Column values are fairly small: numbers and short strings (for example, 60 bytes per URL).       Requires high throughput when processing a single query (up to billions of rows per second per server).       Transactions are not necessary.       Low requirements for data consistency.       There is one large table per query. All tables are small, except for one.       A query result is significantly smaller than the source data. In other words, data is filtered or aggregated, so the result fits in a single server"s RAM.      It is easy to see that the OLAP scenario is very different from other popular scenarios (such as OLTP or Key-Value access). So it doesn"t make sense to try to use OLTP or a Key-Value DB for processing analytical queries if you want to get decent performance. For example, if you try to use MongoDB or Redis for analytics, you will get very poor performance compared to OLAP databases.   Why Column-Oriented Databases Work Better in the OLAP Scenario¶      Column-oriented databases are better suited to OLAP scenarios: they are at least 100 times faster in processing most queries. The reasons are explained in detail below, but the fact is easier to demonstrate visually. END"""
+    cursor.execute("""insert into clickhouse.test_long_text (flen, field1) values (3248, '{}')""".format(text_from_issue));
+
+    node1.query('''
+        DROP TABLE IF EXISTS test_long_test;
+        CREATE TABLE test_long_text (flen UInt32, field1 String)
+        ENGINE = ODBC('DSN=postgresql_odbc; Servername=postgre-sql.local', 'clickhouse', 'test_long_text')''')
+    result = node1.query("select field1 from test_long_text;")
+    assert(result.strip() == text_from_issue)
+
+    long_text = "text" * 1000000
+    cursor.execute("""insert into clickhouse.test_long_text (flen, field1) values (400000, '{}')""".format(long_text));
+    result = node1.query("select field1 from test_long_text where flen=400000;")
+    assert(result.strip() == long_text)
+
diff --git a/tests/integration/test_optimize_on_insert/__init__.py b/tests/integration/test_optimize_on_insert/__init__.py
new file mode 100644
index 00000000000..e5a0d9b4834
--- /dev/null
+++ b/tests/integration/test_optimize_on_insert/__init__.py
@@ -0,0 +1 @@
+#!/usr/bin/env python3
diff --git a/tests/integration/test_optimize_on_insert/test.py b/tests/integration/test_optimize_on_insert/test.py
new file mode 100644
index 00000000000..da4e20edf0c
--- /dev/null
+++ b/tests/integration/test_optimize_on_insert/test.py
@@ -0,0 +1,48 @@
+#!/usr/bin/env python3
+
+import pytest
+from helpers.client import QueryRuntimeException
+from helpers.cluster import ClickHouseCluster
+
+cluster = ClickHouseCluster(__file__)
+node1 = cluster.add_instance('node1', with_zookeeper=True)
+node2 = cluster.add_instance('node2', with_zookeeper=True)
+
+@pytest.fixture(scope="module")
+def start_cluster():
+    try:
+        cluster.start()
+
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+
+def get_data_files_for_table(node, table_name):
+    raw_output = node.exec_in_container(["bash", "-c", "ls /var/lib/clickhouse/data/default/{}".format(table_name)])
+    return raw_output.strip().split("\n")
+
+def test_empty_parts_optimize(start_cluster):
+    for n, node in enumerate([node1, node2]):
+        node.query("""
+            CREATE TABLE empty (key UInt32, val UInt32, date Datetime)
+            ENGINE=ReplicatedSummingMergeTree('/clickhouse/01560_optimize_on_insert', '{}', val)
+            PARTITION BY date ORDER BY key;
+        """.format(n+1))
+
+    node1.query("INSERT INTO empty VALUES (1, 1, '2020-01-01'), (1, 1, '2020-01-01'), (1, -2, '2020-01-01')")
+
+    node2.query("SYSTEM SYNC REPLICA empty", timeout=15)
+
+    assert node1.query("SELECT * FROM empty") == ""
+    assert node2.query("SELECT * FROM empty") == ""
+
+    # No other tmp files exists
+    assert set(get_data_files_for_table(node1, "empty")) == {"detached", "format_version.txt"}
+    assert set(get_data_files_for_table(node2, "empty")) == {"detached", "format_version.txt"}
+
+    node1.query("INSERT INTO empty VALUES (1, 1, '2020-02-01'), (1, 1, '2020-02-01'), (1, -2, '2020-02-01')", settings={"insert_quorum": 2})
+
+    assert node1.query("SELECT * FROM empty") == ""
+    assert node2.query("SELECT * FROM empty") == ""
diff --git a/tests/integration/test_quota/test.py b/tests/integration/test_quota/test.py
index 353d776c0f3..0f59ae27583 100644
--- a/tests/integration/test_quota/test.py
+++ b/tests/integration/test_quota/test.py
@@ -372,6 +372,7 @@ def test_dcl_management():
 def test_users_xml_is_readonly():
     assert re.search("storage is readonly", instance.query_and_get_error("DROP QUOTA myQuota"))
 
+
 def test_query_inserts():
     check_system_quotas([["myQuota", "e651da9c-a748-8703-061a-7e5e5096dae7", "users.xml", "['user_name']", [31556952],
                           0, "['default']", "[]"]])
@@ -380,13 +381,43 @@ def test_query_inserts():
     system_quotas_usage(
         [["myQuota", "default", 1, 31556952, 0, 1000, 0, 500, 0, 500, 0, "\\N", 0, "\\N", 0, "\\N", 0, 1000, 0, "\\N", "\\N"]])
 
-    instance.query("INSERT INTO test_table values(1)")
+    instance.query("DROP TABLE IF EXISTS test_table_ins")
+    instance.query("CREATE TABLE test_table_ins(x UInt32) ENGINE = MergeTree ORDER BY tuple()")
     system_quota_usage(
-        [["myQuota", "default", 31556952, 1, 1000, 0, 500, 1, 500, 0, "\\N", 0, "\\N", 0, "\\N", 0, 1000, 0, "\\N", "\\N"]])
+        [["myQuota", "default", 31556952, 2, 1000, 0, 500, 0, 500, 0, "\\N", 0, "\\N", 0, "\\N", 0, 1000, 0, "\\N", "\\N"]])
+    
+    instance.query("INSERT INTO test_table_ins values(1)")
+    system_quota_usage(
+        [["myQuota", "default", 31556952, 3, 1000, 0, 500, 1, 500, 0, "\\N", 0, "\\N", 0, "\\N", 0, 1000, 0, "\\N", "\\N"]])
+    instance.query("DROP TABLE test_table_ins")
 
-def test_consumption_show_tables_quota():
-    instance.query("SHOW TABLES")
 
+def test_consumption_of_show_tables():
+    assert instance.query("SHOW TABLES") == "test_table\n"
     assert re.match(
-        "myQuota\\tdefault\\t.*\\t31556952\\t1\\t1000\\t1\\t500\\t0\\t500\\t0\\t\\\\N\\t1\\t\\\\N\\t19\\t\\\\N\\t1\\t1000\\t35\\t\\\\N\\t.*\\t\\\\N\n",
+        "myQuota\\tdefault\\t.*\\t31556952\\t1\\t1000\\t1\\t500\\t0\\t500\\t0\\t\\\\N\\t1\\t\\\\N.*",
+        instance.query("SHOW QUOTA"))
+
+def test_consumption_of_show_databases():
+    assert instance.query("SHOW DATABASES") == "default\nsystem\n"
+    assert re.match(
+        "myQuota\\tdefault\\t.*\\t31556952\\t1\\t1000\\t1\\t500\\t0\\t500\\t0\\t\\\\N\\t2\\t\\\\N.*",
+        instance.query("SHOW QUOTA"))
+
+def test_consumption_of_show_clusters():
+    assert len(instance.query("SHOW CLUSTERS")) > 0
+    assert re.match(
+        "myQuota\\tdefault\\t.*\\t31556952\\t1\\t1000\\t1\\t500\\t0\\t500\\t0\\t\\\\N.*",
+        instance.query("SHOW QUOTA"))
+
+def test_consumption_of_show_processlist():
+    instance.query("SHOW PROCESSLIST")
+    assert re.match(
+        "myQuota\\tdefault\\t.*\\t31556952\\t1\\t1000\\t1\\t500\\t0\\t500\\t0\\t\\\\N\\t0\\t\\\\N.*",
+        instance.query("SHOW QUOTA"))
+
+def test_consumption_of_show_privileges():
+    assert len(instance.query("SHOW PRIVILEGES")) > 0
+    assert re.match(
+        "myQuota\\tdefault\\t.*\\t31556952\\t1\\t1000\\t1\\t500\\t0\\t500\\t0\\t\\\\N.*",
         instance.query("SHOW QUOTA"))
diff --git a/tests/integration/test_reload_auxiliary_zookeepers/test.py b/tests/integration/test_reload_auxiliary_zookeepers/test.py
index 92c66c890fc..1b14408bc12 100644
--- a/tests/integration/test_reload_auxiliary_zookeepers/test.py
+++ b/tests/integration/test_reload_auxiliary_zookeepers/test.py
@@ -62,8 +62,7 @@ def test_reload_auxiliary_zookeepers(start_cluster):
 </yandex>"""
     node.replace_config("/etc/clickhouse-server/conf.d/zookeeper.xml", new_config)
 
-    # Hopefully it has finished the configuration reload
-    time.sleep(2)
+    node.query("SYSTEM RELOAD CONFIG")
 
     node.query(
         "ALTER TABLE simple2 FETCH PARTITION '2020-08-27' FROM 'zookeeper2:/clickhouse/tables/0/simple';"
@@ -81,7 +80,7 @@ def test_reload_auxiliary_zookeepers(start_cluster):
     </zookeeper>
 </yandex>"""
     node.replace_config("/etc/clickhouse-server/conf.d/zookeeper.xml", new_config)
-    time.sleep(2)
+    node.query("SYSTEM RELOAD CONFIG")
     with pytest.raises(QueryRuntimeException):
         node.query(
             "ALTER TABLE simple2 FETCH PARTITION '2020-08-27' FROM 'zookeeper2:/clickhouse/tables/0/simple';"
diff --git a/tests/integration/test_reload_clusters_config/__init__.py b/tests/integration/test_reload_clusters_config/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/integration/test_reload_clusters_config/configs/remote_servers.xml b/tests/integration/test_reload_clusters_config/configs/remote_servers.xml
new file mode 100644
index 00000000000..b827fce02be
--- /dev/null
+++ b/tests/integration/test_reload_clusters_config/configs/remote_servers.xml
@@ -0,0 +1,30 @@
+<yandex>
+    <remote_servers>
+        <test_cluster>
+            <shard>
+                <internal_replication>true</internal_replication>
+                <replica>
+                    <host>node_1</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>node_2</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </test_cluster>
+        <test_cluster2>
+            <shard>
+                <internal_replication>true</internal_replication>
+                <replica>
+                    <host>node_1</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>node_2</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </test_cluster2>
+    </remote_servers>
+</yandex>
diff --git a/tests/integration/test_reload_clusters_config/test.py b/tests/integration/test_reload_clusters_config/test.py
new file mode 100644
index 00000000000..f1fb0d820d4
--- /dev/null
+++ b/tests/integration/test_reload_clusters_config/test.py
@@ -0,0 +1,235 @@
+import os
+import sys
+import time
+
+import pytest
+
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
+from helpers.cluster import ClickHouseCluster
+from helpers.network import PartitionManager
+from helpers.test_tools import TSV
+
+cluster = ClickHouseCluster(__file__)
+node = cluster.add_instance('node', with_zookeeper=True, main_configs=['configs/remote_servers.xml'])
+node_1 = cluster.add_instance('node_1', with_zookeeper=True)
+node_2 = cluster.add_instance('node_2', with_zookeeper=True)
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+
+        node.query('''CREATE TABLE distributed (id UInt32) ENGINE =
+            Distributed('test_cluster', 'default', 'replicated')''')
+        
+        node.query('''CREATE TABLE distributed2 (id UInt32) ENGINE =
+            Distributed('test_cluster2', 'default', 'replicated')''')
+
+        cluster.pause_container('node_1')
+        cluster.pause_container('node_2')
+
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+
+base_config = '''
+<yandex>
+    <remote_servers>
+        <test_cluster>
+            <shard>
+                <internal_replication>true</internal_replication>
+                <replica>
+                    <host>node_1</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>node_2</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </test_cluster>
+        <test_cluster2>
+            <shard>
+                <internal_replication>true</internal_replication>
+                <replica>
+                    <host>node_1</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>node_2</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </test_cluster2>
+    </remote_servers>
+</yandex>
+'''
+
+test_config1 = '''
+<yandex>
+    <remote_servers>
+        <test_cluster>
+            <shard>
+                <internal_replication>true</internal_replication>
+                <replica>
+                    <host>node_1</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </test_cluster>
+        <test_cluster2>
+            <shard>
+                <internal_replication>true</internal_replication>
+                <replica>
+                    <host>node_1</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>node_2</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </test_cluster2>
+    </remote_servers>
+</yandex>
+'''
+
+test_config2 = '''
+<yandex>
+    <remote_servers>
+        <test_cluster>
+            <shard>
+                <internal_replication>true</internal_replication>
+                <replica>
+                    <host>node_1</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>node_2</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </test_cluster>
+    </remote_servers>
+</yandex>
+'''
+
+test_config3 = '''
+<yandex>
+    <remote_servers>
+        <test_cluster>
+            <shard>
+                <internal_replication>true</internal_replication>
+                <replica>
+                    <host>node_1</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>node_2</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </test_cluster>
+        <test_cluster2>
+            <shard>
+                <internal_replication>true</internal_replication>
+                <replica>
+                    <host>node_1</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>node_2</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </test_cluster2>
+        <test_cluster3>
+            <shard>
+                <internal_replication>true</internal_replication>
+                <replica>
+                    <host>node_1</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </test_cluster3>
+    </remote_servers>
+</yandex>
+'''
+
+
+def send_repeated_query(table, count=5):
+    for i in range(count):
+        node.query_and_get_error("SELECT count() FROM {} SETTINGS receive_timeout=1".format(table))
+
+
+def get_errors_count(cluster, host_name="node_1"):
+    return int(node.query("SELECT errors_count FROM system.clusters WHERE cluster='{}' and host_name='{}'".format(cluster, host_name)))
+
+
+def set_config(config):
+    node.replace_config("/etc/clickhouse-server/config.d/remote_servers.xml", config)
+    node.query("SYSTEM RELOAD CONFIG")
+
+
+def test_simple_reload(started_cluster):
+    send_repeated_query("distributed")
+
+    assert get_errors_count("test_cluster") > 0
+    
+    node.query("SYSTEM RELOAD CONFIG")
+
+    assert get_errors_count("test_cluster") > 0
+
+
+def test_update_one_cluster(started_cluster):
+    send_repeated_query("distributed")
+    send_repeated_query("distributed2")
+
+    assert get_errors_count("test_cluster") > 0
+    assert get_errors_count("test_cluster2") > 0
+
+    set_config(test_config1)
+
+    assert get_errors_count("test_cluster") == 0
+    assert get_errors_count("test_cluster2") > 0
+
+    set_config(base_config)
+
+
+def test_delete_cluster(started_cluster):
+    send_repeated_query("distributed")
+    send_repeated_query("distributed2")
+
+    assert get_errors_count("test_cluster") > 0
+    assert get_errors_count("test_cluster2") > 0
+
+    set_config(test_config2)
+
+    assert get_errors_count("test_cluster") > 0
+    
+    result = node.query("SELECT * FROM system.clusters WHERE cluster='test_cluster2'")
+    assert result == ''
+
+    set_config(base_config)
+
+
+def test_add_cluster(started_cluster):
+    send_repeated_query("distributed")
+    send_repeated_query("distributed2")
+
+    assert get_errors_count("test_cluster") > 0
+    assert get_errors_count("test_cluster2") > 0
+
+    set_config(test_config3)
+
+    assert get_errors_count("test_cluster") > 0
+    assert get_errors_count("test_cluster2") > 0
+
+    result = node.query("SELECT * FROM system.clusters WHERE cluster='test_cluster3'")
+    assert result != ''
+
+    set_config(base_config)
+
diff --git a/tests/integration/test_reload_zookeeper/test.py b/tests/integration/test_reload_zookeeper/test.py
index 82c47f4ec9e..1fe0ab13a7f 100644
--- a/tests/integration/test_reload_zookeeper/test.py
+++ b/tests/integration/test_reload_zookeeper/test.py
@@ -74,6 +74,9 @@ def test_reload_zookeeper(start_cluster):
     with pytest.raises(QueryRuntimeException):
         node.query("SELECT COUNT() FROM test_table", settings={"select_sequential_consistency" : 1})
 
+    def get_active_zk_connections():
+        return str(node.exec_in_container(['bash', '-c', 'lsof -a -i4 -i6 -itcp -w | grep 2181 | grep ESTABLISHED | wc -l'], privileged=True, user='root')).strip()
+
     ## set config to zoo2, server will be normal
     new_config = """
 <yandex>
@@ -89,5 +92,10 @@ def test_reload_zookeeper(start_cluster):
     node.replace_config("/etc/clickhouse-server/conf.d/zookeeper.xml", new_config)
     node.query("SYSTEM RELOAD CONFIG")
 
+    active_zk_connections = get_active_zk_connections()
+    assert active_zk_connections == '1', "Total connections to ZooKeeper not equal to 1, {}".format(active_zk_connections)
+
     assert_eq_with_retry(node, "SELECT COUNT() FROM test_table", '1000', retry_count=120, sleep_time=0.5)
 
+    active_zk_connections = get_active_zk_connections()
+    assert active_zk_connections == '1', "Total connections to ZooKeeper not equal to 1, {}".format(active_zk_connections)
diff --git a/tests/integration/test_replace_partition/test.py b/tests/integration/test_replace_partition/test.py
index 06e7f4be82b..d30a038825f 100644
--- a/tests/integration/test_replace_partition/test.py
+++ b/tests/integration/test_replace_partition/test.py
@@ -1,3 +1,8 @@
+# pylint: disable=line-too-long
+# pylint: disable=unused-argument
+# pylint: disable=redefined-outer-name:
+
+import time
 import pytest
 
 from helpers.cluster import ClickHouseCluster
@@ -13,13 +18,13 @@ def _fill_nodes(nodes, shard):
         node.query(
             '''
                 CREATE DATABASE test;
-    
+
                 CREATE TABLE real_table(date Date, id UInt32, dummy UInt32)
                 ENGINE = MergeTree(date, id, 8192);
-    
+
                 CREATE TABLE other_table(date Date, id UInt32, dummy UInt32)
                 ENGINE = MergeTree(date, id, 8192);
-    
+
                 CREATE TABLE test_table(date Date, id UInt32, dummy UInt32)
                 ENGINE = ReplicatedMergeTree('/clickhouse/tables/test{shard}/replicated', '{replica}', date, id, 8192);
             '''.format(shard=shard, replica=node.name))
@@ -97,12 +102,13 @@ def test_drop_failover(drop_failover):
         # Drop partition on source node
         node3.query("ALTER TABLE test_table DROP PARTITION 201706")
 
-    # connection restored
+    # Wait few seconds for connection to zookeeper to be restored
+    time.sleep(5)
 
-    node4.query_with_retry("select last_exception from system.replication_queue where type = 'REPLACE_RANGE'",
-                           check_callback=lambda x: 'Not found part' not in x, sleep_time=1)
-    assert 'Not found part' not in node4.query(
-        "select last_exception from system.replication_queue where type = 'REPLACE_RANGE'")
+    msg = node4.query_with_retry(
+        "select last_exception from system.replication_queue where type = 'REPLACE_RANGE'",
+        check_callback=lambda x: 'Not found part' not in x, sleep_time=1)
+    assert 'Not found part' not in msg
     assert_eq_with_retry(node4, "SELECT id FROM test_table order by id", '')
 
 
@@ -151,8 +157,11 @@ def test_replace_after_replace_failover(replace_after_replace_failover):
 
         assert_eq_with_retry(node5, "SELECT id FROM test_table order by id", '333')
 
-    node6.query_with_retry("select last_exception from system.replication_queue where type = 'REPLACE_RANGE'",
-                           check_callback=lambda x: 'Not found part' not in x, sleep_time=1)
-    assert 'Not found part' not in node6.query(
-        "select last_exception from system.replication_queue where type = 'REPLACE_RANGE'")
+    # Wait few seconds for connection to zookeeper to be restored
+    time.sleep(5)
+
+    msg = node6.query_with_retry(
+        "select last_exception from system.replication_queue where type = 'REPLACE_RANGE'",
+        check_callback=lambda x: 'Not found part' not in x, sleep_time=1)
+    assert 'Not found part' not in msg
     assert_eq_with_retry(node6, "SELECT id FROM test_table order by id", '333')
diff --git a/tests/integration/test_replicated_database/configs/config.xml b/tests/integration/test_replicated_database/configs/config.xml
index ebceee3aa5c..d751454437c 100644
--- a/tests/integration/test_replicated_database/configs/config.xml
+++ b/tests/integration/test_replicated_database/configs/config.xml
@@ -1,34 +1,3 @@
 <yandex>
     <database_atomic_delay_before_drop_table_sec>10</database_atomic_delay_before_drop_table_sec>
-
-    <remote_servers>
-        <cluster>
-            <shard>
-                <internal_replication>true</internal_replication>
-                <replica>
-                    <host>main_node</host>
-                    <port>9000</port>
-                </replica>
-                <replica>
-                    <host>dummy_node</host>
-                    <port>9000</port>
-                </replica>
-                <replica>
-                    <host>competing_node</host>
-                    <port>9000</port>
-                </replica>
-            </shard>
-            <shard>
-                <internal_replication>true</internal_replication>
-                <replica>
-                    <host>snapshotting_node</host>
-                    <port>9000</port>
-                </replica>
-                <replica>
-                    <host>snapshot_recovering_node</host>
-                    <port>9000</port>
-                </replica>
-            </shard>
-        </cluster>
-    </remote_servers>
 </yandex>
diff --git a/tests/integration/test_replicated_database/configs/settings.xml b/tests/integration/test_replicated_database/configs/settings.xml
index e0f7e8691e6..7f45502e20d 100644
--- a/tests/integration/test_replicated_database/configs/settings.xml
+++ b/tests/integration/test_replicated_database/configs/settings.xml
@@ -2,6 +2,7 @@
     <profiles>
         <default>
             <allow_experimental_database_replicated>1</allow_experimental_database_replicated>
+            <allow_experimental_alter_materialized_view_structure>1</allow_experimental_alter_materialized_view_structure>
         </default>
     </profiles>
     <users>
diff --git a/tests/integration/test_replicated_database/test.py b/tests/integration/test_replicated_database/test.py
index 99e7d6077f8..70d779ea737 100644
--- a/tests/integration/test_replicated_database/test.py
+++ b/tests/integration/test_replicated_database/test.py
@@ -35,8 +35,17 @@ def started_cluster():
         cluster.shutdown()
 
 def test_create_replicated_table(started_cluster):
+    assert "Explicit zookeeper_path and replica_name are specified" in \
+           main_node.query_and_get_error("CREATE TABLE testdb.replicated_table (d Date, k UInt64, i32 Int32) "
+                                         "ENGINE=ReplicatedMergeTree('/test/tmp', 'r') ORDER BY k PARTITION BY toYYYYMM(d);")
+
+    assert "Explicit zookeeper_path and replica_name are specified" in \
+           main_node.query_and_get_error("CREATE TABLE testdb.replicated_table (d Date, k UInt64, i32 Int32) "
+                                         "ENGINE=ReplicatedMergeTree('/test/tmp', 'r', d, k, 8192);")
+
     assert "Old syntax is not allowed" in \
-           main_node.query_and_get_error("CREATE TABLE testdb.replicated_table (d Date, k UInt64, i32 Int32) ENGINE=ReplicatedMergeTree('/test/tmp', 'r', d, k, 8192);")
+           main_node.query_and_get_error("CREATE TABLE testdb.replicated_table (d Date, k UInt64, i32 Int32) "
+                                         "ENGINE=ReplicatedMergeTree('/test/tmp/{shard}', '{replica}', d, k, 8192);")
 
     main_node.query("CREATE TABLE testdb.replicated_table (d Date, k UInt64, i32 Int32) ENGINE=ReplicatedMergeTree ORDER BY k PARTITION BY toYYYYMM(d);")
 
@@ -99,16 +108,20 @@ def test_alters_from_different_replicas(started_cluster):
                     "(CounterID UInt32, StartDate Date, UserID UInt32, VisitID UInt32, NestedColumn Nested(A UInt8, S String), ToDrop UInt32) "
                     "ENGINE = MergeTree(StartDate, intHash32(UserID), (CounterID, StartDate, intHash32(UserID), VisitID), 8192);")
 
-    main_node.query("CREATE TABLE testdb.dist AS testdb.concurrent_test ENGINE = Distributed(cluster, testdb, concurrent_test, CounterID)")
+    main_node.query("CREATE TABLE testdb.dist AS testdb.concurrent_test ENGINE = Distributed(testdb, testdb, concurrent_test, CounterID)")
 
     dummy_node.stop_clickhouse(kill=True)
 
-    settings = {"distributed_ddl_task_timeout": 10}
+    settings = {"distributed_ddl_task_timeout": 5}
     assert "There are 1 unfinished hosts (0 of them are currently active)" in \
         competing_node.query_and_get_error("ALTER TABLE testdb.concurrent_test ADD COLUMN Added0 UInt32;", settings=settings)
+    settings = {"distributed_ddl_task_timeout": 5, "distributed_ddl_output_mode": "null_status_on_timeout"}
+    assert "shard1|replica2\t\\N\t\\N" in \
+        main_node.query("ALTER TABLE testdb.concurrent_test ADD COLUMN Added2 UInt32;", settings=settings)
+    settings = {"distributed_ddl_task_timeout": 5, "distributed_ddl_output_mode": "never_throw"}
+    assert "shard1|replica2\t\\N\t\\N" in \
+        competing_node.query("ALTER TABLE testdb.concurrent_test ADD COLUMN Added1 UInt32 AFTER Added0;", settings=settings)
     dummy_node.start_clickhouse()
-    main_node.query("ALTER TABLE testdb.concurrent_test ADD COLUMN Added2 UInt32;")
-    competing_node.query("ALTER TABLE testdb.concurrent_test ADD COLUMN Added1 UInt32 AFTER Added0;")
     main_node.query("ALTER TABLE testdb.concurrent_test ADD COLUMN AddedNested1 Nested(A UInt32, B UInt64) AFTER Added2;")
     competing_node.query("ALTER TABLE testdb.concurrent_test ADD COLUMN AddedNested1.C Array(String) AFTER AddedNested1.B;")
     main_node.query("ALTER TABLE testdb.concurrent_test ADD COLUMN AddedNested2 Nested(A UInt32, B UInt64) AFTER AddedNested1;")
@@ -198,8 +211,14 @@ def test_recover_staled_replica(started_cluster):
     dummy_node.query("CREATE TABLE recover.rmt2 (n int) ENGINE=ReplicatedMergeTree order by n", settings=settings)
     main_node.query("CREATE TABLE recover.rmt3 (n int) ENGINE=ReplicatedMergeTree order by n", settings=settings)
     dummy_node.query("CREATE TABLE recover.rmt5 (n int) ENGINE=ReplicatedMergeTree order by n", settings=settings)
-    main_node.query("CREATE DICTIONARY recover.d1 (n int DEFAULT 0, m int DEFAULT 1) PRIMARY KEY n SOURCE(CLICKHOUSE(HOST 'localhost' PORT 9000 USER 'default' TABLE 'rmt1' PASSWORD '' DB 'recover')) LIFETIME(MIN 1 MAX 10) LAYOUT(FLAT())")
-    dummy_node.query("CREATE DICTIONARY recover.d2 (n int DEFAULT 0, m int DEFAULT 1) PRIMARY KEY n SOURCE(CLICKHOUSE(HOST 'localhost' PORT 9000 USER 'default' TABLE 'rmt2' PASSWORD '' DB 'recover')) LIFETIME(MIN 1 MAX 10) LAYOUT(FLAT())")
+    main_node.query("CREATE MATERIALIZED VIEW recover.mv1 (n int) ENGINE=ReplicatedMergeTree order by n AS SELECT n FROM recover.rmt1", settings=settings)
+    dummy_node.query("CREATE MATERIALIZED VIEW recover.mv2 (n int) ENGINE=ReplicatedMergeTree order by n  AS SELECT n FROM recover.rmt2", settings=settings)
+    main_node.query("CREATE DICTIONARY recover.d1 (n int DEFAULT 0, m int DEFAULT 1) PRIMARY KEY n "
+                    "SOURCE(CLICKHOUSE(HOST 'localhost' PORT 9000 USER 'default' TABLE 'rmt1' PASSWORD '' DB 'recover')) "
+                    "LIFETIME(MIN 1 MAX 10) LAYOUT(FLAT())")
+    dummy_node.query("CREATE DICTIONARY recover.d2 (n int DEFAULT 0, m int DEFAULT 1) PRIMARY KEY n "
+                     "SOURCE(CLICKHOUSE(HOST 'localhost' PORT 9000 USER 'default' TABLE 'rmt2' PASSWORD '' DB 'recover')) "
+                     "LIFETIME(MIN 1 MAX 10) LAYOUT(FLAT())")
 
     for table in ['t1', 't2', 'mt1', 'mt2', 'rmt1', 'rmt2', 'rmt3', 'rmt5']:
         main_node.query("INSERT INTO recover.{} VALUES (42)".format(table))
@@ -217,35 +236,44 @@ def test_recover_staled_replica(started_cluster):
         main_node.query("RENAME TABLE recover.rmt3 TO recover.rmt4", settings=settings)
         main_node.query("DROP TABLE recover.rmt5", settings=settings)
         main_node.query("DROP DICTIONARY recover.d2", settings=settings)
-        main_node.query("CREATE DICTIONARY recover.d2 (n int DEFAULT 0, m int DEFAULT 1) PRIMARY KEY n SOURCE(CLICKHOUSE(HOST 'localhost' PORT 9000 USER 'default' TABLE 'rmt1' PASSWORD '' DB 'recover')) LIFETIME(MIN 1 MAX 10) LAYOUT(FLAT());", settings=settings)
+        main_node.query("CREATE DICTIONARY recover.d2 (n int DEFAULT 0, m int DEFAULT 1) PRIMARY KEY n "
+                        "SOURCE(CLICKHOUSE(HOST 'localhost' PORT 9000 USER 'default' TABLE 'rmt1' PASSWORD '' DB 'recover')) "
+                        "LIFETIME(MIN 1 MAX 10) LAYOUT(FLAT());", settings=settings)
+
+        inner_table = ".inner_id." + dummy_node.query("SELECT uuid FROM system.tables WHERE database='recover' AND name='mv1'").strip()
+        main_node.query("ALTER TABLE recover.`{}` MODIFY COLUMN n int DEFAULT 42".format(inner_table), settings=settings)
+        main_node.query("ALTER TABLE recover.mv1 MODIFY QUERY SELECT m FROM recover.rmt1".format(inner_table), settings=settings)
+        main_node.query("RENAME TABLE recover.mv2 TO recover.mv3".format(inner_table), settings=settings)
 
         main_node.query("CREATE TABLE recover.tmp AS recover.m1", settings=settings)
         main_node.query("DROP TABLE recover.tmp", settings=settings)
         main_node.query("CREATE TABLE recover.tmp AS recover.m1", settings=settings)
         main_node.query("DROP TABLE recover.tmp", settings=settings)
         main_node.query("CREATE TABLE recover.tmp AS recover.m1", settings=settings)
-        main_node.query("DROP TABLE recover.tmp", settings=settings)
-        main_node.query("CREATE TABLE recover.tmp AS recover.m1", settings=settings)
 
-    assert main_node.query("SELECT name FROM system.tables WHERE database='recover' ORDER BY name") == "d1\nd2\nm1\nmt1\nmt2\nrmt1\nrmt2\nrmt4\nt2\ntmp\n"
-    query = "SELECT name, uuid, create_table_query FROM system.tables WHERE database='recover' ORDER BY name"
+    assert main_node.query("SELECT name FROM system.tables WHERE database='recover' AND name NOT LIKE '.inner_id.%' ORDER BY name") == \
+           "d1\nd2\nm1\nmt1\nmt2\nmv1\nmv3\nrmt1\nrmt2\nrmt4\nt2\ntmp\n"
+    query = "SELECT name, uuid, create_table_query FROM system.tables WHERE database='recover' AND name NOT LIKE '.inner_id.%' " \
+            "ORDER BY name SETTINGS show_table_uuid_in_table_create_query_if_not_nil=1"
     expected = main_node.query(query)
     assert_eq_with_retry(dummy_node, query, expected)
+    assert main_node.query("SELECT count() FROM system.tables WHERE database='recover' AND name LIKE '.inner_id.%'") == "2\n"
+    assert dummy_node.query("SELECT count() FROM system.tables WHERE database='recover' AND name LIKE '.inner_id.%'") == "2\n"
 
-    for table in ['m1', 't2', 'mt1', 'mt2', 'rmt1', 'rmt2', 'rmt4', 'd1', 'd2']:
+    for table in ['m1', 't2', 'mt1', 'mt2', 'rmt1', 'rmt2', 'rmt4', 'd1', 'd2', 'mv1', 'mv3']:
         assert main_node.query("SELECT (*,).1 FROM recover.{}".format(table)) == "42\n"
-    for table in ['t2', 'rmt1', 'rmt2', 'rmt4', 'd1', 'd2', 'mt2']:
+    for table in ['t2', 'rmt1', 'rmt2', 'rmt4', 'd1', 'd2', 'mt2', 'mv1', 'mv3']:
         assert dummy_node.query("SELECT (*,).1 FROM recover.{}".format(table)) == "42\n"
     for table in ['m1', 'mt1']:
         assert dummy_node.query("SELECT count() FROM recover.{}".format(table)) == "0\n"
 
     assert dummy_node.query("SELECT count() FROM system.tables WHERE database='recover_broken_tables'") == "2\n"
-    table = dummy_node.query("SHOW TABLES FROM recover_broken_tables LIKE 'mt1_26_%'").strip()
+    table = dummy_node.query("SHOW TABLES FROM recover_broken_tables LIKE 'mt1_29_%'").strip()
     assert dummy_node.query("SELECT (*,).1 FROM recover_broken_tables.{}".format(table)) == "42\n"
-    table = dummy_node.query("SHOW TABLES FROM recover_broken_tables LIKE 'rmt5_26_%'").strip()
+    table = dummy_node.query("SHOW TABLES FROM recover_broken_tables LIKE 'rmt5_29_%'").strip()
     assert dummy_node.query("SELECT (*,).1 FROM recover_broken_tables.{}".format(table)) == "42\n"
 
-    expected = "Cleaned 4 outdated objects: dropped 1 dictionaries and 1 tables, moved 2 tables"
+    expected = "Cleaned 6 outdated objects: dropped 1 dictionaries and 3 tables, moved 2 tables"
     assert_logs_contain(dummy_node, expected)
 
     dummy_node.query("DROP TABLE recover.tmp")
diff --git a/tests/integration/test_replicated_fetches_timeouts/__init__.py b/tests/integration/test_replicated_fetches_timeouts/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/integration/test_replicated_fetches_timeouts/configs/server.xml b/tests/integration/test_replicated_fetches_timeouts/configs/server.xml
new file mode 100644
index 00000000000..d4b441b91fb
--- /dev/null
+++ b/tests/integration/test_replicated_fetches_timeouts/configs/server.xml
@@ -0,0 +1,3 @@
+<yandex>
+    <background_processing_pool_task_sleep_seconds_when_no_work_max>0.1</background_processing_pool_task_sleep_seconds_when_no_work_max>
+</yandex>
diff --git a/tests/integration/test_replicated_fetches_timeouts/test.py b/tests/integration/test_replicated_fetches_timeouts/test.py
new file mode 100644
index 00000000000..963ec2487fd
--- /dev/null
+++ b/tests/integration/test_replicated_fetches_timeouts/test.py
@@ -0,0 +1,95 @@
+#!/usr/bin/env python3
+
+import random
+import string
+import time
+
+import pytest
+from helpers.cluster import ClickHouseCluster
+from helpers.network import PartitionManager
+
+cluster = ClickHouseCluster(__file__)
+node1 = cluster.add_instance(
+    'node1', with_zookeeper=True,
+    main_configs=['configs/server.xml'])
+
+node2 = cluster.add_instance(
+    'node2', with_zookeeper=True,
+    main_configs=['configs/server.xml'])
+
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+
+def get_random_string(length):
+    return ''.join(random.choice(string.ascii_uppercase + string.digits) for _ in range(length))
+
+
+def test_no_stall(started_cluster):
+    for instance in started_cluster.instances.values():
+        instance.query("""
+            CREATE TABLE t (key UInt64, data String)
+            ENGINE = ReplicatedMergeTree('/clickhouse/test/t', '{instance}')
+                ORDER BY tuple()
+                PARTITION BY key""")
+
+    # Pause node3 until the test setup is prepared
+    node2.query("SYSTEM STOP FETCHES t")
+
+    node1.query("INSERT INTO t SELECT 1, '{}' FROM numbers(500)".format(get_random_string(104857)))
+    node1.query("INSERT INTO t SELECT 2, '{}' FROM numbers(500)".format(get_random_string(104857)))
+
+    with PartitionManager() as pm:
+        pm.add_network_delay(node1, 2000)
+        node2.query("SYSTEM START FETCHES t")
+
+        # Wait for timeout exceptions to confirm that timeout is triggered.
+        while True:
+            conn_timeout_exceptions = int(node2.query(
+                """
+                SELECT count()
+                FROM system.replication_queue
+                WHERE last_exception LIKE '%connect timed out%'
+                """))
+
+            if conn_timeout_exceptions >= 2:
+                break
+
+            time.sleep(0.1)
+
+        print("Connection timeouts tested!")
+
+        # Increase connection timeout and wait for receive timeouts.
+        node2.query("""
+            ALTER TABLE t
+                MODIFY SETTING replicated_fetches_http_connection_timeout = 30,
+                    replicated_fetches_http_receive_timeout = 1""")
+
+        while True:
+            timeout_exceptions = int(node2.query(
+                """
+                SELECT count()
+                FROM system.replication_queue
+                WHERE last_exception LIKE '%e.displayText() = Timeout%'
+                    AND last_exception NOT LIKE '%connect timed out%'
+                """).strip())
+
+            if timeout_exceptions >= 2:
+                break
+
+            time.sleep(0.1)
+
+    for instance in started_cluster.instances.values():
+        # Workaround for DROP TABLE not finishing if it is started while table is readonly.
+        instance.query("SYSTEM RESTART REPLICA t")
+
+        # Cleanup data directory from test results archive.
+        instance.query("DROP TABLE t SYNC")
diff --git a/tests/integration/test_replicated_merge_tree_s3/configs/config.d/storage_conf.xml b/tests/integration/test_replicated_merge_tree_s3/configs/config.d/storage_conf.xml
index 20b750ffff3..1f75a4efeae 100644
--- a/tests/integration/test_replicated_merge_tree_s3/configs/config.d/storage_conf.xml
+++ b/tests/integration/test_replicated_merge_tree_s3/configs/config.d/storage_conf.xml
@@ -21,6 +21,7 @@
 
     <merge_tree>
         <min_bytes_for_wide_part>0</min_bytes_for_wide_part>
+        <allow_s3_zero_copy_replication>0</allow_s3_zero_copy_replication>
     </merge_tree>
 
     <remote_servers>
diff --git a/tests/integration/test_replicated_merge_tree_s3_zero_copy/__init__.py b/tests/integration/test_replicated_merge_tree_s3_zero_copy/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/integration/test_replicated_merge_tree_s3_zero_copy/configs/config.d/storage_conf.xml b/tests/integration/test_replicated_merge_tree_s3_zero_copy/configs/config.d/storage_conf.xml
new file mode 100644
index 00000000000..d8c7f49fc49
--- /dev/null
+++ b/tests/integration/test_replicated_merge_tree_s3_zero_copy/configs/config.d/storage_conf.xml
@@ -0,0 +1,50 @@
+<yandex>
+    <storage_configuration>
+        <disks>
+            <s3>
+                <type>s3</type>
+                <endpoint>http://minio1:9001/root/data/</endpoint>
+                <access_key_id>minio</access_key_id>
+                <secret_access_key>minio123</secret_access_key>
+            </s3>
+        </disks>
+        <policies>
+            <s3>
+                <volumes>
+                    <main>
+                        <disk>s3</disk>
+                    </main>
+                </volumes>
+            </s3>
+        </policies>
+    </storage_configuration>
+
+    <merge_tree>
+        <min_bytes_for_wide_part>0</min_bytes_for_wide_part>
+        <allow_s3_zero_copy_replication>1</allow_s3_zero_copy_replication>
+    </merge_tree>
+
+    <remote_servers>
+        <cluster>
+            <shard>
+                <replica>
+                    <host>node1</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>node2</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>node3</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </cluster>
+    </remote_servers>
+
+    <macros>
+        <shard>0</shard>
+    </macros>
+
+</yandex>
diff --git a/tests/integration/test_replicated_merge_tree_s3_zero_copy/test.py b/tests/integration/test_replicated_merge_tree_s3_zero_copy/test.py
new file mode 100644
index 00000000000..793abc53566
--- /dev/null
+++ b/tests/integration/test_replicated_merge_tree_s3_zero_copy/test.py
@@ -0,0 +1,105 @@
+import logging
+import random
+import string
+
+import pytest
+from helpers.cluster import ClickHouseCluster
+
+logging.getLogger().setLevel(logging.INFO)
+logging.getLogger().addHandler(logging.StreamHandler())
+
+
+@pytest.fixture(scope="module")
+def cluster():
+    try:
+        cluster = ClickHouseCluster(__file__)
+
+        cluster.add_instance("node1", main_configs=["configs/config.d/storage_conf.xml"], macros={'replica': '1'},
+                             with_minio=True, with_zookeeper=True)
+        cluster.add_instance("node2", main_configs=["configs/config.d/storage_conf.xml"], macros={'replica': '2'},
+                             with_zookeeper=True)
+        cluster.add_instance("node3", main_configs=["configs/config.d/storage_conf.xml"], macros={'replica': '3'},
+                             with_zookeeper=True)
+
+        logging.info("Starting cluster...")
+        cluster.start()
+        logging.info("Cluster started")
+
+        yield cluster
+    finally:
+        cluster.shutdown()
+
+
+FILES_OVERHEAD = 1
+FILES_OVERHEAD_PER_COLUMN = 2  # Data and mark files
+FILES_OVERHEAD_PER_PART_WIDE = FILES_OVERHEAD_PER_COLUMN * 3 + 2 + 6 + 1
+FILES_OVERHEAD_PER_PART_COMPACT = 10 + 1
+
+
+def random_string(length):
+    letters = string.ascii_letters
+    return ''.join(random.choice(letters) for i in range(length))
+
+
+def generate_values(date_str, count, sign=1):
+    data = [[date_str, sign * (i + 1), random_string(10)] for i in range(count)]
+    data.sort(key=lambda tup: tup[1])
+    return ",".join(["('{}',{},'{}')".format(x, y, z) for x, y, z in data])
+
+
+def create_table(cluster, additional_settings=None):
+    create_table_statement = """
+        CREATE TABLE s3_test ON CLUSTER cluster(
+            dt Date,
+            id Int64,
+            data String,
+            INDEX min_max (id) TYPE minmax GRANULARITY 3
+        ) ENGINE=ReplicatedMergeTree()
+        PARTITION BY dt
+        ORDER BY (dt, id)
+        SETTINGS storage_policy='s3'
+        """
+    if additional_settings:
+        create_table_statement += ","
+        create_table_statement += additional_settings
+
+    list(cluster.instances.values())[0].query(create_table_statement)
+
+
+@pytest.fixture(autouse=True)
+def drop_table(cluster):
+    yield
+    for node in list(cluster.instances.values()):
+        node.query("DROP TABLE IF EXISTS s3_test")
+
+    minio = cluster.minio_client
+    # Remove extra objects to prevent tests cascade failing
+    for obj in list(minio.list_objects(cluster.minio_bucket, 'data/')):
+        minio.remove_object(cluster.minio_bucket, obj.object_name)
+
+@pytest.mark.parametrize(
+    "min_rows_for_wide_part,files_per_part",
+    [
+        (0, FILES_OVERHEAD_PER_PART_WIDE),
+        (8192, FILES_OVERHEAD_PER_PART_COMPACT)
+    ]
+)
+def test_insert_select_replicated(cluster, min_rows_for_wide_part, files_per_part):
+    create_table(cluster, additional_settings="min_rows_for_wide_part={}".format(min_rows_for_wide_part))
+
+    all_values = ""
+    for node_idx in range(1, 4):
+        node = cluster.instances["node" + str(node_idx)]
+        values = generate_values("2020-01-0" + str(node_idx), 4096)
+        node.query("INSERT INTO s3_test VALUES {}".format(values), settings={"insert_quorum": 3})
+        if node_idx != 1:
+            all_values += ","
+        all_values += values
+
+    for node_idx in range(1, 4):
+        node = cluster.instances["node" + str(node_idx)]
+        assert node.query("SELECT * FROM s3_test order by dt, id FORMAT Values",
+                          settings={"select_sequential_consistency": 1}) == all_values
+
+    minio = cluster.minio_client
+    assert len(list(minio.list_objects(cluster.minio_bucket, 'data/'))) == (3 * FILES_OVERHEAD) + (files_per_part * 3)
diff --git a/tests/integration/test_replicated_merge_tree_with_auxiliary_zookeepers/test.py b/tests/integration/test_replicated_merge_tree_with_auxiliary_zookeepers/test.py
index 91a25ec8d8a..a9dcce1b9d4 100644
--- a/tests/integration/test_replicated_merge_tree_with_auxiliary_zookeepers/test.py
+++ b/tests/integration/test_replicated_merge_tree_with_auxiliary_zookeepers/test.py
@@ -6,7 +6,6 @@ from helpers.cluster import ClickHouseCluster
 from helpers.client import QueryRuntimeException
 from helpers.test_tools import TSV
 
-cluster = ClickHouseCluster(__file__)
 cluster = ClickHouseCluster(__file__)
 node1 = cluster.add_instance("node1", main_configs=["configs/zookeeper_config.xml", "configs/remote_servers.xml"], with_zookeeper=True)
 node2 = cluster.add_instance("node2", main_configs=["configs/zookeeper_config.xml", "configs/remote_servers.xml"], with_zookeeper=True)
@@ -78,3 +77,27 @@ def test_create_replicated_merge_tree_with_not_exists_auxiliary_zookeeper(starte
                 ENGINE = ReplicatedMergeTree('zookeeper_not_exits:/clickhouse/tables/test/test_auxiliary_zookeeper', '{replica}')
                 ORDER BY a;
             '''.format(replica=node1.name))
+
+# Drop table with auxiliary zookeeper.
+def test_drop_replicated_merge_tree_with_auxiliary_zookeeper(started_cluster):
+    drop_table([node1, node2], "test_auxiliary_zookeeper")
+    for node in [node1, node2]:
+        node.query(
+            '''
+                CREATE TABLE test_auxiliary_zookeeper(a Int32)
+                ENGINE = ReplicatedMergeTree('zookeeper2:/clickhouse/tables/test/test_auxiliary_zookeeper', '{replica}')
+                ORDER BY a;
+            '''.format(replica=node.name))
+
+    # Insert data into node1, and query it from node2.
+    node1.query("INSERT INTO test_auxiliary_zookeeper VALUES (1)")
+    time.sleep(5)
+
+    expected = "1\n"
+    assert TSV(node1.query("SELECT a FROM test_auxiliary_zookeeper")) == TSV(expected)
+    assert TSV(node2.query("SELECT a FROM test_auxiliary_zookeeper")) == TSV(expected)
+
+    zk = cluster.get_kazoo_client('zoo1')
+    assert zk.exists('/clickhouse/tables/test/test_auxiliary_zookeeper')
+    drop_table([node1, node2], "test_auxiliary_zookeeper")
+    assert zk.exists('/clickhouse/tables/test/test_auxiliary_zookeeper') is None
diff --git a/tests/integration/test_replication_credentials/test.py b/tests/integration/test_replication_credentials/test.py
index 4f07d6966a6..9181c515adf 100644
--- a/tests/integration/test_replication_credentials/test.py
+++ b/tests/integration/test_replication_credentials/test.py
@@ -9,7 +9,6 @@ def _fill_nodes(nodes, shard):
         node.query(
             '''
                 CREATE DATABASE test;
-    
                 CREATE TABLE test_table(date Date, id UInt32, dummy UInt32)
                 ENGINE = ReplicatedMergeTree('/clickhouse/tables/test{shard}/replicated', '{replica}', date, id, 8192);
             '''.format(shard=shard, replica=node.name))
@@ -114,6 +113,32 @@ def test_different_credentials(different_credentials_cluster):
     assert node5.query("SELECT id FROM test_table order by id") == '111\n'
     assert node6.query("SELECT id FROM test_table order by id") == '222\n'
 
+    add_old = """
+    <yandex>
+        <interserver_http_port>9009</interserver_http_port>
+        <interserver_http_credentials>
+            <user>admin</user>
+            <password>222</password>
+            <old>
+                <user>root</user>
+                <password>111</password>
+            </old>
+            <old>
+                <user>aaa</user>
+                <password>333</password>
+            </old>
+        </interserver_http_credentials>
+    </yandex>
+    """
+
+    node5.replace_config("/etc/clickhouse-server/config.d/credentials1.xml", add_old)
+
+    node5.query("SYSTEM RELOAD CONFIG")
+    node5.query("INSERT INTO test_table values('2017-06-21', 333, 1)")
+    node6.query("SYSTEM SYNC REPLICA test_table", timeout=10)
+
+    assert node6.query("SELECT id FROM test_table order by id") == '111\n222\n333\n'
+
 
 node7 = cluster.add_instance('node7', main_configs=['configs/remote_servers.xml', 'configs/credentials1.xml'],
                              with_zookeeper=True)
@@ -146,3 +171,23 @@ def test_credentials_and_no_credentials(credentials_and_no_credentials_cluster):
 
     assert node7.query("SELECT id FROM test_table order by id") == '111\n'
     assert node8.query("SELECT id FROM test_table order by id") == '222\n'
+
+    allow_empty = """
+    <yandex>
+        <interserver_http_port>9009</interserver_http_port>
+        <interserver_http_credentials>
+            <user>admin</user>
+            <password>222</password>
+            <allow_empty>true</allow_empty>
+        </interserver_http_credentials>
+    </yandex>
+    """
+
+    # change state: Flip node7 to mixed auth/non-auth (allow node8)
+    node7.replace_config("/etc/clickhouse-server/config.d/credentials1.xml",
+                         allow_empty)
+
+    node7.query("SYSTEM RELOAD CONFIG")
+    node7.query("insert into test_table values ('2017-06-22', 333, 1)")
+    node8.query("SYSTEM SYNC REPLICA test_table", timeout=10)
+    assert node8.query("SELECT id FROM test_table order by id") == '111\n222\n333\n'
diff --git a/tests/integration/test_row_policy/normal_filter2_table2.xml b/tests/integration/test_row_policy/normal_filter2_table2.xml
new file mode 100644
index 00000000000..aca6bddc334
--- /dev/null
+++ b/tests/integration/test_row_policy/normal_filter2_table2.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<yandex>
+    <users>
+        <default>
+            <!-- For testing the table filters -->
+            <databases>
+                <mydb>
+                    <!-- Simple expression filter -->
+                    <filtered_table2>
+                        <filter>a &gt; 0</filter>
+                    </filtered_table2>
+                </mydb>
+            </databases>
+        </default>
+    </users>
+</yandex>
diff --git a/tests/integration/test_row_policy/test.py b/tests/integration/test_row_policy/test.py
index c3c86f5a9c5..76aef325bfa 100644
--- a/tests/integration/test_row_policy/test.py
+++ b/tests/integration/test_row_policy/test.py
@@ -103,21 +103,32 @@ def test_join():
 
 
 def test_cannot_trick_row_policy_with_keyword_with():
-    assert node.query("WITH 0 AS a SELECT * FROM mydb.filtered_table1") == TSV([[1, 0], [1, 1]])
-    assert node.query("WITH 0 AS a SELECT a, b FROM mydb.filtered_table1") == TSV([[0, 0], [0, 1]])
     assert node.query("WITH 0 AS a SELECT a FROM mydb.filtered_table1") == TSV([[0], [0]])
     assert node.query("WITH 0 AS a SELECT b FROM mydb.filtered_table1") == TSV([[0], [1]])
 
+    assert node.query("WITH 0 AS a SELECT * FROM mydb.filtered_table1")                              == TSV([[1, 0], [1, 1]])
+    assert node.query("WITH 0 AS a SELECT * FROM mydb.filtered_table1 WHERE a >= 0 AND b >= 0 SETTINGS optimize_move_to_prewhere = 0") == TSV([[1, 0], [1, 1]])
+    assert node.query("WITH 0 AS a SELECT * FROM mydb.filtered_table1 PREWHERE a >= 0 AND b >= 0")   == TSV([[1, 0], [1, 1]])
+    assert node.query("WITH 0 AS a SELECT * FROM mydb.filtered_table1 PREWHERE a >= 0 WHERE b >= 0") == TSV([[1, 0], [1, 1]])
+    assert node.query("WITH 0 AS a SELECT * FROM mydb.filtered_table1 PREWHERE b >= 0 WHERE a >= 0") == TSV([[1, 0], [1, 1]])
 
-def test_prewhere_not_supported():
-    expected_error = "PREWHERE is not supported if the table is filtered by row-level security"
-    assert expected_error in node.query_and_get_error("SELECT * FROM mydb.filtered_table1 PREWHERE 1")
-    assert expected_error in node.query_and_get_error("SELECT * FROM mydb.filtered_table2 PREWHERE 1")
-    assert expected_error in node.query_and_get_error("SELECT * FROM mydb.filtered_table3 PREWHERE 1")
+    assert node.query("WITH 0 AS a SELECT a, b FROM mydb.filtered_table1")                              == TSV([[0, 0], [0, 1]])
+    assert node.query("WITH 0 AS a SELECT a, b FROM mydb.filtered_table1 WHERE a >= 0 AND b >= 0 SETTINGS optimize_move_to_prewhere = 0") == TSV([[0, 0], [0, 1]])
+    assert node.query("WITH 0 AS a SELECT a, b FROM mydb.filtered_table1 PREWHERE a >= 0 AND b >= 0")   == TSV([[0, 0], [0, 1]])
+    assert node.query("WITH 0 AS a SELECT a, b FROM mydb.filtered_table1 PREWHERE a >= 0 WHERE b >= 0") == TSV([[0, 0], [0, 1]])
+    assert node.query("WITH 0 AS a SELECT a, b FROM mydb.filtered_table1 PREWHERE b >= 0 WHERE a >= 0") == TSV([[0, 0], [0, 1]])
 
-    # However PREWHERE should still work for user without filtering.
-    assert node.query("SELECT * FROM mydb.filtered_table1 PREWHERE 1", user="another") == TSV(
-        [[0, 0], [0, 1], [1, 0], [1, 1]])
+    assert node.query("WITH 0 AS c SELECT * FROM mydb.filtered_table3")                              == TSV([[0, 1], [1, 0]])
+    assert node.query("WITH 0 AS c SELECT * FROM mydb.filtered_table3 WHERE c >= 0 AND a >= 0 SETTINGS optimize_move_to_prewhere = 0") == TSV([[0, 1], [1, 0]])
+    assert node.query("WITH 0 AS c SELECT * FROM mydb.filtered_table3 PREWHERE c >= 0 AND a >= 0")   == TSV([[0, 1], [1, 0]])
+    assert node.query("WITH 0 AS c SELECT * FROM mydb.filtered_table3 PREWHERE c >= 0 WHERE a >= 0") == TSV([[0, 1], [1, 0]])
+    assert node.query("WITH 0 AS c SELECT * FROM mydb.filtered_table3 PREWHERE a >= 0 WHERE c >= 0") == TSV([[0, 1], [1, 0]])
+
+    assert node.query("WITH 0 AS c SELECT a, b, c FROM mydb.filtered_table3")                              == TSV([[0, 1, 0], [1, 0, 0]])
+    assert node.query("WITH 0 AS c SELECT a, b, c FROM mydb.filtered_table3 WHERE c >= 0 AND a >= 0 SETTINGS optimize_move_to_prewhere = 0") == TSV([[0, 1, 0], [1, 0, 0]])
+    assert node.query("WITH 0 AS c SELECT a, b, c FROM mydb.filtered_table3 PREWHERE c >= 0 AND a >= 0")   == TSV([[0, 1, 0], [1, 0, 0]])
+    assert node.query("WITH 0 AS c SELECT a, b, c FROM mydb.filtered_table3 PREWHERE c >= 0 WHERE a >= 0") == TSV([[0, 1, 0], [1, 0, 0]])
+    assert node.query("WITH 0 AS c SELECT a, b, c FROM mydb.filtered_table3 PREWHERE a >= 0 WHERE c >= 0") == TSV([[0, 1, 0], [1, 0, 0]])
 
 
 def test_policy_from_users_xml_affects_only_user_assigned():
@@ -132,6 +143,57 @@ def test_policy_from_users_xml_affects_only_user_assigned():
     assert node.query("SELECT * FROM mydb.local", user="another") == TSV([[1, 0], [1, 1]])
 
 
+def test_with_prewhere():
+    copy_policy_xml('normal_filter2_table2.xml')
+    assert node.query("SELECT * FROM mydb.filtered_table2 WHERE a > 1 SETTINGS optimize_move_to_prewhere = 0")    == TSV([[4, 3, 2, 1]])
+    assert node.query("SELECT a FROM mydb.filtered_table2 WHERE a > 1 SETTINGS optimize_move_to_prewhere = 0")    == TSV([[4]])
+    assert node.query("SELECT a, b FROM mydb.filtered_table2 WHERE a > 1 SETTINGS optimize_move_to_prewhere = 0") == TSV([[4, 3]])
+    assert node.query("SELECT b, c FROM mydb.filtered_table2 WHERE a > 1 SETTINGS optimize_move_to_prewhere = 0") == TSV([[3, 2]])
+    assert node.query("SELECT d FROM mydb.filtered_table2 WHERE a > 1 SETTINGS optimize_move_to_prewhere = 0")    == TSV([[1]])
+
+    assert node.query("SELECT * FROM mydb.filtered_table2 PREWHERE a > 1")    == TSV([[4, 3, 2, 1]])
+    assert node.query("SELECT a FROM mydb.filtered_table2 PREWHERE a > 1")    == TSV([[4]])
+    assert node.query("SELECT a, b FROM mydb.filtered_table2 PREWHERE a > 1") == TSV([[4, 3]])
+    assert node.query("SELECT b, c FROM mydb.filtered_table2 PREWHERE a > 1") == TSV([[3, 2]])
+    assert node.query("SELECT d FROM mydb.filtered_table2 PREWHERE a > 1")    == TSV([[1]])
+
+    assert node.query("SELECT * FROM mydb.filtered_table2 PREWHERE a < 4 WHERE b < 10") == TSV([[1, 2, 3, 4]])
+    assert node.query("SELECT a FROM mydb.filtered_table2 PREWHERE a < 4 WHERE b < 10") == TSV([[1]])
+    assert node.query("SELECT b FROM mydb.filtered_table2 PREWHERE a < 4 WHERE b < 10") == TSV([[2]])
+    assert node.query("SELECT a, b FROM mydb.filtered_table2 PREWHERE a < 4 WHERE b < 10") == TSV([[1, 2]])
+    assert node.query("SELECT a, c FROM mydb.filtered_table2 PREWHERE a < 4 WHERE b < 10") == TSV([[1, 3]])
+    assert node.query("SELECT b, d FROM mydb.filtered_table2 PREWHERE a < 4 WHERE b < 10") == TSV([[2, 4]])
+    assert node.query("SELECT c, d FROM mydb.filtered_table2 PREWHERE a < 4 WHERE b < 10") == TSV([[3, 4]])
+
+
+def test_throwif_error_in_where_with_same_condition_as_filter():
+    copy_policy_xml('normal_filter2_table2.xml')
+    assert 'expected' in node.query_and_get_error("SELECT * FROM mydb.filtered_table2 WHERE throwIf(a > 0, 'expected') = 0 SETTINGS optimize_move_to_prewhere = 0")
+
+
+def test_throwif_error_in_prewhere_with_same_condition_as_filter():
+    copy_policy_xml('normal_filter2_table2.xml')
+    assert 'expected' in node.query_and_get_error("SELECT * FROM mydb.filtered_table2 PREWHERE throwIf(a > 0, 'expected') = 0")
+
+
+def test_throwif_in_where_doesnt_expose_restricted_data():
+    copy_policy_xml('no_filters.xml')
+    assert 'expected' in node.query_and_get_error("SELECT * FROM mydb.filtered_table2 WHERE throwIf(a = 0, 'expected') = 0 SETTINGS optimize_move_to_prewhere = 0")
+
+    copy_policy_xml('normal_filter2_table2.xml')
+    assert node.query("SELECT * FROM mydb.filtered_table2 WHERE throwIf(a = 0, 'pwned') = 0 SETTINGS optimize_move_to_prewhere = 0") == TSV([
+        [1, 2, 3, 4], [4, 3, 2, 1]])
+
+
+def test_throwif_in_prewhere_doesnt_expose_restricted_data():
+    copy_policy_xml('no_filters.xml')
+    assert 'expected' in node.query_and_get_error("SELECT * FROM mydb.filtered_table2 PREWHERE throwIf(a = 0, 'expected') = 0")
+
+    copy_policy_xml('normal_filter2_table2.xml')
+    assert node.query("SELECT * FROM mydb.filtered_table2 PREWHERE throwIf(a = 0, 'pwned') = 0") == TSV([
+        [1, 2, 3, 4], [4, 3, 2, 1]])
+
+
 def test_change_of_users_xml_changes_row_policies():
     copy_policy_xml('normal_filters.xml')
     assert node.query("SELECT * FROM mydb.filtered_table1") == TSV([[1, 0], [1, 1]])
@@ -154,6 +216,11 @@ def test_change_of_users_xml_changes_row_policies():
     assert node.query("SELECT * FROM mydb.filtered_table2") == TSV([[0, 0, 0, 0], [0, 0, 6, 0]])
     assert node.query("SELECT * FROM mydb.filtered_table3") == TSV([[0, 1], [1, 0]])
 
+    copy_policy_xml('normal_filter2_table2.xml')
+    assert node.query("SELECT * FROM mydb.filtered_table1") == TSV([[0, 0], [0, 1], [1, 0], [1, 1]])
+    assert node.query("SELECT * FROM mydb.filtered_table2") == TSV([[1, 2, 3, 4], [4, 3, 2, 1]])
+    assert node.query("SELECT * FROM mydb.filtered_table3") == TSV([[0, 0], [0, 1], [1, 0], [1, 1]])
+
     copy_policy_xml('no_filters.xml')
     assert node.query("SELECT * FROM mydb.filtered_table1") == TSV([[0, 0], [0, 1], [1, 0], [1, 1]])
     assert node.query("SELECT * FROM mydb.filtered_table2") == TSV(
@@ -342,32 +409,31 @@ def test_tags_with_db_and_table_names():
 
 
 def test_miscellaneous_engines():
-    copy_policy_xml('normal_filters.xml')
+    node.query("CREATE ROW POLICY OR REPLACE pC ON mydb.other_table FOR SELECT USING a = 1 TO default")
+    assert node.query("SHOW ROW POLICIES ON mydb.other_table") == "pC\n"
 
     # ReplicatedMergeTree
-    node.query("DROP TABLE mydb.filtered_table1")
-    node.query(
-        "CREATE TABLE mydb.filtered_table1 (a UInt8, b UInt8) ENGINE ReplicatedMergeTree('/clickhouse/tables/00-00/filtered_table1', 'replica1') ORDER BY a")
-    node.query("INSERT INTO mydb.filtered_table1 values (0, 0), (0, 1), (1, 0), (1, 1)")
-    assert node.query("SELECT * FROM mydb.filtered_table1") == TSV([[1, 0], [1, 1]])
+    node.query("DROP TABLE IF EXISTS mydb.other_table")
+    node.query("CREATE TABLE mydb.other_table (a UInt8, b UInt8) ENGINE ReplicatedMergeTree('/clickhouse/tables/00-00/filtered_table1', 'replica1') ORDER BY a")
+    node.query("INSERT INTO mydb.other_table values (0, 0), (0, 1), (1, 0), (1, 1)")
+    assert node.query("SELECT * FROM mydb.other_table") == TSV([[1, 0], [1, 1]])
 
     # CollapsingMergeTree
-    node.query("DROP TABLE mydb.filtered_table1")
-    node.query("CREATE TABLE mydb.filtered_table1 (a UInt8, b Int8) ENGINE CollapsingMergeTree(b) ORDER BY a")
-    node.query("INSERT INTO mydb.filtered_table1 values (0, 1), (0, 1), (1, 1), (1, 1)")
-    assert node.query("SELECT * FROM mydb.filtered_table1") == TSV([[1, 1], [1, 1]])
+    node.query("DROP TABLE mydb.other_table")
+    node.query("CREATE TABLE mydb.other_table (a UInt8, b Int8) ENGINE CollapsingMergeTree(b) ORDER BY a")
+    node.query("INSERT INTO mydb.other_table values (0, 1), (0, 1), (1, 1), (1, 1)")
+    assert node.query("SELECT * FROM mydb.other_table") == TSV([[1, 1], [1, 1]])
 
     # ReplicatedCollapsingMergeTree
-    node.query("DROP TABLE mydb.filtered_table1")
-    node.query(
-        "CREATE TABLE mydb.filtered_table1 (a UInt8, b Int8) ENGINE ReplicatedCollapsingMergeTree('/clickhouse/tables/00-01/filtered_table1', 'replica1', b) ORDER BY a")
-    node.query("INSERT INTO mydb.filtered_table1 values (0, 1), (0, 1), (1, 1), (1, 1)")
-    assert node.query("SELECT * FROM mydb.filtered_table1") == TSV([[1, 1], [1, 1]])
+    node.query("DROP TABLE mydb.other_table")
+    node.query("CREATE TABLE mydb.other_table (a UInt8, b Int8) ENGINE ReplicatedCollapsingMergeTree('/clickhouse/tables/00-01/filtered_table1', 'replica1', b) ORDER BY a")
+    node.query("INSERT INTO mydb.other_table values (0, 1), (0, 1), (1, 1), (1, 1)")
+    assert node.query("SELECT * FROM mydb.other_table") == TSV([[1, 1], [1, 1]])
+
+    node.query("DROP ROW POLICY pC ON mydb.other_table")
 
     # DistributedMergeTree
-    node.query("DROP TABLE IF EXISTS mydb.not_filtered_table")
-    node.query(
-        "CREATE TABLE mydb.not_filtered_table (a UInt8, b UInt8) ENGINE Distributed('test_local_cluster', mydb, local)")
-    assert node.query("SELECT * FROM mydb.not_filtered_table", user="another") == TSV([[1, 0], [1, 1], [1, 0], [1, 1]])
-    assert node.query("SELECT sum(a), b FROM mydb.not_filtered_table GROUP BY b ORDER BY b", user="another") == TSV(
-        [[2, 0], [2, 1]])
+    node.query("DROP TABLE IF EXISTS mydb.other_table")
+    node.query("CREATE TABLE mydb.other_table (a UInt8, b UInt8) ENGINE Distributed('test_local_cluster', mydb, local)")
+    assert node.query("SELECT * FROM mydb.other_table", user="another") == TSV([[1, 0], [1, 1], [1, 0], [1, 1]])
+    assert node.query("SELECT sum(a), b FROM mydb.other_table GROUP BY b ORDER BY b", user="another") == TSV([[2, 0], [2, 1]])
diff --git a/tests/integration/test_s3_cluster/__init__.py b/tests/integration/test_s3_cluster/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/integration/test_s3_cluster/configs/cluster.xml b/tests/integration/test_s3_cluster/configs/cluster.xml
new file mode 100644
index 00000000000..8334ace15eb
--- /dev/null
+++ b/tests/integration/test_s3_cluster/configs/cluster.xml
@@ -0,0 +1,24 @@
+
+<yandex>
+    <remote_servers>
+    <cluster_simple>
+        <shard>
+            <replica>
+                <host>s0_0_0</host>
+                <port>9000</port>
+            </replica>
+            <replica>
+                <host>s0_0_1</host>
+                <port>9000</port>
+            </replica>
+        </shard>
+        <shard>
+            <replica>
+                <host>s0_1_0</host>
+                <port>9000</port>
+            </replica>
+        </shard>
+    </cluster_simple>
+
+    </remote_servers>
+</yandex>
\ No newline at end of file
diff --git a/tests/integration/test_s3_cluster/data/clickhouse/part1.csv b/tests/integration/test_s3_cluster/data/clickhouse/part1.csv
new file mode 100644
index 00000000000..a44d3ca1ffb
--- /dev/null
+++ b/tests/integration/test_s3_cluster/data/clickhouse/part1.csv
@@ -0,0 +1,10 @@
+"fSRH",976027584,"[[(-1.5346513608456012e-204,-2.867937504545497e266),(3.1627675144114637e-231,-2.20343471241604e-54),(-1.866886218651809e-89,-7.695893036366416e100),(8.196307577166986e-169,-8.203793887684096e-263),(-1.6150328830402252e-215,8.531116551449711e-296),(4.3378407855931477e92,1.1313645428723989e117),(-4.238081208165573e137,-8.969951719788361e67)],[(-3.409639554701108e169,-7.277093176871153e-254),(1.1466207153308928e-226,3.429893348531029e96),(6.451302850199177e-189,-7.52379443153242e125),(-1.7132078539493614e-127,-2.3177814806867505e241),(1.4996520594989919e-257,4.271017883966942e128)],[(65460976657479156000,1.7055814145588595e253),(-1.921491101580189e154,3.2912740465446566e-286),(0.0008437955075350972,-5.143493717005472e-107),(8.637208599142187e-150,7.825076274945548e136),(1.8077733932468565e-159,5.51061479974026e-77),(1.300406236793709e-260,10669142.497111017),(-1.731981751951159e91,-1.270795062098902e102)],[(3.336706342781395e-7,-1.1919528866481513e266)]]"
+"sX6>",733011552,"[[(-3.737863336077909e-44,3.066510481088993e-161),(-1.0047259170558555e-31,8.066145272086467e-274)],[(1.2261835328136691e-58,-6.154561379350395e258),(8.26019994651558e35,-6.736984599062694e-19),(-1.4143671344485664e-238,-1.220003479858045e203),(2.466089772925698e-207,1.0025476904532926e-242),(-6.3786667153054354e240,-7.010834902137467e-103),(-6.766918514324285e-263,7.404639608483947e188),(2.753493977757937e126,-4.089565842001999e-152)],[(4.339873790493155e239,-5.022554811588342e24),(-1.7712390083519473e-66,1.3290563068463308e112),(3.3648764781548893e233,1.1123394188044336e112),(-5.415278137684864e195,5.590597851016202e-270),(-2.1032310903543943e99,-2.2335799924679948e-184)]]"
+"",2396526460,"[[(1.9925796792641788e-261,1.647618305107044e158),(3.014593666207223e-222,-9.016473078578002e-20),(-1.5307802021477097e-230,-7.867078587209265e-243),(-7.330317098800564e295,1.7496539408601967e-281)],[(2.2816938730052074e98,-3.3089122320442997e-136),(-4.930983789361344e-263,-6.526758521792829e59),(-2.6482873886835413e34,-4.1985691142515947e83),(1.5496810029349365e238,-4.790553105593492e71),(-7.597436233325566e83,-1.3791763752378415e137),(-1.917321980700588e-307,-1.5913257477581824e62)]]"
+"=@ep",3618088392,"[[(-2.2303235811290024e-306,8.64070367587338e-13),(-7.403012423264767e-129,-1.0825508572345856e-147),(-3.6080301450167e286,1.7302718548299961e285),(-1.3839239794870825e-156,4.255424291564323e107),(2.3191305762555e-33,-2.873899421579949e-145),(7.237414513124649e-159,-4.926574547865783e178),(4.251831312243431e-199,1.2164714479391436e201)],[(-5.114074387943793e242,2.0119340496886292e295),(-3.3663670765548e-262,-6.1992631068472835e221),(1.1539386993255106e-261,1.582903697171063e-33),(-6.1914577817088e118,-1.0401495621681123e145)],[],[(-5.9815907467493136e82,4.369047439375412e219),(-4.485368440431237e89,-3.633023372434946e-59),(-2.087497331251707e-180,1.0524018118646965e257)],[(-1.2636503461000215e-228,-4.8426877075223456e204),(2.74943107551342e281,-7.453097760262003e-14)]]"
+"",3467776823,"[]"
+"b'zQ",484159052,"[[(3.041838095219909e276,-6.956822159518612e-87)],[(6.636906358770296e-97,1.0531865724169307e-214)],[(-8.429249069245283e-243,-2.134779842898037e243)],[(-0.4657586598569572,2.799768548127799e187),(-5.961335445789657e-129,2.560331789344886e293),(-3.139409694983184e45,2.8011384557268085e-47)]]"
+"6xGw",4126129912,"[]"
+"Q",3109335413,"[[(-2.8435266267772945e39,9.548278488724291e26),(-1.1682790407223344e46,-3.925561182768867e-266),(2.8381633655721614e-202,-3.472921303086527e40),(3.3968328275944204e-150,-2.2188876184777275e-69),(-1.2612795000783405e-88,-1.2942793285205966e-49),(1.3678466236967012e179,1.721664680964459e97),(-1.1020844667744628e198,-3.403142062758506e-47)],[],[(1.343149099058239e-279,9.397894929770352e-132),(-5.280854317597215e250,9.862550191577643e-292),(-7.11468799151533e-58,7.510011657942604e96),(1.183774454157175e-288,-1.5697197095936546e272),(-3.727289017361602e120,2.422831380775067e-107),(1.4345094301262986e-177,2.4990983297605437e-91)],[(9.195226893854516e169,6.546374357272709e-236),(2.320311199531441e-126,2.2257031285964243e-185),(3.351868475505779e-184,1.84394695526876e88)],[(1.6290814396647987e-112,-3.589542711073253e38),(4.0060174859833907e-261,-1.9900431208726192e-296),(2.047468933030435e56,8.483912759156179e-57),(3.1165727272872075e191,-1.5487136748040008e-156),(0.43564020198461034,4.618165048931035e-244),(-7.674951896752824e-214,1.1652522629091777e-105),(4.838653901829244e-89,5.3085904574780206e169)],[(1.8286703553352283e-246,2.0403170465657044e255),(2.040810692623279e267,4.3956975402250484e-8),(2.4101343663018673e131,-8.672394158504762e167),(3.092080945239809e-219,-3.775474693770226e293),(-1.527991241079512e-15,-1.2603969180963007e226),(9.17470637459212e-56,1.6021090930395906e-133),(7.877647227721046e58,3.2592118033868903e-108)],[(1.4334765313272463e170,2.6971234798957105e-50)]]"
+"^ip",1015254922,"[[(-2.227414144223298e-63,1.2391785738638914e276),(1.2668491759136862e207,2.5656762953078853e-67),(2.385410876813441e-268,1.451107969531624e25),(-5.475956161647574e131,2239495689376746),(1.5591286361054593e180,3.672868971445151e117)]]"
+"5N]",1720727300,"[[(-2.0670321228319122e-258,-2.6893477429616666e-32),(-2.2424105705209414e225,3.547832127050775e25),(4.452916756606404e-121,-3.71114618421911e156),(-1.966961937965055e-110,3.1217044497868816e227),(20636923519704216,1.3500210618276638e30),(3.3195926701816527e-276,1.5557140338374535e234)],[]]"
diff --git a/tests/integration/test_s3_cluster/data/clickhouse/part123.csv b/tests/integration/test_s3_cluster/data/clickhouse/part123.csv
new file mode 100644
index 00000000000..1ca3353b741
--- /dev/null
+++ b/tests/integration/test_s3_cluster/data/clickhouse/part123.csv
@@ -0,0 +1,3 @@
+"b'zQ",2960084897,"[[(3.014593666207223e-222,-7.277093176871153e-254),(-1.5307802021477097e-230,3.429893348531029e96),(-7.330317098800564e295,-7.52379443153242e125),(2.2816938730052074e98,-2.3177814806867505e241),(-4.930983789361344e-263,4.271017883966942e128)],[(-2.6482873886835413e34,1.7055814145588595e253),(1.5496810029349365e238,3.2912740465446566e-286),(-7.597436233325566e83,-5.143493717005472e-107),(-1.917321980700588e-307,7.825076274945548e136)],[(-2.2303235811290024e-306,5.51061479974026e-77),(-7.403012423264767e-129,10669142.497111017),(-3.6080301450167e286,-1.270795062098902e102),(-1.3839239794870825e-156,-1.1919528866481513e266),(2.3191305762555e-33,3.066510481088993e-161),(7.237414513124649e-159,8.066145272086467e-274)],[(4.251831312243431e-199,-6.154561379350395e258),(-5.114074387943793e242,-6.736984599062694e-19),(-3.3663670765548e-262,-1.220003479858045e203),(1.1539386993255106e-261,1.0025476904532926e-242),(-6.1914577817088e118,-7.010834902137467e-103),(-5.9815907467493136e82,7.404639608483947e188),(-4.485368440431237e89,-4.089565842001999e-152)]]"
+"6xGw",2107128550,"[[(-2.087497331251707e-180,-5.022554811588342e24),(-1.2636503461000215e-228,1.3290563068463308e112),(2.74943107551342e281,1.1123394188044336e112),(3.041838095219909e276,5.590597851016202e-270)],[],[(6.636906358770296e-97,-2.2335799924679948e-184),(-8.429249069245283e-243,1.647618305107044e158),(-0.4657586598569572,-9.016473078578002e-20)]]"
+"Q",2713167232,"[[(-5.961335445789657e-129,-7.867078587209265e-243),(-3.139409694983184e45,1.7496539408601967e-281)],[(-2.8435266267772945e39,-3.3089122320442997e-136)]]"
diff --git a/tests/integration/test_s3_cluster/data/database/part2.csv b/tests/integration/test_s3_cluster/data/database/part2.csv
new file mode 100644
index 00000000000..572676e47c6
--- /dev/null
+++ b/tests/integration/test_s3_cluster/data/database/part2.csv
@@ -0,0 +1,5 @@
+"~m`",820408404,"[]"
+"~E",3621610983,"[[(1.183772215004139e-238,-1.282774073199881e211),(1.6787305112393978e-46,7.500499989257719e25),(-2.458759475104641e-260,3.1724599388651864e-171),(-2.0163203163062471e118,-4.677226438945462e-162),(-5.52491070012707e-135,7.051780441780731e-236)]]"
+"~1",1715555780,"[[(-6.847404226505131e-267,5.939552045362479e-272),(8.02275075985457e-160,8.369250185716419e-104),(-1.193940928527857e-258,-1.132580458849774e39)],[(1.1866087552639048e253,3.104988412734545e57),(-3.37278669639914e84,-2.387628643569968e287),(-2.452136349495753e73,3.194309776006896e-204),(-1001997440265471100,3.482122851077378e-182)],[],[(-5.754682082202988e-20,6.598766936241908e156)],[(8.386764833095757e300,1.2049637765877942e229),(3.136243074210055e53,5.764669663844127e-100),(-4.190632347661851e195,-5.053553379163823e302),(2.0805194731736336e-19,-1.0849036699112485e-271),(1.1292361211411365e227,-8.767824448179629e229),(-3.6938137156625264e-19,-5.387931698392423e109),(-1.2240482125885677e189,-1.5631467861525635e-103)],[(-2.3917431782202442e138,7.817228281030191e-242),(-1.1462343232899826e279,-1.971215065504208e-225),(5.4316119855340265e-62,3.761081156597423e-60),(8.111852137718836e306,8.115485489580134e-208)],[]]"
+"~%]",1606443384,"[[]]"
+"}or",726681547,"[]"
\ No newline at end of file
diff --git a/tests/integration/test_s3_cluster/data/database/partition675.csv b/tests/integration/test_s3_cluster/data/database/partition675.csv
new file mode 100644
index 00000000000..e8496680368
--- /dev/null
+++ b/tests/integration/test_s3_cluster/data/database/partition675.csv
@@ -0,0 +1,7 @@
+"kvUES",4281162618,"[[(2.4538308454074088e303,1.2209370543175666e178),(1.4564007891121754e-186,2.340773478952682e-273),(-1.01791181533976e165,-3.9617466227377253e248)]]"
+"Gu",4280623186,"[[(-1.623487579335014e38,-1.0633405021023563e225),(-4.373688812751571e180,2.5511550357717127e138)]]"
+"J_u1",4277430503,"[[(2.981826196369429e-294,-6.059236590410922e236),(8.502045137575854e-296,3.0210403188125657e-91),(-9.370591842861745e175,4.150870185764185e129),(1.011801592194125e275,-9.236010982686472e266),(-3.1830638196303316e277,2.417706446545472e-105),(-1.4369143023804266e-201,4.7529126795899655e238)],[(-2.118789593804697e186,-1.8760231612433755e-280),(2.5982563179976053e200,-1.4683025762313524e-40)],[(-1.873397623255704e-240,1.4363190147949886e-283),(-1.5760337746177136e153,1.5272278536086246e-34),(-8.117473317695919e155,2.4375370926733504e150),(-1.179230972881795e99,1.7693459774706515e-259),(2.2102106250558424e-40,4.734162675762768e-56),(6.058833110550111e-8,8.892471775821198e164),(-1.8208740799996599e59,6.446958261080721e178)]]"
+"s:\",4265055390,"[[(-3.291651377214531e-167,3.9198636942402856e185),(2.4897781692770126e176,2.579309759138358e188),(4.653945381397663e205,3.216314556208208e158),(-5.3373279440714224e-39,2.404386813826413e212),(-1.4217294382527138e307,8.874978978402512e-173)],[(8.527603121149904e-58,-5.0520795335878225e88),(-0.00022870878520550814,-3.2334214176860943e-68),(-6.97683613433404e304,-2.1573757788072144e-82),(-1.1394163455875937e36,-3.817990182461824e271),(2.4099027412881423e-209,8.542179392011098e-156),(3.2610511540394803e174,1.1692631657517616e-20)],[(3.625474290538107e261,-5.359205062039837e-193),(-3.574126569378072e-112,-5.421804160994412e265),(-4.873653931207849e-76,3219678918284.317),(-7.030770825898911e-57,1.4647389742249787e-274),(-4.4882439220492357e-203,6.569338333730439e-38)],[(-2.2418056002374865e-136,5.113251922954469e-16),(2.5156744571032497e297,-3.0536957683846124e-192)],[(1.861112291954516e306,-1.8160882143331256e129),(1.982573454900027e290,-2.451412311394593e170)],[(-2.8292230178712157e-18,1.2570198161962067e216),(6.24832495972797e-164,-2.0770908334330718e-273)],[(980143647.1858811,1.2738714961511727e106),(6.516450532397311e-184,4.088688742052062e31),(-2.246311532913914e269,-7.418103885850518e-179),(1.2222973942835046e-289,2.750544834553288e-46),(9.503169349701076e159,-1.355457053256579e215)]]"
+":hzO",4263726959,"[[(-2.553206398375626e-90,1.6536977728640226e199),(1.5630078027143848e-36,2.805242683101373e-211),(2.2573933085983554e-92,3.450501333524858e292),(-1.215900901292646e-275,-3.860558658606121e272),(6.65716072773856e-145,2.5359010031217893e217)],[(-1.3308039625779135e308,1.7464622720773261e258),(-3.2986890093446374e179,3.9038871583175653e-69),(-4.3594764087383885e-95,4.229921973278908e-123),(-5.455694205415656e137,3.597894902167716e108),(1.2480860990110662e-29,-1.4873488392480292e-185),(7.563210285835444e55,-5624068447.488605)],[(3.9517937289943195e181,-3.2799189227094424e-68),(8.906762198487649e-167,3.952452177941537e-159)]]"
+"a",4258301804,"[[(5.827965576703262e-281,2.2523852665173977e90)],[(-6.837604072282348e-97,8.125864241406046e-61)],[(-2.3047912084435663e53,-8.814499720685194e36),(1.2072558137199047e-79,1.2096862541827071e142),(2.2000026293774143e275,-3.2571689055108606e-199),(1.1822278574921316e134,2.9571188365006754e-86),(1.0448954272555034e-169,1.2182183489600953e-60)],[(-3.1366540817730525e89,9.327128058982966e-306),(6.588968210928936e73,-11533531378.938957),(-2.6715943555840563e44,-4.557428011172859e224),(-3.8334913754415923e285,-4.748721454106074e-173),(-1.6912052107425128e275,-4.789382438422238e-219),(1.8538365229016863e151,-3.5698172075468775e-37)],[(-2.1963131282037294e49,-5.53604352524995e-296)],[(-8.834414834987965e167,1.3186354307320576e247),(2.109209547987338e298,1.2191009105107557e-32),(-3.896880410603213e-92,-3.4589588698231044e-121),(-3.252529090888335e138,-7.862741341454407e204)],[(-9.673078095447289e-207,8.839303128607278e123),(2.6043620378793597e-244,-6.898328199987363e-308),(-2.5921142292355475e-54,1.0352159149517285e-143)]]"
+"S+",4257734123,"[[(1.5714269203495863e245,-15651321.549208183),(-3.7292056272445236e-254,-4.556927533596056e-234),(-3.0309414401442555e-203,-3.84393827531526e-12)],[(1.7718777510571518e219,3.972086323144777e139),(1.5723805735454373e-67,-3.805243648123396e226),(154531069271292800000,1.1384408025183933e-285),(-2.009892367470994e-247,2.0325742976832167e81)],[(1.2145787097670788e55,-5.0579298233321666e-30),(5.05577441452021e-182,-2.968914705509665e-175),(-1.702335524921919e67,-2.852552828587631e-226),(-2.7664498327826963e-99,-1.2967072085088717e-305),(7.68881162387673e-68,-1.2506915095983359e-142),(-7.60308693295946e-40,5.414853590549086e218)],[(8.595602987813848e226,-3.9708286611967497e-206),(-5.80352787694746e-52,5.610493934761672e236),(2.1336999375861025e217,-5.431988994371099e-154),(-6.2758614367782974e29,-8.359901046980544e-55)],[(1.6910790690897504e54,9.798739710823911e197),(-6.530270107036228e-284,8.758552462406328e-302),(2.931625032390877e-118,2.8793800873550273e83),(-3.293986884112906e-88,11877326093331202),(0.0008071321465157103,1.0720860516457485e-298)]]"
diff --git a/tests/integration/test_s3_cluster/test.py b/tests/integration/test_s3_cluster/test.py
new file mode 100644
index 00000000000..f60e6e6862f
--- /dev/null
+++ b/tests/integration/test_s3_cluster/test.py
@@ -0,0 +1,129 @@
+import logging
+import os
+
+import pytest
+from helpers.cluster import ClickHouseCluster
+from helpers.test_tools import TSV
+
+logging.getLogger().setLevel(logging.INFO)
+logging.getLogger().addHandler(logging.StreamHandler())
+
+SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
+S3_DATA = ['data/clickhouse/part1.csv', 'data/clickhouse/part123.csv', 'data/database/part2.csv', 'data/database/partition675.csv']
+
+def create_buckets_s3(cluster):
+    minio = cluster.minio_client
+    for file in S3_DATA:
+        minio.fput_object(bucket_name=cluster.minio_bucket, object_name=file, file_path=os.path.join(SCRIPT_DIR, file))
+    for obj in minio.list_objects(cluster.minio_bucket, recursive=True):
+        print(obj.object_name)
+
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster = ClickHouseCluster(__file__)
+        cluster.add_instance('s0_0_0', main_configs=["configs/cluster.xml"], with_minio=True)
+        cluster.add_instance('s0_0_1', main_configs=["configs/cluster.xml"])
+        cluster.add_instance('s0_1_0', main_configs=["configs/cluster.xml"])
+            
+        logging.info("Starting cluster...")
+        cluster.start()
+        logging.info("Cluster started")
+
+        create_buckets_s3(cluster)
+
+        yield cluster
+    finally:
+        cluster.shutdown()
+
+
+def test_select_all(started_cluster):
+    node = started_cluster.instances['s0_0_0']
+    pure_s3 = node.query("""
+    SELECT * from s3(
+        'http://minio1:9001/root/data/{clickhouse,database}/*', 
+        'minio', 'minio123', 'CSV', 
+        'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))') 
+    ORDER BY (name, value, polygon)""")
+    # print(pure_s3)
+    s3_distibuted = node.query("""
+    SELECT * from s3Cluster(
+        'cluster_simple', 
+        'http://minio1:9001/root/data/{clickhouse,database}/*', 'minio', 'minio123', 'CSV', 
+        'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))') ORDER BY (name, value, polygon)""")
+    # print(s3_distibuted)
+
+    assert TSV(pure_s3) == TSV(s3_distibuted)
+
+
+def test_count(started_cluster):
+    node = started_cluster.instances['s0_0_0']
+    pure_s3 = node.query("""
+    SELECT count(*) from s3(
+        'http://minio1:9001/root/data/{clickhouse,database}/*', 
+        'minio', 'minio123', 'CSV', 
+        'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')""")
+    # print(pure_s3)
+    s3_distibuted = node.query("""
+    SELECT count(*) from s3Cluster(
+        'cluster_simple', 'http://minio1:9001/root/data/{clickhouse,database}/*', 
+        'minio', 'minio123', 'CSV',
+        'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')""")
+    # print(s3_distibuted)
+
+    assert TSV(pure_s3) == TSV(s3_distibuted)
+
+
+def test_union_all(started_cluster):
+    node = started_cluster.instances['s0_0_0']
+    pure_s3 = node.query("""
+    SELECT * FROM
+    (
+        SELECT * from s3(
+            'http://minio1:9001/root/data/{clickhouse,database}/*', 
+            'minio', 'minio123', 'CSV', 
+            'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))') 
+        UNION ALL
+        SELECT * from s3(
+            'http://minio1:9001/root/data/{clickhouse,database}/*', 
+            'minio', 'minio123', 'CSV', 
+            'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')
+    )
+    ORDER BY (name, value, polygon)
+    """)
+    # print(pure_s3)
+    s3_distibuted = node.query("""
+    SELECT * FROM
+    (
+        SELECT * from s3Cluster(
+            'cluster_simple', 
+            'http://minio1:9001/root/data/{clickhouse,database}/*', 'minio', 'minio123', 'CSV', 
+            'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')
+        UNION ALL
+        SELECT * from s3Cluster(
+            'cluster_simple', 
+            'http://minio1:9001/root/data/{clickhouse,database}/*', 'minio', 'minio123', 'CSV', 
+            'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')
+    )
+    ORDER BY (name, value, polygon)
+    """)
+    # print(s3_distibuted)
+
+    assert TSV(pure_s3) == TSV(s3_distibuted)
+
+
+def test_wrong_cluster(started_cluster):
+    node = started_cluster.instances['s0_0_0']
+    error = node.query_and_get_error("""
+    SELECT count(*) from s3Cluster(
+        'non_existent_cluster',
+        'http://minio1:9001/root/data/{clickhouse,database}/*', 
+        'minio', 'minio123', 'CSV', 'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')
+    UNION ALL
+    SELECT count(*) from s3Cluster(
+        'non_existent_cluster',
+        'http://minio1:9001/root/data/{clickhouse,database}/*', 
+        'minio', 'minio123', 'CSV', 'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')""")
+    
+    assert "not found" in error
\ No newline at end of file
diff --git a/tests/integration/test_s3_zero_copy_replication/__init__.py b/tests/integration/test_s3_zero_copy_replication/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/integration/test_s3_zero_copy_replication/configs/config.d/s3.xml b/tests/integration/test_s3_zero_copy_replication/configs/config.d/s3.xml
new file mode 100644
index 00000000000..ec28840054a
--- /dev/null
+++ b/tests/integration/test_s3_zero_copy_replication/configs/config.d/s3.xml
@@ -0,0 +1,61 @@
+<yandex>
+
+    <storage_configuration>
+        <disks>
+            <s31>
+                <type>s3</type>
+                <endpoint>http://minio1:9001/root/data/</endpoint>
+                <access_key_id>minio</access_key_id>
+                <secret_access_key>minio123</secret_access_key>
+            </s31>
+        </disks>
+        <policies>
+            <s3>
+                <volumes>
+                    <main>
+                        <disk>s31</disk>
+                    </main>
+                </volumes>
+            </s3>
+            <hybrid>
+                <volumes>
+                    <main>
+                        <disk>default</disk>
+                    </main>
+                    <external>
+                        <disk>s31</disk>
+                    </external>
+                </volumes>
+                <move_factor>0.0</move_factor>
+            </hybrid>
+        </policies>
+    </storage_configuration>
+
+    <merge_tree>
+        <min_bytes_for_wide_part>0</min_bytes_for_wide_part>
+        <old_parts_lifetime>1</old_parts_lifetime>
+        <allow_s3_zero_copy_replication>1</allow_s3_zero_copy_replication>
+    </merge_tree>
+
+    <remote_servers>
+        <test_cluster>
+            <shard>
+                <replica>
+                    <host>node1</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+            <shard>
+                <replica>
+                    <host>node2</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </test_cluster>
+    </remote_servers>
+
+    <macros>
+        <cluster>test_cluster</cluster>
+    </macros>
+
+</yandex>
diff --git a/tests/integration/test_s3_zero_copy_replication/test.py b/tests/integration/test_s3_zero_copy_replication/test.py
new file mode 100644
index 00000000000..f7078d55c33
--- /dev/null
+++ b/tests/integration/test_s3_zero_copy_replication/test.py
@@ -0,0 +1,137 @@
+import logging
+import time
+
+import pytest
+from helpers.cluster import ClickHouseCluster
+
+logging.getLogger().setLevel(logging.INFO)
+logging.getLogger().addHandler(logging.StreamHandler())
+
+
+@pytest.fixture(scope="module")
+def cluster():
+    try:
+        cluster = ClickHouseCluster(__file__)
+        cluster.add_instance("node1", main_configs=["configs/config.d/s3.xml"], macros={'replica': '1'},
+                             with_minio=True,
+                             with_zookeeper=True)
+        cluster.add_instance("node2", main_configs=["configs/config.d/s3.xml"], macros={'replica': '2'},
+                             with_minio=True,
+                             with_zookeeper=True)
+        logging.info("Starting cluster...")
+        cluster.start()
+        logging.info("Cluster started")
+
+        yield cluster
+    finally:
+        cluster.shutdown()
+
+
+def get_large_objects_count(cluster, size=100):
+    minio = cluster.minio_client
+    counter = 0
+    for obj in minio.list_objects(cluster.minio_bucket, 'data/'):
+        if obj.size >= size:
+            counter = counter + 1
+    return counter
+
+
+def wait_for_large_objects_count(cluster, expected, size=100, timeout=30):
+    while timeout > 0:
+        if get_large_objects_count(cluster, size) == expected:
+            return
+        timeout -= 1
+        time.sleep(1)
+    assert get_large_objects_count(cluster, size) == expected
+
+
+@pytest.mark.parametrize(
+    "policy", ["s3"]
+)
+def test_s3_zero_copy_replication(cluster, policy):
+    node1 = cluster.instances["node1"]
+    node2 = cluster.instances["node2"]
+
+    node1.query(
+        """
+        CREATE TABLE s3_test ON CLUSTER test_cluster (id UInt32, value String)
+        ENGINE=ReplicatedMergeTree('/clickhouse/tables/s3_test', '{}')
+        ORDER BY id
+        SETTINGS storage_policy='{}'
+        """
+            .format('{replica}', policy)
+    )
+
+    node1.query("INSERT INTO s3_test VALUES (0,'data'),(1,'data')")
+    time.sleep(1)
+    assert node1.query("SELECT * FROM s3_test order by id FORMAT Values") == "(0,'data'),(1,'data')"
+    assert node2.query("SELECT * FROM s3_test order by id FORMAT Values") == "(0,'data'),(1,'data')"
+
+    # Based on version 20.x - should be only one file with size 100+ (checksums.txt), used by both nodes
+    assert get_large_objects_count(cluster) == 1
+
+    node2.query("INSERT INTO s3_test VALUES (2,'data'),(3,'data')")
+    time.sleep(1)
+    assert node2.query("SELECT * FROM s3_test order by id FORMAT Values") == "(0,'data'),(1,'data'),(2,'data'),(3,'data')"
+    assert node1.query("SELECT * FROM s3_test order by id FORMAT Values") == "(0,'data'),(1,'data'),(2,'data'),(3,'data')"
+
+    # Based on version 20.x - two parts
+    wait_for_large_objects_count(cluster, 2)
+
+    node1.query("OPTIMIZE TABLE s3_test")
+
+    # Based on version 20.x - after merge, two old parts and one merged
+    wait_for_large_objects_count(cluster, 3)
+
+    # Based on version 20.x - after cleanup - only one merged part
+    wait_for_large_objects_count(cluster, 1, timeout=60)
+
+    node1.query("DROP TABLE IF EXISTS s3_test NO DELAY")
+    node2.query("DROP TABLE IF EXISTS s3_test NO DELAY")
+
+
+def test_s3_zero_copy_on_hybrid_storage(cluster):
+    node1 = cluster.instances["node1"]
+    node2 = cluster.instances["node2"]
+
+    node1.query(
+        """
+        CREATE TABLE hybrid_test ON CLUSTER test_cluster (id UInt32, value String)
+        ENGINE=ReplicatedMergeTree('/clickhouse/tables/hybrid_test', '{}')
+        ORDER BY id
+        SETTINGS storage_policy='hybrid'
+        """
+            .format('{replica}')
+    )
+
+    node1.query("INSERT INTO hybrid_test VALUES (0,'data'),(1,'data')")
+
+    time.sleep(1)
+
+    assert node1.query("SELECT * FROM hybrid_test ORDER BY id FORMAT Values") == "(0,'data'),(1,'data')"
+    assert node2.query("SELECT * FROM hybrid_test ORDER BY id FORMAT Values") == "(0,'data'),(1,'data')"
+
+    assert node1.query("SELECT partition_id,disk_name FROM system.parts WHERE table='hybrid_test' FORMAT Values") == "('all','default')"
+    assert node2.query("SELECT partition_id,disk_name FROM system.parts WHERE table='hybrid_test' FORMAT Values") == "('all','default')"
+
+    node1.query("ALTER TABLE hybrid_test MOVE PARTITION ID 'all' TO DISK 's31'")
+
+    assert node1.query("SELECT partition_id,disk_name FROM system.parts WHERE table='hybrid_test' FORMAT Values") == "('all','s31')"
+    assert node2.query("SELECT partition_id,disk_name FROM system.parts WHERE table='hybrid_test' FORMAT Values") == "('all','default')"
+
+    # Total objects in S3
+    s3_objects = get_large_objects_count(cluster, 0)
+
+    node2.query("ALTER TABLE hybrid_test MOVE PARTITION ID 'all' TO DISK 's31'")
+
+    assert node1.query("SELECT partition_id,disk_name FROM system.parts WHERE table='hybrid_test' FORMAT Values") == "('all','s31')"
+    assert node2.query("SELECT partition_id,disk_name FROM system.parts WHERE table='hybrid_test' FORMAT Values") == "('all','s31')"
+
+    # Check that after moving partition on node2 no new obects on s3
+    wait_for_large_objects_count(cluster, s3_objects, size=0)
+
+    assert node1.query("SELECT * FROM hybrid_test ORDER BY id FORMAT Values") == "(0,'data'),(1,'data')"
+    assert node2.query("SELECT * FROM hybrid_test ORDER BY id FORMAT Values") == "(0,'data'),(1,'data')"
+
+    node1.query("DROP TABLE IF EXISTS hybrid_test NO DELAY")
+    node2.query("DROP TABLE IF EXISTS hybrid_test NO DELAY")
diff --git a/tests/integration/test_secure_socket/__init__.py b/tests/integration/test_secure_socket/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/integration/test_secure_socket/configs_secure/config.d/remote_servers.xml b/tests/integration/test_secure_socket/configs_secure/config.d/remote_servers.xml
new file mode 100644
index 00000000000..0c109d6d768
--- /dev/null
+++ b/tests/integration/test_secure_socket/configs_secure/config.d/remote_servers.xml
@@ -0,0 +1,14 @@
+<yandex>
+    <tcp_port_secure>9440</tcp_port_secure>
+    <remote_servers>
+        <test_cluster>
+            <shard>
+                <replica>
+                    <host>node2</host>
+                    <port>9440</port>
+                    <secure>1</secure>
+                </replica>
+            </shard>
+        </test_cluster>
+    </remote_servers>
+</yandex>
diff --git a/tests/integration/test_secure_socket/configs_secure/config.d/ssl_conf.xml b/tests/integration/test_secure_socket/configs_secure/config.d/ssl_conf.xml
new file mode 100644
index 00000000000..fe39e3712b8
--- /dev/null
+++ b/tests/integration/test_secure_socket/configs_secure/config.d/ssl_conf.xml
@@ -0,0 +1,18 @@
+<yandex>
+    <openSSL>
+        <server>
+            <certificateFile>/etc/clickhouse-server/config.d/server.crt</certificateFile>
+            <privateKeyFile>/etc/clickhouse-server/config.d/server.key</privateKeyFile>
+            <dhParamsFile>/etc/clickhouse-server/config.d/dhparam.pem</dhParamsFile>
+            <verificationMode>none</verificationMode>
+            <cacheSessions>true</cacheSessions>
+        </server>
+        <client>
+            <cacheSessions>true</cacheSessions>
+            <verificationMode>none</verificationMode>
+            <invalidCertificateHandler>
+                <name>AcceptCertificateHandler</name>
+            </invalidCertificateHandler>
+        </client>
+    </openSSL>
+</yandex>
diff --git a/tests/integration/test_secure_socket/configs_secure/dhparam.pem b/tests/integration/test_secure_socket/configs_secure/dhparam.pem
new file mode 100644
index 00000000000..2e6cee0798d
--- /dev/null
+++ b/tests/integration/test_secure_socket/configs_secure/dhparam.pem
@@ -0,0 +1,8 @@
+-----BEGIN DH PARAMETERS-----
+MIIBCAKCAQEAua92DDli13gJ+//ZXyGaggjIuidqB0crXfhUlsrBk9BV1hH3i7fR
+XGP9rUdk2ubnB3k2ejBStL5oBrkHm9SzUFSQHqfDjLZjKoUpOEmuDc4cHvX1XTR5
+Pr1vf5cd0yEncJWG5W4zyUB8k++SUdL2qaeslSs+f491HBLDYn/h8zCgRbBvxhxb
+9qeho1xcbnWeqkN6Kc9bgGozA16P9NLuuLttNnOblkH+lMBf42BSne/TWt3AlGZf
+slKmmZcySUhF8aKfJnLKbkBCFqOtFRh8zBA9a7g+BT/lSANATCDPaAk1YVih2EKb
+dpc3briTDbRsiqg2JKMI7+VdULY9bh3EawIBAg==
+-----END DH PARAMETERS-----
diff --git a/tests/integration/test_secure_socket/configs_secure/server.crt b/tests/integration/test_secure_socket/configs_secure/server.crt
new file mode 100644
index 00000000000..7ade2d96273
--- /dev/null
+++ b/tests/integration/test_secure_socket/configs_secure/server.crt
@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIC/TCCAeWgAwIBAgIJANjx1QSR77HBMA0GCSqGSIb3DQEBCwUAMBQxEjAQBgNV
+BAMMCWxvY2FsaG9zdDAgFw0xODA3MzAxODE2MDhaGA8yMjkyMDUxNDE4MTYwOFow
+FDESMBAGA1UEAwwJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAs9uSo6lJG8o8pw0fbVGVu0tPOljSWcVSXH9uiJBwlZLQnhN4SFSFohfI
+4K8U1tBDTnxPLUo/V1K9yzoLiRDGMkwVj6+4+hE2udS2ePTQv5oaMeJ9wrs+5c9T
+4pOtlq3pLAdm04ZMB1nbrEysceVudHRkQbGHzHp6VG29Fw7Ga6YpqyHQihRmEkTU
+7UCYNA+Vk7aDPdMS/khweyTpXYZimaK9f0ECU3/VOeG3fH6Sp2X6FN4tUj/aFXEj
+sRmU5G2TlYiSIUMF2JPdhSihfk1hJVALrHPTU38SOL+GyyBRWdNcrIwVwbpvsvPg
+pryMSNxnpr0AK0dFhjwnupIv5hJIOQIDAQABo1AwTjAdBgNVHQ4EFgQUjPLb3uYC
+kcamyZHK4/EV8jAP0wQwHwYDVR0jBBgwFoAUjPLb3uYCkcamyZHK4/EV8jAP0wQw
+DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAM/ocuDvfPus/KpMVD51j
+4IdlU8R0vmnYLQ+ygzOAo7+hUWP5j0yvq4ILWNmQX6HNvUggCgFv9bjwDFhb/5Vr
+85ieWfTd9+LTjrOzTw4avdGwpX9G+6jJJSSq15tw5ElOIFb/qNA9O4dBiu8vn03C
+L/zRSXrARhSqTW5w/tZkUcSTT+M5h28+Lgn9ysx4Ff5vi44LJ1NnrbJbEAIYsAAD
++UA+4MBFKx1r6hHINULev8+lCfkpwIaeS8RL+op4fr6kQPxnULw8wT8gkuc8I4+L
+P9gg/xDHB44T3ADGZ5Ib6O0DJaNiToO6rnoaaxs0KkotbvDWvRoxEytSbXKoYjYp
+0g==
+-----END CERTIFICATE-----
diff --git a/tests/integration/test_secure_socket/configs_secure/server.key b/tests/integration/test_secure_socket/configs_secure/server.key
new file mode 100644
index 00000000000..f0fb61ac443
--- /dev/null
+++ b/tests/integration/test_secure_socket/configs_secure/server.key
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCz25KjqUkbyjyn
+DR9tUZW7S086WNJZxVJcf26IkHCVktCeE3hIVIWiF8jgrxTW0ENOfE8tSj9XUr3L
+OguJEMYyTBWPr7j6ETa51LZ49NC/mhox4n3Cuz7lz1Pik62WreksB2bThkwHWdus
+TKxx5W50dGRBsYfMenpUbb0XDsZrpimrIdCKFGYSRNTtQJg0D5WTtoM90xL+SHB7
+JOldhmKZor1/QQJTf9U54bd8fpKnZfoU3i1SP9oVcSOxGZTkbZOViJIhQwXYk92F
+KKF+TWElUAusc9NTfxI4v4bLIFFZ01ysjBXBum+y8+CmvIxI3GemvQArR0WGPCe6
+ki/mEkg5AgMBAAECggEATrbIBIxwDJOD2/BoUqWkDCY3dGevF8697vFuZKIiQ7PP
+TX9j4vPq0DfsmDjHvAPFkTHiTQXzlroFik3LAp+uvhCCVzImmHq0IrwvZ9xtB43f
+7Pkc5P6h1l3Ybo8HJ6zRIY3TuLtLxuPSuiOMTQSGRL0zq3SQ5DKuGwkz+kVjHXUN
+MR2TECFwMHKQ5VLrC+7PMpsJYyOMlDAWhRfUalxC55xOXTpaN8TxNnwQ8K2ISVY5
+212Jz/a4hn4LdwxSz3Tiu95PN072K87HLWx3EdT6vW4Ge5P/A3y+smIuNAlanMnu
+plHBRtpATLiTxZt/n6npyrfQVbYjSH7KWhB8hBHtaQKBgQDh9Cq1c/KtqDtE0Ccr
+/r9tZNTUwBE6VP+3OJeKdEdtsfuxjOCkS1oAjgBJiSDOiWPh1DdoDeVZjPKq6pIu
+Mq12OE3Doa8znfCXGbkSzEKOb2unKZMJxzrz99kXt40W5DtrqKPNb24CNqTiY8Aa
+CjtcX+3weat82VRXvph6U8ltMwKBgQDLxjiQQzNoY7qvg7CwJCjf9qq8jmLK766g
+1FHXopqS+dTxDLM8eJSRrpmxGWJvNeNc1uPhsKsKgotqAMdBUQTf7rSTbt4MyoH5
+bUcRLtr+0QTK9hDWMOOvleqNXha68vATkohWYfCueNsC60qD44o8RZAS6UNy3ENq
+cM1cxqe84wKBgQDKkHutWnooJtajlTxY27O/nZKT/HA1bDgniMuKaz4R4Gr1PIez
+on3YW3V0d0P7BP6PWRIm7bY79vkiMtLEKdiKUGWeyZdo3eHvhDb/3DCawtau8L2K
+GZsHVp2//mS1Lfz7Qh8/L/NedqCQ+L4iWiPnZ3THjjwn3CoZ05ucpvrAMwKBgB54
+nay039MUVq44Owub3KDg+dcIU62U+cAC/9oG7qZbxYPmKkc4oL7IJSNecGHA5SbU
+2268RFdl/gLz6tfRjbEOuOHzCjFPdvAdbysanpTMHLNc6FefJ+zxtgk9sJh0C4Jh
+vxFrw9nTKKzfEl12gQ1SOaEaUIO0fEBGbe8ZpauRAoGAMAlGV+2/K4ebvAJKOVTa
+dKAzQ+TD2SJmeR1HZmKDYddNqwtZlzg3v4ZhCk4eaUmGeC1Bdh8MDuB3QQvXz4Dr
+vOIP4UVaOr+uM+7TgAgVnP4/K6IeJGzUDhX93pmpWhODfdu/oojEKVcpCojmEmS1
+KCBtmIrQLqzMpnBpLNuSY+Q=
+-----END PRIVATE KEY-----
diff --git a/tests/integration/test_secure_socket/configs_secure/users.d/users.xml b/tests/integration/test_secure_socket/configs_secure/users.d/users.xml
new file mode 100644
index 00000000000..479017f6370
--- /dev/null
+++ b/tests/integration/test_secure_socket/configs_secure/users.d/users.xml
@@ -0,0 +1,6 @@
+<yandex>
+    <profiles>
+        <default>
+        </default>
+    </profiles>
+</yandex>
diff --git a/tests/integration/test_secure_socket/test.py b/tests/integration/test_secure_socket/test.py
new file mode 100644
index 00000000000..65c789f9d02
--- /dev/null
+++ b/tests/integration/test_secure_socket/test.py
@@ -0,0 +1,84 @@
+import os.path
+import time
+
+import pytest
+from helpers.cluster import ClickHouseCluster
+from helpers.test_tools import TSV
+
+cluster = ClickHouseCluster(__file__)
+
+NODES = {'node' + str(i): None for i in (1, 2)}
+
+config = '''<yandex>
+    <profiles>
+        <default>
+            <sleep_in_send_data_ms>{sleep_in_send_data_ms}</sleep_in_send_data_ms>
+        </default>
+    </profiles>
+</yandex>'''
+
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    cluster.__with_ssl_config = True
+    main_configs = [
+        "configs_secure/config.d/remote_servers.xml",
+        "configs_secure/server.crt",
+        "configs_secure/server.key",
+        "configs_secure/dhparam.pem",
+        "configs_secure/config.d/ssl_conf.xml",
+    ]
+
+    NODES['node1'] =  cluster.add_instance('node1', main_configs=main_configs)
+    NODES['node2'] =  cluster.add_instance('node2', main_configs=main_configs, user_configs=["configs_secure/users.d/users.xml"])
+
+    try:
+        cluster.start()
+        NODES['node2'].query("CREATE TABLE base_table (x UInt64) ENGINE = MergeTree  ORDER BY x;")
+        NODES['node2'].query("INSERT INTO base_table VALUES (5);")
+        NODES['node1'].query("CREATE TABLE distributed_table (x UInt64) ENGINE = Distributed(test_cluster, default, base_table);")
+
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+
+def test(started_cluster):
+    NODES['node2'].replace_config('/etc/clickhouse-server/users.d/users.xml', config.format(sleep_in_send_data_ms=1000000))
+    
+    attempts = 0
+    while attempts < 1000:
+        setting = NODES['node2'].http_query("SELECT value FROM system.settings WHERE name='sleep_in_send_data_ms'")
+        if int(setting) == 1000000:
+            break
+        time.sleep(0.1)
+        attempts += 1
+
+    assert attempts < 1000
+
+
+    start = time.time()
+    NODES['node1'].query_and_get_error('SELECT * FROM distributed_table settings receive_timeout=5, send_timeout=5, use_hedged_requests=0, async_socket_for_remote=0;')
+    end = time.time()
+    assert end - start < 10
+
+    start = time.time()
+    error = NODES['node1'].query_and_get_error('SELECT * FROM distributed_table settings receive_timeout=5, send_timeout=5, use_hedged_requests=0, async_socket_for_remote=1;')
+    end = time.time()
+
+    assert end - start < 10
+
+    # Check that exception about timeout wasn't thrown from DB::ReadBufferFromPocoSocket::nextImpl().
+    assert error.find('DB::ReadBufferFromPocoSocket::nextImpl()') == -1
+
+    start = time.time()
+    error = NODES['node1'].query_and_get_error('SELECT * FROM distributed_table settings receive_timeout=5, send_timeout=5, use_hedged_requests=1, async_socket_for_remote=1;')
+    end = time.time()
+
+    assert end - start < 10
+
+    # Check that exception about timeout wasn't thrown from DB::ReadBufferFromPocoSocket::nextImpl().
+    assert error.find('DB::ReadBufferFromPocoSocket::nextImpl()') == -1
+
+
diff --git a/tests/integration/test_storage_hdfs/test.py b/tests/integration/test_storage_hdfs/test.py
index a6c8b7e1ee9..a0dc342e910 100644
--- a/tests/integration/test_storage_hdfs/test.py
+++ b/tests/integration/test_storage_hdfs/test.py
@@ -201,6 +201,24 @@ def test_write_gzip_storage(started_cluster):
     assert started_cluster.hdfs_api.read_gzip_data("/gzip_storage") == "1\tMark\t72.53\n"
     assert node1.query("select * from GZIPHDFSStorage") == "1\tMark\t72.53\n"
 
+
+def test_virtual_columns(started_cluster):
+    node1.query("create table virtual_cols (id UInt32) ENGINE = HDFS('hdfs://hdfs1:9000/file*', 'TSV')")
+    started_cluster.hdfs_api.write_data("/file1", "1\n")
+    started_cluster.hdfs_api.write_data("/file2", "2\n")
+    started_cluster.hdfs_api.write_data("/file3", "3\n")
+    expected = "1\tfile1\thdfs://hdfs1:9000//file1\n2\tfile2\thdfs://hdfs1:9000//file2\n3\tfile3\thdfs://hdfs1:9000//file3\n"
+    assert node1.query("select id, _file as file_name, _path as file_path from virtual_cols order by id") == expected
+
+    
+def test_read_files_with_spaces(started_cluster):
+    started_cluster.hdfs_api.write_data("/test test test 1.txt", "1\n")
+    started_cluster.hdfs_api.write_data("/test test test 2.txt", "2\n")
+    started_cluster.hdfs_api.write_data("/test test test 3.txt", "3\n")
+    node1.query("create table test (id UInt32) ENGINE = HDFS('hdfs://hdfs1:9000/test*', 'TSV')")
+    assert node1.query("select * from test order by id") == "1\n2\n3\n"
+
+
 if __name__ == '__main__':
     cluster.start()
     input("Cluster created, press any key to destroy...")
diff --git a/tests/integration/test_storage_kafka/test.py b/tests/integration/test_storage_kafka/test.py
index 5f2726832cc..99617367bb1 100644
--- a/tests/integration/test_storage_kafka/test.py
+++ b/tests/integration/test_storage_kafka/test.py
@@ -5,8 +5,12 @@ import socket
 import subprocess
 import threading
 import time
+import io
+import string
 
 import avro.schema
+import avro.io
+import avro.datafile
 from confluent_kafka.avro.cached_schema_registry_client import CachedSchemaRegistryClient
 from confluent_kafka.avro.serializer.message_serializer import MessageSerializer
 from confluent_kafka import admin
@@ -18,10 +22,8 @@ from helpers.client import QueryRuntimeException
 from helpers.cluster import ClickHouseCluster
 from helpers.network import PartitionManager
 from helpers.test_tools import TSV
-from kafka import KafkaAdminClient, KafkaProducer, KafkaConsumer, BrokerConnection
+from kafka import KafkaAdminClient, KafkaProducer, KafkaConsumer
 from kafka.admin import NewTopic
-from kafka.protocol.admin import DescribeGroupsRequest_v1
-from kafka.protocol.group import MemberAssignment
 
 """
 protoc --version
@@ -83,12 +85,16 @@ def wait_kafka_is_available(max_retries=50):
 def producer_serializer(x):
     return x.encode() if isinstance(x, str) else x
 
-def kafka_produce(topic, messages, timestamp=None):
-    producer = KafkaProducer(bootstrap_servers="localhost:9092", value_serializer=producer_serializer)
+def kafka_produce(topic, messages, timestamp=None, retries=2):
+    producer = KafkaProducer(bootstrap_servers="localhost:9092", value_serializer=producer_serializer, retries=retries, max_in_flight_requests_per_connection=1)
     for message in messages:
         producer.send(topic=topic, value=message, timestamp_ms=timestamp)
         producer.flush()
 
+## just to ensure the python client / producer is working properly
+def kafka_producer_send_heartbeat_msg(max_retries=50):
+    kafka_produce('test_heartbeat_topic', ['test'], retries=max_retries)
+
 def kafka_consume(topic):
     consumer = KafkaConsumer(bootstrap_servers="localhost:9092", auto_offset_reset="earliest")
     consumer.subscribe(topics=(topic))
@@ -138,6 +144,37 @@ def kafka_produce_protobuf_social(topic, start_index, num_messages):
     producer.flush()
     print(("Produced {} messages for topic {}".format(num_messages, topic)))
 
+def avro_message(value):
+    schema = avro.schema.make_avsc_object({
+        'name': 'row',
+        'type': 'record',
+        'fields': [
+            {'name': 'id', 'type': 'long'},
+            {'name': 'blockNo', 'type': 'int'},
+            {'name': 'val1', 'type': 'string'},
+            {'name': 'val2', 'type': 'float'},
+            {'name': 'val3', 'type': 'int'}
+        ]
+    })
+    bytes_writer = io.BytesIO()
+    # writer = avro.io.DatumWriter(schema)
+    # encoder = avro.io.BinaryEncoder(bytes_writer)
+    # writer.write(value, encoder)
+
+
+    # DataFileWrite seems to be mandatory to get schema encoded
+    writer = avro.datafile.DataFileWriter(bytes_writer, avro.io.DatumWriter(), schema)
+    if isinstance(value, list):
+        for v in value:
+            writer.append(v)
+    else:
+        writer.append(value)
+    writer.flush()
+    raw_bytes = bytes_writer.getvalue()
+
+    writer.close()
+    bytes_writer.close()
+    return raw_bytes
 
 def avro_confluent_message(schema_registry_client, value):
     # type: (CachedSchemaRegistryClient, dict) -> str
@@ -156,6 +193,132 @@ def avro_confluent_message(schema_registry_client, value):
     })
     return serializer.encode_record_with_schema('test_subject', schema, value)
 
+# Since everything is async and shaky when receiving messages from Kafka,
+# we may want to try and check results multiple times in a loop.
+def kafka_check_result(result, check=False, ref_file='test_kafka_json.reference'):
+    fpath = p.join(p.dirname(__file__), ref_file)
+    with open(fpath) as reference:
+        if check:
+            assert TSV(result) == TSV(reference)
+        else:
+            return TSV(result) == TSV(reference)
+
+def describe_consumer_group(name):
+    admin_client = KafkaAdminClient(bootstrap_servers="localhost:9092")
+    consumer_groups = admin_client.describe_consumer_groups([name])
+    res = []
+    for member in consumer_groups[0].members:
+        member_info = {}
+        member_info['member_id'] = member.member_id
+        member_info['client_id'] = member.client_id
+        member_info['client_host'] = member.client_host
+        member_topics_assignment = []
+        for (topic, partitions) in member.member_assignment.assignment:
+            member_topics_assignment.append({'topic': topic, 'partitions': partitions})
+        member_info['assignment'] = member_topics_assignment
+        res.append(member_info)
+    return res
+
+# Fixtures
+
+@pytest.fixture(scope="module")
+def kafka_cluster():
+    try:
+        global kafka_id
+        cluster.start()
+        kafka_id = instance.cluster.kafka_docker_id
+        print(("kafka_id is {}".format(kafka_id)))
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+@pytest.fixture(autouse=True)
+def kafka_setup_teardown():
+    instance.query('DROP DATABASE IF EXISTS test; CREATE DATABASE test;')
+    wait_kafka_is_available() # ensure kafka is alive
+    kafka_producer_send_heartbeat_msg() # ensure python kafka client is ok
+    # print("kafka is available - running test")
+    yield  # run test
+
+# Tests
+
+@pytest.mark.timeout(180)
+def test_kafka_settings_old_syntax(kafka_cluster):
+    assert TSV(instance.query("SELECT * FROM system.macros WHERE macro like 'kafka%' ORDER BY macro",
+                              ignore_error=True)) == TSV('''kafka_broker	kafka1
+kafka_client_id	instance
+kafka_format_json_each_row	JSONEachRow
+kafka_group_name_new	new
+kafka_group_name_old	old
+kafka_topic_new	new
+kafka_topic_old	old
+''')
+
+    instance.query('''
+        CREATE TABLE test.kafka (key UInt64, value UInt64)
+            ENGINE = Kafka('{kafka_broker}:19092', '{kafka_topic_old}', '{kafka_group_name_old}', '{kafka_format_json_each_row}', '\\n');
+        ''')
+
+    # Don't insert malformed messages since old settings syntax
+    # doesn't support skipping of broken messages.
+    messages = []
+    for i in range(50):
+        messages.append(json.dumps({'key': i, 'value': i}))
+    kafka_produce('old', messages)
+
+    result = ''
+    while True:
+        result += instance.query('SELECT * FROM test.kafka', ignore_error=True)
+        if kafka_check_result(result):
+            break
+
+    kafka_check_result(result, True)
+
+    members = describe_consumer_group('old')
+    assert members[0]['client_id'] == 'ClickHouse-instance-test-kafka'
+    # text_desc = kafka_cluster.exec_in_container(kafka_cluster.get_container_id('kafka1'),"kafka-consumer-groups --bootstrap-server localhost:9092 --describe --members --group old --verbose"))
+
+
+@pytest.mark.timeout(180)
+def test_kafka_settings_new_syntax(kafka_cluster):
+    instance.query('''
+        CREATE TABLE test.kafka (key UInt64, value UInt64)
+            ENGINE = Kafka
+            SETTINGS kafka_broker_list = '{kafka_broker}:19092',
+                     kafka_topic_list = '{kafka_topic_new}',
+                     kafka_group_name = '{kafka_group_name_new}',
+                     kafka_format = '{kafka_format_json_each_row}',
+                     kafka_row_delimiter = '\\n',
+                     kafka_client_id = '{kafka_client_id} test 1234',
+                     kafka_skip_broken_messages = 1;
+        ''')
+
+    messages = []
+    for i in range(25):
+        messages.append(json.dumps({'key': i, 'value': i}))
+    kafka_produce('new', messages)
+
+    # Insert couple of malformed messages.
+    kafka_produce('new', ['}{very_broken_message,'])
+    kafka_produce('new', ['}another{very_broken_message,'])
+
+    messages = []
+    for i in range(25, 50):
+        messages.append(json.dumps({'key': i, 'value': i}))
+    kafka_produce('new', messages)
+
+    result = ''
+    while True:
+        result += instance.query('SELECT * FROM test.kafka', ignore_error=True)
+        if kafka_check_result(result):
+            break
+
+    kafka_check_result(result, True)
+
+    members = describe_consumer_group('new')
+    assert members[0]['client_id'] == 'instance test 1234'
+
 
 @pytest.mark.timeout(180)
 def test_kafka_json_as_string(kafka_cluster):
@@ -183,7 +346,7 @@ def test_kafka_json_as_string(kafka_cluster):
         "Parsing of message (topic: kafka_json_as_string, partition: 0, offset: 1) return no rows")
 
 
-@pytest.mark.timeout(300)
+@pytest.mark.timeout(120)
 def test_kafka_formats(kafka_cluster):
     # data was dumped from clickhouse itself in a following manner
     # clickhouse-client --format=Native --query='SELECT toInt64(number) as id, toUInt16( intDiv( id, 65536 ) ) as blockNo, reinterpretAsString(19777) as val1, toFloat32(0.5) as val2, toUInt8(1) as val3 from numbers(100) ORDER BY id' | xxd -ps | tr -d '\n' | sed 's/\(..\)/\\x\1/g'
@@ -311,7 +474,7 @@ def test_kafka_formats(kafka_cluster):
                 # On empty message exception happens: Line "" doesn't match the regexp.: (at row 1)
                 # /src/Processors/Formats/Impl/RegexpRowInputFormat.cpp:140: DB::RegexpRowInputFormat::readRow(std::__1::vector<COW<DB::IColumn>::mutable_ptr<DB::IColumn>, std::__1::allocator<COW<DB::IColumn>::mutable_ptr<DB::IColumn> > >&, DB::RowReadExtension&) @ 0x1df82fcb in /usr/bin/clickhouse
             ],
-            'extra_settings': ", format_regexp='\(id = (.+?), blockNo = (.+?), val1 = \"(.+?)\", val2 = (.+?), val3 = (.+?)\)', format_regexp_escaping_rule='Escaped'"
+            'extra_settings': r", format_regexp='\(id = (.+?), blockNo = (.+?), val1 = \"(.+?)\", val2 = (.+?), val3 = (.+?)\)', format_regexp_escaping_rule='Escaped'"
         },
 
         ## BINARY FORMATS
@@ -444,13 +607,6 @@ def test_kafka_formats(kafka_cluster):
         #     #     ''
         #     # ],
         # },
-        # 'Avro' : {
-        #     'data_sample' : [
-        #         b'\x4f\x62\x6a\x01\x04\x16\x61\x76\x72\x6f\x2e\x73\x63\x68\x65\x6d\x61\x82\x03\x7b\x22\x74\x79\x70\x65\x22\x3a\x22\x72\x65\x63\x6f\x72\x64\x22\x2c\x22\x6e\x61\x6d\x65\x22\x3a\x22\x72\x6f\x77\x22\x2c\x22\x66\x69\x65\x6c\x64\x73\x22\x3a\x5b\x7b\x22\x6e\x61\x6d\x65\x22\x3a\x22\x69\x64\x22\x2c\x22\x74\x79\x70\x65\x22\x3a\x22\x6c\x6f\x6e\x67\x22\x7d\x2c\x7b\x22\x6e\x61\x6d\x65\x22\x3a\x22\x62\x6c\x6f\x63\x6b\x4e\x6f\x22\x2c\x22\x74\x79\x70\x65\x22\x3a\x22\x69\x6e\x74\x22\x7d\x2c\x7b\x22\x6e\x61\x6d\x65\x22\x3a\x22\x76\x61\x6c\x31\x22\x2c\x22\x74\x79\x70\x65\x22\x3a\x22\x73\x74\x72\x69\x6e\x67\x22\x7d\x2c\x7b\x22\x6e\x61\x6d\x65\x22\x3a\x22\x76\x61\x6c\x32\x22\x2c\x22\x74\x79\x70\x65\x22\x3a\x22\x66\x6c\x6f\x61\x74\x22\x7d\x2c\x7b\x22\x6e\x61\x6d\x65\x22\x3a\x22\x76\x61\x6c\x33\x22\x2c\x22\x74\x79\x70\x65\x22\x3a\x22\x69\x6e\x74\x22\x7d\x5d\x7d\x14\x61\x76\x72\x6f\x2e\x63\x6f\x64\x65\x63\x08\x6e\x75\x6c\x6c\x00\x8d\x1f\xf2\x17\x71\xa4\x2e\xe4\xc9\x0a\x23\x67\x12\xaa\xc6\xc0\x02\x14\x00\x00\x04\x41\x4d\x00\x00\x00\x3f\x02\x8d\x1f\xf2\x17\x71\xa4\x2e\xe4\xc9\x0a\x23\x67\x12\xaa\xc6\xc0',
-        #         b'\x4f\x62\x6a\x01\x04\x16\x61\x76\x72\x6f\x2e\x73\x63\x68\x65\x6d\x61\x82\x03\x7b\x22\x74\x79\x70\x65\x22\x3a\x22\x72\x65\x63\x6f\x72\x64\x22\x2c\x22\x6e\x61\x6d\x65\x22\x3a\x22\x72\x6f\x77\x22\x2c\x22\x66\x69\x65\x6c\x64\x73\x22\x3a\x5b\x7b\x22\x6e\x61\x6d\x65\x22\x3a\x22\x69\x64\x22\x2c\x22\x74\x79\x70\x65\x22\x3a\x22\x6c\x6f\x6e\x67\x22\x7d\x2c\x7b\x22\x6e\x61\x6d\x65\x22\x3a\x22\x62\x6c\x6f\x63\x6b\x4e\x6f\x22\x2c\x22\x74\x79\x70\x65\x22\x3a\x22\x69\x6e\x74\x22\x7d\x2c\x7b\x22\x6e\x61\x6d\x65\x22\x3a\x22\x76\x61\x6c\x31\x22\x2c\x22\x74\x79\x70\x65\x22\x3a\x22\x73\x74\x72\x69\x6e\x67\x22\x7d\x2c\x7b\x22\x6e\x61\x6d\x65\x22\x3a\x22\x76\x61\x6c\x32\x22\x2c\x22\x74\x79\x70\x65\x22\x3a\x22\x66\x6c\x6f\x61\x74\x22\x7d\x2c\x7b\x22\x6e\x61\x6d\x65\x22\x3a\x22\x76\x61\x6c\x33\x22\x2c\x22\x74\x79\x70\x65\x22\x3a\x22\x69\x6e\x74\x22\x7d\x5d\x7d\x14\x61\x76\x72\x6f\x2e\x63\x6f\x64\x65\x63\x08\x6e\x75\x6c\x6c\x00\xeb\x9d\x51\x82\xf2\x11\x3d\x0b\xc5\x92\x97\xb2\x07\x6d\x72\x5a\x1e\xac\x02\x02\x00\x04\x41\x4d\x00\x00\x00\x3f\x02\x04\x00\x04\x41\x4d\x00\x00\x00\x3f\x02\x06\x00\x04\x41\x4d\x00\x00\x00\x3f\x02\x08\x00\x04\x41\x4d\x00\x00\x00\x3f\x02\x0a\x00\x04\x41\x4d\x00\x00\x00\x3f\x02\x0c\x00\x04\x41\x4d\x00\x00\x00\x3f\x02\x0e\x00\x04\x41\x4d\x00\x00\x00\x3f\x02\x10\x00\x04\x41\x4d\x00\x00\x00\x3f\x02\x12\x00\x04\x41\x4d\x00\x00\x00\x3f\x02\x14\x00\x04\x41\x4d\x00\x00\x00\x3f\x02\x16\x00\x04\x41\x4d\x00\x00\x00\x3f\x02\x18\x00\x04\x41\x4d\x00\x00\x00\x3f\x02\x1a\x00\x04\x41\x4d\x00\x00\x00\x3f\x02\x1c\x00\x04\x41\x4d\x00\x00\x00\x3f\x02\x1e\x00\x04\x41\x4d\x00\x00\x00\x3f\x02\xeb\x9d\x51\x82\xf2\x11\x3d\x0b\xc5\x92\x97\xb2\x07\x6d\x72\x5a',
-        #         b'\x4f\x62\x6a\x01\x04\x16\x61\x76\x72\x6f\x2e\x73\x63\x68\x65\x6d\x61\x82\x03\x7b\x22\x74\x79\x70\x65\x22\x3a\x22\x72\x65\x63\x6f\x72\x64\x22\x2c\x22\x6e\x61\x6d\x65\x22\x3a\x22\x72\x6f\x77\x22\x2c\x22\x66\x69\x65\x6c\x64\x73\x22\x3a\x5b\x7b\x22\x6e\x61\x6d\x65\x22\x3a\x22\x69\x64\x22\x2c\x22\x74\x79\x70\x65\x22\x3a\x22\x6c\x6f\x6e\x67\x22\x7d\x2c\x7b\x22\x6e\x61\x6d\x65\x22\x3a\x22\x62\x6c\x6f\x63\x6b\x4e\x6f\x22\x2c\x22\x74\x79\x70\x65\x22\x3a\x22\x69\x6e\x74\x22\x7d\x2c\x7b\x22\x6e\x61\x6d\x65\x22\x3a\x22\x76\x61\x6c\x31\x22\x2c\x22\x74\x79\x70\x65\x22\x3a\x22\x73\x74\x72\x69\x6e\x67\x22\x7d\x2c\x7b\x22\x6e\x61\x6d\x65\x22\x3a\x22\x76\x61\x6c\x32\x22\x2c\x22\x74\x79\x70\x65\x22\x3a\x22\x66\x6c\x6f\x61\x74\x22\x7d\x2c\x7b\x22\x6e\x61\x6d\x65\x22\x3a\x22\x76\x61\x6c\x33\x22\x2c\x22\x74\x79\x70\x65\x22\x3a\x22\x69\x6e\x74\x22\x7d\x5d\x7d\x14\x61\x76\x72\x6f\x2e\x63\x6f\x64\x65\x63\x08\x6e\x75\x6c\x6c\x00\x73\x65\x4f\x7c\xd9\x33\xe1\x18\xdd\x30\xe8\x22\x2a\x58\x20\x6f\x02\x14\x00\x00\x04\x41\x4d\x00\x00\x00\x3f\x02\x73\x65\x4f\x7c\xd9\x33\xe1\x18\xdd\x30\xe8\x22\x2a\x58\x20\x6f',
-        #     ],
-        # },
         'AvroConfluent': {
             'data_sample': [
                 avro_confluent_message(cluster.schema_registry_client,
@@ -468,6 +624,19 @@ def test_kafka_formats(kafka_cluster):
                 cluster.schema_registry_port
             ),
             'supports_empty_value': True,
+        },
+        'Avro': {
+            # It seems impossible to send more than one avro file per a message
+            #   because of nature of Avro: blocks go one after another
+            'data_sample': [
+                avro_message({'id': 0, 'blockNo': 0, 'val1': str('AM'), 'val2': 0.5, "val3": 1}),
+
+                avro_message([{'id': id, 'blockNo': 0, 'val1': str('AM'),
+                                                               'val2': 0.5, "val3": 1} for id in range(1, 16)]),
+
+                avro_message({'id': 0, 'blockNo': 0, 'val1': str('AM'), 'val2': 0.5, "val3": 1}),
+            ],
+            'supports_empty_value': False,
         }
         # 'Arrow' : {
         #     # Not working at all: DB::Exception: Error while opening a table: Invalid: File is too small: 0, Stack trace (when copying this message, always include the lines below):
@@ -545,7 +714,7 @@ def test_kafka_formats(kafka_cluster):
             '''.format(topic_name=topic_name, format_name=format_name,
                        extra_settings=format_opts.get('extra_settings') or ''))
 
-    time.sleep(12)
+    instance.wait_for_log_line('kafka.*Committed offset [0-9]+.*format_tests_', repetitions=len(all_formats.keys()), look_behind_lines=12000)
 
     for format_name, format_opts in list(all_formats.items()):
         print(('Checking {}'.format(format_name)))
@@ -574,148 +743,6 @@ def test_kafka_formats(kafka_cluster):
 '''.format(topic_name=topic_name, offset_0=offsets[0], offset_1=offsets[1], offset_2=offsets[2])
         assert TSV(result) == TSV(expected), 'Proper result for format: {}'.format(format_name)
 
-
-# Since everything is async and shaky when receiving messages from Kafka,
-# we may want to try and check results multiple times in a loop.
-def kafka_check_result(result, check=False, ref_file='test_kafka_json.reference'):
-    fpath = p.join(p.dirname(__file__), ref_file)
-    with open(fpath) as reference:
-        if check:
-            assert TSV(result) == TSV(reference)
-        else:
-            return TSV(result) == TSV(reference)
-
-
-# https://stackoverflow.com/a/57692111/1555175
-def describe_consumer_group(name):
-    client = BrokerConnection('localhost', 9092, socket.AF_INET)
-    client.connect_blocking()
-
-    list_members_in_groups = DescribeGroupsRequest_v1(groups=[name])
-    future = client.send(list_members_in_groups)
-    while not future.is_done:
-        for resp, f in client.recv():
-            f.success(resp)
-
-    (error_code, group_id, state, protocol_type, protocol, members) = future.value.groups[0]
-
-    res = []
-    for member in members:
-        (member_id, client_id, client_host, member_metadata, member_assignment) = member
-        member_info = {}
-        member_info['member_id'] = member_id
-        member_info['client_id'] = client_id
-        member_info['client_host'] = client_host
-        member_topics_assignment = []
-        for (topic, partitions) in MemberAssignment.decode(member_assignment).assignment:
-            member_topics_assignment.append({'topic': topic, 'partitions': partitions})
-        member_info['assignment'] = member_topics_assignment
-        res.append(member_info)
-    return res
-
-
-# Fixtures
-
-@pytest.fixture(scope="module")
-def kafka_cluster():
-    try:
-        global kafka_id
-        cluster.start()
-        kafka_id = instance.cluster.kafka_docker_id
-        print(("kafka_id is {}".format(kafka_id)))
-        yield cluster
-
-    finally:
-        cluster.shutdown()
-
-
-@pytest.fixture(autouse=True)
-def kafka_setup_teardown():
-    instance.query('DROP DATABASE IF EXISTS test; CREATE DATABASE test;')
-    wait_kafka_is_available()
-    # print("kafka is available - running test")
-    yield  # run test
-
-
-# Tests
-
-@pytest.mark.timeout(180)
-def test_kafka_settings_old_syntax(kafka_cluster):
-    assert TSV(instance.query("SELECT * FROM system.macros WHERE macro like 'kafka%' ORDER BY macro",
-                              ignore_error=True)) == TSV('''kafka_broker	kafka1
-kafka_client_id	instance
-kafka_format_json_each_row	JSONEachRow
-kafka_group_name_new	new
-kafka_group_name_old	old
-kafka_topic_new	new
-kafka_topic_old	old
-''')
-
-    instance.query('''
-        CREATE TABLE test.kafka (key UInt64, value UInt64)
-            ENGINE = Kafka('{kafka_broker}:19092', '{kafka_topic_old}', '{kafka_group_name_old}', '{kafka_format_json_each_row}', '\\n');
-        ''')
-
-    # Don't insert malformed messages since old settings syntax
-    # doesn't support skipping of broken messages.
-    messages = []
-    for i in range(50):
-        messages.append(json.dumps({'key': i, 'value': i}))
-    kafka_produce('old', messages)
-
-    result = ''
-    while True:
-        result += instance.query('SELECT * FROM test.kafka', ignore_error=True)
-        if kafka_check_result(result):
-            break
-
-    kafka_check_result(result, True)
-
-    members = describe_consumer_group('old')
-    assert members[0]['client_id'] == 'ClickHouse-instance-test-kafka'
-    # text_desc = kafka_cluster.exec_in_container(kafka_cluster.get_container_id('kafka1'),"kafka-consumer-groups --bootstrap-server localhost:9092 --describe --members --group old --verbose"))
-
-
-@pytest.mark.timeout(180)
-def test_kafka_settings_new_syntax(kafka_cluster):
-    instance.query('''
-        CREATE TABLE test.kafka (key UInt64, value UInt64)
-            ENGINE = Kafka
-            SETTINGS kafka_broker_list = '{kafka_broker}:19092',
-                     kafka_topic_list = '{kafka_topic_new}',
-                     kafka_group_name = '{kafka_group_name_new}',
-                     kafka_format = '{kafka_format_json_each_row}',
-                     kafka_row_delimiter = '\\n',
-                     kafka_client_id = '{kafka_client_id} test 1234',
-                     kafka_skip_broken_messages = 1;
-        ''')
-
-    messages = []
-    for i in range(25):
-        messages.append(json.dumps({'key': i, 'value': i}))
-    kafka_produce('new', messages)
-
-    # Insert couple of malformed messages.
-    kafka_produce('new', ['}{very_broken_message,'])
-    kafka_produce('new', ['}another{very_broken_message,'])
-
-    messages = []
-    for i in range(25, 50):
-        messages.append(json.dumps({'key': i, 'value': i}))
-    kafka_produce('new', messages)
-
-    result = ''
-    while True:
-        result += instance.query('SELECT * FROM test.kafka', ignore_error=True)
-        if kafka_check_result(result):
-            break
-
-    kafka_check_result(result, True)
-
-    members = describe_consumer_group('new')
-    assert members[0]['client_id'] == 'instance test 1234'
-
-
 @pytest.mark.timeout(180)
 def test_kafka_issue11308(kafka_cluster):
     # Check that matview does respect Kafka SETTINGS
@@ -796,6 +823,12 @@ def test_kafka_issue4116(kafka_cluster):
 
 @pytest.mark.timeout(180)
 def test_kafka_consumer_hang(kafka_cluster):
+    admin_client = KafkaAdminClient(bootstrap_servers="localhost:9092")
+
+    topic_list = []
+    topic_list.append(NewTopic(name="consumer_hang", num_partitions=8, replication_factor=1))
+    admin_client.create_topics(new_topics=topic_list, validate_only=False)
+
     instance.query('''
         DROP TABLE IF EXISTS test.kafka;
         DROP TABLE IF EXISTS test.view;
@@ -807,20 +840,18 @@ def test_kafka_consumer_hang(kafka_cluster):
                      kafka_topic_list = 'consumer_hang',
                      kafka_group_name = 'consumer_hang',
                      kafka_format = 'JSONEachRow',
-                     kafka_num_consumers = 8,
-                     kafka_row_delimiter = '\\n';
+                     kafka_num_consumers = 8;
         CREATE TABLE test.view (key UInt64, value UInt64) ENGINE = Memory();
         CREATE MATERIALIZED VIEW test.consumer TO test.view AS SELECT * FROM test.kafka;
         ''')
 
-    time.sleep(10)
-    instance.query('SELECT * FROM test.view')
+    instance.wait_for_log_line('kafka.*Stalled', repetitions=20)
 
     # This should trigger heartbeat fail,
     # which will trigger REBALANCE_IN_PROGRESS,
     # and which can lead to consumer hang.
     kafka_cluster.pause_container('kafka1')
-    time.sleep(0.5)
+    instance.wait_for_log_line('heartbeat error')
     kafka_cluster.unpause_container('kafka1')
 
     # print("Attempt to drop")
@@ -844,6 +875,12 @@ def test_kafka_consumer_hang(kafka_cluster):
 
 @pytest.mark.timeout(180)
 def test_kafka_consumer_hang2(kafka_cluster):
+    admin_client = KafkaAdminClient(bootstrap_servers="localhost:9092")
+
+    topic_list = []
+    topic_list.append(NewTopic(name="consumer_hang2", num_partitions=1, replication_factor=1))
+    admin_client.create_topics(new_topics=topic_list, validate_only=False)
+
     instance.query('''
         DROP TABLE IF EXISTS test.kafka;
 
@@ -884,23 +921,22 @@ def test_kafka_consumer_hang2(kafka_cluster):
     assert int(instance.query("select count() from system.processes where position(lower(query),'dr'||'op')>0")) == 0
 
 
-@pytest.mark.timeout(180)
+@pytest.mark.timeout(120)
 def test_kafka_csv_with_delimiter(kafka_cluster):
+    messages = []
+    for i in range(50):
+        messages.append('{i}, {i}'.format(i=i))
+    kafka_produce('csv', messages)
+
     instance.query('''
         CREATE TABLE test.kafka (key UInt64, value UInt64)
             ENGINE = Kafka
             SETTINGS kafka_broker_list = 'kafka1:19092',
                      kafka_topic_list = 'csv',
                      kafka_group_name = 'csv',
-                     kafka_format = 'CSV',
-                     kafka_row_delimiter = '\\n';
+                     kafka_format = 'CSV';
         ''')
 
-    messages = []
-    for i in range(50):
-        messages.append('{i}, {i}'.format(i=i))
-    kafka_produce('csv', messages)
-
     result = ''
     while True:
         result += instance.query('SELECT * FROM test.kafka', ignore_error=True)
@@ -910,23 +946,22 @@ def test_kafka_csv_with_delimiter(kafka_cluster):
     kafka_check_result(result, True)
 
 
-@pytest.mark.timeout(180)
+@pytest.mark.timeout(120)
 def test_kafka_tsv_with_delimiter(kafka_cluster):
+    messages = []
+    for i in range(50):
+        messages.append('{i}\t{i}'.format(i=i))
+    kafka_produce('tsv', messages)
+
     instance.query('''
         CREATE TABLE test.kafka (key UInt64, value UInt64)
             ENGINE = Kafka
             SETTINGS kafka_broker_list = 'kafka1:19092',
                      kafka_topic_list = 'tsv',
                      kafka_group_name = 'tsv',
-                     kafka_format = 'TSV',
-                     kafka_row_delimiter = '\\n';
+                     kafka_format = 'TSV';
         ''')
 
-    messages = []
-    for i in range(50):
-        messages.append('{i}\t{i}'.format(i=i))
-    kafka_produce('tsv', messages)
-
     result = ''
     while True:
         result += instance.query('SELECT * FROM test.kafka', ignore_error=True)
@@ -936,8 +971,13 @@ def test_kafka_tsv_with_delimiter(kafka_cluster):
     kafka_check_result(result, True)
 
 
-@pytest.mark.timeout(180)
+@pytest.mark.timeout(120)
 def test_kafka_select_empty(kafka_cluster):
+    admin_client = KafkaAdminClient(bootstrap_servers="localhost:9092")
+    topic_list = []
+    topic_list.append(NewTopic(name="empty", num_partitions=1, replication_factor=1))
+    admin_client.create_topics(new_topics=topic_list, validate_only=False)
+
     instance.query('''
         CREATE TABLE test.kafka (key UInt64)
             ENGINE = Kafka
@@ -953,15 +993,6 @@ def test_kafka_select_empty(kafka_cluster):
 
 @pytest.mark.timeout(180)
 def test_kafka_json_without_delimiter(kafka_cluster):
-    instance.query('''
-        CREATE TABLE test.kafka (key UInt64, value UInt64)
-            ENGINE = Kafka
-            SETTINGS kafka_broker_list = 'kafka1:19092',
-                     kafka_topic_list = 'json',
-                     kafka_group_name = 'json',
-                     kafka_format = 'JSONEachRow';
-        ''')
-
     messages = ''
     for i in range(25):
         messages += json.dumps({'key': i, 'value': i}) + '\n'
@@ -972,6 +1003,15 @@ def test_kafka_json_without_delimiter(kafka_cluster):
         messages += json.dumps({'key': i, 'value': i}) + '\n'
     kafka_produce('json', [messages])
 
+    instance.query('''
+        CREATE TABLE test.kafka (key UInt64, value UInt64)
+            ENGINE = Kafka
+            SETTINGS kafka_broker_list = 'kafka1:19092',
+                     kafka_topic_list = 'json',
+                     kafka_group_name = 'json',
+                     kafka_format = 'JSONEachRow';
+        ''')
+
     result = ''
     while True:
         result += instance.query('SELECT * FROM test.kafka', ignore_error=True)
@@ -983,6 +1023,10 @@ def test_kafka_json_without_delimiter(kafka_cluster):
 
 @pytest.mark.timeout(180)
 def test_kafka_protobuf(kafka_cluster):
+    kafka_produce_protobuf_messages('pb', 0, 20)
+    kafka_produce_protobuf_messages('pb', 20, 1)
+    kafka_produce_protobuf_messages('pb', 21, 29)
+
     instance.query('''
         CREATE TABLE test.kafka (key UInt64, value String)
             ENGINE = Kafka
@@ -993,10 +1037,6 @@ def test_kafka_protobuf(kafka_cluster):
                      kafka_schema = 'kafka.proto:KeyValuePair';
         ''')
 
-    kafka_produce_protobuf_messages('pb', 0, 20)
-    kafka_produce_protobuf_messages('pb', 20, 1)
-    kafka_produce_protobuf_messages('pb', 21, 29)
-
     result = ''
     while True:
         result += instance.query('SELECT * FROM test.kafka', ignore_error=True)
@@ -1009,6 +1049,9 @@ def test_kafka_protobuf(kafka_cluster):
 @pytest.mark.timeout(180)
 def test_kafka_string_field_on_first_position_in_protobuf(kafka_cluster):
 # https://github.com/ClickHouse/ClickHouse/issues/12615
+    kafka_produce_protobuf_social('string_field_on_first_position_in_protobuf', 0, 20)
+    kafka_produce_protobuf_social('string_field_on_first_position_in_protobuf', 20, 1)
+    kafka_produce_protobuf_social('string_field_on_first_position_in_protobuf', 21, 29)
 
     instance.query('''
 CREATE TABLE test.kafka (
@@ -1021,14 +1064,8 @@ SETTINGS
     kafka_group_name = 'string_field_on_first_position_in_protobuf',
     kafka_format = 'Protobuf',
     kafka_schema = 'social:User';
-
-    SELECT * FROM test.kafka;
         ''')
 
-    kafka_produce_protobuf_social('string_field_on_first_position_in_protobuf', 0, 20)
-    kafka_produce_protobuf_social('string_field_on_first_position_in_protobuf', 20, 1)
-    kafka_produce_protobuf_social('string_field_on_first_position_in_protobuf', 21, 29)
-
     result = instance.query('SELECT * FROM test.kafka', ignore_error=True)
     expected = '''\
 John Doe 0	1000000
@@ -1170,7 +1207,7 @@ def test_kafka_materialized_view(kafka_cluster):
     kafka_check_result(result, True)
 
 @pytest.mark.timeout(180)
-def test_librdkafka_snappy_regression(kafka_cluster):
+def test_librdkafka_compression(kafka_cluster):
     """
     Regression for UB in snappy-c (that is used in librdkafka),
     backport pr is [1].
@@ -1180,55 +1217,63 @@ def test_librdkafka_snappy_regression(kafka_cluster):
     Example of corruption:
 
         2020.12.10 09:59:56.831507 [ 20 ] {} <Error> void DB::StorageKafka::threadFunc(size_t): Code: 27, e.displayText() = DB::Exception: Cannot parse input: expected '"' before: 'foo"}': (while reading the value of key value): (at row 1)
-, Stack trace (when copying this message, always include the lines below):
+
+    To trigger this regression there should duplicated messages
+
+    Orignal reproducer is:
+    $ gcc --version |& fgrep gcc
+    gcc (GCC) 10.2.0
+    $ yes foobarbaz | fold -w 80 | head -n10 >| in-…
+    $ make clean && make CFLAGS='-Wall -g -O2 -ftree-loop-vectorize -DNDEBUG=1 -DSG=1 -fPIC'
+    $ ./verify in
+    final comparision of in failed at 20 of 100
+
     """
 
-    # create topic with snappy compression
-    admin_client = admin.AdminClient({'bootstrap.servers': 'localhost:9092'})
-    topic_snappy = admin.NewTopic(topic='snappy_regression', num_partitions=1, replication_factor=1, config={
-        'compression.type': 'snappy',
-    })
-    admin_client.create_topics(new_topics=[topic_snappy], validate_only=False)
-
-    instance.query('''
-        CREATE TABLE test.kafka (key UInt64, value String)
-            ENGINE = Kafka
-            SETTINGS kafka_broker_list = 'kafka1:19092',
-                     kafka_topic_list = 'snappy_regression',
-                     kafka_group_name = 'ch_snappy_regression',
-                     kafka_format = 'JSONEachRow';
-    ''')
+    supported_compression_types = ['gzip', 'snappy', 'lz4', 'zstd', 'uncompressed']
 
     messages = []
     expected = []
-    # To trigger this regression there should duplicated messages
-    # Orignal reproducer is:
-    #
-    #     $ gcc --version |& fgrep gcc
-    #     gcc (GCC) 10.2.0
-    #     $ yes foobarbaz | fold -w 80 | head -n10 >| in-…
-    #     $ make clean && make CFLAGS='-Wall -g -O2 -ftree-loop-vectorize -DNDEBUG=1 -DSG=1 -fPIC'
-    #     $ ./verify in
-    #     final comparision of in failed at 20 of 100
+
     value = 'foobarbaz'*10
     number_of_messages = 50
     for i in range(number_of_messages):
         messages.append(json.dumps({'key': i, 'value': value}))
         expected.append(f'{i}\t{value}')
-    kafka_produce('snappy_regression', messages)
 
     expected = '\n'.join(expected)
 
-    while True:
-        result = instance.query('SELECT * FROM test.kafka')
-        rows = len(result.strip('\n').split('\n'))
-        print(rows)
-        if rows == number_of_messages:
-            break
+    for compression_type in supported_compression_types:
+        print(('Check compression {}'.format(compression_type)))
 
-    assert TSV(result) == TSV(expected)
+        topic_name = 'test_librdkafka_compression_{}'.format(compression_type)
+        admin_client = admin.AdminClient({'bootstrap.servers': 'localhost:9092'})
+        topic = admin.NewTopic(topic=topic_name, num_partitions=1, replication_factor=1, config={
+            'compression.type': compression_type,
+        })
+        admin_client.create_topics(new_topics=[topic], validate_only=False)
 
-    instance.query('DROP TABLE test.kafka')
+        instance.query('''
+            CREATE TABLE test.kafka (key UInt64, value String)
+                ENGINE = Kafka
+                SETTINGS kafka_broker_list = 'kafka1:19092',
+                        kafka_topic_list = '{topic_name}',
+                        kafka_group_name = '{topic_name}_group',
+                        kafka_format = 'JSONEachRow',
+                        kafka_flush_interval_ms = 1000;
+            CREATE MATERIALIZED VIEW test.consumer Engine=Log AS
+                SELECT * FROM test.kafka;
+        '''.format(topic_name=topic_name) )
+
+        kafka_produce(topic_name, messages)
+
+        instance.wait_for_log_line("Committed offset {}".format(number_of_messages))
+
+        result = instance.query('SELECT * FROM test.consumer')
+        assert TSV(result) == TSV(expected)
+
+        instance.query('DROP TABLE test.kafka SYNC')
+        instance.query('DROP TABLE test.consumer SYNC')
 
 @pytest.mark.timeout(180)
 def test_kafka_materialized_view_with_subquery(kafka_cluster):
@@ -1577,9 +1622,6 @@ def test_kafka_commit_on_block_write(kafka_cluster):
         DROP TABLE test.kafka;
     ''')
 
-    while int(instance.query("SELECT count() FROM system.tables WHERE database='test' AND name='kafka'")) == 1:
-        time.sleep(1)
-
     instance.query('''
         CREATE TABLE test.kafka (key UInt64, value UInt64)
             ENGINE = Kafka
@@ -1874,7 +1916,8 @@ def test_kafka_lot_of_partitions_partial_commit_of_bulk(kafka_cluster):
                      kafka_topic_list = 'topic_with_multiple_partitions2',
                      kafka_group_name = 'topic_with_multiple_partitions2',
                      kafka_format = 'JSONEachRow',
-                     kafka_max_block_size = 211;
+                     kafka_max_block_size = 211,
+                     kafka_flush_interval_ms = 500;
         CREATE TABLE test.view (key UInt64, value UInt64)
             ENGINE = MergeTree()
             ORDER BY key;
@@ -1892,7 +1935,7 @@ def test_kafka_lot_of_partitions_partial_commit_of_bulk(kafka_cluster):
         messages.append("\n".join(rows))
     kafka_produce('topic_with_multiple_partitions2', messages)
 
-    time.sleep(30)
+    instance.wait_for_log_line('kafka.*Stalled', repetitions=5)
 
     result = instance.query('SELECT count(), uniqExact(key), max(key) FROM test.view')
     print(result)
@@ -1961,7 +2004,8 @@ def test_kafka_rebalance(kafka_cluster):
                         kafka_topic_list = 'topic_with_multiple_partitions',
                         kafka_group_name = 'rebalance_test_group',
                         kafka_format = 'JSONEachRow',
-                        kafka_max_block_size = 33;
+                        kafka_max_block_size = 33,
+                        kafka_flush_interval_ms = 500;
             CREATE MATERIALIZED VIEW test.{0}_mv TO test.destination AS
                 SELECT
                 key,
@@ -1975,21 +2019,15 @@ def test_kafka_rebalance(kafka_cluster):
             FROM test.{0};
         '''.format(table_name))
         # kafka_cluster.open_bash_shell('instance')
-        while int(
-                instance.query("SELECT count() FROM test.destination WHERE _consumed_by='{}'".format(table_name))) == 0:
-            print(("Waiting for test.kafka_consumer{} to start consume".format(consumer_index)))
-            time.sleep(1)
+        # Waiting for test.kafka_consumerX to start consume ...
+        instance.wait_for_log_line('kafka_consumer{}.*Polled offset [0-9]+'.format(consumer_index))
 
     cancel.set()
 
     # I leave last one working by intent (to finish consuming after all rebalances)
     for consumer_index in range(NUMBER_OF_CONSURRENT_CONSUMERS - 1):
         print(("Dropping test.kafka_consumer{}".format(consumer_index)))
-        instance.query('DROP TABLE IF EXISTS test.kafka_consumer{}'.format(consumer_index))
-        while int(instance.query(
-                "SELECT count() FROM system.tables WHERE database='test' AND name='kafka_consumer{}'".format(
-                    consumer_index))) == 1:
-            time.sleep(1)
+        instance.query('DROP TABLE IF EXISTS test.kafka_consumer{} SYNC'.format(consumer_index))
 
     # print(instance.query('SELECT count(), uniqExact(key), max(key) + 1 FROM test.destination'))
     # kafka_cluster.open_bash_shell('instance')
@@ -2042,9 +2080,9 @@ def test_kafka_rebalance(kafka_cluster):
     assert result == 1, 'Messages from kafka get duplicated!'
 
 
-@pytest.mark.timeout(1200)
+@pytest.mark.timeout(120)
 def test_kafka_no_holes_when_write_suffix_failed(kafka_cluster):
-    messages = [json.dumps({'key': j + 1, 'value': 'x' * 300}) for j in range(1)]
+    messages = [json.dumps({'key': j + 1, 'value': 'x' * 300}) for j in range(22)]
     kafka_produce('no_holes_when_write_suffix_failed', messages)
 
     instance.query('''
@@ -2060,39 +2098,28 @@ def test_kafka_no_holes_when_write_suffix_failed(kafka_cluster):
                      kafka_max_block_size = 20,
                      kafka_flush_interval_ms = 2000;
 
-        SELECT * FROM test.kafka LIMIT 1; /* do subscription & assignment in advance (it can take different time, test rely on timing, so can flap otherwise) */
+        CREATE TABLE test.view (key UInt64, value String)
+            ENGINE = ReplicatedMergeTree('/clickhouse/kafkatest/tables/no_holes_when_write_suffix_failed', 'node1')
+            ORDER BY key;
     ''')
 
-    messages = [json.dumps({'key': j + 1, 'value': 'x' * 300}) for j in range(22)]
-    kafka_produce('no_holes_when_write_suffix_failed', messages)
-
     # init PartitionManager (it starts container) earlier
     pm = PartitionManager()
 
     instance.query('''
-        CREATE TABLE test.view (key UInt64, value String)
-            ENGINE = ReplicatedMergeTree('/clickhouse/kafkatest/tables/no_holes_when_write_suffix_failed', 'node1')
-            ORDER BY key;
-
         CREATE MATERIALIZED VIEW test.consumer TO test.view AS
             SELECT * FROM test.kafka
-            WHERE NOT sleepEachRow(1);
+            WHERE NOT sleepEachRow(0.25);
     ''')
 
+    instance.wait_for_log_line("Polled batch of 20 messages")
     # the tricky part here is that disconnect should happen after write prefix, but before write suffix
-    # so i use sleepEachRow
-
-    time.sleep(3)
+    # we have 0.25 (sleepEachRow) * 20 ( Rows ) = 5 sec window after "Polled batch of 20 messages"
+    # while materialized view is working to inject zookeeper failure
     pm.drop_instance_zk_connections(instance)
-    time.sleep(20)
+    instance.wait_for_log_line("Error.*(session has been expired|Connection loss).*while write prefix to view")
     pm.heal_all()
-
-    # connection restored and it will take a while until next block will be flushed
-    # it takes years on CI :\
-    time.sleep(45)
-
-    # as it's a bit tricky to hit the proper moment - let's check in logs if we did it correctly
-    assert instance.contains_in_log("ZooKeeper session has been expired.: while write prefix to view")
+    instance.wait_for_log_line("Committed offset 22")
 
     result = instance.query('SELECT count(), uniqExact(key), max(key) FROM test.view')
     print(result)
@@ -2146,7 +2173,7 @@ def test_commits_of_unprocessed_messages_on_drop(kafka_cluster):
     kafka_produce('commits_of_unprocessed_messages_on_drop', messages)
 
     instance.query('''
-        DROP TABLE IF EXISTS test.destination;
+        DROP TABLE IF EXISTS test.destination SYNC;
         CREATE TABLE test.destination (
             key UInt64,
             value UInt64,
@@ -2166,7 +2193,8 @@ def test_commits_of_unprocessed_messages_on_drop(kafka_cluster):
                     kafka_topic_list = 'commits_of_unprocessed_messages_on_drop',
                     kafka_group_name = 'commits_of_unprocessed_messages_on_drop_test_group',
                     kafka_format = 'JSONEachRow',
-                    kafka_max_block_size = 1000;
+                    kafka_max_block_size = 1000,
+                    kafka_flush_interval_ms = 1000;
 
         CREATE MATERIALIZED VIEW test.kafka_consumer TO test.destination AS
             SELECT
@@ -2180,9 +2208,8 @@ def test_commits_of_unprocessed_messages_on_drop(kafka_cluster):
         FROM test.kafka;
     ''')
 
-    while int(instance.query("SELECT count() FROM test.destination")) == 0:
-        print("Waiting for test.kafka_consumer to start consume")
-        time.sleep(1)
+    # Waiting for test.kafka_consumer to start consume
+    instance.wait_for_log_line('Committed offset [0-9]+')
 
     cancel = threading.Event()
 
@@ -2195,14 +2222,14 @@ def test_commits_of_unprocessed_messages_on_drop(kafka_cluster):
                 messages.append(json.dumps({'key': i[0], 'value': i[0]}))
                 i[0] += 1
             kafka_produce('commits_of_unprocessed_messages_on_drop', messages)
-            time.sleep(1)
+            time.sleep(0.5)
 
     kafka_thread = threading.Thread(target=produce)
     kafka_thread.start()
-    time.sleep(12)
+    time.sleep(4)
 
     instance.query('''
-        DROP TABLE test.kafka;
+        DROP TABLE test.kafka SYNC;
     ''')
 
     instance.query('''
@@ -2212,11 +2239,12 @@ def test_commits_of_unprocessed_messages_on_drop(kafka_cluster):
                     kafka_topic_list = 'commits_of_unprocessed_messages_on_drop',
                     kafka_group_name = 'commits_of_unprocessed_messages_on_drop_test_group',
                     kafka_format = 'JSONEachRow',
-                    kafka_max_block_size = 10000;
+                    kafka_max_block_size = 10000,
+                    kafka_flush_interval_ms = 1000;
     ''')
 
     cancel.set()
-    time.sleep(15)
+    instance.wait_for_log_line('kafka.*Stalled', repetitions=5)
 
     # kafka_cluster.open_bash_shell('instance')
     # SELECT key, _timestamp, _offset FROM test.destination where runningDifference(key) <> 1 ORDER BY key;
@@ -2225,8 +2253,8 @@ def test_commits_of_unprocessed_messages_on_drop(kafka_cluster):
     print(result)
 
     instance.query('''
-        DROP TABLE test.kafka_consumer;
-        DROP TABLE test.destination;
+        DROP TABLE test.kafka_consumer SYNC;
+        DROP TABLE test.destination SYNC;
     ''')
 
     kafka_thread.join()
@@ -2245,7 +2273,8 @@ def test_bad_reschedule(kafka_cluster):
                     kafka_topic_list = 'test_bad_reschedule',
                     kafka_group_name = 'test_bad_reschedule',
                     kafka_format = 'JSONEachRow',
-                    kafka_max_block_size = 1000;
+                    kafka_max_block_size = 1000,
+                    kafka_flush_interval_ms = 1000;
 
         CREATE MATERIALIZED VIEW test.destination Engine=Log AS
         SELECT
@@ -2260,21 +2289,19 @@ def test_bad_reschedule(kafka_cluster):
         FROM test.kafka;
     ''')
 
-    while int(instance.query("SELECT count() FROM test.destination")) < 20000:
-        print("Waiting for consume")
-        time.sleep(1)
+    instance.wait_for_log_line("Committed offset 20000")
 
     assert int(instance.query("SELECT max(consume_ts) - min(consume_ts) FROM test.destination")) < 8
 
 
 @pytest.mark.timeout(300)
 def test_kafka_duplicates_when_commit_failed(kafka_cluster):
-    messages = [json.dumps({'key': j + 1, 'value': 'x' * 300}) for j in range(1)]
+    messages = [json.dumps({'key': j + 1, 'value': 'x' * 300}) for j in range(22)]
     kafka_produce('duplicates_when_commit_failed', messages)
 
     instance.query('''
-        DROP TABLE IF EXISTS test.view;
-        DROP TABLE IF EXISTS test.consumer;
+        DROP TABLE IF EXISTS test.view SYNC;
+        DROP TABLE IF EXISTS test.consumer SYNC;
 
         CREATE TABLE test.kafka (key UInt64, value String)
             ENGINE = Kafka
@@ -2285,51 +2312,42 @@ def test_kafka_duplicates_when_commit_failed(kafka_cluster):
                      kafka_max_block_size = 20,
                      kafka_flush_interval_ms = 1000;
 
-        SELECT * FROM test.kafka LIMIT 1; /* do subscription & assignment in advance (it can take different time, test rely on timing, so can flap otherwise) */
-    ''')
-
-    messages = [json.dumps({'key': j + 1, 'value': 'x' * 300}) for j in range(22)]
-    kafka_produce('duplicates_when_commit_failed', messages)
-
-    instance.query('''
         CREATE TABLE test.view (key UInt64, value String)
             ENGINE = MergeTree()
             ORDER BY key;
-
-        CREATE MATERIALIZED VIEW test.consumer TO test.view AS
-            SELECT * FROM test.kafka
-            WHERE NOT sleepEachRow(0.5);
     ''')
 
-    # print time.strftime("%m/%d/%Y %H:%M:%S")
-    time.sleep(3) #  MV will work for 10 sec, after that commit should happen, we want to pause before
+    instance.query('''
+        CREATE MATERIALIZED VIEW test.consumer TO test.view AS
+            SELECT * FROM test.kafka
+            WHERE NOT sleepEachRow(0.25);
+    ''')
 
-    # print time.strftime("%m/%d/%Y %H:%M:%S")
+    instance.wait_for_log_line("Polled batch of 20 messages")
+    # the tricky part here is that disconnect should happen after write prefix, but before we do commit
+    # we have 0.25 (sleepEachRow) * 20 ( Rows ) = 5 sec window after "Polled batch of 20 messages"
+    # while materialized view is working to inject zookeeper failure
     kafka_cluster.pause_container('kafka1')
-    # that timeout it VERY important, and picked after lot of experiments
-    # when too low (<30sec) librdkafka will not report any timeout (alternative is to decrease the default session timeouts for librdkafka)
-    # when too high (>50sec) broker will decide to remove us from the consumer group, and will start answering "Broker: Unknown member"
-    time.sleep(42)
 
-    # print time.strftime("%m/%d/%Y %H:%M:%S")
+    # if we restore the connection too fast (<30sec) librdkafka will not report any timeout
+    # (alternative is to decrease the default session timeouts for librdkafka)
+    #
+    # when the delay is too long (>50sec) broker will decide to remove us from the consumer group,
+    # and will start answering "Broker: Unknown member"
+    instance.wait_for_log_line("Exception during commit attempt: Local: Waiting for coordinator", timeout=45)
+    instance.wait_for_log_line("All commit attempts failed", look_behind_lines=500)
+
     kafka_cluster.unpause_container('kafka1')
 
     # kafka_cluster.open_bash_shell('instance')
-
-    # connection restored and it will take a while until next block will be flushed
-    # it takes years on CI :\
-    time.sleep(30)
-
-    # as it's a bit tricky to hit the proper moment - let's check in logs if we did it correctly
-    assert instance.contains_in_log("Local: Waiting for coordinator")
-    assert instance.contains_in_log("All commit attempts failed")
+    instance.wait_for_log_line("Committed offset 22")
 
     result = instance.query('SELECT count(), uniqExact(key), max(key) FROM test.view')
     print(result)
 
     instance.query('''
-        DROP TABLE test.consumer;
-        DROP TABLE test.view;
+        DROP TABLE test.consumer SYNC;
+        DROP TABLE test.view SYNC;
     ''')
 
     # After https://github.com/edenhill/librdkafka/issues/2631
@@ -2392,9 +2410,8 @@ def test_premature_flush_on_eof(kafka_cluster):
     # all subscriptions/assignments done during select, so it start sending data to test.destination
     # immediately after creation of MV
 
-    time.sleep(1.5) # that sleep is needed to ensure that first poll finished, and at least one 'empty' polls happened.
-                  # Empty poll before the fix were leading to premature flush.
-                  # TODO: wait for messages in log: "Polled batch of 1 messages", followed by "Stalled"
+    instance.wait_for_log_line("Polled batch of 1 messages")
+    instance.wait_for_log_line("Stalled")
 
     # produce more messages after delay
     kafka_produce('premature_flush_on_eof', messages)
@@ -2402,7 +2419,7 @@ def test_premature_flush_on_eof(kafka_cluster):
     # data was not flushed yet (it will be flushed 7.5 sec after creating MV)
     assert int(instance.query("SELECT count() FROM test.destination")) == 0
 
-    time.sleep(9) # TODO: wait for messages in log: "Committed offset ..."
+    instance.wait_for_log_line("Committed offset 2")
 
     # it should be single part, i.e. single insert
     result = instance.query('SELECT _part, count() FROM test.destination group by _part')
@@ -2414,10 +2431,10 @@ def test_premature_flush_on_eof(kafka_cluster):
     ''')
 
 
-@pytest.mark.timeout(180)
+@pytest.mark.timeout(120)
 def test_kafka_unavailable(kafka_cluster):
-    messages = [json.dumps({'key': j + 1, 'value': j + 1}) for j in range(20000)]
-    kafka_produce('test_bad_reschedule', messages)
+    messages = [json.dumps({'key': j + 1, 'value': j + 1}) for j in range(2000)]
+    kafka_produce('test_kafka_unavailable', messages)
 
     kafka_cluster.pause_container('kafka1')
 
@@ -2425,10 +2442,11 @@ def test_kafka_unavailable(kafka_cluster):
         CREATE TABLE test.kafka (key UInt64, value UInt64)
             ENGINE = Kafka
             SETTINGS kafka_broker_list = 'kafka1:19092',
-                    kafka_topic_list = 'test_bad_reschedule',
-                    kafka_group_name = 'test_bad_reschedule',
+                    kafka_topic_list = 'test_kafka_unavailable',
+                    kafka_group_name = 'test_kafka_unavailable',
                     kafka_format = 'JSONEachRow',
-                    kafka_max_block_size = 1000;
+                    kafka_max_block_size = 1000,
+                    kafka_flush_interval_ms = 1000;
 
         CREATE MATERIALIZED VIEW test.destination Engine=Log AS
         SELECT
@@ -2444,19 +2462,22 @@ def test_kafka_unavailable(kafka_cluster):
     ''')
 
     instance.query("SELECT * FROM test.kafka")
-    instance.query("SELECT count() FROM test.destination")
 
-    # enough to trigger issue
-    time.sleep(30)
+    instance.wait_for_log_line('brokers are down')
+    instance.wait_for_log_line('stalled. Reschedule', repetitions=2)
+
     kafka_cluster.unpause_container('kafka1')
 
-    while int(instance.query("SELECT count() FROM test.destination")) < 20000:
-        print("Waiting for consume")
-        time.sleep(1)
-
+    instance.wait_for_log_line("Committed offset 2000")
+    assert int(instance.query("SELECT count() FROM test.destination")) == 2000
+    time.sleep(5) # needed to give time for kafka client in python test to recovery
 
 @pytest.mark.timeout(180)
 def test_kafka_issue14202(kafka_cluster):
+    """
+    INSERT INTO Kafka Engine from an empty SELECT sub query was leading to failure
+    """
+
     instance.query('''
         CREATE TABLE test.empty_table (
             dt Date,
@@ -2513,6 +2534,382 @@ def test_kafka_csv_with_thread_per_consumer(kafka_cluster):
 
     kafka_check_result(result, True)
 
+def random_string(size=8):
+    return ''.join(random.choices(string.ascii_uppercase + string.digits, k=size))
+
+@pytest.mark.timeout(180)
+def test_kafka_engine_put_errors_to_stream(kafka_cluster):
+    instance.query('''
+        DROP TABLE IF EXISTS test.kafka;
+        DROP TABLE IF EXISTS test.kafka_data;
+        DROP TABLE IF EXISTS test.kafka_errors;
+        CREATE TABLE test.kafka (i Int64, s String)
+            ENGINE = Kafka
+            SETTINGS kafka_broker_list = 'kafka1:19092',
+                     kafka_topic_list = 'json',
+                     kafka_group_name = 'json',
+                     kafka_format = 'JSONEachRow',
+                     kafka_max_block_size = 128,
+                     kafka_handle_error_mode = 'stream';
+        CREATE MATERIALIZED VIEW test.kafka_data (i Int64, s String)
+            ENGINE = MergeTree
+            ORDER BY i
+            AS SELECT i, s FROM test.kafka WHERE length(_error) == 0;
+        CREATE MATERIALIZED VIEW test.kafka_errors (topic String, partition Int64, offset Int64, raw String, error String)
+            ENGINE = MergeTree
+            ORDER BY (topic, offset)
+            AS SELECT
+               _topic AS topic,
+               _partition AS partition,
+               _offset AS offset,
+               _raw_message AS raw,
+               _error AS error
+               FROM test.kafka WHERE length(_error) > 0;
+        ''')
+
+    messages = []
+    for i in range(128):
+        if i % 2 == 0:
+            messages.append(json.dumps({'i': i, 's': random_string(8)}))
+        else:
+            # Unexpected json content for table test.kafka.
+            messages.append(json.dumps({'i': 'n_' + random_string(4), 's': random_string(8)}))
+
+    kafka_produce('json', messages)
+
+    while True:
+      total_rows = instance.query('SELECT count() FROM test.kafka_data', ignore_error=True)
+      if total_rows == '64\n':
+        break
+
+    while True:
+      total_error_rows = instance.query('SELECT count() FROM test.kafka_errors', ignore_error=True)
+      if total_error_rows == '64\n':
+        break
+
+    instance.query('''
+        DROP TABLE test.kafka;
+        DROP TABLE test.kafka_data;
+        DROP TABLE test.kafka_errors;
+    ''')
+
+def gen_normal_json():
+    return '{"i":1000, "s":"ABC123abc"}'
+
+def gen_malformed_json():
+    return '{"i":"n1000", "s":"1000"}'
+
+def gen_message_with_jsons(jsons = 10, malformed = 0):
+    s = io.StringIO()
+    for i in range (jsons):
+        if malformed and random.randint(0,1) == 1:
+            s.write(gen_malformed_json())
+        else:
+            s.write(gen_normal_json())
+        s.write(' ')
+    return s.getvalue()
+
+
+def test_kafka_engine_put_errors_to_stream_with_random_malformed_json(kafka_cluster):
+    instance.query('''
+        DROP TABLE IF EXISTS test.kafka;
+        DROP TABLE IF EXISTS test.kafka_data;
+        DROP TABLE IF EXISTS test.kafka_errors;
+        CREATE TABLE test.kafka (i Int64, s String)
+            ENGINE = Kafka
+            SETTINGS kafka_broker_list = 'kafka1:19092',
+                     kafka_topic_list = 'json',
+                     kafka_group_name = 'json',
+                     kafka_format = 'JSONEachRow',
+                     kafka_max_block_size = 100,
+                     kafka_poll_max_batch_size = 1,
+                     kafka_handle_error_mode = 'stream';
+        CREATE MATERIALIZED VIEW test.kafka_data (i Int64, s String)
+            ENGINE = MergeTree
+            ORDER BY i
+            AS SELECT i, s FROM test.kafka WHERE length(_error) == 0;
+        CREATE MATERIALIZED VIEW test.kafka_errors (topic String, partition Int64, offset Int64, raw String, error String)
+            ENGINE = MergeTree
+            ORDER BY (topic, offset)
+            AS SELECT
+               _topic AS topic,
+               _partition AS partition,
+               _offset AS offset,
+               _raw_message AS raw,
+               _error AS error
+               FROM test.kafka WHERE length(_error) > 0;
+        ''')
+
+    messages = []
+    for i in range(128):
+        if i % 2 == 0:
+            messages.append(gen_message_with_jsons(10, 1))
+        else:
+            messages.append(gen_message_with_jsons(10, 0))
+
+    kafka_produce('json', messages)
+
+    while True:
+      total_rows = instance.query('SELECT count() FROM test.kafka_data', ignore_error=True)
+      if total_rows == '640\n':
+        break
+
+    while True:
+      total_error_rows = instance.query('SELECT count() FROM test.kafka_errors', ignore_error=True)
+      if total_error_rows == '64\n':
+        break
+
+    instance.query('''
+        DROP TABLE test.kafka;
+        DROP TABLE test.kafka_data;
+        DROP TABLE test.kafka_errors;
+    ''')
+
+@pytest.mark.timeout(120)
+def test_kafka_formats_with_broken_message(kafka_cluster):
+    # data was dumped from clickhouse itself in a following manner
+    # clickhouse-client --format=Native --query='SELECT toInt64(number) as id, toUInt16( intDiv( id, 65536 ) ) as blockNo, reinterpretAsString(19777) as val1, toFloat32(0.5) as val2, toUInt8(1) as val3 from numbers(100) ORDER BY id' | xxd -ps | tr -d '\n' | sed 's/\(..\)/\\x\1/g'
+
+    all_formats = {
+        ## Text formats ##
+        # dumped with clickhouse-client ... | perl -pe 's/\n/\\n/; s/\t/\\t/g;'
+        'JSONEachRow': {
+            'data_sample': [
+                '{"id":"0","blockNo":0,"val1":"AM","val2":0.5,"val3":1}\n',
+                '{"id":"1","blockNo":0,"val1":"AM","val2":0.5,"val3":1}\n{"id":"2","blockNo":0,"val1":"AM","val2":0.5,"val3":1}\n{"id":"3","blockNo":0,"val1":"AM","val2":0.5,"val3":1}\n{"id":"4","blockNo":0,"val1":"AM","val2":0.5,"val3":1}\n{"id":"5","blockNo":0,"val1":"AM","val2":0.5,"val3":1}\n{"id":"6","blockNo":0,"val1":"AM","val2":0.5,"val3":1}\n{"id":"7","blockNo":0,"val1":"AM","val2":0.5,"val3":1}\n{"id":"8","blockNo":0,"val1":"AM","val2":0.5,"val3":1}\n{"id":"9","blockNo":0,"val1":"AM","val2":0.5,"val3":1}\n{"id":"10","blockNo":0,"val1":"AM","val2":0.5,"val3":1}\n{"id":"11","blockNo":0,"val1":"AM","val2":0.5,"val3":1}\n{"id":"12","blockNo":0,"val1":"AM","val2":0.5,"val3":1}\n{"id":"13","blockNo":0,"val1":"AM","val2":0.5,"val3":1}\n{"id":"14","blockNo":0,"val1":"AM","val2":0.5,"val3":1}\n{"id":"15","blockNo":0,"val1":"AM","val2":0.5,"val3":1}\n',
+                '{"id":"0","blockNo":0,"val1":"AM","val2":0.5,"val3":1}\n',
+                # broken message
+                '{"id":"0","blockNo":"BAD","val1":"AM","val2":0.5,"val3":1}',
+            ],
+            'expected':'''{"raw_message":"{\\"id\\":\\"0\\",\\"blockNo\\":\\"BAD\\",\\"val1\\":\\"AM\\",\\"val2\\":0.5,\\"val3\\":1}","error":"Cannot parse input: expected '\\"' before: 'BAD\\",\\"val1\\":\\"AM\\",\\"val2\\":0.5,\\"val3\\":1}': (while reading the value of key blockNo)"}''',
+            'supports_empty_value': True,
+            'printable': True,
+        },
+        # JSONAsString doesn't fit to that test, and tested separately
+        'JSONCompactEachRow': {
+            'data_sample': [
+                '["0", 0, "AM", 0.5, 1]\n',
+                '["1", 0, "AM", 0.5, 1]\n["2", 0, "AM", 0.5, 1]\n["3", 0, "AM", 0.5, 1]\n["4", 0, "AM", 0.5, 1]\n["5", 0, "AM", 0.5, 1]\n["6", 0, "AM", 0.5, 1]\n["7", 0, "AM", 0.5, 1]\n["8", 0, "AM", 0.5, 1]\n["9", 0, "AM", 0.5, 1]\n["10", 0, "AM", 0.5, 1]\n["11", 0, "AM", 0.5, 1]\n["12", 0, "AM", 0.5, 1]\n["13", 0, "AM", 0.5, 1]\n["14", 0, "AM", 0.5, 1]\n["15", 0, "AM", 0.5, 1]\n',
+                '["0", 0, "AM", 0.5, 1]\n',
+                # broken message
+                '["0", "BAD", "AM", 0.5, 1]',
+            ],
+            'expected':'''{"raw_message":"[\\"0\\", \\"BAD\\", \\"AM\\", 0.5, 1]","error":"Cannot parse input: expected '\\"' before: 'BAD\\", \\"AM\\", 0.5, 1]': (while reading the value of key blockNo)"}''',
+            'supports_empty_value': True,
+            'printable':True,
+        },
+        'JSONCompactEachRowWithNamesAndTypes': {
+            'data_sample': [
+                '["id", "blockNo", "val1", "val2", "val3"]\n["Int64", "UInt16", "String", "Float32", "UInt8"]\n["0", 0, "AM", 0.5, 1]\n',
+                '["id", "blockNo", "val1", "val2", "val3"]\n["Int64", "UInt16", "String", "Float32", "UInt8"]\n["1", 0, "AM", 0.5, 1]\n["2", 0, "AM", 0.5, 1]\n["3", 0, "AM", 0.5, 1]\n["4", 0, "AM", 0.5, 1]\n["5", 0, "AM", 0.5, 1]\n["6", 0, "AM", 0.5, 1]\n["7", 0, "AM", 0.5, 1]\n["8", 0, "AM", 0.5, 1]\n["9", 0, "AM", 0.5, 1]\n["10", 0, "AM", 0.5, 1]\n["11", 0, "AM", 0.5, 1]\n["12", 0, "AM", 0.5, 1]\n["13", 0, "AM", 0.5, 1]\n["14", 0, "AM", 0.5, 1]\n["15", 0, "AM", 0.5, 1]\n',
+                '["id", "blockNo", "val1", "val2", "val3"]\n["Int64", "UInt16", "String", "Float32", "UInt8"]\n["0", 0, "AM", 0.5, 1]\n',
+                # broken message
+                '["0", "BAD", "AM", 0.5, 1]',
+            ],
+            'expected':'''{"raw_message":"[\\"0\\", \\"BAD\\", \\"AM\\", 0.5, 1]","error":"Cannot parse JSON string: expected opening quote"}''',
+            'printable':True,
+        },
+        'TSKV': {
+            'data_sample': [
+                'id=0\tblockNo=0\tval1=AM\tval2=0.5\tval3=1\n',
+                'id=1\tblockNo=0\tval1=AM\tval2=0.5\tval3=1\nid=2\tblockNo=0\tval1=AM\tval2=0.5\tval3=1\nid=3\tblockNo=0\tval1=AM\tval2=0.5\tval3=1\nid=4\tblockNo=0\tval1=AM\tval2=0.5\tval3=1\nid=5\tblockNo=0\tval1=AM\tval2=0.5\tval3=1\nid=6\tblockNo=0\tval1=AM\tval2=0.5\tval3=1\nid=7\tblockNo=0\tval1=AM\tval2=0.5\tval3=1\nid=8\tblockNo=0\tval1=AM\tval2=0.5\tval3=1\nid=9\tblockNo=0\tval1=AM\tval2=0.5\tval3=1\nid=10\tblockNo=0\tval1=AM\tval2=0.5\tval3=1\nid=11\tblockNo=0\tval1=AM\tval2=0.5\tval3=1\nid=12\tblockNo=0\tval1=AM\tval2=0.5\tval3=1\nid=13\tblockNo=0\tval1=AM\tval2=0.5\tval3=1\nid=14\tblockNo=0\tval1=AM\tval2=0.5\tval3=1\nid=15\tblockNo=0\tval1=AM\tval2=0.5\tval3=1\n',
+                'id=0\tblockNo=0\tval1=AM\tval2=0.5\tval3=1\n',
+                # broken message
+                'id=0\tblockNo=BAD\tval1=AM\tval2=0.5\tval3=1\n',
+            ],
+            'expected':'{"raw_message":"id=0\\tblockNo=BAD\\tval1=AM\\tval2=0.5\\tval3=1\\n","error":"Found garbage after field in TSKV format: blockNo: (at row 1)\\n"}',
+            'printable':True,
+        },
+        'CSV': {
+            'data_sample': [
+                '0,0,"AM",0.5,1\n',
+                '1,0,"AM",0.5,1\n2,0,"AM",0.5,1\n3,0,"AM",0.5,1\n4,0,"AM",0.5,1\n5,0,"AM",0.5,1\n6,0,"AM",0.5,1\n7,0,"AM",0.5,1\n8,0,"AM",0.5,1\n9,0,"AM",0.5,1\n10,0,"AM",0.5,1\n11,0,"AM",0.5,1\n12,0,"AM",0.5,1\n13,0,"AM",0.5,1\n14,0,"AM",0.5,1\n15,0,"AM",0.5,1\n',
+                '0,0,"AM",0.5,1\n',
+                # broken message
+                '0,"BAD","AM",0.5,1\n',
+            ],
+            'expected':'''{"raw_message":"0,\\"BAD\\",\\"AM\\",0.5,1\\n","error":"Cannot parse input: expected '\\"' before: 'BAD\\",\\"AM\\",0.5,1\\\\n': Could not print diagnostic info because two last rows aren't in buffer (rare case)\\n"}''',
+            'printable':True,
+            'supports_empty_value': True,
+        },
+        'TSV': {
+            'data_sample': [
+                '0\t0\tAM\t0.5\t1\n',
+                '1\t0\tAM\t0.5\t1\n2\t0\tAM\t0.5\t1\n3\t0\tAM\t0.5\t1\n4\t0\tAM\t0.5\t1\n5\t0\tAM\t0.5\t1\n6\t0\tAM\t0.5\t1\n7\t0\tAM\t0.5\t1\n8\t0\tAM\t0.5\t1\n9\t0\tAM\t0.5\t1\n10\t0\tAM\t0.5\t1\n11\t0\tAM\t0.5\t1\n12\t0\tAM\t0.5\t1\n13\t0\tAM\t0.5\t1\n14\t0\tAM\t0.5\t1\n15\t0\tAM\t0.5\t1\n',
+                '0\t0\tAM\t0.5\t1\n',
+                # broken message
+                '0\tBAD\tAM\t0.5\t1\n',
+            ],
+            'expected':'''{"raw_message":"0\\tBAD\\tAM\\t0.5\\t1\\n","error":"Cannot parse input: expected '\\\\t' before: 'BAD\\\\tAM\\\\t0.5\\\\t1\\\\n': Could not print diagnostic info because two last rows aren't in buffer (rare case)\\n"}''',
+            'supports_empty_value': True,
+            'printable':True,
+        },
+        'CSVWithNames': {
+            'data_sample': [
+                '"id","blockNo","val1","val2","val3"\n0,0,"AM",0.5,1\n',
+                '"id","blockNo","val1","val2","val3"\n1,0,"AM",0.5,1\n2,0,"AM",0.5,1\n3,0,"AM",0.5,1\n4,0,"AM",0.5,1\n5,0,"AM",0.5,1\n6,0,"AM",0.5,1\n7,0,"AM",0.5,1\n8,0,"AM",0.5,1\n9,0,"AM",0.5,1\n10,0,"AM",0.5,1\n11,0,"AM",0.5,1\n12,0,"AM",0.5,1\n13,0,"AM",0.5,1\n14,0,"AM",0.5,1\n15,0,"AM",0.5,1\n',
+                '"id","blockNo","val1","val2","val3"\n0,0,"AM",0.5,1\n',
+                # broken message
+                '"id","blockNo","val1","val2","val3"\n0,"BAD","AM",0.5,1\n',
+            ],
+            'expected':'''{"raw_message":"\\"id\\",\\"blockNo\\",\\"val1\\",\\"val2\\",\\"val3\\"\\n0,\\"BAD\\",\\"AM\\",0.5,1\\n","error":"Cannot parse input: expected '\\"' before: 'BAD\\",\\"AM\\",0.5,1\\\\n': Could not print diagnostic info because two last rows aren't in buffer (rare case)\\n"}''',
+            'printable':True,
+        },
+        'Values': {
+            'data_sample': [
+                "(0,0,'AM',0.5,1)",
+                "(1,0,'AM',0.5,1),(2,0,'AM',0.5,1),(3,0,'AM',0.5,1),(4,0,'AM',0.5,1),(5,0,'AM',0.5,1),(6,0,'AM',0.5,1),(7,0,'AM',0.5,1),(8,0,'AM',0.5,1),(9,0,'AM',0.5,1),(10,0,'AM',0.5,1),(11,0,'AM',0.5,1),(12,0,'AM',0.5,1),(13,0,'AM',0.5,1),(14,0,'AM',0.5,1),(15,0,'AM',0.5,1)",
+                "(0,0,'AM',0.5,1)",
+                # broken message
+                "(0,'BAD','AM',0.5,1)",
+            ],
+            'expected':r'''{"raw_message":"(0,'BAD','AM',0.5,1)","error":"Cannot parse string 'BAD' as UInt16: syntax error at begin of string. Note: there are toUInt16OrZero and toUInt16OrNull functions, which returns zero\/NULL instead of throwing exception.: while executing 'FUNCTION CAST(assumeNotNull(_dummy_0) :: 2, 'UInt16' :: 1) -> CAST(assumeNotNull(_dummy_0), 'UInt16') UInt16 : 4'"}''',
+            'supports_empty_value': True,
+            'printable':True,
+        },
+        'TSVWithNames': {
+            'data_sample': [
+                'id\tblockNo\tval1\tval2\tval3\n0\t0\tAM\t0.5\t1\n',
+                'id\tblockNo\tval1\tval2\tval3\n1\t0\tAM\t0.5\t1\n2\t0\tAM\t0.5\t1\n3\t0\tAM\t0.5\t1\n4\t0\tAM\t0.5\t1\n5\t0\tAM\t0.5\t1\n6\t0\tAM\t0.5\t1\n7\t0\tAM\t0.5\t1\n8\t0\tAM\t0.5\t1\n9\t0\tAM\t0.5\t1\n10\t0\tAM\t0.5\t1\n11\t0\tAM\t0.5\t1\n12\t0\tAM\t0.5\t1\n13\t0\tAM\t0.5\t1\n14\t0\tAM\t0.5\t1\n15\t0\tAM\t0.5\t1\n',
+                'id\tblockNo\tval1\tval2\tval3\n0\t0\tAM\t0.5\t1\n',
+                # broken message
+                'id\tblockNo\tval1\tval2\tval3\n0\tBAD\tAM\t0.5\t1\n',
+            ],
+            'expected':'''{"raw_message":"id\\tblockNo\\tval1\\tval2\\tval3\\n0\\tBAD\\tAM\\t0.5\\t1\\n","error":"Cannot parse input: expected '\\\\t' before: 'BAD\\\\tAM\\\\t0.5\\\\t1\\\\n': Could not print diagnostic info because two last rows aren't in buffer (rare case)\\n"}''',
+            'supports_empty_value': True,
+            'printable':True,
+        },
+        'TSVWithNamesAndTypes': {
+            'data_sample': [
+                'id\tblockNo\tval1\tval2\tval3\nInt64\tUInt16\tString\tFloat32\tUInt8\n0\t0\tAM\t0.5\t1\n',
+                'id\tblockNo\tval1\tval2\tval3\nInt64\tUInt16\tString\tFloat32\tUInt8\n1\t0\tAM\t0.5\t1\n2\t0\tAM\t0.5\t1\n3\t0\tAM\t0.5\t1\n4\t0\tAM\t0.5\t1\n5\t0\tAM\t0.5\t1\n6\t0\tAM\t0.5\t1\n7\t0\tAM\t0.5\t1\n8\t0\tAM\t0.5\t1\n9\t0\tAM\t0.5\t1\n10\t0\tAM\t0.5\t1\n11\t0\tAM\t0.5\t1\n12\t0\tAM\t0.5\t1\n13\t0\tAM\t0.5\t1\n14\t0\tAM\t0.5\t1\n15\t0\tAM\t0.5\t1\n',
+                'id\tblockNo\tval1\tval2\tval3\nInt64\tUInt16\tString\tFloat32\tUInt8\n0\t0\tAM\t0.5\t1\n',
+                # broken message
+                'id\tblockNo\tval1\tval2\tval3\nInt64\tUInt16\tString\tFloat32\tUInt8\n0\tBAD\tAM\t0.5\t1\n',
+            ],
+            'expected':'''{"raw_message":"id\\tblockNo\\tval1\\tval2\\tval3\\nInt64\\tUInt16\\tString\\tFloat32\\tUInt8\\n0\\tBAD\\tAM\\t0.5\\t1\\n","error":"Cannot parse input: expected '\\\\t' before: 'BAD\\\\tAM\\\\t0.5\\\\t1\\\\n': Could not print diagnostic info because two last rows aren't in buffer (rare case)\\n"}''',
+            'printable':True,
+        },
+      'Native': {
+            'data_sample': [
+                b'\x05\x01\x02\x69\x64\x05\x49\x6e\x74\x36\x34\x00\x00\x00\x00\x00\x00\x00\x00\x07\x62\x6c\x6f\x63\x6b\x4e\x6f\x06\x55\x49\x6e\x74\x31\x36\x00\x00\x04\x76\x61\x6c\x31\x06\x53\x74\x72\x69\x6e\x67\x02\x41\x4d\x04\x76\x61\x6c\x32\x07\x46\x6c\x6f\x61\x74\x33\x32\x00\x00\x00\x3f\x04\x76\x61\x6c\x33\x05\x55\x49\x6e\x74\x38\x01',
+                b'\x05\x0f\x02\x69\x64\x05\x49\x6e\x74\x36\x34\x01\x00\x00\x00\x00\x00\x00\x00\x02\x00\x00\x00\x00\x00\x00\x00\x03\x00\x00\x00\x00\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x05\x00\x00\x00\x00\x00\x00\x00\x06\x00\x00\x00\x00\x00\x00\x00\x07\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x09\x00\x00\x00\x00\x00\x00\x00\x0a\x00\x00\x00\x00\x00\x00\x00\x0b\x00\x00\x00\x00\x00\x00\x00\x0c\x00\x00\x00\x00\x00\x00\x00\x0d\x00\x00\x00\x00\x00\x00\x00\x0e\x00\x00\x00\x00\x00\x00\x00\x0f\x00\x00\x00\x00\x00\x00\x00\x07\x62\x6c\x6f\x63\x6b\x4e\x6f\x06\x55\x49\x6e\x74\x31\x36\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x04\x76\x61\x6c\x31\x06\x53\x74\x72\x69\x6e\x67\x02\x41\x4d\x02\x41\x4d\x02\x41\x4d\x02\x41\x4d\x02\x41\x4d\x02\x41\x4d\x02\x41\x4d\x02\x41\x4d\x02\x41\x4d\x02\x41\x4d\x02\x41\x4d\x02\x41\x4d\x02\x41\x4d\x02\x41\x4d\x02\x41\x4d\x04\x76\x61\x6c\x32\x07\x46\x6c\x6f\x61\x74\x33\x32\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x04\x76\x61\x6c\x33\x05\x55\x49\x6e\x74\x38\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01',
+                b'\x05\x01\x02\x69\x64\x05\x49\x6e\x74\x36\x34\x00\x00\x00\x00\x00\x00\x00\x00\x07\x62\x6c\x6f\x63\x6b\x4e\x6f\x06\x55\x49\x6e\x74\x31\x36\x00\x00\x04\x76\x61\x6c\x31\x06\x53\x74\x72\x69\x6e\x67\x02\x41\x4d\x04\x76\x61\x6c\x32\x07\x46\x6c\x6f\x61\x74\x33\x32\x00\x00\x00\x3f\x04\x76\x61\x6c\x33\x05\x55\x49\x6e\x74\x38\x01',
+                # broken message
+           b'\x05\x01\x02\x69\x64\x05\x49\x6e\x74\x36\x34\x00\x00\x00\x00\x00\x00\x00\x00\x07\x62\x6c\x6f\x63\x6b\x4e\x6f\x06\x53\x74\x72\x69\x6e\x67\x03\x42\x41\x44\x04\x76\x61\x6c\x31\x06\x53\x74\x72\x69\x6e\x67\x02\x41\x4d\x04\x76\x61\x6c\x32\x07\x46\x6c\x6f\x61\x74\x33\x32\x00\x00\x00\x3f\x04\x76\x61\x6c\x33\x05\x55\x49\x6e\x74\x38\x01',
+            ],
+            'expected':'''{"raw_message":"050102696405496E743634000000000000000007626C6F636B4E6F06537472696E67034241440476616C3106537472696E6702414D0476616C3207466C6F617433320000003F0476616C330555496E743801","error":"Cannot convert: String to UInt16"}''',
+            'printable':False,
+        },
+        'RowBinary': {
+            'data_sample': [
+                b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01',
+                b'\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01\x03\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01\x05\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01\x06\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01\x07\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01\x08\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01\x09\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01\x0a\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01\x0b\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01\x0c\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01\x0d\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01\x0e\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01',
+                b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01',
+                # broken message
+                b'\x00\x00\x00\x00\x00\x00\x00\x00\x03\x42\x41\x44\x02\x41\x4d\x00\x00\x00\x3f\x01',
+            ],
+            'expected':'{"raw_message":"00000000000000000342414402414D0000003F01","error":"Cannot read all data. Bytes read: 9. Bytes expected: 65.: (at row 1)\\n"}',
+            'printable':False,
+        },
+        'RowBinaryWithNamesAndTypes': {
+            'data_sample': [
+                b'\x05\x02\x69\x64\x07\x62\x6c\x6f\x63\x6b\x4e\x6f\x04\x76\x61\x6c\x31\x04\x76\x61\x6c\x32\x04\x76\x61\x6c\x33\x05\x49\x6e\x74\x36\x34\x06\x55\x49\x6e\x74\x31\x36\x06\x53\x74\x72\x69\x6e\x67\x07\x46\x6c\x6f\x61\x74\x33\x32\x05\x55\x49\x6e\x74\x38\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01',
+                b'\x05\x02\x69\x64\x07\x62\x6c\x6f\x63\x6b\x4e\x6f\x04\x76\x61\x6c\x31\x04\x76\x61\x6c\x32\x04\x76\x61\x6c\x33\x05\x49\x6e\x74\x36\x34\x06\x55\x49\x6e\x74\x31\x36\x06\x53\x74\x72\x69\x6e\x67\x07\x46\x6c\x6f\x61\x74\x33\x32\x05\x55\x49\x6e\x74\x38\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01\x03\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01\x05\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01\x06\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01\x07\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01\x08\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01\x09\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01\x0a\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01\x0b\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01\x0c\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01\x0d\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01\x0e\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01',
+                b'\x05\x02\x69\x64\x07\x62\x6c\x6f\x63\x6b\x4e\x6f\x04\x76\x61\x6c\x31\x04\x76\x61\x6c\x32\x04\x76\x61\x6c\x33\x05\x49\x6e\x74\x36\x34\x06\x55\x49\x6e\x74\x31\x36\x06\x53\x74\x72\x69\x6e\x67\x07\x46\x6c\x6f\x61\x74\x33\x32\x05\x55\x49\x6e\x74\x38\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01',
+                # broken message
+            b'\x05\x02\x69\x64\x07\x62\x6c\x6f\x63\x6b\x4e\x6f\x04\x76\x61\x6c\x31\x04\x76\x61\x6c\x32\x04\x76\x61\x6c\x33\x05\x49\x6e\x74\x36\x34\x06\x53\x74\x72\x69\x6e\x67\x06\x53\x74\x72\x69\x6e\x67\x07\x46\x6c\x6f\x61\x74\x33\x32\x05\x55\x49\x6e\x74\x38\x00\x00\x00\x00\x00\x00\x00\x00\x03\x42\x41\x44\x02\x41\x4d\x00\x00\x00\x3f\x01',
+            ],
+            'expected':'{"raw_message":"0502696407626C6F636B4E6F0476616C310476616C320476616C3305496E74363406537472696E6706537472696E6707466C6F617433320555496E743800000000000000000342414402414D0000003F01","error":"Cannot read all data. Bytes read: 9. Bytes expected: 65.: (at row 1)\\n"}',
+            'printable':False,
+        },
+        'ORC': {
+            'data_sample': [
+                b'\x4f\x52\x43\x11\x00\x00\x0a\x06\x12\x04\x08\x01\x50\x00\x2b\x00\x00\x0a\x13\x0a\x03\x00\x00\x00\x12\x0c\x08\x01\x12\x06\x08\x00\x10\x00\x18\x00\x50\x00\x30\x00\x00\xe3\x12\xe7\x62\x65\x00\x01\x21\x3e\x0e\x46\x25\x0e\x2e\x46\x03\x21\x46\x03\x09\xa6\x00\x06\x00\x32\x00\x00\xe3\x92\xe4\x62\x65\x00\x01\x21\x01\x0e\x46\x25\x2e\x2e\x26\x47\x5f\x21\x20\x96\x60\x09\x60\x00\x00\x36\x00\x00\xe3\x92\xe1\x62\x65\x00\x01\x21\x61\x0e\x46\x23\x5e\x2e\x46\x03\x21\x66\x03\x3d\x53\x29\x10\x11\xc0\x00\x00\x2b\x00\x00\x0a\x13\x0a\x03\x00\x00\x00\x12\x0c\x08\x01\x12\x06\x08\x02\x10\x02\x18\x02\x50\x00\x05\x00\x00\xff\x00\x03\x00\x00\x30\x07\x00\x00\x40\x00\x80\x05\x00\x00\x41\x4d\x07\x00\x00\x42\x00\x80\x03\x00\x00\x0a\x07\x00\x00\x42\x00\x80\x05\x00\x00\xff\x01\x88\x00\x00\x4d\xca\xc1\x0a\x80\x30\x0c\x03\xd0\x2e\x6b\xcb\x98\x17\xf1\x14\x50\xfc\xff\xcf\xb4\x66\x1e\x3c\x84\x47\x9a\xce\x1c\xb9\x1b\xb7\xf9\xda\x48\x09\x9e\xb2\xf3\x92\xce\x5b\x86\xf6\x56\x7f\x21\x41\x2f\x51\xa6\x7a\xd7\x1d\xe5\xea\xae\x3d\xca\xd5\x83\x71\x60\xd8\x17\xfc\x62\x0f\xa8\x00\x00\xe3\x4a\xe6\x62\xe1\x60\x0c\x60\xe0\xe2\xe3\x60\x14\x62\xe3\x60\x10\x60\x90\x60\x08\x60\x88\x60\xe5\x12\xe0\x60\x54\xe2\xe0\x62\x34\x10\x62\x34\x90\x60\x02\x8a\x70\x71\x09\x01\x45\xb8\xb8\x98\x1c\x7d\x85\x80\x58\x82\x05\x28\xc6\xcd\x25\xca\xc1\x68\xc4\x0b\x52\xc5\x6c\xa0\x67\x2a\x05\x22\xc0\x4a\x21\x86\x31\x09\x30\x81\xb5\xb2\x02\x00\x36\x01\x00\x25\x8c\xbd\x0a\xc2\x30\x14\x85\x73\x6f\x92\xf6\x92\x6a\x09\x01\x21\x64\x92\x4e\x75\x91\x58\x71\xc9\x64\x27\x5d\x2c\x1d\x5d\xfd\x59\xc4\x42\x37\x5f\xc0\x17\xe8\x23\x9b\xc6\xe1\x3b\x70\x0f\xdf\xb9\xc4\xf5\x17\x5d\x41\x5c\x4f\x60\x37\xeb\x53\x0d\x55\x4d\x0b\x23\x01\xb9\x90\x2e\xbf\x0f\xe3\xe3\xdd\x8d\x0e\x5f\x4f\x27\x3e\xb7\x61\x97\xb2\x49\xb9\xaf\x90\x20\x92\x27\x32\x2a\x6b\xf4\xf3\x0d\x1e\x82\x20\xe8\x59\x28\x09\x4c\x46\x4c\x33\xcb\x7a\x76\x95\x41\x47\x9f\x14\x78\x03\xde\x62\x6c\x54\x30\xb1\x51\x0a\xdb\x8b\x89\x58\x11\xbb\x22\xac\x08\x9a\xe5\x6c\x71\xbf\x3d\xb8\x39\x92\xfa\x7f\x86\x1a\xd3\x54\x1e\xa7\xee\xcc\x7e\x08\x9e\x01\x10\x01\x18\x80\x80\x10\x22\x02\x00\x0c\x28\x57\x30\x06\x82\xf4\x03\x03\x4f\x52\x43\x18',
+                b'\x4f\x52\x43\x11\x00\x00\x0a\x06\x12\x04\x08\x0f\x50\x00\x2b\x00\x00\x0a\x13\x0a\x03\x00\x00\x00\x12\x0c\x08\x0f\x12\x06\x08\x00\x10\x00\x18\x00\x50\x00\x30\x00\x00\xe3\x12\xe7\x62\x65\x00\x01\x21\x3e\x0e\x7e\x25\x0e\x2e\x46\x43\x21\x46\x4b\x09\xad\x00\x06\x00\x33\x00\x00\x0a\x17\x0a\x03\x00\x00\x00\x12\x10\x08\x0f\x22\x0a\x0a\x02\x41\x4d\x12\x02\x41\x4d\x18\x3c\x50\x00\x3a\x00\x00\xe3\x92\xe1\x62\x65\x00\x01\x21\x61\x0e\x7e\x23\x5e\x2e\x46\x03\x21\x66\x03\x3d\x53\x29\x66\x73\x3d\xd3\x00\x06\x00\x2b\x00\x00\x0a\x13\x0a\x03\x00\x00\x00\x12\x0c\x08\x0f\x12\x06\x08\x02\x10\x02\x18\x1e\x50\x00\x05\x00\x00\x0c\x00\x2b\x00\x00\x31\x32\x33\x34\x35\x36\x37\x38\x39\x31\x30\x31\x31\x31\x32\x31\x33\x31\x34\x31\x35\x09\x00\x00\x06\x01\x03\x02\x09\x00\x00\xc0\x0e\x00\x00\x07\x00\x00\x42\x00\x80\x05\x00\x00\x41\x4d\x0a\x00\x00\xe3\xe2\x42\x01\x00\x09\x00\x00\xc0\x0e\x02\x00\x05\x00\x00\x0c\x01\x94\x00\x00\x2d\xca\xc1\x0e\x80\x30\x08\x03\xd0\xc1\x60\x2e\xf3\x62\x76\x6a\xe2\x0e\xfe\xff\x57\x5a\x3b\x0f\xe4\x51\xe8\x68\xbd\x5d\x05\xe7\xf8\x34\x40\x3a\x6e\x59\xb1\x64\xe0\x91\xa9\xbf\xb1\x97\xd2\x95\x9d\x1e\xca\x55\x3a\x6d\xb4\xd2\xdd\x0b\x74\x9a\x74\xf7\x12\x39\xbd\x97\x7f\x7c\x06\xbb\xa6\x8d\x97\x17\xb4\x00\x00\xe3\x4a\xe6\x62\xe1\xe0\x0f\x60\xe0\xe2\xe3\xe0\x17\x62\xe3\x60\x10\x60\x90\x60\x08\x60\x88\x60\xe5\x12\xe0\xe0\x57\xe2\xe0\x62\x34\x14\x62\xb4\x94\xd0\x02\x8a\xc8\x73\x09\x01\x45\xb8\xb8\x98\x1c\x7d\x85\x80\x58\xc2\x06\x28\x26\xc4\x25\xca\xc1\x6f\xc4\xcb\xc5\x68\x20\xc4\x6c\xa0\x67\x2a\xc5\x6c\xae\x67\x0a\x14\xe6\x87\x1a\xc6\x24\xc0\x24\x21\x07\x32\x0c\x00\x4a\x01\x00\xe3\x60\x16\x58\xc3\x24\xc5\xcd\xc1\x2c\x30\x89\x51\xc2\x4b\xc1\x57\x83\x5f\x49\x83\x83\x47\x88\x95\x91\x89\x99\x85\x55\x8a\x3d\x29\x27\x3f\x39\xdb\x2f\x5f\x8a\x29\x33\x45\x8a\xa5\x2c\x31\xc7\x10\x4c\x1a\x81\x49\x63\x25\x26\x0e\x46\x20\x66\x07\x63\x36\x0e\x3e\x0d\x26\x03\x10\x9f\xd1\x80\xdf\x8a\x85\x83\x3f\x80\xc1\x8a\x8f\x83\x5f\x88\x8d\x83\x41\x80\x41\x82\x21\x80\x21\x82\xd5\x4a\x80\x83\x5f\x89\x83\x8b\xd1\x50\x88\xd1\x52\x42\x0b\x28\x22\x6f\x25\x04\x14\xe1\xe2\x62\x72\xf4\x15\x02\x62\x09\x1b\xa0\x98\x90\x95\x28\x07\xbf\x11\x2f\x17\xa3\x81\x10\xb3\x81\x9e\xa9\x14\xb3\xb9\x9e\x29\x50\x98\x1f\x6a\x18\x93\x00\x93\x84\x1c\xc8\x30\x87\x09\x7e\x1e\x0c\x00\x08\xa8\x01\x10\x01\x18\x80\x80\x10\x22\x02\x00\x0c\x28\x5d\x30\x06\x82\xf4\x03\x03\x4f\x52\x43\x18',
+                b'\x4f\x52\x43\x11\x00\x00\x0a\x06\x12\x04\x08\x01\x50\x00\x2b\x00\x00\x0a\x13\x0a\x03\x00\x00\x00\x12\x0c\x08\x01\x12\x06\x08\x00\x10\x00\x18\x00\x50\x00\x30\x00\x00\xe3\x12\xe7\x62\x65\x00\x01\x21\x3e\x0e\x46\x25\x0e\x2e\x46\x03\x21\x46\x03\x09\xa6\x00\x06\x00\x32\x00\x00\xe3\x92\xe4\x62\x65\x00\x01\x21\x01\x0e\x46\x25\x2e\x2e\x26\x47\x5f\x21\x20\x96\x60\x09\x60\x00\x00\x36\x00\x00\xe3\x92\xe1\x62\x65\x00\x01\x21\x61\x0e\x46\x23\x5e\x2e\x46\x03\x21\x66\x03\x3d\x53\x29\x10\x11\xc0\x00\x00\x2b\x00\x00\x0a\x13\x0a\x03\x00\x00\x00\x12\x0c\x08\x01\x12\x06\x08\x02\x10\x02\x18\x02\x50\x00\x05\x00\x00\xff\x00\x03\x00\x00\x30\x07\x00\x00\x40\x00\x80\x05\x00\x00\x41\x4d\x07\x00\x00\x42\x00\x80\x03\x00\x00\x0a\x07\x00\x00\x42\x00\x80\x05\x00\x00\xff\x01\x88\x00\x00\x4d\xca\xc1\x0a\x80\x30\x0c\x03\xd0\x2e\x6b\xcb\x98\x17\xf1\x14\x50\xfc\xff\xcf\xb4\x66\x1e\x3c\x84\x47\x9a\xce\x1c\xb9\x1b\xb7\xf9\xda\x48\x09\x9e\xb2\xf3\x92\xce\x5b\x86\xf6\x56\x7f\x21\x41\x2f\x51\xa6\x7a\xd7\x1d\xe5\xea\xae\x3d\xca\xd5\x83\x71\x60\xd8\x17\xfc\x62\x0f\xa8\x00\x00\xe3\x4a\xe6\x62\xe1\x60\x0c\x60\xe0\xe2\xe3\x60\x14\x62\xe3\x60\x10\x60\x90\x60\x08\x60\x88\x60\xe5\x12\xe0\x60\x54\xe2\xe0\x62\x34\x10\x62\x34\x90\x60\x02\x8a\x70\x71\x09\x01\x45\xb8\xb8\x98\x1c\x7d\x85\x80\x58\x82\x05\x28\xc6\xcd\x25\xca\xc1\x68\xc4\x0b\x52\xc5\x6c\xa0\x67\x2a\x05\x22\xc0\x4a\x21\x86\x31\x09\x30\x81\xb5\xb2\x02\x00\x36\x01\x00\x25\x8c\xbd\x0a\xc2\x30\x14\x85\x73\x6f\x92\xf6\x92\x6a\x09\x01\x21\x64\x92\x4e\x75\x91\x58\x71\xc9\x64\x27\x5d\x2c\x1d\x5d\xfd\x59\xc4\x42\x37\x5f\xc0\x17\xe8\x23\x9b\xc6\xe1\x3b\x70\x0f\xdf\xb9\xc4\xf5\x17\x5d\x41\x5c\x4f\x60\x37\xeb\x53\x0d\x55\x4d\x0b\x23\x01\xb9\x90\x2e\xbf\x0f\xe3\xe3\xdd\x8d\x0e\x5f\x4f\x27\x3e\xb7\x61\x97\xb2\x49\xb9\xaf\x90\x20\x92\x27\x32\x2a\x6b\xf4\xf3\x0d\x1e\x82\x20\xe8\x59\x28\x09\x4c\x46\x4c\x33\xcb\x7a\x76\x95\x41\x47\x9f\x14\x78\x03\xde\x62\x6c\x54\x30\xb1\x51\x0a\xdb\x8b\x89\x58\x11\xbb\x22\xac\x08\x9a\xe5\x6c\x71\xbf\x3d\xb8\x39\x92\xfa\x7f\x86\x1a\xd3\x54\x1e\xa7\xee\xcc\x7e\x08\x9e\x01\x10\x01\x18\x80\x80\x10\x22\x02\x00\x0c\x28\x57\x30\x06\x82\xf4\x03\x03\x4f\x52\x43\x18',
+                # broken message
+            b'\x4f\x52\x43\x0a\x0b\x0a\x03\x00\x00\x00\x12\x04\x08\x01\x50\x00\x0a\x15\x0a\x05\x00\x00\x00\x00\x00\x12\x0c\x08\x01\x12\x06\x08\x00\x10\x00\x18\x00\x50\x00\x0a\x12\x0a\x06\x00\x00\x00\x00\x00\x00\x12\x08\x08\x01\x42\x02\x08\x06\x50\x00\x0a\x12\x0a\x06\x00\x00\x00\x00\x00\x00\x12\x08\x08\x01\x42\x02\x08\x04\x50\x00\x0a\x29\x0a\x04\x00\x00\x00\x00\x12\x21\x08\x01\x1a\x1b\x09\x00\x00\x00\x00\x00\x00\xe0\x3f\x11\x00\x00\x00\x00\x00\x00\xe0\x3f\x19\x00\x00\x00\x00\x00\x00\xe0\x3f\x50\x00\x0a\x15\x0a\x05\x00\x00\x00\x00\x00\x12\x0c\x08\x01\x12\x06\x08\x02\x10\x02\x18\x02\x50\x00\xff\x80\xff\x80\xff\x00\xff\x80\xff\x03\x42\x41\x44\xff\x80\xff\x02\x41\x4d\xff\x80\x00\x00\x00\x3f\xff\x80\xff\x01\x0a\x06\x08\x06\x10\x00\x18\x0d\x0a\x06\x08\x06\x10\x01\x18\x17\x0a\x06\x08\x06\x10\x02\x18\x14\x0a\x06\x08\x06\x10\x03\x18\x14\x0a\x06\x08\x06\x10\x04\x18\x2b\x0a\x06\x08\x06\x10\x05\x18\x17\x0a\x06\x08\x00\x10\x00\x18\x02\x0a\x06\x08\x00\x10\x01\x18\x02\x0a\x06\x08\x01\x10\x01\x18\x02\x0a\x06\x08\x00\x10\x02\x18\x02\x0a\x06\x08\x02\x10\x02\x18\x02\x0a\x06\x08\x01\x10\x02\x18\x03\x0a\x06\x08\x00\x10\x03\x18\x02\x0a\x06\x08\x02\x10\x03\x18\x02\x0a\x06\x08\x01\x10\x03\x18\x02\x0a\x06\x08\x00\x10\x04\x18\x02\x0a\x06\x08\x01\x10\x04\x18\x04\x0a\x06\x08\x00\x10\x05\x18\x02\x0a\x06\x08\x01\x10\x05\x18\x02\x12\x04\x08\x00\x10\x00\x12\x04\x08\x00\x10\x00\x12\x04\x08\x00\x10\x00\x12\x04\x08\x00\x10\x00\x12\x04\x08\x00\x10\x00\x12\x04\x08\x00\x10\x00\x1a\x03\x47\x4d\x54\x0a\x59\x0a\x04\x08\x01\x50\x00\x0a\x0c\x08\x01\x12\x06\x08\x00\x10\x00\x18\x00\x50\x00\x0a\x08\x08\x01\x42\x02\x08\x06\x50\x00\x0a\x08\x08\x01\x42\x02\x08\x04\x50\x00\x0a\x21\x08\x01\x1a\x1b\x09\x00\x00\x00\x00\x00\x00\xe0\x3f\x11\x00\x00\x00\x00\x00\x00\xe0\x3f\x19\x00\x00\x00\x00\x00\x00\xe0\x3f\x50\x00\x0a\x0c\x08\x01\x12\x06\x08\x02\x10\x02\x18\x02\x50\x00\x08\x03\x10\xec\x02\x1a\x0c\x08\x03\x10\x8e\x01\x18\x1d\x20\xc1\x01\x28\x01\x22\x2e\x08\x0c\x12\x05\x01\x02\x03\x04\x05\x1a\x02\x69\x64\x1a\x07\x62\x6c\x6f\x63\x6b\x4e\x6f\x1a\x04\x76\x61\x6c\x31\x1a\x04\x76\x61\x6c\x32\x1a\x04\x76\x61\x6c\x33\x20\x00\x28\x00\x30\x00\x22\x08\x08\x04\x20\x00\x28\x00\x30\x00\x22\x08\x08\x08\x20\x00\x28\x00\x30\x00\x22\x08\x08\x08\x20\x00\x28\x00\x30\x00\x22\x08\x08\x05\x20\x00\x28\x00\x30\x00\x22\x08\x08\x01\x20\x00\x28\x00\x30\x00\x30\x01\x3a\x04\x08\x01\x50\x00\x3a\x0c\x08\x01\x12\x06\x08\x00\x10\x00\x18\x00\x50\x00\x3a\x08\x08\x01\x42\x02\x08\x06\x50\x00\x3a\x08\x08\x01\x42\x02\x08\x04\x50\x00\x3a\x21\x08\x01\x1a\x1b\x09\x00\x00\x00\x00\x00\x00\xe0\x3f\x11\x00\x00\x00\x00\x00\x00\xe0\x3f\x19\x00\x00\x00\x00\x00\x00\xe0\x3f\x50\x00\x3a\x0c\x08\x01\x12\x06\x08\x02\x10\x02\x18\x02\x50\x00\x40\x90\x4e\x48\x01\x08\xd5\x01\x10\x00\x18\x80\x80\x04\x22\x02\x00\x0b\x28\x5b\x30\x06\x82\xf4\x03\x03\x4f\x52\x43\x18',
+            ],
+            'expected':r'''{"raw_message":"4F52430A0B0A030000001204080150000A150A050000000000120C0801120608001000180050000A120A06000000000000120808014202080650000A120A06000000000000120808014202080450000A290A0400000000122108011A1B09000000000000E03F11000000000000E03F19000000000000E03F50000A150A050000000000120C080112060802100218025000FF80FF80FF00FF80FF03424144FF80FF02414DFF800000003FFF80FF010A0608061000180D0A060806100118170A060806100218140A060806100318140A0608061004182B0A060806100518170A060800100018020A060800100118020A060801100118020A060800100218020A060802100218020A060801100218030A060800100318020A060802100318020A060801100318020A060800100418020A060801100418040A060800100518020A060801100518021204080010001204080010001204080010001204080010001204080010001204080010001A03474D540A590A04080150000A0C0801120608001000180050000A0808014202080650000A0808014202080450000A2108011A1B09000000000000E03F11000000000000E03F19000000000000E03F50000A0C080112060802100218025000080310EC021A0C0803108E01181D20C1012801222E080C120501020304051A0269641A07626C6F636B4E6F1A0476616C311A0476616C321A0476616C33200028003000220808042000280030002208080820002800300022080808200028003000220808052000280030002208080120002800300030013A04080150003A0C0801120608001000180050003A0808014202080650003A0808014202080450003A2108011A1B09000000000000E03F11000000000000E03F19000000000000E03F50003A0C08011206080210021802500040904E480108D5011000188080042202000B285B300682F403034F524318","error":"Cannot parse string 'BAD' as UInt16: syntax error at begin of string. Note: there are toUInt16OrZero and toUInt16OrNull functions, which returns zero\/NULL instead of throwing exception."}''',
+            'printable':False,
+        }
+    }
+
+    topic_name_prefix = 'format_tests_4_stream_'
+    for format_name, format_opts in list(all_formats.items()):
+        print(('Set up {}'.format(format_name)))
+        topic_name = topic_name_prefix + '{}'.format(format_name)
+        data_sample = format_opts['data_sample']
+        data_prefix = []
+        raw_message = '_raw_message'
+        # prepend empty value when supported
+        if format_opts.get('supports_empty_value', False):
+            data_prefix = data_prefix + ['']
+        if format_opts.get('printable', False) == False:
+            raw_message = 'hex(_raw_message)'
+        kafka_produce(topic_name, data_prefix + data_sample)
+        instance.query('''
+            DROP TABLE IF EXISTS test.kafka_{format_name};
+
+            CREATE TABLE test.kafka_{format_name} (
+                id Int64,
+                blockNo UInt16,
+                val1 String,
+                val2 Float32,
+                val3 UInt8
+            ) ENGINE = Kafka()
+                SETTINGS kafka_broker_list = 'kafka1:19092',
+                        kafka_topic_list = '{topic_name}',
+                        kafka_group_name = '{topic_name}',
+                        kafka_format = '{format_name}',
+                        kafka_handle_error_mode = 'stream',
+                        kafka_flush_interval_ms = 1000 {extra_settings};
+
+            DROP TABLE IF EXISTS test.kafka_data_{format_name}_mv;
+            CREATE MATERIALIZED VIEW test.kafka_data_{format_name}_mv Engine=Log AS
+                SELECT *, _topic, _partition, _offset FROM test.kafka_{format_name}
+                WHERE length(_error) = 0;
+
+            DROP TABLE IF EXISTS test.kafka_errors_{format_name}_mv;
+            CREATE MATERIALIZED VIEW test.kafka_errors_{format_name}_mv Engine=Log AS
+                SELECT {raw_message} as raw_message, _error as error, _topic as topic, _partition as partition, _offset as offset FROM test.kafka_{format_name}
+                WHERE length(_error) > 0;
+            '''.format(topic_name=topic_name, format_name=format_name, raw_message=raw_message,
+                       extra_settings=format_opts.get('extra_settings') or ''))
+
+    for format_name, format_opts in list(all_formats.items()):
+        print(('Checking {}'.format(format_name)))
+        topic_name = topic_name_prefix + '{}'.format(format_name)
+        # shift offsets by 1 if format supports empty value
+        offsets = [1, 2, 3] if format_opts.get('supports_empty_value', False) else [0, 1, 2]
+        result = instance.query('SELECT * FROM test.kafka_data_{format_name}_mv;'.format(format_name=format_name))
+        expected = '''\
+0	0	AM	0.5	1	{topic_name}	0	{offset_0}
+1	0	AM	0.5	1	{topic_name}	0	{offset_1}
+2	0	AM	0.5	1	{topic_name}	0	{offset_1}
+3	0	AM	0.5	1	{topic_name}	0	{offset_1}
+4	0	AM	0.5	1	{topic_name}	0	{offset_1}
+5	0	AM	0.5	1	{topic_name}	0	{offset_1}
+6	0	AM	0.5	1	{topic_name}	0	{offset_1}
+7	0	AM	0.5	1	{topic_name}	0	{offset_1}
+8	0	AM	0.5	1	{topic_name}	0	{offset_1}
+9	0	AM	0.5	1	{topic_name}	0	{offset_1}
+10	0	AM	0.5	1	{topic_name}	0	{offset_1}
+11	0	AM	0.5	1	{topic_name}	0	{offset_1}
+12	0	AM	0.5	1	{topic_name}	0	{offset_1}
+13	0	AM	0.5	1	{topic_name}	0	{offset_1}
+14	0	AM	0.5	1	{topic_name}	0	{offset_1}
+15	0	AM	0.5	1	{topic_name}	0	{offset_1}
+0	0	AM	0.5	1	{topic_name}	0	{offset_2}
+'''.format(topic_name=topic_name, offset_0=offsets[0], offset_1=offsets[1], offset_2=offsets[2])
+        print(('Checking result\n {result} \n expected \n {expected}\n'.format(result=str(result), expected=str(expected))))
+        assert TSV(result) == TSV(expected), 'Proper result for format: {}'.format(format_name)
+        errors_result = instance.query('SELECT raw_message, error FROM test.kafka_errors_{format_name}_mv format JSONEachRow'.format(format_name=format_name))
+        errors_expected = format_opts['expected']
+        print(errors_result.strip())
+        print(errors_expected.strip())
+        assert  errors_result.strip() == errors_expected.strip(), 'Proper errors for format: {}'.format(format_name)
 
 if __name__ == '__main__':
     cluster.start()
diff --git a/tests/integration/test_storage_mysql/configs/users.xml b/tests/integration/test_storage_mysql/configs/users.xml
new file mode 100644
index 00000000000..27c4d46984e
--- /dev/null
+++ b/tests/integration/test_storage_mysql/configs/users.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<yandex>
+    <profiles>
+        <default>
+            <max_block_size>2</max_block_size>
+        </default>
+    </profiles>
+
+    <users>
+        <default>
+            <password></password>
+            <networks incl="networks" replace="replace">
+                <ip>::/0</ip>
+            </networks>
+            <profile>default</profile>
+        </default>
+    </users>
+</yandex>
diff --git a/tests/integration/test_storage_mysql/test.py b/tests/integration/test_storage_mysql/test.py
index 7b23e20e200..9c3abd799af 100644
--- a/tests/integration/test_storage_mysql/test.py
+++ b/tests/integration/test_storage_mysql/test.py
@@ -8,6 +8,9 @@ from helpers.cluster import ClickHouseCluster
 cluster = ClickHouseCluster(__file__)
 
 node1 = cluster.add_instance('node1', main_configs=['configs/remote_servers.xml'], with_mysql=True)
+node2 = cluster.add_instance('node2', main_configs=['configs/remote_servers.xml'], with_mysql_cluster=True)
+node3 = cluster.add_instance('node3', main_configs=['configs/remote_servers.xml'], user_configs=['configs/users.xml'], with_mysql=True)
+
 create_table_sql_template = """
     CREATE TABLE `clickhouse`.`{}` (
     `id` int(11) NOT NULL,
@@ -18,15 +21,30 @@ create_table_sql_template = """
     PRIMARY KEY (`id`)) ENGINE=InnoDB;
     """
 
+def get_mysql_conn(port=3308):
+    conn = pymysql.connect(user='root', password='clickhouse', host='127.0.0.1', port=port)
+    return conn
+
+
+def create_mysql_db(conn, name):
+    with conn.cursor() as cursor:
+        cursor.execute(
+            "CREATE DATABASE {} DEFAULT CHARACTER SET 'utf8'".format(name))
+
+
+def create_mysql_table(conn, tableName):
+    with conn.cursor() as cursor:
+        cursor.execute(create_table_sql_template.format(tableName))
+
 
 @pytest.fixture(scope="module")
 def started_cluster():
     try:
         cluster.start()
 
-        conn = get_mysql_conn()
         ## create mysql db and table
-        create_mysql_db(conn, 'clickhouse')
+        conn1 = get_mysql_conn(port=3308)
+        create_mysql_db(conn1, 'clickhouse')
         yield cluster
 
     finally:
@@ -52,6 +70,7 @@ CREATE TABLE {}(id UInt32, name String, age UInt32, money UInt32) ENGINE = MySQL
     assert node1.query(query.format(t=table_name)) == '250\n'
     conn.close()
 
+
 def test_insert_select(started_cluster):
     table_name = 'test_insert_select'
     conn = get_mysql_conn()
@@ -148,6 +167,7 @@ def test_table_function(started_cluster):
     assert node1.query("SELECT sum(`money`) FROM {}".format(table_function)).rstrip() == '60000'
     conn.close()
 
+
 def test_binary_type(started_cluster):
     conn = get_mysql_conn()
     with conn.cursor() as cursor:
@@ -156,6 +176,7 @@ def test_binary_type(started_cluster):
     node1.query("INSERT INTO {} VALUES (42, 'clickhouse')".format('TABLE FUNCTION ' + table_function))
     assert node1.query("SELECT * FROM {}".format(table_function)) == '42\tclickhouse\\0\\0\\0\\0\\0\\0\n'
 
+
 def test_enum_type(started_cluster):
     table_name = 'test_enum_type'
     conn = get_mysql_conn()
@@ -168,20 +189,95 @@ CREATE TABLE {}(id UInt32, name String, age UInt32, money UInt32, source Enum8('
     conn.close()
 
 
-def get_mysql_conn():
-    conn = pymysql.connect(user='root', password='clickhouse', host='127.0.0.1', port=3308)
-    return conn
+def test_mysql_distributed(started_cluster):
+    table_name = 'test_replicas'
+
+    conn1 = get_mysql_conn(port=3348)
+    conn2 = get_mysql_conn(port=3388)
+    conn3 = get_mysql_conn(port=3368)
+    conn4 = get_mysql_conn(port=3308)
+
+    create_mysql_db(conn1, 'clickhouse')
+    create_mysql_db(conn2, 'clickhouse')
+    create_mysql_db(conn3, 'clickhouse')
+
+    create_mysql_table(conn1, table_name)
+    create_mysql_table(conn2, table_name)
+    create_mysql_table(conn3, table_name)
+    create_mysql_table(conn4, table_name)
+
+    # Storage with with 3 replicas
+    node2.query('''
+        CREATE TABLE test_replicas
+        (id UInt32, name String, age UInt32, money UInt32)
+        ENGINE = MySQL(`mysql{2|3|4}:3306`, 'clickhouse', 'test_replicas', 'root', 'clickhouse'); ''')
+
+    # Fill remote tables with different data to be able to check
+    nodes = [node1, node2, node2, node2]
+    for i in range(1, 5):
+        nodes[i-1].query('''
+            CREATE TABLE test_replica{}
+            (id UInt32, name String, age UInt32, money UInt32)
+            ENGINE = MySQL(`mysql{}:3306`, 'clickhouse', 'test_replicas', 'root', 'clickhouse');'''.format(i, i))
+        nodes[i-1].query("INSERT INTO test_replica{} (id, name) SELECT number, 'host{}' from numbers(10) ".format(i, i))
+
+    # test multiple ports parsing
+    result = node2.query('''SELECT DISTINCT(name) FROM mysql(`mysql{1|2|3}:3306`, 'clickhouse', 'test_replicas', 'root', 'clickhouse'); ''')
+    assert(result == 'host1\n' or result == 'host2\n' or result == 'host3\n')
+    result = node2.query('''SELECT DISTINCT(name) FROM mysql(`mysql1:3306|mysql2:3306|mysql3:3306`, 'clickhouse', 'test_replicas', 'root', 'clickhouse'); ''')
+    assert(result == 'host1\n' or result == 'host2\n' or result == 'host3\n')
+
+    # check all replicas are traversed
+    query = "SELECT * FROM ("
+    for i in range (3):
+        query += "SELECT name FROM test_replicas UNION DISTINCT "
+    query += "SELECT name FROM test_replicas)"
+
+    result = node2.query(query)
+    assert(result == 'host2\nhost3\nhost4\n')
+
+    # Storage with with two shards, each has 2 replicas
+    node2.query('''
+        CREATE TABLE test_shards
+        (id UInt32, name String, age UInt32, money UInt32)
+        ENGINE = ExternalDistributed('MySQL', `mysql{1|2}:3306,mysql{3|4}:3306`, 'clickhouse', 'test_replicas', 'root', 'clickhouse'); ''')
+
+    # Check only one replica in each shard is used
+    result = node2.query("SELECT DISTINCT(name) FROM test_shards ORDER BY name")
+    assert(result == 'host1\nhost3\n')
+
+    # check all replicas are traversed
+    query = "SELECT name FROM ("
+    for i in range (3):
+        query += "SELECT name FROM test_shards UNION DISTINCT "
+    query += "SELECT name FROM test_shards) ORDER BY name"
+    result = node2.query(query)
+    assert(result == 'host1\nhost2\nhost3\nhost4\n')
+
+    # disconnect mysql1
+    started_cluster.pause_container('mysql1')
+    result = node2.query("SELECT DISTINCT(name) FROM test_shards ORDER BY name")
+    started_cluster.unpause_container('mysql1')
+    assert(result == 'host2\nhost4\n' or result == 'host3\nhost4\n')
 
 
-def create_mysql_db(conn, name):
-    with conn.cursor() as cursor:
-        cursor.execute(
-            "CREATE DATABASE {} DEFAULT CHARACTER SET 'utf8'".format(name))
+def test_external_settings(started_cluster):
+    table_name = 'test_external_settings'
+    conn = get_mysql_conn()
+    create_mysql_table(conn, table_name)
 
-
-def create_mysql_table(conn, tableName):
-    with conn.cursor() as cursor:
-        cursor.execute(create_table_sql_template.format(tableName))
+    node3.query('''
+CREATE TABLE {}(id UInt32, name String, age UInt32, money UInt32) ENGINE = MySQL('mysql1:3306', 'clickhouse', '{}', 'root', 'clickhouse');
+'''.format(table_name, table_name))
+    node3.query(
+        "INSERT INTO {}(id, name, money) select number, concat('name_', toString(number)), 3 from numbers(100) ".format(
+            table_name))
+    assert node3.query("SELECT count() FROM {}".format(table_name)).rstrip() == '100'
+    assert node3.query("SELECT sum(money) FROM {}".format(table_name)).rstrip() == '300'
+    node3.query("select value from system.settings where name = 'max_block_size' FORMAT TSV") == "2\n"
+    node3.query("select value from system.settings where name = 'external_storage_max_read_rows' FORMAT TSV") == "0\n"
+    assert node3.query("SELECT COUNT(DISTINCT blockNumber()) FROM {} FORMAT TSV".format(table_name)) == '50\n'
+    conn.close()
 
 
 if __name__ == '__main__':
diff --git a/tests/integration/test_storage_postgresql/configs/log_conf.xml b/tests/integration/test_storage_postgresql/configs/log_conf.xml
new file mode 100644
index 00000000000..f9d15e572aa
--- /dev/null
+++ b/tests/integration/test_storage_postgresql/configs/log_conf.xml
@@ -0,0 +1,11 @@
+<yandex>
+    <logger>
+        <level>trace</level>
+        <log>/var/log/clickhouse-server/log.log</log>
+        <errorlog>/var/log/clickhouse-server/log.err.log</errorlog>
+        <size>1000M</size>
+        <count>10</count>
+        <stderr>/var/log/clickhouse-server/stderr.log</stderr>
+        <stdout>/var/log/clickhouse-server/stdout.log</stdout>
+    </logger>
+</yandex>
diff --git a/tests/integration/test_storage_postgresql/test.py b/tests/integration/test_storage_postgresql/test.py
index 4f567c19f2b..b1ef58866bc 100644
--- a/tests/integration/test_storage_postgresql/test.py
+++ b/tests/integration/test_storage_postgresql/test.py
@@ -2,18 +2,22 @@ import time
 
 import pytest
 import psycopg2
+from multiprocessing.dummy import Pool
+
 from helpers.cluster import ClickHouseCluster
 from helpers.test_tools import assert_eq_with_retry
 from psycopg2.extensions import ISOLATION_LEVEL_AUTOCOMMIT
 
 cluster = ClickHouseCluster(__file__)
-node1 = cluster.add_instance('node1', main_configs=[], with_postgres=True)
+node1 = cluster.add_instance('node1', main_configs=["configs/log_conf.xml"], with_postgres=True)
+node2 = cluster.add_instance('node2', main_configs=['configs/log_conf.xml'], with_postgres_cluster=True)
 
-def get_postgres_conn(database=False):
+def get_postgres_conn(database=False, port=5432):
     if database == True:
-        conn_string = "host='localhost' dbname='clickhouse' user='postgres' password='mysecretpassword'"
+        conn_string = "host='localhost' port={} dbname='clickhouse' user='postgres' password='mysecretpassword'".format(port)
     else:
-        conn_string = "host='localhost' user='postgres' password='mysecretpassword'"
+        conn_string = "host='localhost' port={} user='postgres' password='mysecretpassword'".format(port)
+
     conn = psycopg2.connect(conn_string)
     conn.set_isolation_level(ISOLATION_LEVEL_AUTOCOMMIT)
     conn.autocommit = True
@@ -28,9 +32,20 @@ def create_postgres_db(conn, name):
 def started_cluster():
     try:
         cluster.start()
-        postgres_conn = get_postgres_conn()
-        print("postgres connected")
+
+        postgres_conn = get_postgres_conn(port=5432)
         create_postgres_db(postgres_conn, 'clickhouse')
+
+        postgres_conn = get_postgres_conn(port=5421)
+        create_postgres_db(postgres_conn, 'clickhouse')
+
+        postgres_conn = get_postgres_conn(port=5441)
+        create_postgres_db(postgres_conn, 'clickhouse')
+
+        postgres_conn = get_postgres_conn(port=5461)
+        create_postgres_db(postgres_conn, 'clickhouse')
+
+        print("postgres connected")
         yield cluster
 
     finally:
@@ -63,13 +78,19 @@ def test_postgres_conversions(started_cluster):
     cursor.execute(
         '''CREATE TABLE IF NOT EXISTS test_types (
         a smallint, b integer, c bigint, d real, e double precision, f serial, g bigserial,
-        h timestamp, i date, j numeric(5, 5), k decimal(5, 5))''')
+        h timestamp, i date, j decimal(5, 3), k numeric, l boolean)''')
     node1.query('''
         INSERT INTO TABLE FUNCTION postgresql('postgres1:5432', 'clickhouse', 'test_types', 'postgres', 'mysecretpassword') VALUES
-        (-32768, -2147483648, -9223372036854775808, 1.12345, 1.1234567890, 2147483647, 9223372036854775807, '2000-05-12 12:12:12', '2000-05-12', 0.2, 0.2)''')
+        (-32768, -2147483648, -9223372036854775808, 1.12345, 1.1234567890, 2147483647, 9223372036854775807, '2000-05-12 12:12:12', '2000-05-12', 22.222, 22.222, 1)''')
     result = node1.query('''
-        SELECT * FROM postgresql('postgres1:5432', 'clickhouse', 'test_types', 'postgres', 'mysecretpassword')''')
-    assert(result == '-32768\t-2147483648\t-9223372036854775808\t1.12345\t1.123456789\t2147483647\t9223372036854775807\t2000-05-12 12:12:12\t2000-05-12\t0.20000\t0.20000\n')
+        SELECT a, b, c, d, e, f, g, h, i, j, toDecimal128(k, 3), l FROM postgresql('postgres1:5432', 'clickhouse', 'test_types', 'postgres', 'mysecretpassword')''')
+    assert(result == '-32768\t-2147483648\t-9223372036854775808\t1.12345\t1.123456789\t2147483647\t9223372036854775807\t2000-05-12 12:12:12\t2000-05-12\t22.222\t22.222\t1\n')
+
+    cursor.execute("INSERT INTO test_types (l) VALUES (TRUE), (true), ('yes'), ('y'), ('1');")
+    cursor.execute("INSERT INTO test_types (l) VALUES (FALSE), (false), ('no'), ('off'), ('0');")
+    expected = "1\n1\n1\n1\n1\n1\n0\n0\n0\n0\n0\n"
+    result = node1.query('''SELECT l FROM postgresql('postgres1:5432', 'clickhouse', 'test_types', 'postgres', 'mysecretpassword')''')
+    assert(result == expected)
 
     cursor.execute(
         '''CREATE TABLE IF NOT EXISTS test_array_dimensions
@@ -132,6 +153,152 @@ def test_postgres_conversions(started_cluster):
     assert(result == expected)
 
 
+def test_non_default_scema(started_cluster):
+    conn = get_postgres_conn(True)
+    cursor = conn.cursor()
+    cursor.execute('CREATE SCHEMA test_schema')
+    cursor.execute('CREATE TABLE test_schema.test_table (a integer)')
+    cursor.execute('INSERT INTO test_schema.test_table SELECT i FROM generate_series(0, 99) as t(i)')
+
+    node1.query('''
+        CREATE TABLE test_pg_table_schema (a UInt32)
+        ENGINE PostgreSQL('postgres1:5432', 'clickhouse', 'test_table', 'postgres', 'mysecretpassword', 'test_schema');
+    ''')
+
+    result = node1.query('SELECT * FROM test_pg_table_schema')
+    expected = node1.query('SELECT number FROM numbers(100)')
+    assert(result == expected)
+
+    table_function = '''postgresql('postgres1:5432', 'clickhouse', 'test_table', 'postgres', 'mysecretpassword', 'test_schema')'''
+    result = node1.query('SELECT * FROM {}'.format(table_function))
+    assert(result == expected)
+
+    cursor.execute('''CREATE SCHEMA "test.nice.schema"''')
+    cursor.execute('''CREATE TABLE "test.nice.schema"."test.nice.table" (a integer)''')
+    cursor.execute('INSERT INTO "test.nice.schema"."test.nice.table" SELECT i FROM generate_series(0, 99) as t(i)')
+
+    node1.query('''
+        CREATE TABLE test_pg_table_schema_with_dots (a UInt32)
+        ENGINE PostgreSQL('postgres1:5432', 'clickhouse', 'test.nice.table', 'postgres', 'mysecretpassword', 'test.nice.schema');
+    ''')
+    result = node1.query('SELECT * FROM test_pg_table_schema_with_dots')
+    assert(result == expected)
+
+
+def test_concurrent_queries(started_cluster):
+    conn = get_postgres_conn(True)
+    cursor = conn.cursor()
+
+    node1.query('''
+        CREATE TABLE test_table (key UInt32, value UInt32)
+        ENGINE = PostgreSQL('postgres1:5432', 'clickhouse', 'test_table', 'postgres', 'mysecretpassword')''')
+
+    cursor.execute('CREATE TABLE test_table (key integer, value integer)')
+
+    prev_count =  node1.count_in_log('New connection to postgres1:5432')
+    def node_select(_):
+        for i in range(20):
+            result = node1.query("SELECT * FROM test_table", user='default')
+    busy_pool = Pool(20)
+    p = busy_pool.map_async(node_select, range(20))
+    p.wait()
+    count =  node1.count_in_log('New connection to postgres1:5432')
+    print(count, prev_count)
+    # 16 is default size for connection pool
+    assert(int(count) == int(prev_count) + 16)
+
+    def node_insert(_):
+        for i in range(5):
+            result = node1.query("INSERT INTO test_table SELECT number, number FROM numbers(1000)", user='default')
+
+    busy_pool = Pool(5)
+    p = busy_pool.map_async(node_insert, range(5))
+    p.wait()
+    result = node1.query("SELECT count() FROM test_table", user='default')
+    print(result)
+    assert(int(result) == 5 * 5 * 1000)
+
+    def node_insert_select(_):
+        for i in range(5):
+            result = node1.query("INSERT INTO test_table SELECT number, number FROM numbers(1000)", user='default')
+            result = node1.query("SELECT * FROM test_table LIMIT 100", user='default')
+
+    busy_pool = Pool(5)
+    p = busy_pool.map_async(node_insert_select, range(5))
+    p.wait()
+    result = node1.query("SELECT count() FROM test_table", user='default')
+    print(result)
+    assert(int(result) == 5 * 5 * 1000  * 2)
+
+    node1.query('DROP TABLE test_table;')
+    cursor.execute('DROP TABLE test_table;')
+
+    count =  node1.count_in_log('New connection to postgres1:5432')
+    print(count, prev_count)
+    assert(int(count) == int(prev_count) + 16)
+
+
+def test_postgres_distributed(started_cluster):
+    conn0 = get_postgres_conn(port=5432, database=True)
+    conn1 = get_postgres_conn(port=5421, database=True)
+    conn2 = get_postgres_conn(port=5441, database=True)
+    conn3 = get_postgres_conn(port=5461, database=True)
+
+    cursor0 = conn0.cursor()
+    cursor1 = conn1.cursor()
+    cursor2 = conn2.cursor()
+    cursor3 = conn3.cursor()
+    cursors = [cursor0, cursor1, cursor2, cursor3]
+
+    for i in range(4):
+        cursors[i].execute('CREATE TABLE test_replicas (id Integer, name Text)')
+        cursors[i].execute("""INSERT INTO test_replicas select i, 'host{}' from generate_series(0, 99) as t(i);""".format(i + 1));
+
+    # test multiple ports parsing
+    result = node2.query('''SELECT DISTINCT(name) FROM postgresql(`postgres{1|2|3}:5432`, 'clickhouse', 'test_replicas', 'postgres', 'mysecretpassword'); ''')
+    assert(result == 'host1\n' or result == 'host2\n' or result == 'host3\n')
+    result = node2.query('''SELECT DISTINCT(name) FROM postgresql(`postgres2:5431|postgres3:5432`, 'clickhouse', 'test_replicas', 'postgres', 'mysecretpassword'); ''')
+    assert(result == 'host3\n' or result == 'host2\n')
+
+    # Create storage with with 3 replicas
+    node2.query('''
+        CREATE TABLE test_replicas
+        (id UInt32, name String)
+        ENGINE = PostgreSQL(`postgres{2|3|4}:5432`, 'clickhouse', 'test_replicas', 'postgres', 'mysecretpassword'); ''')
+
+    # Check all replicas are traversed
+    query = "SELECT name FROM ("
+    for i in range (3):
+        query += "SELECT name FROM test_replicas UNION DISTINCT "
+    query += "SELECT name FROM test_replicas) ORDER BY name"
+    result = node2.query(query)
+    assert(result == 'host2\nhost3\nhost4\n')
+
+    # Create storage with with two two shards, each has 2 replicas
+    node2.query('''
+        CREATE TABLE test_shards
+        (id UInt32, name String, age UInt32, money UInt32)
+        ENGINE = ExternalDistributed('PostgreSQL', `postgres{1|2}:5432,postgres{3|4}:5432`, 'clickhouse', 'test_replicas', 'postgres', 'mysecretpassword'); ''')
+
+    # Check only one replica in each shard is used
+    result = node2.query("SELECT DISTINCT(name) FROM test_shards ORDER BY name")
+    assert(result == 'host1\nhost3\n')
+
+    # Check all replicas are traversed
+    query = "SELECT name FROM ("
+    for i in range (3):
+        query += "SELECT name FROM test_shards UNION DISTINCT "
+    query += "SELECT name FROM test_shards) ORDER BY name"
+    result = node2.query(query)
+    assert(result == 'host1\nhost2\nhost3\nhost4\n')
+
+    # Disconnect postgres1
+    started_cluster.pause_container('postgres1')
+    result = node2.query("SELECT DISTINCT(name) FROM test_shards ORDER BY name")
+    started_cluster.unpause_container('postgres1')
+    assert(result == 'host2\nhost4\n' or result == 'host3\nhost4\n')
+
+
 if __name__ == '__main__':
     cluster.start()
     input("Cluster created, press any key to destroy...")
diff --git a/tests/integration/test_storage_rabbitmq/test.py b/tests/integration/test_storage_rabbitmq/test.py
index ca89ebdea0a..50fcdd8d77e 100644
--- a/tests/integration/test_storage_rabbitmq/test.py
+++ b/tests/integration/test_storage_rabbitmq/test.py
@@ -253,12 +253,20 @@ def test_rabbitmq_csv_with_delimiter(rabbitmq_cluster):
 @pytest.mark.timeout(240)
 def test_rabbitmq_tsv_with_delimiter(rabbitmq_cluster):
     instance.query('''
+        DROP TABLE IF EXISTS test.view;
+        DROP TABLE IF EXISTS test.consumer;
         CREATE TABLE test.rabbitmq (key UInt64, value UInt64)
             ENGINE = RabbitMQ
             SETTINGS rabbitmq_host_port = 'rabbitmq1:5672',
                      rabbitmq_exchange_name = 'tsv',
                      rabbitmq_format = 'TSV',
+                     rabbitmq_queue_base = 'tsv',
                      rabbitmq_row_delimiter = '\\n';
+        CREATE TABLE test.view (key UInt64, value UInt64)
+            ENGINE = MergeTree()
+            ORDER BY key;
+        CREATE MATERIALIZED VIEW test.consumer TO test.view AS
+            SELECT * FROM test.rabbitmq;
         ''')
 
     credentials = pika.PlainCredentials('root', 'clickhouse')
@@ -272,13 +280,11 @@ def test_rabbitmq_tsv_with_delimiter(rabbitmq_cluster):
 
     for message in messages:
         channel.basic_publish(exchange='tsv', routing_key='', body=message)
-
     connection.close()
-    time.sleep(1)
 
     result = ''
     while True:
-        result += instance.query('SELECT * FROM test.rabbitmq ORDER BY key', ignore_error=True)
+        result = instance.query('SELECT * FROM test.view ORDER BY key')
         if rabbitmq_check_result(result):
             break
 
diff --git a/tests/integration/test_storage_s3/s3_mock/mock_s3.py b/tests/integration/test_storage_s3/s3_mocks/mock_s3.py
similarity index 89%
rename from tests/integration/test_storage_s3/s3_mock/mock_s3.py
rename to tests/integration/test_storage_s3/s3_mocks/mock_s3.py
index 088cc883e57..3e876689175 100644
--- a/tests/integration/test_storage_s3/s3_mock/mock_s3.py
+++ b/tests/integration/test_storage_s3/s3_mocks/mock_s3.py
@@ -1,3 +1,5 @@
+import sys
+
 from bottle import abort, route, run, request, response
 
 
@@ -21,4 +23,4 @@ def ping():
     return 'OK'
 
 
-run(host='0.0.0.0', port=8080)
+run(host='0.0.0.0', port=int(sys.argv[1]))
diff --git a/tests/integration/test_storage_s3/s3_mocks/unstable_server.py b/tests/integration/test_storage_s3/s3_mocks/unstable_server.py
new file mode 100644
index 00000000000..4a27845ff9f
--- /dev/null
+++ b/tests/integration/test_storage_s3/s3_mocks/unstable_server.py
@@ -0,0 +1,90 @@
+import http.server
+import random
+import re
+import socket
+import struct
+import sys
+
+
+def gen_n_digit_number(n):
+    assert 0 < n < 19
+    return random.randint(10**(n-1), 10**n-1)
+
+
+def gen_line():
+    columns = 4
+
+    row = []
+    def add_number():
+        digits = random.randint(1, 18)
+        row.append(gen_n_digit_number(digits))
+
+    for i in range(columns // 2):
+        add_number()
+    row.append(1)
+    for i in range(columns - 1 - columns // 2):
+        add_number()
+
+    line = ",".join(map(str, row)) + "\n"
+    return line.encode()
+
+
+random.seed("Unstable server/1.0")
+lines = b"".join((gen_line() for _ in range(500000)))
+
+
+class RequestHandler(http.server.BaseHTTPRequestHandler):
+    def do_HEAD(self):
+        if self.path == "/root/test.csv":
+            self.from_bytes = 0
+            self.end_bytes = len(lines)
+            self.size = self.end_bytes
+            self.send_block_size = 256
+            self.stop_at = random.randint(900000, 1200000) // self.send_block_size # Block size is 1024**2.
+
+            if "Range" in self.headers:
+                cr = self.headers["Range"]
+                parts = re.split("[ -/=]+", cr)
+                assert parts[0] == "bytes"
+                self.from_bytes = int(parts[1])
+                if parts[2]:
+                    self.end_bytes = int(parts[2])+1
+                self.send_response(206)
+                self.send_header("Content-Range", f"bytes {self.from_bytes}-{self.end_bytes-1}/{self.size}")
+            else:
+                self.send_response(200)
+
+            self.send_header("Accept-Ranges", "bytes")
+            self.send_header("Content-Type", "text/plain")
+            self.send_header("Content-Length", f"{self.end_bytes-self.from_bytes}")
+            self.end_headers()
+
+        elif self.path == "/":
+            self.send_response(200)
+            self.send_header("Content-Type", "text/plain")
+            self.end_headers()
+
+        else:
+            self.send_response(404)
+            self.send_header("Content-Type", "text/plain")
+            self.end_headers()
+
+
+    def do_GET(self):
+        self.do_HEAD()
+        if self.path == "/root/test.csv":
+            for c, i in enumerate(range(self.from_bytes, self.end_bytes, self.send_block_size)):
+                self.wfile.write(lines[i:min(i+self.send_block_size, self.end_bytes)])
+                if (c + 1) % self.stop_at == 0:
+                    #self.wfile._sock.setsockopt(socket.SOL_SOCKET, socket.SO_LINGER, struct.pack("ii", 0, 0))
+                    #self.wfile._sock.shutdown(socket.SHUT_RDWR)
+                    #self.wfile._sock.close()
+                    print('Dropping connection')
+                    break
+
+        elif self.path == "/":
+            self.wfile.write(b"OK")
+
+
+httpd = http.server.HTTPServer(("0.0.0.0", int(sys.argv[1])), RequestHandler)
+httpd.serve_forever()
diff --git a/tests/integration/test_storage_s3/test.py b/tests/integration/test_storage_s3/test.py
index 1f445feb5a0..c239dc68810 100644
--- a/tests/integration/test_storage_s3/test.py
+++ b/tests/integration/test_storage_s3/test.py
@@ -14,6 +14,9 @@ from helpers.cluster import ClickHouseCluster, ClickHouseInstance
 logging.getLogger().setLevel(logging.INFO)
 logging.getLogger().addHandler(logging.StreamHandler())
 
+SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
+CONFIG_PATH = os.path.join(SCRIPT_DIR, './_instances/dummy/configs/config.d/defaultS3.xml')
+
 
 # Creates S3 bucket for tests and allows anonymous read-write access to it.
 def prepare_s3_bucket(cluster):
@@ -85,14 +88,15 @@ def cluster():
         cluster.add_instance("restricted_dummy", main_configs=["configs/config_for_test_remote_host_filter.xml"],
                              with_minio=True)
         cluster.add_instance("dummy", with_minio=True, main_configs=["configs/defaultS3.xml"])
-        cluster.add_instance("s3_max_redirects", with_minio=True, main_configs=["configs/defaultS3.xml"], user_configs=["configs/s3_max_redirects.xml"])
+        cluster.add_instance("s3_max_redirects", with_minio=True, main_configs=["configs/defaultS3.xml"],
+                             user_configs=["configs/s3_max_redirects.xml"])
         logging.info("Starting cluster...")
         cluster.start()
         logging.info("Cluster started")
 
         prepare_s3_bucket(cluster)
         logging.info("S3 bucket created")
-        run_s3_mock(cluster)
+        run_s3_mocks(cluster)
 
         yield cluster
     finally:
@@ -109,13 +113,18 @@ def run_query(instance, query, stdin=None, settings=None):
     return result
 
 
-# Test simple put.
-@pytest.mark.parametrize("maybe_auth,positive", [
-    ("", True),
-    ("'minio','minio123',", True),
-    ("'wrongid','wrongkey',", False)
+# Test simple put. Also checks that wrong credentials produce an error with every compression method.
+@pytest.mark.parametrize("maybe_auth,positive,compression", [
+    ("", True, 'auto'),
+    ("'minio','minio123',", True, 'auto'),
+    ("'wrongid','wrongkey',", False, 'auto'),
+    ("'wrongid','wrongkey',", False, 'gzip'),
+    ("'wrongid','wrongkey',", False, 'deflate'),
+    ("'wrongid','wrongkey',", False, 'brotli'),
+    ("'wrongid','wrongkey',", False, 'xz'),
+    ("'wrongid','wrongkey',", False, 'zstd')
 ])
-def test_put(cluster, maybe_auth, positive):
+def test_put(cluster, maybe_auth, positive, compression):
     # type: (ClickHouseCluster) -> None
 
     bucket = cluster.minio_bucket if not maybe_auth else cluster.minio_restricted_bucket
@@ -124,8 +133,8 @@ def test_put(cluster, maybe_auth, positive):
     values = "(1, 2, 3), (3, 2, 1), (78, 43, 45)"
     values_csv = "1,2,3\n3,2,1\n78,43,45\n"
     filename = "test.csv"
-    put_query = "insert into table function s3('http://{}:{}/{}/{}', {}'CSV', '{}') values {}".format(
-        cluster.minio_host, cluster.minio_port, bucket, filename, maybe_auth, table_format, values)
+    put_query = f"""insert into table function s3('http://{cluster.minio_host}:{cluster.minio_port}/{bucket}/{filename}',
+                    {maybe_auth}'CSV', '{table_format}', {compression}) values {values}"""
 
     try:
         run_query(instance, put_query)
@@ -279,7 +288,7 @@ def test_put_get_with_globs(cluster):
 @pytest.mark.parametrize("maybe_auth,positive", [
     ("", True),
     # ("'minio','minio123',",True), Redirect with credentials not working with nginx.
-    ("'wrongid','wrongkey',", False)
+    ("'wrongid','wrongkey',", False),
 ])
 def test_multipart_put(cluster, maybe_auth, positive):
     # type: (ClickHouseCluster) -> None
@@ -375,26 +384,42 @@ def test_s3_glob_scheherazade(cluster):
     assert run_query(instance, query).splitlines() == ["1001\t1001\t1001\t1001"]
 
 
-def run_s3_mock(cluster):
-    logging.info("Starting s3 mock")
-    container_id = cluster.get_container_id('resolver')
-    current_dir = os.path.dirname(__file__)
-    cluster.copy_file_to_container(container_id, os.path.join(current_dir, "s3_mock", "mock_s3.py"), "mock_s3.py")
-    cluster.exec_in_container(container_id, ["python", "mock_s3.py"], detach=True)
+def run_s3_mocks(cluster):
+    logging.info("Starting s3 mocks")
+    mocks = (
+        ("mock_s3.py", "resolver", "8080"),
+        ("unstable_server.py", "resolver", "8081"),
+    )
+    for mock_filename, container, port in mocks:
+        container_id = cluster.get_container_id(container)
+        current_dir = os.path.dirname(__file__)
+        cluster.copy_file_to_container(container_id, os.path.join(current_dir, "s3_mocks", mock_filename), mock_filename)
+        cluster.exec_in_container(container_id, ["python", mock_filename, port], detach=True)
 
-    # Wait for S3 mock start
-    for attempt in range(10):
-        ping_response = cluster.exec_in_container(cluster.get_container_id('resolver'),
-                                                  ["curl", "-s", "http://resolver:8080/"], nothrow=True)
-        if ping_response != 'OK':
-            if attempt == 9:
-                assert ping_response == 'OK', 'Expected "OK", but got "{}"'.format(ping_response)
+    # Wait for S3 mocks to start
+    for mock_filename, container, port in mocks:
+        for attempt in range(10):
+            ping_response = cluster.exec_in_container(cluster.get_container_id(container),
+                                                      ["curl", "-s", f"http://{container}:{port}/"], nothrow=True)
+            if ping_response != 'OK':
+                if attempt == 9:
+                    assert ping_response == 'OK', 'Expected "OK", but got "{}"'.format(ping_response)
+                else:
+                    time.sleep(1)
             else:
-                time.sleep(1)
-        else:
-            break
+                break
 
-    logging.info("S3 mock started")
+    logging.info("S3 mocks started")
+
+
+def replace_config(old, new):
+    config = open(CONFIG_PATH, 'r')
+    config_lines = config.readlines()
+    config.close()
+    config_lines = [line.replace(old, new) for line in config_lines]
+    config = open(CONFIG_PATH, 'w')
+    config.writelines(config_lines)
+    config.close()
 
 
 def test_custom_auth_headers(cluster):
@@ -409,6 +434,22 @@ def test_custom_auth_headers(cluster):
     result = run_query(instance, get_query)
     assert result == '1\t2\t3\n'
 
+    instance.query(
+        "CREATE TABLE test ({table_format}) ENGINE = S3('http://resolver:8080/{bucket}/{file}', 'CSV')".format(
+            bucket=cluster.minio_restricted_bucket,
+            file=filename,
+            table_format=table_format
+        ))
+    assert run_query(instance, "SELECT * FROM test") == '1\t2\t3\n'
+
+    replace_config("<header>Authorization: Bearer TOKEN", "<header>Authorization: Bearer INVALID_TOKEN")
+    instance.query("SYSTEM RELOAD CONFIG")
+    ret, err = instance.query_and_get_answer_with_error("SELECT * FROM test")
+    assert ret == "" and err != ""
+    replace_config("<header>Authorization: Bearer INVALID_TOKEN", "<header>Authorization: Bearer TOKEN")
+    instance.query("SYSTEM RELOAD CONFIG")
+    assert run_query(instance, "SELECT * FROM test") == '1\t2\t3\n'
+
 
 def test_custom_auth_headers_exclusion(cluster):
     table_format = "column1 UInt32, column2 UInt32, column3 UInt32"
@@ -488,6 +529,15 @@ def test_storage_s3_get_gzip(cluster, extension, method):
         run_query(instance, f"DROP TABLE {name}")
 
 
+def test_storage_s3_get_unstable(cluster):
+    bucket = cluster.minio_bucket
+    instance = cluster.instances["dummy"]
+    table_format = "column1 Int64, column2 Int64, column3 Int64, column4 Int64"
+    get_query = f"SELECT count(), sum(column3) FROM s3('http://resolver:8081/{cluster.minio_bucket}/test.csv', 'CSV', '{table_format}') FORMAT CSV"
+    result = run_query(instance, get_query)
+    assert result.splitlines() == ["500000,500000"]
+
+
 def test_storage_s3_put_uncompressed(cluster):
     bucket = cluster.minio_bucket
     instance = cluster.instances["dummy"]
diff --git a/tests/integration/test_system_clusters_actual_information/__init__.py b/tests/integration/test_system_clusters_actual_information/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/integration/test_system_clusters_actual_information/configs/remote_servers.xml b/tests/integration/test_system_clusters_actual_information/configs/remote_servers.xml
new file mode 100644
index 00000000000..b4f30a87520
--- /dev/null
+++ b/tests/integration/test_system_clusters_actual_information/configs/remote_servers.xml
@@ -0,0 +1,14 @@
+<yandex>
+    <remote_servers>
+        <test_cluster>
+            <shard>
+                <internal_replication>true</internal_replication>
+                <replica>
+                    <host>node_1</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </test_cluster>
+    </remote_servers>
+</yandex>
+
diff --git a/tests/integration/test_system_clusters_actual_information/test.py b/tests/integration/test_system_clusters_actual_information/test.py
new file mode 100644
index 00000000000..afbaf53089f
--- /dev/null
+++ b/tests/integration/test_system_clusters_actual_information/test.py
@@ -0,0 +1,60 @@
+import os
+import sys
+import time
+
+import pytest
+
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
+from helpers.cluster import ClickHouseCluster
+from helpers.network import PartitionManager
+
+cluster = ClickHouseCluster(__file__)
+node = cluster.add_instance('node', with_zookeeper=True, main_configs=['configs/remote_servers.xml'])
+node_1 = cluster.add_instance('node_1', with_zookeeper=True)
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+
+        node_1.query('''CREATE TABLE replicated (id UInt32, date Date) ENGINE =
+            ReplicatedMergeTree('/clickhouse/tables/replicated', 'node_1')  ORDER BY id PARTITION BY toYYYYMM(date)''')
+
+        node.query("CREATE TABLE distributed (id UInt32, date Date) ENGINE = Distributed('test_cluster', 'default', 'replicated')")
+
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+
+
+def test(started_cluster):
+    cluster.pause_container("node_1")
+
+    node.query("SYSTEM RELOAD CONFIG")
+    node.query_and_get_error("SELECT count() FROM distributed SETTINGS receive_timeout=1")
+
+    result = node.query("SELECT errors_count, estimated_recovery_time FROM system.clusters WHERE cluster='test_cluster' and host_name='node_1'")
+    errors_count, recovery_time = map(int, result.split())
+    assert errors_count == 3
+
+    while True: 
+        time.sleep(1)
+
+        result = node.query("SELECT errors_count, estimated_recovery_time FROM system.clusters WHERE cluster='test_cluster' and host_name='node_1'")
+        prev_time = recovery_time
+        errors_count, recovery_time = map(int, result.split())
+
+        if recovery_time == 0:
+            break
+
+        assert recovery_time < prev_time
+        assert errors_count > 0
+
+    assert recovery_time == 0
+    assert errors_count == 0
+
+    cluster.unpause_container("node_1")
+
diff --git a/tests/integration/test_testkeeper_back_to_back/test.py b/tests/integration/test_testkeeper_back_to_back/test.py
deleted file mode 100644
index 8ec54f1a883..00000000000
--- a/tests/integration/test_testkeeper_back_to_back/test.py
+++ /dev/null
@@ -1,532 +0,0 @@
-import pytest
-from helpers.cluster import ClickHouseCluster
-import random
-import string
-import os
-import time
-from multiprocessing.dummy import Pool
-
-cluster = ClickHouseCluster(__file__)
-node = cluster.add_instance('node', main_configs=['configs/enable_test_keeper.xml', 'configs/logs_conf.xml'], with_zookeeper=True)
-from kazoo.client import KazooClient, KazooState
-
-_genuine_zk_instance = None
-_fake_zk_instance = None
-
-def get_genuine_zk():
-    global _genuine_zk_instance
-    if not _genuine_zk_instance:
-        print("Zoo1", cluster.get_instance_ip("zoo1"))
-        _genuine_zk_instance = cluster.get_kazoo_client('zoo1')
-    return _genuine_zk_instance
-
-
-def get_fake_zk():
-    global _fake_zk_instance
-    if not _fake_zk_instance:
-        print("node", cluster.get_instance_ip("node"))
-        _fake_zk_instance = KazooClient(hosts=cluster.get_instance_ip("node") + ":9181", timeout=30.0)
-        def reset_last_zxid_listener(state):
-            print("Fake zk callback called for state", state)
-            global _fake_zk_instance
-            if state != KazooState.CONNECTED:
-                _fake_zk_instance._reset()
-
-        _fake_zk_instance.add_listener(reset_last_zxid_listener)
-        _fake_zk_instance.start()
-    return _fake_zk_instance
-
-def random_string(length):
-    return ''.join(random.choices(string.ascii_lowercase + string.digits, k=length))
-
-def create_random_path(prefix="", depth=1):
-    if depth == 0:
-        return prefix
-    return create_random_path(os.path.join(prefix, random_string(3)), depth - 1)
-
-@pytest.fixture(scope="module")
-def started_cluster():
-    try:
-        cluster.start()
-
-        yield cluster
-
-    finally:
-        cluster.shutdown()
-        if _genuine_zk_instance:
-            _genuine_zk_instance.stop()
-            _genuine_zk_instance.close()
-        if _fake_zk_instance:
-            _fake_zk_instance.stop()
-            _fake_zk_instance.close()
-
-
-def test_simple_commands(started_cluster):
-    genuine_zk = get_genuine_zk()
-    fake_zk = get_fake_zk()
-
-    for zk in [genuine_zk, fake_zk]:
-        zk.create("/test_simple_commands", b"")
-        zk.create("/test_simple_commands/somenode1", b"hello")
-        zk.set("/test_simple_commands/somenode1", b"world")
-
-    for zk in [genuine_zk, fake_zk]:
-        assert zk.exists("/test_simple_commands")
-        assert zk.exists("/test_simple_commands/somenode1")
-        print(zk.get("/test_simple_commands/somenode1"))
-        assert zk.get("/test_simple_commands/somenode1")[0] == b"world"
-
-
-def test_sequential_nodes(started_cluster):
-    genuine_zk = get_genuine_zk()
-    fake_zk = get_fake_zk()
-    genuine_zk.create("/test_sequential_nodes")
-    fake_zk.create("/test_sequential_nodes")
-    for i in range(1, 11):
-        genuine_zk.create("/test_sequential_nodes/" + ("a" * i) + "-", sequence=True)
-        genuine_zk.create("/test_sequential_nodes/" + ("b" * i))
-        fake_zk.create("/test_sequential_nodes/" + ("a" * i) + "-", sequence=True)
-        fake_zk.create("/test_sequential_nodes/" + ("b" * i))
-
-    genuine_childs = list(sorted(genuine_zk.get_children("/test_sequential_nodes")))
-    fake_childs = list(sorted(fake_zk.get_children("/test_sequential_nodes")))
-    assert genuine_childs == fake_childs
-
-
-def assert_eq_stats(stat1, stat2):
-    assert stat1.version == stat2.version
-    assert stat1.cversion == stat2.cversion
-    assert stat1.aversion == stat2.aversion
-    assert stat1.aversion == stat2.aversion
-    assert stat1.dataLength == stat2.dataLength
-    assert stat1.numChildren == stat2.numChildren
-
-def test_stats(started_cluster):
-    genuine_zk = get_genuine_zk()
-    fake_zk = get_fake_zk()
-    genuine_zk.create("/test_stats_nodes")
-    fake_zk.create("/test_stats_nodes")
-    genuine_stats = genuine_zk.exists("/test_stats_nodes")
-    fake_stats = fake_zk.exists("/test_stats_nodes")
-    assert_eq_stats(genuine_stats, fake_stats)
-    for i in range(1, 11):
-        genuine_zk.create("/test_stats_nodes/" + ("a" * i) + "-", sequence=True)
-        genuine_zk.create("/test_stats_nodes/" + ("b" * i))
-        fake_zk.create("/test_stats_nodes/" + ("a" * i) + "-", sequence=True)
-        fake_zk.create("/test_stats_nodes/" + ("b" * i))
-
-    genuine_stats = genuine_zk.exists("/test_stats_nodes")
-    fake_stats = fake_zk.exists("/test_stats_nodes")
-    assert_eq_stats(genuine_stats, fake_stats)
-    for i in range(1, 11):
-        print("/test_stats_nodes/" + ("a" * i) + "-" + "{:010d}".format((i - 1) * 2))
-        genuine_zk.delete("/test_stats_nodes/" + ("a" * i) + "-" + "{:010d}".format((i - 1) * 2))
-        genuine_zk.delete("/test_stats_nodes/" + ("b" * i))
-        fake_zk.delete("/test_stats_nodes/" + ("a" * i) + "-" + "{:010d}".format((i - 1) * 2))
-        fake_zk.delete("/test_stats_nodes/" + ("b" * i))
-
-    genuine_stats = genuine_zk.exists("/test_stats_nodes")
-    fake_stats = fake_zk.exists("/test_stats_nodes")
-    print(genuine_stats)
-    print(fake_stats)
-    assert_eq_stats(genuine_stats, fake_stats)
-    for i in range(100):
-        genuine_zk.set("/test_stats_nodes", ("q" * i).encode())
-        fake_zk.set("/test_stats_nodes", ("q" * i).encode())
-
-    genuine_stats = genuine_zk.exists("/test_stats_nodes")
-    fake_stats = fake_zk.exists("/test_stats_nodes")
-    print(genuine_stats)
-    print(fake_stats)
-    assert_eq_stats(genuine_stats, fake_stats)
-
-def test_watchers(started_cluster):
-    genuine_zk = get_genuine_zk()
-    fake_zk = get_fake_zk()
-    genuine_zk.create("/test_data_watches")
-    fake_zk.create("/test_data_watches")
-    genuine_data_watch_data = None
-
-    def genuine_callback(event):
-        print("Genuine data watch called")
-        nonlocal genuine_data_watch_data
-        genuine_data_watch_data = event
-
-    fake_data_watch_data = None
-    def fake_callback(event):
-        print("Fake data watch called")
-        nonlocal fake_data_watch_data
-        fake_data_watch_data = event
-
-    genuine_zk.get("/test_data_watches", watch=genuine_callback)
-    fake_zk.get("/test_data_watches", watch=fake_callback)
-
-    print("Calling set genuine")
-    genuine_zk.set("/test_data_watches", b"a")
-    print("Calling set fake")
-    fake_zk.set("/test_data_watches", b"a")
-    time.sleep(3)
-
-    print("Genuine data", genuine_data_watch_data)
-    print("Fake data", fake_data_watch_data)
-    assert genuine_data_watch_data == fake_data_watch_data
-
-    genuine_children = None
-    def genuine_child_callback(event):
-        print("Genuine child watch called")
-        nonlocal genuine_children
-        genuine_children = event
-
-    fake_children = None
-    def fake_child_callback(event):
-        print("Fake child watch called")
-        nonlocal fake_children
-        fake_children = event
-
-    genuine_zk.get_children("/test_data_watches", watch=genuine_child_callback)
-    fake_zk.get_children("/test_data_watches", watch=fake_child_callback)
-
-    print("Calling genuine child")
-    genuine_zk.create("/test_data_watches/child", b"b")
-    print("Calling fake child")
-    fake_zk.create("/test_data_watches/child", b"b")
-
-    time.sleep(3)
-
-    print("Genuine children", genuine_children)
-    print("Fake children", fake_children)
-    assert genuine_children == fake_children
-
-def test_multitransactions(started_cluster):
-    genuine_zk = get_genuine_zk()
-    fake_zk = get_fake_zk()
-    for zk in [genuine_zk, fake_zk]:
-        zk.create('/test_multitransactions')
-        t = zk.transaction()
-        t.create('/test_multitransactions/freddy')
-        t.create('/test_multitransactions/fred', ephemeral=True)
-        t.create('/test_multitransactions/smith', sequence=True)
-        results = t.commit()
-        assert len(results) == 3
-        assert results[0] == '/test_multitransactions/freddy'
-        assert results[2].startswith('/test_multitransactions/smith0') is True
-
-    from kazoo.exceptions import RolledBackError, NoNodeError
-    for i, zk in enumerate([genuine_zk, fake_zk]):
-        print("Processing ZK", i)
-        t = zk.transaction()
-        t.create('/test_multitransactions/q')
-        t.delete('/test_multitransactions/a')
-        t.create('/test_multitransactions/x')
-        results = t.commit()
-        print("Results", results)
-        assert results[0].__class__ == RolledBackError
-        assert results[1].__class__ == NoNodeError
-        assert zk.exists('/test_multitransactions/q') is None
-        assert zk.exists('/test_multitransactions/a') is None
-        assert zk.exists('/test_multitransactions/x') is None
-
-
-def exists(zk, path):
-    result = zk.exists(path)
-    return result is not None
-
-def get(zk, path):
-    result = zk.get(path)
-    return result[0]
-
-def get_children(zk, path):
-    return [elem for elem in list(sorted(zk.get_children(path))) if elem not in ('clickhouse', 'zookeeper')]
-
-READ_REQUESTS = [
-    ("exists", exists),
-    ("get", get),
-    ("get_children", get_children),
-]
-
-
-def create(zk, path, data):
-    zk.create(path, data.encode())
-
-
-def set_data(zk, path, data):
-    zk.set(path, data.encode())
-
-
-WRITE_REQUESTS = [
-    ("create", create),
-    ("set_data", set_data),
-]
-
-
-def delete(zk, path):
-    zk.delete(path)
-
-DELETE_REQUESTS = [
-    ("delete", delete)
-]
-
-
-class Request(object):
-    def __init__(self, name, arguments, callback, is_return):
-        self.name = name
-        self.arguments = arguments
-        self.callback = callback
-        self.is_return = is_return
-
-    def __str__(self):
-        arg_str = ', '.join([str(k) + "=" + str(v) for k, v in self.arguments.items()])
-        return "ZKRequest name {} with arguments {}".format(self.name, arg_str)
-
-def generate_requests(iters=1):
-    requests = []
-    existing_paths = []
-    for i in range(iters):
-        for _ in range(100):
-            rand_length = random.randint(0, 10)
-            path = "/"
-            for j in range(1, rand_length):
-                path = create_random_path(path, 1)
-                existing_paths.append(path)
-                value = random_string(1000)
-                request = Request("create", {"path" : path, "value": value[0:10]}, lambda zk, path=path, value=value: create(zk, path, value), False)
-                requests.append(request)
-
-        for _ in range(100):
-            path = random.choice(existing_paths)
-            value = random_string(100)
-            request = Request("set", {"path": path, "value": value[0:10]}, lambda zk, path=path, value=value: set_data(zk, path, value), False)
-            requests.append(request)
-
-        for _ in range(100):
-            path = random.choice(existing_paths)
-            callback = random.choice(READ_REQUESTS)
-            def read_func1(zk, path=path, callback=callback):
-                return callback[1](zk, path)
-
-            request = Request(callback[0], {"path": path}, read_func1, True)
-            requests.append(request)
-
-        for _ in range(30):
-            path = random.choice(existing_paths)
-            request = Request("delete", {"path": path}, lambda zk, path=path: delete(zk, path), False)
-
-        for _ in range(100):
-            path = random.choice(existing_paths)
-            callback = random.choice(READ_REQUESTS)
-            def read_func2(zk, path=path, callback=callback):
-                return callback[1](zk, path)
-            request = Request(callback[0], {"path": path}, read_func2, True)
-            requests.append(request)
-    return requests
-
-
-def test_random_requests(started_cluster):
-    requests = generate_requests(10)
-    genuine_zk = get_genuine_zk()
-    fake_zk = get_fake_zk()
-    for i, request in enumerate(requests):
-        genuine_throw = False
-        fake_throw = False
-        fake_result = None
-        genuine_result = None
-        try:
-            genuine_result = request.callback(genuine_zk)
-        except Exception as ex:
-            genuine_throw = True
-
-        try:
-            fake_result = request.callback(fake_zk)
-        except Exception as ex:
-            fake_throw = True
-
-        assert fake_throw == genuine_throw, "Fake throw genuine not or vise versa"
-        assert fake_result == genuine_result, "Zookeeper results differ"
-    root_children_genuine = [elem for elem in list(sorted(genuine_zk.get_children("/"))) if elem not in ('clickhouse', 'zookeeper')]
-    root_children_fake = [elem for elem in list(sorted(fake_zk.get_children("/"))) if elem not in ('clickhouse', 'zookeeper')]
-    assert root_children_fake == root_children_genuine
-
-def test_end_of_session(started_cluster):
-    fake_zk1 = None
-    fake_zk2 = None
-    genuine_zk1 = None
-    genuine_zk2 = None
-
-    try:
-        fake_zk1 = KazooClient(hosts=cluster.get_instance_ip("node") + ":9181")
-        fake_zk1.start()
-        fake_zk2 = KazooClient(hosts=cluster.get_instance_ip("node") + ":9181")
-        fake_zk2.start()
-        genuine_zk1 = cluster.get_kazoo_client('zoo1')
-        genuine_zk1.start()
-        genuine_zk2 = cluster.get_kazoo_client('zoo1')
-        genuine_zk2.start()
-
-        fake_zk1.create("/test_end_of_session")
-        genuine_zk1.create("/test_end_of_session")
-        fake_ephemeral_event = None
-        def fake_ephemeral_callback(event):
-            print("Fake watch triggered")
-            nonlocal fake_ephemeral_event
-            fake_ephemeral_event = event
-
-        genuine_ephemeral_event = None
-        def genuine_ephemeral_callback(event):
-            print("Genuine watch triggered")
-            nonlocal genuine_ephemeral_event
-            genuine_ephemeral_event = event
-
-        assert fake_zk2.exists("/test_end_of_session") is not None
-        assert genuine_zk2.exists("/test_end_of_session") is not None
-
-        fake_zk1.create("/test_end_of_session/ephemeral_node", ephemeral=True)
-        genuine_zk1.create("/test_end_of_session/ephemeral_node", ephemeral=True)
-
-        assert fake_zk2.exists("/test_end_of_session/ephemeral_node", watch=fake_ephemeral_callback) is not None
-        assert genuine_zk2.exists("/test_end_of_session/ephemeral_node", watch=genuine_ephemeral_callback) is not None
-
-        print("Stopping genuine zk")
-        genuine_zk1.stop()
-        print("Closing genuine zk")
-        genuine_zk1.close()
-
-        print("Stopping fake zk")
-        fake_zk1.stop()
-        print("Closing fake zk")
-        fake_zk1.close()
-
-        assert fake_zk2.exists("/test_end_of_session/ephemeral_node") is None
-        assert genuine_zk2.exists("/test_end_of_session/ephemeral_node") is None
-
-        assert fake_ephemeral_event == genuine_ephemeral_event
-
-    finally:
-        try:
-            for zk in [fake_zk1, fake_zk2, genuine_zk1, genuine_zk2]:
-                if zk:
-                    zk.stop()
-                    zk.close()
-        except:
-            pass
-
-def test_end_of_watches_session(started_cluster):
-    fake_zk1 = None
-    fake_zk2 = None
-    try:
-        fake_zk1 = KazooClient(hosts=cluster.get_instance_ip("node") + ":9181")
-        fake_zk1.start()
-
-        fake_zk2 = KazooClient(hosts=cluster.get_instance_ip("node") + ":9181")
-        fake_zk2.start()
-
-        fake_zk1.create("/test_end_of_watches_session")
-
-        dummy_set = 0
-        def dummy_callback(event):
-            nonlocal dummy_set
-            dummy_set += 1
-            print(event)
-
-        for child_node in range(100):
-            fake_zk1.create("/test_end_of_watches_session/" + str(child_node))
-            fake_zk1.get_children("/test_end_of_watches_session/" + str(child_node), watch=dummy_callback)
-
-        fake_zk2.get_children("/test_end_of_watches_session/" + str(0), watch=dummy_callback)
-        fake_zk2.get_children("/test_end_of_watches_session/" + str(1), watch=dummy_callback)
-
-        fake_zk1.stop()
-        fake_zk1.close()
-
-        for child_node in range(100):
-            fake_zk2.create("/test_end_of_watches_session/" + str(child_node) + "/" + str(child_node), b"somebytes")
-
-        assert dummy_set == 2
-    finally:
-        try:
-            for zk in [fake_zk1, fake_zk2]:
-                if zk:
-                    zk.stop()
-                    zk.close()
-        except:
-            pass
-
-def test_concurrent_watches(started_cluster):
-    fake_zk = get_fake_zk()
-    fake_zk.restart()
-    global_path = "/test_concurrent_watches_0"
-    fake_zk.create(global_path)
-
-    dumb_watch_triggered_counter = 0
-    all_paths_triggered = []
-
-    existing_path = []
-    all_paths_created = []
-    watches_created = 0
-    def create_path_and_watch(i):
-        nonlocal watches_created
-        nonlocal all_paths_created
-        fake_zk.ensure_path(global_path + "/" + str(i))
-        # new function each time
-        def dumb_watch(event):
-            nonlocal dumb_watch_triggered_counter
-            dumb_watch_triggered_counter += 1
-            nonlocal all_paths_triggered
-            all_paths_triggered.append(event.path)
-
-        fake_zk.get(global_path + "/" + str(i), watch=dumb_watch)
-        all_paths_created.append(global_path + "/" + str(i))
-        watches_created += 1
-        existing_path.append(i)
-
-    trigger_called = 0
-    def trigger_watch(i):
-        nonlocal trigger_called
-        trigger_called += 1
-        fake_zk.set(global_path + "/" + str(i), b"somevalue")
-        try:
-            existing_path.remove(i)
-        except:
-            pass
-
-    def call(total):
-        for i in range(total):
-            create_path_and_watch(random.randint(0, 1000))
-            time.sleep(random.random() % 0.5)
-            try:
-                rand_num = random.choice(existing_path)
-                trigger_watch(rand_num)
-            except:
-                pass
-        while existing_path:
-            try:
-                rand_num = random.choice(existing_path)
-                trigger_watch(rand_num)
-            except:
-                pass
-
-    p = Pool(10)
-    arguments = [100] * 10
-    watches_must_be_created = sum(arguments)
-    watches_trigger_must_be_called = sum(arguments)
-    watches_must_be_triggered = sum(arguments)
-    p.map(call, arguments)
-    p.close()
-
-    # waiting for late watches
-    for i in range(50):
-        if dumb_watch_triggered_counter == watches_must_be_triggered:
-            break
-
-        time.sleep(0.1)
-
-    assert watches_created == watches_must_be_created
-    assert trigger_called >= watches_trigger_must_be_called
-    assert len(existing_path) == 0
-    if dumb_watch_triggered_counter != watches_must_be_triggered:
-        print("All created paths", all_paths_created)
-        print("All triggerred paths", all_paths_triggered)
-        print("All paths len", len(all_paths_created))
-        print("All triggered len", len(all_paths_triggered))
-        print("Diff", list(set(all_paths_created) - set(all_paths_triggered)))
-
-    assert dumb_watch_triggered_counter == watches_must_be_triggered
diff --git a/tests/integration/test_ttl_replicated/test.py b/tests/integration/test_ttl_replicated/test.py
index 389e249790f..67614b88029 100644
--- a/tests/integration/test_ttl_replicated/test.py
+++ b/tests/integration/test_ttl_replicated/test.py
@@ -396,6 +396,10 @@ def test_ttl_compatibility(started_cluster, node_left, node_right, num_run):
     node_right.query("OPTIMIZE TABLE test_ttl_group_by FINAL")
     node_right.query("OPTIMIZE TABLE test_ttl_where FINAL")
 
+    node_left.query("SYSTEM SYNC REPLICA test_ttl_delete", timeout=20)
+    node_left.query("SYSTEM SYNC REPLICA test_ttl_group_by", timeout=20)
+    node_left.query("SYSTEM SYNC REPLICA test_ttl_where", timeout=20)
+
     assert node_left.query("SELECT id FROM test_ttl_delete ORDER BY id") == "2\n4\n"
     assert node_right.query("SELECT id FROM test_ttl_delete ORDER BY id") == "2\n4\n"
 
diff --git a/tests/integration/test_zookeeper_config/test.py b/tests/integration/test_zookeeper_config/test.py
index eb5ab2da98f..584f76c80f0 100644
--- a/tests/integration/test_zookeeper_config/test.py
+++ b/tests/integration/test_zookeeper_config/test.py
@@ -1,6 +1,7 @@
 
 
 import time
+import threading
 from os import path as p, unlink
 from tempfile import NamedTemporaryFile
 
@@ -129,7 +130,7 @@ def test_secure_connection():
     # We need absolute path in zookeeper volumes. Generate it dynamically.
     TEMPLATE = '''
     zoo{zoo_id}:
-        image: zookeeper:3.5.6
+        image: zookeeper:3.6.2
         restart: always
         environment:
             ZOO_TICK_TIME: 500
@@ -174,6 +175,20 @@ def test_secure_connection():
         assert node1.query("SELECT count() FROM system.zookeeper WHERE path = '/'") == '2\n'
         assert node2.query("SELECT count() FROM system.zookeeper WHERE path = '/'") == '2\n'
 
+
+        kThreadsNumber = 16
+        kIterations = 100
+        threads = []
+        for _ in range(kThreadsNumber):
+            threads.append(threading.Thread(target=(lambda: 
+                [node1.query("SELECT count() FROM system.zookeeper WHERE path = '/'") for _ in range(kIterations)])))
+
+        for thread in threads:
+            thread.start()
+
+        for thread in threads:
+            thread.join()
+
     finally:
         cluster.shutdown()
         unlink(docker_compose.name)
diff --git a/tests/jepsen.clickhouse-keeper/.gitignore b/tests/jepsen.clickhouse-keeper/.gitignore
new file mode 100644
index 00000000000..d956ab0a125
--- /dev/null
+++ b/tests/jepsen.clickhouse-keeper/.gitignore
@@ -0,0 +1,13 @@
+/target
+/classes
+/checkouts
+profiles.clj
+pom.xml
+pom.xml.asc
+*.jar
+*.class
+/.lein-*
+/.nrepl-port
+/.prepl-port
+.hgignore
+.hg/
diff --git a/tests/jepsen.clickhouse-keeper/LICENSE b/tests/jepsen.clickhouse-keeper/LICENSE
new file mode 100644
index 00000000000..231512650b9
--- /dev/null
+++ b/tests/jepsen.clickhouse-keeper/LICENSE
@@ -0,0 +1,280 @@
+Eclipse Public License - v 2.0
+
+    THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+    PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION
+    OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+  a) in the case of the initial Contributor, the initial content
+     Distributed under this Agreement, and
+
+  b) in the case of each subsequent Contributor:
+     i) changes to the Program, and
+     ii) additions to the Program;
+  where such changes and/or additions to the Program originate from
+  and are Distributed by that particular Contributor. A Contribution
+  "originates" from a Contributor if it was added to the Program by
+  such Contributor itself or anyone acting on such Contributor's behalf.
+  Contributions do not include changes or additions to the Program that
+  are not Modified Works.
+
+"Contributor" means any person or entity that Distributes the Program.
+
+"Licensed Patents" mean patent claims licensable by a Contributor which
+are necessarily infringed by the use or sale of its Contribution alone
+or when combined with the Program.
+
+"Program" means the Contributions Distributed in accordance with this
+Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement
+or any Secondary License (as applicable), including Contributors.
+
+"Derivative Works" shall mean any work, whether in Source Code or other
+form, that is based on (or derived from) the Program and for which the
+editorial revisions, annotations, elaborations, or other modifications
+represent, as a whole, an original work of authorship.
+
+"Modified Works" shall mean any work in Source Code or other form that
+results from an addition to, deletion from, or modification of the
+contents of the Program, including, for purposes of clarity any new file
+in Source Code form that contains any contents of the Program. Modified
+Works shall not include works that contain only declarations,
+interfaces, types, classes, structures, or files of the Program solely
+in each case in order to link to, bind by name, or subclass the Program
+or Modified Works thereof.
+
+"Distribute" means the acts of a) distributing or b) making available
+in any manner that enables the transfer of a copy.
+
+"Source Code" means the form of a Program preferred for making
+modifications, including but not limited to software source code,
+documentation source, and configuration files.
+
+"Secondary License" means either the GNU General Public License,
+Version 2.0, or any later versions of that license, including any
+exceptions or additional permissions as identified by the initial
+Contributor.
+
+2. GRANT OF RIGHTS
+
+  a) Subject to the terms of this Agreement, each Contributor hereby
+  grants Recipient a non-exclusive, worldwide, royalty-free copyright
+  license to reproduce, prepare Derivative Works of, publicly display,
+  publicly perform, Distribute and sublicense the Contribution of such
+  Contributor, if any, and such Derivative Works.
+
+  b) Subject to the terms of this Agreement, each Contributor hereby
+  grants Recipient a non-exclusive, worldwide, royalty-free patent
+  license under Licensed Patents to make, use, sell, offer to sell,
+  import and otherwise transfer the Contribution of such Contributor,
+  if any, in Source Code or other form. This patent license shall
+  apply to the combination of the Contribution and the Program if, at
+  the time the Contribution is added by the Contributor, such addition
+  of the Contribution causes such combination to be covered by the
+  Licensed Patents. The patent license shall not apply to any other
+  combinations which include the Contribution. No hardware per se is
+  licensed hereunder.
+
+  c) Recipient understands that although each Contributor grants the
+  licenses to its Contributions set forth herein, no assurances are
+  provided by any Contributor that the Program does not infringe the
+  patent or other intellectual property rights of any other entity.
+  Each Contributor disclaims any liability to Recipient for claims
+  brought by any other entity based on infringement of intellectual
+  property rights or otherwise. As a condition to exercising the
+  rights and licenses granted hereunder, each Recipient hereby
+  assumes sole responsibility to secure any other intellectual
+  property rights needed, if any. For example, if a third party
+  patent license is required to allow Recipient to Distribute the
+  Program, it is Recipient's responsibility to acquire that license
+  before distributing the Program.
+
+  d) Each Contributor represents that to its knowledge it has
+  sufficient copyright rights in its Contribution, if any, to grant
+  the copyright license set forth in this Agreement.
+
+  e) Notwithstanding the terms of any Secondary License, no
+  Contributor makes additional grants to any Recipient (other than
+  those set forth in this Agreement) as a result of such Recipient's
+  receipt of the Program under the terms of a Secondary License
+  (if permitted under the terms of Section 3).
+
+3. REQUIREMENTS
+
+3.1 If a Contributor Distributes the Program in any form, then:
+
+  a) the Program must also be made available as Source Code, in
+  accordance with section 3.2, and the Contributor must accompany
+  the Program with a statement that the Source Code for the Program
+  is available under this Agreement, and informs Recipients how to
+  obtain it in a reasonable manner on or through a medium customarily
+  used for software exchange; and
+
+  b) the Contributor may Distribute the Program under a license
+  different than this Agreement, provided that such license:
+     i) effectively disclaims on behalf of all other Contributors all
+     warranties and conditions, express and implied, including
+     warranties or conditions of title and non-infringement, and
+     implied warranties or conditions of merchantability and fitness
+     for a particular purpose;
+
+     ii) effectively excludes on behalf of all other Contributors all
+     liability for damages, including direct, indirect, special,
+     incidental and consequential damages, such as lost profits;
+
+     iii) does not attempt to limit or alter the recipients' rights
+     in the Source Code under section 3.2; and
+
+     iv) requires any subsequent distribution of the Program by any
+     party to be under a license that satisfies the requirements
+     of this section 3.
+
+3.2 When the Program is Distributed as Source Code:
+
+  a) it must be made available under this Agreement, or if the
+  Program (i) is combined with other material in a separate file or
+  files made available under a Secondary License, and (ii) the initial
+  Contributor attached to the Source Code the notice described in
+  Exhibit A of this Agreement, then the Program may be made available
+  under the terms of such Secondary Licenses, and
+
+  b) a copy of this Agreement must be included with each copy of
+  the Program.
+
+3.3 Contributors may not remove or alter any copyright, patent,
+trademark, attribution notices, disclaimers of warranty, or limitations
+of liability ("notices") contained within the Program from any copy of
+the Program which they Distribute, provided that Contributors may add
+their own appropriate notices.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities
+with respect to end users, business partners and the like. While this
+license is intended to facilitate the commercial use of the Program,
+the Contributor who includes the Program in a commercial product
+offering should do so in a manner which does not create potential
+liability for other Contributors. Therefore, if a Contributor includes
+the Program in a commercial product offering, such Contributor
+("Commercial Contributor") hereby agrees to defend and indemnify every
+other Contributor ("Indemnified Contributor") against any losses,
+damages and costs (collectively "Losses") arising from claims, lawsuits
+and other legal actions brought by a third party against the Indemnified
+Contributor to the extent caused by the acts or omissions of such
+Commercial Contributor in connection with its distribution of the Program
+in a commercial product offering. The obligations in this section do not
+apply to any claims or Losses relating to any actual or alleged
+intellectual property infringement. In order to qualify, an Indemnified
+Contributor must: a) promptly notify the Commercial Contributor in
+writing of such claim, and b) allow the Commercial Contributor to control,
+and cooperate with the Commercial Contributor in, the defense and any
+related settlement negotiations. The Indemnified Contributor may
+participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those performance
+claims and warranties, and if a court requires any other Contributor to
+pay any damages as a result, the Commercial Contributor must pay
+those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
+PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS"
+BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
+IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF
+TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR
+PURPOSE. Each Recipient is solely responsible for determining the
+appropriateness of using and distributing the Program and assumes all
+risks associated with its exercise of rights under this Agreement,
+including but not limited to the risks and costs of program errors,
+compliance with applicable laws, damage to or loss of data, programs
+or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
+PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS
+SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
+PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
+EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further
+action by the parties hereto, such provision shall be reformed to the
+minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other software
+or hardware) infringes such Recipient's patent(s), then such Recipient's
+rights granted under Section 2(b) shall terminate as of the date such
+litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of
+time after becoming aware of such noncompliance. If all Recipient's
+rights under this Agreement terminate, Recipient agrees to cease use
+and distribution of the Program as soon as reasonably practicable.
+However, Recipient's obligations under this Agreement and any licenses
+granted by Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement,
+but in order to avoid inconsistency the Agreement is copyrighted and
+may only be modified in the following manner. The Agreement Steward
+reserves the right to publish new versions (including revisions) of
+this Agreement from time to time. No one other than the Agreement
+Steward has the right to modify this Agreement. The Eclipse Foundation
+is the initial Agreement Steward. The Eclipse Foundation may assign the
+responsibility to serve as the Agreement Steward to a suitable separate
+entity. Each new version of the Agreement will be given a distinguishing
+version number. The Program (including Contributions) may always be
+Distributed subject to the version of the Agreement under which it was
+received. In addition, after a new version of the Agreement is published,
+Contributor may elect to Distribute the Program (including its
+Contributions) under the new version.
+
+Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
+receives no rights or licenses to the intellectual property of any
+Contributor under this Agreement, whether expressly, by implication,
+estoppel or otherwise. All rights in the Program not expressly granted
+under this Agreement are reserved. Nothing in this Agreement is intended
+to be enforceable by any entity that is not a Contributor or Recipient.
+No third-party beneficiary rights are created under this Agreement.
+
+Exhibit A - Form of Secondary Licenses Notice
+
+"This Source Code may also be made available under the following
+Secondary Licenses when the conditions for such availability set forth
+in the Eclipse Public License, v. 2.0 are satisfied: GNU General Public
+License as published by the Free Software Foundation, either version 2
+of the License, or (at your option) any later version, with the GNU
+Classpath Exception which is available at
+https://www.gnu.org/software/classpath/license.html."
+
+  Simply including a copy of this Agreement, including this Exhibit A
+  is not sufficient to license the Source Code under Secondary Licenses.
+
+  If it is not possible or desirable to put the notice in a particular
+  file, then You may include the notice in a location (such as a LICENSE
+  file in a relevant directory) where a recipient would be likely to
+  look for such a notice.
+
+  You may add additional accurate notices of copyright ownership.
diff --git a/tests/jepsen.clickhouse-keeper/README.md b/tests/jepsen.clickhouse-keeper/README.md
new file mode 100644
index 00000000000..8f3754b8f7b
--- /dev/null
+++ b/tests/jepsen.clickhouse-keeper/README.md
@@ -0,0 +1,155 @@
+# Jepsen tests ClickHouse Keeper
+
+A Clojure library designed to test ZooKeeper-like implementation inside ClickHouse.
+
+## Test scenarios (workloads)
+
+### CAS register
+
+CAS Register has three operations: read number, write number, compare-and-swap number. This register is simulated as a single ZooKeeper node. Read transforms to ZooKeeper's `getData` request. Write transforms to the `set` request. Compare-and-swap implemented via `getData` + compare in code + `set` new value with `version` from `getData`.
+
+In this test, we use a linearizable checker, so Jepsen validates that history was linearizable. One of the heaviest workloads.
+
+Strictly requires `quorum_reads` to be true.
+
+### Set
+
+Set has two operations: add a number to set and read all values from set. This workload is simulated on a single ZooKeeper node with a string value that represents Clojure set data structure. Add operation very similar to compare-and-swap. We read string value from ZooKeeper node with `getData`, parse it to Clojure's set, add new value to the set and try to write it with the received version.
+
+In this test, Jepsen validates that all successfully added values can be read. Generator for this workload performs only add operations until a timeout and after that tries to read set once.
+
+### Unique IDs
+
+In the Unique IDs workload we have only one operation: generate a new unique number. It's implemented using ZooKeeper's sequential nodes. For each generates request client just creates a new sequential node in ZooKeeper with a fixed prefix. After that cuts the prefix off from the returned path and parses the number from the rest part.
+
+Jepsen checks that all returned IDs were unique.
+
+### Counter
+
+Counter workload has two operations: read counter value and add some number to the counter. Its implementation is quite weird. We add number `N` to the counter creating `N` sequential nodes in a single ZooKeeper transaction. Counter read implemented as `getChildren` ZooKeeper request and count of all returned nodes.
+
+Jepsen checks that counter value lies in the interval of possible value. Strictly requires `quorum_reads` to be true.
+
+### Total queue
+
+Simulates an unordered queue with three operations: enqueue number, dequeue, and drain. Enqueue operation uses `create` request with node name equals to number. `Dequeue` operation is more interesting. We list (`getChildren`) all nodes and remember the parent node version. After that we choose the smallest one and prepare the transaction: `check` parent node version + set an empty value to parent node + delete smalled child node. Drain operation is just `getChildren` on the parent path.
+
+Jepsen checks that all enqueued values were dequeued or drained. Duplicates are allowed because  Jepsen doesn't know the value of the unknown-status (`:info`) dequeue operation. So when we try to `dequeue` some element we should return it even if our delete transaction failed with `Connection loss` error.
+
+### Linear queue
+
+Same with the total queue, but without drain operation. Checks linearizability between enqueue and dequeue. Sometimes consume more than 10GB during validation even for very short histories.
+
+
+## Nemesis
+
+We use almost all standard nemeses with small changes for our storage.
+
+### Random node killer (random-node-killer)
+
+Sleep 5 seconds, kills random node, sleep for 5 seconds, and starts it back.
+
+### All nodes killer (all-nodes-killer)
+
+Kill all nodes at once, sleep for 5 seconds, and starts them back.
+
+### Simple partitioner (simple-partitioner)
+
+Partition one node from others using iptables. No one can see the victim and the victim cannot see anybody.
+
+### Random node stop (random-node-hammer-time)
+
+Send `SIGSTOP` to the random node. Sleep 5 seconds. Send `SIGCONT`.
+
+### All nodes stop (all-nodes-hammer-time)
+
+Send `SIGSTOP` to all nodes. Sleep 5 seconds. Send `SIGCONT`.
+
+### Logs corruptor (logs-corruptor)
+
+Corrupts latest log (change one random byte) in `clickhouse_path/coordination/logs`. Restarts nodes.
+
+### Snapshots corruptor (snapshots-corruptor)
+
+Corrupts latest snapshot (change one random byte) in `clickhouse_path/coordination/snapshots`. Restarts nodes.
+
+### Logs and snapshots corruptor  (logs-and-snapshots-corruptor)
+
+Corrupts both the latest log and snapshot. Restarts node.
+
+### Drop data corruptor (drop-data-corruptor)
+
+Drop all data from `clickhouse_path/coordinator`. Restarts node.
+
+### Bridge partitioner (bridge-partitioner)
+
+Two nodes don't see each other but can see another node. The last node can see both.
+
+### Blind node partitioner (blind-node-partitioner)
+
+One of the nodes cannot see another, but they can see it.
+
+### Blind others partitioner (blind-others-partitioner)
+
+Two nodes don't see one node but it can see both.
+
+## Usage
+
+### Dependencies
+
+- leiningen (https://leiningen.org/)
+- clojure (https://clojure.org/)
+- jvm
+
+### Options for `lein run`
+
+- `test` Run a single test.
+- `test-all` Run all available tests from tests-set.
+- `-w (--workload)` One of the workloads. Option for a single `test`.
+- `--nemesis` One of nemeses. Option for a single `test`.
+- `-q (--quorum)` Run test with quorum reads.
+- `-r (--rate)` How many operations per second Jepsen will generate in a single thread.
+- `-s (--snapshot-distance)` ClickHouse Keeper setting. How often we will create a new snapshot.
+- `--stale-log-gap` ClickHosue Keeper setting. A leader will send a snapshot instead of a log to this node if it's committed index less than leaders - this setting value.
+- `--reserved-log-items` ClickHouse Keeper setting. How many log items to keep after the snapshot.
+- `--ops-per-key` Option for CAS register workload. Total ops that will be generated for a single register.
+- `--lightweight-run` Run some lightweight tests without linearizability checks. Option for `tests-all` run.
+- `--reuse-binary` Don't download clickhouse binary if it already exists on the node.
+- `--clickhouse-source` URL to clickhouse `.deb`, `.tgz` or binary.
+- `--time-limit` (in seconds) How long Jepsen will generate new operations.
+- `--nodes-file` File with nodes for SSH. Newline separated.
+- `--username` SSH username for nodes.
+- `--password` SSH password for nodes.
+- `--concurrency` How many threads Jepsen will use for concurrent requests.
+- `--test-count` How many times to run a single test or how many tests to run from the tests set.
+
+
+### Examples:
+
+1. Run `Set` workload with `logs-and-snapshots-corruptor` ten times:
+
+```sh
+$ lein run test --nodes-file nodes.txt --username root --password '' --time-limit 30 --concurrency 50 -r 50 --workload set --nemesis logs-and-snapshots-corruptor  --clickhouse-source 'https://clickhouse-builds.s3.yandex.net/someurl/clickhouse-common-static_21.4.1.6321_amd64.deb' -q --test-count 10 --reuse-binary
+```
+
+2. Run ten random tests from `lightweight-run` with some custom Keeper settings:
+
+``` sh
+$ lein run test-all --nodes-file nodes.txt --username root --password '' --time-limit 30 --concurrency 50 -r 50 --snapshot-distance 100 --stale-log-gap 100 --reserved-log-items 10 --lightweight-run  --clickhouse-source 'someurl' -q --reuse-binary --test-count 10
+```
+
+
+## License
+
+Copyright © 2021 FIXME
+
+This program and the accompanying materials are made available under the
+terms of the Eclipse Public License 2.0 which is available at
+http://www.eclipse.org/legal/epl-2.0.
+
+This Source Code may also be made available under the following Secondary
+Licenses when the conditions for such availability set forth in the Eclipse
+Public License, v. 2.0 are satisfied: GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or (at your
+option) any later version, with the GNU Classpath Exception which is available
+at https://www.gnu.org/software/classpath/license.html.
diff --git a/tests/jepsen.clickhouse-keeper/doc/intro.md b/tests/jepsen.clickhouse-keeper/doc/intro.md
new file mode 100644
index 00000000000..09ce235c467
--- /dev/null
+++ b/tests/jepsen.clickhouse-keeper/doc/intro.md
@@ -0,0 +1,3 @@
+# Introduction to jepsen.keeper
+
+TODO: write [great documentation](http://jacobian.org/writing/what-to-write/)
diff --git a/tests/jepsen.clickhouse-keeper/project.clj b/tests/jepsen.clickhouse-keeper/project.clj
new file mode 100644
index 00000000000..c38767a767d
--- /dev/null
+++ b/tests/jepsen.clickhouse-keeper/project.clj
@@ -0,0 +1,13 @@
+(defproject jepsen.keeper "0.1.0-SNAPSHOT"
+  :injections [(.. System (setProperty "zookeeper.request.timeout" "10000"))]
+  :description "A jepsen tests for ClickHouse Keeper"
+  :url "https://clickhouse.tech/"
+  :license {:name "EPL-2.0"
+            :url "https://www.eclipse.org/legal/epl-2.0/"}
+  :main jepsen.clickhouse-keeper.main
+  :plugins [[lein-cljfmt "0.7.0"]]
+  :dependencies [[org.clojure/clojure "1.10.1"]
+                 [jepsen "0.2.3"]
+                 [zookeeper-clj "0.9.4"]
+                 [org.apache.zookeeper/zookeeper "3.6.1" :exclusions [org.slf4j/slf4j-log4j12]]]
+  :repl-options {:init-ns jepsen.clickhouse-keeper.main})
diff --git a/tests/jepsen.clickhouse-keeper/resources/config.xml b/tests/jepsen.clickhouse-keeper/resources/config.xml
new file mode 120000
index 00000000000..c7596baa075
--- /dev/null
+++ b/tests/jepsen.clickhouse-keeper/resources/config.xml
@@ -0,0 +1 @@
+../../../programs/server/config.xml
\ No newline at end of file
diff --git a/tests/jepsen.clickhouse-keeper/resources/keeper_config.xml b/tests/jepsen.clickhouse-keeper/resources/keeper_config.xml
new file mode 100644
index 00000000000..528ea5d77be
--- /dev/null
+++ b/tests/jepsen.clickhouse-keeper/resources/keeper_config.xml
@@ -0,0 +1,39 @@
+<yandex>
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>{id}</server_id>
+
+        <coordination_settings>
+            <operation_timeout_ms>10000</operation_timeout_ms>
+            <session_timeout_ms>30000</session_timeout_ms>
+            <force_sync>false</force_sync>
+            <startup_timeout>120000</startup_timeout>
+            <raft_logs_level>trace</raft_logs_level>
+            <heart_beat_interval_ms>1000</heart_beat_interval_ms>
+            <election_timeout_lower_bound_ms>2000</election_timeout_lower_bound_ms>
+            <election_timeout_upper_bound_ms>4000</election_timeout_upper_bound_ms>
+            <quorum_reads>{quorum_reads}</quorum_reads>
+            <snapshot_distance>{snapshot_distance}</snapshot_distance>
+            <stale_log_gap>{stale_log_gap}</stale_log_gap>
+            <reserved_log_items>{reserved_log_items}</reserved_log_items>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>{srv1}</hostname>
+                <port>9444</port>
+            </server>
+            <server>
+                <id>2</id>
+                <hostname>{srv2}</hostname>
+                <port>9444</port>
+            </server>
+            <server>
+                <id>3</id>
+                <hostname>{srv3}</hostname>
+                <port>9444</port>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</yandex>
diff --git a/tests/jepsen.clickhouse-keeper/resources/listen.xml b/tests/jepsen.clickhouse-keeper/resources/listen.xml
new file mode 100644
index 00000000000..de8c737ff75
--- /dev/null
+++ b/tests/jepsen.clickhouse-keeper/resources/listen.xml
@@ -0,0 +1,3 @@
+<yandex>
+    <listen_host>::</listen_host>
+</yandex>
diff --git a/tests/jepsen.clickhouse-keeper/resources/users.xml b/tests/jepsen.clickhouse-keeper/resources/users.xml
new file mode 120000
index 00000000000..41b137a130f
--- /dev/null
+++ b/tests/jepsen.clickhouse-keeper/resources/users.xml
@@ -0,0 +1 @@
+../../../programs/server/users.xml
\ No newline at end of file
diff --git a/tests/jepsen.clickhouse-keeper/resources/zoo.cfg b/tests/jepsen.clickhouse-keeper/resources/zoo.cfg
new file mode 100644
index 00000000000..fd49be16d0f
--- /dev/null
+++ b/tests/jepsen.clickhouse-keeper/resources/zoo.cfg
@@ -0,0 +1,23 @@
+# http://hadoop.apache.org/zookeeper/docs/current/zookeeperAdmin.html
+
+# The number of milliseconds of each tick
+tickTime=2000
+# The number of ticks that the initial
+# synchronization phase can take
+initLimit=10
+# The number of ticks that can pass between
+# sending a request and getting an acknowledgement
+syncLimit=5
+# the directory where the snapshot is stored.
+dataDir=/var/lib/zookeeper
+# Place the dataLogDir to a separate physical disc for better performance
+# dataLogDir=/disk2/zookeeper
+
+# the port at which the clients will connect
+clientPort=2181
+
+# Leader accepts client connections. Default value is "yes". The leader machine
+# coordinates updates. For higher update throughput at thes slight expense of
+# read throughput the leader can be configured to not accept clients and focus
+# on coordination.
+leaderServes=yes
diff --git a/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/bench.clj b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/bench.clj
new file mode 100644
index 00000000000..040d2eaa77b
--- /dev/null
+++ b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/bench.clj
@@ -0,0 +1,39 @@
+(ns jepsen.clickhouse-keeper.bench
+  (:require [clojure.tools.logging :refer :all]
+            [jepsen
+             [client :as client]])
+  (:import (java.lang ProcessBuilder)
+           (java.lang ProcessBuilder$Redirect)))
+
+(defn exec-process-builder
+  [command & args]
+  (let [pbuilder (ProcessBuilder. (into-array (cons command args)))]
+    (.redirectOutput pbuilder ProcessBuilder$Redirect/INHERIT)
+    (.redirectError pbuilder ProcessBuilder$Redirect/INHERIT)
+    (let [p (.start pbuilder)]
+      (.waitFor p))))
+
+(defrecord BenchClient [port]
+  client/Client
+  (open! [this test node]
+    this)
+
+  (setup! [this test]
+    this)
+
+  (invoke! [this test op]
+    (let [bench-opts (into [] (clojure.string/split (:bench-opts op) #" "))
+          bench-path (:bench-path op)
+          nodes (into [] (flatten (map (fn [x] (identity ["-h" (str x ":" port)])) (:nodes test))))
+          all-args (concat [bench-path] bench-opts nodes)]
+      (info "Running cmd" all-args)
+      (apply exec-process-builder all-args)
+      (assoc op :type :ok :value "ok")))
+
+  (teardown! [_ test])
+
+  (close! [_ test]))
+
+(defn bench-client
+  [port]
+  (BenchClient. port))
diff --git a/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/constants.clj b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/constants.clj
new file mode 100644
index 00000000000..cd62d66e652
--- /dev/null
+++ b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/constants.clj
@@ -0,0 +1,20 @@
+(ns jepsen.clickhouse-keeper.constants)
+
+(def common-prefix "/home/robot-clickhouse")
+
+(def binary-name "clickhouse")
+
+(def binary-path (str common-prefix "/" binary-name))
+(def pid-file-path (str common-prefix "/clickhouse.pid"))
+
+(def data-dir (str common-prefix "/db"))
+(def logs-dir (str common-prefix "/logs"))
+(def configs-dir (str common-prefix "/config"))
+(def sub-configs-dir (str configs-dir "/config.d"))
+(def coordination-data-dir (str data-dir "/coordination"))
+(def coordination-snapshots-dir (str coordination-data-dir "/snapshots"))
+(def coordination-logs-dir (str coordination-data-dir "/logs"))
+
+(def stderr-file (str logs-dir "/stderr.log"))
+
+(def binaries-cache-dir (str common-prefix "/binaries"))
diff --git a/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/counter.clj b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/counter.clj
new file mode 100644
index 00000000000..dfccf7dd635
--- /dev/null
+++ b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/counter.clj
@@ -0,0 +1,50 @@
+(ns jepsen.clickhouse-keeper.counter
+  (:require
+   [clojure.tools.logging :refer :all]
+   [jepsen
+    [checker :as checker]
+    [client :as client]
+    [generator :as gen]]
+   [jepsen.clickhouse-keeper.utils :refer :all]
+   [zookeeper :as zk])
+  (:import (org.apache.zookeeper ZooKeeper KeeperException KeeperException$BadVersionException)))
+
+(defn r   [_ _] {:type :invoke, :f :read})
+(defn add [_ _] {:type :invoke, :f :add, :value (rand-int 5)})
+
+(defrecord CounterClient [conn nodename]
+  client/Client
+  (open! [this test node]
+    (assoc
+     (assoc this
+            :conn (zk-connect node 9181 30000))
+     :nodename node))
+
+  (setup! [this test])
+
+  (invoke! [this test op]
+    (case (:f op)
+      :read (exec-with-retries 30 (fn []
+                                    (assoc op
+                                           :type :ok
+                                           :value (count (zk-list conn "/")))))
+      :add (try
+             (do
+               (zk-multi-create-many-seq-nodes conn "/seq-" (:value op))
+               (assoc op :type :ok))
+             (catch Exception _ (assoc op :type :info, :error :connect-error)))))
+
+  (teardown! [_ test])
+
+  (close! [_ test]
+    (zk/close conn)))
+
+(defn workload
+  "A generator, client, and checker for a set test."
+  [opts]
+  {:client    (CounterClient. nil nil)
+   :checker   (checker/counter)
+   :generator (->> (range)
+                   (map (fn [x]
+                          (->> (gen/mix [r add])))))
+   :final-generator (gen/once {:type :invoke, :f :read, :value nil})})
diff --git a/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/db.clj b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/db.clj
new file mode 100644
index 00000000000..fdb6b233fec
--- /dev/null
+++ b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/db.clj
@@ -0,0 +1,151 @@
+(ns jepsen.clickhouse-keeper.db
+  (:require [clojure.tools.logging :refer :all]
+            [jepsen
+             [control :as c]
+             [db :as db]
+             [util :as util :refer [meh]]]
+            [jepsen.clickhouse-keeper.constants :refer :all]
+            [jepsen.clickhouse-keeper.utils :refer :all]
+            [clojure.java.io :as io]
+            [jepsen.control.util :as cu]
+            [jepsen.os.ubuntu :as ubuntu]))
+
+(defn get-clickhouse-sky
+  [version]
+  (c/exec :sky :get :-d common-prefix :-N :Backbone version)
+  (str common-prefix "/clickhouse"))
+
+(defn get-clickhouse-url
+  [url]
+  (non-precise-cached-wget! url))
+
+(defn get-clickhouse-scp
+  [path]
+  (c/upload path (str common-prefix "/clickhouse")))
+
+(defn download-clickhouse
+  [source]
+  (info "Downloading clickhouse from" source)
+  (cond
+    (clojure.string/starts-with? source "rbtorrent:") (get-clickhouse-sky source)
+    (clojure.string/starts-with? source "http") (get-clickhouse-url source)
+    (.exists (io/file source)) (get-clickhouse-scp source)
+    :else (throw (Exception. (str "Don't know how to download clickhouse from" source)))))
+
+(defn unpack-deb
+  [path]
+  (do
+    (c/exec :dpkg :-x path common-prefix)
+    (c/exec :rm :-f path)
+    (c/exec :mv (str common-prefix "/usr/bin/clickhouse") common-prefix)
+    (c/exec :rm :-rf (str common-prefix "/usr") (str common-prefix "/etc"))))
+
+(defn unpack-tgz
+  [path]
+  (do
+    (c/exec :mkdir :-p (str common-prefix "/unpacked"))
+    (c/exec :tar :-zxvf path :-C (str common-prefix "/unpacked"))
+    (c/exec :rm :-f path)
+    (let [subdir (c/exec :ls (str common-prefix "/unpacked"))]
+      (c/exec :mv (str common-prefix "/unpacked/" subdir "/usr/bin/clickhouse") common-prefix)
+      (c/exec :rm :-fr (str common-prefix "/unpacked")))))
+
+(defn chmod-binary
+  [path]
+  (info "Binary path chmod" path)
+  (c/exec :chmod :+x path))
+
+(defn install-downloaded-clickhouse
+  [path]
+  (cond
+    (clojure.string/ends-with? path ".deb") (unpack-deb path)
+    (clojure.string/ends-with? path ".tgz") (unpack-tgz path)
+    (clojure.string/ends-with? path "clickhouse") (chmod-binary path)
+    :else (throw (Exception. (str "Don't know how to install clickhouse from path" path)))))
+
+(defn prepare-dirs
+  []
+  (do
+    (c/exec :mkdir :-p common-prefix)
+    (c/exec :mkdir :-p data-dir)
+    (c/exec :mkdir :-p logs-dir)
+    (c/exec :mkdir :-p configs-dir)
+    (c/exec :mkdir :-p sub-configs-dir)
+    (c/exec :touch stderr-file)
+    (c/exec :chown :-R :root common-prefix)))
+
+(defn cluster-config
+  [test node config-template]
+  (let [nodes (:nodes test)
+        replacement-map {#"\{srv1\}" (get nodes 0)
+                         #"\{srv2\}" (get nodes 1)
+                         #"\{srv3\}" (get nodes 2)
+                         #"\{id\}" (str (inc (.indexOf nodes node)))
+                         #"\{quorum_reads\}" (str (boolean (:quorum test)))
+                         #"\{snapshot_distance\}" (str (:snapshot-distance test))
+                         #"\{stale_log_gap\}" (str (:stale-log-gap test))
+                         #"\{reserved_log_items\}" (str (:reserved-log-items test))}]
+    (reduce #(clojure.string/replace %1 (get %2 0) (get %2 1)) config-template replacement-map)))
+
+(defn install-configs
+  [test node]
+  (c/exec :echo (slurp (io/resource "config.xml")) :> (str configs-dir "/config.xml"))
+  (c/exec :echo (slurp (io/resource "users.xml")) :> (str configs-dir "/users.xml"))
+  (c/exec :echo (slurp (io/resource "listen.xml")) :> (str sub-configs-dir "/listen.xml"))
+  (c/exec :echo (cluster-config test node (slurp (io/resource "keeper_config.xml"))) :> (str sub-configs-dir "/keeper_config.xml")))
+
+(defn collect-traces
+  [test node]
+  (let [pid (c/exec :pidof "clickhouse")]
+    (c/exec :timeout :-s "KILL" "60" :gdb :-ex "set pagination off" :-ex (str "set logging file " logs-dir "/gdb.log") :-ex
+            "set logging on" :-ex "backtrace" :-ex "thread apply all backtrace"
+            :-ex "backtrace" :-ex "detach" :-ex "quit" :--pid pid :|| :true)))
+
+(defn db
+  [version reuse-binary]
+  (reify db/DB
+    (setup! [_ test node]
+      (c/su
+       (do
+         (info "Preparing directories")
+         (prepare-dirs)
+         (if (or (not (cu/exists? binary-path)) (not reuse-binary))
+           (do (info "Downloading clickhouse")
+               (install-downloaded-clickhouse (download-clickhouse version)))
+           (info "Binary already exsist on path" binary-path "skipping download"))
+         (info "Installing configs")
+         (install-configs test node)
+         (info "Starting server")
+         (start-clickhouse! node test)
+         (info "ClickHouse started"))))
+
+    (teardown! [_ test node]
+      (info node "Tearing down clickhouse")
+      (c/su
+       (kill-clickhouse! node test)
+       (if (not reuse-binary)
+         (c/exec :rm :-rf binary-path))
+       (c/exec :rm :-rf pid-file-path)
+       (c/exec :rm :-rf data-dir)
+       (c/exec :rm :-rf logs-dir)
+       (c/exec :rm :-rf configs-dir)))
+
+    db/LogFiles
+    (log-files [_ test node]
+      (c/su
+       ;(if (cu/exists? pid-file-path)
+         ;(do
+         ;  (info node "Collecting traces")
+         ;  (collect-traces test node))
+         ;(info node "Pid files doesn't exists"))
+       (kill-clickhouse! node test)
+       (if (cu/exists? coordination-data-dir)
+         (do
+           (info node "Coordination files exists, going to compress")
+           (c/cd data-dir
+                 (c/exec :tar :czf "coordination.tar.gz" "coordination")))))
+      (let [common-logs [stderr-file (str logs-dir "/clickhouse-server.log") (str data-dir "/coordination.tar.gz")]
+            gdb-log (str logs-dir "/gdb.log")]
+        (if (cu/exists? (str logs-dir "/gdb.log"))
+          (conj common-logs gdb-log)
+          common-logs)))))
diff --git a/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/main.clj b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/main.clj
new file mode 100644
index 00000000000..0384d4d583a
--- /dev/null
+++ b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/main.clj
@@ -0,0 +1,202 @@
+(ns jepsen.clickhouse-keeper.main
+  (:require [clojure.tools.logging :refer :all]
+            [jepsen.clickhouse-keeper.utils :refer :all]
+            [clojure.pprint :refer [pprint]]
+            [jepsen.clickhouse-keeper.set :as set]
+            [jepsen.clickhouse-keeper.db :refer :all]
+            [jepsen.clickhouse-keeper.zookeeperdb :refer :all]
+            [jepsen.clickhouse-keeper.nemesis :as custom-nemesis]
+            [jepsen.clickhouse-keeper.register :as register]
+            [jepsen.clickhouse-keeper.unique :as unique]
+            [jepsen.clickhouse-keeper.queue :as queue]
+            [jepsen.clickhouse-keeper.counter :as counter]
+            [jepsen.clickhouse-keeper.bench :as bench]
+            [jepsen.clickhouse-keeper.constants :refer :all]
+            [clojure.string :as str]
+            [jepsen
+             [checker :as checker]
+             [cli :as cli]
+             [client :as client]
+             [control :as c]
+             [db :as db]
+             [nemesis :as nemesis]
+             [generator :as gen]
+             [independent :as independent]
+             [tests :as tests]
+             [util :as util :refer [meh]]]
+            [jepsen.control.util :as cu]
+            [jepsen.os.ubuntu :as ubuntu]
+            [jepsen.checker.timeline :as timeline]
+            [clojure.java.io :as io]
+            [zookeeper.data :as data]
+            [zookeeper :as zk])
+  (:import (org.apache.zookeeper ZooKeeper KeeperException KeeperException$BadVersionException)
+           (ch.qos.logback.classic Level)
+           (org.slf4j Logger LoggerFactory)))
+
+(def workloads
+  "A map of workload names to functions that construct workloads, given opts."
+  {"set"      set/workload
+   "register" register/workload
+   "unique-ids" unique/workload
+   "counter" counter/workload
+   "total-queue" queue/total-workload
+   "linear-queue" queue/linear-workload})
+
+(def cli-opts
+  "Additional command line options."
+  [["-w" "--workload NAME" "What workload should we run?"
+    :default "set"
+    :validate [workloads (cli/one-of workloads)]]
+   [nil "--nemesis NAME" "Which nemesis will poison our lives?"
+    :default "random-node-killer"
+    :validate [custom-nemesis/custom-nemesises (cli/one-of custom-nemesis/custom-nemesises)]]
+   ["-q" "--quorum" "Use quorum reads, instead of reading from any primary."]
+   ["-r" "--rate HZ" "Approximate number of requests per second, per thread."
+    :default  10
+    :parse-fn read-string
+    :validate [#(and (number? %) (pos? %)) "Must be a positive number"]]
+   ["-s" "--snapshot-distance NUM" "Number of log entries to create snapshot"
+    :default 10000
+    :parse-fn read-string
+    :validate [#(and (number? %) (pos? %)) "Must be a positive number"]]
+   [nil "--stale-log-gap NUM" "Number of log entries to send snapshot instead of separate logs"
+    :default 1000
+    :parse-fn read-string
+    :validate [#(and (number? %) (pos? %)) "Must be a positive number"]]
+   [nil "--reserved-log-items NUM" "Number of log entries to keep after snapshot"
+    :default 1000
+    :parse-fn read-string
+    :validate [#(and (number? %) (pos? %)) "Must be a positive number"]]
+   [nil "--ops-per-key NUM" "Maximum number of operations on any given key."
+    :default  100
+    :parse-fn parse-long
+    :validate [pos? "Must be a positive integer."]]
+   [nil, "--lightweight-run" "Subset of workloads/nemesises which is simple to validate"]
+   [nil, "--reuse-binary" "Use already downloaded binary if it exists, don't remove it on shutdown"]
+   [nil, "--bench" "Run perf-test mode"]
+   [nil, "--zookeeper-version VERSION" "Run zookeeper with version"
+    :default ""]
+   [nil, "--bench-opts STR" "Run perf-test mode"
+    :default "--generator list_medium_nodes -c 30 -i 1000"]
+   ["-c" "--clickhouse-source URL" "URL for clickhouse deb or tgz package"
+    :default "https://clickhouse-builds.s3.yandex.net/21677/ef82333089156907a0979669d9374c2e18daabe5/clickhouse_build_check/clang-11_relwithdebuginfo_none_bundled_unsplitted_disable_False_deb/clickhouse-common-static_21.4.1.6313_amd64.deb"]
+   [nil "--bench-path path" "Path to keeper-bench util"
+    :default "/home/alesap/code/cpp/BuildCH/utils/keeper-bench/keeper-bench"]])
+
+(defn get-db
+  [opts]
+  (if (empty? (:zookeeper-version opts))
+    (db (:clickhouse-source opts) (boolean (:reuse-binary opts)))
+    (zookeeper-db (:zookeeper-version opts))))
+
+(defn get-port
+  [opts]
+  (if (empty? (:zookeeper-version opts))
+    9181
+    2181))
+
+(defn clickhouse-func-tests
+  [opts]
+  (info "Test opts\n" (with-out-str (pprint opts)))
+  (let [quorum (boolean (:quorum opts))
+        workload  ((get workloads (:workload opts)) opts)
+        current-nemesis (get custom-nemesis/custom-nemesises (:nemesis opts))]
+    (merge tests/noop-test
+           opts
+           {:name (str "clickhouse-keeper-quorum=" quorum "-"  (name (:workload opts)) "-" (name (:nemesis opts)))
+            :os ubuntu/os
+            :db (get-db opts)
+            :pure-generators true
+            :client (:client workload)
+            :nemesis (:nemesis current-nemesis)
+            :checker (checker/compose
+                      {:perf     (checker/perf)
+                       :workload (:checker workload)})
+            :generator (gen/phases
+                        (->> (:generator workload)
+                             (gen/stagger (/ (:rate opts)))
+                             (gen/nemesis (:generator current-nemesis))
+                             (gen/time-limit (:time-limit opts)))
+                        (gen/log "Healing cluster")
+                        (gen/nemesis (gen/once {:type :info, :f :stop}))
+                        (gen/log "Waiting for recovery")
+                        (gen/sleep 10)
+                        (gen/clients (:final-generator workload)))})))
+
+(defn clickhouse-perf-test
+  [opts]
+  (info "Starting performance test")
+  (let [dct {:type :invoke :bench-opts (:bench-opts opts) :bench-path (:bench-path opts)}]
+    (merge tests/noop-test
+           opts
+           {:name (str "clickhouse-keeper-perf")
+            :os ubuntu/os
+            :db (get-db opts)
+            :pure-generators true
+            :client (bench/bench-client (get-port opts))
+            :nemesis nemesis/noop
+            :generator (->> dct
+                            (gen/stagger 1)
+                            (gen/nemesis nil))})))
+
+(defn clickhouse-keeper-test
+  "Given an options map from the command line runner (e.g. :nodes, :ssh,
+  :concurrency, ...), constructs a test map."
+  [opts]
+  (if (boolean (:bench opts))
+    (clickhouse-perf-test opts)
+    (clickhouse-func-tests opts)))
+
+(def all-nemesises (keys custom-nemesis/custom-nemesises))
+
+(def all-workloads (keys workloads))
+
+(def lightweight-workloads ["set" "unique-ids" "counter" "total-queue"])
+
+(def useful-nemesises ["random-node-killer"
+                       "simple-partitioner"
+                       "all-nodes-hammer-time"
+                       ; can lead to a very rare data loss https://github.com/eBay/NuRaft/issues/185
+                       ;"logs-and-snapshots-corruptor"
+                       ;"drop-data-corruptor"
+                       "bridge-partitioner"
+                       "blind-node-partitioner"
+                       "blind-others-partitioner"])
+
+(defn cart [colls]
+  (if (empty? colls)
+    '(())
+    (for [more (cart (rest colls))
+          x (first colls)]
+      (cons x more))))
+
+(defn all-test-options
+  "Takes base cli options, a collection of nemeses, workloads, and a test count,
+  and constructs a sequence of test options."
+  [cli worload-nemeseis-collection]
+  (take (:test-count cli)
+        (shuffle (for [[workload nemesis] worload-nemeseis-collection]
+                   (assoc cli
+                          :nemesis   nemesis
+                          :workload  workload
+                          :test-count 1)))))
+(defn all-tests
+  "Turns CLI options into a sequence of tests."
+  [test-fn cli]
+  (if (boolean (:lightweight-run cli))
+    (map test-fn (all-test-options cli (cart [lightweight-workloads useful-nemesises])))
+    (map test-fn (all-test-options cli (cart [all-workloads all-nemesises])))))
+
+(defn -main
+  "Handles command line arguments. Can either run a test, or a web server for
+  browsing results."
+  [& args]
+  (.setLevel
+   (LoggerFactory/getLogger "org.apache.zookeeper") Level/OFF)
+  (cli/run! (merge (cli/single-test-cmd {:test-fn clickhouse-keeper-test
+                                         :opt-spec cli-opts})
+                   (cli/test-all-cmd {:tests-fn (partial all-tests clickhouse-keeper-test)
+                                      :opt-spec cli-opts})
+                   (cli/serve-cmd))
+            args))
diff --git a/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/nemesis.clj b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/nemesis.clj
new file mode 100644
index 00000000000..caf59d3a25f
--- /dev/null
+++ b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/nemesis.clj
@@ -0,0 +1,160 @@
+(ns jepsen.clickhouse-keeper.nemesis
+  (:require
+   [clojure.tools.logging :refer :all]
+   [jepsen
+    [nemesis :as nemesis]
+    [control :as c]
+    [generator :as gen]]
+   [jepsen.clickhouse-keeper.constants :refer :all]
+   [jepsen.clickhouse-keeper.utils :refer :all]))
+
+(defn random-node-killer-nemesis
+  []
+  (nemesis/node-start-stopper
+   rand-nth
+   (fn start [test node] (kill-clickhouse! node test))
+   (fn stop [test node] (start-clickhouse! node test))))
+
+(defn all-nodes-killer-nemesis
+  []
+  (nemesis/node-start-stopper
+   identity
+   (fn start [test node] (kill-clickhouse! node test))
+   (fn stop [test node] (start-clickhouse! node test))))
+
+(defn random-node-hammer-time-nemesis
+  []
+  (nemesis/hammer-time "clickhouse"))
+
+(defn all-nodes-hammer-time-nemesis
+  []
+  (nemesis/hammer-time identity "clickhouse"))
+
+(defn select-last-file
+  [path]
+  (last (clojure.string/split
+         (c/exec :find path :-type :f :-printf "%T+ %p\n" :| :grep :-v :tmp_ :| :sort :| :awk "{print $2}")
+         #"\n")))
+
+(defn random-file-pos
+  [fname]
+  (let [fsize (Integer/parseInt (c/exec :du :-b fname :| :cut :-f1))]
+    (rand-int fsize)))
+
+(defn corrupt-file
+  [fname]
+  (if (not (empty? fname))
+    (do
+      (info "Corrupting" fname)
+      (c/exec :dd "if=/dev/zero" (str "of=" fname) "bs=1" "count=1" (str "seek=" (random-file-pos fname)) "conv=notrunc"))
+    (info "Nothing to corrupt")))
+
+(defn corruptor-nemesis
+  [path corruption-op]
+  (reify nemesis/Nemesis
+
+    (setup! [this test] this)
+
+    (invoke! [this test op]
+      (cond (= (:f op) :corrupt)
+            (let [nodes (list (rand-nth (:nodes test)))]
+              (info "Corruption on node" nodes)
+              (c/on-nodes test nodes
+                          (fn [test node]
+                            (c/su
+                             (kill-clickhouse! node test)
+                             (corruption-op path)
+                             (start-clickhouse! node test))))
+              (assoc op :type :info, :value :corrupted))
+            :else (do (c/on-nodes test (:nodes test)
+                                  (fn [test node]
+                                    (c/su
+                                     (start-clickhouse! node test))))
+                      (assoc op :type :info, :value :done))))
+
+    (teardown! [this test])))
+
+(defn logs-corruption-nemesis
+  []
+  (corruptor-nemesis coordination-logs-dir #(corrupt-file (select-last-file %1))))
+
+(defn snapshots-corruption-nemesis
+  []
+  (corruptor-nemesis coordination-snapshots-dir #(corrupt-file (select-last-file %1))))
+
+(defn logs-and-snapshots-corruption-nemesis
+  []
+  (corruptor-nemesis coordination-data-dir (fn [path]
+                                             (do
+                                               (corrupt-file (select-last-file (str path "/snapshots")))
+                                               (corrupt-file (select-last-file (str path "/logs")))))))
+(defn drop-all-corruption-nemesis
+  []
+  (corruptor-nemesis coordination-data-dir (fn [path]
+                                             (c/exec :rm :-fr path))))
+
+(defn partition-bridge-nemesis
+  []
+  (nemesis/partitioner nemesis/bridge))
+
+(defn blind-node
+  [nodes]
+  (let [[[victim] others] (nemesis/split-one nodes)]
+    {victim (into #{} others)}))
+
+(defn blind-node-partition-nemesis
+  []
+  (nemesis/partitioner blind-node))
+
+(defn blind-others
+  [nodes]
+  (let [[[victim] others] (nemesis/split-one nodes)]
+    (into {} (map (fn [node] [node #{victim}])) others)))
+
+(defn blind-others-partition-nemesis
+  []
+  (nemesis/partitioner blind-others))
+
+(defn network-non-symmetric-nemesis
+  []
+  (nemesis/partitioner nemesis/bridge))
+
+(defn start-stop-generator
+  [time-corrupt time-ok]
+  (->>
+   (cycle [(gen/sleep time-ok)
+           {:type :info, :f :start}
+           (gen/sleep time-corrupt)
+           {:type :info, :f :stop}])))
+
+(defn corruption-generator
+  []
+  (->>
+   (cycle [(gen/sleep 5)
+           {:type :info, :f :corrupt}])))
+
+(def custom-nemesises
+  {"random-node-killer" {:nemesis (random-node-killer-nemesis)
+                         :generator (start-stop-generator 5 5)}
+   "all-nodes-killer" {:nemesis (all-nodes-killer-nemesis)
+                       :generator (start-stop-generator 1 10)}
+   "simple-partitioner" {:nemesis (nemesis/partition-random-halves)
+                         :generator (start-stop-generator 5 5)}
+   "random-node-hammer-time"    {:nemesis (random-node-hammer-time-nemesis)
+                                 :generator (start-stop-generator 5 5)}
+   "all-nodes-hammer-time"    {:nemesis (all-nodes-hammer-time-nemesis)
+                               :generator (start-stop-generator 1 10)}
+   "logs-corruptor" {:nemesis (logs-corruption-nemesis)
+                     :generator (corruption-generator)}
+   "snapshots-corruptor" {:nemesis (snapshots-corruption-nemesis)
+                          :generator (corruption-generator)}
+   "logs-and-snapshots-corruptor" {:nemesis (logs-and-snapshots-corruption-nemesis)
+                                   :generator (corruption-generator)}
+   "drop-data-corruptor" {:nemesis (drop-all-corruption-nemesis)
+                          :generator (corruption-generator)}
+   "bridge-partitioner" {:nemesis (partition-bridge-nemesis)
+                         :generator (start-stop-generator 5 5)}
+   "blind-node-partitioner" {:nemesis (blind-node-partition-nemesis)
+                             :generator (start-stop-generator 5 5)}
+   "blind-others-partitioner" {:nemesis (blind-others-partition-nemesis)
+                               :generator (start-stop-generator 5 5)}})
diff --git a/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/queue.clj b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/queue.clj
new file mode 100644
index 00000000000..30ff7c01ec4
--- /dev/null
+++ b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/queue.clj
@@ -0,0 +1,79 @@
+(ns jepsen.clickhouse-keeper.queue
+  (:require
+   [clojure.tools.logging :refer :all]
+   [jepsen
+    [checker :as checker]
+    [client :as client]
+    [generator :as gen]]
+   [knossos.model :as model]
+   [jepsen.checker.timeline :as timeline]
+   [jepsen.clickhouse-keeper.utils :refer :all]
+   [zookeeper :as zk])
+  (:import (org.apache.zookeeper ZooKeeper KeeperException KeeperException$BadVersionException)))
+
+(defn enqueue   [val _ _] {:type :invoke, :f :enqueue :value val})
+(defn dequeue [_ _] {:type :invoke, :f :dequeue})
+
+(defrecord QueueClient [conn nodename]
+  client/Client
+  (open! [this test node]
+    (assoc
+     (assoc this
+            :conn (zk-connect node 9181 30000))
+     :nodename node))
+
+  (setup! [this test])
+
+  (invoke! [this test op]
+    (case (:f op)
+      :enqueue (try
+                 (do
+                   (zk-create-if-not-exists conn (str "/" (:value op)) "")
+                   (assoc op :type :ok))
+                 (catch Exception _ (assoc op :type :info, :error :connect-error)))
+      :dequeue
+      (try
+        (let [result (zk-multi-delete-first-child conn "/")]
+          (if (not (nil? result))
+            (assoc op :type :ok :value result)
+            (assoc op :type :fail :value result)))
+        (catch Exception _ (assoc op :type :info, :error :connect-error)))
+      :drain
+      ; drain via delete is to long, just list all nodes
+      (exec-with-retries 30 (fn []
+                              (zk-sync conn)
+                              (assoc op :type :ok :value (into #{} (map #(str %1) (zk-list conn "/"))))))))
+
+  (teardown! [_ test])
+
+  (close! [_ test]
+    (zk/close conn)))
+
+(defn sorted-str-range
+  [n]
+  (sort (map (fn [v] (str v)) (take n (range)))))
+
+(defn total-workload
+  "A generator, client, and checker for a set test."
+  [opts]
+  {:client    (QueueClient. nil nil)
+   :checker   (checker/compose
+               {:total-queue (checker/total-queue)
+                :timeline (timeline/html)})
+   :generator (->> (sorted-str-range 50000)
+                   (map (fn [x]
+                          (rand-nth [{:type :invoke, :f :enqueue :value x}
+                                     {:type :invoke, :f :dequeue}]))))
+   :final-generator (gen/once {:type :invoke, :f :drain, :value nil})})
+
+(defn linear-workload
+  [opts]
+  {:client    (QueueClient. nil nil)
+   :checker   (checker/compose
+               {:linear   (checker/linearizable {:model     (model/unordered-queue)
+                                                 :algorithm :linear})
+                :timeline (timeline/html)})
+   :generator (->> (sorted-str-range 10000)
+                   (map (fn [x]
+                          (rand-nth [{:type :invoke, :f :enqueue :value x}
+                                     {:type :invoke, :f :dequeue}]))))})
diff --git a/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/register.clj b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/register.clj
new file mode 100644
index 00000000000..b2f381168bd
--- /dev/null
+++ b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/register.clj
@@ -0,0 +1,64 @@
+(ns jepsen.clickhouse-keeper.register
+  (:require   [jepsen
+               [checker :as checker]
+               [client :as client]
+               [independent :as independent]
+               [generator :as gen]]
+              [jepsen.checker.timeline :as timeline]
+              [knossos.model :as model]
+              [jepsen.clickhouse-keeper.utils :refer :all]
+              [zookeeper :as zk])
+  (:import (org.apache.zookeeper ZooKeeper KeeperException KeeperException$BadVersionException)))
+
+(defn r   [_ _] {:type :invoke, :f :read, :value nil})
+(defn w   [_ _] {:type :invoke, :f :write, :value (rand-int 5)})
+(defn cas [_ _] {:type :invoke, :f :cas, :value [(rand-int 5) (rand-int 5)]})
+
+(defrecord RegisterClient [conn]
+  client/Client
+  (open! [this test node]
+    (assoc this :conn (zk-connect node 9181 30000)))
+
+  (setup! [this test]
+    (zk-create-range conn 300)) ; 300 nodes to be sure
+
+  (invoke! [_ test op]
+    (let [[k v] (:value op)
+          zk-k (zk-path k)]
+      (case (:f op)
+        :read (try
+                (assoc op :type :ok, :value (independent/tuple k (parse-long (:data (zk-get-str conn zk-k)))))
+                (catch Exception _ (assoc op :type :fail, :error :connect-error)))
+        :write (try
+                 (do (zk-set conn zk-k v)
+                     (assoc op :type :ok))
+                 (catch Exception _ (assoc op :type :info, :error :connect-error)))
+        :cas (try
+               (let [[old new] v]
+                 (assoc op :type (if (zk-cas conn zk-k old new)
+                                   :ok
+                                   :fail)))
+               (catch KeeperException$BadVersionException _ (assoc op :type :fail, :error :bad-version))
+               (catch Exception _ (assoc op :type :info, :error :connect-error))))))
+
+  (teardown! [this test])
+
+  (close! [_ test]
+    (zk/close conn)))
+
+(defn workload
+  "Tests linearizable reads, writes, and compare-and-set operations on
+  independent keys."
+  [opts]
+  {:client    (RegisterClient. nil)
+   :checker   (independent/checker
+               (checker/compose
+                {:linear   (checker/linearizable {:model     (model/cas-register)
+                                                  :algorithm :linear})
+                 :timeline (timeline/html)}))
+   :generator (independent/concurrent-generator
+               10
+               (range)
+               (fn [k]
+                 (->> (gen/mix [r w cas])
+                      (gen/limit (:ops-per-key opts)))))})
diff --git a/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/set.clj b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/set.clj
new file mode 100644
index 00000000000..79ec4f824bb
--- /dev/null
+++ b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/set.clj
@@ -0,0 +1,50 @@
+(ns jepsen.clickhouse-keeper.set
+  (:require
+   [clojure.tools.logging :refer :all]
+   [jepsen
+    [checker :as checker]
+    [client :as client]
+    [generator :as gen]]
+   [jepsen.clickhouse-keeper.utils :refer :all]
+   [zookeeper :as zk])
+  (:import (org.apache.zookeeper ZooKeeper KeeperException KeeperException$BadVersionException)))
+
+(defrecord SetClient [k conn nodename]
+  client/Client
+  (open! [this test node]
+    (assoc
+     (assoc this
+            :conn (zk-connect node 9181 30000))
+     :nodename node))
+
+  (setup! [this test]
+    (exec-with-retries 30 (fn []
+                            (zk-create-if-not-exists conn k "#{}"))))
+
+  (invoke! [this test op]
+    (case (:f op)
+      :read (exec-with-retries 30 (fn []
+                                    (zk-sync conn)
+                                    (assoc op
+                                           :type :ok
+                                           :value (read-string (:data (zk-get-str conn k))))))
+      :add (try
+             (do
+               (zk-add-to-set conn k (:value op))
+               (assoc op :type :ok))
+             (catch KeeperException$BadVersionException _ (assoc op :type :fail, :error :bad-version))
+             (catch Exception _ (assoc op :type :info, :error :connect-error)))))
+
+  (teardown! [_ test])
+
+  (close! [_ test]
+    (zk/close conn)))
+
+(defn workload
+  "A generator, client, and checker for a set test."
+  [opts]
+  {:client    (SetClient. "/a-set" nil nil)
+   :checker   (checker/set)
+   :generator (->> (range)
+                   (map (fn [x] {:type :invoke, :f :add, :value x})))
+   :final-generator (gen/once {:type :invoke, :f :read, :value nil})})
diff --git a/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/unique.clj b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/unique.clj
new file mode 100644
index 00000000000..c50f33924e0
--- /dev/null
+++ b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/unique.clj
@@ -0,0 +1,42 @@
+(ns jepsen.clickhouse-keeper.unique
+  (:require
+   [clojure.tools.logging :refer :all]
+   [jepsen
+    [checker :as checker]
+    [client :as client]
+    [generator :as gen]]
+   [jepsen.clickhouse-keeper.utils :refer :all]
+   [zookeeper :as zk])
+  (:import (org.apache.zookeeper ZooKeeper KeeperException KeeperException$BadVersionException)))
+
+(defrecord UniqueClient [conn nodename]
+  client/Client
+  (open! [this test node]
+    (assoc
+     (assoc this
+            :conn (zk-connect node 9181 30000))
+     :nodename node))
+
+  (setup! [this test])
+
+  (invoke! [this test op]
+    (case
+     :generate
+      (try
+        (let [result-path (zk-create-sequential conn "/seq-" "")]
+          (assoc op :type :ok :value (parse-and-get-counter result-path)))
+        (catch Exception _ (assoc op :type :info, :error :connect-error)))))
+
+  (teardown! [_ test])
+
+  (close! [_ test]
+    (zk/close conn)))
+
+(defn workload
+  "A generator, client, and checker for a set test."
+  [opts]
+  {:client    (UniqueClient. nil nil)
+   :checker   (checker/unique-ids)
+   :generator (->>
+               (range)
+               (map (fn [_] {:type :invoke, :f :generate})))})
diff --git a/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/utils.clj b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/utils.clj
new file mode 100644
index 00000000000..70813457251
--- /dev/null
+++ b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/utils.clj
@@ -0,0 +1,203 @@
+(ns jepsen.clickhouse-keeper.utils
+  (:require [clojure.string :as str]
+            [zookeeper.data :as data]
+            [zookeeper :as zk]
+            [zookeeper.internal :as zi]
+            [jepsen.control.util :as cu]
+            [jepsen.clickhouse-keeper.constants :refer :all]
+            [jepsen.control :as c]
+            [clojure.tools.logging :refer :all]
+            [clojure.java.io :as io])
+  (:import (org.apache.zookeeper.data Stat)
+           (org.apache.zookeeper CreateMode
+                                 ZooKeeper)
+           (org.apache.zookeeper ZooKeeper KeeperException KeeperException$BadVersionException)
+           (java.security MessageDigest)))
+
+(defn exec-with-retries
+  [retries f & args]
+  (let [res (try {:value (apply f args)}
+                 (catch Exception e
+                   (if (zero? retries)
+                     (throw e)
+                     {:exception e})))]
+    (if (:exception res)
+      (do (Thread/sleep 1000) (recur (dec retries) f args))
+      (:value res))))
+
+(defn parse-long
+  "Parses a string to a Long. Passes through `nil` and empty strings."
+  [s]
+  (if (and s (> (count s) 0))
+    (Long/parseLong s)))
+
+(defn parse-and-get-counter
+  [path]
+  (Integer/parseInt (apply str (take-last 10 (seq (str path))))))
+
+(defn zk-range
+  []
+  (map (fn [v] (str "/" v)) (range)))
+
+(defn zk-path
+  [n]
+  (str "/" n))
+
+(defn zk-connect
+  [host port timeout]
+  (exec-with-retries 30 (fn [] (zk/connect (str host ":" port) :timeout-msec timeout))))
+
+(defn zk-create-range
+  [conn n]
+  (dorun (map (fn [v] (zk/create-all conn v :persistent? true)) (take n (zk-range)))))
+
+(defn zk-set
+  ([conn path value]
+   (zk/set-data conn path (data/to-bytes (str value)) -1))
+  ([conn path value version]
+   (zk/set-data conn path (data/to-bytes (str value)) version)))
+
+(defn zk-get-str
+  [conn path]
+  (let [zk-result (zk/data conn path)]
+    {:data (data/to-string (:data zk-result))
+     :stat (:stat zk-result)}))
+
+(defn zk-list
+  [conn path]
+  (zk/children conn path))
+
+(defn zk-list-with-stat
+  [conn path]
+  (let [stat (new Stat)
+        children (seq (.getChildren conn path false stat))]
+    {:children children
+     :stat (zi/stat-to-map stat)}))
+
+(defn zk-cas
+  [conn path old-value new-value]
+  (let [current-value (zk-get-str conn path)]
+    (if (= (parse-long (:data current-value)) old-value)
+      (do (zk-set conn path new-value (:version (:stat current-value)))
+          true))))
+
+(defn zk-add-to-set
+  [conn path elem]
+  (let [current-value (zk-get-str conn path)
+        current-set (read-string (:data current-value))
+        new-set (conj current-set elem)]
+    (zk-set conn path (pr-str new-set) (:version (:stat current-value)))))
+
+(defn zk-create-if-not-exists
+  [conn path data]
+  (zk/create conn path :data (data/to-bytes (str data)) :persistent? true))
+
+(defn zk-create-sequential
+  [conn path-prefix data]
+  (zk/create conn path-prefix :data (data/to-bytes (str data)) :persistent? true :sequential? true))
+
+(defn zk-multi-create-many-seq-nodes
+  [conn path-prefix num]
+  (let [txn (.transaction conn)]
+    (loop [i 0]
+      (cond (>= i num) (.commit txn)
+            :else (do (.create txn path-prefix
+                               (data/to-bytes "")
+                               (zi/acls :open-acl-unsafe)
+                               CreateMode/PERSISTENT_SEQUENTIAL)
+                      (recur (inc i)))))))
+
+; sync call not implemented in zookeeper-clj and don't have sync version in java API
+(defn zk-sync
+  [conn]
+  (zk-set conn "/" "" -1))
+
+(defn zk-parent-path
+  [path]
+  (let [rslash_pos (str/last-index-of path "/")]
+    (if (> rslash_pos 0)
+      (subs path 0 rslash_pos)
+      "/")))
+
+(defn zk-multi-delete-first-child
+  [conn path]
+  (let [{children :children stat :stat} (zk-list-with-stat conn path)
+        txn (.transaction conn)
+        first-child (first (sort children))]
+    (if (not (nil? first-child))
+      (try
+        (do (.check txn path (:version stat))
+            (.setData txn path (data/to-bytes "") -1) ; I'm just checking multitransactions
+            (.delete txn (str path first-child) -1)
+            (.commit txn)
+            first-child)
+        (catch KeeperException$BadVersionException _ nil)
+        ; Even if we got connection loss, delete may actually be executed.
+        ; This function is used for queue model, which strictly require
+        ; all enqueued elements to be dequeued, but allow duplicates.
+        ; So even in case when we not sure about delete we return first-child.
+        (catch Exception _ first-child))
+      nil)))
+
+(defn clickhouse-alive?
+  [node test]
+  (info "Checking server alive on" node)
+  (try
+    (c/exec binary-path :client :--query "SELECT 1")
+    (catch Exception _ false)))
+
+(defn wait-clickhouse-alive!
+  [node test & {:keys [maxtries] :or {maxtries 30}}]
+  (loop [i 0]
+    (cond (> i maxtries) false
+          (clickhouse-alive? node test) true
+          :else (do (Thread/sleep 1000) (recur (inc i))))))
+
+(defn kill-clickhouse!
+  [node test]
+  (info "Killing server on node" node)
+  (c/su
+   (cu/stop-daemon! binary-path pid-file-path)
+   (c/exec :rm :-fr (str data-dir "/status"))))
+
+(defn start-clickhouse!
+  [node test]
+  (info "Starting server on node" node)
+  (c/su
+   (cu/start-daemon!
+    {:pidfile pid-file-path
+     :logfile stderr-file
+     :chdir data-dir}
+    binary-path
+    :server
+    :--config (str configs-dir "/config.xml")
+    :--
+    :--path (str data-dir "/")
+    :--user_files_path (str data-dir "/user_files")
+    :--top_level_domains_path (str data-dir "/top_level_domains")
+    :--logger.log (str logs-dir "/clickhouse-server.log")
+    :--logger.errorlog (str logs-dir "/clickhouse-server.err.log")
+    :--keeper_server.snapshot_storage_path coordination-snapshots-dir
+    :--keeper_server.logs_storage_path coordination-logs-dir)
+   (wait-clickhouse-alive! node test)))
+
+(defn md5 [^String s]
+  (let [algorithm (MessageDigest/getInstance "MD5")
+        raw (.digest algorithm (.getBytes s))]
+    (format "%032x" (BigInteger. 1 raw))))
+
+(defn non-precise-cached-wget!
+  [url]
+  (let [encoded-url (md5 url)
+        expected-file-name (.getName (io/file url))
+        dest-file (str binaries-cache-dir "/" encoded-url)
+        dest-symlink (str common-prefix "/" expected-file-name)
+        wget-opts (concat cu/std-wget-opts [:-O dest-file])]
+    (when-not (cu/exists? dest-file)
+      (info "Downloading" url)
+      (do (c/exec :mkdir :-p binaries-cache-dir)
+          (c/cd binaries-cache-dir
+                (cu/wget-helper! wget-opts url))))
+    (c/exec :rm :-rf dest-symlink)
+    (c/exec :ln :-s dest-file dest-symlink)
+    dest-symlink))
diff --git a/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/zookeeperdb.clj b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/zookeeperdb.clj
new file mode 100644
index 00000000000..7cb88cd1fd9
--- /dev/null
+++ b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/zookeeperdb.clj
@@ -0,0 +1,64 @@
+(ns jepsen.clickhouse-keeper.zookeeperdb
+  (:require [clojure.tools.logging :refer :all]
+            [jepsen.clickhouse-keeper.utils :refer :all]
+            [clojure.java.io :as io]
+            [jepsen
+             [control :as c]
+             [db :as db]]
+            [jepsen.os.ubuntu :as ubuntu]))
+
+(defn zk-node-ids
+  "Returns a map of node names to node ids."
+  [test]
+  (->> test
+       :nodes
+       (map-indexed (fn [i node] [node (inc i)]))
+       (into {})))
+
+(defn zk-node-id
+  "Given a test and a node name from that test, returns the ID for that node."
+  [test node]
+  ((zk-node-ids test) node))
+
+(defn zoo-cfg-servers
+  "Constructs a zoo.cfg fragment for servers."
+  [test mynode]
+  (->> (zk-node-ids test)
+       (map (fn [[node id]]
+              (str "server." id "=" (if (= (name node) mynode) "0.0.0.0" (name node)) ":2888:3888")))
+       (clojure.string/join "\n")))
+
+(defn zookeeper-db
+  "Zookeeper DB for a particular version."
+  [version]
+  (reify db/DB
+    (setup! [_ test node]
+      (c/su
+       (info node "Installing ZK" version)
+       (c/exec :apt-get :update)
+       (c/exec :apt-get :install (str "zookeeper=" version))
+       (c/exec :apt-get :install (str "zookeeperd=" version))
+       (c/exec :echo (zk-node-id test node) :> "/etc/zookeeper/conf/myid")
+
+       (c/exec :echo (str (slurp (io/resource "zoo.cfg"))
+                          "\n"
+                          (zoo-cfg-servers test node))
+               :> "/etc/zookeeper/conf/zoo.cfg")
+
+       (info node "ZK restarting")
+       (c/exec :service :zookeeper :restart)
+       (info "Connecting to zk" (name node))
+       (zk-connect (name node) 2181 1000)
+       (info node "ZK ready")))
+
+    (teardown! [_ test node]
+      (info node "tearing down ZK")
+      (c/su
+       (c/exec :service :zookeeper :stop :|| true)
+       (c/exec :rm :-rf
+               (c/lit "/var/lib/zookeeper/version-*")
+               (c/lit "/var/log/zookeeper/*"))))
+
+    db/LogFiles
+    (log-files [_ test node]
+      ["/var/log/zookeeper/zookeeper.log"])))
diff --git a/tests/jepsen.clickhouse-keeper/test/jepsen/keeper_test.clj b/tests/jepsen.clickhouse-keeper/test/jepsen/keeper_test.clj
new file mode 100644
index 00000000000..25333605351
--- /dev/null
+++ b/tests/jepsen.clickhouse-keeper/test/jepsen/keeper_test.clj
@@ -0,0 +1,39 @@
+(ns jepsen.keeper-test
+  (:require [clojure.test :refer :all]
+            [jepsen.clickhouse-keeper.utils :refer :all]
+            [zookeeper :as zk]
+            [zookeeper.data :as data])
+  (:import (ch.qos.logback.classic Level)
+           (org.slf4j Logger LoggerFactory)))
+
+(defn multicreate
+  [conn]
+  (dorun (map (fn [v] (zk/create conn v :persistent? true)) (take 10 (zk-range)))))
+
+(defn multidelete
+  [conn]
+  (dorun (map (fn [v] (zk/delete conn v)) (take 10 (zk-range)))))
+
+(deftest a-test
+  (testing "keeper connection"
+    (.setLevel
+     (LoggerFactory/getLogger "org.apache.zookeeper") Level/OFF)
+    (let [conn (zk/connect "localhost:9181" :timeout-msec 5000)]
+      ;(println (take 10 (zk-range)))
+      ;(multidelete conn)
+      ;(multicreate conn)
+      ;(zk/create-all conn "/0")
+      ;(zk/create conn "/0")
+      ;(println (zk/children conn "/"))
+      ;(zk/set-data conn "/0" (data/to-bytes "777") -1)
+      (println (zk-parent-path "/sasds/dasda/das"))
+      (println (zk-parent-path "/sasds"))
+      (zk-multi-create-many-seq-nodes conn "/a-" 5)
+      (println (zk/children conn "/"))
+      (println (zk-list-with-stat conn "/"))
+      (println (zk-multi-delete-first-child conn "/"))
+      (println (zk-list-with-stat conn "/"))
+      ;(Thread/sleep 5000)
+      ;(println "VALUE" (data/to-string (:data (zk/data conn "/0"))))
+      ;(is (= (data/to-string (:data (zk/data conn "/0"))) "777"))
+      (zk/close conn))))
diff --git a/tests/msan_suppressions.txt b/tests/msan_suppressions.txt
index e0edd7f3dd7..cf468b0be96 100644
--- a/tests/msan_suppressions.txt
+++ b/tests/msan_suppressions.txt
@@ -7,12 +7,6 @@ fun:tolower
 
 # Suppress some failures in contrib so that we can enable MSan in CI.
 # Ideally, we should report these upstream.
-src:*/contrib/zlib-ng/*
-src:*/contrib/simdjson/*
-src:*/contrib/lz4/*
 
 # Hyperscan
 fun:roseRunProgram
-
-# mariadbclient, NSS functions from libc
-fun:_nss_files_parse_servent
diff --git a/tests/performance/ColumnMap.xml b/tests/performance/ColumnMap.xml
index f6393985377..874ed638224 100644
--- a/tests/performance/ColumnMap.xml
+++ b/tests/performance/ColumnMap.xml
@@ -26,10 +26,13 @@ FROM
         arrayMap(x -> toString(x), range(100)) AS keys,
         arrayMap(x -> toString(x * x), range(100)) AS values,
         cast((keys, values), 'Map(String, String)') AS map
-    FROM numbers(10000)
+    FROM numbers_mt(10000)
 )
+SETTINGS max_insert_threads = 8
     </create_query>
 
+    <fill_query>optimize table column_map_test final</fill_query>
+
     <query>SELECT count() FROM column_map_test WHERE NOT ignore(arrayMap(x -> map[CONCAT(toString(x), {key_suffix})], range(0, 100, 10)))</query>
 
     <drop_query>DROP TABLE IF EXISTS column_map_test</drop_query>
diff --git a/tests/performance/agg_functions_min_max_any.xml b/tests/performance/agg_functions_min_max_any.xml
index 79c9e2c6976..6ca9e3eb65a 100644
--- a/tests/performance/agg_functions_min_max_any.xml
+++ b/tests/performance/agg_functions_min_max_any.xml
@@ -6,7 +6,9 @@
     <substitutions>
         <substitution>
             <name>group_scale</name>
-            <value>1000000</value>
+            <values>
+                <value>1000000</value>
+            </values>
         </substitution>
     </substitutions>
 
diff --git a/tests/performance/aggregation_overflow.xml b/tests/performance/aggregation_overflow.xml
new file mode 100644
index 00000000000..71afdf3947a
--- /dev/null
+++ b/tests/performance/aggregation_overflow.xml
@@ -0,0 +1,5 @@
+<test>
+    <query>select bitAnd(number, 15) as k, sum(number) from numbers(100000000) group by k with totals order by k format Null settings max_rows_to_group_by = 10, group_by_overflow_mode='any', totals_mode = 'after_having_inclusive'</query>
+    <query>select bitAnd(number, 65535) as k, sum(number) from numbers(100000000) group by k with totals order by k format Null settings max_rows_to_group_by = 10, group_by_overflow_mode='any', totals_mode = 'after_having_inclusive', max_block_size = 65530</query>
+    <query>select bitAnd(number, 65535) as k, sum(number) from numbers(100000000) group by k with totals order by k format Null settings max_rows_to_group_by = 10, group_by_overflow_mode='any', max_block_size = 65530</query>
+</test>
diff --git a/tests/performance/arithmetic.xml b/tests/performance/arithmetic.xml
index 0be61eb5823..bf5e7662e37 100644
--- a/tests/performance/arithmetic.xml
+++ b/tests/performance/arithmetic.xml
@@ -1,4 +1,4 @@
-<test>
+<test max_ignored_relative_change="0.2">
     <settings>
         <max_memory_usage>30000000000</max_memory_usage>
     </settings>
diff --git a/tests/performance/array_join.xml b/tests/performance/array_join.xml
index ca280ce28ad..cf92b51f545 100644
--- a/tests/performance/array_join.xml
+++ b/tests/performance/array_join.xml
@@ -1,4 +1,4 @@
-<test>
+<test max_ignored_relative_change="0.2">
 
 
 
diff --git a/tests/performance/avg_weighted.xml b/tests/performance/avg_weighted.xml
index df9e7c21068..2476011e6a9 100644
--- a/tests/performance/avg_weighted.xml
+++ b/tests/performance/avg_weighted.xml
@@ -11,8 +11,8 @@
 
     <create_query>CREATE TABLE perf_avg(
         num UInt64,
-        num_u Decimal256(75) DEFAULT toDecimal256(num / 400000, 75),
-        num_f Float64 DEFAULT num / 100
+        num_u Decimal256(75) MATERIALIZED toDecimal256(num / 400000, 75),
+        num_f Float64 MATERIALIZED num / 100
         ) ENGINE = MergeTree() ORDER BY num
     </create_query>
 
@@ -23,6 +23,8 @@
         LIMIT 50000000
     </fill_query>
 
+    <fill_query>optimize table perf_avg final</fill_query>
+
     <query>SELECT avg(num)                  FROM perf_avg FORMAT Null</query>
     <query>SELECT avg(2 * num)              FROM perf_avg FORMAT Null</query>
     <query>SELECT avg(num_u)                FROM perf_avg FORMAT Null</query>
diff --git a/tests/performance/bounding_ratio.xml b/tests/performance/bounding_ratio.xml
index e3a15f90013..e430136b624 100644
--- a/tests/performance/bounding_ratio.xml
+++ b/tests/performance/bounding_ratio.xml
@@ -1,4 +1,4 @@
-<test>
+<test max_ignored_relative_change="0.2">
     <query>SELECT boundingRatio(number, number) FROM numbers(100000000)</query>
     <query>SELECT (argMax(number, number) - argMin(number, number)) / (max(number) - min(number)) FROM numbers(100000000)</query>
 </test>
diff --git a/tests/performance/codec_none.xml b/tests/performance/codec_none.xml
new file mode 100644
index 00000000000..e6eb9773a66
--- /dev/null
+++ b/tests/performance/codec_none.xml
@@ -0,0 +1,13 @@
+<test>
+    <preconditions>
+        <table_exists>hits_10m_single</table_exists>
+    </preconditions>
+
+    <create_query>CREATE TABLE hits_none (Title String CODEC(NONE)) ENGINE = MergeTree ORDER BY tuple()</create_query>
+    <fill_query>INSERT INTO hits_none SELECT Title FROM test.hits</fill_query>
+    <fill_query>OPTIMIZE TABLE hits_none FINAL</fill_query>
+
+    <query><![CDATA[SELECT sum(length(Title)) FROM hits_none]]></query>
+
+    <drop_query>DROP TABLE hits_none</drop_query>
+</test>
diff --git a/tests/performance/codecs_float_insert.xml b/tests/performance/codecs_float_insert.xml
index a7cb5152c09..b282bcc268f 100644
--- a/tests/performance/codecs_float_insert.xml
+++ b/tests/performance/codecs_float_insert.xml
@@ -1,5 +1,5 @@
 <!-- FIXME this instability is abysmal, investigate the unstable queries -->
-<test>
+<test max_ignored_relative_change="0.2">
     <settings>
         <allow_suspicious_codecs>1</allow_suspicious_codecs>
     </settings>
diff --git a/tests/performance/codecs_int_insert.xml b/tests/performance/codecs_int_insert.xml
index caefaba3725..662df80ae70 100644
--- a/tests/performance/codecs_int_insert.xml
+++ b/tests/performance/codecs_int_insert.xml
@@ -1,4 +1,4 @@
-<test>
+<test max_ignored_relative_change="0.2">
     <settings>
         <allow_suspicious_codecs>1</allow_suspicious_codecs>
     </settings>
diff --git a/tests/performance/collations.xml b/tests/performance/collations.xml
index 17b2d36b7e3..52ccede3798 100644
--- a/tests/performance/collations.xml
+++ b/tests/performance/collations.xml
@@ -1,4 +1,4 @@
-<test>
+<test max_ignored_relative_change="0.2">
 
 
 
diff --git a/tests/performance/conditional.xml b/tests/performance/conditional.xml
index 21623f45b05..91b6cb95ff2 100644
--- a/tests/performance/conditional.xml
+++ b/tests/performance/conditional.xml
@@ -1,4 +1,4 @@
-<test max_ignored_relative_change="0.2">
+<test>
     <query>SELECT count() FROM zeros(10000000) WHERE NOT ignore(if(rand() % 2, toDateTime('2019-02-04 01:24:31'), toDate('2019-02-04')))</query>
     <query>SELECT count() FROM zeros(10000000) WHERE NOT ignore(multiIf(rand() % 2, toDateTime('2019-02-04 01:24:31'), toDate('2019-02-04')))</query>
     <query>SELECT count() FROM zeros(10000000) WHERE NOT ignore(if(rand() % 2, [toDateTime('2019-02-04 01:24:31')], [toDate('2019-02-04')]))</query>
diff --git a/tests/performance/constant_column_search.xml b/tests/performance/constant_column_search.xml
index cb76fd4cefb..71d8185d818 100644
--- a/tests/performance/constant_column_search.xml
+++ b/tests/performance/constant_column_search.xml
@@ -1,4 +1,4 @@
-<test>
+<test max_ignored_relative_change="0.2">
     <tags>
         <tag>search</tag>
     </tags>
diff --git a/tests/performance/date_time_64.xml b/tests/performance/date_time_64.xml
index 838aba34d87..fd883416a33 100644
--- a/tests/performance/date_time_64.xml
+++ b/tests/performance/date_time_64.xml
@@ -1,4 +1,4 @@
-<test>
+<test max_ignored_relative_change="0.2">
     <preconditions>
         <table_exists>hits_100m_single</table_exists>
     </preconditions>
diff --git a/tests/performance/date_time_long.xml b/tests/performance/date_time_long.xml
index 1229631a434..c2eb42d3318 100644
--- a/tests/performance/date_time_long.xml
+++ b/tests/performance/date_time_long.xml
@@ -1,5 +1,4 @@
-<test>
-    <tags><tag>long</tag></tags>
+<test max_ignored_relative_change="0.3">
     <substitutions>
        <substitution>
            <name>datetime_transform</name>
@@ -78,7 +77,6 @@
                <value>toYYYYMMDDhhmmss</value>
 
                <value>toRelativeQuarterNum</value>
-               <value>toUnixTimestamp</value>
            </values>
         </substitution>
         <substitution>
@@ -120,9 +118,9 @@
         </substitution>
     </substitutions>
 
-    <query>SELECT count() FROM numbers(100000000) WHERE NOT ignore(toDateTime('2017-01-01 00:00:00') + number % 100000000 + rand() % 100000 AS t, {datetime_transform}(t, '{time_zone}'))</query>
-    <query>SELECT count() FROM numbers(100000000) WHERE NOT ignore(toDate('2017-01-01') + number % 1000 + rand() % 10 AS t, {date_transform}(t))</query>
-    <query>SELECT count() FROM numbers(100000000) WHERE NOT ignore(toDateTime('2017-01-01 00:00:00') + number % 100000000 + rand() % 100000 AS t, {binary_function}(t, 1))</query>
-    <query>SELECT count() FROM numbers(100000000) WHERE NOT ignore(toDateTime('2017-01-01 00:00:00') + number % 100000000 + rand() % 100000 AS t, toStartOfInterval(t, INTERVAL 1 month))</query>
-    <query>SELECT count() FROM numbers(100000000) WHERE NOT ignore(toDateTime('2017-01-01 00:00:00') + number % 100000000 + rand() % 100000 AS t, date_trunc('month', t))</query>
+    <query>SELECT count() FROM numbers(50000000) WHERE NOT ignore(toDateTime('2017-01-01 00:00:00') + number % 100000000 + rand() % 100000 AS t, {datetime_transform}(t, '{time_zone}'))</query>
+    <query>SELECT count() FROM numbers(50000000) WHERE NOT ignore(toDate('2017-01-01') + number % 1000 + rand() % 10 AS t, {date_transform}(t))</query>
+    <query>SELECT count() FROM numbers(50000000) WHERE NOT ignore(toDateTime('2017-01-01 00:00:00') + number % 100000000 + rand() % 100000 AS t, {binary_function}(t, 1))</query>
+    <query>SELECT count() FROM numbers(50000000) WHERE NOT ignore(toDateTime('2017-01-01 00:00:00') + number % 100000000 + rand() % 100000 AS t, toStartOfInterval(t, INTERVAL 1 month))</query>
+    <query>SELECT count() FROM numbers(50000000) WHERE NOT ignore(toDateTime('2017-01-01 00:00:00') + number % 100000000 + rand() % 100000 AS t, date_trunc('month', t))</query>
 </test>
diff --git a/tests/performance/decimal_aggregates.xml b/tests/performance/decimal_aggregates.xml
index f7bc2ac1868..3fc1408d7e4 100644
--- a/tests/performance/decimal_aggregates.xml
+++ b/tests/performance/decimal_aggregates.xml
@@ -18,7 +18,7 @@
 
     <query>SELECT uniq(d32), uniqCombined(d32), uniqExact(d32), uniqHLL12(d32) FROM     (SELECT * FROM t LIMIT 10000000)</query>
     <query>SELECT uniq(d64), uniqCombined(d64), uniqExact(d64), uniqHLL12(d64) FROM     (SELECT * FROM t LIMIT 10000000)</query>
-    <query>SELECT uniq(d128), uniqCombined(d128), uniqExact(d128), uniqHLL12(d128) FROM (SELECT * FROM t LIMIT 1000000)</query>
+    <query>SELECT uniq(d128), uniqCombined(d128), uniqExact(d128), uniqHLL12(d128) FROM (SELECT * FROM t LIMIT 10000000)</query>
 
     <query>SELECT median(d32), medianExact(d32), medianExactWeighted(d32, 2) FROM    (SELECT * FROM t LIMIT 10000000)</query>
     <query>SELECT median(d64), medianExact(d64), medianExactWeighted(d64, 2) FROM    (SELECT * FROM t LIMIT 1000000)</query>
diff --git a/tests/performance/direct_dictionary.xml b/tests/performance/direct_dictionary.xml
new file mode 100644
index 00000000000..3f01449ed99
--- /dev/null
+++ b/tests/performance/direct_dictionary.xml
@@ -0,0 +1,138 @@
+<test max_ignored_relative_change="0.3">
+    <create_query>
+        CREATE TABLE simple_key_direct_dictionary_source_table
+        (
+            id UInt64,
+            value_int UInt64,
+            value_string String,
+            value_decimal Decimal64(8),
+            value_string_nullable Nullable(String)
+        ) ENGINE = Memory;
+    </create_query>
+
+    <create_query>
+        CREATE TABLE complex_key_direct_dictionary_source_table
+        (
+            id UInt64,
+            id_key String,
+            value_int UInt64,
+            value_string String,
+            value_decimal Decimal64(8),
+            value_string_nullable Nullable(String)
+        ) ENGINE = TinyLog;
+    </create_query>
+
+    <create_query>
+        CREATE DICTIONARY simple_key_direct_dictionary
+        (
+            id UInt64,
+            value_int UInt64,
+            value_string String,
+            value_decimal Decimal64(8),
+            value_string_nullable Nullable(String)
+        )
+        PRIMARY KEY id
+        SOURCE(CLICKHOUSE(DB 'default' TABLE 'simple_key_direct_dictionary_source_table'))
+        LAYOUT(DIRECT())
+    </create_query>
+
+    <create_query>
+        CREATE DICTIONARY complex_key_direct_dictionary
+        (
+            id UInt64,
+            id_key String,
+            value_int UInt64,
+            value_string String,
+            value_decimal Decimal64(8),
+            value_string_nullable Nullable(String)
+        )
+        PRIMARY KEY id, id_key
+        SOURCE(CLICKHOUSE(DB 'default' TABLE 'complex_key_direct_dictionary_source_table'))
+        LAYOUT(COMPLEX_KEY_DIRECT())
+    </create_query>
+
+    <fill_query>
+        INSERT INTO simple_key_direct_dictionary_source_table
+        SELECT number, number, toString(number), toDecimal64(number, 8), toString(number)
+        FROM system.numbers
+        LIMIT 50000;
+    </fill_query>
+
+    <fill_query>
+        INSERT INTO complex_key_direct_dictionary_source_table
+        SELECT number, toString(number), number, toString(number), toDecimal64(number, 8), toString(number)
+        FROM system.numbers
+        LIMIT 50000;
+    </fill_query>
+
+    <substitutions>
+        <substitution>
+            <name>column_name</name>
+            <values>
+                <value>'value_int'</value>
+                <value>'value_string'</value>
+                <value>'value_decimal'</value>
+                <value>'value_string_nullable'</value>
+            </values>
+        </substitution>
+
+        <substitution>
+            <name>elements_count</name>
+            <values>
+                <value>50000</value>
+                <value>75000</value>
+            </values>
+        </substitution>
+    </substitutions>
+
+    <query>
+        WITH rand64() % toUInt64({elements_count}) as key
+        SELECT dictGet('default.simple_key_direct_dictionary', {column_name}, key)
+        FROM system.numbers
+        LIMIT {elements_count}
+        FORMAT Null;
+    </query>
+    <query>
+        WITH rand64() % toUInt64({elements_count}) as key
+        SELECT dictGet('default.simple_key_direct_dictionary', ('value_int', 'value_string', 'value_decimal', 'value_string_nullable'), key)
+        FROM system.numbers
+        LIMIT {elements_count}
+        FORMAT Null;
+    </query>
+    <query>
+        WITH rand64() % toUInt64({elements_count}) as key
+        SELECT dictHas('default.simple_key_direct_dictionary', key)
+        FROM system.numbers
+        LIMIT {elements_count}
+        FORMAT Null;
+    </query>
+
+    <query>
+        WITH (number, toString(number)) as key
+        SELECT dictGet('default.complex_key_direct_dictionary', {column_name}, key)
+        FROM system.numbers
+        LIMIT {elements_count}
+        FORMAT Null;
+    </query>
+    <query>
+        WITH (number, toString(number)) as key
+        SELECT dictGet('default.complex_key_direct_dictionary', ('value_int', 'value_string', 'value_decimal', 'value_string_nullable'), key)
+        FROM system.numbers
+        LIMIT {elements_count}
+        FORMAT Null;
+    </query>
+    <query>
+        WITH (number, toString(number)) as key
+        SELECT dictHas('default.complex_key_direct_dictionary', key)
+        FROM system.numbers
+        LIMIT {elements_count}
+        FORMAT Null;
+    </query>
+
+    <drop_query>DROP TABLE IF EXISTS simple_key_direct_dictionary_source_table;</drop_query>
+    <drop_query>DROP TABLE IF EXISTS complex_key_direct_dictionary_source_table;</drop_query>
+
+    <drop_query>DROP DICTIONARY IF EXISTS simple_key_direct_dictionary;</drop_query>
+    <drop_query>DROP DICTIONARY IF EXISTS complex_key_direct_dictionary;</drop_query>
+
+</test>
diff --git a/tests/performance/flat_dictionary.xml b/tests/performance/flat_dictionary.xml
new file mode 100644
index 00000000000..a80631db541
--- /dev/null
+++ b/tests/performance/flat_dictionary.xml
@@ -0,0 +1,80 @@
+<test max_ignored_relative_change="0.3">
+    <create_query>
+        CREATE TABLE simple_key_flat_dictionary_source_table
+        (
+            id UInt64,
+            value_int UInt64,
+            value_string String,
+            value_decimal Decimal64(8),
+            value_string_nullable Nullable(String)
+        ) ENGINE = Memory;
+    </create_query>
+
+    <create_query>
+        CREATE DICTIONARY simple_key_flat_dictionary
+        (
+            id UInt64,
+            value_int UInt64,
+            value_string String,
+            value_decimal Decimal64(8),
+            value_string_nullable Nullable(String)
+        )
+        PRIMARY KEY id
+        SOURCE(CLICKHOUSE(DB 'default' TABLE 'simple_key_flat_dictionary_source_table'))
+        LAYOUT(FLAT(INITIAL_ARRAY_SIZE 50000 MAX_ARRAY_SIZE 5000000))
+        LIFETIME(MIN 0 MAX 1000)
+    </create_query>
+
+    <fill_query>
+        INSERT INTO simple_key_flat_dictionary_source_table
+        SELECT number, number, toString(number), toDecimal64(number, 8), toString(number)
+        FROM system.numbers
+        LIMIT 5000000;
+    </fill_query>
+
+    <substitutions>
+        <substitution>
+            <name>column_name</name>
+            <values>
+                <value>'value_int'</value>
+                <value>'value_string'</value>
+                <value>'value_decimal'</value>
+                <value>'value_string_nullable'</value>
+            </values>
+        </substitution>
+
+        <substitution>
+            <name>elements_count</name>
+            <values>
+                <value>5000000</value>
+                <value>7500000</value>
+            </values>
+        </substitution>
+    </substitutions>
+
+    <query>
+        WITH rand64() % toUInt64({elements_count}) as key
+        SELECT dictGet('default.simple_key_flat_dictionary', {column_name}, key)
+        FROM system.numbers
+        LIMIT {elements_count}
+        FORMAT Null;
+    </query>
+
+    <query>
+        SELECT * FROM simple_key_flat_dictionary
+        FORMAT Null;
+    </query>
+
+    <query>
+        WITH rand64() % toUInt64(75000000) as key
+        SELECT dictHas('default.simple_key_flat_dictionary', key)
+        FROM system.numbers
+        LIMIT 75000000
+        FORMAT Null;
+    </query>
+
+    <drop_query>DROP TABLE IF EXISTS simple_key_flat_dictionary_source_table</drop_query>
+
+    <drop_query>DROP DICTIONARY IF EXISTS simple_key_flat_dictionary</drop_query>
+
+</test>
diff --git a/tests/performance/float_formatting.xml b/tests/performance/float_formatting.xml
index d24ccd7664c..71d8aee3f89 100644
--- a/tests/performance/float_formatting.xml
+++ b/tests/performance/float_formatting.xml
@@ -3,7 +3,7 @@
     is 10 times faster than toString(number % 100 + 0.5). The shorter
     queries are somewhat unstable, so ignore differences less than 10%.
 -->
-<test max_ignored_relative_change="0.2">
+<test>
     <substitutions>
        <substitution>
            <name>expr</name>
diff --git a/tests/performance/float_parsing.xml b/tests/performance/float_parsing.xml
index 33ab8ba6f10..eb8577bd127 100644
--- a/tests/performance/float_parsing.xml
+++ b/tests/performance/float_parsing.xml
@@ -1,4 +1,4 @@
-<test>
+<test max_ignored_relative_change="0.2">
     <substitutions>
        <substitution>
            <name>expr</name>
diff --git a/tests/performance/fuse_sumcount.xml b/tests/performance/fuse_sumcount.xml
new file mode 100644
index 00000000000..b2eb0e678e2
--- /dev/null
+++ b/tests/performance/fuse_sumcount.xml
@@ -0,0 +1,33 @@
+<test>
+    <!-- We test rewriting sum(), avg(), count() to a single call of sumCount() here.
+         As a reference, we use the same queries with the optimization disabled.
+         sum() has a highly optimized algorithm, so alone it will be faster than sumCount(),
+         but when we add count() or avg(), the sumCount() should win.
+         Also test GROUP BY with and without keys, because they might have different
+         optimizations. -->
+    <settings>
+        <optimize_fuse_sum_count_avg>1</optimize_fuse_sum_count_avg>
+    </settings>
+
+    <substitutions>
+        <substitution>
+            <name>key</name>
+            <values>
+                <value>1</value>
+                <value>intHash32(number) % 1000</value>
+            </values>
+        </substitution>
+    </substitutions>
+
+    <query>SELECT sum(number)                             FROM numbers(1000000000) FORMAT Null</query>
+    <query>SELECT sum(number), count(number)              FROM numbers(1000000000) FORMAT Null</query>
+    <query>SELECT sum(number), count(number)              FROM numbers(1000000000) SETTINGS optimize_fuse_sum_count_avg = 0 FORMAT Null</query>
+    <query>SELECT sum(number), avg(number), count(number) FROM numbers(1000000000) FORMAT Null</query>
+    <query>SELECT sum(number), avg(number), count(number) FROM numbers(1000000000) SETTINGS optimize_fuse_sum_count_avg = 0 FORMAT Null</query>
+
+    <query>SELECT sum(number)                             FROM numbers(100000000) GROUP BY intHash32(number) % 1000 FORMAT Null</query>
+    <query>SELECT sum(number), count(number)              FROM numbers(100000000) GROUP BY intHash32(number) % 1000 FORMAT Null</query>
+    <query>SELECT sum(number), count(number)              FROM numbers(100000000) GROUP BY intHash32(number) % 1000 SETTINGS optimize_fuse_sum_count_avg = 0 FORMAT Null</query>
+    <query>SELECT sum(number), avg(number), count(number) FROM numbers(100000000) GROUP BY intHash32(number) % 1000 FORMAT Null</query>
+    <query>SELECT sum(number), avg(number), count(number) FROM numbers(100000000) GROUP BY intHash32(number) % 1000 SETTINGS optimize_fuse_sum_count_avg = 0 FORMAT Null</query>
+</test>
diff --git a/tests/performance/fuzz_bits.xml b/tests/performance/fuzz_bits.xml
index 2679977cb1d..87064e520c2 100644
--- a/tests/performance/fuzz_bits.xml
+++ b/tests/performance/fuzz_bits.xml
@@ -1,4 +1,4 @@
-<test>
+<test max_ignored_relative_change="0.3">
 
 
 
diff --git a/tests/performance/general_purpose_hashes.xml b/tests/performance/general_purpose_hashes.xml
index bd2fa9674f6..f34554360cf 100644
--- a/tests/performance/general_purpose_hashes.xml
+++ b/tests/performance/general_purpose_hashes.xml
@@ -1,4 +1,4 @@
-<test max_ignored_relative_change="0.2">
+<test>
     <substitutions>
         <substitution>
            <name>gp_hash_func</name>
diff --git a/tests/performance/generate_table_function.xml b/tests/performance/generate_table_function.xml
index bc49a7de1bd..0339a8c19e8 100644
--- a/tests/performance/generate_table_function.xml
+++ b/tests/performance/generate_table_function.xml
@@ -1,4 +1,4 @@
-<test>
+<test max_ignored_relative_change="0.2">
     <query>SELECT sum(NOT ignore(*)) FROM (SELECT * FROM generateRandom('ui64 UInt64, i64 Int64, ui32 UInt32, i32 Int32, ui16 UInt16, i16 Int16, ui8 UInt8, i8 Int8') LIMIT 1000000000);</query>
     <query>SELECT sum(NOT ignore(*)) FROM (SELECT * FROM generateRandom('ui64 UInt64, i64 Int64, ui32 UInt32, i32 Int32, ui16 UInt16, i16 Int16, ui8 UInt8, i8 Int8', 0, 10, 10) LIMIT 1000000000);</query>
     <query>SELECT sum(NOT ignore(*)) FROM (SELECT * FROM generateRandom('i Enum8(\'hello\' = 1, \'world\' = 5)', 0, 10, 10) LIMIT 1000000000);</query>
diff --git a/tests/performance/great_circle_dist.xml b/tests/performance/great_circle_dist.xml
index b5e271ddfa8..ad445f34417 100644
--- a/tests/performance/great_circle_dist.xml
+++ b/tests/performance/great_circle_dist.xml
@@ -2,6 +2,6 @@
     <!-- lon [-180; 180], lat [-90; 90] -->
     <query>SELECT count() FROM numbers(1000000) WHERE NOT ignore(greatCircleDistance((rand(1) % 360) * 1. - 180, (number % 150) * 1.2 - 90, (number % 360) + toFloat64(rand(2)) / 4294967296 - 180, (rand(3) % 180) * 1. - 90))</query>
     <!-- 55.755830, 37.617780 is center of Moscow -->
-    <query>SELECT count() FROM zeros(1000000) WHERE NOT ignore(greatCircleDistance(55. + toFloat64(rand(1)) / 4294967296, 37. + toFloat64(rand(2)) / 4294967296, 55. + toFloat64(rand(3)) / 4294967296, 37. + toFloat64(rand(4)) / 4294967296))</query>
+    <query>SELECT count() FROM zeros(10000000) WHERE NOT ignore(greatCircleDistance(55. + toFloat64(rand(1)) / 4294967296, 37. + toFloat64(rand(2)) / 4294967296, 55. + toFloat64(rand(3)) / 4294967296, 37. + toFloat64(rand(4)) / 4294967296))</query>
 </test>
 
diff --git a/tests/performance/group_by_sundy_li.xml b/tests/performance/group_by_sundy_li.xml
index c49712a8519..aebc305335c 100644
--- a/tests/performance/group_by_sundy_li.xml
+++ b/tests/performance/group_by_sundy_li.xml
@@ -1,4 +1,4 @@
-<test max_ignored_relative_change="0.2">
+<test max_ignored_relative_change="0.4">
     <settings>
         <max_insert_threads>8</max_insert_threads>
     </settings>
diff --git a/tests/performance/hashed_dictionary.xml b/tests/performance/hashed_dictionary.xml
new file mode 100644
index 00000000000..26164b4f888
--- /dev/null
+++ b/tests/performance/hashed_dictionary.xml
@@ -0,0 +1,126 @@
+<test max_ignored_relative_change="0.3">
+    <create_query>
+        CREATE TABLE simple_key_hashed_dictionary_source_table
+        (
+            id UInt64,
+            value_int UInt64,
+            value_string String,
+            value_decimal Decimal64(8),
+            value_string_nullable Nullable(String)
+        ) ENGINE = Memory;
+    </create_query>
+
+    <create_query>
+        CREATE TABLE complex_key_hashed_dictionary_source_table
+        (
+            id UInt64,
+            id_key String,
+            value_int UInt64,
+            value_string String,
+            value_decimal Decimal64(8),
+            value_string_nullable Nullable(String)
+        ) ENGINE = Memory;
+    </create_query>
+
+    <create_query>
+        CREATE DICTIONARY simple_key_hashed_dictionary
+        (
+            id UInt64,
+            value_int UInt64,
+            value_string String,
+            value_decimal Decimal64(8),
+            value_string_nullable Nullable(String)
+        )
+        PRIMARY KEY id
+        SOURCE(CLICKHOUSE(DB 'default' TABLE 'simple_key_hashed_dictionary_source_table'))
+        LAYOUT(HASHED())
+        LIFETIME(MIN 0 MAX 1000);
+    </create_query>
+
+    <create_query>
+        CREATE DICTIONARY complex_key_hashed_dictionary
+        (
+            id UInt64,
+            id_key String,
+            value_int UInt64,
+            value_string String,
+            value_decimal Decimal64(8),
+            value_string_nullable Nullable(String)
+        )
+        PRIMARY KEY id, id_key
+        SOURCE(CLICKHOUSE(DB 'default' TABLE 'complex_key_hashed_dictionary_source_table'))
+        LAYOUT(COMPLEX_KEY_HASHED())
+        LIFETIME(MIN 0 MAX 1000);
+    </create_query>
+
+    <fill_query>
+        INSERT INTO simple_key_hashed_dictionary_source_table
+        SELECT number, number, toString(number), toDecimal64(number, 8), toString(number)
+        FROM system.numbers
+        LIMIT 5000000;
+    </fill_query>
+
+    <fill_query>
+        INSERT INTO complex_key_hashed_dictionary_source_table
+        SELECT number, toString(number), number, toString(number), toDecimal64(number, 8), toString(number)
+        FROM system.numbers
+        LIMIT 5000000;
+    </fill_query>
+
+    <substitutions>
+        <substitution>
+            <name>column_name</name>
+            <values>
+                <value>'value_int'</value>
+                <value>'value_string'</value>
+                <value>'value_decimal'</value>
+                <value>'value_string_nullable'</value>
+            </values>
+        </substitution>
+
+        <substitution>
+            <name>elements_count</name>
+            <values>
+                <value>5000000</value>
+                <value>7500000</value>
+            </values>
+        </substitution>
+    </substitutions>
+
+    <query>
+        WITH rand64() % toUInt64({elements_count}) as key
+        SELECT dictGet('default.simple_key_hashed_dictionary', {column_name}, key)
+        FROM system.numbers
+        LIMIT {elements_count}
+        FORMAT Null;
+    </query>
+    <query>
+        WITH rand64() % toUInt64({elements_count}) as key
+        SELECT dictHas('default.simple_key_hashed_dictionary', key)
+        FROM system.numbers
+        LIMIT {elements_count}
+        FORMAT Null;
+    </query>
+
+    <query>
+        WITH (rand64() % toUInt64({elements_count}), toString(rand64() % toUInt64({elements_count}))) as key
+        SELECT dictGet('default.complex_key_hashed_dictionary', {column_name}, key)
+        FROM system.numbers
+        LIMIT {elements_count}
+        FORMAT Null;
+    </query>
+    <query>
+        WITH (rand64() % toUInt64({elements_count}), toString(rand64() % toUInt64({elements_count}))) as key
+        SELECT dictHas('default.complex_key_hashed_dictionary', key)
+        FROM system.numbers
+        LIMIT {elements_count}
+        FORMAT Null;
+    </query>
+
+    <drop_query>DROP TABLE IF EXISTS simple_key_hashed_dictionary_source_table;</drop_query>
+    <drop_query>DROP TABLE IF EXISTS complex_key_hashed_dictionary_source_table;</drop_query>
+
+    <drop_query>DROP DICTIONARY IF EXISTS simple_key_hashed_dictionary;</drop_query>
+    <drop_query>DROP DICTIONARY IF EXISTS complex_key_hashed_dictionary;</drop_query>
+
+</test>
diff --git a/tests/performance/if_array_string.xml b/tests/performance/if_array_string.xml
index 445b3c8c55a..f1752767e76 100644
--- a/tests/performance/if_array_string.xml
+++ b/tests/performance/if_array_string.xml
@@ -1,8 +1,8 @@
-<test max_ignored_relative_change="0.4">
+<test max_ignored_relative_change="0.3">
     <query>SELECT count() FROM zeros(10000000) WHERE NOT ignore(rand() % 2 ? ['Hello', 'World'] : ['a', 'b', 'c'])</query>
     <query>SELECT count() FROM zeros(10000000) WHERE NOT ignore(rand() % 2 ? materialize(['Hello', 'World']) : ['a', 'b', 'c'])</query>
     <query>SELECT count() FROM zeros(10000000) WHERE NOT ignore(rand() % 2 ? ['Hello', 'World'] : materialize(['a', 'b', 'c']))</query>
     <query>SELECT count() FROM zeros(10000000) WHERE NOT ignore(rand() % 2 ? materialize(['Hello', 'World']) : materialize(['a', 'b', 'c']))</query>
     <query>SELECT count() FROM zeros(10000000) WHERE NOT ignore(rand() % 2 ? materialize(['', '']) : emptyArrayString())</query>
-    <query>SELECT count() FROM zeros(1000000) WHERE NOT ignore(rand() % 2 ? materialize(['https://github.com/ClickHouse/ClickHouse/pull/1070', 'https://www.google.ru/search?newwindow=1&amp;site=&amp;source=hp&amp;q=zookeeper+wire+protocol+exists&amp;oq=zookeeper+wire+protocol+exists&amp;gs_l=psy-ab.3...330.6300.0.6687.33.28.0.0.0.0.386.4838.0j5j9j5.19.0....0...1.1.64.psy-ab..14.17.4448.0..0j35i39k1j0i131k1j0i22i30k1j0i19k1j33i21k1.r_3uFoNOrSU']) : emptyArrayString())</query>
+    <query>SELECT count() FROM zeros(10000000) WHERE NOT ignore(rand() % 2 ? materialize(['https://github.com/ClickHouse/ClickHouse/pull/1070', 'https://www.google.ru/search?newwindow=1&amp;site=&amp;source=hp&amp;q=zookeeper+wire+protocol+exists&amp;oq=zookeeper+wire+protocol+exists&amp;gs_l=psy-ab.3...330.6300.0.6687.33.28.0.0.0.0.386.4838.0j5j9j5.19.0....0...1.1.64.psy-ab..14.17.4448.0..0j35i39k1j0i131k1j0i22i30k1j0i19k1j33i21k1.r_3uFoNOrSU']) : emptyArrayString())</query>
 </test>
diff --git a/tests/performance/intDiv.xml b/tests/performance/intDiv.xml
new file mode 100644
index 00000000000..c6fa0238986
--- /dev/null
+++ b/tests/performance/intDiv.xml
@@ -0,0 +1,5 @@
+<test>
+    <query>SELECT count() FROM numbers(200000000) WHERE NOT ignore(intDiv(number, 1000000000))</query>
+    <query>SELECT count() FROM numbers(200000000) WHERE NOT ignore(divide(number, 1000000000))</query>
+    <query>SELECT count() FROM numbers(200000000) WHERE NOT ignore(toUInt32(divide(number, 1000000000)))</query>
+</test>
diff --git a/tests/performance/int_parsing.xml b/tests/performance/int_parsing.xml
index 3b8620e46c3..32f904331ce 100644
--- a/tests/performance/int_parsing.xml
+++ b/tests/performance/int_parsing.xml
@@ -1,4 +1,4 @@
-<test>
+<test max_ignored_relative_change="0.2">
     <preconditions>
         <table_exists>hits_100m_single</table_exists>
         <table_exists>hits_10m_single</table_exists>
diff --git a/tests/performance/jit_small_requests.xml b/tests/performance/jit_small_requests.xml
index c9abec0926b..d8f917fb9af 100644
--- a/tests/performance/jit_small_requests.xml
+++ b/tests/performance/jit_small_requests.xml
@@ -1,4 +1,4 @@
-<test>
+<test max_ignored_relative_change="0.2">
     <query>
         WITH
             bitXor(number, 0x4CF2D2BAAE6DA887) AS x0,
diff --git a/tests/performance/joins_in_memory.xml b/tests/performance/joins_in_memory.xml
index bac7679930f..158602e28ab 100644
--- a/tests/performance/joins_in_memory.xml
+++ b/tests/performance/joins_in_memory.xml
@@ -1,4 +1,4 @@
-<test>
+<test max_ignored_relative_change="0.2">
     <create_query>CREATE TABLE ints (i64 Int64, i32 Int32, i16 Int16, i8 Int8) ENGINE = Memory</create_query>
 
     <fill_query>INSERT INTO ints SELECT number AS i64, i64 AS i32, i64 AS i16, i64 AS i8 FROM numbers(10000)</fill_query>
@@ -13,12 +13,12 @@
     <query short='1' tag='ANY LEFT IN'>SELECT COUNT() FROM ints l ANY LEFT JOIN ints r USING i64 WHERE i32 IN(42, 10042, 20042, 30042, 40042)</query>
 
     <query tag='INNER'>SELECT COUNT() FROM ints l INNER JOIN ints r USING i64 WHERE i32 = 20042</query>
-    <query tag='INNER KEY'>SELECT COUNT() FROM ints l INNER JOIN ints r USING i64,i32,i16,i8 WHERE i32 = 20042</query>
+    <query tag='INNER KEY'>SELECT COUNT() FROM ints l INNER JOIN ints r USING i64,i32,i16,i8 WHERE i32 = 20042 settings query_plan_filter_push_down = 0</query>
     <query tag='INNER ON'>SELECT COUNT() FROM ints l INNER JOIN ints r ON l.i64 = r.i64 WHERE i32 = 20042</query>
     <query tag='INNER IN'>SELECT COUNT() FROM ints l INNER JOIN ints r USING i64 WHERE i32 IN(42, 10042, 20042, 30042, 40042)</query>
 
     <query tag='LEFT'>SELECT COUNT() FROM ints l LEFT JOIN ints r USING i64 WHERE i32 = 20042</query>
-    <query tag='LEFT KEY'>SELECT COUNT() FROM ints l LEFT JOIN ints r USING i64,i32,i16,i8 WHERE i32 = 20042</query>
+    <query tag='LEFT KEY'>SELECT COUNT() FROM ints l LEFT JOIN ints r USING i64,i32,i16,i8 WHERE i32 = 20042 settings query_plan_filter_push_down = 0</query>
     <query tag='LEFT ON'>SELECT COUNT() FROM ints l LEFT JOIN ints r ON l.i64 = r.i64 WHERE i32 = 20042</query>
     <query tag='LEFT IN'>SELECT COUNT() FROM ints l LEFT JOIN ints r USING i64 WHERE i32 IN(42, 10042, 20042, 30042, 40042)</query>
 
diff --git a/tests/performance/joins_in_memory_pmj.xml b/tests/performance/joins_in_memory_pmj.xml
index 5dd4395513d..d122dba72c3 100644
--- a/tests/performance/joins_in_memory_pmj.xml
+++ b/tests/performance/joins_in_memory_pmj.xml
@@ -1,55 +1,56 @@
-<test max_ignored_relative_change="1.3">
+<test max_ignored_relative_change="0.7">
     <create_query>CREATE TABLE ints (i64 Int64, i32 Int32, i16 Int16, i8 Int8) ENGINE = Memory</create_query>
 
     <settings>
         <join_algorithm>partial_merge</join_algorithm>
+        <query_plan_filter_push_down>0</query_plan_filter_push_down>
     </settings>
 
-    <fill_query>INSERT INTO ints SELECT number AS i64, i64 AS i32, i64 AS i16, i64 AS i8 FROM numbers(10000)</fill_query>
-    <fill_query>INSERT INTO ints SELECT 10000 + number % 1000 AS i64, i64 AS i32, i64 AS i16, i64 AS i8 FROM numbers(10000)</fill_query>
-    <fill_query>INSERT INTO ints SELECT 20000 + number % 100 AS i64, i64 AS i32, i64 AS i16, i64 AS i8 FROM numbers(10000)</fill_query>
-    <fill_query>INSERT INTO ints SELECT 30000 + number % 10 AS i64, i64 AS i32, i64 AS i16, i64 AS i8 FROM numbers(10000)</fill_query>
-    <fill_query>INSERT INTO ints SELECT 40000 + number % 1 AS i64, i64 AS i32, i64 AS i16, i64 AS i8 FROM numbers(10000)</fill_query>
+    <fill_query>INSERT INTO ints SELECT number AS i64, i64 AS i32, i64 AS i16, i64 AS i8 FROM numbers(10000) settings query_plan_filter_push_down = 0</fill_query>
+    <fill_query>INSERT INTO ints SELECT 10000 + number % 1000 AS i64, i64 AS i32, i64 AS i16, i64 AS i8 FROM numbers(10000) settings query_plan_filter_push_down = 0</fill_query>
+    <fill_query>INSERT INTO ints SELECT 20000 + number % 100 AS i64, i64 AS i32, i64 AS i16, i64 AS i8 FROM numbers(10000) settings query_plan_filter_push_down = 0</fill_query>
+    <fill_query>INSERT INTO ints SELECT 30000 + number % 10 AS i64, i64 AS i32, i64 AS i16, i64 AS i8 FROM numbers(10000) settings query_plan_filter_push_down = 0</fill_query>
+    <fill_query>INSERT INTO ints SELECT 40000 + number % 1 AS i64, i64 AS i32, i64 AS i16, i64 AS i8 FROM numbers(10000) settings query_plan_filter_push_down = 0</fill_query>
 
-    <query short='1' tag='ANY LEFT'>SELECT COUNT() FROM ints l ANY LEFT JOIN ints r USING i64 WHERE i32 = 20042</query>
-    <query short='1' tag='ANY LEFT KEY'>SELECT COUNT() FROM ints l ANY LEFT JOIN ints r USING i64,i32,i16,i8 WHERE i32 = 20042</query>
-    <query short='1' tag='ANY LEFT ON'>SELECT COUNT() FROM ints l ANY LEFT JOIN ints r ON l.i64 = r.i64 WHERE i32 = 20042</query>
-    <query short='1' tag='ANY LEFT IN'>SELECT COUNT() FROM ints l ANY LEFT JOIN ints r USING i64 WHERE i32 IN(42, 10042, 20042, 30042, 40042)</query>
+    <query short='1' tag='ANY LEFT'>SELECT COUNT() FROM ints l ANY LEFT JOIN ints r USING i64 WHERE i32 = 20042 settings query_plan_filter_push_down = 0</query>
+    <query short='1' tag='ANY LEFT KEY'>SELECT COUNT() FROM ints l ANY LEFT JOIN ints r USING i64,i32,i16,i8 WHERE i32 = 20042 settings query_plan_filter_push_down = 0</query>
+    <query short='1' tag='ANY LEFT ON'>SELECT COUNT() FROM ints l ANY LEFT JOIN ints r ON l.i64 = r.i64 WHERE i32 = 20042 settings query_plan_filter_push_down = 0</query>
+    <query short='1' tag='ANY LEFT IN'>SELECT COUNT() FROM ints l ANY LEFT JOIN ints r USING i64 WHERE i32 IN(42, 10042, 20042, 30042, 40042) settings query_plan_filter_push_down = 0</query>
 
-    <query tag='INNER'>SELECT COUNT() FROM ints l INNER JOIN ints r USING i64 WHERE i32 = 20042</query>
-    <query tag='INNER KEY'>SELECT COUNT() FROM ints l INNER JOIN ints r USING i64,i32,i16,i8 WHERE i32 = 20042</query>
-    <query tag='INNER ON'>SELECT COUNT() FROM ints l INNER JOIN ints r ON l.i64 = r.i64 WHERE i32 = 20042</query>
-    <query tag='INNER IN'>SELECT COUNT() FROM ints l INNER JOIN ints r USING i64 WHERE i32 IN(42, 10042, 20042, 30042, 40042)</query>
+    <query tag='INNER'>SELECT COUNT() FROM ints l INNER JOIN ints r USING i64 WHERE i32 = 20042 settings query_plan_filter_push_down = 0</query>
+    <query tag='INNER KEY'>SELECT COUNT() FROM ints l INNER JOIN ints r USING i64,i32,i16,i8 WHERE i32 = 20042 settings query_plan_filter_push_down = 0</query>
+    <query tag='INNER ON'>SELECT COUNT() FROM ints l INNER JOIN ints r ON l.i64 = r.i64 WHERE i32 = 20042 settings query_plan_filter_push_down = 0</query>
+    <query tag='INNER IN'>SELECT COUNT() FROM ints l INNER JOIN ints r USING i64 WHERE i32 IN(42, 10042, 20042, 30042, 40042) settings query_plan_filter_push_down = 0</query>
 
-    <query tag='LEFT'>SELECT COUNT() FROM ints l LEFT JOIN ints r USING i64 WHERE i32 = 20042</query>
-    <query tag='LEFT KEY'>SELECT COUNT() FROM ints l LEFT JOIN ints r USING i64,i32,i16,i8 WHERE i32 = 20042</query>
-    <query tag='LEFT ON'>SELECT COUNT() FROM ints l LEFT JOIN ints r ON l.i64 = r.i64 WHERE i32 = 20042</query>
-    <query tag='LEFT IN'>SELECT COUNT() FROM ints l LEFT JOIN ints r USING i64 WHERE i32 IN(42, 10042, 20042, 30042, 40042)</query>
+    <query tag='LEFT'>SELECT COUNT() FROM ints l LEFT JOIN ints r USING i64 WHERE i32 = 20042 settings query_plan_filter_push_down = 0</query>
+    <query tag='LEFT KEY'>SELECT COUNT() FROM ints l LEFT JOIN ints r USING i64,i32,i16,i8 WHERE i32 = 20042 settings query_plan_filter_push_down = 0</query>
+    <query tag='LEFT ON'>SELECT COUNT() FROM ints l LEFT JOIN ints r ON l.i64 = r.i64 WHERE i32 = 20042 settings query_plan_filter_push_down = 0</query>
+    <query tag='LEFT IN'>SELECT COUNT() FROM ints l LEFT JOIN ints r USING i64 WHERE i32 IN(42, 10042, 20042, 30042, 40042) settings query_plan_filter_push_down = 0</query>
 
-    <query short='1' tag='ANY LEFT (noopt)'>SELECT COUNT() FROM ints l ANY LEFT JOIN ints r USING i64 WHERE i32 = 20042 SETTINGS partial_merge_join_optimizations = 0</query>
-    <query short='1' tag='ANY LEFT KEY (noopt)'>SELECT COUNT() FROM ints l ANY LEFT JOIN ints r USING i64,i32,i16,i8 WHERE i32 = 20042 SETTINGS partial_merge_join_optimizations = 0</query>
-    <query short='1' tag='ANY LEFT ON (noopt)'>SELECT COUNT() FROM ints l ANY LEFT JOIN ints r ON l.i64 = r.i64 WHERE i32 = 20042 SETTINGS partial_merge_join_optimizations = 0</query>
-    <query short='1' tag='ANY LEFT IN (noopt)'>SELECT COUNT() FROM ints l ANY LEFT JOIN ints r USING i64 WHERE i32 IN(42, 10042, 20042, 30042, 40042) SETTINGS partial_merge_join_optimizations = 0</query>
+    <query short='1' tag='ANY LEFT (noopt)'>SELECT COUNT() FROM ints l ANY LEFT JOIN ints r USING i64 WHERE i32 = 20042 SETTINGS partial_merge_join_optimizations = 0, query_plan_filter_push_down = 0</query>
+    <query short='1' tag='ANY LEFT KEY (noopt)'>SELECT COUNT() FROM ints l ANY LEFT JOIN ints r USING i64,i32,i16,i8 WHERE i32 = 20042 SETTINGS partial_merge_join_optimizations = 0, query_plan_filter_push_down = 0</query>
+    <query short='1' tag='ANY LEFT ON (noopt)'>SELECT COUNT() FROM ints l ANY LEFT JOIN ints r ON l.i64 = r.i64 WHERE i32 = 20042 SETTINGS partial_merge_join_optimizations = 0, query_plan_filter_push_down = 0</query>
+    <query short='1' tag='ANY LEFT IN (noopt)'>SELECT COUNT() FROM ints l ANY LEFT JOIN ints r USING i64 WHERE i32 IN(42, 10042, 20042, 30042, 40042) SETTINGS partial_merge_join_optimizations = 0, query_plan_filter_push_down = 0</query>
 
-    <query tag='INNER (noopt)'>SELECT COUNT() FROM ints l INNER JOIN ints r USING i64 WHERE i32 = 20042 SETTINGS partial_merge_join_optimizations = 0</query>
-    <query tag='INNER KEY (noopt)'>SELECT COUNT() FROM ints l INNER JOIN ints r USING i64,i32,i16,i8 WHERE i32 = 20042 SETTINGS partial_merge_join_optimizations = 0</query>
-    <query tag='INNER ON (noopt)'>SELECT COUNT() FROM ints l INNER JOIN ints r ON l.i64 = r.i64 WHERE i32 = 20042 SETTINGS partial_merge_join_optimizations = 0</query>
-    <query tag='INNER IN (noopt)'>SELECT COUNT() FROM ints l INNER JOIN ints r USING i64 WHERE i32 IN(42, 10042, 20042, 30042, 40042) SETTINGS partial_merge_join_optimizations = 0</query>
+    <query tag='INNER (noopt)'>SELECT COUNT() FROM ints l INNER JOIN ints r USING i64 WHERE i32 = 20042 SETTINGS partial_merge_join_optimizations = 0, query_plan_filter_push_down = 0</query>
+    <query tag='INNER KEY (noopt)'>SELECT COUNT() FROM ints l INNER JOIN ints r USING i64,i32,i16,i8 WHERE i32 = 20042 SETTINGS partial_merge_join_optimizations = 0, query_plan_filter_push_down = 0</query>
+    <query tag='INNER ON (noopt)'>SELECT COUNT() FROM ints l INNER JOIN ints r ON l.i64 = r.i64 WHERE i32 = 20042 SETTINGS partial_merge_join_optimizations = 0, query_plan_filter_push_down = 0</query>
+    <query tag='INNER IN (noopt)'>SELECT COUNT() FROM ints l INNER JOIN ints r USING i64 WHERE i32 IN(42, 10042, 20042, 30042, 40042) SETTINGS partial_merge_join_optimizations = 0, query_plan_filter_push_down = 0</query>
 
-    <query tag='LEFT (noopt)'>SELECT COUNT() FROM ints l LEFT JOIN ints r USING i64 WHERE i32 = 20042 SETTINGS partial_merge_join_optimizations = 0</query>
-    <query tag='LEFT KEY (noopt)'>SELECT COUNT() FROM ints l LEFT JOIN ints r USING i64,i32,i16,i8 WHERE i32 = 20042 SETTINGS partial_merge_join_optimizations = 0</query>
-    <query tag='LEFT ON (noopt)'>SELECT COUNT() FROM ints l LEFT JOIN ints r ON l.i64 = r.i64 WHERE i32 = 20042 SETTINGS partial_merge_join_optimizations = 0</query>
-    <query tag='LEFT IN (noopt)'>SELECT COUNT() FROM ints l LEFT JOIN ints r USING i64 WHERE i32 IN(42, 10042, 20042, 30042, 40042) SETTINGS partial_merge_join_optimizations = 0</query>
+    <query tag='LEFT (noopt)'>SELECT COUNT() FROM ints l LEFT JOIN ints r USING i64 WHERE i32 = 20042 SETTINGS partial_merge_join_optimizations = 0, query_plan_filter_push_down = 0</query>
+    <query tag='LEFT KEY (noopt)'>SELECT COUNT() FROM ints l LEFT JOIN ints r USING i64,i32,i16,i8 WHERE i32 = 20042 SETTINGS partial_merge_join_optimizations = 0, query_plan_filter_push_down = 0</query>
+    <query tag='LEFT ON (noopt)'>SELECT COUNT() FROM ints l LEFT JOIN ints r ON l.i64 = r.i64 WHERE i32 = 20042 SETTINGS partial_merge_join_optimizations = 0, query_plan_filter_push_down = 0</query>
+    <query tag='LEFT IN (noopt)'>SELECT COUNT() FROM ints l LEFT JOIN ints r USING i64 WHERE i32 IN(42, 10042, 20042, 30042, 40042) SETTINGS partial_merge_join_optimizations = 0, query_plan_filter_push_down = 0</query>
 
-    <query tag='RIGHT'>SELECT COUNT() FROM ints l RIGHT JOIN ints r USING i64 WHERE i32 = 20042</query>
-    <query tag='RIGHT KEY'>SELECT COUNT() FROM ints l RIGHT JOIN ints r USING i64,i32,i16,i8 WHERE i32 = 20042</query>
-    <query tag='RIGHT ON'>SELECT COUNT() FROM ints l RIGHT JOIN ints r ON l.i64 = r.i64 WHERE i32 = 20042</query>
-    <query tag='RIGHT IN'>SELECT COUNT() FROM ints l RIGHT JOIN ints r USING i64 WHERE i32 IN(42, 10042, 20042, 30042, 40042)</query>
+    <query tag='RIGHT'>SELECT COUNT() FROM ints l RIGHT JOIN ints r USING i64 WHERE i32 = 20042 settings query_plan_filter_push_down = 0</query>
+    <query tag='RIGHT KEY'>SELECT COUNT() FROM ints l RIGHT JOIN ints r USING i64,i32,i16,i8 WHERE i32 = 20042 settings query_plan_filter_push_down = 0</query>
+    <query tag='RIGHT ON'>SELECT COUNT() FROM ints l RIGHT JOIN ints r ON l.i64 = r.i64 WHERE i32 = 20042 settings query_plan_filter_push_down = 0</query>
+    <query tag='RIGHT IN'>SELECT COUNT() FROM ints l RIGHT JOIN ints r USING i64 WHERE i32 IN(42, 10042, 20042, 30042, 40042) settings query_plan_filter_push_down = 0</query>
 
-    <query tag='FULL'>SELECT COUNT() FROM ints l FULL JOIN ints r USING i64 WHERE i32 = 20042</query>
-    <query tag='FULL KEY'>SELECT COUNT() FROM ints l FULL JOIN ints r USING i64,i32,i16,i8 WHERE i32 = 20042</query>
-    <query tag='FULL ON'>SELECT COUNT() FROM ints l FULL JOIN ints r ON l.i64 = r.i64 WHERE i32 = 20042</query>
-    <query tag='FULL IN'>SELECT COUNT() FROM ints l FULL JOIN ints r USING i64 WHERE i32 IN(42, 10042, 20042, 30042, 40042)</query>
+    <query tag='FULL'>SELECT COUNT() FROM ints l FULL JOIN ints r USING i64 WHERE i32 = 20042 settings query_plan_filter_push_down = 0</query>
+    <query tag='FULL KEY'>SELECT COUNT() FROM ints l FULL JOIN ints r USING i64,i32,i16,i8 WHERE i32 = 20042 settings query_plan_filter_push_down = 0</query>
+    <query tag='FULL ON'>SELECT COUNT() FROM ints l FULL JOIN ints r ON l.i64 = r.i64 WHERE i32 = 20042 settings query_plan_filter_push_down = 0</query>
+    <query tag='FULL IN'>SELECT COUNT() FROM ints l FULL JOIN ints r USING i64 WHERE i32 IN(42, 10042, 20042, 30042, 40042) settings query_plan_filter_push_down = 0</query>
 
     <drop_query>DROP TABLE IF EXISTS ints</drop_query>
 </test>
diff --git a/tests/performance/json_extract_simdjson.xml b/tests/performance/json_extract_simdjson.xml
index f9f6df5140e..9ec3613d5e8 100644
--- a/tests/performance/json_extract_simdjson.xml
+++ b/tests/performance/json_extract_simdjson.xml
@@ -1,7 +1,4 @@
 <test>
-
-
-
     <substitutions>
         <substitution>
            <name>json</name>
@@ -21,19 +18,19 @@
         <allow_simdjson>1</allow_simdjson>
     </settings>
 
-    <query>SELECT 'simdjson-1', count() FROM zeros(1000000) WHERE NOT ignore(JSONExtractString(materialize({json}), 'sparam'))</query>
-    <query>SELECT 'simdjson-2', count() FROM zeros(1000000) WHERE NOT ignore(JSONExtractString(materialize({json}), 'sparam', 'nested_1'))</query>
-    <query>SELECT 'simdjson-3', count() FROM zeros(1000000) WHERE NOT ignore(JSONExtractInt(materialize({json}), 'nparam'))</query>
-    <query>SELECT 'simdjson-4', count() FROM zeros(1000000) WHERE NOT ignore(JSONExtractUInt(materialize({json}), 'nparam'))</query>
-    <query>SELECT 'simdjson-5', count() FROM zeros(1000000) WHERE NOT ignore(JSONExtractFloat(materialize({json}), 'fparam'))</query>
+    <query>SELECT 'simdjson-1',  count() FROM zeros(5000000) WHERE NOT ignore(JSONExtractString(materialize({json}), 'sparam'))</query>
+    <query>SELECT 'simdjson-2',  count() FROM zeros(5000000) WHERE NOT ignore(JSONExtractString(materialize({json}), 'sparam', 'nested_1'))</query>
+    <query>SELECT 'simdjson-3',  count() FROM zeros(5000000) WHERE NOT ignore(JSONExtractInt(materialize({json}), 'nparam'))</query>
+    <query>SELECT 'simdjson-4',  count() FROM zeros(5000000) WHERE NOT ignore(JSONExtractUInt(materialize({json}), 'nparam'))</query>
+    <query>SELECT 'simdjson-5',  count() FROM zeros(5000000) WHERE NOT ignore(JSONExtractFloat(materialize({json}), 'fparam'))</query>
 
-    <query>SELECT 'simdjson-6', count() FROM zeros(1000000) WHERE NOT ignore(JSONExtractString(materialize({long_json}), 'sparam'))</query>
-    <query>SELECT 'simdjson-7', count() FROM zeros(1000000) WHERE NOT ignore(JSONExtractString(materialize({long_json}), 'sparam', 'nested_1'))</query>
-    <query>SELECT 'simdjson-8', count() FROM zeros(1000000) WHERE NOT ignore(JSONExtractInt(materialize({long_json}), 'nparam'))</query>
-    <query>SELECT 'simdjson-9', count() FROM zeros(1000000) WHERE NOT ignore(JSONExtractUInt(materialize({long_json}), 'nparam'))</query>
-    <query>SELECT 'simdjson-10', count() FROM zeros(1000000) WHERE NOT ignore(JSONExtractRaw(materialize({long_json}), 'fparam'))</query>
-    <query>SELECT 'simdjson-11', count() FROM zeros(1000000) WHERE NOT ignore(JSONExtractFloat(materialize({long_json}), 'fparam'))</query>
-    <query>SELECT 'simdjson-12', count() FROM zeros(1000000) WHERE NOT ignore(JSONExtractFloat(materialize({long_json}), 'fparam', 'nested_2', -2))</query>
-    <query>SELECT 'simdjson-13', count() FROM zeros(1000000) WHERE NOT ignore(JSONExtractBool(materialize({long_json}), 'bparam'))</query>
+    <query>SELECT 'simdjson-6',  count() FROM zeros(5000000) WHERE NOT ignore(JSONExtractString(materialize({long_json}), 'sparam'))</query>
+    <query>SELECT 'simdjson-7',  count() FROM zeros(5000000) WHERE NOT ignore(JSONExtractString(materialize({long_json}), 'sparam', 'nested_1'))</query>
+    <query>SELECT 'simdjson-8',  count() FROM zeros(5000000) WHERE NOT ignore(JSONExtractInt(materialize({long_json}), 'nparam'))</query>
+    <query>SELECT 'simdjson-9',  count() FROM zeros(5000000) WHERE NOT ignore(JSONExtractUInt(materialize({long_json}), 'nparam'))</query>
+    <query>SELECT 'simdjson-10', count() FROM zeros(3000000) WHERE NOT ignore(JSONExtractRaw(materialize({long_json}), 'fparam'))</query>
+    <query>SELECT 'simdjson-11', count() FROM zeros(5000000) WHERE NOT ignore(JSONExtractFloat(materialize({long_json}), 'fparam'))</query>
+    <query>SELECT 'simdjson-12', count() FROM zeros(5000000) WHERE NOT ignore(JSONExtractFloat(materialize({long_json}), 'fparam', 'nested_2', -2))</query>
+    <query>SELECT 'simdjson-13', count() FROM zeros(5000000) WHERE NOT ignore(JSONExtractBool(materialize({long_json}), 'bparam'))</query>
 
 </test>
diff --git a/tests/performance/logical_functions_medium.xml b/tests/performance/logical_functions_medium.xml
index be474894b54..19572191532 100644
--- a/tests/performance/logical_functions_medium.xml
+++ b/tests/performance/logical_functions_medium.xml
@@ -1,4 +1,4 @@
-<test>
+<test max_ignored_relative_change="0.2">
     <settings>
         <max_threads>1</max_threads>
     </settings>
diff --git a/tests/performance/logical_functions_small.xml b/tests/performance/logical_functions_small.xml
index 3d70ef6811d..d5f6a7b99cb 100644
--- a/tests/performance/logical_functions_small.xml
+++ b/tests/performance/logical_functions_small.xml
@@ -1,4 +1,4 @@
-<test>
+<test max_ignored_relative_change="0.2">
     <settings>
         <max_threads>1</max_threads>
     </settings>
diff --git a/tests/performance/math.xml b/tests/performance/math.xml
index 006e33548c9..35250351683 100644
--- a/tests/performance/math.xml
+++ b/tests/performance/math.xml
@@ -1,4 +1,4 @@
-<test>
+<test max_ignored_relative_change="0.3">
     <substitutions>
         <substitution>
            <name>func_slow</name>
diff --git a/tests/performance/mmap_io.xml b/tests/performance/mmap_io.xml
new file mode 100644
index 00000000000..b8f3f6e69dd
--- /dev/null
+++ b/tests/performance/mmap_io.xml
@@ -0,0 +1,17 @@
+<test>
+    <preconditions>
+        <table_exists>hits_10m_single</table_exists>
+    </preconditions>
+
+    <settings>
+        <min_bytes_to_use_mmap_io>1</min_bytes_to_use_mmap_io>
+    </settings>
+
+    <create_query>CREATE TABLE hits_none (WatchID UInt64 CODEC(NONE)) ENGINE = MergeTree ORDER BY tuple()</create_query>
+    <fill_query>INSERT INTO hits_none SELECT WatchID FROM test.hits</fill_query>
+    <fill_query>OPTIMIZE TABLE hits_none FINAL</fill_query>
+
+    <query short="1"><![CDATA[SELECT sum(WatchID) FROM hits_none]]></query>
+
+    <drop_query>DROP TABLE hits_none</drop_query>
+</test>
diff --git a/tests/performance/modulo.xml b/tests/performance/modulo.xml
index 77b544ff389..7c33855ff32 100644
--- a/tests/performance/modulo.xml
+++ b/tests/performance/modulo.xml
@@ -1,7 +1,4 @@
 <test>
-
-
-
     <query>SELECT number % 128 FROM numbers(300000000) FORMAT Null</query>
     <query>SELECT number % 255 FROM numbers(300000000) FORMAT Null</query>
     <query>SELECT number % 256 FROM numbers(300000000) FORMAT Null</query>
diff --git a/tests/performance/optimized_select_final.xml b/tests/performance/optimized_select_final.xml
index 2c8254d2b88..d70fccc1330 100644
--- a/tests/performance/optimized_select_final.xml
+++ b/tests/performance/optimized_select_final.xml
@@ -1,4 +1,4 @@
-<test max_ignored_relative_change="0.2">
+<test max_ignored_relative_change="0.3">
     <settings>
         <do_not_merge_across_partitions_select_final>1</do_not_merge_across_partitions_select_final>
     </settings>
diff --git a/tests/performance/optimized_select_final_one_part.xml b/tests/performance/optimized_select_final_one_part.xml
index 92c8eed859a..63541313ac9 100644
--- a/tests/performance/optimized_select_final_one_part.xml
+++ b/tests/performance/optimized_select_final_one_part.xml
@@ -1,4 +1,4 @@
-<test max_ignored_relative_change="0.2">
+<test>
     <settings>
         <do_not_merge_across_partitions_select_final>1</do_not_merge_across_partitions_select_final>
     </settings>
diff --git a/tests/performance/or_null_default.xml b/tests/performance/or_null_default.xml
index 6fed0cce4d6..009719f66a5 100644
--- a/tests/performance/or_null_default.xml
+++ b/tests/performance/or_null_default.xml
@@ -1,4 +1,4 @@
-<test max_ignored_relative_change="0.3">
+<test>
     <query>SELECT sumOrNull(number) FROM numbers(100000000)</query>
     <query>SELECT sumOrDefault(toNullable(number)) FROM numbers(100000000)</query>
     <query>SELECT sumOrNull(number) FROM numbers(10000000) GROUP BY number % 1024</query>
diff --git a/tests/performance/order_by_decimals.xml b/tests/performance/order_by_decimals.xml
index 4889137865d..20b860f0a2d 100644
--- a/tests/performance/order_by_decimals.xml
+++ b/tests/performance/order_by_decimals.xml
@@ -4,13 +4,10 @@
         <tag>comparison</tag>
     </tags>
 
+    <query>SELECT toInt32(number)          AS n FROM numbers(10000000) ORDER BY n DESC FORMAT Null</query>
+    <query>SELECT toDecimal32(number, 0)   AS n FROM numbers(10000000) ORDER BY n      FORMAT Null</query>
 
-
-    <query>SELECT toInt32(number) AS n FROM numbers(1000000) ORDER BY n DESC FORMAT Null</query>
-    <query>SELECT toDecimal32(number, 0) AS n FROM numbers(1000000) ORDER BY n FORMAT Null</query>
-
-    <query>SELECT toDecimal32(number, 0) AS n FROM numbers(1000000) ORDER BY n DESC FORMAT Null</query>
-    <query>SELECT toDecimal64(number, 8) AS n FROM numbers(1000000) ORDER BY n DESC FORMAT Null</query>
-    <query>SELECT toDecimal128(number, 10) AS n FROM numbers(1000000) ORDER BY n DESC FORMAT Null</query>
-
+    <query>SELECT toDecimal32(number, 0)   AS n FROM numbers(10000000) ORDER BY n DESC FORMAT Null</query>
+    <query>SELECT toDecimal64(number, 8)   AS n FROM numbers(10000000) ORDER BY n DESC FORMAT Null</query>
+    <query>SELECT toDecimal128(number, 10) AS n FROM numbers(10000000) ORDER BY n DESC FORMAT Null</query>
 </test>
diff --git a/tests/performance/order_by_read_in_order.xml b/tests/performance/order_by_read_in_order.xml
index b91cd14baf4..cdbf477c335 100644
--- a/tests/performance/order_by_read_in_order.xml
+++ b/tests/performance/order_by_read_in_order.xml
@@ -3,10 +3,11 @@
         <table_exists>hits_100m_single</table_exists>
     </preconditions>
 
-<query>SELECT * FROM hits_100m_single ORDER BY CounterID, EventDate LIMIT 1000</query>
-<query>SELECT * FROM hits_100m_single ORDER BY CounterID DESC, toStartOfWeek(EventDate) DESC LIMIT 100</query>
+<!-- Some queries are almost instantaneous index lookups, so we mark them as short. -->
+<query short="1">SELECT * FROM hits_100m_single ORDER BY CounterID, EventDate LIMIT 100</query>
+<query short="1">SELECT * FROM hits_100m_single ORDER BY CounterID DESC, toStartOfWeek(EventDate) DESC LIMIT 100</query>
 <query>SELECT * FROM hits_100m_single ORDER BY CounterID, EventDate, URL LIMIT 100</query>
-<query>SELECT * FROM hits_100m_single WHERE CounterID IN (152220, 168777, 149234, 149234) ORDER BY CounterID DESC, EventDate DESC LIMIT 100</query>
+<query short="1">SELECT * FROM hits_100m_single WHERE CounterID IN (152220, 168777, 149234, 149234) ORDER BY CounterID DESC, EventDate DESC LIMIT 100</query>
 <query>SELECT * FROM hits_100m_single WHERE UserID=1988954671305023629 ORDER BY CounterID, EventDate LIMIT 100</query>
 
 </test>
diff --git a/tests/performance/parse_engine_file.xml b/tests/performance/parse_engine_file.xml
index 2459ed084cd..d0226c3bb68 100644
--- a/tests/performance/parse_engine_file.xml
+++ b/tests/performance/parse_engine_file.xml
@@ -1,4 +1,4 @@
-<test max_ignored_relative_change="0.4">
+<test max_ignored_relative_change="0.2">
 
 <preconditions>
     <table_exists>test.hits</table_exists>
@@ -30,7 +30,7 @@
 
 <fill_query>INSERT INTO table_{format} SELECT * FROM test.hits LIMIT 100000</fill_query>
 
-<query>SELECT * FROM table_{format} FORMAT Null</query>
+<query short="'{format}' == 'Native'">SELECT * FROM table_{format} FORMAT Null</query>
 
 <drop_query>DROP TABLE IF EXISTS table_{format}</drop_query>
 
diff --git a/tests/performance/point_in_polygon.xml b/tests/performance/point_in_polygon.xml
index 403c2d62cba..31c24eb006f 100644
--- a/tests/performance/point_in_polygon.xml
+++ b/tests/performance/point_in_polygon.xml
@@ -1,5 +1,9 @@
 <test>
     <settings>
+        <!--
+            Not sure why it's needed. Maybe it has something to do with the
+            resulting block size of Memory table.
+         -->
         <optimize_trivial_insert_select>0</optimize_trivial_insert_select>
     </settings>
 
@@ -8,7 +12,8 @@
         INSERT INTO polygons
         WITH number + 1 AS radius
         SELECT [arrayMap(x -> (cos(x / 90. * pi()) * radius, sin(x / 90. * pi()) * radius), range(180))]
-        FROM numbers(1000000)
+        FROM numbers_mt(5000000)
+        SETTINGS max_insert_threads = 2, max_memory_usage = 30000000000
     </create_query>
 
     <query>SELECT pointInPolygon((100, 100), polygon) FROM polygons FORMAT Null</query>
diff --git a/tests/performance/prewhere_with_row_level_filter.xml b/tests/performance/prewhere_with_row_level_filter.xml
new file mode 100644
index 00000000000..9448fdcb408
--- /dev/null
+++ b/tests/performance/prewhere_with_row_level_filter.xml
@@ -0,0 +1,20 @@
+<test>
+    <settings>
+        <optimize_move_to_prewhere>0</optimize_move_to_prewhere>
+    </settings>
+
+    <create_query>DROP TABLE IF EXISTS test_prl</create_query>
+    <create_query>CREATE TABLE test_prl (n UInt64) ENGINE MergeTree ORDER BY n</create_query>
+    <create_query>CREATE ROW POLICY OR REPLACE test_prl_policy ON test_prl AS PERMISSIVE FOR SELECT USING n % 7 TO ALL</create_query>
+
+    <fill_query>INSERT INTO test_prl SELECT number FROM numbers(100000000) SETTINGS max_insert_threads=8</fill_query>
+
+    <query>SELECT sum(n) FROM test_prl</query>
+    <query>SELECT sum(n) FROM test_prl WHERE n % 3 AND n % 5</query>
+    <query>SELECT sum(n) FROM test_prl PREWHERE n % 3 AND n % 5</query>
+    <query>SELECT sum(n) FROM test_prl PREWHERE n % 3 WHERE n % 5</query>
+    <query>SELECT sum(n) FROM test_prl PREWHERE n % 5 WHERE n % 3</query>
+
+    <drop_query>DROP ROW POLICY IF EXISTS test_prl_policy ON test_prl</drop_query>
+    <drop_query>DROP TABLE IF EXISTS test_prl</drop_query>
+</test>
diff --git a/tests/performance/questdb_sum_int32.xml b/tests/performance/questdb_sum_int32.xml
index ae13210107e..613ef3dc058 100644
--- a/tests/performance/questdb_sum_int32.xml
+++ b/tests/performance/questdb_sum_int32.xml
@@ -25,7 +25,8 @@
     </substitutions>
 
     <create_query>CREATE TABLE `zz_{type}_{engine}` (x {type}) ENGINE {engine}</create_query>
-    <fill_query>INSERT INTO `zz_{type}_{engine}` SELECT rand() FROM numbers(1000000000)</fill_query>
+    <fill_query>INSERT INTO `zz_{type}_{engine}` SELECT rand() FROM numbers_mt(1000000000) SETTINGS max_insert_threads = 8</fill_query>
+    <fill_query>OPTIMIZE TABLE `zz_{type}_MergeTree ORDER BY tuple()` FINAL</fill_query>
 
     <query>SELECT sum(x) FROM `zz_{type}_{engine}`</query>
 
diff --git a/tests/performance/random_string.xml b/tests/performance/random_string.xml
index 1a740ae077a..79f12373f1c 100644
--- a/tests/performance/random_string.xml
+++ b/tests/performance/random_string.xml
@@ -1,4 +1,4 @@
-<test>
+<test max_ignored_relative_change="0.2">
     <query>SELECT count() FROM zeros(100000000) WHERE NOT ignore(randomString(10))</query>
     <query>SELECT count() FROM zeros(100000000) WHERE NOT ignore(randomString(100))</query>
     <query>SELECT count() FROM zeros(1000000) WHERE NOT ignore(randomString(1000))</query>
diff --git a/tests/performance/subqueries.xml b/tests/performance/subqueries.xml
new file mode 100644
index 00000000000..0d41099841b
--- /dev/null
+++ b/tests/performance/subqueries.xml
@@ -0,0 +1,7 @@
+<test>
+    <create_query>create table tab (a UInt32, b UInt32) engine = MergeTree order by (a, b)</create_query>
+    <fill_query>insert into tab values (1, 1)</fill_query>
+    <query>select a, b from tab where (a, b) in (select toUInt32(number) as x, toUInt32(sleep(0.1) + 1) from numbers_mt(16)) settings max_threads = 2, max_block_size = 4</query>
+    <query>select a, b from tab where (1, 1) = (select min(toUInt32(number + 1)) as x, min(toUInt32(sleep(0.1) + 1)) from numbers_mt(16)) settings max_threads = 2, max_block_size = 4</query>
+    <drop_query>DROP TABLE tab</drop_query>
+</test>
diff --git a/tests/performance/sum.xml b/tests/performance/sum.xml
index 32c194dab6f..9bee2a580c3 100644
--- a/tests/performance/sum.xml
+++ b/tests/performance/sum.xml
@@ -1,4 +1,4 @@
-<test max_ignored_relative_change="0.2">
+<test>
     <query>SELECT sum(number) FROM numbers(100000000)</query>
     <query>SELECT sum(toUInt32(number)) FROM numbers(100000000)</query>
     <query>SELECT sum(toUInt16(number)) FROM numbers(100000000)</query>
diff --git a/tests/performance/sum_map.xml b/tests/performance/sum_map.xml
index bc9f9be2a18..b732c150220 100644
--- a/tests/performance/sum_map.xml
+++ b/tests/performance/sum_map.xml
@@ -1,4 +1,4 @@
-<test>
+<test max_ignored_relative_change="0.3">
     <settings>
         <max_threads>1</max_threads>
     </settings>
diff --git a/tests/performance/synthetic_hardware_benchmark.xml b/tests/performance/synthetic_hardware_benchmark.xml
index 4b94f73a21d..ffcf30db5cb 100644
--- a/tests/performance/synthetic_hardware_benchmark.xml
+++ b/tests/performance/synthetic_hardware_benchmark.xml
@@ -1,4 +1,4 @@
-<test max_ignored_relative_change="0.2">
+<test max_ignored_relative_change="0.3">
     <settings>
         <max_memory_usage>30000000000</max_memory_usage>
     </settings>
diff --git a/tests/performance/url_hits.xml b/tests/performance/url_hits.xml
index a699ef6ba97..1813b2a72cb 100644
--- a/tests/performance/url_hits.xml
+++ b/tests/performance/url_hits.xml
@@ -1,4 +1,4 @@
-<test>
+<test max_ignored_relative_change="0.2">
     <preconditions>
         <table_exists>hits_100m_single</table_exists>
         <table_exists>hits_10m_single</table_exists>
diff --git a/tests/performance/visit_param_extract_raw.xml b/tests/performance/visit_param_extract_raw.xml
index 67faeb1f743..358dcc9cc0e 100644
--- a/tests/performance/visit_param_extract_raw.xml
+++ b/tests/performance/visit_param_extract_raw.xml
@@ -1,4 +1,4 @@
-<test max_ignored_relative_change="0.2">
+<test max_ignored_relative_change="0.3">
     <substitutions>
         <substitution>
            <name>param</name>
diff --git a/tests/performance/window_functions.xml b/tests/performance/window_functions.xml
index 622e349d060..6be3d59e2b0 100644
--- a/tests/performance/window_functions.xml
+++ b/tests/performance/window_functions.xml
@@ -110,4 +110,46 @@
         format Null
     </query>
 
+    <!-- Our variant of lead. -->
+    <query>
+        select leadInFrame(number) over w
+        from
+            (select number, intDiv(number, 1111) p, mod(number, 111) o
+                from numbers(10000000)) t
+        window w as (partition by p order by o
+            rows between unbounded preceding and unbounded following)
+        format Null
+    </query>
+
+    <!-- A faster replacement for lead with constant offset. -->
+    <query>
+        select any(number) over w
+        from
+            (select number, intDiv(number, 1111) p, mod(number, 111) o
+                from numbers(10000000)) t
+        window w as (partition by p order by o
+            rows between 1 following and 1 following)
+        format Null
+    </query>
+
+    <query>
+        select leadInFrame(number, number) over w
+        from
+            (select number, intDiv(number, 1111) p, mod(number, 111) o
+                from numbers(10000000)) t
+        window w as (partition by p order by o
+            rows between unbounded preceding and unbounded following)
+        format Null
+    </query>
+
+    <query>
+        select leadInFrame(number, number, number) over w
+        from
+            (select number, intDiv(number, 1111) p, mod(number, 111) o
+                from numbers(10000000)) t
+        window w as (partition by p order by o
+            rows between unbounded preceding and unbounded following)
+        format Null
+    </query>
+
 </test>
diff --git a/tests/queries/0_stateless/00029_test_zookeeper_optimize_exception.sh b/tests/queries/0_stateless/00029_test_zookeeper_optimize_exception.sh
index 86f1d1f161c..3360b8da83d 100755
--- a/tests/queries/0_stateless/00029_test_zookeeper_optimize_exception.sh
+++ b/tests/queries/0_stateless/00029_test_zookeeper_optimize_exception.sh
@@ -4,12 +4,11 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CUR_DIR"/../shell_config.sh
 
-
 ${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS test_optimize_exception"
 ${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS test_optimize_exception_replicated"
 
 ${CLICKHOUSE_CLIENT} --query="CREATE TABLE test_optimize_exception (date Date) ENGINE=MergeTree() PARTITION BY toYYYYMM(date) ORDER BY date"
-${CLICKHOUSE_CLIENT} --query="CREATE TABLE test_optimize_exception_replicated (date Date) ENGINE=ReplicatedMergeTree('/clickhouse/tables/test_00029/optimize', 'r1') PARTITION BY toYYYYMM(date) ORDER BY date"
+${CLICKHOUSE_CLIENT} --query="CREATE TABLE test_optimize_exception_replicated (date Date) ENGINE=ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/optimize', 'r1') PARTITION BY toYYYYMM(date) ORDER BY date"
 
 ${CLICKHOUSE_CLIENT} --query="INSERT INTO test_optimize_exception VALUES (toDate('2017-09-09')), (toDate('2017-09-10'))"
 ${CLICKHOUSE_CLIENT} --query="INSERT INTO test_optimize_exception VALUES (toDate('2017-09-09')), (toDate('2017-09-10'))"
diff --git a/tests/queries/0_stateless/00120_join_and_group_by.reference b/tests/queries/0_stateless/00120_join_and_group_by.reference
index 417dbb5b661..9b3afb80a8d 100644
--- a/tests/queries/0_stateless/00120_join_and_group_by.reference
+++ b/tests/queries/0_stateless/00120_join_and_group_by.reference
@@ -1,11 +1,11 @@
 0
+4416930539393268817	1241149650	9
+4761183170873013810	4249604106	0
 7766709361750702608	3902320246	4
+9624464864560415994	1298551497	3
 10577349846663553072	1343103100	1
 11700034558374135620	1618865725	8
-18198135717204167749	1996614413	2
-4761183170873013810	4249604106	0
 12742043333840853032	1295823179	6
-9624464864560415994	1298551497	3
-4416930539393268817	1241149650	9
-15228578409069794350	2641603337	5
 13365811232860260488	3844986530	7
+15228578409069794350	2641603337	5
+18198135717204167749	1996614413	2
diff --git a/tests/queries/0_stateless/00120_join_and_group_by.sql b/tests/queries/0_stateless/00120_join_and_group_by.sql
index 21168443ee4..005e25a7127 100644
--- a/tests/queries/0_stateless/00120_join_and_group_by.sql
+++ b/tests/queries/0_stateless/00120_join_and_group_by.sql
@@ -3,4 +3,4 @@ SELECT value FROM system.one ANY LEFT JOIN (SELECT dummy, dummy AS value) js2 US
 SELECT value1, value2, sum(number)
 FROM (SELECT number, intHash64(number) AS value1 FROM system.numbers LIMIT 10) js1
 ANY LEFT JOIN (SELECT number, intHash32(number) AS value2 FROM system.numbers LIMIT 10) js2
-USING number GROUP BY value1, value2;
+USING number GROUP BY value1, value2 ORDER BY value1, value2;
diff --git a/tests/queries/0_stateless/00189_time_zones.reference b/tests/queries/0_stateless/00189_time_zones_long.reference
similarity index 97%
rename from tests/queries/0_stateless/00189_time_zones.reference
rename to tests/queries/0_stateless/00189_time_zones_long.reference
index 664c30056de..df42e8f1b6e 100644
--- a/tests/queries/0_stateless/00189_time_zones.reference
+++ b/tests/queries/0_stateless/00189_time_zones_long.reference
@@ -148,9 +148,9 @@ toStartOfInterval
 2019-02-05 00:00:00
 2019-02-03 00:00:00
 2019-02-06 22:00:00
-2019-02-06 21:00:00
-2019-02-06 21:00:00
-2019-02-06 03:00:00
+2019-02-06 22:00:00
+2019-02-06 18:00:00
+2019-02-06 00:00:00
 2019-02-06 22:57:00
 2019-02-06 22:56:00
 2019-02-06 22:55:00
@@ -179,13 +179,13 @@ toRelativeYearNum
 44
 44
 44
-44
+45
 toRelativeMonthNum
 536
 536
 536
 537
-536
+537
 toRelativeWeekNum
 2335
 2335
@@ -197,12 +197,13 @@ toRelativeDayNum
 16343
 16343
 16344
-16343
+16344
 toRelativeHourNum
 392251
 392251
 392251
 392251
+392252
 toRelativeMinuteNum
 23535110
 23535110
diff --git a/tests/queries/0_stateless/00189_time_zones.sql b/tests/queries/0_stateless/00189_time_zones_long.sql
similarity index 98%
rename from tests/queries/0_stateless/00189_time_zones.sql
rename to tests/queries/0_stateless/00189_time_zones_long.sql
index a0ef5b59517..36c7dfb402a 100644
--- a/tests/queries/0_stateless/00189_time_zones.sql
+++ b/tests/queries/0_stateless/00189_time_zones_long.sql
@@ -277,7 +277,8 @@ SELECT toRelativeDayNum(toDateTime(1412106600), 'Europe/Moscow') - toRelativeDay
 SELECT toRelativeDayNum(toDateTime(1412106600), 'Europe/Paris') - toRelativeDayNum(toDateTime(0), 'Europe/Paris');
 SELECT toRelativeDayNum(toDateTime(1412106600), 'Europe/London') - toRelativeDayNum(toDateTime(0), 'Europe/London');
 SELECT toRelativeDayNum(toDateTime(1412106600), 'Asia/Tokyo') - toRelativeDayNum(toDateTime(0), 'Asia/Tokyo');
-SELECT toRelativeDayNum(toDateTime(1412106600), 'Pacific/Pitcairn') - toRelativeDayNum(toDateTime(0), 'Pacific/Pitcairn');
+-- NOTE: toRelativeDayNum(toDateTime(0), 'Pacific/Pitcairn') overflows from -1 to 65535
+SELECT toUInt16(toRelativeDayNum(toDateTime(1412106600), 'Pacific/Pitcairn') - toRelativeDayNum(toDateTime(0), 'Pacific/Pitcairn'));
 
 /* toRelativeHourNum */
 
@@ -286,7 +287,7 @@ SELECT toRelativeHourNum(toDateTime(1412106600), 'Europe/Moscow') - toRelativeHo
 SELECT toRelativeHourNum(toDateTime(1412106600), 'Europe/Paris') - toRelativeHourNum(toDateTime(0), 'Europe/Paris');
 SELECT toRelativeHourNum(toDateTime(1412106600), 'Europe/London') - toRelativeHourNum(toDateTime(0), 'Europe/London');
 SELECT toRelativeHourNum(toDateTime(1412106600), 'Asia/Tokyo') - toRelativeHourNum(toDateTime(0), 'Asia/Tokyo');
--- known wrong result: SELECT toRelativeHourNum(toDateTime(1412106600), 'Pacific/Pitcairn') - toRelativeHourNum(toDateTime(0), 'Pacific/Pitcairn');
+SELECT toRelativeHourNum(toDateTime(1412106600), 'Pacific/Pitcairn') - toRelativeHourNum(toDateTime(0), 'Pacific/Pitcairn');
 
 /* toRelativeMinuteNum */
 
diff --git a/tests/queries/0_stateless/00205_scalar_subqueries.sql b/tests/queries/0_stateless/00205_scalar_subqueries.sql
index 14244377e5f..03bcd0a3ebc 100644
--- a/tests/queries/0_stateless/00205_scalar_subqueries.sql
+++ b/tests/queries/0_stateless/00205_scalar_subqueries.sql
@@ -7,3 +7,4 @@ SELECT (SELECT toDate('2015-01-02'), 'Hello');
 SELECT (SELECT toDate('2015-01-02'), 'Hello') AS x, x, identity((SELECT 1)), identity((SELECT 1) AS y);
 -- SELECT (SELECT uniqState(''));
 
+ SELECT ( SELECT throwIf(1 + dummy) );  -- { serverError 395 }
diff --git a/tests/queries/0_stateless/00206_empty_array_to_single.sql b/tests/queries/0_stateless/00206_empty_array_to_single.sql
index 9724aa3fda7..0e3ff4f3537 100644
--- a/tests/queries/0_stateless/00206_empty_array_to_single.sql
+++ b/tests/queries/0_stateless/00206_empty_array_to_single.sql
@@ -1,5 +1,5 @@
 SELECT emptyArrayToSingle(arrayFilter(x -> x != 99, arrayJoin([[1, 2], [99], [4, 5, 6]])));
-SELECT emptyArrayToSingle(emptyArrayString()), emptyArrayToSingle(emptyArrayDate()), emptyArrayToSingle(emptyArrayDateTime());
+SELECT emptyArrayToSingle(emptyArrayString()), emptyArrayToSingle(emptyArrayDate()), emptyArrayToSingle(arrayFilter(x -> 0, [now('Europe/Moscow')]));
 
 SELECT
     emptyArrayToSingle(range(number % 3)),
diff --git a/tests/queries/0_stateless/00212_shard_aggregate_function_uniq.reference b/tests/queries/0_stateless/00212_long_shard_aggregate_function_uniq.reference
similarity index 100%
rename from tests/queries/0_stateless/00212_shard_aggregate_function_uniq.reference
rename to tests/queries/0_stateless/00212_long_shard_aggregate_function_uniq.reference
index 63686e2e352..33a2bb5437f 100644
--- a/tests/queries/0_stateless/00212_shard_aggregate_function_uniq.reference
+++ b/tests/queries/0_stateless/00212_long_shard_aggregate_function_uniq.reference
@@ -52,110 +52,110 @@ uniqHLL12
 35	54328
 36	52997
 uniqHLL12 round(float)
-0.125	1
-0.5	1
-0.05	1
-0.143	1
-0.056	1
-0.048	2
-0.083	1
-0.25	1
-0.1	1
-0.028	1
 0.027	1
+0.028	1
 0.031	1
-0.067	1
 0.037	1
-0.045	161
-0.125	160
-0.5	164
-0.05	164
-0.143	162
-0.091	81
-0.056	163
-0.048	159
-0.083	158
-0.25	165
-1	159
-0.1	164
-0.028	160
+0.048	2
+0.05	1
+0.056	1
+0.067	1
+0.083	1
+0.1	1
+0.125	1
+0.143	1
+0.25	1
+0.5	1
 0.027	161
+0.028	160
 0.031	164
-0.067	160
-0.043	159
 0.037	160
+0.043	159
+0.045	161
+0.048	159
+0.05	164
+0.056	163
+0.067	160
 0.071	161
+0.083	158
+0.091	81
+0.1	164
+0.125	160
+0.143	162
+0.25	165
+0.5	164
+1	159
+0.027	52997
+0.028	54328
+0.031	54151
+0.037	53394
+0.043	54620
 0.045	54268
-0.125	54011
-0.5	55013
-0.05	55115
-0.143	52353
-0.091	26870
-0.056	55227
 0.048	54370
+0.05	55115
+0.056	55227
+0.067	53396
+0.071	53951
 0.083	54554
+0.091	26870
+0.1	54138
+0.125	54011
+0.143	52353
 0.25	52912
+0.5	55013
 1	54571
-0.1	54138
-0.028	54328
-0.027	52997
-0.031	54151
-0.067	53396
-0.043	54620
-0.037	53394
-0.071	53951
 uniqHLL12 round(toFloat32())
-0.5	1
-0.05	1
-0.25	1
-0.048	2
-0.083	1
-0.125	1
-0.031	1
-0.143	1
-0.028	1
-0.067	1
 0.027	1
-0.056	1
+0.028	1
+0.031	1
 0.037	1
+0.048	2
+0.05	1
+0.056	1
+0.067	1
+0.083	1
 0.1	1
-0.5	164
-0.05	164
-0.25	165
-0.048	159
-0.091	81
+0.125	1
+0.143	1
+0.25	1
+0.5	1
+0.027	161
+0.028	160
+0.031	164
+0.037	160
 0.043	159
+0.045	161
+0.048	159
+0.05	164
+0.056	163
+0.067	160
 0.071	161
 0.083	158
-0.125	160
-0.031	164
-0.143	162
-0.028	160
-0.067	160
-0.045	161
-0.027	161
-0.056	163
-0.037	160
+0.091	81
 0.1	164
+0.125	160
+0.143	162
+0.25	165
+0.5	164
 1	159
-0.5	55013
-0.05	55115
-0.25	52912
-0.048	54370
-0.091	26870
+0.027	52997
+0.028	54328
+0.031	54151
+0.037	53394
 0.043	54620
+0.045	54268
+0.048	54370
+0.05	55115
+0.056	55227
+0.067	53396
 0.071	53951
 0.083	54554
-0.125	54011
-0.031	54151
-0.143	52353
-0.028	54328
-0.067	53396
-0.045	54268
-0.027	52997
-0.056	55227
-0.037	53394
+0.091	26870
 0.1	54138
+0.125	54011
+0.143	52353
+0.25	52912
+0.5	55013
 1	54571
 uniqHLL12 IPv4NumToString
 1	1
@@ -425,428 +425,428 @@ uniqCombined(20)
 35	54054
 36	54054
 uniqCombined(round(float))
-0.125	1
-0.5	1
-0.05	1
-0.143	1
-0.056	1
-0.048	2
-0.083	1
-0.25	1
-0.1	1
-0.028	1
 0.027	1
+0.028	1
 0.031	1
-0.067	1
 0.037	1
-0.045	162
-0.125	163
-0.5	162
-0.05	162
-0.143	162
-0.091	81
-0.056	162
-0.048	162
-0.083	163
-0.25	162
-1	162
-0.1	163
-0.028	162
+0.048	2
+0.05	1
+0.056	1
+0.067	1
+0.083	1
+0.1	1
+0.125	1
+0.143	1
+0.25	1
+0.5	1
 0.027	162
+0.028	162
 0.031	162
-0.067	162
-0.043	162
 0.037	162
+0.043	162
+0.045	162
+0.048	162
+0.05	162
+0.056	162
+0.067	162
 0.071	162
-0.045	54117
-0.125	54213
-0.5	54056
-0.05	53923
-0.143	54129
-0.091	26975
-0.056	54129
-0.048	53958
-0.083	54064
-0.25	53999
-1	53901
-0.1	53853
-0.028	53931
+0.083	163
+0.091	81
+0.1	163
+0.125	163
+0.143	162
+0.25	162
+0.5	162
+1	162
 0.027	53982
+0.028	53931
 0.031	53948
-0.067	53997
-0.043	54150
 0.037	54047
+0.043	54150
+0.045	54117
+0.048	53958
+0.05	53923
+0.056	54129
+0.067	53997
 0.071	53963
+0.083	54064
+0.091	26975
+0.1	53853
+0.125	54213
+0.143	54129
+0.25	53999
+0.5	54056
+1	53901
 uniqCombined(12)(round(float))
-0.125	1
-0.5	1
-0.05	1
-0.143	1
-0.056	1
-0.048	2
-0.083	1
-0.25	1
-0.1	1
-0.028	1
 0.027	1
+0.028	1
 0.031	1
-0.067	1
 0.037	1
-0.045	162
-0.125	163
-0.5	162
-0.05	162
-0.143	162
-0.091	81
-0.056	162
-0.048	162
-0.083	163
-0.25	162
-1	162
-0.1	163
-0.028	162
+0.048	2
+0.05	1
+0.056	1
+0.067	1
+0.083	1
+0.1	1
+0.125	1
+0.143	1
+0.25	1
+0.5	1
 0.027	162
+0.028	162
 0.031	162
-0.067	162
-0.043	162
 0.037	162
+0.043	162
+0.045	162
+0.048	162
+0.05	162
+0.056	162
+0.067	162
 0.071	162
-0.045	53928
-0.125	52275
-0.5	53721
-0.05	54123
-0.143	54532
-0.091	26931
-0.056	55120
-0.048	53293
-0.083	54428
-0.25	53226
-1	54708
-0.1	53417
-0.028	54635
+0.083	163
+0.091	81
+0.1	163
+0.125	163
+0.143	162
+0.25	162
+0.5	162
+1	162
 0.027	53155
+0.028	54635
 0.031	53763
-0.067	53188
-0.043	53827
 0.037	53920
+0.043	53827
+0.045	53928
+0.048	53293
+0.05	54123
+0.056	55120
+0.067	53188
 0.071	53409
+0.083	54428
+0.091	26931
+0.1	53417
+0.125	52275
+0.143	54532
+0.25	53226
+0.5	53721
+1	54708
 uniqCombined(17)(round(float))
-0.125	1
-0.5	1
-0.05	1
-0.143	1
-0.056	1
-0.048	2
-0.083	1
-0.25	1
-0.1	1
-0.028	1
 0.027	1
+0.028	1
 0.031	1
-0.067	1
 0.037	1
-0.045	162
-0.125	163
-0.5	162
-0.05	162
-0.143	162
-0.091	81
-0.056	162
-0.048	162
-0.083	163
-0.25	162
-1	162
-0.1	163
-0.028	162
+0.048	2
+0.05	1
+0.056	1
+0.067	1
+0.083	1
+0.1	1
+0.125	1
+0.143	1
+0.25	1
+0.5	1
 0.027	162
+0.028	162
 0.031	162
-0.067	162
-0.043	162
 0.037	162
+0.043	162
+0.045	162
+0.048	162
+0.05	162
+0.056	162
+0.067	162
 0.071	162
+0.083	163
+0.091	81
+0.1	163
+0.125	163
+0.143	162
+0.25	162
+0.5	162
+1	162
+0.027	53982
+0.028	53931
+0.031	53948
+0.037	54047
+0.043	54150
 0.045	54117
-0.125	54213
-0.5	54056
-0.05	53923
-0.143	54129
-0.091	26975
-0.056	54129
 0.048	53958
+0.05	53923
+0.056	54129
+0.067	53997
+0.071	53963
 0.083	54064
+0.091	26975
+0.1	53853
+0.125	54213
+0.143	54129
 0.25	53999
+0.5	54056
 1	53901
-0.1	53853
-0.028	53931
-0.027	53982
-0.031	53948
-0.067	53997
-0.043	54150
-0.037	54047
-0.071	53963
 uniqCombined(20)(round(float))
-0.125	1
-0.5	1
-0.05	1
-0.143	1
-0.056	1
-0.048	2
-0.083	1
-0.25	1
-0.1	1
-0.028	1
 0.027	1
+0.028	1
 0.031	1
-0.067	1
 0.037	1
-0.045	162
-0.125	163
-0.5	162
-0.05	162
-0.143	162
-0.091	81
-0.056	162
-0.048	162
-0.083	163
-0.25	162
-1	162
-0.1	163
-0.028	162
+0.048	2
+0.05	1
+0.056	1
+0.067	1
+0.083	1
+0.1	1
+0.125	1
+0.143	1
+0.25	1
+0.5	1
 0.027	162
+0.028	162
 0.031	162
-0.067	162
-0.043	162
 0.037	162
+0.043	162
+0.045	162
+0.048	162
+0.05	162
+0.056	162
+0.067	162
 0.071	162
-0.045	54054
-0.125	54053
-0.5	54054
-0.05	54053
-0.143	54054
-0.091	27027
-0.056	54054
-0.048	54053
-0.083	54055
-0.25	54054
-1	54054
-0.1	54053
-0.028	54054
+0.083	163
+0.091	81
+0.1	163
+0.125	163
+0.143	162
+0.25	162
+0.5	162
+1	162
 0.027	54054
+0.028	54054
 0.031	54054
-0.067	54054
-0.043	54053
 0.037	54053
+0.043	54053
+0.045	54054
+0.048	54053
+0.05	54053
+0.056	54054
+0.067	54054
 0.071	54054
+0.083	54055
+0.091	27027
+0.1	54053
+0.125	54053
+0.143	54054
+0.25	54054
+0.5	54054
+1	54054
 uniqCombined(X)(round(toFloat32()))
-0.5	1
-0.05	1
-0.25	1
-0.048	2
-0.083	1
-0.125	1
-0.031	1
-0.143	1
-0.028	1
-0.067	1
 0.027	1
-0.056	1
+0.028	1
+0.031	1
 0.037	1
+0.048	2
+0.05	1
+0.056	1
+0.067	1
+0.083	1
 0.1	1
-0.5	162
-0.05	162
-0.25	162
-0.048	162
-0.091	81
+0.125	1
+0.143	1
+0.25	1
+0.5	1
+0.027	162
+0.028	162
+0.031	162
+0.037	162
 0.043	162
+0.045	162
+0.048	162
+0.05	162
+0.056	162
+0.067	162
 0.071	162
 0.083	163
-0.125	163
-0.031	162
-0.143	162
-0.028	162
-0.067	162
-0.045	162
-0.027	162
-0.056	162
-0.037	162
+0.091	81
 0.1	163
+0.125	163
+0.143	162
+0.25	162
+0.5	162
 1	162
-0.5	54056
-0.05	53923
-0.25	53999
-0.048	53958
-0.091	26975
+0.027	53982
+0.028	53931
+0.031	53948
+0.037	54047
 0.043	54150
+0.045	54117
+0.048	53958
+0.05	53923
+0.056	54129
+0.067	53997
 0.071	53963
 0.083	54064
-0.125	54213
-0.031	53948
-0.143	54129
-0.028	53931
-0.067	53997
-0.045	54117
-0.027	53982
-0.056	54129
-0.037	54047
+0.091	26975
 0.1	53853
+0.125	54213
+0.143	54129
+0.25	53999
+0.5	54056
 1	53901
 uniqCombined(12)(round(toFloat32()))
-0.5	1
-0.05	1
-0.25	1
-0.048	2
-0.083	1
-0.125	1
-0.031	1
-0.143	1
-0.028	1
-0.067	1
 0.027	1
-0.056	1
+0.028	1
+0.031	1
 0.037	1
+0.048	2
+0.05	1
+0.056	1
+0.067	1
+0.083	1
 0.1	1
-0.5	162
-0.05	162
-0.25	162
-0.048	162
-0.091	81
+0.125	1
+0.143	1
+0.25	1
+0.5	1
+0.027	162
+0.028	162
+0.031	162
+0.037	162
 0.043	162
+0.045	162
+0.048	162
+0.05	162
+0.056	162
+0.067	162
 0.071	162
 0.083	163
-0.125	163
-0.031	162
-0.143	162
-0.028	162
-0.067	162
-0.045	162
-0.027	162
-0.056	162
-0.037	162
+0.091	81
 0.1	163
+0.125	163
+0.143	162
+0.25	162
+0.5	162
 1	162
-0.5	53721
-0.05	54123
-0.25	53226
-0.048	53293
-0.091	26931
+0.027	53155
+0.028	54635
+0.031	53763
+0.037	53920
 0.043	53827
+0.045	53928
+0.048	53293
+0.05	54123
+0.056	55120
+0.067	53188
 0.071	53409
 0.083	54428
-0.125	52275
-0.031	53763
-0.143	54532
-0.028	54635
-0.067	53188
-0.045	53928
-0.027	53155
-0.056	55120
-0.037	53920
+0.091	26931
 0.1	53417
+0.125	52275
+0.143	54532
+0.25	53226
+0.5	53721
 1	54708
 uniqCombined(17)(round(toFloat32()))
-0.5	1
-0.05	1
-0.25	1
-0.048	2
-0.083	1
-0.125	1
-0.031	1
-0.143	1
-0.028	1
-0.067	1
 0.027	1
-0.056	1
+0.028	1
+0.031	1
 0.037	1
+0.048	2
+0.05	1
+0.056	1
+0.067	1
+0.083	1
 0.1	1
-0.5	162
-0.05	162
-0.25	162
-0.048	162
-0.091	81
+0.125	1
+0.143	1
+0.25	1
+0.5	1
+0.027	162
+0.028	162
+0.031	162
+0.037	162
 0.043	162
+0.045	162
+0.048	162
+0.05	162
+0.056	162
+0.067	162
 0.071	162
 0.083	163
-0.125	163
-0.031	162
-0.143	162
-0.028	162
-0.067	162
-0.045	162
-0.027	162
-0.056	162
-0.037	162
+0.091	81
 0.1	163
+0.125	163
+0.143	162
+0.25	162
+0.5	162
 1	162
-0.5	54056
-0.05	53923
-0.25	53999
-0.048	53958
-0.091	26975
+0.027	53982
+0.028	53931
+0.031	53948
+0.037	54047
 0.043	54150
+0.045	54117
+0.048	53958
+0.05	53923
+0.056	54129
+0.067	53997
 0.071	53963
 0.083	54064
-0.125	54213
-0.031	53948
-0.143	54129
-0.028	53931
-0.067	53997
-0.045	54117
-0.027	53982
-0.056	54129
-0.037	54047
+0.091	26975
 0.1	53853
+0.125	54213
+0.143	54129
+0.25	53999
+0.5	54056
 1	53901
 uniqCombined(20)(round(toFloat32()))
-0.5	1
-0.05	1
-0.25	1
-0.048	2
-0.083	1
-0.125	1
-0.031	1
-0.143	1
-0.028	1
-0.067	1
 0.027	1
-0.056	1
+0.028	1
+0.031	1
 0.037	1
+0.048	2
+0.05	1
+0.056	1
+0.067	1
+0.083	1
 0.1	1
-0.5	162
-0.05	162
-0.25	162
-0.048	162
-0.091	81
+0.125	1
+0.143	1
+0.25	1
+0.5	1
+0.027	162
+0.028	162
+0.031	162
+0.037	162
 0.043	162
+0.045	162
+0.048	162
+0.05	162
+0.056	162
+0.067	162
 0.071	162
 0.083	163
-0.125	163
-0.031	162
-0.143	162
-0.028	162
-0.067	162
-0.045	162
-0.027	162
-0.056	162
-0.037	162
+0.091	81
 0.1	163
+0.125	163
+0.143	162
+0.25	162
+0.5	162
 1	162
-0.5	54054
-0.05	54053
-0.25	54054
-0.048	54053
-0.091	27027
+0.027	54054
+0.028	54054
+0.031	54054
+0.037	54053
 0.043	54053
+0.045	54054
+0.048	54053
+0.05	54053
+0.056	54054
+0.067	54054
 0.071	54054
 0.083	54055
-0.125	54053
-0.031	54054
-0.143	54054
-0.028	54054
-0.067	54054
-0.045	54054
-0.027	54054
-0.056	54054
-0.037	54053
+0.091	27027
 0.1	54053
+0.125	54053
+0.143	54054
+0.25	54054
+0.5	54054
 1	54054
 uniqCombined(Z)(IPv4NumToString)
 1	1
diff --git a/tests/queries/0_stateless/00212_shard_aggregate_function_uniq.sql b/tests/queries/0_stateless/00212_long_shard_aggregate_function_uniq.sql
similarity index 75%
rename from tests/queries/0_stateless/00212_shard_aggregate_function_uniq.sql
rename to tests/queries/0_stateless/00212_long_shard_aggregate_function_uniq.sql
index afef71ae06d..f1b3c82fec3 100644
--- a/tests/queries/0_stateless/00212_shard_aggregate_function_uniq.sql
+++ b/tests/queries/0_stateless/00212_long_shard_aggregate_function_uniq.sql
@@ -2,27 +2,27 @@
 
 SELECT 'uniqHLL12';
 
-SELECT Y, uniqHLL12(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 15) GROUP BY Y;
-SELECT Y, uniqHLL12(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 3000) GROUP BY Y;
-SELECT Y, uniqHLL12(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y;
+SELECT Y, uniqHLL12(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 15) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqHLL12(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 3000) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqHLL12(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y ORDER BY Y;
 
 SELECT 'uniqHLL12 round(float)';
 
-SELECT Y, uniqHLL12(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 15) GROUP BY Y;
-SELECT Y, uniqHLL12(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 3000) GROUP BY Y;
-SELECT Y, uniqHLL12(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y;
+SELECT Y, uniqHLL12(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 15) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqHLL12(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 3000) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqHLL12(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y ORDER BY Y;
 
 SELECT 'uniqHLL12 round(toFloat32())';
 
-SELECT Y, uniqHLL12(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 15) GROUP BY Y;
-SELECT Y, uniqHLL12(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 3000) GROUP BY Y;
-SELECT Y, uniqHLL12(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y;
+SELECT Y, uniqHLL12(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 15) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqHLL12(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 3000) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqHLL12(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y ORDER BY Y;
 
 SELECT 'uniqHLL12 IPv4NumToString';
 
-SELECT Y, uniqHLL12(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 15) GROUP BY Y;
-SELECT Y, uniqHLL12(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 3000) GROUP BY Y;
-SELECT Y, uniqHLL12(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y;
+SELECT Y, uniqHLL12(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 15) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqHLL12(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 3000) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqHLL12(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y ORDER BY Y;
 
 SELECT 'uniqHLL12 remote()';
 
@@ -32,99 +32,99 @@ SELECT uniqHLL12(dummy) FROM remote('127.0.0.{2,3}', system.one);
 
 SELECT 'uniqCombined';
 
-SELECT Y, uniqCombined(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 15) GROUP BY Y;
-SELECT Y, uniqCombined(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 3000) GROUP BY Y;
-SELECT Y, uniqCombined(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y;
+SELECT Y, uniqCombined(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 15) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 3000) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y ORDER BY Y;
 
 SELECT 'uniqCombined(12)';
 
-SELECT Y, uniqCombined(12)(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 15) GROUP BY Y;
-SELECT Y, uniqCombined(12)(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 3000) GROUP BY Y;
-SELECT Y, uniqCombined(12)(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y;
+SELECT Y, uniqCombined(12)(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 15) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(12)(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 3000) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(12)(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y ORDER BY Y;
 
 SELECT 'uniqCombined(17)';
 
-SELECT Y, uniqCombined(17)(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 15) GROUP BY Y;
-SELECT Y, uniqCombined(17)(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 3000) GROUP BY Y;
-SELECT Y, uniqCombined(17)(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y;
+SELECT Y, uniqCombined(17)(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 15) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(17)(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 3000) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(17)(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y ORDER BY Y;
 
 SELECT 'uniqCombined(20)';
 
-SELECT Y, uniqCombined(20)(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 15) GROUP BY Y;
-SELECT Y, uniqCombined(20)(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 3000) GROUP BY Y;
-SELECT Y, uniqCombined(20)(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y;
+SELECT Y, uniqCombined(20)(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 15) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(20)(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 3000) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(20)(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y ORDER BY Y;
 
 SELECT 'uniqCombined(round(float))';
 
-SELECT Y, uniqCombined(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 15) GROUP BY Y;
-SELECT Y, uniqCombined(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 3000) GROUP BY Y;
-SELECT Y, uniqCombined(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y;
+SELECT Y, uniqCombined(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 15) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 3000) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y ORDER BY Y;
 
 SELECT 'uniqCombined(12)(round(float))';
 
-SELECT Y, uniqCombined(12)(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 15) GROUP BY Y;
-SELECT Y, uniqCombined(12)(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 3000) GROUP BY Y;
-SELECT Y, uniqCombined(12)(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y;
+SELECT Y, uniqCombined(12)(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 15) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(12)(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 3000) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(12)(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y ORDER BY Y;
 
 SELECT 'uniqCombined(17)(round(float))';
 
-SELECT Y, uniqCombined(17)(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 15) GROUP BY Y;
-SELECT Y, uniqCombined(17)(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 3000) GROUP BY Y;
-SELECT Y, uniqCombined(17)(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y;
+SELECT Y, uniqCombined(17)(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 15) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(17)(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 3000) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(17)(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y ORDER BY Y;
 
 SELECT 'uniqCombined(20)(round(float))';
 
-SELECT Y, uniqCombined(20)(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 15) GROUP BY Y;
-SELECT Y, uniqCombined(20)(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 3000) GROUP BY Y;
-SELECT Y, uniqCombined(20)(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y;
+SELECT Y, uniqCombined(20)(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 15) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(20)(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 3000) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(20)(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y ORDER BY Y;
 
 SELECT 'uniqCombined(X)(round(toFloat32()))';
 
-SELECT Y, uniqCombined(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 15) GROUP BY Y;
-SELECT Y, uniqCombined(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 3000) GROUP BY Y;
-SELECT Y, uniqCombined(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y;
+SELECT Y, uniqCombined(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 15) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 3000) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y ORDER BY Y;
 
 SELECT 'uniqCombined(12)(round(toFloat32()))';
 
-SELECT Y, uniqCombined(12)(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 15) GROUP BY Y;
-SELECT Y, uniqCombined(12)(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 3000) GROUP BY Y;
-SELECT Y, uniqCombined(12)(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y;
+SELECT Y, uniqCombined(12)(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 15) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(12)(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 3000) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(12)(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y ORDER BY Y;
 
 SELECT 'uniqCombined(17)(round(toFloat32()))';
 
-SELECT Y, uniqCombined(17)(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 15) GROUP BY Y;
-SELECT Y, uniqCombined(17)(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 3000) GROUP BY Y;
-SELECT Y, uniqCombined(17)(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y;
+SELECT Y, uniqCombined(17)(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 15) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(17)(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 3000) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(17)(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y ORDER BY Y;
 
 SELECT 'uniqCombined(20)(round(toFloat32()))';
 
-SELECT Y, uniqCombined(20)(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 15) GROUP BY Y;
-SELECT Y, uniqCombined(20)(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 3000) GROUP BY Y;
-SELECT Y, uniqCombined(20)(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y;
+SELECT Y, uniqCombined(20)(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 15) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(20)(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 3000) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(20)(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y ORDER BY Y;
 
 SELECT 'uniqCombined(Z)(IPv4NumToString)';
 
-SELECT Y, uniqCombined(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 15) GROUP BY Y;
-SELECT Y, uniqCombined(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 3000) GROUP BY Y;
-SELECT Y, uniqCombined(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y;
+SELECT Y, uniqCombined(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 15) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 3000) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y ORDER BY Y;
 
 SELECT 'uniqCombined(12)(IPv4NumToString)';
 
-SELECT Y, uniqCombined(12)(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 15) GROUP BY Y;
-SELECT Y, uniqCombined(12)(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 3000) GROUP BY Y;
-SELECT Y, uniqCombined(12)(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y;
+SELECT Y, uniqCombined(12)(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 15) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(12)(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 3000) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(12)(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y ORDER BY Y;
 
 SELECT 'uniqCombined(17)(IPv4NumToString)';
 
-SELECT Y, uniqCombined(17)(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 15) GROUP BY Y;
-SELECT Y, uniqCombined(17)(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 3000) GROUP BY Y;
-SELECT Y, uniqCombined(17)(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y;
+SELECT Y, uniqCombined(17)(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 15) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(17)(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 3000) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(17)(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y ORDER BY Y;
 
 SELECT 'uniqCombined(20)(IPv4NumToString)';
 
-SELECT Y, uniqCombined(20)(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 15) GROUP BY Y;
-SELECT Y, uniqCombined(20)(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 3000) GROUP BY Y;
-SELECT Y, uniqCombined(20)(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y;
+SELECT Y, uniqCombined(20)(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 15) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(20)(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 3000) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(20)(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y ORDER BY Y;
 
 SELECT 'uniqCombined remote()';
 
diff --git a/tests/queries/0_stateless/00232_format_readable_size.reference b/tests/queries/0_stateless/00232_format_readable_size.reference
index 0f723e968d9..b9b9b467b50 100644
--- a/tests/queries/0_stateless/00232_format_readable_size.reference
+++ b/tests/queries/0_stateless/00232_format_readable_size.reference
@@ -20,51 +20,51 @@
 170.21 MiB	170.21 MiB	170.21 MiB
 462.69 MiB	462.69 MiB	462.69 MiB
 1.23 GiB	1.23 GiB	1.23 GiB
-3.34 GiB	3.34 GiB	-2.00 GiB
-9.08 GiB	9.08 GiB	-2.00 GiB
-24.67 GiB	24.67 GiB	-2.00 GiB
-67.06 GiB	67.06 GiB	-2.00 GiB
-182.29 GiB	182.29 GiB	-2.00 GiB
-495.51 GiB	495.51 GiB	-2.00 GiB
-1.32 TiB	1.32 TiB	-2.00 GiB
-3.58 TiB	3.58 TiB	-2.00 GiB
-9.72 TiB	9.72 TiB	-2.00 GiB
-26.42 TiB	26.42 TiB	-2.00 GiB
-71.82 TiB	71.82 TiB	-2.00 GiB
-195.22 TiB	195.22 TiB	-2.00 GiB
-530.66 TiB	530.66 TiB	-2.00 GiB
-1.41 PiB	1.41 PiB	-2.00 GiB
-3.83 PiB	3.83 PiB	-2.00 GiB
-10.41 PiB	10.41 PiB	-2.00 GiB
-28.29 PiB	28.29 PiB	-2.00 GiB
-76.91 PiB	76.91 PiB	-2.00 GiB
-209.06 PiB	209.06 PiB	-2.00 GiB
-568.30 PiB	568.30 PiB	-2.00 GiB
-1.51 EiB	1.51 EiB	-2.00 GiB
-4.10 EiB	4.10 EiB	-2.00 GiB
-11.15 EiB	11.15 EiB	-2.00 GiB
-30.30 EiB	0.00 B	-2.00 GiB
-82.37 EiB	0.00 B	-2.00 GiB
-223.89 EiB	0.00 B	-2.00 GiB
-608.60 EiB	0.00 B	-2.00 GiB
-1.62 ZiB	0.00 B	-2.00 GiB
-4.39 ZiB	0.00 B	-2.00 GiB
-11.94 ZiB	0.00 B	-2.00 GiB
-32.45 ZiB	0.00 B	-2.00 GiB
-88.21 ZiB	0.00 B	-2.00 GiB
-239.77 ZiB	0.00 B	-2.00 GiB
-651.77 ZiB	0.00 B	-2.00 GiB
-1.73 YiB	0.00 B	-2.00 GiB
-4.70 YiB	0.00 B	-2.00 GiB
-12.78 YiB	0.00 B	-2.00 GiB
-34.75 YiB	0.00 B	-2.00 GiB
-94.46 YiB	0.00 B	-2.00 GiB
-256.78 YiB	0.00 B	-2.00 GiB
-698.00 YiB	0.00 B	-2.00 GiB
-1897.37 YiB	0.00 B	-2.00 GiB
-5157.59 YiB	0.00 B	-2.00 GiB
-14019.80 YiB	0.00 B	-2.00 GiB
-38109.75 YiB	0.00 B	-2.00 GiB
-103593.05 YiB	0.00 B	-2.00 GiB
-281595.11 YiB	0.00 B	-2.00 GiB
-765454.88 YiB	0.00 B	-2.00 GiB
+3.34 GiB	3.34 GiB	2.00 GiB
+9.08 GiB	9.08 GiB	2.00 GiB
+24.67 GiB	24.67 GiB	2.00 GiB
+67.06 GiB	67.06 GiB	2.00 GiB
+182.29 GiB	182.29 GiB	2.00 GiB
+495.51 GiB	495.51 GiB	2.00 GiB
+1.32 TiB	1.32 TiB	2.00 GiB
+3.58 TiB	3.58 TiB	2.00 GiB
+9.72 TiB	9.72 TiB	2.00 GiB
+26.42 TiB	26.42 TiB	2.00 GiB
+71.82 TiB	71.82 TiB	2.00 GiB
+195.22 TiB	195.22 TiB	2.00 GiB
+530.66 TiB	530.66 TiB	2.00 GiB
+1.41 PiB	1.41 PiB	2.00 GiB
+3.83 PiB	3.83 PiB	2.00 GiB
+10.41 PiB	10.41 PiB	2.00 GiB
+28.29 PiB	28.29 PiB	2.00 GiB
+76.91 PiB	76.91 PiB	2.00 GiB
+209.06 PiB	209.06 PiB	2.00 GiB
+568.30 PiB	568.30 PiB	2.00 GiB
+1.51 EiB	1.51 EiB	2.00 GiB
+4.10 EiB	4.10 EiB	2.00 GiB
+11.15 EiB	11.15 EiB	2.00 GiB
+30.30 EiB	16.00 EiB	2.00 GiB
+82.37 EiB	16.00 EiB	2.00 GiB
+223.89 EiB	16.00 EiB	2.00 GiB
+608.60 EiB	16.00 EiB	2.00 GiB
+1.62 ZiB	16.00 EiB	2.00 GiB
+4.39 ZiB	16.00 EiB	2.00 GiB
+11.94 ZiB	16.00 EiB	2.00 GiB
+32.45 ZiB	16.00 EiB	2.00 GiB
+88.21 ZiB	16.00 EiB	2.00 GiB
+239.77 ZiB	16.00 EiB	2.00 GiB
+651.77 ZiB	16.00 EiB	2.00 GiB
+1.73 YiB	16.00 EiB	2.00 GiB
+4.70 YiB	16.00 EiB	2.00 GiB
+12.78 YiB	16.00 EiB	2.00 GiB
+34.75 YiB	16.00 EiB	2.00 GiB
+94.46 YiB	16.00 EiB	2.00 GiB
+256.78 YiB	16.00 EiB	2.00 GiB
+698.00 YiB	16.00 EiB	2.00 GiB
+1897.37 YiB	16.00 EiB	2.00 GiB
+5157.59 YiB	16.00 EiB	2.00 GiB
+14019.80 YiB	16.00 EiB	2.00 GiB
+38109.75 YiB	16.00 EiB	2.00 GiB
+103593.05 YiB	16.00 EiB	2.00 GiB
+281595.11 YiB	16.00 EiB	2.00 GiB
+765454.88 YiB	16.00 EiB	2.00 GiB
diff --git a/tests/queries/0_stateless/00232_format_readable_size.sql b/tests/queries/0_stateless/00232_format_readable_size.sql
index 952ee82b81a..e96f7ebeb20 100644
--- a/tests/queries/0_stateless/00232_format_readable_size.sql
+++ b/tests/queries/0_stateless/00232_format_readable_size.sql
@@ -1,4 +1,4 @@
-WITH round(exp(number), 6) AS x, toUInt64(x) AS y, toInt32(x) AS z
+WITH round(exp(number), 6) AS x, x > 0xFFFFFFFFFFFFFFFF ? 0xFFFFFFFFFFFFFFFF : toUInt64(x) AS y, x > 0x7FFFFFFF ? 0x7FFFFFFF : toInt32(x) AS z
 SELECT formatReadableSize(x), formatReadableSize(y), formatReadableSize(z)
 FROM system.numbers
 LIMIT 70;
diff --git a/tests/queries/0_stateless/00411_long_accurate_number_comparison_float.reference b/tests/queries/0_stateless/00411_long_accurate_number_comparison_float.reference
index 53cdf1e9393..bc8e5e14552 100644
--- a/tests/queries/0_stateless/00411_long_accurate_number_comparison_float.reference
+++ b/tests/queries/0_stateless/00411_long_accurate_number_comparison_float.reference
@@ -1 +1,124 @@
-PASSED
+0	0.000000000	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1
+0	-1.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+0	1.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+0	18446744073709551616.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+0	9223372036854775808.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+0	-9223372036854775808.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+0	9223372036854775808.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+0	2251799813685248.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+0	4503599627370496.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+0	9007199254740991.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+0	9007199254740992.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+0	9007199254740992.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+0	9007199254740994.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+0	-9007199254740991.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+0	-9007199254740992.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+0	-9007199254740992.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+0	-9007199254740994.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+0	104.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+0	-4503599627370496.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+0	-0.500000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+0	0.500000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+0	-1.500000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+0	1.500000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+0	9007199254740992.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+0	2251799813685247.500000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+0	2251799813685248.500000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+0	1152921504606846976.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+0	-1152921504606846976.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+0	-9223372036854786048.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+0	9223372036854786048.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+-1	0.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+-1	-1.000000000	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1
+-1	1.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+-1	18446744073709551616.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+-1	9223372036854775808.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+-1	-9223372036854775808.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+-1	9223372036854775808.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+-1	2251799813685248.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+-1	4503599627370496.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+-1	9007199254740991.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+-1	9007199254740992.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+-1	9007199254740992.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+-1	9007199254740994.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+-1	-9007199254740991.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+-1	-9007199254740992.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+-1	-9007199254740992.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+-1	-9007199254740994.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+-1	104.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+-1	-4503599627370496.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+-1	-0.500000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+-1	0.500000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+-1	-1.500000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+-1	1.500000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+-1	9007199254740992.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+-1	2251799813685247.500000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+-1	2251799813685248.500000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+-1	1152921504606846976.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+-1	-1152921504606846976.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+-1	-9223372036854786048.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+-1	9223372036854786048.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+1	0.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+1	-1.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+1	1.000000000	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1
+1	18446744073709551616.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+1	9223372036854775808.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+1	-9223372036854775808.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+1	9223372036854775808.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+1	2251799813685248.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+1	4503599627370496.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+1	9007199254740991.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+1	9007199254740992.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+1	9007199254740992.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+1	9007199254740994.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+1	-9007199254740991.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+1	-9007199254740992.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+1	-9007199254740992.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+1	-9007199254740994.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+1	104.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+1	-4503599627370496.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+1	-0.500000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+1	0.500000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+1	-1.500000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+1	1.500000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+1	9007199254740992.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+1	2251799813685247.500000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+1	2251799813685248.500000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+1	1152921504606846976.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+1	-1152921504606846976.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+1	-9223372036854786048.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+1	9223372036854786048.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+18446744073709551615	0.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+18446744073709551615	-1.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+18446744073709551615	1.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+18446744073709551615	18446744073709551616.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+18446744073709551615	9223372036854775808.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+18446744073709551615	-9223372036854775808.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+18446744073709551615	9223372036854775808.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+18446744073709551615	2251799813685248.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+18446744073709551615	4503599627370496.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+18446744073709551615	9007199254740991.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+18446744073709551615	9007199254740992.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+18446744073709551615	9007199254740992.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+18446744073709551615	9007199254740994.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+18446744073709551615	-9007199254740991.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+18446744073709551615	-9007199254740992.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+18446744073709551615	-9007199254740992.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+18446744073709551615	-9007199254740994.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+18446744073709551615	104.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+18446744073709551615	-4503599627370496.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+18446744073709551615	-0.500000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+18446744073709551615	0.500000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+18446744073709551615	-1.500000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+18446744073709551615	1.500000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+18446744073709551615	9007199254740992.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+18446744073709551615	2251799813685247.500000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+18446744073709551615	2251799813685248.500000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+18446744073709551615	1152921504606846976.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+18446744073709551615	-1152921504606846976.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+18446744073709551615	-9223372036854786048.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+18446744073709551615	9223372036854786048.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+9223372036854775808	0.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+9223372036854775808	-1.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+9223372036854775808	1.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+9223372036854775808	18446744073709551616.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
diff --git a/tests/queries/0_stateless/00411_long_accurate_number_comparison_float.sql b/tests/queries/0_stateless/00411_long_accurate_number_comparison_float.sql
new file mode 100644
index 00000000000..16245c42a7a
--- /dev/null
+++ b/tests/queries/0_stateless/00411_long_accurate_number_comparison_float.sql
@@ -0,0 +1,127 @@
+-- The results are different than in Python. That's why this file is genearated and the reference is edited instead of using the Python script.
+-- Example: in ClickHouse, 9223372036854775808.0 != 9223372036854775808.
+
+SELECT '0', '0.000000000', 0 = 0.000000000, 0 != 0.000000000, 0 < 0.000000000, 0 <= 0.000000000, 0 > 0.000000000, 0 >= 0.000000000,	0.000000000 = 0, 0.000000000 != 0, 0.000000000 < 0, 0.000000000 <= 0, 0.000000000 > 0, 0.000000000 >= 0 , toUInt8(0) = 0.000000000, toUInt8(0) != 0.000000000, toUInt8(0) < 0.000000000, toUInt8(0) <= 0.000000000, toUInt8(0) > 0.000000000, toUInt8(0) >= 0.000000000,	0.000000000 = toUInt8(0), 0.000000000 != toUInt8(0), 0.000000000 < toUInt8(0), 0.000000000 <= toUInt8(0), 0.000000000 > toUInt8(0), 0.000000000 >= toUInt8(0) , toInt8(0) = 0.000000000, toInt8(0) != 0.000000000, toInt8(0) < 0.000000000, toInt8(0) <= 0.000000000, toInt8(0) > 0.000000000, toInt8(0) >= 0.000000000,	0.000000000 = toInt8(0), 0.000000000 != toInt8(0), 0.000000000 < toInt8(0), 0.000000000 <= toInt8(0), 0.000000000 > toInt8(0), 0.000000000 >= toInt8(0) , toUInt16(0) = 0.000000000, toUInt16(0) != 0.000000000, toUInt16(0) < 0.000000000, toUInt16(0) <= 0.000000000, toUInt16(0) > 0.000000000, toUInt16(0) >= 0.000000000,	0.000000000 = toUInt16(0), 0.000000000 != toUInt16(0), 0.000000000 < toUInt16(0), 0.000000000 <= toUInt16(0), 0.000000000 > toUInt16(0), 0.000000000 >= toUInt16(0) , toInt16(0) = 0.000000000, toInt16(0) != 0.000000000, toInt16(0) < 0.000000000, toInt16(0) <= 0.000000000, toInt16(0) > 0.000000000, toInt16(0) >= 0.000000000,	0.000000000 = toInt16(0), 0.000000000 != toInt16(0), 0.000000000 < toInt16(0), 0.000000000 <= toInt16(0), 0.000000000 > toInt16(0), 0.000000000 >= toInt16(0) , toUInt32(0) = 0.000000000, toUInt32(0) != 0.000000000, toUInt32(0) < 0.000000000, toUInt32(0) <= 0.000000000, toUInt32(0) > 0.000000000, toUInt32(0) >= 0.000000000,	0.000000000 = toUInt32(0), 0.000000000 != toUInt32(0), 0.000000000 < toUInt32(0), 0.000000000 <= toUInt32(0), 0.000000000 > toUInt32(0), 0.000000000 >= toUInt32(0) , toInt32(0) = 0.000000000, toInt32(0) != 0.000000000, toInt32(0) < 0.000000000, toInt32(0) <= 0.000000000, toInt32(0) > 0.000000000, toInt32(0) >= 0.000000000,	0.000000000 = toInt32(0), 0.000000000 != toInt32(0), 0.000000000 < toInt32(0), 0.000000000 <= toInt32(0), 0.000000000 > toInt32(0), 0.000000000 >= toInt32(0) , toUInt64(0) = 0.000000000, toUInt64(0) != 0.000000000, toUInt64(0) < 0.000000000, toUInt64(0) <= 0.000000000, toUInt64(0) > 0.000000000, toUInt64(0) >= 0.000000000,	0.000000000 = toUInt64(0), 0.000000000 != toUInt64(0), 0.000000000 < toUInt64(0), 0.000000000 <= toUInt64(0), 0.000000000 > toUInt64(0), 0.000000000 >= toUInt64(0) , toInt64(0) = 0.000000000, toInt64(0) != 0.000000000, toInt64(0) < 0.000000000, toInt64(0) <= 0.000000000, toInt64(0) > 0.000000000, toInt64(0) >= 0.000000000,	0.000000000 = toInt64(0), 0.000000000 != toInt64(0), 0.000000000 < toInt64(0), 0.000000000 <= toInt64(0), 0.000000000 > toInt64(0), 0.000000000 >= toInt64(0) ;
+SELECT '0', '-1.000000000', 0 = -1.000000000, 0 != -1.000000000, 0 < -1.000000000, 0 <= -1.000000000, 0 > -1.000000000, 0 >= -1.000000000,	-1.000000000 = 0, -1.000000000 != 0, -1.000000000 < 0, -1.000000000 <= 0, -1.000000000 > 0, -1.000000000 >= 0 , toUInt8(0) = -1.000000000, toUInt8(0) != -1.000000000, toUInt8(0) < -1.000000000, toUInt8(0) <= -1.000000000, toUInt8(0) > -1.000000000, toUInt8(0) >= -1.000000000,	-1.000000000 = toUInt8(0), -1.000000000 != toUInt8(0), -1.000000000 < toUInt8(0), -1.000000000 <= toUInt8(0), -1.000000000 > toUInt8(0), -1.000000000 >= toUInt8(0) , toInt8(0) = -1.000000000, toInt8(0) != -1.000000000, toInt8(0) < -1.000000000, toInt8(0) <= -1.000000000, toInt8(0) > -1.000000000, toInt8(0) >= -1.000000000,	-1.000000000 = toInt8(0), -1.000000000 != toInt8(0), -1.000000000 < toInt8(0), -1.000000000 <= toInt8(0), -1.000000000 > toInt8(0), -1.000000000 >= toInt8(0) , toUInt16(0) = -1.000000000, toUInt16(0) != -1.000000000, toUInt16(0) < -1.000000000, toUInt16(0) <= -1.000000000, toUInt16(0) > -1.000000000, toUInt16(0) >= -1.000000000,	-1.000000000 = toUInt16(0), -1.000000000 != toUInt16(0), -1.000000000 < toUInt16(0), -1.000000000 <= toUInt16(0), -1.000000000 > toUInt16(0), -1.000000000 >= toUInt16(0) , toInt16(0) = -1.000000000, toInt16(0) != -1.000000000, toInt16(0) < -1.000000000, toInt16(0) <= -1.000000000, toInt16(0) > -1.000000000, toInt16(0) >= -1.000000000,	-1.000000000 = toInt16(0), -1.000000000 != toInt16(0), -1.000000000 < toInt16(0), -1.000000000 <= toInt16(0), -1.000000000 > toInt16(0), -1.000000000 >= toInt16(0) , toUInt32(0) = -1.000000000, toUInt32(0) != -1.000000000, toUInt32(0) < -1.000000000, toUInt32(0) <= -1.000000000, toUInt32(0) > -1.000000000, toUInt32(0) >= -1.000000000,	-1.000000000 = toUInt32(0), -1.000000000 != toUInt32(0), -1.000000000 < toUInt32(0), -1.000000000 <= toUInt32(0), -1.000000000 > toUInt32(0), -1.000000000 >= toUInt32(0) , toInt32(0) = -1.000000000, toInt32(0) != -1.000000000, toInt32(0) < -1.000000000, toInt32(0) <= -1.000000000, toInt32(0) > -1.000000000, toInt32(0) >= -1.000000000,	-1.000000000 = toInt32(0), -1.000000000 != toInt32(0), -1.000000000 < toInt32(0), -1.000000000 <= toInt32(0), -1.000000000 > toInt32(0), -1.000000000 >= toInt32(0) , toUInt64(0) = -1.000000000, toUInt64(0) != -1.000000000, toUInt64(0) < -1.000000000, toUInt64(0) <= -1.000000000, toUInt64(0) > -1.000000000, toUInt64(0) >= -1.000000000,	-1.000000000 = toUInt64(0), -1.000000000 != toUInt64(0), -1.000000000 < toUInt64(0), -1.000000000 <= toUInt64(0), -1.000000000 > toUInt64(0), -1.000000000 >= toUInt64(0) , toInt64(0) = -1.000000000, toInt64(0) != -1.000000000, toInt64(0) < -1.000000000, toInt64(0) <= -1.000000000, toInt64(0) > -1.000000000, toInt64(0) >= -1.000000000,	-1.000000000 = toInt64(0), -1.000000000 != toInt64(0), -1.000000000 < toInt64(0), -1.000000000 <= toInt64(0), -1.000000000 > toInt64(0), -1.000000000 >= toInt64(0) ;
+SELECT '0', '1.000000000', 0 = 1.000000000, 0 != 1.000000000, 0 < 1.000000000, 0 <= 1.000000000, 0 > 1.000000000, 0 >= 1.000000000,	1.000000000 = 0, 1.000000000 != 0, 1.000000000 < 0, 1.000000000 <= 0, 1.000000000 > 0, 1.000000000 >= 0 , toUInt8(0) = 1.000000000, toUInt8(0) != 1.000000000, toUInt8(0) < 1.000000000, toUInt8(0) <= 1.000000000, toUInt8(0) > 1.000000000, toUInt8(0) >= 1.000000000,	1.000000000 = toUInt8(0), 1.000000000 != toUInt8(0), 1.000000000 < toUInt8(0), 1.000000000 <= toUInt8(0), 1.000000000 > toUInt8(0), 1.000000000 >= toUInt8(0) , toInt8(0) = 1.000000000, toInt8(0) != 1.000000000, toInt8(0) < 1.000000000, toInt8(0) <= 1.000000000, toInt8(0) > 1.000000000, toInt8(0) >= 1.000000000,	1.000000000 = toInt8(0), 1.000000000 != toInt8(0), 1.000000000 < toInt8(0), 1.000000000 <= toInt8(0), 1.000000000 > toInt8(0), 1.000000000 >= toInt8(0) , toUInt16(0) = 1.000000000, toUInt16(0) != 1.000000000, toUInt16(0) < 1.000000000, toUInt16(0) <= 1.000000000, toUInt16(0) > 1.000000000, toUInt16(0) >= 1.000000000,	1.000000000 = toUInt16(0), 1.000000000 != toUInt16(0), 1.000000000 < toUInt16(0), 1.000000000 <= toUInt16(0), 1.000000000 > toUInt16(0), 1.000000000 >= toUInt16(0) , toInt16(0) = 1.000000000, toInt16(0) != 1.000000000, toInt16(0) < 1.000000000, toInt16(0) <= 1.000000000, toInt16(0) > 1.000000000, toInt16(0) >= 1.000000000,	1.000000000 = toInt16(0), 1.000000000 != toInt16(0), 1.000000000 < toInt16(0), 1.000000000 <= toInt16(0), 1.000000000 > toInt16(0), 1.000000000 >= toInt16(0) , toUInt32(0) = 1.000000000, toUInt32(0) != 1.000000000, toUInt32(0) < 1.000000000, toUInt32(0) <= 1.000000000, toUInt32(0) > 1.000000000, toUInt32(0) >= 1.000000000,	1.000000000 = toUInt32(0), 1.000000000 != toUInt32(0), 1.000000000 < toUInt32(0), 1.000000000 <= toUInt32(0), 1.000000000 > toUInt32(0), 1.000000000 >= toUInt32(0) , toInt32(0) = 1.000000000, toInt32(0) != 1.000000000, toInt32(0) < 1.000000000, toInt32(0) <= 1.000000000, toInt32(0) > 1.000000000, toInt32(0) >= 1.000000000,	1.000000000 = toInt32(0), 1.000000000 != toInt32(0), 1.000000000 < toInt32(0), 1.000000000 <= toInt32(0), 1.000000000 > toInt32(0), 1.000000000 >= toInt32(0) , toUInt64(0) = 1.000000000, toUInt64(0) != 1.000000000, toUInt64(0) < 1.000000000, toUInt64(0) <= 1.000000000, toUInt64(0) > 1.000000000, toUInt64(0) >= 1.000000000,	1.000000000 = toUInt64(0), 1.000000000 != toUInt64(0), 1.000000000 < toUInt64(0), 1.000000000 <= toUInt64(0), 1.000000000 > toUInt64(0), 1.000000000 >= toUInt64(0) , toInt64(0) = 1.000000000, toInt64(0) != 1.000000000, toInt64(0) < 1.000000000, toInt64(0) <= 1.000000000, toInt64(0) > 1.000000000, toInt64(0) >= 1.000000000,	1.000000000 = toInt64(0), 1.000000000 != toInt64(0), 1.000000000 < toInt64(0), 1.000000000 <= toInt64(0), 1.000000000 > toInt64(0), 1.000000000 >= toInt64(0) ;
+SELECT '0', '18446744073709551616.000000000', 0 = 18446744073709551616.000000000, 0 != 18446744073709551616.000000000, 0 < 18446744073709551616.000000000, 0 <= 18446744073709551616.000000000, 0 > 18446744073709551616.000000000, 0 >= 18446744073709551616.000000000,	18446744073709551616.000000000 = 0, 18446744073709551616.000000000 != 0, 18446744073709551616.000000000 < 0, 18446744073709551616.000000000 <= 0, 18446744073709551616.000000000 > 0, 18446744073709551616.000000000 >= 0 , toUInt8(0) = 18446744073709551616.000000000, toUInt8(0) != 18446744073709551616.000000000, toUInt8(0) < 18446744073709551616.000000000, toUInt8(0) <= 18446744073709551616.000000000, toUInt8(0) > 18446744073709551616.000000000, toUInt8(0) >= 18446744073709551616.000000000,	18446744073709551616.000000000 = toUInt8(0), 18446744073709551616.000000000 != toUInt8(0), 18446744073709551616.000000000 < toUInt8(0), 18446744073709551616.000000000 <= toUInt8(0), 18446744073709551616.000000000 > toUInt8(0), 18446744073709551616.000000000 >= toUInt8(0) , toInt8(0) = 18446744073709551616.000000000, toInt8(0) != 18446744073709551616.000000000, toInt8(0) < 18446744073709551616.000000000, toInt8(0) <= 18446744073709551616.000000000, toInt8(0) > 18446744073709551616.000000000, toInt8(0) >= 18446744073709551616.000000000,	18446744073709551616.000000000 = toInt8(0), 18446744073709551616.000000000 != toInt8(0), 18446744073709551616.000000000 < toInt8(0), 18446744073709551616.000000000 <= toInt8(0), 18446744073709551616.000000000 > toInt8(0), 18446744073709551616.000000000 >= toInt8(0) , toUInt16(0) = 18446744073709551616.000000000, toUInt16(0) != 18446744073709551616.000000000, toUInt16(0) < 18446744073709551616.000000000, toUInt16(0) <= 18446744073709551616.000000000, toUInt16(0) > 18446744073709551616.000000000, toUInt16(0) >= 18446744073709551616.000000000,	18446744073709551616.000000000 = toUInt16(0), 18446744073709551616.000000000 != toUInt16(0), 18446744073709551616.000000000 < toUInt16(0), 18446744073709551616.000000000 <= toUInt16(0), 18446744073709551616.000000000 > toUInt16(0), 18446744073709551616.000000000 >= toUInt16(0) , toInt16(0) = 18446744073709551616.000000000, toInt16(0) != 18446744073709551616.000000000, toInt16(0) < 18446744073709551616.000000000, toInt16(0) <= 18446744073709551616.000000000, toInt16(0) > 18446744073709551616.000000000, toInt16(0) >= 18446744073709551616.000000000,	18446744073709551616.000000000 = toInt16(0), 18446744073709551616.000000000 != toInt16(0), 18446744073709551616.000000000 < toInt16(0), 18446744073709551616.000000000 <= toInt16(0), 18446744073709551616.000000000 > toInt16(0), 18446744073709551616.000000000 >= toInt16(0) , toUInt32(0) = 18446744073709551616.000000000, toUInt32(0) != 18446744073709551616.000000000, toUInt32(0) < 18446744073709551616.000000000, toUInt32(0) <= 18446744073709551616.000000000, toUInt32(0) > 18446744073709551616.000000000, toUInt32(0) >= 18446744073709551616.000000000,	18446744073709551616.000000000 = toUInt32(0), 18446744073709551616.000000000 != toUInt32(0), 18446744073709551616.000000000 < toUInt32(0), 18446744073709551616.000000000 <= toUInt32(0), 18446744073709551616.000000000 > toUInt32(0), 18446744073709551616.000000000 >= toUInt32(0) , toInt32(0) = 18446744073709551616.000000000, toInt32(0) != 18446744073709551616.000000000, toInt32(0) < 18446744073709551616.000000000, toInt32(0) <= 18446744073709551616.000000000, toInt32(0) > 18446744073709551616.000000000, toInt32(0) >= 18446744073709551616.000000000,	18446744073709551616.000000000 = toInt32(0), 18446744073709551616.000000000 != toInt32(0), 18446744073709551616.000000000 < toInt32(0), 18446744073709551616.000000000 <= toInt32(0), 18446744073709551616.000000000 > toInt32(0), 18446744073709551616.000000000 >= toInt32(0) , toUInt64(0) = 18446744073709551616.000000000, toUInt64(0) != 18446744073709551616.000000000, toUInt64(0) < 18446744073709551616.000000000, toUInt64(0) <= 18446744073709551616.000000000, toUInt64(0) > 18446744073709551616.000000000, toUInt64(0) >= 18446744073709551616.000000000,	18446744073709551616.000000000 = toUInt64(0), 18446744073709551616.000000000 != toUInt64(0), 18446744073709551616.000000000 < toUInt64(0), 18446744073709551616.000000000 <= toUInt64(0), 18446744073709551616.000000000 > toUInt64(0), 18446744073709551616.000000000 >= toUInt64(0) , toInt64(0) = 18446744073709551616.000000000, toInt64(0) != 18446744073709551616.000000000, toInt64(0) < 18446744073709551616.000000000, toInt64(0) <= 18446744073709551616.000000000, toInt64(0) > 18446744073709551616.000000000, toInt64(0) >= 18446744073709551616.000000000,	18446744073709551616.000000000 = toInt64(0), 18446744073709551616.000000000 != toInt64(0), 18446744073709551616.000000000 < toInt64(0), 18446744073709551616.000000000 <= toInt64(0), 18446744073709551616.000000000 > toInt64(0), 18446744073709551616.000000000 >= toInt64(0) ;
+SELECT '0', '9223372036854775808.000000000', 0 = 9223372036854775808.000000000, 0 != 9223372036854775808.000000000, 0 < 9223372036854775808.000000000, 0 <= 9223372036854775808.000000000, 0 > 9223372036854775808.000000000, 0 >= 9223372036854775808.000000000,	9223372036854775808.000000000 = 0, 9223372036854775808.000000000 != 0, 9223372036854775808.000000000 < 0, 9223372036854775808.000000000 <= 0, 9223372036854775808.000000000 > 0, 9223372036854775808.000000000 >= 0 , toUInt8(0) = 9223372036854775808.000000000, toUInt8(0) != 9223372036854775808.000000000, toUInt8(0) < 9223372036854775808.000000000, toUInt8(0) <= 9223372036854775808.000000000, toUInt8(0) > 9223372036854775808.000000000, toUInt8(0) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toUInt8(0), 9223372036854775808.000000000 != toUInt8(0), 9223372036854775808.000000000 < toUInt8(0), 9223372036854775808.000000000 <= toUInt8(0), 9223372036854775808.000000000 > toUInt8(0), 9223372036854775808.000000000 >= toUInt8(0) , toInt8(0) = 9223372036854775808.000000000, toInt8(0) != 9223372036854775808.000000000, toInt8(0) < 9223372036854775808.000000000, toInt8(0) <= 9223372036854775808.000000000, toInt8(0) > 9223372036854775808.000000000, toInt8(0) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toInt8(0), 9223372036854775808.000000000 != toInt8(0), 9223372036854775808.000000000 < toInt8(0), 9223372036854775808.000000000 <= toInt8(0), 9223372036854775808.000000000 > toInt8(0), 9223372036854775808.000000000 >= toInt8(0) , toUInt16(0) = 9223372036854775808.000000000, toUInt16(0) != 9223372036854775808.000000000, toUInt16(0) < 9223372036854775808.000000000, toUInt16(0) <= 9223372036854775808.000000000, toUInt16(0) > 9223372036854775808.000000000, toUInt16(0) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toUInt16(0), 9223372036854775808.000000000 != toUInt16(0), 9223372036854775808.000000000 < toUInt16(0), 9223372036854775808.000000000 <= toUInt16(0), 9223372036854775808.000000000 > toUInt16(0), 9223372036854775808.000000000 >= toUInt16(0) , toInt16(0) = 9223372036854775808.000000000, toInt16(0) != 9223372036854775808.000000000, toInt16(0) < 9223372036854775808.000000000, toInt16(0) <= 9223372036854775808.000000000, toInt16(0) > 9223372036854775808.000000000, toInt16(0) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toInt16(0), 9223372036854775808.000000000 != toInt16(0), 9223372036854775808.000000000 < toInt16(0), 9223372036854775808.000000000 <= toInt16(0), 9223372036854775808.000000000 > toInt16(0), 9223372036854775808.000000000 >= toInt16(0) , toUInt32(0) = 9223372036854775808.000000000, toUInt32(0) != 9223372036854775808.000000000, toUInt32(0) < 9223372036854775808.000000000, toUInt32(0) <= 9223372036854775808.000000000, toUInt32(0) > 9223372036854775808.000000000, toUInt32(0) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toUInt32(0), 9223372036854775808.000000000 != toUInt32(0), 9223372036854775808.000000000 < toUInt32(0), 9223372036854775808.000000000 <= toUInt32(0), 9223372036854775808.000000000 > toUInt32(0), 9223372036854775808.000000000 >= toUInt32(0) , toInt32(0) = 9223372036854775808.000000000, toInt32(0) != 9223372036854775808.000000000, toInt32(0) < 9223372036854775808.000000000, toInt32(0) <= 9223372036854775808.000000000, toInt32(0) > 9223372036854775808.000000000, toInt32(0) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toInt32(0), 9223372036854775808.000000000 != toInt32(0), 9223372036854775808.000000000 < toInt32(0), 9223372036854775808.000000000 <= toInt32(0), 9223372036854775808.000000000 > toInt32(0), 9223372036854775808.000000000 >= toInt32(0) , toUInt64(0) = 9223372036854775808.000000000, toUInt64(0) != 9223372036854775808.000000000, toUInt64(0) < 9223372036854775808.000000000, toUInt64(0) <= 9223372036854775808.000000000, toUInt64(0) > 9223372036854775808.000000000, toUInt64(0) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toUInt64(0), 9223372036854775808.000000000 != toUInt64(0), 9223372036854775808.000000000 < toUInt64(0), 9223372036854775808.000000000 <= toUInt64(0), 9223372036854775808.000000000 > toUInt64(0), 9223372036854775808.000000000 >= toUInt64(0) , toInt64(0) = 9223372036854775808.000000000, toInt64(0) != 9223372036854775808.000000000, toInt64(0) < 9223372036854775808.000000000, toInt64(0) <= 9223372036854775808.000000000, toInt64(0) > 9223372036854775808.000000000, toInt64(0) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toInt64(0), 9223372036854775808.000000000 != toInt64(0), 9223372036854775808.000000000 < toInt64(0), 9223372036854775808.000000000 <= toInt64(0), 9223372036854775808.000000000 > toInt64(0), 9223372036854775808.000000000 >= toInt64(0) ;
+SELECT '0', '-9223372036854775808.000000000', 0 = -9223372036854775808.000000000, 0 != -9223372036854775808.000000000, 0 < -9223372036854775808.000000000, 0 <= -9223372036854775808.000000000, 0 > -9223372036854775808.000000000, 0 >= -9223372036854775808.000000000,	-9223372036854775808.000000000 = 0, -9223372036854775808.000000000 != 0, -9223372036854775808.000000000 < 0, -9223372036854775808.000000000 <= 0, -9223372036854775808.000000000 > 0, -9223372036854775808.000000000 >= 0 , toUInt8(0) = -9223372036854775808.000000000, toUInt8(0) != -9223372036854775808.000000000, toUInt8(0) < -9223372036854775808.000000000, toUInt8(0) <= -9223372036854775808.000000000, toUInt8(0) > -9223372036854775808.000000000, toUInt8(0) >= -9223372036854775808.000000000,	-9223372036854775808.000000000 = toUInt8(0), -9223372036854775808.000000000 != toUInt8(0), -9223372036854775808.000000000 < toUInt8(0), -9223372036854775808.000000000 <= toUInt8(0), -9223372036854775808.000000000 > toUInt8(0), -9223372036854775808.000000000 >= toUInt8(0) , toInt8(0) = -9223372036854775808.000000000, toInt8(0) != -9223372036854775808.000000000, toInt8(0) < -9223372036854775808.000000000, toInt8(0) <= -9223372036854775808.000000000, toInt8(0) > -9223372036854775808.000000000, toInt8(0) >= -9223372036854775808.000000000,	-9223372036854775808.000000000 = toInt8(0), -9223372036854775808.000000000 != toInt8(0), -9223372036854775808.000000000 < toInt8(0), -9223372036854775808.000000000 <= toInt8(0), -9223372036854775808.000000000 > toInt8(0), -9223372036854775808.000000000 >= toInt8(0) , toUInt16(0) = -9223372036854775808.000000000, toUInt16(0) != -9223372036854775808.000000000, toUInt16(0) < -9223372036854775808.000000000, toUInt16(0) <= -9223372036854775808.000000000, toUInt16(0) > -9223372036854775808.000000000, toUInt16(0) >= -9223372036854775808.000000000,	-9223372036854775808.000000000 = toUInt16(0), -9223372036854775808.000000000 != toUInt16(0), -9223372036854775808.000000000 < toUInt16(0), -9223372036854775808.000000000 <= toUInt16(0), -9223372036854775808.000000000 > toUInt16(0), -9223372036854775808.000000000 >= toUInt16(0) , toInt16(0) = -9223372036854775808.000000000, toInt16(0) != -9223372036854775808.000000000, toInt16(0) < -9223372036854775808.000000000, toInt16(0) <= -9223372036854775808.000000000, toInt16(0) > -9223372036854775808.000000000, toInt16(0) >= -9223372036854775808.000000000,	-9223372036854775808.000000000 = toInt16(0), -9223372036854775808.000000000 != toInt16(0), -9223372036854775808.000000000 < toInt16(0), -9223372036854775808.000000000 <= toInt16(0), -9223372036854775808.000000000 > toInt16(0), -9223372036854775808.000000000 >= toInt16(0) , toUInt32(0) = -9223372036854775808.000000000, toUInt32(0) != -9223372036854775808.000000000, toUInt32(0) < -9223372036854775808.000000000, toUInt32(0) <= -9223372036854775808.000000000, toUInt32(0) > -9223372036854775808.000000000, toUInt32(0) >= -9223372036854775808.000000000,	-9223372036854775808.000000000 = toUInt32(0), -9223372036854775808.000000000 != toUInt32(0), -9223372036854775808.000000000 < toUInt32(0), -9223372036854775808.000000000 <= toUInt32(0), -9223372036854775808.000000000 > toUInt32(0), -9223372036854775808.000000000 >= toUInt32(0) , toInt32(0) = -9223372036854775808.000000000, toInt32(0) != -9223372036854775808.000000000, toInt32(0) < -9223372036854775808.000000000, toInt32(0) <= -9223372036854775808.000000000, toInt32(0) > -9223372036854775808.000000000, toInt32(0) >= -9223372036854775808.000000000,	-9223372036854775808.000000000 = toInt32(0), -9223372036854775808.000000000 != toInt32(0), -9223372036854775808.000000000 < toInt32(0), -9223372036854775808.000000000 <= toInt32(0), -9223372036854775808.000000000 > toInt32(0), -9223372036854775808.000000000 >= toInt32(0) , toUInt64(0) = -9223372036854775808.000000000, toUInt64(0) != -9223372036854775808.000000000, toUInt64(0) < -9223372036854775808.000000000, toUInt64(0) <= -9223372036854775808.000000000, toUInt64(0) > -9223372036854775808.000000000, toUInt64(0) >= -9223372036854775808.000000000,	-9223372036854775808.000000000 = toUInt64(0), -9223372036854775808.000000000 != toUInt64(0), -9223372036854775808.000000000 < toUInt64(0), -9223372036854775808.000000000 <= toUInt64(0), -9223372036854775808.000000000 > toUInt64(0), -9223372036854775808.000000000 >= toUInt64(0) , toInt64(0) = -9223372036854775808.000000000, toInt64(0) != -9223372036854775808.000000000, toInt64(0) < -9223372036854775808.000000000, toInt64(0) <= -9223372036854775808.000000000, toInt64(0) > -9223372036854775808.000000000, toInt64(0) >= -9223372036854775808.000000000,	-9223372036854775808.000000000 = toInt64(0), -9223372036854775808.000000000 != toInt64(0), -9223372036854775808.000000000 < toInt64(0), -9223372036854775808.000000000 <= toInt64(0), -9223372036854775808.000000000 > toInt64(0), -9223372036854775808.000000000 >= toInt64(0) ;
+SELECT '0', '9223372036854775808.000000000', 0 = 9223372036854775808.000000000, 0 != 9223372036854775808.000000000, 0 < 9223372036854775808.000000000, 0 <= 9223372036854775808.000000000, 0 > 9223372036854775808.000000000, 0 >= 9223372036854775808.000000000,	9223372036854775808.000000000 = 0, 9223372036854775808.000000000 != 0, 9223372036854775808.000000000 < 0, 9223372036854775808.000000000 <= 0, 9223372036854775808.000000000 > 0, 9223372036854775808.000000000 >= 0 , toUInt8(0) = 9223372036854775808.000000000, toUInt8(0) != 9223372036854775808.000000000, toUInt8(0) < 9223372036854775808.000000000, toUInt8(0) <= 9223372036854775808.000000000, toUInt8(0) > 9223372036854775808.000000000, toUInt8(0) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toUInt8(0), 9223372036854775808.000000000 != toUInt8(0), 9223372036854775808.000000000 < toUInt8(0), 9223372036854775808.000000000 <= toUInt8(0), 9223372036854775808.000000000 > toUInt8(0), 9223372036854775808.000000000 >= toUInt8(0) , toInt8(0) = 9223372036854775808.000000000, toInt8(0) != 9223372036854775808.000000000, toInt8(0) < 9223372036854775808.000000000, toInt8(0) <= 9223372036854775808.000000000, toInt8(0) > 9223372036854775808.000000000, toInt8(0) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toInt8(0), 9223372036854775808.000000000 != toInt8(0), 9223372036854775808.000000000 < toInt8(0), 9223372036854775808.000000000 <= toInt8(0), 9223372036854775808.000000000 > toInt8(0), 9223372036854775808.000000000 >= toInt8(0) , toUInt16(0) = 9223372036854775808.000000000, toUInt16(0) != 9223372036854775808.000000000, toUInt16(0) < 9223372036854775808.000000000, toUInt16(0) <= 9223372036854775808.000000000, toUInt16(0) > 9223372036854775808.000000000, toUInt16(0) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toUInt16(0), 9223372036854775808.000000000 != toUInt16(0), 9223372036854775808.000000000 < toUInt16(0), 9223372036854775808.000000000 <= toUInt16(0), 9223372036854775808.000000000 > toUInt16(0), 9223372036854775808.000000000 >= toUInt16(0) , toInt16(0) = 9223372036854775808.000000000, toInt16(0) != 9223372036854775808.000000000, toInt16(0) < 9223372036854775808.000000000, toInt16(0) <= 9223372036854775808.000000000, toInt16(0) > 9223372036854775808.000000000, toInt16(0) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toInt16(0), 9223372036854775808.000000000 != toInt16(0), 9223372036854775808.000000000 < toInt16(0), 9223372036854775808.000000000 <= toInt16(0), 9223372036854775808.000000000 > toInt16(0), 9223372036854775808.000000000 >= toInt16(0) , toUInt32(0) = 9223372036854775808.000000000, toUInt32(0) != 9223372036854775808.000000000, toUInt32(0) < 9223372036854775808.000000000, toUInt32(0) <= 9223372036854775808.000000000, toUInt32(0) > 9223372036854775808.000000000, toUInt32(0) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toUInt32(0), 9223372036854775808.000000000 != toUInt32(0), 9223372036854775808.000000000 < toUInt32(0), 9223372036854775808.000000000 <= toUInt32(0), 9223372036854775808.000000000 > toUInt32(0), 9223372036854775808.000000000 >= toUInt32(0) , toInt32(0) = 9223372036854775808.000000000, toInt32(0) != 9223372036854775808.000000000, toInt32(0) < 9223372036854775808.000000000, toInt32(0) <= 9223372036854775808.000000000, toInt32(0) > 9223372036854775808.000000000, toInt32(0) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toInt32(0), 9223372036854775808.000000000 != toInt32(0), 9223372036854775808.000000000 < toInt32(0), 9223372036854775808.000000000 <= toInt32(0), 9223372036854775808.000000000 > toInt32(0), 9223372036854775808.000000000 >= toInt32(0) , toUInt64(0) = 9223372036854775808.000000000, toUInt64(0) != 9223372036854775808.000000000, toUInt64(0) < 9223372036854775808.000000000, toUInt64(0) <= 9223372036854775808.000000000, toUInt64(0) > 9223372036854775808.000000000, toUInt64(0) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toUInt64(0), 9223372036854775808.000000000 != toUInt64(0), 9223372036854775808.000000000 < toUInt64(0), 9223372036854775808.000000000 <= toUInt64(0), 9223372036854775808.000000000 > toUInt64(0), 9223372036854775808.000000000 >= toUInt64(0) , toInt64(0) = 9223372036854775808.000000000, toInt64(0) != 9223372036854775808.000000000, toInt64(0) < 9223372036854775808.000000000, toInt64(0) <= 9223372036854775808.000000000, toInt64(0) > 9223372036854775808.000000000, toInt64(0) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toInt64(0), 9223372036854775808.000000000 != toInt64(0), 9223372036854775808.000000000 < toInt64(0), 9223372036854775808.000000000 <= toInt64(0), 9223372036854775808.000000000 > toInt64(0), 9223372036854775808.000000000 >= toInt64(0) ;
+SELECT '0', '2251799813685248.000000000', 0 = 2251799813685248.000000000, 0 != 2251799813685248.000000000, 0 < 2251799813685248.000000000, 0 <= 2251799813685248.000000000, 0 > 2251799813685248.000000000, 0 >= 2251799813685248.000000000,	2251799813685248.000000000 = 0, 2251799813685248.000000000 != 0, 2251799813685248.000000000 < 0, 2251799813685248.000000000 <= 0, 2251799813685248.000000000 > 0, 2251799813685248.000000000 >= 0 , toUInt8(0) = 2251799813685248.000000000, toUInt8(0) != 2251799813685248.000000000, toUInt8(0) < 2251799813685248.000000000, toUInt8(0) <= 2251799813685248.000000000, toUInt8(0) > 2251799813685248.000000000, toUInt8(0) >= 2251799813685248.000000000,	2251799813685248.000000000 = toUInt8(0), 2251799813685248.000000000 != toUInt8(0), 2251799813685248.000000000 < toUInt8(0), 2251799813685248.000000000 <= toUInt8(0), 2251799813685248.000000000 > toUInt8(0), 2251799813685248.000000000 >= toUInt8(0) , toInt8(0) = 2251799813685248.000000000, toInt8(0) != 2251799813685248.000000000, toInt8(0) < 2251799813685248.000000000, toInt8(0) <= 2251799813685248.000000000, toInt8(0) > 2251799813685248.000000000, toInt8(0) >= 2251799813685248.000000000,	2251799813685248.000000000 = toInt8(0), 2251799813685248.000000000 != toInt8(0), 2251799813685248.000000000 < toInt8(0), 2251799813685248.000000000 <= toInt8(0), 2251799813685248.000000000 > toInt8(0), 2251799813685248.000000000 >= toInt8(0) , toUInt16(0) = 2251799813685248.000000000, toUInt16(0) != 2251799813685248.000000000, toUInt16(0) < 2251799813685248.000000000, toUInt16(0) <= 2251799813685248.000000000, toUInt16(0) > 2251799813685248.000000000, toUInt16(0) >= 2251799813685248.000000000,	2251799813685248.000000000 = toUInt16(0), 2251799813685248.000000000 != toUInt16(0), 2251799813685248.000000000 < toUInt16(0), 2251799813685248.000000000 <= toUInt16(0), 2251799813685248.000000000 > toUInt16(0), 2251799813685248.000000000 >= toUInt16(0) , toInt16(0) = 2251799813685248.000000000, toInt16(0) != 2251799813685248.000000000, toInt16(0) < 2251799813685248.000000000, toInt16(0) <= 2251799813685248.000000000, toInt16(0) > 2251799813685248.000000000, toInt16(0) >= 2251799813685248.000000000,	2251799813685248.000000000 = toInt16(0), 2251799813685248.000000000 != toInt16(0), 2251799813685248.000000000 < toInt16(0), 2251799813685248.000000000 <= toInt16(0), 2251799813685248.000000000 > toInt16(0), 2251799813685248.000000000 >= toInt16(0) , toUInt32(0) = 2251799813685248.000000000, toUInt32(0) != 2251799813685248.000000000, toUInt32(0) < 2251799813685248.000000000, toUInt32(0) <= 2251799813685248.000000000, toUInt32(0) > 2251799813685248.000000000, toUInt32(0) >= 2251799813685248.000000000,	2251799813685248.000000000 = toUInt32(0), 2251799813685248.000000000 != toUInt32(0), 2251799813685248.000000000 < toUInt32(0), 2251799813685248.000000000 <= toUInt32(0), 2251799813685248.000000000 > toUInt32(0), 2251799813685248.000000000 >= toUInt32(0) , toInt32(0) = 2251799813685248.000000000, toInt32(0) != 2251799813685248.000000000, toInt32(0) < 2251799813685248.000000000, toInt32(0) <= 2251799813685248.000000000, toInt32(0) > 2251799813685248.000000000, toInt32(0) >= 2251799813685248.000000000,	2251799813685248.000000000 = toInt32(0), 2251799813685248.000000000 != toInt32(0), 2251799813685248.000000000 < toInt32(0), 2251799813685248.000000000 <= toInt32(0), 2251799813685248.000000000 > toInt32(0), 2251799813685248.000000000 >= toInt32(0) , toUInt64(0) = 2251799813685248.000000000, toUInt64(0) != 2251799813685248.000000000, toUInt64(0) < 2251799813685248.000000000, toUInt64(0) <= 2251799813685248.000000000, toUInt64(0) > 2251799813685248.000000000, toUInt64(0) >= 2251799813685248.000000000,	2251799813685248.000000000 = toUInt64(0), 2251799813685248.000000000 != toUInt64(0), 2251799813685248.000000000 < toUInt64(0), 2251799813685248.000000000 <= toUInt64(0), 2251799813685248.000000000 > toUInt64(0), 2251799813685248.000000000 >= toUInt64(0) , toInt64(0) = 2251799813685248.000000000, toInt64(0) != 2251799813685248.000000000, toInt64(0) < 2251799813685248.000000000, toInt64(0) <= 2251799813685248.000000000, toInt64(0) > 2251799813685248.000000000, toInt64(0) >= 2251799813685248.000000000,	2251799813685248.000000000 = toInt64(0), 2251799813685248.000000000 != toInt64(0), 2251799813685248.000000000 < toInt64(0), 2251799813685248.000000000 <= toInt64(0), 2251799813685248.000000000 > toInt64(0), 2251799813685248.000000000 >= toInt64(0) ;
+SELECT '0', '4503599627370496.000000000', 0 = 4503599627370496.000000000, 0 != 4503599627370496.000000000, 0 < 4503599627370496.000000000, 0 <= 4503599627370496.000000000, 0 > 4503599627370496.000000000, 0 >= 4503599627370496.000000000,	4503599627370496.000000000 = 0, 4503599627370496.000000000 != 0, 4503599627370496.000000000 < 0, 4503599627370496.000000000 <= 0, 4503599627370496.000000000 > 0, 4503599627370496.000000000 >= 0 , toUInt8(0) = 4503599627370496.000000000, toUInt8(0) != 4503599627370496.000000000, toUInt8(0) < 4503599627370496.000000000, toUInt8(0) <= 4503599627370496.000000000, toUInt8(0) > 4503599627370496.000000000, toUInt8(0) >= 4503599627370496.000000000,	4503599627370496.000000000 = toUInt8(0), 4503599627370496.000000000 != toUInt8(0), 4503599627370496.000000000 < toUInt8(0), 4503599627370496.000000000 <= toUInt8(0), 4503599627370496.000000000 > toUInt8(0), 4503599627370496.000000000 >= toUInt8(0) , toInt8(0) = 4503599627370496.000000000, toInt8(0) != 4503599627370496.000000000, toInt8(0) < 4503599627370496.000000000, toInt8(0) <= 4503599627370496.000000000, toInt8(0) > 4503599627370496.000000000, toInt8(0) >= 4503599627370496.000000000,	4503599627370496.000000000 = toInt8(0), 4503599627370496.000000000 != toInt8(0), 4503599627370496.000000000 < toInt8(0), 4503599627370496.000000000 <= toInt8(0), 4503599627370496.000000000 > toInt8(0), 4503599627370496.000000000 >= toInt8(0) , toUInt16(0) = 4503599627370496.000000000, toUInt16(0) != 4503599627370496.000000000, toUInt16(0) < 4503599627370496.000000000, toUInt16(0) <= 4503599627370496.000000000, toUInt16(0) > 4503599627370496.000000000, toUInt16(0) >= 4503599627370496.000000000,	4503599627370496.000000000 = toUInt16(0), 4503599627370496.000000000 != toUInt16(0), 4503599627370496.000000000 < toUInt16(0), 4503599627370496.000000000 <= toUInt16(0), 4503599627370496.000000000 > toUInt16(0), 4503599627370496.000000000 >= toUInt16(0) , toInt16(0) = 4503599627370496.000000000, toInt16(0) != 4503599627370496.000000000, toInt16(0) < 4503599627370496.000000000, toInt16(0) <= 4503599627370496.000000000, toInt16(0) > 4503599627370496.000000000, toInt16(0) >= 4503599627370496.000000000,	4503599627370496.000000000 = toInt16(0), 4503599627370496.000000000 != toInt16(0), 4503599627370496.000000000 < toInt16(0), 4503599627370496.000000000 <= toInt16(0), 4503599627370496.000000000 > toInt16(0), 4503599627370496.000000000 >= toInt16(0) , toUInt32(0) = 4503599627370496.000000000, toUInt32(0) != 4503599627370496.000000000, toUInt32(0) < 4503599627370496.000000000, toUInt32(0) <= 4503599627370496.000000000, toUInt32(0) > 4503599627370496.000000000, toUInt32(0) >= 4503599627370496.000000000,	4503599627370496.000000000 = toUInt32(0), 4503599627370496.000000000 != toUInt32(0), 4503599627370496.000000000 < toUInt32(0), 4503599627370496.000000000 <= toUInt32(0), 4503599627370496.000000000 > toUInt32(0), 4503599627370496.000000000 >= toUInt32(0) , toInt32(0) = 4503599627370496.000000000, toInt32(0) != 4503599627370496.000000000, toInt32(0) < 4503599627370496.000000000, toInt32(0) <= 4503599627370496.000000000, toInt32(0) > 4503599627370496.000000000, toInt32(0) >= 4503599627370496.000000000,	4503599627370496.000000000 = toInt32(0), 4503599627370496.000000000 != toInt32(0), 4503599627370496.000000000 < toInt32(0), 4503599627370496.000000000 <= toInt32(0), 4503599627370496.000000000 > toInt32(0), 4503599627370496.000000000 >= toInt32(0) , toUInt64(0) = 4503599627370496.000000000, toUInt64(0) != 4503599627370496.000000000, toUInt64(0) < 4503599627370496.000000000, toUInt64(0) <= 4503599627370496.000000000, toUInt64(0) > 4503599627370496.000000000, toUInt64(0) >= 4503599627370496.000000000,	4503599627370496.000000000 = toUInt64(0), 4503599627370496.000000000 != toUInt64(0), 4503599627370496.000000000 < toUInt64(0), 4503599627370496.000000000 <= toUInt64(0), 4503599627370496.000000000 > toUInt64(0), 4503599627370496.000000000 >= toUInt64(0) , toInt64(0) = 4503599627370496.000000000, toInt64(0) != 4503599627370496.000000000, toInt64(0) < 4503599627370496.000000000, toInt64(0) <= 4503599627370496.000000000, toInt64(0) > 4503599627370496.000000000, toInt64(0) >= 4503599627370496.000000000,	4503599627370496.000000000 = toInt64(0), 4503599627370496.000000000 != toInt64(0), 4503599627370496.000000000 < toInt64(0), 4503599627370496.000000000 <= toInt64(0), 4503599627370496.000000000 > toInt64(0), 4503599627370496.000000000 >= toInt64(0) ;
+SELECT '0', '9007199254740991.000000000', 0 = 9007199254740991.000000000, 0 != 9007199254740991.000000000, 0 < 9007199254740991.000000000, 0 <= 9007199254740991.000000000, 0 > 9007199254740991.000000000, 0 >= 9007199254740991.000000000,	9007199254740991.000000000 = 0, 9007199254740991.000000000 != 0, 9007199254740991.000000000 < 0, 9007199254740991.000000000 <= 0, 9007199254740991.000000000 > 0, 9007199254740991.000000000 >= 0 , toUInt8(0) = 9007199254740991.000000000, toUInt8(0) != 9007199254740991.000000000, toUInt8(0) < 9007199254740991.000000000, toUInt8(0) <= 9007199254740991.000000000, toUInt8(0) > 9007199254740991.000000000, toUInt8(0) >= 9007199254740991.000000000,	9007199254740991.000000000 = toUInt8(0), 9007199254740991.000000000 != toUInt8(0), 9007199254740991.000000000 < toUInt8(0), 9007199254740991.000000000 <= toUInt8(0), 9007199254740991.000000000 > toUInt8(0), 9007199254740991.000000000 >= toUInt8(0) , toInt8(0) = 9007199254740991.000000000, toInt8(0) != 9007199254740991.000000000, toInt8(0) < 9007199254740991.000000000, toInt8(0) <= 9007199254740991.000000000, toInt8(0) > 9007199254740991.000000000, toInt8(0) >= 9007199254740991.000000000,	9007199254740991.000000000 = toInt8(0), 9007199254740991.000000000 != toInt8(0), 9007199254740991.000000000 < toInt8(0), 9007199254740991.000000000 <= toInt8(0), 9007199254740991.000000000 > toInt8(0), 9007199254740991.000000000 >= toInt8(0) , toUInt16(0) = 9007199254740991.000000000, toUInt16(0) != 9007199254740991.000000000, toUInt16(0) < 9007199254740991.000000000, toUInt16(0) <= 9007199254740991.000000000, toUInt16(0) > 9007199254740991.000000000, toUInt16(0) >= 9007199254740991.000000000,	9007199254740991.000000000 = toUInt16(0), 9007199254740991.000000000 != toUInt16(0), 9007199254740991.000000000 < toUInt16(0), 9007199254740991.000000000 <= toUInt16(0), 9007199254740991.000000000 > toUInt16(0), 9007199254740991.000000000 >= toUInt16(0) , toInt16(0) = 9007199254740991.000000000, toInt16(0) != 9007199254740991.000000000, toInt16(0) < 9007199254740991.000000000, toInt16(0) <= 9007199254740991.000000000, toInt16(0) > 9007199254740991.000000000, toInt16(0) >= 9007199254740991.000000000,	9007199254740991.000000000 = toInt16(0), 9007199254740991.000000000 != toInt16(0), 9007199254740991.000000000 < toInt16(0), 9007199254740991.000000000 <= toInt16(0), 9007199254740991.000000000 > toInt16(0), 9007199254740991.000000000 >= toInt16(0) , toUInt32(0) = 9007199254740991.000000000, toUInt32(0) != 9007199254740991.000000000, toUInt32(0) < 9007199254740991.000000000, toUInt32(0) <= 9007199254740991.000000000, toUInt32(0) > 9007199254740991.000000000, toUInt32(0) >= 9007199254740991.000000000,	9007199254740991.000000000 = toUInt32(0), 9007199254740991.000000000 != toUInt32(0), 9007199254740991.000000000 < toUInt32(0), 9007199254740991.000000000 <= toUInt32(0), 9007199254740991.000000000 > toUInt32(0), 9007199254740991.000000000 >= toUInt32(0) , toInt32(0) = 9007199254740991.000000000, toInt32(0) != 9007199254740991.000000000, toInt32(0) < 9007199254740991.000000000, toInt32(0) <= 9007199254740991.000000000, toInt32(0) > 9007199254740991.000000000, toInt32(0) >= 9007199254740991.000000000,	9007199254740991.000000000 = toInt32(0), 9007199254740991.000000000 != toInt32(0), 9007199254740991.000000000 < toInt32(0), 9007199254740991.000000000 <= toInt32(0), 9007199254740991.000000000 > toInt32(0), 9007199254740991.000000000 >= toInt32(0) , toUInt64(0) = 9007199254740991.000000000, toUInt64(0) != 9007199254740991.000000000, toUInt64(0) < 9007199254740991.000000000, toUInt64(0) <= 9007199254740991.000000000, toUInt64(0) > 9007199254740991.000000000, toUInt64(0) >= 9007199254740991.000000000,	9007199254740991.000000000 = toUInt64(0), 9007199254740991.000000000 != toUInt64(0), 9007199254740991.000000000 < toUInt64(0), 9007199254740991.000000000 <= toUInt64(0), 9007199254740991.000000000 > toUInt64(0), 9007199254740991.000000000 >= toUInt64(0) , toInt64(0) = 9007199254740991.000000000, toInt64(0) != 9007199254740991.000000000, toInt64(0) < 9007199254740991.000000000, toInt64(0) <= 9007199254740991.000000000, toInt64(0) > 9007199254740991.000000000, toInt64(0) >= 9007199254740991.000000000,	9007199254740991.000000000 = toInt64(0), 9007199254740991.000000000 != toInt64(0), 9007199254740991.000000000 < toInt64(0), 9007199254740991.000000000 <= toInt64(0), 9007199254740991.000000000 > toInt64(0), 9007199254740991.000000000 >= toInt64(0) ;
+SELECT '0', '9007199254740992.000000000', 0 = 9007199254740992.000000000, 0 != 9007199254740992.000000000, 0 < 9007199254740992.000000000, 0 <= 9007199254740992.000000000, 0 > 9007199254740992.000000000, 0 >= 9007199254740992.000000000,	9007199254740992.000000000 = 0, 9007199254740992.000000000 != 0, 9007199254740992.000000000 < 0, 9007199254740992.000000000 <= 0, 9007199254740992.000000000 > 0, 9007199254740992.000000000 >= 0 , toUInt8(0) = 9007199254740992.000000000, toUInt8(0) != 9007199254740992.000000000, toUInt8(0) < 9007199254740992.000000000, toUInt8(0) <= 9007199254740992.000000000, toUInt8(0) > 9007199254740992.000000000, toUInt8(0) >= 9007199254740992.000000000,	9007199254740992.000000000 = toUInt8(0), 9007199254740992.000000000 != toUInt8(0), 9007199254740992.000000000 < toUInt8(0), 9007199254740992.000000000 <= toUInt8(0), 9007199254740992.000000000 > toUInt8(0), 9007199254740992.000000000 >= toUInt8(0) , toInt8(0) = 9007199254740992.000000000, toInt8(0) != 9007199254740992.000000000, toInt8(0) < 9007199254740992.000000000, toInt8(0) <= 9007199254740992.000000000, toInt8(0) > 9007199254740992.000000000, toInt8(0) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt8(0), 9007199254740992.000000000 != toInt8(0), 9007199254740992.000000000 < toInt8(0), 9007199254740992.000000000 <= toInt8(0), 9007199254740992.000000000 > toInt8(0), 9007199254740992.000000000 >= toInt8(0) , toUInt16(0) = 9007199254740992.000000000, toUInt16(0) != 9007199254740992.000000000, toUInt16(0) < 9007199254740992.000000000, toUInt16(0) <= 9007199254740992.000000000, toUInt16(0) > 9007199254740992.000000000, toUInt16(0) >= 9007199254740992.000000000,	9007199254740992.000000000 = toUInt16(0), 9007199254740992.000000000 != toUInt16(0), 9007199254740992.000000000 < toUInt16(0), 9007199254740992.000000000 <= toUInt16(0), 9007199254740992.000000000 > toUInt16(0), 9007199254740992.000000000 >= toUInt16(0) , toInt16(0) = 9007199254740992.000000000, toInt16(0) != 9007199254740992.000000000, toInt16(0) < 9007199254740992.000000000, toInt16(0) <= 9007199254740992.000000000, toInt16(0) > 9007199254740992.000000000, toInt16(0) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt16(0), 9007199254740992.000000000 != toInt16(0), 9007199254740992.000000000 < toInt16(0), 9007199254740992.000000000 <= toInt16(0), 9007199254740992.000000000 > toInt16(0), 9007199254740992.000000000 >= toInt16(0) , toUInt32(0) = 9007199254740992.000000000, toUInt32(0) != 9007199254740992.000000000, toUInt32(0) < 9007199254740992.000000000, toUInt32(0) <= 9007199254740992.000000000, toUInt32(0) > 9007199254740992.000000000, toUInt32(0) >= 9007199254740992.000000000,	9007199254740992.000000000 = toUInt32(0), 9007199254740992.000000000 != toUInt32(0), 9007199254740992.000000000 < toUInt32(0), 9007199254740992.000000000 <= toUInt32(0), 9007199254740992.000000000 > toUInt32(0), 9007199254740992.000000000 >= toUInt32(0) , toInt32(0) = 9007199254740992.000000000, toInt32(0) != 9007199254740992.000000000, toInt32(0) < 9007199254740992.000000000, toInt32(0) <= 9007199254740992.000000000, toInt32(0) > 9007199254740992.000000000, toInt32(0) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt32(0), 9007199254740992.000000000 != toInt32(0), 9007199254740992.000000000 < toInt32(0), 9007199254740992.000000000 <= toInt32(0), 9007199254740992.000000000 > toInt32(0), 9007199254740992.000000000 >= toInt32(0) , toUInt64(0) = 9007199254740992.000000000, toUInt64(0) != 9007199254740992.000000000, toUInt64(0) < 9007199254740992.000000000, toUInt64(0) <= 9007199254740992.000000000, toUInt64(0) > 9007199254740992.000000000, toUInt64(0) >= 9007199254740992.000000000,	9007199254740992.000000000 = toUInt64(0), 9007199254740992.000000000 != toUInt64(0), 9007199254740992.000000000 < toUInt64(0), 9007199254740992.000000000 <= toUInt64(0), 9007199254740992.000000000 > toUInt64(0), 9007199254740992.000000000 >= toUInt64(0) , toInt64(0) = 9007199254740992.000000000, toInt64(0) != 9007199254740992.000000000, toInt64(0) < 9007199254740992.000000000, toInt64(0) <= 9007199254740992.000000000, toInt64(0) > 9007199254740992.000000000, toInt64(0) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt64(0), 9007199254740992.000000000 != toInt64(0), 9007199254740992.000000000 < toInt64(0), 9007199254740992.000000000 <= toInt64(0), 9007199254740992.000000000 > toInt64(0), 9007199254740992.000000000 >= toInt64(0) ;
+SELECT '0', '9007199254740992.000000000', 0 = 9007199254740992.000000000, 0 != 9007199254740992.000000000, 0 < 9007199254740992.000000000, 0 <= 9007199254740992.000000000, 0 > 9007199254740992.000000000, 0 >= 9007199254740992.000000000,	9007199254740992.000000000 = 0, 9007199254740992.000000000 != 0, 9007199254740992.000000000 < 0, 9007199254740992.000000000 <= 0, 9007199254740992.000000000 > 0, 9007199254740992.000000000 >= 0 , toUInt8(0) = 9007199254740992.000000000, toUInt8(0) != 9007199254740992.000000000, toUInt8(0) < 9007199254740992.000000000, toUInt8(0) <= 9007199254740992.000000000, toUInt8(0) > 9007199254740992.000000000, toUInt8(0) >= 9007199254740992.000000000,	9007199254740992.000000000 = toUInt8(0), 9007199254740992.000000000 != toUInt8(0), 9007199254740992.000000000 < toUInt8(0), 9007199254740992.000000000 <= toUInt8(0), 9007199254740992.000000000 > toUInt8(0), 9007199254740992.000000000 >= toUInt8(0) , toInt8(0) = 9007199254740992.000000000, toInt8(0) != 9007199254740992.000000000, toInt8(0) < 9007199254740992.000000000, toInt8(0) <= 9007199254740992.000000000, toInt8(0) > 9007199254740992.000000000, toInt8(0) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt8(0), 9007199254740992.000000000 != toInt8(0), 9007199254740992.000000000 < toInt8(0), 9007199254740992.000000000 <= toInt8(0), 9007199254740992.000000000 > toInt8(0), 9007199254740992.000000000 >= toInt8(0) , toUInt16(0) = 9007199254740992.000000000, toUInt16(0) != 9007199254740992.000000000, toUInt16(0) < 9007199254740992.000000000, toUInt16(0) <= 9007199254740992.000000000, toUInt16(0) > 9007199254740992.000000000, toUInt16(0) >= 9007199254740992.000000000,	9007199254740992.000000000 = toUInt16(0), 9007199254740992.000000000 != toUInt16(0), 9007199254740992.000000000 < toUInt16(0), 9007199254740992.000000000 <= toUInt16(0), 9007199254740992.000000000 > toUInt16(0), 9007199254740992.000000000 >= toUInt16(0) , toInt16(0) = 9007199254740992.000000000, toInt16(0) != 9007199254740992.000000000, toInt16(0) < 9007199254740992.000000000, toInt16(0) <= 9007199254740992.000000000, toInt16(0) > 9007199254740992.000000000, toInt16(0) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt16(0), 9007199254740992.000000000 != toInt16(0), 9007199254740992.000000000 < toInt16(0), 9007199254740992.000000000 <= toInt16(0), 9007199254740992.000000000 > toInt16(0), 9007199254740992.000000000 >= toInt16(0) , toUInt32(0) = 9007199254740992.000000000, toUInt32(0) != 9007199254740992.000000000, toUInt32(0) < 9007199254740992.000000000, toUInt32(0) <= 9007199254740992.000000000, toUInt32(0) > 9007199254740992.000000000, toUInt32(0) >= 9007199254740992.000000000,	9007199254740992.000000000 = toUInt32(0), 9007199254740992.000000000 != toUInt32(0), 9007199254740992.000000000 < toUInt32(0), 9007199254740992.000000000 <= toUInt32(0), 9007199254740992.000000000 > toUInt32(0), 9007199254740992.000000000 >= toUInt32(0) , toInt32(0) = 9007199254740992.000000000, toInt32(0) != 9007199254740992.000000000, toInt32(0) < 9007199254740992.000000000, toInt32(0) <= 9007199254740992.000000000, toInt32(0) > 9007199254740992.000000000, toInt32(0) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt32(0), 9007199254740992.000000000 != toInt32(0), 9007199254740992.000000000 < toInt32(0), 9007199254740992.000000000 <= toInt32(0), 9007199254740992.000000000 > toInt32(0), 9007199254740992.000000000 >= toInt32(0) , toUInt64(0) = 9007199254740992.000000000, toUInt64(0) != 9007199254740992.000000000, toUInt64(0) < 9007199254740992.000000000, toUInt64(0) <= 9007199254740992.000000000, toUInt64(0) > 9007199254740992.000000000, toUInt64(0) >= 9007199254740992.000000000,	9007199254740992.000000000 = toUInt64(0), 9007199254740992.000000000 != toUInt64(0), 9007199254740992.000000000 < toUInt64(0), 9007199254740992.000000000 <= toUInt64(0), 9007199254740992.000000000 > toUInt64(0), 9007199254740992.000000000 >= toUInt64(0) , toInt64(0) = 9007199254740992.000000000, toInt64(0) != 9007199254740992.000000000, toInt64(0) < 9007199254740992.000000000, toInt64(0) <= 9007199254740992.000000000, toInt64(0) > 9007199254740992.000000000, toInt64(0) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt64(0), 9007199254740992.000000000 != toInt64(0), 9007199254740992.000000000 < toInt64(0), 9007199254740992.000000000 <= toInt64(0), 9007199254740992.000000000 > toInt64(0), 9007199254740992.000000000 >= toInt64(0) ;
+SELECT '0', '9007199254740994.000000000', 0 = 9007199254740994.000000000, 0 != 9007199254740994.000000000, 0 < 9007199254740994.000000000, 0 <= 9007199254740994.000000000, 0 > 9007199254740994.000000000, 0 >= 9007199254740994.000000000,	9007199254740994.000000000 = 0, 9007199254740994.000000000 != 0, 9007199254740994.000000000 < 0, 9007199254740994.000000000 <= 0, 9007199254740994.000000000 > 0, 9007199254740994.000000000 >= 0 , toUInt8(0) = 9007199254740994.000000000, toUInt8(0) != 9007199254740994.000000000, toUInt8(0) < 9007199254740994.000000000, toUInt8(0) <= 9007199254740994.000000000, toUInt8(0) > 9007199254740994.000000000, toUInt8(0) >= 9007199254740994.000000000,	9007199254740994.000000000 = toUInt8(0), 9007199254740994.000000000 != toUInt8(0), 9007199254740994.000000000 < toUInt8(0), 9007199254740994.000000000 <= toUInt8(0), 9007199254740994.000000000 > toUInt8(0), 9007199254740994.000000000 >= toUInt8(0) , toInt8(0) = 9007199254740994.000000000, toInt8(0) != 9007199254740994.000000000, toInt8(0) < 9007199254740994.000000000, toInt8(0) <= 9007199254740994.000000000, toInt8(0) > 9007199254740994.000000000, toInt8(0) >= 9007199254740994.000000000,	9007199254740994.000000000 = toInt8(0), 9007199254740994.000000000 != toInt8(0), 9007199254740994.000000000 < toInt8(0), 9007199254740994.000000000 <= toInt8(0), 9007199254740994.000000000 > toInt8(0), 9007199254740994.000000000 >= toInt8(0) , toUInt16(0) = 9007199254740994.000000000, toUInt16(0) != 9007199254740994.000000000, toUInt16(0) < 9007199254740994.000000000, toUInt16(0) <= 9007199254740994.000000000, toUInt16(0) > 9007199254740994.000000000, toUInt16(0) >= 9007199254740994.000000000,	9007199254740994.000000000 = toUInt16(0), 9007199254740994.000000000 != toUInt16(0), 9007199254740994.000000000 < toUInt16(0), 9007199254740994.000000000 <= toUInt16(0), 9007199254740994.000000000 > toUInt16(0), 9007199254740994.000000000 >= toUInt16(0) , toInt16(0) = 9007199254740994.000000000, toInt16(0) != 9007199254740994.000000000, toInt16(0) < 9007199254740994.000000000, toInt16(0) <= 9007199254740994.000000000, toInt16(0) > 9007199254740994.000000000, toInt16(0) >= 9007199254740994.000000000,	9007199254740994.000000000 = toInt16(0), 9007199254740994.000000000 != toInt16(0), 9007199254740994.000000000 < toInt16(0), 9007199254740994.000000000 <= toInt16(0), 9007199254740994.000000000 > toInt16(0), 9007199254740994.000000000 >= toInt16(0) , toUInt32(0) = 9007199254740994.000000000, toUInt32(0) != 9007199254740994.000000000, toUInt32(0) < 9007199254740994.000000000, toUInt32(0) <= 9007199254740994.000000000, toUInt32(0) > 9007199254740994.000000000, toUInt32(0) >= 9007199254740994.000000000,	9007199254740994.000000000 = toUInt32(0), 9007199254740994.000000000 != toUInt32(0), 9007199254740994.000000000 < toUInt32(0), 9007199254740994.000000000 <= toUInt32(0), 9007199254740994.000000000 > toUInt32(0), 9007199254740994.000000000 >= toUInt32(0) , toInt32(0) = 9007199254740994.000000000, toInt32(0) != 9007199254740994.000000000, toInt32(0) < 9007199254740994.000000000, toInt32(0) <= 9007199254740994.000000000, toInt32(0) > 9007199254740994.000000000, toInt32(0) >= 9007199254740994.000000000,	9007199254740994.000000000 = toInt32(0), 9007199254740994.000000000 != toInt32(0), 9007199254740994.000000000 < toInt32(0), 9007199254740994.000000000 <= toInt32(0), 9007199254740994.000000000 > toInt32(0), 9007199254740994.000000000 >= toInt32(0) , toUInt64(0) = 9007199254740994.000000000, toUInt64(0) != 9007199254740994.000000000, toUInt64(0) < 9007199254740994.000000000, toUInt64(0) <= 9007199254740994.000000000, toUInt64(0) > 9007199254740994.000000000, toUInt64(0) >= 9007199254740994.000000000,	9007199254740994.000000000 = toUInt64(0), 9007199254740994.000000000 != toUInt64(0), 9007199254740994.000000000 < toUInt64(0), 9007199254740994.000000000 <= toUInt64(0), 9007199254740994.000000000 > toUInt64(0), 9007199254740994.000000000 >= toUInt64(0) , toInt64(0) = 9007199254740994.000000000, toInt64(0) != 9007199254740994.000000000, toInt64(0) < 9007199254740994.000000000, toInt64(0) <= 9007199254740994.000000000, toInt64(0) > 9007199254740994.000000000, toInt64(0) >= 9007199254740994.000000000,	9007199254740994.000000000 = toInt64(0), 9007199254740994.000000000 != toInt64(0), 9007199254740994.000000000 < toInt64(0), 9007199254740994.000000000 <= toInt64(0), 9007199254740994.000000000 > toInt64(0), 9007199254740994.000000000 >= toInt64(0) ;
+SELECT '0', '-9007199254740991.000000000', 0 = -9007199254740991.000000000, 0 != -9007199254740991.000000000, 0 < -9007199254740991.000000000, 0 <= -9007199254740991.000000000, 0 > -9007199254740991.000000000, 0 >= -9007199254740991.000000000,	-9007199254740991.000000000 = 0, -9007199254740991.000000000 != 0, -9007199254740991.000000000 < 0, -9007199254740991.000000000 <= 0, -9007199254740991.000000000 > 0, -9007199254740991.000000000 >= 0 , toUInt8(0) = -9007199254740991.000000000, toUInt8(0) != -9007199254740991.000000000, toUInt8(0) < -9007199254740991.000000000, toUInt8(0) <= -9007199254740991.000000000, toUInt8(0) > -9007199254740991.000000000, toUInt8(0) >= -9007199254740991.000000000,	-9007199254740991.000000000 = toUInt8(0), -9007199254740991.000000000 != toUInt8(0), -9007199254740991.000000000 < toUInt8(0), -9007199254740991.000000000 <= toUInt8(0), -9007199254740991.000000000 > toUInt8(0), -9007199254740991.000000000 >= toUInt8(0) , toInt8(0) = -9007199254740991.000000000, toInt8(0) != -9007199254740991.000000000, toInt8(0) < -9007199254740991.000000000, toInt8(0) <= -9007199254740991.000000000, toInt8(0) > -9007199254740991.000000000, toInt8(0) >= -9007199254740991.000000000,	-9007199254740991.000000000 = toInt8(0), -9007199254740991.000000000 != toInt8(0), -9007199254740991.000000000 < toInt8(0), -9007199254740991.000000000 <= toInt8(0), -9007199254740991.000000000 > toInt8(0), -9007199254740991.000000000 >= toInt8(0) , toUInt16(0) = -9007199254740991.000000000, toUInt16(0) != -9007199254740991.000000000, toUInt16(0) < -9007199254740991.000000000, toUInt16(0) <= -9007199254740991.000000000, toUInt16(0) > -9007199254740991.000000000, toUInt16(0) >= -9007199254740991.000000000,	-9007199254740991.000000000 = toUInt16(0), -9007199254740991.000000000 != toUInt16(0), -9007199254740991.000000000 < toUInt16(0), -9007199254740991.000000000 <= toUInt16(0), -9007199254740991.000000000 > toUInt16(0), -9007199254740991.000000000 >= toUInt16(0) , toInt16(0) = -9007199254740991.000000000, toInt16(0) != -9007199254740991.000000000, toInt16(0) < -9007199254740991.000000000, toInt16(0) <= -9007199254740991.000000000, toInt16(0) > -9007199254740991.000000000, toInt16(0) >= -9007199254740991.000000000,	-9007199254740991.000000000 = toInt16(0), -9007199254740991.000000000 != toInt16(0), -9007199254740991.000000000 < toInt16(0), -9007199254740991.000000000 <= toInt16(0), -9007199254740991.000000000 > toInt16(0), -9007199254740991.000000000 >= toInt16(0) , toUInt32(0) = -9007199254740991.000000000, toUInt32(0) != -9007199254740991.000000000, toUInt32(0) < -9007199254740991.000000000, toUInt32(0) <= -9007199254740991.000000000, toUInt32(0) > -9007199254740991.000000000, toUInt32(0) >= -9007199254740991.000000000,	-9007199254740991.000000000 = toUInt32(0), -9007199254740991.000000000 != toUInt32(0), -9007199254740991.000000000 < toUInt32(0), -9007199254740991.000000000 <= toUInt32(0), -9007199254740991.000000000 > toUInt32(0), -9007199254740991.000000000 >= toUInt32(0) , toInt32(0) = -9007199254740991.000000000, toInt32(0) != -9007199254740991.000000000, toInt32(0) < -9007199254740991.000000000, toInt32(0) <= -9007199254740991.000000000, toInt32(0) > -9007199254740991.000000000, toInt32(0) >= -9007199254740991.000000000,	-9007199254740991.000000000 = toInt32(0), -9007199254740991.000000000 != toInt32(0), -9007199254740991.000000000 < toInt32(0), -9007199254740991.000000000 <= toInt32(0), -9007199254740991.000000000 > toInt32(0), -9007199254740991.000000000 >= toInt32(0) , toUInt64(0) = -9007199254740991.000000000, toUInt64(0) != -9007199254740991.000000000, toUInt64(0) < -9007199254740991.000000000, toUInt64(0) <= -9007199254740991.000000000, toUInt64(0) > -9007199254740991.000000000, toUInt64(0) >= -9007199254740991.000000000,	-9007199254740991.000000000 = toUInt64(0), -9007199254740991.000000000 != toUInt64(0), -9007199254740991.000000000 < toUInt64(0), -9007199254740991.000000000 <= toUInt64(0), -9007199254740991.000000000 > toUInt64(0), -9007199254740991.000000000 >= toUInt64(0) , toInt64(0) = -9007199254740991.000000000, toInt64(0) != -9007199254740991.000000000, toInt64(0) < -9007199254740991.000000000, toInt64(0) <= -9007199254740991.000000000, toInt64(0) > -9007199254740991.000000000, toInt64(0) >= -9007199254740991.000000000,	-9007199254740991.000000000 = toInt64(0), -9007199254740991.000000000 != toInt64(0), -9007199254740991.000000000 < toInt64(0), -9007199254740991.000000000 <= toInt64(0), -9007199254740991.000000000 > toInt64(0), -9007199254740991.000000000 >= toInt64(0) ;
+SELECT '0', '-9007199254740992.000000000', 0 = -9007199254740992.000000000, 0 != -9007199254740992.000000000, 0 < -9007199254740992.000000000, 0 <= -9007199254740992.000000000, 0 > -9007199254740992.000000000, 0 >= -9007199254740992.000000000,	-9007199254740992.000000000 = 0, -9007199254740992.000000000 != 0, -9007199254740992.000000000 < 0, -9007199254740992.000000000 <= 0, -9007199254740992.000000000 > 0, -9007199254740992.000000000 >= 0 , toUInt8(0) = -9007199254740992.000000000, toUInt8(0) != -9007199254740992.000000000, toUInt8(0) < -9007199254740992.000000000, toUInt8(0) <= -9007199254740992.000000000, toUInt8(0) > -9007199254740992.000000000, toUInt8(0) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toUInt8(0), -9007199254740992.000000000 != toUInt8(0), -9007199254740992.000000000 < toUInt8(0), -9007199254740992.000000000 <= toUInt8(0), -9007199254740992.000000000 > toUInt8(0), -9007199254740992.000000000 >= toUInt8(0) , toInt8(0) = -9007199254740992.000000000, toInt8(0) != -9007199254740992.000000000, toInt8(0) < -9007199254740992.000000000, toInt8(0) <= -9007199254740992.000000000, toInt8(0) > -9007199254740992.000000000, toInt8(0) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toInt8(0), -9007199254740992.000000000 != toInt8(0), -9007199254740992.000000000 < toInt8(0), -9007199254740992.000000000 <= toInt8(0), -9007199254740992.000000000 > toInt8(0), -9007199254740992.000000000 >= toInt8(0) , toUInt16(0) = -9007199254740992.000000000, toUInt16(0) != -9007199254740992.000000000, toUInt16(0) < -9007199254740992.000000000, toUInt16(0) <= -9007199254740992.000000000, toUInt16(0) > -9007199254740992.000000000, toUInt16(0) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toUInt16(0), -9007199254740992.000000000 != toUInt16(0), -9007199254740992.000000000 < toUInt16(0), -9007199254740992.000000000 <= toUInt16(0), -9007199254740992.000000000 > toUInt16(0), -9007199254740992.000000000 >= toUInt16(0) , toInt16(0) = -9007199254740992.000000000, toInt16(0) != -9007199254740992.000000000, toInt16(0) < -9007199254740992.000000000, toInt16(0) <= -9007199254740992.000000000, toInt16(0) > -9007199254740992.000000000, toInt16(0) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toInt16(0), -9007199254740992.000000000 != toInt16(0), -9007199254740992.000000000 < toInt16(0), -9007199254740992.000000000 <= toInt16(0), -9007199254740992.000000000 > toInt16(0), -9007199254740992.000000000 >= toInt16(0) , toUInt32(0) = -9007199254740992.000000000, toUInt32(0) != -9007199254740992.000000000, toUInt32(0) < -9007199254740992.000000000, toUInt32(0) <= -9007199254740992.000000000, toUInt32(0) > -9007199254740992.000000000, toUInt32(0) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toUInt32(0), -9007199254740992.000000000 != toUInt32(0), -9007199254740992.000000000 < toUInt32(0), -9007199254740992.000000000 <= toUInt32(0), -9007199254740992.000000000 > toUInt32(0), -9007199254740992.000000000 >= toUInt32(0) , toInt32(0) = -9007199254740992.000000000, toInt32(0) != -9007199254740992.000000000, toInt32(0) < -9007199254740992.000000000, toInt32(0) <= -9007199254740992.000000000, toInt32(0) > -9007199254740992.000000000, toInt32(0) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toInt32(0), -9007199254740992.000000000 != toInt32(0), -9007199254740992.000000000 < toInt32(0), -9007199254740992.000000000 <= toInt32(0), -9007199254740992.000000000 > toInt32(0), -9007199254740992.000000000 >= toInt32(0) , toUInt64(0) = -9007199254740992.000000000, toUInt64(0) != -9007199254740992.000000000, toUInt64(0) < -9007199254740992.000000000, toUInt64(0) <= -9007199254740992.000000000, toUInt64(0) > -9007199254740992.000000000, toUInt64(0) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toUInt64(0), -9007199254740992.000000000 != toUInt64(0), -9007199254740992.000000000 < toUInt64(0), -9007199254740992.000000000 <= toUInt64(0), -9007199254740992.000000000 > toUInt64(0), -9007199254740992.000000000 >= toUInt64(0) , toInt64(0) = -9007199254740992.000000000, toInt64(0) != -9007199254740992.000000000, toInt64(0) < -9007199254740992.000000000, toInt64(0) <= -9007199254740992.000000000, toInt64(0) > -9007199254740992.000000000, toInt64(0) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toInt64(0), -9007199254740992.000000000 != toInt64(0), -9007199254740992.000000000 < toInt64(0), -9007199254740992.000000000 <= toInt64(0), -9007199254740992.000000000 > toInt64(0), -9007199254740992.000000000 >= toInt64(0) ;
+SELECT '0', '-9007199254740992.000000000', 0 = -9007199254740992.000000000, 0 != -9007199254740992.000000000, 0 < -9007199254740992.000000000, 0 <= -9007199254740992.000000000, 0 > -9007199254740992.000000000, 0 >= -9007199254740992.000000000,	-9007199254740992.000000000 = 0, -9007199254740992.000000000 != 0, -9007199254740992.000000000 < 0, -9007199254740992.000000000 <= 0, -9007199254740992.000000000 > 0, -9007199254740992.000000000 >= 0 , toUInt8(0) = -9007199254740992.000000000, toUInt8(0) != -9007199254740992.000000000, toUInt8(0) < -9007199254740992.000000000, toUInt8(0) <= -9007199254740992.000000000, toUInt8(0) > -9007199254740992.000000000, toUInt8(0) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toUInt8(0), -9007199254740992.000000000 != toUInt8(0), -9007199254740992.000000000 < toUInt8(0), -9007199254740992.000000000 <= toUInt8(0), -9007199254740992.000000000 > toUInt8(0), -9007199254740992.000000000 >= toUInt8(0) , toInt8(0) = -9007199254740992.000000000, toInt8(0) != -9007199254740992.000000000, toInt8(0) < -9007199254740992.000000000, toInt8(0) <= -9007199254740992.000000000, toInt8(0) > -9007199254740992.000000000, toInt8(0) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toInt8(0), -9007199254740992.000000000 != toInt8(0), -9007199254740992.000000000 < toInt8(0), -9007199254740992.000000000 <= toInt8(0), -9007199254740992.000000000 > toInt8(0), -9007199254740992.000000000 >= toInt8(0) , toUInt16(0) = -9007199254740992.000000000, toUInt16(0) != -9007199254740992.000000000, toUInt16(0) < -9007199254740992.000000000, toUInt16(0) <= -9007199254740992.000000000, toUInt16(0) > -9007199254740992.000000000, toUInt16(0) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toUInt16(0), -9007199254740992.000000000 != toUInt16(0), -9007199254740992.000000000 < toUInt16(0), -9007199254740992.000000000 <= toUInt16(0), -9007199254740992.000000000 > toUInt16(0), -9007199254740992.000000000 >= toUInt16(0) , toInt16(0) = -9007199254740992.000000000, toInt16(0) != -9007199254740992.000000000, toInt16(0) < -9007199254740992.000000000, toInt16(0) <= -9007199254740992.000000000, toInt16(0) > -9007199254740992.000000000, toInt16(0) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toInt16(0), -9007199254740992.000000000 != toInt16(0), -9007199254740992.000000000 < toInt16(0), -9007199254740992.000000000 <= toInt16(0), -9007199254740992.000000000 > toInt16(0), -9007199254740992.000000000 >= toInt16(0) , toUInt32(0) = -9007199254740992.000000000, toUInt32(0) != -9007199254740992.000000000, toUInt32(0) < -9007199254740992.000000000, toUInt32(0) <= -9007199254740992.000000000, toUInt32(0) > -9007199254740992.000000000, toUInt32(0) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toUInt32(0), -9007199254740992.000000000 != toUInt32(0), -9007199254740992.000000000 < toUInt32(0), -9007199254740992.000000000 <= toUInt32(0), -9007199254740992.000000000 > toUInt32(0), -9007199254740992.000000000 >= toUInt32(0) , toInt32(0) = -9007199254740992.000000000, toInt32(0) != -9007199254740992.000000000, toInt32(0) < -9007199254740992.000000000, toInt32(0) <= -9007199254740992.000000000, toInt32(0) > -9007199254740992.000000000, toInt32(0) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toInt32(0), -9007199254740992.000000000 != toInt32(0), -9007199254740992.000000000 < toInt32(0), -9007199254740992.000000000 <= toInt32(0), -9007199254740992.000000000 > toInt32(0), -9007199254740992.000000000 >= toInt32(0) , toUInt64(0) = -9007199254740992.000000000, toUInt64(0) != -9007199254740992.000000000, toUInt64(0) < -9007199254740992.000000000, toUInt64(0) <= -9007199254740992.000000000, toUInt64(0) > -9007199254740992.000000000, toUInt64(0) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toUInt64(0), -9007199254740992.000000000 != toUInt64(0), -9007199254740992.000000000 < toUInt64(0), -9007199254740992.000000000 <= toUInt64(0), -9007199254740992.000000000 > toUInt64(0), -9007199254740992.000000000 >= toUInt64(0) , toInt64(0) = -9007199254740992.000000000, toInt64(0) != -9007199254740992.000000000, toInt64(0) < -9007199254740992.000000000, toInt64(0) <= -9007199254740992.000000000, toInt64(0) > -9007199254740992.000000000, toInt64(0) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toInt64(0), -9007199254740992.000000000 != toInt64(0), -9007199254740992.000000000 < toInt64(0), -9007199254740992.000000000 <= toInt64(0), -9007199254740992.000000000 > toInt64(0), -9007199254740992.000000000 >= toInt64(0) ;
+SELECT '0', '-9007199254740994.000000000', 0 = -9007199254740994.000000000, 0 != -9007199254740994.000000000, 0 < -9007199254740994.000000000, 0 <= -9007199254740994.000000000, 0 > -9007199254740994.000000000, 0 >= -9007199254740994.000000000,	-9007199254740994.000000000 = 0, -9007199254740994.000000000 != 0, -9007199254740994.000000000 < 0, -9007199254740994.000000000 <= 0, -9007199254740994.000000000 > 0, -9007199254740994.000000000 >= 0 , toUInt8(0) = -9007199254740994.000000000, toUInt8(0) != -9007199254740994.000000000, toUInt8(0) < -9007199254740994.000000000, toUInt8(0) <= -9007199254740994.000000000, toUInt8(0) > -9007199254740994.000000000, toUInt8(0) >= -9007199254740994.000000000,	-9007199254740994.000000000 = toUInt8(0), -9007199254740994.000000000 != toUInt8(0), -9007199254740994.000000000 < toUInt8(0), -9007199254740994.000000000 <= toUInt8(0), -9007199254740994.000000000 > toUInt8(0), -9007199254740994.000000000 >= toUInt8(0) , toInt8(0) = -9007199254740994.000000000, toInt8(0) != -9007199254740994.000000000, toInt8(0) < -9007199254740994.000000000, toInt8(0) <= -9007199254740994.000000000, toInt8(0) > -9007199254740994.000000000, toInt8(0) >= -9007199254740994.000000000,	-9007199254740994.000000000 = toInt8(0), -9007199254740994.000000000 != toInt8(0), -9007199254740994.000000000 < toInt8(0), -9007199254740994.000000000 <= toInt8(0), -9007199254740994.000000000 > toInt8(0), -9007199254740994.000000000 >= toInt8(0) , toUInt16(0) = -9007199254740994.000000000, toUInt16(0) != -9007199254740994.000000000, toUInt16(0) < -9007199254740994.000000000, toUInt16(0) <= -9007199254740994.000000000, toUInt16(0) > -9007199254740994.000000000, toUInt16(0) >= -9007199254740994.000000000,	-9007199254740994.000000000 = toUInt16(0), -9007199254740994.000000000 != toUInt16(0), -9007199254740994.000000000 < toUInt16(0), -9007199254740994.000000000 <= toUInt16(0), -9007199254740994.000000000 > toUInt16(0), -9007199254740994.000000000 >= toUInt16(0) , toInt16(0) = -9007199254740994.000000000, toInt16(0) != -9007199254740994.000000000, toInt16(0) < -9007199254740994.000000000, toInt16(0) <= -9007199254740994.000000000, toInt16(0) > -9007199254740994.000000000, toInt16(0) >= -9007199254740994.000000000,	-9007199254740994.000000000 = toInt16(0), -9007199254740994.000000000 != toInt16(0), -9007199254740994.000000000 < toInt16(0), -9007199254740994.000000000 <= toInt16(0), -9007199254740994.000000000 > toInt16(0), -9007199254740994.000000000 >= toInt16(0) , toUInt32(0) = -9007199254740994.000000000, toUInt32(0) != -9007199254740994.000000000, toUInt32(0) < -9007199254740994.000000000, toUInt32(0) <= -9007199254740994.000000000, toUInt32(0) > -9007199254740994.000000000, toUInt32(0) >= -9007199254740994.000000000,	-9007199254740994.000000000 = toUInt32(0), -9007199254740994.000000000 != toUInt32(0), -9007199254740994.000000000 < toUInt32(0), -9007199254740994.000000000 <= toUInt32(0), -9007199254740994.000000000 > toUInt32(0), -9007199254740994.000000000 >= toUInt32(0) , toInt32(0) = -9007199254740994.000000000, toInt32(0) != -9007199254740994.000000000, toInt32(0) < -9007199254740994.000000000, toInt32(0) <= -9007199254740994.000000000, toInt32(0) > -9007199254740994.000000000, toInt32(0) >= -9007199254740994.000000000,	-9007199254740994.000000000 = toInt32(0), -9007199254740994.000000000 != toInt32(0), -9007199254740994.000000000 < toInt32(0), -9007199254740994.000000000 <= toInt32(0), -9007199254740994.000000000 > toInt32(0), -9007199254740994.000000000 >= toInt32(0) , toUInt64(0) = -9007199254740994.000000000, toUInt64(0) != -9007199254740994.000000000, toUInt64(0) < -9007199254740994.000000000, toUInt64(0) <= -9007199254740994.000000000, toUInt64(0) > -9007199254740994.000000000, toUInt64(0) >= -9007199254740994.000000000,	-9007199254740994.000000000 = toUInt64(0), -9007199254740994.000000000 != toUInt64(0), -9007199254740994.000000000 < toUInt64(0), -9007199254740994.000000000 <= toUInt64(0), -9007199254740994.000000000 > toUInt64(0), -9007199254740994.000000000 >= toUInt64(0) , toInt64(0) = -9007199254740994.000000000, toInt64(0) != -9007199254740994.000000000, toInt64(0) < -9007199254740994.000000000, toInt64(0) <= -9007199254740994.000000000, toInt64(0) > -9007199254740994.000000000, toInt64(0) >= -9007199254740994.000000000,	-9007199254740994.000000000 = toInt64(0), -9007199254740994.000000000 != toInt64(0), -9007199254740994.000000000 < toInt64(0), -9007199254740994.000000000 <= toInt64(0), -9007199254740994.000000000 > toInt64(0), -9007199254740994.000000000 >= toInt64(0) ;
+SELECT '0', '104.000000000', 0 = 104.000000000, 0 != 104.000000000, 0 < 104.000000000, 0 <= 104.000000000, 0 > 104.000000000, 0 >= 104.000000000,	104.000000000 = 0, 104.000000000 != 0, 104.000000000 < 0, 104.000000000 <= 0, 104.000000000 > 0, 104.000000000 >= 0 , toUInt8(0) = 104.000000000, toUInt8(0) != 104.000000000, toUInt8(0) < 104.000000000, toUInt8(0) <= 104.000000000, toUInt8(0) > 104.000000000, toUInt8(0) >= 104.000000000,	104.000000000 = toUInt8(0), 104.000000000 != toUInt8(0), 104.000000000 < toUInt8(0), 104.000000000 <= toUInt8(0), 104.000000000 > toUInt8(0), 104.000000000 >= toUInt8(0) , toInt8(0) = 104.000000000, toInt8(0) != 104.000000000, toInt8(0) < 104.000000000, toInt8(0) <= 104.000000000, toInt8(0) > 104.000000000, toInt8(0) >= 104.000000000,	104.000000000 = toInt8(0), 104.000000000 != toInt8(0), 104.000000000 < toInt8(0), 104.000000000 <= toInt8(0), 104.000000000 > toInt8(0), 104.000000000 >= toInt8(0) , toUInt16(0) = 104.000000000, toUInt16(0) != 104.000000000, toUInt16(0) < 104.000000000, toUInt16(0) <= 104.000000000, toUInt16(0) > 104.000000000, toUInt16(0) >= 104.000000000,	104.000000000 = toUInt16(0), 104.000000000 != toUInt16(0), 104.000000000 < toUInt16(0), 104.000000000 <= toUInt16(0), 104.000000000 > toUInt16(0), 104.000000000 >= toUInt16(0) , toInt16(0) = 104.000000000, toInt16(0) != 104.000000000, toInt16(0) < 104.000000000, toInt16(0) <= 104.000000000, toInt16(0) > 104.000000000, toInt16(0) >= 104.000000000,	104.000000000 = toInt16(0), 104.000000000 != toInt16(0), 104.000000000 < toInt16(0), 104.000000000 <= toInt16(0), 104.000000000 > toInt16(0), 104.000000000 >= toInt16(0) , toUInt32(0) = 104.000000000, toUInt32(0) != 104.000000000, toUInt32(0) < 104.000000000, toUInt32(0) <= 104.000000000, toUInt32(0) > 104.000000000, toUInt32(0) >= 104.000000000,	104.000000000 = toUInt32(0), 104.000000000 != toUInt32(0), 104.000000000 < toUInt32(0), 104.000000000 <= toUInt32(0), 104.000000000 > toUInt32(0), 104.000000000 >= toUInt32(0) , toInt32(0) = 104.000000000, toInt32(0) != 104.000000000, toInt32(0) < 104.000000000, toInt32(0) <= 104.000000000, toInt32(0) > 104.000000000, toInt32(0) >= 104.000000000,	104.000000000 = toInt32(0), 104.000000000 != toInt32(0), 104.000000000 < toInt32(0), 104.000000000 <= toInt32(0), 104.000000000 > toInt32(0), 104.000000000 >= toInt32(0) , toUInt64(0) = 104.000000000, toUInt64(0) != 104.000000000, toUInt64(0) < 104.000000000, toUInt64(0) <= 104.000000000, toUInt64(0) > 104.000000000, toUInt64(0) >= 104.000000000,	104.000000000 = toUInt64(0), 104.000000000 != toUInt64(0), 104.000000000 < toUInt64(0), 104.000000000 <= toUInt64(0), 104.000000000 > toUInt64(0), 104.000000000 >= toUInt64(0) , toInt64(0) = 104.000000000, toInt64(0) != 104.000000000, toInt64(0) < 104.000000000, toInt64(0) <= 104.000000000, toInt64(0) > 104.000000000, toInt64(0) >= 104.000000000,	104.000000000 = toInt64(0), 104.000000000 != toInt64(0), 104.000000000 < toInt64(0), 104.000000000 <= toInt64(0), 104.000000000 > toInt64(0), 104.000000000 >= toInt64(0) ;
+SELECT '0', '-4503599627370496.000000000', 0 = -4503599627370496.000000000, 0 != -4503599627370496.000000000, 0 < -4503599627370496.000000000, 0 <= -4503599627370496.000000000, 0 > -4503599627370496.000000000, 0 >= -4503599627370496.000000000,	-4503599627370496.000000000 = 0, -4503599627370496.000000000 != 0, -4503599627370496.000000000 < 0, -4503599627370496.000000000 <= 0, -4503599627370496.000000000 > 0, -4503599627370496.000000000 >= 0 , toUInt8(0) = -4503599627370496.000000000, toUInt8(0) != -4503599627370496.000000000, toUInt8(0) < -4503599627370496.000000000, toUInt8(0) <= -4503599627370496.000000000, toUInt8(0) > -4503599627370496.000000000, toUInt8(0) >= -4503599627370496.000000000,	-4503599627370496.000000000 = toUInt8(0), -4503599627370496.000000000 != toUInt8(0), -4503599627370496.000000000 < toUInt8(0), -4503599627370496.000000000 <= toUInt8(0), -4503599627370496.000000000 > toUInt8(0), -4503599627370496.000000000 >= toUInt8(0) , toInt8(0) = -4503599627370496.000000000, toInt8(0) != -4503599627370496.000000000, toInt8(0) < -4503599627370496.000000000, toInt8(0) <= -4503599627370496.000000000, toInt8(0) > -4503599627370496.000000000, toInt8(0) >= -4503599627370496.000000000,	-4503599627370496.000000000 = toInt8(0), -4503599627370496.000000000 != toInt8(0), -4503599627370496.000000000 < toInt8(0), -4503599627370496.000000000 <= toInt8(0), -4503599627370496.000000000 > toInt8(0), -4503599627370496.000000000 >= toInt8(0) , toUInt16(0) = -4503599627370496.000000000, toUInt16(0) != -4503599627370496.000000000, toUInt16(0) < -4503599627370496.000000000, toUInt16(0) <= -4503599627370496.000000000, toUInt16(0) > -4503599627370496.000000000, toUInt16(0) >= -4503599627370496.000000000,	-4503599627370496.000000000 = toUInt16(0), -4503599627370496.000000000 != toUInt16(0), -4503599627370496.000000000 < toUInt16(0), -4503599627370496.000000000 <= toUInt16(0), -4503599627370496.000000000 > toUInt16(0), -4503599627370496.000000000 >= toUInt16(0) , toInt16(0) = -4503599627370496.000000000, toInt16(0) != -4503599627370496.000000000, toInt16(0) < -4503599627370496.000000000, toInt16(0) <= -4503599627370496.000000000, toInt16(0) > -4503599627370496.000000000, toInt16(0) >= -4503599627370496.000000000,	-4503599627370496.000000000 = toInt16(0), -4503599627370496.000000000 != toInt16(0), -4503599627370496.000000000 < toInt16(0), -4503599627370496.000000000 <= toInt16(0), -4503599627370496.000000000 > toInt16(0), -4503599627370496.000000000 >= toInt16(0) , toUInt32(0) = -4503599627370496.000000000, toUInt32(0) != -4503599627370496.000000000, toUInt32(0) < -4503599627370496.000000000, toUInt32(0) <= -4503599627370496.000000000, toUInt32(0) > -4503599627370496.000000000, toUInt32(0) >= -4503599627370496.000000000,	-4503599627370496.000000000 = toUInt32(0), -4503599627370496.000000000 != toUInt32(0), -4503599627370496.000000000 < toUInt32(0), -4503599627370496.000000000 <= toUInt32(0), -4503599627370496.000000000 > toUInt32(0), -4503599627370496.000000000 >= toUInt32(0) , toInt32(0) = -4503599627370496.000000000, toInt32(0) != -4503599627370496.000000000, toInt32(0) < -4503599627370496.000000000, toInt32(0) <= -4503599627370496.000000000, toInt32(0) > -4503599627370496.000000000, toInt32(0) >= -4503599627370496.000000000,	-4503599627370496.000000000 = toInt32(0), -4503599627370496.000000000 != toInt32(0), -4503599627370496.000000000 < toInt32(0), -4503599627370496.000000000 <= toInt32(0), -4503599627370496.000000000 > toInt32(0), -4503599627370496.000000000 >= toInt32(0) , toUInt64(0) = -4503599627370496.000000000, toUInt64(0) != -4503599627370496.000000000, toUInt64(0) < -4503599627370496.000000000, toUInt64(0) <= -4503599627370496.000000000, toUInt64(0) > -4503599627370496.000000000, toUInt64(0) >= -4503599627370496.000000000,	-4503599627370496.000000000 = toUInt64(0), -4503599627370496.000000000 != toUInt64(0), -4503599627370496.000000000 < toUInt64(0), -4503599627370496.000000000 <= toUInt64(0), -4503599627370496.000000000 > toUInt64(0), -4503599627370496.000000000 >= toUInt64(0) , toInt64(0) = -4503599627370496.000000000, toInt64(0) != -4503599627370496.000000000, toInt64(0) < -4503599627370496.000000000, toInt64(0) <= -4503599627370496.000000000, toInt64(0) > -4503599627370496.000000000, toInt64(0) >= -4503599627370496.000000000,	-4503599627370496.000000000 = toInt64(0), -4503599627370496.000000000 != toInt64(0), -4503599627370496.000000000 < toInt64(0), -4503599627370496.000000000 <= toInt64(0), -4503599627370496.000000000 > toInt64(0), -4503599627370496.000000000 >= toInt64(0) ;
+SELECT '0', '-0.500000000', 0 = -0.500000000, 0 != -0.500000000, 0 < -0.500000000, 0 <= -0.500000000, 0 > -0.500000000, 0 >= -0.500000000,	-0.500000000 = 0, -0.500000000 != 0, -0.500000000 < 0, -0.500000000 <= 0, -0.500000000 > 0, -0.500000000 >= 0 , toUInt8(0) = -0.500000000, toUInt8(0) != -0.500000000, toUInt8(0) < -0.500000000, toUInt8(0) <= -0.500000000, toUInt8(0) > -0.500000000, toUInt8(0) >= -0.500000000,	-0.500000000 = toUInt8(0), -0.500000000 != toUInt8(0), -0.500000000 < toUInt8(0), -0.500000000 <= toUInt8(0), -0.500000000 > toUInt8(0), -0.500000000 >= toUInt8(0) , toInt8(0) = -0.500000000, toInt8(0) != -0.500000000, toInt8(0) < -0.500000000, toInt8(0) <= -0.500000000, toInt8(0) > -0.500000000, toInt8(0) >= -0.500000000,	-0.500000000 = toInt8(0), -0.500000000 != toInt8(0), -0.500000000 < toInt8(0), -0.500000000 <= toInt8(0), -0.500000000 > toInt8(0), -0.500000000 >= toInt8(0) , toUInt16(0) = -0.500000000, toUInt16(0) != -0.500000000, toUInt16(0) < -0.500000000, toUInt16(0) <= -0.500000000, toUInt16(0) > -0.500000000, toUInt16(0) >= -0.500000000,	-0.500000000 = toUInt16(0), -0.500000000 != toUInt16(0), -0.500000000 < toUInt16(0), -0.500000000 <= toUInt16(0), -0.500000000 > toUInt16(0), -0.500000000 >= toUInt16(0) , toInt16(0) = -0.500000000, toInt16(0) != -0.500000000, toInt16(0) < -0.500000000, toInt16(0) <= -0.500000000, toInt16(0) > -0.500000000, toInt16(0) >= -0.500000000,	-0.500000000 = toInt16(0), -0.500000000 != toInt16(0), -0.500000000 < toInt16(0), -0.500000000 <= toInt16(0), -0.500000000 > toInt16(0), -0.500000000 >= toInt16(0) , toUInt32(0) = -0.500000000, toUInt32(0) != -0.500000000, toUInt32(0) < -0.500000000, toUInt32(0) <= -0.500000000, toUInt32(0) > -0.500000000, toUInt32(0) >= -0.500000000,	-0.500000000 = toUInt32(0), -0.500000000 != toUInt32(0), -0.500000000 < toUInt32(0), -0.500000000 <= toUInt32(0), -0.500000000 > toUInt32(0), -0.500000000 >= toUInt32(0) , toInt32(0) = -0.500000000, toInt32(0) != -0.500000000, toInt32(0) < -0.500000000, toInt32(0) <= -0.500000000, toInt32(0) > -0.500000000, toInt32(0) >= -0.500000000,	-0.500000000 = toInt32(0), -0.500000000 != toInt32(0), -0.500000000 < toInt32(0), -0.500000000 <= toInt32(0), -0.500000000 > toInt32(0), -0.500000000 >= toInt32(0) , toUInt64(0) = -0.500000000, toUInt64(0) != -0.500000000, toUInt64(0) < -0.500000000, toUInt64(0) <= -0.500000000, toUInt64(0) > -0.500000000, toUInt64(0) >= -0.500000000,	-0.500000000 = toUInt64(0), -0.500000000 != toUInt64(0), -0.500000000 < toUInt64(0), -0.500000000 <= toUInt64(0), -0.500000000 > toUInt64(0), -0.500000000 >= toUInt64(0) , toInt64(0) = -0.500000000, toInt64(0) != -0.500000000, toInt64(0) < -0.500000000, toInt64(0) <= -0.500000000, toInt64(0) > -0.500000000, toInt64(0) >= -0.500000000,	-0.500000000 = toInt64(0), -0.500000000 != toInt64(0), -0.500000000 < toInt64(0), -0.500000000 <= toInt64(0), -0.500000000 > toInt64(0), -0.500000000 >= toInt64(0) ;
+SELECT '0', '0.500000000', 0 = 0.500000000, 0 != 0.500000000, 0 < 0.500000000, 0 <= 0.500000000, 0 > 0.500000000, 0 >= 0.500000000,	0.500000000 = 0, 0.500000000 != 0, 0.500000000 < 0, 0.500000000 <= 0, 0.500000000 > 0, 0.500000000 >= 0 , toUInt8(0) = 0.500000000, toUInt8(0) != 0.500000000, toUInt8(0) < 0.500000000, toUInt8(0) <= 0.500000000, toUInt8(0) > 0.500000000, toUInt8(0) >= 0.500000000,	0.500000000 = toUInt8(0), 0.500000000 != toUInt8(0), 0.500000000 < toUInt8(0), 0.500000000 <= toUInt8(0), 0.500000000 > toUInt8(0), 0.500000000 >= toUInt8(0) , toInt8(0) = 0.500000000, toInt8(0) != 0.500000000, toInt8(0) < 0.500000000, toInt8(0) <= 0.500000000, toInt8(0) > 0.500000000, toInt8(0) >= 0.500000000,	0.500000000 = toInt8(0), 0.500000000 != toInt8(0), 0.500000000 < toInt8(0), 0.500000000 <= toInt8(0), 0.500000000 > toInt8(0), 0.500000000 >= toInt8(0) , toUInt16(0) = 0.500000000, toUInt16(0) != 0.500000000, toUInt16(0) < 0.500000000, toUInt16(0) <= 0.500000000, toUInt16(0) > 0.500000000, toUInt16(0) >= 0.500000000,	0.500000000 = toUInt16(0), 0.500000000 != toUInt16(0), 0.500000000 < toUInt16(0), 0.500000000 <= toUInt16(0), 0.500000000 > toUInt16(0), 0.500000000 >= toUInt16(0) , toInt16(0) = 0.500000000, toInt16(0) != 0.500000000, toInt16(0) < 0.500000000, toInt16(0) <= 0.500000000, toInt16(0) > 0.500000000, toInt16(0) >= 0.500000000,	0.500000000 = toInt16(0), 0.500000000 != toInt16(0), 0.500000000 < toInt16(0), 0.500000000 <= toInt16(0), 0.500000000 > toInt16(0), 0.500000000 >= toInt16(0) , toUInt32(0) = 0.500000000, toUInt32(0) != 0.500000000, toUInt32(0) < 0.500000000, toUInt32(0) <= 0.500000000, toUInt32(0) > 0.500000000, toUInt32(0) >= 0.500000000,	0.500000000 = toUInt32(0), 0.500000000 != toUInt32(0), 0.500000000 < toUInt32(0), 0.500000000 <= toUInt32(0), 0.500000000 > toUInt32(0), 0.500000000 >= toUInt32(0) , toInt32(0) = 0.500000000, toInt32(0) != 0.500000000, toInt32(0) < 0.500000000, toInt32(0) <= 0.500000000, toInt32(0) > 0.500000000, toInt32(0) >= 0.500000000,	0.500000000 = toInt32(0), 0.500000000 != toInt32(0), 0.500000000 < toInt32(0), 0.500000000 <= toInt32(0), 0.500000000 > toInt32(0), 0.500000000 >= toInt32(0) , toUInt64(0) = 0.500000000, toUInt64(0) != 0.500000000, toUInt64(0) < 0.500000000, toUInt64(0) <= 0.500000000, toUInt64(0) > 0.500000000, toUInt64(0) >= 0.500000000,	0.500000000 = toUInt64(0), 0.500000000 != toUInt64(0), 0.500000000 < toUInt64(0), 0.500000000 <= toUInt64(0), 0.500000000 > toUInt64(0), 0.500000000 >= toUInt64(0) , toInt64(0) = 0.500000000, toInt64(0) != 0.500000000, toInt64(0) < 0.500000000, toInt64(0) <= 0.500000000, toInt64(0) > 0.500000000, toInt64(0) >= 0.500000000,	0.500000000 = toInt64(0), 0.500000000 != toInt64(0), 0.500000000 < toInt64(0), 0.500000000 <= toInt64(0), 0.500000000 > toInt64(0), 0.500000000 >= toInt64(0) ;
+SELECT '0', '-1.500000000', 0 = -1.500000000, 0 != -1.500000000, 0 < -1.500000000, 0 <= -1.500000000, 0 > -1.500000000, 0 >= -1.500000000,	-1.500000000 = 0, -1.500000000 != 0, -1.500000000 < 0, -1.500000000 <= 0, -1.500000000 > 0, -1.500000000 >= 0 , toUInt8(0) = -1.500000000, toUInt8(0) != -1.500000000, toUInt8(0) < -1.500000000, toUInt8(0) <= -1.500000000, toUInt8(0) > -1.500000000, toUInt8(0) >= -1.500000000,	-1.500000000 = toUInt8(0), -1.500000000 != toUInt8(0), -1.500000000 < toUInt8(0), -1.500000000 <= toUInt8(0), -1.500000000 > toUInt8(0), -1.500000000 >= toUInt8(0) , toInt8(0) = -1.500000000, toInt8(0) != -1.500000000, toInt8(0) < -1.500000000, toInt8(0) <= -1.500000000, toInt8(0) > -1.500000000, toInt8(0) >= -1.500000000,	-1.500000000 = toInt8(0), -1.500000000 != toInt8(0), -1.500000000 < toInt8(0), -1.500000000 <= toInt8(0), -1.500000000 > toInt8(0), -1.500000000 >= toInt8(0) , toUInt16(0) = -1.500000000, toUInt16(0) != -1.500000000, toUInt16(0) < -1.500000000, toUInt16(0) <= -1.500000000, toUInt16(0) > -1.500000000, toUInt16(0) >= -1.500000000,	-1.500000000 = toUInt16(0), -1.500000000 != toUInt16(0), -1.500000000 < toUInt16(0), -1.500000000 <= toUInt16(0), -1.500000000 > toUInt16(0), -1.500000000 >= toUInt16(0) , toInt16(0) = -1.500000000, toInt16(0) != -1.500000000, toInt16(0) < -1.500000000, toInt16(0) <= -1.500000000, toInt16(0) > -1.500000000, toInt16(0) >= -1.500000000,	-1.500000000 = toInt16(0), -1.500000000 != toInt16(0), -1.500000000 < toInt16(0), -1.500000000 <= toInt16(0), -1.500000000 > toInt16(0), -1.500000000 >= toInt16(0) , toUInt32(0) = -1.500000000, toUInt32(0) != -1.500000000, toUInt32(0) < -1.500000000, toUInt32(0) <= -1.500000000, toUInt32(0) > -1.500000000, toUInt32(0) >= -1.500000000,	-1.500000000 = toUInt32(0), -1.500000000 != toUInt32(0), -1.500000000 < toUInt32(0), -1.500000000 <= toUInt32(0), -1.500000000 > toUInt32(0), -1.500000000 >= toUInt32(0) , toInt32(0) = -1.500000000, toInt32(0) != -1.500000000, toInt32(0) < -1.500000000, toInt32(0) <= -1.500000000, toInt32(0) > -1.500000000, toInt32(0) >= -1.500000000,	-1.500000000 = toInt32(0), -1.500000000 != toInt32(0), -1.500000000 < toInt32(0), -1.500000000 <= toInt32(0), -1.500000000 > toInt32(0), -1.500000000 >= toInt32(0) , toUInt64(0) = -1.500000000, toUInt64(0) != -1.500000000, toUInt64(0) < -1.500000000, toUInt64(0) <= -1.500000000, toUInt64(0) > -1.500000000, toUInt64(0) >= -1.500000000,	-1.500000000 = toUInt64(0), -1.500000000 != toUInt64(0), -1.500000000 < toUInt64(0), -1.500000000 <= toUInt64(0), -1.500000000 > toUInt64(0), -1.500000000 >= toUInt64(0) , toInt64(0) = -1.500000000, toInt64(0) != -1.500000000, toInt64(0) < -1.500000000, toInt64(0) <= -1.500000000, toInt64(0) > -1.500000000, toInt64(0) >= -1.500000000,	-1.500000000 = toInt64(0), -1.500000000 != toInt64(0), -1.500000000 < toInt64(0), -1.500000000 <= toInt64(0), -1.500000000 > toInt64(0), -1.500000000 >= toInt64(0) ;
+SELECT '0', '1.500000000', 0 = 1.500000000, 0 != 1.500000000, 0 < 1.500000000, 0 <= 1.500000000, 0 > 1.500000000, 0 >= 1.500000000,	1.500000000 = 0, 1.500000000 != 0, 1.500000000 < 0, 1.500000000 <= 0, 1.500000000 > 0, 1.500000000 >= 0 , toUInt8(0) = 1.500000000, toUInt8(0) != 1.500000000, toUInt8(0) < 1.500000000, toUInt8(0) <= 1.500000000, toUInt8(0) > 1.500000000, toUInt8(0) >= 1.500000000,	1.500000000 = toUInt8(0), 1.500000000 != toUInt8(0), 1.500000000 < toUInt8(0), 1.500000000 <= toUInt8(0), 1.500000000 > toUInt8(0), 1.500000000 >= toUInt8(0) , toInt8(0) = 1.500000000, toInt8(0) != 1.500000000, toInt8(0) < 1.500000000, toInt8(0) <= 1.500000000, toInt8(0) > 1.500000000, toInt8(0) >= 1.500000000,	1.500000000 = toInt8(0), 1.500000000 != toInt8(0), 1.500000000 < toInt8(0), 1.500000000 <= toInt8(0), 1.500000000 > toInt8(0), 1.500000000 >= toInt8(0) , toUInt16(0) = 1.500000000, toUInt16(0) != 1.500000000, toUInt16(0) < 1.500000000, toUInt16(0) <= 1.500000000, toUInt16(0) > 1.500000000, toUInt16(0) >= 1.500000000,	1.500000000 = toUInt16(0), 1.500000000 != toUInt16(0), 1.500000000 < toUInt16(0), 1.500000000 <= toUInt16(0), 1.500000000 > toUInt16(0), 1.500000000 >= toUInt16(0) , toInt16(0) = 1.500000000, toInt16(0) != 1.500000000, toInt16(0) < 1.500000000, toInt16(0) <= 1.500000000, toInt16(0) > 1.500000000, toInt16(0) >= 1.500000000,	1.500000000 = toInt16(0), 1.500000000 != toInt16(0), 1.500000000 < toInt16(0), 1.500000000 <= toInt16(0), 1.500000000 > toInt16(0), 1.500000000 >= toInt16(0) , toUInt32(0) = 1.500000000, toUInt32(0) != 1.500000000, toUInt32(0) < 1.500000000, toUInt32(0) <= 1.500000000, toUInt32(0) > 1.500000000, toUInt32(0) >= 1.500000000,	1.500000000 = toUInt32(0), 1.500000000 != toUInt32(0), 1.500000000 < toUInt32(0), 1.500000000 <= toUInt32(0), 1.500000000 > toUInt32(0), 1.500000000 >= toUInt32(0) , toInt32(0) = 1.500000000, toInt32(0) != 1.500000000, toInt32(0) < 1.500000000, toInt32(0) <= 1.500000000, toInt32(0) > 1.500000000, toInt32(0) >= 1.500000000,	1.500000000 = toInt32(0), 1.500000000 != toInt32(0), 1.500000000 < toInt32(0), 1.500000000 <= toInt32(0), 1.500000000 > toInt32(0), 1.500000000 >= toInt32(0) , toUInt64(0) = 1.500000000, toUInt64(0) != 1.500000000, toUInt64(0) < 1.500000000, toUInt64(0) <= 1.500000000, toUInt64(0) > 1.500000000, toUInt64(0) >= 1.500000000,	1.500000000 = toUInt64(0), 1.500000000 != toUInt64(0), 1.500000000 < toUInt64(0), 1.500000000 <= toUInt64(0), 1.500000000 > toUInt64(0), 1.500000000 >= toUInt64(0) , toInt64(0) = 1.500000000, toInt64(0) != 1.500000000, toInt64(0) < 1.500000000, toInt64(0) <= 1.500000000, toInt64(0) > 1.500000000, toInt64(0) >= 1.500000000,	1.500000000 = toInt64(0), 1.500000000 != toInt64(0), 1.500000000 < toInt64(0), 1.500000000 <= toInt64(0), 1.500000000 > toInt64(0), 1.500000000 >= toInt64(0) ;
+SELECT '0', '9007199254740992.000000000', 0 = 9007199254740992.000000000, 0 != 9007199254740992.000000000, 0 < 9007199254740992.000000000, 0 <= 9007199254740992.000000000, 0 > 9007199254740992.000000000, 0 >= 9007199254740992.000000000,	9007199254740992.000000000 = 0, 9007199254740992.000000000 != 0, 9007199254740992.000000000 < 0, 9007199254740992.000000000 <= 0, 9007199254740992.000000000 > 0, 9007199254740992.000000000 >= 0 , toUInt8(0) = 9007199254740992.000000000, toUInt8(0) != 9007199254740992.000000000, toUInt8(0) < 9007199254740992.000000000, toUInt8(0) <= 9007199254740992.000000000, toUInt8(0) > 9007199254740992.000000000, toUInt8(0) >= 9007199254740992.000000000,	9007199254740992.000000000 = toUInt8(0), 9007199254740992.000000000 != toUInt8(0), 9007199254740992.000000000 < toUInt8(0), 9007199254740992.000000000 <= toUInt8(0), 9007199254740992.000000000 > toUInt8(0), 9007199254740992.000000000 >= toUInt8(0) , toInt8(0) = 9007199254740992.000000000, toInt8(0) != 9007199254740992.000000000, toInt8(0) < 9007199254740992.000000000, toInt8(0) <= 9007199254740992.000000000, toInt8(0) > 9007199254740992.000000000, toInt8(0) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt8(0), 9007199254740992.000000000 != toInt8(0), 9007199254740992.000000000 < toInt8(0), 9007199254740992.000000000 <= toInt8(0), 9007199254740992.000000000 > toInt8(0), 9007199254740992.000000000 >= toInt8(0) , toUInt16(0) = 9007199254740992.000000000, toUInt16(0) != 9007199254740992.000000000, toUInt16(0) < 9007199254740992.000000000, toUInt16(0) <= 9007199254740992.000000000, toUInt16(0) > 9007199254740992.000000000, toUInt16(0) >= 9007199254740992.000000000,	9007199254740992.000000000 = toUInt16(0), 9007199254740992.000000000 != toUInt16(0), 9007199254740992.000000000 < toUInt16(0), 9007199254740992.000000000 <= toUInt16(0), 9007199254740992.000000000 > toUInt16(0), 9007199254740992.000000000 >= toUInt16(0) , toInt16(0) = 9007199254740992.000000000, toInt16(0) != 9007199254740992.000000000, toInt16(0) < 9007199254740992.000000000, toInt16(0) <= 9007199254740992.000000000, toInt16(0) > 9007199254740992.000000000, toInt16(0) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt16(0), 9007199254740992.000000000 != toInt16(0), 9007199254740992.000000000 < toInt16(0), 9007199254740992.000000000 <= toInt16(0), 9007199254740992.000000000 > toInt16(0), 9007199254740992.000000000 >= toInt16(0) , toUInt32(0) = 9007199254740992.000000000, toUInt32(0) != 9007199254740992.000000000, toUInt32(0) < 9007199254740992.000000000, toUInt32(0) <= 9007199254740992.000000000, toUInt32(0) > 9007199254740992.000000000, toUInt32(0) >= 9007199254740992.000000000,	9007199254740992.000000000 = toUInt32(0), 9007199254740992.000000000 != toUInt32(0), 9007199254740992.000000000 < toUInt32(0), 9007199254740992.000000000 <= toUInt32(0), 9007199254740992.000000000 > toUInt32(0), 9007199254740992.000000000 >= toUInt32(0) , toInt32(0) = 9007199254740992.000000000, toInt32(0) != 9007199254740992.000000000, toInt32(0) < 9007199254740992.000000000, toInt32(0) <= 9007199254740992.000000000, toInt32(0) > 9007199254740992.000000000, toInt32(0) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt32(0), 9007199254740992.000000000 != toInt32(0), 9007199254740992.000000000 < toInt32(0), 9007199254740992.000000000 <= toInt32(0), 9007199254740992.000000000 > toInt32(0), 9007199254740992.000000000 >= toInt32(0) , toUInt64(0) = 9007199254740992.000000000, toUInt64(0) != 9007199254740992.000000000, toUInt64(0) < 9007199254740992.000000000, toUInt64(0) <= 9007199254740992.000000000, toUInt64(0) > 9007199254740992.000000000, toUInt64(0) >= 9007199254740992.000000000,	9007199254740992.000000000 = toUInt64(0), 9007199254740992.000000000 != toUInt64(0), 9007199254740992.000000000 < toUInt64(0), 9007199254740992.000000000 <= toUInt64(0), 9007199254740992.000000000 > toUInt64(0), 9007199254740992.000000000 >= toUInt64(0) , toInt64(0) = 9007199254740992.000000000, toInt64(0) != 9007199254740992.000000000, toInt64(0) < 9007199254740992.000000000, toInt64(0) <= 9007199254740992.000000000, toInt64(0) > 9007199254740992.000000000, toInt64(0) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt64(0), 9007199254740992.000000000 != toInt64(0), 9007199254740992.000000000 < toInt64(0), 9007199254740992.000000000 <= toInt64(0), 9007199254740992.000000000 > toInt64(0), 9007199254740992.000000000 >= toInt64(0) ;
+SELECT '0', '2251799813685247.500000000', 0 = 2251799813685247.500000000, 0 != 2251799813685247.500000000, 0 < 2251799813685247.500000000, 0 <= 2251799813685247.500000000, 0 > 2251799813685247.500000000, 0 >= 2251799813685247.500000000,	2251799813685247.500000000 = 0, 2251799813685247.500000000 != 0, 2251799813685247.500000000 < 0, 2251799813685247.500000000 <= 0, 2251799813685247.500000000 > 0, 2251799813685247.500000000 >= 0 , toUInt8(0) = 2251799813685247.500000000, toUInt8(0) != 2251799813685247.500000000, toUInt8(0) < 2251799813685247.500000000, toUInt8(0) <= 2251799813685247.500000000, toUInt8(0) > 2251799813685247.500000000, toUInt8(0) >= 2251799813685247.500000000,	2251799813685247.500000000 = toUInt8(0), 2251799813685247.500000000 != toUInt8(0), 2251799813685247.500000000 < toUInt8(0), 2251799813685247.500000000 <= toUInt8(0), 2251799813685247.500000000 > toUInt8(0), 2251799813685247.500000000 >= toUInt8(0) , toInt8(0) = 2251799813685247.500000000, toInt8(0) != 2251799813685247.500000000, toInt8(0) < 2251799813685247.500000000, toInt8(0) <= 2251799813685247.500000000, toInt8(0) > 2251799813685247.500000000, toInt8(0) >= 2251799813685247.500000000,	2251799813685247.500000000 = toInt8(0), 2251799813685247.500000000 != toInt8(0), 2251799813685247.500000000 < toInt8(0), 2251799813685247.500000000 <= toInt8(0), 2251799813685247.500000000 > toInt8(0), 2251799813685247.500000000 >= toInt8(0) , toUInt16(0) = 2251799813685247.500000000, toUInt16(0) != 2251799813685247.500000000, toUInt16(0) < 2251799813685247.500000000, toUInt16(0) <= 2251799813685247.500000000, toUInt16(0) > 2251799813685247.500000000, toUInt16(0) >= 2251799813685247.500000000,	2251799813685247.500000000 = toUInt16(0), 2251799813685247.500000000 != toUInt16(0), 2251799813685247.500000000 < toUInt16(0), 2251799813685247.500000000 <= toUInt16(0), 2251799813685247.500000000 > toUInt16(0), 2251799813685247.500000000 >= toUInt16(0) , toInt16(0) = 2251799813685247.500000000, toInt16(0) != 2251799813685247.500000000, toInt16(0) < 2251799813685247.500000000, toInt16(0) <= 2251799813685247.500000000, toInt16(0) > 2251799813685247.500000000, toInt16(0) >= 2251799813685247.500000000,	2251799813685247.500000000 = toInt16(0), 2251799813685247.500000000 != toInt16(0), 2251799813685247.500000000 < toInt16(0), 2251799813685247.500000000 <= toInt16(0), 2251799813685247.500000000 > toInt16(0), 2251799813685247.500000000 >= toInt16(0) , toUInt32(0) = 2251799813685247.500000000, toUInt32(0) != 2251799813685247.500000000, toUInt32(0) < 2251799813685247.500000000, toUInt32(0) <= 2251799813685247.500000000, toUInt32(0) > 2251799813685247.500000000, toUInt32(0) >= 2251799813685247.500000000,	2251799813685247.500000000 = toUInt32(0), 2251799813685247.500000000 != toUInt32(0), 2251799813685247.500000000 < toUInt32(0), 2251799813685247.500000000 <= toUInt32(0), 2251799813685247.500000000 > toUInt32(0), 2251799813685247.500000000 >= toUInt32(0) , toInt32(0) = 2251799813685247.500000000, toInt32(0) != 2251799813685247.500000000, toInt32(0) < 2251799813685247.500000000, toInt32(0) <= 2251799813685247.500000000, toInt32(0) > 2251799813685247.500000000, toInt32(0) >= 2251799813685247.500000000,	2251799813685247.500000000 = toInt32(0), 2251799813685247.500000000 != toInt32(0), 2251799813685247.500000000 < toInt32(0), 2251799813685247.500000000 <= toInt32(0), 2251799813685247.500000000 > toInt32(0), 2251799813685247.500000000 >= toInt32(0) , toUInt64(0) = 2251799813685247.500000000, toUInt64(0) != 2251799813685247.500000000, toUInt64(0) < 2251799813685247.500000000, toUInt64(0) <= 2251799813685247.500000000, toUInt64(0) > 2251799813685247.500000000, toUInt64(0) >= 2251799813685247.500000000,	2251799813685247.500000000 = toUInt64(0), 2251799813685247.500000000 != toUInt64(0), 2251799813685247.500000000 < toUInt64(0), 2251799813685247.500000000 <= toUInt64(0), 2251799813685247.500000000 > toUInt64(0), 2251799813685247.500000000 >= toUInt64(0) , toInt64(0) = 2251799813685247.500000000, toInt64(0) != 2251799813685247.500000000, toInt64(0) < 2251799813685247.500000000, toInt64(0) <= 2251799813685247.500000000, toInt64(0) > 2251799813685247.500000000, toInt64(0) >= 2251799813685247.500000000,	2251799813685247.500000000 = toInt64(0), 2251799813685247.500000000 != toInt64(0), 2251799813685247.500000000 < toInt64(0), 2251799813685247.500000000 <= toInt64(0), 2251799813685247.500000000 > toInt64(0), 2251799813685247.500000000 >= toInt64(0) ;
+SELECT '0', '2251799813685248.500000000', 0 = 2251799813685248.500000000, 0 != 2251799813685248.500000000, 0 < 2251799813685248.500000000, 0 <= 2251799813685248.500000000, 0 > 2251799813685248.500000000, 0 >= 2251799813685248.500000000,	2251799813685248.500000000 = 0, 2251799813685248.500000000 != 0, 2251799813685248.500000000 < 0, 2251799813685248.500000000 <= 0, 2251799813685248.500000000 > 0, 2251799813685248.500000000 >= 0 , toUInt8(0) = 2251799813685248.500000000, toUInt8(0) != 2251799813685248.500000000, toUInt8(0) < 2251799813685248.500000000, toUInt8(0) <= 2251799813685248.500000000, toUInt8(0) > 2251799813685248.500000000, toUInt8(0) >= 2251799813685248.500000000,	2251799813685248.500000000 = toUInt8(0), 2251799813685248.500000000 != toUInt8(0), 2251799813685248.500000000 < toUInt8(0), 2251799813685248.500000000 <= toUInt8(0), 2251799813685248.500000000 > toUInt8(0), 2251799813685248.500000000 >= toUInt8(0) , toInt8(0) = 2251799813685248.500000000, toInt8(0) != 2251799813685248.500000000, toInt8(0) < 2251799813685248.500000000, toInt8(0) <= 2251799813685248.500000000, toInt8(0) > 2251799813685248.500000000, toInt8(0) >= 2251799813685248.500000000,	2251799813685248.500000000 = toInt8(0), 2251799813685248.500000000 != toInt8(0), 2251799813685248.500000000 < toInt8(0), 2251799813685248.500000000 <= toInt8(0), 2251799813685248.500000000 > toInt8(0), 2251799813685248.500000000 >= toInt8(0) , toUInt16(0) = 2251799813685248.500000000, toUInt16(0) != 2251799813685248.500000000, toUInt16(0) < 2251799813685248.500000000, toUInt16(0) <= 2251799813685248.500000000, toUInt16(0) > 2251799813685248.500000000, toUInt16(0) >= 2251799813685248.500000000,	2251799813685248.500000000 = toUInt16(0), 2251799813685248.500000000 != toUInt16(0), 2251799813685248.500000000 < toUInt16(0), 2251799813685248.500000000 <= toUInt16(0), 2251799813685248.500000000 > toUInt16(0), 2251799813685248.500000000 >= toUInt16(0) , toInt16(0) = 2251799813685248.500000000, toInt16(0) != 2251799813685248.500000000, toInt16(0) < 2251799813685248.500000000, toInt16(0) <= 2251799813685248.500000000, toInt16(0) > 2251799813685248.500000000, toInt16(0) >= 2251799813685248.500000000,	2251799813685248.500000000 = toInt16(0), 2251799813685248.500000000 != toInt16(0), 2251799813685248.500000000 < toInt16(0), 2251799813685248.500000000 <= toInt16(0), 2251799813685248.500000000 > toInt16(0), 2251799813685248.500000000 >= toInt16(0) , toUInt32(0) = 2251799813685248.500000000, toUInt32(0) != 2251799813685248.500000000, toUInt32(0) < 2251799813685248.500000000, toUInt32(0) <= 2251799813685248.500000000, toUInt32(0) > 2251799813685248.500000000, toUInt32(0) >= 2251799813685248.500000000,	2251799813685248.500000000 = toUInt32(0), 2251799813685248.500000000 != toUInt32(0), 2251799813685248.500000000 < toUInt32(0), 2251799813685248.500000000 <= toUInt32(0), 2251799813685248.500000000 > toUInt32(0), 2251799813685248.500000000 >= toUInt32(0) , toInt32(0) = 2251799813685248.500000000, toInt32(0) != 2251799813685248.500000000, toInt32(0) < 2251799813685248.500000000, toInt32(0) <= 2251799813685248.500000000, toInt32(0) > 2251799813685248.500000000, toInt32(0) >= 2251799813685248.500000000,	2251799813685248.500000000 = toInt32(0), 2251799813685248.500000000 != toInt32(0), 2251799813685248.500000000 < toInt32(0), 2251799813685248.500000000 <= toInt32(0), 2251799813685248.500000000 > toInt32(0), 2251799813685248.500000000 >= toInt32(0) , toUInt64(0) = 2251799813685248.500000000, toUInt64(0) != 2251799813685248.500000000, toUInt64(0) < 2251799813685248.500000000, toUInt64(0) <= 2251799813685248.500000000, toUInt64(0) > 2251799813685248.500000000, toUInt64(0) >= 2251799813685248.500000000,	2251799813685248.500000000 = toUInt64(0), 2251799813685248.500000000 != toUInt64(0), 2251799813685248.500000000 < toUInt64(0), 2251799813685248.500000000 <= toUInt64(0), 2251799813685248.500000000 > toUInt64(0), 2251799813685248.500000000 >= toUInt64(0) , toInt64(0) = 2251799813685248.500000000, toInt64(0) != 2251799813685248.500000000, toInt64(0) < 2251799813685248.500000000, toInt64(0) <= 2251799813685248.500000000, toInt64(0) > 2251799813685248.500000000, toInt64(0) >= 2251799813685248.500000000,	2251799813685248.500000000 = toInt64(0), 2251799813685248.500000000 != toInt64(0), 2251799813685248.500000000 < toInt64(0), 2251799813685248.500000000 <= toInt64(0), 2251799813685248.500000000 > toInt64(0), 2251799813685248.500000000 >= toInt64(0) ;
+SELECT '0', '1152921504606846976.000000000', 0 = 1152921504606846976.000000000, 0 != 1152921504606846976.000000000, 0 < 1152921504606846976.000000000, 0 <= 1152921504606846976.000000000, 0 > 1152921504606846976.000000000, 0 >= 1152921504606846976.000000000,	1152921504606846976.000000000 = 0, 1152921504606846976.000000000 != 0, 1152921504606846976.000000000 < 0, 1152921504606846976.000000000 <= 0, 1152921504606846976.000000000 > 0, 1152921504606846976.000000000 >= 0 , toUInt8(0) = 1152921504606846976.000000000, toUInt8(0) != 1152921504606846976.000000000, toUInt8(0) < 1152921504606846976.000000000, toUInt8(0) <= 1152921504606846976.000000000, toUInt8(0) > 1152921504606846976.000000000, toUInt8(0) >= 1152921504606846976.000000000,	1152921504606846976.000000000 = toUInt8(0), 1152921504606846976.000000000 != toUInt8(0), 1152921504606846976.000000000 < toUInt8(0), 1152921504606846976.000000000 <= toUInt8(0), 1152921504606846976.000000000 > toUInt8(0), 1152921504606846976.000000000 >= toUInt8(0) , toInt8(0) = 1152921504606846976.000000000, toInt8(0) != 1152921504606846976.000000000, toInt8(0) < 1152921504606846976.000000000, toInt8(0) <= 1152921504606846976.000000000, toInt8(0) > 1152921504606846976.000000000, toInt8(0) >= 1152921504606846976.000000000,	1152921504606846976.000000000 = toInt8(0), 1152921504606846976.000000000 != toInt8(0), 1152921504606846976.000000000 < toInt8(0), 1152921504606846976.000000000 <= toInt8(0), 1152921504606846976.000000000 > toInt8(0), 1152921504606846976.000000000 >= toInt8(0) , toUInt16(0) = 1152921504606846976.000000000, toUInt16(0) != 1152921504606846976.000000000, toUInt16(0) < 1152921504606846976.000000000, toUInt16(0) <= 1152921504606846976.000000000, toUInt16(0) > 1152921504606846976.000000000, toUInt16(0) >= 1152921504606846976.000000000,	1152921504606846976.000000000 = toUInt16(0), 1152921504606846976.000000000 != toUInt16(0), 1152921504606846976.000000000 < toUInt16(0), 1152921504606846976.000000000 <= toUInt16(0), 1152921504606846976.000000000 > toUInt16(0), 1152921504606846976.000000000 >= toUInt16(0) , toInt16(0) = 1152921504606846976.000000000, toInt16(0) != 1152921504606846976.000000000, toInt16(0) < 1152921504606846976.000000000, toInt16(0) <= 1152921504606846976.000000000, toInt16(0) > 1152921504606846976.000000000, toInt16(0) >= 1152921504606846976.000000000,	1152921504606846976.000000000 = toInt16(0), 1152921504606846976.000000000 != toInt16(0), 1152921504606846976.000000000 < toInt16(0), 1152921504606846976.000000000 <= toInt16(0), 1152921504606846976.000000000 > toInt16(0), 1152921504606846976.000000000 >= toInt16(0) , toUInt32(0) = 1152921504606846976.000000000, toUInt32(0) != 1152921504606846976.000000000, toUInt32(0) < 1152921504606846976.000000000, toUInt32(0) <= 1152921504606846976.000000000, toUInt32(0) > 1152921504606846976.000000000, toUInt32(0) >= 1152921504606846976.000000000,	1152921504606846976.000000000 = toUInt32(0), 1152921504606846976.000000000 != toUInt32(0), 1152921504606846976.000000000 < toUInt32(0), 1152921504606846976.000000000 <= toUInt32(0), 1152921504606846976.000000000 > toUInt32(0), 1152921504606846976.000000000 >= toUInt32(0) , toInt32(0) = 1152921504606846976.000000000, toInt32(0) != 1152921504606846976.000000000, toInt32(0) < 1152921504606846976.000000000, toInt32(0) <= 1152921504606846976.000000000, toInt32(0) > 1152921504606846976.000000000, toInt32(0) >= 1152921504606846976.000000000,	1152921504606846976.000000000 = toInt32(0), 1152921504606846976.000000000 != toInt32(0), 1152921504606846976.000000000 < toInt32(0), 1152921504606846976.000000000 <= toInt32(0), 1152921504606846976.000000000 > toInt32(0), 1152921504606846976.000000000 >= toInt32(0) , toUInt64(0) = 1152921504606846976.000000000, toUInt64(0) != 1152921504606846976.000000000, toUInt64(0) < 1152921504606846976.000000000, toUInt64(0) <= 1152921504606846976.000000000, toUInt64(0) > 1152921504606846976.000000000, toUInt64(0) >= 1152921504606846976.000000000,	1152921504606846976.000000000 = toUInt64(0), 1152921504606846976.000000000 != toUInt64(0), 1152921504606846976.000000000 < toUInt64(0), 1152921504606846976.000000000 <= toUInt64(0), 1152921504606846976.000000000 > toUInt64(0), 1152921504606846976.000000000 >= toUInt64(0) , toInt64(0) = 1152921504606846976.000000000, toInt64(0) != 1152921504606846976.000000000, toInt64(0) < 1152921504606846976.000000000, toInt64(0) <= 1152921504606846976.000000000, toInt64(0) > 1152921504606846976.000000000, toInt64(0) >= 1152921504606846976.000000000,	1152921504606846976.000000000 = toInt64(0), 1152921504606846976.000000000 != toInt64(0), 1152921504606846976.000000000 < toInt64(0), 1152921504606846976.000000000 <= toInt64(0), 1152921504606846976.000000000 > toInt64(0), 1152921504606846976.000000000 >= toInt64(0) ;
+SELECT '0', '-1152921504606846976.000000000', 0 = -1152921504606846976.000000000, 0 != -1152921504606846976.000000000, 0 < -1152921504606846976.000000000, 0 <= -1152921504606846976.000000000, 0 > -1152921504606846976.000000000, 0 >= -1152921504606846976.000000000,	-1152921504606846976.000000000 = 0, -1152921504606846976.000000000 != 0, -1152921504606846976.000000000 < 0, -1152921504606846976.000000000 <= 0, -1152921504606846976.000000000 > 0, -1152921504606846976.000000000 >= 0 , toUInt8(0) = -1152921504606846976.000000000, toUInt8(0) != -1152921504606846976.000000000, toUInt8(0) < -1152921504606846976.000000000, toUInt8(0) <= -1152921504606846976.000000000, toUInt8(0) > -1152921504606846976.000000000, toUInt8(0) >= -1152921504606846976.000000000,	-1152921504606846976.000000000 = toUInt8(0), -1152921504606846976.000000000 != toUInt8(0), -1152921504606846976.000000000 < toUInt8(0), -1152921504606846976.000000000 <= toUInt8(0), -1152921504606846976.000000000 > toUInt8(0), -1152921504606846976.000000000 >= toUInt8(0) , toInt8(0) = -1152921504606846976.000000000, toInt8(0) != -1152921504606846976.000000000, toInt8(0) < -1152921504606846976.000000000, toInt8(0) <= -1152921504606846976.000000000, toInt8(0) > -1152921504606846976.000000000, toInt8(0) >= -1152921504606846976.000000000,	-1152921504606846976.000000000 = toInt8(0), -1152921504606846976.000000000 != toInt8(0), -1152921504606846976.000000000 < toInt8(0), -1152921504606846976.000000000 <= toInt8(0), -1152921504606846976.000000000 > toInt8(0), -1152921504606846976.000000000 >= toInt8(0) , toUInt16(0) = -1152921504606846976.000000000, toUInt16(0) != -1152921504606846976.000000000, toUInt16(0) < -1152921504606846976.000000000, toUInt16(0) <= -1152921504606846976.000000000, toUInt16(0) > -1152921504606846976.000000000, toUInt16(0) >= -1152921504606846976.000000000,	-1152921504606846976.000000000 = toUInt16(0), -1152921504606846976.000000000 != toUInt16(0), -1152921504606846976.000000000 < toUInt16(0), -1152921504606846976.000000000 <= toUInt16(0), -1152921504606846976.000000000 > toUInt16(0), -1152921504606846976.000000000 >= toUInt16(0) , toInt16(0) = -1152921504606846976.000000000, toInt16(0) != -1152921504606846976.000000000, toInt16(0) < -1152921504606846976.000000000, toInt16(0) <= -1152921504606846976.000000000, toInt16(0) > -1152921504606846976.000000000, toInt16(0) >= -1152921504606846976.000000000,	-1152921504606846976.000000000 = toInt16(0), -1152921504606846976.000000000 != toInt16(0), -1152921504606846976.000000000 < toInt16(0), -1152921504606846976.000000000 <= toInt16(0), -1152921504606846976.000000000 > toInt16(0), -1152921504606846976.000000000 >= toInt16(0) , toUInt32(0) = -1152921504606846976.000000000, toUInt32(0) != -1152921504606846976.000000000, toUInt32(0) < -1152921504606846976.000000000, toUInt32(0) <= -1152921504606846976.000000000, toUInt32(0) > -1152921504606846976.000000000, toUInt32(0) >= -1152921504606846976.000000000,	-1152921504606846976.000000000 = toUInt32(0), -1152921504606846976.000000000 != toUInt32(0), -1152921504606846976.000000000 < toUInt32(0), -1152921504606846976.000000000 <= toUInt32(0), -1152921504606846976.000000000 > toUInt32(0), -1152921504606846976.000000000 >= toUInt32(0) , toInt32(0) = -1152921504606846976.000000000, toInt32(0) != -1152921504606846976.000000000, toInt32(0) < -1152921504606846976.000000000, toInt32(0) <= -1152921504606846976.000000000, toInt32(0) > -1152921504606846976.000000000, toInt32(0) >= -1152921504606846976.000000000,	-1152921504606846976.000000000 = toInt32(0), -1152921504606846976.000000000 != toInt32(0), -1152921504606846976.000000000 < toInt32(0), -1152921504606846976.000000000 <= toInt32(0), -1152921504606846976.000000000 > toInt32(0), -1152921504606846976.000000000 >= toInt32(0) , toUInt64(0) = -1152921504606846976.000000000, toUInt64(0) != -1152921504606846976.000000000, toUInt64(0) < -1152921504606846976.000000000, toUInt64(0) <= -1152921504606846976.000000000, toUInt64(0) > -1152921504606846976.000000000, toUInt64(0) >= -1152921504606846976.000000000,	-1152921504606846976.000000000 = toUInt64(0), -1152921504606846976.000000000 != toUInt64(0), -1152921504606846976.000000000 < toUInt64(0), -1152921504606846976.000000000 <= toUInt64(0), -1152921504606846976.000000000 > toUInt64(0), -1152921504606846976.000000000 >= toUInt64(0) , toInt64(0) = -1152921504606846976.000000000, toInt64(0) != -1152921504606846976.000000000, toInt64(0) < -1152921504606846976.000000000, toInt64(0) <= -1152921504606846976.000000000, toInt64(0) > -1152921504606846976.000000000, toInt64(0) >= -1152921504606846976.000000000,	-1152921504606846976.000000000 = toInt64(0), -1152921504606846976.000000000 != toInt64(0), -1152921504606846976.000000000 < toInt64(0), -1152921504606846976.000000000 <= toInt64(0), -1152921504606846976.000000000 > toInt64(0), -1152921504606846976.000000000 >= toInt64(0) ;
+SELECT '0', '-9223372036854786048.000000000', 0 = -9223372036854786048.000000000, 0 != -9223372036854786048.000000000, 0 < -9223372036854786048.000000000, 0 <= -9223372036854786048.000000000, 0 > -9223372036854786048.000000000, 0 >= -9223372036854786048.000000000,	-9223372036854786048.000000000 = 0, -9223372036854786048.000000000 != 0, -9223372036854786048.000000000 < 0, -9223372036854786048.000000000 <= 0, -9223372036854786048.000000000 > 0, -9223372036854786048.000000000 >= 0 , toUInt8(0) = -9223372036854786048.000000000, toUInt8(0) != -9223372036854786048.000000000, toUInt8(0) < -9223372036854786048.000000000, toUInt8(0) <= -9223372036854786048.000000000, toUInt8(0) > -9223372036854786048.000000000, toUInt8(0) >= -9223372036854786048.000000000,	-9223372036854786048.000000000 = toUInt8(0), -9223372036854786048.000000000 != toUInt8(0), -9223372036854786048.000000000 < toUInt8(0), -9223372036854786048.000000000 <= toUInt8(0), -9223372036854786048.000000000 > toUInt8(0), -9223372036854786048.000000000 >= toUInt8(0) , toInt8(0) = -9223372036854786048.000000000, toInt8(0) != -9223372036854786048.000000000, toInt8(0) < -9223372036854786048.000000000, toInt8(0) <= -9223372036854786048.000000000, toInt8(0) > -9223372036854786048.000000000, toInt8(0) >= -9223372036854786048.000000000,	-9223372036854786048.000000000 = toInt8(0), -9223372036854786048.000000000 != toInt8(0), -9223372036854786048.000000000 < toInt8(0), -9223372036854786048.000000000 <= toInt8(0), -9223372036854786048.000000000 > toInt8(0), -9223372036854786048.000000000 >= toInt8(0) , toUInt16(0) = -9223372036854786048.000000000, toUInt16(0) != -9223372036854786048.000000000, toUInt16(0) < -9223372036854786048.000000000, toUInt16(0) <= -9223372036854786048.000000000, toUInt16(0) > -9223372036854786048.000000000, toUInt16(0) >= -9223372036854786048.000000000,	-9223372036854786048.000000000 = toUInt16(0), -9223372036854786048.000000000 != toUInt16(0), -9223372036854786048.000000000 < toUInt16(0), -9223372036854786048.000000000 <= toUInt16(0), -9223372036854786048.000000000 > toUInt16(0), -9223372036854786048.000000000 >= toUInt16(0) , toInt16(0) = -9223372036854786048.000000000, toInt16(0) != -9223372036854786048.000000000, toInt16(0) < -9223372036854786048.000000000, toInt16(0) <= -9223372036854786048.000000000, toInt16(0) > -9223372036854786048.000000000, toInt16(0) >= -9223372036854786048.000000000,	-9223372036854786048.000000000 = toInt16(0), -9223372036854786048.000000000 != toInt16(0), -9223372036854786048.000000000 < toInt16(0), -9223372036854786048.000000000 <= toInt16(0), -9223372036854786048.000000000 > toInt16(0), -9223372036854786048.000000000 >= toInt16(0) , toUInt32(0) = -9223372036854786048.000000000, toUInt32(0) != -9223372036854786048.000000000, toUInt32(0) < -9223372036854786048.000000000, toUInt32(0) <= -9223372036854786048.000000000, toUInt32(0) > -9223372036854786048.000000000, toUInt32(0) >= -9223372036854786048.000000000,	-9223372036854786048.000000000 = toUInt32(0), -9223372036854786048.000000000 != toUInt32(0), -9223372036854786048.000000000 < toUInt32(0), -9223372036854786048.000000000 <= toUInt32(0), -9223372036854786048.000000000 > toUInt32(0), -9223372036854786048.000000000 >= toUInt32(0) , toInt32(0) = -9223372036854786048.000000000, toInt32(0) != -9223372036854786048.000000000, toInt32(0) < -9223372036854786048.000000000, toInt32(0) <= -9223372036854786048.000000000, toInt32(0) > -9223372036854786048.000000000, toInt32(0) >= -9223372036854786048.000000000,	-9223372036854786048.000000000 = toInt32(0), -9223372036854786048.000000000 != toInt32(0), -9223372036854786048.000000000 < toInt32(0), -9223372036854786048.000000000 <= toInt32(0), -9223372036854786048.000000000 > toInt32(0), -9223372036854786048.000000000 >= toInt32(0) , toUInt64(0) = -9223372036854786048.000000000, toUInt64(0) != -9223372036854786048.000000000, toUInt64(0) < -9223372036854786048.000000000, toUInt64(0) <= -9223372036854786048.000000000, toUInt64(0) > -9223372036854786048.000000000, toUInt64(0) >= -9223372036854786048.000000000,	-9223372036854786048.000000000 = toUInt64(0), -9223372036854786048.000000000 != toUInt64(0), -9223372036854786048.000000000 < toUInt64(0), -9223372036854786048.000000000 <= toUInt64(0), -9223372036854786048.000000000 > toUInt64(0), -9223372036854786048.000000000 >= toUInt64(0) , toInt64(0) = -9223372036854786048.000000000, toInt64(0) != -9223372036854786048.000000000, toInt64(0) < -9223372036854786048.000000000, toInt64(0) <= -9223372036854786048.000000000, toInt64(0) > -9223372036854786048.000000000, toInt64(0) >= -9223372036854786048.000000000,	-9223372036854786048.000000000 = toInt64(0), -9223372036854786048.000000000 != toInt64(0), -9223372036854786048.000000000 < toInt64(0), -9223372036854786048.000000000 <= toInt64(0), -9223372036854786048.000000000 > toInt64(0), -9223372036854786048.000000000 >= toInt64(0) ;
+SELECT '0', '9223372036854786048.000000000', 0 = 9223372036854786048.000000000, 0 != 9223372036854786048.000000000, 0 < 9223372036854786048.000000000, 0 <= 9223372036854786048.000000000, 0 > 9223372036854786048.000000000, 0 >= 9223372036854786048.000000000,	9223372036854786048.000000000 = 0, 9223372036854786048.000000000 != 0, 9223372036854786048.000000000 < 0, 9223372036854786048.000000000 <= 0, 9223372036854786048.000000000 > 0, 9223372036854786048.000000000 >= 0 , toUInt8(0) = 9223372036854786048.000000000, toUInt8(0) != 9223372036854786048.000000000, toUInt8(0) < 9223372036854786048.000000000, toUInt8(0) <= 9223372036854786048.000000000, toUInt8(0) > 9223372036854786048.000000000, toUInt8(0) >= 9223372036854786048.000000000,	9223372036854786048.000000000 = toUInt8(0), 9223372036854786048.000000000 != toUInt8(0), 9223372036854786048.000000000 < toUInt8(0), 9223372036854786048.000000000 <= toUInt8(0), 9223372036854786048.000000000 > toUInt8(0), 9223372036854786048.000000000 >= toUInt8(0) , toInt8(0) = 9223372036854786048.000000000, toInt8(0) != 9223372036854786048.000000000, toInt8(0) < 9223372036854786048.000000000, toInt8(0) <= 9223372036854786048.000000000, toInt8(0) > 9223372036854786048.000000000, toInt8(0) >= 9223372036854786048.000000000,	9223372036854786048.000000000 = toInt8(0), 9223372036854786048.000000000 != toInt8(0), 9223372036854786048.000000000 < toInt8(0), 9223372036854786048.000000000 <= toInt8(0), 9223372036854786048.000000000 > toInt8(0), 9223372036854786048.000000000 >= toInt8(0) , toUInt16(0) = 9223372036854786048.000000000, toUInt16(0) != 9223372036854786048.000000000, toUInt16(0) < 9223372036854786048.000000000, toUInt16(0) <= 9223372036854786048.000000000, toUInt16(0) > 9223372036854786048.000000000, toUInt16(0) >= 9223372036854786048.000000000,	9223372036854786048.000000000 = toUInt16(0), 9223372036854786048.000000000 != toUInt16(0), 9223372036854786048.000000000 < toUInt16(0), 9223372036854786048.000000000 <= toUInt16(0), 9223372036854786048.000000000 > toUInt16(0), 9223372036854786048.000000000 >= toUInt16(0) , toInt16(0) = 9223372036854786048.000000000, toInt16(0) != 9223372036854786048.000000000, toInt16(0) < 9223372036854786048.000000000, toInt16(0) <= 9223372036854786048.000000000, toInt16(0) > 9223372036854786048.000000000, toInt16(0) >= 9223372036854786048.000000000,	9223372036854786048.000000000 = toInt16(0), 9223372036854786048.000000000 != toInt16(0), 9223372036854786048.000000000 < toInt16(0), 9223372036854786048.000000000 <= toInt16(0), 9223372036854786048.000000000 > toInt16(0), 9223372036854786048.000000000 >= toInt16(0) , toUInt32(0) = 9223372036854786048.000000000, toUInt32(0) != 9223372036854786048.000000000, toUInt32(0) < 9223372036854786048.000000000, toUInt32(0) <= 9223372036854786048.000000000, toUInt32(0) > 9223372036854786048.000000000, toUInt32(0) >= 9223372036854786048.000000000,	9223372036854786048.000000000 = toUInt32(0), 9223372036854786048.000000000 != toUInt32(0), 9223372036854786048.000000000 < toUInt32(0), 9223372036854786048.000000000 <= toUInt32(0), 9223372036854786048.000000000 > toUInt32(0), 9223372036854786048.000000000 >= toUInt32(0) , toInt32(0) = 9223372036854786048.000000000, toInt32(0) != 9223372036854786048.000000000, toInt32(0) < 9223372036854786048.000000000, toInt32(0) <= 9223372036854786048.000000000, toInt32(0) > 9223372036854786048.000000000, toInt32(0) >= 9223372036854786048.000000000,	9223372036854786048.000000000 = toInt32(0), 9223372036854786048.000000000 != toInt32(0), 9223372036854786048.000000000 < toInt32(0), 9223372036854786048.000000000 <= toInt32(0), 9223372036854786048.000000000 > toInt32(0), 9223372036854786048.000000000 >= toInt32(0) , toUInt64(0) = 9223372036854786048.000000000, toUInt64(0) != 9223372036854786048.000000000, toUInt64(0) < 9223372036854786048.000000000, toUInt64(0) <= 9223372036854786048.000000000, toUInt64(0) > 9223372036854786048.000000000, toUInt64(0) >= 9223372036854786048.000000000,	9223372036854786048.000000000 = toUInt64(0), 9223372036854786048.000000000 != toUInt64(0), 9223372036854786048.000000000 < toUInt64(0), 9223372036854786048.000000000 <= toUInt64(0), 9223372036854786048.000000000 > toUInt64(0), 9223372036854786048.000000000 >= toUInt64(0) , toInt64(0) = 9223372036854786048.000000000, toInt64(0) != 9223372036854786048.000000000, toInt64(0) < 9223372036854786048.000000000, toInt64(0) <= 9223372036854786048.000000000, toInt64(0) > 9223372036854786048.000000000, toInt64(0) >= 9223372036854786048.000000000,	9223372036854786048.000000000 = toInt64(0), 9223372036854786048.000000000 != toInt64(0), 9223372036854786048.000000000 < toInt64(0), 9223372036854786048.000000000 <= toInt64(0), 9223372036854786048.000000000 > toInt64(0), 9223372036854786048.000000000 >= toInt64(0) ;
+SELECT '-1', '0.000000000', -1 = 0.000000000, -1 != 0.000000000, -1 < 0.000000000, -1 <= 0.000000000, -1 > 0.000000000, -1 >= 0.000000000,	0.000000000 = -1, 0.000000000 != -1, 0.000000000 < -1, 0.000000000 <= -1, 0.000000000 > -1, 0.000000000 >= -1 , toInt8(-1) = 0.000000000, toInt8(-1) != 0.000000000, toInt8(-1) < 0.000000000, toInt8(-1) <= 0.000000000, toInt8(-1) > 0.000000000, toInt8(-1) >= 0.000000000,	0.000000000 = toInt8(-1), 0.000000000 != toInt8(-1), 0.000000000 < toInt8(-1), 0.000000000 <= toInt8(-1), 0.000000000 > toInt8(-1), 0.000000000 >= toInt8(-1) , toInt16(-1) = 0.000000000, toInt16(-1) != 0.000000000, toInt16(-1) < 0.000000000, toInt16(-1) <= 0.000000000, toInt16(-1) > 0.000000000, toInt16(-1) >= 0.000000000,	0.000000000 = toInt16(-1), 0.000000000 != toInt16(-1), 0.000000000 < toInt16(-1), 0.000000000 <= toInt16(-1), 0.000000000 > toInt16(-1), 0.000000000 >= toInt16(-1) , toInt32(-1) = 0.000000000, toInt32(-1) != 0.000000000, toInt32(-1) < 0.000000000, toInt32(-1) <= 0.000000000, toInt32(-1) > 0.000000000, toInt32(-1) >= 0.000000000,	0.000000000 = toInt32(-1), 0.000000000 != toInt32(-1), 0.000000000 < toInt32(-1), 0.000000000 <= toInt32(-1), 0.000000000 > toInt32(-1), 0.000000000 >= toInt32(-1) , toInt64(-1) = 0.000000000, toInt64(-1) != 0.000000000, toInt64(-1) < 0.000000000, toInt64(-1) <= 0.000000000, toInt64(-1) > 0.000000000, toInt64(-1) >= 0.000000000,	0.000000000 = toInt64(-1), 0.000000000 != toInt64(-1), 0.000000000 < toInt64(-1), 0.000000000 <= toInt64(-1), 0.000000000 > toInt64(-1), 0.000000000 >= toInt64(-1) ;
+SELECT '-1', '-1.000000000', -1 = -1.000000000, -1 != -1.000000000, -1 < -1.000000000, -1 <= -1.000000000, -1 > -1.000000000, -1 >= -1.000000000,	-1.000000000 = -1, -1.000000000 != -1, -1.000000000 < -1, -1.000000000 <= -1, -1.000000000 > -1, -1.000000000 >= -1 , toInt8(-1) = -1.000000000, toInt8(-1) != -1.000000000, toInt8(-1) < -1.000000000, toInt8(-1) <= -1.000000000, toInt8(-1) > -1.000000000, toInt8(-1) >= -1.000000000,	-1.000000000 = toInt8(-1), -1.000000000 != toInt8(-1), -1.000000000 < toInt8(-1), -1.000000000 <= toInt8(-1), -1.000000000 > toInt8(-1), -1.000000000 >= toInt8(-1) , toInt16(-1) = -1.000000000, toInt16(-1) != -1.000000000, toInt16(-1) < -1.000000000, toInt16(-1) <= -1.000000000, toInt16(-1) > -1.000000000, toInt16(-1) >= -1.000000000,	-1.000000000 = toInt16(-1), -1.000000000 != toInt16(-1), -1.000000000 < toInt16(-1), -1.000000000 <= toInt16(-1), -1.000000000 > toInt16(-1), -1.000000000 >= toInt16(-1) , toInt32(-1) = -1.000000000, toInt32(-1) != -1.000000000, toInt32(-1) < -1.000000000, toInt32(-1) <= -1.000000000, toInt32(-1) > -1.000000000, toInt32(-1) >= -1.000000000,	-1.000000000 = toInt32(-1), -1.000000000 != toInt32(-1), -1.000000000 < toInt32(-1), -1.000000000 <= toInt32(-1), -1.000000000 > toInt32(-1), -1.000000000 >= toInt32(-1) , toInt64(-1) = -1.000000000, toInt64(-1) != -1.000000000, toInt64(-1) < -1.000000000, toInt64(-1) <= -1.000000000, toInt64(-1) > -1.000000000, toInt64(-1) >= -1.000000000,	-1.000000000 = toInt64(-1), -1.000000000 != toInt64(-1), -1.000000000 < toInt64(-1), -1.000000000 <= toInt64(-1), -1.000000000 > toInt64(-1), -1.000000000 >= toInt64(-1) ;
+SELECT '-1', '1.000000000', -1 = 1.000000000, -1 != 1.000000000, -1 < 1.000000000, -1 <= 1.000000000, -1 > 1.000000000, -1 >= 1.000000000,	1.000000000 = -1, 1.000000000 != -1, 1.000000000 < -1, 1.000000000 <= -1, 1.000000000 > -1, 1.000000000 >= -1 , toInt8(-1) = 1.000000000, toInt8(-1) != 1.000000000, toInt8(-1) < 1.000000000, toInt8(-1) <= 1.000000000, toInt8(-1) > 1.000000000, toInt8(-1) >= 1.000000000,	1.000000000 = toInt8(-1), 1.000000000 != toInt8(-1), 1.000000000 < toInt8(-1), 1.000000000 <= toInt8(-1), 1.000000000 > toInt8(-1), 1.000000000 >= toInt8(-1) , toInt16(-1) = 1.000000000, toInt16(-1) != 1.000000000, toInt16(-1) < 1.000000000, toInt16(-1) <= 1.000000000, toInt16(-1) > 1.000000000, toInt16(-1) >= 1.000000000,	1.000000000 = toInt16(-1), 1.000000000 != toInt16(-1), 1.000000000 < toInt16(-1), 1.000000000 <= toInt16(-1), 1.000000000 > toInt16(-1), 1.000000000 >= toInt16(-1) , toInt32(-1) = 1.000000000, toInt32(-1) != 1.000000000, toInt32(-1) < 1.000000000, toInt32(-1) <= 1.000000000, toInt32(-1) > 1.000000000, toInt32(-1) >= 1.000000000,	1.000000000 = toInt32(-1), 1.000000000 != toInt32(-1), 1.000000000 < toInt32(-1), 1.000000000 <= toInt32(-1), 1.000000000 > toInt32(-1), 1.000000000 >= toInt32(-1) , toInt64(-1) = 1.000000000, toInt64(-1) != 1.000000000, toInt64(-1) < 1.000000000, toInt64(-1) <= 1.000000000, toInt64(-1) > 1.000000000, toInt64(-1) >= 1.000000000,	1.000000000 = toInt64(-1), 1.000000000 != toInt64(-1), 1.000000000 < toInt64(-1), 1.000000000 <= toInt64(-1), 1.000000000 > toInt64(-1), 1.000000000 >= toInt64(-1) ;
+SELECT '-1', '18446744073709551616.000000000', -1 = 18446744073709551616.000000000, -1 != 18446744073709551616.000000000, -1 < 18446744073709551616.000000000, -1 <= 18446744073709551616.000000000, -1 > 18446744073709551616.000000000, -1 >= 18446744073709551616.000000000,	18446744073709551616.000000000 = -1, 18446744073709551616.000000000 != -1, 18446744073709551616.000000000 < -1, 18446744073709551616.000000000 <= -1, 18446744073709551616.000000000 > -1, 18446744073709551616.000000000 >= -1 , toInt8(-1) = 18446744073709551616.000000000, toInt8(-1) != 18446744073709551616.000000000, toInt8(-1) < 18446744073709551616.000000000, toInt8(-1) <= 18446744073709551616.000000000, toInt8(-1) > 18446744073709551616.000000000, toInt8(-1) >= 18446744073709551616.000000000,	18446744073709551616.000000000 = toInt8(-1), 18446744073709551616.000000000 != toInt8(-1), 18446744073709551616.000000000 < toInt8(-1), 18446744073709551616.000000000 <= toInt8(-1), 18446744073709551616.000000000 > toInt8(-1), 18446744073709551616.000000000 >= toInt8(-1) , toInt16(-1) = 18446744073709551616.000000000, toInt16(-1) != 18446744073709551616.000000000, toInt16(-1) < 18446744073709551616.000000000, toInt16(-1) <= 18446744073709551616.000000000, toInt16(-1) > 18446744073709551616.000000000, toInt16(-1) >= 18446744073709551616.000000000,	18446744073709551616.000000000 = toInt16(-1), 18446744073709551616.000000000 != toInt16(-1), 18446744073709551616.000000000 < toInt16(-1), 18446744073709551616.000000000 <= toInt16(-1), 18446744073709551616.000000000 > toInt16(-1), 18446744073709551616.000000000 >= toInt16(-1) , toInt32(-1) = 18446744073709551616.000000000, toInt32(-1) != 18446744073709551616.000000000, toInt32(-1) < 18446744073709551616.000000000, toInt32(-1) <= 18446744073709551616.000000000, toInt32(-1) > 18446744073709551616.000000000, toInt32(-1) >= 18446744073709551616.000000000,	18446744073709551616.000000000 = toInt32(-1), 18446744073709551616.000000000 != toInt32(-1), 18446744073709551616.000000000 < toInt32(-1), 18446744073709551616.000000000 <= toInt32(-1), 18446744073709551616.000000000 > toInt32(-1), 18446744073709551616.000000000 >= toInt32(-1) , toInt64(-1) = 18446744073709551616.000000000, toInt64(-1) != 18446744073709551616.000000000, toInt64(-1) < 18446744073709551616.000000000, toInt64(-1) <= 18446744073709551616.000000000, toInt64(-1) > 18446744073709551616.000000000, toInt64(-1) >= 18446744073709551616.000000000,	18446744073709551616.000000000 = toInt64(-1), 18446744073709551616.000000000 != toInt64(-1), 18446744073709551616.000000000 < toInt64(-1), 18446744073709551616.000000000 <= toInt64(-1), 18446744073709551616.000000000 > toInt64(-1), 18446744073709551616.000000000 >= toInt64(-1) ;
+SELECT '-1', '9223372036854775808.000000000', -1 = 9223372036854775808.000000000, -1 != 9223372036854775808.000000000, -1 < 9223372036854775808.000000000, -1 <= 9223372036854775808.000000000, -1 > 9223372036854775808.000000000, -1 >= 9223372036854775808.000000000,	9223372036854775808.000000000 = -1, 9223372036854775808.000000000 != -1, 9223372036854775808.000000000 < -1, 9223372036854775808.000000000 <= -1, 9223372036854775808.000000000 > -1, 9223372036854775808.000000000 >= -1 , toInt8(-1) = 9223372036854775808.000000000, toInt8(-1) != 9223372036854775808.000000000, toInt8(-1) < 9223372036854775808.000000000, toInt8(-1) <= 9223372036854775808.000000000, toInt8(-1) > 9223372036854775808.000000000, toInt8(-1) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toInt8(-1), 9223372036854775808.000000000 != toInt8(-1), 9223372036854775808.000000000 < toInt8(-1), 9223372036854775808.000000000 <= toInt8(-1), 9223372036854775808.000000000 > toInt8(-1), 9223372036854775808.000000000 >= toInt8(-1) , toInt16(-1) = 9223372036854775808.000000000, toInt16(-1) != 9223372036854775808.000000000, toInt16(-1) < 9223372036854775808.000000000, toInt16(-1) <= 9223372036854775808.000000000, toInt16(-1) > 9223372036854775808.000000000, toInt16(-1) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toInt16(-1), 9223372036854775808.000000000 != toInt16(-1), 9223372036854775808.000000000 < toInt16(-1), 9223372036854775808.000000000 <= toInt16(-1), 9223372036854775808.000000000 > toInt16(-1), 9223372036854775808.000000000 >= toInt16(-1) , toInt32(-1) = 9223372036854775808.000000000, toInt32(-1) != 9223372036854775808.000000000, toInt32(-1) < 9223372036854775808.000000000, toInt32(-1) <= 9223372036854775808.000000000, toInt32(-1) > 9223372036854775808.000000000, toInt32(-1) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toInt32(-1), 9223372036854775808.000000000 != toInt32(-1), 9223372036854775808.000000000 < toInt32(-1), 9223372036854775808.000000000 <= toInt32(-1), 9223372036854775808.000000000 > toInt32(-1), 9223372036854775808.000000000 >= toInt32(-1) , toInt64(-1) = 9223372036854775808.000000000, toInt64(-1) != 9223372036854775808.000000000, toInt64(-1) < 9223372036854775808.000000000, toInt64(-1) <= 9223372036854775808.000000000, toInt64(-1) > 9223372036854775808.000000000, toInt64(-1) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toInt64(-1), 9223372036854775808.000000000 != toInt64(-1), 9223372036854775808.000000000 < toInt64(-1), 9223372036854775808.000000000 <= toInt64(-1), 9223372036854775808.000000000 > toInt64(-1), 9223372036854775808.000000000 >= toInt64(-1) ;
+SELECT '-1', '-9223372036854775808.000000000', -1 = -9223372036854775808.000000000, -1 != -9223372036854775808.000000000, -1 < -9223372036854775808.000000000, -1 <= -9223372036854775808.000000000, -1 > -9223372036854775808.000000000, -1 >= -9223372036854775808.000000000,	-9223372036854775808.000000000 = -1, -9223372036854775808.000000000 != -1, -9223372036854775808.000000000 < -1, -9223372036854775808.000000000 <= -1, -9223372036854775808.000000000 > -1, -9223372036854775808.000000000 >= -1 , toInt8(-1) = -9223372036854775808.000000000, toInt8(-1) != -9223372036854775808.000000000, toInt8(-1) < -9223372036854775808.000000000, toInt8(-1) <= -9223372036854775808.000000000, toInt8(-1) > -9223372036854775808.000000000, toInt8(-1) >= -9223372036854775808.000000000,	-9223372036854775808.000000000 = toInt8(-1), -9223372036854775808.000000000 != toInt8(-1), -9223372036854775808.000000000 < toInt8(-1), -9223372036854775808.000000000 <= toInt8(-1), -9223372036854775808.000000000 > toInt8(-1), -9223372036854775808.000000000 >= toInt8(-1) , toInt16(-1) = -9223372036854775808.000000000, toInt16(-1) != -9223372036854775808.000000000, toInt16(-1) < -9223372036854775808.000000000, toInt16(-1) <= -9223372036854775808.000000000, toInt16(-1) > -9223372036854775808.000000000, toInt16(-1) >= -9223372036854775808.000000000,	-9223372036854775808.000000000 = toInt16(-1), -9223372036854775808.000000000 != toInt16(-1), -9223372036854775808.000000000 < toInt16(-1), -9223372036854775808.000000000 <= toInt16(-1), -9223372036854775808.000000000 > toInt16(-1), -9223372036854775808.000000000 >= toInt16(-1) , toInt32(-1) = -9223372036854775808.000000000, toInt32(-1) != -9223372036854775808.000000000, toInt32(-1) < -9223372036854775808.000000000, toInt32(-1) <= -9223372036854775808.000000000, toInt32(-1) > -9223372036854775808.000000000, toInt32(-1) >= -9223372036854775808.000000000,	-9223372036854775808.000000000 = toInt32(-1), -9223372036854775808.000000000 != toInt32(-1), -9223372036854775808.000000000 < toInt32(-1), -9223372036854775808.000000000 <= toInt32(-1), -9223372036854775808.000000000 > toInt32(-1), -9223372036854775808.000000000 >= toInt32(-1) , toInt64(-1) = -9223372036854775808.000000000, toInt64(-1) != -9223372036854775808.000000000, toInt64(-1) < -9223372036854775808.000000000, toInt64(-1) <= -9223372036854775808.000000000, toInt64(-1) > -9223372036854775808.000000000, toInt64(-1) >= -9223372036854775808.000000000,	-9223372036854775808.000000000 = toInt64(-1), -9223372036854775808.000000000 != toInt64(-1), -9223372036854775808.000000000 < toInt64(-1), -9223372036854775808.000000000 <= toInt64(-1), -9223372036854775808.000000000 > toInt64(-1), -9223372036854775808.000000000 >= toInt64(-1) ;
+SELECT '-1', '9223372036854775808.000000000', -1 = 9223372036854775808.000000000, -1 != 9223372036854775808.000000000, -1 < 9223372036854775808.000000000, -1 <= 9223372036854775808.000000000, -1 > 9223372036854775808.000000000, -1 >= 9223372036854775808.000000000,	9223372036854775808.000000000 = -1, 9223372036854775808.000000000 != -1, 9223372036854775808.000000000 < -1, 9223372036854775808.000000000 <= -1, 9223372036854775808.000000000 > -1, 9223372036854775808.000000000 >= -1 , toInt8(-1) = 9223372036854775808.000000000, toInt8(-1) != 9223372036854775808.000000000, toInt8(-1) < 9223372036854775808.000000000, toInt8(-1) <= 9223372036854775808.000000000, toInt8(-1) > 9223372036854775808.000000000, toInt8(-1) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toInt8(-1), 9223372036854775808.000000000 != toInt8(-1), 9223372036854775808.000000000 < toInt8(-1), 9223372036854775808.000000000 <= toInt8(-1), 9223372036854775808.000000000 > toInt8(-1), 9223372036854775808.000000000 >= toInt8(-1) , toInt16(-1) = 9223372036854775808.000000000, toInt16(-1) != 9223372036854775808.000000000, toInt16(-1) < 9223372036854775808.000000000, toInt16(-1) <= 9223372036854775808.000000000, toInt16(-1) > 9223372036854775808.000000000, toInt16(-1) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toInt16(-1), 9223372036854775808.000000000 != toInt16(-1), 9223372036854775808.000000000 < toInt16(-1), 9223372036854775808.000000000 <= toInt16(-1), 9223372036854775808.000000000 > toInt16(-1), 9223372036854775808.000000000 >= toInt16(-1) , toInt32(-1) = 9223372036854775808.000000000, toInt32(-1) != 9223372036854775808.000000000, toInt32(-1) < 9223372036854775808.000000000, toInt32(-1) <= 9223372036854775808.000000000, toInt32(-1) > 9223372036854775808.000000000, toInt32(-1) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toInt32(-1), 9223372036854775808.000000000 != toInt32(-1), 9223372036854775808.000000000 < toInt32(-1), 9223372036854775808.000000000 <= toInt32(-1), 9223372036854775808.000000000 > toInt32(-1), 9223372036854775808.000000000 >= toInt32(-1) , toInt64(-1) = 9223372036854775808.000000000, toInt64(-1) != 9223372036854775808.000000000, toInt64(-1) < 9223372036854775808.000000000, toInt64(-1) <= 9223372036854775808.000000000, toInt64(-1) > 9223372036854775808.000000000, toInt64(-1) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toInt64(-1), 9223372036854775808.000000000 != toInt64(-1), 9223372036854775808.000000000 < toInt64(-1), 9223372036854775808.000000000 <= toInt64(-1), 9223372036854775808.000000000 > toInt64(-1), 9223372036854775808.000000000 >= toInt64(-1) ;
+SELECT '-1', '2251799813685248.000000000', -1 = 2251799813685248.000000000, -1 != 2251799813685248.000000000, -1 < 2251799813685248.000000000, -1 <= 2251799813685248.000000000, -1 > 2251799813685248.000000000, -1 >= 2251799813685248.000000000,	2251799813685248.000000000 = -1, 2251799813685248.000000000 != -1, 2251799813685248.000000000 < -1, 2251799813685248.000000000 <= -1, 2251799813685248.000000000 > -1, 2251799813685248.000000000 >= -1 , toInt8(-1) = 2251799813685248.000000000, toInt8(-1) != 2251799813685248.000000000, toInt8(-1) < 2251799813685248.000000000, toInt8(-1) <= 2251799813685248.000000000, toInt8(-1) > 2251799813685248.000000000, toInt8(-1) >= 2251799813685248.000000000,	2251799813685248.000000000 = toInt8(-1), 2251799813685248.000000000 != toInt8(-1), 2251799813685248.000000000 < toInt8(-1), 2251799813685248.000000000 <= toInt8(-1), 2251799813685248.000000000 > toInt8(-1), 2251799813685248.000000000 >= toInt8(-1) , toInt16(-1) = 2251799813685248.000000000, toInt16(-1) != 2251799813685248.000000000, toInt16(-1) < 2251799813685248.000000000, toInt16(-1) <= 2251799813685248.000000000, toInt16(-1) > 2251799813685248.000000000, toInt16(-1) >= 2251799813685248.000000000,	2251799813685248.000000000 = toInt16(-1), 2251799813685248.000000000 != toInt16(-1), 2251799813685248.000000000 < toInt16(-1), 2251799813685248.000000000 <= toInt16(-1), 2251799813685248.000000000 > toInt16(-1), 2251799813685248.000000000 >= toInt16(-1) , toInt32(-1) = 2251799813685248.000000000, toInt32(-1) != 2251799813685248.000000000, toInt32(-1) < 2251799813685248.000000000, toInt32(-1) <= 2251799813685248.000000000, toInt32(-1) > 2251799813685248.000000000, toInt32(-1) >= 2251799813685248.000000000,	2251799813685248.000000000 = toInt32(-1), 2251799813685248.000000000 != toInt32(-1), 2251799813685248.000000000 < toInt32(-1), 2251799813685248.000000000 <= toInt32(-1), 2251799813685248.000000000 > toInt32(-1), 2251799813685248.000000000 >= toInt32(-1) , toInt64(-1) = 2251799813685248.000000000, toInt64(-1) != 2251799813685248.000000000, toInt64(-1) < 2251799813685248.000000000, toInt64(-1) <= 2251799813685248.000000000, toInt64(-1) > 2251799813685248.000000000, toInt64(-1) >= 2251799813685248.000000000,	2251799813685248.000000000 = toInt64(-1), 2251799813685248.000000000 != toInt64(-1), 2251799813685248.000000000 < toInt64(-1), 2251799813685248.000000000 <= toInt64(-1), 2251799813685248.000000000 > toInt64(-1), 2251799813685248.000000000 >= toInt64(-1) ;
+SELECT '-1', '4503599627370496.000000000', -1 = 4503599627370496.000000000, -1 != 4503599627370496.000000000, -1 < 4503599627370496.000000000, -1 <= 4503599627370496.000000000, -1 > 4503599627370496.000000000, -1 >= 4503599627370496.000000000,	4503599627370496.000000000 = -1, 4503599627370496.000000000 != -1, 4503599627370496.000000000 < -1, 4503599627370496.000000000 <= -1, 4503599627370496.000000000 > -1, 4503599627370496.000000000 >= -1 , toInt8(-1) = 4503599627370496.000000000, toInt8(-1) != 4503599627370496.000000000, toInt8(-1) < 4503599627370496.000000000, toInt8(-1) <= 4503599627370496.000000000, toInt8(-1) > 4503599627370496.000000000, toInt8(-1) >= 4503599627370496.000000000,	4503599627370496.000000000 = toInt8(-1), 4503599627370496.000000000 != toInt8(-1), 4503599627370496.000000000 < toInt8(-1), 4503599627370496.000000000 <= toInt8(-1), 4503599627370496.000000000 > toInt8(-1), 4503599627370496.000000000 >= toInt8(-1) , toInt16(-1) = 4503599627370496.000000000, toInt16(-1) != 4503599627370496.000000000, toInt16(-1) < 4503599627370496.000000000, toInt16(-1) <= 4503599627370496.000000000, toInt16(-1) > 4503599627370496.000000000, toInt16(-1) >= 4503599627370496.000000000,	4503599627370496.000000000 = toInt16(-1), 4503599627370496.000000000 != toInt16(-1), 4503599627370496.000000000 < toInt16(-1), 4503599627370496.000000000 <= toInt16(-1), 4503599627370496.000000000 > toInt16(-1), 4503599627370496.000000000 >= toInt16(-1) , toInt32(-1) = 4503599627370496.000000000, toInt32(-1) != 4503599627370496.000000000, toInt32(-1) < 4503599627370496.000000000, toInt32(-1) <= 4503599627370496.000000000, toInt32(-1) > 4503599627370496.000000000, toInt32(-1) >= 4503599627370496.000000000,	4503599627370496.000000000 = toInt32(-1), 4503599627370496.000000000 != toInt32(-1), 4503599627370496.000000000 < toInt32(-1), 4503599627370496.000000000 <= toInt32(-1), 4503599627370496.000000000 > toInt32(-1), 4503599627370496.000000000 >= toInt32(-1) , toInt64(-1) = 4503599627370496.000000000, toInt64(-1) != 4503599627370496.000000000, toInt64(-1) < 4503599627370496.000000000, toInt64(-1) <= 4503599627370496.000000000, toInt64(-1) > 4503599627370496.000000000, toInt64(-1) >= 4503599627370496.000000000,	4503599627370496.000000000 = toInt64(-1), 4503599627370496.000000000 != toInt64(-1), 4503599627370496.000000000 < toInt64(-1), 4503599627370496.000000000 <= toInt64(-1), 4503599627370496.000000000 > toInt64(-1), 4503599627370496.000000000 >= toInt64(-1) ;
+SELECT '-1', '9007199254740991.000000000', -1 = 9007199254740991.000000000, -1 != 9007199254740991.000000000, -1 < 9007199254740991.000000000, -1 <= 9007199254740991.000000000, -1 > 9007199254740991.000000000, -1 >= 9007199254740991.000000000,	9007199254740991.000000000 = -1, 9007199254740991.000000000 != -1, 9007199254740991.000000000 < -1, 9007199254740991.000000000 <= -1, 9007199254740991.000000000 > -1, 9007199254740991.000000000 >= -1 , toInt8(-1) = 9007199254740991.000000000, toInt8(-1) != 9007199254740991.000000000, toInt8(-1) < 9007199254740991.000000000, toInt8(-1) <= 9007199254740991.000000000, toInt8(-1) > 9007199254740991.000000000, toInt8(-1) >= 9007199254740991.000000000,	9007199254740991.000000000 = toInt8(-1), 9007199254740991.000000000 != toInt8(-1), 9007199254740991.000000000 < toInt8(-1), 9007199254740991.000000000 <= toInt8(-1), 9007199254740991.000000000 > toInt8(-1), 9007199254740991.000000000 >= toInt8(-1) , toInt16(-1) = 9007199254740991.000000000, toInt16(-1) != 9007199254740991.000000000, toInt16(-1) < 9007199254740991.000000000, toInt16(-1) <= 9007199254740991.000000000, toInt16(-1) > 9007199254740991.000000000, toInt16(-1) >= 9007199254740991.000000000,	9007199254740991.000000000 = toInt16(-1), 9007199254740991.000000000 != toInt16(-1), 9007199254740991.000000000 < toInt16(-1), 9007199254740991.000000000 <= toInt16(-1), 9007199254740991.000000000 > toInt16(-1), 9007199254740991.000000000 >= toInt16(-1) , toInt32(-1) = 9007199254740991.000000000, toInt32(-1) != 9007199254740991.000000000, toInt32(-1) < 9007199254740991.000000000, toInt32(-1) <= 9007199254740991.000000000, toInt32(-1) > 9007199254740991.000000000, toInt32(-1) >= 9007199254740991.000000000,	9007199254740991.000000000 = toInt32(-1), 9007199254740991.000000000 != toInt32(-1), 9007199254740991.000000000 < toInt32(-1), 9007199254740991.000000000 <= toInt32(-1), 9007199254740991.000000000 > toInt32(-1), 9007199254740991.000000000 >= toInt32(-1) , toInt64(-1) = 9007199254740991.000000000, toInt64(-1) != 9007199254740991.000000000, toInt64(-1) < 9007199254740991.000000000, toInt64(-1) <= 9007199254740991.000000000, toInt64(-1) > 9007199254740991.000000000, toInt64(-1) >= 9007199254740991.000000000,	9007199254740991.000000000 = toInt64(-1), 9007199254740991.000000000 != toInt64(-1), 9007199254740991.000000000 < toInt64(-1), 9007199254740991.000000000 <= toInt64(-1), 9007199254740991.000000000 > toInt64(-1), 9007199254740991.000000000 >= toInt64(-1) ;
+SELECT '-1', '9007199254740992.000000000', -1 = 9007199254740992.000000000, -1 != 9007199254740992.000000000, -1 < 9007199254740992.000000000, -1 <= 9007199254740992.000000000, -1 > 9007199254740992.000000000, -1 >= 9007199254740992.000000000,	9007199254740992.000000000 = -1, 9007199254740992.000000000 != -1, 9007199254740992.000000000 < -1, 9007199254740992.000000000 <= -1, 9007199254740992.000000000 > -1, 9007199254740992.000000000 >= -1 , toInt8(-1) = 9007199254740992.000000000, toInt8(-1) != 9007199254740992.000000000, toInt8(-1) < 9007199254740992.000000000, toInt8(-1) <= 9007199254740992.000000000, toInt8(-1) > 9007199254740992.000000000, toInt8(-1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt8(-1), 9007199254740992.000000000 != toInt8(-1), 9007199254740992.000000000 < toInt8(-1), 9007199254740992.000000000 <= toInt8(-1), 9007199254740992.000000000 > toInt8(-1), 9007199254740992.000000000 >= toInt8(-1) , toInt16(-1) = 9007199254740992.000000000, toInt16(-1) != 9007199254740992.000000000, toInt16(-1) < 9007199254740992.000000000, toInt16(-1) <= 9007199254740992.000000000, toInt16(-1) > 9007199254740992.000000000, toInt16(-1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt16(-1), 9007199254740992.000000000 != toInt16(-1), 9007199254740992.000000000 < toInt16(-1), 9007199254740992.000000000 <= toInt16(-1), 9007199254740992.000000000 > toInt16(-1), 9007199254740992.000000000 >= toInt16(-1) , toInt32(-1) = 9007199254740992.000000000, toInt32(-1) != 9007199254740992.000000000, toInt32(-1) < 9007199254740992.000000000, toInt32(-1) <= 9007199254740992.000000000, toInt32(-1) > 9007199254740992.000000000, toInt32(-1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt32(-1), 9007199254740992.000000000 != toInt32(-1), 9007199254740992.000000000 < toInt32(-1), 9007199254740992.000000000 <= toInt32(-1), 9007199254740992.000000000 > toInt32(-1), 9007199254740992.000000000 >= toInt32(-1) , toInt64(-1) = 9007199254740992.000000000, toInt64(-1) != 9007199254740992.000000000, toInt64(-1) < 9007199254740992.000000000, toInt64(-1) <= 9007199254740992.000000000, toInt64(-1) > 9007199254740992.000000000, toInt64(-1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt64(-1), 9007199254740992.000000000 != toInt64(-1), 9007199254740992.000000000 < toInt64(-1), 9007199254740992.000000000 <= toInt64(-1), 9007199254740992.000000000 > toInt64(-1), 9007199254740992.000000000 >= toInt64(-1) ;
+SELECT '-1', '9007199254740992.000000000', -1 = 9007199254740992.000000000, -1 != 9007199254740992.000000000, -1 < 9007199254740992.000000000, -1 <= 9007199254740992.000000000, -1 > 9007199254740992.000000000, -1 >= 9007199254740992.000000000,	9007199254740992.000000000 = -1, 9007199254740992.000000000 != -1, 9007199254740992.000000000 < -1, 9007199254740992.000000000 <= -1, 9007199254740992.000000000 > -1, 9007199254740992.000000000 >= -1 , toInt8(-1) = 9007199254740992.000000000, toInt8(-1) != 9007199254740992.000000000, toInt8(-1) < 9007199254740992.000000000, toInt8(-1) <= 9007199254740992.000000000, toInt8(-1) > 9007199254740992.000000000, toInt8(-1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt8(-1), 9007199254740992.000000000 != toInt8(-1), 9007199254740992.000000000 < toInt8(-1), 9007199254740992.000000000 <= toInt8(-1), 9007199254740992.000000000 > toInt8(-1), 9007199254740992.000000000 >= toInt8(-1) , toInt16(-1) = 9007199254740992.000000000, toInt16(-1) != 9007199254740992.000000000, toInt16(-1) < 9007199254740992.000000000, toInt16(-1) <= 9007199254740992.000000000, toInt16(-1) > 9007199254740992.000000000, toInt16(-1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt16(-1), 9007199254740992.000000000 != toInt16(-1), 9007199254740992.000000000 < toInt16(-1), 9007199254740992.000000000 <= toInt16(-1), 9007199254740992.000000000 > toInt16(-1), 9007199254740992.000000000 >= toInt16(-1) , toInt32(-1) = 9007199254740992.000000000, toInt32(-1) != 9007199254740992.000000000, toInt32(-1) < 9007199254740992.000000000, toInt32(-1) <= 9007199254740992.000000000, toInt32(-1) > 9007199254740992.000000000, toInt32(-1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt32(-1), 9007199254740992.000000000 != toInt32(-1), 9007199254740992.000000000 < toInt32(-1), 9007199254740992.000000000 <= toInt32(-1), 9007199254740992.000000000 > toInt32(-1), 9007199254740992.000000000 >= toInt32(-1) , toInt64(-1) = 9007199254740992.000000000, toInt64(-1) != 9007199254740992.000000000, toInt64(-1) < 9007199254740992.000000000, toInt64(-1) <= 9007199254740992.000000000, toInt64(-1) > 9007199254740992.000000000, toInt64(-1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt64(-1), 9007199254740992.000000000 != toInt64(-1), 9007199254740992.000000000 < toInt64(-1), 9007199254740992.000000000 <= toInt64(-1), 9007199254740992.000000000 > toInt64(-1), 9007199254740992.000000000 >= toInt64(-1) ;
+SELECT '-1', '9007199254740994.000000000', -1 = 9007199254740994.000000000, -1 != 9007199254740994.000000000, -1 < 9007199254740994.000000000, -1 <= 9007199254740994.000000000, -1 > 9007199254740994.000000000, -1 >= 9007199254740994.000000000,	9007199254740994.000000000 = -1, 9007199254740994.000000000 != -1, 9007199254740994.000000000 < -1, 9007199254740994.000000000 <= -1, 9007199254740994.000000000 > -1, 9007199254740994.000000000 >= -1 , toInt8(-1) = 9007199254740994.000000000, toInt8(-1) != 9007199254740994.000000000, toInt8(-1) < 9007199254740994.000000000, toInt8(-1) <= 9007199254740994.000000000, toInt8(-1) > 9007199254740994.000000000, toInt8(-1) >= 9007199254740994.000000000,	9007199254740994.000000000 = toInt8(-1), 9007199254740994.000000000 != toInt8(-1), 9007199254740994.000000000 < toInt8(-1), 9007199254740994.000000000 <= toInt8(-1), 9007199254740994.000000000 > toInt8(-1), 9007199254740994.000000000 >= toInt8(-1) , toInt16(-1) = 9007199254740994.000000000, toInt16(-1) != 9007199254740994.000000000, toInt16(-1) < 9007199254740994.000000000, toInt16(-1) <= 9007199254740994.000000000, toInt16(-1) > 9007199254740994.000000000, toInt16(-1) >= 9007199254740994.000000000,	9007199254740994.000000000 = toInt16(-1), 9007199254740994.000000000 != toInt16(-1), 9007199254740994.000000000 < toInt16(-1), 9007199254740994.000000000 <= toInt16(-1), 9007199254740994.000000000 > toInt16(-1), 9007199254740994.000000000 >= toInt16(-1) , toInt32(-1) = 9007199254740994.000000000, toInt32(-1) != 9007199254740994.000000000, toInt32(-1) < 9007199254740994.000000000, toInt32(-1) <= 9007199254740994.000000000, toInt32(-1) > 9007199254740994.000000000, toInt32(-1) >= 9007199254740994.000000000,	9007199254740994.000000000 = toInt32(-1), 9007199254740994.000000000 != toInt32(-1), 9007199254740994.000000000 < toInt32(-1), 9007199254740994.000000000 <= toInt32(-1), 9007199254740994.000000000 > toInt32(-1), 9007199254740994.000000000 >= toInt32(-1) , toInt64(-1) = 9007199254740994.000000000, toInt64(-1) != 9007199254740994.000000000, toInt64(-1) < 9007199254740994.000000000, toInt64(-1) <= 9007199254740994.000000000, toInt64(-1) > 9007199254740994.000000000, toInt64(-1) >= 9007199254740994.000000000,	9007199254740994.000000000 = toInt64(-1), 9007199254740994.000000000 != toInt64(-1), 9007199254740994.000000000 < toInt64(-1), 9007199254740994.000000000 <= toInt64(-1), 9007199254740994.000000000 > toInt64(-1), 9007199254740994.000000000 >= toInt64(-1) ;
+SELECT '-1', '-9007199254740991.000000000', -1 = -9007199254740991.000000000, -1 != -9007199254740991.000000000, -1 < -9007199254740991.000000000, -1 <= -9007199254740991.000000000, -1 > -9007199254740991.000000000, -1 >= -9007199254740991.000000000,	-9007199254740991.000000000 = -1, -9007199254740991.000000000 != -1, -9007199254740991.000000000 < -1, -9007199254740991.000000000 <= -1, -9007199254740991.000000000 > -1, -9007199254740991.000000000 >= -1 , toInt8(-1) = -9007199254740991.000000000, toInt8(-1) != -9007199254740991.000000000, toInt8(-1) < -9007199254740991.000000000, toInt8(-1) <= -9007199254740991.000000000, toInt8(-1) > -9007199254740991.000000000, toInt8(-1) >= -9007199254740991.000000000,	-9007199254740991.000000000 = toInt8(-1), -9007199254740991.000000000 != toInt8(-1), -9007199254740991.000000000 < toInt8(-1), -9007199254740991.000000000 <= toInt8(-1), -9007199254740991.000000000 > toInt8(-1), -9007199254740991.000000000 >= toInt8(-1) , toInt16(-1) = -9007199254740991.000000000, toInt16(-1) != -9007199254740991.000000000, toInt16(-1) < -9007199254740991.000000000, toInt16(-1) <= -9007199254740991.000000000, toInt16(-1) > -9007199254740991.000000000, toInt16(-1) >= -9007199254740991.000000000,	-9007199254740991.000000000 = toInt16(-1), -9007199254740991.000000000 != toInt16(-1), -9007199254740991.000000000 < toInt16(-1), -9007199254740991.000000000 <= toInt16(-1), -9007199254740991.000000000 > toInt16(-1), -9007199254740991.000000000 >= toInt16(-1) , toInt32(-1) = -9007199254740991.000000000, toInt32(-1) != -9007199254740991.000000000, toInt32(-1) < -9007199254740991.000000000, toInt32(-1) <= -9007199254740991.000000000, toInt32(-1) > -9007199254740991.000000000, toInt32(-1) >= -9007199254740991.000000000,	-9007199254740991.000000000 = toInt32(-1), -9007199254740991.000000000 != toInt32(-1), -9007199254740991.000000000 < toInt32(-1), -9007199254740991.000000000 <= toInt32(-1), -9007199254740991.000000000 > toInt32(-1), -9007199254740991.000000000 >= toInt32(-1) , toInt64(-1) = -9007199254740991.000000000, toInt64(-1) != -9007199254740991.000000000, toInt64(-1) < -9007199254740991.000000000, toInt64(-1) <= -9007199254740991.000000000, toInt64(-1) > -9007199254740991.000000000, toInt64(-1) >= -9007199254740991.000000000,	-9007199254740991.000000000 = toInt64(-1), -9007199254740991.000000000 != toInt64(-1), -9007199254740991.000000000 < toInt64(-1), -9007199254740991.000000000 <= toInt64(-1), -9007199254740991.000000000 > toInt64(-1), -9007199254740991.000000000 >= toInt64(-1) ;
+SELECT '-1', '-9007199254740992.000000000', -1 = -9007199254740992.000000000, -1 != -9007199254740992.000000000, -1 < -9007199254740992.000000000, -1 <= -9007199254740992.000000000, -1 > -9007199254740992.000000000, -1 >= -9007199254740992.000000000,	-9007199254740992.000000000 = -1, -9007199254740992.000000000 != -1, -9007199254740992.000000000 < -1, -9007199254740992.000000000 <= -1, -9007199254740992.000000000 > -1, -9007199254740992.000000000 >= -1 , toInt8(-1) = -9007199254740992.000000000, toInt8(-1) != -9007199254740992.000000000, toInt8(-1) < -9007199254740992.000000000, toInt8(-1) <= -9007199254740992.000000000, toInt8(-1) > -9007199254740992.000000000, toInt8(-1) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toInt8(-1), -9007199254740992.000000000 != toInt8(-1), -9007199254740992.000000000 < toInt8(-1), -9007199254740992.000000000 <= toInt8(-1), -9007199254740992.000000000 > toInt8(-1), -9007199254740992.000000000 >= toInt8(-1) , toInt16(-1) = -9007199254740992.000000000, toInt16(-1) != -9007199254740992.000000000, toInt16(-1) < -9007199254740992.000000000, toInt16(-1) <= -9007199254740992.000000000, toInt16(-1) > -9007199254740992.000000000, toInt16(-1) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toInt16(-1), -9007199254740992.000000000 != toInt16(-1), -9007199254740992.000000000 < toInt16(-1), -9007199254740992.000000000 <= toInt16(-1), -9007199254740992.000000000 > toInt16(-1), -9007199254740992.000000000 >= toInt16(-1) , toInt32(-1) = -9007199254740992.000000000, toInt32(-1) != -9007199254740992.000000000, toInt32(-1) < -9007199254740992.000000000, toInt32(-1) <= -9007199254740992.000000000, toInt32(-1) > -9007199254740992.000000000, toInt32(-1) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toInt32(-1), -9007199254740992.000000000 != toInt32(-1), -9007199254740992.000000000 < toInt32(-1), -9007199254740992.000000000 <= toInt32(-1), -9007199254740992.000000000 > toInt32(-1), -9007199254740992.000000000 >= toInt32(-1) , toInt64(-1) = -9007199254740992.000000000, toInt64(-1) != -9007199254740992.000000000, toInt64(-1) < -9007199254740992.000000000, toInt64(-1) <= -9007199254740992.000000000, toInt64(-1) > -9007199254740992.000000000, toInt64(-1) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toInt64(-1), -9007199254740992.000000000 != toInt64(-1), -9007199254740992.000000000 < toInt64(-1), -9007199254740992.000000000 <= toInt64(-1), -9007199254740992.000000000 > toInt64(-1), -9007199254740992.000000000 >= toInt64(-1) ;
+SELECT '-1', '-9007199254740992.000000000', -1 = -9007199254740992.000000000, -1 != -9007199254740992.000000000, -1 < -9007199254740992.000000000, -1 <= -9007199254740992.000000000, -1 > -9007199254740992.000000000, -1 >= -9007199254740992.000000000,	-9007199254740992.000000000 = -1, -9007199254740992.000000000 != -1, -9007199254740992.000000000 < -1, -9007199254740992.000000000 <= -1, -9007199254740992.000000000 > -1, -9007199254740992.000000000 >= -1 , toInt8(-1) = -9007199254740992.000000000, toInt8(-1) != -9007199254740992.000000000, toInt8(-1) < -9007199254740992.000000000, toInt8(-1) <= -9007199254740992.000000000, toInt8(-1) > -9007199254740992.000000000, toInt8(-1) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toInt8(-1), -9007199254740992.000000000 != toInt8(-1), -9007199254740992.000000000 < toInt8(-1), -9007199254740992.000000000 <= toInt8(-1), -9007199254740992.000000000 > toInt8(-1), -9007199254740992.000000000 >= toInt8(-1) , toInt16(-1) = -9007199254740992.000000000, toInt16(-1) != -9007199254740992.000000000, toInt16(-1) < -9007199254740992.000000000, toInt16(-1) <= -9007199254740992.000000000, toInt16(-1) > -9007199254740992.000000000, toInt16(-1) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toInt16(-1), -9007199254740992.000000000 != toInt16(-1), -9007199254740992.000000000 < toInt16(-1), -9007199254740992.000000000 <= toInt16(-1), -9007199254740992.000000000 > toInt16(-1), -9007199254740992.000000000 >= toInt16(-1) , toInt32(-1) = -9007199254740992.000000000, toInt32(-1) != -9007199254740992.000000000, toInt32(-1) < -9007199254740992.000000000, toInt32(-1) <= -9007199254740992.000000000, toInt32(-1) > -9007199254740992.000000000, toInt32(-1) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toInt32(-1), -9007199254740992.000000000 != toInt32(-1), -9007199254740992.000000000 < toInt32(-1), -9007199254740992.000000000 <= toInt32(-1), -9007199254740992.000000000 > toInt32(-1), -9007199254740992.000000000 >= toInt32(-1) , toInt64(-1) = -9007199254740992.000000000, toInt64(-1) != -9007199254740992.000000000, toInt64(-1) < -9007199254740992.000000000, toInt64(-1) <= -9007199254740992.000000000, toInt64(-1) > -9007199254740992.000000000, toInt64(-1) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toInt64(-1), -9007199254740992.000000000 != toInt64(-1), -9007199254740992.000000000 < toInt64(-1), -9007199254740992.000000000 <= toInt64(-1), -9007199254740992.000000000 > toInt64(-1), -9007199254740992.000000000 >= toInt64(-1) ;
+SELECT '-1', '-9007199254740994.000000000', -1 = -9007199254740994.000000000, -1 != -9007199254740994.000000000, -1 < -9007199254740994.000000000, -1 <= -9007199254740994.000000000, -1 > -9007199254740994.000000000, -1 >= -9007199254740994.000000000,	-9007199254740994.000000000 = -1, -9007199254740994.000000000 != -1, -9007199254740994.000000000 < -1, -9007199254740994.000000000 <= -1, -9007199254740994.000000000 > -1, -9007199254740994.000000000 >= -1 , toInt8(-1) = -9007199254740994.000000000, toInt8(-1) != -9007199254740994.000000000, toInt8(-1) < -9007199254740994.000000000, toInt8(-1) <= -9007199254740994.000000000, toInt8(-1) > -9007199254740994.000000000, toInt8(-1) >= -9007199254740994.000000000,	-9007199254740994.000000000 = toInt8(-1), -9007199254740994.000000000 != toInt8(-1), -9007199254740994.000000000 < toInt8(-1), -9007199254740994.000000000 <= toInt8(-1), -9007199254740994.000000000 > toInt8(-1), -9007199254740994.000000000 >= toInt8(-1) , toInt16(-1) = -9007199254740994.000000000, toInt16(-1) != -9007199254740994.000000000, toInt16(-1) < -9007199254740994.000000000, toInt16(-1) <= -9007199254740994.000000000, toInt16(-1) > -9007199254740994.000000000, toInt16(-1) >= -9007199254740994.000000000,	-9007199254740994.000000000 = toInt16(-1), -9007199254740994.000000000 != toInt16(-1), -9007199254740994.000000000 < toInt16(-1), -9007199254740994.000000000 <= toInt16(-1), -9007199254740994.000000000 > toInt16(-1), -9007199254740994.000000000 >= toInt16(-1) , toInt32(-1) = -9007199254740994.000000000, toInt32(-1) != -9007199254740994.000000000, toInt32(-1) < -9007199254740994.000000000, toInt32(-1) <= -9007199254740994.000000000, toInt32(-1) > -9007199254740994.000000000, toInt32(-1) >= -9007199254740994.000000000,	-9007199254740994.000000000 = toInt32(-1), -9007199254740994.000000000 != toInt32(-1), -9007199254740994.000000000 < toInt32(-1), -9007199254740994.000000000 <= toInt32(-1), -9007199254740994.000000000 > toInt32(-1), -9007199254740994.000000000 >= toInt32(-1) , toInt64(-1) = -9007199254740994.000000000, toInt64(-1) != -9007199254740994.000000000, toInt64(-1) < -9007199254740994.000000000, toInt64(-1) <= -9007199254740994.000000000, toInt64(-1) > -9007199254740994.000000000, toInt64(-1) >= -9007199254740994.000000000,	-9007199254740994.000000000 = toInt64(-1), -9007199254740994.000000000 != toInt64(-1), -9007199254740994.000000000 < toInt64(-1), -9007199254740994.000000000 <= toInt64(-1), -9007199254740994.000000000 > toInt64(-1), -9007199254740994.000000000 >= toInt64(-1) ;
+SELECT '-1', '104.000000000', -1 = 104.000000000, -1 != 104.000000000, -1 < 104.000000000, -1 <= 104.000000000, -1 > 104.000000000, -1 >= 104.000000000,	104.000000000 = -1, 104.000000000 != -1, 104.000000000 < -1, 104.000000000 <= -1, 104.000000000 > -1, 104.000000000 >= -1 , toInt8(-1) = 104.000000000, toInt8(-1) != 104.000000000, toInt8(-1) < 104.000000000, toInt8(-1) <= 104.000000000, toInt8(-1) > 104.000000000, toInt8(-1) >= 104.000000000,	104.000000000 = toInt8(-1), 104.000000000 != toInt8(-1), 104.000000000 < toInt8(-1), 104.000000000 <= toInt8(-1), 104.000000000 > toInt8(-1), 104.000000000 >= toInt8(-1) , toInt16(-1) = 104.000000000, toInt16(-1) != 104.000000000, toInt16(-1) < 104.000000000, toInt16(-1) <= 104.000000000, toInt16(-1) > 104.000000000, toInt16(-1) >= 104.000000000,	104.000000000 = toInt16(-1), 104.000000000 != toInt16(-1), 104.000000000 < toInt16(-1), 104.000000000 <= toInt16(-1), 104.000000000 > toInt16(-1), 104.000000000 >= toInt16(-1) , toInt32(-1) = 104.000000000, toInt32(-1) != 104.000000000, toInt32(-1) < 104.000000000, toInt32(-1) <= 104.000000000, toInt32(-1) > 104.000000000, toInt32(-1) >= 104.000000000,	104.000000000 = toInt32(-1), 104.000000000 != toInt32(-1), 104.000000000 < toInt32(-1), 104.000000000 <= toInt32(-1), 104.000000000 > toInt32(-1), 104.000000000 >= toInt32(-1) , toInt64(-1) = 104.000000000, toInt64(-1) != 104.000000000, toInt64(-1) < 104.000000000, toInt64(-1) <= 104.000000000, toInt64(-1) > 104.000000000, toInt64(-1) >= 104.000000000,	104.000000000 = toInt64(-1), 104.000000000 != toInt64(-1), 104.000000000 < toInt64(-1), 104.000000000 <= toInt64(-1), 104.000000000 > toInt64(-1), 104.000000000 >= toInt64(-1) ;
+SELECT '-1', '-4503599627370496.000000000', -1 = -4503599627370496.000000000, -1 != -4503599627370496.000000000, -1 < -4503599627370496.000000000, -1 <= -4503599627370496.000000000, -1 > -4503599627370496.000000000, -1 >= -4503599627370496.000000000,	-4503599627370496.000000000 = -1, -4503599627370496.000000000 != -1, -4503599627370496.000000000 < -1, -4503599627370496.000000000 <= -1, -4503599627370496.000000000 > -1, -4503599627370496.000000000 >= -1 , toInt8(-1) = -4503599627370496.000000000, toInt8(-1) != -4503599627370496.000000000, toInt8(-1) < -4503599627370496.000000000, toInt8(-1) <= -4503599627370496.000000000, toInt8(-1) > -4503599627370496.000000000, toInt8(-1) >= -4503599627370496.000000000,	-4503599627370496.000000000 = toInt8(-1), -4503599627370496.000000000 != toInt8(-1), -4503599627370496.000000000 < toInt8(-1), -4503599627370496.000000000 <= toInt8(-1), -4503599627370496.000000000 > toInt8(-1), -4503599627370496.000000000 >= toInt8(-1) , toInt16(-1) = -4503599627370496.000000000, toInt16(-1) != -4503599627370496.000000000, toInt16(-1) < -4503599627370496.000000000, toInt16(-1) <= -4503599627370496.000000000, toInt16(-1) > -4503599627370496.000000000, toInt16(-1) >= -4503599627370496.000000000,	-4503599627370496.000000000 = toInt16(-1), -4503599627370496.000000000 != toInt16(-1), -4503599627370496.000000000 < toInt16(-1), -4503599627370496.000000000 <= toInt16(-1), -4503599627370496.000000000 > toInt16(-1), -4503599627370496.000000000 >= toInt16(-1) , toInt32(-1) = -4503599627370496.000000000, toInt32(-1) != -4503599627370496.000000000, toInt32(-1) < -4503599627370496.000000000, toInt32(-1) <= -4503599627370496.000000000, toInt32(-1) > -4503599627370496.000000000, toInt32(-1) >= -4503599627370496.000000000,	-4503599627370496.000000000 = toInt32(-1), -4503599627370496.000000000 != toInt32(-1), -4503599627370496.000000000 < toInt32(-1), -4503599627370496.000000000 <= toInt32(-1), -4503599627370496.000000000 > toInt32(-1), -4503599627370496.000000000 >= toInt32(-1) , toInt64(-1) = -4503599627370496.000000000, toInt64(-1) != -4503599627370496.000000000, toInt64(-1) < -4503599627370496.000000000, toInt64(-1) <= -4503599627370496.000000000, toInt64(-1) > -4503599627370496.000000000, toInt64(-1) >= -4503599627370496.000000000,	-4503599627370496.000000000 = toInt64(-1), -4503599627370496.000000000 != toInt64(-1), -4503599627370496.000000000 < toInt64(-1), -4503599627370496.000000000 <= toInt64(-1), -4503599627370496.000000000 > toInt64(-1), -4503599627370496.000000000 >= toInt64(-1) ;
+SELECT '-1', '-0.500000000', -1 = -0.500000000, -1 != -0.500000000, -1 < -0.500000000, -1 <= -0.500000000, -1 > -0.500000000, -1 >= -0.500000000,	-0.500000000 = -1, -0.500000000 != -1, -0.500000000 < -1, -0.500000000 <= -1, -0.500000000 > -1, -0.500000000 >= -1 , toInt8(-1) = -0.500000000, toInt8(-1) != -0.500000000, toInt8(-1) < -0.500000000, toInt8(-1) <= -0.500000000, toInt8(-1) > -0.500000000, toInt8(-1) >= -0.500000000,	-0.500000000 = toInt8(-1), -0.500000000 != toInt8(-1), -0.500000000 < toInt8(-1), -0.500000000 <= toInt8(-1), -0.500000000 > toInt8(-1), -0.500000000 >= toInt8(-1) , toInt16(-1) = -0.500000000, toInt16(-1) != -0.500000000, toInt16(-1) < -0.500000000, toInt16(-1) <= -0.500000000, toInt16(-1) > -0.500000000, toInt16(-1) >= -0.500000000,	-0.500000000 = toInt16(-1), -0.500000000 != toInt16(-1), -0.500000000 < toInt16(-1), -0.500000000 <= toInt16(-1), -0.500000000 > toInt16(-1), -0.500000000 >= toInt16(-1) , toInt32(-1) = -0.500000000, toInt32(-1) != -0.500000000, toInt32(-1) < -0.500000000, toInt32(-1) <= -0.500000000, toInt32(-1) > -0.500000000, toInt32(-1) >= -0.500000000,	-0.500000000 = toInt32(-1), -0.500000000 != toInt32(-1), -0.500000000 < toInt32(-1), -0.500000000 <= toInt32(-1), -0.500000000 > toInt32(-1), -0.500000000 >= toInt32(-1) , toInt64(-1) = -0.500000000, toInt64(-1) != -0.500000000, toInt64(-1) < -0.500000000, toInt64(-1) <= -0.500000000, toInt64(-1) > -0.500000000, toInt64(-1) >= -0.500000000,	-0.500000000 = toInt64(-1), -0.500000000 != toInt64(-1), -0.500000000 < toInt64(-1), -0.500000000 <= toInt64(-1), -0.500000000 > toInt64(-1), -0.500000000 >= toInt64(-1) ;
+SELECT '-1', '0.500000000', -1 = 0.500000000, -1 != 0.500000000, -1 < 0.500000000, -1 <= 0.500000000, -1 > 0.500000000, -1 >= 0.500000000,	0.500000000 = -1, 0.500000000 != -1, 0.500000000 < -1, 0.500000000 <= -1, 0.500000000 > -1, 0.500000000 >= -1 , toInt8(-1) = 0.500000000, toInt8(-1) != 0.500000000, toInt8(-1) < 0.500000000, toInt8(-1) <= 0.500000000, toInt8(-1) > 0.500000000, toInt8(-1) >= 0.500000000,	0.500000000 = toInt8(-1), 0.500000000 != toInt8(-1), 0.500000000 < toInt8(-1), 0.500000000 <= toInt8(-1), 0.500000000 > toInt8(-1), 0.500000000 >= toInt8(-1) , toInt16(-1) = 0.500000000, toInt16(-1) != 0.500000000, toInt16(-1) < 0.500000000, toInt16(-1) <= 0.500000000, toInt16(-1) > 0.500000000, toInt16(-1) >= 0.500000000,	0.500000000 = toInt16(-1), 0.500000000 != toInt16(-1), 0.500000000 < toInt16(-1), 0.500000000 <= toInt16(-1), 0.500000000 > toInt16(-1), 0.500000000 >= toInt16(-1) , toInt32(-1) = 0.500000000, toInt32(-1) != 0.500000000, toInt32(-1) < 0.500000000, toInt32(-1) <= 0.500000000, toInt32(-1) > 0.500000000, toInt32(-1) >= 0.500000000,	0.500000000 = toInt32(-1), 0.500000000 != toInt32(-1), 0.500000000 < toInt32(-1), 0.500000000 <= toInt32(-1), 0.500000000 > toInt32(-1), 0.500000000 >= toInt32(-1) , toInt64(-1) = 0.500000000, toInt64(-1) != 0.500000000, toInt64(-1) < 0.500000000, toInt64(-1) <= 0.500000000, toInt64(-1) > 0.500000000, toInt64(-1) >= 0.500000000,	0.500000000 = toInt64(-1), 0.500000000 != toInt64(-1), 0.500000000 < toInt64(-1), 0.500000000 <= toInt64(-1), 0.500000000 > toInt64(-1), 0.500000000 >= toInt64(-1) ;
+SELECT '-1', '-1.500000000', -1 = -1.500000000, -1 != -1.500000000, -1 < -1.500000000, -1 <= -1.500000000, -1 > -1.500000000, -1 >= -1.500000000,	-1.500000000 = -1, -1.500000000 != -1, -1.500000000 < -1, -1.500000000 <= -1, -1.500000000 > -1, -1.500000000 >= -1 , toInt8(-1) = -1.500000000, toInt8(-1) != -1.500000000, toInt8(-1) < -1.500000000, toInt8(-1) <= -1.500000000, toInt8(-1) > -1.500000000, toInt8(-1) >= -1.500000000,	-1.500000000 = toInt8(-1), -1.500000000 != toInt8(-1), -1.500000000 < toInt8(-1), -1.500000000 <= toInt8(-1), -1.500000000 > toInt8(-1), -1.500000000 >= toInt8(-1) , toInt16(-1) = -1.500000000, toInt16(-1) != -1.500000000, toInt16(-1) < -1.500000000, toInt16(-1) <= -1.500000000, toInt16(-1) > -1.500000000, toInt16(-1) >= -1.500000000,	-1.500000000 = toInt16(-1), -1.500000000 != toInt16(-1), -1.500000000 < toInt16(-1), -1.500000000 <= toInt16(-1), -1.500000000 > toInt16(-1), -1.500000000 >= toInt16(-1) , toInt32(-1) = -1.500000000, toInt32(-1) != -1.500000000, toInt32(-1) < -1.500000000, toInt32(-1) <= -1.500000000, toInt32(-1) > -1.500000000, toInt32(-1) >= -1.500000000,	-1.500000000 = toInt32(-1), -1.500000000 != toInt32(-1), -1.500000000 < toInt32(-1), -1.500000000 <= toInt32(-1), -1.500000000 > toInt32(-1), -1.500000000 >= toInt32(-1) , toInt64(-1) = -1.500000000, toInt64(-1) != -1.500000000, toInt64(-1) < -1.500000000, toInt64(-1) <= -1.500000000, toInt64(-1) > -1.500000000, toInt64(-1) >= -1.500000000,	-1.500000000 = toInt64(-1), -1.500000000 != toInt64(-1), -1.500000000 < toInt64(-1), -1.500000000 <= toInt64(-1), -1.500000000 > toInt64(-1), -1.500000000 >= toInt64(-1) ;
+SELECT '-1', '1.500000000', -1 = 1.500000000, -1 != 1.500000000, -1 < 1.500000000, -1 <= 1.500000000, -1 > 1.500000000, -1 >= 1.500000000,	1.500000000 = -1, 1.500000000 != -1, 1.500000000 < -1, 1.500000000 <= -1, 1.500000000 > -1, 1.500000000 >= -1 , toInt8(-1) = 1.500000000, toInt8(-1) != 1.500000000, toInt8(-1) < 1.500000000, toInt8(-1) <= 1.500000000, toInt8(-1) > 1.500000000, toInt8(-1) >= 1.500000000,	1.500000000 = toInt8(-1), 1.500000000 != toInt8(-1), 1.500000000 < toInt8(-1), 1.500000000 <= toInt8(-1), 1.500000000 > toInt8(-1), 1.500000000 >= toInt8(-1) , toInt16(-1) = 1.500000000, toInt16(-1) != 1.500000000, toInt16(-1) < 1.500000000, toInt16(-1) <= 1.500000000, toInt16(-1) > 1.500000000, toInt16(-1) >= 1.500000000,	1.500000000 = toInt16(-1), 1.500000000 != toInt16(-1), 1.500000000 < toInt16(-1), 1.500000000 <= toInt16(-1), 1.500000000 > toInt16(-1), 1.500000000 >= toInt16(-1) , toInt32(-1) = 1.500000000, toInt32(-1) != 1.500000000, toInt32(-1) < 1.500000000, toInt32(-1) <= 1.500000000, toInt32(-1) > 1.500000000, toInt32(-1) >= 1.500000000,	1.500000000 = toInt32(-1), 1.500000000 != toInt32(-1), 1.500000000 < toInt32(-1), 1.500000000 <= toInt32(-1), 1.500000000 > toInt32(-1), 1.500000000 >= toInt32(-1) , toInt64(-1) = 1.500000000, toInt64(-1) != 1.500000000, toInt64(-1) < 1.500000000, toInt64(-1) <= 1.500000000, toInt64(-1) > 1.500000000, toInt64(-1) >= 1.500000000,	1.500000000 = toInt64(-1), 1.500000000 != toInt64(-1), 1.500000000 < toInt64(-1), 1.500000000 <= toInt64(-1), 1.500000000 > toInt64(-1), 1.500000000 >= toInt64(-1) ;
+SELECT '-1', '9007199254740992.000000000', -1 = 9007199254740992.000000000, -1 != 9007199254740992.000000000, -1 < 9007199254740992.000000000, -1 <= 9007199254740992.000000000, -1 > 9007199254740992.000000000, -1 >= 9007199254740992.000000000,	9007199254740992.000000000 = -1, 9007199254740992.000000000 != -1, 9007199254740992.000000000 < -1, 9007199254740992.000000000 <= -1, 9007199254740992.000000000 > -1, 9007199254740992.000000000 >= -1 , toInt8(-1) = 9007199254740992.000000000, toInt8(-1) != 9007199254740992.000000000, toInt8(-1) < 9007199254740992.000000000, toInt8(-1) <= 9007199254740992.000000000, toInt8(-1) > 9007199254740992.000000000, toInt8(-1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt8(-1), 9007199254740992.000000000 != toInt8(-1), 9007199254740992.000000000 < toInt8(-1), 9007199254740992.000000000 <= toInt8(-1), 9007199254740992.000000000 > toInt8(-1), 9007199254740992.000000000 >= toInt8(-1) , toInt16(-1) = 9007199254740992.000000000, toInt16(-1) != 9007199254740992.000000000, toInt16(-1) < 9007199254740992.000000000, toInt16(-1) <= 9007199254740992.000000000, toInt16(-1) > 9007199254740992.000000000, toInt16(-1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt16(-1), 9007199254740992.000000000 != toInt16(-1), 9007199254740992.000000000 < toInt16(-1), 9007199254740992.000000000 <= toInt16(-1), 9007199254740992.000000000 > toInt16(-1), 9007199254740992.000000000 >= toInt16(-1) , toInt32(-1) = 9007199254740992.000000000, toInt32(-1) != 9007199254740992.000000000, toInt32(-1) < 9007199254740992.000000000, toInt32(-1) <= 9007199254740992.000000000, toInt32(-1) > 9007199254740992.000000000, toInt32(-1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt32(-1), 9007199254740992.000000000 != toInt32(-1), 9007199254740992.000000000 < toInt32(-1), 9007199254740992.000000000 <= toInt32(-1), 9007199254740992.000000000 > toInt32(-1), 9007199254740992.000000000 >= toInt32(-1) , toInt64(-1) = 9007199254740992.000000000, toInt64(-1) != 9007199254740992.000000000, toInt64(-1) < 9007199254740992.000000000, toInt64(-1) <= 9007199254740992.000000000, toInt64(-1) > 9007199254740992.000000000, toInt64(-1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt64(-1), 9007199254740992.000000000 != toInt64(-1), 9007199254740992.000000000 < toInt64(-1), 9007199254740992.000000000 <= toInt64(-1), 9007199254740992.000000000 > toInt64(-1), 9007199254740992.000000000 >= toInt64(-1) ;
+SELECT '-1', '2251799813685247.500000000', -1 = 2251799813685247.500000000, -1 != 2251799813685247.500000000, -1 < 2251799813685247.500000000, -1 <= 2251799813685247.500000000, -1 > 2251799813685247.500000000, -1 >= 2251799813685247.500000000,	2251799813685247.500000000 = -1, 2251799813685247.500000000 != -1, 2251799813685247.500000000 < -1, 2251799813685247.500000000 <= -1, 2251799813685247.500000000 > -1, 2251799813685247.500000000 >= -1 , toInt8(-1) = 2251799813685247.500000000, toInt8(-1) != 2251799813685247.500000000, toInt8(-1) < 2251799813685247.500000000, toInt8(-1) <= 2251799813685247.500000000, toInt8(-1) > 2251799813685247.500000000, toInt8(-1) >= 2251799813685247.500000000,	2251799813685247.500000000 = toInt8(-1), 2251799813685247.500000000 != toInt8(-1), 2251799813685247.500000000 < toInt8(-1), 2251799813685247.500000000 <= toInt8(-1), 2251799813685247.500000000 > toInt8(-1), 2251799813685247.500000000 >= toInt8(-1) , toInt16(-1) = 2251799813685247.500000000, toInt16(-1) != 2251799813685247.500000000, toInt16(-1) < 2251799813685247.500000000, toInt16(-1) <= 2251799813685247.500000000, toInt16(-1) > 2251799813685247.500000000, toInt16(-1) >= 2251799813685247.500000000,	2251799813685247.500000000 = toInt16(-1), 2251799813685247.500000000 != toInt16(-1), 2251799813685247.500000000 < toInt16(-1), 2251799813685247.500000000 <= toInt16(-1), 2251799813685247.500000000 > toInt16(-1), 2251799813685247.500000000 >= toInt16(-1) , toInt32(-1) = 2251799813685247.500000000, toInt32(-1) != 2251799813685247.500000000, toInt32(-1) < 2251799813685247.500000000, toInt32(-1) <= 2251799813685247.500000000, toInt32(-1) > 2251799813685247.500000000, toInt32(-1) >= 2251799813685247.500000000,	2251799813685247.500000000 = toInt32(-1), 2251799813685247.500000000 != toInt32(-1), 2251799813685247.500000000 < toInt32(-1), 2251799813685247.500000000 <= toInt32(-1), 2251799813685247.500000000 > toInt32(-1), 2251799813685247.500000000 >= toInt32(-1) , toInt64(-1) = 2251799813685247.500000000, toInt64(-1) != 2251799813685247.500000000, toInt64(-1) < 2251799813685247.500000000, toInt64(-1) <= 2251799813685247.500000000, toInt64(-1) > 2251799813685247.500000000, toInt64(-1) >= 2251799813685247.500000000,	2251799813685247.500000000 = toInt64(-1), 2251799813685247.500000000 != toInt64(-1), 2251799813685247.500000000 < toInt64(-1), 2251799813685247.500000000 <= toInt64(-1), 2251799813685247.500000000 > toInt64(-1), 2251799813685247.500000000 >= toInt64(-1) ;
+SELECT '-1', '2251799813685248.500000000', -1 = 2251799813685248.500000000, -1 != 2251799813685248.500000000, -1 < 2251799813685248.500000000, -1 <= 2251799813685248.500000000, -1 > 2251799813685248.500000000, -1 >= 2251799813685248.500000000,	2251799813685248.500000000 = -1, 2251799813685248.500000000 != -1, 2251799813685248.500000000 < -1, 2251799813685248.500000000 <= -1, 2251799813685248.500000000 > -1, 2251799813685248.500000000 >= -1 , toInt8(-1) = 2251799813685248.500000000, toInt8(-1) != 2251799813685248.500000000, toInt8(-1) < 2251799813685248.500000000, toInt8(-1) <= 2251799813685248.500000000, toInt8(-1) > 2251799813685248.500000000, toInt8(-1) >= 2251799813685248.500000000,	2251799813685248.500000000 = toInt8(-1), 2251799813685248.500000000 != toInt8(-1), 2251799813685248.500000000 < toInt8(-1), 2251799813685248.500000000 <= toInt8(-1), 2251799813685248.500000000 > toInt8(-1), 2251799813685248.500000000 >= toInt8(-1) , toInt16(-1) = 2251799813685248.500000000, toInt16(-1) != 2251799813685248.500000000, toInt16(-1) < 2251799813685248.500000000, toInt16(-1) <= 2251799813685248.500000000, toInt16(-1) > 2251799813685248.500000000, toInt16(-1) >= 2251799813685248.500000000,	2251799813685248.500000000 = toInt16(-1), 2251799813685248.500000000 != toInt16(-1), 2251799813685248.500000000 < toInt16(-1), 2251799813685248.500000000 <= toInt16(-1), 2251799813685248.500000000 > toInt16(-1), 2251799813685248.500000000 >= toInt16(-1) , toInt32(-1) = 2251799813685248.500000000, toInt32(-1) != 2251799813685248.500000000, toInt32(-1) < 2251799813685248.500000000, toInt32(-1) <= 2251799813685248.500000000, toInt32(-1) > 2251799813685248.500000000, toInt32(-1) >= 2251799813685248.500000000,	2251799813685248.500000000 = toInt32(-1), 2251799813685248.500000000 != toInt32(-1), 2251799813685248.500000000 < toInt32(-1), 2251799813685248.500000000 <= toInt32(-1), 2251799813685248.500000000 > toInt32(-1), 2251799813685248.500000000 >= toInt32(-1) , toInt64(-1) = 2251799813685248.500000000, toInt64(-1) != 2251799813685248.500000000, toInt64(-1) < 2251799813685248.500000000, toInt64(-1) <= 2251799813685248.500000000, toInt64(-1) > 2251799813685248.500000000, toInt64(-1) >= 2251799813685248.500000000,	2251799813685248.500000000 = toInt64(-1), 2251799813685248.500000000 != toInt64(-1), 2251799813685248.500000000 < toInt64(-1), 2251799813685248.500000000 <= toInt64(-1), 2251799813685248.500000000 > toInt64(-1), 2251799813685248.500000000 >= toInt64(-1) ;
+SELECT '-1', '1152921504606846976.000000000', -1 = 1152921504606846976.000000000, -1 != 1152921504606846976.000000000, -1 < 1152921504606846976.000000000, -1 <= 1152921504606846976.000000000, -1 > 1152921504606846976.000000000, -1 >= 1152921504606846976.000000000,	1152921504606846976.000000000 = -1, 1152921504606846976.000000000 != -1, 1152921504606846976.000000000 < -1, 1152921504606846976.000000000 <= -1, 1152921504606846976.000000000 > -1, 1152921504606846976.000000000 >= -1 , toInt8(-1) = 1152921504606846976.000000000, toInt8(-1) != 1152921504606846976.000000000, toInt8(-1) < 1152921504606846976.000000000, toInt8(-1) <= 1152921504606846976.000000000, toInt8(-1) > 1152921504606846976.000000000, toInt8(-1) >= 1152921504606846976.000000000,	1152921504606846976.000000000 = toInt8(-1), 1152921504606846976.000000000 != toInt8(-1), 1152921504606846976.000000000 < toInt8(-1), 1152921504606846976.000000000 <= toInt8(-1), 1152921504606846976.000000000 > toInt8(-1), 1152921504606846976.000000000 >= toInt8(-1) , toInt16(-1) = 1152921504606846976.000000000, toInt16(-1) != 1152921504606846976.000000000, toInt16(-1) < 1152921504606846976.000000000, toInt16(-1) <= 1152921504606846976.000000000, toInt16(-1) > 1152921504606846976.000000000, toInt16(-1) >= 1152921504606846976.000000000,	1152921504606846976.000000000 = toInt16(-1), 1152921504606846976.000000000 != toInt16(-1), 1152921504606846976.000000000 < toInt16(-1), 1152921504606846976.000000000 <= toInt16(-1), 1152921504606846976.000000000 > toInt16(-1), 1152921504606846976.000000000 >= toInt16(-1) , toInt32(-1) = 1152921504606846976.000000000, toInt32(-1) != 1152921504606846976.000000000, toInt32(-1) < 1152921504606846976.000000000, toInt32(-1) <= 1152921504606846976.000000000, toInt32(-1) > 1152921504606846976.000000000, toInt32(-1) >= 1152921504606846976.000000000,	1152921504606846976.000000000 = toInt32(-1), 1152921504606846976.000000000 != toInt32(-1), 1152921504606846976.000000000 < toInt32(-1), 1152921504606846976.000000000 <= toInt32(-1), 1152921504606846976.000000000 > toInt32(-1), 1152921504606846976.000000000 >= toInt32(-1) , toInt64(-1) = 1152921504606846976.000000000, toInt64(-1) != 1152921504606846976.000000000, toInt64(-1) < 1152921504606846976.000000000, toInt64(-1) <= 1152921504606846976.000000000, toInt64(-1) > 1152921504606846976.000000000, toInt64(-1) >= 1152921504606846976.000000000,	1152921504606846976.000000000 = toInt64(-1), 1152921504606846976.000000000 != toInt64(-1), 1152921504606846976.000000000 < toInt64(-1), 1152921504606846976.000000000 <= toInt64(-1), 1152921504606846976.000000000 > toInt64(-1), 1152921504606846976.000000000 >= toInt64(-1) ;
+SELECT '-1', '-1152921504606846976.000000000', -1 = -1152921504606846976.000000000, -1 != -1152921504606846976.000000000, -1 < -1152921504606846976.000000000, -1 <= -1152921504606846976.000000000, -1 > -1152921504606846976.000000000, -1 >= -1152921504606846976.000000000,	-1152921504606846976.000000000 = -1, -1152921504606846976.000000000 != -1, -1152921504606846976.000000000 < -1, -1152921504606846976.000000000 <= -1, -1152921504606846976.000000000 > -1, -1152921504606846976.000000000 >= -1 , toInt8(-1) = -1152921504606846976.000000000, toInt8(-1) != -1152921504606846976.000000000, toInt8(-1) < -1152921504606846976.000000000, toInt8(-1) <= -1152921504606846976.000000000, toInt8(-1) > -1152921504606846976.000000000, toInt8(-1) >= -1152921504606846976.000000000,	-1152921504606846976.000000000 = toInt8(-1), -1152921504606846976.000000000 != toInt8(-1), -1152921504606846976.000000000 < toInt8(-1), -1152921504606846976.000000000 <= toInt8(-1), -1152921504606846976.000000000 > toInt8(-1), -1152921504606846976.000000000 >= toInt8(-1) , toInt16(-1) = -1152921504606846976.000000000, toInt16(-1) != -1152921504606846976.000000000, toInt16(-1) < -1152921504606846976.000000000, toInt16(-1) <= -1152921504606846976.000000000, toInt16(-1) > -1152921504606846976.000000000, toInt16(-1) >= -1152921504606846976.000000000,	-1152921504606846976.000000000 = toInt16(-1), -1152921504606846976.000000000 != toInt16(-1), -1152921504606846976.000000000 < toInt16(-1), -1152921504606846976.000000000 <= toInt16(-1), -1152921504606846976.000000000 > toInt16(-1), -1152921504606846976.000000000 >= toInt16(-1) , toInt32(-1) = -1152921504606846976.000000000, toInt32(-1) != -1152921504606846976.000000000, toInt32(-1) < -1152921504606846976.000000000, toInt32(-1) <= -1152921504606846976.000000000, toInt32(-1) > -1152921504606846976.000000000, toInt32(-1) >= -1152921504606846976.000000000,	-1152921504606846976.000000000 = toInt32(-1), -1152921504606846976.000000000 != toInt32(-1), -1152921504606846976.000000000 < toInt32(-1), -1152921504606846976.000000000 <= toInt32(-1), -1152921504606846976.000000000 > toInt32(-1), -1152921504606846976.000000000 >= toInt32(-1) , toInt64(-1) = -1152921504606846976.000000000, toInt64(-1) != -1152921504606846976.000000000, toInt64(-1) < -1152921504606846976.000000000, toInt64(-1) <= -1152921504606846976.000000000, toInt64(-1) > -1152921504606846976.000000000, toInt64(-1) >= -1152921504606846976.000000000,	-1152921504606846976.000000000 = toInt64(-1), -1152921504606846976.000000000 != toInt64(-1), -1152921504606846976.000000000 < toInt64(-1), -1152921504606846976.000000000 <= toInt64(-1), -1152921504606846976.000000000 > toInt64(-1), -1152921504606846976.000000000 >= toInt64(-1) ;
+SELECT '-1', '-9223372036854786048.000000000', -1 = -9223372036854786048.000000000, -1 != -9223372036854786048.000000000, -1 < -9223372036854786048.000000000, -1 <= -9223372036854786048.000000000, -1 > -9223372036854786048.000000000, -1 >= -9223372036854786048.000000000,	-9223372036854786048.000000000 = -1, -9223372036854786048.000000000 != -1, -9223372036854786048.000000000 < -1, -9223372036854786048.000000000 <= -1, -9223372036854786048.000000000 > -1, -9223372036854786048.000000000 >= -1 , toInt8(-1) = -9223372036854786048.000000000, toInt8(-1) != -9223372036854786048.000000000, toInt8(-1) < -9223372036854786048.000000000, toInt8(-1) <= -9223372036854786048.000000000, toInt8(-1) > -9223372036854786048.000000000, toInt8(-1) >= -9223372036854786048.000000000,	-9223372036854786048.000000000 = toInt8(-1), -9223372036854786048.000000000 != toInt8(-1), -9223372036854786048.000000000 < toInt8(-1), -9223372036854786048.000000000 <= toInt8(-1), -9223372036854786048.000000000 > toInt8(-1), -9223372036854786048.000000000 >= toInt8(-1) , toInt16(-1) = -9223372036854786048.000000000, toInt16(-1) != -9223372036854786048.000000000, toInt16(-1) < -9223372036854786048.000000000, toInt16(-1) <= -9223372036854786048.000000000, toInt16(-1) > -9223372036854786048.000000000, toInt16(-1) >= -9223372036854786048.000000000,	-9223372036854786048.000000000 = toInt16(-1), -9223372036854786048.000000000 != toInt16(-1), -9223372036854786048.000000000 < toInt16(-1), -9223372036854786048.000000000 <= toInt16(-1), -9223372036854786048.000000000 > toInt16(-1), -9223372036854786048.000000000 >= toInt16(-1) , toInt32(-1) = -9223372036854786048.000000000, toInt32(-1) != -9223372036854786048.000000000, toInt32(-1) < -9223372036854786048.000000000, toInt32(-1) <= -9223372036854786048.000000000, toInt32(-1) > -9223372036854786048.000000000, toInt32(-1) >= -9223372036854786048.000000000,	-9223372036854786048.000000000 = toInt32(-1), -9223372036854786048.000000000 != toInt32(-1), -9223372036854786048.000000000 < toInt32(-1), -9223372036854786048.000000000 <= toInt32(-1), -9223372036854786048.000000000 > toInt32(-1), -9223372036854786048.000000000 >= toInt32(-1) , toInt64(-1) = -9223372036854786048.000000000, toInt64(-1) != -9223372036854786048.000000000, toInt64(-1) < -9223372036854786048.000000000, toInt64(-1) <= -9223372036854786048.000000000, toInt64(-1) > -9223372036854786048.000000000, toInt64(-1) >= -9223372036854786048.000000000,	-9223372036854786048.000000000 = toInt64(-1), -9223372036854786048.000000000 != toInt64(-1), -9223372036854786048.000000000 < toInt64(-1), -9223372036854786048.000000000 <= toInt64(-1), -9223372036854786048.000000000 > toInt64(-1), -9223372036854786048.000000000 >= toInt64(-1) ;
+SELECT '-1', '9223372036854786048.000000000', -1 = 9223372036854786048.000000000, -1 != 9223372036854786048.000000000, -1 < 9223372036854786048.000000000, -1 <= 9223372036854786048.000000000, -1 > 9223372036854786048.000000000, -1 >= 9223372036854786048.000000000,	9223372036854786048.000000000 = -1, 9223372036854786048.000000000 != -1, 9223372036854786048.000000000 < -1, 9223372036854786048.000000000 <= -1, 9223372036854786048.000000000 > -1, 9223372036854786048.000000000 >= -1 , toInt8(-1) = 9223372036854786048.000000000, toInt8(-1) != 9223372036854786048.000000000, toInt8(-1) < 9223372036854786048.000000000, toInt8(-1) <= 9223372036854786048.000000000, toInt8(-1) > 9223372036854786048.000000000, toInt8(-1) >= 9223372036854786048.000000000,	9223372036854786048.000000000 = toInt8(-1), 9223372036854786048.000000000 != toInt8(-1), 9223372036854786048.000000000 < toInt8(-1), 9223372036854786048.000000000 <= toInt8(-1), 9223372036854786048.000000000 > toInt8(-1), 9223372036854786048.000000000 >= toInt8(-1) , toInt16(-1) = 9223372036854786048.000000000, toInt16(-1) != 9223372036854786048.000000000, toInt16(-1) < 9223372036854786048.000000000, toInt16(-1) <= 9223372036854786048.000000000, toInt16(-1) > 9223372036854786048.000000000, toInt16(-1) >= 9223372036854786048.000000000,	9223372036854786048.000000000 = toInt16(-1), 9223372036854786048.000000000 != toInt16(-1), 9223372036854786048.000000000 < toInt16(-1), 9223372036854786048.000000000 <= toInt16(-1), 9223372036854786048.000000000 > toInt16(-1), 9223372036854786048.000000000 >= toInt16(-1) , toInt32(-1) = 9223372036854786048.000000000, toInt32(-1) != 9223372036854786048.000000000, toInt32(-1) < 9223372036854786048.000000000, toInt32(-1) <= 9223372036854786048.000000000, toInt32(-1) > 9223372036854786048.000000000, toInt32(-1) >= 9223372036854786048.000000000,	9223372036854786048.000000000 = toInt32(-1), 9223372036854786048.000000000 != toInt32(-1), 9223372036854786048.000000000 < toInt32(-1), 9223372036854786048.000000000 <= toInt32(-1), 9223372036854786048.000000000 > toInt32(-1), 9223372036854786048.000000000 >= toInt32(-1) , toInt64(-1) = 9223372036854786048.000000000, toInt64(-1) != 9223372036854786048.000000000, toInt64(-1) < 9223372036854786048.000000000, toInt64(-1) <= 9223372036854786048.000000000, toInt64(-1) > 9223372036854786048.000000000, toInt64(-1) >= 9223372036854786048.000000000,	9223372036854786048.000000000 = toInt64(-1), 9223372036854786048.000000000 != toInt64(-1), 9223372036854786048.000000000 < toInt64(-1), 9223372036854786048.000000000 <= toInt64(-1), 9223372036854786048.000000000 > toInt64(-1), 9223372036854786048.000000000 >= toInt64(-1) ;
+SELECT '1', '0.000000000', 1 = 0.000000000, 1 != 0.000000000, 1 < 0.000000000, 1 <= 0.000000000, 1 > 0.000000000, 1 >= 0.000000000,	0.000000000 = 1, 0.000000000 != 1, 0.000000000 < 1, 0.000000000 <= 1, 0.000000000 > 1, 0.000000000 >= 1 , toUInt8(1) = 0.000000000, toUInt8(1) != 0.000000000, toUInt8(1) < 0.000000000, toUInt8(1) <= 0.000000000, toUInt8(1) > 0.000000000, toUInt8(1) >= 0.000000000,	0.000000000 = toUInt8(1), 0.000000000 != toUInt8(1), 0.000000000 < toUInt8(1), 0.000000000 <= toUInt8(1), 0.000000000 > toUInt8(1), 0.000000000 >= toUInt8(1) , toInt8(1) = 0.000000000, toInt8(1) != 0.000000000, toInt8(1) < 0.000000000, toInt8(1) <= 0.000000000, toInt8(1) > 0.000000000, toInt8(1) >= 0.000000000,	0.000000000 = toInt8(1), 0.000000000 != toInt8(1), 0.000000000 < toInt8(1), 0.000000000 <= toInt8(1), 0.000000000 > toInt8(1), 0.000000000 >= toInt8(1) , toUInt16(1) = 0.000000000, toUInt16(1) != 0.000000000, toUInt16(1) < 0.000000000, toUInt16(1) <= 0.000000000, toUInt16(1) > 0.000000000, toUInt16(1) >= 0.000000000,	0.000000000 = toUInt16(1), 0.000000000 != toUInt16(1), 0.000000000 < toUInt16(1), 0.000000000 <= toUInt16(1), 0.000000000 > toUInt16(1), 0.000000000 >= toUInt16(1) , toInt16(1) = 0.000000000, toInt16(1) != 0.000000000, toInt16(1) < 0.000000000, toInt16(1) <= 0.000000000, toInt16(1) > 0.000000000, toInt16(1) >= 0.000000000,	0.000000000 = toInt16(1), 0.000000000 != toInt16(1), 0.000000000 < toInt16(1), 0.000000000 <= toInt16(1), 0.000000000 > toInt16(1), 0.000000000 >= toInt16(1) , toUInt32(1) = 0.000000000, toUInt32(1) != 0.000000000, toUInt32(1) < 0.000000000, toUInt32(1) <= 0.000000000, toUInt32(1) > 0.000000000, toUInt32(1) >= 0.000000000,	0.000000000 = toUInt32(1), 0.000000000 != toUInt32(1), 0.000000000 < toUInt32(1), 0.000000000 <= toUInt32(1), 0.000000000 > toUInt32(1), 0.000000000 >= toUInt32(1) , toInt32(1) = 0.000000000, toInt32(1) != 0.000000000, toInt32(1) < 0.000000000, toInt32(1) <= 0.000000000, toInt32(1) > 0.000000000, toInt32(1) >= 0.000000000,	0.000000000 = toInt32(1), 0.000000000 != toInt32(1), 0.000000000 < toInt32(1), 0.000000000 <= toInt32(1), 0.000000000 > toInt32(1), 0.000000000 >= toInt32(1) , toUInt64(1) = 0.000000000, toUInt64(1) != 0.000000000, toUInt64(1) < 0.000000000, toUInt64(1) <= 0.000000000, toUInt64(1) > 0.000000000, toUInt64(1) >= 0.000000000,	0.000000000 = toUInt64(1), 0.000000000 != toUInt64(1), 0.000000000 < toUInt64(1), 0.000000000 <= toUInt64(1), 0.000000000 > toUInt64(1), 0.000000000 >= toUInt64(1) , toInt64(1) = 0.000000000, toInt64(1) != 0.000000000, toInt64(1) < 0.000000000, toInt64(1) <= 0.000000000, toInt64(1) > 0.000000000, toInt64(1) >= 0.000000000,	0.000000000 = toInt64(1), 0.000000000 != toInt64(1), 0.000000000 < toInt64(1), 0.000000000 <= toInt64(1), 0.000000000 > toInt64(1), 0.000000000 >= toInt64(1) ;
+SELECT '1', '-1.000000000', 1 = -1.000000000, 1 != -1.000000000, 1 < -1.000000000, 1 <= -1.000000000, 1 > -1.000000000, 1 >= -1.000000000,	-1.000000000 = 1, -1.000000000 != 1, -1.000000000 < 1, -1.000000000 <= 1, -1.000000000 > 1, -1.000000000 >= 1 , toUInt8(1) = -1.000000000, toUInt8(1) != -1.000000000, toUInt8(1) < -1.000000000, toUInt8(1) <= -1.000000000, toUInt8(1) > -1.000000000, toUInt8(1) >= -1.000000000,	-1.000000000 = toUInt8(1), -1.000000000 != toUInt8(1), -1.000000000 < toUInt8(1), -1.000000000 <= toUInt8(1), -1.000000000 > toUInt8(1), -1.000000000 >= toUInt8(1) , toInt8(1) = -1.000000000, toInt8(1) != -1.000000000, toInt8(1) < -1.000000000, toInt8(1) <= -1.000000000, toInt8(1) > -1.000000000, toInt8(1) >= -1.000000000,	-1.000000000 = toInt8(1), -1.000000000 != toInt8(1), -1.000000000 < toInt8(1), -1.000000000 <= toInt8(1), -1.000000000 > toInt8(1), -1.000000000 >= toInt8(1) , toUInt16(1) = -1.000000000, toUInt16(1) != -1.000000000, toUInt16(1) < -1.000000000, toUInt16(1) <= -1.000000000, toUInt16(1) > -1.000000000, toUInt16(1) >= -1.000000000,	-1.000000000 = toUInt16(1), -1.000000000 != toUInt16(1), -1.000000000 < toUInt16(1), -1.000000000 <= toUInt16(1), -1.000000000 > toUInt16(1), -1.000000000 >= toUInt16(1) , toInt16(1) = -1.000000000, toInt16(1) != -1.000000000, toInt16(1) < -1.000000000, toInt16(1) <= -1.000000000, toInt16(1) > -1.000000000, toInt16(1) >= -1.000000000,	-1.000000000 = toInt16(1), -1.000000000 != toInt16(1), -1.000000000 < toInt16(1), -1.000000000 <= toInt16(1), -1.000000000 > toInt16(1), -1.000000000 >= toInt16(1) , toUInt32(1) = -1.000000000, toUInt32(1) != -1.000000000, toUInt32(1) < -1.000000000, toUInt32(1) <= -1.000000000, toUInt32(1) > -1.000000000, toUInt32(1) >= -1.000000000,	-1.000000000 = toUInt32(1), -1.000000000 != toUInt32(1), -1.000000000 < toUInt32(1), -1.000000000 <= toUInt32(1), -1.000000000 > toUInt32(1), -1.000000000 >= toUInt32(1) , toInt32(1) = -1.000000000, toInt32(1) != -1.000000000, toInt32(1) < -1.000000000, toInt32(1) <= -1.000000000, toInt32(1) > -1.000000000, toInt32(1) >= -1.000000000,	-1.000000000 = toInt32(1), -1.000000000 != toInt32(1), -1.000000000 < toInt32(1), -1.000000000 <= toInt32(1), -1.000000000 > toInt32(1), -1.000000000 >= toInt32(1) , toUInt64(1) = -1.000000000, toUInt64(1) != -1.000000000, toUInt64(1) < -1.000000000, toUInt64(1) <= -1.000000000, toUInt64(1) > -1.000000000, toUInt64(1) >= -1.000000000,	-1.000000000 = toUInt64(1), -1.000000000 != toUInt64(1), -1.000000000 < toUInt64(1), -1.000000000 <= toUInt64(1), -1.000000000 > toUInt64(1), -1.000000000 >= toUInt64(1) , toInt64(1) = -1.000000000, toInt64(1) != -1.000000000, toInt64(1) < -1.000000000, toInt64(1) <= -1.000000000, toInt64(1) > -1.000000000, toInt64(1) >= -1.000000000,	-1.000000000 = toInt64(1), -1.000000000 != toInt64(1), -1.000000000 < toInt64(1), -1.000000000 <= toInt64(1), -1.000000000 > toInt64(1), -1.000000000 >= toInt64(1) ;
+SELECT '1', '1.000000000', 1 = 1.000000000, 1 != 1.000000000, 1 < 1.000000000, 1 <= 1.000000000, 1 > 1.000000000, 1 >= 1.000000000,	1.000000000 = 1, 1.000000000 != 1, 1.000000000 < 1, 1.000000000 <= 1, 1.000000000 > 1, 1.000000000 >= 1 , toUInt8(1) = 1.000000000, toUInt8(1) != 1.000000000, toUInt8(1) < 1.000000000, toUInt8(1) <= 1.000000000, toUInt8(1) > 1.000000000, toUInt8(1) >= 1.000000000,	1.000000000 = toUInt8(1), 1.000000000 != toUInt8(1), 1.000000000 < toUInt8(1), 1.000000000 <= toUInt8(1), 1.000000000 > toUInt8(1), 1.000000000 >= toUInt8(1) , toInt8(1) = 1.000000000, toInt8(1) != 1.000000000, toInt8(1) < 1.000000000, toInt8(1) <= 1.000000000, toInt8(1) > 1.000000000, toInt8(1) >= 1.000000000,	1.000000000 = toInt8(1), 1.000000000 != toInt8(1), 1.000000000 < toInt8(1), 1.000000000 <= toInt8(1), 1.000000000 > toInt8(1), 1.000000000 >= toInt8(1) , toUInt16(1) = 1.000000000, toUInt16(1) != 1.000000000, toUInt16(1) < 1.000000000, toUInt16(1) <= 1.000000000, toUInt16(1) > 1.000000000, toUInt16(1) >= 1.000000000,	1.000000000 = toUInt16(1), 1.000000000 != toUInt16(1), 1.000000000 < toUInt16(1), 1.000000000 <= toUInt16(1), 1.000000000 > toUInt16(1), 1.000000000 >= toUInt16(1) , toInt16(1) = 1.000000000, toInt16(1) != 1.000000000, toInt16(1) < 1.000000000, toInt16(1) <= 1.000000000, toInt16(1) > 1.000000000, toInt16(1) >= 1.000000000,	1.000000000 = toInt16(1), 1.000000000 != toInt16(1), 1.000000000 < toInt16(1), 1.000000000 <= toInt16(1), 1.000000000 > toInt16(1), 1.000000000 >= toInt16(1) , toUInt32(1) = 1.000000000, toUInt32(1) != 1.000000000, toUInt32(1) < 1.000000000, toUInt32(1) <= 1.000000000, toUInt32(1) > 1.000000000, toUInt32(1) >= 1.000000000,	1.000000000 = toUInt32(1), 1.000000000 != toUInt32(1), 1.000000000 < toUInt32(1), 1.000000000 <= toUInt32(1), 1.000000000 > toUInt32(1), 1.000000000 >= toUInt32(1) , toInt32(1) = 1.000000000, toInt32(1) != 1.000000000, toInt32(1) < 1.000000000, toInt32(1) <= 1.000000000, toInt32(1) > 1.000000000, toInt32(1) >= 1.000000000,	1.000000000 = toInt32(1), 1.000000000 != toInt32(1), 1.000000000 < toInt32(1), 1.000000000 <= toInt32(1), 1.000000000 > toInt32(1), 1.000000000 >= toInt32(1) , toUInt64(1) = 1.000000000, toUInt64(1) != 1.000000000, toUInt64(1) < 1.000000000, toUInt64(1) <= 1.000000000, toUInt64(1) > 1.000000000, toUInt64(1) >= 1.000000000,	1.000000000 = toUInt64(1), 1.000000000 != toUInt64(1), 1.000000000 < toUInt64(1), 1.000000000 <= toUInt64(1), 1.000000000 > toUInt64(1), 1.000000000 >= toUInt64(1) , toInt64(1) = 1.000000000, toInt64(1) != 1.000000000, toInt64(1) < 1.000000000, toInt64(1) <= 1.000000000, toInt64(1) > 1.000000000, toInt64(1) >= 1.000000000,	1.000000000 = toInt64(1), 1.000000000 != toInt64(1), 1.000000000 < toInt64(1), 1.000000000 <= toInt64(1), 1.000000000 > toInt64(1), 1.000000000 >= toInt64(1) ;
+SELECT '1', '18446744073709551616.000000000', 1 = 18446744073709551616.000000000, 1 != 18446744073709551616.000000000, 1 < 18446744073709551616.000000000, 1 <= 18446744073709551616.000000000, 1 > 18446744073709551616.000000000, 1 >= 18446744073709551616.000000000,	18446744073709551616.000000000 = 1, 18446744073709551616.000000000 != 1, 18446744073709551616.000000000 < 1, 18446744073709551616.000000000 <= 1, 18446744073709551616.000000000 > 1, 18446744073709551616.000000000 >= 1 , toUInt8(1) = 18446744073709551616.000000000, toUInt8(1) != 18446744073709551616.000000000, toUInt8(1) < 18446744073709551616.000000000, toUInt8(1) <= 18446744073709551616.000000000, toUInt8(1) > 18446744073709551616.000000000, toUInt8(1) >= 18446744073709551616.000000000,	18446744073709551616.000000000 = toUInt8(1), 18446744073709551616.000000000 != toUInt8(1), 18446744073709551616.000000000 < toUInt8(1), 18446744073709551616.000000000 <= toUInt8(1), 18446744073709551616.000000000 > toUInt8(1), 18446744073709551616.000000000 >= toUInt8(1) , toInt8(1) = 18446744073709551616.000000000, toInt8(1) != 18446744073709551616.000000000, toInt8(1) < 18446744073709551616.000000000, toInt8(1) <= 18446744073709551616.000000000, toInt8(1) > 18446744073709551616.000000000, toInt8(1) >= 18446744073709551616.000000000,	18446744073709551616.000000000 = toInt8(1), 18446744073709551616.000000000 != toInt8(1), 18446744073709551616.000000000 < toInt8(1), 18446744073709551616.000000000 <= toInt8(1), 18446744073709551616.000000000 > toInt8(1), 18446744073709551616.000000000 >= toInt8(1) , toUInt16(1) = 18446744073709551616.000000000, toUInt16(1) != 18446744073709551616.000000000, toUInt16(1) < 18446744073709551616.000000000, toUInt16(1) <= 18446744073709551616.000000000, toUInt16(1) > 18446744073709551616.000000000, toUInt16(1) >= 18446744073709551616.000000000,	18446744073709551616.000000000 = toUInt16(1), 18446744073709551616.000000000 != toUInt16(1), 18446744073709551616.000000000 < toUInt16(1), 18446744073709551616.000000000 <= toUInt16(1), 18446744073709551616.000000000 > toUInt16(1), 18446744073709551616.000000000 >= toUInt16(1) , toInt16(1) = 18446744073709551616.000000000, toInt16(1) != 18446744073709551616.000000000, toInt16(1) < 18446744073709551616.000000000, toInt16(1) <= 18446744073709551616.000000000, toInt16(1) > 18446744073709551616.000000000, toInt16(1) >= 18446744073709551616.000000000,	18446744073709551616.000000000 = toInt16(1), 18446744073709551616.000000000 != toInt16(1), 18446744073709551616.000000000 < toInt16(1), 18446744073709551616.000000000 <= toInt16(1), 18446744073709551616.000000000 > toInt16(1), 18446744073709551616.000000000 >= toInt16(1) , toUInt32(1) = 18446744073709551616.000000000, toUInt32(1) != 18446744073709551616.000000000, toUInt32(1) < 18446744073709551616.000000000, toUInt32(1) <= 18446744073709551616.000000000, toUInt32(1) > 18446744073709551616.000000000, toUInt32(1) >= 18446744073709551616.000000000,	18446744073709551616.000000000 = toUInt32(1), 18446744073709551616.000000000 != toUInt32(1), 18446744073709551616.000000000 < toUInt32(1), 18446744073709551616.000000000 <= toUInt32(1), 18446744073709551616.000000000 > toUInt32(1), 18446744073709551616.000000000 >= toUInt32(1) , toInt32(1) = 18446744073709551616.000000000, toInt32(1) != 18446744073709551616.000000000, toInt32(1) < 18446744073709551616.000000000, toInt32(1) <= 18446744073709551616.000000000, toInt32(1) > 18446744073709551616.000000000, toInt32(1) >= 18446744073709551616.000000000,	18446744073709551616.000000000 = toInt32(1), 18446744073709551616.000000000 != toInt32(1), 18446744073709551616.000000000 < toInt32(1), 18446744073709551616.000000000 <= toInt32(1), 18446744073709551616.000000000 > toInt32(1), 18446744073709551616.000000000 >= toInt32(1) , toUInt64(1) = 18446744073709551616.000000000, toUInt64(1) != 18446744073709551616.000000000, toUInt64(1) < 18446744073709551616.000000000, toUInt64(1) <= 18446744073709551616.000000000, toUInt64(1) > 18446744073709551616.000000000, toUInt64(1) >= 18446744073709551616.000000000,	18446744073709551616.000000000 = toUInt64(1), 18446744073709551616.000000000 != toUInt64(1), 18446744073709551616.000000000 < toUInt64(1), 18446744073709551616.000000000 <= toUInt64(1), 18446744073709551616.000000000 > toUInt64(1), 18446744073709551616.000000000 >= toUInt64(1) , toInt64(1) = 18446744073709551616.000000000, toInt64(1) != 18446744073709551616.000000000, toInt64(1) < 18446744073709551616.000000000, toInt64(1) <= 18446744073709551616.000000000, toInt64(1) > 18446744073709551616.000000000, toInt64(1) >= 18446744073709551616.000000000,	18446744073709551616.000000000 = toInt64(1), 18446744073709551616.000000000 != toInt64(1), 18446744073709551616.000000000 < toInt64(1), 18446744073709551616.000000000 <= toInt64(1), 18446744073709551616.000000000 > toInt64(1), 18446744073709551616.000000000 >= toInt64(1) ;
+SELECT '1', '9223372036854775808.000000000', 1 = 9223372036854775808.000000000, 1 != 9223372036854775808.000000000, 1 < 9223372036854775808.000000000, 1 <= 9223372036854775808.000000000, 1 > 9223372036854775808.000000000, 1 >= 9223372036854775808.000000000,	9223372036854775808.000000000 = 1, 9223372036854775808.000000000 != 1, 9223372036854775808.000000000 < 1, 9223372036854775808.000000000 <= 1, 9223372036854775808.000000000 > 1, 9223372036854775808.000000000 >= 1 , toUInt8(1) = 9223372036854775808.000000000, toUInt8(1) != 9223372036854775808.000000000, toUInt8(1) < 9223372036854775808.000000000, toUInt8(1) <= 9223372036854775808.000000000, toUInt8(1) > 9223372036854775808.000000000, toUInt8(1) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toUInt8(1), 9223372036854775808.000000000 != toUInt8(1), 9223372036854775808.000000000 < toUInt8(1), 9223372036854775808.000000000 <= toUInt8(1), 9223372036854775808.000000000 > toUInt8(1), 9223372036854775808.000000000 >= toUInt8(1) , toInt8(1) = 9223372036854775808.000000000, toInt8(1) != 9223372036854775808.000000000, toInt8(1) < 9223372036854775808.000000000, toInt8(1) <= 9223372036854775808.000000000, toInt8(1) > 9223372036854775808.000000000, toInt8(1) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toInt8(1), 9223372036854775808.000000000 != toInt8(1), 9223372036854775808.000000000 < toInt8(1), 9223372036854775808.000000000 <= toInt8(1), 9223372036854775808.000000000 > toInt8(1), 9223372036854775808.000000000 >= toInt8(1) , toUInt16(1) = 9223372036854775808.000000000, toUInt16(1) != 9223372036854775808.000000000, toUInt16(1) < 9223372036854775808.000000000, toUInt16(1) <= 9223372036854775808.000000000, toUInt16(1) > 9223372036854775808.000000000, toUInt16(1) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toUInt16(1), 9223372036854775808.000000000 != toUInt16(1), 9223372036854775808.000000000 < toUInt16(1), 9223372036854775808.000000000 <= toUInt16(1), 9223372036854775808.000000000 > toUInt16(1), 9223372036854775808.000000000 >= toUInt16(1) , toInt16(1) = 9223372036854775808.000000000, toInt16(1) != 9223372036854775808.000000000, toInt16(1) < 9223372036854775808.000000000, toInt16(1) <= 9223372036854775808.000000000, toInt16(1) > 9223372036854775808.000000000, toInt16(1) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toInt16(1), 9223372036854775808.000000000 != toInt16(1), 9223372036854775808.000000000 < toInt16(1), 9223372036854775808.000000000 <= toInt16(1), 9223372036854775808.000000000 > toInt16(1), 9223372036854775808.000000000 >= toInt16(1) , toUInt32(1) = 9223372036854775808.000000000, toUInt32(1) != 9223372036854775808.000000000, toUInt32(1) < 9223372036854775808.000000000, toUInt32(1) <= 9223372036854775808.000000000, toUInt32(1) > 9223372036854775808.000000000, toUInt32(1) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toUInt32(1), 9223372036854775808.000000000 != toUInt32(1), 9223372036854775808.000000000 < toUInt32(1), 9223372036854775808.000000000 <= toUInt32(1), 9223372036854775808.000000000 > toUInt32(1), 9223372036854775808.000000000 >= toUInt32(1) , toInt32(1) = 9223372036854775808.000000000, toInt32(1) != 9223372036854775808.000000000, toInt32(1) < 9223372036854775808.000000000, toInt32(1) <= 9223372036854775808.000000000, toInt32(1) > 9223372036854775808.000000000, toInt32(1) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toInt32(1), 9223372036854775808.000000000 != toInt32(1), 9223372036854775808.000000000 < toInt32(1), 9223372036854775808.000000000 <= toInt32(1), 9223372036854775808.000000000 > toInt32(1), 9223372036854775808.000000000 >= toInt32(1) , toUInt64(1) = 9223372036854775808.000000000, toUInt64(1) != 9223372036854775808.000000000, toUInt64(1) < 9223372036854775808.000000000, toUInt64(1) <= 9223372036854775808.000000000, toUInt64(1) > 9223372036854775808.000000000, toUInt64(1) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toUInt64(1), 9223372036854775808.000000000 != toUInt64(1), 9223372036854775808.000000000 < toUInt64(1), 9223372036854775808.000000000 <= toUInt64(1), 9223372036854775808.000000000 > toUInt64(1), 9223372036854775808.000000000 >= toUInt64(1) , toInt64(1) = 9223372036854775808.000000000, toInt64(1) != 9223372036854775808.000000000, toInt64(1) < 9223372036854775808.000000000, toInt64(1) <= 9223372036854775808.000000000, toInt64(1) > 9223372036854775808.000000000, toInt64(1) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toInt64(1), 9223372036854775808.000000000 != toInt64(1), 9223372036854775808.000000000 < toInt64(1), 9223372036854775808.000000000 <= toInt64(1), 9223372036854775808.000000000 > toInt64(1), 9223372036854775808.000000000 >= toInt64(1) ;
+SELECT '1', '-9223372036854775808.000000000', 1 = -9223372036854775808.000000000, 1 != -9223372036854775808.000000000, 1 < -9223372036854775808.000000000, 1 <= -9223372036854775808.000000000, 1 > -9223372036854775808.000000000, 1 >= -9223372036854775808.000000000,	-9223372036854775808.000000000 = 1, -9223372036854775808.000000000 != 1, -9223372036854775808.000000000 < 1, -9223372036854775808.000000000 <= 1, -9223372036854775808.000000000 > 1, -9223372036854775808.000000000 >= 1 , toUInt8(1) = -9223372036854775808.000000000, toUInt8(1) != -9223372036854775808.000000000, toUInt8(1) < -9223372036854775808.000000000, toUInt8(1) <= -9223372036854775808.000000000, toUInt8(1) > -9223372036854775808.000000000, toUInt8(1) >= -9223372036854775808.000000000,	-9223372036854775808.000000000 = toUInt8(1), -9223372036854775808.000000000 != toUInt8(1), -9223372036854775808.000000000 < toUInt8(1), -9223372036854775808.000000000 <= toUInt8(1), -9223372036854775808.000000000 > toUInt8(1), -9223372036854775808.000000000 >= toUInt8(1) , toInt8(1) = -9223372036854775808.000000000, toInt8(1) != -9223372036854775808.000000000, toInt8(1) < -9223372036854775808.000000000, toInt8(1) <= -9223372036854775808.000000000, toInt8(1) > -9223372036854775808.000000000, toInt8(1) >= -9223372036854775808.000000000,	-9223372036854775808.000000000 = toInt8(1), -9223372036854775808.000000000 != toInt8(1), -9223372036854775808.000000000 < toInt8(1), -9223372036854775808.000000000 <= toInt8(1), -9223372036854775808.000000000 > toInt8(1), -9223372036854775808.000000000 >= toInt8(1) , toUInt16(1) = -9223372036854775808.000000000, toUInt16(1) != -9223372036854775808.000000000, toUInt16(1) < -9223372036854775808.000000000, toUInt16(1) <= -9223372036854775808.000000000, toUInt16(1) > -9223372036854775808.000000000, toUInt16(1) >= -9223372036854775808.000000000,	-9223372036854775808.000000000 = toUInt16(1), -9223372036854775808.000000000 != toUInt16(1), -9223372036854775808.000000000 < toUInt16(1), -9223372036854775808.000000000 <= toUInt16(1), -9223372036854775808.000000000 > toUInt16(1), -9223372036854775808.000000000 >= toUInt16(1) , toInt16(1) = -9223372036854775808.000000000, toInt16(1) != -9223372036854775808.000000000, toInt16(1) < -9223372036854775808.000000000, toInt16(1) <= -9223372036854775808.000000000, toInt16(1) > -9223372036854775808.000000000, toInt16(1) >= -9223372036854775808.000000000,	-9223372036854775808.000000000 = toInt16(1), -9223372036854775808.000000000 != toInt16(1), -9223372036854775808.000000000 < toInt16(1), -9223372036854775808.000000000 <= toInt16(1), -9223372036854775808.000000000 > toInt16(1), -9223372036854775808.000000000 >= toInt16(1) , toUInt32(1) = -9223372036854775808.000000000, toUInt32(1) != -9223372036854775808.000000000, toUInt32(1) < -9223372036854775808.000000000, toUInt32(1) <= -9223372036854775808.000000000, toUInt32(1) > -9223372036854775808.000000000, toUInt32(1) >= -9223372036854775808.000000000,	-9223372036854775808.000000000 = toUInt32(1), -9223372036854775808.000000000 != toUInt32(1), -9223372036854775808.000000000 < toUInt32(1), -9223372036854775808.000000000 <= toUInt32(1), -9223372036854775808.000000000 > toUInt32(1), -9223372036854775808.000000000 >= toUInt32(1) , toInt32(1) = -9223372036854775808.000000000, toInt32(1) != -9223372036854775808.000000000, toInt32(1) < -9223372036854775808.000000000, toInt32(1) <= -9223372036854775808.000000000, toInt32(1) > -9223372036854775808.000000000, toInt32(1) >= -9223372036854775808.000000000,	-9223372036854775808.000000000 = toInt32(1), -9223372036854775808.000000000 != toInt32(1), -9223372036854775808.000000000 < toInt32(1), -9223372036854775808.000000000 <= toInt32(1), -9223372036854775808.000000000 > toInt32(1), -9223372036854775808.000000000 >= toInt32(1) , toUInt64(1) = -9223372036854775808.000000000, toUInt64(1) != -9223372036854775808.000000000, toUInt64(1) < -9223372036854775808.000000000, toUInt64(1) <= -9223372036854775808.000000000, toUInt64(1) > -9223372036854775808.000000000, toUInt64(1) >= -9223372036854775808.000000000,	-9223372036854775808.000000000 = toUInt64(1), -9223372036854775808.000000000 != toUInt64(1), -9223372036854775808.000000000 < toUInt64(1), -9223372036854775808.000000000 <= toUInt64(1), -9223372036854775808.000000000 > toUInt64(1), -9223372036854775808.000000000 >= toUInt64(1) , toInt64(1) = -9223372036854775808.000000000, toInt64(1) != -9223372036854775808.000000000, toInt64(1) < -9223372036854775808.000000000, toInt64(1) <= -9223372036854775808.000000000, toInt64(1) > -9223372036854775808.000000000, toInt64(1) >= -9223372036854775808.000000000,	-9223372036854775808.000000000 = toInt64(1), -9223372036854775808.000000000 != toInt64(1), -9223372036854775808.000000000 < toInt64(1), -9223372036854775808.000000000 <= toInt64(1), -9223372036854775808.000000000 > toInt64(1), -9223372036854775808.000000000 >= toInt64(1) ;
+SELECT '1', '9223372036854775808.000000000', 1 = 9223372036854775808.000000000, 1 != 9223372036854775808.000000000, 1 < 9223372036854775808.000000000, 1 <= 9223372036854775808.000000000, 1 > 9223372036854775808.000000000, 1 >= 9223372036854775808.000000000,	9223372036854775808.000000000 = 1, 9223372036854775808.000000000 != 1, 9223372036854775808.000000000 < 1, 9223372036854775808.000000000 <= 1, 9223372036854775808.000000000 > 1, 9223372036854775808.000000000 >= 1 , toUInt8(1) = 9223372036854775808.000000000, toUInt8(1) != 9223372036854775808.000000000, toUInt8(1) < 9223372036854775808.000000000, toUInt8(1) <= 9223372036854775808.000000000, toUInt8(1) > 9223372036854775808.000000000, toUInt8(1) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toUInt8(1), 9223372036854775808.000000000 != toUInt8(1), 9223372036854775808.000000000 < toUInt8(1), 9223372036854775808.000000000 <= toUInt8(1), 9223372036854775808.000000000 > toUInt8(1), 9223372036854775808.000000000 >= toUInt8(1) , toInt8(1) = 9223372036854775808.000000000, toInt8(1) != 9223372036854775808.000000000, toInt8(1) < 9223372036854775808.000000000, toInt8(1) <= 9223372036854775808.000000000, toInt8(1) > 9223372036854775808.000000000, toInt8(1) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toInt8(1), 9223372036854775808.000000000 != toInt8(1), 9223372036854775808.000000000 < toInt8(1), 9223372036854775808.000000000 <= toInt8(1), 9223372036854775808.000000000 > toInt8(1), 9223372036854775808.000000000 >= toInt8(1) , toUInt16(1) = 9223372036854775808.000000000, toUInt16(1) != 9223372036854775808.000000000, toUInt16(1) < 9223372036854775808.000000000, toUInt16(1) <= 9223372036854775808.000000000, toUInt16(1) > 9223372036854775808.000000000, toUInt16(1) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toUInt16(1), 9223372036854775808.000000000 != toUInt16(1), 9223372036854775808.000000000 < toUInt16(1), 9223372036854775808.000000000 <= toUInt16(1), 9223372036854775808.000000000 > toUInt16(1), 9223372036854775808.000000000 >= toUInt16(1) , toInt16(1) = 9223372036854775808.000000000, toInt16(1) != 9223372036854775808.000000000, toInt16(1) < 9223372036854775808.000000000, toInt16(1) <= 9223372036854775808.000000000, toInt16(1) > 9223372036854775808.000000000, toInt16(1) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toInt16(1), 9223372036854775808.000000000 != toInt16(1), 9223372036854775808.000000000 < toInt16(1), 9223372036854775808.000000000 <= toInt16(1), 9223372036854775808.000000000 > toInt16(1), 9223372036854775808.000000000 >= toInt16(1) , toUInt32(1) = 9223372036854775808.000000000, toUInt32(1) != 9223372036854775808.000000000, toUInt32(1) < 9223372036854775808.000000000, toUInt32(1) <= 9223372036854775808.000000000, toUInt32(1) > 9223372036854775808.000000000, toUInt32(1) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toUInt32(1), 9223372036854775808.000000000 != toUInt32(1), 9223372036854775808.000000000 < toUInt32(1), 9223372036854775808.000000000 <= toUInt32(1), 9223372036854775808.000000000 > toUInt32(1), 9223372036854775808.000000000 >= toUInt32(1) , toInt32(1) = 9223372036854775808.000000000, toInt32(1) != 9223372036854775808.000000000, toInt32(1) < 9223372036854775808.000000000, toInt32(1) <= 9223372036854775808.000000000, toInt32(1) > 9223372036854775808.000000000, toInt32(1) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toInt32(1), 9223372036854775808.000000000 != toInt32(1), 9223372036854775808.000000000 < toInt32(1), 9223372036854775808.000000000 <= toInt32(1), 9223372036854775808.000000000 > toInt32(1), 9223372036854775808.000000000 >= toInt32(1) , toUInt64(1) = 9223372036854775808.000000000, toUInt64(1) != 9223372036854775808.000000000, toUInt64(1) < 9223372036854775808.000000000, toUInt64(1) <= 9223372036854775808.000000000, toUInt64(1) > 9223372036854775808.000000000, toUInt64(1) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toUInt64(1), 9223372036854775808.000000000 != toUInt64(1), 9223372036854775808.000000000 < toUInt64(1), 9223372036854775808.000000000 <= toUInt64(1), 9223372036854775808.000000000 > toUInt64(1), 9223372036854775808.000000000 >= toUInt64(1) , toInt64(1) = 9223372036854775808.000000000, toInt64(1) != 9223372036854775808.000000000, toInt64(1) < 9223372036854775808.000000000, toInt64(1) <= 9223372036854775808.000000000, toInt64(1) > 9223372036854775808.000000000, toInt64(1) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toInt64(1), 9223372036854775808.000000000 != toInt64(1), 9223372036854775808.000000000 < toInt64(1), 9223372036854775808.000000000 <= toInt64(1), 9223372036854775808.000000000 > toInt64(1), 9223372036854775808.000000000 >= toInt64(1) ;
+SELECT '1', '2251799813685248.000000000', 1 = 2251799813685248.000000000, 1 != 2251799813685248.000000000, 1 < 2251799813685248.000000000, 1 <= 2251799813685248.000000000, 1 > 2251799813685248.000000000, 1 >= 2251799813685248.000000000,	2251799813685248.000000000 = 1, 2251799813685248.000000000 != 1, 2251799813685248.000000000 < 1, 2251799813685248.000000000 <= 1, 2251799813685248.000000000 > 1, 2251799813685248.000000000 >= 1 , toUInt8(1) = 2251799813685248.000000000, toUInt8(1) != 2251799813685248.000000000, toUInt8(1) < 2251799813685248.000000000, toUInt8(1) <= 2251799813685248.000000000, toUInt8(1) > 2251799813685248.000000000, toUInt8(1) >= 2251799813685248.000000000,	2251799813685248.000000000 = toUInt8(1), 2251799813685248.000000000 != toUInt8(1), 2251799813685248.000000000 < toUInt8(1), 2251799813685248.000000000 <= toUInt8(1), 2251799813685248.000000000 > toUInt8(1), 2251799813685248.000000000 >= toUInt8(1) , toInt8(1) = 2251799813685248.000000000, toInt8(1) != 2251799813685248.000000000, toInt8(1) < 2251799813685248.000000000, toInt8(1) <= 2251799813685248.000000000, toInt8(1) > 2251799813685248.000000000, toInt8(1) >= 2251799813685248.000000000,	2251799813685248.000000000 = toInt8(1), 2251799813685248.000000000 != toInt8(1), 2251799813685248.000000000 < toInt8(1), 2251799813685248.000000000 <= toInt8(1), 2251799813685248.000000000 > toInt8(1), 2251799813685248.000000000 >= toInt8(1) , toUInt16(1) = 2251799813685248.000000000, toUInt16(1) != 2251799813685248.000000000, toUInt16(1) < 2251799813685248.000000000, toUInt16(1) <= 2251799813685248.000000000, toUInt16(1) > 2251799813685248.000000000, toUInt16(1) >= 2251799813685248.000000000,	2251799813685248.000000000 = toUInt16(1), 2251799813685248.000000000 != toUInt16(1), 2251799813685248.000000000 < toUInt16(1), 2251799813685248.000000000 <= toUInt16(1), 2251799813685248.000000000 > toUInt16(1), 2251799813685248.000000000 >= toUInt16(1) , toInt16(1) = 2251799813685248.000000000, toInt16(1) != 2251799813685248.000000000, toInt16(1) < 2251799813685248.000000000, toInt16(1) <= 2251799813685248.000000000, toInt16(1) > 2251799813685248.000000000, toInt16(1) >= 2251799813685248.000000000,	2251799813685248.000000000 = toInt16(1), 2251799813685248.000000000 != toInt16(1), 2251799813685248.000000000 < toInt16(1), 2251799813685248.000000000 <= toInt16(1), 2251799813685248.000000000 > toInt16(1), 2251799813685248.000000000 >= toInt16(1) , toUInt32(1) = 2251799813685248.000000000, toUInt32(1) != 2251799813685248.000000000, toUInt32(1) < 2251799813685248.000000000, toUInt32(1) <= 2251799813685248.000000000, toUInt32(1) > 2251799813685248.000000000, toUInt32(1) >= 2251799813685248.000000000,	2251799813685248.000000000 = toUInt32(1), 2251799813685248.000000000 != toUInt32(1), 2251799813685248.000000000 < toUInt32(1), 2251799813685248.000000000 <= toUInt32(1), 2251799813685248.000000000 > toUInt32(1), 2251799813685248.000000000 >= toUInt32(1) , toInt32(1) = 2251799813685248.000000000, toInt32(1) != 2251799813685248.000000000, toInt32(1) < 2251799813685248.000000000, toInt32(1) <= 2251799813685248.000000000, toInt32(1) > 2251799813685248.000000000, toInt32(1) >= 2251799813685248.000000000,	2251799813685248.000000000 = toInt32(1), 2251799813685248.000000000 != toInt32(1), 2251799813685248.000000000 < toInt32(1), 2251799813685248.000000000 <= toInt32(1), 2251799813685248.000000000 > toInt32(1), 2251799813685248.000000000 >= toInt32(1) , toUInt64(1) = 2251799813685248.000000000, toUInt64(1) != 2251799813685248.000000000, toUInt64(1) < 2251799813685248.000000000, toUInt64(1) <= 2251799813685248.000000000, toUInt64(1) > 2251799813685248.000000000, toUInt64(1) >= 2251799813685248.000000000,	2251799813685248.000000000 = toUInt64(1), 2251799813685248.000000000 != toUInt64(1), 2251799813685248.000000000 < toUInt64(1), 2251799813685248.000000000 <= toUInt64(1), 2251799813685248.000000000 > toUInt64(1), 2251799813685248.000000000 >= toUInt64(1) , toInt64(1) = 2251799813685248.000000000, toInt64(1) != 2251799813685248.000000000, toInt64(1) < 2251799813685248.000000000, toInt64(1) <= 2251799813685248.000000000, toInt64(1) > 2251799813685248.000000000, toInt64(1) >= 2251799813685248.000000000,	2251799813685248.000000000 = toInt64(1), 2251799813685248.000000000 != toInt64(1), 2251799813685248.000000000 < toInt64(1), 2251799813685248.000000000 <= toInt64(1), 2251799813685248.000000000 > toInt64(1), 2251799813685248.000000000 >= toInt64(1) ;
+SELECT '1', '4503599627370496.000000000', 1 = 4503599627370496.000000000, 1 != 4503599627370496.000000000, 1 < 4503599627370496.000000000, 1 <= 4503599627370496.000000000, 1 > 4503599627370496.000000000, 1 >= 4503599627370496.000000000,	4503599627370496.000000000 = 1, 4503599627370496.000000000 != 1, 4503599627370496.000000000 < 1, 4503599627370496.000000000 <= 1, 4503599627370496.000000000 > 1, 4503599627370496.000000000 >= 1 , toUInt8(1) = 4503599627370496.000000000, toUInt8(1) != 4503599627370496.000000000, toUInt8(1) < 4503599627370496.000000000, toUInt8(1) <= 4503599627370496.000000000, toUInt8(1) > 4503599627370496.000000000, toUInt8(1) >= 4503599627370496.000000000,	4503599627370496.000000000 = toUInt8(1), 4503599627370496.000000000 != toUInt8(1), 4503599627370496.000000000 < toUInt8(1), 4503599627370496.000000000 <= toUInt8(1), 4503599627370496.000000000 > toUInt8(1), 4503599627370496.000000000 >= toUInt8(1) , toInt8(1) = 4503599627370496.000000000, toInt8(1) != 4503599627370496.000000000, toInt8(1) < 4503599627370496.000000000, toInt8(1) <= 4503599627370496.000000000, toInt8(1) > 4503599627370496.000000000, toInt8(1) >= 4503599627370496.000000000,	4503599627370496.000000000 = toInt8(1), 4503599627370496.000000000 != toInt8(1), 4503599627370496.000000000 < toInt8(1), 4503599627370496.000000000 <= toInt8(1), 4503599627370496.000000000 > toInt8(1), 4503599627370496.000000000 >= toInt8(1) , toUInt16(1) = 4503599627370496.000000000, toUInt16(1) != 4503599627370496.000000000, toUInt16(1) < 4503599627370496.000000000, toUInt16(1) <= 4503599627370496.000000000, toUInt16(1) > 4503599627370496.000000000, toUInt16(1) >= 4503599627370496.000000000,	4503599627370496.000000000 = toUInt16(1), 4503599627370496.000000000 != toUInt16(1), 4503599627370496.000000000 < toUInt16(1), 4503599627370496.000000000 <= toUInt16(1), 4503599627370496.000000000 > toUInt16(1), 4503599627370496.000000000 >= toUInt16(1) , toInt16(1) = 4503599627370496.000000000, toInt16(1) != 4503599627370496.000000000, toInt16(1) < 4503599627370496.000000000, toInt16(1) <= 4503599627370496.000000000, toInt16(1) > 4503599627370496.000000000, toInt16(1) >= 4503599627370496.000000000,	4503599627370496.000000000 = toInt16(1), 4503599627370496.000000000 != toInt16(1), 4503599627370496.000000000 < toInt16(1), 4503599627370496.000000000 <= toInt16(1), 4503599627370496.000000000 > toInt16(1), 4503599627370496.000000000 >= toInt16(1) , toUInt32(1) = 4503599627370496.000000000, toUInt32(1) != 4503599627370496.000000000, toUInt32(1) < 4503599627370496.000000000, toUInt32(1) <= 4503599627370496.000000000, toUInt32(1) > 4503599627370496.000000000, toUInt32(1) >= 4503599627370496.000000000,	4503599627370496.000000000 = toUInt32(1), 4503599627370496.000000000 != toUInt32(1), 4503599627370496.000000000 < toUInt32(1), 4503599627370496.000000000 <= toUInt32(1), 4503599627370496.000000000 > toUInt32(1), 4503599627370496.000000000 >= toUInt32(1) , toInt32(1) = 4503599627370496.000000000, toInt32(1) != 4503599627370496.000000000, toInt32(1) < 4503599627370496.000000000, toInt32(1) <= 4503599627370496.000000000, toInt32(1) > 4503599627370496.000000000, toInt32(1) >= 4503599627370496.000000000,	4503599627370496.000000000 = toInt32(1), 4503599627370496.000000000 != toInt32(1), 4503599627370496.000000000 < toInt32(1), 4503599627370496.000000000 <= toInt32(1), 4503599627370496.000000000 > toInt32(1), 4503599627370496.000000000 >= toInt32(1) , toUInt64(1) = 4503599627370496.000000000, toUInt64(1) != 4503599627370496.000000000, toUInt64(1) < 4503599627370496.000000000, toUInt64(1) <= 4503599627370496.000000000, toUInt64(1) > 4503599627370496.000000000, toUInt64(1) >= 4503599627370496.000000000,	4503599627370496.000000000 = toUInt64(1), 4503599627370496.000000000 != toUInt64(1), 4503599627370496.000000000 < toUInt64(1), 4503599627370496.000000000 <= toUInt64(1), 4503599627370496.000000000 > toUInt64(1), 4503599627370496.000000000 >= toUInt64(1) , toInt64(1) = 4503599627370496.000000000, toInt64(1) != 4503599627370496.000000000, toInt64(1) < 4503599627370496.000000000, toInt64(1) <= 4503599627370496.000000000, toInt64(1) > 4503599627370496.000000000, toInt64(1) >= 4503599627370496.000000000,	4503599627370496.000000000 = toInt64(1), 4503599627370496.000000000 != toInt64(1), 4503599627370496.000000000 < toInt64(1), 4503599627370496.000000000 <= toInt64(1), 4503599627370496.000000000 > toInt64(1), 4503599627370496.000000000 >= toInt64(1) ;
+SELECT '1', '9007199254740991.000000000', 1 = 9007199254740991.000000000, 1 != 9007199254740991.000000000, 1 < 9007199254740991.000000000, 1 <= 9007199254740991.000000000, 1 > 9007199254740991.000000000, 1 >= 9007199254740991.000000000,	9007199254740991.000000000 = 1, 9007199254740991.000000000 != 1, 9007199254740991.000000000 < 1, 9007199254740991.000000000 <= 1, 9007199254740991.000000000 > 1, 9007199254740991.000000000 >= 1 , toUInt8(1) = 9007199254740991.000000000, toUInt8(1) != 9007199254740991.000000000, toUInt8(1) < 9007199254740991.000000000, toUInt8(1) <= 9007199254740991.000000000, toUInt8(1) > 9007199254740991.000000000, toUInt8(1) >= 9007199254740991.000000000,	9007199254740991.000000000 = toUInt8(1), 9007199254740991.000000000 != toUInt8(1), 9007199254740991.000000000 < toUInt8(1), 9007199254740991.000000000 <= toUInt8(1), 9007199254740991.000000000 > toUInt8(1), 9007199254740991.000000000 >= toUInt8(1) , toInt8(1) = 9007199254740991.000000000, toInt8(1) != 9007199254740991.000000000, toInt8(1) < 9007199254740991.000000000, toInt8(1) <= 9007199254740991.000000000, toInt8(1) > 9007199254740991.000000000, toInt8(1) >= 9007199254740991.000000000,	9007199254740991.000000000 = toInt8(1), 9007199254740991.000000000 != toInt8(1), 9007199254740991.000000000 < toInt8(1), 9007199254740991.000000000 <= toInt8(1), 9007199254740991.000000000 > toInt8(1), 9007199254740991.000000000 >= toInt8(1) , toUInt16(1) = 9007199254740991.000000000, toUInt16(1) != 9007199254740991.000000000, toUInt16(1) < 9007199254740991.000000000, toUInt16(1) <= 9007199254740991.000000000, toUInt16(1) > 9007199254740991.000000000, toUInt16(1) >= 9007199254740991.000000000,	9007199254740991.000000000 = toUInt16(1), 9007199254740991.000000000 != toUInt16(1), 9007199254740991.000000000 < toUInt16(1), 9007199254740991.000000000 <= toUInt16(1), 9007199254740991.000000000 > toUInt16(1), 9007199254740991.000000000 >= toUInt16(1) , toInt16(1) = 9007199254740991.000000000, toInt16(1) != 9007199254740991.000000000, toInt16(1) < 9007199254740991.000000000, toInt16(1) <= 9007199254740991.000000000, toInt16(1) > 9007199254740991.000000000, toInt16(1) >= 9007199254740991.000000000,	9007199254740991.000000000 = toInt16(1), 9007199254740991.000000000 != toInt16(1), 9007199254740991.000000000 < toInt16(1), 9007199254740991.000000000 <= toInt16(1), 9007199254740991.000000000 > toInt16(1), 9007199254740991.000000000 >= toInt16(1) , toUInt32(1) = 9007199254740991.000000000, toUInt32(1) != 9007199254740991.000000000, toUInt32(1) < 9007199254740991.000000000, toUInt32(1) <= 9007199254740991.000000000, toUInt32(1) > 9007199254740991.000000000, toUInt32(1) >= 9007199254740991.000000000,	9007199254740991.000000000 = toUInt32(1), 9007199254740991.000000000 != toUInt32(1), 9007199254740991.000000000 < toUInt32(1), 9007199254740991.000000000 <= toUInt32(1), 9007199254740991.000000000 > toUInt32(1), 9007199254740991.000000000 >= toUInt32(1) , toInt32(1) = 9007199254740991.000000000, toInt32(1) != 9007199254740991.000000000, toInt32(1) < 9007199254740991.000000000, toInt32(1) <= 9007199254740991.000000000, toInt32(1) > 9007199254740991.000000000, toInt32(1) >= 9007199254740991.000000000,	9007199254740991.000000000 = toInt32(1), 9007199254740991.000000000 != toInt32(1), 9007199254740991.000000000 < toInt32(1), 9007199254740991.000000000 <= toInt32(1), 9007199254740991.000000000 > toInt32(1), 9007199254740991.000000000 >= toInt32(1) , toUInt64(1) = 9007199254740991.000000000, toUInt64(1) != 9007199254740991.000000000, toUInt64(1) < 9007199254740991.000000000, toUInt64(1) <= 9007199254740991.000000000, toUInt64(1) > 9007199254740991.000000000, toUInt64(1) >= 9007199254740991.000000000,	9007199254740991.000000000 = toUInt64(1), 9007199254740991.000000000 != toUInt64(1), 9007199254740991.000000000 < toUInt64(1), 9007199254740991.000000000 <= toUInt64(1), 9007199254740991.000000000 > toUInt64(1), 9007199254740991.000000000 >= toUInt64(1) , toInt64(1) = 9007199254740991.000000000, toInt64(1) != 9007199254740991.000000000, toInt64(1) < 9007199254740991.000000000, toInt64(1) <= 9007199254740991.000000000, toInt64(1) > 9007199254740991.000000000, toInt64(1) >= 9007199254740991.000000000,	9007199254740991.000000000 = toInt64(1), 9007199254740991.000000000 != toInt64(1), 9007199254740991.000000000 < toInt64(1), 9007199254740991.000000000 <= toInt64(1), 9007199254740991.000000000 > toInt64(1), 9007199254740991.000000000 >= toInt64(1) ;
+SELECT '1', '9007199254740992.000000000', 1 = 9007199254740992.000000000, 1 != 9007199254740992.000000000, 1 < 9007199254740992.000000000, 1 <= 9007199254740992.000000000, 1 > 9007199254740992.000000000, 1 >= 9007199254740992.000000000,	9007199254740992.000000000 = 1, 9007199254740992.000000000 != 1, 9007199254740992.000000000 < 1, 9007199254740992.000000000 <= 1, 9007199254740992.000000000 > 1, 9007199254740992.000000000 >= 1 , toUInt8(1) = 9007199254740992.000000000, toUInt8(1) != 9007199254740992.000000000, toUInt8(1) < 9007199254740992.000000000, toUInt8(1) <= 9007199254740992.000000000, toUInt8(1) > 9007199254740992.000000000, toUInt8(1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toUInt8(1), 9007199254740992.000000000 != toUInt8(1), 9007199254740992.000000000 < toUInt8(1), 9007199254740992.000000000 <= toUInt8(1), 9007199254740992.000000000 > toUInt8(1), 9007199254740992.000000000 >= toUInt8(1) , toInt8(1) = 9007199254740992.000000000, toInt8(1) != 9007199254740992.000000000, toInt8(1) < 9007199254740992.000000000, toInt8(1) <= 9007199254740992.000000000, toInt8(1) > 9007199254740992.000000000, toInt8(1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt8(1), 9007199254740992.000000000 != toInt8(1), 9007199254740992.000000000 < toInt8(1), 9007199254740992.000000000 <= toInt8(1), 9007199254740992.000000000 > toInt8(1), 9007199254740992.000000000 >= toInt8(1) , toUInt16(1) = 9007199254740992.000000000, toUInt16(1) != 9007199254740992.000000000, toUInt16(1) < 9007199254740992.000000000, toUInt16(1) <= 9007199254740992.000000000, toUInt16(1) > 9007199254740992.000000000, toUInt16(1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toUInt16(1), 9007199254740992.000000000 != toUInt16(1), 9007199254740992.000000000 < toUInt16(1), 9007199254740992.000000000 <= toUInt16(1), 9007199254740992.000000000 > toUInt16(1), 9007199254740992.000000000 >= toUInt16(1) , toInt16(1) = 9007199254740992.000000000, toInt16(1) != 9007199254740992.000000000, toInt16(1) < 9007199254740992.000000000, toInt16(1) <= 9007199254740992.000000000, toInt16(1) > 9007199254740992.000000000, toInt16(1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt16(1), 9007199254740992.000000000 != toInt16(1), 9007199254740992.000000000 < toInt16(1), 9007199254740992.000000000 <= toInt16(1), 9007199254740992.000000000 > toInt16(1), 9007199254740992.000000000 >= toInt16(1) , toUInt32(1) = 9007199254740992.000000000, toUInt32(1) != 9007199254740992.000000000, toUInt32(1) < 9007199254740992.000000000, toUInt32(1) <= 9007199254740992.000000000, toUInt32(1) > 9007199254740992.000000000, toUInt32(1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toUInt32(1), 9007199254740992.000000000 != toUInt32(1), 9007199254740992.000000000 < toUInt32(1), 9007199254740992.000000000 <= toUInt32(1), 9007199254740992.000000000 > toUInt32(1), 9007199254740992.000000000 >= toUInt32(1) , toInt32(1) = 9007199254740992.000000000, toInt32(1) != 9007199254740992.000000000, toInt32(1) < 9007199254740992.000000000, toInt32(1) <= 9007199254740992.000000000, toInt32(1) > 9007199254740992.000000000, toInt32(1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt32(1), 9007199254740992.000000000 != toInt32(1), 9007199254740992.000000000 < toInt32(1), 9007199254740992.000000000 <= toInt32(1), 9007199254740992.000000000 > toInt32(1), 9007199254740992.000000000 >= toInt32(1) , toUInt64(1) = 9007199254740992.000000000, toUInt64(1) != 9007199254740992.000000000, toUInt64(1) < 9007199254740992.000000000, toUInt64(1) <= 9007199254740992.000000000, toUInt64(1) > 9007199254740992.000000000, toUInt64(1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toUInt64(1), 9007199254740992.000000000 != toUInt64(1), 9007199254740992.000000000 < toUInt64(1), 9007199254740992.000000000 <= toUInt64(1), 9007199254740992.000000000 > toUInt64(1), 9007199254740992.000000000 >= toUInt64(1) , toInt64(1) = 9007199254740992.000000000, toInt64(1) != 9007199254740992.000000000, toInt64(1) < 9007199254740992.000000000, toInt64(1) <= 9007199254740992.000000000, toInt64(1) > 9007199254740992.000000000, toInt64(1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt64(1), 9007199254740992.000000000 != toInt64(1), 9007199254740992.000000000 < toInt64(1), 9007199254740992.000000000 <= toInt64(1), 9007199254740992.000000000 > toInt64(1), 9007199254740992.000000000 >= toInt64(1) ;
+SELECT '1', '9007199254740992.000000000', 1 = 9007199254740992.000000000, 1 != 9007199254740992.000000000, 1 < 9007199254740992.000000000, 1 <= 9007199254740992.000000000, 1 > 9007199254740992.000000000, 1 >= 9007199254740992.000000000,	9007199254740992.000000000 = 1, 9007199254740992.000000000 != 1, 9007199254740992.000000000 < 1, 9007199254740992.000000000 <= 1, 9007199254740992.000000000 > 1, 9007199254740992.000000000 >= 1 , toUInt8(1) = 9007199254740992.000000000, toUInt8(1) != 9007199254740992.000000000, toUInt8(1) < 9007199254740992.000000000, toUInt8(1) <= 9007199254740992.000000000, toUInt8(1) > 9007199254740992.000000000, toUInt8(1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toUInt8(1), 9007199254740992.000000000 != toUInt8(1), 9007199254740992.000000000 < toUInt8(1), 9007199254740992.000000000 <= toUInt8(1), 9007199254740992.000000000 > toUInt8(1), 9007199254740992.000000000 >= toUInt8(1) , toInt8(1) = 9007199254740992.000000000, toInt8(1) != 9007199254740992.000000000, toInt8(1) < 9007199254740992.000000000, toInt8(1) <= 9007199254740992.000000000, toInt8(1) > 9007199254740992.000000000, toInt8(1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt8(1), 9007199254740992.000000000 != toInt8(1), 9007199254740992.000000000 < toInt8(1), 9007199254740992.000000000 <= toInt8(1), 9007199254740992.000000000 > toInt8(1), 9007199254740992.000000000 >= toInt8(1) , toUInt16(1) = 9007199254740992.000000000, toUInt16(1) != 9007199254740992.000000000, toUInt16(1) < 9007199254740992.000000000, toUInt16(1) <= 9007199254740992.000000000, toUInt16(1) > 9007199254740992.000000000, toUInt16(1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toUInt16(1), 9007199254740992.000000000 != toUInt16(1), 9007199254740992.000000000 < toUInt16(1), 9007199254740992.000000000 <= toUInt16(1), 9007199254740992.000000000 > toUInt16(1), 9007199254740992.000000000 >= toUInt16(1) , toInt16(1) = 9007199254740992.000000000, toInt16(1) != 9007199254740992.000000000, toInt16(1) < 9007199254740992.000000000, toInt16(1) <= 9007199254740992.000000000, toInt16(1) > 9007199254740992.000000000, toInt16(1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt16(1), 9007199254740992.000000000 != toInt16(1), 9007199254740992.000000000 < toInt16(1), 9007199254740992.000000000 <= toInt16(1), 9007199254740992.000000000 > toInt16(1), 9007199254740992.000000000 >= toInt16(1) , toUInt32(1) = 9007199254740992.000000000, toUInt32(1) != 9007199254740992.000000000, toUInt32(1) < 9007199254740992.000000000, toUInt32(1) <= 9007199254740992.000000000, toUInt32(1) > 9007199254740992.000000000, toUInt32(1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toUInt32(1), 9007199254740992.000000000 != toUInt32(1), 9007199254740992.000000000 < toUInt32(1), 9007199254740992.000000000 <= toUInt32(1), 9007199254740992.000000000 > toUInt32(1), 9007199254740992.000000000 >= toUInt32(1) , toInt32(1) = 9007199254740992.000000000, toInt32(1) != 9007199254740992.000000000, toInt32(1) < 9007199254740992.000000000, toInt32(1) <= 9007199254740992.000000000, toInt32(1) > 9007199254740992.000000000, toInt32(1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt32(1), 9007199254740992.000000000 != toInt32(1), 9007199254740992.000000000 < toInt32(1), 9007199254740992.000000000 <= toInt32(1), 9007199254740992.000000000 > toInt32(1), 9007199254740992.000000000 >= toInt32(1) , toUInt64(1) = 9007199254740992.000000000, toUInt64(1) != 9007199254740992.000000000, toUInt64(1) < 9007199254740992.000000000, toUInt64(1) <= 9007199254740992.000000000, toUInt64(1) > 9007199254740992.000000000, toUInt64(1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toUInt64(1), 9007199254740992.000000000 != toUInt64(1), 9007199254740992.000000000 < toUInt64(1), 9007199254740992.000000000 <= toUInt64(1), 9007199254740992.000000000 > toUInt64(1), 9007199254740992.000000000 >= toUInt64(1) , toInt64(1) = 9007199254740992.000000000, toInt64(1) != 9007199254740992.000000000, toInt64(1) < 9007199254740992.000000000, toInt64(1) <= 9007199254740992.000000000, toInt64(1) > 9007199254740992.000000000, toInt64(1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt64(1), 9007199254740992.000000000 != toInt64(1), 9007199254740992.000000000 < toInt64(1), 9007199254740992.000000000 <= toInt64(1), 9007199254740992.000000000 > toInt64(1), 9007199254740992.000000000 >= toInt64(1) ;
+SELECT '1', '9007199254740994.000000000', 1 = 9007199254740994.000000000, 1 != 9007199254740994.000000000, 1 < 9007199254740994.000000000, 1 <= 9007199254740994.000000000, 1 > 9007199254740994.000000000, 1 >= 9007199254740994.000000000,	9007199254740994.000000000 = 1, 9007199254740994.000000000 != 1, 9007199254740994.000000000 < 1, 9007199254740994.000000000 <= 1, 9007199254740994.000000000 > 1, 9007199254740994.000000000 >= 1 , toUInt8(1) = 9007199254740994.000000000, toUInt8(1) != 9007199254740994.000000000, toUInt8(1) < 9007199254740994.000000000, toUInt8(1) <= 9007199254740994.000000000, toUInt8(1) > 9007199254740994.000000000, toUInt8(1) >= 9007199254740994.000000000,	9007199254740994.000000000 = toUInt8(1), 9007199254740994.000000000 != toUInt8(1), 9007199254740994.000000000 < toUInt8(1), 9007199254740994.000000000 <= toUInt8(1), 9007199254740994.000000000 > toUInt8(1), 9007199254740994.000000000 >= toUInt8(1) , toInt8(1) = 9007199254740994.000000000, toInt8(1) != 9007199254740994.000000000, toInt8(1) < 9007199254740994.000000000, toInt8(1) <= 9007199254740994.000000000, toInt8(1) > 9007199254740994.000000000, toInt8(1) >= 9007199254740994.000000000,	9007199254740994.000000000 = toInt8(1), 9007199254740994.000000000 != toInt8(1), 9007199254740994.000000000 < toInt8(1), 9007199254740994.000000000 <= toInt8(1), 9007199254740994.000000000 > toInt8(1), 9007199254740994.000000000 >= toInt8(1) , toUInt16(1) = 9007199254740994.000000000, toUInt16(1) != 9007199254740994.000000000, toUInt16(1) < 9007199254740994.000000000, toUInt16(1) <= 9007199254740994.000000000, toUInt16(1) > 9007199254740994.000000000, toUInt16(1) >= 9007199254740994.000000000,	9007199254740994.000000000 = toUInt16(1), 9007199254740994.000000000 != toUInt16(1), 9007199254740994.000000000 < toUInt16(1), 9007199254740994.000000000 <= toUInt16(1), 9007199254740994.000000000 > toUInt16(1), 9007199254740994.000000000 >= toUInt16(1) , toInt16(1) = 9007199254740994.000000000, toInt16(1) != 9007199254740994.000000000, toInt16(1) < 9007199254740994.000000000, toInt16(1) <= 9007199254740994.000000000, toInt16(1) > 9007199254740994.000000000, toInt16(1) >= 9007199254740994.000000000,	9007199254740994.000000000 = toInt16(1), 9007199254740994.000000000 != toInt16(1), 9007199254740994.000000000 < toInt16(1), 9007199254740994.000000000 <= toInt16(1), 9007199254740994.000000000 > toInt16(1), 9007199254740994.000000000 >= toInt16(1) , toUInt32(1) = 9007199254740994.000000000, toUInt32(1) != 9007199254740994.000000000, toUInt32(1) < 9007199254740994.000000000, toUInt32(1) <= 9007199254740994.000000000, toUInt32(1) > 9007199254740994.000000000, toUInt32(1) >= 9007199254740994.000000000,	9007199254740994.000000000 = toUInt32(1), 9007199254740994.000000000 != toUInt32(1), 9007199254740994.000000000 < toUInt32(1), 9007199254740994.000000000 <= toUInt32(1), 9007199254740994.000000000 > toUInt32(1), 9007199254740994.000000000 >= toUInt32(1) , toInt32(1) = 9007199254740994.000000000, toInt32(1) != 9007199254740994.000000000, toInt32(1) < 9007199254740994.000000000, toInt32(1) <= 9007199254740994.000000000, toInt32(1) > 9007199254740994.000000000, toInt32(1) >= 9007199254740994.000000000,	9007199254740994.000000000 = toInt32(1), 9007199254740994.000000000 != toInt32(1), 9007199254740994.000000000 < toInt32(1), 9007199254740994.000000000 <= toInt32(1), 9007199254740994.000000000 > toInt32(1), 9007199254740994.000000000 >= toInt32(1) , toUInt64(1) = 9007199254740994.000000000, toUInt64(1) != 9007199254740994.000000000, toUInt64(1) < 9007199254740994.000000000, toUInt64(1) <= 9007199254740994.000000000, toUInt64(1) > 9007199254740994.000000000, toUInt64(1) >= 9007199254740994.000000000,	9007199254740994.000000000 = toUInt64(1), 9007199254740994.000000000 != toUInt64(1), 9007199254740994.000000000 < toUInt64(1), 9007199254740994.000000000 <= toUInt64(1), 9007199254740994.000000000 > toUInt64(1), 9007199254740994.000000000 >= toUInt64(1) , toInt64(1) = 9007199254740994.000000000, toInt64(1) != 9007199254740994.000000000, toInt64(1) < 9007199254740994.000000000, toInt64(1) <= 9007199254740994.000000000, toInt64(1) > 9007199254740994.000000000, toInt64(1) >= 9007199254740994.000000000,	9007199254740994.000000000 = toInt64(1), 9007199254740994.000000000 != toInt64(1), 9007199254740994.000000000 < toInt64(1), 9007199254740994.000000000 <= toInt64(1), 9007199254740994.000000000 > toInt64(1), 9007199254740994.000000000 >= toInt64(1) ;
+SELECT '1', '-9007199254740991.000000000', 1 = -9007199254740991.000000000, 1 != -9007199254740991.000000000, 1 < -9007199254740991.000000000, 1 <= -9007199254740991.000000000, 1 > -9007199254740991.000000000, 1 >= -9007199254740991.000000000,	-9007199254740991.000000000 = 1, -9007199254740991.000000000 != 1, -9007199254740991.000000000 < 1, -9007199254740991.000000000 <= 1, -9007199254740991.000000000 > 1, -9007199254740991.000000000 >= 1 , toUInt8(1) = -9007199254740991.000000000, toUInt8(1) != -9007199254740991.000000000, toUInt8(1) < -9007199254740991.000000000, toUInt8(1) <= -9007199254740991.000000000, toUInt8(1) > -9007199254740991.000000000, toUInt8(1) >= -9007199254740991.000000000,	-9007199254740991.000000000 = toUInt8(1), -9007199254740991.000000000 != toUInt8(1), -9007199254740991.000000000 < toUInt8(1), -9007199254740991.000000000 <= toUInt8(1), -9007199254740991.000000000 > toUInt8(1), -9007199254740991.000000000 >= toUInt8(1) , toInt8(1) = -9007199254740991.000000000, toInt8(1) != -9007199254740991.000000000, toInt8(1) < -9007199254740991.000000000, toInt8(1) <= -9007199254740991.000000000, toInt8(1) > -9007199254740991.000000000, toInt8(1) >= -9007199254740991.000000000,	-9007199254740991.000000000 = toInt8(1), -9007199254740991.000000000 != toInt8(1), -9007199254740991.000000000 < toInt8(1), -9007199254740991.000000000 <= toInt8(1), -9007199254740991.000000000 > toInt8(1), -9007199254740991.000000000 >= toInt8(1) , toUInt16(1) = -9007199254740991.000000000, toUInt16(1) != -9007199254740991.000000000, toUInt16(1) < -9007199254740991.000000000, toUInt16(1) <= -9007199254740991.000000000, toUInt16(1) > -9007199254740991.000000000, toUInt16(1) >= -9007199254740991.000000000,	-9007199254740991.000000000 = toUInt16(1), -9007199254740991.000000000 != toUInt16(1), -9007199254740991.000000000 < toUInt16(1), -9007199254740991.000000000 <= toUInt16(1), -9007199254740991.000000000 > toUInt16(1), -9007199254740991.000000000 >= toUInt16(1) , toInt16(1) = -9007199254740991.000000000, toInt16(1) != -9007199254740991.000000000, toInt16(1) < -9007199254740991.000000000, toInt16(1) <= -9007199254740991.000000000, toInt16(1) > -9007199254740991.000000000, toInt16(1) >= -9007199254740991.000000000,	-9007199254740991.000000000 = toInt16(1), -9007199254740991.000000000 != toInt16(1), -9007199254740991.000000000 < toInt16(1), -9007199254740991.000000000 <= toInt16(1), -9007199254740991.000000000 > toInt16(1), -9007199254740991.000000000 >= toInt16(1) , toUInt32(1) = -9007199254740991.000000000, toUInt32(1) != -9007199254740991.000000000, toUInt32(1) < -9007199254740991.000000000, toUInt32(1) <= -9007199254740991.000000000, toUInt32(1) > -9007199254740991.000000000, toUInt32(1) >= -9007199254740991.000000000,	-9007199254740991.000000000 = toUInt32(1), -9007199254740991.000000000 != toUInt32(1), -9007199254740991.000000000 < toUInt32(1), -9007199254740991.000000000 <= toUInt32(1), -9007199254740991.000000000 > toUInt32(1), -9007199254740991.000000000 >= toUInt32(1) , toInt32(1) = -9007199254740991.000000000, toInt32(1) != -9007199254740991.000000000, toInt32(1) < -9007199254740991.000000000, toInt32(1) <= -9007199254740991.000000000, toInt32(1) > -9007199254740991.000000000, toInt32(1) >= -9007199254740991.000000000,	-9007199254740991.000000000 = toInt32(1), -9007199254740991.000000000 != toInt32(1), -9007199254740991.000000000 < toInt32(1), -9007199254740991.000000000 <= toInt32(1), -9007199254740991.000000000 > toInt32(1), -9007199254740991.000000000 >= toInt32(1) , toUInt64(1) = -9007199254740991.000000000, toUInt64(1) != -9007199254740991.000000000, toUInt64(1) < -9007199254740991.000000000, toUInt64(1) <= -9007199254740991.000000000, toUInt64(1) > -9007199254740991.000000000, toUInt64(1) >= -9007199254740991.000000000,	-9007199254740991.000000000 = toUInt64(1), -9007199254740991.000000000 != toUInt64(1), -9007199254740991.000000000 < toUInt64(1), -9007199254740991.000000000 <= toUInt64(1), -9007199254740991.000000000 > toUInt64(1), -9007199254740991.000000000 >= toUInt64(1) , toInt64(1) = -9007199254740991.000000000, toInt64(1) != -9007199254740991.000000000, toInt64(1) < -9007199254740991.000000000, toInt64(1) <= -9007199254740991.000000000, toInt64(1) > -9007199254740991.000000000, toInt64(1) >= -9007199254740991.000000000,	-9007199254740991.000000000 = toInt64(1), -9007199254740991.000000000 != toInt64(1), -9007199254740991.000000000 < toInt64(1), -9007199254740991.000000000 <= toInt64(1), -9007199254740991.000000000 > toInt64(1), -9007199254740991.000000000 >= toInt64(1) ;
+SELECT '1', '-9007199254740992.000000000', 1 = -9007199254740992.000000000, 1 != -9007199254740992.000000000, 1 < -9007199254740992.000000000, 1 <= -9007199254740992.000000000, 1 > -9007199254740992.000000000, 1 >= -9007199254740992.000000000,	-9007199254740992.000000000 = 1, -9007199254740992.000000000 != 1, -9007199254740992.000000000 < 1, -9007199254740992.000000000 <= 1, -9007199254740992.000000000 > 1, -9007199254740992.000000000 >= 1 , toUInt8(1) = -9007199254740992.000000000, toUInt8(1) != -9007199254740992.000000000, toUInt8(1) < -9007199254740992.000000000, toUInt8(1) <= -9007199254740992.000000000, toUInt8(1) > -9007199254740992.000000000, toUInt8(1) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toUInt8(1), -9007199254740992.000000000 != toUInt8(1), -9007199254740992.000000000 < toUInt8(1), -9007199254740992.000000000 <= toUInt8(1), -9007199254740992.000000000 > toUInt8(1), -9007199254740992.000000000 >= toUInt8(1) , toInt8(1) = -9007199254740992.000000000, toInt8(1) != -9007199254740992.000000000, toInt8(1) < -9007199254740992.000000000, toInt8(1) <= -9007199254740992.000000000, toInt8(1) > -9007199254740992.000000000, toInt8(1) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toInt8(1), -9007199254740992.000000000 != toInt8(1), -9007199254740992.000000000 < toInt8(1), -9007199254740992.000000000 <= toInt8(1), -9007199254740992.000000000 > toInt8(1), -9007199254740992.000000000 >= toInt8(1) , toUInt16(1) = -9007199254740992.000000000, toUInt16(1) != -9007199254740992.000000000, toUInt16(1) < -9007199254740992.000000000, toUInt16(1) <= -9007199254740992.000000000, toUInt16(1) > -9007199254740992.000000000, toUInt16(1) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toUInt16(1), -9007199254740992.000000000 != toUInt16(1), -9007199254740992.000000000 < toUInt16(1), -9007199254740992.000000000 <= toUInt16(1), -9007199254740992.000000000 > toUInt16(1), -9007199254740992.000000000 >= toUInt16(1) , toInt16(1) = -9007199254740992.000000000, toInt16(1) != -9007199254740992.000000000, toInt16(1) < -9007199254740992.000000000, toInt16(1) <= -9007199254740992.000000000, toInt16(1) > -9007199254740992.000000000, toInt16(1) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toInt16(1), -9007199254740992.000000000 != toInt16(1), -9007199254740992.000000000 < toInt16(1), -9007199254740992.000000000 <= toInt16(1), -9007199254740992.000000000 > toInt16(1), -9007199254740992.000000000 >= toInt16(1) , toUInt32(1) = -9007199254740992.000000000, toUInt32(1) != -9007199254740992.000000000, toUInt32(1) < -9007199254740992.000000000, toUInt32(1) <= -9007199254740992.000000000, toUInt32(1) > -9007199254740992.000000000, toUInt32(1) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toUInt32(1), -9007199254740992.000000000 != toUInt32(1), -9007199254740992.000000000 < toUInt32(1), -9007199254740992.000000000 <= toUInt32(1), -9007199254740992.000000000 > toUInt32(1), -9007199254740992.000000000 >= toUInt32(1) , toInt32(1) = -9007199254740992.000000000, toInt32(1) != -9007199254740992.000000000, toInt32(1) < -9007199254740992.000000000, toInt32(1) <= -9007199254740992.000000000, toInt32(1) > -9007199254740992.000000000, toInt32(1) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toInt32(1), -9007199254740992.000000000 != toInt32(1), -9007199254740992.000000000 < toInt32(1), -9007199254740992.000000000 <= toInt32(1), -9007199254740992.000000000 > toInt32(1), -9007199254740992.000000000 >= toInt32(1) , toUInt64(1) = -9007199254740992.000000000, toUInt64(1) != -9007199254740992.000000000, toUInt64(1) < -9007199254740992.000000000, toUInt64(1) <= -9007199254740992.000000000, toUInt64(1) > -9007199254740992.000000000, toUInt64(1) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toUInt64(1), -9007199254740992.000000000 != toUInt64(1), -9007199254740992.000000000 < toUInt64(1), -9007199254740992.000000000 <= toUInt64(1), -9007199254740992.000000000 > toUInt64(1), -9007199254740992.000000000 >= toUInt64(1) , toInt64(1) = -9007199254740992.000000000, toInt64(1) != -9007199254740992.000000000, toInt64(1) < -9007199254740992.000000000, toInt64(1) <= -9007199254740992.000000000, toInt64(1) > -9007199254740992.000000000, toInt64(1) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toInt64(1), -9007199254740992.000000000 != toInt64(1), -9007199254740992.000000000 < toInt64(1), -9007199254740992.000000000 <= toInt64(1), -9007199254740992.000000000 > toInt64(1), -9007199254740992.000000000 >= toInt64(1) ;
+SELECT '1', '-9007199254740992.000000000', 1 = -9007199254740992.000000000, 1 != -9007199254740992.000000000, 1 < -9007199254740992.000000000, 1 <= -9007199254740992.000000000, 1 > -9007199254740992.000000000, 1 >= -9007199254740992.000000000,	-9007199254740992.000000000 = 1, -9007199254740992.000000000 != 1, -9007199254740992.000000000 < 1, -9007199254740992.000000000 <= 1, -9007199254740992.000000000 > 1, -9007199254740992.000000000 >= 1 , toUInt8(1) = -9007199254740992.000000000, toUInt8(1) != -9007199254740992.000000000, toUInt8(1) < -9007199254740992.000000000, toUInt8(1) <= -9007199254740992.000000000, toUInt8(1) > -9007199254740992.000000000, toUInt8(1) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toUInt8(1), -9007199254740992.000000000 != toUInt8(1), -9007199254740992.000000000 < toUInt8(1), -9007199254740992.000000000 <= toUInt8(1), -9007199254740992.000000000 > toUInt8(1), -9007199254740992.000000000 >= toUInt8(1) , toInt8(1) = -9007199254740992.000000000, toInt8(1) != -9007199254740992.000000000, toInt8(1) < -9007199254740992.000000000, toInt8(1) <= -9007199254740992.000000000, toInt8(1) > -9007199254740992.000000000, toInt8(1) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toInt8(1), -9007199254740992.000000000 != toInt8(1), -9007199254740992.000000000 < toInt8(1), -9007199254740992.000000000 <= toInt8(1), -9007199254740992.000000000 > toInt8(1), -9007199254740992.000000000 >= toInt8(1) , toUInt16(1) = -9007199254740992.000000000, toUInt16(1) != -9007199254740992.000000000, toUInt16(1) < -9007199254740992.000000000, toUInt16(1) <= -9007199254740992.000000000, toUInt16(1) > -9007199254740992.000000000, toUInt16(1) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toUInt16(1), -9007199254740992.000000000 != toUInt16(1), -9007199254740992.000000000 < toUInt16(1), -9007199254740992.000000000 <= toUInt16(1), -9007199254740992.000000000 > toUInt16(1), -9007199254740992.000000000 >= toUInt16(1) , toInt16(1) = -9007199254740992.000000000, toInt16(1) != -9007199254740992.000000000, toInt16(1) < -9007199254740992.000000000, toInt16(1) <= -9007199254740992.000000000, toInt16(1) > -9007199254740992.000000000, toInt16(1) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toInt16(1), -9007199254740992.000000000 != toInt16(1), -9007199254740992.000000000 < toInt16(1), -9007199254740992.000000000 <= toInt16(1), -9007199254740992.000000000 > toInt16(1), -9007199254740992.000000000 >= toInt16(1) , toUInt32(1) = -9007199254740992.000000000, toUInt32(1) != -9007199254740992.000000000, toUInt32(1) < -9007199254740992.000000000, toUInt32(1) <= -9007199254740992.000000000, toUInt32(1) > -9007199254740992.000000000, toUInt32(1) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toUInt32(1), -9007199254740992.000000000 != toUInt32(1), -9007199254740992.000000000 < toUInt32(1), -9007199254740992.000000000 <= toUInt32(1), -9007199254740992.000000000 > toUInt32(1), -9007199254740992.000000000 >= toUInt32(1) , toInt32(1) = -9007199254740992.000000000, toInt32(1) != -9007199254740992.000000000, toInt32(1) < -9007199254740992.000000000, toInt32(1) <= -9007199254740992.000000000, toInt32(1) > -9007199254740992.000000000, toInt32(1) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toInt32(1), -9007199254740992.000000000 != toInt32(1), -9007199254740992.000000000 < toInt32(1), -9007199254740992.000000000 <= toInt32(1), -9007199254740992.000000000 > toInt32(1), -9007199254740992.000000000 >= toInt32(1) , toUInt64(1) = -9007199254740992.000000000, toUInt64(1) != -9007199254740992.000000000, toUInt64(1) < -9007199254740992.000000000, toUInt64(1) <= -9007199254740992.000000000, toUInt64(1) > -9007199254740992.000000000, toUInt64(1) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toUInt64(1), -9007199254740992.000000000 != toUInt64(1), -9007199254740992.000000000 < toUInt64(1), -9007199254740992.000000000 <= toUInt64(1), -9007199254740992.000000000 > toUInt64(1), -9007199254740992.000000000 >= toUInt64(1) , toInt64(1) = -9007199254740992.000000000, toInt64(1) != -9007199254740992.000000000, toInt64(1) < -9007199254740992.000000000, toInt64(1) <= -9007199254740992.000000000, toInt64(1) > -9007199254740992.000000000, toInt64(1) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toInt64(1), -9007199254740992.000000000 != toInt64(1), -9007199254740992.000000000 < toInt64(1), -9007199254740992.000000000 <= toInt64(1), -9007199254740992.000000000 > toInt64(1), -9007199254740992.000000000 >= toInt64(1) ;
+SELECT '1', '-9007199254740994.000000000', 1 = -9007199254740994.000000000, 1 != -9007199254740994.000000000, 1 < -9007199254740994.000000000, 1 <= -9007199254740994.000000000, 1 > -9007199254740994.000000000, 1 >= -9007199254740994.000000000,	-9007199254740994.000000000 = 1, -9007199254740994.000000000 != 1, -9007199254740994.000000000 < 1, -9007199254740994.000000000 <= 1, -9007199254740994.000000000 > 1, -9007199254740994.000000000 >= 1 , toUInt8(1) = -9007199254740994.000000000, toUInt8(1) != -9007199254740994.000000000, toUInt8(1) < -9007199254740994.000000000, toUInt8(1) <= -9007199254740994.000000000, toUInt8(1) > -9007199254740994.000000000, toUInt8(1) >= -9007199254740994.000000000,	-9007199254740994.000000000 = toUInt8(1), -9007199254740994.000000000 != toUInt8(1), -9007199254740994.000000000 < toUInt8(1), -9007199254740994.000000000 <= toUInt8(1), -9007199254740994.000000000 > toUInt8(1), -9007199254740994.000000000 >= toUInt8(1) , toInt8(1) = -9007199254740994.000000000, toInt8(1) != -9007199254740994.000000000, toInt8(1) < -9007199254740994.000000000, toInt8(1) <= -9007199254740994.000000000, toInt8(1) > -9007199254740994.000000000, toInt8(1) >= -9007199254740994.000000000,	-9007199254740994.000000000 = toInt8(1), -9007199254740994.000000000 != toInt8(1), -9007199254740994.000000000 < toInt8(1), -9007199254740994.000000000 <= toInt8(1), -9007199254740994.000000000 > toInt8(1), -9007199254740994.000000000 >= toInt8(1) , toUInt16(1) = -9007199254740994.000000000, toUInt16(1) != -9007199254740994.000000000, toUInt16(1) < -9007199254740994.000000000, toUInt16(1) <= -9007199254740994.000000000, toUInt16(1) > -9007199254740994.000000000, toUInt16(1) >= -9007199254740994.000000000,	-9007199254740994.000000000 = toUInt16(1), -9007199254740994.000000000 != toUInt16(1), -9007199254740994.000000000 < toUInt16(1), -9007199254740994.000000000 <= toUInt16(1), -9007199254740994.000000000 > toUInt16(1), -9007199254740994.000000000 >= toUInt16(1) , toInt16(1) = -9007199254740994.000000000, toInt16(1) != -9007199254740994.000000000, toInt16(1) < -9007199254740994.000000000, toInt16(1) <= -9007199254740994.000000000, toInt16(1) > -9007199254740994.000000000, toInt16(1) >= -9007199254740994.000000000,	-9007199254740994.000000000 = toInt16(1), -9007199254740994.000000000 != toInt16(1), -9007199254740994.000000000 < toInt16(1), -9007199254740994.000000000 <= toInt16(1), -9007199254740994.000000000 > toInt16(1), -9007199254740994.000000000 >= toInt16(1) , toUInt32(1) = -9007199254740994.000000000, toUInt32(1) != -9007199254740994.000000000, toUInt32(1) < -9007199254740994.000000000, toUInt32(1) <= -9007199254740994.000000000, toUInt32(1) > -9007199254740994.000000000, toUInt32(1) >= -9007199254740994.000000000,	-9007199254740994.000000000 = toUInt32(1), -9007199254740994.000000000 != toUInt32(1), -9007199254740994.000000000 < toUInt32(1), -9007199254740994.000000000 <= toUInt32(1), -9007199254740994.000000000 > toUInt32(1), -9007199254740994.000000000 >= toUInt32(1) , toInt32(1) = -9007199254740994.000000000, toInt32(1) != -9007199254740994.000000000, toInt32(1) < -9007199254740994.000000000, toInt32(1) <= -9007199254740994.000000000, toInt32(1) > -9007199254740994.000000000, toInt32(1) >= -9007199254740994.000000000,	-9007199254740994.000000000 = toInt32(1), -9007199254740994.000000000 != toInt32(1), -9007199254740994.000000000 < toInt32(1), -9007199254740994.000000000 <= toInt32(1), -9007199254740994.000000000 > toInt32(1), -9007199254740994.000000000 >= toInt32(1) , toUInt64(1) = -9007199254740994.000000000, toUInt64(1) != -9007199254740994.000000000, toUInt64(1) < -9007199254740994.000000000, toUInt64(1) <= -9007199254740994.000000000, toUInt64(1) > -9007199254740994.000000000, toUInt64(1) >= -9007199254740994.000000000,	-9007199254740994.000000000 = toUInt64(1), -9007199254740994.000000000 != toUInt64(1), -9007199254740994.000000000 < toUInt64(1), -9007199254740994.000000000 <= toUInt64(1), -9007199254740994.000000000 > toUInt64(1), -9007199254740994.000000000 >= toUInt64(1) , toInt64(1) = -9007199254740994.000000000, toInt64(1) != -9007199254740994.000000000, toInt64(1) < -9007199254740994.000000000, toInt64(1) <= -9007199254740994.000000000, toInt64(1) > -9007199254740994.000000000, toInt64(1) >= -9007199254740994.000000000,	-9007199254740994.000000000 = toInt64(1), -9007199254740994.000000000 != toInt64(1), -9007199254740994.000000000 < toInt64(1), -9007199254740994.000000000 <= toInt64(1), -9007199254740994.000000000 > toInt64(1), -9007199254740994.000000000 >= toInt64(1) ;
+SELECT '1', '104.000000000', 1 = 104.000000000, 1 != 104.000000000, 1 < 104.000000000, 1 <= 104.000000000, 1 > 104.000000000, 1 >= 104.000000000,	104.000000000 = 1, 104.000000000 != 1, 104.000000000 < 1, 104.000000000 <= 1, 104.000000000 > 1, 104.000000000 >= 1 , toUInt8(1) = 104.000000000, toUInt8(1) != 104.000000000, toUInt8(1) < 104.000000000, toUInt8(1) <= 104.000000000, toUInt8(1) > 104.000000000, toUInt8(1) >= 104.000000000,	104.000000000 = toUInt8(1), 104.000000000 != toUInt8(1), 104.000000000 < toUInt8(1), 104.000000000 <= toUInt8(1), 104.000000000 > toUInt8(1), 104.000000000 >= toUInt8(1) , toInt8(1) = 104.000000000, toInt8(1) != 104.000000000, toInt8(1) < 104.000000000, toInt8(1) <= 104.000000000, toInt8(1) > 104.000000000, toInt8(1) >= 104.000000000,	104.000000000 = toInt8(1), 104.000000000 != toInt8(1), 104.000000000 < toInt8(1), 104.000000000 <= toInt8(1), 104.000000000 > toInt8(1), 104.000000000 >= toInt8(1) , toUInt16(1) = 104.000000000, toUInt16(1) != 104.000000000, toUInt16(1) < 104.000000000, toUInt16(1) <= 104.000000000, toUInt16(1) > 104.000000000, toUInt16(1) >= 104.000000000,	104.000000000 = toUInt16(1), 104.000000000 != toUInt16(1), 104.000000000 < toUInt16(1), 104.000000000 <= toUInt16(1), 104.000000000 > toUInt16(1), 104.000000000 >= toUInt16(1) , toInt16(1) = 104.000000000, toInt16(1) != 104.000000000, toInt16(1) < 104.000000000, toInt16(1) <= 104.000000000, toInt16(1) > 104.000000000, toInt16(1) >= 104.000000000,	104.000000000 = toInt16(1), 104.000000000 != toInt16(1), 104.000000000 < toInt16(1), 104.000000000 <= toInt16(1), 104.000000000 > toInt16(1), 104.000000000 >= toInt16(1) , toUInt32(1) = 104.000000000, toUInt32(1) != 104.000000000, toUInt32(1) < 104.000000000, toUInt32(1) <= 104.000000000, toUInt32(1) > 104.000000000, toUInt32(1) >= 104.000000000,	104.000000000 = toUInt32(1), 104.000000000 != toUInt32(1), 104.000000000 < toUInt32(1), 104.000000000 <= toUInt32(1), 104.000000000 > toUInt32(1), 104.000000000 >= toUInt32(1) , toInt32(1) = 104.000000000, toInt32(1) != 104.000000000, toInt32(1) < 104.000000000, toInt32(1) <= 104.000000000, toInt32(1) > 104.000000000, toInt32(1) >= 104.000000000,	104.000000000 = toInt32(1), 104.000000000 != toInt32(1), 104.000000000 < toInt32(1), 104.000000000 <= toInt32(1), 104.000000000 > toInt32(1), 104.000000000 >= toInt32(1) , toUInt64(1) = 104.000000000, toUInt64(1) != 104.000000000, toUInt64(1) < 104.000000000, toUInt64(1) <= 104.000000000, toUInt64(1) > 104.000000000, toUInt64(1) >= 104.000000000,	104.000000000 = toUInt64(1), 104.000000000 != toUInt64(1), 104.000000000 < toUInt64(1), 104.000000000 <= toUInt64(1), 104.000000000 > toUInt64(1), 104.000000000 >= toUInt64(1) , toInt64(1) = 104.000000000, toInt64(1) != 104.000000000, toInt64(1) < 104.000000000, toInt64(1) <= 104.000000000, toInt64(1) > 104.000000000, toInt64(1) >= 104.000000000,	104.000000000 = toInt64(1), 104.000000000 != toInt64(1), 104.000000000 < toInt64(1), 104.000000000 <= toInt64(1), 104.000000000 > toInt64(1), 104.000000000 >= toInt64(1) ;
+SELECT '1', '-4503599627370496.000000000', 1 = -4503599627370496.000000000, 1 != -4503599627370496.000000000, 1 < -4503599627370496.000000000, 1 <= -4503599627370496.000000000, 1 > -4503599627370496.000000000, 1 >= -4503599627370496.000000000,	-4503599627370496.000000000 = 1, -4503599627370496.000000000 != 1, -4503599627370496.000000000 < 1, -4503599627370496.000000000 <= 1, -4503599627370496.000000000 > 1, -4503599627370496.000000000 >= 1 , toUInt8(1) = -4503599627370496.000000000, toUInt8(1) != -4503599627370496.000000000, toUInt8(1) < -4503599627370496.000000000, toUInt8(1) <= -4503599627370496.000000000, toUInt8(1) > -4503599627370496.000000000, toUInt8(1) >= -4503599627370496.000000000,	-4503599627370496.000000000 = toUInt8(1), -4503599627370496.000000000 != toUInt8(1), -4503599627370496.000000000 < toUInt8(1), -4503599627370496.000000000 <= toUInt8(1), -4503599627370496.000000000 > toUInt8(1), -4503599627370496.000000000 >= toUInt8(1) , toInt8(1) = -4503599627370496.000000000, toInt8(1) != -4503599627370496.000000000, toInt8(1) < -4503599627370496.000000000, toInt8(1) <= -4503599627370496.000000000, toInt8(1) > -4503599627370496.000000000, toInt8(1) >= -4503599627370496.000000000,	-4503599627370496.000000000 = toInt8(1), -4503599627370496.000000000 != toInt8(1), -4503599627370496.000000000 < toInt8(1), -4503599627370496.000000000 <= toInt8(1), -4503599627370496.000000000 > toInt8(1), -4503599627370496.000000000 >= toInt8(1) , toUInt16(1) = -4503599627370496.000000000, toUInt16(1) != -4503599627370496.000000000, toUInt16(1) < -4503599627370496.000000000, toUInt16(1) <= -4503599627370496.000000000, toUInt16(1) > -4503599627370496.000000000, toUInt16(1) >= -4503599627370496.000000000,	-4503599627370496.000000000 = toUInt16(1), -4503599627370496.000000000 != toUInt16(1), -4503599627370496.000000000 < toUInt16(1), -4503599627370496.000000000 <= toUInt16(1), -4503599627370496.000000000 > toUInt16(1), -4503599627370496.000000000 >= toUInt16(1) , toInt16(1) = -4503599627370496.000000000, toInt16(1) != -4503599627370496.000000000, toInt16(1) < -4503599627370496.000000000, toInt16(1) <= -4503599627370496.000000000, toInt16(1) > -4503599627370496.000000000, toInt16(1) >= -4503599627370496.000000000,	-4503599627370496.000000000 = toInt16(1), -4503599627370496.000000000 != toInt16(1), -4503599627370496.000000000 < toInt16(1), -4503599627370496.000000000 <= toInt16(1), -4503599627370496.000000000 > toInt16(1), -4503599627370496.000000000 >= toInt16(1) , toUInt32(1) = -4503599627370496.000000000, toUInt32(1) != -4503599627370496.000000000, toUInt32(1) < -4503599627370496.000000000, toUInt32(1) <= -4503599627370496.000000000, toUInt32(1) > -4503599627370496.000000000, toUInt32(1) >= -4503599627370496.000000000,	-4503599627370496.000000000 = toUInt32(1), -4503599627370496.000000000 != toUInt32(1), -4503599627370496.000000000 < toUInt32(1), -4503599627370496.000000000 <= toUInt32(1), -4503599627370496.000000000 > toUInt32(1), -4503599627370496.000000000 >= toUInt32(1) , toInt32(1) = -4503599627370496.000000000, toInt32(1) != -4503599627370496.000000000, toInt32(1) < -4503599627370496.000000000, toInt32(1) <= -4503599627370496.000000000, toInt32(1) > -4503599627370496.000000000, toInt32(1) >= -4503599627370496.000000000,	-4503599627370496.000000000 = toInt32(1), -4503599627370496.000000000 != toInt32(1), -4503599627370496.000000000 < toInt32(1), -4503599627370496.000000000 <= toInt32(1), -4503599627370496.000000000 > toInt32(1), -4503599627370496.000000000 >= toInt32(1) , toUInt64(1) = -4503599627370496.000000000, toUInt64(1) != -4503599627370496.000000000, toUInt64(1) < -4503599627370496.000000000, toUInt64(1) <= -4503599627370496.000000000, toUInt64(1) > -4503599627370496.000000000, toUInt64(1) >= -4503599627370496.000000000,	-4503599627370496.000000000 = toUInt64(1), -4503599627370496.000000000 != toUInt64(1), -4503599627370496.000000000 < toUInt64(1), -4503599627370496.000000000 <= toUInt64(1), -4503599627370496.000000000 > toUInt64(1), -4503599627370496.000000000 >= toUInt64(1) , toInt64(1) = -4503599627370496.000000000, toInt64(1) != -4503599627370496.000000000, toInt64(1) < -4503599627370496.000000000, toInt64(1) <= -4503599627370496.000000000, toInt64(1) > -4503599627370496.000000000, toInt64(1) >= -4503599627370496.000000000,	-4503599627370496.000000000 = toInt64(1), -4503599627370496.000000000 != toInt64(1), -4503599627370496.000000000 < toInt64(1), -4503599627370496.000000000 <= toInt64(1), -4503599627370496.000000000 > toInt64(1), -4503599627370496.000000000 >= toInt64(1) ;
+SELECT '1', '-0.500000000', 1 = -0.500000000, 1 != -0.500000000, 1 < -0.500000000, 1 <= -0.500000000, 1 > -0.500000000, 1 >= -0.500000000,	-0.500000000 = 1, -0.500000000 != 1, -0.500000000 < 1, -0.500000000 <= 1, -0.500000000 > 1, -0.500000000 >= 1 , toUInt8(1) = -0.500000000, toUInt8(1) != -0.500000000, toUInt8(1) < -0.500000000, toUInt8(1) <= -0.500000000, toUInt8(1) > -0.500000000, toUInt8(1) >= -0.500000000,	-0.500000000 = toUInt8(1), -0.500000000 != toUInt8(1), -0.500000000 < toUInt8(1), -0.500000000 <= toUInt8(1), -0.500000000 > toUInt8(1), -0.500000000 >= toUInt8(1) , toInt8(1) = -0.500000000, toInt8(1) != -0.500000000, toInt8(1) < -0.500000000, toInt8(1) <= -0.500000000, toInt8(1) > -0.500000000, toInt8(1) >= -0.500000000,	-0.500000000 = toInt8(1), -0.500000000 != toInt8(1), -0.500000000 < toInt8(1), -0.500000000 <= toInt8(1), -0.500000000 > toInt8(1), -0.500000000 >= toInt8(1) , toUInt16(1) = -0.500000000, toUInt16(1) != -0.500000000, toUInt16(1) < -0.500000000, toUInt16(1) <= -0.500000000, toUInt16(1) > -0.500000000, toUInt16(1) >= -0.500000000,	-0.500000000 = toUInt16(1), -0.500000000 != toUInt16(1), -0.500000000 < toUInt16(1), -0.500000000 <= toUInt16(1), -0.500000000 > toUInt16(1), -0.500000000 >= toUInt16(1) , toInt16(1) = -0.500000000, toInt16(1) != -0.500000000, toInt16(1) < -0.500000000, toInt16(1) <= -0.500000000, toInt16(1) > -0.500000000, toInt16(1) >= -0.500000000,	-0.500000000 = toInt16(1), -0.500000000 != toInt16(1), -0.500000000 < toInt16(1), -0.500000000 <= toInt16(1), -0.500000000 > toInt16(1), -0.500000000 >= toInt16(1) , toUInt32(1) = -0.500000000, toUInt32(1) != -0.500000000, toUInt32(1) < -0.500000000, toUInt32(1) <= -0.500000000, toUInt32(1) > -0.500000000, toUInt32(1) >= -0.500000000,	-0.500000000 = toUInt32(1), -0.500000000 != toUInt32(1), -0.500000000 < toUInt32(1), -0.500000000 <= toUInt32(1), -0.500000000 > toUInt32(1), -0.500000000 >= toUInt32(1) , toInt32(1) = -0.500000000, toInt32(1) != -0.500000000, toInt32(1) < -0.500000000, toInt32(1) <= -0.500000000, toInt32(1) > -0.500000000, toInt32(1) >= -0.500000000,	-0.500000000 = toInt32(1), -0.500000000 != toInt32(1), -0.500000000 < toInt32(1), -0.500000000 <= toInt32(1), -0.500000000 > toInt32(1), -0.500000000 >= toInt32(1) , toUInt64(1) = -0.500000000, toUInt64(1) != -0.500000000, toUInt64(1) < -0.500000000, toUInt64(1) <= -0.500000000, toUInt64(1) > -0.500000000, toUInt64(1) >= -0.500000000,	-0.500000000 = toUInt64(1), -0.500000000 != toUInt64(1), -0.500000000 < toUInt64(1), -0.500000000 <= toUInt64(1), -0.500000000 > toUInt64(1), -0.500000000 >= toUInt64(1) , toInt64(1) = -0.500000000, toInt64(1) != -0.500000000, toInt64(1) < -0.500000000, toInt64(1) <= -0.500000000, toInt64(1) > -0.500000000, toInt64(1) >= -0.500000000,	-0.500000000 = toInt64(1), -0.500000000 != toInt64(1), -0.500000000 < toInt64(1), -0.500000000 <= toInt64(1), -0.500000000 > toInt64(1), -0.500000000 >= toInt64(1) ;
+SELECT '1', '0.500000000', 1 = 0.500000000, 1 != 0.500000000, 1 < 0.500000000, 1 <= 0.500000000, 1 > 0.500000000, 1 >= 0.500000000,	0.500000000 = 1, 0.500000000 != 1, 0.500000000 < 1, 0.500000000 <= 1, 0.500000000 > 1, 0.500000000 >= 1 , toUInt8(1) = 0.500000000, toUInt8(1) != 0.500000000, toUInt8(1) < 0.500000000, toUInt8(1) <= 0.500000000, toUInt8(1) > 0.500000000, toUInt8(1) >= 0.500000000,	0.500000000 = toUInt8(1), 0.500000000 != toUInt8(1), 0.500000000 < toUInt8(1), 0.500000000 <= toUInt8(1), 0.500000000 > toUInt8(1), 0.500000000 >= toUInt8(1) , toInt8(1) = 0.500000000, toInt8(1) != 0.500000000, toInt8(1) < 0.500000000, toInt8(1) <= 0.500000000, toInt8(1) > 0.500000000, toInt8(1) >= 0.500000000,	0.500000000 = toInt8(1), 0.500000000 != toInt8(1), 0.500000000 < toInt8(1), 0.500000000 <= toInt8(1), 0.500000000 > toInt8(1), 0.500000000 >= toInt8(1) , toUInt16(1) = 0.500000000, toUInt16(1) != 0.500000000, toUInt16(1) < 0.500000000, toUInt16(1) <= 0.500000000, toUInt16(1) > 0.500000000, toUInt16(1) >= 0.500000000,	0.500000000 = toUInt16(1), 0.500000000 != toUInt16(1), 0.500000000 < toUInt16(1), 0.500000000 <= toUInt16(1), 0.500000000 > toUInt16(1), 0.500000000 >= toUInt16(1) , toInt16(1) = 0.500000000, toInt16(1) != 0.500000000, toInt16(1) < 0.500000000, toInt16(1) <= 0.500000000, toInt16(1) > 0.500000000, toInt16(1) >= 0.500000000,	0.500000000 = toInt16(1), 0.500000000 != toInt16(1), 0.500000000 < toInt16(1), 0.500000000 <= toInt16(1), 0.500000000 > toInt16(1), 0.500000000 >= toInt16(1) , toUInt32(1) = 0.500000000, toUInt32(1) != 0.500000000, toUInt32(1) < 0.500000000, toUInt32(1) <= 0.500000000, toUInt32(1) > 0.500000000, toUInt32(1) >= 0.500000000,	0.500000000 = toUInt32(1), 0.500000000 != toUInt32(1), 0.500000000 < toUInt32(1), 0.500000000 <= toUInt32(1), 0.500000000 > toUInt32(1), 0.500000000 >= toUInt32(1) , toInt32(1) = 0.500000000, toInt32(1) != 0.500000000, toInt32(1) < 0.500000000, toInt32(1) <= 0.500000000, toInt32(1) > 0.500000000, toInt32(1) >= 0.500000000,	0.500000000 = toInt32(1), 0.500000000 != toInt32(1), 0.500000000 < toInt32(1), 0.500000000 <= toInt32(1), 0.500000000 > toInt32(1), 0.500000000 >= toInt32(1) , toUInt64(1) = 0.500000000, toUInt64(1) != 0.500000000, toUInt64(1) < 0.500000000, toUInt64(1) <= 0.500000000, toUInt64(1) > 0.500000000, toUInt64(1) >= 0.500000000,	0.500000000 = toUInt64(1), 0.500000000 != toUInt64(1), 0.500000000 < toUInt64(1), 0.500000000 <= toUInt64(1), 0.500000000 > toUInt64(1), 0.500000000 >= toUInt64(1) , toInt64(1) = 0.500000000, toInt64(1) != 0.500000000, toInt64(1) < 0.500000000, toInt64(1) <= 0.500000000, toInt64(1) > 0.500000000, toInt64(1) >= 0.500000000,	0.500000000 = toInt64(1), 0.500000000 != toInt64(1), 0.500000000 < toInt64(1), 0.500000000 <= toInt64(1), 0.500000000 > toInt64(1), 0.500000000 >= toInt64(1) ;
+SELECT '1', '-1.500000000', 1 = -1.500000000, 1 != -1.500000000, 1 < -1.500000000, 1 <= -1.500000000, 1 > -1.500000000, 1 >= -1.500000000,	-1.500000000 = 1, -1.500000000 != 1, -1.500000000 < 1, -1.500000000 <= 1, -1.500000000 > 1, -1.500000000 >= 1 , toUInt8(1) = -1.500000000, toUInt8(1) != -1.500000000, toUInt8(1) < -1.500000000, toUInt8(1) <= -1.500000000, toUInt8(1) > -1.500000000, toUInt8(1) >= -1.500000000,	-1.500000000 = toUInt8(1), -1.500000000 != toUInt8(1), -1.500000000 < toUInt8(1), -1.500000000 <= toUInt8(1), -1.500000000 > toUInt8(1), -1.500000000 >= toUInt8(1) , toInt8(1) = -1.500000000, toInt8(1) != -1.500000000, toInt8(1) < -1.500000000, toInt8(1) <= -1.500000000, toInt8(1) > -1.500000000, toInt8(1) >= -1.500000000,	-1.500000000 = toInt8(1), -1.500000000 != toInt8(1), -1.500000000 < toInt8(1), -1.500000000 <= toInt8(1), -1.500000000 > toInt8(1), -1.500000000 >= toInt8(1) , toUInt16(1) = -1.500000000, toUInt16(1) != -1.500000000, toUInt16(1) < -1.500000000, toUInt16(1) <= -1.500000000, toUInt16(1) > -1.500000000, toUInt16(1) >= -1.500000000,	-1.500000000 = toUInt16(1), -1.500000000 != toUInt16(1), -1.500000000 < toUInt16(1), -1.500000000 <= toUInt16(1), -1.500000000 > toUInt16(1), -1.500000000 >= toUInt16(1) , toInt16(1) = -1.500000000, toInt16(1) != -1.500000000, toInt16(1) < -1.500000000, toInt16(1) <= -1.500000000, toInt16(1) > -1.500000000, toInt16(1) >= -1.500000000,	-1.500000000 = toInt16(1), -1.500000000 != toInt16(1), -1.500000000 < toInt16(1), -1.500000000 <= toInt16(1), -1.500000000 > toInt16(1), -1.500000000 >= toInt16(1) , toUInt32(1) = -1.500000000, toUInt32(1) != -1.500000000, toUInt32(1) < -1.500000000, toUInt32(1) <= -1.500000000, toUInt32(1) > -1.500000000, toUInt32(1) >= -1.500000000,	-1.500000000 = toUInt32(1), -1.500000000 != toUInt32(1), -1.500000000 < toUInt32(1), -1.500000000 <= toUInt32(1), -1.500000000 > toUInt32(1), -1.500000000 >= toUInt32(1) , toInt32(1) = -1.500000000, toInt32(1) != -1.500000000, toInt32(1) < -1.500000000, toInt32(1) <= -1.500000000, toInt32(1) > -1.500000000, toInt32(1) >= -1.500000000,	-1.500000000 = toInt32(1), -1.500000000 != toInt32(1), -1.500000000 < toInt32(1), -1.500000000 <= toInt32(1), -1.500000000 > toInt32(1), -1.500000000 >= toInt32(1) , toUInt64(1) = -1.500000000, toUInt64(1) != -1.500000000, toUInt64(1) < -1.500000000, toUInt64(1) <= -1.500000000, toUInt64(1) > -1.500000000, toUInt64(1) >= -1.500000000,	-1.500000000 = toUInt64(1), -1.500000000 != toUInt64(1), -1.500000000 < toUInt64(1), -1.500000000 <= toUInt64(1), -1.500000000 > toUInt64(1), -1.500000000 >= toUInt64(1) , toInt64(1) = -1.500000000, toInt64(1) != -1.500000000, toInt64(1) < -1.500000000, toInt64(1) <= -1.500000000, toInt64(1) > -1.500000000, toInt64(1) >= -1.500000000,	-1.500000000 = toInt64(1), -1.500000000 != toInt64(1), -1.500000000 < toInt64(1), -1.500000000 <= toInt64(1), -1.500000000 > toInt64(1), -1.500000000 >= toInt64(1) ;
+SELECT '1', '1.500000000', 1 = 1.500000000, 1 != 1.500000000, 1 < 1.500000000, 1 <= 1.500000000, 1 > 1.500000000, 1 >= 1.500000000,	1.500000000 = 1, 1.500000000 != 1, 1.500000000 < 1, 1.500000000 <= 1, 1.500000000 > 1, 1.500000000 >= 1 , toUInt8(1) = 1.500000000, toUInt8(1) != 1.500000000, toUInt8(1) < 1.500000000, toUInt8(1) <= 1.500000000, toUInt8(1) > 1.500000000, toUInt8(1) >= 1.500000000,	1.500000000 = toUInt8(1), 1.500000000 != toUInt8(1), 1.500000000 < toUInt8(1), 1.500000000 <= toUInt8(1), 1.500000000 > toUInt8(1), 1.500000000 >= toUInt8(1) , toInt8(1) = 1.500000000, toInt8(1) != 1.500000000, toInt8(1) < 1.500000000, toInt8(1) <= 1.500000000, toInt8(1) > 1.500000000, toInt8(1) >= 1.500000000,	1.500000000 = toInt8(1), 1.500000000 != toInt8(1), 1.500000000 < toInt8(1), 1.500000000 <= toInt8(1), 1.500000000 > toInt8(1), 1.500000000 >= toInt8(1) , toUInt16(1) = 1.500000000, toUInt16(1) != 1.500000000, toUInt16(1) < 1.500000000, toUInt16(1) <= 1.500000000, toUInt16(1) > 1.500000000, toUInt16(1) >= 1.500000000,	1.500000000 = toUInt16(1), 1.500000000 != toUInt16(1), 1.500000000 < toUInt16(1), 1.500000000 <= toUInt16(1), 1.500000000 > toUInt16(1), 1.500000000 >= toUInt16(1) , toInt16(1) = 1.500000000, toInt16(1) != 1.500000000, toInt16(1) < 1.500000000, toInt16(1) <= 1.500000000, toInt16(1) > 1.500000000, toInt16(1) >= 1.500000000,	1.500000000 = toInt16(1), 1.500000000 != toInt16(1), 1.500000000 < toInt16(1), 1.500000000 <= toInt16(1), 1.500000000 > toInt16(1), 1.500000000 >= toInt16(1) , toUInt32(1) = 1.500000000, toUInt32(1) != 1.500000000, toUInt32(1) < 1.500000000, toUInt32(1) <= 1.500000000, toUInt32(1) > 1.500000000, toUInt32(1) >= 1.500000000,	1.500000000 = toUInt32(1), 1.500000000 != toUInt32(1), 1.500000000 < toUInt32(1), 1.500000000 <= toUInt32(1), 1.500000000 > toUInt32(1), 1.500000000 >= toUInt32(1) , toInt32(1) = 1.500000000, toInt32(1) != 1.500000000, toInt32(1) < 1.500000000, toInt32(1) <= 1.500000000, toInt32(1) > 1.500000000, toInt32(1) >= 1.500000000,	1.500000000 = toInt32(1), 1.500000000 != toInt32(1), 1.500000000 < toInt32(1), 1.500000000 <= toInt32(1), 1.500000000 > toInt32(1), 1.500000000 >= toInt32(1) , toUInt64(1) = 1.500000000, toUInt64(1) != 1.500000000, toUInt64(1) < 1.500000000, toUInt64(1) <= 1.500000000, toUInt64(1) > 1.500000000, toUInt64(1) >= 1.500000000,	1.500000000 = toUInt64(1), 1.500000000 != toUInt64(1), 1.500000000 < toUInt64(1), 1.500000000 <= toUInt64(1), 1.500000000 > toUInt64(1), 1.500000000 >= toUInt64(1) , toInt64(1) = 1.500000000, toInt64(1) != 1.500000000, toInt64(1) < 1.500000000, toInt64(1) <= 1.500000000, toInt64(1) > 1.500000000, toInt64(1) >= 1.500000000,	1.500000000 = toInt64(1), 1.500000000 != toInt64(1), 1.500000000 < toInt64(1), 1.500000000 <= toInt64(1), 1.500000000 > toInt64(1), 1.500000000 >= toInt64(1) ;
+SELECT '1', '9007199254740992.000000000', 1 = 9007199254740992.000000000, 1 != 9007199254740992.000000000, 1 < 9007199254740992.000000000, 1 <= 9007199254740992.000000000, 1 > 9007199254740992.000000000, 1 >= 9007199254740992.000000000,	9007199254740992.000000000 = 1, 9007199254740992.000000000 != 1, 9007199254740992.000000000 < 1, 9007199254740992.000000000 <= 1, 9007199254740992.000000000 > 1, 9007199254740992.000000000 >= 1 , toUInt8(1) = 9007199254740992.000000000, toUInt8(1) != 9007199254740992.000000000, toUInt8(1) < 9007199254740992.000000000, toUInt8(1) <= 9007199254740992.000000000, toUInt8(1) > 9007199254740992.000000000, toUInt8(1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toUInt8(1), 9007199254740992.000000000 != toUInt8(1), 9007199254740992.000000000 < toUInt8(1), 9007199254740992.000000000 <= toUInt8(1), 9007199254740992.000000000 > toUInt8(1), 9007199254740992.000000000 >= toUInt8(1) , toInt8(1) = 9007199254740992.000000000, toInt8(1) != 9007199254740992.000000000, toInt8(1) < 9007199254740992.000000000, toInt8(1) <= 9007199254740992.000000000, toInt8(1) > 9007199254740992.000000000, toInt8(1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt8(1), 9007199254740992.000000000 != toInt8(1), 9007199254740992.000000000 < toInt8(1), 9007199254740992.000000000 <= toInt8(1), 9007199254740992.000000000 > toInt8(1), 9007199254740992.000000000 >= toInt8(1) , toUInt16(1) = 9007199254740992.000000000, toUInt16(1) != 9007199254740992.000000000, toUInt16(1) < 9007199254740992.000000000, toUInt16(1) <= 9007199254740992.000000000, toUInt16(1) > 9007199254740992.000000000, toUInt16(1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toUInt16(1), 9007199254740992.000000000 != toUInt16(1), 9007199254740992.000000000 < toUInt16(1), 9007199254740992.000000000 <= toUInt16(1), 9007199254740992.000000000 > toUInt16(1), 9007199254740992.000000000 >= toUInt16(1) , toInt16(1) = 9007199254740992.000000000, toInt16(1) != 9007199254740992.000000000, toInt16(1) < 9007199254740992.000000000, toInt16(1) <= 9007199254740992.000000000, toInt16(1) > 9007199254740992.000000000, toInt16(1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt16(1), 9007199254740992.000000000 != toInt16(1), 9007199254740992.000000000 < toInt16(1), 9007199254740992.000000000 <= toInt16(1), 9007199254740992.000000000 > toInt16(1), 9007199254740992.000000000 >= toInt16(1) , toUInt32(1) = 9007199254740992.000000000, toUInt32(1) != 9007199254740992.000000000, toUInt32(1) < 9007199254740992.000000000, toUInt32(1) <= 9007199254740992.000000000, toUInt32(1) > 9007199254740992.000000000, toUInt32(1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toUInt32(1), 9007199254740992.000000000 != toUInt32(1), 9007199254740992.000000000 < toUInt32(1), 9007199254740992.000000000 <= toUInt32(1), 9007199254740992.000000000 > toUInt32(1), 9007199254740992.000000000 >= toUInt32(1) , toInt32(1) = 9007199254740992.000000000, toInt32(1) != 9007199254740992.000000000, toInt32(1) < 9007199254740992.000000000, toInt32(1) <= 9007199254740992.000000000, toInt32(1) > 9007199254740992.000000000, toInt32(1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt32(1), 9007199254740992.000000000 != toInt32(1), 9007199254740992.000000000 < toInt32(1), 9007199254740992.000000000 <= toInt32(1), 9007199254740992.000000000 > toInt32(1), 9007199254740992.000000000 >= toInt32(1) , toUInt64(1) = 9007199254740992.000000000, toUInt64(1) != 9007199254740992.000000000, toUInt64(1) < 9007199254740992.000000000, toUInt64(1) <= 9007199254740992.000000000, toUInt64(1) > 9007199254740992.000000000, toUInt64(1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toUInt64(1), 9007199254740992.000000000 != toUInt64(1), 9007199254740992.000000000 < toUInt64(1), 9007199254740992.000000000 <= toUInt64(1), 9007199254740992.000000000 > toUInt64(1), 9007199254740992.000000000 >= toUInt64(1) , toInt64(1) = 9007199254740992.000000000, toInt64(1) != 9007199254740992.000000000, toInt64(1) < 9007199254740992.000000000, toInt64(1) <= 9007199254740992.000000000, toInt64(1) > 9007199254740992.000000000, toInt64(1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt64(1), 9007199254740992.000000000 != toInt64(1), 9007199254740992.000000000 < toInt64(1), 9007199254740992.000000000 <= toInt64(1), 9007199254740992.000000000 > toInt64(1), 9007199254740992.000000000 >= toInt64(1) ;
+SELECT '1', '2251799813685247.500000000', 1 = 2251799813685247.500000000, 1 != 2251799813685247.500000000, 1 < 2251799813685247.500000000, 1 <= 2251799813685247.500000000, 1 > 2251799813685247.500000000, 1 >= 2251799813685247.500000000,	2251799813685247.500000000 = 1, 2251799813685247.500000000 != 1, 2251799813685247.500000000 < 1, 2251799813685247.500000000 <= 1, 2251799813685247.500000000 > 1, 2251799813685247.500000000 >= 1 , toUInt8(1) = 2251799813685247.500000000, toUInt8(1) != 2251799813685247.500000000, toUInt8(1) < 2251799813685247.500000000, toUInt8(1) <= 2251799813685247.500000000, toUInt8(1) > 2251799813685247.500000000, toUInt8(1) >= 2251799813685247.500000000,	2251799813685247.500000000 = toUInt8(1), 2251799813685247.500000000 != toUInt8(1), 2251799813685247.500000000 < toUInt8(1), 2251799813685247.500000000 <= toUInt8(1), 2251799813685247.500000000 > toUInt8(1), 2251799813685247.500000000 >= toUInt8(1) , toInt8(1) = 2251799813685247.500000000, toInt8(1) != 2251799813685247.500000000, toInt8(1) < 2251799813685247.500000000, toInt8(1) <= 2251799813685247.500000000, toInt8(1) > 2251799813685247.500000000, toInt8(1) >= 2251799813685247.500000000,	2251799813685247.500000000 = toInt8(1), 2251799813685247.500000000 != toInt8(1), 2251799813685247.500000000 < toInt8(1), 2251799813685247.500000000 <= toInt8(1), 2251799813685247.500000000 > toInt8(1), 2251799813685247.500000000 >= toInt8(1) , toUInt16(1) = 2251799813685247.500000000, toUInt16(1) != 2251799813685247.500000000, toUInt16(1) < 2251799813685247.500000000, toUInt16(1) <= 2251799813685247.500000000, toUInt16(1) > 2251799813685247.500000000, toUInt16(1) >= 2251799813685247.500000000,	2251799813685247.500000000 = toUInt16(1), 2251799813685247.500000000 != toUInt16(1), 2251799813685247.500000000 < toUInt16(1), 2251799813685247.500000000 <= toUInt16(1), 2251799813685247.500000000 > toUInt16(1), 2251799813685247.500000000 >= toUInt16(1) , toInt16(1) = 2251799813685247.500000000, toInt16(1) != 2251799813685247.500000000, toInt16(1) < 2251799813685247.500000000, toInt16(1) <= 2251799813685247.500000000, toInt16(1) > 2251799813685247.500000000, toInt16(1) >= 2251799813685247.500000000,	2251799813685247.500000000 = toInt16(1), 2251799813685247.500000000 != toInt16(1), 2251799813685247.500000000 < toInt16(1), 2251799813685247.500000000 <= toInt16(1), 2251799813685247.500000000 > toInt16(1), 2251799813685247.500000000 >= toInt16(1) , toUInt32(1) = 2251799813685247.500000000, toUInt32(1) != 2251799813685247.500000000, toUInt32(1) < 2251799813685247.500000000, toUInt32(1) <= 2251799813685247.500000000, toUInt32(1) > 2251799813685247.500000000, toUInt32(1) >= 2251799813685247.500000000,	2251799813685247.500000000 = toUInt32(1), 2251799813685247.500000000 != toUInt32(1), 2251799813685247.500000000 < toUInt32(1), 2251799813685247.500000000 <= toUInt32(1), 2251799813685247.500000000 > toUInt32(1), 2251799813685247.500000000 >= toUInt32(1) , toInt32(1) = 2251799813685247.500000000, toInt32(1) != 2251799813685247.500000000, toInt32(1) < 2251799813685247.500000000, toInt32(1) <= 2251799813685247.500000000, toInt32(1) > 2251799813685247.500000000, toInt32(1) >= 2251799813685247.500000000,	2251799813685247.500000000 = toInt32(1), 2251799813685247.500000000 != toInt32(1), 2251799813685247.500000000 < toInt32(1), 2251799813685247.500000000 <= toInt32(1), 2251799813685247.500000000 > toInt32(1), 2251799813685247.500000000 >= toInt32(1) , toUInt64(1) = 2251799813685247.500000000, toUInt64(1) != 2251799813685247.500000000, toUInt64(1) < 2251799813685247.500000000, toUInt64(1) <= 2251799813685247.500000000, toUInt64(1) > 2251799813685247.500000000, toUInt64(1) >= 2251799813685247.500000000,	2251799813685247.500000000 = toUInt64(1), 2251799813685247.500000000 != toUInt64(1), 2251799813685247.500000000 < toUInt64(1), 2251799813685247.500000000 <= toUInt64(1), 2251799813685247.500000000 > toUInt64(1), 2251799813685247.500000000 >= toUInt64(1) , toInt64(1) = 2251799813685247.500000000, toInt64(1) != 2251799813685247.500000000, toInt64(1) < 2251799813685247.500000000, toInt64(1) <= 2251799813685247.500000000, toInt64(1) > 2251799813685247.500000000, toInt64(1) >= 2251799813685247.500000000,	2251799813685247.500000000 = toInt64(1), 2251799813685247.500000000 != toInt64(1), 2251799813685247.500000000 < toInt64(1), 2251799813685247.500000000 <= toInt64(1), 2251799813685247.500000000 > toInt64(1), 2251799813685247.500000000 >= toInt64(1) ;
+SELECT '1', '2251799813685248.500000000', 1 = 2251799813685248.500000000, 1 != 2251799813685248.500000000, 1 < 2251799813685248.500000000, 1 <= 2251799813685248.500000000, 1 > 2251799813685248.500000000, 1 >= 2251799813685248.500000000,	2251799813685248.500000000 = 1, 2251799813685248.500000000 != 1, 2251799813685248.500000000 < 1, 2251799813685248.500000000 <= 1, 2251799813685248.500000000 > 1, 2251799813685248.500000000 >= 1 , toUInt8(1) = 2251799813685248.500000000, toUInt8(1) != 2251799813685248.500000000, toUInt8(1) < 2251799813685248.500000000, toUInt8(1) <= 2251799813685248.500000000, toUInt8(1) > 2251799813685248.500000000, toUInt8(1) >= 2251799813685248.500000000,	2251799813685248.500000000 = toUInt8(1), 2251799813685248.500000000 != toUInt8(1), 2251799813685248.500000000 < toUInt8(1), 2251799813685248.500000000 <= toUInt8(1), 2251799813685248.500000000 > toUInt8(1), 2251799813685248.500000000 >= toUInt8(1) , toInt8(1) = 2251799813685248.500000000, toInt8(1) != 2251799813685248.500000000, toInt8(1) < 2251799813685248.500000000, toInt8(1) <= 2251799813685248.500000000, toInt8(1) > 2251799813685248.500000000, toInt8(1) >= 2251799813685248.500000000,	2251799813685248.500000000 = toInt8(1), 2251799813685248.500000000 != toInt8(1), 2251799813685248.500000000 < toInt8(1), 2251799813685248.500000000 <= toInt8(1), 2251799813685248.500000000 > toInt8(1), 2251799813685248.500000000 >= toInt8(1) , toUInt16(1) = 2251799813685248.500000000, toUInt16(1) != 2251799813685248.500000000, toUInt16(1) < 2251799813685248.500000000, toUInt16(1) <= 2251799813685248.500000000, toUInt16(1) > 2251799813685248.500000000, toUInt16(1) >= 2251799813685248.500000000,	2251799813685248.500000000 = toUInt16(1), 2251799813685248.500000000 != toUInt16(1), 2251799813685248.500000000 < toUInt16(1), 2251799813685248.500000000 <= toUInt16(1), 2251799813685248.500000000 > toUInt16(1), 2251799813685248.500000000 >= toUInt16(1) , toInt16(1) = 2251799813685248.500000000, toInt16(1) != 2251799813685248.500000000, toInt16(1) < 2251799813685248.500000000, toInt16(1) <= 2251799813685248.500000000, toInt16(1) > 2251799813685248.500000000, toInt16(1) >= 2251799813685248.500000000,	2251799813685248.500000000 = toInt16(1), 2251799813685248.500000000 != toInt16(1), 2251799813685248.500000000 < toInt16(1), 2251799813685248.500000000 <= toInt16(1), 2251799813685248.500000000 > toInt16(1), 2251799813685248.500000000 >= toInt16(1) , toUInt32(1) = 2251799813685248.500000000, toUInt32(1) != 2251799813685248.500000000, toUInt32(1) < 2251799813685248.500000000, toUInt32(1) <= 2251799813685248.500000000, toUInt32(1) > 2251799813685248.500000000, toUInt32(1) >= 2251799813685248.500000000,	2251799813685248.500000000 = toUInt32(1), 2251799813685248.500000000 != toUInt32(1), 2251799813685248.500000000 < toUInt32(1), 2251799813685248.500000000 <= toUInt32(1), 2251799813685248.500000000 > toUInt32(1), 2251799813685248.500000000 >= toUInt32(1) , toInt32(1) = 2251799813685248.500000000, toInt32(1) != 2251799813685248.500000000, toInt32(1) < 2251799813685248.500000000, toInt32(1) <= 2251799813685248.500000000, toInt32(1) > 2251799813685248.500000000, toInt32(1) >= 2251799813685248.500000000,	2251799813685248.500000000 = toInt32(1), 2251799813685248.500000000 != toInt32(1), 2251799813685248.500000000 < toInt32(1), 2251799813685248.500000000 <= toInt32(1), 2251799813685248.500000000 > toInt32(1), 2251799813685248.500000000 >= toInt32(1) , toUInt64(1) = 2251799813685248.500000000, toUInt64(1) != 2251799813685248.500000000, toUInt64(1) < 2251799813685248.500000000, toUInt64(1) <= 2251799813685248.500000000, toUInt64(1) > 2251799813685248.500000000, toUInt64(1) >= 2251799813685248.500000000,	2251799813685248.500000000 = toUInt64(1), 2251799813685248.500000000 != toUInt64(1), 2251799813685248.500000000 < toUInt64(1), 2251799813685248.500000000 <= toUInt64(1), 2251799813685248.500000000 > toUInt64(1), 2251799813685248.500000000 >= toUInt64(1) , toInt64(1) = 2251799813685248.500000000, toInt64(1) != 2251799813685248.500000000, toInt64(1) < 2251799813685248.500000000, toInt64(1) <= 2251799813685248.500000000, toInt64(1) > 2251799813685248.500000000, toInt64(1) >= 2251799813685248.500000000,	2251799813685248.500000000 = toInt64(1), 2251799813685248.500000000 != toInt64(1), 2251799813685248.500000000 < toInt64(1), 2251799813685248.500000000 <= toInt64(1), 2251799813685248.500000000 > toInt64(1), 2251799813685248.500000000 >= toInt64(1) ;
+SELECT '1', '1152921504606846976.000000000', 1 = 1152921504606846976.000000000, 1 != 1152921504606846976.000000000, 1 < 1152921504606846976.000000000, 1 <= 1152921504606846976.000000000, 1 > 1152921504606846976.000000000, 1 >= 1152921504606846976.000000000,	1152921504606846976.000000000 = 1, 1152921504606846976.000000000 != 1, 1152921504606846976.000000000 < 1, 1152921504606846976.000000000 <= 1, 1152921504606846976.000000000 > 1, 1152921504606846976.000000000 >= 1 , toUInt8(1) = 1152921504606846976.000000000, toUInt8(1) != 1152921504606846976.000000000, toUInt8(1) < 1152921504606846976.000000000, toUInt8(1) <= 1152921504606846976.000000000, toUInt8(1) > 1152921504606846976.000000000, toUInt8(1) >= 1152921504606846976.000000000,	1152921504606846976.000000000 = toUInt8(1), 1152921504606846976.000000000 != toUInt8(1), 1152921504606846976.000000000 < toUInt8(1), 1152921504606846976.000000000 <= toUInt8(1), 1152921504606846976.000000000 > toUInt8(1), 1152921504606846976.000000000 >= toUInt8(1) , toInt8(1) = 1152921504606846976.000000000, toInt8(1) != 1152921504606846976.000000000, toInt8(1) < 1152921504606846976.000000000, toInt8(1) <= 1152921504606846976.000000000, toInt8(1) > 1152921504606846976.000000000, toInt8(1) >= 1152921504606846976.000000000,	1152921504606846976.000000000 = toInt8(1), 1152921504606846976.000000000 != toInt8(1), 1152921504606846976.000000000 < toInt8(1), 1152921504606846976.000000000 <= toInt8(1), 1152921504606846976.000000000 > toInt8(1), 1152921504606846976.000000000 >= toInt8(1) , toUInt16(1) = 1152921504606846976.000000000, toUInt16(1) != 1152921504606846976.000000000, toUInt16(1) < 1152921504606846976.000000000, toUInt16(1) <= 1152921504606846976.000000000, toUInt16(1) > 1152921504606846976.000000000, toUInt16(1) >= 1152921504606846976.000000000,	1152921504606846976.000000000 = toUInt16(1), 1152921504606846976.000000000 != toUInt16(1), 1152921504606846976.000000000 < toUInt16(1), 1152921504606846976.000000000 <= toUInt16(1), 1152921504606846976.000000000 > toUInt16(1), 1152921504606846976.000000000 >= toUInt16(1) , toInt16(1) = 1152921504606846976.000000000, toInt16(1) != 1152921504606846976.000000000, toInt16(1) < 1152921504606846976.000000000, toInt16(1) <= 1152921504606846976.000000000, toInt16(1) > 1152921504606846976.000000000, toInt16(1) >= 1152921504606846976.000000000,	1152921504606846976.000000000 = toInt16(1), 1152921504606846976.000000000 != toInt16(1), 1152921504606846976.000000000 < toInt16(1), 1152921504606846976.000000000 <= toInt16(1), 1152921504606846976.000000000 > toInt16(1), 1152921504606846976.000000000 >= toInt16(1) , toUInt32(1) = 1152921504606846976.000000000, toUInt32(1) != 1152921504606846976.000000000, toUInt32(1) < 1152921504606846976.000000000, toUInt32(1) <= 1152921504606846976.000000000, toUInt32(1) > 1152921504606846976.000000000, toUInt32(1) >= 1152921504606846976.000000000,	1152921504606846976.000000000 = toUInt32(1), 1152921504606846976.000000000 != toUInt32(1), 1152921504606846976.000000000 < toUInt32(1), 1152921504606846976.000000000 <= toUInt32(1), 1152921504606846976.000000000 > toUInt32(1), 1152921504606846976.000000000 >= toUInt32(1) , toInt32(1) = 1152921504606846976.000000000, toInt32(1) != 1152921504606846976.000000000, toInt32(1) < 1152921504606846976.000000000, toInt32(1) <= 1152921504606846976.000000000, toInt32(1) > 1152921504606846976.000000000, toInt32(1) >= 1152921504606846976.000000000,	1152921504606846976.000000000 = toInt32(1), 1152921504606846976.000000000 != toInt32(1), 1152921504606846976.000000000 < toInt32(1), 1152921504606846976.000000000 <= toInt32(1), 1152921504606846976.000000000 > toInt32(1), 1152921504606846976.000000000 >= toInt32(1) , toUInt64(1) = 1152921504606846976.000000000, toUInt64(1) != 1152921504606846976.000000000, toUInt64(1) < 1152921504606846976.000000000, toUInt64(1) <= 1152921504606846976.000000000, toUInt64(1) > 1152921504606846976.000000000, toUInt64(1) >= 1152921504606846976.000000000,	1152921504606846976.000000000 = toUInt64(1), 1152921504606846976.000000000 != toUInt64(1), 1152921504606846976.000000000 < toUInt64(1), 1152921504606846976.000000000 <= toUInt64(1), 1152921504606846976.000000000 > toUInt64(1), 1152921504606846976.000000000 >= toUInt64(1) , toInt64(1) = 1152921504606846976.000000000, toInt64(1) != 1152921504606846976.000000000, toInt64(1) < 1152921504606846976.000000000, toInt64(1) <= 1152921504606846976.000000000, toInt64(1) > 1152921504606846976.000000000, toInt64(1) >= 1152921504606846976.000000000,	1152921504606846976.000000000 = toInt64(1), 1152921504606846976.000000000 != toInt64(1), 1152921504606846976.000000000 < toInt64(1), 1152921504606846976.000000000 <= toInt64(1), 1152921504606846976.000000000 > toInt64(1), 1152921504606846976.000000000 >= toInt64(1) ;
+SELECT '1', '-1152921504606846976.000000000', 1 = -1152921504606846976.000000000, 1 != -1152921504606846976.000000000, 1 < -1152921504606846976.000000000, 1 <= -1152921504606846976.000000000, 1 > -1152921504606846976.000000000, 1 >= -1152921504606846976.000000000,	-1152921504606846976.000000000 = 1, -1152921504606846976.000000000 != 1, -1152921504606846976.000000000 < 1, -1152921504606846976.000000000 <= 1, -1152921504606846976.000000000 > 1, -1152921504606846976.000000000 >= 1 , toUInt8(1) = -1152921504606846976.000000000, toUInt8(1) != -1152921504606846976.000000000, toUInt8(1) < -1152921504606846976.000000000, toUInt8(1) <= -1152921504606846976.000000000, toUInt8(1) > -1152921504606846976.000000000, toUInt8(1) >= -1152921504606846976.000000000,	-1152921504606846976.000000000 = toUInt8(1), -1152921504606846976.000000000 != toUInt8(1), -1152921504606846976.000000000 < toUInt8(1), -1152921504606846976.000000000 <= toUInt8(1), -1152921504606846976.000000000 > toUInt8(1), -1152921504606846976.000000000 >= toUInt8(1) , toInt8(1) = -1152921504606846976.000000000, toInt8(1) != -1152921504606846976.000000000, toInt8(1) < -1152921504606846976.000000000, toInt8(1) <= -1152921504606846976.000000000, toInt8(1) > -1152921504606846976.000000000, toInt8(1) >= -1152921504606846976.000000000,	-1152921504606846976.000000000 = toInt8(1), -1152921504606846976.000000000 != toInt8(1), -1152921504606846976.000000000 < toInt8(1), -1152921504606846976.000000000 <= toInt8(1), -1152921504606846976.000000000 > toInt8(1), -1152921504606846976.000000000 >= toInt8(1) , toUInt16(1) = -1152921504606846976.000000000, toUInt16(1) != -1152921504606846976.000000000, toUInt16(1) < -1152921504606846976.000000000, toUInt16(1) <= -1152921504606846976.000000000, toUInt16(1) > -1152921504606846976.000000000, toUInt16(1) >= -1152921504606846976.000000000,	-1152921504606846976.000000000 = toUInt16(1), -1152921504606846976.000000000 != toUInt16(1), -1152921504606846976.000000000 < toUInt16(1), -1152921504606846976.000000000 <= toUInt16(1), -1152921504606846976.000000000 > toUInt16(1), -1152921504606846976.000000000 >= toUInt16(1) , toInt16(1) = -1152921504606846976.000000000, toInt16(1) != -1152921504606846976.000000000, toInt16(1) < -1152921504606846976.000000000, toInt16(1) <= -1152921504606846976.000000000, toInt16(1) > -1152921504606846976.000000000, toInt16(1) >= -1152921504606846976.000000000,	-1152921504606846976.000000000 = toInt16(1), -1152921504606846976.000000000 != toInt16(1), -1152921504606846976.000000000 < toInt16(1), -1152921504606846976.000000000 <= toInt16(1), -1152921504606846976.000000000 > toInt16(1), -1152921504606846976.000000000 >= toInt16(1) , toUInt32(1) = -1152921504606846976.000000000, toUInt32(1) != -1152921504606846976.000000000, toUInt32(1) < -1152921504606846976.000000000, toUInt32(1) <= -1152921504606846976.000000000, toUInt32(1) > -1152921504606846976.000000000, toUInt32(1) >= -1152921504606846976.000000000,	-1152921504606846976.000000000 = toUInt32(1), -1152921504606846976.000000000 != toUInt32(1), -1152921504606846976.000000000 < toUInt32(1), -1152921504606846976.000000000 <= toUInt32(1), -1152921504606846976.000000000 > toUInt32(1), -1152921504606846976.000000000 >= toUInt32(1) , toInt32(1) = -1152921504606846976.000000000, toInt32(1) != -1152921504606846976.000000000, toInt32(1) < -1152921504606846976.000000000, toInt32(1) <= -1152921504606846976.000000000, toInt32(1) > -1152921504606846976.000000000, toInt32(1) >= -1152921504606846976.000000000,	-1152921504606846976.000000000 = toInt32(1), -1152921504606846976.000000000 != toInt32(1), -1152921504606846976.000000000 < toInt32(1), -1152921504606846976.000000000 <= toInt32(1), -1152921504606846976.000000000 > toInt32(1), -1152921504606846976.000000000 >= toInt32(1) , toUInt64(1) = -1152921504606846976.000000000, toUInt64(1) != -1152921504606846976.000000000, toUInt64(1) < -1152921504606846976.000000000, toUInt64(1) <= -1152921504606846976.000000000, toUInt64(1) > -1152921504606846976.000000000, toUInt64(1) >= -1152921504606846976.000000000,	-1152921504606846976.000000000 = toUInt64(1), -1152921504606846976.000000000 != toUInt64(1), -1152921504606846976.000000000 < toUInt64(1), -1152921504606846976.000000000 <= toUInt64(1), -1152921504606846976.000000000 > toUInt64(1), -1152921504606846976.000000000 >= toUInt64(1) , toInt64(1) = -1152921504606846976.000000000, toInt64(1) != -1152921504606846976.000000000, toInt64(1) < -1152921504606846976.000000000, toInt64(1) <= -1152921504606846976.000000000, toInt64(1) > -1152921504606846976.000000000, toInt64(1) >= -1152921504606846976.000000000,	-1152921504606846976.000000000 = toInt64(1), -1152921504606846976.000000000 != toInt64(1), -1152921504606846976.000000000 < toInt64(1), -1152921504606846976.000000000 <= toInt64(1), -1152921504606846976.000000000 > toInt64(1), -1152921504606846976.000000000 >= toInt64(1) ;
+SELECT '1', '-9223372036854786048.000000000', 1 = -9223372036854786048.000000000, 1 != -9223372036854786048.000000000, 1 < -9223372036854786048.000000000, 1 <= -9223372036854786048.000000000, 1 > -9223372036854786048.000000000, 1 >= -9223372036854786048.000000000,	-9223372036854786048.000000000 = 1, -9223372036854786048.000000000 != 1, -9223372036854786048.000000000 < 1, -9223372036854786048.000000000 <= 1, -9223372036854786048.000000000 > 1, -9223372036854786048.000000000 >= 1 , toUInt8(1) = -9223372036854786048.000000000, toUInt8(1) != -9223372036854786048.000000000, toUInt8(1) < -9223372036854786048.000000000, toUInt8(1) <= -9223372036854786048.000000000, toUInt8(1) > -9223372036854786048.000000000, toUInt8(1) >= -9223372036854786048.000000000,	-9223372036854786048.000000000 = toUInt8(1), -9223372036854786048.000000000 != toUInt8(1), -9223372036854786048.000000000 < toUInt8(1), -9223372036854786048.000000000 <= toUInt8(1), -9223372036854786048.000000000 > toUInt8(1), -9223372036854786048.000000000 >= toUInt8(1) , toInt8(1) = -9223372036854786048.000000000, toInt8(1) != -9223372036854786048.000000000, toInt8(1) < -9223372036854786048.000000000, toInt8(1) <= -9223372036854786048.000000000, toInt8(1) > -9223372036854786048.000000000, toInt8(1) >= -9223372036854786048.000000000,	-9223372036854786048.000000000 = toInt8(1), -9223372036854786048.000000000 != toInt8(1), -9223372036854786048.000000000 < toInt8(1), -9223372036854786048.000000000 <= toInt8(1), -9223372036854786048.000000000 > toInt8(1), -9223372036854786048.000000000 >= toInt8(1) , toUInt16(1) = -9223372036854786048.000000000, toUInt16(1) != -9223372036854786048.000000000, toUInt16(1) < -9223372036854786048.000000000, toUInt16(1) <= -9223372036854786048.000000000, toUInt16(1) > -9223372036854786048.000000000, toUInt16(1) >= -9223372036854786048.000000000,	-9223372036854786048.000000000 = toUInt16(1), -9223372036854786048.000000000 != toUInt16(1), -9223372036854786048.000000000 < toUInt16(1), -9223372036854786048.000000000 <= toUInt16(1), -9223372036854786048.000000000 > toUInt16(1), -9223372036854786048.000000000 >= toUInt16(1) , toInt16(1) = -9223372036854786048.000000000, toInt16(1) != -9223372036854786048.000000000, toInt16(1) < -9223372036854786048.000000000, toInt16(1) <= -9223372036854786048.000000000, toInt16(1) > -9223372036854786048.000000000, toInt16(1) >= -9223372036854786048.000000000,	-9223372036854786048.000000000 = toInt16(1), -9223372036854786048.000000000 != toInt16(1), -9223372036854786048.000000000 < toInt16(1), -9223372036854786048.000000000 <= toInt16(1), -9223372036854786048.000000000 > toInt16(1), -9223372036854786048.000000000 >= toInt16(1) , toUInt32(1) = -9223372036854786048.000000000, toUInt32(1) != -9223372036854786048.000000000, toUInt32(1) < -9223372036854786048.000000000, toUInt32(1) <= -9223372036854786048.000000000, toUInt32(1) > -9223372036854786048.000000000, toUInt32(1) >= -9223372036854786048.000000000,	-9223372036854786048.000000000 = toUInt32(1), -9223372036854786048.000000000 != toUInt32(1), -9223372036854786048.000000000 < toUInt32(1), -9223372036854786048.000000000 <= toUInt32(1), -9223372036854786048.000000000 > toUInt32(1), -9223372036854786048.000000000 >= toUInt32(1) , toInt32(1) = -9223372036854786048.000000000, toInt32(1) != -9223372036854786048.000000000, toInt32(1) < -9223372036854786048.000000000, toInt32(1) <= -9223372036854786048.000000000, toInt32(1) > -9223372036854786048.000000000, toInt32(1) >= -9223372036854786048.000000000,	-9223372036854786048.000000000 = toInt32(1), -9223372036854786048.000000000 != toInt32(1), -9223372036854786048.000000000 < toInt32(1), -9223372036854786048.000000000 <= toInt32(1), -9223372036854786048.000000000 > toInt32(1), -9223372036854786048.000000000 >= toInt32(1) , toUInt64(1) = -9223372036854786048.000000000, toUInt64(1) != -9223372036854786048.000000000, toUInt64(1) < -9223372036854786048.000000000, toUInt64(1) <= -9223372036854786048.000000000, toUInt64(1) > -9223372036854786048.000000000, toUInt64(1) >= -9223372036854786048.000000000,	-9223372036854786048.000000000 = toUInt64(1), -9223372036854786048.000000000 != toUInt64(1), -9223372036854786048.000000000 < toUInt64(1), -9223372036854786048.000000000 <= toUInt64(1), -9223372036854786048.000000000 > toUInt64(1), -9223372036854786048.000000000 >= toUInt64(1) , toInt64(1) = -9223372036854786048.000000000, toInt64(1) != -9223372036854786048.000000000, toInt64(1) < -9223372036854786048.000000000, toInt64(1) <= -9223372036854786048.000000000, toInt64(1) > -9223372036854786048.000000000, toInt64(1) >= -9223372036854786048.000000000,	-9223372036854786048.000000000 = toInt64(1), -9223372036854786048.000000000 != toInt64(1), -9223372036854786048.000000000 < toInt64(1), -9223372036854786048.000000000 <= toInt64(1), -9223372036854786048.000000000 > toInt64(1), -9223372036854786048.000000000 >= toInt64(1) ;
+SELECT '1', '9223372036854786048.000000000', 1 = 9223372036854786048.000000000, 1 != 9223372036854786048.000000000, 1 < 9223372036854786048.000000000, 1 <= 9223372036854786048.000000000, 1 > 9223372036854786048.000000000, 1 >= 9223372036854786048.000000000,	9223372036854786048.000000000 = 1, 9223372036854786048.000000000 != 1, 9223372036854786048.000000000 < 1, 9223372036854786048.000000000 <= 1, 9223372036854786048.000000000 > 1, 9223372036854786048.000000000 >= 1 , toUInt8(1) = 9223372036854786048.000000000, toUInt8(1) != 9223372036854786048.000000000, toUInt8(1) < 9223372036854786048.000000000, toUInt8(1) <= 9223372036854786048.000000000, toUInt8(1) > 9223372036854786048.000000000, toUInt8(1) >= 9223372036854786048.000000000,	9223372036854786048.000000000 = toUInt8(1), 9223372036854786048.000000000 != toUInt8(1), 9223372036854786048.000000000 < toUInt8(1), 9223372036854786048.000000000 <= toUInt8(1), 9223372036854786048.000000000 > toUInt8(1), 9223372036854786048.000000000 >= toUInt8(1) , toInt8(1) = 9223372036854786048.000000000, toInt8(1) != 9223372036854786048.000000000, toInt8(1) < 9223372036854786048.000000000, toInt8(1) <= 9223372036854786048.000000000, toInt8(1) > 9223372036854786048.000000000, toInt8(1) >= 9223372036854786048.000000000,	9223372036854786048.000000000 = toInt8(1), 9223372036854786048.000000000 != toInt8(1), 9223372036854786048.000000000 < toInt8(1), 9223372036854786048.000000000 <= toInt8(1), 9223372036854786048.000000000 > toInt8(1), 9223372036854786048.000000000 >= toInt8(1) , toUInt16(1) = 9223372036854786048.000000000, toUInt16(1) != 9223372036854786048.000000000, toUInt16(1) < 9223372036854786048.000000000, toUInt16(1) <= 9223372036854786048.000000000, toUInt16(1) > 9223372036854786048.000000000, toUInt16(1) >= 9223372036854786048.000000000,	9223372036854786048.000000000 = toUInt16(1), 9223372036854786048.000000000 != toUInt16(1), 9223372036854786048.000000000 < toUInt16(1), 9223372036854786048.000000000 <= toUInt16(1), 9223372036854786048.000000000 > toUInt16(1), 9223372036854786048.000000000 >= toUInt16(1) , toInt16(1) = 9223372036854786048.000000000, toInt16(1) != 9223372036854786048.000000000, toInt16(1) < 9223372036854786048.000000000, toInt16(1) <= 9223372036854786048.000000000, toInt16(1) > 9223372036854786048.000000000, toInt16(1) >= 9223372036854786048.000000000,	9223372036854786048.000000000 = toInt16(1), 9223372036854786048.000000000 != toInt16(1), 9223372036854786048.000000000 < toInt16(1), 9223372036854786048.000000000 <= toInt16(1), 9223372036854786048.000000000 > toInt16(1), 9223372036854786048.000000000 >= toInt16(1) , toUInt32(1) = 9223372036854786048.000000000, toUInt32(1) != 9223372036854786048.000000000, toUInt32(1) < 9223372036854786048.000000000, toUInt32(1) <= 9223372036854786048.000000000, toUInt32(1) > 9223372036854786048.000000000, toUInt32(1) >= 9223372036854786048.000000000,	9223372036854786048.000000000 = toUInt32(1), 9223372036854786048.000000000 != toUInt32(1), 9223372036854786048.000000000 < toUInt32(1), 9223372036854786048.000000000 <= toUInt32(1), 9223372036854786048.000000000 > toUInt32(1), 9223372036854786048.000000000 >= toUInt32(1) , toInt32(1) = 9223372036854786048.000000000, toInt32(1) != 9223372036854786048.000000000, toInt32(1) < 9223372036854786048.000000000, toInt32(1) <= 9223372036854786048.000000000, toInt32(1) > 9223372036854786048.000000000, toInt32(1) >= 9223372036854786048.000000000,	9223372036854786048.000000000 = toInt32(1), 9223372036854786048.000000000 != toInt32(1), 9223372036854786048.000000000 < toInt32(1), 9223372036854786048.000000000 <= toInt32(1), 9223372036854786048.000000000 > toInt32(1), 9223372036854786048.000000000 >= toInt32(1) , toUInt64(1) = 9223372036854786048.000000000, toUInt64(1) != 9223372036854786048.000000000, toUInt64(1) < 9223372036854786048.000000000, toUInt64(1) <= 9223372036854786048.000000000, toUInt64(1) > 9223372036854786048.000000000, toUInt64(1) >= 9223372036854786048.000000000,	9223372036854786048.000000000 = toUInt64(1), 9223372036854786048.000000000 != toUInt64(1), 9223372036854786048.000000000 < toUInt64(1), 9223372036854786048.000000000 <= toUInt64(1), 9223372036854786048.000000000 > toUInt64(1), 9223372036854786048.000000000 >= toUInt64(1) , toInt64(1) = 9223372036854786048.000000000, toInt64(1) != 9223372036854786048.000000000, toInt64(1) < 9223372036854786048.000000000, toInt64(1) <= 9223372036854786048.000000000, toInt64(1) > 9223372036854786048.000000000, toInt64(1) >= 9223372036854786048.000000000,	9223372036854786048.000000000 = toInt64(1), 9223372036854786048.000000000 != toInt64(1), 9223372036854786048.000000000 < toInt64(1), 9223372036854786048.000000000 <= toInt64(1), 9223372036854786048.000000000 > toInt64(1), 9223372036854786048.000000000 >= toInt64(1) ;
+SELECT '18446744073709551615', '0.000000000', 18446744073709551615 = 0.000000000, 18446744073709551615 != 0.000000000, 18446744073709551615 < 0.000000000, 18446744073709551615 <= 0.000000000, 18446744073709551615 > 0.000000000, 18446744073709551615 >= 0.000000000,	0.000000000 = 18446744073709551615, 0.000000000 != 18446744073709551615, 0.000000000 < 18446744073709551615, 0.000000000 <= 18446744073709551615, 0.000000000 > 18446744073709551615, 0.000000000 >= 18446744073709551615 , toUInt64(18446744073709551615) = 0.000000000, toUInt64(18446744073709551615) != 0.000000000, toUInt64(18446744073709551615) < 0.000000000, toUInt64(18446744073709551615) <= 0.000000000, toUInt64(18446744073709551615) > 0.000000000, toUInt64(18446744073709551615) >= 0.000000000,	0.000000000 = toUInt64(18446744073709551615), 0.000000000 != toUInt64(18446744073709551615), 0.000000000 < toUInt64(18446744073709551615), 0.000000000 <= toUInt64(18446744073709551615), 0.000000000 > toUInt64(18446744073709551615), 0.000000000 >= toUInt64(18446744073709551615) ;
+SELECT '18446744073709551615', '-1.000000000', 18446744073709551615 = -1.000000000, 18446744073709551615 != -1.000000000, 18446744073709551615 < -1.000000000, 18446744073709551615 <= -1.000000000, 18446744073709551615 > -1.000000000, 18446744073709551615 >= -1.000000000,	-1.000000000 = 18446744073709551615, -1.000000000 != 18446744073709551615, -1.000000000 < 18446744073709551615, -1.000000000 <= 18446744073709551615, -1.000000000 > 18446744073709551615, -1.000000000 >= 18446744073709551615 , toUInt64(18446744073709551615) = -1.000000000, toUInt64(18446744073709551615) != -1.000000000, toUInt64(18446744073709551615) < -1.000000000, toUInt64(18446744073709551615) <= -1.000000000, toUInt64(18446744073709551615) > -1.000000000, toUInt64(18446744073709551615) >= -1.000000000,	-1.000000000 = toUInt64(18446744073709551615), -1.000000000 != toUInt64(18446744073709551615), -1.000000000 < toUInt64(18446744073709551615), -1.000000000 <= toUInt64(18446744073709551615), -1.000000000 > toUInt64(18446744073709551615), -1.000000000 >= toUInt64(18446744073709551615) ;
+SELECT '18446744073709551615', '1.000000000', 18446744073709551615 = 1.000000000, 18446744073709551615 != 1.000000000, 18446744073709551615 < 1.000000000, 18446744073709551615 <= 1.000000000, 18446744073709551615 > 1.000000000, 18446744073709551615 >= 1.000000000,	1.000000000 = 18446744073709551615, 1.000000000 != 18446744073709551615, 1.000000000 < 18446744073709551615, 1.000000000 <= 18446744073709551615, 1.000000000 > 18446744073709551615, 1.000000000 >= 18446744073709551615 , toUInt64(18446744073709551615) = 1.000000000, toUInt64(18446744073709551615) != 1.000000000, toUInt64(18446744073709551615) < 1.000000000, toUInt64(18446744073709551615) <= 1.000000000, toUInt64(18446744073709551615) > 1.000000000, toUInt64(18446744073709551615) >= 1.000000000,	1.000000000 = toUInt64(18446744073709551615), 1.000000000 != toUInt64(18446744073709551615), 1.000000000 < toUInt64(18446744073709551615), 1.000000000 <= toUInt64(18446744073709551615), 1.000000000 > toUInt64(18446744073709551615), 1.000000000 >= toUInt64(18446744073709551615) ;
+SELECT '18446744073709551615', '18446744073709551616.000000000', 18446744073709551615 = 18446744073709551616.000000000, 18446744073709551615 != 18446744073709551616.000000000, 18446744073709551615 < 18446744073709551616.000000000, 18446744073709551615 <= 18446744073709551616.000000000, 18446744073709551615 > 18446744073709551616.000000000, 18446744073709551615 >= 18446744073709551616.000000000,	18446744073709551616.000000000 = 18446744073709551615, 18446744073709551616.000000000 != 18446744073709551615, 18446744073709551616.000000000 < 18446744073709551615, 18446744073709551616.000000000 <= 18446744073709551615, 18446744073709551616.000000000 > 18446744073709551615, 18446744073709551616.000000000 >= 18446744073709551615 , toUInt64(18446744073709551615) = 18446744073709551616.000000000, toUInt64(18446744073709551615) != 18446744073709551616.000000000, toUInt64(18446744073709551615) < 18446744073709551616.000000000, toUInt64(18446744073709551615) <= 18446744073709551616.000000000, toUInt64(18446744073709551615) > 18446744073709551616.000000000, toUInt64(18446744073709551615) >= 18446744073709551616.000000000,	18446744073709551616.000000000 = toUInt64(18446744073709551615), 18446744073709551616.000000000 != toUInt64(18446744073709551615), 18446744073709551616.000000000 < toUInt64(18446744073709551615), 18446744073709551616.000000000 <= toUInt64(18446744073709551615), 18446744073709551616.000000000 > toUInt64(18446744073709551615), 18446744073709551616.000000000 >= toUInt64(18446744073709551615) ;
+SELECT '18446744073709551615', '9223372036854775808.000000000', 18446744073709551615 = 9223372036854775808.000000000, 18446744073709551615 != 9223372036854775808.000000000, 18446744073709551615 < 9223372036854775808.000000000, 18446744073709551615 <= 9223372036854775808.000000000, 18446744073709551615 > 9223372036854775808.000000000, 18446744073709551615 >= 9223372036854775808.000000000,	9223372036854775808.000000000 = 18446744073709551615, 9223372036854775808.000000000 != 18446744073709551615, 9223372036854775808.000000000 < 18446744073709551615, 9223372036854775808.000000000 <= 18446744073709551615, 9223372036854775808.000000000 > 18446744073709551615, 9223372036854775808.000000000 >= 18446744073709551615 , toUInt64(18446744073709551615) = 9223372036854775808.000000000, toUInt64(18446744073709551615) != 9223372036854775808.000000000, toUInt64(18446744073709551615) < 9223372036854775808.000000000, toUInt64(18446744073709551615) <= 9223372036854775808.000000000, toUInt64(18446744073709551615) > 9223372036854775808.000000000, toUInt64(18446744073709551615) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toUInt64(18446744073709551615), 9223372036854775808.000000000 != toUInt64(18446744073709551615), 9223372036854775808.000000000 < toUInt64(18446744073709551615), 9223372036854775808.000000000 <= toUInt64(18446744073709551615), 9223372036854775808.000000000 > toUInt64(18446744073709551615), 9223372036854775808.000000000 >= toUInt64(18446744073709551615) ;
+SELECT '18446744073709551615', '-9223372036854775808.000000000', 18446744073709551615 = -9223372036854775808.000000000, 18446744073709551615 != -9223372036854775808.000000000, 18446744073709551615 < -9223372036854775808.000000000, 18446744073709551615 <= -9223372036854775808.000000000, 18446744073709551615 > -9223372036854775808.000000000, 18446744073709551615 >= -9223372036854775808.000000000,	-9223372036854775808.000000000 = 18446744073709551615, -9223372036854775808.000000000 != 18446744073709551615, -9223372036854775808.000000000 < 18446744073709551615, -9223372036854775808.000000000 <= 18446744073709551615, -9223372036854775808.000000000 > 18446744073709551615, -9223372036854775808.000000000 >= 18446744073709551615 , toUInt64(18446744073709551615) = -9223372036854775808.000000000, toUInt64(18446744073709551615) != -9223372036854775808.000000000, toUInt64(18446744073709551615) < -9223372036854775808.000000000, toUInt64(18446744073709551615) <= -9223372036854775808.000000000, toUInt64(18446744073709551615) > -9223372036854775808.000000000, toUInt64(18446744073709551615) >= -9223372036854775808.000000000,	-9223372036854775808.000000000 = toUInt64(18446744073709551615), -9223372036854775808.000000000 != toUInt64(18446744073709551615), -9223372036854775808.000000000 < toUInt64(18446744073709551615), -9223372036854775808.000000000 <= toUInt64(18446744073709551615), -9223372036854775808.000000000 > toUInt64(18446744073709551615), -9223372036854775808.000000000 >= toUInt64(18446744073709551615) ;
+SELECT '18446744073709551615', '9223372036854775808.000000000', 18446744073709551615 = 9223372036854775808.000000000, 18446744073709551615 != 9223372036854775808.000000000, 18446744073709551615 < 9223372036854775808.000000000, 18446744073709551615 <= 9223372036854775808.000000000, 18446744073709551615 > 9223372036854775808.000000000, 18446744073709551615 >= 9223372036854775808.000000000,	9223372036854775808.000000000 = 18446744073709551615, 9223372036854775808.000000000 != 18446744073709551615, 9223372036854775808.000000000 < 18446744073709551615, 9223372036854775808.000000000 <= 18446744073709551615, 9223372036854775808.000000000 > 18446744073709551615, 9223372036854775808.000000000 >= 18446744073709551615 , toUInt64(18446744073709551615) = 9223372036854775808.000000000, toUInt64(18446744073709551615) != 9223372036854775808.000000000, toUInt64(18446744073709551615) < 9223372036854775808.000000000, toUInt64(18446744073709551615) <= 9223372036854775808.000000000, toUInt64(18446744073709551615) > 9223372036854775808.000000000, toUInt64(18446744073709551615) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toUInt64(18446744073709551615), 9223372036854775808.000000000 != toUInt64(18446744073709551615), 9223372036854775808.000000000 < toUInt64(18446744073709551615), 9223372036854775808.000000000 <= toUInt64(18446744073709551615), 9223372036854775808.000000000 > toUInt64(18446744073709551615), 9223372036854775808.000000000 >= toUInt64(18446744073709551615) ;
+SELECT '18446744073709551615', '2251799813685248.000000000', 18446744073709551615 = 2251799813685248.000000000, 18446744073709551615 != 2251799813685248.000000000, 18446744073709551615 < 2251799813685248.000000000, 18446744073709551615 <= 2251799813685248.000000000, 18446744073709551615 > 2251799813685248.000000000, 18446744073709551615 >= 2251799813685248.000000000,	2251799813685248.000000000 = 18446744073709551615, 2251799813685248.000000000 != 18446744073709551615, 2251799813685248.000000000 < 18446744073709551615, 2251799813685248.000000000 <= 18446744073709551615, 2251799813685248.000000000 > 18446744073709551615, 2251799813685248.000000000 >= 18446744073709551615 , toUInt64(18446744073709551615) = 2251799813685248.000000000, toUInt64(18446744073709551615) != 2251799813685248.000000000, toUInt64(18446744073709551615) < 2251799813685248.000000000, toUInt64(18446744073709551615) <= 2251799813685248.000000000, toUInt64(18446744073709551615) > 2251799813685248.000000000, toUInt64(18446744073709551615) >= 2251799813685248.000000000,	2251799813685248.000000000 = toUInt64(18446744073709551615), 2251799813685248.000000000 != toUInt64(18446744073709551615), 2251799813685248.000000000 < toUInt64(18446744073709551615), 2251799813685248.000000000 <= toUInt64(18446744073709551615), 2251799813685248.000000000 > toUInt64(18446744073709551615), 2251799813685248.000000000 >= toUInt64(18446744073709551615) ;
+SELECT '18446744073709551615', '4503599627370496.000000000', 18446744073709551615 = 4503599627370496.000000000, 18446744073709551615 != 4503599627370496.000000000, 18446744073709551615 < 4503599627370496.000000000, 18446744073709551615 <= 4503599627370496.000000000, 18446744073709551615 > 4503599627370496.000000000, 18446744073709551615 >= 4503599627370496.000000000,	4503599627370496.000000000 = 18446744073709551615, 4503599627370496.000000000 != 18446744073709551615, 4503599627370496.000000000 < 18446744073709551615, 4503599627370496.000000000 <= 18446744073709551615, 4503599627370496.000000000 > 18446744073709551615, 4503599627370496.000000000 >= 18446744073709551615 , toUInt64(18446744073709551615) = 4503599627370496.000000000, toUInt64(18446744073709551615) != 4503599627370496.000000000, toUInt64(18446744073709551615) < 4503599627370496.000000000, toUInt64(18446744073709551615) <= 4503599627370496.000000000, toUInt64(18446744073709551615) > 4503599627370496.000000000, toUInt64(18446744073709551615) >= 4503599627370496.000000000,	4503599627370496.000000000 = toUInt64(18446744073709551615), 4503599627370496.000000000 != toUInt64(18446744073709551615), 4503599627370496.000000000 < toUInt64(18446744073709551615), 4503599627370496.000000000 <= toUInt64(18446744073709551615), 4503599627370496.000000000 > toUInt64(18446744073709551615), 4503599627370496.000000000 >= toUInt64(18446744073709551615) ;
+SELECT '18446744073709551615', '9007199254740991.000000000', 18446744073709551615 = 9007199254740991.000000000, 18446744073709551615 != 9007199254740991.000000000, 18446744073709551615 < 9007199254740991.000000000, 18446744073709551615 <= 9007199254740991.000000000, 18446744073709551615 > 9007199254740991.000000000, 18446744073709551615 >= 9007199254740991.000000000,	9007199254740991.000000000 = 18446744073709551615, 9007199254740991.000000000 != 18446744073709551615, 9007199254740991.000000000 < 18446744073709551615, 9007199254740991.000000000 <= 18446744073709551615, 9007199254740991.000000000 > 18446744073709551615, 9007199254740991.000000000 >= 18446744073709551615 , toUInt64(18446744073709551615) = 9007199254740991.000000000, toUInt64(18446744073709551615) != 9007199254740991.000000000, toUInt64(18446744073709551615) < 9007199254740991.000000000, toUInt64(18446744073709551615) <= 9007199254740991.000000000, toUInt64(18446744073709551615) > 9007199254740991.000000000, toUInt64(18446744073709551615) >= 9007199254740991.000000000,	9007199254740991.000000000 = toUInt64(18446744073709551615), 9007199254740991.000000000 != toUInt64(18446744073709551615), 9007199254740991.000000000 < toUInt64(18446744073709551615), 9007199254740991.000000000 <= toUInt64(18446744073709551615), 9007199254740991.000000000 > toUInt64(18446744073709551615), 9007199254740991.000000000 >= toUInt64(18446744073709551615) ;
+SELECT '18446744073709551615', '9007199254740992.000000000', 18446744073709551615 = 9007199254740992.000000000, 18446744073709551615 != 9007199254740992.000000000, 18446744073709551615 < 9007199254740992.000000000, 18446744073709551615 <= 9007199254740992.000000000, 18446744073709551615 > 9007199254740992.000000000, 18446744073709551615 >= 9007199254740992.000000000,	9007199254740992.000000000 = 18446744073709551615, 9007199254740992.000000000 != 18446744073709551615, 9007199254740992.000000000 < 18446744073709551615, 9007199254740992.000000000 <= 18446744073709551615, 9007199254740992.000000000 > 18446744073709551615, 9007199254740992.000000000 >= 18446744073709551615 , toUInt64(18446744073709551615) = 9007199254740992.000000000, toUInt64(18446744073709551615) != 9007199254740992.000000000, toUInt64(18446744073709551615) < 9007199254740992.000000000, toUInt64(18446744073709551615) <= 9007199254740992.000000000, toUInt64(18446744073709551615) > 9007199254740992.000000000, toUInt64(18446744073709551615) >= 9007199254740992.000000000,	9007199254740992.000000000 = toUInt64(18446744073709551615), 9007199254740992.000000000 != toUInt64(18446744073709551615), 9007199254740992.000000000 < toUInt64(18446744073709551615), 9007199254740992.000000000 <= toUInt64(18446744073709551615), 9007199254740992.000000000 > toUInt64(18446744073709551615), 9007199254740992.000000000 >= toUInt64(18446744073709551615) ;
+SELECT '18446744073709551615', '9007199254740992.000000000', 18446744073709551615 = 9007199254740992.000000000, 18446744073709551615 != 9007199254740992.000000000, 18446744073709551615 < 9007199254740992.000000000, 18446744073709551615 <= 9007199254740992.000000000, 18446744073709551615 > 9007199254740992.000000000, 18446744073709551615 >= 9007199254740992.000000000,	9007199254740992.000000000 = 18446744073709551615, 9007199254740992.000000000 != 18446744073709551615, 9007199254740992.000000000 < 18446744073709551615, 9007199254740992.000000000 <= 18446744073709551615, 9007199254740992.000000000 > 18446744073709551615, 9007199254740992.000000000 >= 18446744073709551615 , toUInt64(18446744073709551615) = 9007199254740992.000000000, toUInt64(18446744073709551615) != 9007199254740992.000000000, toUInt64(18446744073709551615) < 9007199254740992.000000000, toUInt64(18446744073709551615) <= 9007199254740992.000000000, toUInt64(18446744073709551615) > 9007199254740992.000000000, toUInt64(18446744073709551615) >= 9007199254740992.000000000,	9007199254740992.000000000 = toUInt64(18446744073709551615), 9007199254740992.000000000 != toUInt64(18446744073709551615), 9007199254740992.000000000 < toUInt64(18446744073709551615), 9007199254740992.000000000 <= toUInt64(18446744073709551615), 9007199254740992.000000000 > toUInt64(18446744073709551615), 9007199254740992.000000000 >= toUInt64(18446744073709551615) ;
+SELECT '18446744073709551615', '9007199254740994.000000000', 18446744073709551615 = 9007199254740994.000000000, 18446744073709551615 != 9007199254740994.000000000, 18446744073709551615 < 9007199254740994.000000000, 18446744073709551615 <= 9007199254740994.000000000, 18446744073709551615 > 9007199254740994.000000000, 18446744073709551615 >= 9007199254740994.000000000,	9007199254740994.000000000 = 18446744073709551615, 9007199254740994.000000000 != 18446744073709551615, 9007199254740994.000000000 < 18446744073709551615, 9007199254740994.000000000 <= 18446744073709551615, 9007199254740994.000000000 > 18446744073709551615, 9007199254740994.000000000 >= 18446744073709551615 , toUInt64(18446744073709551615) = 9007199254740994.000000000, toUInt64(18446744073709551615) != 9007199254740994.000000000, toUInt64(18446744073709551615) < 9007199254740994.000000000, toUInt64(18446744073709551615) <= 9007199254740994.000000000, toUInt64(18446744073709551615) > 9007199254740994.000000000, toUInt64(18446744073709551615) >= 9007199254740994.000000000,	9007199254740994.000000000 = toUInt64(18446744073709551615), 9007199254740994.000000000 != toUInt64(18446744073709551615), 9007199254740994.000000000 < toUInt64(18446744073709551615), 9007199254740994.000000000 <= toUInt64(18446744073709551615), 9007199254740994.000000000 > toUInt64(18446744073709551615), 9007199254740994.000000000 >= toUInt64(18446744073709551615) ;
+SELECT '18446744073709551615', '-9007199254740991.000000000', 18446744073709551615 = -9007199254740991.000000000, 18446744073709551615 != -9007199254740991.000000000, 18446744073709551615 < -9007199254740991.000000000, 18446744073709551615 <= -9007199254740991.000000000, 18446744073709551615 > -9007199254740991.000000000, 18446744073709551615 >= -9007199254740991.000000000,	-9007199254740991.000000000 = 18446744073709551615, -9007199254740991.000000000 != 18446744073709551615, -9007199254740991.000000000 < 18446744073709551615, -9007199254740991.000000000 <= 18446744073709551615, -9007199254740991.000000000 > 18446744073709551615, -9007199254740991.000000000 >= 18446744073709551615 , toUInt64(18446744073709551615) = -9007199254740991.000000000, toUInt64(18446744073709551615) != -9007199254740991.000000000, toUInt64(18446744073709551615) < -9007199254740991.000000000, toUInt64(18446744073709551615) <= -9007199254740991.000000000, toUInt64(18446744073709551615) > -9007199254740991.000000000, toUInt64(18446744073709551615) >= -9007199254740991.000000000,	-9007199254740991.000000000 = toUInt64(18446744073709551615), -9007199254740991.000000000 != toUInt64(18446744073709551615), -9007199254740991.000000000 < toUInt64(18446744073709551615), -9007199254740991.000000000 <= toUInt64(18446744073709551615), -9007199254740991.000000000 > toUInt64(18446744073709551615), -9007199254740991.000000000 >= toUInt64(18446744073709551615) ;
+SELECT '18446744073709551615', '-9007199254740992.000000000', 18446744073709551615 = -9007199254740992.000000000, 18446744073709551615 != -9007199254740992.000000000, 18446744073709551615 < -9007199254740992.000000000, 18446744073709551615 <= -9007199254740992.000000000, 18446744073709551615 > -9007199254740992.000000000, 18446744073709551615 >= -9007199254740992.000000000,	-9007199254740992.000000000 = 18446744073709551615, -9007199254740992.000000000 != 18446744073709551615, -9007199254740992.000000000 < 18446744073709551615, -9007199254740992.000000000 <= 18446744073709551615, -9007199254740992.000000000 > 18446744073709551615, -9007199254740992.000000000 >= 18446744073709551615 , toUInt64(18446744073709551615) = -9007199254740992.000000000, toUInt64(18446744073709551615) != -9007199254740992.000000000, toUInt64(18446744073709551615) < -9007199254740992.000000000, toUInt64(18446744073709551615) <= -9007199254740992.000000000, toUInt64(18446744073709551615) > -9007199254740992.000000000, toUInt64(18446744073709551615) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toUInt64(18446744073709551615), -9007199254740992.000000000 != toUInt64(18446744073709551615), -9007199254740992.000000000 < toUInt64(18446744073709551615), -9007199254740992.000000000 <= toUInt64(18446744073709551615), -9007199254740992.000000000 > toUInt64(18446744073709551615), -9007199254740992.000000000 >= toUInt64(18446744073709551615) ;
+SELECT '18446744073709551615', '-9007199254740992.000000000', 18446744073709551615 = -9007199254740992.000000000, 18446744073709551615 != -9007199254740992.000000000, 18446744073709551615 < -9007199254740992.000000000, 18446744073709551615 <= -9007199254740992.000000000, 18446744073709551615 > -9007199254740992.000000000, 18446744073709551615 >= -9007199254740992.000000000,	-9007199254740992.000000000 = 18446744073709551615, -9007199254740992.000000000 != 18446744073709551615, -9007199254740992.000000000 < 18446744073709551615, -9007199254740992.000000000 <= 18446744073709551615, -9007199254740992.000000000 > 18446744073709551615, -9007199254740992.000000000 >= 18446744073709551615 , toUInt64(18446744073709551615) = -9007199254740992.000000000, toUInt64(18446744073709551615) != -9007199254740992.000000000, toUInt64(18446744073709551615) < -9007199254740992.000000000, toUInt64(18446744073709551615) <= -9007199254740992.000000000, toUInt64(18446744073709551615) > -9007199254740992.000000000, toUInt64(18446744073709551615) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toUInt64(18446744073709551615), -9007199254740992.000000000 != toUInt64(18446744073709551615), -9007199254740992.000000000 < toUInt64(18446744073709551615), -9007199254740992.000000000 <= toUInt64(18446744073709551615), -9007199254740992.000000000 > toUInt64(18446744073709551615), -9007199254740992.000000000 >= toUInt64(18446744073709551615) ;
+SELECT '18446744073709551615', '-9007199254740994.000000000', 18446744073709551615 = -9007199254740994.000000000, 18446744073709551615 != -9007199254740994.000000000, 18446744073709551615 < -9007199254740994.000000000, 18446744073709551615 <= -9007199254740994.000000000, 18446744073709551615 > -9007199254740994.000000000, 18446744073709551615 >= -9007199254740994.000000000,	-9007199254740994.000000000 = 18446744073709551615, -9007199254740994.000000000 != 18446744073709551615, -9007199254740994.000000000 < 18446744073709551615, -9007199254740994.000000000 <= 18446744073709551615, -9007199254740994.000000000 > 18446744073709551615, -9007199254740994.000000000 >= 18446744073709551615 , toUInt64(18446744073709551615) = -9007199254740994.000000000, toUInt64(18446744073709551615) != -9007199254740994.000000000, toUInt64(18446744073709551615) < -9007199254740994.000000000, toUInt64(18446744073709551615) <= -9007199254740994.000000000, toUInt64(18446744073709551615) > -9007199254740994.000000000, toUInt64(18446744073709551615) >= -9007199254740994.000000000,	-9007199254740994.000000000 = toUInt64(18446744073709551615), -9007199254740994.000000000 != toUInt64(18446744073709551615), -9007199254740994.000000000 < toUInt64(18446744073709551615), -9007199254740994.000000000 <= toUInt64(18446744073709551615), -9007199254740994.000000000 > toUInt64(18446744073709551615), -9007199254740994.000000000 >= toUInt64(18446744073709551615) ;
+SELECT '18446744073709551615', '104.000000000', 18446744073709551615 = 104.000000000, 18446744073709551615 != 104.000000000, 18446744073709551615 < 104.000000000, 18446744073709551615 <= 104.000000000, 18446744073709551615 > 104.000000000, 18446744073709551615 >= 104.000000000,	104.000000000 = 18446744073709551615, 104.000000000 != 18446744073709551615, 104.000000000 < 18446744073709551615, 104.000000000 <= 18446744073709551615, 104.000000000 > 18446744073709551615, 104.000000000 >= 18446744073709551615 , toUInt64(18446744073709551615) = 104.000000000, toUInt64(18446744073709551615) != 104.000000000, toUInt64(18446744073709551615) < 104.000000000, toUInt64(18446744073709551615) <= 104.000000000, toUInt64(18446744073709551615) > 104.000000000, toUInt64(18446744073709551615) >= 104.000000000,	104.000000000 = toUInt64(18446744073709551615), 104.000000000 != toUInt64(18446744073709551615), 104.000000000 < toUInt64(18446744073709551615), 104.000000000 <= toUInt64(18446744073709551615), 104.000000000 > toUInt64(18446744073709551615), 104.000000000 >= toUInt64(18446744073709551615) ;
+SELECT '18446744073709551615', '-4503599627370496.000000000', 18446744073709551615 = -4503599627370496.000000000, 18446744073709551615 != -4503599627370496.000000000, 18446744073709551615 < -4503599627370496.000000000, 18446744073709551615 <= -4503599627370496.000000000, 18446744073709551615 > -4503599627370496.000000000, 18446744073709551615 >= -4503599627370496.000000000,	-4503599627370496.000000000 = 18446744073709551615, -4503599627370496.000000000 != 18446744073709551615, -4503599627370496.000000000 < 18446744073709551615, -4503599627370496.000000000 <= 18446744073709551615, -4503599627370496.000000000 > 18446744073709551615, -4503599627370496.000000000 >= 18446744073709551615 , toUInt64(18446744073709551615) = -4503599627370496.000000000, toUInt64(18446744073709551615) != -4503599627370496.000000000, toUInt64(18446744073709551615) < -4503599627370496.000000000, toUInt64(18446744073709551615) <= -4503599627370496.000000000, toUInt64(18446744073709551615) > -4503599627370496.000000000, toUInt64(18446744073709551615) >= -4503599627370496.000000000,	-4503599627370496.000000000 = toUInt64(18446744073709551615), -4503599627370496.000000000 != toUInt64(18446744073709551615), -4503599627370496.000000000 < toUInt64(18446744073709551615), -4503599627370496.000000000 <= toUInt64(18446744073709551615), -4503599627370496.000000000 > toUInt64(18446744073709551615), -4503599627370496.000000000 >= toUInt64(18446744073709551615) ;
+SELECT '18446744073709551615', '-0.500000000', 18446744073709551615 = -0.500000000, 18446744073709551615 != -0.500000000, 18446744073709551615 < -0.500000000, 18446744073709551615 <= -0.500000000, 18446744073709551615 > -0.500000000, 18446744073709551615 >= -0.500000000,	-0.500000000 = 18446744073709551615, -0.500000000 != 18446744073709551615, -0.500000000 < 18446744073709551615, -0.500000000 <= 18446744073709551615, -0.500000000 > 18446744073709551615, -0.500000000 >= 18446744073709551615 , toUInt64(18446744073709551615) = -0.500000000, toUInt64(18446744073709551615) != -0.500000000, toUInt64(18446744073709551615) < -0.500000000, toUInt64(18446744073709551615) <= -0.500000000, toUInt64(18446744073709551615) > -0.500000000, toUInt64(18446744073709551615) >= -0.500000000,	-0.500000000 = toUInt64(18446744073709551615), -0.500000000 != toUInt64(18446744073709551615), -0.500000000 < toUInt64(18446744073709551615), -0.500000000 <= toUInt64(18446744073709551615), -0.500000000 > toUInt64(18446744073709551615), -0.500000000 >= toUInt64(18446744073709551615) ;
+SELECT '18446744073709551615', '0.500000000', 18446744073709551615 = 0.500000000, 18446744073709551615 != 0.500000000, 18446744073709551615 < 0.500000000, 18446744073709551615 <= 0.500000000, 18446744073709551615 > 0.500000000, 18446744073709551615 >= 0.500000000,	0.500000000 = 18446744073709551615, 0.500000000 != 18446744073709551615, 0.500000000 < 18446744073709551615, 0.500000000 <= 18446744073709551615, 0.500000000 > 18446744073709551615, 0.500000000 >= 18446744073709551615 , toUInt64(18446744073709551615) = 0.500000000, toUInt64(18446744073709551615) != 0.500000000, toUInt64(18446744073709551615) < 0.500000000, toUInt64(18446744073709551615) <= 0.500000000, toUInt64(18446744073709551615) > 0.500000000, toUInt64(18446744073709551615) >= 0.500000000,	0.500000000 = toUInt64(18446744073709551615), 0.500000000 != toUInt64(18446744073709551615), 0.500000000 < toUInt64(18446744073709551615), 0.500000000 <= toUInt64(18446744073709551615), 0.500000000 > toUInt64(18446744073709551615), 0.500000000 >= toUInt64(18446744073709551615) ;
+SELECT '18446744073709551615', '-1.500000000', 18446744073709551615 = -1.500000000, 18446744073709551615 != -1.500000000, 18446744073709551615 < -1.500000000, 18446744073709551615 <= -1.500000000, 18446744073709551615 > -1.500000000, 18446744073709551615 >= -1.500000000,	-1.500000000 = 18446744073709551615, -1.500000000 != 18446744073709551615, -1.500000000 < 18446744073709551615, -1.500000000 <= 18446744073709551615, -1.500000000 > 18446744073709551615, -1.500000000 >= 18446744073709551615 , toUInt64(18446744073709551615) = -1.500000000, toUInt64(18446744073709551615) != -1.500000000, toUInt64(18446744073709551615) < -1.500000000, toUInt64(18446744073709551615) <= -1.500000000, toUInt64(18446744073709551615) > -1.500000000, toUInt64(18446744073709551615) >= -1.500000000,	-1.500000000 = toUInt64(18446744073709551615), -1.500000000 != toUInt64(18446744073709551615), -1.500000000 < toUInt64(18446744073709551615), -1.500000000 <= toUInt64(18446744073709551615), -1.500000000 > toUInt64(18446744073709551615), -1.500000000 >= toUInt64(18446744073709551615) ;
+SELECT '18446744073709551615', '1.500000000', 18446744073709551615 = 1.500000000, 18446744073709551615 != 1.500000000, 18446744073709551615 < 1.500000000, 18446744073709551615 <= 1.500000000, 18446744073709551615 > 1.500000000, 18446744073709551615 >= 1.500000000,	1.500000000 = 18446744073709551615, 1.500000000 != 18446744073709551615, 1.500000000 < 18446744073709551615, 1.500000000 <= 18446744073709551615, 1.500000000 > 18446744073709551615, 1.500000000 >= 18446744073709551615 , toUInt64(18446744073709551615) = 1.500000000, toUInt64(18446744073709551615) != 1.500000000, toUInt64(18446744073709551615) < 1.500000000, toUInt64(18446744073709551615) <= 1.500000000, toUInt64(18446744073709551615) > 1.500000000, toUInt64(18446744073709551615) >= 1.500000000,	1.500000000 = toUInt64(18446744073709551615), 1.500000000 != toUInt64(18446744073709551615), 1.500000000 < toUInt64(18446744073709551615), 1.500000000 <= toUInt64(18446744073709551615), 1.500000000 > toUInt64(18446744073709551615), 1.500000000 >= toUInt64(18446744073709551615) ;
+SELECT '18446744073709551615', '9007199254740992.000000000', 18446744073709551615 = 9007199254740992.000000000, 18446744073709551615 != 9007199254740992.000000000, 18446744073709551615 < 9007199254740992.000000000, 18446744073709551615 <= 9007199254740992.000000000, 18446744073709551615 > 9007199254740992.000000000, 18446744073709551615 >= 9007199254740992.000000000,	9007199254740992.000000000 = 18446744073709551615, 9007199254740992.000000000 != 18446744073709551615, 9007199254740992.000000000 < 18446744073709551615, 9007199254740992.000000000 <= 18446744073709551615, 9007199254740992.000000000 > 18446744073709551615, 9007199254740992.000000000 >= 18446744073709551615 , toUInt64(18446744073709551615) = 9007199254740992.000000000, toUInt64(18446744073709551615) != 9007199254740992.000000000, toUInt64(18446744073709551615) < 9007199254740992.000000000, toUInt64(18446744073709551615) <= 9007199254740992.000000000, toUInt64(18446744073709551615) > 9007199254740992.000000000, toUInt64(18446744073709551615) >= 9007199254740992.000000000,	9007199254740992.000000000 = toUInt64(18446744073709551615), 9007199254740992.000000000 != toUInt64(18446744073709551615), 9007199254740992.000000000 < toUInt64(18446744073709551615), 9007199254740992.000000000 <= toUInt64(18446744073709551615), 9007199254740992.000000000 > toUInt64(18446744073709551615), 9007199254740992.000000000 >= toUInt64(18446744073709551615) ;
+SELECT '18446744073709551615', '2251799813685247.500000000', 18446744073709551615 = 2251799813685247.500000000, 18446744073709551615 != 2251799813685247.500000000, 18446744073709551615 < 2251799813685247.500000000, 18446744073709551615 <= 2251799813685247.500000000, 18446744073709551615 > 2251799813685247.500000000, 18446744073709551615 >= 2251799813685247.500000000,	2251799813685247.500000000 = 18446744073709551615, 2251799813685247.500000000 != 18446744073709551615, 2251799813685247.500000000 < 18446744073709551615, 2251799813685247.500000000 <= 18446744073709551615, 2251799813685247.500000000 > 18446744073709551615, 2251799813685247.500000000 >= 18446744073709551615 , toUInt64(18446744073709551615) = 2251799813685247.500000000, toUInt64(18446744073709551615) != 2251799813685247.500000000, toUInt64(18446744073709551615) < 2251799813685247.500000000, toUInt64(18446744073709551615) <= 2251799813685247.500000000, toUInt64(18446744073709551615) > 2251799813685247.500000000, toUInt64(18446744073709551615) >= 2251799813685247.500000000,	2251799813685247.500000000 = toUInt64(18446744073709551615), 2251799813685247.500000000 != toUInt64(18446744073709551615), 2251799813685247.500000000 < toUInt64(18446744073709551615), 2251799813685247.500000000 <= toUInt64(18446744073709551615), 2251799813685247.500000000 > toUInt64(18446744073709551615), 2251799813685247.500000000 >= toUInt64(18446744073709551615) ;
+SELECT '18446744073709551615', '2251799813685248.500000000', 18446744073709551615 = 2251799813685248.500000000, 18446744073709551615 != 2251799813685248.500000000, 18446744073709551615 < 2251799813685248.500000000, 18446744073709551615 <= 2251799813685248.500000000, 18446744073709551615 > 2251799813685248.500000000, 18446744073709551615 >= 2251799813685248.500000000,	2251799813685248.500000000 = 18446744073709551615, 2251799813685248.500000000 != 18446744073709551615, 2251799813685248.500000000 < 18446744073709551615, 2251799813685248.500000000 <= 18446744073709551615, 2251799813685248.500000000 > 18446744073709551615, 2251799813685248.500000000 >= 18446744073709551615 , toUInt64(18446744073709551615) = 2251799813685248.500000000, toUInt64(18446744073709551615) != 2251799813685248.500000000, toUInt64(18446744073709551615) < 2251799813685248.500000000, toUInt64(18446744073709551615) <= 2251799813685248.500000000, toUInt64(18446744073709551615) > 2251799813685248.500000000, toUInt64(18446744073709551615) >= 2251799813685248.500000000,	2251799813685248.500000000 = toUInt64(18446744073709551615), 2251799813685248.500000000 != toUInt64(18446744073709551615), 2251799813685248.500000000 < toUInt64(18446744073709551615), 2251799813685248.500000000 <= toUInt64(18446744073709551615), 2251799813685248.500000000 > toUInt64(18446744073709551615), 2251799813685248.500000000 >= toUInt64(18446744073709551615) ;
+SELECT '18446744073709551615', '1152921504606846976.000000000', 18446744073709551615 = 1152921504606846976.000000000, 18446744073709551615 != 1152921504606846976.000000000, 18446744073709551615 < 1152921504606846976.000000000, 18446744073709551615 <= 1152921504606846976.000000000, 18446744073709551615 > 1152921504606846976.000000000, 18446744073709551615 >= 1152921504606846976.000000000,	1152921504606846976.000000000 = 18446744073709551615, 1152921504606846976.000000000 != 18446744073709551615, 1152921504606846976.000000000 < 18446744073709551615, 1152921504606846976.000000000 <= 18446744073709551615, 1152921504606846976.000000000 > 18446744073709551615, 1152921504606846976.000000000 >= 18446744073709551615 , toUInt64(18446744073709551615) = 1152921504606846976.000000000, toUInt64(18446744073709551615) != 1152921504606846976.000000000, toUInt64(18446744073709551615) < 1152921504606846976.000000000, toUInt64(18446744073709551615) <= 1152921504606846976.000000000, toUInt64(18446744073709551615) > 1152921504606846976.000000000, toUInt64(18446744073709551615) >= 1152921504606846976.000000000,	1152921504606846976.000000000 = toUInt64(18446744073709551615), 1152921504606846976.000000000 != toUInt64(18446744073709551615), 1152921504606846976.000000000 < toUInt64(18446744073709551615), 1152921504606846976.000000000 <= toUInt64(18446744073709551615), 1152921504606846976.000000000 > toUInt64(18446744073709551615), 1152921504606846976.000000000 >= toUInt64(18446744073709551615) ;
+SELECT '18446744073709551615', '-1152921504606846976.000000000', 18446744073709551615 = -1152921504606846976.000000000, 18446744073709551615 != -1152921504606846976.000000000, 18446744073709551615 < -1152921504606846976.000000000, 18446744073709551615 <= -1152921504606846976.000000000, 18446744073709551615 > -1152921504606846976.000000000, 18446744073709551615 >= -1152921504606846976.000000000,	-1152921504606846976.000000000 = 18446744073709551615, -1152921504606846976.000000000 != 18446744073709551615, -1152921504606846976.000000000 < 18446744073709551615, -1152921504606846976.000000000 <= 18446744073709551615, -1152921504606846976.000000000 > 18446744073709551615, -1152921504606846976.000000000 >= 18446744073709551615 , toUInt64(18446744073709551615) = -1152921504606846976.000000000, toUInt64(18446744073709551615) != -1152921504606846976.000000000, toUInt64(18446744073709551615) < -1152921504606846976.000000000, toUInt64(18446744073709551615) <= -1152921504606846976.000000000, toUInt64(18446744073709551615) > -1152921504606846976.000000000, toUInt64(18446744073709551615) >= -1152921504606846976.000000000,	-1152921504606846976.000000000 = toUInt64(18446744073709551615), -1152921504606846976.000000000 != toUInt64(18446744073709551615), -1152921504606846976.000000000 < toUInt64(18446744073709551615), -1152921504606846976.000000000 <= toUInt64(18446744073709551615), -1152921504606846976.000000000 > toUInt64(18446744073709551615), -1152921504606846976.000000000 >= toUInt64(18446744073709551615) ;
+SELECT '18446744073709551615', '-9223372036854786048.000000000', 18446744073709551615 = -9223372036854786048.000000000, 18446744073709551615 != -9223372036854786048.000000000, 18446744073709551615 < -9223372036854786048.000000000, 18446744073709551615 <= -9223372036854786048.000000000, 18446744073709551615 > -9223372036854786048.000000000, 18446744073709551615 >= -9223372036854786048.000000000,	-9223372036854786048.000000000 = 18446744073709551615, -9223372036854786048.000000000 != 18446744073709551615, -9223372036854786048.000000000 < 18446744073709551615, -9223372036854786048.000000000 <= 18446744073709551615, -9223372036854786048.000000000 > 18446744073709551615, -9223372036854786048.000000000 >= 18446744073709551615 , toUInt64(18446744073709551615) = -9223372036854786048.000000000, toUInt64(18446744073709551615) != -9223372036854786048.000000000, toUInt64(18446744073709551615) < -9223372036854786048.000000000, toUInt64(18446744073709551615) <= -9223372036854786048.000000000, toUInt64(18446744073709551615) > -9223372036854786048.000000000, toUInt64(18446744073709551615) >= -9223372036854786048.000000000,	-9223372036854786048.000000000 = toUInt64(18446744073709551615), -9223372036854786048.000000000 != toUInt64(18446744073709551615), -9223372036854786048.000000000 < toUInt64(18446744073709551615), -9223372036854786048.000000000 <= toUInt64(18446744073709551615), -9223372036854786048.000000000 > toUInt64(18446744073709551615), -9223372036854786048.000000000 >= toUInt64(18446744073709551615) ;
+SELECT '18446744073709551615', '9223372036854786048.000000000', 18446744073709551615 = 9223372036854786048.000000000, 18446744073709551615 != 9223372036854786048.000000000, 18446744073709551615 < 9223372036854786048.000000000, 18446744073709551615 <= 9223372036854786048.000000000, 18446744073709551615 > 9223372036854786048.000000000, 18446744073709551615 >= 9223372036854786048.000000000,	9223372036854786048.000000000 = 18446744073709551615, 9223372036854786048.000000000 != 18446744073709551615, 9223372036854786048.000000000 < 18446744073709551615, 9223372036854786048.000000000 <= 18446744073709551615, 9223372036854786048.000000000 > 18446744073709551615, 9223372036854786048.000000000 >= 18446744073709551615 , toUInt64(18446744073709551615) = 9223372036854786048.000000000, toUInt64(18446744073709551615) != 9223372036854786048.000000000, toUInt64(18446744073709551615) < 9223372036854786048.000000000, toUInt64(18446744073709551615) <= 9223372036854786048.000000000, toUInt64(18446744073709551615) > 9223372036854786048.000000000, toUInt64(18446744073709551615) >= 9223372036854786048.000000000,	9223372036854786048.000000000 = toUInt64(18446744073709551615), 9223372036854786048.000000000 != toUInt64(18446744073709551615), 9223372036854786048.000000000 < toUInt64(18446744073709551615), 9223372036854786048.000000000 <= toUInt64(18446744073709551615), 9223372036854786048.000000000 > toUInt64(18446744073709551615), 9223372036854786048.000000000 >= toUInt64(18446744073709551615) ;
+SELECT '9223372036854775808', '0.000000000', 9223372036854775808 = 0.000000000, 9223372036854775808 != 0.000000000, 9223372036854775808 < 0.000000000, 9223372036854775808 <= 0.000000000, 9223372036854775808 > 0.000000000, 9223372036854775808 >= 0.000000000,	0.000000000 = 9223372036854775808, 0.000000000 != 9223372036854775808, 0.000000000 < 9223372036854775808, 0.000000000 <= 9223372036854775808, 0.000000000 > 9223372036854775808, 0.000000000 >= 9223372036854775808 , toUInt64(9223372036854775808) = 0.000000000, toUInt64(9223372036854775808) != 0.000000000, toUInt64(9223372036854775808) < 0.000000000, toUInt64(9223372036854775808) <= 0.000000000, toUInt64(9223372036854775808) > 0.000000000, toUInt64(9223372036854775808) >= 0.000000000,	0.000000000 = toUInt64(9223372036854775808), 0.000000000 != toUInt64(9223372036854775808), 0.000000000 < toUInt64(9223372036854775808), 0.000000000 <= toUInt64(9223372036854775808), 0.000000000 > toUInt64(9223372036854775808), 0.000000000 >= toUInt64(9223372036854775808) ;
+SELECT '9223372036854775808', '-1.000000000', 9223372036854775808 = -1.000000000, 9223372036854775808 != -1.000000000, 9223372036854775808 < -1.000000000, 9223372036854775808 <= -1.000000000, 9223372036854775808 > -1.000000000, 9223372036854775808 >= -1.000000000,	-1.000000000 = 9223372036854775808, -1.000000000 != 9223372036854775808, -1.000000000 < 9223372036854775808, -1.000000000 <= 9223372036854775808, -1.000000000 > 9223372036854775808, -1.000000000 >= 9223372036854775808 , toUInt64(9223372036854775808) = -1.000000000, toUInt64(9223372036854775808) != -1.000000000, toUInt64(9223372036854775808) < -1.000000000, toUInt64(9223372036854775808) <= -1.000000000, toUInt64(9223372036854775808) > -1.000000000, toUInt64(9223372036854775808) >= -1.000000000,	-1.000000000 = toUInt64(9223372036854775808), -1.000000000 != toUInt64(9223372036854775808), -1.000000000 < toUInt64(9223372036854775808), -1.000000000 <= toUInt64(9223372036854775808), -1.000000000 > toUInt64(9223372036854775808), -1.000000000 >= toUInt64(9223372036854775808) ;
+SELECT '9223372036854775808', '1.000000000', 9223372036854775808 = 1.000000000, 9223372036854775808 != 1.000000000, 9223372036854775808 < 1.000000000, 9223372036854775808 <= 1.000000000, 9223372036854775808 > 1.000000000, 9223372036854775808 >= 1.000000000,	1.000000000 = 9223372036854775808, 1.000000000 != 9223372036854775808, 1.000000000 < 9223372036854775808, 1.000000000 <= 9223372036854775808, 1.000000000 > 9223372036854775808, 1.000000000 >= 9223372036854775808 , toUInt64(9223372036854775808) = 1.000000000, toUInt64(9223372036854775808) != 1.000000000, toUInt64(9223372036854775808) < 1.000000000, toUInt64(9223372036854775808) <= 1.000000000, toUInt64(9223372036854775808) > 1.000000000, toUInt64(9223372036854775808) >= 1.000000000,	1.000000000 = toUInt64(9223372036854775808), 1.000000000 != toUInt64(9223372036854775808), 1.000000000 < toUInt64(9223372036854775808), 1.000000000 <= toUInt64(9223372036854775808), 1.000000000 > toUInt64(9223372036854775808), 1.000000000 >= toUInt64(9223372036854775808) ;
+SELECT '9223372036854775808', '18446744073709551616.000000000', 9223372036854775808 = 18446744073709551616.000000000, 9223372036854775808 != 18446744073709551616.000000000, 9223372036854775808 < 18446744073709551616.000000000, 9223372036854775808 <= 18446744073709551616.000000000, 9223372036854775808 > 18446744073709551616.000000000, 9223372036854775808 >= 18446744073709551616.000000000,	18446744073709551616.000000000 = 9223372036854775808, 18446744073709551616.000000000 != 9223372036854775808, 18446744073709551616.000000000 < 9223372036854775808, 18446744073709551616.000000000 <= 9223372036854775808, 18446744073709551616.000000000 > 9223372036854775808, 18446744073709551616.000000000 >= 9223372036854775808 , toUInt64(9223372036854775808) = 18446744073709551616.000000000, toUInt64(9223372036854775808) != 18446744073709551616.000000000, toUInt64(9223372036854775808) < 18446744073709551616.000000000, toUInt64(9223372036854775808) <= 18446744073709551616.000000000, toUInt64(9223372036854775808) > 18446744073709551616.000000000, toUInt64(9223372036854775808) >= 18446744073709551616.000000000,	18446744073709551616.000000000 = toUInt64(9223372036854775808), 18446744073709551616.000000000 != toUInt64(9223372036854775808), 18446744073709551616.000000000 < toUInt64(9223372036854775808), 18446744073709551616.000000000 <= toUInt64(9223372036854775808), 18446744073709551616.000000000 > toUInt64(9223372036854775808), 18446744073709551616.000000000 >= toUInt64(9223372036854775808) ;
diff --git a/tests/queries/0_stateless/00416_pocopatch_progress_in_http_headers.sh b/tests/queries/0_stateless/00416_pocopatch_progress_in_http_headers.sh
index 5d9cd12e4bf..6e9814cbca8 100755
--- a/tests/queries/0_stateless/00416_pocopatch_progress_in_http_headers.sh
+++ b/tests/queries/0_stateless/00416_pocopatch_progress_in_http_headers.sh
@@ -7,7 +7,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 ${CLICKHOUSE_CURL} -vsS "${CLICKHOUSE_URL}&max_block_size=5&send_progress_in_http_headers=1&http_headers_progress_interval_ms=0" -d 'SELECT max(number) FROM numbers(10)' 2>&1 | grep -E 'Content-Encoding|X-ClickHouse-Progress|^[0-9]'
 # This test will fail with external poco (progress not supported)
 
-${CLICKHOUSE_CURL} -vsS "${CLICKHOUSE_URL}&max_block_size=1&send_progress_in_http_headers=1&http_headers_progress_interval_ms=0" -d 'SELECT number FROM numbers(10)' 2>&1 | grep -E 'Content-Encoding|X-ClickHouse-Progress|^[0-9]'
+${CLICKHOUSE_CURL} -vsS "${CLICKHOUSE_URL}&max_block_size=1&send_progress_in_http_headers=1&http_headers_progress_interval_ms=0&output_format_parallel_formatting=0" -d 'SELECT number FROM numbers(10)' 2>&1 | grep -E 'Content-Encoding|X-ClickHouse-Progress|^[0-9]'
 ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&max_block_size=1&send_progress_in_http_headers=1&http_headers_progress_interval_ms=0&enable_http_compression=1" -H 'Accept-Encoding: gzip' -d 'SELECT number FROM system.numbers LIMIT 10' | gzip -d
 
 # 'send_progress_in_http_headers' is false by default
diff --git a/tests/queries/0_stateless/00446_clear_column_in_partition_concurrent_zookeeper.sh b/tests/queries/0_stateless/00446_clear_column_in_partition_concurrent_zookeeper.sh
index 60de1822318..5c5ecd4564b 100755
--- a/tests/queries/0_stateless/00446_clear_column_in_partition_concurrent_zookeeper.sh
+++ b/tests/queries/0_stateless/00446_clear_column_in_partition_concurrent_zookeeper.sh
@@ -8,8 +8,8 @@ ch="$CLICKHOUSE_CLIENT --stacktrace -q"
 
 $ch "DROP TABLE IF EXISTS clear_column1"
 $ch "DROP TABLE IF EXISTS clear_column2"
-$ch "CREATE TABLE clear_column1 (d Date, i Int64, s String) ENGINE = ReplicatedMergeTree('/clickhouse/test_00446/tables/clear_column_concurrent', '1', d, d, 8192)"
-$ch "CREATE TABLE clear_column2 (d Date, i Int64, s String) ENGINE = ReplicatedMergeTree('/clickhouse/test_00446/tables/clear_column_concurrent', '2', d, d, 8192)"
+$ch "CREATE TABLE clear_column1 (d Date, i Int64, s String) ENGINE = ReplicatedMergeTree('/clickhouse/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/tables/clear_column_concurrent', '1', d, d, 8192)"
+$ch "CREATE TABLE clear_column2 (d Date, i Int64, s String) ENGINE = ReplicatedMergeTree('/clickhouse/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/tables/clear_column_concurrent', '2', d, d, 8192)"
 
 $ch "ALTER TABLE clear_column1 CLEAR COLUMN VasyaUnexistingColumn IN PARTITION '200001'" --replication_alter_partitions_sync=2 1>/dev/null 2>/dev/null
 rc=$?
diff --git a/tests/queries/0_stateless/00506_union_distributed.reference b/tests/queries/0_stateless/00506_union_distributed.reference
index 4a2dcd69dc2..3324c3d5675 100644
--- a/tests/queries/0_stateless/00506_union_distributed.reference
+++ b/tests/queries/0_stateless/00506_union_distributed.reference
@@ -1,16 +1,16 @@
 3	8
+13	28
 23	48
 33	68
-13	28
 3	8
+13	28
 23	48
 33	68
-13	28
 3	8
+13	28
 23	48
 33	68
-13	28
 3	8
+13	28
 23	48
 33	68
-13	28
diff --git a/tests/queries/0_stateless/00506_union_distributed.sql b/tests/queries/0_stateless/00506_union_distributed.sql
index 3f631b8da56..4c5fd9a1743 100644
--- a/tests/queries/0_stateless/00506_union_distributed.sql
+++ b/tests/queries/0_stateless/00506_union_distributed.sql
@@ -15,10 +15,10 @@ INSERT INTO union1 VALUES (11,12,13,14,15);
 INSERT INTO union2 VALUES (21,22,23,24,25);
 INSERT INTO union3 VALUES (31,32,33,34,35);
 
-select b, sum(c) from ( select a, b, sum(c) as c from union2 where a>1 group by a,b UNION ALL select a, b, sum(c) as c from union2 where b>1 group by a, b ) as a group by b;
-select b, sum(c) from ( select a, b, sum(c) as c from union1 where a>1 group by a,b UNION ALL select a, b, sum(c) as c from union2 where b>1 group by a, b ) as a group by b;
-select b, sum(c) from ( select a, b, sum(c) as c from union1 where a>1 group by a,b UNION ALL select a, b, sum(c) as c from union1 where b>1 group by a, b ) as a group by b;
-select b, sum(c) from ( select a, b, sum(c) as c from union2 where a>1 group by a,b UNION ALL select a, b, sum(c) as c from union3 where b>1 group by a, b ) as a group by b;
+select b, sum(c) from ( select a, b, sum(c) as c from union2 where a>1 group by a,b UNION ALL select a, b, sum(c) as c from union2 where b>1 group by a, b  order by a, b) as a group by b order by b;
+select b, sum(c) from ( select a, b, sum(c) as c from union1 where a>1 group by a,b UNION ALL select a, b, sum(c) as c from union2 where b>1 group by a, b order by a, b) as a group by b order by b;
+select b, sum(c) from ( select a, b, sum(c) as c from union1 where a>1 group by a,b UNION ALL select a, b, sum(c) as c from union1 where b>1 group by a, b order by a, b) as a group by b order by b;
+select b, sum(c) from ( select a, b, sum(c) as c from union2 where a>1 group by a,b UNION ALL select a, b, sum(c) as c from union3 where b>1 group by a, b order by a, b) as a group by b order by b;
 
 DROP TABLE union1;
 DROP TABLE union2;
diff --git a/tests/queries/0_stateless/00536_int_exp.sql b/tests/queries/0_stateless/00536_int_exp.sql
index c78a326a3b3..80b88e8f4f8 100644
--- a/tests/queries/0_stateless/00536_int_exp.sql
+++ b/tests/queries/0_stateless/00536_int_exp.sql
@@ -1 +1 @@
-SELECT exp2(number) AS e2d, intExp2(number) AS e2i, e2d = e2i AS e2eq, exp10(number) AS e10d, intExp10(number) AS e10i, e10d = e10i AS e10eq FROM system.numbers LIMIT 64;
+SELECT exp2(number) AS e2d, intExp2(number) AS e2i, toUInt64(e2d) = e2i AS e2eq, exp10(number) AS e10d, intExp10(number) AS e10i, toString(e10d) = toString(e10i) AS e10eq FROM system.numbers LIMIT 64;
diff --git a/tests/queries/0_stateless/00539_functions_for_working_with_json.reference b/tests/queries/0_stateless/00539_functions_for_working_with_json.reference
index c0399f8ab2e..4d3527722a1 100644
--- a/tests/queries/0_stateless/00539_functions_for_working_with_json.reference
+++ b/tests/queries/0_stateless/00539_functions_for_working_with_json.reference
@@ -13,3 +13,10 @@ test"string
  "["
  ["]", "2", "3"]
  {"nested" : [1,2,3]}
+-1
+0
+0
+-1
+1
+test_string
+test"string
diff --git a/tests/queries/0_stateless/00539_functions_for_working_with_json.sql b/tests/queries/0_stateless/00539_functions_for_working_with_json.sql
index 514b5f2e5ea..31853e92262 100644
--- a/tests/queries/0_stateless/00539_functions_for_working_with_json.sql
+++ b/tests/queries/0_stateless/00539_functions_for_working_with_json.sql
@@ -15,3 +15,11 @@ SELECT visitParamExtractRaw('{"myparam": "{"}', 'myparam');
 SELECT visitParamExtractRaw('{"myparam": "["}', 'myparam');
 SELECT visitParamExtractRaw('{"myparam": ["]", "2", "3"], "other":123}', 'myparam');
 SELECT visitParamExtractRaw('{"myparam": {"nested" : [1,2,3]}, "other":123}', 'myparam');
+
+SELECT simpleJSONExtractInt('{"myparam":-1}', 'myparam');
+SELECT simpleJSONExtractUInt('{"myparam":-1}', 'myparam');
+SELECT simpleJSONExtractFloat('{"myparam":null}', 'myparam');
+SELECT simpleJSONExtractFloat('{"myparam":-1}', 'myparam');
+SELECT simpleJSONExtractBool('{"myparam":true}', 'myparam');
+SELECT simpleJSONExtractString('{"myparam":"test_string"}', 'myparam');
+SELECT simpleJSONExtractString('{"myparam":"test\\"string"}', 'myparam');
diff --git a/tests/queries/0_stateless/00555_hasAll_hasAny.reference b/tests/queries/0_stateless/00555_hasAll_hasAny.reference
index b33700bfa02..5608f7b970e 100644
--- a/tests/queries/0_stateless/00555_hasAll_hasAny.reference
+++ b/tests/queries/0_stateless/00555_hasAll_hasAny.reference
@@ -34,10 +34,6 @@
 1
 0
 -
-0
-0
-0
-0
 -
 0
 1
diff --git a/tests/queries/0_stateless/00555_hasAll_hasAny.sql b/tests/queries/0_stateless/00555_hasAll_hasAny.sql
index 9df356dce2e..c8a6c3cecbd 100644
--- a/tests/queries/0_stateless/00555_hasAll_hasAny.sql
+++ b/tests/queries/0_stateless/00555_hasAll_hasAny.sql
@@ -39,10 +39,10 @@ select hasAny(['a', 'b'], ['a', 'c']);
 select hasAll(['a', 'b'], ['a', 'c']);
 select '-';
 
-select hasAny([1], ['a']);
-select hasAll([1], ['a']);
-select hasAll([[1, 2], [3, 4]], ['a', 'c']);
-select hasAny([[1, 2], [3, 4]], ['a', 'c']);
+select hasAny([1], ['a']); -- { serverError 386 }
+select hasAll([1], ['a']); -- { serverError 386 }
+select hasAll([[1, 2], [3, 4]], ['a', 'c']); -- { serverError 386 }
+select hasAny([[1, 2], [3, 4]], ['a', 'c']); -- { serverError 386 }
 select '-';
 
 select hasAll([[1, 2], [3, 4]], [[1, 2], [3, 5]]);
diff --git a/tests/queries/0_stateless/00555_hasSubstr.reference b/tests/queries/0_stateless/00555_hasSubstr.reference
index 1051fa28d6c..de97d19c932 100644
--- a/tests/queries/0_stateless/00555_hasSubstr.reference
+++ b/tests/queries/0_stateless/00555_hasSubstr.reference
@@ -20,8 +20,6 @@
 0
 1
 -
-0
-0
 1
 1
 0
diff --git a/tests/queries/0_stateless/00555_hasSubstr.sql b/tests/queries/0_stateless/00555_hasSubstr.sql
index 04c70e4a43b..5f90a69c546 100644
--- a/tests/queries/0_stateless/00555_hasSubstr.sql
+++ b/tests/queries/0_stateless/00555_hasSubstr.sql
@@ -25,8 +25,8 @@ select hasSubstr(['a', 'b'], ['a', 'c']);
 select hasSubstr(['a', 'c', 'b'], ['a', 'c']);
 select '-';
 
-select hasSubstr([1], ['a']);
-select hasSubstr([[1, 2], [3, 4]], ['a', 'c']);
+select hasSubstr([1], ['a']); -- { serverError 386 }
+select hasSubstr([[1, 2], [3, 4]], ['a', 'c']); -- { serverError 386 }
 select hasSubstr([[1, 2], [3, 4], [5, 8]], [[3, 4]]);
 select hasSubstr([[1, 2], [3, 4], [5, 8]], [[3, 4], [5, 8]]);
 select hasSubstr([[1, 2], [3, 4], [5, 8]], [[1, 2], [5, 8]]);
diff --git a/tests/queries/0_stateless/00561_storage_join.reference b/tests/queries/0_stateless/00561_storage_join.reference
index 867b945ba1c..2fe12a38360 100644
--- a/tests/queries/0_stateless/00561_storage_join.reference
+++ b/tests/queries/0_stateless/00561_storage_join.reference
@@ -2,3 +2,4 @@
 2	22	92	82	123457
 1	11	91	81	123456
 2	22	92	82	123457
+11	1	91	81	123456
diff --git a/tests/queries/0_stateless/00561_storage_join.sql b/tests/queries/0_stateless/00561_storage_join.sql
index 62ca80d31fe..01e66d0c380 100644
--- a/tests/queries/0_stateless/00561_storage_join.sql
+++ b/tests/queries/0_stateless/00561_storage_join.sql
@@ -36,5 +36,13 @@ from (
 ) js1
 SEMI LEFT JOIN joinbug_join using id2;
 
+/* type conversion */
+SELECT * FROM
+(
+    SELECT toUInt32(11) AS id2
+) AS js1
+SEMI LEFT JOIN joinbug_join USING (id2);
+
+
 DROP TABLE joinbug;
 DROP TABLE joinbug_join;
diff --git a/tests/queries/0_stateless/00597_push_down_predicate.reference b/tests/queries/0_stateless/00597_push_down_predicate.reference
index bd1c4791df4..59313c35b81 100644
--- a/tests/queries/0_stateless/00597_push_down_predicate.reference
+++ b/tests/queries/0_stateless/00597_push_down_predicate.reference
@@ -585,3 +585,15 @@ SEMI LEFT JOIN
 ) AS r USING (id)
 WHERE r.id = 1
 2000-01-01	1	test string 1	1	2000-01-01	test string 1	1
+SELECT value + t1.value AS expr
+FROM 
+(
+    SELECT
+        value,
+        t1.value
+    FROM test_00597 AS t0
+    ALL FULL OUTER JOIN test_00597 AS t1 USING (date)
+    WHERE (value + `t1.value`) < 3
+)
+WHERE expr < 3
+2
diff --git a/tests/queries/0_stateless/00597_push_down_predicate.sql b/tests/queries/0_stateless/00597_push_down_predicate.sql
index ec306ac6792..2e3357241ad 100644
--- a/tests/queries/0_stateless/00597_push_down_predicate.sql
+++ b/tests/queries/0_stateless/00597_push_down_predicate.sql
@@ -135,5 +135,9 @@ SELECT * FROM (SELECT * FROM (SELECT * FROM test_00597) AS a ANY LEFT JOIN (SELE
 EXPLAIN SYNTAX SELECT * FROM (SELECT * FROM test_00597) ANY INNER JOIN (SELECT * FROM (SELECT * FROM test_00597)) as r USING id WHERE r.id = 1;
 SELECT * FROM (SELECT * FROM test_00597) ANY INNER JOIN (SELECT * FROM (SELECT * FROM test_00597)) as r USING id WHERE r.id = 1;
 
+-- issue 20497
+EXPLAIN SYNTAX SELECT value + t1.value AS expr FROM (SELECT t0.value, t1.value FROM test_00597 AS t0 FULL JOIN test_00597 AS t1 USING date) WHERE expr < 3;
+SELECT value + t1.value AS expr FROM (SELECT t0.value, t1.value FROM test_00597 AS t0 FULL JOIN test_00597 AS t1 USING date) WHERE expr < 3;
+
 DROP TABLE IF EXISTS test_00597;
 DROP TABLE IF EXISTS test_view_00597;
diff --git a/tests/queries/0_stateless/00600_replace_running_query.sh b/tests/queries/0_stateless/00600_replace_running_query.sh
index be5523e06ea..78ea4daf6bb 100755
--- a/tests/queries/0_stateless/00600_replace_running_query.sh
+++ b/tests/queries/0_stateless/00600_replace_running_query.sh
@@ -6,6 +6,8 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
+${CLICKHOUSE_CLIENT} -q "drop user if exists u_00600"
+${CLICKHOUSE_CLIENT} -q "create user u_00600 settings max_execution_time=60, readonly=1"
 
 function wait_for_query_to_start()
 {
@@ -22,7 +24,7 @@ $CLICKHOUSE_CURL -sS "$CLICKHOUSE_URL&query_id=hello&replace_running_query=1" -d
 # Wait for it to be replaced
 wait
 
-${CLICKHOUSE_CLIENT_BINARY} --user=readonly --query_id=42 --query='SELECT 2, count() FROM system.numbers' 2>&1 | grep -cF 'was cancelled' &
+${CLICKHOUSE_CLIENT_BINARY} --user=u_00600 --query_id=42 --query='SELECT 2, count() FROM system.numbers' 2>&1 | grep -cF 'was cancelled' &
 wait_for_query_to_start '42'
 
 # Trying to run another query with the same query_id
@@ -39,3 +41,4 @@ wait_for_query_to_start '42'
 ${CLICKHOUSE_CLIENT} --query_id=42 --replace_running_query=1 --replace_running_query_max_wait_ms=500 --query='SELECT 43' 2>&1 | grep -F "can't be stopped" > /dev/null
 wait
 ${CLICKHOUSE_CLIENT} --query_id=42 --replace_running_query=1 --query='SELECT 44'
+${CLICKHOUSE_CLIENT} -q "drop user u_00600"
diff --git a/tests/queries/0_stateless/00626_replace_partition_from_table_zookeeper.sh b/tests/queries/0_stateless/00626_replace_partition_from_table_zookeeper.sh
index 5aa445858db..443f2856c88 100755
--- a/tests/queries/0_stateless/00626_replace_partition_from_table_zookeeper.sh
+++ b/tests/queries/0_stateless/00626_replace_partition_from_table_zookeeper.sh
@@ -12,19 +12,22 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 function query_with_retry
 {
-    retry=0
+    local query="$1" && shift
+
+    local retry=0
     until [ $retry -ge 5 ]
     do
-        result=$($CLICKHOUSE_CLIENT $2 --query="$1" 2>&1)
+        local result
+        result="$($CLICKHOUSE_CLIENT "$@" --query="$query" 2>&1)"
         if [ "$?" == 0 ]; then
             echo -n "$result"
             return
         else
-            retry=$(($retry + 1))
+            retry=$((retry + 1))
             sleep 3
         fi
     done
-    echo "Query '$1' failed with '$result'"
+    echo "Query '$query' failed with '$result'"
 }
 
 $CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS src;"
@@ -32,8 +35,8 @@ $CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS dst_r1;"
 $CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS dst_r2;"
 
 $CLICKHOUSE_CLIENT --query="CREATE TABLE src (p UInt64, k String, d UInt64) ENGINE = MergeTree PARTITION BY p ORDER BY k;"
-$CLICKHOUSE_CLIENT --query="CREATE TABLE dst_r1 (p UInt64, k String, d UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/test_00626/dst_1', '1') PARTITION BY p ORDER BY k SETTINGS old_parts_lifetime=1, cleanup_delay_period=1, cleanup_delay_period_random_add=0;"
-$CLICKHOUSE_CLIENT --query="CREATE TABLE dst_r2 (p UInt64, k String, d UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/test_00626/dst_1', '2') PARTITION BY p ORDER BY k SETTINGS old_parts_lifetime=1, cleanup_delay_period=1, cleanup_delay_period_random_add=0;"
+$CLICKHOUSE_CLIENT --query="CREATE TABLE dst_r1 (p UInt64, k String, d UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/dst_1', '1') PARTITION BY p ORDER BY k SETTINGS old_parts_lifetime=1, cleanup_delay_period=1, cleanup_delay_period_random_add=0;"
+$CLICKHOUSE_CLIENT --query="CREATE TABLE dst_r2 (p UInt64, k String, d UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/dst_1', '2') PARTITION BY p ORDER BY k SETTINGS old_parts_lifetime=1, cleanup_delay_period=1, cleanup_delay_period_random_add=0;"
 
 $CLICKHOUSE_CLIENT --query="INSERT INTO src VALUES (0, '0', 1);"
 $CLICKHOUSE_CLIENT --query="INSERT INTO src VALUES (1, '0', 1);"
@@ -139,7 +142,7 @@ $CLICKHOUSE_CLIENT --query="DROP TABLE src;"
 
 $CLICKHOUSE_CLIENT --query="SELECT count(), sum(d), uniqExact(_part) FROM dst_r1;"
 $CLICKHOUSE_CLIENT --query="SYSTEM SYNC REPLICA dst_r1;"
-query_with_retry "OPTIMIZE TABLE dst_r1 PARTITION 1;" "--replication_alter_partitions_sync=0 --optimize_throw_if_noop=1"
+query_with_retry "OPTIMIZE TABLE dst_r1 PARTITION 1;" --replication_alter_partitions_sync=0 --optimize_throw_if_noop=1
 
 $CLICKHOUSE_CLIENT --query="SYSTEM SYNC REPLICA dst_r1;"
 $CLICKHOUSE_CLIENT --query="SELECT count(), sum(d), uniqExact(_part) FROM dst_r1;"
diff --git a/tests/queries/0_stateless/00632_aggregation_window_funnel.reference b/tests/queries/0_stateless/00632_aggregation_window_funnel.reference
index 492135567ea..2c68f277bfa 100644
--- a/tests/queries/0_stateless/00632_aggregation_window_funnel.reference
+++ b/tests/queries/0_stateless/00632_aggregation_window_funnel.reference
@@ -57,3 +57,7 @@
 [2, 0]
 [3, 1]
 [4, 1]
+1
+1
+1
+1
diff --git a/tests/queries/0_stateless/00632_aggregation_window_funnel.sql b/tests/queries/0_stateless/00632_aggregation_window_funnel.sql
index 5a1610256ac..aa0dc804238 100644
--- a/tests/queries/0_stateless/00632_aggregation_window_funnel.sql
+++ b/tests/queries/0_stateless/00632_aggregation_window_funnel.sql
@@ -79,3 +79,13 @@ select u, windowFunnel(86400)(dt, a is null and b is null) as s from funnel_test
 select u, windowFunnel(86400)(dt, a is null, b = 'b3') as s from funnel_test_non_null group by u order by u format JSONCompactEachRow;
 select u, windowFunnel(86400, 'strict_order')(dt, a is null, b = 'b3') as s from funnel_test_non_null group by u order by u format JSONCompactEachRow;
 drop table funnel_test_non_null;
+
+create table funnel_test_strict_increase (timestamp UInt32, event UInt32) engine=Memory;
+insert into funnel_test_strict_increase values (0,1000),(1,1001),(1,1002),(1,1003),(2,1004);
+
+select 5 = windowFunnel(10000)(timestamp, event = 1000, event = 1001, event = 1002, event = 1003, event = 1004) from funnel_test_strict_increase;
+select 2 = windowFunnel(10000, 'strict_increase')(timestamp, event = 1000, event = 1001, event = 1002, event = 1003, event = 1004) from funnel_test_strict_increase;
+select 3 = windowFunnel(10000)(timestamp, event = 1004, event = 1004, event = 1004) from funnel_test_strict_increase;
+select 1 = windowFunnel(10000, 'strict_increase')(timestamp, event = 1004, event = 1004, event = 1004) from funnel_test_strict_increase;
+
+drop table funnel_test_strict_increase;
diff --git a/tests/queries/0_stateless/00633_materialized_view_and_too_many_parts_zookeeper.sh b/tests/queries/0_stateless/00633_materialized_view_and_too_many_parts_zookeeper.sh
index 817da08bfa0..def8e8f4cfe 100755
--- a/tests/queries/0_stateless/00633_materialized_view_and_too_many_parts_zookeeper.sh
+++ b/tests/queries/0_stateless/00633_materialized_view_and_too_many_parts_zookeeper.sh
@@ -10,10 +10,10 @@ ${CLICKHOUSE_CLIENT} --query "DROP TABLE IF EXISTS a"
 ${CLICKHOUSE_CLIENT} --query "DROP TABLE IF EXISTS b"
 ${CLICKHOUSE_CLIENT} --query "DROP TABLE IF EXISTS c"
 
-${CLICKHOUSE_CLIENT} --query "CREATE TABLE root (d UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/test_00633/root', '1') ORDER BY d"
-${CLICKHOUSE_CLIENT} --query "CREATE MATERIALIZED VIEW a (d UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/test_00633/a', '1') ORDER BY d AS SELECT * FROM root"
-${CLICKHOUSE_CLIENT} --query "CREATE MATERIALIZED VIEW b (d UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/test_00633/b', '1') ORDER BY d SETTINGS parts_to_delay_insert=1, parts_to_throw_insert=1 AS SELECT * FROM root"
-${CLICKHOUSE_CLIENT} --query "CREATE MATERIALIZED VIEW c (d UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/test_00633/c', '1') ORDER BY d AS SELECT * FROM root"
+${CLICKHOUSE_CLIENT} --query "CREATE TABLE root (d UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/root', '1') ORDER BY d"
+${CLICKHOUSE_CLIENT} --query "CREATE MATERIALIZED VIEW a (d UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/a', '1') ORDER BY d AS SELECT * FROM root"
+${CLICKHOUSE_CLIENT} --query "CREATE MATERIALIZED VIEW b (d UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/b', '1') ORDER BY d SETTINGS parts_to_delay_insert=1, parts_to_throw_insert=1 AS SELECT * FROM root"
+${CLICKHOUSE_CLIENT} --query "CREATE MATERIALIZED VIEW c (d UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/c', '1') ORDER BY d AS SELECT * FROM root"
 
 ${CLICKHOUSE_CLIENT} --query "INSERT INTO root VALUES (1)";
 ${CLICKHOUSE_CLIENT} --query "SELECT _table, d FROM merge('${CLICKHOUSE_DATABASE}', '^[abc]\$') ORDER BY _table"
@@ -33,7 +33,7 @@ ${CLICKHOUSE_CLIENT} --query "DROP TABLE c"
 # Deduplication check for non-replicated root table
 echo
 ${CLICKHOUSE_CLIENT} --query "CREATE TABLE root (d UInt64) ENGINE = Null"
-${CLICKHOUSE_CLIENT} --query "CREATE MATERIALIZED VIEW d (d UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/test_00633/d', '1') ORDER BY d AS SELECT * FROM root"
+${CLICKHOUSE_CLIENT} --query "CREATE MATERIALIZED VIEW d (d UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/d', '1') ORDER BY d AS SELECT * FROM root"
 ${CLICKHOUSE_CLIENT} --query "INSERT INTO root VALUES (1)";
 ${CLICKHOUSE_CLIENT} --query "INSERT INTO root VALUES (1)";
 ${CLICKHOUSE_CLIENT} --query "SELECT * FROM d";
diff --git a/tests/queries/0_stateless/00634_performance_introspection_and_logging.sh b/tests/queries/0_stateless/00634_performance_introspection_and_logging.sh
index e51e4fea5db..cc5ece15435 100755
--- a/tests/queries/0_stateless/00634_performance_introspection_and_logging.sh
+++ b/tests/queries/0_stateless/00634_performance_introspection_and_logging.sh
@@ -48,7 +48,7 @@ SELECT
     threads_realtime >= threads_time_user_system_io,
     any(length(thread_ids)) >= 1
     FROM
-        (SELECT * FROM system.query_log PREWHERE query='$heavy_cpu_query' WHERE event_date >= today()-1 AND current_database = currentDatabase() AND type=2 ORDER BY event_time DESC LIMIT 1)
+        (SELECT * FROM system.query_log PREWHERE query='$heavy_cpu_query' WHERE event_date >= today()-2 AND current_database = currentDatabase() AND type=2 ORDER BY event_time DESC LIMIT 1)
     ARRAY JOIN ProfileEvents.Names AS PN, ProfileEvents.Values AS PV"
 
 # Clean
diff --git a/tests/queries/0_stateless/00652_replicated_mutations_default_database_zookeeper.sh b/tests/queries/0_stateless/00652_replicated_mutations_default_database_zookeeper.sh
index 02f552c250d..58295e17790 100755
--- a/tests/queries/0_stateless/00652_replicated_mutations_default_database_zookeeper.sh
+++ b/tests/queries/0_stateless/00652_replicated_mutations_default_database_zookeeper.sh
@@ -11,7 +11,7 @@ ${CLICKHOUSE_CLIENT} --multiquery << EOF
 DROP TABLE IF EXISTS mutations_r1;
 DROP TABLE IF EXISTS for_subquery;
 
-CREATE TABLE mutations_r1(x UInt32, y UInt32) ENGINE ReplicatedMergeTree('/clickhouse/tables/${CLICKHOUSE_DATABASE}/mutations', 'r1') ORDER BY x;
+CREATE TABLE mutations_r1(x UInt32, y UInt32) ENGINE ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/mutations', 'r1') ORDER BY x;
 INSERT INTO mutations_r1 VALUES (123, 1), (234, 2), (345, 3);
 
 CREATE TABLE for_subquery(x UInt32) ENGINE TinyLog;
diff --git a/tests/queries/0_stateless/00652_replicated_mutations_zookeeper.sh b/tests/queries/0_stateless/00652_replicated_mutations_zookeeper.sh
index 08a39c58c3e..3ec6e4e3e90 100755
--- a/tests/queries/0_stateless/00652_replicated_mutations_zookeeper.sh
+++ b/tests/queries/0_stateless/00652_replicated_mutations_zookeeper.sh
@@ -10,8 +10,8 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 ${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS mutations_r1"
 ${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS mutations_r2"
 
-${CLICKHOUSE_CLIENT} --query="CREATE TABLE mutations_r1(d Date, x UInt32, s String, m MATERIALIZED x + 2) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00652/mutations', 'r1', d, intDiv(x, 10), 8192)"
-${CLICKHOUSE_CLIENT} --query="CREATE TABLE mutations_r2(d Date, x UInt32, s String, m MATERIALIZED x + 2) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00652/mutations', 'r2', d, intDiv(x, 10), 8192)"
+${CLICKHOUSE_CLIENT} --query="CREATE TABLE mutations_r1(d Date, x UInt32, s String, m MATERIALIZED x + 2) ENGINE ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/mutations', 'r1', d, intDiv(x, 10), 8192)"
+${CLICKHOUSE_CLIENT} --query="CREATE TABLE mutations_r2(d Date, x UInt32, s String, m MATERIALIZED x + 2) ENGINE ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/mutations', 'r2', d, intDiv(x, 10), 8192)"
 
 # Test a mutation on empty table
 ${CLICKHOUSE_CLIENT} --query="ALTER TABLE mutations_r1 DELETE WHERE x = 1 SETTINGS mutations_sync = 2"
@@ -51,11 +51,11 @@ ${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS mutations_cleaner_r1"
 ${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS mutations_cleaner_r2"
 
 # Create 2 replicas with finished_mutations_to_keep = 2
-${CLICKHOUSE_CLIENT} --query="CREATE TABLE mutations_cleaner_r1(x UInt32) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00652/mutations_cleaner', 'r1') ORDER BY x SETTINGS \
+${CLICKHOUSE_CLIENT} --query="CREATE TABLE mutations_cleaner_r1(x UInt32) ENGINE ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/mutations_cleaner', 'r1') ORDER BY x SETTINGS \
     finished_mutations_to_keep = 2,
     cleanup_delay_period = 1,
     cleanup_delay_period_random_add = 0"
-${CLICKHOUSE_CLIENT} --query="CREATE TABLE mutations_cleaner_r2(x UInt32) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00652/mutations_cleaner', 'r2') ORDER BY x SETTINGS \
+${CLICKHOUSE_CLIENT} --query="CREATE TABLE mutations_cleaner_r2(x UInt32) ENGINE ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/mutations_cleaner', 'r2') ORDER BY x SETTINGS \
     finished_mutations_to_keep = 2,
     cleanup_delay_period = 1,
     cleanup_delay_period_random_add = 0"
diff --git a/tests/queries/0_stateless/00700_decimal_complex_types.reference b/tests/queries/0_stateless/00700_decimal_complex_types.reference
index e81dd94513f..9c7c6fefefd 100644
--- a/tests/queries/0_stateless/00700_decimal_complex_types.reference
+++ b/tests/queries/0_stateless/00700_decimal_complex_types.reference
@@ -39,9 +39,33 @@ Tuple(Decimal(9, 1), Decimal(18, 1), Decimal(38, 1))	Decimal(9, 1)	Decimal(18, 1
 1	0
 1	0
 1	0
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
 1	0
 2	0
 3	0
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
 [0.100,0.200,0.300,0.400,0.500,0.600]	Array(Decimal(18, 3))
 [0.100,0.200,0.300,0.700,0.800,0.900]	Array(Decimal(38, 3))
 [0.400,0.500,0.600,0.700,0.800,0.900]	Array(Decimal(38, 3))
diff --git a/tests/queries/0_stateless/00700_decimal_complex_types.sql b/tests/queries/0_stateless/00700_decimal_complex_types.sql
index 2d506b124a2..f4b29e77be9 100644
--- a/tests/queries/0_stateless/00700_decimal_complex_types.sql
+++ b/tests/queries/0_stateless/00700_decimal_complex_types.sql
@@ -58,35 +58,35 @@ SELECT has(a, toDecimal32(0.1, 3)), has(a, toDecimal32(1.0, 3)) FROM decimal;
 SELECT has(b, toDecimal64(0.4, 3)), has(b, toDecimal64(1.0, 3)) FROM decimal;
 SELECT has(c, toDecimal128(0.7, 3)), has(c, toDecimal128(1.0, 3)) FROM decimal;
 
-SELECT has(a, toDecimal32(0.1, 2)) FROM decimal; -- { serverError 43 }
-SELECT has(a, toDecimal32(0.1, 4)) FROM decimal; -- { serverError 43 }
-SELECT has(a, toDecimal64(0.1, 3)) FROM decimal; -- { serverError 43 }
-SELECT has(a, toDecimal128(0.1, 3)) FROM decimal; -- { serverError 43 }
-SELECT has(b, toDecimal32(0.4, 3)) FROM decimal; -- { serverError 43 }
-SELECT has(b, toDecimal64(0.4, 2)) FROM decimal; -- { serverError 43 }
-SELECT has(b, toDecimal64(0.4, 4)) FROM decimal; -- { serverError 43 }
-SELECT has(b, toDecimal128(0.4, 3)) FROM decimal; -- { serverError 43 }
-SELECT has(c, toDecimal32(0.7, 3)) FROM decimal; -- { serverError 43 }
-SELECT has(c, toDecimal64(0.7, 3)) FROM decimal; -- { serverError 43 }
-SELECT has(c, toDecimal128(0.7, 2)) FROM decimal; -- { serverError 43 }
-SELECT has(c, toDecimal128(0.7, 4)) FROM decimal; -- { serverError 43 }
+SELECT has(a, toDecimal32(0.1, 2)) FROM decimal;
+SELECT has(a, toDecimal32(0.1, 4)) FROM decimal;
+SELECT has(a, toDecimal64(0.1, 3)) FROM decimal;
+SELECT has(a, toDecimal128(0.1, 3)) FROM decimal;
+SELECT has(b, toDecimal32(0.4, 3)) FROM decimal;
+SELECT has(b, toDecimal64(0.4, 2)) FROM decimal;
+SELECT has(b, toDecimal64(0.4, 4)) FROM decimal;
+SELECT has(b, toDecimal128(0.4, 3)) FROM decimal;
+SELECT has(c, toDecimal32(0.7, 3)) FROM decimal;
+SELECT has(c, toDecimal64(0.7, 3)) FROM decimal;
+SELECT has(c, toDecimal128(0.7, 2)) FROM decimal;
+SELECT has(c, toDecimal128(0.7, 4)) FROM decimal;
 
 SELECT indexOf(a, toDecimal32(0.1, 3)), indexOf(a, toDecimal32(1.0, 3)) FROM decimal;
 SELECT indexOf(b, toDecimal64(0.5, 3)), indexOf(b, toDecimal64(1.0, 3)) FROM decimal;
 SELECT indexOf(c, toDecimal128(0.9, 3)), indexOf(c, toDecimal128(1.0, 3)) FROM decimal;
 
-SELECT indexOf(a, toDecimal32(0.1, 2)) FROM decimal; -- { serverError 43 }
-SELECT indexOf(a, toDecimal32(0.1, 4)) FROM decimal; -- { serverError 43 }
-SELECT indexOf(a, toDecimal64(0.1, 3)) FROM decimal; -- { serverError 43 }
-SELECT indexOf(a, toDecimal128(0.1, 3)) FROM decimal; -- { serverError 43 }
-SELECT indexOf(b, toDecimal32(0.4, 3)) FROM decimal; -- { serverError 43 }
-SELECT indexOf(b, toDecimal64(0.4, 2)) FROM decimal; -- { serverError 43 }
-SELECT indexOf(b, toDecimal64(0.4, 4)) FROM decimal; -- { serverError 43 }
-SELECT indexOf(b, toDecimal128(0.4, 3)) FROM decimal; -- { serverError 43 }
-SELECT indexOf(c, toDecimal32(0.7, 3)) FROM decimal; -- { serverError 43 }
-SELECT indexOf(c, toDecimal64(0.7, 3)) FROM decimal; -- { serverError 43 }
-SELECT indexOf(c, toDecimal128(0.7, 2)) FROM decimal; -- { serverError 43 }
-SELECT indexOf(c, toDecimal128(0.7, 4)) FROM decimal; -- { serverError 43 }
+SELECT indexOf(a, toDecimal32(0.1, 2)) FROM decimal;
+SELECT indexOf(a, toDecimal32(0.1, 4)) FROM decimal;
+SELECT indexOf(a, toDecimal64(0.1, 3)) FROM decimal;
+SELECT indexOf(a, toDecimal128(0.1, 3)) FROM decimal;
+SELECT indexOf(b, toDecimal32(0.4, 3)) FROM decimal;
+SELECT indexOf(b, toDecimal64(0.4, 2)) FROM decimal;
+SELECT indexOf(b, toDecimal64(0.4, 4)) FROM decimal;
+SELECT indexOf(b, toDecimal128(0.4, 3)) FROM decimal;
+SELECT indexOf(c, toDecimal32(0.7, 3)) FROM decimal;
+SELECT indexOf(c, toDecimal64(0.7, 3)) FROM decimal;
+SELECT indexOf(c, toDecimal128(0.7, 2)) FROM decimal;
+SELECT indexOf(c, toDecimal128(0.7, 4)) FROM decimal;
 
 SELECT arrayConcat(a, b) AS x, toTypeName(x) FROM decimal;
 SELECT arrayConcat(a, c) AS x, toTypeName(x) FROM decimal;
diff --git a/tests/queries/0_stateless/00715_fetch_merged_or_mutated_part_zookeeper.sh b/tests/queries/0_stateless/00715_fetch_merged_or_mutated_part_zookeeper.sh
index 54b6c80f2ac..48833d2643c 100755
--- a/tests/queries/0_stateless/00715_fetch_merged_or_mutated_part_zookeeper.sh
+++ b/tests/queries/0_stateless/00715_fetch_merged_or_mutated_part_zookeeper.sh
@@ -11,8 +11,8 @@ ${CLICKHOUSE_CLIENT} -n --query="
     DROP TABLE IF EXISTS fetches_r1;
     DROP TABLE IF EXISTS fetches_r2"
 
-${CLICKHOUSE_CLIENT} --query="CREATE TABLE fetches_r1(x UInt32) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00715/fetches', 'r1') ORDER BY x"
-${CLICKHOUSE_CLIENT} --query="CREATE TABLE fetches_r2(x UInt32) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00715/fetches', 'r2') ORDER BY x \
+${CLICKHOUSE_CLIENT} --query="CREATE TABLE fetches_r1(x UInt32) ENGINE ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/fetches', 'r1') ORDER BY x"
+${CLICKHOUSE_CLIENT} --query="CREATE TABLE fetches_r2(x UInt32) ENGINE ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/fetches', 'r2') ORDER BY x \
     SETTINGS prefer_fetch_merged_part_time_threshold=0, \
              prefer_fetch_merged_part_size_threshold=0"
 
diff --git a/tests/queries/0_stateless/00717_merge_and_distributed.sql b/tests/queries/0_stateless/00717_merge_and_distributed.sql
index f0d34b5165f..35dad18937a 100644
--- a/tests/queries/0_stateless/00717_merge_and_distributed.sql
+++ b/tests/queries/0_stateless/00717_merge_and_distributed.sql
@@ -18,9 +18,9 @@ SELECT * FROM merge(currentDatabase(), 'test_local_1');
 SELECT *, _table FROM merge(currentDatabase(), 'test_local_1') ORDER BY _table;
 SELECT sum(value), _table FROM merge(currentDatabase(), 'test_local_1') GROUP BY _table ORDER BY _table;
 SELECT * FROM merge(currentDatabase(), 'test_local_1') WHERE _table = 'test_local_1';
-SELECT * FROM merge(currentDatabase(), 'test_local_1') PREWHERE _table = 'test_local_1'; -- { serverError 16 }
+SELECT * FROM merge(currentDatabase(), 'test_local_1') PREWHERE _table = 'test_local_1'; -- { serverError 10 }
 SELECT * FROM merge(currentDatabase(), 'test_local_1') WHERE _table in ('test_local_1', 'test_local_2');
-SELECT * FROM merge(currentDatabase(), 'test_local_1') PREWHERE _table in ('test_local_1', 'test_local_2'); -- { serverError 16 }
+SELECT * FROM merge(currentDatabase(), 'test_local_1') PREWHERE _table in ('test_local_1', 'test_local_2'); -- { serverError 10 }
 
 SELECT '--------------Single Distributed------------';
 SELECT * FROM merge(currentDatabase(), 'test_distributed_1');
@@ -36,9 +36,9 @@ SELECT * FROM merge(currentDatabase(), 'test_local_1|test_local_2') ORDER BY _ta
 SELECT *, _table FROM merge(currentDatabase(), 'test_local_1|test_local_2') ORDER BY _table;
 SELECT sum(value), _table FROM merge(currentDatabase(), 'test_local_1|test_local_2') GROUP BY _table ORDER BY _table;
 SELECT * FROM merge(currentDatabase(), 'test_local_1|test_local_2') WHERE _table = 'test_local_1';
-SELECT * FROM merge(currentDatabase(), 'test_local_1|test_local_2') PREWHERE _table = 'test_local_1'; -- { serverError 16 }
+SELECT * FROM merge(currentDatabase(), 'test_local_1|test_local_2') PREWHERE _table = 'test_local_1'; -- { serverError 10 }
 SELECT * FROM merge(currentDatabase(), 'test_local_1|test_local_2') WHERE _table in ('test_local_1', 'test_local_2') ORDER BY value;
-SELECT * FROM merge(currentDatabase(), 'test_local_1|test_local_2') PREWHERE _table in ('test_local_1', 'test_local_2') ORDER BY value; -- { serverError 16 }
+SELECT * FROM merge(currentDatabase(), 'test_local_1|test_local_2') PREWHERE _table in ('test_local_1', 'test_local_2') ORDER BY value; -- { serverError 10 }
 
 SELECT '--------------Local Merge Distributed------------';
 SELECT * FROM merge(currentDatabase(), 'test_local_1|test_distributed_2') ORDER BY _table;
diff --git a/tests/queries/0_stateless/00753_distributed_system_columns_and_system_tables.reference b/tests/queries/0_stateless/00753_distributed_system_columns_and_system_tables.reference
new file mode 100644
index 00000000000..042e79f1b80
--- /dev/null
+++ b/tests/queries/0_stateless/00753_distributed_system_columns_and_system_tables.reference
@@ -0,0 +1,4 @@
+Check total_bytes/total_rows for Distributed
+0	\N
+1	\N
+0	\N
diff --git a/tests/queries/0_stateless/00753_distributed_system_columns_and_system_tables.sql b/tests/queries/0_stateless/00753_distributed_system_columns_and_system_tables.sql
new file mode 100644
index 00000000000..fd9786be011
--- /dev/null
+++ b/tests/queries/0_stateless/00753_distributed_system_columns_and_system_tables.sql
@@ -0,0 +1,11 @@
+SELECT 'Check total_bytes/total_rows for Distributed';
+CREATE TABLE check_system_tables_null (key Int) Engine=Null();
+CREATE TABLE check_system_tables AS check_system_tables_null Engine=Distributed(test_shard_localhost, currentDatabase(), check_system_tables_null);
+SYSTEM STOP DISTRIBUTED SENDS check_system_tables;
+SELECT total_bytes, total_rows FROM system.tables WHERE database = currentDatabase() AND name = 'check_system_tables';
+INSERT INTO check_system_tables SELECT * FROM numbers(1) SETTINGS prefer_localhost_replica=0;
+SELECT total_bytes>0, total_rows FROM system.tables WHERE database = currentDatabase() AND name = 'check_system_tables';
+SYSTEM FLUSH DISTRIBUTED check_system_tables;
+SELECT total_bytes, total_rows FROM system.tables WHERE database = currentDatabase() AND name = 'check_system_tables';
+DROP TABLE check_system_tables_null;
+DROP TABLE check_system_tables;
diff --git a/tests/queries/0_stateless/00800_versatile_storage_join.reference b/tests/queries/0_stateless/00800_versatile_storage_join.reference
index f1d3f98e32a..0a143f8bc12 100644
--- a/tests/queries/0_stateless/00800_versatile_storage_join.reference
+++ b/tests/queries/0_stateless/00800_versatile_storage_join.reference
@@ -1,5 +1,4 @@
 --------read--------
-def	[1,2]	2
 abc	[0]	1
 def	[1,2]	2
 abc	[0]	1
@@ -7,6 +6,7 @@ def	[1,2]	2
 abc	[0]	1
 def	[1,2]	2
 abc	[0]	1
+def	[1,2]	2
 --------joinGet--------
 
 abc
diff --git a/tests/queries/0_stateless/00800_versatile_storage_join.sql b/tests/queries/0_stateless/00800_versatile_storage_join.sql
index c1e325ce9aa..b0ec6f69f93 100644
--- a/tests/queries/0_stateless/00800_versatile_storage_join.sql
+++ b/tests/queries/0_stateless/00800_versatile_storage_join.sql
@@ -22,10 +22,10 @@ INSERT INTO join_all_left VALUES ('abc', [0], 1), ('def', [1, 2], 2);
 -- read from StorageJoin
 
 SELECT '--------read--------';
-SELECT * from join_any_inner;
-SELECT * from join_any_left;
-SELECT * from join_all_inner;
-SELECT * from join_all_left;
+SELECT * from join_any_inner ORDER BY k;
+SELECT * from join_any_left ORDER BY k;
+SELECT * from join_all_inner ORDER BY k;
+SELECT * from join_all_left ORDER BY k;
 
 -- create StorageJoin tables with customized settings
 
diff --git a/tests/queries/0_stateless/00804_rollup_with_having.reference b/tests/queries/0_stateless/00804_rollup_with_having.reference
index 62de36a36ba..0f708e8d900 100644
--- a/tests/queries/0_stateless/00804_rollup_with_having.reference
+++ b/tests/queries/0_stateless/00804_rollup_with_having.reference
@@ -1,4 +1,4 @@
-a	\N	1
 a	b	1
 a	\N	2
+a	\N	1
 a	b	1
diff --git a/tests/queries/0_stateless/00804_rollup_with_having.sql b/tests/queries/0_stateless/00804_rollup_with_having.sql
index cddaa8b6451..29b9ae19041 100644
--- a/tests/queries/0_stateless/00804_rollup_with_having.sql
+++ b/tests/queries/0_stateless/00804_rollup_with_having.sql
@@ -8,7 +8,7 @@ INSERT INTO rollup_having VALUES (NULL, NULL);
 INSERT INTO rollup_having VALUES ('a', NULL);
 INSERT INTO rollup_having VALUES ('a', 'b');
 
-SELECT a, b, count(*) FROM rollup_having GROUP BY a, b WITH ROLLUP HAVING a IS NOT NULL;
-SELECT a, b, count(*) FROM rollup_having GROUP BY a, b WITH ROLLUP HAVING a IS NOT NULL and b IS NOT NULL;
+SELECT a, b, count(*) FROM rollup_having GROUP BY a, b WITH ROLLUP HAVING a IS NOT NULL ORDER BY a, b;
+SELECT a, b, count(*) FROM rollup_having GROUP BY a, b WITH ROLLUP HAVING a IS NOT NULL and b IS NOT NULL ORDER BY a, b;
 
 DROP TABLE rollup_having;
diff --git a/tests/queries/0_stateless/00814_replicated_minimalistic_part_header_zookeeper.sql b/tests/queries/0_stateless/00814_replicated_minimalistic_part_header_zookeeper.sql
index 0fd760d73d5..63897e225ce 100644
--- a/tests/queries/0_stateless/00814_replicated_minimalistic_part_header_zookeeper.sql
+++ b/tests/queries/0_stateless/00814_replicated_minimalistic_part_header_zookeeper.sql
@@ -4,13 +4,13 @@ DROP TABLE IF EXISTS part_header_r2;
 SET replication_alter_partitions_sync = 2;
 
 CREATE TABLE part_header_r1(x UInt32, y UInt32)
-    ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00814/part_header', '1') ORDER BY x
+    ENGINE ReplicatedMergeTree('/clickhouse/tables/'||currentDatabase()||'/test_00814/part_header/{shard}', '1{replica}') ORDER BY x
     SETTINGS use_minimalistic_part_header_in_zookeeper = 0,
              old_parts_lifetime = 1,
              cleanup_delay_period = 0,
              cleanup_delay_period_random_add = 0;
 CREATE TABLE part_header_r2(x UInt32, y UInt32)
-    ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00814/part_header', '2') ORDER BY x
+    ENGINE ReplicatedMergeTree('/clickhouse/tables/'||currentDatabase()||'/test_00814/part_header/{shard}', '2{replica}') ORDER BY x
     SETTINGS use_minimalistic_part_header_in_zookeeper = 1,
              old_parts_lifetime = 1,
              cleanup_delay_period = 0,
@@ -39,10 +39,10 @@ SELECT sleep(3) FORMAT Null;
 SELECT '*** Test part removal ***';
 SELECT '*** replica 1 ***';
 SELECT name FROM system.parts WHERE active AND database = currentDatabase() AND table = 'part_header_r1';
-SELECT name FROM system.zookeeper WHERE path = '/clickhouse/tables/test_00814/part_header/replicas/1/parts';
+SELECT name FROM system.zookeeper WHERE path = '/clickhouse/tables/'||currentDatabase()||'/test_00814/part_header/s1/replicas/1r1/parts';
 SELECT '*** replica 2 ***';
 SELECT name FROM system.parts WHERE active AND database = currentDatabase() AND table = 'part_header_r2';
-SELECT name FROM system.zookeeper WHERE path = '/clickhouse/tables/test_00814/part_header/replicas/1/parts';
+SELECT name FROM system.zookeeper WHERE path = '/clickhouse/tables/'||currentDatabase()||'/test_00814/part_header/s1/replicas/1r1/parts';
 
 SELECT '*** Test ALTER ***';
 ALTER TABLE part_header_r1 MODIFY COLUMN y String;
diff --git a/tests/queries/0_stateless/00816_long_concurrent_alter_column.sh b/tests/queries/0_stateless/00816_long_concurrent_alter_column.sh
index 63b687d072d..b0244991b3c 100755
--- a/tests/queries/0_stateless/00816_long_concurrent_alter_column.sh
+++ b/tests/queries/0_stateless/00816_long_concurrent_alter_column.sh
@@ -60,16 +60,10 @@ wait
 
 echo "DROP TABLE concurrent_alter_column NO DELAY" | ${CLICKHOUSE_CLIENT}   # NO DELAY has effect only for Atomic database
 
-db_engine=`$CLICKHOUSE_CLIENT -q "SELECT engine FROM system.databases WHERE name='$CLICKHOUSE_DATABASE'"`
-if [[ $db_engine == "Atomic" ]]; then
-    # DROP is non-blocking, so wait for alters
-    while true; do
-        $CLICKHOUSE_CLIENT -q "SELECT c = 0 FROM (SELECT count() as c FROM system.processes WHERE query_id LIKE 'alter_00816_%')" | grep 1 > /dev/null && break;
-        sleep 1;
-    done
-fi
-
-# Check for deadlocks
-echo "SELECT * FROM system.processes WHERE query_id LIKE 'alter_00816_%'" | ${CLICKHOUSE_CLIENT}
+# Wait for alters and check for deadlocks (in case of deadlock this loop will not finish)
+while true; do
+    echo "SELECT * FROM system.processes WHERE query_id LIKE 'alter\\_00816\\_%'" | ${CLICKHOUSE_CLIENT} | grep -q -F 'alter' || break
+    sleep 1;
+done
 
 echo 'did not crash'
diff --git a/tests/queries/0_stateless/00825_protobuf_format_array_3dim.sh b/tests/queries/0_stateless/00825_protobuf_format_array_3dim.sh
index 903217ca939..762f8a937e4 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_array_3dim.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_array_3dim.sh
@@ -1,18 +1,19 @@
 #!/usr/bin/env bash
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+SCHEMADIR=$CURDIR/format_schemas
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
 set -eo pipefail
 
 # Run the client.
-$CLICKHOUSE_CLIENT --multiquery <<'EOF'
+$CLICKHOUSE_CLIENT --multiquery <<EOF
 DROP TABLE IF EXISTS array_3dim_protobuf_00825;
 
 CREATE TABLE array_3dim_protobuf_00825
 (
-    `a_b_c` Array(Array(Array(Int32)))
+    a_b_c Array(Array(Array(Int32)))
 ) ENGINE = MergeTree ORDER BY tuple();
 
 INSERT INTO array_3dim_protobuf_00825 VALUES ([[], [[]], [[1]], [[2,3],[4]]]), ([[[5, 6, 7]], [[8, 9, 10]]]);
@@ -21,15 +22,16 @@ SELECT * FROM array_3dim_protobuf_00825;
 EOF
 
 BINARY_FILE_PATH=$(mktemp "$CURDIR/00825_protobuf_format_array_3dim.XXXXXX.binary")
-$CLICKHOUSE_CLIENT --query "SELECT * FROM array_3dim_protobuf_00825 FORMAT Protobuf SETTINGS format_schema = '$CURDIR/00825_protobuf_format_array_3dim:ABC'" > "$BINARY_FILE_PATH"
+$CLICKHOUSE_CLIENT --query "SELECT * FROM array_3dim_protobuf_00825 FORMAT Protobuf SETTINGS format_schema = '$SCHEMADIR/00825_protobuf_format_array_3dim:ABC'" > "$BINARY_FILE_PATH"
 
 # Check the output in the protobuf format
 echo
-$CURDIR/helpers/protobuf_length_delimited_encoder.py --decode_and_check --format_schema "$CURDIR/00825_protobuf_format_array_3dim:ABC" --input "$BINARY_FILE_PATH"
+$CURDIR/helpers/protobuf_length_delimited_encoder.py --decode_and_check --format_schema "$SCHEMADIR/00825_protobuf_format_array_3dim:ABC" --input "$BINARY_FILE_PATH"
 
 # Check the input in the protobuf format (now the table contains the same data twice).
 echo
-$CLICKHOUSE_CLIENT --query "INSERT INTO array_3dim_protobuf_00825 FORMAT Protobuf SETTINGS format_schema='$CURDIR/00825_protobuf_format_array_3dim:ABC'" < "$BINARY_FILE_PATH"
+$CLICKHOUSE_CLIENT --query "INSERT INTO array_3dim_protobuf_00825 FORMAT Protobuf SETTINGS format_schema='$SCHEMADIR/00825_protobuf_format_array_3dim:ABC'" < "$BINARY_FILE_PATH"
 $CLICKHOUSE_CLIENT --query "SELECT * FROM array_3dim_protobuf_00825"
 
 rm "$BINARY_FILE_PATH"
+$CLICKHOUSE_CLIENT --query "DROP TABLE array_3dim_protobuf_00825"
diff --git a/tests/queries/0_stateless/00825_protobuf_format_array_of_arrays.sh b/tests/queries/0_stateless/00825_protobuf_format_array_of_arrays.sh
index 0b386723091..243446f9438 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_array_of_arrays.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_array_of_arrays.sh
@@ -3,18 +3,21 @@
 # https://github.com/ClickHouse/ClickHouse/issues/9069
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+SCHEMADIR=$CURDIR/format_schemas
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
 set -eo pipefail
 
 # Run the client.
-$CLICKHOUSE_CLIENT --multiquery <<'EOF'
+$CLICKHOUSE_CLIENT --multiquery <<EOF
+DROP TABLE IF EXISTS array_of_arrays_protobuf_00825;
+
 CREATE TABLE array_of_arrays_protobuf_00825
 (
-    `a` String,
-    `b` Nested (
-        `c` Array(Float64)
+    a String,
+    b Nested (
+        c Array(Float64)
     )
 ) ENGINE = MergeTree ORDER BY tuple();
 
@@ -24,15 +27,16 @@ SELECT * FROM array_of_arrays_protobuf_00825;
 EOF
 
 BINARY_FILE_PATH=$(mktemp "$CURDIR/00825_protobuf_format_array_of_arrays.XXXXXX.binary")
-$CLICKHOUSE_CLIENT --query "SELECT * FROM array_of_arrays_protobuf_00825 FORMAT Protobuf SETTINGS format_schema = '$CURDIR/00825_protobuf_format_array_of_arrays:AA'" > "$BINARY_FILE_PATH"
+$CLICKHOUSE_CLIENT --query "SELECT * FROM array_of_arrays_protobuf_00825 FORMAT Protobuf SETTINGS format_schema = '$SCHEMADIR/00825_protobuf_format_array_of_arrays:AA'" > "$BINARY_FILE_PATH"
 
 # Check the output in the protobuf format
 echo
-$CURDIR/helpers/protobuf_length_delimited_encoder.py --decode_and_check --format_schema "$CURDIR/00825_protobuf_format_array_of_arrays:AA" --input "$BINARY_FILE_PATH"
+$CURDIR/helpers/protobuf_length_delimited_encoder.py --decode_and_check --format_schema "$SCHEMADIR/00825_protobuf_format_array_of_arrays:AA" --input "$BINARY_FILE_PATH"
 
 # Check the input in the protobuf format (now the table contains the same data twice).
 echo
-$CLICKHOUSE_CLIENT --query "INSERT INTO array_of_arrays_protobuf_00825 FORMAT Protobuf SETTINGS format_schema='$CURDIR/00825_protobuf_format_array_of_arrays:AA'" < "$BINARY_FILE_PATH"
+$CLICKHOUSE_CLIENT --query "INSERT INTO array_of_arrays_protobuf_00825 FORMAT Protobuf SETTINGS format_schema='$SCHEMADIR/00825_protobuf_format_array_of_arrays:AA'" < "$BINARY_FILE_PATH"
 $CLICKHOUSE_CLIENT --query "SELECT * FROM array_of_arrays_protobuf_00825"
 
 rm "$BINARY_FILE_PATH"
+$CLICKHOUSE_CLIENT --query "DROP TABLE array_of_arrays_protobuf_00825"
diff --git a/tests/queries/0_stateless/00825_protobuf_format_enum_mapping.sh b/tests/queries/0_stateless/00825_protobuf_format_enum_mapping.sh
index cbb387a62a5..300f82e5ca2 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_enum_mapping.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_enum_mapping.sh
@@ -3,13 +3,14 @@
 # https://github.com/ClickHouse/ClickHouse/issues/7438
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+SCHEMADIR=$CURDIR/format_schemas
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
 set -eo pipefail
 
 # Run the client.
-$CLICKHOUSE_CLIENT --multiquery <<'EOF'
+$CLICKHOUSE_CLIENT --multiquery <<EOF
 DROP TABLE IF EXISTS enum_mapping_protobuf_00825;
 
 CREATE TABLE enum_mapping_protobuf_00825
@@ -23,15 +24,16 @@ SELECT * FROM enum_mapping_protobuf_00825;
 EOF
 
 BINARY_FILE_PATH=$(mktemp "$CURDIR/00825_protobuf_format_enum_mapping.XXXXXX.binary")
-$CLICKHOUSE_CLIENT --query "SELECT * FROM enum_mapping_protobuf_00825 FORMAT Protobuf SETTINGS format_schema = '$CURDIR/00825_protobuf_format_enum_mapping:Message'" > "$BINARY_FILE_PATH"
+$CLICKHOUSE_CLIENT --query "SELECT * FROM enum_mapping_protobuf_00825 FORMAT Protobuf SETTINGS format_schema = '$SCHEMADIR/00825_protobuf_format_enum_mapping:Message'" > "$BINARY_FILE_PATH"
 
 # Check the output in the protobuf format
 echo
-$CURDIR/helpers/protobuf_length_delimited_encoder.py --decode_and_check --format_schema "$CURDIR/00825_protobuf_format_enum_mapping:Message" --input "$BINARY_FILE_PATH"
+$CURDIR/helpers/protobuf_length_delimited_encoder.py --decode_and_check --format_schema "$SCHEMADIR/00825_protobuf_format_enum_mapping:Message" --input "$BINARY_FILE_PATH"
 
 # Check the input in the protobuf format (now the table contains the same data twice).
 echo
-$CLICKHOUSE_CLIENT --query "INSERT INTO enum_mapping_protobuf_00825 FORMAT Protobuf SETTINGS format_schema='$CURDIR/00825_protobuf_format_enum_mapping:Message'" < "$BINARY_FILE_PATH"
+$CLICKHOUSE_CLIENT --query "INSERT INTO enum_mapping_protobuf_00825 FORMAT Protobuf SETTINGS format_schema='$SCHEMADIR/00825_protobuf_format_enum_mapping:Message'" < "$BINARY_FILE_PATH"
 $CLICKHOUSE_CLIENT --query "SELECT * FROM enum_mapping_protobuf_00825"
 
 rm "$BINARY_FILE_PATH"
+$CLICKHOUSE_CLIENT --query "DROP TABLE enum_mapping_protobuf_00825"
diff --git a/tests/queries/0_stateless/00825_protobuf_format_input.insh b/tests/queries/0_stateless/00825_protobuf_format_input.insh
deleted file mode 100644
index 39a2f17c98f..00000000000
--- a/tests/queries/0_stateless/00825_protobuf_format_input.insh
+++ /dev/null
@@ -1,5 +0,0 @@
-echo -ne '\xf3\x01\x0a\x24\x61\x37\x35\x32\x32\x31\x35\x38\x2d\x33\x64\x34\x31\x2d\x34\x62\x37\x37\x2d\x61\x64\x36\x39\x2d\x36\x63\x35\x39\x38\x65\x65\x35\x35\x63\x34\x39\x12\x04\x49\x76\x61\x6e\x1a\x06\x50\x65\x74\x72\x6f\x76\x20\x01\x28\xaf\x1f\x32\x03\x70\x6e\x67\x3a\x0c\x2b\x37\x34\x39\x35\x31\x32\x33\x34\x35\x36\x37\x40\x01\x4d\xfc\xd0\x30\x5c\x50\x26\x58\x09\x62\x09\x59\x65\x73\x74\x65\x72\x64\x61\x79\x62\x07\x46\x6c\x6f\x77\x65\x72\x73\x6a\x04\xff\x01\x00\x00\x72\x06\x4d\x6f\x73\x63\x6f\x77\x7a\x08\x4b\x03\x5f\x42\x72\x7d\x16\x42\x81\x01\x1f\x85\xeb\x51\xb8\x1e\x09\x40\x89\x01\x33\x33\x33\x33\x33\xc3\x6a\x40\x95\x01\xcd\xcc\xcc\x3d\x9d\x01\x9a\x99\xb9\x40\xa0\x01\x80\xc4\xd7\x8d\x7f\xaa\x01\x0c\x0a\x05\x6d\x65\x74\x65\x72\x15\x00\x00\x80\x3f\xaa\x01\x11\x0a\x0a\x63\x65\x6e\x74\x69\x6d\x65\x74\x65\x72\x15\x0a\xd7\x23\x3c\xaa\x01\x10\x0a\x09\x6b\x69\x6c\x6f\x6d\x65\x74\x65\x72\x15\x00\x00\x7a\x44\xb2\x01\x10\x0a\x0e\xa2\x06\x0b\x0a\x09\x08\xf4\x03\x12\x04\xf5\x03\xf6\x03\x7e\x0a\x24\x63\x36\x39\x34\x61\x64\x38\x61\x2d\x66\x37\x31\x34\x2d\x34\x65\x61\x33\x2d\x39\x30\x37\x64\x2d\x66\x64\x35\x34\x66\x62\x32\x35\x64\x39\x62\x35\x12\x07\x4e\x61\x74\x61\x6c\x69\x61\x1a\x08\x53\x6f\x6b\x6f\x6c\x6f\x76\x61\x28\xa6\x3f\x32\x03\x6a\x70\x67\x50\x1a\x58\x0b\x6a\x04\x64\xc8\x01\x32\x72\x08\x50\x6c\x79\x6d\x6f\x75\x74\x68\x7a\x08\x6a\x9d\x49\x42\x46\x8c\x84\xc0\x81\x01\x6e\x86\x1b\xf0\xf9\x21\x09\x40\x95\x01\x42\x60\xe5\x3b\x9d\x01\xcd\xcc\xac\x40\xa0\x01\xff\xff\xa9\xce\x93\x8c\x09\xc0\x01\x0a\x24\x61\x37\x64\x61\x31\x61\x61\x36\x2d\x66\x34\x32\x35\x2d\x34\x37\x38\x39\x2d\x38\x39\x34\x37\x2d\x62\x30\x33\x34\x37\x38\x36\x65\x64\x33\x37\x34\x12\x06\x56\x61\x73\x69\x6c\x79\x1a\x07\x53\x69\x64\x6f\x72\x6f\x76\x20\x01\x28\xfb\x48\x32\x03\x62\x6d\x70\x3a\x0d\x2b\x34\x34\x32\x30\x31\x32\x33\x34\x35\x36\x37\x38\x40\x01\x4d\x50\xe0\x27\x5c\x50\x17\x58\x04\x62\x05\x53\x75\x6e\x6e\x79\x6a\x05\xfa\x01\xf4\x01\x0a\x72\x08\x4d\x75\x72\x6d\x61\x6e\x73\x6b\x7a\x08\xfd\xf0\x89\x42\xc8\x4c\x04\x42\x81\x01\x11\x2d\x44\x54\xfb\x21\x09\x40\x89\x01\x00\x00\x00\xe8\x76\x48\x37\x42\x95\x01\x00\x00\x48\x44\x9d\x01\xcd\xcc\x4c\xc0\xa0\x01\x80\xd4\x9f\x93\x01\xaa\x01\x0c\x0a\x05\x70\x6f\x75\x6e\x64\x15\x00\x00\x80\x41\xb2\x01\x0a\x0a\x08\xa2\x06\x05\x0a\x03\x08\xf7\x03' | $CLICKHOUSE_CLIENT --query="INSERT INTO in_persons_00825 FORMAT Protobuf SETTINGS format_schema = '$CURDIR/00825_protobuf_format:Person'"
-echo -ne '\xb3\x01\x12\x05\x46\x72\x69\x64\x61\x28\x99\xe1\xf3\xd1\x0b\x52\x08\x45\x72\x6d\x61\x6b\x6f\x76\x61\x72\x0c\x00\x00\xdc\x42\x00\x00\x52\x43\x00\x00\x94\x42\x79\x48\xce\x3d\x51\x00\x00\x00\x00\xc8\x02\x14\xc2\x05\x08\x00\x00\x80\x44\x00\x00\x80\x49\x9a\x06\x02\x4b\x42\x9a\x06\x02\x4d\x42\xa1\x06\x00\x00\x00\x00\x00\x00\xe0\x3f\xa8\x06\x2a\xa8\x06\xa8\xff\xff\xff\xff\xff\xff\xff\xff\x01\xb0\x06\x01\xbd\x06\x25\x06\x49\x40\xfa\x06\x02\x34\x30\x90\x08\xe2\x08\xe1\x08\x89\xe6\x6e\xdd\x01\x00\x00\x00\xb0\x09\xc3\x19\xd0\x0c\xb7\x02\xe2\x12\x24\x32\x30\x66\x63\x64\x39\x35\x61\x2d\x33\x33\x32\x64\x2d\x34\x31\x64\x62\x2d\x61\x39\x65\x63\x2d\x31\x36\x31\x66\x36\x34\x34\x64\x30\x35\x39\x63\xa0\x38\xbc\x05\xaa\x38\x02\xbd\x05\xb4\x01\x08\x01\x12\x06\x49\x73\x6f\x6c\x64\x65\x52\x07\x4c\x61\x76\x72\x6f\x76\x61\x72\x0c\x00\x00\x7f\x43\x00\x00\x00\x00\x00\x00\x7f\x43\xaa\x01\x03\x61\x62\x63\xc8\x02\x32\xc2\x05\x08\x00\x00\x00\x41\x00\x00\x80\x3f\x9a\x06\x04\x42\x79\x74\x65\x9a\x06\x03\x42\x69\x74\xa1\x06\x00\x00\x00\x00\x00\x00\x12\x40\xa8\x06\x1a\xa8\x06\xb0\xff\xff\xff\xff\xff\xff\xff\xff\x01\xb0\x06\x01\xbd\x06\xf9\x0f\x49\x40\xc2\x06\x01\x2c\xfa\x06\x02\x33\x32\x90\x08\x78\xe1\x08\x39\x4e\x2b\xfe\xe4\xf5\xff\xff\xb0\x09\xe8\x30\xd8\x12\x01\xe2\x12\x24\x37\x63\x66\x61\x36\x38\x35\x36\x2d\x61\x35\x34\x61\x2d\x34\x37\x38\x36\x2d\x62\x38\x65\x35\x2d\x37\x34\x35\x31\x35\x39\x64\x35\x32\x32\x37\x38\xa0\x38\xbe\x05\xc2\x3e\x05\x15\x00\x00\xb6\x42' | $CLICKHOUSE_CLIENT --query="INSERT INTO in_persons_00825 FORMAT Protobuf SETTINGS format_schema = '$CURDIR/00825_protobuf_format:AltPerson'"
-echo -ne '\xa5\x02\x0a\x24\x61\x61\x30\x65\x35\x61\x30\x36\x2d\x63\x61\x62\x32\x2d\x34\x30\x33\x34\x2d\x61\x36\x61\x32\x2d\x34\x38\x65\x38\x32\x62\x39\x31\x36\x36\x34\x65\x12\x06\x4c\x65\x6f\x6e\x69\x64\x1a\x08\x4b\x69\x72\x69\x6c\x6c\x6f\x76\x22\x04\x6d\x61\x6c\x65\x2a\x0a\x31\x39\x38\x33\x2d\x30\x36\x2d\x32\x34\x3a\x0c\x2b\x37\x34\x39\x35\x30\x32\x37\x35\x38\x36\x34\x42\x01\x31\x4a\x13\x32\x30\x31\x39\x2d\x30\x32\x2d\x30\x34\x20\x30\x39\x3a\x34\x35\x3a\x30\x30\x52\x02\x33\x35\x5a\x06\x63\x61\x6e\x63\x65\x72\x62\x07\x37\x20\x72\x69\x6e\x67\x73\x62\x08\x45\x61\x73\x74\x73\x69\x64\x65\x62\x0b\x4c\x61\x73\x74\x20\x48\x75\x72\x72\x61\x68\x6a\x01\x30\x6a\x01\x30\x6a\x03\x32\x35\x35\x72\x09\x53\x61\x6e\x20\x44\x69\x65\x67\x6f\x7a\x09\x33\x32\x2e\x38\x32\x33\x39\x34\x33\x7a\x0b\x2d\x31\x31\x37\x2e\x30\x38\x31\x33\x32\x37\x82\x01\x09\x33\x2e\x31\x34\x31\x35\x39\x32\x37\x8a\x01\x08\x31\x35\x30\x30\x30\x30\x30\x30\x92\x01\x06\x31\x38\x36\x2e\x37\x35\x9a\x01\x04\x2d\x32\x2e\x31\xa2\x01\x0b\x32\x30\x36\x35\x39\x38\x32\x39\x33\x33\x31\xaa\x01\x18\x0a\x06\x6d\x69\x6e\x75\x74\x65\x0a\x04\x68\x6f\x75\x72\x12\x02\x36\x30\x12\x04\x33\x36\x30\x30\xb2\x01\x08\x0a\x06\x12\x04\x31\x38\x30\x30' | $CLICKHOUSE_CLIENT --query="INSERT INTO in_persons_00825 FORMAT Protobuf SETTINGS format_schema = '$CURDIR/00825_protobuf_format:StrPerson'"
-echo -ne '\xdd\x01\x0a\x24\x33\x66\x61\x65\x65\x30\x36\x34\x2d\x63\x34\x66\x37\x2d\x34\x64\x33\x34\x2d\x62\x36\x66\x33\x2d\x38\x64\x38\x31\x63\x32\x62\x36\x61\x31\x35\x64\x12\x04\x4e\x69\x63\x6b\x1a\x0a\x4b\x6f\x6c\x65\x73\x6e\x69\x6b\x6f\x76\x20\x01\x28\xda\x52\x32\x03\x62\x6d\x70\x3a\x0c\x34\x31\x32\x2d\x36\x38\x37\x2d\x35\x30\x30\x37\x40\x01\x4d\x2f\x27\xf2\x5b\x50\x14\x58\x09\x62\x06\x48\x61\x76\x61\x6e\x61\x68\x80\x01\x68\x00\x68\x80\x01\x72\x0a\x50\x69\x74\x74\x73\x62\x75\x72\x67\x68\x7a\x08\x9b\x11\x22\x42\x1f\xe6\x9f\xc2\x81\x01\x28\x2d\x44\x54\xfb\x21\x09\x40\x89\x01\x00\x00\x00\xe8\x76\x48\x27\x42\x95\x01\x00\x00\x43\x44\x9d\x01\x66\x66\x92\x41\xa0\x01\xce\xdf\xb8\xba\x01\xab\x01\x0d\xcd\xcc\xe2\x41\x0d\xcd\xcc\x4c\x3e\x0d\x00\x00\x80\x3f\x12\x05\x6f\x75\x6e\x63\x65\x12\x05\x63\x61\x72\x61\x74\x12\x04\x67\x72\x61\x6d\xac\x01\xb3\x01\x0b\xa2\x06\x05\x0b\x08\x96\x4a\x0c\x0c\xb4\x01' | $CLICKHOUSE_CLIENT --query="INSERT INTO in_persons_00825 FORMAT Protobuf SETTINGS format_schema = '$CURDIR/00825_protobuf_format_syntax2:Syntax2Person'"
-echo -ne '\x04\x08\x02\x10\x04\x00\x04\x08\x03\x10\x09' | $CLICKHOUSE_CLIENT --query="INSERT INTO in_squares_00825 FORMAT Protobuf SETTINGS format_schema = '$CURDIR/00825_protobuf_format:NumberAndSquare'"
diff --git a/tests/queries/0_stateless/00825_protobuf_format_input.reference b/tests/queries/0_stateless/00825_protobuf_format_input.reference
deleted file mode 100644
index 75fef3f8ac3..00000000000
--- a/tests/queries/0_stateless/00825_protobuf_format_input.reference
+++ /dev/null
@@ -1,18 +0,0 @@
-a7da1aa6-f425-4789-8947-b034786ed374	Vasily	Sidorov	male	1995-07-28	bmp	+442012345678	1	2018-12-30 00:00:00	23	leo	['Sunny']	[250,244,10]	Murmansk	[68.970680,33.074982]	3.14159265358979	100000000000.00	800	-3.2	154400000	['pound']	[16]	503	[]
-c694ad8a-f714-4ea3-907d-fd54fb25d9b5	Natalia	Sokolova	female	1992-03-08	jpg	\N	0	\N	26	pisces	[]	[100,200,50]	Plymouth	[50.403724,-4.142123]	3.14159	\N	0.007	5.4	-20000000000000	[]	[]	\N	[]
-aa0e5a06-cab2-4034-a6a2-48e82b91664e	Leonid	Kirillov	male	1983-06-24	\N	+74950275864\0	1	2019-02-04 09:45:00	35	cancer	['7 rings','Eastside','Last Hurrah']	[0,0,255]	San Diego	[32.823943,-117.081327]	3.1415927	15000000.00	186.75	-2.1	20659829331	['minute','hour']	[60,3600]	\N	[1800]
-20fcd95a-332d-41db-a9ec-161f644d059c	Frida	Ermakova	female	1978-12-12	\N	3124555929\0\0\0	0	2013-03-11 16:30:00	40	sagittarius	[]	[110,210,74]		[42.000000,-88.000000]	3.1410000324249268	311.00	0.5	10.0	8010000009	['KB','MB']	[1024,1048576]	700	[701]
-a7522158-3d41-4b77-ad69-6c598ee55c49	Ivan	Petrov	male	1980-12-29	png	+74951234567\0	1	2019-01-05 18:45:00	38	capricorn	['Yesterday','Flowers']	[255,0,0]	Moscow	[55.753216,37.622504]	3.14	214.10	0.1	5.8	17060000000	['meter','centimeter','kilometer']	[1,0.01,1000]	500	[501,502]
-3faee064-c4f7-4d34-b6f3-8d81c2b6a15d	Nick	Kolesnikov	male	1998-12-26	bmp	412-687-5007\0	1	2018-11-19 05:59:59	20	capricorn	['Havana']	[128,0,128]	Pittsburgh	[40.517192,-79.949456]	3.1415926535898	50000000000.00	780	18.3	195500007	['ounce','carat','gram']	[28.35,0.2,1]	9494	[]
-7cfa6856-a54a-4786-b8e5-745159d52278	Isolde	Lavrova	female	1987-02-09	\N	\N	1	\N	32	aquarius	[]	[255,0,255]		[26.000000,-80.000000]	3.1415998935699463	\N	4.5	25.0	-11111111111111	['Byte','Bit']	[8,1]	702	[]
-0	0
-2	4
-3	9
-a7da1aa6-f425-4789-8947-b034786ed374	Vasily	Sidorov	male	1995-07-28	bmp	+442012345678	1	2018-12-30 00:00:00	23	leo	['Sunny']	[250,244,10]	Murmansk	[68.970680,33.074982]	3.14159265358979	100000000000.00	800	-3.2	154400000	['pound']	[16]	503	[]
-c694ad8a-f714-4ea3-907d-fd54fb25d9b5	Natalia	Sokolova	female	1992-03-08	jpg	\N	0	\N	26	pisces	[]	[100,200,50]	Plymouth	[50.403724,-4.142123]	3.14159	\N	0.007	5.4	-20000000000000	[]	[]	\N	[]
-a7522158-3d41-4b77-ad69-6c598ee55c49	Ivan	Petrov	male	1980-12-29	png	+74951234567\0	1	2019-01-05 18:45:00	38	capricorn	['Yesterday','Flowers']	[255,0,0]	Moscow	[55.753216,37.622504]	3.14	214.10	0.1	5.8	17060000000	['meter','centimeter','kilometer']	[1,0.01,1000]	500	[501,502]
-3faee064-c4f7-4d34-b6f3-8d81c2b6a15d	Nick	Kolesnikov	male	1998-12-26	bmp	412-687-5007\0	1	2018-11-19 05:59:59	20	capricorn	['Havana']	[128,0,128]	Pittsburgh	[40.517192,-79.949456]	3.1415926535898	50000000000.00	780	18.3	195500007	['ounce','carat','gram']	[28.35,0.2,1]	9494	[]
-2	4
-3	9
-ok
-ok
diff --git a/tests/queries/0_stateless/00825_protobuf_format_input.sh b/tests/queries/0_stateless/00825_protobuf_format_input.sh
deleted file mode 100755
index 5a85a852cb1..00000000000
--- a/tests/queries/0_stateless/00825_protobuf_format_input.sh
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/usr/bin/env bash
-
-CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CURDIR"/../shell_config.sh
-
-set -eo pipefail
-
-# Run the client.
-$CLICKHOUSE_CLIENT --multiquery <<'EOF'
-DROP TABLE IF EXISTS in_persons_00825;
-DROP TABLE IF EXISTS in_squares_00825;
-
-CREATE TABLE in_persons_00825 (uuid UUID,
-                               name String,
-                               surname String,
-                               gender Enum8('male'=1, 'female'=0),
-                               birthDate Date,
-                               photo Nullable(String),
-                               phoneNumber Nullable(FixedString(13)),
-                               isOnline UInt8,
-                               visitTime Nullable(DateTime),
-                               age UInt8,
-                               zodiacSign Enum16('aries'=321, 'taurus'=420, 'gemini'=521, 'cancer'=621, 'leo'=723, 'virgo'=823,
-                                                 'libra'=923, 'scorpius'=1023, 'sagittarius'=1122, 'capricorn'=1222, 'aquarius'=120,
-                                                 'pisces'=219),
-                               songs Array(String),
-                               color Array(UInt8),
-                               hometown LowCardinality(String),
-                               location Array(Decimal32(6)),
-                               pi Nullable(Float64),
-                               lotteryWin Nullable(Decimal64(2)),
-                               someRatio Float32,
-                               temperature Decimal32(1),
-                               randomBigNumber Int64,
-                               measureUnits Nested (unit String, coef Float32),
-                               nestiness_a_b_c_d Nullable(UInt32),
-                               `nestiness_a_B.c_E` Array(UInt32)
-                              ) ENGINE = MergeTree ORDER BY tuple();
-
-CREATE TABLE in_squares_00825 (number UInt32, square UInt32) ENGINE = MergeTree ORDER BY tuple();
-EOF
-
-# To generate the file 00825_protobuf_format_input.insh use the following commands:
-# ninja ProtobufDelimitedMessagesSerializer
-# build/utils/test-data-generator/ProtobufDelimitedMessagesSerializer
-# shellcheck source=./00825_protobuf_format_input.insh
-source "$CURDIR"/00825_protobuf_format_input.insh
-
-$CLICKHOUSE_CLIENT --query "SELECT * FROM in_persons_00825 ORDER BY uuid;"
-$CLICKHOUSE_CLIENT --query "SELECT * FROM in_squares_00825 ORDER BY number;"
-
-$CLICKHOUSE_CLIENT --query "TRUNCATE TABLE in_persons_00825;"
-$CLICKHOUSE_CLIENT --query "TRUNCATE TABLE in_squares_00825;"
-
-# shellcheck source=./00825_protobuf_format_input_single.insh
-source "$CURDIR"/00825_protobuf_format_input_single.insh
-
-$CLICKHOUSE_CLIENT --query "SELECT * FROM in_persons_00825 ORDER BY uuid;"
-$CLICKHOUSE_CLIENT --query "SELECT * FROM in_squares_00825 ORDER BY number;"
-
-# Try to input malformed data.
-set +eo pipefail
-echo -ne '\xe0\x80\x3f\x0b' \
-    | $CLICKHOUSE_CLIENT --query="INSERT INTO in_persons_00825 FORMAT Protobuf SETTINGS format_schema = '$CURDIR/00825_protobuf_format:Person'" 2>&1 \
-    | grep -qF "Protobuf messages are corrupted" && echo "ok" || echo "fail"
-set -eo pipefail
-
-# Try to input malformed data for ProtobufSingle
-set +eo pipefail
-echo -ne '\xff\xff\x3f\x0b' \
-    | $CLICKHOUSE_CLIENT --query="INSERT INTO in_persons_00825 FORMAT ProtobufSingle SETTINGS format_schema = '$CURDIR/00825_protobuf_format:Person'" 2>&1 \
-    | grep -qF "Protobuf messages are corrupted" && echo "ok" || echo "fail"
-set -eo pipefail
-
-$CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS in_persons_00825;"
-$CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS in_squares_00825;"
diff --git a/tests/queries/0_stateless/00825_protobuf_format_input_single.insh b/tests/queries/0_stateless/00825_protobuf_format_input_single.insh
deleted file mode 100644
index 6c4dfec05aa..00000000000
--- a/tests/queries/0_stateless/00825_protobuf_format_input_single.insh
+++ /dev/null
@@ -1,12 +0,0 @@
-echo -ne '\x0a\x24\x61\x37\x35\x32\x32\x31\x35\x38\x2d\x33\x64\x34\x31\x2d\x34\x62\x37\x37\x2d\x61\x64\x36\x39\x2d\x36\x63\x35\x39\x38\x65\x65\x35\x35\x63\x34\x39\x12\x04\x49\x76\x61\x6e\x1a\x06\x50\x65\x74\x72\x6f\x76\x20\x01\x28\xaf\x1f\x32\x03\x70\x6e\x67\x3a\x0c\x2b\x37\x34\x39\x35\x31\x32\x33\x34\x35\x36\x37\x40\x01\x4d\xfc\xd0\x30\x5c\x50\x26\x58\x09\x62\x09\x59\x65\x73\x74\x65\x72\x64\x61\x79\x62\x07\x46\x6c\x6f\x77\x65\x72\x73\x6a\x04\xff\x01\x00\x00\x72\x06\x4d\x6f\x73\x63\x6f\x77\x7a\x08\x4b\x03\x5f\x42\x72\x7d\x16\x42\x81\x01\x1f\x85\xeb\x51\xb8\x1e\x09\x40\x89\x01\x33\x33\x33\x33\x33\xc3\x6a\x40\x95\x01\xcd\xcc\xcc\x3d\x9d\x01\x9a\x99\xb9\x40\xa0\x01\x80\xc4\xd7\x8d\x7f\xaa\x01\x0c\x0a\x05\x6d\x65\x74\x65\x72\x15\x00\x00\x80\x3f\xaa\x01\x11\x0a\x0a\x63\x65\x6e\x74\x69\x6d\x65\x74\x65\x72\x15\x0a\xd7\x23\x3c\xaa\x01\x10\x0a\x09\x6b\x69\x6c\x6f\x6d\x65\x74\x65\x72\x15\x00\x00\x7a\x44\xb2\x01\x10\x0a\x0e\xa2\x06\x0b\x0a\x09\x08\xf4\x03\x12\x04\xf5\x03\xf6\x03' | $CLICKHOUSE_CLIENT --query="INSERT INTO in_persons_00825 FORMAT ProtobufSingle SETTINGS format_schema = '$CURDIR/00825_protobuf_format:Person'"
-echo -ne '\x0a\x24\x63\x36\x39\x34\x61\x64\x38\x61\x2d\x66\x37\x31\x34\x2d\x34\x65\x61\x33\x2d\x39\x30\x37\x64\x2d\x66\x64\x35\x34\x66\x62\x32\x35\x64\x39\x62\x35\x12\x07\x4e\x61\x74\x61\x6c\x69\x61\x1a\x08\x53\x6f\x6b\x6f\x6c\x6f\x76\x61\x28\xa6\x3f\x32\x03\x6a\x70\x67\x50\x1a\x58\x0b\x6a\x04\x64\xc8\x01\x32\x72\x08\x50\x6c\x79\x6d\x6f\x75\x74\x68\x7a\x08\x6a\x9d\x49\x42\x46\x8c\x84\xc0\x81\x01\x6e\x86\x1b\xf0\xf9\x21\x09\x40\x95\x01\x42\x60\xe5\x3b\x9d\x01\xcd\xcc\xac\x40\xa0\x01\xff\xff\xa9\xce\x93\x8c\x09' | $CLICKHOUSE_CLIENT --query="INSERT INTO in_persons_00825 FORMAT ProtobufSingle SETTINGS format_schema = '$CURDIR/00825_protobuf_format:Person'"
-echo -ne '\x0a\x24\x61\x37\x64\x61\x31\x61\x61\x36\x2d\x66\x34\x32\x35\x2d\x34\x37\x38\x39\x2d\x38\x39\x34\x37\x2d\x62\x30\x33\x34\x37\x38\x36\x65\x64\x33\x37\x34\x12\x06\x56\x61\x73\x69\x6c\x79\x1a\x07\x53\x69\x64\x6f\x72\x6f\x76\x20\x01\x28\xfb\x48\x32\x03\x62\x6d\x70\x3a\x0d\x2b\x34\x34\x32\x30\x31\x32\x33\x34\x35\x36\x37\x38\x40\x01\x4d\x50\xe0\x27\x5c\x50\x17\x58\x04\x62\x05\x53\x75\x6e\x6e\x79\x6a\x05\xfa\x01\xf4\x01\x0a\x72\x08\x4d\x75\x72\x6d\x61\x6e\x73\x6b\x7a\x08\xfd\xf0\x89\x42\xc8\x4c\x04\x42\x81\x01\x11\x2d\x44\x54\xfb\x21\x09\x40\x89\x01\x00\x00\x00\xe8\x76\x48\x37\x42\x95\x01\x00\x00\x48\x44\x9d\x01\xcd\xcc\x4c\xc0\xa0\x01\x80\xd4\x9f\x93\x01\xaa\x01\x0c\x0a\x05\x70\x6f\x75\x6e\x64\x15\x00\x00\x80\x41\xb2\x01\x0a\x0a\x08\xa2\x06\x05\x0a\x03\x08\xf7\x03' | $CLICKHOUSE_CLIENT --query="INSERT INTO in_persons_00825 FORMAT ProtobufSingle SETTINGS format_schema = '$CURDIR/00825_protobuf_format:Person'"
-echo -ne '\x0a\x24\x33\x66\x61\x65\x65\x30\x36\x34\x2d\x63\x34\x66\x37\x2d\x34\x64\x33\x34\x2d\x62\x36\x66\x33\x2d\x38\x64\x38\x31\x63\x32\x62\x36\x61\x31\x35\x64\x12\x04\x4e\x69\x63\x6b\x1a\x0a\x4b\x6f\x6c\x65\x73\x6e\x69\x6b\x6f\x76\x20\x01\x28\xda\x52\x32\x03\x62\x6d\x70\x3a\x0c\x34\x31\x32\x2d\x36\x38\x37\x2d\x35\x30\x30\x37\x40\x01\x4d\x2f\x27\xf2\x5b\x50\x14\x58\x09\x62\x06\x48\x61\x76\x61\x6e\x61\x68\x80\x01\x68\x00\x68\x80\x01\x72\x0a\x50\x69\x74\x74\x73\x62\x75\x72\x67\x68\x7a\x08\x9b\x11\x22\x42\x1f\xe6\x9f\xc2\x81\x01\x28\x2d\x44\x54\xfb\x21\x09\x40\x89\x01\x00\x00\x00\xe8\x76\x48\x27\x42\x95\x01\x00\x00\x43\x44\x9d\x01\x66\x66\x92\x41\xa0\x01\xce\xdf\xb8\xba\x01\xab\x01\x0d\xcd\xcc\xe2\x41\x0d\xcd\xcc\x4c\x3e\x0d\x00\x00\x80\x3f\x12\x05\x6f\x75\x6e\x63\x65\x12\x05\x63\x61\x72\x61\x74\x12\x04\x67\x72\x61\x6d\xac\x01\xb3\x01\x0b\xa2\x06\x05\x0b\x08\x96\x4a\x0c\x0c\xb4\x01' | $CLICKHOUSE_CLIENT --query="INSERT INTO in_persons_00825 FORMAT ProtobufSingle SETTINGS format_schema = '$CURDIR/00825_protobuf_format_syntax2:Syntax2Person'"
-
-echo -ne '\x08\x02\x10\x04' | $CLICKHOUSE_CLIENT --query="INSERT INTO in_squares_00825 FORMAT ProtobufSingle SETTINGS format_schema = '$CURDIR/00825_protobuf_format:NumberAndSquare'"
-echo -ne '\x08\x03\x10\x09' | $CLICKHOUSE_CLIENT --query="INSERT INTO in_squares_00825 FORMAT ProtobufSingle SETTINGS format_schema = '$CURDIR/00825_protobuf_format:NumberAndSquare'"
-
-### Actually empty Protobuf message is a valid message (with all values default).
-### It will work in Kafka but clickhouse-client forbids that:
-### Code: 108. DB::Exception: No data to insert
-## echo -ne '' | $CLICKHOUSE_CLIENT --query="INSERT INTO in_squares_00825 FORMAT ProtobufSingle SETTINGS format_schema = '$CURDIR/00825_protobuf_format:NumberAndSquare'"
\ No newline at end of file
diff --git a/tests/queries/0_stateless/00825_protobuf_format_map.sh b/tests/queries/0_stateless/00825_protobuf_format_map.sh
index 5df25c41750..877fe73603e 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_map.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_map.sh
@@ -1,31 +1,30 @@
 #!/usr/bin/env bash
 
-# https://github.com/ClickHouse/ClickHouse/issues/6497
-
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+SCHEMADIR=$CURDIR/format_schemas
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
 set -eo pipefail
 
 # Run the client.
-$CLICKHOUSE_CLIENT --multiquery <<'EOF'
+$CLICKHOUSE_CLIENT --multiquery <<EOF
 SET allow_experimental_map_type = 1;
 
-DROP TABLE IF EXISTS map_00825;
+DROP TABLE IF EXISTS map_protobuf_00825;
 
-CREATE TABLE map_00825
+CREATE TABLE map_protobuf_00825
 (
   a Map(String, UInt32)
 ) ENGINE = MergeTree ORDER BY tuple();
 
-INSERT INTO map_00825 VALUES ({'x':5, 'y':7}), ({'z':11}), ({'temp':0}), ({'':0});
+INSERT INTO map_protobuf_00825 VALUES ({'x':5, 'y':7}), ({'z':11}), ({'temp':0}), ({'':0});
 
-SELECT * FROM map_00825;
+SELECT * FROM map_protobuf_00825;
 EOF
 
 BINARY_FILE_PATH=$(mktemp "$CURDIR/00825_protobuf_format_map.XXXXXX.binary")
-$CLICKHOUSE_CLIENT --query "SELECT * FROM map_00825 FORMAT Protobuf SETTINGS format_schema = '$CURDIR/00825_protobuf_format_map:Message'" > "$BINARY_FILE_PATH"
+$CLICKHOUSE_CLIENT --query "SELECT * FROM map_protobuf_00825 FORMAT Protobuf SETTINGS format_schema = '$SCHEMADIR/00825_protobuf_format_map:Message'" > "$BINARY_FILE_PATH"
 
 # Check the output in the protobuf format
 echo
@@ -34,7 +33,8 @@ hexdump -C $BINARY_FILE_PATH
 
 # Check the input in the protobuf format (now the table contains the same data twice).
 echo
-$CLICKHOUSE_CLIENT --query "INSERT INTO map_00825 FORMAT Protobuf SETTINGS format_schema='$CURDIR/00825_protobuf_format_map:Message'" < "$BINARY_FILE_PATH"
-$CLICKHOUSE_CLIENT --query "SELECT * FROM map_00825"
+$CLICKHOUSE_CLIENT --query "INSERT INTO map_protobuf_00825 FORMAT Protobuf SETTINGS format_schema='$SCHEMADIR/00825_protobuf_format_map:Message'" < "$BINARY_FILE_PATH"
+$CLICKHOUSE_CLIENT --query "SELECT * FROM map_protobuf_00825"
 
 rm "$BINARY_FILE_PATH"
+$CLICKHOUSE_CLIENT --query "DROP TABLE map_protobuf_00825"
diff --git a/tests/queries/0_stateless/00825_protobuf_format_nested_in_nested.reference b/tests/queries/0_stateless/00825_protobuf_format_nested_in_nested.reference
new file mode 100644
index 00000000000..08fb4696506
--- /dev/null
+++ b/tests/queries/0_stateless/00825_protobuf_format_nested_in_nested.reference
@@ -0,0 +1,52 @@
+[[(1),(2)],[(3),(4),(5)]]
+[[(6)]]
+[[]]
+[]
+
+Binary representation:
+00000000  18 0a 08 12 02 18 01 12  02 18 02 0a 0c 12 02 18  |................|
+00000010  03 12 02 18 04 12 02 18  05 06 0a 04 12 02 18 06  |................|
+00000020  02 0a 00 00                                       |....|
+00000024
+
+MESSAGE #1 AT 0x00000001
+x {
+  y {
+    z: 1
+  }
+  y {
+    z: 2
+  }
+}
+x {
+  y {
+    z: 3
+  }
+  y {
+    z: 4
+  }
+  y {
+    z: 5
+  }
+}
+MESSAGE #2 AT 0x0000001A
+x {
+  y {
+    z: 6
+  }
+}
+MESSAGE #3 AT 0x00000021
+x {
+}
+MESSAGE #4 AT 0x00000024
+
+Binary representation is as expected
+
+[[(1),(2)],[(3),(4),(5)]]
+[[(6)]]
+[[]]
+[]
+[[(1),(2)],[(3),(4),(5)]]
+[[(6)]]
+[[]]
+[]
diff --git a/tests/queries/0_stateless/00825_protobuf_format_nested_in_nested.sh b/tests/queries/0_stateless/00825_protobuf_format_nested_in_nested.sh
new file mode 100755
index 00000000000..9d382f8c589
--- /dev/null
+++ b/tests/queries/0_stateless/00825_protobuf_format_nested_in_nested.sh
@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+
+# https://github.com/ClickHouse/ClickHouse/issues/11117
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+SCHEMADIR=$CURDIR/format_schemas
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+set -eo pipefail
+
+# Run the client.
+$CLICKHOUSE_CLIENT --multiquery <<EOF
+DROP TABLE IF EXISTS nested_in_nested_protobuf_00825;
+
+CREATE TABLE nested_in_nested_protobuf_00825 (x Nested (y Nested (z Int64))) ENGINE = MergeTree ORDER BY tuple();
+
+INSERT INTO nested_in_nested_protobuf_00825 VALUES ([[(1),(2)],[(3),(4),(5)]]), ([[(6)]]), ([[]]), ([]);
+
+SELECT * FROM nested_in_nested_protobuf_00825;
+EOF
+
+BINARY_FILE_PATH=$(mktemp "$CURDIR/00825_protobuf_format_nested_in_nested.XXXXXX.binary")
+$CLICKHOUSE_CLIENT --query "SELECT * FROM nested_in_nested_protobuf_00825 FORMAT Protobuf SETTINGS format_schema = '$SCHEMADIR/00825_protobuf_format_nested_in_nested:MessageType'" > "$BINARY_FILE_PATH"
+
+# Check the output in the protobuf format
+echo
+$CURDIR/helpers/protobuf_length_delimited_encoder.py --decode_and_check --format_schema "$SCHEMADIR/00825_protobuf_format_nested_in_nested:MessageType" --input "$BINARY_FILE_PATH"
+
+# Check the input in the protobuf format (now the table contains the same data twice).
+echo
+$CLICKHOUSE_CLIENT --query "INSERT INTO nested_in_nested_protobuf_00825 FORMAT Protobuf SETTINGS format_schema='$SCHEMADIR/00825_protobuf_format_nested_in_nested:MessageType'" < "$BINARY_FILE_PATH"
+$CLICKHOUSE_CLIENT --query "SELECT * FROM nested_in_nested_protobuf_00825"
+
+rm "$BINARY_FILE_PATH"
+$CLICKHOUSE_CLIENT --query "DROP TABLE nested_in_nested_protobuf_00825"
diff --git a/tests/queries/0_stateless/00825_protobuf_format_nested_optional.sh b/tests/queries/0_stateless/00825_protobuf_format_nested_optional.sh
index 58ded92f2c1..b33db75b5c9 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_nested_optional.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_nested_optional.sh
@@ -3,13 +3,14 @@
 # https://github.com/ClickHouse/ClickHouse/issues/6497
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+SCHEMADIR=$CURDIR/format_schemas
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
 set -eo pipefail
 
 # Run the client.
-$CLICKHOUSE_CLIENT --multiquery <<'EOF'
+$CLICKHOUSE_CLIENT --multiquery <<EOF
 DROP TABLE IF EXISTS nested_optional_protobuf_00825;
 
 CREATE TABLE nested_optional_protobuf_00825
@@ -27,15 +28,16 @@ SELECT * FROM nested_optional_protobuf_00825;
 EOF
 
 BINARY_FILE_PATH=$(mktemp "$CURDIR/00825_protobuf_format_nested_optional.XXXXXX.binary")
-$CLICKHOUSE_CLIENT --query "SELECT * FROM nested_optional_protobuf_00825 FORMAT Protobuf SETTINGS format_schema = '$CURDIR/00825_protobuf_format_nested_optional:Message'" > "$BINARY_FILE_PATH"
+$CLICKHOUSE_CLIENT --query "SELECT * FROM nested_optional_protobuf_00825 FORMAT Protobuf SETTINGS format_schema = '$SCHEMADIR/00825_protobuf_format_nested_optional:Message'" > "$BINARY_FILE_PATH"
 
 # Check the output in the protobuf format
 echo
-$CURDIR/helpers/protobuf_length_delimited_encoder.py --decode_and_check --format_schema "$CURDIR/00825_protobuf_format_nested_optional:Message" --input "$BINARY_FILE_PATH"
+$CURDIR/helpers/protobuf_length_delimited_encoder.py --decode_and_check --format_schema "$SCHEMADIR/00825_protobuf_format_nested_optional:Message" --input "$BINARY_FILE_PATH"
 
 # Check the input in the protobuf format (now the table contains the same data twice).
 echo
-$CLICKHOUSE_CLIENT --query "INSERT INTO nested_optional_protobuf_00825 FORMAT Protobuf SETTINGS format_schema='$CURDIR/00825_protobuf_format_nested_optional:Message'" < "$BINARY_FILE_PATH"
+$CLICKHOUSE_CLIENT --query "INSERT INTO nested_optional_protobuf_00825 FORMAT Protobuf SETTINGS format_schema='$SCHEMADIR/00825_protobuf_format_nested_optional:Message'" < "$BINARY_FILE_PATH"
 $CLICKHOUSE_CLIENT --query "SELECT * FROM nested_optional_protobuf_00825"
 
 rm "$BINARY_FILE_PATH"
+$CLICKHOUSE_CLIENT --query "DROP TABLE nested_optional_protobuf_00825"
diff --git a/tests/queries/0_stateless/00825_protobuf_format_no_length_delimiter.reference b/tests/queries/0_stateless/00825_protobuf_format_no_length_delimiter.reference
new file mode 100644
index 00000000000..ba84d41eb51
--- /dev/null
+++ b/tests/queries/0_stateless/00825_protobuf_format_no_length_delimiter.reference
@@ -0,0 +1,13 @@
+1000	1K
+2000	2K
+3000	3K
+
+Binary representation:
+00000000  08 e8 07 12 02 31 4b                              |.....1K|
+00000007
+
+x: 1000
+str: "1K"
+
+Roundtrip:
+1000	1K
diff --git a/tests/queries/0_stateless/00825_protobuf_format_no_length_delimiter.sh b/tests/queries/0_stateless/00825_protobuf_format_no_length_delimiter.sh
new file mode 100755
index 00000000000..b95d35e8256
--- /dev/null
+++ b/tests/queries/0_stateless/00825_protobuf_format_no_length_delimiter.sh
@@ -0,0 +1,52 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+SCHEMADIR=$CURDIR/format_schemas
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+set -eo pipefail
+
+# Run the client.
+$CLICKHOUSE_CLIENT --multiquery <<EOF
+DROP TABLE IF EXISTS no_length_delimiter_protobuf_00825;
+DROP TABLE IF EXISTS roundtrip_no_length_delimiter_protobuf_00825;
+
+CREATE TABLE no_length_delimiter_protobuf_00825
+(
+  x Int32,
+  str String
+) ENGINE = MergeTree ORDER BY tuple();
+
+INSERT INTO no_length_delimiter_protobuf_00825 VALUES (1000, '1K'), (2000, '2K'), (3000, '3K');
+SELECT * FROM no_length_delimiter_protobuf_00825;
+EOF
+
+BINARY_FILE_PATH=$(mktemp "$CURDIR/00825_protobuf_format_no_length_delimiter.XXXXXX.binary")
+$CLICKHOUSE_CLIENT --query "SELECT * FROM no_length_delimiter_protobuf_00825 LIMIT 1 FORMAT ProtobufSingle SETTINGS format_schema = '$SCHEMADIR/00825_protobuf_format_no_length_delimiter:Message'" > "$BINARY_FILE_PATH"
+
+# Check the output in the ProtobufSingle format
+echo
+echo "Binary representation:"
+hexdump -C $BINARY_FILE_PATH
+
+echo
+(cd $SCHEMADIR && protoc --decode Message 00825_protobuf_format_no_length_delimiter.proto) < $BINARY_FILE_PATH
+
+# Check the input in the ProtobufSingle format.
+echo
+echo "Roundtrip:"
+$CLICKHOUSE_CLIENT --query "CREATE TABLE roundtrip_no_length_delimiter_protobuf_00825 AS no_length_delimiter_protobuf_00825"
+$CLICKHOUSE_CLIENT --query "INSERT INTO roundtrip_no_length_delimiter_protobuf_00825 FORMAT ProtobufSingle SETTINGS format_schema='$SCHEMADIR/00825_protobuf_format_no_length_delimiter:Message'" < "$BINARY_FILE_PATH"
+$CLICKHOUSE_CLIENT --query "SELECT * FROM roundtrip_no_length_delimiter_protobuf_00825"
+rm "$BINARY_FILE_PATH"
+
+# The ProtobufSingle format can't be used to write multiple rows because this format doesn't have any row delimiter.
+$CLICKHOUSE_CLIENT --multiquery --testmode > /dev/null <<EOF
+SELECT * FROM no_length_delimiter_protobuf_00825 FORMAT ProtobufSingle SETTINGS format_schema = '$SCHEMADIR/00825_protobuf_format_no_length_delimiter:Message'; -- { clientError 546 }
+EOF
+
+$CLICKHOUSE_CLIENT --multiquery <<EOF
+DROP TABLE no_length_delimiter_protobuf_00825;
+DROP TABLE roundtrip_no_length_delimiter_protobuf_00825;
+EOF
diff --git a/tests/queries/0_stateless/00825_protobuf_format_output.reference b/tests/queries/0_stateless/00825_protobuf_format_output.reference
deleted file mode 100644
index f0e0ac58a5e..00000000000
Binary files a/tests/queries/0_stateless/00825_protobuf_format_output.reference and /dev/null differ
diff --git a/tests/queries/0_stateless/00825_protobuf_format_output.sh b/tests/queries/0_stateless/00825_protobuf_format_output.sh
deleted file mode 100755
index f2d0c60b393..00000000000
--- a/tests/queries/0_stateless/00825_protobuf_format_output.sh
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/usr/bin/env bash
-
-# To generate reference file for this test use the following commands:
-# ninja ProtobufDelimitedMessagesSerializer
-# build/utils/test-data-generator/ProtobufDelimitedMessagesSerializer
-
-CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CURDIR"/../shell_config.sh
-
-set -e -o pipefail
-
-# Run the client.
-$CLICKHOUSE_CLIENT -mnT <<EOF
-DROP TABLE IF EXISTS out_persons_00825;
-DROP TABLE IF EXISTS out_squares_00825;
-
-CREATE TABLE out_persons_00825 (uuid UUID,
-                                name String,
-                                surname String,
-                                gender Enum8('male'=1, 'female'=0),
-                                birthDate Date,
-                                photo Nullable(String),
-                                phoneNumber Nullable(FixedString(13)),
-                                isOnline UInt8,
-                                visitTime Nullable(DateTime),
-                                age UInt8,
-                                zodiacSign Enum16('aries'=321, 'taurus'=420, 'gemini'=521, 'cancer'=621, 'leo'=723, 'virgo'=823,
-                                                  'libra'=923, 'scorpius'=1023, 'sagittarius'=1122, 'capricorn'=1222, 'aquarius'=120,
-                                                  'pisces'=219),
-                                songs Array(String),
-                                color Array(UInt8),
-                                hometown LowCardinality(String),
-                                location Array(Decimal32(6)),
-                                pi Nullable(Float64),
-                                lotteryWin Nullable(Decimal64(2)),
-                                someRatio Float32,
-                                temperature Decimal32(1),
-                                randomBigNumber Int64,
-                                measureUnits Nested(unit  String, coef Float32),
-                                nestiness_a_b_c_d Nullable(UInt32),
-                                \`nestiness_a_B.c_E\` Array(UInt32)
-                               ) ENGINE = MergeTree ORDER BY tuple();
-
-CREATE TABLE out_squares_00825 (number UInt32, square UInt64) ENGINE = MergeTree ORDER BY tuple();
-
-INSERT INTO out_persons_00825 VALUES (toUUID('a7522158-3d41-4b77-ad69-6c598ee55c49'), 'Ivan', 'Petrov', 'male', toDate('1980-12-29'), 'png', '+74951234567', 1, toDateTime('2019-01-05 18:45:00'), 38, 'capricorn', ['Yesterday', 'Flowers'], [255, 0, 0], 'Moscow', [55.753215, 37.622504], 3.14, 214.10, 0.1, 5.8, 17060000000, ['meter', 'centimeter', 'kilometer'], [1, 0.01, 1000], 500, [501, 502]);
-INSERT INTO out_persons_00825 VALUES (toUUID('c694ad8a-f714-4ea3-907d-fd54fb25d9b5'), 'Natalia', 'Sokolova', 'female', toDate('1992-03-08'), 'jpg', NULL, 0, NULL, 26, 'pisces', [], [100, 200, 50], 'Plymouth', [50.403724, -4.142123], 3.14159, NULL, 0.007, 5.4, -20000000000000, [], [], NULL, []);
-INSERT INTO out_persons_00825 VALUES (toUUID('a7da1aa6-f425-4789-8947-b034786ed374'), 'Vasily', 'Sidorov', 'male', toDate('1995-07-28'), 'bmp', '+442012345678', 1, toDateTime('2018-12-30 00:00:00'), 23, 'leo', ['Sunny'], [250, 244, 10], 'Murmansk', [68.970682, 33.074981], 3.14159265358979, 100000000000, 800, -3.2, 154400000, ['pound'], [16], 503, []);
-INSERT INTO out_squares_00825 VALUES (2, 4), (0, 0), (3, 9);
-
-SELECT * FROM out_persons_00825 ORDER BY name FORMAT Protobuf SETTINGS format_schema = '$CURDIR/00825_protobuf_format:Person';
-SELECT 'ALTERNATIVE->';
-SELECT * FROM out_persons_00825 ORDER BY name FORMAT Protobuf SETTINGS format_schema = '$CURDIR/00825_protobuf_format:AltPerson';
-SELECT 'STRINGS->';
-SELECT * FROM out_persons_00825 ORDER BY name FORMAT Protobuf SETTINGS format_schema = '$CURDIR/00825_protobuf_format:StrPerson';
-SELECT 'SYNTAX2->';
-SELECT * FROM out_persons_00825 ORDER BY name FORMAT Protobuf SETTINGS format_schema = '$CURDIR/00825_protobuf_format_syntax2:Syntax2Person';
-SELECT 'SQUARES->';
-SELECT * FROM out_squares_00825 ORDER BY number FORMAT Protobuf SETTINGS format_schema = '$CURDIR/00825_protobuf_format:NumberAndSquare';
-
-SELECT '\n\n** ProtobufSingle **\n\n';
-
-SELECT * FROM out_persons_00825 ORDER BY name LIMIT 1 FORMAT ProtobufSingle SETTINGS format_schema = '$CURDIR/00825_protobuf_format:Person';
-SELECT 'ALTERNATIVE->';
-SELECT * FROM out_persons_00825 ORDER BY name LIMIT 1 FORMAT ProtobufSingle SETTINGS format_schema = '$CURDIR/00825_protobuf_format:AltPerson';
-SELECT 'STRINGS->';
-SELECT * FROM out_persons_00825 ORDER BY name LIMIT 1 FORMAT ProtobufSingle SETTINGS format_schema = '$CURDIR/00825_protobuf_format:StrPerson';
-SELECT 'SYNTAX2->';
-SELECT * FROM out_persons_00825 ORDER BY name LIMIT 1 FORMAT ProtobufSingle SETTINGS format_schema = '$CURDIR/00825_protobuf_format_syntax2:Syntax2Person';
-SELECT 'SQUARES->';
-SELECT * FROM out_squares_00825 ORDER BY number LIMIT 1 FORMAT ProtobufSingle SETTINGS format_schema = '$CURDIR/00825_protobuf_format:NumberAndSquare';
-
--- Code: 546, e.displayText() = DB::Exception: The ProtobufSingle format can't be used to write multiple rows because this format doesn't have any row delimiter.
-SELECT * FROM out_persons_00825 ORDER BY name FORMAT ProtobufSingle SETTINGS format_schema = '$CURDIR/00825_protobuf_format:Person'; -- { clientError 546 }
-
-DROP TABLE IF EXISTS out_persons_00825;
-DROP TABLE IF EXISTS out_squares_00825;
-EOF
diff --git a/tests/queries/0_stateless/00825_protobuf_format_persons.reference b/tests/queries/0_stateless/00825_protobuf_format_persons.reference
new file mode 100644
index 00000000000..711980b3592
--- /dev/null
+++ b/tests/queries/0_stateless/00825_protobuf_format_persons.reference
@@ -0,0 +1,569 @@
+a7522158-3d41-4b77-ad69-6c598ee55c49	Ivan	Petrov	male	1980-12-29	png	+74951234567\0	1	2019-01-05 18:45:00	38	capricorn	['Yesterday','Flowers']	[255,0,0]	Moscow	[55.753215,37.622504]	3.14	214.10	0.1	5.8	17060000000	['meter','centimeter','kilometer']	[1,0.01,1000]	500	[501,502]
+c694ad8a-f714-4ea3-907d-fd54fb25d9b5	Natalia	Sokolova	female	1992-03-08	jpg	\N	0	\N	26	pisces	[]	[100,200,50]	Plymouth	[50.403724,-4.142123]	3.14159	\N	0.007	5.4	-20000000000000	[]	[]	\N	[]
+a7da1aa6-f425-4789-8947-b034786ed374	Vasily	Sidorov	male	1995-07-28	bmp	+442012345678	1	2018-12-30 00:00:00	23	leo	['Sunny']	[250,244,10]	Murmansk	[68.970682,33.074981]	3.14159265358979	100000000000.00	800	-3.2	154400000	['pound']	[16]	503	[]
+
+Schema 00825_protobuf_format_persons:Person
+
+Binary representation:
+00000000  f4 01 0a 24 61 37 35 32  32 31 35 38 2d 33 64 34  |...$a7522158-3d4|
+00000010  31 2d 34 62 37 37 2d 61  64 36 39 2d 36 63 35 39  |1-4b77-ad69-6c59|
+00000020  38 65 65 35 35 63 34 39  12 04 49 76 61 6e 1a 06  |8ee55c49..Ivan..|
+00000030  50 65 74 72 6f 76 20 01  28 af 1f 32 03 70 6e 67  |Petrov .(..2.png|
+00000040  3a 0d 2b 37 34 39 35 31  32 33 34 35 36 37 00 40  |:.+74951234567.@|
+00000050  01 4d fc d0 30 5c 50 26  58 09 62 09 59 65 73 74  |.M..0\P&X.b.Yest|
+00000060  65 72 64 61 79 62 07 46  6c 6f 77 65 72 73 6a 04  |erdayb.Flowersj.|
+00000070  ff 01 00 00 72 06 4d 6f  73 63 6f 77 7a 08 4b 03  |....r.Moscowz.K.|
+00000080  5f 42 72 7d 16 42 81 01  1f 85 eb 51 b8 1e 09 40  |_Br}.B.....Q...@|
+00000090  89 01 33 33 33 33 33 c3  6a 40 95 01 cd cc cc 3d  |..33333.j@.....=|
+000000a0  9d 01 9a 99 b9 40 a0 01  80 c4 d7 8d 7f aa 01 0c  |.....@..........|
+000000b0  0a 05 6d 65 74 65 72 15  00 00 80 3f aa 01 11 0a  |..meter....?....|
+000000c0  0a 63 65 6e 74 69 6d 65  74 65 72 15 0a d7 23 3c  |.centimeter...#<|
+000000d0  aa 01 10 0a 09 6b 69 6c  6f 6d 65 74 65 72 15 00  |.....kilometer..|
+000000e0  00 7a 44 b2 01 10 0a 0e  a2 06 0b 0a 09 08 f4 03  |.zD.............|
+000000f0  12 04 f5 03 f6 03 7e 0a  24 63 36 39 34 61 64 38  |......~.$c694ad8|
+00000100  61 2d 66 37 31 34 2d 34  65 61 33 2d 39 30 37 64  |a-f714-4ea3-907d|
+00000110  2d 66 64 35 34 66 62 32  35 64 39 62 35 12 07 4e  |-fd54fb25d9b5..N|
+00000120  61 74 61 6c 69 61 1a 08  53 6f 6b 6f 6c 6f 76 61  |atalia..Sokolova|
+00000130  28 a6 3f 32 03 6a 70 67  50 1a 58 0b 6a 04 64 c8  |(.?2.jpgP.X.j.d.|
+00000140  01 32 72 08 50 6c 79 6d  6f 75 74 68 7a 08 6a 9d  |.2r.Plymouthz.j.|
+00000150  49 42 46 8c 84 c0 81 01  6e 86 1b f0 f9 21 09 40  |IBF.....n....!.@|
+00000160  95 01 42 60 e5 3b 9d 01  cd cc ac 40 a0 01 ff ff  |..B`.;.....@....|
+00000170  a9 ce 93 8c 09 c0 01 0a  24 61 37 64 61 31 61 61  |........$a7da1aa|
+00000180  36 2d 66 34 32 35 2d 34  37 38 39 2d 38 39 34 37  |6-f425-4789-8947|
+00000190  2d 62 30 33 34 37 38 36  65 64 33 37 34 12 06 56  |-b034786ed374..V|
+000001a0  61 73 69 6c 79 1a 07 53  69 64 6f 72 6f 76 20 01  |asily..Sidorov .|
+000001b0  28 fb 48 32 03 62 6d 70  3a 0d 2b 34 34 32 30 31  |(.H2.bmp:.+44201|
+000001c0  32 33 34 35 36 37 38 40  01 4d 50 e0 27 5c 50 17  |2345678@.MP.'\P.|
+000001d0  58 04 62 05 53 75 6e 6e  79 6a 05 fa 01 f4 01 0a  |X.b.Sunnyj......|
+000001e0  72 08 4d 75 72 6d 61 6e  73 6b 7a 08 fd f0 89 42  |r.Murmanskz....B|
+000001f0  c8 4c 04 42 81 01 11 2d  44 54 fb 21 09 40 89 01  |.L.B...-DT.!.@..|
+00000200  00 00 00 e8 76 48 37 42  95 01 00 00 48 44 9d 01  |....vH7B....HD..|
+00000210  cd cc 4c c0 a0 01 80 d4  9f 93 01 aa 01 0c 0a 05  |..L.............|
+00000220  70 6f 75 6e 64 15 00 00  80 41 b2 01 0a 0a 08 a2  |pound....A......|
+00000230  06 05 0a 03 08 f7 03                              |.......|
+00000237
+
+MESSAGE #1 AT 0x00000002
+uuid: "a7522158-3d41-4b77-ad69-6c598ee55c49"
+name: "Ivan"
+surname: "Petrov"
+gender: male
+birthDate: 4015
+photo: "png"
+phoneNumber: "+74951234567\000"
+isOnline: true
+visitTime: 1546703100
+age: 38
+zodiacSign: capricorn
+songs: "Yesterday"
+songs: "Flowers"
+color: 255
+color: 0
+color: 0
+hometown: "Moscow"
+location: 55.7532158
+location: 37.6225052
+pi: 3.14
+lotteryWin: 214.1
+someRatio: 0.1
+temperature: 5.8
+randomBigNumber: 17060000000
+measureUnits {
+  unit: "meter"
+  coef: 1
+}
+measureUnits {
+  unit: "centimeter"
+  coef: 0.01
+}
+measureUnits {
+  unit: "kilometer"
+  coef: 1000
+}
+nestiness {
+  a {
+    b {
+      c {
+        d: 500
+        e: 501
+        e: 502
+      }
+    }
+  }
+}
+MESSAGE #2 AT 0x000000F7
+uuid: "c694ad8a-f714-4ea3-907d-fd54fb25d9b5"
+name: "Natalia"
+surname: "Sokolova"
+birthDate: 8102
+photo: "jpg"
+age: 26
+zodiacSign: pisces
+color: 100
+color: 200
+color: 50
+hometown: "Plymouth"
+location: 50.4037247
+location: -4.14212322
+pi: 3.14159
+someRatio: 0.007
+temperature: 5.4
+randomBigNumber: -20000000000000
+MESSAGE #3 AT 0x00000177
+uuid: "a7da1aa6-f425-4789-8947-b034786ed374"
+name: "Vasily"
+surname: "Sidorov"
+gender: male
+birthDate: 9339
+photo: "bmp"
+phoneNumber: "+442012345678"
+isOnline: true
+visitTime: 1546117200
+age: 23
+zodiacSign: leo
+songs: "Sunny"
+color: 250
+color: 244
+color: 10
+hometown: "Murmansk"
+location: 68.9706802
+location: 33.0749817
+pi: 3.14159265358979
+lotteryWin: 100000000000
+someRatio: 800
+temperature: -3.2
+randomBigNumber: 154400000
+measureUnits {
+  unit: "pound"
+  coef: 16
+}
+nestiness {
+  a {
+    b {
+      c {
+        d: 503
+      }
+    }
+  }
+}
+
+Binary representation is as expected
+
+Roundtrip:
+a7522158-3d41-4b77-ad69-6c598ee55c49	Ivan	Petrov	male	1980-12-29	png	+74951234567\0	1	2019-01-05 18:45:00	38	capricorn	['Yesterday','Flowers']	[255,0,0]	Moscow	[55.753216,37.622504]	3.14	214.10	0.1	5.8	17060000000	['meter','centimeter','kilometer']	[1,0.01,1000]	500	[501,502]
+c694ad8a-f714-4ea3-907d-fd54fb25d9b5	Natalia	Sokolova	female	1992-03-08	jpg	\N	0	\N	26	pisces	[]	[100,200,50]	Plymouth	[50.403724,-4.142123]	3.14159	\N	0.007	5.4	-20000000000000	[]	[]	\N	[]
+a7da1aa6-f425-4789-8947-b034786ed374	Vasily	Sidorov	male	1995-07-28	bmp	+442012345678	1	2018-12-30 00:00:00	23	leo	['Sunny']	[250,244,10]	Murmansk	[68.970680,33.074982]	3.14159265358979	100000000000.00	800	-3.2	154400000	['pound']	[16]	503	[]
+
+Schema 00825_protobuf_format_persons:AltPerson
+
+Binary representation:
+00000000  c4 01 08 01 12 04 49 76  61 6e 28 87 a8 c4 9b 97  |......Ivan(.....|
+00000010  02 52 06 50 65 74 72 6f  76 72 0c 00 00 7f 43 00  |.R.Petrovr....C.|
+00000020  00 00 00 00 00 00 00 79  fc d0 30 5c 00 00 00 00  |.......y..0\....|
+00000030  c8 02 0a c2 05 0c 00 00  80 3f 0a d7 23 3c 00 00  |.........?..#<..|
+00000040  7a 44 9a 06 05 6d 65 74  65 72 9a 06 0a 63 65 6e  |zD...meter...cen|
+00000050  74 69 6d 65 74 65 72 9a  06 09 6b 69 6c 6f 6d 65  |timeter...kilome|
+00000060  74 65 72 a1 06 00 00 00  a0 99 99 b9 3f a8 06 37  |ter.........?..7|
+00000070  a8 06 25 bd 06 c3 f5 48  40 fa 06 02 33 38 90 08  |..%....H@...38..|
+00000080  c6 09 e1 08 00 f1 da f8  03 00 00 00 b0 09 af 1f  |................|
+00000090  d0 0c d6 01 e2 12 24 61  37 35 32 32 31 35 38 2d  |......$a7522158-|
+000000a0  33 64 34 31 2d 34 62 37  37 2d 61 64 36 39 2d 36  |3d41-4b77-ad69-6|
+000000b0  63 35 39 38 65 65 35 35  63 34 39 a0 38 f4 03 aa  |c598ee55c49.8...|
+000000c0  38 04 f5 03 f6 03 84 01  12 07 4e 61 74 61 6c 69  |8.........Natali|
+000000d0  61 52 08 53 6f 6b 6f 6c  6f 76 61 72 0c 00 00 c8  |aR.Sokolovar....|
+000000e0  42 00 00 48 43 00 00 48  42 c8 02 0a a1 06 00 00  |B..HC..HB.......|
+000000f0  00 40 08 ac 7c 3f a8 06  32 a8 06 fc ff ff ff ff  |.@..|?..2.......|
+00000100  ff ff ff ff 01 b0 06 01  bd 06 d0 0f 49 40 fa 06  |............I@..|
+00000110  02 32 36 90 08 db 01 e1  08 00 c0 1a 63 cf ed ff  |.26.........c...|
+00000120  ff b0 09 a6 3f e2 12 24  63 36 39 34 61 64 38 61  |....?..$c694ad8a|
+00000130  2d 66 37 31 34 2d 34 65  61 33 2d 39 30 37 64 2d  |-f714-4ea3-907d-|
+00000140  66 64 35 34 66 62 32 35  64 39 62 35 a3 01 08 01  |fd54fb25d9b5....|
+00000150  12 06 56 61 73 69 6c 79  28 ce ca f4 cf ee 0c 52  |..Vasily(......R|
+00000160  07 53 69 64 6f 72 6f 76  72 0c 00 00 7a 43 00 00  |.Sidorovr...zC..|
+00000170  74 43 00 00 20 41 79 50  e0 27 5c 00 00 00 00 c8  |tC.. AyP.'\.....|
+00000180  02 05 c2 05 04 00 00 80  41 9a 06 05 70 6f 75 6e  |........A...poun|
+00000190  64 a1 06 00 00 00 00 00  00 89 40 a8 06 44 a8 06  |d.........@..D..|
+000001a0  21 bd 06 db 0f 49 40 fa  06 02 32 33 90 08 d3 05  |!....I@...23....|
+000001b0  e1 08 00 f5 33 09 00 00  00 00 b0 09 fb 48 d0 0c  |....3........H..|
+000001c0  80 d0 db c3 f4 02 e2 12  24 61 37 64 61 31 61 61  |........$a7da1aa|
+000001d0  36 2d 66 34 32 35 2d 34  37 38 39 2d 38 39 34 37  |6-f425-4789-8947|
+000001e0  2d 62 30 33 34 37 38 36  65 64 33 37 34 a0 38 f7  |-b034786ed374.8.|
+000001f0  03                                                |.|
+000001f1
+
+MESSAGE #1 AT 0x00000002
+isOnline: online
+name: "Ivan"
+phoneNumber: 74951234567
+surname: "Petrov"
+color: 255
+color: 0
+color: 0
+visitTime: 1546703100
+temperature: 5
+measureUnits_coef: 1
+measureUnits_coef: 0.01
+measureUnits_coef: 1000
+measureUnits_unit: "meter"
+measureUnits_unit: "centimeter"
+measureUnits_unit: "kilometer"
+someRatio: 0.10000000149011612
+location: 55
+location: 37
+pi: 3.14
+age: "38"
+zodiacSign: 1222
+randomBigNumber: 17060000000
+birthDate: 4015
+lotteryWin: 214
+uuid: "a7522158-3d41-4b77-ad69-6c598ee55c49"
+nestiness_a_b_c_d: 500
+nestiness_a_b_c_e: 501
+nestiness_a_b_c_e: 502
+MESSAGE #2 AT 0x000000C8
+name: "Natalia"
+surname: "Sokolova"
+color: 100
+color: 200
+color: 50
+temperature: 5
+someRatio: 0.0070000002160668373
+location: 50
+location: -4
+gender: female
+pi: 3.14159
+age: "26"
+zodiacSign: 219
+randomBigNumber: -20000000000000
+birthDate: 8102
+uuid: "c694ad8a-f714-4ea3-907d-fd54fb25d9b5"
+MESSAGE #3 AT 0x0000014E
+isOnline: online
+name: "Vasily"
+phoneNumber: 442012345678
+surname: "Sidorov"
+color: 250
+color: 244
+color: 10
+visitTime: 1546117200
+temperature: -3
+measureUnits_coef: 16
+measureUnits_unit: "pound"
+someRatio: 800
+location: 68
+location: 33
+pi: 3.14159274
+age: "23"
+zodiacSign: 723
+randomBigNumber: 154400000
+birthDate: 9339
+lotteryWin: 100000000000
+uuid: "a7da1aa6-f425-4789-8947-b034786ed374"
+nestiness_a_b_c_d: 503
+
+Binary representation is as expected
+
+Roundtrip:
+a7522158-3d41-4b77-ad69-6c598ee55c49	Ivan	Petrov	male	1980-12-29	\N	74951234567\0\0	1	2019-01-05 18:45:00	38	capricorn	[]	[255,0,0]		[55.000000,37.000000]	3.140000104904175	214.00	0.1	5.0	17060000000	['meter','centimeter','kilometer']	[1,0.01,1000]	500	[501,502]
+c694ad8a-f714-4ea3-907d-fd54fb25d9b5	Natalia	Sokolova	female	1992-03-08	\N	\N	0	\N	26	pisces	[]	[100,200,50]		[50.000000,-4.000000]	3.141590118408203	\N	0.007	5.0	-20000000000000	[]	[]	\N	[]
+a7da1aa6-f425-4789-8947-b034786ed374	Vasily	Sidorov	male	1995-07-28	\N	442012345678\0	1	2018-12-30 00:00:00	23	leo	[]	[250,244,10]		[68.000000,33.000000]	3.1415927410125732	100000000000.00	800	-3.0	154400000	['pound']	[16]	503	[]
+
+Schema 00825_protobuf_format_persons:StrPerson
+
+Binary representation:
+00000000  a7 02 0a 24 61 37 35 32  32 31 35 38 2d 33 64 34  |...$a7522158-3d4|
+00000010  31 2d 34 62 37 37 2d 61  64 36 39 2d 36 63 35 39  |1-4b77-ad69-6c59|
+00000020  38 65 65 35 35 63 34 39  12 04 49 76 61 6e 1a 06  |8ee55c49..Ivan..|
+00000030  50 65 74 72 6f 76 22 04  6d 61 6c 65 2a 0a 31 39  |Petrov".male*.19|
+00000040  38 30 2d 31 32 2d 32 39  3a 0d 2b 37 34 39 35 31  |80-12-29:.+74951|
+00000050  32 33 34 35 36 37 00 42  01 31 4a 13 32 30 31 39  |234567.B.1J.2019|
+00000060  2d 30 31 2d 30 35 20 31  38 3a 34 35 3a 30 30 52  |-01-05 18:45:00R|
+00000070  02 33 38 5a 09 63 61 70  72 69 63 6f 72 6e 62 09  |.38Z.capricornb.|
+00000080  59 65 73 74 65 72 64 61  79 62 07 46 6c 6f 77 65  |Yesterdayb.Flowe|
+00000090  72 73 6a 03 32 35 35 6a  01 30 6a 01 30 72 06 4d  |rsj.255j.0j.0r.M|
+000000a0  6f 73 63 6f 77 7a 09 35  35 2e 37 35 33 32 31 35  |oscowz.55.753215|
+000000b0  7a 09 33 37 2e 36 32 32  35 30 34 82 01 04 33 2e  |z.37.622504...3.|
+000000c0  31 34 8a 01 06 32 31 34  2e 31 30 92 01 03 30 2e  |14...214.10...0.|
+000000d0  31 9a 01 03 35 2e 38 a2  01 0b 31 37 30 36 30 30  |1...5.8...170600|
+000000e0  30 30 30 30 30 aa 01 2d  0a 05 6d 65 74 65 72 0a  |00000..-..meter.|
+000000f0  0a 63 65 6e 74 69 6d 65  74 65 72 0a 09 6b 69 6c  |.centimeter..kil|
+00000100  6f 6d 65 74 65 72 12 01  31 12 04 30 2e 30 31 12  |ometer..1..0.01.|
+00000110  04 31 30 30 30 b2 01 11  0a 0f 0a 03 35 30 30 12  |.1000.......500.|
+00000120  03 35 30 31 12 03 35 30  32 b4 01 0a 24 63 36 39  |.501..502...$c69|
+00000130  34 61 64 38 61 2d 66 37  31 34 2d 34 65 61 33 2d  |4ad8a-f714-4ea3-|
+00000140  39 30 37 64 2d 66 64 35  34 66 62 32 35 64 39 62  |907d-fd54fb25d9b|
+00000150  35 12 07 4e 61 74 61 6c  69 61 1a 08 53 6f 6b 6f  |5..Natalia..Soko|
+00000160  6c 6f 76 61 22 06 66 65  6d 61 6c 65 2a 0a 31 39  |lova".female*.19|
+00000170  39 32 2d 30 33 2d 30 38  42 01 30 52 02 32 36 5a  |92-03-08B.0R.26Z|
+00000180  06 70 69 73 63 65 73 6a  03 31 30 30 6a 03 32 30  |.piscesj.100j.20|
+00000190  30 6a 02 35 30 72 08 50  6c 79 6d 6f 75 74 68 7a  |0j.50r.Plymouthz|
+000001a0  09 35 30 2e 34 30 33 37  32 34 7a 09 2d 34 2e 31  |.50.403724z.-4.1|
+000001b0  34 32 31 32 33 82 01 07  33 2e 31 34 31 35 39 92  |42123...3.14159.|
+000001c0  01 05 30 2e 30 30 37 9a  01 03 35 2e 34 a2 01 0f  |..0.007...5.4...|
+000001d0  2d 32 30 30 30 30 30 30  30 30 30 30 30 30 30 84  |-20000000000000.|
+000001e0  02 0a 24 61 37 64 61 31  61 61 36 2d 66 34 32 35  |..$a7da1aa6-f425|
+000001f0  2d 34 37 38 39 2d 38 39  34 37 2d 62 30 33 34 37  |-4789-8947-b0347|
+00000200  38 36 65 64 33 37 34 12  06 56 61 73 69 6c 79 1a  |86ed374..Vasily.|
+00000210  07 53 69 64 6f 72 6f 76  22 04 6d 61 6c 65 2a 0a  |.Sidorov".male*.|
+00000220  31 39 39 35 2d 30 37 2d  32 38 3a 0d 2b 34 34 32  |1995-07-28:.+442|
+00000230  30 31 32 33 34 35 36 37  38 42 01 31 4a 13 32 30  |012345678B.1J.20|
+00000240  31 38 2d 31 32 2d 33 30  20 30 30 3a 30 30 3a 30  |18-12-30 00:00:0|
+00000250  30 52 02 32 33 5a 03 6c  65 6f 62 05 53 75 6e 6e  |0R.23Z.leob.Sunn|
+00000260  79 6a 03 32 35 30 6a 03  32 34 34 6a 02 31 30 72  |yj.250j.244j.10r|
+00000270  08 4d 75 72 6d 61 6e 73  6b 7a 09 36 38 2e 39 37  |.Murmanskz.68.97|
+00000280  30 36 38 32 7a 09 33 33  2e 30 37 34 39 38 31 82  |0682z.33.074981.|
+00000290  01 10 33 2e 31 34 31 35  39 32 36 35 33 35 38 39  |..3.141592653589|
+000002a0  37 39 8a 01 0f 31 30 30  30 30 30 30 30 30 30 30  |79...10000000000|
+000002b0  30 2e 30 30 92 01 03 38  30 30 9a 01 04 2d 33 2e  |0.00...800...-3.|
+000002c0  32 a2 01 09 31 35 34 34  30 30 30 30 30 aa 01 0b  |2...154400000...|
+000002d0  0a 05 70 6f 75 6e 64 12  02 31 36 b2 01 07 0a 05  |..pound..16.....|
+000002e0  0a 03 35 30 33                                    |..503|
+000002e5
+
+MESSAGE #1 AT 0x00000002
+uuid: "a7522158-3d41-4b77-ad69-6c598ee55c49"
+name: "Ivan"
+surname: "Petrov"
+gender: "male"
+birthDate: "1980-12-29"
+phoneNumber: "+74951234567\000"
+isOnline: "1"
+visitTime: "2019-01-05 18:45:00"
+age: "38"
+zodiacSign: "capricorn"
+songs: "Yesterday"
+songs: "Flowers"
+color: "255"
+color: "0"
+color: "0"
+hometown: "Moscow"
+location: "55.753215"
+location: "37.622504"
+pi: "3.14"
+lotteryWin: "214.10"
+someRatio: "0.1"
+temperature: "5.8"
+randomBigNumber: "17060000000"
+measureUnits {
+  unit: "meter"
+  unit: "centimeter"
+  unit: "kilometer"
+  coef: "1"
+  coef: "0.01"
+  coef: "1000"
+}
+nestiness_a {
+  b_c {
+    d: "500"
+    e: "501"
+    e: "502"
+  }
+}
+MESSAGE #2 AT 0x0000012B
+uuid: "c694ad8a-f714-4ea3-907d-fd54fb25d9b5"
+name: "Natalia"
+surname: "Sokolova"
+gender: "female"
+birthDate: "1992-03-08"
+isOnline: "0"
+age: "26"
+zodiacSign: "pisces"
+color: "100"
+color: "200"
+color: "50"
+hometown: "Plymouth"
+location: "50.403724"
+location: "-4.142123"
+pi: "3.14159"
+someRatio: "0.007"
+temperature: "5.4"
+randomBigNumber: "-20000000000000"
+MESSAGE #3 AT 0x000001E1
+uuid: "a7da1aa6-f425-4789-8947-b034786ed374"
+name: "Vasily"
+surname: "Sidorov"
+gender: "male"
+birthDate: "1995-07-28"
+phoneNumber: "+442012345678"
+isOnline: "1"
+visitTime: "2018-12-30 00:00:00"
+age: "23"
+zodiacSign: "leo"
+songs: "Sunny"
+color: "250"
+color: "244"
+color: "10"
+hometown: "Murmansk"
+location: "68.970682"
+location: "33.074981"
+pi: "3.14159265358979"
+lotteryWin: "100000000000.00"
+someRatio: "800"
+temperature: "-3.2"
+randomBigNumber: "154400000"
+measureUnits {
+  unit: "pound"
+  coef: "16"
+}
+nestiness_a {
+  b_c {
+    d: "503"
+  }
+}
+
+Binary representation is as expected
+
+Roundtrip:
+a7522158-3d41-4b77-ad69-6c598ee55c49	Ivan	Petrov	male	1980-12-29	\N	+74951234567\0	1	2019-01-05 18:45:00	38	capricorn	['Yesterday','Flowers']	[255,0,0]	Moscow	[55.753215,37.622504]	3.14	214.10	0.1	5.8	17060000000	['meter','centimeter','kilometer']	[1,0.01,1000]	500	[501,502]
+c694ad8a-f714-4ea3-907d-fd54fb25d9b5	Natalia	Sokolova	female	1992-03-08	\N	\N	0	\N	26	pisces	[]	[100,200,50]	Plymouth	[50.403724,-4.142123]	3.14159	\N	0.007	5.4	-20000000000000	[]	[]	\N	[]
+a7da1aa6-f425-4789-8947-b034786ed374	Vasily	Sidorov	male	1995-07-28	\N	+442012345678	1	2018-12-30 00:00:00	23	leo	['Sunny']	[250,244,10]	Murmansk	[68.970682,33.074981]	3.14159265358979	100000000000.00	800	-3.2	154400000	['pound']	[16]	503	[]
+
+Schema 00825_protobuf_format_syntax2:Syntax2Person
+
+Binary representation:
+00000000  f1 01 0a 24 61 37 35 32  32 31 35 38 2d 33 64 34  |...$a7522158-3d4|
+00000010  31 2d 34 62 37 37 2d 61  64 36 39 2d 36 63 35 39  |1-4b77-ad69-6c59|
+00000020  38 65 65 35 35 63 34 39  12 04 49 76 61 6e 1a 06  |8ee55c49..Ivan..|
+00000030  50 65 74 72 6f 76 20 01  28 af 1f 32 03 70 6e 67  |Petrov .(..2.png|
+00000040  3a 0d 2b 37 34 39 35 31  32 33 34 35 36 37 00 40  |:.+74951234567.@|
+00000050  01 4d fc d0 30 5c 50 26  58 09 62 09 59 65 73 74  |.M..0\P&X.b.Yest|
+00000060  65 72 64 61 79 62 07 46  6c 6f 77 65 72 73 68 ff  |erdayb.Flowersh.|
+00000070  01 68 00 68 00 72 06 4d  6f 73 63 6f 77 7a 08 4b  |.h.h.r.Moscowz.K|
+00000080  03 5f 42 72 7d 16 42 81  01 1f 85 eb 51 b8 1e 09  |._Br}.B.....Q...|
+00000090  40 89 01 33 33 33 33 33  c3 6a 40 95 01 cd cc cc  |@..33333.j@.....|
+000000a0  3d 9d 01 9a 99 b9 40 a0  01 80 c4 d7 8d 7f ab 01  |=.....@.........|
+000000b0  0d 00 00 80 3f 0d 0a d7  23 3c 0d 00 00 7a 44 12  |....?...#<...zD.|
+000000c0  05 6d 65 74 65 72 12 0a  63 65 6e 74 69 6d 65 74  |.meter..centimet|
+000000d0  65 72 12 09 6b 69 6c 6f  6d 65 74 65 72 ac 01 b3  |er..kilometer...|
+000000e0  01 0b a2 06 0b 0b 08 f4  03 10 f5 03 10 f6 03 0c  |................|
+000000f0  0c b4 01 83 01 0a 24 63  36 39 34 61 64 38 61 2d  |......$c694ad8a-|
+00000100  66 37 31 34 2d 34 65 61  33 2d 39 30 37 64 2d 66  |f714-4ea3-907d-f|
+00000110  64 35 34 66 62 32 35 64  39 62 35 12 07 4e 61 74  |d54fb25d9b5..Nat|
+00000120  61 6c 69 61 1a 08 53 6f  6b 6f 6c 6f 76 61 20 00  |alia..Sokolova .|
+00000130  28 a6 3f 32 03 6a 70 67  40 00 50 1a 58 0b 68 64  |(.?2.jpg@.P.X.hd|
+00000140  68 c8 01 68 32 72 08 50  6c 79 6d 6f 75 74 68 7a  |h..h2r.Plymouthz|
+00000150  08 6a 9d 49 42 46 8c 84  c0 81 01 6e 86 1b f0 f9  |.j.IBF.....n....|
+00000160  21 09 40 95 01 42 60 e5  3b 9d 01 cd cc ac 40 a0  |!.@..B`.;.....@.|
+00000170  01 ff ff a9 ce 93 8c 09  c3 01 0a 24 61 37 64 61  |...........$a7da|
+00000180  31 61 61 36 2d 66 34 32  35 2d 34 37 38 39 2d 38  |1aa6-f425-4789-8|
+00000190  39 34 37 2d 62 30 33 34  37 38 36 65 64 33 37 34  |947-b034786ed374|
+000001a0  12 06 56 61 73 69 6c 79  1a 07 53 69 64 6f 72 6f  |..Vasily..Sidoro|
+000001b0  76 20 01 28 fb 48 32 03  62 6d 70 3a 0d 2b 34 34  |v .(.H2.bmp:.+44|
+000001c0  32 30 31 32 33 34 35 36  37 38 40 01 4d 50 e0 27  |2012345678@.MP.'|
+000001d0  5c 50 17 58 04 62 05 53  75 6e 6e 79 68 fa 01 68  |\P.X.b.Sunnyh..h|
+000001e0  f4 01 68 0a 72 08 4d 75  72 6d 61 6e 73 6b 7a 08  |..h.r.Murmanskz.|
+000001f0  fd f0 89 42 c8 4c 04 42  81 01 11 2d 44 54 fb 21  |...B.L.B...-DT.!|
+00000200  09 40 89 01 00 00 00 e8  76 48 37 42 95 01 00 00  |.@......vH7B....|
+00000210  48 44 9d 01 cd cc 4c c0  a0 01 80 d4 9f 93 01 ab  |HD....L.........|
+00000220  01 0d 00 00 80 41 12 05  70 6f 75 6e 64 ac 01 b3  |.....A..pound...|
+00000230  01 0b a2 06 05 0b 08 f7  03 0c 0c b4 01           |.............|
+0000023d
+
+MESSAGE #1 AT 0x00000002
+uuid: "a7522158-3d41-4b77-ad69-6c598ee55c49"
+name: "Ivan"
+surname: "Petrov"
+gender: male
+birthDate: 4015
+photo: "png"
+phoneNumber: "+74951234567\000"
+isOnline: true
+visitTime: 1546703100
+age: 38
+zodiacSign: capricorn
+songs: "Yesterday"
+songs: "Flowers"
+color: 255
+color: 0
+color: 0
+hometown: "Moscow"
+location: 55.7532158
+location: 37.6225052
+pi: 3.14
+lotteryWin: 214.1
+someRatio: 0.1
+temperature: 5.8
+randomBigNumber: 17060000000
+MeasureUnits {
+  coef: 1
+  coef: 0.01
+  coef: 1000
+  unit: "meter"
+  unit: "centimeter"
+  unit: "kilometer"
+}
+Nestiness {
+  A {
+    b {
+      C {
+        d: 500
+        e: 501
+        e: 502
+      }
+    }
+  }
+}
+MESSAGE #2 AT 0x000000F5
+uuid: "c694ad8a-f714-4ea3-907d-fd54fb25d9b5"
+name: "Natalia"
+surname: "Sokolova"
+gender: female
+birthDate: 8102
+photo: "jpg"
+isOnline: false
+age: 26
+zodiacSign: pisces
+color: 100
+color: 200
+color: 50
+hometown: "Plymouth"
+location: 50.4037247
+location: -4.14212322
+pi: 3.14159
+someRatio: 0.007
+temperature: 5.4
+randomBigNumber: -20000000000000
+MESSAGE #3 AT 0x0000017A
+uuid: "a7da1aa6-f425-4789-8947-b034786ed374"
+name: "Vasily"
+surname: "Sidorov"
+gender: male
+birthDate: 9339
+photo: "bmp"
+phoneNumber: "+442012345678"
+isOnline: true
+visitTime: 1546117200
+age: 23
+zodiacSign: leo
+songs: "Sunny"
+color: 250
+color: 244
+color: 10
+hometown: "Murmansk"
+location: 68.9706802
+location: 33.0749817
+pi: 3.14159265358979
+lotteryWin: 100000000000
+someRatio: 800
+temperature: -3.2
+randomBigNumber: 154400000
+MeasureUnits {
+  coef: 16
+  unit: "pound"
+}
+Nestiness {
+  A {
+    b {
+      C {
+        d: 503
+      }
+    }
+  }
+}
+
+Binary representation is as expected
+
+Roundtrip:
+a7522158-3d41-4b77-ad69-6c598ee55c49	Ivan	Petrov	male	1980-12-29	png	+74951234567\0	1	2019-01-05 18:45:00	38	capricorn	['Yesterday','Flowers']	[255,0,0]	Moscow	[55.753216,37.622504]	3.14	214.10	0.1	5.8	17060000000	['meter','centimeter','kilometer']	[1,0.01,1000]	500	[501,502]
+c694ad8a-f714-4ea3-907d-fd54fb25d9b5	Natalia	Sokolova	female	1992-03-08	jpg	\N	0	\N	26	pisces	[]	[100,200,50]	Plymouth	[50.403724,-4.142123]	3.14159	\N	0.007	5.4	-20000000000000	[]	[]	\N	[]
+a7da1aa6-f425-4789-8947-b034786ed374	Vasily	Sidorov	male	1995-07-28	bmp	+442012345678	1	2018-12-30 00:00:00	23	leo	['Sunny']	[250,244,10]	Murmansk	[68.970680,33.074982]	3.14159265358979	100000000000.00	800	-3.2	154400000	['pound']	[16]	503	[]
diff --git a/tests/queries/0_stateless/00825_protobuf_format_persons.sh b/tests/queries/0_stateless/00825_protobuf_format_persons.sh
new file mode 100755
index 00000000000..957ed738d99
--- /dev/null
+++ b/tests/queries/0_stateless/00825_protobuf_format_persons.sh
@@ -0,0 +1,118 @@
+#!/usr/bin/env bash
+
+# To generate reference file for this test use the following commands:
+# ninja ProtobufDelimitedMessagesSerializer
+# build/utils/test-data-generator/ProtobufDelimitedMessagesSerializer
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+SCHEMADIR=$CURDIR/format_schemas
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+set -eo pipefail
+
+# Run the client.
+$CLICKHOUSE_CLIENT --multiquery <<EOF
+DROP TABLE IF EXISTS persons_00825;
+DROP TABLE IF EXISTS roundtrip_persons_00825;
+DROP TABLE IF EXISTS alt_persons_00825;
+DROP TABLE IF EXISTS str_persons_00825;
+DROP TABLE IF EXISTS syntax2_persons_00825;
+
+CREATE TABLE persons_00825 (uuid UUID,
+                            name String,
+                            surname String,
+                            gender Enum8('male'=1, 'female'=0),
+                            birthDate Date,
+                            photo Nullable(String),
+                            phoneNumber Nullable(FixedString(13)),
+                            isOnline UInt8,
+                            visitTime Nullable(DateTime),
+                            age UInt8,
+                            zodiacSign Enum16('aries'=321, 'taurus'=420, 'gemini'=521, 'cancer'=621, 'leo'=723, 'virgo'=823,
+                                              'libra'=923, 'scorpius'=1023, 'sagittarius'=1122, 'capricorn'=1222, 'aquarius'=120,
+                                              'pisces'=219),
+                            songs Array(String),
+                            color Array(UInt8),
+                            hometown LowCardinality(String),
+                            location Array(Decimal32(6)),
+                            pi Nullable(Float64),
+                            lotteryWin Nullable(Decimal64(2)),
+                            someRatio Float32,
+                            temperature Decimal32(1),
+                            randomBigNumber Int64,
+                            measureUnits Nested(unit  String, coef Float32),
+                            nestiness_a_b_c_d Nullable(UInt32),
+                            \`nestiness_a_B.c_E\` Array(UInt32)
+                           ) ENGINE = MergeTree ORDER BY tuple();
+
+INSERT INTO persons_00825 VALUES (toUUID('a7522158-3d41-4b77-ad69-6c598ee55c49'), 'Ivan', 'Petrov', 'male', toDate('1980-12-29'), 'png', '+74951234567', 1, toDateTime('2019-01-05 18:45:00'), 38, 'capricorn', ['Yesterday', 'Flowers'], [255, 0, 0], 'Moscow', [55.753215, 37.622504], 3.14, 214.10, 0.1, 5.8, 17060000000, ['meter', 'centimeter', 'kilometer'], [1, 0.01, 1000], 500, [501, 502]);
+INSERT INTO persons_00825 VALUES (toUUID('c694ad8a-f714-4ea3-907d-fd54fb25d9b5'), 'Natalia', 'Sokolova', 'female', toDate('1992-03-08'), 'jpg', NULL, 0, NULL, 26, 'pisces', [], [100, 200, 50], 'Plymouth', [50.403724, -4.142123], 3.14159, NULL, 0.007, 5.4, -20000000000000, [], [], NULL, []);
+INSERT INTO persons_00825 VALUES (toUUID('a7da1aa6-f425-4789-8947-b034786ed374'), 'Vasily', 'Sidorov', 'male', toDate('1995-07-28'), 'bmp', '+442012345678', 1, toDateTime('2018-12-30 00:00:00'), 23, 'leo', ['Sunny'], [250, 244, 10], 'Murmansk', [68.970682, 33.074981], 3.14159265358979, 100000000000, 800, -3.2, 154400000, ['pound'], [16], 503, []);
+
+SELECT * FROM persons_00825 ORDER BY name;
+EOF
+
+# Use schema 00825_protobuf_format_persons:Person
+echo
+echo "Schema 00825_protobuf_format_persons:Person"
+BINARY_FILE_PATH=$(mktemp "$CURDIR/00825_protobuf_format_persons.XXXXXX.binary")
+$CLICKHOUSE_CLIENT --query "SELECT * FROM persons_00825 ORDER BY name FORMAT Protobuf SETTINGS format_schema = '$SCHEMADIR/00825_protobuf_format_persons:Person'" > $BINARY_FILE_PATH
+echo
+$CURDIR/helpers/protobuf_length_delimited_encoder.py --decode_and_check --format_schema "$SCHEMADIR/00825_protobuf_format_persons:Person" --input "$BINARY_FILE_PATH"
+echo
+echo "Roundtrip:"
+$CLICKHOUSE_CLIENT --query "CREATE TABLE roundtrip_persons_00825 AS persons_00825"
+$CLICKHOUSE_CLIENT --query "INSERT INTO roundtrip_persons_00825 FORMAT Protobuf SETTINGS format_schema='$SCHEMADIR/00825_protobuf_format_persons:Person'" < "$BINARY_FILE_PATH"
+$CLICKHOUSE_CLIENT --query "SELECT * FROM roundtrip_persons_00825 ORDER BY name"
+rm "$BINARY_FILE_PATH"
+
+# Use schema 00825_protobuf_format_persons:AltPerson
+echo
+echo "Schema 00825_protobuf_format_persons:AltPerson"
+BINARY_FILE_PATH=$(mktemp "$CURDIR/00825_protobuf_format_persons.XXXXXX.binary")
+$CLICKHOUSE_CLIENT --query "SELECT * FROM persons_00825 ORDER BY name FORMAT Protobuf SETTINGS format_schema = '$SCHEMADIR/00825_protobuf_format_persons:AltPerson'" > $BINARY_FILE_PATH
+echo
+$CURDIR/helpers/protobuf_length_delimited_encoder.py --decode_and_check --format_schema "$SCHEMADIR/00825_protobuf_format_persons:AltPerson" --input "$BINARY_FILE_PATH"
+echo
+echo "Roundtrip:"
+$CLICKHOUSE_CLIENT --query "CREATE TABLE alt_persons_00825 AS persons_00825"
+$CLICKHOUSE_CLIENT --query "INSERT INTO alt_persons_00825 FORMAT Protobuf SETTINGS format_schema='$SCHEMADIR/00825_protobuf_format_persons:AltPerson'" < "$BINARY_FILE_PATH"
+$CLICKHOUSE_CLIENT --query "SELECT * FROM alt_persons_00825 ORDER BY name"
+rm "$BINARY_FILE_PATH"
+
+# Use schema 00825_protobuf_format_persons:StrPerson
+echo
+echo "Schema 00825_protobuf_format_persons:StrPerson"
+BINARY_FILE_PATH=$(mktemp "$CURDIR/00825_protobuf_format_persons.XXXXXX.binary")
+$CLICKHOUSE_CLIENT --query "SELECT * FROM persons_00825 ORDER BY name FORMAT Protobuf SETTINGS format_schema = '$SCHEMADIR/00825_protobuf_format_persons:StrPerson'" > $BINARY_FILE_PATH
+echo
+$CURDIR/helpers/protobuf_length_delimited_encoder.py --decode_and_check --format_schema "$SCHEMADIR/00825_protobuf_format_persons:StrPerson" --input "$BINARY_FILE_PATH"
+echo
+echo "Roundtrip:"
+$CLICKHOUSE_CLIENT --query "CREATE TABLE str_persons_00825 AS persons_00825"
+$CLICKHOUSE_CLIENT --query "INSERT INTO str_persons_00825 FORMAT Protobuf SETTINGS format_schema='$SCHEMADIR/00825_protobuf_format_persons:StrPerson'" < "$BINARY_FILE_PATH"
+$CLICKHOUSE_CLIENT --query "SELECT * FROM str_persons_00825 ORDER BY name"
+rm "$BINARY_FILE_PATH"
+
+# Use schema 00825_protobuf_format_syntax2:Syntax2Person
+echo
+echo "Schema 00825_protobuf_format_syntax2:Syntax2Person"
+BINARY_FILE_PATH=$(mktemp "$CURDIR/00825_protobuf_format_persons.XXXXXX.binary")
+$CLICKHOUSE_CLIENT --query "SELECT * FROM persons_00825 ORDER BY name FORMAT Protobuf SETTINGS format_schema = '$SCHEMADIR/00825_protobuf_format_persons_syntax2:Syntax2Person'" > $BINARY_FILE_PATH
+echo
+$CURDIR/helpers/protobuf_length_delimited_encoder.py --decode_and_check --format_schema "$SCHEMADIR/00825_protobuf_format_persons_syntax2:Syntax2Person" --input "$BINARY_FILE_PATH"
+echo
+echo "Roundtrip:"
+$CLICKHOUSE_CLIENT --query "CREATE TABLE syntax2_persons_00825 AS persons_00825"
+$CLICKHOUSE_CLIENT --query "INSERT INTO syntax2_persons_00825 FORMAT Protobuf SETTINGS format_schema='$SCHEMADIR/00825_protobuf_format_persons_syntax2:Syntax2Person'" < "$BINARY_FILE_PATH"
+$CLICKHOUSE_CLIENT --query "SELECT * FROM syntax2_persons_00825 ORDER BY name"
+rm "$BINARY_FILE_PATH"
+
+$CLICKHOUSE_CLIENT --multiquery <<EOF
+DROP TABLE persons_00825;
+DROP TABLE roundtrip_persons_00825;
+DROP TABLE alt_persons_00825;
+DROP TABLE str_persons_00825;
+DROP TABLE syntax2_persons_00825;
+EOF
diff --git a/tests/queries/0_stateless/00825_protobuf_format_squares.reference b/tests/queries/0_stateless/00825_protobuf_format_squares.reference
new file mode 100644
index 00000000000..83a09bd547c
--- /dev/null
+++ b/tests/queries/0_stateless/00825_protobuf_format_squares.reference
@@ -0,0 +1,24 @@
+2	4
+0	0
+3	9
+
+Binary representation:
+00000000  04 08 02 10 04 00 04 08  03 10 09                 |...........|
+0000000b
+
+MESSAGE #1 AT 0x00000001
+number: 2
+square: 4
+MESSAGE #2 AT 0x00000006
+MESSAGE #3 AT 0x00000007
+number: 3
+square: 9
+
+Binary representation is as expected
+
+2	4
+0	0
+3	9
+2	4
+0	0
+3	9
diff --git a/tests/queries/0_stateless/00825_protobuf_format_squares.sh b/tests/queries/0_stateless/00825_protobuf_format_squares.sh
new file mode 100755
index 00000000000..d3ff3ad2f4f
--- /dev/null
+++ b/tests/queries/0_stateless/00825_protobuf_format_squares.sh
@@ -0,0 +1,34 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+SCHEMADIR=$CURDIR/format_schemas
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+set -eo pipefail
+
+# Run the client.
+$CLICKHOUSE_CLIENT --multiquery <<EOF
+DROP TABLE IF EXISTS squares_protobuf_00825;
+
+CREATE TABLE squares_protobuf_00825 (number UInt32, square UInt64) ENGINE = MergeTree ORDER BY tuple();
+
+INSERT INTO squares_protobuf_00825 VALUES (2, 4), (0, 0), (3, 9);
+
+SELECT * FROM squares_protobuf_00825;
+EOF
+
+BINARY_FILE_PATH=$(mktemp "$CURDIR/00825_protobuf_format_nested_optional.XXXXXX.binary")
+$CLICKHOUSE_CLIENT --query "SELECT * FROM squares_protobuf_00825 FORMAT Protobuf SETTINGS format_schema = '$SCHEMADIR/00825_protobuf_format_squares:NumberAndSquare'" > "$BINARY_FILE_PATH"
+
+# Check the output in the protobuf format
+echo
+$CURDIR/helpers/protobuf_length_delimited_encoder.py --decode_and_check --format_schema "$SCHEMADIR/00825_protobuf_format_squares:NumberAndSquare" --input "$BINARY_FILE_PATH"
+
+# Check the input in the protobuf format (now the table contains the same data twice).
+echo
+$CLICKHOUSE_CLIENT --query "INSERT INTO squares_protobuf_00825 FORMAT Protobuf SETTINGS format_schema='$SCHEMADIR/00825_protobuf_format_squares:NumberAndSquare'" < "$BINARY_FILE_PATH"
+$CLICKHOUSE_CLIENT --query "SELECT * FROM squares_protobuf_00825"
+
+rm "$BINARY_FILE_PATH"
+$CLICKHOUSE_CLIENT --query "DROP TABLE squares_protobuf_00825"
diff --git a/tests/queries/0_stateless/00825_protobuf_format_table_default.sh b/tests/queries/0_stateless/00825_protobuf_format_table_default.sh
index 97f7769269a..96664ca7f20 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_table_default.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_table_default.sh
@@ -1,13 +1,14 @@
 #!/usr/bin/env bash
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+SCHEMADIR=$CURDIR/format_schemas
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
 set -eo pipefail
 
 # Run the client.
-$CLICKHOUSE_CLIENT --multiquery <<'EOF'
+$CLICKHOUSE_CLIENT --multiquery <<EOF
 DROP TABLE IF EXISTS table_default_protobuf_00825;
 
 CREATE TABLE table_default_protobuf_00825
@@ -24,15 +25,16 @@ SELECT * FROM table_default_protobuf_00825 ORDER BY x,y,z;
 EOF
 
 BINARY_FILE_PATH=$(mktemp "$CURDIR/00825_protobuf_format_table_default.XXXXXX.binary")
-$CLICKHOUSE_CLIENT --query "SELECT * FROM table_default_protobuf_00825 ORDER BY x,y,z FORMAT Protobuf SETTINGS format_schema = '$CURDIR/00825_protobuf_format_table_default:Message'" > "$BINARY_FILE_PATH"
+$CLICKHOUSE_CLIENT --query "SELECT * FROM table_default_protobuf_00825 ORDER BY x,y,z FORMAT Protobuf SETTINGS format_schema = '$SCHEMADIR/00825_protobuf_format_table_default:Message'" > "$BINARY_FILE_PATH"
 
 # Check the output in the protobuf format
 echo
-$CURDIR/helpers/protobuf_length_delimited_encoder.py --decode_and_check --format_schema "$CURDIR/00825_protobuf_format_table_default:Message" --input "$BINARY_FILE_PATH"
+$CURDIR/helpers/protobuf_length_delimited_encoder.py --decode_and_check --format_schema "$SCHEMADIR/00825_protobuf_format_table_default:Message" --input "$BINARY_FILE_PATH"
 
 # Check the input in the protobuf format (now the table contains the same data twice).
 echo
-$CLICKHOUSE_CLIENT --query "INSERT INTO table_default_protobuf_00825 FORMAT Protobuf SETTINGS format_schema='$CURDIR/00825_protobuf_format_table_default:Message'" < "$BINARY_FILE_PATH"
+$CLICKHOUSE_CLIENT --query "INSERT INTO table_default_protobuf_00825 FORMAT Protobuf SETTINGS format_schema='$SCHEMADIR/00825_protobuf_format_table_default:Message'" < "$BINARY_FILE_PATH"
 $CLICKHOUSE_CLIENT --query "SELECT * FROM table_default_protobuf_00825 ORDER BY x,y,z"
 
 rm "$BINARY_FILE_PATH"
+$CLICKHOUSE_CLIENT --query "DROP TABLE table_default_protobuf_00825"
diff --git a/tests/queries/0_stateless/00826_cross_to_inner_join.reference b/tests/queries/0_stateless/00826_cross_to_inner_join.reference
index 84867de2849..973c5b078a3 100644
--- a/tests/queries/0_stateless/00826_cross_to_inner_join.reference
+++ b/tests/queries/0_stateless/00826_cross_to_inner_join.reference
@@ -1,18 +1,18 @@
 0	0
-cross
+--- cross ---
 1	1	1	1
 1	1	1	2
 2	2	2	\N
-cross nullable
+--- cross nullable ---
 1	1	1	1
 2	2	1	2
-cross nullable vs not nullable
+--- cross nullable vs not nullable ---
 1	1	1	1
 2	2	1	2
-cross self
+--- cross self ---
 1	1	1	1
 2	2	2	2
-cross one table expr
+--- cross one table expr ---
 1	1	1	1
 1	1	1	2
 1	1	2	\N
@@ -21,20 +21,34 @@ cross one table expr
 2	2	1	2
 2	2	2	\N
 2	2	3	\N
-cross multiple ands
+--- cross multiple ands ---
 1	1	1	1
-cross and inside and
+--- cross and inside and ---
 1	1	1	1
-cross split conjunction
+--- cross split conjunction ---
 1	1	1	1
-comma
+--- and or ---
+1	1	1	1
+--- arithmetic expr ---
+2	2	1	2
+--- is null or ---
+1	1	1	2
+2	2	2	\N
+--- do not rewrite alias ---
+1
+1
+2
+--- comma ---
 1	1	1	1
 1	1	1	2
 2	2	2	\N
-comma nullable
+--- comma nullable ---
 1	1	1	1
 2	2	1	2
-cross
+--- comma and or ---
+1	1	1	1
+2	2	2	\N
+--- cross ---
 SELECT
     a,
     b,
@@ -43,7 +57,7 @@ SELECT
 FROM t1_00826
 ALL INNER JOIN t2_00826 ON a = t2_00826.a
 WHERE a = t2_00826.a
-cross nullable
+--- cross nullable ---
 SELECT
     a,
     b,
@@ -52,7 +66,7 @@ SELECT
 FROM t1_00826
 ALL INNER JOIN t2_00826 ON a = t2_00826.a
 WHERE a = t2_00826.a
-cross nullable vs not nullable
+--- cross nullable vs not nullable ---
 SELECT
     a,
     b,
@@ -61,7 +75,7 @@ SELECT
 FROM t1_00826
 ALL INNER JOIN t2_00826 ON a = t2_00826.b
 WHERE a = t2_00826.b
-cross self
+--- cross self ---
 SELECT
     a,
     b,
@@ -70,7 +84,7 @@ SELECT
 FROM t1_00826 AS x
 ALL INNER JOIN t1_00826 AS y ON (a = y.a) AND (b = y.b)
 WHERE (a = y.a) AND (b = y.b)
-cross one table expr
+--- cross one table expr ---
 SELECT
     a,
     b,
@@ -79,7 +93,7 @@ SELECT
 FROM t1_00826
 CROSS JOIN t2_00826
 WHERE a = b
-cross multiple ands
+--- cross multiple ands ---
 SELECT
     a,
     b,
@@ -88,16 +102,16 @@ SELECT
 FROM t1_00826
 ALL INNER JOIN t2_00826 ON (a = t2_00826.a) AND (b = t2_00826.b)
 WHERE (a = t2_00826.a) AND (b = t2_00826.b)
-cross and inside and
+--- cross and inside and ---
 SELECT
     a,
     b,
     t2_00826.a,
     t2_00826.b
 FROM t1_00826
-ALL INNER JOIN t2_00826 ON (((a = t2_00826.a) AND (a = t2_00826.a)) AND (a = t2_00826.a)) AND (b = t2_00826.b)
+ALL INNER JOIN t2_00826 ON (a = t2_00826.a) AND (a = t2_00826.a) AND (a = t2_00826.a) AND (b = t2_00826.b)
 WHERE (a = t2_00826.a) AND ((a = t2_00826.a) AND ((a = t2_00826.a) AND (b = t2_00826.b)))
-cross split conjunction
+--- cross split conjunction ---
 SELECT
     a,
     b,
@@ -106,3 +120,62 @@ SELECT
 FROM t1_00826
 ALL INNER JOIN t2_00826 ON (a = t2_00826.a) AND (b = t2_00826.b)
 WHERE (a = t2_00826.a) AND (b = t2_00826.b) AND (a >= 1) AND (t2_00826.b > 0)
+--- and or ---
+SELECT
+    a,
+    b,
+    t2_00826.a,
+    t2_00826.b
+FROM t1_00826
+ALL INNER JOIN t2_00826 ON (a = t2_00826.a) AND (b = t2_00826.b)
+WHERE (a = t2_00826.a) AND (b = t2_00826.b) AND ((a >= 1) OR (t2_00826.b = 1))
+--- arithmetic expr ---
+SELECT
+    a,
+    b,
+    t2_00826.a,
+    t2_00826.b
+FROM t1_00826
+ALL INNER JOIN t2_00826 ON (a + 1) = (t2_00826.a + t2_00826.b)
+WHERE ((a + 1) = (t2_00826.a + t2_00826.b)) AND ((((a + b) + t2_00826.a) + t2_00826.b) > 5)
+--- is null or ---
+SELECT
+    a,
+    b,
+    t2_00826.a,
+    t2_00826.b
+FROM t1_00826
+ALL INNER JOIN t2_00826 ON b = t2_00826.a
+WHERE (b = t2_00826.a) AND (isNull(t2_00826.b) OR (t2_00826.b > t2_00826.a))
+--- do not rewrite alias ---
+SELECT a AS b
+FROM t1_00826
+CROSS JOIN t2_00826
+WHERE (b = t2_00826.a) AND (b > 0)
+--- comma ---
+SELECT
+    a,
+    b,
+    t2_00826.a,
+    t2_00826.b
+FROM t1_00826
+ALL INNER JOIN t2_00826 ON a = t2_00826.a
+WHERE a = t2_00826.a
+--- comma nullable ---
+SELECT
+    a,
+    b,
+    t2_00826.a,
+    t2_00826.b
+FROM t1_00826
+ALL INNER JOIN t2_00826 ON b = t2_00826.b
+WHERE b = t2_00826.b
+--- comma and or ---
+SELECT
+    a,
+    b,
+    t2_00826.a,
+    t2_00826.b
+FROM t1_00826
+ALL INNER JOIN t2_00826 ON a = t2_00826.a
+WHERE (a = t2_00826.a) AND (isNull(t2_00826.b) OR (t2_00826.b < 2))
diff --git a/tests/queries/0_stateless/00826_cross_to_inner_join.sql b/tests/queries/0_stateless/00826_cross_to_inner_join.sql
index 67471864686..392ade02ab7 100644
--- a/tests/queries/0_stateless/00826_cross_to_inner_join.sql
+++ b/tests/queries/0_stateless/00826_cross_to_inner_join.sql
@@ -12,46 +12,79 @@ INSERT INTO t1_00826 values (1,1), (2,2);
 INSERT INTO t2_00826 values (1,1), (1,2);
 INSERT INTO t2_00826 (a) values (2), (3);
 
-SELECT 'cross';
+SELECT '--- cross ---';
 SELECT * FROM t1_00826 cross join t2_00826 where t1_00826.a = t2_00826.a;
-SELECT 'cross nullable';
+SELECT '--- cross nullable ---';
 SELECT * FROM t1_00826 cross join t2_00826 where t1_00826.b = t2_00826.b;
-SELECT 'cross nullable vs not nullable';
+SELECT '--- cross nullable vs not nullable ---';
 SELECT * FROM t1_00826 cross join t2_00826 where t1_00826.a = t2_00826.b;
-SELECT 'cross self';
+SELECT '--- cross self ---';
 SELECT * FROM t1_00826 x cross join t1_00826 y where x.a = y.a and x.b = y.b;
-SELECT 'cross one table expr';
+SELECT '--- cross one table expr ---';
 SELECT * FROM t1_00826 cross join t2_00826 where t1_00826.a = t1_00826.b order by (t1_00826.a, t2_00826.a, t2_00826.b);
-SELECT 'cross multiple ands';
+SELECT '--- cross multiple ands ---';
 SELECT * FROM t1_00826 cross join t2_00826 where t1_00826.a = t2_00826.a and t1_00826.b = t2_00826.b;
-SELECT 'cross and inside and';
+SELECT '--- cross and inside and ---';
 SELECT * FROM t1_00826 cross join t2_00826 where t1_00826.a = t2_00826.a and (t1_00826.b = t2_00826.b and 1);
-SELECT 'cross split conjunction';
+SELECT '--- cross split conjunction ---';
 SELECT * FROM t1_00826 cross join t2_00826 where t1_00826.a = t2_00826.a and t1_00826.b = t2_00826.b and t1_00826.a >= 1 and t2_00826.b = 1;
 
-SELECT 'comma';
+SELECT '--- and or ---';
+SELECT * FROM t1_00826 cross join t2_00826 where t1_00826.a = t2_00826.a and t1_00826.b = t2_00826.b and (t1_00826.a >= 1 OR t2_00826.b = 1);
+
+SELECT '--- arithmetic expr ---';
+SELECT * FROM t1_00826 cross join t2_00826 where t1_00826.a + 1 = t2_00826.a + t2_00826.b AND (t1_00826.a + t1_00826.b + t2_00826.a + t2_00826.b > 5);
+
+SELECT '--- is null or ---';
+SELECT * FROM t1_00826 cross join t2_00826 where t1_00826.b = t2_00826.a AND (t2_00826.b IS NULL OR t2_00826.b > t2_00826.a);
+
+SELECT '--- do not rewrite alias ---';
+SELECT a as b FROM t1_00826 cross join t2_00826 where t1_00826.b = t2_00826.a AND b > 0;
+
+SELECT '--- comma ---';
 SELECT * FROM t1_00826, t2_00826 where t1_00826.a = t2_00826.a;
-SELECT 'comma nullable';
+SELECT '--- comma nullable ---';
 SELECT * FROM t1_00826, t2_00826 where t1_00826.b = t2_00826.b;
+SELECT '--- comma and or ---';
+SELECT * FROM t1_00826, t2_00826 where t1_00826.a = t2_00826.a AND (t2_00826.b IS NULL OR t2_00826.b < 2);
 
 
-SELECT 'cross';
+SELECT '--- cross ---';
 EXPLAIN SYNTAX SELECT * FROM t1_00826 cross join t2_00826 where t1_00826.a = t2_00826.a;
-SELECT 'cross nullable';
+SELECT '--- cross nullable ---';
 EXPLAIN SYNTAX SELECT * FROM t1_00826, t2_00826 where t1_00826.a = t2_00826.a;
-SELECT 'cross nullable vs not nullable';
+SELECT '--- cross nullable vs not nullable ---';
 EXPLAIN SYNTAX SELECT * FROM t1_00826 cross join t2_00826 where t1_00826.a = t2_00826.b;
-SELECT 'cross self';
+SELECT '--- cross self ---';
 EXPLAIN SYNTAX SELECT * FROM t1_00826 x cross join t1_00826 y where x.a = y.a and x.b = y.b;
-SELECT 'cross one table expr';
+SELECT '--- cross one table expr ---';
 EXPLAIN SYNTAX SELECT * FROM t1_00826 cross join t2_00826 where t1_00826.a = t1_00826.b;
-SELECT 'cross multiple ands';
+SELECT '--- cross multiple ands ---';
 EXPLAIN SYNTAX SELECT * FROM t1_00826 cross join t2_00826 where t1_00826.a = t2_00826.a and t1_00826.b = t2_00826.b;
-SELECT 'cross and inside and';
+SELECT '--- cross and inside and ---';
 EXPLAIN SYNTAX SELECT * FROM t1_00826 cross join t2_00826 where t1_00826.a = t2_00826.a and (t1_00826.a = t2_00826.a and (t1_00826.a = t2_00826.a and t1_00826.b = t2_00826.b));
 
-SELECT 'cross split conjunction';
+SELECT '--- cross split conjunction ---';
 EXPLAIN SYNTAX SELECT * FROM t1_00826 cross join t2_00826 where t1_00826.a = t2_00826.a and t1_00826.b = t2_00826.b and t1_00826.a >= 1 and t2_00826.b > 0;
 
+SELECT '--- and or ---';
+EXPLAIN SYNTAX SELECT * FROM t1_00826 cross join t2_00826 where t1_00826.a = t2_00826.a and t1_00826.b = t2_00826.b and (t1_00826.a >= 1 OR t2_00826.b = 1);
+
+SELECT '--- arithmetic expr ---';
+EXPLAIN SYNTAX SELECT * FROM t1_00826 cross join t2_00826 where t1_00826.a + 1 = t2_00826.a + t2_00826.b AND (t1_00826.a + t1_00826.b + t2_00826.a + t2_00826.b > 5);
+
+SELECT '--- is null or ---';
+EXPLAIN SYNTAX SELECT * FROM t1_00826 cross join t2_00826 where t1_00826.b = t2_00826.a AND (t2_00826.b IS NULL OR t2_00826.b > t2_00826.a);
+
+SELECT '--- do not rewrite alias ---';
+EXPLAIN SYNTAX SELECT a as b FROM t1_00826 cross join t2_00826 where t1_00826.b = t2_00826.a AND b > 0;
+
+SELECT '--- comma ---';
+EXPLAIN SYNTAX SELECT * FROM t1_00826, t2_00826 where t1_00826.a = t2_00826.a;
+SELECT '--- comma nullable ---';
+EXPLAIN SYNTAX SELECT * FROM t1_00826, t2_00826 where t1_00826.b = t2_00826.b;
+SELECT '--- comma and or ---';
+EXPLAIN SYNTAX SELECT * FROM t1_00826, t2_00826 where t1_00826.a = t2_00826.a AND (t2_00826.b IS NULL OR t2_00826.b < 2);
+
 DROP TABLE t1_00826;
 DROP TABLE t2_00826;
diff --git a/tests/queries/0_stateless/00834_kill_mutation_replicated_zookeeper.sh b/tests/queries/0_stateless/00834_kill_mutation_replicated_zookeeper.sh
index d1f938f73fe..92ab6814235 100755
--- a/tests/queries/0_stateless/00834_kill_mutation_replicated_zookeeper.sh
+++ b/tests/queries/0_stateless/00834_kill_mutation_replicated_zookeeper.sh
@@ -10,8 +10,8 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 ${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS kill_mutation_r1"
 ${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS kill_mutation_r2"
 
-${CLICKHOUSE_CLIENT} --query="CREATE TABLE kill_mutation_r1(d Date, x UInt32, s String) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00834/kill_mutation', '1') ORDER BY x PARTITION BY d"
-${CLICKHOUSE_CLIENT} --query="CREATE TABLE kill_mutation_r2(d Date, x UInt32, s String) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00834/kill_mutation', '2') ORDER BY x PARTITION BY d"
+${CLICKHOUSE_CLIENT} --query="CREATE TABLE kill_mutation_r1(d Date, x UInt32, s String) ENGINE ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/kill_mutation', '1') ORDER BY x PARTITION BY d"
+${CLICKHOUSE_CLIENT} --query="CREATE TABLE kill_mutation_r2(d Date, x UInt32, s String) ENGINE ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/kill_mutation', '2') ORDER BY x PARTITION BY d"
 
 ${CLICKHOUSE_CLIENT} --query="INSERT INTO kill_mutation_r1 VALUES ('2000-01-01', 1, 'a')"
 ${CLICKHOUSE_CLIENT} --query="INSERT INTO kill_mutation_r1 VALUES ('2001-01-01', 2, 'b')"
diff --git a/tests/queries/0_stateless/00849_multiple_comma_join_2.reference b/tests/queries/0_stateless/00849_multiple_comma_join_2.reference
index 4db65b0b795..fc39ef13935 100644
--- a/tests/queries/0_stateless/00849_multiple_comma_join_2.reference
+++ b/tests/queries/0_stateless/00849_multiple_comma_join_2.reference
@@ -127,7 +127,7 @@ FROM
     ) AS `--.s`
     CROSS JOIN t3
 ) AS `--.s`
-ALL INNER JOIN t4 ON ((a = `--t1.a`) AND (a = `--t2.a`)) AND (a = `--t3.a`)
+ALL INNER JOIN t4 ON (a = `--t1.a`) AND (a = `--t2.a`) AND (a = `--t3.a`)
 WHERE (a = `--t1.a`) AND (a = `--t2.a`) AND (a = `--t3.a`)
 SELECT `--t1.a` AS `t1.a`
 FROM 
diff --git a/tests/queries/0_stateless/00855_join_with_array_join.reference b/tests/queries/0_stateless/00855_join_with_array_join.reference
index 386bde518ea..88f9253500c 100644
--- a/tests/queries/0_stateless/00855_join_with_array_join.reference
+++ b/tests/queries/0_stateless/00855_join_with_array_join.reference
@@ -4,3 +4,8 @@
 4	0
 5	0
 6	0
+-
+1	0	
+2	2	a2
+1	0	
+2	2	a2
diff --git a/tests/queries/0_stateless/00855_join_with_array_join.sql b/tests/queries/0_stateless/00855_join_with_array_join.sql
index 10b03fec062..506d9479110 100644
--- a/tests/queries/0_stateless/00855_join_with_array_join.sql
+++ b/tests/queries/0_stateless/00855_join_with_array_join.sql
@@ -1,10 +1,35 @@
 SET joined_subquery_requires_alias = 0;
 
-select ax, c from (select [1,2] ax, 0 c) array join ax join (select 0 c) using(c);
-select ax, c from (select [3,4] ax, 0 c) join (select 0 c) using(c) array join ax;
-select ax, c from (select [5,6] ax, 0 c) s1 join system.one s2 ON s1.c = s2.dummy array join ax;
+SELECT ax, c FROM (SELECT [1,2] ax, 0 c) ARRAY JOIN ax JOIN (SELECT 0 c) USING (c);
+SELECT ax, c FROM (SELECT [3,4] ax, 0 c) JOIN (SELECT 0 c) USING (c) ARRAY JOIN ax;
+SELECT ax, c FROM (SELECT [5,6] ax, 0 c) s1 JOIN system.one s2 ON s1.c = s2.dummy ARRAY JOIN ax;
+
+
+SELECT ax, c FROM (SELECT [101,102] ax, 0 c) s1
+JOIN system.one s2 ON s1.c = s2.dummy
+JOIN system.one s3 ON s1.c = s3.dummy
+ARRAY JOIN ax; -- { serverError 48 }
+
+SELECT '-';
+
+SET joined_subquery_requires_alias = 1;
+
+DROP TABLE IF EXISTS f;
+DROP TABLE IF EXISTS d;
+
+CREATE TABLE f (`d_ids` Array(Int64) ) ENGINE = TinyLog;
+INSERT INTO f VALUES ([1, 2]);
+
+CREATE TABLE d (`id` Int64, `name` String ) ENGINE = TinyLog;
+
+INSERT INTO d VALUES (2, 'a2'), (3, 'a3');
+
+SELECT d_ids, id, name FROM f LEFT ARRAY JOIN d_ids LEFT JOIN d ON d.id = d_ids ORDER BY id;
+SELECT did, id, name FROM f LEFT ARRAY JOIN d_ids as did LEFT JOIN d ON d.id = did ORDER BY id;
+
+-- name clash, doesn't work yet
+SELECT id, name FROM f LEFT ARRAY JOIN d_ids as id LEFT JOIN d ON d.id = id ORDER BY id; -- { serverError 403 }
+
+DROP TABLE IF EXISTS f;
+DROP TABLE IF EXISTS d;
 
-select ax, c from (select [7,8] ax, 0 c) s1
-join system.one s2 ON s1.c = s2.dummy
-join system.one s3 ON s1.c = s3.dummy
-array join ax; -- { serverError 48 }
diff --git a/tests/queries/0_stateless/00878_join_unexpected_results.reference b/tests/queries/0_stateless/00878_join_unexpected_results.reference
index 65fcbc257ca..a389cb47a96 100644
--- a/tests/queries/0_stateless/00878_join_unexpected_results.reference
+++ b/tests/queries/0_stateless/00878_join_unexpected_results.reference
@@ -23,8 +23,6 @@ join_use_nulls = 1
 -
 \N	\N
 -
-1	1	\N	\N
-2	2	\N	\N
 -
 1	1	1	1
 2	2	\N	\N
@@ -51,8 +49,6 @@ join_use_nulls = 0
 -
 -
 -
-1	1	0	0
-2	2	0	0
 -
 1	1	1	1
 2	2	0	0
diff --git a/tests/queries/0_stateless/00878_join_unexpected_results.sql b/tests/queries/0_stateless/00878_join_unexpected_results.sql
index 6f6cd6e6479..0aef5208b26 100644
--- a/tests/queries/0_stateless/00878_join_unexpected_results.sql
+++ b/tests/queries/0_stateless/00878_join_unexpected_results.sql
@@ -30,11 +30,11 @@ select * from t left outer join s on (t.a=s.a and t.b=s.b) where s.a is null;
 select '-';
 select s.* from t left outer join s on (t.a=s.a and t.b=s.b) where s.a is null;
 select '-';
-select t.*, s.* from t left join s on (s.a=t.a and t.b=s.b and t.a=toInt64(2)) order by t.a;
+select t.*, s.* from t left join s on (s.a=t.a and t.b=s.b and t.a=toInt64(2)) order by t.a; -- {serverError 403 }
 select '-';
 select t.*, s.* from t left join s on (s.a=t.a) order by t.a;
 select '-';
-select t.*, s.* from t left join s on (t.b=toInt64(2) and s.a=t.a) where s.b=2;
+select t.*, s.* from t left join s on (t.b=toInt64(2) and s.a=t.a) where s.b=2; -- {serverError 403 }
 
 select 'join_use_nulls = 0';
 set join_use_nulls = 0;
@@ -58,11 +58,11 @@ select '-';
 select '-';
 -- select s.* from t left outer join s on (t.a=s.a and t.b=s.b) where s.a is null; -- TODO
 select '-';
-select t.*, s.* from t left join s on (s.a=t.a and t.b=s.b and t.a=toInt64(2)) order by t.a;
+select t.*, s.* from t left join s on (s.a=t.a and t.b=s.b and t.a=toInt64(2)) order by t.a; -- {serverError 403 }
 select '-';
 select t.*, s.* from t left join s on (s.a=t.a) order by t.a;
 select '-';
-select t.*, s.* from t left join s on (t.b=toInt64(2) and s.a=t.a) where s.b=2;
+select t.*, s.* from t left join s on (t.b=toInt64(2) and s.a=t.a) where s.b=2; -- {serverError 403 }
 
 drop table t;
 drop table s;
diff --git a/tests/queries/0_stateless/00882_multiple_join_no_alias.reference b/tests/queries/0_stateless/00882_multiple_join_no_alias.reference
index a3723bc9976..523063f8a3c 100644
--- a/tests/queries/0_stateless/00882_multiple_join_no_alias.reference
+++ b/tests/queries/0_stateless/00882_multiple_join_no_alias.reference
@@ -1,8 +1,8 @@
 1	1	1	1
 0	0	0	0
-0
 1
+0
 1	1	1	1	1	1
 2	2	0	0	0	0
-2	2	0
 1	1	1
+2	2	0
diff --git a/tests/queries/0_stateless/00882_multiple_join_no_alias.sql b/tests/queries/0_stateless/00882_multiple_join_no_alias.sql
index bd3a2a19913..4a96e73c679 100644
--- a/tests/queries/0_stateless/00882_multiple_join_no_alias.sql
+++ b/tests/queries/0_stateless/00882_multiple_join_no_alias.sql
@@ -13,22 +13,22 @@ insert into y values (1,1);
 select s.a, s.a, s.b as s_b, s.b from t
 left join s on s.a = t.a
 left join y on s.b = y.b
-order by t.a;
+order by t.a, s.a, s.b;
 
 select max(s.a) from t
 left join s on s.a = t.a
 left join y on s.b = y.b
-group by t.a;
+group by t.a order by t.a;
 
 select t.a, t.a as t_a, s.a, s.a as s_a, y.a, y.a as y_a from t
 left join s on t.a = s.a
 left join y on y.b = s.b
-order by t.a;
+order by t.a, s.a, y.a;
 
 select t.a, t.a as t_a, max(s.a) from t
 left join s on t.a = s.a
 left join y on y.b = s.b
-group by t.a;
+group by t.a order by t.a;
 
 drop table t;
 drop table s;
diff --git a/tests/queries/0_stateless/00906_low_cardinality_rollup.reference b/tests/queries/0_stateless/00906_low_cardinality_rollup.reference
index 3e287311126..257605d9006 100644
--- a/tests/queries/0_stateless/00906_low_cardinality_rollup.reference
+++ b/tests/queries/0_stateless/00906_low_cardinality_rollup.reference
@@ -1,18 +1,18 @@
-c	d	1
 a	b	1
-c	\N	1
 a	\N	1
+c	d	1
+c	\N	1
 \N	\N	2
-c	1
 a	1
+c	1
 \N	2
-c	d	1
 a	b	1
-c	\N	1
 a	\N	1
+c	d	1
+c	\N	1
 \N	b	1
 \N	d	1
 \N	\N	2
-c	1
 a	1
+c	1
 \N	2
diff --git a/tests/queries/0_stateless/00906_low_cardinality_rollup.sql b/tests/queries/0_stateless/00906_low_cardinality_rollup.sql
index 3b8be7b9ac6..125529ad383 100644
--- a/tests/queries/0_stateless/00906_low_cardinality_rollup.sql
+++ b/tests/queries/0_stateless/00906_low_cardinality_rollup.sql
@@ -3,10 +3,10 @@ CREATE TABLE lc (a LowCardinality(Nullable(String)), b LowCardinality(Nullable(S
 INSERT INTO lc VALUES ('a', 'b');
 INSERT INTO lc VALUES ('c', 'd');
 
-SELECT a, b, count(a) FROM lc GROUP BY a, b WITH ROLLUP;
-SELECT a, count(a) FROM lc GROUP BY a WITH ROLLUP;
+SELECT a, b, count(a) FROM lc GROUP BY a, b WITH ROLLUP ORDER BY a, b;
+SELECT a, count(a) FROM lc GROUP BY a WITH ROLLUP ORDER BY a;
 
-SELECT a, b, count(a) FROM lc GROUP BY a, b WITH CUBE;
-SELECT a, count(a) FROM lc GROUP BY a WITH CUBE;
+SELECT a, b, count(a) FROM lc GROUP BY a, b WITH CUBE ORDER BY a, b;
+SELECT a, count(a) FROM lc GROUP BY a WITH CUBE ORDER BY a;
 
 DROP TABLE if exists lc;
diff --git a/tests/queries/0_stateless/00910_decimal_group_array_crash_3783.sql b/tests/queries/0_stateless/00910_decimal_group_array_crash_3783.sql
index 29ec19a6efe..cf0e0bac3dd 100644
--- a/tests/queries/0_stateless/00910_decimal_group_array_crash_3783.sql
+++ b/tests/queries/0_stateless/00910_decimal_group_array_crash_3783.sql
@@ -28,7 +28,7 @@ SELECT `time`, groupArray((sensor_id, volume)) AS groupArr FROM (
     WHERE received_at BETWEEN '2018-12-12 00:00:00' AND '2018-12-30 00:00:00'
     GROUP BY `time`,sensor_id
     ORDER BY `time`
-) GROUP BY `time`;
+) GROUP BY `time` ORDER BY `time`;
 
 DROP TABLE sensor_value;
 
@@ -59,4 +59,4 @@ select s.a, s.b, max(s.dt1) dt1, s.c, s.d, s.f, s.i, max(s.dt2) dt2 from (
         , toDecimal128(268.970000000000, 12)   f
         , toDecimal128(0.000000000000, 12)     i
         , toDateTime('2018-11-02 00:00:00', 'Europe/Moscow')    dt2
-) s group by s.a, s.b, s.c, s.d, s.f, s.i;
+) s group by s.a, s.b, s.c, s.d, s.f, s.i ORDER BY s.a, s.b, s.c, s.d, s.f, s.i;
diff --git a/tests/queries/0_stateless/00918_has_unsufficient_type_check.reference b/tests/queries/0_stateless/00918_has_unsufficient_type_check.reference
index 7938dcdde86..b261da18d51 100644
--- a/tests/queries/0_stateless/00918_has_unsufficient_type_check.reference
+++ b/tests/queries/0_stateless/00918_has_unsufficient_type_check.reference
@@ -1,3 +1,2 @@
-0
 1
 0
diff --git a/tests/queries/0_stateless/00918_has_unsufficient_type_check.sql b/tests/queries/0_stateless/00918_has_unsufficient_type_check.sql
index f76fd446a8e..c40419e4d56 100644
--- a/tests/queries/0_stateless/00918_has_unsufficient_type_check.sql
+++ b/tests/queries/0_stateless/00918_has_unsufficient_type_check.sql
@@ -1,3 +1,3 @@
-SELECT hasAny([['Hello, world']], [[[]]]);
+SELECT hasAny([['Hello, world']], [[[]]]); -- { serverError 386 }
 SELECT hasAny([['Hello, world']], [['Hello', 'world'], ['Hello, world']]);
 SELECT hasAll([['Hello, world']], [['Hello', 'world'], ['Hello, world']]);
diff --git a/tests/queries/0_stateless/00921_datetime64_compatibility.python b/tests/queries/0_stateless/00921_datetime64_compatibility_long.python
similarity index 95%
rename from tests/queries/0_stateless/00921_datetime64_compatibility.python
rename to tests/queries/0_stateless/00921_datetime64_compatibility_long.python
index bf0ae8a72ac..c8b9620629d 100644
--- a/tests/queries/0_stateless/00921_datetime64_compatibility.python
+++ b/tests/queries/0_stateless/00921_datetime64_compatibility_long.python
@@ -86,8 +86,7 @@ CAST(N as DateTime64(9, 'Europe/Minsk'))
 formatDateTime(N, '%C %d %D %e %F %H %I %j %m %M %p %R %S %T %u %V %w %y %Y %%')
 """.splitlines()
 
-# Expanded later to cartesian product of all arguments.
-# NOTE: {N} to be turned into N after str.format() for keys (format string), but not for list of values!
+# Expanded later to cartesian product of all arguments, using format string.
 extra_ops = [
     # With same type:
     (
@@ -179,7 +178,7 @@ def escape_string(s):
 
 
 def execute_functions_for_types(functions, types):
-    # TODO: use string.Template here to allow lines that do not contain type, like: SELECT CAST(toDateTime64(1234567890), 'DateTime64')
+    # NOTE: use string.Template here to allow lines with missing keys, like type, e.g. SELECT CAST(toDateTime64(1234567890), 'DateTime64')
     for func in functions:
         print(("""SELECT 'SELECT {func}';""".format(func=escape_string(func))))
         for dt in types:
diff --git a/tests/queries/0_stateless/00921_datetime64_compatibility.reference b/tests/queries/0_stateless/00921_datetime64_compatibility_long.reference
similarity index 99%
rename from tests/queries/0_stateless/00921_datetime64_compatibility.reference
rename to tests/queries/0_stateless/00921_datetime64_compatibility_long.reference
index 004f4f5e824..67413512e06 100644
--- a/tests/queries/0_stateless/00921_datetime64_compatibility.reference
+++ b/tests/queries/0_stateless/00921_datetime64_compatibility_long.reference
@@ -1,5 +1,4 @@
 SELECT toTimeZone(N, \'UTC\')
-
 Code: 43
 "DateTime('UTC')","2019-09-16 16:20:11"
 "DateTime64(3, 'UTC')","2019-09-16 16:20:11.234"
@@ -35,25 +34,21 @@ SELECT toDayOfWeek(N)
 "UInt8",1
 ------------------------------------------
 SELECT toHour(N)
-
 Code: 43
 "UInt8",19
 "UInt8",19
 ------------------------------------------
 SELECT toMinute(N)
-
 Code: 43
 "UInt8",20
 "UInt8",20
 ------------------------------------------
 SELECT toSecond(N)
-
 Code: 43
 "UInt8",11
 "UInt8",11
 ------------------------------------------
 SELECT toUnixTimestamp(N)
-
 Code: 44
 "UInt32",1568650811
 "UInt32",1568650811
@@ -94,31 +89,26 @@ SELECT toStartOfDay(N)
 "DateTime('Europe/Minsk')","2019-09-16 00:00:00"
 ------------------------------------------
 SELECT toStartOfHour(N)
-
 Code: 43
 "DateTime('Europe/Minsk')","2019-09-16 19:00:00"
 "DateTime('Europe/Minsk')","2019-09-16 19:00:00"
 ------------------------------------------
 SELECT toStartOfMinute(N)
-
 Code: 43
 "DateTime('Europe/Minsk')","2019-09-16 19:20:00"
 "DateTime('Europe/Minsk')","2019-09-16 19:20:00"
 ------------------------------------------
 SELECT toStartOfFiveMinute(N)
-
 Code: 43
 "DateTime('Europe/Minsk')","2019-09-16 19:20:00"
 "DateTime('Europe/Minsk')","2019-09-16 19:20:00"
 ------------------------------------------
 SELECT toStartOfTenMinutes(N)
-
 Code: 43
 "DateTime('Europe/Minsk')","2019-09-16 19:20:00"
 "DateTime('Europe/Minsk')","2019-09-16 19:20:00"
 ------------------------------------------
 SELECT toStartOfFifteenMinutes(N)
-
 Code: 43
 "DateTime('Europe/Minsk')","2019-09-16 19:15:00"
 "DateTime('Europe/Minsk')","2019-09-16 19:15:00"
@@ -139,7 +129,6 @@ SELECT toStartOfInterval(N, INTERVAL 1 day)
 "DateTime('Europe/Minsk')","2019-09-16 00:00:00"
 ------------------------------------------
 SELECT toStartOfInterval(N, INTERVAL 15 minute)
-
 Code: 43
 "DateTime('Europe/Minsk')","2019-09-16 19:15:00"
 "DateTime('Europe/Minsk')","2019-09-16 19:15:00"
@@ -160,13 +149,11 @@ SELECT date_trunc(\'day\', N)
 "DateTime('Europe/Minsk')","2019-09-16 00:00:00"
 ------------------------------------------
 SELECT date_trunc(\'minute\', N)
-
 Code: 43
 "DateTime('Europe/Minsk')","2019-09-16 19:20:00"
 "DateTime('Europe/Minsk')","2019-09-16 19:20:00"
 ------------------------------------------
 SELECT toTime(N)
-
 Code: 43
 "DateTime('Europe/Minsk')","1970-01-02 19:20:11"
 "DateTime('Europe/Minsk')","1970-01-02 19:20:11"
@@ -232,7 +219,6 @@ SELECT toYearWeek(N)
 "UInt32",201937
 ------------------------------------------
 SELECT timeSlot(N)
-
 Code: 43
 "DateTime('Europe/Minsk')","2019-09-16 19:00:00"
 "DateTime('Europe/Minsk')","2019-09-16 19:00:00"
@@ -375,15 +361,11 @@ SELECT formatDateTime(N, \'%C %d %D %e %F %H %I %j %m %M %p %R %S %T %u %V %w %y
 SELECT N -  N
 "Int32",0
 "Int32",0
-
 Code: 43
 ------------------------------------------
 SELECT N +  N
-
 Code: 43
-
 Code: 43
-
 Code: 43
 ------------------------------------------
 SELECT N != N
@@ -417,47 +399,33 @@ SELECT N >= N
 "UInt8",1
 ------------------------------------------
 SELECT N - DT
-
 Code: 43
 "Int32",0
-
 Code: 43
 ------------------------------------------
 SELECT DT - N
-
 Code: 43
 "Int32",0
-
 Code: 43
 ------------------------------------------
 SELECT N - D
 "Int32",0
-
 Code: 43
-
 Code: 43
 ------------------------------------------
 SELECT D - N
 "Int32",0
-
 Code: 43
-
 Code: 43
 ------------------------------------------
 SELECT N - DT64
-
 Code: 43
-
 Code: 43
-
 Code: 43
 ------------------------------------------
 SELECT DT64 - N
-
 Code: 43
-
 Code: 43
-
 Code: 43
 ------------------------------------------
 SELECT N != DT
@@ -726,11 +694,8 @@ SELECT N -  toUInt8(1)
 "DateTime64(3, 'Europe/Minsk')","2019-09-16 19:20:10.234"
 ------------------------------------------
 SELECT toUInt8(1) -  N
-
 Code: 43
-
 Code: 43
-
 Code: 43
 ------------------------------------------
 SELECT N -  toInt8(-1)
@@ -739,11 +704,8 @@ SELECT N -  toInt8(-1)
 "DateTime64(3, 'Europe/Minsk')","2019-09-16 19:20:12.234"
 ------------------------------------------
 SELECT toInt8(-1) -  N
-
 Code: 43
-
 Code: 43
-
 Code: 43
 ------------------------------------------
 SELECT N -  toUInt16(1)
@@ -752,11 +714,8 @@ SELECT N -  toUInt16(1)
 "DateTime64(3, 'Europe/Minsk')","2019-09-16 19:20:10.234"
 ------------------------------------------
 SELECT toUInt16(1) -  N
-
 Code: 43
-
 Code: 43
-
 Code: 43
 ------------------------------------------
 SELECT N -  toInt16(-1)
@@ -765,11 +724,8 @@ SELECT N -  toInt16(-1)
 "DateTime64(3, 'Europe/Minsk')","2019-09-16 19:20:12.234"
 ------------------------------------------
 SELECT toInt16(-1) -  N
-
 Code: 43
-
 Code: 43
-
 Code: 43
 ------------------------------------------
 SELECT N -  toUInt32(1)
@@ -778,11 +734,8 @@ SELECT N -  toUInt32(1)
 "DateTime64(3, 'Europe/Minsk')","2019-09-16 19:20:10.234"
 ------------------------------------------
 SELECT toUInt32(1) -  N
-
 Code: 43
-
 Code: 43
-
 Code: 43
 ------------------------------------------
 SELECT N -  toInt32(-1)
@@ -791,11 +744,8 @@ SELECT N -  toInt32(-1)
 "DateTime64(3, 'Europe/Minsk')","2019-09-16 19:20:12.234"
 ------------------------------------------
 SELECT toInt32(-1) -  N
-
 Code: 43
-
 Code: 43
-
 Code: 43
 ------------------------------------------
 SELECT N -  toUInt64(1)
@@ -804,11 +754,8 @@ SELECT N -  toUInt64(1)
 "DateTime64(3, 'Europe/Minsk')","2019-09-16 19:20:10.234"
 ------------------------------------------
 SELECT toUInt64(1) -  N
-
 Code: 43
-
 Code: 43
-
 Code: 43
 ------------------------------------------
 SELECT N -  toInt64(-1)
@@ -817,585 +764,486 @@ SELECT N -  toInt64(-1)
 "DateTime64(3, 'Europe/Minsk')","2019-09-16 19:20:12.234"
 ------------------------------------------
 SELECT toInt64(-1) -  N
-
 Code: 43
-
 Code: 43
-
 Code: 43
 ------------------------------------------
 SELECT N == toUInt8(1)
-
 Code: 43
 "UInt8",0
 "UInt8",0
 ------------------------------------------
 SELECT toUInt8(1) == N
-
 Code: 43
 "UInt8",0
 "UInt8",0
 ------------------------------------------
 SELECT N == toInt8(-1)
-
 Code: 43
 "UInt8",0
 "UInt8",0
 ------------------------------------------
 SELECT toInt8(-1) == N
-
 Code: 43
 "UInt8",0
 "UInt8",0
 ------------------------------------------
 SELECT N == toUInt16(1)
-
 Code: 43
 "UInt8",0
 "UInt8",0
 ------------------------------------------
 SELECT toUInt16(1) == N
-
 Code: 43
 "UInt8",0
 "UInt8",0
 ------------------------------------------
 SELECT N == toInt16(-1)
-
 Code: 43
 "UInt8",0
 "UInt8",0
 ------------------------------------------
 SELECT toInt16(-1) == N
-
 Code: 43
 "UInt8",0
 "UInt8",0
 ------------------------------------------
 SELECT N == toUInt32(1)
-
 Code: 43
 "UInt8",0
 "UInt8",0
 ------------------------------------------
 SELECT toUInt32(1) == N
-
 Code: 43
 "UInt8",0
 "UInt8",0
 ------------------------------------------
 SELECT N == toInt32(-1)
-
 Code: 43
 "UInt8",0
 "UInt8",0
 ------------------------------------------
 SELECT toInt32(-1) == N
-
 Code: 43
 "UInt8",0
 "UInt8",0
 ------------------------------------------
 SELECT N == toUInt64(1)
-
 Code: 43
 "UInt8",0
 "UInt8",0
 ------------------------------------------
 SELECT toUInt64(1) == N
-
 Code: 43
 "UInt8",0
 "UInt8",0
 ------------------------------------------
 SELECT N == toInt64(-1)
-
 Code: 43
 "UInt8",0
 "UInt8",0
 ------------------------------------------
 SELECT toInt64(-1) == N
-
 Code: 43
 "UInt8",0
 "UInt8",0
 ------------------------------------------
 SELECT N != toUInt8(1)
-
 Code: 43
 "UInt8",1
 "UInt8",1
 ------------------------------------------
 SELECT toUInt8(1) != N
-
 Code: 43
 "UInt8",1
 "UInt8",1
 ------------------------------------------
 SELECT N != toInt8(-1)
-
 Code: 43
 "UInt8",1
 "UInt8",1
 ------------------------------------------
 SELECT toInt8(-1) != N
-
 Code: 43
 "UInt8",1
 "UInt8",1
 ------------------------------------------
 SELECT N != toUInt16(1)
-
 Code: 43
 "UInt8",1
 "UInt8",1
 ------------------------------------------
 SELECT toUInt16(1) != N
-
 Code: 43
 "UInt8",1
 "UInt8",1
 ------------------------------------------
 SELECT N != toInt16(-1)
-
 Code: 43
 "UInt8",1
 "UInt8",1
 ------------------------------------------
 SELECT toInt16(-1) != N
-
 Code: 43
 "UInt8",1
 "UInt8",1
 ------------------------------------------
 SELECT N != toUInt32(1)
-
 Code: 43
 "UInt8",1
 "UInt8",1
 ------------------------------------------
 SELECT toUInt32(1) != N
-
 Code: 43
 "UInt8",1
 "UInt8",1
 ------------------------------------------
 SELECT N != toInt32(-1)
-
 Code: 43
 "UInt8",1
 "UInt8",1
 ------------------------------------------
 SELECT toInt32(-1) != N
-
 Code: 43
 "UInt8",1
 "UInt8",1
 ------------------------------------------
 SELECT N != toUInt64(1)
-
 Code: 43
 "UInt8",1
 "UInt8",1
 ------------------------------------------
 SELECT toUInt64(1) != N
-
 Code: 43
 "UInt8",1
 "UInt8",1
 ------------------------------------------
 SELECT N != toInt64(-1)
-
 Code: 43
 "UInt8",1
 "UInt8",1
 ------------------------------------------
 SELECT toInt64(-1) != N
-
 Code: 43
 "UInt8",1
 "UInt8",1
 ------------------------------------------
 SELECT N <  toUInt8(1)
-
 Code: 43
 "UInt8",0
 "UInt8",0
 ------------------------------------------
 SELECT toUInt8(1) <  N
-
 Code: 43
 "UInt8",1
 "UInt8",1
 ------------------------------------------
 SELECT N <  toInt8(-1)
-
 Code: 43
 "UInt8",0
 "UInt8",0
 ------------------------------------------
 SELECT toInt8(-1) <  N
-
 Code: 43
 "UInt8",1
 "UInt8",1
 ------------------------------------------
 SELECT N <  toUInt16(1)
-
 Code: 43
 "UInt8",0
 "UInt8",0
 ------------------------------------------
 SELECT toUInt16(1) <  N
-
 Code: 43
 "UInt8",1
 "UInt8",1
 ------------------------------------------
 SELECT N <  toInt16(-1)
-
 Code: 43
 "UInt8",0
 "UInt8",0
 ------------------------------------------
 SELECT toInt16(-1) <  N
-
 Code: 43
 "UInt8",1
 "UInt8",1
 ------------------------------------------
 SELECT N <  toUInt32(1)
-
 Code: 43
 "UInt8",0
 "UInt8",0
 ------------------------------------------
 SELECT toUInt32(1) <  N
-
 Code: 43
 "UInt8",1
 "UInt8",1
 ------------------------------------------
 SELECT N <  toInt32(-1)
-
 Code: 43
 "UInt8",0
 "UInt8",0
 ------------------------------------------
 SELECT toInt32(-1) <  N
-
 Code: 43
 "UInt8",1
 "UInt8",1
 ------------------------------------------
 SELECT N <  toUInt64(1)
-
 Code: 43
 "UInt8",0
 "UInt8",0
 ------------------------------------------
 SELECT toUInt64(1) <  N
-
 Code: 43
 "UInt8",1
 "UInt8",1
 ------------------------------------------
 SELECT N <  toInt64(-1)
-
 Code: 43
 "UInt8",0
 "UInt8",0
 ------------------------------------------
 SELECT toInt64(-1) <  N
-
 Code: 43
 "UInt8",1
 "UInt8",1
 ------------------------------------------
 SELECT N <= toUInt8(1)
-
 Code: 43
 "UInt8",0
 "UInt8",0
 ------------------------------------------
 SELECT toUInt8(1) <= N
-
 Code: 43
 "UInt8",1
 "UInt8",1
 ------------------------------------------
 SELECT N <= toInt8(-1)
-
 Code: 43
 "UInt8",0
 "UInt8",0
 ------------------------------------------
 SELECT toInt8(-1) <= N
-
 Code: 43
 "UInt8",1
 "UInt8",1
 ------------------------------------------
 SELECT N <= toUInt16(1)
-
 Code: 43
 "UInt8",0
 "UInt8",0
 ------------------------------------------
 SELECT toUInt16(1) <= N
-
 Code: 43
 "UInt8",1
 "UInt8",1
 ------------------------------------------
 SELECT N <= toInt16(-1)
-
 Code: 43
 "UInt8",0
 "UInt8",0
 ------------------------------------------
 SELECT toInt16(-1) <= N
-
 Code: 43
 "UInt8",1
 "UInt8",1
 ------------------------------------------
 SELECT N <= toUInt32(1)
-
 Code: 43
 "UInt8",0
 "UInt8",0
 ------------------------------------------
 SELECT toUInt32(1) <= N
-
 Code: 43
 "UInt8",1
 "UInt8",1
 ------------------------------------------
 SELECT N <= toInt32(-1)
-
 Code: 43
 "UInt8",0
 "UInt8",0
 ------------------------------------------
 SELECT toInt32(-1) <= N
-
 Code: 43
 "UInt8",1
 "UInt8",1
 ------------------------------------------
 SELECT N <= toUInt64(1)
-
 Code: 43
 "UInt8",0
 "UInt8",0
 ------------------------------------------
 SELECT toUInt64(1) <= N
-
 Code: 43
 "UInt8",1
 "UInt8",1
 ------------------------------------------
 SELECT N <= toInt64(-1)
-
 Code: 43
 "UInt8",0
 "UInt8",0
 ------------------------------------------
 SELECT toInt64(-1) <= N
-
 Code: 43
 "UInt8",1
 "UInt8",1
 ------------------------------------------
 SELECT N >  toUInt8(1)
-
 Code: 43
 "UInt8",1
 "UInt8",1
 ------------------------------------------
 SELECT toUInt8(1) >  N
-
 Code: 43
 "UInt8",0
 "UInt8",0
 ------------------------------------------
 SELECT N >  toInt8(-1)
-
 Code: 43
 "UInt8",1
 "UInt8",1
 ------------------------------------------
 SELECT toInt8(-1) >  N
-
 Code: 43
 "UInt8",0
 "UInt8",0
 ------------------------------------------
 SELECT N >  toUInt16(1)
-
 Code: 43
 "UInt8",1
 "UInt8",1
 ------------------------------------------
 SELECT toUInt16(1) >  N
-
 Code: 43
 "UInt8",0
 "UInt8",0
 ------------------------------------------
 SELECT N >  toInt16(-1)
-
 Code: 43
 "UInt8",1
 "UInt8",1
 ------------------------------------------
 SELECT toInt16(-1) >  N
-
 Code: 43
 "UInt8",0
 "UInt8",0
 ------------------------------------------
 SELECT N >  toUInt32(1)
-
 Code: 43
 "UInt8",1
 "UInt8",1
 ------------------------------------------
 SELECT toUInt32(1) >  N
-
 Code: 43
 "UInt8",0
 "UInt8",0
 ------------------------------------------
 SELECT N >  toInt32(-1)
-
 Code: 43
 "UInt8",1
 "UInt8",1
 ------------------------------------------
 SELECT toInt32(-1) >  N
-
 Code: 43
 "UInt8",0
 "UInt8",0
 ------------------------------------------
 SELECT N >  toUInt64(1)
-
 Code: 43
 "UInt8",1
 "UInt8",1
 ------------------------------------------
 SELECT toUInt64(1) >  N
-
 Code: 43
 "UInt8",0
 "UInt8",0
 ------------------------------------------
 SELECT N >  toInt64(-1)
-
 Code: 43
 "UInt8",1
 "UInt8",1
 ------------------------------------------
 SELECT toInt64(-1) >  N
-
 Code: 43
 "UInt8",0
 "UInt8",0
 ------------------------------------------
 SELECT N >= toUInt8(1)
-
 Code: 43
 "UInt8",1
 "UInt8",1
 ------------------------------------------
 SELECT toUInt8(1) >= N
-
 Code: 43
 "UInt8",0
 "UInt8",0
 ------------------------------------------
 SELECT N >= toInt8(-1)
-
 Code: 43
 "UInt8",1
 "UInt8",1
 ------------------------------------------
 SELECT toInt8(-1) >= N
-
 Code: 43
 "UInt8",0
 "UInt8",0
 ------------------------------------------
 SELECT N >= toUInt16(1)
-
 Code: 43
 "UInt8",1
 "UInt8",1
 ------------------------------------------
 SELECT toUInt16(1) >= N
-
 Code: 43
 "UInt8",0
 "UInt8",0
 ------------------------------------------
 SELECT N >= toInt16(-1)
-
 Code: 43
 "UInt8",1
 "UInt8",1
 ------------------------------------------
 SELECT toInt16(-1) >= N
-
 Code: 43
 "UInt8",0
 "UInt8",0
 ------------------------------------------
 SELECT N >= toUInt32(1)
-
 Code: 43
 "UInt8",1
 "UInt8",1
 ------------------------------------------
 SELECT toUInt32(1) >= N
-
 Code: 43
 "UInt8",0
 "UInt8",0
 ------------------------------------------
 SELECT N >= toInt32(-1)
-
 Code: 43
 "UInt8",1
 "UInt8",1
 ------------------------------------------
 SELECT toInt32(-1) >= N
-
 Code: 43
 "UInt8",0
 "UInt8",0
 ------------------------------------------
 SELECT N >= toUInt64(1)
-
 Code: 43
 "UInt8",1
 "UInt8",1
 ------------------------------------------
 SELECT toUInt64(1) >= N
-
 Code: 43
 "UInt8",0
 "UInt8",0
 ------------------------------------------
 SELECT N >= toInt64(-1)
-
 Code: 43
 "UInt8",1
 "UInt8",1
 ------------------------------------------
 SELECT toInt64(-1) >= N
-
 Code: 43
 "UInt8",0
 "UInt8",0
diff --git a/tests/queries/0_stateless/00921_datetime64_compatibility.sh b/tests/queries/0_stateless/00921_datetime64_compatibility_long.sh
similarity index 82%
rename from tests/queries/0_stateless/00921_datetime64_compatibility.sh
rename to tests/queries/0_stateless/00921_datetime64_compatibility_long.sh
index 1617e5b1f77..52a29c19be1 100755
--- a/tests/queries/0_stateless/00921_datetime64_compatibility.sh
+++ b/tests/queries/0_stateless/00921_datetime64_compatibility_long.sh
@@ -11,6 +11,6 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 # ${CURDIR}/00921_datetime64_compatibility.python
 
-python3 "${CURDIR}"/00921_datetime64_compatibility.python \
+python3 "${CURDIR}"/00921_datetime64_compatibility_long.python \
     | ${CLICKHOUSE_CLIENT} --ignore-error -T -nm --calculate_text_stack_trace 0 --log-level 'error' 2>&1 \
-    | sed 's/Received exception .*//g; s/^\(Code: [0-9]\+\).*$/\1/g'
+    | grep -v 'Received exception .*$' | sed 's/^\(Code: [0-9]\+\).*$/\1/g'
diff --git a/tests/queries/0_stateless/00926_adaptive_index_granularity_collapsing_merge_tree.reference b/tests/queries/0_stateless/00926_adaptive_index_granularity_collapsing_merge_tree.reference
index e5e283f754b..3a176a17f5a 100644
--- a/tests/queries/0_stateless/00926_adaptive_index_granularity_collapsing_merge_tree.reference
+++ b/tests/queries/0_stateless/00926_adaptive_index_granularity_collapsing_merge_tree.reference
@@ -1,7 +1,7 @@
 4
 4
 8
-7
+8
 -----
 4
 1
diff --git a/tests/queries/0_stateless/00926_adaptive_index_granularity_collapsing_merge_tree.sql b/tests/queries/0_stateless/00926_adaptive_index_granularity_collapsing_merge_tree.sql
index d4c19cbe8f2..58b266f106f 100644
--- a/tests/queries/0_stateless/00926_adaptive_index_granularity_collapsing_merge_tree.sql
+++ b/tests/queries/0_stateless/00926_adaptive_index_granularity_collapsing_merge_tree.sql
@@ -58,7 +58,7 @@ OPTIMIZE TABLE four_rows_per_granule FINAL;
 
 SELECT COUNT(*) FROM four_rows_per_granule;
 
-SELECT distinct(marks) from system.parts WHERE table = 'four_rows_per_granule' and database=currentDatabase() and active=1;
+SELECT sum(marks) from system.parts WHERE table = 'four_rows_per_granule' and database=currentDatabase() and active=1;
 
 INSERT INTO four_rows_per_granule (p, k, v1, v2, Sign) VALUES ('2018-05-15', 1, 1000, 2000, 1), ('2018-05-16', 2, 3000, 4000, 1), ('2018-05-17', 3, 5000, 6000, 1), ('2018-05-18', 4, 7000, 8000, 1);
 
diff --git a/tests/queries/0_stateless/00926_adaptive_index_granularity_versioned_collapsing_merge_tree.reference b/tests/queries/0_stateless/00926_adaptive_index_granularity_versioned_collapsing_merge_tree.reference
index 067189f73fc..f93aae0225a 100644
--- a/tests/queries/0_stateless/00926_adaptive_index_granularity_versioned_collapsing_merge_tree.reference
+++ b/tests/queries/0_stateless/00926_adaptive_index_granularity_versioned_collapsing_merge_tree.reference
@@ -6,11 +6,9 @@
 4
 1
 0
-0
 6
 2
 -----
 6
 3
 0
-0
diff --git a/tests/queries/0_stateless/00926_adaptive_index_granularity_versioned_collapsing_merge_tree.sql b/tests/queries/0_stateless/00926_adaptive_index_granularity_versioned_collapsing_merge_tree.sql
index 4d4dbda922d..44dd0412aea 100644
--- a/tests/queries/0_stateless/00926_adaptive_index_granularity_versioned_collapsing_merge_tree.sql
+++ b/tests/queries/0_stateless/00926_adaptive_index_granularity_versioned_collapsing_merge_tree.sql
@@ -62,7 +62,11 @@ OPTIMIZE TABLE four_rows_per_granule FINAL;
 
 SELECT COUNT(*) FROM four_rows_per_granule;
 
-SELECT distinct(marks) from system.parts WHERE table = 'four_rows_per_granule' and database=currentDatabase() and active=1;
+-- We expect zero marks here, so we might get zero rows if all the parts were
+-- deleted already. This can happen in parallel runs where there may be a long delay
+-- between queries. So we must write the query in such a way that it always returns
+-- zero rows if OK.
+SELECT distinct(marks) d from system.parts WHERE table = 'four_rows_per_granule' and database=currentDatabase() and active=1 having d > 0;
 
 INSERT INTO four_rows_per_granule (p, k, v1, v2, Sign, Version) VALUES ('2018-05-15', 1, 1000, 2000, 1, 1), ('2018-05-16', 2, 3000, 4000, 1, 1), ('2018-05-17', 3, 5000, 6000, 1, 1), ('2018-05-18', 4, 7000, 8000, 1, 1);
 
@@ -120,6 +124,10 @@ OPTIMIZE TABLE six_rows_per_granule FINAL;
 
 SELECT COUNT(*) FROM six_rows_per_granule;
 
-SELECT distinct(marks) from system.parts WHERE table = 'six_rows_per_granule' and database=currentDatabase() and active=1;
+-- We expect zero marks here, so we might get zero rows if all the parts were
+-- deleted already. This can happen in parallel runs where there may be a long delay
+-- between queries. So we must write the query in such a way that it always returns
+-- zero rows if OK.
+SELECT distinct(marks) d from system.parts WHERE table = 'six_rows_per_granule' and database=currentDatabase() and active=1 having d > 0;
 
 DROP TABLE IF EXISTS six_rows_per_granule;
diff --git a/tests/queries/0_stateless/00933_test_fix_extra_seek_on_compressed_cache.reference b/tests/queries/0_stateless/00933_test_fix_extra_seek_on_compressed_cache.reference
index 7a08495654c..f1839bae259 100644
--- a/tests/queries/0_stateless/00933_test_fix_extra_seek_on_compressed_cache.reference
+++ b/tests/queries/0_stateless/00933_test_fix_extra_seek_on_compressed_cache.reference
@@ -1 +1 @@
-0	36	13
+0	0	13
diff --git a/tests/queries/0_stateless/00950_dict_get.reference b/tests/queries/0_stateless/00950_dict_get.reference
index 3010a2989c0..c1b502bf773 100644
--- a/tests/queries/0_stateless/00950_dict_get.reference
+++ b/tests/queries/0_stateless/00950_dict_get.reference
@@ -1,48 +1,48 @@
-dictGet	flat_ints	1	1	1	1	1	1	1	1	1
-dictGetOrDefault	flat_ints	1	1	1	1	1	1	1	1	1
-dictGetOrDefault	flat_ints	0	42	42	42	42	42	42	42	42
-dictGet	hashed_ints	1	1	1	1	1	1	1	1	1
-dictGetOrDefault	hashed_ints	1	1	1	1	1	1	1	1	1
-dictGetOrDefault	hashed_ints	0	42	42	42	42	42	42	42	42
-dictGet	hashed_sparse_ints	1	1	1	1	1	1	1	1	1
-dictGetOrDefault	hashed_sparse_ints	1	1	1	1	1	1	1	1	1
-dictGetOrDefault	hashed_sparse_ints	0	42	42	42	42	42	42	42	42
-dictGet	cache_ints	1	1	1	1	1	1	1	1	1
-dictGetOrDefault	cache_ints	1	1	1	1	1	1	1	1	1
-dictGetOrDefault	cache_ints	0	42	42	42	42	42	42	42	42
-dictGet	complex_hashed_ints	(1)	1	1	1	1	1	1	1	1
-dictGetOrDefault	complex_hashed_ints	(1)	1	1	1	1	1	1	1	1
-dictGetOrDefault	complex_hashed_ints	(0)	42	42	42	42	42	42	42	42
-dictGet	complex_cache_ints	(1)	1	1	1	1	1	1	1	1
-dictGetOrDefault	complex_cache_ints	(1)	1	1	1	1	1	1	1	1
-dictGetOrDefault	complex_cache_ints	(0)	42	42	42	42	42	42	42	42
-dictGet	flat_strings	1	1
-dictGetOrDefault	flat_strings	1	1
-dictGetOrDefault	flat_strings	0	*
-dictGet	hashed_strings	1	1
-dictGetOrDefault	hashed_strings	1	1
-dictGetOrDefault	hashed_strings	0	*
-dictGet	cache_strings	1	1
-dictGetOrDefault	cache_strings	1	1
-dictGetOrDefault	cache_strings	0	*
-dictGet	complex_hashed_strings	1	1
-dictGetOrDefault	complex_hashed_strings	1	1
-dictGetOrDefault	complex_hashed_strings	0	*
-dictGet	complex_cache_strings	1	1
-dictGetOrDefault	complex_cache_strings	1	1
-dictGetOrDefault	complex_cache_strings	0	*
-dictGet	flat_decimals	1	1.0000	1.000000	1.0
-dictGetOrDefault	flat_decimals	1	1.0000	1.000000	1.0
-dictGetOrDefault	flat_decimals	0	42.0000	42.000000	42.0
-dictGet	hashed_decimals	1	1.0000	1.000000	1.0
-dictGetOrDefault	hashed_decimals	1	1.0000	1.000000	1.0
-dictGetOrDefault	hashed_decimals	0	42.0000	42.000000	42.0
-dictGet	cache_decimals	1	1.0000	1.000000	1.0
-dictGetOrDefault	cache_decimals	1	1.0000	1.000000	1.0
-dictGetOrDefault	cache_decimals	0	42.0000	42.000000	42.0
-dictGet	complex_hashed_decimals	(1)	1.0000	1.000000	1.0
-dictGetOrDefault	complex_hashed_decimals	(1)	1.0000	1.000000	1.0
-dictGetOrDefault	complex_hashed_decimals	(0)	42.0000	42.000000	42.0
-dictGet	complex_cache_decimals	(1)	1.0000	1.000000	1.0
-dictGetOrDefault	complex_cache_decimals	(1)	1.0000	1.000000	1.0
-dictGetOrDefault	complex_cache_decimals	(0)	42.0000	42.000000	42.0
+dictGet	flat_ints	1	1	1	1	1	1	1	1	1	(1,1,1)
+dictGetOrDefault	flat_ints	1	1	1	1	1	1	1	1	1	(1,1,1)
+dictGetOrDefault	flat_ints	0	42	42	42	42	42	42	42	42	(42,42,42)
+dictGet	hashed_ints	1	1	1	1	1	1	1	1	1	(1,1,1)
+dictGetOrDefault	hashed_ints	1	1	1	1	1	1	1	1	1	(1,1,1)
+dictGetOrDefault	hashed_ints	0	42	42	42	42	42	42	42	(42,42,42)
+dictGet	hashed_sparse_ints	1	1	1	1	1	1	1	1	1	(1,1,1)
+dictGetOrDefault	hashed_sparse_ints	1	1	1	1	1	1	1	1	1	(1,1,1)
+dictGetOrDefault	hashed_sparse_ints	0	42	42	42	42	42	42	42	42	(42,42,42)
+dictGet	cache_ints	1	1	1	1	1	1	1	1	1	(1,1,1)
+dictGetOrDefault	cache_ints	1	1	1	1	1	1	1	1	1	(1,1,1)
+dictGetOrDefault	cache_ints	0	42	42	42	42	42	42	42	42	(42,42,42)
+dictGet	complex_hashed_ints	(1)	1	1	1	1	1	1	1	1	(1,1,1)
+dictGetOrDefault	complex_hashed_ints	(1)	1	1	1	1	1	1	1	1	(1,1,1)
+dictGetOrDefault	complex_hashed_ints	(0)	42	42	42	42	42	42	42	42	(42,42,42)
+dictGet	complex_cache_ints	(1)	1	1	1	1	1	1	1	1	(1,1,1)
+dictGetOrDefault	complex_cache_ints	(1)	1	1	1	1	1	1	1	1	(1,1,1)
+dictGetOrDefault	complex_cache_ints	(0)	42	42	42	42	42	42	42	42	(42,42,42)
+dictGet	flat_strings	1	1	1
+dictGetOrDefault	flat_strings	1	1	1
+dictGetOrDefault	flat_strings	0	*	*
+dictGet	hashed_strings	1	1	1
+dictGetOrDefault	hashed_strings	1	1	1
+dictGetOrDefault	hashed_strings	0	*	*
+dictGet	cache_strings	1	1	1
+dictGetOrDefault	cache_strings	1	1	1
+dictGetOrDefault	cache_strings	0	*	*
+dictGet	complex_hashed_strings	1	1	1
+dictGetOrDefault	complex_hashed_strings	1	1	1
+dictGetOrDefault	complex_hashed_strings	0	*	*
+dictGet	complex_cache_strings	1	1	1
+dictGetOrDefault	complex_cache_strings	1	1	1
+dictGetOrDefault	complex_cache_strings	0	*	*
+dictGet	flat_decimals	1	1.0000	1.000000	1.0	(1.0000,1.000000,1.0)
+dictGetOrDefault	flat_decimals	1	1.0000	1.000000	1.0	(1.0000,1.000000,1.0)
+dictGetOrDefault	flat_decimals	0	42.0000	42.000000	42.0	(42.0000,42.000000,42.0)
+dictGet	hashed_decimals	1	1.0000	1.000000	1.0	(1.0000,1.000000,1.0)
+dictGetOrDefault	hashed_decimals	1	1.0000	1.000000	1.0	(1.0000,1.000000,1.0)
+dictGetOrDefault	hashed_decimals	0	42.0000	42.000000	42.0	(42.0000,42.000000,42.0)
+dictGet	cache_decimals	1	1.0000	1.000000	1.0	(1.0000,1.000000,1.0)
+dictGetOrDefault	cache_decimals	1	1.0000	1.000000	1.0	(1.0000,1.000000,1.0)
+dictGetOrDefault	cache_decimals	0	42.0000	42.000000	42.0	(42.0000,42.000000,42.0)
+dictGet	complex_hashed_decimals	(1)	1.0000	1.000000	1.0	(1.0000,1.000000,1.0)
+dictGetOrDefault	complex_hashed_decimals	(1)	1.0000	1.000000	1.0	(1.0000,1.000000,1.0)
+dictGetOrDefault	complex_hashed_decimals	(0)	42.0000	42.000000	42.0	(42.0000,42.000000,42.0)
+dictGet	complex_cache_decimals	(1)	1.0000	1.000000	1.0	(1.0000,1.000000,1.0)
+dictGetOrDefault	complex_cache_decimals	(1)	1.0000	1.000000	1.0	(1.0000,1.000000,1.0)
+dictGetOrDefault	complex_cache_decimals	(0)	42.0000	42.000000	42.0	(42.0000,42.000000,42.0)
diff --git a/tests/queries/0_stateless/00950_dict_get.sql b/tests/queries/0_stateless/00950_dict_get.sql
index 93bb8f9b813..e49e05fbd27 100644
--- a/tests/queries/0_stateless/00950_dict_get.sql
+++ b/tests/queries/0_stateless/00950_dict_get.sql
@@ -20,7 +20,8 @@ select 'dictGet', 'flat_ints' as dict_name, toUInt64(1) as k,
     dictGet(dict_name, 'u8', k),
     dictGet(dict_name, 'u16', k),
     dictGet(dict_name, 'u32', k),
-    dictGet(dict_name, 'u64', k);
+    dictGet(dict_name, 'u64', k),
+    dictGet(dict_name, ('i8', 'i16', 'i32'), k);
 select 'dictGetOrDefault', 'flat_ints' as dict_name, toUInt64(1) as k,
     dictGetOrDefault(dict_name, 'i8', k, toInt8(42)),
     dictGetOrDefault(dict_name, 'i16', k, toInt16(42)),
@@ -29,7 +30,8 @@ select 'dictGetOrDefault', 'flat_ints' as dict_name, toUInt64(1) as k,
     dictGetOrDefault(dict_name, 'u8', k, toUInt8(42)),
     dictGetOrDefault(dict_name, 'u16', k, toUInt16(42)),
     dictGetOrDefault(dict_name, 'u32', k, toUInt32(42)),
-    dictGetOrDefault(dict_name, 'u64', k, toUInt64(42));
+    dictGetOrDefault(dict_name, 'u64', k, toUInt64(42)),
+    dictGetOrDefault(dict_name, ('i8', 'i16', 'i32'), k, (toInt8(42), toInt16(42), toInt32(42)));
 select 'dictGetOrDefault', 'flat_ints' as dict_name, toUInt64(0) as k,
     dictGetOrDefault(dict_name, 'i8', k, toInt8(42)),
     dictGetOrDefault(dict_name, 'i16', k, toInt16(42)),
@@ -38,7 +40,8 @@ select 'dictGetOrDefault', 'flat_ints' as dict_name, toUInt64(0) as k,
     dictGetOrDefault(dict_name, 'u8', k, toUInt8(42)),
     dictGetOrDefault(dict_name, 'u16', k, toUInt16(42)),
     dictGetOrDefault(dict_name, 'u32', k, toUInt32(42)),
-    dictGetOrDefault(dict_name, 'u64', k, toUInt64(42));
+    dictGetOrDefault(dict_name, 'u64', k, toUInt64(42)),
+    dictGetOrDefault(dict_name, ('i8', 'i16', 'i32'), k, (toInt8(42), toInt16(42), toInt32(42)));
 
 select 'dictGet', 'hashed_ints' as dict_name, toUInt64(1) as k,
     dictGet(dict_name, 'i8', k),
@@ -48,7 +51,8 @@ select 'dictGet', 'hashed_ints' as dict_name, toUInt64(1) as k,
     dictGet(dict_name, 'u8', k),
     dictGet(dict_name, 'u16', k),
     dictGet(dict_name, 'u32', k),
-    dictGet(dict_name, 'u64', k);
+    dictGet(dict_name, 'u64', k),
+    dictGet(dict_name, ('i8', 'i16', 'i32'), k);
 select 'dictGetOrDefault', 'hashed_ints' as dict_name, toUInt64(1) as k,
     dictGetOrDefault(dict_name, 'i8', k, toInt8(42)),
     dictGetOrDefault(dict_name, 'i16', k, toInt16(42)),
@@ -57,7 +61,8 @@ select 'dictGetOrDefault', 'hashed_ints' as dict_name, toUInt64(1) as k,
     dictGetOrDefault(dict_name, 'u8', k, toUInt8(42)),
     dictGetOrDefault(dict_name, 'u16', k, toUInt16(42)),
     dictGetOrDefault(dict_name, 'u32', k, toUInt32(42)),
-    dictGetOrDefault(dict_name, 'u64', k, toUInt64(42));
+    dictGetOrDefault(dict_name, 'u64', k, toUInt64(42)),
+    dictGetOrDefault(dict_name, ('i8', 'i16', 'i32'), k, (toInt8(42), toInt16(42), toInt32(42)));
 select 'dictGetOrDefault', 'hashed_ints' as dict_name, toUInt64(0) as k,
     dictGetOrDefault(dict_name, 'i8', k, toInt8(42)),
     dictGetOrDefault(dict_name, 'i16', k, toInt16(42)),
@@ -66,7 +71,7 @@ select 'dictGetOrDefault', 'hashed_ints' as dict_name, toUInt64(0) as k,
     dictGetOrDefault(dict_name, 'u8', k, toUInt8(42)),
     dictGetOrDefault(dict_name, 'u16', k, toUInt16(42)),
     dictGetOrDefault(dict_name, 'u32', k, toUInt32(42)),
-    dictGetOrDefault(dict_name, 'u64', k, toUInt64(42));
+    dictGetOrDefault(dict_name, ('i8', 'i16', 'i32'), k, (toInt8(42), toInt16(42), toInt32(42)));
 
 select 'dictGet', 'hashed_sparse_ints' as dict_name, toUInt64(1) as k,
     dictGet(dict_name, 'i8', k),
@@ -76,7 +81,8 @@ select 'dictGet', 'hashed_sparse_ints' as dict_name, toUInt64(1) as k,
     dictGet(dict_name, 'u8', k),
     dictGet(dict_name, 'u16', k),
     dictGet(dict_name, 'u32', k),
-    dictGet(dict_name, 'u64', k);
+    dictGet(dict_name, 'u64', k),
+    dictGet(dict_name, ('i8', 'i16', 'i32'), k);
 select 'dictGetOrDefault', 'hashed_sparse_ints' as dict_name, toUInt64(1) as k,
     dictGetOrDefault(dict_name, 'i8', k, toInt8(42)),
     dictGetOrDefault(dict_name, 'i16', k, toInt16(42)),
@@ -85,7 +91,8 @@ select 'dictGetOrDefault', 'hashed_sparse_ints' as dict_name, toUInt64(1) as k,
     dictGetOrDefault(dict_name, 'u8', k, toUInt8(42)),
     dictGetOrDefault(dict_name, 'u16', k, toUInt16(42)),
     dictGetOrDefault(dict_name, 'u32', k, toUInt32(42)),
-    dictGetOrDefault(dict_name, 'u64', k, toUInt64(42));
+    dictGetOrDefault(dict_name, 'u64', k, toUInt64(42)),
+    dictGetOrDefault(dict_name, ('i8', 'i16', 'i32'), k, (toInt8(42), toInt16(42), toInt32(42)));
 select 'dictGetOrDefault', 'hashed_sparse_ints' as dict_name, toUInt64(0) as k,
     dictGetOrDefault(dict_name, 'i8', k, toInt8(42)),
     dictGetOrDefault(dict_name, 'i16', k, toInt16(42)),
@@ -94,7 +101,8 @@ select 'dictGetOrDefault', 'hashed_sparse_ints' as dict_name, toUInt64(0) as k,
     dictGetOrDefault(dict_name, 'u8', k, toUInt8(42)),
     dictGetOrDefault(dict_name, 'u16', k, toUInt16(42)),
     dictGetOrDefault(dict_name, 'u32', k, toUInt32(42)),
-    dictGetOrDefault(dict_name, 'u64', k, toUInt64(42));
+    dictGetOrDefault(dict_name, 'u64', k, toUInt64(42)),
+    dictGetOrDefault(dict_name, ('i8', 'i16', 'i32'), k, (toInt8(42), toInt16(42), toInt32(42)));
 
 select 'dictGet', 'cache_ints' as dict_name, toUInt64(1) as k,
     dictGet(dict_name, 'i8', k),
@@ -104,7 +112,8 @@ select 'dictGet', 'cache_ints' as dict_name, toUInt64(1) as k,
     dictGet(dict_name, 'u8', k),
     dictGet(dict_name, 'u16', k),
     dictGet(dict_name, 'u32', k),
-    dictGet(dict_name, 'u64', k);
+    dictGet(dict_name, 'u64', k),
+    dictGet(dict_name, ('i8', 'i16', 'i32'), k);
 select 'dictGetOrDefault', 'cache_ints' as dict_name, toUInt64(1) as k,
     dictGetOrDefault(dict_name, 'i8', k, toInt8(42)),
     dictGetOrDefault(dict_name, 'i16', k, toInt16(42)),
@@ -113,7 +122,8 @@ select 'dictGetOrDefault', 'cache_ints' as dict_name, toUInt64(1) as k,
     dictGetOrDefault(dict_name, 'u8', k, toUInt8(42)),
     dictGetOrDefault(dict_name, 'u16', k, toUInt16(42)),
     dictGetOrDefault(dict_name, 'u32', k, toUInt32(42)),
-    dictGetOrDefault(dict_name, 'u64', k, toUInt64(42));
+    dictGetOrDefault(dict_name, 'u64', k, toUInt64(42)),
+    dictGetOrDefault(dict_name, ('i8', 'i16', 'i32'), k, (toInt8(42), toInt16(42), toInt32(42)));
 select 'dictGetOrDefault', 'cache_ints' as dict_name, toUInt64(0) as k,
     dictGetOrDefault(dict_name, 'i8', k, toInt8(42)),
     dictGetOrDefault(dict_name, 'i16', k, toInt16(42)),
@@ -122,7 +132,8 @@ select 'dictGetOrDefault', 'cache_ints' as dict_name, toUInt64(0) as k,
     dictGetOrDefault(dict_name, 'u8', k, toUInt8(42)),
     dictGetOrDefault(dict_name, 'u16', k, toUInt16(42)),
     dictGetOrDefault(dict_name, 'u32', k, toUInt32(42)),
-    dictGetOrDefault(dict_name, 'u64', k, toUInt64(42));
+    dictGetOrDefault(dict_name, 'u64', k, toUInt64(42)),
+    dictGetOrDefault(dict_name, ('i8', 'i16', 'i32'), k, (toInt8(42), toInt16(42), toInt32(42)));
 
 select 'dictGet', 'complex_hashed_ints' as dict_name, tuple(toUInt64(1)) as k,
     dictGet(dict_name, 'i8', k),
@@ -132,7 +143,8 @@ select 'dictGet', 'complex_hashed_ints' as dict_name, tuple(toUInt64(1)) as k,
     dictGet(dict_name, 'u8', k),
     dictGet(dict_name, 'u16', k),
     dictGet(dict_name, 'u32', k),
-    dictGet(dict_name, 'u64', k);
+    dictGet(dict_name, 'u64', k),
+    dictGet(dict_name, ('i8', 'i16', 'i32'), k);
 select 'dictGetOrDefault', 'complex_hashed_ints' as dict_name, tuple(toUInt64(1)) as k,
     dictGetOrDefault(dict_name, 'i8', k, toInt8(42)),
     dictGetOrDefault(dict_name, 'i16', k, toInt16(42)),
@@ -141,7 +153,8 @@ select 'dictGetOrDefault', 'complex_hashed_ints' as dict_name, tuple(toUInt64(1)
     dictGetOrDefault(dict_name, 'u8', k, toUInt8(42)),
     dictGetOrDefault(dict_name, 'u16', k, toUInt16(42)),
     dictGetOrDefault(dict_name, 'u32', k, toUInt32(42)),
-    dictGetOrDefault(dict_name, 'u64', k, toUInt64(42));
+    dictGetOrDefault(dict_name, 'u64', k, toUInt64(42)),
+    dictGetOrDefault(dict_name, ('i8', 'i16', 'i32'), k, (toInt8(42), toInt16(42), toInt32(42)));
 select 'dictGetOrDefault', 'complex_hashed_ints' as dict_name, tuple(toUInt64(0)) as k,
     dictGetOrDefault(dict_name, 'i8', k, toInt8(42)),
     dictGetOrDefault(dict_name, 'i16', k, toInt16(42)),
@@ -150,7 +163,8 @@ select 'dictGetOrDefault', 'complex_hashed_ints' as dict_name, tuple(toUInt64(0)
     dictGetOrDefault(dict_name, 'u8', k, toUInt8(42)),
     dictGetOrDefault(dict_name, 'u16', k, toUInt16(42)),
     dictGetOrDefault(dict_name, 'u32', k, toUInt32(42)),
-    dictGetOrDefault(dict_name, 'u64', k, toUInt64(42));
+    dictGetOrDefault(dict_name, 'u64', k, toUInt64(42)),
+    dictGetOrDefault(dict_name, ('i8', 'i16', 'i32'), k, (toInt8(42), toInt16(42), toInt32(42)));
 
 select 'dictGet', 'complex_cache_ints' as dict_name, tuple(toUInt64(1)) as k,
     dictGet(dict_name, 'i8', k),
@@ -160,7 +174,8 @@ select 'dictGet', 'complex_cache_ints' as dict_name, tuple(toUInt64(1)) as k,
     dictGet(dict_name, 'u8', k),
     dictGet(dict_name, 'u16', k),
     dictGet(dict_name, 'u32', k),
-    dictGet(dict_name, 'u64', k);
+    dictGet(dict_name, 'u64', k),
+    dictGet(dict_name, ('i8', 'i16', 'i32'), k);;
 select 'dictGetOrDefault', 'complex_cache_ints' as dict_name, tuple(toUInt64(1)) as k,
     dictGetOrDefault(dict_name, 'i8', k, toInt8(42)),
     dictGetOrDefault(dict_name, 'i16', k, toInt16(42)),
@@ -169,7 +184,8 @@ select 'dictGetOrDefault', 'complex_cache_ints' as dict_name, tuple(toUInt64(1))
     dictGetOrDefault(dict_name, 'u8', k, toUInt8(42)),
     dictGetOrDefault(dict_name, 'u16', k, toUInt16(42)),
     dictGetOrDefault(dict_name, 'u32', k, toUInt32(42)),
-    dictGetOrDefault(dict_name, 'u64', k, toUInt64(42));
+    dictGetOrDefault(dict_name, 'u64', k, toUInt64(42)),
+    dictGetOrDefault(dict_name, ('i8', 'i16', 'i32'), k, (toInt8(42), toInt16(42), toInt32(42)));
 select 'dictGetOrDefault', 'complex_cache_ints' as dict_name, tuple(toUInt64(0)) as k,
     dictGetOrDefault(dict_name, 'i8', k, toInt8(42)),
     dictGetOrDefault(dict_name, 'i16', k, toInt16(42)),
@@ -178,96 +194,112 @@ select 'dictGetOrDefault', 'complex_cache_ints' as dict_name, tuple(toUInt64(0))
     dictGetOrDefault(dict_name, 'u8', k, toUInt8(42)),
     dictGetOrDefault(dict_name, 'u16', k, toUInt16(42)),
     dictGetOrDefault(dict_name, 'u32', k, toUInt32(42)),
-    dictGetOrDefault(dict_name, 'u64', k, toUInt64(42));
+    dictGetOrDefault(dict_name, 'u64', k, toUInt64(42)),
+    dictGetOrDefault(dict_name, ('i8', 'i16', 'i32'), k, (toInt8(42), toInt16(42), toInt32(42)));
 
 --
 
-select 'dictGet', 'flat_strings' as dict_name, toUInt64(1) as k, dictGet(dict_name, 'str', k);
-select 'dictGetOrDefault', 'flat_strings' as dict_name, toUInt64(1) as k, dictGetOrDefault(dict_name, 'str', k, '*');
-select 'dictGetOrDefault', 'flat_strings' as dict_name, toUInt64(0) as k, dictGetOrDefault(dict_name, 'str', k, '*');
+select 'dictGet', 'flat_strings' as dict_name, toUInt64(1) as k, dictGet(dict_name, 'str', k), dictGet(dict_name, ('str'), k);
+select 'dictGetOrDefault', 'flat_strings' as dict_name, toUInt64(1) as k, dictGetOrDefault(dict_name, 'str', k, '*'), dictGetOrDefault(dict_name, ('str'), k, ('*'));
+select 'dictGetOrDefault', 'flat_strings' as dict_name, toUInt64(0) as k, dictGetOrDefault(dict_name, 'str', k, '*'), dictGetOrDefault(dict_name, ('str'), k, ('*'));
 
-select 'dictGet', 'hashed_strings' as dict_name, toUInt64(1) as k, dictGet(dict_name, 'str', k);
-select 'dictGetOrDefault', 'hashed_strings' as dict_name, toUInt64(1) as k, dictGetOrDefault(dict_name, 'str', k, '*');
-select 'dictGetOrDefault', 'hashed_strings' as dict_name, toUInt64(0) as k, dictGetOrDefault(dict_name, 'str', k, '*');
+select 'dictGet', 'hashed_strings' as dict_name, toUInt64(1) as k, dictGet(dict_name, 'str', k), dictGet(dict_name, ('str'), k);
+select 'dictGetOrDefault', 'hashed_strings' as dict_name, toUInt64(1) as k, dictGetOrDefault(dict_name, 'str', k, '*'), dictGetOrDefault(dict_name, ('str'), k, ('*'));
+select 'dictGetOrDefault', 'hashed_strings' as dict_name, toUInt64(0) as k, dictGetOrDefault(dict_name, 'str', k, '*'), dictGetOrDefault(dict_name, ('str'), k, ('*'));
 
-select 'dictGet', 'cache_strings' as dict_name, toUInt64(1) as k, dictGet(dict_name, 'str', k);
-select 'dictGetOrDefault', 'cache_strings' as dict_name, toUInt64(1) as k, dictGetOrDefault(dict_name, 'str', k, '*');
-select 'dictGetOrDefault', 'cache_strings' as dict_name, toUInt64(0) as k, dictGetOrDefault(dict_name, 'str', k, '*');
+select 'dictGet', 'cache_strings' as dict_name, toUInt64(1) as k, dictGet(dict_name, 'str', k), dictGet(dict_name, ('str'), k);
+select 'dictGetOrDefault', 'cache_strings' as dict_name, toUInt64(1) as k, dictGetOrDefault(dict_name, 'str', k, '*'), dictGetOrDefault(dict_name, ('str'), k, ('*'));
+select 'dictGetOrDefault', 'cache_strings' as dict_name, toUInt64(0) as k, dictGetOrDefault(dict_name, 'str', k, '*'), dictGetOrDefault(dict_name, ('str'), k, ('*'));
 
-select 'dictGet', 'complex_hashed_strings' as dict_name, toUInt64(1) as k, dictGet(dict_name, 'str', tuple(k));
-select 'dictGetOrDefault', 'complex_hashed_strings' as dict_name, toUInt64(1) as k, dictGetOrDefault(dict_name, 'str', tuple(k), '*');
-select 'dictGetOrDefault', 'complex_hashed_strings' as dict_name, toUInt64(0) as k, dictGetOrDefault(dict_name, 'str', tuple(k), '*');
+select 'dictGet', 'complex_hashed_strings' as dict_name, toUInt64(1) as k, dictGet(dict_name, 'str', tuple(k)), dictGet(dict_name, ('str'), tuple(k));
+select 'dictGetOrDefault', 'complex_hashed_strings' as dict_name, toUInt64(1) as k, dictGetOrDefault(dict_name, 'str', tuple(k), '*'), dictGetOrDefault(dict_name, ('str'), tuple(k), ('*'));
+select 'dictGetOrDefault', 'complex_hashed_strings' as dict_name, toUInt64(0) as k, dictGetOrDefault(dict_name, 'str', tuple(k), '*'), dictGetOrDefault(dict_name, ('str'), tuple(k), ('*'));
 
-select 'dictGet', 'complex_cache_strings' as dict_name, toUInt64(1) as k, dictGet(dict_name, 'str', tuple(k));
-select 'dictGetOrDefault', 'complex_cache_strings' as dict_name, toUInt64(1) as k, dictGetOrDefault(dict_name, 'str', tuple(k), '*');
-select 'dictGetOrDefault', 'complex_cache_strings' as dict_name, toUInt64(0) as k, dictGetOrDefault(dict_name, 'str', tuple(k), '*');
+select 'dictGet', 'complex_cache_strings' as dict_name, toUInt64(1) as k, dictGet(dict_name, 'str', tuple(k)), dictGet(dict_name, ('str'), tuple(k));
+select 'dictGetOrDefault', 'complex_cache_strings' as dict_name, toUInt64(1) as k, dictGetOrDefault(dict_name, 'str', tuple(k), '*'), dictGetOrDefault(dict_name, ('str'), tuple(k), ('*'));
+select 'dictGetOrDefault', 'complex_cache_strings' as dict_name, toUInt64(0) as k, dictGetOrDefault(dict_name, 'str', tuple(k), '*'), dictGetOrDefault(dict_name, ('str'), tuple(k), ('*'));
 
 --
 
 select 'dictGet', 'flat_decimals' as dict_name, toUInt64(1) as k,
     dictGet(dict_name, 'd32', k),
     dictGet(dict_name, 'd64', k),
-    dictGet(dict_name, 'd128', k);
+    dictGet(dict_name, 'd128', k),
+    dictGet(dict_name, ('d32', 'd64', 'd128'), k);
 select 'dictGetOrDefault', 'flat_decimals' as dict_name, toUInt64(1) as k,
     dictGetOrDefault(dict_name, 'd32', k, toDecimal32(42, 4)),
     dictGetOrDefault(dict_name, 'd64', k, toDecimal64(42, 6)),
-    dictGetOrDefault(dict_name, 'd128', k, toDecimal128(42, 1));
+    dictGetOrDefault(dict_name, 'd128', k, toDecimal128(42, 1)),
+    dictGetOrDefault(dict_name, ('d32', 'd64', 'd128'), k, (toDecimal32(42, 4), toDecimal64(42, 6), toDecimal128(42, 1)));
 select 'dictGetOrDefault', 'flat_decimals' as dict_name, toUInt64(0) as k,
     dictGetOrDefault(dict_name, 'd32', k, toDecimal32(42, 4)),
     dictGetOrDefault(dict_name, 'd64', k, toDecimal64(42, 6)),
-    dictGetOrDefault(dict_name, 'd128', k, toDecimal128(42, 1));
+    dictGetOrDefault(dict_name, 'd128', k, toDecimal128(42, 1)),
+    dictGetOrDefault(dict_name, ('d32', 'd64', 'd128'), k, (toDecimal32(42, 4), toDecimal64(42, 6), toDecimal128(42, 1)));
 
 select 'dictGet', 'hashed_decimals' as dict_name, toUInt64(1) as k,
     dictGet(dict_name, 'd32', k),
     dictGet(dict_name, 'd64', k),
-    dictGet(dict_name, 'd128', k);
+    dictGet(dict_name, 'd128', k),
+    dictGet(dict_name, ('d32', 'd64', 'd128'), k);
 select 'dictGetOrDefault', 'hashed_decimals' as dict_name, toUInt64(1) as k,
     dictGetOrDefault(dict_name, 'd32', k, toDecimal32(42, 4)),
     dictGetOrDefault(dict_name, 'd64', k, toDecimal64(42, 6)),
-    dictGetOrDefault(dict_name, 'd128', k, toDecimal128(42, 1));
+    dictGetOrDefault(dict_name, 'd128', k, toDecimal128(42, 1)),
+    dictGetOrDefault(dict_name, ('d32', 'd64', 'd128'), k, (toDecimal32(42, 4), toDecimal64(42, 6), toDecimal128(42, 1)));
 select 'dictGetOrDefault', 'hashed_decimals' as dict_name, toUInt64(0) as k,
     dictGetOrDefault(dict_name, 'd32', k, toDecimal32(42, 4)),
     dictGetOrDefault(dict_name, 'd64', k, toDecimal64(42, 6)),
-    dictGetOrDefault(dict_name, 'd128', k, toDecimal128(42, 1));
+    dictGetOrDefault(dict_name, 'd128', k, toDecimal128(42, 1)),
+    dictGetOrDefault(dict_name, ('d32', 'd64', 'd128'), k, (toDecimal32(42, 4), toDecimal64(42, 6), toDecimal128(42, 1)));
 
 select 'dictGet', 'cache_decimals' as dict_name, toUInt64(1) as k,
     dictGet(dict_name, 'd32', k),
     dictGet(dict_name, 'd64', k),
-    dictGet(dict_name, 'd128', k);
+    dictGet(dict_name, 'd128', k),
+    dictGet(dict_name, ('d32', 'd64', 'd128'), k);
 select 'dictGetOrDefault', 'cache_decimals' as dict_name, toUInt64(1) as k,
     dictGetOrDefault(dict_name, 'd32', k, toDecimal32(42, 4)),
     dictGetOrDefault(dict_name, 'd64', k, toDecimal64(42, 6)),
-    dictGetOrDefault(dict_name, 'd128', k, toDecimal128(42, 1));
+    dictGetOrDefault(dict_name, 'd128', k, toDecimal128(42, 1)),
+    dictGetOrDefault(dict_name, ('d32', 'd64', 'd128'), k, (toDecimal32(42, 4), toDecimal64(42, 6), toDecimal128(42, 1)));
 select 'dictGetOrDefault', 'cache_decimals' as dict_name, toUInt64(0) as k,
     dictGetOrDefault(dict_name, 'd32', k, toDecimal32(42, 4)),
     dictGetOrDefault(dict_name, 'd64', k, toDecimal64(42, 6)),
-    dictGetOrDefault(dict_name, 'd128', k, toDecimal128(42, 1));
+    dictGetOrDefault(dict_name, 'd128', k, toDecimal128(42, 1)),
+    dictGetOrDefault(dict_name, ('d32', 'd64', 'd128'), k, (toDecimal32(42, 4), toDecimal64(42, 6), toDecimal128(42, 1)));
 
 select 'dictGet', 'complex_hashed_decimals' as dict_name, tuple(toUInt64(1)) as k,
     dictGet(dict_name, 'd32', k),
     dictGet(dict_name, 'd64', k),
-    dictGet(dict_name, 'd128', k);
+    dictGet(dict_name, 'd128', k),
+    dictGet(dict_name, ('d32', 'd64', 'd128'), k);
 select 'dictGetOrDefault', 'complex_hashed_decimals' as dict_name, tuple(toUInt64(1)) as k,
     dictGetOrDefault(dict_name, 'd32', k, toDecimal32(42, 4)),
     dictGetOrDefault(dict_name, 'd64', k, toDecimal64(42, 6)),
-    dictGetOrDefault(dict_name, 'd128', k, toDecimal128(42, 1));
+    dictGetOrDefault(dict_name, 'd128', k, toDecimal128(42, 1)),
+    dictGetOrDefault(dict_name, ('d32', 'd64', 'd128'), k, (toDecimal32(42, 4), toDecimal64(42, 6), toDecimal128(42, 1)));
 select 'dictGetOrDefault', 'complex_hashed_decimals' as dict_name, tuple(toUInt64(0)) as k,
     dictGetOrDefault(dict_name, 'd32', k, toDecimal32(42, 4)),
     dictGetOrDefault(dict_name, 'd64', k, toDecimal64(42, 6)),
-    dictGetOrDefault(dict_name, 'd128', k, toDecimal128(42, 1));
+    dictGetOrDefault(dict_name, 'd128', k, toDecimal128(42, 1)),
+    dictGetOrDefault(dict_name, ('d32', 'd64', 'd128'), k, (toDecimal32(42, 4), toDecimal64(42, 6), toDecimal128(42, 1)));
 
 select 'dictGet', 'complex_cache_decimals' as dict_name, tuple(toUInt64(1)) as k,
     dictGet(dict_name, 'd32', k),
     dictGet(dict_name, 'd64', k),
-    dictGet(dict_name, 'd128', k);
+    dictGet(dict_name, 'd128', k),
+    dictGet(dict_name, ('d32', 'd64', 'd128'), k);
 select 'dictGetOrDefault', 'complex_cache_decimals' as dict_name, tuple(toUInt64(1)) as k,
     dictGetOrDefault(dict_name, 'd32', k, toDecimal32(42, 4)),
     dictGetOrDefault(dict_name, 'd64', k, toDecimal64(42, 6)),
-    dictGetOrDefault(dict_name, 'd128', k, toDecimal128(42, 1));
+    dictGetOrDefault(dict_name, 'd128', k, toDecimal128(42, 1)),
+    dictGetOrDefault(dict_name, ('d32', 'd64', 'd128'), k, (toDecimal32(42, 4), toDecimal64(42, 6), toDecimal128(42, 1)));
 select 'dictGetOrDefault', 'complex_cache_decimals' as dict_name, tuple(toUInt64(0)) as k,
     dictGetOrDefault(dict_name, 'd32', k, toDecimal32(42, 4)),
     dictGetOrDefault(dict_name, 'd64', k, toDecimal64(42, 6)),
-    dictGetOrDefault(dict_name, 'd128', k, toDecimal128(42, 1));
+    dictGetOrDefault(dict_name, 'd128', k, toDecimal128(42, 1)),
+    dictGetOrDefault(dict_name, ('d32', 'd64', 'd128'), k, (toDecimal32(42, 4), toDecimal64(42, 6), toDecimal128(42, 1)));
 
 --
 -- Keep the tables, so that the dictionaries can be reloaded correctly and
diff --git a/tests/queries/0_stateless/00953_zookeeper_suetin_deduplication_bug.sh b/tests/queries/0_stateless/00953_zookeeper_suetin_deduplication_bug.sh
index bbc2d957937..71ca29bfd96 100755
--- a/tests/queries/0_stateless/00953_zookeeper_suetin_deduplication_bug.sh
+++ b/tests/queries/0_stateless/00953_zookeeper_suetin_deduplication_bug.sh
@@ -15,48 +15,44 @@ CREATE TABLE elog (
     engine_id UInt32,
     referrer String
 )
-ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00953/elog', 'test')
+ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/elog/{shard}', '{replica}')
 PARTITION BY date
 ORDER BY (engine_id)
 SETTINGS replicated_deduplication_window = 2, cleanup_delay_period=4, cleanup_delay_period_random_add=0;"
 
 $CLICKHOUSE_CLIENT --query="INSERT INTO elog VALUES (toDate('2018-10-01'), 1, 'hello')"
-sleep 1
 $CLICKHOUSE_CLIENT --query="INSERT INTO elog VALUES (toDate('2018-10-01'), 2, 'hello')"
-sleep 1
 $CLICKHOUSE_CLIENT --query="INSERT INTO elog VALUES (toDate('2018-10-01'), 3, 'hello')"
 
 $CLICKHOUSE_CLIENT --query="SELECT count(*) from elog" # 3 rows
 
-count=$($CLICKHOUSE_CLIENT --query="SELECT COUNT(*) FROM system.zookeeper where path = '/clickhouse/tables/test_00953/elog/blocks'")
-
+count=$($CLICKHOUSE_CLIENT --query="SELECT COUNT(*) FROM system.zookeeper where path = '/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/elog/s1/blocks'")
 while [[ $count != 2 ]]
 do
     sleep 1
-    count=$($CLICKHOUSE_CLIENT --query="SELECT COUNT(*) FROM system.zookeeper where path = '/clickhouse/tables/test_00953/elog/blocks'")
+    count=$($CLICKHOUSE_CLIENT --query="SELECT COUNT(*) FROM system.zookeeper where path = '/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/elog/s1/blocks'")
 done
 
 $CLICKHOUSE_CLIENT --query="INSERT INTO elog VALUES (toDate('2018-10-01'), 1, 'hello')"
 
 $CLICKHOUSE_CLIENT --query="SELECT count(*) from elog" # 4 rows
-count=$($CLICKHOUSE_CLIENT --query="SELECT COUNT(*) FROM system.zookeeper where path = '/clickhouse/tables/test_00953/elog/blocks'")
 
+count=$($CLICKHOUSE_CLIENT --query="SELECT COUNT(*) FROM system.zookeeper where path = '/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/elog/s1/blocks'")
 while [[ $count != 2 ]]
 do
     sleep 1
-    count=$($CLICKHOUSE_CLIENT --query="SELECT COUNT(*) FROM system.zookeeper where path = '/clickhouse/tables/test_00953/elog/blocks'")
+    count=$($CLICKHOUSE_CLIENT --query="SELECT COUNT(*) FROM system.zookeeper where path = '/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/elog/s1/blocks'")
 done
 
 $CLICKHOUSE_CLIENT --query="INSERT INTO elog VALUES (toDate('2018-10-01'), 2, 'hello')"
 
 $CLICKHOUSE_CLIENT --query="SELECT count(*) from elog" # 5 rows
 
-count=$($CLICKHOUSE_CLIENT --query="SELECT COUNT(*) FROM system.zookeeper where path = '/clickhouse/tables/test_00953/elog/blocks'")
-
+count=$($CLICKHOUSE_CLIENT --query="SELECT COUNT(*) FROM system.zookeeper where path = '/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/elog/s1/blocks'")
 while [[ $count != 2 ]]
 do
     sleep 1
-    count=$($CLICKHOUSE_CLIENT --query="SELECT COUNT(*) FROM system.zookeeper where path = '/clickhouse/tables/test_00953/elog/blocks'")
+    count=$($CLICKHOUSE_CLIENT --query="SELECT COUNT(*) FROM system.zookeeper where path = '/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/elog/s1/blocks'")
 done
 
 $CLICKHOUSE_CLIENT --query="INSERT INTO elog VALUES (toDate('2018-10-01'), 2, 'hello')"
diff --git a/tests/queries/0_stateless/00956_sensitive_data_masking.sh b/tests/queries/0_stateless/00956_sensitive_data_masking.sh
index 764cb6a713e..7462dfd5585 100755
--- a/tests/queries/0_stateless/00956_sensitive_data_masking.sh
+++ b/tests/queries/0_stateless/00956_sensitive_data_masking.sh
@@ -65,7 +65,7 @@ echo '5.1'
 
 # wait until the query in background will start (max: 10 seconds as sleepEachRow)
 for _ in {1..100}; do
-    $CLICKHOUSE_CLIENT --query="SHOW PROCESSLIST" --log_queries=0 >"$tmp_file" 2>&1
+    $CLICKHOUSE_CLIENT --query="SELECT * FROM system.processes WHERE current_database = currentDatabase()" --log_queries=0 >"$tmp_file" 2>&1
     grep -q -F 'fwerkh_that_magic_string_make_me_unique' "$tmp_file" && break
     sleep 0.1
 done
@@ -97,7 +97,7 @@ echo 7
 # and finally querylog
 $CLICKHOUSE_CLIENT \
   --server_logs_file=/dev/null \
-  --query="select * from system.query_log where current_database = currentDatabase() AND event_time > now() - 10 and query like '%TOPSECRET%';"
+  --query="select * from system.query_log where current_database = currentDatabase() AND event_date >= yesterday() and query like '%TOPSECRET%';"
 
 
 rm -f "$tmp_file" >/dev/null 2>&1
@@ -118,8 +118,8 @@ $CLICKHOUSE_CLIENT --query="SYSTEM FLUSH LOGS" --server_logs_file=/dev/null
 echo 9
 $CLICKHOUSE_CLIENT \
    --server_logs_file=/dev/null \
-   --query="SELECT if( count() > 0, 'text_log non empty', 'text_log empty') FROM system.text_log WHERE event_time>now() - 60 and message like '%find_me%';
-   select * from system.text_log where event_time > now() - 60 and message like '%TOPSECRET=TOPSECRET%';"  --ignore-error --multiquery
+   --query="SELECT if( count() > 0, 'text_log non empty', 'text_log empty') FROM system.text_log WHERE event_date >= yesterday() and message like '%find_me%';
+   select * from system.text_log where event_date >= yesterday() and message like '%TOPSECRET=TOPSECRET%';"  --ignore-error --multiquery
 
 echo 'finish'
 rm -f "$tmp_file" >/dev/null 2>&1
diff --git a/tests/queries/0_stateless/00966_invalid_json_must_not_parse.reference b/tests/queries/0_stateless/00966_invalid_json_must_not_parse.reference
index f7eb44d66e0..4521d575ff3 100644
--- a/tests/queries/0_stateless/00966_invalid_json_must_not_parse.reference
+++ b/tests/queries/0_stateless/00966_invalid_json_must_not_parse.reference
@@ -4,3 +4,7 @@
 0
 0
 0
+0
+0
+0
+0
diff --git a/tests/queries/0_stateless/00966_invalid_json_must_not_parse.sql b/tests/queries/0_stateless/00966_invalid_json_must_not_parse.sql
index afcbc78cfd5..0e7fa55dbae 100644
--- a/tests/queries/0_stateless/00966_invalid_json_must_not_parse.sql
+++ b/tests/queries/0_stateless/00966_invalid_json_must_not_parse.sql
@@ -3,6 +3,8 @@ SET allow_simdjson=1;
 SELECT JSONLength('"HX-=');
 SELECT JSONLength('[9]\0\x42\xD3\x36\xE3');
 SELECT JSONLength(unhex('5B30000E06D7AA5D'));
+SELECT JSONLength('{"success"test:"123"}');
+SELECT isValidJSON('{"success"test:"123"}');
 
 
 SET allow_simdjson=0;
@@ -10,3 +12,5 @@ SET allow_simdjson=0;
 SELECT JSONLength('"HX-=');
 SELECT JSONLength('[9]\0\x42\xD3\x36\xE3');
 SELECT JSONLength(unhex('5B30000E06D7AA5D'));
+SELECT JSONLength('{"success"test:"123"}');
+SELECT isValidJSON('{"success"test:"123"}');
diff --git a/tests/queries/0_stateless/00966_live_view_watch_events_http.py b/tests/queries/0_stateless/00966_live_view_watch_events_http.py
index 3d407ec5602..1c00a5d1236 100755
--- a/tests/queries/0_stateless/00966_live_view_watch_events_http.py
+++ b/tests/queries/0_stateless/00966_live_view_watch_events_http.py
@@ -28,13 +28,14 @@ with client(name='client1>', log=log) as client1:
     client1.expect(prompt)
 
 
-    with http_client({'method':'GET', 'url': '/?allow_experimental_live_view=1&query=WATCH%20test.lv%20EVENTS'}, name='client2>', log=log) as client2:
-        client2.expect('.*1\n')
-        client1.send('INSERT INTO test.mt VALUES (1),(2),(3)')
+    try:
+        with http_client({'method':'GET', 'url': '/?allow_experimental_live_view=1&query=WATCH%20test.lv%20EVENTS'}, name='client2>', log=log) as client2:
+            client2.expect('.*1\n')
+            client1.send('INSERT INTO test.mt VALUES (1),(2),(3)')
+            client1.expect(prompt)
+            client2.expect('.*2\n')
+    finally:
+        client1.send('DROP TABLE test.lv')
+        client1.expect(prompt)
+        client1.send('DROP TABLE test.mt')
         client1.expect(prompt)
-        client2.expect('.*2\n')
-
-    client1.send('DROP TABLE test.lv')
-    client1.expect(prompt)
-    client1.send('DROP TABLE test.mt')
-    client1.expect(prompt)
diff --git a/tests/queries/0_stateless/00967_live_view_watch_http.py b/tests/queries/0_stateless/00967_live_view_watch_http.py
index d26bb5402e7..c41b9f0c861 100755
--- a/tests/queries/0_stateless/00967_live_view_watch_http.py
+++ b/tests/queries/0_stateless/00967_live_view_watch_http.py
@@ -27,14 +27,14 @@ with client(name='client1>', log=log) as client1:
     client1.send('CREATE LIVE VIEW test.lv AS SELECT sum(a) FROM test.mt')
     client1.expect(prompt)
 
-
-    with http_client({'method':'GET', 'url':'/?allow_experimental_live_view=1&query=WATCH%20test.lv'}, name='client2>', log=log) as client2:
-        client2.expect('.*0\t1\n')
-        client1.send('INSERT INTO test.mt VALUES (1),(2),(3)')
+    try:
+        with http_client({'method':'GET', 'url':'/?allow_experimental_live_view=1&query=WATCH%20test.lv'}, name='client2>', log=log) as client2:
+            client2.expect('.*0\t1\n')
+            client1.send('INSERT INTO test.mt VALUES (1),(2),(3)')
+            client1.expect(prompt)
+            client2.expect('.*6\t2\n')
+    finally:
+        client1.send('DROP TABLE test.lv')
+        client1.expect(prompt)
+        client1.send('DROP TABLE test.mt')
         client1.expect(prompt)
-        client2.expect('.*6\t2\n')
-
-    client1.send('DROP TABLE test.lv')
-    client1.expect(prompt)
-    client1.send('DROP TABLE test.mt')
-    client1.expect(prompt)
diff --git a/tests/queries/0_stateless/00971_merge_tree_uniform_read_distribution_and_max_rows_to_read.sql b/tests/queries/0_stateless/00971_merge_tree_uniform_read_distribution_and_max_rows_to_read.sql
index d31989d65bd..5abb1af620a 100644
--- a/tests/queries/0_stateless/00971_merge_tree_uniform_read_distribution_and_max_rows_to_read.sql
+++ b/tests/queries/0_stateless/00971_merge_tree_uniform_read_distribution_and_max_rows_to_read.sql
@@ -10,7 +10,8 @@ SELECT count() FROM merge_tree;
 
 SET max_rows_to_read = 900000;
 
-SELECT count() FROM merge_tree WHERE not ignore(); -- { serverError 158 }
-SELECT count() FROM merge_tree WHERE not ignore(); -- { serverError 158 }
+-- constant ignore will be pruned by part pruner. ignore(*) is used.
+SELECT count() FROM merge_tree WHERE not ignore(*); -- { serverError 158 }
+SELECT count() FROM merge_tree WHERE not ignore(*); -- { serverError 158 }
 
 DROP TABLE merge_tree;
diff --git a/tests/queries/0_stateless/00974_distributed_join_on.sql b/tests/queries/0_stateless/00974_distributed_join_on.sql
index 10f8763fa33..355d9f81e82 100644
--- a/tests/queries/0_stateless/00974_distributed_join_on.sql
+++ b/tests/queries/0_stateless/00974_distributed_join_on.sql
@@ -1,7 +1,3 @@
--- Avoid "Connection failed at try №1" messages.
-SET send_logs_level = 'none';
-SET connect_timeout_with_failover_ms = 5000;
-
 DROP TABLE IF EXISTS source_table1;
 DROP TABLE IF EXISTS source_table2;
 DROP TABLE IF EXISTS distributed_table1;
diff --git a/tests/queries/0_stateless/00975_indices_mutation_replicated_zookeeper.reference b/tests/queries/0_stateless/00975_indices_mutation_replicated_zookeeper_long.reference
similarity index 100%
rename from tests/queries/0_stateless/00975_indices_mutation_replicated_zookeeper.reference
rename to tests/queries/0_stateless/00975_indices_mutation_replicated_zookeeper_long.reference
diff --git a/tests/queries/0_stateless/00975_indices_mutation_replicated_zookeeper.sh b/tests/queries/0_stateless/00975_indices_mutation_replicated_zookeeper_long.sh
similarity index 90%
rename from tests/queries/0_stateless/00975_indices_mutation_replicated_zookeeper.sh
rename to tests/queries/0_stateless/00975_indices_mutation_replicated_zookeeper_long.sh
index 81c0c563db1..22c404c7712 100755
--- a/tests/queries/0_stateless/00975_indices_mutation_replicated_zookeeper.sh
+++ b/tests/queries/0_stateless/00975_indices_mutation_replicated_zookeeper_long.sh
@@ -17,17 +17,18 @@ CREATE TABLE indices_mutaions1
     i64 Int64,
     i32 Int32,
     INDEX idx (i64, u64 * i64) TYPE minmax GRANULARITY 1
-) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00975/indices_mutaions', 'r1')
+) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/indices_mutaions', 'r1')
 PARTITION BY i32
 ORDER BY u64
 SETTINGS index_granularity = 2;
+
 CREATE TABLE indices_mutaions2
 (
     u64 UInt64,
     i64 Int64,
     i32 Int32,
     INDEX idx (i64, u64 * i64) TYPE minmax GRANULARITY 1
-) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00975/indices_mutaions', 'r2')
+) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/indices_mutaions', 'r2')
 PARTITION BY i32
 ORDER BY u64
 SETTINGS index_granularity = 2;"
diff --git a/tests/queries/0_stateless/00976_system_stop_ttl_merges.sql b/tests/queries/0_stateless/00976_system_stop_ttl_merges.sql
index 41f2428d9e6..b27e4275d5d 100644
--- a/tests/queries/0_stateless/00976_system_stop_ttl_merges.sql
+++ b/tests/queries/0_stateless/00976_system_stop_ttl_merges.sql
@@ -2,7 +2,7 @@ drop table if exists ttl;
 
 create table ttl (d Date, a Int) engine = MergeTree order by a partition by toDayOfMonth(d) ttl d + interval 1 day;
 
-system stop ttl merges;
+system stop ttl merges ttl;
 
 insert into ttl values (toDateTime('2000-10-10 00:00:00'), 1), (toDateTime('2000-10-10 00:00:00'), 2)
 insert into ttl values (toDateTime('2100-10-10 00:00:00'), 3), (toDateTime('2100-10-10 00:00:00'), 4);
@@ -11,7 +11,7 @@ select sleep(1) format Null; -- wait if very fast merge happen
 optimize table ttl partition 10 final;
 select * from ttl order by d, a;
 
-system start ttl merges;
+system start ttl merges ttl;
 optimize table ttl partition 10 final;
 select * from ttl order by d, a;
 
diff --git a/tests/queries/0_stateless/00987_distributed_stack_overflow.sql b/tests/queries/0_stateless/00987_distributed_stack_overflow.sql
index 4baa6969b31..d2e2b8f37ef 100644
--- a/tests/queries/0_stateless/00987_distributed_stack_overflow.sql
+++ b/tests/queries/0_stateless/00987_distributed_stack_overflow.sql
@@ -5,13 +5,13 @@ DROP TABLE IF EXISTS distr2;
 CREATE TABLE distr (x UInt8) ENGINE = Distributed(test_shard_localhost, currentDatabase(), distr); -- { serverError 269 }
 
 CREATE TABLE distr0 (x UInt8) ENGINE = Distributed(test_shard_localhost, '', distr0);
-SELECT * FROM distr0; -- { serverError 306 }
+SELECT * FROM distr0; -- { serverError 581 }
 
 CREATE TABLE distr1 (x UInt8) ENGINE = Distributed(test_shard_localhost, currentDatabase(), distr2);
 CREATE TABLE distr2 (x UInt8) ENGINE = Distributed(test_shard_localhost, currentDatabase(), distr1);
 
-SELECT * FROM distr1; -- { serverError 306 }
-SELECT * FROM distr2; -- { serverError 306 }
+SELECT * FROM distr1; -- { serverError 581 }
+SELECT * FROM distr2; -- { serverError 581 }
 
 DROP TABLE distr0;
 DROP TABLE distr1;
diff --git a/tests/queries/0_stateless/00992_system_parts_race_condition_zookeeper_long.reference b/tests/queries/0_stateless/00992_system_parts_race_condition_zookeeper_long.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/00992_system_parts_race_condition_zookeeper.sh b/tests/queries/0_stateless/00992_system_parts_race_condition_zookeeper_long.sh
similarity index 81%
rename from tests/queries/0_stateless/00992_system_parts_race_condition_zookeeper.sh
rename to tests/queries/0_stateless/00992_system_parts_race_condition_zookeeper_long.sh
index 613e032f42a..fe6246e02f6 100755
--- a/tests/queries/0_stateless/00992_system_parts_race_condition_zookeeper.sh
+++ b/tests/queries/0_stateless/00992_system_parts_race_condition_zookeeper_long.sh
@@ -10,8 +10,8 @@ $CLICKHOUSE_CLIENT -n -q "
     DROP TABLE IF EXISTS alter_table;
     DROP TABLE IF EXISTS alter_table2;
 
-    CREATE TABLE alter_table (a UInt8, b Int16, c Float32, d String, e Array(UInt8), f Nullable(UUID), g Tuple(UInt8, UInt16)) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_DATABASE.alter_table', 'r1') ORDER BY a PARTITION BY b % 10 SETTINGS old_parts_lifetime = 1, cleanup_delay_period = 1, cleanup_delay_period_random_add = 0;
-    CREATE TABLE alter_table2 (a UInt8, b Int16, c Float32, d String, e Array(UInt8), f Nullable(UUID), g Tuple(UInt8, UInt16)) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_DATABASE.alter_table', 'r2') ORDER BY a PARTITION BY b % 10 SETTINGS old_parts_lifetime = 1, cleanup_delay_period = 1, cleanup_delay_period_random_add = 0
+    CREATE TABLE alter_table (a UInt8, b Int16, c Float32, d String, e Array(UInt8), f Nullable(UUID), g Tuple(UInt8, UInt16)) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/alter_table', 'r1') ORDER BY a PARTITION BY b % 10 SETTINGS old_parts_lifetime = 1, cleanup_delay_period = 1, cleanup_delay_period_random_add = 0;
+    CREATE TABLE alter_table2 (a UInt8, b Int16, c Float32, d String, e Array(UInt8), f Nullable(UUID), g Tuple(UInt8, UInt16)) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/alter_table', 'r2') ORDER BY a PARTITION BY b % 10 SETTINGS old_parts_lifetime = 1, cleanup_delay_period = 1, cleanup_delay_period_random_add = 0
 "
 
 function thread1()
@@ -74,7 +74,7 @@ timeout $TIMEOUT bash -c thread5 2> /dev/null &
 
 wait
 
-$CLICKHOUSE_CLIENT -n -q "
-    DROP TABLE alter_table;
-    DROP TABLE alter_table2
-"
+$CLICKHOUSE_CLIENT -n -q "DROP TABLE alter_table;" &
+$CLICKHOUSE_CLIENT -n -q "DROP TABLE alter_table2;" &
+
+wait
diff --git a/tests/queries/0_stateless/00993_system_parts_race_condition_drop_zookeeper.sh b/tests/queries/0_stateless/00993_system_parts_race_condition_drop_zookeeper.sh
index 1731148f71f..d960d8ff91d 100755
--- a/tests/queries/0_stateless/00993_system_parts_race_condition_drop_zookeeper.sh
+++ b/tests/queries/0_stateless/00993_system_parts_race_condition_drop_zookeeper.sh
@@ -52,7 +52,7 @@ function thread6()
     while true; do
         REPLICA=$(($RANDOM % 10))
         $CLICKHOUSE_CLIENT -n -q "DROP TABLE IF EXISTS alter_table_$REPLICA;
-            CREATE TABLE alter_table_$REPLICA (a UInt8, b Int16, c Float32, d String, e Array(UInt8), f Nullable(UUID), g Tuple(UInt8, UInt16)) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00993/alter_table', 'r_$REPLICA') ORDER BY a PARTITION BY b % 10 SETTINGS old_parts_lifetime = 1, cleanup_delay_period = 0, cleanup_delay_period_random_add = 0;";
+            CREATE TABLE alter_table_$REPLICA (a UInt8, b Int16, c Float32, d String, e Array(UInt8), f Nullable(UUID), g Tuple(UInt8, UInt16)) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/alter_table', 'r_$REPLICA') ORDER BY a PARTITION BY b % 10 SETTINGS old_parts_lifetime = 1, cleanup_delay_period = 0, cleanup_delay_period_random_add = 0;";
         sleep 0.$RANDOM;
         done
 }
diff --git a/tests/queries/0_stateless/01013_sync_replica_timeout_zookeeper.sh b/tests/queries/0_stateless/01013_sync_replica_timeout_zookeeper.sh
index 724caa7f414..89b178a38ea 100755
--- a/tests/queries/0_stateless/01013_sync_replica_timeout_zookeeper.sh
+++ b/tests/queries/0_stateless/01013_sync_replica_timeout_zookeeper.sh
@@ -4,7 +4,6 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-
 R1=table_1013_1
 R2=table_1013_2
 
@@ -12,8 +11,8 @@ ${CLICKHOUSE_CLIENT} -n -q "
     DROP TABLE IF EXISTS $R1;
     DROP TABLE IF EXISTS $R2;
 
-    CREATE TABLE $R1 (x UInt32) ENGINE ReplicatedMergeTree('/clickhouse/tables/${CLICKHOUSE_DATABASE}.table_1013', 'r1') ORDER BY x;
-    CREATE TABLE $R2 (x UInt32) ENGINE ReplicatedMergeTree('/clickhouse/tables/${CLICKHOUSE_DATABASE}.table_1013', 'r2') ORDER BY x;
+    CREATE TABLE $R1 (x UInt32) ENGINE ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/table_1013', 'r1') ORDER BY x;
+    CREATE TABLE $R2 (x UInt32) ENGINE ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/table_1013', 'r2') ORDER BY x;
 
     SYSTEM STOP FETCHES $R2;
     INSERT INTO $R1 VALUES (1)
diff --git a/tests/queries/0_stateless/01017_mutations_with_nondeterministic_functions_zookeeper.sh b/tests/queries/0_stateless/01017_mutations_with_nondeterministic_functions_zookeeper.sh
index d7d0dab71b9..a10e5fb2788 100755
--- a/tests/queries/0_stateless/01017_mutations_with_nondeterministic_functions_zookeeper.sh
+++ b/tests/queries/0_stateless/01017_mutations_with_nondeterministic_functions_zookeeper.sh
@@ -4,7 +4,6 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-
 R1=table_1017_1
 R2=table_1017_2
 T1=table_1017_merge
@@ -29,8 +28,8 @@ ${CLICKHOUSE_CLIENT} -n -q "
     CREATE TABLE lookup_table (y UInt32, y_new UInt32) ENGINE = Join(ANY, LEFT, y);
     INSERT INTO lookup_table VALUES(1,1001),(2,1002);
 
-    CREATE TABLE $R1 (x UInt32, y UInt32) ENGINE ReplicatedMergeTree('/clickhouse/tables/${CLICKHOUSE_DATABASE}.table_1017', 'r1') ORDER BY x;
-    CREATE TABLE $R2 (x UInt32, y UInt32) ENGINE ReplicatedMergeTree('/clickhouse/tables/${CLICKHOUSE_DATABASE}.table_1017', 'r2') ORDER BY x;
+    CREATE TABLE $R1 (x UInt32, y UInt32) ENGINE ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/table_1017', 'r1') ORDER BY x;
+    CREATE TABLE $R2 (x UInt32, y UInt32) ENGINE ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/table_1017', 'r2') ORDER BY x;
     CREATE TABLE $T1 (x UInt32, y UInt32) ENGINE MergeTree() ORDER BY x;
 
     INSERT INTO $R1 VALUES (0, 1)(1, 2)(2, 3)(3, 4);
diff --git a/tests/queries/0_stateless/01018_ip_dictionary.reference b/tests/queries/0_stateless/01018_ip_dictionary_long.reference
similarity index 100%
rename from tests/queries/0_stateless/01018_ip_dictionary.reference
rename to tests/queries/0_stateless/01018_ip_dictionary_long.reference
diff --git a/tests/queries/0_stateless/01018_ip_dictionary.sql b/tests/queries/0_stateless/01018_ip_dictionary_long.sql
similarity index 99%
rename from tests/queries/0_stateless/01018_ip_dictionary.sql
rename to tests/queries/0_stateless/01018_ip_dictionary_long.sql
index 5df1afcd559..2abd51cc9fe 100644
--- a/tests/queries/0_stateless/01018_ip_dictionary.sql
+++ b/tests/queries/0_stateless/01018_ip_dictionary_long.sql
@@ -41,6 +41,9 @@ SOURCE(CLICKHOUSE(host 'localhost' port 9000 user 'default' db 'database_for_dic
 LAYOUT(IP_TRIE())
 LIFETIME(MIN 10 MAX 100);
 
+-- fuzzer
+SELECT '127.0.0.0/24' = dictGetString('database_for_dict.dict_ipv4_trie', 'prefixprefixprefixprefix', tuple(IPv4StringToNum('127.0.0.0127.0.0.0'))); -- { serverError 36 }
+
 SELECT 0 == dictGetUInt32('database_for_dict.dict_ipv4_trie', 'asn', tuple(IPv4StringToNum('0.0.0.0')));
 SELECT 1 == dictGetUInt32('database_for_dict.dict_ipv4_trie', 'asn', tuple(IPv4StringToNum('128.0.0.0')));
 SELECT 2 == dictGetUInt32('database_for_dict.dict_ipv4_trie', 'asn', tuple(IPv4StringToNum('192.0.0.0')));
diff --git a/tests/queries/0_stateless/01034_move_partition_from_table_zookeeper.sh b/tests/queries/0_stateless/01034_move_partition_from_table_zookeeper.sh
index 11c7296932c..ae3dd7851c8 100755
--- a/tests/queries/0_stateless/01034_move_partition_from_table_zookeeper.sh
+++ b/tests/queries/0_stateless/01034_move_partition_from_table_zookeeper.sh
@@ -26,8 +26,8 @@ function query_with_retry
 $CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS src;"
 $CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS dst;"
 
-$CLICKHOUSE_CLIENT --query="CREATE TABLE src (p UInt64, k String, d UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/$CLICKHOUSE_DATABASE/src1', '1') PARTITION BY p ORDER BY k;"
-$CLICKHOUSE_CLIENT --query="CREATE TABLE dst (p UInt64, k String, d UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/$CLICKHOUSE_DATABASE/dst1', '1') PARTITION BY p ORDER BY k SETTINGS old_parts_lifetime=1, cleanup_delay_period=1, cleanup_delay_period_random_add=0;"
+$CLICKHOUSE_CLIENT --query="CREATE TABLE src (p UInt64, k String, d UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/src1', '1') PARTITION BY p ORDER BY k;"
+$CLICKHOUSE_CLIENT --query="CREATE TABLE dst (p UInt64, k String, d UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/dst1', '1') PARTITION BY p ORDER BY k SETTINGS old_parts_lifetime=1, cleanup_delay_period=1, cleanup_delay_period_random_add=0;"
 
 $CLICKHOUSE_CLIENT --query="INSERT INTO src VALUES (0, '0', 1);"
 $CLICKHOUSE_CLIENT --query="INSERT INTO src VALUES (1, '0', 1);"
@@ -56,8 +56,8 @@ $CLICKHOUSE_CLIENT --query="DROP TABLE dst;"
 
 $CLICKHOUSE_CLIENT --query="SELECT 'MOVE incompatible schema missing column';"
 
-$CLICKHOUSE_CLIENT --query="CREATE TABLE src (p UInt64, k String, d UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/$CLICKHOUSE_DATABASE/src2', '1') PARTITION BY p ORDER BY (d, p);"
-$CLICKHOUSE_CLIENT --query="CREATE TABLE dst (p UInt64, d UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/$CLICKHOUSE_DATABASE/dst2', '1') PARTITION BY p ORDER BY (d, p) SETTINGS old_parts_lifetime=1, cleanup_delay_period=1, cleanup_delay_period_random_add=0;"
+$CLICKHOUSE_CLIENT --query="CREATE TABLE src (p UInt64, k String, d UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/src2', '1') PARTITION BY p ORDER BY (d, p);"
+$CLICKHOUSE_CLIENT --query="CREATE TABLE dst (p UInt64, d UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/dst2', '1') PARTITION BY p ORDER BY (d, p) SETTINGS old_parts_lifetime=1, cleanup_delay_period=1, cleanup_delay_period_random_add=0;"
 
 $CLICKHOUSE_CLIENT --query="INSERT INTO src VALUES (0, '0', 1);"
 $CLICKHOUSE_CLIENT --query="INSERT INTO src VALUES (1, '0', 1);"
@@ -75,8 +75,8 @@ $CLICKHOUSE_CLIENT --query="DROP TABLE dst;"
 
 $CLICKHOUSE_CLIENT --query="SELECT 'MOVE incompatible schema different order by';"
 
-$CLICKHOUSE_CLIENT --query="CREATE TABLE src (p UInt64, k String, d UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/$CLICKHOUSE_DATABASE/src3', '1') PARTITION BY p ORDER BY (p, k, d);"
-$CLICKHOUSE_CLIENT --query="CREATE TABLE dst (p UInt64, k String, d UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/$CLICKHOUSE_DATABASE/dst3', '1') PARTITION BY p ORDER BY (d, k, p);"
+$CLICKHOUSE_CLIENT --query="CREATE TABLE src (p UInt64, k String, d UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/$CURR_DATABASE/src3', '1') PARTITION BY p ORDER BY (p, k, d);"
+$CLICKHOUSE_CLIENT --query="CREATE TABLE dst (p UInt64, k String, d UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/$CURR_DATABASE/dst3', '1') PARTITION BY p ORDER BY (d, k, p);"
 
 
 $CLICKHOUSE_CLIENT --query="INSERT INTO src VALUES (0, '0', 1);"
diff --git a/tests/queries/0_stateless/01035_concurrent_move_partition_from_table_zookeeper.sh b/tests/queries/0_stateless/01035_concurrent_move_partition_from_table_zookeeper.sh
index 4eb3cb9a7bd..7c15b795c36 100755
--- a/tests/queries/0_stateless/01035_concurrent_move_partition_from_table_zookeeper.sh
+++ b/tests/queries/0_stateless/01035_concurrent_move_partition_from_table_zookeeper.sh
@@ -9,8 +9,8 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 $CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS src;"
 $CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS dst;"
 
-$CLICKHOUSE_CLIENT --query="CREATE TABLE src (p UInt64, k String) ENGINE = ReplicatedMergeTree('/clickhouse/$CLICKHOUSE_DATABASE/src', '1') PARTITION BY p ORDER BY k;"
-$CLICKHOUSE_CLIENT --query="CREATE TABLE dst (p UInt64, k String) ENGINE = ReplicatedMergeTree('/clickhouse/$CLICKHOUSE_DATABASE/dst', '1') PARTITION BY p ORDER BY k SETTINGS old_parts_lifetime=1, cleanup_delay_period=1, cleanup_delay_period_random_add=0;"
+$CLICKHOUSE_CLIENT --query="CREATE TABLE src (p UInt64, k String) ENGINE = ReplicatedMergeTree('/clickhouse/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/src', '1') PARTITION BY p ORDER BY k;"
+$CLICKHOUSE_CLIENT --query="CREATE TABLE dst (p UInt64, k String) ENGINE = ReplicatedMergeTree('/clickhouse/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/dst', '1') PARTITION BY p ORDER BY k SETTINGS old_parts_lifetime=1, cleanup_delay_period=1, cleanup_delay_period_random_add=0;"
 
 function thread1()
 {
diff --git a/tests/queries/0_stateless/01035_lc_empty_part_bug.sh b/tests/queries/0_stateless/01035_lc_empty_part_bug.sh
index b65cf87d1ca..185c4ef4a4e 100755
--- a/tests/queries/0_stateless/01035_lc_empty_part_bug.sh
+++ b/tests/queries/0_stateless/01035_lc_empty_part_bug.sh
@@ -8,7 +8,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 ${CLICKHOUSE_CLIENT} --multiquery --query="
     DROP TABLE IF EXISTS lc_empty_part_bug;
-    create table lc_empty_part_bug (id  UInt64, s String) Engine=MergeTree ORDER BY id;
+    create table lc_empty_part_bug (id  UInt64, s String) Engine=MergeTree ORDER BY id SETTINGS number_of_free_entries_in_pool_to_execute_mutation=0;
     insert into lc_empty_part_bug select number as id, toString(rand()) from numbers(100);
     alter table lc_empty_part_bug delete where id < 100;
 " --mutations_sync=1
diff --git a/tests/queries/0_stateless/00411_long_accurate_number_comparison_float.sh b/tests/queries/0_stateless/01039_row_policy_dcl.sh
similarity index 50%
rename from tests/queries/0_stateless/00411_long_accurate_number_comparison_float.sh
rename to tests/queries/0_stateless/01039_row_policy_dcl.sh
index d03e02efc55..8c2249f2981 100755
--- a/tests/queries/0_stateless/00411_long_accurate_number_comparison_float.sh
+++ b/tests/queries/0_stateless/01039_row_policy_dcl.sh
@@ -4,6 +4,4 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-# We should have correct env vars from shell_config.sh to run this test
-
-python3 "$CURDIR"/00411_long_accurate_number_comparison.python float
+${CLICKHOUSE_CLIENT} -q "SHOW POLICIES ON $CLICKHOUSE_DATABASE.*"
diff --git a/tests/queries/0_stateless/01039_row_policy_dcl.sql b/tests/queries/0_stateless/01039_row_policy_dcl.sql
deleted file mode 100644
index 14742a72914..00000000000
--- a/tests/queries/0_stateless/01039_row_policy_dcl.sql
+++ /dev/null
@@ -1 +0,0 @@
-SHOW POLICIES;
diff --git a/tests/queries/0_stateless/01045_zookeeper_system_mutations_with_parts_names.sh b/tests/queries/0_stateless/01045_zookeeper_system_mutations_with_parts_names.sh
index c035a692d12..6510fcf408d 100755
--- a/tests/queries/0_stateless/01045_zookeeper_system_mutations_with_parts_names.sh
+++ b/tests/queries/0_stateless/01045_zookeeper_system_mutations_with_parts_names.sh
@@ -47,7 +47,7 @@ ${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS table_for_mutations"
 
 ${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS replicated_table_for_mutations"
 
-${CLICKHOUSE_CLIENT} --query="CREATE TABLE replicated_table_for_mutations(k UInt32, v1 UInt64) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_01045/replicated_table_for_mutations', '1') ORDER BY k PARTITION BY modulo(k, 2)"
+${CLICKHOUSE_CLIENT} --query="CREATE TABLE replicated_table_for_mutations(k UInt32, v1 UInt64) ENGINE ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/replicated_table_for_mutations', '1') ORDER BY k PARTITION BY modulo(k, 2)"
 
 ${CLICKHOUSE_CLIENT} --query="SYSTEM STOP MERGES replicated_table_for_mutations"
 
diff --git a/tests/queries/0_stateless/01053_ssd_dictionary.sql b/tests/queries/0_stateless/01053_ssd_dictionary.sql
index cd4ce95802f..23a369cc8a6 100644
--- a/tests/queries/0_stateless/01053_ssd_dictionary.sql
+++ b/tests/queries/0_stateless/01053_ssd_dictionary.sql
@@ -1,12 +1,12 @@
 SET send_logs_level = 'none';
 
-DROP DATABASE IF EXISTS database_for_dict;
+DROP DATABASE IF EXISTS 01053_db;
 
-CREATE DATABASE database_for_dict Engine = Ordinary;
+CREATE DATABASE 01053_db Engine = Ordinary;
 
-DROP TABLE IF EXISTS database_for_dict.table_for_dict;
+DROP TABLE IF EXISTS 01053_db.table_for_dict;
 
-CREATE TABLE database_for_dict.table_for_dict
+CREATE TABLE 01053_db.table_for_dict
 (
   id UInt64,
   a UInt64,
@@ -16,16 +16,16 @@ CREATE TABLE database_for_dict.table_for_dict
 ENGINE = MergeTree()
 ORDER BY id;
 
-INSERT INTO database_for_dict.table_for_dict VALUES (1, 100, -100, 'clickhouse'), (2, 3, 4, 'database'), (5, 6, 7, 'columns'), (10, 9, 8, '');
-INSERT INTO database_for_dict.table_for_dict SELECT number, 0, -1, 'a' FROM system.numbers WHERE number NOT IN (1, 2, 5, 10) LIMIT 370;
-INSERT INTO database_for_dict.table_for_dict SELECT number, 0, -1, 'b' FROM system.numbers WHERE number NOT IN (1, 2, 5, 10) LIMIT 370, 370;
-INSERT INTO database_for_dict.table_for_dict SELECT number, 0, -1, 'c' FROM system.numbers WHERE number NOT IN (1, 2, 5, 10) LIMIT 700, 370;
+INSERT INTO 01053_db.table_for_dict VALUES (1, 100, -100, 'clickhouse'), (2, 3, 4, 'database'), (5, 6, 7, 'columns'), (10, 9, 8, '');
+INSERT INTO 01053_db.table_for_dict SELECT number, 0, -1, 'a' FROM system.numbers WHERE number NOT IN (1, 2, 5, 10) LIMIT 370;
+INSERT INTO 01053_db.table_for_dict SELECT number, 0, -1, 'b' FROM system.numbers WHERE number NOT IN (1, 2, 5, 10) LIMIT 370, 370;
+INSERT INTO 01053_db.table_for_dict SELECT number, 0, -1, 'c' FROM system.numbers WHERE number NOT IN (1, 2, 5, 10) LIMIT 700, 370;
 
-DROP DICTIONARY IF EXISTS database_for_dict.ssd_dict;
+DROP DICTIONARY IF EXISTS 01053_db.ssd_dict;
 
 -- FIXME filesystem error: in create_directory: Permission denied [/var/lib/clickhouse]
 -- Probably we need rewrite it to integration test
-CREATE DICTIONARY database_for_dict.ssd_dict
+CREATE DICTIONARY 01053_db.ssd_dict
 (
     id UInt64,
     a UInt64 DEFAULT 0,
@@ -33,40 +33,40 @@ CREATE DICTIONARY database_for_dict.ssd_dict
     c String DEFAULT 'none'
 )
 PRIMARY KEY id
-SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'table_for_dict' PASSWORD '' DB 'database_for_dict'))
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'table_for_dict' PASSWORD '' DB '01053_db'))
 LIFETIME(MIN 1000 MAX 2000)
 LAYOUT(SSD_CACHE(FILE_SIZE 8192 PATH '/var/lib/clickhouse/clickhouse_dicts/0d'));
 
 SELECT 'TEST_SMALL';
-SELECT dictGetInt32('database_for_dict.ssd_dict', 'b', toUInt64(1));
-SELECT dictGetInt32('database_for_dict.ssd_dict', 'b', toUInt64(4));
-SELECT dictGetUInt64('database_for_dict.ssd_dict', 'a', toUInt64(5));
-SELECT dictGetUInt64('database_for_dict.ssd_dict', 'a', toUInt64(6));
-SELECT dictGetString('database_for_dict.ssd_dict', 'c', toUInt64(2));
-SELECT dictGetString('database_for_dict.ssd_dict', 'c', toUInt64(3));
+SELECT dictGetInt32('01053_db.ssd_dict', 'b', toUInt64(1));
+SELECT dictGetInt32('01053_db.ssd_dict', 'b', toUInt64(4));
+SELECT dictGetUInt64('01053_db.ssd_dict', 'a', toUInt64(5));
+SELECT dictGetUInt64('01053_db.ssd_dict', 'a', toUInt64(6));
+SELECT dictGetString('01053_db.ssd_dict', 'c', toUInt64(2));
+SELECT dictGetString('01053_db.ssd_dict', 'c', toUInt64(3));
 
-SELECT * FROM database_for_dict.ssd_dict ORDER BY id;
-DROP DICTIONARY database_for_dict.ssd_dict;
+SELECT * FROM 01053_db.ssd_dict ORDER BY id;
+DROP DICTIONARY 01053_db.ssd_dict;
 
-DROP TABLE IF EXISTS database_for_dict.keys_table;
+DROP TABLE IF EXISTS 01053_db.keys_table;
 
-CREATE TABLE database_for_dict.keys_table
+CREATE TABLE 01053_db.keys_table
 (
   id UInt64
 )
 ENGINE = StripeLog();
 
-INSERT INTO database_for_dict.keys_table VALUES (1);
-INSERT INTO database_for_dict.keys_table SELECT 11 + intHash64(number) % 1200 FROM system.numbers LIMIT 370;
-INSERT INTO database_for_dict.keys_table VALUES (2);
-INSERT INTO database_for_dict.keys_table SELECT 11 + intHash64(number) % 1200 FROM system.numbers LIMIT 370, 370;
-INSERT INTO database_for_dict.keys_table VALUES (5);
-INSERT INTO database_for_dict.keys_table SELECT 11 + intHash64(number) % 1200 FROM system.numbers LIMIT 700, 370;
-INSERT INTO database_for_dict.keys_table VALUES (10);
+INSERT INTO 01053_db.keys_table VALUES (1);
+INSERT INTO 01053_db.keys_table SELECT 11 + intHash64(number) % 1200 FROM system.numbers LIMIT 370;
+INSERT INTO 01053_db.keys_table VALUES (2);
+INSERT INTO 01053_db.keys_table SELECT 11 + intHash64(number) % 1200 FROM system.numbers LIMIT 370, 370;
+INSERT INTO 01053_db.keys_table VALUES (5);
+INSERT INTO 01053_db.keys_table SELECT 11 + intHash64(number) % 1200 FROM system.numbers LIMIT 700, 370;
+INSERT INTO 01053_db.keys_table VALUES (10);
 
-DROP DICTIONARY IF EXISTS database_for_dict.ssd_dict;
+DROP DICTIONARY IF EXISTS 01053_db.ssd_dict;
 
-CREATE DICTIONARY database_for_dict.ssd_dict
+CREATE DICTIONARY 01053_db.ssd_dict
 (
     id UInt64,
     a UInt64 DEFAULT 0,
@@ -74,86 +74,86 @@ CREATE DICTIONARY database_for_dict.ssd_dict
     c String DEFAULT 'none'
 )
 PRIMARY KEY id
-SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'table_for_dict' PASSWORD '' DB 'database_for_dict'))
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'table_for_dict' PASSWORD '' DB '01053_db'))
 LIFETIME(MIN 1000 MAX 2000)
-LAYOUT(SSD_CACHE(FILE_SIZE 8192 PATH '/var/lib/clickhouse/clickhouse_dicts/1d' BLOCK_SIZE 512 WRITE_BUFFER_SIZE 4096 MAX_STORED_KEYS 1000000));
+LAYOUT(SSD_CACHE(FILE_SIZE 8192 PATH '/var/lib/clickhouse/clickhouse_dicts/1d' BLOCK_SIZE 512 WRITE_BUFFER_SIZE 4096));
 
 SELECT 'UPDATE DICTIONARY';
 -- 118
-SELECT sum(dictGetUInt64('database_for_dict.ssd_dict', 'a', toUInt64(id))) FROM database_for_dict.keys_table;
+SELECT sum(dictGetUInt64('01053_db.ssd_dict', 'a', toUInt64(id))) FROM 01053_db.keys_table;
 
 SELECT 'VALUE FROM DISK';
 -- -100
-SELECT dictGetInt32('database_for_dict.ssd_dict', 'b', toUInt64(1));
+SELECT dictGetInt32('01053_db.ssd_dict', 'b', toUInt64(1));
 
 -- 'clickhouse'
-SELECT dictGetString('database_for_dict.ssd_dict', 'c', toUInt64(1));
+SELECT dictGetString('01053_db.ssd_dict', 'c', toUInt64(1));
 
 SELECT 'VALUE FROM RAM BUFFER';
 -- 8
-SELECT dictGetInt32('database_for_dict.ssd_dict', 'b', toUInt64(10));
+SELECT dictGetInt32('01053_db.ssd_dict', 'b', toUInt64(10));
 
 -- ''
-SELECT dictGetString('database_for_dict.ssd_dict', 'c', toUInt64(10));
+SELECT dictGetString('01053_db.ssd_dict', 'c', toUInt64(10));
 
 SELECT 'VALUES FROM DISK AND RAM BUFFER';
 -- 118
-SELECT sum(dictGetUInt64('database_for_dict.ssd_dict', 'a', toUInt64(id))) FROM database_for_dict.keys_table;
+SELECT sum(dictGetUInt64('01053_db.ssd_dict', 'a', toUInt64(id))) FROM 01053_db.keys_table;
 
 SELECT 'HAS';
 -- 1006
-SELECT count() FROM database_for_dict.keys_table WHERE dictHas('database_for_dict.ssd_dict', toUInt64(id));
+SELECT count() FROM 01053_db.keys_table WHERE dictHas('01053_db.ssd_dict', toUInt64(id));
 
 SELECT 'VALUES NOT FROM TABLE';
 -- 0 -1 none
-SELECT dictGetUInt64('database_for_dict.ssd_dict', 'a', toUInt64(1000000)), dictGetInt32('database_for_dict.ssd_dict', 'b', toUInt64(1000000)), dictGetString('database_for_dict.ssd_dict', 'c', toUInt64(1000000));
-SELECT dictGetUInt64('database_for_dict.ssd_dict', 'a', toUInt64(1000000)), dictGetInt32('database_for_dict.ssd_dict', 'b', toUInt64(1000000)), dictGetString('database_for_dict.ssd_dict', 'c', toUInt64(1000000));
+SELECT dictGetUInt64('01053_db.ssd_dict', 'a', toUInt64(1000000)), dictGetInt32('01053_db.ssd_dict', 'b', toUInt64(1000000)), dictGetString('01053_db.ssd_dict', 'c', toUInt64(1000000));
+SELECT dictGetUInt64('01053_db.ssd_dict', 'a', toUInt64(1000000)), dictGetInt32('01053_db.ssd_dict', 'b', toUInt64(1000000)), dictGetString('01053_db.ssd_dict', 'c', toUInt64(1000000));
 
 SELECT 'DUPLICATE KEYS';
-SELECT arrayJoin([1, 2, 3, 3, 2, 1]) AS id, dictGetInt32('database_for_dict.ssd_dict', 'b', toUInt64(id));
+SELECT arrayJoin([1, 2, 3, 3, 2, 1]) AS id, dictGetInt32('01053_db.ssd_dict', 'b', toUInt64(id));
 --SELECT
-DROP DICTIONARY IF EXISTS database_for_dict.ssd_dict;
+DROP DICTIONARY IF EXISTS 01053_db.ssd_dict;
 
-DROP TABLE IF EXISTS database_for_dict.keys_table;
+DROP TABLE IF EXISTS 01053_db.keys_table;
 
-CREATE TABLE database_for_dict.keys_table
+CREATE TABLE 01053_db.keys_table
 (
   id UInt64
 )
 ENGINE = MergeTree()
 ORDER BY id;
 
-INSERT INTO database_for_dict.keys_table VALUES (1);
-INSERT INTO database_for_dict.keys_table SELECT intHash64(number) FROM system.numbers LIMIT 370;
-INSERT INTO database_for_dict.keys_table VALUES (2);
-INSERT INTO database_for_dict.keys_table SELECT intHash64(number) FROM system.numbers LIMIT 370, 370;
-INSERT INTO database_for_dict.keys_table VALUES (5);
-INSERT INTO database_for_dict.keys_table SELECT intHash64(number) FROM system.numbers LIMIT 700, 370;
-INSERT INTO database_for_dict.keys_table VALUES (10);
+INSERT INTO 01053_db.keys_table VALUES (1);
+INSERT INTO 01053_db.keys_table SELECT intHash64(number) FROM system.numbers LIMIT 370;
+INSERT INTO 01053_db.keys_table VALUES (2);
+INSERT INTO 01053_db.keys_table SELECT intHash64(number) FROM system.numbers LIMIT 370, 370;
+INSERT INTO 01053_db.keys_table VALUES (5);
+INSERT INTO 01053_db.keys_table SELECT intHash64(number) FROM system.numbers LIMIT 700, 370;
+INSERT INTO 01053_db.keys_table VALUES (10);
 
-OPTIMIZE TABLE database_for_dict.keys_table;
+OPTIMIZE TABLE 01053_db.keys_table;
 
-CREATE DICTIONARY database_for_dict.ssd_dict
+CREATE DICTIONARY 01053_db.ssd_dict
 (
     id UInt64,
     a UInt64 DEFAULT 0,
     b Int32 DEFAULT -1
 )
 PRIMARY KEY id
-SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'table_for_dict' PASSWORD '' DB 'database_for_dict'))
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'table_for_dict' PASSWORD '' DB '01053_db'))
 LIFETIME(MIN 1000 MAX 2000)
-LAYOUT(SSD_CACHE(FILE_SIZE 8192 PATH '/var/lib/clickhouse/clickhouse_dicts/2d' BLOCK_SIZE 512 WRITE_BUFFER_SIZE 1024 MAX_STORED_KEYS 10));
+LAYOUT(SSD_CACHE(FILE_SIZE 8192 PATH '/var/lib/clickhouse/clickhouse_dicts/2d' BLOCK_SIZE 512 WRITE_BUFFER_SIZE 1024));
 
 SELECT 'UPDATE DICTIONARY (MT)';
 -- 118
-SELECT sum(dictGetUInt64('database_for_dict.ssd_dict', 'a', toUInt64(id))) FROM database_for_dict.keys_table;
+SELECT sum(dictGetUInt64('01053_db.ssd_dict', 'a', toUInt64(id))) FROM 01053_db.keys_table;
 
 SELECT 'VALUES FROM DISK AND RAM BUFFER (MT)';
 -- 118
-SELECT sum(dictGetUInt64('database_for_dict.ssd_dict', 'a', toUInt64(id))) FROM database_for_dict.keys_table;
+SELECT sum(dictGetUInt64('01053_db.ssd_dict', 'a', toUInt64(id))) FROM 01053_db.keys_table;
 
-DROP DICTIONARY IF EXISTS database_for_dict.ssd_dict;
+DROP DICTIONARY IF EXISTS 01053_db.ssd_dict;
 
-DROP TABLE IF EXISTS database_for_dict.table_for_dict;
+DROP TABLE IF EXISTS 01053_db.table_for_dict;
 
-DROP DATABASE IF EXISTS database_for_dict;
+DROP DATABASE IF EXISTS 01053_db;
diff --git a/tests/queries/0_stateless/01057_http_compression_prefer_brotli.sh b/tests/queries/0_stateless/01057_http_compression_prefer_brotli.sh
index e5f4d12ee18..22ab745d7c0 100755
--- a/tests/queries/0_stateless/01057_http_compression_prefer_brotli.sh
+++ b/tests/queries/0_stateless/01057_http_compression_prefer_brotli.sh
@@ -11,3 +11,4 @@ ${CLICKHOUSE_CURL} -sS -H 'Accept-Encoding: gzip,deflate,br' "${CLICKHOUSE_URL}&
 ${CLICKHOUSE_CURL} -sS -H 'Accept-Encoding: gzip,deflate'    "${CLICKHOUSE_URL}&enable_http_compression=1" -d 'SELECT 1' | gzip -d
 ${CLICKHOUSE_CURL} -sS -H 'Accept-Encoding: gzip'            "${CLICKHOUSE_URL}&enable_http_compression=1" -d 'SELECT number FROM numbers(1000000)' | gzip -d | tail -n3
 ${CLICKHOUSE_CURL} -sS -H 'Accept-Encoding: br'              "${CLICKHOUSE_URL}&enable_http_compression=1" -d 'SELECT number FROM numbers(1000000)' | brotli -d | tail -n3
+
diff --git a/tests/queries/0_stateless/01076_parallel_alter_replicated_zookeeper.sh b/tests/queries/0_stateless/01076_parallel_alter_replicated_zookeeper.sh
index ca453ee8f0d..efe518046a1 100755
--- a/tests/queries/0_stateless/01076_parallel_alter_replicated_zookeeper.sh
+++ b/tests/queries/0_stateless/01076_parallel_alter_replicated_zookeeper.sh
@@ -20,7 +20,7 @@ for i in $(seq $REPLICAS); do
 done
 
 for i in $(seq $REPLICAS); do
-    $CLICKHOUSE_CLIENT --query "CREATE TABLE concurrent_mutate_mt_$i (key UInt64, value1 UInt64, value2 String) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_01076/concurrent_mutate_mt', '$i') ORDER BY key SETTINGS max_replicated_mutations_in_queue=1000, number_of_free_entries_in_pool_to_execute_mutation=0,max_replicated_merges_in_queue=1000,temporary_directories_lifetime=10,cleanup_delay_period=3,cleanup_delay_period_random_add=0"
+    $CLICKHOUSE_CLIENT --query "CREATE TABLE concurrent_mutate_mt_$i (key UInt64, value1 UInt64, value2 String) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/concurrent_mutate_mt', '$i') ORDER BY key SETTINGS max_replicated_mutations_in_queue=1000, number_of_free_entries_in_pool_to_execute_mutation=0,max_replicated_merges_in_queue=1000,temporary_directories_lifetime=10,cleanup_delay_period=3,cleanup_delay_period_random_add=0"
 done
 
 $CLICKHOUSE_CLIENT --query "INSERT INTO concurrent_mutate_mt_1 SELECT number, number + 10, toString(number) from numbers(10)"
diff --git a/tests/queries/0_stateless/01079_bad_alters_zookeeper.reference b/tests/queries/0_stateless/01079_bad_alters_zookeeper_long.reference
similarity index 52%
rename from tests/queries/0_stateless/01079_bad_alters_zookeeper.reference
rename to tests/queries/0_stateless/01079_bad_alters_zookeeper_long.reference
index ebefe4b2a29..731cd871b3b 100644
--- a/tests/queries/0_stateless/01079_bad_alters_zookeeper.reference
+++ b/tests/queries/0_stateless/01079_bad_alters_zookeeper_long.reference
@@ -1,6 +1,6 @@
 Wrong column name.
-CREATE TABLE default.table_for_bad_alters\n(\n    `key` UInt64,\n    `value1` UInt8,\n    `value2` String\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_01079/table_for_bad_alters\', \'1\')\nORDER BY key\nSETTINGS index_granularity = 8192
-CREATE TABLE default.table_for_bad_alters\n(\n    `key` UInt64,\n    `value1` UInt8,\n    `value2` UInt32\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_01079/table_for_bad_alters\', \'1\')\nORDER BY key\nSETTINGS index_granularity = 8192
+CREATE TABLE default.table_for_bad_alters\n(\n    `key` UInt64,\n    `value1` UInt8,\n    `value2` String\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/01079_bad_alters_zookeeper_long_default/table_for_bad_alters\', \'1\')\nORDER BY key\nSETTINGS index_granularity = 8192
+CREATE TABLE default.table_for_bad_alters\n(\n    `key` UInt64,\n    `value1` UInt8,\n    `value2` UInt32\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/01079_bad_alters_zookeeper_long_default/table_for_bad_alters\', \'1\')\nORDER BY key\nSETTINGS index_granularity = 8192
 syntax error at begin of string.
 7
 Hello
diff --git a/tests/queries/0_stateless/01079_bad_alters_zookeeper.sh b/tests/queries/0_stateless/01079_bad_alters_zookeeper_long.sh
similarity index 90%
rename from tests/queries/0_stateless/01079_bad_alters_zookeeper.sh
rename to tests/queries/0_stateless/01079_bad_alters_zookeeper_long.sh
index 1c0206453b7..6e79be90046 100755
--- a/tests/queries/0_stateless/01079_bad_alters_zookeeper.sh
+++ b/tests/queries/0_stateless/01079_bad_alters_zookeeper_long.sh
@@ -10,7 +10,7 @@ $CLICKHOUSE_CLIENT -n --query "CREATE TABLE table_for_bad_alters (
     key UInt64,
     value1 UInt8,
     value2 String
-) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_01079/table_for_bad_alters', '1')
+) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/table_for_bad_alters', '1')
 ORDER BY key;"
 
 $CLICKHOUSE_CLIENT --query "INSERT INTO table_for_bad_alters VALUES(1, 1, 'Hello');"
@@ -21,7 +21,7 @@ $CLICKHOUSE_CLIENT --query "ALTER TABLE table_for_bad_alters MODIFY COLUMN value
 
 sleep 2
 
-while [[ $($CLICKHOUSE_CLIENT --query "KILL MUTATION WHERE mutation_id='0000000000'" 2>&1) ]]; do
+while [[ $($CLICKHOUSE_CLIENT --query "KILL MUTATION WHERE mutation_id='0000000000' and database = '$CLICKHOUSE_DATABASE'" 2>&1) ]]; do
     sleep 1
 done
 
diff --git a/tests/queries/0_stateless/01079_parallel_alter_add_drop_column_zookeeper.sh b/tests/queries/0_stateless/01079_parallel_alter_add_drop_column_zookeeper.sh
index b3a5de8f9bc..7a3e3cf155f 100755
--- a/tests/queries/0_stateless/01079_parallel_alter_add_drop_column_zookeeper.sh
+++ b/tests/queries/0_stateless/01079_parallel_alter_add_drop_column_zookeeper.sh
@@ -12,7 +12,7 @@ done
 
 
 for i in $(seq $REPLICAS); do
-    $CLICKHOUSE_CLIENT --query "CREATE TABLE concurrent_alter_add_drop_$i (key UInt64, value0 UInt8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_01079/concurrent_alter_add_drop_column', '$i') ORDER BY key SETTINGS max_replicated_mutations_in_queue=1000, number_of_free_entries_in_pool_to_execute_mutation=0,max_replicated_merges_in_queue=1000"
+    $CLICKHOUSE_CLIENT --query "CREATE TABLE concurrent_alter_add_drop_$i (key UInt64, value0 UInt8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/concurrent_alter_add_drop_column', '$i') ORDER BY key SETTINGS max_replicated_mutations_in_queue=1000, number_of_free_entries_in_pool_to_execute_mutation=0,max_replicated_merges_in_queue=1000"
 done
 
 $CLICKHOUSE_CLIENT --query "INSERT INTO concurrent_alter_add_drop_1 SELECT number, number + 10 from numbers(100000)"
diff --git a/tests/queries/0_stateless/01079_parallel_alter_detach_table_zookeeper.sh b/tests/queries/0_stateless/01079_parallel_alter_detach_table_zookeeper.sh
index d5f0c987e5d..83f3196253a 100755
--- a/tests/queries/0_stateless/01079_parallel_alter_detach_table_zookeeper.sh
+++ b/tests/queries/0_stateless/01079_parallel_alter_detach_table_zookeeper.sh
@@ -11,7 +11,7 @@ for i in $(seq $REPLICAS); do
 done
 
 for i in $(seq $REPLICAS); do
-    $CLICKHOUSE_CLIENT --query "CREATE TABLE concurrent_alter_detach_$i (key UInt64, value1 UInt8, value2 UInt8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_01079/concurrent_alter_detach', '$i') ORDER BY key SETTINGS max_replicated_mutations_in_queue=1000, number_of_free_entries_in_pool_to_execute_mutation=0,max_replicated_merges_in_queue=1000,temporary_directories_lifetime=10,cleanup_delay_period=3,cleanup_delay_period_random_add=0"
+    $CLICKHOUSE_CLIENT --query "CREATE TABLE concurrent_alter_detach_$i (key UInt64, value1 UInt8, value2 UInt8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/concurrent_alter_detach', '$i') ORDER BY key SETTINGS max_replicated_mutations_in_queue=1000, number_of_free_entries_in_pool_to_execute_mutation=0,max_replicated_merges_in_queue=1000,temporary_directories_lifetime=10,cleanup_delay_period=3,cleanup_delay_period_random_add=0"
 done
 
 $CLICKHOUSE_CLIENT --query "INSERT INTO concurrent_alter_detach_1 SELECT number, number + 10, number from numbers(10)"
diff --git a/tests/queries/0_stateless/01079_parallel_alter_modify_zookeeper.reference b/tests/queries/0_stateless/01079_parallel_alter_modify_zookeeper_long.reference
similarity index 100%
rename from tests/queries/0_stateless/01079_parallel_alter_modify_zookeeper.reference
rename to tests/queries/0_stateless/01079_parallel_alter_modify_zookeeper_long.reference
diff --git a/tests/queries/0_stateless/01079_parallel_alter_modify_zookeeper.sh b/tests/queries/0_stateless/01079_parallel_alter_modify_zookeeper_long.sh
similarity index 94%
rename from tests/queries/0_stateless/01079_parallel_alter_modify_zookeeper.sh
rename to tests/queries/0_stateless/01079_parallel_alter_modify_zookeeper_long.sh
index 5b14c5a8543..9cca73b5eef 100755
--- a/tests/queries/0_stateless/01079_parallel_alter_modify_zookeeper.sh
+++ b/tests/queries/0_stateless/01079_parallel_alter_modify_zookeeper_long.sh
@@ -11,7 +11,7 @@ for i in $(seq $REPLICAS); do
 done
 
 for i in $(seq $REPLICAS); do
-    $CLICKHOUSE_CLIENT --query "CREATE TABLE concurrent_alter_mt_$i (key UInt64, value1 UInt64, value2 Int32) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_01079/concurrent_alter_mt', '$i') ORDER BY key SETTINGS max_replicated_mutations_in_queue=1000, number_of_free_entries_in_pool_to_execute_mutation=0,max_replicated_merges_in_queue=1000"
+    $CLICKHOUSE_CLIENT --query "CREATE TABLE concurrent_alter_mt_$i (key UInt64, value1 UInt64, value2 Int32) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/concurrent_alter_mt', '$i') ORDER BY key SETTINGS max_replicated_mutations_in_queue=1000, number_of_free_entries_in_pool_to_execute_mutation=0,max_replicated_merges_in_queue=1000"
 done
 
 $CLICKHOUSE_CLIENT --query "INSERT INTO concurrent_alter_mt_1 SELECT number, number + 10, number from numbers(10)"
diff --git a/tests/queries/0_stateless/01087_table_function_generate.reference b/tests/queries/0_stateless/01087_table_function_generate.reference
index d7cc6b0a933..d8886945caa 100644
--- a/tests/queries/0_stateless/01087_table_function_generate.reference
+++ b/tests/queries/0_stateless/01087_table_function_generate.reference
@@ -1,14 +1,14 @@
 UInt64	Int64	UInt32	Int32	UInt16	Int16	UInt8	Int8
-2804162938822577320	-2776833771540858	3467776823	1163715250	31161	-2916	220	-117
-7885388429666205427	-1363628932535403038	484159052	-308788249	43346	13638	143	-105
-4357435422797280898	1355609803008819271	4126129912	-852056475	34184	9166	49	33
-5935810273536892891	-804738887697332962	3109335413	-80126721	47877	-31421	186	-77
-368066018677693974	-4927165984347126295	1015254922	2026080544	46037	-29626	240	108
-8124171311239967992	-1179703908046100129	1720727300	-138469036	33028	-12819	138	16
-15657812979985370729	-5733276247123822513	3254757884	-500590428	3829	30527	3	-81
-18371568619324220532	-6793779541583578394	1686821450	-455892108	43475	2284	252	-90
-821735343441964030	3148260644406230976	256251035	-885069056	11643	11455	176	90
-9558594037060121162	-2907172753635797124	4276198376	1947296644	45922	26632	97	43
+2804162938822577320	-2776833771540858	3467776823	1163715250	23903	-2916	220	-117
+7885388429666205427	-1363628932535403038	484159052	-308788249	44305	13638	143	-105
+4357435422797280898	1355609803008819271	4126129912	-852056475	58858	9166	49	33
+5935810273536892891	-804738887697332962	3109335413	-80126721	13655	-31421	186	-77
+368066018677693974	-4927165984347126295	1015254922	2026080544	21973	-29626	240	108
+8124171311239967992	-1179703908046100129	1720727300	-138469036	36175	-12819	138	16
+15657812979985370729	-5733276247123822513	3254757884	-500590428	13193	30527	3	-81
+18371568619324220532	-6793779541583578394	1686821450	-455892108	52282	2284	252	-90
+821735343441964030	3148260644406230976	256251035	-885069056	55255	11455	176	90
+9558594037060121162	-2907172753635797124	4276198376	1947296644	48701	26632	97	43
 -
 Enum8(\'hello\' = 1, \'world\' = 5)
 hello
@@ -47,16 +47,16 @@ h
 o
 -
 Date	DateTime	DateTime(\'Europe/Moscow\')
-2077-09-17	1970-10-09 02:30:14	2074-08-12 11:31:27
-2005-11-19	2106-01-30 21:52:44	2097-05-25 07:54:35
-2007-02-24	2096-12-12 00:40:50	1988-08-10 11:16:31
-2019-06-30	2096-01-15 16:31:33	2063-10-20 08:48:17
-2039-01-16	2103-02-11 16:44:39	2036-10-09 04:29:10
-1994-11-03	1980-01-02 05:18:22	2055-12-23 12:33:52
-2083-08-20	2079-06-11 16:29:02	2000-12-05 17:46:24
-2030-06-25	2100-03-01 18:50:22	1993-03-25 01:19:12
-2087-03-16	2034-08-25 19:46:33	2045-12-10 16:47:40
-2006-04-30	2069-09-30 16:07:48	2084-08-26 03:33:12
+2113-06-12	1970-10-09 02:30:14	2074-08-12 11:31:27
+2103-11-03	2106-01-30 21:52:44	2097-05-25 07:54:35
+2008-03-16	2096-12-12 00:40:50	1988-08-10 11:16:31
+2126-11-26	2096-01-15 16:31:33	2063-10-20 08:48:17
+1991-02-02	2103-02-11 16:44:39	2036-10-09 04:29:10
+2096-11-03	1980-01-02 05:18:22	2055-12-23 12:33:52
+2024-12-16	2079-06-11 16:29:02	2000-12-05 17:46:24
+2085-04-07	2100-03-01 18:50:22	1993-03-25 01:19:12
+2135-05-30	2034-08-25 19:46:33	2045-12-10 16:47:40
+2094-12-18	2069-09-30 16:07:48	2084-08-26 03:33:12
 -
 DateTime64(3)	DateTime64(6)	DateTime64(6, \'Europe/Moscow\')
 1978-06-07 23:50:57.320	2013-08-28 10:21:54.010758	1991-08-25 16:23:26.140215
@@ -225,14 +225,14 @@ RL,{Xs\\tw
 [114]	-84125.1554	('2023-06-06 06:55:06.492','bf9ab359-ef9f-ad11-7e6c-160368b1e5ea')
 [124]	-114719.5228	('2010-11-11 22:57:23.722','c1046ffb-3415-cc3a-509a-e0005856d7d7')
 -
-[]	1900051923	{	-189530.5846	h	-5.6279699579452485e47	('1980-08-29','2090-10-31 19:35:45','2038-07-15 05:22:51.805','63d9a12d-d1cf-1f3a-57c6-9bc6dddd0975')	8502
-[-102,-118]	392272782	Eb	-14818.0200	o	-2.664492247169164e59	('2059-02-10','1994-07-16 00:40:02','2034-02-02 05:30:44.960','4fa09948-d32e-8903-63df-43ad759e43f7')	DA61
-[-71]	775049089	\N	-158115.1178	w	4.1323844687113747e-305	('1997-02-15','2062-08-12 23:41:53','2074-02-13 10:29:40.749','c4a44dd7-d009-6f65-1494-9daedfa8a124')	83A7
-[-28,100]	3675466147	{	-146685.1749	h	3.6676044396877755e142	('1997-10-26','2002-06-26 03:33:41','2002-12-02 05:46:03.455','98714b2c-65e7-b5cb-a040-421e260c6d8d')	4B94
-[-23]	2514120753	(`u,	-119659.6174	w	1.3231258347475906e34	('2055-11-20','2080-03-28 08:11:25','2073-07-10 12:19:58.146','003b3b6b-088f-f941-aeb9-c26e0ee72b8e')	6B1F
-[11,-36]	3308237300	\N	171205.1896	\N	5.634708707075817e195	('2009-03-18','2041-11-11 13:19:44','2044-03-18 17:34:17.814','9e60f4cb-6e55-1deb-5ac4-d66a86a8886d')	1964
-[39]	1614362420	`4A8P	157144.0630	o	-1.1843143253872814e-255	('1991-04-27','2066-03-02 11:07:49','1997-10-22 20:14:13.755','97685503-2609-d2b9-981c-02fd75d106cb')	A35B
-[48,-120]	3848918261	1<Lu3	91487.2852	h	-1.9300793134783347e263	('1983-09-27','2031-08-07 11:29:42','2085-03-11 15:17:17.374','af838873-48b2-f609-6483-f5c08733364c')	8E7C
-[55]	3047524030	li&lF	93462.3661	h	2.8979254388809897e54	('2011-08-01','2058-07-14 01:47:30','2055-10-14 06:36:20.056','e932a7b5-173a-1304-e522-b794b8fa3f11')	35D9
-[100,-42]	3999367674		-112975.9852	h	2.658098863752086e-160	('2025-12-13','2029-04-21 12:27:59','2068-08-27 07:49:41.825','802b2a96-319b-8e60-63d9-99b88ccae237')	074E
+[]	1900051923	{	-189530.5846	h	-5.6279699579452485e47	('1984-12-06','2090-10-31 19:35:45','2038-07-15 05:22:51.805','63d9a12d-d1cf-1f3a-57c6-9bc6dddd0975')	8502
+[-102,-118]	392272782	Eb	-14818.0200	o	-2.664492247169164e59	('2024-01-16','1994-07-16 00:40:02','2034-02-02 05:30:44.960','4fa09948-d32e-8903-63df-43ad759e43f7')	DA61
+[-71]	775049089	\N	-158115.1178	w	4.1323844687113747e-305	('2103-08-04','2062-08-12 23:41:53','2074-02-13 10:29:40.749','c4a44dd7-d009-6f65-1494-9daedfa8a124')	83A7
+[-28,100]	3675466147	{	-146685.1749	h	3.6676044396877755e142	('2119-02-01','2002-06-26 03:33:41','2002-12-02 05:46:03.455','98714b2c-65e7-b5cb-a040-421e260c6d8d')	4B94
+[-23]	2514120753	(`u,	-119659.6174	w	1.3231258347475906e34	('2017-10-25','2080-03-28 08:11:25','2073-07-10 12:19:58.146','003b3b6b-088f-f941-aeb9-c26e0ee72b8e')	6B1F
+[11,-36]	3308237300	\N	171205.1896	\N	5.634708707075817e195	('2084-01-01','2041-11-11 13:19:44','2044-03-18 17:34:17.814','9e60f4cb-6e55-1deb-5ac4-d66a86a8886d')	1964
+[39]	1614362420	`4A8P	157144.0630	o	-1.1843143253872814e-255	('2061-03-10','2066-03-02 11:07:49','1997-10-22 20:14:13.755','97685503-2609-d2b9-981c-02fd75d106cb')	A35B
+[48,-120]	3848918261	1<Lu3	91487.2852	h	-1.9300793134783347e263	('2081-06-01','2031-08-07 11:29:42','2085-03-11 15:17:17.374','af838873-48b2-f609-6483-f5c08733364c')	8E7C
+[55]	3047524030	li&lF	93462.3661	h	2.8979254388809897e54	('2108-04-19','2058-07-14 01:47:30','2055-10-14 06:36:20.056','e932a7b5-173a-1304-e522-b794b8fa3f11')	35D9
+[100,-42]	3999367674		-112975.9852	h	2.658098863752086e-160	('2005-08-26','2029-04-21 12:27:59','2068-08-27 07:49:41.825','802b2a96-319b-8e60-63d9-99b88ccae237')	074E
 -
diff --git a/tests/queries/0_stateless/01103_optimize_drop_race_zookeeper.sh b/tests/queries/0_stateless/01103_optimize_drop_race_zookeeper.sh
index 287a63f858b..72459e21b69 100755
--- a/tests/queries/0_stateless/01103_optimize_drop_race_zookeeper.sh
+++ b/tests/queries/0_stateless/01103_optimize_drop_race_zookeeper.sh
@@ -26,7 +26,7 @@ function thread3()
 {
     while true; do
         $CLICKHOUSE_CLIENT -n -q "DROP TABLE IF EXISTS concurrent_optimize_table;
-            CREATE TABLE concurrent_optimize_table (a UInt8, b Int16, c Float32, d String, e Array(UInt8), f Nullable(UUID), g Tuple(UInt8, UInt16)) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_01103/concurrent_optimize_table', '1') ORDER BY a PARTITION BY b % 10 SETTINGS old_parts_lifetime = 1, cleanup_delay_period = 0, cleanup_delay_period_random_add = 0;";
+            CREATE TABLE concurrent_optimize_table (a UInt8, b Int16, c Float32, d String, e Array(UInt8), f Nullable(UUID), g Tuple(UInt8, UInt16)) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/concurrent_optimize_table', '1') ORDER BY a PARTITION BY b % 10 SETTINGS old_parts_lifetime = 1, cleanup_delay_period = 0, cleanup_delay_period_random_add = 0;";
         sleep 0.$RANDOM;
         sleep 0.$RANDOM;
         sleep 0.$RANDOM;
diff --git a/tests/queries/0_stateless/01107_join_right_table_totals.reference b/tests/queries/0_stateless/01107_join_right_table_totals.reference
index 77db8015b0e..f71d3b0d05f 100644
--- a/tests/queries/0_stateless/01107_join_right_table_totals.reference
+++ b/tests/queries/0_stateless/01107_join_right_table_totals.reference
@@ -8,3 +8,13 @@
 0
 
 0	0	0
+
+0	0
+
+0	0
+
+0	0
+
+0	0
+
+0	0
diff --git a/tests/queries/0_stateless/01107_join_right_table_totals.sql b/tests/queries/0_stateless/01107_join_right_table_totals.sql
index 77e8848c957..a4f284e5e2d 100644
--- a/tests/queries/0_stateless/01107_join_right_table_totals.sql
+++ b/tests/queries/0_stateless/01107_join_right_table_totals.sql
@@ -35,4 +35,29 @@ FULL JOIN
 ) rr
 USING (id);
 
+SELECT id, yago 
+FROM ( SELECT item_id AS id FROM t GROUP BY id ) AS ll
+FULL OUTER JOIN ( SELECT item_id AS id, arrayJoin([111, 222, 333, 444]), SUM(price_sold) AS yago FROM t GROUP BY id WITH TOTALS ) AS rr 
+USING (id);
+
+SELECT id, yago 
+FROM ( SELECT item_id AS id, arrayJoin([111, 222, 333]) FROM t GROUP BY id WITH TOTALS ) AS ll
+FULL OUTER JOIN ( SELECT item_id AS id, SUM(price_sold) AS yago FROM t GROUP BY id ) AS rr 
+USING (id);
+
+SELECT id, yago 
+FROM ( SELECT item_id AS id, arrayJoin(emptyArrayInt32()) FROM t GROUP BY id WITH TOTALS ) AS ll
+FULL OUTER JOIN ( SELECT item_id AS id, SUM(price_sold) AS yago FROM t GROUP BY id ) AS rr 
+USING (id);
+
+SELECT id, yago 
+FROM ( SELECT item_id AS id FROM t GROUP BY id ) AS ll
+FULL OUTER JOIN ( SELECT item_id AS id, arrayJoin(emptyArrayInt32()), SUM(price_sold) AS yago FROM t GROUP BY id WITH TOTALS ) AS rr 
+USING (id);
+
+SELECT id, yago 
+FROM ( SELECT item_id AS id, arrayJoin([111, 222, 333]) FROM t GROUP BY id WITH TOTALS ) AS ll
+FULL OUTER JOIN ( SELECT item_id AS id, arrayJoin([111, 222, 333, 444]), SUM(price_sold) AS yago FROM t GROUP BY id WITH TOTALS ) AS rr 
+USING (id);
+
 DROP TABLE t;
diff --git a/tests/queries/0_stateless/01108_restart_replicas_rename_deadlock_zookeeper.sh b/tests/queries/0_stateless/01108_restart_replicas_rename_deadlock_zookeeper.sh
index cddf1ebcda6..d564594291a 100755
--- a/tests/queries/0_stateless/01108_restart_replicas_rename_deadlock_zookeeper.sh
+++ b/tests/queries/0_stateless/01108_restart_replicas_rename_deadlock_zookeeper.sh
@@ -7,7 +7,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 for i in $(seq 4); do
     $CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS replica_01108_$i"
     $CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS replica_01108_${i}_tmp"
-    $CLICKHOUSE_CLIENT -q "CREATE TABLE replica_01108_$i (n int) ENGINE=ReplicatedMergeTree('/clickhouse/tables/test_01108/replica_01108_$i', 'replica') ORDER BY tuple()"
+    $CLICKHOUSE_CLIENT -q "CREATE TABLE replica_01108_$i (n int) ENGINE=ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/replica_01108_$i', 'replica') ORDER BY tuple()"
     $CLICKHOUSE_CLIENT -q "INSERT INTO replica_01108_$i SELECT * FROM system.numbers LIMIT $i * 10, 10"
 done
 
diff --git a/tests/queries/0_stateless/01125_generate_random_qoega.reference b/tests/queries/0_stateless/01125_generate_random_qoega.reference
index 1cb416a722b..af3f8c99896 100644
--- a/tests/queries/0_stateless/01125_generate_random_qoega.reference
+++ b/tests/queries/0_stateless/01125_generate_random_qoega.reference
@@ -1 +1 @@
-100	4456446406473339606
+100	663736399314727673
diff --git a/tests/queries/0_stateless/01128_generate_random_nested.reference b/tests/queries/0_stateless/01128_generate_random_nested.reference
index d9d2b251702..6d2e90d8193 100644
--- a/tests/queries/0_stateless/01128_generate_random_nested.reference
+++ b/tests/queries/0_stateless/01128_generate_random_nested.reference
@@ -1,2 +1,2 @@
-100	12366141706519416319
-109	2990700419202507835
+100	12122376849981951205
+109	6180823897498688294
diff --git a/tests/queries/0_stateless/01151_storage_merge_filter_tables_by_virtual_column.reference b/tests/queries/0_stateless/01151_storage_merge_filter_tables_by_virtual_column.reference
new file mode 100644
index 00000000000..90755b06aa9
--- /dev/null
+++ b/tests/queries/0_stateless/01151_storage_merge_filter_tables_by_virtual_column.reference
@@ -0,0 +1,7 @@
+30	4995
+20	4950
+15	4700
+20	495
+20	4545
+15	470
+15	4520
diff --git a/tests/queries/0_stateless/01151_storage_merge_filter_tables_by_virtual_column.sql b/tests/queries/0_stateless/01151_storage_merge_filter_tables_by_virtual_column.sql
new file mode 100644
index 00000000000..2a250725654
--- /dev/null
+++ b/tests/queries/0_stateless/01151_storage_merge_filter_tables_by_virtual_column.sql
@@ -0,0 +1,26 @@
+drop table if exists src_table_1;
+drop table if exists src_table_2;
+drop table if exists src_table_3;
+drop table if exists set;
+
+create table src_table_1 (n UInt64) engine=Memory as select * from numbers(10);
+create table src_table_2 (n UInt64) engine=Log as select number * 10 from numbers(10);
+create table src_table_3 (n UInt64) engine=MergeTree order by n as select number * 100 from numbers(10);
+create table set (s String) engine=Set as select arrayJoin(['src_table_1', 'src_table_2']);
+
+create temporary table tmp (s String);
+insert into tmp values ('src_table_1'), ('src_table_3');
+
+select count(), sum(n) from merge(currentDatabase(), 'src_table');
+-- FIXME #21401 select count(), sum(n) from merge(currentDatabase(), 'src_table') where _table = 'src_table_1' or toInt8(substr(_table, 11, 1)) = 2;
+select count(), sum(n) from merge(currentDatabase(), 'src_table') where _table in ('src_table_2', 'src_table_3');
+select count(), sum(n) from merge(currentDatabase(), 'src_table') where _table in ('src_table_2', 'src_table_3') and n % 20 = 0;
+select count(), sum(n) from merge(currentDatabase(), 'src_table') where _table in set;
+select count(), sum(n) from merge(currentDatabase(), 'src_table') where _table in tmp;
+select count(), sum(n) from merge(currentDatabase(), 'src_table') where _table in set and n % 2 = 0;
+select count(), sum(n) from merge(currentDatabase(), 'src_table') where n % 2 = 0 and _table in tmp;
+
+drop table src_table_1;
+drop table src_table_2;
+drop table src_table_3;
+drop table set;
diff --git a/tests/queries/0_stateless/01152_cross_replication.reference b/tests/queries/0_stateless/01152_cross_replication.reference
new file mode 100644
index 00000000000..389d14ff28b
--- /dev/null
+++ b/tests/queries/0_stateless/01152_cross_replication.reference
@@ -0,0 +1,10 @@
+localhost	9000	0		0	0
+localhost	9000	0		0	0
+demo_loan_01568
+demo_loan_01568
+CREATE TABLE shard_0.demo_loan_01568\n(\n    `id` Int64 COMMENT \'id\',\n    `date_stat` Date COMMENT \'date of stat\',\n    `customer_no` String COMMENT \'customer no\',\n    `loan_principal` Float64 COMMENT \'loan principal\'\n)\nENGINE = ReplacingMergeTree\nPARTITION BY toYYYYMM(date_stat)\nORDER BY id\nSETTINGS index_granularity = 8192
+CREATE TABLE shard_1.demo_loan_01568\n(\n    `id` Int64 COMMENT \'id\',\n    `date_stat` Date COMMENT \'date of stat\',\n    `customer_no` String COMMENT \'customer no\',\n    `loan_principal` Float64 COMMENT \'loan principal\'\n)\nENGINE = ReplacingMergeTree\nPARTITION BY toYYYYMM(date_stat)\nORDER BY id\nSETTINGS index_granularity = 8192
+1	2021-04-13	qwerty	3.14159
+2	2021-04-14	asdfgh	2.71828
+2	2021-04-14	asdfgh	2.71828
+1	2021-04-13	qwerty	3.14159
diff --git a/tests/queries/0_stateless/01152_cross_replication.sql b/tests/queries/0_stateless/01152_cross_replication.sql
new file mode 100644
index 00000000000..23507c41fd0
--- /dev/null
+++ b/tests/queries/0_stateless/01152_cross_replication.sql
@@ -0,0 +1,30 @@
+DROP DATABASE IF EXISTS shard_0;
+DROP DATABASE IF EXISTS shard_1;
+SET distributed_ddl_output_mode='none';
+DROP TABLE IF EXISTS demo_loan_01568_dist;
+
+CREATE DATABASE shard_0;
+CREATE DATABASE shard_1;
+
+CREATE TABLE demo_loan_01568 ON CLUSTER test_cluster_two_shards_different_databases ( `id` Int64 COMMENT 'id', `date_stat` Date COMMENT 'date of stat', `customer_no` String COMMENT 'customer no', `loan_principal` Float64 COMMENT 'loan principal' ) ENGINE=ReplacingMergeTree() ORDER BY id PARTITION BY toYYYYMM(date_stat); -- { serverError 371 }
+SET distributed_ddl_output_mode='throw';
+CREATE TABLE shard_0.demo_loan_01568 ON CLUSTER test_cluster_two_shards_different_databases ( `id` Int64 COMMENT 'id', `date_stat` Date COMMENT 'date of stat', `customer_no` String COMMENT 'customer no', `loan_principal` Float64 COMMENT 'loan principal' ) ENGINE=ReplacingMergeTree() ORDER BY id PARTITION BY toYYYYMM(date_stat);
+CREATE TABLE shard_1.demo_loan_01568 ON CLUSTER test_cluster_two_shards_different_databases ( `id` Int64 COMMENT 'id', `date_stat` Date COMMENT 'date of stat', `customer_no` String COMMENT 'customer no', `loan_principal` Float64 COMMENT 'loan principal' ) ENGINE=ReplacingMergeTree() ORDER BY id PARTITION BY toYYYYMM(date_stat);
+SET distributed_ddl_output_mode='none';
+
+SHOW TABLES FROM shard_0;
+SHOW TABLES FROM shard_1;
+SHOW CREATE TABLE shard_0.demo_loan_01568;
+SHOW CREATE TABLE shard_1.demo_loan_01568;
+
+CREATE TABLE demo_loan_01568_dist AS shard_0.demo_loan_01568 ENGINE=Distributed('test_cluster_two_shards_different_databases', '', 'demo_loan_01568', id % 2);
+INSERT INTO demo_loan_01568_dist VALUES (1, '2021-04-13', 'qwerty', 3.14159), (2, '2021-04-14', 'asdfgh', 2.71828);
+SYSTEM FLUSH DISTRIBUTED demo_loan_01568_dist;
+SELECT * FROM demo_loan_01568_dist ORDER BY id;
+
+SELECT * FROM shard_0.demo_loan_01568;
+SELECT * FROM shard_1.demo_loan_01568;
+
+DROP DATABASE shard_0;
+DROP DATABASE shard_1;
+DROP TABLE demo_loan_01568_dist;
diff --git a/tests/queries/0_stateless/01153_attach_mv_uuid.reference b/tests/queries/0_stateless/01153_attach_mv_uuid.reference
new file mode 100644
index 00000000000..e37fe28e303
--- /dev/null
+++ b/tests/queries/0_stateless/01153_attach_mv_uuid.reference
@@ -0,0 +1,22 @@
+1	1
+2	4
+1	1
+2	4
+3	9
+4	16
+CREATE MATERIALIZED VIEW default.mv UUID \'e15f3ab5-6cae-4df3-b879-f40deafd82c2\'\n(\n    `n` Int32,\n    `n2` Int64\n)\nENGINE = MergeTree\nPARTITION BY n % 10\nORDER BY n AS\nSELECT\n    n,\n    n * n AS n2\nFROM default.src
+1	1
+2	4
+CREATE MATERIALIZED VIEW default.mv UUID \'e15f3ab5-6cae-4df3-b879-f40deafd82c2\'\n(\n    `n` Int32,\n    `n2` Int64\n)\nENGINE = MergeTree\nPARTITION BY n % 10\nORDER BY n AS\nSELECT\n    n,\n    n * n AS n2\nFROM default.src
+1	1
+2	4
+3	9
+4	16
+CREATE MATERIALIZED VIEW default.mv UUID \'e15f3ab5-6cae-4df3-b879-f40deafd82c2\' TO INNER UUID \'3bd68e3c-2693-4352-ad66-a66eba9e345e\'\n(\n    `n` Int32,\n    `n2` Int64\n)\nENGINE = MergeTree\nPARTITION BY n % 10\nORDER BY n AS\nSELECT\n    n,\n    n * n AS n2\nFROM default.src
+1	1
+2	4
+CREATE MATERIALIZED VIEW default.mv UUID \'e15f3ab5-6cae-4df3-b879-f40deafd82c2\' TO INNER UUID \'3bd68e3c-2693-4352-ad66-a66eba9e345e\'\n(\n    `n` Int32,\n    `n2` Int64\n)\nENGINE = MergeTree\nPARTITION BY n % 10\nORDER BY n AS\nSELECT\n    n,\n    n * n AS n2\nFROM default.src
+1	1
+2	4
+3	9
+4	16
diff --git a/tests/queries/0_stateless/01153_attach_mv_uuid.sql b/tests/queries/0_stateless/01153_attach_mv_uuid.sql
new file mode 100644
index 00000000000..86d768d94a7
--- /dev/null
+++ b/tests/queries/0_stateless/01153_attach_mv_uuid.sql
@@ -0,0 +1,42 @@
+DROP TABLE IF EXISTS src;
+DROP TABLE IF EXISTS mv;
+DROP TABLE IF EXISTS ".inner_id.e15f3ab5-6cae-4df3-b879-f40deafd82c2";
+
+CREATE TABLE src (n UInt64) ENGINE=MergeTree ORDER BY n;
+CREATE MATERIALIZED VIEW mv (n Int32, n2 Int64) ENGINE = MergeTree PARTITION BY n % 10 ORDER BY n AS SELECT n, n * n AS n2 FROM src;
+INSERT INTO src VALUES (1), (2);
+SELECT * FROM mv ORDER BY n;
+DETACH TABLE mv;
+ATTACH TABLE mv;
+INSERT INTO src VALUES (3), (4);
+SELECT * FROM mv ORDER BY n;
+DROP TABLE mv SYNC;
+
+SET show_table_uuid_in_table_create_query_if_not_nil=1;
+CREATE TABLE ".inner_id.e15f3ab5-6cae-4df3-b879-f40deafd82c2" (n Int32, n2 Int64) ENGINE = MergeTree PARTITION BY n % 10 ORDER BY n;
+ATTACH MATERIALIZED VIEW mv UUID 'e15f3ab5-6cae-4df3-b879-f40deafd82c2' (n Int32, n2 Int64) ENGINE = MergeTree PARTITION BY n % 10 ORDER BY n AS SELECT n, n * n AS n2 FROM src;
+SHOW CREATE TABLE mv;
+INSERT INTO src VALUES (1), (2);
+SELECT * FROM mv ORDER BY n;
+DETACH TABLE mv;
+ATTACH TABLE mv;
+SHOW CREATE TABLE mv;
+INSERT INTO src VALUES (3), (4);
+SELECT * FROM mv ORDER BY n;
+DROP TABLE mv SYNC;
+
+CREATE TABLE ".inner_id.e15f3ab5-6cae-4df3-b879-f40deafd82c2" UUID '3bd68e3c-2693-4352-ad66-a66eba9e345e' (n Int32, n2 Int64) ENGINE = MergeTree PARTITION BY n % 10 ORDER BY n;
+ATTACH MATERIALIZED VIEW mv UUID 'e15f3ab5-6cae-4df3-b879-f40deafd82c2' TO INNER UUID '3bd68e3c-2693-4352-ad66-a66eba9e345e' (n Int32, n2 Int64) ENGINE = MergeTree PARTITION BY n % 10 ORDER BY n AS SELECT n, n * n AS n2 FROM src;
+SHOW CREATE TABLE mv;
+INSERT INTO src VALUES (1), (2);
+SELECT * FROM mv ORDER BY n;
+DETACH TABLE mv;
+ATTACH TABLE mv;
+SHOW CREATE TABLE mv;
+INSERT INTO src VALUES (3), (4);
+SELECT * FROM mv ORDER BY n;
+DROP TABLE mv SYNC;
+
+ATTACH MATERIALIZED VIEW mv UUID '3bd68e3c-2693-4352-ad66-a66eba9e345e' TO INNER UUID '3bd68e3c-2693-4352-ad66-a66eba9e345e' (n Int32, n2 Int64) ENGINE = MergeTree PARTITION BY n % 10 ORDER BY n AS SELECT n, n * n AS n2 FROM src; -- { serverError 36 }
+
+DROP TABLE src;
diff --git a/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.reference b/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.reference
new file mode 100644
index 00000000000..0cc8c788fed
--- /dev/null
+++ b/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.reference
@@ -0,0 +1,25 @@
+none
+Received exception from server:
+Code: 57. Error: Received from localhost:9000. Error: There was an error on [localhost:9000]: Code: 57, e.displayText() = Error: Table default.throw already exists
+Received exception from server:
+Code: 159. Error: Received from localhost:9000. Error: Watching task <task> is executing longer than distributed_ddl_task_timeout (=8) seconds. There are 1 unfinished hosts (0 of them are currently active), they are going to execute the query in background.
+throw
+localhost	9000	0		0	0
+localhost	9000	57	Code: 57, e.displayText() = Error: Table default.throw already exists.	0	0
+Received exception from server:
+Code: 57. Error: Received from localhost:9000. Error: There was an error on [localhost:9000]: Code: 57, e.displayText() = Error: Table default.throw already exists
+localhost	9000	0		1	0
+Received exception from server:
+Code: 159. Error: Received from localhost:9000. Error: Watching task <task> is executing longer than distributed_ddl_task_timeout (=8) seconds. There are 1 unfinished hosts (0 of them are currently active), they are going to execute the query in background.
+null_status_on_timeout
+localhost	9000	0		0	0
+localhost	9000	57	Code: 57, e.displayText() = Error: Table default.null_status already exists.	0	0
+Received exception from server:
+Code: 57. Error: Received from localhost:9000. Error: There was an error on [localhost:9000]: Code: 57, e.displayText() = Error: Table default.null_status already exists
+localhost	9000	0		1	0
+localhost	1	\N	\N	1	0
+never_throw
+localhost	9000	0		0	0
+localhost	9000	57	Code: 57, e.displayText() = Error: Table default.never_throw already exists.	0	0
+localhost	9000	0		1	0
+localhost	1	\N	\N	1	0
diff --git a/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.sh b/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.sh
new file mode 100755
index 00000000000..66ceef21682
--- /dev/null
+++ b/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.sh
@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+
+$CLICKHOUSE_CLIENT -q "drop table if exists throw;"
+$CLICKHOUSE_CLIENT -q "drop table if exists null_status;"
+$CLICKHOUSE_CLIENT -q "drop table if exists never_throw;"
+
+CLICKHOUSE_CLIENT_OPT=$(echo ${CLICKHOUSE_CLIENT_OPT} | sed 's/'"--send_logs_level=${CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL}"'/--send_logs_level=fatal/g')
+
+CLIENT="$CLICKHOUSE_CLIENT_BINARY $CLICKHOUSE_CLIENT_OPT --distributed_ddl_task_timeout=8 --distributed_ddl_output_mode=none"
+$CLIENT -q "select value from system.settings where name='distributed_ddl_output_mode';"
+# Ok
+$CLIENT -q "create table throw on cluster test_shard_localhost (n int) engine=Memory;"
+# Table exists
+$CLIENT -q "create table throw on cluster test_shard_localhost (n int) engine=Memory;" 2>&1| grep -Fv "@ 0x" | sed "s/DB::Exception/Error/g" | sed "s/ (version.*)//" | sed "s/exists.. /exists/"
+# Timeout
+$CLIENT -q "drop table throw on cluster test_unavailable_shard;" 2>&1| grep -Fv "@ 0x" | sed "s/DB::Exception/Error/g" | sed "s/ (version.*)//" | sed "s/Watching task .* is executing longer/Watching task <task> is executing longer/" | sed "s/background. /background./"
+
+CLIENT="$CLICKHOUSE_CLIENT_BINARY $CLICKHOUSE_CLIENT_OPT --distributed_ddl_task_timeout=8 --distributed_ddl_output_mode=throw"
+$CLIENT -q "select value from system.settings where name='distributed_ddl_output_mode';"
+$CLIENT -q "create table throw on cluster test_shard_localhost (n int) engine=Memory;"
+$CLIENT -q "create table throw on cluster test_shard_localhost (n int) engine=Memory;" 2>&1| grep -Fv "@ 0x" | sed "s/DB::Exception/Error/g" | sed "s/ (version.*)//" | sed "s/exists.. /exists/"
+$CLIENT -q "drop table throw on cluster test_unavailable_shard;" 2>&1| grep -Fv "@ 0x" | sed "s/DB::Exception/Error/g" | sed "s/ (version.*)//" | sed "s/Watching task .* is executing longer/Watching task <task> is executing longer/" | sed "s/background. /background./"
+
+CLIENT="$CLICKHOUSE_CLIENT_BINARY $CLICKHOUSE_CLIENT_OPT --distributed_ddl_task_timeout=8 --distributed_ddl_output_mode=null_status_on_timeout"
+$CLIENT -q "select value from system.settings where name='distributed_ddl_output_mode';"
+$CLIENT -q "create table null_status on cluster test_shard_localhost (n int) engine=Memory;"
+$CLIENT -q "create table null_status on cluster test_shard_localhost (n int) engine=Memory;" 2>&1| grep -Fv "@ 0x" | sed "s/DB::Exception/Error/g" | sed "s/ (version.*)//" | sed "s/exists.. /exists/"
+$CLIENT -q "drop table null_status on cluster test_unavailable_shard;"
+
+CLIENT="$CLICKHOUSE_CLIENT_BINARY $CLICKHOUSE_CLIENT_OPT --distributed_ddl_task_timeout=8 --distributed_ddl_output_mode=never_throw"
+$CLIENT -q "select value from system.settings where name='distributed_ddl_output_mode';"
+$CLIENT -q "create table never_throw on cluster test_shard_localhost (n int) engine=Memory;"
+$CLIENT -q "create table never_throw on cluster test_shard_localhost (n int) engine=Memory;" 2>&1| sed "s/DB::Exception/Error/g" | sed "s/ (version.*)//"
+$CLIENT -q "drop table never_throw on cluster test_unavailable_shard;"
diff --git a/tests/queries/0_stateless/01181_db_atomic_drop_on_cluster.sql b/tests/queries/0_stateless/01181_db_atomic_drop_on_cluster.sql
index ca393c36617..24283a0e8e3 100644
--- a/tests/queries/0_stateless/01181_db_atomic_drop_on_cluster.sql
+++ b/tests/queries/0_stateless/01181_db_atomic_drop_on_cluster.sql
@@ -1,5 +1,4 @@
 DROP TABLE IF EXISTS test_repl ON CLUSTER test_shard_localhost SYNC;
-
 CREATE TABLE test_repl ON CLUSTER test_shard_localhost (n UInt64) ENGINE ReplicatedMergeTree('/clickhouse/test_01181/{database}/test_repl','r1') ORDER BY tuple();
 DETACH TABLE test_repl ON CLUSTER test_shard_localhost SYNC;
 ATTACH TABLE test_repl ON CLUSTER test_shard_localhost;
diff --git a/tests/queries/0_stateless/01192_rename_database_zookeeper.sh b/tests/queries/0_stateless/01192_rename_database_zookeeper.sh
index 90b9baf4ebf..58bdfbf71ad 100755
--- a/tests/queries/0_stateless/01192_rename_database_zookeeper.sh
+++ b/tests/queries/0_stateless/01192_rename_database_zookeeper.sh
@@ -36,7 +36,7 @@ $CLICKHOUSE_CLIENT -q "SELECT count(n), sum(n) FROM test_01192_renamed.mt"
 # 5. check moving tables from Ordinary to Atomic (can be used to "alter" database engine)
 $CLICKHOUSE_CLIENT --default_database_engine=Ordinary -q "CREATE DATABASE test_01192"
 $CLICKHOUSE_CLIENT -q "CREATE TABLE test_01192.mt AS test_01192_renamed.mt ENGINE=MergeTree ORDER BY n"
-$CLICKHOUSE_CLIENT -q "CREATE TABLE test_01192.rmt AS test_01192_renamed.mt ENGINE=ReplicatedMergeTree('/test/01192/', '1') ORDER BY n"
+$CLICKHOUSE_CLIENT -q "CREATE TABLE test_01192.rmt AS test_01192_renamed.mt ENGINE=ReplicatedMergeTree('/test/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/', '1') ORDER BY n"
 $CLICKHOUSE_CLIENT -q "CREATE MATERIALIZED VIEW test_01192.mv TO test_01192.rmt AS SELECT * FROM test_01192.mt"
 
 $CLICKHOUSE_CLIENT -q "INSERT INTO test_01192.mt SELECT number FROM numbers(10)" && echo "inserted"
diff --git a/tests/queries/0_stateless/01213_alter_rename_column_zookeeper.reference b/tests/queries/0_stateless/01213_alter_rename_column_zookeeper.reference
index fc2a74d1a93..35385731ad3 100644
--- a/tests/queries/0_stateless/01213_alter_rename_column_zookeeper.reference
+++ b/tests/queries/0_stateless/01213_alter_rename_column_zookeeper.reference
@@ -1,7 +1,7 @@
 1
-CREATE TABLE default.table_for_rename_replicated\n(\n    `date` Date,\n    `key` UInt64,\n    `value1` String,\n    `value2` String,\n    `value3` String\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_01213/table_for_rename_replicated\', \'1\')\nPARTITION BY date\nORDER BY key\nSETTINGS index_granularity = 8192
+CREATE TABLE default.table_for_rename_replicated\n(\n    `date` Date,\n    `key` UInt64,\n    `value1` String,\n    `value2` String,\n    `value3` String\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/01213_alter_rename_column_zookeeper_default/table_for_rename_replicated\', \'1\')\nPARTITION BY date\nORDER BY key\nSETTINGS index_granularity = 8192
 renamed_value1
-CREATE TABLE default.table_for_rename_replicated\n(\n    `date` Date,\n    `key` UInt64,\n    `renamed_value1` String,\n    `value2` String,\n    `value3` String\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_01213/table_for_rename_replicated\', \'1\')\nPARTITION BY date\nORDER BY key\nSETTINGS index_granularity = 8192
+CREATE TABLE default.table_for_rename_replicated\n(\n    `date` Date,\n    `key` UInt64,\n    `renamed_value1` String,\n    `value2` String,\n    `value3` String\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/01213_alter_rename_column_zookeeper_default/table_for_rename_replicated\', \'1\')\nPARTITION BY date\nORDER BY key\nSETTINGS index_granularity = 8192
 1
 date	key	renamed_value1	value2	value3
 2019-10-02	1	1	1	1
diff --git a/tests/queries/0_stateless/01213_alter_rename_column_zookeeper.sh b/tests/queries/0_stateless/01213_alter_rename_column_zookeeper.sh
index 5ab0e800d39..5da8de70c46 100755
--- a/tests/queries/0_stateless/01213_alter_rename_column_zookeeper.sh
+++ b/tests/queries/0_stateless/01213_alter_rename_column_zookeeper.sh
@@ -15,7 +15,7 @@ CREATE TABLE table_for_rename_replicated
   value2 String,
   value3 String
 )
-ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_01213/table_for_rename_replicated', '1')
+ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/table_for_rename_replicated', '1')
 PARTITION BY date
 ORDER BY key;
 "
diff --git a/tests/queries/0_stateless/01231_log_queries_min_type.sql b/tests/queries/0_stateless/01231_log_queries_min_type.sql
index 9659739b61d..b3540f3354b 100644
--- a/tests/queries/0_stateless/01231_log_queries_min_type.sql
+++ b/tests/queries/0_stateless/01231_log_queries_min_type.sql
@@ -2,26 +2,33 @@ set log_queries=1;
 
 select '01231_log_queries_min_type/QUERY_START';
 system flush logs;
-select count() from system.query_log where current_database = currentDatabase() and query like '%01231_log_queries_min_type/QUERY_START%' and query not like '%system.query_log%' and event_date = today() and event_time >= now() - interval 1 minute;
+select count() from system.query_log where current_database = currentDatabase()
+    and query like 'select \'01231_log_queries_min_type/QUERY_START%'
+    and event_date >= yesterday();
 
 set log_queries_min_type='EXCEPTION_BEFORE_START';
 select '01231_log_queries_min_type/EXCEPTION_BEFORE_START';
 system flush logs;
-select count() from system.query_log where current_database = currentDatabase() and query like '%01231_log_queries_min_type/EXCEPTION_BEFORE_START%' and query not like '%system.query_log%' and event_date = today() and event_time >= now() - interval 1 minute;
+select count() from system.query_log where current_database = currentDatabase()
+    and query like 'select \'01231_log_queries_min_type/EXCEPTION_BEFORE_START%'
+    and event_date >= yesterday();
 
 set max_rows_to_read='100K';
 set log_queries_min_type='EXCEPTION_WHILE_PROCESSING';
 select '01231_log_queries_min_type/EXCEPTION_WHILE_PROCESSING', max(number) from system.numbers limit 1e6; -- { serverError 158; }
+set max_rows_to_read=0;
 system flush logs;
-select count() from system.query_log where current_database = currentDatabase() and query like '%01231_log_queries_min_type/EXCEPTION_WHILE_PROCESSING%' and query not like '%system.query_log%' and event_date = today() and event_time >= now() - interval 1 minute and type = 'ExceptionWhileProcessing';
+select count() from system.query_log where current_database = currentDatabase()
+    and query like 'select \'01231_log_queries_min_type/EXCEPTION_WHILE_PROCESSING%'
+    and event_date >= yesterday() and type = 'ExceptionWhileProcessing';
 
+set max_rows_to_read='100K';
 select '01231_log_queries_min_type w/ Settings/EXCEPTION_WHILE_PROCESSING', max(number) from system.numbers limit 1e6; -- { serverError 158; }
 system flush logs;
+set max_rows_to_read=0;
 select count() from system.query_log where
     current_database = currentDatabase() and
-    query like '%01231_log_queries_min_type w/ Settings/EXCEPTION_WHILE_PROCESSING%' and
-    query not like '%system.query_log%' and
-    event_date = today() and
-    event_time >= now() - interval 1 minute and
+    query like 'select \'01231_log_queries_min_type w/ Settings/EXCEPTION_WHILE_PROCESSING%' and
+    event_date >= yesterday() and
     type = 'ExceptionWhileProcessing' and
     has(Settings.Names, 'max_rows_to_read');
diff --git a/tests/queries/0_stateless/01231_markdown_format.reference b/tests/queries/0_stateless/01231_markdown_format.reference
index e2ec03b401a..65838bfede7 100644
--- a/tests/queries/0_stateless/01231_markdown_format.reference
+++ b/tests/queries/0_stateless/01231_markdown_format.reference
@@ -1,5 +1,5 @@
-| id | name | array | 
-|-:|:-|:-:|
-| 1 | name1 | [1,2,3] |
-| 2 | name2 | [4,5,6] |
-| 3 | name3 | [7,8,9] |
+| id | name | array | nullable | low_cardinality | decimal | 
+|-:|:-|:-|:-|:-|-:|
+| 1 | name1 | [1,2,3] | Some long string | name1 | 1.110000 |
+| 2 | name2 | [4,5,60000] | \N | Another long string | 222.222222 |
+| 30000 | One more long string | [7,8,9] | name3 | name3 | 3.330000 |
diff --git a/tests/queries/0_stateless/01231_markdown_format.sql b/tests/queries/0_stateless/01231_markdown_format.sql
index 693664be1ab..65c65389e12 100644
--- a/tests/queries/0_stateless/01231_markdown_format.sql
+++ b/tests/queries/0_stateless/01231_markdown_format.sql
@@ -1,6 +1,6 @@
 DROP TABLE IF EXISTS makrdown;
-CREATE TABLE markdown (id UInt32, name String, array Array(Int8)) ENGINE = Memory;
-INSERT INTO markdown VALUES (1, 'name1', [1,2,3]), (2, 'name2', [4,5,6]), (3, 'name3', [7,8,9]);
+CREATE TABLE markdown (id UInt32, name String, array Array(Int32), nullable Nullable(String), low_cardinality LowCardinality(String), decimal Decimal32(6)) ENGINE = Memory;
+INSERT INTO markdown VALUES (1, 'name1', [1,2,3], 'Some long string', 'name1', 1.11), (2, 'name2', [4,5,60000], Null, 'Another long string', 222.222222), (30000, 'One more long string', [7,8,9], 'name3', 'name3', 3.33);
 
 SELECT * FROM markdown FORMAT Markdown;
 DROP TABLE IF EXISTS markdown
diff --git a/tests/queries/0_stateless/01244_optimize_distributed_group_by_sharding_key.sql b/tests/queries/0_stateless/01244_optimize_distributed_group_by_sharding_key.sql
index d152326091b..2f77155cc54 100644
--- a/tests/queries/0_stateless/01244_optimize_distributed_group_by_sharding_key.sql
+++ b/tests/queries/0_stateless/01244_optimize_distributed_group_by_sharding_key.sql
@@ -1,9 +1,5 @@
 -- TODO: correct testing with real unique shards
 
--- Avoid "Connection failed at try №1" messages.
-SET send_logs_level = 'fatal';
-SET connect_timeout_with_failover_ms = 5000;
-
 set optimize_distributed_group_by_sharding_key=1;
 
 drop table if exists dist_01247;
diff --git a/tests/queries/0_stateless/01247_optimize_distributed_group_by_sharding_key_dist_on_dist.sql b/tests/queries/0_stateless/01247_optimize_distributed_group_by_sharding_key_dist_on_dist.sql
index 1000e956583..73dc916e463 100644
--- a/tests/queries/0_stateless/01247_optimize_distributed_group_by_sharding_key_dist_on_dist.sql
+++ b/tests/queries/0_stateless/01247_optimize_distributed_group_by_sharding_key_dist_on_dist.sql
@@ -1,9 +1,5 @@
 -- TODO: correct testing with real unique shards
 
--- Avoid "Connection failed at try №1" messages.
-SET send_logs_level = 'fatal';
-SET connect_timeout_with_failover_ms = 5000;
-
 set optimize_distributed_group_by_sharding_key=1;
 
 drop table if exists dist_01247;
diff --git a/tests/queries/0_stateless/01251_dict_is_in_infinite_loop.reference b/tests/queries/0_stateless/01251_dict_is_in_infinite_loop.reference
index 757d2858524..0a2c97efb42 100644
--- a/tests/queries/0_stateless/01251_dict_is_in_infinite_loop.reference
+++ b/tests/queries/0_stateless/01251_dict_is_in_infinite_loop.reference
@@ -29,10 +29,10 @@
 1
 1
 1
-255
-255
 0
-255
+0
+0
+0
 [11,22]
 [22,11]
 [11,22]
diff --git a/tests/queries/0_stateless/01252_weird_time_zone.reference b/tests/queries/0_stateless/01252_weird_time_zone.reference
index f2968d4efa6..90f5bf0e30d 100644
--- a/tests/queries/0_stateless/01252_weird_time_zone.reference
+++ b/tests/queries/0_stateless/01252_weird_time_zone.reference
@@ -1,7 +1,7 @@
-2020-01-02 03:04:05	2020-01-02 00:00:00	3
-2020-01-02 03:04:05	2020-01-02 00:00:00	3
-2020-01-02 03:04:05	2020-01-02 00:00:00	3
-2020-01-02 03:04:05	2020-01-02 00:00:00	3
-2020-01-02 03:04:05	2020-01-02 00:00:00	3
-2020-01-02 03:04:05	2020-01-02 00:00:00	3
-2020-01-02 03:04:05	2020-01-02 00:00:00	3
+Pacific/Kiritimati	2020-01-02 03:04:05	2020-01-02 00:00:00	3
+Africa/El_Aaiun	2020-01-02 03:04:05	2020-01-02 00:00:00	3
+Asia/Pyongyang	2020-01-02 03:04:05	2020-01-02 00:00:00	3
+Pacific/Kwajalein	2020-01-02 03:04:05	2020-01-02 00:00:00	3
+Pacific/Apia	2020-01-02 03:04:05	2020-01-02 00:00:00	3
+Pacific/Enderbury	2020-01-02 03:04:05	2020-01-02 00:00:00	3
+Pacific/Fakaofo	2020-01-02 03:04:05	2020-01-02 00:00:00	3
diff --git a/tests/queries/0_stateless/01252_weird_time_zone.sql b/tests/queries/0_stateless/01252_weird_time_zone.sql
index 68ea903a797..c4919ca4fe0 100644
--- a/tests/queries/0_stateless/01252_weird_time_zone.sql
+++ b/tests/queries/0_stateless/01252_weird_time_zone.sql
@@ -1,15 +1,15 @@
-SELECT toDateTime('2020-01-02 03:04:05', 'Pacific/Kiritimati') AS x, toStartOfDay(x), toHour(x);
-SELECT toDateTime('2020-01-02 03:04:05', 'Africa/El_Aaiun') AS x, toStartOfDay(x), toHour(x);
-SELECT toDateTime('2020-01-02 03:04:05', 'Asia/Pyongyang') AS x, toStartOfDay(x), toHour(x);
-SELECT toDateTime('2020-01-02 03:04:05', 'Pacific/Kwajalein') AS x, toStartOfDay(x), toHour(x);
-SELECT toDateTime('2020-01-02 03:04:05', 'Pacific/Apia') AS x, toStartOfDay(x), toHour(x);
-SELECT toDateTime('2020-01-02 03:04:05', 'Pacific/Enderbury') AS x, toStartOfDay(x), toHour(x);
-SELECT toDateTime('2020-01-02 03:04:05', 'Pacific/Fakaofo') AS x, toStartOfDay(x), toHour(x);
+SELECT 'Pacific/Kiritimati', toDateTime('2020-01-02 03:04:05', 'Pacific/Kiritimati') AS x, toStartOfDay(x), toHour(x);
+SELECT 'Africa/El_Aaiun', toDateTime('2020-01-02 03:04:05', 'Africa/El_Aaiun') AS x, toStartOfDay(x), toHour(x);
+SELECT 'Asia/Pyongyang', toDateTime('2020-01-02 03:04:05', 'Asia/Pyongyang') AS x, toStartOfDay(x), toHour(x);
+SELECT 'Pacific/Kwajalein', toDateTime('2020-01-02 03:04:05', 'Pacific/Kwajalein') AS x, toStartOfDay(x), toHour(x);
+SELECT 'Pacific/Apia', toDateTime('2020-01-02 03:04:05', 'Pacific/Apia') AS x, toStartOfDay(x), toHour(x);
+SELECT 'Pacific/Enderbury', toDateTime('2020-01-02 03:04:05', 'Pacific/Enderbury') AS x, toStartOfDay(x), toHour(x);
+SELECT 'Pacific/Fakaofo', toDateTime('2020-01-02 03:04:05', 'Pacific/Fakaofo') AS x, toStartOfDay(x), toHour(x);
 
-SELECT toHour(toDateTime(rand(), 'Pacific/Kiritimati') AS t) AS h, t FROM numbers(1000000) WHERE h < 0 OR h > 23 ORDER BY h LIMIT 1 BY h;
-SELECT toHour(toDateTime(rand(), 'Africa/El_Aaiun') AS t) AS h, t FROM numbers(1000000) WHERE h < 0 OR h > 23 ORDER BY h LIMIT 1 BY h;
-SELECT toHour(toDateTime(rand(), 'Asia/Pyongyang') AS t) AS h, t FROM numbers(1000000) WHERE h < 0 OR h > 23 ORDER BY h LIMIT 1 BY h;
-SELECT toHour(toDateTime(rand(), 'Pacific/Kwajalein') AS t) AS h, t FROM numbers(1000000) WHERE h < 0 OR h > 23 ORDER BY h LIMIT 1 BY h;
-SELECT toHour(toDateTime(rand(), 'Pacific/Apia') AS t) AS h, t FROM numbers(1000000) WHERE h < 0 OR h > 23 ORDER BY h LIMIT 1 BY h;
-SELECT toHour(toDateTime(rand(), 'Pacific/Enderbury') AS t) AS h, t FROM numbers(1000000) WHERE h < 0 OR h > 23 ORDER BY h LIMIT 1 BY h;
-SELECT toHour(toDateTime(rand(), 'Pacific/Fakaofo') AS t) AS h, t FROM numbers(1000000) WHERE h < 0 OR h > 23 ORDER BY h LIMIT 1 BY h;
+SELECT 'Pacific/Kiritimati', rand() as r, toHour(toDateTime(r, 'Pacific/Kiritimati') AS t) AS h, t, toTypeName(t) FROM numbers(1000000) WHERE h < 0 OR h > 23 ORDER BY h LIMIT 1 BY h;
+SELECT 'Africa/El_Aaiun', rand() as r, toHour(toDateTime(r, 'Africa/El_Aaiun') AS t) AS h, t, toTypeName(t) FROM numbers(1000000) WHERE h < 0 OR h > 23 ORDER BY h LIMIT 1 BY h;
+SELECT 'Asia/Pyongyang', rand() as r, toHour(toDateTime(r, 'Asia/Pyongyang') AS t) AS h, t, toTypeName(t) FROM numbers(1000000) WHERE h < 0 OR h > 23 ORDER BY h LIMIT 1 BY h;
+SELECT 'Pacific/Kwajalein', rand() as r, toHour(toDateTime(r, 'Pacific/Kwajalein') AS t) AS h, t, toTypeName(t) FROM numbers(1000000) WHERE h < 0 OR h > 23 ORDER BY h LIMIT 1 BY h;
+SELECT 'Pacific/Apia', rand() as r, toHour(toDateTime(r, 'Pacific/Apia') AS t) AS h, t, toTypeName(t) FROM numbers(1000000) WHERE h < 0 OR h > 23 ORDER BY h LIMIT 1 BY h;
+SELECT 'Pacific/Enderbury', rand() as r, toHour(toDateTime(r, 'Pacific/Enderbury') AS t) AS h, t, toTypeName(t) FROM numbers(1000000) WHERE h < 0 OR h > 23 ORDER BY h LIMIT 1 BY h;
+SELECT 'Pacific/Fakaofo', rand() as r, toHour(toDateTime(r, 'Pacific/Fakaofo') AS t) AS h, t, toTypeName(t) FROM numbers(1000000) WHERE h < 0 OR h > 23 ORDER BY h LIMIT 1 BY h;
diff --git a/tests/queries/0_stateless/01263_type_conversion_nvartolomei.reference b/tests/queries/0_stateless/01263_type_conversion_nvartolomei.reference
index 09b593dad3d..97c766822ac 100644
--- a/tests/queries/0_stateless/01263_type_conversion_nvartolomei.reference
+++ b/tests/queries/0_stateless/01263_type_conversion_nvartolomei.reference
@@ -3,5 +3,3 @@
 a
 a
 ---
-a
-a
diff --git a/tests/queries/0_stateless/01263_type_conversion_nvartolomei.sql b/tests/queries/0_stateless/01263_type_conversion_nvartolomei.sql
index e3d66e9cdba..0eeb97e2b2d 100644
--- a/tests/queries/0_stateless/01263_type_conversion_nvartolomei.sql
+++ b/tests/queries/0_stateless/01263_type_conversion_nvartolomei.sql
@@ -43,7 +43,7 @@ SELECT * FROM d;
 SELECT '---';
 
 INSERT INTO m VALUES ('b');
-SELECT v FROM d ORDER BY v; -- { clientError 36 }
+SELECT toString(v) FROM (SELECT v FROM d ORDER BY v) FORMAT Null; -- { serverError 36 }
 
 
 DROP TABLE m;
diff --git a/tests/queries/0_stateless/01269_create_with_null.reference b/tests/queries/0_stateless/01269_create_with_null.reference
index 86be41bc06a..73f834da75a 100644
--- a/tests/queries/0_stateless/01269_create_with_null.reference
+++ b/tests/queries/0_stateless/01269_create_with_null.reference
@@ -2,3 +2,6 @@ Nullable(Int32)	Int32	Nullable(Int32)	Int32
 CREATE TABLE default.data_null\n(\n    `a` Nullable(Int32),\n    `b` Int32,\n    `c` Nullable(Int32),\n    `d` Int32\n)\nENGINE = Memory
 Nullable(Int32)	Int32	Nullable(Int32)	Nullable(Int32)
 CREATE TABLE default.set_null\n(\n    `a` Nullable(Int32),\n    `b` Int32,\n    `c` Nullable(Int32),\n    `d` Nullable(Int32)\n)\nENGINE = Memory
+CREATE TABLE default.set_null\n(\n    `a` Nullable(Int32),\n    `b` Int32,\n    `c` Nullable(Int32),\n    `d` Nullable(Int32)\n)\nENGINE = Memory
+CREATE TABLE default.cannot_be_nullable\n(\n    `n` Nullable(Int8),\n    `a` Array(UInt8)\n)\nENGINE = Memory
+CREATE TABLE default.cannot_be_nullable\n(\n    `n` Nullable(Int8),\n    `a` Array(UInt8)\n)\nENGINE = Memory
diff --git a/tests/queries/0_stateless/01269_create_with_null.sql b/tests/queries/0_stateless/01269_create_with_null.sql
index 856b6ea75f4..faa6b84e9e4 100644
--- a/tests/queries/0_stateless/01269_create_with_null.sql
+++ b/tests/queries/0_stateless/01269_create_with_null.sql
@@ -1,5 +1,6 @@
 DROP TABLE IF EXISTS data_null;
 DROP TABLE IF EXISTS set_null;
+DROP TABLE IF EXISTS cannot_be_nullable;
 
 SET data_type_default_nullable='false';
 
@@ -45,6 +46,17 @@ INSERT INTO set_null VALUES (NULL, 2, NULL, NULL);
 SELECT toTypeName(a), toTypeName(b), toTypeName(c), toTypeName(d) FROM set_null;
 
 SHOW CREATE TABLE set_null;
+DETACH TABLE set_null;
+ATTACH TABLE set_null;
+SHOW CREATE TABLE set_null;
+
+CREATE TABLE cannot_be_nullable (n Int8, a Array(UInt8)) ENGINE=Memory; -- { serverError 43 }
+CREATE TABLE cannot_be_nullable (n Int8, a Array(UInt8) NOT NULL) ENGINE=Memory;
+SHOW CREATE TABLE cannot_be_nullable;
+DETACH TABLE cannot_be_nullable;
+ATTACH TABLE cannot_be_nullable;
+SHOW CREATE TABLE cannot_be_nullable;
 
 DROP TABLE data_null;
 DROP TABLE set_null;
+DROP TABLE cannot_be_nullable;
diff --git a/tests/queries/0_stateless/01271_show_privileges.reference b/tests/queries/0_stateless/01271_show_privileges.reference
index 791f83cca05..892bd95d2d9 100644
--- a/tests/queries/0_stateless/01271_show_privileges.reference
+++ b/tests/queries/0_stateless/01271_show_privileges.reference
@@ -28,8 +28,8 @@ ALTER TTL	['ALTER MODIFY TTL','MODIFY TTL']	TABLE	ALTER TABLE
 ALTER MATERIALIZE TTL	['MATERIALIZE TTL']	TABLE	ALTER TABLE
 ALTER SETTINGS	['ALTER SETTING','ALTER MODIFY SETTING','MODIFY SETTING']	TABLE	ALTER TABLE
 ALTER MOVE PARTITION	['ALTER MOVE PART','MOVE PARTITION','MOVE PART']	TABLE	ALTER TABLE
-ALTER FETCH PARTITION	['FETCH PARTITION']	TABLE	ALTER TABLE
-ALTER FREEZE PARTITION	['FREEZE PARTITION']	TABLE	ALTER TABLE
+ALTER FETCH PARTITION	['ALTER FETCH PART','FETCH PARTITION']	TABLE	ALTER TABLE
+ALTER FREEZE PARTITION	['FREEZE PARTITION','UNFREEZE']	TABLE	ALTER TABLE
 ALTER TABLE	[]	\N	ALTER
 ALTER VIEW REFRESH	['ALTER LIVE VIEW REFRESH','REFRESH VIEW']	VIEW	ALTER VIEW
 ALTER VIEW MODIFY QUERY	['ALTER TABLE MODIFY QUERY']	VIEW	ALTER VIEW
@@ -76,11 +76,13 @@ SYSTEM SHUTDOWN	['SYSTEM KILL','SHUTDOWN']	GLOBAL	SYSTEM
 SYSTEM DROP DNS CACHE	['SYSTEM DROP DNS','DROP DNS CACHE','DROP DNS']	GLOBAL	SYSTEM DROP CACHE
 SYSTEM DROP MARK CACHE	['SYSTEM DROP MARK','DROP MARK CACHE','DROP MARKS']	GLOBAL	SYSTEM DROP CACHE
 SYSTEM DROP UNCOMPRESSED CACHE	['SYSTEM DROP UNCOMPRESSED','DROP UNCOMPRESSED CACHE','DROP UNCOMPRESSED']	GLOBAL	SYSTEM DROP CACHE
+SYSTEM DROP MMAP CACHE	['SYSTEM DROP MMAP','DROP MMAP CACHE','DROP MMAP']	GLOBAL	SYSTEM DROP CACHE
 SYSTEM DROP COMPILED EXPRESSION CACHE	['SYSTEM DROP COMPILED EXPRESSION','DROP COMPILED EXPRESSION CACHE','DROP COMPILED EXPRESSIONS']	GLOBAL	SYSTEM DROP CACHE
 SYSTEM DROP CACHE	['DROP CACHE']	\N	SYSTEM
 SYSTEM RELOAD CONFIG	['RELOAD CONFIG']	GLOBAL	SYSTEM RELOAD
 SYSTEM RELOAD SYMBOLS	['RELOAD SYMBOLS']	GLOBAL	SYSTEM RELOAD
 SYSTEM RELOAD DICTIONARY	['SYSTEM RELOAD DICTIONARIES','RELOAD DICTIONARY','RELOAD DICTIONARIES']	GLOBAL	SYSTEM RELOAD
+SYSTEM RELOAD MODEL	['SYSTEM RELOAD MODELS','RELOAD MODEL','RELOAD MODELS']	GLOBAL	SYSTEM RELOAD
 SYSTEM RELOAD EMBEDDED DICTIONARIES	['RELOAD EMBEDDED DICTIONARIES']	GLOBAL	SYSTEM RELOAD
 SYSTEM RELOAD	[]	\N	SYSTEM
 SYSTEM MERGES	['SYSTEM STOP MERGES','SYSTEM START MERGES','STOP_MERGES','START MERGES']	TABLE	SYSTEM
diff --git a/tests/queries/0_stateless/01272_totals_and_filter_bug.reference b/tests/queries/0_stateless/01272_totals_and_filter_bug.reference
index 0db840561fd..5b407738cb8 100644
--- a/tests/queries/0_stateless/01272_totals_and_filter_bug.reference
+++ b/tests/queries/0_stateless/01272_totals_and_filter_bug.reference
@@ -1,6 +1,6 @@
 1	1
 
-0	2
+0	1
 -
 test1	10	0
 
diff --git a/tests/queries/0_stateless/01280_ssd_complex_key_dictionary.sql b/tests/queries/0_stateless/01280_ssd_complex_key_dictionary.sql
index 70e1d2bed29..cd3e52c9691 100644
--- a/tests/queries/0_stateless/01280_ssd_complex_key_dictionary.sql
+++ b/tests/queries/0_stateless/01280_ssd_complex_key_dictionary.sql
@@ -1,12 +1,12 @@
 SET send_logs_level = 'none';
 
-DROP DATABASE IF EXISTS database_for_dict;
+DROP DATABASE IF EXISTS 01280_db;
 
-CREATE DATABASE database_for_dict Engine = Ordinary;
+CREATE DATABASE 01280_db Engine = Ordinary;
 
-DROP TABLE IF EXISTS database_for_dict.table_for_dict;
+DROP TABLE IF EXISTS 01280_db.table_for_dict;
 
-CREATE TABLE database_for_dict.table_for_dict
+CREATE TABLE 01280_db.table_for_dict
 (
   k1 String,
   k2 Int32,
@@ -17,16 +17,16 @@ CREATE TABLE database_for_dict.table_for_dict
 ENGINE = MergeTree()
 ORDER BY (k1, k2);
 
-INSERT INTO database_for_dict.table_for_dict VALUES (toString(1), 3, 100, -100, 'clickhouse'), (toString(2), -1, 3, 4, 'database'), (toString(5), -3, 6, 7, 'columns'), (toString(10), -20, 9, 8, '');
-INSERT INTO database_for_dict.table_for_dict SELECT toString(number), number + 1, 0, -1, 'a' FROM system.numbers WHERE number NOT IN (1, 2, 5, 10) LIMIT 370;
-INSERT INTO database_for_dict.table_for_dict SELECT toString(number), number + 10, 0, -1, 'b' FROM system.numbers WHERE number NOT IN (1, 2, 5, 10) LIMIT 370, 370;
-INSERT INTO database_for_dict.table_for_dict SELECT toString(number), number + 100, 0, -1, 'c' FROM system.numbers WHERE number NOT IN (1, 2, 5, 10) LIMIT 700, 370;
+INSERT INTO 01280_db.table_for_dict VALUES (toString(1), 3, 100, -100, 'clickhouse'), (toString(2), -1, 3, 4, 'database'), (toString(5), -3, 6, 7, 'columns'), (toString(10), -20, 9, 8, '');
+INSERT INTO 01280_db.table_for_dict SELECT toString(number), number + 1, 0, -1, 'a' FROM system.numbers WHERE number NOT IN (1, 2, 5, 10) LIMIT 370;
+INSERT INTO 01280_db.table_for_dict SELECT toString(number), number + 10, 0, -1, 'b' FROM system.numbers WHERE number NOT IN (1, 2, 5, 10) LIMIT 370, 370;
+INSERT INTO 01280_db.table_for_dict SELECT toString(number), number + 100, 0, -1, 'c' FROM system.numbers WHERE number NOT IN (1, 2, 5, 10) LIMIT 700, 370;
 
-DROP DICTIONARY IF EXISTS database_for_dict.ssd_dict;
+DROP DICTIONARY IF EXISTS 01280_db.ssd_dict;
 
 -- FIXME filesystem error: in create_directory: Permission denied [/var/lib/clickhouse]
 -- Probably we need rewrite it to integration test
-CREATE DICTIONARY database_for_dict.ssd_dict
+CREATE DICTIONARY 01280_db.ssd_dict
 (
     k1 String,
     k2 Int32,
@@ -35,60 +35,59 @@ CREATE DICTIONARY database_for_dict.ssd_dict
     c String DEFAULT 'none'
 )
 PRIMARY KEY k1, k2
-SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'table_for_dict' PASSWORD '' DB 'database_for_dict'))
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'table_for_dict' PASSWORD '' DB '01280_db'))
 LIFETIME(MIN 1000 MAX 2000)
 LAYOUT(COMPLEX_KEY_SSD_CACHE(FILE_SIZE 8192 PATH '/var/lib/clickhouse/clickhouse_dicts/0d'));
 
 SELECT 'TEST_SMALL';
 SELECT 'VALUE FROM RAM BUFFER';
 
--- NUMBER_OF_ARGUMENTS_DOESNT_MATCH
-SELECT dictHas('database_for_dict.ssd_dict', 'a', tuple('1')); -- { serverError 42 }
+SELECT dictHas('01280_db.ssd_dict', 'a', tuple('1')); -- { serverError 43 }
 
-SELECT dictGetUInt64('database_for_dict.ssd_dict', 'a', tuple('1', toInt32(3)));
-SELECT dictGetInt32('database_for_dict.ssd_dict', 'b', tuple('1', toInt32(3)));
-SELECT dictGetString('database_for_dict.ssd_dict', 'c', tuple('1', toInt32(3)));
+SELECT dictGetUInt64('01280_db.ssd_dict', 'a', tuple('1', toInt32(3)));
+SELECT dictGetInt32('01280_db.ssd_dict', 'b', tuple('1', toInt32(3)));
+SELECT dictGetString('01280_db.ssd_dict', 'c', tuple('1', toInt32(3)));
 
-SELECT dictGetUInt64('database_for_dict.ssd_dict', 'a', tuple('1', toInt32(3)));
-SELECT dictGetInt32('database_for_dict.ssd_dict', 'b', tuple('1', toInt32(3)));
-SELECT dictGetString('database_for_dict.ssd_dict', 'c', tuple('1', toInt32(3)));
+SELECT dictGetUInt64('01280_db.ssd_dict', 'a', tuple('1', toInt32(3)));
+SELECT dictGetInt32('01280_db.ssd_dict', 'b', tuple('1', toInt32(3)));
+SELECT dictGetString('01280_db.ssd_dict', 'c', tuple('1', toInt32(3)));
 
-SELECT dictGetUInt64('database_for_dict.ssd_dict', 'a', tuple('2', toInt32(-1)));
-SELECT dictGetInt32('database_for_dict.ssd_dict', 'b', tuple('2', toInt32(-1)));
-SELECT dictGetString('database_for_dict.ssd_dict', 'c', tuple('2', toInt32(-1)));
+SELECT dictGetUInt64('01280_db.ssd_dict', 'a', tuple('2', toInt32(-1)));
+SELECT dictGetInt32('01280_db.ssd_dict', 'b', tuple('2', toInt32(-1)));
+SELECT dictGetString('01280_db.ssd_dict', 'c', tuple('2', toInt32(-1)));
 
-SELECT dictGetUInt64('database_for_dict.ssd_dict', 'a', tuple('5', toInt32(-3)));
-SELECT dictGetInt32('database_for_dict.ssd_dict', 'b', tuple('5', toInt32(-3)));
-SELECT dictGetString('database_for_dict.ssd_dict', 'c', tuple('5', toInt32(-3)));
+SELECT dictGetUInt64('01280_db.ssd_dict', 'a', tuple('5', toInt32(-3)));
+SELECT dictGetInt32('01280_db.ssd_dict', 'b', tuple('5', toInt32(-3)));
+SELECT dictGetString('01280_db.ssd_dict', 'c', tuple('5', toInt32(-3)));
 
-SELECT dictGetUInt64('database_for_dict.ssd_dict', 'a', tuple('10', toInt32(-20)));
-SELECT dictGetInt32('database_for_dict.ssd_dict', 'b', tuple('10', toInt32(-20)));
-SELECT dictGetString('database_for_dict.ssd_dict', 'c', tuple('10', toInt32(-20)));
+SELECT dictGetUInt64('01280_db.ssd_dict', 'a', tuple('10', toInt32(-20)));
+SELECT dictGetInt32('01280_db.ssd_dict', 'b', tuple('10', toInt32(-20)));
+SELECT dictGetString('01280_db.ssd_dict', 'c', tuple('10', toInt32(-20)));
 
-SELECT dictGetUInt64('database_for_dict.ssd_dict', 'a', tuple(toInt32(3))); --{serverError 53}
+SELECT dictGetUInt64('01280_db.ssd_dict', 'a', tuple(toInt32(3))); --{serverError 53}
 
-DROP DICTIONARY database_for_dict.ssd_dict;
+DROP DICTIONARY 01280_db.ssd_dict;
 
-DROP TABLE IF EXISTS database_for_dict.keys_table;
+DROP TABLE IF EXISTS 01280_db.keys_table;
 
-CREATE TABLE database_for_dict.keys_table
+CREATE TABLE 01280_db.keys_table
 (
     k1 String,
     k2 Int32
 )
 ENGINE = StripeLog();
 
-INSERT INTO database_for_dict.keys_table VALUES ('1', 3);
-INSERT INTO database_for_dict.keys_table SELECT toString(intHash64(number + 1) % 1200), 11 + intHash64(number) % 1200 FROM system.numbers LIMIT 370;
-INSERT INTO database_for_dict.keys_table VALUES ('2', -1);
-INSERT INTO database_for_dict.keys_table SELECT toString(intHash64(number + 1) % 1200), 11 + intHash64(number) % 1200 FROM system.numbers LIMIT 370, 370;
-INSERT INTO database_for_dict.keys_table VALUES ('5', -3);
-INSERT INTO database_for_dict.keys_table SELECT toString(intHash64(number + 1) % 1200), 11 + intHash64(number) % 1200 FROM system.numbers LIMIT 700, 370;
-INSERT INTO database_for_dict.keys_table VALUES ('10', -20);
+INSERT INTO 01280_db.keys_table VALUES ('1', 3);
+INSERT INTO 01280_db.keys_table SELECT toString(intHash64(number + 1) % 1200), 11 + intHash64(number) % 1200 FROM system.numbers LIMIT 370;
+INSERT INTO 01280_db.keys_table VALUES ('2', -1);
+INSERT INTO 01280_db.keys_table SELECT toString(intHash64(number + 1) % 1200), 11 + intHash64(number) % 1200 FROM system.numbers LIMIT 370, 370;
+INSERT INTO 01280_db.keys_table VALUES ('5', -3);
+INSERT INTO 01280_db.keys_table SELECT toString(intHash64(number + 1) % 1200), 11 + intHash64(number) % 1200 FROM system.numbers LIMIT 700, 370;
+INSERT INTO 01280_db.keys_table VALUES ('10', -20);
 
-DROP DICTIONARY IF EXISTS database_for_dict.ssd_dict;
+DROP DICTIONARY IF EXISTS 01280_db.ssd_dict;
 
-CREATE DICTIONARY database_for_dict.ssd_dict
+CREATE DICTIONARY 01280_db.ssd_dict
 (
     k1 String,
     k2 Int32,
@@ -97,43 +96,43 @@ CREATE DICTIONARY database_for_dict.ssd_dict
     c String DEFAULT 'none'
 )
 PRIMARY KEY k1, k2
-SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'table_for_dict' PASSWORD '' DB 'database_for_dict'))
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'table_for_dict' PASSWORD '' DB '01280_db'))
 LIFETIME(MIN 1000 MAX 2000)
-LAYOUT(COMPLEX_KEY_SSD_CACHE(FILE_SIZE 8192 PATH '/var/lib/clickhouse/clickhouse_dicts/1d' BLOCK_SIZE 512 WRITE_BUFFER_SIZE 4096 MAX_STORED_KEYS 1000000));
+LAYOUT(COMPLEX_KEY_SSD_CACHE(FILE_SIZE 8192 PATH '/var/lib/clickhouse/clickhouse_dicts/1d' BLOCK_SIZE 512 WRITE_BUFFER_SIZE 4096));
 
 SELECT 'UPDATE DICTIONARY';
 -- 118
-SELECT sum(dictGetUInt64('database_for_dict.ssd_dict', 'a', (k1, k2))) FROM database_for_dict.keys_table;
+SELECT sum(dictGetUInt64('01280_db.ssd_dict', 'a', (k1, k2))) FROM 01280_db.keys_table;
 
 SELECT 'VALUE FROM DISK';
 -- -100
-SELECT dictGetInt32('database_for_dict.ssd_dict', 'b', ('1', toInt32(3)));
+SELECT dictGetInt32('01280_db.ssd_dict', 'b', ('1', toInt32(3)));
 
 -- 'clickhouse'
-SELECT dictGetString('database_for_dict.ssd_dict', 'c', ('1', toInt32(3)));
+SELECT dictGetString('01280_db.ssd_dict', 'c', ('1', toInt32(3)));
 
 SELECT 'VALUE FROM RAM BUFFER';
 -- 8
-SELECT dictGetInt32('database_for_dict.ssd_dict', 'b', ('10', toInt32(-20)));
+SELECT dictGetInt32('01280_db.ssd_dict', 'b', ('10', toInt32(-20)));
 
 -- ''
-SELECT dictGetString('database_for_dict.ssd_dict', 'c', ('10', toInt32(-20)));
+SELECT dictGetString('01280_db.ssd_dict', 'c', ('10', toInt32(-20)));
 
 SELECT 'VALUES FROM DISK AND RAM BUFFER';
 -- 118
-SELECT sum(dictGetUInt64('database_for_dict.ssd_dict', 'a', (k1, k2))) FROM database_for_dict.keys_table;
+SELECT sum(dictGetUInt64('01280_db.ssd_dict', 'a', (k1, k2))) FROM 01280_db.keys_table;
 
 SELECT 'HAS';
 -- 6
-SELECT count() FROM database_for_dict.keys_table WHERE dictHas('database_for_dict.ssd_dict', (k1, k2));
+SELECT count() FROM 01280_db.keys_table WHERE dictHas('01280_db.ssd_dict', (k1, k2));
 
 SELECT 'VALUES NOT FROM TABLE';
 -- 0 -1 none
-SELECT dictGetUInt64('database_for_dict.ssd_dict', 'a', ('unknown', toInt32(0))), dictGetInt32('database_for_dict.ssd_dict', 'b', ('unknown', toInt32(0))), dictGetString('database_for_dict.ssd_dict', 'c', ('unknown', toInt32(0)));
-SELECT dictGetUInt64('database_for_dict.ssd_dict', 'a', ('unknown', toInt32(0))), dictGetInt32('database_for_dict.ssd_dict', 'b', ('unknown', toInt32(0))), dictGetString('database_for_dict.ssd_dict', 'c', ('unknown', toInt32(0)));
+SELECT dictGetUInt64('01280_db.ssd_dict', 'a', ('unknown', toInt32(0))), dictGetInt32('01280_db.ssd_dict', 'b', ('unknown', toInt32(0))), dictGetString('01280_db.ssd_dict', 'c', ('unknown', toInt32(0)));
+SELECT dictGetUInt64('01280_db.ssd_dict', 'a', ('unknown', toInt32(0))), dictGetInt32('01280_db.ssd_dict', 'b', ('unknown', toInt32(0))), dictGetString('01280_db.ssd_dict', 'c', ('unknown', toInt32(0)));
 
 SELECT 'DUPLICATE KEYS';
-SELECT arrayJoin([('1', toInt32(3)), ('2', toInt32(-1)), ('', toInt32(0)), ('', toInt32(0)), ('2', toInt32(-1)), ('1', toInt32(3))]) AS keys, dictGetInt32('database_for_dict.ssd_dict', 'b', keys);
+SELECT arrayJoin([('1', toInt32(3)), ('2', toInt32(-1)), ('', toInt32(0)), ('', toInt32(0)), ('2', toInt32(-1)), ('1', toInt32(3))]) AS keys, dictGetInt32('01280_db.ssd_dict', 'b', keys);
 
 DROP DICTIONARY IF EXISTS database_for_dict.ssd_dict;
 
diff --git a/tests/queries/0_stateless/01291_aggregation_in_order.sql b/tests/queries/0_stateless/01291_aggregation_in_order.sql
index 753075f2757..c4357811520 100644
--- a/tests/queries/0_stateless/01291_aggregation_in_order.sql
+++ b/tests/queries/0_stateless/01291_aggregation_in_order.sql
@@ -9,12 +9,12 @@ INSERT INTO pk_order(a, b, c, d) VALUES (2, 2, 107, 2), (2, 3, 108, 2), (2, 4, 1
 
 -- Order after group by in order is determined
 
-SELECT a, b FROM pk_order GROUP BY a, b;
-SELECT a FROM pk_order GROUP BY a;
+SELECT a, b FROM pk_order GROUP BY a, b ORDER BY a, b;
+SELECT a FROM pk_order GROUP BY a ORDER BY a;
 
-SELECT a, b, sum(c), avg(d) FROM pk_order GROUP BY a, b;
-SELECT a, sum(c), avg(d) FROM pk_order GROUP BY a;
-SELECT a, sum(c), avg(d) FROM pk_order GROUP BY -a;
+SELECT a, b, sum(c), avg(d) FROM pk_order GROUP BY a, b ORDER BY a, b;
+SELECT a, sum(c), avg(d) FROM pk_order GROUP BY a ORDER BY a;
+SELECT a, sum(c), avg(d) FROM pk_order GROUP BY -a ORDER BY a;
 
 DROP TABLE IF EXISTS pk_order;
 
@@ -26,8 +26,8 @@ INSERT INTO pk_order
 
 set max_block_size = 1;
 
-SELECT d, max(b) FROM pk_order GROUP BY d, a LIMIT 5;
-SELECT d, avg(a) FROM pk_order GROUP BY toString(d) LIMIT 5;
-SELECT toStartOfHour(d) as d1, min(a), max(b) FROM pk_order GROUP BY d1 LIMIT 5;
+SELECT d, max(b) FROM pk_order GROUP BY d, a ORDER BY d, a LIMIT 5;
+SELECT d, avg(a) FROM pk_order GROUP BY toString(d) ORDER BY toString(d) LIMIT 5;
+SELECT toStartOfHour(d) as d1, min(a), max(b) FROM pk_order GROUP BY d1 ORDER BY d1 LIMIT 5;
 
 DROP TABLE pk_order;
diff --git a/tests/queries/0_stateless/01293_show_clusters.reference b/tests/queries/0_stateless/01293_show_clusters.reference
index 590ca348458..ad790cc8b4f 100644
--- a/tests/queries/0_stateless/01293_show_clusters.reference
+++ b/tests/queries/0_stateless/01293_show_clusters.reference
@@ -1,2 +1,2 @@
 test_shard_localhost
-test_shard_localhost	1	1	1	localhost	::1	9000	1	default		0	0
+test_shard_localhost	1	1	1	localhost	::1	9000	1	default		0	0	0
diff --git a/tests/queries/0_stateless/01293_show_settings.reference b/tests/queries/0_stateless/01293_show_settings.reference
index feebc9e473d..6fcbf194614 100644
--- a/tests/queries/0_stateless/01293_show_settings.reference
+++ b/tests/queries/0_stateless/01293_show_settings.reference
@@ -1,5 +1,5 @@
 send_timeout	Seconds	300
 connect_timeout	Seconds	10
-connect_timeout_with_failover_ms	Milliseconds	50
-connect_timeout_with_failover_secure_ms	Milliseconds	100
+connect_timeout_with_failover_ms	Milliseconds	2000
+connect_timeout_with_failover_secure_ms	Milliseconds	3000
 max_memory_usage	UInt64	10000000000
diff --git a/tests/queries/0_stateless/01293_system_distribution_queue.sql b/tests/queries/0_stateless/01293_system_distribution_queue.sql
index 8f84bbac41f..dc63dece960 100644
--- a/tests/queries/0_stateless/01293_system_distribution_queue.sql
+++ b/tests/queries/0_stateless/01293_system_distribution_queue.sql
@@ -10,20 +10,15 @@ select * from system.distribution_queue;
 select 'INSERT';
 system stop distributed sends dist_01293;
 insert into dist_01293 select * from numbers(10);
--- metrics updated only after distributed_directory_monitor_sleep_time_ms
-set distributed_directory_monitor_sleep_time_ms=10;
--- 1 second should guarantee metrics update
--- XXX: but this is kind of quirk, way more better will be account this metrics without any delays.
-select sleep(1) format Null;
-select is_blocked, error_count, data_files, data_compressed_bytes>100 from system.distribution_queue;
+select is_blocked, error_count, data_files, data_compressed_bytes>100 from system.distribution_queue where database = currentDatabase();
 system flush distributed dist_01293;
 
 select 'FLUSH';
-select is_blocked, error_count, data_files, data_compressed_bytes from system.distribution_queue;
+select is_blocked, error_count, data_files, data_compressed_bytes from system.distribution_queue where database = currentDatabase();
 
 select 'UNBLOCK';
 system start distributed sends dist_01293;
-select is_blocked, error_count, data_files, data_compressed_bytes from system.distribution_queue;
+select is_blocked, error_count, data_files, data_compressed_bytes from system.distribution_queue where database = currentDatabase();
 
 drop table null_01293;
 drop table dist_01293;
diff --git a/tests/queries/0_stateless/01294_create_settings_profile.reference b/tests/queries/0_stateless/01294_create_settings_profile.reference
index ab1b3833419..da47b084070 100644
--- a/tests/queries/0_stateless/01294_create_settings_profile.reference
+++ b/tests/queries/0_stateless/01294_create_settings_profile.reference
@@ -38,8 +38,12 @@ CREATE SETTINGS PROFILE s2_01294 SETTINGS max_memory_usage = 5000000
 CREATE SETTINGS PROFILE s3_01294 TO ALL
 CREATE SETTINGS PROFILE s4_01294 TO ALL
 CREATE SETTINGS PROFILE s1_01294 SETTINGS max_memory_usage = 6000000
+CREATE SETTINGS PROFILE s2_01294 SETTINGS max_memory_usage = 6000000
+CREATE SETTINGS PROFILE s3_01294 TO ALL
+CREATE SETTINGS PROFILE s4_01294 TO ALL
+CREATE SETTINGS PROFILE s1_01294 SETTINGS max_memory_usage = 6000000
 CREATE SETTINGS PROFILE s2_01294 SETTINGS max_memory_usage = 6000000 TO r1_01294
-CREATE SETTINGS PROFILE s3_01294 SETTINGS max_memory_usage = 6000000 TO r1_01294
+CREATE SETTINGS PROFILE s3_01294 TO r1_01294
 CREATE SETTINGS PROFILE s4_01294 TO r1_01294
 -- readonly ambiguity
 CREATE SETTINGS PROFILE s1_01294 SETTINGS readonly = 1
@@ -53,7 +57,8 @@ s1_01294	local directory	0	0	[]	[]
 s2_01294	local directory	1	0	['r1_01294']	[]
 s3_01294	local directory	1	0	['r1_01294']	[]
 s4_01294	local directory	1	0	['r1_01294']	[]
-s5_01294	local directory	3	1	[]	['r1_01294']
+s5_01294	local directory	3	0	['u1_01294']	[]
+s6_01294	local directory	0	1	[]	['r1_01294','u1_01294']
 -- system.settings_profile_elements
 s2_01294	\N	\N	0	readonly	0	\N	\N	\N	\N
 s3_01294	\N	\N	0	max_memory_usage	5000000	4000000	6000000	1	\N
diff --git a/tests/queries/0_stateless/01294_create_settings_profile.sql b/tests/queries/0_stateless/01294_create_settings_profile.sql
index 9dbabd3f068..b7dd91ad6ed 100644
--- a/tests/queries/0_stateless/01294_create_settings_profile.sql
+++ b/tests/queries/0_stateless/01294_create_settings_profile.sql
@@ -82,7 +82,8 @@ SELECT '-- multiple profiles in one command';
 CREATE PROFILE s1_01294, s2_01294 SETTINGS max_memory_usage=5000000;
 CREATE PROFILE s3_01294, s4_01294 TO ALL;
 SHOW CREATE PROFILE s1_01294, s2_01294, s3_01294, s4_01294;
-ALTER PROFILE s1_01294, s2_01294, s3_01294 SETTINGS max_memory_usage=6000000;
+ALTER PROFILE s1_01294, s2_01294 SETTINGS max_memory_usage=6000000;
+SHOW CREATE PROFILE s1_01294, s2_01294, s3_01294, s4_01294;
 ALTER PROFILE s2_01294, s3_01294, s4_01294 TO r1_01294;
 SHOW CREATE PROFILE s1_01294, s2_01294, s3_01294, s4_01294;
 DROP PROFILE s1_01294, s2_01294, s3_01294, s4_01294;
@@ -107,12 +108,13 @@ CREATE PROFILE s1_01294;
 CREATE PROFILE s2_01294 SETTINGS readonly=0 TO r1_01294;;
 CREATE PROFILE s3_01294 SETTINGS max_memory_usage=5000000 MIN 4000000 MAX 6000000 READONLY TO r1_01294;
 CREATE PROFILE s4_01294 SETTINGS max_memory_usage=5000000 TO r1_01294;
-CREATE PROFILE s5_01294 SETTINGS INHERIT default, readonly=0, max_memory_usage MAX 6000000 WRITABLE TO ALL EXCEPT r1_01294;
+CREATE PROFILE s5_01294 SETTINGS INHERIT default, readonly=0, max_memory_usage MAX 6000000 WRITABLE TO u1_01294;
+CREATE PROFILE s6_01294 TO ALL EXCEPT u1_01294, r1_01294;
 SELECT name, storage, num_elements, apply_to_all, apply_to_list, apply_to_except FROM system.settings_profiles WHERE name LIKE 's%\_01294' ORDER BY name;
 
 SELECT '-- system.settings_profile_elements';
 SELECT * FROM system.settings_profile_elements WHERE profile_name LIKE 's%\_01294' ORDER BY profile_name, index;
-DROP PROFILE s1_01294, s2_01294, s3_01294, s4_01294, s5_01294;
+DROP PROFILE s1_01294, s2_01294, s3_01294, s4_01294, s5_01294, s6_01294;
 
 DROP ROLE r1_01294;
 DROP USER u1_01294;
diff --git a/tests/queries/0_stateless/01294_lazy_database_concurrent_recreate_reattach_and_show_tables.reference b/tests/queries/0_stateless/01294_lazy_database_concurrent_recreate_reattach_and_show_tables_long.reference
similarity index 100%
rename from tests/queries/0_stateless/01294_lazy_database_concurrent_recreate_reattach_and_show_tables.reference
rename to tests/queries/0_stateless/01294_lazy_database_concurrent_recreate_reattach_and_show_tables_long.reference
diff --git a/tests/queries/0_stateless/01294_lazy_database_concurrent_recreate_reattach_and_show_tables.sh b/tests/queries/0_stateless/01294_lazy_database_concurrent_recreate_reattach_and_show_tables_long.sh
similarity index 94%
rename from tests/queries/0_stateless/01294_lazy_database_concurrent_recreate_reattach_and_show_tables.sh
rename to tests/queries/0_stateless/01294_lazy_database_concurrent_recreate_reattach_and_show_tables_long.sh
index d8f72c7837d..f5a4a1adac0 100755
--- a/tests/queries/0_stateless/01294_lazy_database_concurrent_recreate_reattach_and_show_tables.sh
+++ b/tests/queries/0_stateless/01294_lazy_database_concurrent_recreate_reattach_and_show_tables_long.sh
@@ -70,8 +70,10 @@ function recreate_lazy_func4()
 function test_func()
 {
     while true; do
-        $CLICKHOUSE_CLIENT -q "SYSTEM STOP TTL MERGES";
+        for table in log tlog slog tlog2; do
+            $CLICKHOUSE_CLIENT -q "SYSTEM STOP TTL MERGES $CURR_DATABASE.$table" >& /dev/null
         done
+    done
 }
 
 
diff --git a/tests/queries/0_stateless/01300_polygon_convex_hull.reference b/tests/queries/0_stateless/01300_polygon_convex_hull.reference
new file mode 100644
index 00000000000..47be3068b5c
--- /dev/null
+++ b/tests/queries/0_stateless/01300_polygon_convex_hull.reference
@@ -0,0 +1 @@
+[[(0,0),(0,5),(5,5),(5,0),(0,0)]]
diff --git a/tests/queries/0_stateless/01300_polygon_convex_hull.sql b/tests/queries/0_stateless/01300_polygon_convex_hull.sql
new file mode 100644
index 00000000000..4a4aa66bbfb
--- /dev/null
+++ b/tests/queries/0_stateless/01300_polygon_convex_hull.sql
@@ -0,0 +1 @@
+select polygonConvexHullCartesian([[[(0., 0.), (0., 5.), (5., 5.), (5., 0.), (2., 3.)]]]);
diff --git a/tests/queries/0_stateless/01300_read_wkt.reference b/tests/queries/0_stateless/01300_read_wkt.reference
new file mode 100644
index 00000000000..acee1c8f14b
--- /dev/null
+++ b/tests/queries/0_stateless/01300_read_wkt.reference
@@ -0,0 +1,16 @@
+(0,0)
+[[(1,0),(10,0),(10,10),(0,10),(1,0)]]
+[[(0,0),(10,0),(10,10),(0,10),(0,0)],[(4,4),(5,4),(5,5),(4,5),(4,4)]]
+[[[(2,0),(10,0),(10,10),(0,10),(2,0)],[(4,4),(5,4),(5,5),(4,5),(4,4)]],[[(-10,-10),(-10,-9),(-9,10),(-10,-10)]]]
+(0,0)
+(1,0)
+(2,0)
+[[(1,0),(10,0),(10,10),(0,10),(1,0)]]
+[[(0,0),(10,0),(10,10),(0,10),(0,0)]]
+[[(2,0),(10,0),(10,10),(0,10),(2,0)]]
+[[(0,0),(10,0),(10,10),(0,10),(0,0)],[(4,4),(5,4),(5,5),(4,5),(4,4)]]
+[[(2,0),(10,0),(10,10),(0,10),(2,0)],[(4,4),(5,4),(5,5),(4,5),(4,4)]]
+[[(1,0),(10,0),(10,10),(0,10),(1,0)],[(4,4),(5,4),(5,5),(4,5),(4,4)]]
+[[[(1,0),(10,0),(10,10),(0,10),(1,0)],[(4,4),(5,4),(5,5),(4,5),(4,4)]],[[(-10,-10),(-10,-9),(-9,10),(-10,-10)]]]
+[[[(0,0),(10,0),(10,10),(0,10),(0,0)],[(4,4),(5,4),(5,5),(4,5),(4,4)]],[[(-10,-10),(-10,-9),(-9,10),(-10,-10)]]]
+[[[(2,0),(10,0),(10,10),(0,10),(2,0)],[(4,4),(5,4),(5,5),(4,5),(4,4)]],[[(-10,-10),(-10,-9),(-9,10),(-10,-10)]]]
diff --git a/tests/queries/0_stateless/01300_read_wkt.sql b/tests/queries/0_stateless/01300_read_wkt.sql
new file mode 100644
index 00000000000..8121bdf6084
--- /dev/null
+++ b/tests/queries/0_stateless/01300_read_wkt.sql
@@ -0,0 +1,30 @@
+SELECT readWktPoint('POINT(0 0)');
+SELECT readWktPolygon('POLYGON((1 0,10 0,10 10,0 10,1 0))');
+SELECT readWktPolygon('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,5 4,5 5,4 5,4 4))');
+SELECT readWktMultiPolygon('MULTIPOLYGON(((2 0,10 0,10 10,0 10,2 0),(4 4,5 4,5 5,4 5,4 4)),((-10 -10,-10 -9,-9 10,-10 -10)))');
+
+DROP TABLE IF EXISTS geo;
+CREATE TABLE geo (s String, id Int) engine=Memory();
+INSERT INTO geo VALUES ('POINT(0 0)', 1);
+INSERT INTO geo VALUES ('POINT(1 0)', 2);
+INSERT INTO geo VALUES ('POINT(2 0)', 3);
+SELECT readWktPoint(s) FROM geo ORDER BY id;
+
+DROP TABLE IF EXISTS geo;
+CREATE TABLE geo (s String, id Int) engine=Memory();
+INSERT INTO geo VALUES ('POLYGON((1 0,10 0,10 10,0 10,1 0))', 1);
+INSERT INTO geo VALUES ('POLYGON((0 0,10 0,10 10,0 10,0 0))', 2);
+INSERT INTO geo VALUES ('POLYGON((2 0,10 0,10 10,0 10,2 0))', 3);
+INSERT INTO geo VALUES ('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,5 4,5 5,4 5,4 4))', 4);
+INSERT INTO geo VALUES ('POLYGON((2 0,10 0,10 10,0 10,2 0),(4 4,5 4,5 5,4 5,4 4))', 5);
+INSERT INTO geo VALUES ('POLYGON((1 0,10 0,10 10,0 10,1 0),(4 4,5 4,5 5,4 5,4 4))', 6);
+SELECT readWktPolygon(s) FROM geo ORDER BY id;
+
+DROP TABLE IF EXISTS geo;
+CREATE TABLE geo (s String, id Int) engine=Memory();
+INSERT INTO geo VALUES ('MULTIPOLYGON(((1 0,10 0,10 10,0 10,1 0),(4 4,5 4,5 5,4 5,4 4)),((-10 -10,-10 -9,-9 10,-10 -10)))', 1);
+INSERT INTO geo VALUES ('MULTIPOLYGON(((0 0,10 0,10 10,0 10,0 0),(4 4,5 4,5 5,4 5,4 4)),((-10 -10,-10 -9,-9 10,-10 -10)))', 2);
+INSERT INTO geo VALUES ('MULTIPOLYGON(((2 0,10 0,10 10,0 10,2 0),(4 4,5 4,5 5,4 5,4 4)),((-10 -10,-10 -9,-9 10,-10 -10)))', 3);
+SELECT readWktMultiPolygon(s) FROM geo ORDER BY id;
+
+DROP TABLE geo;
diff --git a/tests/queries/0_stateless/01300_svg.reference b/tests/queries/0_stateless/01300_svg.reference
new file mode 100644
index 00000000000..d39d67ff273
--- /dev/null
+++ b/tests/queries/0_stateless/01300_svg.reference
@@ -0,0 +1,56 @@
+<circle cx="0" cy="0" r="5" style=""/>
+<polygon points="0,0 0,10 10,10 10,0 0,0" style=""/>
+<g fill-rule="evenodd"><path d="M 0,0 L 0,10 L 10,10 L 10,0 L 0,0M 4,4 L 5,4 L 5,5 L 4,5 L 4,4 z " style=""/></g>
+<g fill-rule="evenodd"><path d="M 0,0 L 0,10 L 10,10 L 10,0 L 0,0M 4,4 L 5,4 L 5,5 L 4,5 L 4,4 z " style=""/></g><g fill-rule="evenodd"><path d="M -10,-10 L -10,-9 L -9,10 L -10,-10 z " style=""/></g>
+<circle cx="0" cy="0" r="5" style="b"/>
+<polygon points="0,0 0,10 10,10 10,0 0,0" style="b"/>
+<g fill-rule="evenodd"><path d="M 0,0 L 0,10 L 10,10 L 10,0 L 0,0M 4,4 L 5,4 L 5,5 L 4,5 L 4,4 z " style="b"/></g>
+<g fill-rule="evenodd"><path d="M 0,0 L 0,10 L 10,10 L 10,0 L 0,0M 4,4 L 5,4 L 5,5 L 4,5 L 4,4 z " style="b"/></g><g fill-rule="evenodd"><path d="M -10,-10 L -10,-9 L -9,10 L -10,-10 z " style="b"/></g>
+<circle cx="0" cy="0" r="5" style=""/>
+<circle cx="1" cy="0" r="5" style=""/>
+<circle cx="2" cy="0" r="5" style=""/>
+<circle cx="0" cy="0" r="5" style="b"/>
+<circle cx="1" cy="0" r="5" style="b"/>
+<circle cx="2" cy="0" r="5" style="b"/>
+<circle cx="0" cy="0" r="5" style="b"/>
+<circle cx="0" cy="0" r="5" style="c"/>
+<circle cx="0" cy="0" r="5" style="d"/>
+<circle cx="0" cy="0" r="5" style="b"/>
+<circle cx="1" cy="0" r="5" style="c"/>
+<circle cx="2" cy="0" r="5" style="d"/>
+<polygon points="0,0 0,10 10,10 10,0 0,0" style=""/>
+<polygon points="1,0 0,10 10,10 10,0 1,0" style=""/>
+<polygon points="2,0 0,10 10,10 10,0 2,0" style=""/>
+<polygon points="0,0 0,10 10,10 10,0 0,0" style="b"/>
+<polygon points="1,0 0,10 10,10 10,0 1,0" style="b"/>
+<polygon points="2,0 0,10 10,10 10,0 2,0" style="b"/>
+<polygon points="0,0 0,10 10,10 10,0 0,0" style="b"/>
+<polygon points="0,0 0,10 10,10 10,0 0,0" style="c"/>
+<polygon points="0,0 0,10 10,10 10,0 0,0" style="d"/>
+<polygon points="0,0 0,10 10,10 10,0 0,0" style="b"/>
+<polygon points="1,0 0,10 10,10 10,0 1,0" style="c"/>
+<polygon points="2,0 0,10 10,10 10,0 2,0" style="d"/>
+<g fill-rule="evenodd"><path d="M 0,0 L 0,10 L 10,10 L 10,0 L 0,0M 4,4 L 5,4 L 5,5 L 4,5 L 4,4 z " style=""/></g>
+<g fill-rule="evenodd"><path d="M 1,0 L 0,10 L 10,10 L 10,0 L 1,0M 4,4 L 5,4 L 5,5 L 4,5 L 4,4 z " style=""/></g>
+<g fill-rule="evenodd"><path d="M 2,0 L 0,10 L 10,10 L 10,0 L 2,0M 4,4 L 5,4 L 5,5 L 4,5 L 4,4 z " style=""/></g>
+<g fill-rule="evenodd"><path d="M 0,0 L 0,10 L 10,10 L 10,0 L 0,0M 4,4 L 5,4 L 5,5 L 4,5 L 4,4 z " style="b"/></g>
+<g fill-rule="evenodd"><path d="M 1,0 L 0,10 L 10,10 L 10,0 L 1,0M 4,4 L 5,4 L 5,5 L 4,5 L 4,4 z " style="b"/></g>
+<g fill-rule="evenodd"><path d="M 2,0 L 0,10 L 10,10 L 10,0 L 2,0M 4,4 L 5,4 L 5,5 L 4,5 L 4,4 z " style="b"/></g>
+<g fill-rule="evenodd"><path d="M 0,0 L 0,10 L 10,10 L 10,0 L 0,0M 4,4 L 5,4 L 5,5 L 4,5 L 4,4 z " style="b"/></g>
+<g fill-rule="evenodd"><path d="M 0,0 L 0,10 L 10,10 L 10,0 L 0,0M 4,4 L 5,4 L 5,5 L 4,5 L 4,4 z " style="c"/></g>
+<g fill-rule="evenodd"><path d="M 0,0 L 0,10 L 10,10 L 10,0 L 0,0M 4,4 L 5,4 L 5,5 L 4,5 L 4,4 z " style="d"/></g>
+<g fill-rule="evenodd"><path d="M 0,0 L 0,10 L 10,10 L 10,0 L 0,0M 4,4 L 5,4 L 5,5 L 4,5 L 4,4 z " style="b"/></g>
+<g fill-rule="evenodd"><path d="M 1,0 L 0,10 L 10,10 L 10,0 L 1,0M 4,4 L 5,4 L 5,5 L 4,5 L 4,4 z " style="c"/></g>
+<g fill-rule="evenodd"><path d="M 2,0 L 0,10 L 10,10 L 10,0 L 2,0M 4,4 L 5,4 L 5,5 L 4,5 L 4,4 z " style="d"/></g>
+<g fill-rule="evenodd"><path d="M 0,0 L 0,10 L 10,10 L 10,0 L 0,0M 4,4 L 5,4 L 5,5 L 4,5 L 4,4 z " style=""/></g><g fill-rule="evenodd"><path d="M -10,-10 L -10,-9 L -9,10 L -10,-10 z " style=""/></g>
+<g fill-rule="evenodd"><path d="M 1,0 L 0,10 L 10,10 L 10,0 L 1,0M 4,4 L 5,4 L 5,5 L 4,5 L 4,4 z " style=""/></g><g fill-rule="evenodd"><path d="M -10,-10 L -10,-9 L -9,10 L -10,-10 z " style=""/></g>
+<g fill-rule="evenodd"><path d="M 2,0 L 0,10 L 10,10 L 10,0 L 2,0M 4,4 L 5,4 L 5,5 L 4,5 L 4,4 z " style=""/></g><g fill-rule="evenodd"><path d="M -10,-10 L -10,-9 L -9,10 L -10,-10 z " style=""/></g>
+<g fill-rule="evenodd"><path d="M 0,0 L 0,10 L 10,10 L 10,0 L 0,0M 4,4 L 5,4 L 5,5 L 4,5 L 4,4 z " style="b"/></g><g fill-rule="evenodd"><path d="M -10,-10 L -10,-9 L -9,10 L -10,-10 z " style="b"/></g>
+<g fill-rule="evenodd"><path d="M 1,0 L 0,10 L 10,10 L 10,0 L 1,0M 4,4 L 5,4 L 5,5 L 4,5 L 4,4 z " style="b"/></g><g fill-rule="evenodd"><path d="M -10,-10 L -10,-9 L -9,10 L -10,-10 z " style="b"/></g>
+<g fill-rule="evenodd"><path d="M 2,0 L 0,10 L 10,10 L 10,0 L 2,0M 4,4 L 5,4 L 5,5 L 4,5 L 4,4 z " style="b"/></g><g fill-rule="evenodd"><path d="M -10,-10 L -10,-9 L -9,10 L -10,-10 z " style="b"/></g>
+<g fill-rule="evenodd"><path d="M 0,0 L 0,10 L 10,10 L 10,0 L 0,0M 4,4 L 5,4 L 5,5 L 4,5 L 4,4 z " style="b"/></g><g fill-rule="evenodd"><path d="M -10,-10 L -10,-9 L -9,10 L -10,-10 z " style="b"/></g>
+<g fill-rule="evenodd"><path d="M 0,0 L 0,10 L 10,10 L 10,0 L 0,0M 4,4 L 5,4 L 5,5 L 4,5 L 4,4 z " style="c"/></g><g fill-rule="evenodd"><path d="M -10,-10 L -10,-9 L -9,10 L -10,-10 z " style="c"/></g>
+<g fill-rule="evenodd"><path d="M 0,0 L 0,10 L 10,10 L 10,0 L 0,0M 4,4 L 5,4 L 5,5 L 4,5 L 4,4 z " style="d"/></g><g fill-rule="evenodd"><path d="M -10,-10 L -10,-9 L -9,10 L -10,-10 z " style="d"/></g>
+<g fill-rule="evenodd"><path d="M 0,0 L 0,10 L 10,10 L 10,0 L 0,0M 4,4 L 5,4 L 5,5 L 4,5 L 4,4 z " style="b"/></g><g fill-rule="evenodd"><path d="M -10,-10 L -10,-9 L -9,10 L -10,-10 z " style="b"/></g>
+<g fill-rule="evenodd"><path d="M 1,0 L 0,10 L 10,10 L 10,0 L 1,0M 4,4 L 5,4 L 5,5 L 4,5 L 4,4 z " style="c"/></g><g fill-rule="evenodd"><path d="M -10,-10 L -10,-9 L -9,10 L -10,-10 z " style="c"/></g>
+<g fill-rule="evenodd"><path d="M 2,0 L 0,10 L 10,10 L 10,0 L 2,0M 4,4 L 5,4 L 5,5 L 4,5 L 4,4 z " style="d"/></g><g fill-rule="evenodd"><path d="M -10,-10 L -10,-9 L -9,10 L -10,-10 z " style="d"/></g>
diff --git a/tests/queries/0_stateless/01300_svg.sql b/tests/queries/0_stateless/01300_svg.sql
new file mode 100644
index 00000000000..a1deb1745c3
--- /dev/null
+++ b/tests/queries/0_stateless/01300_svg.sql
@@ -0,0 +1,50 @@
+SELECT svg((0., 0.));
+SELECT svg([(0., 0.), (10, 0), (10, 10), (0, 10)]);
+SELECT svg([[(0., 0.), (10, 0), (10, 10), (0, 10)], [(4., 4.), (5, 4), (5, 5), (4, 5)]]);
+SELECT svg([[[(0., 0.), (10, 0), (10, 10), (0, 10)], [(4., 4.), (5, 4), (5, 5), (4, 5)]], [[(-10., -10.), (-10, -9), (-9, 10)]]]);
+SELECT svg((0., 0.), 'b');
+SELECT svg([(0., 0.), (10, 0), (10, 10), (0, 10)], 'b');
+SELECT svg([[(0., 0.), (10, 0), (10, 10), (0, 10)], [(4., 4.), (5, 4), (5, 5), (4, 5)]], 'b');
+SELECT svg([[[(0., 0.), (10, 0), (10, 10), (0, 10)], [(4., 4.), (5, 4), (5, 5), (4, 5)]], [[(-10., -10.), (-10, -9), (-9, 10)]]], 'b');
+
+DROP TABLE IF EXISTS geo;
+CREATE TABLE geo (p Tuple(Float64, Float64), s String, id Int) engine=Memory();
+INSERT INTO geo VALUES ((0., 0.), 'b', 1);
+INSERT INTO geo VALUES ((1., 0.), 'c', 2);
+INSERT INTO geo VALUES ((2., 0.), 'd', 3);
+SELECT svg(p) FROM geo ORDER BY id;
+SELECT svg(p, 'b') FROM geo ORDER BY id;
+SELECT svg((0., 0.), s) FROM geo ORDER BY id;
+SELECT svg(p, s) FROM geo ORDER BY id;
+
+DROP TABLE IF EXISTS geo;
+CREATE TABLE geo (p Array(Tuple(Float64, Float64)), s String, id Int) engine=Memory();
+INSERT INTO geo VALUES ([(0., 0.), (10, 0), (10, 10), (0, 10)], 'b', 1);
+INSERT INTO geo VALUES ([(1., 0.), (10, 0), (10, 10), (0, 10)], 'c', 2);
+INSERT INTO geo VALUES ([(2., 0.), (10, 0), (10, 10), (0, 10)], 'd', 3);
+SELECT svg(p) FROM geo ORDER BY id;
+SELECT svg(p, 'b') FROM geo ORDER BY id;
+SELECT svg([(0., 0.), (10, 0), (10, 10), (0, 10)], s) FROM geo ORDER BY id;
+SELECT svg(p, s) FROM geo ORDER BY id;
+
+DROP TABLE IF EXISTS geo;
+CREATE TABLE geo (p Array(Array(Tuple(Float64, Float64))), s String, id Int) engine=Memory();
+INSERT INTO geo VALUES ([[(0., 0.), (10, 0), (10, 10), (0, 10)], [(4, 4), (5, 4), (5, 5), (4, 5)]], 'b', 1);
+INSERT INTO geo VALUES ([[(1., 0.), (10, 0), (10, 10), (0, 10)], [(4, 4), (5, 4), (5, 5), (4, 5)]], 'c', 2);
+INSERT INTO geo VALUES ([[(2., 0.), (10, 0), (10, 10), (0, 10)], [(4, 4), (5, 4), (5, 5), (4, 5)]], 'd', 3);
+SELECT svg(p) FROM geo ORDER BY id;
+SELECT svg(p, 'b') FROM geo ORDER BY id;
+SELECT svg([[(0., 0.), (10, 0), (10, 10), (0, 10)], [(4., 4.), (5, 4), (5, 5), (4, 5)]], s) FROM geo ORDER BY id;
+SELECT svg(p, s) FROM geo ORDER BY id;
+
+DROP TABLE IF EXISTS geo;
+CREATE TABLE geo (p Array(Array(Array(Tuple(Float64, Float64)))), s String, id Int) engine=Memory();
+INSERT INTO geo VALUES ([[[(0., 0.), (10, 0), (10, 10), (0, 10)], [(4., 4.), (5, 4), (5, 5), (4, 5)]], [[(-10., -10.), (-10, -9), (-9, 10)]]], 'b', 1);
+INSERT INTO geo VALUES ([[[(1., 0.), (10, 0), (10, 10), (0, 10)], [(4., 4.), (5, 4), (5, 5), (4, 5)]], [[(-10., -10.), (-10, -9), (-9, 10)]]], 'c', 2);
+INSERT INTO geo VALUES ([[[(2., 0.), (10, 0), (10, 10), (0, 10)], [(4., 4.), (5, 4), (5, 5), (4, 5)]], [[(-10., -10.), (-10, -9), (-9, 10)]]], 'd', 3);
+SELECT svg(p) FROM geo ORDER BY id;
+SELECT svg(p, 'b') FROM geo ORDER BY id;
+SELECT svg([[[(0., 0.), (10, 0), (10, 10), (0, 10)], [(4., 4.), (5, 4), (5, 5), (4, 5)]], [[(-10., -10.), (-10, -9), (-9, 10)]]], s) FROM geo ORDER BY id;
+SELECT svg(p, s) FROM geo ORDER BY id;
+
+DROP TABLE geo;
diff --git a/tests/queries/0_stateless/01300_wkt.reference b/tests/queries/0_stateless/01300_wkt.reference
new file mode 100644
index 00000000000..0079e9f32df
--- /dev/null
+++ b/tests/queries/0_stateless/01300_wkt.reference
@@ -0,0 +1,16 @@
+POINT(0 0)
+POLYGON((0 0,10 0,10 10,0 10))
+POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,5 4,5 5,4 5,4 4))
+MULTIPOLYGON(((0 0,10 0,10 10,0 10,0 0),(4 4,5 4,5 5,4 5,4 4)),((-10 -10,-10 -9,-9 10,-10 -10)))
+POINT(0 0)
+POINT(1 0)
+POINT(2 0)
+POLYGON((0 0,10 0,10 10,0 10))
+POLYGON((1 0,10 0,10 10,0 10))
+POLYGON((2 0,10 0,10 10,0 10))
+POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,5 4,5 5,4 5,4 4))
+POLYGON((1 0,10 0,10 10,0 10,1 0),(4 4,5 4,5 5,4 5,4 4))
+POLYGON((2 0,10 0,10 10,0 10,2 0),(4 4,5 4,5 5,4 5,4 4))
+MULTIPOLYGON(((0 0,10 0,10 10,0 10,0 0),(4 4,5 4,5 5,4 5,4 4)),((-10 -10,-10 -9,-9 10,-10 -10)))
+MULTIPOLYGON(((1 0,10 0,10 10,0 10,1 0),(4 4,5 4,5 5,4 5,4 4)),((-10 -10,-10 -9,-9 10,-10 -10)))
+MULTIPOLYGON(((2 0,10 0,10 10,0 10,2 0),(4 4,5 4,5 5,4 5,4 4)),((-10 -10,-10 -9,-9 10,-10 -10)))
diff --git a/tests/queries/0_stateless/01300_wkt.sql b/tests/queries/0_stateless/01300_wkt.sql
new file mode 100644
index 00000000000..00063d0a612
--- /dev/null
+++ b/tests/queries/0_stateless/01300_wkt.sql
@@ -0,0 +1,34 @@
+SELECT wkt((0., 0.));
+SELECT wkt([(0., 0.), (10., 0.), (10., 10.), (0., 10.)]);
+SELECT wkt([[(0., 0.), (10., 0.), (10., 10.), (0., 10.)], [(4., 4.), (5., 4.), (5., 5.), (4., 5.)]]);
+SELECT wkt([[[(0., 0.), (10., 0.), (10., 10.), (0., 10.)], [(4., 4.), (5., 4.), (5., 5.), (4., 5.)]], [[(-10., -10.), (-10., -9.), (-9., 10.)]]]);
+
+DROP TABLE IF EXISTS geo;
+CREATE TABLE geo (p Tuple(Float64, Float64), id Int) engine=Memory();
+INSERT INTO geo VALUES ((0, 0), 1);
+INSERT INTO geo VALUES ((1, 0), 2);
+INSERT INTO geo VALUES ((2, 0), 3);
+SELECT wkt(p) FROM geo ORDER BY id;
+
+DROP TABLE IF EXISTS geo;
+CREATE TABLE geo (p Array(Tuple(Float64, Float64)), id Int) engine=Memory();
+INSERT INTO geo VALUES ([(0, 0), (10, 0), (10, 10), (0, 10)], 1);
+INSERT INTO geo VALUES ([(1, 0), (10, 0), (10, 10), (0, 10)], 2);
+INSERT INTO geo VALUES ([(2, 0), (10, 0), (10, 10), (0, 10)], 3);
+SELECT wkt(p) FROM geo ORDER BY id;
+
+DROP TABLE IF EXISTS geo;
+CREATE TABLE geo (p Array(Array(Tuple(Float64, Float64))), id Int) engine=Memory();
+INSERT INTO geo VALUES ([[(0, 0), (10, 0), (10, 10), (0, 10)], [(4, 4), (5, 4), (5, 5), (4, 5)]], 1);
+INSERT INTO geo VALUES ([[(1, 0), (10, 0), (10, 10), (0, 10)], [(4, 4), (5, 4), (5, 5), (4, 5)]], 2);
+INSERT INTO geo VALUES ([[(2, 0), (10, 0), (10, 10), (0, 10)], [(4, 4), (5, 4), (5, 5), (4, 5)]], 3);
+SELECT wkt(p) FROM geo ORDER BY id;
+
+DROP TABLE IF EXISTS geo;
+CREATE TABLE geo (p Array(Array(Array(Tuple(Float64, Float64)))), id Int) engine=Memory();
+INSERT INTO geo VALUES ([[[(0, 0), (10, 0), (10, 10), (0, 10)], [(4, 4), (5, 4), (5, 5), (4, 5)]], [[(-10, -10), (-10, -9), (-9, 10)]]], 1);
+INSERT INTO geo VALUES ([[[(1, 0), (10, 0), (10, 10), (0, 10)], [(4, 4), (5, 4), (5, 5), (4, 5)]], [[(-10, -10), (-10, -9), (-9, 10)]]], 2);
+INSERT INTO geo VALUES ([[[(2, 0), (10, 0), (10, 10), (0, 10)], [(4, 4), (5, 4), (5, 5), (4, 5)]], [[(-10, -10), (-10, -9), (-9, 10)]]], 3);
+SELECT wkt(p) FROM geo ORDER BY id;
+
+DROP TABLE geo;
diff --git a/tests/queries/0_stateless/01301_polygons_within.reference b/tests/queries/0_stateless/01301_polygons_within.reference
new file mode 100644
index 00000000000..ee14f826295
--- /dev/null
+++ b/tests/queries/0_stateless/01301_polygons_within.reference
@@ -0,0 +1,10 @@
+0
+1
+0
+1
+-------- MultiPolygon with Polygon
+0
+-------- MultiPolygon with Polygon with Holes
+0
+-------- Polygon with Polygon with Holes
+0
diff --git a/tests/queries/0_stateless/01301_polygons_within.sql b/tests/queries/0_stateless/01301_polygons_within.sql
new file mode 100644
index 00000000000..901c7909af7
--- /dev/null
+++ b/tests/queries/0_stateless/01301_polygons_within.sql
@@ -0,0 +1,15 @@
+select polygonsWithinCartesian([[[(0, 0),(0, 3),(1, 2.9),(2, 2.6),(2.6, 2),(2.9, 1),(3, 0),(0, 0)]]], [[[(1., 1.),(1., 4.),(4., 4.),(4., 1.),(1., 1.)]]]);
+select polygonsWithinCartesian([[[(2., 2.), (2., 3.), (3., 3.), (3., 2.)]]], [[[(1., 1.),(1., 4.),(4., 4.),(4., 1.),(1., 1.)]]]);
+
+select polygonsWithinSpherical([[[(4.3613577, 50.8651821), (4.349556, 50.8535879), (4.3602419, 50.8435626), (4.3830299, 50.8428851), (4.3904543, 50.8564867), (4.3613148, 50.8651279)]]], [[[(4.346693, 50.858306), (4.367945, 50.852455), (4.366227, 50.840809), (4.344961, 50.833264), (4.338074, 50.848677), (4.346693, 50.858306)]]]);
+select polygonsWithinSpherical([[[(4.3501568, 50.8518269), (4.3444920, 50.8439961), (4.3565941, 50.8443213), (4.3501568, 50.8518269)]]], [[[(4.3679450, 50.8524550),(4.3466930, 50.8583060),(4.3380740, 50.8486770),(4.3449610, 50.8332640),(4.3662270, 50.8408090),(4.3679450, 50.8524550)]]]);
+
+select '-------- MultiPolygon with Polygon';
+select polygonsWithinSpherical([[(29.453587685533865,59.779570356240356),(29.393139070478895,52.276266797422124),(40.636581470703206,59.38168915000267),(41.21084331372543,59.103467777099866),(29.786055068336193,52.146627480315004),(31.23682182965546,52.16517054781818),(41.69443223416517,58.85424941916091),(42.51048853740727,58.47703162291134),(32.59691566839227,52.22075341251539),(34.289476889931414,52.22075341251539),(43.02430176537451,58.07974369546071),(43.02430176537451,57.25537683364851),(35.468224883503325,52.2022335126388),(37.16078610504247,52.23926559241349),(43.02430176537451,56.26136189644947),(43.02430176537451,55.326904361850836),(38.33953409861437,52.16517054781818),(40.09254393520848,52.16517054781818),(44.4146199116388,55.3097062225408),(44.47506852669377,59.80998197603594),(39.72985224487867,59.931351417569715),(30.23941968124846,53.67744677450975),(30.20919537372098,54.63314259659509),(38.73245009647167,59.94649146557819),(37.2816833351524,59.97675082987618),(30.23941968124846,55.2752875586599),(30.33009260383092,56.19415599955667),(36.28428118674541,59.96162460231375),(34.863738732953635,59.97675082987618),(30.178971066193498,56.97640788219866),(30.178971066193498,57.91957806959033),(33.65476643185424,59.94649146557819),(32.32489690064491,59.94649146557819),(30.481214141468342,58.85424941916091),(30.571887064050795,59.99187015036608),(29.453587685533865,59.779570356240356)]], [[[(33.473420586689336,58.85424941916091),(32.23422397806246,58.492830557036),(32.173775363007486,58.03176922751564),(31.508840597402823,57.499784781503735),(31.750635057622702,56.86092686957355),(31.508840597402823,55.941082594334574),(32.20399967053497,55.515591939372456),(31.84130798020516,54.998862226280465),(31.418167674820367,54.422670886434275),(32.47601843828233,53.83826377018255),(32.08310244042503,53.408048308050866),(33.171177511414484,52.82758702113742),(34.77306581037117,52.91880107773494),(34.77306581037117,53.784726518357985),(34.108131044766516,54.17574726780569),(35.07530888564602,54.59813930694554),(34.25925258240394,54.96417435716029),(35.01486027059106,55.361278263643584),(33.50364489421682,55.37845402950552),(32.7480372060297,55.90721384574556),(35.67979503619571,55.68634475630185),(32.83871012861215,56.311688992608396),(34.591719965206266,56.29492065473883),(35.7100193437232,56.311688992608396),(33.83611227701915,56.695333481003644),(32.95960735872209,56.9434497616887),(36.072711034053015,57.091531913901434),(33.171177511414484,57.33702717078384),(36.193608264162954,57.499784781503735),(33.23162612646945,57.77481561306047),(36.43540272438284,58.04776787540811),(33.62454212432676,58.27099811968307),(36.344729801800376,58.54018474404165),(33.83611227701915,58.68186423448108),(34.74284150284369,59.565911441555244),(33.473420586689336,58.85424941916091)]], [[(34.65216858026123,58.91672306881671),(37.19101041256995,58.68186423448108),(36.01226241899805,58.28688958537609),(37.16078610504247,58.04776787540811),(35.74024365125068,57.79092907387934),(37.009664567405046,57.499784781503735),(35.77046795877817,57.25537683364851),(36.979440259877556,57.07510745541089),(34.22902827487645,56.794777197297435),(36.7074214921302,56.210968525786996),(34.712617195316206,56.10998276812964),(36.55629995449277,55.63519693782703),(35.13575750070099,55.53270067649592),(36.43540272438284,55.34409504165558),(34.83351442542614,55.01619492319591),(35.61934642114075,54.49294870011772),(34.89396304048112,54.12264226523038),(35.37755196092087,53.046178687628185),(37.43280487278982,52.95523300597458),(35.92158949641559,53.80257986695776),(36.91899164482259,53.856094327816805),(36.01226241899805,54.75541714463799),(37.765272255592166,55.189110239786885),(36.828318722240134,55.44708256557195),(38.03729102333953,55.652253637168315),(36.64697287707522,55.941082594334574),(38.21863686850443,56.05939028508024),(36.37495410932787,56.64551287174558),(38.30930979108689,56.992876013526654),(37.16078610504247,57.25537683364851),(38.127963945921984,57.516020773674256),(37.43280487278982,57.710289827306724),(38.33953409861437,57.935626886818994),(37.40258056526235,58.31865112960426),(38.58132855883426,58.744648733419496),(37.31190764267989,59.02578062465136),(34.65216858026123,58.91672306881671)]], [[(38.52087994377928,59.11898412389468),(39.54850639971376,58.713270635642914),(38.369758406141855,58.28688958537609),(38.85334732658162,58.06375936407028),(38.33953409861437,57.710289827306724),(38.73245009647167,57.48354156434209),(38.21863686850443,57.271721400459285),(38.97424455669155,56.87744603722649),(37.463029180317314,56.5623320541159),(38.94402024916407,56.05939028508024),(38.18841256097694,55.856355210835915),(38.490655636251795,55.53270067649592),(37.795496563119656,55.39562234093384),(38.30930979108689,55.154587013355666),(36.7074214921302,54.65063295250911),(37.31190764267989,53.92734063371401),(36.979440259877556,53.58783775557231),(37.855945178174615,52.91880107773497),(39.57873070724124,52.69956490610895),(38.33953409861437,53.281741738901104),(40.00187101262603,53.35396273604752),(39.54850639971376,53.58783775557231),(40.24366547284591,53.58783775557231),(39.97164670509855,53.98069568468355),(40.60635716317572,54.03398248547225),(40.39478701048334,54.44025165268903),(39.54850639971376,54.56310590284329),(39.54850639971376,54.87732350170489),(40.39478701048334,54.87732350170489),(40.39478701048334,55.24083903654295),(39.82052516746112,55.2752875586599),(39.760076552406154,55.75443792473942),(40.57613285564824,55.78844000174894),(40.425011318010824,56.19415599955667),(39.82052516746112,56.07626182891758),(39.79030085993364,56.41214455508424),(40.48545993306579,56.495655446714636),(40.33433839542836,56.95993246553937),(39.79030085993364,56.992876013526654),(39.72985224487867,57.46729112028032),(40.33433839542836,57.46729112028032),(40.24366547284591,58.04776787540811),(39.63917932229622,58.04776787540811),(39.63917932229622,58.382088724871295),(40.33433839542836,58.382088724871295),(40.45523562553831,58.9011152358548),(38.52087994377928,59.11898412389468)]]]) format TSV;
+
+select '-------- MultiPolygon with Polygon with Holes';
+select polygonsWithinSpherical([[[(33.473420586689336,58.85424941916091),(32.23422397806246,58.492830557036),(32.173775363007486,58.03176922751564),(31.508840597402823,57.499784781503735),(31.750635057622702,56.86092686957355),(31.508840597402823,55.941082594334574),(32.20399967053497,55.515591939372456),(31.84130798020516,54.998862226280465),(31.418167674820367,54.422670886434275),(32.47601843828233,53.83826377018255),(32.08310244042503,53.408048308050866),(33.171177511414484,52.82758702113742),(34.77306581037117,52.91880107773494),(34.77306581037117,53.784726518357985),(34.108131044766516,54.17574726780569),(35.07530888564602,54.59813930694554),(34.25925258240394,54.96417435716029),(35.01486027059106,55.361278263643584),(33.50364489421682,55.37845402950552),(32.7480372060297,55.90721384574556),(35.67979503619571,55.68634475630185),(32.83871012861215,56.311688992608396),(34.591719965206266,56.29492065473883),(35.7100193437232,56.311688992608396),(33.83611227701915,56.695333481003644),(32.95960735872209,56.9434497616887),(36.072711034053015,57.091531913901434),(33.171177511414484,57.33702717078384),(36.193608264162954,57.499784781503735),(33.23162612646945,57.77481561306047),(36.43540272438284,58.04776787540811),(33.62454212432676,58.27099811968307),(36.344729801800376,58.54018474404165),(33.83611227701915,58.68186423448108),(34.74284150284369,59.565911441555244),(33.473420586689336,58.85424941916091)]], [[(34.65216858026123,58.91672306881671),(37.19101041256995,58.68186423448108),(36.01226241899805,58.28688958537609),(37.16078610504247,58.04776787540811),(35.74024365125068,57.79092907387934),(37.009664567405046,57.499784781503735),(35.77046795877817,57.25537683364851),(36.979440259877556,57.07510745541089),(34.22902827487645,56.794777197297435),(36.7074214921302,56.210968525786996),(34.712617195316206,56.10998276812964),(36.55629995449277,55.63519693782703),(35.13575750070099,55.53270067649592),(36.43540272438284,55.34409504165558),(34.83351442542614,55.01619492319591),(35.61934642114075,54.49294870011772),(34.89396304048112,54.12264226523038),(35.37755196092087,53.046178687628185),(37.43280487278982,52.95523300597458),(35.92158949641559,53.80257986695776),(36.91899164482259,53.856094327816805),(36.01226241899805,54.75541714463799),(37.765272255592166,55.189110239786885),(36.828318722240134,55.44708256557195),(38.03729102333953,55.652253637168315),(36.64697287707522,55.941082594334574),(38.21863686850443,56.05939028508024),(36.37495410932787,56.64551287174558),(38.30930979108689,56.992876013526654),(37.16078610504247,57.25537683364851),(38.127963945921984,57.516020773674256),(37.43280487278982,57.710289827306724),(38.33953409861437,57.935626886818994),(37.40258056526235,58.31865112960426),(38.58132855883426,58.744648733419496),(37.31190764267989,59.02578062465136),(34.65216858026123,58.91672306881671)]], [[(38.52087994377928,59.11898412389468),(39.54850639971376,58.713270635642914),(38.369758406141855,58.28688958537609),(38.85334732658162,58.06375936407028),(38.33953409861437,57.710289827306724),(38.73245009647167,57.48354156434209),(38.21863686850443,57.271721400459285),(38.97424455669155,56.87744603722649),(37.463029180317314,56.5623320541159),(38.94402024916407,56.05939028508024),(38.18841256097694,55.856355210835915),(38.490655636251795,55.53270067649592),(37.795496563119656,55.39562234093384),(38.30930979108689,55.154587013355666),(36.7074214921302,54.65063295250911),(37.31190764267989,53.92734063371401),(36.979440259877556,53.58783775557231),(37.855945178174615,52.91880107773497),(39.57873070724124,52.69956490610895),(38.33953409861437,53.281741738901104),(40.00187101262603,53.35396273604752),(39.54850639971376,53.58783775557231),(40.24366547284591,53.58783775557231),(39.97164670509855,53.98069568468355),(40.60635716317572,54.03398248547225),(40.39478701048334,54.44025165268903),(39.54850639971376,54.56310590284329),(39.54850639971376,54.87732350170489),(40.39478701048334,54.87732350170489),(40.39478701048334,55.24083903654295),(39.82052516746112,55.2752875586599),(39.760076552406154,55.75443792473942),(40.57613285564824,55.78844000174894),(40.425011318010824,56.19415599955667),(39.82052516746112,56.07626182891758),(39.79030085993364,56.41214455508424),(40.48545993306579,56.495655446714636),(40.33433839542836,56.95993246553937),(39.79030085993364,56.992876013526654),(39.72985224487867,57.46729112028032),(40.33433839542836,57.46729112028032),(40.24366547284591,58.04776787540811),(39.63917932229622,58.04776787540811),(39.63917932229622,58.382088724871295),(40.33433839542836,58.382088724871295),(40.45523562553831,58.9011152358548),(38.52087994377928,59.11898412389468)]]], [[(24.367675781249993,61.45977057029751),(19.577636718749993,58.67693767258692),(19.577636718749993,57.492213666700735),(19.445800781249996,55.87531083569678),(19.445800781249996,54.085173420886775),(17.468261718749996,53.014783245859235),(20.017089843749993,51.563412328675895),(21.203613281249993,50.205033264943324),(26.125488281249993,50.40151532278236),(27.22412109374999,48.980216985374994),(32.80517578124999,49.525208341974405),(35.26611328124999,48.74894534343292),(36.93603515624999,49.66762782262194),(42.56103515625,48.77791275550183),(43.92333984374999,49.8096315635631),(47.17529296875,49.152969656170455),(49.28466796875,50.54136296522162),(48.05419921875,51.17934297928929),(51.39404296875,52.48278022207825),(50.64697265625,53.014783245859235),(52.88818359375,53.93021986394004),(51.65771484374999,54.29088164657006),(52.66845703125,55.825973254619015),(50.25146484375,56.145549500679095),(51.92138671875,57.914847767009206),(49.15283203125,58.17070248348605),(49.59228515625,60.086762746260064),(47.043457031249986,59.88893689676584),(43.57177734375,61.37567331572748),(42.64892578125,60.630101766266705),(36.89208984374999,62.000904713685856),(36.01318359374999,61.143235250840576),(31.398925781249993,62.02152819100766),(30.563964843749996,61.05828537037917),(26.872558593749993,61.71070595883174),(26.652832031249993,61.10078883158897),(24.367675781249993,61.45977057029751)], [(24.455566406249993,59.42272750081452),(21.203613281249993,58.49369382056807),(21.335449218749993,56.89700392127261),(21.599121093749993,55.92458580482949),(25.202636718749993,55.998380955359636),(28.850097656249993,57.06463027327854),(27.09228515625,57.844750992890994),(28.806152343749996,59.17592824927138),(26.257324218749993,59.17592824927138),(24.455566406249993,59.42272750081452)], [(35.13427734375,59.84481485969107),(31.970214843749993,58.97266715450152),(33.20068359374999,56.776808316568406),(36.67236328125,56.41390137600675),(39.08935546874999,57.25528054528888),(42.69287109374999,58.03137242177638),(40.89111328124999,59.26588062825809),(37.28759765625,58.722598828043374),(37.11181640624999,59.66774058164964),(35.13427734375,59.84481485969107)], [(29.157714843749993,55.75184939173528),(22.565917968749993,55.128649068488784),(22.565917968749993,53.54030739150019),(22.038574218749996,51.48138289610097),(26.257324218749993,51.42661449707484),(30.124511718749993,50.54136296522162),(32.18994140624999,51.17934297928929),(30.124511718749993,53.173119202640635),(35.09033203124999,53.173119202640635),(33.11279296875,54.085173420886775),(29.597167968749993,55.50374985927513),(29.157714843749993,55.75184939173528)], [(42.82470703125,56.58369172128337),(36.584472656249986,55.329144408405085),(37.99072265625,53.592504809039355),(34.95849609374999,51.48138289610097),(36.54052734374999,50.40151532278236),(39.66064453124999,50.289339253291786),(39.79248046875,52.13348804077148),(41.77001953125,50.68079714532166),(44.49462890624999,51.97134580885171),(47.30712890624999,52.509534770327264),(44.05517578125,53.54030739150019),(46.60400390625,53.696706475303245),(47.61474609375,55.40406982700608),(45.37353515625,55.40406982700608),(42.82470703125,56.58369172128337)]]) format TSV;
+
+select '-------- Polygon with Polygon with Holes';
+select polygonsWithinSpherical([[(29.453587685533865,59.779570356240356),(29.393139070478895,52.276266797422124),(40.636581470703206,59.38168915000267),(41.21084331372543,59.103467777099866),(29.786055068336193,52.146627480315004),(31.23682182965546,52.16517054781818),(41.69443223416517,58.85424941916091),(42.51048853740727,58.47703162291134),(32.59691566839227,52.22075341251539),(34.289476889931414,52.22075341251539),(43.02430176537451,58.07974369546071),(43.02430176537451,57.25537683364851),(35.468224883503325,52.2022335126388),(37.16078610504247,52.23926559241349),(43.02430176537451,56.26136189644947),(43.02430176537451,55.326904361850836),(38.33953409861437,52.16517054781818),(40.09254393520848,52.16517054781818),(44.4146199116388,55.3097062225408),(44.47506852669377,59.80998197603594),(39.72985224487867,59.931351417569715),(30.23941968124846,53.67744677450975),(30.20919537372098,54.63314259659509),(38.73245009647167,59.94649146557819),(37.2816833351524,59.97675082987618),(30.23941968124846,55.2752875586599),(30.33009260383092,56.19415599955667),(36.28428118674541,59.96162460231375),(34.863738732953635,59.97675082987618),(30.178971066193498,56.97640788219866),(30.178971066193498,57.91957806959033),(33.65476643185424,59.94649146557819),(32.32489690064491,59.94649146557819),(30.481214141468342,58.85424941916091),(30.571887064050795,59.99187015036608),(29.453587685533865,59.779570356240356)]], [[(24.367675781249993,61.45977057029751),(19.577636718749993,58.67693767258692),(19.577636718749993,57.492213666700735),(19.445800781249996,55.87531083569678),(19.445800781249996,54.085173420886775),(17.468261718749996,53.014783245859235),(20.017089843749993,51.563412328675895),(21.203613281249993,50.205033264943324),(26.125488281249993,50.40151532278236),(27.22412109374999,48.980216985374994),(32.80517578124999,49.525208341974405),(35.26611328124999,48.74894534343292),(36.93603515624999,49.66762782262194),(42.56103515625,48.77791275550183),(43.92333984374999,49.8096315635631),(47.17529296875,49.152969656170455),(49.28466796875,50.54136296522162),(48.05419921875,51.17934297928929),(51.39404296875,52.48278022207825),(50.64697265625,53.014783245859235),(52.88818359375,53.93021986394004),(51.65771484374999,54.29088164657006),(52.66845703125,55.825973254619015),(50.25146484375,56.145549500679095),(51.92138671875,57.914847767009206),(49.15283203125,58.17070248348605),(49.59228515625,60.086762746260064),(47.043457031249986,59.88893689676584),(43.57177734375,61.37567331572748),(42.64892578125,60.630101766266705),(36.89208984374999,62.000904713685856),(36.01318359374999,61.143235250840576),(31.398925781249993,62.02152819100766),(30.563964843749996,61.05828537037917),(26.872558593749993,61.71070595883174),(26.652832031249993,61.10078883158897),(24.367675781249993,61.45977057029751)], [(24.455566406249993,59.42272750081452),(21.203613281249993,58.49369382056807),(21.335449218749993,56.89700392127261),(21.599121093749993,55.92458580482949),(25.202636718749993,55.998380955359636),(28.850097656249993,57.06463027327854),(27.09228515625,57.844750992890994),(28.806152343749996,59.17592824927138),(26.257324218749993,59.17592824927138),(24.455566406249993,59.42272750081452)], [(35.13427734375,59.84481485969107),(31.970214843749993,58.97266715450152),(33.20068359374999,56.776808316568406),(36.67236328125,56.41390137600675),(39.08935546874999,57.25528054528888),(42.69287109374999,58.03137242177638),(40.89111328124999,59.26588062825809),(37.28759765625,58.722598828043374),(37.11181640624999,59.66774058164964),(35.13427734375,59.84481485969107)], [(29.157714843749993,55.75184939173528),(22.565917968749993,55.128649068488784),(22.565917968749993,53.54030739150019),(22.038574218749996,51.48138289610097),(26.257324218749993,51.42661449707484),(30.124511718749993,50.54136296522162),(32.18994140624999,51.17934297928929),(30.124511718749993,53.173119202640635),(35.09033203124999,53.173119202640635),(33.11279296875,54.085173420886775),(29.597167968749993,55.50374985927513),(29.157714843749993,55.75184939173528)], [(42.82470703125,56.58369172128337),(36.584472656249986,55.329144408405085),(37.99072265625,53.592504809039355),(34.95849609374999,51.48138289610097),(36.54052734374999,50.40151532278236),(39.66064453124999,50.289339253291786),(39.79248046875,52.13348804077148),(41.77001953125,50.68079714532166),(44.49462890624999,51.97134580885171),(47.30712890624999,52.509534770327264),(44.05517578125,53.54030739150019),(46.60400390625,53.696706475303245),(47.61474609375,55.40406982700608),(45.37353515625,55.40406982700608),(42.82470703125,56.58369172128337)]]) format TSV;
+
diff --git a/tests/queries/0_stateless/01302_polygons_distance.reference b/tests/queries/0_stateless/01302_polygons_distance.reference
new file mode 100644
index 00000000000..f5f59e30710
--- /dev/null
+++ b/tests/queries/0_stateless/01302_polygons_distance.reference
@@ -0,0 +1,4 @@
+0
+1.2727922061357855
+0.3274195462417724
+0.3274195462417724
diff --git a/tests/queries/0_stateless/01302_polygons_distance.sql b/tests/queries/0_stateless/01302_polygons_distance.sql
new file mode 100644
index 00000000000..a69b5017a5f
--- /dev/null
+++ b/tests/queries/0_stateless/01302_polygons_distance.sql
@@ -0,0 +1,10 @@
+select polygonsDistanceCartesian([[[(0, 0),(0, 3),(1, 2.9),(2, 2.6),(2.6, 2),(2.9, 1),(3, 0),(0, 0)]]], [[[(1., 1.),(1., 4.),(4., 4.),(4., 1.),(1., 1.)]]]);
+select polygonsDistanceCartesian([[[(0, 0), (0, 0.1), (0.1, 0.1), (0.1, 0)]]], [[[(1., 1.),(1., 4.),(4., 4.),(4., 1.),(1., 1.)]]]);
+select polygonsDistanceSpherical([[[(23.725750, 37.971536)]]], [[[(4.3826169, 50.8119483)]]]);
+
+drop table if exists polygon_01302;
+create table polygon_01302 (x Array(Array(Array(Tuple(Float64, Float64)))), y Array(Array(Array(Tuple(Float64, Float64))))) engine=Memory();
+insert into polygon_01302 values ([[[(23.725750, 37.971536)]]], [[[(4.3826169, 50.8119483)]]]);
+select polygonsDistanceSpherical(x, y) from polygon_01302;
+
+drop table polygon_01302;
diff --git a/tests/queries/0_stateless/01303_polygons_equals.reference b/tests/queries/0_stateless/01303_polygons_equals.reference
new file mode 100644
index 00000000000..0d66ea1aee9
--- /dev/null
+++ b/tests/queries/0_stateless/01303_polygons_equals.reference
@@ -0,0 +1,2 @@
+0
+1
diff --git a/tests/queries/0_stateless/01303_polygons_equals.sql b/tests/queries/0_stateless/01303_polygons_equals.sql
new file mode 100644
index 00000000000..42f1bd4693c
--- /dev/null
+++ b/tests/queries/0_stateless/01303_polygons_equals.sql
@@ -0,0 +1,2 @@
+select polygonsEqualsCartesian([[[(0, 0),(0, 3),(1, 2.9),(2, 2.6),(2.6, 2),(2.9, 1),(3, 0),(0, 0)]]], [[[(1., 1.),(1., 4.),(4., 4.),(4., 1.),(1., 1.)]]]);
+select polygonsEqualsCartesian([[[(1., 1.),(1., 4.),(4., 4.),(4., 1.)]]], [[[(1., 1.),(1., 4.),(4., 4.),(4., 1.),(1., 1.)]]]);
diff --git a/tests/queries/0_stateless/01304_direct_io.reference b/tests/queries/0_stateless/01304_direct_io_long.reference
similarity index 100%
rename from tests/queries/0_stateless/01304_direct_io.reference
rename to tests/queries/0_stateless/01304_direct_io_long.reference
diff --git a/tests/queries/0_stateless/01304_direct_io.sh b/tests/queries/0_stateless/01304_direct_io_long.sh
similarity index 78%
rename from tests/queries/0_stateless/01304_direct_io.sh
rename to tests/queries/0_stateless/01304_direct_io_long.sh
index 3ba3d020d99..7505173ddba 100755
--- a/tests/queries/0_stateless/01304_direct_io.sh
+++ b/tests/queries/0_stateless/01304_direct_io_long.sh
@@ -9,12 +9,12 @@ $CLICKHOUSE_CLIENT --multiquery --query "
     CREATE TABLE bug (UserID UInt64, Date Date) ENGINE = MergeTree ORDER BY Date;
     INSERT INTO bug SELECT rand64(), '2020-06-07' FROM numbers(50000000);
     OPTIMIZE TABLE bug FINAL;"
+LOG="$CLICKHOUSE_TMP/err-$CLICKHOUSE_DATABASE"
+$CLICKHOUSE_BENCHMARK --iterations 10 --max_threads 100 --min_bytes_to_use_direct_io 1 <<< "SELECT sum(UserID) FROM bug PREWHERE NOT ignore(Date)" 1>/dev/null 2>"$LOG"
+cat "$LOG" | grep Exception
+cat "$LOG" | grep Loaded
 
-$CLICKHOUSE_BENCHMARK --iterations 10 --max_threads 100 --min_bytes_to_use_direct_io 1 <<< "SELECT sum(UserID) FROM bug PREWHERE NOT ignore(Date)" 1>/dev/null 2>"$CLICKHOUSE_TMP"/err
-cat "$CLICKHOUSE_TMP"/err | grep Exception
-cat "$CLICKHOUSE_TMP"/err | grep Loaded
-
-rm "$CLICKHOUSE_TMP"/err
+rm "$LOG"
 
 $CLICKHOUSE_CLIENT --multiquery --query "
     DROP TABLE bug;"
diff --git a/tests/queries/0_stateless/01304_polygons_sym_difference.reference b/tests/queries/0_stateless/01304_polygons_sym_difference.reference
new file mode 100644
index 00000000000..7d16848ac2e
--- /dev/null
+++ b/tests/queries/0_stateless/01304_polygons_sym_difference.reference
@@ -0,0 +1,7 @@
+[[[(1,2.9),(1,1),(2.9,1),(3,0),(0,0),(0,3),(1,2.9)]],[[(1,2.9),(1,4),(4,4),(4,1),(2.9,1),(2.6,2),(2,2.6),(1,2.9)]]]
+-------- MultiPolygon with Polygon
+MULTIPOLYGON(((36.9725 59.0149,35.5408 58.9593,37.2817 59.9768,38.7325 59.9465,36.9725 59.0149)),((36.9725 59.0149,37.3119 59.0258,37.8553 58.9075,36.5949 58.1673,36.0123 58.2869,37.191 58.6819,36.4989 58.7512,36.9725 59.0149)),((36.151 54.791,37.7653 55.1891,37.06 55.3843,37.2824 55.5258,38.0373 55.6523,37.6238 55.7402,38.1319 56.0534,38.2186 56.0594,38.1688 56.0758,38.4339 56.2361,38.944 56.0594,38.1884 55.8564,38.4907 55.5327,37.7955 55.3956,38.2609 55.1775,38.1601 55.1091,36.7074 54.6506,37.0035 54.2999,36.6985 54.0791,36.0472 54.7217,36.151 54.791)),((36.151 54.791,36.0123 54.7554,36.0472 54.7217,34.9611 53.9765,34.894 54.1226,35.6193 54.4929,34.9706 54.9262,35.2275 55.0993,36.4354 55.3441,35.7505 55.4454,35.9817 55.5958,36.5563 55.6352,36.193 55.7319,37.2281 56.3799,38.1688 56.0758,38.1319 56.0534,36.647 55.9411,37.6238 55.7402,37.2824 55.5258,36.8283 55.4471,37.06 55.3843,36.151 54.791)),((36.5334 56.6753,38.2312 56.9795,37.565 56.5843,37.463 56.5623,37.5054 56.5484,37.2281 56.3799,36.4446 56.6242,36.5334 56.6753)),((36.5334 56.6753,36.375 56.6455,36.4446 56.6242,36.0233 56.3789,35.4083 56.5254,36.1999 57.0022,36.9794 57.0751,36.4587 57.1544,38.0535 58.0542,38.3395 57.9356,37.4328 57.7103,38.0744 57.5312,37.9669 57.4734,37.1608 57.2554,37.4489 57.1909,36.5334 56.6753)),((36.8709 53.2765,37.135 53.4711,37.8559 52.9188,38.0214 52.8989,37.1608 52.2393,35.4682 52.2022,36.5022 53.0008,37.4328 52.9552,36.8709 53.2765)),((36.8709 53.2765,36.5022 53.0008,35.3776 53.0462,35.3645 53.076,36.1528 53.6763,36.8709 53.2765)),((36.6985 54.0791,36.919 53.8561,36.3552 53.8269,36.6985 54.0791)),((35.5408 58.9593,35.3712 58.8556,34.6522 58.9167,35.5408 58.9593)),((36.0848 57.855,36.3932 58.0447,36.4354 58.0478,36.403 58.0507,36.5949 58.1673,37.1608 58.0478,36.0848 57.855)),((36.0848 57.855,35.9179 57.7512,35.7402 57.7909,36.0848 57.855)),((37.135 53.4711,36.9794 53.5878,37.3119 53.9273,37.0035 54.2999,38.1601 55.1091,38.3093 55.1546,38.2609 55.1775,39.8102 56.1914,39.8205 56.0763,40.425 56.1942,40.5716 55.8007,40.5504 55.7875,39.7601 55.7544,39.8151 55.3187,37.135 53.4711)),((38.2312 56.9795,38.2699 57.0021,38.3093 56.9929,38.2312 56.9795)),((36.4989 58.7512,36.1498 58.553,34.9952 58.6226,35.3712 58.8556,36.4989 58.7512)),((36.4587 57.1544,36.1999 57.0022,34.4816 56.8232,34.8098 57.0409,36.0727 57.0915,35.0338 57.1875,35.4682 57.4674,36.1936 57.4998,35.613 57.5595,35.9179 57.7512,37.0097 57.4998,35.7705 57.2554,36.4587 57.1544)),((38.0535 58.0542,37.4026 58.3187,38.5813 58.7446,37.8553 58.9075,39.7299 59.9314,44.4751 59.81,44.4146 55.3097,40.0925 52.1652,38.3395 52.1652,39.1456 52.7573,39.5787 52.6996,39.2704 52.8471,39.9877 53.3534,40.0019 53.354,39.9942 53.358,43.0243 55.3269,43.0243 56.2614,40.2143 54.467,39.5485 54.5631,39.5485 54.8773,40.3948 54.8773,40.3948 55.2408,39.8205 55.2753,39.8151 55.3187,40.5504 55.7875,40.5761 55.7884,40.5716 55.8007,43.0243 57.2554,43.0243 58.0797,40.4543 56.5923,40.3343 56.9599,39.7903 56.9929,39.7863 57.025,42.5105 58.477,41.6944 58.8542,40.1389 58.048,39.6392 58.0478,39.6392 58.3427,39.7184 58.3823,40.3343 58.3821,40.4136 58.7241,41.2108 59.1035,40.6366 59.3817,39.8163 58.9766,38.5209 59.119,39.4085 58.7696,38.7465 58.4255,38.3698 58.2869,38.432 58.2584,38.0535 58.0542)),((34.4996 55.9565,33.5244 56.1686,33.7222 56.3063,34.5917 56.2949,35.0485 56.303,34.744 56.1118,34.7126 56.11,34.7331 56.1049,34.4996 55.9565)),((34.4996 55.9565,35.0954 55.822,34.9721 55.7463,34.2598 55.8023,34.4996 55.9565)),((31.6069 56.3194,31.5088 55.9411,31.7782 55.7778,30.2092 54.6331,30.2394 53.6774,31.7439 54.8677,31.4182 54.4227,31.8748 54.1736,29.3931 52.2763,29.4536 59.7796,30.5719 59.9919,30.4812 58.8542,32.3249 59.9465,33.6548 59.9465,30.179 57.9196,30.179 56.9764,32.2175 58.3664,32.1738 58.0318,31.5088 57.4998,31.6514 57.1258,30.3301 56.1942,30.2394 55.2753,31.6069 56.3194)),((31.6069 56.3194,31.7506 56.8609,31.6514 57.1258,34.0496 58.6717,34.9952 58.6226,34.6028 58.3749,33.6245 58.271,34.3593 58.2189,33.7581 57.8255,33.2316 57.7748,33.6325 57.7419,31.6069 56.3194)),((33.5244 56.1686,33.1204 55.8832,32.748 55.9072,32.9547 55.7645,31.7439 54.8677,31.8413 54.9989,32.204 55.5156,31.7782 55.7778,33.3418 56.8364,33.8361 56.6953,34.1885 56.6259,33.7222 56.3063,32.8387 56.3117,33.5244 56.1686)),((33.1204 55.8832,34.2598 55.8023,33.6125 55.3778,33.5036 55.3785,32.9547 55.7645,33.1204 55.8832)),((35.3188 55.9582,36.193 55.7319,35.9817 55.5958,35.1358 55.5327,35.7505 55.4454,35.2275 55.0993,34.8335 55.0162,34.9706 54.9262,34.7231 54.7576,34.2593 54.9642,35.0149 55.3613,34.3709 55.3709,34.9721 55.7463,35.6798 55.6863,35.0954 55.822,35.3188 55.9582)),((35.3188 55.9582,34.7331 56.1049,34.744 56.1118,35.6571 56.1619,35.3188 55.9582)),((33.3418 56.8364,32.9596 56.9434,33.5602 56.9781,33.3418 56.8364)),((33.4048 52.8423,34.7731 52.9188,34.7731 53.7847,34.7279 53.8116,34.9611 53.9765,35.3645 53.076,34.2895 52.2208,32.5969 52.2208,33.4048 52.8423)),((33.4048 52.8423,33.1712 52.8276,32.5275 53.1741,34.7231 54.7576,35.0753 54.5981,34.1081 54.1757,34.7279 53.8116,33.4048 52.8423)),((32.2523 53.964,32.476 53.8383,32.0831 53.408,32.5275 53.1741,31.2368 52.1652,29.7861 52.1466,32.2523 53.964)),((32.2523 53.964,31.8748 54.1736,33.6125 55.3778,34.3709 55.3709,32.2523 53.964)),((36.3552 53.8269,36.1528 53.6763,35.9216 53.8026,36.3552 53.8269)),((32.5691 58.5924,34.8637 59.9768,36.2843 59.9616,34.0496 58.6717,33.8361 58.6819,34.7428 59.5659,33.4734 58.8542,32.5691 58.5924)),((32.5691 58.5924,32.2175 58.3664,32.2342 58.4928,32.5691 58.5924)),((33.5602 56.9781,34.0208 57.2724,35.0338 57.1875,34.8098 57.0409,33.5602 56.9781)),((36.3932 58.0447,35.1134 57.9454,35.4314 58.1349,36.403 58.0507,36.3932 58.0447)),((35.1134 57.9454,34.6332 57.6538,33.6325 57.7419,33.7581 57.8255,35.1134 57.9454)),((35.4314 58.1349,34.3593 58.2189,34.6028 58.3749,36.0877 58.5174,35.4314 58.1349)),((35.4682 57.4674,34.2274 57.4023,34.6332 57.6538,35.613 57.5595,35.4682 57.4674)),((34.4816 56.8232,34.3867 56.7596,34.229 56.7948,34.4816 56.8232)),((34.1885 56.6259,34.3867 56.7596,35.4083 56.5254,35.2273 56.414,34.1885 56.6259)),((34.2274 57.4023,34.0208 57.2724,33.1712 57.337,34.2274 57.4023)),((35.0485 56.303,35.2273 56.414,35.71 56.3117,35.0485 56.303)),((35.6571 56.1619,36.0233 56.3789,36.7074 56.211,35.6571 56.1619)),((36.1498 58.553,36.3447 58.5402,36.0877 58.5174,36.1498 58.553)),((40.2143 54.467,40.3948 54.4403,40.6064 54.034,39.9716 53.9807,40.2437 53.5878,39.5485 53.5878,39.9942 53.358,39.9877 53.3534,38.5511 53.2922,40.2143 54.467)),((39.8102 56.1914,39.7903 56.4121,40.2529 56.4682,39.8102 56.1914)),((38.0214 52.8989,38.4609 53.226,39.2704 52.8471,39.1456 52.7573,38.0214 52.8989)),((38.5511 53.2922,38.4609 53.226,38.3395 53.2817,38.5511 53.2922)),((40.4543 56.5923,40.4855 56.4957,40.2529 56.4682,40.4543 56.5923)),((40.1389 58.048,40.2437 58.0478,40.3343 57.4673,39.7299 57.4673,39.7863 57.025,38.4339 56.2361,37.5054 56.5484,37.565 56.5843,38.9742 56.8774,38.4915 57.1308,40.1389 58.048)),((40.4136 58.7241,39.7184 58.3823,39.6392 58.3821,39.6392 58.3427,38.3737 57.6908,38.3395 57.7103,38.8533 58.0638,38.432 58.2584,38.7465 58.4255,39.5485 58.7133,39.4085 58.7696,39.8163 58.9766,40.4552 58.9011,40.4136 58.7241)),((38.3737 57.6908,38.7325 57.4835,38.2186 57.2717,38.4915 57.1308,38.2699 57.0021,37.4489 57.1909,37.9669 57.4734,38.128 57.516,38.0744 57.5312,38.3737 57.6908)))
+-------- MultiPolygon with Polygon with Holes
+MULTIPOLYGON(((24.3677 61.4598,26.6528 61.1008,26.8726 61.7107,30.564 61.0583,31.3989 62.0215,36.0132 61.1432,36.8921 62.0009,42.6489 60.6301,43.5718 61.3757,47.0435 59.8889,49.5923 60.0868,49.1528 58.1707,51.9214 57.9148,50.2515 56.1455,52.6685 55.826,51.6577 54.2909,52.8882 53.9302,50.647 53.0148,51.394 52.4828,48.0542 51.1793,49.2847 50.5414,47.1753 49.153,43.9233 49.8096,42.561 48.7779,36.936 49.6676,35.2661 48.7489,32.8052 49.5252,27.2241 48.9802,26.1255 50.4015,21.2036 50.205,20.0171 51.5634,17.4683 53.0148,19.4458 54.0852,19.4458 55.8753,19.5776 57.4922,19.5776 58.6769,24.3677 61.4598),(24.4556 59.4227,21.2036 58.4937,21.3354 56.897,21.5991 55.9246,25.2026 55.9984,28.8501 57.0646,27.0923 57.8448,28.8062 59.1759,26.2573 59.1759,24.4556 59.4227),(35.1489 56.5859,36.7074 56.211,34.7126 56.11,36.5563 55.6352,35.1358 55.5327,36.4354 55.3441,34.8335 55.0162,35.6193 54.4929,34.894 54.1226,35.3776 53.0462,37.0604 52.9744,34.9585 51.4814,36.5405 50.4015,39.6606 50.2893,39.7925 52.1335,41.77 50.6808,44.4946 51.9713,47.3071 52.5095,44.0552 53.5403,46.604 53.6967,47.6147 55.4041,45.3735 55.4041,42.8247 56.5837,40.4412 56.1511,40.425 56.1942,39.8205 56.0763,39.7903 56.4121,40.4855 56.4957,40.3343 56.9599,39.7903 56.9929,39.7379 57.4051,40.0149 57.4677,40.3343 57.4673,40.3237 57.5365,42.6929 58.0314,40.8911 59.2659,39.2792 59.0373,38.5209 59.119,38.8838 58.9777,38.0944 58.8545,37.3119 59.0258,37.2327 59.0233,37.1118 59.6677,35.1343 59.8448,31.9702 58.9727,32.25 58.4976,32.2342 58.4928,32.1738 58.0318,31.5088 57.4998,31.7506 56.8609,31.5088 55.9411,32.204 55.5156,31.8413 54.9989,31.627 54.7093,29.5972 55.5037,29.1577 55.7518,22.5659 55.1286,22.5659 53.5403,22.0386 51.4814,26.2573 51.4266,30.1245 50.5414,32.1899 51.1793,30.1245 53.1731,32.4808 53.1989,33.1712 52.8276,34.7731 52.9188,34.7731 53.1793,35.0903 53.1731,34.7731 53.3243,34.7731 53.7847,34.1081 54.1757,35.0753 54.5981,34.2593 54.9642,35.0149 55.3613,33.5036 55.3785,32.748 55.9072,35.6798 55.6863,32.8387 56.3117,34.5917 56.2949,35.71 56.3117,33.8361 56.6953,33.7182 56.7292,35.1489 56.5859)),((35.1489 56.5859,34.229 56.7948,36.9794 57.0751,35.7705 57.2554,37.0097 57.4998,35.7402 57.7909,37.1608 58.0478,36.0123 58.2869,37.191 58.6819,34.6522 58.9167,37.2327 59.0233,37.2876 58.7226,38.0944 58.8545,38.5813 58.7446,37.4026 58.3187,38.3395 57.9356,37.4328 57.7103,38.128 57.516,37.1608 57.2554,38.3092 56.9929,38.309 56.9928,36.375 56.6455,36.8799 56.4895,36.6724 56.4139,35.1489 56.5859)),((33.1079 56.9523,32.25 58.4976,33.4734 58.8542,34.7428 59.5659,33.8361 58.6819,36.3447 58.5402,33.6245 58.271,36.4354 58.0478,33.2316 57.7748,36.1936 57.4998,33.1712 57.337,36.0727 57.0915,33.1079 56.9523)),((33.1079 56.9523,33.1392 56.8934,32.9596 56.9434,33.1079 56.9523)),((33.7182 56.7292,33.2007 56.7768,33.1392 56.8934,33.7182 56.7292)),((37.0604 52.9744,37.2165 53.0798,37.4328 52.9552,37.0604 52.9744)),((34.7731 53.3243,34.7731 53.1793,32.4808 53.1989,32.0831 53.408,32.476 53.8383,31.4182 54.4227,31.627 54.7093,33.1128 54.0852,34.7731 53.3243)),((36.9508 55.414,37.7653 55.1891,36.8822 54.975,36.5845 55.3291,36.9508 55.414)),((36.9508 55.414,36.8283 55.4471,37.9482 55.6376,36.9508 55.414)),((37.2165 53.0798,35.9216 53.8026,36.919 53.8561,36.0123 54.7554,36.8822 54.975,37.0572 54.7635,36.7074 54.6506,37.3119 53.9273,36.9794 53.5878,37.4471 53.2343,37.2165 53.0798)),((37.0572 54.7635,38.3093 55.1546,37.7955 55.3956,38.4907 55.5327,38.3184 55.7179,40.4412 56.1511,40.5761 55.7884,39.7601 55.7544,39.8205 55.2753,40.3948 55.2408,40.3948 54.8773,39.5485 54.8773,39.5485 54.5631,40.3948 54.4403,40.6064 54.034,39.9716 53.9807,40.2437 53.5878,39.5485 53.5878,40.0019 53.354,38.3395 53.2817,39.5787 52.6996,37.8559 52.9188,37.4471 53.2343,37.9907 53.5925,37.0572 54.7635)),((38.5798 57.0849,38.2186 57.2717,38.7325 57.4835,38.3395 57.7103,38.8533 58.0638,38.3698 58.2869,39.5485 58.7133,38.8838 58.9777,39.2792 59.0373,40.4552 58.9011,40.3343 58.3821,39.6392 58.3821,39.6392 58.0478,40.2437 58.0478,40.3237 57.5365,40.0149 57.4677,39.7299 57.4673,39.7379 57.4051,39.0894 57.2553,38.5798 57.0849)),((38.5798 57.0849,38.9742 56.8774,37.463 56.5623,38.944 56.0594,38.1884 55.8564,38.3184 55.7179,38.0262 55.6546,36.647 55.9411,38.2186 56.0594,36.8799 56.4895,38.309 56.9928,38.3093 56.9929,38.3092 56.9929,38.5798 57.0849)),((37.9482 55.6376,38.0262 55.6546,38.0373 55.6523,37.9482 55.6376)))
+-------- Polygon with Polygon with Holes
+MULTIPOLYGON(((24.3677 61.4598,26.6528 61.1008,26.8726 61.7107,30.564 61.0583,31.3989 62.0215,36.0132 61.1432,36.8921 62.0009,42.6489 60.6301,43.5718 61.3757,47.0435 59.8889,49.5923 60.0868,49.1528 58.1707,51.9214 57.9148,50.2515 56.1455,52.6685 55.826,51.6577 54.2909,52.8882 53.9302,50.647 53.0148,51.394 52.4828,48.0542 51.1793,49.2847 50.5414,47.1753 49.153,43.9233 49.8096,42.561 48.7779,36.936 49.6676,35.2661 48.7489,32.8052 49.5252,27.2241 48.9802,26.1255 50.4015,21.2036 50.205,20.0171 51.5634,17.4683 53.0148,19.4458 54.0852,19.4458 55.8753,19.5776 57.4922,19.5776 58.6769,24.3677 61.4598),(24.4556 59.4227,21.2036 58.4937,21.3354 56.897,21.5991 55.9246,25.2026 55.9984,28.8501 57.0646,27.0923 57.8448,28.8062 59.1759,26.2573 59.1759,24.4556 59.4227),(35.9475 59.7758,36.2843 59.9616,34.8637 59.9768,34.2247 59.6064,31.9702 58.9727,32.2964 58.4175,30.179 56.9764,30.179 57.9196,33.6548 59.9465,32.3249 59.9465,30.4812 58.8542,30.5719 59.9919,29.4536 59.7796,29.4171 55.606,29.1577 55.7518,22.5659 55.1286,22.5659 53.5403,22.0386 51.4814,26.2573 51.4266,30.1245 50.5414,32.1899 51.1793,31.1968 52.1649,31.2368 52.1652,32.5603 53.1989,33.8733 53.1922,32.5969 52.2208,34.2895 52.2208,37.2766 54.4948,37.7431 53.9104,35.4682 52.2022,35.9681 52.2157,34.9585 51.4814,36.5405 50.4015,39.6606 50.2893,39.7925 52.1335,41.77 50.6808,44.4946 51.9713,47.3071 52.5095,44.0552 53.5403,46.604 53.6967,47.6147 55.4041,45.3735 55.4041,44.4212 55.8594,44.4751 59.81,39.7299 59.9314,37.6322 58.7797,37.2876 58.7226,37.2102 59.1452,38.7325 59.9465,37.2817 59.9768,36.7912 59.6986,35.9475 59.7758)),((32.6512 57.792,32.2964 58.4175,34.2247 59.6064,35.1343 59.8448,35.9475 59.7758,32.6512 57.792)),((32.6512 57.792,32.9378 57.2699,30.2394 55.2753,30.3301 56.1942,32.6512 57.792)),((33.2446 56.7729,33.2007 56.7768,32.9378 57.2699,36.7912 59.6986,37.1118 59.6677,37.2102 59.1452,33.2446 56.7729)),((33.2446 56.7729,34.2635 56.6767,31.5682 54.7333,30.7705 55.0525,33.2446 56.7729)),((34.2635 56.6767,37.6322 58.7797,40.2079 59.1718,35.4536 56.5531,34.2635 56.6767)),((40.2079 59.1718,40.6366 59.3817,40.8804 59.2644,40.2079 59.1718)),((34.3351 53.53,35.0903 53.1731,33.8733 53.1922,34.3351 53.53)),((34.3351 53.53,33.5144 53.9057,38.1759 56.9472,39.0894 57.2553,40.9691 57.677,37.1934 55.4694,36.5845 55.3291,36.7219 55.1665,34.3351 53.53)),((32.6907 54.2663,33.1128 54.0852,33.5144 53.9057,32.5603 53.1989,31.1682 53.1903,32.6907 54.2663)),((32.6907 54.2663,32.2591 54.4483,35.4536 56.5531,36.1815 56.4715,32.6907 54.2663)),((38.1759 56.9472,36.6724 56.4139,36.1815 56.4715,41.168 59.0834,41.5887 58.8012,38.1759 56.9472)),((37.2766 54.4948,36.7219 55.1665,37.1934 55.4694,39.4328 55.9511,37.2766 54.4948)),((40.9691 57.677,42.2498 58.3455,42.6929 58.0314,40.9691 57.677)),((30.7705 55.0525,30.2092 54.6331,30.2394 53.6774,31.5682 54.7333,32.2591 54.4483,30.5408 53.1811,30.1245 53.1731,30.3098 53.0028,29.3931 52.2763,29.4171 55.606,29.5972 55.5037,30.7705 55.0525)),((30.5408 53.1811,31.1682 53.1903,30.5785 52.7531,30.3098 53.0028,30.5408 53.1811)),((30.5785 52.7531,31.1968 52.1649,29.7861 52.1466,30.5785 52.7531)),((35.9681 52.2157,37.9907 53.5925,37.7431 53.9104,41.4519 56.3413,42.8247 56.5837,44.4212 55.8594,44.4146 55.3097,40.0925 52.1652,38.3395 52.1652,43.0243 55.3269,43.0243 56.2614,37.1608 52.2393,35.9681 52.2157)),((39.4328 55.9511,43.0243 58.0797,43.0243 57.2554,41.4519 56.3413,39.4328 55.9511)),((41.168 59.0834,40.9299 59.2404,41.2108 59.1035,41.168 59.0834)),((41.5887 58.8012,41.6944 58.8542,42.5105 58.477,42.2498 58.3455,41.5887 58.8012)),((40.9299 59.2404,40.8804 59.2644,40.8911 59.2659,40.9299 59.2404)))
diff --git a/tests/queries/0_stateless/01304_polygons_sym_difference.sql b/tests/queries/0_stateless/01304_polygons_sym_difference.sql
new file mode 100644
index 00000000000..f4893dd5b33
--- /dev/null
+++ b/tests/queries/0_stateless/01304_polygons_sym_difference.sql
@@ -0,0 +1,10 @@
+select polygonsSymDifferenceCartesian([[[(0, 0),(0, 3),(1, 2.9),(2, 2.6),(2.6, 2),(2.9, 1),(3, 0),(0, 0)]]], [[[(1., 1.),(1., 4.),(4., 4.),(4., 1.),(1., 1.)]]]);
+                                                                                                                                    
+select '-------- MultiPolygon with Polygon';
+select wkt(polygonsSymDifferenceSpherical([[(29.453587685533865,59.779570356240356),(29.393139070478895,52.276266797422124),(40.636581470703206,59.38168915000267),(41.21084331372543,59.103467777099866),(29.786055068336193,52.146627480315004),(31.23682182965546,52.16517054781818),(41.69443223416517,58.85424941916091),(42.51048853740727,58.47703162291134),(32.59691566839227,52.22075341251539),(34.289476889931414,52.22075341251539),(43.02430176537451,58.07974369546071),(43.02430176537451,57.25537683364851),(35.468224883503325,52.2022335126388),(37.16078610504247,52.23926559241349),(43.02430176537451,56.26136189644947),(43.02430176537451,55.326904361850836),(38.33953409861437,52.16517054781818),(40.09254393520848,52.16517054781818),(44.4146199116388,55.3097062225408),(44.47506852669377,59.80998197603594),(39.72985224487867,59.931351417569715),(30.23941968124846,53.67744677450975),(30.20919537372098,54.63314259659509),(38.73245009647167,59.94649146557819),(37.2816833351524,59.97675082987618),(30.23941968124846,55.2752875586599),(30.33009260383092,56.19415599955667),(36.28428118674541,59.96162460231375),(34.863738732953635,59.97675082987618),(30.178971066193498,56.97640788219866),(30.178971066193498,57.91957806959033),(33.65476643185424,59.94649146557819),(32.32489690064491,59.94649146557819),(30.481214141468342,58.85424941916091),(30.571887064050795,59.99187015036608),(29.453587685533865,59.779570356240356)]], [[[(33.473420586689336,58.85424941916091),(32.23422397806246,58.492830557036),(32.173775363007486,58.03176922751564),(31.508840597402823,57.499784781503735),(31.750635057622702,56.86092686957355),(31.508840597402823,55.941082594334574),(32.20399967053497,55.515591939372456),(31.84130798020516,54.998862226280465),(31.418167674820367,54.422670886434275),(32.47601843828233,53.83826377018255),(32.08310244042503,53.408048308050866),(33.171177511414484,52.82758702113742),(34.77306581037117,52.91880107773494),(34.77306581037117,53.784726518357985),(34.108131044766516,54.17574726780569),(35.07530888564602,54.59813930694554),(34.25925258240394,54.96417435716029),(35.01486027059106,55.361278263643584),(33.50364489421682,55.37845402950552),(32.7480372060297,55.90721384574556),(35.67979503619571,55.68634475630185),(32.83871012861215,56.311688992608396),(34.591719965206266,56.29492065473883),(35.7100193437232,56.311688992608396),(33.83611227701915,56.695333481003644),(32.95960735872209,56.9434497616887),(36.072711034053015,57.091531913901434),(33.171177511414484,57.33702717078384),(36.193608264162954,57.499784781503735),(33.23162612646945,57.77481561306047),(36.43540272438284,58.04776787540811),(33.62454212432676,58.27099811968307),(36.344729801800376,58.54018474404165),(33.83611227701915,58.68186423448108),(34.74284150284369,59.565911441555244),(33.473420586689336,58.85424941916091)]], [[(34.65216858026123,58.91672306881671),(37.19101041256995,58.68186423448108),(36.01226241899805,58.28688958537609),(37.16078610504247,58.04776787540811),(35.74024365125068,57.79092907387934),(37.009664567405046,57.499784781503735),(35.77046795877817,57.25537683364851),(36.979440259877556,57.07510745541089),(34.22902827487645,56.794777197297435),(36.7074214921302,56.210968525786996),(34.712617195316206,56.10998276812964),(36.55629995449277,55.63519693782703),(35.13575750070099,55.53270067649592),(36.43540272438284,55.34409504165558),(34.83351442542614,55.01619492319591),(35.61934642114075,54.49294870011772),(34.89396304048112,54.12264226523038),(35.37755196092087,53.046178687628185),(37.43280487278982,52.95523300597458),(35.92158949641559,53.80257986695776),(36.91899164482259,53.856094327816805),(36.01226241899805,54.75541714463799),(37.765272255592166,55.189110239786885),(36.828318722240134,55.44708256557195),(38.03729102333953,55.652253637168315),(36.64697287707522,55.941082594334574),(38.21863686850443,56.05939028508024),(36.37495410932787,56.64551287174558),(38.30930979108689,56.992876013526654),(37.16078610504247,57.25537683364851),(38.127963945921984,57.516020773674256),(37.43280487278982,57.710289827306724),(38.33953409861437,57.935626886818994),(37.40258056526235,58.31865112960426),(38.58132855883426,58.744648733419496),(37.31190764267989,59.02578062465136),(34.65216858026123,58.91672306881671)]], [[(38.52087994377928,59.11898412389468),(39.54850639971376,58.713270635642914),(38.369758406141855,58.28688958537609),(38.85334732658162,58.06375936407028),(38.33953409861437,57.710289827306724),(38.73245009647167,57.48354156434209),(38.21863686850443,57.271721400459285),(38.97424455669155,56.87744603722649),(37.463029180317314,56.5623320541159),(38.94402024916407,56.05939028508024),(38.18841256097694,55.856355210835915),(38.490655636251795,55.53270067649592),(37.795496563119656,55.39562234093384),(38.30930979108689,55.154587013355666),(36.7074214921302,54.65063295250911),(37.31190764267989,53.92734063371401),(36.979440259877556,53.58783775557231),(37.855945178174615,52.91880107773497),(39.57873070724124,52.69956490610895),(38.33953409861437,53.281741738901104),(40.00187101262603,53.35396273604752),(39.54850639971376,53.58783775557231),(40.24366547284591,53.58783775557231),(39.97164670509855,53.98069568468355),(40.60635716317572,54.03398248547225),(40.39478701048334,54.44025165268903),(39.54850639971376,54.56310590284329),(39.54850639971376,54.87732350170489),(40.39478701048334,54.87732350170489),(40.39478701048334,55.24083903654295),(39.82052516746112,55.2752875586599),(39.760076552406154,55.75443792473942),(40.57613285564824,55.78844000174894),(40.425011318010824,56.19415599955667),(39.82052516746112,56.07626182891758),(39.79030085993364,56.41214455508424),(40.48545993306579,56.495655446714636),(40.33433839542836,56.95993246553937),(39.79030085993364,56.992876013526654),(39.72985224487867,57.46729112028032),(40.33433839542836,57.46729112028032),(40.24366547284591,58.04776787540811),(39.63917932229622,58.04776787540811),(39.63917932229622,58.382088724871295),(40.33433839542836,58.382088724871295),(40.45523562553831,58.9011152358548),(38.52087994377928,59.11898412389468)]]])) format TSV;
+
+select '-------- MultiPolygon with Polygon with Holes';
+select wkt(polygonsSymDifferenceSpherical([[[(33.473420586689336,58.85424941916091),(32.23422397806246,58.492830557036),(32.173775363007486,58.03176922751564),(31.508840597402823,57.499784781503735),(31.750635057622702,56.86092686957355),(31.508840597402823,55.941082594334574),(32.20399967053497,55.515591939372456),(31.84130798020516,54.998862226280465),(31.418167674820367,54.422670886434275),(32.47601843828233,53.83826377018255),(32.08310244042503,53.408048308050866),(33.171177511414484,52.82758702113742),(34.77306581037117,52.91880107773494),(34.77306581037117,53.784726518357985),(34.108131044766516,54.17574726780569),(35.07530888564602,54.59813930694554),(34.25925258240394,54.96417435716029),(35.01486027059106,55.361278263643584),(33.50364489421682,55.37845402950552),(32.7480372060297,55.90721384574556),(35.67979503619571,55.68634475630185),(32.83871012861215,56.311688992608396),(34.591719965206266,56.29492065473883),(35.7100193437232,56.311688992608396),(33.83611227701915,56.695333481003644),(32.95960735872209,56.9434497616887),(36.072711034053015,57.091531913901434),(33.171177511414484,57.33702717078384),(36.193608264162954,57.499784781503735),(33.23162612646945,57.77481561306047),(36.43540272438284,58.04776787540811),(33.62454212432676,58.27099811968307),(36.344729801800376,58.54018474404165),(33.83611227701915,58.68186423448108),(34.74284150284369,59.565911441555244),(33.473420586689336,58.85424941916091)]], [[(34.65216858026123,58.91672306881671),(37.19101041256995,58.68186423448108),(36.01226241899805,58.28688958537609),(37.16078610504247,58.04776787540811),(35.74024365125068,57.79092907387934),(37.009664567405046,57.499784781503735),(35.77046795877817,57.25537683364851),(36.979440259877556,57.07510745541089),(34.22902827487645,56.794777197297435),(36.7074214921302,56.210968525786996),(34.712617195316206,56.10998276812964),(36.55629995449277,55.63519693782703),(35.13575750070099,55.53270067649592),(36.43540272438284,55.34409504165558),(34.83351442542614,55.01619492319591),(35.61934642114075,54.49294870011772),(34.89396304048112,54.12264226523038),(35.37755196092087,53.046178687628185),(37.43280487278982,52.95523300597458),(35.92158949641559,53.80257986695776),(36.91899164482259,53.856094327816805),(36.01226241899805,54.75541714463799),(37.765272255592166,55.189110239786885),(36.828318722240134,55.44708256557195),(38.03729102333953,55.652253637168315),(36.64697287707522,55.941082594334574),(38.21863686850443,56.05939028508024),(36.37495410932787,56.64551287174558),(38.30930979108689,56.992876013526654),(37.16078610504247,57.25537683364851),(38.127963945921984,57.516020773674256),(37.43280487278982,57.710289827306724),(38.33953409861437,57.935626886818994),(37.40258056526235,58.31865112960426),(38.58132855883426,58.744648733419496),(37.31190764267989,59.02578062465136),(34.65216858026123,58.91672306881671)]], [[(38.52087994377928,59.11898412389468),(39.54850639971376,58.713270635642914),(38.369758406141855,58.28688958537609),(38.85334732658162,58.06375936407028),(38.33953409861437,57.710289827306724),(38.73245009647167,57.48354156434209),(38.21863686850443,57.271721400459285),(38.97424455669155,56.87744603722649),(37.463029180317314,56.5623320541159),(38.94402024916407,56.05939028508024),(38.18841256097694,55.856355210835915),(38.490655636251795,55.53270067649592),(37.795496563119656,55.39562234093384),(38.30930979108689,55.154587013355666),(36.7074214921302,54.65063295250911),(37.31190764267989,53.92734063371401),(36.979440259877556,53.58783775557231),(37.855945178174615,52.91880107773497),(39.57873070724124,52.69956490610895),(38.33953409861437,53.281741738901104),(40.00187101262603,53.35396273604752),(39.54850639971376,53.58783775557231),(40.24366547284591,53.58783775557231),(39.97164670509855,53.98069568468355),(40.60635716317572,54.03398248547225),(40.39478701048334,54.44025165268903),(39.54850639971376,54.56310590284329),(39.54850639971376,54.87732350170489),(40.39478701048334,54.87732350170489),(40.39478701048334,55.24083903654295),(39.82052516746112,55.2752875586599),(39.760076552406154,55.75443792473942),(40.57613285564824,55.78844000174894),(40.425011318010824,56.19415599955667),(39.82052516746112,56.07626182891758),(39.79030085993364,56.41214455508424),(40.48545993306579,56.495655446714636),(40.33433839542836,56.95993246553937),(39.79030085993364,56.992876013526654),(39.72985224487867,57.46729112028032),(40.33433839542836,57.46729112028032),(40.24366547284591,58.04776787540811),(39.63917932229622,58.04776787540811),(39.63917932229622,58.382088724871295),(40.33433839542836,58.382088724871295),(40.45523562553831,58.9011152358548),(38.52087994377928,59.11898412389468)]]], [[(24.367675781249993,61.45977057029751),(19.577636718749993,58.67693767258692),(19.577636718749993,57.492213666700735),(19.445800781249996,55.87531083569678),(19.445800781249996,54.085173420886775),(17.468261718749996,53.014783245859235),(20.017089843749993,51.563412328675895),(21.203613281249993,50.205033264943324),(26.125488281249993,50.40151532278236),(27.22412109374999,48.980216985374994),(32.80517578124999,49.525208341974405),(35.26611328124999,48.74894534343292),(36.93603515624999,49.66762782262194),(42.56103515625,48.77791275550183),(43.92333984374999,49.8096315635631),(47.17529296875,49.152969656170455),(49.28466796875,50.54136296522162),(48.05419921875,51.17934297928929),(51.39404296875,52.48278022207825),(50.64697265625,53.014783245859235),(52.88818359375,53.93021986394004),(51.65771484374999,54.29088164657006),(52.66845703125,55.825973254619015),(50.25146484375,56.145549500679095),(51.92138671875,57.914847767009206),(49.15283203125,58.17070248348605),(49.59228515625,60.086762746260064),(47.043457031249986,59.88893689676584),(43.57177734375,61.37567331572748),(42.64892578125,60.630101766266705),(36.89208984374999,62.000904713685856),(36.01318359374999,61.143235250840576),(31.398925781249993,62.02152819100766),(30.563964843749996,61.05828537037917),(26.872558593749993,61.71070595883174),(26.652832031249993,61.10078883158897),(24.367675781249993,61.45977057029751)], [(24.455566406249993,59.42272750081452),(21.203613281249993,58.49369382056807),(21.335449218749993,56.89700392127261),(21.599121093749993,55.92458580482949),(25.202636718749993,55.998380955359636),(28.850097656249993,57.06463027327854),(27.09228515625,57.844750992890994),(28.806152343749996,59.17592824927138),(26.257324218749993,59.17592824927138),(24.455566406249993,59.42272750081452)], [(35.13427734375,59.84481485969107),(31.970214843749993,58.97266715450152),(33.20068359374999,56.776808316568406),(36.67236328125,56.41390137600675),(39.08935546874999,57.25528054528888),(42.69287109374999,58.03137242177638),(40.89111328124999,59.26588062825809),(37.28759765625,58.722598828043374),(37.11181640624999,59.66774058164964),(35.13427734375,59.84481485969107)], [(29.157714843749993,55.75184939173528),(22.565917968749993,55.128649068488784),(22.565917968749993,53.54030739150019),(22.038574218749996,51.48138289610097),(26.257324218749993,51.42661449707484),(30.124511718749993,50.54136296522162),(32.18994140624999,51.17934297928929),(30.124511718749993,53.173119202640635),(35.09033203124999,53.173119202640635),(33.11279296875,54.085173420886775),(29.597167968749993,55.50374985927513),(29.157714843749993,55.75184939173528)], [(42.82470703125,56.58369172128337),(36.584472656249986,55.329144408405085),(37.99072265625,53.592504809039355),(34.95849609374999,51.48138289610097),(36.54052734374999,50.40151532278236),(39.66064453124999,50.289339253291786),(39.79248046875,52.13348804077148),(41.77001953125,50.68079714532166),(44.49462890624999,51.97134580885171),(47.30712890624999,52.509534770327264),(44.05517578125,53.54030739150019),(46.60400390625,53.696706475303245),(47.61474609375,55.40406982700608),(45.37353515625,55.40406982700608),(42.82470703125,56.58369172128337)]])) format TSV;
+
+select '-------- Polygon with Polygon with Holes';
+select wkt(polygonsSymDifferenceSpherical([[(29.453587685533865,59.779570356240356),(29.393139070478895,52.276266797422124),(40.636581470703206,59.38168915000267),(41.21084331372543,59.103467777099866),(29.786055068336193,52.146627480315004),(31.23682182965546,52.16517054781818),(41.69443223416517,58.85424941916091),(42.51048853740727,58.47703162291134),(32.59691566839227,52.22075341251539),(34.289476889931414,52.22075341251539),(43.02430176537451,58.07974369546071),(43.02430176537451,57.25537683364851),(35.468224883503325,52.2022335126388),(37.16078610504247,52.23926559241349),(43.02430176537451,56.26136189644947),(43.02430176537451,55.326904361850836),(38.33953409861437,52.16517054781818),(40.09254393520848,52.16517054781818),(44.4146199116388,55.3097062225408),(44.47506852669377,59.80998197603594),(39.72985224487867,59.931351417569715),(30.23941968124846,53.67744677450975),(30.20919537372098,54.63314259659509),(38.73245009647167,59.94649146557819),(37.2816833351524,59.97675082987618),(30.23941968124846,55.2752875586599),(30.33009260383092,56.19415599955667),(36.28428118674541,59.96162460231375),(34.863738732953635,59.97675082987618),(30.178971066193498,56.97640788219866),(30.178971066193498,57.91957806959033),(33.65476643185424,59.94649146557819),(32.32489690064491,59.94649146557819),(30.481214141468342,58.85424941916091),(30.571887064050795,59.99187015036608),(29.453587685533865,59.779570356240356)]], [[(24.367675781249993,61.45977057029751),(19.577636718749993,58.67693767258692),(19.577636718749993,57.492213666700735),(19.445800781249996,55.87531083569678),(19.445800781249996,54.085173420886775),(17.468261718749996,53.014783245859235),(20.017089843749993,51.563412328675895),(21.203613281249993,50.205033264943324),(26.125488281249993,50.40151532278236),(27.22412109374999,48.980216985374994),(32.80517578124999,49.525208341974405),(35.26611328124999,48.74894534343292),(36.93603515624999,49.66762782262194),(42.56103515625,48.77791275550183),(43.92333984374999,49.8096315635631),(47.17529296875,49.152969656170455),(49.28466796875,50.54136296522162),(48.05419921875,51.17934297928929),(51.39404296875,52.48278022207825),(50.64697265625,53.014783245859235),(52.88818359375,53.93021986394004),(51.65771484374999,54.29088164657006),(52.66845703125,55.825973254619015),(50.25146484375,56.145549500679095),(51.92138671875,57.914847767009206),(49.15283203125,58.17070248348605),(49.59228515625,60.086762746260064),(47.043457031249986,59.88893689676584),(43.57177734375,61.37567331572748),(42.64892578125,60.630101766266705),(36.89208984374999,62.000904713685856),(36.01318359374999,61.143235250840576),(31.398925781249993,62.02152819100766),(30.563964843749996,61.05828537037917),(26.872558593749993,61.71070595883174),(26.652832031249993,61.10078883158897),(24.367675781249993,61.45977057029751)], [(24.455566406249993,59.42272750081452),(21.203613281249993,58.49369382056807),(21.335449218749993,56.89700392127261),(21.599121093749993,55.92458580482949),(25.202636718749993,55.998380955359636),(28.850097656249993,57.06463027327854),(27.09228515625,57.844750992890994),(28.806152343749996,59.17592824927138),(26.257324218749993,59.17592824927138),(24.455566406249993,59.42272750081452)], [(35.13427734375,59.84481485969107),(31.970214843749993,58.97266715450152),(33.20068359374999,56.776808316568406),(36.67236328125,56.41390137600675),(39.08935546874999,57.25528054528888),(42.69287109374999,58.03137242177638),(40.89111328124999,59.26588062825809),(37.28759765625,58.722598828043374),(37.11181640624999,59.66774058164964),(35.13427734375,59.84481485969107)], [(29.157714843749993,55.75184939173528),(22.565917968749993,55.128649068488784),(22.565917968749993,53.54030739150019),(22.038574218749996,51.48138289610097),(26.257324218749993,51.42661449707484),(30.124511718749993,50.54136296522162),(32.18994140624999,51.17934297928929),(30.124511718749993,53.173119202640635),(35.09033203124999,53.173119202640635),(33.11279296875,54.085173420886775),(29.597167968749993,55.50374985927513),(29.157714843749993,55.75184939173528)], [(42.82470703125,56.58369172128337),(36.584472656249986,55.329144408405085),(37.99072265625,53.592504809039355),(34.95849609374999,51.48138289610097),(36.54052734374999,50.40151532278236),(39.66064453124999,50.289339253291786),(39.79248046875,52.13348804077148),(41.77001953125,50.68079714532166),(44.49462890624999,51.97134580885171),(47.30712890624999,52.509534770327264),(44.05517578125,53.54030739150019),(46.60400390625,53.696706475303245),(47.61474609375,55.40406982700608),(45.37353515625,55.40406982700608),(42.82470703125,56.58369172128337)]])) format TSV;
diff --git a/tests/queries/0_stateless/01305_polygons_union.reference b/tests/queries/0_stateless/01305_polygons_union.reference
new file mode 100644
index 00000000000..f87d03c151c
--- /dev/null
+++ b/tests/queries/0_stateless/01305_polygons_union.reference
@@ -0,0 +1,8 @@
+[[[(1,2.9),(1,4),(4,4),(4,1),(2.9,1),(3,0),(0,0),(0,3),(1,2.9)]]]
+[[[(4.3666052904432435,50.84337386140151),(4.366227,50.840809),(4.344961,50.833264),(4.338074,50.848677),(4.346693,50.858306),(4.3526804582393535,50.856658100365976),(4.3613577,50.8651821),(4.3613148,50.8651279),(4.3904543,50.8564867),(4.3830299,50.8428851),(4.3666052904432435,50.84337386140151)]]]
+-------- MultiPolygon with Polygon
+MULTIPOLYGON(((35.5408 58.9593,37.2817 59.9768,38.7325 59.9465,36.9725 59.0149,37.3119 59.0258,37.8553 58.9075,39.7299 59.9314,44.4751 59.81,44.4146 55.3097,40.0925 52.1652,38.3395 52.1652,39.1456 52.7573,38.0214 52.8989,37.1608 52.2393,35.4682 52.2022,36.5022 53.0008,35.3776 53.0462,35.3645 53.076,34.2895 52.2208,32.5969 52.2208,33.4048 52.8423,33.1712 52.8276,32.5275 53.1741,31.2368 52.1652,29.7861 52.1466,32.2523 53.964,31.8748 54.1736,29.3931 52.2763,29.4536 59.7796,30.5719 59.9919,30.4812 58.8542,32.3249 59.9465,33.6548 59.9465,30.179 57.9196,30.179 56.9764,32.2175 58.3664,32.2342 58.4928,32.5691 58.5924,34.8637 59.9768,36.2843 59.9616,34.0496 58.6717,34.9952 58.6226,35.3712 58.8556,34.6522 58.9167,35.5408 58.9593),(36.4989 58.7512,36.1498 58.553,36.3447 58.5402,36.0877 58.5174,35.4314 58.1349,36.403 58.0507,36.5949 58.1673,36.0123 58.2869,37.191 58.6819,36.4989 58.7512),(34.4816 56.8232,34.8098 57.0409,33.5602 56.9781,33.3418 56.8364,33.8361 56.6953,34.1885 56.6259,34.3867 56.7596,34.229 56.7948,34.4816 56.8232),(35.9179 57.7512,35.7402 57.7909,36.0848 57.855,36.3932 58.0447,35.1134 57.9454,34.6332 57.6538,35.613 57.5595,35.9179 57.7512),(36.8709 53.2765,37.135 53.4711,36.9794 53.5878,37.3119 53.9273,37.0035 54.2999,36.6985 54.0791,36.919 53.8561,36.3552 53.8269,36.1528 53.6763,36.8709 53.2765),(38.1601 55.1091,38.3093 55.1546,38.2609 55.1775,38.1601 55.1091),(38.1688 56.0758,38.4339 56.2361,37.5054 56.5484,37.2281 56.3799,38.1688 56.0758),(38.1319 56.0534,36.647 55.9411,37.6238 55.7402,38.1319 56.0534),(37.2824 55.5258,36.8283 55.4471,37.06 55.3843,37.2824 55.5258),(36.151 54.791,36.0123 54.7554,36.0472 54.7217,36.151 54.791),(34.9611 53.9765,34.894 54.1226,35.6193 54.4929,34.9706 54.9262,34.7231 54.7576,35.0753 54.5981,34.1081 54.1757,34.7279 53.8116,34.9611 53.9765),(38.2312 56.9795,37.565 56.5843,38.9742 56.8774,38.4915 57.1308,38.2699 57.0021,38.3093 56.9929,38.2312 56.9795),(36.5334 56.6753,36.375 56.6455,36.4446 56.6242,36.5334 56.6753),(36.1999 57.0022,36.9794 57.0751,36.4587 57.1544,36.1999 57.0022),(34.6028 58.3749,33.6245 58.271,34.3593 58.2189,34.6028 58.3749),(33.7581 57.8255,33.2316 57.7748,33.6325 57.7419,33.7581 57.8255),(31.6069 56.3194,31.7506 56.8609,31.6514 57.1258,30.3301 56.1942,30.2394 55.2753,31.6069 56.3194),(34.2274 57.4023,34.0208 57.2724,35.0338 57.1875,35.4682 57.4674,34.2274 57.4023),(31.7782 55.7778,30.2092 54.6331,30.2394 53.6774,31.7439 54.8677,31.8413 54.9989,32.204 55.5156,31.7782 55.7778),(33.7222 56.3063,32.8387 56.3117,33.5244 56.1686,33.7222 56.3063),(33.1204 55.8832,32.748 55.9072,32.9547 55.7645,33.1204 55.8832),(35.2275 55.0993,36.4354 55.3441,35.7505 55.4454,35.2275 55.0993),(35.9817 55.5958,36.5563 55.6352,36.193 55.7319,35.9817 55.5958),(35.0954 55.822,35.3188 55.9582,34.7331 56.1049,34.4996 55.9565,35.0954 55.822),(34.9721 55.7463,34.2598 55.8023,33.6125 55.3778,34.3709 55.3709,34.9721 55.7463),(35.6571 56.1619,36.0233 56.3789,35.4083 56.5254,35.2273 56.414,35.71 56.3117,35.0485 56.303,34.744 56.1118,35.6571 56.1619),(40.2143 54.467,40.3948 54.4403,40.6064 54.034,39.9716 53.9807,40.2437 53.5878,39.5485 53.5878,39.9942 53.358,43.0243 55.3269,43.0243 56.2614,40.2143 54.467),(38.5511 53.2922,38.4609 53.226,39.2704 52.8471,39.9877 53.3534,38.5511 53.2922),(40.5716 55.8007,43.0243 57.2554,43.0243 58.0797,40.4543 56.5923,40.4855 56.4957,40.2529 56.4682,39.8102 56.1914,39.8205 56.0763,40.425 56.1942,40.5716 55.8007),(40.5504 55.7875,39.7601 55.7544,39.8151 55.3187,40.5504 55.7875),(39.7863 57.025,42.5105 58.477,41.6944 58.8542,40.1389 58.048,40.2437 58.0478,40.3343 57.4673,39.7299 57.4673,39.7863 57.025),(38.0744 57.5312,38.3737 57.6908,38.3395 57.7103,38.8533 58.0638,38.432 58.2584,38.0535 58.0542,38.3395 57.9356,37.4328 57.7103,38.0744 57.5312),(37.9669 57.4734,37.1608 57.2554,37.4489 57.1909,37.9669 57.4734),(40.4136 58.7241,41.2108 59.1035,40.6366 59.3817,39.8163 58.9766,40.4552 58.9011,40.4136 58.7241),(39.7184 58.3823,39.6392 58.3821,39.6392 58.3427,39.7184 58.3823),(38.7465 58.4255,39.5485 58.7133,39.4085 58.7696,38.7465 58.4255)))
+-------- MultiPolygon with Polygon with Holes
+MULTIPOLYGON(((24.3677 61.4598,26.6528 61.1008,26.8726 61.7107,30.564 61.0583,31.3989 62.0215,36.0132 61.1432,36.8921 62.0009,42.6489 60.6301,43.5718 61.3757,47.0435 59.8889,49.5923 60.0868,49.1528 58.1707,51.9214 57.9148,50.2515 56.1455,52.6685 55.826,51.6577 54.2909,52.8882 53.9302,50.647 53.0148,51.394 52.4828,48.0542 51.1793,49.2847 50.5414,47.1753 49.153,43.9233 49.8096,42.561 48.7779,36.936 49.6676,35.2661 48.7489,32.8052 49.5252,27.2241 48.9802,26.1255 50.4015,21.2036 50.205,20.0171 51.5634,17.4683 53.0148,19.4458 54.0852,19.4458 55.8753,19.5776 57.4922,19.5776 58.6769,24.3677 61.4598),(24.4556 59.4227,21.2036 58.4937,21.3354 56.897,21.5991 55.9246,25.2026 55.9984,28.8501 57.0646,27.0923 57.8448,28.8062 59.1759,26.2573 59.1759,24.4556 59.4227),(33.1079 56.9523,33.1392 56.8934,33.7182 56.7292,35.1489 56.5859,34.229 56.7948,36.9794 57.0751,35.7705 57.2554,37.0097 57.4998,35.7402 57.7909,37.1608 58.0478,36.0123 58.2869,37.191 58.6819,34.6522 58.9167,37.2327 59.0233,37.1118 59.6677,35.1343 59.8448,31.9702 58.9727,32.25 58.4976,33.4734 58.8542,34.7428 59.5659,33.8361 58.6819,36.3447 58.5402,33.6245 58.271,36.4354 58.0478,33.2316 57.7748,36.1936 57.4998,33.1712 57.337,36.0727 57.0915,33.1079 56.9523),(37.0604 52.9744,34.9585 51.4814,36.5405 50.4015,39.6606 50.2893,39.7925 52.1335,41.77 50.6808,44.4946 51.9713,47.3071 52.5095,44.0552 53.5403,46.604 53.6967,47.6147 55.4041,45.3735 55.4041,42.8247 56.5837,40.4412 56.1511,40.5761 55.7884,39.7601 55.7544,39.8205 55.2753,40.3948 55.2408,40.3948 54.8773,39.5485 54.8773,39.5485 54.5631,40.3948 54.4403,40.6064 54.034,39.9716 53.9807,40.2437 53.5878,39.5485 53.5878,40.0019 53.354,38.3395 53.2817,39.5787 52.6996,37.8559 52.9188,37.4471 53.2343,37.2165 53.0798,37.4328 52.9552,37.0604 52.9744),(31.627 54.7093,29.5972 55.5037,29.1577 55.7518,22.5659 55.1286,22.5659 53.5403,22.0386 51.4814,26.2573 51.4266,30.1245 50.5414,32.1899 51.1793,30.1245 53.1731,32.4808 53.1989,32.0831 53.408,32.476 53.8383,31.4182 54.4227,31.627 54.7093),(34.7731 53.3243,34.7731 53.1793,35.0903 53.1731,34.7731 53.3243),(36.9508 55.414,37.7653 55.1891,36.8822 54.975,37.0572 54.7635,38.3093 55.1546,37.7955 55.3956,38.4907 55.5327,38.3184 55.7179,38.0262 55.6546,38.0373 55.6523,37.9482 55.6376,36.9508 55.414),(38.3092 56.9929,38.5798 57.0849,38.2186 57.2717,38.7325 57.4835,38.3395 57.7103,38.8533 58.0638,38.3698 58.2869,39.5485 58.7133,38.8838 58.9777,38.0944 58.8545,38.5813 58.7446,37.4026 58.3187,38.3395 57.9356,37.4328 57.7103,38.128 57.516,37.1608 57.2554,38.3092 56.9929),(38.309 56.9928,36.375 56.6455,36.8799 56.4895,38.309 56.9928),(40.3237 57.5365,42.6929 58.0314,40.8911 59.2659,39.2792 59.0373,40.4552 58.9011,40.3343 58.3821,39.6392 58.3821,39.6392 58.0478,40.2437 58.0478,40.3237 57.5365),(40.0149 57.4677,39.7299 57.4673,39.7379 57.4051,40.0149 57.4677)))
+-------- Polygon with Polygon with Holes
+MULTIPOLYGON(((24.3677 61.4598,26.6528 61.1008,26.8726 61.7107,30.564 61.0583,31.3989 62.0215,36.0132 61.1432,36.8921 62.0009,42.6489 60.6301,43.5718 61.3757,47.0435 59.8889,49.5923 60.0868,49.1528 58.1707,51.9214 57.9148,50.2515 56.1455,52.6685 55.826,51.6577 54.2909,52.8882 53.9302,50.647 53.0148,51.394 52.4828,48.0542 51.1793,49.2847 50.5414,47.1753 49.153,43.9233 49.8096,42.561 48.7779,36.936 49.6676,35.2661 48.7489,32.8052 49.5252,27.2241 48.9802,26.1255 50.4015,21.2036 50.205,20.0171 51.5634,17.4683 53.0148,19.4458 54.0852,19.4458 55.8753,19.5776 57.4922,19.5776 58.6769,24.3677 61.4598),(24.4556 59.4227,21.2036 58.4937,21.3354 56.897,21.5991 55.9246,25.2026 55.9984,28.8501 57.0646,27.0923 57.8448,28.8062 59.1759,26.2573 59.1759,24.4556 59.4227),(32.6512 57.792,32.9378 57.2699,36.7912 59.6986,35.9475 59.7758,32.6512 57.792),(33.2446 56.7729,34.2635 56.6767,37.6322 58.7797,37.2876 58.7226,37.2102 59.1452,33.2446 56.7729),(36.1815 56.4715,41.168 59.0834,40.9299 59.2404,40.8804 59.2644,40.2079 59.1718,35.4536 56.5531,36.1815 56.4715),(30.7705 55.0525,30.2092 54.6331,30.2394 53.6774,31.5682 54.7333,30.7705 55.0525),(33.8733 53.1922,34.3351 53.53,33.5144 53.9057,32.5603 53.1989,33.8733 53.1922),(31.1968 52.1649,29.7861 52.1466,30.5785 52.7531,30.3098 53.0028,29.3931 52.2763,29.4171 55.606,29.1577 55.7518,22.5659 55.1286,22.5659 53.5403,22.0386 51.4814,26.2573 51.4266,30.1245 50.5414,32.1899 51.1793,31.1968 52.1649),(31.1682 53.1903,32.6907 54.2663,32.2591 54.4483,30.5408 53.1811,31.1682 53.1903),(39.4328 55.9511,37.2766 54.4948,37.7431 53.9104,41.4519 56.3413,39.4328 55.9511),(40.9691 57.677,42.2498 58.3455,41.5887 58.8012,38.1759 56.9472,39.0894 57.2553,40.9691 57.677),(37.1934 55.4694,36.5845 55.3291,36.7219 55.1665,37.1934 55.4694),(32.2964 58.4175,34.2247 59.6064,31.9702 58.9727,32.2964 58.4175),(35.9681 52.2157,34.9585 51.4814,36.5405 50.4015,39.6606 50.2893,39.7925 52.1335,41.77 50.6808,44.4946 51.9713,47.3071 52.5095,44.0552 53.5403,46.604 53.6967,47.6147 55.4041,45.3735 55.4041,44.4212 55.8594,44.4146 55.3097,40.0925 52.1652,38.3395 52.1652,43.0243 55.3269,43.0243 56.2614,37.1608 52.2393,35.9681 52.2157)))
diff --git a/tests/queries/0_stateless/01305_polygons_union.sql b/tests/queries/0_stateless/01305_polygons_union.sql
new file mode 100644
index 00000000000..01982c21e6e
--- /dev/null
+++ b/tests/queries/0_stateless/01305_polygons_union.sql
@@ -0,0 +1,15 @@
+select polygonsUnionCartesian([[[(0., 0.),(0., 3.),(1., 2.9),(2., 2.6),(2.6, 2.),(2.9, 1),(3., 0.),(0., 0.)]]], [[[(1., 1.),(1., 4.),(4., 4.),(4., 1.),(1., 1.)]]]);
+
+SELECT polygonsUnionCartesian([[[(2., 100.0000991821289), (0., 3.), (1., 2.9), (2., 2.6), (2.6, 2.), (2.9, 1), (3., 0.), (100.0000991821289, 2.)]]], [[[(1., 1.), (1000.0001220703125, nan), (4., 4.), (4., 1.), (1., 1.)]]]); -- { serverError 43 }
+
+select polygonsUnionSpherical([[[(4.3613577, 50.8651821), (4.349556, 50.8535879), (4.3602419, 50.8435626), (4.3830299, 50.8428851), (4.3904543, 50.8564867), (4.3613148, 50.8651279)]]], [[[(4.346693, 50.858306), (4.367945, 50.852455), (4.366227, 50.840809), (4.344961, 50.833264), (4.338074, 50.848677), (4.346693, 50.858306)]]]);
+
+select '-------- MultiPolygon with Polygon';
+select wkt(polygonsUnionSpherical([[(29.453587685533865,59.779570356240356),(29.393139070478895,52.276266797422124),(40.636581470703206,59.38168915000267),(41.21084331372543,59.103467777099866),(29.786055068336193,52.146627480315004),(31.23682182965546,52.16517054781818),(41.69443223416517,58.85424941916091),(42.51048853740727,58.47703162291134),(32.59691566839227,52.22075341251539),(34.289476889931414,52.22075341251539),(43.02430176537451,58.07974369546071),(43.02430176537451,57.25537683364851),(35.468224883503325,52.2022335126388),(37.16078610504247,52.23926559241349),(43.02430176537451,56.26136189644947),(43.02430176537451,55.326904361850836),(38.33953409861437,52.16517054781818),(40.09254393520848,52.16517054781818),(44.4146199116388,55.3097062225408),(44.47506852669377,59.80998197603594),(39.72985224487867,59.931351417569715),(30.23941968124846,53.67744677450975),(30.20919537372098,54.63314259659509),(38.73245009647167,59.94649146557819),(37.2816833351524,59.97675082987618),(30.23941968124846,55.2752875586599),(30.33009260383092,56.19415599955667),(36.28428118674541,59.96162460231375),(34.863738732953635,59.97675082987618),(30.178971066193498,56.97640788219866),(30.178971066193498,57.91957806959033),(33.65476643185424,59.94649146557819),(32.32489690064491,59.94649146557819),(30.481214141468342,58.85424941916091),(30.571887064050795,59.99187015036608),(29.453587685533865,59.779570356240356)]], [[[(33.473420586689336,58.85424941916091),(32.23422397806246,58.492830557036),(32.173775363007486,58.03176922751564),(31.508840597402823,57.499784781503735),(31.750635057622702,56.86092686957355),(31.508840597402823,55.941082594334574),(32.20399967053497,55.515591939372456),(31.84130798020516,54.998862226280465),(31.418167674820367,54.422670886434275),(32.47601843828233,53.83826377018255),(32.08310244042503,53.408048308050866),(33.171177511414484,52.82758702113742),(34.77306581037117,52.91880107773494),(34.77306581037117,53.784726518357985),(34.108131044766516,54.17574726780569),(35.07530888564602,54.59813930694554),(34.25925258240394,54.96417435716029),(35.01486027059106,55.361278263643584),(33.50364489421682,55.37845402950552),(32.7480372060297,55.90721384574556),(35.67979503619571,55.68634475630185),(32.83871012861215,56.311688992608396),(34.591719965206266,56.29492065473883),(35.7100193437232,56.311688992608396),(33.83611227701915,56.695333481003644),(32.95960735872209,56.9434497616887),(36.072711034053015,57.091531913901434),(33.171177511414484,57.33702717078384),(36.193608264162954,57.499784781503735),(33.23162612646945,57.77481561306047),(36.43540272438284,58.04776787540811),(33.62454212432676,58.27099811968307),(36.344729801800376,58.54018474404165),(33.83611227701915,58.68186423448108),(34.74284150284369,59.565911441555244),(33.473420586689336,58.85424941916091)]], [[(34.65216858026123,58.91672306881671),(37.19101041256995,58.68186423448108),(36.01226241899805,58.28688958537609),(37.16078610504247,58.04776787540811),(35.74024365125068,57.79092907387934),(37.009664567405046,57.499784781503735),(35.77046795877817,57.25537683364851),(36.979440259877556,57.07510745541089),(34.22902827487645,56.794777197297435),(36.7074214921302,56.210968525786996),(34.712617195316206,56.10998276812964),(36.55629995449277,55.63519693782703),(35.13575750070099,55.53270067649592),(36.43540272438284,55.34409504165558),(34.83351442542614,55.01619492319591),(35.61934642114075,54.49294870011772),(34.89396304048112,54.12264226523038),(35.37755196092087,53.046178687628185),(37.43280487278982,52.95523300597458),(35.92158949641559,53.80257986695776),(36.91899164482259,53.856094327816805),(36.01226241899805,54.75541714463799),(37.765272255592166,55.189110239786885),(36.828318722240134,55.44708256557195),(38.03729102333953,55.652253637168315),(36.64697287707522,55.941082594334574),(38.21863686850443,56.05939028508024),(36.37495410932787,56.64551287174558),(38.30930979108689,56.992876013526654),(37.16078610504247,57.25537683364851),(38.127963945921984,57.516020773674256),(37.43280487278982,57.710289827306724),(38.33953409861437,57.935626886818994),(37.40258056526235,58.31865112960426),(38.58132855883426,58.744648733419496),(37.31190764267989,59.02578062465136),(34.65216858026123,58.91672306881671)]], [[(38.52087994377928,59.11898412389468),(39.54850639971376,58.713270635642914),(38.369758406141855,58.28688958537609),(38.85334732658162,58.06375936407028),(38.33953409861437,57.710289827306724),(38.73245009647167,57.48354156434209),(38.21863686850443,57.271721400459285),(38.97424455669155,56.87744603722649),(37.463029180317314,56.5623320541159),(38.94402024916407,56.05939028508024),(38.18841256097694,55.856355210835915),(38.490655636251795,55.53270067649592),(37.795496563119656,55.39562234093384),(38.30930979108689,55.154587013355666),(36.7074214921302,54.65063295250911),(37.31190764267989,53.92734063371401),(36.979440259877556,53.58783775557231),(37.855945178174615,52.91880107773497),(39.57873070724124,52.69956490610895),(38.33953409861437,53.281741738901104),(40.00187101262603,53.35396273604752),(39.54850639971376,53.58783775557231),(40.24366547284591,53.58783775557231),(39.97164670509855,53.98069568468355),(40.60635716317572,54.03398248547225),(40.39478701048334,54.44025165268903),(39.54850639971376,54.56310590284329),(39.54850639971376,54.87732350170489),(40.39478701048334,54.87732350170489),(40.39478701048334,55.24083903654295),(39.82052516746112,55.2752875586599),(39.760076552406154,55.75443792473942),(40.57613285564824,55.78844000174894),(40.425011318010824,56.19415599955667),(39.82052516746112,56.07626182891758),(39.79030085993364,56.41214455508424),(40.48545993306579,56.495655446714636),(40.33433839542836,56.95993246553937),(39.79030085993364,56.992876013526654),(39.72985224487867,57.46729112028032),(40.33433839542836,57.46729112028032),(40.24366547284591,58.04776787540811),(39.63917932229622,58.04776787540811),(39.63917932229622,58.382088724871295),(40.33433839542836,58.382088724871295),(40.45523562553831,58.9011152358548),(38.52087994377928,59.11898412389468)]]])) format TSV;
+
+select '-------- MultiPolygon with Polygon with Holes';
+select wkt(polygonsUnionSpherical([[[(33.473420586689336,58.85424941916091),(32.23422397806246,58.492830557036),(32.173775363007486,58.03176922751564),(31.508840597402823,57.499784781503735),(31.750635057622702,56.86092686957355),(31.508840597402823,55.941082594334574),(32.20399967053497,55.515591939372456),(31.84130798020516,54.998862226280465),(31.418167674820367,54.422670886434275),(32.47601843828233,53.83826377018255),(32.08310244042503,53.408048308050866),(33.171177511414484,52.82758702113742),(34.77306581037117,52.91880107773494),(34.77306581037117,53.784726518357985),(34.108131044766516,54.17574726780569),(35.07530888564602,54.59813930694554),(34.25925258240394,54.96417435716029),(35.01486027059106,55.361278263643584),(33.50364489421682,55.37845402950552),(32.7480372060297,55.90721384574556),(35.67979503619571,55.68634475630185),(32.83871012861215,56.311688992608396),(34.591719965206266,56.29492065473883),(35.7100193437232,56.311688992608396),(33.83611227701915,56.695333481003644),(32.95960735872209,56.9434497616887),(36.072711034053015,57.091531913901434),(33.171177511414484,57.33702717078384),(36.193608264162954,57.499784781503735),(33.23162612646945,57.77481561306047),(36.43540272438284,58.04776787540811),(33.62454212432676,58.27099811968307),(36.344729801800376,58.54018474404165),(33.83611227701915,58.68186423448108),(34.74284150284369,59.565911441555244),(33.473420586689336,58.85424941916091)]], [[(34.65216858026123,58.91672306881671),(37.19101041256995,58.68186423448108),(36.01226241899805,58.28688958537609),(37.16078610504247,58.04776787540811),(35.74024365125068,57.79092907387934),(37.009664567405046,57.499784781503735),(35.77046795877817,57.25537683364851),(36.979440259877556,57.07510745541089),(34.22902827487645,56.794777197297435),(36.7074214921302,56.210968525786996),(34.712617195316206,56.10998276812964),(36.55629995449277,55.63519693782703),(35.13575750070099,55.53270067649592),(36.43540272438284,55.34409504165558),(34.83351442542614,55.01619492319591),(35.61934642114075,54.49294870011772),(34.89396304048112,54.12264226523038),(35.37755196092087,53.046178687628185),(37.43280487278982,52.95523300597458),(35.92158949641559,53.80257986695776),(36.91899164482259,53.856094327816805),(36.01226241899805,54.75541714463799),(37.765272255592166,55.189110239786885),(36.828318722240134,55.44708256557195),(38.03729102333953,55.652253637168315),(36.64697287707522,55.941082594334574),(38.21863686850443,56.05939028508024),(36.37495410932787,56.64551287174558),(38.30930979108689,56.992876013526654),(37.16078610504247,57.25537683364851),(38.127963945921984,57.516020773674256),(37.43280487278982,57.710289827306724),(38.33953409861437,57.935626886818994),(37.40258056526235,58.31865112960426),(38.58132855883426,58.744648733419496),(37.31190764267989,59.02578062465136),(34.65216858026123,58.91672306881671)]], [[(38.52087994377928,59.11898412389468),(39.54850639971376,58.713270635642914),(38.369758406141855,58.28688958537609),(38.85334732658162,58.06375936407028),(38.33953409861437,57.710289827306724),(38.73245009647167,57.48354156434209),(38.21863686850443,57.271721400459285),(38.97424455669155,56.87744603722649),(37.463029180317314,56.5623320541159),(38.94402024916407,56.05939028508024),(38.18841256097694,55.856355210835915),(38.490655636251795,55.53270067649592),(37.795496563119656,55.39562234093384),(38.30930979108689,55.154587013355666),(36.7074214921302,54.65063295250911),(37.31190764267989,53.92734063371401),(36.979440259877556,53.58783775557231),(37.855945178174615,52.91880107773497),(39.57873070724124,52.69956490610895),(38.33953409861437,53.281741738901104),(40.00187101262603,53.35396273604752),(39.54850639971376,53.58783775557231),(40.24366547284591,53.58783775557231),(39.97164670509855,53.98069568468355),(40.60635716317572,54.03398248547225),(40.39478701048334,54.44025165268903),(39.54850639971376,54.56310590284329),(39.54850639971376,54.87732350170489),(40.39478701048334,54.87732350170489),(40.39478701048334,55.24083903654295),(39.82052516746112,55.2752875586599),(39.760076552406154,55.75443792473942),(40.57613285564824,55.78844000174894),(40.425011318010824,56.19415599955667),(39.82052516746112,56.07626182891758),(39.79030085993364,56.41214455508424),(40.48545993306579,56.495655446714636),(40.33433839542836,56.95993246553937),(39.79030085993364,56.992876013526654),(39.72985224487867,57.46729112028032),(40.33433839542836,57.46729112028032),(40.24366547284591,58.04776787540811),(39.63917932229622,58.04776787540811),(39.63917932229622,58.382088724871295),(40.33433839542836,58.382088724871295),(40.45523562553831,58.9011152358548),(38.52087994377928,59.11898412389468)]]], [[(24.367675781249993,61.45977057029751),(19.577636718749993,58.67693767258692),(19.577636718749993,57.492213666700735),(19.445800781249996,55.87531083569678),(19.445800781249996,54.085173420886775),(17.468261718749996,53.014783245859235),(20.017089843749993,51.563412328675895),(21.203613281249993,50.205033264943324),(26.125488281249993,50.40151532278236),(27.22412109374999,48.980216985374994),(32.80517578124999,49.525208341974405),(35.26611328124999,48.74894534343292),(36.93603515624999,49.66762782262194),(42.56103515625,48.77791275550183),(43.92333984374999,49.8096315635631),(47.17529296875,49.152969656170455),(49.28466796875,50.54136296522162),(48.05419921875,51.17934297928929),(51.39404296875,52.48278022207825),(50.64697265625,53.014783245859235),(52.88818359375,53.93021986394004),(51.65771484374999,54.29088164657006),(52.66845703125,55.825973254619015),(50.25146484375,56.145549500679095),(51.92138671875,57.914847767009206),(49.15283203125,58.17070248348605),(49.59228515625,60.086762746260064),(47.043457031249986,59.88893689676584),(43.57177734375,61.37567331572748),(42.64892578125,60.630101766266705),(36.89208984374999,62.000904713685856),(36.01318359374999,61.143235250840576),(31.398925781249993,62.02152819100766),(30.563964843749996,61.05828537037917),(26.872558593749993,61.71070595883174),(26.652832031249993,61.10078883158897),(24.367675781249993,61.45977057029751)], [(24.455566406249993,59.42272750081452),(21.203613281249993,58.49369382056807),(21.335449218749993,56.89700392127261),(21.599121093749993,55.92458580482949),(25.202636718749993,55.998380955359636),(28.850097656249993,57.06463027327854),(27.09228515625,57.844750992890994),(28.806152343749996,59.17592824927138),(26.257324218749993,59.17592824927138),(24.455566406249993,59.42272750081452)], [(35.13427734375,59.84481485969107),(31.970214843749993,58.97266715450152),(33.20068359374999,56.776808316568406),(36.67236328125,56.41390137600675),(39.08935546874999,57.25528054528888),(42.69287109374999,58.03137242177638),(40.89111328124999,59.26588062825809),(37.28759765625,58.722598828043374),(37.11181640624999,59.66774058164964),(35.13427734375,59.84481485969107)], [(29.157714843749993,55.75184939173528),(22.565917968749993,55.128649068488784),(22.565917968749993,53.54030739150019),(22.038574218749996,51.48138289610097),(26.257324218749993,51.42661449707484),(30.124511718749993,50.54136296522162),(32.18994140624999,51.17934297928929),(30.124511718749993,53.173119202640635),(35.09033203124999,53.173119202640635),(33.11279296875,54.085173420886775),(29.597167968749993,55.50374985927513),(29.157714843749993,55.75184939173528)], [(42.82470703125,56.58369172128337),(36.584472656249986,55.329144408405085),(37.99072265625,53.592504809039355),(34.95849609374999,51.48138289610097),(36.54052734374999,50.40151532278236),(39.66064453124999,50.289339253291786),(39.79248046875,52.13348804077148),(41.77001953125,50.68079714532166),(44.49462890624999,51.97134580885171),(47.30712890624999,52.509534770327264),(44.05517578125,53.54030739150019),(46.60400390625,53.696706475303245),(47.61474609375,55.40406982700608),(45.37353515625,55.40406982700608),(42.82470703125,56.58369172128337)]])) format TSV;
+
+select '-------- Polygon with Polygon with Holes';
+select wkt(polygonsUnionSpherical([[(29.453587685533865,59.779570356240356),(29.393139070478895,52.276266797422124),(40.636581470703206,59.38168915000267),(41.21084331372543,59.103467777099866),(29.786055068336193,52.146627480315004),(31.23682182965546,52.16517054781818),(41.69443223416517,58.85424941916091),(42.51048853740727,58.47703162291134),(32.59691566839227,52.22075341251539),(34.289476889931414,52.22075341251539),(43.02430176537451,58.07974369546071),(43.02430176537451,57.25537683364851),(35.468224883503325,52.2022335126388),(37.16078610504247,52.23926559241349),(43.02430176537451,56.26136189644947),(43.02430176537451,55.326904361850836),(38.33953409861437,52.16517054781818),(40.09254393520848,52.16517054781818),(44.4146199116388,55.3097062225408),(44.47506852669377,59.80998197603594),(39.72985224487867,59.931351417569715),(30.23941968124846,53.67744677450975),(30.20919537372098,54.63314259659509),(38.73245009647167,59.94649146557819),(37.2816833351524,59.97675082987618),(30.23941968124846,55.2752875586599),(30.33009260383092,56.19415599955667),(36.28428118674541,59.96162460231375),(34.863738732953635,59.97675082987618),(30.178971066193498,56.97640788219866),(30.178971066193498,57.91957806959033),(33.65476643185424,59.94649146557819),(32.32489690064491,59.94649146557819),(30.481214141468342,58.85424941916091),(30.571887064050795,59.99187015036608),(29.453587685533865,59.779570356240356)]], [[(24.367675781249993,61.45977057029751),(19.577636718749993,58.67693767258692),(19.577636718749993,57.492213666700735),(19.445800781249996,55.87531083569678),(19.445800781249996,54.085173420886775),(17.468261718749996,53.014783245859235),(20.017089843749993,51.563412328675895),(21.203613281249993,50.205033264943324),(26.125488281249993,50.40151532278236),(27.22412109374999,48.980216985374994),(32.80517578124999,49.525208341974405),(35.26611328124999,48.74894534343292),(36.93603515624999,49.66762782262194),(42.56103515625,48.77791275550183),(43.92333984374999,49.8096315635631),(47.17529296875,49.152969656170455),(49.28466796875,50.54136296522162),(48.05419921875,51.17934297928929),(51.39404296875,52.48278022207825),(50.64697265625,53.014783245859235),(52.88818359375,53.93021986394004),(51.65771484374999,54.29088164657006),(52.66845703125,55.825973254619015),(50.25146484375,56.145549500679095),(51.92138671875,57.914847767009206),(49.15283203125,58.17070248348605),(49.59228515625,60.086762746260064),(47.043457031249986,59.88893689676584),(43.57177734375,61.37567331572748),(42.64892578125,60.630101766266705),(36.89208984374999,62.000904713685856),(36.01318359374999,61.143235250840576),(31.398925781249993,62.02152819100766),(30.563964843749996,61.05828537037917),(26.872558593749993,61.71070595883174),(26.652832031249993,61.10078883158897),(24.367675781249993,61.45977057029751)], [(24.455566406249993,59.42272750081452),(21.203613281249993,58.49369382056807),(21.335449218749993,56.89700392127261),(21.599121093749993,55.92458580482949),(25.202636718749993,55.998380955359636),(28.850097656249993,57.06463027327854),(27.09228515625,57.844750992890994),(28.806152343749996,59.17592824927138),(26.257324218749993,59.17592824927138),(24.455566406249993,59.42272750081452)], [(35.13427734375,59.84481485969107),(31.970214843749993,58.97266715450152),(33.20068359374999,56.776808316568406),(36.67236328125,56.41390137600675),(39.08935546874999,57.25528054528888),(42.69287109374999,58.03137242177638),(40.89111328124999,59.26588062825809),(37.28759765625,58.722598828043374),(37.11181640624999,59.66774058164964),(35.13427734375,59.84481485969107)], [(29.157714843749993,55.75184939173528),(22.565917968749993,55.128649068488784),(22.565917968749993,53.54030739150019),(22.038574218749996,51.48138289610097),(26.257324218749993,51.42661449707484),(30.124511718749993,50.54136296522162),(32.18994140624999,51.17934297928929),(30.124511718749993,53.173119202640635),(35.09033203124999,53.173119202640635),(33.11279296875,54.085173420886775),(29.597167968749993,55.50374985927513),(29.157714843749993,55.75184939173528)], [(42.82470703125,56.58369172128337),(36.584472656249986,55.329144408405085),(37.99072265625,53.592504809039355),(34.95849609374999,51.48138289610097),(36.54052734374999,50.40151532278236),(39.66064453124999,50.289339253291786),(39.79248046875,52.13348804077148),(41.77001953125,50.68079714532166),(44.49462890624999,51.97134580885171),(47.30712890624999,52.509534770327264),(44.05517578125,53.54030739150019),(46.60400390625,53.696706475303245),(47.61474609375,55.40406982700608),(45.37353515625,55.40406982700608),(42.82470703125,56.58369172128337)]])) format TSV;
+
diff --git a/tests/queries/0_stateless/01305_replica_create_drop_zookeeper.sh b/tests/queries/0_stateless/01305_replica_create_drop_zookeeper.sh
index 5dd3d2b38d6..6248813c9ba 100755
--- a/tests/queries/0_stateless/01305_replica_create_drop_zookeeper.sh
+++ b/tests/queries/0_stateless/01305_replica_create_drop_zookeeper.sh
@@ -8,24 +8,13 @@ set -e
 
 function thread()
 {
-    db_engine=`$CLICKHOUSE_CLIENT -q "SELECT engine FROM system.databases WHERE name='$CLICKHOUSE_DATABASE'"`
-    if [[ $db_engine == "Atomic" ]]; then
-        # Ignore "Replica already exists" exception
-        while true; do
-            $CLICKHOUSE_CLIENT -n -q "DROP TABLE IF EXISTS test_table_$1 NO DELAY;
-                CREATE TABLE test_table_$1 (a UInt8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_01305/alter_table', 'r_$1') ORDER BY tuple();" 2>&1 |
-                    grep -vP '(^$)|(^Received exception from server)|(^\d+\. )|because the last replica of the table was dropped right now|is already started to be removing by another replica right now|is already finished removing by another replica right now|Removing leftovers from table|Another replica was suddenly created|was successfully removed from ZooKeeper|was created by another server at the same moment|was suddenly removed|some other replicas were created at the same time|already exists'
-            done
-    else
-        while true; do
-            $CLICKHOUSE_CLIENT -n -q "DROP TABLE IF EXISTS test_table_$1;
-                CREATE TABLE test_table_$1 (a UInt8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_01305/alter_table', 'r_$1') ORDER BY tuple();" 2>&1 |
-                    grep -vP '(^$)|(^Received exception from server)|(^\d+\. )|because the last replica of the table was dropped right now|is already started to be removing by another replica right now|is already finished removing by another replica right now|Removing leftovers from table|Another replica was suddenly created|was successfully removed from ZooKeeper|was created by another server at the same moment|was suddenly removed|some other replicas were created at the same time'
-            done
-    fi
+    while true; do
+        $CLICKHOUSE_CLIENT -n -q "DROP TABLE IF EXISTS test_table_$1 SYNC;
+            CREATE TABLE test_table_$1 (a UInt8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/alter_table', 'r_$1') ORDER BY tuple();" 2>&1 |
+                grep -vP '(^$)|(^Received exception from server)|(^\d+\. )|because the last replica of the table was dropped right now|is already started to be removing by another replica right now| were removed by another replica|Removing leftovers from table|Another replica was suddenly created|was created by another server at the same moment|was suddenly removed|some other replicas were created at the same time'
+    done
 }
 
-
 # https://stackoverflow.com/questions/9954794/execute-a-shell-function-with-timeout
 export -f thread;
 
diff --git a/tests/queries/0_stateless/01306_polygons_intersection.reference b/tests/queries/0_stateless/01306_polygons_intersection.reference
new file mode 100644
index 00000000000..43ee975913e
--- /dev/null
+++ b/tests/queries/0_stateless/01306_polygons_intersection.reference
@@ -0,0 +1,10 @@
+[[[(1,2.9),(2,2.6),(2.6,2),(2.9,1),(1,1),(1,2.9)]]]
+[]
+[]
+[[[(4.3666052904432435,50.84337386140151),(4.3602419,50.8435626),(4.349556,50.8535879),(4.3526804582393535,50.856658100365976),(4.367945,50.852455),(4.3666052904432435,50.84337386140151)]]]
+-------- MultiPolygon with Polygon
+MULTIPOLYGON(((35.5408 58.9593,36.9725 59.0149,36.4989 58.7512,35.3712 58.8556,35.5408 58.9593)),((34.4816 56.8232,36.1999 57.0022,35.4083 56.5254,34.3867 56.7596,34.4816 56.8232)),((35.9179 57.7512,36.0848 57.855,37.1608 58.0478,36.5949 58.1673,37.8553 58.9075,38.5813 58.7446,37.4026 58.3187,38.0535 58.0542,36.4587 57.1544,35.7705 57.2554,37.0097 57.4998,35.9179 57.7512)),((36.8709 53.2765,37.4328 52.9552,36.5022 53.0008,36.8709 53.2765)),((36.1528 53.6763,35.3645 53.076,34.9611 53.9765,36.0472 54.7217,36.6985 54.0791,36.3552 53.8269,35.9216 53.8026,36.1528 53.6763)),((37.0035 54.2999,36.7074 54.6506,38.1601 55.1091,37.0035 54.2999)),((38.1688 56.0758,38.2186 56.0594,38.1319 56.0534,38.1688 56.0758)),((37.6238 55.7402,38.0373 55.6523,37.2824 55.5258,37.6238 55.7402)),((37.06 55.3843,37.7653 55.1891,36.151 54.791,37.06 55.3843)),((38.2312 56.9795,36.5334 56.6753,37.4489 57.1909,38.2699 57.0021,38.2312 56.9795)),((37.2281 56.3799,36.193 55.7319,35.3188 55.9582,35.6571 56.1619,36.7074 56.211,36.0233 56.3789,36.4446 56.6242,37.2281 56.3799)),((34.9952 58.6226,36.1498 58.553,36.0877 58.5174,34.6028 58.3749,34.9952 58.6226)),((34.3593 58.2189,35.4314 58.1349,35.1134 57.9454,33.7581 57.8255,34.3593 58.2189)),((33.6325 57.7419,34.6332 57.6538,34.2274 57.4023,33.1712 57.337,34.0208 57.2724,33.5602 56.9781,32.9596 56.9434,33.3418 56.8364,31.7782 55.7778,31.5088 55.9411,31.6069 56.3194,33.6325 57.7419)),((36.403 58.0507,36.4354 58.0478,36.3932 58.0447,36.403 58.0507)),((35.613 57.5595,36.1936 57.4998,35.4682 57.4674,35.613 57.5595)),((35.0338 57.1875,36.0727 57.0915,34.8098 57.0409,35.0338 57.1875)),((34.1885 56.6259,35.2273 56.414,35.0485 56.303,34.5917 56.2949,33.7222 56.3063,34.1885 56.6259)),((33.5244 56.1686,34.4996 55.9565,34.2598 55.8023,33.1204 55.8832,33.5244 56.1686)),((32.9547 55.7645,33.5036 55.3785,33.6125 55.3778,31.8748 54.1736,31.4182 54.4227,31.7439 54.8677,32.9547 55.7645)),((34.7279 53.8116,34.7731 53.7847,34.7731 52.9188,33.4048 52.8423,34.7279 53.8116)),((34.7231 54.7576,32.5275 53.1741,32.0831 53.408,32.476 53.8383,32.2523 53.964,34.3709 55.3709,35.0149 55.3613,34.2593 54.9642,34.7231 54.7576)),((34.9706 54.9262,34.8335 55.0162,35.2275 55.0993,34.9706 54.9262)),((35.7505 55.4454,35.1358 55.5327,35.9817 55.5958,35.7505 55.4454)),((35.0954 55.822,35.6798 55.6863,34.9721 55.7463,35.0954 55.822)),((34.7331 56.1049,34.7126 56.11,34.744 56.1118,34.7331 56.1049)),((40.2143 54.467,38.5511 53.2922,38.3395 53.2817,38.4609 53.226,38.0214 52.8989,37.8559 52.9188,37.135 53.4711,39.8151 55.3187,39.8205 55.2753,40.3948 55.2408,40.3948 54.8773,39.5485 54.8773,39.5485 54.5631,40.2143 54.467)),((40.5716 55.8007,40.5761 55.7884,40.5504 55.7875,40.5716 55.8007)),((40.4543 56.5923,40.2529 56.4682,39.7903 56.4121,39.8102 56.1914,38.2609 55.1775,37.7955 55.3956,38.4907 55.5327,38.1884 55.8564,38.944 56.0594,38.4339 56.2361,39.7863 57.025,39.7903 56.9929,40.3343 56.9599,40.4543 56.5923)),((40.1389 58.048,38.4915 57.1308,38.2186 57.2717,38.7325 57.4835,38.3737 57.6908,39.6392 58.3427,39.6392 58.0478,40.1389 58.048)),((37.5054 56.5484,37.463 56.5623,37.565 56.5843,37.5054 56.5484)),((38.0744 57.5312,38.128 57.516,37.9669 57.4734,38.0744 57.5312)),((40.4136 58.7241,40.3343 58.3821,39.7184 58.3823,40.4136 58.7241)),((39.8163 58.9766,39.4085 58.7696,38.5209 59.119,39.8163 58.9766)),((38.432 58.2584,38.3698 58.2869,38.7465 58.4255,38.432 58.2584)),((32.2175 58.3664,32.5691 58.5924,33.4734 58.8542,34.7428 59.5659,33.8361 58.6819,34.0496 58.6717,31.6514 57.1258,31.5088 57.4998,32.1738 58.0318,32.2175 58.3664)),((39.9942 53.358,40.0019 53.354,39.9877 53.3534,39.9942 53.358)),((39.2704 52.8471,39.5787 52.6996,39.1456 52.7573,39.2704 52.8471)))
+-------- MultiPolygon with Polygon with Holes
+MULTIPOLYGON(((33.1079 56.9523,32.9596 56.9434,33.1392 56.8934,33.2007 56.7768,33.7182 56.7292,33.8361 56.6953,35.71 56.3117,34.5917 56.2949,32.8387 56.3117,35.6798 55.6863,32.748 55.9072,33.5036 55.3785,35.0149 55.3613,34.2593 54.9642,35.0753 54.5981,34.1081 54.1757,34.7731 53.7847,34.7731 53.3243,33.1128 54.0852,31.627 54.7093,31.8413 54.9989,32.204 55.5156,31.5088 55.9411,31.7506 56.8609,31.5088 57.4998,32.1738 58.0318,32.2342 58.4928,32.25 58.4976,33.1079 56.9523)),((35.1489 56.5859,36.6724 56.4139,36.8799 56.4895,38.2186 56.0594,36.647 55.9411,38.0262 55.6546,37.9482 55.6376,36.8283 55.4471,36.9508 55.414,36.5845 55.3291,36.8822 54.975,36.0123 54.7554,36.919 53.8561,35.9216 53.8026,37.2165 53.0798,37.0604 52.9744,35.3776 53.0462,34.894 54.1226,35.6193 54.4929,34.8335 55.0162,36.4354 55.3441,35.1358 55.5327,36.5563 55.6352,34.7126 56.11,36.7074 56.211,35.1489 56.5859)),((37.2327 59.0233,37.3119 59.0258,38.0944 58.8545,37.2876 58.7226,37.2327 59.0233)),((37.4471 53.2343,36.9794 53.5878,37.3119 53.9273,36.7074 54.6506,37.0572 54.7635,37.9907 53.5925,37.4471 53.2343)),((34.7731 53.1793,34.7731 52.9188,33.1712 52.8276,32.4808 53.1989,34.7731 53.1793)),((40.4412 56.1511,38.3184 55.7179,38.1884 55.8564,38.944 56.0594,37.463 56.5623,38.9742 56.8774,38.5798 57.0849,39.0894 57.2553,39.7379 57.4051,39.7903 56.9929,40.3343 56.9599,40.4855 56.4957,39.7903 56.4121,39.8205 56.0763,40.425 56.1942,40.4412 56.1511)),((38.3092 56.9929,38.3093 56.9929,38.309 56.9928,38.3092 56.9929)),((40.3237 57.5365,40.3343 57.4673,40.0149 57.4677,40.3237 57.5365)),((39.2792 59.0373,38.8838 58.9777,38.5209 59.119,39.2792 59.0373)))
+-------- Polygon with Polygon with Holes
+MULTIPOLYGON(((32.6512 57.792,30.3301 56.1942,30.2394 55.2753,32.9378 57.2699,33.2007 56.7768,33.2446 56.7729,30.7705 55.0525,29.5972 55.5037,29.4171 55.606,29.4536 59.7796,30.5719 59.9919,30.4812 58.8542,32.3249 59.9465,33.6548 59.9465,30.179 57.9196,30.179 56.9764,32.2964 58.4175,32.6512 57.792)),((35.9475 59.7758,35.1343 59.8448,34.2247 59.6064,34.8637 59.9768,36.2843 59.9616,35.9475 59.7758)),((36.7912 59.6986,37.2817 59.9768,38.7325 59.9465,37.2102 59.1452,37.1118 59.6677,36.7912 59.6986)),((34.2635 56.6767,35.4536 56.5531,32.2591 54.4483,31.5682 54.7333,34.2635 56.6767)),((36.1815 56.4715,36.6724 56.4139,38.1759 56.9472,33.5144 53.9057,33.1128 54.0852,32.6907 54.2663,36.1815 56.4715)),((33.8733 53.1922,35.0903 53.1731,34.3351 53.53,36.7219 55.1665,37.2766 54.4948,34.2895 52.2208,32.5969 52.2208,33.8733 53.1922)),((31.1968 52.1649,30.5785 52.7531,31.1682 53.1903,32.5603 53.1989,31.2368 52.1652,31.1968 52.1649)),((30.3098 53.0028,30.1245 53.1731,30.5408 53.1811,30.3098 53.0028)),((37.6322 58.7797,39.7299 59.9314,44.4751 59.81,44.4212 55.8594,42.8247 56.5837,41.4519 56.3413,43.0243 57.2554,43.0243 58.0797,39.4328 55.9511,37.1934 55.4694,40.9691 57.677,42.6929 58.0314,42.2498 58.3455,42.5105 58.477,41.6944 58.8542,41.5887 58.8012,41.168 59.0834,41.2108 59.1035,40.9299 59.2404,40.8911 59.2659,40.8804 59.2644,40.6366 59.3817,40.2079 59.1718,37.6322 58.7797)),((35.9681 52.2157,35.4682 52.2022,37.7431 53.9104,37.9907 53.5925,35.9681 52.2157)))
diff --git a/tests/queries/0_stateless/01306_polygons_intersection.sql b/tests/queries/0_stateless/01306_polygons_intersection.sql
new file mode 100644
index 00000000000..144408ca0ae
--- /dev/null
+++ b/tests/queries/0_stateless/01306_polygons_intersection.sql
@@ -0,0 +1,14 @@
+select polygonsIntersectionCartesian([[[(0., 0.),(0., 3.),(1., 2.9),(2., 2.6),(2.6, 2.),(2.9, 1.),(3., 0.),(0., 0.)]]], [[[(1., 1.),(1., 4.),(4., 4.),(4., 1.),(1., 1.)]]]);
+select polygonsIntersectionCartesian([[[(0., 0.),(0., 3.),(1., 2.9),(2., 2.6),(2.6, 2.),(2.9, 1.),(3., 0.),(0., 0.)]]], [[[(3., 3.),(3., 4.),(4., 4.),(4., 3.),(3., 3.)]]]);
+
+select polygonsIntersectionSpherical([[[(4.346693, 50.858306), (4.367945, 50.852455), (4.366227, 50.840809), (4.344961, 50.833264), (4.338074, 50.848677), (4.346693, 50.858306)]]], [[[(25.0010, 136.9987), (17.7500, 142.5000), (11.3733, 142.5917)]]]);
+select polygonsIntersectionSpherical([[[(4.3613577, 50.8651821), (4.349556, 50.8535879), (4.3602419, 50.8435626), (4.3830299, 50.8428851), (4.3904543, 50.8564867), (4.3613148, 50.8651279)]]], [[[(4.346693, 50.858306), (4.367945, 50.852455), (4.366227, 50.840809), (4.344961, 50.833264), (4.338074, 50.848677), (4.346693, 50.858306)]]]);
+
+select '-------- MultiPolygon with Polygon';
+select wkt(polygonsIntersectionSpherical([[(29.453587685533865,59.779570356240356),(29.393139070478895,52.276266797422124),(40.636581470703206,59.38168915000267),(41.21084331372543,59.103467777099866),(29.786055068336193,52.146627480315004),(31.23682182965546,52.16517054781818),(41.69443223416517,58.85424941916091),(42.51048853740727,58.47703162291134),(32.59691566839227,52.22075341251539),(34.289476889931414,52.22075341251539),(43.02430176537451,58.07974369546071),(43.02430176537451,57.25537683364851),(35.468224883503325,52.2022335126388),(37.16078610504247,52.23926559241349),(43.02430176537451,56.26136189644947),(43.02430176537451,55.326904361850836),(38.33953409861437,52.16517054781818),(40.09254393520848,52.16517054781818),(44.4146199116388,55.3097062225408),(44.47506852669377,59.80998197603594),(39.72985224487867,59.931351417569715),(30.23941968124846,53.67744677450975),(30.20919537372098,54.63314259659509),(38.73245009647167,59.94649146557819),(37.2816833351524,59.97675082987618),(30.23941968124846,55.2752875586599),(30.33009260383092,56.19415599955667),(36.28428118674541,59.96162460231375),(34.863738732953635,59.97675082987618),(30.178971066193498,56.97640788219866),(30.178971066193498,57.91957806959033),(33.65476643185424,59.94649146557819),(32.32489690064491,59.94649146557819),(30.481214141468342,58.85424941916091),(30.571887064050795,59.99187015036608),(29.453587685533865,59.779570356240356)]], [[[(33.473420586689336,58.85424941916091),(32.23422397806246,58.492830557036),(32.173775363007486,58.03176922751564),(31.508840597402823,57.499784781503735),(31.750635057622702,56.86092686957355),(31.508840597402823,55.941082594334574),(32.20399967053497,55.515591939372456),(31.84130798020516,54.998862226280465),(31.418167674820367,54.422670886434275),(32.47601843828233,53.83826377018255),(32.08310244042503,53.408048308050866),(33.171177511414484,52.82758702113742),(34.77306581037117,52.91880107773494),(34.77306581037117,53.784726518357985),(34.108131044766516,54.17574726780569),(35.07530888564602,54.59813930694554),(34.25925258240394,54.96417435716029),(35.01486027059106,55.361278263643584),(33.50364489421682,55.37845402950552),(32.7480372060297,55.90721384574556),(35.67979503619571,55.68634475630185),(32.83871012861215,56.311688992608396),(34.591719965206266,56.29492065473883),(35.7100193437232,56.311688992608396),(33.83611227701915,56.695333481003644),(32.95960735872209,56.9434497616887),(36.072711034053015,57.091531913901434),(33.171177511414484,57.33702717078384),(36.193608264162954,57.499784781503735),(33.23162612646945,57.77481561306047),(36.43540272438284,58.04776787540811),(33.62454212432676,58.27099811968307),(36.344729801800376,58.54018474404165),(33.83611227701915,58.68186423448108),(34.74284150284369,59.565911441555244),(33.473420586689336,58.85424941916091)]], [[(34.65216858026123,58.91672306881671),(37.19101041256995,58.68186423448108),(36.01226241899805,58.28688958537609),(37.16078610504247,58.04776787540811),(35.74024365125068,57.79092907387934),(37.009664567405046,57.499784781503735),(35.77046795877817,57.25537683364851),(36.979440259877556,57.07510745541089),(34.22902827487645,56.794777197297435),(36.7074214921302,56.210968525786996),(34.712617195316206,56.10998276812964),(36.55629995449277,55.63519693782703),(35.13575750070099,55.53270067649592),(36.43540272438284,55.34409504165558),(34.83351442542614,55.01619492319591),(35.61934642114075,54.49294870011772),(34.89396304048112,54.12264226523038),(35.37755196092087,53.046178687628185),(37.43280487278982,52.95523300597458),(35.92158949641559,53.80257986695776),(36.91899164482259,53.856094327816805),(36.01226241899805,54.75541714463799),(37.765272255592166,55.189110239786885),(36.828318722240134,55.44708256557195),(38.03729102333953,55.652253637168315),(36.64697287707522,55.941082594334574),(38.21863686850443,56.05939028508024),(36.37495410932787,56.64551287174558),(38.30930979108689,56.992876013526654),(37.16078610504247,57.25537683364851),(38.127963945921984,57.516020773674256),(37.43280487278982,57.710289827306724),(38.33953409861437,57.935626886818994),(37.40258056526235,58.31865112960426),(38.58132855883426,58.744648733419496),(37.31190764267989,59.02578062465136),(34.65216858026123,58.91672306881671)]], [[(38.52087994377928,59.11898412389468),(39.54850639971376,58.713270635642914),(38.369758406141855,58.28688958537609),(38.85334732658162,58.06375936407028),(38.33953409861437,57.710289827306724),(38.73245009647167,57.48354156434209),(38.21863686850443,57.271721400459285),(38.97424455669155,56.87744603722649),(37.463029180317314,56.5623320541159),(38.94402024916407,56.05939028508024),(38.18841256097694,55.856355210835915),(38.490655636251795,55.53270067649592),(37.795496563119656,55.39562234093384),(38.30930979108689,55.154587013355666),(36.7074214921302,54.65063295250911),(37.31190764267989,53.92734063371401),(36.979440259877556,53.58783775557231),(37.855945178174615,52.91880107773497),(39.57873070724124,52.69956490610895),(38.33953409861437,53.281741738901104),(40.00187101262603,53.35396273604752),(39.54850639971376,53.58783775557231),(40.24366547284591,53.58783775557231),(39.97164670509855,53.98069568468355),(40.60635716317572,54.03398248547225),(40.39478701048334,54.44025165268903),(39.54850639971376,54.56310590284329),(39.54850639971376,54.87732350170489),(40.39478701048334,54.87732350170489),(40.39478701048334,55.24083903654295),(39.82052516746112,55.2752875586599),(39.760076552406154,55.75443792473942),(40.57613285564824,55.78844000174894),(40.425011318010824,56.19415599955667),(39.82052516746112,56.07626182891758),(39.79030085993364,56.41214455508424),(40.48545993306579,56.495655446714636),(40.33433839542836,56.95993246553937),(39.79030085993364,56.992876013526654),(39.72985224487867,57.46729112028032),(40.33433839542836,57.46729112028032),(40.24366547284591,58.04776787540811),(39.63917932229622,58.04776787540811),(39.63917932229622,58.382088724871295),(40.33433839542836,58.382088724871295),(40.45523562553831,58.9011152358548),(38.52087994377928,59.11898412389468)]]])) format TSV;
+
+select '-------- MultiPolygon with Polygon with Holes';
+select wkt(polygonsIntersectionSpherical([[[(33.473420586689336,58.85424941916091),(32.23422397806246,58.492830557036),(32.173775363007486,58.03176922751564),(31.508840597402823,57.499784781503735),(31.750635057622702,56.86092686957355),(31.508840597402823,55.941082594334574),(32.20399967053497,55.515591939372456),(31.84130798020516,54.998862226280465),(31.418167674820367,54.422670886434275),(32.47601843828233,53.83826377018255),(32.08310244042503,53.408048308050866),(33.171177511414484,52.82758702113742),(34.77306581037117,52.91880107773494),(34.77306581037117,53.784726518357985),(34.108131044766516,54.17574726780569),(35.07530888564602,54.59813930694554),(34.25925258240394,54.96417435716029),(35.01486027059106,55.361278263643584),(33.50364489421682,55.37845402950552),(32.7480372060297,55.90721384574556),(35.67979503619571,55.68634475630185),(32.83871012861215,56.311688992608396),(34.591719965206266,56.29492065473883),(35.7100193437232,56.311688992608396),(33.83611227701915,56.695333481003644),(32.95960735872209,56.9434497616887),(36.072711034053015,57.091531913901434),(33.171177511414484,57.33702717078384),(36.193608264162954,57.499784781503735),(33.23162612646945,57.77481561306047),(36.43540272438284,58.04776787540811),(33.62454212432676,58.27099811968307),(36.344729801800376,58.54018474404165),(33.83611227701915,58.68186423448108),(34.74284150284369,59.565911441555244),(33.473420586689336,58.85424941916091)]], [[(34.65216858026123,58.91672306881671),(37.19101041256995,58.68186423448108),(36.01226241899805,58.28688958537609),(37.16078610504247,58.04776787540811),(35.74024365125068,57.79092907387934),(37.009664567405046,57.499784781503735),(35.77046795877817,57.25537683364851),(36.979440259877556,57.07510745541089),(34.22902827487645,56.794777197297435),(36.7074214921302,56.210968525786996),(34.712617195316206,56.10998276812964),(36.55629995449277,55.63519693782703),(35.13575750070099,55.53270067649592),(36.43540272438284,55.34409504165558),(34.83351442542614,55.01619492319591),(35.61934642114075,54.49294870011772),(34.89396304048112,54.12264226523038),(35.37755196092087,53.046178687628185),(37.43280487278982,52.95523300597458),(35.92158949641559,53.80257986695776),(36.91899164482259,53.856094327816805),(36.01226241899805,54.75541714463799),(37.765272255592166,55.189110239786885),(36.828318722240134,55.44708256557195),(38.03729102333953,55.652253637168315),(36.64697287707522,55.941082594334574),(38.21863686850443,56.05939028508024),(36.37495410932787,56.64551287174558),(38.30930979108689,56.992876013526654),(37.16078610504247,57.25537683364851),(38.127963945921984,57.516020773674256),(37.43280487278982,57.710289827306724),(38.33953409861437,57.935626886818994),(37.40258056526235,58.31865112960426),(38.58132855883426,58.744648733419496),(37.31190764267989,59.02578062465136),(34.65216858026123,58.91672306881671)]], [[(38.52087994377928,59.11898412389468),(39.54850639971376,58.713270635642914),(38.369758406141855,58.28688958537609),(38.85334732658162,58.06375936407028),(38.33953409861437,57.710289827306724),(38.73245009647167,57.48354156434209),(38.21863686850443,57.271721400459285),(38.97424455669155,56.87744603722649),(37.463029180317314,56.5623320541159),(38.94402024916407,56.05939028508024),(38.18841256097694,55.856355210835915),(38.490655636251795,55.53270067649592),(37.795496563119656,55.39562234093384),(38.30930979108689,55.154587013355666),(36.7074214921302,54.65063295250911),(37.31190764267989,53.92734063371401),(36.979440259877556,53.58783775557231),(37.855945178174615,52.91880107773497),(39.57873070724124,52.69956490610895),(38.33953409861437,53.281741738901104),(40.00187101262603,53.35396273604752),(39.54850639971376,53.58783775557231),(40.24366547284591,53.58783775557231),(39.97164670509855,53.98069568468355),(40.60635716317572,54.03398248547225),(40.39478701048334,54.44025165268903),(39.54850639971376,54.56310590284329),(39.54850639971376,54.87732350170489),(40.39478701048334,54.87732350170489),(40.39478701048334,55.24083903654295),(39.82052516746112,55.2752875586599),(39.760076552406154,55.75443792473942),(40.57613285564824,55.78844000174894),(40.425011318010824,56.19415599955667),(39.82052516746112,56.07626182891758),(39.79030085993364,56.41214455508424),(40.48545993306579,56.495655446714636),(40.33433839542836,56.95993246553937),(39.79030085993364,56.992876013526654),(39.72985224487867,57.46729112028032),(40.33433839542836,57.46729112028032),(40.24366547284591,58.04776787540811),(39.63917932229622,58.04776787540811),(39.63917932229622,58.382088724871295),(40.33433839542836,58.382088724871295),(40.45523562553831,58.9011152358548),(38.52087994377928,59.11898412389468)]]], [[(24.367675781249993,61.45977057029751),(19.577636718749993,58.67693767258692),(19.577636718749993,57.492213666700735),(19.445800781249996,55.87531083569678),(19.445800781249996,54.085173420886775),(17.468261718749996,53.014783245859235),(20.017089843749993,51.563412328675895),(21.203613281249993,50.205033264943324),(26.125488281249993,50.40151532278236),(27.22412109374999,48.980216985374994),(32.80517578124999,49.525208341974405),(35.26611328124999,48.74894534343292),(36.93603515624999,49.66762782262194),(42.56103515625,48.77791275550183),(43.92333984374999,49.8096315635631),(47.17529296875,49.152969656170455),(49.28466796875,50.54136296522162),(48.05419921875,51.17934297928929),(51.39404296875,52.48278022207825),(50.64697265625,53.014783245859235),(52.88818359375,53.93021986394004),(51.65771484374999,54.29088164657006),(52.66845703125,55.825973254619015),(50.25146484375,56.145549500679095),(51.92138671875,57.914847767009206),(49.15283203125,58.17070248348605),(49.59228515625,60.086762746260064),(47.043457031249986,59.88893689676584),(43.57177734375,61.37567331572748),(42.64892578125,60.630101766266705),(36.89208984374999,62.000904713685856),(36.01318359374999,61.143235250840576),(31.398925781249993,62.02152819100766),(30.563964843749996,61.05828537037917),(26.872558593749993,61.71070595883174),(26.652832031249993,61.10078883158897),(24.367675781249993,61.45977057029751)], [(24.455566406249993,59.42272750081452),(21.203613281249993,58.49369382056807),(21.335449218749993,56.89700392127261),(21.599121093749993,55.92458580482949),(25.202636718749993,55.998380955359636),(28.850097656249993,57.06463027327854),(27.09228515625,57.844750992890994),(28.806152343749996,59.17592824927138),(26.257324218749993,59.17592824927138),(24.455566406249993,59.42272750081452)], [(35.13427734375,59.84481485969107),(31.970214843749993,58.97266715450152),(33.20068359374999,56.776808316568406),(36.67236328125,56.41390137600675),(39.08935546874999,57.25528054528888),(42.69287109374999,58.03137242177638),(40.89111328124999,59.26588062825809),(37.28759765625,58.722598828043374),(37.11181640624999,59.66774058164964),(35.13427734375,59.84481485969107)], [(29.157714843749993,55.75184939173528),(22.565917968749993,55.128649068488784),(22.565917968749993,53.54030739150019),(22.038574218749996,51.48138289610097),(26.257324218749993,51.42661449707484),(30.124511718749993,50.54136296522162),(32.18994140624999,51.17934297928929),(30.124511718749993,53.173119202640635),(35.09033203124999,53.173119202640635),(33.11279296875,54.085173420886775),(29.597167968749993,55.50374985927513),(29.157714843749993,55.75184939173528)], [(42.82470703125,56.58369172128337),(36.584472656249986,55.329144408405085),(37.99072265625,53.592504809039355),(34.95849609374999,51.48138289610097),(36.54052734374999,50.40151532278236),(39.66064453124999,50.289339253291786),(39.79248046875,52.13348804077148),(41.77001953125,50.68079714532166),(44.49462890624999,51.97134580885171),(47.30712890624999,52.509534770327264),(44.05517578125,53.54030739150019),(46.60400390625,53.696706475303245),(47.61474609375,55.40406982700608),(45.37353515625,55.40406982700608),(42.82470703125,56.58369172128337)]])) format TSV;
+
+select '-------- Polygon with Polygon with Holes';
+select wkt(polygonsIntersectionSpherical([[(29.453587685533865,59.779570356240356),(29.393139070478895,52.276266797422124),(40.636581470703206,59.38168915000267),(41.21084331372543,59.103467777099866),(29.786055068336193,52.146627480315004),(31.23682182965546,52.16517054781818),(41.69443223416517,58.85424941916091),(42.51048853740727,58.47703162291134),(32.59691566839227,52.22075341251539),(34.289476889931414,52.22075341251539),(43.02430176537451,58.07974369546071),(43.02430176537451,57.25537683364851),(35.468224883503325,52.2022335126388),(37.16078610504247,52.23926559241349),(43.02430176537451,56.26136189644947),(43.02430176537451,55.326904361850836),(38.33953409861437,52.16517054781818),(40.09254393520848,52.16517054781818),(44.4146199116388,55.3097062225408),(44.47506852669377,59.80998197603594),(39.72985224487867,59.931351417569715),(30.23941968124846,53.67744677450975),(30.20919537372098,54.63314259659509),(38.73245009647167,59.94649146557819),(37.2816833351524,59.97675082987618),(30.23941968124846,55.2752875586599),(30.33009260383092,56.19415599955667),(36.28428118674541,59.96162460231375),(34.863738732953635,59.97675082987618),(30.178971066193498,56.97640788219866),(30.178971066193498,57.91957806959033),(33.65476643185424,59.94649146557819),(32.32489690064491,59.94649146557819),(30.481214141468342,58.85424941916091),(30.571887064050795,59.99187015036608),(29.453587685533865,59.779570356240356)]], [[(24.367675781249993,61.45977057029751),(19.577636718749993,58.67693767258692),(19.577636718749993,57.492213666700735),(19.445800781249996,55.87531083569678),(19.445800781249996,54.085173420886775),(17.468261718749996,53.014783245859235),(20.017089843749993,51.563412328675895),(21.203613281249993,50.205033264943324),(26.125488281249993,50.40151532278236),(27.22412109374999,48.980216985374994),(32.80517578124999,49.525208341974405),(35.26611328124999,48.74894534343292),(36.93603515624999,49.66762782262194),(42.56103515625,48.77791275550183),(43.92333984374999,49.8096315635631),(47.17529296875,49.152969656170455),(49.28466796875,50.54136296522162),(48.05419921875,51.17934297928929),(51.39404296875,52.48278022207825),(50.64697265625,53.014783245859235),(52.88818359375,53.93021986394004),(51.65771484374999,54.29088164657006),(52.66845703125,55.825973254619015),(50.25146484375,56.145549500679095),(51.92138671875,57.914847767009206),(49.15283203125,58.17070248348605),(49.59228515625,60.086762746260064),(47.043457031249986,59.88893689676584),(43.57177734375,61.37567331572748),(42.64892578125,60.630101766266705),(36.89208984374999,62.000904713685856),(36.01318359374999,61.143235250840576),(31.398925781249993,62.02152819100766),(30.563964843749996,61.05828537037917),(26.872558593749993,61.71070595883174),(26.652832031249993,61.10078883158897),(24.367675781249993,61.45977057029751)], [(24.455566406249993,59.42272750081452),(21.203613281249993,58.49369382056807),(21.335449218749993,56.89700392127261),(21.599121093749993,55.92458580482949),(25.202636718749993,55.998380955359636),(28.850097656249993,57.06463027327854),(27.09228515625,57.844750992890994),(28.806152343749996,59.17592824927138),(26.257324218749993,59.17592824927138),(24.455566406249993,59.42272750081452)], [(35.13427734375,59.84481485969107),(31.970214843749993,58.97266715450152),(33.20068359374999,56.776808316568406),(36.67236328125,56.41390137600675),(39.08935546874999,57.25528054528888),(42.69287109374999,58.03137242177638),(40.89111328124999,59.26588062825809),(37.28759765625,58.722598828043374),(37.11181640624999,59.66774058164964),(35.13427734375,59.84481485969107)], [(29.157714843749993,55.75184939173528),(22.565917968749993,55.128649068488784),(22.565917968749993,53.54030739150019),(22.038574218749996,51.48138289610097),(26.257324218749993,51.42661449707484),(30.124511718749993,50.54136296522162),(32.18994140624999,51.17934297928929),(30.124511718749993,53.173119202640635),(35.09033203124999,53.173119202640635),(33.11279296875,54.085173420886775),(29.597167968749993,55.50374985927513),(29.157714843749993,55.75184939173528)], [(42.82470703125,56.58369172128337),(36.584472656249986,55.329144408405085),(37.99072265625,53.592504809039355),(34.95849609374999,51.48138289610097),(36.54052734374999,50.40151532278236),(39.66064453124999,50.289339253291786),(39.79248046875,52.13348804077148),(41.77001953125,50.68079714532166),(44.49462890624999,51.97134580885171),(47.30712890624999,52.509534770327264),(44.05517578125,53.54030739150019),(46.60400390625,53.696706475303245),(47.61474609375,55.40406982700608),(45.37353515625,55.40406982700608),(42.82470703125,56.58369172128337)]])) format TSV;
diff --git a/tests/queries/0_stateless/01307_multiple_leaders_zookeeper.sh b/tests/queries/0_stateless/01307_multiple_leaders_zookeeper.sh
index 24c6199a94a..21fc88d7c2d 100755
--- a/tests/queries/0_stateless/01307_multiple_leaders_zookeeper.sh
+++ b/tests/queries/0_stateless/01307_multiple_leaders_zookeeper.sh
@@ -12,7 +12,7 @@ DATA_SIZE=200
 SEQ=$(seq 0 $(($NUM_REPLICAS - 1)))
 
 for REPLICA in $SEQ; do $CLICKHOUSE_CLIENT -n --query "DROP TABLE IF EXISTS r$REPLICA"; done
-for REPLICA in $SEQ; do $CLICKHOUSE_CLIENT -n --query "CREATE TABLE r$REPLICA (x UInt64) ENGINE = ReplicatedMergeTree('/test_01307/table', 'r$REPLICA') ORDER BY x SETTINGS min_bytes_for_wide_part = '10M';"; done
+for REPLICA in $SEQ; do $CLICKHOUSE_CLIENT -n --query "CREATE TABLE r$REPLICA (x UInt64) ENGINE = ReplicatedMergeTree('/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/table', 'r$REPLICA') ORDER BY x SETTINGS min_bytes_for_wide_part = '10M';"; done
 
 function thread()
 {
diff --git a/tests/queries/0_stateless/01307_polygon_perimeter.reference b/tests/queries/0_stateless/01307_polygon_perimeter.reference
new file mode 100644
index 00000000000..209e3ef4b62
--- /dev/null
+++ b/tests/queries/0_stateless/01307_polygon_perimeter.reference
@@ -0,0 +1 @@
+20
diff --git a/tests/queries/0_stateless/01307_polygon_perimeter.sql b/tests/queries/0_stateless/01307_polygon_perimeter.sql
new file mode 100644
index 00000000000..18f5b385826
--- /dev/null
+++ b/tests/queries/0_stateless/01307_polygon_perimeter.sql
@@ -0,0 +1 @@
+select polygonPerimeterCartesian([[[(0., 0.), (0., 5.), (5., 5.), (5., 0.), (0., 0.)]]]);
diff --git a/tests/queries/0_stateless/01308_polygon_area.reference b/tests/queries/0_stateless/01308_polygon_area.reference
new file mode 100644
index 00000000000..56d0c4ef174
--- /dev/null
+++ b/tests/queries/0_stateless/01308_polygon_area.reference
@@ -0,0 +1,2 @@
+25
+9.387703638370358e-8
diff --git a/tests/queries/0_stateless/01308_polygon_area.sql b/tests/queries/0_stateless/01308_polygon_area.sql
new file mode 100644
index 00000000000..e3a44ad7d51
--- /dev/null
+++ b/tests/queries/0_stateless/01308_polygon_area.sql
@@ -0,0 +1,3 @@
+select polygonAreaCartesian([[[(0., 0.), (0., 5.), (5., 5.), (5., 0.)]]]);
+select polygonAreaSpherical([[[(4.346693, 50.858306), (4.367945, 50.852455), (4.366227, 50.840809), (4.344961, 50.833264), (4.338074, 50.848677), (4.346693, 50.858306)]]]);
+SELECT polygonAreaCartesian([]); -- { serverError 36 }
diff --git a/tests/queries/0_stateless/01318_long_unsuccessful_mutation_zookeeper.sh b/tests/queries/0_stateless/01318_long_unsuccessful_mutation_zookeeper.sh
index ced668e9849..13250e82079 100755
--- a/tests/queries/0_stateless/01318_long_unsuccessful_mutation_zookeeper.sh
+++ b/tests/queries/0_stateless/01318_long_unsuccessful_mutation_zookeeper.sh
@@ -11,7 +11,7 @@ $CLICKHOUSE_CLIENT --query "
         key UInt64,
         value String
     )
-    ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_01318/mutation_table', '1')
+    ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/mutation_table', '1')
     ORDER BY key
     PARTITION BY key % 10
 "
@@ -47,7 +47,7 @@ done
 
 echo "$query_result"
 
-$CLICKHOUSE_CLIENT --query "KILL MUTATION WHERE mutation_id='$first_mutation_id'"
+$CLICKHOUSE_CLIENT --query "KILL MUTATION WHERE mutation_id='$first_mutation_id' and database='$CLICKHOUSE_DATABASE'"
 
 check_query="SELECT sum(parts_to_do) FROM system.mutations WHERE table='mutation_table' and database='$CLICKHOUSE_DATABASE'"
 
diff --git a/tests/queries/0_stateless/01320_create_sync_race_condition_zookeeper.sh b/tests/queries/0_stateless/01320_create_sync_race_condition_zookeeper.sh
index a15d8c8d2cd..97c200c651f 100755
--- a/tests/queries/0_stateless/01320_create_sync_race_condition_zookeeper.sh
+++ b/tests/queries/0_stateless/01320_create_sync_race_condition_zookeeper.sh
@@ -11,7 +11,7 @@ $CLICKHOUSE_CLIENT --query "CREATE DATABASE test_01320 ENGINE=Ordinary"   # Diff
 
 function thread1()
 {
-    while true; do $CLICKHOUSE_CLIENT -n --query "CREATE TABLE test_01320.r (x UInt64) ENGINE = ReplicatedMergeTree('/test_01320/table', 'r') ORDER BY x; DROP TABLE test_01320.r;"; done
+    while true; do $CLICKHOUSE_CLIENT -n --query "CREATE TABLE test_01320.r (x UInt64) ENGINE = ReplicatedMergeTree('/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/table', 'r') ORDER BY x; DROP TABLE test_01320.r;"; done
 }
 
 function thread2()
diff --git a/tests/queries/0_stateless/01338_long_select_and_alter_zookeeper.reference b/tests/queries/0_stateless/01338_long_select_and_alter_zookeeper.reference
index e7db2788824..b4ed8efab63 100644
--- a/tests/queries/0_stateless/01338_long_select_and_alter_zookeeper.reference
+++ b/tests/queries/0_stateless/01338_long_select_and_alter_zookeeper.reference
@@ -1,3 +1,3 @@
 10
 5
-CREATE TABLE default.alter_mt\n(\n    `key` UInt64,\n    `value` UInt64\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_01338/alter_mt\', \'1\')\nORDER BY key\nSETTINGS index_granularity = 8192
+CREATE TABLE default.alter_mt\n(\n    `key` UInt64,\n    `value` UInt64\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/01338_long_select_and_alter_zookeeper_default/alter_mt\', \'1\')\nORDER BY key\nSETTINGS index_granularity = 8192
diff --git a/tests/queries/0_stateless/01338_long_select_and_alter_zookeeper.sh b/tests/queries/0_stateless/01338_long_select_and_alter_zookeeper.sh
index d990a8a1c08..4aeecc7343d 100755
--- a/tests/queries/0_stateless/01338_long_select_and_alter_zookeeper.sh
+++ b/tests/queries/0_stateless/01338_long_select_and_alter_zookeeper.sh
@@ -6,7 +6,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS alter_mt"
 
-$CLICKHOUSE_CLIENT --query "CREATE TABLE alter_mt (key UInt64, value String) ENGINE=ReplicatedMergeTree('/clickhouse/tables/test_01338/alter_mt', '1') ORDER BY key"
+$CLICKHOUSE_CLIENT --query "CREATE TABLE alter_mt (key UInt64, value String) ENGINE=ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/alter_mt', '1') ORDER BY key"
 
 $CLICKHOUSE_CLIENT --query "INSERT INTO alter_mt SELECT number, toString(number) FROM numbers(5)"
 
diff --git a/tests/queries/0_stateless/01344_min_bytes_to_use_mmap_io_index.sql b/tests/queries/0_stateless/01344_min_bytes_to_use_mmap_io_index.sql
index 9044ee08f8d..7aab991d203 100644
--- a/tests/queries/0_stateless/01344_min_bytes_to_use_mmap_io_index.sql
+++ b/tests/queries/0_stateless/01344_min_bytes_to_use_mmap_io_index.sql
@@ -6,6 +6,6 @@ SET min_bytes_to_use_mmap_io = 1;
 SELECT * FROM test_01344 WHERE x = 'Hello, world';
 
 SYSTEM FLUSH LOGS;
-SELECT PE.Values FROM system.query_log ARRAY JOIN ProfileEvents AS PE WHERE current_database = currentDatabase() AND event_date >= yesterday() AND event_time >= now() - 300 AND query LIKE 'SELECT * FROM test_01344 WHERE x = ''Hello, world''%' AND PE.Names = 'CreatedReadBufferMMap' AND type = 2 ORDER BY event_time DESC LIMIT 1;
+SELECT PE.Values FROM system.query_log ARRAY JOIN ProfileEvents AS PE WHERE current_database = currentDatabase() AND event_date >= yesterday() AND query LIKE 'SELECT * FROM test_01344 WHERE x = ''Hello, world''%' AND PE.Names = 'CreatedReadBufferMMap' AND type = 2 ORDER BY event_time DESC LIMIT 1;
 
 DROP TABLE test_01344;
diff --git a/tests/queries/0_stateless/01357_version_collapsing_attach_detach_zookeeper.sql b/tests/queries/0_stateless/01357_version_collapsing_attach_detach_zookeeper.sql
index 0086ec5c2a3..d8249a603ff 100644
--- a/tests/queries/0_stateless/01357_version_collapsing_attach_detach_zookeeper.sql
+++ b/tests/queries/0_stateless/01357_version_collapsing_attach_detach_zookeeper.sql
@@ -8,13 +8,13 @@ CREATE TABLE versioned_collapsing_table(
   sign Int8,
   version UInt16
 )
-ENGINE = ReplicatedVersionedCollapsingMergeTree('/clickhouse/versioned_collapsing_table', '1', sign, version)
+ENGINE = ReplicatedVersionedCollapsingMergeTree('/clickhouse/versioned_collapsing_table/{shard}', '{replica}', sign, version)
 PARTITION BY d
 ORDER BY (key1, key2);
 
 INSERT INTO versioned_collapsing_table VALUES (toDate('2019-10-10'), 1, 1, 'Hello', -1, 1);
 
-SELECT value FROM system.zookeeper WHERE path = '/clickhouse/versioned_collapsing_table' and name = 'metadata';
+SELECT value FROM system.zookeeper WHERE path = '/clickhouse/versioned_collapsing_table/s1' and name = 'metadata';
 
 SELECT COUNT() FROM versioned_collapsing_table;
 
diff --git a/tests/queries/0_stateless/01360_materialized_view_with_join_on_query_log.sql b/tests/queries/0_stateless/01360_materialized_view_with_join_on_query_log.sql
index 950d4fe097f..3380f04f8c9 100644
--- a/tests/queries/0_stateless/01360_materialized_view_with_join_on_query_log.sql
+++ b/tests/queries/0_stateless/01360_materialized_view_with_join_on_query_log.sql
@@ -17,7 +17,7 @@ CREATE MATERIALIZED VIEW slow_log Engine=Memory AS
                 extract(query,'/\\*\\s*QUERY_GROUP_ID:(.*?)\\s*\\*/') as QUERY_GROUP_ID,
                 *
             FROM system.query_log
-            WHERE type<>1 and event_date >= yesterday() and event_time > now() - 120
+            WHERE type<>1 and event_date >= yesterday()
         ) as ql
         INNER JOIN expected_times USING (QUERY_GROUP_ID)
         WHERE query_duration_ms > max_query_duration_ms
@@ -38,7 +38,7 @@ SELECT
     extract(query,'/\\*\\s*QUERY_GROUP_ID:(.*?)\\s*\\*/') as QUERY_GROUP_ID,
     count()
 FROM system.query_log
-WHERE current_database = currentDatabase() AND type<>1 and event_date >= yesterday() and event_time > now() - 20 and QUERY_GROUP_ID<>''
+WHERE current_database = currentDatabase() AND type<>1 and event_date >= yesterday() and QUERY_GROUP_ID<>''
 GROUP BY QUERY_GROUP_ID
 ORDER BY QUERY_GROUP_ID;
 
diff --git a/tests/queries/0_stateless/01370_client_autocomplete_word_break_characters.expect b/tests/queries/0_stateless/01370_client_autocomplete_word_break_characters.expect
index 50ef009dee9..a6d52b39918 100755
--- a/tests/queries/0_stateless/01370_client_autocomplete_word_break_characters.expect
+++ b/tests/queries/0_stateless/01370_client_autocomplete_word_break_characters.expect
@@ -23,7 +23,7 @@ set is_done 0
 while {$is_done == 0} {
     send -- "\t"
     expect {
-        "_connections" {
+        "_" {
             set is_done 1
         }
         default {
diff --git a/tests/queries/0_stateless/01386_negative_float_constant_key_condition.reference b/tests/queries/0_stateless/01386_negative_float_constant_key_condition.reference
index 44e0be8e356..bb0b1cf658d 100644
--- a/tests/queries/0_stateless/01386_negative_float_constant_key_condition.reference
+++ b/tests/queries/0_stateless/01386_negative_float_constant_key_condition.reference
@@ -1,4 +1,3 @@
 0
 0
 0
-0
diff --git a/tests/queries/0_stateless/01386_negative_float_constant_key_condition.sql b/tests/queries/0_stateless/01386_negative_float_constant_key_condition.sql
index 216f43c4285..c2191d6ab96 100644
--- a/tests/queries/0_stateless/01386_negative_float_constant_key_condition.sql
+++ b/tests/queries/0_stateless/01386_negative_float_constant_key_condition.sql
@@ -12,7 +12,7 @@ SETTINGS index_granularity = 8192;
 INSERT INTO t0 VALUES (0, 0);
 
 SELECT t0.c1 FROM t0 WHERE NOT (t0.c1 OR (t0.c0 AND -1524532316));
-SELECT t0.c1 FROM t0 WHERE NOT (t0.c1 OR (t0.c0 AND -1.0));
+SELECT t0.c1 FROM t0 WHERE NOT (t0.c1 OR (t0.c0 AND -1.0)); -- { serverError 70 }
 SELECT t0.c1 FROM t0 WHERE NOT (t0.c1 OR (t0.c0 AND inf));
 SELECT t0.c1 FROM t0 WHERE NOT (t0.c1 OR (t0.c0 AND nan));
 
diff --git a/tests/queries/0_stateless/01396_inactive_replica_cleanup_nodes_zookeeper.sh b/tests/queries/0_stateless/01396_inactive_replica_cleanup_nodes_zookeeper.sh
index 30b2b665658..693580bc270 100755
--- a/tests/queries/0_stateless/01396_inactive_replica_cleanup_nodes_zookeeper.sh
+++ b/tests/queries/0_stateless/01396_inactive_replica_cleanup_nodes_zookeeper.sh
@@ -12,8 +12,8 @@ SCALE=5000
 $CLICKHOUSE_CLIENT -n --query "
     DROP TABLE IF EXISTS r1;
     DROP TABLE IF EXISTS r2;
-    CREATE TABLE r1 (x UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_01396/r', '1') ORDER BY x SETTINGS old_parts_lifetime = 1, cleanup_delay_period = 0, cleanup_delay_period_random_add = 1, parts_to_throw_insert = 100000, max_replicated_logs_to_keep = 10;
-    CREATE TABLE r2 (x UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_01396/r', '2') ORDER BY x SETTINGS old_parts_lifetime = 1, cleanup_delay_period = 0, cleanup_delay_period_random_add = 1, parts_to_throw_insert = 100000, max_replicated_logs_to_keep = 10;
+    CREATE TABLE r1 (x UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/{shard}', '1{replica}') ORDER BY x SETTINGS old_parts_lifetime = 1, cleanup_delay_period = 0, cleanup_delay_period_random_add = 1, parts_to_throw_insert = 100000, max_replicated_logs_to_keep = 10;
+    CREATE TABLE r2 (x UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/{shard}', '2{replica}') ORDER BY x SETTINGS old_parts_lifetime = 1, cleanup_delay_period = 0, cleanup_delay_period_random_add = 1, parts_to_throw_insert = 100000, max_replicated_logs_to_keep = 10;
     DETACH TABLE r2;
 "
 
@@ -29,16 +29,16 @@ for _ in {1..60}; do
 done
 
 
-$CLICKHOUSE_CLIENT --query "SELECT numChildren < $((SCALE / 4)) FROM system.zookeeper WHERE path = '/clickhouse/tables/test_01396/r' AND name = 'log'";
+$CLICKHOUSE_CLIENT --query "SELECT numChildren < $((SCALE / 4)) FROM system.zookeeper WHERE path = '/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/s1' AND name = 'log'";
 echo -e '\n---\n';
-$CLICKHOUSE_CLIENT --query "SELECT value FROM system.zookeeper WHERE path = '/clickhouse/tables/test_01396/r/replicas/1' AND name = 'is_lost'";
-$CLICKHOUSE_CLIENT --query "SELECT value FROM system.zookeeper WHERE path = '/clickhouse/tables/test_01396/r/replicas/2' AND name = 'is_lost'";
+$CLICKHOUSE_CLIENT --query "SELECT value FROM system.zookeeper WHERE path = '/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/s1/replicas/1r1' AND name = 'is_lost'";
+$CLICKHOUSE_CLIENT --query "SELECT value FROM system.zookeeper WHERE path = '/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/s1/replicas/2r1' AND name = 'is_lost'";
 echo -e '\n---\n';
 
 $CLICKHOUSE_CLIENT --query "ATTACH TABLE r2"
 $CLICKHOUSE_CLIENT --receive_timeout 600 --query "SYSTEM SYNC REPLICA r2" # Need to increase timeout, otherwise it timed out in debug build
 
-$CLICKHOUSE_CLIENT --query "SELECT value FROM system.zookeeper WHERE path = '/clickhouse/tables/test_01396/r/replicas/2' AND name = 'is_lost'";
+$CLICKHOUSE_CLIENT --query "SELECT value FROM system.zookeeper WHERE path = '/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/s1/replicas/2r1' AND name = 'is_lost'";
 
 $CLICKHOUSE_CLIENT -n --query "
     DROP TABLE IF EXISTS r1;
diff --git a/tests/queries/0_stateless/01414_mutations_and_errors_zookeeper.sh b/tests/queries/0_stateless/01414_mutations_and_errors_zookeeper.sh
index ceeeed41049..6e1a6e01757 100755
--- a/tests/queries/0_stateless/01414_mutations_and_errors_zookeeper.sh
+++ b/tests/queries/0_stateless/01414_mutations_and_errors_zookeeper.sh
@@ -12,7 +12,7 @@ $CLICKHOUSE_CLIENT --query "
         key UInt64,
         value String
     )
-    ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_01414/mutation_table', '1')
+    ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/mutation_table', '1')
     ORDER BY tuple()
     PARTITION BY date
 "
diff --git a/tests/queries/0_stateless/01417_freeze_partition_verbose.reference b/tests/queries/0_stateless/01417_freeze_partition_verbose.reference
index e648f619c50..7a895d1ed4f 100644
--- a/tests/queries/0_stateless/01417_freeze_partition_verbose.reference
+++ b/tests/queries/0_stateless/01417_freeze_partition_verbose.reference
@@ -16,3 +16,9 @@ ATTACH PARTITION	3	3_12_12_0	3_4_4_0
 command_type	partition_id	part_name	backup_name	old_part_name
 FREEZE PARTITION	7	7_8_8_0	test_01417_single_part_7	
 ATTACH PART	5	5_13_13_0		5_6_6_0
+command_type	partition_id	part_name	backup_name
+UNFREEZE PARTITION	7	7_8_8_0	test_01417_single_part_7
+command_type	partition_id	part_name	backup_name
+FREEZE PARTITION	202103	20210301_20210301_1_1_0	test_01417_single_part_old_syntax
+command_type	partition_id	part_name	backup_name
+UNFREEZE PARTITION	20210301	20210301_20210301_1_1_0	test_01417_single_part_old_syntax
diff --git a/tests/queries/0_stateless/01417_freeze_partition_verbose.sh b/tests/queries/0_stateless/01417_freeze_partition_verbose.sh
index 5294f4fe8f1..f5389e3e03d 100755
--- a/tests/queries/0_stateless/01417_freeze_partition_verbose.sh
+++ b/tests/queries/0_stateless/01417_freeze_partition_verbose.sh
@@ -13,6 +13,11 @@ ${CLICKHOUSE_CLIENT} --query "DROP TABLE IF EXISTS table_for_freeze;"
 ${CLICKHOUSE_CLIENT} --query "CREATE TABLE table_for_freeze (key UInt64, value String) ENGINE = MergeTree() ORDER BY key PARTITION BY key % 10;"
 ${CLICKHOUSE_CLIENT} --query "INSERT INTO table_for_freeze SELECT number, toString(number) from numbers(10);"
 
+# also for old syntax
+${CLICKHOUSE_CLIENT} --query "DROP TABLE IF EXISTS table_for_freeze_old_syntax;"
+${CLICKHOUSE_CLIENT} --query "CREATE TABLE table_for_freeze_old_syntax (dt Date, value String) ENGINE = MergeTree(dt, (value), 8192);"
+${CLICKHOUSE_CLIENT} --query "INSERT INTO table_for_freeze_old_syntax SELECT toDate('2021-03-01'), toString(number) from numbers(10);"
+
 ${CLICKHOUSE_CLIENT} --query "ALTER TABLE table_for_freeze FREEZE WITH NAME 'test_01417' FORMAT TSVWithNames SETTINGS alter_partition_verbose_result = 1;" \
   | ${CLICKHOUSE_LOCAL} --structure "$ALTER_OUT_STRUCTURE, $FREEZE_OUT_STRUCTURE" \
       --query "SELECT command_type, partition_id, part_name, backup_name FROM table"
@@ -35,5 +40,21 @@ ${CLICKHOUSE_CLIENT} --query "ALTER TABLE table_for_freeze FREEZE PARTITION '7'
   | ${CLICKHOUSE_LOCAL} --structure "$ALTER_OUT_STRUCTURE, $FREEZE_OUT_STRUCTURE, $ATTACH_OUT_STRUCTURE" \
       --query "SELECT command_type, partition_id, part_name, backup_name, old_part_name FROM table"
 
+# Unfreeze partition
+${CLICKHOUSE_CLIENT} --query "ALTER TABLE table_for_freeze UNFREEZE PARTITION '7' WITH NAME 'test_01417_single_part_7' FORMAT TSVWithNames SETTINGS alter_partition_verbose_result = 1;" \
+  | ${CLICKHOUSE_LOCAL} --structure "$ALTER_OUT_STRUCTURE, $FREEZE_OUT_STRUCTURE" \
+      --query "SELECT command_type, partition_id, part_name, backup_name FROM table"
+
+# Freeze partition with old syntax
+${CLICKHOUSE_CLIENT} --query "ALTER TABLE table_for_freeze_old_syntax FREEZE PARTITION '202103' WITH NAME 'test_01417_single_part_old_syntax' FORMAT TSVWithNames SETTINGS alter_partition_verbose_result = 1;" \
+  | ${CLICKHOUSE_LOCAL} --structure "$ALTER_OUT_STRUCTURE, $FREEZE_OUT_STRUCTURE" \
+      --query "SELECT command_type, partition_id, part_name, backup_name FROM table"
+
+# Unfreeze partition with old syntax
+${CLICKHOUSE_CLIENT} --query "ALTER TABLE table_for_freeze_old_syntax UNFREEZE PARTITION '202103' WITH NAME 'test_01417_single_part_old_syntax' FORMAT TSVWithNames SETTINGS alter_partition_verbose_result = 1;" \
+  | ${CLICKHOUSE_LOCAL} --structure "$ALTER_OUT_STRUCTURE, $FREEZE_OUT_STRUCTURE" \
+      --query "SELECT command_type, partition_id, part_name, backup_name FROM table"
+
 # teardown
 ${CLICKHOUSE_CLIENT} --query "DROP TABLE IF EXISTS table_for_freeze;"
+${CLICKHOUSE_CLIENT} --query "DROP TABLE IF EXISTS table_for_freeze_old_syntax;"
diff --git a/tests/queries/0_stateless/01417_freeze_partition_verbose_zookeeper.sh b/tests/queries/0_stateless/01417_freeze_partition_verbose_zookeeper.sh
index 480daeefa46..bb935a950ff 100755
--- a/tests/queries/0_stateless/01417_freeze_partition_verbose_zookeeper.sh
+++ b/tests/queries/0_stateless/01417_freeze_partition_verbose_zookeeper.sh
@@ -11,7 +11,7 @@ FREEZE_OUT_STRUCTURE='backup_name String, backup_path String , part_backup_path
 # setup
 
 ${CLICKHOUSE_CLIENT} --query "DROP TABLE IF EXISTS table_for_freeze_replicated;"
-${CLICKHOUSE_CLIENT} --query "CREATE TABLE table_for_freeze_replicated (key UInt64, value String) ENGINE = ReplicatedMergeTree('/test_01417/table_for_freeze_replicated', '1') ORDER BY key PARTITION BY key % 10;"
+${CLICKHOUSE_CLIENT} --query "CREATE TABLE table_for_freeze_replicated (key UInt64, value String) ENGINE = ReplicatedMergeTree('/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/table_for_freeze_replicated', '1') ORDER BY key PARTITION BY key % 10;"
 ${CLICKHOUSE_CLIENT} --query "INSERT INTO table_for_freeze_replicated SELECT number, toString(number) from numbers(10);"
 
 ${CLICKHOUSE_CLIENT} --query "ALTER TABLE table_for_freeze_replicated FREEZE WITH NAME 'test_01417' FORMAT TSVWithNames SETTINGS alter_partition_verbose_result = 1;" \
diff --git a/tests/queries/0_stateless/01440_to_date_monotonicity.reference b/tests/queries/0_stateless/01440_to_date_monotonicity.reference
index 96732e5996c..74716fe6223 100644
--- a/tests/queries/0_stateless/01440_to_date_monotonicity.reference
+++ b/tests/queries/0_stateless/01440_to_date_monotonicity.reference
@@ -1,4 +1,4 @@
 0
-1970-01-01	2106-02-07	1970-04-11	1970-01-01	2106-02-07
+1970-01-01	2106-02-07	1970-04-11	1970-01-01	2149-06-06
 1970-01-01 03:00:00	2106-02-07 09:28:15	1970-01-01 03:16:40
 2000-01-01 13:12:12
diff --git a/tests/queries/0_stateless/01459_manual_write_to_replicas.sh b/tests/queries/0_stateless/01459_manual_write_to_replicas.sh
index 467c29d3d33..cf239fd7032 100755
--- a/tests/queries/0_stateless/01459_manual_write_to_replicas.sh
+++ b/tests/queries/0_stateless/01459_manual_write_to_replicas.sh
@@ -11,7 +11,7 @@ NUM_REPLICAS=10
 for i in $(seq 1 $NUM_REPLICAS); do
     $CLICKHOUSE_CLIENT -n -q "
         DROP TABLE IF EXISTS r$i;
-        CREATE TABLE r$i (x UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/tables/01459_manual_write_ro_replicas/r', 'r$i') ORDER BY x;
+        CREATE TABLE r$i (x UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/r', 'r$i') ORDER BY x;
     "
 done
 
diff --git a/tests/queries/0_stateless/01459_manual_write_to_replicas_quorum.sh b/tests/queries/0_stateless/01459_manual_write_to_replicas_quorum.sh
index 376ee58859e..8c322798173 100755
--- a/tests/queries/0_stateless/01459_manual_write_to_replicas_quorum.sh
+++ b/tests/queries/0_stateless/01459_manual_write_to_replicas_quorum.sh
@@ -11,7 +11,7 @@ NUM_REPLICAS=10
 for i in $(seq 1 $NUM_REPLICAS); do
     $CLICKHOUSE_CLIENT -n -q "
         DROP TABLE IF EXISTS r$i;
-        CREATE TABLE r$i (x UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/tables/01459_manual_write_ro_replicas_quorum/r', 'r$i') ORDER BY x;
+        CREATE TABLE r$i (x UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/r', 'r$i') ORDER BY x;
     "
 done
 
diff --git a/tests/queries/0_stateless/01461_query_start_time_microseconds.sql b/tests/queries/0_stateless/01461_query_start_time_microseconds.sql
index 678b9b3d85e..be1d9897053 100644
--- a/tests/queries/0_stateless/01461_query_start_time_microseconds.sql
+++ b/tests/queries/0_stateless/01461_query_start_time_microseconds.sql
@@ -7,6 +7,8 @@ WITH (
           SELECT query_start_time_microseconds
           FROM system.query_log
           WHERE current_database = currentDatabase()
+            AND query like 'SELECT \'01461_query%'
+            AND event_date >= yesterday()
           ORDER BY query_start_time DESC
           LIMIT 1
       ) AS time_with_microseconds,
@@ -14,6 +16,8 @@ WITH (
           SELECT query_start_time
           FROM system.query_log
           WHERE current_database = currentDatabase()
+            AND query like 'SELECT \'01461_query%'
+            AND event_date >= yesterday()
           ORDER BY query_start_time DESC
           LIMIT 1
       ) AS t)
@@ -27,6 +31,8 @@ WITH (
           SELECT query_start_time_microseconds
           FROM system.query_thread_log
           WHERE current_database = currentDatabase()
+            AND query like 'SELECT \'01461_query%'
+            AND event_date >= yesterday()
           ORDER BY query_start_time DESC
           LIMIT 1
       ) AS time_with_microseconds,
@@ -34,6 +40,8 @@ WITH (
           SELECT query_start_time
           FROM system.query_thread_log
           WHERE current_database = currentDatabase()
+            AND query like 'SELECT \'01461_query%'
+            AND event_date >= yesterday()
           ORDER BY query_start_time DESC
           LIMIT 1
       ) AS t)
diff --git a/tests/queries/0_stateless/01475_read_subcolumns.sql b/tests/queries/0_stateless/01475_read_subcolumns.sql
index 16832c4fc59..3457d17dba1 100644
--- a/tests/queries/0_stateless/01475_read_subcolumns.sql
+++ b/tests/queries/0_stateless/01475_read_subcolumns.sql
@@ -10,7 +10,7 @@ SYSTEM FLUSH LOGS;
 SELECT ProfileEvents.Values[indexOf(ProfileEvents.Names, 'FileOpen')]
 FROM system.query_log
 WHERE (type = 'QueryFinish') AND (lower(query) LIKE lower('SELECT a.size0 FROM %t_arr%'))
-    AND event_time > now() - INTERVAL 10 SECOND AND current_database = currentDatabase();
+    AND current_database = currentDatabase();
 
 SELECT '====tuple====';
 DROP TABLE IF EXISTS t_tup;
@@ -27,7 +27,7 @@ SYSTEM FLUSH LOGS;
 SELECT ProfileEvents.Values[indexOf(ProfileEvents.Names, 'FileOpen')]
 FROM system.query_log
 WHERE (type = 'QueryFinish') AND (lower(query) LIKE lower('SELECT t._ FROM %t_tup%'))
-    AND event_time > now() - INTERVAL 10 SECOND AND current_database = currentDatabase();
+    AND current_database = currentDatabase();
 
 SELECT '====nullable====';
 DROP TABLE IF EXISTS t_nul;
@@ -41,7 +41,7 @@ SYSTEM FLUSH LOGS;
 SELECT ProfileEvents.Values[indexOf(ProfileEvents.Names, 'FileOpen')]
 FROM system.query_log
 WHERE (type = 'QueryFinish') AND (lower(query) LIKE lower('SELECT n.null FROM %t_nul%'))
-    AND event_time > now() - INTERVAL 10 SECOND AND current_database = currentDatabase();
+    AND current_database = currentDatabase();
 
 SELECT '====map====';
 SET allow_experimental_map_type = 1;
@@ -60,7 +60,7 @@ SYSTEM FLUSH LOGS;
 SELECT ProfileEvents.Values[indexOf(ProfileEvents.Names, 'FileOpen')]
 FROM system.query_log
 WHERE (type = 'QueryFinish') AND (lower(query) LIKE lower('SELECT m.% FROM %t_map%'))
-    AND event_time > now() - INTERVAL 10 SECOND AND current_database = currentDatabase();
+    AND current_database = currentDatabase();
 
 DROP TABLE t_arr;
 DROP TABLE t_nul;
diff --git a/tests/queries/0_stateless/01483_merge_table_join_and_group_by.reference b/tests/queries/0_stateless/01483_merge_table_join_and_group_by.reference
index b2c3ea56b7f..4261ccd8a1f 100644
--- a/tests/queries/0_stateless/01483_merge_table_join_and_group_by.reference
+++ b/tests/queries/0_stateless/01483_merge_table_join_and_group_by.reference
@@ -5,3 +5,5 @@
 1
 0	1
 0	1
+1	0
+1
diff --git a/tests/queries/0_stateless/01483_merge_table_join_and_group_by.sql b/tests/queries/0_stateless/01483_merge_table_join_and_group_by.sql
index a6678ca9040..68b4e7d4015 100644
--- a/tests/queries/0_stateless/01483_merge_table_join_and_group_by.sql
+++ b/tests/queries/0_stateless/01483_merge_table_join_and_group_by.sql
@@ -17,6 +17,9 @@ SELECT ID FROM m INNER JOIN b USING(key) GROUP BY ID;
 SELECT * FROM m INNER JOIN b USING(key) WHERE ID = 1 HAVING ID = 1 ORDER BY ID;
 SELECT * FROM m INNER JOIN b USING(key) WHERE ID = 1 GROUP BY ID, key HAVING ID = 1 ORDER BY ID;
 
+SELECT sum(b.ID), sum(m.key) FROM m FULL JOIN b ON (m.key == b.key) GROUP BY key;
+SELECT sum(b.ID + m.key) FROM m FULL JOIN b ON (m.key == b.key) GROUP BY key;
+
 DROP TABLE IF EXISTS a;
 DROP TABLE IF EXISTS b;
 DROP TABLE IF EXISTS m;
diff --git a/tests/queries/0_stateless/01508_partition_pruning_long.reference b/tests/queries/0_stateless/01508_partition_pruning_long.reference
index 70f529c6058..334ecb63164 100644
--- a/tests/queries/0_stateless/01508_partition_pruning_long.reference
+++ b/tests/queries/0_stateless/01508_partition_pruning_long.reference
@@ -5,11 +5,11 @@ Selected 0/6 parts by partition key, 0 parts by primary key, 0/0 marks by primar
 
 select uniqExact(_part), count() from tMM where toDate(d)=toDate('2020-09-01');
 2	2880
-Selected 2/6 parts by partition key, 2 parts by primary key, 2/4 marks by primary key, 2 marks to read from 2 ranges
+Selected 2/6 parts by partition key, 2 parts by primary key, 2/2 marks by primary key, 2 marks to read from 2 ranges
 
 select uniqExact(_part), count() from tMM where toDate(d)=toDate('2020-10-15');
 1	1440
-Selected 1/6 parts by partition key, 1 parts by primary key, 1/2 marks by primary key, 1 marks to read from 1 ranges
+Selected 1/6 parts by partition key, 1 parts by primary key, 1/1 marks by primary key, 1 marks to read from 1 ranges
 
 select uniqExact(_part), count() from tMM where toDate(d)='2020-09-15';
 0	0
@@ -17,27 +17,27 @@ Selected 0/6 parts by partition key, 0 parts by primary key, 0/0 marks by primar
 
 select uniqExact(_part), count() from tMM where toYYYYMM(d)=202009;
 2	10000
-Selected 2/6 parts by partition key, 2 parts by primary key, 2/4 marks by primary key, 2 marks to read from 2 ranges
+Selected 2/6 parts by partition key, 2 parts by primary key, 2/2 marks by primary key, 2 marks to read from 2 ranges
 
 select uniqExact(_part), count() from tMM where toYYYYMMDD(d)=20200816;
 2	2880
-Selected 2/6 parts by partition key, 2 parts by primary key, 2/4 marks by primary key, 2 marks to read from 2 ranges
+Selected 2/6 parts by partition key, 2 parts by primary key, 2/2 marks by primary key, 2 marks to read from 2 ranges
 
 select uniqExact(_part), count() from tMM where toYYYYMMDD(d)=20201015;
 1	1440
-Selected 1/6 parts by partition key, 1 parts by primary key, 1/2 marks by primary key, 1 marks to read from 1 ranges
+Selected 1/6 parts by partition key, 1 parts by primary key, 1/1 marks by primary key, 1 marks to read from 1 ranges
 
 select uniqExact(_part), count() from tMM where toDate(d)='2020-10-15';
 1	1440
-Selected 1/6 parts by partition key, 1 parts by primary key, 1/2 marks by primary key, 1 marks to read from 1 ranges
+Selected 1/6 parts by partition key, 1 parts by primary key, 1/1 marks by primary key, 1 marks to read from 1 ranges
 
 select uniqExact(_part), count() from tMM where d >= '2020-09-01 00:00:00' and d<'2020-10-15 00:00:00';
 3	15000
-Selected 3/6 parts by partition key, 3 parts by primary key, 3/6 marks by primary key, 3 marks to read from 3 ranges
+Selected 3/6 parts by partition key, 3 parts by primary key, 3/3 marks by primary key, 3 marks to read from 3 ranges
 
 select uniqExact(_part), count() from tMM where d >= '2020-01-16 00:00:00' and d < toDateTime('2021-08-17 00:00:00');
 6	30000
-Selected 6/6 parts by partition key, 6 parts by primary key, 6/12 marks by primary key, 6 marks to read from 6 ranges
+Selected 6/6 parts by partition key, 6 parts by primary key, 6/6 marks by primary key, 6 marks to read from 6 ranges
 
 select uniqExact(_part), count() from tMM where d >= '2020-09-16 00:00:00' and d < toDateTime('2020-10-01 00:00:00');
 0	0
@@ -45,117 +45,117 @@ Selected 0/6 parts by partition key, 0 parts by primary key, 0/0 marks by primar
 
 select uniqExact(_part), count() from tMM where d >= '2020-09-12 00:00:00' and d < '2020-10-16 00:00:00';
 2	6440
-Selected 2/6 parts by partition key, 2 parts by primary key, 2/4 marks by primary key, 2 marks to read from 2 ranges
+Selected 2/6 parts by partition key, 2 parts by primary key, 2/2 marks by primary key, 2 marks to read from 2 ranges
 
 select uniqExact(_part), count() from tMM where toStartOfDay(d) >= '2020-09-12 00:00:00';
 2	10000
-Selected 2/6 parts by partition key, 2 parts by primary key, 2/4 marks by primary key, 2 marks to read from 2 ranges
+Selected 2/6 parts by partition key, 2 parts by primary key, 2/2 marks by primary key, 2 marks to read from 2 ranges
 
 select uniqExact(_part), count() from tMM where toStartOfDay(d) = '2020-09-01 00:00:00';
 2	2880
-Selected 2/6 parts by partition key, 2 parts by primary key, 2/4 marks by primary key, 2 marks to read from 2 ranges
+Selected 2/6 parts by partition key, 2 parts by primary key, 2/2 marks by primary key, 2 marks to read from 2 ranges
 
 select uniqExact(_part), count() from tMM where toStartOfDay(d) = '2020-10-01 00:00:00';
 1	1440
-Selected 1/6 parts by partition key, 1 parts by primary key, 1/2 marks by primary key, 1 marks to read from 1 ranges
+Selected 1/6 parts by partition key, 1 parts by primary key, 1/1 marks by primary key, 1 marks to read from 1 ranges
 
 select uniqExact(_part), count() from tMM where toStartOfDay(d) >= '2020-09-15 00:00:00' and d < '2020-10-16 00:00:00';
 2	6440
-Selected 2/6 parts by partition key, 2 parts by primary key, 2/4 marks by primary key, 2 marks to read from 2 ranges
+Selected 2/6 parts by partition key, 2 parts by primary key, 2/2 marks by primary key, 2 marks to read from 2 ranges
 
 select uniqExact(_part), count() from tMM where toYYYYMM(d) between 202009 and 202010;
 4	20000
-Selected 4/6 parts by partition key, 4 parts by primary key, 4/8 marks by primary key, 4 marks to read from 4 ranges
+Selected 4/6 parts by partition key, 4 parts by primary key, 4/4 marks by primary key, 4 marks to read from 4 ranges
 
 select uniqExact(_part), count() from tMM where toYYYYMM(d) between 202009 and 202009;
 2	10000
-Selected 2/6 parts by partition key, 2 parts by primary key, 2/4 marks by primary key, 2 marks to read from 2 ranges
+Selected 2/6 parts by partition key, 2 parts by primary key, 2/2 marks by primary key, 2 marks to read from 2 ranges
 
 select uniqExact(_part), count() from tMM where toYYYYMM(d) between 202009 and 202010 and toStartOfDay(d) = '2020-10-01 00:00:00';
 1	1440
-Selected 1/6 parts by partition key, 1 parts by primary key, 1/2 marks by primary key, 1 marks to read from 1 ranges
+Selected 1/6 parts by partition key, 1 parts by primary key, 1/1 marks by primary key, 1 marks to read from 1 ranges
 
 select uniqExact(_part), count() from tMM where toYYYYMM(d) >= 202009 and toStartOfDay(d) < '2020-10-02 00:00:00';
 3	11440
-Selected 3/6 parts by partition key, 3 parts by primary key, 3/6 marks by primary key, 3 marks to read from 3 ranges
+Selected 3/6 parts by partition key, 3 parts by primary key, 3/3 marks by primary key, 3 marks to read from 3 ranges
 
 select uniqExact(_part), count() from tMM where toYYYYMM(d) > 202009 and toStartOfDay(d) < '2020-10-02 00:00:00';
 1	1440
-Selected 1/6 parts by partition key, 1 parts by primary key, 1/2 marks by primary key, 1 marks to read from 1 ranges
+Selected 1/6 parts by partition key, 1 parts by primary key, 1/1 marks by primary key, 1 marks to read from 1 ranges
 
 select uniqExact(_part), count() from tMM where toYYYYMM(d)+1 > 202009 and toStartOfDay(d) < '2020-10-02 00:00:00';
 3	11440
-Selected 3/6 parts by partition key, 3 parts by primary key, 3/6 marks by primary key, 3 marks to read from 3 ranges
+Selected 3/6 parts by partition key, 3 parts by primary key, 3/3 marks by primary key, 3 marks to read from 3 ranges
 
 select uniqExact(_part), count() from tMM where toYYYYMM(d)+1 > 202010 and toStartOfDay(d) < '2020-10-02 00:00:00';
 1	1440
-Selected 1/6 parts by partition key, 1 parts by primary key, 1/2 marks by primary key, 1 marks to read from 1 ranges
+Selected 1/6 parts by partition key, 1 parts by primary key, 1/1 marks by primary key, 1 marks to read from 1 ranges
 
 select uniqExact(_part), count() from tMM where toYYYYMM(d)+1 > 202010;
 2	10000
-Selected 2/6 parts by partition key, 2 parts by primary key, 2/4 marks by primary key, 2 marks to read from 2 ranges
+Selected 2/6 parts by partition key, 2 parts by primary key, 2/2 marks by primary key, 2 marks to read from 2 ranges
 
 select uniqExact(_part), count() from tMM where toYYYYMM(d-1)+1 = 202010;
 3	9999
-Selected 3/6 parts by partition key, 3 parts by primary key, 3/6 marks by primary key, 3 marks to read from 3 ranges
+Selected 3/6 parts by partition key, 3 parts by primary key, 3/3 marks by primary key, 3 marks to read from 3 ranges
 
 select uniqExact(_part), count() from tMM where toStartOfMonth(d) >= '2020-09-15';
 2	10000
-Selected 2/6 parts by partition key, 2 parts by primary key, 2/4 marks by primary key, 2 marks to read from 2 ranges
+Selected 2/6 parts by partition key, 2 parts by primary key, 2/2 marks by primary key, 2 marks to read from 2 ranges
 
 select uniqExact(_part), count() from tMM where toStartOfMonth(d) >= '2020-09-01';
 4	20000
-Selected 4/6 parts by partition key, 4 parts by primary key, 4/8 marks by primary key, 4 marks to read from 4 ranges
+Selected 4/6 parts by partition key, 4 parts by primary key, 4/4 marks by primary key, 4 marks to read from 4 ranges
 
 select uniqExact(_part), count() from tMM where toStartOfMonth(d) >= '2020-09-01' and toStartOfMonth(d) < '2020-10-01';
 2	10000
-Selected 2/6 parts by partition key, 2 parts by primary key, 2/4 marks by primary key, 2 marks to read from 2 ranges
+Selected 2/6 parts by partition key, 2 parts by primary key, 2/2 marks by primary key, 2 marks to read from 2 ranges
 
 select uniqExact(_part), count() from tMM where toYYYYMM(d-1)+1 = 202010;
 2	9999
-Selected 2/3 parts by partition key, 2 parts by primary key, 2/4 marks by primary key, 2 marks to read from 2 ranges
+Selected 2/3 parts by partition key, 2 parts by primary key, 2/2 marks by primary key, 2 marks to read from 2 ranges
 
 select uniqExact(_part), count() from tMM where toYYYYMM(d)+1 > 202010;
 1	10000
-Selected 1/3 parts by partition key, 1 parts by primary key, 1/2 marks by primary key, 1 marks to read from 1 ranges
+Selected 1/3 parts by partition key, 1 parts by primary key, 1/1 marks by primary key, 1 marks to read from 1 ranges
 
 select uniqExact(_part), count() from tMM where toYYYYMM(d) between 202009 and 202010;
 2	20000
-Selected 2/3 parts by partition key, 2 parts by primary key, 2/4 marks by primary key, 2 marks to read from 2 ranges
+Selected 2/3 parts by partition key, 2 parts by primary key, 2/2 marks by primary key, 2 marks to read from 2 ranges
 
 --------- tDD ----------------------------
 select uniqExact(_part), count() from tDD where toDate(d)=toDate('2020-09-24');
 1	10000
-Selected 1/4 parts by partition key, 1 parts by primary key, 1/2 marks by primary key, 1 marks to read from 1 ranges
+Selected 1/4 parts by partition key, 1 parts by primary key, 1/1 marks by primary key, 1 marks to read from 1 ranges
 
 select uniqExact(_part), count() FROM tDD WHERE toDate(d) = toDate('2020-09-24');
 1	10000
-Selected 1/4 parts by partition key, 1 parts by primary key, 1/2 marks by primary key, 1 marks to read from 1 ranges
+Selected 1/4 parts by partition key, 1 parts by primary key, 1/1 marks by primary key, 1 marks to read from 1 ranges
 
 select uniqExact(_part), count() FROM tDD WHERE toDate(d) = '2020-09-24';
 1	10000
-Selected 1/4 parts by partition key, 1 parts by primary key, 1/2 marks by primary key, 1 marks to read from 1 ranges
+Selected 1/4 parts by partition key, 1 parts by primary key, 1/1 marks by primary key, 1 marks to read from 1 ranges
 
 select uniqExact(_part), count() FROM tDD WHERE toDate(d) >= '2020-09-23' and toDate(d) <= '2020-09-26';
 3	40000
-Selected 3/4 parts by partition key, 3 parts by primary key, 4/7 marks by primary key, 4 marks to read from 3 ranges
+Selected 3/4 parts by partition key, 3 parts by primary key, 4/4 marks by primary key, 4 marks to read from 3 ranges
 
 select uniqExact(_part), count() FROM tDD WHERE toYYYYMMDD(d) >= 20200923 and toDate(d) <= '2020-09-26';
 3	40000
-Selected 3/4 parts by partition key, 3 parts by primary key, 4/7 marks by primary key, 4 marks to read from 3 ranges
+Selected 3/4 parts by partition key, 3 parts by primary key, 4/4 marks by primary key, 4 marks to read from 3 ranges
 
 --------- sDD ----------------------------
 select uniqExact(_part), count() from sDD;
 6	30000
-Selected 6/6 parts by partition key, 6 parts by primary key, 6/12 marks by primary key, 6 marks to read from 6 ranges
+Selected 6/6 parts by partition key, 6 parts by primary key, 6/6 marks by primary key, 6 marks to read from 6 ranges
 
 select uniqExact(_part), count() from sDD where toYYYYMM(toDateTime(intDiv(d,1000),'UTC')-1)+1 = 202010;
 3	9999
-Selected 3/6 parts by partition key, 3 parts by primary key, 3/6 marks by primary key, 3 marks to read from 3 ranges
+Selected 3/6 parts by partition key, 3 parts by primary key, 3/3 marks by primary key, 3 marks to read from 3 ranges
 
 select uniqExact(_part), count() from sDD where toYYYYMM(toDateTime(intDiv(d,1000),'UTC')-1) = 202010;
 2	9999
-Selected 2/6 parts by partition key, 2 parts by primary key, 2/4 marks by primary key, 2 marks to read from 2 ranges
+Selected 2/6 parts by partition key, 2 parts by primary key, 2/2 marks by primary key, 2 marks to read from 2 ranges
 
 select uniqExact(_part), count() from sDD where toYYYYMM(toDateTime(intDiv(d,1000),'UTC')-1) = 202110;
 0	0
@@ -163,52 +163,52 @@ Selected 0/6 parts by partition key, 0 parts by primary key, 0/0 marks by primar
 
 select uniqExact(_part), count() from sDD where toYYYYMM(toDateTime(intDiv(d,1000),'UTC'))+1 > 202009 and toStartOfDay(toDateTime(intDiv(d,1000),'UTC')) < toDateTime('2020-10-02 00:00:00','UTC');
 3	11440
-Selected 3/6 parts by partition key, 3 parts by primary key, 3/6 marks by primary key, 3 marks to read from 3 ranges
+Selected 3/6 parts by partition key, 3 parts by primary key, 3/3 marks by primary key, 3 marks to read from 3 ranges
 
 select uniqExact(_part), count() from sDD where toYYYYMM(toDateTime(intDiv(d,1000),'UTC'))+1 > 202009 and toDateTime(intDiv(d,1000),'UTC') < toDateTime('2020-10-01 00:00:00','UTC');
 2	10000
-Selected 2/6 parts by partition key, 2 parts by primary key, 2/4 marks by primary key, 2 marks to read from 2 ranges
+Selected 2/6 parts by partition key, 2 parts by primary key, 2/2 marks by primary key, 2 marks to read from 2 ranges
 
 select uniqExact(_part), count() from sDD where d >= 1598918400000;
 4	20000
-Selected 4/6 parts by partition key, 4 parts by primary key, 4/8 marks by primary key, 4 marks to read from 4 ranges
+Selected 4/6 parts by partition key, 4 parts by primary key, 4/4 marks by primary key, 4 marks to read from 4 ranges
 
 select uniqExact(_part), count() from sDD where d >= 1598918400000 and toYYYYMM(toDateTime(intDiv(d,1000),'UTC')-1) < 202010;
 3	10001
-Selected 3/6 parts by partition key, 3 parts by primary key, 3/6 marks by primary key, 3 marks to read from 3 ranges
+Selected 3/6 parts by partition key, 3 parts by primary key, 3/3 marks by primary key, 3 marks to read from 3 ranges
 
 --------- xMM ----------------------------
 select uniqExact(_part), count() from xMM where toStartOfDay(d) >= '2020-10-01 00:00:00';
 2	10000
-Selected 2/6 parts by partition key, 2 parts by primary key, 2/4 marks by primary key, 2 marks to read from 2 ranges
+Selected 2/6 parts by partition key, 2 parts by primary key, 2/2 marks by primary key, 2 marks to read from 2 ranges
 
 select uniqExact(_part), count() from xMM where d >= '2020-09-01 00:00:00' and d <= '2020-10-01 00:00:00';
 3	10001
-Selected 3/6 parts by partition key, 3 parts by primary key, 3/6 marks by primary key, 3 marks to read from 3 ranges
+Selected 3/6 parts by partition key, 3 parts by primary key, 3/3 marks by primary key, 3 marks to read from 3 ranges
 
 select uniqExact(_part), count() from xMM where d >= '2020-09-01 00:00:00' and d < '2020-10-01 00:00:00';
 2	10000
-Selected 2/6 parts by partition key, 2 parts by primary key, 2/4 marks by primary key, 2 marks to read from 2 ranges
+Selected 2/6 parts by partition key, 2 parts by primary key, 2/2 marks by primary key, 2 marks to read from 2 ranges
 
 select uniqExact(_part), count() from xMM where d >= '2020-09-01 00:00:00' and d <= '2020-10-01 00:00:00' and a=1;
 1	1
-Selected 1/6 parts by partition key, 1 parts by primary key, 1/2 marks by primary key, 1 marks to read from 1 ranges
+Selected 1/6 parts by partition key, 1 parts by primary key, 1/1 marks by primary key, 1 marks to read from 1 ranges
 
 select uniqExact(_part), count() from xMM where d >= '2020-09-01 00:00:00' and d <= '2020-10-01 00:00:00' and a<>3;
 2	5001
-Selected 2/6 parts by partition key, 2 parts by primary key, 2/4 marks by primary key, 2 marks to read from 2 ranges
+Selected 2/6 parts by partition key, 2 parts by primary key, 2/2 marks by primary key, 2 marks to read from 2 ranges
 
 select uniqExact(_part), count() from xMM where d >= '2020-09-01 00:00:00' and d < '2020-10-01 00:00:00' and a<>3;
 1	5000
-Selected 1/6 parts by partition key, 1 parts by primary key, 1/2 marks by primary key, 1 marks to read from 1 ranges
+Selected 1/6 parts by partition key, 1 parts by primary key, 1/1 marks by primary key, 1 marks to read from 1 ranges
 
 select uniqExact(_part), count() from xMM where d >= '2020-09-01 00:00:00' and d < '2020-11-01 00:00:00' and a = 1;
 2	10000
-Selected 2/6 parts by partition key, 2 parts by primary key, 2/4 marks by primary key, 2 marks to read from 2 ranges
+Selected 2/6 parts by partition key, 2 parts by primary key, 2/2 marks by primary key, 2 marks to read from 2 ranges
 
 select uniqExact(_part), count() from xMM where a = 1;
 3	15000
-Selected 3/6 parts by partition key, 3 parts by primary key, 3/6 marks by primary key, 3 marks to read from 3 ranges
+Selected 3/6 parts by partition key, 3 parts by primary key, 3/3 marks by primary key, 3 marks to read from 3 ranges
 
 select uniqExact(_part), count() from xMM where a = 66;
 0	0
@@ -216,29 +216,29 @@ Selected 0/6 parts by partition key, 0 parts by primary key, 0/0 marks by primar
 
 select uniqExact(_part), count() from xMM where a <> 66;
 6	30000
-Selected 6/6 parts by partition key, 6 parts by primary key, 6/12 marks by primary key, 6 marks to read from 6 ranges
+Selected 6/6 parts by partition key, 6 parts by primary key, 6/6 marks by primary key, 6 marks to read from 6 ranges
 
 select uniqExact(_part), count() from xMM where a = 2;
 2	10000
-Selected 2/6 parts by partition key, 2 parts by primary key, 2/4 marks by primary key, 2 marks to read from 2 ranges
+Selected 2/6 parts by partition key, 2 parts by primary key, 2/2 marks by primary key, 2 marks to read from 2 ranges
 
 select uniqExact(_part), count() from xMM where a = 1;
 2	15000
-Selected 2/5 parts by partition key, 2 parts by primary key, 2/4 marks by primary key, 2 marks to read from 2 ranges
+Selected 2/5 parts by partition key, 2 parts by primary key, 2/2 marks by primary key, 2 marks to read from 2 ranges
 
 select uniqExact(_part), count() from xMM where toStartOfDay(d) >= '2020-10-01 00:00:00';
 1	10000
-Selected 1/5 parts by partition key, 1 parts by primary key, 1/2 marks by primary key, 1 marks to read from 1 ranges
+Selected 1/5 parts by partition key, 1 parts by primary key, 1/1 marks by primary key, 1 marks to read from 1 ranges
 
 select uniqExact(_part), count() from xMM where a <> 66;
 5	30000
-Selected 5/5 parts by partition key, 5 parts by primary key, 5/10 marks by primary key, 5 marks to read from 5 ranges
+Selected 5/5 parts by partition key, 5 parts by primary key, 5/5 marks by primary key, 5 marks to read from 5 ranges
 
 select uniqExact(_part), count() from xMM where d >= '2020-09-01 00:00:00' and d <= '2020-10-01 00:00:00' and a<>3;
 2	5001
-Selected 2/5 parts by partition key, 2 parts by primary key, 2/4 marks by primary key, 2 marks to read from 2 ranges
+Selected 2/5 parts by partition key, 2 parts by primary key, 2/2 marks by primary key, 2 marks to read from 2 ranges
 
 select uniqExact(_part), count() from xMM where d >= '2020-09-01 00:00:00' and d < '2020-10-01 00:00:00' and a<>3;
 1	5000
-Selected 1/5 parts by partition key, 1 parts by primary key, 1/2 marks by primary key, 1 marks to read from 1 ranges
+Selected 1/5 parts by partition key, 1 parts by primary key, 1/1 marks by primary key, 1 marks to read from 1 ranges
 
diff --git a/tests/queries/0_stateless/01508_race_condition_rename_clear_zookeeper.reference b/tests/queries/0_stateless/01508_race_condition_rename_clear_zookeeper_long.reference
similarity index 100%
rename from tests/queries/0_stateless/01508_race_condition_rename_clear_zookeeper.reference
rename to tests/queries/0_stateless/01508_race_condition_rename_clear_zookeeper_long.reference
diff --git a/tests/queries/0_stateless/01508_race_condition_rename_clear_zookeeper.sh b/tests/queries/0_stateless/01508_race_condition_rename_clear_zookeeper_long.sh
similarity index 81%
rename from tests/queries/0_stateless/01508_race_condition_rename_clear_zookeeper.sh
rename to tests/queries/0_stateless/01508_race_condition_rename_clear_zookeeper_long.sh
index 4cb4734b448..156deb60ff9 100755
--- a/tests/queries/0_stateless/01508_race_condition_rename_clear_zookeeper.sh
+++ b/tests/queries/0_stateless/01508_race_condition_rename_clear_zookeeper_long.sh
@@ -8,7 +8,7 @@ $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS table_for_renames0"
 $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS table_for_renames50"
 
 
-$CLICKHOUSE_CLIENT --query "CREATE TABLE table_for_renames0 (value UInt64, data String) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_01508/concurrent_rename', '1') ORDER BY tuple() SETTINGS cleanup_delay_period = 1, cleanup_delay_period_random_add = 0, min_rows_for_compact_part = 100000, min_rows_for_compact_part = 10000000, write_ahead_log_max_bytes = 1"
+$CLICKHOUSE_CLIENT --query "CREATE TABLE table_for_renames0 (value UInt64, data String) ENGINE ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/concurrent_rename', '1') ORDER BY tuple() SETTINGS cleanup_delay_period = 1, cleanup_delay_period_random_add = 0, min_rows_for_compact_part = 100000, min_rows_for_compact_part = 10000000, write_ahead_log_max_bytes = 1"
 
 
 $CLICKHOUSE_CLIENT --query "INSERT INTO table_for_renames0 SELECT number, toString(number) FROM numbers(1000)"
diff --git a/tests/queries/0_stateless/01509_check_many_parallel_quorum_inserts.reference b/tests/queries/0_stateless/01509_check_many_parallel_quorum_inserts_long.reference
similarity index 100%
rename from tests/queries/0_stateless/01509_check_many_parallel_quorum_inserts.reference
rename to tests/queries/0_stateless/01509_check_many_parallel_quorum_inserts_long.reference
diff --git a/tests/queries/0_stateless/01509_check_many_parallel_quorum_inserts.sh b/tests/queries/0_stateless/01509_check_many_parallel_quorum_inserts_long.sh
similarity index 90%
rename from tests/queries/0_stateless/01509_check_many_parallel_quorum_inserts.sh
rename to tests/queries/0_stateless/01509_check_many_parallel_quorum_inserts_long.sh
index c5ffad1c4ca..b71654e7e6c 100755
--- a/tests/queries/0_stateless/01509_check_many_parallel_quorum_inserts.sh
+++ b/tests/queries/0_stateless/01509_check_many_parallel_quorum_inserts_long.sh
@@ -11,7 +11,7 @@ NUM_REPLICAS=10
 for i in $(seq 1 $NUM_REPLICAS); do
     $CLICKHOUSE_CLIENT -n -q "
         DROP TABLE IF EXISTS r$i;
-        CREATE TABLE r$i (x UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_01509/parallel_quorum_many', 'r$i') ORDER BY x;
+        CREATE TABLE r$i (x UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/parallel_quorum_many', 'r$i') ORDER BY x;
     "
 done
 
diff --git a/tests/queries/0_stateless/01509_check_parallel_quorum_inserts.reference b/tests/queries/0_stateless/01509_check_parallel_quorum_inserts_long.reference
similarity index 100%
rename from tests/queries/0_stateless/01509_check_parallel_quorum_inserts.reference
rename to tests/queries/0_stateless/01509_check_parallel_quorum_inserts_long.reference
diff --git a/tests/queries/0_stateless/01509_check_parallel_quorum_inserts.sh b/tests/queries/0_stateless/01509_check_parallel_quorum_inserts_long.sh
similarity index 90%
rename from tests/queries/0_stateless/01509_check_parallel_quorum_inserts.sh
rename to tests/queries/0_stateless/01509_check_parallel_quorum_inserts_long.sh
index 898a68d9c77..78336ea073b 100755
--- a/tests/queries/0_stateless/01509_check_parallel_quorum_inserts.sh
+++ b/tests/queries/0_stateless/01509_check_parallel_quorum_inserts_long.sh
@@ -12,7 +12,7 @@ NUM_INSERTS=5
 for i in $(seq 1 $NUM_REPLICAS); do
     $CLICKHOUSE_CLIENT -n -q "
         DROP TABLE IF EXISTS r$i;
-        CREATE TABLE r$i (x UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_01509/parallel_quorum', 'r$i') ORDER BY x;
+        CREATE TABLE r$i (x UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/parallel_quorum', 'r$i') ORDER BY x;
     "
 done
 
diff --git a/tests/queries/0_stateless/01509_parallel_quorum_and_merge.reference b/tests/queries/0_stateless/01509_parallel_quorum_and_merge_long.reference
similarity index 100%
rename from tests/queries/0_stateless/01509_parallel_quorum_and_merge.reference
rename to tests/queries/0_stateless/01509_parallel_quorum_and_merge_long.reference
diff --git a/tests/queries/0_stateless/01509_parallel_quorum_and_merge.sh b/tests/queries/0_stateless/01509_parallel_quorum_and_merge_long.sh
similarity index 88%
rename from tests/queries/0_stateless/01509_parallel_quorum_and_merge.sh
rename to tests/queries/0_stateless/01509_parallel_quorum_and_merge_long.sh
index ca5f58512a3..fbeb65419ce 100755
--- a/tests/queries/0_stateless/01509_parallel_quorum_and_merge.sh
+++ b/tests/queries/0_stateless/01509_parallel_quorum_and_merge_long.sh
@@ -10,9 +10,9 @@ $CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS parallel_q1"
 $CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS parallel_q2"
 
 
-$CLICKHOUSE_CLIENT -q "CREATE TABLE parallel_q1 (x UInt64) ENGINE=ReplicatedMergeTree('/clickhouse/tables/test_01509/parallel_q', 'r1') ORDER BY tuple() SETTINGS old_parts_lifetime = 1, cleanup_delay_period = 0, cleanup_delay_period_random_add = 0"
+$CLICKHOUSE_CLIENT -q "CREATE TABLE parallel_q1 (x UInt64) ENGINE=ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/parallel_q', 'r1') ORDER BY tuple() SETTINGS old_parts_lifetime = 1, cleanup_delay_period = 0, cleanup_delay_period_random_add = 0"
 
-$CLICKHOUSE_CLIENT -q "CREATE TABLE parallel_q2 (x UInt64) ENGINE=ReplicatedMergeTree('/clickhouse/tables/test_01509/parallel_q', 'r2') ORDER BY tuple() SETTINGS always_fetch_merged_part = 1"
+$CLICKHOUSE_CLIENT -q "CREATE TABLE parallel_q2 (x UInt64) ENGINE=ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/parallel_q', 'r2') ORDER BY tuple() SETTINGS always_fetch_merged_part = 1"
 
 $CLICKHOUSE_CLIENT -q "SYSTEM STOP REPLICATION QUEUES parallel_q2"
 
diff --git a/tests/queries/0_stateless/01509_parallel_quorum_insert_no_replicas.sql b/tests/queries/0_stateless/01509_parallel_quorum_insert_no_replicas.sql
index 1b680cf26c1..16c4a4df936 100644
--- a/tests/queries/0_stateless/01509_parallel_quorum_insert_no_replicas.sql
+++ b/tests/queries/0_stateless/01509_parallel_quorum_insert_no_replicas.sql
@@ -1,16 +1,16 @@
-DROP TABLE IF EXISTS r1;
-DROP TABLE IF EXISTS r2;
+DROP TABLE IF EXISTS r1 SYNC;
+DROP TABLE IF EXISTS r2 SYNC;
 
 CREATE TABLE r1 (
     key UInt64, value String
 )
-ENGINE = ReplicatedMergeTree('/clickhouse/01509_no_repliacs', '1')
+ENGINE = ReplicatedMergeTree('/clickhouse/01509_parallel_quorum_insert_no_replicas', '1')
 ORDER BY tuple();
 
 CREATE TABLE r2 (
     key UInt64, value String
 )
-ENGINE = ReplicatedMergeTree('/clickhouse/01509_no_repliacs', '2')
+ENGINE = ReplicatedMergeTree('/clickhouse/01509_parallel_quorum_insert_no_replicas', '2')
 ORDER BY tuple();
 
 SET insert_quorum_parallel=1;
@@ -18,8 +18,13 @@ SET insert_quorum_parallel=1;
 SET insert_quorum=3;
 INSERT INTO r1 VALUES(1, '1'); --{serverError 285}
 
+-- retry should still fail despite the insert_deduplicate enabled
+INSERT INTO r1 VALUES(1, '1'); --{serverError 285}
+INSERT INTO r1 VALUES(1, '1'); --{serverError 285}
+
 SELECT 'insert to two replicas works';
 SET insert_quorum=2, insert_quorum_parallel=1;
+
 INSERT INTO r1 VALUES(1, '1');
 
 SELECT COUNT() FROM r1;
@@ -29,12 +34,18 @@ DETACH TABLE r2;
 
 INSERT INTO r1 VALUES(2, '2'); --{serverError 285}
 
+-- retry should fail despite the insert_deduplicate enabled
+INSERT INTO r1 VALUES(2, '2'); --{serverError 285}
+INSERT INTO r1 VALUES(2, '2'); --{serverError 285}
+
 SET insert_quorum=1, insert_quorum_parallel=1;
 SELECT 'insert to single replica works';
 INSERT INTO r1 VALUES(2, '2');
 
 ATTACH TABLE r2;
 
+INSERT INTO r2 VALUES(2, '2');
+
 SYSTEM SYNC REPLICA r2;
 
 SET insert_quorum=2, insert_quorum_parallel=1;
@@ -47,6 +58,17 @@ SELECT COUNT() FROM r2;
 SELECT 'deduplication works';
 INSERT INTO r2 VALUES(3, '3');
 
+-- still works if we relax quorum
+SET insert_quorum=1, insert_quorum_parallel=1;
+INSERT INTO r2 VALUES(3, '3');
+INSERT INTO r1 VALUES(3, '3');
+-- will start failing if we increase quorum
+SET insert_quorum=3, insert_quorum_parallel=1;
+INSERT INTO r1 VALUES(3, '3'); --{serverError 285}
+-- work back ok when quorum=2
+SET insert_quorum=2, insert_quorum_parallel=1;
+INSERT INTO r2 VALUES(3, '3');
+
 SELECT COUNT() FROM r1;
 SELECT COUNT() FROM r2;
 
@@ -56,8 +78,18 @@ SET insert_quorum_timeout=0;
 
 INSERT INTO r1 VALUES (4, '4'); -- { serverError 319 }
 
+-- retry should fail despite the insert_deduplicate enabled
+INSERT INTO r1 VALUES (4, '4'); -- { serverError 319 }
+INSERT INTO r1 VALUES (4, '4'); -- { serverError 319 }
+SELECT * FROM r2 WHERE key=4;
+
 SYSTEM START FETCHES r2;
 
+SET insert_quorum_timeout=6000000;
+
+-- now retry should be successful
+INSERT INTO r1 VALUES (4, '4');
+
 SYSTEM SYNC REPLICA r2;
 
 SELECT 'insert happened';
diff --git a/tests/queries/0_stateless/01531_query_log_query_comment.sql b/tests/queries/0_stateless/01531_query_log_query_comment.sql
index 2e1faf1b9e4..19d6eac0e15 100644
--- a/tests/queries/0_stateless/01531_query_log_query_comment.sql
+++ b/tests/queries/0_stateless/01531_query_log_query_comment.sql
@@ -1,20 +1,20 @@
 set log_queries=1;
 set log_queries_min_type='QUERY_FINISH';
 
-set enable_global_with_statement=1;
+set enable_global_with_statement=0;
 select /* test=01531, enable_global_with_statement=0 */ 2;
 system flush logs;
 select count() from system.query_log
-where event_time >= now() - interval 5 minute
-    and query like '%select /* test=01531, enable_global_with_statement=0 */ 2%'
+where event_date >= yesterday()
+    and query like 'select /* test=01531, enable_global_with_statement=0 */ 2%'
     and current_database = currentDatabase()
     ;
 
 set enable_global_with_statement=1;
-select /* test=01531 enable_global_with_statement=1 */ 2;
+select /* test=01531, enable_global_with_statement=1 */ 2;
 system flush logs;
 select count() from system.query_log
-where event_time >= now() - interval 5 minute
-    and query like '%select /* test=01531 enable_global_with_statement=1 */ 2%'
+where event_date >= yesterday()
+    and query like 'select /* test=01531, enable_global_with_statement=1 */ 2%'
     and current_database = currentDatabase()
     ;
diff --git a/tests/queries/0_stateless/01533_multiple_nested.reference b/tests/queries/0_stateless/01533_multiple_nested.reference
index ba37ce1c32c..138a7cfd7f2 100644
--- a/tests/queries/0_stateless/01533_multiple_nested.reference
+++ b/tests/queries/0_stateless/01533_multiple_nested.reference
@@ -13,16 +13,16 @@ col3
 read files
 4
 6
-0	899984	7199412
-1	899987	7199877
-2	899990	7200255
-3	899993	7199883
-4	899996	7199798
-5	899999	7200306
-6	900002	7200064
-7	900005	7199429
-8	900008	7200067
-9	899992	7199993
+0	89982	719752
+1	89988	720017
+2	89994	720152
+3	90000	720157
+4	90006	720100
+5	90012	720168
+6	90018	720106
+7	90005	719891
+8	89992	719854
+9	89979	719706
 0	[]
 0	[0]
 1	[0,2]
diff --git a/tests/queries/0_stateless/01533_multiple_nested.sql b/tests/queries/0_stateless/01533_multiple_nested.sql
index 38c80617334..0ddb0cfbfb4 100644
--- a/tests/queries/0_stateless/01533_multiple_nested.sql
+++ b/tests/queries/0_stateless/01533_multiple_nested.sql
@@ -36,7 +36,7 @@ SYSTEM FLUSH LOGS;
 SELECT ProfileEvents.Values[indexOf(ProfileEvents.Names, 'FileOpen')]
 FROM system.query_log
 WHERE (type = 'QueryFinish') AND (lower(query) LIKE lower('SELECT col1.a FROM %nested%'))
-    AND event_time > now() - INTERVAL 10 SECOND AND current_database = currentDatabase();
+    AND event_date >= yesterday() AND current_database = currentDatabase();
 
 SYSTEM DROP MARK CACHE;
 SELECT col3.n2.s FROM nested FORMAT Null;
@@ -46,7 +46,7 @@ SYSTEM FLUSH LOGS;
 SELECT ProfileEvents.Values[indexOf(ProfileEvents.Names, 'FileOpen')]
 FROM system.query_log
 WHERE (type = 'QueryFinish') AND (lower(query) LIKE lower('SELECT col3.n2.s FROM %nested%'))
-    AND event_time > now() - INTERVAL 10 SECOND AND current_database = currentDatabase();
+    AND event_date >= yesterday() AND current_database = currentDatabase();
 
 DROP TABLE nested;
 
@@ -59,7 +59,7 @@ ENGINE = MergeTree
 ORDER BY id
 SETTINGS min_bytes_for_wide_part = 0;
 
-INSERT INTO nested SELECT number, arrayMap(x -> (x, arrayMap(y -> (toString(y * x), y + x), range(number % 17))), range(number % 19)) FROM numbers(1000000);
+INSERT INTO nested SELECT number, arrayMap(x -> (x, arrayMap(y -> (toString(y * x), y + x), range(number % 17))), range(number % 19)) FROM numbers(100000);
 SELECT id % 10, sum(length(col1)), sumArray(arrayMap(x -> length(x), col1.n.b)) FROM nested GROUP BY id % 10;
 
 SELECT arraySum(col1.a), arrayMap(x -> x * x * 2, col1.a) FROM nested ORDER BY id LIMIT 5;
diff --git a/tests/queries/0_stateless/01544_errorCodeToName.reference b/tests/queries/0_stateless/01544_errorCodeToName.reference
index ace588644e1..fefccf984be 100644
--- a/tests/queries/0_stateless/01544_errorCodeToName.reference
+++ b/tests/queries/0_stateless/01544_errorCodeToName.reference
@@ -1,4 +1,5 @@
 
 
+
 OK
 UNSUPPORTED_METHOD
diff --git a/tests/queries/0_stateless/01544_errorCodeToName.sql b/tests/queries/0_stateless/01544_errorCodeToName.sql
index 9e28ed1116c..aa32270f00b 100644
--- a/tests/queries/0_stateless/01544_errorCodeToName.sql
+++ b/tests/queries/0_stateless/01544_errorCodeToName.sql
@@ -1,4 +1,5 @@
 SELECT errorCodeToName(toUInt32(-1));
+SELECT errorCodeToName(-1);
 SELECT errorCodeToName(600); /* gap in error codes */
 SELECT errorCodeToName(0);
 SELECT errorCodeToName(1);
diff --git a/tests/queries/0_stateless/01545_system_errors.reference b/tests/queries/0_stateless/01545_system_errors.reference
index d00491fd7e5..0e7f2447090 100644
--- a/tests/queries/0_stateless/01545_system_errors.reference
+++ b/tests/queries/0_stateless/01545_system_errors.reference
@@ -1 +1,2 @@
-1
+local=1
+remote=1
diff --git a/tests/queries/0_stateless/01545_system_errors.sh b/tests/queries/0_stateless/01545_system_errors.sh
index 63af6bb8d43..970fd403866 100755
--- a/tests/queries/0_stateless/01545_system_errors.sh
+++ b/tests/queries/0_stateless/01545_system_errors.sh
@@ -4,7 +4,14 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-prev="$(${CLICKHOUSE_CLIENT} -q "SELECT value FROM system.errors WHERE name = 'FUNCTION_THROW_IF_VALUE_IS_NON_ZERO'")"
+# local
+prev="$(${CLICKHOUSE_CLIENT} -q "SELECT value FROM system.errors WHERE name = 'FUNCTION_THROW_IF_VALUE_IS_NON_ZERO' AND NOT remote")"
 $CLICKHOUSE_CLIENT -q 'SELECT throwIf(1)' >& /dev/null
-cur="$(${CLICKHOUSE_CLIENT} -q "SELECT value FROM system.errors WHERE name = 'FUNCTION_THROW_IF_VALUE_IS_NON_ZERO'")"
-echo $((cur - prev))
+cur="$(${CLICKHOUSE_CLIENT} -q "SELECT value FROM system.errors WHERE name = 'FUNCTION_THROW_IF_VALUE_IS_NON_ZERO' AND NOT remote")"
+echo local=$((cur - prev))
+
+# remote
+prev="$(${CLICKHOUSE_CLIENT} -q "SELECT value FROM system.errors WHERE name = 'FUNCTION_THROW_IF_VALUE_IS_NON_ZERO' AND remote")"
+${CLICKHOUSE_CLIENT} -q "SELECT * FROM remote('127.2', system.one) where throwIf(not dummy)" >& /dev/null
+cur="$(${CLICKHOUSE_CLIENT} -q "SELECT value FROM system.errors WHERE name = 'FUNCTION_THROW_IF_VALUE_IS_NON_ZERO' AND remote")"
+echo remote=$((cur - prev))
diff --git a/tests/queries/0_stateless/01546_log_queries_min_query_duration_ms.reference b/tests/queries/0_stateless/01546_log_queries_min_query_duration_ms.reference
index 0463db26710..8947c3c2bc3 100644
--- a/tests/queries/0_stateless/01546_log_queries_min_query_duration_ms.reference
+++ b/tests/queries/0_stateless/01546_log_queries_min_query_duration_ms.reference
@@ -1,4 +1,4 @@
 0
 0
 1
-1
+OK
diff --git a/tests/queries/0_stateless/01546_log_queries_min_query_duration_ms.sql b/tests/queries/0_stateless/01546_log_queries_min_query_duration_ms.sql
index f0f681288cf..20854da0e8a 100644
--- a/tests/queries/0_stateless/01546_log_queries_min_query_duration_ms.sql
+++ b/tests/queries/0_stateless/01546_log_queries_min_query_duration_ms.sql
@@ -12,19 +12,15 @@ system flush logs;
 select count()
 from system.query_log
 where
-    query like '%01546_log_queries_min_query_duration_ms-fast%'
-    and query not like '%system.query_log%'
+    query like 'select \'01546_log_queries_min_query_duration_ms-fast%'
     and current_database = currentDatabase()
-    and event_date = today()
-    and event_time >= now() - interval 1 minute;
+    and event_date >= yesterday();
 select count()
 from system.query_thread_log
 where
-    query like '%01546_log_queries_min_query_duration_ms-fast%'
-    and query not like '%system.query_thread_log%'
+    query like 'select \'01546_log_queries_min_query_duration_ms-fast%'
     and current_database = currentDatabase()
-    and event_date = today()
-    and event_time >= now() - interval 1 minute;
+    and event_date >= yesterday();
 
 --
 -- slow -- query logged
@@ -37,18 +33,14 @@ system flush logs;
 select count()
 from system.query_log
 where
-    query like '%01546_log_queries_min_query_duration_ms-slow%'
-    and query not like '%system.query_log%'
+    query like 'select \'01546_log_queries_min_query_duration_ms-slow%'
     and current_database = currentDatabase()
-    and event_date = today()
-    and event_time >= now() - interval 1 minute;
+    and event_date >= yesterday();
 -- There at least two threads involved in a simple query
 -- (one thread just waits another, sigh)
-select count() == 2
+select if(count() == 2, 'OK', 'Fail: ' || toString(count()))
 from system.query_thread_log
 where
-    query like '%01546_log_queries_min_query_duration_ms-slow%'
-    and query not like '%system.query_thread_log%'
+    query like 'select \'01546_log_queries_min_query_duration_ms-slow%'
     and current_database = currentDatabase()
-    and event_date = today()
-    and event_time >= now() - interval 1 minute;
+    and event_date >= yesterday();
diff --git a/tests/queries/0_stateless/01547_query_log_current_database.sql b/tests/queries/0_stateless/01547_query_log_current_database.sql
index c0ad22163ba..5eec8a81ccc 100644
--- a/tests/queries/0_stateless/01547_query_log_current_database.sql
+++ b/tests/queries/0_stateless/01547_query_log_current_database.sql
@@ -21,17 +21,15 @@ system flush logs;
 select count()
 from system.query_log
 where
-    query like '%01547_query_log_current_database%'
+    query like 'select \'01547_query_log_current_database%'
     and current_database = currentDatabase()
-    and event_date = today()
-    and event_time >= now() - interval 1 minute;
+    and event_date >= yesterday();
 
 -- at least two threads for processing
 -- (but one just waits for another, sigh)
 select count() == 2
 from system.query_thread_log
 where
-    query like '%01547_query_log_current_database%'
+    query like 'select \'01547_query_log_current_database%'
     and current_database = currentDatabase()
-    and event_date = today()
-    and event_time >= now() - interval 1 minute;
+    and event_date >= yesterday()
diff --git a/tests/queries/0_stateless/01548_query_log_query_execution_ms.sql b/tests/queries/0_stateless/01548_query_log_query_execution_ms.sql
index e80e84646be..028b3400d01 100644
--- a/tests/queries/0_stateless/01548_query_log_query_execution_ms.sql
+++ b/tests/queries/0_stateless/01548_query_log_query_execution_ms.sql
@@ -13,8 +13,7 @@ where
     query like '%01548_query_log_query_execution_ms%'
     and current_database = currentDatabase()
     and query_duration_ms between 100 and 800
-    and event_date = today()
-    and event_time >= now() - interval 1 minute;
+    and event_date >= yesterday();
 
 -- at least two threads for processing
 -- (but one just waits for another, sigh)
diff --git a/tests/queries/0_stateless/01550_create_map_type.reference b/tests/queries/0_stateless/01550_create_map_type.reference
index 877199e92d5..d4794ac1459 100644
--- a/tests/queries/0_stateless/01550_create_map_type.reference
+++ b/tests/queries/0_stateless/01550_create_map_type.reference
@@ -6,6 +6,8 @@ lisi
 female
 zhangsan
 gender
+2020-01-01	{1:0,2:1}
+2020-01-01	{1:0,2:-1}
 1116
 1117
 1118
diff --git a/tests/queries/0_stateless/01550_create_map_type.sql b/tests/queries/0_stateless/01550_create_map_type.sql
index 695a40c42b4..26bbf3c7dde 100644
--- a/tests/queries/0_stateless/01550_create_map_type.sql
+++ b/tests/queries/0_stateless/01550_create_map_type.sql
@@ -22,7 +22,21 @@ select a[b] from table_map;
 select b from table_map where a = map('name','lisi', 'gender', 'female');
 drop table if exists table_map;
 
--- Int type
+-- Big Integer type
+
+create table table_map (d DATE, m Map(Int8, UInt256)) ENGINE = MergeTree() order by d;
+insert into table_map values ('2020-01-01', map(1, 0, 2, 1));
+select * from table_map;
+drop table table_map;
+
+-- Integer type
+
+create table table_map (d DATE, m Map(Int8, Int8)) ENGINE = MergeTree() order by d;
+insert into table_map values ('2020-01-01', map(1, 0, 2, -1));
+select * from table_map;
+drop table table_map;
+
+-- Unsigned Int type
 drop table if exists table_map;
 create table table_map(a Map(UInt8, UInt64), b UInt8) Engine = MergeTree() order by b;
 insert into table_map select map(number, number+5), number from numbers(1111,4);
diff --git a/tests/queries/0_stateless/01551_mergetree_read_in_order_spread.reference b/tests/queries/0_stateless/01551_mergetree_read_in_order_spread.reference
index fb07aec9dd5..835e2af269a 100644
--- a/tests/queries/0_stateless/01551_mergetree_read_in_order_spread.reference
+++ b/tests/queries/0_stateless/01551_mergetree_read_in_order_spread.reference
@@ -2,7 +2,7 @@
 ExpressionTransform
   (Aggregating)
   FinalizingSimpleTransform
-    AggregatingSortedTransform 3 → 1
+    FinishAggregatingInOrderTransform 3 → 1
       AggregatingInOrderTransform × 3
         (Expression)
         ExpressionTransform × 3
@@ -13,16 +13,16 @@ ExpressionTransform
                 (MergingSorted)
                   (Expression)
                   ExpressionTransform
-                    (ReadFromStorage)
+                    (ReadFromMergeTree)
                     MergeTree 0 → 1
                 (MergingSorted)
                 MergingSortedTransform 2 → 1
                   (Expression)
                   ExpressionTransform × 2
-                    (ReadFromStorage)
+                    (ReadFromMergeTree)
                     MergeTree × 2 0 → 1
                 (MergingSorted)
                   (Expression)
                   ExpressionTransform
-                    (ReadFromStorage)
+                    (ReadFromMergeTree)
                     MergeTree 0 → 1
diff --git a/tests/queries/0_stateless/01560_optimize_on_insert.reference b/tests/queries/0_stateless/01560_optimize_on_insert.reference
index 7ace2043be0..477f48be7a9 100644
--- a/tests/queries/0_stateless/01560_optimize_on_insert.reference
+++ b/tests/queries/0_stateless/01560_optimize_on_insert.reference
@@ -11,3 +11,4 @@ Summing Merge Tree
 Aggregating Merge Tree
 1	5	2020-01-01 00:00:00
 2	5	2020-01-02 00:00:00
+Check creating empty parts
diff --git a/tests/queries/0_stateless/01560_optimize_on_insert.sql b/tests/queries/0_stateless/01560_optimize_on_insert.sql
index 9f6dac686bb..f64f4c75cfe 100644
--- a/tests/queries/0_stateless/01560_optimize_on_insert.sql
+++ b/tests/queries/0_stateless/01560_optimize_on_insert.sql
@@ -33,3 +33,10 @@ INSERT INTO aggregating_merge_tree VALUES (1, 1, '2020-01-01'), (2, 1, '2020-01-
 SELECT * FROM aggregating_merge_tree ORDER BY key;
 DROP TABLE aggregating_merge_tree;
 
+SELECT 'Check creating empty parts';
+DROP TABLE IF EXISTS empty;
+CREATE TABLE empty (key UInt32, val UInt32, date Datetime) ENGINE=SummingMergeTree(val) PARTITION BY date ORDER BY key;
+INSERT INTO empty VALUES (1, 1, '2020-01-01'), (1, 1, '2020-01-01'), (1, -2, '2020-01-01');
+SELECT * FROM empty ORDER BY key;
+SELECT table, partition, active FROM system.parts where table = 'empty' and active = 1;
+DROP TABLE empty;
diff --git a/tests/queries/0_stateless/01560_optimize_on_insert_zookeeper.reference b/tests/queries/0_stateless/01560_optimize_on_insert_zookeeper.reference
new file mode 100644
index 00000000000..e89c6201fb7
--- /dev/null
+++ b/tests/queries/0_stateless/01560_optimize_on_insert_zookeeper.reference
@@ -0,0 +1 @@
+Check creating empty parts
diff --git a/tests/queries/0_stateless/01560_optimize_on_insert_zookeeper.sql b/tests/queries/0_stateless/01560_optimize_on_insert_zookeeper.sql
new file mode 100644
index 00000000000..a98818b2195
--- /dev/null
+++ b/tests/queries/0_stateless/01560_optimize_on_insert_zookeeper.sql
@@ -0,0 +1,36 @@
+DROP TABLE IF EXISTS empty1;
+DROP TABLE IF EXISTS empty2;
+
+SELECT 'Check creating empty parts';
+
+CREATE TABLE empty1 (key UInt32, val UInt32, date Datetime)
+ENGINE=ReplicatedSummingMergeTree('/clickhouse/01560_optimize_on_insert', '1', val)
+PARTITION BY date ORDER BY key;
+
+CREATE TABLE empty2 (key UInt32, val UInt32, date Datetime)
+ENGINE=ReplicatedSummingMergeTree('/clickhouse/01560_optimize_on_insert', '2', val)
+PARTITION BY date ORDER BY key;
+
+INSERT INTO empty2 VALUES (1, 1, '2020-01-01'), (1, 1, '2020-01-01'), (1, -2, '2020-01-01');
+
+SYSTEM SYNC REPLICA empty1;
+
+SELECT * FROM empty1 ORDER BY key;
+SELECT * FROM empty2 ORDER BY key;
+
+SELECT table, partition, active FROM system.parts where table = 'empty1' and database=currentDatabase() and active = 1;
+SELECT table, partition, active FROM system.parts where table = 'empty2' and database=currentDatabase() and active = 1;
+
+DETACH table empty1;
+DETACH table empty2;
+ATTACH table empty1;
+ATTACH table empty2;
+
+SELECT * FROM empty1 ORDER BY key;
+SELECT * FROM empty2 ORDER BY key;
+
+SELECT table, partition, active FROM system.parts where table = 'empty1' and database=currentDatabase() and active = 1;
+SELECT table, partition, active FROM system.parts where table = 'empty2' and database=currentDatabase() and active = 1;
+
+DROP TABLE IF EXISTS empty1;
+DROP TABLE IF EXISTS empty2;
diff --git a/tests/queries/0_stateless/01561_Date_and_DateTime64_comparision.sql b/tests/queries/0_stateless/01561_Date_and_DateTime64_comparision.sql
index 7e75d871e07..a61bcff4db7 100644
--- a/tests/queries/0_stateless/01561_Date_and_DateTime64_comparision.sql
+++ b/tests/queries/0_stateless/01561_Date_and_DateTime64_comparision.sql
@@ -6,7 +6,7 @@ SELECT
     dt64 < d,
     toDate(dt64) < d,
     dt64 < toDateTime64(d, 1, 'UTC'),
-    
+
     '<=',
     dt64 <= d,
     toDate(dt64) <= d,
@@ -16,7 +16,7 @@ SELECT
     dt64 = d,
     toDate(dt64) = d,
     dt64 = toDateTime64(d, 1, 'UTC'),
-    
+
     '>=',
     dt64 >= d,
     toDate(dt64) >= d,
@@ -31,7 +31,7 @@ SELECT
     dt64 != d,
     toDate(dt64) != d,
     dt64 != toDateTime64(d, 1, 'UTC')
-FROM 
+FROM
 (
     WITH toDateTime('2019-09-16 19:20:11') as val
     SELECT
diff --git a/tests/queries/0_stateless/01562_optimize_monotonous_functions_in_order_by.reference b/tests/queries/0_stateless/01562_optimize_monotonous_functions_in_order_by.reference
index a1a1814a581..0eb7e06f724 100644
--- a/tests/queries/0_stateless/01562_optimize_monotonous_functions_in_order_by.reference
+++ b/tests/queries/0_stateless/01562_optimize_monotonous_functions_in_order_by.reference
@@ -11,7 +11,7 @@ Expression (Projection)
         PartialSorting (Sort each block for ORDER BY)
           Expression (Before ORDER BY)
             SettingQuotaAndLimits (Set limits and quota after reading from storage)
-              ReadFromStorage (MergeTree)
+              ReadFromMergeTree
 SELECT
     timestamp,
     key
@@ -23,7 +23,7 @@ Expression (Projection)
     FinishSorting
       Expression (Before ORDER BY)
         SettingQuotaAndLimits (Set limits and quota after reading from storage)
-          ReadFromStorage (MergeTree with order)
+          ReadFromMergeTree
 SELECT
     timestamp,
     key
@@ -37,7 +37,7 @@ Expression (Projection)
     FinishSorting
       Expression (Before ORDER BY)
         SettingQuotaAndLimits (Set limits and quota after reading from storage)
-          ReadFromStorage (MergeTree with order)
+          ReadFromMergeTree
 SELECT
     timestamp,
     key
diff --git a/tests/queries/0_stateless/01566_negate_formatting.reference b/tests/queries/0_stateless/01566_negate_formatting.reference
new file mode 100644
index 00000000000..69d79cf929a
--- /dev/null
+++ b/tests/queries/0_stateless/01566_negate_formatting.reference
@@ -0,0 +1,34 @@
+-- { echo }
+explain syntax select negate(1), negate(-1), - -1, -(-1), (-1) in (-1);
+SELECT
+    -1,
+    1,
+    1,
+    1,
+    -1 IN (-1)
+explain syntax select negate(1.), negate(-1.), - -1., -(-1.), (-1.) in (-1.);
+SELECT
+    -1.,
+    1.,
+    1.,
+    1.,
+    -1. IN (-1.)
+explain syntax select negate(-9223372036854775808), -(-9223372036854775808), - -9223372036854775808;
+SELECT
+    -9223372036854775808,
+    -9223372036854775808,
+    -9223372036854775808
+explain syntax select negate(0), negate(-0), - -0, -(-0), (-0) in (-0);
+SELECT
+    0,
+    0,
+    0,
+    0,
+    0 IN (0)
+explain syntax select negate(0.), negate(-0.), - -0., -(-0.), (-0.) in (-0.);
+SELECT
+    -0.,
+    0.,
+    0.,
+    0.,
+    -0. IN (-0.)
diff --git a/tests/queries/0_stateless/01566_negate_formatting.sql b/tests/queries/0_stateless/01566_negate_formatting.sql
new file mode 100644
index 00000000000..65e983fbdd1
--- /dev/null
+++ b/tests/queries/0_stateless/01566_negate_formatting.sql
@@ -0,0 +1,6 @@
+-- { echo }
+explain syntax select negate(1), negate(-1), - -1, -(-1), (-1) in (-1);
+explain syntax select negate(1.), negate(-1.), - -1., -(-1.), (-1.) in (-1.);
+explain syntax select negate(-9223372036854775808), -(-9223372036854775808), - -9223372036854775808;
+explain syntax select negate(0), negate(-0), - -0, -(-0), (-0) in (-0);
+explain syntax select negate(0.), negate(-0.), - -0., -(-0.), (-0.) in (-0.);
diff --git a/tests/queries/0_stateless/01567_system_processes_current_database.reference b/tests/queries/0_stateless/01567_system_processes_current_database.reference
new file mode 100644
index 00000000000..d00491fd7e5
--- /dev/null
+++ b/tests/queries/0_stateless/01567_system_processes_current_database.reference
@@ -0,0 +1 @@
+1
diff --git a/tests/queries/0_stateless/01567_system_processes_current_database.sql b/tests/queries/0_stateless/01567_system_processes_current_database.sql
new file mode 100644
index 00000000000..406120d742d
--- /dev/null
+++ b/tests/queries/0_stateless/01567_system_processes_current_database.sql
@@ -0,0 +1 @@
+select count(*) from system.processes where current_database = currentDatabase();
diff --git a/tests/queries/0_stateless/01568_window_functions_distributed.reference b/tests/queries/0_stateless/01568_window_functions_distributed.reference
new file mode 100644
index 00000000000..b441189303d
--- /dev/null
+++ b/tests/queries/0_stateless/01568_window_functions_distributed.reference
@@ -0,0 +1,5 @@
+-- { echo }
+set allow_experimental_window_functions = 1;
+select row_number() over (order by dummy) from (select * from remote('127.0.0.{1,2}', system, one));
+1
+2
diff --git a/tests/queries/0_stateless/01568_window_functions_distributed.sql b/tests/queries/0_stateless/01568_window_functions_distributed.sql
new file mode 100644
index 00000000000..754b996e00c
--- /dev/null
+++ b/tests/queries/0_stateless/01568_window_functions_distributed.sql
@@ -0,0 +1,4 @@
+-- { echo }
+set allow_experimental_window_functions = 1;
+
+select row_number() over (order by dummy) from (select * from remote('127.0.0.{1,2}', system, one));
diff --git a/tests/queries/0_stateless/01576_alias_column_rewrite.reference b/tests/queries/0_stateless/01576_alias_column_rewrite.reference
index 334ebc7eb1f..c5679544e1d 100644
--- a/tests/queries/0_stateless/01576_alias_column_rewrite.reference
+++ b/tests/queries/0_stateless/01576_alias_column_rewrite.reference
@@ -28,47 +28,47 @@ Expression (Projection)
         PartialSorting (Sort each block for ORDER BY)
           Expression ((Before ORDER BY + Add table aliases))
             SettingQuotaAndLimits (Set limits and quota after reading from storage)
-              ReadFromStorage (MergeTree)
+              ReadFromMergeTree
 Expression (Projection)
   Limit (preliminary LIMIT)
     FinishSorting
       Expression ((Before ORDER BY + Add table aliases))
         SettingQuotaAndLimits (Set limits and quota after reading from storage)
           Union
-            ReadFromStorage (MergeTree with order)
-            ReadFromStorage (MergeTree with order)
-            ReadFromStorage (MergeTree with order)
+            ReadFromMergeTree
+            ReadFromMergeTree
+            ReadFromMergeTree
 Expression (Projection)
   Limit (preliminary LIMIT)
     FinishSorting
       Expression (Before ORDER BY)
         SettingQuotaAndLimits (Set limits and quota after reading from storage)
           Union
-            ReadFromStorage (MergeTree with order)
-            ReadFromStorage (MergeTree with order)
-            ReadFromStorage (MergeTree with order)
+            ReadFromMergeTree
+            ReadFromMergeTree
+            ReadFromMergeTree
 optimize_aggregation_in_order
 Expression ((Projection + Before ORDER BY))
   Aggregating
     Expression ((Before GROUP BY + Add table aliases))
       SettingQuotaAndLimits (Set limits and quota after reading from storage)
-        ReadFromStorage (MergeTree)
+        ReadFromMergeTree
 Expression ((Projection + Before ORDER BY))
   Aggregating
     Expression ((Before GROUP BY + Add table aliases))
       SettingQuotaAndLimits (Set limits and quota after reading from storage)
         Union
-          ReadFromStorage (MergeTree with order)
-          ReadFromStorage (MergeTree with order)
-          ReadFromStorage (MergeTree with order)
+          ReadFromMergeTree
+          ReadFromMergeTree
+          ReadFromMergeTree
 Expression ((Projection + Before ORDER BY))
   Aggregating
     Expression (Before GROUP BY)
       SettingQuotaAndLimits (Set limits and quota after reading from storage)
         Union
-          ReadFromStorage (MergeTree with order)
-          ReadFromStorage (MergeTree with order)
-          ReadFromStorage (MergeTree with order)
+          ReadFromMergeTree
+          ReadFromMergeTree
+          ReadFromMergeTree
 second-index
 1
 1
diff --git a/tests/queries/0_stateless/01586_replicated_mutations_empty_partition.reference b/tests/queries/0_stateless/01586_replicated_mutations_empty_partition.reference
index f79be33624b..2f204867c41 100644
--- a/tests/queries/0_stateless/01586_replicated_mutations_empty_partition.reference
+++ b/tests/queries/0_stateless/01586_replicated_mutations_empty_partition.reference
@@ -2,4 +2,4 @@
 10
 10
 24
-CREATE TABLE default.replicated_mutations_empty_partitions\n(\n    `key` UInt64,\n    `value` UInt64\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/test/01586_replicated_mutations_empty_partitions\', \'1\')\nPARTITION BY key\nORDER BY key\nSETTINGS index_granularity = 8192
+CREATE TABLE default.replicated_mutations_empty_partitions\n(\n    `key` UInt64,\n    `value` UInt64\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/test/default/01586_replicated_mutations_empty_partitions/{shard}\', \'{replica}\')\nPARTITION BY key\nORDER BY key\nSETTINGS index_granularity = 8192
diff --git a/tests/queries/0_stateless/01586_replicated_mutations_empty_partition.sql b/tests/queries/0_stateless/01586_replicated_mutations_empty_partition.sql
index 659cc060f32..73245fe49ec 100644
--- a/tests/queries/0_stateless/01586_replicated_mutations_empty_partition.sql
+++ b/tests/queries/0_stateless/01586_replicated_mutations_empty_partition.sql
@@ -5,7 +5,7 @@ CREATE TABLE replicated_mutations_empty_partitions
     key UInt64,
     value String
 )
-ENGINE = ReplicatedMergeTree('/clickhouse/test/01586_replicated_mutations_empty_partitions', '1')
+ENGINE = ReplicatedMergeTree('/clickhouse/test/'||currentDatabase()||'/01586_replicated_mutations_empty_partitions/{shard}', '{replica}')
 ORDER BY key
 PARTITION by key;
 
@@ -13,7 +13,7 @@ INSERT INTO replicated_mutations_empty_partitions SELECT number, toString(number
 
 SELECT count(distinct value) FROM replicated_mutations_empty_partitions;
 
-SELECT count() FROM system.zookeeper WHERE path = '/clickhouse/test/01586_replicated_mutations_empty_partitions/block_numbers';
+SELECT count() FROM system.zookeeper WHERE path = '/clickhouse/test/'||currentDatabase()||'/01586_replicated_mutations_empty_partitions/s1/block_numbers';
 
 ALTER TABLE replicated_mutations_empty_partitions DROP PARTITION '3';
 ALTER TABLE replicated_mutations_empty_partitions DROP PARTITION '4';
@@ -21,7 +21,7 @@ ALTER TABLE replicated_mutations_empty_partitions DROP PARTITION '5';
 ALTER TABLE replicated_mutations_empty_partitions DROP PARTITION '9';
 
 -- still ten records
-SELECT count() FROM system.zookeeper WHERE path = '/clickhouse/test/01586_replicated_mutations_empty_partitions/block_numbers';
+SELECT count() FROM system.zookeeper WHERE path = '/clickhouse/test/'||currentDatabase()||'/01586_replicated_mutations_empty_partitions/s1/block_numbers';
 
 ALTER TABLE replicated_mutations_empty_partitions MODIFY COLUMN value UInt64 SETTINGS replication_alter_partitions_sync=2;
 
diff --git a/tests/queries/0_stateless/01591_window_functions.reference b/tests/queries/0_stateless/01591_window_functions.reference
index d2543f0db75..21a2e72fea4 100644
--- a/tests/queries/0_stateless/01591_window_functions.reference
+++ b/tests/queries/0_stateless/01591_window_functions.reference
@@ -771,6 +771,28 @@ order by x;
 125	124	127	4
 126	125	127	3
 127	126	127	2
+-- We need large offsets to trigger overflow to positive direction, or
+-- else the frame end runs into partition end w/o overflow and doesn't move
+-- after that. The frame from this query is equivalent to the entire partition.
+select x, min(x) over w, max(x) over w, count(x) over w
+from (
+    select toUInt8(if(mod(number, 2),
+        toInt64(255 - intDiv(number, 2)),
+        toInt64(intDiv(number, 2)))) x
+    from numbers(10)
+)
+window w as (order by x range between 255 preceding and 255 following)
+order by x;
+0	0	255	10
+1	0	255	10
+2	0	255	10
+3	0	255	10
+4	0	255	10
+251	0	255	10
+252	0	255	10
+253	0	255	10
+254	0	255	10
+255	0	255	10
 -- RANGE OFFSET ORDER BY DESC
 select x, min(x) over w, max(x) over w, count(x) over w from (
     select toUInt8(number) x from numbers(11)) t
@@ -920,6 +942,35 @@ FROM numbers(2)
 ;
 1	0
 1	1
+-- optimize_read_in_order conflicts with sorting for window functions, check that
+-- it is disabled.
+drop table if exists window_mt;
+create table window_mt engine MergeTree order by number
+    as select number, mod(number, 3) p from numbers(100);
+select number, count(*) over (partition by p)
+    from window_mt order by number limit 10 settings optimize_read_in_order = 0;
+0	34
+1	33
+2	33
+3	34
+4	33
+5	33
+6	34
+7	33
+8	33
+9	34
+select number, count(*) over (partition by p)
+    from window_mt order by number limit 10 settings optimize_read_in_order = 1;
+0	34
+1	33
+2	33
+3	34
+4	33
+5	33
+6	34
+7	33
+8	33
+9	34
 -- some true window functions -- rank and friends
 select number, p, o,
     count(*) over w,
@@ -974,6 +1025,34 @@ from numbers(5);
 1	3
 2	4
 3	\N
+-- variants of lag/lead that respect the frame
+select number, p, pp,
+    lagInFrame(number) over w as lag1,
+    lagInFrame(number, number - pp) over w as lag2,
+    lagInFrame(number, number - pp, number * 11) over w as lag,
+    leadInFrame(number, number - pp, number * 11) over w as lead
+from (select number, intDiv(number, 5) p, p * 5 pp from numbers(16))
+window w as (partition by p order by number
+    rows between unbounded preceding and unbounded following)
+order by number
+settings max_block_size = 3;
+;
+0	0	0	0	0	0	0
+1	0	0	0	0	0	2
+2	0	0	1	0	0	4
+3	0	0	2	0	0	33
+4	0	0	3	0	0	44
+5	1	5	0	5	5	5
+6	1	5	5	5	5	7
+7	1	5	6	5	5	9
+8	1	5	7	5	5	88
+9	1	5	8	5	5	99
+10	2	10	0	10	10	10
+11	2	10	10	10	10	12
+12	2	10	11	10	10	14
+13	2	10	12	10	10	143
+14	2	10	13	10	10	154
+15	3	15	0	15	15	15
 -- case-insensitive SQL-standard synonyms for any and anyLast
 select
     number,
@@ -993,3 +1072,40 @@ order by number
 7	6	8
 8	7	9
 9	8	9
+-- In this case, we had a problem with PartialSortingTransform returning zero-row
+-- chunks for input chunks w/o columns.
+select count() over () from numbers(4) where number < 2;
+2
+2
+-- floating point RANGE frame
+select
+    count(*) over (order by toFloat32(number) range 5. preceding),
+    count(*) over (order by toFloat64(number) range 5. preceding),
+    count(*) over (order by toFloat32(number) range between current row and 5. following),
+    count(*) over (order by toFloat64(number) range between current row and 5. following)
+from numbers(7)
+;
+1	1	6	6
+2	2	6	6
+3	3	5	5
+4	4	4	4
+5	5	3	3
+6	6	2	2
+6	6	1	1
+-- negative offsets should not be allowed
+select count() over (order by toInt64(number) range between -1 preceding and unbounded following) from numbers(1); -- { serverError 36 }
+select count() over (order by toInt64(number) range between -1 following and unbounded following) from numbers(1); -- { serverError 36 }
+select count() over (order by toInt64(number) range between unbounded preceding and -1 preceding) from numbers(1); -- { serverError 36 }
+select count() over (order by toInt64(number) range between unbounded preceding and -1 following) from numbers(1); -- { serverError 36 }
+-- a test with aggregate function that allocates memory in arena
+select sum(a[length(a)])
+from (
+    select groupArray(number) over (partition by modulo(number, 11)
+            order by modulo(number, 1111), number) a
+    from numbers_mt(10000)
+) settings max_block_size = 7;
+49995000
+-- -INT_MIN row offset that can lead to problems with negation, found when fuzzing
+-- under UBSan. Should be limited to at most INT_MAX.
+select count() over (rows between 2147483648 preceding and 2147493648 following) from numbers(2); -- { serverError 36 }
+drop table window_mt;
diff --git a/tests/queries/0_stateless/01591_window_functions.sql b/tests/queries/0_stateless/01591_window_functions.sql
index 03bd8371e23..afbf26d0b5c 100644
--- a/tests/queries/0_stateless/01591_window_functions.sql
+++ b/tests/queries/0_stateless/01591_window_functions.sql
@@ -242,6 +242,19 @@ from (
 window w as (order by x range between 1 preceding and 2 following)
 order by x;
 
+-- We need large offsets to trigger overflow to positive direction, or
+-- else the frame end runs into partition end w/o overflow and doesn't move
+-- after that. The frame from this query is equivalent to the entire partition.
+select x, min(x) over w, max(x) over w, count(x) over w
+from (
+    select toUInt8(if(mod(number, 2),
+        toInt64(255 - intDiv(number, 2)),
+        toInt64(intDiv(number, 2)))) x
+    from numbers(10)
+)
+window w as (order by x range between 255 preceding and 255 following)
+order by x;
+
 -- RANGE OFFSET ORDER BY DESC
 select x, min(x) over w, max(x) over w, count(x) over w from (
     select toUInt8(number) x from numbers(11)) t
@@ -316,6 +329,18 @@ SELECT
 FROM numbers(2)
 ;
 
+-- optimize_read_in_order conflicts with sorting for window functions, check that
+-- it is disabled.
+drop table if exists window_mt;
+create table window_mt engine MergeTree order by number
+    as select number, mod(number, 3) p from numbers(100);
+
+select number, count(*) over (partition by p)
+    from window_mt order by number limit 10 settings optimize_read_in_order = 0;
+
+select number, count(*) over (partition by p)
+    from window_mt order by number limit 10 settings optimize_read_in_order = 1;
+
 -- some true window functions -- rank and friends
 select number, p, o,
     count(*) over w,
@@ -336,6 +361,19 @@ select
         over (order by number rows between 1 following and 1 following)
 from numbers(5);
 
+-- variants of lag/lead that respect the frame
+select number, p, pp,
+    lagInFrame(number) over w as lag1,
+    lagInFrame(number, number - pp) over w as lag2,
+    lagInFrame(number, number - pp, number * 11) over w as lag,
+    leadInFrame(number, number - pp, number * 11) over w as lead
+from (select number, intDiv(number, 5) p, p * 5 pp from numbers(16))
+window w as (partition by p order by number
+    rows between unbounded preceding and unbounded following)
+order by number
+settings max_block_size = 3;
+;
+
 -- case-insensitive SQL-standard synonyms for any and anyLast
 select
     number,
@@ -345,3 +383,36 @@ from numbers(10)
 window w as (order by number range between 1 preceding and 1 following)
 order by number
 ;
+
+-- In this case, we had a problem with PartialSortingTransform returning zero-row
+-- chunks for input chunks w/o columns.
+select count() over () from numbers(4) where number < 2;
+
+-- floating point RANGE frame
+select
+    count(*) over (order by toFloat32(number) range 5. preceding),
+    count(*) over (order by toFloat64(number) range 5. preceding),
+    count(*) over (order by toFloat32(number) range between current row and 5. following),
+    count(*) over (order by toFloat64(number) range between current row and 5. following)
+from numbers(7)
+;
+
+-- negative offsets should not be allowed
+select count() over (order by toInt64(number) range between -1 preceding and unbounded following) from numbers(1); -- { serverError 36 }
+select count() over (order by toInt64(number) range between -1 following and unbounded following) from numbers(1); -- { serverError 36 }
+select count() over (order by toInt64(number) range between unbounded preceding and -1 preceding) from numbers(1); -- { serverError 36 }
+select count() over (order by toInt64(number) range between unbounded preceding and -1 following) from numbers(1); -- { serverError 36 }
+
+-- a test with aggregate function that allocates memory in arena
+select sum(a[length(a)])
+from (
+    select groupArray(number) over (partition by modulo(number, 11)
+            order by modulo(number, 1111), number) a
+    from numbers_mt(10000)
+) settings max_block_size = 7;
+
+-- -INT_MIN row offset that can lead to problems with negation, found when fuzzing
+-- under UBSan. Should be limited to at most INT_MAX.
+select count() over (rows between 2147483648 preceding and 2147493648 following) from numbers(2); -- { serverError 36 }
+
+drop table window_mt;
diff --git a/tests/queries/0_stateless/01592_long_window_functions1.reference b/tests/queries/0_stateless/01592_long_window_functions1.reference
new file mode 100644
index 00000000000..5160cca9c3e
--- /dev/null
+++ b/tests/queries/0_stateless/01592_long_window_functions1.reference
@@ -0,0 +1,4 @@
+---- arrays ----
+6360452672161319041
+---- window f ----
+6360452672161319041
diff --git a/tests/queries/0_stateless/01592_long_window_functions1.sql b/tests/queries/0_stateless/01592_long_window_functions1.sql
new file mode 100644
index 00000000000..bb0f77ff60a
--- /dev/null
+++ b/tests/queries/0_stateless/01592_long_window_functions1.sql
@@ -0,0 +1,36 @@
+drop table if exists stack;
+
+set allow_experimental_window_functions = 1;
+set max_insert_threads = 4;
+
+create table stack(item_id Int64, brand_id Int64, rack_id Int64, dt DateTime, expiration_dt DateTime, quantity UInt64)
+Engine = MergeTree 
+partition by toYYYYMM(dt) 
+order by (brand_id, toStartOfHour(dt));
+
+insert into stack 
+select number%99991, number%11, number%1111, toDateTime('2020-01-01 00:00:00')+number/100, 
+   toDateTime('2020-02-01 00:00:00')+number/10, intDiv(number,100)+1
+from numbers_mt(10000000);
+
+select '---- arrays ----';
+
+select cityHash64( toString( groupArray (tuple(*) ) )) from (
+    select brand_id, rack_id, arrayJoin(arraySlice(arraySort(groupArray(quantity)),1,2)) quantity
+    from stack
+    group by brand_id, rack_id
+    order by brand_id, rack_id, quantity
+) t;
+
+
+select '---- window f ----';
+
+select cityHash64( toString( groupArray (tuple(*) ) )) from (
+    select brand_id, rack_id,  quantity from
+       ( select brand_id, rack_id, quantity, row_number() over (partition by brand_id, rack_id order by quantity) rn
+         from stack ) as t0 
+    where rn <= 2  
+    order by brand_id, rack_id, quantity
+) t;
+
+drop table if exists stack;
diff --git a/tests/queries/0_stateless/01592_window_functions.reference b/tests/queries/0_stateless/01592_window_functions.reference
new file mode 100644
index 00000000000..8ca5086821b
--- /dev/null
+++ b/tests/queries/0_stateless/01592_window_functions.reference
@@ -0,0 +1,81 @@
+---- Q1 ----
+Dell Vostro	800.00	Laptop	850
+HP Elite	1200.00	Laptop	850
+Lenovo Thinkpad	700.00	Laptop	850
+Sony VAIO	700.00	Laptop	850
+HTC One	400.00	Smartphone	500
+Microsoft Lumia	200.00	Smartphone	500
+Nexus	500.00	Smartphone	500
+iPhone	900.00	Smartphone	500
+Kindle Fire	150.00	Tablet	350
+Samsung Galaxy Tab	200.00	Tablet	350
+iPad	700.00	Tablet	350
+---- Q2 ----
+Lenovo Thinkpad	Laptop	700.00	1
+Sony VAIO	Laptop	700.00	1
+Dell Vostro	Laptop	800.00	3
+HP Elite	Laptop	1200.00	4
+Microsoft Lumia	Smartphone	200.00	1
+HTC One	Smartphone	400.00	2
+Nexus	Smartphone	500.00	3
+iPhone	Smartphone	900.00	4
+Kindle Fire	Tablet	150.00	1
+Samsung Galaxy Tab	Tablet	200.00	2
+iPad	Tablet	700.00	3
+---- Q3 ----
+HP Elite	Laptop	1200.00	1
+Dell Vostro	Laptop	800.00	2
+Lenovo Thinkpad	Laptop	700.00	3
+Sony VAIO	Laptop	700.00	4
+iPhone	Smartphone	900.00	1
+Nexus	Smartphone	500.00	2
+HTC One	Smartphone	400.00	3
+Microsoft Lumia	Smartphone	200.00	4
+iPad	Tablet	700.00	1
+Samsung Galaxy Tab	Tablet	200.00	2
+Kindle Fire	Tablet	150.00	3
+---- Q4 ----
+Lenovo Thinkpad	Laptop	700.00	700.00	1
+Sony VAIO	Laptop	700.00	700.00	1
+Dell Vostro	Laptop	800.00	700.00	2
+HP Elite	Laptop	1200.00	700.00	3
+Microsoft Lumia	Smartphone	200.00	200.00	1
+HTC One	Smartphone	400.00	200.00	2
+Nexus	Smartphone	500.00	200.00	3
+iPhone	Smartphone	900.00	200.00	4
+---- Q5 ----
+Sony VAIO	Laptop	700.00	700.00
+Lenovo Thinkpad	Laptop	700.00	700.00
+HP Elite	Laptop	1200.00	700.00
+Dell Vostro	Laptop	800.00	700.00
+iPhone	Smartphone	900.00	900.00
+Nexus	Smartphone	500.00	900.00
+Microsoft Lumia	Smartphone	200.00	900.00
+HTC One	Smartphone	400.00	900.00
+iPad	Tablet	700.00	700.00
+Samsung Galaxy Tab	Tablet	200.00	700.00
+Kindle Fire	Tablet	150.00	700.00
+---- Q6 ----
+Dell Vostro	Laptop	800.00	1200.00
+HP Elite	Laptop	1200.00	1200.00
+Lenovo Thinkpad	Laptop	700.00	1200.00
+Sony VAIO	Laptop	700.00	1200.00
+HTC One	Smartphone	400.00	900.00
+Microsoft Lumia	Smartphone	200.00	900.00
+Nexus	Smartphone	500.00	900.00
+iPhone	Smartphone	900.00	900.00
+Kindle Fire	Tablet	150.00	700.00
+Samsung Galaxy Tab	Tablet	200.00	700.00
+iPad	Tablet	700.00	700.00
+---- Q7 ----
+Dell Vostro	800.00	Laptop	733	850
+HP Elite	1200.00	Laptop	850	850
+Lenovo Thinkpad	700.00	Laptop	700	850
+Sony VAIO	700.00	Laptop	700	850
+HTC One	400.00	Smartphone	300	500
+Microsoft Lumia	200.00	Smartphone	200	500
+Nexus	500.00	Smartphone	367	500
+iPhone	900.00	Smartphone	500	500
+Kindle Fire	150.00	Tablet	150	350
+Samsung Galaxy Tab	200.00	Tablet	175	350
+iPad	700.00	Tablet	350	350
diff --git a/tests/queries/0_stateless/01592_window_functions.sql b/tests/queries/0_stateless/01592_window_functions.sql
new file mode 100644
index 00000000000..8d5033fc821
--- /dev/null
+++ b/tests/queries/0_stateless/01592_window_functions.sql
@@ -0,0 +1,107 @@
+set allow_experimental_window_functions = 1;
+
+drop table if exists product_groups;
+drop table if exists products;
+
+CREATE TABLE product_groups (
+	group_id Int64,
+	group_name String
+) Engine = Memory;
+
+
+CREATE TABLE products (
+	product_id Int64,
+	product_name String,
+	price DECIMAL(11, 2),
+	group_id Int64
+) Engine = Memory;
+
+INSERT INTO product_groups  VALUES	(1, 'Smartphone'),(2, 'Laptop'),(3, 'Tablet');
+
+INSERT INTO products (product_id,product_name, group_id,price) VALUES (1, 'Microsoft Lumia', 1, 200), (2, 'HTC One', 1, 400), (3, 'Nexus', 1, 500), (4, 'iPhone', 1, 900),(5, 'HP Elite', 2, 1200),(6, 'Lenovo Thinkpad', 2, 700),(7, 'Sony VAIO', 2, 700),(8, 'Dell Vostro', 2, 800),(9, 'iPad', 3, 700),(10, 'Kindle Fire', 3, 150),(11, 'Samsung Galaxy Tab', 3, 200);
+
+select '---- Q1 ----';
+
+SELECT
+	product_name,
+	price,
+	group_name,
+	AVG(price) OVER (PARTITION BY group_name)
+FROM products INNER JOIN  product_groups USING (group_id)
+order by group_name, product_name, price;
+
+select '---- Q2 ----';
+
+SELECT
+	product_name,
+	group_name,
+  price,
+	rank() OVER (PARTITION BY group_name ORDER BY price) rank
+FROM products INNER JOIN product_groups USING (group_id)
+order by  group_name, rank, price;
+
+select '---- Q3 ----';
+SELECT
+	product_name,
+	group_name,
+	price,
+	row_number() OVER (PARTITION BY group_name ORDER BY price desc) rn
+FROM products INNER JOIN product_groups USING (group_id)
+ORDER BY group_name, rn;
+
+select '---- Q4 ----';
+SELECT *
+FROM
+(
+    SELECT
+        product_name,
+        group_name,
+        price,
+        min(price) OVER (PARTITION BY group_name) AS min_price,
+        dense_rank() OVER (PARTITION BY group_name ORDER BY price ASC) AS r
+    FROM products
+    INNER JOIN product_groups USING (group_id)
+) AS t
+WHERE min_price > 160
+ORDER BY
+    group_name ASC,
+    r ASC,
+    product_name ASC;
+
+select '---- Q5 ----';
+SELECT
+	product_name,
+	group_name,
+	price,
+	FIRST_VALUE (price) OVER (PARTITION BY group_name ORDER BY product_name desc) AS price_per_group_per_alphab
+FROM products INNER JOIN product_groups USING (group_id)
+order by group_name, product_name desc;
+
+select '---- Q6 ----';
+SELECT
+	product_name,
+	group_name,
+	price,
+	LAST_VALUE (price) OVER (PARTITION BY group_name ORDER BY
+			price RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
+  ) AS highest_price_per_group
+FROM
+	products
+INNER JOIN product_groups USING (group_id)
+order by group_name, product_name;
+
+select '---- Q7 ----';
+select product_name, price, group_name, round(avg0), round(avg1)
+from (
+SELECT
+	product_name,
+	price,
+	group_name,
+	avg(price) OVER (PARTITION BY group_name ORDER BY price) avg0,
+	avg(price) OVER (PARTITION BY group_name ORDER BY
+			price RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) avg1
+FROM products INNER JOIN  product_groups USING (group_id)) t
+order by group_name, product_name, price;
+
+drop table product_groups;
+drop table products;
diff --git a/tests/queries/0_stateless/01593_concurrent_alter_mutations_kill.reference b/tests/queries/0_stateless/01593_concurrent_alter_mutations_kill.reference
index 94e15c09768..4b07f533f5a 100644
--- a/tests/queries/0_stateless/01593_concurrent_alter_mutations_kill.reference
+++ b/tests/queries/0_stateless/01593_concurrent_alter_mutations_kill.reference
@@ -1,2 +1,2 @@
-CREATE TABLE default.concurrent_mutate_kill\n(\n    `key` UInt64,\n    `value` Int64\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_01593/concurrent_mutate_kill\', \'1\')\nPARTITION BY key % 100\nORDER BY key\nSETTINGS max_replicated_mutations_in_queue = 1000, number_of_free_entries_in_pool_to_execute_mutation = 0, max_replicated_merges_in_queue = 1000, index_granularity = 8192
+CREATE TABLE default.concurrent_mutate_kill\n(\n    `key` UInt64,\n    `value` Int64\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/01593_concurrent_alter_mutations_kill_default/concurrent_mutate_kill\', \'1\')\nPARTITION BY key % 100\nORDER BY key\nSETTINGS max_replicated_mutations_in_queue = 1000, number_of_free_entries_in_pool_to_execute_mutation = 0, max_replicated_merges_in_queue = 1000, index_granularity = 8192
 499999500000
diff --git a/tests/queries/0_stateless/01593_concurrent_alter_mutations_kill.sh b/tests/queries/0_stateless/01593_concurrent_alter_mutations_kill.sh
index 6ae103bdf6e..d40406222c2 100755
--- a/tests/queries/0_stateless/01593_concurrent_alter_mutations_kill.sh
+++ b/tests/queries/0_stateless/01593_concurrent_alter_mutations_kill.sh
@@ -6,7 +6,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS concurrent_mutate_kill"
 
-$CLICKHOUSE_CLIENT --query "CREATE TABLE concurrent_mutate_kill (key UInt64, value String) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_01593/concurrent_mutate_kill', '1') ORDER BY key PARTITION BY key % 100 SETTINGS max_replicated_mutations_in_queue=1000, number_of_free_entries_in_pool_to_execute_mutation=0,max_replicated_merges_in_queue=1000"
+$CLICKHOUSE_CLIENT --query "CREATE TABLE concurrent_mutate_kill (key UInt64, value String) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/concurrent_mutate_kill', '1') ORDER BY key PARTITION BY key % 100 SETTINGS max_replicated_mutations_in_queue=1000, number_of_free_entries_in_pool_to_execute_mutation=0,max_replicated_merges_in_queue=1000"
 
 $CLICKHOUSE_CLIENT --query "INSERT INTO concurrent_mutate_kill SELECT number, toString(number) FROM numbers(1000000)"
 
diff --git a/tests/queries/0_stateless/01593_concurrent_alter_mutations_kill_many_replicas.reference b/tests/queries/0_stateless/01593_concurrent_alter_mutations_kill_many_replicas.reference
deleted file mode 100644
index cb1eace24a2..00000000000
--- a/tests/queries/0_stateless/01593_concurrent_alter_mutations_kill_many_replicas.reference
+++ /dev/null
@@ -1,16 +0,0 @@
-499999500000
-499999500000
-499999500000
-499999500000
-499999500000
-Metadata version on replica 1 equal with first replica, OK
-CREATE TABLE default.concurrent_kill_1\n(\n    `key` UInt64,\n    `value` Int64\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_01593_concurrent_kill\', \'1\')\nORDER BY key\nSETTINGS max_replicated_mutations_in_queue = 1000, number_of_free_entries_in_pool_to_execute_mutation = 0, max_replicated_merges_in_queue = 1000, index_granularity = 8192
-Metadata version on replica 2 equal with first replica, OK
-CREATE TABLE default.concurrent_kill_2\n(\n    `key` UInt64,\n    `value` Int64\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_01593_concurrent_kill\', \'2\')\nORDER BY key\nSETTINGS max_replicated_mutations_in_queue = 1000, number_of_free_entries_in_pool_to_execute_mutation = 0, max_replicated_merges_in_queue = 1000, index_granularity = 8192
-Metadata version on replica 3 equal with first replica, OK
-CREATE TABLE default.concurrent_kill_3\n(\n    `key` UInt64,\n    `value` Int64\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_01593_concurrent_kill\', \'3\')\nORDER BY key\nSETTINGS max_replicated_mutations_in_queue = 1000, number_of_free_entries_in_pool_to_execute_mutation = 0, max_replicated_merges_in_queue = 1000, index_granularity = 8192
-Metadata version on replica 4 equal with first replica, OK
-CREATE TABLE default.concurrent_kill_4\n(\n    `key` UInt64,\n    `value` Int64\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_01593_concurrent_kill\', \'4\')\nORDER BY key\nSETTINGS max_replicated_mutations_in_queue = 1000, number_of_free_entries_in_pool_to_execute_mutation = 0, max_replicated_merges_in_queue = 1000, index_granularity = 8192
-Metadata version on replica 5 equal with first replica, OK
-CREATE TABLE default.concurrent_kill_5\n(\n    `key` UInt64,\n    `value` Int64\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_01593_concurrent_kill\', \'5\')\nORDER BY key\nSETTINGS max_replicated_mutations_in_queue = 1000, number_of_free_entries_in_pool_to_execute_mutation = 0, max_replicated_merges_in_queue = 1000, index_granularity = 8192
-499999500000
diff --git a/tests/queries/0_stateless/01593_concurrent_alter_mutations_kill_many_replicas_long.reference b/tests/queries/0_stateless/01593_concurrent_alter_mutations_kill_many_replicas_long.reference
new file mode 100644
index 00000000000..f7c65e36be4
--- /dev/null
+++ b/tests/queries/0_stateless/01593_concurrent_alter_mutations_kill_many_replicas_long.reference
@@ -0,0 +1,16 @@
+499999500000
+499999500000
+499999500000
+499999500000
+499999500000
+Metadata version on replica 1 equal with first replica, OK
+CREATE TABLE default.concurrent_kill_1\n(\n    `key` UInt64,\n    `value` Int64\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/01593_concurrent_alter_mutations_kill_many_replicas_long_default/{shard}\', \'{replica}1\')\nORDER BY key\nSETTINGS max_replicated_mutations_in_queue = 1000, number_of_free_entries_in_pool_to_execute_mutation = 0, max_replicated_merges_in_queue = 1000, index_granularity = 8192
+Metadata version on replica 2 equal with first replica, OK
+CREATE TABLE default.concurrent_kill_2\n(\n    `key` UInt64,\n    `value` Int64\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/01593_concurrent_alter_mutations_kill_many_replicas_long_default/{shard}\', \'{replica}2\')\nORDER BY key\nSETTINGS max_replicated_mutations_in_queue = 1000, number_of_free_entries_in_pool_to_execute_mutation = 0, max_replicated_merges_in_queue = 1000, index_granularity = 8192
+Metadata version on replica 3 equal with first replica, OK
+CREATE TABLE default.concurrent_kill_3\n(\n    `key` UInt64,\n    `value` Int64\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/01593_concurrent_alter_mutations_kill_many_replicas_long_default/{shard}\', \'{replica}3\')\nORDER BY key\nSETTINGS max_replicated_mutations_in_queue = 1000, number_of_free_entries_in_pool_to_execute_mutation = 0, max_replicated_merges_in_queue = 1000, index_granularity = 8192
+Metadata version on replica 4 equal with first replica, OK
+CREATE TABLE default.concurrent_kill_4\n(\n    `key` UInt64,\n    `value` Int64\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/01593_concurrent_alter_mutations_kill_many_replicas_long_default/{shard}\', \'{replica}4\')\nORDER BY key\nSETTINGS max_replicated_mutations_in_queue = 1000, number_of_free_entries_in_pool_to_execute_mutation = 0, max_replicated_merges_in_queue = 1000, index_granularity = 8192
+Metadata version on replica 5 equal with first replica, OK
+CREATE TABLE default.concurrent_kill_5\n(\n    `key` UInt64,\n    `value` Int64\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/01593_concurrent_alter_mutations_kill_many_replicas_long_default/{shard}\', \'{replica}5\')\nORDER BY key\nSETTINGS max_replicated_mutations_in_queue = 1000, number_of_free_entries_in_pool_to_execute_mutation = 0, max_replicated_merges_in_queue = 1000, index_granularity = 8192
+499999500000
diff --git a/tests/queries/0_stateless/01593_concurrent_alter_mutations_kill_many_replicas.sh b/tests/queries/0_stateless/01593_concurrent_alter_mutations_kill_many_replicas_long.sh
similarity index 84%
rename from tests/queries/0_stateless/01593_concurrent_alter_mutations_kill_many_replicas.sh
rename to tests/queries/0_stateless/01593_concurrent_alter_mutations_kill_many_replicas_long.sh
index bfa68328c06..e263750c431 100755
--- a/tests/queries/0_stateless/01593_concurrent_alter_mutations_kill_many_replicas.sh
+++ b/tests/queries/0_stateless/01593_concurrent_alter_mutations_kill_many_replicas_long.sh
@@ -11,7 +11,10 @@ for i in $(seq $REPLICAS); do
 done
 
 for i in $(seq $REPLICAS); do
-    $CLICKHOUSE_CLIENT --query "CREATE TABLE concurrent_kill_$i (key UInt64, value String) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_01593_concurrent_kill', '$i') ORDER BY key SETTINGS max_replicated_mutations_in_queue=1000, number_of_free_entries_in_pool_to_execute_mutation=0,max_replicated_merges_in_queue=1000"
+    $CLICKHOUSE_CLIENT --query "CREATE TABLE concurrent_kill_$i (key UInt64, value String) ENGINE =
+    ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/{shard}', '{replica}$i') ORDER BY key
+    SETTINGS max_replicated_mutations_in_queue=1000, number_of_free_entries_in_pool_to_execute_mutation=0,max_replicated_merges_in_queue=1000"
+
 done
 
 $CLICKHOUSE_CLIENT --query "INSERT INTO concurrent_kill_1 SELECT number, toString(number) FROM numbers(1000000)"
@@ -77,9 +80,10 @@ while true; do
 done
 
 
-metadata_version=$($CLICKHOUSE_CLIENT --query "SELECT value FROM system.zookeeper WHERE path = '/clickhouse/tables/test_01593_concurrent_kill/replicas/$i/' and name = 'metadata_version'")
+metadata_version=$($CLICKHOUSE_CLIENT --query "SELECT value FROM system.zookeeper WHERE path = '/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/s1/replicas/r1$i/' and name = 'metadata_version'")
 for i in $(seq $REPLICAS); do
-    replica_metadata_version=$($CLICKHOUSE_CLIENT --query "SELECT value FROM system.zookeeper WHERE path = '/clickhouse/tables/test_01593_concurrent_kill/replicas/$i/' and name = 'metadata_version'")
+    replica_metadata_version=$($CLICKHOUSE_CLIENT --query "SELECT value FROM system.zookeeper WHERE path = '/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/s1/replicas/r1$i/' and name = 'metadata_version'")
+
     if [ "$metadata_version" != "$replica_metadata_version" ]; then
         echo "Metadata version on replica $i differs from the first replica, FAIL"
     else
diff --git a/tests/queries/0_stateless/01598_memory_limit_zeros.sql b/tests/queries/0_stateless/01598_memory_limit_zeros.sql
index e90d7bbccb7..a07ce0bcca3 100644
--- a/tests/queries/0_stateless/01598_memory_limit_zeros.sql
+++ b/tests/queries/0_stateless/01598_memory_limit_zeros.sql
@@ -1,2 +1,2 @@
-SET max_memory_usage = 1;
+SET max_memory_usage = 1, max_untracked_memory = 1000000;
 select 'test', count(*) from zeros_mt(1000000) where not ignore(zero); -- { serverError 241 }
diff --git a/tests/queries/0_stateless/01600_benchmark_query.sh b/tests/queries/0_stateless/01600_benchmark_query.sh
index a563c87a10f..1cf9cb23c3c 100755
--- a/tests/queries/0_stateless/01600_benchmark_query.sh
+++ b/tests/queries/0_stateless/01600_benchmark_query.sh
@@ -4,9 +4,10 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_BENCHMARK --iterations 10 --query "SELECT 1" 1>/dev/null 2>"$CLICKHOUSE_TMP"/err
+LOG="$CLICKHOUSE_TMP/err-$CLICKHOUSE_DATABASE"
+$CLICKHOUSE_BENCHMARK --iterations 10 --query "SELECT 1" 1>/dev/null 2>"$LOG"
 
-cat "$CLICKHOUSE_TMP"/err | grep Exception
-cat "$CLICKHOUSE_TMP"/err | grep Loaded
+cat "$LOG" | grep Exception
+cat "$LOG" | grep Loaded
 
-rm "$CLICKHOUSE_TMP"/err
+rm "$LOG"
diff --git a/tests/queries/0_stateless/01601_custom_tld.reference b/tests/queries/0_stateless/01601_custom_tld.reference
index 98b99778396..e056505f273 100644
--- a/tests/queries/0_stateless/01601_custom_tld.reference
+++ b/tests/queries/0_stateless/01601_custom_tld.reference
@@ -1,11 +1,24 @@
-no-tld
+-- no-tld
+
+foo.there-is-no-such-domain
+foo.there-is-no-such-domain
 
 foo.there-is-no-such-domain
 foo.there-is-no-such-domain
 foo
-generic
+-- generic
 kernel
 kernel.biz.ss
-difference
+-- difference
 biz.ss
 kernel.biz.ss
+-- 3+level
+xx.blogspot.co.at
+blogspot
+xx.blogspot.co.at
+blogspot
+-- url
+foobar.com
+foobar.com
+foobar.com
+xx.blogspot.co.at
diff --git a/tests/queries/0_stateless/01601_custom_tld.sql b/tests/queries/0_stateless/01601_custom_tld.sql
index 6d68299c07d..688dd419858 100644
--- a/tests/queries/0_stateless/01601_custom_tld.sql
+++ b/tests/queries/0_stateless/01601_custom_tld.sql
@@ -1,16 +1,31 @@
-select 'no-tld';
-select cutToFirstSignificantSubdomainCustom('there-is-no-such-domain', 'public_suffix_list');
+select '-- no-tld';
 -- even if there is no TLD, 2-nd level by default anyway
 -- FIXME: make this behavior optional (so that TLD for host never changed, either empty or something real)
+select cutToFirstSignificantSubdomain('there-is-no-such-domain');
+select cutToFirstSignificantSubdomain('foo.there-is-no-such-domain');
+select cutToFirstSignificantSubdomain('bar.foo.there-is-no-such-domain');
+select cutToFirstSignificantSubdomainCustom('there-is-no-such-domain', 'public_suffix_list');
 select cutToFirstSignificantSubdomainCustom('foo.there-is-no-such-domain', 'public_suffix_list');
 select cutToFirstSignificantSubdomainCustom('bar.foo.there-is-no-such-domain', 'public_suffix_list');
 select firstSignificantSubdomainCustom('bar.foo.there-is-no-such-domain', 'public_suffix_list');
 
-select 'generic';
-select firstSignificantSubdomainCustom('foo.kernel.biz.ss', 'public_suffix_list'); -- kernel.biz.ss
+select '-- generic';
+select firstSignificantSubdomainCustom('foo.kernel.biz.ss', 'public_suffix_list'); -- kernel
 select cutToFirstSignificantSubdomainCustom('foo.kernel.biz.ss', 'public_suffix_list'); -- kernel.biz.ss
 
-select 'difference';
+select '-- difference';
 -- biz.ss is not in the default TLD list, hence:
 select cutToFirstSignificantSubdomain('foo.kernel.biz.ss'); -- biz.ss
 select cutToFirstSignificantSubdomainCustom('foo.kernel.biz.ss', 'public_suffix_list'); -- kernel.biz.ss
+
+select '-- 3+level';
+select cutToFirstSignificantSubdomainCustom('xx.blogspot.co.at', 'public_suffix_list'); -- xx.blogspot.co.at
+select firstSignificantSubdomainCustom('xx.blogspot.co.at', 'public_suffix_list'); -- blogspot
+select cutToFirstSignificantSubdomainCustom('foo.bar.xx.blogspot.co.at', 'public_suffix_list'); -- xx.blogspot.co.at
+select firstSignificantSubdomainCustom('foo.bar.xx.blogspot.co.at', 'public_suffix_list'); -- blogspot
+
+select '-- url';
+select cutToFirstSignificantSubdomainCustom('http://foobar.com', 'public_suffix_list');
+select cutToFirstSignificantSubdomainCustom('http://foobar.com/foo', 'public_suffix_list');
+select cutToFirstSignificantSubdomainCustom('http://bar.foobar.com/foo', 'public_suffix_list');
+select cutToFirstSignificantSubdomainCustom('http://xx.blogspot.co.at', 'public_suffix_list');
diff --git a/tests/queries/0_stateless/01602_max_distributed_connections.reference b/tests/queries/0_stateless/01602_max_distributed_connections.reference
index e69de29bb2d..7326d960397 100644
--- a/tests/queries/0_stateless/01602_max_distributed_connections.reference
+++ b/tests/queries/0_stateless/01602_max_distributed_connections.reference
@@ -0,0 +1 @@
+Ok
diff --git a/tests/queries/0_stateless/01602_max_distributed_connections.sh b/tests/queries/0_stateless/01602_max_distributed_connections.sh
index 93c6071c091..772acb39344 100755
--- a/tests/queries/0_stateless/01602_max_distributed_connections.sh
+++ b/tests/queries/0_stateless/01602_max_distributed_connections.sh
@@ -4,13 +4,31 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-common_opts=(
-    "--format=Null"
+# We check that even if max_threads is small, the setting max_distributed_connections
+# will allow to process queries on multiple shards concurrently.
 
-    "--max_threads=1"
-    "--max_distributed_connections=3"
-)
+# We do sleep 1.5 seconds on ten machines.
+# If concurrency is one (bad) the query will take at least 15 seconds and the following loops are guaranteed to be infinite.
+# If concurrency is 10 (good), the query may take less than 10 second with non-zero probability
+#  and the following loops will finish with probability 1 assuming independent random variables.
 
-# NOTE: the test use higher timeout to avoid flakiness.
-timeout 9s ${CLICKHOUSE_CLIENT} "$@" "${common_opts[@]}" -q "select sleep(3) from remote('127.{1,2,3,4,5}', system.one)" --prefer_localhost_replica=0
-timeout 9s ${CLICKHOUSE_CLIENT} "$@" "${common_opts[@]}" -q "select sleep(3) from remote('127.{1,2,3,4,5}', system.one)" --prefer_localhost_replica=1
+while true; do
+    timeout 10 ${CLICKHOUSE_CLIENT} --max_threads 1 --max_distributed_connections 10 --query "
+        SELECT sleep(1.5) FROM remote('127.{1..10}', system.one) FORMAT Null" --prefer_localhost_replica=0 && break
+done
+
+while true; do
+    timeout 10 ${CLICKHOUSE_CLIENT} --max_threads 1 --max_distributed_connections 10 --query "
+        SELECT sleep(1.5) FROM remote('127.{1..10}', system.one) FORMAT Null" --prefer_localhost_replica=1 && break
+done
+
+# If max_distributed_connections is low and async_socket_for_remote is disabled,
+#  the concurrency of distributed queries will be also low.
+
+timeout 1 ${CLICKHOUSE_CLIENT} --max_threads 1 --max_distributed_connections 1 --async_socket_for_remote 0 --query "
+    SELECT sleep(0.15) FROM remote('127.{1..10}', system.one) FORMAT Null" --prefer_localhost_replica=0 && echo 'Fail'
+
+timeout 1 ${CLICKHOUSE_CLIENT} --max_threads 1 --max_distributed_connections 1 --async_socket_for_remote 0 --query "
+    SELECT sleep(0.15) FROM remote('127.{1..10}', system.one) FORMAT Null" --prefer_localhost_replica=1 && echo 'Fail'
+
+echo 'Ok'
diff --git a/tests/queries/0_stateless/01604_explain_ast_of_nonselect_query.reference b/tests/queries/0_stateless/01604_explain_ast_of_nonselect_query.reference
index e674ac5fabb..6ae67d7d9ad 100644
--- a/tests/queries/0_stateless/01604_explain_ast_of_nonselect_query.reference
+++ b/tests/queries/0_stateless/01604_explain_ast_of_nonselect_query.reference
@@ -1,6 +1,6 @@
 AlterQuery  t1 (children 1)
  ExpressionList (children 1)
-  AlterCommand 25 (children 1)
+  AlterCommand 27 (children 1)
    Function equals (children 1)
     ExpressionList (children 2)
      Identifier date
diff --git a/tests/queries/0_stateless/01605_skip_idx_compact_parts.sql b/tests/queries/0_stateless/01605_skip_idx_compact_parts.sql
index db28b7f9438..d57ccdcf9fc 100644
--- a/tests/queries/0_stateless/01605_skip_idx_compact_parts.sql
+++ b/tests/queries/0_stateless/01605_skip_idx_compact_parts.sql
@@ -3,14 +3,14 @@ CREATE TABLE skip_idx_comp_parts (a Int, b Int, index b_idx b TYPE minmax GRANUL
     ENGINE = MergeTree ORDER BY a
     SETTINGS index_granularity=256, merge_max_block_size=100;
 
-SYSTEM STOP MERGES;
+SYSTEM STOP MERGES skip_idx_comp_parts;
 
 INSERT INTO skip_idx_comp_parts SELECT number, number FROM numbers(200);
 INSERT INTO skip_idx_comp_parts SELECT number, number FROM numbers(200);
 INSERT INTO skip_idx_comp_parts SELECT number, number FROM numbers(200);
 INSERT INTO skip_idx_comp_parts SELECT number, number FROM numbers(200);
 
-SYSTEM START MERGES;
+SYSTEM START MERGES skip_idx_comp_parts;
 OPTIMIZE TABLE skip_idx_comp_parts FINAL;
 
 SELECT count() FROM skip_idx_comp_parts WHERE b > 100;
diff --git a/tests/queries/0_stateless/01631_date_overflow_as_partition_key.reference b/tests/queries/0_stateless/01631_date_overflow_as_partition_key.reference
index dbcd92da11c..62f620f3ba9 100644
--- a/tests/queries/0_stateless/01631_date_overflow_as_partition_key.reference
+++ b/tests/queries/0_stateless/01631_date_overflow_as_partition_key.reference
@@ -1,2 +1,2 @@
-1970-01-01	1
-1970-01-01	1
+2106-11-11	1
+2106-11-12	1
diff --git a/tests/queries/0_stateless/01631_date_overflow_as_partition_key.sql b/tests/queries/0_stateless/01631_date_overflow_as_partition_key.sql
index f252e10806a..9a8d37084fb 100644
--- a/tests/queries/0_stateless/01631_date_overflow_as_partition_key.sql
+++ b/tests/queries/0_stateless/01631_date_overflow_as_partition_key.sql
@@ -6,6 +6,6 @@ insert into dt_overflow values('2106-11-11', 1);
 
 insert into dt_overflow values('2106-11-12', 1);
 
-select * from dt_overflow;
+select * from dt_overflow ORDER BY d;
 
 drop table if exists dt_overflow;
diff --git a/tests/queries/0_stateless/01637_nullable_fuzz3.reference b/tests/queries/0_stateless/01637_nullable_fuzz3.reference
index d9cf16b9d2a..795a0159ac8 100644
--- a/tests/queries/0_stateless/01637_nullable_fuzz3.reference
+++ b/tests/queries/0_stateless/01637_nullable_fuzz3.reference
@@ -1,2 +1,6 @@
 
 0
+
+0
+
+0	0	0
diff --git a/tests/queries/0_stateless/01637_nullable_fuzz3.sql b/tests/queries/0_stateless/01637_nullable_fuzz3.sql
index 21bf8999eae..6cfd0fc7d1c 100644
--- a/tests/queries/0_stateless/01637_nullable_fuzz3.sql
+++ b/tests/queries/0_stateless/01637_nullable_fuzz3.sql
@@ -1,4 +1,6 @@
 DROP TABLE IF EXISTS t;
 CREATE TABLE t (`item_id` UInt64, `price_sold` Float32, `date` Date) ENGINE = MergeTree ORDER BY item_id;
 SELECT item_id FROM (SELECT item_id FROM t GROUP BY item_id WITH TOTALS) AS l FULL OUTER JOIN (SELECT item_id FROM t GROUP BY item_id WITH TOTALS) AS r USING (item_id);
+SELECT item_id FROM (SELECT item_id FROM t GROUP BY item_id WITH TOTALS) AS l FULL OUTER JOIN (SELECT item_id FROM t GROUP BY item_id WITH TOTALS) AS r USING (item_id) SETTINGS join_use_nulls = '1';
+SELECT * FROM (SELECT item_id, sum(price_sold) as price_sold FROM t GROUP BY item_id WITH TOTALS) AS l FULL OUTER JOIN (SELECT item_id, sum(price_sold) as price_sold FROM t GROUP BY item_id WITH TOTALS) AS r USING (item_id) SETTINGS join_use_nulls = '1';
 DROP TABLE t;
diff --git a/tests/queries/0_stateless/01643_merge_tree_fsync_smoke.reference b/tests/queries/0_stateless/01643_merge_tree_fsync_smoke.reference
index 654db9dbc86..f57d5df6efd 100644
--- a/tests/queries/0_stateless/01643_merge_tree_fsync_smoke.reference
+++ b/tests/queries/0_stateless/01643_merge_tree_fsync_smoke.reference
@@ -10,3 +10,5 @@ wide fsync_after_insert,fsync_part_directory
 1
 memory in_memory_parts_insert_sync
 1
+wide fsync_part_directory,vertical
+1
diff --git a/tests/queries/0_stateless/01643_merge_tree_fsync_smoke.sql b/tests/queries/0_stateless/01643_merge_tree_fsync_smoke.sql
index 21ebb607693..644cf063a33 100644
--- a/tests/queries/0_stateless/01643_merge_tree_fsync_smoke.sql
+++ b/tests/queries/0_stateless/01643_merge_tree_fsync_smoke.sql
@@ -4,34 +4,47 @@ select 'default';
 create table data_01643 (key Int) engine=MergeTree() order by key;
 insert into data_01643 values (1);
 select * from data_01643;
+optimize table data_01643 final;
 drop table data_01643;
 
 select 'compact fsync_after_insert';
 create table data_01643 (key Int) engine=MergeTree() order by key settings min_rows_for_wide_part=2, fsync_after_insert=1;
 insert into data_01643 values (1);
 select * from data_01643;
+optimize table data_01643 final;
 drop table data_01643;
 
 select 'compact fsync_after_insert,fsync_part_directory';
 create table data_01643 (key Int) engine=MergeTree() order by key settings min_rows_for_wide_part=2, fsync_after_insert=1, fsync_part_directory=1;
 insert into data_01643 values (1);
 select * from data_01643;
+optimize table data_01643 final;
 drop table data_01643;
 
 select 'wide fsync_after_insert';
 create table data_01643 (key Int) engine=MergeTree() order by key settings min_bytes_for_wide_part=0, fsync_after_insert=1;
 insert into data_01643 values (1);
 select * from data_01643;
+optimize table data_01643 final;
 drop table data_01643;
 
 select 'wide fsync_after_insert,fsync_part_directory';
 create table data_01643 (key Int) engine=MergeTree() order by key settings min_bytes_for_wide_part=0, fsync_after_insert=1, fsync_part_directory=1;
 insert into data_01643 values (1);
 select * from data_01643;
+optimize table data_01643 final;
 drop table data_01643;
 
 select 'memory in_memory_parts_insert_sync';
 create table data_01643 (key Int) engine=MergeTree() order by key settings min_rows_for_compact_part=2, in_memory_parts_insert_sync=1, fsync_after_insert=1, fsync_part_directory=1;
 insert into data_01643 values (1);
 select * from data_01643;
+optimize table data_01643 final;
+drop table data_01643;
+
+select 'wide fsync_part_directory,vertical';
+create table data_01643 (key Int) engine=MergeTree() order by key settings min_bytes_for_wide_part=0, fsync_part_directory=1, enable_vertical_merge_algorithm=1, vertical_merge_algorithm_min_rows_to_activate=1, vertical_merge_algorithm_min_columns_to_activate=1;
+insert into data_01643 values (1);
+select * from data_01643;
+optimize table data_01643 final;
 drop table data_01643;
diff --git a/tests/queries/0_stateless/01649_with_alias_key_condition.sql b/tests/queries/0_stateless/01649_with_alias_key_condition.sql
index b813e6ee84f..0a796f8512e 100644
--- a/tests/queries/0_stateless/01649_with_alias_key_condition.sql
+++ b/tests/queries/0_stateless/01649_with_alias_key_condition.sql
@@ -6,6 +6,6 @@ insert into alias_key_condition values (1, 2), (3, 4);
 
 set force_primary_key = 1;
 
-with i as k select * from alias_key_condition where k = 3;
+with i as k select * from alias_key_condition where k = (select i from alias_key_condition where i = 3);
 
 drop table if exists alias_key_condition;
diff --git a/tests/queries/0_stateless/01651_bugs_from_15889.reference b/tests/queries/0_stateless/01651_bugs_from_15889.reference
index 77ac542d4fb..28271a697e2 100644
--- a/tests/queries/0_stateless/01651_bugs_from_15889.reference
+++ b/tests/queries/0_stateless/01651_bugs_from_15889.reference
@@ -1,2 +1,3 @@
 0
+0
 
diff --git a/tests/queries/0_stateless/01651_bugs_from_15889.sql b/tests/queries/0_stateless/01651_bugs_from_15889.sql
index 1fbf669a1b8..97da4d78ab6 100644
--- a/tests/queries/0_stateless/01651_bugs_from_15889.sql
+++ b/tests/queries/0_stateless/01651_bugs_from_15889.sql
@@ -8,7 +8,7 @@ INSERT INTO xp SELECT '2020-01-01', number, '' FROM numbers(100000);
 
 CREATE TABLE xp_d AS xp ENGINE = Distributed(test_shard_localhost, currentDatabase(), xp);
 
-SELECT count(7 = (SELECT number FROM numbers(0) ORDER BY number ASC NULLS FIRST LIMIT 7)) FROM xp_d PREWHERE toYYYYMM(A) GLOBAL IN (SELECT NULL = (SELECT number FROM numbers(1) ORDER BY number DESC NULLS LAST LIMIT 1), toYYYYMM(min(A)) FROM xp_d) WHERE B > NULL; -- { serverError 20 }
+SELECT count(7 = (SELECT number FROM numbers(0) ORDER BY number ASC NULLS FIRST LIMIT 7)) FROM xp_d PREWHERE toYYYYMM(A) GLOBAL IN (SELECT NULL = (SELECT number FROM numbers(1) ORDER BY number DESC NULLS LAST LIMIT 1), toYYYYMM(min(A)) FROM xp_d) WHERE B > NULL; -- B > NULL is evaluated to 0 and this works
 
 SELECT count() FROM xp_d WHERE A GLOBAL IN (SELECT NULL); -- { serverError 53 }
 
diff --git a/tests/queries/0_stateless/01653_move_conditions_from_join_on_to_where.reference b/tests/queries/0_stateless/01653_move_conditions_from_join_on_to_where.reference
deleted file mode 100644
index 19487c9f942..00000000000
--- a/tests/queries/0_stateless/01653_move_conditions_from_join_on_to_where.reference
+++ /dev/null
@@ -1,140 +0,0 @@
----------Q1----------
-2	2	2	20
-SELECT
-    a,
-    b,
-    table2.a,
-    table2.b
-FROM table1
-ALL INNER JOIN 
-(
-    SELECT
-        a,
-        b
-    FROM table2
-) AS table2 ON a = table2.a
-WHERE table2.b = toUInt32(20)
----------Q2----------
-2	2	2	20
-SELECT
-    a,
-    b,
-    table2.a,
-    table2.b
-FROM table1
-ALL INNER JOIN 
-(
-    SELECT
-        a,
-        b
-    FROM table2
-) AS table2 ON a = table2.a
-WHERE (table2.a < table2.b) AND (table2.b = toUInt32(20))
----------Q3----------
----------Q4----------
-6	40
-SELECT
-    a,
-    table2.b
-FROM table1
-ALL INNER JOIN 
-(
-    SELECT
-        a,
-        b
-    FROM table2
-) AS table2 ON a = toUInt32(10 - table2.a)
-WHERE (b = 6) AND (table2.b > 20)
----------Q5----------
-SELECT
-    a,
-    table2.b
-FROM table1
-ALL INNER JOIN 
-(
-    SELECT
-        a,
-        b
-    FROM table2
-    WHERE 0
-) AS table2 ON a = table2.a
-WHERE 0
----------Q6----------
----------Q7----------
-0	0	0	0
-SELECT
-    a,
-    b,
-    table2.a,
-    table2.b
-FROM table1
-ALL INNER JOIN 
-(
-    SELECT
-        a,
-        b
-    FROM table2
-) AS table2 ON a = table2.a
-WHERE (table2.b < toUInt32(40)) AND (b < 1)
----------Q8----------
----------Q9---will not be optimized----------
-SELECT
-    a,
-    b,
-    table2.a,
-    table2.b
-FROM table1
-ALL LEFT JOIN 
-(
-    SELECT
-        a,
-        b
-    FROM table2
-) AS table2 ON (a = table2.a) AND (b = toUInt32(10))
-SELECT
-    a,
-    b,
-    table2.a,
-    table2.b
-FROM table1
-ALL RIGHT JOIN 
-(
-    SELECT
-        a,
-        b
-    FROM table2
-) AS table2 ON (a = table2.a) AND (b = toUInt32(10))
-SELECT
-    a,
-    b,
-    table2.a,
-    table2.b
-FROM table1
-ALL FULL OUTER JOIN 
-(
-    SELECT
-        a,
-        b
-    FROM table2
-) AS table2 ON (a = table2.a) AND (b = toUInt32(10))
-SELECT
-    a,
-    b,
-    table2.a,
-    table2.b
-FROM table1
-ALL FULL OUTER JOIN 
-(
-    SELECT
-        a,
-        b
-    FROM table2
-) AS table2 ON (a = table2.a) AND (table2.b = toUInt32(10))
-WHERE a < toUInt32(20)
-SELECT
-    a,
-    b,
-    table2.a,
-    table2.b
-FROM table1
-CROSS JOIN table2
diff --git a/tests/queries/0_stateless/01653_move_conditions_from_join_on_to_where.sql b/tests/queries/0_stateless/01653_move_conditions_from_join_on_to_where.sql
deleted file mode 100644
index 23871a9c47c..00000000000
--- a/tests/queries/0_stateless/01653_move_conditions_from_join_on_to_where.sql
+++ /dev/null
@@ -1,48 +0,0 @@
-DROP TABLE IF EXISTS table1;
-DROP TABLE IF EXISTS table2;
-
-CREATE TABLE table1 (a UInt32, b UInt32) ENGINE = Memory;
-CREATE TABLE table2 (a UInt32, b UInt32) ENGINE = Memory;
-
-INSERT INTO table1 SELECT number, number FROM numbers(10);
-INSERT INTO table2 SELECT number * 2, number * 20 FROM numbers(6);
-
-SELECT '---------Q1----------';
-SELECT * FROM table1 JOIN table2 ON (table1.a = table2.a) AND (table2.b = toUInt32(20));
-EXPLAIN SYNTAX SELECT * FROM table1 JOIN table2 ON (table1.a = table2.a) AND (table2.b = toUInt32(20));
-
-SELECT '---------Q2----------';
-SELECT * FROM table1 JOIN table2 ON (table1.a = table2.a) AND (table2.a < table2.b) AND (table2.b = toUInt32(20));
-EXPLAIN SYNTAX SELECT * FROM table1 JOIN table2 ON (table1.a = table2.a) AND (table2.a < table2.b) AND (table2.b = toUInt32(20));
-
-SELECT '---------Q3----------';
-SELECT * FROM table1 JOIN table2 ON (table1.a = toUInt32(table2.a + 5)) AND (table2.a < table1.b) AND (table2.b > toUInt32(20)); -- { serverError 48 }
-
-SELECT '---------Q4----------';
-SELECT table1.a, table2.b FROM table1 INNER JOIN table2 ON (table1.a = toUInt32(10 - table2.a)) AND (table1.b = 6) AND (table2.b > 20);
-EXPLAIN SYNTAX SELECT table1.a, table2.b FROM table1 INNER JOIN table2 ON (table1.a = toUInt32(10 - table2.a)) AND (table1.b = 6) AND (table2.b > 20);
-
-SELECT '---------Q5----------';
-SELECT table1.a, table2.b FROM table1 JOIN table2 ON (table1.a = table2.a) AND (table1.b = 6) AND (table2.b > 20) AND (10 < 6);
-EXPLAIN SYNTAX SELECT table1.a, table2.b FROM table1 JOIN table2 ON (table1.a = table2.a) AND (table1.b = 6) AND (table2.b > 20) AND (10 < 6);
-
-SELECT '---------Q6----------';
-SELECT table1.a, table2.b FROM table1 JOIN table2 ON (table1.b = 6) AND (table2.b > 20); -- { serverError 403 } 
-
-SELECT '---------Q7----------';
-SELECT * FROM table1 JOIN table2 ON (table1.a = table2.a) AND (table2.b < toUInt32(40)) where table1.b < 1;
-EXPLAIN SYNTAX SELECT * FROM table1 JOIN table2 ON (table1.a = table2.a) AND (table2.b < toUInt32(40)) where table1.b < 1;
-SELECT * FROM table1 JOIN table2 ON (table1.a = table2.a) AND (table2.b < toUInt32(40)) where table1.b > 10;
-
-SELECT '---------Q8----------';
-SELECT * FROM table1 INNER JOIN table2 ON (table1.a = table2.a) AND (table2.b < toUInt32(table1, 10)); -- { serverError 47 }
-
-SELECT '---------Q9---will not be optimized----------';
-EXPLAIN SYNTAX SELECT * FROM table1 LEFT JOIN table2 ON (table1.a = table2.a) AND (table1.b = toUInt32(10));
-EXPLAIN SYNTAX SELECT * FROM table1 RIGHT JOIN table2 ON (table1.a = table2.a) AND (table1.b = toUInt32(10));
-EXPLAIN SYNTAX SELECT * FROM table1 FULL JOIN table2 ON (table1.a = table2.a) AND (table1.b = toUInt32(10));
-EXPLAIN SYNTAX SELECT * FROM table1 FULL JOIN table2 ON (table1.a = table2.a) AND (table2.b = toUInt32(10)) WHERE table1.a < toUInt32(20);
-EXPLAIN SYNTAX SELECT * FROM table1 , table2;
-
-DROP TABLE table1;
-DROP TABLE table2;
diff --git a/tests/queries/0_stateless/01655_plan_optimizations.reference b/tests/queries/0_stateless/01655_plan_optimizations.reference
index fda40305f9d..22f5a2e73e3 100644
--- a/tests/queries/0_stateless/01655_plan_optimizations.reference
+++ b/tests/queries/0_stateless/01655_plan_optimizations.reference
@@ -1,7 +1,9 @@
-sipHash should be calculated after filtration
+Too many optimizations applied to query plan
+Too many optimizations applied to query plan
+> sipHash should be calculated after filtration
 FUNCTION sipHash64
 Filter column: equals
-sorting steps should know about limit
+> sorting steps should know about limit
 Limit 10
 MergingSorted
 Limit 10
@@ -9,3 +11,138 @@ MergeSorting
 Limit 10
 PartialSorting
 Limit 10
+-- filter push down --
+> filter should be pushed down after aggregating
+Aggregating
+Filter
+0	1
+1	2
+2	3
+3	4
+4	5
+5	6
+6	7
+7	8
+8	9
+9	10
+> filter should be pushed down after aggregating, column after aggregation is const
+COLUMN Const(UInt8) -> notEquals(y, 0)
+Aggregating
+Filter
+Filter
+0	1	1
+1	2	1
+2	3	1
+3	4	1
+4	5	1
+5	6	1
+6	7	1
+7	8	1
+8	9	1
+9	10	1
+> one condition of filter should be pushed down after aggregating, other condition is aliased
+Filter column
+ALIAS notEquals(s, 4) :: 1 -> and(notEquals(y, 0), notEquals(s, 4))
+Aggregating
+Filter column: notEquals(y, 0)
+0	1
+1	2
+2	3
+3	4
+5	6
+6	7
+7	8
+8	9
+9	10
+> one condition of filter should be pushed down after aggregating, other condition is casted
+Filter column
+FUNCTION CAST(minus(s, 4) :: 1, UInt8 :: 3) -> and(notEquals(y, 0), minus(s, 4))
+Aggregating
+Filter column: notEquals(y, 0)
+0	1
+1	2
+2	3
+3	4
+5	6
+6	7
+7	8
+8	9
+9	10
+> one condition of filter should be pushed down after aggregating, other two conditions are ANDed
+Filter column
+FUNCTION and(minus(s, 8) :: 1, minus(s, 4) :: 2) -> and(notEquals(y, 0), minus(s, 8), minus(s, 4))
+Aggregating
+Filter column: notEquals(y, 0)
+0	1
+1	2
+2	3
+3	4
+5	6
+6	7
+7	8
+9	10
+> two conditions of filter should be pushed down after aggregating and ANDed, one condition is aliased
+Filter column
+ALIAS notEquals(s, 8) :: 1 -> and(notEquals(y, 0), notEquals(s, 8), minus(y, 4))
+Aggregating
+Filter column: and(notEquals(y, 0), minus(y, 4))
+0	1
+1	2
+2	3
+4	5
+5	6
+6	7
+7	8
+9	10
+> filter is split, one part is filtered before ARRAY JOIN
+Filter column: and(notEquals(y, 2), notEquals(x, 0))
+ARRAY JOIN x
+Filter column: notEquals(y, 2)
+1	3
+> filter is pushed down before Distinct
+Distinct
+Distinct
+Filter column: notEquals(y, 2)
+0	0
+0	1
+1	0
+1	1
+> filter is pushed down before sorting steps
+MergingSorted
+MergeSorting
+PartialSorting
+Filter column: and(notEquals(x, 0), notEquals(y, 0))
+1	2
+1	1
+> filter is pushed down before TOTALS HAVING and aggregating
+TotalsHaving
+Aggregating
+Filter column: notEquals(y, 2)
+0	12
+1	15
+3	10
+
+0	37
+> filter is pushed down before CreatingSets
+CreatingSets
+Filter
+Filter
+1
+3
+> one condition of filter is pushed down before LEFT JOIN
+Join
+Filter column: notEquals(number, 1)
+Join
+0	0
+3	3
+> one condition of filter is pushed down before INNER JOIN
+Join
+Filter column: notEquals(number, 1)
+Join
+3	3
+> filter is pushed down before UNION
+Union
+Filter
+Filter
+2	3
+2	3
diff --git a/tests/queries/0_stateless/01655_plan_optimizations.sh b/tests/queries/0_stateless/01655_plan_optimizations.sh
index 4f3541f9dde..148e6157773 100755
--- a/tests/queries/0_stateless/01655_plan_optimizations.sh
+++ b/tests/queries/0_stateless/01655_plan_optimizations.sh
@@ -4,7 +4,195 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-echo "sipHash should be calculated after filtration"
+$CLICKHOUSE_CLIENT -q "select x + 1 from (select y + 2 as x from (select dummy + 3 as y)) settings query_plan_max_optimizations_to_apply = 1" 2>&1 |
+     grep -o "Too many optimizations applied to query plan"
+
+echo "> sipHash should be calculated after filtration"
 $CLICKHOUSE_CLIENT -q "explain actions = 1 select sum(x), sum(y) from (select sipHash64(number) as x, bitAnd(number, 1024) as y from numbers_mt(1000000000) limit 1000000000) where y = 0" | grep -o "FUNCTION sipHash64\|Filter column: equals"
-echo "sorting steps should know about limit"
+echo "> sorting steps should know about limit"
 $CLICKHOUSE_CLIENT -q "explain actions = 1 select number from (select number from numbers(500000000) order by -number) limit 10" | grep -o "MergingSorted\|MergeSorting\|PartialSorting\|Limit 10"
+
+echo "-- filter push down --"
+echo "> filter should be pushed down after aggregating"
+$CLICKHOUSE_CLIENT -q "
+    explain select * from (select sum(x), y from (
+        select number as x, number + 1 as y from numbers(10)) group by y
+    ) where y != 0
+    settings enable_optimize_predicate_expression=0" | grep -o "Aggregating\|Filter"
+$CLICKHOUSE_CLIENT -q "
+    select s, y from (select sum(x) as s, y from (
+        select number as x, number + 1 as y from numbers(10)) group by y
+    ) where y != 0 order by s, y
+    settings enable_optimize_predicate_expression=0"
+
+echo "> filter should be pushed down after aggregating, column after aggregation is const"
+$CLICKHOUSE_CLIENT -q "
+    explain actions = 1 select s, y, y != 0 from (select sum(x) as s, y from (
+        select number as x, number + 1 as y from numbers(10)) group by y
+    ) where y != 0
+    settings enable_optimize_predicate_expression=0" | grep -o "Aggregating\|Filter\|COLUMN Const(UInt8) -> notEquals(y, 0)"
+$CLICKHOUSE_CLIENT -q "
+    select s, y, y != 0 from (select sum(x) as s, y from (
+        select number as x, number + 1 as y from numbers(10)) group by y
+    ) where y != 0 order by s, y, y != 0
+    settings enable_optimize_predicate_expression=0"
+
+echo "> one condition of filter should be pushed down after aggregating, other condition is aliased"
+$CLICKHOUSE_CLIENT -q "
+    explain actions = 1 select s, y from (
+        select sum(x) as s, y from (select number as x, number + 1 as y from numbers(10)) group by y
+    ) where y != 0 and s != 4
+    settings enable_optimize_predicate_expression=0" |
+    grep -o "Aggregating\|Filter column\|Filter column: notEquals(y, 0)\|ALIAS notEquals(s, 4) :: 1 -> and(notEquals(y, 0), notEquals(s, 4))"
+$CLICKHOUSE_CLIENT -q "
+    select s, y from (
+        select sum(x) as s, y from (select number as x, number + 1 as y from numbers(10)) group by y
+    ) where y != 0 and s != 4 order by s, y
+    settings enable_optimize_predicate_expression=0"
+
+echo "> one condition of filter should be pushed down after aggregating, other condition is casted"
+$CLICKHOUSE_CLIENT -q "
+    explain actions = 1 select s, y from (
+        select sum(x) as s, y from (select number as x, number + 1 as y from numbers(10)) group by y
+    ) where y != 0 and s - 4
+    settings enable_optimize_predicate_expression=0" |
+    grep -o "Aggregating\|Filter column\|Filter column: notEquals(y, 0)\|FUNCTION CAST(minus(s, 4) :: 1, UInt8 :: 3) -> and(notEquals(y, 0), minus(s, 4))"
+$CLICKHOUSE_CLIENT -q "
+    select s, y from (
+        select sum(x) as s, y from (select number as x, number + 1 as y from numbers(10)) group by y
+    ) where y != 0 and s - 4 order by s, y
+    settings enable_optimize_predicate_expression=0"
+
+echo "> one condition of filter should be pushed down after aggregating, other two conditions are ANDed"
+$CLICKHOUSE_CLIENT -q "
+    explain actions = 1 select s, y from (
+        select sum(x) as s, y from (select number as x, number + 1 as y from numbers(10)) group by y
+    ) where y != 0 and s - 8 and s - 4
+    settings enable_optimize_predicate_expression=0" |
+    grep -o "Aggregating\|Filter column\|Filter column: notEquals(y, 0)\|FUNCTION and(minus(s, 8) :: 1, minus(s, 4) :: 2) -> and(notEquals(y, 0), minus(s, 8), minus(s, 4))"
+$CLICKHOUSE_CLIENT -q "
+    select s, y from (
+        select sum(x) as s, y from (select number as x, number + 1 as y from numbers(10)) group by y
+    ) where y != 0 and s - 8 and s - 4 order by s, y
+    settings enable_optimize_predicate_expression=0"
+
+echo "> two conditions of filter should be pushed down after aggregating and ANDed, one condition is aliased"
+$CLICKHOUSE_CLIENT -q "
+    explain actions = 1 select s, y from (
+        select sum(x) as s, y from (select number as x, number + 1 as y from numbers(10)) group by y
+    ) where y != 0 and s != 8 and y - 4
+    settings enable_optimize_predicate_expression=0" |
+    grep -o "Aggregating\|Filter column\|Filter column: and(notEquals(y, 0), minus(y, 4))\|ALIAS notEquals(s, 8) :: 1 -> and(notEquals(y, 0), notEquals(s, 8), minus(y, 4))"
+$CLICKHOUSE_CLIENT -q "
+    select s, y from (
+        select sum(x) as s, y from (select number as x, number + 1 as y from numbers(10)) group by y
+    ) where y != 0 and s != 8 and y - 4 order by s, y
+    settings enable_optimize_predicate_expression=0"
+
+echo "> filter is split, one part is filtered before ARRAY JOIN"
+$CLICKHOUSE_CLIENT -q "
+    explain actions = 1 select x, y from (
+        select range(number) as x, number + 1 as y from numbers(3)
+    ) array join x where y != 2 and x != 0" |
+    grep -o "Filter column: and(notEquals(y, 2), notEquals(x, 0))\|ARRAY JOIN x\|Filter column: notEquals(y, 2)"
+$CLICKHOUSE_CLIENT -q "
+    select x, y from (
+        select range(number) as x, number + 1 as y from numbers(3)
+    ) array join x where y != 2 and x != 0 order by x, y"
+
+# echo "> filter is split, one part is filtered before Aggregating and Cube"
+# $CLICKHOUSE_CLIENT -q "
+#     explain actions = 1 select * from (
+#         select sum(x) as s, x, y from (select number as x, number + 1 as y from numbers(10)) group by x, y　with cube
+#     ) where y != 0 and s != 4
+#     settings enable_optimize_predicate_expression=0" |
+#     grep -o "Cube\|Aggregating\|Filter column: notEquals(y, 0)"
+# $CLICKHOUSE_CLIENT -q "
+#     select s, x, y from (
+#         select sum(x) as s, x, y from (select number as x, number + 1 as y from numbers(10)) group by x, y　with cube
+#     ) where y != 0 and s != 4 order by s, x, y
+#     settings enable_optimize_predicate_expression=0"
+
+echo "> filter is pushed down before Distinct"
+$CLICKHOUSE_CLIENT -q "
+    explain actions = 1 select x, y from (
+        select distinct x, y from (select number % 2 as x, number % 3 as y from numbers(10))
+    ) where y != 2
+    settings enable_optimize_predicate_expression=0" |
+    grep -o "Distinct\|Filter column: notEquals(y, 2)"
+$CLICKHOUSE_CLIENT -q "
+    select x, y from (
+        select distinct x, y from (select number % 2 as x, number % 3 as y from numbers(10))
+    ) where y != 2 order by x, y
+    settings enable_optimize_predicate_expression=0"
+
+echo "> filter is pushed down before sorting steps"
+$CLICKHOUSE_CLIENT -q "
+    explain actions = 1 select x, y from (
+        select number % 2 as x, number % 3 as y from numbers(6) order by y desc
+    ) where x != 0 and y != 0
+    settings enable_optimize_predicate_expression = 0" |
+    grep -o "MergingSorted\|MergeSorting\|PartialSorting\|Filter column: and(notEquals(x, 0), notEquals(y, 0))"
+$CLICKHOUSE_CLIENT -q "
+    select x, y from (
+        select number % 2 as x, number % 3 as y from numbers(6) order by y desc
+    ) where x != 0 and y != 0
+    settings enable_optimize_predicate_expression = 0"
+
+echo "> filter is pushed down before TOTALS HAVING and aggregating"
+$CLICKHOUSE_CLIENT -q "
+    explain actions = 1 select * from (
+        select y, sum(x) from (select number as x, number % 4 as y from numbers(10)) group by y with totals
+    ) where y != 2
+    settings enable_optimize_predicate_expression=0" |
+    grep -o "TotalsHaving\|Aggregating\|Filter column: notEquals(y, 2)"
+$CLICKHOUSE_CLIENT -q "
+    select * from (
+        select y, sum(x) from (select number as x, number % 4 as y from numbers(10)) group by y with totals
+    ) where y != 2"
+
+echo "> filter is pushed down before CreatingSets"
+$CLICKHOUSE_CLIENT -q "
+    explain select number from (
+        select number from numbers(5) where number in (select 1 + number from numbers(3))
+    ) where number != 2 settings enable_optimize_predicate_expression=0" |
+    grep -o "CreatingSets\|Filter"
+$CLICKHOUSE_CLIENT -q "
+    select number from (
+        select number from numbers(5) where number in (select 1 + number from numbers(3))
+    ) where number != 2 settings enable_optimize_predicate_expression=0"
+
+echo "> one condition of filter is pushed down before LEFT JOIN"
+$CLICKHOUSE_CLIENT -q "
+    explain actions = 1
+    select number as a, r.b from numbers(4) as l any left join (
+        select number + 2 as b from numbers(3)
+    ) as r on a = r.b where a != 1 and b != 2 settings enable_optimize_predicate_expression = 0" |
+    grep -o "Join\|Filter column: notEquals(number, 1)"
+$CLICKHOUSE_CLIENT -q "
+    select number as a, r.b from numbers(4) as l any left join (
+        select number + 2 as b from numbers(3)
+    ) as r on a = r.b where a != 1 and b != 2 settings enable_optimize_predicate_expression = 0"
+
+echo "> one condition of filter is pushed down before INNER JOIN"
+$CLICKHOUSE_CLIENT -q "
+    explain actions = 1
+    select number as a, r.b from numbers(4) as l any inner join (
+        select number + 2 as b from numbers(3)
+    ) as r on a = r.b where a != 1 and b != 2 settings enable_optimize_predicate_expression = 0" |
+    grep -o "Join\|Filter column: notEquals(number, 1)"
+$CLICKHOUSE_CLIENT -q "
+    select number as a, r.b from numbers(4) as l any inner join (
+        select number + 2 as b from numbers(3)
+    ) as r on a = r.b where a != 1 and b != 2 settings enable_optimize_predicate_expression = 0"
+
+echo "> filter is pushed down before UNION"
+$CLICKHOUSE_CLIENT -q "
+    explain select a, b from (
+        select number + 1 as a, number + 2 as b from numbers(2) union all select number + 1 as b, number + 2 as a from numbers(2)
+    ) where a != 1 settings enable_optimize_predicate_expression = 0" |
+    grep -o "Union\|Filter"
+$CLICKHOUSE_CLIENT -q "
+    select a, b from (
+        select number + 1 as a, number + 2 as b from numbers(2) union all select number + 1 as b, number + 2 as a from numbers(2)
+    ) where a != 1 settings enable_optimize_predicate_expression = 0"
diff --git a/tests/queries/0_stateless/01656_test_query_log_factories_info.reference b/tests/queries/0_stateless/01656_test_query_log_factories_info.reference
index 324890c0a5a..af7feae5a38 100644
--- a/tests/queries/0_stateless/01656_test_query_log_factories_info.reference
+++ b/tests/queries/0_stateless/01656_test_query_log_factories_info.reference
@@ -1,8 +1,8 @@
-2	 worl	[123,1,1]	49	\N	50	4950	Nullable(UInt64)	50
-2	 worl	[123,1,1]	49	\N	50	4950	Nullable(UInt64)	50
+2	 worl	1	1	0	4950	99	[123,1,1]	49	\N	50	4950	Nullable(UInt64)	50
+2	 worl	1	1	0	4950	99	[123,1,1]	49	\N	50	4950	Nullable(UInt64)	50
 
 arraySort(used_aggregate_functions)
-['avg','count','groupBitAnd','sum','uniq']
+['avg','count','groupBitAnd','max','sum','uniq']
 
 arraySort(used_aggregate_function_combinators)
 ['Array','If','OrDefault','OrNull']
@@ -11,7 +11,7 @@ arraySort(used_table_functions)
 ['numbers']
 
 arraySort(used_functions)
-['CAST','addDays','array','arrayFlatten','modulo','plus','substring','toDate','toDayOfYear','toTypeName','toWeek']
+['CAST','CRC32','addDays','array','arrayFlatten','modulo','plus','pow','round','substring','tanh','toDate','toDayOfYear','toTypeName','toWeek']
 
 arraySort(used_data_type_families)
 ['Array','Int32','Nullable','String']
@@ -20,5 +20,5 @@ used_database_engines
 ['Atomic']
 
 arraySort(used_data_type_families)	used_storages
-['DateTime','Int64']	['Memory']
+['Int64','datetime']	['Memory']
 
diff --git a/tests/queries/0_stateless/01656_test_query_log_factories_info.sql b/tests/queries/0_stateless/01656_test_query_log_factories_info.sql
index 17657cf60f5..3a890ce16f9 100644
--- a/tests/queries/0_stateless/01656_test_query_log_factories_info.sql
+++ b/tests/queries/0_stateless/01656_test_query_log_factories_info.sql
@@ -2,6 +2,8 @@ SET database_atomic_wait_for_drop_and_detach_synchronously=1;
 
 SELECT uniqArray([1, 1, 2]),
        SUBSTRING('Hello, world', 7, 5),
+       POW(1, 2), ROUND(TANh(1)), CrC32(''),
+       SUM(number), MAX(number),
        flatten([[[BIT_AND(123)]], [[mod(3, 2)], [CAST('1' AS INTEGER)]]]),
        week(toDate('2000-12-05')),
        CAST(arrayJoin([NULL, NULL]) AS Nullable(TEXT)),
@@ -49,7 +51,7 @@ WHERE current_database = currentDatabase() AND type == 'QueryFinish' AND (query
 ORDER BY query_start_time DESC LIMIT 1 FORMAT TabSeparatedWithNames;
 SELECT '';
 
-CREATE OR REPLACE TABLE test_query_log_factories_info1.memory_table (id BIGINT, date DateTime) ENGINE=Memory();
+CREATE OR REPLACE TABLE test_query_log_factories_info1.memory_table (id BIGINT, date DATETIME) ENGINE=Memory();
 
 SYSTEM FLUSH LOGS;
 SELECT arraySort(used_data_type_families), used_storages
diff --git a/tests/queries/0_stateless/01658_read_file_to_stringcolumn.sh b/tests/queries/0_stateless/01658_read_file_to_stringcolumn.sh
index 593f0e59ea7..072e8d75f52 100755
--- a/tests/queries/0_stateless/01658_read_file_to_stringcolumn.sh
+++ b/tests/queries/0_stateless/01658_read_file_to_stringcolumn.sh
@@ -8,7 +8,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # Data preparation.
 # Now we can get the user_files_path by use the table file function for trick. also we can get it by query as:
 #  "insert into function file('exist.txt', 'CSV', 'val1 char') values ('aaaa'); select _path from file('exist.txt', 'CSV', 'val1 char')"
-user_files_path=$(clickhouse-client --query "select _path,_file from file('nonexist.txt', 'CSV', 'val1 char')" 2>&1 |grep Exception | awk '{gsub("/nonexist.txt","",$9); print $9}')
+user_files_path=$(clickhouse-client --query "select _path,_file from file('nonexist.txt', 'CSV', 'val1 char')" 2>&1 | grep Exception | awk '{gsub("/nonexist.txt","",$9); print $9}')
 
 mkdir -p ${user_files_path}/
 echo -n aaaaaaaaa > ${user_files_path}/a.txt
diff --git a/tests/queries/0_stateless/01661_extract_all_groups_throw_fast.sql b/tests/queries/0_stateless/01661_extract_all_groups_throw_fast.sql
index 48d3baba0c5..a056d77896c 100644
--- a/tests/queries/0_stateless/01661_extract_all_groups_throw_fast.sql
+++ b/tests/queries/0_stateless/01661_extract_all_groups_throw_fast.sql
@@ -1 +1,2 @@
 SELECT repeat('abcdefghijklmnopqrstuvwxyz', number * 100) AS haystack, extractAllGroupsHorizontal(haystack, '(\\w)') AS matches FROM numbers(1023); -- { serverError 128 }
+SELECT count(extractAllGroupsHorizontal(materialize('a'), '(a)')) FROM numbers(1000000) FORMAT Null; -- shouldn't fail
diff --git a/tests/queries/0_stateless/01666_blns.sql b/tests/queries/0_stateless/01666_blns.sql
index 787f0369244..be9632092bc 100644
--- a/tests/queries/0_stateless/01666_blns.sql
+++ b/tests/queries/0_stateless/01666_blns.sql
@@ -554,9 +554,9 @@ SELECT count() FROM test;
 DROP TABLE IF EXISTS test_r1;
 DROP TABLE IF EXISTS test_r2;
 
-CREATE TABLE test_r1 AS test ENGINE = ReplicatedMergeTree('/clickhouse/test', 'r1') ORDER BY "\\" SETTINGS min_bytes_for_wide_part = '100G';
+CREATE TABLE test_r1 AS test ENGINE = ReplicatedMergeTree('/clickhouse/test_01666', 'r1') ORDER BY "\\" SETTINGS min_bytes_for_wide_part = '100G';
 INSERT INTO test_r1 SELECT * FROM test;
-CREATE TABLE test_r2 AS test ENGINE = ReplicatedMergeTree('/clickhouse/test', 'r2') ORDER BY "\\" SETTINGS min_bytes_for_wide_part = '100G';
+CREATE TABLE test_r2 AS test ENGINE = ReplicatedMergeTree('/clickhouse/test_01666', 'r2') ORDER BY "\\" SETTINGS min_bytes_for_wide_part = '100G';
 
 SYSTEM SYNC REPLICA test_r2;
 
diff --git a/tests/queries/0_stateless/01666_merge_tree_max_query_limit.reference b/tests/queries/0_stateless/01666_merge_tree_max_query_limit.reference
index a08a20dc95d..25880a7d740 100644
--- a/tests/queries/0_stateless/01666_merge_tree_max_query_limit.reference
+++ b/tests/queries/0_stateless/01666_merge_tree_max_query_limit.reference
@@ -12,4 +12,3 @@ Check if another query is passed
 Modify max_concurrent_queries back to 1
 Check if another query with less marks to read is throttled
 yes
-finished	long_running_query	default	select sleepEachRow(0.01) from simple settings max_block_size = 1 format Null
diff --git a/tests/queries/0_stateless/01666_merge_tree_max_query_limit.sh b/tests/queries/0_stateless/01666_merge_tree_max_query_limit.sh
index e32a83c9560..c5fbb35a9cd 100755
--- a/tests/queries/0_stateless/01666_merge_tree_max_query_limit.sh
+++ b/tests/queries/0_stateless/01666_merge_tree_max_query_limit.sh
@@ -15,12 +15,14 @@ drop table if exists simple;
 create table simple (i int, j int) engine = MergeTree order by i
 settings index_granularity = 1, max_concurrent_queries = 1, min_marks_to_honor_max_concurrent_queries = 2;
 
-insert into simple select number, number + 100 from numbers(1000);
+insert into simple select number, number + 100 from numbers(5000);
 "
 
+query_id="long_running_query-$CLICKHOUSE_DATABASE"
+
 echo "Spin up a long running query"
-${CLICKHOUSE_CLIENT} --query "select sleepEachRow(0.01) from simple settings max_block_size = 1 format Null" --query_id "long_running_query" > /dev/null 2>&1 &
-wait_for_query_to_start 'long_running_query'
+${CLICKHOUSE_CLIENT} --query "select sleepEachRow(0.1) from simple settings max_block_size = 1 format Null" --query_id "$query_id" > /dev/null 2>&1 &
+wait_for_query_to_start "$query_id"
 
 # query which reads marks >= min_marks_to_honor_max_concurrent_queries is throttled
 echo "Check if another query with some marks to read is throttled"
@@ -61,7 +63,7 @@ CODE=$?
 [ "$CODE" -ne "202" ] && echo "Expected error code: 202 but got: $CODE" && exit 1;
 echo "yes"
 
-${CLICKHOUSE_CLIENT} --query "KILL QUERY WHERE query_id = 'long_running_query' SYNC"
+${CLICKHOUSE_CLIENT} --query "KILL QUERY WHERE query_id = '$query_id' SYNC FORMAT Null"
 wait
 
 ${CLICKHOUSE_CLIENT} --multiline --multiquery --query "
diff --git a/tests/queries/0_stateless/01670_distributed_bytes_to_throw_insert.reference b/tests/queries/0_stateless/01670_distributed_bytes_to_throw_insert.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01670_distributed_bytes_to_throw_insert.sql b/tests/queries/0_stateless/01670_distributed_bytes_to_throw_insert.sql
new file mode 100644
index 00000000000..1415c895290
--- /dev/null
+++ b/tests/queries/0_stateless/01670_distributed_bytes_to_throw_insert.sql
@@ -0,0 +1,14 @@
+drop table if exists dist_01670;
+drop table if exists data_01670;
+
+create table data_01670 (key Int) engine=Null();
+create table dist_01670 (key Int) engine=Distributed(test_shard_localhost, currentDatabase(), data_01670) settings bytes_to_throw_insert=1;
+system stop distributed sends dist_01670;
+-- first batch is always OK, since there is no pending bytes yet
+insert into dist_01670 select * from numbers(1) settings prefer_localhost_replica=0;
+-- second will fail, because of bytes_to_throw_insert=1
+-- (previous block definitelly takes more, since it has header)
+insert into dist_01670 select * from numbers(1) settings prefer_localhost_replica=0; -- { serverError 574 }
+system flush distributed dist_01670;
+drop table dist_01670;
+drop table data_01670;
diff --git a/tests/queries/0_stateless/01670_log_comment.sql b/tests/queries/0_stateless/01670_log_comment.sql
index c1496273784..2fb61eb5812 100644
--- a/tests/queries/0_stateless/01670_log_comment.sql
+++ b/tests/queries/0_stateless/01670_log_comment.sql
@@ -1,5 +1,5 @@
 SET log_comment = 'log_comment test', log_queries = 1;
 SELECT 1;
 SYSTEM FLUSH LOGS;
-SELECT type, query FROM system.query_log WHERE current_database = currentDatabase() AND log_comment = 'log_comment test' AND event_date >= yesterday() AND type = 1 ORDER BY event_time DESC LIMIT 1;
-SELECT type, query FROM system.query_log WHERE current_database = currentDatabase() AND log_comment = 'log_comment test' AND event_date >= yesterday() AND type = 2 ORDER BY event_time DESC LIMIT 1;
+SELECT type, query FROM system.query_log WHERE current_database = currentDatabase() AND log_comment = 'log_comment test' AND query LIKE 'SELECT 1%' AND event_date >= yesterday() AND type = 1 ORDER BY event_time_microseconds DESC LIMIT 1;
+SELECT type, query FROM system.query_log WHERE current_database = currentDatabase() AND log_comment = 'log_comment test' AND query LIKE 'SELECT 1%' AND event_date >= yesterday() AND type = 2 ORDER BY event_time_microseconds DESC LIMIT 1;
diff --git a/tests/queries/0_stateless/01671_ddl_hang_timeout_long.reference b/tests/queries/0_stateless/01671_ddl_hang_timeout_long.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01671_ddl_hang_timeout.sh b/tests/queries/0_stateless/01671_ddl_hang_timeout_long.sh
similarity index 89%
rename from tests/queries/0_stateless/01671_ddl_hang_timeout.sh
rename to tests/queries/0_stateless/01671_ddl_hang_timeout_long.sh
index 2ca97e3978b..641eba2d8fa 100755
--- a/tests/queries/0_stateless/01671_ddl_hang_timeout.sh
+++ b/tests/queries/0_stateless/01671_ddl_hang_timeout_long.sh
@@ -6,7 +6,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 function thread_create_drop_table {
     while true; do
         REPLICA=$(($RANDOM % 10))
-        $CLICKHOUSE_CLIENT --query "CREATE TABLE IF NOT EXISTS t1 (x UInt64, s Array(Nullable(String))) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_01671/test_01671', 'r_$REPLICA') order by x" 2>/dev/null
+        $CLICKHOUSE_CLIENT --query "CREATE TABLE IF NOT EXISTS t1 (x UInt64, s Array(Nullable(String))) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/test_01671', 'r_$REPLICA') order by x" 2>/dev/null
         sleep 0.0$RANDOM
         $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS t1"
     done
diff --git a/tests/queries/0_stateless/01674_htm_xml_coarse_parse.reference b/tests/queries/0_stateless/01674_htm_xml_coarse_parse.reference
index 63b3707b9b4..9cca4934551 100644
--- a/tests/queries/0_stateless/01674_htm_xml_coarse_parse.reference
+++ b/tests/queries/0_stateless/01674_htm_xml_coarse_parse.reference
@@ -2,7 +2,7 @@
 
 Here is CDTATA.
 This is a white space test.
-This is a complex test. <script type="text/javascript">Hello, world</script> world <style> hello
+This is a complex test.<script type="text/javascript">Hello, world</script> world <style> hello
 hello, world
 
 hello, world
diff --git a/tests/queries/0_stateless/01674_htm_xml_coarse_parse.sql b/tests/queries/0_stateless/01674_htm_xml_coarse_parse.sql
index 65c243687c1..fd1292eb3fb 100644
--- a/tests/queries/0_stateless/01674_htm_xml_coarse_parse.sql
+++ b/tests/queries/0_stateless/01674_htm_xml_coarse_parse.sql
@@ -1,8 +1,9 @@
-SELECT htmlOrXmlCoarseParse('<script>Here is script.</script>');
-SELECT htmlOrXmlCoarseParse('<style>Here is style.</style>');
-SELECT htmlOrXmlCoarseParse('<![CDATA[Here is CDTATA.]]>');
-SELECT htmlOrXmlCoarseParse('This is a     white   space test.');
-SELECT htmlOrXmlCoarseParse('This is a complex test. <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"\n "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><![CDATA[<script type="text/javascript">Hello, world</script> ]]><hello />world<![CDATA[ <style> ]]> hello</style>\n<script><![CDATA[</script>]]>hello</script>\n</html>');
+SELECT extractTextFromHTML('<script>Here is script.</script>');
+SELECT extractTextFromHTML('<style>Here is style.</style>');
+SELECT extractTextFromHTML('<![CDATA[Here is CDTATA.]]>');
+SELECT extractTextFromHTML('This is a     white   space test.');
+SELECT extractTextFromHTML('This is a complex test. <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"\n "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><![CDATA[<script type="text/javascript">Hello, world</script> ]]><hello />world<![CDATA[ <style> ]]> hello</style>\n<script><![CDATA[</script>]]>hello</script>\n</html>');
+
 DROP TABLE IF EXISTS defaults;
 CREATE TABLE defaults
 (
@@ -11,5 +12,5 @@ CREATE TABLE defaults
 
 INSERT INTO defaults values ('<common tag>hello, world<tag>'), ('<script desc=content> some content </script>'), ('<![CDATA[hello, world]]>'), ('white space    collapse');
 
-SELECT htmlOrXmlCoarseParse(stringColumn) FROM defaults;
+SELECT extractTextFromHTML(stringColumn) FROM defaults;
 DROP table defaults;
diff --git a/tests/queries/0_stateless/01675_distributed_bytes_to_delay_insert.reference b/tests/queries/0_stateless/01675_distributed_bytes_to_delay_insert.reference
new file mode 100644
index 00000000000..d8c50c741ea
--- /dev/null
+++ b/tests/queries/0_stateless/01675_distributed_bytes_to_delay_insert.reference
@@ -0,0 +1,3 @@
+max_delay_to_insert will throw
+max_delay_to_insert will succeed
+flushed
diff --git a/tests/queries/0_stateless/01675_distributed_bytes_to_delay_insert.sh b/tests/queries/0_stateless/01675_distributed_bytes_to_delay_insert.sh
new file mode 100755
index 00000000000..bad12e4cd58
--- /dev/null
+++ b/tests/queries/0_stateless/01675_distributed_bytes_to_delay_insert.sh
@@ -0,0 +1,86 @@
+#!/usr/bin/env bash
+
+# NOTE: $SECONDS accuracy is second, so we need some delta, hence -1 in time conditions.
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+max_delay_to_insert=5
+
+${CLICKHOUSE_CLIENT} -nq "
+drop table if exists dist_01675;
+drop table if exists data_01675;
+"
+
+${CLICKHOUSE_CLIENT} -nq "
+create table data_01675 (key Int) engine=Null();
+create table dist_01675 (key Int) engine=Distributed(test_shard_localhost, currentDatabase(), data_01675) settings bytes_to_delay_insert=1, max_delay_to_insert=$max_delay_to_insert;
+system stop distributed sends dist_01675;
+"
+
+#
+# Case 1: max_delay_to_insert will throw.
+#
+echo "max_delay_to_insert will throw"
+
+start_seconds=$SECONDS
+${CLICKHOUSE_CLIENT} --testmode -nq "
+-- first batch is always OK, since there is no pending bytes yet
+insert into dist_01675 select * from numbers(1) settings prefer_localhost_replica=0;
+-- second will fail, because of bytes_to_delay_insert=1 and max_delay_to_insert=5,
+-- while distributed sends is stopped.
+--
+-- (previous block definitelly takes more, since it has header)
+insert into dist_01675 select * from numbers(1) settings prefer_localhost_replica=0; -- { serverError 574 }
+system flush distributed dist_01675;
+"
+end_seconds=$SECONDS
+
+if (( (end_seconds-start_seconds)<(max_delay_to_insert-1) )); then
+    echo "max_delay_to_insert was not satisfied ($end_seconds-$start_seconds)"
+fi
+
+#
+# Case 2: max_delay_to_insert will finally finished.
+#
+echo "max_delay_to_insert will succeed"
+
+max_delay_to_insert=10
+${CLICKHOUSE_CLIENT} -nq "
+drop table dist_01675;
+create table dist_01675 (key Int) engine=Distributed(test_shard_localhost, currentDatabase(), data_01675) settings bytes_to_delay_insert=1, max_delay_to_insert=$max_delay_to_insert;
+system stop distributed sends dist_01675;
+"
+
+flush_delay=4
+function flush_distributed_worker()
+{
+    sleep $flush_delay
+    ${CLICKHOUSE_CLIENT} -q "system flush distributed dist_01675"
+    echo flushed
+}
+flush_distributed_worker &
+
+start_seconds=$SECONDS
+${CLICKHOUSE_CLIENT} --testmode -nq "
+-- first batch is always OK, since there is no pending bytes yet
+insert into dist_01675 select * from numbers(1) settings prefer_localhost_replica=0;
+-- second will succcedd, due to SYSTEM FLUSH DISTRIBUTED in background.
+insert into dist_01675 select * from numbers(1) settings prefer_localhost_replica=0;
+"
+end_seconds=$SECONDS
+wait
+
+if (( (end_seconds-start_seconds)<(flush_delay-1) )); then
+    echo "max_delay_to_insert was not wait flush_delay ($end_seconds-$start_seconds)"
+fi
+if (( (end_seconds-start_seconds)>=(max_delay_to_insert-1) )); then
+    echo "max_delay_to_insert was overcommited ($end_seconds-$start_seconds)"
+fi
+
+
+${CLICKHOUSE_CLIENT} -nq "
+drop table dist_01675;
+drop table data_01675;
+"
diff --git a/tests/queries/0_stateless/01676_long_clickhouse_client_autocomplete.reference b/tests/queries/0_stateless/01676_long_clickhouse_client_autocomplete.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01676_clickhouse_client_autocomplete.sh b/tests/queries/0_stateless/01676_long_clickhouse_client_autocomplete.sh
similarity index 80%
rename from tests/queries/0_stateless/01676_clickhouse_client_autocomplete.sh
rename to tests/queries/0_stateless/01676_long_clickhouse_client_autocomplete.sh
index 08e07044841..1ed5c6be272 100755
--- a/tests/queries/0_stateless/01676_clickhouse_client_autocomplete.sh
+++ b/tests/queries/0_stateless/01676_long_clickhouse_client_autocomplete.sh
@@ -69,18 +69,6 @@ compwords_positive=(
     max_concurrent_queries_for_all_users
     # system.clusters
     test_shard_localhost
-    # system.errors, also it is very rare to cover system_events_show_zero_values
-    CONDITIONAL_TREE_PARENT_NOT_FOUND
-    # system.events, also it is very rare to cover system_events_show_zero_values
-    WriteBufferFromFileDescriptorWriteFailed
-    # system.asynchronous_metrics, also this metric has zero value
-    #
-    # NOTE: that there is no ability to complete metrics like
-    # jemalloc.background_thread.num_runs, due to "." is used as a word breaker
-    # (and this cannot be changed -- db.table)
-    ReplicasMaxAbsoluteDelay
-    # system.metrics
-    PartsPreCommitted
     # system.macros
     default_path_test
     # system.storage_policies, egh not uniq
diff --git a/tests/queries/0_stateless/01676_range_hashed_dictionary.reference b/tests/queries/0_stateless/01676_range_hashed_dictionary.reference
new file mode 100644
index 00000000000..23a5180d99c
--- /dev/null
+++ b/tests/queries/0_stateless/01676_range_hashed_dictionary.reference
@@ -0,0 +1,58 @@
+Dictionary not nullable
+dictGet
+0.33
+0.42
+0.46
+0.2
+0.4
+dictHas
+1
+1
+1
+0
+select columns from dictionary
+allColumns
+1	2019-05-05	2019-05-20	0.33
+1	2019-05-21	2019-05-30	0.42
+2	2019-05-21	2019-05-30	0.46
+noColumns
+1
+1
+1
+onlySpecificColumns
+1	2019-05-05	0.33
+1	2019-05-21	0.42
+2	2019-05-21	0.46
+onlySpecificColumn
+0.33
+0.42
+0.46
+Dictionary nullable
+dictGet
+0.33
+0.42
+\N
+0.2
+0.4
+dictHas
+1
+1
+1
+0
+select columns from dictionary
+allColumns
+1	2019-05-05	2019-05-20	0.33
+1	2019-05-21	2019-05-30	0.42
+2	2019-05-21	2019-05-30	\N
+noColumns
+1
+1
+1
+onlySpecificColumns
+1	2019-05-05	0.33
+1	2019-05-21	0.42
+2	2019-05-21	\N
+onlySpecificColumn
+0.33
+0.42
+\N
diff --git a/tests/queries/0_stateless/01676_range_hashed_dictionary.sql b/tests/queries/0_stateless/01676_range_hashed_dictionary.sql
new file mode 100644
index 00000000000..455e850b239
--- /dev/null
+++ b/tests/queries/0_stateless/01676_range_hashed_dictionary.sql
@@ -0,0 +1,110 @@
+DROP DATABASE IF EXISTS database_for_range_dict;
+
+CREATE DATABASE database_for_range_dict;
+
+CREATE TABLE database_for_range_dict.date_table
+(
+  CountryID UInt64,
+  StartDate Date,
+  EndDate Date,
+  Tax Float64
+)
+ENGINE = MergeTree()
+ORDER BY CountryID;
+
+INSERT INTO database_for_range_dict.date_table VALUES(1, toDate('2019-05-05'), toDate('2019-05-20'), 0.33);
+INSERT INTO database_for_range_dict.date_table VALUES(1, toDate('2019-05-21'), toDate('2019-05-30'), 0.42);
+INSERT INTO database_for_range_dict.date_table VALUES(2, toDate('2019-05-21'), toDate('2019-05-30'), 0.46);
+
+CREATE DICTIONARY database_for_range_dict.range_dictionary
+(
+  CountryID UInt64,
+  StartDate Date,
+  EndDate Date,
+  Tax Float64 DEFAULT 0.2
+)
+PRIMARY KEY CountryID
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'date_table' DB 'database_for_range_dict'))
+LIFETIME(MIN 1 MAX 1000)
+LAYOUT(RANGE_HASHED())
+RANGE(MIN StartDate MAX EndDate);
+
+SELECT 'Dictionary not nullable';
+SELECT 'dictGet';
+SELECT dictGet('database_for_range_dict.range_dictionary', 'Tax', toUInt64(1), toDate('2019-05-15'));
+SELECT dictGet('database_for_range_dict.range_dictionary', 'Tax', toUInt64(1), toDate('2019-05-29'));
+SELECT dictGet('database_for_range_dict.range_dictionary', 'Tax', toUInt64(2), toDate('2019-05-29'));
+SELECT dictGet('database_for_range_dict.range_dictionary', 'Tax', toUInt64(2), toDate('2019-05-31'));
+SELECT dictGetOrDefault('database_for_range_dict.range_dictionary', 'Tax', toUInt64(2), toDate('2019-05-31'), 0.4);
+SELECT 'dictHas';
+SELECT dictHas('database_for_range_dict.range_dictionary', toUInt64(1), toDate('2019-05-15'));
+SELECT dictHas('database_for_range_dict.range_dictionary', toUInt64(1), toDate('2019-05-29'));
+SELECT dictHas('database_for_range_dict.range_dictionary', toUInt64(2), toDate('2019-05-29'));
+SELECT dictHas('database_for_range_dict.range_dictionary', toUInt64(2), toDate('2019-05-31'));
+SELECT 'select columns from dictionary';
+SELECT 'allColumns';
+SELECT * FROM database_for_range_dict.range_dictionary;
+SELECT 'noColumns';
+SELECT 1 FROM database_for_range_dict.range_dictionary;
+SELECT 'onlySpecificColumns';
+SELECT CountryID, StartDate, Tax FROM database_for_range_dict.range_dictionary;
+SELECT 'onlySpecificColumn';
+SELECT Tax FROM database_for_range_dict.range_dictionary;
+
+DROP TABLE database_for_range_dict.date_table;
+DROP DICTIONARY database_for_range_dict.range_dictionary;
+
+CREATE TABLE database_for_range_dict.date_table
+(
+  CountryID UInt64,
+  StartDate Date,
+  EndDate Date,
+  Tax Nullable(Float64)
+)
+ENGINE = MergeTree()
+ORDER BY CountryID;
+
+INSERT INTO database_for_range_dict.date_table VALUES(1, toDate('2019-05-05'), toDate('2019-05-20'), 0.33);
+INSERT INTO database_for_range_dict.date_table VALUES(1, toDate('2019-05-21'), toDate('2019-05-30'), 0.42);
+INSERT INTO database_for_range_dict.date_table VALUES(2, toDate('2019-05-21'), toDate('2019-05-30'), NULL);
+
+CREATE DICTIONARY database_for_range_dict.range_dictionary_nullable
+(
+  CountryID UInt64,
+  StartDate Date,
+  EndDate Date,
+  Tax Nullable(Float64) DEFAULT 0.2
+)
+PRIMARY KEY CountryID
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'date_table' DB 'database_for_range_dict'))
+LIFETIME(MIN 1 MAX 1000)
+LAYOUT(RANGE_HASHED())
+RANGE(MIN StartDate MAX EndDate);
+
+SELECT 'Dictionary nullable';
+SELECT 'dictGet';
+SELECT dictGet('database_for_range_dict.range_dictionary_nullable', 'Tax', toUInt64(1), toDate('2019-05-15'));
+SELECT dictGet('database_for_range_dict.range_dictionary_nullable', 'Tax', toUInt64(1), toDate('2019-05-29'));
+SELECT dictGet('database_for_range_dict.range_dictionary_nullable', 'Tax', toUInt64(2), toDate('2019-05-29'));
+SELECT dictGet('database_for_range_dict.range_dictionary_nullable', 'Tax', toUInt64(2), toDate('2019-05-31'));
+SELECT dictGetOrDefault('database_for_range_dict.range_dictionary_nullable', 'Tax', toUInt64(2), toDate('2019-05-31'), 0.4);
+SELECT 'dictHas';
+SELECT dictHas('database_for_range_dict.range_dictionary_nullable', toUInt64(1), toDate('2019-05-15'));
+SELECT dictHas('database_for_range_dict.range_dictionary_nullable', toUInt64(1), toDate('2019-05-29'));
+SELECT dictHas('database_for_range_dict.range_dictionary_nullable', toUInt64(2), toDate('2019-05-29'));
+SELECT dictHas('database_for_range_dict.range_dictionary_nullable', toUInt64(2), toDate('2019-05-31'));
+SELECT 'select columns from dictionary';
+SELECT 'allColumns';
+SELECT * FROM database_for_range_dict.range_dictionary_nullable;
+SELECT 'noColumns';
+SELECT 1 FROM database_for_range_dict.range_dictionary_nullable;
+SELECT 'onlySpecificColumns';
+SELECT CountryID, StartDate, Tax FROM database_for_range_dict.range_dictionary_nullable;
+SELECT 'onlySpecificColumn';
+SELECT Tax FROM database_for_range_dict.range_dictionary_nullable;
+
+DROP TABLE database_for_range_dict.date_table;
+DROP DICTIONARY database_for_range_dict.range_dictionary_nullable;
+
+DROP DATABASE database_for_range_dict;
+
diff --git a/tests/queries/0_stateless/01681_cache_dictionary_simple_key.reference b/tests/queries/0_stateless/01681_cache_dictionary_simple_key.reference
new file mode 100644
index 00000000000..b3258e36f74
--- /dev/null
+++ b/tests/queries/0_stateless/01681_cache_dictionary_simple_key.reference
@@ -0,0 +1,66 @@
+Dictionary cache_dictionary_simple_key_simple_attributes
+dictGet existing value
+value_0	value_second_0
+value_1	value_second_1
+value_2	value_second_2
+dictGet with non existing value
+value_0	value_second_0
+value_1	value_second_1
+value_2	value_second_2
+value_first_default	value_second_default
+dictGetOrDefault existing value
+value_0	value_second_0
+value_1	value_second_1
+value_2	value_second_2
+dictGetOrDefault non existing value
+value_0	value_second_0
+value_1	value_second_1
+value_2	value_second_2
+default	default
+dictHas
+1
+1
+1
+0
+select all values as input stream
+0	value_0	value_second_0
+1	value_1	value_second_1
+2	value_2	value_second_2
+Dictionary cache_dictionary_simple_key_complex_attributes
+dictGet existing value
+value_0	value_second_0
+value_1	\N
+value_2	value_second_2
+dictGet with non existing value
+value_0	value_second_0
+value_1	\N
+value_2	value_second_2
+value_first_default	value_second_default
+dictGetOrDefault existing value
+value_0	value_second_0
+value_1	\N
+value_2	value_second_2
+dictGetOrDefault non existing value
+value_0	value_second_0
+value_1	\N
+value_2	value_second_2
+default	default
+dictHas
+1
+1
+1
+0
+select all values as input stream
+0	value_0	value_second_0
+1	value_1	\N
+2	value_2	value_second_2
+Dictionary cache_dictionary_simple_key_hierarchy
+dictGet
+0
+0
+1
+1
+2
+dictGetHierarchy
+[1]
+[4,2,1]
diff --git a/tests/queries/0_stateless/01681_cache_dictionary_simple_key.sql b/tests/queries/0_stateless/01681_cache_dictionary_simple_key.sql
new file mode 100644
index 00000000000..f200ead341b
--- /dev/null
+++ b/tests/queries/0_stateless/01681_cache_dictionary_simple_key.sql
@@ -0,0 +1,123 @@
+DROP DATABASE IF EXISTS 01681_database_for_cache_dictionary;
+CREATE DATABASE 01681_database_for_cache_dictionary;
+
+CREATE TABLE 01681_database_for_cache_dictionary.simple_key_simple_attributes_source_table
+(
+   id UInt64,
+   value_first String,
+   value_second String
+)
+ENGINE = TinyLog;
+
+INSERT INTO 01681_database_for_cache_dictionary.simple_key_simple_attributes_source_table VALUES(0, 'value_0', 'value_second_0');
+INSERT INTO 01681_database_for_cache_dictionary.simple_key_simple_attributes_source_table VALUES(1, 'value_1', 'value_second_1');
+INSERT INTO 01681_database_for_cache_dictionary.simple_key_simple_attributes_source_table VALUES(2, 'value_2', 'value_second_2');
+
+CREATE DICTIONARY 01681_database_for_cache_dictionary.cache_dictionary_simple_key_simple_attributes
+(
+   id UInt64,
+   value_first String DEFAULT 'value_first_default',
+   value_second String DEFAULT 'value_second_default'
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'simple_key_simple_attributes_source_table'))
+LIFETIME(MIN 1 MAX 1000)
+LAYOUT(CACHE(SIZE_IN_CELLS 10));
+
+SELECT 'Dictionary cache_dictionary_simple_key_simple_attributes';
+SELECT 'dictGet existing value';
+SELECT dictGet('01681_database_for_cache_dictionary.cache_dictionary_simple_key_simple_attributes', 'value_first', number) as value_first,
+    dictGet('01681_database_for_cache_dictionary.cache_dictionary_simple_key_simple_attributes', 'value_second', number) as value_second FROM system.numbers LIMIT 3;
+SELECT 'dictGet with non existing value';
+SELECT dictGet('01681_database_for_cache_dictionary.cache_dictionary_simple_key_simple_attributes', 'value_first', number) as value_first,
+    dictGet('01681_database_for_cache_dictionary.cache_dictionary_simple_key_simple_attributes', 'value_second', number) as value_second FROM system.numbers LIMIT 4;
+SELECT 'dictGetOrDefault existing value';
+SELECT dictGetOrDefault('01681_database_for_cache_dictionary.cache_dictionary_simple_key_simple_attributes', 'value_first', number, toString('default')) as value_first,
+    dictGetOrDefault('01681_database_for_cache_dictionary.cache_dictionary_simple_key_simple_attributes', 'value_second', number, toString('default')) as value_second FROM system.numbers LIMIT 3;
+SELECT 'dictGetOrDefault non existing value';
+SELECT dictGetOrDefault('01681_database_for_cache_dictionary.cache_dictionary_simple_key_simple_attributes', 'value_first', number, toString('default')) as value_first,
+    dictGetOrDefault('01681_database_for_cache_dictionary.cache_dictionary_simple_key_simple_attributes', 'value_second', number, toString('default')) as value_second FROM system.numbers LIMIT 4;
+SELECT 'dictHas';
+SELECT dictHas('01681_database_for_cache_dictionary.cache_dictionary_simple_key_simple_attributes', number) FROM system.numbers LIMIT 4;
+SELECT 'select all values as input stream';
+SELECT * FROM 01681_database_for_cache_dictionary.cache_dictionary_simple_key_simple_attributes ORDER BY id;
+
+DROP DICTIONARY 01681_database_for_cache_dictionary.cache_dictionary_simple_key_simple_attributes;
+DROP TABLE 01681_database_for_cache_dictionary.simple_key_simple_attributes_source_table;
+
+CREATE TABLE 01681_database_for_cache_dictionary.simple_key_complex_attributes_source_table
+(
+   id UInt64,
+   value_first String,
+   value_second Nullable(String)
+)
+ENGINE = TinyLog;
+
+INSERT INTO 01681_database_for_cache_dictionary.simple_key_complex_attributes_source_table VALUES(0, 'value_0', 'value_second_0');
+INSERT INTO 01681_database_for_cache_dictionary.simple_key_complex_attributes_source_table VALUES(1, 'value_1', NULL);
+INSERT INTO 01681_database_for_cache_dictionary.simple_key_complex_attributes_source_table VALUES(2, 'value_2', 'value_second_2');
+
+CREATE DICTIONARY 01681_database_for_cache_dictionary.cache_dictionary_simple_key_complex_attributes
+(
+   id UInt64,
+   value_first String DEFAULT 'value_first_default',
+   value_second Nullable(String) DEFAULT 'value_second_default'
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'simple_key_complex_attributes_source_table'))
+LIFETIME(MIN 1 MAX 1000)
+LAYOUT(CACHE(SIZE_IN_CELLS 10));
+
+SELECT 'Dictionary cache_dictionary_simple_key_complex_attributes';
+SELECT 'dictGet existing value';
+SELECT dictGet('01681_database_for_cache_dictionary.cache_dictionary_simple_key_complex_attributes', 'value_first', number) as value_first,
+    dictGet('01681_database_for_cache_dictionary.cache_dictionary_simple_key_complex_attributes', 'value_second', number) as value_second FROM system.numbers LIMIT 3;
+SELECT 'dictGet with non existing value';
+SELECT dictGet('01681_database_for_cache_dictionary.cache_dictionary_simple_key_complex_attributes', 'value_first', number) as value_first,
+    dictGet('01681_database_for_cache_dictionary.cache_dictionary_simple_key_complex_attributes', 'value_second', number) as value_second FROM system.numbers LIMIT 4;
+SELECT 'dictGetOrDefault existing value';
+SELECT dictGetOrDefault('01681_database_for_cache_dictionary.cache_dictionary_simple_key_complex_attributes', 'value_first', number, toString('default')) as value_first,
+    dictGetOrDefault('01681_database_for_cache_dictionary.cache_dictionary_simple_key_complex_attributes', 'value_second', number, toString('default')) as value_second FROM system.numbers LIMIT 3;
+SELECT 'dictGetOrDefault non existing value';
+SELECT dictGetOrDefault('01681_database_for_cache_dictionary.cache_dictionary_simple_key_complex_attributes', 'value_first', number, toString('default')) as value_first,
+    dictGetOrDefault('01681_database_for_cache_dictionary.cache_dictionary_simple_key_complex_attributes', 'value_second', number, toString('default')) as value_second FROM system.numbers LIMIT 4;
+SELECT 'dictHas';
+SELECT dictHas('01681_database_for_cache_dictionary.cache_dictionary_simple_key_complex_attributes', number) FROM system.numbers LIMIT 4;
+SELECT 'select all values as input stream';
+SELECT * FROM 01681_database_for_cache_dictionary.cache_dictionary_simple_key_complex_attributes ORDER BY id;
+
+DROP DICTIONARY 01681_database_for_cache_dictionary.cache_dictionary_simple_key_complex_attributes;
+DROP TABLE 01681_database_for_cache_dictionary.simple_key_complex_attributes_source_table;
+
+CREATE TABLE 01681_database_for_cache_dictionary.simple_key_hierarchy_table
+(
+    id UInt64,
+    parent_id UInt64
+) ENGINE = TinyLog();
+
+INSERT INTO 01681_database_for_cache_dictionary.simple_key_hierarchy_table VALUES (1, 0);
+INSERT INTO 01681_database_for_cache_dictionary.simple_key_hierarchy_table VALUES (2, 1);
+INSERT INTO 01681_database_for_cache_dictionary.simple_key_hierarchy_table VALUES (3, 1);
+INSERT INTO 01681_database_for_cache_dictionary.simple_key_hierarchy_table VALUES (4, 2);
+
+CREATE DICTIONARY 01681_database_for_cache_dictionary.cache_dictionary_simple_key_hierarchy
+(
+   id UInt64,
+   parent_id UInt64 HIERARCHICAL
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'simple_key_hierarchy_table'))
+LIFETIME(MIN 1 MAX 1000)
+LAYOUT(CACHE(SIZE_IN_CELLS 10));
+
+SELECT 'Dictionary cache_dictionary_simple_key_hierarchy';
+SELECT 'dictGet';
+SELECT dictGet('01681_database_for_cache_dictionary.cache_dictionary_simple_key_hierarchy', 'parent_id', number) FROM system.numbers LIMIT 5;
+SELECT 'dictGetHierarchy';
+SELECT dictGetHierarchy('01681_database_for_cache_dictionary.cache_dictionary_simple_key_hierarchy', toUInt64(1));
+SELECT dictGetHierarchy('01681_database_for_cache_dictionary.cache_dictionary_simple_key_hierarchy', toUInt64(4));
+
+DROP DICTIONARY 01681_database_for_cache_dictionary.cache_dictionary_simple_key_hierarchy;
+DROP TABLE 01681_database_for_cache_dictionary.simple_key_hierarchy_table;
+
+DROP DATABASE 01681_database_for_cache_dictionary;
diff --git a/tests/queries/0_stateless/01682_cache_dictionary_complex_key.reference b/tests/queries/0_stateless/01682_cache_dictionary_complex_key.reference
new file mode 100644
index 00000000000..a0f99ca13cc
--- /dev/null
+++ b/tests/queries/0_stateless/01682_cache_dictionary_complex_key.reference
@@ -0,0 +1,56 @@
+Dictionary cache_dictionary_complex_key_simple_attributes
+dictGet existing value
+value_0	value_second_0
+value_1	value_second_1
+value_2	value_second_2
+dictGet with non existing value
+value_0	value_second_0
+value_1	value_second_1
+value_2	value_second_2
+value_first_default	value_second_default
+dictGetOrDefault existing value
+value_0	value_second_0
+value_1	value_second_1
+value_2	value_second_2
+dictGetOrDefault non existing value
+value_0	value_second_0
+value_1	value_second_1
+value_2	value_second_2
+default	default
+dictHas
+1
+1
+1
+0
+select all values as input stream
+0	id_key_0	value_0	value_second_0
+1	id_key_1	value_1	value_second_1
+2	id_key_2	value_2	value_second_2
+Dictionary cache_dictionary_complex_key_complex_attributes
+dictGet existing value
+value_0	value_second_0
+value_1	\N
+value_2	value_second_2
+dictGet with non existing value
+value_0	value_second_0
+value_1	\N
+value_2	value_second_2
+value_first_default	value_second_default
+dictGetOrDefault existing value
+value_0	value_second_0
+value_1	\N
+value_2	value_second_2
+dictGetOrDefault non existing value
+value_0	value_second_0
+value_1	\N
+value_2	value_second_2
+default	default
+dictHas
+1
+1
+1
+0
+select all values as input stream
+0	id_key_0	value_0	value_second_0
+1	id_key_1	value_1	\N
+2	id_key_2	value_2	value_second_2
diff --git a/tests/queries/0_stateless/01682_cache_dictionary_complex_key.sql b/tests/queries/0_stateless/01682_cache_dictionary_complex_key.sql
new file mode 100644
index 00000000000..4cc83412457
--- /dev/null
+++ b/tests/queries/0_stateless/01682_cache_dictionary_complex_key.sql
@@ -0,0 +1,97 @@
+DROP DATABASE IF EXISTS 01682_database_for_cache_dictionary;
+CREATE DATABASE 01682_database_for_cache_dictionary;
+
+CREATE TABLE 01682_database_for_cache_dictionary.complex_key_simple_attributes_source_table
+(
+   id UInt64,
+   id_key String,
+   value_first String,
+   value_second String
+)
+ENGINE = TinyLog;
+
+INSERT INTO 01682_database_for_cache_dictionary.complex_key_simple_attributes_source_table VALUES(0, 'id_key_0', 'value_0', 'value_second_0');
+INSERT INTO 01682_database_for_cache_dictionary.complex_key_simple_attributes_source_table VALUES(1, 'id_key_1', 'value_1', 'value_second_1');
+INSERT INTO 01682_database_for_cache_dictionary.complex_key_simple_attributes_source_table VALUES(2, 'id_key_2', 'value_2', 'value_second_2');
+
+CREATE DICTIONARY 01682_database_for_cache_dictionary.cache_dictionary_complex_key_simple_attributes
+(
+   id UInt64,
+   id_key String,
+   value_first String DEFAULT 'value_first_default',
+   value_second String DEFAULT 'value_second_default'
+)
+PRIMARY KEY id, id_key
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'complex_key_simple_attributes_source_table' DB '01682_database_for_cache_dictionary'))
+LIFETIME(MIN 1 MAX 1000)
+LAYOUT(COMPLEX_KEY_CACHE(SIZE_IN_CELLS 10));
+
+SELECT 'Dictionary cache_dictionary_complex_key_simple_attributes';
+SELECT 'dictGet existing value';
+SELECT dictGet('01682_database_for_cache_dictionary.cache_dictionary_complex_key_simple_attributes', 'value_first', (number, concat('id_key_', toString(number)))) as value_first,
+    dictGet('01682_database_for_cache_dictionary.cache_dictionary_complex_key_simple_attributes', 'value_second', (number, concat('id_key_', toString(number)))) as value_second FROM system.numbers LIMIT 3;
+SELECT 'dictGet with non existing value';
+SELECT dictGet('01682_database_for_cache_dictionary.cache_dictionary_complex_key_simple_attributes', 'value_first', (number, concat('id_key_', toString(number)))) as value_first,
+    dictGet('01682_database_for_cache_dictionary.cache_dictionary_complex_key_simple_attributes', 'value_second', (number, concat('id_key_', toString(number)))) as value_second FROM system.numbers LIMIT 4;
+SELECT 'dictGetOrDefault existing value';
+SELECT dictGetOrDefault('01682_database_for_cache_dictionary.cache_dictionary_complex_key_simple_attributes', 'value_first', (number, concat('id_key_', toString(number))), toString('default')) as value_first,
+    dictGetOrDefault('01682_database_for_cache_dictionary.cache_dictionary_complex_key_simple_attributes', 'value_second', (number, concat('id_key_', toString(number))), toString('default')) as value_second FROM system.numbers LIMIT 3;
+SELECT 'dictGetOrDefault non existing value';
+SELECT dictGetOrDefault('01682_database_for_cache_dictionary.cache_dictionary_complex_key_simple_attributes', 'value_first', (number, concat('id_key_', toString(number))), toString('default')) as value_first,
+    dictGetOrDefault('01682_database_for_cache_dictionary.cache_dictionary_complex_key_simple_attributes', 'value_second', (number, concat('id_key_', toString(number))), toString('default')) as value_second FROM system.numbers LIMIT 4;
+SELECT 'dictHas';
+SELECT dictHas('01682_database_for_cache_dictionary.cache_dictionary_complex_key_simple_attributes', (number, concat('id_key_', toString(number)))) FROM system.numbers LIMIT 4;
+SELECT 'select all values as input stream';
+SELECT * FROM 01682_database_for_cache_dictionary.cache_dictionary_complex_key_simple_attributes ORDER BY id;
+
+DROP DICTIONARY 01682_database_for_cache_dictionary.cache_dictionary_complex_key_simple_attributes;
+DROP TABLE 01682_database_for_cache_dictionary.complex_key_simple_attributes_source_table;
+
+CREATE TABLE 01682_database_for_cache_dictionary.complex_key_complex_attributes_source_table
+(
+   id UInt64,
+   id_key String,
+   value_first String,
+   value_second Nullable(String)
+)
+ENGINE = TinyLog;
+
+INSERT INTO 01682_database_for_cache_dictionary.complex_key_complex_attributes_source_table VALUES(0, 'id_key_0', 'value_0', 'value_second_0');
+INSERT INTO 01682_database_for_cache_dictionary.complex_key_complex_attributes_source_table VALUES(1, 'id_key_1', 'value_1', NULL);
+INSERT INTO 01682_database_for_cache_dictionary.complex_key_complex_attributes_source_table VALUES(2, 'id_key_2', 'value_2', 'value_second_2');
+
+CREATE DICTIONARY 01682_database_for_cache_dictionary.cache_dictionary_complex_key_complex_attributes
+(
+    id UInt64,
+    id_key String,
+
+    value_first String DEFAULT 'value_first_default',
+    value_second Nullable(String) DEFAULT 'value_second_default'
+)
+PRIMARY KEY id, id_key
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'complex_key_complex_attributes_source_table' DB '01682_database_for_cache_dictionary'))
+LIFETIME(MIN 1 MAX 1000)
+LAYOUT(COMPLEX_KEY_CACHE(SIZE_IN_CELLS 10));
+
+SELECT 'Dictionary cache_dictionary_complex_key_complex_attributes';
+SELECT 'dictGet existing value';
+SELECT dictGet('01682_database_for_cache_dictionary.cache_dictionary_complex_key_complex_attributes', 'value_first', (number, concat('id_key_', toString(number)))) as value_first,
+    dictGet('01682_database_for_cache_dictionary.cache_dictionary_complex_key_complex_attributes', 'value_second', (number, concat('id_key_', toString(number)))) as value_second FROM system.numbers LIMIT 3;
+SELECT 'dictGet with non existing value';
+SELECT dictGet('01682_database_for_cache_dictionary.cache_dictionary_complex_key_complex_attributes', 'value_first', (number, concat('id_key_', toString(number)))) as value_first,
+    dictGet('01682_database_for_cache_dictionary.cache_dictionary_complex_key_complex_attributes', 'value_second', (number, concat('id_key_', toString(number)))) as value_second FROM system.numbers LIMIT 4;
+SELECT 'dictGetOrDefault existing value';
+SELECT dictGetOrDefault('01682_database_for_cache_dictionary.cache_dictionary_complex_key_complex_attributes', 'value_first', (number, concat('id_key_', toString(number))), toString('default')) as value_first,
+    dictGetOrDefault('01682_database_for_cache_dictionary.cache_dictionary_complex_key_complex_attributes', 'value_second', (number, concat('id_key_', toString(number))), toString('default')) as value_second FROM system.numbers LIMIT 3;
+SELECT 'dictGetOrDefault non existing value';
+SELECT dictGetOrDefault('01682_database_for_cache_dictionary.cache_dictionary_complex_key_complex_attributes', 'value_first', (number, concat('id_key_', toString(number))), toString('default')) as value_first,
+    dictGetOrDefault('01682_database_for_cache_dictionary.cache_dictionary_complex_key_complex_attributes', 'value_second', (number, concat('id_key_', toString(number))), toString('default')) as value_second FROM system.numbers LIMIT 4;
+SELECT 'dictHas';
+SELECT dictHas('01682_database_for_cache_dictionary.cache_dictionary_complex_key_complex_attributes', (number, concat('id_key_', toString(number)))) FROM system.numbers LIMIT 4;
+SELECT 'select all values as input stream';
+SELECT * FROM 01682_database_for_cache_dictionary.cache_dictionary_complex_key_complex_attributes ORDER BY id;
+
+DROP DICTIONARY 01682_database_for_cache_dictionary.cache_dictionary_complex_key_complex_attributes;
+DROP TABLE 01682_database_for_cache_dictionary.complex_key_complex_attributes_source_table;
+
+DROP DATABASE 01682_database_for_cache_dictionary;
diff --git a/tests/queries/0_stateless/01683_flat_dictionary.reference b/tests/queries/0_stateless/01683_flat_dictionary.reference
new file mode 100644
index 00000000000..b2a24a01738
--- /dev/null
+++ b/tests/queries/0_stateless/01683_flat_dictionary.reference
@@ -0,0 +1,58 @@
+Dictionary flat_dictionary_simple_key_simple_attributes
+dictGet existing value
+value_0	value_second_0
+value_1	value_second_1
+value_2	value_second_2
+dictGet with non existing value
+value_0	value_second_0
+value_1	value_second_1
+value_2	value_second_2
+value_first_default	value_second_default
+dictGetOrDefault existing value
+value_0	value_second_0
+value_1	value_second_1
+value_2	value_second_2
+dictGetOrDefault non existing value
+value_0	value_second_0
+value_1	value_second_1
+value_2	value_second_2
+default	default
+dictHas
+1
+1
+1
+0
+Dictionary flat_dictionary_simple_key_complex_attributes
+dictGet existing value
+value_0	value_second_0
+value_1	\N
+value_2	value_second_2
+dictGet with non existing value
+value_0	value_second_0
+value_1	\N
+value_2	value_second_2
+value_first_default	value_second_default
+dictGetOrDefault existing value
+value_0	value_second_0
+value_1	\N
+value_2	value_second_2
+dictGetOrDefault non existing value
+value_0	value_second_0
+value_1	\N
+value_2	value_second_2
+default	default
+dictHas
+1
+1
+1
+0
+Dictionary flat_dictionary_simple_key_hierarchy
+dictGet
+0
+0
+1
+1
+2
+dictGetHierarchy
+[1]
+[4,2,1]
diff --git a/tests/queries/0_stateless/01683_flat_dictionary.sql b/tests/queries/0_stateless/01683_flat_dictionary.sql
new file mode 100644
index 00000000000..c9f864c6a16
--- /dev/null
+++ b/tests/queries/0_stateless/01683_flat_dictionary.sql
@@ -0,0 +1,119 @@
+DROP DATABASE IF EXISTS 01681_database_for_flat_dictionary;
+CREATE DATABASE 01681_database_for_flat_dictionary;
+
+CREATE TABLE 01681_database_for_flat_dictionary.simple_key_simple_attributes_source_table
+(
+   id UInt64,
+   value_first String,
+   value_second String
+)
+ENGINE = TinyLog;
+
+INSERT INTO 01681_database_for_flat_dictionary.simple_key_simple_attributes_source_table VALUES(0, 'value_0', 'value_second_0');
+INSERT INTO 01681_database_for_flat_dictionary.simple_key_simple_attributes_source_table VALUES(1, 'value_1', 'value_second_1');
+INSERT INTO 01681_database_for_flat_dictionary.simple_key_simple_attributes_source_table VALUES(2, 'value_2', 'value_second_2');
+
+CREATE DICTIONARY 01681_database_for_flat_dictionary.flat_dictionary_simple_key_simple_attributes
+(
+   id UInt64,
+   value_first String DEFAULT 'value_first_default',
+   value_second String DEFAULT 'value_second_default'
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'simple_key_simple_attributes_source_table'))
+LIFETIME(MIN 1 MAX 1000)
+LAYOUT(FLAT());
+
+SELECT 'Dictionary flat_dictionary_simple_key_simple_attributes';
+SELECT 'dictGet existing value';
+SELECT dictGet('01681_database_for_flat_dictionary.flat_dictionary_simple_key_simple_attributes', 'value_first', number) as value_first,
+    dictGet('01681_database_for_flat_dictionary.flat_dictionary_simple_key_simple_attributes', 'value_second', number) as value_second FROM system.numbers LIMIT 3;
+SELECT 'dictGet with non existing value';
+SELECT dictGet('01681_database_for_flat_dictionary.flat_dictionary_simple_key_simple_attributes', 'value_first', number) as value_first,
+    dictGet('01681_database_for_flat_dictionary.flat_dictionary_simple_key_simple_attributes', 'value_second', number) as value_second FROM system.numbers LIMIT 4;
+SELECT 'dictGetOrDefault existing value';
+SELECT dictGetOrDefault('01681_database_for_flat_dictionary.flat_dictionary_simple_key_simple_attributes', 'value_first', number, toString('default')) as value_first,
+    dictGetOrDefault('01681_database_for_flat_dictionary.flat_dictionary_simple_key_simple_attributes', 'value_second', number, toString('default')) as value_second FROM system.numbers LIMIT 3;
+SELECT 'dictGetOrDefault non existing value';
+SELECT dictGetOrDefault('01681_database_for_flat_dictionary.flat_dictionary_simple_key_simple_attributes', 'value_first', number, toString('default')) as value_first,
+    dictGetOrDefault('01681_database_for_flat_dictionary.flat_dictionary_simple_key_simple_attributes', 'value_second', number, toString('default')) as value_second FROM system.numbers LIMIT 4;
+SELECT 'dictHas';
+SELECT dictHas('01681_database_for_flat_dictionary.flat_dictionary_simple_key_simple_attributes', number) FROM system.numbers LIMIT 4;
+
+DROP DICTIONARY 01681_database_for_flat_dictionary.flat_dictionary_simple_key_simple_attributes;
+DROP TABLE 01681_database_for_flat_dictionary.simple_key_simple_attributes_source_table;
+
+CREATE TABLE 01681_database_for_flat_dictionary.simple_key_complex_attributes_source_table
+(
+   id UInt64,
+   value_first String,
+   value_second Nullable(String)
+)
+ENGINE = TinyLog;
+
+INSERT INTO 01681_database_for_flat_dictionary.simple_key_complex_attributes_source_table VALUES(0, 'value_0', 'value_second_0');
+INSERT INTO 01681_database_for_flat_dictionary.simple_key_complex_attributes_source_table VALUES(1, 'value_1', NULL);
+INSERT INTO 01681_database_for_flat_dictionary.simple_key_complex_attributes_source_table VALUES(2, 'value_2', 'value_second_2');
+
+CREATE DICTIONARY 01681_database_for_flat_dictionary.flat_dictionary_simple_key_complex_attributes
+(
+   id UInt64,
+   value_first String DEFAULT 'value_first_default',
+   value_second Nullable(String) DEFAULT 'value_second_default'
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'simple_key_complex_attributes_source_table'))
+LIFETIME(MIN 1 MAX 1000)
+LAYOUT(FLAT());
+
+SELECT 'Dictionary flat_dictionary_simple_key_complex_attributes';
+SELECT 'dictGet existing value';
+SELECT dictGet('01681_database_for_flat_dictionary.flat_dictionary_simple_key_complex_attributes', 'value_first', number) as value_first,
+    dictGet('01681_database_for_flat_dictionary.flat_dictionary_simple_key_complex_attributes', 'value_second', number) as value_second FROM system.numbers LIMIT 3;
+SELECT 'dictGet with non existing value';
+SELECT dictGet('01681_database_for_flat_dictionary.flat_dictionary_simple_key_complex_attributes', 'value_first', number) as value_first,
+    dictGet('01681_database_for_flat_dictionary.flat_dictionary_simple_key_complex_attributes', 'value_second', number) as value_second FROM system.numbers LIMIT 4;
+SELECT 'dictGetOrDefault existing value';
+SELECT dictGetOrDefault('01681_database_for_flat_dictionary.flat_dictionary_simple_key_complex_attributes', 'value_first', number, toString('default')) as value_first,
+    dictGetOrDefault('01681_database_for_flat_dictionary.flat_dictionary_simple_key_complex_attributes', 'value_second', number, toString('default')) as value_second FROM system.numbers LIMIT 3;
+SELECT 'dictGetOrDefault non existing value';
+SELECT dictGetOrDefault('01681_database_for_flat_dictionary.flat_dictionary_simple_key_complex_attributes', 'value_first', number, toString('default')) as value_first,
+    dictGetOrDefault('01681_database_for_flat_dictionary.flat_dictionary_simple_key_complex_attributes', 'value_second', number, toString('default')) as value_second FROM system.numbers LIMIT 4;
+SELECT 'dictHas';
+SELECT dictHas('01681_database_for_flat_dictionary.flat_dictionary_simple_key_complex_attributes', number) FROM system.numbers LIMIT 4;
+
+DROP DICTIONARY 01681_database_for_flat_dictionary.flat_dictionary_simple_key_complex_attributes;
+DROP TABLE 01681_database_for_flat_dictionary.simple_key_complex_attributes_source_table;
+
+CREATE TABLE 01681_database_for_flat_dictionary.simple_key_hierarchy_table
+(
+    id UInt64,
+    parent_id UInt64
+) ENGINE = TinyLog();
+
+INSERT INTO 01681_database_for_flat_dictionary.simple_key_hierarchy_table VALUES (1, 0);
+INSERT INTO 01681_database_for_flat_dictionary.simple_key_hierarchy_table VALUES (2, 1);
+INSERT INTO 01681_database_for_flat_dictionary.simple_key_hierarchy_table VALUES (3, 1);
+INSERT INTO 01681_database_for_flat_dictionary.simple_key_hierarchy_table VALUES (4, 2);
+
+CREATE DICTIONARY 01681_database_for_flat_dictionary.flat_dictionary_simple_key_hierarchy
+(
+   id UInt64,
+   parent_id UInt64 HIERARCHICAL
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'simple_key_hierarchy_table'))
+LIFETIME(MIN 1 MAX 1000)
+LAYOUT(FLAT());
+
+SELECT 'Dictionary flat_dictionary_simple_key_hierarchy';
+SELECT 'dictGet';
+SELECT dictGet('01681_database_for_flat_dictionary.flat_dictionary_simple_key_hierarchy', 'parent_id', number) FROM system.numbers LIMIT 5;
+SELECT 'dictGetHierarchy';
+SELECT dictGetHierarchy('01681_database_for_flat_dictionary.flat_dictionary_simple_key_hierarchy', toUInt64(1));
+SELECT dictGetHierarchy('01681_database_for_flat_dictionary.flat_dictionary_simple_key_hierarchy', toUInt64(4));
+
+DROP DICTIONARY 01681_database_for_flat_dictionary.flat_dictionary_simple_key_hierarchy;
+DROP TABLE 01681_database_for_flat_dictionary.simple_key_hierarchy_table;
+
+DROP DATABASE 01681_database_for_flat_dictionary;
diff --git a/tests/queries/0_stateless/01684_insert_specify_shard_id.sql b/tests/queries/0_stateless/01684_insert_specify_shard_id.sql
index ce1c7807b59..712fbfcc506 100644
--- a/tests/queries/0_stateless/01684_insert_specify_shard_id.sql
+++ b/tests/queries/0_stateless/01684_insert_specify_shard_id.sql
@@ -28,8 +28,8 @@ INSERT INTO x_dist SELECT * FROM numbers(10); -- { serverError 55 }
 INSERT INTO y_dist SELECT * FROM numbers(10); -- { serverError 55 }
 
 -- invalid shard id
-INSERT INTO x_dist SELECT * FROM numbers(10) settings insert_shard_id = 3; -- { serverError 1003 }
-INSERT INTO y_dist SELECT * FROM numbers(10) settings insert_shard_id = 3; -- { serverError 1003 }
+INSERT INTO x_dist SELECT * FROM numbers(10) settings insert_shard_id = 3; -- { serverError 577 }
+INSERT INTO y_dist SELECT * FROM numbers(10) settings insert_shard_id = 3; -- { serverError 577 }
 
 DROP TABLE x;
 DROP TABLE x_dist;
diff --git a/tests/queries/0_stateless/01684_ssd_cache_dictionary_simple_key.reference b/tests/queries/0_stateless/01684_ssd_cache_dictionary_simple_key.reference
new file mode 100644
index 00000000000..b3258e36f74
--- /dev/null
+++ b/tests/queries/0_stateless/01684_ssd_cache_dictionary_simple_key.reference
@@ -0,0 +1,66 @@
+Dictionary cache_dictionary_simple_key_simple_attributes
+dictGet existing value
+value_0	value_second_0
+value_1	value_second_1
+value_2	value_second_2
+dictGet with non existing value
+value_0	value_second_0
+value_1	value_second_1
+value_2	value_second_2
+value_first_default	value_second_default
+dictGetOrDefault existing value
+value_0	value_second_0
+value_1	value_second_1
+value_2	value_second_2
+dictGetOrDefault non existing value
+value_0	value_second_0
+value_1	value_second_1
+value_2	value_second_2
+default	default
+dictHas
+1
+1
+1
+0
+select all values as input stream
+0	value_0	value_second_0
+1	value_1	value_second_1
+2	value_2	value_second_2
+Dictionary cache_dictionary_simple_key_complex_attributes
+dictGet existing value
+value_0	value_second_0
+value_1	\N
+value_2	value_second_2
+dictGet with non existing value
+value_0	value_second_0
+value_1	\N
+value_2	value_second_2
+value_first_default	value_second_default
+dictGetOrDefault existing value
+value_0	value_second_0
+value_1	\N
+value_2	value_second_2
+dictGetOrDefault non existing value
+value_0	value_second_0
+value_1	\N
+value_2	value_second_2
+default	default
+dictHas
+1
+1
+1
+0
+select all values as input stream
+0	value_0	value_second_0
+1	value_1	\N
+2	value_2	value_second_2
+Dictionary cache_dictionary_simple_key_hierarchy
+dictGet
+0
+0
+1
+1
+2
+dictGetHierarchy
+[1]
+[4,2,1]
diff --git a/tests/queries/0_stateless/01684_ssd_cache_dictionary_simple_key.sql b/tests/queries/0_stateless/01684_ssd_cache_dictionary_simple_key.sql
new file mode 100644
index 00000000000..9dbad1289f1
--- /dev/null
+++ b/tests/queries/0_stateless/01684_ssd_cache_dictionary_simple_key.sql
@@ -0,0 +1,123 @@
+DROP DATABASE IF EXISTS 01684_database_for_cache_dictionary;
+CREATE DATABASE 01684_database_for_cache_dictionary;
+
+CREATE TABLE 01684_database_for_cache_dictionary.simple_key_simple_attributes_source_table
+(
+   id UInt64,
+   value_first String,
+   value_second String
+)
+ENGINE = TinyLog;
+
+INSERT INTO 01684_database_for_cache_dictionary.simple_key_simple_attributes_source_table VALUES(0, 'value_0', 'value_second_0');
+INSERT INTO 01684_database_for_cache_dictionary.simple_key_simple_attributes_source_table VALUES(1, 'value_1', 'value_second_1');
+INSERT INTO 01684_database_for_cache_dictionary.simple_key_simple_attributes_source_table VALUES(2, 'value_2', 'value_second_2');
+
+CREATE DICTIONARY 01684_database_for_cache_dictionary.cache_dictionary_simple_key_simple_attributes
+(
+   id UInt64,
+   value_first String DEFAULT 'value_first_default',
+   value_second String DEFAULT 'value_second_default'
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'simple_key_simple_attributes_source_table'))
+LIFETIME(MIN 1 MAX 1000)
+LAYOUT(SSD_CACHE(BLOCK_SIZE 4096 FILE_SIZE 8192 PATH '/var/lib/clickhouse/clickhouse_dicts/0d'));
+
+SELECT 'Dictionary cache_dictionary_simple_key_simple_attributes';
+SELECT 'dictGet existing value';
+SELECT dictGet('01684_database_for_cache_dictionary.cache_dictionary_simple_key_simple_attributes', 'value_first', number) as value_first,
+    dictGet('01684_database_for_cache_dictionary.cache_dictionary_simple_key_simple_attributes', 'value_second', number) as value_second FROM system.numbers LIMIT 3;
+SELECT 'dictGet with non existing value';
+SELECT dictGet('01684_database_for_cache_dictionary.cache_dictionary_simple_key_simple_attributes', 'value_first', number) as value_first,
+    dictGet('01684_database_for_cache_dictionary.cache_dictionary_simple_key_simple_attributes', 'value_second', number) as value_second FROM system.numbers LIMIT 4;
+SELECT 'dictGetOrDefault existing value';
+SELECT dictGetOrDefault('01684_database_for_cache_dictionary.cache_dictionary_simple_key_simple_attributes', 'value_first', number, toString('default')) as value_first,
+    dictGetOrDefault('01684_database_for_cache_dictionary.cache_dictionary_simple_key_simple_attributes', 'value_second', number, toString('default')) as value_second FROM system.numbers LIMIT 3;
+SELECT 'dictGetOrDefault non existing value';
+SELECT dictGetOrDefault('01684_database_for_cache_dictionary.cache_dictionary_simple_key_simple_attributes', 'value_first', number, toString('default')) as value_first,
+    dictGetOrDefault('01684_database_for_cache_dictionary.cache_dictionary_simple_key_simple_attributes', 'value_second', number, toString('default')) as value_second FROM system.numbers LIMIT 4;
+SELECT 'dictHas';
+SELECT dictHas('01684_database_for_cache_dictionary.cache_dictionary_simple_key_simple_attributes', number) FROM system.numbers LIMIT 4;
+SELECT 'select all values as input stream';
+SELECT * FROM 01684_database_for_cache_dictionary.cache_dictionary_simple_key_simple_attributes ORDER BY id;
+
+DROP DICTIONARY 01684_database_for_cache_dictionary.cache_dictionary_simple_key_simple_attributes;
+DROP TABLE 01684_database_for_cache_dictionary.simple_key_simple_attributes_source_table;
+
+CREATE TABLE 01684_database_for_cache_dictionary.simple_key_complex_attributes_source_table
+(
+   id UInt64,
+   value_first String,
+   value_second Nullable(String)
+)
+ENGINE = TinyLog;
+
+INSERT INTO 01684_database_for_cache_dictionary.simple_key_complex_attributes_source_table VALUES(0, 'value_0', 'value_second_0');
+INSERT INTO 01684_database_for_cache_dictionary.simple_key_complex_attributes_source_table VALUES(1, 'value_1', NULL);
+INSERT INTO 01684_database_for_cache_dictionary.simple_key_complex_attributes_source_table VALUES(2, 'value_2', 'value_second_2');
+
+CREATE DICTIONARY 01684_database_for_cache_dictionary.cache_dictionary_simple_key_complex_attributes
+(
+   id UInt64,
+   value_first String DEFAULT 'value_first_default',
+   value_second Nullable(String) DEFAULT 'value_second_default'
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'simple_key_complex_attributes_source_table'))
+LIFETIME(MIN 1 MAX 1000)
+LAYOUT(SSD_CACHE(BLOCK_SIZE 4096 FILE_SIZE 8192 PATH '/var/lib/clickhouse/clickhouse_dicts/1d'));
+
+SELECT 'Dictionary cache_dictionary_simple_key_complex_attributes';
+SELECT 'dictGet existing value';
+SELECT dictGet('01684_database_for_cache_dictionary.cache_dictionary_simple_key_complex_attributes', 'value_first', number) as value_first,
+    dictGet('01684_database_for_cache_dictionary.cache_dictionary_simple_key_complex_attributes', 'value_second', number) as value_second FROM system.numbers LIMIT 3;
+SELECT 'dictGet with non existing value';
+SELECT dictGet('01684_database_for_cache_dictionary.cache_dictionary_simple_key_complex_attributes', 'value_first', number) as value_first,
+    dictGet('01684_database_for_cache_dictionary.cache_dictionary_simple_key_complex_attributes', 'value_second', number) as value_second FROM system.numbers LIMIT 4;
+SELECT 'dictGetOrDefault existing value';
+SELECT dictGetOrDefault('01684_database_for_cache_dictionary.cache_dictionary_simple_key_complex_attributes', 'value_first', number, toString('default')) as value_first,
+    dictGetOrDefault('01684_database_for_cache_dictionary.cache_dictionary_simple_key_complex_attributes', 'value_second', number, toString('default')) as value_second FROM system.numbers LIMIT 3;
+SELECT 'dictGetOrDefault non existing value';
+SELECT dictGetOrDefault('01684_database_for_cache_dictionary.cache_dictionary_simple_key_complex_attributes', 'value_first', number, toString('default')) as value_first,
+    dictGetOrDefault('01684_database_for_cache_dictionary.cache_dictionary_simple_key_complex_attributes', 'value_second', number, toString('default')) as value_second FROM system.numbers LIMIT 4;
+SELECT 'dictHas';
+SELECT dictHas('01684_database_for_cache_dictionary.cache_dictionary_simple_key_complex_attributes', number) FROM system.numbers LIMIT 4;
+SELECT 'select all values as input stream';
+SELECT * FROM 01684_database_for_cache_dictionary.cache_dictionary_simple_key_complex_attributes ORDER BY id;
+
+DROP DICTIONARY 01684_database_for_cache_dictionary.cache_dictionary_simple_key_complex_attributes;
+DROP TABLE 01684_database_for_cache_dictionary.simple_key_complex_attributes_source_table;
+
+CREATE TABLE 01684_database_for_cache_dictionary.simple_key_hierarchy_table
+(
+    id UInt64,
+    parent_id UInt64
+) ENGINE = TinyLog();
+
+INSERT INTO 01684_database_for_cache_dictionary.simple_key_hierarchy_table VALUES (1, 0);
+INSERT INTO 01684_database_for_cache_dictionary.simple_key_hierarchy_table VALUES (2, 1);
+INSERT INTO 01684_database_for_cache_dictionary.simple_key_hierarchy_table VALUES (3, 1);
+INSERT INTO 01684_database_for_cache_dictionary.simple_key_hierarchy_table VALUES (4, 2);
+
+CREATE DICTIONARY 01684_database_for_cache_dictionary.cache_dictionary_simple_key_hierarchy
+(
+   id UInt64,
+   parent_id UInt64 HIERARCHICAL
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'simple_key_hierarchy_table'))
+LIFETIME(MIN 1 MAX 1000)
+LAYOUT(SSD_CACHE(BLOCK_SIZE 4096 FILE_SIZE 8192 PATH '/var/lib/clickhouse/clickhouse_dicts/2d'));
+
+SELECT 'Dictionary cache_dictionary_simple_key_hierarchy';
+SELECT 'dictGet';
+SELECT dictGet('01684_database_for_cache_dictionary.cache_dictionary_simple_key_hierarchy', 'parent_id', number) FROM system.numbers LIMIT 5;
+SELECT 'dictGetHierarchy';
+SELECT dictGetHierarchy('01684_database_for_cache_dictionary.cache_dictionary_simple_key_hierarchy', toUInt64(1));
+SELECT dictGetHierarchy('01684_database_for_cache_dictionary.cache_dictionary_simple_key_hierarchy', toUInt64(4));
+
+DROP DICTIONARY 01684_database_for_cache_dictionary.cache_dictionary_simple_key_hierarchy;
+DROP TABLE 01684_database_for_cache_dictionary.simple_key_hierarchy_table;
+
+DROP DATABASE 01684_database_for_cache_dictionary;
diff --git a/tests/queries/0_stateless/01685_ssd_cache_dictionary_complex_key.reference b/tests/queries/0_stateless/01685_ssd_cache_dictionary_complex_key.reference
new file mode 100644
index 00000000000..a0f99ca13cc
--- /dev/null
+++ b/tests/queries/0_stateless/01685_ssd_cache_dictionary_complex_key.reference
@@ -0,0 +1,56 @@
+Dictionary cache_dictionary_complex_key_simple_attributes
+dictGet existing value
+value_0	value_second_0
+value_1	value_second_1
+value_2	value_second_2
+dictGet with non existing value
+value_0	value_second_0
+value_1	value_second_1
+value_2	value_second_2
+value_first_default	value_second_default
+dictGetOrDefault existing value
+value_0	value_second_0
+value_1	value_second_1
+value_2	value_second_2
+dictGetOrDefault non existing value
+value_0	value_second_0
+value_1	value_second_1
+value_2	value_second_2
+default	default
+dictHas
+1
+1
+1
+0
+select all values as input stream
+0	id_key_0	value_0	value_second_0
+1	id_key_1	value_1	value_second_1
+2	id_key_2	value_2	value_second_2
+Dictionary cache_dictionary_complex_key_complex_attributes
+dictGet existing value
+value_0	value_second_0
+value_1	\N
+value_2	value_second_2
+dictGet with non existing value
+value_0	value_second_0
+value_1	\N
+value_2	value_second_2
+value_first_default	value_second_default
+dictGetOrDefault existing value
+value_0	value_second_0
+value_1	\N
+value_2	value_second_2
+dictGetOrDefault non existing value
+value_0	value_second_0
+value_1	\N
+value_2	value_second_2
+default	default
+dictHas
+1
+1
+1
+0
+select all values as input stream
+0	id_key_0	value_0	value_second_0
+1	id_key_1	value_1	\N
+2	id_key_2	value_2	value_second_2
diff --git a/tests/queries/0_stateless/01685_ssd_cache_dictionary_complex_key.sql b/tests/queries/0_stateless/01685_ssd_cache_dictionary_complex_key.sql
new file mode 100644
index 00000000000..03a7e1d80df
--- /dev/null
+++ b/tests/queries/0_stateless/01685_ssd_cache_dictionary_complex_key.sql
@@ -0,0 +1,98 @@
+DROP DATABASE IF EXISTS 01685_database_for_cache_dictionary;
+CREATE DATABASE 01685_database_for_cache_dictionary;
+
+CREATE TABLE 01685_database_for_cache_dictionary.complex_key_simple_attributes_source_table
+(
+   id UInt64,
+   id_key String,
+   value_first String,
+   value_second String
+)
+ENGINE = TinyLog;
+
+INSERT INTO 01685_database_for_cache_dictionary.complex_key_simple_attributes_source_table VALUES(0, 'id_key_0', 'value_0', 'value_second_0');
+INSERT INTO 01685_database_for_cache_dictionary.complex_key_simple_attributes_source_table VALUES(1, 'id_key_1', 'value_1', 'value_second_1');
+INSERT INTO 01685_database_for_cache_dictionary.complex_key_simple_attributes_source_table VALUES(2, 'id_key_2', 'value_2', 'value_second_2');
+
+CREATE DICTIONARY 01685_database_for_cache_dictionary.cache_dictionary_complex_key_simple_attributes
+(
+   id UInt64,
+   id_key String,
+   value_first String DEFAULT 'value_first_default',
+   value_second String DEFAULT 'value_second_default'
+)
+PRIMARY KEY id, id_key
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'complex_key_simple_attributes_source_table' DB '01685_database_for_cache_dictionary'))
+LIFETIME(MIN 1 MAX 1000)
+LAYOUT(COMPLEX_KEY_SSD_CACHE(BLOCK_SIZE 4096 FILE_SIZE 8192 PATH '/var/lib/clickhouse/clickhouse_dicts/0d'));
+
+SELECT 'Dictionary cache_dictionary_complex_key_simple_attributes';
+SELECT 'dictGet existing value';
+SELECT dictGet('01685_database_for_cache_dictionary.cache_dictionary_complex_key_simple_attributes', 'value_first', (number, concat('id_key_', toString(number)))) as value_first,
+    dictGet('01685_database_for_cache_dictionary.cache_dictionary_complex_key_simple_attributes', 'value_second', (number, concat('id_key_', toString(number)))) as value_second FROM system.numbers LIMIT 3;
+SELECT 'dictGet with non existing value';
+SELECT dictGet('01685_database_for_cache_dictionary.cache_dictionary_complex_key_simple_attributes', 'value_first', (number, concat('id_key_', toString(number)))) as value_first,
+    dictGet('01685_database_for_cache_dictionary.cache_dictionary_complex_key_simple_attributes', 'value_second', (number, concat('id_key_', toString(number)))) as value_second FROM system.numbers LIMIT 4;
+SELECT 'dictGetOrDefault existing value';
+SELECT dictGetOrDefault('01685_database_for_cache_dictionary.cache_dictionary_complex_key_simple_attributes', 'value_first', (number, concat('id_key_', toString(number))), toString('default')) as value_first,
+    dictGetOrDefault('01685_database_for_cache_dictionary.cache_dictionary_complex_key_simple_attributes', 'value_second', (number, concat('id_key_', toString(number))), toString('default')) as value_second FROM system.numbers LIMIT 3;
+SELECT 'dictGetOrDefault non existing value';
+SELECT dictGetOrDefault('01685_database_for_cache_dictionary.cache_dictionary_complex_key_simple_attributes', 'value_first', (number, concat('id_key_', toString(number))), toString('default')) as value_first,
+    dictGetOrDefault('01685_database_for_cache_dictionary.cache_dictionary_complex_key_simple_attributes', 'value_second', (number, concat('id_key_', toString(number))), toString('default')) as value_second FROM system.numbers LIMIT 4;
+SELECT 'dictHas';
+SELECT dictHas('01685_database_for_cache_dictionary.cache_dictionary_complex_key_simple_attributes', (number, concat('id_key_', toString(number)))) FROM system.numbers LIMIT 4;
+SELECT 'select all values as input stream';
+SELECT * FROM 01685_database_for_cache_dictionary.cache_dictionary_complex_key_simple_attributes ORDER BY id;
+
+DROP DICTIONARY 01685_database_for_cache_dictionary.cache_dictionary_complex_key_simple_attributes;
+DROP TABLE 01685_database_for_cache_dictionary.complex_key_simple_attributes_source_table;
+
+CREATE TABLE 01685_database_for_cache_dictionary.complex_key_complex_attributes_source_table
+(
+   id UInt64,
+   id_key String,
+   value_first String,
+   value_second Nullable(String)
+)
+ENGINE = TinyLog;
+
+INSERT INTO 01685_database_for_cache_dictionary.complex_key_complex_attributes_source_table VALUES(0, 'id_key_0', 'value_0', 'value_second_0');
+INSERT INTO 01685_database_for_cache_dictionary.complex_key_complex_attributes_source_table VALUES(1, 'id_key_1', 'value_1', NULL);
+INSERT INTO 01685_database_for_cache_dictionary.complex_key_complex_attributes_source_table VALUES(2, 'id_key_2', 'value_2', 'value_second_2');
+
+CREATE DICTIONARY 01685_database_for_cache_dictionary.cache_dictionary_complex_key_complex_attributes
+(
+    id UInt64,
+    id_key String,
+
+    value_first String DEFAULT 'value_first_default',
+    value_second Nullable(String) DEFAULT 'value_second_default'
+)
+PRIMARY KEY id, id_key
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'complex_key_complex_attributes_source_table' DB '01685_database_for_cache_dictionary'))
+LIFETIME(MIN 1 MAX 1000)
+LAYOUT(COMPLEX_KEY_SSD_CACHE(BLOCK_SIZE 4096 FILE_SIZE 8192 PATH '/var/lib/clickhouse/clickhouse_dicts/1d'));
+
+SELECT 'Dictionary cache_dictionary_complex_key_complex_attributes';
+SELECT 'dictGet existing value';
+SELECT dictGet('01685_database_for_cache_dictionary.cache_dictionary_complex_key_complex_attributes', 'value_first', (number, concat('id_key_', toString(number)))) as value_first,
+    dictGet('01685_database_for_cache_dictionary.cache_dictionary_complex_key_complex_attributes', 'value_second', (number, concat('id_key_', toString(number)))) as value_second FROM system.numbers LIMIT 3;
+SELECT 'dictGet with non existing value';
+SELECT dictGet('01685_database_for_cache_dictionary.cache_dictionary_complex_key_complex_attributes', 'value_first', (number, concat('id_key_', toString(number)))) as value_first,
+    dictGet('01685_database_for_cache_dictionary.cache_dictionary_complex_key_complex_attributes', 'value_second', (number, concat('id_key_', toString(number)))) as value_second FROM system.numbers LIMIT 4;
+SELECT 'dictGetOrDefault existing value';
+SELECT dictGetOrDefault('01685_database_for_cache_dictionary.cache_dictionary_complex_key_complex_attributes', 'value_first', (number, concat('id_key_', toString(number))), toString('default')) as value_first,
+    dictGetOrDefault('01685_database_for_cache_dictionary.cache_dictionary_complex_key_complex_attributes', 'value_second', (number, concat('id_key_', toString(number))), toString('default')) as value_second FROM system.numbers LIMIT 3;
+SELECT 'dictGetOrDefault non existing value';
+SELECT dictGetOrDefault('01685_database_for_cache_dictionary.cache_dictionary_complex_key_complex_attributes', 'value_first', (number, concat('id_key_', toString(number))), toString('default')) as value_first,
+    dictGetOrDefault('01685_database_for_cache_dictionary.cache_dictionary_complex_key_complex_attributes', 'value_second', (number, concat('id_key_', toString(number))), toString('default')) as value_second FROM system.numbers LIMIT 4;
+SELECT 'dictHas';
+SELECT dictHas('01685_database_for_cache_dictionary.cache_dictionary_complex_key_complex_attributes', (number, concat('id_key_', toString(number)))) FROM system.numbers LIMIT 4;
+SELECT 'select all values as input stream';
+SELECT * FROM 01685_database_for_cache_dictionary.cache_dictionary_complex_key_complex_attributes ORDER BY id;
+
+DROP DICTIONARY 01685_database_for_cache_dictionary.cache_dictionary_complex_key_complex_attributes;
+DROP TABLE 01685_database_for_cache_dictionary.complex_key_complex_attributes_source_table;
+
+DROP DATABASE 01685_database_for_cache_dictionary;
+
diff --git a/tests/queries/0_stateless/01686_event_time_microseconds_part_log.sql b/tests/queries/0_stateless/01686_event_time_microseconds_part_log.sql
index a1b419527d4..4a653379ef1 100644
--- a/tests/queries/0_stateless/01686_event_time_microseconds_part_log.sql
+++ b/tests/queries/0_stateless/01686_event_time_microseconds_part_log.sql
@@ -8,13 +8,15 @@ CREATE TABLE table_with_single_pk
 ENGINE = MergeTree
 ORDER BY key;
 
-INSERT INTO table_with_single_pk SELECT number, toString(number % 10) FROM numbers(10000000);
+INSERT INTO table_with_single_pk SELECT number, toString(number % 10) FROM numbers(1000000);
 
 SYSTEM FLUSH LOGS;
 
 WITH (
          SELECT (event_time, event_time_microseconds)
          FROM system.part_log
+         WHERE "table" = 'table_with_single_pk'
+             AND "database" = currentDatabase()
          ORDER BY event_time DESC
          LIMIT 1
     ) AS time
diff --git a/tests/queries/0_stateless/01691_DateTime64_clamp.reference b/tests/queries/0_stateless/01691_DateTime64_clamp.reference
index 3adc9a17e5c..881ab4feff8 100644
--- a/tests/queries/0_stateless/01691_DateTime64_clamp.reference
+++ b/tests/queries/0_stateless/01691_DateTime64_clamp.reference
@@ -1,10 +1,11 @@
 -- { echo }
+-- These values are within the extended range of DateTime64 [1925-01-01, 2284-01-01)
 SELECT toTimeZone(toDateTime(-2, 2), 'Europe/Moscow');
-1970-01-01 03:00:00.00
+1970-01-01 02:59:58.00
 SELECT toDateTime64(-2, 2, 'Europe/Moscow');
-1970-01-01 03:00:00.00
+1970-01-01 02:59:58.00
 SELECT CAST(-1 AS DateTime64(0, 'Europe/Moscow'));
-1970-01-01 03:00:00
+1970-01-01 02:59:59
 SELECT CAST('2020-01-01 00:00:00.3' AS DateTime64(0, 'Europe/Moscow'));
 2020-01-01 00:00:00
 SELECT toDateTime64(bitShiftLeft(toUInt64(1), 33), 2, 'Europe/Moscow') FORMAT Null;
@@ -13,5 +14,14 @@ SELECT toTimeZone(toDateTime(-2., 2), 'Europe/Moscow');
 SELECT toDateTime64(-2., 2, 'Europe/Moscow');
 1970-01-01 03:00:00.00
 SELECT toDateTime64(toFloat32(bitShiftLeft(toUInt64(1),33)), 2, 'Europe/Moscow');
-2106-02-07 09:00:00.00
+2106-02-07 09:28:16.00
 SELECT toDateTime64(toFloat64(bitShiftLeft(toUInt64(1),33)), 2, 'Europe/Moscow') FORMAT Null;
+-- These are outsize of extended range and hence clamped
+SELECT toDateTime64(-1 * bitShiftLeft(toUInt64(1), 35), 2);
+1925-01-01 02:00:00.00
+SELECT CAST(-1 * bitShiftLeft(toUInt64(1), 35) AS DateTime64);
+1925-01-01 02:00:00.000
+SELECT CAST(bitShiftLeft(toUInt64(1), 35) AS DateTime64);
+2282-12-31 03:00:00.000
+SELECT toDateTime64(bitShiftLeft(toUInt64(1), 35), 2);
+2282-12-31 03:00:00.00
diff --git a/tests/queries/0_stateless/01691_DateTime64_clamp.sql b/tests/queries/0_stateless/01691_DateTime64_clamp.sql
index 92d5a33328f..c77a66febb3 100644
--- a/tests/queries/0_stateless/01691_DateTime64_clamp.sql
+++ b/tests/queries/0_stateless/01691_DateTime64_clamp.sql
@@ -1,4 +1,5 @@
 -- { echo }
+-- These values are within the extended range of DateTime64 [1925-01-01, 2284-01-01)
 SELECT toTimeZone(toDateTime(-2, 2), 'Europe/Moscow');
 SELECT toDateTime64(-2, 2, 'Europe/Moscow');
 SELECT CAST(-1 AS DateTime64(0, 'Europe/Moscow'));
@@ -8,3 +9,9 @@ SELECT toTimeZone(toDateTime(-2., 2), 'Europe/Moscow');
 SELECT toDateTime64(-2., 2, 'Europe/Moscow');
 SELECT toDateTime64(toFloat32(bitShiftLeft(toUInt64(1),33)), 2, 'Europe/Moscow');
 SELECT toDateTime64(toFloat64(bitShiftLeft(toUInt64(1),33)), 2, 'Europe/Moscow') FORMAT Null;
+
+-- These are outsize of extended range and hence clamped
+SELECT toDateTime64(-1 * bitShiftLeft(toUInt64(1), 35), 2);
+SELECT CAST(-1 * bitShiftLeft(toUInt64(1), 35) AS DateTime64);
+SELECT CAST(bitShiftLeft(toUInt64(1), 35) AS DateTime64);
+SELECT toDateTime64(bitShiftLeft(toUInt64(1), 35), 2);
diff --git a/tests/queries/0_stateless/01698_fix_toMinute.reference b/tests/queries/0_stateless/01698_fix_toMinute.reference
new file mode 100644
index 00000000000..7675aad3a57
--- /dev/null
+++ b/tests/queries/0_stateless/01698_fix_toMinute.reference
@@ -0,0 +1,24 @@
+Check the bug causing situation: the special Australia/Lord_Howe time zone. toDateTime and toString functions are all tested at once
+1554559200	2019-04-07 01:00:00	2019-04-07 01:00:00
+1554559800	2019-04-07 01:10:00	2019-04-07 01:10:00
+1554560400	2019-04-07 01:20:00	2019-04-07 01:20:00
+1554561000	2019-04-07 01:30:00	2019-04-07 01:30:00
+1554561600	2019-04-07 01:40:00	2019-04-07 01:40:00
+1554562200	2019-04-07 01:50:00	2019-04-07 01:50:00
+1554562800	2019-04-07 01:30:00	2019-04-07 01:30:00
+1554563400	2019-04-07 01:40:00	2019-04-07 01:40:00
+1554564000	2019-04-07 01:50:00	2019-04-07 01:50:00
+1554564600	2019-04-07 02:00:00	2019-04-07 02:00:00
+1554565200	2019-04-07 02:10:00	2019-04-07 02:10:00
+1554565800	2019-04-07 02:20:00	2019-04-07 02:20:00
+1554566400	2019-04-07 02:30:00	2019-04-07 02:30:00
+1554567000	2019-04-07 02:40:00	2019-04-07 02:40:00
+1554567600	2019-04-07 02:50:00	2019-04-07 02:50:00
+1554568200	2019-04-07 03:00:00	2019-04-07 03:00:00
+1554568800	2019-04-07 03:10:00	2019-04-07 03:10:00
+1554569400	2019-04-07 03:20:00	2019-04-07 03:20:00
+1554570000	2019-04-07 03:30:00	2019-04-07 03:30:00
+1554570600	2019-04-07 03:40:00	2019-04-07 03:40:00
+4 days test in batch comparing with manually computation result for Europe/Moscow whose timezone epoc is of whole hour:
+4 days test in batch comparing with manually computation result for Asia/Tehran whose timezone epoc is of half hour:
+4 days test in batch comparing with manually computation result for Australia/Lord_Howe whose timezone epoc is of half hour and also its DST offset is half hour:
diff --git a/tests/queries/0_stateless/01698_fix_toMinute.sql b/tests/queries/0_stateless/01698_fix_toMinute.sql
new file mode 100644
index 00000000000..f582806719d
--- /dev/null
+++ b/tests/queries/0_stateless/01698_fix_toMinute.sql
@@ -0,0 +1,16 @@
+/* toDateTime or toString or other functions which should call the toMinute() function will all meet this bug. tests below will verify the toDateTime and toString. */
+SELECT 'Check the bug causing situation: the special Australia/Lord_Howe time zone. toDateTime and toString functions are all tested at once';
+SELECT toUnixTimestamp(x) as tt, (toDateTime('2019-04-07 01:00:00', 'Australia/Lord_Howe') + INTERVAL number * 600 SECOND) AS x,  toString(x) as xx FROM numbers(20);
+
+/* The Batch Part. Test period is whole 4 days*/
+SELECT '4 days test in batch comparing with manually computation result for Europe/Moscow whose timezone epoc is of whole hour:';
+SELECT toUnixTimestamp(x) as tt, (toDateTime('1981-04-01 00:00:00', 'Europe/Moscow') + INTERVAL number * 600 SECOND) AS x, timezoneOffset(x) as res,(toDateTime(toString(x), 'UTC') - x ) AS calc FROM numbers(576) where res != calc;
+SELECT toUnixTimestamp(x) as tt, (toDateTime('1981-09-30 00:00:00', 'Europe/Moscow') + INTERVAL number * 600 SECOND) AS x, timezoneOffset(x) as res,(toDateTime(toString(x), 'UTC') - x ) AS calc FROM numbers(576) where res != calc;
+
+SELECT '4 days test in batch comparing with manually computation result for Asia/Tehran whose timezone epoc is of half hour:';
+SELECT toUnixTimestamp(x) as tt, (toDateTime('2020-03-21 00:00:00', 'Asia/Tehran') + INTERVAL number * 600 SECOND) AS x, timezoneOffset(x) as res,(toDateTime(toString(x), 'UTC') - x ) AS calc FROM numbers(576) where res != calc;
+SELECT toUnixTimestamp(x) as tt, (toDateTime('2020-09-20 00:00:00', 'Asia/Tehran') + INTERVAL number * 600 SECOND) AS x, timezoneOffset(x) as res,(toDateTime(toString(x), 'UTC') - x ) AS calc FROM numbers(576) where res != calc;
+
+SELECT '4 days test in batch comparing with manually computation result for Australia/Lord_Howe whose timezone epoc is of half hour and also its DST offset is half hour:';
+SELECT toUnixTimestamp(x) as tt, (toDateTime('2020-10-04 01:40:00', 'Australia/Lord_Howe') + INTERVAL number * 600 SECOND) AS x, timezoneOffset(x) as res,(toDateTime(toString(x), 'UTC') - x ) AS calc FROM numbers(576) where res != calc;
+SELECT toUnixTimestamp(x) as tt, (toDateTime('2019-04-07 01:00:00', 'Australia/Lord_Howe') + INTERVAL number * 600 SECOND) AS x, timezoneOffset(x) as res,(toDateTime(toString(x), 'UTC') - x ) AS calc FROM numbers(576) where res != calc;
diff --git a/tests/queries/0_stateless/01699_timezoneOffset.reference b/tests/queries/0_stateless/01699_timezoneOffset.reference
index e70c5fa62ee..a1cc6391e6f 100644
--- a/tests/queries/0_stateless/01699_timezoneOffset.reference
+++ b/tests/queries/0_stateless/01699_timezoneOffset.reference
@@ -1,8 +1,8 @@
 DST boundary test for Europe/Moscow:
-0	1981-04-01 22:40:00	10800	355002000
-1	1981-04-01 22:50:00	10800	355002600
-2	1981-04-02 00:00:00	14400	355003200
-3	1981-04-02 00:10:00	14400	355003800
+0	1981-04-01 22:40:00	14400	354998400
+1	1981-04-01 22:50:00	14400	354999000
+2	1981-04-01 23:00:00	14400	354999600
+3	1981-04-01 23:10:00	14400	355000200
 0	1981-09-30 23:00:00	14400	370724400
 1	1981-09-30 23:10:00	14400	370725000
 2	1981-09-30 23:20:00	14400	370725600
@@ -22,10 +22,10 @@ DST boundary test for Europe/Moscow:
 16	1981-10-01 00:40:00	10800	370734000
 17	1981-10-01 00:50:00	10800	370734600
 DST boundary test for Asia/Tehran:
-0	2020-03-21 22:40:00	12600	1584817800
-1	2020-03-21 22:50:00	12600	1584818400
-2	2020-03-22 00:00:00	16200	1584819000
-3	2020-03-22 00:10:00	16200	1584819600
+0	2020-03-21 22:40:00	16200	1584814200
+1	2020-03-21 22:50:00	16200	1584814800
+2	2020-03-21 23:00:00	16200	1584815400
+3	2020-03-21 23:10:00	16200	1584816000
 0	2020-09-20 23:00:00	16200	1600626600
 1	2020-09-20 23:10:00	16200	1600627200
 2	2020-09-20 23:20:00	16200	1600627800
@@ -50,57 +50,29 @@ DST boundary test for Australia/Lord_Howe. This is a special timezone with DST o
 DST boundary test for Australia/Lord_Howe:
 0	2020-10-04 01:40:00	37800	1601737800
 1	2020-10-04 01:50:00	37800	1601738400
-2	2020-10-04 02:00:00	39600	1601739000
-3	2020-10-04 02:10:00	39600	1601739600
+2	2020-10-04 02:30:00	39600	1601739000
+3	2020-10-04 02:40:00	39600	1601739600
 0	2019-04-07 01:00:00	39600	1554559200
 1	2019-04-07 01:10:00	39600	1554559800
 2	2019-04-07 01:20:00	39600	1554560400
 3	2019-04-07 01:30:00	39600	1554561000
 4	2019-04-07 01:40:00	39600	1554561600
 5	2019-04-07 01:50:00	39600	1554562200
-6	2019-04-07 01:00:00	37800	1554562800
-7	2019-04-07 01:10:00	37800	1554563400
-8	2019-04-07 01:20:00	37800	1554564000
-9	2019-04-07 02:30:00	37800	1554564600
-10	2019-04-07 02:40:00	37800	1554565200
-11	2019-04-07 02:50:00	37800	1554565800
-12	2019-04-07 02:00:00	37800	1554566400
-13	2019-04-07 02:10:00	37800	1554567000
-14	2019-04-07 02:20:00	37800	1554567600
-15	2019-04-07 03:30:00	37800	1554568200
-16	2019-04-07 03:40:00	37800	1554568800
-17	2019-04-07 03:50:00	37800	1554569400
+6	2019-04-07 01:30:00	37800	1554562800
+7	2019-04-07 01:40:00	37800	1554563400
+8	2019-04-07 01:50:00	37800	1554564000
+9	2019-04-07 02:00:00	37800	1554564600
+10	2019-04-07 02:10:00	37800	1554565200
+11	2019-04-07 02:20:00	37800	1554565800
+12	2019-04-07 02:30:00	37800	1554566400
+13	2019-04-07 02:40:00	37800	1554567000
+14	2019-04-07 02:50:00	37800	1554567600
+15	2019-04-07 03:00:00	37800	1554568200
+16	2019-04-07 03:10:00	37800	1554568800
+17	2019-04-07 03:20:00	37800	1554569400
 4 days test in batch comparing with manually computation result for Europe/Moscow:
 4 days test in batch comparing with manually computation result for Asia/Tehran:
-The result maybe wrong for toDateTime processing Australia/Lord_Howe
-1601739000	2020-10-04 02:00:00	39600	37800
-1601739600	2020-10-04 02:10:00	39600	37800
-1601740200	2020-10-04 02:20:00	39600	37800
-1601740800	2020-10-04 03:30:00	39600	41400
-1601741400	2020-10-04 03:40:00	39600	41400
-1601742000	2020-10-04 03:50:00	39600	41400
-1601742600	2020-10-04 03:00:00	39600	37800
-1601743200	2020-10-04 03:10:00	39600	37800
-1601743800	2020-10-04 03:20:00	39600	37800
-1601744400	2020-10-04 04:30:00	39600	41400
-1601745000	2020-10-04 04:40:00	39600	41400
-1601745600	2020-10-04 04:50:00	39600	41400
-1601746200	2020-10-04 04:00:00	39600	37800
-1601746800	2020-10-04 04:10:00	39600	37800
-1601747400	2020-10-04 04:20:00	39600	37800
-1601748000	2020-10-04 05:30:00	39600	41400
-1554562800	2019-04-07 01:00:00	37800	36000
-1554563400	2019-04-07 01:10:00	37800	36000
-1554564000	2019-04-07 01:20:00	37800	36000
-1554564600	2019-04-07 02:30:00	37800	39600
-1554565200	2019-04-07 02:40:00	37800	39600
-1554565800	2019-04-07 02:50:00	37800	39600
-1554566400	2019-04-07 02:00:00	37800	36000
-1554567000	2019-04-07 02:10:00	37800	36000
-1554567600	2019-04-07 02:20:00	37800	36000
-1554568200	2019-04-07 03:30:00	37800	39600
-1554568800	2019-04-07 03:40:00	37800	39600
-1554569400	2019-04-07 03:50:00	37800	39600
+4 days test in batch comparing with manually computation result for Australia/Lord_Howe
 Moscow DST Years:
 11	1981-06-01 00:00:00	14400
 12	1982-06-01 00:00:00	14400
diff --git a/tests/queries/0_stateless/01699_timezoneOffset.sql b/tests/queries/0_stateless/01699_timezoneOffset.sql
index 1b3f05ecdd7..8cabb23c4de 100644
--- a/tests/queries/0_stateless/01699_timezoneOffset.sql
+++ b/tests/queries/0_stateless/01699_timezoneOffset.sql
@@ -26,8 +26,7 @@ SELECT '4 days test in batch comparing with manually computation result for Asia
 SELECT toUnixTimestamp(x) as tt, (toDateTime('2020-03-21 00:00:00', 'Asia/Tehran') + INTERVAL number * 600 SECOND) AS x, timezoneOffset(x) as res,(toDateTime(toString(x), 'UTC') - x ) AS calc FROM numbers(576) where res != calc;
 SELECT toUnixTimestamp(x) as tt, (toDateTime('2020-09-20 00:00:00', 'Asia/Tehran') + INTERVAL number * 600 SECOND) AS x, timezoneOffset(x) as res,(toDateTime(toString(x), 'UTC') - x ) AS calc FROM numbers(576) where res != calc;
 
-/* During this test we got unexpected result comes from the toDateTime() function when process the special time zone of 'Australia/Lord_Howe', which may be some kind of bugs. */
-SELECT 'The result maybe wrong for toDateTime processing Australia/Lord_Howe';
+SELECT '4 days test in batch comparing with manually computation result for Australia/Lord_Howe';
 SELECT toUnixTimestamp(x) as tt, (toDateTime('2020-10-04 01:40:00', 'Australia/Lord_Howe') + INTERVAL number * 600 SECOND) AS x, timezoneOffset(x) as res,(toDateTime(toString(x), 'UTC') - x ) AS calc FROM numbers(18) where res != calc;
 SELECT toUnixTimestamp(x) as tt, (toDateTime('2019-04-07 01:00:00', 'Australia/Lord_Howe') + INTERVAL number * 600 SECOND) AS x, timezoneOffset(x) as res,(toDateTime(toString(x), 'UTC') - x ) AS calc FROM numbers(18) where res != calc;
 
diff --git a/tests/queries/0_stateless/01700_point_in_polygon_ubsan.sql b/tests/queries/0_stateless/01700_point_in_polygon_ubsan.sql
index 97db40ab65e..72317df5439 100644
--- a/tests/queries/0_stateless/01700_point_in_polygon_ubsan.sql
+++ b/tests/queries/0_stateless/01700_point_in_polygon_ubsan.sql
@@ -1 +1 @@
-SELECT pointInPolygon((0, 0), [[(0, 0), (10, 10), (256, -9223372036854775808)]]) FORMAT Null;
+SELECT pointInPolygon((0, 0), [[(0, 0), (10, 10), (256, -9223372036854775808)]]) FORMAT Null ;-- { serverError 36 }
diff --git a/tests/queries/0_stateless/01700_system_zookeeper_path_in.reference b/tests/queries/0_stateless/01700_system_zookeeper_path_in.reference
index 2fc177c812e..e491dd9e091 100644
--- a/tests/queries/0_stateless/01700_system_zookeeper_path_in.reference
+++ b/tests/queries/0_stateless/01700_system_zookeeper_path_in.reference
@@ -1,16 +1,14 @@
 block_numbers
 blocks
-1
+r1
 ========
 block_numbers
 blocks
-1
+r1
 ========
 block_numbers
 blocks
 ========
-1
 failed_parts
 last_part
-leader_election-0000000000
 parallel
diff --git a/tests/queries/0_stateless/01700_system_zookeeper_path_in.sql b/tests/queries/0_stateless/01700_system_zookeeper_path_in.sql
index d4126098c7c..02457a956a1 100644
--- a/tests/queries/0_stateless/01700_system_zookeeper_path_in.sql
+++ b/tests/queries/0_stateless/01700_system_zookeeper_path_in.sql
@@ -3,17 +3,20 @@ DROP TABLE IF EXISTS sample_table;
 CREATE TABLE sample_table (
     key UInt64
 )
-ENGINE ReplicatedMergeTree('/clickhouse/01700_system_zookeeper_path_in', '1')
+ENGINE ReplicatedMergeTree('/clickhouse/01700_system_zookeeper_path_in/{shard}', '{replica}')
 ORDER BY tuple();
 
-SELECT name FROM system.zookeeper WHERE path = '/clickhouse/01700_system_zookeeper_path_in' AND name like 'block%' ORDER BY name;
-SELECT name FROM system.zookeeper WHERE path = '/clickhouse/01700_system_zookeeper_path_in/replicas' ORDER BY name;
+SELECT name FROM system.zookeeper WHERE path = '/clickhouse/01700_system_zookeeper_path_in/s1' AND name like 'block%' ORDER BY name;
+SELECT name FROM system.zookeeper WHERE path = '/clickhouse/01700_system_zookeeper_path_in/s1/replicas' AND name LIKE '%r1%' ORDER BY name;
+
 SELECT '========';
-SELECT name FROM system.zookeeper WHERE path IN ('/clickhouse/01700_system_zookeeper_path_in') AND name LIKE 'block%' ORDER BY name;
-SELECT name FROM system.zookeeper WHERE path IN ('/clickhouse/01700_system_zookeeper_path_in/replicas') ORDER BY name;
+SELECT name FROM system.zookeeper WHERE path IN ('/clickhouse/01700_system_zookeeper_path_in/s1') AND name LIKE 'block%' ORDER BY name;
+SELECT name FROM system.zookeeper WHERE path IN ('/clickhouse/01700_system_zookeeper_path_in/s1/replicas') AND name LIKE '%r1%' ORDER BY name;
 SELECT '========';
-SELECT name FROM system.zookeeper WHERE path IN ('/clickhouse/01700_system_zookeeper_path_in','/clickhouse/01700_system_zookeeper_path_in/replicas') AND name LIKE 'block%' ORDER BY name;
+SELECT name FROM system.zookeeper WHERE path IN ('/clickhouse/01700_system_zookeeper_path_in/s1',
+                                                 '/clickhouse/01700_system_zookeeper_path_in/s1/replicas') AND name LIKE 'block%' ORDER BY name;
 SELECT '========';
-SELECT name FROM system.zookeeper WHERE path IN (SELECT concat('/clickhouse/01700_system_zookeeper_path_in/', name) FROM system.zookeeper WHERE (path = '/clickhouse/01700_system_zookeeper_path_in')) ORDER BY name;
+SELECT name FROM system.zookeeper WHERE path IN (SELECT concat('/clickhouse/01700_system_zookeeper_path_in/s1/', name)
+    FROM system.zookeeper WHERE (name != 'replicas' AND name NOT LIKE 'leader_election%' AND path = '/clickhouse/01700_system_zookeeper_path_in/s1')) ORDER BY name;
 
 DROP TABLE IF EXISTS sample_table;
diff --git a/tests/queries/0_stateless/01701_parallel_parsing_infinite_segmentation.sh b/tests/queries/0_stateless/01701_parallel_parsing_infinite_segmentation.sh
index d3e634eb560..edc4f6916ff 100755
--- a/tests/queries/0_stateless/01701_parallel_parsing_infinite_segmentation.sh
+++ b/tests/queries/0_stateless/01701_parallel_parsing_infinite_segmentation.sh
@@ -1,9 +1,11 @@
-#!/usr/bin/env bash                                                                                                                                                                                                                                           
-                                                                                                                                                                                                                                                              
-CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)                                                                                                                                                                                                          
-# shellcheck source=../shell_config.sh                                                                                                                                                                                                                        
-. "$CURDIR"/../shell_config.sh   
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
 
 ${CLICKHOUSE_CLIENT} -q "create table insert_big_json(a String, b String) engine=MergeTree() order by tuple()";
 
-python3 -c "[print('{{\"a\":\"{}\", \"b\":\"{}\"'.format('clickhouse'* 1000000, 'dbms' * 1000000)) for i in range(10)]; [print('{{\"a\":\"{}\", \"b\":\"{}\"}}'.format('clickhouse'* 100000, 'dbms' * 100000)) for i in range(10)]" 2>/dev/null  | ${CLICKHOUSE_CLIENT} --input_format_parallel_parsing=1 --max_memory_usage=0 -q "insert into insert_big_json FORMAT JSONEachRow" 2>&1 | grep -q "min_chunk_bytes_for_parallel_parsing" && echo "Ok." || echo "FAIL" ||:
\ No newline at end of file
+python3 -c "[print('{{\"a\":\"{}\", \"b\":\"{}\"'.format('clickhouse'* 1000000, 'dbms' * 1000000)) for i in range(10)]; [print('{{\"a\":\"{}\", \"b\":\"{}\"}}'.format('clickhouse'* 100000, 'dbms' * 100000)) for i in range(10)]" 2>/dev/null  | ${CLICKHOUSE_CLIENT} --input_format_parallel_parsing=1 --max_memory_usage=0 -q "insert into insert_big_json FORMAT JSONEachRow" 2>&1 | grep -q "min_chunk_bytes_for_parallel_parsing" && echo "Ok." || echo "FAIL" ||:
+
+${CLICKHOUSE_CLIENT} -q "drop table insert_big_json"
diff --git a/tests/queries/0_stateless/01702_system_query_log.reference b/tests/queries/0_stateless/01702_system_query_log.reference
new file mode 100644
index 00000000000..1f329feac22
--- /dev/null
+++ b/tests/queries/0_stateless/01702_system_query_log.reference
@@ -0,0 +1,86 @@
+DROP queries and also a cleanup before the test
+CREATE queries
+SET queries
+ALTER TABLE queries
+SYSTEM queries
+SHOW queries
+GRANT queries
+REVOKE queries
+Misc queries
+ACTUAL LOG CONTENT:
+Select	SELECT \'DROP queries and also a cleanup before the test\';
+Drop	DROP DATABASE IF EXISTS sqllt SYNC;
+	DROP USER IF EXISTS sqllt_user;
+	DROP ROLE IF EXISTS sqllt_role;
+	DROP POLICY IF EXISTS sqllt_policy ON sqllt.table, sqllt.view, sqllt.dictionary;
+	DROP ROW POLICY IF EXISTS sqllt_row_policy ON sqllt.table, sqllt.view, sqllt.dictionary;
+	DROP QUOTA IF EXISTS sqllt_quota;
+	DROP SETTINGS PROFILE IF EXISTS sqllt_settings_profile;
+Select	SELECT \'CREATE queries\';
+Create	CREATE DATABASE sqllt;
+Create	CREATE TABLE sqllt.table\n(\n    i UInt8, s String\n)\nENGINE = MergeTree PARTITION BY tuple() ORDER BY tuple();
+Create	CREATE VIEW sqllt.view AS SELECT i, s FROM sqllt.table;
+Create	CREATE DICTIONARY sqllt.dictionary (key UInt64, value UInt64) PRIMARY KEY key SOURCE(CLICKHOUSE(DB \'sqllt\' TABLE \'table\' HOST \'localhost\' PORT 9001)) LIFETIME(0) LAYOUT(FLAT());
+	CREATE USER sqllt_user IDENTIFIED WITH PLAINTEXT_PASSWORD BY \'password\';
+	CREATE ROLE sqllt_role;
+	CREATE POLICY sqllt_policy ON sqllt.table, sqllt.view, sqllt.dictionary AS PERMISSIVE TO ALL;
+	CREATE POLICY sqllt_row_policy ON sqllt.table, sqllt.view, sqllt.dictionary AS PERMISSIVE TO ALL;
+	CREATE QUOTA sqllt_quota KEYED BY user_name TO sqllt_role;
+	CREATE SETTINGS PROFILE sqllt_settings_profile SETTINGS interactive_delay = 200000;
+Grant	GRANT sqllt_role TO sqllt_user;
+Select	SELECT \'SET queries\';
+	SET log_profile_events=false;
+	SET DEFAULT ROLE sqllt_role TO sqllt_user;
+Select	-- SET ROLE sqllt_role; -- tests are executed by user `default` which is defined in XML and is impossible to update.\n\nSELECT \'ALTER TABLE queries\';
+Alter	ALTER TABLE sqllt.table ADD COLUMN new_col UInt32 DEFAULT 123456789;
+Alter	ALTER TABLE sqllt.table COMMENT COLUMN new_col \'dummy column with a comment\';
+Alter	ALTER TABLE sqllt.table CLEAR COLUMN new_col;
+Alter	ALTER TABLE sqllt.table MODIFY COLUMN new_col DateTime DEFAULT \'2015-05-18 07:40:13\';
+Alter	ALTER TABLE sqllt.table MODIFY COLUMN new_col REMOVE COMMENT;
+Alter	ALTER TABLE sqllt.table RENAME COLUMN new_col TO the_new_col;
+Alter	ALTER TABLE sqllt.table DROP COLUMN the_new_col;
+Alter	ALTER TABLE sqllt.table UPDATE i = i + 1 WHERE 1;
+Alter	ALTER TABLE sqllt.table DELETE WHERE i > 65535;
+Select	-- not done, seems to hard, so I\'ve skipped queries of ALTER-X, where X is:\n-- PARTITION\n-- ORDER BY\n-- SAMPLE BY\n-- INDEX\n-- CONSTRAINT\n-- TTL\n-- USER\n-- QUOTA\n-- ROLE\n-- ROW POLICY\n-- SETTINGS PROFILE\n\nSELECT \'SYSTEM queries\';
+System	SYSTEM FLUSH LOGS;
+System	SYSTEM STOP MERGES sqllt.table
+System	SYSTEM START MERGES sqllt.table
+System	SYSTEM STOP TTL MERGES sqllt.table
+System	SYSTEM START TTL MERGES sqllt.table
+System	SYSTEM STOP MOVES sqllt.table
+System	SYSTEM START MOVES sqllt.table
+System	SYSTEM STOP FETCHES sqllt.table
+System	SYSTEM START FETCHES sqllt.table
+System	SYSTEM STOP REPLICATED SENDS sqllt.table
+System	SYSTEM START REPLICATED SENDS sqllt.table
+Select	-- SYSTEM RELOAD DICTIONARY sqllt.dictionary; -- temporary out of order: Code: 210, Connection refused (localhost:9001) (version 21.3.1.1)\n-- DROP REPLICA\n-- haha, no\n-- SYSTEM KILL;\n-- SYSTEM SHUTDOWN;\n\n-- Since we don\'t really care about the actual output, suppress it with `FORMAT Null`.\nSELECT \'SHOW queries\';
+	SHOW CREATE TABLE sqllt.table FORMAT Null;
+	SHOW CREATE DICTIONARY sqllt.dictionary FORMAT Null;
+	SHOW DATABASES LIKE \'sqllt\' FORMAT Null;
+	SHOW TABLES FROM sqllt FORMAT Null;
+	SHOW DICTIONARIES FROM sqllt FORMAT Null;
+	SHOW GRANTS FORMAT Null;
+	SHOW GRANTS FOR sqllt_user FORMAT Null;
+	SHOW CREATE USER sqllt_user FORMAT Null;
+	SHOW CREATE ROLE sqllt_role FORMAT Null;
+	SHOW CREATE POLICY sqllt_policy FORMAT Null;
+	SHOW CREATE ROW POLICY sqllt_row_policy FORMAT Null;
+	SHOW CREATE QUOTA sqllt_quota FORMAT Null;
+	SHOW CREATE SETTINGS PROFILE sqllt_settings_profile FORMAT Null;
+Select	SELECT \'GRANT queries\';
+Grant	GRANT SELECT ON sqllt.table TO sqllt_user;
+Grant	GRANT DROP ON sqllt.view TO sqllt_user;
+Select	SELECT \'REVOKE queries\';
+Revoke	REVOKE SELECT ON sqllt.table FROM sqllt_user;
+Revoke	REVOKE DROP ON sqllt.view FROM sqllt_user;
+Select	SELECT \'Misc queries\';
+	DESCRIBE TABLE sqllt.table FORMAT Null;
+	CHECK TABLE sqllt.table FORMAT Null;
+Drop	DETACH TABLE sqllt.table;
+Create	ATTACH TABLE sqllt.table;
+Rename	RENAME TABLE sqllt.table TO sqllt.table_new;
+Rename	RENAME TABLE sqllt.table_new TO sqllt.table;
+Drop	TRUNCATE TABLE sqllt.table;
+Drop	DROP TABLE sqllt.table SYNC;
+	SET log_comment=\'\';
+DROP queries and also a cleanup after the test
diff --git a/tests/queries/0_stateless/01702_system_query_log.sql b/tests/queries/0_stateless/01702_system_query_log.sql
new file mode 100644
index 00000000000..e3ebf97edb7
--- /dev/null
+++ b/tests/queries/0_stateless/01702_system_query_log.sql
@@ -0,0 +1,146 @@
+-- fire all kinds of queries and then check if those are present in the system.query_log
+SET log_comment='system.query_log logging test';
+
+SELECT 'DROP queries and also a cleanup before the test';
+DROP DATABASE IF EXISTS sqllt SYNC;
+DROP USER IF EXISTS sqllt_user;
+DROP ROLE IF EXISTS sqllt_role;
+DROP POLICY IF EXISTS sqllt_policy ON sqllt.table, sqllt.view, sqllt.dictionary;
+DROP ROW POLICY IF EXISTS sqllt_row_policy ON sqllt.table, sqllt.view, sqllt.dictionary;
+DROP QUOTA IF EXISTS sqllt_quota;
+DROP SETTINGS PROFILE IF EXISTS sqllt_settings_profile;
+
+SELECT 'CREATE queries';
+CREATE DATABASE sqllt;
+
+CREATE TABLE sqllt.table
+(
+    i UInt8, s String
+)
+ENGINE = MergeTree PARTITION BY tuple() ORDER BY tuple();
+
+CREATE VIEW sqllt.view AS SELECT i, s FROM sqllt.table;
+CREATE DICTIONARY sqllt.dictionary (key UInt64, value UInt64) PRIMARY KEY key SOURCE(CLICKHOUSE(DB 'sqllt' TABLE 'table' HOST 'localhost' PORT 9001)) LIFETIME(0) LAYOUT(FLAT());
+
+CREATE USER sqllt_user IDENTIFIED WITH PLAINTEXT_PASSWORD BY 'password';
+CREATE ROLE sqllt_role;
+
+CREATE POLICY sqllt_policy ON sqllt.table, sqllt.view, sqllt.dictionary AS PERMISSIVE TO ALL;
+CREATE POLICY sqllt_row_policy ON sqllt.table, sqllt.view, sqllt.dictionary AS PERMISSIVE TO ALL;
+
+CREATE QUOTA sqllt_quota KEYED BY user_name TO sqllt_role;
+CREATE SETTINGS PROFILE sqllt_settings_profile SETTINGS interactive_delay = 200000;
+
+GRANT sqllt_role TO sqllt_user;
+
+
+SELECT 'SET queries';
+SET log_profile_events=false;
+SET DEFAULT ROLE sqllt_role TO sqllt_user;
+-- SET ROLE sqllt_role; -- tests are executed by user `default` which is defined in XML and is impossible to update.
+
+SELECT 'ALTER TABLE queries';
+ALTER TABLE sqllt.table ADD COLUMN new_col UInt32 DEFAULT 123456789;
+ALTER TABLE sqllt.table COMMENT COLUMN new_col 'dummy column with a comment';
+ALTER TABLE sqllt.table CLEAR COLUMN new_col;
+ALTER TABLE sqllt.table MODIFY COLUMN new_col DateTime DEFAULT '2015-05-18 07:40:13';
+ALTER TABLE sqllt.table MODIFY COLUMN new_col REMOVE COMMENT;
+ALTER TABLE sqllt.table RENAME COLUMN new_col TO the_new_col;
+ALTER TABLE sqllt.table DROP COLUMN the_new_col;
+ALTER TABLE sqllt.table UPDATE i = i + 1 WHERE 1;
+ALTER TABLE sqllt.table DELETE WHERE i > 65535;
+
+-- not done, seems to hard, so I've skipped queries of ALTER-X, where X is:
+-- PARTITION
+-- ORDER BY
+-- SAMPLE BY
+-- INDEX
+-- CONSTRAINT
+-- TTL
+-- USER
+-- QUOTA
+-- ROLE
+-- ROW POLICY
+-- SETTINGS PROFILE
+
+SELECT 'SYSTEM queries';
+SYSTEM FLUSH LOGS;
+SYSTEM STOP MERGES sqllt.table;
+SYSTEM START MERGES sqllt.table;
+SYSTEM STOP TTL MERGES sqllt.table;
+SYSTEM START TTL MERGES sqllt.table;
+SYSTEM STOP MOVES sqllt.table;
+SYSTEM START MOVES sqllt.table;
+SYSTEM STOP FETCHES sqllt.table;
+SYSTEM START FETCHES sqllt.table;
+SYSTEM STOP REPLICATED SENDS sqllt.table;
+SYSTEM START REPLICATED SENDS sqllt.table;
+
+-- SYSTEM RELOAD DICTIONARY sqllt.dictionary; -- temporary out of order: Code: 210, Connection refused (localhost:9001) (version 21.3.1.1)
+-- DROP REPLICA
+-- haha, no
+-- SYSTEM KILL;
+-- SYSTEM SHUTDOWN;
+
+-- Since we don't really care about the actual output, suppress it with `FORMAT Null`.
+SELECT 'SHOW queries';
+
+SHOW CREATE TABLE sqllt.table FORMAT Null;
+SHOW CREATE DICTIONARY sqllt.dictionary FORMAT Null;
+SHOW DATABASES LIKE 'sqllt' FORMAT Null;
+SHOW TABLES FROM sqllt FORMAT Null;
+SHOW DICTIONARIES FROM sqllt FORMAT Null;
+SHOW GRANTS FORMAT Null;
+SHOW GRANTS FOR sqllt_user FORMAT Null;
+SHOW CREATE USER sqllt_user FORMAT Null;
+SHOW CREATE ROLE sqllt_role FORMAT Null;
+SHOW CREATE POLICY sqllt_policy FORMAT Null;
+SHOW CREATE ROW POLICY sqllt_row_policy FORMAT Null;
+SHOW CREATE QUOTA sqllt_quota FORMAT Null;
+SHOW CREATE SETTINGS PROFILE sqllt_settings_profile FORMAT Null;
+
+SELECT 'GRANT queries';
+GRANT SELECT ON sqllt.table TO sqllt_user;
+GRANT DROP ON sqllt.view TO sqllt_user;
+
+SELECT 'REVOKE queries';
+REVOKE SELECT ON sqllt.table FROM sqllt_user;
+REVOKE DROP ON sqllt.view FROM sqllt_user;
+
+SELECT 'Misc queries';
+DESCRIBE TABLE sqllt.table FORMAT Null;
+
+CHECK TABLE sqllt.table FORMAT Null;
+DETACH TABLE sqllt.table;
+ATTACH TABLE sqllt.table;
+
+RENAME TABLE sqllt.table TO sqllt.table_new;
+RENAME TABLE sqllt.table_new TO sqllt.table;
+TRUNCATE TABLE sqllt.table;
+DROP TABLE sqllt.table SYNC;
+
+SET log_comment='';
+---------------------------------------------------------------------------------------------------
+-- Now get all logs related to this test
+---------------------------------------------------------------------------------------------------
+
+SYSTEM FLUSH LOGS;
+SELECT 'ACTUAL LOG CONTENT:';
+
+-- Try to filter out all possible previous junk events by excluding old log entries,
+SELECT query_kind, query FROM system.query_log
+WHERE
+    log_comment LIKE '%system.query_log%' AND type == 'QueryStart' AND event_date >= yesterday()
+    AND current_database == currentDatabase()
+ORDER BY event_time_microseconds;
+
+
+-- cleanup
+SELECT 'DROP queries and also a cleanup after the test';
+DROP DATABASE IF EXISTS sqllt;
+DROP USER IF EXISTS sqllt_user;
+DROP ROLE IF EXISTS sqllt_role;
+DROP POLICY IF EXISTS sqllt_policy ON sqllt.table, sqllt.view, sqllt.dictionary;
+DROP ROW POLICY IF EXISTS sqllt_row_policy ON sqllt.table, sqllt.view, sqllt.dictionary;
+DROP QUOTA IF EXISTS sqllt_quota;
+DROP SETTINGS PROFILE IF EXISTS sqllt_settings_profile;
diff --git a/tests/queries/0_stateless/01702_toDateTime_from_string_clamping.reference b/tests/queries/0_stateless/01702_toDateTime_from_string_clamping.reference
index 228086615da..7e8307d66a6 100644
--- a/tests/queries/0_stateless/01702_toDateTime_from_string_clamping.reference
+++ b/tests/queries/0_stateless/01702_toDateTime_from_string_clamping.reference
@@ -1,9 +1,9 @@
 -- { echo }
 SELECT toString(toDateTime('-922337203.6854775808', 1));
-2106-02-07 15:41:33.6
+1940-10-09 22:13:17.6
 SELECT toString(toDateTime('9922337203.6854775808', 1));
-2104-12-30 00:50:11.6
+2283-11-11 23:46:43.6
 SELECT toDateTime64(CAST('10000000000.1' AS Decimal64(1)), 1);
-2106-02-07 20:50:08.1
+2283-11-11 23:46:40.1
 SELECT toDateTime64(CAST('-10000000000.1' AS Decimal64(1)), 1);
-2011-12-23 00:38:08.1
+1925-01-01 00:00:00.1
diff --git a/tests/queries/0_stateless/01709_inactive_parts_to_delay_throw.sql b/tests/queries/0_stateless/01709_inactive_parts_to_delay_throw.sql
deleted file mode 100644
index fad890c4807..00000000000
--- a/tests/queries/0_stateless/01709_inactive_parts_to_delay_throw.sql
+++ /dev/null
@@ -1,12 +0,0 @@
-drop table if exists x;
-
-create table x (i int) engine MergeTree order by i settings old_parts_lifetime = 10000000000, min_bytes_for_wide_part = 0, inactive_parts_to_throw_insert = 1;
-
-insert into x values (1);
-insert into x values (2);
-
-optimize table x final;
-
-insert into x values (3); -- { serverError 252; }
-
-drop table if exists x;
diff --git a/tests/queries/0_stateless/01709_inactive_parts_to_throw_insert.reference b/tests/queries/0_stateless/01709_inactive_parts_to_throw_insert.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01709_inactive_parts_to_throw_insert.sql b/tests/queries/0_stateless/01709_inactive_parts_to_throw_insert.sql
new file mode 100644
index 00000000000..6de0d4f4e0c
--- /dev/null
+++ b/tests/queries/0_stateless/01709_inactive_parts_to_throw_insert.sql
@@ -0,0 +1,12 @@
+drop table if exists data_01709;
+
+create table data_01709 (i int) engine MergeTree order by i settings old_parts_lifetime = 10000000000, min_bytes_for_wide_part = 0, inactive_parts_to_throw_insert = 1;
+
+insert into data_01709 values (1);
+insert into data_01709 values (2);
+
+optimize table data_01709 final;
+
+insert into data_01709 values (3); -- { serverError 252; }
+
+drop table data_01709;
diff --git a/tests/queries/0_stateless/01710_join_use_nulls.reference b/tests/queries/0_stateless/01710_join_use_nulls.reference
index 8bd111e0416..069117803a7 100644
--- a/tests/queries/0_stateless/01710_join_use_nulls.reference
+++ b/tests/queries/0_stateless/01710_join_use_nulls.reference
@@ -1,3 +1,4 @@
 3
+3
 1
 1
diff --git a/tests/queries/0_stateless/01710_join_use_nulls.sql b/tests/queries/0_stateless/01710_join_use_nulls.sql
index b024227d4e2..980ac48dd13 100644
--- a/tests/queries/0_stateless/01710_join_use_nulls.sql
+++ b/tests/queries/0_stateless/01710_join_use_nulls.sql
@@ -4,15 +4,15 @@ DROP TABLE IF EXISTS Y;
 CREATE TABLE X (id Int) ENGINE=Memory;
 CREATE TABLE Y (id Int) ENGINE=Memory;
 
--- Type mismatch of columns to JOIN by: plus(id, 1) Int64 at left, Y.id Int32 at right.
-SELECT Y.id - 1 FROM X RIGHT JOIN Y ON (X.id + 1) = Y.id SETTINGS join_use_nulls=1; -- { serverError 53 }
+SELECT Y.id - 1 FROM X RIGHT JOIN Y ON (X.id + 1) = Y.id SETTINGS join_use_nulls=1;
 SELECT Y.id - 1 FROM X RIGHT JOIN Y ON (X.id + 1) = toInt64(Y.id) SETTINGS join_use_nulls=1;
 
--- Logical error: 'Arguments of 'plus' have incorrect data types: '2' of type 'UInt8', '1' of type 'UInt8''.
+-- Fix issue #20366 
+-- Arguments of 'plus' have incorrect data types: '2' of type 'UInt8', '1' of type 'UInt8'.
 -- Because 1 became toNullable(1), i.e.:
 --     2 UInt8 Const(size = 1, UInt8(size = 1))
 --     1 UInt8 Const(size = 1, Nullable(size = 1, UInt8(size = 1), UInt8(size = 1)))
-SELECT 2+1 FROM system.one X RIGHT JOIN system.one Y ON X.dummy+1 = Y.dummy SETTINGS join_use_nulls = 1; -- { serverError 53 }
+SELECT 2+1 FROM system.one X RIGHT JOIN system.one Y ON X.dummy+1 = Y.dummy SETTINGS join_use_nulls = 1;
 SELECT 2+1 FROM system.one X RIGHT JOIN system.one Y ON X.dummy+1 = toUInt16(Y.dummy) SETTINGS join_use_nulls = 1;
 SELECT X.dummy+1 FROM system.one X RIGHT JOIN system.one Y ON X.dummy = Y.dummy SETTINGS join_use_nulls = 1;
 SELECT Y.dummy+1 FROM system.one X RIGHT JOIN system.one Y ON X.dummy = Y.dummy SETTINGS join_use_nulls = 1;
diff --git a/tests/queries/0_stateless/01711_cte_subquery_fix.sql b/tests/queries/0_stateless/01711_cte_subquery_fix.sql
index ddea548eada..10ad9019209 100644
--- a/tests/queries/0_stateless/01711_cte_subquery_fix.sql
+++ b/tests/queries/0_stateless/01711_cte_subquery_fix.sql
@@ -1,3 +1,7 @@
 drop table if exists t;
 create table t engine = Memory as with cte as (select * from numbers(10)) select * from cte;
 drop table t;
+
+drop table if exists view1;
+create view view1 as with t as (select number n from numbers(3)) select n from t;
+drop table view1;
diff --git a/tests/queries/0_stateless/01715_table_function_view_fix.sql b/tests/queries/0_stateless/01715_table_function_view_fix.sql
index de5150b7b70..b96609391b5 100644
--- a/tests/queries/0_stateless/01715_table_function_view_fix.sql
+++ b/tests/queries/0_stateless/01715_table_function_view_fix.sql
@@ -1 +1,3 @@
 SELECT view(SELECT 1); -- { clientError 62 }
+
+SELECT sumIf(dummy, dummy) FROM remote('127.0.0.{1,2}', numbers(2, 100), view(SELECT CAST(NULL, 'Nullable(UInt8)') AS dummy FROM system.one)); -- { serverError 183 }
diff --git a/tests/queries/0_stateless/01715_tuple_insert_null_as_default.reference b/tests/queries/0_stateless/01715_tuple_insert_null_as_default.reference
new file mode 100644
index 00000000000..20f0fadfdcf
--- /dev/null
+++ b/tests/queries/0_stateless/01715_tuple_insert_null_as_default.reference
@@ -0,0 +1,15 @@
+Tuple
+(0,1)
+(0,1)
+Tuple nested in Array
+[(0,2),(3,0),(0,4)]
+[(0,2),(3,0),(0,4)]
+Tuple nested in Array nested in Tuple
+(0,[(0,2),(3,0),(0,4)])
+(0,[(0,2),(3,0),(0,4)])
+Tuple nested in Map
+{'test':(0,1)}
+{'test':(0,1)}
+Tuple nested in Map nested in Tuple
+(0,{'test':(0,1)})
+(0,{'test':(0,1)})
diff --git a/tests/queries/0_stateless/01715_tuple_insert_null_as_default.sql b/tests/queries/0_stateless/01715_tuple_insert_null_as_default.sql
new file mode 100644
index 00000000000..d5fd9af22bd
--- /dev/null
+++ b/tests/queries/0_stateless/01715_tuple_insert_null_as_default.sql
@@ -0,0 +1,77 @@
+SELECT 'Tuple';
+
+DROP TABLE IF EXISTS test_tuple;
+CREATE TABLE test_tuple (value Tuple(UInt8, UInt8)) ENGINE=TinyLog;
+
+SET input_format_null_as_default = 1;
+INSERT INTO test_tuple VALUES ((NULL, 1));
+SELECT * FROM test_tuple;
+
+SET input_format_null_as_default = 0;
+INSERT INTO test_tuple VALUES ((NULL, 2)); -- { clientError 53 }
+SELECT * FROM test_tuple;
+
+DROP TABLE test_tuple;
+
+SELECT 'Tuple nested in Array';
+
+DROP TABLE IF EXISTS test_tuple_nested_in_array;
+CREATE TABLE test_tuple_nested_in_array (value Array(Tuple(UInt8, UInt8))) ENGINE=TinyLog;
+
+SET input_format_null_as_default = 1;
+INSERT INTO test_tuple_nested_in_array VALUES ([(NULL, 2), (3, NULL), (NULL, 4)]);
+SELECT * FROM test_tuple_nested_in_array;
+
+SET input_format_null_as_default = 0;
+INSERT INTO test_tuple_nested_in_array VALUES ([(NULL, 1)]); -- { clientError 53 }
+SELECT * FROM test_tuple_nested_in_array;
+
+DROP TABLE test_tuple_nested_in_array;
+
+SELECT 'Tuple nested in Array nested in Tuple';
+
+DROP TABLE IF EXISTS test_tuple_nested_in_array_nested_in_tuple;
+CREATE TABLE test_tuple_nested_in_array_nested_in_tuple (value Tuple(UInt8, Array(Tuple(UInt8, UInt8)))) ENGINE=TinyLog;
+
+SET input_format_null_as_default = 1;
+INSERT INTO test_tuple_nested_in_array_nested_in_tuple VALUES ( (NULL, [(NULL, 2), (3, NULL), (NULL, 4)]) );
+SELECT * FROM test_tuple_nested_in_array_nested_in_tuple;
+
+SET input_format_null_as_default = 0;
+INSERT INTO test_tuple_nested_in_array_nested_in_tuple VALUES ( (NULL, [(NULL, 1)]) ); -- { clientError 53 }
+SELECT * FROM test_tuple_nested_in_array_nested_in_tuple;
+
+DROP TABLE test_tuple_nested_in_array_nested_in_tuple;
+
+SELECT 'Tuple nested in Map';
+
+SET allow_experimental_map_type = 1;
+
+DROP TABLE IF EXISTS test_tuple_nested_in_map;
+CREATE TABLE test_tuple_nested_in_map (value Map(String, Tuple(UInt8, UInt8))) ENGINE=TinyLog;
+
+SET input_format_null_as_default = 1;
+INSERT INTO test_tuple_nested_in_map VALUES (map('test', (NULL, 1)));
+
+SELECT * FROM test_tuple_nested_in_map;
+
+SET input_format_null_as_default = 0;
+INSERT INTO test_tuple_nested_in_map VALUES (map('test', (NULL, 1))); -- { clientError 53 }
+SELECT * FROM test_tuple_nested_in_map;
+
+DROP TABLE test_tuple_nested_in_map;
+
+SELECT 'Tuple nested in Map nested in Tuple';
+
+DROP TABLE IF EXISTS test_tuple_nested_in_map_nested_in_tuple;
+CREATE TABLE test_tuple_nested_in_map_nested_in_tuple (value Tuple(UInt8, Map(String, Tuple(UInt8, UInt8)))) ENGINE=TinyLog;
+
+SET input_format_null_as_default = 1;
+INSERT INTO test_tuple_nested_in_map_nested_in_tuple VALUES ( (NULL, map('test', (NULL, 1))) );
+SELECT * FROM test_tuple_nested_in_map_nested_in_tuple;
+
+SET input_format_null_as_default = 0;
+INSERT INTO test_tuple_nested_in_map_nested_in_tuple VALUES ( (NULL, map('test', (NULL, 1))) ); -- { clientError 53 }
+SELECT * FROM test_tuple_nested_in_map_nested_in_tuple;
+
+DROP TABLE test_tuple_nested_in_map_nested_in_tuple;
diff --git a/tests/queries/0_stateless/01720_constraints_complex_types.reference b/tests/queries/0_stateless/01720_constraints_complex_types.reference
new file mode 100644
index 00000000000..01e79c32a8c
--- /dev/null
+++ b/tests/queries/0_stateless/01720_constraints_complex_types.reference
@@ -0,0 +1,3 @@
+1
+2
+3
diff --git a/tests/queries/0_stateless/01720_constraints_complex_types.sql b/tests/queries/0_stateless/01720_constraints_complex_types.sql
new file mode 100644
index 00000000000..273f509b6eb
--- /dev/null
+++ b/tests/queries/0_stateless/01720_constraints_complex_types.sql
@@ -0,0 +1,47 @@
+SET allow_suspicious_low_cardinality_types = 1;
+
+DROP TABLE IF EXISTS constraint_on_nullable_type;
+CREATE TABLE constraint_on_nullable_type
+(
+    `id` Nullable(UInt64),
+    CONSTRAINT `c0` CHECK `id` = 1
+)
+ENGINE = TinyLog();
+
+INSERT INTO constraint_on_nullable_type VALUES (0); -- {serverError 469}
+INSERT INTO constraint_on_nullable_type VALUES (1);
+
+SELECT * FROM constraint_on_nullable_type;
+
+DROP TABLE constraint_on_nullable_type;
+
+DROP TABLE IF EXISTS constraint_on_low_cardinality_type;
+CREATE TABLE constraint_on_low_cardinality_type
+(
+    `id` LowCardinality(UInt64),
+    CONSTRAINT `c0` CHECK `id` = 2
+)
+ENGINE = TinyLog;
+
+INSERT INTO constraint_on_low_cardinality_type VALUES (0); -- {serverError 469}
+INSERT INTO constraint_on_low_cardinality_type VALUES (2);
+
+SELECT * FROM constraint_on_low_cardinality_type;
+
+DROP TABLE constraint_on_low_cardinality_type;
+
+DROP TABLE IF EXISTS constraint_on_low_cardinality_nullable_type;
+
+CREATE TABLE constraint_on_low_cardinality_nullable_type
+(
+    `id` LowCardinality(Nullable(UInt64)),
+    CONSTRAINT `c0` CHECK `id` = 3
+)
+ENGINE = TinyLog;
+
+INSERT INTO constraint_on_low_cardinality_nullable_type VALUES (0); -- {serverError 469}
+INSERT INTO constraint_on_low_cardinality_nullable_type VALUES (3);
+
+SELECT * FROM constraint_on_low_cardinality_nullable_type;
+
+DROP TABLE constraint_on_low_cardinality_nullable_type;
diff --git a/tests/queries/0_stateless/01720_country_intersection.reference b/tests/queries/0_stateless/01720_country_intersection.reference
new file mode 100644
index 00000000000..5b7cee92bdc
--- /dev/null
+++ b/tests/queries/0_stateless/01720_country_intersection.reference
@@ -0,0 +1,104 @@
+Dhekelia Sovereign Base Area	Dhekelia Sovereign Base Area	[[[(33.847423,34.94245),(33.819672,34.964748),(33.80421,34.972602),(33.781896,34.976212),(33.784945,34.976212),(33.788046,34.976988),(33.7928,34.977763),(33.79435,34.977763),(33.791146,34.982414),(33.786495,34.984687),(33.782568,34.984687),(33.777917,34.984687),(33.77399,34.988666),(33.766135,34.990268),(33.761484,34.990268),(33.75921,34.988666),(33.765411,34.985566),(33.769339,34.983964),(33.770889,34.980088),(33.77554,34.980088),(33.780191,34.979313),(33.780986,34.976338),(33.780935,34.976345),(33.760427,34.979682),(33.717296,34.977769),(33.70152,34.97289),(33.702935,34.987943),(33.711461,34.985566),(33.71544,34.997296),(33.699731,35.002722),(33.69663,35.008975),(33.705312,35.015228),(33.702211,35.022256),(33.685003,35.029284),(33.679444,35.033891),(33.679435,35.033899),(33.675649,35.037036),(33.674099,35.046441),(33.678853,35.055794),(33.69446,35.058171),(33.705312,35.06675),(33.714717,35.06675),(33.719368,35.06277),(33.711461,35.040963),(33.707585,35.029284),(33.718489,35.032385),(33.739677,35.047216),(33.766135,35.03161),(33.77554,35.040188),(33.786495,35.038534),(33.79435,35.040188),(33.798278,35.052642),(33.824012,35.06675),(33.834865,35.063597),(33.842719,35.056621),(33.853571,35.058171),(33.866904,35.06675),(33.871555,35.073054),(33.876929,35.076826),(33.871555,35.085456),(33.871555,35.100236),(33.876206,35.118994),(33.889435,35.118994),(33.891812,35.110468),(33.89884,35.108814),(33.903594,35.099512),(33.905868,35.09636),(33.905868,35.090882),(33.913619,35.090882),(33.921474,35.080702),(33.914446,35.073054),(33.908245,35.070729),(33.906524,35.069122),(33.906506,35.069105),(33.898116,35.061272),(33.880133,35.073054),(33.874655,35.067525),(33.867627,35.060497),(33.855122,35.053417),(33.841169,35.051092),(33.834865,35.056621),(33.827113,35.061272),(33.813781,35.055794),(33.804375,35.049541),(33.799001,35.038534),(33.822359,35.030059),(33.830214,35.023031),(33.829387,35.001176),(33.829387,35.001172),(33.840342,34.993369),(33.859049,34.991819),(33.859049,34.974662),(33.850471,34.973009),(33.838068,34.963707),(33.84582,34.959728),(33.864423,34.962983),(33.891841,34.958139),(33.8838,34.949123),(33.874522,34.94123),(33.862315,34.937893),(33.847423,34.94245)],[(33.746689,35.002711),(33.752063,35.004323),(33.752063,35.0144),(33.746151,35.015207),(33.741314,35.013729),(33.740239,35.010101),(33.738761,35.005264),(33.739702,35.002576),(33.742792,35.001233),(33.746689,35.002711)]]]
+Dhekelia Sovereign Base Area	Kyrgyzstan	[]
+Kyrgyzstan	Dhekelia Sovereign Base Area	[]
+Kyrgyzstan	Kyrgyzstan	[[[(74.746683,40.336505),(74.724668,40.337539),(74.705755,40.331286),(74.654388,40.291547),(74.637645,40.281987),(74.598681,40.266174),(74.565402,40.24695),(74.476622,40.172433),(74.369858,40.105822),(74.333788,40.09373),(74.302885,40.090061),(74.272293,40.093833),(74.237876,40.10391),(74.20315,40.109853),(74.167596,40.10639),(74.13287,40.095332),(74.101244,40.078847),(74.069515,40.067788),(74.003989,40.060812),(73.976704,40.043603),(73.966368,40.033268),(73.957894,40.021434),(73.952106,40.008257),(73.949729,39.993684),(73.944044,39.970068),(73.927301,39.953325),(73.907561,39.937873),(73.893195,39.918133),(73.885443,39.876534),(73.880689,39.86501),(73.872937,39.856845),(73.844102,39.838086),(73.83201,39.82372),(73.823018,39.805685),(73.818574,39.786048),(73.819814,39.766721),(73.829529,39.746981),(73.843068,39.740366),(73.859915,39.737162),(73.879345,39.727912),(73.893505,39.710394),(73.899602,39.689465),(73.904253,39.64647),(73.926784,39.592882),(73.921617,39.582133),(73.899292,39.571539),(73.883066,39.561204000000004),(73.870457,39.546786),(73.859192,39.524255),(73.848029,39.489735),(73.838314,39.475679),(73.820744,39.468186),(73.632642,39.448343),(73.604323,39.459608),(73.512236,39.467411),(73.476889,39.464776),(73.367645,39.443795),(73.343151,39.430669),(73.335503,39.415166),(73.333332,39.40111),(73.326408,39.390878),(73.269357,39.382558),(73.167864,39.355377),(73.136032,39.353465),(73.100995,39.361164),(73.083425,39.367831),(73.071126,39.370725),(73.058414,39.368813),(73.009321,39.348607),(72.994335,39.347832),(72.976765,39.352224),(72.91434,39.362715),(72.893669,39.363903),(72.850468,39.35672),(72.835275,39.356204),(72.65048,39.393772),(72.633737,39.394496),(72.616373,39.390413),(72.606141,39.383489),(72.587021,39.364885),(72.575756,39.359304),(72.559426,39.359562),(72.534104,39.372327),(72.519015,39.375686),(72.50806,39.371965),(72.476744,39.346127),(72.460414,39.344111),(72.443567,39.344783),(72.410701,39.351346),(72.393234,39.350829),(72.355924,39.336101),(72.334117,39.333828),(72.31634,39.328815),(72.304248,39.31357),(72.281407,39.259724),(72.240272,39.189909),(72.228903,39.189237),(72.228668,39.189502),(72.218568,39.20089),(72.209163,39.217297),(72.206476,39.226883),(72.206373,39.234609),(72.203272,39.24081),(72.182395,39.249337),(72.167098,39.258742),(72.158623,39.262617),(72.115525,39.268147),(72.094751,39.275072),(72.08576,39.290109),(72.084106,39.311245),(72.078112,39.336618),(72.06695,39.358477),(72.049793,39.368864),(72.031499,39.366694),(71.996463,39.351863),(71.959152,39.345868),(71.942306,39.339047),(71.843501,39.285045),(71.807017,39.272849),(71.77043,39.269542),(71.751207,39.274245),(71.732913,39.285097),(71.71834,39.301065),(71.710899,39.32096),(71.712966,39.341527),(71.723198,39.353981),(71.736634,39.364575),(71.748106,39.379561),(71.751827,39.399663),(71.749243,39.425502),(71.740251,39.448343),(71.724438,39.459401),(71.704594,39.458988),(71.602792,39.442348),(71.554319,39.444157),(71.512875,39.458833),(71.492101,39.493663),(71.500576,39.509217),(71.526001,39.538156),(71.531375,39.553091),(71.52538,39.569162),(71.510911,39.584148),(71.509654,39.584998),(71.493031,39.596241),(71.459545,39.612105),(71.441251,39.610658),(71.406731,39.598153),(71.378309,39.594173),(71.368543,39.591486),(71.36161799999999,39.587559),(71.347872,39.576242),(71.340586,39.571694),(71.305911,39.557173),(71.291958,39.548957),(71.260074,39.520638),(71.249273,39.514385),(71.236923,39.514488),(71.179975,39.523015),(71.137446,39.521155),(71.095898,39.51237),(71.062928,39.495627),(71.042309,39.467876),(71.027581,39.435217),(71.009288,39.407622),(70.977145,39.394909),(70.949808,39.400749),(70.925159,39.412944),(70.903351,39.420851),(70.884489,39.413874),(70.872242,39.402971),(70.864181,39.400594),(70.855292,39.40173),(70.840099,39.40142),(70.828059,39.398578),(70.797621,39.385349),(70.770129,39.382093),(70.739744,39.386228),(70.713285,39.398423),(70.698092,39.41899),(70.698609,39.431393),(70.703053,39.444725),(70.705431,39.458523),(70.699746,39.472165),(70.690134,39.479193),(70.666725,39.486893),(70.655976,39.493663),(70.655976,39.493714),(70.655925,39.49387),(70.655598,39.494664),(70.635977,39.542497),(70.622128,39.563529),(70.59784,39.577792),(70.58027,39.579549),(70.54358,39.574278),(70.526113,39.575622),(70.513504,39.581513),(70.490973,39.596861),(70.477227,39.601201),(70.459967,39.599548),(70.427618,39.590091),(70.411082,39.587456),(70.40147,39.584768),(70.395372,39.579497),(70.390411,39.57402),(70.384313,39.570867),(70.374288,39.571022),(70.353462,39.575932),(70.343179,39.576862),(70.33026,39.573089),(70.241066,39.522395),(70.223289,39.519087999999996),(70.20603,39.5241),(70.204376,39.538156),(70.215021,39.574071),(70.214814,39.591125),(70.210267,39.609728),(70.200655,39.619495),(70.185204,39.610348),(70.15735,39.563891),(70.148979,39.554279),(70.132442,39.550042),(70.116268,39.554641),(70.08273,39.569782000000004),(70.062266,39.573451),(70.040355,39.573606),(70.019684,39.568594),(70.002734,39.556863),(69.987128,39.539603),(69.978757,39.534436),(69.948629,39.545081),(69.907753,39.548492),(69.830445,39.536244),(69.791585,39.545391),(69.74983,39.563839),(69.710349,39.574071),(69.669421,39.577792),(69.582295,39.573555),(69.564932,39.568129),(69.531445,39.545649),(69.514392,39.537588),(69.496099,39.532575),(69.477288,39.530405),(69.455274,39.530456),(69.412176,39.52503),(69.391454,39.530508),(69.367218,39.549938),(69.361637,39.552884),(69.352025,39.549628),(69.348407,39.543169),(69.345927,39.535366),(69.339726,39.528079),(69.300348,39.515625),(69.286189,39.539707),(69.29115,39.658872),(69.287533,39.677786),(69.280091,39.694271),(69.265932,39.707758),(69.248362,39.719385),(69.233324,39.732666),(69.226296,39.751011),(69.229552,39.790544),(69.240714,39.82894),(69.286447,39.935755),(69.305671,39.968621),(69.310064,39.978646),(69.310322,39.984796),(69.313991,39.986914),(69.32784,39.984744),(69.357296,39.959474),(69.405355,39.896119),(69.501576,39.922474),(69.500439,39.935703),(69.477288,39.968156),(69.478115,39.975029),(69.477288,39.981592),(69.475118,39.987741),(69.471191,39.993684),(69.463129,40.025413),(69.46964,40.050993),(69.485712,40.073731),(69.506331,40.096933),(69.509224,40.103445),(69.513462,40.120705),(69.518009,40.125097),(69.526071,40.123185),(69.536613,40.107889),(69.543021,40.103083),(69.558834,40.101739),(69.575474,40.1036),(69.969558,40.211603),(70.004595,40.208761),(70.14717,40.136983),(70.168822,40.13166),(70.218535,40.134141),(70.241531,40.132745),(70.263494,40.12427),(70.277808,40.112075),(70.290262,40.098174),(70.306282,40.08479),(70.324265,40.077503),(70.359509,40.074041),(70.397646,40.061225),(70.477227,40.052027),(70.502135,40.045981),(70.525493,40.033682),(70.535622,40.015957),(70.520946,39.993736),(70.505029,39.985106),(70.488493,39.978543),(70.473197,39.97012),(70.460226,39.956115),(70.450872,39.937408),(70.44803,39.919993),(70.455627,39.906816),(70.477227,39.900925),(70.485961,39.909606),(70.494177,39.931672),(70.500895,39.940561),(70.512574,39.94516),(70.555052,39.946245),(70.576601,39.952239),(70.5966,39.961955),(70.613963,39.975752),(70.627399,39.993891),(70.635977,40.028514),(70.634737,40.059313),(70.63944,40.084945),(70.66595,40.104168),(70.729822,40.120705),(70.743464,40.127113),(70.782532,40.152589),(70.788733,40.158997),(70.792144,40.161374),(70.797725,40.161942),(70.802686,40.160134),(70.806045,40.157653),(70.806716,40.156155),(70.824906,40.163544),(70.831831,40.168195),(70.845164,40.171813),(70.898545,40.162614),(70.929293,40.170624),(70.962883,40.189693),(70.979522,40.214084),(70.958955,40.238372),(70.995129,40.266587),(71.053213,40.274235),(71.169382,40.26142),(71.201008,40.263848),(71.215115,40.280747),(71.223952,40.302864),(71.239558,40.321106),(71.253821,40.324413),(71.263949,40.318212),(71.272838,40.307722),(71.283225,40.29842),(71.297074,40.293821),(71.313559,40.292684),(71.344926,40.295216),(71.365132,40.294131),(71.396551,40.271548),(71.441355,40.260903),(71.450966,40.248914),(71.458925,40.234134),(71.477115,40.220802),(71.498405,40.210518),(71.521246,40.203749),(71.568272,40.196566),(71.592973,40.198426),(71.601655,40.20995),(71.604032,40.227261),(71.61013,40.246382),(71.62832,40.258887),(71.645993,40.247105),(71.660153,40.224471),(71.667181,40.204162),(71.666871,40.163131),(71.673072,40.147886),(71.693329,40.141117),(71.707178,40.144269),(71.759785,40.168092),(71.775908,40.179926),(71.78676,40.193517),(71.805467,40.225298),(71.836473,40.249172),(71.872956,40.250774),(71.912334,40.243436),(71.951814,40.240904),(71.96339,40.243746),(71.969178,40.244418),(71.977033,40.243074),(71.989021,40.239302),(72.004834,40.237287),(72.01889,40.240026),(72.025402,40.250878),(72.019821,40.258732),(72.013239,40.262072),(72.005971,40.26576),(71.977033,40.276096),(71.958222,40.286534),(71.951091,40.30152),(71.951094,40.301529),(71.956672,40.31568),(72.043178,40.349321),(72.069637,40.369423),(72.084106,40.39738),(72.090101,40.416035),(72.099299,40.426371),(72.165858,40.454431),(72.182705,40.45779),(72.228328,40.459606),(72.235931,40.459909),(72.254225,40.458307),(72.263415,40.452651),(72.26363,40.452519),(72.259599,40.44239),(72.24513,40.438721),(72.228077,40.437533),(72.216501,40.434949),(72.211768,40.425836),(72.211644,40.425596),(72.224356,40.422443),(72.269624,40.424045),(72.284301,40.41986),(72.343418,40.393401),(72.370497,40.38565),(72.394061,40.389422),(72.414422,40.410713),(72.425171,40.435983),(72.426204,40.45934),(72.426096,40.459545),(72.420028,40.471027),(72.415662,40.479287),(72.415585,40.47933),(72.372254,40.503265),(72.363469,40.512309),(72.363467,40.51241),(72.363262,40.523573999999996),(72.36998,40.539852),(72.370083,40.557732),(72.369928,40.557930999999996),(72.348483,40.585379),(72.348509,40.585508),(72.351893,40.601967),(72.381556,40.612148),(72.414835,40.589875),(72.447908,40.560471),(72.476744,40.549567),(72.515294,40.54564),(72.585781,40.508743),(72.625468,40.5105),(72.640868,40.519853),(72.65048,40.532151999999996),(72.655131,40.546363),(72.656474,40.561143),(72.664226,40.577783),(72.682416,40.577679),(72.719209,40.564864),(72.748355,40.575096),(72.760034,40.641758),(72.783908,40.669663),(72.818945,40.681084),(72.890982,40.695088),(72.976765,40.736068),(73.070609,40.762474),(73.118048,40.782938),(73.148641,40.813686),(73.14337,40.833839),(73.143292,40.833853),(73.135042,40.835274),(73.112467,40.839162),(73.053556,40.83632),(73.033299,40.847224),(73.01945,40.8619),(73.00343,40.870168),(72.929429,40.844175),(72.883127,40.819628),(72.870311,40.818181),(72.872998,40.834821),(72.868658,40.864122),(72.830107,40.87208),(72.701226,40.863243),(72.658231,40.867171),(72.619474,40.88009),(72.588468,40.905825),(72.545577,40.956519),(72.52625,40.962204),(72.501445,40.963496),(72.483358,40.970575),(72.483565,40.99352),(72.485219,40.999566),(72.484702,41.004682),(72.481911,41.008816),(72.476744,41.011813),(72.423517,41.01574),(72.395198,41.022045),(72.374321,41.031967),(72.345692,41.06597),(72.33236,41.072843),(72.314066,41.061681),(72.308795,41.054446),(72.297323,41.028143),(72.289778,41.023544),(72.252985,41.019616),(72.195486,41.006358),(72.165135,40.999359),(72.178777,41.023182),(72.185599,41.041062),(72.185599,41.060647),(72.1764,41.112892),(72.174643,41.141418),(72.169889,41.168651),(72.158417,41.187875),(72.132889,41.199295),(72.108497,41.196401),(72.085243,41.184877),(72.063642,41.170201),(72.033773,41.15661),(72.016513,41.163535),(72.001217,41.18002),(71.977033,41.195213),(71.897658,41.184929),(71.871613,41.194489),(71.866342,41.236606),(71.868822,41.279239),(71.863034,41.312208),(71.847015,41.341819),(71.75317,41.44729),(71.745212,41.45282),(71.73684,41.455404),(71.730433,41.451166),(71.729709,41.430082),(71.721648,41.424759),(71.712242,41.428015),(71.706868,41.444086),(71.696119,41.447445),(71.691469,41.441916),(71.687334,41.431012),(71.681443,41.422847),(71.671935,41.425483),(71.671108,41.437627),(71.689505,41.493799),(71.689401,41.514625),(71.68413,41.534055),(71.671418,41.547388),(71.649507,41.54992),(71.62739,41.543202),(71.615297,41.532143),(71.595454,41.493799),(71.595454,41.493747),(71.595557,41.493696),(71.595557,41.493489),(71.605582,41.476849),(71.633694,41.449616),(71.637415,41.431271),(71.633074,41.411324),(71.618811,41.377786),(71.585532,41.323525),(71.557937,41.301718),(71.52383,41.296654),(71.480629,41.310761),(71.432466,41.344816),(71.418772,41.3474),(71.412571,41.334687),(71.421459,41.162088),(71.416085,41.127362),(71.393657,41.112737),(71.325238,41.157334),(71.300226,41.133046),(71.289478,41.113874),(71.276145,41.113151),(71.263381,41.123486),(71.253821,41.13749),(71.241522,41.175162),(71.230153,41.187255),(71.206382,41.188753),(71.185711,41.180227),(71.183024,41.166377),(71.187882,41.148446),(71.189949,41.127465),(71.18013,41.108138),(71.164421,41.116199),(71.139099,41.148394),(71.123079,41.158212),(71.085769,41.162036),(71.067579,41.169736),(71.047012,41.182035),(71.024688,41.189787),(70.977145,41.19635),(70.93415,41.19144),(70.914203,41.193042),(70.895962,41.206116),(70.882164,41.220482),(70.865731,41.233195),(70.847747,41.243065),(70.828524,41.249111),(70.805993,41.247458),(70.786563,41.24043),(70.770439,41.238518),(70.758037,41.25216),(70.75628,41.269627),(70.77106,41.331018),(70.769199,41.352102),(70.759691,41.372515),(70.70357,41.445482),(70.686724,41.462483),(70.66781,41.471372),(70.633807,41.467496),(70.511334,41.414476),(70.477227,41.404657),(70.470782,41.404879),(70.453198,41.405484),(70.438057,41.416078),(70.413614,41.450701),(70.398989,41.464964),(70.382246,41.476436),(70.344936,41.493489),(70.344729,41.493644),(70.344522,41.493696),(70.344419,41.493799),(70.203446,41.505633),(70.166549,41.520206),(70.148255,41.552452),(70.169288,41.578342),(70.33119,41.649629),(70.390824,41.685054),(70.423484,41.696913),(70.453663,41.71208),(70.477227,41.738435),(70.506476,41.78559),(70.550091,41.824063),(70.648948,41.887393),(70.679696,41.901113),(70.779328,41.909665),(70.814003,41.919535),(70.825113,41.93633),(70.828059,41.993743),(70.845474,42.030356),(70.886711,42.038495),(70.935907,42.036867),(70.977145,42.044231),(71.118429,42.122908),(71.201008,42.140788),(71.238215,42.160244),(71.253201,42.197555),(71.249868,42.198385),(71.217854,42.206365),(71.077604,42.281167),(71.045772,42.29096),(71.014042,42.287704),(70.9696,42.263468),(70.947793,42.248146),(70.918648,42.253365),(70.897822,42.261608),(70.858134,42.291063),(70.852657,42.306075),(70.864801,42.321552),(70.888825,42.338575),(70.900354,42.346744),(70.932703,42.3762),(70.939835,42.387827),(70.937354,42.394778),(70.931773,42.401496),(70.929913,42.412296),(70.936114,42.431623),(70.947586,42.451286),(70.961952,42.468107),(70.977145,42.478752),(71.024739,42.455963),(71.041017,42.4548),(71.054712,42.460381),(71.064168,42.470329),(71.066287,42.482137),(71.057864,42.493402),(71.057657,42.493402),(71.057554,42.493506),(71.057554,42.493609),(71.022724,42.51645),(71.012699,42.526036),(71.00319,42.563527),(71.040656,42.580529),(71.127007,42.590606),(71.142768,42.602543),(71.148091,42.6174),(71.146437,42.656855),(71.149021,42.677939),(71.157548,42.687938),(71.19522,42.69724),(71.211446,42.705224),(71.223849,42.717936),(71.245449,42.747133),(71.262502,42.753567),(71.284723,42.7484),(71.308495,42.740105),(71.329785,42.737031),(71.347562,42.742844),(71.363065,42.75411),(71.376294,42.768321),(71.386939,42.783074),(71.404613,42.794883),(71.428849,42.79558),(71.477115,42.78354),(71.493651,42.788914),(71.504193,42.789612),(71.51432199999999,42.78571),(71.553803,42.760905),(71.566308,42.757236),(71.583568,42.759639),(71.693536,42.811807),(71.726402,42.819660999999996),(71.796682,42.822297),(71.831408,42.831573),(71.847738,42.834053),(71.863241,42.829041),(71.878847,42.821341),(71.895384,42.816044),(71.956982,42.804598),(72.072737,42.757185),(72.10488,42.750337),(72.11997,42.75181),(72.148805,42.76199),(72.164101,42.765091),(72.292362,42.76106),(72.358405,42.741397),(72.476744,42.682564),(72.51178,42.677551),(72.583817,42.678275),(72.725824,42.652876),(72.756933,42.640215),(72.780601,42.620449),(72.815224,42.573036),(72.840752,42.555698),(72.874549,42.543993),(72.908345,42.536965),(72.942348,42.536035),(73.070609,42.551926),(73.115051,42.550841),(73.152671,42.539213),(73.172722,42.527845),(73.189052,42.520765),(73.206828,42.517173),(73.278348,42.513401),(73.301396,42.507071),(73.316589,42.493712),(73.313385,42.463171),(73.314419,42.441571),(73.326201,42.428677),(73.417461,42.41705),(73.476889,42.399067),(73.505105,42.402943),(73.505518,42.420926),(73.505077,42.421557),(73.432964,42.524847),(73.417565,42.556163),(73.41002,42.58965),(73.412707,42.627322),(73.423869,42.662772),(73.476889,42.75088),(73.503554,42.794082),(73.507068,42.809404),(73.504278,42.827594),(73.491979,42.861003),(73.489498,42.877823),(73.493012,42.894954),(73.501177,42.909346),(73.521744,42.936166),(73.559675,43.017298),(73.57094,43.031922),(73.58665,43.042283),(73.634089,43.062463),(73.805551,43.114734),(73.822811,43.117318),(73.864256,43.116103),(73.90167,43.13096),(73.935053,43.199716),(73.965335,43.216924),(73.985385,43.211679),(74.021456,43.186306),(74.039852,43.181861),(74.197362,43.195788),(74.213899,43.202635),(74.216586,43.216924),(74.206044,43.234106),(74.178759,43.261702),(74.207697,43.24979),(74.25865,43.215761),(74.286969,43.207209),(74.320042,43.201654),(74.348774,43.191034),(74.400554,43.159537),(74.420604,43.151837),(74.462772,43.148634),(74.498222,43.131115),(74.539253,43.122899),(74.558167,43.115044),(74.572016,43.102202),(74.597028,43.070344),(74.61129,43.058174),(74.71392,42.999883),(74.74875,42.990013),(74.862851,42.975828),(74.948531,42.944848),(74.976849,42.926477),(75.005375,42.9164),(75.066146,42.902602),(75.094258,42.890303),(75.118133,42.876531),(75.178594,42.84966),(75.204639,42.84519),(75.271198,42.845758000000004),(75.496611,42.823925),(75.535988,42.827025),(75.555936,42.825217),(75.620428,42.805295),(75.646163,42.806096),(75.675308,42.815371999999996),(75.703833,42.830488),(75.727605,42.848678),(75.73825,42.861571),(75.770599,42.92565),(75.782072,42.933324),(75.797161,42.936192),(75.807059,42.936771),(75.858966,42.939809),(75.898033,42.935701),(75.976582,42.918725),(75.999113,42.91764),(76.064535,42.93397),(76.09058,42.93428),(76.163754,42.921154),(76.254498,42.921154),(76.340487,42.901672),(76.351132,42.902886),(76.370976,42.909604),(76.382965,42.910069),(76.3933,42.905263),(76.404463,42.889244),(76.414074,42.885497),(76.432058,42.88958),(76.461927,42.910999),(76.48053,42.916968),(76.506885,42.914488),(76.558768,42.89821),(76.58502,42.894799),(76.605897,42.898494),(76.644345,42.911129),(76.688786,42.910328),(76.707907,42.913661),(76.74625,42.928879),(76.750385,42.932574),(76.751625,42.937096),(76.753899,42.940765),(76.76134,42.942057),(76.77953,42.939292),(76.785214,42.939654),(76.792966,42.943065),(76.814153,42.961487),(76.83348,42.971745),(76.853427,42.974122),(76.897662,42.974536),(76.93735,42.986034),(76.956884,42.988514),(76.976417,42.98221),(77.089899,42.968154),(77.124005,42.958904),(77.135064,42.951746),(77.163693,42.921981),(77.178679,42.913196),(77.195112,42.910069),(77.21189,42.909944),(77.229632,42.909811),(77.328127,42.897564),(77.36089,42.90454),(77.403265,42.919759),(77.418561,42.922239),(77.43396,42.921412),(77.461762,42.914384),(77.501553,42.914539),(77.520984,42.906917),(77.53845,42.896272),(77.557777,42.888133),(77.574417,42.887848),(77.62692,42.906555),(77.647797,42.909501),(77.71384,42.907589),(77.781226,42.895626),(77.787531,42.889709),(77.791665,42.883043),(77.798176,42.877513),(77.809958,42.871286),(77.83559,42.879839),(77.852229,42.887952),(77.861221,42.89082),(77.883855,42.893223),(77.907006,42.891285),(77.929331,42.885006),(77.986175,42.860202),(78.030616,42.854672),(78.137897,42.861984),(78.183579,42.86015),(78.229777,42.865007),(78.249104,42.862398),(78.290136,42.851442),(78.31122,42.850512),(78.328376,42.855292),(78.364653,42.872526),(78.38553,42.878237),(78.429559,42.880665),(78.496118,42.875601),(78.594303,42.850228),(78.635437,42.832477),(78.669957,42.811161),(78.687114,42.804598),(78.807933,42.79558),(78.888135,42.771215),(78.954281,42.768424),(78.992935,42.757133),(79.030866,42.756151),(79.108794,42.785348),(79.148274,42.790981),(79.173389,42.785632),(79.180831,42.77553),(79.175146,42.737031),(79.176076,42.713931),(79.181864,42.693597),(79.192199,42.674838),(79.206359,42.656467),(79.242119,42.629776),(79.321287,42.602181),(79.353016,42.577299),(79.398388,42.496942),(79.425673,42.469605),(79.47642,42.453973),(79.571918,42.449529),(79.652533,42.461053),(79.696458,42.459838),(79.917943,42.42444),(79.960111,42.403511),(79.97396,42.39147),(80.012098,42.349509),(80.077003,42.305765),(80.110076,42.273338),(80.136534,42.23887),(80.16661,42.208717),(80.210328,42.189519),(80.21653,42.174404),(80.219837,42.141873),(80.224591,42.125569),(80.235133,42.110945),(80.247432,42.098413),(80.256527,42.084357),(80.257561,42.065263),(80.231206,42.033689),(80.181906,42.020976),(79.930862,42.023276),(79.879496,42.013199),(79.842909,42.00183),(79.826786,41.992244),(79.812833,41.97762),(79.803842,41.959998),(79.792576,41.922817),(79.783274,41.905092),(79.747514,41.879745),(79.702969,41.874939),(79.655737,41.875843),(79.610985,41.867626),(79.554658,41.837602),(79.489856,41.819257),(79.410997,41.778588),(79.390844,41.772697),(79.367382,41.772387),(79.30413,41.787554),(79.282323,41.783497),(79.264856,41.774506),(79.217521,41.741226),(79.19592,41.729521),(79.174526,41.722622),(79.127914,41.714302),(79.088743,41.702546),(78.976192,41.6418),(78.915834,41.63317),(78.897437,41.626272),(78.807313,41.578445),(78.672128,41.538448),(78.658278,41.532453),(78.645049,41.52372),(78.637401,41.512868),(78.629133,41.48796),(78.619211,41.478089),(78.583968,41.465997),(78.51038,41.454422),(78.41757,41.400471),(78.377675,41.386622),(78.359899,41.377527),(78.343466,41.362024),(78.339332,41.344041),(78.356901,41.305542),(78.359692,41.287455),(78.34946,41.270402),(78.331477,41.258723),(78.291582,41.240791),(78.275356,41.228854),(78.250345,41.200535),(78.231335,41.172856),(78.204456,41.133718),(78.190503,41.11775),(78.176034,41.105502),(78.074955,41.039512),(78.057178,41.034344),(78.036508,41.036101),(77.997647,41.049795),(77.866699,41.064058),(77.831042,41.062973),(77.797556,41.054704),(77.665574,41.001271),(77.650278,40.997137),(77.631778,40.995793),(77.580721,40.997705),(77.503517,40.981066),(77.47488799999999,40.982047),(77.445226,40.993675),(77.388795,41.011658),(77.332985,41.02065),(77.301152,41.019306),(77.243171,41.005664),(77.118838,41.011658),(77.088555,41.019565),(77.035018,41.040338),(77.007733,41.044214),(76.900143,41.025766),(76.860972,41.013208),(76.834927,40.99352),(76.820871,40.97781),(76.783974,40.957139),(76.766818,40.944685),(76.757413,40.925772),(76.760927,40.9066),(76.768368,40.887014),(76.770848,40.867119),(76.762477,40.847017),(76.746871,40.83446),(76.707286,40.817613),(76.674214,40.795444),(76.647859,40.764851),(76.630805,40.728885),(76.624191,40.627547),(76.62078,40.611321),(76.609411,40.59711),(76.556391,40.565690000000004),(76.531173,40.534995),(76.498927,40.464611),(76.476499,40.436138),(76.449111,40.415519),(76.361984,40.371904),(76.330152,40.348081),(76.313512,40.343327),(76.299353,40.355677),(76.283333,40.417276),(76.273411,40.434122),(76.244162,40.441202),(76.21543,40.416552),(76.185044,40.384203),(76.151351,40.368131),(76.132541,40.371542),(76.095231,40.387355),(76.07611,40.391954),(76.051616,40.390197),(75.962422,40.357331),(75.949297,40.343068),(75.938031,40.326222),(75.921495,40.309117),(75.901858,40.298885),(75.880464,40.295268),(75.858553,40.296353),(75.79375,40.30891),(75.772046,40.31015),(75.750549,40.308342),(75.704454,40.293149),(75.681819,40.291702),(75.664869,40.305706),(75.656291,40.32307),(75.640168,40.367305),(75.638308,40.386115),(75.64636899999999,40.405338),(75.659598,40.419084),(75.669314,40.432365),(75.666936,40.450245),(75.657221,40.461097),(75.629006,40.481303),(75.617947,40.493964),(75.610816,40.512877),(75.605648,40.569411),(75.587665,40.611941),(75.559863,40.63287),(75.523793,40.63318),(75.481832,40.614111),(75.26324,40.480166),(75.253318,40.47598),(75.241536,40.474068),(75.229237,40.470347),(75.223966,40.462441),(75.220142,40.452984),(75.212494,40.444716),(75.19389,40.441254),(75.175287,40.448127),(75.15658,40.458152),(75.13808,40.463888),(75.113172,40.460787),(75.064389,40.443837),(75.039068,40.441099),(75.002378,40.4473),(74.966101,40.459289),(74.879181,40.505074),(74.856443,40.513187),(74.835359,40.511637),(74.832312,40.508116),(74.820063,40.493964),(74.816032,40.48368),(74.815102,40.480114),(74.807041,40.461769),(74.794638,40.440737),(74.787404,40.420738),(74.794638,40.405545),(74.841664,40.372059),(74.853859,40.35883),(74.862128,40.32617),(74.830915,40.319917),(74.746683,40.336505)],[(70.63298,39.79845),(70.661609,39.809819),(70.694527,39.814832),(70.70481,39.822067),(70.706412,39.839998),(70.698919,39.858447),(70.68662,39.860876),(70.654994,39.849765),(70.619906,39.850695),(70.498725,39.881908),(70.483739,39.882218),(70.482602,39.866767),(70.490147,39.850179),(70.503479,39.835502),(70.537379,39.817312),(70.547301,39.807649),(70.575878,39.77008),(70.581614,39.766566),(70.63298,39.79845)],[(71.007634,39.911157),(71.009288,39.885732),(71.021897,39.880823),(71.036056,39.887541),(71.049802,39.897979),(71.060964,39.904129),(71.079981,39.903405),(71.084787,39.894827),(71.087216,39.88382),(71.098895,39.8755),(71.113674,39.874466),(71.16101,39.884233),(71.1946,39.884802),(71.208449,39.888781),(71.219094,39.900925),(71.221058,39.931724),(71.17703,39.968156),(71.174704,39.993994),(71.190982,40.006241),(71.237284,40.031098),(71.244002,40.046756),(71.236354,40.056057),(71.223745,40.057866),(71.198217,40.052595),(71.192946,40.05027),(71.181887,40.043397),(71.176926,40.042001),(71.169382,40.042828),(71.165454,40.044637),(71.162043,40.046911),(71.105975,40.064946),(71.078844,40.07864),(71.06174,40.095176),(71.047942,40.122513),(71.031199,40.146905),(71.008564,40.157757),(70.977145,40.144579),(70.959885,40.113418),(70.954046,40.095797),(70.952961,40.079208),(70.958438,40.063085),(70.98314,40.021383),(70.994509,40.008877),(71.007634,40.003503),(71.034299,39.99911),(71.045823,39.99203),(71.050371,39.962885),(71.007634,39.911157)],[(71.757304,39.903095),(71.767123,39.915446),(71.789757,39.979318),(71.78552,39.989705),(71.760612,39.98371),(71.724128,39.962678),(71.706868,39.956115),(71.681753,39.955082),(71.665527,39.940199),(71.675346,39.925781),(71.696843,39.913844),(71.71617,39.906764),(71.741801,39.90077),(71.757304,39.903095)]]]
+Aruba	Aruba	[[[(-69.936391,12.531724),(-69.924672,12.519232),(-69.915761,12.497016),(-69.88019800000001,12.453559),(-69.87682,12.427395),(-69.888092,12.41767),(-69.908803,12.417792),(-69.930531,12.425971),(-69.945139,12.440375),(-69.924672,12.440375),(-69.924672,12.447211),(-69.958567,12.463202),(-70.027659,12.522935),(-70.048085,12.531155),(-70.058095,12.537177),(-70.062408,12.54682),(-70.060374,12.556952),(-70.051096,12.574042),(-70.048736,12.583726),(-70.052642,12.600002),(-70.059641,12.614244),(-70.061106,12.625393),(-70.048736,12.632148),(-70.007151,12.585517),(-69.996938,12.577582),(-69.936391,12.531724)]]]
+Aruba	Afghanistan	[]
+Aruba	Albania	[]
+Aruba	Andorra	[]
+Aruba	Ashmore and Cartier Islands	[]
+Aruba	Austria	[]
+Aruba	Burundi	[]
+Aruba	Belgium	[]
+Aruba	Benin	[]
+Aruba	Burkina Faso	[]
+Aruba	Bulgaria	[]
+Aruba	Bahrain	[]
+Aruba	Bosnia and Herzegovina	[]
+Aruba	Bajo Nuevo Bank (Petrel Is.)	[]
+Aruba	Saint Barthelemy	[]
+Aruba	Belarus	[]
+Aruba	Bolivia	[]
+Aruba	Barbados	[]
+Aruba	Bhutan	[]
+Aruba	Botswana	[]
+Aruba	Central African Republic	[]
+Aruba	Switzerland	[]
+Aruba	Clipperton Island	[]
+Aruba	Cameroon	[]
+Aruba	Republic of Congo	[]
+Aruba	Coral Sea Islands	[]
+Aruba	Curaçao	[]
+Aruba	Czech Republic	[]
+Aruba	Djibouti	[]
+Aruba	Dominica	[]
+Aruba	Algeria	[]
+Aruba	Ethiopia	[]
+Aruba	Georgia	[]
+Aruba	Ghana	[]
+Aruba	Gibraltar	[]
+Aruba	Guinea	[]
+Aruba	Gambia	[]
+Aruba	Guatemala	[]
+Aruba	Guam	[]
+Aruba	Heard Island and McDonald Islands	[]
+Aruba	Hungary	[]
+Aruba	Isle of Man	[]
+Aruba	Iraq	[]
+Aruba	Israel	[]
+Aruba	Jamaica	[]
+Aruba	Jersey	[]
+Aruba	Jordan	[]
+Aruba	Baykonur Cosmodrome	[]
+Aruba	Siachen Glacier	[]
+Aruba	Kosovo	[]
+Aruba	Laos	[]
+Aruba	Lebanon	[]
+Aruba	Liberia	[]
+Aruba	Libya	[]
+Aruba	Saint Lucia	[]
+Aruba	Liechtenstein	[]
+Aruba	Lesotho	[]
+Aruba	Luxembourg	[]
+Aruba	Latvia	[]
+Aruba	Saint Martin	[]
+Aruba	Morocco	[]
+Aruba	Monaco	[]
+Aruba	Moldova	[]
+Aruba	Macedonia	[]
+Aruba	Mali	[]
+Aruba	Montenegro	[]
+Aruba	Mongolia	[]
+Aruba	Montserrat	[]
+Aruba	Namibia	[]
+Aruba	Niger	[]
+Aruba	Norfolk Island	[]
+Aruba	Niue	[]
+Aruba	Nepal	[]
+Aruba	Nauru	[]
+Aruba	Poland	[]
+Aruba	Paraguay	[]
+Aruba	Qatar	[]
+Aruba	Romania	[]
+Aruba	Rwanda	[]
+Aruba	Western Sahara	[]
+Aruba	Scarborough Reef	[]
+Aruba	South Sudan	[]
+Aruba	Senegal	[]
+Aruba	Serranilla Bank	[]
+Aruba	Singapore	[]
+Aruba	San Marino	[]
+Aruba	Somaliland	[]
+Aruba	Somalia	[]
+Aruba	Republic of Serbia	[]
+Aruba	Suriname	[]
+Aruba	Slovakia	[]
+Aruba	Slovenia	[]
+Aruba	Swaziland	[]
+Aruba	Sint Maarten	[]
+Aruba	Syria	[]
+Aruba	Chad	[]
+Aruba	Togo	[]
+Aruba	Uganda	[]
+Aruba	Uruguay	[]
+Aruba	Vatican	[]
diff --git a/tests/queries/0_stateless/01720_country_intersection.sh b/tests/queries/0_stateless/01720_country_intersection.sh
new file mode 100755
index 00000000000..d7e0e67d351
--- /dev/null
+++ b/tests/queries/0_stateless/01720_country_intersection.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+${CLICKHOUSE_CLIENT} -q "drop table if exists country_polygons;"
+${CLICKHOUSE_CLIENT} -q "create table country_polygons(name String, p Array(Array(Tuple(Float64, Float64)))) engine=MergeTree() order by tuple();"
+cat ${CURDIR}/country_polygons.tsv | ${CLICKHOUSE_CLIENT} -q "insert into country_polygons format TSV"
+${CLICKHOUSE_CLIENT} -q "SELECT c, d, polygonsIntersectionSpherical(a, b) FROM (SELECT first.p AS a, second.p AS b, first.name AS c, second.name AS d FROM country_polygons AS first CROSS JOIN country_polygons AS second LIMIT 100) format TSV"
+${CLICKHOUSE_CLIENT} -q "drop table if exists country_polygons;"
+
+
+${CLICKHOUSE_CLIENT} -q "drop table if exists country_rings;"
+${CLICKHOUSE_CLIENT} -q "create table country_rings(name String, p Array(Tuple(Float64, Float64))) engine=MergeTree() order by tuple();"
+cat ${CURDIR}/country_rings.tsv | ${CLICKHOUSE_CLIENT} -q "insert into country_rings format TSV"
+${CLICKHOUSE_CLIENT} -q "SELECT c, d, polygonsIntersectionSpherical(a, b) FROM (SELECT first.p AS a, second.p AS b, first.name AS c, second.name AS d FROM country_rings AS first CROSS JOIN country_rings AS second LIMIT 100) format TSV"
+${CLICKHOUSE_CLIENT} -q "drop table if exists country_rings;"
\ No newline at end of file
diff --git a/tests/queries/0_stateless/01720_country_perimeter_and_area.reference b/tests/queries/0_stateless/01720_country_perimeter_and_area.reference
new file mode 100644
index 00000000000..8a9690791c6
--- /dev/null
+++ b/tests/queries/0_stateless/01720_country_perimeter_and_area.reference
@@ -0,0 +1,214 @@
+Dhekelia Sovereign Base Area	0.0186259930051051
+Kyrgyzstan	0.5868323961091907
+-------------------------------------
+Dhekelia Sovereign Base Area	0.000003139488070896512
+Kyrgyzstan	0.004895645023822883
+-------------------------------------
+Aruba	0.011249330810410983
+Afghanistan	0.8199216326776404
+Albania	0.17108622597702605
+Andorra	0.015145740647213184
+Ashmore and Cartier Islands	0.001111472909012953
+Austria	0.3258464621357028
+Burundi	0.1409500621452211
+Belgium	0.1794463601873955
+Benin	0.31426073515874664
+Burkina Faso	0.5144381682226761
+Bulgaria	0.3083164214454252
+Bahrain	0.02137170357214413
+Bosnia and Herzegovina	0.20611959113245232
+Bajo Nuevo Bank (Petrel Is.)	0.0001254597070361587
+Saint Barthelemy	0.0032990108720812672
+Belarus	0.42899119772830474
+Bolivia	0.9279328001326348
+Barbados	0.014116142490651021
+Bhutan	0.1601735058766338
+Botswana	0.5896697538755427
+Central African Republic	0.7760222837198817
+Switzerland	0.2318851512510408
+Clipperton Island	0.0014072924221565273
+Cameroon	0.8001045813665599
+Republic of Congo	0.6904316055863188
+Coral Sea Islands	0.00011634674137689659
+Curaçao	0.02078862020307983
+Czech Republic	0.2708588915805718
+Djibouti	0.12937731543684822
+Dominica	0.020094439807419574
+Algeria	1.1549683948032776
+Ethiopia	0.8210654364815099
+Georgia	0.26823008017781313
+Ghana	0.4056578143818251
+Gibraltar	0.0014059440610631154
+Guinea	0.6350853755877334
+Gambia	0.19279774895359095
+Guatemala	0.3030953561509038
+Guam	0.020321390076536976
+Heard Island and McDonald Islands	0.017334896920453105
+Hungary	0.2617732480910806
+Isle of Man	0.01875803631141408
+Iraq	0.5469861219502402
+Israel	0.19353851895699914
+Jamaica	0.10055860979159512
+Jersey	0.008427337812134537
+Jordan	0.2642243503964102
+Baykonur Cosmodrome	0.04482995477542441
+Siachen Glacier	0.03872116827341272
+Kosovo	0.08773172991408161
+Laos	0.6899867972760174
+Lebanon	0.09676977254650951
+Liberia	0.2961649538030388
+Libya	0.9538430912224716
+Saint Lucia	0.016786201647759867
+Liechtenstein	0.009288582116863231
+Lesotho	0.12315874900320756
+Luxembourg	0.04125996057810259
+Latvia	0.24488610945731157
+Saint Martin	0.006547834154217771
+Morocco	0.8817924249630141
+Monaco	0.0026049777439637527
+Moldova	0.20765701819586885
+Macedonia	0.1128831074330059
+Mali	1.1385970015559317
+Montenegro	0.11756794062084858
+Mongolia	1.142306166871007
+Montserrat	0.006620100691409788
+Namibia	0.843464957679987
+Niger	0.8780744302377772
+Norfolk Island	0.004912027225339993
+Niue	0.009881892958363517
+Nepal	0.4076113675280835
+Nauru	0.0031205159769295255
+Poland	0.48922069488271314
+Paraguay	0.5475256537493991
+Qatar	0.09362771431858698
+Romania	0.44095021664473105
+Rwanda	0.1293663890297039
+Western Sahara	0.4691920993279596
+Scarborough Reef	0.00019842225207367386
+South Sudan	0.7584190842556537
+Senegal	0.5883247226863264
+Serranilla Bank	0.0002389083935906293
+Singapore	0.015233384733369614
+San Marino	0.004596873449598911
+Somaliland	0.3096791489207226
+Somalia	0.6879915318072617
+Republic of Serbia	0.29677234233404165
+Suriname	0.32255243342976203
+Slovakia	0.19843599488831584
+Slovenia	0.14713148471782736
+Swaziland	0.08434161089555517
+Sint Maarten	0.0037955305365309296
+Syria	0.35675522352394456
+Chad	0.9102578296637189
+Togo	0.2600585482954555
+Uganda	0.38301730108810556
+Uruguay	0.3083564407046887
+Vatican	0.00006702452496391445
+Akrotiri Sovereign Base Area	0.013376747415600219
+Zambia	0.8807923488623808
+Zimbabwe	0.4553903789902945
+-------------------------------------
+Aruba	0.0000041986375296795025
+Afghanistan	0.015826481758320493
+Albania	0.0006971811189621746
+Andorra	0.00001112355564980348
+Ashmore and Cartier Islands	6.66668338977609e-8
+Austria	0.0020634744883290235
+Burundi	0.000669169243101558
+Belgium	0.0007529367590741593
+Benin	0.00287239734953164
+Burkina Faso	0.006746218025419332
+Bulgaria	0.0027733372191197786
+Bahrain	0.00001443842547561405
+Bosnia and Herzegovina	0.0012742491201009779
+Bajo Nuevo Bank (Petrel Is.)	8.864825701897049e-10
+Saint Barthelemy	6.036607210116289e-7
+Belarus	0.005090738074359067
+Bolivia	0.026865324735758436
+Barbados	0.0000109856680212211
+Bhutan	0.0009961026696220909
+Botswana	0.01430200501713062
+Central African Republic	0.015290667187215962
+Switzerland	0.0010181463734151514
+Clipperton Island	1.2373029819547803e-7
+Cameroon	0.011488908713113137
+Republic of Congo	0.008534881807187833
+Coral Sea Islands	5.121674593493771e-10
+Curaçao	0.000011457378136273848
+Czech Republic	0.0019339153549488386
+Djibouti	0.000540370985929321
+Dominica	0.000018056168258583246
+Algeria	0.05696762706232162
+Ethiopia	0.02789047634482515
+Georgia	0.0017113229913929072
+Ghana	0.0059048504621945965
+Gibraltar	9.095456688875715e-8
+Guinea	0.006043151808047173
+Gambia	0.0002596816395280707
+Guatemala	0.0026901925526205263
+Guam	0.000013952443476670549
+Heard Island and McDonald Islands	0.000009688375334192321
+Hungary	0.0022899094702118978
+Isle of Man	0.00001410012284549863
+Iraq	0.010780689598789812
+Israel	0.0005400181032289429
+Jamaica	0.00027268062650994383
+Jersey	0.0000029236161155167853
+Jordan	0.002191215069390572
+Baykonur Cosmodrome	0.00015978303781425133
+Siachen Glacier	0.0000513879615262916
+Kosovo	0.0002684178325412152
+Laos	0.005637555524983489
+Lebanon	0.0002464436461544738
+Liberia	0.002357973807538481
+Libya	0.040072512808839354
+Saint Lucia	0.000014963842166249258
+Liechtenstein	0.0000033722024322722466
+Lesotho	0.0007426290112070925
+Luxembourg	0.00006405006804909529
+Latvia	0.00158313668683266
+Saint Martin	0.00000168759530251474
+Morocco	0.014595589778269167
+Monaco	4.6325700981005285e-7
+Moldova	0.0008158639460823913
+Macedonia	0.0006245180554490506
+Mali	0.03096381132470007
+Montenegro	0.00033762445623993013
+Mongolia	0.038446609480001344
+Montserrat	0.0000024620326175206004
+Namibia	0.020320978539029165
+Niger	0.02919849042641136
+Norfolk Island	0.0000010150641235563077
+Niue	0.000005450796200539049
+Nepal	0.003629565673884544
+Nauru	7.119067469952887e-7
+Poland	0.0076921097527402876
+Paraguay	0.009875843128670564
+Qatar	0.0002752610716836153
+Romania	0.005809479702080411
+Rwanda	0.0006262235765421803
+Western Sahara	0.0022344529652030694
+Scarborough Reef	2.4176335726807567e-9
+South Sudan	0.015509656314462458
+Senegal	0.00485201810074574
+Serranilla Bank	2.6035559945372385e-9
+Singapore	0.000012633505579848072
+San Marino	0.0000014830814619737624
+Somaliland	0.0041412916217828406
+Somalia	0.011674654119996183
+Republic of Serbia	0.001907268740192651
+Suriname	0.0035911641359236534
+Slovakia	0.0011901587428922095
+Slovenia	0.0004995546076509384
+Swaziland	0.00042234053226485263
+Sint Maarten	5.772865969377286e-7
+Syria	0.004581243750467663
+Chad	0.0313064894302088
+Togo	0.0014067991034602252
+Uganda	0.005985159048654327
+Uruguay	0.0043716082436750115
+Vatican	3.002600504657064e-10
+Akrotiri Sovereign Base Area	0.0000024314362587592923
+Zambia	0.018594119224502336
+Zimbabwe	0.009621356779606268
+-------------------------------------
diff --git a/tests/queries/0_stateless/01720_country_perimeter_and_area.sh b/tests/queries/0_stateless/01720_country_perimeter_and_area.sh
new file mode 100755
index 00000000000..75016ee1d1f
--- /dev/null
+++ b/tests/queries/0_stateless/01720_country_perimeter_and_area.sh
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+${CLICKHOUSE_CLIENT} -q "drop table if exists country_polygons;"
+${CLICKHOUSE_CLIENT} -q "create table country_polygons(name String, p Array(Array(Tuple(Float64, Float64)))) engine=MergeTree() order by tuple();"
+cat ${CURDIR}/country_polygons.tsv | ${CLICKHOUSE_CLIENT} -q "insert into country_polygons format TSV"
+
+${CLICKHOUSE_CLIENT} -q "SELECT name, polygonPerimeterSpherical(p) from country_polygons"
+${CLICKHOUSE_CLIENT} -q "SELECT '-------------------------------------'"
+${CLICKHOUSE_CLIENT} -q "SELECT name, polygonAreaSpherical(p) from country_polygons"
+${CLICKHOUSE_CLIENT} -q "SELECT '-------------------------------------'"
+${CLICKHOUSE_CLIENT} -q "drop table if exists country_rings;"
+
+
+${CLICKHOUSE_CLIENT} -q "create table country_rings(name String, p Array(Tuple(Float64, Float64))) engine=MergeTree() order by tuple();"
+cat ${CURDIR}/country_rings.tsv | ${CLICKHOUSE_CLIENT} -q "insert into country_rings format TSV"
+
+${CLICKHOUSE_CLIENT} -q "SELECT name, polygonPerimeterSpherical(p) from country_rings"
+${CLICKHOUSE_CLIENT} -q "SELECT '-------------------------------------'"
+${CLICKHOUSE_CLIENT} -q "SELECT name, polygonAreaSpherical(p) from country_rings"
+${CLICKHOUSE_CLIENT} -q "SELECT '-------------------------------------'"
+${CLICKHOUSE_CLIENT} -q "drop table if exists country_rings;"
+
+${CLICKHOUSE_CLIENT} -q "drop table country_polygons"
diff --git a/tests/queries/0_stateless/01720_join_implicit_cast.reference b/tests/queries/0_stateless/01720_join_implicit_cast.reference
new file mode 100644
index 00000000000..3cca6a264fa
--- /dev/null
+++ b/tests/queries/0_stateless/01720_join_implicit_cast.reference
@@ -0,0 +1,102 @@
+=== hash ===
+= full =
+1	1
+2	2
+-1	1
+1	\N
+1	257
+1	-1
+= left =
+1	1
+2	2
+= right =
+1	1
+-1	1
+1	\N
+1	257
+1	-1
+= inner =
+1	1
+= full =
+1	1	1	1
+2	2	0	\N
+0	0	-1	1
+0	0	1	\N
+0	0	1	257
+0	0	1	-1
+= left =
+1	1	1	1
+2	2	0	\N
+= right =
+1	1	1	1
+0	0	-1	1
+0	0	1	\N
+0	0	1	257
+0	0	1	-1
+= inner =
+1	1	1	1
+= agg =
+5	260
+3	3
+3	258
+1	1
+5	260
+3	3
+3	258
+1	1
+= types =
+1
+1
+1
+1
+=== partial_merge ===
+= full =
+1	1
+2	2
+-1	1
+1	\N
+1	257
+1	-1
+= left =
+1	1
+2	2
+= right =
+1	1
+-1	1
+1	\N
+1	257
+1	-1
+= inner =
+1	1
+= full =
+1	1	1	1
+2	2	0	\N
+0	0	-1	1
+0	0	1	\N
+0	0	1	257
+0	0	1	-1
+= left =
+1	1	1	1
+2	2	0	\N
+= right =
+1	1	1	1
+0	0	-1	1
+0	0	1	\N
+0	0	1	257
+0	0	1	-1
+= inner =
+1	1	1	1
+= agg =
+5	260
+3	3
+3	258
+1	1
+5	260
+3	3
+3	258
+1	1
+= types =
+1
+1
+1
+1
diff --git a/tests/queries/0_stateless/01720_join_implicit_cast.sql b/tests/queries/0_stateless/01720_join_implicit_cast.sql
new file mode 100644
index 00000000000..cf4a3bdcef6
--- /dev/null
+++ b/tests/queries/0_stateless/01720_join_implicit_cast.sql
@@ -0,0 +1,96 @@
+DROP TABLE IF EXISTS t_ab1;
+DROP TABLE IF EXISTS t_ab2;
+
+CREATE TABLE t_ab1 (id Nullable(Int32), a UInt16, b UInt8) ENGINE = TinyLog;
+CREATE TABLE t_ab2 (id Nullable(Int32), a Int16, b Nullable(Int64)) ENGINE = TinyLog;
+INSERT INTO t_ab1 VALUES (0, 1, 1), (1, 2, 2);
+INSERT INTO t_ab2 VALUES (2, -1, 1), (3, 1, NULL), (4, 1, 257), (5, 1, -1), (6, 1, 1);
+
+SELECT '=== hash ===';
+
+SET join_algorithm = 'hash';
+
+SELECT '= full =';
+SELECT a, b FROM t_ab1 FULL JOIN t_ab2 USING (a, b) ORDER BY ifNull(t_ab1.id, t_ab2.id);
+SELECT '= left =';
+SELECT a, b FROM t_ab1 LEFT JOIN t_ab2 USING (a, b) ORDER BY ifNull(t_ab1.id, t_ab2.id);
+SELECT '= right =';
+SELECT a, b FROM t_ab1 RIGHT JOIN t_ab2 USING (a, b) ORDER BY ifNull(t_ab1.id, t_ab2.id);
+SELECT '= inner =';
+SELECT a, b FROM t_ab1 INNER JOIN t_ab2 USING (a, b) ORDER BY ifNull(t_ab1.id, t_ab2.id);
+
+SELECT '= full =';
+SELECT a, b, t_ab2.a, t_ab2.b FROM t_ab1 FULL JOIN t_ab2 ON (t_ab1.a == t_ab2.a AND t_ab1.b == t_ab2.b) ORDER BY ifNull(t_ab1.id, t_ab2.id);
+SELECT '= left =';
+SELECT a, b, t_ab2.a, t_ab2.b FROM t_ab1 LEFT JOIN t_ab2 ON (t_ab1.a == t_ab2.a AND t_ab1.b == t_ab2.b) ORDER BY ifNull(t_ab1.id, t_ab2.id);
+SELECT '= right =';
+SELECT a, b, t_ab2.a, t_ab2.b FROM t_ab1 RIGHT JOIN t_ab2 ON (t_ab1.a == t_ab2.a AND t_ab1.b == t_ab2.b) ORDER BY ifNull(t_ab1.id, t_ab2.id);
+SELECT '= inner =';
+SELECT a, b, t_ab2.a, t_ab2.b FROM t_ab1 INNER JOIN t_ab2 ON (t_ab1.a == t_ab2.a AND t_ab1.b == t_ab2.b) ORDER BY ifNull(t_ab1.id, t_ab2.id);
+
+SELECT '= agg =';
+SELECT sum(a), sum(b) FROM t_ab1 FULL JOIN t_ab2 USING (a, b);
+SELECT sum(a), sum(b) FROM t_ab1 LEFT JOIN t_ab2 USING (a, b);
+SELECT sum(a), sum(b) FROM t_ab1 RIGHT JOIN t_ab2 USING (a, b);
+SELECT sum(a), sum(b) FROM t_ab1 INNER JOIN t_ab2 USING (a, b);
+
+SELECT sum(a) + sum(t_ab2.a) - 1, sum(b) + sum(t_ab2.b) - 1 FROM t_ab1 FULL JOIN t_ab2 ON (t_ab1.a == t_ab2.a AND t_ab1.b == t_ab2.b);
+SELECT sum(a) + sum(t_ab2.a) - 1, sum(b) + sum(t_ab2.b) - 1 FROM t_ab1 LEFT JOIN t_ab2 ON (t_ab1.a == t_ab2.a AND t_ab1.b == t_ab2.b);
+SELECT sum(a) + sum(t_ab2.a) - 1, sum(b) + sum(t_ab2.b) - 1 FROM t_ab1 RIGHT JOIN t_ab2 ON (t_ab1.a == t_ab2.a AND t_ab1.b == t_ab2.b);
+SELECT sum(a) + sum(t_ab2.a) - 1, sum(b) + sum(t_ab2.b) - 1 FROM t_ab1 INNER JOIN t_ab2 ON (t_ab1.a == t_ab2.a AND t_ab1.b == t_ab2.b);
+
+SELECT '= types =';
+
+SELECT any(toTypeName(a)) == 'Int32' AND any(toTypeName(b)) == 'Nullable(Int64)' FROM t_ab1 FULL JOIN t_ab2 USING (a, b);
+SELECT any(toTypeName(a)) == 'Int32' AND any(toTypeName(b)) == 'Nullable(Int64)' FROM t_ab1 LEFT JOIN t_ab2 USING (a, b);
+SELECT any(toTypeName(a)) == 'Int32' AND any(toTypeName(b)) == 'Nullable(Int64)' FROM t_ab1 RIGHT JOIN t_ab2 USING (a, b);
+SELECT any(toTypeName(a)) == 'Int32' AND any(toTypeName(b)) == 'Nullable(Int64)' FROM t_ab1 INNER JOIN t_ab2 USING (a, b);
+
+SELECT * FROM ( SELECT a, b as "CAST(a, Int32)" FROM t_ab1 ) t_ab1 FULL JOIN t_ab2 ON (t_ab1.a == t_ab2.a); -- { serverError 44 }
+SELECT * FROM ( SELECT a, b as "CAST(a, Int32)" FROM t_ab1 ) t_ab1 FULL JOIN t_ab2 USING (a) FORMAT Null;
+
+SELECT '=== partial_merge ===';
+
+SET join_algorithm = 'partial_merge';
+
+SELECT '= full =';
+SELECT a, b FROM t_ab1 FULL JOIN t_ab2 USING (a, b) ORDER BY ifNull(t_ab1.id, t_ab2.id);
+SELECT '= left =';
+SELECT a, b FROM t_ab1 LEFT JOIN t_ab2 USING (a, b) ORDER BY ifNull(t_ab1.id, t_ab2.id);
+SELECT '= right =';
+SELECT a, b FROM t_ab1 RIGHT JOIN t_ab2 USING (a, b) ORDER BY ifNull(t_ab1.id, t_ab2.id);
+SELECT '= inner =';
+SELECT a, b FROM t_ab1 INNER JOIN t_ab2 USING (a, b) ORDER BY ifNull(t_ab1.id, t_ab2.id);
+
+SELECT '= full =';
+SELECT a, b, t_ab2.a, t_ab2.b FROM t_ab1 FULL JOIN t_ab2 ON (t_ab1.a == t_ab2.a AND t_ab1.b == t_ab2.b) ORDER BY ifNull(t_ab1.id, t_ab2.id);
+SELECT '= left =';
+SELECT a, b, t_ab2.a, t_ab2.b FROM t_ab1 LEFT JOIN t_ab2 ON (t_ab1.a == t_ab2.a AND t_ab1.b == t_ab2.b) ORDER BY ifNull(t_ab1.id, t_ab2.id);
+SELECT '= right =';
+SELECT a, b, t_ab2.a, t_ab2.b FROM t_ab1 RIGHT JOIN t_ab2 ON (t_ab1.a == t_ab2.a AND t_ab1.b == t_ab2.b) ORDER BY ifNull(t_ab1.id, t_ab2.id);
+SELECT '= inner =';
+SELECT a, b, t_ab2.a, t_ab2.b FROM t_ab1 INNER JOIN t_ab2 ON (t_ab1.a == t_ab2.a AND t_ab1.b == t_ab2.b) ORDER BY ifNull(t_ab1.id, t_ab2.id);
+
+SELECT '= agg =';
+SELECT sum(a), sum(b) FROM t_ab1 FULL JOIN t_ab2 USING (a, b);
+SELECT sum(a), sum(b) FROM t_ab1 LEFT JOIN t_ab2 USING (a, b);
+SELECT sum(a), sum(b) FROM t_ab1 RIGHT JOIN t_ab2 USING (a, b);
+SELECT sum(a), sum(b) FROM t_ab1 INNER JOIN t_ab2 USING (a, b);
+
+SELECT sum(a) + sum(t_ab2.a) - 1, sum(b) + sum(t_ab2.b) - 1 FROM t_ab1 FULL JOIN t_ab2 ON (t_ab1.a == t_ab2.a AND t_ab1.b == t_ab2.b);
+SELECT sum(a) + sum(t_ab2.a) - 1, sum(b) + sum(t_ab2.b) - 1 FROM t_ab1 LEFT JOIN t_ab2 ON (t_ab1.a == t_ab2.a AND t_ab1.b == t_ab2.b);
+SELECT sum(a) + sum(t_ab2.a) - 1, sum(b) + sum(t_ab2.b) - 1 FROM t_ab1 RIGHT JOIN t_ab2 ON (t_ab1.a == t_ab2.a AND t_ab1.b == t_ab2.b);
+SELECT sum(a) + sum(t_ab2.a) - 1, sum(b) + sum(t_ab2.b) - 1 FROM t_ab1 INNER JOIN t_ab2 ON (t_ab1.a == t_ab2.a AND t_ab1.b == t_ab2.b);
+
+SELECT '= types =';
+
+SELECT any(toTypeName(a)) == 'Int32' AND any(toTypeName(b)) == 'Nullable(Int64)' FROM t_ab1 FULL JOIN t_ab2 USING (a, b);
+SELECT any(toTypeName(a)) == 'Int32' AND any(toTypeName(b)) == 'Nullable(Int64)' FROM t_ab1 LEFT JOIN t_ab2 USING (a, b);
+SELECT any(toTypeName(a)) == 'Int32' AND any(toTypeName(b)) == 'Nullable(Int64)' FROM t_ab1 RIGHT JOIN t_ab2 USING (a, b);
+SELECT any(toTypeName(a)) == 'Int32' AND any(toTypeName(b)) == 'Nullable(Int64)' FROM t_ab1 INNER JOIN t_ab2 USING (a, b);
+
+SELECT * FROM ( SELECT a, b as "CAST(a, Int32)" FROM t_ab1 ) t_ab1 FULL JOIN t_ab2 ON (t_ab1.a == t_ab2.a); -- { serverError 44 }
+SELECT * FROM ( SELECT a, b as "CAST(a, Int32)" FROM t_ab1 ) t_ab1 FULL JOIN t_ab2 USING (a) FORMAT Null;
+
+DROP TABLE IF EXISTS t_ab1;
+DROP TABLE IF EXISTS t_ab2;
diff --git a/tests/queries/0_stateless/01720_type_map_and_casts.reference b/tests/queries/0_stateless/01720_type_map_and_casts.reference
new file mode 100644
index 00000000000..590bdedd7f2
--- /dev/null
+++ b/tests/queries/0_stateless/01720_type_map_and_casts.reference
@@ -0,0 +1,42 @@
+Map(Int8, Int8)
+{127:1,0:1,-1:1}
+{}
+1	0	1	1
+0	0	0	0
+0
+1
+1
+0
+0
+0
+0
+0
+0
+0
+1
+Map(Int32, UInt16)
+{-1:1,2147483647:2,-2147483648:3}
+1	2	3
+0
+1
+0
+0
+0
+Map(Date, Int32)
+{'2020-01-01':1,'2020-01-02':2,'1970-01-02':3}
+1	2	0
+0
+3
+0
+Map(UUID, UInt16)
+{'00001192-0000-4000-8000-000000000001':1,'00001192-0000-4000-7000-000000000001':2}
+0	2	1
+Map(Int128, String)
+{-1:'a',0:'b',1234567898765432193024000:'c',-1234567898765432193024000:'d'}
+a	b	c	d
+
+a
+b
+
+a	b	c	d
+b	b	b	b
diff --git a/tests/queries/0_stateless/01720_type_map_and_casts.sql b/tests/queries/0_stateless/01720_type_map_and_casts.sql
new file mode 100644
index 00000000000..d7991999ef7
--- /dev/null
+++ b/tests/queries/0_stateless/01720_type_map_and_casts.sql
@@ -0,0 +1,84 @@
+SET allow_experimental_map_type = 1;
+
+DROP TABLE IF EXISTS table_map_with_key_integer;
+
+CREATE TABLE table_map_with_key_integer (d DATE, m Map(Int8, Int8))
+ENGINE = MergeTree() ORDER BY d;
+
+INSERT INTO table_map_with_key_integer VALUES ('2020-01-01', map(127, 1, 0, 1, -1, 1)) ('2020-01-01', map());
+
+SELECT 'Map(Int8, Int8)';
+
+SELECT m FROM table_map_with_key_integer;
+SELECT m[127], m[1], m[0], m[-1] FROM table_map_with_key_integer;
+SELECT m[toInt8(number - 2)] FROM table_map_with_key_integer ARRAY JOIN [0, 1, 2, 3, 4] AS number;
+
+SELECT count() FROM table_map_with_key_integer WHERE m = map();
+
+DROP TABLE IF EXISTS table_map_with_key_integer;
+
+CREATE TABLE table_map_with_key_integer (d DATE, m Map(Int32, UInt16))
+ENGINE = MergeTree() ORDER BY d;
+
+INSERT INTO table_map_with_key_integer VALUES ('2020-01-01', map(-1, 1, 2147483647, 2, -2147483648, 3));
+
+SELECT 'Map(Int32, UInt16)';
+
+SELECT m FROM table_map_with_key_integer;
+SELECT m[-1], m[2147483647], m[-2147483648] FROM table_map_with_key_integer;
+SELECT m[toInt32(number - 2)] FROM table_map_with_key_integer ARRAY JOIN [0, 1, 2, 3, 4] AS number;
+
+DROP TABLE IF EXISTS table_map_with_key_integer;
+
+CREATE TABLE table_map_with_key_integer (d DATE, m Map(Date, Int32))
+ENGINE = MergeTree() ORDER BY d;
+
+INSERT INTO table_map_with_key_integer VALUES ('2020-01-01', map('2020-01-01', 1, '2020-01-02', 2, '1970-01-02', 3));
+
+SELECT 'Map(Date, Int32)';
+
+SELECT m FROM table_map_with_key_integer;
+SELECT m[toDate('2020-01-01')], m[toDate('2020-01-02')], m[toDate('2020-01-03')] FROM table_map_with_key_integer;
+SELECT m[toDate(number)] FROM table_map_with_key_integer ARRAY JOIN [0, 1, 2] AS number;
+
+DROP TABLE IF EXISTS table_map_with_key_integer;
+
+CREATE TABLE table_map_with_key_integer (d DATE, m Map(UUID, UInt16))
+ENGINE = MergeTree() ORDER BY d;
+
+INSERT INTO table_map_with_key_integer VALUES ('2020-01-01', map('00001192-0000-4000-8000-000000000001', 1, '00001192-0000-4000-7000-000000000001', 2));
+
+SELECT 'Map(UUID, UInt16)';
+
+SELECT m FROM table_map_with_key_integer;
+SELECT
+    m[toUUID('00001192-0000-4000-6000-000000000001')],
+    m[toUUID('00001192-0000-4000-7000-000000000001')],
+    m[toUUID('00001192-0000-4000-8000-000000000001')]
+FROM table_map_with_key_integer;
+
+SELECT m[257], m[1] FROM table_map_with_key_integer; -- { serverError 43 }
+
+DROP TABLE IF EXISTS table_map_with_key_integer;
+
+CREATE TABLE table_map_with_key_integer (d DATE, m Map(Int128, String))
+ENGINE = MergeTree() ORDER BY d;
+
+
+INSERT INTO table_map_with_key_integer SELECT '2020-01-01', map(-1, 'a', 0, 'b', toInt128(1234567898765432123456789), 'c', toInt128(-1234567898765432123456789), 'd');
+
+SELECT 'Map(Int128, String)';
+
+SELECT m FROM table_map_with_key_integer;
+SELECT m[toInt128(-1)], m[toInt128(0)], m[toInt128(1234567898765432123456789)], m[toInt128(-1234567898765432123456789)] FROM table_map_with_key_integer;
+SELECT m[toInt128(number - 2)] FROM table_map_with_key_integer ARRAY JOIN [0, 1, 2, 3] AS number;
+
+SELECT m[-1], m[0], m[toInt128(1234567898765432123456789)], m[toInt128(-1234567898765432123456789)] FROM table_map_with_key_integer;
+SELECT m[toUInt64(0)], m[toInt64(0)], m[toUInt8(0)], m[toUInt16(0)] FROM table_map_with_key_integer;
+
+DROP TABLE IF EXISTS table_map_with_key_integer;
+
+
+CREATE TABLE table_map_with_key_integer (m Map(Float32, String)) ENGINE = MergeTree() ORDER BY tuple(); -- { serverError 36}
+CREATE TABLE table_map_with_key_integer (m Map(Nullable(String), String)) ENGINE = MergeTree() ORDER BY tuple(); -- { serverError 36}
+CREATE TABLE table_map_with_key_integer (m Map(Array(UInt32), String)) ENGINE = MergeTree() ORDER BY tuple(); -- { serverError 36}
diff --git a/tests/queries/0_stateless/01721_constraints_constant_expressions.reference b/tests/queries/0_stateless/01721_constraints_constant_expressions.reference
new file mode 100644
index 00000000000..d00491fd7e5
--- /dev/null
+++ b/tests/queries/0_stateless/01721_constraints_constant_expressions.reference
@@ -0,0 +1 @@
+1
diff --git a/tests/queries/0_stateless/01721_constraints_constant_expressions.sql b/tests/queries/0_stateless/01721_constraints_constant_expressions.sql
new file mode 100644
index 00000000000..d70c0cd4dc0
--- /dev/null
+++ b/tests/queries/0_stateless/01721_constraints_constant_expressions.sql
@@ -0,0 +1,40 @@
+DROP TABLE IF EXISTS constraint_constant_number_expression;
+CREATE TABLE constraint_constant_number_expression
+(
+    id UInt64,
+    CONSTRAINT `c0` CHECK 1,
+    CONSTRAINT `c1` CHECK 1 < 2,
+    CONSTRAINT `c2` CHECK isNull(cast(NULL, 'Nullable(UInt8)'))
+) ENGINE = TinyLog();
+
+INSERT INTO constraint_constant_number_expression VALUES (1);
+
+SELECT * FROM constraint_constant_number_expression;
+
+DROP TABLE constraint_constant_number_expression;
+
+DROP TABLE IF EXISTS constraint_constant_number_expression_non_uint8;
+CREATE TABLE constraint_constant_number_expression_non_uint8
+(
+    id UInt64,
+    CONSTRAINT `c0` CHECK toUInt64(1)
+) ENGINE = TinyLog();
+
+INSERT INTO constraint_constant_number_expression_non_uint8 VALUES (2); -- {serverError 1}
+
+SELECT * FROM constraint_constant_number_expression_non_uint8;
+
+DROP TABLE constraint_constant_number_expression_non_uint8;
+
+DROP TABLE IF EXISTS constraint_constant_nullable_expression_that_contains_null;
+CREATE TABLE constraint_constant_nullable_expression_that_contains_null
+(
+    id UInt64,
+    CONSTRAINT `c0` CHECK nullIf(1 % 2, 1)
+) ENGINE = TinyLog();
+
+INSERT INTO constraint_constant_nullable_expression_that_contains_null VALUES (3); -- {serverError 469}
+
+SELECT * FROM constraint_constant_nullable_expression_that_contains_null;
+
+DROP TABLE constraint_constant_nullable_expression_that_contains_null;
diff --git a/tests/queries/0_stateless/01721_join_implicit_cast_long.reference b/tests/queries/0_stateless/01721_join_implicit_cast_long.reference
new file mode 100644
index 00000000000..d78307175f9
--- /dev/null
+++ b/tests/queries/0_stateless/01721_join_implicit_cast_long.reference
@@ -0,0 +1,804 @@
+=== hash ===
+= full =
+-4	0	196
+-3	0	197
+-2	0	198
+-1	0	199
+0	0	200
+1	101	201
+2	102	202
+3	103	203
+4	104	204
+5	105	205
+6	106	\N
+7	107	\N
+8	108	\N
+9	109	\N
+10	110	\N
+= left =
+1	101	201
+2	102	202
+3	103	203
+4	104	204
+5	105	205
+6	106	\N
+7	107	\N
+8	108	\N
+9	109	\N
+10	110	\N
+= right =
+-4	0	196
+-3	0	197
+-2	0	198
+-1	0	199
+0	0	200
+1	101	201
+2	102	202
+3	103	203
+4	104	204
+5	105	205
+= inner =
+1	101	201
+2	102	202
+3	103	203
+4	104	204
+5	105	205
+= full =
+0	0	-4
+0	0	-3
+0	0	-2
+0	0	-1
+0	0	0
+1	1	1
+2	2	2
+3	3	3
+4	4	4
+5	5	5
+6	6	0
+7	7	0
+8	8	0
+9	9	0
+10	10	0
+= left =
+1	1	1
+2	2	2
+3	3	3
+4	4	4
+5	5	5
+6	6	0
+7	7	0
+8	8	0
+9	9	0
+10	10	0
+= right =
+0	0	-4
+0	0	-3
+0	0	-2
+0	0	-1
+0	0	0
+1	1	1
+2	2	2
+3	3	3
+4	4	4
+5	5	5
+= inner =
+1	1	1
+2	2	2
+3	3	3
+4	4	4
+5	5	5
+= join on =
+= full =
+0	0	-4	196
+0	0	-3	197
+0	0	-2	198
+0	0	-1	199
+0	0	0	200
+1	101	1	201
+2	102	2	202
+3	103	3	203
+4	104	4	204
+5	105	5	205
+6	106	0	\N
+7	107	0	\N
+8	108	0	\N
+9	109	0	\N
+10	110	0	\N
+= left =
+1	101	1	201
+2	102	2	202
+3	103	3	203
+4	104	4	204
+5	105	5	205
+6	106	0	\N
+7	107	0	\N
+8	108	0	\N
+9	109	0	\N
+10	110	0	\N
+= right =
+0	0	-4	196
+0	0	-3	197
+0	0	-2	198
+0	0	-1	199
+0	0	0	200
+1	101	1	201
+2	102	2	202
+3	103	3	203
+4	104	4	204
+5	105	5	205
+= inner =
+1	101	1	201
+2	102	2	202
+3	103	3	203
+4	104	4	204
+5	105	5	205
+= full =
+0	0	-4	196
+0	0	-3	197
+0	0	-2	198
+0	0	-1	199
+0	0	0	200
+1	101	1	201
+2	102	2	202
+3	103	3	203
+4	104	4	204
+5	105	5	205
+6	106	0	\N
+7	107	0	\N
+8	108	0	\N
+9	109	0	\N
+10	110	0	\N
+= left =
+1	101	1	201
+2	102	2	202
+3	103	3	203
+4	104	4	204
+5	105	5	205
+6	106	0	\N
+7	107	0	\N
+8	108	0	\N
+9	109	0	\N
+10	110	0	\N
+= right =
+0	0	-4	196
+0	0	-3	197
+0	0	-2	198
+0	0	-1	199
+0	0	0	200
+1	101	1	201
+2	102	2	202
+3	103	3	203
+4	104	4	204
+5	105	5	205
+= inner =
+1	101	1	201
+2	102	2	202
+3	103	3	203
+4	104	4	204
+5	105	5	205
+= agg =
+1
+1
+1
+1
+1
+1
+0	-10	0
+1	55	1055
+0	0	-10	0	990
+1	55	15	1055	1015
+= types =
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+=== partial_merge ===
+= full =
+-4	0	196
+-3	0	197
+-2	0	198
+-1	0	199
+0	0	200
+1	101	201
+2	102	202
+3	103	203
+4	104	204
+5	105	205
+6	106	\N
+7	107	\N
+8	108	\N
+9	109	\N
+10	110	\N
+= left =
+1	101	201
+2	102	202
+3	103	203
+4	104	204
+5	105	205
+6	106	\N
+7	107	\N
+8	108	\N
+9	109	\N
+10	110	\N
+= right =
+-4	0	196
+-3	0	197
+-2	0	198
+-1	0	199
+0	0	200
+1	101	201
+2	102	202
+3	103	203
+4	104	204
+5	105	205
+= inner =
+1	101	201
+2	102	202
+3	103	203
+4	104	204
+5	105	205
+= full =
+0	0	-4
+0	0	-3
+0	0	-2
+0	0	-1
+0	0	0
+1	1	1
+2	2	2
+3	3	3
+4	4	4
+5	5	5
+6	6	0
+7	7	0
+8	8	0
+9	9	0
+10	10	0
+= left =
+1	1	1
+2	2	2
+3	3	3
+4	4	4
+5	5	5
+6	6	0
+7	7	0
+8	8	0
+9	9	0
+10	10	0
+= right =
+0	0	-4
+0	0	-3
+0	0	-2
+0	0	-1
+0	0	0
+1	1	1
+2	2	2
+3	3	3
+4	4	4
+5	5	5
+= inner =
+1	1	1
+2	2	2
+3	3	3
+4	4	4
+5	5	5
+= join on =
+= full =
+0	0	-4	196
+0	0	-3	197
+0	0	-2	198
+0	0	-1	199
+0	0	0	200
+1	101	1	201
+2	102	2	202
+3	103	3	203
+4	104	4	204
+5	105	5	205
+6	106	0	\N
+7	107	0	\N
+8	108	0	\N
+9	109	0	\N
+10	110	0	\N
+= left =
+1	101	1	201
+2	102	2	202
+3	103	3	203
+4	104	4	204
+5	105	5	205
+6	106	0	\N
+7	107	0	\N
+8	108	0	\N
+9	109	0	\N
+10	110	0	\N
+= right =
+0	0	-4	196
+0	0	-3	197
+0	0	-2	198
+0	0	-1	199
+0	0	0	200
+1	101	1	201
+2	102	2	202
+3	103	3	203
+4	104	4	204
+5	105	5	205
+= inner =
+1	101	1	201
+2	102	2	202
+3	103	3	203
+4	104	4	204
+5	105	5	205
+= full =
+0	0	-4	196
+0	0	-3	197
+0	0	-2	198
+0	0	-1	199
+0	0	0	200
+1	101	1	201
+2	102	2	202
+3	103	3	203
+4	104	4	204
+5	105	5	205
+6	106	0	\N
+7	107	0	\N
+8	108	0	\N
+9	109	0	\N
+10	110	0	\N
+= left =
+1	101	1	201
+2	102	2	202
+3	103	3	203
+4	104	4	204
+5	105	5	205
+6	106	0	\N
+7	107	0	\N
+8	108	0	\N
+9	109	0	\N
+10	110	0	\N
+= right =
+0	0	-4	196
+0	0	-3	197
+0	0	-2	198
+0	0	-1	199
+0	0	0	200
+1	101	1	201
+2	102	2	202
+3	103	3	203
+4	104	4	204
+5	105	5	205
+= inner =
+1	101	1	201
+2	102	2	202
+3	103	3	203
+4	104	4	204
+5	105	5	205
+= agg =
+1
+1
+1
+1
+1
+1
+0	-10	0
+1	55	1055
+0	0	-10	0	990
+1	55	15	1055	1015
+= types =
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+=== switch ===
+= full =
+-4	0	196
+-3	0	197
+-2	0	198
+-1	0	199
+0	0	200
+1	101	201
+2	102	202
+3	103	203
+4	104	204
+5	105	205
+6	106	\N
+7	107	\N
+8	108	\N
+9	109	\N
+10	110	\N
+= left =
+1	101	201
+2	102	202
+3	103	203
+4	104	204
+5	105	205
+6	106	\N
+7	107	\N
+8	108	\N
+9	109	\N
+10	110	\N
+= right =
+-4	0	196
+-3	0	197
+-2	0	198
+-1	0	199
+0	0	200
+1	101	201
+2	102	202
+3	103	203
+4	104	204
+5	105	205
+= inner =
+1	101	201
+2	102	202
+3	103	203
+4	104	204
+5	105	205
+= full =
+0	0	-4
+0	0	-3
+0	0	-2
+0	0	-1
+0	0	0
+1	1	1
+2	2	2
+3	3	3
+4	4	4
+5	5	5
+6	6	0
+7	7	0
+8	8	0
+9	9	0
+10	10	0
+= left =
+1	1	1
+2	2	2
+3	3	3
+4	4	4
+5	5	5
+6	6	0
+7	7	0
+8	8	0
+9	9	0
+10	10	0
+= right =
+0	0	-4
+0	0	-3
+0	0	-2
+0	0	-1
+0	0	0
+1	1	1
+2	2	2
+3	3	3
+4	4	4
+5	5	5
+= inner =
+1	1	1
+2	2	2
+3	3	3
+4	4	4
+5	5	5
+= join on =
+= full =
+0	0	-4	196
+0	0	-3	197
+0	0	-2	198
+0	0	-1	199
+0	0	0	200
+1	101	1	201
+2	102	2	202
+3	103	3	203
+4	104	4	204
+5	105	5	205
+6	106	0	\N
+7	107	0	\N
+8	108	0	\N
+9	109	0	\N
+10	110	0	\N
+= left =
+1	101	1	201
+2	102	2	202
+3	103	3	203
+4	104	4	204
+5	105	5	205
+6	106	0	\N
+7	107	0	\N
+8	108	0	\N
+9	109	0	\N
+10	110	0	\N
+= right =
+0	0	-4	196
+0	0	-3	197
+0	0	-2	198
+0	0	-1	199
+0	0	0	200
+1	101	1	201
+2	102	2	202
+3	103	3	203
+4	104	4	204
+5	105	5	205
+= inner =
+1	101	1	201
+2	102	2	202
+3	103	3	203
+4	104	4	204
+5	105	5	205
+= full =
+0	0	-4	196
+0	0	-3	197
+0	0	-2	198
+0	0	-1	199
+0	0	0	200
+1	101	1	201
+2	102	2	202
+3	103	3	203
+4	104	4	204
+5	105	5	205
+6	106	0	\N
+7	107	0	\N
+8	108	0	\N
+9	109	0	\N
+10	110	0	\N
+= left =
+1	101	1	201
+2	102	2	202
+3	103	3	203
+4	104	4	204
+5	105	5	205
+6	106	0	\N
+7	107	0	\N
+8	108	0	\N
+9	109	0	\N
+10	110	0	\N
+= right =
+0	0	-4	196
+0	0	-3	197
+0	0	-2	198
+0	0	-1	199
+0	0	0	200
+1	101	1	201
+2	102	2	202
+3	103	3	203
+4	104	4	204
+5	105	5	205
+= inner =
+1	101	1	201
+2	102	2	202
+3	103	3	203
+4	104	4	204
+5	105	5	205
+= agg =
+1
+1
+1
+1
+1
+1
+0	-10	0
+1	55	1055
+0	0	-10	0	990
+1	55	15	1055	1015
+= types =
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+=== join use nulls ===
+= full =
+-4	\N	196
+-3	\N	197
+-2	\N	198
+-1	\N	199
+0	\N	200
+1	101	201
+2	102	202
+3	103	203
+4	104	204
+5	105	205
+6	106	\N
+7	107	\N
+8	108	\N
+9	109	\N
+10	110	\N
+= left =
+1	101	201
+2	102	202
+3	103	203
+4	104	204
+5	105	205
+6	106	\N
+7	107	\N
+8	108	\N
+9	109	\N
+10	110	\N
+= right =
+-4	\N	196
+-3	\N	197
+-2	\N	198
+-1	\N	199
+0	\N	200
+1	101	201
+2	102	202
+3	103	203
+4	104	204
+5	105	205
+= inner =
+1	101	201
+2	102	202
+3	103	203
+4	104	204
+5	105	205
+= full =
+1	1	1
+2	2	2
+3	3	3
+4	4	4
+5	5	5
+6	6	\N
+7	7	\N
+8	8	\N
+9	9	\N
+10	10	\N
+\N	\N	-4
+\N	\N	-3
+\N	\N	-2
+\N	\N	-1
+\N	\N	0
+= left =
+1	1	1
+2	2	2
+3	3	3
+4	4	4
+5	5	5
+6	6	\N
+7	7	\N
+8	8	\N
+9	9	\N
+10	10	\N
+= right =
+1	1	1
+2	2	2
+3	3	3
+4	4	4
+5	5	5
+\N	\N	-4
+\N	\N	-3
+\N	\N	-2
+\N	\N	-1
+\N	\N	0
+= inner =
+1	1	1
+2	2	2
+3	3	3
+4	4	4
+5	5	5
+= join on =
+= full =
+1	101	1	201
+2	102	2	202
+3	103	3	203
+4	104	4	204
+5	105	5	205
+6	106	\N	\N
+7	107	\N	\N
+8	108	\N	\N
+9	109	\N	\N
+10	110	\N	\N
+\N	\N	-4	196
+\N	\N	-3	197
+\N	\N	-2	198
+\N	\N	-1	199
+\N	\N	0	200
+= left =
+1	101	1	201
+2	102	2	202
+3	103	3	203
+4	104	4	204
+5	105	5	205
+6	106	\N	\N
+7	107	\N	\N
+8	108	\N	\N
+9	109	\N	\N
+10	110	\N	\N
+= right =
+1	101	1	201
+2	102	2	202
+3	103	3	203
+4	104	4	204
+5	105	5	205
+\N	\N	-4	196
+\N	\N	-3	197
+\N	\N	-2	198
+\N	\N	-1	199
+\N	\N	0	200
+= inner =
+1	101	1	201
+2	102	2	202
+3	103	3	203
+4	104	4	204
+5	105	5	205
+= full =
+1	101	1	201
+2	102	2	202
+3	103	3	203
+4	104	4	204
+5	105	5	205
+6	106	\N	\N
+7	107	\N	\N
+8	108	\N	\N
+9	109	\N	\N
+10	110	\N	\N
+\N	\N	-4	196
+\N	\N	-3	197
+\N	\N	-2	198
+\N	\N	-1	199
+\N	\N	0	200
+= left =
+1	101	1	201
+2	102	2	202
+3	103	3	203
+4	104	4	204
+5	105	5	205
+6	106	\N	\N
+7	107	\N	\N
+8	108	\N	\N
+9	109	\N	\N
+10	110	\N	\N
+= right =
+1	101	1	201
+2	102	2	202
+3	103	3	203
+4	104	4	204
+5	105	5	205
+\N	\N	-4	196
+\N	\N	-3	197
+\N	\N	-2	198
+\N	\N	-1	199
+\N	\N	0	200
+= inner =
+1	101	1	201
+2	102	2	202
+3	103	3	203
+4	104	4	204
+5	105	5	205
+= agg =
+1
+1
+1
+1
+1
+1
+0	-10	\N
+1	55	1055
+1	55	15	1055	1015
+\N	\N	-10	\N	990
+= types =
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
diff --git a/tests/queries/0_stateless/01721_join_implicit_cast_long.sql b/tests/queries/0_stateless/01721_join_implicit_cast_long.sql
new file mode 100644
index 00000000000..a6b411fadde
--- /dev/null
+++ b/tests/queries/0_stateless/01721_join_implicit_cast_long.sql
@@ -0,0 +1,316 @@
+DROP TABLE IF EXISTS t1;
+DROP TABLE IF EXISTS t2;
+
+CREATE TABLE t1 (a UInt16, b UInt16) ENGINE = TinyLog;
+CREATE TABLE t2 (a Int16, b Nullable(Int64)) ENGINE = TinyLog;
+
+INSERT INTO t1 SELECT number as a, 100 + number as b FROM system.numbers LIMIT 1, 10;
+INSERT INTO t2 SELECT number - 5 as a, 200 + number - 5 as b FROM system.numbers LIMIT 1, 10;
+
+SELECT '=== hash ===';
+SET join_algorithm = 'hash';
+
+SELECT '= full =';
+SELECT a, b, t2.b FROM t1 FULL JOIN t2 USING (a) ORDER BY (a);
+SELECT '= left =';
+SELECT a, b, t2.b FROM t1 LEFT JOIN t2 USING (a) ORDER BY (a);
+SELECT '= right =';
+SELECT a, b, t2.b FROM t1 RIGHT JOIN t2 USING (a) ORDER BY (a);
+SELECT '= inner =';
+SELECT a, b, t2.b FROM t1 INNER JOIN t2 USING (a) ORDER BY (a);
+
+SELECT '= full =';
+SELECT a, t1.a, t2.a FROM t1 FULL JOIN t2 USING (a) ORDER BY (t1.a, t2.a);
+SELECT '= left =';
+SELECT a, t1.a, t2.a FROM t1 LEFT JOIN t2 USING (a) ORDER BY (t1.a, t2.a);
+SELECT '= right =';
+SELECT a, t1.a, t2.a FROM t1 RIGHT JOIN t2 USING (a) ORDER BY (t1.a, t2.a);
+SELECT '= inner =';
+SELECT a, t1.a, t2.a FROM t1 INNER JOIN t2 USING (a) ORDER BY (t1.a, t2.a);
+
+SELECT '= join on =';
+SELECT '= full =';
+SELECT a, b, t2.a, t2.b FROM t1 FULL JOIN t2 ON (t1.a == t2.a) ORDER BY (t1.a, t2.a);
+SELECT '= left =';
+SELECT a, b, t2.a, t2.b FROM t1 LEFT JOIN t2 ON (t1.a == t2.a) ORDER BY (t1.a, t2.a);
+SELECT '= right =';
+SELECT a, b, t2.a, t2.b FROM t1 RIGHT JOIN t2 ON (t1.a == t2.a) ORDER BY (t1.a, t2.a);
+SELECT '= inner =';
+SELECT a, b, t2.a, t2.b FROM t1 INNER JOIN t2 ON (t1.a == t2.a) ORDER BY (t1.a, t2.a);
+
+SELECT '= full =';
+SELECT * FROM t1 FULL JOIN t2 ON (t1.a + t1.b = t2.a + t2.b - 100) ORDER BY (t1.a, t2.a);
+SELECT '= left =';
+SELECT * FROM t1 LEFT JOIN t2 ON (t1.a + t1.b = t2.a + t2.b - 100) ORDER BY (t1.a, t2.a);
+SELECT '= right =';
+SELECT * FROM t1 RIGHT JOIN t2 ON (t1.a + t1.b = t2.a + t2.b - 100) ORDER BY (t1.a, t2.a);
+SELECT '= inner =';
+SELECT * FROM t1 INNER JOIN t2 ON (t1.a + t1.b = t2.a + t2.b - 100) ORDER BY (t1.a, t2.a);
+
+-- Int64 and UInt64 has no supertype
+SELECT * FROM t1 FULL JOIN t2 ON (t1.a + t1.b + 100 = t2.a + t2.b) ORDER BY (t1.a, t2.a); -- { serverError 53 }
+SELECT * FROM t1 LEFT JOIN t2 ON (t1.a + t1.b + 100 = t2.a + t2.b) ORDER BY (t1.a, t2.a); -- { serverError 53 }
+SELECT * FROM t1 RIGHT JOIN t2 ON (t1.a + t1.b + 100 = t2.a + t2.b) ORDER BY (t1.a, t2.a); -- { serverError 53 }
+SELECT * FROM t1 INNER JOIN t2 ON (t1.a + t1.b + 100 = t2.a + t2.b) ORDER BY (t1.a, t2.a); -- { serverError 53 }
+
+SELECT '= agg =';
+SELECT sum(a) == 7 FROM t1 FULL JOIN t2 USING (a) WHERE b > 102 AND t2.b <= 204;
+SELECT sum(a) == 7 FROM t1 INNER JOIN t2 USING (a) WHERE b > 102 AND t2.b <= 204;
+
+SELECT sum(b) = 103 FROM t1 LEFT JOIN t2 USING (a) WHERE b > 102 AND t2.b < 204;
+SELECT sum(t2.b) = 203 FROM t1 RIGHT JOIN t2 USING (a) WHERE b > 102 AND t2.b < 204;
+
+SELECT sum(a) == 2 + 3 + 4 FROM t1 FULL JOIN t2 ON (t1.a + t1.b = t2.a + t2.b - 100) WHERE t1.b < 105 AND t2.b > 201;
+SELECT sum(a) == 55 FROM t1 FULL JOIN t2 ON (t1.a + t1.b = t2.a + t2.b - 100) WHERE 1;
+
+SELECT a > 0, sum(a), sum(b) FROM t1 FULL JOIN t2 USING (a) GROUP BY (a > 0) ORDER BY a > 0;
+SELECT a > 0, sum(a), sum(t2.a), sum(b), sum(t2.b) FROM t1 FULL JOIN t2 ON (t1.a == t2.a) GROUP BY (a > 0) ORDER BY a > 0;
+
+SELECT '= types =';
+SELECT any(toTypeName(a)) == 'Int32' AND any(toTypeName(t2.a)) == 'Int32' FROM t1 FULL JOIN t2 USING (a);
+SELECT any(toTypeName(a)) == 'Int32' AND any(toTypeName(t2.a)) == 'Int32' FROM t1 LEFT JOIN t2 USING (a);
+SELECT any(toTypeName(a)) == 'Int32' AND any(toTypeName(t2.a)) == 'Int32' FROM t1 RIGHT JOIN t2 USING (a);
+SELECT any(toTypeName(a)) == 'Int32' AND any(toTypeName(t2.a)) == 'Int32' FROM t1 INNER JOIN t2 USING (a);
+
+SELECT toTypeName(any(a)) == 'Int32' AND toTypeName(any(t2.a)) == 'Int32' FROM t1 FULL JOIN t2 USING (a);
+SELECT min(toTypeName(a) == 'Int32' AND toTypeName(t2.a) == 'Int32') FROM t1 FULL JOIN t2 USING (a);
+
+SELECT any(toTypeName(a)) == 'UInt16' AND any(toTypeName(t2.a)) == 'Int16' FROM t1 FULL JOIN t2 ON (t1.a == t2.a);
+SELECT any(toTypeName(a)) == 'UInt16' AND any(toTypeName(t2.a)) == 'Int16' FROM t1 LEFT JOIN t2 ON (t1.a == t2.a);
+SELECT any(toTypeName(a)) == 'UInt16' AND any(toTypeName(t2.a)) == 'Int16' FROM t1 RIGHT JOIN t2 ON (t1.a == t2.a);
+SELECT any(toTypeName(a)) == 'UInt16' AND any(toTypeName(t2.a)) == 'Int16' FROM t1 INNER JOIN t2 ON (t1.a == t2.a);
+SELECT toTypeName(any(a)) == 'UInt16' AND toTypeName(any(t2.a)) == 'Int16' FROM t1 FULL JOIN t2 ON (t1.a == t2.a);
+
+SELECT '=== partial_merge ===';
+
+SET join_algorithm = 'partial_merge';
+
+SELECT '= full =';
+SELECT a, b, t2.b FROM t1 FULL JOIN t2 USING (a) ORDER BY (a);
+SELECT '= left =';
+SELECT a, b, t2.b FROM t1 LEFT JOIN t2 USING (a) ORDER BY (a);
+SELECT '= right =';
+SELECT a, b, t2.b FROM t1 RIGHT JOIN t2 USING (a) ORDER BY (a);
+SELECT '= inner =';
+SELECT a, b, t2.b FROM t1 INNER JOIN t2 USING (a) ORDER BY (a);
+
+SELECT '= full =';
+SELECT a, t1.a, t2.a FROM t1 FULL JOIN t2 USING (a) ORDER BY (t1.a, t2.a);
+SELECT '= left =';
+SELECT a, t1.a, t2.a FROM t1 LEFT JOIN t2 USING (a) ORDER BY (t1.a, t2.a);
+SELECT '= right =';
+SELECT a, t1.a, t2.a FROM t1 RIGHT JOIN t2 USING (a) ORDER BY (t1.a, t2.a);
+SELECT '= inner =';
+SELECT a, t1.a, t2.a FROM t1 INNER JOIN t2 USING (a) ORDER BY (t1.a, t2.a);
+
+SELECT '= join on =';
+SELECT '= full =';
+SELECT a, b, t2.a, t2.b FROM t1 FULL JOIN t2 ON (t1.a == t2.a) ORDER BY (t1.a, t2.a);
+SELECT '= left =';
+SELECT a, b, t2.a, t2.b FROM t1 LEFT JOIN t2 ON (t1.a == t2.a) ORDER BY (t1.a, t2.a);
+SELECT '= right =';
+SELECT a, b, t2.a, t2.b FROM t1 RIGHT JOIN t2 ON (t1.a == t2.a) ORDER BY (t1.a, t2.a);
+SELECT '= inner =';
+SELECT a, b, t2.a, t2.b FROM t1 INNER JOIN t2 ON (t1.a == t2.a) ORDER BY (t1.a, t2.a);
+
+SELECT '= full =';
+SELECT * FROM t1 FULL JOIN t2 ON (t1.a + t1.b = t2.a + t2.b - 100) ORDER BY (t1.a, t2.a);
+SELECT '= left =';
+SELECT * FROM t1 LEFT JOIN t2 ON (t1.a + t1.b = t2.a + t2.b - 100) ORDER BY (t1.a, t2.a);
+SELECT '= right =';
+SELECT * FROM t1 RIGHT JOIN t2 ON (t1.a + t1.b = t2.a + t2.b - 100) ORDER BY (t1.a, t2.a);
+SELECT '= inner =';
+SELECT * FROM t1 INNER JOIN t2 ON (t1.a + t1.b = t2.a + t2.b - 100) ORDER BY (t1.a, t2.a);
+
+-- Int64 and UInt64 has no supertype
+SELECT * FROM t1 FULL JOIN t2 ON (t1.a + t1.b + 100 = t2.a + t2.b) ORDER BY (t1.a, t2.a); -- { serverError 53 }
+SELECT * FROM t1 LEFT JOIN t2 ON (t1.a + t1.b + 100 = t2.a + t2.b) ORDER BY (t1.a, t2.a); -- { serverError 53 }
+SELECT * FROM t1 RIGHT JOIN t2 ON (t1.a + t1.b + 100 = t2.a + t2.b) ORDER BY (t1.a, t2.a); -- { serverError 53 }
+SELECT * FROM t1 INNER JOIN t2 ON (t1.a + t1.b + 100 = t2.a + t2.b) ORDER BY (t1.a, t2.a); -- { serverError 53 }
+
+SELECT '= agg =';
+SELECT sum(a) == 7 FROM t1 FULL JOIN t2 USING (a) WHERE b > 102 AND t2.b <= 204;
+SELECT sum(a) == 7 FROM t1 INNER JOIN t2 USING (a) WHERE b > 102 AND t2.b <= 204;
+
+SELECT sum(b) = 103 FROM t1 LEFT JOIN t2 USING (a) WHERE b > 102 AND t2.b < 204;
+SELECT sum(t2.b) = 203 FROM t1 RIGHT JOIN t2 USING (a) WHERE b > 102 AND t2.b < 204;
+
+SELECT sum(a) == 2 + 3 + 4 FROM t1 FULL JOIN t2 ON (t1.a + t1.b = t2.a + t2.b - 100) WHERE t1.b < 105 AND t2.b > 201;
+SELECT sum(a) == 55 FROM t1 FULL JOIN t2 ON (t1.a + t1.b = t2.a + t2.b - 100) WHERE 1;
+
+SELECT a > 0, sum(a), sum(b) FROM t1 FULL JOIN t2 USING (a) GROUP BY (a > 0) ORDER BY a > 0;
+SELECT a > 0, sum(a), sum(t2.a), sum(b), sum(t2.b) FROM t1 FULL JOIN t2 ON (t1.a == t2.a) GROUP BY (a > 0) ORDER BY a > 0;
+
+SELECT '= types =';
+SELECT any(toTypeName(a)) == 'Int32' AND any(toTypeName(t2.a)) == 'Int32' FROM t1 FULL JOIN t2 USING (a);
+SELECT any(toTypeName(a)) == 'Int32' AND any(toTypeName(t2.a)) == 'Int32' FROM t1 LEFT JOIN t2 USING (a);
+SELECT any(toTypeName(a)) == 'Int32' AND any(toTypeName(t2.a)) == 'Int32' FROM t1 RIGHT JOIN t2 USING (a);
+SELECT any(toTypeName(a)) == 'Int32' AND any(toTypeName(t2.a)) == 'Int32' FROM t1 INNER JOIN t2 USING (a);
+
+SELECT toTypeName(any(a)) == 'Int32' AND toTypeName(any(t2.a)) == 'Int32' FROM t1 FULL JOIN t2 USING (a);
+SELECT min(toTypeName(a) == 'Int32' AND toTypeName(t2.a) == 'Int32') FROM t1 FULL JOIN t2 USING (a);
+
+SELECT any(toTypeName(a)) == 'UInt16' AND any(toTypeName(t2.a)) == 'Int16' FROM t1 FULL JOIN t2 ON (t1.a == t2.a);
+SELECT any(toTypeName(a)) == 'UInt16' AND any(toTypeName(t2.a)) == 'Int16' FROM t1 LEFT JOIN t2 ON (t1.a == t2.a);
+SELECT any(toTypeName(a)) == 'UInt16' AND any(toTypeName(t2.a)) == 'Int16' FROM t1 RIGHT JOIN t2 ON (t1.a == t2.a);
+SELECT any(toTypeName(a)) == 'UInt16' AND any(toTypeName(t2.a)) == 'Int16' FROM t1 INNER JOIN t2 ON (t1.a == t2.a);
+SELECT toTypeName(any(a)) == 'UInt16' AND toTypeName(any(t2.a)) == 'Int16' FROM t1 FULL JOIN t2 ON (t1.a == t2.a);
+
+SELECT '=== switch ===';
+
+SET join_algorithm = 'auto';
+SET max_bytes_in_join = 100;
+
+SELECT '= full =';
+SELECT a, b, t2.b FROM t1 FULL JOIN t2 USING (a) ORDER BY (a);
+SELECT '= left =';
+SELECT a, b, t2.b FROM t1 LEFT JOIN t2 USING (a) ORDER BY (a);
+SELECT '= right =';
+SELECT a, b, t2.b FROM t1 RIGHT JOIN t2 USING (a) ORDER BY (a);
+SELECT '= inner =';
+SELECT a, b, t2.b FROM t1 INNER JOIN t2 USING (a) ORDER BY (a);
+
+SELECT '= full =';
+SELECT a, t1.a, t2.a FROM t1 FULL JOIN t2 USING (a) ORDER BY (t1.a, t2.a);
+SELECT '= left =';
+SELECT a, t1.a, t2.a FROM t1 LEFT JOIN t2 USING (a) ORDER BY (t1.a, t2.a);
+SELECT '= right =';
+SELECT a, t1.a, t2.a FROM t1 RIGHT JOIN t2 USING (a) ORDER BY (t1.a, t2.a);
+SELECT '= inner =';
+SELECT a, t1.a, t2.a FROM t1 INNER JOIN t2 USING (a) ORDER BY (t1.a, t2.a);
+
+SELECT '= join on =';
+SELECT '= full =';
+SELECT a, b, t2.a, t2.b FROM t1 FULL JOIN t2 ON (t1.a == t2.a) ORDER BY (t1.a, t2.a);
+SELECT '= left =';
+SELECT a, b, t2.a, t2.b FROM t1 LEFT JOIN t2 ON (t1.a == t2.a) ORDER BY (t1.a, t2.a);
+SELECT '= right =';
+SELECT a, b, t2.a, t2.b FROM t1 RIGHT JOIN t2 ON (t1.a == t2.a) ORDER BY (t1.a, t2.a);
+SELECT '= inner =';
+SELECT a, b, t2.a, t2.b FROM t1 INNER JOIN t2 ON (t1.a == t2.a) ORDER BY (t1.a, t2.a);
+
+SELECT '= full =';
+SELECT * FROM t1 FULL JOIN t2 ON (t1.a + t1.b = t2.a + t2.b - 100) ORDER BY (t1.a, t2.a);
+SELECT '= left =';
+SELECT * FROM t1 LEFT JOIN t2 ON (t1.a + t1.b = t2.a + t2.b - 100) ORDER BY (t1.a, t2.a);
+SELECT '= right =';
+SELECT * FROM t1 RIGHT JOIN t2 ON (t1.a + t1.b = t2.a + t2.b - 100) ORDER BY (t1.a, t2.a);
+SELECT '= inner =';
+SELECT * FROM t1 INNER JOIN t2 ON (t1.a + t1.b = t2.a + t2.b - 100) ORDER BY (t1.a, t2.a);
+
+-- Int64 and UInt64 has no supertype
+SELECT * FROM t1 FULL JOIN t2 ON (t1.a + t1.b + 100 = t2.a + t2.b) ORDER BY (t1.a, t2.a); -- { serverError 53 }
+SELECT * FROM t1 LEFT JOIN t2 ON (t1.a + t1.b + 100 = t2.a + t2.b) ORDER BY (t1.a, t2.a); -- { serverError 53 }
+SELECT * FROM t1 RIGHT JOIN t2 ON (t1.a + t1.b + 100 = t2.a + t2.b) ORDER BY (t1.a, t2.a); -- { serverError 53 }
+SELECT * FROM t1 INNER JOIN t2 ON (t1.a + t1.b + 100 = t2.a + t2.b) ORDER BY (t1.a, t2.a); -- { serverError 53 }
+
+SELECT '= agg =';
+SELECT sum(a) == 7 FROM t1 FULL JOIN t2 USING (a) WHERE b > 102 AND t2.b <= 204;
+SELECT sum(a) == 7 FROM t1 INNER JOIN t2 USING (a) WHERE b > 102 AND t2.b <= 204;
+
+SELECT sum(b) = 103 FROM t1 LEFT JOIN t2 USING (a) WHERE b > 102 AND t2.b < 204;
+SELECT sum(t2.b) = 203 FROM t1 RIGHT JOIN t2 USING (a) WHERE b > 102 AND t2.b < 204;
+
+SELECT sum(a) == 2 + 3 + 4 FROM t1 FULL JOIN t2 ON (t1.a + t1.b = t2.a + t2.b - 100) WHERE t1.b < 105 AND t2.b > 201;
+SELECT sum(a) == 55 FROM t1 FULL JOIN t2 ON (t1.a + t1.b = t2.a + t2.b - 100) WHERE 1;
+
+SELECT a > 0, sum(a), sum(b) FROM t1 FULL JOIN t2 USING (a) GROUP BY (a > 0) ORDER BY a > 0;
+SELECT a > 0, sum(a), sum(t2.a), sum(b), sum(t2.b) FROM t1 FULL JOIN t2 ON (t1.a == t2.a) GROUP BY (a > 0) ORDER BY a > 0;
+
+SELECT '= types =';
+SELECT any(toTypeName(a)) == 'Int32' AND any(toTypeName(t2.a)) == 'Int32' FROM t1 FULL JOIN t2 USING (a);
+SELECT any(toTypeName(a)) == 'Int32' AND any(toTypeName(t2.a)) == 'Int32' FROM t1 LEFT JOIN t2 USING (a);
+SELECT any(toTypeName(a)) == 'Int32' AND any(toTypeName(t2.a)) == 'Int32' FROM t1 RIGHT JOIN t2 USING (a);
+SELECT any(toTypeName(a)) == 'Int32' AND any(toTypeName(t2.a)) == 'Int32' FROM t1 INNER JOIN t2 USING (a);
+
+SELECT toTypeName(any(a)) == 'Int32' AND toTypeName(any(t2.a)) == 'Int32' FROM t1 FULL JOIN t2 USING (a);
+SELECT min(toTypeName(a) == 'Int32' AND toTypeName(t2.a) == 'Int32') FROM t1 FULL JOIN t2 USING (a);
+
+SELECT any(toTypeName(a)) == 'UInt16' AND any(toTypeName(t2.a)) == 'Int16' FROM t1 FULL JOIN t2 ON (t1.a == t2.a);
+SELECT any(toTypeName(a)) == 'UInt16' AND any(toTypeName(t2.a)) == 'Int16' FROM t1 LEFT JOIN t2 ON (t1.a == t2.a);
+SELECT any(toTypeName(a)) == 'UInt16' AND any(toTypeName(t2.a)) == 'Int16' FROM t1 RIGHT JOIN t2 ON (t1.a == t2.a);
+SELECT any(toTypeName(a)) == 'UInt16' AND any(toTypeName(t2.a)) == 'Int16' FROM t1 INNER JOIN t2 ON (t1.a == t2.a);
+SELECT toTypeName(any(a)) == 'UInt16' AND toTypeName(any(t2.a)) == 'Int16' FROM t1 FULL JOIN t2 ON (t1.a == t2.a);
+
+SET max_bytes_in_join = 0;
+
+SELECT '=== join use nulls ===';
+
+SET join_use_nulls = 1;
+
+
+SELECT '= full =';
+SELECT a, b, t2.b FROM t1 FULL JOIN t2 USING (a) ORDER BY (a);
+SELECT '= left =';
+SELECT a, b, t2.b FROM t1 LEFT JOIN t2 USING (a) ORDER BY (a);
+SELECT '= right =';
+SELECT a, b, t2.b FROM t1 RIGHT JOIN t2 USING (a) ORDER BY (a);
+SELECT '= inner =';
+SELECT a, b, t2.b FROM t1 INNER JOIN t2 USING (a) ORDER BY (a);
+
+SELECT '= full =';
+SELECT a, t1.a, t2.a FROM t1 FULL JOIN t2 USING (a) ORDER BY (t1.a, t2.a);
+SELECT '= left =';
+SELECT a, t1.a, t2.a FROM t1 LEFT JOIN t2 USING (a) ORDER BY (t1.a, t2.a);
+SELECT '= right =';
+SELECT a, t1.a, t2.a FROM t1 RIGHT JOIN t2 USING (a) ORDER BY (t1.a, t2.a);
+SELECT '= inner =';
+SELECT a, t1.a, t2.a FROM t1 INNER JOIN t2 USING (a) ORDER BY (t1.a, t2.a);
+
+SELECT '= join on =';
+SELECT '= full =';
+SELECT a, b, t2.a, t2.b FROM t1 FULL JOIN t2 ON (t1.a == t2.a) ORDER BY (t1.a, t2.a);
+SELECT '= left =';
+SELECT a, b, t2.a, t2.b FROM t1 LEFT JOIN t2 ON (t1.a == t2.a) ORDER BY (t1.a, t2.a);
+SELECT '= right =';
+SELECT a, b, t2.a, t2.b FROM t1 RIGHT JOIN t2 ON (t1.a == t2.a) ORDER BY (t1.a, t2.a);
+SELECT '= inner =';
+SELECT a, b, t2.a, t2.b FROM t1 INNER JOIN t2 ON (t1.a == t2.a) ORDER BY (t1.a, t2.a);
+
+SELECT '= full =';
+SELECT * FROM t1 FULL JOIN t2 ON (t1.a + t1.b = t2.a + t2.b - 100) ORDER BY (t1.a, t2.a);
+SELECT '= left =';
+SELECT * FROM t1 LEFT JOIN t2 ON (t1.a + t1.b = t2.a + t2.b - 100) ORDER BY (t1.a, t2.a);
+SELECT '= right =';
+SELECT * FROM t1 RIGHT JOIN t2 ON (t1.a + t1.b = t2.a + t2.b - 100) ORDER BY (t1.a, t2.a);
+SELECT '= inner =';
+SELECT * FROM t1 INNER JOIN t2 ON (t1.a + t1.b = t2.a + t2.b - 100) ORDER BY (t1.a, t2.a);
+
+-- Int64 and UInt64 has no supertype
+SELECT * FROM t1 FULL JOIN t2 ON (t1.a + t1.b + 100 = t2.a + t2.b) ORDER BY (t1.a, t2.a); -- { serverError 53 }
+SELECT * FROM t1 LEFT JOIN t2 ON (t1.a + t1.b + 100 = t2.a + t2.b) ORDER BY (t1.a, t2.a); -- { serverError 53 }
+SELECT * FROM t1 RIGHT JOIN t2 ON (t1.a + t1.b + 100 = t2.a + t2.b) ORDER BY (t1.a, t2.a); -- { serverError 53 }
+SELECT * FROM t1 INNER JOIN t2 ON (t1.a + t1.b + 100 = t2.a + t2.b) ORDER BY (t1.a, t2.a); -- { serverError 53 }
+
+SELECT '= agg =';
+SELECT sum(a) == 7 FROM t1 FULL JOIN t2 USING (a) WHERE b > 102 AND t2.b <= 204;
+SELECT sum(a) == 7 FROM t1 INNER JOIN t2 USING (a) WHERE b > 102 AND t2.b <= 204;
+
+SELECT sum(b) = 103 FROM t1 LEFT JOIN t2 USING (a) WHERE b > 102 AND t2.b < 204;
+SELECT sum(t2.b) = 203 FROM t1 RIGHT JOIN t2 USING (a) WHERE b > 102 AND t2.b < 204;
+
+SELECT sum(a) == 2 + 3 + 4 FROM t1 FULL JOIN t2 ON (t1.a + t1.b = t2.a + t2.b - 100) WHERE t1.b < 105 AND t2.b > 201;
+SELECT sum(a) == 55 FROM t1 FULL JOIN t2 ON (t1.a + t1.b = t2.a + t2.b - 100) WHERE 1;
+
+SELECT a > 0, sum(a), sum(b) FROM t1 FULL JOIN t2 USING (a) GROUP BY (a > 0) ORDER BY a > 0;
+SELECT a > 0, sum(a), sum(t2.a), sum(b), sum(t2.b) FROM t1 FULL JOIN t2 ON (t1.a == t2.a) GROUP BY (a > 0) ORDER BY a > 0;
+
+SELECT '= types =';
+SELECT any(toTypeName(a)) == 'Nullable(Int32)' AND any(toTypeName(t2.a)) == 'Nullable(Int32)' FROM t1 FULL JOIN t2 USING (a);
+SELECT any(toTypeName(a)) == 'Int32' AND any(toTypeName(t2.a)) == 'Nullable(Int32)' FROM t1 LEFT JOIN t2 USING (a);
+SELECT any(toTypeName(a)) == 'Nullable(Int32)' AND any(toTypeName(t2.a)) == 'Int32' FROM t1 RIGHT JOIN t2 USING (a);
+SELECT any(toTypeName(a)) == 'Int32' AND any(toTypeName(t2.a)) == 'Int32' FROM t1 INNER JOIN t2 USING (a);
+
+SELECT toTypeName(any(a)) == 'Nullable(Int32)' AND toTypeName(any(t2.a)) == 'Nullable(Int32)' FROM t1 FULL JOIN t2 USING (a);
+SELECT min(toTypeName(a) == 'Nullable(Int32)' AND toTypeName(t2.a) == 'Nullable(Int32)') FROM t1 FULL JOIN t2 USING (a);
+
+SELECT any(toTypeName(a)) == 'Nullable(UInt16)' AND any(toTypeName(t2.a)) == 'Nullable(Int16)' FROM t1 FULL JOIN t2 ON (t1.a == t2.a);
+SELECT any(toTypeName(a)) == 'UInt16' AND any(toTypeName(t2.a)) == 'Nullable(Int16)' FROM t1 LEFT JOIN t2 ON (t1.a == t2.a);
+SELECT any(toTypeName(a)) == 'Nullable(UInt16)' AND any(toTypeName(t2.a)) == 'Int16' FROM t1 RIGHT JOIN t2 ON (t1.a == t2.a);
+SELECT any(toTypeName(a)) == 'UInt16' AND any(toTypeName(t2.a)) == 'Int16' FROM t1 INNER JOIN t2 ON (t1.a == t2.a);
+SELECT toTypeName(any(a)) == 'Nullable(UInt16)' AND toTypeName(any(t2.a)) == 'Nullable(Int16)' FROM t1 FULL JOIN t2 ON (t1.a == t2.a);
+
+SET join_use_nulls = 0;
+
+DROP TABLE IF EXISTS t1;
+DROP TABLE IF EXISTS t2;
diff --git a/tests/queries/0_stateless/01722_long_brotli_http_compression_json_format.reference b/tests/queries/0_stateless/01722_long_brotli_http_compression_json_format.reference
new file mode 100644
index 00000000000..7c089a2fd05
--- /dev/null
+++ b/tests/queries/0_stateless/01722_long_brotli_http_compression_json_format.reference
@@ -0,0 +1,23 @@
+		},
+		{
+			"datetime": "2020-12-12",
+			"pipeline": "test-pipeline",
+			"host": "clickhouse-test-host-001.clickhouse.com",
+			"home": "clickhouse",
+			"detail": "clickhouse",
+			"row_number": "999998"
+		},
+		{
+			"datetime": "2020-12-12",
+			"pipeline": "test-pipeline",
+			"host": "clickhouse-test-host-001.clickhouse.com",
+			"home": "clickhouse",
+			"detail": "clickhouse",
+			"row_number": "999999"
+		}
+	],
+
+	"rows": 1000000,
+
+	"rows_before_limit_at_least": 1048080,
+
diff --git a/tests/queries/0_stateless/01722_long_brotli_http_compression_json_format.sh b/tests/queries/0_stateless/01722_long_brotli_http_compression_json_format.sh
new file mode 100755
index 00000000000..a187d778fdb
--- /dev/null
+++ b/tests/queries/0_stateless/01722_long_brotli_http_compression_json_format.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+${CLICKHOUSE_CURL} -sS -H 'Accept-Encoding: br'              "${CLICKHOUSE_URL}&enable_http_compression=1" -d "SELECT toDate('2020-12-12') as datetime, 'test-pipeline' as pipeline, 'clickhouse-test-host-001.clickhouse.com' as host, 'clickhouse' as home, 'clickhouse' as detail, number as row_number FROM numbers(1000000) FORMAT JSON" | brotli -d | tail -n30 | head -n23
diff --git a/tests/queries/0_stateless/01732_alters_bad_conversions.reference b/tests/queries/0_stateless/01732_alters_bad_conversions.reference
new file mode 100644
index 00000000000..5f570c78579
--- /dev/null
+++ b/tests/queries/0_stateless/01732_alters_bad_conversions.reference
@@ -0,0 +1,4 @@
+CREATE TABLE default.bad_conversions\n(\n    `a` UInt32\n)\nENGINE = MergeTree\nORDER BY tuple()\nSETTINGS index_granularity = 8192
+0
+CREATE TABLE default.bad_conversions_2\n(\n    `e` Enum8(\'foo\' = 1, \'bar\' = 2)\n)\nENGINE = MergeTree\nORDER BY tuple()\nSETTINGS index_granularity = 8192
+0
diff --git a/tests/queries/0_stateless/01732_alters_bad_conversions.sql b/tests/queries/0_stateless/01732_alters_bad_conversions.sql
new file mode 100644
index 00000000000..27da5242368
--- /dev/null
+++ b/tests/queries/0_stateless/01732_alters_bad_conversions.sql
@@ -0,0 +1,17 @@
+DROP TABLE IF EXISTS bad_conversions;
+DROP TABLE IF EXISTS bad_conversions_2;
+
+CREATE TABLE bad_conversions (a UInt32) ENGINE = MergeTree ORDER BY tuple();
+INSERT INTO bad_conversions VALUES (1);
+ALTER TABLE bad_conversions MODIFY COLUMN a Array(String); -- { serverError 53 }
+SHOW CREATE TABLE bad_conversions;
+SELECT count() FROM system.mutations WHERE table = 'bad_conversions' AND database = currentDatabase();
+
+CREATE TABLE bad_conversions_2 (e Enum('foo' = 1, 'bar' = 2)) ENGINE = MergeTree ORDER BY tuple();
+INSERT INTO bad_conversions_2 VALUES (1);
+ALTER TABLE bad_conversions_2 MODIFY COLUMN e Enum('bar' = 1, 'foo' = 2); -- { serverError 70 }
+SHOW CREATE TABLE bad_conversions_2;
+SELECT count() FROM system.mutations WHERE table = 'bad_conversions_2' AND database = currentDatabase();
+
+DROP TABLE IF EXISTS bad_conversions;
+DROP TABLE IF EXISTS bad_conversions_2;
diff --git a/tests/queries/0_stateless/01732_explain_syntax_union_query.reference b/tests/queries/0_stateless/01732_explain_syntax_union_query.reference
new file mode 100644
index 00000000000..fe5eb01a7ed
--- /dev/null
+++ b/tests/queries/0_stateless/01732_explain_syntax_union_query.reference
@@ -0,0 +1,66 @@
+SELECT 1
+UNION ALL
+SELECT 1
+UNION ALL
+SELECT 1
+UNION ALL
+SELECT 1
+UNION ALL
+SELECT 1
+ 
+SELECT 1
+UNION ALL
+(
+    SELECT 1
+    UNION DISTINCT
+    SELECT 1
+    UNION DISTINCT
+    SELECT 1
+)
+UNION ALL
+SELECT 1
+ 
+SELECT x
+FROM 
+(
+    SELECT 1 AS x
+    UNION ALL
+    (
+        SELECT 1
+        UNION DISTINCT
+        SELECT 1
+        UNION DISTINCT
+        SELECT 1
+    )
+    UNION ALL
+    SELECT 1
+)
+ 
+SELECT x
+FROM 
+(
+    SELECT 1 AS x
+    UNION ALL
+    SELECT 1
+    UNION ALL
+    SELECT 1
+)
+ 
+SELECT 1
+UNION DISTINCT
+SELECT 1
+UNION DISTINCT
+SELECT 1
+ 
+SELECT 1
+ 
+
+(
+    SELECT 1
+    UNION DISTINCT
+    SELECT 1
+    UNION DISTINCT
+    SELECT 1
+)
+UNION ALL
+SELECT 1
diff --git a/tests/queries/0_stateless/01732_explain_syntax_union_query.sql b/tests/queries/0_stateless/01732_explain_syntax_union_query.sql
new file mode 100644
index 00000000000..0dd1e19e765
--- /dev/null
+++ b/tests/queries/0_stateless/01732_explain_syntax_union_query.sql
@@ -0,0 +1,86 @@
+EXPLAIN SYNTAX
+SELECT 1
+UNION ALL
+(
+    SELECT 1
+    UNION ALL
+    (
+        SELECT 1
+        UNION ALL
+        SELECT 1
+    )
+    UNION ALL
+    SELECT 1
+);
+
+SELECT ' ';
+
+EXPLAIN SYNTAX
+SELECT 1
+UNION ALL
+(
+    SELECT 1
+    UNION DISTINCT
+    (
+        SELECT 1
+        UNION ALL
+        SELECT 1
+    )
+    UNION ALL
+    SELECT 1
+);
+
+SELECT ' ';
+
+EXPLAIN SYNTAX
+SELECT x
+FROM
+(
+    SELECT 1 AS x
+    UNION ALL
+    (
+        SELECT 1
+        UNION DISTINCT
+        (
+            SELECT 1
+            UNION ALL
+            SELECT 1
+        )
+        UNION ALL
+        SELECT 1
+    )
+);
+
+SELECT ' ';
+
+EXPLAIN SYNTAX
+SELECT x
+FROM 
+(
+    SELECT 1 AS x
+    UNION ALL
+    (
+        SELECT 1
+        UNION ALL
+        SELECT 1
+    )
+);
+
+SELECT ' ';
+
+EXPLAIN SYNTAX
+SELECT 1
+UNION ALL
+SELECT 1
+UNION DISTINCT
+SELECT 1;
+
+SELECT ' ';
+
+EXPLAIN SYNTAX
+(((((((((((((((SELECT 1)))))))))))))));
+
+SELECT ' ';
+
+EXPLAIN SYNTAX
+(((((((((((((((SELECT 1 UNION DISTINCT SELECT 1))) UNION DISTINCT SELECT 1)))) UNION ALL SELECT 1))))))));
diff --git a/tests/queries/0_stateless/01732_race_condition_storage_join_long.reference b/tests/queries/0_stateless/01732_race_condition_storage_join_long.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01732_race_condition_storage_join_long.sh b/tests/queries/0_stateless/01732_race_condition_storage_join_long.sh
new file mode 100755
index 00000000000..b7dd76760d4
--- /dev/null
+++ b/tests/queries/0_stateless/01732_race_condition_storage_join_long.sh
@@ -0,0 +1,61 @@
+#!/usr/bin/env bash
+
+unset CLICKHOUSE_LOG_COMMENT
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+set -o errexit
+set -o pipefail
+
+echo "
+	DROP TABLE IF EXISTS storage_join_race;
+	CREATE TABLE storage_join_race (x UInt64, y UInt64) Engine = Join(ALL, FULL, x);
+" | $CLICKHOUSE_CLIENT -n
+
+function read_thread_big()
+{
+    while true; do 
+        echo "
+            SELECT * FROM ( SELECT number AS x FROM numbers(100000) ) AS t1 ALL FULL JOIN storage_join_race USING (x) FORMAT Null;
+        " | $CLICKHOUSE_CLIENT -n
+    done
+}
+
+function read_thread_small()
+{
+    while true; do 
+        echo "
+            SELECT * FROM ( SELECT number AS x FROM numbers(10) ) AS t1 ALL FULL JOIN storage_join_race USING (x) FORMAT Null;
+        " | $CLICKHOUSE_CLIENT -n
+    done
+}
+
+function read_thread_select()
+{
+    while true; do
+        echo "
+            SELECT * FROM storage_join_race FORMAT Null;
+        " | $CLICKHOUSE_CLIENT -n
+    done
+}
+
+# https://stackoverflow.com/questions/9954794/execute-a-shell-function-with-timeout
+export -f read_thread_big;
+export -f read_thread_small;
+export -f read_thread_select;
+
+TIMEOUT=20
+
+timeout $TIMEOUT bash -c read_thread_big 2> /dev/null &
+timeout $TIMEOUT bash -c read_thread_small 2> /dev/null &
+timeout $TIMEOUT bash -c read_thread_select 2> /dev/null &
+
+echo "
+    INSERT INTO storage_join_race SELECT number AS x, number AS y FROM numbers (10000000);
+" | $CLICKHOUSE_CLIENT -n
+
+wait
+
+$CLICKHOUSE_CLIENT -q "DROP TABLE storage_join_race"
diff --git a/tests/queries/0_stateless/01732_union_and_union_all.reference b/tests/queries/0_stateless/01732_union_and_union_all.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01732_union_and_union_all.sql b/tests/queries/0_stateless/01732_union_and_union_all.sql
new file mode 100644
index 00000000000..2de6daa5bb9
--- /dev/null
+++ b/tests/queries/0_stateless/01732_union_and_union_all.sql
@@ -0,0 +1 @@
+select 1 UNION select 1 UNION ALL select 1; -- { serverError 558 }
diff --git a/tests/queries/0_stateless/01735_join_get_low_card_fix.reference b/tests/queries/0_stateless/01735_join_get_low_card_fix.reference
new file mode 100644
index 00000000000..0b20aead00e
--- /dev/null
+++ b/tests/queries/0_stateless/01735_join_get_low_card_fix.reference
@@ -0,0 +1 @@
+yyy
diff --git a/tests/queries/0_stateless/01735_join_get_low_card_fix.sql b/tests/queries/0_stateless/01735_join_get_low_card_fix.sql
new file mode 100644
index 00000000000..bdc979bc11e
--- /dev/null
+++ b/tests/queries/0_stateless/01735_join_get_low_card_fix.sql
@@ -0,0 +1,9 @@
+drop table if exists join_tbl;
+
+create table join_tbl (`id` String, `name` String) engine Join(any, left, id);
+
+insert into join_tbl values ('xxx', 'yyy');
+
+select joinGet('join_tbl', 'name', toLowCardinality('xxx'));
+
+drop table if exists join_tbl;
diff --git a/tests/queries/0_stateless/01735_to_datetime64.reference b/tests/queries/0_stateless/01735_to_datetime64.reference
new file mode 100644
index 00000000000..d00491fd7e5
--- /dev/null
+++ b/tests/queries/0_stateless/01735_to_datetime64.reference
@@ -0,0 +1 @@
+1
diff --git a/tests/queries/0_stateless/01735_to_datetime64.sql b/tests/queries/0_stateless/01735_to_datetime64.sql
new file mode 100644
index 00000000000..fe4eb521148
--- /dev/null
+++ b/tests/queries/0_stateless/01735_to_datetime64.sql
@@ -0,0 +1 @@
+SELECT toDate(toDateTime64(today(), 0, 'UTC')) = toDate(toDateTime(today(), 'UTC'));
diff --git a/tests/queries/0_stateless/01736_null_as_default.reference b/tests/queries/0_stateless/01736_null_as_default.reference
new file mode 100644
index 00000000000..baf83eb21d7
--- /dev/null
+++ b/tests/queries/0_stateless/01736_null_as_default.reference
@@ -0,0 +1,2 @@
+A
+\N
diff --git a/tests/queries/0_stateless/01736_null_as_default.sql b/tests/queries/0_stateless/01736_null_as_default.sql
new file mode 100644
index 00000000000..a00011b06d4
--- /dev/null
+++ b/tests/queries/0_stateless/01736_null_as_default.sql
@@ -0,0 +1,5 @@
+drop table if exists test_enum;
+create table test_enum (c Nullable(Enum16('A' = 1, 'B' = 2))) engine Log;
+insert into test_enum values (1), (NULL);
+select * from test_enum;
+drop table test_enum;
diff --git a/tests/queries/0_stateless/01737_clickhouse_server_wait_server_pool_long.config.xml b/tests/queries/0_stateless/01737_clickhouse_server_wait_server_pool_long.config.xml
new file mode 100644
index 00000000000..2d0a480a375
--- /dev/null
+++ b/tests/queries/0_stateless/01737_clickhouse_server_wait_server_pool_long.config.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<yandex>
+    <logger>
+        <level>trace</level>
+        <console>true</console>
+    </logger>
+
+    <tcp_port>9000</tcp_port>
+
+    <path>./</path>
+
+    <mark_cache_size>0</mark_cache_size>
+
+    <users>
+        <default>
+            <password></password>
+
+            <networks>
+                <ip>::/0</ip>
+            </networks>
+
+            <profile>default</profile>
+            <quota>default</quota>
+            <access_management>1</access_management>
+        </default>
+    </users>
+
+    <profiles>
+        <default/>
+    </profiles>
+
+    <quotas>
+        <default />
+    </quotas>
+</yandex>
diff --git a/tests/queries/0_stateless/01737_clickhouse_server_wait_server_pool_long.reference b/tests/queries/0_stateless/01737_clickhouse_server_wait_server_pool_long.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01737_clickhouse_server_wait_server_pool_long.sh b/tests/queries/0_stateless/01737_clickhouse_server_wait_server_pool_long.sh
new file mode 100755
index 00000000000..a4fd7529ab2
--- /dev/null
+++ b/tests/queries/0_stateless/01737_clickhouse_server_wait_server_pool_long.sh
@@ -0,0 +1,83 @@
+#!/usr/bin/env bash
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+server_opts=(
+    "--config-file=$CUR_DIR/$(basename "${BASH_SOURCE[0]}" .sh).config.xml"
+    "--"
+    # to avoid multiple listen sockets (complexity for port discovering)
+    "--listen_host=127.1"
+    # we will discover the real port later.
+    "--tcp_port=0"
+    "--shutdown_wait_unfinished=0"
+)
+CLICKHOUSE_WATCHDOG_ENABLE=0 $CLICKHOUSE_SERVER_BINARY "${server_opts[@]}" >& clickhouse-server.log &
+server_pid=$!
+
+trap cleanup EXIT
+function cleanup()
+{
+    kill -9 $server_pid
+    kill -9 $client_pid
+
+    echo "Test failed. Server log:"
+    cat clickhouse-server.log
+    rm -f clickhouse-server.log
+
+    exit 1
+}
+
+server_port=
+i=0 retries=300
+# wait until server will start to listen (max 30 seconds)
+while [[ -z $server_port ]] && [[ $i -lt $retries ]]; do
+    server_port=$(lsof -n -a -P -i tcp -s tcp:LISTEN -p $server_pid 2>/dev/null | awk -F'[ :]' '/LISTEN/ { print $(NF-1) }')
+    ((++i))
+    sleep 0.1
+done
+if [[ -z $server_port ]]; then
+    echo "Cannot wait for LISTEN socket" >&2
+    exit 1
+fi
+
+# wait for the server to start accepting tcp connections (max 30 seconds)
+i=0 retries=300
+while ! $CLICKHOUSE_CLIENT_BINARY --host 127.1 --port "$server_port" --format Null -q 'select 1' 2>/dev/null && [[ $i -lt $retries ]]; do
+    sleep 0.1
+done
+if ! $CLICKHOUSE_CLIENT_BINARY --host 127.1 --port "$server_port" --format Null -q 'select 1'; then
+    echo "Cannot wait until server will start accepting connections on <tcp_port>" >&2
+    exit 1
+fi
+
+query_id="$CLICKHOUSE_DATABASE-$SECONDS"
+$CLICKHOUSE_CLIENT_BINARY --query_id "$query_id" --host 127.1 --port "$server_port" --format Null -q 'select sleepEachRow(1) from numbers(10)' 2>/dev/null &
+client_pid=$!
+
+# wait until the query will appear in processlist (max 10 second)
+# (it is enough to trigger the problem)
+i=0 retries=1000
+while [[ $($CLICKHOUSE_CLIENT_BINARY --host 127.1 --port "$server_port" -q "select count() from system.processes where query_id = '$query_id'") != "1" ]] && [[ $i -lt $retries ]]; do
+    sleep 0.01
+done
+if [[ $($CLICKHOUSE_CLIENT_BINARY --host 127.1 --port "$server_port" -q "select count() from system.processes where query_id = '$query_id'") != "1" ]]; then
+    echo "Cannot wait until the query will start" >&2
+    exit 1
+fi
+
+# send TERM and save the error code to ensure that it is 0 (EXIT_SUCCESS)
+kill $server_pid
+wait $server_pid
+return_code=$?
+
+wait $client_pid
+
+trap '' EXIT
+if [ $return_code != 0 ]; then
+    cat clickhouse-server.log
+fi
+rm -f clickhouse-server.log
+
+exit $return_code
diff --git a/tests/queries/0_stateless/01737_move_order_key_to_prewhere_select_final.reference b/tests/queries/0_stateless/01737_move_order_key_to_prewhere_select_final.reference
new file mode 100644
index 00000000000..95479cf37ba
--- /dev/null
+++ b/tests/queries/0_stateless/01737_move_order_key_to_prewhere_select_final.reference
@@ -0,0 +1,28 @@
+SELECT
+    x,
+    y,
+    z
+FROM prewhere_move_select_final
+PREWHERE y > 100
+SELECT
+    x,
+    y,
+    z
+FROM prewhere_move_select_final
+FINAL
+PREWHERE y > 100
+SELECT
+    x,
+    y,
+    z
+FROM prewhere_move_select_final
+FINAL
+WHERE z > 400
+SELECT
+    x,
+    y,
+    z
+FROM prewhere_move_select_final
+FINAL
+PREWHERE y > 100
+WHERE (y > 100) AND (z > 400)
diff --git a/tests/queries/0_stateless/01737_move_order_key_to_prewhere_select_final.sql b/tests/queries/0_stateless/01737_move_order_key_to_prewhere_select_final.sql
new file mode 100644
index 00000000000..a3a882c461a
--- /dev/null
+++ b/tests/queries/0_stateless/01737_move_order_key_to_prewhere_select_final.sql
@@ -0,0 +1,15 @@
+DROP TABLE IF EXISTS prewhere_move_select_final;
+CREATE TABLE prewhere_move_select_final (x Int, y Int, z Int) ENGINE = ReplacingMergeTree() ORDER BY (x, y);
+INSERT INTO prewhere_move_select_final SELECT number, number * 2, number * 3 FROM numbers(1000);
+
+-- order key can be pushed down with final
+EXPLAIN SYNTAX SELECT * FROM prewhere_move_select_final WHERE y > 100;
+EXPLAIN SYNTAX SELECT * FROM prewhere_move_select_final FINAL WHERE y > 100;
+
+-- can not be pushed down
+EXPLAIN SYNTAX SELECT * FROM prewhere_move_select_final FINAL WHERE z > 400;
+
+-- only y can be pushed down
+EXPLAIN SYNTAX SELECT * FROM prewhere_move_select_final FINAL WHERE y > 100 and z > 400;
+
+DROP TABLE prewhere_move_select_final;
diff --git a/tests/queries/0_stateless/01739_index_hint.reference b/tests/queries/0_stateless/01739_index_hint.reference
new file mode 100644
index 00000000000..6aa40c5d302
--- /dev/null
+++ b/tests/queries/0_stateless/01739_index_hint.reference
@@ -0,0 +1,35 @@
+-- { echo }
+
+drop table if exists tbl;
+create table tbl (p Int64, t Int64, f Float64) Engine=MergeTree partition by p order by t settings index_granularity=1;
+insert into tbl select number / 4, number, 0 from numbers(16);
+select * from tbl WHERE indexHint(t = 1) order by t;
+0	0	0
+0	1	0
+select * from tbl WHERE indexHint(t in (select toInt64(number) + 2 from numbers(3))) order by t;
+0	1	0
+0	2	0
+0	3	0
+1	4	0
+select * from tbl WHERE indexHint(p = 2) order by t;
+2	8	0
+2	9	0
+2	10	0
+2	11	0
+select * from tbl WHERE indexHint(p in (select toInt64(number) - 2 from numbers(3))) order by t;
+0	0	0
+0	1	0
+0	2	0
+0	3	0
+drop table tbl;
+drop table if exists XXXX;
+create table XXXX (t Int64, f Float64) Engine=MergeTree order by t settings index_granularity=128;
+insert into XXXX select number*60, 0 from numbers(100000);
+SELECT count() FROM XXXX WHERE indexHint(t = 42);
+128
+drop table if exists XXXX;
+create table XXXX (t Int64, f Float64) Engine=MergeTree order by t settings index_granularity=8192;
+insert into XXXX select number*60, 0 from numbers(100000);
+SELECT count() FROM XXXX WHERE indexHint(t = toDateTime(0));
+100000
+drop table XXXX;
diff --git a/tests/queries/0_stateless/01739_index_hint.sql b/tests/queries/0_stateless/01739_index_hint.sql
new file mode 100644
index 00000000000..28395c2dc1d
--- /dev/null
+++ b/tests/queries/0_stateless/01739_index_hint.sql
@@ -0,0 +1,35 @@
+-- { echo }
+
+drop table if exists tbl;
+
+create table tbl (p Int64, t Int64, f Float64) Engine=MergeTree partition by p order by t settings index_granularity=1;
+
+insert into tbl select number / 4, number, 0 from numbers(16);
+
+select * from tbl WHERE indexHint(t = 1) order by t;
+
+select * from tbl WHERE indexHint(t in (select toInt64(number) + 2 from numbers(3))) order by t;
+
+select * from tbl WHERE indexHint(p = 2) order by t;
+
+select * from tbl WHERE indexHint(p in (select toInt64(number) - 2 from numbers(3))) order by t;
+
+drop table tbl;
+
+drop table if exists XXXX;
+
+create table XXXX (t Int64, f Float64) Engine=MergeTree order by t settings index_granularity=128;
+
+insert into XXXX select number*60, 0 from numbers(100000);
+
+SELECT count() FROM XXXX WHERE indexHint(t = 42);
+
+drop table if exists XXXX;
+
+create table XXXX (t Int64, f Float64) Engine=MergeTree order by t settings index_granularity=8192;
+
+insert into XXXX select number*60, 0 from numbers(100000);
+
+SELECT count() FROM XXXX WHERE indexHint(t = toDateTime(0));
+
+drop table XXXX;
diff --git a/tests/queries/0_stateless/01744_fuse_sum_count_aggregate.reference b/tests/queries/0_stateless/01744_fuse_sum_count_aggregate.reference
new file mode 100644
index 00000000000..70c19fc8ced
--- /dev/null
+++ b/tests/queries/0_stateless/01744_fuse_sum_count_aggregate.reference
@@ -0,0 +1,12 @@
+210	230	20
+SELECT
+    sum(a),
+    sumCount(b).1,
+    sumCount(b).2
+FROM fuse_tbl
+---------NOT trigger fuse--------
+210	11.5
+SELECT
+    sum(a),
+    avg(b)
+FROM fuse_tbl
diff --git a/tests/queries/0_stateless/01744_fuse_sum_count_aggregate.sql b/tests/queries/0_stateless/01744_fuse_sum_count_aggregate.sql
new file mode 100644
index 00000000000..cad7b5803d4
--- /dev/null
+++ b/tests/queries/0_stateless/01744_fuse_sum_count_aggregate.sql
@@ -0,0 +1,11 @@
+DROP TABLE IF EXISTS fuse_tbl;
+CREATE TABLE fuse_tbl(a Int8, b Int8) Engine = Log;
+INSERT INTO fuse_tbl SELECT number, number + 1 FROM numbers(1, 20);
+
+SET optimize_fuse_sum_count_avg = 1;
+SELECT sum(a), sum(b), count(b) from fuse_tbl;
+EXPLAIN SYNTAX SELECT sum(a), sum(b), count(b) from fuse_tbl;
+SELECT '---------NOT trigger fuse--------';
+SELECT sum(a), avg(b) from fuse_tbl;
+EXPLAIN SYNTAX SELECT sum(a), avg(b) from fuse_tbl;
+DROP TABLE fuse_tbl;
diff --git a/tests/queries/0_stateless/01744_tuple_cast_to_map_bugfix.reference b/tests/queries/0_stateless/01744_tuple_cast_to_map_bugfix.reference
new file mode 100644
index 00000000000..c5143f7c4e9
--- /dev/null
+++ b/tests/queries/0_stateless/01744_tuple_cast_to_map_bugfix.reference
@@ -0,0 +1,3 @@
+{1:'Ready',2:'Steady',3:'Go'}
+{1:'Ready',2:'Steady',3:'Go'}
+{1:'Ready',2:'Steady',3:'Go'}
diff --git a/tests/queries/0_stateless/01744_tuple_cast_to_map_bugfix.sql b/tests/queries/0_stateless/01744_tuple_cast_to_map_bugfix.sql
new file mode 100644
index 00000000000..c5c50c5b039
--- /dev/null
+++ b/tests/queries/0_stateless/01744_tuple_cast_to_map_bugfix.sql
@@ -0,0 +1,3 @@
+SELECT CAST((['1', '2', '3'], ['Ready', 'Steady', 'Go']), 'Map(UInt8, String)') AS map;
+SELECT CAST((['1', '2', '3'], ['Ready', 'Steady', 'Go']), 'Map(UInt8, String)') AS map;
+SELECT CAST((['1', '2', '3'], ['Ready', 'Steady', 'Go']), 'Map(UInt8, String)') AS map;
diff --git a/tests/queries/0_stateless/01745_alter_delete_view.reference b/tests/queries/0_stateless/01745_alter_delete_view.reference
new file mode 100644
index 00000000000..dc3ab50ab0d
--- /dev/null
+++ b/tests/queries/0_stateless/01745_alter_delete_view.reference
@@ -0,0 +1,4 @@
+1	1
+2	1
+1	1
+2	1
diff --git a/tests/queries/0_stateless/01745_alter_delete_view.sql b/tests/queries/0_stateless/01745_alter_delete_view.sql
new file mode 100644
index 00000000000..c242f1be63e
--- /dev/null
+++ b/tests/queries/0_stateless/01745_alter_delete_view.sql
@@ -0,0 +1,28 @@
+DROP VIEW IF EXISTS test_view;
+DROP TABLE IF EXISTS test_table;
+
+CREATE TABLE test_table
+(
+    f1 Int32,
+    f2 Int32,
+    pk Int32
+)
+ENGINE = MergeTree()
+ORDER BY f1
+PARTITION BY pk;
+
+CREATE VIEW test_view AS
+SELECT f1, f2
+FROM test_table
+WHERE pk = 2;
+
+INSERT INTO test_table (f1, f2, pk) VALUES (1,1,1), (1,1,2), (2,1,1), (2,1,2);
+
+SELECT * FROM test_view ORDER BY f1, f2;
+
+ALTER TABLE test_view DELETE WHERE pk = 2; --{serverError 48}
+
+SELECT * FROM test_view ORDER BY f1, f2;
+
+DROP VIEW IF EXISTS test_view;
+DROP TABLE IF EXISTS test_table;
diff --git a/tests/queries/0_stateless/01746_executable_pool_dictionary.reference b/tests/queries/0_stateless/01746_executable_pool_dictionary.reference
new file mode 100644
index 00000000000..cf79a75e3f1
--- /dev/null
+++ b/tests/queries/0_stateless/01746_executable_pool_dictionary.reference
@@ -0,0 +1,10 @@
+executable_pool_simple
+1 a
+1 b
+2 a
+2 b
+executable_pool_complex
+value a
+value b
+value a
+value b
diff --git a/tests/queries/0_stateless/01746_executable_pool_dictionary.sql b/tests/queries/0_stateless/01746_executable_pool_dictionary.sql
new file mode 100644
index 00000000000..aa59d209b51
--- /dev/null
+++ b/tests/queries/0_stateless/01746_executable_pool_dictionary.sql
@@ -0,0 +1,15 @@
+SELECT 'executable_pool_simple';
+
+SELECT dictGet('executable_pool_simple', 'a', toUInt64(1));
+SELECT dictGet('executable_pool_simple', 'b', toUInt64(1));
+
+SELECT dictGet('executable_pool_simple', 'a', toUInt64(2));
+SELECT dictGet('executable_pool_simple', 'b', toUInt64(2));
+
+SELECT 'executable_pool_complex';
+
+SELECT dictGet('executable_pool_complex', 'a', ('First_1', 'Second_1'));
+SELECT dictGet('executable_pool_complex', 'b', ('First_1', 'Second_1'));
+
+SELECT dictGet('executable_pool_complex', 'a', ('First_2', 'Second_2'));
+SELECT dictGet('executable_pool_complex', 'b', ('First_2', 'Second_2'));
diff --git a/tests/queries/0_stateless/01746_extract_text_from_html.reference b/tests/queries/0_stateless/01746_extract_text_from_html.reference
new file mode 100644
index 00000000000..ee05e085ba4
--- /dev/null
+++ b/tests/queries/0_stateless/01746_extract_text_from_html.reference
@@ -0,0 +1,120 @@
+-- { echo }
+
+SELECT extractTextFromHTML('');
+
+SELECT extractTextFromHTML(' ');
+
+SELECT extractTextFromHTML('  ');
+
+SELECT extractTextFromHTML('Hello');
+Hello
+SELECT extractTextFromHTML('Hello, world');
+Hello, world
+SELECT extractTextFromHTML('Hello,  world');
+Hello, world
+SELECT extractTextFromHTML(' Hello,  world');
+Hello, world
+SELECT extractTextFromHTML(' Hello,  world ');
+Hello, world
+SELECT extractTextFromHTML(' \t Hello,\rworld \n ');
+Hello, world
+SELECT extractTextFromHTML('Hello<world');
+Hello
+SELECT extractTextFromHTML('Hello < world');
+Hello
+SELECT extractTextFromHTML('Hello > world');
+Hello > world
+SELECT extractTextFromHTML('Hello<world>');
+Hello
+SELECT extractTextFromHTML('Hello<>world');
+Hello world
+SELECT extractTextFromHTML('Hello<!>world');
+Hello world
+SELECT extractTextFromHTML('Hello<!->world');
+Hello world
+SELECT extractTextFromHTML('Hello<!-->world');
+Hello world
+SELECT extractTextFromHTML('Hello<!--->world');
+Hello world
+SELECT extractTextFromHTML('Hello<!---->world');
+Hello world
+SELECT extractTextFromHTML('Hello <!-- --> World');
+Hello World
+SELECT extractTextFromHTML('Hello<!-- --> World');
+Hello World
+SELECT extractTextFromHTML('Hello<!-- -->World');
+Hello World
+SELECT extractTextFromHTML('Hello <!-- -->World');
+Hello World
+SELECT extractTextFromHTML('Hello <u> World</u>');
+Hello World
+SELECT extractTextFromHTML('Hello <u>World</u>');
+Hello World
+SELECT extractTextFromHTML('Hello<u>World</u>');
+Hello World
+SELECT extractTextFromHTML('Hello<u> World</u>');
+Hello World
+SELECT extractTextFromHTML('<![CDATA[ \t Hello,\rworld \n ]]>');
+ \t Hello,\rworld \n 
+SELECT extractTextFromHTML('Hello <![CDATA[Hello\tworld]]> world!');
+HelloHello\tworld world!
+SELECT extractTextFromHTML('Hello<![CDATA[Hello\tworld]]>world!');
+HelloHello\tworld world!
+SELECT extractTextFromHTML('Hello <![CDATA[Hello <b>world</b>]]> world!');
+HelloHello <b>world</b> world!
+SELECT extractTextFromHTML('<![CDATA[<sender>John Smith</sender>]]>');
+<sender>John Smith</sender>
+SELECT extractTextFromHTML('<![CDATA[<sender>John <![CDATA[Smith</sender>]]>');
+<sender>John <![CDATA[Smith</sender>
+SELECT extractTextFromHTML('<![CDATA[<sender>John <![CDATA[]]>Smith</sender>]]>');
+<sender>John <![CDATA[ Smith ]]>
+SELECT extractTextFromHTML('<![CDATA[<sender>John ]]><![CDATA[Smith</sender>]]>');
+<sender>John Smith</sender>
+SELECT extractTextFromHTML('<![CDATA[<sender>John ]]> <![CDATA[Smith</sender>]]>');
+<sender>John Smith</sender>
+SELECT extractTextFromHTML('<![CDATA[<sender>John]]> <![CDATA[Smith</sender>]]>');
+<sender>JohnSmith</sender>
+SELECT extractTextFromHTML('<![CDATA[<sender>John ]]>]]><![CDATA[Smith</sender>]]>');
+<sender>John ]]>Smith</sender>
+SELECT extractTextFromHTML('Hello<script>World</script> goodbye');
+Hello goodbye
+SELECT extractTextFromHTML('Hello<script >World</script> goodbye');
+Hello goodbye
+SELECT extractTextFromHTML('Hello<scripta>World</scripta> goodbye');
+Hello World goodbye
+SELECT extractTextFromHTML('Hello<script type="text/javascript">World</script> goodbye');
+Hello goodbye
+SELECT extractTextFromHTML('Hello<style type="text/css">World</style> goodbye');
+Hello goodbye
+SELECT extractTextFromHTML('Hello<script:p>World</script:p> goodbye');
+Hello World goodbye
+SELECT extractTextFromHTML('Hello<script:p type="text/javascript">World</script:p> goodbye');
+Hello World goodbye
+SELECT extractTextFromHTML('Hello<style type="text/css">World <!-- abc --> </style> goodbye');
+Hello goodbye
+SELECT extractTextFromHTML('Hello<style type="text/css">World <!-- abc --> </style \n > goodbye');
+Hello goodbye
+SELECT extractTextFromHTML('Hello<style type="text/css">World <!-- abc --> </ style> goodbye');
+Hello
+SELECT extractTextFromHTML('Hello<style type="text/css">World <!-- abc --> </stylea> goodbye');
+Hello
+SELECT extractTextFromHTML('Hello<style type="text/css">World <![CDATA[</style>]]> </stylea> goodbye');
+Hello
+SELECT extractTextFromHTML('Hello<style type="text/css">World <![CDATA[</style>]]> </style> goodbye');
+Hello goodbye
+SELECT extractTextFromHTML('Hello<style type="text/css">World <![CDAT[</style>]]> </style> goodbye');
+Hello ]]> goodbye
+SELECT extractTextFromHTML('Hello<style type="text/css">World <![endif]--> </style> goodbye');
+Hello goodbye
+SELECT extractTextFromHTML('Hello<style type="text/css">World <script>abc</script> </stylea> goodbye');
+Hello
+SELECT extractTextFromHTML('Hello<style type="text/css">World <script>abc</script> </style> goodbye');
+Hello goodbye
+SELECT extractTextFromHTML('<![CDATA[]]]]><![CDATA[>]]>');
+]]>
+SELECT extractTextFromHTML('
+<img src="pictures/power.png" style="margin-bottom: -30px;" />
+<br><span style="padding-right: 10px; font-size: 10px;">xkcd.com</span>
+</div>
+');
+xkcd.com
diff --git a/tests/queries/0_stateless/01746_extract_text_from_html.sql b/tests/queries/0_stateless/01746_extract_text_from_html.sql
new file mode 100644
index 00000000000..b4ccc775bef
--- /dev/null
+++ b/tests/queries/0_stateless/01746_extract_text_from_html.sql
@@ -0,0 +1,72 @@
+-- { echo }
+
+SELECT extractTextFromHTML('');
+SELECT extractTextFromHTML(' ');
+SELECT extractTextFromHTML('  ');
+SELECT extractTextFromHTML('Hello');
+SELECT extractTextFromHTML('Hello, world');
+SELECT extractTextFromHTML('Hello,  world');
+SELECT extractTextFromHTML(' Hello,  world');
+SELECT extractTextFromHTML(' Hello,  world ');
+SELECT extractTextFromHTML(' \t Hello,\rworld \n ');
+
+SELECT extractTextFromHTML('Hello<world');
+SELECT extractTextFromHTML('Hello < world');
+SELECT extractTextFromHTML('Hello > world');
+SELECT extractTextFromHTML('Hello<world>');
+SELECT extractTextFromHTML('Hello<>world');
+SELECT extractTextFromHTML('Hello<!>world');
+SELECT extractTextFromHTML('Hello<!->world');
+SELECT extractTextFromHTML('Hello<!-->world');
+SELECT extractTextFromHTML('Hello<!--->world');
+SELECT extractTextFromHTML('Hello<!---->world');
+
+SELECT extractTextFromHTML('Hello <!-- --> World');
+SELECT extractTextFromHTML('Hello<!-- --> World');
+SELECT extractTextFromHTML('Hello<!-- -->World');
+SELECT extractTextFromHTML('Hello <!-- -->World');
+SELECT extractTextFromHTML('Hello <u> World</u>');
+SELECT extractTextFromHTML('Hello <u>World</u>');
+SELECT extractTextFromHTML('Hello<u>World</u>');
+SELECT extractTextFromHTML('Hello<u> World</u>');
+
+SELECT extractTextFromHTML('<![CDATA[ \t Hello,\rworld \n ]]>');
+SELECT extractTextFromHTML('Hello <![CDATA[Hello\tworld]]> world!');
+SELECT extractTextFromHTML('Hello<![CDATA[Hello\tworld]]>world!');
+
+SELECT extractTextFromHTML('Hello <![CDATA[Hello <b>world</b>]]> world!');
+SELECT extractTextFromHTML('<![CDATA[<sender>John Smith</sender>]]>');
+SELECT extractTextFromHTML('<![CDATA[<sender>John <![CDATA[Smith</sender>]]>');
+SELECT extractTextFromHTML('<![CDATA[<sender>John <![CDATA[]]>Smith</sender>]]>');
+SELECT extractTextFromHTML('<![CDATA[<sender>John ]]><![CDATA[Smith</sender>]]>');
+SELECT extractTextFromHTML('<![CDATA[<sender>John ]]> <![CDATA[Smith</sender>]]>');
+SELECT extractTextFromHTML('<![CDATA[<sender>John]]> <![CDATA[Smith</sender>]]>');
+SELECT extractTextFromHTML('<![CDATA[<sender>John ]]>]]><![CDATA[Smith</sender>]]>');
+
+SELECT extractTextFromHTML('Hello<script>World</script> goodbye');
+SELECT extractTextFromHTML('Hello<script >World</script> goodbye');
+SELECT extractTextFromHTML('Hello<scripta>World</scripta> goodbye');
+SELECT extractTextFromHTML('Hello<script type="text/javascript">World</script> goodbye');
+SELECT extractTextFromHTML('Hello<style type="text/css">World</style> goodbye');
+SELECT extractTextFromHTML('Hello<script:p>World</script:p> goodbye');
+SELECT extractTextFromHTML('Hello<script:p type="text/javascript">World</script:p> goodbye');
+
+SELECT extractTextFromHTML('Hello<style type="text/css">World <!-- abc --> </style> goodbye');
+SELECT extractTextFromHTML('Hello<style type="text/css">World <!-- abc --> </style \n > goodbye');
+SELECT extractTextFromHTML('Hello<style type="text/css">World <!-- abc --> </ style> goodbye');
+SELECT extractTextFromHTML('Hello<style type="text/css">World <!-- abc --> </stylea> goodbye');
+
+SELECT extractTextFromHTML('Hello<style type="text/css">World <![CDATA[</style>]]> </stylea> goodbye');
+SELECT extractTextFromHTML('Hello<style type="text/css">World <![CDATA[</style>]]> </style> goodbye');
+SELECT extractTextFromHTML('Hello<style type="text/css">World <![CDAT[</style>]]> </style> goodbye');
+SELECT extractTextFromHTML('Hello<style type="text/css">World <![endif]--> </style> goodbye');
+SELECT extractTextFromHTML('Hello<style type="text/css">World <script>abc</script> </stylea> goodbye');
+SELECT extractTextFromHTML('Hello<style type="text/css">World <script>abc</script> </style> goodbye');
+
+SELECT extractTextFromHTML('<![CDATA[]]]]><![CDATA[>]]>');
+
+SELECT extractTextFromHTML('
+<img src="pictures/power.png" style="margin-bottom: -30px;" />
+<br><span style="padding-right: 10px; font-size: 10px;">xkcd.com</span>
+</div>
+');
diff --git a/tests/queries/0_stateless/01746_forbid_drop_column_referenced_by_mv.reference b/tests/queries/0_stateless/01746_forbid_drop_column_referenced_by_mv.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01746_forbid_drop_column_referenced_by_mv.sql b/tests/queries/0_stateless/01746_forbid_drop_column_referenced_by_mv.sql
new file mode 100644
index 00000000000..f084cae7780
--- /dev/null
+++ b/tests/queries/0_stateless/01746_forbid_drop_column_referenced_by_mv.sql
@@ -0,0 +1,172 @@
+-- MergeTree
+DROP TABLE IF EXISTS `01746_merge_tree`;
+CREATE TABLE `01746_merge_tree`
+(
+    `n1` Int8,
+    `n2` Int8,
+    `n3` Int8,
+    `n4` Int8
+)
+ENGINE = MergeTree
+ORDER BY n1;
+
+DROP TABLE IF EXISTS `01746_merge_tree_mv`;
+CREATE MATERIALIZED VIEW `01746_merge_tree_mv`
+ENGINE = Memory AS
+SELECT
+    n2,
+    n3
+FROM `01746_merge_tree`;
+
+ALTER TABLE `01746_merge_tree`
+    DROP COLUMN n3;  -- { serverError 524 }
+
+ALTER TABLE `01746_merge_tree`
+    DROP COLUMN n2;  -- { serverError 524 }
+
+-- ok
+ALTER TABLE `01746_merge_tree`
+    DROP COLUMN n4;
+
+DROP TABLE `01746_merge_tree`;
+DROP TABLE `01746_merge_tree_mv`;
+
+-- Null 
+DROP TABLE IF EXISTS `01746_null`;
+CREATE TABLE `01746_null`
+(
+    `n1` Int8,
+    `n2` Int8,
+    `n3` Int8
+)
+ENGINE = Null;
+
+DROP TABLE IF EXISTS `01746_null_mv`;
+CREATE MATERIALIZED VIEW `01746_null_mv`
+ENGINE = Memory AS
+SELECT
+    n1,
+    n2
+FROM `01746_null`;
+
+ALTER TABLE `01746_null`
+    DROP COLUMN n1; -- { serverError 524 }
+
+ALTER TABLE `01746_null`
+    DROP COLUMN n2; -- { serverError 524 }
+
+-- ok
+ALTER TABLE `01746_null`
+    DROP COLUMN n3;
+
+DROP TABLE `01746_null`;
+DROP TABLE `01746_null_mv`;
+
+-- Distributed
+
+DROP TABLE IF EXISTS `01746_local`;
+CREATE TABLE `01746_local`
+(
+    `n1` Int8,
+    `n2` Int8,
+    `n3` Int8
+)
+ENGINE = Memory;
+
+DROP TABLE IF EXISTS `01746_dist`;
+CREATE TABLE `01746_dist` AS `01746_local`
+ENGINE = Distributed('test_shard_localhost', currentDatabase(), `01746_local`, rand());
+
+DROP TABLE IF EXISTS `01746_dist_mv`;
+CREATE MATERIALIZED VIEW `01746_dist_mv`
+ENGINE = Memory AS
+SELECT
+    n1,
+    n2
+FROM `01746_dist`;
+
+ALTER TABLE `01746_dist`
+    DROP COLUMN n1; -- { serverError 524 }
+
+ALTER TABLE `01746_dist`
+    DROP COLUMN n2; -- { serverError 524 }
+
+-- ok
+ALTER TABLE `01746_dist`
+    DROP COLUMN n3;
+
+DROP TABLE `01746_local`;
+DROP TABLE `01746_dist`;
+DROP TABLE `01746_dist_mv`;
+
+-- Merge
+DROP TABLE IF EXISTS `01746_merge_t`;
+CREATE TABLE `01746_merge_t`
+(
+    `n1` Int8,
+    `n2` Int8,
+    `n3` Int8
+)
+ENGINE = Memory;
+
+DROP TABLE IF EXISTS `01746_merge`;
+CREATE TABLE `01746_merge` AS `01746_merge_t`
+ENGINE = Merge(currentDatabase(), '01746_merge_t');
+
+DROP TABLE IF EXISTS `01746_merge_mv`;
+CREATE MATERIALIZED VIEW `01746_merge_mv`
+ENGINE = Memory AS
+SELECT
+    n1,
+    n2
+FROM `01746_merge`;
+
+ALTER TABLE `01746_merge`
+    DROP COLUMN n1; -- { serverError 524 }
+
+ALTER TABLE `01746_merge`
+    DROP COLUMN n2; -- { serverError 524 }
+
+-- ok
+ALTER TABLE `01746_merge`
+    DROP COLUMN n3;
+
+DROP TABLE `01746_merge_t`;
+DROP TABLE `01746_merge`;
+DROP TABLE `01746_merge_mv`;
+
+-- Buffer
+DROP TABLE IF EXISTS `01746_buffer_t`;
+CREATE TABLE `01746_buffer_t`
+(
+    `n1` Int8,
+    `n2` Int8,
+    `n3` Int8
+)
+ENGINE = Memory;
+
+DROP TABLE IF EXISTS `01746_buffer`;
+CREATE TABLE `01746_buffer` AS `01746_buffer_t`
+ENGINE = Buffer(currentDatabase(), `01746_buffer_t`, 16, 10, 100, 10000, 1000000, 10000000, 100000000);
+
+DROP TABLE IF EXISTS `01746_buffer_mv`;
+CREATE MATERIALIZED VIEW `01746_buffer_mv`
+ENGINE = Memory AS
+SELECT
+    n1,
+    n2
+FROM `01746_buffer`;
+
+ALTER TABLE `01746_buffer`
+    DROP COLUMN n1; -- { serverError 524 }
+
+ALTER TABLE `01746_buffer`
+    DROP COLUMN n2; -- { serverError 524 }
+
+-- ok
+ALTER TABLE `01746_buffer`
+    DROP COLUMN n3;
+
+DROP TABLE `01746_buffer_t`;
+DROP TABLE `01746_buffer`;
+DROP TABLE `01746_buffer_mv`;
diff --git a/tests/queries/0_stateless/01746_lc_values_format_bug.reference b/tests/queries/0_stateless/01746_lc_values_format_bug.reference
new file mode 100644
index 00000000000..78981922613
--- /dev/null
+++ b/tests/queries/0_stateless/01746_lc_values_format_bug.reference
@@ -0,0 +1 @@
+a
diff --git a/tests/queries/0_stateless/01746_lc_values_format_bug.sql b/tests/queries/0_stateless/01746_lc_values_format_bug.sql
new file mode 100644
index 00000000000..6717b9ae5e3
--- /dev/null
+++ b/tests/queries/0_stateless/01746_lc_values_format_bug.sql
@@ -0,0 +1,14 @@
+drop table if exists lc_test;
+
+CREATE TABLE lc_test
+(
+    `id` LowCardinality(String)
+)
+ENGINE = MergeTree
+PARTITION BY tuple()
+ORDER BY id;
+
+insert into lc_test values (toString('a'));
+
+select id from lc_test;
+drop table if exists lc_test;
diff --git a/tests/queries/0_stateless/01746_long_zlib_http_compression_json_format.reference b/tests/queries/0_stateless/01746_long_zlib_http_compression_json_format.reference
new file mode 100644
index 00000000000..92dfd99c259
--- /dev/null
+++ b/tests/queries/0_stateless/01746_long_zlib_http_compression_json_format.reference
@@ -0,0 +1,23 @@
+		},
+		{
+			"datetime": "2020-12-12",
+			"pipeline": "test-pipeline",
+			"host": "clickhouse-test-host-001.clickhouse.com",
+			"home": "clickhouse",
+			"detail": "clickhouse",
+			"row_number": "99998"
+		},
+		{
+			"datetime": "2020-12-12",
+			"pipeline": "test-pipeline",
+			"host": "clickhouse-test-host-001.clickhouse.com",
+			"home": "clickhouse",
+			"detail": "clickhouse",
+			"row_number": "99999"
+		}
+	],
+
+	"rows": 100000,
+
+	"rows_before_limit_at_least": 131010,
+
diff --git a/tests/queries/0_stateless/01746_long_zlib_http_compression_json_format.sh b/tests/queries/0_stateless/01746_long_zlib_http_compression_json_format.sh
new file mode 100755
index 00000000000..7a2343a953a
--- /dev/null
+++ b/tests/queries/0_stateless/01746_long_zlib_http_compression_json_format.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+${CLICKHOUSE_CURL} -sS -H 'Accept-Encoding: gzip'              "${CLICKHOUSE_URL}&enable_http_compression=1&http_zlib_compression_level=1" -d "SELECT toDate('2020-12-12') as datetime, 'test-pipeline' as pipeline, 'clickhouse-test-host-001.clickhouse.com' as host, 'clickhouse' as home, 'clickhouse' as detail, number as row_number FROM numbers(100000) FORMAT JSON" | gzip -d | tail -n30 | head -n23
diff --git a/tests/queries/0_stateless/01746_long_zstd_http_compression_json_format.reference b/tests/queries/0_stateless/01746_long_zstd_http_compression_json_format.reference
new file mode 100644
index 00000000000..7c089a2fd05
--- /dev/null
+++ b/tests/queries/0_stateless/01746_long_zstd_http_compression_json_format.reference
@@ -0,0 +1,23 @@
+		},
+		{
+			"datetime": "2020-12-12",
+			"pipeline": "test-pipeline",
+			"host": "clickhouse-test-host-001.clickhouse.com",
+			"home": "clickhouse",
+			"detail": "clickhouse",
+			"row_number": "999998"
+		},
+		{
+			"datetime": "2020-12-12",
+			"pipeline": "test-pipeline",
+			"host": "clickhouse-test-host-001.clickhouse.com",
+			"home": "clickhouse",
+			"detail": "clickhouse",
+			"row_number": "999999"
+		}
+	],
+
+	"rows": 1000000,
+
+	"rows_before_limit_at_least": 1048080,
+
diff --git a/tests/queries/0_stateless/01746_long_zstd_http_compression_json_format.sh b/tests/queries/0_stateless/01746_long_zstd_http_compression_json_format.sh
new file mode 100755
index 00000000000..f520a21e9b3
--- /dev/null
+++ b/tests/queries/0_stateless/01746_long_zstd_http_compression_json_format.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+${CLICKHOUSE_CURL} -sS -H 'Accept-Encoding: zstd'              "${CLICKHOUSE_URL}&enable_http_compression=1" -d "SELECT toDate('2020-12-12') as datetime, 'test-pipeline' as pipeline, 'clickhouse-test-host-001.clickhouse.com' as host, 'clickhouse' as home, 'clickhouse' as detail, number as row_number FROM numbers(1000000) FORMAT JSON" | zstd -d | tail -n30 | head -n23
diff --git a/tests/queries/0_stateless/01746_test_for_tupleElement_must_be_constant_issue.reference b/tests/queries/0_stateless/01746_test_for_tupleElement_must_be_constant_issue.reference
new file mode 100644
index 00000000000..6592226b0ac
--- /dev/null
+++ b/tests/queries/0_stateless/01746_test_for_tupleElement_must_be_constant_issue.reference
@@ -0,0 +1,2 @@
+[('a',10)]
+[('a',10)]
diff --git a/tests/queries/0_stateless/01746_test_for_tupleElement_must_be_constant_issue.sql b/tests/queries/0_stateless/01746_test_for_tupleElement_must_be_constant_issue.sql
new file mode 100644
index 00000000000..72ba6a036df
--- /dev/null
+++ b/tests/queries/0_stateless/01746_test_for_tupleElement_must_be_constant_issue.sql
@@ -0,0 +1,7 @@
+DROP TABLE IF EXISTS ttt01746;
+CREATE TABLE ttt01746 (d Date, n UInt64) ENGINE = MergeTree() PARTITION BY toMonday(d) ORDER BY n;
+INSERT INTO ttt01746 SELECT toDate('2021-02-14') + (number % 30) AS d, number AS n FROM numbers(1500000);
+set optimize_move_to_prewhere=0;
+SELECT arraySort(x -> x.2, [tuple('a', 10)]) AS X FROM ttt01746 WHERE d >= toDate('2021-03-03') - 2 ORDER BY n LIMIT 1;
+SELECT arraySort(x -> x.2, [tuple('a', 10)]) AS X FROM ttt01746 PREWHERE d >= toDate('2021-03-03') - 2 ORDER BY n LIMIT 1;
+DROP TABLE ttt01746;
diff --git a/tests/queries/0_stateless/01747_alter_partition_key_enum_zookeeper.reference b/tests/queries/0_stateless/01747_alter_partition_key_enum_zookeeper.reference
new file mode 100644
index 00000000000..02359f0f98b
--- /dev/null
+++ b/tests/queries/0_stateless/01747_alter_partition_key_enum_zookeeper.reference
@@ -0,0 +1,6 @@
+IU	lada	2101	1970-04-19 15:00:00
+PS	jeep	Grand Cherokee	2005-10-03 15:00:00
+PS	jeep	Grand Cherokee	2005-10-03 15:00:00
+IU	lada	2101	1970-04-19 15:00:00
+PS	jeep	Grand Cherokee	2005-10-03 15:00:00
+PS	jeep	Grand Cherokee	2005-10-03 15:00:00
diff --git a/tests/queries/0_stateless/01747_alter_partition_key_enum_zookeeper.sql b/tests/queries/0_stateless/01747_alter_partition_key_enum_zookeeper.sql
new file mode 100644
index 00000000000..759c8ba3a0b
--- /dev/null
+++ b/tests/queries/0_stateless/01747_alter_partition_key_enum_zookeeper.sql
@@ -0,0 +1,63 @@
+DROP TABLE IF EXISTS report;
+
+CREATE TABLE report
+(
+    `product` Enum8('IU' = 1, 'WS' = 2),
+    `machine` String,
+    `branch` String,
+    `generated_time` DateTime
+)
+ENGINE = MergeTree
+PARTITION BY (product, toYYYYMM(generated_time))
+ORDER BY (product, machine, branch, generated_time);
+
+INSERT INTO report VALUES ('IU', 'lada', '2101', toDateTime('1970-04-19 15:00:00'));
+
+SELECT * FROM report  WHERE product = 'IU';
+
+ALTER TABLE report MODIFY COLUMN product Enum8('IU' = 1, 'WS' = 2, 'PS' = 3);
+
+SELECT * FROM report WHERE product = 'PS';
+
+INSERT INTO report VALUES ('PS', 'jeep', 'Grand Cherokee', toDateTime('2005-10-03 15:00:00'));
+
+SELECT * FROM report WHERE product = 'PS';
+
+DETACH TABLE report;
+ATTACH TABLE report;
+
+SELECT * FROM report WHERE product = 'PS';
+
+DROP TABLE IF EXISTS report;
+
+DROP TABLE IF EXISTS replicated_report;
+
+CREATE TABLE replicated_report
+(
+    `product` Enum8('IU' = 1, 'WS' = 2),
+    `machine` String,
+    `branch` String,
+    `generated_time` DateTime
+)
+ENGINE = ReplicatedMergeTree('/clickhouse/01747_alter_partition_key/t', '1')
+PARTITION BY (product, toYYYYMM(generated_time))
+ORDER BY (product, machine, branch, generated_time);
+
+INSERT INTO replicated_report VALUES ('IU', 'lada', '2101', toDateTime('1970-04-19 15:00:00'));
+
+SELECT * FROM replicated_report  WHERE product = 'IU';
+
+ALTER TABLE replicated_report MODIFY COLUMN product Enum8('IU' = 1, 'WS' = 2, 'PS' = 3) SETTINGS replication_alter_partitions_sync=2;
+
+SELECT * FROM replicated_report WHERE product = 'PS';
+
+INSERT INTO replicated_report VALUES ('PS', 'jeep', 'Grand Cherokee', toDateTime('2005-10-03 15:00:00'));
+
+SELECT * FROM replicated_report WHERE product = 'PS';
+
+DETACH TABLE replicated_report;
+ATTACH TABLE replicated_report;
+
+SELECT * FROM replicated_report WHERE product = 'PS';
+
+DROP TABLE IF EXISTS replicated_report;
diff --git a/tests/queries/0_stateless/01747_executable_pool_dictionary_implicit_key.reference b/tests/queries/0_stateless/01747_executable_pool_dictionary_implicit_key.reference
new file mode 100644
index 00000000000..ab44ba51330
--- /dev/null
+++ b/tests/queries/0_stateless/01747_executable_pool_dictionary_implicit_key.reference
@@ -0,0 +1,10 @@
+executable_pool_simple_implicit_key
+1 a
+1 b
+2 a
+2 b
+executable_pool_complex_implicit_key
+data a
+data b
+data a
+data b
diff --git a/tests/queries/0_stateless/01747_executable_pool_dictionary_implicit_key.sql b/tests/queries/0_stateless/01747_executable_pool_dictionary_implicit_key.sql
new file mode 100644
index 00000000000..6c6d33c7d43
--- /dev/null
+++ b/tests/queries/0_stateless/01747_executable_pool_dictionary_implicit_key.sql
@@ -0,0 +1,15 @@
+SELECT 'executable_pool_simple_implicit_key';
+
+SELECT dictGet('executable_pool_simple_implicit_key', 'a', toUInt64(1));
+SELECT dictGet('executable_pool_simple_implicit_key', 'b', toUInt64(1));
+
+SELECT dictGet('executable_pool_simple_implicit_key', 'a', toUInt64(2));
+SELECT dictGet('executable_pool_simple_implicit_key', 'b', toUInt64(2));
+
+SELECT 'executable_pool_complex_implicit_key';
+
+SELECT dictGet('executable_pool_complex_implicit_key', 'a', ('First_1', 'Second_1'));
+SELECT dictGet('executable_pool_complex_implicit_key', 'b', ('First_1', 'Second_1'));
+
+SELECT dictGet('executable_pool_complex_implicit_key', 'a', ('First_2', 'Second_2'));
+SELECT dictGet('executable_pool_complex_implicit_key', 'b', ('First_2', 'Second_2'));
diff --git a/tests/queries/0_stateless/01747_join_view_filter_dictionary.reference b/tests/queries/0_stateless/01747_join_view_filter_dictionary.reference
new file mode 100644
index 00000000000..24ed2375adf
--- /dev/null
+++ b/tests/queries/0_stateless/01747_join_view_filter_dictionary.reference
@@ -0,0 +1,2 @@
+name	test	33	1.2
+33
diff --git a/tests/queries/0_stateless/01747_join_view_filter_dictionary.sql b/tests/queries/0_stateless/01747_join_view_filter_dictionary.sql
new file mode 100644
index 00000000000..b43fa336485
--- /dev/null
+++ b/tests/queries/0_stateless/01747_join_view_filter_dictionary.sql
@@ -0,0 +1,49 @@
+drop table if exists summing_table01747;
+drop view if exists rates01747;
+drop view if exists agg_view01747;
+drop table if exists dictst01747;
+drop DICTIONARY if exists default.dict01747;
+
+CREATE TABLE summing_table01747
+ (
+    some_name               String,
+    user_id                 UInt64,
+    amount                  Int64,
+    currency                String
+ )
+ENGINE = SummingMergeTree()
+ORDER BY (some_name);
+
+CREATE VIEW rates01747 AS
+   SELECT 'USD' as from_currency, 'EUR' as to_currency, 1.2 as rates01747;
+
+insert into summing_table01747 values ('name', 2, 20, 'USD'),('name', 1, 10, 'USD');
+
+create table dictst01747(some_name String, field1 String, field2 UInt8) Engine = Memory
+as select 'name', 'test', 33;
+
+CREATE DICTIONARY default.dict01747 (some_name String, field1 String, field2 UInt8)
+PRIMARY KEY some_name SOURCE(CLICKHOUSE(HOST 'localhost' PORT 9000 
+TABLE dictst01747 DB currentDatabase() USER 'default')) 
+LIFETIME(MIN 0 MAX 0) LAYOUT(COMPLEX_KEY_HASHED());
+
+
+CREATE VIEW agg_view01747 AS
+  SELECT
+    summing_table01747.some_name as some_name,
+    dictGet('default.dict01747', 'field1', tuple(some_name)) as field1,
+    dictGet('default.dict01747', 'field2', tuple(some_name)) as field2,
+    rates01747.rates01747 as rates01747
+  FROM summing_table01747
+  ANY LEFT JOIN rates01747
+    ON rates01747.from_currency = summing_table01747.currency;
+
+select * from agg_view01747;
+
+SELECT field2 FROM agg_view01747 WHERE field1 = 'test';
+
+drop table summing_table01747;
+drop view rates01747;
+drop view agg_view01747;
+drop table dictst01747;
+drop DICTIONARY default.dict01747;
diff --git a/tests/queries/0_stateless/01747_transform_empty_arrays.reference b/tests/queries/0_stateless/01747_transform_empty_arrays.reference
new file mode 100644
index 00000000000..d00491fd7e5
--- /dev/null
+++ b/tests/queries/0_stateless/01747_transform_empty_arrays.reference
@@ -0,0 +1 @@
+1
diff --git a/tests/queries/0_stateless/01747_transform_empty_arrays.sql b/tests/queries/0_stateless/01747_transform_empty_arrays.sql
new file mode 100644
index 00000000000..cc9a00a4555
--- /dev/null
+++ b/tests/queries/0_stateless/01747_transform_empty_arrays.sql
@@ -0,0 +1,27 @@
+SELECT *
+FROM
+(
+    WITH
+
+        (
+            SELECT groupArray(a)
+            FROM
+            (
+                SELECT 1 AS a
+            )
+        ) AS keys,
+
+        (
+            SELECT groupArray(a)
+            FROM
+            (
+                SELECT 2 AS a
+            )
+        ) AS values
+    SELECT *
+    FROM
+    (
+        SELECT 1 AS a
+    )
+    WHERE transform(a, keys, values, 0)
+) AS wrap;
diff --git a/tests/queries/0_stateless/01748_dictionary_table_dot.reference b/tests/queries/0_stateless/01748_dictionary_table_dot.reference
new file mode 100644
index 00000000000..e965047ad7c
--- /dev/null
+++ b/tests/queries/0_stateless/01748_dictionary_table_dot.reference
@@ -0,0 +1 @@
+Hello
diff --git a/tests/queries/0_stateless/01748_dictionary_table_dot.sql b/tests/queries/0_stateless/01748_dictionary_table_dot.sql
new file mode 100644
index 00000000000..a974786f446
--- /dev/null
+++ b/tests/queries/0_stateless/01748_dictionary_table_dot.sql
@@ -0,0 +1,34 @@
+DROP DATABASE IF EXISTS test_01748;
+CREATE DATABASE test_01748;
+USE test_01748;
+
+DROP TABLE IF EXISTS `test.txt`;
+DROP DICTIONARY IF EXISTS test_dict;
+
+CREATE TABLE `test.txt`
+(
+    `key1` UInt32,
+    `key2` UInt32,
+    `value` String
+)
+ENGINE = Memory();
+
+CREATE DICTIONARY test_dict
+(
+    `key1` UInt32,
+    `key2` UInt32,
+    `value` String
+)
+PRIMARY KEY key1, key2
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT 9000 USER 'default' TABLE `test.txt` PASSWORD '' DB currentDatabase()))
+LIFETIME(MIN 1 MAX 3600)
+LAYOUT(COMPLEX_KEY_HASHED());
+
+INSERT INTO `test.txt` VALUES (1, 2, 'Hello');
+
+-- TODO: it does not work without fully qualified name.
+SYSTEM RELOAD DICTIONARY test_01748.test_dict;
+
+SELECT dictGet(test_dict, 'value', (toUInt32(1), toUInt32(2)));
+
+DROP DATABASE test_01748;
diff --git a/tests/queries/0_stateless/01748_partition_id_pruning.reference b/tests/queries/0_stateless/01748_partition_id_pruning.reference
new file mode 100644
index 00000000000..192e33c03c9
--- /dev/null
+++ b/tests/queries/0_stateless/01748_partition_id_pruning.reference
@@ -0,0 +1,7 @@
+1	1
+1	2
+1	3
+1	1
+1	2
+1	3
+3
diff --git a/tests/queries/0_stateless/01748_partition_id_pruning.sql b/tests/queries/0_stateless/01748_partition_id_pruning.sql
new file mode 100644
index 00000000000..0a3f7d2713c
--- /dev/null
+++ b/tests/queries/0_stateless/01748_partition_id_pruning.sql
@@ -0,0 +1,19 @@
+drop table if exists x;
+
+create table x (i int, j int) engine MergeTree partition by i order by j settings index_granularity = 1;
+
+insert into x values (1, 1), (1, 2), (1, 3), (2, 4), (2, 5), (2, 6);
+
+set max_rows_to_read = 3;
+
+select * from x where _partition_id = partitionId(1);
+
+set max_rows_to_read = 4; -- one row for subquery
+
+select * from x where _partition_id in (select partitionId(number + 1) from numbers(1));
+
+-- trivial count optimization test
+set max_rows_to_read = 1; -- one row for subquery
+select count() from x where _partition_id in (select partitionId(number + 1) from numbers(1));
+
+drop table x;
diff --git a/tests/queries/0_stateless/01750_parsing_exception.reference b/tests/queries/0_stateless/01750_parsing_exception.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01750_parsing_exception.sh b/tests/queries/0_stateless/01750_parsing_exception.sh
new file mode 100755
index 00000000000..cd50d769f6d
--- /dev/null
+++ b/tests/queries/0_stateless/01750_parsing_exception.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+# if it will not match, the exit code of grep will be non-zero and the test will fail
+$CLICKHOUSE_CLIENT -q "SELECT toDateTime(format('{}-{}-01 00:00:00', '2021', '1'))" |& grep -F -q 'Cannot parse datetime 2021-1-01 00:00:00: Cannot parse DateTime from String:'
diff --git a/tests/queries/0_stateless/01752_distributed_query_sigsegv.reference b/tests/queries/0_stateless/01752_distributed_query_sigsegv.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01752_distributed_query_sigsegv.sql b/tests/queries/0_stateless/01752_distributed_query_sigsegv.sql
new file mode 100644
index 00000000000..a6936aec913
--- /dev/null
+++ b/tests/queries/0_stateless/01752_distributed_query_sigsegv.sql
@@ -0,0 +1,8 @@
+-- this is enough to trigger the regression
+SELECT throwIf(dummy = 0) FROM remote('127.1', system.one); -- { serverError 395 }
+
+-- these are just in case
+SELECT throwIf(dummy = 0) FROM remote('127.{1,2}', system.one); -- { serverError 395 }
+SELECT throwIf(dummy = 0) FROM remote('127.{1,2}', system.one) SETTINGS prefer_localhost_replica=0; -- { serverError 395 }
+SELECT throwIf(dummy = 0) FROM remote('127.{1,2}', system.one) SETTINGS prefer_localhost_replica=0, distributed_group_by_no_merge=1; -- { serverError 395 }
+SELECT throwIf(dummy = 0) FROM remote('127.{1,2}', system.one) SETTINGS prefer_localhost_replica=0, distributed_group_by_no_merge=2; -- { serverError 395 }
diff --git a/tests/queries/0_stateless/01753_direct_dictionary_simple_key.reference b/tests/queries/0_stateless/01753_direct_dictionary_simple_key.reference
new file mode 100644
index 00000000000..1d3a43b59fb
--- /dev/null
+++ b/tests/queries/0_stateless/01753_direct_dictionary_simple_key.reference
@@ -0,0 +1,66 @@
+Dictionary direct_dictionary_simple_key_simple_attributes
+dictGet existing value
+value_0	value_second_0
+value_1	value_second_1
+value_2	value_second_2
+dictGet with non existing value
+value_0	value_second_0
+value_1	value_second_1
+value_2	value_second_2
+value_first_default	value_second_default
+dictGetOrDefault existing value
+value_0	value_second_0
+value_1	value_second_1
+value_2	value_second_2
+dictGetOrDefault non existing value
+value_0	value_second_0
+value_1	value_second_1
+value_2	value_second_2
+default	default
+dictHas
+1
+1
+1
+0
+select all values as input stream
+0	value_0	value_second_0
+1	value_1	value_second_1
+2	value_2	value_second_2
+Dictionary direct_dictionary_simple_key_complex_attributes
+dictGet existing value
+value_0	value_second_0
+value_1	\N
+value_2	value_second_2
+dictGet with non existing value
+value_0	value_second_0
+value_1	\N
+value_2	value_second_2
+value_first_default	value_second_default
+dictGetOrDefault existing value
+value_0	value_second_0
+value_1	\N
+value_2	value_second_2
+dictGetOrDefault non existing value
+value_0	value_second_0
+value_1	\N
+value_2	value_second_2
+default	default
+dictHas
+1
+1
+1
+0
+select all values as input stream
+0	value_0	value_second_0
+1	value_1	\N
+2	value_2	value_second_2
+Dictionary direct_dictionary_simple_key_hierarchy
+dictGet
+0
+0
+1
+1
+2
+dictGetHierarchy
+[1]
+[4,2,1]
diff --git a/tests/queries/0_stateless/01753_direct_dictionary_simple_key.sql b/tests/queries/0_stateless/01753_direct_dictionary_simple_key.sql
new file mode 100644
index 00000000000..afd91ffdaa5
--- /dev/null
+++ b/tests/queries/0_stateless/01753_direct_dictionary_simple_key.sql
@@ -0,0 +1,120 @@
+DROP DATABASE IF EXISTS 01753_dictionary_db;
+CREATE DATABASE 01753_dictionary_db;
+
+CREATE TABLE 01753_dictionary_db.simple_key_simple_attributes_source_table
+(
+   id UInt64,
+   value_first String,
+   value_second String
+)
+ENGINE = TinyLog;
+
+INSERT INTO 01753_dictionary_db.simple_key_simple_attributes_source_table VALUES(0, 'value_0', 'value_second_0');
+INSERT INTO 01753_dictionary_db.simple_key_simple_attributes_source_table VALUES(1, 'value_1', 'value_second_1');
+INSERT INTO 01753_dictionary_db.simple_key_simple_attributes_source_table VALUES(2, 'value_2', 'value_second_2');
+
+CREATE DICTIONARY 01753_dictionary_db.direct_dictionary_simple_key_simple_attributes
+(
+   id UInt64,
+   value_first String DEFAULT 'value_first_default',
+   value_second String DEFAULT 'value_second_default'
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'simple_key_simple_attributes_source_table'))
+LAYOUT(DIRECT());
+
+SELECT 'Dictionary direct_dictionary_simple_key_simple_attributes';
+SELECT 'dictGet existing value';
+SELECT dictGet('01753_dictionary_db.direct_dictionary_simple_key_simple_attributes', 'value_first', number) as value_first,
+    dictGet('01753_dictionary_db.direct_dictionary_simple_key_simple_attributes', 'value_second', number) as value_second FROM system.numbers LIMIT 3;
+SELECT 'dictGet with non existing value';
+SELECT dictGet('01753_dictionary_db.direct_dictionary_simple_key_simple_attributes', 'value_first', number) as value_first,
+    dictGet('01753_dictionary_db.direct_dictionary_simple_key_simple_attributes', 'value_second', number) as value_second FROM system.numbers LIMIT 4;
+SELECT 'dictGetOrDefault existing value';
+SELECT dictGetOrDefault('01753_dictionary_db.direct_dictionary_simple_key_simple_attributes', 'value_first', number, toString('default')) as value_first,
+    dictGetOrDefault('01753_dictionary_db.direct_dictionary_simple_key_simple_attributes', 'value_second', number, toString('default')) as value_second FROM system.numbers LIMIT 3;
+SELECT 'dictGetOrDefault non existing value';
+SELECT dictGetOrDefault('01753_dictionary_db.direct_dictionary_simple_key_simple_attributes', 'value_first', number, toString('default')) as value_first,
+    dictGetOrDefault('01753_dictionary_db.direct_dictionary_simple_key_simple_attributes', 'value_second', number, toString('default')) as value_second FROM system.numbers LIMIT 4;
+SELECT 'dictHas';
+SELECT dictHas('01753_dictionary_db.direct_dictionary_simple_key_simple_attributes', number) FROM system.numbers LIMIT 4;
+SELECT 'select all values as input stream';
+SELECT * FROM 01753_dictionary_db.direct_dictionary_simple_key_simple_attributes;
+
+DROP DICTIONARY 01753_dictionary_db.direct_dictionary_simple_key_simple_attributes;
+DROP TABLE 01753_dictionary_db.simple_key_simple_attributes_source_table;
+
+CREATE TABLE 01753_dictionary_db.simple_key_complex_attributes_source_table
+(
+   id UInt64,
+   value_first String,
+   value_second Nullable(String)
+)
+ENGINE = TinyLog;
+
+INSERT INTO 01753_dictionary_db.simple_key_complex_attributes_source_table VALUES(0, 'value_0', 'value_second_0');
+INSERT INTO 01753_dictionary_db.simple_key_complex_attributes_source_table VALUES(1, 'value_1', NULL);
+INSERT INTO 01753_dictionary_db.simple_key_complex_attributes_source_table VALUES(2, 'value_2', 'value_second_2');
+
+CREATE DICTIONARY 01753_dictionary_db.direct_dictionary_simple_key_complex_attributes
+(
+   id UInt64,
+   value_first String DEFAULT 'value_first_default',
+   value_second Nullable(String) DEFAULT 'value_second_default'
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'simple_key_complex_attributes_source_table'))
+LAYOUT(DIRECT());
+
+SELECT 'Dictionary direct_dictionary_simple_key_complex_attributes';
+SELECT 'dictGet existing value';
+SELECT dictGet('01753_dictionary_db.direct_dictionary_simple_key_complex_attributes', 'value_first', number) as value_first,
+    dictGet('01753_dictionary_db.direct_dictionary_simple_key_complex_attributes', 'value_second', number) as value_second FROM system.numbers LIMIT 3;
+SELECT 'dictGet with non existing value';
+SELECT dictGet('01753_dictionary_db.direct_dictionary_simple_key_complex_attributes', 'value_first', number) as value_first,
+    dictGet('01753_dictionary_db.direct_dictionary_simple_key_complex_attributes', 'value_second', number) as value_second FROM system.numbers LIMIT 4;
+SELECT 'dictGetOrDefault existing value';
+SELECT dictGetOrDefault('01753_dictionary_db.direct_dictionary_simple_key_complex_attributes', 'value_first', number, toString('default')) as value_first,
+    dictGetOrDefault('01753_dictionary_db.direct_dictionary_simple_key_complex_attributes', 'value_second', number, toString('default')) as value_second FROM system.numbers LIMIT 3;
+SELECT 'dictGetOrDefault non existing value';
+SELECT dictGetOrDefault('01753_dictionary_db.direct_dictionary_simple_key_complex_attributes', 'value_first', number, toString('default')) as value_first,
+    dictGetOrDefault('01753_dictionary_db.direct_dictionary_simple_key_complex_attributes', 'value_second', number, toString('default')) as value_second FROM system.numbers LIMIT 4;
+SELECT 'dictHas';
+SELECT dictHas('01753_dictionary_db.direct_dictionary_simple_key_complex_attributes', number) FROM system.numbers LIMIT 4;
+SELECT 'select all values as input stream';
+SELECT * FROM 01753_dictionary_db.direct_dictionary_simple_key_complex_attributes;
+
+DROP DICTIONARY 01753_dictionary_db.direct_dictionary_simple_key_complex_attributes;
+DROP TABLE 01753_dictionary_db.simple_key_complex_attributes_source_table;
+
+CREATE TABLE 01753_dictionary_db.simple_key_hierarchy_table
+(
+    id UInt64,
+    parent_id UInt64
+) ENGINE = TinyLog();
+
+INSERT INTO 01753_dictionary_db.simple_key_hierarchy_table VALUES (1, 0);
+INSERT INTO 01753_dictionary_db.simple_key_hierarchy_table VALUES (2, 1);
+INSERT INTO 01753_dictionary_db.simple_key_hierarchy_table VALUES (3, 1);
+INSERT INTO 01753_dictionary_db.simple_key_hierarchy_table VALUES (4, 2);
+
+CREATE DICTIONARY 01753_dictionary_db.direct_dictionary_simple_key_hierarchy
+(
+   id UInt64,
+   parent_id UInt64 HIERARCHICAL
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'simple_key_hierarchy_table'))
+LAYOUT(DIRECT());
+
+SELECT 'Dictionary direct_dictionary_simple_key_hierarchy';
+SELECT 'dictGet';
+SELECT dictGet('01753_dictionary_db.direct_dictionary_simple_key_hierarchy', 'parent_id', number) FROM system.numbers LIMIT 5;
+SELECT 'dictGetHierarchy';
+SELECT dictGetHierarchy('01753_dictionary_db.direct_dictionary_simple_key_hierarchy', toUInt64(1));
+SELECT dictGetHierarchy('01753_dictionary_db.direct_dictionary_simple_key_hierarchy', toUInt64(4));
+
+DROP DICTIONARY 01753_dictionary_db.direct_dictionary_simple_key_hierarchy;
+DROP TABLE 01753_dictionary_db.simple_key_hierarchy_table;
+
+DROP DATABASE 01753_dictionary_db;
diff --git a/tests/queries/0_stateless/01753_fix_clickhouse_format.reference b/tests/queries/0_stateless/01753_fix_clickhouse_format.reference
new file mode 100644
index 00000000000..0aad4d64c55
--- /dev/null
+++ b/tests/queries/0_stateless/01753_fix_clickhouse_format.reference
@@ -0,0 +1,25 @@
+SELECT 1
+;
+
+SELECT 1
+UNION ALL
+(
+    SELECT 1
+    UNION DISTINCT
+    SELECT 1
+)
+;
+
+SELECT 1
+;
+
+SELECT 1
+UNION ALL
+(
+    SELECT 1
+    UNION DISTINCT
+    SELECT 1
+)
+;
+
+OK
diff --git a/tests/queries/0_stateless/01753_fix_clickhouse_format.sh b/tests/queries/0_stateless/01753_fix_clickhouse_format.sh
new file mode 100755
index 00000000000..5cdd53b2166
--- /dev/null
+++ b/tests/queries/0_stateless/01753_fix_clickhouse_format.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+echo "select 1; select 1 union all (select 1 union distinct select 1);   " | $CLICKHOUSE_FORMAT -n;
+
+echo "select 1; select 1 union all (select 1 union distinct select 1); -- comment  " | $CLICKHOUSE_FORMAT -n;
+
+echo "insert into t values (1); " | $CLICKHOUSE_FORMAT -n  2>&1 \ | grep -F -q "Code: 578" && echo 'OK' || echo 'FAIL'
diff --git a/tests/queries/0_stateless/01753_max_uri_size.reference b/tests/queries/0_stateless/01753_max_uri_size.reference
new file mode 100644
index 00000000000..d00491fd7e5
--- /dev/null
+++ b/tests/queries/0_stateless/01753_max_uri_size.reference
@@ -0,0 +1 @@
+1
diff --git a/tests/queries/0_stateless/01753_max_uri_size.sh b/tests/queries/0_stateless/01753_max_uri_size.sh
new file mode 100755
index 00000000000..62bc4f2c26f
--- /dev/null
+++ b/tests/queries/0_stateless/01753_max_uri_size.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+# NOTE: since 'max_uri_size' doesn't affect the request itself, this test hardly depends on the default value of this setting (1 MiB).
+
+python3 -c "
+print('${CLICKHOUSE_URL}', end='')
+print('&hello=world'*100000, end='')
+print('&query=SELECT+1')
+" > "${CLICKHOUSE_TMP}/url.txt"
+
+wget --input-file "${CLICKHOUSE_TMP}/url.txt" 2>&1 | grep -Fc "400: Bad Request"
+
+rm "${CLICKHOUSE_TMP}/url.txt"
diff --git a/tests/queries/0_stateless/01753_mutate_table_predicated_with_table.reference b/tests/queries/0_stateless/01753_mutate_table_predicated_with_table.reference
new file mode 100644
index 00000000000..d00491fd7e5
--- /dev/null
+++ b/tests/queries/0_stateless/01753_mutate_table_predicated_with_table.reference
@@ -0,0 +1 @@
+1
diff --git a/tests/queries/0_stateless/01753_mutate_table_predicated_with_table.sql b/tests/queries/0_stateless/01753_mutate_table_predicated_with_table.sql
new file mode 100644
index 00000000000..efb444eb4b1
--- /dev/null
+++ b/tests/queries/0_stateless/01753_mutate_table_predicated_with_table.sql
@@ -0,0 +1,12 @@
+DROP TABLE IF EXISTS mmm;
+
+CREATE TABLE mmm ENGINE=MergeTree ORDER BY number
+AS SELECT number, rand() % 10 AS a FROM numbers(1000);
+
+ALTER TABLE mmm DELETE WHERE a IN (SELECT a FROM mmm) SETTINGS mutations_sync=1;
+
+SELECT is_done FROM system.mutations WHERE table = 'mmm' and database=currentDatabase();
+
+SELECT * FROM mmm;
+
+DROP TABLE IF EXISTS mmm;
diff --git a/tests/queries/0_stateless/01753_optimize_aggregation_in_order.reference b/tests/queries/0_stateless/01753_optimize_aggregation_in_order.reference
new file mode 100644
index 00000000000..0cfbf08886f
--- /dev/null
+++ b/tests/queries/0_stateless/01753_optimize_aggregation_in_order.reference
@@ -0,0 +1 @@
+2
diff --git a/tests/queries/0_stateless/01753_optimize_aggregation_in_order.sh b/tests/queries/0_stateless/01753_optimize_aggregation_in_order.sh
new file mode 100755
index 00000000000..2a7345f4865
--- /dev/null
+++ b/tests/queries/0_stateless/01753_optimize_aggregation_in_order.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL=trace
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+$CLICKHOUSE_CLIENT --optimize_aggregation_in_order=1 -nm -q "
+drop table if exists data_01753;
+create table data_01753 (key Int) engine=MergeTree() order by key as select * from numbers(8);
+select * from data_01753 group by key settings max_block_size=1;
+select * from data_01753 group by key settings max_block_size=1;
+drop table data_01753;
+" |& grep -F -c 'AggregatingInOrderTransform: Aggregated. 8 to 8 rows'
diff --git a/tests/queries/0_stateless/01753_system_zookeeper_query_param_path_long.reference b/tests/queries/0_stateless/01753_system_zookeeper_query_param_path_long.reference
new file mode 100644
index 00000000000..9daeafb9864
--- /dev/null
+++ b/tests/queries/0_stateless/01753_system_zookeeper_query_param_path_long.reference
@@ -0,0 +1 @@
+test
diff --git a/tests/queries/0_stateless/01753_system_zookeeper_query_param_path_long.sh b/tests/queries/0_stateless/01753_system_zookeeper_query_param_path_long.sh
new file mode 100755
index 00000000000..d3046e73b93
--- /dev/null
+++ b/tests/queries/0_stateless/01753_system_zookeeper_query_param_path_long.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+
+${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS test_01753";
+${CLICKHOUSE_CLIENT} --query="CREATE TABLE test_01753 (n Int8) ENGINE=ReplicatedMergeTree('/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/test_01753/test', '1') ORDER BY n"
+
+${CLICKHOUSE_CLIENT} --query="SELECT name FROM system.zookeeper WHERE path = {path:String}" --param_path "$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/test_01753"
+
+
+${CLICKHOUSE_CLIENT} --query="DROP TABLE test_01753 SYNC";
diff --git a/tests/queries/0_stateless/01754_clickhouse_format_backslash.reference b/tests/queries/0_stateless/01754_clickhouse_format_backslash.reference
new file mode 100644
index 00000000000..328483d9867
--- /dev/null
+++ b/tests/queries/0_stateless/01754_clickhouse_format_backslash.reference
@@ -0,0 +1,16 @@
+SELECT * \
+FROM  \
+( \
+    SELECT 1 AS x \
+    UNION ALL \
+    SELECT 1 \
+    UNION DISTINCT \
+    SELECT 3 \
+)
+SELECT 1 \
+UNION ALL \
+( \
+    SELECT 1 \
+    UNION DISTINCT \
+    SELECT 1 \
+)
diff --git a/tests/queries/0_stateless/01754_clickhouse_format_backslash.sh b/tests/queries/0_stateless/01754_clickhouse_format_backslash.sh
new file mode 100755
index 00000000000..6a76dc9c5c8
--- /dev/null
+++ b/tests/queries/0_stateless/01754_clickhouse_format_backslash.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+echo "select * from (select 1 as x union all select 1 union distinct select 3)" | $CLICKHOUSE_FORMAT --backslash;
+
+echo "select 1 union all (select 1 union distinct select 1)" | $CLICKHOUSE_FORMAT --backslash;
diff --git a/tests/queries/0_stateless/01754_cluster_all_replicas_shard_num.reference b/tests/queries/0_stateless/01754_cluster_all_replicas_shard_num.reference
new file mode 100644
index 00000000000..d308efd8662
--- /dev/null
+++ b/tests/queries/0_stateless/01754_cluster_all_replicas_shard_num.reference
@@ -0,0 +1,9 @@
+1
+1
+1
+2
+1
+2
+1
+1
+2
diff --git a/tests/queries/0_stateless/01754_cluster_all_replicas_shard_num.sql b/tests/queries/0_stateless/01754_cluster_all_replicas_shard_num.sql
new file mode 100644
index 00000000000..833f86c538d
--- /dev/null
+++ b/tests/queries/0_stateless/01754_cluster_all_replicas_shard_num.sql
@@ -0,0 +1,8 @@
+SELECT _shard_num FROM cluster('test_shard_localhost', system.one);
+SELECT _shard_num FROM clusterAllReplicas('test_shard_localhost', system.one);
+
+SELECT _shard_num FROM cluster('test_cluster_two_shards', system.one) ORDER BY _shard_num;
+SELECT _shard_num FROM clusterAllReplicas('test_cluster_two_shards', system.one) ORDER BY _shard_num;
+
+SELECT _shard_num FROM cluster('test_cluster_one_shard_two_replicas', system.one) ORDER BY _shard_num;
+SELECT _shard_num FROM clusterAllReplicas('test_cluster_one_shard_two_replicas', system.one) ORDER BY _shard_num;
diff --git a/tests/queries/0_stateless/01754_direct_dictionary_complex_key.reference b/tests/queries/0_stateless/01754_direct_dictionary_complex_key.reference
new file mode 100644
index 00000000000..603785e984c
--- /dev/null
+++ b/tests/queries/0_stateless/01754_direct_dictionary_complex_key.reference
@@ -0,0 +1,56 @@
+Dictionary direct_dictionary_complex_key_simple_attributes
+dictGet existing value
+value_0	value_second_0
+value_1	value_second_1
+value_2	value_second_2
+dictGet with non existing value
+value_0	value_second_0
+value_1	value_second_1
+value_2	value_second_2
+value_first_default	value_second_default
+dictGetOrDefault existing value
+value_0	value_second_0
+value_1	value_second_1
+value_2	value_second_2
+dictGetOrDefault non existing value
+value_0	value_second_0
+value_1	value_second_1
+value_2	value_second_2
+default	default
+dictHas
+1
+1
+1
+0
+select all values as input stream
+0	id_key_0	value_0	value_second_0
+1	id_key_1	value_1	value_second_1
+2	id_key_2	value_2	value_second_2
+Dictionary direct_dictionary_complex_key_complex_attributes
+dictGet existing value
+value_0	value_second_0
+value_1	\N
+value_2	value_second_2
+dictGet with non existing value
+value_0	value_second_0
+value_1	\N
+value_2	value_second_2
+value_first_default	value_second_default
+dictGetOrDefault existing value
+value_0	value_second_0
+value_1	\N
+value_2	value_second_2
+dictGetOrDefault non existing value
+value_0	value_second_0
+value_1	\N
+value_2	value_second_2
+default	default
+dictHas
+1
+1
+1
+0
+select all values as input stream
+0	id_key_0	value_0	value_second_0
+1	id_key_1	value_1	\N
+2	id_key_2	value_2	value_second_2
diff --git a/tests/queries/0_stateless/01754_direct_dictionary_complex_key.sql b/tests/queries/0_stateless/01754_direct_dictionary_complex_key.sql
new file mode 100644
index 00000000000..51b29457011
--- /dev/null
+++ b/tests/queries/0_stateless/01754_direct_dictionary_complex_key.sql
@@ -0,0 +1,95 @@
+DROP DATABASE IF EXISTS 01754_dictionary_db;
+CREATE DATABASE 01754_dictionary_db;
+
+CREATE TABLE 01754_dictionary_db.complex_key_simple_attributes_source_table
+(
+   id UInt64,
+   id_key String,
+   value_first String,
+   value_second String
+)
+ENGINE = TinyLog;
+
+INSERT INTO 01754_dictionary_db.complex_key_simple_attributes_source_table VALUES(0, 'id_key_0', 'value_0', 'value_second_0');
+INSERT INTO 01754_dictionary_db.complex_key_simple_attributes_source_table VALUES(1, 'id_key_1', 'value_1', 'value_second_1');
+INSERT INTO 01754_dictionary_db.complex_key_simple_attributes_source_table VALUES(2, 'id_key_2', 'value_2', 'value_second_2');
+
+CREATE DICTIONARY 01754_dictionary_db.direct_dictionary_complex_key_simple_attributes
+(
+   id UInt64,
+   id_key String DEFAULT 'test_default_id_key',
+   value_first String DEFAULT 'value_first_default',
+   value_second String DEFAULT 'value_second_default'
+)
+PRIMARY KEY id, id_key
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'complex_key_simple_attributes_source_table'))
+LAYOUT(COMPLEX_KEY_DIRECT());
+
+SELECT 'Dictionary direct_dictionary_complex_key_simple_attributes';
+SELECT 'dictGet existing value';
+SELECT dictGet('01754_dictionary_db.direct_dictionary_complex_key_simple_attributes', 'value_first', (number, concat('id_key_', toString(number)))) as value_first,
+    dictGet('01754_dictionary_db.direct_dictionary_complex_key_simple_attributes', 'value_second', (number, concat('id_key_', toString(number)))) as value_second FROM system.numbers LIMIT 3;
+SELECT 'dictGet with non existing value';
+SELECT dictGet('01754_dictionary_db.direct_dictionary_complex_key_simple_attributes', 'value_first', (number, concat('id_key_', toString(number)))) as value_first,
+    dictGet('01754_dictionary_db.direct_dictionary_complex_key_simple_attributes', 'value_second', (number, concat('id_key_', toString(number)))) as value_second FROM system.numbers LIMIT 4;
+SELECT 'dictGetOrDefault existing value';
+SELECT dictGetOrDefault('01754_dictionary_db.direct_dictionary_complex_key_simple_attributes', 'value_first', (number, concat('id_key_', toString(number))), toString('default')) as value_first,
+    dictGetOrDefault('01754_dictionary_db.direct_dictionary_complex_key_simple_attributes', 'value_second', (number, concat('id_key_', toString(number))), toString('default')) as value_second FROM system.numbers LIMIT 3;
+SELECT 'dictGetOrDefault non existing value';
+SELECT dictGetOrDefault('01754_dictionary_db.direct_dictionary_complex_key_simple_attributes', 'value_first', (number, concat('id_key_', toString(number))), toString('default')) as value_first,
+    dictGetOrDefault('01754_dictionary_db.direct_dictionary_complex_key_simple_attributes', 'value_second', (number, concat('id_key_', toString(number))), toString('default')) as value_second FROM system.numbers LIMIT 4;
+SELECT 'dictHas';
+SELECT dictHas('01754_dictionary_db.direct_dictionary_complex_key_simple_attributes', (number, concat('id_key_', toString(number)))) FROM system.numbers LIMIT 4;
+SELECT 'select all values as input stream';
+SELECT * FROM 01754_dictionary_db.direct_dictionary_complex_key_simple_attributes;
+
+DROP DICTIONARY 01754_dictionary_db.direct_dictionary_complex_key_simple_attributes;
+DROP TABLE 01754_dictionary_db.complex_key_simple_attributes_source_table;
+
+CREATE TABLE 01754_dictionary_db.complex_key_complex_attributes_source_table
+(
+   id UInt64,
+   id_key String,
+   value_first String,
+   value_second Nullable(String)
+)
+ENGINE = TinyLog;
+
+INSERT INTO 01754_dictionary_db.complex_key_complex_attributes_source_table VALUES(0, 'id_key_0', 'value_0', 'value_second_0');
+INSERT INTO 01754_dictionary_db.complex_key_complex_attributes_source_table VALUES(1, 'id_key_1', 'value_1', NULL);
+INSERT INTO 01754_dictionary_db.complex_key_complex_attributes_source_table VALUES(2, 'id_key_2', 'value_2', 'value_second_2');
+
+CREATE DICTIONARY 01754_dictionary_db.direct_dictionary_complex_key_complex_attributes
+(
+    id UInt64,
+    id_key String,
+
+    value_first String DEFAULT 'value_first_default',
+    value_second Nullable(String) DEFAULT 'value_second_default'
+)
+PRIMARY KEY id, id_key
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'complex_key_complex_attributes_source_table'))
+LAYOUT(COMPLEX_KEY_DIRECT());
+
+SELECT 'Dictionary direct_dictionary_complex_key_complex_attributes';
+SELECT 'dictGet existing value';
+SELECT dictGet('01754_dictionary_db.direct_dictionary_complex_key_complex_attributes', 'value_first', (number, concat('id_key_', toString(number)))) as value_first,
+    dictGet('01754_dictionary_db.direct_dictionary_complex_key_complex_attributes', 'value_second', (number, concat('id_key_', toString(number)))) as value_second FROM system.numbers LIMIT 3;
+SELECT 'dictGet with non existing value';
+SELECT dictGet('01754_dictionary_db.direct_dictionary_complex_key_complex_attributes', 'value_first', (number, concat('id_key_', toString(number)))) as value_first,
+    dictGet('01754_dictionary_db.direct_dictionary_complex_key_complex_attributes', 'value_second', (number, concat('id_key_', toString(number)))) as value_second FROM system.numbers LIMIT 4;
+SELECT 'dictGetOrDefault existing value';
+SELECT dictGetOrDefault('01754_dictionary_db.direct_dictionary_complex_key_complex_attributes', 'value_first', (number, concat('id_key_', toString(number))), toString('default')) as value_first,
+    dictGetOrDefault('01754_dictionary_db.direct_dictionary_complex_key_complex_attributes', 'value_second', (number, concat('id_key_', toString(number))), toString('default')) as value_second FROM system.numbers LIMIT 3;
+SELECT 'dictGetOrDefault non existing value';
+SELECT dictGetOrDefault('01754_dictionary_db.direct_dictionary_complex_key_complex_attributes', 'value_first', (number, concat('id_key_', toString(number))), toString('default')) as value_first,
+    dictGetOrDefault('01754_dictionary_db.direct_dictionary_complex_key_complex_attributes', 'value_second', (number, concat('id_key_', toString(number))), toString('default')) as value_second FROM system.numbers LIMIT 4;
+SELECT 'dictHas';
+SELECT dictHas('01754_dictionary_db.direct_dictionary_complex_key_complex_attributes', (number, concat('id_key_', toString(number)))) FROM system.numbers LIMIT 4;
+SELECT 'select all values as input stream';
+SELECT * FROM 01754_dictionary_db.direct_dictionary_complex_key_complex_attributes;
+
+DROP DICTIONARY 01754_dictionary_db.direct_dictionary_complex_key_complex_attributes;
+DROP TABLE 01754_dictionary_db.complex_key_complex_attributes_source_table;
+
+DROP DATABASE 01754_dictionary_db;
diff --git a/tests/queries/0_stateless/01755_client_highlight_multi_line_comment_regression.expect b/tests/queries/0_stateless/01755_client_highlight_multi_line_comment_regression.expect
new file mode 100755
index 00000000000..65b9bde235b
--- /dev/null
+++ b/tests/queries/0_stateless/01755_client_highlight_multi_line_comment_regression.expect
@@ -0,0 +1,25 @@
+#!/usr/bin/expect -f
+
+log_user 0
+set timeout 5
+match_max 100000
+# A default timeout action is to do nothing, change it to fail
+expect_after {
+    timeout {
+        exit 2
+    }
+}
+
+set basedir [file dirname $argv0]
+spawn bash -c "source $basedir/../shell_config.sh ; \$CLICKHOUSE_CLIENT_BINARY \$CLICKHOUSE_CLIENT_OPT"
+expect ":) "
+
+# regression for heap-buffer-overflow issue (under ASAN)
+send -- "/**"
+expect "/**"
+# just in case few more bytes
+send -- "foobar"
+expect "/**foobar"
+
+send -- "\3\4"
+expect eof
diff --git a/tests/queries/0_stateless/01755_client_highlight_multi_line_comment_regression.reference b/tests/queries/0_stateless/01755_client_highlight_multi_line_comment_regression.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01755_shard_pruning_with_literal.reference b/tests/queries/0_stateless/01755_shard_pruning_with_literal.reference
new file mode 100644
index 00000000000..6ed281c757a
--- /dev/null
+++ b/tests/queries/0_stateless/01755_shard_pruning_with_literal.reference
@@ -0,0 +1,2 @@
+1
+1
diff --git a/tests/queries/0_stateless/01755_shard_pruning_with_literal.sql b/tests/queries/0_stateless/01755_shard_pruning_with_literal.sql
new file mode 100644
index 00000000000..0e93d76573c
--- /dev/null
+++ b/tests/queries/0_stateless/01755_shard_pruning_with_literal.sql
@@ -0,0 +1,14 @@
+set optimize_skip_unused_shards=1;
+
+drop table if exists data_01755;
+drop table if exists dist_01755;
+
+create table data_01755 (i Int) Engine=Memory;
+create table dist_01755 as data_01755 Engine=Distributed(test_cluster_two_shards, currentDatabase(), data_01755, i);
+
+insert into data_01755 values (1);
+
+select * from dist_01755 where 1 settings enable_early_constant_folding = 0;
+
+drop table if exists data_01755;
+drop table if exists dist_01755;
diff --git a/tests/queries/0_stateless/01756_optimize_skip_unused_shards_rewrite_in.reference b/tests/queries/0_stateless/01756_optimize_skip_unused_shards_rewrite_in.reference
new file mode 100644
index 00000000000..a1bfcf043da
--- /dev/null
+++ b/tests/queries/0_stateless/01756_optimize_skip_unused_shards_rewrite_in.reference
@@ -0,0 +1,25 @@
+(0, 2)
+0	0
+0	0
+WITH CAST(\'default\', \'String\') AS id_no SELECT one.dummy, ignore(id_no) FROM system.one WHERE dummy IN (0, 2)
+WITH CAST(\'default\', \'String\') AS id_no SELECT one.dummy, ignore(id_no) FROM system.one WHERE dummy IN (0, 2)
+optimize_skip_unused_shards_rewrite_in(0, 2)
+0	0
+WITH CAST(\'default\', \'String\') AS id_02 SELECT one.dummy, ignore(id_02) FROM system.one WHERE dummy IN tuple(0)
+WITH CAST(\'default\', \'String\') AS id_02 SELECT one.dummy, ignore(id_02) FROM system.one WHERE dummy IN tuple(2)
+optimize_skip_unused_shards_rewrite_in(2,)
+WITH CAST(\'default\', \'String\') AS id_2 SELECT one.dummy, ignore(id_2) FROM system.one WHERE dummy IN tuple(2)
+optimize_skip_unused_shards_rewrite_in(0,)
+0	0
+WITH CAST(\'default\', \'String\') AS id_0 SELECT one.dummy, ignore(id_0) FROM system.one WHERE dummy IN tuple(0)
+errors
+others
+0
+0
+0
+different types -- prohibited
+different types -- conversion
+0
+optimize_skip_unused_shards_limit
+0
+0
diff --git a/tests/queries/0_stateless/01756_optimize_skip_unused_shards_rewrite_in.sql b/tests/queries/0_stateless/01756_optimize_skip_unused_shards_rewrite_in.sql
new file mode 100644
index 00000000000..dc481ccca72
--- /dev/null
+++ b/tests/queries/0_stateless/01756_optimize_skip_unused_shards_rewrite_in.sql
@@ -0,0 +1,138 @@
+-- NOTE: this test cannot use 'current_database = currentDatabase()',
+-- because it does not propagated via remote queries,
+-- hence it uses 'with (select currentDatabase()) as X'
+-- (with subquery to expand it on the initiator).
+
+drop table if exists dist_01756;
+drop table if exists dist_01756_str;
+drop table if exists dist_01756_column;
+drop table if exists data_01756_str;
+
+-- SELECT
+--     intHash64(0) % 2,
+--     intHash64(2) % 2
+-- ┌─modulo(intHash64(0), 2)─┬─modulo(intHash64(2), 2)─┐
+-- │                       0 │                       1 │
+-- └─────────────────────────┴─────────────────────────┘
+create table dist_01756 as system.one engine=Distributed(test_cluster_two_shards, system, one, intHash64(dummy));
+
+-- separate log entry for localhost queries
+set prefer_localhost_replica=0;
+set force_optimize_skip_unused_shards=2;
+set optimize_skip_unused_shards=1;
+set optimize_skip_unused_shards_rewrite_in=0;
+set log_queries=1;
+
+--
+-- w/o optimize_skip_unused_shards_rewrite_in=1
+--
+select '(0, 2)';
+with (select currentDatabase()) as id_no select *, ignore(id_no) from dist_01756 where dummy in (0, 2);
+system flush logs;
+select query from system.query_log where
+    event_date = today() and
+    event_time > now() - interval 1 hour and
+    not is_initial_query and
+    query not like '%system.query_log%' and
+    query like concat('WITH%', currentDatabase(), '%AS id_no %') and
+    type = 'QueryFinish'
+order by query;
+
+--
+-- w/ optimize_skip_unused_shards_rewrite_in=1
+--
+
+set optimize_skip_unused_shards_rewrite_in=1;
+
+-- detailed coverage for realistic examples
+select 'optimize_skip_unused_shards_rewrite_in(0, 2)';
+with (select currentDatabase()) as id_02 select *, ignore(id_02) from dist_01756 where dummy in (0, 2);
+system flush logs;
+select query from system.query_log where
+    event_date = today() and
+    event_time > now() - interval 1 hour and
+    not is_initial_query and
+    query not like '%system.query_log%' and
+    query like concat('WITH%', currentDatabase(), '%AS id_02 %') and
+    type = 'QueryFinish'
+order by query;
+
+select 'optimize_skip_unused_shards_rewrite_in(2,)';
+with (select currentDatabase()) as id_2 select *, ignore(id_2) from dist_01756 where dummy in (2,);
+system flush logs;
+select query from system.query_log where
+    event_date = today() and
+    event_time > now() - interval 1 hour and
+    not is_initial_query and
+    query not like '%system.query_log%' and
+    query like concat('WITH%', currentDatabase(), '%AS id_2 %') and
+    type = 'QueryFinish'
+order by query;
+
+select 'optimize_skip_unused_shards_rewrite_in(0,)';
+with (select currentDatabase()) as id_0 select *, ignore(id_0) from dist_01756 where dummy in (0,);
+system flush logs;
+select query from system.query_log where
+    event_date = today() and
+    event_time > now() - interval 1 hour and
+    not is_initial_query and
+    query not like '%system.query_log%' and
+    query like concat('WITH%', currentDatabase(), '%AS id_0 %') and
+    type = 'QueryFinish'
+order by query;
+
+--
+-- errors
+--
+select 'errors';
+
+-- not tuple
+select * from dist_01756 where dummy in (0); -- { serverError 507 }
+-- optimize_skip_unused_shards does not support non-constants
+select * from dist_01756 where dummy in (select * from system.one); -- { serverError 507 }
+select * from dist_01756 where dummy in (toUInt8(0)); -- { serverError 507 }
+-- wrong type (tuple)
+select * from dist_01756 where dummy in ('0'); -- { serverError 507 }
+-- intHash64 does not accept string
+select * from dist_01756 where dummy in ('0', '2'); -- { serverError 43 }
+-- NOT IN does not supported
+select * from dist_01756 where dummy not in (0, 2); -- { serverError 507 }
+
+--
+-- others
+--
+select 'others';
+
+select * from dist_01756 where dummy not in (2, 3) and dummy in (0, 2);
+select * from dist_01756 where dummy in tuple(0, 2);
+select * from dist_01756 where dummy in tuple(0);
+select * from dist_01756 where dummy in tuple(2);
+-- Identifier is NULL
+select (2 IN (2,)), * from dist_01756 where dummy in (0, 2) format Null;
+-- Literal is NULL
+select (dummy IN (toUInt8(2),)), * from dist_01756 where dummy in (0, 2) format Null;
+
+-- different type
+select 'different types -- prohibited';
+create table data_01756_str (key String) engine=Memory();
+create table dist_01756_str as data_01756_str engine=Distributed(test_cluster_two_shards, currentDatabase(), data_01756_str, cityHash64(key));
+select * from dist_01756_str where key in ('0', '2');
+select * from dist_01756_str where key in ('0', Null); -- { serverError 507 }
+select * from dist_01756_str where key in (0, 2); -- { serverError 53 }
+select * from dist_01756_str where key in (0, Null); -- { serverError 53 }
+
+-- different type #2
+select 'different types -- conversion';
+create table dist_01756_column as system.one engine=Distributed(test_cluster_two_shards, system, one, dummy);
+select * from dist_01756_column where dummy in (0, '255');
+select * from dist_01756_column where dummy in (0, '255foo'); -- { serverError 53 }
+
+-- optimize_skip_unused_shards_limit
+select 'optimize_skip_unused_shards_limit';
+select * from dist_01756 where dummy in (0, 2) settings optimize_skip_unused_shards_limit=1; -- { serverError 507 }
+select * from dist_01756 where dummy in (0, 2) settings optimize_skip_unused_shards_limit=1, force_optimize_skip_unused_shards=0;
+
+drop table dist_01756;
+drop table dist_01756_str;
+drop table dist_01756_column;
+drop table data_01756_str;
diff --git a/tests/queries/0_stateless/01757_optimize_skip_unused_shards_limit.reference b/tests/queries/0_stateless/01757_optimize_skip_unused_shards_limit.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01757_optimize_skip_unused_shards_limit.sql b/tests/queries/0_stateless/01757_optimize_skip_unused_shards_limit.sql
new file mode 100644
index 00000000000..68247dbfbe5
--- /dev/null
+++ b/tests/queries/0_stateless/01757_optimize_skip_unused_shards_limit.sql
@@ -0,0 +1,33 @@
+drop table if exists dist_01757;
+create table dist_01757 as system.one engine=Distributed(test_cluster_two_shards, system, one, dummy);
+
+set optimize_skip_unused_shards=1;
+set force_optimize_skip_unused_shards=2;
+
+-- in
+select * from dist_01757 where dummy in (0,) format Null;
+select * from dist_01757 where dummy in (0, 1) format Null settings optimize_skip_unused_shards_limit=2;
+
+-- in negative
+select * from dist_01757 where dummy in (0, 1) settings optimize_skip_unused_shards_limit=1; -- { serverError 507 }
+
+-- or negative
+select * from dist_01757 where dummy = 0 or dummy = 1 settings optimize_skip_unused_shards_limit=1; -- { serverError 507 }
+
+-- or
+select * from dist_01757 where dummy = 0 or dummy = 1 format Null settings optimize_skip_unused_shards_limit=2;
+
+-- and negative
+select * from dist_01757 where dummy = 0 and dummy = 1 settings optimize_skip_unused_shards_limit=1; -- { serverError 507 }
+select * from dist_01757 where dummy = 0 and dummy = 2 and dummy = 3 settings optimize_skip_unused_shards_limit=1; -- { serverError 507 }
+select * from dist_01757 where dummy = 0 and dummy = 2 and dummy = 3 settings optimize_skip_unused_shards_limit=2; -- { serverError 507 }
+
+-- and
+select * from dist_01757 where dummy = 0 and dummy = 1 settings optimize_skip_unused_shards_limit=2;
+select * from dist_01757 where dummy = 0 and dummy = 1 and dummy = 3 settings optimize_skip_unused_shards_limit=3;
+
+-- ARGUMENT_OUT_OF_BOUND error
+select * from dist_01757 where dummy in (0, 1) settings optimize_skip_unused_shards_limit=0; -- { serverError 69 }
+select * from dist_01757 where dummy in (0, 1) settings optimize_skip_unused_shards_limit=9223372036854775808; -- { serverError 69 }
+
+drop table dist_01757;
diff --git a/tests/queries/0_stateless/01758_optimize_skip_unused_shards_once.reference b/tests/queries/0_stateless/01758_optimize_skip_unused_shards_once.reference
new file mode 100644
index 00000000000..d23ada2e8d4
--- /dev/null
+++ b/tests/queries/0_stateless/01758_optimize_skip_unused_shards_once.reference
@@ -0,0 +1,2 @@
+StorageDistributed (dist_01758): Auto-increment is 0
+StorageDistributed (dist_01758): Skipping irrelevant shards - the query will be sent to the following shards of the cluster (shard numbers): [1]
diff --git a/tests/queries/0_stateless/01758_optimize_skip_unused_shards_once.sh b/tests/queries/0_stateless/01758_optimize_skip_unused_shards_once.sh
new file mode 100755
index 00000000000..d18ea8694a9
--- /dev/null
+++ b/tests/queries/0_stateless/01758_optimize_skip_unused_shards_once.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL=trace
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+$CLICKHOUSE_CLIENT --optimize_skip_unused_shards=1 -nm -q "
+create table dist_01758 as system.one engine=Distributed(test_cluster_two_shards, system, one, dummy);
+select * from dist_01758 where dummy = 0 format Null;
+" |& grep -o "StorageDistributed (dist_01758).*"
+
+$CLICKHOUSE_CLIENT -q "drop table dist_01758" 2>/dev/null
diff --git a/tests/queries/0_stateless/01759_dictionary_unique_attribute_names.reference b/tests/queries/0_stateless/01759_dictionary_unique_attribute_names.reference
new file mode 100644
index 00000000000..bb08bbbe0b5
--- /dev/null
+++ b/tests/queries/0_stateless/01759_dictionary_unique_attribute_names.reference
@@ -0,0 +1,3 @@
+0	2	3
+1	5	6
+2	8	9
diff --git a/tests/queries/0_stateless/01759_dictionary_unique_attribute_names.sql b/tests/queries/0_stateless/01759_dictionary_unique_attribute_names.sql
new file mode 100644
index 00000000000..11a52976716
--- /dev/null
+++ b/tests/queries/0_stateless/01759_dictionary_unique_attribute_names.sql
@@ -0,0 +1,32 @@
+DROP DATABASE IF EXISTS 01759_db;
+CREATE DATABASE 01759_db;
+
+DROP TABLE IF EXISTS 01759_db.dictionary_source_table;
+CREATE TABLE 01759_db.dictionary_source_table
+(
+   key UInt64,
+   value1 UInt64,
+   value2 UInt64
+)
+ENGINE = TinyLog;
+
+INSERT INTO 01759_db.dictionary_source_table VALUES (0, 2, 3), (1, 5, 6), (2, 8, 9);
+
+DROP DICTIONARY IF EXISTS 01759_db.test_dictionary;
+
+CREATE DICTIONARY 01759_db.test_dictionary(key UInt64, value1 UInt64, value1 UInt64)
+PRIMARY KEY key
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'dictionary_source_table' DB '01759_db'))
+LAYOUT(COMPLEX_KEY_DIRECT()); -- {serverError 36}
+
+CREATE DICTIONARY 01759_db.test_dictionary(key UInt64, value1 UInt64, value2 UInt64)
+PRIMARY KEY key
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'dictionary_source_table' DB '01759_db'))
+LAYOUT(COMPLEX_KEY_DIRECT());
+
+SELECT number, dictGet('01759_db.test_dictionary', 'value1', tuple(number)) as value1,
+   dictGet('01759_db.test_dictionary', 'value2', tuple(number)) as value2 FROM system.numbers LIMIT 3;
+
+DROP TABLE 01759_db.dictionary_source_table;
+
+DROP DATABASE 01759_db;
diff --git a/tests/queries/0_stateless/01759_optimize_skip_unused_shards_zero_shards.reference b/tests/queries/0_stateless/01759_optimize_skip_unused_shards_zero_shards.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01759_optimize_skip_unused_shards_zero_shards.sql b/tests/queries/0_stateless/01759_optimize_skip_unused_shards_zero_shards.sql
new file mode 100644
index 00000000000..2ddf318313f
--- /dev/null
+++ b/tests/queries/0_stateless/01759_optimize_skip_unused_shards_zero_shards.sql
@@ -0,0 +1,3 @@
+create table dist_01756 (dummy UInt8) ENGINE = Distributed('test_cluster_two_shards', 'system', 'one', dummy);
+select ignore(1), * from dist_01756 where 0 settings optimize_skip_unused_shards=1, force_optimize_skip_unused_shards=1;
+drop table dist_01756;
diff --git a/tests/queries/0_stateless/01760_ddl_dictionary_use_current_database_name.reference b/tests/queries/0_stateless/01760_ddl_dictionary_use_current_database_name.reference
new file mode 100644
index 00000000000..6594f6baa3d
--- /dev/null
+++ b/tests/queries/0_stateless/01760_ddl_dictionary_use_current_database_name.reference
@@ -0,0 +1,8 @@
+dictGet
+0
+1
+0
+dictHas
+1
+1
+0
diff --git a/tests/queries/0_stateless/01760_ddl_dictionary_use_current_database_name.sql b/tests/queries/0_stateless/01760_ddl_dictionary_use_current_database_name.sql
new file mode 100644
index 00000000000..9c405640930
--- /dev/null
+++ b/tests/queries/0_stateless/01760_ddl_dictionary_use_current_database_name.sql
@@ -0,0 +1,29 @@
+DROP TABLE IF EXISTS ddl_dictonary_test_source;
+CREATE TABLE ddl_dictonary_test_source
+(
+   id UInt64,
+   value UInt64
+)
+ENGINE = TinyLog;
+
+INSERT INTO ddl_dictonary_test_source VALUES (0, 0);
+INSERT INTO ddl_dictonary_test_source VALUES (1, 1);
+
+DROP DICTIONARY IF EXISTS ddl_dictionary_test;
+CREATE DICTIONARY ddl_dictionary_test
+(
+   id UInt64,
+   value UInt64 DEFAULT 0
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'ddl_dictonary_test_source'))
+LAYOUT(DIRECT());
+
+SELECT 'dictGet';
+SELECT dictGet('ddl_dictionary_test', 'value', number) FROM system.numbers LIMIT 3;
+
+SELECT 'dictHas';
+SELECT dictHas('ddl_dictionary_test', number) FROM system.numbers LIMIT 3;
+
+DROP TABLE ddl_dictonary_test_source;
+DROP DICTIONARY ddl_dictionary_test;
diff --git a/tests/queries/0_stateless/01760_modulo_negative.reference b/tests/queries/0_stateless/01760_modulo_negative.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01760_modulo_negative.sql b/tests/queries/0_stateless/01760_modulo_negative.sql
new file mode 100644
index 00000000000..dbea06cc100
--- /dev/null
+++ b/tests/queries/0_stateless/01760_modulo_negative.sql
@@ -0,0 +1 @@
+SELECT -number % -9223372036854775808 FROM system.numbers; -- { serverError 153 }
diff --git a/tests/queries/0_stateless/01760_polygon_dictionaries.reference b/tests/queries/0_stateless/01760_polygon_dictionaries.reference
new file mode 100644
index 00000000000..6b236e980e1
--- /dev/null
+++ b/tests/queries/0_stateless/01760_polygon_dictionaries.reference
@@ -0,0 +1,19 @@
+dictGet
+(-0.1,0)	Click South	423	423
+(0,-1.1)	Click West	424	\N
+(0,1.1)	Click North	422	\N
+(0.1,0)	Click East	421	421
+(3,3)	qqq	10	20
+dictGetOrDefault
+(-0.1,0)	Click South	423	423
+(0,-1.1)	Click West	424	\N
+(0,1.1)	Click North	422	\N
+(0.1,0)	Click East	421	421
+(3,3)	DefaultName	30	40
+dictHas
+(-0.1,0)	1	1	1
+(0,-1.1)	1	1	1
+(0,1.1)	1	1	1
+(0.1,0)	1	1	1
+(3,3)	0	0	0
+check NaN or infinite point input
diff --git a/tests/queries/0_stateless/01760_polygon_dictionaries.sql b/tests/queries/0_stateless/01760_polygon_dictionaries.sql
new file mode 100644
index 00000000000..406e9af27ea
--- /dev/null
+++ b/tests/queries/0_stateless/01760_polygon_dictionaries.sql
@@ -0,0 +1,69 @@
+DROP DATABASE IF EXISTS 01760_db;
+CREATE DATABASE 01760_db;
+
+DROP TABLE IF EXISTS 01760_db.polygons;
+CREATE TABLE 01760_db.polygons (key Array(Array(Array(Tuple(Float64, Float64)))), name String, value UInt64, value_nullable Nullable(UInt64)) ENGINE = Memory;
+INSERT INTO 01760_db.polygons VALUES ([[[(3, 1), (0, 1), (0, -1), (3, -1)]]], 'Click East', 421, 421);
+INSERT INTO 01760_db.polygons VALUES ([[[(-1, 1), (1, 1), (1, 3), (-1, 3)]]], 'Click North', 422, NULL);
+INSERT INTO 01760_db.polygons VALUES ([[[(-3, 1), (-3, -1), (0, -1), (0, 1)]]], 'Click South', 423, 423);
+INSERT INTO 01760_db.polygons VALUES ([[[(-1, -1), (1, -1), (1, -3), (-1, -3)]]], 'Click West', 424, NULL);
+
+DROP TABLE IF EXISTS 01760_db.points;
+CREATE TABLE 01760_db.points (x Float64, y Float64, def_i UInt64, def_s String) ENGINE = Memory;
+INSERT INTO 01760_db.points VALUES (0.1, 0.0, 112, 'aax');
+INSERT INTO 01760_db.points VALUES (-0.1, 0.0, 113, 'aay');
+INSERT INTO 01760_db.points VALUES (0.0, 1.1, 114, 'aaz');
+INSERT INTO 01760_db.points VALUES (0.0, -1.1, 115, 'aat');
+INSERT INTO 01760_db.points VALUES (3.0, 3.0, 22, 'bb');
+
+DROP DICTIONARY IF EXISTS 01760_db.dict_array;
+CREATE DICTIONARY 01760_db.dict_array
+(
+    key Array(Array(Array(Tuple(Float64, Float64)))),
+    name String DEFAULT 'qqq',
+    value UInt64 DEFAULT 10,
+    value_nullable Nullable(UInt64) DEFAULT 20
+)
+PRIMARY KEY key
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'polygons' DB '01760_db'))
+LIFETIME(0)
+LAYOUT(POLYGON());
+
+SELECT 'dictGet';
+
+SELECT tuple(x, y) as key,
+    dictGet('01760_db.dict_array', 'name', key),
+    dictGet('01760_db.dict_array', 'value', key),
+    dictGet('01760_db.dict_array', 'value_nullable', key)
+FROM 01760_db.points
+ORDER BY x, y;
+
+SELECT 'dictGetOrDefault';
+
+SELECT tuple(x, y) as key,
+    dictGetOrDefault('01760_db.dict_array', 'name', key, 'DefaultName'),
+    dictGetOrDefault('01760_db.dict_array', 'value', key, 30),
+    dictGetOrDefault('01760_db.dict_array', 'value_nullable', key, 40)
+FROM 01760_db.points
+ORDER BY x, y;
+
+SELECT 'dictHas';
+
+SELECT tuple(x, y) as key,
+    dictHas('01760_db.dict_array', key),
+    dictHas('01760_db.dict_array', key),
+    dictHas('01760_db.dict_array', key)
+FROM 01760_db.points
+ORDER BY x, y;
+
+SELECT 'check NaN or infinite point input';
+SELECT tuple(nan, inf) as key, dictGet('01760_db.dict_array', 'name', key); --{serverError 36}
+SELECT tuple(nan, nan) as key, dictGet('01760_db.dict_array', 'name', key); --{serverError 36}
+SELECT tuple(inf, nan) as key, dictGet('01760_db.dict_array', 'name', key); --{serverError 36}
+SELECT tuple(inf, inf) as key, dictGet('01760_db.dict_array', 'name', key); --{serverError 36}
+
+DROP DICTIONARY 01760_db.dict_array;
+DROP TABLE 01760_db.points;
+DROP TABLE 01760_db.polygons;
+
+DROP DATABASE 01760_db;
diff --git a/tests/queries/0_stateless/01760_system_dictionaries.reference b/tests/queries/0_stateless/01760_system_dictionaries.reference
new file mode 100644
index 00000000000..aaf160dea69
--- /dev/null
+++ b/tests/queries/0_stateless/01760_system_dictionaries.reference
@@ -0,0 +1,14 @@
+simple key
+example_simple_key_dictionary	01760_db	['id']	['UInt64']	['value']	['UInt64']	NOT_LOADED
+example_simple_key_dictionary	01760_db	['id']	['UInt64']	['value']	['UInt64']	NOT_LOADED
+0	0
+1	1
+2	2
+example_simple_key_dictionary	01760_db	['id']	['UInt64']	['value']	['UInt64']	LOADED
+complex key
+example_complex_key_dictionary	01760_db	['id','id_key']	['UInt64','String']	['value']	['UInt64']	NOT_LOADED
+example_complex_key_dictionary	01760_db	['id','id_key']	['UInt64','String']	['value']	['UInt64']	NOT_LOADED
+0	0_key	0
+1	1_key	1
+2	2_key	2
+example_complex_key_dictionary	01760_db	['id','id_key']	['UInt64','String']	['value']	['UInt64']	LOADED
diff --git a/tests/queries/0_stateless/01760_system_dictionaries.sql b/tests/queries/0_stateless/01760_system_dictionaries.sql
new file mode 100644
index 00000000000..f4e0cfa0086
--- /dev/null
+++ b/tests/queries/0_stateless/01760_system_dictionaries.sql
@@ -0,0 +1,57 @@
+DROP DATABASE IF EXISTS 01760_db;
+CREATE DATABASE 01760_db;
+
+DROP TABLE IF EXISTS 01760_db.example_simple_key_source;
+CREATE TABLE 01760_db.example_simple_key_source (id UInt64, value UInt64) ENGINE=TinyLog;
+INSERT INTO 01760_db.example_simple_key_source VALUES (0, 0), (1, 1), (2, 2);
+
+DROP DICTIONARY IF EXISTS 01760_db.example_simple_key_dictionary;
+CREATE DICTIONARY 01760_db.example_simple_key_dictionary (
+    id UInt64,
+    value UInt64
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'example_simple_key_source' DATABASE '01760_db'))
+LAYOUT(DIRECT());
+
+SELECT 'simple key';
+
+SELECT name, database, key.names, key.types, attribute.names, attribute.types, status FROM system.dictionaries WHERE database='01760_db';
+SELECT name, database, key.names, key.types, attribute.names, attribute.types, status FROM system.dictionaries WHERE database='01760_db';
+
+SELECT * FROM 01760_db.example_simple_key_dictionary;
+
+SELECT name, database, key.names, key.types, attribute.names, attribute.types, status FROM system.dictionaries WHERE database='01760_db';
+
+DROP TABLE 01760_db.example_simple_key_source;
+DROP DICTIONARY 01760_db.example_simple_key_dictionary;
+
+SELECT name, database, key.names, key.types, attribute.names, attribute.types, status FROM system.dictionaries WHERE database='01760_db';
+
+DROP TABLE IF EXISTS 01760_db.example_complex_key_source;
+CREATE TABLE 01760_db.example_complex_key_source (id UInt64, id_key String, value UInt64) ENGINE=TinyLog;
+INSERT INTO 01760_db.example_complex_key_source VALUES (0, '0_key', 0), (1, '1_key', 1), (2, '2_key', 2);
+
+DROP DICTIONARY IF EXISTS 01760_db.example_complex_key_dictionary;
+CREATE DICTIONARY 01760_db.example_complex_key_dictionary (
+    id UInt64,
+    id_key String,
+    value UInt64
+)
+PRIMARY KEY id, id_key
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'example_complex_key_source' DATABASE '01760_db'))
+LAYOUT(COMPLEX_KEY_DIRECT());
+
+SELECT 'complex key';
+
+SELECT name, database, key.names, key.types, attribute.names, attribute.types, status FROM system.dictionaries WHERE database='01760_db';
+SELECT name, database, key.names, key.types, attribute.names, attribute.types, status FROM system.dictionaries WHERE database='01760_db';
+
+SELECT * FROM 01760_db.example_complex_key_dictionary;
+
+SELECT name, database, key.names, key.types, attribute.names, attribute.types, status FROM system.dictionaries WHERE database='01760_db';
+
+DROP TABLE 01760_db.example_complex_key_source;
+DROP DICTIONARY 01760_db.example_complex_key_dictionary;
+
+DROP DATABASE 01760_db;
diff --git a/tests/queries/0_stateless/01761_alter_decimal_zookeeper.reference b/tests/queries/0_stateless/01761_alter_decimal_zookeeper.reference
new file mode 100644
index 00000000000..5dcc95fd7b7
--- /dev/null
+++ b/tests/queries/0_stateless/01761_alter_decimal_zookeeper.reference
@@ -0,0 +1,9 @@
+1	5.00000000
+2	6.00000000
+CREATE TABLE default.test_alter_decimal\n(\n    `n` UInt64,\n    `d` Decimal(18, 8)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/01761_alter_decimal_zookeeper\', \'r1\')\nORDER BY tuple()\nSETTINGS index_granularity = 8192
+1	5.00000000
+2	6.00000000
+CREATE TABLE default.test_alter_decimal\n(\n    `n` UInt64,\n    `d` Decimal(18, 8)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/01761_alter_decimal_zookeeper\', \'r1\')\nORDER BY tuple()\nSETTINGS index_granularity = 8192
+1	5.00000000
+2	6.00000000
+3	7.00000000
diff --git a/tests/queries/0_stateless/01761_alter_decimal_zookeeper.sql b/tests/queries/0_stateless/01761_alter_decimal_zookeeper.sql
new file mode 100644
index 00000000000..01766f0d6c2
--- /dev/null
+++ b/tests/queries/0_stateless/01761_alter_decimal_zookeeper.sql
@@ -0,0 +1,31 @@
+DROP TABLE IF EXISTS test_alter_decimal;
+
+CREATE TABLE test_alter_decimal
+(n UInt64, d Decimal(15, 8))
+ENGINE = ReplicatedMergeTree('/clickhouse/01761_alter_decimal_zookeeper', 'r1')
+ORDER BY tuple();
+
+INSERT INTO test_alter_decimal VALUES (1, toDecimal32(5, 5));
+
+INSERT INTO test_alter_decimal VALUES (2, toDecimal32(6, 6));
+
+SELECT * FROM test_alter_decimal ORDER BY n;
+
+ALTER TABLE test_alter_decimal MODIFY COLUMN d Decimal(18, 8);
+
+SHOW CREATE TABLE test_alter_decimal;
+
+SELECT * FROM test_alter_decimal ORDER BY n;
+
+DETACH TABLE test_alter_decimal;
+ATTACH TABLE test_alter_decimal;
+
+SHOW CREATE TABLE test_alter_decimal;
+
+INSERT INTO test_alter_decimal VALUES (3, toDecimal32(7, 7));
+
+OPTIMIZE TABLE test_alter_decimal FINAL;
+
+SELECT * FROM test_alter_decimal ORDER BY n;
+
+DROP TABLE IF EXISTS test_alter_decimal;
diff --git a/tests/queries/0_stateless/01761_cast_to_enum_nullable.reference b/tests/queries/0_stateless/01761_cast_to_enum_nullable.reference
new file mode 100644
index 00000000000..d00491fd7e5
--- /dev/null
+++ b/tests/queries/0_stateless/01761_cast_to_enum_nullable.reference
@@ -0,0 +1 @@
+1
diff --git a/tests/queries/0_stateless/01761_cast_to_enum_nullable.sql b/tests/queries/0_stateless/01761_cast_to_enum_nullable.sql
new file mode 100644
index 00000000000..42a51d2f7b9
--- /dev/null
+++ b/tests/queries/0_stateless/01761_cast_to_enum_nullable.sql
@@ -0,0 +1 @@
+SELECT toUInt8(assumeNotNull(cast(cast(NULL, 'Nullable(String)'), 'Nullable(Enum8(\'Hello\' = 1))')));
diff --git a/tests/queries/0_stateless/01761_round_year_bounds.reference b/tests/queries/0_stateless/01761_round_year_bounds.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01761_round_year_bounds.sql b/tests/queries/0_stateless/01761_round_year_bounds.sql
new file mode 100644
index 00000000000..fed12c55568
--- /dev/null
+++ b/tests/queries/0_stateless/01761_round_year_bounds.sql
@@ -0,0 +1 @@
+SELECT toStartOfInterval(toDateTime(-9223372036854775808), toIntervalYear(100), 'Europe/Moscow') FORMAT Null;
diff --git a/tests/queries/0_stateless/01762_datetime64_extended_parsing.reference b/tests/queries/0_stateless/01762_datetime64_extended_parsing.reference
new file mode 100644
index 00000000000..531b6f8bf13
--- /dev/null
+++ b/tests/queries/0_stateless/01762_datetime64_extended_parsing.reference
@@ -0,0 +1 @@
+1925-01-02 03:04:05.678901
diff --git a/tests/queries/0_stateless/01762_datetime64_extended_parsing.sql b/tests/queries/0_stateless/01762_datetime64_extended_parsing.sql
new file mode 100644
index 00000000000..a7ad447b215
--- /dev/null
+++ b/tests/queries/0_stateless/01762_datetime64_extended_parsing.sql
@@ -0,0 +1 @@
+SELECT toDateTime64('1925-01-02 03:04:05.678901', 6);
diff --git a/tests/queries/0_stateless/01763_filter_push_down_bugs.reference b/tests/queries/0_stateless/01763_filter_push_down_bugs.reference
new file mode 100644
index 00000000000..66ea84a07c1
--- /dev/null
+++ b/tests/queries/0_stateless/01763_filter_push_down_bugs.reference
@@ -0,0 +1,6 @@
+1	2
+1	2
+[1]	2
+[[1]]	2
+String1_0	String2_0	String3_0	String4_0	1
+String1_0	String2_0	String3_0	String4_0	1
diff --git a/tests/queries/0_stateless/01763_filter_push_down_bugs.sql b/tests/queries/0_stateless/01763_filter_push_down_bugs.sql
new file mode 100644
index 00000000000..5000eb38878
--- /dev/null
+++ b/tests/queries/0_stateless/01763_filter_push_down_bugs.sql
@@ -0,0 +1,37 @@
+SELECT * FROM (SELECT col1, col2 FROM (select '1' as col1, '2' as col2) GROUP by col1, col2) AS expr_qry WHERE col2 != '';
+SELECT * FROM (SELECT materialize('1') AS s1, materialize('2') AS s2 GROUP BY s1, s2) WHERE s2 = '2';
+SELECT * FROM (SELECT materialize([1]) AS s1, materialize('2') AS s2 GROUP BY s1, s2) WHERE s2 = '2';
+SELECT * FROM (SELECT materialize([[1]]) AS s1, materialize('2') AS s2 GROUP BY s1, s2) WHERE s2 = '2';
+
+DROP TABLE IF EXISTS Test;
+
+CREATE TABLE Test
+ENGINE = MergeTree()
+PRIMARY KEY (String1,String2)
+ORDER BY (String1,String2)
+AS 
+SELECT
+   'String1_' || toString(number) as String1,
+   'String2_' || toString(number) as String2,
+   'String3_' || toString(number) as String3,
+   'String4_' || toString(number%4) as String4
+FROM numbers(1);
+
+SELECT *
+FROM
+  (
+   SELECT String1,String2,String3,String4,COUNT(*)
+   FROM Test
+   GROUP by String1,String2,String3,String4
+  ) AS expr_qry;
+
+SELECT *
+FROM
+  (
+    SELECT String1,String2,String3,String4,COUNT(*)
+    FROM Test
+    GROUP by String1,String2,String3,String4
+  ) AS expr_qry
+WHERE  String4 ='String4_0';
+
+DROP TABLE IF EXISTS Test;
diff --git a/tests/queries/0_stateless/01763_long_ttl_group_by.reference b/tests/queries/0_stateless/01763_long_ttl_group_by.reference
new file mode 100644
index 00000000000..bdea806e747
--- /dev/null
+++ b/tests/queries/0_stateless/01763_long_ttl_group_by.reference
@@ -0,0 +1,6 @@
+206000	0	3	5
+41200	0	3	1
+20600	0	3	1
+206000	0	3	5
+41200	0	3	1
+20600	0	3	1
diff --git a/tests/queries/0_stateless/01763_long_ttl_group_by.sql b/tests/queries/0_stateless/01763_long_ttl_group_by.sql
new file mode 100644
index 00000000000..e0c6f678f15
--- /dev/null
+++ b/tests/queries/0_stateless/01763_long_ttl_group_by.sql
@@ -0,0 +1,26 @@
+DROP TABLE IF EXISTS test_ttl_group_by01763;
+CREATE TABLE test_ttl_group_by01763
+(key UInt32, ts DateTime, value UInt32, min_value UInt32 default value, max_value UInt32 default value)
+ENGINE = MergeTree() PARTITION BY toYYYYMM(ts)
+ORDER BY (key, toStartOfInterval(ts, toIntervalMinute(3)), ts) 
+TTL ts + INTERVAL 5 MINUTE GROUP BY key, toStartOfInterval(ts, toIntervalMinute(3)) 
+SET value = sum(value), min_value = min(min_value), max_value = max(max_value),  ts=min(toStartOfInterval(ts, toIntervalMinute(3)));
+
+INSERT INTO test_ttl_group_by01763(key, ts, value) SELECT number%5 as key, now() - interval 10 minute + number, 1 FROM numbers(100000);
+INSERT INTO test_ttl_group_by01763(key, ts, value) SELECT number%5 as key, now() - interval 10 minute + number, 0 FROM numbers(1000);
+INSERT INTO test_ttl_group_by01763(key, ts, value) SELECT number%5 as key, now() - interval 10 minute + number, 3 FROM numbers(1000);
+INSERT INTO test_ttl_group_by01763(key, ts, value) SELECT number%5 as key, now() -   interval 2 month + number, 1 FROM numbers(100000);
+INSERT INTO test_ttl_group_by01763(key, ts, value) SELECT number%5 as key, now() -   interval 2 month + number, 0 FROM numbers(1000);
+INSERT INTO test_ttl_group_by01763(key, ts, value) SELECT number%5 as key, now() -   interval 2 month + number, 3 FROM numbers(1000);
+
+SELECT sum(value), min(min_value), max(max_value), uniqExact(key) FROM test_ttl_group_by01763;
+SELECT sum(value), min(min_value), max(max_value), uniqExact(key) FROM test_ttl_group_by01763 where key = 3 ;
+SELECT sum(value), min(min_value), max(max_value), uniqExact(key) FROM test_ttl_group_by01763 where key = 3 and ts <= today() - interval 30 day ;
+
+OPTIMIZE TABLE test_ttl_group_by01763 FINAL;
+
+SELECT sum(value), min(min_value), max(max_value), uniqExact(key) FROM test_ttl_group_by01763;
+SELECT sum(value), min(min_value), max(max_value), uniqExact(key) FROM test_ttl_group_by01763 where key = 3 ;
+SELECT sum(value), min(min_value), max(max_value), uniqExact(key) FROM test_ttl_group_by01763 where key = 3 and ts <= today() - interval 30 day ;
+
+DROP TABLE test_ttl_group_by01763;
diff --git a/tests/queries/0_stateless/01763_max_distributed_depth.reference b/tests/queries/0_stateless/01763_max_distributed_depth.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01763_max_distributed_depth.sql b/tests/queries/0_stateless/01763_max_distributed_depth.sql
new file mode 100644
index 00000000000..d1bb9e4be90
--- /dev/null
+++ b/tests/queries/0_stateless/01763_max_distributed_depth.sql
@@ -0,0 +1,26 @@
+DROP TABLE IF EXISTS tt6;
+
+CREATE TABLE tt6
+(
+	`id` UInt32,
+	`first_column` UInt32,
+	`second_column` UInt32,
+	`third_column` UInt32,
+	`status` String
+
+)
+ENGINE = Distributed('test_shard_localhost', '', 'tt6', rand());
+
+INSERT INTO tt6 VALUES (1, 1, 1, 1, 'ok'); -- { serverError 581 }
+
+SELECT * FROM tt6; -- { serverError 581 }
+
+SET max_distributed_depth = 0;
+
+-- stack overflow
+INSERT INTO tt6 VALUES (1, 1, 1, 1, 'ok'); -- { serverError 306}
+
+-- stack overflow
+SELECT * FROM tt6; -- { serverError 306 }
+
+DROP TABLE tt6;
diff --git a/tests/queries/0_stateless/01764_collapsing_merge_adaptive_granularity.reference b/tests/queries/0_stateless/01764_collapsing_merge_adaptive_granularity.reference
new file mode 100644
index 00000000000..0f128a62bbb
--- /dev/null
+++ b/tests/queries/0_stateless/01764_collapsing_merge_adaptive_granularity.reference
@@ -0,0 +1,4 @@
+-8191	8193
+-8191	8193
+0	2
+0	2
diff --git a/tests/queries/0_stateless/01764_collapsing_merge_adaptive_granularity.sql b/tests/queries/0_stateless/01764_collapsing_merge_adaptive_granularity.sql
new file mode 100644
index 00000000000..ca6465154ea
--- /dev/null
+++ b/tests/queries/0_stateless/01764_collapsing_merge_adaptive_granularity.sql
@@ -0,0 +1,53 @@
+DROP TABLE IF EXISTS collapsing_table;
+SET optimize_on_insert = 0;
+
+CREATE TABLE collapsing_table
+(
+    key UInt64,
+    value UInt64,
+    Sign Int8
+)
+ENGINE = CollapsingMergeTree(Sign)
+ORDER BY key
+SETTINGS
+    vertical_merge_algorithm_min_rows_to_activate=0,
+    vertical_merge_algorithm_min_columns_to_activate=0,
+    min_bytes_for_wide_part = 0;
+
+INSERT INTO collapsing_table SELECT if(number == 8192, 8191, number), 1, if(number == 8192, +1, -1) FROM numbers(8193);
+
+SELECT sum(Sign), count() from collapsing_table;
+
+OPTIMIZE TABLE collapsing_table FINAL;
+
+SELECT sum(Sign), count() from collapsing_table;
+
+DROP TABLE IF EXISTS collapsing_table;
+
+
+DROP TABLE IF EXISTS collapsing_suspicious_granularity;
+
+CREATE TABLE collapsing_suspicious_granularity
+(
+    key UInt64,
+    value UInt64,
+    Sign Int8
+)
+ENGINE = CollapsingMergeTree(Sign)
+ORDER BY key
+SETTINGS
+    vertical_merge_algorithm_min_rows_to_activate=0,
+    vertical_merge_algorithm_min_columns_to_activate=0,
+    min_bytes_for_wide_part = 0,
+    index_granularity = 1;
+
+INSERT INTO collapsing_suspicious_granularity VALUES (1, 1, -1) (1, 1, 1);
+
+SELECT sum(Sign), count() from collapsing_suspicious_granularity;
+
+OPTIMIZE TABLE collapsing_suspicious_granularity FINAL;
+
+SELECT sum(Sign), count() from collapsing_suspicious_granularity;
+
+
+DROP TABLE IF EXISTS collapsing_suspicious_granularity;
diff --git a/tests/queries/0_stateless/01764_prefer_column_name_to_alias.reference b/tests/queries/0_stateless/01764_prefer_column_name_to_alias.reference
new file mode 100644
index 00000000000..6fde46c38a4
--- /dev/null
+++ b/tests/queries/0_stateless/01764_prefer_column_name_to_alias.reference
@@ -0,0 +1,3 @@
+4.5	9
+3	2
+3	3
diff --git a/tests/queries/0_stateless/01764_prefer_column_name_to_alias.sql b/tests/queries/0_stateless/01764_prefer_column_name_to_alias.sql
new file mode 100644
index 00000000000..5524712c3c6
--- /dev/null
+++ b/tests/queries/0_stateless/01764_prefer_column_name_to_alias.sql
@@ -0,0 +1,8 @@
+SELECT avg(number) AS number, max(number) FROM numbers(10); -- { serverError 184 }
+SELECT sum(x) AS x, max(x) FROM (SELECT 1 AS x UNION ALL SELECT 2 AS x) t; -- { serverError 184 }
+select sum(C1) as C1, count(C1) as C2 from (select number as C1 from numbers(3)) as ITBL; -- { serverError 184 }
+
+set prefer_column_name_to_alias  = 1;
+SELECT avg(number) AS number, max(number) FROM numbers(10);
+SELECT sum(x) AS x, max(x) FROM (SELECT 1 AS x UNION ALL SELECT 2 AS x) t settings prefer_column_name_to_alias = 1;
+select sum(C1) as C1, count(C1) as C2 from (select number as C1 from numbers(3)) as ITBL settings prefer_column_name_to_alias = 1;
diff --git a/tests/queries/0_stateless/01764_table_function_dictionary.reference b/tests/queries/0_stateless/01764_table_function_dictionary.reference
new file mode 100644
index 00000000000..b8e844ab3e9
--- /dev/null
+++ b/tests/queries/0_stateless/01764_table_function_dictionary.reference
@@ -0,0 +1,2 @@
+0	0
+1	1
diff --git a/tests/queries/0_stateless/01764_table_function_dictionary.sql b/tests/queries/0_stateless/01764_table_function_dictionary.sql
new file mode 100644
index 00000000000..0168566077d
--- /dev/null
+++ b/tests/queries/0_stateless/01764_table_function_dictionary.sql
@@ -0,0 +1,25 @@
+DROP TABLE IF EXISTS table_function_dictionary_source_table;
+CREATE TABLE table_function_dictionary_source_table
+(
+   id UInt64,
+   value UInt64
+)
+ENGINE = TinyLog;
+
+INSERT INTO table_function_dictionary_source_table VALUES (0, 0);
+INSERT INTO table_function_dictionary_source_table VALUES (1, 1);
+
+DROP DICTIONARY IF EXISTS table_function_dictionary_test_dictionary;
+CREATE DICTIONARY table_function_dictionary_test_dictionary
+(
+   id UInt64,
+   value UInt64 DEFAULT 0
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'table_function_dictionary_source_table'))
+LAYOUT(DIRECT());
+
+SELECT * FROM dictionary('table_function_dictionary_test_dictionary');
+
+DROP TABLE table_function_dictionary_source_table;
+DROP DICTIONARY table_function_dictionary_test_dictionary;
diff --git a/tests/queries/0_stateless/01765_hashed_dictionary_simple_key.reference b/tests/queries/0_stateless/01765_hashed_dictionary_simple_key.reference
new file mode 100644
index 00000000000..2cc0a8668a2
--- /dev/null
+++ b/tests/queries/0_stateless/01765_hashed_dictionary_simple_key.reference
@@ -0,0 +1,132 @@
+Dictionary hashed_dictionary_simple_key_simple_attributes
+dictGet existing value
+value_0	value_second_0
+value_1	value_second_1
+value_2	value_second_2
+dictGet with non existing value
+value_0	value_second_0
+value_1	value_second_1
+value_2	value_second_2
+value_first_default	value_second_default
+dictGetOrDefault existing value
+value_0	value_second_0
+value_1	value_second_1
+value_2	value_second_2
+dictGetOrDefault non existing value
+value_0	value_second_0
+value_1	value_second_1
+value_2	value_second_2
+default	default
+dictHas
+1
+1
+1
+0
+select all values as input stream
+0	value_0	value_second_0
+1	value_1	value_second_1
+2	value_2	value_second_2
+Dictionary sparse_hashed_dictionary_simple_key_simple_attributes
+dictGet existing value
+value_0	value_second_0
+value_1	value_second_1
+value_2	value_second_2
+dictGet with non existing value
+value_0	value_second_0
+value_1	value_second_1
+value_2	value_second_2
+value_first_default	value_second_default
+dictGetOrDefault existing value
+value_0	value_second_0
+value_1	value_second_1
+value_2	value_second_2
+dictGetOrDefault non existing value
+value_0	value_second_0
+value_1	value_second_1
+value_2	value_second_2
+default	default
+dictHas
+1
+1
+1
+0
+select all values as input stream
+0	value_0	value_second_0
+1	value_1	value_second_1
+2	value_2	value_second_2
+Dictionary hashed_dictionary_simple_key_complex_attributes
+dictGet existing value
+value_0	value_second_0
+value_1	\N
+value_2	value_second_2
+dictGet with non existing value
+value_0	value_second_0
+value_1	\N
+value_2	value_second_2
+value_first_default	value_second_default
+dictGetOrDefault existing value
+value_0	value_second_0
+value_1	\N
+value_2	value_second_2
+dictGetOrDefault non existing value
+value_0	value_second_0
+value_1	\N
+value_2	value_second_2
+default	default
+dictHas
+1
+1
+1
+0
+select all values as input stream
+0	value_0	value_second_0
+1	value_1	\N
+2	value_2	value_second_2
+Dictionary sparse_hashed_dictionary_simple_key_complex_attributes
+dictGet existing value
+value_0	value_second_0
+value_1	\N
+value_2	value_second_2
+dictGet with non existing value
+value_0	value_second_0
+value_1	\N
+value_2	value_second_2
+value_first_default	value_second_default
+dictGetOrDefault existing value
+value_0	value_second_0
+value_1	\N
+value_2	value_second_2
+dictGetOrDefault non existing value
+value_0	value_second_0
+value_1	\N
+value_2	value_second_2
+default	default
+dictHas
+1
+1
+1
+0
+select all values as input stream
+0	value_0	value_second_0
+1	value_1	\N
+2	value_2	value_second_2
+Dictionary hashed_dictionary_simple_key_hierarchy
+dictGet
+0
+0
+1
+1
+2
+dictGetHierarchy
+[1]
+[4,2,1]
+Dictionary sparse_hashed_dictionary_simple_key_hierarchy
+dictGet
+0
+0
+1
+1
+2
+dictGetHierarchy
+[1]
+[4,2,1]
diff --git a/tests/queries/0_stateless/01765_hashed_dictionary_simple_key.sql b/tests/queries/0_stateless/01765_hashed_dictionary_simple_key.sql
new file mode 100644
index 00000000000..7502c6a93bb
--- /dev/null
+++ b/tests/queries/0_stateless/01765_hashed_dictionary_simple_key.sql
@@ -0,0 +1,207 @@
+DROP DATABASE IF EXISTS 01765_db;
+CREATE DATABASE 01765_db;
+
+CREATE TABLE 01765_db.simple_key_simple_attributes_source_table
+(
+   id UInt64,
+   value_first String,
+   value_second String
+)
+ENGINE = TinyLog;
+
+INSERT INTO 01765_db.simple_key_simple_attributes_source_table VALUES(0, 'value_0', 'value_second_0');
+INSERT INTO 01765_db.simple_key_simple_attributes_source_table VALUES(1, 'value_1', 'value_second_1');
+INSERT INTO 01765_db.simple_key_simple_attributes_source_table VALUES(2, 'value_2', 'value_second_2');
+
+CREATE DICTIONARY 01765_db.hashed_dictionary_simple_key_simple_attributes
+(
+   id UInt64,
+   value_first String DEFAULT 'value_first_default',
+   value_second String DEFAULT 'value_second_default'
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'simple_key_simple_attributes_source_table'))
+LIFETIME(MIN 1 MAX 1000)
+LAYOUT(HASHED());
+
+SELECT 'Dictionary hashed_dictionary_simple_key_simple_attributes';
+SELECT 'dictGet existing value';
+SELECT dictGet('01765_db.hashed_dictionary_simple_key_simple_attributes', 'value_first', number) as value_first,
+    dictGet('01765_db.hashed_dictionary_simple_key_simple_attributes', 'value_second', number) as value_second FROM system.numbers LIMIT 3;
+SELECT 'dictGet with non existing value';
+SELECT dictGet('01765_db.hashed_dictionary_simple_key_simple_attributes', 'value_first', number) as value_first,
+    dictGet('01765_db.hashed_dictionary_simple_key_simple_attributes', 'value_second', number) as value_second FROM system.numbers LIMIT 4;
+SELECT 'dictGetOrDefault existing value';
+SELECT dictGetOrDefault('01765_db.hashed_dictionary_simple_key_simple_attributes', 'value_first', number, toString('default')) as value_first,
+    dictGetOrDefault('01765_db.hashed_dictionary_simple_key_simple_attributes', 'value_second', number, toString('default')) as value_second FROM system.numbers LIMIT 3;
+SELECT 'dictGetOrDefault non existing value';
+SELECT dictGetOrDefault('01765_db.hashed_dictionary_simple_key_simple_attributes', 'value_first', number, toString('default')) as value_first,
+    dictGetOrDefault('01765_db.hashed_dictionary_simple_key_simple_attributes', 'value_second', number, toString('default')) as value_second FROM system.numbers LIMIT 4;
+SELECT 'dictHas';
+SELECT dictHas('01765_db.hashed_dictionary_simple_key_simple_attributes', number) FROM system.numbers LIMIT 4;
+SELECT 'select all values as input stream';
+SELECT * FROM 01765_db.hashed_dictionary_simple_key_simple_attributes ORDER BY id;
+
+DROP DICTIONARY 01765_db.hashed_dictionary_simple_key_simple_attributes;
+
+CREATE DICTIONARY 01765_db.sparse_hashed_dictionary_simple_key_simple_attributes
+(
+   id UInt64,
+   value_first String DEFAULT 'value_first_default',
+   value_second String DEFAULT 'value_second_default'
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'simple_key_simple_attributes_source_table'))
+LIFETIME(MIN 1 MAX 1000)
+LAYOUT(SPARSE_HASHED());
+
+SELECT 'Dictionary sparse_hashed_dictionary_simple_key_simple_attributes';
+SELECT 'dictGet existing value';
+SELECT dictGet('01765_db.sparse_hashed_dictionary_simple_key_simple_attributes', 'value_first', number) as value_first,
+    dictGet('01765_db.sparse_hashed_dictionary_simple_key_simple_attributes', 'value_second', number) as value_second FROM system.numbers LIMIT 3;
+SELECT 'dictGet with non existing value';
+SELECT dictGet('01765_db.sparse_hashed_dictionary_simple_key_simple_attributes', 'value_first', number) as value_first,
+    dictGet('01765_db.sparse_hashed_dictionary_simple_key_simple_attributes', 'value_second', number) as value_second FROM system.numbers LIMIT 4;
+SELECT 'dictGetOrDefault existing value';
+SELECT dictGetOrDefault('01765_db.sparse_hashed_dictionary_simple_key_simple_attributes', 'value_first', number, toString('default')) as value_first,
+    dictGetOrDefault('01765_db.sparse_hashed_dictionary_simple_key_simple_attributes', 'value_second', number, toString('default')) as value_second FROM system.numbers LIMIT 3;
+SELECT 'dictGetOrDefault non existing value';
+SELECT dictGetOrDefault('01765_db.sparse_hashed_dictionary_simple_key_simple_attributes', 'value_first', number, toString('default')) as value_first,
+    dictGetOrDefault('01765_db.sparse_hashed_dictionary_simple_key_simple_attributes', 'value_second', number, toString('default')) as value_second FROM system.numbers LIMIT 4;
+SELECT 'dictHas';
+SELECT dictHas('01765_db.sparse_hashed_dictionary_simple_key_simple_attributes', number) FROM system.numbers LIMIT 4;
+SELECT 'select all values as input stream';
+SELECT * FROM 01765_db.sparse_hashed_dictionary_simple_key_simple_attributes ORDER BY id;
+
+DROP DICTIONARY 01765_db.sparse_hashed_dictionary_simple_key_simple_attributes;
+
+DROP TABLE 01765_db.simple_key_simple_attributes_source_table;
+
+CREATE TABLE 01765_db.simple_key_complex_attributes_source_table
+(
+   id UInt64,
+   value_first String,
+   value_second Nullable(String)
+)
+ENGINE = TinyLog;
+
+INSERT INTO 01765_db.simple_key_complex_attributes_source_table VALUES(0, 'value_0', 'value_second_0');
+INSERT INTO 01765_db.simple_key_complex_attributes_source_table VALUES(1, 'value_1', NULL);
+INSERT INTO 01765_db.simple_key_complex_attributes_source_table VALUES(2, 'value_2', 'value_second_2');
+
+CREATE DICTIONARY 01765_db.hashed_dictionary_simple_key_complex_attributes
+(
+   id UInt64,
+   value_first String DEFAULT 'value_first_default',
+   value_second Nullable(String) DEFAULT 'value_second_default'
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'simple_key_complex_attributes_source_table'))
+LIFETIME(MIN 1 MAX 1000)
+LAYOUT(HASHED());
+
+SELECT 'Dictionary hashed_dictionary_simple_key_complex_attributes';
+SELECT 'dictGet existing value';
+SELECT dictGet('01765_db.hashed_dictionary_simple_key_complex_attributes', 'value_first', number) as value_first,
+    dictGet('01765_db.hashed_dictionary_simple_key_complex_attributes', 'value_second', number) as value_second FROM system.numbers LIMIT 3;
+SELECT 'dictGet with non existing value';
+SELECT dictGet('01765_db.hashed_dictionary_simple_key_complex_attributes', 'value_first', number) as value_first,
+    dictGet('01765_db.hashed_dictionary_simple_key_complex_attributes', 'value_second', number) as value_second FROM system.numbers LIMIT 4;
+SELECT 'dictGetOrDefault existing value';
+SELECT dictGetOrDefault('01765_db.hashed_dictionary_simple_key_complex_attributes', 'value_first', number, toString('default')) as value_first,
+    dictGetOrDefault('01765_db.hashed_dictionary_simple_key_complex_attributes', 'value_second', number, toString('default')) as value_second FROM system.numbers LIMIT 3;
+SELECT 'dictGetOrDefault non existing value';
+SELECT dictGetOrDefault('01765_db.hashed_dictionary_simple_key_complex_attributes', 'value_first', number, toString('default')) as value_first,
+    dictGetOrDefault('01765_db.hashed_dictionary_simple_key_complex_attributes', 'value_second', number, toString('default')) as value_second FROM system.numbers LIMIT 4;
+SELECT 'dictHas';
+SELECT dictHas('01765_db.hashed_dictionary_simple_key_complex_attributes', number) FROM system.numbers LIMIT 4;
+SELECT 'select all values as input stream';
+SELECT * FROM 01765_db.hashed_dictionary_simple_key_complex_attributes ORDER BY id;
+
+DROP DICTIONARY 01765_db.hashed_dictionary_simple_key_complex_attributes;
+
+CREATE DICTIONARY 01765_db.sparse_hashed_dictionary_simple_key_complex_attributes
+(
+   id UInt64,
+   value_first String DEFAULT 'value_first_default',
+   value_second Nullable(String) DEFAULT 'value_second_default'
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'simple_key_complex_attributes_source_table'))
+LIFETIME(MIN 1 MAX 1000)
+LAYOUT(HASHED());
+
+SELECT 'Dictionary sparse_hashed_dictionary_simple_key_complex_attributes';
+SELECT 'dictGet existing value';
+SELECT dictGet('01765_db.sparse_hashed_dictionary_simple_key_complex_attributes', 'value_first', number) as value_first,
+    dictGet('01765_db.sparse_hashed_dictionary_simple_key_complex_attributes', 'value_second', number) as value_second FROM system.numbers LIMIT 3;
+SELECT 'dictGet with non existing value';
+SELECT dictGet('01765_db.sparse_hashed_dictionary_simple_key_complex_attributes', 'value_first', number) as value_first,
+    dictGet('01765_db.sparse_hashed_dictionary_simple_key_complex_attributes', 'value_second', number) as value_second FROM system.numbers LIMIT 4;
+SELECT 'dictGetOrDefault existing value';
+SELECT dictGetOrDefault('01765_db.sparse_hashed_dictionary_simple_key_complex_attributes', 'value_first', number, toString('default')) as value_first,
+    dictGetOrDefault('01765_db.sparse_hashed_dictionary_simple_key_complex_attributes', 'value_second', number, toString('default')) as value_second FROM system.numbers LIMIT 3;
+SELECT 'dictGetOrDefault non existing value';
+SELECT dictGetOrDefault('01765_db.sparse_hashed_dictionary_simple_key_complex_attributes', 'value_first', number, toString('default')) as value_first,
+    dictGetOrDefault('01765_db.sparse_hashed_dictionary_simple_key_complex_attributes', 'value_second', number, toString('default')) as value_second FROM system.numbers LIMIT 4;
+SELECT 'dictHas';
+SELECT dictHas('01765_db.sparse_hashed_dictionary_simple_key_complex_attributes', number) FROM system.numbers LIMIT 4;
+SELECT 'select all values as input stream';
+SELECT * FROM 01765_db.sparse_hashed_dictionary_simple_key_complex_attributes ORDER BY id;
+
+DROP DICTIONARY 01765_db.sparse_hashed_dictionary_simple_key_complex_attributes;
+
+DROP TABLE 01765_db.simple_key_complex_attributes_source_table;
+
+CREATE TABLE 01765_db.simple_key_hierarchy_table
+(
+    id UInt64,
+    parent_id UInt64
+) ENGINE = TinyLog();
+
+INSERT INTO 01765_db.simple_key_hierarchy_table VALUES (1, 0);
+INSERT INTO 01765_db.simple_key_hierarchy_table VALUES (2, 1);
+INSERT INTO 01765_db.simple_key_hierarchy_table VALUES (3, 1);
+INSERT INTO 01765_db.simple_key_hierarchy_table VALUES (4, 2);
+
+CREATE DICTIONARY 01765_db.hashed_dictionary_simple_key_hierarchy
+(
+   id UInt64,
+   parent_id UInt64 HIERARCHICAL
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'simple_key_hierarchy_table'))
+LIFETIME(MIN 1 MAX 1000)
+LAYOUT(HASHED());
+
+SELECT 'Dictionary hashed_dictionary_simple_key_hierarchy';
+SELECT 'dictGet';
+SELECT dictGet('01765_db.hashed_dictionary_simple_key_hierarchy', 'parent_id', number) FROM system.numbers LIMIT 5;
+SELECT 'dictGetHierarchy';
+SELECT dictGetHierarchy('01765_db.hashed_dictionary_simple_key_hierarchy', toUInt64(1));
+SELECT dictGetHierarchy('01765_db.hashed_dictionary_simple_key_hierarchy', toUInt64(4));
+
+DROP DICTIONARY 01765_db.hashed_dictionary_simple_key_hierarchy;
+
+CREATE DICTIONARY 01765_db.sparse_hashed_dictionary_simple_key_hierarchy
+(
+   id UInt64,
+   parent_id UInt64 HIERARCHICAL
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'simple_key_hierarchy_table'))
+LIFETIME(MIN 1 MAX 1000)
+LAYOUT(HASHED());
+
+SELECT 'Dictionary sparse_hashed_dictionary_simple_key_hierarchy';
+SELECT 'dictGet';
+SELECT dictGet('01765_db.sparse_hashed_dictionary_simple_key_hierarchy', 'parent_id', number) FROM system.numbers LIMIT 5;
+SELECT 'dictGetHierarchy';
+SELECT dictGetHierarchy('01765_db.sparse_hashed_dictionary_simple_key_hierarchy', toUInt64(1));
+SELECT dictGetHierarchy('01765_db.sparse_hashed_dictionary_simple_key_hierarchy', toUInt64(4));
+
+DROP DICTIONARY 01765_db.sparse_hashed_dictionary_simple_key_hierarchy;
+
+DROP TABLE 01765_db.simple_key_hierarchy_table;
+
+DROP DATABASE 01765_db;
diff --git a/tests/queries/0_stateless/01765_move_to_table_overlapping_block_number.reference b/tests/queries/0_stateless/01765_move_to_table_overlapping_block_number.reference
new file mode 100644
index 00000000000..a07ed155918
--- /dev/null
+++ b/tests/queries/0_stateless/01765_move_to_table_overlapping_block_number.reference
@@ -0,0 +1,4 @@
+1	1	1_1_1_0
+1	2	1_2_2_0
+1	3	1_3_3_0
+1	4	1_4_4_0
diff --git a/tests/queries/0_stateless/01765_move_to_table_overlapping_block_number.sql b/tests/queries/0_stateless/01765_move_to_table_overlapping_block_number.sql
new file mode 100644
index 00000000000..ea00c573c74
--- /dev/null
+++ b/tests/queries/0_stateless/01765_move_to_table_overlapping_block_number.sql
@@ -0,0 +1,20 @@
+DROP TABLE IF EXISTS t_src;
+DROP TABLE IF EXISTS t_dst;
+
+CREATE TABLE t_src (id UInt32, v UInt32) ENGINE = MergeTree ORDER BY id PARTITION BY id;
+CREATE TABLE t_dst (id UInt32, v UInt32) ENGINE = MergeTree ORDER BY id PARTITION BY id;
+
+SYSTEM STOP MERGES t_src;
+SYSTEM STOP MERGES t_dst;
+
+INSERT INTO t_dst VALUES (1, 1);
+INSERT INTO t_dst VALUES (1, 2);
+INSERT INTO t_dst VALUES (1, 3);
+
+INSERT INTO t_src VALUES (1, 4);
+
+ALTER TABLE t_src MOVE PARTITION 1 TO TABLE t_dst;
+SELECT *, _part FROM t_dst ORDER BY v;
+
+DROP TABLE t_src;
+DROP TABLE t_dst;
diff --git a/tests/queries/0_stateless/01765_tehran_dst.reference b/tests/queries/0_stateless/01765_tehran_dst.reference
new file mode 100644
index 00000000000..61f5403e5e5
--- /dev/null
+++ b/tests/queries/0_stateless/01765_tehran_dst.reference
@@ -0,0 +1,2 @@
+2021-03-22 23:15:11
+2020-03-21 23:00:00
diff --git a/tests/queries/0_stateless/01765_tehran_dst.sql b/tests/queries/0_stateless/01765_tehran_dst.sql
new file mode 100644
index 00000000000..41b92ae2360
--- /dev/null
+++ b/tests/queries/0_stateless/01765_tehran_dst.sql
@@ -0,0 +1,2 @@
+SELECT toTimeZone(toDateTime('2021-03-22 18:45:11', 'UTC'), 'Asia/Tehran');
+SELECT toDateTime('2020-03-21 23:00:00', 'Asia/Tehran');
diff --git a/tests/queries/0_stateless/01766_hashed_dictionary_complex_key.reference b/tests/queries/0_stateless/01766_hashed_dictionary_complex_key.reference
new file mode 100644
index 00000000000..12c210581c2
--- /dev/null
+++ b/tests/queries/0_stateless/01766_hashed_dictionary_complex_key.reference
@@ -0,0 +1,56 @@
+Dictionary hashed_dictionary_complex_key_simple_attributes
+dictGet existing value
+value_0	value_second_0
+value_1	value_second_1
+value_2	value_second_2
+dictGet with non existing value
+value_0	value_second_0
+value_1	value_second_1
+value_2	value_second_2
+value_first_default	value_second_default
+dictGetOrDefault existing value
+value_0	value_second_0
+value_1	value_second_1
+value_2	value_second_2
+dictGetOrDefault non existing value
+value_0	value_second_0
+value_1	value_second_1
+value_2	value_second_2
+default	default
+dictHas
+1
+1
+1
+0
+select all values as input stream
+0	id_key_0	value_0	value_second_0
+1	id_key_1	value_1	value_second_1
+2	id_key_2	value_2	value_second_2
+Dictionary hashed_dictionary_complex_key_complex_attributes
+dictGet existing value
+value_0	value_second_0
+value_1	\N
+value_2	value_second_2
+dictGet with non existing value
+value_0	value_second_0
+value_1	\N
+value_2	value_second_2
+value_first_default	value_second_default
+dictGetOrDefault existing value
+value_0	value_second_0
+value_1	\N
+value_2	value_second_2
+dictGetOrDefault non existing value
+value_0	value_second_0
+value_1	\N
+value_2	value_second_2
+default	default
+dictHas
+1
+1
+1
+0
+select all values as input stream
+0	id_key_0	value_0	value_second_0
+1	id_key_1	value_1	\N
+2	id_key_2	value_2	value_second_2
diff --git a/tests/queries/0_stateless/01766_hashed_dictionary_complex_key.sql b/tests/queries/0_stateless/01766_hashed_dictionary_complex_key.sql
new file mode 100644
index 00000000000..de7ab5b5a1a
--- /dev/null
+++ b/tests/queries/0_stateless/01766_hashed_dictionary_complex_key.sql
@@ -0,0 +1,98 @@
+DROP DATABASE IF EXISTS 01766_db;
+CREATE DATABASE 01766_db;
+
+CREATE TABLE 01766_db.complex_key_simple_attributes_source_table
+(
+   id UInt64,
+   id_key String,
+   value_first String,
+   value_second String
+)
+ENGINE = TinyLog;
+
+INSERT INTO 01766_db.complex_key_simple_attributes_source_table VALUES(0, 'id_key_0', 'value_0', 'value_second_0');
+INSERT INTO 01766_db.complex_key_simple_attributes_source_table VALUES(1, 'id_key_1', 'value_1', 'value_second_1');
+INSERT INTO 01766_db.complex_key_simple_attributes_source_table VALUES(2, 'id_key_2', 'value_2', 'value_second_2');
+
+CREATE DICTIONARY 01766_db.hashed_dictionary_complex_key_simple_attributes
+(
+   id UInt64,
+   id_key String,
+   value_first String DEFAULT 'value_first_default',
+   value_second String DEFAULT 'value_second_default'
+)
+PRIMARY KEY id, id_key
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'complex_key_simple_attributes_source_table' DB '01766_db'))
+LIFETIME(MIN 1 MAX 1000)
+LAYOUT(COMPLEX_KEY_HASHED());
+
+SELECT 'Dictionary hashed_dictionary_complex_key_simple_attributes';
+SELECT 'dictGet existing value';
+SELECT dictGet('01766_db.hashed_dictionary_complex_key_simple_attributes', 'value_first', (number, concat('id_key_', toString(number)))) as value_first,
+    dictGet('01766_db.hashed_dictionary_complex_key_simple_attributes', 'value_second', (number, concat('id_key_', toString(number)))) as value_second FROM system.numbers LIMIT 3;
+SELECT 'dictGet with non existing value';
+SELECT dictGet('01766_db.hashed_dictionary_complex_key_simple_attributes', 'value_first', (number, concat('id_key_', toString(number)))) as value_first,
+    dictGet('01766_db.hashed_dictionary_complex_key_simple_attributes', 'value_second', (number, concat('id_key_', toString(number)))) as value_second FROM system.numbers LIMIT 4;
+SELECT 'dictGetOrDefault existing value';
+SELECT dictGetOrDefault('01766_db.hashed_dictionary_complex_key_simple_attributes', 'value_first', (number, concat('id_key_', toString(number))), toString('default')) as value_first,
+    dictGetOrDefault('01766_db.hashed_dictionary_complex_key_simple_attributes', 'value_second', (number, concat('id_key_', toString(number))), toString('default')) as value_second FROM system.numbers LIMIT 3;
+SELECT 'dictGetOrDefault non existing value';
+SELECT dictGetOrDefault('01766_db.hashed_dictionary_complex_key_simple_attributes', 'value_first', (number, concat('id_key_', toString(number))), toString('default')) as value_first,
+    dictGetOrDefault('01766_db.hashed_dictionary_complex_key_simple_attributes', 'value_second', (number, concat('id_key_', toString(number))), toString('default')) as value_second FROM system.numbers LIMIT 4;
+SELECT 'dictHas';
+SELECT dictHas('01766_db.hashed_dictionary_complex_key_simple_attributes', (number, concat('id_key_', toString(number)))) FROM system.numbers LIMIT 4;
+SELECT 'select all values as input stream';
+SELECT * FROM 01766_db.hashed_dictionary_complex_key_simple_attributes ORDER BY (id, id_key);
+
+DROP DICTIONARY 01766_db.hashed_dictionary_complex_key_simple_attributes;
+
+DROP TABLE 01766_db.complex_key_simple_attributes_source_table;
+
+CREATE TABLE 01766_db.complex_key_complex_attributes_source_table
+(
+   id UInt64,
+   id_key String,
+   value_first String,
+   value_second Nullable(String)
+)
+ENGINE = TinyLog;
+
+INSERT INTO 01766_db.complex_key_complex_attributes_source_table VALUES(0, 'id_key_0', 'value_0', 'value_second_0');
+INSERT INTO 01766_db.complex_key_complex_attributes_source_table VALUES(1, 'id_key_1', 'value_1', NULL);
+INSERT INTO 01766_db.complex_key_complex_attributes_source_table VALUES(2, 'id_key_2', 'value_2', 'value_second_2');
+
+CREATE DICTIONARY 01766_db.hashed_dictionary_complex_key_complex_attributes
+(
+    id UInt64,
+    id_key String,
+
+    value_first String DEFAULT 'value_first_default',
+    value_second Nullable(String) DEFAULT 'value_second_default'
+)
+PRIMARY KEY id, id_key
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'complex_key_complex_attributes_source_table' DB '01766_db'))
+LIFETIME(MIN 1 MAX 1000)
+LAYOUT(COMPLEX_KEY_HASHED());
+
+SELECT 'Dictionary hashed_dictionary_complex_key_complex_attributes';
+SELECT 'dictGet existing value';
+SELECT dictGet('01766_db.hashed_dictionary_complex_key_complex_attributes', 'value_first', (number, concat('id_key_', toString(number)))) as value_first,
+    dictGet('01766_db.hashed_dictionary_complex_key_complex_attributes', 'value_second', (number, concat('id_key_', toString(number)))) as value_second FROM system.numbers LIMIT 3;
+SELECT 'dictGet with non existing value';
+SELECT dictGet('01766_db.hashed_dictionary_complex_key_complex_attributes', 'value_first', (number, concat('id_key_', toString(number)))) as value_first,
+    dictGet('01766_db.hashed_dictionary_complex_key_complex_attributes', 'value_second', (number, concat('id_key_', toString(number)))) as value_second FROM system.numbers LIMIT 4;
+SELECT 'dictGetOrDefault existing value';
+SELECT dictGetOrDefault('01766_db.hashed_dictionary_complex_key_complex_attributes', 'value_first', (number, concat('id_key_', toString(number))), toString('default')) as value_first,
+    dictGetOrDefault('01766_db.hashed_dictionary_complex_key_complex_attributes', 'value_second', (number, concat('id_key_', toString(number))), toString('default')) as value_second FROM system.numbers LIMIT 3;
+SELECT 'dictGetOrDefault non existing value';
+SELECT dictGetOrDefault('01766_db.hashed_dictionary_complex_key_complex_attributes', 'value_first', (number, concat('id_key_', toString(number))), toString('default')) as value_first,
+    dictGetOrDefault('01766_db.hashed_dictionary_complex_key_complex_attributes', 'value_second', (number, concat('id_key_', toString(number))), toString('default')) as value_second FROM system.numbers LIMIT 4;
+SELECT 'dictHas';
+SELECT dictHas('01766_db.hashed_dictionary_complex_key_complex_attributes', (number, concat('id_key_', toString(number)))) FROM system.numbers LIMIT 4;
+SELECT 'select all values as input stream';
+SELECT * FROM 01766_db.hashed_dictionary_complex_key_complex_attributes ORDER BY (id, id_key);
+
+DROP DICTIONARY 01766_db.hashed_dictionary_complex_key_complex_attributes;
+DROP TABLE 01766_db.complex_key_complex_attributes_source_table;
+
+DROP DATABASE 01766_db;
diff --git a/tests/queries/0_stateless/01766_todatetime64_no_timezone_arg.reference b/tests/queries/0_stateless/01766_todatetime64_no_timezone_arg.reference
new file mode 100644
index 00000000000..52eea094ae4
--- /dev/null
+++ b/tests/queries/0_stateless/01766_todatetime64_no_timezone_arg.reference
@@ -0,0 +1 @@
+2021-03-22 00:00:00.000
diff --git a/tests/queries/0_stateless/01766_todatetime64_no_timezone_arg.sql b/tests/queries/0_stateless/01766_todatetime64_no_timezone_arg.sql
new file mode 100644
index 00000000000..99141a694c1
--- /dev/null
+++ b/tests/queries/0_stateless/01766_todatetime64_no_timezone_arg.sql
@@ -0,0 +1 @@
+SELECT toDateTime64('2021-03-22', 3);
diff --git a/tests/queries/0_stateless/01767_timezoneOf.reference b/tests/queries/0_stateless/01767_timezoneOf.reference
new file mode 100644
index 00000000000..0a8a8c32d4e
--- /dev/null
+++ b/tests/queries/0_stateless/01767_timezoneOf.reference
@@ -0,0 +1 @@
+Asia/Tehran	Asia/Tehran	Asia/Tehran	Africa/Accra	Pacific/Pitcairn
diff --git a/tests/queries/0_stateless/01767_timezoneOf.sh b/tests/queries/0_stateless/01767_timezoneOf.sh
new file mode 100755
index 00000000000..9dee051ee3f
--- /dev/null
+++ b/tests/queries/0_stateless/01767_timezoneOf.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+TZ=Asia/Tehran $CLICKHOUSE_LOCAL --query "SELECT timezone(), timezoneOf(now()), timeZone(), timeZoneOf(toTimezone(toNullable(now()), 'Africa/Accra')), timeZoneOf(toTimeZone(now64(3), 'Pacific/Pitcairn'))"
diff --git a/tests/queries/0_stateless/01768_extended_range.reference b/tests/queries/0_stateless/01768_extended_range.reference
new file mode 100644
index 00000000000..1436eeae43a
--- /dev/null
+++ b/tests/queries/0_stateless/01768_extended_range.reference
@@ -0,0 +1,3 @@
+1968
+-473
+1990-01-01
diff --git a/tests/queries/0_stateless/01768_extended_range.sql b/tests/queries/0_stateless/01768_extended_range.sql
new file mode 100644
index 00000000000..4acaccd1399
--- /dev/null
+++ b/tests/queries/0_stateless/01768_extended_range.sql
@@ -0,0 +1,4 @@
+SELECT toYear(toDateTime64('1968-12-12 11:22:33', 0, 'UTC'));
+SELECT toInt16(toRelativeWeekNum(toDateTime64('1960-11-30 18:00:11.999', 3, 'UTC')));
+SELECT toStartOfQuarter(toDateTime64('1990-01-04 12:14:12', 0, 'UTC'));
+SELECT toUnixTimestamp(toDateTime64('1900-12-12 11:22:33', 0, 'UTC')); -- { serverError 407 }
diff --git a/tests/queries/0_stateless/01769_extended_range_2.reference b/tests/queries/0_stateless/01769_extended_range_2.reference
new file mode 100644
index 00000000000..e9c4e1d8604
--- /dev/null
+++ b/tests/queries/0_stateless/01769_extended_range_2.reference
@@ -0,0 +1,3 @@
+1969-12-31 18:00:12
+1969-12-30 18:00:12
+1969-12-31 18:00:12
diff --git a/tests/queries/0_stateless/01769_extended_range_2.sql b/tests/queries/0_stateless/01769_extended_range_2.sql
new file mode 100644
index 00000000000..a2570c9397b
--- /dev/null
+++ b/tests/queries/0_stateless/01769_extended_range_2.sql
@@ -0,0 +1,3 @@
+SELECT toDateTime64('1969-12-31 18:00:12', 0, 'America/Phoenix');
+SELECT toDateTime64('1969-12-30 18:00:12', 0, 'America/Phoenix');
+SELECT toDateTime64('1969-12-31 18:00:12', 0, 'Europe/Moscow');
diff --git a/tests/queries/0_stateless/01770_add_months_ubsan.reference b/tests/queries/0_stateless/01770_add_months_ubsan.reference
new file mode 100644
index 00000000000..573541ac970
--- /dev/null
+++ b/tests/queries/0_stateless/01770_add_months_ubsan.reference
@@ -0,0 +1 @@
+0
diff --git a/tests/queries/0_stateless/01770_add_months_ubsan.sql b/tests/queries/0_stateless/01770_add_months_ubsan.sql
new file mode 100644
index 00000000000..039434ff9bc
--- /dev/null
+++ b/tests/queries/0_stateless/01770_add_months_ubsan.sql
@@ -0,0 +1,2 @@
+-- Result does not make sense but UBSan report should not be triggered.
+SELECT ignore(now() + INTERVAL 9223372036854775807 MONTH);
diff --git a/tests/queries/0_stateless/01770_extended_range_3.reference b/tests/queries/0_stateless/01770_extended_range_3.reference
new file mode 100644
index 00000000000..1a35ee6cc1e
--- /dev/null
+++ b/tests/queries/0_stateless/01770_extended_range_3.reference
@@ -0,0 +1,2 @@
+1984-04-01 08:00:00
+1985-03-31 09:00:00
diff --git a/tests/queries/0_stateless/01770_extended_range_3.sql b/tests/queries/0_stateless/01770_extended_range_3.sql
new file mode 100644
index 00000000000..68e0782d3d5
--- /dev/null
+++ b/tests/queries/0_stateless/01770_extended_range_3.sql
@@ -0,0 +1,2 @@
+SELECT addHours(toDateTime64('1984-03-31 23:00:00', 0, 'Asia/Novosibirsk'), 8);
+SELECT addHours(toDateTime64('1985-03-31 00:00:00', 0, 'Asia/Novosibirsk'), 8);
diff --git a/tests/queries/0_stateless/01771_bloom_filter_not_has.reference b/tests/queries/0_stateless/01771_bloom_filter_not_has.reference
new file mode 100644
index 00000000000..fc08c4c0d15
--- /dev/null
+++ b/tests/queries/0_stateless/01771_bloom_filter_not_has.reference
@@ -0,0 +1,3 @@
+10000000
+1
+9999999
diff --git a/tests/queries/0_stateless/01771_bloom_filter_not_has.sql b/tests/queries/0_stateless/01771_bloom_filter_not_has.sql
new file mode 100644
index 00000000000..ab0e3d308f9
--- /dev/null
+++ b/tests/queries/0_stateless/01771_bloom_filter_not_has.sql
@@ -0,0 +1,7 @@
+DROP TABLE IF EXISTS bloom_filter_null_array;
+CREATE TABLE bloom_filter_null_array (v Array(Int32), INDEX idx v TYPE bloom_filter GRANULARITY 3) ENGINE = MergeTree() ORDER BY v;
+INSERT INTO bloom_filter_null_array SELECT [number] FROM numbers(10000000);
+SELECT COUNT() FROM bloom_filter_null_array;
+SELECT COUNT() FROM bloom_filter_null_array WHERE has(v, 0);
+SELECT COUNT() FROM bloom_filter_null_array WHERE not has(v, 0);
+DROP TABLE bloom_filter_null_array;
diff --git a/tests/queries/0_stateless/01771_datetime64_no_time_part.reference b/tests/queries/0_stateless/01771_datetime64_no_time_part.reference
new file mode 100644
index 00000000000..c13116eeefe
--- /dev/null
+++ b/tests/queries/0_stateless/01771_datetime64_no_time_part.reference
@@ -0,0 +1 @@
+1985-03-31 00:00:00
diff --git a/tests/queries/0_stateless/01771_datetime64_no_time_part.sql b/tests/queries/0_stateless/01771_datetime64_no_time_part.sql
new file mode 100644
index 00000000000..debf4783eb8
--- /dev/null
+++ b/tests/queries/0_stateless/01771_datetime64_no_time_part.sql
@@ -0,0 +1 @@
+SELECT toDateTime64('1985-03-31', 0, 'Europe/Helsinki');
diff --git a/tests/queries/0_stateless/01772_intdiv_minus_one_ubsan.reference b/tests/queries/0_stateless/01772_intdiv_minus_one_ubsan.reference
new file mode 100644
index 00000000000..6b764d18a4d
--- /dev/null
+++ b/tests/queries/0_stateless/01772_intdiv_minus_one_ubsan.reference
@@ -0,0 +1,10 @@
+-9223372036854775807
+-9223372036854775808
+9223372036854775807
+9223372036854775806
+9223372036854775805
+9223372036854775804
+9223372036854775803
+9223372036854775802
+9223372036854775801
+9223372036854775800
diff --git a/tests/queries/0_stateless/01772_intdiv_minus_one_ubsan.sql b/tests/queries/0_stateless/01772_intdiv_minus_one_ubsan.sql
new file mode 100644
index 00000000000..20b4f585182
--- /dev/null
+++ b/tests/queries/0_stateless/01772_intdiv_minus_one_ubsan.sql
@@ -0,0 +1 @@
+SELECT intDiv(toInt64(number), -1) FROM numbers(9223372036854775807, 10);
diff --git a/tests/queries/0_stateless/01772_to_start_of_hour_align.reference b/tests/queries/0_stateless/01772_to_start_of_hour_align.reference
new file mode 100644
index 00000000000..f130df3bef5
--- /dev/null
+++ b/tests/queries/0_stateless/01772_to_start_of_hour_align.reference
@@ -0,0 +1,86 @@
+2021-03-23 00:00:00
+2021-03-23 11:00:00
+2021-03-23 22:00:00
+2021-03-23 13:00:00
+2021-03-23 12:00:00
+2021-03-23 00:00:00
+2010-03-28 00:00:00	2010-03-28 00:00:00	1269723600
+2010-03-28 00:15:00	2010-03-28 00:00:00	1269724500
+2010-03-28 00:30:00	2010-03-28 00:00:00	1269725400
+2010-03-28 00:45:00	2010-03-28 00:00:00	1269726300
+2010-03-28 01:00:00	2010-03-28 00:00:00	1269727200
+2010-03-28 01:15:00	2010-03-28 00:00:00	1269728100
+2010-03-28 01:30:00	2010-03-28 00:00:00	1269729000
+2010-03-28 01:45:00	2010-03-28 00:00:00	1269729900
+2010-03-28 03:00:00	2010-03-28 03:00:00	1269730800
+2010-03-28 03:15:00	2010-03-28 03:00:00	1269731700
+2010-03-28 03:30:00	2010-03-28 03:00:00	1269732600
+2010-03-28 03:45:00	2010-03-28 03:00:00	1269733500
+2010-03-28 04:00:00	2010-03-28 04:00:00	1269734400
+2010-03-28 04:15:00	2010-03-28 04:00:00	1269735300
+2010-03-28 04:30:00	2010-03-28 04:00:00	1269736200
+2010-03-28 04:45:00	2010-03-28 04:00:00	1269737100
+2010-03-28 05:00:00	2010-03-28 04:00:00	1269738000
+2010-03-28 05:15:00	2010-03-28 04:00:00	1269738900
+2010-03-28 05:30:00	2010-03-28 04:00:00	1269739800
+2010-03-28 05:45:00	2010-03-28 04:00:00	1269740700
+2010-10-31 00:00:00	2010-10-31 00:00:00	1288468800
+2010-10-31 00:15:00	2010-10-31 00:00:00	1288469700
+2010-10-31 00:30:00	2010-10-31 00:00:00	1288470600
+2010-10-31 00:45:00	2010-10-31 00:00:00	1288471500
+2010-10-31 01:00:00	2010-10-31 00:00:00	1288472400
+2010-10-31 01:15:00	2010-10-31 00:00:00	1288473300
+2010-10-31 01:30:00	2010-10-31 00:00:00	1288474200
+2010-10-31 01:45:00	2010-10-31 00:00:00	1288475100
+2010-10-31 02:00:00	2010-10-31 02:00:00	1288476000
+2010-10-31 02:15:00	2010-10-31 02:00:00	1288476900
+2010-10-31 02:30:00	2010-10-31 02:00:00	1288477800
+2010-10-31 02:45:00	2010-10-31 02:00:00	1288478700
+2010-10-31 02:00:00	2010-10-31 02:00:00	1288479600
+2010-10-31 02:15:00	2010-10-31 02:00:00	1288480500
+2010-10-31 02:30:00	2010-10-31 02:00:00	1288481400
+2010-10-31 02:45:00	2010-10-31 02:00:00	1288482300
+2010-10-31 03:00:00	2010-10-31 02:00:00	1288483200
+2010-10-31 03:15:00	2010-10-31 02:00:00	1288484100
+2010-10-31 03:30:00	2010-10-31 02:00:00	1288485000
+2010-10-31 03:45:00	2010-10-31 02:00:00	1288485900
+2020-04-05 00:00:00	2020-04-05 00:00:00	1586005200
+2020-04-05 00:15:00	2020-04-05 00:00:00	1586006100
+2020-04-05 00:30:00	2020-04-05 00:00:00	1586007000
+2020-04-05 00:45:00	2020-04-05 00:00:00	1586007900
+2020-04-05 01:00:00	2020-04-05 00:00:00	1586008800
+2020-04-05 01:15:00	2020-04-05 00:00:00	1586009700
+2020-04-05 01:30:00	2020-04-05 00:00:00	1586010600
+2020-04-05 01:45:00	2020-04-05 00:00:00	1586011500
+2020-04-05 01:30:00	2020-04-05 00:00:00	1586012400
+2020-04-05 01:45:00	2020-04-05 00:00:00	1586013300
+2020-04-05 02:00:00	2020-04-05 02:00:00	1586014200
+2020-04-05 02:15:00	2020-04-05 02:00:00	1586015100
+2020-04-05 02:30:00	2020-04-05 02:00:00	1586016000
+2020-04-05 02:45:00	2020-04-05 02:00:00	1586016900
+2020-04-05 03:00:00	2020-04-05 02:00:00	1586017800
+2020-04-05 03:15:00	2020-04-05 02:00:00	1586018700
+2020-04-05 03:30:00	2020-04-05 02:00:00	1586019600
+2020-04-05 03:45:00	2020-04-05 02:00:00	1586020500
+2020-04-05 04:00:00	2020-04-05 04:00:00	1586021400
+2020-04-05 04:15:00	2020-04-05 04:00:00	1586022300
+2020-10-04 00:00:00	2020-10-04 00:00:00	1601731800
+2020-10-04 00:15:00	2020-10-04 00:00:00	1601732700
+2020-10-04 00:30:00	2020-10-04 00:00:00	1601733600
+2020-10-04 00:45:00	2020-10-04 00:00:00	1601734500
+2020-10-04 01:00:00	2020-10-04 00:00:00	1601735400
+2020-10-04 01:15:00	2020-10-04 00:00:00	1601736300
+2020-10-04 01:30:00	2020-10-04 00:00:00	1601737200
+2020-10-04 01:45:00	2020-10-04 00:00:00	1601738100
+2020-10-04 02:30:00	2020-10-04 02:30:00	1601739000
+2020-10-04 02:45:00	2020-10-04 02:30:00	1601739900
+2020-10-04 03:00:00	2020-10-04 02:30:00	1601740800
+2020-10-04 03:15:00	2020-10-04 02:30:00	1601741700
+2020-10-04 03:30:00	2020-10-04 02:30:00	1601742600
+2020-10-04 03:45:00	2020-10-04 02:30:00	1601743500
+2020-10-04 04:00:00	2020-10-04 04:00:00	1601744400
+2020-10-04 04:15:00	2020-10-04 04:00:00	1601745300
+2020-10-04 04:30:00	2020-10-04 04:00:00	1601746200
+2020-10-04 04:45:00	2020-10-04 04:00:00	1601747100
+2020-10-04 05:00:00	2020-10-04 04:00:00	1601748000
+2020-10-04 05:15:00	2020-10-04 04:00:00	1601748900
diff --git a/tests/queries/0_stateless/01772_to_start_of_hour_align.sql b/tests/queries/0_stateless/01772_to_start_of_hour_align.sql
new file mode 100644
index 00000000000..6d1bb460f90
--- /dev/null
+++ b/tests/queries/0_stateless/01772_to_start_of_hour_align.sql
@@ -0,0 +1,21 @@
+-- Rounding down to hour intervals is aligned to midnight even if the interval length does not divide the whole day.
+SELECT toStartOfInterval(toDateTime('2021-03-23 03:58:00'), INTERVAL 11 HOUR);
+SELECT toStartOfInterval(toDateTime('2021-03-23 13:58:00'), INTERVAL 11 HOUR);
+SELECT toStartOfInterval(toDateTime('2021-03-23 23:58:00'), INTERVAL 11 HOUR);
+
+-- It should work correctly even in timezones with non-whole hours offset. India have +05:30.
+SELECT toStartOfHour(toDateTime('2021-03-23 13:58:00', 'Asia/Kolkata'));
+SELECT toStartOfInterval(toDateTime('2021-03-23 13:58:00', 'Asia/Kolkata'), INTERVAL 6 HOUR);
+
+-- Specifying the interval longer than 24 hours is not correct, but it works as expected by just rounding to midnight.
+SELECT toStartOfInterval(toDateTime('2021-03-23 13:58:00', 'Asia/Kolkata'), INTERVAL 66 HOUR);
+
+-- In case of timezone shifts, rounding is performed to the hour number on "wall clock" time.
+-- The intervals may become shorter or longer due to time shifts. For example, the three hour interval may actually last two hours.
+-- If the same hour number on "wall clock" time correspond to multiple time points due to shifting backwards, the unspecified time point is selected among the candidates.
+SELECT toDateTime('2010-03-28 00:00:00', 'Europe/Moscow') + INTERVAL 15 * number MINUTE AS src, toStartOfInterval(src, INTERVAL 2 HOUR) AS rounded, toUnixTimestamp(src) AS t FROM numbers(20);
+SELECT toDateTime('2010-10-31 00:00:00', 'Europe/Moscow') + INTERVAL 15 * number MINUTE AS src, toStartOfInterval(src, INTERVAL 2 HOUR) AS rounded, toUnixTimestamp(src) AS t FROM numbers(20);
+
+-- And this should work even for non whole number of hours shifts.
+SELECT toDateTime('2020-04-05 00:00:00', 'Australia/Lord_Howe') + INTERVAL 15 * number MINUTE AS src, toStartOfInterval(src, INTERVAL 2 HOUR) AS rounded, toUnixTimestamp(src) AS t FROM numbers(20);
+SELECT toDateTime('2020-10-04 00:00:00', 'Australia/Lord_Howe') + INTERVAL 15 * number MINUTE AS src, toStartOfInterval(src, INTERVAL 2 HOUR) AS rounded, toUnixTimestamp(src) AS t FROM numbers(20);
diff --git a/tests/queries/0_stateless/01773_case_sensitive_version.reference b/tests/queries/0_stateless/01773_case_sensitive_version.reference
new file mode 100644
index 00000000000..72749c905a3
--- /dev/null
+++ b/tests/queries/0_stateless/01773_case_sensitive_version.reference
@@ -0,0 +1 @@
+1	1	1
diff --git a/tests/queries/0_stateless/01773_case_sensitive_version.sql b/tests/queries/0_stateless/01773_case_sensitive_version.sql
new file mode 100644
index 00000000000..27fa1c27b2a
--- /dev/null
+++ b/tests/queries/0_stateless/01773_case_sensitive_version.sql
@@ -0,0 +1 @@
+SELECT version()=Version(), VERSION()=Version(), vErSiOn()=VeRsIoN();
diff --git a/tests/queries/0_stateless/01773_datetime64_add_ubsan.reference b/tests/queries/0_stateless/01773_datetime64_add_ubsan.reference
new file mode 100644
index 00000000000..aa47d0d46d4
--- /dev/null
+++ b/tests/queries/0_stateless/01773_datetime64_add_ubsan.reference
@@ -0,0 +1,2 @@
+0
+0
diff --git a/tests/queries/0_stateless/01773_datetime64_add_ubsan.sql b/tests/queries/0_stateless/01773_datetime64_add_ubsan.sql
new file mode 100644
index 00000000000..f7267f2b6b4
--- /dev/null
+++ b/tests/queries/0_stateless/01773_datetime64_add_ubsan.sql
@@ -0,0 +1,2 @@
+-- The result is unspecified but UBSan should not argue.
+SELECT ignore(addHours(now64(3), inf)) FROM numbers(2);
diff --git a/tests/queries/0_stateless/01773_min_max_time_system_parts_datetime64.reference b/tests/queries/0_stateless/01773_min_max_time_system_parts_datetime64.reference
new file mode 100644
index 00000000000..1cea52ec1c2
--- /dev/null
+++ b/tests/queries/0_stateless/01773_min_max_time_system_parts_datetime64.reference
@@ -0,0 +1,2 @@
+2000-01-02 03:04:05	2001-02-03 04:05:06
+2000-01-02 03:04:05	2001-02-03 04:05:06
diff --git a/tests/queries/0_stateless/01773_min_max_time_system_parts_datetime64.sql b/tests/queries/0_stateless/01773_min_max_time_system_parts_datetime64.sql
new file mode 100644
index 00000000000..5a1f809b03b
--- /dev/null
+++ b/tests/queries/0_stateless/01773_min_max_time_system_parts_datetime64.sql
@@ -0,0 +1,9 @@
+DROP TABLE IF EXISTS test;
+CREATE TABLE test (time DateTime64(3)) ENGINE = MergeTree ORDER BY tuple() PARTITION BY toStartOfInterval(time, INTERVAL 2 YEAR);
+
+INSERT INTO test VALUES ('2000-01-02 03:04:05.123'), ('2001-02-03 04:05:06.789');
+
+SELECT min_time, max_time FROM system.parts WHERE table = 'test' AND database = currentDatabase();
+SELECT min_time, max_time FROM system.parts_columns WHERE table = 'test' AND database = currentDatabase();
+
+DROP TABLE test;
diff --git a/tests/queries/0_stateless/01774_bar_with_illegal_value.reference b/tests/queries/0_stateless/01774_bar_with_illegal_value.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01774_bar_with_illegal_value.sql b/tests/queries/0_stateless/01774_bar_with_illegal_value.sql
new file mode 100644
index 00000000000..60c7f303c13
--- /dev/null
+++ b/tests/queries/0_stateless/01774_bar_with_illegal_value.sql
@@ -0,0 +1 @@
+SELECT greatCircleAngle(1048575, 257, -9223372036854775808, 1048576) - NULL, bar(7, -inf, 1024); -- { serverError 36 } 
diff --git a/tests/queries/0_stateless/01774_case_sensitive_connection_id.reference b/tests/queries/0_stateless/01774_case_sensitive_connection_id.reference
new file mode 100644
index 00000000000..95bea1a178c
--- /dev/null
+++ b/tests/queries/0_stateless/01774_case_sensitive_connection_id.reference
@@ -0,0 +1 @@
+0	0	0	0	0	0
diff --git a/tests/queries/0_stateless/01774_case_sensitive_connection_id.sql b/tests/queries/0_stateless/01774_case_sensitive_connection_id.sql
new file mode 100644
index 00000000000..5a4f2b5853a
--- /dev/null
+++ b/tests/queries/0_stateless/01774_case_sensitive_connection_id.sql
@@ -0,0 +1 @@
+SELECT connection_id(), CONNECTION_ID(), CoNnEcTiOn_Id(), connectionid(), CONNECTIONID(), CoNnEcTiOnId();
diff --git a/tests/queries/0_stateless/01774_ip_address_in_range.reference b/tests/queries/0_stateless/01774_ip_address_in_range.reference
new file mode 100644
index 00000000000..b2f282d2183
--- /dev/null
+++ b/tests/queries/0_stateless/01774_ip_address_in_range.reference
@@ -0,0 +1,46 @@
+# Invocation with constants
+1
+0
+1
+0
+# Invocation with non-constant addresses
+192.168.99.255	192.168.100.0/22	0
+192.168.100.1	192.168.100.0/22	1
+192.168.103.255	192.168.100.0/22	1
+192.168.104.0	192.168.100.0/22	0
+::192.168.99.255	::192.168.100.0/118	0
+::192.168.100.1	::192.168.100.0/118	1
+::192.168.103.255	::192.168.100.0/118	1
+::192.168.104.0	::192.168.100.0/118	0
+# Invocation with non-constant prefixes
+192.168.100.1	192.168.100.0/22	1
+192.168.100.1	192.168.100.0/24	1
+192.168.100.1	192.168.100.0/32	0
+::192.168.100.1	::192.168.100.0/118	1
+::192.168.100.1	::192.168.100.0/120	1
+::192.168.100.1	::192.168.100.0/128	0
+# Invocation with non-constants
+192.168.100.1	192.168.100.0/22	1
+192.168.100.1	192.168.100.0/24	1
+192.168.103.255	192.168.100.0/22	1
+192.168.103.255	192.168.100.0/24	0
+::192.168.100.1	::192.168.100.0/118	1
+::192.168.100.1	::192.168.100.0/120	1
+::192.168.103.255	::192.168.100.0/118	1
+::192.168.103.255	::192.168.100.0/120	0
+# Check with dense table
+1
+1
+1
+1
+1
+1
+1
+1
+# Mismatching IP versions is not an error.
+0
+0
+0
+0
+# Unparsable arguments
+# Wrong argument types
diff --git a/tests/queries/0_stateless/01774_ip_address_in_range.sql b/tests/queries/0_stateless/01774_ip_address_in_range.sql
new file mode 100644
index 00000000000..29c2bcb220d
--- /dev/null
+++ b/tests/queries/0_stateless/01774_ip_address_in_range.sql
@@ -0,0 +1,64 @@
+SELECT '# Invocation with constants';
+
+SELECT isIPAddressInRange('127.0.0.1', '127.0.0.0/8');
+SELECT isIPAddressInRange('128.0.0.1', '127.0.0.0/8');
+
+SELECT isIPAddressInRange('ffff::1', 'ffff::/16');
+SELECT isIPAddressInRange('fffe::1', 'ffff::/16');
+
+SELECT '# Invocation with non-constant addresses';
+
+WITH arrayJoin(['192.168.99.255', '192.168.100.1', '192.168.103.255', '192.168.104.0']) as addr, '192.168.100.0/22' as prefix SELECT addr, prefix, isIPAddressInRange(addr, prefix);
+WITH arrayJoin(['::192.168.99.255', '::192.168.100.1', '::192.168.103.255', '::192.168.104.0']) as addr, '::192.168.100.0/118' as prefix SELECT addr, prefix, isIPAddressInRange(addr, prefix);
+
+SELECT '# Invocation with non-constant prefixes';
+
+WITH '192.168.100.1' as addr, arrayJoin(['192.168.100.0/22', '192.168.100.0/24', '192.168.100.0/32']) as prefix SELECT addr, prefix, isIPAddressInRange(addr, prefix);
+WITH '::192.168.100.1' as addr, arrayJoin(['::192.168.100.0/118', '::192.168.100.0/120', '::192.168.100.0/128']) as prefix SELECT addr, prefix, isIPAddressInRange(addr, prefix);
+
+SELECT '# Invocation with non-constants';
+
+WITH arrayJoin(['192.168.100.1', '192.168.103.255']) as addr, arrayJoin(['192.168.100.0/22', '192.168.100.0/24']) as prefix SELECT addr, prefix, isIPAddressInRange(addr, prefix);
+WITH arrayJoin(['::192.168.100.1', '::192.168.103.255']) as addr, arrayJoin(['::192.168.100.0/118', '::192.168.100.0/120']) as prefix SELECT addr, prefix, isIPAddressInRange(addr, prefix);
+
+SELECT '# Check with dense table';
+
+DROP TABLE IF EXISTS test_data;
+CREATE TABLE test_data (cidr String) ENGINE = Memory;
+
+INSERT INTO test_data
+SELECT
+    IPv4NumToString(IPv4CIDRToRange(IPv4StringToNum('255.255.255.255'), toUInt8(number)).1) || '/' || toString(number) AS cidr
+FROM system.numbers LIMIT 33;
+
+SELECT sum(isIPAddressInRange('0.0.0.0', cidr)) == 1 FROM test_data;
+SELECT sum(isIPAddressInRange('127.0.0.0', cidr)) == 1 FROM test_data;
+SELECT sum(isIPAddressInRange('128.0.0.0', cidr)) == 2 FROM test_data;
+SELECT sum(isIPAddressInRange('255.0.0.0', cidr)) == 9 FROM test_data;
+SELECT sum(isIPAddressInRange('255.0.0.1', cidr)) == 9 FROM test_data;
+SELECT sum(isIPAddressInRange('255.0.0.255', cidr)) == 9 FROM test_data;
+SELECT sum(isIPAddressInRange('255.255.255.255', cidr)) == 33 FROM test_data;
+SELECT sum(isIPAddressInRange('255.255.255.254', cidr)) == 32 FROM test_data;
+
+DROP TABLE IF EXISTS test_data;
+
+SELECT '# Mismatching IP versions is not an error.';
+
+SELECT isIPAddressInRange('127.0.0.1', 'ffff::/16');
+SELECT isIPAddressInRange('127.0.0.1', '::127.0.0.1/128');
+SELECT isIPAddressInRange('::1', '127.0.0.0/8');
+SELECT isIPAddressInRange('::127.0.0.1', '127.0.0.1/32');
+
+SELECT '# Unparsable arguments';
+
+SELECT isIPAddressInRange('unparsable', '127.0.0.0/8'); -- { serverError 6 }
+SELECT isIPAddressInRange('127.0.0.1', 'unparsable'); -- { serverError 6 }
+
+SELECT '# Wrong argument types';
+
+SELECT isIPAddressInRange(100, '127.0.0.0/8'); -- { serverError 43 }
+SELECT isIPAddressInRange(NULL, '127.0.0.0/8'); -- { serverError 43 }
+SELECT isIPAddressInRange(CAST(NULL, 'Nullable(String)'), '127.0.0.0/8'); -- { serverError 43 }
+SELECT isIPAddressInRange('127.0.0.1', 100); -- { serverError 43 }
+SELECT isIPAddressInRange(100, NULL); -- { serverError 43 }
+WITH arrayJoin([NULL, NULL, NULL, NULL]) AS prefix SELECT isIPAddressInRange([NULL, NULL, 0, 255, 0], prefix); -- { serverError 43 }
diff --git a/tests/queries/0_stateless/01774_tuple_null_in.reference b/tests/queries/0_stateless/01774_tuple_null_in.reference
new file mode 100644
index 00000000000..aa47d0d46d4
--- /dev/null
+++ b/tests/queries/0_stateless/01774_tuple_null_in.reference
@@ -0,0 +1,2 @@
+0
+0
diff --git a/tests/queries/0_stateless/01774_tuple_null_in.sql b/tests/queries/0_stateless/01774_tuple_null_in.sql
new file mode 100644
index 00000000000..a9cc39e8840
--- /dev/null
+++ b/tests/queries/0_stateless/01774_tuple_null_in.sql
@@ -0,0 +1,2 @@
+SELECT (NULL, NULL) = (8, 0) OR (NULL, NULL) = (3, 2) OR (NULL, NULL) = (0, 0) OR (NULL, NULL) = (3, 1);
+SELECT (NULL, NULL) IN ((NULL, 0), (3, 1), (3, 2), (8, 0), (NULL, NULL));
diff --git a/tests/queries/0_stateless/01776_decrypt_aead_size_check.reference b/tests/queries/0_stateless/01776_decrypt_aead_size_check.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01776_decrypt_aead_size_check.sql b/tests/queries/0_stateless/01776_decrypt_aead_size_check.sql
new file mode 100644
index 00000000000..8730ed0eda2
--- /dev/null
+++ b/tests/queries/0_stateless/01776_decrypt_aead_size_check.sql
@@ -0,0 +1 @@
+SELECT decrypt('aes-128-gcm', 'text', 'key', 'IV'); -- { serverError 36 }
diff --git a/tests/queries/0_stateless/01777_map_populate_series_ubsan.reference b/tests/queries/0_stateless/01777_map_populate_series_ubsan.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01777_map_populate_series_ubsan.sql b/tests/queries/0_stateless/01777_map_populate_series_ubsan.sql
new file mode 100644
index 00000000000..5a8c182425a
--- /dev/null
+++ b/tests/queries/0_stateless/01777_map_populate_series_ubsan.sql
@@ -0,0 +1,2 @@
+-- Should correctly throw exception about overflow:
+SELECT mapPopulateSeries([-9223372036854775808, toUInt32(2)], [toUInt32(1023), -1]); -- { serverError 128 }
diff --git a/tests/queries/0_stateless/01778_hierarchical_dictionaries.reference b/tests/queries/0_stateless/01778_hierarchical_dictionaries.reference
new file mode 100644
index 00000000000..5fe5f5f1db6
--- /dev/null
+++ b/tests/queries/0_stateless/01778_hierarchical_dictionaries.reference
@@ -0,0 +1,102 @@
+Flat dictionary
+Get hierarchy
+[]
+[1]
+[2,1]
+[3,1]
+[4,2,1]
+[]
+Get is in hierarchy
+0
+1
+1
+1
+1
+0
+Get children
+[1]
+[2,3]
+[4]
+[]
+[]
+[]
+Get all descendants
+[1,2,3,4]
+[2,3,4]
+[4]
+[]
+[]
+[]
+Get descendants at first level
+[1]
+[2,3]
+[4]
+[]
+[]
+[]
+Hashed dictionary
+Get hierarchy
+[]
+[1]
+[2,1]
+[3,1]
+[4,2,1]
+[]
+Get is in hierarchy
+0
+1
+1
+1
+1
+0
+Get children
+[1]
+[3,2]
+[4]
+[]
+[]
+[]
+Get all descendants
+[1,3,2,4]
+[3,2,4]
+[4]
+[]
+[]
+[]
+Get descendants at first level
+[1]
+[3,2]
+[4]
+[]
+[]
+[]
+Cache dictionary
+Get hierarchy
+[]
+[1]
+[2,1]
+[3,1]
+[4,2,1]
+[]
+Get is in hierarchy
+0
+1
+1
+1
+1
+0
+Direct dictionary
+Get hierarchy
+[]
+[1]
+[2,1]
+[3,1]
+[4,2,1]
+[]
+Get is in hierarchy
+0
+1
+1
+1
+1
+0
diff --git a/tests/queries/0_stateless/01778_hierarchical_dictionaries.sql b/tests/queries/0_stateless/01778_hierarchical_dictionaries.sql
new file mode 100644
index 00000000000..f6e1a7c9375
--- /dev/null
+++ b/tests/queries/0_stateless/01778_hierarchical_dictionaries.sql
@@ -0,0 +1,95 @@
+DROP DATABASE IF EXISTS 01778_db;
+CREATE DATABASE 01778_db;
+
+CREATE TABLE 01778_db.hierarchy_source_table (id UInt64, parent_id UInt64) ENGINE = TinyLog;
+INSERT INTO 01778_db.hierarchy_source_table VALUES (1, 0), (2, 1), (3, 1), (4, 2);
+
+CREATE DICTIONARY 01778_db.hierarchy_flat_dictionary
+(
+    id UInt64,
+    parent_id UInt64 HIERARCHICAL
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'hierarchy_source_table' DB '01778_db'))
+LAYOUT(FLAT())
+LIFETIME(MIN 1 MAX 1000);
+
+SELECT 'Flat dictionary';
+
+SELECT 'Get hierarchy';
+SELECT dictGetHierarchy('01778_db.hierarchy_flat_dictionary', number) FROM system.numbers LIMIT 6;
+SELECT 'Get is in hierarchy';
+SELECT dictIsIn('01778_db.hierarchy_flat_dictionary', number, number) FROM system.numbers LIMIT 6;
+SELECT 'Get children';
+SELECT dictGetChildren('01778_db.hierarchy_flat_dictionary', number) FROM system.numbers LIMIT 6;
+SELECT 'Get all descendants';
+SELECT dictGetDescendants('01778_db.hierarchy_flat_dictionary', number) FROM system.numbers LIMIT 6;
+SELECT 'Get descendants at first level';
+SELECT dictGetDescendants('01778_db.hierarchy_flat_dictionary', number, 1) FROM system.numbers LIMIT 6;
+
+DROP DICTIONARY 01778_db.hierarchy_flat_dictionary;
+
+CREATE DICTIONARY 01778_db.hierarchy_hashed_dictionary
+(
+    id UInt64,
+    parent_id UInt64 HIERARCHICAL
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'hierarchy_source_table' DB '01778_db'))
+LAYOUT(HASHED())
+LIFETIME(MIN 1 MAX 1000);
+
+SELECT 'Hashed dictionary';
+
+SELECT 'Get hierarchy';
+SELECT dictGetHierarchy('01778_db.hierarchy_hashed_dictionary', number) FROM system.numbers LIMIT 6;
+SELECT 'Get is in hierarchy';
+SELECT dictIsIn('01778_db.hierarchy_hashed_dictionary', number, number) FROM system.numbers LIMIT 6;
+SELECT 'Get children';
+SELECT dictGetChildren('01778_db.hierarchy_hashed_dictionary', number) FROM system.numbers LIMIT 6;
+SELECT 'Get all descendants';
+SELECT dictGetDescendants('01778_db.hierarchy_hashed_dictionary', number) FROM system.numbers LIMIT 6;
+SELECT 'Get descendants at first level';
+SELECT dictGetDescendants('01778_db.hierarchy_hashed_dictionary', number, 1) FROM system.numbers LIMIT 6;
+
+DROP DICTIONARY 01778_db.hierarchy_hashed_dictionary;
+
+CREATE DICTIONARY 01778_db.hierarchy_cache_dictionary
+(
+    id UInt64,
+    parent_id UInt64 HIERARCHICAL
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'hierarchy_source_table' DB '01778_db'))
+LAYOUT(CACHE(SIZE_IN_CELLS 10))
+LIFETIME(MIN 1 MAX 1000);
+
+SELECT 'Cache dictionary';
+
+SELECT 'Get hierarchy';
+SELECT dictGetHierarchy('01778_db.hierarchy_cache_dictionary', number) FROM system.numbers LIMIT 6;
+SELECT 'Get is in hierarchy';
+SELECT dictIsIn('01778_db.hierarchy_cache_dictionary', number, number) FROM system.numbers LIMIT 6;
+
+DROP DICTIONARY 01778_db.hierarchy_cache_dictionary;
+
+CREATE DICTIONARY 01778_db.hierarchy_direct_dictionary
+(
+    id UInt64,
+    parent_id UInt64 HIERARCHICAL
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'hierarchy_source_table' DB '01778_db'))
+LAYOUT(DIRECT());
+
+SELECT 'Direct dictionary';
+
+SELECT 'Get hierarchy';
+SELECT dictGetHierarchy('01778_db.hierarchy_direct_dictionary', number) FROM system.numbers LIMIT 6;
+SELECT 'Get is in hierarchy';
+SELECT dictIsIn('01778_db.hierarchy_direct_dictionary', number, number) FROM system.numbers LIMIT 6;
+
+DROP DICTIONARY 01778_db.hierarchy_direct_dictionary;
+
+DROP TABLE 01778_db.hierarchy_source_table;
+DROP DATABASE 01778_db;
diff --git a/tests/queries/0_stateless/01778_mmap_cache_infra.reference b/tests/queries/0_stateless/01778_mmap_cache_infra.reference
new file mode 100644
index 00000000000..0e82b277bc1
--- /dev/null
+++ b/tests/queries/0_stateless/01778_mmap_cache_infra.reference
@@ -0,0 +1,6 @@
+CreatedReadBufferMMap
+CreatedReadBufferMMapFailed
+MMappedFileCacheHits
+MMappedFileCacheMisses
+MMappedFileBytes
+MMappedFiles
diff --git a/tests/queries/0_stateless/01778_mmap_cache_infra.sql b/tests/queries/0_stateless/01778_mmap_cache_infra.sql
new file mode 100644
index 00000000000..29a84c5507b
--- /dev/null
+++ b/tests/queries/0_stateless/01778_mmap_cache_infra.sql
@@ -0,0 +1,7 @@
+-- We check the existence of queries and metrics and don't check the results (a smoke test).
+
+SYSTEM DROP MMAP CACHE;
+
+SET system_events_show_zero_values = 1;
+SELECT event FROM system.events WHERE event LIKE '%MMap%' ORDER BY event;
+SELECT metric FROM system.metrics WHERE metric LIKE '%MMap%' ORDER BY metric;
diff --git a/tests/queries/0_stateless/01778_test_LowCardinality_FixedString_pk.reference b/tests/queries/0_stateless/01778_test_LowCardinality_FixedString_pk.reference
new file mode 100644
index 00000000000..a134ce52c11
--- /dev/null
+++ b/tests/queries/0_stateless/01778_test_LowCardinality_FixedString_pk.reference
@@ -0,0 +1,3 @@
+100
+100
+100
diff --git a/tests/queries/0_stateless/01778_test_LowCardinality_FixedString_pk.sql b/tests/queries/0_stateless/01778_test_LowCardinality_FixedString_pk.sql
new file mode 100644
index 00000000000..1a0a1d35f76
--- /dev/null
+++ b/tests/queries/0_stateless/01778_test_LowCardinality_FixedString_pk.sql
@@ -0,0 +1,21 @@
+DROP TABLE IF EXISTS test_01778;
+
+CREATE TABLE test_01778
+(
+    `key` LowCardinality(FixedString(3)),
+    `d` date
+)
+ENGINE = MergeTree(d, key, 8192);
+
+
+INSERT INTO test_01778 SELECT toString(intDiv(number,8000)), today() FROM numbers(100000);
+INSERT INTO test_01778 SELECT toString('xxx'), today() FROM numbers(100);
+
+SELECT count() FROM test_01778 WHERE key = 'xxx';
+
+SELECT count() FROM test_01778 WHERE key = toFixedString('xxx', 3);
+
+SELECT count() FROM test_01778 WHERE toString(key) = 'xxx';
+
+DROP TABLE test_01778;
+
diff --git a/tests/queries/0_stateless/01778_where_with_column_name.reference b/tests/queries/0_stateless/01778_where_with_column_name.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01778_where_with_column_name.sql b/tests/queries/0_stateless/01778_where_with_column_name.sql
new file mode 100644
index 00000000000..effde87f018
--- /dev/null
+++ b/tests/queries/0_stateless/01778_where_with_column_name.sql
@@ -0,0 +1,5 @@
+DROP TABLE IF EXISTS ttt01778;
+CREATE TABLE ttt01778 (`1` String, `2` INT) ENGINE = MergeTree() ORDER BY tuple();
+INSERT INTO ttt01778 values('1',1),('2',2),('3',3);
+select * from ttt01778 where 1=2; -- no server error
+DROP TABLE ttt01778;
diff --git a/tests/queries/0_stateless/01779_quantile_deterministic_msan.reference b/tests/queries/0_stateless/01779_quantile_deterministic_msan.reference
new file mode 100644
index 00000000000..b432de6ddb3
--- /dev/null
+++ b/tests/queries/0_stateless/01779_quantile_deterministic_msan.reference
@@ -0,0 +1 @@
+11447494982455782708
diff --git a/tests/queries/0_stateless/01779_quantile_deterministic_msan.sql b/tests/queries/0_stateless/01779_quantile_deterministic_msan.sql
new file mode 100644
index 00000000000..ef4234da306
--- /dev/null
+++ b/tests/queries/0_stateless/01779_quantile_deterministic_msan.sql
@@ -0,0 +1 @@
+SELECT cityHash64(toString(quantileDeterministicState(number, sipHash64(number)))) FROM numbers(8193);
diff --git a/tests/queries/0_stateless/01780_clickhouse_dictionary_source_loop.reference b/tests/queries/0_stateless/01780_clickhouse_dictionary_source_loop.reference
new file mode 100644
index 00000000000..0cfb83aa2f2
--- /dev/null
+++ b/tests/queries/0_stateless/01780_clickhouse_dictionary_source_loop.reference
@@ -0,0 +1,3 @@
+1	1
+2	2
+3	3
diff --git a/tests/queries/0_stateless/01780_clickhouse_dictionary_source_loop.sql b/tests/queries/0_stateless/01780_clickhouse_dictionary_source_loop.sql
new file mode 100644
index 00000000000..5673e646a47
--- /dev/null
+++ b/tests/queries/0_stateless/01780_clickhouse_dictionary_source_loop.sql
@@ -0,0 +1,53 @@
+DROP DATABASE IF EXISTS 01780_db;
+CREATE DATABASE 01780_db;
+
+DROP DICTIONARY IF EXISTS dict1;
+CREATE DICTIONARY dict1
+(
+    id UInt64,
+    value String
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT 9000 TABLE 'dict1'))
+LAYOUT(DIRECT());
+
+SELECT * FROM dict1; --{serverError 36}
+
+DROP DICTIONARY dict1;
+
+DROP DICTIONARY IF EXISTS dict2;
+CREATE DICTIONARY 01780_db.dict2
+(
+    id UInt64,
+    value String
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT 9000 DATABASE '01780_db' TABLE 'dict2'))
+LAYOUT(DIRECT());
+
+SELECT * FROM 01780_db.dict2; --{serverError 36}
+DROP DICTIONARY 01780_db.dict2;
+
+DROP TABLE IF EXISTS 01780_db.dict3_source;
+CREATE TABLE 01780_db.dict3_source
+(
+    id UInt64,
+    value String
+) ENGINE = TinyLog;
+
+INSERT INTO 01780_db.dict3_source VALUES (1, '1'), (2, '2'), (3, '3');
+
+CREATE DICTIONARY 01780_db.dict3
+(
+    id UInt64,
+    value String
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT 9000 TABLE 'dict3_source' DATABASE '01780_db'))
+LAYOUT(DIRECT());
+
+SELECT * FROM 01780_db.dict3;
+
+DROP DICTIONARY 01780_db.dict3;
+
+DROP DATABASE 01780_db;
diff --git a/tests/queries/0_stateless/01780_dict_get_or_null.reference b/tests/queries/0_stateless/01780_dict_get_or_null.reference
new file mode 100644
index 00000000000..4baca9ec91b
--- /dev/null
+++ b/tests/queries/0_stateless/01780_dict_get_or_null.reference
@@ -0,0 +1,18 @@
+Simple key dictionary dictGetOrNull
+0	0	\N	\N	(NULL,NULL)
+1	1	First	First	('First','First')
+2	1	Second	\N	('Second',NULL)
+3	1	Third	Third	('Third','Third')
+4	0	\N	\N	(NULL,NULL)
+Complex key dictionary dictGetOrNull
+(0,'key')	0	\N	\N	(NULL,NULL)
+(1,'key')	1	First	First	('First','First')
+(2,'key')	1	Second	\N	('Second',NULL)
+(3,'key')	1	Third	Third	('Third','Third')
+(4,'key')	0	\N	\N	(NULL,NULL)
+Range key dictionary dictGetOrNull
+(0,'2019-05-20')	0	\N	\N	(NULL,NULL)
+(1,'2019-05-20')	1	First	First	('First','First')
+(2,'2019-05-20')	1	Second	\N	('Second',NULL)
+(3,'2019-05-20')	1	Third	Third	('Third','Third')
+(4,'2019-05-20')	0	\N	\N	(NULL,NULL)
diff --git a/tests/queries/0_stateless/01780_dict_get_or_null.sql b/tests/queries/0_stateless/01780_dict_get_or_null.sql
new file mode 100644
index 00000000000..f13bcf57d27
--- /dev/null
+++ b/tests/queries/0_stateless/01780_dict_get_or_null.sql
@@ -0,0 +1,116 @@
+DROP TABLE IF EXISTS simple_key_dictionary_source_table;
+CREATE TABLE simple_key_dictionary_source_table
+(
+    id UInt64,
+    value String,
+    value_nullable Nullable(String)
+) ENGINE = TinyLog;
+
+INSERT INTO simple_key_dictionary_source_table VALUES (1, 'First', 'First');
+INSERT INTO simple_key_dictionary_source_table VALUES (2, 'Second', NULL);
+INSERT INTO simple_key_dictionary_source_table VALUES (3, 'Third', 'Third');
+
+DROP DICTIONARY IF EXISTS simple_key_dictionary;
+CREATE DICTIONARY simple_key_dictionary
+(
+    id UInt64,
+    value String,
+    value_nullable Nullable(String)
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() TABLE 'simple_key_dictionary_source_table'))
+LAYOUT(DIRECT());
+
+SELECT 'Simple key dictionary dictGetOrNull';
+
+SELECT
+    number,
+    dictHas('simple_key_dictionary', number),
+    dictGetOrNull('simple_key_dictionary', 'value', number),
+    dictGetOrNull('simple_key_dictionary', 'value_nullable', number),
+    dictGetOrNull('simple_key_dictionary', ('value', 'value_nullable'), number)
+FROM system.numbers LIMIT 5;
+
+DROP DICTIONARY simple_key_dictionary;
+DROP TABLE simple_key_dictionary_source_table;
+
+DROP TABLE IF EXISTS complex_key_dictionary_source_table;
+CREATE TABLE complex_key_dictionary_source_table
+(
+    id UInt64,
+    id_key String,
+    value String,
+    value_nullable Nullable(String)
+) ENGINE = TinyLog;
+
+INSERT INTO complex_key_dictionary_source_table VALUES (1, 'key', 'First', 'First');
+INSERT INTO complex_key_dictionary_source_table VALUES (2, 'key', 'Second', NULL);
+INSERT INTO complex_key_dictionary_source_table VALUES (3, 'key', 'Third', 'Third');
+
+DROP DICTIONARY IF EXISTS complex_key_dictionary;
+CREATE DICTIONARY complex_key_dictionary
+(
+    id UInt64,
+    id_key String,
+    value String,
+    value_nullable Nullable(String)
+)
+PRIMARY KEY id, id_key
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() TABLE 'complex_key_dictionary_source_table'))
+LAYOUT(COMPLEX_KEY_DIRECT());
+
+SELECT 'Complex key dictionary dictGetOrNull';
+
+SELECT
+    (number, 'key'),
+    dictHas('complex_key_dictionary', (number, 'key')),
+    dictGetOrNull('complex_key_dictionary', 'value', (number, 'key')),
+    dictGetOrNull('complex_key_dictionary', 'value_nullable', (number, 'key')),
+    dictGetOrNull('complex_key_dictionary', ('value', 'value_nullable'), (number, 'key'))
+FROM system.numbers LIMIT 5;
+
+DROP DICTIONARY complex_key_dictionary;
+DROP TABLE complex_key_dictionary_source_table;
+
+DROP TABLE IF EXISTS range_key_dictionary_source_table;
+CREATE TABLE range_key_dictionary_source_table
+(
+    key UInt64,
+    start_date Date,
+    end_date Date,
+    value String,
+    value_nullable Nullable(String)
+)
+ENGINE = TinyLog();
+
+INSERT INTO range_key_dictionary_source_table VALUES(1, toDate('2019-05-20'), toDate('2019-05-20'), 'First', 'First');
+INSERT INTO range_key_dictionary_source_table VALUES(2, toDate('2019-05-20'), toDate('2019-05-20'), 'Second', NULL);
+INSERT INTO range_key_dictionary_source_table VALUES(3, toDate('2019-05-20'), toDate('2019-05-20'), 'Third', 'Third');
+
+DROP DICTIONARY IF EXISTS range_key_dictionary;
+CREATE DICTIONARY range_key_dictionary
+(
+    key UInt64,
+    start_date Date,
+    end_date Date,
+    value String,
+    value_nullable Nullable(String)
+)
+PRIMARY KEY key
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() TABLE 'range_key_dictionary_source_table'))
+LIFETIME(MIN 1 MAX 1000)
+LAYOUT(RANGE_HASHED())
+RANGE(MIN start_date MAX end_date);
+
+SELECT 'Range key dictionary dictGetOrNull';
+
+SELECT
+    (number, toDate('2019-05-20')),
+    dictHas('range_key_dictionary', number, toDate('2019-05-20')),
+    dictGetOrNull('range_key_dictionary', 'value', number, toDate('2019-05-20')),
+    dictGetOrNull('range_key_dictionary', 'value_nullable', number, toDate('2019-05-20')),
+    dictGetOrNull('range_key_dictionary', ('value', 'value_nullable'), number, toDate('2019-05-20'))
+FROM system.numbers LIMIT 5;
+
+DROP DICTIONARY range_key_dictionary;
+DROP TABLE range_key_dictionary_source_table;
diff --git a/tests/queries/0_stateless/01780_range_msan.reference b/tests/queries/0_stateless/01780_range_msan.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01780_range_msan.sql b/tests/queries/0_stateless/01780_range_msan.sql
new file mode 100644
index 00000000000..dd0a35c3eea
--- /dev/null
+++ b/tests/queries/0_stateless/01780_range_msan.sql
@@ -0,0 +1 @@
+SELECT range(toUInt256(1), 1); -- { serverError 44 }
diff --git a/tests/queries/0_stateless/01781_map_op_ubsan.reference b/tests/queries/0_stateless/01781_map_op_ubsan.reference
new file mode 100644
index 00000000000..030c8bb5ab4
--- /dev/null
+++ b/tests/queries/0_stateless/01781_map_op_ubsan.reference
@@ -0,0 +1 @@
+\N	(([0,10,255],[-9223372036854775808,1025,0]),[255,NULL])	\N	([0,255],3,[-2])	[NULL]
diff --git a/tests/queries/0_stateless/01781_map_op_ubsan.sql b/tests/queries/0_stateless/01781_map_op_ubsan.sql
new file mode 100644
index 00000000000..adbb5d5a8d7
--- /dev/null
+++ b/tests/queries/0_stateless/01781_map_op_ubsan.sql
@@ -0,0 +1 @@
+SELECT toInt32([toUInt8(NULL)], NULL), (mapSubtract(([toUInt8(256), 10], [toInt32(-9223372036854775808), 1025]), ([toUInt8(65535), 0], [toInt16(0.), -9223372036854775808])), [toUInt8(-1), toInt32(([toUInt8(9223372036854775807), -1], [toInt32(255), 65536]), NULL)]), toUInt8(([2, 9223372036854775807], [toFloat32('0.0000065536'), 2]), 9223372036854775807, NULL), ([toUInt8(1024), 255], toUInt8(3), [toInt16(-2)]), [NULL];
diff --git a/tests/queries/0_stateless/01781_merge_tree_deduplication.reference b/tests/queries/0_stateless/01781_merge_tree_deduplication.reference
new file mode 100644
index 00000000000..cb5a3f1ff52
--- /dev/null
+++ b/tests/queries/0_stateless/01781_merge_tree_deduplication.reference
@@ -0,0 +1,85 @@
+1	1
+1	1
+===============
+1	1
+1	1
+2	2
+3	3
+4	4
+===============
+1	1
+1	1
+2	2
+3	3
+4	4
+5	5
+6	6
+7	7
+===============
+1	1
+1	1
+2	2
+3	3
+4	4
+5	5
+6	6
+7	7
+8	8
+9	9
+10	10
+11	11
+12	12
+===============
+10	10
+12	12
+===============
+1	1
+1	1
+2	2
+3	3
+4	4
+5	5
+6	6
+8	8
+9	9
+11	11
+12	12
+===============
+88	11	11
+77	11	11
+77	12	12
+===============
+1	1	33
+1	1	33
+2	2	33
+3	3	33
+===============
+1	1	33
+1	1	33
+1	1	33
+1	1	33
+2	2	33
+3	3	33
+===============
+1	1	33
+1	1	33
+1	1	33
+1	1	33
+1	1	33
+2	2	33
+3	3	33
+===============
+1	1	44
+2	2	44
+3	3	44
+4	4	44
+===============
+1	1
+1	1
+===============
+1	1
+1	1
+1	1
+2	2
+3	3
+4	4
diff --git a/tests/queries/0_stateless/01781_merge_tree_deduplication.sql b/tests/queries/0_stateless/01781_merge_tree_deduplication.sql
new file mode 100644
index 00000000000..236f7b35b80
--- /dev/null
+++ b/tests/queries/0_stateless/01781_merge_tree_deduplication.sql
@@ -0,0 +1,187 @@
+DROP TABLE IF EXISTS merge_tree_deduplication;
+
+CREATE TABLE merge_tree_deduplication
+(
+    key UInt64,
+    value String,
+    part UInt8 DEFAULT 77
+)
+ENGINE=MergeTree()
+ORDER BY key
+PARTITION BY part
+SETTINGS non_replicated_deduplication_window=3;
+
+SYSTEM STOP MERGES merge_tree_deduplication;
+
+INSERT INTO merge_tree_deduplication (key, value) VALUES (1, '1');
+
+SELECT key, value FROM merge_tree_deduplication;
+
+INSERT INTO merge_tree_deduplication (key, value) VALUES (1, '1');
+
+SELECT key, value FROM merge_tree_deduplication;
+
+SELECT '===============';
+
+INSERT INTO merge_tree_deduplication (key, value) VALUES (2, '2');
+
+INSERT INTO merge_tree_deduplication (key, value) VALUES (3, '3');
+
+INSERT INTO merge_tree_deduplication (key, value) VALUES (4, '4');
+
+INSERT INTO merge_tree_deduplication (key, value) VALUES (1, '1');
+
+SELECT key, value FROM merge_tree_deduplication ORDER BY key;
+
+SELECT '===============';
+
+INSERT INTO merge_tree_deduplication (key, value) VALUES (5, '5');
+
+INSERT INTO merge_tree_deduplication (key, value) VALUES (6, '6');
+
+INSERT INTO merge_tree_deduplication (key, value) VALUES (7, '7');
+
+INSERT INTO merge_tree_deduplication (key, value) VALUES (5, '5');
+
+SELECT key, value FROM merge_tree_deduplication ORDER BY key;
+
+SELECT '===============';
+
+INSERT INTO merge_tree_deduplication (key, value) VALUES (8, '8');
+
+INSERT INTO merge_tree_deduplication (key, value) VALUES (9, '9');
+
+INSERT INTO merge_tree_deduplication (key, value) VALUES (10, '10');
+
+INSERT INTO merge_tree_deduplication (key, value) VALUES (11, '11');
+
+INSERT INTO merge_tree_deduplication (key, value) VALUES (12, '12');
+
+INSERT INTO merge_tree_deduplication (key, value) VALUES (10, '10');
+INSERT INTO merge_tree_deduplication (key, value) VALUES (11, '11');
+INSERT INTO merge_tree_deduplication (key, value) VALUES (12, '12');
+
+SELECT key, value FROM merge_tree_deduplication ORDER BY key;
+
+SELECT '===============';
+
+ALTER TABLE merge_tree_deduplication DROP PART '77_9_9_0'; -- some old part
+
+INSERT INTO merge_tree_deduplication (key, value) VALUES (10, '10');
+
+SELECT key, value FROM merge_tree_deduplication WHERE key = 10;
+
+ALTER TABLE merge_tree_deduplication DROP PART '77_13_13_0'; -- fresh part
+
+INSERT INTO merge_tree_deduplication (key, value) VALUES (12, '12');
+
+SELECT key, value FROM merge_tree_deduplication WHERE key = 12;
+
+DETACH TABLE merge_tree_deduplication;
+ATTACH TABLE merge_tree_deduplication;
+
+OPTIMIZE TABLE  merge_tree_deduplication FINAL;
+
+INSERT INTO merge_tree_deduplication (key, value) VALUES (11, '11'); -- deduplicated
+INSERT INTO merge_tree_deduplication (key, value) VALUES (12, '12'); -- deduplicated
+
+SELECT '===============';
+
+SELECT key, value FROM merge_tree_deduplication ORDER BY key;
+
+SELECT '===============';
+
+INSERT INTO merge_tree_deduplication (key, value, part) VALUES (11, '11', 88);
+
+ALTER TABLE merge_tree_deduplication DROP PARTITION 77;
+
+INSERT INTO merge_tree_deduplication (key, value, part) VALUES (11, '11', 88); --deduplicated
+
+INSERT INTO merge_tree_deduplication (key, value) VALUES (11, '11'); -- not deduplicated
+INSERT INTO merge_tree_deduplication (key, value) VALUES (12, '12'); -- not deduplicated
+
+SELECT part, key, value FROM merge_tree_deduplication ORDER BY key;
+
+-- Alters....
+
+ALTER TABLE merge_tree_deduplication MODIFY SETTING non_replicated_deduplication_window = 2;
+
+SELECT '===============';
+
+INSERT INTO merge_tree_deduplication (key, value, part) VALUES (1, '1', 33);
+INSERT INTO merge_tree_deduplication (key, value, part) VALUES (2, '2', 33);
+INSERT INTO merge_tree_deduplication (key, value, part) VALUES (3, '3', 33);
+INSERT INTO merge_tree_deduplication (key, value, part) VALUES (1, '1', 33);
+
+SELECT * FROM merge_tree_deduplication WHERE part = 33 ORDER BY key;
+
+SELECT '===============';
+
+ALTER TABLE merge_tree_deduplication MODIFY SETTING non_replicated_deduplication_window = 0;
+
+INSERT INTO merge_tree_deduplication (key, value, part) VALUES (1, '1', 33);
+INSERT INTO merge_tree_deduplication (key, value, part) VALUES (1, '1', 33);
+
+DETACH TABLE merge_tree_deduplication;
+ATTACH TABLE merge_tree_deduplication;
+
+SELECT * FROM merge_tree_deduplication WHERE part = 33 ORDER BY key;
+
+SELECT '===============';
+
+ALTER TABLE merge_tree_deduplication MODIFY SETTING non_replicated_deduplication_window = 3;
+
+INSERT INTO merge_tree_deduplication (key, value, part) VALUES (1, '1', 33);
+
+SELECT * FROM merge_tree_deduplication WHERE part = 33 ORDER BY key;
+
+SELECT '===============';
+
+INSERT INTO merge_tree_deduplication (key, value, part) VALUES (1, '1', 44);
+INSERT INTO merge_tree_deduplication (key, value, part) VALUES (2, '2', 44);
+INSERT INTO merge_tree_deduplication (key, value, part) VALUES (3, '3', 44);
+INSERT INTO merge_tree_deduplication (key, value, part) VALUES (1, '1', 44);
+
+INSERT INTO merge_tree_deduplication (key, value, part) VALUES (4, '4', 44);
+
+DETACH TABLE merge_tree_deduplication;
+ATTACH TABLE merge_tree_deduplication;
+
+SELECT * FROM merge_tree_deduplication WHERE part = 44 ORDER BY key;
+
+DROP TABLE IF EXISTS merge_tree_deduplication;
+
+SELECT '===============';
+
+DROP TABLE IF EXISTS merge_tree_no_deduplication;
+
+CREATE TABLE merge_tree_no_deduplication
+(
+    key UInt64,
+    value String
+)
+ENGINE=MergeTree()
+ORDER BY key;
+
+INSERT INTO merge_tree_no_deduplication (key, value) VALUES (1, '1');
+INSERT INTO merge_tree_no_deduplication (key, value) VALUES (1, '1');
+
+SELECT * FROM merge_tree_no_deduplication ORDER BY key;
+
+SELECT '===============';
+
+ALTER TABLE merge_tree_no_deduplication MODIFY SETTING non_replicated_deduplication_window = 3;
+
+INSERT INTO merge_tree_no_deduplication (key, value) VALUES (1, '1');
+INSERT INTO merge_tree_no_deduplication (key, value) VALUES (2, '2');
+INSERT INTO merge_tree_no_deduplication (key, value) VALUES (3, '3');
+
+DETACH TABLE merge_tree_no_deduplication;
+ATTACH TABLE merge_tree_no_deduplication;
+
+INSERT INTO merge_tree_no_deduplication (key, value) VALUES (1, '1');
+INSERT INTO merge_tree_no_deduplication (key, value) VALUES (4, '4');
+
+SELECT * FROM merge_tree_no_deduplication ORDER BY key;
+
+DROP TABLE IF EXISTS merge_tree_no_deduplication;
diff --git a/tests/queries/0_stateless/01781_token_extractor_buffer_overflow.reference b/tests/queries/0_stateless/01781_token_extractor_buffer_overflow.reference
new file mode 100644
index 00000000000..aa47d0d46d4
--- /dev/null
+++ b/tests/queries/0_stateless/01781_token_extractor_buffer_overflow.reference
@@ -0,0 +1,2 @@
+0
+0
diff --git a/tests/queries/0_stateless/01781_token_extractor_buffer_overflow.sql b/tests/queries/0_stateless/01781_token_extractor_buffer_overflow.sql
new file mode 100644
index 00000000000..4cc216955b3
--- /dev/null
+++ b/tests/queries/0_stateless/01781_token_extractor_buffer_overflow.sql
@@ -0,0 +1,10 @@
+SET max_block_size = 10, min_insert_block_size_rows = 0, min_insert_block_size_bytes = 0, max_threads = 20;
+
+DROP TABLE IF EXISTS bloom_filter;
+CREATE TABLE bloom_filter (`id` UInt64, `s` String, INDEX tok_bf (s, lower(s)) TYPE tokenbf_v1(512, 3, 0) GRANULARITY 1) ENGINE = MergeTree ORDER BY id SETTINGS index_granularity = 8;
+INSERT INTO bloom_filter SELECT number, 'yyy,uuu' FROM numbers(1024);
+
+SELECT max(id) FROM bloom_filter WHERE hasToken(s, 'abc');
+SELECT max(id) FROM bloom_filter WHERE hasToken(s, 'abcabcabcabcabcabcabcab\0');
+
+DROP TABLE bloom_filter;
diff --git a/tests/queries/0_stateless/01782_field_oom.reference b/tests/queries/0_stateless/01782_field_oom.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01782_field_oom.sql b/tests/queries/0_stateless/01782_field_oom.sql
new file mode 100644
index 00000000000..2609c589d94
--- /dev/null
+++ b/tests/queries/0_stateless/01782_field_oom.sql
@@ -0,0 +1,2 @@
+SET max_memory_usage = '500M';
+SELECT sumMap([number], [number]) FROM system.numbers_mt; -- { serverError 241 }
diff --git a/tests/queries/0_stateless/01783_http_chunk_size.reference b/tests/queries/0_stateless/01783_http_chunk_size.reference
new file mode 100644
index 00000000000..e454a00607c
--- /dev/null
+++ b/tests/queries/0_stateless/01783_http_chunk_size.reference
@@ -0,0 +1 @@
+1234567890 1234567890 1234567890 1234567890
diff --git a/tests/queries/0_stateless/01783_http_chunk_size.sh b/tests/queries/0_stateless/01783_http_chunk_size.sh
new file mode 100755
index 00000000000..66ac4dfa975
--- /dev/null
+++ b/tests/queries/0_stateless/01783_http_chunk_size.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+URL="${CLICKHOUSE_URL}&session_id=id_${CLICKHOUSE_DATABASE}"
+
+echo "DROP TABLE IF EXISTS table" | ${CLICKHOUSE_CURL} -sSg "${URL}" -d @-
+echo "CREATE TABLE table (a String) ENGINE Memory()" | ${CLICKHOUSE_CURL} -sSg "${URL}" -d @-
+
+# NOTE: suppose that curl sends everything in a single chunk - there are no options to force the chunk-size.
+echo "SET max_query_size=44" | ${CLICKHOUSE_CURL} -sSg "${URL}" -d @-
+echo -ne "INSERT INTO TABLE table FORMAT TabSeparated 1234567890 1234567890 1234567890 1234567890\n" | ${CLICKHOUSE_CURL} -H "Transfer-Encoding: chunked" -sS "${URL}" --data-binary @-
+
+echo "SELECT * from table" | ${CLICKHOUSE_CURL} -sSg "${URL}" -d @-
+echo "DROP TABLE table" | ${CLICKHOUSE_CURL} -sSg "${URL}" -d @-
diff --git a/tests/queries/0_stateless/01783_merge_engine_join_key_condition.reference b/tests/queries/0_stateless/01783_merge_engine_join_key_condition.reference
new file mode 100644
index 00000000000..4068a6e00dd
--- /dev/null
+++ b/tests/queries/0_stateless/01783_merge_engine_join_key_condition.reference
@@ -0,0 +1,5 @@
+3	3
+1	4
+1	4
+1	4
+1	4
diff --git a/tests/queries/0_stateless/01783_merge_engine_join_key_condition.sql b/tests/queries/0_stateless/01783_merge_engine_join_key_condition.sql
new file mode 100644
index 00000000000..372c1bd3572
--- /dev/null
+++ b/tests/queries/0_stateless/01783_merge_engine_join_key_condition.sql
@@ -0,0 +1,23 @@
+DROP TABLE IF EXISTS foo;
+DROP TABLE IF EXISTS foo_merge;
+DROP TABLE IF EXISTS t2;
+
+CREATE TABLE foo(Id Int32, Val Int32) Engine=MergeTree PARTITION BY Val ORDER BY Id;
+INSERT INTO foo SELECT number, number%5 FROM numbers(100000);
+
+CREATE TABLE foo_merge as foo ENGINE=Merge(currentDatabase(), '^foo');
+
+CREATE TABLE t2 (Id Int32, Val Int32, X Int32) Engine=Memory;
+INSERT INTO t2 values (4, 3, 4);
+
+SET force_primary_key = 1, force_index_by_date=1;
+
+SELECT * FROM foo_merge WHERE Val = 3 AND Id = 3;
+SELECT count(), X FROM foo_merge JOIN t2 USING Val WHERE Val = 3 AND Id = 3 AND t2.X == 4 GROUP BY X;
+SELECT count(), X FROM foo_merge JOIN t2 USING Val WHERE Val = 3 AND (Id = 3 AND t2.X == 4) GROUP BY X;
+SELECT count(), X FROM foo_merge JOIN t2 USING Val WHERE Val = 3 AND Id = 3 GROUP BY X;
+SELECT count(), X FROM (SELECT * FROM foo_merge) f JOIN t2 USING Val WHERE Val = 3 AND Id = 3 GROUP BY X;
+
+DROP TABLE IF EXISTS foo;
+DROP TABLE IF EXISTS foo_merge;
+DROP TABLE IF EXISTS t2;
diff --git a/tests/queries/0_stateless/01783_parallel_formatting_memory.reference b/tests/queries/0_stateless/01783_parallel_formatting_memory.reference
new file mode 100644
index 00000000000..c5cdc5cf0bb
--- /dev/null
+++ b/tests/queries/0_stateless/01783_parallel_formatting_memory.reference
@@ -0,0 +1 @@
+Code: 241
diff --git a/tests/queries/0_stateless/01783_parallel_formatting_memory.sh b/tests/queries/0_stateless/01783_parallel_formatting_memory.sh
new file mode 100755
index 00000000000..0b8cb0bc6be
--- /dev/null
+++ b/tests/queries/0_stateless/01783_parallel_formatting_memory.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+$CLICKHOUSE_CURL -sS "$CLICKHOUSE_URL&max_memory_usage=1G" -d "SELECT range(65535) FROM system.one ARRAY JOIN range(65536) AS number" | grep -oF 'Code: 241'
diff --git a/tests/queries/0_stateless/01784_parallel_formatting_memory.reference b/tests/queries/0_stateless/01784_parallel_formatting_memory.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01784_parallel_formatting_memory.sql b/tests/queries/0_stateless/01784_parallel_formatting_memory.sql
new file mode 100644
index 00000000000..35dc063f895
--- /dev/null
+++ b/tests/queries/0_stateless/01784_parallel_formatting_memory.sql
@@ -0,0 +1,2 @@
+SET max_memory_usage = '1G';
+SELECT range(65535) FROM system.one ARRAY JOIN range(65536) AS number; -- { serverError 241 }
diff --git a/tests/queries/0_stateless/01785_dictionary_element_count.reference b/tests/queries/0_stateless/01785_dictionary_element_count.reference
new file mode 100644
index 00000000000..4b79788b4d4
--- /dev/null
+++ b/tests/queries/0_stateless/01785_dictionary_element_count.reference
@@ -0,0 +1,8 @@
+1	First
+simple_key_flat_dictionary	01785_db	1
+1	First
+simple_key_hashed_dictionary	01785_db	1
+1	First
+simple_key_cache_dictionary	01785_db	1
+1	FirstKey	First
+complex_key_hashed_dictionary	01785_db	1
diff --git a/tests/queries/0_stateless/01785_dictionary_element_count.sql b/tests/queries/0_stateless/01785_dictionary_element_count.sql
new file mode 100644
index 00000000000..6db65152a56
--- /dev/null
+++ b/tests/queries/0_stateless/01785_dictionary_element_count.sql
@@ -0,0 +1,91 @@
+DROP DATABASE IF EXISTS 01785_db;
+CREATE DATABASE 01785_db;
+
+DROP TABLE IF EXISTS 01785_db.simple_key_source_table;
+CREATE TABLE 01785_db.simple_key_source_table
+(
+    id UInt64,
+    value String
+) ENGINE = TinyLog();
+
+INSERT INTO 01785_db.simple_key_source_table VALUES (1, 'First');
+INSERT INTO 01785_db.simple_key_source_table VALUES (1, 'First');
+
+DROP DICTIONARY IF EXISTS 01785_db.simple_key_flat_dictionary;
+CREATE DICTIONARY 01785_db.simple_key_flat_dictionary
+(
+    id UInt64,
+    value String
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() DB '01785_db' TABLE 'simple_key_source_table'))
+LAYOUT(FLAT())
+LIFETIME(MIN 0 MAX 1000);
+
+SELECT * FROM 01785_db.simple_key_flat_dictionary;
+SELECT name, database, element_count FROM system.dictionaries WHERE database = '01785_db' AND name = 'simple_key_flat_dictionary';
+
+DROP DICTIONARY 01785_db.simple_key_flat_dictionary;
+
+CREATE DICTIONARY 01785_db.simple_key_hashed_dictionary
+(
+    id UInt64,
+    value String
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() DB '01785_db' TABLE 'simple_key_source_table'))
+LAYOUT(HASHED())
+LIFETIME(MIN 0 MAX 1000);
+
+SELECT * FROM 01785_db.simple_key_hashed_dictionary;
+SELECT name, database, element_count FROM system.dictionaries WHERE database = '01785_db' AND name = 'simple_key_hashed_dictionary';
+
+DROP DICTIONARY 01785_db.simple_key_hashed_dictionary;
+
+CREATE DICTIONARY 01785_db.simple_key_cache_dictionary
+(
+    id UInt64,
+    value String
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() DB '01785_db' TABLE 'simple_key_source_table'))
+LAYOUT(CACHE(SIZE_IN_CELLS 100000))
+LIFETIME(MIN 0 MAX 1000);
+
+SELECT toUInt64(1) as key, dictGet('01785_db.simple_key_cache_dictionary', 'value', key);
+SELECT name, database, element_count FROM system.dictionaries WHERE database = '01785_db' AND name = 'simple_key_cache_dictionary';
+
+DROP DICTIONARY 01785_db.simple_key_cache_dictionary;
+
+DROP TABLE 01785_db.simple_key_source_table;
+
+DROP TABLE IF EXISTS 01785_db.complex_key_source_table;
+CREATE TABLE 01785_db.complex_key_source_table
+(
+    id UInt64,
+    id_key String,
+    value String
+) ENGINE = TinyLog();
+
+INSERT INTO 01785_db.complex_key_source_table VALUES (1, 'FirstKey', 'First');
+INSERT INTO 01785_db.complex_key_source_table VALUES (1, 'FirstKey', 'First');
+
+CREATE DICTIONARY 01785_db.complex_key_hashed_dictionary
+(
+    id UInt64,
+    id_key String,
+    value String
+)
+PRIMARY KEY id, id_key
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() DB '01785_db' TABLE 'complex_key_source_table'))
+LAYOUT(COMPLEX_KEY_HASHED())
+LIFETIME(MIN 0 MAX 1000);
+
+SELECT * FROM 01785_db.complex_key_hashed_dictionary;
+SELECT name, database, element_count FROM system.dictionaries WHERE database = '01785_db' AND name = 'complex_key_hashed_dictionary';
+
+DROP DICTIONARY 01785_db.complex_key_hashed_dictionary;
+
+DROP TABLE 01785_db.complex_key_source_table;
+
+DROP DATABASE 01785_db;
diff --git a/tests/queries/0_stateless/01785_parallel_formatting_memory.reference b/tests/queries/0_stateless/01785_parallel_formatting_memory.reference
new file mode 100644
index 00000000000..0ec7fc54b01
--- /dev/null
+++ b/tests/queries/0_stateless/01785_parallel_formatting_memory.reference
@@ -0,0 +1,2 @@
+Code: 241
+Code: 241
diff --git a/tests/queries/0_stateless/01785_parallel_formatting_memory.sh b/tests/queries/0_stateless/01785_parallel_formatting_memory.sh
new file mode 100755
index 00000000000..6d081c61fd3
--- /dev/null
+++ b/tests/queries/0_stateless/01785_parallel_formatting_memory.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+$CLICKHOUSE_CLIENT --compress 0 --max_memory_usage 1G --query "SELECT range(65535) FROM system.one ARRAY JOIN range(65536) AS number" 2>&1 | grep -oF 'Code: 241' | head -n1
+$CLICKHOUSE_CLIENT --compress 1 --max_memory_usage 1G --query "SELECT range(65535) FROM system.one ARRAY JOIN range(65536) AS number" 2>&1 | grep -oF 'Code: 241' | head -n1
diff --git a/tests/queries/0_stateless/01785_pmj_lc_bug.reference b/tests/queries/0_stateless/01785_pmj_lc_bug.reference
new file mode 100644
index 00000000000..98fb6a68656
--- /dev/null
+++ b/tests/queries/0_stateless/01785_pmj_lc_bug.reference
@@ -0,0 +1,4 @@
+1
+1
+1
+1
diff --git a/tests/queries/0_stateless/01785_pmj_lc_bug.sql b/tests/queries/0_stateless/01785_pmj_lc_bug.sql
new file mode 100644
index 00000000000..722faa9b40d
--- /dev/null
+++ b/tests/queries/0_stateless/01785_pmj_lc_bug.sql
@@ -0,0 +1,14 @@
+SET join_algorithm = 'partial_merge';
+SET max_bytes_in_join = '100';
+
+CREATE TABLE foo_lc (n LowCardinality(String)) ENGINE = Memory;
+CREATE TABLE foo (n String) ENGINE = Memory;
+
+INSERT INTO foo SELECT toString(number) AS n FROM system.numbers LIMIT 1025;
+INSERT INTO foo_lc SELECT toString(number) AS n FROM system.numbers LIMIT 1025;
+
+SELECT 1025 == count(n) FROM foo_lc AS t1 ANY LEFT JOIN foo_lc AS t2 ON t1.n == t2.n;
+SELECT 1025 == count(n) FROM foo AS t1 ANY LEFT JOIN foo_lc AS t2 ON t1.n == t2.n;
+SELECT 1025 == count(n) FROM foo_lc AS t1 ANY LEFT JOIN foo AS t2 ON t1.n == t2.n;
+
+SELECT 1025 == count(n) FROM foo_lc AS t1 ALL LEFT JOIN foo_lc AS t2 ON t1.n == t2.n;
diff --git a/tests/queries/0_stateless/01786_explain_merge_tree.reference b/tests/queries/0_stateless/01786_explain_merge_tree.reference
new file mode 100644
index 00000000000..51eb52688a3
--- /dev/null
+++ b/tests/queries/0_stateless/01786_explain_merge_tree.reference
@@ -0,0 +1,51 @@
+      ReadFromMergeTree
+      Indexes:
+        MinMax
+          Keys: 
+            y
+          Condition: (y in [1, +inf))
+          Parts: 4/5
+          Granules: 11/12
+        Partition
+          Keys: 
+            y
+            bitAnd(z, 3)
+          Condition: and((bitAnd(z, 3) not in [1, 1]), and((y in [1, +inf)), (bitAnd(z, 3) not in [1, 1])))
+          Parts: 3/4
+          Granules: 10/11
+        PrimaryKey
+          Keys: 
+            x
+            y
+          Condition: and((x in [11, +inf)), (y in [1, +inf)))
+          Parts: 2/3
+          Granules: 6/10
+        Skip
+          Name: t_minmax
+          Description: minmax GRANULARITY 2
+          Parts: 1/2
+          Granules: 2/6
+        Skip
+          Name: t_set
+          Description: set GRANULARITY 2
+          Parts: 1/1
+          Granules: 1/2
+-----------------
+          ReadFromMergeTree
+          ReadType: InOrder
+          Parts: 1
+          Granules: 3
+-----------------
+          ReadFromMergeTree
+          ReadType: InReverseOrder
+          Parts: 1
+          Granules: 3
+      ReadFromMergeTree
+      Indexes:
+        PrimaryKey
+          Keys: 
+            x
+            plus(x, y)
+          Condition: or((x in 2-element set), (plus(plus(x, y), 1) in (-inf, 2]))
+          Parts: 1/1
+          Granules: 1/1
diff --git a/tests/queries/0_stateless/01786_explain_merge_tree.sh b/tests/queries/0_stateless/01786_explain_merge_tree.sh
new file mode 100755
index 00000000000..2791d0c6921
--- /dev/null
+++ b/tests/queries/0_stateless/01786_explain_merge_tree.sh
@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+$CLICKHOUSE_CLIENT -q "drop table if exists test_index"
+$CLICKHOUSE_CLIENT -q "drop table if exists idx"
+
+$CLICKHOUSE_CLIENT -q "create table test_index (x UInt32, y UInt32, z UInt32, t UInt32, index t_minmax t % 20 TYPE minmax GRANULARITY 2, index t_set t % 19 type set(4) granularity 2) engine = MergeTree order by (x, y) partition by (y, bitAnd(z, 3), intDiv(t, 15)) settings index_granularity = 2, min_bytes_for_wide_part = 0"
+$CLICKHOUSE_CLIENT -q "insert into test_index select number, number > 3 ? 3 : number, number = 1 ? 1 : 0, number from numbers(20)"
+
+$CLICKHOUSE_CLIENT -q "
+    explain indexes = 1 select *, _part from test_index where t % 19 = 16 and y > 0 and bitAnd(z, 3) != 1 and x > 10 and t % 20 > 14;
+    " | grep -A 100 "ReadFromMergeTree" # | grep -v "Description"
+
+echo "-----------------"
+
+$CLICKHOUSE_CLIENT -q "
+    explain actions = 1 select x from test_index where x > 15 order by x;
+    " | grep -A 100 "ReadFromMergeTree"
+
+echo "-----------------"
+
+$CLICKHOUSE_CLIENT -q "
+    explain actions = 1 select x from test_index where x > 15 order by x desc;
+    " | grep -A 100 "ReadFromMergeTree"
+
+$CLICKHOUSE_CLIENT -q "CREATE TABLE idx (x UInt32, y UInt32, z UInt32) ENGINE = MergeTree ORDER BY (x, x + y) settings min_bytes_for_wide_part = 0"
+$CLICKHOUSE_CLIENT -q "insert into idx select number, number, number from numbers(10)"
+
+$CLICKHOUSE_CLIENT -q "
+    explain indexes = 1 select z from idx where not(x + y + 1 > 2 and x not in (4, 5))
+    " | grep -A 100 "ReadFromMergeTree"
+
+$CLICKHOUSE_CLIENT -q "drop table if exists test_index"
+$CLICKHOUSE_CLIENT -q "drop table if exists idx"
diff --git a/tests/queries/0_stateless/01786_group_by_pk_many_streams.reference b/tests/queries/0_stateless/01786_group_by_pk_many_streams.reference
new file mode 100644
index 00000000000..b8809e746a5
--- /dev/null
+++ b/tests/queries/0_stateless/01786_group_by_pk_many_streams.reference
@@ -0,0 +1,11 @@
+94950
+84950
+74950
+64950
+54950
+=======
+94950
+84950
+74950
+64950
+54950
diff --git a/tests/queries/0_stateless/01786_group_by_pk_many_streams.sql b/tests/queries/0_stateless/01786_group_by_pk_many_streams.sql
new file mode 100644
index 00000000000..e555aa4d6e6
--- /dev/null
+++ b/tests/queries/0_stateless/01786_group_by_pk_many_streams.sql
@@ -0,0 +1,16 @@
+DROP TABLE IF EXISTS group_by_pk;
+
+CREATE TABLE group_by_pk (k UInt64, v UInt64)
+ENGINE = MergeTree ORDER BY k PARTITION BY v % 50;
+
+INSERT INTO group_by_pk SELECT number / 100, number FROM numbers(1000);
+
+SELECT sum(v) AS s FROM group_by_pk GROUP BY k ORDER BY s DESC LIMIT 5
+SETTINGS optimize_aggregation_in_order = 1, max_block_size = 1;
+
+SELECT '=======';
+
+SELECT sum(v) AS s FROM group_by_pk GROUP BY k ORDER BY s DESC LIMIT 5
+SETTINGS optimize_aggregation_in_order = 0, max_block_size = 1;
+
+DROP TABLE IF EXISTS group_by_pk;
diff --git a/tests/queries/0_stateless/01786_nullable_string_tsv_at_eof.reference b/tests/queries/0_stateless/01786_nullable_string_tsv_at_eof.reference
new file mode 100644
index 00000000000..35b388bbafb
--- /dev/null
+++ b/tests/queries/0_stateless/01786_nullable_string_tsv_at_eof.reference
@@ -0,0 +1,6 @@
+1	
+1	
+1	
+1	
+1	
+1	
diff --git a/tests/queries/0_stateless/01786_nullable_string_tsv_at_eof.sh b/tests/queries/0_stateless/01786_nullable_string_tsv_at_eof.sh
new file mode 100755
index 00000000000..f0a663ae409
--- /dev/null
+++ b/tests/queries/0_stateless/01786_nullable_string_tsv_at_eof.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+printf '1\t' | $CLICKHOUSE_LOCAL --query="SELECT * FROM table" --structure='a String, b String'
+printf '1\t' | $CLICKHOUSE_LOCAL --input_format_null_as_default 0 --query="SELECT * FROM table" --structure='a String, b String'
+printf '1\t' | $CLICKHOUSE_LOCAL --input_format_null_as_default 1 --query="SELECT * FROM table" --structure='a String, b String'
+printf '1\t' | $CLICKHOUSE_LOCAL --query="SELECT * FROM table" --structure='a String, b Nullable(String)'
+printf '1\t' | $CLICKHOUSE_LOCAL --input_format_null_as_default 0 --query="SELECT * FROM table" --structure='a String, b Nullable(String)'
+printf '1\t' | $CLICKHOUSE_LOCAL --input_format_null_as_default 1 --query="SELECT * FROM table" --structure='a Nullable(String), b Nullable(String)'
diff --git a/tests/queries/0_stateless/01787_arena_assert_column_nothing.reference b/tests/queries/0_stateless/01787_arena_assert_column_nothing.reference
new file mode 100644
index 00000000000..d00491fd7e5
--- /dev/null
+++ b/tests/queries/0_stateless/01787_arena_assert_column_nothing.reference
@@ -0,0 +1 @@
+1
diff --git a/tests/queries/0_stateless/01787_arena_assert_column_nothing.sql b/tests/queries/0_stateless/01787_arena_assert_column_nothing.sql
new file mode 100644
index 00000000000..de6374a1bc3
--- /dev/null
+++ b/tests/queries/0_stateless/01787_arena_assert_column_nothing.sql
@@ -0,0 +1 @@
+SELECT 1 GROUP BY emptyArrayToSingle(arrayFilter(x -> 1, []));
diff --git a/tests/queries/0_stateless/01787_map_remote.reference b/tests/queries/0_stateless/01787_map_remote.reference
new file mode 100644
index 00000000000..1c488d4418e
--- /dev/null
+++ b/tests/queries/0_stateless/01787_map_remote.reference
@@ -0,0 +1,2 @@
+{'a':1,'b':2}
+{'a':1,'b':2}
diff --git a/tests/queries/0_stateless/01787_map_remote.sql b/tests/queries/0_stateless/01787_map_remote.sql
new file mode 100644
index 00000000000..854eafa0a50
--- /dev/null
+++ b/tests/queries/0_stateless/01787_map_remote.sql
@@ -0,0 +1 @@
+SELECT map('a', 1, 'b', 2) FROM remote('127.0.0.{1,2}', system, one);
\ No newline at end of file
diff --git a/tests/queries/0_stateless/01788_update_nested_type_subcolumn_check.reference b/tests/queries/0_stateless/01788_update_nested_type_subcolumn_check.reference
new file mode 100644
index 00000000000..c6f75cab8b7
--- /dev/null
+++ b/tests/queries/0_stateless/01788_update_nested_type_subcolumn_check.reference
@@ -0,0 +1,21 @@
+1	[100,200]	['aa','bb']	[1,2]
+0	[0,1]	['aa','bb']	[0,0]
+1	[100,200]	['aa','bb']	[1,2]
+2	[100,200,300]	['a','b','c']	[10,20,30]
+3	[3,4]	['aa','bb']	[3,6]
+4	[4,5]	['aa','bb']	[4,8]
+0	[0,1]	['aa','bb']	[0,0]
+1	[100,200]	['aa','bb']	[1,2]
+2	[100,200,300]	['a','b','c']	[100,200,300]
+3	[3,4]	['aa','bb']	[3,6]
+4	[4,5]	['aa','bb']	[4,8]
+0	[0,1]	['aa','bb']	[0,0]
+1	[100,200]	['aa','bb']	[1,2]
+2	[100,200,300]	['a','b','c']	[100,200,300]
+3	[68,72]	['aa','bb']	[68,72]
+4	[4,5]	['aa','bb']	[4,8]
+0	0	aa	0
+1	1	bb	2
+2	2	aa	4
+3	3	aa	6
+4	4	aa	8
diff --git a/tests/queries/0_stateless/01788_update_nested_type_subcolumn_check.sql b/tests/queries/0_stateless/01788_update_nested_type_subcolumn_check.sql
new file mode 100644
index 00000000000..8e850b70c24
--- /dev/null
+++ b/tests/queries/0_stateless/01788_update_nested_type_subcolumn_check.sql
@@ -0,0 +1,70 @@
+DROP TABLE IF EXISTS test_wide_nested;
+
+CREATE TABLE test_wide_nested
+(
+    `id` Int,
+    `info.id` Array(Int),
+    `info.name` Array(String),
+    `info.age` Array(Int)
+)
+ENGINE = MergeTree
+ORDER BY tuple()
+SETTINGS min_bytes_for_wide_part = 0;
+
+set mutations_sync = 1;
+
+INSERT INTO test_wide_nested SELECT number, [number,number + 1], ['aa','bb'], [number,number * 2] FROM numbers(5);
+
+alter table test_wide_nested update `info.id` = [100,200] where id = 1;
+select * from test_wide_nested where id = 1 order by id;
+
+alter table test_wide_nested update `info.id` = [100,200,300], `info.age` = [10,20,30], `info.name` = ['a','b','c'] where id = 2;
+select * from test_wide_nested;
+
+alter table test_wide_nested update `info.id` = [100,200,300], `info.age` = `info.id`, `info.name` = ['a','b','c'] where id = 2;
+select * from test_wide_nested;
+
+alter table test_wide_nested update `info.id` = [100,200], `info.age`=[68,72] where id = 3;
+alter table test_wide_nested update `info.id` = `info.age` where id = 3;
+select * from test_wide_nested;
+
+alter table test_wide_nested update `info.id` = [100,200], `info.age` = [10,20,30], `info.name` = ['a','b','c']  where id = 0; -- { serverError 341 }
+
+-- Recreate table, because KILL MUTATION is not suitable for parallel tests execution.
+DROP TABLE test_wide_nested;
+
+CREATE TABLE test_wide_nested
+(
+    `id` Int,
+    `info.id` Array(Int),
+    `info.name` Array(String),
+    `info.age` Array(Int)
+)
+ENGINE = MergeTree
+ORDER BY tuple()
+SETTINGS min_bytes_for_wide_part = 0;
+
+INSERT INTO test_wide_nested SELECT number, [number,number + 1], ['aa','bb'], [number,number * 2] FROM numbers(5);
+
+alter table test_wide_nested update `info.id` = [100,200,300], `info.age` = [10,20,30] where id = 1; -- { serverError 341 }
+
+DROP TABLE test_wide_nested;
+
+DROP TABLE IF EXISTS test_wide_not_nested;
+
+CREATE TABLE test_wide_not_nested
+(
+  `id` Int,
+  `info.id` Int,
+  `info.name` String,
+  `info.age` Int
+)
+ENGINE = MergeTree
+ORDER BY tuple()
+SETTINGS min_bytes_for_wide_part = 0;
+
+INSERT INTO test_wide_not_nested SELECT number, number, 'aa', number * 2 FROM numbers(5);
+ALTER TABLE test_wide_not_nested UPDATE `info.name` = 'bb' WHERE id = 1;
+SELECT * FROM test_wide_not_nested ORDER BY id;
+
+DROP TABLE test_wide_not_nested;
diff --git a/tests/queries/0_stateless/01790_dist_INSERT_block_structure_mismatch_types_and_names.reference b/tests/queries/0_stateless/01790_dist_INSERT_block_structure_mismatch_types_and_names.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01790_dist_INSERT_block_structure_mismatch_types_and_names.sql b/tests/queries/0_stateless/01790_dist_INSERT_block_structure_mismatch_types_and_names.sql
new file mode 100644
index 00000000000..e921460ccfc
--- /dev/null
+++ b/tests/queries/0_stateless/01790_dist_INSERT_block_structure_mismatch_types_and_names.sql
@@ -0,0 +1,22 @@
+DROP TABLE IF EXISTS tmp_01781;
+DROP TABLE IF EXISTS dist_01781;
+
+SET prefer_localhost_replica=0;
+
+CREATE TABLE tmp_01781 (n LowCardinality(String)) ENGINE=Memory;
+CREATE TABLE dist_01781 (n LowCardinality(String)) Engine=Distributed(test_cluster_two_shards, currentDatabase(), tmp_01781, cityHash64(n));
+
+SET insert_distributed_sync=1;
+INSERT INTO dist_01781 VALUES ('1'),('2');
+-- different LowCardinality size
+INSERT INTO dist_01781 SELECT * FROM numbers(1000);
+
+SET insert_distributed_sync=0;
+SYSTEM STOP DISTRIBUTED SENDS dist_01781;
+INSERT INTO dist_01781 VALUES ('1'),('2');
+-- different LowCardinality size
+INSERT INTO dist_01781 SELECT * FROM numbers(1000);
+SYSTEM FLUSH DISTRIBUTED dist_01781;
+
+DROP TABLE tmp_01781;
+DROP TABLE dist_01781;
diff --git a/tests/queries/0_stateless/01791_dist_INSERT_block_structure_mismatch.reference b/tests/queries/0_stateless/01791_dist_INSERT_block_structure_mismatch.reference
new file mode 100644
index 00000000000..3bba1ac23c0
--- /dev/null
+++ b/tests/queries/0_stateless/01791_dist_INSERT_block_structure_mismatch.reference
@@ -0,0 +1,6 @@
+<Warning> DistributedBlockOutputStream: Structure does not match (remote: n Int8 Int8(size = 0), local: n UInt64 UInt64(size = 1)), implicit conversion will be done.
+<Warning> DistributedBlockOutputStream: Structure does not match (remote: n Int8 Int8(size = 0), local: n UInt64 UInt64(size = 1)), implicit conversion will be done.
+1
+1
+2
+2
diff --git a/tests/queries/0_stateless/01791_dist_INSERT_block_structure_mismatch.sh b/tests/queries/0_stateless/01791_dist_INSERT_block_structure_mismatch.sh
new file mode 100755
index 00000000000..e989696da03
--- /dev/null
+++ b/tests/queries/0_stateless/01791_dist_INSERT_block_structure_mismatch.sh
@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+
+# NOTE: this is a partial copy of the 01683_dist_INSERT_block_structure_mismatch,
+# but this test also checks the log messages
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+$CLICKHOUSE_CLIENT --prefer_localhost_replica=0 -nm -q "
+    DROP TABLE IF EXISTS tmp_01683;
+    DROP TABLE IF EXISTS dist_01683;
+
+    CREATE TABLE tmp_01683 (n Int8) ENGINE=Memory;
+    CREATE TABLE dist_01683 (n UInt64) Engine=Distributed(test_cluster_two_shards, currentDatabase(), tmp_01683, n);
+
+    SET insert_distributed_sync=1;
+    INSERT INTO dist_01683 VALUES (1),(2);
+
+    SET insert_distributed_sync=0;
+    INSERT INTO dist_01683 VALUES (1),(2);
+    SYSTEM FLUSH DISTRIBUTED dist_01683;
+
+    -- TODO: cover distributed_directory_monitor_batch_inserts=1
+
+    SELECT * FROM tmp_01683 ORDER BY n;
+
+    DROP TABLE tmp_01683;
+    DROP TABLE dist_01683;
+" |& sed 's/^.*</</g'
diff --git a/tests/queries/0_stateless/01795_TinyLog_rwlock_ub.reference b/tests/queries/0_stateless/01795_TinyLog_rwlock_ub.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01795_TinyLog_rwlock_ub.sql b/tests/queries/0_stateless/01795_TinyLog_rwlock_ub.sql
new file mode 100644
index 00000000000..7afa2b7e164
--- /dev/null
+++ b/tests/queries/0_stateless/01795_TinyLog_rwlock_ub.sql
@@ -0,0 +1,5 @@
+DROP TABLE IF EXISTS underlying_01795;
+CREATE TABLE underlying_01795 (key UInt64) Engine=TinyLog();
+INSERT INTO FUNCTION remote('127.1', currentDatabase(), underlying_01795) SELECT toUInt64(number) FROM system.numbers LIMIT 1;
+SELECT * FROM underlying_01795 FORMAT Null;
+DROP TABLE underlying_01795;
diff --git a/tests/queries/0_stateless/01796_Log_rwlock_ub.reference b/tests/queries/0_stateless/01796_Log_rwlock_ub.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01796_Log_rwlock_ub.sql b/tests/queries/0_stateless/01796_Log_rwlock_ub.sql
new file mode 100644
index 00000000000..4f95dbc14e5
--- /dev/null
+++ b/tests/queries/0_stateless/01796_Log_rwlock_ub.sql
@@ -0,0 +1,5 @@
+DROP TABLE IF EXISTS underlying_01796;
+CREATE TABLE underlying_01796 (key UInt64) Engine=Log();
+INSERT INTO FUNCTION remote('127.1', currentDatabase(), underlying_01796) SELECT toUInt64(number) FROM system.numbers LIMIT 1;
+SELECT * FROM underlying_01796 FORMAT Null;
+DROP TABLE underlying_01796;
diff --git a/tests/queries/0_stateless/01797_StripeLog_rwlock_ub.reference b/tests/queries/0_stateless/01797_StripeLog_rwlock_ub.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01797_StripeLog_rwlock_ub.sql b/tests/queries/0_stateless/01797_StripeLog_rwlock_ub.sql
new file mode 100644
index 00000000000..18cadf0a227
--- /dev/null
+++ b/tests/queries/0_stateless/01797_StripeLog_rwlock_ub.sql
@@ -0,0 +1,5 @@
+DROP TABLE IF EXISTS underlying_01797;
+CREATE TABLE underlying_01797 (key UInt64) Engine=StripeLog();
+INSERT INTO FUNCTION remote('127.1', currentDatabase(), underlying_01797) SELECT toUInt64(number) FROM system.numbers LIMIT 1;
+SELECT * FROM underlying_01797 FORMAT Null;
+DROP TABLE underlying_01797;
diff --git a/tests/queries/0_stateless/01798_having_push_down.reference b/tests/queries/0_stateless/01798_having_push_down.reference
new file mode 100644
index 00000000000..3d6a36b087d
--- /dev/null
+++ b/tests/queries/0_stateless/01798_having_push_down.reference
@@ -0,0 +1,2 @@
+1	1	2
+1	\N
diff --git a/tests/queries/0_stateless/01798_having_push_down.sql b/tests/queries/0_stateless/01798_having_push_down.sql
new file mode 100644
index 00000000000..28b97b7f065
--- /dev/null
+++ b/tests/queries/0_stateless/01798_having_push_down.sql
@@ -0,0 +1,17 @@
+DROP TABLE IF EXISTS t_having;
+
+CREATE TABLE t_having (c0 Int32, c1 UInt64) ENGINE = Memory;
+
+INSERT INTO t_having SELECT number, number FROM numbers(1000);
+
+SELECT sum(c0 = 0), min(c0 + 1), sum(c0 + 2) FROM t_having
+GROUP BY c0 HAVING c0 = 0
+SETTINGS enable_optimize_predicate_expression=0;
+
+SELECT c0 + -1, sum(intDivOrZero(intDivOrZero(NULL, NULL), '2'), intDivOrZero(10000000000., intDivOrZero(intDivOrZero(intDivOrZero(NULL, NULL), 10), NULL))) FROM t_having GROUP BY c0 = 2, c0 = 10, intDivOrZero(intDivOrZero(intDivOrZero(NULL, NULL), NULL), NULL), c0 HAVING c0 = 2 SETTINGS enable_optimize_predicate_expression = 0;
+
+SELECT sum(c0 + 257) FROM t_having GROUP BY c0 = -9223372036854775808, NULL, -2147483649, c0 HAVING c0 = -9223372036854775808 SETTINGS enable_optimize_predicate_expression = 0;
+
+SELECT c0 + -2, c0 + -9223372036854775807, c0 = NULL FROM t_having GROUP BY c0 = 0.9998999834060669, 1023, c0 HAVING c0 = 0.9998999834060669 SETTINGS enable_optimize_predicate_expression = 0;
+
+DROP TABLE t_having;
diff --git a/tests/queries/0_stateless/01800_log_nested.reference b/tests/queries/0_stateless/01800_log_nested.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01800_log_nested.sql b/tests/queries/0_stateless/01800_log_nested.sql
new file mode 100644
index 00000000000..6fe2b257905
--- /dev/null
+++ b/tests/queries/0_stateless/01800_log_nested.sql
@@ -0,0 +1,20 @@
+-- TinyTinyLog
+DROP TABLE IF EXISTS nested_01800_tiny_log;
+CREATE TABLE nested_01800_tiny_log (`column` Nested(name String, names Array(String), types Array(Enum8('PU' = 1, 'US' = 2, 'OTHER' = 3)))) ENGINE = TinyLog;
+INSERT INTO nested_01800_tiny_log VALUES (['Hello', 'World'], [['a'], ['b', 'c']], [['PU', 'US'], ['OTHER']]);
+SELECT 10 FROM nested_01800_tiny_log FORMAT Null;
+DROP TABLE nested_01800_tiny_log;
+
+-- StripeStripeLog
+DROP TABLE IF EXISTS nested_01800_stripe_log;
+CREATE TABLE nested_01800_stripe_log (`column` Nested(name String, names Array(String), types Array(Enum8('PU' = 1, 'US' = 2, 'OTHER' = 3)))) ENGINE = StripeLog;
+INSERT INTO nested_01800_stripe_log VALUES (['Hello', 'World'], [['a'], ['b', 'c']], [['PU', 'US'], ['OTHER']]);
+SELECT 10 FROM nested_01800_stripe_log FORMAT Null;
+DROP TABLE nested_01800_stripe_log;
+
+-- Log
+DROP TABLE IF EXISTS nested_01800_log;
+CREATE TABLE nested_01800_log (`column` Nested(name String, names Array(String), types Array(Enum8('PU' = 1, 'US' = 2, 'OTHER' = 3)))) ENGINE = Log;
+INSERT INTO nested_01800_log VALUES (['Hello', 'World'], [['a'], ['b', 'c']], [['PU', 'US'], ['OTHER']]);
+SELECT 10 FROM nested_01800_log FORMAT Null;
+DROP TABLE nested_01800_log;
diff --git a/tests/queries/0_stateless/01801_approx_total_rows_mergetree_reverse.reference b/tests/queries/0_stateless/01801_approx_total_rows_mergetree_reverse.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01801_approx_total_rows_mergetree_reverse.sql b/tests/queries/0_stateless/01801_approx_total_rows_mergetree_reverse.sql
new file mode 100644
index 00000000000..8809bf67a4c
--- /dev/null
+++ b/tests/queries/0_stateless/01801_approx_total_rows_mergetree_reverse.sql
@@ -0,0 +1,10 @@
+drop table if exists data_01801;
+create table data_01801 (key Int) engine=MergeTree() order by key settings index_granularity=10 as select number/10 from numbers(100);
+
+select * from data_01801 where key = 0 order by key settings max_rows_to_read=9 format Null; -- { serverError 158 }
+select * from data_01801 where key = 0 order by key desc settings max_rows_to_read=9 format Null; -- { serverError 158 }
+
+select * from data_01801 where key = 0 order by key settings max_rows_to_read=10 format Null;
+select * from data_01801 where key = 0 order by key desc settings max_rows_to_read=10 format Null;
+
+drop table data_01801;
diff --git a/tests/queries/0_stateless/01801_dateDiff_DateTime64.reference b/tests/queries/0_stateless/01801_dateDiff_DateTime64.reference
new file mode 100644
index 00000000000..f28cf4dc58e
--- /dev/null
+++ b/tests/queries/0_stateless/01801_dateDiff_DateTime64.reference
@@ -0,0 +1,113 @@
+-- { echo }
+
+-- DateTime64 vs DateTime64 same scale
+SELECT dateDiff('second', toDateTime64('1927-01-01 00:00:00', 0, 'UTC'), toDateTime64('1927-01-01 00:00:10', 0, 'UTC'));
+10
+SELECT dateDiff('second', toDateTime64('1927-01-01 00:00:00', 0, 'UTC'), toDateTime64('1927-01-01 00:10:00', 0, 'UTC'));
+600
+SELECT dateDiff('second', toDateTime64('1927-01-01 00:00:00', 0, 'UTC'), toDateTime64('1927-01-01 01:00:00', 0, 'UTC'));
+3600
+SELECT dateDiff('second', toDateTime64('1927-01-01 00:00:00', 0, 'UTC'), toDateTime64('1927-01-01 01:10:10', 0, 'UTC'));
+4210
+SELECT dateDiff('minute', toDateTime64('1927-01-01 00:00:00', 0, 'UTC'), toDateTime64('1927-01-01 00:10:00', 0, 'UTC'));
+10
+SELECT dateDiff('minute', toDateTime64('1927-01-01 00:00:00', 0, 'UTC'), toDateTime64('1927-01-01 10:00:00', 0, 'UTC'));
+600
+SELECT dateDiff('hour', toDateTime64('1927-01-01 00:00:00', 0, 'UTC'), toDateTime64('1927-01-01 10:00:00', 0, 'UTC'));
+10
+SELECT dateDiff('day', toDateTime64('1927-01-01 00:00:00', 0, 'UTC'), toDateTime64('1927-01-02 00:00:00', 0, 'UTC'));
+1
+SELECT dateDiff('month', toDateTime64('1927-01-01 00:00:00', 0, 'UTC'), toDateTime64('1927-02-01 00:00:00', 0, 'UTC'));
+1
+SELECT dateDiff('year', toDateTime64('1927-01-01 00:00:00', 0, 'UTC'), toDateTime64('1928-01-01 00:00:00', 0, 'UTC'));
+1
+-- DateTime64 vs DateTime64 different scale
+SELECT dateDiff('second', toDateTime64('1927-01-01 00:00:00', 6, 'UTC'), toDateTime64('1927-01-01 00:00:10', 3, 'UTC'));
+10
+SELECT dateDiff('second', toDateTime64('1927-01-01 00:00:00', 6, 'UTC'), toDateTime64('1927-01-01 00:10:00', 3, 'UTC'));
+600
+SELECT dateDiff('second', toDateTime64('1927-01-01 00:00:00', 6, 'UTC'), toDateTime64('1927-01-01 01:00:00', 3, 'UTC'));
+3600
+SELECT dateDiff('second', toDateTime64('1927-01-01 00:00:00', 6, 'UTC'), toDateTime64('1927-01-01 01:10:10', 3, 'UTC'));
+4210
+SELECT dateDiff('minute', toDateTime64('1927-01-01 00:00:00', 6, 'UTC'), toDateTime64('1927-01-01 00:10:00', 3, 'UTC'));
+10
+SELECT dateDiff('minute', toDateTime64('1927-01-01 00:00:00', 6, 'UTC'), toDateTime64('1927-01-01 10:00:00', 3, 'UTC'));
+600
+SELECT dateDiff('hour', toDateTime64('1927-01-01 00:00:00', 6, 'UTC'), toDateTime64('1927-01-01 10:00:00', 3, 'UTC'));
+10
+SELECT dateDiff('day', toDateTime64('1927-01-01 00:00:00', 6, 'UTC'), toDateTime64('1927-01-02 00:00:00', 3, 'UTC'));
+1
+SELECT dateDiff('month', toDateTime64('1927-01-01 00:00:00', 6, 'UTC'), toDateTime64('1927-02-01 00:00:00', 3, 'UTC'));
+1
+SELECT dateDiff('year', toDateTime64('1927-01-01 00:00:00', 6, 'UTC'), toDateTime64('1928-01-01 00:00:00', 3, 'UTC'));
+1
+-- With DateTime
+-- DateTime64 vs DateTime
+SELECT dateDiff('second', toDateTime64('2015-08-18 00:00:00', 0, 'UTC'), toDateTime('2015-08-18 00:00:00', 'UTC'));
+0
+SELECT dateDiff('second', toDateTime64('2015-08-18 00:00:00', 0, 'UTC'), toDateTime('2015-08-18 00:00:10', 'UTC'));
+10
+SELECT dateDiff('second', toDateTime64('2015-08-18 00:00:00', 0, 'UTC'), toDateTime('2015-08-18 00:10:00', 'UTC'));
+600
+SELECT dateDiff('second', toDateTime64('2015-08-18 00:00:00', 0, 'UTC'), toDateTime('2015-08-18 01:00:00', 'UTC'));
+3600
+SELECT dateDiff('second', toDateTime64('2015-08-18 00:00:00', 0, 'UTC'), toDateTime('2015-08-18 01:10:10', 'UTC'));
+4210
+-- DateTime vs DateTime64
+SELECT dateDiff('second', toDateTime('2015-08-18 00:00:00', 'UTC'), toDateTime64('2015-08-18 00:00:00', 3, 'UTC'));
+0
+SELECT dateDiff('second', toDateTime('2015-08-18 00:00:00', 'UTC'), toDateTime64('2015-08-18 00:00:10', 3, 'UTC'));
+10
+SELECT dateDiff('second', toDateTime('2015-08-18 00:00:00', 'UTC'), toDateTime64('2015-08-18 00:10:00', 3, 'UTC'));
+600
+SELECT dateDiff('second', toDateTime('2015-08-18 00:00:00', 'UTC'), toDateTime64('2015-08-18 01:00:00', 3, 'UTC'));
+3600
+SELECT dateDiff('second', toDateTime('2015-08-18 00:00:00', 'UTC'), toDateTime64('2015-08-18 01:10:10', 3, 'UTC'));
+4210
+-- With Date
+-- DateTime64 vs Date
+SELECT dateDiff('day', toDateTime64('2015-08-18 00:00:00', 0, 'UTC'), toDate('2015-08-19', 'UTC'));
+1
+-- Date vs DateTime64
+SELECT dateDiff('day', toDate('2015-08-18', 'UTC'), toDateTime64('2015-08-19 00:00:00', 3, 'UTC'));
+1
+-- Same thing but const vs non-const columns
+SELECT dateDiff('second', toDateTime64('1927-01-01 00:00:00', 0, 'UTC'), materialize(toDateTime64('1927-01-01 00:00:10', 0, 'UTC')));
+10
+SELECT dateDiff('second', toDateTime64('1927-01-01 00:00:00', 6, 'UTC'), materialize(toDateTime64('1927-01-01 00:00:10', 3, 'UTC')));
+10
+SELECT dateDiff('second', toDateTime64('2015-08-18 00:00:00', 0, 'UTC'), materialize(toDateTime('2015-08-18 00:00:10', 'UTC')));
+10
+SELECT dateDiff('second', toDateTime('2015-08-18 00:00:00', 'UTC'), materialize(toDateTime64('2015-08-18 00:00:10', 3, 'UTC')));
+10
+SELECT dateDiff('day', toDateTime64('2015-08-18 00:00:00', 0, 'UTC'), materialize(toDate('2015-08-19', 'UTC')));
+1
+SELECT dateDiff('day', toDate('2015-08-18', 'UTC'), materialize(toDateTime64('2015-08-19 00:00:00', 3, 'UTC')));
+1
+-- Same thing but non-const vs const columns
+SELECT dateDiff('second', materialize(toDateTime64('1927-01-01 00:00:00', 0, 'UTC')), toDateTime64('1927-01-01 00:00:10', 0, 'UTC'));
+10
+SELECT dateDiff('second', materialize(toDateTime64('1927-01-01 00:00:00', 6, 'UTC')), toDateTime64('1927-01-01 00:00:10', 3, 'UTC'));
+10
+SELECT dateDiff('second', materialize(toDateTime64('2015-08-18 00:00:00', 0, 'UTC')), toDateTime('2015-08-18 00:00:10', 'UTC'));
+10
+SELECT dateDiff('second', materialize(toDateTime('2015-08-18 00:00:00', 'UTC')), toDateTime64('2015-08-18 00:00:10', 3, 'UTC'));
+10
+SELECT dateDiff('day', materialize(toDateTime64('2015-08-18 00:00:00', 0, 'UTC')), toDate('2015-08-19', 'UTC'));
+1
+SELECT dateDiff('day', materialize(toDate('2015-08-18', 'UTC')), toDateTime64('2015-08-19 00:00:00', 3, 'UTC'));
+1
+-- Same thing but non-const vs non-const columns
+SELECT dateDiff('second', materialize(toDateTime64('1927-01-01 00:00:00', 0, 'UTC')), materialize(toDateTime64('1927-01-01 00:00:10', 0, 'UTC')));
+10
+SELECT dateDiff('second', materialize(toDateTime64('1927-01-01 00:00:00', 6, 'UTC')), materialize(toDateTime64('1927-01-01 00:00:10', 3, 'UTC')));
+10
+SELECT dateDiff('second', materialize(toDateTime64('2015-08-18 00:00:00', 0, 'UTC')), materialize(toDateTime('2015-08-18 00:00:10', 'UTC')));
+10
+SELECT dateDiff('second', materialize(toDateTime('2015-08-18 00:00:00', 'UTC')), materialize(toDateTime64('2015-08-18 00:00:10', 3, 'UTC')));
+10
+SELECT dateDiff('day', materialize(toDateTime64('2015-08-18 00:00:00', 0, 'UTC')), materialize(toDate('2015-08-19', 'UTC')));
+1
+SELECT dateDiff('day', materialize(toDate('2015-08-18', 'UTC')), materialize(toDateTime64('2015-08-19 00:00:00', 3, 'UTC')));
+1
diff --git a/tests/queries/0_stateless/01801_dateDiff_DateTime64.sql b/tests/queries/0_stateless/01801_dateDiff_DateTime64.sql
new file mode 100644
index 00000000000..020559f4e62
--- /dev/null
+++ b/tests/queries/0_stateless/01801_dateDiff_DateTime64.sql
@@ -0,0 +1,77 @@
+-- { echo }
+
+-- DateTime64 vs DateTime64 same scale
+SELECT dateDiff('second', toDateTime64('1927-01-01 00:00:00', 0, 'UTC'), toDateTime64('1927-01-01 00:00:10', 0, 'UTC'));
+SELECT dateDiff('second', toDateTime64('1927-01-01 00:00:00', 0, 'UTC'), toDateTime64('1927-01-01 00:10:00', 0, 'UTC'));
+SELECT dateDiff('second', toDateTime64('1927-01-01 00:00:00', 0, 'UTC'), toDateTime64('1927-01-01 01:00:00', 0, 'UTC'));
+SELECT dateDiff('second', toDateTime64('1927-01-01 00:00:00', 0, 'UTC'), toDateTime64('1927-01-01 01:10:10', 0, 'UTC'));
+
+SELECT dateDiff('minute', toDateTime64('1927-01-01 00:00:00', 0, 'UTC'), toDateTime64('1927-01-01 00:10:00', 0, 'UTC'));
+SELECT dateDiff('minute', toDateTime64('1927-01-01 00:00:00', 0, 'UTC'), toDateTime64('1927-01-01 10:00:00', 0, 'UTC'));
+
+SELECT dateDiff('hour', toDateTime64('1927-01-01 00:00:00', 0, 'UTC'), toDateTime64('1927-01-01 10:00:00', 0, 'UTC'));
+
+SELECT dateDiff('day', toDateTime64('1927-01-01 00:00:00', 0, 'UTC'), toDateTime64('1927-01-02 00:00:00', 0, 'UTC'));
+SELECT dateDiff('month', toDateTime64('1927-01-01 00:00:00', 0, 'UTC'), toDateTime64('1927-02-01 00:00:00', 0, 'UTC'));
+SELECT dateDiff('year', toDateTime64('1927-01-01 00:00:00', 0, 'UTC'), toDateTime64('1928-01-01 00:00:00', 0, 'UTC'));
+
+-- DateTime64 vs DateTime64 different scale
+SELECT dateDiff('second', toDateTime64('1927-01-01 00:00:00', 6, 'UTC'), toDateTime64('1927-01-01 00:00:10', 3, 'UTC'));
+SELECT dateDiff('second', toDateTime64('1927-01-01 00:00:00', 6, 'UTC'), toDateTime64('1927-01-01 00:10:00', 3, 'UTC'));
+SELECT dateDiff('second', toDateTime64('1927-01-01 00:00:00', 6, 'UTC'), toDateTime64('1927-01-01 01:00:00', 3, 'UTC'));
+SELECT dateDiff('second', toDateTime64('1927-01-01 00:00:00', 6, 'UTC'), toDateTime64('1927-01-01 01:10:10', 3, 'UTC'));
+
+SELECT dateDiff('minute', toDateTime64('1927-01-01 00:00:00', 6, 'UTC'), toDateTime64('1927-01-01 00:10:00', 3, 'UTC'));
+SELECT dateDiff('minute', toDateTime64('1927-01-01 00:00:00', 6, 'UTC'), toDateTime64('1927-01-01 10:00:00', 3, 'UTC'));
+
+SELECT dateDiff('hour', toDateTime64('1927-01-01 00:00:00', 6, 'UTC'), toDateTime64('1927-01-01 10:00:00', 3, 'UTC'));
+
+SELECT dateDiff('day', toDateTime64('1927-01-01 00:00:00', 6, 'UTC'), toDateTime64('1927-01-02 00:00:00', 3, 'UTC'));
+SELECT dateDiff('month', toDateTime64('1927-01-01 00:00:00', 6, 'UTC'), toDateTime64('1927-02-01 00:00:00', 3, 'UTC'));
+SELECT dateDiff('year', toDateTime64('1927-01-01 00:00:00', 6, 'UTC'), toDateTime64('1928-01-01 00:00:00', 3, 'UTC'));
+
+-- With DateTime
+-- DateTime64 vs DateTime
+SELECT dateDiff('second', toDateTime64('2015-08-18 00:00:00', 0, 'UTC'), toDateTime('2015-08-18 00:00:00', 'UTC'));
+SELECT dateDiff('second', toDateTime64('2015-08-18 00:00:00', 0, 'UTC'), toDateTime('2015-08-18 00:00:10', 'UTC'));
+SELECT dateDiff('second', toDateTime64('2015-08-18 00:00:00', 0, 'UTC'), toDateTime('2015-08-18 00:10:00', 'UTC'));
+SELECT dateDiff('second', toDateTime64('2015-08-18 00:00:00', 0, 'UTC'), toDateTime('2015-08-18 01:00:00', 'UTC'));
+SELECT dateDiff('second', toDateTime64('2015-08-18 00:00:00', 0, 'UTC'), toDateTime('2015-08-18 01:10:10', 'UTC'));
+
+-- DateTime vs DateTime64
+SELECT dateDiff('second', toDateTime('2015-08-18 00:00:00', 'UTC'), toDateTime64('2015-08-18 00:00:00', 3, 'UTC'));
+SELECT dateDiff('second', toDateTime('2015-08-18 00:00:00', 'UTC'), toDateTime64('2015-08-18 00:00:10', 3, 'UTC'));
+SELECT dateDiff('second', toDateTime('2015-08-18 00:00:00', 'UTC'), toDateTime64('2015-08-18 00:10:00', 3, 'UTC'));
+SELECT dateDiff('second', toDateTime('2015-08-18 00:00:00', 'UTC'), toDateTime64('2015-08-18 01:00:00', 3, 'UTC'));
+SELECT dateDiff('second', toDateTime('2015-08-18 00:00:00', 'UTC'), toDateTime64('2015-08-18 01:10:10', 3, 'UTC'));
+
+-- With Date
+-- DateTime64 vs Date
+SELECT dateDiff('day', toDateTime64('2015-08-18 00:00:00', 0, 'UTC'), toDate('2015-08-19', 'UTC'));
+
+-- Date vs DateTime64
+SELECT dateDiff('day', toDate('2015-08-18', 'UTC'), toDateTime64('2015-08-19 00:00:00', 3, 'UTC'));
+
+-- Same thing but const vs non-const columns
+SELECT dateDiff('second', toDateTime64('1927-01-01 00:00:00', 0, 'UTC'), materialize(toDateTime64('1927-01-01 00:00:10', 0, 'UTC')));
+SELECT dateDiff('second', toDateTime64('1927-01-01 00:00:00', 6, 'UTC'), materialize(toDateTime64('1927-01-01 00:00:10', 3, 'UTC')));
+SELECT dateDiff('second', toDateTime64('2015-08-18 00:00:00', 0, 'UTC'), materialize(toDateTime('2015-08-18 00:00:10', 'UTC')));
+SELECT dateDiff('second', toDateTime('2015-08-18 00:00:00', 'UTC'), materialize(toDateTime64('2015-08-18 00:00:10', 3, 'UTC')));
+SELECT dateDiff('day', toDateTime64('2015-08-18 00:00:00', 0, 'UTC'), materialize(toDate('2015-08-19', 'UTC')));
+SELECT dateDiff('day', toDate('2015-08-18', 'UTC'), materialize(toDateTime64('2015-08-19 00:00:00', 3, 'UTC')));
+
+-- Same thing but non-const vs const columns
+SELECT dateDiff('second', materialize(toDateTime64('1927-01-01 00:00:00', 0, 'UTC')), toDateTime64('1927-01-01 00:00:10', 0, 'UTC'));
+SELECT dateDiff('second', materialize(toDateTime64('1927-01-01 00:00:00', 6, 'UTC')), toDateTime64('1927-01-01 00:00:10', 3, 'UTC'));
+SELECT dateDiff('second', materialize(toDateTime64('2015-08-18 00:00:00', 0, 'UTC')), toDateTime('2015-08-18 00:00:10', 'UTC'));
+SELECT dateDiff('second', materialize(toDateTime('2015-08-18 00:00:00', 'UTC')), toDateTime64('2015-08-18 00:00:10', 3, 'UTC'));
+SELECT dateDiff('day', materialize(toDateTime64('2015-08-18 00:00:00', 0, 'UTC')), toDate('2015-08-19', 'UTC'));
+SELECT dateDiff('day', materialize(toDate('2015-08-18', 'UTC')), toDateTime64('2015-08-19 00:00:00', 3, 'UTC'));
+
+-- Same thing but non-const vs non-const columns
+SELECT dateDiff('second', materialize(toDateTime64('1927-01-01 00:00:00', 0, 'UTC')), materialize(toDateTime64('1927-01-01 00:00:10', 0, 'UTC')));
+SELECT dateDiff('second', materialize(toDateTime64('1927-01-01 00:00:00', 6, 'UTC')), materialize(toDateTime64('1927-01-01 00:00:10', 3, 'UTC')));
+SELECT dateDiff('second', materialize(toDateTime64('2015-08-18 00:00:00', 0, 'UTC')), materialize(toDateTime('2015-08-18 00:00:10', 'UTC')));
+SELECT dateDiff('second', materialize(toDateTime('2015-08-18 00:00:00', 'UTC')), materialize(toDateTime64('2015-08-18 00:00:10', 3, 'UTC')));
+SELECT dateDiff('day', materialize(toDateTime64('2015-08-18 00:00:00', 0, 'UTC')), materialize(toDate('2015-08-19', 'UTC')));
+SELECT dateDiff('day', materialize(toDate('2015-08-18', 'UTC')), materialize(toDateTime64('2015-08-19 00:00:00', 3, 'UTC')));
diff --git a/tests/queries/0_stateless/01801_distinct_group_by_shard.reference b/tests/queries/0_stateless/01801_distinct_group_by_shard.reference
new file mode 100644
index 00000000000..d00491fd7e5
--- /dev/null
+++ b/tests/queries/0_stateless/01801_distinct_group_by_shard.reference
@@ -0,0 +1 @@
+1
diff --git a/tests/queries/0_stateless/01801_distinct_group_by_shard.sql b/tests/queries/0_stateless/01801_distinct_group_by_shard.sql
new file mode 100644
index 00000000000..ca6572b91ee
--- /dev/null
+++ b/tests/queries/0_stateless/01801_distinct_group_by_shard.sql
@@ -0,0 +1 @@
+SELECT DISTINCT a FROM remote('127.0.0.{1,2,3}', values('a UInt8, b UInt8', (1, 2), (1, 3))) GROUP BY a, b;
diff --git a/tests/queries/0_stateless/01801_nullable_low_cardinality_tsv.reference b/tests/queries/0_stateless/01801_nullable_low_cardinality_tsv.reference
new file mode 100644
index 00000000000..573541ac970
--- /dev/null
+++ b/tests/queries/0_stateless/01801_nullable_low_cardinality_tsv.reference
@@ -0,0 +1 @@
+0
diff --git a/tests/queries/0_stateless/01801_nullable_low_cardinality_tsv.sh b/tests/queries/0_stateless/01801_nullable_low_cardinality_tsv.sh
new file mode 100755
index 00000000000..935bfe18cfc
--- /dev/null
+++ b/tests/queries/0_stateless/01801_nullable_low_cardinality_tsv.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+$CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS nullable_low_cardinality_tsv_test;";
+$CLICKHOUSE_CLIENT --multiquery --query="CREATE TABLE nullable_low_cardinality_tsv_test
+(
+    A Date,
+    S LowCardinality(Nullable(String)),
+    X Int32,
+    S1 LowCardinality(Nullable(String)),
+    S2 Array(String)
+) ENGINE=TinyLog";
+
+printf '2020-01-01\t\N\t32\t\N\n' | $CLICKHOUSE_CLIENT -q 'insert into nullable_low_cardinality_tsv_test format TSV' 2>&1 \
+    | grep -q "Code: 27"
+
+echo $?;
+
+$CLICKHOUSE_CLIENT --query="DROP TABLE nullable_low_cardinality_tsv_test";
diff --git a/tests/queries/0_stateless/01801_s3_cluster.reference b/tests/queries/0_stateless/01801_s3_cluster.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01801_s3_cluster.sh b/tests/queries/0_stateless/01801_s3_cluster.sh
new file mode 100755
index 00000000000..215d5500be5
--- /dev/null
+++ b/tests/queries/0_stateless/01801_s3_cluster.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+# NOTE: this is a partial copy of the 01683_dist_INSERT_block_structure_mismatch,
+# but this test also checks the log messages
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+
+${CLICKHOUSE_CLIENT_BINARY} --send_logs_level="none" -q "SELECT *  FROM s3('https://s3.mds.yandex.net/clickhouse-test-reports/*/*/functional_stateless_tests_(ubsan)/test_results.tsv',  '$S3_ACCESS_KEY_ID', '$S3_SECRET_ACCESS', 'LineAsString', 'line String') limit 100 FORMAT Null;"
+${CLICKHOUSE_CLIENT_BINARY} --send_logs_level="none" -q "SELECT *  FROM s3Cluster('test_cluster_two_shards', 'https://s3.mds.yandex.net/clickhouse-test-reports/*/*/functional_stateless_tests_(ubsan)/test_results.tsv',  '$S3_ACCESS_KEY_ID', '$S3_SECRET_ACCESS', 'LineAsString', 'line String') limit 100 FORMAT Null;"
diff --git a/tests/queries/0_stateless/01802_formatDateTime_DateTime64_century.reference b/tests/queries/0_stateless/01802_formatDateTime_DateTime64_century.reference
new file mode 100644
index 00000000000..75c114cdd74
--- /dev/null
+++ b/tests/queries/0_stateless/01802_formatDateTime_DateTime64_century.reference
@@ -0,0 +1,27 @@
+-- { echo }
+
+SELECT formatDateTime(toDateTime64('1935-12-12 12:12:12', 0, 'Europe/Moscow'), '%C');
+19
+SELECT formatDateTime(toDateTime64('1969-12-12 12:12:12', 0, 'Europe/Moscow'), '%C');
+19
+SELECT formatDateTime(toDateTime64('1989-12-12 12:12:12', 0, 'Europe/Moscow'), '%C');
+19
+SELECT formatDateTime(toDateTime64('2019-09-16 19:20:12', 0, 'Europe/Moscow'), '%C');
+20
+SELECT formatDateTime(toDateTime64('2105-12-12 12:12:12', 0, 'Europe/Moscow'), '%C');
+21
+SELECT formatDateTime(toDateTime64('2205-12-12 12:12:12', 0, 'Europe/Moscow'), '%C');
+22
+-- non-zero scale
+SELECT formatDateTime(toDateTime64('1935-12-12 12:12:12', 6, 'Europe/Moscow'), '%C');
+19
+SELECT formatDateTime(toDateTime64('1969-12-12 12:12:12', 6, 'Europe/Moscow'), '%C');
+19
+SELECT formatDateTime(toDateTime64('1989-12-12 12:12:12', 6, 'Europe/Moscow'), '%C');
+19
+SELECT formatDateTime(toDateTime64('2019-09-16 19:20:12', 0, 'Europe/Moscow'), '%C');
+20
+SELECT formatDateTime(toDateTime64('2105-12-12 12:12:12', 6, 'Europe/Moscow'), '%C');
+21
+SELECT formatDateTime(toDateTime64('2205-01-12 12:12:12', 6, 'Europe/Moscow'), '%C');
+22
diff --git a/tests/queries/0_stateless/01802_formatDateTime_DateTime64_century.sql b/tests/queries/0_stateless/01802_formatDateTime_DateTime64_century.sql
new file mode 100644
index 00000000000..e368f45cbda
--- /dev/null
+++ b/tests/queries/0_stateless/01802_formatDateTime_DateTime64_century.sql
@@ -0,0 +1,16 @@
+-- { echo }
+
+SELECT formatDateTime(toDateTime64('1935-12-12 12:12:12', 0, 'Europe/Moscow'), '%C');
+SELECT formatDateTime(toDateTime64('1969-12-12 12:12:12', 0, 'Europe/Moscow'), '%C');
+SELECT formatDateTime(toDateTime64('1989-12-12 12:12:12', 0, 'Europe/Moscow'), '%C');
+SELECT formatDateTime(toDateTime64('2019-09-16 19:20:12', 0, 'Europe/Moscow'), '%C');
+SELECT formatDateTime(toDateTime64('2105-12-12 12:12:12', 0, 'Europe/Moscow'), '%C');
+SELECT formatDateTime(toDateTime64('2205-12-12 12:12:12', 0, 'Europe/Moscow'), '%C');
+
+-- non-zero scale
+SELECT formatDateTime(toDateTime64('1935-12-12 12:12:12', 6, 'Europe/Moscow'), '%C');
+SELECT formatDateTime(toDateTime64('1969-12-12 12:12:12', 6, 'Europe/Moscow'), '%C');
+SELECT formatDateTime(toDateTime64('1989-12-12 12:12:12', 6, 'Europe/Moscow'), '%C');
+SELECT formatDateTime(toDateTime64('2019-09-16 19:20:12', 0, 'Europe/Moscow'), '%C');
+SELECT formatDateTime(toDateTime64('2105-12-12 12:12:12', 6, 'Europe/Moscow'), '%C');
+SELECT formatDateTime(toDateTime64('2205-01-12 12:12:12', 6, 'Europe/Moscow'), '%C');
\ No newline at end of file
diff --git a/tests/queries/0_stateless/01802_rank_corr_mann_whitney_over_window.reference b/tests/queries/0_stateless/01802_rank_corr_mann_whitney_over_window.reference
new file mode 100644
index 00000000000..42acbe4fbaf
--- /dev/null
+++ b/tests/queries/0_stateless/01802_rank_corr_mann_whitney_over_window.reference
@@ -0,0 +1,10 @@
+0.5060606060606061
+0.5083333333333333
+0.5119047619047619
+0.5178571428571428
+0.5285714285714286
+0.525
+0.55
+0.625
+0.5
+nan
diff --git a/tests/queries/0_stateless/01802_rank_corr_mann_whitney_over_window.sql b/tests/queries/0_stateless/01802_rank_corr_mann_whitney_over_window.sql
new file mode 100644
index 00000000000..3c1746a30f8
--- /dev/null
+++ b/tests/queries/0_stateless/01802_rank_corr_mann_whitney_over_window.sql
@@ -0,0 +1,22 @@
+DROP TABLE IF EXISTS 01802_empsalary;
+
+SET allow_experimental_window_functions=1;
+
+CREATE TABLE 01802_empsalary
+(
+    `depname` LowCardinality(String),
+    `empno` UInt64,
+    `salary` Int32,
+    `enroll_date` Date
+)
+ENGINE = MergeTree
+ORDER BY enroll_date
+SETTINGS index_granularity = 8192;
+
+INSERT INTO 01802_empsalary VALUES ('sales', 1, 5000, '2006-10-01'), ('develop', 8, 6000, '2006-10-01'), ('personnel', 2, 3900, '2006-12-23'), ('develop', 10, 5200, '2007-08-01'), ('sales', 3, 4800, '2007-08-01'), ('sales', 4, 4800, '2007-08-08'), ('develop', 11, 5200, '2007-08-15'), ('personnel', 5, 3500, '2007-12-10'), ('develop', 7, 4200, '2008-01-01'), ('develop', 9, 4500, '2008-01-01');
+
+SELECT mannWhitneyUTest(salary, salary) OVER (ORDER BY salary ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING) AS func FROM 01802_empsalary; -- {serverError 36}
+
+SELECT rankCorr(salary, 0.5) OVER (ORDER BY salary ASC ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING) AS func FROM 01802_empsalary;
+
+DROP TABLE IF EXISTS 01802_empsalary;
diff --git a/tests/queries/0_stateless/01802_test_postgresql_protocol_with_row_policy.reference b/tests/queries/0_stateless/01802_test_postgresql_protocol_with_row_policy.reference
new file mode 100644
index 00000000000..729d93bf322
--- /dev/null
+++ b/tests/queries/0_stateless/01802_test_postgresql_protocol_with_row_policy.reference
@@ -0,0 +1,24 @@
+before row policy
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
+
+after row policy with no password
+ val 
+-----
+   2
+(1 row)
+
+after row policy with plaintext_password
+ val 
+-----
+   2
+(1 row)
+
diff --git a/tests/queries/0_stateless/01802_test_postgresql_protocol_with_row_policy.sh b/tests/queries/0_stateless/01802_test_postgresql_protocol_with_row_policy.sh
new file mode 100755
index 00000000000..edd73131020
--- /dev/null
+++ b/tests/queries/0_stateless/01802_test_postgresql_protocol_with_row_policy.sh
@@ -0,0 +1,43 @@
+#!/usr/bin/env bash
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+echo "
+CREATE DATABASE IF NOT EXISTS db01802;
+DROP TABLE IF EXISTS db01802.postgresql;
+DROP ROW POLICY IF EXISTS test_policy ON db01802.postgresql;
+
+CREATE TABLE db01802.postgresql (val UInt32) ENGINE=MergeTree ORDER BY val;
+INSERT INTO db01802.postgresql SELECT number FROM numbers(10);
+
+SELECT 'before row policy';
+SELECT * FROM db01802.postgresql;
+" | $CLICKHOUSE_CLIENT -n
+
+
+echo "
+DROP USER IF EXISTS postgresql_user;
+CREATE USER postgresql_user HOST IP '127.0.0.1' IDENTIFIED WITH no_password;
+GRANT SELECT(val) ON db01802.postgresql TO postgresql_user;
+CREATE ROW POLICY IF NOT EXISTS test_policy ON db01802.postgresql FOR SELECT USING val = 2 TO postgresql_user;
+
+SELECT '';
+SELECT 'after row policy with no password';
+" | $CLICKHOUSE_CLIENT -n
+
+psql --host localhost --port ${CLICKHOUSE_PORT_POSTGRESQL} db01802 --user postgresql_user -c "SELECT * FROM postgresql;"
+
+echo "
+DROP USER IF EXISTS postgresql_user;
+DROP ROW POLICY IF EXISTS test_policy ON db01802.postgresql;
+CREATE USER postgresql_user HOST IP '127.0.0.1' IDENTIFIED WITH plaintext_password BY 'qwerty';
+GRANT SELECT(val) ON db01802.postgresql TO postgresql_user;
+CREATE ROW POLICY IF NOT EXISTS test_policy ON db01802.postgresql FOR SELECT USING val = 2 TO postgresql_user;
+
+SELECT 'after row policy with plaintext_password';
+" | $CLICKHOUSE_CLIENT -n
+
+psql "postgresql://postgresql_user:qwerty@localhost:${CLICKHOUSE_PORT_POSTGRESQL}/db01802" -c "SELECT * FROM postgresql;"
+
diff --git a/tests/queries/0_stateless/01802_toDateTime64_large_values.reference b/tests/queries/0_stateless/01802_toDateTime64_large_values.reference
new file mode 100644
index 00000000000..c44c61ab93a
--- /dev/null
+++ b/tests/queries/0_stateless/01802_toDateTime64_large_values.reference
@@ -0,0 +1,10 @@
+-- { echo }
+
+SELECT toDateTime64('2205-12-12 12:12:12', 0, 'UTC');
+2205-12-12 12:12:12
+SELECT toDateTime64('2205-12-12 12:12:12', 0, 'Europe/Moscow');
+2205-12-12 12:12:12
+SELECT toDateTime64('2205-12-12 12:12:12', 6, 'Europe/Moscow');
+2205-12-12 12:12:12.000000
+SELECT toDateTime64('2205-12-12 12:12:12', 6, 'Europe/Moscow');
+2205-12-12 12:12:12.000000
diff --git a/tests/queries/0_stateless/01802_toDateTime64_large_values.sql b/tests/queries/0_stateless/01802_toDateTime64_large_values.sql
new file mode 100644
index 00000000000..299111f43bc
--- /dev/null
+++ b/tests/queries/0_stateless/01802_toDateTime64_large_values.sql
@@ -0,0 +1,7 @@
+-- { echo }
+
+SELECT toDateTime64('2205-12-12 12:12:12', 0, 'UTC');
+SELECT toDateTime64('2205-12-12 12:12:12', 0, 'Europe/Moscow');
+
+SELECT toDateTime64('2205-12-12 12:12:12', 6, 'Europe/Moscow');
+SELECT toDateTime64('2205-12-12 12:12:12', 6, 'Europe/Moscow');
\ No newline at end of file
diff --git a/tests/queries/0_stateless/01803_const_nullable_map.reference b/tests/queries/0_stateless/01803_const_nullable_map.reference
new file mode 100644
index 00000000000..573541ac970
--- /dev/null
+++ b/tests/queries/0_stateless/01803_const_nullable_map.reference
@@ -0,0 +1 @@
+0
diff --git a/tests/queries/0_stateless/01803_const_nullable_map.sql b/tests/queries/0_stateless/01803_const_nullable_map.sql
new file mode 100644
index 00000000000..4ac9f925e24
--- /dev/null
+++ b/tests/queries/0_stateless/01803_const_nullable_map.sql
@@ -0,0 +1,9 @@
+DROP TABLE IF EXISTS t_map_null;
+
+SET allow_experimental_map_type = 1;
+
+CREATE TABLE t_map_null (a Map(String, String), b String) engine = MergeTree() ORDER BY a;
+INSERT INTO t_map_null VALUES (map('a', 'b', 'c', 'd'), 'foo');
+SELECT count() FROM t_map_null WHERE a = map('name', NULL, '', NULL);
+
+DROP TABLE t_map_null;
diff --git a/tests/queries/0_stateless/01803_untuple_subquery.reference b/tests/queries/0_stateless/01803_untuple_subquery.reference
new file mode 100644
index 00000000000..838ff3aa952
--- /dev/null
+++ b/tests/queries/0_stateless/01803_untuple_subquery.reference
@@ -0,0 +1,2 @@
+(0.5,'92233720368547758.07',NULL)		1.00	256	\N	\N
+\N
diff --git a/tests/queries/0_stateless/01803_untuple_subquery.sql b/tests/queries/0_stateless/01803_untuple_subquery.sql
new file mode 100644
index 00000000000..512b4c561af
--- /dev/null
+++ b/tests/queries/0_stateless/01803_untuple_subquery.sql
@@ -0,0 +1,3 @@
+SELECT (0.5, '92233720368547758.07', NULL), '', '1.00', untuple(('256', NULL)), NULL FROM (SELECT untuple(((NULL, untuple((('0.0000000100', (65536, NULL, (65535, 9223372036854775807), '25.7', (0.00009999999747378752, '10.25', 1048577), 65536)), '0.0000001024', '65537', NULL))), untuple((9223372036854775807, -inf, 0.5)), NULL, -9223372036854775808)), 257, 7, ('0.0001048575', (1024, NULL, (7, 3), (untuple(tuple(-NULL)), NULL, '0.0001048577', NULL), 0)), 0, (0, 0.9998999834060669, '65537'), untuple(tuple('10.25')));
+
+SELECT NULL FROM (SELECT untuple((NULL, dummy)));
diff --git a/tests/queries/0_stateless/01804_dictionary_decimal256_type.reference b/tests/queries/0_stateless/01804_dictionary_decimal256_type.reference
new file mode 100644
index 00000000000..1af9d45f72b
--- /dev/null
+++ b/tests/queries/0_stateless/01804_dictionary_decimal256_type.reference
@@ -0,0 +1,14 @@
+Flat dictionary
+5.00000
+Hashed dictionary
+5.00000
+Cache dictionary
+5.00000
+SSDCache dictionary
+5.00000
+Direct dictionary
+5.00000
+IPTrie dictionary
+5.00000
+Polygon dictionary
+5.00000
diff --git a/tests/queries/0_stateless/01804_dictionary_decimal256_type.sql b/tests/queries/0_stateless/01804_dictionary_decimal256_type.sql
new file mode 100644
index 00000000000..cc0ec598b70
--- /dev/null
+++ b/tests/queries/0_stateless/01804_dictionary_decimal256_type.sql
@@ -0,0 +1,141 @@
+SET allow_experimental_bigint_types = 1;
+
+DROP TABLE IF EXISTS dictionary_decimal_source_table;
+CREATE TABLE dictionary_decimal_source_table
+(
+    id UInt64,
+    decimal_value Decimal256(5)
+) ENGINE = TinyLog;
+
+INSERT INTO dictionary_decimal_source_table VALUES (1, 5.0);
+
+DROP DICTIONARY IF EXISTS flat_dictionary;
+CREATE DICTIONARY flat_dictionary
+(
+    id UInt64,
+    decimal_value Decimal256(5)
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() TABLE 'dictionary_decimal_source_table'))
+LIFETIME(MIN 1 MAX 1000)
+LAYOUT(FLAT());
+
+SELECT 'Flat dictionary';
+SELECT dictGet('flat_dictionary', 'decimal_value', toUInt64(1));
+
+DROP DICTIONARY IF EXISTS hashed_dictionary;
+CREATE DICTIONARY hashed_dictionary
+(
+    id UInt64,
+    decimal_value Decimal256(5)
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() TABLE 'dictionary_decimal_source_table'))
+LIFETIME(MIN 1 MAX 1000)
+LAYOUT(HASHED());
+
+SELECT 'Hashed dictionary';
+SELECT dictGet('hashed_dictionary', 'decimal_value', toUInt64(1));
+
+DROP DICTIONARY hashed_dictionary;
+
+DROP DICTIONARY IF EXISTS cache_dictionary;
+CREATE DICTIONARY cache_dictionary
+(
+    id UInt64,
+    decimal_value Decimal256(5)
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() TABLE 'dictionary_decimal_source_table'))
+LIFETIME(MIN 1 MAX 1000)
+LAYOUT(CACHE(SIZE_IN_CELLS 10));
+
+SELECT 'Cache dictionary';
+SELECT dictGet('cache_dictionary', 'decimal_value', toUInt64(1));
+
+DROP DICTIONARY cache_dictionary;
+
+DROP DICTIONARY IF EXISTS ssd_cache_dictionary;
+CREATE DICTIONARY ssd_cache_dictionary
+(
+    id UInt64,
+    decimal_value Decimal256(5)
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() TABLE 'dictionary_decimal_source_table'))
+LIFETIME(MIN 1 MAX 1000)
+LAYOUT(SSD_CACHE(BLOCK_SIZE 4096 FILE_SIZE 8192 PATH '/var/lib/clickhouse/clickhouse_dicts/0d'));
+
+SELECT 'SSDCache dictionary';
+SELECT dictGet('ssd_cache_dictionary', 'decimal_value', toUInt64(1));
+
+DROP DICTIONARY ssd_cache_dictionary;
+
+DROP DICTIONARY IF EXISTS direct_dictionary;
+CREATE DICTIONARY direct_dictionary
+(
+    id UInt64,
+    decimal_value Decimal256(5)
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() TABLE 'dictionary_decimal_source_table'))
+LAYOUT(DIRECT());
+
+SELECT 'Direct dictionary';
+SELECT dictGet('direct_dictionary', 'decimal_value', toUInt64(1));
+
+DROP DICTIONARY direct_dictionary;
+
+DROP TABLE dictionary_decimal_source_table;
+
+DROP TABLE IF EXISTS ip_trie_dictionary_decimal_source_table;
+CREATE TABLE ip_trie_dictionary_decimal_source_table
+(
+    prefix String,
+    decimal_value Decimal256(5)
+) ENGINE = TinyLog;
+
+INSERT INTO ip_trie_dictionary_decimal_source_table VALUES ('127.0.0.0', 5.0);
+
+DROP DICTIONARY IF EXISTS ip_trie_dictionary;
+CREATE DICTIONARY ip_trie_dictionary
+(
+    prefix String,
+    decimal_value Decimal256(5)
+)
+PRIMARY KEY prefix
+SOURCE(CLICKHOUSE(HOST 'localhost' port tcpPort() TABLE 'ip_trie_dictionary_decimal_source_table'))
+LIFETIME(MIN 10 MAX 1000)
+LAYOUT(IP_TRIE());
+
+SELECT 'IPTrie dictionary';
+SELECT dictGet('ip_trie_dictionary', 'decimal_value', tuple(IPv4StringToNum('127.0.0.0')));
+
+DROP DICTIONARY ip_trie_dictionary;
+DROP TABLE ip_trie_dictionary_decimal_source_table;
+
+DROP TABLE IF EXISTS dictionary_decimal_polygons_source_table;
+CREATE TABLE dictionary_decimal_polygons_source_table
+(
+    key Array(Array(Array(Tuple(Float64, Float64)))),
+    decimal_value Decimal256(5)
+) ENGINE = TinyLog;
+
+INSERT INTO dictionary_decimal_polygons_source_table VALUES ([[[(0, 0), (0, 1), (1, 1), (1, 0)]]], 5.0);
+
+DROP DICTIONARY IF EXISTS polygon_dictionary;
+CREATE DICTIONARY polygon_dictionary
+(
+    key Array(Array(Array(Tuple(Float64, Float64)))),
+    decimal_value Decimal256(5)
+)
+PRIMARY KEY key
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() TABLE 'dictionary_decimal_polygons_source_table'))
+LIFETIME(MIN 0 MAX 1000)
+LAYOUT(POLYGON());
+
+SELECT 'Polygon dictionary';
+SELECT dictGet('polygon_dictionary', 'decimal_value', tuple(0.5, 0.5));
+
+DROP DICTIONARY polygon_dictionary;
+DROP TABLE dictionary_decimal_polygons_source_table;
diff --git a/tests/queries/0_stateless/01804_uniq_up_to_ubsan.reference b/tests/queries/0_stateless/01804_uniq_up_to_ubsan.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01804_uniq_up_to_ubsan.sql b/tests/queries/0_stateless/01804_uniq_up_to_ubsan.sql
new file mode 100644
index 00000000000..fcbe585b70a
--- /dev/null
+++ b/tests/queries/0_stateless/01804_uniq_up_to_ubsan.sql
@@ -0,0 +1,2 @@
+SELECT uniqUpTo(1e100)(number) FROM numbers(5); -- { serverError 70 }
+SELECT uniqUpTo(-1e100)(number) FROM numbers(5); -- { serverError 70 }
diff --git a/tests/queries/0_stateless/01809_inactive_parts_to_delay_throw_insert.reference b/tests/queries/0_stateless/01809_inactive_parts_to_delay_throw_insert.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01809_inactive_parts_to_delay_throw_insert.sql b/tests/queries/0_stateless/01809_inactive_parts_to_delay_throw_insert.sql
new file mode 100644
index 00000000000..e9bbfe69421
--- /dev/null
+++ b/tests/queries/0_stateless/01809_inactive_parts_to_delay_throw_insert.sql
@@ -0,0 +1,12 @@
+drop table if exists data_01809;
+
+create table data_01809 (i int) engine MergeTree order by i settings old_parts_lifetime = 10000000000, min_bytes_for_wide_part = 0, inactive_parts_to_throw_insert = 0, inactive_parts_to_delay_insert = 1;
+
+insert into data_01809 values (1);
+insert into data_01809 values (2);
+
+optimize table data_01809 final;
+
+insert into data_01809 values (3);
+
+drop table data_01809;
diff --git a/tests/queries/0_stateless/01810_max_part_removal_threads_long.reference b/tests/queries/0_stateless/01810_max_part_removal_threads_long.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01810_max_part_removal_threads_long.sh b/tests/queries/0_stateless/01810_max_part_removal_threads_long.sh
new file mode 100755
index 00000000000..f2aa1f63197
--- /dev/null
+++ b/tests/queries/0_stateless/01810_max_part_removal_threads_long.sh
@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+
+# NOTE: this done as not .sql since we need to Ordinary database
+# (to account threads in query_log for DROP TABLE query)
+# and we can do it compatible with parallel run only in .sh
+# (via $CLICKHOUSE_DATABASE)
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+$CLICKHOUSE_CLIENT -nm -q "create database ordinary_$CLICKHOUSE_DATABASE engine=Ordinary"
+
+# MergeTree
+$CLICKHOUSE_CLIENT -nm -q """
+    use ordinary_$CLICKHOUSE_DATABASE;
+    drop table if exists data_01810;
+    create table data_01810 (key Int) Engine=MergeTree() order by key partition by key settings max_part_removal_threads=10, concurrent_part_removal_threshold=49;
+    insert into data_01810 select * from numbers(50);
+    drop table data_01810 settings log_queries=1;
+    system flush logs;
+    select throwIf(length(thread_ids)<50) from system.query_log where event_date = today() and current_database = currentDatabase() and query = 'drop table data_01810 settings log_queries=1;' and type = 'QueryFinish' format Null;
+"""
+
+# ReplicatedMergeTree
+$CLICKHOUSE_CLIENT -nm -q """
+    use ordinary_$CLICKHOUSE_DATABASE;
+    drop table if exists rep_data_01810;
+    create table rep_data_01810 (key Int) Engine=ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/rep_data_01810', '1') order by key partition by key settings max_part_removal_threads=10, concurrent_part_removal_threshold=49;
+    insert into rep_data_01810 select * from numbers(50);
+    drop table rep_data_01810 settings log_queries=1;
+    system flush logs;
+    select throwIf(length(thread_ids)<50) from system.query_log where event_date = today() and current_database = currentDatabase() and query = 'drop table rep_data_01810 settings log_queries=1;' and type = 'QueryFinish' format Null;
+"""
+
+$CLICKHOUSE_CLIENT -nm -q "drop database ordinary_$CLICKHOUSE_DATABASE"
diff --git a/tests/queries/0_stateless/01811_filter_by_null.reference b/tests/queries/0_stateless/01811_filter_by_null.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01811_filter_by_null.sql b/tests/queries/0_stateless/01811_filter_by_null.sql
new file mode 100644
index 00000000000..496faf428ab
--- /dev/null
+++ b/tests/queries/0_stateless/01811_filter_by_null.sql
@@ -0,0 +1,9 @@
+DROP TABLE IF EXISTS test_01344;
+
+CREATE TABLE test_01344 (x String, INDEX idx (x) TYPE set(10) GRANULARITY 1) ENGINE = MergeTree ORDER BY tuple() SETTINGS min_bytes_for_wide_part = 0;
+INSERT INTO test_01344 VALUES ('Hello, world');
+SELECT NULL FROM test_01344 WHERE ignore(1) = NULL;
+SELECT NULL FROM test_01344 WHERE encrypt(ignore(encrypt(NULL, '0.0001048577', lcm(2, 65537), NULL, inf, NULL), lcm(-2, 1048575)), '-0.0000000001', lcm(NULL, NULL)) = NULL;
+SELECT NULL FROM test_01344 WHERE ignore(x, lcm(NULL, 1048576), -2) = NULL;
+
+DROP TABLE test_01344;
diff --git a/tests/queries/0_stateless/01811_storage_buffer_flush_parameters.reference b/tests/queries/0_stateless/01811_storage_buffer_flush_parameters.reference
new file mode 100644
index 00000000000..209e3ef4b62
--- /dev/null
+++ b/tests/queries/0_stateless/01811_storage_buffer_flush_parameters.reference
@@ -0,0 +1 @@
+20
diff --git a/tests/queries/0_stateless/01811_storage_buffer_flush_parameters.sql b/tests/queries/0_stateless/01811_storage_buffer_flush_parameters.sql
new file mode 100644
index 00000000000..dac68ad4ae8
--- /dev/null
+++ b/tests/queries/0_stateless/01811_storage_buffer_flush_parameters.sql
@@ -0,0 +1,22 @@
+drop table if exists data_01811;
+drop table if exists buffer_01811;
+
+create table data_01811 (key Int) Engine=Memory();
+/* Buffer with flush_rows=1000 */
+create table buffer_01811 (key Int) Engine=Buffer(currentDatabase(), data_01811,
+    /* num_layers= */ 1,
+    /* min_time= */   1,     /* max_time= */  86400,
+    /* min_rows= */   1e9,   /* max_rows= */  1e6,
+    /* min_bytes= */  0,     /* max_bytes= */ 4e6,
+    /* flush_time= */ 86400, /* flush_rows= */ 10, /* flush_bytes= */0
+);
+
+insert into buffer_01811 select * from numbers(10);
+insert into buffer_01811 select * from numbers(10);
+
+-- wait for background buffer flush
+select sleep(3) format Null;
+select count() from data_01811;
+
+drop table buffer_01811;
+drop table data_01811;
diff --git a/tests/queries/0_stateless/01812_basic_auth_http_server.reference b/tests/queries/0_stateless/01812_basic_auth_http_server.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01812_basic_auth_http_server.sh b/tests/queries/0_stateless/01812_basic_auth_http_server.sh
new file mode 100755
index 00000000000..4b993137bbd
--- /dev/null
+++ b/tests/queries/0_stateless/01812_basic_auth_http_server.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+# shellcheck disable=SC2046
+
+# In very old (e.g. 1.1.54385) versions of ClickHouse there was a bug in Poco HTTP library:
+# Basic HTTP authentication headers was not parsed if the size of URL is exactly 4077 + something bytes.
+# So, the user may get authentication error if valid credentials are passed.
+# This is a minor issue because it does not have security implications (at worse the user will be not allowed to access).
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+# In this test we do the opposite: passing the invalid credentials while server is accepting default user without a password.
+# And if the bug exists, they will be ignored (treat as empty credentials) and query succeed.
+
+for i in {3950..4100}; do ${CLICKHOUSE_CURL} --user default:12345 "${CLICKHOUSE_URL}&query=SELECT+1"$(perl -e "print '+'x$i") | grep -v -F 'password' ||:; done
+
+# You can check that the bug exists in old version by running the old server in Docker:
+# docker run --network host -it --rm yandex/clickhouse-server:1.1.54385
diff --git a/tests/queries/0_stateless/01812_has_generic.reference b/tests/queries/0_stateless/01812_has_generic.reference
new file mode 100644
index 00000000000..e8183f05f5d
--- /dev/null
+++ b/tests/queries/0_stateless/01812_has_generic.reference
@@ -0,0 +1,3 @@
+1
+1
+1
diff --git a/tests/queries/0_stateless/01812_has_generic.sql b/tests/queries/0_stateless/01812_has_generic.sql
new file mode 100644
index 00000000000..9ab5b655102
--- /dev/null
+++ b/tests/queries/0_stateless/01812_has_generic.sql
@@ -0,0 +1,3 @@
+SELECT has([(1, 2), (3, 4)], (toUInt16(3), 4));
+SELECT hasAny([(1, 2), (3, 4)], [(toUInt16(3), 4)]);
+SELECT hasAll([(1, 2), (3, 4)], [(toNullable(1), toUInt64(2)), (toUInt16(3), 4)]);
diff --git a/tests/queries/0_stateless/01812_optimize_skip_unused_shards_single_node.reference b/tests/queries/0_stateless/01812_optimize_skip_unused_shards_single_node.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01812_optimize_skip_unused_shards_single_node.sql b/tests/queries/0_stateless/01812_optimize_skip_unused_shards_single_node.sql
new file mode 100644
index 00000000000..c39947f2c04
--- /dev/null
+++ b/tests/queries/0_stateless/01812_optimize_skip_unused_shards_single_node.sql
@@ -0,0 +1,3 @@
+-- remote() does not have sharding key, while force_optimize_skip_unused_shards=2 requires from table to have it.
+-- But due to only one node, everything works.
+select * from remote('127.1', system.one) settings optimize_skip_unused_shards=1, force_optimize_skip_unused_shards=2 format Null;
diff --git a/tests/queries/0_stateless/01813_distributed_scalar_subqueries_alias.reference b/tests/queries/0_stateless/01813_distributed_scalar_subqueries_alias.reference
new file mode 100644
index 00000000000..5565ed6787f
--- /dev/null
+++ b/tests/queries/0_stateless/01813_distributed_scalar_subqueries_alias.reference
@@ -0,0 +1,4 @@
+0
+1
+0
+1
diff --git a/tests/queries/0_stateless/01813_distributed_scalar_subqueries_alias.sql b/tests/queries/0_stateless/01813_distributed_scalar_subqueries_alias.sql
new file mode 100644
index 00000000000..722bd4af5bb
--- /dev/null
+++ b/tests/queries/0_stateless/01813_distributed_scalar_subqueries_alias.sql
@@ -0,0 +1,18 @@
+DROP TABLE IF EXISTS data;
+CREATE TABLE data (a Int64, b Int64) ENGINE = TinyLog();
+
+DROP TABLE IF EXISTS data_distributed;
+CREATE TABLE data_distributed (a Int64, b Int64) ENGINE = Distributed(test_shard_localhost, currentDatabase(), 'data');
+
+INSERT INTO data VALUES (0, 0);
+
+SET prefer_localhost_replica = 1;
+SELECT a / (SELECT sum(number) FROM numbers(10)) FROM data_distributed;
+SELECT a < (SELECT 1) FROM data_distributed;
+
+SET prefer_localhost_replica = 0;
+SELECT a / (SELECT sum(number) FROM numbers(10)) FROM data_distributed;
+SELECT a < (SELECT 1) FROM data_distributed;
+
+DROP TABLE data_distributed;
+DROP TABLE data;
diff --git a/tests/queries/0_stateless/01817_storage_buffer_parameters.reference b/tests/queries/0_stateless/01817_storage_buffer_parameters.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01817_storage_buffer_parameters.sql b/tests/queries/0_stateless/01817_storage_buffer_parameters.sql
new file mode 100644
index 00000000000..84727bc5d6b
--- /dev/null
+++ b/tests/queries/0_stateless/01817_storage_buffer_parameters.sql
@@ -0,0 +1,42 @@
+drop table if exists data_01817;
+drop table if exists buffer_01817;
+
+create table data_01817 (key Int) Engine=Null();
+
+-- w/ flush_*
+create table buffer_01817 (key Int) Engine=Buffer(currentDatabase(), data_01817,
+    /* num_layers= */ 1,
+    /* min_time= */   1,     /* max_time= */  86400,
+    /* min_rows= */   1e9,   /* max_rows= */  1e6,
+    /* min_bytes= */  0,     /* max_bytes= */ 4e6,
+    /* flush_time= */ 86400, /* flush_rows= */ 10, /* flush_bytes= */0
+);
+drop table buffer_01817;
+
+-- w/o flush_*
+create table buffer_01817 (key Int) Engine=Buffer(currentDatabase(), data_01817,
+    /* num_layers= */ 1,
+    /* min_time= */   1,     /* max_time= */  86400,
+    /* min_rows= */   1e9,   /* max_rows= */  1e6,
+    /* min_bytes= */  0,     /* max_bytes= */ 4e6
+);
+drop table buffer_01817;
+
+-- not enough args
+create table buffer_01817 (key Int) Engine=Buffer(currentDatabase(), data_01817,
+    /* num_layers= */ 1,
+    /* min_time= */   1,     /* max_time= */  86400,
+    /* min_rows= */   1e9,   /* max_rows= */  1e6,
+    /* min_bytes= */  0      /* max_bytes= 4e6  */
+); -- { serverError 42 }
+-- too much args
+create table buffer_01817 (key Int) Engine=Buffer(currentDatabase(), data_01817,
+    /* num_layers= */ 1,
+    /* min_time= */   1,     /* max_time= */  86400,
+    /* min_rows= */   1e9,   /* max_rows= */  1e6,
+    /* min_bytes= */  0,     /* max_bytes= */ 4e6,
+    /* flush_time= */ 86400, /* flush_rows= */ 10, /* flush_bytes= */0,
+    0
+); -- { serverError 42 }
+
+drop table data_01817;
diff --git a/tests/queries/0_stateless/01818_case_float_value_fangyc.reference b/tests/queries/0_stateless/01818_case_float_value_fangyc.reference
new file mode 100644
index 00000000000..61780798228
--- /dev/null
+++ b/tests/queries/0_stateless/01818_case_float_value_fangyc.reference
@@ -0,0 +1 @@
+b
diff --git a/tests/queries/0_stateless/01818_case_float_value_fangyc.sql b/tests/queries/0_stateless/01818_case_float_value_fangyc.sql
new file mode 100644
index 00000000000..3cdb8503e64
--- /dev/null
+++ b/tests/queries/0_stateless/01818_case_float_value_fangyc.sql
@@ -0,0 +1 @@
+select case 1.1 when 0.1 then 'a' when 1.1 then 'b' when 2.1 then 'c' else 'default' end as f;
diff --git a/tests/queries/0_stateless/01818_input_format_with_names_use_header.reference b/tests/queries/0_stateless/01818_input_format_with_names_use_header.reference
new file mode 100644
index 00000000000..b7b577c4685
--- /dev/null
+++ b/tests/queries/0_stateless/01818_input_format_with_names_use_header.reference
@@ -0,0 +1,2 @@
+testdata1
+testdata2
diff --git a/tests/queries/0_stateless/01818_input_format_with_names_use_header.sh b/tests/queries/0_stateless/01818_input_format_with_names_use_header.sh
new file mode 100755
index 00000000000..953c39a40a2
--- /dev/null
+++ b/tests/queries/0_stateless/01818_input_format_with_names_use_header.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS \`01818_with_names\`;"
+
+${CLICKHOUSE_CLIENT} -q "CREATE TABLE \`01818_with_names\` (t String) ENGINE = MergeTree ORDER BY t;"
+
+echo -ne "t\ntestdata1\ntestdata2" | ${CLICKHOUSE_CLIENT} --input_format_with_names_use_header 0 --query "INSERT INTO \`01818_with_names\` FORMAT CSVWithNames"
+
+${CLICKHOUSE_CLIENT} -q "SELECT * FROM \`01818_with_names\`;"
+
+${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS \`01818_with_names\`;"
diff --git a/tests/queries/0_stateless/01820_unhex_case_insensitive.reference b/tests/queries/0_stateless/01820_unhex_case_insensitive.reference
new file mode 100644
index 00000000000..e692ee54787
--- /dev/null
+++ b/tests/queries/0_stateless/01820_unhex_case_insensitive.reference
@@ -0,0 +1 @@
+012	MySQL
diff --git a/tests/queries/0_stateless/01820_unhex_case_insensitive.sql b/tests/queries/0_stateless/01820_unhex_case_insensitive.sql
new file mode 100644
index 00000000000..99d8031eeda
--- /dev/null
+++ b/tests/queries/0_stateless/01820_unhex_case_insensitive.sql
@@ -0,0 +1,2 @@
+-- MySQL has function `unhex`, so we will make our function `unhex` also case insensitive for compatibility.
+SELECT unhex('303132'), UNHEX('4D7953514C');
diff --git a/tests/queries/0_stateless/01821_dictionary_primary_key_wrong_order.reference b/tests/queries/0_stateless/01821_dictionary_primary_key_wrong_order.reference
new file mode 100644
index 00000000000..9833cbcc9b6
--- /dev/null
+++ b/tests/queries/0_stateless/01821_dictionary_primary_key_wrong_order.reference
@@ -0,0 +1 @@
+1	20
diff --git a/tests/queries/0_stateless/01821_dictionary_primary_key_wrong_order.sql b/tests/queries/0_stateless/01821_dictionary_primary_key_wrong_order.sql
new file mode 100644
index 00000000000..636426fcc91
--- /dev/null
+++ b/tests/queries/0_stateless/01821_dictionary_primary_key_wrong_order.sql
@@ -0,0 +1,24 @@
+DROP TABLE IF EXISTS dictionary_primary_key_source_table;
+CREATE TABLE dictionary_primary_key_source_table
+(
+    identifier UInt64,
+    v UInt64
+) ENGINE = TinyLog;
+
+INSERT INTO dictionary_primary_key_source_table VALUES (20, 1);
+
+DROP DICTIONARY IF EXISTS flat_dictionary;
+CREATE DICTIONARY flat_dictionary
+(
+    identifier UInt64,
+    v UInt64
+)
+PRIMARY KEY v
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() TABLE 'dictionary_primary_key_source_table'))
+LIFETIME(MIN 1 MAX 1000)
+LAYOUT(FLAT());
+
+SELECT * FROM flat_dictionary;
+
+DROP DICTIONARY flat_dictionary;
+DROP TABLE dictionary_primary_key_source_table;
diff --git a/tests/queries/0_stateless/01821_to_date_time_ubsan.reference b/tests/queries/0_stateless/01821_to_date_time_ubsan.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01821_to_date_time_ubsan.sql b/tests/queries/0_stateless/01821_to_date_time_ubsan.sql
new file mode 100644
index 00000000000..74226fc221f
--- /dev/null
+++ b/tests/queries/0_stateless/01821_to_date_time_ubsan.sql
@@ -0,0 +1,2 @@
+SELECT toDateTime('9223372036854775806', 7); -- { serverError 407 }
+SELECT toDateTime('9223372036854775806', 8); -- { serverError 407 }
diff --git a/tests/queries/0_stateless/01822_async_read_from_socket_crash.reference b/tests/queries/0_stateless/01822_async_read_from_socket_crash.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01822_async_read_from_socket_crash.sh b/tests/queries/0_stateless/01822_async_read_from_socket_crash.sh
new file mode 100755
index 00000000000..b4bb2228a91
--- /dev/null
+++ b/tests/queries/0_stateless/01822_async_read_from_socket_crash.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+
+
+for _ in {1..10}; do $CLICKHOUSE_CLIENT -q "select number from remote('127.0.0.{2,3}', numbers(20)) limit 8 settings max_block_size = 2, unknown_packet_in_send_data=4, sleep_in_send_data_ms=100, async_socket_for_remote=1 format Null" > /dev/null 2>&1 || true; done
diff --git a/tests/queries/0_stateless/01822_union_and_constans_error.reference b/tests/queries/0_stateless/01822_union_and_constans_error.reference
new file mode 100644
index 00000000000..d00491fd7e5
--- /dev/null
+++ b/tests/queries/0_stateless/01822_union_and_constans_error.reference
@@ -0,0 +1 @@
+1
diff --git a/tests/queries/0_stateless/01822_union_and_constans_error.sql b/tests/queries/0_stateless/01822_union_and_constans_error.sql
new file mode 100644
index 00000000000..38b7df700cd
--- /dev/null
+++ b/tests/queries/0_stateless/01822_union_and_constans_error.sql
@@ -0,0 +1,20 @@
+drop table if exists t0;
+CREATE TABLE t0 (c0 String) ENGINE = Log();
+
+SELECT isNull(t0.c0) OR COUNT('\n?pVa')
+FROM t0
+GROUP BY t0.c0
+HAVING isNull(t0.c0)
+UNION ALL
+SELECT isNull(t0.c0) OR COUNT('\n?pVa')
+FROM t0
+GROUP BY t0.c0
+HAVING NOT isNull(t0.c0)
+UNION ALL
+SELECT isNull(t0.c0) OR COUNT('\n?pVa')
+FROM t0
+GROUP BY t0.c0
+HAVING isNull(isNull(t0.c0))
+SETTINGS aggregate_functions_null_for_empty = 1, enable_optimize_predicate_expression = 0;
+
+drop table if exists t0;
diff --git a/tests/queries/0_stateless/01823_array_low_cardinality_KuliginStepan.reference b/tests/queries/0_stateless/01823_array_low_cardinality_KuliginStepan.reference
new file mode 100644
index 00000000000..2439021d2e0
--- /dev/null
+++ b/tests/queries/0_stateless/01823_array_low_cardinality_KuliginStepan.reference
@@ -0,0 +1 @@
+[['a'],['b','c']]
diff --git a/tests/queries/0_stateless/01823_array_low_cardinality_KuliginStepan.sql b/tests/queries/0_stateless/01823_array_low_cardinality_KuliginStepan.sql
new file mode 100644
index 00000000000..528a3b464b3
--- /dev/null
+++ b/tests/queries/0_stateless/01823_array_low_cardinality_KuliginStepan.sql
@@ -0,0 +1,7 @@
+create temporary table test (
+    arr Array(Array(LowCardinality(String)))
+);
+
+insert into test(arr) values ([['a'], ['b', 'c']]);
+
+select arrayFilter(x -> 1, arr) from test;
diff --git a/tests/queries/0_stateless/01831_max_streams.reference b/tests/queries/0_stateless/01831_max_streams.reference
new file mode 100644
index 00000000000..573541ac970
--- /dev/null
+++ b/tests/queries/0_stateless/01831_max_streams.reference
@@ -0,0 +1 @@
+0
diff --git a/tests/queries/0_stateless/01831_max_streams.sql b/tests/queries/0_stateless/01831_max_streams.sql
new file mode 100644
index 00000000000..aa835dea5ac
--- /dev/null
+++ b/tests/queries/0_stateless/01831_max_streams.sql
@@ -0,0 +1 @@
+select * from remote('127.1', system.one) settings max_distributed_connections=0;
diff --git a/tests/queries/0_stateless/01833_test_collation_alvarotuso.reference b/tests/queries/0_stateless/01833_test_collation_alvarotuso.reference
new file mode 100644
index 00000000000..c55134e07d3
--- /dev/null
+++ b/tests/queries/0_stateless/01833_test_collation_alvarotuso.reference
@@ -0,0 +1,6 @@
+a	a
+A	A
+b	b
+B	B
+c	c
+C	C
diff --git a/tests/queries/0_stateless/01833_test_collation_alvarotuso.sql b/tests/queries/0_stateless/01833_test_collation_alvarotuso.sql
new file mode 100644
index 00000000000..65422731711
--- /dev/null
+++ b/tests/queries/0_stateless/01833_test_collation_alvarotuso.sql
@@ -0,0 +1,21 @@
+DROP TABLE IF EXISTS test_collation;
+
+CREATE TABLE test_collation
+(
+    `v` String,
+    `v2` String
+)
+ENGINE = MergeTree
+ORDER BY v
+SETTINGS index_granularity = 8192;
+
+insert into test_collation values ('A', 'A');
+insert into test_collation values ('B', 'B');
+insert into test_collation values ('C', 'C');
+insert into test_collation values ('a', 'a');
+insert into test_collation values ('b', 'b');
+insert into test_collation values ('c', 'c');
+
+SELECT * FROM test_collation ORDER BY v ASC COLLATE 'en';
+
+DROP TABLE test_collation;
diff --git a/tests/queries/0_stateless/01834_alias_columns_laziness_filimonov.reference b/tests/queries/0_stateless/01834_alias_columns_laziness_filimonov.reference
new file mode 100644
index 00000000000..7326d960397
--- /dev/null
+++ b/tests/queries/0_stateless/01834_alias_columns_laziness_filimonov.reference
@@ -0,0 +1 @@
+Ok
diff --git a/tests/queries/0_stateless/01834_alias_columns_laziness_filimonov.sh b/tests/queries/0_stateless/01834_alias_columns_laziness_filimonov.sh
new file mode 100755
index 00000000000..793f477b3cb
--- /dev/null
+++ b/tests/queries/0_stateless/01834_alias_columns_laziness_filimonov.sh
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+${CLICKHOUSE_CLIENT} --multiquery --query "
+drop table if exists aliases_lazyness;
+create table aliases_lazyness (x UInt32, y ALIAS sleepEachRow(0.1)) Engine=MergeTree ORDER BY x;
+insert into aliases_lazyness(x) select * from numbers(40);
+"
+
+# In very old ClickHouse versions alias column was calculated for every row.
+# If it works this way, the query will take at least 0.1 * 40 = 4 seconds.
+# If the issue does not exist, the query should take slightly more than 0.1 seconds.
+# The exact time is not guaranteed, so we check in a loop that at least once 
+# the query will process in less than one second, that proves that the behaviour is not like it was long time ago.
+
+while true
+do
+    timeout 1 ${CLICKHOUSE_CLIENT} --query "SELECT x, y FROM aliases_lazyness WHERE x = 1 FORMAT Null" && break
+done
+
+${CLICKHOUSE_CLIENT} --multiquery --query "
+drop table aliases_lazyness;
+SELECT 'Ok';
+"
diff --git a/tests/queries/0_stateless/01835_alias_to_primary_key_cyfdecyf.reference b/tests/queries/0_stateless/01835_alias_to_primary_key_cyfdecyf.reference
new file mode 100644
index 00000000000..1f49e6b362b
--- /dev/null
+++ b/tests/queries/0_stateless/01835_alias_to_primary_key_cyfdecyf.reference
@@ -0,0 +1,2 @@
+2017-12-15	1	1
+2017-12-15	1	1
diff --git a/tests/queries/0_stateless/01835_alias_to_primary_key_cyfdecyf.sql b/tests/queries/0_stateless/01835_alias_to_primary_key_cyfdecyf.sql
new file mode 100644
index 00000000000..54ffb7b4c1f
--- /dev/null
+++ b/tests/queries/0_stateless/01835_alias_to_primary_key_cyfdecyf.sql
@@ -0,0 +1,21 @@
+DROP TABLE IF EXISTS db;
+
+CREATE TABLE tb
+(
+    date Date,
+    `index` Int32,
+    value Int32,
+    idx Int32 ALIAS `index`
+)
+ENGINE = MergeTree
+PARTITION BY date
+ORDER BY (date, `index`);
+
+insert into tb values ('2017-12-15', 1, 1);
+
+SET force_primary_key = 1;
+
+select * from tb where `index` >= 0 AND `index` <= 2;
+select * from tb where idx >= 0 AND idx <= 2;
+
+DROP TABLE tb;
diff --git a/tests/queries/0_stateless/01836_date_time_keep_default_timezone_on_operations_den_crane.reference b/tests/queries/0_stateless/01836_date_time_keep_default_timezone_on_operations_den_crane.reference
new file mode 100644
index 00000000000..fc624e3510f
--- /dev/null
+++ b/tests/queries/0_stateless/01836_date_time_keep_default_timezone_on_operations_den_crane.reference
@@ -0,0 +1,6 @@
+DateTime
+DateTime
+DateTime(\'UTC\')
+DateTime64(3)
+DateTime64(3)
+DateTime64(3, \'UTC\')
diff --git a/tests/queries/0_stateless/01836_date_time_keep_default_timezone_on_operations_den_crane.sql b/tests/queries/0_stateless/01836_date_time_keep_default_timezone_on_operations_den_crane.sql
new file mode 100644
index 00000000000..be47cfb0411
--- /dev/null
+++ b/tests/queries/0_stateless/01836_date_time_keep_default_timezone_on_operations_den_crane.sql
@@ -0,0 +1,26 @@
+SELECT toTypeName(now());
+SELECT toTypeName(now() - 1);
+SELECT toTypeName(now('UTC') - 1);
+
+SELECT toTypeName(now64(3));
+SELECT toTypeName(now64(3) - 1);
+SELECT toTypeName(toTimeZone(now64(3), 'UTC') - 1);
+
+DROP TABLE IF EXISTS tt_null;
+DROP TABLE IF EXISTS tt;
+DROP TABLE IF EXISTS tt_mv;
+
+create table tt_null(p String) engine = Null;
+
+create table tt(p String,tmin AggregateFunction(min, DateTime)) 
+engine = AggregatingMergeTree  order by p;
+
+create materialized view tt_mv to tt as 
+select p, minState(now() - interval 30 minute) as tmin
+from tt_null group by p;
+
+insert into tt_null values('x');
+
+DROP TABLE tt_null;
+DROP TABLE tt;
+DROP TABLE tt_mv;
diff --git a/tests/queries/0_stateless/arcadia_skip_list.txt b/tests/queries/0_stateless/arcadia_skip_list.txt
index 4e523545938..f7068c16edd 100644
--- a/tests/queries/0_stateless/arcadia_skip_list.txt
+++ b/tests/queries/0_stateless/arcadia_skip_list.txt
@@ -15,6 +15,7 @@
 00732_base64_functions
 00746_hashing_tuples
 00751_hashing_ints
+00753_distributed_system_columns_and_system_tables
 00800_function_java_hash
 00800_low_cardinality_distributed_insert
 00821_distributed_storage_with_join_on
@@ -90,6 +91,7 @@
 01125_dict_ddl_cannot_add_column
 01129_dict_get_join_lose_constness
 01138_join_on_distributed_and_tmp
+01153_attach_mv_uuid
 01191_rename_dictionary
 01200_mutations_memory_consumption
 01211_optimize_skip_unused_shards_type_mismatch
@@ -175,7 +177,7 @@
 01560_timeseriesgroupsum_segfault
 00976_ttl_with_old_parts
 01584_distributed_buffer_cannot_find_column
-01018_ip_dictionary
+01018_ip_dictionary_long
 01582_distinct_subquery_groupby
 01558_ttest
 01558_ttest_scipy
@@ -197,7 +199,9 @@
 01181_db_atomic_drop_on_cluster
 01658_test_base64Encode_mysql_compatibility
 01659_test_base64Decode_mysql_compatibility
+01670_distributed_bytes_to_throw_insert
 01674_htm_xml_coarse_parse
+01675_distributed_bytes_to_delay_insert
 01675_data_type_coroutine
 01676_clickhouse_client_autocomplete
 01671_aggregate_function_group_bitmap_data
@@ -207,3 +211,24 @@
 01702_bitmap_native_integers
 01686_event_time_microseconds_part_log
 01017_uniqCombined_memory_usage
+01747_join_view_filter_dictionary
+01748_dictionary_table_dot
+01755_client_highlight_multi_line_comment_regression
+00950_dict_get
+01683_flat_dictionary
+01681_cache_dictionary_simple_key
+01682_cache_dictionary_complex_key
+01684_ssd_cache_dictionary_simple_key
+01685_ssd_cache_dictionary_complex_key
+01304_polygons_sym_difference
+01305_polygons_union
+01306_polygons_intersection
+01702_system_query_log
+01759_optimize_skip_unused_shards_zero_shards
+01780_clickhouse_dictionary_source_loop
+01790_dist_INSERT_block_structure_mismatch_types_and_names
+01791_dist_INSERT_block_structure_mismatch
+01801_distinct_group_by_shard
+01804_dictionary_decimal256_type
+01801_s3_distributed
+01833_test_collation_alvarotuso
diff --git a/tests/queries/0_stateless/country_polygons.tsv b/tests/queries/0_stateless/country_polygons.tsv
new file mode 100644
index 00000000000..4fa8313e3cb
--- /dev/null
+++ b/tests/queries/0_stateless/country_polygons.tsv
@@ -0,0 +1,2 @@
+Dhekelia Sovereign Base Area	[[(33.905868,35.090882),(33.913619,35.090882),(33.921474,35.080702),(33.914446,35.073054),(33.908245,35.070729),(33.906524,35.069122),(33.906506,35.069105),(33.898116,35.061272),(33.880133,35.073054),(33.874655,35.067525),(33.867627,35.060497),(33.855122,35.053417),(33.841169,35.051092),(33.834865,35.056621),(33.827113,35.061272),(33.813781,35.055794),(33.804375,35.049541),(33.799001,35.038534),(33.822359,35.030059),(33.830214,35.023031),(33.829387,35.001176),(33.829387,35.001172),(33.840342,34.993369),(33.859049,34.991819),(33.859049,34.974662),(33.850471,34.973009),(33.838068,34.963707),(33.84582,34.959728),(33.864423,34.962983),(33.891841,34.958139),(33.8838,34.949123),(33.874522,34.94123),(33.862315,34.937893),(33.847423,34.94245),(33.819672,34.964748),(33.80421,34.972602),(33.781896,34.976212),(33.784945,34.976212),(33.788046,34.976988),(33.7928,34.977763),(33.79435,34.977763),(33.791146,34.982414),(33.786495,34.984687),(33.782568,34.984687),(33.777917,34.984687),(33.77399,34.988666),(33.766135,34.990268),(33.761484,34.990268),(33.75921,34.988666),(33.765411,34.985566),(33.769339,34.983964),(33.770889,34.980088),(33.77554,34.980088),(33.780191,34.979313),(33.780986,34.976338),(33.780935,34.976345),(33.760427,34.979682),(33.717296,34.977769),(33.70152,34.97289),(33.702935,34.987943),(33.711461,34.985566),(33.71544,34.997296),(33.699731,35.002722),(33.69663,35.008975),(33.705312,35.015228),(33.702211,35.022256),(33.685003,35.029284),(33.679444,35.033891),(33.679435,35.033899),(33.675649,35.037036),(33.674099,35.046441),(33.678853,35.055794),(33.69446,35.058171),(33.705312,35.06675),(33.714717,35.06675),(33.719368,35.06277),(33.711461,35.040963),(33.707585,35.029284),(33.718489,35.032385),(33.739677,35.047216),(33.766135,35.03161),(33.77554,35.040188),(33.786495,35.038534),(33.79435,35.040188),(33.798278,35.052642),(33.824012,35.06675),(33.834865,35.063597),(33.842719,35.056621),(33.853571,35.058171),(33.866904,35.06675),(33.871555,35.073054),(33.876929,35.076826),(33.871555,35.085456),(33.871555,35.100236),(33.876206,35.118994),(33.889435,35.118994),(33.891812,35.110468),(33.89884,35.108814),(33.903594,35.099512),(33.905868,35.09636),(33.905868,35.090882)],[(33.742792,35.001233),(33.746689,35.002711),(33.752063,35.004323),(33.752063,35.0144),(33.746151,35.015207),(33.741314,35.013729),(33.740239,35.010101),(33.738761,35.005264),(33.739702,35.002576),(33.742792,35.001233)]]
+Kyrgyzstan	[[(75.204639,42.84519),(75.271198,42.845758),(75.496611,42.823925),(75.535988,42.827025),(75.555936,42.825217),(75.620428,42.805295),(75.646163,42.806096),(75.675308,42.815372),(75.703833,42.830488),(75.727605,42.848678),(75.73825,42.861571),(75.770599,42.92565),(75.782072,42.933324),(75.797161,42.936192),(75.807059,42.936771),(75.858966,42.939809),(75.898033,42.935701),(75.976582,42.918725),(75.999113,42.91764),(76.064535,42.93397),(76.09058,42.93428),(76.163754,42.921154),(76.254498,42.921154),(76.340487,42.901672),(76.351132,42.902886),(76.370976,42.909604),(76.382965,42.910069),(76.3933,42.905263),(76.404463,42.889244),(76.414074,42.885497),(76.432058,42.88958),(76.461927,42.910999),(76.48053,42.916968),(76.506885,42.914488),(76.558768,42.89821),(76.58502,42.894799),(76.605897,42.898494),(76.644345,42.911129),(76.688786,42.910328),(76.707907,42.913661),(76.74625,42.928879),(76.750385,42.932574),(76.751625,42.937096),(76.753899,42.940765),(76.76134,42.942057),(76.77953,42.939292),(76.785214,42.939654),(76.792966,42.943065),(76.814153,42.961487),(76.83348,42.971745),(76.853427,42.974122),(76.897662,42.974536),(76.93735,42.986034),(76.956884,42.988514),(76.976417,42.98221),(77.089899,42.968154),(77.124005,42.958904),(77.135064,42.951746),(77.163693,42.921981),(77.178679,42.913196),(77.195112,42.910069),(77.21189,42.909944),(77.229632,42.909811),(77.328127,42.897564),(77.36089,42.90454),(77.403265,42.919759),(77.418561,42.922239),(77.43396,42.921412),(77.461762,42.914384),(77.501553,42.914539),(77.520984,42.906917),(77.53845,42.896272),(77.557777,42.888133),(77.574417,42.887848),(77.62692,42.906555),(77.647797,42.909501),(77.71384,42.907589),(77.781226,42.895626),(77.787531,42.889709),(77.791665,42.883043),(77.798176,42.877513),(77.809958,42.871286),(77.83559,42.879839),(77.852229,42.887952),(77.861221,42.89082),(77.883855,42.893223),(77.907006,42.891285),(77.929331,42.885006),(77.986175,42.860202),(78.030616,42.854672),(78.137897,42.861984),(78.183579,42.86015),(78.229777,42.865007),(78.249104,42.862398),(78.290136,42.851442),(78.31122,42.850512),(78.328376,42.855292),(78.364653,42.872526),(78.38553,42.878237),(78.429559,42.880665),(78.496118,42.875601),(78.594303,42.850228),(78.635437,42.832477),(78.669957,42.811161),(78.687114,42.804598),(78.807933,42.79558),(78.888135,42.771215),(78.954281,42.768424),(78.992935,42.757133),(79.030866,42.756151),(79.108794,42.785348),(79.148274,42.790981),(79.173389,42.785632),(79.180831,42.77553),(79.175146,42.737031),(79.176076,42.713931),(79.181864,42.693597),(79.192199,42.674838),(79.206359,42.656467),(79.242119,42.629776),(79.321287,42.602181),(79.353016,42.577299),(79.398388,42.496942),(79.425673,42.469605),(79.47642,42.453973),(79.571918,42.449529),(79.652533,42.461053),(79.696458,42.459838),(79.917943,42.42444),(79.960111,42.403511),(79.97396,42.39147),(80.012098,42.349509),(80.077003,42.305765),(80.110076,42.273338),(80.136534,42.23887),(80.16661,42.208717),(80.210328,42.189519),(80.21653,42.174404),(80.219837,42.141873),(80.224591,42.125569),(80.235133,42.110945),(80.247432,42.098413),(80.256527,42.084357),(80.257561,42.065263),(80.231206,42.033689),(80.181906,42.020976),(79.930862,42.023276),(79.879496,42.013199),(79.842909,42.00183),(79.826786,41.992244),(79.812833,41.97762),(79.803842,41.959998),(79.792576,41.922817),(79.783274,41.905092),(79.747514,41.879745),(79.702969,41.874939),(79.655737,41.875843),(79.610985,41.867626),(79.554658,41.837602),(79.489856,41.819257),(79.410997,41.778588),(79.390844,41.772697),(79.367382,41.772387),(79.30413,41.787554),(79.282323,41.783497),(79.264856,41.774506),(79.217521,41.741226),(79.19592,41.729521),(79.174526,41.722622),(79.127914,41.714302),(79.088743,41.702546),(78.976192,41.6418),(78.915834,41.63317),(78.897437,41.626272),(78.807313,41.578445),(78.672128,41.538448),(78.658278,41.532453),(78.645049,41.52372),(78.637401,41.512868),(78.629133,41.48796),(78.619211,41.478089),(78.583968,41.465997),(78.51038,41.454422),(78.41757,41.400471),(78.377675,41.386622),(78.359899,41.377527),(78.343466,41.362024),(78.339332,41.344041),(78.356901,41.305542),(78.359692,41.287455),(78.34946,41.270402),(78.331477,41.258723),(78.291582,41.240791),(78.275356,41.228854),(78.250345,41.200535),(78.231335,41.172856),(78.204456,41.133718),(78.190503,41.11775),(78.176034,41.105502),(78.074955,41.039512),(78.057178,41.034344),(78.036508,41.036101),(77.997647,41.049795),(77.866699,41.064058),(77.831042,41.062973),(77.797556,41.054704),(77.665574,41.001271),(77.650278,40.997137),(77.631778,40.995793),(77.580721,40.997705),(77.503517,40.981066),(77.474888,40.982047),(77.445226,40.993675),(77.388795,41.011658),(77.332985,41.02065),(77.301152,41.019306),(77.243171,41.005664),(77.118838,41.011658),(77.088555,41.019565),(77.035018,41.040338),(77.007733,41.044214),(76.900143,41.025766),(76.860972,41.013208),(76.834927,40.99352),(76.820871,40.97781),(76.783974,40.957139),(76.766818,40.944685),(76.757413,40.925772),(76.760927,40.9066),(76.768368,40.887014),(76.770848,40.867119),(76.762477,40.847017),(76.746871,40.83446),(76.707286,40.817613),(76.674214,40.795444),(76.647859,40.764851),(76.630805,40.728885),(76.624191,40.627547),(76.62078,40.611321),(76.609411,40.59711),(76.556391,40.56569),(76.531173,40.534995),(76.498927,40.464611),(76.476499,40.436138),(76.449111,40.415519),(76.361984,40.371904),(76.330152,40.348081),(76.313512,40.343327),(76.299353,40.355677),(76.283333,40.417276),(76.273411,40.434122),(76.244162,40.441202),(76.21543,40.416552),(76.185044,40.384203),(76.151351,40.368131),(76.132541,40.371542),(76.095231,40.387355),(76.07611,40.391954),(76.051616,40.390197),(75.962422,40.357331),(75.949297,40.343068),(75.938031,40.326222),(75.921495,40.309117),(75.901858,40.298885),(75.880464,40.295268),(75.858553,40.296353),(75.79375,40.30891),(75.772046,40.31015),(75.750549,40.308342),(75.704454,40.293149),(75.681819,40.291702),(75.664869,40.305706),(75.656291,40.32307),(75.640168,40.367305),(75.638308,40.386115),(75.646369,40.405338),(75.659598,40.419084),(75.669314,40.432365),(75.666936,40.450245),(75.657221,40.461097),(75.629006,40.481303),(75.617947,40.493964),(75.610816,40.512877),(75.605648,40.569411),(75.587665,40.611941),(75.559863,40.63287),(75.523793,40.63318),(75.481832,40.614111),(75.26324,40.480166),(75.253318,40.47598),(75.241536,40.474068),(75.229237,40.470347),(75.223966,40.462441),(75.220142,40.452984),(75.212494,40.444716),(75.19389,40.441254),(75.175287,40.448127),(75.15658,40.458152),(75.13808,40.463888),(75.113172,40.460787),(75.064389,40.443837),(75.039068,40.441099),(75.002378,40.4473),(74.966101,40.459289),(74.879181,40.505074),(74.856443,40.513187),(74.835359,40.511637),(74.832312,40.508116),(74.820063,40.493964),(74.816032,40.48368),(74.815102,40.480114),(74.807041,40.461769),(74.794638,40.440737),(74.787404,40.420738),(74.794638,40.405545),(74.841664,40.372059),(74.853859,40.35883),(74.862128,40.32617),(74.830915,40.319917),(74.746683,40.336505),(74.724668,40.337539),(74.705755,40.331286),(74.654388,40.291547),(74.637645,40.281987),(74.598681,40.266174),(74.565402,40.24695),(74.476622,40.172433),(74.369858,40.105822),(74.333788,40.09373),(74.302885,40.090061),(74.272293,40.093833),(74.237876,40.10391),(74.20315,40.109853),(74.167596,40.10639),(74.13287,40.095332),(74.101244,40.078847),(74.069515,40.067788),(74.003989,40.060812),(73.976704,40.043603),(73.966368,40.033268),(73.957894,40.021434),(73.952106,40.008257),(73.949729,39.993684),(73.944044,39.970068),(73.927301,39.953325),(73.907561,39.937873),(73.893195,39.918133),(73.885443,39.876534),(73.880689,39.86501),(73.872937,39.856845),(73.844102,39.838086),(73.83201,39.82372),(73.823018,39.805685),(73.818574,39.786048),(73.819814,39.766721),(73.829529,39.746981),(73.843068,39.740366),(73.859915,39.737162),(73.879345,39.727912),(73.893505,39.710394),(73.899602,39.689465),(73.904253,39.64647),(73.926784,39.592882),(73.921617,39.582133),(73.899292,39.571539),(73.883066,39.561204),(73.870457,39.546786),(73.859192,39.524255),(73.848029,39.489735),(73.838314,39.475679),(73.820744,39.468186),(73.632642,39.448343),(73.604323,39.459608),(73.512236,39.467411),(73.476889,39.464776),(73.367645,39.443795),(73.343151,39.430669),(73.335503,39.415166),(73.333332,39.40111),(73.326408,39.390878),(73.269357,39.382558),(73.167864,39.355377),(73.136032,39.353465),(73.100995,39.361164),(73.083425,39.367831),(73.071126,39.370725),(73.058414,39.368813),(73.009321,39.348607),(72.994335,39.347832),(72.976765,39.352224),(72.91434,39.362715),(72.893669,39.363903),(72.850468,39.35672),(72.835275,39.356204),(72.65048,39.393772),(72.633737,39.394496),(72.616373,39.390413),(72.606141,39.383489),(72.587021,39.364885),(72.575756,39.359304),(72.559426,39.359562),(72.534104,39.372327),(72.519015,39.375686),(72.50806,39.371965),(72.476744,39.346127),(72.460414,39.344111),(72.443567,39.344783),(72.410701,39.351346),(72.393234,39.350829),(72.355924,39.336101),(72.334117,39.333828),(72.31634,39.328815),(72.304248,39.31357),(72.281407,39.259724),(72.240272,39.189909),(72.228903,39.189237),(72.228668,39.189502),(72.218568,39.20089),(72.209163,39.217297),(72.206476,39.226883),(72.206373,39.234609),(72.203272,39.24081),(72.182395,39.249337),(72.167098,39.258742),(72.158623,39.262617),(72.115525,39.268147),(72.094751,39.275072),(72.08576,39.290109),(72.084106,39.311245),(72.078112,39.336618),(72.06695,39.358477),(72.049793,39.368864),(72.031499,39.366694),(71.996463,39.351863),(71.959152,39.345868),(71.942306,39.339047),(71.843501,39.285045),(71.807017,39.272849),(71.77043,39.269542),(71.751207,39.274245),(71.732913,39.285097),(71.71834,39.301065),(71.710899,39.32096),(71.712966,39.341527),(71.723198,39.353981),(71.736634,39.364575),(71.748106,39.379561),(71.751827,39.399663),(71.749243,39.425502),(71.740251,39.448343),(71.724438,39.459401),(71.704594,39.458988),(71.602792,39.442348),(71.554319,39.444157),(71.512875,39.458833),(71.492101,39.493663),(71.500576,39.509217),(71.526001,39.538156),(71.531375,39.553091),(71.52538,39.569162),(71.510911,39.584148),(71.509654,39.584998),(71.493031,39.596241),(71.459545,39.612105),(71.441251,39.610658),(71.406731,39.598153),(71.378309,39.594173),(71.368543,39.591486),(71.361618,39.587559),(71.347872,39.576242),(71.340586,39.571694),(71.305911,39.557173),(71.291958,39.548957),(71.260074,39.520638),(71.249273,39.514385),(71.236923,39.514488),(71.179975,39.523015),(71.137446,39.521155),(71.095898,39.51237),(71.062928,39.495627),(71.042309,39.467876),(71.027581,39.435217),(71.009288,39.407622),(70.977145,39.394909),(70.949808,39.400749),(70.925159,39.412944),(70.903351,39.420851),(70.884489,39.413874),(70.872242,39.402971),(70.864181,39.400594),(70.855292,39.40173),(70.840099,39.40142),(70.828059,39.398578),(70.797621,39.385349),(70.770129,39.382093),(70.739744,39.386228),(70.713285,39.398423),(70.698092,39.41899),(70.698609,39.431393),(70.703053,39.444725),(70.705431,39.458523),(70.699746,39.472165),(70.690134,39.479193),(70.666725,39.486893),(70.655976,39.493663),(70.655976,39.493714),(70.655925,39.49387),(70.655598,39.494664),(70.635977,39.542497),(70.622128,39.563529),(70.59784,39.577792),(70.58027,39.579549),(70.54358,39.574278),(70.526113,39.575622),(70.513504,39.581513),(70.490973,39.596861),(70.477227,39.601201),(70.459967,39.599548),(70.427618,39.590091),(70.411082,39.587456),(70.40147,39.584768),(70.395372,39.579497),(70.390411,39.57402),(70.384313,39.570867),(70.374288,39.571022),(70.353462,39.575932),(70.343179,39.576862),(70.33026,39.573089),(70.241066,39.522395),(70.223289,39.519088),(70.20603,39.5241),(70.204376,39.538156),(70.215021,39.574071),(70.214814,39.591125),(70.210267,39.609728),(70.200655,39.619495),(70.185204,39.610348),(70.15735,39.563891),(70.148979,39.554279),(70.132442,39.550042),(70.116268,39.554641),(70.08273,39.569782),(70.062266,39.573451),(70.040355,39.573606),(70.019684,39.568594),(70.002734,39.556863),(69.987128,39.539603),(69.978757,39.534436),(69.948629,39.545081),(69.907753,39.548492),(69.830445,39.536244),(69.791585,39.545391),(69.74983,39.563839),(69.710349,39.574071),(69.669421,39.577792),(69.582295,39.573555),(69.564932,39.568129),(69.531445,39.545649),(69.514392,39.537588),(69.496099,39.532575),(69.477288,39.530405),(69.455274,39.530456),(69.412176,39.52503),(69.391454,39.530508),(69.367218,39.549938),(69.361637,39.552884),(69.352025,39.549628),(69.348407,39.543169),(69.345927,39.535366),(69.339726,39.528079),(69.300348,39.515625),(69.286189,39.539707),(69.29115,39.658872),(69.287533,39.677786),(69.280091,39.694271),(69.265932,39.707758),(69.248362,39.719385),(69.233324,39.732666),(69.226296,39.751011),(69.229552,39.790544),(69.240714,39.82894),(69.286447,39.935755),(69.305671,39.968621),(69.310064,39.978646),(69.310322,39.984796),(69.313991,39.986914),(69.32784,39.984744),(69.357296,39.959474),(69.405355,39.896119),(69.501576,39.922474),(69.500439,39.935703),(69.477288,39.968156),(69.478115,39.975029),(69.477288,39.981592),(69.475118,39.987741),(69.471191,39.993684),(69.463129,40.025413),(69.46964,40.050993),(69.485712,40.073731),(69.506331,40.096933),(69.509224,40.103445),(69.513462,40.120705),(69.518009,40.125097),(69.526071,40.123185),(69.536613,40.107889),(69.543021,40.103083),(69.558834,40.101739),(69.575474,40.1036),(69.969558,40.211603),(70.004595,40.208761),(70.14717,40.136983),(70.168822,40.13166),(70.218535,40.134141),(70.241531,40.132745),(70.263494,40.12427),(70.277808,40.112075),(70.290262,40.098174),(70.306282,40.08479),(70.324265,40.077503),(70.359509,40.074041),(70.397646,40.061225),(70.477227,40.052027),(70.502135,40.045981),(70.525493,40.033682),(70.535622,40.015957),(70.520946,39.993736),(70.505029,39.985106),(70.488493,39.978543),(70.473197,39.97012),(70.460226,39.956115),(70.450872,39.937408),(70.44803,39.919993),(70.455627,39.906816),(70.477227,39.900925),(70.485961,39.909606),(70.494177,39.931672),(70.500895,39.940561),(70.512574,39.94516),(70.555052,39.946245),(70.576601,39.952239),(70.5966,39.961955),(70.613963,39.975752),(70.627399,39.993891),(70.635977,40.028514),(70.634737,40.059313),(70.63944,40.084945),(70.66595,40.104168),(70.729822,40.120705),(70.743464,40.127113),(70.782532,40.152589),(70.788733,40.158997),(70.792144,40.161374),(70.797725,40.161942),(70.802686,40.160134),(70.806045,40.157653),(70.806716,40.156155),(70.824906,40.163544),(70.831831,40.168195),(70.845164,40.171813),(70.898545,40.162614),(70.929293,40.170624),(70.962883,40.189693),(70.979522,40.214084),(70.958955,40.238372),(70.995129,40.266587),(71.053213,40.274235),(71.169382,40.26142),(71.201008,40.263848),(71.215115,40.280747),(71.223952,40.302864),(71.239558,40.321106),(71.253821,40.324413),(71.263949,40.318212),(71.272838,40.307722),(71.283225,40.29842),(71.297074,40.293821),(71.313559,40.292684),(71.344926,40.295216),(71.365132,40.294131),(71.396551,40.271548),(71.441355,40.260903),(71.450966,40.248914),(71.458925,40.234134),(71.477115,40.220802),(71.498405,40.210518),(71.521246,40.203749),(71.568272,40.196566),(71.592973,40.198426),(71.601655,40.20995),(71.604032,40.227261),(71.61013,40.246382),(71.62832,40.258887),(71.645993,40.247105),(71.660153,40.224471),(71.667181,40.204162),(71.666871,40.163131),(71.673072,40.147886),(71.693329,40.141117),(71.707178,40.144269),(71.759785,40.168092),(71.775908,40.179926),(71.78676,40.193517),(71.805467,40.225298),(71.836473,40.249172),(71.872956,40.250774),(71.912334,40.243436),(71.951814,40.240904),(71.96339,40.243746),(71.969178,40.244418),(71.977033,40.243074),(71.989021,40.239302),(72.004834,40.237287),(72.01889,40.240026),(72.025402,40.250878),(72.019821,40.258732),(72.013239,40.262072),(72.005971,40.26576),(71.977033,40.276096),(71.958222,40.286534),(71.951091,40.30152),(71.951094,40.301529),(71.956672,40.31568),(72.043178,40.349321),(72.069637,40.369423),(72.084106,40.39738),(72.090101,40.416035),(72.099299,40.426371),(72.165858,40.454431),(72.182705,40.45779),(72.228328,40.459606),(72.235931,40.459909),(72.254225,40.458307),(72.263415,40.452651),(72.26363,40.452519),(72.259599,40.44239),(72.24513,40.438721),(72.228077,40.437533),(72.216501,40.434949),(72.211768,40.425836),(72.211644,40.425596),(72.224356,40.422443),(72.269624,40.424045),(72.284301,40.41986),(72.343418,40.393401),(72.370497,40.38565),(72.394061,40.389422),(72.414422,40.410713),(72.425171,40.435983),(72.426204,40.45934),(72.426096,40.459545),(72.420028,40.471027),(72.415662,40.479287),(72.415585,40.47933),(72.372254,40.503265),(72.363469,40.512309),(72.363467,40.51241),(72.363262,40.523574),(72.36998,40.539852),(72.370083,40.557732),(72.369928,40.557931),(72.348483,40.585379),(72.348509,40.585508),(72.351893,40.601967),(72.381556,40.612148),(72.414835,40.589875),(72.447908,40.560471),(72.476744,40.549567),(72.515294,40.54564),(72.585781,40.508743),(72.625468,40.5105),(72.640868,40.519853),(72.65048,40.532152),(72.655131,40.546363),(72.656474,40.561143),(72.664226,40.577783),(72.682416,40.577679),(72.719209,40.564864),(72.748355,40.575096),(72.760034,40.641758),(72.783908,40.669663),(72.818945,40.681084),(72.890982,40.695088),(72.976765,40.736068),(73.070609,40.762474),(73.118048,40.782938),(73.148641,40.813686),(73.14337,40.833839),(73.143292,40.833853),(73.135042,40.835274),(73.112467,40.839162),(73.053556,40.83632),(73.033299,40.847224),(73.01945,40.8619),(73.00343,40.870168),(72.929429,40.844175),(72.883127,40.819628),(72.870311,40.818181),(72.872998,40.834821),(72.868658,40.864122),(72.830107,40.87208),(72.701226,40.863243),(72.658231,40.867171),(72.619474,40.88009),(72.588468,40.905825),(72.545577,40.956519),(72.52625,40.962204),(72.501445,40.963496),(72.483358,40.970575),(72.483565,40.99352),(72.485219,40.999566),(72.484702,41.004682),(72.481911,41.008816),(72.476744,41.011813),(72.423517,41.01574),(72.395198,41.022045),(72.374321,41.031967),(72.345692,41.06597),(72.33236,41.072843),(72.314066,41.061681),(72.308795,41.054446),(72.297323,41.028143),(72.289778,41.023544),(72.252985,41.019616),(72.195486,41.006358),(72.165135,40.999359),(72.178777,41.023182),(72.185599,41.041062),(72.185599,41.060647),(72.1764,41.112892),(72.174643,41.141418),(72.169889,41.168651),(72.158417,41.187875),(72.132889,41.199295),(72.108497,41.196401),(72.085243,41.184877),(72.063642,41.170201),(72.033773,41.15661),(72.016513,41.163535),(72.001217,41.18002),(71.977033,41.195213),(71.897658,41.184929),(71.871613,41.194489),(71.866342,41.236606),(71.868822,41.279239),(71.863034,41.312208),(71.847015,41.341819),(71.75317,41.44729),(71.745212,41.45282),(71.73684,41.455404),(71.730433,41.451166),(71.729709,41.430082),(71.721648,41.424759),(71.712242,41.428015),(71.706868,41.444086),(71.696119,41.447445),(71.691469,41.441916),(71.687334,41.431012),(71.681443,41.422847),(71.671935,41.425483),(71.671108,41.437627),(71.689505,41.493799),(71.689401,41.514625),(71.68413,41.534055),(71.671418,41.547388),(71.649507,41.54992),(71.62739,41.543202),(71.615297,41.532143),(71.595454,41.493799),(71.595454,41.493747),(71.595557,41.493696),(71.595557,41.493489),(71.605582,41.476849),(71.633694,41.449616),(71.637415,41.431271),(71.633074,41.411324),(71.618811,41.377786),(71.585532,41.323525),(71.557937,41.301718),(71.52383,41.296654),(71.480629,41.310761),(71.432466,41.344816),(71.418772,41.3474),(71.412571,41.334687),(71.421459,41.162088),(71.416085,41.127362),(71.393657,41.112737),(71.325238,41.157334),(71.300226,41.133046),(71.289478,41.113874),(71.276145,41.113151),(71.263381,41.123486),(71.253821,41.13749),(71.241522,41.175162),(71.230153,41.187255),(71.206382,41.188753),(71.185711,41.180227),(71.183024,41.166377),(71.187882,41.148446),(71.189949,41.127465),(71.18013,41.108138),(71.164421,41.116199),(71.139099,41.148394),(71.123079,41.158212),(71.085769,41.162036),(71.067579,41.169736),(71.047012,41.182035),(71.024688,41.189787),(70.977145,41.19635),(70.93415,41.19144),(70.914203,41.193042),(70.895962,41.206116),(70.882164,41.220482),(70.865731,41.233195),(70.847747,41.243065),(70.828524,41.249111),(70.805993,41.247458),(70.786563,41.24043),(70.770439,41.238518),(70.758037,41.25216),(70.75628,41.269627),(70.77106,41.331018),(70.769199,41.352102),(70.759691,41.372515),(70.70357,41.445482),(70.686724,41.462483),(70.66781,41.471372),(70.633807,41.467496),(70.511334,41.414476),(70.477227,41.404657),(70.470782,41.404879),(70.453198,41.405484),(70.438057,41.416078),(70.413614,41.450701),(70.398989,41.464964),(70.382246,41.476436),(70.344936,41.493489),(70.344729,41.493644),(70.344522,41.493696),(70.344419,41.493799),(70.203446,41.505633),(70.166549,41.520206),(70.148255,41.552452),(70.169288,41.578342),(70.33119,41.649629),(70.390824,41.685054),(70.423484,41.696913),(70.453663,41.71208),(70.477227,41.738435),(70.506476,41.78559),(70.550091,41.824063),(70.648948,41.887393),(70.679696,41.901113),(70.779328,41.909665),(70.814003,41.919535),(70.825113,41.93633),(70.828059,41.993743),(70.845474,42.030356),(70.886711,42.038495),(70.935907,42.036867),(70.977145,42.044231),(71.118429,42.122908),(71.201008,42.140788),(71.238215,42.160244),(71.253201,42.197555),(71.249868,42.198385),(71.217854,42.206365),(71.077604,42.281167),(71.045772,42.29096),(71.014042,42.287704),(70.9696,42.263468),(70.947793,42.248146),(70.918648,42.253365),(70.897822,42.261608),(70.858134,42.291063),(70.852657,42.306075),(70.864801,42.321552),(70.888825,42.338575),(70.900354,42.346744),(70.932703,42.3762),(70.939835,42.387827),(70.937354,42.394778),(70.931773,42.401496),(70.929913,42.412296),(70.936114,42.431623),(70.947586,42.451286),(70.961952,42.468107),(70.977145,42.478752),(71.024739,42.455963),(71.041017,42.4548),(71.054712,42.460381),(71.064168,42.470329),(71.066287,42.482137),(71.057864,42.493402),(71.057657,42.493402),(71.057554,42.493506),(71.057554,42.493609),(71.022724,42.51645),(71.012699,42.526036),(71.00319,42.563527),(71.040656,42.580529),(71.127007,42.590606),(71.142768,42.602543),(71.148091,42.6174),(71.146437,42.656855),(71.149021,42.677939),(71.157548,42.687938),(71.19522,42.69724),(71.211446,42.705224),(71.223849,42.717936),(71.245449,42.747133),(71.262502,42.753567),(71.284723,42.7484),(71.308495,42.740105),(71.329785,42.737031),(71.347562,42.742844),(71.363065,42.75411),(71.376294,42.768321),(71.386939,42.783074),(71.404613,42.794883),(71.428849,42.79558),(71.477115,42.78354),(71.493651,42.788914),(71.504193,42.789612),(71.514322,42.78571),(71.553803,42.760905),(71.566308,42.757236),(71.583568,42.759639),(71.693536,42.811807),(71.726402,42.819661),(71.796682,42.822297),(71.831408,42.831573),(71.847738,42.834053),(71.863241,42.829041),(71.878847,42.821341),(71.895384,42.816044),(71.956982,42.804598),(72.072737,42.757185),(72.10488,42.750337),(72.11997,42.75181),(72.148805,42.76199),(72.164101,42.765091),(72.292362,42.76106),(72.358405,42.741397),(72.476744,42.682564),(72.51178,42.677551),(72.583817,42.678275),(72.725824,42.652876),(72.756933,42.640215),(72.780601,42.620449),(72.815224,42.573036),(72.840752,42.555698),(72.874549,42.543993),(72.908345,42.536965),(72.942348,42.536035),(73.070609,42.551926),(73.115051,42.550841),(73.152671,42.539213),(73.172722,42.527845),(73.189052,42.520765),(73.206828,42.517173),(73.278348,42.513401),(73.301396,42.507071),(73.316589,42.493712),(73.313385,42.463171),(73.314419,42.441571),(73.326201,42.428677),(73.417461,42.41705),(73.476889,42.399067),(73.505105,42.402943),(73.505518,42.420926),(73.505077,42.421557),(73.432964,42.524847),(73.417565,42.556163),(73.41002,42.58965),(73.412707,42.627322),(73.423869,42.662772),(73.476889,42.75088),(73.503554,42.794082),(73.507068,42.809404),(73.504278,42.827594),(73.491979,42.861003),(73.489498,42.877823),(73.493012,42.894954),(73.501177,42.909346),(73.521744,42.936166),(73.559675,43.017298),(73.57094,43.031922),(73.58665,43.042283),(73.634089,43.062463),(73.805551,43.114734),(73.822811,43.117318),(73.864256,43.116103),(73.90167,43.13096),(73.935053,43.199716),(73.965335,43.216924),(73.985385,43.211679),(74.021456,43.186306),(74.039852,43.181861),(74.197362,43.195788),(74.213899,43.202635),(74.216586,43.216924),(74.206044,43.234106),(74.178759,43.261702),(74.207697,43.24979),(74.25865,43.215761),(74.286969,43.207209),(74.320042,43.201654),(74.348774,43.191034),(74.400554,43.159537),(74.420604,43.151837),(74.462772,43.148634),(74.498222,43.131115),(74.539253,43.122899),(74.558167,43.115044),(74.572016,43.102202),(74.597028,43.070344),(74.61129,43.058174),(74.71392,42.999883),(74.74875,42.990013),(74.862851,42.975828),(74.948531,42.944848),(74.976849,42.926477),(75.005375,42.9164),(75.066146,42.902602),(75.094258,42.890303),(75.118133,42.876531),(75.178594,42.84966),(75.204639,42.84519)],[(71.008564,40.157757),(70.977145,40.144579),(70.959885,40.113418),(70.954046,40.095797),(70.952961,40.079208),(70.958438,40.063085),(70.98314,40.021383),(70.994509,40.008877),(71.007634,40.003503),(71.034299,39.99911),(71.045823,39.99203),(71.050371,39.962885),(71.007634,39.911157),(71.009288,39.885732),(71.021897,39.880823),(71.036056,39.887541),(71.049802,39.897979),(71.060964,39.904129),(71.079981,39.903405),(71.084787,39.894827),(71.087216,39.88382),(71.098895,39.8755),(71.113674,39.874466),(71.16101,39.884233),(71.1946,39.884802),(71.208449,39.888781),(71.219094,39.900925),(71.221058,39.931724),(71.17703,39.968156),(71.174704,39.993994),(71.190982,40.006241),(71.237284,40.031098),(71.244002,40.046756),(71.236354,40.056057),(71.223745,40.057866),(71.198217,40.052595),(71.192946,40.05027),(71.181887,40.043397),(71.176926,40.042001),(71.169382,40.042828),(71.165454,40.044637),(71.162043,40.046911),(71.105975,40.064946),(71.078844,40.07864),(71.06174,40.095176),(71.047942,40.122513),(71.031199,40.146905),(71.008564,40.157757)],[(71.741801,39.90077),(71.757304,39.903095),(71.767123,39.915446),(71.789757,39.979318),(71.78552,39.989705),(71.760612,39.98371),(71.724128,39.962678),(71.706868,39.956115),(71.681753,39.955082),(71.665527,39.940199),(71.675346,39.925781),(71.696843,39.913844),(71.71617,39.906764),(71.741801,39.90077)],[(70.498725,39.881908),(70.483739,39.882218),(70.482602,39.866767),(70.490147,39.850179),(70.503479,39.835502),(70.537379,39.817312),(70.547301,39.807649),(70.575878,39.77008),(70.581614,39.766566),(70.63298,39.79845),(70.661609,39.809819),(70.694527,39.814832),(70.70481,39.822067),(70.706412,39.839998),(70.698919,39.858447),(70.68662,39.860876),(70.654994,39.849765),(70.619906,39.850695),(70.498725,39.881908)]]
diff --git a/tests/queries/0_stateless/country_rings.tsv b/tests/queries/0_stateless/country_rings.tsv
new file mode 100644
index 00000000000..15ab66ec0c0
--- /dev/null
+++ b/tests/queries/0_stateless/country_rings.tsv
@@ -0,0 +1,103 @@
+Aruba	[(-69.996938,12.577582),(-69.936391,12.531724),(-69.924672,12.519232),(-69.915761,12.497016),(-69.880198,12.453559),(-69.87682,12.427395),(-69.888092,12.41767),(-69.908803,12.417792),(-69.930531,12.425971),(-69.945139,12.440375),(-69.924672,12.440375),(-69.924672,12.447211),(-69.958567,12.463202),(-70.027659,12.522935),(-70.048085,12.531155),(-70.058095,12.537177),(-70.062408,12.54682),(-70.060374,12.556952),(-70.051096,12.574042),(-70.048736,12.583726),(-70.052642,12.600002),(-70.059641,12.614244),(-70.061106,12.625393),(-70.048736,12.632148),(-70.007151,12.585517),(-69.996938,12.577582)]
+Afghanistan	[(71.049802,38.408664),(71.05714,38.409026),(71.064943,38.411817),(71.076984,38.412178),(71.089386,38.409853),(71.117395,38.398639),(71.155946,38.376212),(71.217699,38.325827),(71.300123,38.298697),(71.334384,38.280662),(71.358156,38.251258),(71.364512,38.206816),(71.359086,38.184105),(71.340947,38.140929),(71.334539,38.11168),(71.316039,38.083284),(71.302397,38.04233),(71.272631,37.997992),(71.265913,37.972541),(71.255785,37.949881),(71.254544,37.939287),(71.258265,37.926472),(71.263536,37.924353),(71.271184,37.926187),(71.281829,37.924999),(71.31976,37.900582),(71.341154,37.893295),(71.360998,37.902029),(71.379188,37.912932),(71.501196,37.946212),(71.537059,37.944455),(71.567342,37.928074),(71.597727,37.89836),(71.590286,37.891435),(71.593387,37.879343),(71.59504,37.857535),(71.594214,37.833764),(71.590286,37.815729),(71.57468,37.798004),(71.537783,37.779039),(71.529515,37.761133),(71.531168,37.751754),(71.540263,37.730515),(71.542537,37.719559),(71.540883,37.709715),(71.529515,37.67858),(71.52476,37.647729),(71.522073,37.637626),(71.517216,37.629229),(71.505123,37.616),(71.501506,37.610341),(71.497165,37.566545),(71.511221,37.485878),(71.501506,37.445777),(71.490241,37.423376),(71.48714,37.409087),(71.494685,37.370692),(71.496545,37.328524),(71.493858,37.307543),(71.487863,37.294986),(71.487037,37.267055),(71.45014,37.21667),(71.453757,37.192615),(71.446832,37.183597),(71.441045,37.16843),(71.43319,37.127347),(71.431123,37.066989),(71.43319,37.054742),(71.439184,37.044097),(71.456444,37.022548),(71.459958,37.010739),(71.459958,36.969786),(71.463059,36.948082),(71.47174,36.930047),(71.528481,36.856149),(71.538506,36.836099),(71.545328,36.790004),(71.552872,36.769591),(71.563931,36.750678),(71.577367,36.733263),(71.61106,36.704841),(71.653021,36.687012),(71.699943,36.678641),(71.748519,36.678641),(71.797612,36.686082),(71.836576,36.699156),(72.126687,36.872738),(72.152836,36.895708),(72.186839,36.911392),(72.195934,36.918988),(72.210403,36.93661),(72.220325,36.94555),(72.259806,36.967305),(72.360988,37.000275),(72.405947,37.007665),(72.474987,36.997484),(72.50868,37.011075),(72.657714,37.028826),(72.666603,37.038335),(72.672701,37.05761),(72.714352,37.109984),(72.760964,37.187499),(72.79073,37.220262),(72.83052,37.239769),(72.877443,37.246875),(72.902247,37.2538),(72.924262,37.274832),(72.995575,37.3093),(73.067509,37.315062),(73.087766,37.326069),(73.099238,37.339867),(73.116394,37.369064),(73.132104,37.384386),(73.170241,37.40826),(73.179026,37.410741),(73.200627,37.404178),(73.211479,37.40826),(73.260262,37.450041),(73.276075,37.459472),(73.296332,37.464949),(73.32124,37.467017),(73.345011,37.464484),(73.361858,37.456397),(73.378394,37.452547),(73.440612,37.479936),(73.485261,37.480969),(73.605047,37.445777),(73.6745,37.43105),(73.717805,37.431825),(73.753462,37.428388),(73.747054,37.403119),(73.745917,37.394902),(73.74571,37.352863),(73.739096,37.338342),(73.722249,37.322452),(73.704989,37.310954),(73.690416,37.305218),(73.651969,37.302065),(73.630988,37.295993),(73.609904,37.281395),(73.597295,37.261809),(73.601636,37.24088),(73.617656,37.233181),(73.659927,37.243748),(73.680494,37.242457),(73.688039,37.236901),(73.702405,37.221166),(73.709227,37.217006),(73.719975,37.217549),(73.736202,37.227651),(73.746123,37.230545),(73.768654,37.228892),(73.783951,37.225894),(73.798213,37.22853),(73.836247,37.256745),(73.856401,37.261577),(73.899292,37.265478),(73.95562,37.286769),(73.976704,37.290283),(74.052151,37.312246),(74.163256,37.330074),(74.187647,37.338394),(74.206044,37.355654),(74.207697,37.389915),(74.223924,37.403351),(74.250382,37.403687),(74.279424,37.397512),(74.303816,37.400173),(74.315598,37.426916),(74.320869,37.413893),(74.332444,37.420353),(74.343813,37.420999),(74.353632,37.415909),(74.368204,37.396375),(74.378126,37.393765),(74.389392,37.393403),(74.418331,37.389192),(74.435901,37.392344),(74.454814,37.393636),(74.476622,37.386091),(74.512692,37.377229),(74.521167,37.375601),(74.529848,37.375756),(74.631444,37.381079),(74.660383,37.393972),(74.78854,37.331159),(74.816859,37.306923),(74.862644,37.244601),(74.892307,37.231114),(74.813138,37.21543),(74.794018,37.213931),(74.783269,37.219667),(74.743995,37.288397),(74.737381,37.296123),(74.721464,37.297776),(74.709372,37.290826),(74.698934,37.28031),(74.676299,37.263721),(74.670925,37.261344),(74.650978,37.259639),(74.646327,37.254833),(74.64302,37.248374),(74.629997,37.238297),(74.627207,37.234318),(74.623279,37.230804),(74.615011,37.228375),(74.609017,37.230183),(74.596511,37.240751),(74.59,37.243361),(74.575944,37.242147),(74.532225,37.232199),(74.500083,37.23163),(74.487267,37.225946),(74.476622,37.210055),(74.46763,37.189927),(74.456674,37.177318),(74.441585,37.170549),(74.420294,37.168068),(74.38226,37.172047),(74.368308,37.167061),(74.366137,37.14776),(74.38257,37.126572),(74.414403,37.107839),(74.476622,37.083138),(74.494088,37.066472),(74.505767,37.047042),(74.519203,37.030247),(74.542354,37.021669),(74.547418,37.015675),(74.549279,37.008931),(74.548142,37.001644),(74.544214,36.994022),(74.537393,36.962241),(74.521373,36.958495),(74.501736,36.972421),(74.48365,36.99397),(74.480342,36.996916),(74.476622,36.999319),(74.456984,37.004383),(74.43559,37.003221),(74.394043,36.994022),(74.368101,36.976762),(74.284592,36.934232),(74.235706,36.902167),(74.211728,36.895139),(74.145996,36.901702),(74.129666,36.898421),(74.1153,36.889532),(74.108789,36.875631),(74.103931,36.841318),(74.094319,36.831241),(74.035305,36.815583),(74.006366,36.815738),(73.976704,36.824833),(73.946938,36.83088),(73.865083,36.872582),(73.834077,36.882866),(73.772892,36.892013),(73.711842,36.894139),(73.711335,36.894157),(73.711128,36.894164),(73.709483,36.894221),(73.640083,36.896638),(73.509342,36.87868),(73.476889,36.882866),(73.445883,36.886483),(73.379738,36.879249),(73.331782,36.882091),(73.281862,36.867983),(73.267496,36.866536),(73.252717,36.868035),(73.223468,36.874339),(73.191842,36.877027),(73.042497,36.864263),(73.026271,36.859457),(73.002293,36.846124),(72.990511,36.841577),(72.976765,36.842093),(72.945862,36.852222),(72.921058,36.847364),(72.896873,36.836977),(72.867727,36.830415),(72.779361,36.826797),(72.695852,36.836719),(72.629602,36.832947),(72.565214,36.820596),(72.516741,36.800597),(72.454109,36.757964),(72.433129,36.753417),(72.387343,36.755794),(72.346209,36.74489),(72.301974,36.74272),(72.213607,36.726442),(72.169682,36.711352),(72.153456,36.702102),(72.149632,36.689338),(72.164618,36.670063),(72.171646,36.653629),(72.154179,36.645465),(72.096095,36.638902),(72.070877,36.632287),(72.059095,36.627119),(72.050413,36.618645),(72.05217,36.610376),(72.056304,36.601901),(72.054961,36.592858),(72.038838,36.580456),(71.997806,36.572446),(71.977033,36.563041),(71.960909,36.549605),(71.913471,36.527591),(71.899725,36.518341),(71.887632,36.508005),(71.874713,36.499065),(71.85859,36.494156),(71.793788,36.490745),(71.773221,36.480048),(71.774564,36.448422),(71.791514,36.421292),(71.794408,36.407598),(71.782626,36.396539),(71.766916,36.391837),(71.751,36.391113),(71.736324,36.395919),(71.706868,36.421447),(71.649301,36.452763),(71.629147,36.459533),(71.61044,36.457931),(71.600725,36.449301),(71.588736,36.41845),(71.580364,36.402327),(71.572303,36.391682),(71.547188,36.371631),(71.542227,36.356387),(71.552666,36.340987),(71.55835,36.327861),(71.53892,36.319283),(71.514632,36.315201),(71.495822,36.309619),(71.479078,36.300524),(71.402752,36.231381),(71.382443,36.218566),(71.31914,36.200582),(71.313972,36.194019),(71.309011,36.172729),(71.302087,36.163323),(71.292682,36.157897),(71.262296,36.146115),(71.223073,36.125393),(71.217699,36.118055),(71.212635,36.096816),(71.207622,36.087617),(71.175376,36.061159),(71.165919,36.045708),(71.169913,36.030802),(71.170932,36.027001),(71.181887,36.018836),(71.217854,36.002713),(71.23191,35.99398),(71.257438,35.971552),(71.28431,35.962457),(71.312525,35.957393),(71.341567,35.947264),(71.356399,35.933053),(71.360688,35.90029),(71.371333,35.885149),(71.416705,35.858846),(71.431019,35.843705),(71.464402,35.794715),(71.470914,35.779936),(71.47205,35.769962),(71.471017,35.761333),(71.47112,35.752289),(71.475564,35.741024),(71.481352,35.734099),(71.496132,35.724591),(71.502746,35.719061),(71.515355,35.701491),(71.519799,35.683766),(71.514012,35.665576),(71.495925,35.646611),(71.483316,35.62656),(71.492721,35.609559),(71.512771,35.596278),(71.567859,35.574212),(71.584188,35.564187),(71.59349,35.549356),(71.59287,35.530184),(71.586049,35.512097),(71.581708,35.493132),(71.587806,35.470911),(71.593422,35.464194),(71.600725,35.45546),(71.613954,35.443212),(71.622429,35.429621),(71.620879,35.410139),(71.61106,35.395463),(71.562277,35.360582),(71.531582,35.327922),(71.529825,35.300895),(71.547808,35.275626),(71.603205,35.223381),(71.633694,35.203124),(71.637932,35.189688),(71.62925,35.170102),(71.604135,35.138166),(71.534992,35.098582),(71.508947,35.072021),(71.5075,35.028199),(71.512978,35.018122),(71.511325,35.008717),(71.504297,35.000604),(71.493444,34.994196),(71.493444,34.994144),(71.493341,34.994144),(71.493341,34.994041),(71.485383,34.983499),(71.476701,34.960296),(71.46957,34.949702),(71.459958,34.942674),(71.445239,34.937757),(71.324928,34.897561),(71.289478,34.87503),(71.270822,34.844283),(71.25563,34.810228),(71.203075,34.748164),(71.189535,34.737054),(71.150933,34.720311),(71.080601,34.672923),(71.070163,34.661245),(71.068768,34.645948),(71.076261,34.623624),(71.079878,34.602902),(71.076571,34.578511),(71.065822,34.55846),(71.047529,34.551122),(71.006963,34.556341),(70.985827,34.556186),(70.983356,34.555256),(70.96867,34.549727),(70.956991,34.532002),(70.955648,34.510014),(70.961229,34.487612),(70.970841,34.468879),(70.991511,34.443067),(71.01983,34.414438),(71.050939,34.389788),(71.122046,34.356819),(71.126387,34.332221),(71.097086,34.262458),(71.09688,34.244345),(71.106543,34.209386),(71.109489,34.189206),(71.108093,34.165228),(71.101789,34.151818),(71.073884,34.125257),(71.062773,34.10531),(71.063858,34.088928),(71.067269,34.073012),(71.062618,34.054253),(71.046702,34.041877),(70.997712,34.033324),(70.977145,34.027407),(70.965725,34.013816),(70.953994,34.004825),(70.939731,34.000923),(70.921231,34.002241),(70.894308,34.009372),(70.884334,34.007047),(70.879994,33.994257),(70.862217,33.964775),(70.791317,33.953562),(70.656183,33.95475),(70.521979,33.938705),(70.49149,33.939609),(70.408963,33.954414),(70.328193,33.957282),(70.309899,33.961675),(70.275586,33.97617),(70.218845,33.980692),(70.002838,34.043789),(69.969093,34.045727),(69.916021,34.038879),(69.889253,34.031206),(69.872613,34.017227),(69.870443,34.001337),(69.873853,33.986325),(69.871993,33.971519),(69.854216,33.956352),(69.841091,33.941805),(69.847188,33.926948),(69.876489,33.902557),(69.885429,33.889457),(69.898761,33.851501),(69.907546,33.83561),(69.931318,33.806439),(69.940103,33.791479),(69.947234,33.771971),(69.957518,33.752695),(69.972659,33.744841),(69.996478,33.742091),(70.011829,33.740319),(70.065573,33.721018),(70.108154,33.727296),(70.118128,33.716522),(70.126551,33.676964),(70.132546,33.661435),(70.136886,33.656293),(70.145981,33.649885),(70.162518,33.643245),(70.170218,33.638671),(70.174093,33.632108),(70.173473,33.607872),(70.153009,33.544749),(70.151356,33.525862),(70.154973,33.506612),(70.163758,33.488655),(70.177607,33.47341),(70.185462,33.468966),(70.213368,33.461344),(70.220447,33.456021),(70.227837,33.43995),(70.233005,33.432612),(70.285715,33.382873),(70.301579,33.35179),(70.294448,33.318949),(70.124794,33.199034),(70.105364,33.18981),(70.08366,33.191283),(70.059785,33.198052),(70.048003,33.194073),(70.014517,33.140769),(70.006869,33.131803),(69.994725,33.127333),(69.965734,33.1294),(69.955812,33.127695),(69.880933,33.089248),(69.838713,33.086664),(69.771844,33.114776),(69.732983,33.109298),(69.68601,33.080773),(69.667768,33.077),(69.658776,33.078421),(69.650198,33.081858),(69.640689,33.084235),(69.60834,33.079067),(69.587773,33.079532),(69.547517,33.075011),(69.514185,33.056691),(69.487727,33.028373),(69.478125,33.01135),(69.468503,32.994292),(69.48721,32.885875),(69.477288,32.856833),(69.471449,32.852234),(69.445559,32.835671),(69.421064,32.80681),(69.387165,32.785338),(69.376313,32.771877),(69.37807,32.752317),(69.383237,32.744462),(69.39042,32.737899),(69.399154,32.732964),(69.407732,32.729941),(69.414657,32.725575),(69.41724,32.718004),(69.419101,32.70046),(69.429126,32.667361),(69.426025,32.655088),(69.413933,32.635477),(69.361223,32.568478),(69.34355,32.55605),(69.302105,32.543777),(69.281952,32.532796),(69.251566,32.50055),(69.232859,32.462671),(69.228001,32.421304),(69.238543,32.378283),(69.264433,32.322369),(69.268102,32.301337),(69.266965,32.279581),(69.259989,32.236819),(69.259524,32.194522),(69.251876,32.15225),(69.251049,32.13065),(69.270634,32.035978),(69.302157,31.959911),(69.304793,31.94694),(69.301157,31.941282),(69.29885,31.93769),(69.250946,31.907046),(69.223764,31.881931),(69.114313,31.737754),(69.10005,31.724008),(69.084754,31.715791),(69.071628,31.69786),(69.040106,31.673107),(69.004036,31.651092),(68.977267,31.641481),(68.94099,31.643651),(68.906987,31.634298),(68.843529,31.606496),(68.803841,31.602568),(68.77728,31.618588),(68.731184,31.675535),(68.705449,31.70127),(68.697905,31.715946),(68.694907,31.756357),(68.688293,31.768605),(68.675787,31.774702),(68.61946,31.783487),(68.561065,31.811806),(68.527476,31.822968),(68.5051,31.822658),(68.481484,31.815682),(68.438179,31.796045),(68.418748,31.783022),(68.422211,31.773152),(68.439574,31.766589),(68.461433,31.763592),(68.521274,31.764781),(68.540601,31.762507),(68.5498,31.753515),(68.536829,31.741009),(68.515177,31.729951),(68.49802,31.725248),(68.460968,31.730467),(68.356065,31.762507),(68.316532,31.765194),(68.276948,31.763592),(68.255037,31.766383),(68.242635,31.776925),(68.2323,31.790154),(68.206823,31.807879),(68.184758,31.818214),(68.159126,31.825914),(68.138559,31.824674),(68.125743,31.811496),(68.104504,31.76876),(68.09834,31.759124),(68.093497,31.751551),(68.060476,31.725558),(68.055566,31.716566),(68.052259,31.695431),(68.046575,31.688403),(67.994071,31.663443),(67.977328,31.651868),(67.966063,31.638225),(67.955211,31.633212),(67.914696,31.631352),(67.884311,31.635641),(67.870668,31.635176),(67.842711,31.623497),(67.781165,31.564173),(67.74828,31.544392),(67.726698,31.53141),(67.696312,31.520816),(67.665461,31.518129),(67.600504,31.53048),(67.568981,31.52986),(67.556114,31.512186),(67.5634,31.497252),(67.578076,31.48211),(67.591099,31.464799),(67.59699,31.42568),(67.611459,31.410797),(67.631406,31.4001),(67.651147,31.395294),(67.734294,31.404751),(67.770364,31.394674),(67.775067,31.352764),(67.764731,31.334058),(67.749435,31.328011),(67.709024,31.329303),(67.692798,31.325221),(67.678949,31.316591),(67.665926,31.306256),(67.602157,31.271116),(67.583657,31.265225),(67.530224,31.256646),(67.493327,31.242952),(67.433899,31.236079),(67.364601,31.210706),(67.346204,31.20776),(67.282177,31.212773),(67.230294,31.210603),(67.213757,31.212256),(67.19319,31.218509),(67.156707,31.235924),(67.136759,31.241092),(67.116864,31.240316),(67.078468,31.232048),(67.058211,31.232358),(67.035267,31.235924),(67.022865,31.239386),(67.015268,31.244657),(67.013873,31.252667),(67.017904,31.258713),(67.023433,31.264863),(67.025965,31.273028),(67.023898,31.2953),(67.016818,31.309149),(67.002091,31.315867),(66.943283,31.314731),(66.905921,31.305532),(66.838483,31.277007),(66.808614,31.254734),(66.785308,31.23179),(66.759522,31.214788),(66.721281,31.210292),(66.696993,31.195823),(66.663093,31.083117),(66.643973,31.060172),(66.550025,30.976973),(66.527494,30.968343),(66.392309,30.944624),(66.375359,30.936717),(66.366264,30.922868),(66.267975,30.601389),(66.264926,30.557826),(66.281928,30.518138),(66.306113,30.491112),(66.313761,30.478296),(66.319393,30.457832),(66.321822,30.437368),(66.303012,30.305283),(66.305286,30.24477),(66.300893,30.225598),(66.236349,30.1116),(66.221725,30.073721),(66.219296,30.057856),(66.225239,30.04442),(66.260431,30.02313),(66.301565,29.98675),(66.332364,29.966079),(66.340529,29.956571),(66.336808,29.952023),(66.328437,29.949543),(66.322442,29.946545),(66.301772,29.915694),(66.27521,29.885154),(66.195628,29.835338),(66.110466,29.813634),(66.052381,29.798854),(65.994297,29.784023),(65.936109,29.769295),(65.878232,29.75449),(65.820147,29.739736),(65.762063,29.724905),(65.70403,29.710151),(65.645843,29.695346),(65.58781,29.680567),(65.529726,29.665736),(65.471745,29.650956),(65.413661,29.636177),(65.355783,29.621423),(65.297595,29.606644),(65.239511,29.591838),(65.181427,29.57711),(65.036371,29.540162),(64.986606,29.541557),(64.820312,29.567886),(64.683886,29.568816),(64.499477,29.570203),(64.477697,29.570367),(64.207739,29.499983),(64.172599,29.4843),(64.149758,29.458461),(64.113378,29.396295),(64.086093,29.386605),(63.971991,29.429574),(63.78792,29.46058),(63.568605,29.497477),(63.415953,29.484971),(63.366809,29.480941),(63.317768,29.47691),(63.268675,29.472879),(63.219686,29.468797),(63.170697,29.464766),(63.121604,29.460787),(63.072615,29.456756),(63.023626,29.452674),(62.974533,29.448643),(62.925544,29.444638),(62.876451,29.440581),(62.827462,29.436602),(62.778421,29.43252),(62.72938,29.428489),(62.680391,29.424458),(62.63135,29.420428),(62.602581,29.41807),(62.477509,29.407819),(62.374466,29.424872),(62.279433,29.451485),(62.196286,29.47492),(62.112983,29.498226),(62.029629,29.521636),(61.946534,29.545045),(61.863231,29.568351),(61.779929,29.591787),(61.696626,29.615196),(61.613427,29.638502),(61.530228,29.66186),(61.446926,29.685321),(61.363727,29.708627),(61.280424,29.732011),(61.197225,29.755343),(61.114026,29.778726),(61.030621,29.802161),(60.947422,29.825519),(60.876005,29.845518),(60.844379,29.858179),(60.902153,29.916883),(60.978117,29.994139),(60.978427,29.994398),(61.133043,30.154285),(61.215622,30.239706),(61.272156,30.298307),(61.380367,30.41029),(61.461705,30.494522),(61.461705,30.494574),(61.57622,30.613895),(61.702621,30.745515),(61.7852,30.831401),(61.802253,30.847059),(61.799773,30.852381),(61.798429,30.853467),(61.799876,30.871502),(61.802356,30.87853),(61.808351,30.881424),(61.804527,30.94974),(61.800186,30.961419),(61.819306,30.993923),(61.826438,31.014956),(61.826334,31.034593),(61.821477,31.054488),(61.809281,31.087148),(61.791814,31.118929),(61.789334,31.129315),(61.78768,31.158616),(61.779205,31.181095),(61.752437,31.219129),(61.742722,31.239541),(61.742308,31.259437),(61.749233,31.30238),(61.742308,31.32088),(61.706548,31.359844),(61.686911,31.373177),(61.661176,31.38191),(61.606259,31.388741),(61.490851,31.403097),(61.29479,31.427644),(61.125149,31.448887),(61.123535,31.449089),(60.956,31.47007),(60.855024,31.482731),(60.821744,31.494668),(60.809962,31.588357),(60.794976,31.636675),(60.792599,31.660084),(60.805311,31.733981),(60.791462,31.826534),(60.789292,31.874955),(60.796733,31.93676),(60.794976,31.958464),(60.791049,31.969161),(60.786088,31.978979),(60.784021,31.989263),(60.792599,32.011277),(60.786708,32.01691),(60.778336,32.021044),(60.774926,32.027194),(60.782677,32.042541),(60.808825,32.07117),(60.81482,32.087862),(60.828256,32.167443),(60.830323,32.248885),(60.79632,32.355907),(60.752291,32.494581),(60.711674,32.61031),(60.67488,32.715601),(60.64005,32.815517),(60.60615,32.912359),(60.577522,32.994344),(60.562949,33.058268),(60.561502,33.137307),(60.5676,33.151285),(60.615969,33.206191),(60.670332,33.267712),(60.719012,33.323032),(60.757046,33.366337),(60.785881,33.387782),(60.818644,33.404887),(60.829082,33.416282),(60.834664,33.436255),(60.832803,33.453463),(60.829289,33.470129),(60.832183,33.484495),(60.849856,33.494365),(60.897295,33.497026),(60.912075,33.501522),(60.919788,33.512571),(60.92086,33.514105),(60.911971,33.528446),(60.895125,33.541132),(60.879622,33.548703),(60.846032,33.555782),(60.807378,33.558159),(60.733894,33.554852),(60.655553,33.559891),(60.574834,33.587796),(60.511789,33.638387),(60.486881,33.71138),(60.494943,33.744117),(60.525845,33.80215),(60.528016,33.84145),(60.499387,33.994257),(60.488461,34.080927),(60.486778,34.094277),(60.492772,34.139028),(60.520884,34.186131),(60.552407,34.220057),(60.587443,34.250262),(60.634986,34.271217),(60.650592,34.28535),(60.643667,34.306641),(60.714361,34.310129),(60.815957,34.315271),(60.890474,34.318914),(60.879105,34.337647),(60.804898,34.417487),(60.789085,34.44348),(60.77937,34.455081),(60.767277,34.464151),(60.742783,34.473452),(60.733894,34.480429),(60.725316,34.504277),(60.718908,34.51115),(60.71033,34.515129),(60.699685,34.516396),(60.714361,34.537428),(60.739269,34.548022),(60.794046,34.554119),(60.818954,34.559907),(60.838488,34.570914),(60.883859,34.613702),(60.888924,34.62166),(60.895435,34.628327),(60.908871,34.634683),(60.922824,34.636543),(60.935846,34.635665),(60.947525,34.63799),(60.957964,34.649411),(60.961994,34.67375),(60.958687,34.699589),(60.959927,34.723205),(60.978014,34.74062),(61.00964,34.76098),(61.02907,34.789712),(61.034755,34.806249),(61.06545,34.814724),(61.073409,34.847693),(61.077749,34.88304),(61.077026,34.891721),(61.072582,34.910325),(61.071548,34.920557),(61.074752,34.933114),(61.088912,34.951925),(61.092012,34.961485),(61.095319,34.981018),(61.109892,35.018535),(61.115887,35.059877),(61.123121,35.074191),(61.147306,35.102096),(61.136764,35.111191),(61.135214,35.119408),(61.137901,35.128296),(61.139865,35.139665),(61.137074,35.143902),(61.101521,35.183228),(61.096353,35.193202),(61.102347,35.197698),(61.112373,35.202038),(61.112786,35.21165),(61.107929,35.221262),(61.102347,35.225603),(61.101624,35.235318),(61.102451,35.25666),(61.108342,35.277951),(61.122708,35.287666),(61.143999,35.28808),(61.167873,35.291387),(61.187097,35.300379),(61.195055,35.318104),(61.190404,35.369573),(61.195055,35.390089),(61.200843,35.401148),(61.221823,35.424247),(61.227301,35.434479),(61.235983,35.465847),(61.247041,35.48507),(61.270503,35.508428),(61.283835,35.52729),(61.290036,35.548064),(61.287556,35.568269),(61.277014,35.609197),(61.269676,35.618499),(61.283318,35.622633),(61.335718,35.630901),(61.344193,35.630901),(61.351531,35.627801),(61.360936,35.621031),(61.360109,35.618395),(61.351531,35.60713),(61.363934,35.598242),(61.365484,35.5985),(61.367654,35.597983),(61.383467,35.586459),(61.383881,35.582119),(61.379953,35.571318),(61.380263,35.567339),(61.386878,35.559536),(61.393182,35.553593),(61.401244,35.549821),(61.412613,35.548322),(61.419309,35.545891),(61.427702,35.542845),(61.492711,35.494165),(61.538703,35.452307),(61.604746,35.430603),(61.739621,35.413757),(61.799049,35.417478),(61.919352,35.451842),(61.977746,35.450912),(62.00746,35.438923),(62.033815,35.423989),(62.136341,35.341358),(62.163885,35.326165),(62.219023,35.30627),(62.2337,35.293764),(62.244345,35.278055),(62.251218,35.260381),(62.252613,35.242811),(62.25096,35.202349),(62.256851,35.187156),(62.275713,35.151034),(62.286203,35.140647),(62.302016,35.14752),(62.399323,35.255937),(62.431879,35.280638),(62.458905,35.281879),(62.524586,35.232166),(62.53549,35.22736),(62.545515,35.228032),(62.555437,35.230409),(62.566186,35.230771),(62.595641,35.22059),(62.60453,35.219402),(62.621066,35.222709),(62.69362,35.248392),(62.708606,35.25604),(62.721628,35.266427),(62.734238,35.280742),(62.760489,35.302446),(62.823063,35.327514),(62.827565,35.329318),(62.918206,35.388177),(62.985282,35.414584),(63.005539,35.418408),(63.047087,35.421353),(63.066827,35.425591),(63.080211,35.437063),(63.086257,35.455666),(63.090495,35.493545),(63.100727,35.524964),(63.097213,35.535455),(63.080573,35.546514),(63.077369,35.558761),(63.07494,35.609817),(63.076646,35.6247),(63.103156,35.646042),(63.179895,35.666455),(63.207697,35.683198),(63.213588,35.692293),(63.214415,35.699269),(63.209351,35.704488),(63.183926,35.712343),(63.17726,35.716891),(63.163255,35.73229),(63.112044,35.769911),(63.105688,35.782882),(63.101295,35.800555),(63.091322,35.813319),(63.084397,35.826083),(63.088634,35.843395),(63.104086,35.856469),(63.125273,35.860241),(63.342934,35.856262),(63.430216,35.871042),(63.511089,35.901841),(63.52592,35.912693),(63.549588,35.939048),(63.563438,35.950623),(63.582093,35.959047),(63.602298,35.962664),(63.725702,35.968865),(63.765906,35.977288),(63.859854,36.022092),(63.889826,36.029637),(63.906327,36.031732),(63.921969,36.033719),(63.949977,36.028861),(64.045114,35.998734),(64.045579,36.011291),(64.03638,36.058575),(64.036225,36.076404),(64.044648,36.09232),(64.057258,36.105239),(64.123352,36.146064),(64.158698,36.160275),(64.195905,36.165907),(64.237143,36.16043),(64.253731,36.154849),(64.266134,36.152471),(64.276056,36.159241),(64.291869,36.199445),(64.303651,36.211538),(64.318947,36.219754),(64.33724,36.225955),(64.410879,36.239856),(64.444572,36.249985),(64.477697,36.271637),(64.498161,36.291429),(64.576657,36.389615),(64.594382,36.424186),(64.605855,36.461083),(64.610505,36.500926),(64.607767,36.521648),(64.593711,36.559837),(64.589008,36.580249),(64.588801,36.600454),(64.592005,36.621073),(64.604821,36.660554),(64.621357,36.692593),(64.728549,36.85057),(64.765225,36.904622),(64.778764,36.93847),(64.77463,36.977589),(64.755613,37.053631),(64.76016,37.092621),(64.778764,37.118046),(64.807909,37.135512),(64.989087,37.213673),(65.063088,37.233232),(65.487922,37.241997),(65.501407,37.242276),(65.536857,37.257107),(65.583159,37.30806),(65.611271,37.331056),(65.624087,37.345138),(65.629461,37.365421),(65.628893,37.387538),(65.620986,37.430404),(65.625741,37.452805),(65.635766,37.474096),(65.648168,37.493837),(65.648272,37.49394),(65.648323,37.493992),(65.648323,37.494147),(65.65871,37.51027),(65.668839,37.520553),(65.681034,37.526393),(65.698294,37.529416),(65.739429,37.529054),(65.752658,37.537865),(65.758859,37.564117),(65.761443,37.578379),(65.776532,37.572902),(65.79648,37.569336),(65.804334,37.565305),(65.821078,37.535178),(65.829087,37.525618),(65.836064,37.519158),(65.855184,37.507944),(66.079666,37.440868),(66.097856,37.428414),(66.125607,37.3987),(66.142918,37.385058),(66.163072,37.376893),(66.174648,37.375498),(66.207721,37.376893),(66.218469,37.3748),(66.232525,37.365421),(66.241879,37.363302),(66.250848,37.35965),(66.257743,37.356842),(66.274383,37.343277),(66.294434,37.331211),(66.320685,37.329144),(66.389622,37.347179),(66.413496,37.349633),(66.423625,37.34568),(66.438663,37.327904),(66.451065,37.322943),(66.461452,37.324441),(66.469927,37.329764),(66.485223,37.343406),(66.502896,37.355654),(66.519588,37.36418),(66.539018,37.36909),(66.564598,37.370692),(66.588576,37.36847),(66.65467,37.346145),(66.667021,37.344311),(66.694099,37.343406),(66.704745,37.346533),(66.724433,37.36015),(66.734975,37.363302),(66.865768,37.367927),(66.957649,37.385213),(67.005915,37.384386),(67.024105,37.377487),(67.064102,37.354569),(67.085083,37.349633),(67.097382,37.34059),(67.113918,37.297182),(67.123324,37.281963),(67.143477,37.27186),(67.187816,37.258244),(67.20797,37.243464),(67.217995,37.226256),(67.225281,37.207704),(67.236753,37.192408),(67.259129,37.185147),(67.281453,37.188661),(67.319591,37.208428),(67.345222,37.213027),(67.36951,37.21468),(67.391163,37.21959),(67.411265,37.22791),(67.431108,37.239769),(67.463975,37.266279),(67.482371,37.277364),(67.503145,37.281963),(67.526141,37.272894),(67.545003,37.231527),(67.561385,37.2199),(67.572185,37.223155),(67.579937,37.232664),(67.586034,37.242612),(67.592287,37.247185),(67.602726,37.24827),(67.621794,37.252921),(67.633163,37.254058),(67.644635,37.251216),(67.666443,37.238012),(67.677502,37.233542),(67.690162,37.23225),(67.725871,37.233542),(67.746593,37.229408),(67.764266,37.220882),(67.775997,37.207549),(67.780544,37.188868),(67.771966,37.12497),(67.773051,37.109984),(67.78535,37.096548),(67.808036,37.083241),(67.832893,37.073087),(67.87811,37.064431),(67.891959,37.052029),(67.902501,37.034381),(67.918417,37.013814),(67.929269,37.006244),(67.952937,36.996244),(67.961825,36.98994),(67.99619,36.955782),(68.00203,36.947487),(68.00606,36.938677),(68.011125,36.930874),(68.02022,36.92568),(68.02482,36.925518),(68.032725,36.925241),(68.044714,36.92922),(68.054946,36.934646),(68.121092,36.980276),(68.133391,36.986529),(68.151995,36.992782),(68.167963,37.006089),(68.186411,37.01831),(68.212559,37.021256),(68.253746,37.010223),(68.277775,37.010068),(68.288317,37.024408),(68.281599,37.066472),(68.280772,37.086652),(68.288317,37.103214),(68.307282,37.114221),(68.326661,37.113033),(68.346091,37.106909),(68.365832,37.103214),(68.391877,37.105437),(68.411462,37.113369),(68.418025,37.128277),(68.403711,37.151635),(68.465774,37.155356),(68.513316,37.163986),(68.523858,37.164658),(68.532747,37.168999),(68.546544,37.188222),(68.551453,37.192615),(68.571401,37.194708),(68.608814,37.204087),(68.626901,37.206257),(68.630777,37.213828),(68.63641,37.229925),(68.648605,37.244369),(68.671239,37.247185),(68.665452,37.259381),(68.662661,37.263721),(68.657545,37.267675),(68.668862,37.278294),(68.686949,37.279018),(68.725913,37.274522),(68.746532,37.276227),(68.759606,37.275245),(68.771285,37.270724),(68.808492,37.251629),(68.820378,37.250906),(68.824615,37.260621),(68.822031,37.281963),(68.810197,37.312091),(68.813815,37.323408),(68.835829,37.329144),(68.856758,37.324906),(68.868023,37.312142),(68.877015,37.296097),(68.890296,37.281963),(68.904714,37.276692),(68.915824,37.279069),(68.921147,37.287958),(68.917633,37.302427),(68.912982,37.306768),(68.896755,37.316483),(68.890296,37.322943),(68.885077,37.334828),(68.887867,37.338135),(68.893655,37.337154),(68.897169,37.335965),(68.965433,37.329144),(68.985225,37.320359),(69.005483,37.305528),(69.021037,37.287958),(69.035765,37.251577),(69.055609,37.237108),(69.078398,37.225171),(69.096433,37.213027),(69.114313,37.177473),(69.123615,37.169205),(69.145732,37.156958),(69.151003,37.155046),(69.245675,37.103886),(69.265777,37.105411),(69.285621,37.11293),(69.308617,37.116882),(69.312079,37.117477),(69.323913,37.120991),(69.334765,37.129053),(69.350836,37.144142),(69.391196,37.164658),(69.407732,37.177473),(69.442148,37.223621),(69.445197,37.23641),(69.426852,37.239459),(69.409851,37.245661),(69.417912,37.267675),(69.409696,37.276744),(69.403081,37.31116),(69.394606,37.326069),(69.389439,37.332916),(69.386441,37.34152),(69.384891,37.3509),(69.384478,37.36015),(69.385821,37.363147),(69.388508,37.363767),(69.390885,37.365317),(69.391196,37.370692),(69.388302,37.37511),(69.378948,37.377125),(69.377036,37.380665),(69.376313,37.418854),(69.37838,37.437406),(69.384478,37.453271),(69.389645,37.4588),(69.404011,37.466861),(69.411711,37.47252),(69.415587,37.477507),(69.421788,37.489496),(69.425405,37.49425),(69.469744,37.52014),(69.491448,37.536986),(69.508656,37.578973),(69.528655,37.586027),(69.664977,37.576157),(69.687301,37.579594),(69.729573,37.594089),(69.754274,37.596673),(69.762232,37.595794),(69.784453,37.59042),(69.791843,37.586105),(69.80223,37.581506),(69.812668,37.585846),(69.823004,37.592952),(69.832926,37.596673),(69.853286,37.60122),(69.895247,37.61817),(69.918812,37.617137),(69.935245,37.605664),(69.944547,37.589696),(69.955399,37.575485),(69.976586,37.569336),(69.989505,37.56732),(69.994673,37.562256),(69.998497,37.55559),(70.004187,37.551371),(70.007592,37.548846),(70.016894,37.545978),(70.048003,37.541431),(70.041698,37.548846),(70.06919,37.545203),(70.099059,37.536573),(70.129135,37.532284),(70.157867,37.541431),(70.192697,37.576028),(70.199415,37.579284),(70.201947,37.587991),(70.216468,37.617137),(70.218432,37.617447),(70.237655,37.618118),(70.240963,37.617137),(70.246079,37.621271),(70.248301,37.623338),(70.253934,37.630805),(70.255225,37.637471),(70.253882,37.646592),(70.253572,37.654576),(70.257706,37.65809),(70.262564,37.660881),(70.275121,37.675479),(70.277033,37.687985),(70.280547,37.696046),(70.283079,37.704831),(70.281891,37.719559),(70.271762,37.748705),(70.269592,37.762632),(70.275121,37.774181),(70.265561,37.781209),(70.256517,37.791803),(70.249851,37.804877),(70.247164,37.819166),(70.240343,37.827563),(70.207476,37.835624),(70.196004,37.839914),(70.179158,37.860791),(70.165205,37.889911),(70.160503,37.920658),(70.17213,37.946083),(70.192232,37.93288),(70.214711,37.929262),(70.238121,37.932363),(70.26153,37.939287),(70.253675,37.947401),(70.250161,37.955617),(70.25042,37.964144),(70.253934,37.973394),(70.26091,37.976469),(70.272692,37.978174),(70.283751,37.981869),(70.288712,37.990809),(70.293776,37.996106),(70.298583,37.998134),(70.317961,38.006312),(70.326281,38.011273),(70.371187,38.058298),(70.415371,38.094523),(70.425964,38.100647),(70.460071,38.112248),(70.470303,38.120517),(70.482602,38.137363),(70.508543,38.192502),(70.537947,38.238055),(70.547197,38.262653),(70.559393,38.268182),(70.573036,38.27105),(70.583061,38.275081),(70.5966,38.309187),(70.596703,38.317585),(70.595566,38.327791),(70.595773,38.338178),(70.600011,38.347066),(70.609312,38.3512),(70.632102,38.350115),(70.641352,38.354197),(70.676698,38.37492),(70.68476,38.38665),(70.664865,38.398639),(70.664865,38.405409),(70.683313,38.414581),(70.741811,38.419439),(70.754213,38.436466),(70.761086,38.44352),(70.777261,38.446466),(70.808887,38.446362),(70.817982,38.444993),(70.834105,38.4406),(70.843045,38.440161),(70.849814,38.442823),(70.853587,38.447422),(70.859323,38.451659),(70.871002,38.45321),(70.91224,38.437655),(70.936217,38.433004),(70.946759,38.443236),(70.943452,38.465948),(70.950739,38.473053),(70.974045,38.473673),(70.986809,38.470909),(70.998229,38.465664),(71.008564,38.458584),(71.018641,38.449825),(71.024584,38.441918),(71.032956,38.423651),(71.039467,38.415331),(71.049802,38.408664)]
+Albania	[(19.747766,42.578901),(19.746009,42.579934),(19.741358,42.574405),(19.733916,42.562597),(19.732159,42.555543),(19.730299,42.540428),(19.730919,42.533658),(19.73433,42.524382),(19.75159,42.493402),(19.784456,42.474566),(19.801406,42.468132),(19.819596,42.466479),(19.829063,42.468723),(19.835512,42.470251),(19.873339,42.486839),(19.882538,42.493402),(19.882745,42.493557),(19.882745,42.493609),(19.907549,42.506399),(19.956332,42.505314),(19.981757,42.510765),(20.017723,42.546241),(20.039221,42.557765),(20.064956,42.546758),(20.085626,42.530015),(20.135546,42.509629),(20.152392,42.493712),(20.152599,42.493712),(20.152599,42.493609),(20.152702,42.493428),(20.152702,42.493402),(20.180814,42.443095),(20.186292,42.437437),(20.199728,42.427799),(20.204689,42.420099),(20.204379,42.411831),(20.194043,42.4001),(20.192803,42.393693),(20.197454,42.38744),(20.21306,42.377518),(20.218848,42.371446),(20.221225,42.36372),(20.219468,42.350207),(20.220915,42.343101),(20.229597,42.32672),(20.237762,42.319924),(20.249647,42.318607),(20.317964,42.319821),(20.333363,42.317883),(20.456973,42.250497),(20.473665,42.237123),(20.481674,42.230705),(20.500795,42.211223),(20.538622,42.150116),(20.549371,42.123476),(20.551954,42.105803),(20.552161,42.07379),(20.558259,42.055109),(20.589678,41.993639),(20.594329,41.973718),(20.59929,41.960567),(20.59929,41.94788),(20.588748,41.929586),(20.580583,41.921732),(20.573348,41.917675),(20.567251,41.912172),(20.562496,41.900105),(20.562703,41.892845),(20.567767,41.88052),(20.567147,41.873182),(20.541722,41.86158),(20.540786,41.844865),(20.540482,41.839437),(20.54844,41.814193),(20.550136,41.80006),(20.550921,41.793522),(20.54441,41.784763),(20.521155,41.767658),(20.511337,41.757943),(20.503275,41.744637),(20.500381,41.734095),(20.508339,41.661748),(20.513404,41.640405),(20.534591,41.594026),(20.53467,41.587324),(20.534694,41.585266),(20.52932,41.574879),(20.520845,41.568368),(20.507409,41.56227),(20.49294,41.557671),(20.444157,41.549661),(20.447878,41.53545),(20.444984,41.508475),(20.452012,41.493592),(20.463174,41.489768),(20.470822,41.483774),(20.481597,41.468269),(20.483535,41.46548),(20.486842,41.457781),(20.488909,41.441451),(20.490873,41.436025),(20.498004,41.431477),(20.514644,41.429462),(20.522189,41.42569),(20.534074,41.412977),(20.539049,41.402944),(20.540172,41.400678),(20.539965,41.387139),(20.532937,41.370447),(20.523429,41.356805),(20.510407,41.344403),(20.49604,41.337788),(20.481674,41.341199),(20.478108,41.321585),(20.477747,41.319598),(20.483121,41.289471),(20.500071,41.23552),(20.51268,41.210147),(20.549681,41.170615),(20.565494,41.147412),(20.570558,41.124829),(20.569938,41.107104),(20.576966,41.093513),(20.597419,41.086273),(20.605284,41.083488),(20.618927,41.082403),(20.631536,41.082868),(20.634129,41.082576),(20.643008,41.081576),(20.65386,41.075272),(20.664092,41.059149),(20.683419,40.99383),(20.702746,40.936314),(20.717216,40.913214),(20.730573,40.904611),(20.740883,40.89797),(20.766102,40.893732),(20.783672,40.899055),(20.816951,40.920242),(20.836544,40.923904),(20.837415,40.924066),(20.890228,40.918279),(20.939941,40.907065),(20.956684,40.894766),(20.964849,40.875956),(20.965262,40.849394),(20.967019,40.802007),(20.960922,40.780768),(20.943662,40.765265),(20.95348,40.759167),(20.957201,40.751622),(20.959165,40.743561),(20.963505,40.736068),(20.992031,40.7155),(21.018593,40.690902),(21.028825,40.676846),(21.035336,40.65938),(21.036679,40.639743),(21.033165,40.621398),(21.02252,40.586619),(21.020763,40.575096),(21.02035,40.566776),(21.018799,40.558972),(21.013528,40.548896),(21.006707,40.543211),(20.997509,40.53918),(20.98831,40.533496),(20.981489,40.523264),(20.96857,40.520577),(20.957924,40.514944),(20.95193,40.506056),(20.952653,40.493653),(20.94976,40.487866),(20.946452,40.482905),(20.93684,40.472518),(20.911932,40.459547),(20.889608,40.463733),(20.866767,40.472053),(20.839999,40.471639),(20.826666,40.464818),(20.821292,40.456395),(20.817365,40.446835),(20.8092,40.436603),(20.800311,40.432779),(20.779537,40.429006),(20.770649,40.421978),(20.768995,40.412573),(20.773336,40.38534),(20.773853,40.374901),(20.770442,40.36255),(20.765998,40.354282),(20.755043,40.338624),(20.739552,40.309166),(20.736646,40.303639),(20.728791,40.298265),(20.717836,40.293924),(20.706984,40.288085),(20.699129,40.278369),(20.694581,40.25558),(20.696648,40.235581),(20.696442,40.215066),(20.68528,40.191191),(20.679802,40.187832),(20.665022,40.18437),(20.660372,40.178892),(20.659855,40.172743),(20.663162,40.161684),(20.663472,40.15662),(20.668226,40.138068),(20.666779,40.13352),(20.651793,40.101016),(20.647556,40.09404),(20.640218,40.090112),(20.615361,40.081017),(20.577793,40.067271),(20.552885,40.065411),(20.499865,40.071457),(20.481674,40.067788),(20.465965,40.060812),(20.432789,40.063809),(20.413772,40.057194),(20.400439,40.045257),(20.38907,40.029444),(20.380699,40.011667),(20.376461,39.993736),(20.359925,39.991048),(20.310005,39.98986),(20.297913,39.986914),(20.302977,39.979111),(20.317964,39.918391),(20.323131,39.912397),(20.346902,39.894259),(20.392998,39.835451),(20.397028,39.818087),(20.388967,39.79814),(20.371604,39.784291),(20.35455,39.78579),(20.336877,39.794006),(20.299577,39.805056),(20.298326,39.805427),(20.288405,39.806615),(20.280033,39.80398),(20.273005,39.796487),(20.275485,39.792404),(20.281377,39.788167),(20.284684,39.780312),(20.283134,39.775144),(20.276829,39.763155),(20.275692,39.760055),(20.278173,39.756748),(20.285511,39.749668),(20.287268,39.746671),(20.291092,39.737937),(20.296466,39.733493),(20.299463,39.728222),(20.296466,39.71737),(20.28272,39.704399),(20.264117,39.696079),(20.249027,39.684814),(20.24603,39.662903),(20.237245,39.667037),(20.228563,39.669156),(20.220088,39.669156),(20.212027,39.667037),(20.204172,39.660319),(20.203035,39.65262),(20.203449,39.645333),(20.199935,39.640062),(20.184122,39.637013),(20.163761,39.6443),(20.135236,39.664195),(20.089347,39.682799),(20.049556,39.69272),(20.01607,39.701402),(19.99991,39.693498),(19.999848,39.693508),(19.996837,39.692572),(19.99586,39.686713),(19.989024,39.686713),(19.983572,39.701361),(19.98699,39.717963),(20.002696,39.748236),(19.985606,39.75373),(19.980642,39.75731),(19.99586,39.782945),(20.014171,39.832953),(20.016287,39.845038),(20.009776,39.865668),(19.999278,39.871405),(19.983735,39.872382),(19.961681,39.878567),(19.960216,39.881049),(19.959972,39.885077),(19.958832,39.88935),(19.954845,39.892808),(19.941173,39.898993),(19.931163,39.901923),(19.914073,39.902411),(19.906423,39.90644),(19.906423,39.912665),(19.921235,39.926947),(19.931,39.934516),(19.941173,39.940009),(19.923839,39.952826),(19.876801,40.022366),(19.870453,40.034735),(19.863455,40.045356),(19.855235,40.049872),(19.823253,40.050605),(19.807384,40.052883),(19.79656,40.057318),(19.804535,40.063463),(19.777354,40.077786),(19.773123,40.071234),(19.771658,40.068305),(19.770518,40.063463),(19.767263,40.072455),(19.762462,40.07685),(19.756358,40.079901),(19.74936,40.084621),(19.748057,40.088609),(19.740896,40.100409),(19.732677,40.110256),(19.729015,40.108222),(19.719086,40.116034),(19.653168,40.132392),(19.59783,40.157701),(19.565766,40.179836),(19.509288,40.194485),(19.476248,40.21369),(19.381114,40.295233),(19.369965,40.309027),(19.365082,40.317369),(19.351573,40.362047),(19.344249,40.374335),(19.309255,40.400824),(19.296886,40.41356),(19.295177,40.417548),(19.295177,40.418687),(19.289561,40.420396),(19.289561,40.427232),(19.316173,40.437812),(19.33253,40.43891),(19.348155,40.43065),(19.3838,40.397406),(19.39324,40.386298),(19.406505,40.362616),(19.411957,40.34809),(19.414236,40.334418),(19.423595,40.330024),(19.444591,40.333808),(19.465587,40.341498),(19.474946,40.348375),(19.481619,40.439114),(19.47877,40.453925),(19.453136,40.465318),(19.418793,40.491889),(19.391368,40.521796),(19.386404,40.54328),(19.39324,40.537055),(19.396007,40.529608),(19.398611,40.520941),(19.406749,40.522773),(19.414236,40.522773),(19.433604,40.505927),(19.446056,40.511135),(19.452647,40.529853),(19.4546,40.55386),(19.442149,40.573065),(19.415701,40.583482),(19.391612,40.578315),(19.386404,40.550727),(19.379242,40.566148),(19.309825,40.644355),(19.304373,40.653144),(19.309337,40.665025),(19.322927,40.674872),(19.339041,40.684068),(19.351573,40.694159),(19.360525,40.709784),(19.364513,40.726508),(19.365571,40.785956),(19.368826,40.802151),(19.377778,40.812974),(19.396251,40.817043),(19.406749,40.820746),(19.404063,40.829291),(19.396739,40.83869),(19.39324,40.844916),(19.397634,40.852973),(19.404796,40.86107),(19.411388,40.867092),(19.414236,40.868842),(19.406261,40.880316),(19.391124,40.89525),(19.381196,40.908271),(19.389822,40.913804),(19.404959,40.918158),(19.424571,40.939643),(19.440929,40.948635),(19.427013,40.936835),(19.435395,40.913398),(19.427257,40.893378),(19.427257,40.87226),(19.434744,40.87226),(19.437836,40.886542),(19.437673,40.88345),(19.439138,40.880072),(19.440929,40.87226),(19.454112,40.88581),(19.506602,40.905097),(19.523448,40.92064),(19.525157,40.945258),(19.514659,40.964911),(19.501475,40.982978),(19.495453,41.002631),(19.492035,40.976955),(19.479666,40.953925),(19.453868,40.923977),(19.453461,40.928371),(19.447765,40.934312),(19.458507,40.942613),(19.469981,40.956732),(19.477224,40.975002),(19.474946,40.995795),(19.469981,41.000718),(19.453787,41.005845),(19.447765,41.009467),(19.440603,41.020657),(19.441254,41.026028),(19.445486,41.030707),(19.456391,41.106676),(19.451182,41.122707),(19.445486,41.129462),(19.441173,41.137356),(19.441905,41.143866),(19.463715,41.151313),(19.467133,41.162665),(19.467133,41.176174),(19.468761,41.187567),(19.509532,41.237291),(19.516612,41.256415),(19.513357,41.276679),(19.50294,41.294135),(19.488048,41.306464),(19.471934,41.311103),(19.450043,41.311103),(19.431651,41.313707),(19.418956,41.322577),(19.414236,41.341498),(19.414236,41.382799),(19.410818,41.391669),(19.396007,41.402045),(19.39324,41.41352),(19.406423,41.400377),(19.428722,41.401313),(19.44516,41.415188),(19.440929,41.440863),(19.46461,41.450873),(19.489268,41.466132),(19.508637,41.486884),(19.516612,41.513414),(19.514171,41.529975),(19.507172,41.536282),(19.496349,41.538764),(19.482432,41.54385),(19.468028,41.554267),(19.451996,41.574774),(19.440929,41.585395),(19.528087,41.576565),(19.556407,41.583075),(19.565196,41.58511),(19.584809,41.619574),(19.591645,41.619574),(19.592296,41.608588),(19.596039,41.602729),(19.603038,41.601752),(19.612966,41.605292),(19.604991,41.632148),(19.600108,41.639106),(19.591645,41.632636),(19.587087,41.640692),(19.557628,41.660549),(19.578136,41.687649),(19.576345,41.71894),(19.571137,41.752387),(19.5713,41.770413),(19.589529,41.765692),(19.598969,41.778713),(19.599783,41.79975),(19.591645,41.818793),(19.585216,41.818549),(19.465505,41.855455),(19.451182,41.862535),(19.432953,41.868598),(19.365122,41.852372),(19.364223,41.862846),(19.364947,41.888995),(19.356989,41.89964),(19.347687,41.906358),(19.34531,41.910337),(19.34593,41.914471),(19.345413,41.921189),(19.346653,41.926176),(19.350477,41.931369),(19.352854,41.938501),(19.346447,41.961548),(19.351614,41.965166),(19.359779,41.965993),(19.365774,41.969713),(19.371045,41.98656),(19.363707,41.993484),(19.363396,41.993639),(19.354198,42.008703),(19.350581,42.027823),(19.351718,42.047615),(19.356575,42.064798),(19.374869,42.094667),(19.372491,42.104253),(19.369998,42.106507),(19.355025,42.12004),(19.297767,42.151666),(19.282058,42.164559),(19.281956,42.164723),(19.272033,42.180682),(19.274926,42.191276),(19.304589,42.215099),(19.400397,42.325893),(19.401327,42.331061),(19.400707,42.344755),(19.402671,42.352015),(19.412076,42.368397),(19.417243,42.374107),(19.468403,42.41811),(19.481735,42.434491),(19.501476,42.444129),(19.517806,42.45803),(19.531655,42.474773),(19.543747,42.493402),(19.543747,42.493557),(19.549328,42.508595),(19.561317,42.516243),(19.575683,42.522341),(19.588086,42.532857),(19.593667,42.54482),(19.599248,42.571046),(19.605035,42.584844),(19.621779,42.604997),(19.647927,42.627838),(19.658037,42.634613),(19.676039,42.646675),(19.699293,42.654814),(19.722134,42.64608),(19.737534,42.624402),(19.746009,42.5989),(19.746885,42.58893),(19.747766,42.578901)]
+Andorra	[(1.707006,42.502781),(1.697498,42.494462),(1.686336,42.490612),(1.674244,42.490508),(1.662358,42.493712),(1.659774,42.496813),(1.656984,42.49764),(1.653986,42.496529),(1.650369,42.493402),(1.639517,42.466427),(1.607478,42.456428),(1.544432,42.450356),(1.538851,42.445653),(1.534511,42.439917),(1.528206,42.434233),(1.51663,42.429504),(1.508466,42.428677),(1.447901,42.434646),(1.436429,42.440951),(1.436429,42.453482),(1.407593,42.486762),(1.424543,42.492472),(1.430227,42.493557),(1.449968,42.504073),(1.446557,42.519886),(1.428987,42.531462),(1.406456,42.52924),(1.409764,42.540609),(1.4263,42.561796),(1.426403,42.565646),(1.418032,42.569832),(1.419272,42.579263),(1.424853,42.589365),(1.429297,42.595386),(1.451415,42.602052),(1.466814,42.641455),(1.49844,42.640241),(1.527793,42.648535),(1.543089,42.649362),(1.597349,42.621921),(1.608304,42.618123),(1.721993,42.609855),(1.713311,42.589546),(1.729434,42.582001),(1.752688,42.576679),(1.761107,42.567646),(1.765091,42.563372),(1.739976,42.561641),(1.721683,42.548515),(1.710624,42.527741),(1.707006,42.502781)]
+Ashmore and Cartier Islands	[(123.597016,-12.428318),(123.597748,-12.438572),(123.575613,-12.436782),(123.575043,-12.426609),(123.597016,-12.428318)]
+Austria	[(15.161792,48.937221),(15.238067,48.95076),(15.243234,48.95293),(15.257084,48.963886),(15.260391,48.969157),(15.262872,48.982593),(15.266902,48.986675),(15.27455,48.986727),(15.279615,48.982593),(15.283749,48.977632),(15.28871,48.975358),(15.335529,48.974996),(15.357853,48.97081),(15.405912,48.954687),(15.450354,48.944817),(15.471851,48.936704),(15.521254,48.908489),(15.544187,48.902612),(15.603729,48.887353),(15.681347,48.858466),(15.703775,48.854952),(15.726823,48.854952),(15.743669,48.858466),(15.779222,48.870868),(15.787904,48.872263),(15.818497,48.872315),(15.824284,48.869421),(15.828315,48.857122),(15.833276,48.852006),(15.840097,48.850094),(15.859218,48.849164),(15.870173,48.843893),(15.877614,48.841671),(15.885986,48.842033),(15.875754,48.833093),(15.888363,48.835056),(15.899629,48.834746),(15.90707,48.830251),(15.908103,48.819709),(15.925053,48.822602),(15.930324,48.818313),(15.930324,48.811389),(15.931771,48.806428),(16.032334,48.758059),(16.085354,48.742866),(16.177751,48.746535),(16.317588,48.73284),(16.318724,48.733512),(16.339498,48.735579),(16.352727,48.728448),(16.358309,48.727259),(16.374018,48.730308),(16.384974,48.737078),(16.43572,48.794542),(16.453083,48.80219),(16.481919,48.7994),(16.492254,48.79971),(16.510341,48.804774),(16.519539,48.805601),(16.528737,48.803534),(16.545791,48.796299),(16.605529,48.784827),(16.624029,48.78338),(16.643149,48.778264),(16.651004,48.766223),(16.654725,48.751857),(16.661959,48.740023),(16.675085,48.733926),(16.691001,48.732065),(16.729035,48.733099),(16.744332,48.729637),(16.780505,48.713772),(16.798902,48.709224),(16.818125,48.710775),(16.856573,48.719818),(16.873006,48.718991),(16.896674,48.696977),(16.910523,48.63078),(16.945043,48.604166),(16.954345,48.557399),(16.949055,48.544836),(16.946903,48.539726),(16.93047,48.528202),(16.913934,48.519339),(16.906492,48.509908),(16.901221,48.496602),(16.875073,48.471539),(16.864944,48.458077),(16.86081,48.443788),(16.851922,48.390407),(16.849338,48.384102),(16.846858,48.381131),(16.845101,48.376583),(16.84448,48.365602),(16.847581,48.359582),(16.855332,48.356455),(16.875486,48.355034),(16.881171,48.352812),(16.891713,48.347024),(16.901945,48.339402),(16.906492,48.33147),(16.904218,48.327025),(16.900291,48.321238),(16.898431,48.316173),(16.902771,48.314106),(16.905459,48.311988),(16.908869,48.306975),(16.912073,48.301239),(16.913313,48.296691),(16.916621,48.2908),(16.924269,48.287519),(16.933364,48.284728),(16.944423,48.27801),(16.950624,48.276589),(16.954345,48.273127),(16.955275,48.268786),(16.953931,48.25734),(16.954345,48.25256),(16.969951,48.216645),(16.974705,48.198558),(16.974808,48.17688),(16.98194,48.161299),(17.007158,48.142799),(17.020904,48.137166),(17.036923,48.135513),(17.047465,48.130991),(17.062455,48.112724),(17.067206,48.106936),(17.080228,48.097608),(17.069996,48.089159),(17.064829,48.07903),(17.059144,48.060427),(17.063072,48.058773),(17.075061,48.052081),(17.069686,48.035674),(17.092631,48.02725),(17.12498,48.019525),(17.148338,48.005443),(17.085603,47.970148),(17.096145,47.961931),(17.095731,47.95573),(17.090874,47.949477),(17.088083,47.940899),(17.086119,47.93922),(17.076818,47.934956),(17.07413,47.932114),(17.075164,47.927773),(17.080125,47.925758),(17.085396,47.924621),(17.087463,47.922632),(17.083329,47.904829),(17.077541,47.891729),(17.067619,47.881626),(17.051186,47.872893),(17.016563,47.867699),(17.004057,47.863281),(17.004367,47.852377),(17.010672,47.847882),(17.031652,47.841345),(17.039507,47.837365),(17.049119,47.818684),(17.05563,47.812354),(17.040644,47.801114),(17.041988,47.783906),(17.048706,47.763649),(17.050566,47.730989),(17.055527,47.720913),(17.064002,47.71329),(17.075371,47.708484),(17.054804,47.702025),(16.98194,47.695436),(16.902668,47.682026),(16.864738,47.686729),(16.850165,47.712929),(16.836936,47.705358),(16.817299,47.684248),(16.80624,47.676884),(16.797455,47.675463),(16.741128,47.681458),(16.730379,47.685902),(16.719217,47.693731),(16.711569,47.704066),(16.707848,47.714608),(16.702474,47.7236),(16.689865,47.729568),(16.609766,47.750627),(16.567805,47.754192),(16.531115,47.742978),(16.52512,47.733315),(16.526877,47.720137),(16.521399,47.711533),(16.512924,47.706004),(16.47303,47.691767),(16.461145,47.684532),(16.45453,47.681768),(16.449879,47.682414),(16.444918,47.68554),(16.43913,47.690475),(16.431792,47.685463),(16.4166,47.668823),(16.407815,47.66133),(16.425901,47.654276),(16.481919,47.638954),(16.509617,47.64314),(16.575453,47.624949),(16.608422,47.628773),(16.63023,47.622004),(16.647697,47.606139),(16.656172,47.585934),(16.65059,47.566555),(16.66754,47.560096),(16.68139,47.550561),(16.689141,47.53803),(16.688004,47.52263),(16.677359,47.509866),(16.648213,47.501546),(16.636845,47.4932),(16.640875,47.452919),(16.626973,47.445549),(16.589406,47.425633),(16.481919,47.392302),(16.46993,47.405531),(16.456597,47.411836),(16.444091,47.40951),(16.433963,47.39685),(16.436443,47.358506),(16.434273,47.35556),(16.429312,47.353803),(16.424971,47.351116),(16.424351,47.345199),(16.427142,47.341375),(16.431689,47.339721),(16.436133,47.338559),(16.43882,47.336569),(16.469206,47.293238),(16.473237,47.276805),(16.466622,47.263421),(16.452463,47.254584),(16.421354,47.243138),(16.421354,47.243061),(16.421354,47.243035),(16.424661,47.225594),(16.409262,47.203683),(16.412776,47.187173),(16.41877,47.183659),(16.426728,47.184124),(16.4351,47.183581),(16.441818,47.177121),(16.442128,47.168336),(16.433963,47.151283),(16.433653,47.145754),(16.447089,47.139708),(16.480885,47.150767),(16.497318,47.149681),(16.509514,47.137537),(16.50476,47.125833),(16.481919,47.10524),(16.460835,47.0963),(16.454323,47.081701),(16.461765,47.068498),(16.481919,47.063898),(16.493701,47.059816),(16.497215,47.054622),(16.493184,47.049145),(16.481919,47.04421),(16.437167,47.031782),(16.424661,47.024082),(16.45329,47.021679),(16.467553,47.018423),(16.481919,47.00938),(16.486363,46.998554),(16.467449,46.995427),(16.441404,46.99522),(16.424764,46.993102),(16.424764,46.992998),(16.420424,46.99026),(16.415566,46.989433),(16.410398,46.990415),(16.405024,46.993153),(16.387764,47.002042),(16.366577,47.003825),(16.325856,47.00044),(16.288545,47.005582),(16.274903,47.004315),(16.265394,46.993257),(16.261054,46.97809),(16.252992,46.973516),(16.24307,46.972018),(16.232942,46.966075),(16.230358,46.959977),(16.231185,46.954422),(16.230668,46.94835),(16.22395,46.941064),(16.217025,46.937395),(16.196148,46.931297),(16.170723,46.918533),(16.159148,46.910316),(16.122871,46.876365),(16.110055,46.867916),(16.094035,46.862774),(16.052936,46.84606),(16.032024,46.837556),(16.028441,46.836947),(15.987582,46.830011),(15.981691,46.827685),(15.971976,46.820632),(15.972906,46.818435),(15.97735,46.816213),(15.978177,46.809134),(15.971252,46.778076),(15.970985,46.77505),(15.969702,46.760532),(15.970529,46.743014),(15.982001,46.718545),(16.003291,46.709191),(16.014557,46.693714),(16.016723,46.670691),(16.016727,46.670641),(16.016593,46.670757),(15.997917,46.686919),(15.986962,46.69219),(15.946344,46.697151),(15.878545,46.720715),(15.850743,46.724488),(15.822941,46.722834),(15.78461,46.7122),(15.755141,46.704024),(15.728683,46.70299),(15.652098,46.710819),(15.635975,46.717563),(15.632875,46.702473),(15.632978,46.689632),(15.626984,46.680873),(15.621745,46.678175),(15.616648,46.67555),(15.603729,46.673018),(15.58864,46.675963),(15.567349,46.675757),(15.545955,46.671881),(15.530659,46.663845),(15.52084,46.649608),(15.520308,46.64772),(15.517636,46.63824),(15.513939,46.632545),(15.511228,46.628369),(15.492625,46.618293),(15.462653,46.614649),(15.440018,46.62439),(15.435381,46.627195),(15.417591,46.637955),(15.388135,46.645578),(15.332784,46.64358),(15.204891,46.638963),(15.172557,46.64136),(15.105591,46.646323),(15.085723,46.647795),(15.061954,46.649557),(15.004386,46.636844),(14.967179,46.600257),(14.947955,46.619274),(14.933589,46.621135),(14.919507,46.615017),(14.897726,46.605554),(14.894063,46.605215),(14.877055,46.603642),(14.862999,46.604831),(14.85039,46.601136),(14.833647,46.584393),(14.822278,46.567546),(14.814519,46.551337),(14.807189,46.536024),(14.796663,46.519401),(14.788585,46.506646),(14.783004,46.503261),(14.760887,46.496284),(14.735255,46.493339),(14.726367,46.497706),(14.709727,46.492512),(14.703733,46.487758),(14.698772,46.480962),(14.687093,46.471221),(14.679961,46.458871),(14.672546,46.459791),(14.666629,46.460524),(14.662081,46.459698),(14.642031,46.445228),(14.631696,46.440577),(14.621567,46.43851),(14.599863,46.437167),(14.590148,46.434428),(14.575368,46.419726),(14.566997,46.400373),(14.562108,46.391737),(14.557695,46.38394),(14.540332,46.378643),(14.527102,46.388229),(14.515837,46.40536),(14.502194,46.418356),(14.467675,46.412672),(14.450931,46.414481),(14.437145,46.418884),(14.420029,46.424351),(14.414448,46.429002),(14.411244,46.434635),(14.40649,46.439337),(14.395844,46.440991),(14.362151,46.435875),(14.242323,46.438237),(14.149865,46.440061),(14.147933,46.440425),(14.137255,46.442438),(14.081032,46.47595),(14.066355,46.48104),(14.050026,46.484399),(14.032456,46.484709),(14.014922,46.482531),(13.998763,46.480523),(13.98233,46.481918),(13.890862,46.511787),(13.860683,46.51525),(13.795778,46.507886),(13.782135,46.507782),(13.716093,46.518867),(13.700951,46.519746),(13.685345,46.517627),(13.670256,46.518712),(13.549229,46.545842),(13.506751,46.546927),(13.499103,46.550622),(13.484944,46.561733),(13.478019,46.563567),(13.417041,46.560492),(13.373323,46.565789),(13.271417,46.550777),(13.231109,46.552173),(13.210025,46.558012),(13.146463,46.584961),(13.064504,46.598035),(12.83041,46.609637),(12.773566,46.635191),(12.7485,46.640996),(12.739873,46.642994),(12.732018,46.64227),(12.715999,46.637955),(12.706593,46.637749),(12.697395,46.640539),(12.679205,46.650022),(12.671368,46.652466),(12.669593,46.653019),(12.62019,46.656481),(12.562003,46.65121),(12.547327,46.652192),(12.53079,46.65767),(12.499888,46.672139),(12.469632,46.675799),(12.445627,46.678702),(12.40501,46.690123),(12.370387,46.711155),(12.351473,46.743246),(12.342688,46.765131),(12.326048,46.772495),(12.305274,46.774459),(12.284397,46.779988),(12.274785,46.784639),(12.269101,46.788566),(12.266724,46.795336),(12.26693,46.808255),(12.269618,46.819831),(12.273338,46.826755),(12.276129,46.83399),(12.275819,46.846289),(12.26662,46.868148),(12.250807,46.875615),(12.208743,46.876623),(12.1951,46.880085),(12.189002,46.884943),(12.183525,46.891222),(12.172156,46.89918),(12.160994,46.90303),(12.137429,46.905924),(12.126887,46.908869),(12.141563,46.918843),(12.141667,46.927989),(12.134742,46.937446),(12.128231,46.948582),(12.122133,46.971656),(12.117792,46.983076),(12.111178,46.992998),(12.12172,47.010517),(12.182284,47.033616),(12.203575,47.053331),(12.203897,47.067012),(12.204195,47.079686),(12.180631,47.085215),(12.133146,47.078832),(12.116242,47.076559),(12.014956,47.040489),(11.943643,47.038164),(11.899511,47.027725),(11.857033,47.012015),(11.822513,46.993257),(11.777141,46.988296),(11.766082,46.983438),(11.746445,46.972457),(11.73487,46.970622),(11.716163,46.97548),(11.683814,46.991913),(11.664797,46.993257),(11.657252,46.992533),(11.649707,46.992998),(11.648467,46.993257),(11.64795,46.993257),(11.59648,47.00044),(11.572709,46.998915),(11.543667,46.993102),(11.543564,46.993102),(11.543357,46.992998),(11.543254,46.992998),(11.533849,46.989536),(11.524443,46.988347),(11.515348,46.989484),(11.506977,46.992998),(11.501706,46.997856),(11.495918,47.001602),(11.489407,47.004212),(11.471837,47.00708),(11.461812,47.005504),(11.452923,47.000879),(11.445275,46.993102),(11.445172,46.992998),(11.411169,46.970493),(11.380576,46.971553),(11.349467,46.98194),(11.31381,46.987262),(11.243737,46.979252),(11.174491,46.963853),(11.156611,46.956515),(11.091912,46.912435),(11.083643,46.900136),(11.073101,46.86497),(11.054291,46.834145),(11.053464,46.830321),(11.054601,46.819934),(11.052844,46.814921),(11.048503,46.811692),(11.037445,46.808255),(11.033311,46.805568),(11.010883,46.779213),(10.99693,46.76911),(10.982668,46.767741),(10.965718,46.771642),(10.930888,46.773994),(10.913731,46.77234),(10.880348,46.764589),(10.870426,46.764072),(10.860195,46.766991),(10.843141,46.777043),(10.83415,46.780246),(10.823918,46.78035),(10.804901,46.776629),(10.795082,46.776888),(10.76635,46.788101),(10.754775,46.790763),(10.733691,46.786189),(10.722942,46.786448),(10.716947,46.795207),(10.721598,46.800142),(10.743819,46.812518),(10.748677,46.819443),(10.738962,46.829546),(10.662481,46.860965),(10.647081,46.863756),(10.629408,46.862412),(10.527708,46.843214),(10.486264,46.846366),(10.453811,46.864427),(10.451434,46.88577),(10.463836,46.919747),(10.458462,46.936619),(10.449574,46.943906),(10.415571,46.962406),(10.394693,46.985402),(10.384358,46.992998),(10.384358,46.993153),(10.384255,46.993153),(10.378984,46.995505),(10.373403,46.996254),(10.367925,46.995505),(10.338883,46.98411),(10.313665,46.964318),(10.296198,46.941374),(10.295681,46.922693),(10.270773,46.921892),(10.251343,46.92538),(10.235116,46.923313),(10.219924,46.905769),(10.215169,46.893108),(10.214342,46.884685),(10.211655,46.877036),(10.201423,46.86683),(10.157808,46.851612),(10.13197,46.846573),(10.125188,46.846751),(10.1113,46.847116),(10.068098,46.856624),(10.045567,46.865564),(10.006913,46.890757),(9.899943,46.914398),(9.875138,46.927421),(9.862426,46.939772),(9.860772,46.949151),(9.863976,46.959925),(9.866457,46.983387),(9.870591,46.992947),(9.870591,46.998838),(9.866767,47.001938),(9.860566,47.001602),(9.856328,47.004083),(9.857982,47.015478),(9.669053,47.056199),(9.65231,47.05793),(9.59991,47.053486),(9.581203,47.05687),(9.608798,47.080771),(9.615723,47.106764),(9.605594,47.132266),(9.581823,47.154901),(9.552057,47.16689),(9.551954,47.175571),(9.561876,47.190609),(9.562909,47.19774),(9.554331,47.211615),(9.544823,47.220323),(9.540378,47.229108),(9.547096,47.243035),(9.53025,47.253654),(9.521155,47.262801),(9.553298,47.299853),(9.587404,47.32781),(9.591228,47.334683),(9.596396,47.352305),(9.601047,47.36127),(9.639804,47.394524),(9.649519,47.409717),(9.650346,47.452092),(9.621717,47.469197),(9.58451,47.480721),(9.554951,47.5109),(9.553059,47.516891),(9.547482,47.534547),(9.549887,47.533534),(9.554144,47.532743),(9.612622,47.521881),(9.676701,47.52263),(9.703986,47.531415),(9.718455,47.546711),(9.730858,47.564901),(9.752665,47.582058),(9.767135,47.587277),(9.782121,47.588414),(9.79628,47.584952),(9.807959,47.576322),(9.811266,47.564488),(9.809303,47.552318),(9.813127,47.54175),(9.833487,47.534619),(9.841549,47.535032),(9.853848,47.540407),(9.858912,47.541337),(9.888988,47.533792),(9.918753,47.53219),(9.933843,47.534206),(9.945935,47.540769),(9.948726,47.524232),(9.959164,47.514879),(9.97167,47.506404),(9.980765,47.492942),(9.980765,47.489919),(9.981075,47.48687),(9.982625,47.481031),(9.993581,47.476586),(10.002366,47.47917),(10.011254,47.484441),(10.022623,47.487955),(10.071819,47.439121),(10.080604,47.42739),(10.075953,47.416874),(10.053215,47.40486),(10.064171,47.396178),(10.066858,47.385791),(10.067788,47.375042),(10.073162,47.365482),(10.082878,47.359074),(10.089596,47.359281),(10.097244,47.363131),(10.11037,47.367394),(10.11533,47.366955),(10.125666,47.362692),(10.130833,47.362666),(10.135071,47.364888),(10.146956,47.373802),(10.190881,47.379228),(10.209278,47.372484),(10.208555,47.354475),(10.190468,47.317475),(10.192742,47.310912),(10.193259,47.304917),(10.190778,47.298251),(10.18592,47.294995),(10.172691,47.292308),(10.168661,47.290422),(10.159462,47.279131),(10.155431,47.272878),(10.159876,47.271121),(10.174951,47.272376),(10.239354,47.277735),(10.261161,47.283497),(10.305913,47.302178),(10.325447,47.314322),(10.34343,47.330756),(10.365651,47.361115),(10.371646,47.367394),(10.381981,47.372122),(10.403065,47.377109),(10.411643,47.381037),(10.428283,47.396049),(10.442856,47.41628),(10.451951,47.438759),(10.451744,47.460205),(10.44761,47.472581),(10.442236,47.481392),(10.433657,47.487852),(10.419601,47.493045),(10.42973,47.532914),(10.43097,47.542164),(10.424356,47.553352),(10.415674,47.564385),(10.414227,47.573015),(10.429213,47.57702),(10.445956,47.579061),(10.453604,47.581102),(10.457118,47.579242),(10.461563,47.569914),(10.460322,47.565987),(10.455465,47.561181),(10.451744,47.554825),(10.453501,47.546246),(10.458772,47.541647),(10.466937,47.53772),(10.482543,47.532862),(10.525125,47.52847),(10.536907,47.529865),(10.549619,47.536789),(10.569876,47.555936),(10.583726,47.562473),(10.60791,47.562266),(10.739892,47.52847),(10.743923,47.525317),(10.74723,47.52015),(10.752191,47.515395),(10.760769,47.513638),(10.790328,47.516067),(10.830636,47.528573),(10.844795,47.531312),(10.858644,47.530666),(10.86929,47.526583),(10.892234,47.514879),(10.883862,47.508006),(10.851616,47.493097),(10.858438,47.485165),(10.909907,47.46899),(10.959827,47.432506),(10.962824,47.427959),(10.963134,47.421241),(10.96086,47.414316),(10.957656,47.409717),(10.955279,47.409614),(10.965511,47.396075),(10.979464,47.390545),(11.083747,47.389512),(11.10328,47.393568),(11.168599,47.424264),(11.193818,47.428941),(11.215212,47.422998),(11.213041,47.395816),(11.237019,47.393956),(11.258827,47.400725),(11.273089,47.411112),(11.286318,47.423205),(11.305645,47.4354),(11.324249,47.439431),(11.367657,47.440129),(11.383884,47.444857),(11.392462,47.454779),(11.388638,47.46222),(11.377786,47.467052),(11.365487,47.469326),(11.412616,47.506094),(11.435353,47.509711),(11.459951,47.507437),(11.482585,47.50258),(11.529508,47.507851),(11.551212,47.51369),(11.569402,47.527384),(11.574466,47.536634),(11.582321,47.559785),(11.589142,47.570379),(11.617048,47.586761),(11.620458,47.589654),(11.638958,47.589241),(11.682573,47.58335),(11.764015,47.583117),(11.820343,47.575288),(11.830678,47.577614),(11.840703,47.594615),(11.851969,47.599163),(11.935891,47.610738),(12.165645,47.603969),(12.173603,47.60508),(12.202128,47.629833),(12.205745,47.636215),(12.206779,47.645568),(12.205125,47.672285),(12.202335,47.677789),(12.197271,47.680088),(12.189106,47.685566),(12.181768,47.692129),(12.178564,47.697658),(12.1766,47.705823),(12.192413,47.710164),(12.216494,47.723703),(12.225176,47.727372),(12.239749,47.731687),(12.242229,47.732023),(12.239128,47.72745),(12.236545,47.716778),(12.233031,47.708872),(12.226623,47.702878),(12.223315,47.695901),(12.228793,47.684868),(12.238715,47.6789),(12.249567,47.680011),(12.271891,47.687891),(12.293699,47.69001),(12.351473,47.68169),(12.368423,47.683551),(12.407697,47.693731),(12.42413,47.69156),(12.428781,47.685798),(12.43922,47.664482),(12.444697,47.656291),(12.452759,47.649754),(12.482524,47.633579),(12.49658,47.628903),(12.517148,47.628541),(12.538232,47.631331),(12.553838,47.636008),(12.563375,47.641761),(12.598383,47.66288),(12.6174,47.669339),(12.653057,47.675127),(12.688713,47.675127),(12.744834,47.66536),(12.761991,47.666859),(12.751655,47.649392),(12.767365,47.63637),(12.793307,47.624794),(12.81315,47.611824),(12.785865,47.602677),(12.773669,47.5795),(12.77894,47.554825),(12.803642,47.541337),(12.819041,47.539528),(12.828446,47.537255),(12.836921,47.532655),(12.882603,47.498575),(12.931593,47.473512),(12.942548,47.470489),(12.951023,47.472478),(12.959291,47.475527),(12.96973,47.475734),(12.979342,47.472246),(12.984923,47.468267),(12.991124,47.465683),(13.001873,47.466019),(13.008797,47.470101),(13.037323,47.493045),(13.037013,47.501365),(13.034429,47.507437),(13.031225,47.512553),(13.028951,47.518031),(13.028124,47.524232),(13.028124,47.541647),(13.030605,47.544257),(13.040113,47.560457),(13.04125,47.561904),(13.03908,47.561336),(13.038253,47.584022),(13.04094,47.58335),(13.057063,47.597664),(13.057683,47.600429),(13.069569,47.620247),(13.072049,47.622417),(13.07422,47.63451),(13.07484,47.646654),(13.072049,47.659469),(13.064091,47.67399),(13.044557,47.696573),(13.032258,47.706624),(13.019856,47.712929),(13.004353,47.714608),(12.979032,47.707089),(12.964045,47.705358),(12.908338,47.71236),(12.892009,47.723548),(12.910612,47.742927),(12.910819,47.74303),(12.910819,47.743082),(12.917227,47.750161),(12.918984,47.756776),(12.919294,47.763184),(12.921257,47.76954),(12.926735,47.777395),(12.991227,47.847106),(12.986576,47.850259),(12.964976,47.871963),(12.931076,47.924879),(12.914229,47.93599),(12.906168,47.93891),(12.886014,47.952888),(12.862036,47.962552),(12.853975,47.970484),(12.8486,47.980948),(12.848246,47.982389),(12.845603,47.993144),(12.830617,48.015468),(12.760234,48.064871),(12.750932,48.074741),(12.742043,48.086782),(12.736979,48.099959),(12.738943,48.113447),(12.745041,48.12063),(12.751449,48.122103),(12.75796,48.121896),(12.764058,48.123756),(12.77832,48.138717),(12.782351,48.142024),(12.822142,48.160679),(12.835164,48.170704),(12.853458,48.18998),(12.862553,48.196646),(12.877642,48.202046),(12.93304,48.209255),(12.931696,48.211632),(12.947199,48.220004),(12.979445,48.232018),(13.016652,48.255893),(13.032775,48.263567),(13.136438,48.291059),(13.274207,48.307104),(13.307797,48.319636),(13.405569,48.376583),(13.419522,48.392164),(13.425206,48.413377),(13.42717,48.418544),(13.431717,48.423712),(13.436161,48.430585),(13.438228,48.440998),(13.436368,48.469239),(13.438228,48.478541),(13.442983,48.487713),(13.456418,48.506653),(13.459209,48.516394),(13.457039,48.525179),(13.447737,48.534816),(13.443706,48.552851),(13.440709,48.557347),(13.440089,48.560965),(13.445566,48.567915),(13.454558,48.573445),(13.487218,48.581584),(13.520704,48.584581),(13.624367,48.565357),(13.641834,48.559104),(13.65806,48.551094),(13.673356,48.535488),(13.714336,48.523215),(13.716506,48.521691),(13.725394,48.548381),(13.733869,48.559776),(13.73728,48.559259),(13.758054,48.561481),(13.766012,48.563755),(13.77428,48.569207),(13.779034,48.573935),(13.796191,48.598585),(13.802392,48.611711),(13.805493,48.626129),(13.806216,48.642923),(13.800945,48.675221),(13.803529,48.687159),(13.816862,48.695582),(13.804356,48.699561),(13.799395,48.70261),(13.78875,48.716511),(13.783582,48.71527),(13.785856,48.724779),(13.815725,48.76643),(13.855929,48.759299),(13.874946,48.752426),(13.893136,48.743021),(13.915047,48.73098),(13.98233,48.706485),(13.991115,48.700181),(14.007754,48.683283),(14.014162,48.675066),(14.019227,48.671914),(14.026151,48.670054),(14.032146,48.667263),(14.034729,48.661165),(14.032869,48.654912),(14.028322,48.653982),(14.023464,48.654602),(14.020467,48.653155),(14.013749,48.643802),(14.008064,48.642407),(14.006204,48.639513),(14.010855,48.62587),(14.015196,48.620393),(14.032456,48.60613),(14.040827,48.601169),(14.07483,48.591712),(14.216527,48.58117),(14.315746,48.557916),(14.325358,48.558639),(14.333213,48.560706),(14.353366,48.571429),(14.405353,48.586286),(14.421166,48.597061),(14.443593,48.636516),(14.458166,48.643182),(14.482144,48.624475),(14.522038,48.610626),(14.53382,48.608714),(14.548807,48.610936),(14.578779,48.620496),(14.594179,48.621323),(14.600586,48.617576),(14.601827,48.611194),(14.60193,48.604528),(14.605134,48.600316),(14.612885,48.599748),(14.628182,48.603288),(14.634693,48.602332),(14.645442,48.592901),(14.651333,48.583496),(14.659187,48.576959),(14.675621,48.576235),(14.69114,48.586535),(14.695671,48.589542),(14.700735,48.615535),(14.700219,48.646102),(14.703836,48.673103),(14.722749,48.693411),(14.775356,48.724004),(14.78042,48.743124),(14.790446,48.754855),(14.794476,48.766999),(14.800367,48.776507),(14.815457,48.780331),(14.86765,48.775577),(14.919327,48.761573),(14.939584,48.762813),(14.951056,48.780331),(14.948886,48.78214),(14.944441,48.788599),(14.940101,48.796506),(14.938137,48.80281),(14.93979,48.809787),(14.947025,48.822396),(14.968213,48.885028),(14.968316,48.912674),(14.964182,48.943267),(14.964595,48.971741),(14.978238,48.992825),(14.977308,48.998251),(14.977308,49.002902),(14.978858,49.00626),(14.982062,49.007914),(15.003973,49.009774),(15.059576,48.997217),(15.137401,48.993031),(15.144739,48.978924),(15.148977,48.965333),(15.148563,48.951742),(15.141949,48.937479),(15.161792,48.937221)]
+Burundi	[(30.415073,-2.313088),(30.418484,-2.311847),(30.423238,-2.317325),(30.428406,-2.331381),(30.434142,-2.339236),(30.488454,-2.383781),(30.521733,-2.399387),(30.5546,-2.400628),(30.521475,-2.442279),(30.508091,-2.463466),(30.47016,-2.55576),(30.461995,-2.58749),(30.457655,-2.598032),(30.448043,-2.610537),(30.424168,-2.633171),(30.416003,-2.645574),(30.412128,-2.670172),(30.423238,-2.680921),(30.442668,-2.681127),(30.463752,-2.674203),(30.499616,-2.657873),(30.52256,-2.649398),(30.516101,-2.668311),(30.458585,-2.72867),(30.450523,-2.741795),(30.447268,-2.757298),(30.446906,-2.782723),(30.425099,-2.812179),(30.413626,-2.8344),(30.415797,-2.851659),(30.440808,-2.884009),(30.456001,-2.898272),(30.474191,-2.903233),(30.469644,-2.914188),(30.475431,-2.922146),(30.484113,-2.930724),(30.488325,-2.94316),(30.488454,-2.94354),(30.49326,-2.941266),(30.513052,-2.913981),(30.524937,-2.904163),(30.53889,-2.898995),(30.547003,-2.900339),(30.61196,-2.939199),(30.62519,-2.94478),(30.62953,-2.947674),(30.632114,-2.953772),(30.634905,-2.970102),(30.637592,-2.974443),(30.650925,-2.977337),(30.661363,-2.974753),(30.671337,-2.970825),(30.683687,-2.969998),(30.695986,-2.974546),(30.718879,-2.989532),(30.732057,-2.99346),(30.755414,-2.991393),(30.80213,-2.97837),(30.825488,-2.978577),(30.818815,-2.990495),(30.815824,-2.995837),(30.78487,-3.031493),(30.778255,-3.04741),(30.783216,-3.062086),(30.807814,-3.085237),(30.817684,-3.099086),(30.817839,-3.104357),(30.813085,-3.11769),(30.812258,-3.123477),(30.815824,-3.131022),(30.828795,-3.140531),(30.832929,-3.147662),(30.833962,-3.160271),(30.832205,-3.172777),(30.823524,-3.196651),(30.809364,-3.216805),(30.809881,-3.224143),(30.814325,-3.24192),(30.814842,-3.247708),(30.799753,-3.274579),(30.775671,-3.291012),(30.747921,-3.294113),(30.721463,-3.280987),(30.718414,-3.292873),(30.712006,-3.301865),(30.702239,-3.307342),(30.68994,-3.308893),(30.662603,-3.319228),(30.640538,-3.33287),(30.621676,-3.35044),(30.603279,-3.372558),(30.61025,-3.376359),(30.640434,-3.392815),(30.639142,-3.41948),(30.612891,-3.444905),(30.565968,-3.466712),(30.552946,-3.482215),(30.544988,-3.48914),(30.538115,-3.49162),(30.511502,-3.497718),(30.509951,-3.500199),(30.508246,-3.50888),(30.507161,-3.511051),(30.48804,-3.512601),(30.487524,-3.510741),(30.48556,-3.510534),(30.46892,-3.513014),(30.466336,-3.516115),(30.462616,-3.527897),(30.460135,-3.531928),(30.432282,-3.551875),(30.426856,-3.563864),(30.429233,-3.583914),(30.428871,-3.602208),(30.421378,-3.620811),(30.38014,-3.685614),(30.373112,-3.703597),(30.373068,-3.704339),(30.371975,-3.722924),(30.376213,-3.739771),(30.381897,-3.75517),(30.384998,-3.770776),(30.381587,-3.788346),(30.33699,-3.773774),(30.31172,-3.789897),(30.273273,-3.856249),(30.22077,-3.909993),(30.208781,-3.930457),(30.191418,-4.002494),(30.175852,-4.039992),(30.173228,-4.046315),(30.149766,-4.08683),(30.119587,-4.12352),(30.051478,-4.180157),(30.041143,-4.19504),(30.015614,-4.256018),(30.003005,-4.271935),(29.980785,-4.28444),(29.970656,-4.292605),(29.936343,-4.312035),(29.900479,-4.345625),(29.847356,-4.370533),(29.838571,-4.37353),(29.821828,-4.37074),(29.810976,-4.365262),(29.80033,-4.363919),(29.784104,-4.37384),(29.782295,-4.377354),(29.780177,-4.393684),(29.775009,-4.402262),(29.757956,-4.410221),(29.751651,-4.416112),(29.747931,-4.430271),(29.747414,-4.44319),(29.744365,-4.454456),(29.732841,-4.463344),(29.728293,-4.461587),(29.687469,-4.458383),(29.638273,-4.446808),(29.404179,-4.449805),(29.37276,-4.208166),(29.367224,-4.189048),(29.33948,-4.093237),(29.277727,-3.988954),(29.239796,-3.948027),(29.224552,-3.926529),(29.215043,-3.899864),(29.206568,-3.781939),(29.217123,-3.709266),(29.22326,-3.66701),(29.225172,-3.588565),(29.206672,-3.334524),(29.208739,-3.305275),(29.213079,-3.291943),(29.236117,-3.270704),(29.240881,-3.266311),(29.223828,-3.252669),(29.216904,-3.233135),(29.214113,-3.166472),(29.217524,-3.146215),(29.225017,-3.129369),(29.237781,-3.122237),(29.242328,-3.110765),(29.241539,-3.104188),(29.234629,-3.046583),(29.225378,-3.031803),(29.211529,-3.021158),(29.194476,-3.014647),(29.175976,-3.012477),(29.156752,-3.004828),(29.148174,-2.986948),(29.144246,-2.966278),(29.138407,-2.950361),(29.123369,-2.940233),(29.105076,-2.934135),(29.08978,-2.926074),(29.083268,-2.910054),(29.081718,-2.893931),(29.077584,-2.884009),(29.062701,-2.862201),(29.053503,-2.835433),(29.049058,-2.827475),(29.034072,-2.82086),(29.013143,-2.818897),(28.994902,-2.813626),(28.986892,-2.796779),(28.988804,-2.775488),(28.995522,-2.758435),(29.008234,-2.74748),(29.028595,-2.744896),(29.015365,-2.720711),(29.032574,-2.620666),(29.05526,-2.598445),(29.113447,-2.594621),(29.129725,-2.596998),(29.190445,-2.623456),(29.212769,-2.630278),(29.254989,-2.635549),(29.276125,-2.640613),(29.294418,-2.651052),(29.306614,-2.660147),(29.307337,-2.664797),(29.306045,-2.67658),(29.309481,-2.690127),(29.309714,-2.691049),(29.331418,-2.71141),(29.337516,-2.723812),(29.335346,-2.735181),(29.321497,-2.752131),(29.318086,-2.762569),(29.32036,-2.774145),(29.329661,-2.794919),(29.33085,-2.807424),(29.339687,-2.826441),(29.364285,-2.824168),(29.407435,-2.805461),(29.425366,-2.803394),(29.444675,-2.806989),(29.480867,-2.813729),(29.504121,-2.826855),(29.523138,-2.820447),(29.541845,-2.808561),(29.563756,-2.805667),(29.574091,-2.806081),(29.582049,-2.80298),(29.589491,-2.798433),(29.619256,-2.787684),(29.626388,-2.788097),(29.637087,-2.791629),(29.678684,-2.805357),(29.697546,-2.808251),(29.719922,-2.805461),(29.729637,-2.79957),(29.733978,-2.790268),(29.737285,-2.769287),(29.744727,-2.759985),(29.756199,-2.759882),(29.778523,-2.7666),(29.803379,-2.767324),(29.823585,-2.763499),(29.842395,-2.752441),(29.862859,-2.731667),(29.876191,-2.71358),(29.888387,-2.692909),(29.897896,-2.671102),(29.90327,-2.649088),(29.903726,-2.637947),(29.907921,-2.5354),(29.929573,-2.459849),(29.92239,-2.382954),(29.928901,-2.331795),(29.928798,-2.322493),(29.931692,-2.316912),(29.941924,-2.316602),(29.949934,-2.321149),(29.956781,-2.327038),(29.95852,-2.328533),(29.976134,-2.34368),(29.983885,-2.344817),(29.992308,-2.34399),(30.00192,-2.3443),(30.013341,-2.348331),(30.025536,-2.357736),(30.056542,-2.394426),(30.072975,-2.408792),(30.093853,-2.422642),(30.116797,-2.43153),(30.139121,-2.430807),(30.156174,-2.419024),(30.20134,-2.362387),(30.203407,-2.355359),(30.203923,-2.345954),(30.207489,-2.339236),(30.219116,-2.340373),(30.250329,-2.355566),(30.262731,-2.358356),(30.278854,-2.357633),(30.297974,-2.353705),(30.316785,-2.347608),(30.331151,-2.340269),(30.344018,-2.328384),(30.34861,-2.322352),(30.352752,-2.316912),(30.362518,-2.307817),(30.37859,-2.303062),(30.383447,-2.305543),(30.415073,-2.313088)]
+Belgium	[(4.815447,51.431074),(4.822682,51.413685),(4.779067,51.426423),(4.767802,51.425389),(4.762117,51.413375),(4.783304,51.407638),(4.853274,51.40614),(4.871671,51.403039),(4.910325,51.391903),(4.931926,51.395624),(4.957144,51.410997),(4.980192,51.430531),(4.995798,51.446706),(5.002723,51.459005),(5.006133,51.468307),(5.012128,51.474327),(5.027527,51.476807),(5.030318,51.47443),(5.06029,51.461976),(5.079927,51.438541),(5.076413,51.421901),(5.065251,51.405907),(5.061737,51.384255),(5.068145,51.37454),(5.102561,51.350665),(5.107832,51.341984),(5.118064,51.319918),(5.122922,51.313381),(5.140182,51.307386),(5.178836,51.309505),(5.197336,51.308342),(5.214906,51.294338),(5.215423,51.258733),(5.232993,51.255916),(5.239456,51.25693),(5.270717,51.261833),(5.389056,51.258707),(5.409933,51.263539),(5.451894,51.282116),(5.471635,51.288085),(5.493235,51.286535),(5.516696,51.277233),(5.535197,51.26204),(5.542328,51.242661),(5.545532,51.219924),(5.551407,51.216767),(5.568373,51.207651),(5.62501,51.196902),(5.638549,51.190907),(5.648161,51.183957),(5.659013,51.179074),(5.67617,51.179177),(5.718028,51.184603),(5.730844,51.18375),(5.747173,51.177601),(5.768051,51.159462),(5.781383,51.152409),(5.812079,51.157318),(5.829132,51.156465),(5.83802,51.143727),(5.840501,51.138921),(5.826445,51.130162),(5.823241,51.118741),(5.845979,51.103393),(5.83678,51.099492),(5.826652,51.096908),(5.815903,51.095875),(5.804948,51.096624),(5.807428,51.089389),(5.808978,51.08634),(5.811769,51.082309),(5.804327,51.068589),(5.79885,51.061484),(5.791305,51.054998),(5.779626,51.061303),(5.771461,51.058125),(5.766397,51.048436),(5.76402,51.035181),(5.777559,51.023553),(5.761746,50.999162),(5.722369,50.959423),(5.744693,50.963247),(5.754305,50.963092),(5.76402,50.959423),(5.752548,50.947227),(5.735288,50.923973),(5.722369,50.911674),(5.717614,50.909245),(5.706039,50.90661),(5.694463,50.903664),(5.622323,50.852659),(5.624493,50.830284),(5.64072,50.815039),(5.657432,50.807641),(5.663251,50.805065),(5.684852,50.798503),(5.700458,50.795557),(5.698701,50.783775),(5.688366,50.76083),(5.706556,50.754216),(5.717408,50.752821),(5.727846,50.754164),(5.732777,50.758851),(5.743556,50.769099),(5.752444,50.773439),(5.76247,50.771011),(5.782933,50.756696),(5.793165,50.752149),(5.879878,50.753544),(5.891288,50.751246),(5.891321,50.75124),(5.902203,50.749048),(5.974756,50.74755),(5.99491,50.749927),(5.993256,50.748066),(5.992636,50.746258),(5.99274,50.744449),(5.994187,50.742589),(6.010826,50.737059),(6.011343,50.727447),(6.007623,50.716905),(6.01155,50.708534),(6.024779,50.707552),(6.064363,50.714477),(6.081003,50.713495),(6.100227,50.701299),(6.161102,50.642181),(6.147769,50.636755),(6.159448,50.622389),(6.180015,50.615516),(6.249055,50.614431),(6.251329,50.608437),(6.244301,50.599548),(6.232932,50.590763),(6.232932,50.587146),(6.210608,50.578671),(6.179085,50.561979),(6.160688,50.543583),(6.177328,50.530198),(6.169473,50.522499),(6.170817,50.517951),(6.178878,50.515781),(6.190557,50.515212),(6.182599,50.506582),(6.19066,50.501828),(6.199239,50.490408),(6.207197,50.486325),(6.217119,50.486015),(6.250915,50.492681),(6.253086,50.494077),(6.255566,50.494593),(6.25784,50.494077),(6.260114,50.492681),(6.27541,50.48803),(6.318715,50.481674),(6.336905,50.481003),(6.325743,50.474026),(6.323262,50.466016),(6.326156,50.457025),(6.331634,50.446896),(6.340212,50.437853),(6.347343,50.436974),(6.351167,50.433564),(6.350444,50.416872),(6.343313,50.393308),(6.336388,50.379923),(6.337732,50.368089),(6.372458,50.329436),(6.3734,50.32308),(6.374525,50.315483),(6.362019,50.306956),(6.335458,50.303856),(6.322022,50.305406),(6.310653,50.308248),(6.299491,50.308868),(6.285952,50.303856),(6.27603,50.296104),(6.269415,50.286492),(6.267348,50.276416),(6.271792,50.267424),(6.253396,50.256778),(6.210401,50.249027),(6.189627,50.242722),(6.179808,50.233007),(6.157174,50.222724),(6.146839,50.214042),(6.160171,50.204534),(6.165752,50.193165),(6.165132,50.181899),(6.159138,50.172443),(6.151696,50.169342),(6.131749,50.168308),(6.123171,50.164898),(6.121311,50.16159),(6.118003,50.150377),(6.115833,50.145467),(6.125962,50.140196),(6.129476,50.134047),(6.126582,50.127329),(6.117487,50.120456),(6.102604,50.124745),(6.10033,50.132652),(6.101467,50.142108),(6.097126,50.151307),(6.084207,50.159317),(6.076456,50.158645),(6.070048,50.154201),(6.061366,50.150738),(6.038628,50.148413),(6.027363,50.149447),(6.022967,50.15082),(6.014134,50.153581),(6.008036,50.160919),(6.004729,50.170479),(5.998321,50.174975),(5.982921,50.167068),(5.96163,50.165621),(5.953156,50.156371),(5.949021,50.142677),(5.941063,50.128311),(5.92618,50.118337),(5.888973,50.106607),(5.872437,50.096892),(5.86882,50.090535),(5.866856,50.074309),(5.864375,50.067488),(5.858278,50.061803),(5.843705,50.053638),(5.83771,50.047437),(5.838847,50.035862),(5.838847,50.026457),(5.836367,50.01855),(5.829132,50.013589),(5.808875,50.007801),(5.802674,50.002479),(5.801537,49.988681),(5.808565,49.9831),(5.812596,49.977571),(5.80164,49.963825),(5.793372,49.958812),(5.778593,49.95659),(5.771565,49.953541),(5.76371,49.946823),(5.759989,49.941604),(5.757612,49.93654),(5.753581,49.930183),(5.718958,49.891374),(5.714927,49.881866),(5.726709,49.878197),(5.748827,49.867293),(5.758129,49.858198),(5.731877,49.859955),(5.73198,49.854167),(5.730533,49.85117),(5.728673,49.848845),(5.726916,49.845227),(5.736528,49.83944),(5.724642,49.834272),(5.720198,49.824712),(5.721645,49.812775),(5.727743,49.800217),(5.738285,49.788848),(5.748414,49.785644),(5.759162,49.784456),(5.771875,49.779392),(5.778489,49.773035),(5.802054,49.742856),(5.803604,49.738154),(5.805774,49.724201),(5.805361,49.721876),(5.811769,49.718517),(5.825721,49.715778),(5.831716,49.713607),(5.837297,49.712936),(5.843705,49.714331),(5.850216,49.714021),(5.856004,49.708078),(5.856403,49.705807),(5.857347,49.70043),(5.853627,49.696296),(5.848769,49.69273),(5.847219,49.687201),(5.846702,49.68069),(5.843705,49.677486),(5.842258,49.67392),(5.845772,49.666582),(5.852593,49.663223),(5.872644,49.661724),(5.879878,49.657745),(5.885459,49.643534),(5.879878,49.634853),(5.869957,49.628858),(5.861998,49.62276),(5.849183,49.599713),(5.841224,49.589687),(5.829959,49.582763),(5.846909,49.576717),(5.8374,49.56111),(5.814456,49.545142),(5.790685,49.537753),(5.779006,49.539613),(5.757095,49.548398),(5.746346,49.549431),(5.735598,49.545711),(5.722679,49.5346),(5.710276,49.531086),(5.688676,49.533515),(5.667178,49.54044),(5.644647,49.543799),(5.619739,49.53553),(5.607854,49.524937),(5.60558,49.517754),(5.602273,49.513723),(5.587493,49.512431),(5.578915,49.51393),(5.547599,49.523438),(5.528789,49.517961),(5.503674,49.505093),(5.477732,49.495223),(5.456132,49.498944),(5.44993,49.507832),(5.450964,49.516772),(5.454168,49.526177),(5.454375,49.536616),(5.450241,49.545762),(5.402078,49.602451),(5.391166,49.608817),(5.383475,49.613304),(5.352469,49.620693),(5.3411,49.625137),(5.334899,49.625809),(5.331178,49.623122),(5.326941,49.617644),(5.32167,49.61258),(5.314538,49.611133),(5.297898,49.613252),(5.293041,49.617179),(5.290664,49.626378),(5.293764,49.640537),(5.301826,49.643896),(5.306373,49.647513),(5.299449,49.662499),(5.280122,49.677899),(5.259244,49.691335),(5.237644,49.690973),(5.192478,49.682808),(5.169431,49.687201),(5.151241,49.695986),(5.136358,49.705339),(5.093776,49.745337),(5.081891,49.752727),(5.046234,49.759393),(5.026287,49.766731),(4.98908,49.790554),(4.970993,49.797065),(4.968371,49.796981),(4.950013,49.796393),(4.906604,49.786471),(4.884177,49.784146),(4.858029,49.786575),(4.849037,49.794171),(4.849244,49.831585),(4.846763,49.837528),(4.836945,49.848018),(4.834878,49.85303),(4.836738,49.859128),(4.845626,49.865846),(4.848934,49.871066),(4.854308,49.883313),(4.859372,49.891684),(4.861956,49.900314),(4.860199,49.913337),(4.844593,49.931734),(4.797257,49.944291),(4.783925,49.958295),(4.788265,49.974263),(4.826713,50.036017),(4.827643,50.046714),(4.826093,50.055034),(4.827229,50.064077),(4.84604,50.09069),(4.852137,50.091621),(4.862886,50.084076),(4.86516,50.101594),(4.870534,50.122265),(4.871878,50.139783),(4.862679,50.147586),(4.831364,50.1434),(4.820098,50.146449),(4.815551,50.161332),(4.788575,50.153374),(4.681915,50.083921),(4.676128,50.076066),(4.67344,50.066196),(4.675818,50.060201),(4.679538,50.055189),(4.680572,50.048316),(4.672924,50.01638),(4.665896,50.000515),(4.656697,49.989095),(4.645845,49.984495),(4.604194,49.980206),(4.464771,49.935609),(4.435109,49.93225),(4.427651,49.933572),(4.277599,49.960156),(4.215953,49.954408),(4.201118,49.953024),(4.187682,49.955505),(4.131665,49.974987),(4.132365,49.974946),(4.139623,49.974522),(4.138383,49.989198),(4.132905,50.004494),(4.128151,50.005786),(4.132285,50.017568),(4.137349,50.025061),(4.144584,50.030797),(4.162877,50.041805),(4.186028,50.05245),(4.210006,50.06015),(4.210316,50.066713),(4.203392,50.074671),(4.197397,50.084076),(4.180551,50.127226),(4.170629,50.130481),(4.15988,50.129396),(4.139933,50.123557),(4.125774,50.128156),(4.128151,50.146243),(4.147374,50.186343),(4.152749,50.204534),(4.157296,50.212698),(4.167942,50.222465),(4.191506,50.234299),(4.201325,50.241534),(4.203702,50.251973),(4.197604,50.258484),(4.185201,50.26546),(4.171766,50.270886),(4.162774,50.272953),(4.150268,50.269543),(4.149751,50.263135),(4.150992,50.256262),(4.143654,50.251611),(4.125257,50.25714),(4.097868,50.294812),(4.077198,50.306646),(4.055907,50.314553),(4.022731,50.338117),(4.0033,50.34406),(3.982113,50.342613),(3.918551,50.325456),(3.895917,50.325301),(3.878037,50.330779),(3.86088,50.338479),(3.84021,50.345197),(3.798662,50.348452),(3.755047,50.346334),(3.741508,50.34313),(3.733446,50.337239),(3.715463,50.317653),(3.711122,50.309333),(3.708435,50.306336),(3.703887,50.304321),(3.702234,50.305251),(3.700787,50.304683),(3.696859,50.298223),(3.661719,50.319307),(3.652934,50.360183),(3.652831,50.406847),(3.644356,50.445501),(3.62813,50.464363),(3.608286,50.476507),(3.586375,50.483483),(3.563741,50.486532),(3.499145,50.48679),(3.486743,50.492681),(3.496458,50.503792),(3.498008,50.511853),(3.491497,50.517073),(3.477131,50.519863),(3.462868,50.51914),(3.452636,50.514851),(3.442714,50.508494),(3.429175,50.501828),(3.385354,50.491648),(3.361066,50.489787),(3.343599,50.49294),(3.299881,50.507461),(3.286755,50.514075),(3.271045,50.526943),(3.265878,50.538312),(3.264327,50.570196),(3.237869,50.626472),(3.229808,50.65541),(3.24376,50.672102),(3.232391,50.695925),(3.224433,50.705175),(3.210997,50.707965),(3.196941,50.709206),(3.188983,50.715097),(3.176684,50.734114),(3.162823,50.749925),(3.162811,50.749939),(3.146195,50.768892),(3.129245,50.779072),(3.103304,50.784085),(3.023817,50.768262),(2.971425,50.757833),(2.948378,50.748686),(2.930188,50.736232),(2.900112,50.703108),(2.886883,50.696648),(2.871276,50.698767),(2.866726,50.700091),(2.786734,50.723365),(2.768234,50.733235),(2.762963,50.739385),(2.749527,50.75959),(2.743842,50.766205),(2.706635,50.788787),(2.700021,50.79628),(2.69692,50.80305),(2.691856,50.808838),(2.67873,50.81323),(2.669222,50.813902),(2.650618,50.812248),(2.642453,50.812455),(2.627777,50.814419),(2.620439,50.816486),(2.615168,50.82217),(2.60659,50.834831),(2.602042,50.838087),(2.58995,50.842014),(2.586746,50.845425),(2.58778,50.850024),(2.595531,50.861134),(2.596668,50.867646),(2.576928,50.911519),(2.582715,50.920666),(2.605763,50.935238),(2.611654,50.941233),(2.60845,50.961128),(2.592741,50.976114),(2.55698,51.001177),(2.547059,51.020479),(2.537033,51.06461),(2.5218,51.087541),(2.521821,51.087551),(2.542003,51.096869),(2.579926,51.104804),(2.715668,51.169501),(2.923595,51.246487),(3.124848,51.329657),(3.348969,51.375149),(3.349415,51.375223),(3.358068,51.336713),(3.353934,51.311908),(3.353211,51.288602),(3.36737,51.263487),(3.391658,51.24677),(3.398798,51.244698),(3.421941,51.237985),(3.453877,51.235633),(3.501212,51.240284),(3.504106,51.249741),(3.501522,51.262402),(3.503383,51.273952),(3.514338,51.281031),(3.529014,51.283331),(3.545034,51.283925),(3.584825,51.289532),(3.609526,51.290436),(3.635054,51.287827),(3.757321,51.262324),(3.776234,51.254521),(3.781402,51.241421),(3.779748,51.230311),(3.781402,51.219872),(3.796285,51.208762),(3.808687,51.205325),(3.927026,51.206255),(3.949454,51.210777),(3.995032,51.23323),(4.118952,51.272401),(4.168562,51.29687),(4.207939,51.330589),(4.21352,51.340537),(4.220962,51.363817),(4.221491,51.368001),(4.221528,51.367987),(4.222179,51.367743),(4.241059,51.356594),(4.249034,51.346666),(4.256114,51.328437),(4.272634,51.315823),(4.290782,51.305894),(4.302989,51.296088),(4.306651,51.28974),(4.308116,51.283637),(4.305431,51.276597),(4.298676,51.269599),(4.296723,51.267564),(4.30836,51.271226),(4.316417,51.276842),(4.330821,51.296088),(4.29713,51.305162),(4.289317,51.309149),(4.285411,51.31802),(4.286143,51.339667),(4.283051,51.350084),(4.275645,51.3581),(4.261078,51.369371),(4.261068,51.369379),(4.281124,51.368947),(4.290105,51.368752),(4.326278,51.356427),(4.345605,51.352293),(4.392217,51.350407),(4.411234,51.356737),(4.416195,51.373971),(4.410097,51.38379),(4.38767,51.400533),(4.379918,51.409525),(4.380642,51.419653),(4.387153,51.427456),(4.38922,51.434588),(4.377128,51.442882),(4.429424,51.461976),(4.483064,51.474327),(4.512623,51.477376),(4.525232,51.475929),(4.533191,51.467583),(4.531847,51.450866),(4.523372,51.438412),(4.521512,51.428645),(4.540632,51.420067),(4.553861,51.419291),(4.582697,51.422599),(4.614633,51.41756),(4.630136,51.418206),(4.643571,51.42141),(4.653907,51.426216),(4.731215,51.485618),(4.764184,51.496238),(4.778654,51.495359),(4.796844,51.491018),(4.813587,51.48412),(4.823922,51.475645),(4.826093,51.460555),(4.819891,51.446215),(4.815447,51.431074)]
+Benin	[(3.341635,11.882893),(3.355071,11.889043),(3.369127,11.897311),(3.380909,11.895037),(3.391658,11.888836),(3.40282,11.88527),(3.447675,11.857985),(3.484262,11.84517),(3.495424,11.837521),(3.503486,11.829977),(3.536972,11.782899),(3.54369,11.77706),(3.549271,11.773753),(3.553715,11.76967),(3.557436,11.761815),(3.5625,11.746003),(3.566221,11.738354),(3.568185,11.729518),(3.571699,11.72187),(3.58007,11.717374),(3.589372,11.701509),(3.5964,11.695773),(3.574386,11.673035),(3.504933,11.556557),(3.493047,11.511495),(3.486743,11.496276),(3.466692,11.442481),(3.468449,11.419485),(3.483332,11.392303),(3.662546,11.143145),(3.686731,11.120485),(3.694999,11.119116),(3.704404,11.120795),(3.705583,11.120733),(3.713706,11.120304),(3.722077,11.112346),(3.711845,11.073511),(3.711845,11.051859),(3.715876,11.031886),(3.723318,11.013541),(3.733549,10.996462),(3.733549,10.996203),(3.754117,10.907139),(3.75298,10.877683),(3.731276,10.825025),(3.730035,10.807714),(3.7351,10.795776),(3.743161,10.787456),(3.751946,10.78017),(3.759491,10.771592),(3.764452,10.760869),(3.773857,10.728054),(3.783262,10.71697),(3.796078,10.71312),(3.810237,10.710484),(3.82295,10.70325),(3.832148,10.683923),(3.837109,10.654829),(3.837246,10.630609),(3.837419,10.599897),(3.829874,10.573077),(3.804346,10.523157),(3.795354,10.496492),(3.794321,10.444867),(3.787706,10.426367),(3.772513,10.407635),(3.756907,10.405257),(3.692828,10.438382),(3.671744,10.442077),(3.652107,10.435798),(3.632574,10.416652),(3.625959,10.407273),(3.623169,10.400917),(3.622135,10.381228),(3.618208,10.369342),(3.59299,10.330947),(3.572422,10.285704),(3.573352,10.266997),(3.587615,10.244182),(3.655621,10.174781),(3.664613,10.162197),(3.667507,10.146565),(3.66483,10.128654),(3.663993,10.123052),(3.654898,10.101116),(3.642392,10.091892),(3.627819,10.084993),(3.612317,10.070291),(3.605805,10.054116),(3.599604,9.968695),(3.589476,9.948825),(3.557126,9.910559),(3.530771,9.862965),(3.513098,9.846609),(3.452946,9.853095),(3.413982,9.842837),(3.342049,9.813588),(3.325926,9.801728),(3.317141,9.78173),(3.314867,9.759095),(3.318381,9.739432),(3.33068,9.708633),(3.338638,9.678222),(3.33161,9.652022),(3.299054,9.633961),(3.281381,9.634994),(3.261847,9.638612),(3.245724,9.633702),(3.238179,9.609053),(3.239419,9.602309),(3.24469,9.589571),(3.243554,9.584403),(3.182575,9.505338),(3.175134,9.498879),(3.159011,9.493478),(3.151776,9.488156),(3.132553,9.457279),(3.128625,9.429581),(3.135343,9.401675),(3.148055,9.370256),(3.151466,9.353565),(3.151363,9.288633),(3.145162,9.267859),(3.124594,9.228999),(3.091315,9.126421),(3.076019,9.095157),(3.051421,9.078207),(2.983104,9.060611),(2.971425,9.060508),(2.9614,9.065313),(2.951685,9.071902),(2.94073,9.07707),(2.929878,9.078362),(2.899182,9.07738),(2.888433,9.075364),(2.877788,9.068543),(2.869313,9.059707),(2.859701,9.052627),(2.846265,9.050767),(2.769164,9.057045),(2.772368,9.030535),(2.770197,8.967154),(2.76472,8.939766),(2.761516,8.933694),(2.75025,8.916873),(2.74777,8.914806),(2.749527,8.906615),(2.753764,8.904419),(2.758725,8.902662),(2.762549,8.895686),(2.762136,8.880415),(2.74963,8.851941),(2.745909,8.836516),(2.74715,8.827654),(2.752317,8.81228),(2.751077,8.803417),(2.745703,8.798146),(2.728856,8.790472),(2.723172,8.782928),(2.722862,8.772308),(2.722949,8.771218),(2.742439,8.527481),(2.744773,8.498294),(2.736918,8.464523),(2.72896,8.452741),(2.709012,8.430391),(2.703741,8.417885),(2.703535,8.409023),(2.706015,8.390548),(2.706015,8.381272),(2.698367,8.339854),(2.697127,8.320708),(2.700744,8.296885),(2.708496,8.274819),(2.728133,8.233194),(2.734954,8.211903),(2.734437,8.189966),(2.726582,8.171595),(2.716144,8.154904),(2.708392,8.13798),(2.705705,8.119686),(2.703535,8.059897),(2.690926,7.996567),(2.687102,7.933522),(2.683588,7.924634),(2.673356,7.905565),(2.671082,7.897917),(2.671695,7.893434),(2.672219,7.889597),(2.68028,7.87735),(2.691546,7.848669),(2.715524,7.822056),(2.724412,7.80769),(2.727203,7.793324),(2.717641,7.658549),(2.715317,7.625789),(2.720588,7.586566),(2.740638,7.549359),(2.770197,7.514271),(2.792315,7.477633),(2.789628,7.435826),(2.787251,7.426886),(2.786527,7.421254),(2.783323,7.419238),(2.761722,7.423527),(2.751284,7.423631),(2.743636,7.419238),(2.741155,7.408179),(2.762136,7.1622),(2.761102,7.14835),(2.757795,7.138894),(2.749837,7.128558),(2.740638,7.109593),(2.736298,7.102927),(2.735264,7.096002),(2.739088,7.08298),(2.747666,7.072231),(2.773918,7.050785),(2.779706,7.041328),(2.775778,7.030528),(2.765547,7.025102),(2.752731,7.02133),(2.741052,7.0158),(2.71511,6.979833),(2.718418,6.943557),(2.731957,6.905213),(2.736918,6.863303),(2.726272,6.821368),(2.723585,6.799715),(2.72865,6.780001),(2.736298,6.769846),(2.744773,6.763774),(2.755005,6.760725),(2.767407,6.759563),(2.773298,6.755041),(2.775262,6.744887),(2.778569,6.698765),(2.772988,6.687474),(2.760689,6.679387),(2.742602,6.663341),(2.73113,6.641844),(2.73082,6.621354),(2.739398,6.579186),(2.737331,6.558025),(2.718803,6.504298),(2.71542,6.494488),(2.71192,6.474048),(2.704258,6.429299),(2.703841,6.368352),(2.703298,6.368313),(2.306977,6.331488),(2.226817,6.313666),(1.884532,6.274807),(1.619663,6.213899),(1.612439,6.234763),(1.633109,6.245692),(1.761577,6.276026),(1.782351,6.277267),(1.76354,6.350647),(1.74411,6.425733),(1.718375,6.466997),(1.709797,6.473404),(1.6883,6.484437),(1.681685,6.489838),(1.679515,6.498571),(1.681995,6.520017),(1.680755,6.530068),(1.67445,6.538594),(1.657811,6.552263),(1.655227,6.559213),(1.653883,6.570659),(1.646648,6.573192),(1.63683,6.572261),(1.627425,6.573347),(1.61957,6.577998),(1.611198,6.58469),(1.603344,6.592596),(1.597349,6.600813),(1.594145,6.611045),(1.594765,6.620269),(1.596522,6.62864),(1.596316,6.636418),(1.58536,6.656442),(1.572441,6.666907),(1.566033,6.678146),(1.574301,6.700574),(1.589182,6.72046),(1.597039,6.73096),(1.60107,6.746437),(1.595179,6.77057),(1.587531,6.791034),(1.58319,6.808268),(1.58257,6.825347),(1.590114,6.867334),(1.588047,6.881235),(1.579056,6.892035),(1.564223,6.903089),(1.562623,6.904283),(1.551357,6.920871),(1.531927,6.991926),(1.607478,6.991409),(1.625668,6.996783),(1.624944,7.143648),(1.624324,7.288807),(1.623704,7.4381),(1.623251,7.536385),(1.622855,7.62246),(1.622774,7.640052),(1.621947,7.838282),(1.621327,7.996567),(1.623807,8.155886),(1.625564,8.270478),(1.614919,8.356261),(1.609855,8.365485),(1.603964,8.367449),(1.603945,8.367476),(1.60107,8.371635),(1.606031,8.396026),(1.606031,8.413389),(1.607581,8.421864),(1.640447,8.475815),(1.644168,8.493488),(1.63993,8.503255),(1.614092,8.535785),(1.609028,8.546973),(1.607581,8.558755),(1.607204,8.588617),(1.605514,8.722492),(1.604274,8.815225),(1.602827,8.924392),(1.601173,9.049526),(1.595799,9.076811),(1.587841,9.100893),(1.567273,9.13673),(1.505158,9.201455),(1.425267,9.284499),(1.420146,9.292317),(1.401185,9.321267),(1.386716,9.361135),(1.379895,9.462473),(1.368422,9.490843),(1.351266,9.482549),(1.336486,9.497509),(1.326358,9.521952),(1.323154,9.542313),(1.327288,9.555309),(1.345065,9.582388),(1.351266,9.595074),(1.352506,9.60528),(1.352196,9.625357),(1.354573,9.635304),(1.35602,9.647474),(1.348165,9.694164),(1.346925,9.771834),(1.345065,9.881103),(1.343942,9.954756),(1.343825,9.962442),(1.331009,9.996471),(1.225485,10.066053),(1.082238,10.16044),(0.997106,10.216553),(0.939508,10.254517),(0.844423,10.317175),(0.768769,10.367094),(0.760708,10.382158),(0.759881,10.405154),(0.773833,10.508145),(0.78851,10.563852),(0.789233,10.602946),(0.781275,10.693044),(0.795641,10.726478),(0.850005,10.77769),(0.862924,10.796086),(0.866024,10.80637),(0.867575,10.829211),(0.869538,10.839908),(0.885144,10.869389),(0.883698,10.880216),(0.875326,10.900524),(0.872949,10.911299),(0.875843,10.931169),(0.901474,10.992741),(0.931963,10.976101),(0.945399,10.974293),(0.963279,10.974137),(0.967517,10.979486),(0.969997,10.991165),(0.969067,11.002895),(0.963279,11.00827),(0.955321,11.01199),(0.951807,11.021086),(0.95129,11.032299),(0.952427,11.042402),(0.955941,11.044727),(0.964416,11.057414),(0.970307,11.06948),(0.976922,11.078369),(0.981366,11.080126),(0.986017,11.078498),(1.007928,11.075062),(1.014646,11.070359),(1.01971,11.065682),(1.025084,11.063512),(1.027978,11.061341),(1.033249,11.051575),(1.035006,11.049275),(1.041311,11.049585),(1.052163,11.055011),(1.05609,11.05607),(1.086889,11.052737),(1.097018,11.049275),(1.099705,11.044366),(1.106836,11.034418),(1.114174,11.027674),(1.117482,11.032196),(1.118619,11.048241),(1.10725,11.059791),(1.100945,11.070411),(1.099292,11.081289),(1.099085,11.092606),(1.097018,11.104491),(1.095158,11.10444),(1.085649,11.108729),(1.082755,11.110692),(1.082135,11.115292),(1.083892,11.12772),(1.082755,11.131802),(1.07335,11.133947),(1.067046,11.12834),(1.063325,11.126971),(1.062291,11.14206),(1.067459,11.144282),(1.100429,11.15162),(1.106216,11.155651),(1.113038,11.173867),(1.117482,11.178983),(1.128127,11.178879),(1.148074,11.1695),(1.158409,11.165935),(1.153242,11.183169),(1.149314,11.217249),(1.130608,11.247583),(1.135568,11.260115),(1.145904,11.269856),(1.156342,11.28554),(1.165954,11.277995),(1.173499,11.2666),(1.172155,11.261484),(1.18094,11.261355),(1.186211,11.263887),(1.191379,11.267014),(1.200061,11.268977),(1.218974,11.268047),(1.235201,11.263474),(1.268377,11.247893),(1.281089,11.271096),(1.28264,11.278873),(1.280366,11.288692),(1.270547,11.298278),(1.268377,11.30621),(1.273338,11.318225),(1.2845,11.312721),(1.296179,11.299621),(1.302483,11.288847),(1.309305,11.297089),(1.316333,11.29988),(1.323464,11.297089),(1.330389,11.288847),(1.347855,11.303497),(1.345892,11.316339),(1.336176,11.330033),(1.330389,11.347164),(1.33907,11.366103),(1.359017,11.378893),(1.381652,11.388686),(1.398085,11.398685),(1.388576,11.420002),(1.389817,11.428399),(1.398085,11.440311),(1.411107,11.449845),(1.423215,11.453748),(1.423613,11.453876),(1.433845,11.459405),(1.439633,11.473771),(1.455962,11.464702),(1.475289,11.460774),(1.56934,11.453307),(1.567273,11.446693),(1.565,11.432637),(1.563243,11.426022),(1.580606,11.427056),(1.601587,11.388686),(1.62112,11.395275),(1.638173,11.404215),(1.684372,11.413852),(1.703492,11.422921),(1.719099,11.427779),(1.763334,11.424678),(1.782247,11.426022),(1.821521,11.441602),(1.840642,11.445478),(1.858005,11.440311),(1.867617,11.446615),(1.879812,11.444858),(1.905754,11.432843),(1.948025,11.41672),(1.983372,11.414007),(2.010761,11.426901),(2.015429,11.43159),(2.14698,11.56374),(2.22005,11.622548),(2.273587,11.652055),(2.287436,11.665284),(2.291054,11.674792),(2.290227,11.685748),(2.290847,11.703214),(2.301596,11.731533),(2.340043,11.773856),(2.354099,11.799849),(2.390169,11.896536),(2.388205,11.906768),(2.376526,11.924079),(2.375183,11.935035),(2.380867,11.947902),(2.389342,11.950073),(2.398747,11.948781),(2.407429,11.95121),(2.414147,11.958703),(2.422002,11.973172),(2.428926,11.980355),(2.438951,11.981285),(2.44939,11.977513),(2.456728,11.979063),(2.457348,11.99622),(2.455281,12.008674),(2.44877,12.013376),(2.439262,12.015598),(2.428616,12.020353),(2.418281,12.028673),(2.41115,12.036786),(2.405568,12.046708),(2.371875,12.140449),(2.362057,12.196156),(2.36123,12.218894),(2.370015,12.236257),(2.3942,12.247212),(2.407946,12.248918),(2.43089,12.247987),(2.443706,12.249228),(2.446083,12.251811),(2.454351,12.263025),(2.459519,12.266746),(2.46696,12.265041),(2.472644,12.259253),(2.477709,12.257599),(2.483393,12.268038),(2.488044,12.280388),(2.495072,12.283231),(2.504477,12.281835),(2.516259,12.281422),(2.51905,12.279148),(2.5206,12.273671),(2.523701,12.269175),(2.531246,12.269691),(2.53693,12.27305),(2.546025,12.281629),(2.550573,12.284523),(2.586126,12.294031),(2.590053,12.293308),(2.598632,12.288347),(2.603593,12.28783),(2.60969,12.290775),(2.621679,12.299509),(2.628604,12.300801),(2.663847,12.291551),(2.672942,12.296718),(2.686895,12.318422),(2.690202,12.326174),(2.692166,12.334029),(2.69506,12.341212),(2.700434,12.347103),(2.711286,12.351237),(2.721828,12.344261),(2.732267,12.346793),(2.741465,12.354131),(2.757485,12.372941),(2.768544,12.380072),(2.778156,12.381933),(2.798413,12.381209),(2.808645,12.383225),(2.832416,12.384051),(2.844301,12.399244),(2.892257,12.357076),(2.912618,12.346328),(2.922643,12.335631),(2.930394,12.323332),(2.936802,12.300852),(2.944967,12.292481),(2.956026,12.286848),(2.967808,12.282559),(3.000984,12.27889),(3.009356,12.276306),(3.013077,12.271087),(3.022895,12.252483),(3.063409,12.193779),(3.235389,12.039525),(3.238489,12.034202),(3.252028,12.024125),(3.255129,12.018751),(3.257609,11.997408),(3.26257,11.974722),(3.269908,11.956532),(3.292749,11.918653),(3.307012,11.902375),(3.315487,11.894572),(3.327786,11.886407),(3.341635,11.882893)]
+Burkina Faso	[(-0.397671,15.002135),(-0.361472,15.017741),(-0.299176,15.054741),(-0.236699,15.065619),(-0.166988,15.049677),(-0.033404,14.995933),(-0.033197,14.995933),(0.218467,14.910977),(0.220844,14.888214),(0.211852,14.874804),(0.198003,14.863797),(0.185756,14.84819),(0.184102,14.819562),(0.213092,14.761632),(0.219707,14.731221),(0.152941,14.54671),(0.158832,14.496119),(0.18865,14.44775),(0.202382,14.435545),(0.346366,14.307577),(0.388792,14.251612),(0.391635,14.245927),(0.390601,14.237633),(0.381118,14.22567),(0.377424,14.216601),(0.372153,14.185647),(0.367398,14.173787),(0.343472,14.137536),(0.339157,14.12578),(0.343575,14.114333),(0.356262,14.095704),(0.362463,14.088857),(0.368742,14.084154),(0.37422,14.078883),(0.378457,14.070434),(0.37732,14.063949),(0.369052,14.047852),(0.369155,14.039067),(0.378354,14.028809),(0.391376,14.022582),(0.401866,14.013797),(0.403934,13.996072),(0.411866,13.978424),(0.428377,13.967495),(0.445921,13.958581),(0.456695,13.94685),(0.456256,13.938143),(0.448065,13.920108),(0.448634,13.909617),(0.454809,13.902357),(0.47566,13.888947),(0.483515,13.880343),(0.49199,13.861817),(0.499926,13.851015),(0.504082,13.845358),(0.519275,13.831637),(0.552968,13.810037),(0.5632,13.796782),(0.574466,13.785025),(0.593689,13.778101),(0.600511,13.768721),(0.594516,13.74986),(0.584801,13.729008),(0.58046,13.713789),(0.59431,13.688881),(0.620665,13.679967),(0.75337,13.684101),(0.763498,13.682034),(0.766392,13.67511),(0.766185,13.666971),(0.767012,13.660873),(0.766289,13.657178),(0.762878,13.653044),(0.763705,13.646429),(0.775694,13.635293),(0.795331,13.625965),(0.813108,13.625035),(0.850728,13.628601),(0.896927,13.614932),(0.95098,13.583203),(0.991391,13.541113),(0.996559,13.496051),(1.015266,13.465665),(1.048235,13.441945),(1.157169,13.392646),(1.175049,13.38691),(1.217424,13.381768),(1.23427,13.377583),(1.249567,13.367066),(1.268687,13.34606),(1.241505,13.335544),(1.222075,13.344613),(1.205745,13.358901),(1.187658,13.364121),(1.182387,13.358695),(1.177633,13.34761),(1.167608,13.313426),(1.160683,13.311307),(1.138462,13.320377),(1.084719,13.33358),(1.004724,13.364844),(0.983536,13.36841),(0.970411,13.328335),(0.970824,13.243534),(0.971341,13.149405),(0.971661,13.085782),(0.971754,13.067317),(0.974648,13.048326),(0.983536,13.032358),(1.012269,13.016881),(1.083789,13.01099),(1.113968,12.996236),(1.170915,12.949211),(1.230756,12.899756),(1.304806,12.838508),(1.330595,12.817177),(1.412037,12.749869),(1.467124,12.704394),(1.535854,12.647498),(1.563863,12.63215),(1.597039,12.623675),(1.699462,12.61489),(1.826069,12.604193),(1.843742,12.606105),(1.860692,12.61706),(1.872681,12.634217),(1.883223,12.653957),(1.900173,12.678452),(1.906994,12.691836),(1.911438,12.696642),(1.919603,12.698347),(1.926631,12.694989),(1.934486,12.693542),(1.945545,12.700828),(1.962495,12.719121),(1.971693,12.724237),(2.068948,12.716279),(2.109049,12.705634),(2.135197,12.67561),(2.140985,12.656128),(2.144809,12.650753),(2.155455,12.640005),(2.165997,12.631737),(2.18429,12.620626),(2.193282,12.609464),(2.2,12.595925),(2.203204,12.583316),(2.210852,12.523061),(2.215709,12.510349),(2.223874,12.494846),(2.229559,12.487146),(2.242271,12.473452),(2.246302,12.465907),(2.246302,12.461669),(2.243098,12.451179),(2.242994,12.446166),(2.244958,12.424152),(2.23793,12.413455),(2.223254,12.409735),(2.163826,12.404774),(2.158762,12.405652),(2.148013,12.410768),(2.145016,12.41175),(2.138711,12.408339),(2.131477,12.398521),(2.126929,12.39511),(2.069258,12.383328),(2.054169,12.370926),(2.051792,12.341935),(2.070912,12.306898),(2.113803,12.247987),(2.188527,12.145461),(2.258807,12.048775),(2.338079,11.940099),(2.390169,11.896536),(2.354099,11.799849),(2.340043,11.773856),(2.301596,11.731533),(2.290847,11.703214),(2.290227,11.685748),(2.291054,11.674792),(2.287436,11.665284),(2.273587,11.652055),(2.22005,11.622548),(2.14698,11.56374),(2.015429,11.43159),(2.010761,11.426901),(1.983372,11.414007),(1.948025,11.41672),(1.905754,11.432843),(1.879812,11.444858),(1.867617,11.446615),(1.858005,11.440311),(1.840642,11.445478),(1.821521,11.441602),(1.782247,11.426022),(1.763334,11.424678),(1.719099,11.427779),(1.703492,11.422921),(1.684372,11.413852),(1.638173,11.404215),(1.62112,11.395275),(1.601587,11.388686),(1.580606,11.427056),(1.563243,11.426022),(1.565,11.432637),(1.567273,11.446693),(1.56934,11.453307),(1.475289,11.460774),(1.455962,11.464702),(1.439633,11.473771),(1.433845,11.459405),(1.423613,11.453876),(1.423215,11.453748),(1.411107,11.449845),(1.398085,11.440311),(1.389817,11.428399),(1.388576,11.420002),(1.398085,11.398685),(1.381652,11.388686),(1.359017,11.378893),(1.33907,11.366103),(1.330389,11.347164),(1.336176,11.330033),(1.345892,11.316339),(1.347855,11.303497),(1.330389,11.288847),(1.323464,11.297089),(1.316333,11.29988),(1.309305,11.297089),(1.302483,11.288847),(1.296179,11.299621),(1.2845,11.312721),(1.273338,11.318225),(1.268377,11.30621),(1.270547,11.298278),(1.280366,11.288692),(1.28264,11.278873),(1.281089,11.271096),(1.268377,11.247893),(1.235201,11.263474),(1.218974,11.268047),(1.200061,11.268977),(1.191379,11.267014),(1.186211,11.263887),(1.18094,11.261355),(1.172155,11.261484),(1.173499,11.2666),(1.165954,11.277995),(1.156342,11.28554),(1.145904,11.269856),(1.135568,11.260115),(1.130608,11.247583),(1.149314,11.217249),(1.153242,11.183169),(1.158409,11.165935),(1.148074,11.1695),(1.128127,11.178879),(1.117482,11.178983),(1.113038,11.173867),(1.106216,11.155651),(1.100429,11.15162),(1.067459,11.144282),(1.062291,11.14206),(1.063325,11.126971),(1.067046,11.12834),(1.07335,11.133947),(1.082755,11.131802),(1.083892,11.12772),(1.082135,11.115292),(1.082755,11.110692),(1.085649,11.108729),(1.095158,11.10444),(1.097018,11.104491),(1.099085,11.092606),(1.099292,11.081289),(1.100945,11.070411),(1.10725,11.059791),(1.118619,11.048241),(1.117482,11.032196),(1.114174,11.027674),(1.106836,11.034418),(1.099705,11.044366),(1.097018,11.049275),(1.086889,11.052737),(1.05609,11.05607),(1.052163,11.055011),(1.041311,11.049585),(1.035006,11.049275),(1.033249,11.051575),(1.027978,11.061341),(1.025084,11.063512),(1.01971,11.065682),(1.014646,11.070359),(1.007928,11.075062),(0.986017,11.078498),(0.981366,11.080126),(0.976922,11.078369),(0.970307,11.06948),(0.964416,11.057414),(0.955941,11.044727),(0.952427,11.042402),(0.95129,11.032299),(0.951807,11.021086),(0.955321,11.01199),(0.963279,11.00827),(0.969067,11.002895),(0.969997,10.991165),(0.967517,10.979486),(0.963279,10.974137),(0.945399,10.974293),(0.931963,10.976101),(0.901474,10.992741),(0.77156,10.990364),(0.675338,10.988529),(0.612603,10.976566),(0.487649,10.933236),(0.499742,10.975688),(0.483619,10.979693),(0.487133,10.983672),(0.48858,10.987754),(0.489303,10.991914),(0.490647,10.996358),(0.49013,10.999511),(0.488786,11.001784),(0.486616,11.003205),(0.374779,11.025808),(0.287558,11.043436),(0.059588,11.089402),(-0.063118,11.114155),(-0.115062,11.124658),(-0.166109,11.13498),(-0.301682,11.162937),(-0.304473,11.146788),(-0.300545,11.137409),(-0.298297,11.128392),(-0.306126,11.113535),(-0.318813,11.101365),(-0.368939,11.065217),(-0.386923,11.086405),(-0.405888,11.101468),(-0.425215,11.101468),(-0.444387,11.077439),(-0.449038,11.062892),(-0.45126,11.040206),(-0.456686,11.029612),(-0.46852,11.020129),(-0.494823,11.007805),(-0.504228,10.996358),(-0.504228,10.996203),(-0.506709,10.993671),(-0.509706,10.991449),(-0.512961,10.989744),(-0.516475,10.988633),(-0.555439,10.98995),(-0.576213,10.987754),(-0.590579,10.982432),(-0.599829,10.965766),(-0.607116,10.94122),(-0.617244,10.918637),(-0.634763,10.907966),(-0.68277,10.953596),(-0.679773,10.960572),(-0.67228,10.968505),(-0.667991,10.976515),(-0.673933,10.983517),(-0.683235,10.984344),(-0.690212,10.981811),(-0.694656,10.982742),(-0.695999,10.994033),(-0.703017,10.994159),(-0.816974,10.996203),(-0.816974,10.996462),(-0.822141,11.003619),(-0.827774,11.005841),(-0.833665,11.003412),(-0.839401,10.996462),(-0.860795,10.992922),(-0.883171,10.968634),(-0.900586,10.966231),(-0.89392,10.979899),(-0.904359,10.979486),(-0.909475,10.98269),(-0.916451,10.996203),(-0.924047,11.001423),(-0.932471,11.003102),(-1.070343,11.013902),(-1.098714,11.009562),(-1.10755,10.994343),(-1.22806,10.99548),(-1.355287,10.99672),(-1.38035,11.001268),(-1.413553,11.01405),(-1.423584,11.017911),(-1.436057,11.022713),(-1.562406,11.026589),(-1.579821,11.021215),(-1.587004,11.003671),(-1.598683,10.997133),(-1.754074,10.995635),(-1.972872,10.993516),(-2.197871,10.991294),(-2.439769,10.988943),(-2.634951,10.986979),(-2.728798,10.986057),(-2.750706,10.985842),(-2.751119,10.996462),(-2.837341,10.998012),(-2.835946,10.992224),(-2.838711,10.985119),(-2.832716,10.966024),(-2.821761,10.948299),(-2.815767,10.929153),(-2.821399,10.90626),(-2.834861,10.89161),(-2.850803,10.879544),(-2.864239,10.864273),(-2.871629,10.843448),(-2.882662,10.797068),(-2.899482,10.76999),(-2.9031,10.747149),(-2.908577,10.737666),(-2.919274,10.727202),(-2.922323,10.721207),(-2.919959,10.711088),(-2.918913,10.706609),(-2.916949,10.706609),(-2.912634,10.705808),(-2.908035,10.703637),(-2.905141,10.699193),(-2.905115,10.692733),(-2.907337,10.688315),(-2.910154,10.684491),(-2.916251,10.668084),(-2.929661,10.644209),(-2.932504,10.634313),(-2.928266,10.615219),(-2.898294,10.562612),(-2.895865,10.552768),(-2.894211,10.531425),(-2.891524,10.521659),(-2.886899,10.515793),(-2.873386,10.502487),(-2.87044,10.497784),(-2.867391,10.47825),(-2.859562,10.465616),(-2.824448,10.435023),(-2.812149,10.428822),(-2.795871,10.426109),(-2.771428,10.425489),(-2.767552,10.4212),(-2.771893,10.41182),(-2.78104,10.402415),(-2.791995,10.398152),(-2.80494,10.397118),(-2.81463,10.393708),(-2.822329,10.387584),(-2.829461,10.378282),(-2.836282,10.363658),(-2.841295,10.343272),(-2.841295,10.322291),(-2.833182,10.305987),(-2.824448,10.302215),(-2.814216,10.301078),(-2.80569,10.299011),(-2.802098,10.292319),(-2.799669,10.280924),(-2.793184,10.278547),(-2.784451,10.278805),(-2.774839,10.27524),(-2.764865,10.269116),(-2.758354,10.266119),(-2.754943,10.260796),(-2.754375,10.247954),(-2.757682,10.234648),(-2.765124,10.225837),(-2.785381,10.210101),(-2.798455,10.189534),(-2.79892,10.169613),(-2.788481,10.124448),(-2.788481,10.038768),(-2.783572,10.018511),(-2.760886,9.984766),(-2.754375,9.966783),(-2.755564,9.941151),(-2.764865,9.895754),(-2.760524,9.870536),(-2.736753,9.832579),(-2.733911,9.822787),(-2.740267,9.812606),(-2.774839,9.77434),(-2.791582,9.740931),(-2.795303,9.720002),(-2.788481,9.699254),(-2.780317,9.690237),(-2.774839,9.689306),(-2.769258,9.689926),(-2.760524,9.685586),(-2.75546,9.677498),(-2.75422,9.668352),(-2.751016,9.659179),(-2.743404,9.653325),(-2.740164,9.650833),(-2.752928,9.639904),(-2.761506,9.625253),(-2.766467,9.608898),(-2.768018,9.592801),(-2.766261,9.576523),(-2.761093,9.566239),(-2.725281,9.533864),(-2.689211,9.488724),(-2.720475,9.459217),(-2.744918,9.408109),(-2.763677,9.391883),(-2.787603,9.393717),(-2.810418,9.411106),(-2.910154,9.542726),(-2.959892,9.638612),(-2.977824,9.685172),(-2.989994,9.708427),(-3.005677,9.724162),(-3.024643,9.728606),(-3.059059,9.718555),(-3.077094,9.719408),(-3.094561,9.733851),(-3.104379,9.757132),(-3.116911,9.805294),(-3.136936,9.82953),(-3.160112,9.834698),(-3.182566,9.835163),(-3.200007,9.845369),(-3.204399,9.865368),(-3.202229,9.888958),(-3.202565,9.908234),(-3.21476,9.915623),(-3.230237,9.90472),(-3.26406,9.857074),(-3.277857,9.843457),(-3.301732,9.841132),(-3.311809,9.854128),(-3.313566,9.874566),(-3.312739,9.894513),(-3.317183,9.901335),(-3.327518,9.897304),(-3.339249,9.890095),(-3.348344,9.886995),(-3.359015,9.892498),(-3.376559,9.908492),(-3.389168,9.913246),(-3.546471,9.926139),(-3.606261,9.918181),(-3.62334,9.921747),(-3.634011,9.92924),(-3.640548,9.937379),(-3.648171,9.944588),(-3.661658,9.948929),(-3.665043,9.946603),(-3.674319,9.93526),(-3.679641,9.932211),(-3.685946,9.933452),(-3.698994,9.94079),(-3.706462,9.941823),(-3.755037,9.93588),(-3.76961,9.931333),(-3.779739,9.924692),(-3.795758,9.907665),(-3.804259,9.901386),(-3.823483,9.895702),(-3.889706,9.894462),(-3.891625,9.8939),(-3.910093,9.888493),(-3.947739,9.86436),(-3.969185,9.858986),(-3.984042,9.851157),(-3.988253,9.834801),(-3.994609,9.820771),(-4.026675,9.820306),(-4.034969,9.817619),(-4.050317,9.810307),(-4.05135,9.807568),(-4.051712,9.802349),(-4.053675,9.79762),(-4.059877,9.796277),(-4.065716,9.798085),(-4.076155,9.803795),(-4.13305,9.820409),(-4.150259,9.818291),(-4.168294,9.804829),(-4.196974,9.764961),(-4.215423,9.754858),(-4.253095,9.750052),(-4.270329,9.743928),(-4.283636,9.732017),(-4.279191,9.731138),(-4.267513,9.727263),(-4.297795,9.695843),(-4.303299,9.686723),(-4.303454,9.677912),(-4.300482,9.654296),(-4.302988,9.641712),(-4.315933,9.616623),(-4.322477,9.608981),(-4.322548,9.608898),(-4.349678,9.620034),(-4.365026,9.624168),(-4.368023,9.608381),(-4.367817,9.591974),(-4.371175,9.582956),(-4.38487,9.589416),(-4.391588,9.600294),(-4.400166,9.633134),(-4.409106,9.647733),(-4.433368,9.653469),(-4.469206,9.651763),(-4.50171,9.655019),(-4.515921,9.67569),(-4.513647,9.694009),(-4.503829,9.719899),(-4.501607,9.737107),(-4.503958,9.742016),(-4.509953,9.745065),(-4.517782,9.746615),(-4.535946,9.746615),(-4.539098,9.744703),(-4.539899,9.740776),(-4.543051,9.734006),(-4.547961,9.720261),(-4.548426,9.706799),(-4.552198,9.696464),(-4.566719,9.692407),(-4.57832,9.696515),(-4.592712,9.717832),(-4.604029,9.727159),(-4.616949,9.713853),(-4.628731,9.707703),(-4.641107,9.706024),(-4.655809,9.706075),(-4.654724,9.703543),(-4.658264,9.6976),(-4.664827,9.690857),(-4.672914,9.685586),(-4.681079,9.682072),(-4.681803,9.682847),(-4.681544,9.686723),(-4.686608,9.692407),(-4.700096,9.69791),(-4.70547,9.702096),(-4.707641,9.70977),(-4.709088,9.720312),(-4.712808,9.726849),(-4.724384,9.737107),(-4.730017,9.744238),(-4.733324,9.749639),(-4.738337,9.753153),(-4.748646,9.754496),(-4.758594,9.753308),(-4.762134,9.749949),(-4.760454,9.745324),(-4.75477,9.740208),(-4.769963,9.737365),(-4.783192,9.758372),(-4.796447,9.754496),(-4.799315,9.762532),(-4.801227,9.766459),(-4.810115,9.77434),(-4.810115,9.781781),(-4.8004,9.78111),(-4.791899,9.78235),(-4.775905,9.788008),(-4.785414,9.804829),(-4.790323,9.827515),(-4.798462,9.842527),(-4.817557,9.836455),(-4.824274,9.856971),(-4.83846,9.86945),(-4.858329,9.875703),(-4.881739,9.877409),(-4.890059,9.879501),(-4.893495,9.884204),(-4.898017,9.888907),(-4.909386,9.891051),(-4.917085,9.886478),(-4.922356,9.87746),(-4.928015,9.870949),(-4.936671,9.873998),(-4.966075,9.901025),(-4.967315,9.912368),(-4.952949,9.953373),(-4.954809,9.959703),(-4.965713,9.983113),(-4.976927,9.997608),(-4.981397,10.007737),(-4.960209,10.008486),(-4.956411,10.021999),(-4.963336,10.040319),(-4.974524,10.055537),(-4.986642,10.063263),(-4.999793,10.069464),(-5.010516,10.07905),(-5.015581,10.097111),(-5.025528,10.088739),(-5.037233,10.083753),(-5.048343,10.085355),(-5.056483,10.097111),(-5.042866,10.103338),(-5.049377,10.105353),(-5.055139,10.10804),(-5.061702,10.110056),(-5.070099,10.110159),(-5.06103,10.118453),(-5.037595,10.126489),(-5.039455,10.134344),(-5.064725,10.150803),(-5.070719,10.161009),(-5.06395,10.179044),(-5.090718,10.177933),(-5.09015,10.188811),(-5.081597,10.206897),(-5.084414,10.227439),(-5.087333,10.220824),(-5.091907,10.214339),(-5.097849,10.209275),(-5.104903,10.206949),(-5.117073,10.208034),(-5.11821,10.212479),(-5.114412,10.218292),(-5.111802,10.223718),(-5.111802,10.27865),(-5.119192,10.293533),(-5.119882,10.293983),(-5.135677,10.304282),(-5.152058,10.305625),(-5.159499,10.292319),(-5.168439,10.291337),(-5.217584,10.31994),(-5.233552,10.315676),(-5.279802,10.32242),(-5.296649,10.32304),(-5.304142,10.318415),(-5.309206,10.311491),(-5.315511,10.305264),(-5.327086,10.302576),(-5.338507,10.302215),(-5.343778,10.303093),(-5.34817,10.305987),(-5.353338,10.308261),(-5.357058,10.304385),(-5.360831,10.298752),(-5.365533,10.295703),(-5.385739,10.296479),(-5.402534,10.300561),(-5.416228,10.307537),(-5.426977,10.316865),(-5.430077,10.322937),(-5.433488,10.331877),(-5.437829,10.340016),(-5.443772,10.34353),(-5.453022,10.343943),(-5.459946,10.345158),(-5.474157,10.350325),(-5.475294,10.367715),(-5.48749,10.392933),(-5.505111,10.415567),(-5.522578,10.425489),(-5.5171,10.439984),(-5.508987,10.490937),(-5.505163,10.499179),(-5.48165,10.535327),(-5.468111,10.58783),(-5.471057,10.597365),(-5.47855,10.604238),(-5.477413,10.61956),(-5.470488,10.635605),(-5.460566,10.644571),(-5.475914,10.650385),(-5.477154,10.658808),(-5.482115,10.675215),(-5.482632,10.684233),(-5.473072,10.737873),(-5.467956,10.752678),(-5.461186,10.760042),(-5.45297,10.763969),(-5.446459,10.768698),(-5.445012,10.778568),(-5.445322,10.786991),(-5.431421,10.844688),(-5.43509,10.856909),(-5.447027,10.877993),(-5.465579,10.947886),(-5.479118,10.975533),(-5.501804,10.97021),(-5.495603,10.996203),(-5.505602,11.047985),(-5.507334,11.056949),(-5.504233,11.072684),(-5.489764,11.082115),(-5.390131,11.094699),(-5.373026,11.099763),(-5.356283,11.106894),(-5.332512,11.12157),(-5.322332,11.135549),(-5.316182,11.176322),(-5.306726,11.199395),(-5.275255,11.230711),(-5.262852,11.251588),(-5.26094,11.267737),(-5.267865,11.37202),(-5.263472,11.390184),(-5.248176,11.403181),(-5.22642,11.41349),(-5.218307,11.422198),(-5.219186,11.435143),(-5.224612,11.45801),(-5.224663,11.54077),(-5.233914,11.575987),(-5.269467,11.604099),(-5.280732,11.605753),(-5.290964,11.604461),(-5.299956,11.606424),(-5.307604,11.617638),(-5.307811,11.629007),(-5.302281,11.639859),(-5.294788,11.650298),(-5.289259,11.660426),(-5.280681,11.699494),(-5.278562,11.721456),(-5.279544,11.739026),(-5.28714,11.758922),(-5.298974,11.772668),(-5.314787,11.782486),(-5.334269,11.790806),(-5.344656,11.793907),(-5.353286,11.794527),(-5.370649,11.791064),(-5.374525,11.79525),(-5.400415,11.810185),(-5.405996,11.812303),(-5.412197,11.823569),(-5.412352,11.82853),(-5.405944,11.830442),(-5.392302,11.832354),(-5.387909,11.830804),(-5.37561,11.822225),(-5.369874,11.820158),(-5.364552,11.82176),(-5.357058,11.829615),(-5.353803,11.831734),(-5.319025,11.837418),(-5.314839,11.83933),(-5.311066,11.842896),(-5.306519,11.846048),(-5.300163,11.846358),(-5.293445,11.843206),(-5.288019,11.839123),(-5.282489,11.836436),(-5.275151,11.837418),(-5.268227,11.843051),(-5.248228,11.870439),(-5.209471,11.901497),(-5.182909,11.930901),(-5.167819,11.943665),(-5.136994,11.953122),(-5.103947,11.972759),(-5.089323,11.97927),(-5.073768,11.98051),(-5.034313,11.97927),(-5.016046,11.981285),(-5.004703,11.980665),(-4.994238,11.983249),(-4.984523,11.988572),(-4.975454,11.996271),(-4.95375,12.005108),(-4.932071,12.003144),(-4.910677,11.998132),(-4.889955,11.997925),(-4.847245,12.013066),(-4.826238,12.012705),(-4.806808,11.996271),(-4.789522,12.001801),(-4.761281,12.006607),(-4.746889,12.015082),(-4.738983,12.02521),(-4.732281,12.037263),(-4.725133,12.050118),(-4.714617,12.059007),(-4.704023,12.061487),(-4.683715,12.059058),(-4.673586,12.05973),(-4.653716,12.069135),(-4.652737,12.071627),(-4.648678,12.081951),(-4.646663,12.098022),(-4.636121,12.117556),(-4.600309,12.137555),(-4.570233,12.138898),(-4.560466,12.149492),(-4.585529,12.197241),(-4.497421,12.26871),(-4.493545,12.272844),(-4.492253,12.278838),(-4.49401,12.290104),(-4.490496,12.305762),(-4.490703,12.313823),(-4.488171,12.320696),(-4.47719,12.327311),(-4.462488,12.328189),(-4.452669,12.320283),(-4.444814,12.309431),(-4.435823,12.301731),(-4.406135,12.307467),(-4.415359,12.350307),(-4.451636,12.435314),(-4.443678,12.459447),(-4.426624,12.479653),(-4.407607,12.497946),(-4.393448,12.516446),(-4.386885,12.530192),(-4.387247,12.533965),(-4.392647,12.537427),(-4.401406,12.550398),(-4.42249,12.597217),(-4.439078,12.613288),(-4.482538,12.646258),(-4.491323,12.662794),(-4.485251,12.714677),(-4.481711,12.717416),(-4.474942,12.715762),(-4.46437,12.717251),(-4.464296,12.717261),(-4.435254,12.728423),(-4.402026,12.736562),(-4.36885,12.738991),(-4.339446,12.73279),(-4.310921,12.716021),(-4.297227,12.712145),(-4.276298,12.714677),(-4.257642,12.72093),(-4.245472,12.728936),(-4.243974,12.729922),(-4.23413,12.74235),(-4.213278,12.807178),(-4.211883,12.819193),(-4.224647,12.864513),(-4.221314,12.921254),(-4.229324,12.948952),(-4.24785,12.971948),(-4.276918,12.996236),(-4.289733,13.01347),(-4.316398,13.070857),(-4.345363,13.097057),(-4.351073,13.106075),(-4.351073,13.118322),(-4.345906,13.127133),(-4.339601,13.135298),(-4.327044,13.168551),(-4.310197,13.175553),(-4.24617,13.172479),(-4.234801,13.175605),(-4.227773,13.184442),(-4.230021,13.193149),(-4.251209,13.204751),(-4.258107,13.21413),(-4.253508,13.22909),(-4.23878,13.246789),(-4.220668,13.262835),(-4.205501,13.272989),(-4.195837,13.274695),(-4.186458,13.272834),(-4.176872,13.272369),(-4.16602,13.278157),(-4.147106,13.299603),(-4.131578,13.323839),(-4.114654,13.364534),(-4.104267,13.382698),(-4.087549,13.397995),(-4.079307,13.402129),(-4.052539,13.409002),(-4.043495,13.414454),(-4.028199,13.431533),(-4.016029,13.43577),(-4.005358,13.439517),(-3.990217,13.449129),(-3.97691,13.460627),(-3.971613,13.469954),(-3.979468,13.47538),(-3.992232,13.476233),(-3.997968,13.480522),(-3.984481,13.496051),(-3.981251,13.49897),(-3.977737,13.499926),(-3.974094,13.498945),(-3.970321,13.496154),(-3.965468,13.489217),(-3.964482,13.487808),(-3.959288,13.467939),(-3.956059,13.46166),(-3.94748,13.458198),(-3.923399,13.453754),(-3.917973,13.451066),(-3.918593,13.440318),(-3.925544,13.436313),(-3.934923,13.434892),(-3.942726,13.431946),(-3.963009,13.413162),(-3.971613,13.40833),(-3.984042,13.39647),(-3.971613,13.386755),(-3.948411,13.380838),(-3.928825,13.38027),(-3.908878,13.381975),(-3.8926,13.378926),(-3.85808,13.365516),(-3.817101,13.35469),(-3.798626,13.347145),(-3.724419,13.288828),(-3.678711,13.26175),(-3.596882,13.199402),(-3.589802,13.197387),(-3.576599,13.199299),(-3.569958,13.196767),(-3.553913,13.180256),(-3.54505,13.174494),(-3.538487,13.173409),(-3.516111,13.1739),(-3.473922,13.167601),(-3.461593,13.165761),(-3.449475,13.16881),(-3.439475,13.184855),(-3.440586,13.202839),(-3.452265,13.237514),(-3.448544,13.265781),(-3.42653,13.27423),(-3.262406,13.283919),(-3.248634,13.292781),(-3.283955,13.542198),(-3.269176,13.579095),(-3.263905,13.602659),(-3.259719,13.658315),(-3.266282,13.682344),(-3.286952,13.69777),(-3.267057,13.717045),(-3.240418,13.707976),(-3.195821,13.674903),(-3.167941,13.672112),(-3.146031,13.67666),(-3.125102,13.67728),(-3.100039,13.662733),(-3.08221,13.646222),(-3.077301,13.636791),(-3.07451,13.622141),(-3.067508,13.606767),(-3.05601,13.61085),(-3.038621,13.629583),(-3.026968,13.635345),(-3.019113,13.637515),(-2.994774,13.634983),(-2.986402,13.632063),(-2.979322,13.627567),(-2.97232,13.624467),(-2.965008,13.625655),(-2.930473,13.638523),(-2.895245,13.651648),(-2.923383,13.746035),(-2.928059,13.799624),(-2.912169,13.837942),(-2.89447,13.866571),(-2.855377,13.996175),(-2.85703,13.997777),(-2.858606,14.000232),(-2.861552,14.00173),(-2.867288,14.000542),(-2.840855,14.042994),(-2.69319,14.123196),(-2.676265,14.141729),(-2.619758,14.203604),(-2.597382,14.222311),(-2.516147,14.267864),(-2.46168,14.280912),(-2.385612,14.264712),(-2.151879,14.15614),(-2.11984,14.148776),(-2.104337,14.151179),(-2.085008,14.159668),(-2.035918,14.181229),(-2.027288,14.188127),(-2.023412,14.198643),(-2.005015,14.444236),(-1.997057,14.470694),(-1.967033,14.483742),(-1.919129,14.485861),(-1.836963,14.479582),(-1.766683,14.483174),(-1.69692,14.496119),(-1.350275,14.714969),(-1.307745,14.734657),(-1.116697,14.780443),(-1.07856,14.796359),(-1.043317,14.817908),(-1.043138,14.818062),(-0.836404,14.995985),(-0.836249,14.996088),(-0.782816,15.048385),(-0.771272,15.056619),(-0.752895,15.069727),(-0.719719,15.078461),(-0.500343,15.079721),(-0.4679,15.079908),(-0.458649,15.075463),(-0.435602,15.015157),(-0.425732,15.0026),(-0.397671,15.002135)]
+Bulgaria	[(22.919562,43.834225),(23.052551,43.84282),(23.131849,43.847945),(23.161924,43.857324),(23.196961,43.86275),(23.234478,43.877297),(23.325151,43.886592),(23.484695,43.880604),(23.592699,43.837429),(23.620854,43.83401),(23.636107,43.832158),(23.720753,43.845826),(23.742871,43.8427),(23.799922,43.818463),(24.149606,43.75472),(24.159383,43.752938),(24.336705,43.759251),(24.358234,43.760017),(24.375494,43.763867),(24.431201,43.794176),(24.466341,43.802418),(24.500137,43.799498),(24.661763,43.755657),(24.705603,43.743765),(24.752628,43.738804),(24.963675,43.749605),(25.0816,43.718935),(25.211308,43.711881),(25.252339,43.704646),(25.285405,43.690391),(25.28872,43.688962),(25.323033,43.669713),(25.35962,43.654287),(25.403131,43.65005),(25.426075,43.654391),(25.467417,43.667749),(25.48245,43.669715),(25.488759,43.67054),(25.533821,43.668679),(25.556558,43.670359),(25.575059,43.677387),(25.593869,43.680668),(25.616503,43.687748),(25.637897,43.697282),(25.653503,43.708134),(25.671384,43.717359),(25.732948,43.718781),(25.739596,43.718935),(25.781144,43.732009),(25.804399,43.759914),(25.806259,43.763661),(25.839332,43.788439),(25.869304,43.800893),(25.916433,43.844379),(25.924495,43.858616),(25.934003,43.870321),(26.054306,43.934322),(26.061644,43.949773),(26.079317,43.969049),(26.116214,43.998866),(26.150734,44.012405),(26.231453,44.027495),(26.310518,44.052609),(26.332335,44.054926),(26.415791,44.063789),(26.614168,44.084855),(26.647758,44.093382),(26.667808,44.095087),(26.677317,44.097051),(26.697212,44.106094),(26.708685,44.10811),(26.753695,44.10811),(26.789455,44.115965),(26.884126,44.156531),(27.001535,44.165109),(27.027476,44.177046),(27.100237,44.14449),(27.205553,44.129246),(27.226741,44.120719),(27.251132,44.122373),(27.252662,44.121519),(27.269012,44.112399),(27.26431,44.089765),(27.285342,44.072453),(27.341669,44.053074),(27.353555,44.045271),(27.372882,44.020725),(27.383837,44.015092),(27.574523,44.016281),(27.633434,44.029768),(27.656275,44.023877),(27.676119,43.993543),(27.682515,43.987256),(27.721698,43.94874),(27.787327,43.960419),(27.85647,43.988634),(27.912074,43.993336),(27.912074,43.993233),(27.935845,43.964398),(27.98101,43.84934),(28.014806,43.830039),(28.221254,43.761981),(28.434574,43.735213),(28.57838,43.741278),(28.576182,43.727525),(28.57309,43.606147),(28.575531,43.593329),(28.585704,43.575832),(28.595876,43.563707),(28.602712,43.55272),(28.603526,43.538153),(28.594574,43.512519),(28.578461,43.48078),(28.560313,43.453843),(28.545177,43.442532),(28.535004,43.438625),(28.488617,43.40644),(28.479259,43.396796),(28.473888,43.384263),(28.473155,43.366848),(28.459483,43.380683),(28.414561,43.398871),(28.404959,43.40469),(28.393809,43.414293),(28.368663,43.42178),(28.321625,43.42829),(28.299164,43.425035),(28.261567,43.410956),(28.243175,43.407782),(28.177989,43.40998),(28.157237,43.407782),(28.118826,43.391547),(28.091563,43.363959),(28.087006,43.355251),(28.031098,43.248969),(28.017589,43.232733),(28.000173,43.223212),(27.931977,43.209784),(27.920584,43.204047),(27.913829,43.202338),(27.903982,43.202338),(27.903982,43.195502),(27.938731,43.1765),(27.945567,43.16885),(27.944347,43.157131),(27.925141,43.113593),(27.911388,43.065172),(27.904307,43.055854),(27.895518,43.049262),(27.887706,43.042141),(27.883556,43.030992),(27.885427,43.008612),(27.900401,42.962877),(27.903982,42.942288),(27.898448,42.874661),(27.903982,42.859687),(27.883962,42.848375),(27.883556,42.831936),(27.891612,42.81037),(27.897146,42.784003),(27.897146,42.736233),(27.894705,42.717475),(27.892263,42.710517),(27.841075,42.708319),(27.787364,42.715155),(27.743175,42.716051),(27.732677,42.714504),(27.725597,42.708482),(27.719005,42.694566),(27.715831,42.683743),(27.71697,42.674506),(27.724132,42.666978),(27.739513,42.661078),(27.712738,42.65766),(27.6692,42.643704),(27.646739,42.64057),(27.628429,42.628974),(27.630382,42.602729),(27.641449,42.574774),(27.650157,42.558051),(27.634044,42.563707),(27.540863,42.565497),(27.511485,42.553046),(27.498546,42.532457),(27.491466,42.507758),(27.480154,42.482896),(27.46225,42.489569),(27.452891,42.480129),(27.45338,42.465237),(27.465668,42.455634),(27.462087,42.448717),(27.461111,42.443549),(27.465668,42.42829),(27.468435,42.435777),(27.4699,42.437079),(27.469412,42.437201),(27.465668,42.441352),(27.472667,42.461859),(27.503917,42.437323),(27.514171,42.435126),(27.526378,42.443671),(27.534434,42.455268),(27.544444,42.460028),(27.562022,42.448188),(27.571056,42.458482),(27.5796,42.457221),(27.587738,42.451483),(27.595551,42.448188),(27.60963,42.451158),(27.619477,42.455878),(27.629405,42.458645),(27.643321,42.455634),(27.642833,42.450507),(27.641775,42.44953),(27.639822,42.449774),(27.636485,42.448188),(27.642426,42.430894),(27.652192,42.418524),(27.667735,42.416083),(27.691661,42.42829),(27.693533,42.418891),(27.699067,42.413886),(27.707856,42.412746),(27.719005,42.4147),(27.719005,42.407213),(27.713227,42.405951),(27.698009,42.400377),(27.705414,42.390611),(27.709646,42.388129),(27.719005,42.386705),(27.709483,42.376776),(27.708344,42.363105),(27.714366,42.349189),(27.725841,42.338935),(27.740408,42.334296),(27.752126,42.335395),(27.764496,42.338324),(27.780447,42.338935),(27.780447,42.332709),(27.774587,42.327216),(27.774425,42.321723),(27.779145,42.316311),(27.787852,42.310981),(27.76295,42.2956),(27.75115,42.277045),(27.75587,42.25849),(27.780447,42.243354),(27.776052,42.240668),(27.775645,42.239651),(27.773692,42.235907),(27.809744,42.218411),(27.815278,42.211982),(27.819998,42.204657),(27.831391,42.195014),(27.8449,42.186103),(27.856212,42.181301),(27.854177,42.177924),(27.85141,42.170111),(27.849376,42.16706),(27.87908,42.154242),(27.886729,42.147366),(27.903982,42.119818),(27.957774,42.094306),(27.964366,42.084621),(27.972667,42.075385),(27.986583,42.072089),(27.982432,42.061103),(27.987315,42.051744),(27.996918,42.044013),(28.007009,42.037909),(28.007579,42.032904),(28.006114,42.031562),(28.003429,42.03148),(28.000173,42.030463),(28.011567,42.021389),(28.019054,42.00845),(28.020356,41.994574),(28.013845,41.982652),(28.016775,41.972561),(28.016783,41.972531),(27.98101,41.978524),(27.96592,41.982141),(27.917035,41.977904),(27.903392,41.981056),(27.876934,41.99072),(27.852232,41.995448),(27.843034,41.995758),(27.824017,41.993484),(27.819935,41.994699),(27.815955,41.995138),(27.811925,41.994699),(27.807997,41.993484),(27.804948,41.983433),(27.804897,41.969894),(27.802726,41.96005),(27.818281,41.952867),(27.815335,41.946795),(27.80283,41.943074),(27.789807,41.942686),(27.776165,41.946123),(27.723971,41.967595),(27.687074,41.968602),(27.609301,41.953487),(27.606873,41.943513),(27.603359,41.93863),(27.598088,41.938604),(27.590543,41.942893),(27.582378,41.934883),(27.572198,41.929845),(27.550752,41.924212),(27.552096,41.921835),(27.554886,41.920336),(27.557935,41.91907),(27.560674,41.917675),(27.55747,41.915505),(27.551269,41.913102),(27.548892,41.91088),(27.562741,41.906435),(27.546411,41.901164),(27.533182,41.908063),(27.509463,41.933178),(27.494321,41.942841),(27.420837,41.973718),(27.39686,41.989324),(27.374845,42.008703),(27.332471,42.057434),(27.305289,42.077588),(27.273353,42.091747),(27.238213,42.097922),(27.216405,42.095623),(27.203796,42.08813),(27.181576,42.065883),(27.178992,42.061878),(27.178165,42.058364),(27.173824,42.057072),(27.149588,42.061826),(27.127212,42.062576),(27.11605,42.061826),(27.10065,42.071102),(27.0837,42.078415),(27.06551,42.082704),(27.047903,42.08292),(27.046545,42.082936),(27.022619,42.073893),(27.000398,42.04281),(26.981071,42.032862),(26.96717,42.028495),(26.95823,42.018237),(26.950065,42.006171),(26.938903,41.996223),(26.930221,41.994518),(26.911463,41.996792),(26.901076,41.993484),(26.890327,41.985423),(26.881129,41.985526),(26.871724,41.988136),(26.860768,41.987903),(26.85002,41.982865),(26.837899,41.97522),(26.827695,41.968783),(26.819427,41.965657),(26.80842,41.967879),(26.78992,41.979945),(26.780566,41.983433),(26.768578,41.980772),(26.746977,41.964494),(26.736745,41.958965),(26.717573,41.957311),(26.623573,41.969041),(26.605693,41.967414),(26.589467,41.958758),(26.560632,41.935684),(26.553293,41.931576),(26.547092,41.926899),(26.542958,41.920362),(26.544715,41.916435),(26.556807,41.91075),(26.559805,41.90734),(26.558978,41.901733),(26.55474,41.892948),(26.553604,41.887703),(26.552895,41.881643),(26.552053,41.874448),(26.547816,41.856283),(26.539548,41.83799),(26.526112,41.824244),(26.478363,41.813289),(26.375527,41.816622),(26.334185,41.789543),(26.320026,41.765462),(26.316305,41.743758),(26.32323,41.723682),(26.333359,41.713036),(26.294911,41.710323),(26.273931,41.714897),(26.261012,41.723062),(26.23445,41.745825),(26.226182,41.749675),(26.211816,41.750476),(26.189905,41.734689),(26.135128,41.733397),(26.108359,41.727893),(26.081488,41.711512),(26.074046,41.709135),(26.067225,41.708851),(26.060507,41.7073),(26.053686,41.701513),(26.048105,41.689084),(26.047485,41.674615),(26.050275,41.660456),(26.055029,41.648751),(26.05949,41.643777),(26.066915,41.635496),(26.081178,41.630457),(26.095234,41.62839),(26.106706,41.624282),(26.115284,41.616634),(26.121072,41.608211),(26.13027,41.582683),(26.130994,41.575138),(26.129443,41.559377),(26.1312,41.552659),(26.136781,41.549196),(26.152491,41.547026),(26.158072,41.542323),(26.163136,41.529146),(26.16448,41.517725),(26.16293,41.50646),(26.159312,41.493799),(26.147634,41.484756),(26.145877,41.478038),(26.156212,41.460416),(26.160449,41.455869),(26.174299,41.445998),(26.177399,41.439952),(26.175642,41.431891),(26.170578,41.429565),(26.164273,41.42786),(26.159002,41.421814),(26.14784,41.396906),(26.132441,41.371533),(26.120865,41.357787),(26.114664,41.355203),(26.107326,41.356598),(26.021853,41.341664),(26.008934,41.336806),(25.982269,41.323267),(25.959635,41.314999),(25.948576,41.313965),(25.93514,41.315929),(25.921187,41.316032),(25.896279,41.306265),(25.882017,41.304043),(25.86269,41.310089),(25.833337,41.334636),(25.811013,41.341044),(25.800781,41.338046),(25.763471,41.319029),(25.728744,41.317066),(25.717479,41.31412),(25.70518,41.307299),(25.698049,41.301925),(25.691227,41.298411),(25.679962,41.29717),(25.670453,41.299186),(25.649576,41.308487),(25.639758,41.311071),(25.551494,41.31567),(25.537955,41.312208),(25.530203,41.302751),(25.523692,41.291693),(25.514907,41.283476),(25.505089,41.280582),(25.497337,41.281202),(25.489482,41.283063),(25.479096,41.283786),(25.453464,41.280427),(25.285722,41.239396),(25.262261,41.238104),(25.23911,41.240895),(25.21968,41.249731),(25.177098,41.293863),(25.157875,41.30611),(25.153847,41.307535),(25.116534,41.320735),(25.112606,41.324145),(25.104855,41.334067),(25.101858,41.336651),(25.096793,41.336703),(25.08036,41.334067),(24.916959,41.386364),(24.886367,41.400627),(24.872931,41.401867),(24.863009,41.400316),(24.842132,41.394735),(24.803271,41.392668),(24.800171,41.379336),(24.802858,41.361921),(24.794279,41.3474),(24.774436,41.348072),(24.752628,41.362748),(24.718728,41.395717),(24.699195,41.408946),(24.680901,41.415509),(24.661264,41.41768),(24.638217,41.41768),(24.644314,41.427653),(24.609484,41.42724),(24.595842,41.429772),(24.580442,41.440521),(24.579719,41.44419),(24.582199,41.455249),(24.581062,41.460209),(24.577238,41.463568),(24.56773,41.468116),(24.564113,41.471062),(24.558738,41.476849),(24.553571,41.480777),(24.549436,41.485428),(24.546543,41.493644),(24.543339,41.521343),(24.530936,41.547543),(24.510162,41.56165),(24.481327,41.553227),(24.459209,41.549506),(24.438849,41.527699),(24.423966,41.525218),(24.402882,41.527854),(24.387483,41.526665),(24.353893,41.519121),(24.345005,41.518397),(24.318236,41.520774),(24.309554,41.519792),(24.303043,41.51695),(24.296119,41.515245),(24.286817,41.517622),(24.28506,41.523151),(24.287334,41.531626),(24.286403,41.54036),(24.26687,41.549765),(24.250747,41.563459),(24.23328,41.561805),(24.214366,41.555759),(24.197698,41.547711),(24.19628,41.547026),(24.181604,41.537362),(24.17747,41.531006),(24.173129,41.515297),(24.170235,41.511576),(24.162793,41.512041),(24.158453,41.51633),(24.154008,41.522118),(24.146257,41.526769),(24.116491,41.533383),(24.076597,41.536019),(24.047348,41.525735),(24.049829,41.493644),(24.052516,41.471475),(24.051999,41.463),(24.045901,41.455455),(24.034739,41.451321),(24.022854,41.453078),(24.000736,41.464137),(23.997119,41.457006),(23.992365,41.454628),(23.986887,41.453698),(23.981306,41.450856),(23.964666,41.43835),(23.949887,41.437575),(23.902861,41.463517),(23.894799,41.464344),(23.867721,41.445482),(23.851598,41.439591),(23.830927,41.435611),(23.80974,41.433803),(23.792067,41.434475),(23.777081,41.429049),(23.754446,41.400678),(23.73822,41.397474),(23.705354,41.403159),(23.672177,41.402952),(23.65285,41.397629),(23.627736,41.378509),(23.624847,41.377094),(23.612439,41.371016),(23.578953,41.371998),(23.513014,41.397733),(23.414519,41.399903),(23.395502,41.395252),(23.365116,41.378561),(23.347236,41.371223),(23.326049,41.369311),(23.31561,41.376855),(23.306205,41.388379),(23.287705,41.398198),(23.269928,41.397268),(23.24657,41.389723),(23.224246,41.379026),(23.209777,41.368587),(23.206366,41.360939),(23.204816,41.342697),(23.199545,41.332982),(23.190656,41.326057),(23.179701,41.321355),(23.15717,41.316342),(23.115209,41.312673),(22.916978,41.335773),(22.940852,41.349829),(22.94447,41.368432),(22.939406,41.389413),(22.937339,41.410755),(22.940542,41.416905),(22.952118,41.427705),(22.954598,41.432408),(22.953358,41.438195),(22.94757,41.448376),(22.946227,41.453233),(22.943599,41.523201),(22.943023,41.538551),(22.94788,41.555139),(22.948707,41.560978),(22.946434,41.567748),(22.936925,41.57891),(22.933721,41.584595),(22.932068,41.597953),(22.932998,41.612345),(22.936098,41.626168),(22.940852,41.63764),(22.945813,41.641077),(22.961523,41.644488),(22.967001,41.647046),(22.970101,41.652032),(22.976613,41.666553),(22.985435,41.677198),(22.998627,41.693115),(23.009582,41.71637),(23.008859,41.739934),(22.991185,41.760992),(22.98054,41.764739),(22.956872,41.765669),(22.945917,41.769338),(22.939716,41.776702),(22.918322,41.814348),(22.907676,41.848584),(22.901372,41.860418),(22.896721,41.864448),(22.885042,41.869151),(22.882088,41.871618),(22.880804,41.872691),(22.878221,41.880261),(22.878634,41.895015),(22.877084,41.902043),(22.866335,41.924884),(22.858894,41.94788),(22.857137,41.971884),(22.85476,41.982632),(22.846905,41.993484),(22.846595,41.993639),(22.845768,42.006869),(22.845621,42.007408),(22.843701,42.014465),(22.838223,42.019478),(22.826958,42.025085),(22.821273,42.025369),(22.805977,42.02139),(22.798949,42.021235),(22.791094,42.025808),(22.787684,42.032578),(22.785306,42.039141),(22.780862,42.043171),(22.77063,42.043998),(22.725052,42.042474),(22.718437,42.044463),(22.713993,42.048623),(22.710272,42.05299),(22.705725,42.055935),(22.675856,42.060612),(22.627177,42.079127),(22.617771,42.082704),(22.531058,42.129109),(22.510181,42.144793),(22.506939,42.148927),(22.494678,42.164559),(22.481449,42.193317),(22.443622,42.214427),(22.345023,42.313439),(22.364144,42.320984),(22.405795,42.321552),(22.423985,42.325893),(22.438454,42.340052),(22.454371,42.376768),(22.46977,42.391703),(22.485066,42.397155),(22.497572,42.399196),(22.508838,42.404932),(22.519483,42.420926),(22.533125,42.45759),(22.536536,42.47839),(22.532505,42.493402),(22.532505,42.493557),(22.524857,42.507665),(22.512145,42.519189),(22.481449,42.535622),(22.429669,42.571408),(22.425328,42.572855),(22.428842,42.592776),(22.441318,42.632891),(22.444552,42.64329),(22.449203,42.667965),(22.442072,42.681685),(22.468116,42.718324),(22.481449,42.727677),(22.482586,42.730675),(22.482896,42.733775),(22.482586,42.736824),(22.481449,42.739821),(22.466566,42.748529),(22.45313,42.763592),(22.429359,42.806122),(22.425845,42.809843),(22.427395,42.813615),(22.430446,42.817077),(22.436801,42.824286),(22.445482,42.830178),(22.470907,42.840125),(22.481449,42.84674),(22.497055,42.864413),(22.506047,42.870123),(22.519793,42.870356),(22.53757,42.868341),(22.544494,42.871389),(22.544785,42.871706),(22.549972,42.877358),(22.563615,42.884283),(22.5909,42.886892),(22.666244,42.871932),(22.69663,42.87741),(22.727015,42.886892),(22.738798,42.897383),(22.739579,42.898858),(22.745516,42.910069),(22.763189,42.958645),(22.76939,42.97128),(22.776418,42.979729),(22.788097,42.984897),(22.815796,42.989703),(22.828818,42.993449),(22.828921,42.993449),(22.829025,42.993501),(22.829025,42.993656),(22.842254,43.007505),(22.884215,43.036651),(22.889486,43.044376),(22.896721,43.062721),(22.901682,43.069749),(22.910157,43.075279),(22.927107,43.081144),(22.935271,43.085562),(22.955632,43.108274),(22.974029,43.141192),(22.984571,43.174627),(22.982902,43.187318),(22.981367,43.198992),(22.964727,43.204418),(22.915531,43.212247),(22.897754,43.220335),(22.883802,43.230592),(22.857343,43.256947),(22.833159,43.274647),(22.826958,43.28139),(22.823857,43.289297),(22.820756,43.307539),(22.817139,43.315497),(22.80453,43.328984),(22.73301,43.381513),(22.724343,43.38606),(22.719367,43.388671),(22.702934,43.394045),(22.693219,43.394872),(22.674202,43.394148),(22.664694,43.396732),(22.658926,43.401295),(22.656529,43.403192),(22.645367,43.420297),(22.637822,43.426369),(22.62852,43.428255),(22.606919,43.427402),(22.596274,43.429159),(22.586766,43.43443),(22.57271,43.44815),(22.565785,43.453344),(22.532609,43.464842),(22.518863,43.474247),(22.509354,43.493341),(22.490647,43.540883),(22.478452,43.559229),(22.477625,43.564164),(22.478658,43.569176),(22.481449,43.574111),(22.482689,43.576695),(22.483103,43.579279),(22.482689,43.581734),(22.481449,43.584137),(22.478142,43.587573),(22.477108,43.591294),(22.478142,43.594911),(22.481449,43.598529),(22.481759,43.598942),(22.481966,43.599459),(22.481759,43.599975),(22.481449,43.600647),(22.473801,43.612998),(22.472871,43.635942),(22.466256,43.64912),(22.455921,43.656406),(22.426465,43.668214),(22.41396,43.676663),(22.404865,43.687179),(22.396906,43.699401),(22.390498,43.712449),(22.386054,43.725498),(22.385848,43.733817),(22.389568,43.750509),(22.388535,43.758286),(22.362593,43.780843),(22.349467,43.807921),(22.354738,43.829703),(22.367554,43.852751),(22.377063,43.883524),(22.379026,43.913496),(22.382024,43.918561),(22.391945,43.931867),(22.394529,43.936337),(22.396803,43.951944),(22.39732,43.980934),(22.399594,43.993336),(22.411789,44.006927),(22.43432,44.013955),(22.465885,44.017624),(22.481449,44.019433),(22.50367,44.019898),(22.514935,44.030285),(22.522583,44.044703),(22.534159,44.057157),(22.554623,44.062428),(22.57519,44.061394),(22.592967,44.063926),(22.604749,44.079378),(22.604646,44.088163),(22.598134,44.109298),(22.597101,44.119065),(22.599065,44.130331),(22.6094,44.159941),(22.607953,44.159993),(22.605989,44.163145),(22.604852,44.168468),(22.606196,44.174566),(22.608573,44.175858),(22.624799,44.189397),(22.639992,44.207329),(22.648777,44.213995),(22.69164,44.228435),(22.906436,44.122889),(22.942609,44.111469),(22.988085,44.107025),(23.008307,44.100446),(23.030976,44.093072),(23.040071,44.062325),(23.023018,44.031629),(22.988085,44.017676),(22.966277,44.015557),(22.926486,44.006152),(22.905816,44.003982),(22.885869,43.994525),(22.874707,43.972046),(22.850522,43.896986),(22.851039,43.874352),(22.863441,43.855412),(22.888763,43.839522),(22.919562,43.834225)]
+Bahrain	[(50.551606,26.194241),(50.594737,26.160305),(50.604871,26.174732),(50.619898,26.185466),(50.626339,26.170438),(50.632779,26.146823),(50.64566,26.14575),(50.635507,26.134382),(50.634926,26.115694),(50.614757,26.111151),(50.620616,26.052965),(50.618419,25.964748),(50.603526,25.85456),(50.594493,25.832709),(50.56544,25.7897),(50.565278,25.789537),(50.558604,25.81977),(50.547211,25.852932),(50.531423,25.88524),(50.511404,25.913031),(50.467784,25.957587),(50.46046,25.985256),(50.46046,25.985297),(50.479991,26.018866),(50.485444,26.033433),(50.490896,26.048),(50.490896,26.048041),(50.485199,26.085639),(50.469981,26.122626),(50.452973,26.149563),(50.448904,26.161607),(50.449555,26.177965),(50.461192,26.225246),(50.468516,26.236884),(50.481456,26.24258),(50.481619,26.24254),(50.482595,26.24254),(50.503917,26.242011),(50.516368,26.239691),(50.5324,26.2331),(50.545421,26.227729),(50.545502,26.227769),(50.586681,26.242499),(50.593272,26.238593),(50.597423,26.225531),(50.604747,26.216498),(50.606944,26.212388),(50.609141,26.208319),(50.609141,26.208279),(50.603526,26.197659),(50.594086,26.195299),(50.565603,26.198879),(50.551606,26.194241)]
+Bosnia and Herzegovina	[(16.941529,45.241219),(16.947317,45.23569),(16.967987,45.237292),(16.9653,45.244216),(16.961166,45.250934),(16.975945,45.247162),(16.988141,45.236516),(16.998683,45.2314),(17.008295,45.244165),(17.012015,45.236465),(17.013566,45.230574),(17.012532,45.224476),(17.008295,45.216156),(17.014393,45.219773),(17.030206,45.226956),(17.036303,45.23047),(17.055734,45.200446),(17.098418,45.177657),(17.124628,45.169058),(17.187095,45.148563),(17.197844,45.152956),(17.24549,45.155384),(17.249727,45.15988),(17.268951,45.189543),(17.307811,45.171404),(17.326518,45.165926),(17.359384,45.150682),(17.368583,45.145101),(17.382432,45.139623),(17.400829,45.141018),(17.434109,45.148563),(17.436176,45.151922),(17.438759,45.158123),(17.443307,45.162051),(17.451162,45.158485),(17.45695,45.151819),(17.458086,45.146134),(17.454986,45.140605),(17.447751,45.1343),(17.46036,45.131252),(17.472349,45.13275),(17.496224,45.14169),(17.487025,45.120865),(17.481858,45.114405),(17.489299,45.116265),(17.539528,45.120968),(17.561439,45.119366),(17.572395,45.120399),(17.593065,45.129598),(17.629962,45.157348),(17.651563,45.165358),(17.684739,45.163963),(17.714505,45.152025),(17.741377,45.133267),(17.797497,45.081952),(17.815584,45.07017),(17.835738,45.064434),(17.84566,45.065261),(17.875219,45.073994),(17.902607,45.077766),(17.911185,45.081074),(17.927722,45.092029),(17.988493,45.143809),(18.003479,45.149338),(18.019086,45.149442),(18.035002,45.143344),(18.090296,45.107997),(18.112413,45.100607),(18.131844,45.097869),(18.143698,45.0977),(18.143704,45.0977),(18.153651,45.097558),(18.174942,45.100762),(18.192512,45.108514),(18.199333,45.119004),(18.200057,45.131613),(18.20233,45.144067),(18.213286,45.153782),(18.237884,45.157451),(18.261965,45.150682),(18.30744,45.127531),(18.322323,45.12288),(18.392913,45.118642),(18.412033,45.112441),(18.429293,45.102209),(18.45183,45.084959),(18.451842,45.08495),(18.466087,45.074046),(18.481708,45.066921),(18.490788,45.06278),(18.51704,45.055856),(18.541121,45.055287),(18.539261,45.069343),(18.534403,45.081539),(18.534803,45.088412),(18.53492,45.090427),(18.549596,45.094768),(18.557658,45.094406),(18.573781,45.091564),(18.581842,45.091357),(18.58856,45.093218),(18.602513,45.099264),(18.609127,45.100091),(18.616672,45.097662),(18.621116,45.093114),(18.627937,45.08004),(18.633622,45.071979),(18.640547,45.065364),(18.648711,45.062677),(18.658116,45.066294),(18.661217,45.0711),(18.663284,45.077146),(18.666075,45.082986),(18.671346,45.086861),(18.678167,45.087378),(18.684058,45.084794),(18.689019,45.080247),(18.726329,45.026142),(18.738318,45.01591),(18.750101,45.012241),(18.778006,45.010329),(18.78493,45.008468),(18.788961,45.005729),(18.791752,45.001544),(18.794646,44.995446),(18.795162,44.993327),(18.795162,44.988004),(18.795783,44.985059),(18.797953,44.982217),(18.803017,44.977307),(18.804568,44.973845),(18.80157,44.963975),(18.779866,44.952244),(18.772631,44.942478),(18.78338,44.913745),(18.817797,44.887545),(18.842129,44.876239),(18.842144,44.876233),(18.858724,44.868529),(18.889627,44.86119),(18.974916,44.862757),(19.004969,44.863309),(19.015821,44.865635),(19.047757,44.872714),(19.068427,44.874833),(19.08455,44.878967),(19.174261,44.925424),(19.18687,44.927543),(19.193174,44.921549),(19.196895,44.913177),(19.201856,44.908371),(19.211881,44.908371),(19.229554,44.913745),(19.239476,44.915141),(19.283815,44.908371),(19.293013,44.909405),(19.301281,44.91235),(19.31017,44.91235),(19.33022,44.898708),(19.340142,44.896227),(19.350271,44.897002),(19.352958,44.898087),(19.353165,44.899018),(19.356982,44.895877),(19.356993,44.895869),(19.362776,44.891111),(19.368667,44.887132),(19.372802,44.881448),(19.375695,44.873128),(19.376626,44.862999),(19.373112,44.86026),(19.367841,44.859278),(19.363707,44.854628),(19.32836,44.733963),(19.318025,44.715463),(19.308413,44.705128),(19.288259,44.693035),(19.277614,44.684871),(19.270069,44.67562),(19.255703,44.645648),(19.208677,44.588391),(19.20413,44.585135),(19.193278,44.580587),(19.188317,44.57604),(19.18625,44.569322),(19.187283,44.553302),(19.185319,44.546223),(19.179635,44.538264),(19.173124,44.531443),(19.165269,44.526689),(19.129922,44.518317),(19.127339,44.502556),(19.143358,44.458218),(19.141394,44.430829),(19.129612,44.416153),(19.115763,44.403596),(19.107185,44.382718),(19.108942,44.36365),(19.116693,44.343703),(19.138914,44.309338),(19.157001,44.293577),(19.177155,44.286962),(19.220046,44.280244),(19.240717,44.272699),(19.249502,44.270736),(19.263661,44.270167),(19.295907,44.2758),(19.307379,44.274198),(19.324329,44.263966),(19.341589,44.245828),(19.353991,44.22433),(19.356058,44.204021),(19.362363,44.191206),(19.381173,44.177098),(19.424891,44.153792),(19.435537,44.146092),(19.442565,44.143198),(19.448456,44.144438),(19.459721,44.152707),(19.465716,44.15281),(19.474191,44.144903),(19.476361,44.127023),(19.482666,44.120667),(19.498169,44.110229),(19.516189,44.091194),(19.522043,44.08501),(19.554599,44.071265),(19.570929,44.056898),(19.580231,44.051524),(19.583848,44.054315),(19.589946,44.060309),(19.598938,44.062583),(19.611443,44.054521),(19.618885,44.035711),(19.61041,44.019278),(19.593357,44.005584),(19.552222,43.983415),(19.528554,43.977213),(19.50406,43.975663),(19.447112,43.979797),(19.393989,43.977058),(19.379106,43.973854),(19.364637,43.973286),(19.351718,43.979125),(19.325879,43.996592),(19.300558,44.009511),(19.287329,44.013025),(19.272756,44.012405),(19.252085,44.007496),(19.243507,44.002018),(19.238029,43.99251),(19.238133,43.985378),(19.242887,43.972821),(19.240717,43.965741),(19.229348,43.95768),(19.241027,43.952357),(19.275443,43.933263),(19.305932,43.904737),(19.359469,43.842209),(19.461685,43.762136),(19.481735,43.729218),(19.505713,43.67364),(19.507367,43.647182),(19.481735,43.628914),(19.477498,43.616977),(19.475638,43.602559),(19.476878,43.588684),(19.481735,43.578116),(19.48897,43.573181),(19.491761,43.568608),(19.48959,43.564448),(19.481735,43.560831),(19.443908,43.571864),(19.431816,43.57114),(19.41931,43.549255),(19.410732,43.540754),(19.402877,43.549643),(19.394609,43.566463),(19.38045,43.585584),(19.363396,43.601577),(19.34655,43.608838),(19.335801,43.606513),(19.31265,43.593154),(19.300868,43.588297),(19.289189,43.587935),(19.263661,43.590958),(19.252706,43.588633),(19.238856,43.572122),(19.229451,43.549746),(19.217462,43.532796),(19.195345,43.532796),(19.147699,43.538145),(19.122791,43.535948),(19.096023,43.512901),(19.076386,43.507242),(19.054991,43.5067),(19.038145,43.511015),(19.025019,43.523029),(19.01427,43.537783),(19.000214,43.547886),(18.977477,43.546232),(18.962697,43.5383),(18.938926,43.518947),(18.920529,43.512203),(18.911021,43.507268),(18.90513,43.499051),(18.905647,43.490628),(18.915258,43.485383),(18.930658,43.482282),(18.937893,43.478949),(18.951225,43.463808),(18.950708,43.457297),(18.946368,43.44908),(18.946264,43.443938),(18.968278,43.448098),(18.975306,43.444274),(19.00993,43.410995),(19.039592,43.350714),(19.069668,43.30883),(19.062536,43.304386),(19.036285,43.303327),(19.024709,43.298728),(19.022535,43.296546),(19.017164,43.291157),(19.01086,43.28232),(19.002902,43.273949),(18.992463,43.267102),(18.989506,43.272016),(18.988949,43.272941),(18.968589,43.292216),(18.959493,43.303456),(18.957116,43.311828),(18.957943,43.318985),(18.957323,43.325858),(18.950295,43.333067),(18.923423,43.346838),(18.899135,43.351903),(18.839604,43.34782),(18.821207,43.341387),(18.824618,43.337408),(18.830302,43.328157),(18.833506,43.324153),(18.807151,43.318029),(18.679511,43.24948),(18.664318,43.233176),(18.688399,43.224469),(18.645301,43.180182),(18.629074,43.154886),(18.621128,43.124578),(18.620599,43.122563),(18.621116,43.09644),(18.638996,43.020243),(18.598379,43.024455),(18.538951,43.023887),(18.483037,43.014637),(18.452754,42.993398),(18.433531,42.954201),(18.434047,42.936889),(18.443969,42.916865),(18.467637,42.881699),(18.473322,42.862553),(18.465984,42.852812),(18.453478,42.845655),(18.443659,42.834467),(18.444589,42.817078),(18.453891,42.793151),(18.46743,42.769199),(18.502157,42.727445),(18.522518,42.71189),(18.539674,42.695457),(18.550009,42.668069),(18.549596,42.638923),(18.542832,42.626429),(18.538434,42.618304),(18.517247,42.602982),(18.506798,42.59849),(18.486654,42.58983),(18.493682,42.579831),(18.495852,42.570865),(18.492132,42.564767),(18.481797,42.563682),(18.470531,42.569056),(18.458956,42.569728),(18.44769,42.566214),(18.437355,42.559212),(18.421025,42.56363),(18.385265,42.566524),(18.370485,42.57363),(18.369791,42.574384),(18.369783,42.574393),(18.349608,42.59629),(18.338653,42.602517),(18.311574,42.601225),(18.257107,42.614893),(18.224138,42.628071),(18.049368,42.714758),(17.995315,42.740441),(17.971853,42.754962),(17.928859,42.7908),(17.904467,42.804546),(17.869431,42.811807),(17.858475,42.816974),(17.827159,42.853122),(17.825092,42.864542),(17.826229,42.888649),(17.823335,42.898365),(17.81176,42.909863),(17.802665,42.90963),(17.794707,42.904592),(17.786748,42.901388),(17.765458,42.904126),(17.7236,42.916245),(17.701586,42.9195),(17.679468,42.915676),(17.665929,42.90516),(17.653349,42.890928),(17.653331,42.890937),(17.652843,42.891181),(17.556488,42.93476),(17.573985,42.934272),(17.601085,42.925238),(17.617931,42.92178),(17.603038,42.932563),(17.580679,42.942075),(17.63451,42.950403),(17.662725,42.965699),(17.659314,42.993398),(17.659211,42.993449),(17.659108,42.99363),(17.659004,42.993656),(17.628412,43.046573),(17.598026,43.072902),(17.587381,43.082126),(17.450913,43.148152),(17.442067,43.152432),(17.42677,43.165713),(17.415195,43.184962),(17.406823,43.205426),(17.400209,43.216045),(17.389667,43.223099),(17.36941,43.232556),(17.328689,43.260358),(17.289931,43.30343),(17.267607,43.353324),(17.286417,43.437376),(17.270501,43.463214),(17.239495,43.478407),(17.142757,43.489336),(17.084569,43.513237),(17.062314,43.527747),(17.030516,43.54848),(16.98194,43.589692),(16.82381,43.707307),(16.712602,43.771515),(16.698236,43.788078),(16.689761,43.809317),(16.686144,43.826137),(16.678599,43.840684),(16.637361,43.868409),(16.604805,43.901068),(16.555816,43.937474),(16.527447,43.967859),(16.516542,43.979539),(16.501039,43.992716),(16.483469,44.002535),(16.439647,44.014007),(16.431482,44.025789),(16.426935,44.040517),(16.414016,44.055813),(16.403991,44.058759),(16.377946,44.057364),(16.367197,44.058139),(16.357378,44.062169),(16.346113,44.068474),(16.326889,44.082375),(16.312213,44.099997),(16.289992,44.139116),(16.275523,44.157357),(16.232115,44.190999),(16.215785,44.208155),(16.197078,44.25115),(16.18757,44.282414),(16.186639,44.297607),(16.189533,44.308511),(16.199662,44.324686),(16.203176,44.333057),(16.205863,44.349801),(16.205644,44.350531),(16.202866,44.359774),(16.192117,44.367422),(16.171343,44.377086),(16.153153,44.380445),(16.141991,44.380755),(16.13827,44.377602),(16.138787,44.385406),(16.145402,44.389591),(16.153877,44.39357),(16.159871,44.400702),(16.159664,44.416101),(16.152946,44.435067),(16.128348,44.484314),(16.123077,44.5039),(16.116463,44.52147),(16.104887,44.532373),(16.0837,44.534905),(16.04732,44.52333),(16.026649,44.52519),(16.006082,44.541003),(16.013937,44.557023),(16.030473,44.572216),(16.034917,44.585393),(16.043186,44.588442),(16.044736,44.589372),(16.041119,44.602808),(16.036158,44.615314),(16.028303,44.624719),(16.016004,44.628957),(15.991613,44.631437),(15.979107,44.634383),(15.968978,44.63924),(15.955646,44.653193),(15.948101,44.678101),(15.937352,44.688953),(15.929808,44.68947),(15.921539,44.686111),(15.913064,44.684509),(15.905416,44.690142),(15.902006,44.698823),(15.899318,44.70921),(15.895598,44.718564),(15.888776,44.724248),(15.876271,44.724816),(15.869243,44.718564),(15.863868,44.709985),(15.856427,44.703577),(15.847849,44.70151),(15.829969,44.700528),(15.820357,44.698255),(15.805681,44.696653),(15.796999,44.703267),(15.790488,44.713396),(15.78284,44.722594),(15.759275,44.73417),(15.753694,44.739286),(15.728476,44.769103),(15.717314,44.786466),(15.716074,44.80321),(15.730647,44.817007),(15.751214,44.821555),(15.76868,44.827342),(15.773435,44.845016),(15.76403,44.864033),(15.74801,44.882016),(15.734264,44.902118),(15.730853,44.927233),(15.734108,44.93444),(15.738811,44.944855),(15.763616,44.97555),(15.76744,44.993224),(15.755555,45.023558),(15.755968,45.042213),(15.779429,45.085363),(15.78377,45.100917),(15.780049,45.160294),(15.780979,45.167993),(15.792348,45.189801),(15.802569,45.196473),(15.824801,45.210988),(15.878855,45.217241),(15.974559,45.215381),(15.997504,45.218533),(16.008459,45.218171),(16.020448,45.213934),(16.029233,45.205045),(16.028716,45.19626),(16.024996,45.188922),(16.024375,45.184323),(16.033057,45.179724),(16.054968,45.176417),(16.067474,45.169595),(16.08277,45.151612),(16.104061,45.112545),(16.121527,45.096163),(16.212994,45.031464),(16.24121,45.018959),(16.279347,45.007176),(16.316244,45.001234),(16.340635,45.005936),(16.346019,45.02001),(16.346023,45.02002),(16.356965,45.048621),(16.377325,45.075596),(16.381976,45.083709),(16.384043,45.09544),(16.381976,45.101951),(16.38177,45.107584),(16.389211,45.116834),(16.398513,45.121433),(16.424764,45.127272),(16.435513,45.132853),(16.449156,45.148098),(16.481919,45.199516),(16.528944,45.222254),(16.587028,45.220858),(16.786293,45.178846),(16.811718,45.181223),(16.824223,45.189077),(16.825774,45.196364),(16.82505,45.205045),(16.830734,45.216983),(16.84076,45.224011),(16.851922,45.227421),(16.86174,45.232227),(16.867321,45.243389),(16.875383,45.246955),(16.885822,45.255223),(16.893986,45.263543),(16.896984,45.268142),(16.924372,45.284524),(16.93264,45.278788),(16.940702,45.257755),(16.942149,45.249849),(16.941529,45.241219)]
+Bajo Nuevo Bank (Petrel Is.)	[(-79.989288,15.794949),(-79.987823,15.79621),(-79.986399,15.79442),(-79.988149,15.794176),(-79.989288,15.794949)]
+Saint Barthelemy	[(-62.838857,17.881985),(-62.850942,17.890448),(-62.861318,17.905422),(-62.86734,17.920396),(-62.866119,17.929145),(-62.857411,17.925035),(-62.791656,17.915473),(-62.79894,17.904486),(-62.810129,17.892279),(-62.823842,17.883246),(-62.838857,17.881985)]
+Belarus	[(28.148907,56.142414),(28.169112,56.125257),(28.238462,56.082624),(28.269364,56.058207),(28.289828,56.046606),(28.310912,56.042679),(28.333443,56.050249),(28.366516,56.07911),(28.389771,56.088567),(28.537824,56.097714),(28.594719,56.092391),(28.611462,56.088464),(28.620713,56.082986),(28.637094,56.065726),(28.671924,56.037563),(28.680606,56.027382),(28.690011,56.003895),(28.695488,55.98015),(28.706392,55.959841),(28.73192,55.946793),(28.80897,55.934571),(28.830881,55.937672),(28.833051,55.960978),(28.859716,55.976455),(28.922141,55.992139),(28.922245,55.992191),(28.922296,55.992191),(28.922451,55.992242),(28.980846,56.013533),(29.030765,56.024178),(29.088643,56.023222),(29.145435,56.012034),(29.192926,55.992139),(29.224035,55.978186),(29.377411,55.954028),(29.395601,55.947723),(29.413067,55.937982),(29.431567,55.924184),(29.441076,55.914934),(29.444435,55.906925),(29.440559,55.900543),(29.433738,55.899535),(29.425573,55.9),(29.417408,55.89801),(29.407796,55.893876),(29.399631,55.891887),(29.391983,55.888373),(29.384128,55.879949),(29.380718,55.871242),(29.375654,55.846799),(29.371933,55.836386),(29.348162,55.802848),(29.343614,55.786984),(29.350745,55.766055),(29.363406,55.751482),(29.413067,55.727762),(29.461023,55.6873),(29.480867,55.681099),(29.5081,55.685491),(29.585356,55.73802),(29.684162,55.770602),(29.710827,55.773754),(29.779867,55.763807),(29.805705,55.771455),(29.844772,55.812563),(29.869474,55.830547),(29.907817,55.843208),(29.947712,55.848194),(29.988226,55.846799),(30.106255,55.821917),(30.132352,55.826878),(30.177258,55.851372),(30.200254,55.857987),(30.217773,55.855145),(30.251517,55.837626),(30.270793,55.83065),(30.468817,55.793521),(30.477395,55.787733),(30.477808,55.779129),(30.471814,55.770964),(30.469282,55.762644),(30.480702,55.753962),(30.569586,55.729519),(30.580128,55.724765),(30.587466,55.718306),(30.5916,55.705697),(30.588396,55.696601),(30.583745,55.68854),(30.583745,55.679135),(30.596354,55.665286),(30.616611,55.657431),(30.639142,55.654485),(30.679967,55.656346),(30.693713,55.65216),(30.703324,55.642341),(30.71304,55.626683),(30.742185,55.594385),(30.77071,55.591543),(30.804093,55.602344),(30.847657,55.611025),(30.886156,55.600483),(30.907122,55.57777),(30.912821,55.571596),(30.919745,55.534492),(30.899385,55.499146),(30.914371,55.493306),(30.919435,55.492325),(30.913234,55.479715),(30.887189,55.468088),(30.881298,55.451448),(30.889101,55.433413),(30.905276,55.420856),(30.918608,55.407627),(30.918298,55.387783),(30.905948,55.376001),(30.845641,55.351145),(30.811225,55.323084),(30.797169,55.304274),(30.794275,55.285515),(30.804093,55.272958),(30.821353,55.26438),(30.856803,55.253476),(30.869826,55.241539),(30.886517,55.204538),(30.900728,55.192136),(30.947237,55.171362),(30.959795,55.162577),(30.96119,55.158546),(30.956849,55.149503),(30.958813,55.144439),(30.962223,55.142888),(30.972455,55.140873),(30.975039,55.13953),(30.979483,55.134259),(30.984031,55.1309),(30.985478,55.125835),(30.98062,55.115345),(30.972662,55.108575),(30.970285,55.101444),(30.973075,55.093951),(30.98062,55.086303),(30.994211,55.067027),(31.006407,55.04243),(31.005632,55.022999),(30.98062,55.018658),(30.933491,55.025635),(30.913234,55.024601),(30.90662,55.012561),(30.916955,54.996024),(30.931424,54.985172),(30.936075,54.973235),(30.917368,54.953959),(30.899488,54.946363),(30.838613,54.93918),(30.814842,54.928018),(30.817426,54.917631),(30.827451,54.902541),(30.826108,54.877478),(30.810708,54.86151),(30.787867,54.847713),(30.768127,54.829936),(30.762649,54.801979),(30.770607,54.786011),(30.786058,54.779345),(30.827296,54.771025),(30.98062,54.705654),(30.995503,54.689841),(30.999017,54.671341),(31.020928,54.673666),(31.10516,54.668292),(31.128621,54.640387),(31.167947,54.621577),(31.139474,54.582871),(31.089554,54.535897),(31.064646,54.492282),(31.093585,54.479415),(31.167896,54.467064),(31.179017,54.453353),(31.179213,54.453111),(31.20903,54.448047),(31.22536,54.428048),(31.248717,54.376785),(31.26174,54.364486),(31.274142,54.356632),(31.284788,54.347381),(31.292022,54.331258),(31.299154,54.272606),(31.309799,54.244339),(31.324682,54.229249),(31.480641,54.156644),(31.506376,54.143931),(31.530871,54.13742),(31.583116,54.129514),(31.666935,54.101867),(31.697837,54.097939),(31.725794,54.097474),(31.73675,54.094167),(31.748119,54.086312),(31.755767,54.074943),(31.762588,54.060319),(31.77127,54.048537),(31.783517,54.045798),(31.808477,54.055978),(31.813851,54.057063),(31.822636,54.053446),(31.823876,54.050139),(31.823566,54.045488),(31.84651,53.992313),(31.841446,53.984561),(31.839689,53.977223),(31.839276,53.969782),(31.837932,53.962134),(31.82646,53.940171),(31.81013,53.882604),(31.79256,53.857437),(31.753803,53.81961),(31.744656,53.794857),(31.787289,53.794392),(31.873175,53.777132),(32.083602,53.809637),(32.10603,53.806949),(32.164837,53.78168),(32.290411,53.760854),(32.325809,53.745454),(32.357384,53.71972),(32.371801,53.714397),(32.421566,53.715792),(32.442133,53.713932),(32.461563,53.7068),(32.48058,53.692073),(32.487815,53.684683),(32.490192,53.677138),(32.487815,53.669645),(32.48058,53.66241),(32.406115,53.639414),(32.399087,53.635384),(32.398001,53.627425),(32.401102,53.609855),(32.411489,53.582364),(32.429421,53.56159),(32.452933,53.546397),(32.48058,53.535648),(32.53081,53.521437),(32.554271,53.510792),(32.569877,53.492602),(32.569877,53.492395),(32.576802,53.486039),(32.584295,53.48423),(32.592511,53.486452),(32.600573,53.492395),(32.618143,53.494255),(32.635713,53.492653),(32.650286,53.487641),(32.647599,53.479321),(32.641656,53.468985),(32.646772,53.457978),(32.658244,53.455653),(32.688526,53.462216),(32.701239,53.462113),(32.719532,53.439478),(32.717794,53.431062),(32.704443,53.366408),(32.717465,53.334937),(32.697931,53.325893),(32.681808,53.326798),(32.666719,53.331345),(32.649872,53.333671),(32.579954,53.324369),(32.583468,53.321217),(32.591891,53.311837),(32.595922,53.308272),(32.569154,53.298841),(32.537321,53.295068),(32.505643,53.297187),(32.48058,53.305171),(32.454845,53.300443),(32.447197,53.288764),(32.455982,53.277783),(32.479133,53.274915),(32.469211,53.255458),(32.455672,53.236674),(32.423633,53.204402),(32.405546,53.192672),(32.389113,53.187633),(32.352836,53.18045),(32.32028,53.162777),(32.295165,53.140866),(32.267983,53.124769),(32.215687,53.125518),(32.210519,53.121772),(32.209072,53.116346),(32.206695,53.112392),(32.206488,53.10986),(32.207005,53.105158),(32.20592,53.100352),(32.201114,53.097561),(32.197393,53.097742),(32.188608,53.099241),(32.152332,53.096347),(32.126545,53.084229),(32.117295,53.081102),(32.082775,53.081955),(32.009911,53.099964),(31.980559,53.098026),(31.954721,53.089991),(31.930743,53.088337),(31.907179,53.091928),(31.855502,53.110248),(31.842635,53.112186),(31.806823,53.110015),(31.796281,53.112392),(31.780468,53.127869),(31.769719,53.169262),(31.756283,53.186574),(31.738558,53.192542),(31.694478,53.192904),(31.674945,53.19523),(31.614018,53.209751),(31.593606,53.210681),(31.573659,53.207089),(31.535935,53.194868),(31.512061,53.194067),(31.464002,53.199984),(31.416356,53.199984),(31.378529,53.182026),(31.359925,53.133838),(31.361165,53.121306),(31.361573,53.120038),(31.364886,53.109731),(31.367057,53.098931),(31.363698,53.088776),(31.354137,53.08211),(31.329436,53.079345),(31.319204,53.076374),(31.269285,53.028418),(31.247064,53.014388),(31.322615,52.977129),(31.339151,52.958061),(31.36623,52.908555),(31.387934,52.887987),(31.418113,52.870237),(31.450979,52.857214),(31.480641,52.850935),(31.505136,52.848894),(31.512784,52.841039),(31.515161,52.828379),(31.523946,52.811661),(31.538364,52.799853),(31.55056,52.794737),(31.560843,52.787063),(31.569525,52.767504),(31.570248,52.725258),(31.547924,52.705699),(31.480641,52.682522),(31.480641,52.68247),(31.4917,52.667096),(31.536142,52.630484),(31.565907,52.59015),(31.579033,52.577825),(31.615207,52.558576),(31.628643,52.54806),(31.624302,52.53806),(31.610763,52.535993),(31.574382,52.541264),(31.559293,52.540541),(31.563634,52.537053),(31.575933,52.524728),(31.558156,52.519999),(31.55056,52.511886),(31.552988,52.502249),(31.565494,52.492637),(31.587922,52.482612),(31.589369,52.458039),(31.583322,52.4283),(31.582857,52.402772),(31.59035,52.391842),(31.600531,52.383393),(31.608075,52.372463),(31.608592,52.354428),(31.602753,52.340915),(31.592262,52.328616),(31.579602,52.318513),(31.567354,52.311382),(31.59712,52.284303),(31.613656,52.273012),(31.631433,52.26477),(31.648693,52.260997),(31.68342,52.257199),(31.699439,52.251463),(31.688897,52.243221),(31.681921,52.230456),(31.679492,52.215858),(31.682386,52.201931),(31.689517,52.19157),(31.698716,52.185446),(31.749049,52.163949),(31.762588,52.149841),(31.766619,52.130075),(31.764345,52.100568),(31.649933,52.096847),(31.474854,52.117776),(31.383076,52.117492),(31.304425,52.097493),(31.284271,52.081241),(31.268871,52.061242),(31.252438,52.044499),(31.228977,52.03822),(31.204896,52.04393),(31.159214,52.068115),(31.134823,52.076667),(31.096324,52.079613),(30.959329,52.074678),(30.934421,52.069717),(30.918815,52.059175),(30.924706,52.042277),(30.919745,52.037264),(30.916851,52.032355),(30.914629,52.027575),(30.91127,52.022562),(30.940519,52.020082),(30.950131,52.006775),(30.941243,51.993804),(30.915198,51.99259),(30.908377,51.998352),(30.902795,51.99998),(30.896904,51.998326),(30.888739,51.994347),(30.880885,51.988171),(30.879024,51.982022),(30.879644,51.97688),(30.879334,51.97365),(30.869102,51.96502),(30.858044,51.957631),(30.845641,51.951352),(30.831379,51.9459),(30.80306,51.939131),(30.802543,51.935539),(30.80523,51.929338),(30.810605,51.925178),(30.810605,51.918382),(30.797065,51.906729),(30.788177,51.900606),(30.779495,51.897919),(30.74973,51.899624),(30.741668,51.897919),(30.737844,51.891588),(30.737224,51.882235),(30.734537,51.873734),(30.71397,51.866964),(30.707562,51.860376),(30.702808,51.853761),(30.69733,51.850738),(30.694539,51.847276),(30.672732,51.829602),(30.666324,51.822393),(30.661983,51.819422),(30.662293,51.815598),(30.669631,51.806064),(30.670562,51.790535),(30.652785,51.77914),(30.630461,51.770019),(30.618162,51.761338),(30.638109,51.755111),(30.64617,51.754542),(30.64617,51.747075),(30.63506,51.739685),(30.632011,51.727981),(30.630564,51.715604),(30.624983,51.706096),(30.613821,51.702918),(30.582815,51.702297),(30.570309,51.69992),(30.575994,51.686407),(30.564315,51.665297),(30.570309,51.6515),(30.563488,51.647314),(30.555323,51.639769),(30.549949,51.637185),(30.552843,51.633335),(30.556615,51.62362),(30.543851,51.620132),(30.515119,51.603673),(30.515119,51.596257),(30.534549,51.585845),(30.543127,51.582589),(30.543127,51.576388),(30.535273,51.575018),(30.531087,51.573313),(30.527728,51.571298),(30.52256,51.568921),(30.52256,51.562719),(30.534136,51.553263),(30.567415,51.547268),(30.584004,51.542256),(30.576407,51.531119),(30.571446,51.526417),(30.562868,51.521766),(30.575064,51.516056),(30.585399,51.509389),(30.58974,51.501974),(30.584004,51.493835),(30.588913,51.48182),(30.597284,51.474275),(30.60762,51.469831),(30.618162,51.467144),(30.618162,51.459651),(30.604829,51.461227),(30.593564,51.458901),(30.586019,51.451848),(30.584004,51.439213),(30.587879,51.427353),(30.595579,51.42495),(30.606018,51.424562),(30.618162,51.418723),(30.622606,51.412108),(30.632424,51.383971),(30.637489,51.378596),(30.644517,51.372679),(30.64555,51.36746),(30.632424,51.364101),(30.638315,51.33586),(30.610462,51.317541),(30.579921,51.303665),(30.577234,51.289015),(30.559354,51.269326),(30.556615,51.267311),(30.555323,51.243462),(30.554657,51.242507),(30.550672,51.236796),(30.539613,51.235168),(30.532017,51.244625),(30.520803,51.252402),(30.508091,51.257673),(30.494655,51.259921),(30.480702,51.258862),(30.465044,51.261937),(30.442772,51.283047),(30.428096,51.291754),(30.413523,51.294054),(30.383757,51.293924),(30.368461,51.297671),(30.355129,51.305267),(30.324536,51.329969),(30.317095,51.340588),(30.319885,51.341596),(30.328257,51.362473),(30.330014,51.370354),(30.330117,51.380715),(30.329032,51.388622),(30.32619,51.395262),(30.320195,51.402083),(30.30738,51.409602),(30.256892,51.425053),(30.242784,51.434407),(30.20537,51.466498),(30.17731,51.479495),(30.14863,51.48443),(30.00869,51.482078),(29.985745,51.477867),(29.925077,51.457868),(29.912572,51.457429),(29.896552,51.464198),(29.886268,51.464793),(29.873608,51.459186),(29.856761,51.439859),(29.846633,51.432908),(29.828649,51.429963),(29.737905,51.439497),(29.725296,51.450452),(29.716511,51.465671),(29.699975,51.483706),(29.682715,51.491199),(29.660804,51.493137),(29.637756,51.490889),(29.618016,51.485644),(29.597345,51.473965),(29.583186,51.460813),(29.5682,51.449626),(29.545049,51.443657),(29.519004,51.441797),(29.505465,51.437456),(29.495543,51.425648),(29.480867,51.401256),(29.466294,51.385056),(29.446399,51.384901),(29.402732,51.39614),(29.379684,51.391541),(29.35326,51.377055),(29.340565,51.370096),(29.319946,51.365574),(29.297002,51.373713),(29.2846,51.391748),(29.276125,51.413581),(29.264859,51.432908),(29.244395,51.447894),(29.227756,51.45562),(29.221038,51.466963),(29.230443,51.492879),(29.226515,51.519053),(29.214836,51.53546),(29.181453,51.567009),(29.160421,51.603311),(29.147967,51.615636),(29.123886,51.625041),(29.083682,51.631217),(29.063218,51.630596),(29.043581,51.626178),(29.023634,51.614034),(28.999966,51.582408),(28.980846,51.569463),(28.954594,51.563262),(28.892892,51.562874),(28.863643,51.558921),(28.831914,51.548276),(28.799875,51.532618),(28.771866,51.511276),(28.752229,51.483706),(28.749439,51.46686),(28.751609,51.428748),(28.746751,51.413995),(28.728768,51.401256),(28.718226,51.411618),(28.711095,51.430247),(28.703963,51.442623),(28.691148,51.443424),(28.677918,51.438076),(28.663552,51.433993),(28.647016,51.439006),(28.637301,51.449626),(28.630893,51.46363),(28.615183,51.51957),(28.612703,51.53993),(28.603918,51.553547),(28.578079,51.56011),(28.488369,51.572021),(28.461239,51.571659),(28.435349,51.56613),(28.385533,51.545046),(28.359643,51.529362),(28.346879,51.525151),(28.333857,51.52838),(28.328172,51.536364),(28.317424,51.56396),(28.310912,51.57445),(28.29851,51.582977),(28.269726,51.594268),(28.257789,51.601761),(28.249366,51.613078),(28.248384,51.622096),(28.248901,51.630596),(28.245128,51.640622),(28.2304,51.651138),(28.21004,51.651965),(28.187612,51.645195),(28.166218,51.633103),(28.146685,51.614396),(28.114232,51.575613),(28.090151,51.562048),(28.070824,51.557629),(27.973155,51.55781),(27.954758,51.560782),(27.936051,51.567009),(27.87559,51.60804),(27.854196,51.615326),(27.831252,51.612923),(27.812545,51.602019),(27.799522,51.585199),(27.793218,51.565019),(27.793735,51.552307),(27.796267,51.541532),(27.797145,51.530603),(27.792546,51.517296),(27.787327,51.510914),(27.74056,51.471407),(27.730121,51.465154),(27.714256,51.463707),(27.700045,51.467531),(27.683767,51.475515),(27.670331,51.484817),(27.666182,51.490194),(27.66413,51.492853),(27.697306,51.543186),(27.705161,51.568352),(27.692655,51.589229),(27.676842,51.59481),(27.620619,51.595896),(27.512426,51.623099),(27.512305,51.623129),(27.477268,51.623672),(27.458768,51.617496),(27.430966,51.598428),(27.409004,51.59171),(27.388385,51.590728),(27.32906,51.596955),(27.289269,51.588971),(27.267462,51.587498),(27.254026,51.595379),(27.25971,51.612303),(27.27449,51.6338),(27.277487,51.651138),(27.247928,51.655659),(27.22364,51.653696),(27.20359,51.655143),(27.189017,51.663773),(27.181059,51.68341),(27.181472,51.710126),(27.184159,51.731443),(27.177855,51.747075),(27.151086,51.756764),(27.109952,51.762423),(27.021585,51.764542),(26.920816,51.742528),(26.854774,51.749349),(26.665741,51.801387),(26.4456,51.805599),(26.431544,51.810224),(26.419245,51.820921),(26.416971,51.830636),(26.419968,51.839731),(26.419762,51.846862),(26.407773,51.850609),(26.175332,51.856707),(26.14536,51.864846),(26.080764,51.900657),(26.050585,51.904817),(25.981132,51.903474),(25.767915,51.928511),(25.683476,51.918021),(25.547396,51.919442),(25.351971,51.921483),(25.1833,51.94975),(25.138031,51.948949),(25.092659,51.939751),(25.002742,51.910476),(24.721829,51.882338),(24.701055,51.882907),(24.639767,51.892131),(24.39079,51.880013),(24.369602,51.875103),(24.347898,51.861151),(24.311518,51.827561),(24.296119,51.808131),(24.272347,51.742889),(24.244132,51.718214),(24.130754,51.669793),(23.981306,51.586),(23.941308,51.581917),(23.912886,51.598583),(23.884878,51.619874),(23.845293,51.629821),(23.820282,51.631268),(23.749692,51.644472),(23.726231,51.644859),(23.628976,51.629046),(23.616677,51.624783),(23.606445,51.618117),(23.594353,51.604965),(23.593319,51.596955),(23.599107,51.588971),(23.626289,51.540886),(23.628666,51.531223),(23.624118,51.515901),(23.615437,51.51311),(23.606238,51.517399),(23.602311,51.530783),(23.588668,51.535899),(23.572752,51.539672),(23.56035,51.555304),(23.567171,51.55489),(23.573992,51.555304),(23.552081,51.578817),(23.5434,51.592743),(23.539886,51.607109),(23.545157,51.63411),(23.543813,51.6438),(23.532444,51.6515),(23.532444,51.658967),(23.541436,51.659742),(23.547534,51.662067),(23.56035,51.671963),(23.555389,51.676304),(23.549291,51.683203),(23.546087,51.689637),(23.550014,51.692427),(23.559213,51.695166),(23.556939,51.701393),(23.550221,51.708421),(23.546604,51.713589),(23.552288,51.736636),(23.556319,51.747359),(23.56035,51.754542),(23.577299,51.766686),(23.59828,51.77467),(23.617504,51.786504),(23.628666,51.809759),(23.610269,51.825184),(23.594559,51.843297),(23.605721,51.851591),(23.609856,51.873269),(23.621845,51.877429),(23.621328,51.882028),(23.620604,51.883217),(23.618847,51.883268),(23.61492,51.88425),(23.621431,51.895567),(23.622155,51.927943),(23.628666,51.946339),(23.647579,51.97409),(23.660705,51.98688),(23.676415,51.994088),(23.664943,52.011168),(23.650783,52.048943),(23.642515,52.061397),(23.641482,52.072921),(23.637451,52.084471),(23.625255,52.089716),(23.61585,52.0923),(23.609856,52.09863),(23.604791,52.106769),(23.598177,52.11452),(23.579366,52.121548),(23.531928,52.120644),(23.512497,52.124442),(23.484695,52.158626),(23.488726,52.16214),(23.491517,52.174103),(23.487693,52.181622),(23.470949,52.171623),(23.464335,52.176351),(23.454413,52.181467),(23.450485,52.185911),(23.43674,52.175679),(23.427231,52.17679),(23.418239,52.182501),(23.405734,52.185911),(23.391368,52.182501),(23.388474,52.184154),(23.395812,52.193379),(23.395812,52.19958),(23.374831,52.200949),(23.312716,52.215289),(23.29959,52.223428),(23.284191,52.219734),(23.212257,52.231671),(23.189726,52.240533),(23.197684,52.25831),(23.19448,52.271462),(23.183525,52.281306),(23.176099,52.285136),(23.168746,52.288928),(23.165645,52.289393),(23.21205,52.347504),(23.230447,52.365074),(23.270548,52.395123),(23.392298,52.509638),(23.480458,52.554416),(23.569031,52.585887),(23.736153,52.614903),(23.868961,52.670042),(23.908752,52.699859),(23.922498,52.742596),(23.920426,52.772625),(23.912059,52.893853),(23.909476,52.901501),(23.905445,52.906539),(23.902034,52.912534),(23.901104,52.923257),(23.903894,52.931137),(23.914953,52.944625),(23.91795,52.9508),(23.917537,52.95881),(23.909062,52.986664),(23.908959,52.993046),(23.911336,53.00506),(23.909682,53.012734),(23.89821,53.02754),(23.867928,53.051027),(23.859349,53.067976),(23.860693,53.087484),(23.870305,53.101256),(23.882397,53.113297),(23.891389,53.127714),(23.893663,53.151951),(23.883121,53.163991),(23.865964,53.172001),(23.848084,53.183809),(23.836198,53.199286),(23.828447,53.213833),(23.818628,53.227967),(23.800645,53.242462),(23.782972,53.270936),(23.742974,53.365478),(23.722924,53.397104),(23.675795,53.455705),(23.590942,53.611251),(23.567068,53.681014),(23.564794,53.742405),(23.56469,53.742405),(23.56469,53.742457),(23.540402,53.763593),(23.52986,53.78416),(23.520662,53.837335),(23.51043,53.862502),(23.497201,53.885549),(23.486866,53.909992),(23.485625,53.939293),(23.520145,53.93397),(23.609959,53.901827),(23.627116,53.89821),(23.642618,53.898985),(23.691918,53.911491),(23.754446,53.916762),(23.77181,53.924307),(23.787209,53.927924),(23.794134,53.927097),(23.812117,53.920844),(23.820592,53.919294),(23.828344,53.920069),(23.904721,53.946062),(23.919811,53.947768),(23.935417,53.943944),(23.964873,53.93273),(23.981306,53.930404),(24.045385,53.930869),(24.074943,53.935727),(24.136748,53.955416),(24.169615,53.95893),(24.201137,53.95247),(24.229146,53.932368),(24.246406,53.903636),(24.257051,53.894024),(24.276378,53.891802),(24.310175,53.892681),(24.341904,53.887048),(24.377871,53.886841),(24.414044,53.897693),(24.528663,53.958361),(24.579099,53.975621),(24.642971,53.983011),(24.666845,53.993863),(24.670566,53.994276),(24.674287,53.993708),(24.677904,53.992313),(24.690823,53.972831),(24.705603,53.964201),(24.723896,53.963426),(24.788698,53.969678),(24.806372,53.975311),(24.819084,53.992313),(24.819187,53.992416),(24.819291,53.992519),(24.819394,53.992571),(24.821358,54.019908),(24.81247,54.038925),(24.799034,54.05603),(24.787148,54.077631),(24.782497,54.092875),(24.784254,54.096234),(24.790559,54.096596),(24.799447,54.10321),(24.818154,54.110135),(24.818671,54.113959),(24.81743,54.120625),(24.817534,54.128222),(24.821565,54.134526),(24.850984,54.144951),(24.855981,54.146722),(24.902283,54.149771),(24.948275,54.145895),(25.027133,54.12786),(25.071989,54.132201),(25.115603,54.148789),(25.156531,54.175712),(25.173068,54.19659),(25.193532,54.243667),(25.206244,54.256793),(25.224124,54.25855),(25.287583,54.245217),(25.369748,54.247904),(25.394036,54.257154),(25.434137,54.291829),(25.459355,54.298909),(25.472068,54.297152),(25.478682,54.293328),(25.483488,54.287695),(25.553975,54.231265),(25.5455,54.227492),(25.522142,54.228629),(25.501678,54.221756),(25.499301,54.211834),(25.523382,54.204238),(25.528963,54.195659),(25.521729,54.188218),(25.493203,54.18243),(25.485762,54.175402),(25.493307,54.157522),(25.516044,54.144758),(25.543019,54.136955),(25.631593,54.128325),(25.653503,54.128739),(25.663942,54.132356),(25.679755,54.145327),(25.690607,54.148221),(25.728124,54.145223),(25.74001,54.146257),(25.763057,54.156437),(25.771016,54.172147),(25.771946,54.21788),(25.775046,54.22248),(25.786829,54.231781),(25.789206,54.236225),(25.786622,54.242323),(25.781764,54.244442),(25.776287,54.245631),(25.772256,54.248938),(25.765641,54.259997),(25.757786,54.268988),(25.748898,54.276326),(25.739286,54.282579),(25.734739,54.283199),(25.723267,54.280977),(25.719236,54.281546),(25.715412,54.285215),(25.704766,54.302991),(25.701769,54.312758),(25.695981,54.320975),(25.682339,54.325626),(25.667353,54.3233),(25.607408,54.304852),(25.564,54.303146),(25.542296,54.308056),(25.528653,54.320975),(25.529997,54.346141),(25.548807,54.367742),(25.594696,54.400091),(25.612576,54.421796),(25.616296,54.441071),(25.615573,54.461896),(25.619914,54.488096),(25.630869,54.508354),(25.646165,54.520394),(25.70735,54.54153),(25.726471,54.55295),(25.740423,54.568505),(25.745591,54.5884),(25.739906,54.607727),(25.715102,54.643229),(25.708384,54.663021),(25.709521,54.67563),(25.713862,54.685552),(25.719133,54.69475),(25.72306,54.705344),(25.72461,54.715679),(25.7212,54.766736),(25.7243,54.78012),(25.734946,54.78906),(25.756753,54.800377),(25.766571,54.803271),(25.773393,54.803374),(25.778457,54.805286),(25.782901,54.81371),(25.782281,54.821978),(25.773703,54.841925),(25.772256,54.850865),(25.782695,54.869675),(25.802538,54.881612),(25.825793,54.891999),(25.84667,54.90621),(25.853078,54.916442),(25.854835,54.925486),(25.858452,54.932979),(25.870234,54.938818),(25.907855,54.948068),(25.926148,54.947758),(25.962529,54.942901),(25.981132,54.942694),(26.102572,54.957008),(26.138642,54.968946),(26.153628,54.978506),(26.170325,54.99326),(26.187838,55.008736),(26.224631,55.054884),(26.229386,55.06341),(26.231246,55.075451),(26.230316,55.100255),(26.233003,55.111624),(26.264422,55.140098),(26.309484,55.144645),(26.420278,55.128109),(26.428753,55.128212),(26.438572,55.130021),(26.444773,55.133948),(26.450664,55.13984),(26.459139,55.144749),(26.473402,55.145679),(26.578925,55.118549),(26.600939,55.120823),(26.616339,55.135395),(26.627501,55.164438),(26.633909,55.192188),(26.641143,55.202833),(26.656956,55.215339),(26.685689,55.231617),(26.701088,55.236836),(26.739901,55.242776),(26.76558,55.246706),(26.789661,55.257197),(26.80072,55.27332),(26.791574,55.290166),(26.768629,55.300243),(26.602696,55.316883),(26.542338,55.307581),(26.525388,55.308098),(26.465754,55.320862),(26.450044,55.327063),(26.445496,55.337502),(26.455212,55.356105),(26.479086,55.381375),(26.486011,55.390832),(26.49924,55.428091),(26.507818,55.439149),(26.543268,55.459613),(26.546472,55.471241),(26.527662,55.492169),(26.532106,55.516251),(26.55164,55.534492),(26.576134,55.550564),(26.595565,55.56803),(26.605177,55.590096),(26.607657,55.616451),(26.603833,55.643271),(26.594531,55.666991),(26.615615,55.687971),(26.64011,55.695568),(26.666878,55.693966),(26.720105,55.681874),(26.743049,55.682856),(26.822838,55.70611),(26.842785,55.719339),(26.900146,55.778715),(26.957817,55.818584),(26.979426,55.826291),(26.981071,55.826878),(27.110779,55.836283),(27.151448,55.832459),(27.173204,55.825741),(27.235526,55.795846),(27.263018,55.787216),(27.282448,55.791867),(27.329163,55.817576),(27.349627,55.831219),(27.374587,55.814837),(27.405851,55.804347),(27.438821,55.79874),(27.564601,55.792229),(27.592713,55.794244),(27.601498,55.809618),(27.610128,55.83096),(27.617156,55.878554),(27.64501,55.922841),(27.744435,55.959738),(27.776991,55.992397),(27.781229,56.016375),(27.812545,56.034514),(27.880654,56.063866),(27.892747,56.077095),(27.901532,56.089342),(27.911453,56.100246),(27.92706,56.109367),(27.939669,56.113062),(27.98101,56.118023),(28.023798,56.12965),(28.0511,56.140666),(28.06824,56.147582),(28.110976,56.156806),(28.148907,56.142414)]
+Bolivia	[(-65.29247,-11.504723),(-65.257562,-11.495318),(-65.233042,-11.50834),(-65.222655,-11.517435),(-65.215989,-11.530148),(-65.215989,-11.539966),(-65.223611,-11.55795),(-65.223404,-11.571076),(-65.219244,-11.584511),(-65.214542,-11.587509),(-65.207359,-11.587612),(-65.195447,-11.59216),(-65.173976,-11.606526),(-65.167439,-11.615517),(-65.190926,-11.623165),(-65.193354,-11.632364),(-65.189272,-11.657065),(-65.191339,-11.666884),(-65.200253,-11.681973),(-65.20232,-11.691482),(-65.201855,-11.727965),(-65.196197,-11.741814),(-65.182451,-11.756697),(-65.164467,-11.769823),(-65.151497,-11.77313),(-65.143538,-11.763829),(-65.138009,-11.715253),(-65.133978,-11.702644),(-65.127855,-11.694582),(-65.113411,-11.690551),(-65.110465,-11.699957),(-65.113566,-11.722591),(-65.0992,-11.736233),(-65.081062,-11.743468),(-65.065559,-11.75308),(-65.056309,-11.785636),(-65.043312,-11.80765),(-65.038454,-11.818709),(-65.037447,-11.828424),(-65.039204,-11.848681),(-65.038454,-11.8585),(-65.033674,-11.879791),(-65.028093,-11.888886),(-65.017939,-11.89364),(-65.014528,-11.893847),(-65.00458,-11.898394),(-64.998121,-11.908936),(-64.996493,-11.921235),(-65.00086,-11.931054),(-65.014632,-11.950277),(-65.016337,-11.968467),(-65.009438,-11.98428),(-64.997449,-11.996269),(-64.983445,-12.003917),(-64.967606,-12.007948),(-64.925154,-12.009912),(-64.904483,-12.014046),(-64.883503,-12.021384),(-64.862083,-12.024795),(-64.839836,-12.016733),(-64.827615,-12.022314),(-64.809295,-12.025828),(-64.7925,-12.032546),(-64.785188,-12.047429),(-64.780486,-12.067686),(-64.768574,-12.086496),(-64.736793,-12.119776),(-64.744183,-12.133625),(-64.739532,-12.144581),(-64.728396,-12.149852),(-64.716278,-12.146544),(-64.713642,-12.138483),(-64.710283,-12.111921),(-64.706382,-12.106133),(-64.689923,-12.104376),(-64.68646,-12.109957),(-64.681577,-12.126597),(-64.681577,-12.134865),(-64.688579,-12.147164),(-64.688992,-12.153882),(-64.685944,-12.159153),(-64.677184,-12.167628),(-64.67535,-12.171039),(-64.66486,-12.180961),(-64.640572,-12.19512),(-64.593417,-12.215997),(-64.58104,-12.217444),(-64.554892,-12.217754),(-64.548433,-12.219098),(-64.532103,-12.232224),(-64.511484,-12.242662),(-64.510347,-12.239562),(-64.510244,-12.237288),(-64.508848,-12.236048),(-64.49425,-12.238012),(-64.489392,-12.239459),(-64.473037,-12.253204),(-64.469058,-12.261059),(-64.468153,-12.272635),(-64.469316,-12.294856),(-64.474432,-12.316456),(-64.492441,-12.356557),(-64.48978,-12.373611),(-64.48363,-12.377641),(-64.461642,-12.385289),(-64.452521,-12.390354),(-64.444072,-12.399759),(-64.432367,-12.420946),(-64.424874,-12.431385),(-64.411335,-12.445131),(-64.395729,-12.457326),(-64.376763,-12.465905),(-64.353199,-12.469212),(-64.312659,-12.461874),(-64.297699,-12.465698),(-64.287544,-12.497117),(-64.278242,-12.499288),(-64.268708,-12.497221),(-64.26385,-12.495257),(-64.256822,-12.490813),(-64.245712,-12.479444),(-64.236565,-12.475413),(-64.215223,-12.473759),(-64.19755,-12.47872),(-64.183106,-12.487919),(-64.155252,-12.516961),(-64.144788,-12.520372),(-64.134763,-12.510863),(-64.119828,-12.489676),(-64.104455,-12.507142),(-64.044458,-12.509106),(-64.022832,-12.537838),(-64.004176,-12.535461),(-63.972447,-12.523886),(-63.959321,-12.52802),(-63.950019,-12.536805),(-63.939064,-12.544143),(-63.921236,-12.544349),(-63.909143,-12.534324),(-63.902477,-12.525436),(-63.896896,-12.515721),(-63.863203,-12.474793),(-63.862893,-12.469212),(-63.845581,-12.466938),(-63.814989,-12.457223),(-63.801398,-12.454949),(-63.657738,-12.475413),(-63.654844,-12.478307),(-63.600428,-12.506109),(-63.558726,-12.539905),(-63.542189,-12.547967),(-63.520227,-12.551171),(-63.507514,-12.551584),(-63.496145,-12.553341),(-63.485758,-12.557475),(-63.476198,-12.564813),(-63.468757,-12.575769),(-63.467,-12.585794),(-63.46638,-12.595302),(-63.462504,-12.605121),(-63.454236,-12.612046),(-63.445347,-12.614836),(-63.438164,-12.619177),(-63.435219,-12.630339),(-63.431446,-12.636954),(-63.393309,-12.664549),(-63.371088,-12.669923),(-63.359461,-12.674677),(-63.330419,-12.697002),(-63.317913,-12.701963),(-63.247323,-12.701342),(-63.235955,-12.698552),(-63.232027,-12.691111),(-63.222674,-12.682532),(-63.201848,-12.667856),(-63.197301,-12.666823),(-63.18557,-12.668476),(-63.180712,-12.667856),(-63.176113,-12.663619),(-63.171669,-12.652353),(-63.16707,-12.647392),(-63.139475,-12.63561),(-63.136684,-12.63375),(-63.125057,-12.63592),(-63.105213,-12.645222),(-63.075034,-12.652663),(-63.064751,-12.666202),(-63.057826,-12.701963),(-63.053588,-12.70837),(-63.047077,-12.713538),(-63.04346,-12.719119),(-63.051108,-12.730798),(-63.052193,-12.736482),(-63.051108,-12.742167),(-63.047904,-12.746714),(-63.025683,-12.765731),(-63.014728,-12.77772),(-63.010025,-12.787952),(-63.00708,-12.809966),(-62.999173,-12.829087),(-62.988011,-12.843866),(-62.975299,-12.852858),(-62.964498,-12.856578),(-62.955145,-12.857509),(-62.946515,-12.855235),(-62.93804,-12.849447),(-62.928893,-12.846036),(-62.923777,-12.852858),(-62.92047,-12.862263),(-62.867915,-12.929029),(-62.865073,-12.93554),(-62.860112,-12.940294),(-62.849001,-12.942155),(-62.838925,-12.942775),(-62.831431,-12.944945),(-62.826677,-12.950009),(-62.825075,-12.958691),(-62.820166,-12.974918),(-62.807402,-12.98887),(-62.789832,-13.000652),(-62.770453,-13.010471),(-62.768645,-12.990627),(-62.757896,-12.985149),(-62.741308,-12.985356),(-62.722032,-12.982566),(-62.709165,-12.974607),(-62.698985,-12.966649),(-62.686634,-12.964996),(-62.667462,-12.976364),(-62.657902,-12.984633),(-62.651339,-12.992487),(-62.647515,-13.001583),(-62.64519,-13.025354),(-62.641676,-13.030005),(-62.554601,-13.066798),(-62.492692,-13.065041),(-62.472125,-13.068452),(-62.458483,-13.07796),(-62.430939,-13.109793),(-62.428717,-13.114547),(-62.427477,-13.124572),(-62.424118,-13.126536),(-62.410269,-13.125709),(-62.406703,-13.126536),(-62.389701,-13.137078),(-62.381846,-13.139869),(-62.335028,-13.14514),(-62.321592,-13.143693),(-62.310533,-13.133978),(-62.290328,-13.142039),(-62.273636,-13.138422),(-62.259167,-13.130774),(-62.22165,-13.121265),(-62.211521,-13.120335),(-62.200927,-13.122712),(-62.173952,-13.140799),(-62.172454,-13.117855),(-62.162377,-13.120748),(-62.139846,-13.147),(-62.129149,-13.150927),(-62.120467,-13.148757),(-62.114679,-13.150204),(-62.112509,-13.164777),(-62.112457,-13.231801),(-62.109408,-13.248958),(-62.099228,-13.2626),(-62.077731,-13.277896),(-62.033599,-13.325542),(-62.019698,-13.33257),(-62.018665,-13.336808),(-62.003265,-13.360475),(-61.997787,-13.364093),(-61.97536,-13.374118),(-61.958358,-13.385487),(-61.909834,-13.431892),(-61.899499,-13.43923),(-61.879913,-13.449152),(-61.872317,-13.456077),(-61.868596,-13.463932),(-61.847977,-13.530801),(-61.83635,-13.540619),(-61.813974,-13.544237),(-61.794285,-13.540309),(-61.774235,-13.533385),(-61.75434,-13.530284),(-61.735116,-13.538036),(-61.715737,-13.526563),(-61.692896,-13.517985),(-61.668092,-13.512507),(-61.597114,-13.5061),(-61.59306,-13.506794),(-61.588071,-13.50765),(-61.560863,-13.532661),(-61.550812,-13.538036),(-61.503425,-13.548164),(-61.45875,-13.54372),(-61.415471,-13.528114),(-61.347724,-13.493697),(-61.332376,-13.494834),(-61.317131,-13.500932),(-61.281216,-13.507236),(-61.260029,-13.520052),(-61.248556,-13.524393),(-61.237885,-13.524393),(-61.215044,-13.517468),(-61.149105,-13.519845),(-61.139312,-13.514058),(-61.133576,-13.494007),(-61.118719,-13.484499),(-61.076009,-13.478298),(-61.072185,-13.47437),(-61.060118,-13.467136),(-61.047225,-13.464552),(-61.041256,-13.474577),(-61.041256,-13.515195),(-61.022007,-13.535245),(-60.977875,-13.542997),(-60.929299,-13.5462),(-60.896743,-13.552918),(-60.878243,-13.570385),(-60.870673,-13.575449),(-60.801969,-13.604181),(-60.725572,-13.662845),(-60.652701,-13.7188),(-60.618078,-13.736886),(-60.595082,-13.741641),(-60.588623,-13.744535),(-60.584876,-13.749082),(-60.579579,-13.761071),(-60.575135,-13.765619),(-60.566066,-13.769959),(-60.490618,-13.787736),(-60.472635,-13.797865),(-60.465271,-13.816572),(-60.463126,-13.843443),(-60.457313,-13.870935),(-60.448812,-13.896773),(-60.438554,-13.918374),(-60.430441,-13.926746),(-60.408634,-13.944522),(-60.406722,-13.950414),(-60.411605,-13.960542),(-60.40543,-13.966743),(-60.39574,-13.970981),(-60.389694,-13.974908),(-60.387188,-13.98328),(-60.387963,-13.989378),(-60.396515,-14.008394),(-60.409409,-14.055317),(-60.419434,-14.076917),(-60.437236,-14.092007),(-60.461395,-14.098622),(-60.468268,-14.103686),(-60.473513,-14.117225),(-60.477647,-14.139963),(-60.478939,-14.1627),(-60.475684,-14.176033),(-60.462403,-14.19846),(-60.462015,-14.223885),(-60.465633,-14.251067),(-60.464341,-14.278352),(-60.454316,-14.296646),(-60.399926,-14.340777),(-60.391348,-14.357107),(-60.376698,-14.419946),(-60.343806,-14.490949),(-60.338431,-14.5326),(-60.369204,-14.542832),(-60.35272,-14.575388),(-60.30404,-14.608151),(-60.291716,-14.630062),(-60.288822,-14.69073),(-60.284869,-14.772689),(-60.280889,-14.854648),(-60.276859,-14.936607),(-60.272905,-15.018565),(-60.269805,-15.083368),(-60.274972,-15.09515),(-60.389307,-15.096493),(-60.582241,-15.098871),(-60.529479,-15.143726),(-60.460181,-15.224238),(-60.352125,-15.349605),(-60.260451,-15.456058),(-60.246395,-15.478279),(-60.237972,-15.50267),(-60.224821,-15.651395),(-60.206992,-15.853036),(-60.193763,-16.001451),(-60.186968,-16.108731),(-60.17981,-16.222006),(-60.16069,-16.264794),(-60.129839,-16.273062),(-60.060412,-16.27544),(-59.87001,-16.282157),(-59.679557,-16.288772),(-59.489103,-16.295387),(-59.298675,-16.302105),(-59.108248,-16.308719),(-58.917769,-16.315437),(-58.727444,-16.322155),(-58.536965,-16.32877),(-58.464721,-16.33125),(-58.442242,-16.32846),(-58.421623,-16.318434),(-58.414233,-16.308926),(-58.400332,-16.284225),(-58.392943,-16.279367),(-58.349741,-16.2804),(-58.339561,-16.289289),(-58.334548,-16.386647),(-58.338837,-16.400497),(-58.362299,-16.419307),(-58.36359,-16.43667),(-58.342661,-16.473154),(-58.356097,-16.509534),(-58.455885,-16.619088),(-58.472679,-16.649577),(-58.480276,-16.683683),(-58.476658,-16.726988),(-58.456246,-16.802436),(-58.452939,-16.841296),(-58.455109,-16.848324),(-58.464049,-16.866101),(-58.466633,-16.875506),(-58.466272,-16.887289),(-58.45635,-16.937001),(-58.439193,-16.967284),(-58.432475,-16.98537),(-58.426791,-17.055237),(-58.421623,-17.070636),(-58.410978,-17.088206),(-58.406275,-17.110117),(-58.404828,-17.199621),(-58.399144,-17.237448),(-58.38116,-17.267214),(-58.343695,-17.286954),(-58.312172,-17.290881),(-58.302147,-17.293775),(-58.292277,-17.299666),(-58.274397,-17.314032),(-58.264527,-17.320027),(-58.256155,-17.322507),(-58.239929,-17.325195),(-58.231557,-17.329742),(-58.22024,-17.344315),(-58.204065,-17.377388),(-58.188407,-17.38855),(-58.174558,-17.392064),(-58.163189,-17.393407),(-58.152234,-17.396405),(-58.139366,-17.40457),(-58.11203,-17.433508),(-58.101126,-17.44126),(-58.065727,-17.455936),(-58.053687,-17.462344),(-58.010175,-17.49676),(-57.981495,-17.508749),(-57.943564,-17.517844),(-57.905686,-17.520325),(-57.877005,-17.512263),(-57.854113,-17.508543),(-57.836749,-17.511023),(-57.814425,-17.519705),(-57.800731,-17.533451),(-57.790757,-17.555775),(-57.788277,-17.58058),(-57.789569,-17.604144),(-57.787553,-17.620474),(-57.787967,-17.658921),(-57.7859,-17.677525),(-57.777941,-17.695508),(-57.767554,-17.708737),(-57.754894,-17.720623),(-57.740373,-17.730234),(-57.724456,-17.736642),(-57.732983,-17.768475),(-57.729314,-17.779327),(-57.711331,-17.800824),(-57.696809,-17.825112),(-57.698773,-17.843096),(-57.730089,-17.846093),(-57.636916,-18.001122),(-57.585498,-18.122769),(-57.551082,-18.183643),(-57.511188,-18.205554),(-57.490724,-18.205554),(-57.474549,-18.208035),(-57.465661,-18.21775),(-57.466798,-18.239557),(-57.535734,-18.240488),(-57.553872,-18.244518),(-57.56674,-18.256094),(-57.583018,-18.305703),(-57.630043,-18.448434),(-57.677017,-18.59106),(-57.723991,-18.733687),(-57.771068,-18.876314),(-57.782334,-18.910421),(-57.742233,-18.913625),(-57.731794,-18.921996),(-57.727557,-18.941943),(-57.721769,-19.001165),(-57.715826,-19.044573),(-57.771895,-19.048707),(-57.789,-19.059249),(-57.812048,-19.105034),(-57.843105,-19.166839),(-57.911628,-19.302852),(-57.980048,-19.438864),(-58.011209,-19.500669),(-58.011209,-19.500772),(-58.011209,-19.500876),(-58.011261,-19.500876),(-58.02356,-19.52568),(-58.050483,-19.580147),(-58.077458,-19.634718),(-58.089757,-19.659419),(-58.124639,-19.729906),(-58.116939,-19.758018),(-58.04113,-19.82344),(-57.960463,-19.8931),(-57.859745,-19.980123),(-57.86977,-19.992939),(-57.881139,-20.009165),(-57.895609,-20.024151),(-57.917933,-20.034177),(-57.943203,-20.028079),(-57.959171,-20.026218),(-57.966354,-20.031076),(-57.968938,-20.039758),(-57.975811,-20.047509),(-57.985681,-20.05309),(-57.997101,-20.055261),(-58.022371,-20.064976),(-58.053532,-20.10766),(-58.079577,-20.117376),(-58.086243,-20.12089),(-58.098284,-20.13815),(-58.103555,-20.144041),(-58.116319,-20.150449),(-58.158797,-20.165125),(-58.15952,-20.13908),(-58.144741,-20.086163),(-58.143139,-20.065286),(-58.144482,-20.023118),(-58.141847,-20.000897),(-58.145154,-19.969581),(-58.162207,-19.912324),(-58.164223,-19.880284),(-58.161174,-19.847211),(-58.164429,-19.832949),(-58.175282,-19.821373),(-58.214452,-19.798325),(-58.30778,-19.743652),(-58.401004,-19.688875),(-58.49428,-19.634201),(-58.587504,-19.579424),(-58.680832,-19.52475),(-58.774108,-19.470077),(-58.867436,-19.4153),(-58.96066,-19.360523),(-59.011096,-19.330964),(-59.039673,-19.311637),(-59.069646,-19.291483),(-59.089541,-19.286729),(-59.170725,-19.287762),(-59.359085,-19.290139),(-59.547498,-19.292413),(-59.735858,-19.29479),(-59.924322,-19.297064),(-60.006384,-19.298097),(-60.156995,-19.329),(-60.495476,-19.398453),(-60.833931,-19.467906),(-61.17236,-19.537463),(-61.51084,-19.606916),(-61.532286,-19.610016),(-61.579544,-19.616838),(-61.626725,-19.623659),(-61.648222,-19.62676),(-61.737235,-19.639575),(-61.753203,-19.64588),(-61.761213,-19.657765),(-61.780074,-19.706961),(-61.808186,-19.780342),(-61.836298,-19.853826),(-61.86441,-19.927413),(-61.892522,-20.000897),(-61.892574,-20.000897),(-61.905545,-20.026735),(-61.918412,-20.052573),(-61.92474,-20.065128),(-61.931383,-20.078308),(-61.94425,-20.104146),(-61.960942,-20.128021),(-61.977582,-20.151792),(-61.99417,-20.175667),(-62.01081,-20.199541),(-62.05551,-20.260416),(-62.10021,-20.321187),(-62.144962,-20.382062),(-62.189662,-20.442834),(-62.210573,-20.471305),(-62.232398,-20.501021),(-62.26883,-20.553111),(-62.277305,-20.579776),(-62.276168,-20.670727),(-62.275031,-20.75868),(-62.273791,-20.854798),(-62.271886,-21.000424),(-62.271879,-21.000939),(-62.275703,-21.066568),(-62.307898,-21.169301),(-62.340402,-21.272861),(-62.37549,-21.384482),(-62.411974,-21.500857),(-62.446184,-21.606897),(-62.492796,-21.751798),(-62.529228,-21.865073),(-62.572843,-22.000775),(-62.599404,-22.089865),(-62.627516,-22.184536),(-62.650357,-22.234456),(-62.658987,-22.231665),(-62.661829,-22.224534),(-62.663225,-22.215542),(-62.667462,-22.20655),(-62.679296,-22.194768),(-62.722032,-22.166243),(-62.769368,-22.144745),(-62.783476,-22.130896),(-62.790917,-22.113223),(-62.791072,-22.081597),(-62.79779,-22.069401),(-62.795051,-22.061133),(-62.795,-22.051211),(-62.801356,-22.013487),(-62.804353,-22.004082),(-62.818564,-22.000878),(-62.862024,-21.99323),(-63.009922,-22.000671),(-63.010439,-22.000775),(-63.324916,-21.999121),(-63.639392,-21.997468),(-63.67784,-22.003669),(-63.693911,-22.01204),(-63.74042,-22.050591),(-63.751789,-22.045733),(-63.793026,-22.011524),(-63.813129,-22.003049),(-63.906405,-21.997157),(-63.933173,-22.001808),(-63.947591,-22.007596),(-63.95095,-22.0108),(-63.951466,-22.016691),(-63.961027,-22.039119),(-63.964644,-22.058549),(-63.968106,-22.066507),(-63.975806,-22.073845),(-63.983454,-22.077359),(-63.990379,-22.079323),(-63.99565,-22.08294),(-64.004383,-22.09927),(-64.019783,-22.155391),(-64.051021,-22.229185),(-64.058798,-22.240347),(-64.078875,-22.250579),(-64.086239,-22.257917),(-64.160549,-22.438474),(-64.184708,-22.471237),(-64.236333,-22.516712),(-64.250828,-22.54069),(-64.293978,-22.690862),(-64.294598,-22.762899),(-64.303486,-22.782329),(-64.326947,-22.859224),(-64.325294,-22.871936),(-64.343897,-22.863668),(-64.347721,-22.816952),(-64.359994,-22.803),(-64.352321,-22.779125),(-64.355731,-22.751943),(-64.368986,-22.729723),(-64.390768,-22.720524),(-64.401723,-22.712359),(-64.428285,-22.659029),(-64.438233,-22.651898),(-64.447224,-22.648694),(-64.45371,-22.642906),(-64.456242,-22.628023),(-64.455208,-22.616655),(-64.450454,-22.597121),(-64.449421,-22.587096),(-64.445545,-22.576244),(-64.437251,-22.567355),(-64.429835,-22.557123),(-64.428285,-22.542344),(-64.483734,-22.491184),(-64.498126,-22.472787),(-64.504043,-22.449946),(-64.507815,-22.443952),(-64.525747,-22.432997),(-64.531328,-22.425658),(-64.531069,-22.41553),(-64.523292,-22.396203),(-64.524558,-22.385351),(-64.537891,-22.374292),(-64.558871,-22.36065),(-64.572023,-22.343183),(-64.562075,-22.319825),(-64.549156,-22.305356),(-64.542257,-22.291506),(-64.542774,-22.275487),(-64.551843,-22.255023),(-64.560215,-22.243137),(-64.58688,-22.212752),(-64.596207,-22.20655),(-64.616284,-22.20221),(-64.638711,-22.191668),(-64.65778,-22.178438),(-64.679045,-22.175441),(-64.687442,-22.172857),(-64.695245,-22.174201),(-64.713694,-22.181746),(-64.722892,-22.183296),(-64.762321,-22.174408),(-64.832472,-22.137511),(-65.020368,-22.096583),(-65.190478,-22.098474),(-65.457344,-22.101441),(-65.510467,-22.095859),(-65.579894,-22.086454),(-65.588524,-22.087281),(-65.593433,-22.091105),(-65.597878,-22.095653),(-65.605319,-22.099063),(-65.744613,-22.11405),(-65.775309,-22.105058),(-65.804557,-22.085834),(-65.932689,-21.944551),(-65.954497,-21.933079),(-66.046532,-21.917989),(-66.051752,-21.912615),(-66.063586,-21.864039),(-66.094488,-21.83293),(-66.137819,-21.812466),(-66.222465,-21.786938),(-66.240009,-21.792415),(-66.287551,-21.956953),(-66.297163,-22.050281),(-66.301504,-22.064957),(-66.307602,-22.077049),(-66.309824,-22.078186),(-66.314061,-22.075809),(-66.32667,-22.077359),(-66.335249,-22.08232),(-66.343,-22.090485),(-66.349175,-22.1002),(-66.353232,-22.109605),(-66.377468,-22.127072),(-66.510328,-22.162935),(-66.626755,-22.192598),(-66.630579,-22.197352),(-66.633267,-22.204897),(-66.636315,-22.211305),(-66.64138,-22.212545),(-66.657813,-22.207377),(-66.677398,-22.205103),(-66.688457,-22.201693),(-66.699309,-22.200763),(-66.712848,-22.206447),(-66.735896,-22.225051),(-66.748867,-22.244894),(-66.756101,-22.268252),(-66.767935,-22.342563),(-66.77517,-22.365197),(-66.788037,-22.38008),(-66.790518,-22.388348),(-66.784472,-22.417287),(-66.785092,-22.427622),(-66.796461,-22.434857),(-66.90865,-22.467516),(-66.935315,-22.480539),(-66.955572,-22.500693),(-66.965236,-22.514335),(-66.978155,-22.5225),(-66.993555,-22.525807),(-67.015672,-22.523844),(-67.032725,-22.524567),(-67.024354,-22.617585),(-67.026628,-22.639392),(-67.037686,-22.654585),(-67.113237,-22.710086),(-67.142693,-22.742745),(-67.193904,-22.822223),(-67.510267,-22.885785),(-67.547113,-22.892503),(-67.616772,-22.897258),(-67.77144,-22.888679),(-67.803583,-22.878654),(-67.811283,-22.871626),(-67.833038,-22.840103),(-67.837948,-22.840827),(-67.876343,-22.833592),(-67.887092,-22.818709),(-67.891484,-22.792871),(-67.891329,-22.715667),(-67.858721,-22.566838),(-67.859187,-22.547305),(-67.889676,-22.491184),(-67.898202,-22.441471),(-67.906936,-22.420077),(-67.94528,-22.354242),(-67.951894,-22.334088),(-67.952204,-22.314141),(-67.934789,-22.251716),(-67.935978,-22.232285),(-67.944969,-22.208307),(-67.97303,-22.170584),(-67.976595,-22.159835),(-67.973288,-22.15043),(-67.960627,-22.133687),(-67.957165,-22.124592),(-67.960627,-22.102887),(-67.972616,-22.078806),(-67.990186,-22.057619),(-68.010237,-22.044907),(-68.058761,-22.000775),(-68.082739,-21.980311),(-68.092041,-21.968425),(-68.096226,-21.953956),(-68.107595,-21.789625),(-68.128369,-21.712317),(-68.190588,-21.60638),(-68.198442,-21.57186),(-68.19374,-21.328464),(-68.207537,-21.284333),(-68.41631,-20.959805),(-68.432071,-20.945025),(-68.453931,-20.939754),(-68.495995,-20.941615),(-68.510206,-20.940168),(-68.531554,-20.927688),(-68.555113,-20.913916),(-68.57196,-20.872368),(-68.572786,-20.742867),(-68.565087,-20.719509),(-68.550204,-20.699046),(-68.481629,-20.643028),(-68.480957,-20.624735),(-68.510206,-20.601894),(-68.536303,-20.591765),(-68.583328,-20.563033),(-68.685544,-20.516834),(-68.707559,-20.500918),(-68.729676,-20.479214),(-68.750708,-20.451825),(-68.76541,-20.421233),(-68.769028,-20.390537),(-68.757685,-20.364286),(-68.735154,-20.347542),(-68.678516,-20.328629),(-68.718049,-20.261966),(-68.729469,-20.228687),(-68.728281,-20.189619),(-68.723268,-20.16099),(-68.726265,-20.150965),(-68.759028,-20.144144),(-68.789466,-20.125851),(-68.792592,-20.106627),(-68.775539,-20.089677),(-68.652885,-20.054227),(-68.622137,-20.051333),(-68.607771,-20.053607),(-68.597178,-20.056707),(-68.588341,-20.055571),(-68.579349,-20.045442),(-68.574543,-20.03521),(-68.56612,-20.000897),(-68.564932,-19.981363),(-68.544623,-19.934751),(-68.541574,-19.920385),(-68.542917,-19.914184),(-68.546948,-19.908189),(-68.551547,-19.894443),(-68.552529,-19.864885),(-68.553511,-19.857857),(-68.561108,-19.844317),(-68.570823,-19.837599),(-68.60157,-19.825404),(-68.618882,-19.813415),(-68.650353,-19.781582),(-68.698412,-19.746339),(-68.70544,-19.733833),(-68.703218,-19.71554),(-68.690299,-19.695386),(-68.648596,-19.660349),(-68.630974,-19.641952),(-68.576736,-19.564607),(-68.532117,-19.500979),(-68.532117,-19.500876),(-68.510206,-19.471627),(-68.496357,-19.458398),(-68.456101,-19.441241),(-68.447626,-19.434627),(-68.455016,-19.415403),(-68.472586,-19.395456),(-68.493205,-19.376956),(-68.600072,-19.303368),(-68.635728,-19.290553),(-68.663324,-19.273603),(-68.698464,-19.215622),(-68.721253,-19.191747),(-68.815407,-19.113303),(-68.847369,-19.092012),(-68.894782,-19.076509),(-68.908502,-19.067931),(-68.91969,-19.053771),(-68.943151,-19.001165),(-68.961703,-18.969435),(-68.973976,-18.956206),(-68.989609,-18.946491),(-68.959843,-18.907837),(-68.951781,-18.889337),(-68.951445,-18.867323),(-68.954649,-18.856987),(-69.01015,-18.745263),(-69.010537,-18.744539),(-69.010667,-18.743713),(-69.010537,-18.742989),(-69.003174,-18.729553),(-69.001107,-18.716221),(-69.003484,-18.702682),(-69.01015,-18.689762),(-69.033844,-18.649455),(-69.042835,-18.600466),(-69.041647,-18.548893),(-69.034903,-18.50104),(-69.034386,-18.478303),(-69.041698,-18.457735),(-69.07782,-18.398824),(-69.081877,-18.382494),(-69.079293,-18.328027),(-69.081024,-18.319139),(-69.095752,-18.276764),(-69.096837,-18.267979),(-69.09694,-18.257541),(-69.100351,-18.234286),(-69.110661,-18.217957),(-69.141201,-18.186847),(-69.155438,-18.140235),(-69.125931,-18.11109),(-69.089215,-18.083081),(-69.081722,-18.039983),(-69.082284,-18.039078),(-69.092057,-18.023343),(-69.104175,-18.023757),(-69.119885,-18.029854),(-69.14084,-18.030785),(-69.157712,-18.02572),(-69.173887,-18.018899),(-69.204169,-18.001122),(-69.227785,-17.995541),(-69.234813,-17.992957),(-69.241893,-17.986756),(-69.262047,-17.964019),(-69.277601,-17.967533),(-69.290029,-17.976628),(-69.302406,-17.976214),(-69.317857,-17.951616),(-69.326875,-17.915133),(-69.32765,-17.841546),(-69.334239,-17.805785),(-69.359405,-17.75938),(-69.394778,-17.721139),(-69.47578,-17.65241),(-69.497123,-17.621404),(-69.506114,-17.585127),(-69.510036,-17.506588),(-69.510094,-17.505442),(-69.508337,-17.434025),(-69.511385,-17.398678),(-69.522599,-17.36912),(-69.537094,-17.351136),(-69.556938,-17.331499),(-69.597272,-17.300493),(-69.613007,-17.295119),(-69.664416,-17.288562),(-69.666492,-17.288298),(-69.649413,-17.262769),(-69.633833,-17.207269),(-69.6228,-17.185565),(-69.618356,-17.184221),(-69.601147,-17.181534),(-69.59505,-17.179674),(-69.540996,-17.132235),(-69.510094,-17.112081),(-69.482808,-17.101746),(-69.454154,-17.096578),(-69.427437,-17.086863),(-69.406017,-17.062988),(-69.401263,-17.047175),(-69.406017,-17.040871),(-69.413304,-17.03777),(-69.416559,-17.031983),(-69.413588,-17.022267),(-69.407154,-17.015653),(-69.364314,-16.991158),(-69.352455,-16.977722),(-69.325945,-16.922222),(-69.224452,-16.818249),(-69.210654,-16.797061),(-69.191663,-16.743008),(-69.182362,-16.728745),(-69.166368,-16.719133),(-69.130582,-16.715826),(-69.112056,-16.711485),(-69.053816,-16.68234),(-69.037073,-16.670247),(-69.020511,-16.649474),(-69.008341,-16.634177),(-69.035135,-16.598004),(-69.040122,-16.581364),(-69.037642,-16.550255),(-69.038882,-16.49186),(-69.036815,-16.4715),(-69.027875,-16.454137),(-69.001727,-16.422821),(-68.96837,-16.406388),(-68.855844,-16.363186),(-68.833494,-16.328976),(-68.843648,-16.302001),(-68.86667,-16.286912),(-68.91876,-16.266655),(-68.959507,-16.22335),(-68.982038,-16.210017),(-69.01015,-16.219112),(-69.042732,-16.209294),(-69.053558,-16.208364),(-69.064514,-16.212084),(-69.083892,-16.226554),(-69.095183,-16.231205),(-69.120815,-16.231205),(-69.144689,-16.223453),(-69.166264,-16.210431),(-69.184868,-16.195031),(-69.219646,-16.15276),(-69.242125,-16.098189),(-69.284578,-15.995043),(-69.327133,-15.892),(-69.369611,-15.788958),(-69.412218,-15.685811),(-69.424337,-15.656253),(-69.430021,-15.62628),(-69.421184,-15.596411),(-69.356408,-15.50143),(-69.351111,-15.481896),(-69.348527,-15.461846),(-69.343411,-15.442209),(-69.330363,-15.424225),(-69.32026,-15.418851),(-69.292923,-15.409859),(-69.285921,-15.405415),(-69.285404,-15.396733),(-69.296954,-15.366968),(-69.291166,-15.350845),(-69.275198,-15.330278),(-69.255897,-15.313328),(-69.222592,-15.302166),(-69.20913,-15.263615),(-69.189726,-15.262375),(-69.166135,-15.263925),(-69.150426,-15.251626),(-69.1481,-15.233333),(-69.171768,-15.210802),(-69.196495,-15.176592),(-69.21267,-15.161296),(-69.272201,-15.118198),(-69.288583,-15.101971),(-69.346098,-15.016498),(-69.362816,-15.001305),(-69.384313,-14.981772),(-69.390669,-14.964408),(-69.386225,-14.945805),(-69.369844,-14.908288),(-69.367751,-14.900536),(-69.371988,-14.818681),(-69.370541,-14.801524),(-69.36142,-14.787985),(-69.339045,-14.774756),(-69.283518,-14.759666),(-69.267628,-14.750675),(-69.25383,-14.721839),(-69.2475,-14.593682),(-69.234658,-14.574251),(-69.214944,-14.572288),(-69.192232,-14.576939),(-69.170399,-14.577559),(-69.164507,-14.566397),(-69.167427,-14.520301),(-69.164275,-14.503041),(-69.158203,-14.498494),(-69.14115,-14.494153),(-69.134018,-14.490742),(-69.094563,-14.446404),(-69.075133,-14.432451),(-69.01015,-14.397105),(-68.990254,-14.379018),(-68.994621,-14.358967),(-69.008315,-14.33902),(-69.01617,-14.32114),(-69.01723,-14.282486),(-69.015705,-14.263159),(-69.01015,-14.245899),(-68.984906,-14.228329),(-68.951316,-14.219958),(-68.883724,-14.211483),(-68.864448,-14.191226),(-68.868892,-14.156189),(-68.893723,-14.089216),(-68.899976,-14.0548),(-68.905764,-14.039297),(-68.916176,-14.024931),(-68.969713,-13.990514),(-68.982968,-13.972221),(-68.98904,-13.940078),(-68.989195,-13.903698),(-68.992993,-13.869798),(-69.01015,-13.844373),(-69.023095,-13.80603),(-69.024283,-13.79249),(-69.020821,-13.776367),(-69.015964,-13.764585),(-69.015964,-13.753113),(-69.027048,-13.73823),(-69.08105,-13.695442),(-69.101591,-13.666607),(-69.087587,-13.643869),(-69.074539,-13.642629),(-69.044024,-13.648003),(-69.032629,-13.645936),(-69.023844,-13.634981),(-69.023612,-13.623302),(-69.025524,-13.610693),(-69.023198,-13.596947),(-69.015395,-13.585475),(-68.994259,-13.563047),(-68.985655,-13.550231),(-68.976819,-13.526253),(-68.970747,-13.501449),(-68.974441,-13.478814),(-68.962788,-13.283581),(-68.977025,-13.204929),(-68.979661,-13.16457),(-68.972142,-13.046128),(-68.973936,-13.03176),(-68.986224,-12.93337),(-68.986585,-12.890478),(-68.980953,-12.867947),(-68.94943,-12.843866),(-68.938733,-12.819681),(-68.926615,-12.800975),(-68.904627,-12.803972),(-68.891992,-12.775757),(-68.876566,-12.754983),(-68.856206,-12.741443),(-68.77373,-12.719429),(-68.766134,-12.710541),(-68.742957,-12.665789),(-68.752982,-12.65473),(-68.785332,-12.645945),(-68.794608,-12.63654),(-68.793419,-12.62021),(-68.783885,-12.605741),(-68.770113,-12.594372),(-68.74027,-12.578559),(-68.726059,-12.56595),(-68.714535,-12.551171),(-68.706267,-12.535978),(-68.70022,-12.516031),(-68.694381,-12.506832),(-68.684252,-12.502492),(-68.689463,-12.493418),(-68.714225,-12.450298),(-68.81856,-12.269224),(-68.922868,-12.08815),(-69.027281,-11.907076),(-69.13159,-11.726001),(-69.23595,-11.544927),(-69.340336,-11.36375),(-69.444568,-11.182675),(-69.548954,-11.001705),(-69.552494,-10.995607),(-69.556111,-10.989406),(-69.559729,-10.983101),(-69.563269,-10.9769),(-69.566834,-10.970699),(-69.570503,-10.964601),(-69.574017,-10.958503),(-69.577635,-10.952302),(-69.502885,-10.955299),(-69.463378,-10.951268),(-69.39594,-10.935042),(-69.363074,-10.940106),(-69.329588,-10.949408),(-69.293518,-10.954989),(-69.236803,-10.952922),(-69.158513,-10.96212),(-69.121487,-10.970595),(-69.086889,-10.967185),(-69.071309,-10.969975),(-68.996998,-11.001705),(-68.992502,-11.002428),(-68.983382,-11.002428),(-68.978937,-11.001705),(-68.955425,-11.000464),(-68.908141,-11.013383),(-68.884034,-11.016381),(-68.858919,-11.01049),(-68.831685,-11.000361),(-68.804659,-10.994677),(-68.774557,-11.003462),(-68.757633,-11.011937),(-68.773989,-11.035088),(-68.785642,-11.059272),(-68.791171,-11.08511),(-68.787011,-11.126038),(-68.783988,-11.13534),(-68.775926,-11.140611),(-68.758331,-11.141128),(-68.61573,-11.112499),(-68.588031,-11.09865),(-68.536096,-11.061546),(-68.493308,-11.047387),(-68.476565,-11.044803),(-68.459667,-11.044803),(-68.442407,-11.047697),(-68.428196,-11.043666),(-68.396415,-11.014417),(-68.378276,-11.005012),(-68.331147,-11.000464),(-68.313836,-10.993436),(-68.29332,-10.978967),(-68.274355,-10.960053),(-68.257509,-10.938763),(-68.243763,-10.916955),(-68.217563,-10.858044),(-68.203558,-10.838924),(-68.147283,-10.779599),(-68.112091,-10.714074),(-68.09788,-10.697744),(-68.074574,-10.681724),(-68.043775,-10.666945),(-68.027135,-10.661777),(-68.010237,-10.65971),(-67.981815,-10.664361),(-67.862649,-10.65878),(-67.847766,-10.66095),(-67.833348,-10.664981),(-67.81428,-10.675936),(-67.774954,-10.706529),(-67.755782,-10.714177),(-67.721727,-10.705495),(-67.705139,-10.67666),(-67.696044,-10.640486),(-67.684675,-10.610514),(-67.673823,-10.599352),(-67.643489,-10.574547),(-67.630828,-10.559561),(-67.61114,-10.528762),(-67.599978,-10.515429),(-67.58463,-10.501787),(-67.565096,-10.495896),(-67.529336,-10.478532),(-67.488201,-10.464786),(-67.468048,-10.452281),(-67.450529,-10.435951),(-67.436628,-10.417451),(-67.432236,-10.406082),(-67.431874,-10.397917),(-67.42929,-10.390372),(-67.418335,-10.381484),(-67.409188,-10.378797),(-67.365005,-10.378073),(-67.353481,-10.376213),(-67.342836,-10.372492),(-67.335291,-10.366291),(-67.333689,-10.356679),(-67.339425,-10.334872),(-67.337823,-10.326087),(-67.323509,-10.318852),(-67.300668,-10.315132),(-67.259172,-10.313685),(-67.241033,-10.316372),(-67.201759,-10.32681),(-67.184706,-10.326707),(-67.172303,-10.319576),(-67.164862,-10.308517),(-67.159074,-10.297148),(-67.151736,-10.288983),(-67.141763,-10.285573),(-67.12073,-10.284539),(-67.110033,-10.282575),(-67.0643,-10.256944),(-66.902656,-10.09313),(-66.770623,-9.992567),(-66.751606,-9.982645),(-66.670009,-9.951536),(-66.660087,-9.945335),(-66.654816,-9.93717),(-66.65249,-9.926111),(-66.648925,-9.915879),(-66.648904,-9.915854),(-66.64262,-9.907921),(-66.631871,-9.904304),(-66.513842,-9.883943),(-66.452864,-9.888698),(-66.43271,-9.886114),(-66.41328,-9.879189),(-66.371732,-9.855935),(-66.355273,-9.84963),(-66.257321,-9.834851),(-66.238975,-9.828133),(-66.20797,-9.808082),(-66.190658,-9.800848),(-66.135467,-9.795163),(-66.131695,-9.797024),(-66.127923,-9.801158),(-66.123582,-9.805085),(-66.118182,-9.806015),(-66.113117,-9.802398),(-66.106064,-9.790409),(-66.101981,-9.787412),(-66.086995,-9.784518),(-66.081724,-9.785655),(-66.069322,-9.790099),(-66.042786,-9.804878),(-66.029479,-9.808289),(-66.010385,-9.804052),(-65.965659,-9.776766),(-65.946952,-9.771392),(-65.92933,-9.770255),(-65.915274,-9.771702),(-65.874424,-9.781314),(-65.862461,-9.781831),(-65.85042,-9.77532),(-65.834065,-9.758266),(-65.831662,-9.765294),(-65.827398,-9.773976),(-65.822127,-9.781831),(-65.816521,-9.785965),(-65.806418,-9.784415),(-65.803705,-9.775526),(-65.803886,-9.764778),(-65.802645,-9.757336),(-65.794506,-9.737699),(-65.788564,-9.733048),(-65.782207,-9.746277),(-65.779959,-9.755993),(-65.77735,-9.763434),(-65.772441,-9.768808),(-65.76319,-9.772322),(-65.725493,-9.756819),(-65.709964,-9.755993),(-65.713736,-9.77873),(-65.717302,-9.791236),(-65.713116,-9.794233),(-65.705054,-9.793303),(-65.69707,-9.794336),(-65.694357,-9.793716),(-65.683609,-9.789892),(-65.678958,-9.789376),(-65.672628,-9.792579),(-65.663713,-9.802915),(-65.658494,-9.807359),(-65.628883,-9.826893),(-65.614388,-9.833921),(-65.596121,-9.837951),(-65.583977,-9.837228),(-65.579377,-9.832784),(-65.577052,-9.826169),(-65.571884,-9.818831),(-65.570618,-9.815834),(-65.569921,-9.806015),(-65.567983,-9.802088),(-65.562815,-9.799194),(-65.5508,-9.797024),(-65.546821,-9.795163),(-65.535323,-9.782451),(-65.525427,-9.767878),(-65.521396,-9.758576),(-65.517133,-9.743177),(-65.510777,-9.734082),(-65.465224,-9.696461),(-65.45184,-9.681372),(-65.442487,-9.679821),(-65.416235,-9.680132),(-65.397993,-9.686746),(-65.370501,-9.710621),(-65.356058,-9.741626),(-65.353732,-9.745037),(-65.340064,-9.789686),(-65.330323,-9.800744),(-65.316603,-9.812527),(-65.304381,-9.825652),(-65.29911,-9.841259),(-65.30358,-9.864513),(-65.325233,-9.905131),(-65.333294,-9.926835),(-65.336834,-9.967246),(-65.332932,-10.00838),(-65.324148,-10.046414),(-65.30557,-10.098401),(-65.301462,-10.119691),(-65.29911,-10.162996),(-65.296811,-10.173331),(-65.286837,-10.196482),(-65.284822,-10.206818),(-65.288077,-10.216223),(-65.305363,-10.242164),(-65.315621,-10.291257),(-65.327817,-10.314408),(-65.365024,-10.332185),(-65.379235,-10.351408),(-65.39019,-10.374043),(-65.394646,-10.39207),(-65.394738,-10.392439),(-65.393084,-10.400191),(-65.39143,-10.403498),(-65.38727,-10.406702),(-65.410938,-10.44918),(-65.425382,-10.463133),(-65.44998,-10.468094),(-65.44998,-10.474915),(-65.437913,-10.492588),(-65.435691,-10.499203),(-65.436725,-10.504061),(-65.441479,-10.513362),(-65.442487,-10.519357),(-65.441634,-10.527832),(-65.439308,-10.538167),(-65.435898,-10.546952),(-65.431996,-10.550673),(-65.429232,-10.561421),(-65.435639,-10.610824),(-65.435691,-10.62581),(-65.418612,-10.644517),(-65.400784,-10.655473),(-65.386753,-10.669529),(-65.381069,-10.698054),(-65.382258,-10.715624),(-65.389777,-10.753761),(-65.404737,-10.799236),(-65.399698,-10.812259),(-65.360295,-10.822594),(-65.342183,-10.834893),(-65.327119,-10.850499),(-65.31898,-10.865382),(-65.312779,-10.950958),(-65.310117,-10.956539),(-65.30451,-10.962017),(-65.299601,-10.969665),(-65.29911,-10.982068),(-65.302986,-10.990749),(-65.309652,-10.99664),(-65.317843,-11.002015),(-65.326447,-11.009353),(-65.341976,-11.032814),(-65.342699,-11.050591),(-65.337041,-11.067747),(-65.333294,-11.088521),(-65.341046,-11.106608),(-65.379674,-11.136373),(-65.394738,-11.153427),(-65.398148,-11.178025),(-65.385203,-11.193631),(-65.368331,-11.205413),(-65.360011,-11.218849),(-65.366057,-11.234042),(-65.378614,-11.242),(-65.388614,-11.253162),(-65.38727,-11.277553),(-65.37448,-11.295847),(-65.353913,-11.310626),(-65.334819,-11.321168),(-65.326447,-11.327783),(-65.330064,-11.340495),(-65.347505,-11.360752),(-65.353732,-11.372431),(-65.354766,-11.382353),(-65.353009,-11.390621),(-65.319548,-11.476404),(-65.29247,-11.504723)]
+Barbados	[(-59.42691,13.160386),(-59.430043,13.125922),(-59.455719,13.100043),(-59.475779,13.086493),(-59.487538,13.078559),(-59.50886,13.057318),(-59.516713,13.056383),(-59.523101,13.056464),(-59.529286,13.055406),(-59.536122,13.051174),(-59.545969,13.067694),(-59.564443,13.07803),(-59.586903,13.083197),(-59.60025,13.084133),(-59.608144,13.084662),(-59.621571,13.09398),(-59.633127,13.115912),(-59.646067,13.160386),(-59.654205,13.295111),(-59.652211,13.310614),(-59.645131,13.323717),(-59.63093,13.337958),(-59.612864,13.34455),(-59.594472,13.334784),(-59.580719,13.314521),(-59.575917,13.304389),(-59.568959,13.289659),(-59.549794,13.249172),(-59.53661,13.231391),(-59.518056,13.217515),(-59.491811,13.197943),(-59.476674,13.189399),(-59.457102,13.183173),(-59.438629,13.174872),(-59.42691,13.160386)]
+Bhutan	[(90.261804,28.335354),(90.261804,28.299141),(90.29147,28.261351),(90.329504,28.255796),(90.353984,28.299141),(90.386905,28.299141),(90.416535,28.28268),(90.45604,28.28268),(90.505422,28.249758),(90.54822,28.246466),(90.587726,28.233298),(90.597602,28.200376),(90.567973,28.1905),(90.54822,28.157579),(90.515299,28.154287),(90.485669,28.124657),(90.475232,28.072344),(90.492595,28.074412),(90.510061,28.074101),(90.575277,28.065833),(90.597395,28.070587),(90.621889,28.072965),(90.651035,28.086995),(90.667468,28.090328),(90.683901,28.087072),(90.726896,28.061699),(90.755278,28.055173),(90.788701,28.047488),(90.850919,28.044026),(90.90952,28.032657),(90.960577,27.994726),(90.975149,27.982092),(91.008842,27.96677),(91.051941,27.96279),(91.092558,27.971679),(91.11943,27.994726),(91.11943,27.994778),(91.119637,27.994881),(91.133796,28.014105),(91.175861,28.057487),(91.194671,28.070587),(91.220612,28.074877),(91.246141,28.071466),(91.269705,28.072861),(91.290169,28.091413),(91.309599,28.056402),(91.341432,28.030564),(91.418843,27.994726),(91.436483,27.989375),(91.446438,27.986355),(91.460908,27.984365),(91.497495,27.984081),(91.537492,27.969353),(91.578627,27.964702),(91.600641,27.959276),(91.621725,27.950724),(91.637951,27.939743),(91.652834,27.916747),(91.648907,27.897213),(91.637124,27.87724),(91.628339,27.852694),(91.627306,27.829827),(91.632887,27.759444),(91.626686,27.716423),(91.579867,27.657977),(91.573252,27.619711),(91.59506,27.546382),(91.604465,27.532145),(91.632887,27.511655),(91.641672,27.494964),(91.657382,27.479151),(91.680223,27.472846),(91.704924,27.468764),(91.727041,27.460005),(91.727092,27.459942),(91.743681,27.439153),(91.744818,27.423754),(91.750089,27.416157),(91.779648,27.418844),(91.857369,27.443081),(91.884345,27.447163),(91.920931,27.445148),(91.933747,27.449127),(91.963306,27.468919),(91.975088,27.472433),(91.997309,27.448662),(92.084849,27.304226),(92.088776,27.29234),(92.081852,27.275132),(92.050639,27.251413),(92.03679,27.236478),(92.033173,27.227435),(92.029969,27.20847),(92.027075,27.19984),(92.021494,27.19183),(92.008471,27.179479),(92.005788,27.176112),(92.002994,27.172606),(91.995862,27.158033),(91.990798,27.140773),(91.987904,27.122273),(91.987697,27.104031),(91.999893,27.071527),(92.049709,27.026827),(92.066969,26.994943),(92.066969,26.994839),(92.083919,26.937323),(92.080371,26.921571),(92.072757,26.887766),(92.03586,26.854848),(91.975088,26.846631),(91.957415,26.854279),(91.925686,26.878671),(91.908219,26.885182),(91.89313,26.881358),(91.895507,26.868284),(91.895507,26.853504),(91.874009,26.844306),(91.885895,26.83087),(91.886928,26.814437),(91.87866,26.803016),(91.863054,26.804773),(91.852408,26.818519),(91.849515,26.834746),(91.843934,26.84937),(91.825123,26.858465),(91.795254,26.853504),(91.731589,26.816194),(91.702133,26.803481),(91.653764,26.797952),(91.637951,26.798985),(91.593716,26.810768),(91.57563,26.810148),(91.539353,26.79883),(91.520646,26.79759),(91.507417,26.808029),(91.484472,26.852729),(91.475067,26.865545),(91.460598,26.869369),(91.420187,26.871539),(91.406338,26.869524),(91.388457,26.858465),(91.378122,26.842807),(91.370061,26.824669),(91.358382,26.806169),(91.345566,26.794696),(91.330063,26.785498),(91.313217,26.778677),(91.296577,26.774594),(91.27601,26.774077),(91.261954,26.779038),(91.232498,26.795161),(91.198185,26.802344),(91.127078,26.800898),(91.091938,26.804773),(91.062069,26.804567),(91.012781,26.784348),(91.007395,26.782139),(90.944493,26.77887),(90.717077,26.767049),(90.587783,26.780072),(90.475232,26.83242),(90.382627,26.891796),(90.348831,26.896654),(90.328574,26.890659),(90.314208,26.880376),(90.300875,26.868284),(90.284442,26.85707),(90.265994,26.851592),(90.229148,26.852884),(90.210907,26.851489),(90.17742,26.832058),(90.152202,26.771752),(90.127191,26.751392),(90.089157,26.741728),(89.975262,26.731858),(89.912113,26.716717),(89.890409,26.714856),(89.880281,26.716252),(89.85992,26.721884),(89.858701,26.722057),(89.850774,26.723176),(89.847001,26.72483),(89.839043,26.731238),(89.834961,26.731548),(89.829741,26.72762),(89.827674,26.722453),(89.827261,26.717905),(89.826744,26.715683),(89.826796,26.713513),(89.825245,26.707673),(89.822093,26.701007),(89.817287,26.696201),(89.81367,26.696149),(89.804058,26.699767),(89.800079,26.70049),(89.760288,26.70018),(89.75467,26.700989),(89.738739,26.703281),(89.685151,26.724571),(89.66324,26.725502),(89.628307,26.712531),(89.609806,26.712221),(89.597507,26.720954),(89.613475,26.748549),(89.611357,26.765964),(89.586087,26.784051),(89.546503,26.797539),(89.50542,26.803688),(89.442891,26.797022),(89.407338,26.813403),(89.368895,26.837359),(89.341657,26.854331),(89.300161,26.844409),(89.286364,26.844978),(89.273599,26.843892),(89.262954,26.836348),(89.252619,26.826787),(89.240837,26.819759),(89.212828,26.813041),(89.184613,26.810561),(89.128079,26.813455),(89.096504,26.821413),(89.082448,26.836037),(89.074335,26.856398),(89.060693,26.881461),(89.04488,26.897119),(89.021574,26.912674),(88.996614,26.922751),(88.975323,26.921717),(88.965815,26.915464),(88.954549,26.912622),(88.942767,26.913707),(88.932328,26.919237),(88.9253,26.929365),(88.925404,26.939029),(88.926954,26.949416),(88.924474,26.961663),(88.906645,26.981093),(88.88644,26.978975),(88.867113,26.964247),(88.851713,26.945437),(88.845615,26.994839),(88.845615,26.994943),(88.845615,27.049565),(88.840809,27.075248),(88.827632,27.097882),(88.805256,27.113023),(88.742572,27.142737),(88.733082,27.148972),(88.730067,27.150954),(88.738438,27.179789),(88.754355,27.212604),(88.775852,27.240871),(88.801174,27.256425),(88.861428,27.270378),(88.876116,27.280486),(88.884631,27.286346),(88.892331,27.315543),(88.91516,27.330869),(88.950808,27.328229),(88.971933,27.312385),(88.997019,27.330869),(88.981175,27.354635),(88.964011,27.392924),(88.95106,27.433144),(88.957549,27.456939),(88.966202,27.47803),(88.982966,27.492632),(88.980046,27.49798),(88.97521,27.506839),(88.972955,27.517659),(88.978366,27.530283),(88.992793,27.537497),(89.004966,27.54967),(89.002712,27.560491),(89.016238,27.57582),(89.03337,27.578976),(89.039682,27.594305),(89.050954,27.608282),(89.064029,27.615946),(89.091531,27.625865),(89.102351,27.623611),(89.105865,27.622952),(89.109565,27.622258),(89.119484,27.618201),(89.124655,27.614852),(89.127359,27.62729),(89.156021,27.665686),(89.198203,27.730582),(89.21659,27.771142),(89.22492,27.807813),(89.258717,27.827553),(89.299489,27.844245),(89.336025,27.869075),(89.370131,27.909357),(89.417364,27.988654),(89.420981,27.994726),(89.421187,27.994726),(89.444545,28.031184),(89.458808,28.047798),(89.475344,28.061337),(89.495343,28.068004),(89.515032,28.081905),(89.561489,28.13464),(89.579421,28.14464),(89.597817,28.149807),(89.71781,28.169083),(89.755844,28.184379),(89.773621,28.212775),(89.780855,28.228769),(89.796048,28.24019),(89.829741,28.259155),(89.83863,28.267914),(89.854029,28.287267),(89.862918,28.295793),(89.873615,28.300599),(89.881314,28.297525),(89.91613,28.315601),(89.952524,28.308247),(89.971593,28.31804),(89.990455,28.320624),(90.07086,28.34523),(90.123535,28.335354),(90.153164,28.322185),(90.176209,28.325478),(90.199254,28.348523),(90.225591,28.358399),(90.261804,28.335354)]
+Botswana	[(25.259781,-17.794107),(25.21937,-17.879786),(25.21937,-17.908001),(25.226088,-17.931876),(25.255026,-18.001122),(25.296368,-18.068612),(25.323446,-18.09662),(25.357449,-18.115844),(25.387525,-18.138995),(25.408816,-18.175995),(25.440855,-18.2532),(25.473204,-18.303429),(25.481163,-18.323377),(25.490516,-18.365545),(25.49558,-18.378877),(25.508499,-18.399134),(25.574439,-18.465693),(25.608442,-18.487708),(25.622084,-18.501143),(25.669523,-18.566049),(25.698255,-18.590234),(25.736909,-18.608734),(25.761921,-18.630335),(25.773393,-18.665578),(25.779491,-18.738752),(25.815251,-18.813993),(25.940721,-18.921273),(25.967449,-18.999925),(25.9678,-19.000958),(25.964389,-19.021629),(25.948059,-19.058732),(25.944855,-19.079196),(25.948576,-19.103277),(25.956534,-19.122088),(25.981132,-19.161775),(26.011414,-19.199809),(26.034359,-19.243734),(26.13027,-19.501082),(26.155488,-19.537153),(26.194452,-19.5602),(26.239101,-19.571466),(26.292638,-19.572499),(26.30349,-19.577254),(26.313205,-19.584178),(26.32106,-19.592033),(26.330981,-19.604952),(26.333462,-19.613014),(26.326331,-19.633891),(26.319096,-19.646293),(26.312481,-19.649601),(26.312171,-19.651358),(26.324367,-19.659109),(26.332325,-19.662416),(26.362711,-19.667584),(26.385242,-19.679056),(26.412837,-19.71957),(26.431854,-19.73652),(26.450251,-19.743342),(26.489731,-19.75192),(26.508852,-19.759258),(26.549263,-19.784063),(26.566316,-19.800806),(26.574791,-19.819513),(26.581922,-19.842147),(26.595565,-19.855583),(26.614065,-19.863438),(26.659437,-19.875737),(26.673803,-19.883385),(26.67717,-19.886815),(26.684758,-19.894547),(26.698608,-19.91253),(26.713904,-19.927413),(26.730957,-19.935888),(26.750801,-19.939609),(26.774469,-19.939815),(26.811882,-19.94643),(26.925054,-20.000897),(26.961072,-20.007201),(26.9943,-20.006788),(27.02665,-20.010095),(27.060136,-20.027562),(27.069231,-20.03738),(27.086491,-20.060532),(27.097343,-20.068903),(27.109642,-20.073244),(27.119771,-20.073864),(27.129692,-20.072934),(27.141888,-20.073347),(27.16292,-20.076551),(27.183746,-20.082339),(27.201781,-20.092984),(27.214907,-20.110451),(27.266015,-20.234164),(27.283998,-20.35147),(27.268392,-20.49575),(27.306012,-20.477354),(27.340739,-20.473013),(27.45391,-20.473323),(27.534112,-20.483038),(27.590853,-20.473323),(27.625786,-20.488619),(27.66599,-20.489136),(27.683767,-20.49606),(27.698133,-20.509083),(27.705575,-20.526653),(27.702629,-20.566134),(27.690382,-20.60148),(27.682475,-20.637344),(27.707332,-20.716719),(27.709605,-20.756716),(27.694412,-20.837745),(27.689038,-20.849011),(27.681803,-20.857589),(27.676016,-20.866684),(27.674775,-20.879913),(27.675085,-20.891282),(27.672605,-20.913709),(27.672657,-20.923528),(27.680356,-20.979649),(27.678961,-21.000733),(27.666817,-21.053753),(27.666611,-21.071219),(27.674775,-21.090133),(27.709192,-21.134471),(27.724385,-21.149664),(27.793838,-21.197413),(27.823604,-21.231726),(27.849132,-21.269657),(27.884995,-21.310171),(27.8944,-21.32433),(27.896674,-21.332392),(27.896157,-21.347895),(27.897811,-21.35544),(27.904219,-21.364741),(27.920549,-21.381174),(27.950211,-21.438329),(27.953001,-21.448664),(27.949642,-21.456519),(27.941943,-21.468508),(27.939876,-21.478016),(27.943338,-21.479876),(27.950418,-21.482047),(27.954448,-21.487835),(27.949281,-21.500754),(27.953208,-21.510469),(27.958066,-21.511502),(27.963698,-21.510469),(27.970571,-21.514396),(27.975739,-21.522561),(27.984731,-21.542922),(27.990415,-21.551913),(28.002559,-21.564212),(28.016563,-21.572894),(28.032893,-21.577855),(28.090771,-21.581266),(28.165702,-21.595218),(28.284867,-21.596872),(28.321919,-21.603486),(28.361762,-21.616302),(28.443101,-21.655783),(28.464598,-21.660331),(28.481393,-21.657437),(28.497309,-21.651546),(28.532501,-21.643071),(28.542939,-21.638316),(28.553998,-21.636559),(28.585934,-21.644414),(28.6157,-21.647101),(28.629704,-21.651339),(28.66841,-21.679968),(28.714195,-21.693507),(28.860853,-21.757379),(28.891032,-21.764924),(28.951907,-21.768334),(28.980846,-21.774845),(28.998726,-21.786008),(29.038723,-21.797893),(29.05526,-21.809985),(29.057637,-21.829209),(29.045441,-21.852567),(29.028905,-21.876648),(29.017949,-21.898145),(29.013815,-21.940417),(29.021567,-21.982791),(29.040532,-22.020929),(29.070763,-22.051004),(29.10797,-22.069194),(29.144867,-22.075292),(29.239331,-22.072605),(29.244395,-22.075706),(29.254111,-22.087074),(29.259588,-22.096066),(29.26734,-22.115807),(29.273644,-22.125108),(29.350074,-22.186707),(29.331522,-22.192804),(29.302893,-22.190221),(29.248219,-22.179265),(29.222071,-22.182159),(29.202796,-22.194458),(29.186621,-22.207687),(29.168844,-22.213992),(29.047818,-22.220296),(29.038723,-22.223914),(29.017846,-22.250372),(29.018053,-22.255023),(29.002756,-22.263394),(28.983739,-22.281998),(28.960227,-22.310213),(28.967926,-22.38039),(28.963379,-22.392172),(28.953457,-22.40075),(28.930409,-22.440851),(28.912529,-22.453667),(28.86938,-22.448913),(28.84659,-22.449946),(28.836772,-22.463176),(28.831191,-22.482296),(28.816825,-22.492941),(28.796774,-22.498212),(28.77476,-22.501416),(28.731352,-22.513922),(28.659005,-22.551956),(28.623865,-22.562808),(28.5972,-22.562704),(28.577563,-22.560017),(28.559838,-22.563014),(28.538495,-22.580274),(28.522476,-22.584822),(28.459379,-22.569629),(28.376851,-22.575003),(28.338559,-22.584615),(28.301817,-22.603839),(28.286831,-22.615828),(28.250554,-22.655619),(28.240684,-22.66089),(28.216344,-22.663163),(28.205492,-22.665954),(28.196191,-22.671638),(28.164668,-22.708639),(28.159707,-22.718147),(28.157743,-22.731066),(28.159707,-22.743262),(28.162704,-22.751013),(28.162498,-22.758971),(28.154953,-22.771994),(28.145858,-22.779745),(28.135626,-22.783363),(28.125601,-22.785533),(28.117436,-22.789461),(28.113198,-22.795352),(28.107721,-22.810648),(28.10369,-22.816746),(28.088807,-22.822637),(28.065759,-22.828838),(28.047156,-22.8369),(28.045399,-22.847752),(28.053977,-22.869146),(28.04974,-22.891366),(28.037441,-22.911417),(28.021834,-22.92661),(28.008295,-22.934775),(27.989382,-22.943766),(27.968401,-22.951001),(27.949177,-22.953895),(27.937498,-22.963817),(27.937912,-22.986658),(27.946077,-23.029032),(27.930057,-23.057041),(27.895537,-23.079469),(27.853783,-23.095592),(27.815749,-23.104687),(27.82226,-23.12298),(27.806447,-23.128355),(27.78495,-23.127011),(27.774201,-23.125151),(27.77172,-23.133005),(27.774614,-23.140757),(27.779058,-23.147682),(27.781022,-23.152539),(27.783038,-23.155433),(27.787378,-23.159774),(27.78929,-23.163805),(27.784588,-23.165562),(27.783296,-23.166905),(27.775751,-23.172486),(27.774201,-23.173003),(27.759421,-23.21145),(27.753634,-23.220752),(27.739164,-23.227573),(27.725728,-23.221682),(27.698443,-23.193467),(27.658756,-23.223439),(27.647129,-23.227573),(27.633434,-23.223439),(27.619172,-23.217031),(27.608009,-23.216721),(27.599224,-23.244627),(27.580414,-23.26385),(27.576073,-23.279146),(27.575247,-23.284831),(27.573076,-23.290515),(27.569614,-23.294856),(27.565893,-23.29651),(27.563309,-23.299197),(27.564911,-23.305811),(27.567754,-23.31377),(27.569356,-23.320384),(27.563671,-23.342812),(27.548892,-23.360795),(27.528841,-23.373094),(27.50724,-23.379089),(27.465693,-23.380432),(27.45267,-23.38529),(27.443162,-23.395108),(27.434997,-23.406581),(27.425178,-23.412678),(27.411122,-23.405754),(27.41846,-23.391284),(27.410502,-23.389321),(27.395826,-23.394075),(27.383734,-23.399553),(27.38084,-23.40534),(27.371331,-23.417019),(27.361203,-23.422497),(27.349989,-23.391491),(27.335571,-23.402446),(27.312007,-23.43707),(27.295574,-23.451746),(27.278107,-23.463631),(27.239712,-23.481408),(27.202505,-23.492053),(27.191497,-23.503836),(27.205657,-23.523059),(27.195632,-23.52709),(27.18664,-23.527297),(27.178682,-23.523576),(27.171447,-23.515618),(27.168967,-23.521612),(27.161525,-23.52988),(27.157184,-23.536702),(27.149123,-23.527503),(27.137651,-23.523369),(27.127419,-23.525023),(27.123078,-23.532981),(27.127419,-23.54528),(27.135687,-23.551895),(27.141165,-23.558303),(27.13672,-23.570188),(27.124421,-23.56316),(27.113363,-23.564297),(27.103751,-23.571738),(27.095793,-23.583831),(27.102511,-23.583831),(27.084114,-23.596026),(27.078326,-23.602021),(27.075225,-23.611219),(27.068404,-23.607292),(27.061531,-23.604398),(27.063133,-23.624242),(27.069438,-23.641708),(27.070058,-23.656074),(27.054762,-23.66641),(27.037605,-23.665686),(27.029854,-23.654731),(27.024273,-23.642535),(27.013834,-23.638504),(27.00417,-23.645842),(26.986549,-23.686977),(26.96717,-23.718706),(26.962054,-23.737413),(26.964542,-23.74714),(26.966602,-23.75519),(26.938128,-23.802887),(26.945001,-23.823248),(26.941177,-23.850223),(26.870897,-24.11584),(26.868933,-24.160385),(26.84971,-24.248131),(26.839168,-24.265598),(26.823251,-24.278827),(26.802271,-24.289679),(26.714007,-24.315931),(26.692923,-24.326576),(26.684087,-24.341459),(26.62347,-24.39944),(26.558358,-24.438197),(26.531176,-24.458661),(26.506061,-24.48884),(26.476812,-24.559947),(26.469474,-24.571419),(26.404362,-24.632811),(26.404001,-24.632758),(26.381624,-24.629503),(26.363538,-24.628056),(26.344521,-24.624026),(26.32571,-24.622372),(26.278788,-24.62847),(26.165911,-24.660846),(26.013585,-24.704537),(25.981132,-24.726345),(25.966043,-24.73358),(25.914676,-24.731823),(25.881707,-24.742158),(25.874058,-24.743398),(25.868374,-24.748152),(25.866927,-24.772647),(25.877262,-24.845717),(25.876746,-24.886025),(25.866204,-24.918168),(25.837058,-24.979146),(25.835198,-25.016353),(25.804915,-25.064826),(25.782901,-25.131385),(25.695465,-25.309979),(25.663529,-25.439996),(25.652838,-25.463319),(25.608855,-25.559266),(25.587254,-25.61952),(25.458425,-25.711194),(25.386491,-25.743544),(25.177822,-25.763284),(25.135964,-25.756566),(25.090282,-25.743647),(25.051731,-25.737859),(25.013284,-25.743027),(24.967912,-25.762871),(24.908381,-25.804109),(24.888537,-25.811653),(24.828903,-25.826019),(24.79862,-25.829223),(24.770715,-25.822609),(24.737952,-25.815891),(24.664985,-25.823332),(24.629638,-25.816098),(24.576722,-25.783335),(24.500851,-25.757848),(24.456729,-25.743027),(24.436782,-25.745301),(24.416731,-25.753052),(24.38924,-25.75946),(24.338907,-25.751812),(24.296739,-25.723493),(24.227699,-25.648976),(24.183464,-25.625928),(24.130961,-25.626238),(24.027091,-25.651766),(24.005697,-25.65466),(24.00425,-25.649906),(24.009624,-25.641328),(24.008694,-25.633163),(23.998256,-25.625308),(23.988024,-25.61952),(23.976448,-25.617557),(23.924772,-25.629236),(23.905755,-25.618487),(23.890665,-25.59885),(23.845397,-25.569084),(23.807466,-25.523609),(23.798578,-25.518545),(23.778321,-25.51255),(23.769019,-25.507383),(23.762301,-25.498494),(23.752069,-25.477617),(23.742664,-25.469969),(23.68675,-25.454362),(23.674244,-25.44258),(23.6667,-25.432658),(23.561073,-25.357314),(23.535855,-25.343258),(23.506606,-25.330959),(23.496581,-25.324241),(23.483455,-25.311529),(23.468159,-25.290238),(23.45927,-25.282177),(23.444904,-25.278146),(23.431985,-25.280316),(23.399222,-25.291375),(23.381446,-25.292615),(23.365943,-25.289308),(23.320364,-25.273392),(23.265691,-25.263987),(23.216081,-25.26719),(23.168539,-25.280006),(23.093401,-25.312459),(23.083893,-25.319694),(23.071697,-25.325998),(23.065496,-25.320831),(23.061155,-25.310702),(23.054541,-25.302537),(23.030666,-25.299437),(23.006998,-25.310805),(22.968034,-25.346876),(22.962557,-25.355764),(22.960283,-25.364342),(22.956149,-25.372094),(22.94478,-25.378708),(22.930931,-25.384289),(22.920492,-25.39049),(22.911914,-25.399069),(22.903645,-25.411368),(22.887626,-25.450228),(22.876774,-25.462011),(22.851349,-25.471312),(22.844631,-25.481131),(22.824684,-25.543039),(22.816829,-25.558439),(22.814039,-25.566604),(22.813418,-25.575079),(22.819206,-25.584897),(22.828715,-25.595542),(22.833366,-25.606084),(22.824374,-25.6158),(22.810835,-25.625308),(22.809594,-25.633266),(22.813418,-25.641948),(22.814969,-25.6528),(22.812798,-25.667063),(22.810214,-25.677398),(22.804427,-25.687216),(22.759778,-25.734862),(22.746446,-25.755326),(22.740451,-25.77703),(22.741175,-25.790879),(22.744999,-25.794083),(22.75089,-25.796047),(22.757918,-25.805969),(22.764119,-25.820335),(22.765463,-25.826536),(22.754714,-25.843383),(22.739521,-25.858472),(22.719471,-25.874285),(22.708825,-25.891028),(22.721641,-25.909012),(22.726809,-25.921621),(22.727222,-25.943945),(22.724225,-25.967509),(22.719367,-25.984253),(22.710479,-25.996862),(22.70066,-26.00327),(22.672238,-26.012881),(22.661593,-26.020943),(22.66211,-26.029831),(22.665831,-26.039856),(22.665004,-26.051432),(22.623249,-26.10931),(22.620863,-26.111532),(22.611157,-26.120575),(22.59152,-26.133184),(22.580254,-26.146517),(22.563821,-26.18114),(22.545114,-26.207391),(22.527958,-26.213696),(22.482586,-26.204808),(22.450857,-26.210079),(22.428842,-26.226512),(22.395046,-26.271884),(22.342853,-26.317359),(22.318772,-26.328831),(22.303165,-26.333585),(22.257277,-26.340923),(22.248285,-26.346918),(22.237743,-26.366762),(22.197435,-26.404072),(22.178315,-26.439935),(22.146172,-26.519207),(22.108138,-26.571917),(22.057702,-26.617599),(21.998998,-26.650258),(21.935849,-26.663901),(21.838801,-26.664521),(21.807278,-26.669585),(21.780613,-26.678164),(21.768728,-26.688706),(21.767487,-26.704312),(21.776479,-26.749167),(21.777513,-26.768494),(21.773379,-26.786788),(21.76232,-26.804461),(21.74382,-26.820481),(21.687182,-26.855207),(21.664548,-26.863062),(21.643361,-26.862752),(21.583933,-26.848386),(21.498667,-26.846422),(21.449471,-26.826372),(21.42663,-26.822651),(21.380844,-26.823995),(21.296922,-26.844459),(21.282866,-26.844975),(21.254857,-26.841771),(21.240595,-26.841978),(21.153468,-26.864509),(21.122462,-26.865336),(20.990377,-26.838567),(20.950173,-26.816036),(20.907695,-26.800017),(20.851884,-26.806528),(20.826046,-26.818827),(20.779434,-26.848076),(20.714942,-26.875051),(20.693548,-26.889004),(20.690757,-26.891794),(20.685693,-26.881769),(20.675461,-26.85004),(20.665643,-26.839084),(20.650553,-26.829679),(20.644869,-26.824511),(20.638667,-26.816967),(20.624818,-26.789371),(20.61469,-26.753198),(20.609212,-26.716198),(20.608902,-26.686122),(20.630709,-26.618322),(20.632363,-26.595275),(20.627712,-26.580805),(20.611486,-26.559928),(20.605284,-26.547732),(20.602287,-26.522204),(20.605284,-26.493265),(20.618204,-26.439729),(20.622544,-26.427533),(20.652103,-26.407793),(20.665953,-26.391773),(20.695512,-26.341957),(20.753286,-26.276224),(20.77623,-26.240568),(20.79473,-26.201914),(20.837932,-26.146827),(20.841446,-26.131324),(20.803929,-26.071276),(20.800518,-26.052466),(20.802792,-25.980532),(20.79411,-25.893922),(20.767135,-25.834391),(20.766928,-25.83067),(20.755766,-25.818991),(20.749978,-25.818475),(20.740057,-25.823126),(20.726517,-25.827363),(20.727137,-25.818165),(20.737783,-25.798941),(20.716699,-25.732588),(20.70688,-25.714812),(20.696545,-25.70706),(20.671017,-25.695485),(20.662852,-25.685253),(20.662749,-25.674918),(20.67143,-25.653317),(20.67081,-25.642258),(20.663059,-25.636264),(20.65138,-25.63461),(20.641045,-25.631199),(20.637944,-25.620347),(20.643318,-25.613216),(20.665229,-25.60102),(20.67143,-25.591202),(20.663369,-25.564743),(20.618514,-25.528466),(20.620374,-25.500561),(20.626885,-25.484748),(20.656547,-25.467798),(20.643525,-25.45736),(20.63443,-25.45767),(20.625645,-25.462734),(20.61655,-25.466145),(20.606628,-25.462011),(20.605905,-25.451779),(20.611382,-25.439376),(20.612002,-25.431005),(20.596913,-25.432865),(20.593606,-25.413228),(20.588025,-25.40403),(20.558776,-25.392041),(20.542239,-25.382222),(20.535831,-25.371163),(20.529217,-25.340054),(20.525083,-25.332199),(20.514644,-25.31928),(20.51051,-25.312252),(20.510407,-25.304708),(20.514851,-25.299126),(20.518571,-25.293029),(20.516401,-25.283624),(20.50989,-25.277526),(20.491803,-25.269051),(20.485498,-25.26316),(20.483535,-25.256648),(20.481674,-25.2305),(20.462451,-25.223679),(20.443847,-25.213344),(20.434442,-25.199804),(20.443227,-25.183061),(20.444777,-25.168385),(20.433925,-25.146784),(20.406847,-25.10782),(20.375531,-25.046119),(20.364886,-25.0332),(20.235695,-24.936048),(20.159317,-24.893673),(20.149085,-24.890986),(20.128414,-24.889746),(20.118906,-24.887369),(20.107847,-24.880341),(20.081079,-24.852642),(20.029299,-24.815228),(20.010489,-24.788047),(19.992919,-24.775851),(19.986408,-24.768823),(19.981447,-24.752493),(19.981343,-24.580411),(19.981137,-24.408431),(19.980826,-24.236556),(19.980723,-24.064473),(19.980516,-23.892494),(19.980483,-23.864489),(19.98031,-23.720567),(19.980103,-23.548587),(19.979896,-23.376505),(19.979855,-23.308551),(19.979793,-23.204526),(19.979586,-23.032546),(19.979276,-22.860671),(19.979173,-22.688588),(19.978966,-22.538106),(19.978863,-22.387625),(19.978656,-22.237246),(19.978449,-22.086764),(19.978346,-22.000671),(20.21244,-22.000671),(20.446534,-22.000671),(20.680629,-22.000671),(20.914723,-22.000671),(20.97198,-22.000671),(20.984796,-21.963981),(20.984693,-21.922847),(20.984486,-21.865176),(20.984279,-21.807608),(20.984073,-21.750041),(20.983866,-21.69237),(20.983659,-21.634699),(20.983453,-21.577028),(20.983143,-21.519357),(20.983039,-21.46179),(20.982832,-21.404119),(20.982626,-21.346448),(20.982419,-21.28888),(20.982212,-21.231209),(20.982109,-21.173642),(20.981902,-21.116074),(20.981592,-21.058403),(20.981489,-21.000733),(20.981486,-20.999958),(20.981075,-20.875779),(20.980662,-20.750722),(20.980249,-20.625768),(20.979835,-20.500711),(20.979422,-20.375758),(20.97936,-20.351028),(20.979112,-20.250804),(20.978698,-20.125851),(20.978285,-20.000794),(20.977975,-19.87584),(20.977561,-19.750783),(20.977045,-19.625829),(20.976735,-19.500876),(20.976321,-19.375819),(20.975804,-19.250865),(20.975609,-19.172106),(20.975494,-19.125912),(20.975081,-19.000958),(20.975081,-18.96003),(20.975081,-18.919206),(20.975081,-18.878381),(20.975081,-18.83766),(20.975081,-18.796836),(20.975081,-18.756012),(20.975081,-18.715187),(20.975081,-18.674363),(20.975081,-18.633539),(20.975081,-18.592714),(20.975081,-18.551993),(20.975081,-18.511065),(20.975081,-18.470138),(20.975081,-18.429313),(20.975081,-18.388592),(20.975081,-18.347768),(20.975081,-18.319346),(20.993436,-18.318612),(21.024174,-18.317382),(21.080604,-18.315212),(21.136932,-18.312938),(21.193466,-18.310768),(21.249896,-18.308494),(21.296818,-18.306633),(21.343947,-18.304773),(21.39087,-18.302913),(21.437895,-18.301052),(21.456809,-18.300226),(21.475722,-18.299502),(21.492879,-18.296401),(21.509829,-18.293198),(21.526985,-18.289994),(21.544039,-18.28679),(21.628478,-18.271183),(21.71271,-18.255577),(21.79715,-18.239867),(21.881486,-18.224158),(21.966028,-18.208552),(22.050261,-18.192842),(22.134597,-18.177236),(22.219036,-18.161526),(22.303475,-18.145816),(22.387811,-18.13021),(22.472147,-18.1145),(22.556483,-18.098791),(22.640922,-18.083185),(22.725258,-18.067475),(22.809698,-18.051869),(22.894034,-18.036159),(22.981367,-18.020036),(23.099602,-18.010217),(23.185799,-18.003086),(23.254942,-17.997402),(23.292769,-17.998952),(23.305688,-18.005463),(23.311476,-18.009804),(23.312819,-18.016522),(23.312716,-18.029958),(23.31592,-18.037089),(23.323258,-18.039156),(23.330596,-18.039983),(23.3338,-18.04329),(23.33256,-18.067061),(23.3338,-18.073986),(23.336591,-18.07936),(23.348063,-18.09445),(23.359535,-18.119151),(23.389714,-18.153258),(23.395812,-18.163386),(23.396329,-18.169381),(23.394468,-18.186227),(23.395812,-18.191395),(23.40129,-18.194289),(23.410281,-18.197389),(23.418859,-18.198423),(23.429401,-18.188501),(23.444284,-18.200697),(23.458754,-18.217647),(23.464128,-18.225501),(23.477771,-18.230876),(23.49131,-18.23315),(23.501542,-18.23749),(23.505676,-18.249376),(23.511257,-18.260331),(23.521696,-18.268186),(23.527277,-18.277695),(23.518802,-18.293714),(23.551461,-18.327511),(23.560763,-18.348491),(23.546604,-18.369472),(23.555492,-18.383115),(23.571305,-18.426006),(23.57916,-18.467864),(23.592182,-18.478199),(23.609856,-18.477682),(23.645409,-18.466004),(23.649853,-18.46342),(23.656468,-18.458252),(23.680136,-18.431484),(23.700909,-18.42797),(23.715792,-18.419081),(23.809843,-18.321723),(23.825553,-18.317072),(23.837232,-18.305807),(23.855215,-18.280072),(23.867514,-18.269426),(23.89697,-18.250203),(23.912886,-18.235733),(23.915987,-18.201213),(23.950817,-18.177649),(23.956604,-18.176615),(23.961979,-18.177856),(23.966733,-18.180646),(23.971177,-18.18385),(23.974898,-18.177029),(23.979652,-18.171861),(23.991744,-18.163386),(24.02027,-18.151604),(24.028125,-18.145816),(24.05696,-18.119048),(24.065125,-18.115224),(24.101609,-18.108816),(24.135095,-18.085458),(24.183051,-18.029441),(24.218294,-18.012595),(24.238241,-18.009907),(24.259222,-18.012595),(24.270074,-18.015798),(24.287437,-18.02448),(24.296429,-18.026237),(24.305834,-18.019416),(24.334256,-17.971563),(24.350586,-17.95606),(24.365262,-17.950789),(24.399471,-17.95234),(24.421589,-17.956474),(24.433888,-17.967223),(24.451045,-17.998952),(24.458486,-18.005773),(24.465101,-18.008667),(24.469751,-18.014455),(24.471508,-18.029958),(24.505615,-18.060344),(24.518431,-18.057346),(24.564423,-18.052799),(24.574551,-18.050422),(24.577755,-18.044427),(24.591811,-18.028407),(24.595015,-18.022826),(24.598632,-18.020759),(24.649172,-17.962778),(24.664055,-17.949859),(24.698471,-17.928879),(24.725343,-17.895909),(24.730717,-17.891878),(24.738159,-17.887641),(24.74684,-17.88423),(24.756039,-17.882783),(24.764514,-17.879683),(24.770715,-17.865523),(24.776916,-17.862319),(24.79738,-17.858082),(24.820841,-17.839272),(24.838101,-17.835034),(24.857428,-17.833587),(24.931119,-17.81054),(24.93763,-17.807129),(24.945175,-17.799998),(24.948585,-17.79328),(24.953339,-17.788422),(24.964295,-17.786665),(24.958094,-17.800928),(24.968636,-17.807646),(24.975147,-17.816327),(24.983312,-17.820462),(24.998505,-17.81395),(25.007083,-17.825733),(25.019692,-17.823769),(25.047494,-17.807129),(25.057002,-17.827696),(25.087905,-17.826766),(25.120874,-17.813537),(25.153947,-17.781808),(25.194152,-17.782324),(25.259781,-17.794107)]
+Central African Republic	[(22.55576,10.978969),(22.57705,10.985119),(22.600822,10.987806),(22.60909,10.985222),(22.62821,10.976127),(22.638339,10.974137),(22.673169,10.975068),(22.682677,10.974137),(22.719884,10.964655),(22.745102,10.943803),(22.805977,10.924502),(22.861064,10.919154),(22.863234,10.891817),(23.005551,10.686817),(23.109421,10.614495),(23.291219,10.439726),(23.457617,10.173747),(23.624015,9.907768),(23.644789,9.863068),(23.674038,9.69034),(23.669077,9.652022),(23.655538,9.622463),(23.618537,9.566084),(23.606135,9.537171),(23.606755,9.526241),(23.61647,9.501463),(23.618537,9.488311),(23.617194,9.457176),(23.619984,9.447719),(23.627529,9.435084),(23.63497,9.435394),(23.640861,9.43312),(23.646339,9.425033),(23.646856,9.418393),(23.621845,9.34062),(23.620501,9.322869),(23.630733,9.292173),(23.63218,9.277574),(23.623291,9.265637),(23.610062,9.255457),(23.571408,9.207294),(23.549498,9.185254),(23.537922,9.178149),(23.521799,9.175358),(23.48945,9.176702),(23.474257,9.170682),(23.462821,9.153725),(23.45772,9.146161),(23.435706,9.018934),(23.43829,8.994543),(23.451416,8.974182),(23.478081,8.958912),(23.505469,8.961082),(23.542573,8.997281),(23.560143,8.996455),(23.567481,8.974828),(23.565931,8.940024),(23.553632,8.883154),(23.536682,8.85561),(23.495444,8.809438),(23.482318,8.783393),(23.481801,8.759363),(23.49007,8.732595),(23.505262,8.710736),(23.525726,8.701485),(23.540506,8.704793),(23.56407,8.722699),(23.578023,8.730476),(23.59642,8.734145),(23.61337,8.732233),(23.629079,8.725593),(23.644065,8.715154),(23.657088,8.710012),(23.689127,8.710684),(23.72127,8.702002),(23.737496,8.70686),(23.768916,8.721252),(23.803436,8.72213),(23.866687,8.70779),(23.922291,8.713449),(23.962082,8.697015),(23.981306,8.694173),(24.009624,8.698876),(24.114011,8.681642),(24.170328,8.689327),(24.180467,8.690711),(24.217674,8.691512),(24.235761,8.682003),(24.233487,8.667767),(24.21509,8.64136),(24.211266,8.627071),(24.218397,8.613041),(24.245579,8.591802),(24.25054,8.579632),(24.243719,8.570176),(24.203204,8.543459),(24.193179,8.532426),(24.137162,8.438866),(24.125173,8.404889),(24.121556,8.372307),(24.131374,8.343058),(24.152872,8.317891),(24.17995,8.297712),(24.206615,8.283268),(24.222428,8.277196),(24.257051,8.269186),(24.263186,8.268505),(24.281029,8.266525),(24.295498,8.266525),(24.302733,8.26544),(24.310278,8.261564),(24.326814,8.248567),(24.332085,8.245725),(24.396578,8.267817),(24.431097,8.271408),(24.454869,8.248671),(24.458899,8.239757),(24.464274,8.233194),(24.471508,8.22893),(24.481327,8.226657),(24.51285,8.207149),(24.544682,8.206115),(24.614859,8.217148),(24.670876,8.206839),(24.69041,8.206632),(24.710564,8.204307),(24.742293,8.18684),(24.800171,8.180277),(24.832107,8.16573),(24.917993,8.087027),(24.927811,8.070956),(24.930085,8.035454),(24.950549,8.014396),(24.952616,7.996567),(24.958094,7.989178),(24.964812,7.982615),(24.972666,7.976982),(24.981245,7.972331),(25.029304,7.918846),(25.059173,7.896108),(25.089559,7.884895),(25.103408,7.885773),(25.134414,7.892543),(25.148573,7.892594),(25.173171,7.888564),(25.180509,7.884016),(25.18547,7.877918),(25.191568,7.872389),(25.216889,7.864069),(25.229705,7.851615),(25.23942,7.835957),(25.249652,7.804331),(25.264535,7.777718),(25.269909,7.760768),(25.270633,7.746143),(25.266809,7.703097),(25.270633,7.688162),(25.276421,7.674261),(25.279418,7.659482),(25.274974,7.641964),(25.252546,7.62243),(25.186504,7.600106),(25.165213,7.5799),(25.164593,7.567343),(25.169037,7.551168),(25.190431,7.501197),(25.249962,7.469984),(25.263295,7.461044),(25.269599,7.454223),(25.279211,7.438358),(25.285102,7.431589),(25.292957,7.427196),(25.3097,7.422029),(25.316211,7.417223),(25.32417,7.402908),(25.330577,7.374125),(25.335952,7.359604),(25.346804,7.345031),(25.360033,7.335574),(25.416154,7.307772),(25.455118,7.278213),(25.481163,7.266173),(25.500335,7.272787),(25.516768,7.269945),(25.53165,7.260695),(25.576609,7.219819),(25.592422,7.211241),(25.65402,7.195376),(25.672727,7.187831),(25.697015,7.168607),(25.705077,7.166385),(25.724507,7.166695),(25.734429,7.162406),(25.750242,7.146542),(25.7613,7.143751),(25.786209,7.142666),(25.791583,7.134398),(25.791686,7.121117),(25.800781,7.104942),(25.815767,7.099774),(25.860726,7.095537),(25.877469,7.087734),(25.881707,7.079827),(25.884084,7.061069),(25.888735,7.05187),(25.920257,7.034145),(25.930386,7.03151),(25.950436,7.028564),(25.960461,7.024482),(25.966249,7.017454),(25.966766,7.009857),(25.969453,7.003553),(25.981132,7.000297),(26.026091,6.99668),(26.032292,6.974097),(26.035806,6.922266),(26.045418,6.899683),(26.050585,6.896686),(26.05689,6.89741),(26.063401,6.899063),(26.069189,6.899063),(26.073633,6.895136),(26.073116,6.88971),(26.071152,6.88356),(26.071566,6.877462),(26.0757,6.864647),(26.077354,6.85333),(26.080971,6.842348),(26.091203,6.830334),(26.113734,6.816458),(26.131821,6.81173),(26.147634,6.804702),(26.178743,6.765919),(26.219464,6.737523),(26.236207,6.72003),(26.270623,6.702486),(26.329741,6.680575),(26.378007,6.65329),(26.379224,6.631362),(26.379867,6.619778),(26.372323,6.609804),(26.356096,6.579496),(26.324367,6.537199),(26.30504,6.496917),(26.296462,6.489527),(26.286436,6.484179),(26.277031,6.477358),(26.27021,6.465653),(26.289124,6.459426),(26.290674,6.444672),(26.285093,6.425888),(26.282819,6.407853),(26.28964,6.387208),(26.300699,6.377829),(26.315789,6.371576),(26.335219,6.360595),(26.351755,6.344368),(26.375837,6.312587),(26.394647,6.300547),(26.436195,6.29171),(26.452008,6.28029),(26.455315,6.254451),(26.455625,6.230474),(26.464927,6.224402),(26.4795,6.225073),(26.495829,6.221146),(26.508955,6.205462),(26.509472,6.186394),(26.500067,6.167971),(26.48353,6.154457),(26.46534,6.144303),(26.4456,6.130221),(26.42927,6.113091),(26.421312,6.09366),(26.424826,6.072447),(26.440639,6.076995),(26.48105,6.104951),(26.498827,6.099836),(26.509885,6.082679),(26.51805,6.061156),(26.527972,6.043172),(26.543578,6.030847),(26.602179,6.010616),(26.634322,6.006482),(26.705016,6.009789),(26.776329,5.981884),(26.794364,5.970489),(26.805061,5.957183),(26.810849,5.912379),(26.81891,5.894628),(26.842165,5.884267),(26.865316,5.885973),(26.882059,5.891941),(26.894255,5.889667),(26.903763,5.866982),(26.916475,5.849644),(26.937456,5.848507),(26.981071,5.859204),(26.99182,5.847706),(27.003499,5.819284),(27.021999,5.805099),(27.029543,5.78988),(27.036055,5.785126),(27.045356,5.784919),(27.063547,5.790862),(27.072745,5.791224),(27.11481,5.775282),(27.123801,5.768745),(27.130933,5.752131),(27.131449,5.741459),(27.136307,5.734018),(27.156254,5.727481),(27.170413,5.72035),(27.182351,5.707456),(27.190774,5.691824),(27.193823,5.676321),(27.194288,5.667304),(27.196407,5.661464),(27.201109,5.656968),(27.218369,5.645315),(27.219196,5.639993),(27.216716,5.633456),(27.215165,5.616144),(27.210669,5.601623),(27.211341,5.594879),(27.217336,5.585397),(27.222607,5.584363),(27.227309,5.586714),(27.231082,5.587593),(27.234596,5.588833),(27.240073,5.591985),(27.247515,5.592605),(27.257127,5.586068),(27.261054,5.577593),(27.258884,5.559972),(27.260744,5.550257),(27.220126,5.440883),(27.218059,5.42551),(27.220126,5.413082),(27.228239,5.387605),(27.233665,5.33828),(27.2378,5.32319),(27.264465,5.260145),(27.280898,5.23056),(27.30131,5.205187),(27.358516,5.166766),(27.385801,5.143847),(27.402131,5.104496),(27.431173,5.083618),(27.441301,5.070725),(27.414843,5.080725),(27.405335,5.082843),(27.391382,5.092223),(27.380323,5.094393),(27.361203,5.095478),(27.351384,5.097339),(27.342754,5.100594),(27.328647,5.1108),(27.315728,5.122402),(27.301878,5.131988),(27.284412,5.135967),(27.262811,5.138447),(27.239712,5.144881),(27.157494,5.185421),(27.11636,5.200304),(27.073675,5.203327),(27.027476,5.189969),(26.991716,5.171288),(26.961641,5.151185),(26.933684,5.126587),(26.90397,5.094393),(26.899216,5.085996),(26.889604,5.062121),(26.884126,5.053388),(26.872654,5.041786),(26.867073,5.037549),(26.849296,5.039099),(26.848366,5.041373),(26.844955,5.046282),(26.839478,5.051166),(26.832656,5.053388),(26.826145,5.050752),(26.815706,5.040184),(26.808368,5.039099),(26.801857,5.044525),(26.760619,5.088114),(26.753695,5.092274),(26.739432,5.094393),(26.691683,5.094393),(26.681244,5.089277),(26.667602,5.078347),(26.657577,5.073257),(26.644037,5.078347),(26.635666,5.077624),(26.629671,5.067056),(26.62347,5.067056),(26.615512,5.078244),(26.598355,5.080621),(26.579855,5.074343),(26.568176,5.059641),(26.561355,5.067056),(26.554224,5.059847),(26.541511,5.053129),(26.528282,5.048091),(26.519807,5.045972),(26.502547,5.047471),(26.475159,5.057263),(26.462653,5.059641),(26.460689,5.066023),(26.441879,5.104289),(26.429373,5.113798),(26.414284,5.122712),(26.400125,5.133641),(26.390616,5.149015),(26.369429,5.140566),(26.362711,5.135967),(26.353306,5.147775),(26.336356,5.148602),(26.317339,5.146431),(26.291811,5.150979),(26.272484,5.159066),(26.253984,5.172321),(26.246646,5.189969),(26.242098,5.188057),(26.230729,5.185163),(26.226182,5.183147),(26.225665,5.199038),(26.226182,5.204257),(26.213573,5.199141),(26.207165,5.207694),(26.198276,5.238389),(26.195176,5.234772),(26.18453,5.225341),(26.18174,5.229579),(26.175332,5.233687),(26.170888,5.238389),(26.157349,5.232472),(26.150837,5.239966),(26.144223,5.251799),(26.12996,5.258879),(26.125103,5.248595),(26.119625,5.241542),(26.112494,5.238389),(26.104535,5.238596),(26.098438,5.239578),(26.093373,5.241438),(26.088412,5.244591),(26.09172,5.219062),(26.095234,5.211053),(26.086035,5.215238),(26.077147,5.216324),(26.070532,5.212241),(26.067845,5.200846),(26.062677,5.200123),(26.050999,5.200226),(26.037356,5.197953),(26.026917,5.189969),(26.013895,5.199244),(25.996635,5.219243),(25.98599,5.225341),(25.971934,5.227667),(25.962839,5.224514),(25.958394,5.214825),(25.958601,5.197384),(25.943202,5.204102),(25.925632,5.201777),(25.912506,5.190382),(25.910852,5.170099),(25.892972,5.185214),(25.883567,5.203534),(25.872405,5.217099),(25.849357,5.217874),(25.84605,5.211673),(25.836231,5.20002),(25.826103,5.194697),(25.818971,5.214567),(25.814217,5.22162),(25.811427,5.230922),(25.814631,5.244591),(25.810186,5.242679),(25.799438,5.240095),(25.794683,5.238389),(25.792306,5.262832),(25.778354,5.269137),(25.769259,5.265158),(25.781144,5.258879),(25.771739,5.245469),(25.757993,5.244436),(25.743731,5.250611),(25.732775,5.258879),(25.705077,5.289601),(25.691124,5.299807),(25.668903,5.306137),(25.667559,5.307248),(25.663115,5.30916),(25.655777,5.317764),(25.650093,5.320297),(25.637897,5.317971),(25.631076,5.311822),(25.623428,5.309935),(25.609165,5.320297),(25.609165,5.326524),(25.614229,5.329934),(25.617227,5.333552),(25.61981,5.337221),(25.622911,5.34076),(25.600483,5.34045),(25.592319,5.349184),(25.589011,5.362284),(25.58126,5.374919),(25.575059,5.374919),(25.561829,5.373006),(25.543743,5.37528),(25.532787,5.372231),(25.540849,5.354429),(25.528963,5.351897),(25.504469,5.342285),(25.49558,5.344533),(25.484935,5.355307),(25.481989,5.356858),(25.479922,5.353189),(25.435067,5.328694),(25.413363,5.323552),(25.39569,5.333965),(25.385354,5.321485),(25.370678,5.316834),(25.36365,5.310556),(25.376466,5.293011),(25.355899,5.286448),(25.343393,5.271927),(25.337192,5.251748),(25.335538,5.228442),(25.328924,5.216013),(25.316211,5.202242),(25.307736,5.185292),(25.314454,5.163252),(25.321482,5.159169),(25.341223,5.155604),(25.348561,5.149015),(25.349284,5.141677),(25.343807,5.121885),(25.34236,5.111472),(25.339156,5.105168),(25.324996,5.088114),(25.321896,5.077004),(25.320966,5.052251),(25.316832,5.042251),(25.307633,5.032278),(25.292337,5.028273),(25.248515,5.024139),(25.239317,5.015535),(25.227535,5.009566),(25.163663,5.005639),(25.154568,5.009308),(25.147643,5.01414),(25.140201,5.017964),(25.129453,5.018635),(25.121701,5.008636),(25.11426,5.001841),(25.105268,4.998766),(25.100927,4.994554),(25.090489,4.974478),(25.084804,4.954221),(25.076123,4.951844),(25.040569,4.962101),(25.006463,4.980937),(24.969359,4.991402),(24.958094,4.99135),(24.950859,4.987681),(24.932359,4.974426),(24.927088,4.971481),(24.90435,4.966804),(24.868177,4.944376),(24.848333,4.936728),(24.836861,4.93771),(24.827662,4.941922),(24.819498,4.94448),(24.811023,4.940449),(24.800067,4.928899),(24.789422,4.919856),(24.77826,4.918538),(24.766374,4.929881),(24.749838,4.918745),(24.730614,4.917505),(24.664365,4.924403),(24.654236,4.929416),(24.65744,4.939777),(24.670773,4.957218),(24.656923,4.967269),(24.627468,4.976907),(24.615479,4.985097),(24.610001,4.996725),(24.610105,5.016723),(24.601216,5.026103),(24.588607,5.031064),(24.563389,5.034888),(24.553467,5.039099),(24.547369,5.046489),(24.538688,5.065558),(24.533003,5.073257),(24.513676,5.087236),(24.487218,5.100801),(24.480844,5.102335),(24.459623,5.107441),(24.436679,5.100594),(24.433061,5.089329),(24.433475,5.075531),(24.430684,5.067418),(24.416938,5.073257),(24.41146,5.081861),(24.401642,5.111472),(24.396371,5.122298),(24.382522,5.107855),(24.367846,5.084549),(24.361231,5.062948),(24.37198,5.053388),(24.396888,5.048194),(24.398645,5.036024),(24.386139,5.022356),(24.368466,5.012434),(24.296635,5.003262),(24.286507,4.995071),(24.284646,4.992435),(24.272968,4.964013),(24.26966,4.952464),(24.269557,4.943188),(24.267697,4.935721),(24.259222,4.929881),(24.25302,4.929881),(24.246199,4.954066),(24.229766,4.961171),(24.209612,4.956184),(24.190905,4.94417),(24.162897,4.907789),(24.152768,4.902596),(24.139229,4.905438),(24.119902,4.9189),(24.10843,4.92306),(24.08962,4.920218),(24.072463,4.91027),(24.046935,4.888928),(23.995775,4.865053),(23.977998,4.854149),(23.963116,4.868696),(23.957121,4.870815),(23.950817,4.867792),(23.946476,4.861642),(23.943169,4.851695),(23.942755,4.840507),(23.947406,4.830585),(23.948336,4.817692),(23.924358,4.817795),(23.88188,4.82689),(23.874749,4.824978),(23.864414,4.81609),(23.855215,4.813222),(23.847877,4.813997),(23.82824,4.819345),(23.816665,4.820611),(23.798475,4.814746),(23.760027,4.787435),(23.73791,4.779063),(23.692848,4.773405),(23.672694,4.767204),(23.63404,4.745138),(23.588048,4.73395),(23.566551,4.724441),(23.506089,4.676434),(23.488416,4.669845),(23.465058,4.66721),(23.448315,4.659407),(23.437153,4.646565),(23.430022,4.62884),(23.428265,4.617342),(23.428368,4.608609),(23.427438,4.601348),(23.42258,4.594062),(23.414519,4.590832),(23.396019,4.591607),(23.38837,4.587266),(23.371214,4.597266),(23.353954,4.60357),(23.335867,4.6068),(23.316437,4.60773),(23.313026,4.610211),(23.301967,4.621709),(23.29959,4.625119),(23.295146,4.6276),(23.273132,4.632018),(23.264864,4.635067),(23.251841,4.662972),(23.224246,4.680051),(23.220835,4.683514),(23.20864,4.690542),(23.183732,4.725268),(23.168746,4.73811),(23.12389,4.715631),(23.099396,4.711652),(23.077382,4.721057),(23.066633,4.730178),(23.055161,4.7378),(23.042758,4.742967),(23.029323,4.744931),(23.017334,4.750512),(23.011132,4.763638),(23.007205,4.778443),(22.99625,4.799501),(22.985708,4.826425),(22.977439,4.834306),(22.965037,4.835287),(22.953048,4.830792),(22.941473,4.82472),(22.92969,4.820611),(22.915221,4.821154),(22.905919,4.824203),(22.898374,4.823583),(22.888763,4.813222),(22.882872,4.800742),(22.882355,4.788494),(22.886799,4.776686),(22.895584,4.765395),(22.887316,4.755499),(22.865302,4.738678),(22.853829,4.711264),(22.837293,4.714235),(22.818069,4.724596),(22.802876,4.730643),(22.78603,4.724648),(22.776418,4.710101),(22.765153,4.676021),(22.757401,4.660802),(22.74872,4.64827),(22.737867,4.637754),(22.723605,4.62884),(22.723811,4.617032),(22.729806,4.596749),(22.73115,4.587266),(22.728669,4.58029),(22.718954,4.562772),(22.716783,4.556519),(22.713683,4.551222),(22.700144,4.541068),(22.697043,4.535745),(22.697146,4.512025),(22.695079,4.501483),(22.689498,4.491665),(22.675649,4.48474),(22.654358,4.482828),(22.61033,4.484224),(22.59245,4.473707),(22.586972,4.449394),(22.589039,4.421953),(22.594,4.402316),(22.61126,4.381853),(22.613741,4.374359),(22.609297,4.363352),(22.599891,4.352552),(22.588006,4.34418),(22.576534,4.340847),(22.568575,4.331546),(22.539327,4.278164),(22.53974,4.266924),(22.545734,4.245944),(22.546148,4.237184),(22.540464,4.227262),(22.52217,4.211346),(22.518243,4.206799),(22.510491,4.19127),(22.492714,4.174036),(22.457368,4.149076),(22.451532,4.146672),(22.43184,4.13856),(22.422641,4.134787),(22.303269,4.128716),(22.207254,4.150316),(22.184723,4.164605),(22.161882,4.173183),(22.15165,4.179462),(22.133047,4.19866),(22.127879,4.203078),(22.108449,4.209848),(22.057806,4.219537),(22.036613,4.229439),(22.00892,4.242378),(22.001478,4.244652),(21.989593,4.244238),(21.984528,4.242946),(21.980291,4.240621),(21.970783,4.237184),(21.949905,4.233464),(21.891614,4.237184),(21.86774,4.241551),(21.851927,4.25168),(21.838077,4.263255),(21.819887,4.271937),(21.810999,4.273177),(21.78206,4.271937),(21.771001,4.273487),(21.76604,4.277208),(21.76325,4.281678),(21.758496,4.285605),(21.737308,4.293382),(21.722942,4.295139),(21.688939,4.292452),(21.651112,4.295656),(21.634162,4.294209),(21.538147,4.244652),(21.527812,4.249251),(21.508072,4.249406),(21.49722,4.251473),(21.489882,4.256253),(21.48244,4.263126),(21.473138,4.269301),(21.460219,4.271937),(21.416915,4.270076),(21.397691,4.271627),(21.37485,4.278164),(21.358313,4.285553),(21.310358,4.316094),(21.3055,4.323148),(21.298886,4.330228),(21.288344,4.33338),(21.275321,4.332527),(21.265916,4.330073),(21.258371,4.32599),(21.250723,4.320358),(21.244625,4.313769),(21.239148,4.305604),(21.23243,4.297827),(21.223438,4.292452),(21.210932,4.291574),(21.202974,4.296638),(21.195739,4.302917),(21.185611,4.306069),(21.16556,4.307154),(21.158119,4.310203),(21.150057,4.326714),(21.137965,4.332682),(21.113574,4.340847),(21.103445,4.353275),(21.084222,4.388235),(21.076057,4.395469),(21.059624,4.398596),(20.963505,4.433736),(20.871521,4.453373),(20.832351,4.450686),(20.818708,4.443528),(20.807029,4.434252),(20.791836,4.426191),(20.767859,4.42278),(20.68838,4.42278),(20.603114,4.409732),(20.580273,4.415003),(20.559809,4.428361),(20.456713,4.524816),(20.452322,4.528924),(20.44209,4.550499),(20.447051,4.569671),(20.45718,4.58644),(20.463071,4.600935),(20.456456,4.621502),(20.44023,4.64411),(20.420593,4.662352),(20.403746,4.669845),(20.395478,4.677106),(20.373671,4.724441),(20.354034,4.755396),(20.338944,4.771906),(20.322511,4.779063),(20.301737,4.781647),(20.254815,4.797124),(20.236625,4.806349),(20.217194,4.822446),(20.171719,4.87836),(20.152599,4.890685),(20.08635,4.916264),(20.05462,4.937813),(20.031056,4.957993),(20.003977,4.974478),(19.915404,4.993107),(19.890909,5.002125),(19.880367,5.015535),(19.87551,5.031064),(19.858163,5.060305),(19.850188,5.073748),(19.838613,5.087546),(19.82466,5.096977),(19.779185,5.118164),(19.748799,5.124417),(19.728749,5.133848),(19.71955,5.135967),(19.605552,5.138292),(19.568759,5.15519),(19.548605,5.151366),(19.517082,5.135967),(19.496515,5.133796),(19.431506,5.135967),(19.408975,5.130386),(19.394196,5.116976),(19.373112,5.087546),(19.283815,5.032278),(19.236996,5.010781),(19.229761,5.002176),(19.214672,4.976131),(19.195655,4.950345),(19.179015,4.946418),(19.133023,4.946934),(19.116176,4.940449),(19.106741,4.931518),(19.08331,4.90934),(19.069047,4.891253),(19.057782,4.867792),(19.048997,4.836528),(19.044139,4.82689),(19.035768,4.818002),(19.02688,4.811516),(19.019748,4.8033),(19.011583,4.765033),(18.998044,4.750641),(18.980474,4.739402),(18.962284,4.724441),(18.928178,4.666435),(18.923837,4.662869),(18.90451,4.655867),(18.900169,4.652146),(18.897895,4.650647),(18.886526,4.621399),(18.85242,4.594062),(18.828235,4.559981),(18.776972,4.433451),(18.753304,4.400611),(18.721058,4.377357),(18.674343,4.361311),(18.654086,4.357229),(18.633932,4.355963),(18.614295,4.359813),(18.595795,4.371259),(18.576468,4.372757),(18.556831,4.354154),(18.541948,4.327851),(18.53709,4.306069),(18.545048,4.289016),(18.57254,4.265684),(18.578638,4.254858),(18.583909,4.235789),(18.619669,4.169566),(18.632692,4.130421),(18.646541,4.045982),(18.645301,3.982445),(18.64158,3.958261),(18.634552,3.93573),(18.613675,3.901468),(18.611711,3.879093),(18.612024,3.866611),(18.612848,3.833746),(18.593004,3.709775),(18.626387,3.476869),(18.582462,3.477386),(18.570267,3.489607),(18.55435,3.526375),(18.513422,3.592237),(18.497093,3.61146),(18.472081,3.632053),(18.459059,3.631382),(18.448,3.618023),(18.429707,3.600221),(18.420612,3.596371),(18.403662,3.597353),(18.392293,3.595854),(18.387849,3.591668),(18.383715,3.578),(18.379891,3.574382),(18.372863,3.574537),(18.361597,3.58017),(18.355603,3.581462),(18.275918,3.574382),(18.264859,3.574744),(18.255867,3.577225),(18.248529,3.574899),(18.242535,3.561127),(18.235403,3.530923),(18.231579,3.521156),(18.220004,3.503947),(18.202537,3.487333),(18.181556,3.477386),(18.159852,3.480305),(18.146727,3.494904),(18.134014,3.534824),(18.116444,3.552007),(18.082028,3.563453),(18.047094,3.563143),(18.013091,3.55397),(17.981879,3.538803),(17.969476,3.537511),(17.959865,3.541077),(17.924518,3.563453),(17.919247,3.565597),(17.913562,3.561334),(17.875322,3.542731),(17.856408,3.537305),(17.842146,3.540147),(17.835324,3.555831),(17.83057,3.575674),(17.821165,3.593994),(17.808349,3.608592),(17.793156,3.617506),(17.784475,3.61823),(17.765148,3.614354),(17.755949,3.614509),(17.749645,3.618075),(17.73993,3.629159),(17.733212,3.632208),(17.72608,3.631847),(17.714505,3.627506),(17.70913,3.626421),(17.627275,3.626317),(17.586761,3.632234),(17.550484,3.648151),(17.513484,3.679182),(17.508936,3.681766),(17.494983,3.683213),(17.490126,3.68714),(17.486198,3.700292),(17.481858,3.704762),(17.458913,3.708276),(17.442687,3.701274),(17.427494,3.690112),(17.414489,3.683415),(17.375714,3.663447),(17.355767,3.638435),(17.334373,3.618514),(17.298096,3.615904),(17.272258,3.62456),(17.259442,3.625904),(17.244973,3.620607),(17.231123,3.609109),(17.222959,3.598515),(17.213967,3.589291),(17.197224,3.58172),(17.182858,3.579602),(17.142757,3.580842),(17.129011,3.57707),(17.102139,3.566605),(17.088393,3.564435),(17.061418,3.56614),(17.052426,3.56397),(17.035787,3.556141),(17.028862,3.551541),(17.017596,3.5418),(17.009225,3.538131),(17.003127,3.537718),(16.989691,3.539475),(16.98194,3.537976),(16.968607,3.533481),(16.960546,3.538441),(16.953208,3.546891),(16.942252,3.553092),(16.932434,3.553919),(16.904735,3.550637),(16.895537,3.552368),(16.877243,3.559164),(16.867838,3.561541),(16.853162,3.560094),(16.851818,3.551903),(16.854609,3.541335),(16.852645,3.532809),(16.833008,3.522861),(16.811924,3.521672),(16.729552,3.542214),(16.709398,3.543712),(16.686351,3.542214),(16.639428,3.528597),(16.598501,3.501674),(16.567701,3.464389),(16.551682,3.419767),(16.542793,3.336154),(16.517782,3.273238),(16.517162,3.248692),(16.511477,3.227246),(16.477061,3.179394),(16.465485,3.156501),(16.464762,3.1318),(16.47272,3.110612),(16.483159,3.090148),(16.490807,3.067824),(16.484192,3.031909),(16.445538,2.95765),(16.448329,2.913467),(16.460525,2.894605),(16.474994,2.878378),(16.483779,2.860395),(16.479128,2.836314),(16.450603,2.775594),(16.427492,2.726493),(16.413706,2.697201),(16.371124,2.606922),(16.325649,2.510494),(16.293506,2.442074),(16.248031,2.345594),(16.196665,2.236454),(16.192841,2.239503),(16.179715,2.246996),(16.181265,2.256556),(16.18695,2.26932),(16.186536,2.277692),(16.182919,2.281154),(16.169069,2.289887),(16.165969,2.294796),(16.164729,2.314795),(16.162868,2.323839),(16.159251,2.332934),(16.152326,2.343269),(16.133413,2.364818),(16.120907,2.389571),(16.112949,2.410448),(16.111502,2.418562),(16.111502,2.455872),(16.107058,2.474165),(16.094345,2.497523),(16.090315,2.510494),(16.091245,2.532766),(16.106851,2.567028),(16.111502,2.5862),(16.108505,2.606612),(16.093105,2.641494),(16.090315,2.661906),(16.093725,2.67312),(16.101373,2.687847),(16.110468,2.701438),(16.0991,2.70397),(16.086284,2.704952),(16.072848,2.702834),(16.062616,2.703195),(16.059309,2.711825),(16.060032,2.72583),(16.056208,2.759833),(16.059929,2.786188),(16.086904,2.813163),(16.095172,2.836779),(16.092382,2.863289),(16.08246,2.885665),(16.070161,2.906594),(16.055381,2.93977),(16.034194,2.970621),(16.026236,2.978992),(16.015797,2.983488),(16.006082,2.983953),(15.995437,2.981473),(15.982001,2.976719),(15.977763,2.980956),(15.974249,2.985762),(15.971562,2.991188),(15.95823,3.041521),(15.950065,3.061003),(15.933425,3.081777),(15.913995,3.097952),(15.897768,3.103533),(15.854773,3.098985),(15.850949,3.100432),(15.840201,3.107408),(15.834206,3.108545),(15.829142,3.106633),(15.817566,3.100122),(15.813536,3.098985),(15.80103,3.100897),(15.793175,3.103274),(15.78563,3.107977),(15.7107,3.187455),(15.616855,3.286777),(15.517946,3.391603),(15.413973,3.50188),(15.329741,3.590996),(15.262306,3.662589),(15.25264,3.672852),(15.171301,3.758971),(15.084898,3.885836),(15.025987,4.026086),(15.043143,4.026138),(15.075183,4.017973),(15.091719,4.015854),(15.111253,4.019937),(15.150424,4.038514),(15.172438,4.043811),(15.192075,4.052234),(15.189801,4.063112),(15.177709,4.071458),(15.162413,4.073938),(15.14846,4.073938),(15.142569,4.08045),(15.139262,4.094583),(15.132854,4.108536),(15.117764,4.114324),(15.102571,4.112412),(15.091202,4.121791),(15.084484,4.148611),(15.082934,4.205507),(15.072806,4.265942),(15.063814,4.293434),(15.048518,4.321649),(15.013894,4.364257),(15.007383,4.37777),(15.000562,4.403195),(14.993947,4.413298),(14.982062,4.420481),(14.938344,4.435932),(14.779697,4.545047),(14.74373,4.57998),(14.717272,4.622019),(14.704249,4.669354),(14.697325,4.745215),(14.69071,4.762139),(14.691847,4.768702),(14.696084,4.779735),(14.700632,4.804282),(14.701459,4.814384),(14.686989,4.908875),(14.681615,4.920941),(14.675827,4.93076),(14.672107,4.940811),(14.674484,4.967579),(14.669833,4.977113),(14.663425,4.985717),(14.659498,4.997035),(14.660132,5.01144),(14.660324,5.015793),(14.667456,5.052768),(14.663012,5.091447),(14.663218,5.141832),(14.658877,5.164544),(14.651539,5.187514),(14.640481,5.208236),(14.624461,5.224049),(14.603584,5.234255),(14.560485,5.248595),(14.539712,5.261799),(14.523899,5.279679),(14.519868,5.290583),(14.528033,5.293011),(14.539608,5.303579),(14.548393,5.320503),(14.553974,5.338228),(14.555938,5.351328),(14.560796,5.355462),(14.570821,5.370939),(14.579296,5.387605),(14.579606,5.395382),(14.592835,5.400033),(14.597279,5.41148),(14.596246,5.440108),(14.599553,5.456645),(14.614126,5.48486),(14.617433,5.495299),(14.61888,5.525452),(14.617226,5.53788),(14.610612,5.553667),(14.596556,5.577232),(14.591491,5.590952),(14.590148,5.608289),(14.592835,5.62387),(14.610612,5.669138),(14.624358,5.723605),(14.631075,5.738049),(14.624047,5.758306),(14.617433,5.864966),(14.602964,5.883389),(14.598003,5.903491),(14.584773,5.923412),(14.572474,5.924187),(14.545396,5.907573),(14.530616,5.90592),(14.499197,5.909537),(14.482144,5.90964),(14.465711,5.920673),(14.458166,5.936409),(14.453825,5.953875),(14.446901,5.970024),(14.432328,5.98545),(14.417548,5.997258),(14.406076,6.01103),(14.397705,6.019169),(14.389436,6.031054),(14.387266,6.039038),(14.390263,6.045782),(14.397705,6.053947),(14.402459,6.054877),(14.412898,6.047022),(14.418169,6.047126),(14.422509,6.051363),(14.426023,6.059864),(14.429124,6.064179),(14.433568,6.073868),(14.432709,6.079123),(14.431811,6.084617),(14.430571,6.088079),(14.443903,6.100249),(14.467054,6.122599),(14.482144,6.127069),(14.510979,6.155336),(14.525966,6.174069),(14.534957,6.190088),(14.576402,6.189778),(14.719029,6.257862),(14.734842,6.270445),(14.772255,6.318323),(14.782384,6.336772),(14.784658,6.347805),(14.784348,6.358683),(14.780007,6.382221),(14.782177,6.393616),(14.807292,6.4278),(14.921874,6.686414),(14.932452,6.710289),(14.946095,6.72574),(14.962321,6.736696),(15.022369,6.766539),(15.034565,6.776771),(15.042213,6.790775),(15.05906,6.836276),(15.080247,6.878083),(15.113217,6.964692),(15.128926,7.026497),(15.136161,7.045308),(15.147013,7.061844),(15.156108,7.067787),(15.179052,7.07838),(15.187527,7.088612),(15.190214,7.098793),(15.185357,7.156877),(15.186597,7.166334),(15.191248,7.177341),(15.205097,7.200233),(15.223908,7.247517),(15.246564,7.266731),(15.261321,7.279247),(15.338216,7.32219),(15.385345,7.358363),(15.389169,7.364151),(15.397437,7.380739),(15.403225,7.386372),(15.409633,7.387664),(15.428443,7.388801),(15.432784,7.389731),(15.434954,7.402908),(15.415524,7.42084),(15.419451,7.43655),(15.473298,7.509103),(15.481049,7.523263),(15.515569,7.512204),(15.55195,7.509879),(15.624813,7.519749),(15.668532,7.516287),(15.720001,7.468641),(15.758345,7.455567),(15.793899,7.457996),(15.92526,7.488175),(15.94314,7.495306),(15.975696,7.515201),(15.990372,7.529412),(16.012283,7.560315),(16.026339,7.574888),(16.042979,7.583931),(16.0652,7.591217),(16.128762,7.599486),(16.162662,7.611113),(16.185606,7.610751),(16.207207,7.613542),(16.227257,7.625582),(16.26188,7.651885),(16.282758,7.660102),(16.370814,7.672504),(16.38301,7.680669),(16.387144,7.694674),(16.387041,7.762628),(16.392208,7.783609),(16.407401,7.796063),(16.41815,7.795856),(16.427245,7.791464),(16.437373,7.788363),(16.450913,7.792084),(16.457217,7.799628),(16.469413,7.825828),(16.475717,7.835802),(16.491737,7.849238),(16.509204,7.858281),(16.548685,7.870012),(16.550131,7.861692),(16.550752,7.8527),(16.550235,7.843502),(16.54486,7.813013),(16.549305,7.794719),(16.560157,7.779733),(16.576383,7.767796),(16.586822,7.763558),(16.596434,7.761129),(16.605219,7.757202),(16.613073,7.74821),(16.618138,7.734309),(16.616174,7.723871),(16.611833,7.713897),(16.609869,7.701598),(16.61421,7.679584),(16.624546,7.66868),(16.6632,7.657415),(16.686867,7.645788),(16.709812,7.627753),(16.746709,7.586566),(16.768619,7.550238),(16.782365,7.541143),(16.805516,7.543675),(16.812854,7.547706),(16.815071,7.549544),(16.836729,7.567498),(16.839623,7.567446),(16.850372,7.565896),(16.853886,7.567498),(16.855849,7.575404),(16.852439,7.580262),(16.848098,7.584706),(16.847168,7.591579),(16.854816,7.611475),(16.865461,7.624445),(16.880654,7.632869),(16.919618,7.644082),(16.962716,7.650697),(16.98194,7.648733),(16.988968,7.660774),(16.997546,7.666717),(17.008295,7.667647),(17.038991,7.662479),(17.042091,7.667027),(17.041058,7.675502),(17.045605,7.6847),(17.059351,7.696534),(17.079091,7.689919),(17.090254,7.683822),(17.095525,7.67824),(17.101932,7.677724),(17.116298,7.68687),(17.135522,7.705112),(17.170559,7.747539),(17.188645,7.764127),(17.196397,7.76516),(17.204562,7.763817),(17.211073,7.768312),(17.214484,7.786813),(17.220685,7.798181),(17.23379,7.810801),(17.234637,7.811617),(17.250864,7.822831),(17.385739,7.870477),(17.405997,7.883034),(17.419122,7.898227),(17.466355,7.884119),(17.478344,7.891819),(17.487232,7.914453),(17.503665,7.926236),(17.523819,7.93099),(17.559786,7.934711),(17.580766,7.940602),(17.59999,7.950369),(17.62066,7.978739),(17.639884,7.985043),(17.661795,7.986284),(17.679778,7.985198),(17.817238,7.962099),(17.858785,7.960445),(17.897853,7.967473),(17.977228,7.997187),(18.070452,8.019202),(18.508255,8.030674),(18.589283,8.047882),(18.617912,8.090127),(18.618636,8.138652),(18.638583,8.177642),(18.672586,8.20751),(18.715064,8.228672),(18.773768,8.248619),(18.791235,8.257378),(18.813042,8.276421),(18.8549,8.339802),(18.887457,8.370963),(18.901306,8.388636),(18.910401,8.412976),(18.920529,8.432122),(19.020472,8.545578),(19.061296,8.625624),(19.072261,8.631872),(19.081657,8.637226),(19.091475,8.652858),(19.124135,8.675079),(19.103877,8.698049),(19.073492,8.720528),(19.057782,8.729701),(19.048687,8.745669),(18.929108,8.796544),(18.917325,8.805148),(18.912468,8.818403),(18.909677,8.835327),(18.902959,8.84481),(18.886526,8.835844),(18.869783,8.849409),(18.86968,8.864111),(18.892727,8.897933),(18.901409,8.89398),(18.910608,8.894239),(18.917739,8.898812),(18.920736,8.907855),(18.922907,8.918216),(18.928591,8.921679),(18.936446,8.923358),(18.952052,8.931988),(18.971896,8.938215),(18.975927,8.941988),(18.97851,8.949455),(18.984815,8.956431),(18.999491,8.969635),(19.021919,8.985215),(19.060676,9.00418),(19.10057,9.015265),(19.126718,9.007177),(19.133643,9.007177),(19.142118,9.008676),(19.168783,9.002216),(19.174571,9.003767),(19.179635,9.015265),(19.192037,9.020174),(19.232862,9.022293),(19.253429,9.027951),(19.263248,9.028261),(19.275236,9.021983),(19.285778,9.01281),(19.295494,9.009503),(19.304795,9.020846),(19.316268,9.01312),(19.333321,9.006557),(19.352234,9.002061),(19.369391,9.000382),(19.38262,9.003198),(19.420964,9.017435),(19.430162,9.012862),(19.506644,9.013999),(19.511811,9.012293),(19.515842,9.009451),(19.52132,9.008831),(19.530828,9.013999),(19.553772,9.013327),(19.583125,9.025342),(19.613614,9.031672),(19.640072,9.013999),(19.656402,9.021259),(19.700017,9.020587),(19.709008,9.024567),(19.713969,9.02914),(19.738154,9.039372),(19.746836,9.04131),(19.758411,9.041982),(19.784663,9.048751),(19.80554,9.051128),(19.889463,9.046374),(19.902175,9.0518),(19.914474,9.069267),(19.928737,9.062575),(19.932091,9.063331),(19.943413,9.065882),(19.969044,9.082883),(19.976486,9.084175),(19.985477,9.083193),(19.993022,9.084589),(19.996329,9.092831),(19.997156,9.098619),(19.999533,9.104303),(20.002944,9.108515),(20.006871,9.11022),(20.014416,9.106345),(20.01793,9.091048),(20.024338,9.089756),(20.030332,9.093865),(20.029919,9.098981),(20.028369,9.104562),(20.031159,9.11022),(20.060512,9.134353),(20.068676,9.138126),(20.076945,9.13673),(20.090587,9.131123),(20.099372,9.13071),(20.100509,9.134146),(20.099579,9.141174),(20.101026,9.148073),(20.109604,9.151174),(20.117149,9.145748),(20.125727,9.133785),(20.137613,9.121822),(20.154563,9.116421),(20.169549,9.120891),(20.197971,9.140503),(20.212647,9.144973),(20.222982,9.14195),(20.234454,9.13456),(20.256985,9.116421),(20.276829,9.120736),(20.359408,9.116421),(20.378322,9.120065),(20.384419,9.123579),(20.40292,9.136989),(20.412428,9.142053),(20.423073,9.143241),(20.435166,9.138126),(20.455423,9.159313),(20.467618,9.184143),(20.481778,9.204659),(20.507203,9.213263),(20.51299,9.223883),(20.502655,9.247421),(20.496144,9.270882),(20.514231,9.281502),(20.526426,9.283621),(20.533661,9.289641),(20.537278,9.299201),(20.538208,9.311939),(20.541826,9.321629),(20.550921,9.320259),(20.572315,9.308218),(20.573555,9.309149),(20.592262,9.308063),(20.592882,9.308218),(20.609729,9.302792),(20.616653,9.302017),(20.667916,9.302017),(20.654894,9.342971),(20.695822,9.363461),(20.740883,9.377129),(20.750495,9.384545),(20.757937,9.377129),(20.766618,9.38656),(20.771062,9.398058),(20.77654,9.407799),(20.788322,9.411881),(20.792353,9.414),(20.798244,9.423379),(20.801965,9.42555),(20.806719,9.423328),(20.81323,9.419116),(20.813884,9.418847),(20.820258,9.416222),(20.82615,9.418083),(20.832661,9.437255),(20.834314,9.462473),(20.841446,9.484409),(20.86377,9.493789),(20.874209,9.502496),(20.912656,9.544328),(20.921234,9.558978),(20.925058,9.569598),(20.934257,9.577065),(20.955961,9.589416),(20.960508,9.598123),(20.962265,9.606934),(20.96764,9.610603),(20.983143,9.603678),(20.981799,9.616778),(20.980145,9.619931),(20.975804,9.624168),(20.975804,9.630964),(20.989964,9.635615),(20.996062,9.648301),(20.996888,9.682175),(21.000092,9.697394),(21.014252,9.724472),(21.017352,9.743592),(21.019936,9.747933),(21.025621,9.753256),(21.032339,9.75801),(21.037816,9.760671),(21.039056,9.76217),(21.04009,9.764754),(21.042674,9.767079),(21.048358,9.768165),(21.052906,9.765891),(21.062207,9.756201),(21.065825,9.754496),(21.073163,9.757648),(21.080294,9.762609),(21.09311,9.77434),(21.097037,9.775373),(21.101585,9.774237),(21.105202,9.77403),(21.106753,9.778061),(21.105926,9.791884),(21.106753,9.79545),(21.121739,9.831907),(21.131971,9.849426),(21.187264,9.885134),(21.195429,9.887305),(21.198427,9.902988),(21.205661,9.916838),(21.256924,9.975749),(21.27129,9.987247),(21.28514,9.978591),(21.326067,9.962752),(21.339503,9.95991),(21.374333,9.973113),(21.406889,10.005566),(21.433348,10.046055),(21.485437,10.164316),(21.513239,10.200515),(21.544969,10.219997),(21.554477,10.218654),(21.566673,10.214494),(21.579282,10.212272),(21.589721,10.216613),(21.593441,10.214546),(21.625274,10.224493),(21.630648,10.227439),(21.65628,10.233666),(21.668889,10.249195),(21.67695,10.269168),(21.688939,10.288908),(21.697414,10.292422),(21.708886,10.293533),(21.718808,10.296634),(21.723046,10.305987),(21.722116,10.314178),(21.717775,10.328983),(21.716845,10.339809),(21.720462,10.360816),(21.751054,10.41182),(21.743613,10.418978),(21.742786,10.425773),(21.74444,10.432439),(21.744233,10.439106),(21.738032,10.44802),(21.720462,10.468018),(21.716845,10.47732),(21.714674,10.493702),(21.705476,10.53202),(21.703305,10.552406),(21.705476,10.571811),(21.714674,10.601395),(21.716845,10.621007),(21.722632,10.636716),(21.736482,10.646173),(21.753431,10.650721),(21.768418,10.651987),(21.774205,10.655165),(21.778753,10.66227),(21.784851,10.669324),(21.795393,10.672476),(21.803558,10.673665),(21.822575,10.678755),(21.83291,10.679944),(21.852754,10.670151),(21.863606,10.667929),(21.86836,10.676223),(21.872081,10.677592),(21.895025,10.699193),(21.925617,10.720122),(21.943084,10.728261),(22.003855,10.743273),(22.014604,10.754564),(22.004889,10.775519),(22.0114,10.789291),(22.018325,10.809884),(22.029487,10.828746),(22.048607,10.836988),(22.132426,10.828539),(22.148239,10.830761),(22.176351,10.816214),(22.189787,10.837298),(22.200639,10.868666),(22.229371,10.891972),(22.24012,10.905899),(22.253039,10.915304),(22.268439,10.908999),(22.2765,10.908534),(22.287249,10.91595),(22.305956,10.932564),(22.318772,10.939359),(22.339442,10.947731),(22.361146,10.953648),(22.36469,10.954209),(22.391842,10.958505),(22.407035,10.963053),(22.419231,10.970727),(22.437627,10.991552),(22.447136,10.99827),(22.460468,11.000828),(22.476281,10.99796),(22.490751,10.993154),(22.502843,10.992173),(22.511938,11.000828),(22.534676,10.98052),(22.55576,10.978969)]
+Switzerland	[(8.617437,47.757319),(8.62984,47.762796),(8.635007,47.784604),(8.644102,47.791012),(8.657022,47.788118),(8.666633,47.778273),(8.674488,47.766698),(8.68193,47.75874),(8.692265,47.757164),(8.703324,47.758714),(8.713142,47.757422),(8.719757,47.747319),(8.71707,47.743547),(8.703737,47.730033),(8.70043,47.723496),(8.704667,47.715332),(8.712625,47.708691),(8.715106,47.701069),(8.71707,47.694558),(8.769883,47.695074),(8.761718,47.70125),(8.77071,47.720861),(8.797581,47.720034),(8.830241,47.707192),(8.856079,47.690682),(8.837682,47.687788),(8.837786,47.680838),(8.851935,47.671282),(8.852668,47.670786),(8.881711,47.656136),(8.906205,47.651795),(8.945376,47.654302),(8.981756,47.662156),(8.997673,47.673835),(9.016586,47.6789),(9.128104,47.670425),(9.183398,47.670425),(9.196937,47.656136),(9.234351,47.656162),(9.273211,47.65009),(9.547482,47.534547),(9.553059,47.516891),(9.554951,47.5109),(9.58451,47.480721),(9.621717,47.469197),(9.650346,47.452092),(9.649519,47.409717),(9.639804,47.394524),(9.601047,47.36127),(9.596396,47.352305),(9.591228,47.334683),(9.587404,47.32781),(9.553298,47.299853),(9.521155,47.262801),(9.504618,47.243732),(9.487358,47.210014),(9.484981,47.176346),(9.492629,47.15981),(9.503481,47.145392),(9.511853,47.129372),(9.51237,47.10803),(9.502861,47.094698),(9.487565,47.083949),(9.475886,47.073226),(9.477023,47.063898),(9.499554,47.059351),(9.560636,47.0524),(9.581203,47.05687),(9.59991,47.053486),(9.65231,47.05793),(9.669053,47.056199),(9.857982,47.015478),(9.856328,47.004083),(9.860566,47.001602),(9.866767,47.001938),(9.870591,46.998838),(9.870591,46.992947),(9.866457,46.983387),(9.863976,46.959925),(9.860772,46.949151),(9.862426,46.939772),(9.875138,46.927421),(9.899943,46.914398),(10.006913,46.890757),(10.045567,46.865564),(10.068098,46.856624),(10.1113,46.847116),(10.125188,46.846751),(10.13197,46.846573),(10.157808,46.851612),(10.201423,46.86683),(10.211655,46.877036),(10.214342,46.884685),(10.215169,46.893108),(10.219924,46.905769),(10.235116,46.923313),(10.251343,46.92538),(10.270773,46.921892),(10.295681,46.922693),(10.296198,46.941374),(10.313665,46.964318),(10.338883,46.98411),(10.367925,46.995505),(10.373403,46.996254),(10.378984,46.995505),(10.384255,46.993153),(10.384358,46.993153),(10.384358,46.992998),(10.394693,46.985402),(10.415571,46.962406),(10.449574,46.943906),(10.458462,46.936619),(10.463836,46.919747),(10.451434,46.88577),(10.453811,46.864427),(10.44854,46.832233),(10.444923,46.823241),(10.439032,46.816885),(10.417224,46.79885),(10.419085,46.783967),(10.426216,46.76942),(10.428696,46.755648),(10.416604,46.743014),(10.399654,46.735546),(10.395623,46.7264),(10.396554,46.715005),(10.394383,46.70082),(10.384771,46.689012),(10.373919,46.681906),(10.369165,46.672398),(10.377537,46.653277),(10.395623,46.638808),(10.438205,46.635656),(10.459082,46.623564),(10.466627,46.604288),(10.465903,46.578476),(10.457945,46.553697),(10.451833,46.546702),(10.443993,46.537729),(10.425906,46.535326),(10.354282,46.548323),(10.319452,46.546049),(10.306637,46.547496),(10.295371,46.551087),(10.289067,46.555687),(10.283796,46.560725),(10.275941,46.565531),(10.234703,46.575298),(10.230259,46.58615),(10.235737,46.606691),(10.233773,46.617982),(10.217856,46.626974),(10.192122,46.626819),(10.09745,46.608035),(10.087839,46.604392),(10.083498,46.597002),(10.071199,46.564394),(10.062931,46.556746),(10.04133,46.541863),(10.032752,46.532975),(10.031408,46.525792),(10.031201,46.503829),(10.02686,46.493184),(10.028101,46.483934),(10.030478,46.476673),(10.035335,46.471066),(10.044017,46.466984),(10.026344,46.446262),(10.042053,46.432722),(10.071405,46.424816),(10.116157,46.418822),(10.133417,46.414016),(10.140755,46.402905),(10.13321,46.381098),(10.125976,46.37438),(10.104995,46.361357),(10.09745,46.351642),(10.092386,46.338103),(10.091766,46.328956),(10.095797,46.320533),(10.104892,46.309371),(10.14613,46.280277),(10.158945,46.262449),(10.14582,46.243328),(10.117914,46.231133),(10.075746,46.220022),(10.042673,46.220487),(10.041847,46.24307),(10.031718,46.260072),(9.992237,46.284359),(9.977561,46.298105),(9.97105,46.320016),(9.970636,46.339808),(9.964022,46.356086),(9.93901,46.367455),(9.918443,46.37115),(9.899013,46.372158),(9.855398,46.366964),(9.788839,46.343296),(9.768065,46.33862),(9.755249,46.340532),(9.730858,46.350712),(9.720109,46.350893),(9.709257,46.342392),(9.707293,46.330972),(9.708844,46.319629),(9.70843,46.311748),(9.693134,46.297072),(9.674324,46.291801),(9.559705,46.292731),(9.536451,46.298622),(9.515264,46.308596),(9.502551,46.32074),(9.482604,46.35681),(9.473716,46.361874),(9.451598,46.370375),(9.444364,46.375284),(9.4424,46.380891),(9.443847,46.396136),(9.437852,46.492047),(9.434648,46.498326),(9.426794,46.497111),(9.410671,46.488895),(9.403849,46.482513),(9.400335,46.475407),(9.395478,46.469413),(9.384626,46.466416),(9.377081,46.468689),(9.351553,46.485484),(9.350829,46.497861),(9.330986,46.501504),(9.282306,46.49737),(9.263186,46.485122),(9.245823,46.461041),(9.237968,46.436547),(9.24758,46.423033),(9.260912,46.416651),(9.262876,46.406626),(9.260292,46.394017),(9.260396,46.379728),(9.273831,46.344252),(9.275175,46.331385),(9.268974,46.309371),(9.239725,46.266996),(9.224842,46.231184),(9.215747,46.221056),(9.204172,46.213563),(9.192183,46.209635),(9.181331,46.204054),(9.17575,46.194132),(9.171099,46.182609),(9.163788,46.172989),(9.163244,46.172273),(9.090587,46.138167),(9.072087,46.118892),(9.068159,46.105972),(9.07033,46.083441),(9.067126,46.071142),(9.059168,46.061789),(9.049659,46.057913),(9.027748,46.053107),(9.002117,46.03931),(8.997776,46.027941),(9.015553,45.993111),(8.982686,45.971975),(8.980516,45.969495),(8.979793,45.966911),(8.980516,45.964379),(8.982686,45.961847),(8.993435,45.95425),(9.001703,45.93606),(9.010798,45.926655),(9.020514,45.922779),(9.042321,45.919731),(9.051726,45.915545),(9.063095,45.898957),(9.059271,45.881955),(9.034363,45.848107),(9.002427,45.820718),(8.972351,45.824646),(8.939588,45.834826),(8.900004,45.826403),(8.903725,45.841802),(8.909719,45.853688),(8.91375,45.86609),(8.912096,45.883402),(8.906515,45.896476),(8.898144,45.90955),(8.88078,45.931099),(8.870962,45.947067),(8.864451,45.953424),(8.857733,45.957093),(8.800372,45.978538),(8.785076,45.982311),(8.767919,45.983086),(8.769573,45.985773),(8.773397,45.990579),(8.790967,46.018691),(8.819596,46.042927),(8.834375,46.066388),(8.80895,46.089746),(8.793861,46.093415),(8.763165,46.092898),(8.747145,46.094449),(8.739497,46.098066),(8.732159,46.107419),(8.728983,46.108233),(8.723891,46.109538),(8.71769,46.107523),(8.702187,46.097963),(8.695055,46.095172),(8.677485,46.095792),(8.630873,46.114706),(8.611546,46.119357),(8.601831,46.122819),(8.538682,46.187621),(8.51026,46.207878),(8.482665,46.217542),(8.456517,46.224828),(8.43812,46.23537),(8.427165,46.251442),(8.423237,46.275833),(8.426648,46.301568),(8.442874,46.353373),(8.446285,46.382183),(8.445768,46.412362),(8.441634,46.434945),(8.427888,46.44869),(8.399156,46.452179),(8.385907,46.450206),(8.343449,46.443885),(8.316267,46.433653),(8.294976,46.418046),(8.286605,46.40536),(8.290429,46.401122),(8.297043,46.397634),(8.297457,46.387506),(8.291462,46.378359),(8.281541,46.370116),(8.270068,46.364044),(8.24175,46.354123),(8.192554,46.309164),(8.171883,46.299191),(8.128475,46.292473),(8.106874,46.285548),(8.087341,46.271802),(8.077315,46.262035),(8.073078,46.253612),(8.076592,46.249736),(8.09995,46.235629),(8.129509,46.196044),(8.132299,46.159354),(8.110595,46.126953),(8.066877,46.100598),(8.056025,46.098066),(8.035354,46.096516),(8.025329,46.091141),(8.018197,46.080858),(8.016027,46.069385),(8.015924,46.058172),(8.010653,46.029698),(8.008792,46.027683),(7.999077,46.0128),(7.998354,46.010629),(7.985848,45.999312),(7.978717,45.995178),(7.969105,45.993111),(7.898205,45.981949),(7.883782,45.973869),(7.872917,45.959383),(7.870201,45.94037),(7.84962,45.939712),(7.848389,45.938076),(7.845288,45.927792),(7.846115,45.922573),(7.843738,45.919214),(7.831232,45.91446),(7.825444,45.914666),(7.807564,45.91849),(7.780072,45.918129),(7.732013,45.930376),(7.722195,45.929601),(7.71465,45.92712),(7.706279,45.925725),(7.69398,45.928671),(7.692533,45.931203),(7.673722,45.950323),(7.658736,45.960038),(7.643027,45.966343),(7.541121,45.984119),(7.524377,45.978073),(7.514662,45.966704),(7.503707,45.956731),(7.482726,45.954871),(7.452961,45.945879),(7.393843,45.9157),(7.361803,45.907845),(7.286666,45.913426),(7.27354,45.910274),(7.245428,45.89813),(7.183726,45.880456),(7.153547,45.876529),(7.120888,45.876116),(7.090192,45.880508),(7.066938,45.890223),(7.022083,45.92526),(7.015158,45.933321),(7.009784,45.943398),(7.002756,45.961692),(6.991283,45.982466),(6.987666,45.993111),(6.982808,45.995385),(6.915112,46.048612),(6.892375,46.055588),(6.884003,46.053211),(6.876872,46.048095),(6.869224,46.044064),(6.859715,46.044994),(6.85093,46.049645),(6.85031,46.052746),(6.852377,46.056931),(6.851964,46.064683),(6.853411,46.065665),(6.853101,46.076103),(6.851344,46.086025),(6.848553,46.085043),(6.853101,46.090211),(6.861162,46.097032),(6.86819,46.10468),(6.869224,46.112329),(6.853927,46.122612),(6.774346,46.134808),(6.765664,46.151603),(6.774863,46.185864),(6.792226,46.221676),(6.827676,46.269477),(6.804938,46.296607),(6.769488,46.322678),(6.750368,46.345518),(6.755742,46.357068),(6.782097,46.378462),(6.789229,46.395205),(6.788107,46.405008),(6.787058,46.414171),(6.777756,46.424093),(6.777716,46.424106),(6.762667,46.42926),(6.613684,46.455899),(6.547021,46.457372),(6.482942,46.448587),(6.397676,46.408176),(6.365223,46.40244),(6.332357,46.401381),(6.301558,46.394482),(6.269105,46.375026),(6.24058,46.348955),(6.219496,46.329111),(6.214122,46.315469),(6.218256,46.305495),(6.227454,46.288494),(6.227971,46.284463),(6.237583,46.267926),(6.24182,46.263689),(6.252259,46.259916),(6.269002,46.265239),(6.27603,46.26312),(6.281198,46.240073),(6.255359,46.221107),(6.191384,46.191704),(6.140328,46.150207),(6.107875,46.138632),(6.073872,46.149174),(6.028293,46.147934),(5.982921,46.140441),(5.95884,46.130467),(5.972172,46.152171),(5.979821,46.162248),(5.982921,46.170826),(5.965248,46.186226),(5.954809,46.19992),(5.95853,46.211961),(5.982921,46.222709),(6.042866,46.24307),(6.044519,46.243432),(6.046173,46.243535),(6.048033,46.243432),(6.055888,46.241675),(6.061883,46.241158),(6.067671,46.241623),(6.089685,46.246377),(6.094026,46.253044),(6.093095,46.262294),(6.093612,46.273094),(6.100743,46.301413),(6.104051,46.309216),(6.118607,46.331771),(6.1364,46.359342),(6.135057,46.370401),(6.122861,46.385542),(6.108185,46.396497),(6.059019,46.417383),(6.054235,46.419416),(6.065707,46.427012),(6.067567,46.433601),(6.0655,46.440371),(6.0655,46.447993),(6.064777,46.451068),(6.0624,46.455202),(6.060229,46.459904),(6.060229,46.46502),(6.064157,46.471118),(6.075525,46.479593),(6.110355,46.520831),(6.145702,46.55163),(6.121517,46.570285),(6.118417,46.583463),(6.131853,46.595607),(6.266315,46.680356),(6.337938,46.707409),(6.34786,46.71317),(6.374215,46.733609),(6.407391,46.745701),(6.417933,46.751101),(6.429199,46.760816),(6.433023,46.76911),(6.432609,46.785983),(6.425168,46.791615),(6.419897,46.796525),(6.417107,46.802157),(6.418554,46.807015),(6.434263,46.839545),(6.441188,46.848149),(6.443118,46.851455),(6.446769,46.857709),(6.448422,46.871559),(6.445219,46.882617),(6.431886,46.900032),(6.427752,46.909076),(6.442635,46.944164),(6.491107,46.963388),(6.598698,46.986539),(6.665412,47.021291),(6.688253,47.043848),(6.676264,47.0624),(6.6897,47.07829),(6.699105,47.084621),(6.72422,47.09077),(6.72794,47.097126),(6.731661,47.098883),(6.746027,47.103948),(6.744787,47.121053),(6.774759,47.128184),(6.838076,47.168132),(6.840285,47.169525),(6.859302,47.190919),(6.888344,47.211305),(6.956247,47.245231),(6.952216,47.270036),(6.958624,47.290551),(6.977434,47.303729),(6.986529,47.304504),(6.991904,47.305951),(7.006476,47.319361),(7.016915,47.323521),(7.027147,47.325433),(7.036552,47.329515),(7.044303,47.340497),(7.033865,47.350651),(7.018879,47.359901),(7.003996,47.368143),(6.985599,47.362123),(6.86664,47.354165),(6.871601,47.366955),(6.884003,47.382587),(6.898783,47.395713),(6.924517,47.405996),(6.926068,47.424858),(6.952319,47.428837),(6.968546,47.435194),(6.983429,47.443798),(6.990973,47.452221),(6.986116,47.464132),(6.97578,47.477956),(6.9733,47.489092),(6.991904,47.492942),(7.000792,47.49767),(7.009784,47.499247),(7.018879,47.49767),(7.027974,47.492942),(7.053915,47.490384),(7.103731,47.496275),(7.127296,47.492942),(7.140318,47.487852),(7.142169,47.487651),(7.153651,47.486405),(7.180833,47.488265),(7.162642,47.459895),(7.168327,47.443565),(7.190031,47.434728),(7.219383,47.428476),(7.223517,47.426228),(7.226308,47.422636),(7.230339,47.419019),(7.23809,47.416797),(7.244808,47.417727),(7.282635,47.428889),(7.309093,47.432661),(7.33693,47.431854),(7.378547,47.430646),(7.388219,47.433289),(7.406349,47.438242),(7.420563,47.450857),(7.426089,47.455761),(7.429293,47.465114),(7.427639,47.470747),(7.422782,47.475424),(7.419474,47.477852),(7.41441,47.484028),(7.414307,47.490177),(7.425986,47.492503),(7.441488,47.488834),(7.445996,47.486884),(7.454511,47.483201),(7.46743,47.481909),(7.482726,47.491263),(7.484483,47.492942),(7.485827,47.495784),(7.48593,47.498394),(7.485776,47.498768),(7.484897,47.5009),(7.477765,47.507696),(7.475595,47.511726),(7.476939,47.514879),(7.482726,47.516997),(7.493062,47.515499),(7.501123,47.517307),(7.505464,47.523018),(7.505154,47.533017),(7.501743,47.532965),(7.485103,47.541595),(7.482726,47.542267),(7.520867,47.563416),(7.526341,47.566452),(7.550319,47.575495),(7.585483,47.584479),(7.586028,47.584619),(7.637032,47.594977),(7.659666,47.596579),(7.646541,47.571542),(7.635895,47.564591),(7.612337,47.564731),(7.609747,47.564746),(7.646901,47.551445),(7.661423,47.546246),(7.683438,47.544257),(7.72732,47.550423),(7.76674,47.555961),(7.78555,47.563196),(7.801467,47.576089),(7.819657,47.595339),(7.833713,47.590481),(7.898205,47.587846),(7.904303,47.583557),(7.907507,47.574177),(7.90947,47.564798),(7.912157,47.560561),(8.042279,47.560561),(8.087237,47.567382),(8.096952,47.571852),(8.101397,47.576193),(8.105427,47.581257),(8.113902,47.587846),(8.122067,47.592135),(8.143771,47.600067),(8.162065,47.603762),(8.168886,47.608646),(8.173847,47.613529),(8.179015,47.615803),(8.232965,47.621952),(8.251051,47.622004),(8.276993,47.61663),(8.288569,47.615803),(8.293943,47.611462),(8.299317,47.601824),(8.306345,47.592187),(8.316164,47.587846),(8.354094,47.581024),(8.41807,47.580766),(8.4211,47.581112),(8.448869,47.58428),(8.450109,47.589034),(8.461788,47.606139),(8.49238,47.619833),(8.522353,47.621901),(8.537752,47.612134),(8.549638,47.598594),(8.551719,47.596863),(8.560697,47.589396),(8.574133,47.592445),(8.576305,47.595023),(8.580644,47.600171),(8.581781,47.607664),(8.581264,47.614769),(8.582504,47.62159),(8.582091,47.625027),(8.579714,47.628929),(8.57806,47.633476),(8.580334,47.639005),(8.583951,47.641124),(8.589222,47.642468),(8.593563,47.642571),(8.594493,47.640969),(8.595113,47.63482),(8.601624,47.632598),(8.607309,47.656291),(8.598214,47.656885),(8.593589,47.658169),(8.582194,47.66133),(8.568241,47.662932),(8.519666,47.657351),(8.504679,47.65226),(8.49083,47.645568),(8.476051,47.640401),(8.458274,47.639884),(8.437603,47.647842),(8.411972,47.661045),(8.407011,47.661562),(8.391301,47.665464),(8.397709,47.67629),(8.395229,47.684817),(8.390991,47.692129),(8.392128,47.699519),(8.401947,47.707089),(8.427268,47.716468),(8.437913,47.723186),(8.445458,47.743185),(8.450109,47.750471),(8.463648,47.763907),(8.471503,47.76706),(8.482665,47.766853),(8.536512,47.774088),(8.551602,47.779255),(8.5423,47.795017),(8.558216,47.801166),(8.583124,47.800236),(8.601624,47.794603),(8.603175,47.787317),(8.604105,47.774398),(8.607619,47.762254),(8.617437,47.757319)]
+Clipperton Island	[(-109.212026,10.30268),(-109.210357,10.288723),(-109.218577,10.281562),(-109.228017,10.292141),(-109.234242,10.307929),(-109.225942,10.311021),(-109.212026,10.30268)]
+Cameroon	[(14.560692,12.766224),(14.569374,12.769403),(14.569374,12.75961),(14.570717,12.750386),(14.575265,12.744908),(14.584877,12.746355),(14.603997,12.760798),(14.610612,12.762349),(14.618363,12.759196),(14.620327,12.754055),(14.62074,12.747853),(14.624254,12.741885),(14.641721,12.730904),(14.648129,12.725116),(14.664458,12.715969),(14.694017,12.723721),(14.709934,12.718243),(14.716755,12.70181),(14.702079,12.668995),(14.713654,12.65251),(14.728847,12.677212),(14.734118,12.680416),(14.743317,12.67716),(14.752102,12.668944),(14.758716,12.658815),(14.761403,12.649358),(14.768845,12.633235),(14.786208,12.63122),(14.819178,12.638816),(14.830753,12.618249),(14.863826,12.495466),(14.860105,12.490091),(14.852044,12.474692),(14.850184,12.468129),(14.849563,12.457019),(14.85101,12.455158),(14.855455,12.454538),(14.863826,12.447045),(14.861862,12.452006),(14.865893,12.452574),(14.872404,12.450404),(14.877469,12.447045),(14.878502,12.443066),(14.876849,12.431594),(14.877469,12.427201),(14.891215,12.402655),(14.908268,12.326897),(14.906304,12.317957),(14.904857,12.248401),(14.9031,12.236257),(14.898036,12.219462),(14.898036,12.207473),(14.90093,12.200032),(14.905891,12.195639),(14.910128,12.190368),(14.911575,12.180136),(14.907441,12.17347),(14.899896,12.171765),(14.894832,12.167372),(14.898036,12.152799),(14.9031,12.145875),(14.928732,12.128615),(14.950746,12.103345),(14.964802,12.092441),(14.976791,12.094147),(14.993844,12.106704),(15.011827,12.108616),(15.030431,12.100916),(15.049448,12.084586),(15.04459,12.078385),(15.04087,12.067585),(15.04056,12.055648),(15.045727,12.046088),(15.053065,12.038026),(15.053685,12.031877),(15.051205,12.024228),(15.049448,12.011929),(15.05968,11.997305),(15.076836,11.982836),(15.081177,11.971673),(15.052548,11.967229),(15.048311,11.962785),(15.050585,11.952863),(15.055546,11.942476),(15.05937,11.936792),(15.063401,11.927283),(15.056579,11.918447),(15.046967,11.910179),(15.042006,11.902375),(15.044177,11.877312),(15.050998,11.861603),(15.06278,11.853489),(15.079834,11.851216),(15.086345,11.840467),(15.110943,11.782899),(15.105362,11.772719),(15.089135,11.75763),(15.083554,11.748173),(15.085311,11.744039),(15.095957,11.734117),(15.097197,11.727657),(15.093063,11.722903),(15.086345,11.72218),(15.079834,11.722593),(15.076113,11.721456),(15.068258,11.700114),(15.066501,11.680632),(15.069395,11.660788),(15.085208,11.615881),(15.09575,11.598156),(15.123862,11.563171),(15.135644,11.530822),(15.122312,11.503227),(15.076113,11.453307),(15.067018,11.435556),(15.06061,11.416126),(15.054305,11.364088),(15.049448,11.348714),(15.049448,11.337268),(15.052548,11.329801),(15.057819,11.325356),(15.062264,11.320034),(15.06309,11.309931),(15.056373,11.29342),(15.033325,11.26027),(15.028261,11.244483),(15.021233,11.182549),(15.02883,11.080218),(15.035185,10.994627),(15.06247,10.930703),(15.072702,10.915769),(15.079007,10.898147),(15.075596,10.873498),(15.06309,10.830761),(15.065881,10.793115),(15.142259,10.647207),(15.149907,10.623125),(15.14846,10.607338),(15.138435,10.589691),(15.132337,10.565403),(15.131717,10.540701),(15.138228,10.521659),(15.144429,10.51631),(15.153628,10.511969),(15.164686,10.509075),(15.176055,10.50799),(15.186597,10.505871),(15.193315,10.501195),(15.198173,10.496492),(15.218326,10.487216),(15.227215,10.470137),(15.241167,10.432904),(15.255637,10.41704),(15.268763,10.406343),(15.278374,10.394276),(15.282199,10.374588),(15.284266,10.349292),(15.29057,10.328983),(15.301422,10.311749),(15.439192,10.185245),(15.476399,10.132742),(15.490661,10.124448),(15.490144,10.120107),(15.536137,10.080523),(15.602799,10.04099),(15.637939,10.029957),(15.681244,9.991278),(15.663777,9.98611),(15.439398,9.931695),(15.382968,9.930196),(15.214916,9.984095),(15.155488,9.986523),(15.109599,9.981537),(15.100711,9.978901),(15.089445,9.972183),(15.071669,9.955957),(15.06123,9.949239),(15.033015,9.942857),(15.002422,9.945053),(14.944131,9.958825),(14.898139,9.960478),(14.772566,9.921747),(14.732465,9.923814),(14.440493,9.995308),(14.196341,9.979147),(14.181697,9.978178),(14.173532,9.975025),(14.171155,9.96761),(14.170638,9.957843),(14.168365,9.94774),(14.119789,9.85201),(14.088473,9.809635),(14.006721,9.739277),(13.945949,9.652642),(13.947603,9.637759),(14.036486,9.568771),(14.321327,9.243158),(14.331145,9.200215),(14.349542,9.168356),(14.571699,8.99099),(14.793856,8.813623),(14.809876,8.808611),(14.819178,8.811608),(14.827963,8.813158),(14.836748,8.813003),(14.846049,8.810988),(14.859899,8.803314),(14.89938,8.774323),(14.908268,8.764841),(14.913332,8.752438),(14.919947,8.74771),(14.927285,8.745075),(14.934416,8.739003),(14.940101,8.729649),(14.949092,8.704276),(14.951469,8.692106),(14.951469,8.68283),(14.955087,8.676216),(14.968523,8.672159),(15.005833,8.66663),(15.031258,8.658749),(15.051928,8.643789),(15.068568,8.623867),(15.110736,8.555138),(15.16851,8.498604),(15.183703,8.479148),(15.210706,8.421822),(15.345347,8.13599),(15.406532,7.921585),(15.440742,7.839419),(15.487871,7.804951),(15.509368,7.804021),(15.540787,7.796838),(15.562905,7.792445),(15.562181,7.690178),(15.548952,7.630801),(15.521977,7.576076),(15.481049,7.523263),(15.473298,7.509103),(15.419451,7.43655),(15.415524,7.42084),(15.434954,7.402908),(15.432784,7.389731),(15.428443,7.388801),(15.409633,7.387664),(15.403225,7.386372),(15.397437,7.380739),(15.389169,7.364151),(15.385345,7.358363),(15.338216,7.32219),(15.261321,7.279247),(15.246564,7.266731),(15.223908,7.247517),(15.205097,7.200233),(15.191248,7.177341),(15.186597,7.166334),(15.185357,7.156877),(15.190214,7.098793),(15.187527,7.088612),(15.179052,7.07838),(15.156108,7.067787),(15.147013,7.061844),(15.136161,7.045308),(15.128926,7.026497),(15.113217,6.964692),(15.080247,6.878083),(15.05906,6.836276),(15.042213,6.790775),(15.034565,6.776771),(15.022369,6.766539),(14.962321,6.736696),(14.946095,6.72574),(14.932452,6.710289),(14.921874,6.686414),(14.807292,6.4278),(14.782177,6.393616),(14.780007,6.382221),(14.784348,6.358683),(14.784658,6.347805),(14.782384,6.336772),(14.772255,6.318323),(14.734842,6.270445),(14.719029,6.257862),(14.576402,6.189778),(14.534957,6.190088),(14.525966,6.174069),(14.510979,6.155336),(14.482144,6.127069),(14.467054,6.122599),(14.443903,6.100249),(14.430571,6.088079),(14.431811,6.084617),(14.432709,6.079123),(14.433568,6.073868),(14.429124,6.064179),(14.426023,6.059864),(14.422509,6.051363),(14.418169,6.047126),(14.412898,6.047022),(14.402459,6.054877),(14.397705,6.053947),(14.390263,6.045782),(14.387266,6.039038),(14.389436,6.031054),(14.397705,6.019169),(14.406076,6.01103),(14.417548,5.997258),(14.432328,5.98545),(14.446901,5.970024),(14.453825,5.953875),(14.458166,5.936409),(14.465711,5.920673),(14.482144,5.90964),(14.499197,5.909537),(14.530616,5.90592),(14.545396,5.907573),(14.572474,5.924187),(14.584773,5.923412),(14.598003,5.903491),(14.602964,5.883389),(14.617433,5.864966),(14.624047,5.758306),(14.631075,5.738049),(14.624358,5.723605),(14.610612,5.669138),(14.592835,5.62387),(14.590148,5.608289),(14.591491,5.590952),(14.596556,5.577232),(14.610612,5.553667),(14.617226,5.53788),(14.61888,5.525452),(14.617433,5.495299),(14.614126,5.48486),(14.599553,5.456645),(14.596246,5.440108),(14.597279,5.41148),(14.592835,5.400033),(14.579606,5.395382),(14.579296,5.387605),(14.570821,5.370939),(14.560796,5.355462),(14.555938,5.351328),(14.553974,5.338228),(14.548393,5.320503),(14.539608,5.303579),(14.528033,5.293011),(14.519868,5.290583),(14.523899,5.279679),(14.539712,5.261799),(14.560485,5.248595),(14.603584,5.234255),(14.624461,5.224049),(14.640481,5.208236),(14.651539,5.187514),(14.658877,5.164544),(14.663218,5.141832),(14.663012,5.091447),(14.667456,5.052768),(14.660324,5.015793),(14.660132,5.01144),(14.659498,4.997035),(14.663425,4.985717),(14.669833,4.977113),(14.674484,4.967579),(14.672107,4.940811),(14.675827,4.93076),(14.681615,4.920941),(14.686989,4.908875),(14.701459,4.814384),(14.700632,4.804282),(14.696084,4.779735),(14.691847,4.768702),(14.69071,4.762139),(14.697325,4.745215),(14.704249,4.669354),(14.717272,4.622019),(14.74373,4.57998),(14.779697,4.545047),(14.938344,4.435932),(14.982062,4.420481),(14.993947,4.413298),(15.000562,4.403195),(15.007383,4.37777),(15.013894,4.364257),(15.048518,4.321649),(15.063814,4.293434),(15.072806,4.265942),(15.082934,4.205507),(15.084484,4.148611),(15.091202,4.121791),(15.102571,4.112412),(15.117764,4.114324),(15.132854,4.108536),(15.139262,4.094583),(15.142569,4.08045),(15.14846,4.073938),(15.162413,4.073938),(15.177709,4.071458),(15.189801,4.063112),(15.192075,4.052234),(15.172438,4.043811),(15.150424,4.038514),(15.111253,4.019937),(15.091719,4.015854),(15.075183,4.017973),(15.043143,4.026138),(15.025987,4.026086),(15.084898,3.885836),(15.171301,3.758971),(15.25264,3.672852),(15.262306,3.662589),(15.329741,3.590996),(15.413973,3.50188),(15.517946,3.391603),(15.616855,3.286777),(15.7107,3.187455),(15.78563,3.107977),(15.793175,3.103274),(15.80103,3.100897),(15.813536,3.098985),(15.817566,3.100122),(15.829142,3.106633),(15.834206,3.108545),(15.840201,3.107408),(15.850949,3.100432),(15.854773,3.098985),(15.897768,3.103533),(15.913995,3.097952),(15.933425,3.081777),(15.950065,3.061003),(15.95823,3.041521),(15.971562,2.991188),(15.974249,2.985762),(15.977763,2.980956),(15.982001,2.976719),(15.995437,2.981473),(16.006082,2.983953),(16.015797,2.983488),(16.026236,2.978992),(16.034194,2.970621),(16.055381,2.93977),(16.070161,2.906594),(16.08246,2.885665),(16.092382,2.863289),(16.095172,2.836779),(16.086904,2.813163),(16.059929,2.786188),(16.056208,2.759833),(16.060032,2.72583),(16.059309,2.711825),(16.062616,2.703195),(16.072848,2.702834),(16.086284,2.704952),(16.0991,2.70397),(16.110468,2.701438),(16.101373,2.687847),(16.093725,2.67312),(16.090315,2.661906),(16.093105,2.641494),(16.108505,2.606612),(16.111502,2.5862),(16.106851,2.567028),(16.091245,2.532766),(16.090315,2.510494),(16.094345,2.497523),(16.107058,2.474165),(16.111502,2.455872),(16.111502,2.418562),(16.112949,2.410448),(16.120907,2.389571),(16.133413,2.364818),(16.152326,2.343269),(16.159251,2.332934),(16.162868,2.323839),(16.164729,2.314795),(16.165969,2.294796),(16.169069,2.289887),(16.182919,2.281154),(16.186536,2.277692),(16.18695,2.26932),(16.181265,2.256556),(16.179715,2.246996),(16.192841,2.239503),(16.196665,2.236454),(16.202349,2.23201),(16.207723,2.22307),(16.199455,2.212166),(16.159251,2.18209),(16.140647,2.199815),(16.12039,2.203329),(16.104371,2.193562),(16.097756,2.171548),(16.085767,2.149172),(16.083493,2.137752),(16.08556,2.12491),(16.089798,2.116151),(16.092485,2.106901),(16.090315,2.092742),(16.088144,2.09176),(16.084113,2.091605),(16.079669,2.090261),(16.076672,2.08592),(16.075535,2.079952),(16.075535,2.075456),(16.076155,2.07282),(16.076672,2.072252),(16.078119,2.063441),(16.08153,2.055638),(16.081736,2.046827),(16.06644,2.025485),(16.063753,2.015873),(16.06489,1.97895),(16.068714,1.973602),(16.074915,1.970604),(16.083493,1.963008),(16.101373,1.932803),(16.135066,1.845315),(16.159044,1.734805),(16.15584,1.719069),(16.145092,1.714315),(16.123594,1.721601),(16.114809,1.719069),(16.069851,1.654551),(16.030473,1.705401),(16.021998,1.72279),(16.021998,1.733048),(16.024892,1.742479),(16.026339,1.752297),(16.021998,1.763795),(16.013833,1.771314),(16.002775,1.775913),(15.990786,1.776172),(15.98045,1.770591),(15.963191,1.77736),(15.94376,1.781624),(15.928981,1.788962),(15.92588,1.804749),(15.915235,1.798961),(15.901799,1.793742),(15.889913,1.793277),(15.884952,1.801648),(15.882369,1.816712),(15.875651,1.823766),(15.865936,1.828468),(15.842061,1.844152),(15.815396,1.853428),(15.80289,1.859965),(15.76465,1.908722),(15.757415,1.912985),(15.734057,1.916706),(15.721552,1.921615),(15.711113,1.927377),(15.706772,1.931976),(15.611791,1.942544),(15.526628,1.967814),(15.48291,1.97585),(15.439192,1.969829),(15.388135,1.939547),(15.367981,1.932855),(15.349171,1.923295),(15.337389,1.92146),(15.337802,1.92376),(15.314341,1.93425),(15.309484,1.935077),(15.301629,1.943578),(15.300182,1.94766),(15.301939,1.953319),(15.303283,1.966419),(15.301112,1.973757),(15.295428,1.981534),(15.287573,1.987787),(15.25357,2.000318),(15.248092,2.003341),(15.244165,2.010059),(15.238687,2.025304),(15.233726,2.031298),(15.212642,2.039618),(15.197036,2.034967),(15.1836,2.029335),(15.151664,2.040988),(15.138538,2.011506),(15.123862,2.01701),(15.117764,2.01701),(15.107636,2.000835),(15.091616,1.984428),(15.074873,1.979364),(15.06309,1.997166),(15.04366,1.990862),(15.028261,1.995306),(14.980718,2.033107),(14.971003,2.034451),(14.963045,2.010421),(14.953846,2.005822),(14.932142,2.003341),(14.892455,2.00639),(14.896589,2.030937),(14.907338,2.058894),(14.887804,2.072252),(14.8846,2.082096),(14.871474,2.101656),(14.857005,2.115944),(14.850184,2.109795),(14.850184,2.097367),(14.84822,2.085197),(14.841192,2.075921),(14.826309,2.072252),(14.764814,2.065456),(14.76161,2.070185),(14.76254,2.092535),(14.761403,2.099589),(14.756339,2.099589),(14.747554,2.097186),(14.737116,2.096075),(14.727297,2.099589),(14.733498,2.102018),(14.747864,2.113205),(14.720889,2.127597),(14.713654,2.12398),(14.720476,2.099589),(14.705696,2.105532),(14.685956,2.125866),(14.672003,2.134341),(14.646062,2.133359),(14.636346,2.13832),(14.644821,2.154185),(14.620947,2.16483),(14.587874,2.201727),(14.562139,2.208807),(14.557075,2.202399),(14.547773,2.193666),(14.54798,2.184364),(14.550254,2.175166),(14.54705,2.166536),(14.538058,2.163383),(14.4592,2.146537),(14.438736,2.133979),(14.432948,2.132119),(14.418685,2.135271),(14.399358,2.153151),(14.383649,2.162091),(14.320293,2.17067),(14.276265,2.153565),(14.266963,2.152428),(14.16175,2.15341),(14.002793,2.154805),(13.823993,2.156407),(13.662266,2.157761),(13.620336,2.158112),(13.466547,2.159508),(13.294568,2.161058),(13.294258,2.185759),(13.298392,2.215835),(13.294155,2.230511),(13.284646,2.242242),(13.26966,2.255729),(13.254157,2.266891),(13.242891,2.27149),(13.235967,2.269888),(13.221601,2.263946),(13.212299,2.264049),(13.205684,2.266891),(13.191732,2.277692),(13.163827,2.283169),(13.133337,2.284513),(13.124656,2.281051),(13.11308,2.272731),(13.09303,2.253455),(13.083521,2.249528),(13.04094,2.244205),(13.012931,2.256298),(12.996912,2.260018),(12.983166,2.253455),(12.97221,2.250355),(12.954847,2.253249),(12.924771,2.264049),(12.914539,2.254541),(12.903171,2.250355),(12.890458,2.251388),(12.876402,2.257176),(12.867824,2.24498),(12.848084,2.249321),(12.825243,2.259243),(12.808189,2.264049),(12.79558,2.258778),(12.784108,2.249528),(12.770155,2.240691),(12.749898,2.236712),(12.614609,2.256918),(12.590735,2.265703),(12.574819,2.277692),(12.551461,2.272266),(12.534201,2.277692),(12.47839,2.295882),(12.439943,2.298517),(12.384856,2.285908),(12.366769,2.289577),(12.334006,2.309576),(12.321604,2.314072),(12.312096,2.312935),(12.291218,2.301773),(12.28078,2.299034),(12.261039,2.296192),(12.222592,2.283324),(12.202645,2.279552),(12.159237,2.281412),(12.118826,2.28782),(12.100739,2.288492),(12.041931,2.283996),(11.966174,2.28875),(11.889796,2.282084),(11.802153,2.284823),(11.768149,2.280172),(11.75275,2.281877),(11.701384,2.298724),(11.681023,2.315415),(11.671204,2.320996),(11.657252,2.322495),(11.644643,2.319653),(11.618598,2.310403),(11.351637,2.300584),(11.349777,2.291489),(11.354325,2.278467),(11.355978,2.265186),(11.349984,2.25113),(11.342232,2.240588),(11.335928,2.229167),(11.334171,2.212786),(11.334171,2.20028),(11.332414,2.188033),(11.328486,2.176302),(11.322078,2.16576),(11.022975,2.165709),(10.723769,2.165657),(10.424666,2.165657),(10.409686,2.165654),(10.189983,2.165616),(10.125562,2.165605),(9.990997,2.165605),(9.97074,2.168913),(9.907488,2.200487),(9.890125,2.204569),(9.872141,2.211236),(9.84682,2.228547),(9.823669,2.249011),(9.810853,2.264876),(9.808682,2.285495),(9.811886,2.306165),(9.81106,2.324872),(9.799571,2.341742),(9.812185,2.353583),(9.812185,2.359809),(9.819184,2.376939),(9.822927,2.562934),(9.853201,2.696967),(9.870453,2.738105),(9.874278,2.754543),(9.877778,2.881415),(9.88795,2.926907),(9.903331,2.968329),(9.922048,2.99726),(9.94337,3.023139),(9.95574,3.050482),(9.958018,3.082221),(9.919688,3.228095),(9.90211,3.251695),(9.90211,3.257961),(9.911632,3.257717),(9.917979,3.259467),(9.929454,3.264797),(9.929454,3.271552),(9.91391,3.270331),(9.903087,3.272895),(9.89503,3.278306),(9.88795,3.285224),(9.881521,3.294338),(9.855317,3.343573),(9.780935,3.436754),(9.739024,3.47309),(9.6421,3.539049),(9.664236,3.543931),(9.68865,3.556098),(9.770763,3.61872),(9.792817,3.627183),(9.819591,3.627875),(9.787608,3.637112),(9.759613,3.626166),(9.733653,3.60932),(9.706879,3.600531),(9.638438,3.594387),(9.626231,3.600002),(9.621349,3.612779),(9.625987,3.626451),(9.6421,3.63467),(9.612559,3.704983),(9.565115,3.770901),(9.551524,3.79621),(9.545909,3.819648),(9.570974,3.795478),(9.576671,3.792304),(9.581554,3.787828),(9.58961,3.766099),(9.594249,3.758205),(9.606944,3.752265),(9.624278,3.75019),(9.662608,3.750718),(9.652517,3.756049),(9.621104,3.76496),(9.611013,3.770575),(9.607107,3.774726),(9.604259,3.779975),(9.597423,3.788886),(9.589203,3.809638),(9.592133,3.83515),(9.60377,3.859036),(9.621104,3.874823),(9.659028,3.84101),(9.679698,3.836086),(9.689789,3.860582),(9.723481,3.843817),(9.736339,3.834174),(9.744477,3.819648),(9.750336,3.830268),(9.750499,3.840766),(9.74586,3.850898),(9.738292,3.860582),(9.741466,3.861029),(9.751964,3.860582),(9.704926,3.877509),(9.682872,3.890448),(9.67628,3.909003),(9.68922,3.922431),(9.715017,3.931342),(9.743337,3.93594),(9.764415,3.936347),(9.764334,3.940741),(9.76295,3.943793),(9.758149,3.950019),(9.760753,3.951361),(9.76295,3.951239),(9.764415,3.952338),(9.764415,3.957465),(9.664806,3.940375),(9.634613,3.943183),(9.618907,3.960354),(9.623709,3.985785),(9.639903,4.008775),(9.65919,4.018866),(9.675629,4.03384),(9.718923,4.099555),(9.748302,4.114447),(9.752452,4.119818),(9.756847,4.129828),(9.754568,4.135688),(9.738292,4.12873),(9.719493,4.114936),(9.710948,4.105699),(9.703461,4.09394),(9.696625,4.09394),(9.696625,4.114447),(9.678884,4.10102),(9.646332,4.051459),(9.628429,4.031928),(9.606619,4.020657),(9.579356,4.013007),(9.559337,4.016791),(9.559581,4.039374),(9.545909,4.025702),(9.526622,4.035793),(9.508556,4.054185),(9.498546,4.077216),(9.504242,4.100775),(9.490082,4.115871),(9.478526,4.111396),(9.450369,4.080308),(9.452891,4.076972),(9.457286,4.071112),(9.46518,4.068101),(9.474294,4.066148),(9.484386,4.059882),(9.485362,4.055325),(9.495616,4.03148),(9.507009,4.019477),(9.523611,4.00609),(9.532481,3.989447),(9.518565,3.970445),(9.504242,3.976142),(9.497081,3.977688),(9.490082,3.980658),(9.476899,3.990912),(9.464041,4.01203),(9.458344,4.016181),(9.453868,4.018622),(9.451182,4.022773),(9.450369,4.031928),(9.437999,4.030463),(9.42921,4.026557),(9.424083,4.019477),(9.422374,4.008368),(9.449392,3.992133),(9.456554,3.984076),(9.458832,3.972357),(9.456391,3.963528),(9.452403,3.953925),(9.450369,3.939765),(9.453298,3.932115),(9.469086,3.923407),(9.476899,3.915839),(9.464041,3.90998),(9.448253,3.905748),(9.41212,3.902167),(9.393403,3.904283),(9.359223,3.913723),(9.343516,3.915839),(9.313731,3.930854),(9.302582,3.964993),(9.307628,4.001939),(9.326182,4.025702),(9.326182,4.031928),(9.301443,4.026353),(9.290294,4.009711),(9.284353,3.992255),(9.250336,3.960842),(9.220714,3.96601),(9.210704,3.96426),(9.211111,3.982571),(9.213227,3.996568),(9.210623,4.008124),(9.196462,4.018866),(9.184744,4.020901),(9.166515,4.020901),(9.148774,4.019029),(9.138682,4.015448),(9.123383,4.01789),(9.07016,4.051418),(8.983409,4.092434),(8.971202,4.100775),(8.969412,4.128974),(8.988455,4.18891),(8.990977,4.217475),(8.960297,4.245917),(8.93629,4.279527),(8.918956,4.318061),(8.894786,4.460517),(8.900076,4.485093),(8.926036,4.529608),(8.93572,4.55329),(8.913585,4.528632),(8.900564,4.521633),(8.894786,4.535875),(8.897227,4.548),(8.901541,4.560248),(8.904307,4.573188),(8.901622,4.587388),(8.893809,4.594631),(8.871918,4.602484),(8.864106,4.61872),(8.856293,4.62995),(8.847016,4.639716),(8.83961,4.642646),(8.835704,4.629625),(8.86671,4.582709),(8.873709,4.560045),(8.867849,4.544582),(8.858735,4.540839),(8.850597,4.547431),(8.847016,4.563218),(8.798595,4.601142),(8.798025,4.588284),(8.79949,4.577786),(8.80421,4.570136),(8.812836,4.566352),(8.799571,4.542182),(8.795177,4.539008),(8.788422,4.541449),(8.768565,4.553127),(8.764415,4.556627),(8.757009,4.56509),(8.740571,4.571234),(8.724132,4.580471),(8.716563,4.597724),(8.705903,4.63467),(8.661306,4.698798),(8.655121,4.738267),(8.638682,4.71308),(8.645356,4.684068),(8.660492,4.653998),(8.68572,4.561225),(8.694835,4.55329),(8.706309,4.547675),(8.716563,4.539008),(8.722667,4.513129),(8.701671,4.501288),(8.576671,4.491889),(8.56544,4.49726),(8.570323,4.50967),(8.582693,4.523342),(8.593761,4.532782),(8.581716,4.538479),(8.570567,4.53856),(8.562673,4.533189),(8.556407,4.511705),(8.54835,4.507799),(8.537364,4.508531),(8.525564,4.511705),(8.510265,4.527045),(8.505056,4.55093),(8.509939,4.568834),(8.525564,4.566352),(8.530772,4.57925),(8.552094,4.614732),(8.538341,4.604641),(8.525727,4.604438),(8.516124,4.612982),(8.511241,4.629055),(8.513682,4.64232),(8.521169,4.655951),(8.538585,4.676215),(8.567638,4.69599),(8.573253,4.704088),(8.573578,4.716376),(8.569672,4.728339),(8.567638,4.74022),(8.573253,4.752509),(8.580089,4.745063),(8.576508,4.784654),(8.57838,4.804674),(8.590017,4.813381),(8.594168,4.815294),(8.594179,4.815299),(8.594186,4.815299),(8.595113,4.815314),(8.612166,4.831877),(8.608446,4.846217),(8.605448,4.86004),(8.602245,4.881331),(8.61103,4.896653),(8.638315,4.916781),(8.644412,4.934868),(8.683687,4.99688),(8.683687,4.997035),(8.698569,5.017809),(8.707871,5.037549),(8.722651,5.08119),(8.728852,5.094548),(8.748282,5.12421),(8.758307,5.134881),(8.769469,5.139946),(8.781252,5.141987),(8.79169,5.146741),(8.798925,5.159635),(8.825693,5.295492),(8.82466,5.306137),(8.816392,5.330296),(8.815255,5.343499),(8.821663,5.367684),(8.84316,5.409981),(8.849775,5.432357),(8.849258,5.453467),(8.845744,5.472794),(8.844297,5.492353),(8.850498,5.514006),(8.865484,5.533462),(8.884294,5.551445),(8.899487,5.570953),(8.903932,5.595086),(8.8937,5.621751),(8.874889,5.64144),(8.852565,5.658674),(8.832411,5.678156),(8.819286,5.703451),(8.826934,5.717817),(8.844607,5.730866),(8.862177,5.752337),(8.866621,5.777452),(8.857836,5.794893),(8.847087,5.810758),(8.845227,5.831041),(8.855872,5.847499),(8.891219,5.871116),(8.904655,5.888117),(8.921708,5.904473),(8.943206,5.901424),(8.965013,5.893595),(8.982686,5.895765),(8.986304,5.908814),(8.988474,5.937287),(8.993849,5.944083),(9.009868,5.952351),(9.022477,5.965813),(9.043871,5.996689),(9.043871,5.996844),(9.136165,6.092523),(9.273315,6.202775),(9.298843,6.238432),(9.327368,6.298506),(9.341011,6.313983),(9.354757,6.321502),(9.366539,6.32269),(9.379148,6.321605),(9.394961,6.322535),(9.422866,6.339356),(9.453149,6.397673),(9.482604,6.415992),(9.48859,6.418208),(9.528596,6.433019),(9.548957,6.443174),(9.56477,6.458599),(9.588127,6.502731),(9.60301,6.515185),(9.632673,6.521153),(9.644806,6.521226),(9.680525,6.521438),(9.693031,6.531308),(9.69398,6.534305),(9.769822,6.773722),(9.788529,6.794754),(9.8123,6.793049),(9.83173,6.783566),(9.851161,6.777882),(9.874622,6.787701),(10.119465,6.994406),(10.142926,7.007687),(10.156878,7.004742),(10.165043,6.988515),(10.179409,6.914928),(10.189848,6.895446),(10.210828,6.879168),(10.238424,6.871003),(10.495979,6.874672),(10.496599,6.897151),(10.500733,6.912809),(10.508898,6.926348),(10.521197,6.942781),(10.527502,6.947484),(10.533186,6.948828),(10.537424,6.952135),(10.543315,7.028719),(10.55179,7.06634),(10.564192,7.102668),(10.578661,7.130832),(10.597161,7.107268),(10.602536,7.058072),(10.620623,7.043757),(10.646978,7.035076),(10.716947,6.998127),(10.799113,6.967328),(10.831876,6.94521),(10.848206,6.905316),(10.857404,6.859789),(10.877454,6.816097),(10.909391,6.784264),(11.002615,6.767262),(11.036721,6.740546),(11.055945,6.700367),(11.059045,6.652722),(11.057392,6.613008),(11.060596,6.573967),(11.077442,6.496736),(11.097079,6.449117),(11.113512,6.434001),(11.140384,6.43028),(11.202276,6.436739),(11.231748,6.439815),(11.237122,6.438058),(11.248285,6.431004),(11.255519,6.42997),(11.261514,6.432554),(11.272159,6.442037),(11.27588,6.444207),(11.286835,6.443225),(11.308539,6.437903),(11.319495,6.437283),(11.344196,6.443122),(11.369828,6.455757),(11.389361,6.473921),(11.395666,6.496736),(11.401764,6.538181),(11.41675,6.572003),(11.443105,6.593268),(11.482585,6.597169),(11.509767,6.612311),(11.533435,6.645099),(11.562374,6.712485),(11.568885,6.739099),(11.571469,6.766229),(11.566611,6.784187),(11.544597,6.80894),(11.538086,6.8239),(11.543667,6.850694),(11.561754,6.876067),(11.623249,6.932291),(11.681126,6.96862),(11.684847,6.973839),(11.688464,6.986913),(11.692495,6.991616),(11.697249,6.992856),(11.707481,6.991822),(11.718643,6.994458),(11.73425,6.995078),(11.741071,6.997507),(11.746859,7.005362),(11.748616,7.014973),(11.75151,7.023965),(11.766392,7.033525),(11.80887,7.071921),(11.820343,7.078794),(11.833985,7.08298),(11.845147,7.081946),(11.854139,7.077812),(11.862614,7.075435),(11.872226,7.079362),(11.881321,7.102048),(11.868918,7.127111),(11.829954,7.169383),(11.780242,7.241058),(11.766186,7.252943),(11.742415,7.257439),(11.736627,7.263279),(11.744585,7.272167),(11.762465,7.285551),(11.782722,7.304517),(11.844734,7.396397),(11.903545,7.453557),(11.966174,7.514426),(11.992839,7.55401),(12.008548,7.564862),(12.021054,7.576231),(12.024981,7.596592),(12.010719,7.655244),(12.009065,7.676328),(12.012166,7.698343),(12.018987,7.718858),(12.054954,7.783919),(12.154276,7.921326),(12.192103,7.960652),(12.197787,7.975173),(12.1951,7.99171),(12.188175,8.016256),(12.182698,8.054652),(12.182594,8.093486),(12.188279,8.117774),(12.229103,8.175497),(12.233713,8.188455),(12.236751,8.196994),(12.237682,8.21689),(12.221765,8.29766),(12.219285,8.343161),(12.227036,8.386311),(12.249981,8.418764),(12.271788,8.427781),(12.310235,8.421348),(12.331319,8.424293),(12.343205,8.432742),(12.351163,8.44424),(12.357571,8.456358),(12.365116,8.466564),(12.395191,8.487338),(12.403873,8.496537),(12.403253,8.524235),(12.400462,8.538421),(12.377001,8.59511),(12.368836,8.609579),(12.396328,8.600768),(12.410591,8.598494),(12.42444,8.599786),(12.440253,8.606608),(12.451829,8.614695),(12.464334,8.621154),(12.482524,8.623247),(12.495547,8.619553),(12.527793,8.604851),(12.542572,8.602008),(12.557972,8.605677),(12.660395,8.659318),(12.678171,8.678696),(12.692848,8.710891),(12.701633,8.739158),(12.708867,8.750914),(12.720236,8.756469),(12.734499,8.755901),(12.747211,8.753627),(12.759613,8.75342),(12.772946,8.759053),(12.794547,8.788612),(12.805709,8.831503),(12.82824,9.019967),(12.821005,9.056425),(12.822142,9.09681),(12.842192,9.14443),(12.888391,9.226725),(12.894592,9.243959),(12.898416,9.262433),(12.899347,9.302017),(12.891285,9.33199),(12.88157,9.352221),(12.853148,9.356639),(12.848394,9.359947),(12.855422,9.378111),(12.862036,9.382891),(12.920741,9.410486),(12.929009,9.416119),(12.940068,9.4271),(12.969006,9.464075),(12.982442,9.474591),(13.051689,9.504511),(13.13034,9.516526),(13.195453,9.542209),(13.223461,9.613135),(13.228422,9.677912),(13.241341,9.745324),(13.251056,9.76925),(13.260461,9.785709),(13.262942,9.801728),(13.251987,9.824234),(13.222944,9.854128),(13.212712,9.870148),(13.211059,9.892756),(13.218707,9.913039),(13.242271,9.949756),(13.246405,9.973475),(13.242478,9.992673),(13.230489,10.025358),(13.230179,10.045331),(13.247956,10.079412),(13.281339,10.092098),(13.359784,10.100547),(13.378387,10.108609),(13.392672,10.116957),(13.401952,10.122381),(13.423242,10.138478),(13.434921,10.153412),(13.450837,10.187157),(13.453008,10.200515),(13.451354,10.212117),(13.444533,10.232477),(13.444843,10.245474),(13.467167,10.307589),(13.501274,10.496337),(13.538791,10.62142),(13.566283,10.679013),(13.744411,10.930497),(13.749839,10.942442),(13.75702,10.958247),(13.750406,10.996203),(13.75485,11.016719),(13.765909,11.033901),(13.782032,11.047518),(13.820066,11.069274),(13.832054,11.084803),(13.849211,11.124568),(13.873189,11.166503),(13.906262,11.208025),(13.943882,11.245723),(13.98233,11.276264),(14.013129,11.276367),(14.052506,11.265153),(14.122579,11.235724),(14.14325,11.232726),(14.165471,11.238333),(14.186762,11.249237),(14.204642,11.26213),(14.232133,11.290294),(14.244329,11.295436),(14.271304,11.29864),(14.279159,11.301844),(14.368249,11.383001),(14.387059,11.393388),(14.446281,11.411682),(14.467261,11.423852),(14.503951,11.456304),(14.524932,11.468836),(14.576609,11.487336),(14.593765,11.496431),(14.605754,11.514725),(14.616193,11.538677),(14.623841,11.563481),(14.627561,11.584359),(14.627148,11.60968),(14.62136,11.629782),(14.610198,11.646835),(14.593868,11.66301),(14.588597,11.669676),(14.585083,11.676808),(14.580949,11.683267),(14.573508,11.687711),(14.556455,11.687505),(14.552424,11.689003),(14.543329,11.701096),(14.541882,11.709829),(14.546533,11.718614),(14.583223,11.766363),(14.590665,11.783158),(14.612059,11.88496),(14.623427,11.916535),(14.627148,11.950073),(14.626941,11.957204),(14.625184,11.968108),(14.606271,12.011258),(14.604307,12.03043),(14.622187,12.042005),(14.619913,12.052495),(14.637173,12.124222),(14.643168,12.13585),(14.648129,12.141844),(14.650609,12.148097),(14.669936,12.167424),(14.668283,12.178069),(14.663425,12.187578),(14.651539,12.193779),(14.643168,12.190627),(14.629318,12.183495),(14.616296,12.178948),(14.610612,12.183547),(14.6041,12.204321),(14.588287,12.217188),(14.568134,12.22773),(14.548497,12.241579),(14.558315,12.246902),(14.562139,12.248401),(14.562139,12.255842),(14.551184,12.260441),(14.521521,12.282352),(14.51439,12.28938),(14.512426,12.29863),(14.517594,12.313358),(14.51439,12.323538),(14.487105,12.337801),(14.42313,12.353149),(14.217561,12.359298),(14.202161,12.362502),(14.188932,12.370409),(14.179837,12.385602),(14.179113,12.397281),(14.185108,12.427873),(14.185418,12.447045),(14.180216,12.46353),(14.1787,12.468336),(14.177356,12.545592),(14.121132,12.81179),(14.064908,13.077988),(14.418169,13.081141),(14.435429,13.070289),(14.481041,13.000508),(14.482144,12.99882),(14.496303,12.983808),(14.504675,12.969003),(14.507672,12.95244),(14.506122,12.93208),(14.490619,12.886346),(14.490102,12.873608),(14.500437,12.859113),(14.53103,12.836246),(14.549013,12.818211),(14.549013,12.780461),(14.55108,12.771573),(14.554801,12.766896),(14.560692,12.766224)]
+Republic of Congo	[(17.627275,3.626317),(17.70913,3.626421),(17.714505,3.627506),(17.72608,3.631847),(17.733212,3.632208),(17.73993,3.629159),(17.749645,3.618075),(17.755949,3.614509),(17.765148,3.614354),(17.784475,3.61823),(17.793156,3.617506),(17.808349,3.608592),(17.821165,3.593994),(17.83057,3.575674),(17.835324,3.555831),(17.842146,3.540147),(17.856408,3.537305),(17.875322,3.542731),(17.913562,3.561334),(17.919247,3.565597),(17.924518,3.563453),(17.959865,3.541077),(17.969476,3.537511),(17.981879,3.538803),(18.013091,3.55397),(18.047094,3.563143),(18.082028,3.563453),(18.116444,3.552007),(18.134014,3.534824),(18.146727,3.494904),(18.159852,3.480305),(18.181556,3.477386),(18.202537,3.487333),(18.220004,3.503947),(18.231579,3.521156),(18.235403,3.530923),(18.242535,3.561127),(18.248529,3.574899),(18.255867,3.577225),(18.264859,3.574744),(18.275918,3.574382),(18.355603,3.581462),(18.361597,3.58017),(18.372863,3.574537),(18.379891,3.574382),(18.383715,3.578),(18.387849,3.591668),(18.392293,3.595854),(18.403662,3.597353),(18.420612,3.596371),(18.429707,3.600221),(18.448,3.618023),(18.459059,3.631382),(18.472081,3.632053),(18.497093,3.61146),(18.513422,3.592237),(18.55435,3.526375),(18.570267,3.489607),(18.582462,3.477386),(18.626387,3.476869),(18.634552,3.449222),(18.642407,3.323829),(18.631141,3.17898),(18.62184,3.156656),(18.619669,3.14477),(18.613055,3.128182),(18.597345,3.114643),(18.562102,3.096815),(18.541431,3.08281),(18.528409,3.064775),(18.495336,2.966073),(18.479626,2.941372),(18.475802,2.931192),(18.471771,2.909229),(18.467327,2.898894),(18.44924,2.873004),(18.425159,2.822154),(18.421852,2.808822),(18.418338,2.781743),(18.393223,2.713686),(18.316742,2.584339),(18.313745,2.575968),(18.303513,2.572557),(18.246152,2.518917),(18.233026,2.502587),(18.225171,2.486464),(18.214113,2.427657),(18.207808,2.407968),(18.199126,2.389106),(18.187964,2.370916),(18.174012,2.336138),(18.16378,2.321048),(18.146727,2.315932),(18.142696,2.3057),(18.118615,2.276968),(18.111173,2.265289),(18.072416,2.160024),(18.072416,2.145193),(18.078307,2.114807),(18.080787,2.084163),(18.076033,1.988484),(18.081718,1.942415),(18.081511,1.92655),(18.078307,1.90929),(18.068178,1.876217),(18.066111,1.858983),(18.073656,1.572334),(18.071382,1.551457),(18.012264,1.421956),(18.006683,1.402396),(18.002033,1.365783),(17.966996,1.253723),(17.963379,1.191453),(17.956247,1.171661),(17.914803,1.102001),(17.892478,1.077403),(17.873255,1.039628),(17.86664,1.016632),(17.878216,0.947178),(17.877906,0.867907),(17.907671,0.740473),(17.907568,0.713084),(17.892582,0.63588),(17.893202,0.607664),(17.8993,0.583273),(17.91842,0.535214),(17.933096,0.527049),(17.943638,0.510823),(17.949943,0.491496),(17.95201,0.474339),(17.945498,0.377291),(17.939917,0.361271),(17.854031,0.241072),(17.77538,0.026408),(17.757086,-0.009456),(17.716365,-0.195801),(17.713678,-0.220916),(17.716262,-0.246237),(17.740756,-0.346179),(17.749541,-0.523429),(17.741997,-0.533351),(17.728044,-0.553092),(17.664172,-0.612726),(17.658694,-0.619754),(17.654457,-0.627506),(17.652493,-0.642182),(17.650943,-0.646316),(17.647636,-0.649933),(17.635853,-0.658512),(17.623038,-0.673291),(17.60216,-0.688691),(17.545863,-0.756491),(17.411474,-0.918341),(17.385429,-0.942422),(17.364965,-0.967227),(17.357317,-0.973531),(17.330446,-0.986554),(17.327655,-0.991721),(17.308018,-1.014976),(17.297683,-1.021074),(17.245386,-1.035853),(17.194847,-1.042984),(17.175416,-1.048255),(17.10865,-1.075644),(17.060488,-1.089183),(17.028655,-1.094454),(17.022557,-1.097038),(17.012015,-1.104273),(17.005918,-1.106753),(17.003127,-1.112851),(16.979563,-1.140239),(16.940495,-1.174759),(16.909179,-1.211139),(16.862567,-1.248863),(16.839726,-1.262506),(16.833215,-1.269017),(16.828667,-1.276252),(16.817815,-1.304157),(16.794664,-1.345498),(16.779265,-1.382395),(16.762728,-1.405856),(16.725521,-1.47996),(16.692552,-1.522955),(16.669504,-1.56936),(16.655971,-1.59029),(16.636224,-1.62083),(16.628886,-1.637263),(16.623822,-1.6538),(16.622478,-1.665169),(16.623099,-1.699172),(16.617207,-1.728731),(16.604185,-1.754052),(16.524971,-1.858535),(16.522536,-1.861746),(16.517162,-1.873735),(16.513958,-1.887377),(16.507757,-1.890271),(16.49029,-1.903604),(16.474787,-1.910115),(16.470033,-1.912699),(16.460938,-1.920864),(16.445642,-1.940501),(16.382596,-2.002202),(16.340222,-2.034138),(16.284411,-2.087572),(16.256093,-2.106795),(16.231288,-2.129016),(16.206793,-2.160952),(16.194598,-2.182036),(16.187363,-2.204567),(16.188603,-2.227718),(16.19005,-2.23547),(16.189947,-2.241878),(16.176924,-2.286836),(16.174857,-2.303062),(16.178268,-2.318462),(16.187466,-2.332311),(16.189843,-2.337479),(16.191704,-2.346884),(16.192324,-2.39515),(16.225603,-2.635239),(16.204519,-2.782723),(16.180852,-2.85414),(16.178165,-2.868093),(16.177028,-2.882459),(16.183981,-2.940449),(16.188293,-2.976406),(16.184469,-3.026119),(16.189843,-3.082343),(16.185709,-3.136397),(16.189947,-3.153036),(16.199248,-3.171847),(16.199455,-3.194791),(16.193357,-3.238406),(16.198628,-3.25949),(16.210411,-3.271065),(16.222089,-3.279127),(16.227464,-3.289876),(16.225603,-3.313233),(16.220746,-3.331733),(16.207723,-3.361913),(16.158424,-3.447282),(16.137857,-3.500715),(16.115533,-3.544227),(16.053314,-3.619985),(16.012697,-3.702254),(16.005255,-3.724784),(15.991096,-3.738944),(15.974249,-3.786486),(15.94314,-3.840746),(15.936112,-3.848498),(15.930324,-3.858626),(15.912134,-3.917434),(15.888019,-3.940523),(15.882989,-3.945339),(15.844231,-3.965597),(15.799996,-3.978826),(15.755141,-3.985647),(15.711216,-3.992158),(15.566832,-4.038047),(15.549056,-4.046212),(15.533759,-4.057994),(15.52115,-4.076804),(15.490351,-4.175196),(15.484977,-4.183878),(15.462859,-4.207132),(15.458932,-4.21385),(15.45025,-4.217261),(15.425446,-4.23018),(15.386585,-4.244339),(15.275274,-4.300357),(15.25574,-4.313069),(15.228352,-4.324851),(15.20396,-4.339011),(15.193418,-4.358751),(15.188044,-4.372187),(15.150678,-4.425151),(15.09792,-4.499931),(15.076113,-4.520085),(15.022783,-4.54706),(15.014618,-4.558015),(15.00821,-4.571038),(14.931005,-4.646899),(14.849047,-4.783738),(14.841399,-4.800171),(14.831167,-4.815054),(14.815457,-4.827973),(14.768431,-4.84823),(14.702182,-4.889571),(14.672727,-4.899907),(14.634486,-4.903627),(14.623324,-4.899493),(14.592111,-4.88058),(14.579606,-4.876342),(14.575058,-4.873655),(14.566893,-4.860529),(14.562139,-4.855878),(14.553871,-4.855155),(14.532477,-4.856188),(14.528033,-4.852157),(14.519868,-4.841305),(14.501471,-4.840685),(14.481937,-4.845853),(14.470052,-4.852157),(14.449484,-4.873965),(14.437289,-4.880166),(14.418169,-4.883163),(14.400702,-4.886264),(14.396464,-4.855878),(14.412588,-4.778157),(14.408763,-4.767822),(14.403699,-4.75883),(14.399668,-4.749321),(14.399048,-4.737539),(14.401529,-4.728134),(14.409177,-4.710564),(14.410934,-4.701056),(14.406903,-4.676044),(14.395844,-4.660128),(14.380962,-4.646175),(14.365769,-4.627262),(14.3575,-4.589124),(14.349956,-4.566904),(14.350783,-4.559049),(14.358947,-4.544579),(14.37476,-4.530213),(14.412588,-4.514504),(14.424576,-4.502308),(14.435739,-4.486702),(14.452482,-4.467995),(14.466538,-4.448048),(14.469742,-4.429341),(14.46323,-4.422623),(14.428607,-4.400402),(14.409074,-4.377561),(14.392744,-4.352756),(14.386026,-4.338287),(14.385716,-4.332913),(14.389126,-4.327538),(14.393467,-4.313172),(14.395224,-4.300357),(14.395328,-4.289711),(14.392847,-4.281753),(14.387059,-4.277102),(14.368559,-4.278446),(14.325461,-4.301803),(14.279986,-4.312759),(14.259625,-4.326918),(14.222212,-4.359784),(14.184694,-4.377458),(14.146351,-4.38986),(14.058397,-4.400505),(14.021087,-4.415388),(13.991631,-4.455076),(13.989874,-4.45797),(13.987704,-4.46014),(13.971788,-4.471612),(13.954941,-4.491869),(13.944502,-4.498071),(13.934581,-4.498484),(13.905436,-4.4901),(13.904401,-4.489802),(13.87629,-4.491663),(13.867091,-4.489286),(13.856136,-4.479674),(13.84208,-4.453422),(13.832881,-4.441227),(13.810454,-4.426654),(13.78999,-4.424587),(13.726531,-4.446704),(13.714956,-4.453009),(13.711028,-4.464481),(13.721777,-4.561012),(13.71816,-4.580339),(13.702605,-4.62075),(13.699091,-4.642661),(13.712475,-4.685656),(13.705861,-4.694338),(13.698368,-4.693511),(13.690099,-4.691134),(13.681934,-4.695371),(13.6778,-4.706327),(13.680591,-4.724723),(13.67532,-4.731751),(13.666535,-4.732682),(13.643694,-4.726274),(13.633979,-4.725654),(13.613101,-4.739193),(13.591397,-4.779397),(13.57986,-4.783031),(13.570727,-4.785908),(13.558634,-4.780431),(13.538894,-4.759967),(13.526182,-4.754282),(13.51471,-4.755936),(13.482257,-4.77485),(13.492385,-4.783531),(13.496416,-4.792109),(13.493522,-4.799654),(13.482257,-4.805545),(13.430787,-4.843372),(13.403192,-4.876859),(13.39265,-4.885334),(13.371359,-4.841719),(13.364124,-4.806889),(13.35875,-4.794797),(13.349345,-4.785598),(13.334565,-4.777537),(13.274001,-4.755833),(13.255811,-4.743947),(13.208785,-4.703123),(13.18212,-4.686069),(13.172405,-4.676148),(13.160002,-4.643385),(13.142122,-4.61734),(13.134061,-4.602354),(13.112357,-4.576929),(13.087966,-4.579513),(13.071532,-4.60163),(13.073703,-4.635323),(13.027194,-4.612172),(12.961565,-4.533831),(12.921981,-4.502308),(12.902447,-4.480191),(12.884464,-4.432131),(12.869891,-4.411978),(12.854285,-4.403089),(12.842296,-4.40433),(12.830307,-4.409704),(12.814804,-4.412908),(12.801058,-4.410014),(12.782656,-4.400071),(12.775426,-4.396165),(12.761681,-4.391204),(12.737909,-4.40495),(12.726541,-4.427997),(12.718479,-4.451872),(12.70494,-4.467995),(12.686853,-4.47833),(12.670523,-4.491353),(12.656571,-4.507372),(12.634867,-4.54768),(12.623808,-4.559255),(12.608098,-4.565043),(12.497201,-4.5853),(12.429091,-4.607521),(12.414105,-4.608865),(12.387026,-4.605454),(12.377621,-4.619407),(12.378862,-4.662298),(12.374107,-4.683176),(12.332353,-4.765858),(12.321914,-4.778157),(12.307651,-4.783635),(12.273752,-4.787149),(12.258559,-4.790766),(12.244089,-4.796347),(12.235201,-4.803995),(12.222592,-4.780637),(12.213497,-4.769165),(12.204092,-4.763481),(12.192206,-4.763481),(12.187555,-4.768028),(12.15717,-4.870554),(12.130815,-4.912929),(12.018072,-5.0086),(12.009608,-5.019631),(11.994314,-5.005792),(11.980479,-4.989435),(11.957856,-4.951918),(11.920258,-4.906427),(11.895728,-4.882645),(11.886241,-4.855239),(11.830586,-4.797022),(11.82021,-4.7848),(11.819266,-4.77916),(11.824069,-4.77236),(11.829961,-4.773533),(11.843319,-4.788783),(11.848424,-4.786044),(11.853137,-4.773918),(11.850367,-4.752839),(11.824067,-4.718683),(11.781633,-4.680409),(11.776906,-4.667878),(11.777688,-4.657701),(11.801321,-4.657938),(11.820163,-4.637281),(11.824624,-4.614767),(11.806409,-4.577118),(11.692982,-4.463491),(11.589122,-4.374688),(11.497895,-4.294041),(11.450587,-4.26473),(11.401403,-4.221366),(11.382498,-4.191013),(11.377696,-4.184666),(11.364757,-4.162774),(11.362071,-4.15309),(11.363129,-4.131117),(11.362153,-4.119806),(11.358246,-4.111912),(11.270181,-4.041725),(11.172425,-3.977474),(11.139095,-3.9531),(11.114016,-3.936856),(11.129623,-3.907857),(11.196091,-3.728815),(11.212524,-3.697293),(11.238569,-3.675072),(11.272676,-3.652954),(11.302441,-3.62846),(11.334688,-3.608616),(11.375822,-3.600348),(11.413959,-3.587635),(11.436283,-3.559006),(11.45499,-3.528207),(11.482585,-3.509294),(11.532712,-3.516528),(11.569815,-3.54495),(11.64919,-3.673315),(11.665933,-3.691401),(11.687638,-3.69874),(11.742105,-3.691712),(11.762155,-3.693985),(11.819723,-3.710418),(11.838326,-3.710935),(11.840808,-3.709989),(11.858377,-3.703287),(11.879977,-3.687164),(11.897651,-3.66608),(11.905505,-3.643549),(11.898477,-3.622362),(11.879254,-3.612026),(11.855586,-3.604378),(11.834915,-3.592079),(11.824994,-3.571202),(11.827784,-3.548051),(11.884835,-3.413279),(11.898374,-3.389198),(11.941472,-3.356952),(11.954908,-3.335454),(11.944366,-3.303208),(11.905712,-3.285121),(11.858273,-3.272099),(11.821893,-3.254839),(11.781585,-3.221663),(11.760501,-3.209054),(11.703864,-3.185386),(11.696113,-3.179598),(11.687534,-3.17102),(11.685674,-3.167196),(11.687328,-3.161511),(11.688258,-3.092265),(11.693219,-3.074695),(11.706448,-3.04989),(11.716886,-3.043586),(11.730632,-3.044723),(11.75368,-3.042345),(11.778381,-3.027153),(11.778381,-3.005655),(11.763705,-2.982608),(11.687638,-2.901786),(11.653118,-2.851659),(11.636788,-2.833263),(11.616841,-2.826751),(11.588419,-2.835433),(11.547905,-2.863855),(11.530748,-2.866749),(11.52558,-2.843288),(11.535566,-2.804996),(11.537466,-2.797709),(11.61033,-2.678853),(11.619528,-2.653532),(11.624386,-2.632758),(11.624386,-2.611984),(11.619011,-2.586456),(11.609606,-2.564028),(11.584285,-2.523617),(11.576533,-2.502533),(11.57612,-2.485067),(11.583355,-2.42967),(11.579737,-2.407656),(11.55824,-2.349365),(11.566198,-2.329727),(11.568368,-2.329107),(11.605369,-2.330348),(11.655908,-2.345644),(11.669654,-2.352672),(11.675855,-2.360423),(11.679886,-2.368795),(11.687534,-2.377683),(11.721331,-2.404142),(11.739521,-2.413753),(11.756057,-2.415097),(11.772697,-2.405382),(11.806597,-2.374169),(11.828818,-2.365281),(11.864888,-2.35815),(11.907056,-2.34461),(11.938372,-2.329107),(11.948707,-2.335205),(11.966794,-2.348538),(12.000693,-2.390602),(12.031286,-2.411583),(12.062292,-2.414994),(12.45927,-2.329934),(12.447901,-2.30792),(12.455136,-2.275571),(12.468572,-2.241154),(12.475496,-2.212422),(12.468365,-2.171081),(12.470225,-2.156301),(12.477357,-2.141108),(12.49534,-2.11279),(12.499784,-2.09553),(12.46082,-2.077857),(12.440046,-2.045817),(12.431468,-2.005406),(12.423097,-1.897609),(12.426921,-1.88407),(12.438083,-1.886654),(12.450009,-1.899298),(12.468985,-1.919417),(12.486555,-1.924894),(12.499474,-1.917866),(12.503815,-1.907738),(12.504539,-1.896886),(12.506296,-1.888204),(12.512393,-1.875492),(12.517354,-1.86898),(12.523452,-1.863296),(12.572441,-1.83043),(12.58319,-1.826502),(12.632386,-1.825159),(12.674967,-1.842832),(12.741014,-1.890672),(12.745454,-1.893888),(12.787725,-1.907531),(12.804572,-1.919107),(12.816148,-1.943498),(12.838162,-2.016052),(12.847153,-2.037239),(12.852941,-2.044577),(12.868547,-2.059873),(12.872992,-2.065868),(12.876919,-2.088709),(12.875162,-2.089122),(12.875162,-2.093773),(12.874128,-2.099767),(12.876299,-2.104935),(12.895109,-2.109793),(12.894489,-2.11558),(12.890562,-2.122195),(12.888701,-2.126949),(12.884464,-2.134494),(12.882707,-2.140798),(12.885084,-2.147413),(12.89821,-2.160229),(12.902034,-2.167257),(12.902757,-2.177592),(12.907098,-2.195369),(12.921361,-2.194852),(12.945649,-2.18245),(12.95433,-2.190925),(12.973037,-2.221517),(12.982442,-2.232989),(12.987507,-2.259964),(12.990194,-2.268026),(12.997325,-2.275674),(13.003423,-2.275467),(13.008177,-2.276501),(13.010658,-2.287766),(13.002286,-2.296655),(12.996705,-2.304819),(12.994638,-2.314948),(12.993914,-2.323526),(12.991124,-2.332311),(12.987093,-2.340683),(12.982442,-2.347711),(12.97128,-2.357116),(12.966113,-2.366418),(12.969006,-2.372412),(12.982442,-2.371689),(12.994008,-2.360123),(13.012105,-2.342026),(13.025024,-2.338202),(13.049828,-2.342647),(13.114321,-2.371895),(13.135198,-2.37696),(13.146153,-2.374686),(13.165273,-2.363524),(13.176849,-2.361974),(13.186668,-2.364144),(13.361024,-2.428843),(13.3788,-2.43091),(13.398024,-2.426156),(13.419728,-2.42967),(13.424896,-2.429773),(13.438952,-2.425432),(13.44536,-2.427086),(13.453731,-2.439385),(13.458899,-2.441039),(13.469441,-2.435044),(13.473988,-2.426983),(13.476779,-2.417681),(13.482257,-2.408069),(13.492179,-2.398457),(13.524631,-2.37603),(13.533106,-2.367658),(13.547679,-2.349365),(13.557601,-2.340476),(13.569487,-2.334482),(13.593361,-2.326834),(13.603386,-2.320012),(13.60783,-2.311124),(13.610724,-2.289937),(13.617442,-2.279601),(13.69351,-2.205911),(13.701571,-2.194749),(13.705241,-2.18431),(13.706791,-2.16457),(13.709478,-2.153511),(13.72002,-2.133564),(13.740897,-2.102455),(13.743171,-2.09708),(13.746375,-2.09832),(13.756917,-2.105865),(13.770663,-2.119094),(13.782755,-2.138008),(13.791437,-2.159092),(13.800532,-2.200433),(13.823269,-2.246838),(13.835568,-2.265235),(13.853862,-2.283839),(13.86058,-2.293657),(13.863887,-2.321459),(13.871639,-2.328797),(13.882181,-2.333862),(13.892516,-2.3412),(13.906158,-2.359803),(13.901921,-2.366314),(13.890035,-2.373652),(13.875876,-2.403831),(13.855102,-2.41427),(13.847661,-2.423055),(13.846937,-2.461606),(13.8458,-2.466567),(13.86213,-2.480933),(13.884971,-2.488477),(13.909466,-2.489718),(13.930446,-2.485377),(13.947706,-2.474938),(13.957318,-2.470597),(13.967033,-2.470597),(13.976232,-2.477315),(13.979229,-2.495609),(13.985637,-2.5015),(13.993285,-2.501603),(14.039277,-2.487237),(14.045582,-2.4861),(14.055607,-2.486927),(14.071006,-2.495816),(14.080928,-2.49995),(14.090023,-2.498606),(14.096018,-2.491061),(14.100553,-2.478065),(14.106766,-2.460262),(14.115241,-2.451374),(14.124853,-2.443829),(14.131881,-2.435147),(14.131468,-2.408896),(14.136015,-2.398767),(14.14418,-2.390189),(14.1633,-2.373963),(14.172395,-2.367865),(14.182317,-2.363317),(14.230066,-2.352155),(14.234407,-2.354946),(14.226966,-2.323113),(14.151208,-2.259034),(14.148004,-2.224824),(14.161543,-2.214282),(14.195857,-2.201777),(14.209189,-2.187204),(14.209396,-2.179866),(14.203195,-2.161986),(14.204332,-2.152167),(14.209706,-2.147413),(14.226966,-2.141315),(14.233787,-2.134494),(14.238438,-2.120231),(14.244019,-2.067521),(14.250634,-2.047781),(14.251667,-2.037859),(14.24681,-2.029384),(14.238645,-2.02339),(14.233477,-2.018222),(14.232857,-2.012021),(14.238128,-2.002616),(14.237611,-1.991143),(14.240092,-1.982255),(14.245053,-1.974814),(14.252184,-1.967579),(14.368571,-1.92212),(14.37073,-1.921277),(14.397291,-1.906808),(14.404526,-1.893062),(14.396878,-1.849447),(14.397498,-1.840972),(14.403596,-1.815237),(14.406696,-1.735552),(14.413104,-1.713951),(14.425197,-1.700515),(14.448761,-1.686253),(14.441113,-1.679638),(14.420029,-1.676124),(14.402976,-1.670853),(14.390883,-1.630339),(14.371453,-1.619487),(14.364839,-1.612045),(14.37383,-1.604087),(14.394294,-1.596852),(14.403699,-1.592201),(14.413208,-1.585277),(14.419926,-1.575148),(14.423956,-1.563573),(14.430364,-1.554891),(14.463127,-1.54869),(14.462714,-1.5336),(14.451552,-1.515617),(14.438426,-1.502595),(14.451035,-1.473656),(14.452688,-1.449574),(14.456306,-1.440169),(14.467881,-1.429007),(14.480594,-1.420842),(14.487725,-1.40937),(14.482144,-1.388596),(14.447004,-1.365342),(14.432328,-1.350149),(14.426333,-1.331029),(14.429124,-1.31997),(14.436049,-1.312735),(14.444317,-1.306327),(14.451552,-1.298163),(14.457133,-1.287621),(14.46075,-1.278009),(14.464781,-1.255581),(14.465814,-1.224369),(14.464161,-1.215377),(14.456409,-1.202458),(14.439435,-1.185733),(14.435325,-1.181684),(14.428297,-1.169488),(14.427987,-1.16091),(14.433568,-1.14365),(14.434395,-1.135072),(14.430984,-1.123393),(14.420339,-1.101792),(14.391814,-1.023347),(14.39202,-1.008981),(14.402562,-0.987691),(14.407523,-0.944489),(14.412794,-0.921545),(14.428194,-0.896947),(14.445867,-0.877516),(14.457133,-0.856122),(14.452895,-0.825737),(14.446177,-0.800312),(14.44597,-0.775714),(14.451552,-0.751219),(14.492169,-0.663369),(14.498991,-0.630916),(14.489999,-0.600944),(14.466538,-0.552678),(14.454239,-0.539553),(14.414448,-0.512164),(14.39233,-0.482398),(14.358637,-0.461314),(14.320603,-0.444468),(14.292698,-0.436406),(14.275542,-0.439094),(14.260039,-0.446432),(14.244742,-0.451599),(14.228516,-0.447775),(14.210223,-0.440334),(14.193066,-0.440437),(14.17653,-0.446122),(14.159683,-0.455113),(14.157926,-0.417699),(14.150588,-0.376462),(14.138289,-0.336361),(14.121443,-0.302151),(14.095398,-0.276623),(14.058811,-0.258846),(14.01871,-0.252645),(13.98233,-0.262257),(13.975095,-0.252542),(13.967033,-0.245824),(13.957318,-0.242),(13.921558,-0.237865),(13.913807,-0.240553),(13.909983,-0.247167),(13.907295,-0.254402),(13.903058,-0.258846),(13.889829,-0.263704),(13.883421,-0.264944),(13.877426,-0.2605),(13.831228,-0.205413),(13.832158,-0.177094),(13.8427,-0.152289),(13.888054,-0.092088),(13.900474,-0.075602),(13.910706,-0.065886),(13.921145,-0.052967),(13.920111,-0.042425),(13.914943,-0.031263),(13.91298,-0.016587),(13.917217,-0.006665),(13.931377,0.011628),(13.932927,0.022067),(13.925072,0.034366),(13.913083,0.036536),(13.901404,0.036846),(13.894893,0.043668),(13.890656,0.115911),(13.885901,0.140303),(13.876186,0.171308),(13.871225,0.196423),(13.875773,0.220298),(13.909776,0.270941),(13.945226,0.350419),(13.966517,0.373053),(14.040414,0.413774),(14.059121,0.435272),(14.063048,0.455942),(14.056847,0.476406),(14.045582,0.497283),(14.075967,0.539451),(14.125473,0.546169),(14.181594,0.539865),(14.231823,0.542552),(14.245259,0.54772),(14.250944,0.551854),(14.254664,0.557125),(14.328768,0.621204),(14.335383,0.642598),(14.33838,0.693912),(14.367319,0.735512),(14.413414,0.775044),(14.447624,0.81623),(14.44101,0.862791),(14.437599,0.875142),(14.445144,0.883255),(14.457029,0.890334),(14.466228,0.899636),(14.468088,0.913227),(14.46044,0.921237),(14.436565,0.933277),(14.417548,0.950589),(14.400805,0.970329),(14.386749,0.99224),(14.375691,1.015598),(14.360084,1.066758),(14.346442,1.087118),(14.298486,1.109236),(14.28288,1.130113),(14.274715,1.155641),(14.275748,1.231089),(14.273061,1.257237),(14.258178,1.319662),(14.252184,1.330824),(14.241435,1.339196),(14.230066,1.34395),(14.221488,1.349479),(14.219939,1.355018),(14.218387,1.360564),(14.206502,1.362838),(14.198957,1.368316),(14.192549,1.374956),(14.183868,1.380847),(14.14449,1.391622),(14.12444,1.393585),(14.106456,1.388934),(14.070696,1.375111),(14.049509,1.376403),(14.033799,1.387643),(14.01902,1.402138),(14.00083,1.413016),(13.98357,1.41684),(13.794744,1.434436),(13.780585,1.431025),(13.779758,1.426271),(13.770353,1.400432),(13.758157,1.376506),(13.75485,1.374336),(13.744101,1.370279),(13.741104,1.371313),(13.729425,1.37692),(13.724361,1.377953),(13.71754,1.375369),(13.705551,1.36599),(13.699091,1.362786),(13.680694,1.359401),(13.671496,1.358781),(13.662091,1.359195),(13.642247,1.357386),(13.628088,1.348136),(13.615065,1.337439),(13.579202,1.323486),(13.556361,1.29279),(13.543442,1.283489),(13.509955,1.277287),(13.479776,1.277132),(13.448874,1.283075),(13.41394,1.295529),(13.398748,1.296925),(13.37694,1.294444),(13.357406,1.28907),(13.349345,1.281577),(13.342937,1.263852),(13.325987,1.259304),(13.307797,1.25672),(13.289194,1.233983),(13.2709,1.226024),(13.25023,1.221787),(13.215813,1.224371),(13.195453,1.221115),(13.184911,1.22251),(13.184885,1.222623),(13.18181,1.236463),(13.172301,1.242871),(13.160313,1.247729),(13.150184,1.256617),(13.169201,1.258581),(13.176642,1.27088),(13.180363,1.284832),(13.188321,1.291447),(13.202377,1.293411),(13.219327,1.299198),(13.23359,1.30881),(13.242995,1.328861),(13.249093,1.332375),(13.251263,1.337646),(13.242891,1.34979),(13.239584,1.356507),(13.239171,1.364181),(13.239791,1.372346),(13.238447,1.41963),(13.239481,1.427976),(13.223461,1.438001),(13.205478,1.48637),(13.184911,1.496886),(13.190905,1.511072),(13.189665,1.52474),(13.182637,1.536548),(13.171268,1.545256),(13.164447,1.53784),(13.145946,1.56342),(13.129617,1.592462),(13.146773,1.612254),(13.149977,1.636284),(13.143983,1.681811),(13.147807,1.702869),(13.154628,1.721653),(13.157522,1.739146),(13.150184,1.756302),(13.162793,1.76364),(13.173025,1.776947),(13.180673,1.792011),(13.191008,1.828727),(13.192455,1.844746),(13.188321,1.85658),(13.183154,1.864048),(13.175092,1.882108),(13.162173,1.899833),(13.166307,1.904381),(13.178193,1.907792),(13.184911,1.92345),(13.191732,1.935077),(13.19845,1.943112),(13.205064,1.949339),(13.210232,1.956316),(13.212299,1.966419),(13.206615,1.985151),(13.206925,1.993575),(13.21602,1.997166),(13.221291,2.000835),(13.239481,2.02073),(13.245475,2.025304),(13.281132,2.044967),(13.291364,2.068945),(13.294878,2.101087),(13.294568,2.161058),(13.466547,2.159508),(13.620336,2.158112),(13.662266,2.157761),(13.823993,2.156407),(14.002793,2.154805),(14.16175,2.15341),(14.266963,2.152428),(14.276265,2.153565),(14.320293,2.17067),(14.383649,2.162091),(14.399358,2.153151),(14.418685,2.135271),(14.432948,2.132119),(14.438736,2.133979),(14.4592,2.146537),(14.538058,2.163383),(14.54705,2.166536),(14.550254,2.175166),(14.54798,2.184364),(14.547773,2.193666),(14.557075,2.202399),(14.562139,2.208807),(14.587874,2.201727),(14.620947,2.16483),(14.644821,2.154185),(14.636346,2.13832),(14.646062,2.133359),(14.672003,2.134341),(14.685956,2.125866),(14.705696,2.105532),(14.720476,2.099589),(14.713654,2.12398),(14.720889,2.127597),(14.747864,2.113205),(14.733498,2.102018),(14.727297,2.099589),(14.737116,2.096075),(14.747554,2.097186),(14.756339,2.099589),(14.761403,2.099589),(14.76254,2.092535),(14.76161,2.070185),(14.764814,2.065456),(14.826309,2.072252),(14.841192,2.075921),(14.84822,2.085197),(14.850184,2.097367),(14.850184,2.109795),(14.857005,2.115944),(14.871474,2.101656),(14.8846,2.082096),(14.887804,2.072252),(14.907338,2.058894),(14.896589,2.030937),(14.892455,2.00639),(14.932142,2.003341),(14.953846,2.005822),(14.963045,2.010421),(14.971003,2.034451),(14.980718,2.033107),(15.028261,1.995306),(15.04366,1.990862),(15.06309,1.997166),(15.074873,1.979364),(15.091616,1.984428),(15.107636,2.000835),(15.117764,2.01701),(15.123862,2.01701),(15.138538,2.011506),(15.151664,2.040988),(15.1836,2.029335),(15.197036,2.034967),(15.212642,2.039618),(15.233726,2.031298),(15.238687,2.025304),(15.244165,2.010059),(15.248092,2.003341),(15.25357,2.000318),(15.287573,1.987787),(15.295428,1.981534),(15.301112,1.973757),(15.303283,1.966419),(15.301939,1.953319),(15.300182,1.94766),(15.301629,1.943578),(15.309484,1.935077),(15.314341,1.93425),(15.337802,1.92376),(15.337389,1.92146),(15.349171,1.923295),(15.367981,1.932855),(15.388135,1.939547),(15.439192,1.969829),(15.48291,1.97585),(15.526628,1.967814),(15.611791,1.942544),(15.706772,1.931976),(15.711113,1.927377),(15.721552,1.921615),(15.734057,1.916706),(15.757415,1.912985),(15.76465,1.908722),(15.80289,1.859965),(15.815396,1.853428),(15.842061,1.844152),(15.865936,1.828468),(15.875651,1.823766),(15.882369,1.816712),(15.884952,1.801648),(15.889913,1.793277),(15.901799,1.793742),(15.915235,1.798961),(15.92588,1.804749),(15.928981,1.788962),(15.94376,1.781624),(15.963191,1.77736),(15.98045,1.770591),(15.990786,1.776172),(16.002775,1.775913),(16.013833,1.771314),(16.021998,1.763795),(16.026339,1.752297),(16.024892,1.742479),(16.021998,1.733048),(16.021998,1.72279),(16.030473,1.705401),(16.069851,1.654551),(16.114809,1.719069),(16.123594,1.721601),(16.145092,1.714315),(16.15584,1.719069),(16.159044,1.734805),(16.135066,1.845315),(16.101373,1.932803),(16.083493,1.963008),(16.074915,1.970604),(16.068714,1.973602),(16.06489,1.97895),(16.063753,2.015873),(16.06644,2.025485),(16.081736,2.046827),(16.08153,2.055638),(16.078119,2.063441),(16.076672,2.072252),(16.076155,2.07282),(16.075535,2.075456),(16.075535,2.079952),(16.076672,2.08592),(16.079669,2.090261),(16.084113,2.091605),(16.088144,2.09176),(16.090315,2.092742),(16.092485,2.106901),(16.089798,2.116151),(16.08556,2.12491),(16.083493,2.137752),(16.085767,2.149172),(16.097756,2.171548),(16.104371,2.193562),(16.12039,2.203329),(16.140647,2.199815),(16.159251,2.18209),(16.199455,2.212166),(16.207723,2.22307),(16.202349,2.23201),(16.196665,2.236454),(16.248031,2.345594),(16.293506,2.442074),(16.325649,2.510494),(16.371124,2.606922),(16.413706,2.697201),(16.427492,2.726493),(16.450603,2.775594),(16.479128,2.836314),(16.483779,2.860395),(16.474994,2.878378),(16.460525,2.894605),(16.448329,2.913467),(16.445538,2.95765),(16.484192,3.031909),(16.490807,3.067824),(16.483159,3.090148),(16.47272,3.110612),(16.464762,3.1318),(16.465485,3.156501),(16.477061,3.179394),(16.511477,3.227246),(16.517162,3.248692),(16.517782,3.273238),(16.542793,3.336154),(16.551682,3.419767),(16.567701,3.464389),(16.598501,3.501674),(16.639428,3.528597),(16.686351,3.542214),(16.709398,3.543712),(16.729552,3.542214),(16.811924,3.521672),(16.833008,3.522861),(16.852645,3.532809),(16.854609,3.541335),(16.851818,3.551903),(16.853162,3.560094),(16.867838,3.561541),(16.877243,3.559164),(16.895537,3.552368),(16.904735,3.550637),(16.932434,3.553919),(16.942252,3.553092),(16.953208,3.546891),(16.960546,3.538441),(16.968607,3.533481),(16.98194,3.537976),(16.989691,3.539475),(17.003127,3.537718),(17.009225,3.538131),(17.017596,3.5418),(17.028862,3.551541),(17.035787,3.556141),(17.052426,3.56397),(17.061418,3.56614),(17.088393,3.564435),(17.102139,3.566605),(17.129011,3.57707),(17.142757,3.580842),(17.182858,3.579602),(17.197224,3.58172),(17.213967,3.589291),(17.222959,3.598515),(17.231123,3.609109),(17.244973,3.620607),(17.259442,3.625904),(17.272258,3.62456),(17.298096,3.615904),(17.334373,3.618514),(17.355767,3.638435),(17.375714,3.663447),(17.414489,3.683415),(17.427494,3.690112),(17.442687,3.701274),(17.458913,3.708276),(17.481858,3.704762),(17.486198,3.700292),(17.490126,3.68714),(17.494983,3.683213),(17.508936,3.681766),(17.513484,3.679182),(17.550484,3.648151),(17.586761,3.632234),(17.627275,3.626317)]
+Coral Sea Islands	[(154.391287,-21.030043),(154.38852,-21.029067),(154.391287,-21.028741),(154.391287,-21.030043)]
+Curaçao	[(-68.780751,12.097805),(-68.745229,12.062242),(-68.739735,12.053046),(-68.748647,12.047024),(-68.769846,12.042914),(-68.794749,12.041327),(-68.814809,12.043158),(-68.841176,12.055487),(-68.893422,12.090522),(-68.944732,12.105618),(-68.977773,12.124579),(-69.007436,12.148179),(-69.020253,12.169745),(-69.027211,12.19009),(-69.043609,12.196682),(-69.062896,12.198432),(-69.078603,12.20425),(-69.091908,12.219875),(-69.12267,12.269029),(-69.134389,12.27733),(-69.148101,12.28441),(-69.159535,12.293362),(-69.164296,12.306952),(-69.161977,12.342841),(-69.163808,12.361884),(-69.171742,12.378892),(-69.166127,12.387844),(-69.161204,12.391506),(-69.156239,12.390611),(-69.150624,12.385728),(-69.107777,12.367825),(-69.089589,12.356879),(-69.071523,12.341376),(-69.060414,12.322577),(-69.049957,12.276109),(-69.040761,12.256049),(-69.004018,12.221666),(-68.961293,12.201361),(-68.835276,12.171047),(-68.82079,12.16234),(-68.814809,12.149604),(-68.811838,12.12934),(-68.804026,12.117011),(-68.780751,12.097805)]
+Czech Republic	[(14.397808,51.013115),(14.425817,51.020944),(14.462094,51.019652),(14.473462,51.023372),(14.482144,51.037196),(14.487932,51.028721),(14.490102,51.022701),(14.493513,51.016706),(14.502918,51.008516),(14.51532,51.003038),(14.542295,50.998749),(14.554594,50.992651),(14.566687,50.983401),(14.574335,50.975494),(14.577435,50.965727),(14.575575,50.95069),(14.567824,50.938649),(14.555835,50.924283),(14.550357,50.912087),(14.561829,50.906351),(14.617123,50.920872),(14.629215,50.920717),(14.634589,50.9094),(14.628802,50.896119),(14.611852,50.870953),(14.608338,50.853073),(14.613195,50.84558),(14.647922,50.839379),(14.662185,50.834366),(14.700425,50.815969),(14.737529,50.810698),(14.759233,50.810181),(14.775356,50.812972),(14.785071,50.820052),(14.79458,50.831627),(14.810393,50.858447),(14.831683,50.857982),(14.867857,50.86439),(14.982062,50.859067),(14.984129,50.867697),(14.982889,50.902424),(14.981752,50.905266),(14.981132,50.90909),(14.982062,50.914671),(14.984852,50.918082),(14.994671,50.92511),(14.997771,50.930174),(14.996635,50.959216),(14.981442,50.973221),(14.965215,50.981334),(14.960978,50.992651),(14.961081,50.992651),(14.965629,50.996062),(14.970693,50.998697),(14.976377,51.000402),(14.982062,51.001177),(14.996531,51.007844),(15.001182,51.012443),(15.003973,51.020685),(15.02299,51.009652),(15.073632,51.002624),(15.082107,50.992754),(15.09389,50.985416),(15.107946,50.981024),(15.119211,50.982471),(15.122518,50.992651),(15.122518,50.992754),(15.13151,51.005828),(15.144429,51.011564),(15.156108,51.007844),(15.160759,50.992651),(15.170164,50.977975),(15.227111,50.977406),(15.253776,50.969035),(15.269796,50.952653),(15.268763,50.94299),(15.260081,50.932499),(15.253053,50.914103),(15.25605,50.899892),(15.265352,50.88227),(15.277134,50.865734),(15.28778,50.854881),(15.307727,50.844753),(15.325813,50.839689),(15.341006,50.83173),(15.352995,50.812972),(15.353305,50.803257),(15.350515,50.793232),(15.349688,50.783723),(15.356096,50.775455),(15.368579,50.772949),(15.370255,50.772613),(15.381314,50.780002),(15.390822,50.790648),(15.400124,50.797986),(15.441775,50.800208),(15.641866,50.755766),(15.653235,50.75096),(15.666464,50.738093),(15.673803,50.733545),(15.684345,50.731426),(15.76744,50.744191),(15.792245,50.742692),(15.794415,50.735871),(15.797619,50.729773),(15.848159,50.675151),(15.854567,50.673704),(15.882265,50.674221),(15.941486,50.68838),(15.958023,50.686881),(15.971459,50.678613),(15.984481,50.662904),(15.993163,50.649364),(15.998641,50.635567),(15.996367,50.623681),(15.982001,50.61624),(15.980037,50.612984),(15.97921,50.60978),(15.979934,50.606628),(15.982001,50.603631),(16.024479,50.608592),(16.086491,50.64678),(16.128658,50.644042),(16.160284,50.628642),(16.175477,50.624095),(16.192324,50.626575),(16.204519,50.636342),(16.211754,50.649106),(16.219092,50.659131),(16.232011,50.660888),(16.268288,50.660423),(16.300948,50.6551),(16.331644,50.644042),(16.416806,50.586629),(16.425901,50.567561),(16.394482,50.559344),(16.398306,50.551799),(16.398306,50.548492),(16.395516,50.545701),(16.391175,50.539914),(16.389624,50.534849),(16.388281,50.52715),(16.388384,50.521258),(16.391175,50.521827),(16.382596,50.514179),(16.362029,50.501208),(16.352624,50.492785),(16.335468,50.490356),(16.303428,50.49604),(16.287719,50.492785),(16.279967,50.479866),(16.264981,50.471649),(16.247411,50.464983),(16.232011,50.456766),(16.226534,50.455371),(16.217335,50.45165),(16.211237,50.451289),(16.216095,50.440178),(16.217955,50.437129),(16.198008,50.440023),(16.190153,50.424158),(16.199559,50.406278),(16.232011,50.402609),(16.24493,50.376823),(16.249685,50.371035),(16.2625,50.36442),(16.269839,50.365454),(16.27697,50.369433),(16.288649,50.371862),(16.334227,50.371862),(16.343736,50.36995),(16.350764,50.360648),(16.351487,50.351346),(16.35066,50.342251),(16.353244,50.333518),(16.371021,50.318377),(16.415566,50.307938),(16.437787,50.297965),(16.452153,50.284994),(16.477578,50.255332),(16.492047,50.242722),(16.50476,50.227995),(16.535042,50.207738),(16.545894,50.188824),(16.557263,50.154718),(16.566668,50.142212),(16.584238,50.127432),(16.618654,50.10702),(16.660616,50.093016),(16.701233,50.094928),(16.732033,50.121955),(16.754253,50.13229),(16.766449,50.1434),(16.777301,50.15694),(16.795284,50.174406),(16.817712,50.186757),(16.837556,50.188617),(16.857606,50.187739),(16.869762,50.189729),(16.880964,50.191563),(16.890369,50.196937),(16.907009,50.211768),(16.918998,50.217091),(16.927783,50.217298),(16.946283,50.21306),(16.955275,50.213474),(16.957755,50.217143),(16.957548,50.229235),(16.960339,50.231974),(16.975015,50.231819),(16.98101,50.229183),(16.98566,50.223137),(16.996306,50.212905),(17.008398,50.20996),(17.014806,50.218486),(17.012842,50.231664),(16.99982,50.242722),(16.998373,50.26701),(16.987831,50.284942),(16.969641,50.297758),(16.945249,50.306905),(16.926543,50.319255),(16.916724,50.338634),(16.909283,50.359925),(16.897914,50.378218),(16.865874,50.408449),(16.865771,50.422401),(16.892953,50.432943),(16.915794,50.431083),(16.944005,50.420267),(16.958789,50.414598),(16.98194,50.416355),(17.084672,50.397958),(17.095628,50.393669),(17.118882,50.381164),(17.131698,50.376823),(17.145444,50.376719),(17.175933,50.38075),(17.187612,50.378476),(17.185442,50.375686),(17.188852,50.364834),(17.195053,50.351915),(17.201048,50.343233),(17.210866,50.336412),(17.24611,50.322149),(17.269881,50.317757),(17.316803,50.318635),(17.337474,50.313002),(17.319077,50.308248),(17.321867,50.304476),(17.325381,50.301117),(17.329515,50.298223),(17.334063,50.295691),(17.332823,50.282668),(17.334786,50.270008),(17.341711,50.259724),(17.355044,50.253264),(17.365896,50.271558),(17.388013,50.272643),(17.409821,50.261326),(17.419122,50.242722),(17.424187,50.240552),(17.429561,50.239777),(17.434832,50.2405),(17.44,50.242722),(17.469352,50.265563),(17.516998,50.268354),(17.606398,50.258225),(17.629549,50.262101),(17.646705,50.271093),(17.676368,50.297396),(17.681949,50.305561),(17.684533,50.312382),(17.691044,50.315069),(17.707994,50.311039),(17.713575,50.30768),(17.731971,50.291763),(17.734452,50.28949),(17.734969,50.286802),(17.734245,50.283805),(17.731971,50.280653),(17.721119,50.261946),(17.719156,50.252799),(17.721429,50.242722),(17.731971,50.236005),(17.747578,50.217504),(17.738173,50.202363),(17.717915,50.191098),(17.675334,50.174716),(17.648669,50.167998),(17.600403,50.16681),(17.589448,50.163244),(17.58211,50.153167),(17.584177,50.145881),(17.632753,50.106348),(17.648359,50.101801),(17.658488,50.102989),(17.666963,50.106142),(17.677608,50.107744),(17.690734,50.10547),(17.717915,50.096788),(17.731971,50.094876),(17.732385,50.093894),(17.732592,50.092964),(17.732385,50.092189),(17.731971,50.091466),(17.72267,50.08635),(17.719466,50.080872),(17.722566,50.075136),(17.731971,50.06909),(17.74303,50.060563),(17.749852,50.049504),(17.755433,50.037154),(17.763287,50.025216),(17.774553,50.015191),(17.839355,49.973643),(17.875735,49.968682),(17.912116,49.975814),(17.941571,49.992764),(17.959761,49.995812),(17.999862,49.996588),(18.032418,50.00284),(18.037483,50.007233),(18.035726,50.017207),(18.028698,50.024131),(18.020119,50.024286),(18.012161,50.022684),(18.00689,50.024131),(18.002446,50.046765),(18.019074,50.044087),(18.033245,50.041805),(18.091639,50.017207),(18.085128,49.998758),(18.098151,49.989043),(18.162023,49.98124),(18.177216,49.975814),(18.208738,49.958295),(18.22052,49.954885),(18.243982,49.951732),(18.255867,49.946048),(18.260105,49.94057),(18.267029,49.925067),(18.27261,49.918298),(18.292454,49.907808),(18.306923,49.909668),(18.334932,49.925429),(18.333795,49.927135),(18.332452,49.928271),(18.330695,49.92884),(18.328524,49.92884),(18.368832,49.932044),(18.407486,49.923155),(18.481797,49.896645),(18.505051,49.896697),(18.544428,49.912975),(18.559208,49.907187),(18.565409,49.889049),(18.562929,49.873701),(18.567269,49.861454),(18.593831,49.852204),(18.566339,49.831585),(18.566753,49.804765),(18.584116,49.774379),(18.60768,49.74296),(18.617706,49.713866),(18.62401,49.706373),(18.637343,49.700327),(18.668142,49.69857),(18.682404,49.695779),(18.695427,49.688854),(18.715064,49.673817),(18.727673,49.668907),(18.742246,49.669683),(18.757852,49.674075),(18.773458,49.675832),(18.788444,49.668597),(18.792579,49.660794),(18.799297,49.626378),(18.803947,49.616766),(18.81573,49.599299),(18.820174,49.590256),(18.83454,49.547623),(18.837434,49.526952),(18.833196,49.510261),(18.792269,49.509537),(18.773562,49.504886),(18.732531,49.480288),(18.704522,49.479255),(18.675583,49.485043),(18.64282,49.495791),(18.635896,49.496721),(18.628971,49.495791),(18.600446,49.485973),(18.556211,49.490159),(18.535643,49.481684),(18.530476,49.473467),(18.527995,49.454864),(18.522931,49.446079),(18.514663,49.440601),(18.481797,49.429077),(18.439215,49.395074),(18.416788,49.385462),(18.387642,49.389751),(18.385162,49.342261),(18.361586,49.330191),(18.324597,49.311255),(18.190031,49.276942),(18.160576,49.2587),(18.136495,49.233068),(18.117788,49.202579),(18.105075,49.169765),(18.101458,49.142945),(18.10163,49.136928),(18.102905,49.09225),(18.09629,49.070288),(18.075516,49.047188),(18.046061,49.029153),(18.012885,49.019128),(17.959244,49.021867),(17.93506,49.019386),(17.914079,49.010498),(17.90085,48.993031),(17.894649,48.9782),(17.886897,48.947246),(17.878733,48.933552),(17.860336,48.921718),(17.841215,48.920994),(17.820131,48.923371),(17.795533,48.920581),(17.77941,48.911744),(17.744891,48.872574),(17.727217,48.86291),(17.535084,48.812991),(17.498497,48.816763),(17.467905,48.838105),(17.453332,48.842756),(17.429561,48.838157),(17.411225,48.830216),(17.391734,48.821776),(17.374371,48.819605),(17.260269,48.857794),(17.21221,48.866062),(17.167458,48.859758),(17.113715,48.83392),(17.10462,48.824618),(17.098728,48.805756),(17.084362,48.793715),(17.049946,48.774027),(17.025348,48.746328),(16.974808,48.649874),(16.963336,48.635947),(16.947523,48.623157),(16.945043,48.604166),(16.910523,48.63078),(16.896674,48.696977),(16.873006,48.718991),(16.856573,48.719818),(16.818125,48.710775),(16.798902,48.709224),(16.780505,48.713772),(16.744332,48.729637),(16.729035,48.733099),(16.691001,48.732065),(16.675085,48.733926),(16.661959,48.740023),(16.654725,48.751857),(16.651004,48.766223),(16.643149,48.778264),(16.624029,48.78338),(16.605529,48.784827),(16.545791,48.796299),(16.528737,48.803534),(16.519539,48.805601),(16.510341,48.804774),(16.492254,48.79971),(16.481919,48.7994),(16.453083,48.80219),(16.43572,48.794542),(16.384974,48.737078),(16.374018,48.730308),(16.358309,48.727259),(16.352727,48.728448),(16.339498,48.735579),(16.318724,48.733512),(16.317588,48.73284),(16.177751,48.746535),(16.085354,48.742866),(16.032334,48.758059),(15.931771,48.806428),(15.930324,48.811389),(15.930324,48.818313),(15.925053,48.822602),(15.908103,48.819709),(15.90707,48.830251),(15.899629,48.834746),(15.888363,48.835056),(15.875754,48.833093),(15.885986,48.842033),(15.877614,48.841671),(15.870173,48.843893),(15.859218,48.849164),(15.840097,48.850094),(15.833276,48.852006),(15.828315,48.857122),(15.824284,48.869421),(15.818497,48.872315),(15.787904,48.872263),(15.779222,48.870868),(15.743669,48.858466),(15.726823,48.854952),(15.703775,48.854952),(15.681347,48.858466),(15.603729,48.887353),(15.544187,48.902612),(15.521254,48.908489),(15.471851,48.936704),(15.450354,48.944817),(15.405912,48.954687),(15.357853,48.97081),(15.335529,48.974996),(15.28871,48.975358),(15.283749,48.977632),(15.279615,48.982593),(15.27455,48.986727),(15.266902,48.986675),(15.262872,48.982593),(15.260391,48.969157),(15.257084,48.963886),(15.243234,48.95293),(15.238067,48.95076),(15.161792,48.937221),(15.141949,48.937479),(15.148563,48.951742),(15.148977,48.965333),(15.144739,48.978924),(15.137401,48.993031),(15.059576,48.997217),(15.003973,49.009774),(14.982062,49.007914),(14.978858,49.00626),(14.977308,49.002902),(14.977308,48.998251),(14.978238,48.992825),(14.964595,48.971741),(14.964182,48.943267),(14.968316,48.912674),(14.968213,48.885028),(14.947025,48.822396),(14.93979,48.809787),(14.938137,48.80281),(14.940101,48.796506),(14.944441,48.788599),(14.948886,48.78214),(14.951056,48.780331),(14.939584,48.762813),(14.919327,48.761573),(14.86765,48.775577),(14.815457,48.780331),(14.800367,48.776507),(14.794476,48.766999),(14.790446,48.754855),(14.78042,48.743124),(14.775356,48.724004),(14.722749,48.693411),(14.703836,48.673103),(14.700219,48.646102),(14.700735,48.615535),(14.695671,48.589542),(14.69114,48.586535),(14.675621,48.576235),(14.659187,48.576959),(14.651333,48.583496),(14.645442,48.592901),(14.634693,48.602332),(14.628182,48.603288),(14.612885,48.599748),(14.605134,48.600316),(14.60193,48.604528),(14.601827,48.611194),(14.600586,48.617576),(14.594179,48.621323),(14.578779,48.620496),(14.548807,48.610936),(14.53382,48.608714),(14.522038,48.610626),(14.482144,48.624475),(14.458166,48.643182),(14.443593,48.636516),(14.421166,48.597061),(14.405353,48.586286),(14.353366,48.571429),(14.333213,48.560706),(14.325358,48.558639),(14.315746,48.557916),(14.216527,48.58117),(14.07483,48.591712),(14.040827,48.601169),(14.032456,48.60613),(14.015196,48.620393),(14.010855,48.62587),(14.006204,48.639513),(14.008064,48.642407),(14.013749,48.643802),(14.020467,48.653155),(14.023464,48.654602),(14.028322,48.653982),(14.032869,48.654912),(14.034729,48.661165),(14.032146,48.667263),(14.026151,48.670054),(14.019227,48.671914),(14.014162,48.675066),(14.007754,48.683283),(13.991115,48.700181),(13.98233,48.706485),(13.915047,48.73098),(13.893136,48.743021),(13.874946,48.752426),(13.855929,48.759299),(13.815725,48.76643),(13.796191,48.779814),(13.747925,48.843376),(13.724671,48.867303),(13.710615,48.87247),(13.673356,48.876346),(13.654443,48.882237),(13.637389,48.893451),(13.621783,48.909057),(13.611138,48.927247),(13.608657,48.946161),(13.590467,48.944817),(13.573414,48.951018),(13.556464,48.959958),(13.538894,48.967038),(13.522395,48.969342),(13.51595,48.970242),(13.5021,48.966056),(13.492592,48.955049),(13.482257,48.937634),(13.458899,48.945024),(13.427273,48.959958),(13.398541,48.977683),(13.384175,48.993031),(13.383555,49.021092),(13.372393,49.038507),(13.329915,49.066929),(13.299529,49.093645),(13.287333,49.10057),(13.267283,49.105634),(13.206821,49.107495),(13.178503,49.118347),(13.162586,49.135142),(13.14946,49.15483),(13.055823,49.238184),(13.04342,49.242784),(13.043214,49.242887),(13.043214,49.242939),(13.011278,49.267795),(13.00673,49.277097),(13.005387,49.28676),(12.999806,49.294925),(12.982442,49.299628),(12.95433,49.31911),(12.939861,49.326758),(12.922911,49.332701),(12.88467,49.339573),(12.870925,49.336731),(12.875369,49.323864),(12.856662,49.32221),(12.797751,49.327843),(12.777907,49.332545),(12.762094,49.343242),(12.729331,49.391147),(12.709177,49.404737),(12.663082,49.418897),(12.643548,49.42949),(12.632179,49.44396),(12.627218,49.460186),(12.624325,49.493001),(12.622981,49.509847),(12.61554,49.513775),(12.604998,49.512793),(12.593732,49.515015),(12.58288,49.522405),(12.575025,49.529898),(12.568721,49.538838),(12.562313,49.550827),(12.558282,49.562557),(12.553631,49.584726),(12.546603,49.595579),(12.536061,49.603123),(12.512187,49.61165),(12.501955,49.619711),(12.502678,49.62214),(12.507432,49.629995),(12.499474,49.632527),(12.496891,49.633871),(12.505365,49.646118),(12.504642,49.659399),(12.496374,49.669993),(12.482524,49.674695),(12.449245,49.68503),(12.433949,49.6918),(12.419583,49.700223),(12.398912,49.719499),(12.388577,49.732314),(12.383616,49.742856),(12.395398,49.757894),(12.436739,49.769263),(12.452655,49.779702),(12.455859,49.796135),(12.456376,49.817115),(12.462474,49.831223),(12.482524,49.827244),(12.489863,49.842695),(12.51291,49.870239),(12.520972,49.885535),(12.524072,49.904965),(12.517871,49.9122),(12.503608,49.915766),(12.462681,49.931269),(12.463818,49.942121),(12.470742,49.955608),(12.468158,49.970233),(12.451312,49.980568),(12.414518,49.983048),(12.399222,49.992764),(12.398189,49.992764),(12.24688,50.044957),(12.243676,50.051313),(12.243469,50.060408),(12.241402,50.07064),(12.232514,50.08051),(12.218044,50.088572),(12.202025,50.094514),(12.187865,50.102834),(12.179184,50.117976),(12.178564,50.132962),(12.185592,50.155699),(12.182698,50.170737),(12.17505,50.182623),(12.163784,50.193785),(12.13929,50.211045),(12.089887,50.230837),(12.079552,50.242722),(12.092057,50.254815),(12.102393,50.259156),(12.109111,50.263806),(12.110971,50.276622),(12.10725,50.290885),(12.099189,50.299773),(12.076141,50.315173),(12.101344,50.31398),(12.149315,50.311711),(12.168538,50.302977),(12.17443,50.293727),(12.17412,50.276571),(12.178047,50.268767),(12.189209,50.262463),(12.203782,50.259569),(12.232514,50.259104),(12.239645,50.256572),(12.242953,50.252954),(12.242436,50.248355),(12.237992,50.242722),(12.236441,50.242567),(12.235098,50.242257),(12.233754,50.241689),(12.232514,50.240965),(12.229827,50.239053),(12.228897,50.237038),(12.22993,50.234816),(12.232514,50.232491),(12.249981,50.221173),(12.254321,50.217401),(12.258455,50.21089),(12.260212,50.20505),(12.261246,50.199883),(12.273235,50.172339),(12.283363,50.162211),(12.300417,50.160815),(12.314369,50.167327),(12.314369,50.176215),(12.308582,50.186912),(12.305584,50.199314),(12.308685,50.217091),(12.314059,50.226496),(12.3338,50.242722),(12.336487,50.258587),(12.344652,50.26639),(12.355814,50.271403),(12.367183,50.279051),(12.398189,50.315173),(12.408937,50.321994),(12.438289,50.332536),(12.450175,50.339357),(12.453792,50.340701),(12.462784,50.340494),(12.466815,50.34189),(12.468985,50.345559),(12.468365,50.349486),(12.467022,50.352845),(12.466815,50.354912),(12.469502,50.359408),(12.471569,50.364472),(12.475083,50.369433),(12.482524,50.373567),(12.510223,50.38876),(12.550531,50.396357),(12.625358,50.399922),(12.678792,50.393721),(12.691814,50.394651),(12.702976,50.401524),(12.725094,50.423435),(12.737909,50.431548),(12.754239,50.435321),(12.770259,50.435941),(12.788139,50.434339),(12.79434,50.435889),(12.808396,50.441832),(12.817388,50.44302),(12.825759,50.441418),(12.918363,50.4054),(12.952573,50.40416),(12.960631,50.409234),(12.982442,50.42297),(12.996602,50.433667),(13.003113,50.451909),(13.009624,50.492681),(13.017892,50.49635),(13.026264,50.497642),(13.034532,50.496505),(13.042284,50.492785),(13.051069,50.491131),(13.06037,50.490614),(13.069775,50.491079),(13.07887,50.492681),(13.078974,50.492681),(13.079181,50.492785),(13.107396,50.498986),(13.160106,50.497022),(13.184704,50.508753),(13.19907,50.525341),(13.232349,50.58203),(13.25178,50.580893),(13.268006,50.573658),(13.284646,50.568956),(13.305627,50.575777),(13.316272,50.596034),(13.321853,50.60239),(13.35937,50.61934),(13.365365,50.623474),(13.365985,50.627092),(13.368775,50.628332),(13.380971,50.62549),(13.386345,50.621614),(13.400401,50.606576),(13.407016,50.601305),(13.42934,50.594329),(13.447944,50.597274),(13.464893,50.607093),(13.482257,50.620891),(13.492179,50.624456),(13.498173,50.629159),(13.499103,50.635205),(13.493315,50.643215),(13.509955,50.651225),(13.523288,50.66218),(13.527215,50.675668),(13.51564,50.691016),(13.556567,50.706725),(13.601939,50.712151),(13.691753,50.711841),(13.711028,50.71427),(13.749062,50.72321),(13.770663,50.724605),(13.816552,50.72135),(13.834535,50.723675),(13.863474,50.735147),(13.869572,50.735251),(13.875359,50.736542),(13.882181,50.742744),(13.882697,50.748015),(13.88032,50.755043),(13.87908,50.763518),(13.883318,50.773233),(13.892516,50.780416),(13.900991,50.780622),(13.910706,50.778762),(13.923315,50.779951),(13.933547,50.784808),(13.948843,50.797211),(13.959592,50.802068),(13.979126,50.804755),(14.015713,50.801758),(14.034936,50.802585),(14.190792,50.847905),(14.202988,50.85514),(14.221281,50.872607),(14.232133,50.879376),(14.2681,50.88413),(14.346545,50.880203),(14.375897,50.895964),(14.381892,50.920872),(14.355227,50.930639),(14.31833,50.937512),(14.292802,50.95348),(14.293732,50.96397),(14.302207,50.967691),(14.303757,50.969707),(14.28381,50.974822),(14.250013,50.977613),(14.238335,50.982471),(14.249497,50.992651),(14.263553,51.021435),(14.287531,51.036834),(14.319363,51.040012),(14.35657,51.032338),(14.364115,51.027998),(14.369386,51.022442),(14.375897,51.01699),(14.386749,51.01327),(14.397808,51.013115)]
+Djibouti	[(43.240733,11.48786),(43.188815,11.407764),(42.923715,10.998787),(42.908109,11.004187),(42.898084,10.995687),(42.888059,10.983568),(42.873279,10.978246),(42.860153,10.980416),(42.835452,10.987444),(42.794111,10.991604),(42.771787,10.996462),(42.754837,11.010544),(42.729619,11.06501),(42.710395,11.072116),(42.686521,11.073046),(42.615621,11.08966),(42.608145,11.089088),(42.569732,11.086146),(42.479712,11.059119),(42.413256,11.015944),(42.391758,11.005893),(42.376669,11.006668),(42.361166,11.011887),(42.338532,11.015504),(42.305872,11.004601),(42.297294,11.003774),(42.279414,11.004394),(42.270835,11.003516),(42.235179,10.987703),(42.221639,10.984344),(42.202726,10.98455),(42.151359,10.996203),(42.096272,10.990261),(42.069401,10.981501),(42.038395,10.950444),(42.0108,10.943597),(41.954162,10.941271),(41.947341,10.938532),(41.942793,10.933546),(41.937522,10.929825),(41.928841,10.931065),(41.922846,10.936026),(41.920262,10.941943),(41.916852,10.947059),(41.79872,10.970675),(41.773811,10.980054),(41.766523,10.989466),(41.761306,10.996203),(41.779289,11.024677),(41.785594,11.067388),(41.787971,11.259727),(41.775672,11.368429),(41.749834,11.483383),(41.74911,11.537953),(41.778669,11.628645),(41.792415,11.704455),(41.808228,11.736236),(41.823007,11.746106),(41.862282,11.763056),(41.872203,11.775871),(41.877784,11.790134),(41.886259,11.796025),(41.897525,11.799384),(41.911477,11.805947),(41.925327,11.816437),(41.936386,11.827445),(41.97468,11.88091),(42.057308,11.996271),(42.097719,12.070169),(42.108778,12.082106),(42.132343,12.093475),(42.140301,12.105826),(42.155494,12.142257),(42.288715,12.321006),(42.319205,12.386377),(42.379459,12.465907),(42.430929,12.520322),(42.448499,12.523371),(42.475681,12.516343),(42.521569,12.496241),(42.678252,12.360022),(42.691482,12.378832),(42.696187,12.380126),(42.727758,12.388806),(42.741401,12.408081),(42.749876,12.417073),(42.779745,12.422602),(42.792251,12.429165),(42.798038,12.456088),(42.788737,12.487456),(42.785223,12.517222),(42.828838,12.557633),(42.852092,12.611738),(42.868835,12.626155),(42.877723,12.62507),(42.890126,12.615407),(42.900358,12.616389),(43.117686,12.707913),(43.133962,12.697211),(43.143321,12.679511),(43.151134,12.659735),(43.161794,12.642727),(43.259613,12.533352),(43.283214,12.496527),(43.297374,12.482001),(43.312999,12.477688),(43.329356,12.488756),(43.329356,12.453559),(43.331228,12.436713),(43.336192,12.419908),(43.344086,12.406155),(43.353201,12.395209),(43.360525,12.383002),(43.363536,12.365302),(43.364757,12.327135),(43.367849,12.306871),(43.374034,12.292955),(43.411388,12.241767),(43.414317,12.224921),(43.411388,12.166653),(43.418712,12.091254),(43.413341,12.059272),(43.398774,12.029527),(43.377126,12.004828),(43.350434,11.987942),(43.34254,11.985663),(43.315684,11.981106),(43.288341,11.967434),(43.268403,11.963813),(43.225434,11.962877),(43.206554,11.957831),(43.174001,11.935004),(43.097179,11.84455),(43.09197,11.841295),(43.086029,11.838853),(43.076182,11.834703),(43.069184,11.830268),(43.064708,11.823432),(43.060883,11.809556),(43.055512,11.803616),(43.041515,11.798529),(42.986827,11.796088),(42.972504,11.790839),(42.95753,11.780463),(42.942638,11.77383),(42.915538,11.783596),(42.896495,11.780585),(42.803396,11.747992),(42.777192,11.732245),(42.75408,11.707953),(42.684093,11.582261),(42.677419,11.573676),(42.667979,11.568549),(42.636974,11.559556),(42.627696,11.559068),(42.60377,11.563381),(42.577403,11.562405),(42.569021,11.563381),(42.563487,11.567206),(42.554047,11.580268),(42.548595,11.583808),(42.526866,11.582465),(42.515147,11.574123),(42.514985,11.567206),(42.528087,11.570217),(42.532481,11.548489),(42.532481,11.547471),(42.533051,11.523505),(42.538748,11.502997),(42.571625,11.490465),(42.591563,11.47248),(42.60377,11.46776),(42.617686,11.470282),(42.633556,11.484809),(42.644786,11.488227),(42.653494,11.485907),(42.662852,11.481635),(42.672537,11.479722),(42.681651,11.484524),(42.687511,11.497219),(42.680675,11.504788),(42.670421,11.509955),(42.665294,11.51557),(42.674083,11.532131),(42.694102,11.545966),(42.739757,11.563381),(42.807465,11.571275),(42.829112,11.576972),(42.839529,11.584459),(42.847504,11.592719),(42.855805,11.595771),(42.866954,11.587592),(42.875173,11.583686),(42.900727,11.584052),(43.040538,11.585924),(43.06186,11.590155),(43.081798,11.589545),(43.103363,11.576972),(43.123057,11.581488),(43.133556,11.595282),(43.141124,11.608588),(43.151866,11.611762),(43.157888,11.601304),(43.172211,11.542873),(43.173106,11.541653),(43.183849,11.526557),(43.19516,11.518297),(43.226329,11.501899),(43.240733,11.48786)]
+Dominica	[(-61.362864,15.201809),(-61.374094,15.20482),(-61.376129,15.212836),(-61.372792,15.237209),(-61.37328,15.266425),(-61.372792,15.270697),(-61.378285,15.28205),(-61.39094,15.296291),(-61.393219,15.308295),(-61.395009,15.333075),(-61.399566,15.351142),(-61.413726,15.380561),(-61.415679,15.387641),(-61.41808,15.405951),(-61.421213,15.41474),(-61.444203,15.436835),(-61.447865,15.445136),(-61.449778,15.454657),(-61.454254,15.46483),(-61.460032,15.472886),(-61.465566,15.476142),(-61.472076,15.481391),(-61.474273,15.493476),(-61.475209,15.517768),(-61.47936,15.525458),(-61.484853,15.530341),(-61.488922,15.535712),(-61.488881,15.545071),(-61.483998,15.551581),(-61.467275,15.562974),(-61.462148,15.572984),(-61.469065,15.574286),(-61.481191,15.578559),(-61.488881,15.57925),(-61.480621,15.59101),(-61.468984,15.633857),(-61.449208,15.633083),(-61.437245,15.632636),(-61.425933,15.628485),(-61.413726,15.619574),(-61.397572,15.596625),(-61.384633,15.588365),(-61.36974,15.595933),(-61.35733,15.598293),(-61.307688,15.57925),(-61.305898,15.572455),(-61.29955,15.557196),(-61.289622,15.540961),(-61.284047,15.531399),(-61.268625,15.509914),(-61.267161,15.507799),(-61.25768,15.472602),(-61.256012,15.43594),(-61.262929,15.407904),(-61.258372,15.406317),(-61.254221,15.402981),(-61.249257,15.401068),(-61.255523,15.364569),(-61.254058,15.332668),(-61.253733,15.324693),(-61.256663,15.285346),(-61.277211,15.25023),(-61.284413,15.244818),(-61.289296,15.243598),(-61.293202,15.243883),(-61.303375,15.24258),(-61.311879,15.244534),(-61.318186,15.243394),(-61.323598,15.238593),(-61.328725,15.225572),(-61.342681,15.219672),(-61.345937,15.212348),(-61.346384,15.211697),(-61.350738,15.205146),(-61.362864,15.201809)]
+Algeria	[(8.60251,36.939511),(8.605655,36.913045),(8.604828,36.900979),(8.608239,36.890721),(8.642552,36.848501),(8.641725,36.836357),(8.623845,36.826074),(8.554495,36.803646),(8.520079,36.79791),(8.482665,36.799977),(8.444011,36.796205),(8.413109,36.783906),(8.406701,36.767989),(8.441634,36.75321),(8.461788,36.732798),(8.45321,36.697658),(8.430369,36.662621),(8.407941,36.642622),(8.286915,36.583401),(8.222319,36.563764),(8.193484,36.548985),(8.169919,36.525834),(8.16789,36.491995),(8.167852,36.491365),(8.20878,36.477826),(8.295597,36.46868),(8.314924,36.460618),(8.333837,36.456381),(8.349237,36.448784),(8.357712,36.430387),(8.359675,36.411215),(8.358125,36.369926),(8.355423,36.356116),(8.354404,36.350909),(8.307069,36.243629),(8.302314,36.202339),(8.307069,36.182495),(8.31451,36.163944),(8.317094,36.145909),(8.307999,36.126995),(8.296733,36.110407),(8.275649,36.03682),(8.272446,35.981732),(8.268423,35.969864),(8.247227,35.907318),(8.24144,35.827737),(8.24578,35.78531),(8.257666,35.750325),(8.306552,35.684903),(8.323605,35.652192),(8.327225,35.621405),(8.337041,35.537935),(8.336731,35.508376),(8.300868,35.437476),(8.290016,35.402595),(8.287948,35.366059),(8.294356,35.32508),(8.317404,35.289475),(8.355231,35.274334),(8.396882,35.263688),(8.431299,35.241726),(8.421377,35.222089),(8.360916,35.145918),(8.313683,35.103078),(8.300454,35.06768),(8.282884,34.994041),(8.25901,34.940659),(8.248881,34.901953),(8.250741,34.864746),(8.269345,34.763874),(8.266554,34.750283),(8.258714,34.741298),(8.257356,34.739741),(8.225213,34.711681),(8.213431,34.696746),(8.210641,34.681192),(8.236479,34.647654),(8.228831,34.63644),(8.192864,34.617733),(8.186559,34.609568),(8.179531,34.592153),(8.17519,34.58528),(8.167232,34.578562),(8.143668,34.566728),(8.102483,34.536355),(8.094058,34.530142),(7.999077,34.494175),(7.957323,34.469422),(7.87061,34.437899),(7.831542,34.414386),(7.811905,34.379272),(7.774285,34.260959),(7.765293,34.244707),(7.752787,34.232149),(7.733874,34.223778),(7.670312,34.215303),(7.631451,34.199102),(7.604063,34.175486),(7.579568,34.148459),(7.539228,34.113758),(7.517453,34.095026),(7.503707,34.067973),(7.500606,33.994257),(7.479832,33.893901),(7.484897,33.855015),(7.498539,33.799979),(7.505464,33.782849),(7.534196,33.736236),(7.544428,33.68425),(7.553006,33.658748),(7.616568,33.565963),(7.693153,33.454109),(7.708242,33.414861),(7.708286,33.410704),(7.709689,33.278151),(7.724985,33.231409),(7.75072,33.207664),(7.787514,33.198311),(7.83547,33.194538),(7.871953,33.184125),(7.982747,33.116817),(8.002178,33.108368),(8.022642,33.103045),(8.043622,33.101831),(8.0645,33.105784),(8.086824,33.094286),(8.181392,32.969823),(8.282884,32.836369),(8.296423,32.804407),(8.309963,32.663873),(8.319574,32.560598),(8.331253,32.527628),(8.332627,32.526355),(8.359985,32.501015),(8.482665,32.434791),(8.642345,32.336658),(8.851532,32.208242),(9.019893,32.104863),(9.033743,32.090756),(9.045008,32.071842),(9.063304,32.000192),(9.065989,31.989676),(9.094514,31.879606),(9.12273,31.769535),(9.151152,31.659567),(9.17947,31.549497),(9.207789,31.439426),(9.236211,31.329407),(9.264426,31.219336),(9.292952,31.109317),(9.32127,30.999246),(9.349589,30.889175),(9.377908,30.779156),(9.40633,30.669085),(9.434752,30.559066),(9.463071,30.449047),(9.491389,30.338976),(9.519708,30.228905),(9.286544,30.117129),(9.310005,30.084366),(9.369487,30.022794),(9.421729,29.968714),(9.54968,29.802316),(9.667709,29.608323),(9.746929,29.368428),(9.826149,29.128533),(9.848267,28.975726),(9.851264,28.785996),(9.827276,28.618647),(9.776953,28.267578),(9.789872,28.209442),(9.93591,27.866724),(9.934256,27.827398),(9.931274,27.818642),(9.863356,27.619246),(9.846613,27.599298),(9.818501,27.585733),(9.793903,27.569739),(9.797107,27.548914),(9.81168,27.526538),(9.821602,27.505687),(9.813643,27.486489),(9.770545,27.444217),(9.756283,27.42303),(9.743053,27.364119),(9.726517,27.32469),(9.721866,27.308463),(9.721349,27.291875),(9.806099,27.025122),(9.825529,26.92058),(9.835141,26.900995),(9.846096,26.891951),(9.890848,26.869576),(9.906661,26.857483),(9.910588,26.843117),(9.885474,26.736612),(9.88258,26.701782),(9.894052,26.67398),(9.896326,26.652793),(9.854571,26.524377),(9.835761,26.504223),(9.482604,26.352553),(9.481364,26.332606),(9.477643,26.315552),(9.468858,26.301031),(9.434752,26.271989),(9.416458,26.23225),(9.402506,26.216179),(9.377804,26.168946),(9.401162,26.113394),(9.541309,25.936351),(9.693961,25.743494),(9.816744,25.588465),(9.9695,25.395402),(10.007947,25.331426),(10.021383,25.26802),(10.025517,25.1364),(10.029961,24.995065),(10.032028,24.856339),(10.044534,24.829622),(10.193362,24.749937),(10.212172,24.722859),(10.229742,24.629945),(10.242248,24.595115),(10.260335,24.576641),(10.391799,24.47998),(10.410506,24.473288),(10.450194,24.476931),(10.566776,24.516463),(10.677363,24.553851),(10.699067,24.556125),(10.720668,24.552301),(10.911354,24.494501),(11.149996,24.422335),(11.46724,24.326339),(11.50863,24.313814),(11.541393,24.29751),(11.567128,24.26684),(11.636478,24.137649),(11.708618,24.00298),(11.71014,24.000137),(11.822306,23.790642),(11.89238,23.660056),(11.968861,23.517351),(11.900855,23.477173),(11.832745,23.437046),(11.764739,23.396945),(11.696733,23.356844),(11.628623,23.316717),(11.560514,23.276591),(11.492611,23.236516),(11.424501,23.196415),(11.356392,23.156262),(11.288489,23.116161),(11.220379,23.07606),(11.15227,23.035882),(11.084367,22.995755),(11.016257,22.955654),(10.948148,22.915527),(10.880038,22.875375),(10.812032,22.835326),(10.743923,22.795199),(10.675813,22.755046),(10.607807,22.714945),(10.539801,22.674896),(10.471691,22.634744),(10.403788,22.594643),(10.335679,22.554542),(10.267569,22.514337),(10.199563,22.474237),(10.131557,22.434136),(10.063447,22.394035),(9.995441,22.353882),(9.927435,22.313781),(9.859325,22.27368),(9.791319,22.233579),(9.723313,22.193427),(9.655203,22.153326),(9.587197,22.113225),(9.519088,22.073072),(9.451082,22.03292),(9.383075,21.992819),(9.314966,21.952718),(9.24696,21.912565),(9.178953,21.872516),(9.110844,21.832364),(9.042838,21.792263),(8.974832,21.75211),(8.906722,21.712061),(8.838613,21.671908),(8.770606,21.631807),(8.702497,21.591655),(8.634491,21.551502),(8.566381,21.51135),(8.498375,21.4713),(8.430265,21.431148),(8.362259,21.391047),(8.294253,21.350946),(8.226143,21.310845),(8.158034,21.270744),(8.090131,21.230592),(8.022022,21.190491),(7.953912,21.15039),(7.886009,21.110237),(7.8179,21.070085),(7.74979,21.029984),(7.681887,20.989831),(7.613778,20.94973),(7.482726,20.872577),(7.383611,20.791652),(7.312297,20.733464),(7.240881,20.675173),(7.169464,20.616986),(7.098047,20.558746),(7.020532,20.495443),(6.982808,20.46361),(6.925138,20.414001),(6.862092,20.35974),(6.799047,20.305532),(6.736105,20.251323),(6.672957,20.197115),(6.609963,20.142854),(6.546918,20.088646),(6.483769,20.034385),(6.420931,19.980177),(6.357782,19.925917),(6.294737,19.871682),(6.231692,19.817474),(6.168646,19.763213),(6.105601,19.709005),(6.042556,19.654745),(5.979407,19.600536),(5.916362,19.546276),(5.837607,19.478631),(5.794302,19.449796),(5.749344,19.433699),(5.620463,19.408997),(5.520831,19.389903),(5.301826,19.347993),(5.082821,19.306006),(4.983189,19.286963),(4.794467,19.250764),(4.605848,19.214616),(4.417229,19.178417),(4.22861,19.142244),(4.057561,19.110437),(3.886512,19.07863),(3.790291,19.06077),(3.715566,19.046901),(3.54462,19.015068),(3.439821,18.995638),(3.439717,18.995638),(3.358689,18.976853),(3.333057,18.975561),(3.318381,18.977706),(3.308356,18.981685),(3.284895,18.995741),(3.225984,19.05106),(3.179785,19.07),(3.158597,19.08155),(3.138754,19.096045),(3.120874,19.112814),(3.10413,19.135526),(3.102684,19.153561),(3.111779,19.171337),(3.126558,19.193352),(3.134206,19.212859),(3.13927,19.221929),(3.152706,19.230197),(3.17441,19.251643),(3.178855,19.268722),(3.183816,19.307505),(3.192911,19.325798),(3.211514,19.340862),(3.232701,19.351843),(3.250995,19.36546),(3.260813,19.388327),(3.25823,19.410393),(3.247481,19.426464),(3.234769,19.441347),(3.225984,19.459692),(3.22619,19.4692),(3.231668,19.489044),(3.232288,19.495478),(3.228051,19.504159),(3.222883,19.508061),(3.217509,19.511162),(3.212238,19.517156),(3.199422,19.553769),(3.198285,19.592397),(3.216785,19.794064),(3.212754,19.807758),(3.198802,19.820523),(3.183195,19.827731),(3.147022,19.837938),(3.130485,19.845224),(3.072608,19.88889),(2.946001,19.941652),(2.671805,19.996222),(2.616925,19.998367),(2.525665,20.015162),(2.514812,20.015937),(2.495382,20.020097),(2.459312,20.038778),(2.439882,20.04609),(2.415697,20.051284),(2.400401,20.056555),(2.388722,20.067407),(2.348208,20.137635),(2.316478,20.180165),(2.279581,20.21794),(2.21819,20.264087),(2.200826,20.273906),(2.18243,20.278505),(2.161346,20.274939),(2.138195,20.260728),(2.097474,20.224193),(2.071222,20.213263),(2.056339,20.215046),(1.993397,20.235949),(1.983372,20.241918),(1.975621,20.248429),(1.967146,20.253416),(1.95526,20.254915),(1.941204,20.251116),(1.924254,20.23613),(1.913402,20.231092),(1.891388,20.231789),(1.883843,20.24414),(1.880329,20.263054),(1.870614,20.283543),(1.855008,20.294835),(1.838885,20.29592),(1.820901,20.293594),(1.799197,20.294886),(1.778113,20.304291),(1.659154,20.397516),(1.649232,20.412089),(1.650059,20.487019),(1.643961,20.522676),(1.623704,20.551253),(1.559729,20.597504),(1.520351,20.616986),(1.483454,20.622618),(1.465781,20.633522),(1.447487,20.638741),(1.40718,20.645046),(1.363978,20.657707),(1.346925,20.669127),(1.331526,20.687937),(1.310545,20.722716),(1.296696,20.733464),(1.273338,20.739407),(1.252254,20.738994),(1.212463,20.73088),(1.191276,20.73057),(1.168538,20.733464),(1.154585,20.738787),(1.147247,20.751448),(1.14456,20.776252),(1.145284,20.795889),(1.167505,20.886013),(1.180114,20.995309),(1.177943,21.017323),(1.15934,21.081505),(1.146524,21.101711),(1.029322,21.178347),(0.942609,21.235036),(0.855999,21.291673),(0.769389,21.34831),(0.682676,21.404896),(0.596067,21.461585),(0.509457,21.518274),(0.422795,21.574963),(0.33616,21.631601),(0.249499,21.688238),(0.162966,21.744824),(0.076253,21.801461),(0.003735,21.848899),(-0.010408,21.85815),(-0.097044,21.914839),(-0.183731,21.971477),(-0.270392,22.028114),(-0.357028,22.084751),(-0.443663,22.141389),(-0.530325,22.198078),(-0.616934,22.254767),(-0.703647,22.311404),(-0.790309,22.368041),(-0.876918,22.424627),(-0.96358,22.481265),(-1.05019,22.537954),(-1.136903,22.594643),(-1.223512,22.65128),(-1.310122,22.707969),(-1.396783,22.764555),(-1.483496,22.821166),(-1.570054,22.877881),(-1.656716,22.93457),(-1.743326,22.991182),(-1.830039,23.047819),(-1.916648,23.104456),(-2.00331,23.161042),(-2.089919,23.217757),(-2.176632,23.274446),(-2.26319,23.331109),(-2.349852,23.387747),(-2.436513,23.444358),(-2.523226,23.500996),(-2.609836,23.557685),(-2.696446,23.614348),(-2.783107,23.670985),(-2.869768,23.727623),(-2.956404,23.784234),(-3.043065,23.840923),(-3.129649,23.897612),(-3.209489,23.949702),(-3.289123,24.001844),(-3.368808,24.053959),(-3.448544,24.106023),(-3.528281,24.158113),(-3.608018,24.210203),(-3.687625,24.262344),(-3.767336,24.314434),(-3.846996,24.366576),(-3.926732,24.418717),(-4.006495,24.470807),(-4.086154,24.522897),(-4.165865,24.574987),(-4.245498,24.627077),(-4.325235,24.679218),(-4.404946,24.731308),(-4.516025,24.803991),(-4.592351,24.851688),(-4.668677,24.899334),(-4.744925,24.947057),(-4.821226,24.994755),(-4.821355,24.994806),(-4.821536,24.994961),(-4.821613,24.995065),(-4.995194,25.102086),(-5.16875,25.20916),(-5.342331,25.316182),(-5.515964,25.423256),(-5.63699,25.494466),(-5.661525,25.508881),(-5.804628,25.592961),(-5.972266,25.691611),(-6.139905,25.79021),(-6.307491,25.888808),(-6.505412,26.005184),(-6.703333,26.121559),(-6.901202,26.237934),(-7.099123,26.354361),(-7.297043,26.470737),(-7.494912,26.587164),(-7.692782,26.703487),(-7.890754,26.819914),(-8.088623,26.936238),(-8.28644,27.052665),(-8.484413,27.168989),(-8.682385,27.285416),(-8.682385,27.379467),(-8.682385,27.473466),(-8.682385,27.567414),(-8.682385,27.661439),(-8.682385,27.721436),(-8.682385,27.781354),(-8.682385,27.841222),(-8.682385,27.90114),(-8.682385,27.961085),(-8.682385,28.02103),(-8.682385,28.080949),(-8.682385,28.140893),(-8.682385,28.20076),(-8.682385,28.260679),(-8.682385,28.320624),(-8.682385,28.380543),(-8.682385,28.440487),(-8.682385,28.500406),(-8.682385,28.560273),(-8.682385,28.620218),(-8.682385,28.6659),(-8.678768,28.692823),(-8.667606,28.711685),(-8.648847,28.725948),(-8.520819,28.787081),(-8.475835,28.818759),(-8.430411,28.841006),(-8.417802,28.852349),(-8.383489,28.905782),(-8.368451,28.916531),(-8.333259,28.93038),(-8.316774,28.939062),(-8.250474,28.994769),(-8.182312,29.035541),(-8.069658,29.079337),(-8.036326,29.099853),(-7.945014,29.176231),(-7.839129,29.239043),(-7.777996,29.289324),(-7.729989,29.311158),(-7.714667,29.321829),(-7.653611,29.376193),(-7.619453,29.389422),(-7.572686,29.387613),(-7.528502,29.380947),(-7.506126,29.380223),(-7.48406,29.382445),(-7.463286,29.389137),(-7.34961,29.383439),(-7.258755,29.467305),(-7.146934,29.509238),(-7.070057,29.516227),(-6.958236,29.509238),(-6.783515,29.446339),(-6.699649,29.516227),(-6.559872,29.530205),(-6.413107,29.565149),(-6.27333,29.579127),(-6.126564,29.579127),(-6.000765,29.579127),(-5.881955,29.600093),(-5.756156,29.614071),(-5.721212,29.523216),(-5.637346,29.495261),(-5.539503,29.523216),(-5.43467,29.642026),(-5.343815,29.767825),(-5.273927,29.886635),(-5.176083,29.97749),(-5.071251,30.04039),(-4.95943,30.124256),(-4.875564,30.180166),(-4.770731,30.229088),(-4.623966,30.284999),(-4.484189,30.382842),(-4.372368,30.508641),(-4.274524,30.557563),(-4.155714,30.585519),(-4.001959,30.592507),(-3.834228,30.627452),(-3.645529,30.711317),(-3.652518,30.774217),(-3.659507,30.837116),(-3.610585,30.879049),(-3.554674,30.955927),(-3.608741,31.030872),(-3.610085,31.050302),(-3.614529,31.068027),(-3.624141,31.086527),(-3.635872,31.095674),(-3.671942,31.110867),(-3.689718,31.125595),(-3.717107,31.163267),(-3.731421,31.176341),(-3.748862,31.180217),(-3.763719,31.173447),(-3.792968,31.149676),(-3.810796,31.142906),(-3.827462,31.143837),(-3.839322,31.152828),(-3.842836,31.170192),(-3.836169,31.189777),(-3.814982,31.220524),(-3.812915,31.243365),(-3.81922,31.318865),(-3.815189,31.337158),(-3.802502,31.350646),(-3.747467,31.385166),(-3.673484,31.389234),(-3.659507,31.647821),(-3.591378,31.678274),(-3.548745,31.669954),(-3.511564,31.672745),(-3.21921,31.717709),(-3.002556,31.77362),(-2.827836,31.794586),(-2.869769,31.89243),(-2.938731,32.048639),(-2.881189,32.076286),(-2.695567,32.08967),(-2.516147,32.1322),(-2.378636,32.126774),(-2.315177,32.124294),(-2.243398,32.1214),(-2.165109,32.118299),(-2.081858,32.11494),(-1.995455,32.111478),(-1.907553,32.107964),(-1.819962,32.104501),(-1.734334,32.101091),(-1.652375,32.097835),(-1.575791,32.094735),(-1.506337,32.091944),(-1.445618,32.089515),(-1.395388,32.087552),(-1.357406,32.086053),(-1.333428,32.085071),(-1.324953,32.084709),(-1.249557,32.08166),(-1.210335,32.08967),(-1.190594,32.125224),(-1.195607,32.146049),(-1.211833,32.158348),(-1.232711,32.163723),(-1.251831,32.163516),(-1.288986,32.150907),(-1.305161,32.151165),(-1.309554,32.167443),(-1.305678,32.173722),(-1.289193,32.184858),(-1.282992,32.190181),(-1.276636,32.200852),(-1.275189,32.209069),(-1.275499,32.217518),(-1.273423,32.229442),(-1.257515,32.320845),(-1.244131,32.356915),(-1.234158,32.374614),(-1.217983,32.392623),(-1.201705,32.399858),(-1.16026,32.404948),(-1.123157,32.417945),(-1.08998,32.439442),(-1.031999,32.4944),(-1.047502,32.517009),(-1.32702,32.69891),(-1.390531,32.718779),(-1.423345,32.742395),(-1.558789,32.93365),(-1.516363,32.959488),(-1.50887,32.966309),(-1.502978,32.974629),(-1.498844,32.984008),(-1.496519,32.994292),(-1.493367,33.016151),(-1.493057,33.039483),(-1.499516,33.060205),(-1.516363,33.073977),(-1.545508,33.091831),(-1.571398,33.111985),(-1.592069,33.136609),(-1.605608,33.168028),(-1.623591,33.196605),(-1.674234,33.237972),(-1.683381,33.270839),(-1.683226,33.36923),(-1.672839,33.394604),(-1.659145,33.41977),(-1.640386,33.475529),(-1.6254,33.494236),(-1.612739,33.521469),(-1.617338,33.554439),(-1.6624,33.644692),(-1.673252,33.6565),(-1.690719,33.667326),(-1.725394,33.677713),(-1.740742,33.686601),(-1.746788,33.702388),(-1.74224,33.717762),(-1.732577,33.727865),(-1.72095,33.736366),(-1.710821,33.747063),(-1.703225,33.761816),(-1.702501,33.772823),(-1.713043,33.801995),(-1.722087,33.851165),(-1.718728,33.898087),(-1.672115,34.059188),(-1.669635,34.079213),(-1.672085,34.092021),(-1.674751,34.105956),(-1.746064,34.290311),(-1.771334,34.334701),(-1.809626,34.372451),(-1.702966,34.479679),(-1.714232,34.485054),(-1.750664,34.494175),(-1.871121,34.596649),(-1.862957,34.613599),(-1.810505,34.680727),(-1.786114,34.72584),(-1.773143,34.734057),(-1.769526,34.741343),(-1.787716,34.756691),(-1.892825,34.811675),(-1.926725,34.838081),(-1.979745,34.865263),(-1.993491,34.878854),(-1.9984,34.892703),(-1.999692,34.906346),(-2.00362,34.91818),(-2.01628,34.926241),(-2.061239,34.929704),(-2.094932,34.947687),(-2.126041,34.971923),(-2.1633,34.994041),(-2.193789,35.003601),(-2.211669,35.023445),(-2.221126,35.049955),(-2.222564,35.089301),(-2.200103,35.096137),(-2.196116,35.094875),(-2.192616,35.094468),(-2.189443,35.093004),(-2.186391,35.08869),(-2.15689,35.100979),(-2.122222,35.094672),(-2.08609,35.081977),(-2.052358,35.075019),(-1.987701,35.082465),(-1.964752,35.076239),(-1.956451,35.075019),(-1.949818,35.077135),(-1.932485,35.08869),(-1.838694,35.110907),(-1.812734,35.126532),(-1.804351,35.128119),(-1.774241,35.127346),(-1.761138,35.129625),(-1.745595,35.138821),(-1.712799,35.1706),(-1.648834,35.188422),(-1.637685,35.194525),(-1.629506,35.212226),(-1.510365,35.295478),(-1.490875,35.300971),(-1.395904,35.309394),(-1.369537,35.315863),(-1.364003,35.318345),(-1.358957,35.322211),(-1.332672,35.349351),(-1.313791,35.353746),(-1.29483,35.364569),(-1.278635,35.377997),(-1.26773,35.390326),(-1.259185,35.410305),(-1.247304,35.45775),(-1.23705,35.475735),(-1.225413,35.491278),(-1.190338,35.566148),(-1.183339,35.576483),(-1.171539,35.581041),(-1.14802,35.582099),(-1.142812,35.5869),(-1.117014,35.616889),(-1.106353,35.623236),(-1.082753,35.637356),(-1.052073,35.660956),(-1.040395,35.676418),(-1.032948,35.682603),(-0.996693,35.689602),(-0.977651,35.699774),(-0.961537,35.711249),(-0.946278,35.719306),(-0.922678,35.725165),(-0.910227,35.724311),(-0.904693,35.715888),(-0.899403,35.711819),(-0.887563,35.715969),(-0.849477,35.73432),(-0.825022,35.768541),(-0.801666,35.773912),(-0.793528,35.770087),(-0.786122,35.763129),(-0.77717,35.756415),(-0.764027,35.753404),(-0.754018,35.752265),(-0.734486,35.747219),(-0.723134,35.745998),(-0.711293,35.742987),(-0.705881,35.735663),(-0.701324,35.726874),(-0.692454,35.719306),(-0.682607,35.717353),(-0.644521,35.719306),(-0.626454,35.722968),(-0.606109,35.730943),(-0.589345,35.742499),(-0.57726,35.770819),(-0.565053,35.772447),(-0.551259,35.769029),(-0.540924,35.767768),(-0.530426,35.772895),(-0.523427,35.77969),(-0.47704,35.859361),(-0.476064,35.870103),(-0.478424,35.87287),(-0.480336,35.879096),(-0.480824,35.885728),(-0.479482,35.890041),(-0.473785,35.891262),(-0.468007,35.888739),(-0.46288,35.885199),(-0.459055,35.883775),(-0.448964,35.884345),(-0.428131,35.882799),(-0.41804,35.883775),(-0.376129,35.900336),(-0.348541,35.90705),(-0.336171,35.900824),(-0.331451,35.889553),(-0.320709,35.884101),(-0.309193,35.881171),(-0.30191,35.87759),(-0.298492,35.867174),(-0.304596,35.853502),(-0.30191,35.842841),(-0.285553,35.828274),(-0.259429,35.817532),(-0.188059,35.805243),(-0.14509,35.790351),(-0.123891,35.786933),(-0.113678,35.788804),(-0.083079,35.794379),(-0.038482,35.8133),(0.00294,35.838039),(0.034516,35.863267),(0.069957,35.92182),(0.08017,35.947008),(0.114024,36.010199),(0.122406,36.033352),(0.12379,36.044582),(0.127289,36.050767),(0.13559,36.055609),(0.145518,36.059963),(0.153982,36.065009),(0.202159,36.106513),(0.219493,36.116523),(0.283458,36.134426),(0.294444,36.140774),(0.299083,36.147406),(0.321056,36.158881),(0.329275,36.164984),(0.332774,36.173814),(0.337576,36.197496),(0.342296,36.205959),(0.360037,36.213853),(0.384451,36.217963),(0.428396,36.219631),(0.451345,36.223212),(0.468272,36.232245),(0.483165,36.243598),(0.556651,36.284084),(0.594574,36.293158),(0.611827,36.305487),(0.627208,36.319241),(0.644054,36.328843),(0.663259,36.332587),(0.740408,36.337755),(0.753266,36.338609),(0.768728,36.344713),(0.802257,36.363593),(0.864757,36.377387),(0.880544,36.387152),(0.89088,36.396389),(0.913829,36.409125),(0.925141,36.418158),(0.929535,36.42593),(0.93214,36.434556),(0.93629,36.44359),(0.945567,36.452338),(0.962576,36.458157),(1.007091,36.466864),(1.04477,36.486884),(1.116954,36.487128),(1.138845,36.493394),(1.178722,36.510891),(1.202647,36.51439),(1.245453,36.513577),(1.265473,36.515326),(1.288259,36.521226),(1.34669,36.544989),(1.367686,36.547919),(1.385997,36.545152),(1.429535,36.532213),(1.45281,36.528022),(1.476329,36.528957),(1.517426,36.538723),(1.700938,36.547187),(1.716563,36.547919),(1.726736,36.549994),(1.750173,36.559149),(1.761241,36.561591),(1.77003,36.560492),(1.791515,36.555487),(1.802908,36.555365),(1.857595,36.56745),(1.913829,36.570217),(1.96046,36.562201),(1.97283,36.561591),(2.059906,36.570136),(2.309825,36.63052),(2.3296,36.637274),(2.351573,36.638332),(2.373302,36.633857),(2.391856,36.624254),(2.398204,36.615302),(2.400157,36.606187),(2.404063,36.599189),(2.416026,36.59634),(2.426768,36.595282),(2.447276,36.590562),(2.457042,36.589504),(2.600759,36.59634),(2.632986,36.605129),(2.72755,36.665229),(2.792979,36.692939),(2.818696,36.710883),(2.843598,36.740383),(2.849864,36.754055),(2.875662,36.774807),(2.933116,36.80858),(2.977061,36.815863),(2.984874,36.814968),(3.014171,36.811713),(3.047862,36.794989),(3.073985,36.771389),(3.101817,36.751899),(3.140147,36.741645),(3.173269,36.742621),(3.179373,36.742825),(3.21046,36.757392),(3.221202,36.77143),(3.226085,36.7862),(3.227306,36.812323),(3.237804,36.813056),(3.302989,36.788764),(3.340505,36.780707),(3.460704,36.775092),(3.480479,36.777248),(3.519054,36.786607),(3.539806,36.788764),(3.550466,36.791449),(3.558116,36.797675),(3.564301,36.804348),(3.570567,36.80858),(3.580414,36.809963),(3.601817,36.808092),(3.612071,36.80858),(3.649669,36.823961),(3.709483,36.873196),(3.741873,36.891181),(3.827485,36.912909),(3.873871,36.917222),(3.912608,36.911607),(3.948253,36.893297),(3.964041,36.891181),(3.974864,36.892279),(3.99643,36.896918),(4.031423,36.897773),(4.03948,36.896918),(4.08546,36.892076),(4.104828,36.883734),(4.146495,36.901801),(4.159516,36.904202),(4.17156,36.902167),(4.197032,36.893256),(4.21046,36.891181),(4.22283,36.894192),(4.249278,36.907864),(4.261974,36.911607),(4.278575,36.910468),(4.306,36.900458),(4.320323,36.898017),(4.440684,36.911607),(4.452973,36.910061),(4.46811,36.905992),(4.482432,36.900458),(4.491954,36.894599),(4.50408,36.889309),(4.536388,36.888577),(4.550548,36.883734),(4.581554,36.894924),(4.591482,36.89525),(4.622895,36.896389),(4.698009,36.891181),(4.769054,36.898017),(4.78712,36.895413),(4.94988,36.839789),(4.968272,36.82567),(4.973643,36.818915),(4.985688,36.817084),(4.999522,36.817125),(5.009288,36.816067),(5.016449,36.810981),(5.025238,36.798651),(5.029145,36.794989),(5.045909,36.78852),(5.065603,36.783515),(5.086192,36.780829),(5.104828,36.781317),(5.084809,36.732611),(5.09018,36.716783),(5.118419,36.699368),(5.23585,36.650946),(5.269054,36.64411),(5.304373,36.643012),(5.372406,36.650946),(5.428071,36.663886),(5.433849,36.665229),(5.464854,36.665229),(5.469574,36.667711),(5.482188,36.680243),(5.489106,36.685126),(5.529145,36.697659),(5.549001,36.709703),(5.562755,36.745998),(5.576182,36.761379),(5.593923,36.773871),(5.61199,36.781317),(5.655935,36.791815),(5.674571,36.799628),(5.71046,36.825507),(5.733735,36.832343),(5.7588,36.833401),(5.82781,36.821763),(5.868826,36.822943),(6.03712,36.853583),(6.197032,36.90233),(6.235688,36.92121),(6.256847,36.945787),(6.258556,36.966783),(6.254731,36.983303),(6.254405,36.998969),(6.266856,37.017768),(6.274425,37.024237),(6.314626,37.048651),(6.328868,37.061916),(6.338715,37.069281),(6.371593,37.083482),(6.415782,37.092963),(6.462413,37.09394),(6.502696,37.082953),(6.538585,37.06037),(6.5442,37.058783),(6.544688,37.04857),(6.547048,37.041205),(6.552257,37.036689),(6.56129,37.035142),(6.572765,37.027777),(6.583263,36.989814),(6.599457,36.97309),(6.614106,36.977851),(6.631602,36.972398),(6.651134,36.963853),(6.671153,36.959418),(6.822032,36.952623),(6.834809,36.949123),(6.852794,36.940334),(6.86964,36.929185),(6.880056,36.918443),(6.879649,36.902086),(6.909434,36.893052),(6.948578,36.890041),(6.975597,36.891181),(7.064464,36.913316),(7.092296,36.92593),(7.108084,36.920315),(7.133311,36.915269),(7.156993,36.9147),(7.167491,36.922187),(7.176443,36.931871),(7.218761,36.960842),(7.232921,36.966864),(7.239024,36.971503),(7.247081,36.982327),(7.254242,36.994696),(7.257335,37.004136),(7.255544,37.015367),(7.250499,37.023139),(7.211111,37.057034),(7.181651,37.076728),(7.181651,37.082953),(7.192719,37.084296),(7.212169,37.089301),(7.222667,37.089789),(7.232758,37.087226),(7.251313,37.078599),(7.260509,37.076728),(7.262706,37.075995),(7.266449,37.074693),(7.270681,37.071031),(7.27475,37.069322),(7.281016,37.073065),(7.288259,37.080268),(7.292654,37.082506),(7.297699,37.082953),(7.307302,37.080146),(7.325857,37.071194),(7.335948,37.069281),(7.344412,37.071438),(7.369965,37.082953),(7.383474,37.082994),(7.386241,37.082099),(7.386892,37.078111),(7.394054,37.069281),(7.398204,37.05801),(7.404633,37.051581),(7.418224,37.048814),(7.438324,37.04857),(7.447113,37.046617),(7.456065,37.041978),(7.472423,37.050035),(7.490245,37.054999),(7.526134,37.033149),(7.555919,37.00788),(7.588878,36.987616),(7.633556,36.980536),(7.643403,36.982652),(7.652192,36.986233),(7.661876,36.988471),(7.67449,36.986762),(7.685802,36.982408),(7.695974,36.976996),(7.704845,36.970526),(7.712738,36.963202),(7.760753,36.966864),(7.770763,36.97012),(7.789073,36.986558),(7.798595,36.993598),(7.791026,36.973212),(7.778575,36.951117),(7.774262,36.931464),(7.791189,36.918443),(7.773448,36.88996),(7.773774,36.889757),(7.809906,36.86815),(7.866466,36.854397),(7.908458,36.849555),(8.049978,36.87759),(8.073009,36.887397),(8.093028,36.901801),(8.233165,36.958075),(8.25115,36.948676),(8.268728,36.933743),(8.288097,36.92593),(8.333263,36.927802),(8.355968,36.92593),(8.374034,36.918443),(8.388845,36.923245),(8.401622,36.918606),(8.414399,36.910224),(8.428722,36.904202),(8.463227,36.901557),(8.497569,36.904202),(8.601899,36.939358),(8.60251,36.939511)]
+Ethiopia	[(38.13331,14.677762),(38.190258,14.687322),(38.213925,14.685875),(38.229325,14.679725),(38.239557,14.667555),(38.245841,14.652474),(38.247825,14.647712),(38.252683,14.62022),(38.257644,14.610427),(38.267152,14.601771),(38.278831,14.595467),(38.28927,14.587741),(38.295678,14.574874),(38.305186,14.536917),(38.313351,14.519347),(38.32503,14.504594),(38.340636,14.492682),(38.394276,14.464312),(38.402338,14.456871),(38.409056,14.43527),(38.41443,14.426304),(38.426832,14.417183),(38.435204,14.416305),(38.443679,14.418656),(38.492978,14.418294),(38.569356,14.426821),(38.606563,14.436484),(38.668471,14.467723),(38.688005,14.467103),(38.706195,14.46116),(38.724385,14.459403),(38.742885,14.461056),(38.761902,14.465449),(38.821537,14.489478),(38.866082,14.493664),(38.884582,14.506247),(38.917552,14.535703),(38.959203,14.554642),(38.979667,14.567122),(38.993826,14.585157),(38.996823,14.60358),(38.995273,14.622261),(38.996823,14.638901),(39.009742,14.651226),(39.011189,14.647763),(39.04695,14.643758),(39.075475,14.637402),(39.0855,14.633475),(39.107308,14.620116),(39.127461,14.602211),(39.144721,14.581566),(39.158467,14.560146),(39.187509,14.477205),(39.20818,14.440179),(39.233191,14.440438),(39.254999,14.474415),(39.268538,14.48643),(39.293446,14.490305),(39.347603,14.481805),(39.36662,14.482916),(39.448579,14.505111),(39.489403,14.524489),(39.50718,14.547821),(39.515035,14.56782),(39.532295,14.567587),(39.552138,14.556684),(39.567331,14.544307),(39.587692,14.520278),(39.59379,14.514567),(39.599474,14.511648),(39.650944,14.496584),(39.677712,14.494233),(39.722985,14.501717),(39.735073,14.503715),(39.766906,14.504775),(39.796878,14.495111),(39.824473,14.478135),(39.87708,14.433616),(39.892273,14.426562),(39.911186,14.42341),(39.93072,14.428784),(39.961519,14.454209),(39.979812,14.458731),(39.999839,14.455238),(40.023221,14.45116),(40.037483,14.451522),(40.086886,14.465759),(40.104559,14.465966),(40.194373,14.444649),(40.237678,14.427441),(40.277055,14.404574),(40.353687,14.335241),(40.421646,14.273755),(40.479834,14.244403),(40.585874,14.19469),(40.614089,14.185802),(40.704419,14.173219),(40.772322,14.148362),(40.833197,14.105962),(40.93779,13.989922),(41.043623,13.872488),(41.121345,13.738181),(41.192038,13.615863),(41.222217,13.586614),(41.357093,13.502278),(41.530726,13.393783),(41.635525,13.309344),(41.7118,13.247926),(41.750764,13.208316),(41.784767,13.164572),(41.8166,13.112792),(41.894321,12.94797),(41.946617,12.876166),(42.024649,12.82697),(42.0817,12.803922),(42.137304,12.77333),(42.184949,12.733048),(42.250165,12.623985),(42.33171,12.515465),(42.379459,12.465907),(42.319205,12.386377),(42.288715,12.321006),(42.155494,12.142257),(42.140301,12.105826),(42.132343,12.093475),(42.108778,12.082106),(42.097719,12.070169),(42.057308,11.996271),(41.97468,11.88091),(41.936386,11.827445),(41.925327,11.816437),(41.911477,11.805947),(41.897525,11.799384),(41.886259,11.796025),(41.877784,11.790134),(41.872203,11.775871),(41.862282,11.763056),(41.823007,11.746106),(41.808228,11.736236),(41.792415,11.704455),(41.778669,11.628645),(41.74911,11.537953),(41.749834,11.483383),(41.775672,11.368429),(41.787971,11.259727),(41.785594,11.067388),(41.779289,11.024677),(41.761306,10.996203),(41.766523,10.989466),(41.773811,10.980054),(41.79872,10.970675),(41.916852,10.947059),(41.920262,10.941943),(41.922846,10.936026),(41.928841,10.931065),(41.937522,10.929825),(41.942793,10.933546),(41.947341,10.938532),(41.954162,10.941271),(42.0108,10.943597),(42.038395,10.950444),(42.069401,10.981501),(42.096272,10.990261),(42.151359,10.996203),(42.202726,10.98455),(42.221639,10.984344),(42.235179,10.987703),(42.270835,11.003516),(42.279414,11.004394),(42.297294,11.003774),(42.305872,11.004601),(42.338532,11.015504),(42.361166,11.011887),(42.376669,11.006668),(42.391758,11.005893),(42.413256,11.015944),(42.479712,11.059119),(42.569732,11.086146),(42.608145,11.089088),(42.615621,11.08966),(42.686521,11.073046),(42.710395,11.072116),(42.729619,11.06501),(42.754837,11.010544),(42.771787,10.996462),(42.794111,10.991604),(42.835452,10.987444),(42.860153,10.980416),(42.873279,10.978246),(42.888059,10.983568),(42.898084,10.995687),(42.908109,11.004187),(42.923715,10.998787),(42.911313,10.977367),(42.901185,10.936595),(42.893536,10.919671),(42.876793,10.905744),(42.834832,10.888406),(42.819432,10.872567),(42.811578,10.85262),(42.80765,10.83611),(42.801242,10.820788),(42.785636,10.804406),(42.749876,10.775829),(42.738094,10.759784),(42.728585,10.735496),(42.718973,10.694852),(42.711635,10.675163),(42.699646,10.65855),(42.680216,10.647672),(42.660269,10.641625),(42.647247,10.63222),(42.64859,10.611033),(42.668537,10.56623),(42.695202,10.524708),(42.750393,10.471636),(42.765792,10.451947),(42.776644,10.42461),(42.78946,10.333324),(42.808167,10.269116),(42.836279,10.208086),(42.862324,10.177158),(42.958235,10.115559),(42.981903,10.091633),(42.999887,10.061971),(43.012599,10.029286),(43.020764,9.996419),(43.039884,9.949988),(43.067686,9.922522),(43.104273,9.907923),(43.149852,9.899991),(43.187214,9.883326),(43.206334,9.851209),(43.235273,9.691787),(43.248812,9.652332),(43.270671,9.628354),(43.297698,9.621533),(43.305966,9.617554),(43.315578,9.607658),(43.325086,9.585902),(43.331753,9.575076),(43.341364,9.566394),(43.361518,9.553165),(43.370665,9.544225),(43.393351,9.49893),(43.399449,9.480947),(43.401981,9.447409),(43.406322,9.42865),(43.419034,9.413018),(43.471227,9.382012),(43.548225,9.336072),(43.566829,9.334315),(43.59122,9.343591),(43.60724,9.344625),(43.621502,9.336899),(43.698449,9.267162),(43.78759,9.186701),(43.914921,9.071489),(43.984788,9.008314),(44.023855,8.985525),(44.104057,8.959222),(44.192217,8.930283),(44.280377,8.901396),(44.368537,8.872457),(44.456697,8.843544),(44.544753,8.814605),(44.633017,8.785718),(44.721073,8.756779),(44.809233,8.72784),(44.89729,8.698928),(44.985553,8.67004),(45.073558,8.641153),(45.16177,8.612137),(45.249878,8.583276),(45.33809,8.554414),(45.426147,8.525476),(45.51441,8.496537),(45.514462,8.496537),(45.598436,8.468425),(45.682358,8.440313),(45.766384,8.412227),(45.850203,8.384115),(45.934126,8.356003),(46.018049,8.327891),(46.101919,8.299727),(46.185894,8.271641),(46.269816,8.243555),(46.353842,8.215469),(46.437713,8.187357),(46.521687,8.159245),(46.605713,8.131133),(46.689532,8.102969),(46.773558,8.074909),(46.857377,8.046745),(46.920526,8.025609),(46.97923,7.996567),(47.068114,7.996516),(47.210586,7.996516),(47.36608,7.996516),(47.52359,7.996516),(47.653918,7.996516),(47.836697,7.996516),(47.979169,7.996567),(47.930593,7.949697),(47.881811,7.902826),(47.833183,7.855956),(47.784659,7.809137),(47.736032,7.762215),(47.687507,7.715396),(47.638932,7.668525),(47.590252,7.621655),(47.541676,7.574836),(47.532388,7.565864),(47.493101,7.527914),(47.444525,7.481043),(47.395949,7.434173),(47.347373,7.387302),(47.298797,7.34038),(47.250118,7.293509),(47.201439,7.246691),(47.152863,7.19982),(47.104287,7.153001),(47.055608,7.106079),(47.007032,7.059208),(46.95856,7.012286),(46.909984,6.965467),(46.861408,6.918597),(46.812729,6.871675),(46.764101,6.824882),(46.715577,6.777985),(46.667001,6.731115),(46.618425,6.684244),(46.598065,6.664633),(46.55321,6.621457),(46.508406,6.578308),(46.488046,6.558645),(46.466963,6.538292),(46.423915,6.496736),(46.362937,6.43426),(46.302062,6.371731),(46.240981,6.309228),(46.179899,6.246726),(46.118818,6.184223),(46.057839,6.12172),(45.99681,6.059192),(45.935986,5.996689),(45.828706,5.879513),(45.721426,5.762337),(45.614146,5.645057),(45.518477,5.540564),(45.506865,5.527881),(45.399585,5.410704),(45.292356,5.293476),(45.185024,5.176248),(45.077744,5.059072),(45.0209,4.99688),(45.020642,4.99688),(44.941525,4.911484),(44.912586,4.899392),(44.858378,4.902544),(44.806546,4.905541),(44.754766,4.908565),(44.702883,4.911562),(44.651104,4.914507),(44.59922,4.917505),(44.596808,4.917643),(44.547441,4.920476),(44.495557,4.923473),(44.443726,4.926445),(44.391998,4.929468),(44.340115,4.932439),(44.288335,4.935488),(44.236452,4.938485),(44.184672,4.941431),(44.132789,4.94448),(44.081009,4.947451),(44.029126,4.950448),(43.968975,4.953962),(43.932284,4.945203),(43.845158,4.914352),(43.815186,4.907479),(43.716484,4.884793),(43.640519,4.867353),(43.528485,4.841566),(43.459342,4.808829),(43.346997,4.755654),(43.232792,4.701497),(43.119259,4.647702),(43.03544,4.578895),(42.960406,4.517374),(42.952551,4.507581),(42.945936,4.496858),(42.9325,4.463217),(42.914724,4.393299),(42.899634,4.361104),(42.870195,4.328171),(42.868938,4.326765),(42.831628,4.302322),(42.78977,4.285605),(42.718663,4.273487),(42.568285,4.247856),(42.415013,4.221707),(42.297294,4.201734),(42.221846,4.200959),(42.13534,4.200081),(42.102887,4.19189),(42.068367,4.174553),(42.011833,4.129491),(41.941243,4.086212),(41.923466,4.070554),(41.916645,4.051098),(41.917472,4.020453),(41.912201,4.007974),(41.898455,3.996915),(41.885019,3.977226),(41.835927,3.94945),(41.791381,3.958157),(41.747353,3.981412),(41.699811,3.996915),(41.657436,3.972704),(41.642967,3.969449),(41.628704,3.972084),(41.602246,3.983065),(41.586329,3.984151),(41.506231,3.964384),(41.479773,3.962938),(41.429543,3.948882),(41.317405,3.942422),(41.215293,3.936608),(41.162996,3.94268),(41.114524,3.962343),(41.070082,3.996915),(41.0059,4.086677),(40.979751,4.110758),(40.963628,4.12037),(40.915879,4.136648),(40.897689,4.145924),(40.887354,4.156052),(40.870611,4.186981),(40.846013,4.214989),(40.785758,4.25584),(40.763744,4.284933),(40.700699,4.243515),(40.6175,4.211605),(40.511873,4.171064),(40.382682,4.121377),(40.376998,4.116081),(40.371106,4.099932),(40.365732,4.094867),(40.286874,4.067453),(40.185588,4.032158),(40.182797,4.032003),(40.1798,4.03283),(40.176803,4.034535),(40.167191,4.035465),(40.166261,4.031486),(40.166984,4.025259),(40.162437,4.019394),(40.117168,3.996915),(40.020223,3.950122),(39.93413,3.908703),(39.848451,3.867284),(39.828297,3.842583),(39.80866,3.790287),(39.780755,3.71657),(39.764218,3.685745),(39.745098,3.660579),(39.666447,3.588723),(39.600818,3.528907),(39.574979,3.497901),(39.553172,3.431316),(39.536325,3.405013),(39.504389,3.403333),(39.488473,3.413901),(39.480928,3.42726),(39.475657,3.440799),(39.466976,3.452013),(39.436176,3.462374),(39.311326,3.466094),(39.320525,3.484543),(39.315874,3.494904),(39.302748,3.495679),(39.296338,3.49199),(39.257583,3.469686),(39.219445,3.468704),(39.180481,3.476998),(39.090441,3.518334),(39.077542,3.524256),(39.06793,3.526582),(39.010466,3.514464),(38.994963,3.514257),(38.979977,3.519812),(38.963234,3.522086),(38.921272,3.513999),(38.895227,3.513585),(38.82071,3.533739),(38.722008,3.560404),(38.703715,3.570429),(38.688108,3.586294),(38.66103,3.621951),(38.661443,3.615336),(38.6601,3.601306),(38.660306,3.594459),(38.601912,3.59867),(38.596641,3.602133),(38.595608,3.607507),(38.593747,3.61084),(38.579588,3.605311),(38.57411,3.604561),(38.561088,3.606008),(38.547135,3.609522),(38.543208,3.615388),(38.541244,3.623294),(38.533182,3.632828),(38.514269,3.648512),(38.508998,3.650812),(38.499386,3.64691),(38.497319,3.63859),(38.498146,3.629676),(38.496906,3.62394),(38.445953,3.601668),(38.389935,3.596888),(38.283068,3.608902),(38.176925,3.620917),(38.145609,3.618437),(38.114087,3.610608),(38.101891,3.612649),(38.078843,3.632673),(38.048974,3.641846),(38.036158,3.648926),(38.020759,3.667167),(37.995334,3.707914),(37.976731,3.72644),(37.945931,3.746232),(37.846196,3.810337),(37.751008,3.871522),(37.647758,3.937874),(37.556084,3.996889),(37.475056,4.048979),(37.360954,4.122204),(37.263492,4.184888),(37.166031,4.247545),(37.111874,4.282298),(37.105983,4.283848),(37.099988,4.283693),(37.094821,4.284882),(37.091617,4.290256),(37.086449,4.312477),(37.082522,4.322166),(37.075907,4.33108),(37.068466,4.333458),(37.048415,4.331959),(37.041077,4.336817),(37.025367,4.363275),(37.015652,4.370587),(36.974828,4.37994),(36.903721,4.415778),(36.844087,4.432237),(36.651333,4.430583),(36.648857,4.43118),(36.642962,4.432599),(36.628182,4.441461),(36.619501,4.443373),(36.463025,4.440169),(36.277196,4.436449),(36.264277,4.438206),(36.246087,4.446991),(36.236268,4.449652),(36.225726,4.4496),(36.19131,4.444924),(36.045325,4.443716),(36.041345,4.443683),(36.018401,4.449135),(35.99711,4.462959),(35.958352,4.496858),(35.940472,4.508046),(35.933755,4.52218),(35.934065,4.539207),(35.937062,4.559258),(35.936028,4.578533),(35.922799,4.602072),(35.920835,4.619332),(35.784513,4.764181),(35.760018,4.805728),(35.751647,4.854356),(35.755884,5.063439),(35.760949,5.076332),(35.799189,5.124624),(35.807354,5.144674),(35.807147,5.165267),(35.798259,5.189271),(35.778415,5.22715),(35.775315,5.24658),(35.782033,5.26986),(35.809111,5.309109),(35.80415,5.318023),(35.749373,5.339158),(35.683641,5.379595),(35.658319,5.386417),(35.639819,5.382076),(35.621939,5.373782),(35.598168,5.368743),(35.57388,5.375332),(35.530782,5.410084),(35.508044,5.423417),(35.490164,5.428042),(35.469287,5.430755),(35.448203,5.430755),(35.430219,5.427215),(35.408205,5.412565),(35.367484,5.368046),(35.344953,5.352362),(35.320769,5.348719),(35.302372,5.357374),(35.287489,5.374092),(35.254623,5.425923),(35.250695,5.435147),(35.251832,5.447369),(35.258964,5.458143),(35.267645,5.468556),(35.27364,5.479873),(35.269299,5.491785),(35.261961,5.511887),(35.22341,5.542996),(35.143312,5.58966),(35.098663,5.622474),(35.088225,5.64175),(35.079543,5.699782),(35.06528,5.726447),(34.984355,5.841014),(34.974433,5.863106),(34.972676,5.876257),(34.974537,5.887239),(34.977741,5.898659),(34.979911,5.912844),(34.97681,5.924032),(34.960377,5.941706),(34.955313,5.952558),(34.955726,5.964211),(34.95924,5.975502),(34.969782,5.996689),(34.967964,6.008131),(34.959447,6.061724),(34.951489,6.08118),(34.934436,6.102368),(34.915522,6.119705),(34.898882,6.13867),(34.879969,6.187634),(34.844725,6.248689),(34.839764,6.268688),(34.839041,6.327599),(34.832633,6.353541),(34.792739,6.421676),(34.784264,6.44183),(34.776099,6.499449),(34.753878,6.556423),(34.743543,6.596808),(34.733518,6.637606),(34.726593,6.641947),(34.714501,6.655667),(34.709643,6.674012),(34.703545,6.684916),(34.635539,6.729823),(34.618486,6.736541),(34.596679,6.739202),(34.553994,6.739254),(34.53632,6.743078),(34.524745,6.752871),(34.517924,6.793824),(34.516683,6.798062),(34.512136,6.808268),(34.511102,6.814314),(34.513273,6.815296),(34.522575,6.821781),(34.524745,6.824572),(34.523298,6.844183),(34.519061,6.861649),(34.512343,6.876842),(34.503661,6.89002),(34.439169,6.934875),(34.297575,6.968568),(34.294475,6.972237),(34.287653,6.975286),(34.280729,6.980092),(34.275665,6.997403),(34.270807,7.003398),(34.229879,7.03337),(34.219957,7.046134),(34.213756,7.051974),(34.206005,7.054506),(34.198253,7.064376),(34.195773,7.086959),(34.195773,7.09774),(34.195773,7.129023),(34.190915,7.149539),(34.181407,7.167212),(34.167764,7.175377),(34.151124,7.167471),(34.132417,7.163388),(34.113194,7.177548),(34.085909,7.211499),(34.04002,7.247259),(34.033612,7.250256),(34.031132,7.255372),(34.030615,7.3487),(34.02369,7.382445),(34.006534,7.409936),(33.882407,7.536079),(33.852538,7.553545),(33.842099,7.555922),(33.821429,7.558403),(33.811507,7.560987),(33.761071,7.598142),(33.729445,7.642119),(33.71606,7.657156),(33.706552,7.661859),(33.675029,7.670851),(33.647744,7.688627),(33.637202,7.691315),(33.572297,7.685217),(33.550851,7.691315),(33.540361,7.698911),(33.526511,7.717101),(33.516796,7.726093),(33.506823,7.73095),(33.488477,7.73617),(33.479537,7.743146),(33.462329,7.749502),(33.436491,7.748572),(33.393289,7.739735),(33.384401,7.735446),(33.359803,7.719272),(33.347142,7.718961),(33.29159,7.733069),(33.273503,7.749192),(33.257794,7.767434),(33.242394,7.780715),(33.233919,7.783195),(33.201467,7.788156),(33.172941,7.799628),(33.164518,7.801127),(33.132117,7.793944),(33.126949,7.791567),(33.120851,7.783299),(33.107519,7.785211),(33.085401,7.794978),(33.058323,7.797975),(33.051295,7.801127),(33.047677,7.807277),(33.044629,7.816423),(33.040753,7.824846),(33.023493,7.835078),(33.015018,7.850633),(32.9898,7.917244),(32.993572,7.928148),(33.006801,7.942462),(33.007569,7.944058),(33.012021,7.953314),(33.016775,7.958327),(33.021633,7.965251),(33.026077,7.986284),(33.031141,7.996309),(33.043853,8.013465),(33.100594,8.071033),(33.106589,8.08049),(33.111343,8.090644),(33.11341,8.099093),(33.117544,8.104158),(33.147516,8.109067),(33.164776,8.117051),(33.177282,8.127102),(33.185137,8.14108),(33.187824,8.160898),(33.184723,8.166247),(33.171081,8.175962),(33.16798,8.181362),(33.16829,8.195392),(33.169944,8.205495),(33.173975,8.21459),(33.181623,8.225726),(33.190511,8.232419),(33.199865,8.235519),(33.206893,8.240738),(33.208288,8.253683),(33.194852,8.259239),(33.185757,8.26451),(33.178419,8.275672),(33.171391,8.283113),(33.164363,8.292777),(33.161159,8.304585),(33.163123,8.312052),(33.171804,8.330888),(33.174078,8.343058),(33.172321,8.34652),(33.163329,8.352954),(33.161159,8.356106),(33.161882,8.361506),(33.166843,8.368276),(33.16798,8.372823),(33.167877,8.389722),(33.16953,8.397421),(33.174078,8.404475),(33.187824,8.411038),(33.202913,8.414113),(33.210355,8.420779),(33.207358,8.426593),(33.206427,8.430572),(33.23516,8.455635),(33.25273,8.458167),(33.361353,8.434293),(33.370862,8.437393),(33.384608,8.448013),(33.392101,8.451862),(33.400162,8.452638),(33.413133,8.449718),(33.480519,8.45765),(33.489924,8.462921),(33.490338,8.466513),(33.484757,8.474006),(33.505117,8.474884),(33.521964,8.465324),(33.537053,8.453206),(33.552143,8.446824),(33.57116,8.450131),(33.585371,8.458115),(33.600099,8.463955),(33.620407,8.460699),(33.651672,8.434499),(33.671309,8.400289),(33.695545,8.372875),(33.74102,8.367087),(33.751872,8.368793),(33.756213,8.370136),(33.797658,8.405612),(33.808096,8.412614),(33.824116,8.419487),(33.840859,8.423983),(33.875172,8.427936),(33.931706,8.428143),(33.95031,8.433207),(33.970774,8.445377),(34.069579,8.533615),(34.090249,8.556507),(34.103169,8.579322),(34.107251,8.601531),(34.11185,8.626555),(34.097473,8.915836),(34.083096,9.205117),(34.070698,9.454592),(34.066892,9.531176),(34.098208,9.67972),(34.221921,10.02603),(34.280832,10.080109),(34.303466,10.113544),(34.305017,10.124603),(34.301606,10.148994),(34.301813,10.160285),(34.304603,10.165634),(34.314215,10.175452),(34.317419,10.181266),(34.325894,10.223563),(34.32486,10.268651),(34.276181,10.488715),(34.271737,10.530082),(34.279489,10.565506),(34.365582,10.685783),(34.404235,10.759835),(34.420048,10.780816),(34.437308,10.795673),(34.557818,10.877787),(34.574768,10.884143),(34.587067,10.879285),(34.708093,10.774072),(34.737445,10.755391),(34.750674,10.743945),(34.756979,10.728804),(34.752948,10.698728),(34.754395,10.684129),(34.764834,10.680254),(34.772895,10.688263),(34.786228,10.718985),(34.798527,10.729656),(34.815373,10.73131),(34.827569,10.72777),(34.838524,10.72914),(34.85134,10.745753),(34.857334,10.763556),(34.857438,10.775674),(34.861572,10.787586),(34.879762,10.804613),(34.933816,10.845308),(34.950662,10.869183),(34.95831,10.903418),(34.952832,10.91843),(34.92317,10.939928),(34.913558,10.952976),(34.914282,10.963957),(34.980324,11.155263),(34.984148,11.186398),(34.971436,11.206888),(34.953969,11.226112),(34.944254,11.253242),(34.947148,11.274868),(35.073135,11.54896),(35.076856,11.568649),(35.074375,11.587356),(35.053498,11.628077),(35.046263,11.648644),(35.048124,11.68952),(35.040579,11.727399),(35.041199,11.747604),(35.048227,11.771376),(35.059079,11.79587),(35.072722,11.818866),(35.088018,11.838193),(35.126672,11.862946),(35.148556,11.871229),(35.215555,11.896588),(35.245734,11.929867),(35.247802,11.939634),(35.248379,11.957858),(35.248525,11.962475),(35.251419,11.971725),(35.260411,11.980407),(35.297824,12.001594),(35.317358,12.023712),(35.32604,12.047483),(35.335962,12.102312),(35.353738,12.14603),(35.361283,12.157347),(35.371102,12.165512),(35.392909,12.176726),(35.403348,12.185097),(35.412546,12.198636),(35.41544,12.211142),(35.418127,12.238996),(35.428772,12.266953),(35.616875,12.575151),(35.625866,12.585124),(35.634445,12.588587),(35.653772,12.590034),(35.662453,12.593651),(35.672375,12.604296),(35.675992,12.614528),(35.677439,12.625225),(35.684261,12.650753),(35.684054,12.656076),(35.687671,12.659228),(35.70137,12.665421),(35.702761,12.66605),(35.728392,12.67437),(36.029976,12.717158),(36.038451,12.717468),(36.050647,12.715452),(36.057261,12.712145),(36.063049,12.707908),(36.072144,12.70305),(36.099429,12.69566),(36.115035,12.70181),(36.123614,12.721447),(36.143251,12.832551),(36.143044,12.856942),(36.138703,12.871851),(36.115346,12.911719),(36.114415,12.933889),(36.125991,12.950968),(36.140874,12.96554),(36.149865,12.980242),(36.149555,12.988821),(36.146351,12.997373),(36.138393,13.013315),(36.136946,13.032436),(36.233581,13.36164),(36.382099,13.571033),(36.391298,13.599352),(36.394812,13.655938),(36.398429,13.67604),(36.439942,13.776176),(36.458167,13.820139),(36.455376,13.870007),(36.438013,13.919952),(36.432535,13.944499),(36.432122,13.969924),(36.436566,13.991214),(36.52638,14.263523),(36.545707,14.263162),(36.553045,14.282773),(36.565654,14.292927),(36.5825,14.296751),(36.603791,14.29732),(36.61764,14.300446),(36.648543,14.31458),(36.668593,14.317784),(36.713655,14.317784),(36.72213,14.320057),(36.738357,14.329798),(36.748072,14.332072),(36.816388,14.332072),(36.848531,14.327783),(36.913746,14.309024),(36.946923,14.304735),(36.952814,14.300963),(36.970901,14.27683),(36.978859,14.27112),(36.986714,14.266831),(36.995395,14.264092),(37.005627,14.263162),(37.011518,14.265074),(37.026091,14.27683),(37.034256,14.277502),(37.052446,14.275331),(37.060197,14.27683),(37.072703,14.285305),(37.083452,14.297733),(37.090997,14.314218),(37.093787,14.335173),(37.094407,14.35915),(37.097818,14.379511),(37.105879,14.399226),(37.121072,14.420826),(37.149701,14.441936),(37.184221,14.449558),(37.258221,14.448111),(37.280029,14.45545),(37.293775,14.457439),(37.318166,14.43713),(37.33708,14.426356),(37.374907,14.373026),(37.390203,14.358169),(37.394027,14.350081),(37.395474,14.335173),(37.394957,14.312383),(37.397748,14.301738),(37.412217,14.293599),(37.452628,14.260578),(37.456969,14.254609),(37.464307,14.235825),(37.469371,14.210813),(37.475366,14.199574),(37.488182,14.194897),(37.498517,14.193088),(37.508749,14.188127),(37.5165,14.180557),(37.519498,14.170997),(37.520634,14.145443),(37.525285,14.128829),(37.535724,14.11684),(37.553707,14.105497),(37.564973,14.116685),(37.601043,14.200917),(37.658507,14.335173),(37.721242,14.481753),(37.785631,14.632183),(37.85064,14.783879),(37.891464,14.879532),(37.908828,14.864727),(37.92092,14.847519),(37.94004,14.81088),(37.944381,14.80734),(37.954096,14.806255),(37.95761,14.802844),(37.958127,14.798762),(37.957817,14.788194),(37.958437,14.785093),(37.962261,14.777859),(37.964432,14.771193),(37.968772,14.766387),(37.980038,14.764552),(37.989856,14.757317),(37.992027,14.749514),(37.99275,14.740755),(37.998435,14.730911),(38.006703,14.7244),(38.115223,14.681017),(38.13331,14.677762)]
+Georgia	[(40.479834,43.508741),(40.519624,43.505175),(40.550837,43.511247),(40.615536,43.535845),(40.651916,43.538971),(40.681062,43.528068),(40.689966,43.523129),(40.740179,43.495279),(40.842706,43.469389),(40.874952,43.455643),(41.011791,43.375416),(41.042487,43.369834),(41.146666,43.37986),(41.180773,43.374692),(41.213122,43.362781),(41.243921,43.344203),(41.278751,43.333196),(41.350271,43.34335),(41.380657,43.334772),(41.389752,43.324876),(41.403808,43.301518),(41.41311,43.291286),(41.427579,43.283199),(41.479773,43.271236),(41.506128,43.25979),(41.550569,43.226277),(41.577544,43.215296),(41.614131,43.213022),(41.687408,43.220205),(41.723789,43.217234),(41.788901,43.203566),(41.82032,43.20124),(41.88998,43.207028),(41.919332,43.205943),(41.948271,43.200077),(41.97969,43.188657),(42.011316,43.181861),(42.043356,43.18057),(42.075292,43.185272),(42.154334,43.217498),(42.159834,43.21974),(42.185363,43.225476),(42.354551,43.236018),(42.36256,43.235194),(42.422867,43.22899),(42.479712,43.200904),(42.506067,43.181551),(42.534902,43.165067),(42.59588,43.140029),(42.615207,43.13698),(42.629366,43.14127),(42.656238,43.159796),(42.673602,43.165893),(42.704917,43.166436),(42.75153,43.176952),(42.79132,43.176177),(42.829768,43.168761),(42.857673,43.155455),(42.885785,43.135844),(42.914827,43.121943),(43.000093,43.098662),(43.000197,43.085356),(42.992548,43.068819),(42.989758,43.05267),(42.998853,43.042206),(43.048256,43.016962),(43.155588,42.942393),(43.175228,42.934471),(43.194345,42.926761),(43.386178,42.886882),(43.479599,42.867462),(43.517426,42.86046),(43.586259,42.835629),(43.603002,42.824803),(43.644343,42.788578),(43.662843,42.779845),(43.755964,42.763127),(43.782526,42.753213),(43.800613,42.746462),(43.811775,42.717265),(43.788727,42.69308),(43.753794,42.674657),(43.725682,42.6544),(43.722581,42.624867),(43.751107,42.598745),(43.796169,42.58983),(43.845003,42.58704),(43.885362,42.579211),(43.908161,42.566283),(43.920812,42.559109),(43.939726,42.55221),(43.958433,42.554406),(43.973212,42.563992),(43.998017,42.589365),(44.011504,42.600321),(44.055068,42.615307),(44.150824,42.618666),(44.185803,42.626508),(44.197384,42.629105),(44.211351,42.639634),(44.230147,42.653806),(44.248648,42.681995),(44.272005,42.702382),(44.360682,42.703751),(44.401403,42.713518),(44.479228,42.744291),(44.508115,42.750286),(44.558293,42.753102),(44.600977,42.749123),(44.638759,42.740149),(44.642422,42.739279),(44.679422,42.723672),(44.695029,42.714216),(44.724484,42.691039),(44.73637,42.677551),(44.761071,42.619234),(44.773473,42.609648),(44.78231,42.61665),(44.798485,42.671738),(44.827424,42.717962),(44.833676,42.734085),(44.85936,42.75951),(44.902974,42.753076),(45.012115,42.695302),(45.029788,42.688765),(45.048082,42.685897),(45.066995,42.688455),(45.076018,42.691412),(45.103892,42.700547),(45.122961,42.702278),(45.155362,42.693261),(45.184198,42.674838),(45.282693,42.586394),(45.293648,42.572906),(45.301571,42.559842),(45.312562,42.54172),(45.32269,42.530118),(45.35597,42.519964),(45.398551,42.524382),(45.47927,42.54234),(45.536838,42.541358),(45.620657,42.530377),(45.698688,42.507587),(45.739616,42.471466),(45.739506,42.470647),(45.736412,42.447539),(45.62138,42.224478),(45.631405,42.201172),(45.661585,42.186703),(45.701789,42.17275),(45.811601,42.115492),(45.881364,42.102031),(45.895162,42.091876),(45.923481,42.039631),(45.934126,42.028495),(45.947562,42.022914),(45.966372,42.022061),(45.973503,42.024154),(45.986733,42.031906),(45.995156,42.033456),(46.001615,42.030976),(46.018359,42.020046),(46.02673,42.01679),(46.044817,42.017721),(46.05846,42.02033),(46.068278,42.015318),(46.074996,41.993484),(46.099181,41.985061),(46.129876,41.984493),(46.188581,41.993536),(46.188891,41.993639),(46.189201,41.993769),(46.197676,41.9955),(46.206151,41.996094),(46.214574,41.9955),(46.224341,41.993484),(46.250489,41.977723),(46.294156,41.93863),(46.322629,41.929018),(46.382057,41.925246),(46.406552,41.91504),(46.430892,41.890442),(46.392754,41.831685),(46.371309,41.805692),(46.328314,41.766418),(46.313741,41.756651),(46.297773,41.750812),(46.276947,41.749313),(46.230129,41.757323),(46.208321,41.755514),(46.188994,41.740141),(46.179537,41.705879),(46.180002,41.655159),(46.192767,41.610174),(46.21969,41.593302),(46.228475,41.598728),(46.233436,41.607952),(46.24005,41.615497),(46.2539,41.615911),(46.256174,41.610329),(46.278394,41.578393),(46.279871,41.571172),(46.287851,41.532143),(46.29674,41.510387),(46.313948,41.493747),(46.366244,41.466566),(46.377923,41.462483),(46.398284,41.458711),(46.445103,41.425948),(46.542461,41.394994),(46.591554,41.372928),(46.607367,41.345023),(46.62287,41.349622),(46.629841,41.346136),(46.631034,41.345539),(46.637752,41.336961),(46.657079,41.320631),(46.688499,41.284355),(46.694803,41.269782),(46.691703,41.268542),(46.683434,41.269472),(46.674649,41.261669),(46.672686,41.253969),(46.6716,41.236451),(46.669482,41.229888),(46.663591,41.223531),(46.650361,41.214178),(46.64447,41.207977),(46.634755,41.181053),(46.629484,41.14674),(46.621113,41.114597),(46.615539,41.108666),(46.601786,41.09403),(46.582148,41.091653),(46.563132,41.095581),(46.543546,41.097027),(46.522411,41.087002),(46.511145,41.070983),(46.505564,41.055273),(46.496779,41.044834),(46.47492,41.044111),(46.456988,41.052431),(46.429031,41.080956),(46.41265,41.09186),(46.353119,41.106536),(46.332345,41.115889),(46.273433,41.1563),(46.244391,41.183741),(46.228578,41.195419),(46.210595,41.200174),(46.135406,41.199915),(46.113133,41.19604),(46.087608,41.183659),(46.061353,41.170925),(46.041613,41.165447),(46.017428,41.163793),(45.969163,41.168289),(45.820748,41.208804),(45.770337,41.232102),(45.751088,41.240998),(45.709747,41.267715),(45.685872,41.29624),(45.708093,41.317117),(45.731038,41.323267),(45.7453,41.329158),(45.74406,41.335359),(45.720702,41.342387),(45.65559,41.352361),(45.511826,41.39458),(45.47927,41.41768),(45.464801,41.430185),(45.450021,41.432201),(45.416948,41.424604),(45.396794,41.423261),(45.38124,41.425586),(45.333096,41.444352),(45.314422,41.451631),(45.281711,41.452923),(45.24962,41.4445),(45.097834,41.349919),(45.0024,41.290452),(44.989998,41.284458),(44.967363,41.269007),(44.955168,41.262702),(44.917237,41.261772),(44.820706,41.273347),(44.801275,41.258516),(44.809543,41.244409),(44.847061,41.230766),(44.85382,41.223514),(44.857706,41.219346),(44.847784,41.208907),(44.821532,41.20622),(44.674926,41.208494),(44.63312,41.221051),(44.612863,41.223118),(44.591366,41.21578),(44.578446,41.202809),(44.566251,41.186944),(44.551523,41.177023),(44.531008,41.181467),(44.52553,41.189063),(44.521912,41.199295),(44.516641,41.20684),(44.505893,41.206582),(44.499382,41.202809),(44.479228,41.185808),(44.45494,41.180485),(44.432461,41.181673),(44.410601,41.18772),(44.357271,41.212163),(44.344921,41.213248),(44.333087,41.210354),(44.324922,41.204825),(44.317739,41.198572),(44.308489,41.193817),(44.284976,41.190872),(44.266476,41.196195),(44.218107,41.221568),(44.190977,41.230043),(44.180331,41.229939),(44.168446,41.223583),(44.165862,41.216142),(44.16519,41.207667),(44.160074,41.1979),(44.144364,41.186066),(44.124727,41.178056),(44.103643,41.175162),(44.061269,41.184154),(44.041322,41.182552),(44.001117,41.168858),(43.978186,41.164617),(43.977755,41.164537),(43.955849,41.160486),(43.863245,41.158988),(43.820353,41.1455),(43.773741,41.114494),(43.754156,41.108241),(43.729713,41.106691),(43.566622,41.124054),(43.524144,41.122814),(43.470142,41.106174),(43.460324,41.104521),(43.450453,41.104676),(43.440428,41.106588),(43.451797,41.132581),(43.437586,41.156197),(43.410559,41.175162),(43.383274,41.187203),(43.351751,41.193611),(43.322606,41.19206),(43.230622,41.17263),(43.216204,41.180537),(43.192226,41.224978),(43.172021,41.242342),(43.152332,41.24415),(43.130318,41.24229),(43.103136,41.248801),(43.157241,41.26973),(43.171866,41.279342),(43.185353,41.293811),(43.18401,41.298979),(43.154761,41.301873),(43.12391,41.312932),(43.075644,41.344868),(43.002057,41.382695),(42.987588,41.394684),(42.957719,41.437007),(42.949967,41.443673),(42.941079,41.446308),(42.936221,41.450236),(42.93219,41.454783),(42.926093,41.459073),(42.896637,41.466566),(42.888989,41.469976),(42.880721,41.481242),(42.87514,41.493696),(42.868008,41.500207),(42.854572,41.493799),(42.829974,41.472508),(42.811164,41.477159),(42.792147,41.492869),(42.766516,41.504341),(42.774887,41.514263),(42.794628,41.52682),(42.802689,41.534107),(42.806823,41.542995),(42.80889,41.552917),(42.812198,41.562994),(42.819949,41.572347),(42.800932,41.57922),(42.660992,41.588264),(42.610556,41.58506),(42.590914,41.580169),(42.586648,41.579107),(42.585235,41.578755),(42.565184,41.567128),(42.554952,41.550333),(42.545547,41.509612),(42.535522,41.493489),(42.513818,41.476229),(42.483846,41.442174),(42.463072,41.431839),(42.451033,41.43137),(42.437854,41.430857),(42.262464,41.482327),(42.213268,41.480208),(42.18929,41.481707),(42.17265,41.493489),(42.158387,41.499897),(42.143195,41.500259),(42.111775,41.493489),(42.097513,41.498347),(42.083457,41.500104),(42.069401,41.498605),(42.054931,41.493489),(42.019585,41.485066),(41.947961,41.505581),(41.907757,41.493489),(41.894011,41.485531),(41.862695,41.451786),(41.822594,41.426),(41.812982,41.421814),(41.800787,41.42569),(41.760996,41.453543),(41.747767,41.45685),(41.718518,41.459589),(41.706839,41.463155),(41.702601,41.46946),(41.702808,41.477624),(41.703945,41.485117),(41.702601,41.489045),(41.694953,41.489097),(41.669839,41.480467),(41.63997,41.47871),(41.627257,41.480518),(41.520763,41.514228),(41.586274,41.602729),(41.615733,41.632636),(41.676036,41.662177),(41.692882,41.692288),(41.739757,41.749905),(41.742361,41.761664),(41.742442,41.770697),(41.743907,41.778632),(41.750011,41.787502),(41.766287,41.804185),(41.771821,41.812567),(41.773936,41.821601),(41.773936,41.90261),(41.773936,41.902615),(41.773936,41.906928),(41.761974,41.969875),(41.760265,41.99258),(41.755707,42.006415),(41.715261,42.059353),(41.684906,42.098944),(41.674327,42.105536),(41.664073,42.113959),(41.65919,42.133002),(41.657237,42.16706),(41.649181,42.212226),(41.596202,42.349433),(41.592296,42.355414),(41.585216,42.36286),(41.55836,42.382799),(41.554861,42.389838),(41.551199,42.40644),(41.551195,42.406457),(41.500173,42.64057),(41.482758,42.680243),(41.457367,42.71369),(41.424327,42.739895),(41.383474,42.75727),(41.307302,42.767646),(41.291026,42.774359),(41.274913,42.785305),(41.250743,42.795233),(41.225352,42.802314),(41.205333,42.804429),(41.193696,42.801907),(41.173595,42.792792),(41.160899,42.790839),(41.150238,42.79564),(41.104747,42.846584),(41.081798,42.908149),(41.040294,42.96133),(41.023123,42.989976),(40.998383,42.989447),(40.958995,42.976386),(40.933767,42.982733),(40.903982,43.016343),(40.886567,43.024156),(40.886241,43.029283),(40.862804,43.058987),(40.855968,43.063056),(40.783051,43.084174),(40.682872,43.094306),(40.636241,43.092475),(40.604015,43.086493),(40.591807,43.085639),(40.579926,43.088813),(40.56072,43.102973),(40.550548,43.106106),(40.546072,43.108832),(40.528982,43.12226),(40.520193,43.127265),(40.510265,43.12995),(40.478526,43.134019),(40.398285,43.16234),(40.361176,43.165473),(40.335134,43.140855),(40.325043,43.14883),(40.310313,43.175727),(40.301036,43.188666),(40.278331,43.205512),(40.268403,43.216376),(40.272797,43.247992),(40.257172,43.277411),(40.235199,43.304429),(40.219086,43.319037),(40.188243,43.329576),(40.133474,43.34162),(40.101329,43.36518),(40.086925,43.370307),(40.040782,43.3758),(40.009776,43.385159),(39.986013,43.388983),(39.985976,43.38899),(39.991285,43.406318),(40.059187,43.535199),(40.07283,43.551064),(40.096705,43.562639),(40.164297,43.575843),(40.23313,43.575765),(40.479834,43.508741)]
+Ghana	[(-0.166109,11.13498),(-0.158668,11.118444),(-0.14208,11.103329),(-0.121745,11.092192),(-0.103348,11.087541),(-0.085029,11.089402),(-0.051077,11.098264),(-0.032267,11.098574),(0.001116,11.085991),(0.016205,11.062582),(0.019409,11.031628),(0.016567,10.996203),(0.01419,10.983672),(0.007188,10.976799),(-0.001571,10.971295),(-0.009581,10.963001),(-0.014439,10.953596),(-0.036091,10.853137),(-0.035316,10.843448),(-0.0302,10.823785),(-0.032061,10.813165),(-0.04069,10.805026),(-0.061103,10.791358),(-0.07521,10.773659),(-0.082807,10.756218),(-0.088129,10.714412),(-0.091564,10.700254),(-0.09769,10.675008),(-0.098336,10.654157),(-0.088129,10.633486),(-0.079344,10.626252),(-0.068363,10.621058),(-0.056452,10.618009),(-0.033352,10.615064),(-0.026221,10.610361),(-0.019968,10.604341),(-0.010925,10.598269),(0.020339,10.588037),(0.029434,10.582533),(0.037341,10.57318),(0.04902,10.550959),(0.057262,10.541115),(0.110179,10.508249),(0.126018,10.491609),(0.176971,10.397687),(0.179865,10.394173),(0.187513,10.394948),(0.19175,10.400839),(0.194437,10.407376),(0.197073,10.41027),(0.223609,10.399961),(0.23322,10.398617),(0.244563,10.401537),(0.253943,10.406084),(0.263012,10.408926),(0.273244,10.406601),(0.283114,10.396808),(0.283553,10.385775),(0.28022,10.375182),(0.278825,10.366629),(0.290039,10.348491),(0.307066,10.333272),(0.317582,10.31733),(0.308797,10.297099),(0.32275,10.297254),(0.366597,10.304488),(0.376183,10.299941),(0.396596,10.283224),(0.372049,10.265137),(0.367295,10.249815),(0.364427,10.233407),(0.357192,10.219997),(0.358846,10.18633),(0.353601,10.115508),(0.363393,10.089669),(0.37608,10.081582),(0.387087,10.078947),(0.395149,10.072358),(0.398146,10.052127),(0.39457,10.035557),(0.393908,10.03249),(0.382746,10.029596),(0.367295,10.032128),(0.349777,10.02882),(0.355719,10.018976),(0.355125,10.01262),(0.35174,10.006419),(0.349777,9.997169),(0.35143,9.990451),(0.363393,9.966783),(0.370189,9.947017),(0.369569,9.938826),(0.362592,9.932676),(0.349777,9.918956),(0.341715,9.903789),(0.339674,9.889837),(0.344196,9.849762),(0.343886,9.838393),(0.32244,9.760671),(0.323887,9.742068),(0.329132,9.731293),(0.336289,9.72349),(0.342955,9.713543),(0.347606,9.698841),(0.34988,9.680651),(0.347089,9.663158),(0.336651,9.650833),(0.318719,9.648611),(0.301924,9.657835),(0.275285,9.685586),(0.260971,9.657164),(0.261694,9.627941),(0.277636,9.606986),(0.308797,9.603678),(0.349363,9.61391),(0.369155,9.610138),(0.377734,9.589416),(0.370809,9.575644),(0.354608,9.571096),(0.33616,9.574197),(0.32244,9.583137),(0.30456,9.571562),(0.28053,9.570166),(0.230197,9.575747),(0.227743,9.569339),(0.223066,9.541176),(0.223402,9.534794),(0.225908,9.531926),(0.23322,9.525595),(0.243116,9.518697),(0.253503,9.514252),(0.279006,9.519007),(0.293139,9.518283),(0.301924,9.507457),(0.2981,9.497096),(0.28531,9.488363),(0.26973,9.482342),(0.228053,9.473971),(0.227949,9.459734),(0.234977,9.443766),(0.226813,9.432345),(0.23136,9.418961),(0.249886,9.416946),(0.26849,9.420641),(0.314223,9.436479),(0.32182,9.442836),(0.325747,9.451336),(0.328796,9.471568),(0.333783,9.479474),(0.34895,9.486037),(0.371429,9.490016),(0.411659,9.492238),(0.430444,9.489189),(0.483515,9.470017),(0.489923,9.461129),(0.49168,9.451285),(0.489406,9.441027),(0.482792,9.429839),(0.482585,9.428857),(0.482792,9.427875),(0.483515,9.426842),(0.513281,9.416791),(0.531368,9.401107),(0.537569,9.377646),(0.528267,9.326951),(0.526613,9.297651),(0.522479,9.285067),(0.512351,9.274706),(0.501085,9.268195),(0.49292,9.258609),(0.49199,9.238895),(0.504393,9.203109),(0.504703,9.187166),(0.49261,9.166754),(0.469976,9.14673),(0.463646,9.137092),(0.463749,9.12146),(0.458478,9.08924),(0.441554,9.058182),(0.43127,9.02759),(0.44468,8.996558),(0.444887,8.996558),(0.444887,8.996455),(0.493127,8.915219),(0.505633,8.866333),(0.483629,8.834973),(0.483515,8.834811),(0.478451,8.822331),(0.477004,8.80675),(0.47349,8.793547),(0.462483,8.788302),(0.449512,8.790369),(0.439409,8.793444),(0.430134,8.794736),(0.419592,8.791247),(0.424966,8.78732),(0.4183,8.770603),(0.407809,8.759053),(0.397112,8.781532),(0.385278,8.78608),(0.372669,8.783754),(0.365874,8.774272),(0.368084,8.761481),(0.374426,8.724766),(0.403727,8.662082),(0.443518,8.606866),(0.483515,8.579787),(0.500568,8.560176),(0.524753,8.538033),(0.550798,8.519326),(0.616324,8.488759),(0.63379,8.452018),(0.646709,8.414165),(0.685053,8.382564),(0.687224,8.372203),(0.686914,8.360731),(0.689394,8.346055),(0.688567,8.33603),(0.689187,8.331301),(0.693115,8.327891),(0.705104,8.325979),(0.708825,8.322568),(0.712752,8.29797),(0.705207,8.282751),(0.689187,8.272855),(0.645056,8.253425),(0.628313,8.24247),(0.595033,8.21273),(0.586661,8.208751),(0.579013,8.207821),(0.573846,8.203945),(0.572709,8.191),(0.576843,8.180484),(0.584594,8.173068),(0.591519,8.16449),(0.593276,8.150666),(0.587798,8.137721),(0.579943,8.131701),(0.574983,8.124621),(0.580254,8.100075),(0.583974,8.05305),(0.593173,8.015739),(0.593689,7.996567),(0.592863,7.959309),(0.602688,7.893132),(0.603405,7.888305),(0.602578,7.828412),(0.611673,7.771258),(0.609502,7.718961),(0.612293,7.699428),(0.583354,7.704285),(0.570538,7.683925),(0.567438,7.652919),(0.567748,7.625737),(0.562063,7.612301),(0.548524,7.605377),(0.532505,7.601036),(0.519379,7.595196),(0.50925,7.585378),(0.503049,7.574681),(0.499432,7.562382),(0.495608,7.504298),(0.500568,7.45505),(0.516692,7.411022),(0.548214,7.383271),(0.566404,7.380791),(0.586248,7.384357),(0.623042,7.397896),(0.629656,7.389162),(0.645676,7.323585),(0.644436,7.301933),(0.631103,7.265242),(0.621801,7.218837),(0.59772,7.158892),(0.59431,7.119722),(0.598754,7.074711),(0.59803,7.0312),(0.57891,6.996783),(0.565991,6.989652),(0.523823,6.978697),(0.509147,6.977611),(0.494574,6.973116),(0.506046,6.957819),(0.534468,6.935909),(0.54625,6.914773),(0.543873,6.897926),(0.522789,6.862838),(0.516071,6.841806),(0.519275,6.832246),(0.528887,6.826535),(0.541083,6.817182),(0.570022,6.763516),(0.576636,6.754731),(0.593793,6.751114),(0.611259,6.741528),(0.625832,6.727756),(0.634307,6.711607),(0.635341,6.695381),(0.626659,6.644893),(0.63224,6.62399),(0.645366,6.612026),(0.659422,6.601717),(0.668207,6.585827),(0.677612,6.584896),(0.705517,6.585775),(0.714612,6.583914),(0.727428,6.571435),(0.726808,6.562107),(0.71978,6.552728),(0.713475,6.53999),(0.713076,6.533936),(0.711718,6.513376),(0.71792,6.48883),(0.729908,6.465085),(0.745721,6.4409),(0.766805,6.419351),(0.816208,6.395063),(0.841323,6.379224),(0.873879,6.340131),(0.886798,6.33039),(0.907262,6.324912),(0.983536,6.324602),(1.009685,6.244452),(1.025188,6.222334),(1.033146,6.216547),(1.040587,6.213472),(1.048132,6.20939),(1.05578,6.20063),(1.068906,6.180347),(1.079655,6.167919),(1.093401,6.160917),(1.176186,6.151512),(1.187968,6.135647),(1.185396,6.100491),(1.185395,6.100491),(1.184825,6.100328),(1.178396,6.097968),(1.133067,6.073635),(1.098806,6.047024),(1.048025,5.992662),(1.036388,5.975165),(1.011729,5.926256),(1.007091,5.906684),(1.005626,5.886054),(0.995291,5.839342),(0.986583,5.820746),(0.954845,5.791083),(0.914399,5.777086),(0.723481,5.755439),(0.364919,5.78148),(0.321951,5.779202),(0.298106,5.773668),(0.285981,5.768866),(0.280935,5.763007),(0.27589,5.760159),(0.25172,5.759101),(0.243337,5.756171),(0.224376,5.742621),(0.1574,5.724555),(0.1421,5.71426),(0.114594,5.688666),(0.075694,5.677558),(0.061697,5.662828),(0.050629,5.644761),(0.034516,5.628363),(-0.045033,5.60163),(-0.049672,5.598863),(-0.062734,5.585842),(-0.068593,5.581204),(-0.077382,5.57807),(-0.093251,5.576646),(-0.307851,5.507392),(-0.353098,5.501695),(-0.359283,5.498684),(-0.371571,5.492743),(-0.445058,5.431383),(-0.45287,5.420111),(-0.458119,5.404731),(-0.471588,5.390815),(-0.507436,5.368842),(-0.577382,5.35163),(-0.589345,5.351508),(-0.596669,5.344306),(-0.612864,5.332017),(-0.629465,5.326728),(-0.637766,5.340888),(-0.689524,5.304755),(-0.702301,5.299994),(-0.760732,5.252183),(-0.784495,5.22427),(-0.79955,5.21483),(-0.873891,5.204006),(-0.89684,5.205024),(-0.911488,5.218004),(-0.918284,5.209418),(-0.927724,5.206122),(-0.952463,5.204413),(-0.976552,5.19831),(-0.988393,5.198798),(-0.993479,5.20775),(-0.99706,5.216783),(-1.005035,5.214545),(-1.017323,5.204413),(-1.033803,5.202948),(-1.049794,5.198676),(-1.154124,5.153876),(-1.164703,5.139228),(-1.173655,5.130561),(-1.194081,5.118598),(-1.233632,5.100735),(-1.25414,5.096503),(-1.319244,5.09455),(-1.329986,5.091539),(-1.353139,5.077786),(-1.364003,5.073432),(-1.374135,5.072659),(-1.394765,5.07392),(-1.404937,5.073432),(-1.423451,5.06745),(-1.459706,5.04975),(-1.529286,5.039862),(-1.551869,5.031399),(-1.568796,5.019273),(-1.569488,5.018785),(-1.583852,5.025377),(-1.601471,5.026679),(-1.618479,5.022447),(-1.630849,5.012641),(-1.632436,5.004543),(-1.625478,4.989488),(-1.627756,4.981594),(-1.634023,4.974433),(-1.638173,4.970689),(-1.706654,4.936916),(-1.718821,4.92768),(-1.74767,4.895901),(-1.749908,4.888577),(-1.748118,4.881903),(-1.748606,4.877183),(-1.757436,4.875434),(-1.766754,4.874701),(-1.835439,4.855129),(-1.912099,4.820868),(-1.92809,4.806789),(-1.95226,4.772447),(-1.967275,4.758124),(-1.981435,4.752427),(-2.050364,4.743638),(-2.063832,4.738186),(-2.090566,4.737128),(-2.096588,4.738471),(-2.103871,4.745063),(-2.106679,4.755357),(-2.105621,4.766547),(-2.107981,4.77558),(-2.120961,4.779202),(-2.129018,4.780341),(-2.144154,4.78498),(-2.155385,4.786078),(-2.154368,4.790676),(-2.163726,4.800523),(-2.206288,4.834459),(-2.227406,4.843411),(-2.23705,4.849189),(-2.241119,4.858059),(-2.242828,4.865383),(-2.247222,4.873033),(-2.252756,4.879136),(-2.356597,4.919623),(-2.525787,4.954413),(-2.690419,5.010199),(-2.820872,5.020087),(-2.964996,5.045315),(-3.103749,5.087714),(-3.119601,5.091331),(-3.115281,5.107821),(-3.108306,5.109605),(-3.098988,5.113227),(-3.087636,5.114976),(-3.016103,5.114447),(-2.994496,5.10814),(-2.988515,5.10224),(-2.976308,5.084621),(-2.970937,5.080878),(-2.957753,5.082668),(-2.937245,5.091295),(-2.92634,5.09455),(-2.929026,5.122016),(-2.901235,5.133612),(-2.865305,5.139309),(-2.843699,5.149115),(-2.843658,5.149115),(-2.803855,5.147568),(-2.780885,5.150875),(-2.766622,5.16103),(-2.75701,5.179866),(-2.762488,5.1863),(-2.775666,5.197539),(-2.778818,5.201001),(-2.779645,5.210122),(-2.775407,5.231025),(-2.774891,5.239578),(-2.779335,5.251076),(-2.793287,5.271101),(-2.79613,5.284976),(-2.789567,5.346858),(-2.755874,5.340709),(-2.742593,5.343138),(-2.732671,5.355721),(-2.730139,5.373162),(-2.734428,5.391145),(-2.761713,5.454914),(-2.779438,5.526485),(-2.781815,5.578885),(-2.785588,5.595034),(-2.793442,5.608134),(-2.806258,5.618495),(-2.877494,5.636815),(-2.893746,5.630355),(-2.926302,5.610718),(-2.945862,5.608289),(-2.969504,5.621441),(-2.974904,5.647279),(-2.964801,5.709782),(-3.029759,5.704252),(-3.019966,5.818354),(-3.022524,5.854502),(-3.03472,5.890701),(-3.073244,5.960955),(-3.087765,5.996689),(-3.118074,6.163475),(-3.139364,6.219286),(-3.168794,6.246054),(-3.171722,6.249585),(-3.183599,6.263908),(-3.262509,6.617142),(-3.261114,6.633937),(-3.253905,6.644428),(-3.235483,6.654582),(-3.230057,6.661119),(-3.210419,6.715999),(-3.212745,6.722666),(-3.226232,6.748581),(-3.238738,6.764627),(-3.243079,6.774756),(-3.241684,6.810903),(-3.224941,6.849402),(-3.109599,7.046393),(-3.097274,7.054053),(-3.096593,7.054477),(-3.095465,7.055178),(-3.045933,7.071249),(-3.040869,7.078329),(-3.032601,7.128352),(-3.027537,7.138428),(-2.9817,7.195531),(-2.972811,7.214961),(-2.972088,7.228604),(-2.976532,7.236717),(-2.983224,7.244985),(-2.989529,7.258938),(-2.990459,7.270668),(-2.941521,7.577161),(-2.928163,7.617676),(-2.855945,7.771568),(-2.852069,7.778131),(-2.842018,7.790275),(-2.838168,7.796838),(-2.83791,7.802264),(-2.84083,7.815235),(-2.840003,7.820247),(-2.831399,7.82836),(-2.809152,7.841693),(-2.801194,7.85022),(-2.797887,7.861278),(-2.793546,7.935951),(-2.790626,7.943289),(-2.784347,7.944012),(-2.777681,7.93962),(-2.772617,7.933935),(-2.771221,7.930732),(-2.754892,7.944374),(-2.709261,7.996722),(-2.690865,8.009745),(-2.631178,8.029589),(-2.610559,8.040001),(-2.600689,8.052946),(-2.599759,8.070387),(-2.606219,8.094313),(-2.619448,8.123097),(-2.621877,8.135732),(-2.617639,8.151493),(-2.610663,8.164852),(-2.604255,8.170794),(-2.595987,8.170278),(-2.583274,8.164335),(-2.57175,8.16312),(-2.558108,8.167694),(-2.513201,8.194023),(-2.506328,8.209267),(-2.552346,8.489367),(-2.598364,8.769466),(-2.603118,8.78515),(-2.612161,8.780964),(-2.612382,8.781321),(-2.617226,8.78918),(-2.614642,8.801919),(-2.607252,8.808559),(-2.596658,8.814398),(-2.595573,8.828067),(-2.615934,8.89783),(-2.617174,8.915013),(-2.619448,8.923617),(-2.625029,8.925994),(-2.631747,8.926976),(-2.63769,8.931471),(-2.653296,8.978394),(-2.654329,8.998832),(-2.660789,9.014903),(-2.686059,9.028261),(-2.711328,9.033894),(-2.73696,9.035134),(-2.750809,9.037408),(-2.758664,9.04286),(-2.765072,9.049475),(-2.774839,9.054978),(-2.765434,9.069112),(-2.7613,9.084795),(-2.759388,9.134818),(-2.755202,9.143138),(-2.733911,9.164842),(-2.716496,9.200266),(-2.704817,9.218405),(-2.673088,9.23489),(-2.661151,9.253907),(-2.659807,9.272898),(-2.675517,9.281502),(-2.692983,9.285326),(-2.707143,9.295635),(-2.714998,9.311061),(-2.713344,9.329923),(-2.70306,9.343255),(-2.689418,9.349534),(-2.677532,9.357001),(-2.672416,9.374028),(-2.672416,9.401004),(-2.677377,9.417773),(-2.678669,9.42555),(-2.674587,9.457486),(-2.675672,9.471723),(-2.689211,9.488724),(-2.725281,9.533864),(-2.761093,9.566239),(-2.766261,9.576523),(-2.768018,9.592801),(-2.766467,9.608898),(-2.761506,9.625253),(-2.752928,9.639904),(-2.740164,9.650833),(-2.743404,9.653325),(-2.751016,9.659179),(-2.75422,9.668352),(-2.75546,9.677498),(-2.760524,9.685586),(-2.769258,9.689926),(-2.774839,9.689306),(-2.780317,9.690237),(-2.788481,9.699254),(-2.795303,9.720002),(-2.791582,9.740931),(-2.774839,9.77434),(-2.740267,9.812606),(-2.733911,9.822787),(-2.736753,9.832579),(-2.760524,9.870536),(-2.764865,9.895754),(-2.755564,9.941151),(-2.754375,9.966783),(-2.760886,9.984766),(-2.783572,10.018511),(-2.788481,10.038768),(-2.788481,10.124448),(-2.79892,10.169613),(-2.798455,10.189534),(-2.785381,10.210101),(-2.765124,10.225837),(-2.757682,10.234648),(-2.754375,10.247954),(-2.754943,10.260796),(-2.758354,10.266119),(-2.764865,10.269116),(-2.774839,10.27524),(-2.784451,10.278805),(-2.793184,10.278547),(-2.799669,10.280924),(-2.802098,10.292319),(-2.80569,10.299011),(-2.814216,10.301078),(-2.824448,10.302215),(-2.833182,10.305987),(-2.841295,10.322291),(-2.841295,10.343272),(-2.836282,10.363658),(-2.829461,10.378282),(-2.822329,10.387584),(-2.81463,10.393708),(-2.80494,10.397118),(-2.791995,10.398152),(-2.78104,10.402415),(-2.771893,10.41182),(-2.767552,10.4212),(-2.771428,10.425489),(-2.795871,10.426109),(-2.812149,10.428822),(-2.824448,10.435023),(-2.859562,10.465616),(-2.867391,10.47825),(-2.87044,10.497784),(-2.873386,10.502487),(-2.886899,10.515793),(-2.891524,10.521659),(-2.894211,10.531425),(-2.895865,10.552768),(-2.898294,10.562612),(-2.928266,10.615219),(-2.932504,10.634313),(-2.929661,10.644209),(-2.916251,10.668084),(-2.910154,10.684491),(-2.907337,10.688315),(-2.905115,10.692733),(-2.905141,10.699193),(-2.908035,10.703637),(-2.912634,10.705808),(-2.916949,10.706609),(-2.918913,10.706609),(-2.919959,10.711088),(-2.922323,10.721207),(-2.919274,10.727202),(-2.908577,10.737666),(-2.9031,10.747149),(-2.899482,10.76999),(-2.882662,10.797068),(-2.871629,10.843448),(-2.864239,10.864273),(-2.850803,10.879544),(-2.834861,10.89161),(-2.821399,10.90626),(-2.815767,10.929153),(-2.821761,10.948299),(-2.832716,10.966024),(-2.838711,10.985119),(-2.835946,10.992224),(-2.837341,10.998012),(-2.751119,10.996462),(-2.750706,10.985842),(-2.728798,10.986057),(-2.634951,10.986979),(-2.439769,10.988943),(-2.197871,10.991294),(-1.972872,10.993516),(-1.754074,10.995635),(-1.598683,10.997133),(-1.587004,11.003671),(-1.579821,11.021215),(-1.562406,11.026589),(-1.436057,11.022713),(-1.423584,11.017911),(-1.413553,11.01405),(-1.38035,11.001268),(-1.355287,10.99672),(-1.22806,10.99548),(-1.10755,10.994343),(-1.098714,11.009562),(-1.070343,11.013902),(-0.932471,11.003102),(-0.924047,11.001423),(-0.916451,10.996203),(-0.909475,10.98269),(-0.904359,10.979486),(-0.89392,10.979899),(-0.900586,10.966231),(-0.883171,10.968634),(-0.860795,10.992922),(-0.839401,10.996462),(-0.833665,11.003412),(-0.827774,11.005841),(-0.822141,11.003619),(-0.816974,10.996462),(-0.816974,10.996203),(-0.703017,10.994159),(-0.695999,10.994033),(-0.694656,10.982742),(-0.690212,10.981811),(-0.683235,10.984344),(-0.673933,10.983517),(-0.667991,10.976515),(-0.67228,10.968505),(-0.679773,10.960572),(-0.68277,10.953596),(-0.634763,10.907966),(-0.617244,10.918637),(-0.607116,10.94122),(-0.599829,10.965766),(-0.590579,10.982432),(-0.576213,10.987754),(-0.555439,10.98995),(-0.516475,10.988633),(-0.512961,10.989744),(-0.509706,10.991449),(-0.506709,10.993671),(-0.504228,10.996203),(-0.504228,10.996358),(-0.494823,11.007805),(-0.46852,11.020129),(-0.456686,11.029612),(-0.45126,11.040206),(-0.449038,11.062892),(-0.444387,11.077439),(-0.425215,11.101468),(-0.405888,11.101468),(-0.386923,11.086405),(-0.368939,11.065217),(-0.318813,11.101365),(-0.306126,11.113535),(-0.298297,11.128392),(-0.300545,11.137409),(-0.304473,11.146788),(-0.301682,11.162937),(-0.166109,11.13498)]
+Gibraltar	[(-5.358387,36.141109),(-5.338773,36.14112),(-5.339915,36.129828),(-5.33906,36.123847),(-5.34203,36.1105),(-5.35025,36.119289),(-5.358387,36.141109)]
+Guinea	[(-13.338613,12.63923),(-13.332773,12.639643),(-13.330034,12.642072),(-13.327709,12.644914),(-13.322877,12.646516),(-13.292931,12.652717),(-13.284146,12.653337),(-13.275722,12.651064),(-13.263398,12.643209),(-13.25469,12.641813),(-13.246008,12.643157),(-13.229084,12.647808),(-13.22154,12.648376),(-13.21601,12.645741),(-13.20645,12.635664),(-13.201903,12.63339),(-13.197872,12.634062),(-13.185211,12.637783),(-13.176271,12.637731),(-13.169217,12.638765),(-13.162629,12.638144),(-13.154696,12.632822),(-13.145317,12.643932),(-13.127308,12.634837),(-13.108988,12.635406),(-13.091703,12.638196),(-13.076458,12.635922),(-13.063642,12.62228),(-13.059327,12.60347),(-13.060413,12.583367),(-13.064211,12.566159),(-13.079094,12.532156),(-13.082711,12.515671),(-13.078267,12.496241),(-13.066743,12.480118),(-13.051989,12.472263),(-13.034626,12.470558),(-13.015247,12.472676),(-12.997419,12.465855),(-12.981038,12.466992),(-12.969514,12.476811),(-12.966232,12.496086),(-12.949489,12.535928),(-12.913135,12.536342),(-12.874042,12.516395),(-12.849211,12.495001),(-12.84965,12.491073),(-12.851252,12.484355),(-12.849133,12.475829),(-12.838617,12.466372),(-12.829057,12.462755),(-12.799421,12.460636),(-12.783479,12.453091),(-12.779164,12.443273),(-12.773272,12.435056),(-12.752654,12.432421),(-12.688058,12.435986),(-12.667517,12.433661),(-12.648009,12.425754),(-12.63155,12.41268),(-12.603412,12.381933),(-12.598064,12.372424),(-12.597314,12.365448),(-12.593671,12.361572),(-12.579408,12.361159),(-12.57813,12.361528),(-12.570649,12.363691),(-12.541452,12.379452),(-12.521918,12.386894),(-12.505072,12.390253),(-12.48776,12.389477),(-12.466754,12.384465),(-12.423397,12.369117),(-12.405517,12.356456),(-12.377121,12.313668),(-12.36092,12.305607),(-12.192042,12.348756),(-12.155041,12.369014),(-12.121917,12.398728),(-12.103985,12.407357),(-12.07918,12.408133),(-12.018874,12.388444),(-11.997583,12.386377),(-11.984303,12.389012),(-11.946269,12.409425),(-11.93521,12.417021),(-11.930869,12.418726),(-11.923944,12.418778),(-11.921981,12.417693),(-11.920637,12.416039),(-11.860176,12.391079),(-11.839609,12.386687),(-11.757805,12.383328),(-11.720029,12.389477),(-11.643083,12.417641),(-11.601535,12.425238),(-11.515391,12.431645),(-11.481646,12.428235),(-11.416017,12.40498),(-11.388422,12.403895),(-11.388628,12.384465),(-11.407594,12.381933),(-11.431675,12.382966),(-11.447229,12.374543),(-11.451467,12.352115),(-11.444904,12.312531),(-11.444594,12.289484),(-11.463249,12.249951),(-11.491671,12.220909),(-11.507794,12.191608),(-11.489604,12.151197),(-11.470794,12.134609),(-11.409557,12.107893),(-11.391729,12.093733),(-11.351318,12.040403),(-11.334678,12.026192),(-11.315144,12.013325),(-11.294681,12.003093),(-11.274992,11.996271),(-11.25551,11.996168),(-11.223315,12.009294),(-11.206986,12.010172),(-11.191173,12.01441),(-11.176342,12.029499),(-11.165644,12.04862),(-11.159392,12.077507),(-11.152725,12.080866),(-11.14425,12.081331),(-11.136292,12.085103),(-11.122081,12.107272),(-11.117477,12.112702),(-11.116604,12.113732),(-11.084306,12.136573),(-11.072782,12.149492),(-11.059811,12.192435),(-11.052318,12.202512),(-11.038779,12.205251),(-11.015473,12.204424),(-10.972013,12.218583),(-10.952117,12.219462),(-10.927675,12.212951),(-10.909794,12.200135),(-10.869642,12.138433),(-10.846387,12.12138),(-10.822926,12.110476),(-10.804943,12.095955),(-10.798535,12.068102),(-10.801222,12.059213),(-10.811041,12.04154),(-10.812436,12.033427),(-10.807785,12.022833),(-10.781017,11.99622),(-10.740347,11.919894),(-10.711357,11.890386),(-10.669964,11.89204),(-10.655081,11.898965),(-10.645159,11.90837),(-10.634152,11.925423),(-10.625264,11.943872),(-10.621543,11.957669),(-10.613792,11.967694),(-10.595653,11.97989),(-10.574983,11.990329),(-10.55948,11.995186),(-10.566508,12.017252),(-10.555449,12.029344),(-10.535399,12.038698),(-10.51509,12.052909),(-10.514883,12.060144),(-10.517674,12.070737),(-10.517312,12.080349),(-10.507959,12.084586),(-10.504445,12.088359),(-10.512661,12.108461),(-10.511628,12.118073),(-10.493489,12.124429),(-10.445688,12.120708),(-10.435973,12.135178),(-10.428945,12.143394),(-10.39458,12.17161),(-10.381403,12.180136),(-10.37484,12.174814),(-10.368225,12.171506),(-10.353394,12.166494),(-10.354118,12.18086),(-10.348433,12.184787),(-10.339338,12.185459),(-10.329882,12.19042),(-10.325592,12.199773),(-10.323577,12.201995),(-10.316497,12.196879),(-10.313603,12.191143),(-10.31102,12.19104),(-10.304974,12.202874),(-10.26694,12.217808),(-10.258981,12.213778),(-10.254124,12.207215),(-10.247819,12.201065),(-10.21485,12.194606),(-10.179762,12.178224),(-10.160228,12.174503),(-10.135837,12.175485),(-10.128654,12.174503),(-10.118835,12.170163),(-10.105192,12.158639),(-10.097286,12.153678),(-10.09034,12.151584),(-10.087002,12.150577),(-10.070363,12.149854),(-10.060182,12.147528),(-10.04809,12.141379),(-10.027678,12.125669),(-10.015534,12.119881),(-9.996414,12.114145),(-9.961584,12.096007),(-9.941533,12.092751),(-9.923188,12.087584),(-9.888772,12.060557),(-9.870736,12.052082),(-9.861125,12.051875),(-9.840661,12.055028),(-9.833684,12.055131),(-9.823039,12.050893),(-9.806813,12.038439),(-9.796632,12.032342),(-9.778649,12.026657),(-9.722994,12.025417),(-9.698809,12.050997),(-9.686303,12.068153),(-9.681549,12.080814),(-9.683668,12.101485),(-9.682273,12.118538),(-9.675141,12.133989),(-9.66,12.149802),(-9.628167,12.170163),(-9.515616,12.20706),(-9.495876,12.224681),(-9.479598,12.235843),(-9.438877,12.254757),(-9.421513,12.257082),(-9.360173,12.246644),(-9.336816,12.269846),(-9.331906,12.282766),(-9.335007,12.306537),(-9.321829,12.310206),(-9.312889,12.32607),(-9.308497,12.345036),(-9.309169,12.357748),(-9.314801,12.362657),(-9.331648,12.366326),(-9.339167,12.370616),(-9.343947,12.380124),(-9.344464,12.389012),(-9.347151,12.396454),(-9.374694,12.41113),(-9.392781,12.428028),(-9.407251,12.445133),(-9.412573,12.455365),(-9.398155,12.473245),(-9.350872,12.484614),(-9.33418,12.496293),(-9.327307,12.497533),(-9.321519,12.496603),(-9.308187,12.488955),(-9.294079,12.483787),(-9.286379,12.488128),(-9.278938,12.494432),(-9.265864,12.495207),(-9.189486,12.479239),(-9.147318,12.465493),(-9.027765,12.404751),(-8.993839,12.387514),(-8.975907,12.368704),(-8.964745,12.346276),(-8.963092,12.32421),(-8.972135,12.301989),(-8.985261,12.282094),(-8.995906,12.26101),(-8.99756,12.23481),(-8.994278,12.224836),(-8.984537,12.20892),(-8.981178,12.198946),(-8.97384,12.187578),(-8.961696,12.187991),(-8.942008,12.195846),(-8.927021,12.187371),(-8.913896,12.169853),(-8.906041,12.147735),(-8.906971,12.125359),(-8.921957,12.086033),(-8.926298,12.064278),(-8.922112,12.045364),(-8.903715,12.030378),(-8.88165,12.029189),(-8.858757,12.031825),(-8.837983,12.028156),(-8.819793,12.012653),(-8.815452,11.995703),(-8.816434,11.976841),(-8.814909,11.955395),(-8.809974,11.94444),(-8.803205,11.934932),(-8.79783,11.925113),(-8.797004,11.913227),(-8.847233,11.657946),(-8.828526,11.659186),(-8.81168,11.651745),(-8.795195,11.641926),(-8.777211,11.635932),(-8.756541,11.638826),(-8.740366,11.646164),(-8.726517,11.649471),(-8.712874,11.640066),(-8.690705,11.568029),(-8.687346,11.55002),(-8.679026,11.52984),(-8.667967,11.510875),(-8.656754,11.496431),(-8.602183,11.472092),(-8.575208,11.470283),(-8.549577,11.490127),(-8.543996,11.477647),(-8.539425,11.456312),(-8.535521,11.438088),(-8.527563,11.423387),(-8.51578,11.418968),(-8.488134,11.418193),(-8.427724,11.40008),(-8.397648,11.385895),(-8.375324,11.367654),(-8.393359,11.363003),(-8.414133,11.353468),(-8.42607,11.340472),(-8.417957,11.325511),(-8.39956,11.322152),(-8.381267,11.325098),(-8.371035,11.32055),(-8.376719,11.294661),(-8.388398,11.281406),(-8.406691,11.275282),(-8.426897,11.274197),(-8.44457,11.276264),(-8.483224,11.28492),(-8.492578,11.277788),(-8.50312,11.255412),(-8.502345,11.25164),(-8.499244,11.246705),(-8.497022,11.24071),(-8.498779,11.233501),(-8.502138,11.231176),(-8.51206,11.230298),(-8.515625,11.229057),(-8.5241,11.22376),(-8.544616,11.214975),(-8.551799,11.210738),(-8.563943,11.193426),(-8.569679,11.157796),(-8.578154,11.14206),(-8.586991,11.137461),(-8.607222,11.137151),(-8.615413,11.13405),(-8.624611,11.122035),(-8.624921,11.112191),(-8.622389,11.102605),(-8.623112,11.091262),(-8.63368,11.071289),(-8.679801,11.025194),(-8.68869,11.012559),(-8.696906,10.996048),(-8.70073,10.978452),(-8.696234,10.962743),(-8.680938,10.952304),(-8.665229,10.956955),(-8.647969,10.965818),(-8.628228,10.967833),(-8.611382,10.965146),(-8.593347,10.964707),(-8.575622,10.966748),(-8.55955,10.971605),(-8.541567,10.983775),(-8.531645,10.999046),(-8.505755,11.052789),(-8.489064,11.052737),(-8.469013,11.046381),(-8.448704,11.047105),(-8.438162,11.04974),(-8.429067,11.048293),(-8.410464,11.041911),(-8.400645,11.043332),(-8.381318,11.053926),(-8.369329,11.054236),(-8.347315,11.043126),(-8.326593,11.02385),(-8.311142,11.000803),(-8.305096,10.978246),(-8.303649,10.874893),(-8.305871,10.856289),(-8.311814,10.847246),(-8.318893,10.83952),(-8.339822,10.783865),(-8.341941,10.763246),(-8.315586,10.753092),(-8.311142,10.735289),(-8.295535,10.537446),(-8.284425,10.511246),(-8.253884,10.469827),(-8.228873,10.423422),(-8.210579,10.414068),(-8.18903,10.413629),(-8.165983,10.418099),(-8.150583,10.424533),(-8.142056,10.429649),(-8.135442,10.427323),(-8.125417,10.411665),(-8.122109,10.399496),(-8.120921,10.373037),(-8.115495,10.360247),(-8.096116,10.346734),(-8.070071,10.341876),(-8.015708,10.339344),(-7.996277,10.32826),(-7.981549,10.307021),(-7.971214,10.281802),(-7.9646,10.258936),(-7.962584,10.233252),(-7.96801,10.209998),(-7.989663,10.161991),(-7.999843,10.150699),(-8.007233,10.138323),(-8.012349,10.124861),(-8.015708,10.110366),(-8.03488,10.085794),(-8.057876,10.073081),(-8.108777,10.054194),(-8.127535,10.037115),(-8.147741,10.010036),(-8.15849,9.984921),(-8.148878,9.973888),(-8.136269,9.969444),(-8.140093,9.959703),(-8.152392,9.949988),(-8.173837,9.941875),(-8.174716,9.933038),(-8.171512,9.922832),(-8.167895,9.914693),(-8.164536,9.912678),(-8.158955,9.912368),(-8.153219,9.910921),(-8.14955,9.90534),(-8.147224,9.887925),(-8.145674,9.882499),(-8.147327,9.880122),(-8.152133,9.87883),(-8.155079,9.875238),(-8.150996,9.866143),(-8.146862,9.864696),(-8.128104,9.866246),(-8.123505,9.844852),(-8.160293,9.584814),(-8.16159,9.575644),(-8.161022,9.553604),(-8.157611,9.530866),(-8.152857,9.513116),(-8.145364,9.497148),(-8.087176,9.415395),(-8.070433,9.397541),(-8.054051,9.389092),(-8.032296,9.384648),(-8.009868,9.383614),(-7.991575,9.38532),(-7.971059,9.392968),(-7.933025,9.414259),(-7.91189,9.418651),(-7.8706,9.418599),(-7.865381,9.409918),(-7.891736,9.330233),(-7.89494,9.307133),(-7.930648,9.220291),(-7.929563,9.183885),(-7.878713,9.163912),(-7.866311,9.166031),(-7.856234,9.170217),(-7.847914,9.168563),(-7.83422,9.142983),(-7.823368,9.131976),(-7.801044,9.114794),(-7.759392,9.091668),(-7.746783,9.07645),(-7.748203,9.075403),(-7.764198,9.063608),(-7.788073,9.060042),(-7.807813,9.060042),(-7.827037,9.05782),(-7.916747,9.012345),(-7.931785,8.996558),(-7.931837,8.996558),(-7.931837,8.996455),(-7.931888,8.996455),(-7.941604,8.972218),(-7.946461,8.948602),(-7.950699,8.899535),(-7.96894,8.812848),(-7.958915,8.781997),(-7.91313,8.768226),(-7.890961,8.765693),(-7.831016,8.747658),(-7.826572,8.748227),(-7.816056,8.753524),(-7.81019,8.753369),(-7.803679,8.749054),(-7.795695,8.73647),(-7.790915,8.730941),(-7.772053,8.714534),(-7.765129,8.706085),(-7.741202,8.662909),(-7.731823,8.652083),(-7.703944,8.633479),(-7.696812,8.624849),(-7.691593,8.606142),(-7.69397,8.567773),(-7.691696,8.546663),(-7.679242,8.505089),(-7.679294,8.487726),(-7.686477,8.462585),(-7.689578,8.438659),(-7.683221,8.417317),(-7.662447,8.374865),(-7.720738,8.368534),(-7.748334,8.372307),(-7.77102,8.386518),(-7.802439,8.449201),(-7.823833,8.477856),(-7.845744,8.474316),(-7.849413,8.459201),(-7.846777,8.44269),(-7.848586,8.428634),(-7.865588,8.420882),(-7.882331,8.421451),(-7.898583,8.426283),(-7.912871,8.434189),(-7.923827,8.443775),(-7.931578,8.45703),(-7.936953,8.471422),(-7.943877,8.484625),(-7.95628,8.494366),(-7.970542,8.49695),(-7.98589,8.494935),(-8.015708,8.487209),(-8.024906,8.488604),(-8.042476,8.487157),(-8.050667,8.487674),(-8.057204,8.490852),(-8.068107,8.500464),(-8.076634,8.503255),(-8.096891,8.501704),(-8.130119,8.488604),(-8.150531,8.486486),(-8.186343,8.493695),(-8.200296,8.491834),(-8.248872,8.453568),(-8.254401,8.446514),(-8.254298,8.434499),(-8.249078,8.423776),(-8.242102,8.412769),(-8.236883,8.400083),(-8.235281,8.379515),(-8.247631,8.322568),(-8.247631,8.303835),(-8.245306,8.285077),(-8.248252,8.273579),(-8.264581,8.2565),(-8.265977,8.245984),(-8.182932,8.191672),(-8.085522,8.162035),(-8.075962,8.163379),(-8.015708,8.183894),(-8.003305,8.184049),(-8.002427,8.174308),(-8.008266,8.160433),(-8.015708,8.14816),(-8.021702,8.117723),(-8.021289,8.102659),(-8.015708,8.088474),(-7.997052,8.077338),(-7.980413,8.058992),(-7.968217,8.03703),(-7.965638,8.026927),(-7.962636,8.015171),(-7.980361,8.016566),(-7.992505,8.024162),(-8.002168,8.032431),(-8.011987,8.035557),(-8.053845,8.028762),(-8.069089,8.029278),(-8.067229,8.020752),(-8.068883,7.996567),(-8.079115,7.957655),(-8.128879,7.882569),(-8.131204,7.842416),(-8.123763,7.83203),(-8.101439,7.812806),(-8.096323,7.801902),(-8.098261,7.791877),(-8.103919,7.786348),(-8.110482,7.78242),(-8.115133,7.776891),(-8.119009,7.760819),(-8.122626,7.727488),(-8.12738,7.713019),(-8.159523,7.676328),(-8.160195,7.672194),(-8.157404,7.662376),(-8.158024,7.658242),(-8.162107,7.654159),(-8.173424,7.647803),(-8.177868,7.643876),(-8.197867,7.618554),(-8.202621,7.607185),(-8.203035,7.599589),(-8.199779,7.583363),(-8.200244,7.576335),(-8.228976,7.544295),(-8.265356,7.560056),(-8.303235,7.589305),(-8.336773,7.597832),(-8.372275,7.58729),(-8.390878,7.585791),(-8.414805,7.612921),(-8.440023,7.599899),(-8.485446,7.557989),(-8.515625,7.577161),(-8.54782,7.600777),(-8.566527,7.623412),(-8.57278,7.650749),(-8.567405,7.688214),(-8.686571,7.694364),(-8.694477,7.674416),(-8.720677,7.642739),(-8.727576,7.622017),(-8.730031,7.587445),(-8.731478,7.581761),(-8.737369,7.571425),(-8.739178,7.565689),(-8.738041,7.559488),(-8.73401,7.557679),(-8.729514,7.556387),(-8.726827,7.55184),(-8.725742,7.528534),(-8.729617,7.50869),(-8.739539,7.490552),(-8.756489,7.472413),(-8.784394,7.455722),(-8.790389,7.450812),(-8.793955,7.441511),(-8.795453,7.421099),(-8.799226,7.41221),(-8.807701,7.40451),(-8.82403,7.399808),(-8.83341,7.393865),(-8.851626,7.371489),(-8.860617,7.35764),(-8.865371,7.346891),(-8.863304,7.32989),(-8.855915,7.311855),(-8.851367,7.292889),(-8.857827,7.273046),(-8.868885,7.266638),(-8.91219,7.250153),(-8.925419,7.248603),(-8.944385,7.278678),(-8.9572,7.286481),(-8.962575,7.262969),(-8.973117,7.267671),(-8.977716,7.266224),(-8.981023,7.250566),(-8.985467,7.25005),(-9.007637,7.243487),(-9.015698,7.238887),(-9.032855,7.240283),(-9.046652,7.232738),(-9.059261,7.221369),(-9.073111,7.211344),(-9.086392,7.20721),(-9.100448,7.204833),(-9.106085,7.202975),(-9.113935,7.200388),(-9.125407,7.190208),(-9.116054,7.224676),(-9.11962,7.237957),(-9.139153,7.247879),(-9.146905,7.25408),(-9.147473,7.271392),(-9.15308,7.275474),(-9.17543,7.274596),(-9.181476,7.275681),(-9.206281,7.298367),(-9.219872,7.360999),(-9.234341,7.381308),(-9.249715,7.383065),(-9.283796,7.374073),(-9.299505,7.376605),(-9.3055,7.383478),(-9.312424,7.403322),(-9.319401,7.411952),(-9.327772,7.417068),(-9.335007,7.419652),(-9.349218,7.421564),(-9.365961,7.421099),(-9.375159,7.41929),(-9.379242,7.415828),(-9.381412,7.404975),(-9.386477,7.401668),(-9.392264,7.39986),(-9.407354,7.378052),(-9.418723,7.387767),(-9.438101,7.421564),(-9.449263,7.405079),(-9.478357,7.376915),(-9.486626,7.372833),(-9.487099,7.373204),(-9.490708,7.376037),(-9.479701,7.38539),(-9.4735,7.39557),(-9.470864,7.407353),(-9.470244,7.420995),(-9.466213,7.433449),(-9.456705,7.443061),(-9.436086,7.458564),(-9.4134,7.492257),(-9.404925,7.513599),(-9.408697,7.527449),(-9.390817,7.548223),(-9.38366,7.55954),(-9.378777,7.586256),(-9.372989,7.601346),(-9.364411,7.614265),(-9.353507,7.62243),(-9.374694,7.646925),(-9.376245,7.680566),(-9.366374,7.716171),(-9.355471,7.741906),(-9.380999,7.77441),(-9.389681,7.791464),(-9.415674,7.824433),(-9.43867,7.866239),(-9.448437,7.907839),(-9.446008,7.950058),(-9.433093,7.993468),(-9.431745,7.996567),(-9.424562,8.005817),(-9.42234,8.015791),(-9.424149,8.026178),(-9.429265,8.036901),(-9.440944,8.050569),(-9.451537,8.051758),(-9.462183,8.043464),(-9.474223,8.028813),(-9.472776,8.040363),(-9.461873,8.058424),(-9.459805,8.068785),(-9.478047,8.141287),(-9.478099,8.152785),(-9.481406,8.164697),(-9.491328,8.169968),(-9.515616,8.174877),(-9.530137,8.185496),(-9.531894,8.212316),(-9.525435,8.24079),(-9.515616,8.256603),(-9.51081,8.261047),(-9.509156,8.265595),(-9.510758,8.270065),(-9.515616,8.274406),(-9.521249,8.284405),(-9.525124,8.295438),(-9.530189,8.30598),(-9.539387,8.314584),(-9.528483,8.32572),(-9.522282,8.330681),(-9.515616,8.334376),(-9.511482,8.336133),(-9.499131,8.343471),(-9.504351,8.346158),(-9.511482,8.353781),(-9.529052,8.366312),(-9.579178,8.387293),(-9.592045,8.405095),(-9.600159,8.410883),(-9.607342,8.402925),(-9.612148,8.396336),(-9.619537,8.392719),(-9.628064,8.391634),(-9.636125,8.392564),(-9.653385,8.392099),(-9.668372,8.38874),(-9.67726,8.39153),(-9.675916,8.409643),(-9.666511,8.422381),(-9.653385,8.43145),(-9.645117,8.443413),(-9.650543,8.464807),(-9.663514,8.477856),(-9.683513,8.487054),(-9.703253,8.487261),(-9.7155,8.473334),(-9.717981,8.452689),(-9.718188,8.438272),(-9.722115,8.435636),(-9.735913,8.450493),(-9.7463,8.468063),(-9.750899,8.485866),(-9.757307,8.53271),(-9.763043,8.54997),(-9.773585,8.563018),(-9.790586,8.565396),(-9.790018,8.553071),(-9.794824,8.544544),(-9.802007,8.53718),(-9.808854,8.528473),(-9.808828,8.520463),(-9.805469,8.512789),(-9.806813,8.506252),(-9.831617,8.499017),(-9.849704,8.48969),(-9.858644,8.487054),(-9.863502,8.49354),(-9.868153,8.498087),(-9.872804,8.500361),(-9.886911,8.49664),(-9.891872,8.495917),(-9.911354,8.495658),(-9.928149,8.493436),(-9.944169,8.488346),(-9.961119,8.479561),(-10.000186,8.449305),(-10.04039,8.425663),(-10.061681,8.422174),(-10.075013,8.426644),(-10.079354,8.439951),(-10.069277,8.486873),(-10.076099,8.501498),(-10.091085,8.510102),(-10.147981,8.524287),(-10.164879,8.524649),(-10.181829,8.519584),(-10.215625,8.486589),(-10.23242,8.477055),(-10.240275,8.493746),(-10.260842,8.485917),(-10.271332,8.484109),(-10.282236,8.484625),(-10.293708,8.483075),(-10.302235,8.485866),(-10.310245,8.490361),(-10.337581,8.498552),(-10.344299,8.499069),(-10.374737,8.49478),(-10.389775,8.489095),(-10.402384,8.481008),(-10.414062,8.470182),(-10.423778,8.456565),(-10.447962,8.407627),(-10.46021,8.39215),(-10.519276,8.33479),(-10.554364,8.311845),(-10.572657,8.304585),(-10.583251,8.30691),(-10.61188,8.325255),(-10.626711,8.331508),(-10.659784,8.333265),(-10.688154,8.324067),(-10.707895,8.303138),(-10.715181,8.2696),(-10.735283,8.287299),(-10.725,8.319855),(-10.702004,8.353574),(-10.683813,8.374865),(-10.669086,8.399075),(-10.654668,8.485504),(-10.643868,8.486873),(-10.641077,8.49478),(-10.64118,8.50664),(-10.638855,8.519895),(-10.631879,8.532013),(-10.616479,8.546508),(-10.600511,8.575653),(-10.584646,8.596841),(-10.565423,8.612783),(-10.545166,8.616762),(-10.522118,8.618571),(-10.503308,8.631567),(-10.489665,8.651049),(-10.481862,8.672469),(-10.524753,8.729546),(-10.530231,8.739158),(-10.545321,8.750036),(-10.5863,8.804089),(-10.589091,8.806595),(-10.596274,8.811246),(-10.599684,8.81538),(-10.600201,8.819024),(-10.599116,8.829617),(-10.599374,8.834036),(-10.608469,8.862303),(-10.610123,8.872302),(-10.61188,8.94514),(-10.607126,8.979841),(-10.591778,9.039062),(-10.592179,9.041658),(-10.593101,9.047617),(-10.594103,9.0541),(-10.605989,9.063763),(-10.629346,9.070352),(-10.669086,9.074434),(-10.710427,9.072987),(-10.746342,9.083814),(-10.753473,9.120116),(-10.74257,9.163292),(-10.724741,9.194504),(-10.714974,9.201352),(-10.703761,9.206313),(-10.693167,9.21285),(-10.685209,9.224503),(-10.683917,9.233753),(-10.687948,9.250703),(-10.688051,9.259281),(-10.683452,9.271812),(-10.677664,9.282897),(-10.67384,9.293982),(-10.675132,9.306461),(-10.717765,9.343333),(-10.728203,9.34819),(-10.741536,9.357053),(-10.753473,9.367569),(-10.765462,9.385216),(-10.774764,9.387335),(-10.785409,9.387232),(-10.795228,9.388524),(-10.801687,9.387283),(-10.819361,9.388059),(-10.831763,9.392141),(-10.822151,9.4009),(-10.811454,9.408264),(-10.813418,9.413897),(-10.829076,9.423948),(-10.843959,9.440252),(-10.854862,9.455264),(-10.8591,9.472989),(-10.853674,9.497871),(-10.852589,9.512082),(-10.860185,9.518542),(-10.870572,9.523399),(-10.877703,9.532675),(-10.882819,9.560167),(-10.886333,9.568409),(-10.896049,9.578305),(-10.92168,9.595901),(-10.92907,9.605694),(-10.935788,9.631894),(-10.940129,9.639697),(-10.94664,9.644839),(-10.962918,9.650782),(-10.968499,9.654244),(-10.974597,9.663778),(-10.986327,9.697755),(-11.010098,9.74274),(-11.044928,9.78713),(-11.085959,9.826171),(-11.16027,9.872758),(-11.16766,9.884462),(-11.181251,9.950376),(-11.188537,9.972597),(-11.199596,9.982157),(-11.213445,9.983371),(-11.247293,9.993396),(-11.272666,9.996006),(-11.484875,9.994845),(-11.910095,9.992518),(-11.914953,9.931488),(-11.921774,9.922212),(-12.109807,9.881676),(-12.141347,9.874876),(-12.158349,9.8756),(-12.174834,9.879191),(-12.193644,9.886064),(-12.217389,9.90056),(-12.235605,9.91676),(-12.253588,9.928413),(-12.276739,9.929266),(-12.426989,9.897614),(-12.472335,9.881258),(-12.508327,9.860381),(-12.514322,9.851312),(-12.514994,9.845111),(-12.513728,9.838341),(-12.513624,9.827825),(-12.527267,9.753618),(-12.526647,9.75062),(-12.522874,9.739432),(-12.522461,9.734472),(-12.525561,9.732069),(-12.530729,9.732844),(-12.53569,9.732792),(-12.537654,9.727934),(-12.537473,9.715713),(-12.538765,9.711915),(-12.54202,9.71132),(-12.573078,9.692562),(-12.582251,9.683364),(-12.59858,9.654864),(-12.601552,9.651712),(-12.602766,9.609363),(-12.606823,9.600707),(-12.614858,9.600087),(-12.624599,9.601276),(-12.633849,9.597865),(-12.638552,9.589416),(-12.647285,9.556627),(-12.649921,9.552105),(-12.652065,9.549444),(-12.655269,9.547739),(-12.660954,9.546033),(-12.668628,9.542364),(-12.669274,9.53823),(-12.66731,9.533709),(-12.667517,9.528696),(-12.701597,9.420227),(-12.706196,9.413948),(-12.713121,9.408161),(-12.716454,9.404414),(-12.719038,9.398368),(-12.72294,9.392089),(-12.727849,9.393123),(-12.732939,9.396508),(-12.737228,9.397231),(-12.754075,9.3878),(-12.759759,9.382839),(-12.767795,9.372323),(-12.767562,9.364391),(-12.763557,9.355347),(-12.764152,9.347673),(-12.777923,9.343849),(-12.795261,9.33509),(-12.819135,9.29579),(-12.835827,9.281967),(-12.856885,9.278505),(-12.876109,9.279848),(-12.895642,9.278505),(-12.917527,9.267007),(-12.937009,9.287083),(-12.957912,9.272433),(-12.973751,9.241582),(-12.97835,9.21285),(-12.973932,9.202799),(-12.960212,9.186081),(-12.959153,9.177839),(-12.962796,9.176702),(-12.97848,9.175203),(-12.984164,9.172309),(-12.993802,9.158693),(-13.002044,9.14412),(-13.015247,9.112752),(-13.028864,9.095983),(-13.047003,9.084537),(-13.085579,9.065985),(-13.115913,9.043945),(-13.131054,9.041465),(-13.153844,9.04932),(-13.191774,9.072987),(-13.207535,9.076708),(-13.233632,9.072057),(-13.277376,9.058595),(-13.301096,9.04149),(-13.312367,9.048326),(-13.321604,9.056627),(-13.325795,9.067776),(-13.322174,9.083075),(-13.319447,9.083564),(-13.304514,9.083075),(-13.300649,9.084621),(-13.300933,9.088202),(-13.302154,9.092515),(-13.301096,9.096137),(-13.273793,9.12401),(-13.254872,9.154934),(-13.243072,9.169745),(-13.225942,9.179267),(-13.208241,9.18008),(-13.176137,9.173651),(-13.157704,9.179267),(-13.157704,9.185492),(-13.218495,9.183254),(-13.247304,9.186021),(-13.259511,9.196357),(-13.25768,9.200263),(-13.248891,9.208319),(-13.245839,9.213446),(-13.245839,9.226467),(-13.237904,9.246649),(-13.232818,9.267401),(-13.254872,9.244818),(-13.264556,9.220445),(-13.270375,9.194037),(-13.280629,9.165025),(-13.304921,9.175482),(-13.315297,9.182074),(-13.322174,9.192939),(-13.313588,9.197943),(-13.311635,9.207221),(-13.314687,9.233303),(-13.313588,9.23314),(-13.311187,9.237982),(-13.308949,9.244778),(-13.307932,9.250312),(-13.310048,9.253811),(-13.319651,9.259263),(-13.322174,9.261217),(-13.325063,9.281317),(-13.325347,9.311021),(-13.318674,9.329495),(-13.301096,9.315863),(-13.303822,9.337795),(-13.303375,9.347113),(-13.301096,9.356838),(-13.307932,9.356838),(-13.313954,9.349555),(-13.322174,9.345404),(-13.332834,9.343573),(-13.345774,9.343166),(-13.352854,9.338772),(-13.357818,9.328437),(-13.367909,9.282172),(-13.374501,9.272773),(-13.397532,9.28384),(-13.407786,9.287014),(-13.411977,9.293402),(-13.404124,9.308417),(-13.414052,9.317206),(-13.423818,9.332913),(-13.430816,9.352037),(-13.431996,9.37108),(-13.42516,9.389879),(-13.40331,9.418158),(-13.396637,9.439358),(-13.404124,9.439358),(-13.428375,9.420722),(-13.465403,9.418158),(-13.499176,9.428778),(-13.513987,9.449612),(-13.520863,9.479478),(-13.520741,9.495103),(-13.510243,9.511054),(-13.50064,9.521796),(-13.493235,9.534857),(-13.488393,9.550605),(-13.486684,9.569078),(-13.49352,9.569078),(-13.515614,9.524482),(-13.529042,9.505683),(-13.547475,9.50019),(-13.561391,9.508979),(-13.575266,9.527248),(-13.58552,9.54914),(-13.58845,9.569078),(-13.619008,9.556383),(-13.643259,9.542548),(-13.677968,9.522691),(-13.7058,9.514472),(-13.707102,9.512152),(-13.714345,9.507636),(-13.722401,9.505805),(-13.726226,9.511054),(-13.72411,9.519517),(-13.718902,9.522284),(-13.71231,9.523668),(-13.7058,9.528062),(-13.673329,9.573798),(-13.652659,9.597154),(-13.640777,9.623725),(-13.625803,9.647284),(-13.623036,9.662909),(-13.624379,9.720282),(-13.623199,9.727362),(-13.61856,9.732082),(-13.604888,9.737372),(-13.602162,9.743801),(-13.595448,9.755032),(-13.580719,9.76203),(-13.566518,9.771064),(-13.561106,9.788235),(-13.581776,9.777167),(-13.594309,9.774237),(-13.604115,9.780178),(-13.647776,9.831488),(-13.651194,9.842841),(-13.655181,9.841742),(-13.658111,9.840522),(-13.664784,9.836615),(-13.653798,9.805243),(-13.650543,9.777004),(-13.661285,9.754543),(-13.692128,9.740383),(-13.728912,9.744086),(-13.747182,9.767768),(-13.749827,9.799872),(-13.739898,9.829169),(-13.698313,9.880764),(-13.681996,9.913479),(-13.685292,9.946479),(-13.693959,9.953803),(-13.697499,9.940416),(-13.699208,9.921332),(-13.702016,9.911689),(-13.712758,9.905178),(-13.732493,9.876776),(-13.746693,9.870754),(-13.745432,9.866523),(-13.749745,9.863471),(-13.784657,9.850246),(-13.788686,9.850043),(-13.809682,9.85163),(-13.827707,9.855373),(-13.842844,9.860785),(-13.849192,9.867621),(-13.855051,9.878852),(-13.86913,9.896226),(-13.886098,9.912177),(-13.900624,9.919135),(-13.927642,9.93594),(-13.933176,9.943345),(-13.945383,9.966946),(-13.954254,9.970933),(-13.971099,9.971829),(-13.979482,9.974351),(-13.98705,9.980414),(-14.006744,10.001044),(-14.021718,10.00727),(-14.032297,10.008979),(-14.042958,10.012844),(-14.058339,10.025295),(-14.061879,10.050116),(-14.046132,10.079495),(-14.020334,10.094428),(-13.993764,10.076158),(-14.001088,10.088202),(-14.014801,10.104804),(-14.028188,10.116604),(-14.034088,10.114),(-14.041615,10.101304),(-14.056752,10.106594),(-14.068349,10.118109),(-14.0655,10.124579),(-14.043813,10.133246),(-14.026967,10.153957),(-13.999908,10.199693),(-14.014516,10.192776),(-14.024892,10.183743),(-14.044667,10.162177),(-14.055491,10.155341),(-14.082834,10.14289),(-14.089345,10.138251),(-14.091176,10.126044),(-14.089345,10.079901),(-14.092275,10.06859),(-14.100575,10.058295),(-14.113433,10.051011),(-14.130279,10.048896),(-14.153188,10.05565),(-14.170481,10.070787),(-14.179799,10.090277),(-14.178782,10.110297),(-14.16275,10.126614),(-14.138173,10.144477),(-14.123647,10.162584),(-14.137766,10.179185),(-14.141672,10.164537),(-14.153147,10.156317),(-14.168609,10.152737),(-14.184926,10.151923),(-14.182485,10.129543),(-14.200185,10.112738),(-14.222401,10.106106),(-14.233388,10.114),(-14.236562,10.120917),(-14.24356,10.129381),(-14.2506,10.14053),(-14.253814,10.155341),(-14.250478,10.162584),(-14.244049,10.168891),(-14.240061,10.175116),(-14.243886,10.182318),(-14.249257,10.184272),(-14.25475,10.182847),(-14.259023,10.179592),(-14.26065,10.175767),(-14.270131,10.159735),(-14.292104,10.17178),(-14.352366,10.226223),(-14.362701,10.231187),(-14.376698,10.234442),(-14.391835,10.233385),(-14.405507,10.229397),(-14.418568,10.227973),(-14.431956,10.234442),(-14.452545,10.214586),(-14.462636,10.225165),(-14.465891,10.249701),(-14.466135,10.27204),(-14.458241,10.304267),(-14.458608,10.316962),(-14.463043,10.330024),(-14.468617,10.336249),(-14.475331,10.340318),(-14.537262,10.403632),(-14.548004,10.425605),(-14.550893,10.446601),(-14.550526,10.472113),(-14.545522,10.495022),(-14.535593,10.507473),(-14.535024,10.508205),(-14.53543,10.508165),(-14.551422,10.506781),(-14.562408,10.499335),(-14.571604,10.489447),(-14.582834,10.480862),(-14.596425,10.475979),(-14.613515,10.473375),(-14.628977,10.476264),(-14.637441,10.487738),(-14.644276,10.487738),(-14.651194,10.475084),(-14.657786,10.47956),(-14.662709,10.494127),(-14.664703,10.511623),(-14.663808,10.529202),(-14.661122,10.542629),(-14.650461,10.570258),(-14.639394,10.566636),(-14.625966,10.577379),(-14.611399,10.592963),(-14.596425,10.603746),(-14.620595,10.604315),(-14.628651,10.617255),(-14.627431,10.635484),(-14.615224,10.691311),(-14.607289,10.70539),(-14.596425,10.699368),(-14.59024,10.699368),(-14.588287,10.714301),(-14.580719,10.722073),(-14.572418,10.726304),(-14.568512,10.731024),(-14.555491,10.775702),(-14.531321,10.823472),(-14.517445,10.829047),(-14.509674,10.842475),(-14.508372,10.858466),(-14.513905,10.871894),(-14.509999,10.876451),(-14.500234,10.891099),(-14.519928,10.885403),(-14.522572,10.877631),(-14.519154,10.866523),(-14.521352,10.850816),(-14.554921,10.827623),(-14.558909,10.823472),(-14.573476,10.812405),(-14.590403,10.787258),(-14.60436,10.760443),(-14.615956,10.728013),(-14.629709,10.706448),(-14.657867,10.672675),(-14.686106,10.648179),(-14.699818,10.643134),(-14.705719,10.65526),(-14.703725,10.670844),(-14.69811,10.68183),(-14.689443,10.688951),(-14.678334,10.693101),(-14.68578,10.694729),(-14.691762,10.694485),(-14.697865,10.69184),(-14.705719,10.686347),(-14.71935,10.699368),(-14.706899,10.739203),(-14.699086,10.756252),(-14.688385,10.771959),(-14.6822,10.777777),(-14.66808,10.787095),(-14.661285,10.792792),(-14.655995,10.800605),(-14.65331,10.807603),(-14.651357,10.809963),(-14.656565,10.811957),(-14.664703,10.816636),(-14.677968,10.799628),(-14.723134,10.765123),(-14.734771,10.748114),(-14.746449,10.710761),(-14.760325,10.699368),(-14.770009,10.718817),(-14.782704,10.731269),(-14.792836,10.745022),(-14.795074,10.768256),(-14.781606,10.767768),(-14.770009,10.776923),(-14.760813,10.790432),(-14.75414,10.802965),(-14.749257,10.816107),(-14.746083,10.831204),(-14.744985,10.844062),(-14.746693,10.850816),(-14.743886,10.856594),(-14.742421,10.860989),(-14.740468,10.871894),(-14.758901,10.858466),(-14.765289,10.850328),(-14.76773,10.840888),(-14.772572,10.836493),(-14.801259,10.823472),(-14.808705,10.823472),(-14.809682,10.834784),(-14.809071,10.845608),(-14.806508,10.855455),(-14.801259,10.864447),(-14.807281,10.873603),(-14.807973,10.882473),(-14.803822,10.890815),(-14.795074,10.898586),(-14.813873,10.900336),(-14.819732,10.912014),(-14.816762,10.927191),(-14.808705,10.939602),(-14.796132,10.947577),(-14.778635,10.954088),(-14.759918,10.958441),(-14.74356,10.960028),(-14.73176,10.966457),(-14.724965,10.980536),(-14.720611,10.994574),(-14.716298,11.000963),(-14.699452,11.00552),(-14.680776,11.027493),(-14.664703,11.035793),(-14.672231,11.041449),(-14.677235,11.047593),(-14.68517,11.063666),(-14.687001,11.054267),(-14.690094,11.045233),(-14.694976,11.038479),(-14.70226,11.035793),(-14.707875,11.034491),(-14.723541,11.028266),(-14.726796,11.025824),(-14.730824,11.005845),(-14.741526,10.989081),(-14.756825,10.981187),(-14.774566,10.987982),(-14.779449,10.983303),(-14.784576,10.981106),(-14.791412,10.980373),(-14.801259,10.980536),(-14.795481,10.999701),(-14.801259,11.011908),(-14.810658,11.014472),(-14.815541,11.004706),(-14.843495,10.967475),(-14.874623,10.973293),(-14.894439,11.03026),(-14.918568,11.028957),(-14.901479,11.011664),(-14.898793,10.993232),(-14.904124,10.975491),(-14.911122,10.960028),(-14.931956,10.975653),(-14.943918,10.980048),(-14.959584,10.980536),(-14.926381,10.955552),(-14.914418,10.942328),(-14.911122,10.92593),(-14.920888,10.90766),(-14.939809,10.889106),(-14.958119,10.876207),(-14.96642,10.874986),(-14.968495,10.877875),(-14.973215,10.878852),(-14.977895,10.877875),(-14.980051,10.874986),(-14.978993,10.868842),(-14.974233,10.85928),(-14.973215,10.854193),(-14.973215,10.820054),(-14.968984,10.814358),(-14.959584,10.809963),(-14.950185,10.803778),(-14.945912,10.792792),(-14.947662,10.787584),(-14.959584,10.768256),(-14.977528,10.777045),(-15.013905,10.78262),(-15.031565,10.792792),(-15.052602,10.814399),(-15.069447,10.837144),(-15.079457,10.85871),(-15.081125,10.878241),(-15.07433,10.896877),(-15.058909,10.915961),(-15.051625,10.919623),(-15.03189,10.925482),(-15.027821,10.929348),(-15.026682,10.936672),(-15.02359,10.94359),(-15.019399,10.94953),(-15.014801,10.953803),(-15.014801,10.960028),(-15.019276,10.959703),(-15.020334,10.961371),(-15.020131,10.964179),(-15.020985,10.967475),(-14.992594,10.996203),(-14.992594,10.996358),(-14.959056,11.035762),(-14.863145,11.218645),(-14.843249,11.297193),(-14.828212,11.334787),(-14.728993,11.478009),(-14.711061,11.497568),(-14.686773,11.51072),(-14.64538,11.515061),(-14.562259,11.505604),(-14.520944,11.51289),(-14.432268,11.560575),(-14.339223,11.61061),(-14.326485,11.620584),(-14.319793,11.630506),(-14.308218,11.654535),(-14.300389,11.663165),(-14.289692,11.66885),(-14.284472,11.668178),(-14.278736,11.665077),(-14.19502,11.659703),(-14.171973,11.662752),(-14.161844,11.660943),(-14.153085,11.654845),(-14.144481,11.647404),(-14.134921,11.641771),(-14.118565,11.637999),(-14.104664,11.638567),(-14.07464,11.643735),(-14.058827,11.644045),(-14.015135,11.63712),(-13.996454,11.643838),(-13.953355,11.669676),(-13.945423,11.675671),(-13.923745,11.665026),(-13.903643,11.665387),(-13.886409,11.675568),(-13.873515,11.694533),(-13.870673,11.704145),(-13.868529,11.727037),(-13.87305,11.738354),(-13.870053,11.743677),(-13.855041,11.743419),(-13.846282,11.737269),(-13.842975,11.71727),(-13.834551,11.712103),(-13.820134,11.708072),(-13.819514,11.701664),(-13.821684,11.694223),(-13.815767,11.686833),(-13.795691,11.684042),(-13.770007,11.688693),(-13.745771,11.698202),(-13.729932,11.709829),(-13.724765,11.72311),(-13.719571,11.766105),(-13.719365,11.784036),(-13.734635,11.901859),(-13.731328,11.943406),(-13.722594,11.983869),(-13.723938,12.002783),(-13.734919,12.019267),(-13.744428,12.023918),(-13.779645,12.029344),(-13.795897,12.036269),(-13.807757,12.044279),(-13.829642,12.068102),(-13.835197,12.077765),(-13.837729,12.085413),(-13.842406,12.091304),(-13.869717,12.10071),(-13.879768,12.107686),(-13.899302,12.126238),(-13.918396,12.137762),(-13.938654,12.144273),(-13.964853,12.14789),(-13.972527,12.151559),(-13.968367,12.162566),(-13.968264,12.18396),(-13.965732,12.194244),(-13.943925,12.218635),(-13.883153,12.246437),(-13.858968,12.265971),(-13.840003,12.277133),(-13.812641,12.283592),(-13.795691,12.278735),(-13.808558,12.256101),(-13.740836,12.256927),(-13.71182,12.267521),(-13.695025,12.292946),(-13.69102,12.319301),(-13.68301,12.33868),(-13.682028,12.350307),(-13.685155,12.379194),(-13.684147,12.39201),(-13.682028,12.400329),(-13.664433,12.441516),(-13.660712,12.458672),(-13.663399,12.475777),(-13.67469,12.496086),(-13.725075,12.558149),(-13.734635,12.585331),(-13.736314,12.607604),(-13.728279,12.673388),(-13.404758,12.661761),(-13.359801,12.649737),(-13.356648,12.648893),(-13.352049,12.646981),(-13.343444,12.640987),(-13.338613,12.63923)]
+Gambia	[(-14.74093,13.615449),(-14.728579,13.619325),(-14.667188,13.652889),(-14.626674,13.663508),(-14.585539,13.660459),(-14.542596,13.640822),(-14.523243,13.625655),(-14.50973,13.609093),(-14.500221,13.589973),(-14.486863,13.546539),(-14.480378,13.533129),(-14.470275,13.522354),(-14.462135,13.516656),(-14.389582,13.465872),(-14.365553,13.454839),(-14.347285,13.452358),(-14.329947,13.456441),(-14.271217,13.476956),(-14.215794,13.510753),(-14.196829,13.518788),(-14.139132,13.531552),(-14.092882,13.554729),(-14.072599,13.55969),(-14.06185,13.560052),(-14.044461,13.558605),(-14.034022,13.560207),(-14.022266,13.565323),(-14.001905,13.577028),(-13.988495,13.579146),(-13.967489,13.575581),(-13.94209,13.566925),(-13.918086,13.554988),(-13.901343,13.541629),(-13.896175,13.532922),(-13.889793,13.513957),(-13.8846,13.505533),(-13.882504,13.503782),(-13.875479,13.497911),(-13.852793,13.484811),(-13.84269,13.476646),(-13.818713,13.429362),(-13.822562,13.378203),(-13.851036,13.33575),(-13.900568,13.314563),(-13.976119,13.308207),(-14.016272,13.297639),(-14.056579,13.297174),(-14.099496,13.281955),(-14.116808,13.282162),(-14.131794,13.275573),(-14.179827,13.240123),(-14.201687,13.229555),(-14.230625,13.228574),(-14.284911,13.238547),(-14.341781,13.233638),(-14.368834,13.235705),(-14.394982,13.242965),(-14.43144,13.26144),(-14.442034,13.268545),(-14.45149,13.276865),(-14.459139,13.286916),(-14.470326,13.298259),(-14.483633,13.301928),(-14.515104,13.303168),(-14.529574,13.307277),(-14.542854,13.314666),(-14.552109,13.323094),(-14.580733,13.34916),(-14.592154,13.35314),(-14.624555,13.345181),(-14.661607,13.340918),(-14.698142,13.345181),(-14.731577,13.359005),(-14.759482,13.38337),(-14.779636,13.410888),(-14.790333,13.417348),(-14.810797,13.421172),(-14.829142,13.427011),(-14.862576,13.447061),(-14.877614,13.451376),(-14.915907,13.454425),(-14.949703,13.463081),(-15.015074,13.495741),(-15.015229,13.495844),(-15.015435,13.495999),(-15.01559,13.496051),(-15.065251,13.531268),(-15.110158,13.57248),(-15.13765,13.589973),(-15.160491,13.580981),(-15.181331,13.559843),(-15.203951,13.536901),(-15.217955,13.51468),(-15.221728,13.452823),(-15.227774,13.425176),(-15.248341,13.398977),(-15.277073,13.380296),(-15.309836,13.368436),(-15.342392,13.36257),(-15.379237,13.362519),(-15.488326,13.385256),(-15.519539,13.3866),(-15.542948,13.377996),(-15.566048,13.365671),(-15.596123,13.355827),(-15.612453,13.354225),(-15.679891,13.360658),(-15.6925,13.360348),(-15.737407,13.346344),(-15.807118,13.339781),(-15.818694,13.333528),(-15.822673,13.319421),(-15.824367,13.248512),(-15.82474,13.232914),(-15.8266,13.161678),(-15.833318,13.156847),(-15.870784,13.157157),(-15.897441,13.157399),(-15.961734,13.157984),(-16.092062,13.15912),(-16.313289,13.161084),(-16.465218,13.162428),(-16.630014,13.1639),(-16.673525,13.164314),(-16.708407,13.156692),(-16.723186,13.132249),(-16.726339,13.122637),(-16.742152,13.107392),(-16.748508,13.099227),(-16.752125,13.088039),(-16.753651,13.065009),(-16.76887,13.077826),(-16.784332,13.082994),(-16.786733,13.090074),(-16.782541,13.098334),(-16.775502,13.112738),(-16.777333,13.127834),(-16.796742,13.177232),(-16.797475,13.189114),(-16.795033,13.235907),(-16.797353,13.248928),(-16.802968,13.262193),(-16.820058,13.281317),(-16.824452,13.294582),(-16.81664,13.310614),(-16.820302,13.315823),(-16.829701,13.338528),(-16.820709,13.349107),(-16.809967,13.379869),(-16.79955,13.386298),(-16.787343,13.389146),(-16.774322,13.396186),(-16.762929,13.404975),(-16.704457,13.475409),(-16.678822,13.496161),(-16.676747,13.485907),(-16.671132,13.478664),(-16.662506,13.473131),(-16.652252,13.468248),(-16.634633,13.477362),(-16.616851,13.478176),(-16.601389,13.472235),(-16.590728,13.461371),(-16.585317,13.443345),(-16.596303,13.440253),(-16.612782,13.439154),(-16.624257,13.427232),(-16.608713,13.413723),(-16.59553,13.385077),(-16.588368,13.355292),(-16.590728,13.338528),(-16.553863,13.295803),(-16.545766,13.290107),(-16.495188,13.287909),(-16.480824,13.283881),(-16.467763,13.275865),(-16.45995,13.268866),(-16.449696,13.264065),(-16.429351,13.262193),(-16.419667,13.255561),(-16.41393,13.239976),(-16.413482,13.222073),(-16.419423,13.208197),(-16.39977,13.224311),(-16.390859,13.224799),(-16.377797,13.215033),(-16.383656,13.225165),(-16.401926,13.243354),(-16.405751,13.246039),(-16.408274,13.258734),(-16.415273,13.267035),(-16.426015,13.270738),(-16.439931,13.269599),(-16.439931,13.276435),(-16.410512,13.275865),(-16.396799,13.277899),(-16.384633,13.283881),(-16.374745,13.263861),(-16.363271,13.268297),(-16.34968,13.282172),(-16.333404,13.290107),(-16.314809,13.295559),(-16.277943,13.319485),(-16.257965,13.324897),(-16.230133,13.316392),(-16.225901,13.296576),(-16.230214,13.273627),(-16.22761,13.256008),(-16.209706,13.251166),(-16.185455,13.258287),(-16.151275,13.276435),(-16.151275,13.283881),(-16.162262,13.282701),(-16.172515,13.279283),(-16.181752,13.273749),(-16.189809,13.265937),(-16.19929,13.259101),(-16.203521,13.26496),(-16.208079,13.292385),(-16.208608,13.303534),(-16.210764,13.3133),(-16.21703,13.317369),(-16.222035,13.31977),(-16.22525,13.325832),(-16.227122,13.333686),(-16.22761,13.341946),(-16.224436,13.360297),(-16.216217,13.372748),(-16.176178,13.405422),(-16.168691,13.413316),(-16.165517,13.423814),(-16.161204,13.428697),(-16.151438,13.426947),(-16.135121,13.420478),(-15.994862,13.413031),(-15.941314,13.425442),(-15.922231,13.427232),(-15.911285,13.426703),(-15.905629,13.425767),(-15.900624,13.425523),(-15.891225,13.427232),(-15.883778,13.430406),(-15.878407,13.434801),(-15.874379,13.43887),(-15.871327,13.440904),(-15.849517,13.442206),(-15.785024,13.43476),(-15.764475,13.436916),(-15.706207,13.454576),(-15.696767,13.459866),(-15.678049,13.473049),(-15.668691,13.475735),(-15.658925,13.472398),(-15.644683,13.457913),(-15.634918,13.454576),(-15.620839,13.45482),(-15.610422,13.456448),(-15.600901,13.460435),(-15.589589,13.468248),(-15.580922,13.478176),(-15.565053,13.502509),(-15.555409,13.509223),(-15.543446,13.50967),(-15.530995,13.505845),(-15.519643,13.499661),(-15.510732,13.492743),(-15.500396,13.488186),(-15.489654,13.489936),(-15.47936,13.493964),(-15.470041,13.496161),(-15.45108,13.490912),(-15.438873,13.478583),(-15.429433,13.464748),(-15.418853,13.454576),(-15.384429,13.443508),(-15.340566,13.440823),(-15.304799,13.455308),(-15.294749,13.496161),(-15.299957,13.496161),(-15.30191,13.496161),(-15.302154,13.496161),(-15.304067,13.481147),(-15.311391,13.467841),(-15.321848,13.458238),(-15.332875,13.454576),(-15.351674,13.456732),(-15.385976,13.466132),(-15.401479,13.468248),(-15.415761,13.473212),(-15.43224,13.484768),(-15.456451,13.50609),(-15.46524,13.510159),(-15.47411,13.508531),(-15.482818,13.505032),(-15.490834,13.502997),(-15.499867,13.505113),(-15.507558,13.509833),(-15.51358,13.514553),(-15.517893,13.516669),(-15.531728,13.519761),(-15.54304,13.525539),(-15.556142,13.528306),(-15.575836,13.522895),(-15.586008,13.515041),(-15.600697,13.49551),(-15.610666,13.489325),(-15.627756,13.488511),(-15.654652,13.500963),(-15.672109,13.502997),(-15.690175,13.498969),(-15.734202,13.475735),(-15.769887,13.465074),(-16.09024,13.440497),(-16.121897,13.451606),(-16.141591,13.454576),(-16.16039,13.450588),(-16.178456,13.440985),(-16.206532,13.420478),(-16.248443,13.378974),(-16.257965,13.372016),(-16.265614,13.36872),(-16.27302,13.362616),(-16.280588,13.359768),(-16.289133,13.365871),(-16.289703,13.373236),(-16.286733,13.383612),(-16.284901,13.395331),(-16.289133,13.406806),(-16.30602,13.391669),(-16.308095,13.383368),(-16.302113,13.372016),(-16.312123,13.366929),(-16.316396,13.365871),(-16.316396,13.359036),(-16.311635,13.357611),(-16.306996,13.35456),(-16.302113,13.352769),(-16.321889,13.342841),(-16.355946,13.337958),(-16.390533,13.336859),(-16.411977,13.338528),(-16.489491,13.357123),(-16.52184,13.359036),(-16.515777,13.367865),(-16.503529,13.392564),(-16.501332,13.403062),(-16.503529,13.416938),(-16.513417,13.436754),(-16.515696,13.444322),(-16.519765,13.451321),(-16.538197,13.46483),(-16.544504,13.475898),(-16.554433,13.481838),(-16.556549,13.485582),(-16.556549,13.50609),(-16.548004,13.548082),(-16.549143,13.56387),(-16.554799,13.577053),(-16.561391,13.5869),(-16.561399,13.586914),(-16.498756,13.586665),(-16.436641,13.586459),(-16.374577,13.5862),(-16.312462,13.585994),(-16.250295,13.585735),(-16.188232,13.585528),(-16.126117,13.58527),(-16.085383,13.585168),(-16.064054,13.585115),(-16.001938,13.584908),(-15.939772,13.58465),(-15.877708,13.584443),(-15.815593,13.584185),(-15.753426,13.583978),(-15.691363,13.58372),(-15.629196,13.583513),(-15.567133,13.583255),(-15.518195,13.5831),(-15.502486,13.588267),(-15.50047,13.627981),(-15.49803,13.641522),(-15.496801,13.648341),(-15.488946,13.670329),(-15.478611,13.691258),(-15.467501,13.708286),(-15.43634,13.741178),(-15.394069,13.771512),(-15.347766,13.788643),(-15.304462,13.781873),(-15.295108,13.773191),(-15.27573,13.748051),(-15.267255,13.741798),(-15.245964,13.746733),(-15.17062,13.793784),(-15.097704,13.819984),(-15.07631,13.818951),(-15.016779,13.796885),(-14.915803,13.792441),(-14.879268,13.780581),(-14.860314,13.765595),(-14.843973,13.752676),(-14.831312,13.735623),(-14.822372,13.7172),(-14.802942,13.65232),(-14.796017,13.644698),(-14.754934,13.620384),(-14.74093,13.615449)]
+Guatemala	[(-89.160496,17.814314),(-89.156217,17.598243),(-89.150728,17.321032),(-89.149205,17.036271),(-89.166067,16.777009),(-89.184353,16.495872),(-89.19314,16.392626),(-89.208517,16.186132),(-89.234135,15.954945),(-89.236022,15.906493),(-89.236512,15.893915),(-89.228244,15.880841),(-89.225996,15.884044),(-89.216539,15.888644),(-89.204835,15.892416),(-89.195765,15.892933),(-89.177446,15.900271),(-89.100913,15.896809),(-89.072388,15.901511),(-89.040323,15.901718),(-88.951878,15.879652),(-88.913971,15.893948),(-88.900014,15.887844),(-88.8662,15.860338),(-88.831614,15.868638),(-88.787343,15.859076),(-88.753285,15.839789),(-88.749501,15.818793),(-88.726796,15.815172),(-88.625966,15.753892),(-88.638295,15.708808),(-88.63622,15.702094),(-88.609242,15.702094),(-88.598378,15.706122),(-88.595204,15.714667),(-88.596344,15.722154),(-88.598704,15.723212),(-88.598988,15.727362),(-88.602366,15.730902),(-88.60558,15.735541),(-88.605458,15.743069),(-88.600453,15.744574),(-88.591176,15.743557),(-88.582183,15.745022),(-88.578196,15.753892),(-88.57433,15.769965),(-88.5655,15.780951),(-88.55606,15.789496),(-88.550282,15.798285),(-88.549062,15.813666),(-88.556711,15.837348),(-88.557688,15.852932),(-88.550282,15.852932),(-88.550649,15.842475),(-88.550282,15.83926),(-88.544057,15.83926),(-88.532135,15.846829),(-88.503041,15.841376),(-88.48884,15.846747),(-88.511952,15.86758),(-88.52481,15.877021),(-88.543284,15.885159),(-88.551015,15.895168),(-88.557688,15.906562),(-88.564524,15.914984),(-88.607574,15.938422),(-88.619862,15.953274),(-88.605458,15.969631),(-88.590199,15.961005),(-88.561838,15.949042),(-88.550282,15.942328),(-88.52123,15.912746),(-88.500234,15.901068),(-88.447906,15.85871),(-88.344838,15.811957),(-88.311025,15.782416),(-88.300404,15.777818),(-88.256337,15.740383),(-88.221547,15.725898),(-88.220937,15.725653),(-88.220922,15.725647),(-88.23262,15.721419),(-88.235746,15.712427),(-88.23492,15.701575),(-88.241586,15.688242),(-88.247761,15.695684),(-88.264995,15.688604),(-88.279697,15.680749),(-88.295588,15.675013),(-88.316672,15.6746),(-88.322304,15.667262),(-88.352561,15.616903),(-88.398992,15.572797),(-88.467434,15.52074),(-88.50002,15.495954),(-88.50002,15.495903),(-88.587379,15.4303),(-88.674195,15.365058),(-88.760899,15.299962),(-88.847027,15.235299),(-88.973427,15.140395),(-89.008283,15.124401),(-89.109827,15.091457),(-89.140523,15.076394),(-89.14694,15.071284),(-89.160806,15.060245),(-89.172769,15.04221),(-89.188582,14.996088),(-89.1691,14.978415),(-89.169152,14.95206),(-89.181528,14.923664),(-89.189215,14.913059),(-89.198814,14.899815),(-89.223619,14.879015),(-89.231448,14.867311),(-89.23243,14.8485),(-89.227676,14.834574),(-89.218968,14.82168),(-89.198814,14.79809),(-89.189409,14.783001),(-89.170547,14.738791),(-89.159669,14.725123),(-89.150523,14.717294),(-89.146213,14.710858),(-89.144502,14.708302),(-89.142694,14.691275),(-89.145226,14.683446),(-89.155845,14.672258),(-89.159411,14.665979),(-89.155225,14.615595),(-89.155742,14.597844),(-89.160393,14.581282),(-89.172149,14.570404),(-89.183699,14.569525),(-89.208814,14.577949),(-89.221087,14.580093),(-89.238114,14.577949),(-89.245685,14.572988),(-89.250542,14.565184),(-89.259612,14.554255),(-89.290927,14.528003),(-89.304854,14.513353),(-89.314802,14.495964),(-89.323044,14.487463),(-89.345265,14.48196),(-89.355497,14.475448),(-89.361983,14.4624),(-89.363791,14.446561),(-89.361621,14.415478),(-89.390611,14.435993),(-89.391697,14.43372),(-89.396864,14.426046),(-89.398182,14.445373),(-89.408362,14.441523),(-89.4311,14.418708),(-89.446835,14.415529),(-89.458127,14.419586),(-89.469418,14.425374),(-89.485283,14.427389),(-89.496148,14.422897),(-89.503033,14.420051),(-89.527761,14.391061),(-89.541351,14.381526),(-89.544245,14.400052),(-89.555175,14.410827),(-89.569877,14.412015),(-89.584062,14.401809),(-89.590573,14.385971),(-89.586284,14.374679),(-89.578972,14.364783),(-89.576078,14.35313),(-89.582408,14.343363),(-89.592434,14.336387),(-89.598351,14.32799),(-89.592175,14.31383),(-89.571272,14.311143),(-89.564373,14.308146),(-89.558586,14.302823),(-89.555692,14.299025),(-89.549878,14.288276),(-89.548586,14.2836),(-89.546778,14.268329),(-89.544917,14.261818),(-89.54055,14.257606),(-89.527864,14.251457),(-89.52466,14.247374),(-89.524505,14.231768),(-89.530939,14.225567),(-89.638322,14.200556),(-89.664626,14.188851),(-89.689844,14.170015),(-89.709868,14.148724),(-89.752605,14.07524),(-89.755447,14.067075),(-89.754465,14.059401),(-89.74801,14.044895),(-89.747256,14.043201),(-89.747644,14.037646),(-89.762268,14.029997),(-89.776944,14.035785),(-89.802963,14.055474),(-89.821102,14.060073),(-89.835855,14.059091),(-89.880116,14.042684),(-89.890788,14.035889),(-89.912078,14.015192),(-90.008171,13.949692),(-90.022976,13.936954),(-90.031477,13.922924),(-90.038091,13.908377),(-90.047367,13.894295),(-90.05964,13.884709),(-90.08708,13.870472),(-90.099044,13.858509),(-90.106976,13.844066),(-90.112299,13.828253),(-90.114779,13.812),(-90.114314,13.796265),(-90.092982,13.728903),(-90.098328,13.731414),(-90.245553,13.790726),(-90.401159,13.858588),(-90.500209,13.8947),(-90.580413,13.913267),(-90.638019,13.922358),(-90.707278,13.928889),(-90.784615,13.921538),(-90.796247,13.918161),(-90.910333,13.911135),(-91.04374,13.913585),(-91.165761,13.926703),(-91.316461,13.955679),(-91.551869,14.057278),(-91.637115,14.104438),(-91.762558,14.180174),(-91.908193,14.28384),(-92.049591,14.408026),(-92.246234,14.546283),(-92.226097,14.549346),(-92.208062,14.570507),(-92.186074,14.629573),(-92.164731,14.66815),(-92.160804,14.683498),(-92.161734,14.702334),(-92.179382,14.751581),(-92.180105,14.75879),(-92.178813,14.773389),(-92.179382,14.781244),(-92.188658,14.805893),(-92.190828,14.814239),(-92.191655,14.835297),(-92.186797,14.84726),(-92.166023,14.870825),(-92.15468,14.900797),(-92.157574,14.963041),(-92.154215,14.995933),(-92.142356,15.007483),(-92.129876,15.010945),(-92.116982,15.012392),(-92.103831,15.01787),(-92.093599,15.02942),(-92.073807,15.073706),(-92.20336,15.237159),(-92.21093,15.253359),(-92.211292,15.272066),(-92.204651,15.289507),(-92.186177,15.320384),(-92.137446,15.401826),(-92.105931,15.454469),(-92.068536,15.516935),(-91.9896,15.648968),(-91.910561,15.78095),(-91.841676,15.896085),(-91.792971,15.977579),(-91.774471,16.00843),(-91.751888,16.046308),(-91.739848,16.060985),(-91.723776,16.068788),(-91.678405,16.068891),(-91.54048,16.069149),(-91.402607,16.069305),(-91.264786,16.069511),(-91.126914,16.06977),(-90.994798,16.069869),(-90.988989,16.069873),(-90.851116,16.070131),(-90.713295,16.070338),(-90.575474,16.070596),(-90.485738,16.0707),(-90.466153,16.072922),(-90.448195,16.07926),(-90.448144,16.079278),(-90.447841,16.079687),(-90.444165,16.084652),(-90.437421,16.098863),(-90.434475,16.107183),(-90.440211,16.104858),(-90.442743,16.104186),(-90.444526,16.103256),(-90.448144,16.099742),(-90.455585,16.099742),(-90.459487,16.116795),(-90.435302,16.136277),(-90.448144,16.148214),(-90.448144,16.154416),(-90.42613,16.163149),(-90.432718,16.173226),(-90.461812,16.189142),(-90.465584,16.208107),(-90.458505,16.22175),(-90.446232,16.230845),(-90.434475,16.236323),(-90.447989,16.24149),(-90.457833,16.249138),(-90.459435,16.25906),(-90.448144,16.271101),(-90.443725,16.266864),(-90.440625,16.265313),(-90.42768,16.263608),(-90.431426,16.268931),(-90.437524,16.280041),(-90.441297,16.285364),(-90.436749,16.284847),(-90.435509,16.286242),(-90.435509,16.288774),(-90.434475,16.291565),(-90.428558,16.287637),(-90.420238,16.285364),(-90.414063,16.287844),(-90.414011,16.298386),(-90.420187,16.296009),(-90.434734,16.301228),(-90.444888,16.30836),(-90.437886,16.31208),(-90.419463,16.317816),(-90.404684,16.331511),(-90.398793,16.347582),(-90.40719,16.36045),(-90.414011,16.36045),(-90.414011,16.353008),(-90.420807,16.353008),(-90.418223,16.367167),(-90.40874,16.372335),(-90.395124,16.371405),(-90.379853,16.367271),(-90.391377,16.385978),(-90.392695,16.391714),(-90.392902,16.40484),(-90.394917,16.419206),(-90.400601,16.420549),(-90.409464,16.416673),(-90.420807,16.415123),(-90.426698,16.417707),(-90.434114,16.42241),(-90.444371,16.426802),(-90.475842,16.430729),(-90.478426,16.436414),(-90.477082,16.444992),(-90.482302,16.456051),(-90.488219,16.46158),(-90.497753,16.46804),(-90.508915,16.471089),(-90.532893,16.459927),(-90.539068,16.468867),(-90.543719,16.490209),(-90.553409,16.490261),(-90.57935,16.482768),(-90.584724,16.480235),(-90.590616,16.483388),(-90.604672,16.486178),(-90.620743,16.486747),(-90.633094,16.483336),(-90.627874,16.492896),(-90.618986,16.500079),(-90.612061,16.507624),(-90.61263,16.518114),(-90.624154,16.524936),(-90.639502,16.525866),(-90.648183,16.529586),(-90.639967,16.544831),(-90.643532,16.561006),(-90.637021,16.577904),(-90.633765,16.592167),(-90.647356,16.600073),(-90.65025,16.593407),(-90.653609,16.5901),(-90.658828,16.588446),(-90.6672,16.586999),(-90.6672,16.5932),(-90.654023,16.61661),(-90.667717,16.652576),(-90.73531,16.746576),(-90.749779,16.757686),(-90.785591,16.774998),(-90.80037,16.786832),(-90.79696,16.798666),(-90.79696,16.805435),(-90.810602,16.812928),(-90.819956,16.805332),(-90.831738,16.805435),(-90.900623,16.826003),(-90.919071,16.836338),(-90.948165,16.864708),(-90.968887,16.874372),(-90.952764,16.890908),(-90.955193,16.898763),(-90.968835,16.901037),(-90.98625,16.901088),(-90.987956,16.896903),(-90.984287,16.887756),(-90.983253,16.878609),(-90.993072,16.874372),(-90.998343,16.877162),(-91.0109,16.890288),(-91.016688,16.894836),(-91.054928,16.908013),(-91.066866,16.918193),(-91.07131,16.938916),(-91.076943,16.949509),(-91.112238,16.990489),(-91.116113,16.999274),(-91.121229,17.018394),(-91.126552,17.024595),(-91.137146,17.026507),(-91.161227,17.023975),(-91.1712,17.028006),(-91.206754,17.065368),(-91.215952,17.079217),(-91.220241,17.089294),(-91.225357,17.107019),(-91.229595,17.113995),(-91.238793,17.119215),(-91.259205,17.124331),(-91.263133,17.130738),(-91.265148,17.146241),(-91.270832,17.164276),(-91.279514,17.180089),(-91.290418,17.189081),(-91.317755,17.190476),(-91.344523,17.186342),(-91.364884,17.189753),(-91.372945,17.213576),(-91.388345,17.221586),(-91.419247,17.227735),(-91.442502,17.237967),(-91.438264,17.253677),(-91.430771,17.254969),(-90.991986,17.25192),(-90.991444,17.526942),(-90.990901,17.801964),(-90.98284,17.810542),(-90.962221,17.81602),(-90.919123,17.81602),(-90.699239,17.815813),(-90.47946,17.815606),(-90.259654,17.815348),(-90.039771,17.815141),(-89.820017,17.814986),(-89.600159,17.814728),(-89.380302,17.814521),(-89.160496,17.814314)]
+Guam	[(144.886404,13.640204),(144.896658,13.617987),(144.914317,13.605414),(144.934418,13.59984),(144.951915,13.598578),(144.952159,13.586859),(144.937673,13.560533),(144.906993,13.516669),(144.871837,13.485175),(144.808279,13.445787),(144.783458,13.420478),(144.769379,13.379136),(144.760102,13.285631),(144.735606,13.249172),(144.718028,13.241848),(144.69752,13.241034),(144.680675,13.246772),(144.670421,13.264838),(144.656749,13.28205),(144.653575,13.287014),(144.647472,13.324897),(144.644298,13.33161),(144.639496,13.33747),(144.633637,13.342108),(144.626313,13.345364),(144.636567,13.355414),(144.643077,13.365709),(144.646495,13.378485),(144.647472,13.396226),(144.645518,13.404486),(144.640473,13.414781),(144.634776,13.423529),(144.624197,13.43122),(144.628673,13.438788),(144.636485,13.443101),(144.640636,13.437812),(144.65447,13.439154),(144.714854,13.473456),(144.72877,13.485582),(144.783458,13.516669),(144.794119,13.527086),(144.803233,13.53913),(144.811209,13.553616),(144.832205,13.620673),(144.838634,13.632758),(144.850434,13.643744),(144.86671,13.653022),(144.880626,13.65412),(144.886404,13.640204)]
+Heard Island and McDonald Islands	[(73.735118,-53.1124),(73.761892,-53.11891),(73.789073,-53.120538),(73.812185,-53.118504),(73.661632,-53.146661),(73.609548,-53.179864),(73.580821,-53.187595),(73.507335,-53.19256),(73.473399,-53.189223),(73.440196,-53.173272),(73.430431,-53.165297),(73.404145,-53.139337),(73.370942,-53.090509),(73.36378,-53.074802),(73.371267,-53.06463),(73.359711,-53.058852),(73.353282,-53.05169),(73.354177,-53.044203),(73.364431,-53.037286),(73.344737,-53.029229),(73.328868,-53.025079),(73.271007,-53.021742),(73.253673,-53.015069),(73.24171,-53.002211),(73.236013,-52.982029),(73.269379,-52.975274),(73.296886,-52.961602),(73.330903,-52.984796),(73.337169,-52.985772),(73.344574,-52.996515),(73.361095,-53.00921),(73.377452,-53.017022),(73.384939,-53.013116),(73.389171,-52.997817),(73.399587,-52.990981),(73.412934,-52.992852),(73.426524,-53.003188),(73.412852,-53.009373),(73.425629,-53.025323),(73.447032,-53.02809),(73.470225,-53.02158),(73.487966,-53.009373),(73.50766,-53.015313),(73.56422,-53.016778),(73.587576,-53.026788),(73.598481,-53.033868),(73.620942,-53.039646),(73.632579,-53.044122),(73.640147,-53.050714),(73.65561,-53.067966),(73.663341,-53.071466),(73.688975,-53.090265),(73.699474,-53.100844),(73.735118,-53.1124)]
+Hungary	[(20.981489,48.516859),(21.0065,48.518151),(21.035956,48.514637),(21.063861,48.506239),(21.084015,48.49301),(21.109336,48.489109),(21.186748,48.513707),(21.219924,48.518719),(21.238011,48.513448),(21.250413,48.506498),(21.261782,48.50319),(21.276561,48.50872),(21.28824,48.519934),(21.293925,48.530579),(21.302296,48.539907),(21.32183,48.54758),(21.338573,48.549854),(21.372679,48.550345),(21.424563,48.561275),(21.439135,48.558329),(21.472725,48.544997),(21.490812,48.540268),(21.49939,48.535075),(21.506005,48.526496),(21.5151,48.507118),(21.521818,48.50009),(21.537734,48.495232),(21.574631,48.495568),(21.591684,48.49301),(21.600366,48.481641),(21.613388,48.440352),(21.621553,48.429655),(21.67757,48.372346),(21.701238,48.353949),(21.727697,48.340901),(21.759012,48.333769),(21.789398,48.335526),(21.841178,48.353174),(21.884276,48.357463),(21.914765,48.36909),(21.929338,48.372914),(21.981531,48.374723),(21.999928,48.37896),(22.018015,48.379735),(22.077856,48.375808),(22.09646,48.379425),(22.113926,48.38865),(22.13284,48.404798),(22.156508,48.40206),(22.158263,48.402222),(22.158315,48.402227),(22.159298,48.402318),(22.16922,48.409527),(22.201983,48.418157),(22.236089,48.415289),(22.271849,48.403455),(22.256967,48.373224),(22.25676,48.357282),(22.284355,48.358393),(22.29128,48.357566),(22.298721,48.349143),(22.298721,48.339324),(22.296447,48.327801),(22.297378,48.314003),(22.308126,48.293694),(22.357116,48.243103),(22.363627,48.23871),(22.370861,48.237393),(22.378613,48.238865),(22.386468,48.243051),(22.390498,48.244343),(22.394529,48.244757),(22.398767,48.244343),(22.418404,48.238969),(22.434217,48.236747),(22.44972,48.237677),(22.469047,48.244136),(22.473284,48.244498),(22.477418,48.24393),(22.481449,48.242586),(22.55576,48.177164),(22.568886,48.156519),(22.583045,48.124816),(22.600098,48.101122),(22.605472,48.097039),(22.608056,48.096833),(22.621182,48.101768),(22.693219,48.101768),(22.711616,48.105824),(22.728566,48.113137),(22.745722,48.116289),(22.762052,48.109261),(22.765566,48.104533),(22.801429,48.090968),(22.830988,48.072442),(22.844321,48.061047),(22.85476,48.047301),(22.861581,48.028387),(22.857964,48.018026),(22.851349,48.008802),(22.849489,47.993144),(22.832435,47.978933),(22.840807,47.966789),(22.877601,47.946739),(22.861167,47.933819),(22.836053,47.902452),(22.819723,47.892323),(22.779622,47.882298),(22.763602,47.874753),(22.752854,47.86124),(22.753267,47.852687),(22.758331,47.846228),(22.760295,47.838916),(22.75182,47.827676),(22.745826,47.824989),(22.724225,47.82349),(22.703864,47.817186),(22.691669,47.8107),(22.666967,47.78879),(22.637719,47.771555),(22.601235,47.760936),(22.562994,47.757215),(22.528475,47.761039),(22.454371,47.787394),(22.423675,47.782563),(22.407345,47.743082),(22.395873,47.735692),(22.382644,47.732023),(22.368278,47.73117),(22.322079,47.735873),(22.309366,47.735046),(22.29159,47.730705),(22.27309,47.723755),(22.261721,47.715848),(22.23981,47.693472),(22.232162,47.688253),(22.215212,47.679933),(22.207874,47.673732),(22.204153,47.666291),(22.200743,47.647945),(22.197642,47.639315),(22.172837,47.615389),(22.16984,47.608775),(22.169117,47.601385),(22.167608,47.594862),(22.16736,47.593789),(22.162089,47.586244),(22.154177,47.582213),(22.148549,47.579345),(22.09956,47.570948),(22.037445,47.539322),(22.007886,47.517411),(21.988869,47.492942),(21.991453,47.461807),(22.000238,47.427184),(22.001582,47.393827),(21.981531,47.366102),(21.936986,47.357162),(21.919003,47.349669),(21.900813,47.335742),(21.862159,47.297424),(21.856061,47.285745),(21.844589,47.249934),(21.839318,47.240839),(21.827742,47.226007),(21.823608,47.214923),(21.823298,47.203321),(21.825675,47.194278),(21.825985,47.185054),(21.819887,47.172729),(21.811516,47.164693),(21.789398,47.150301),(21.77989,47.140741),(21.775446,47.131672),(21.770485,47.114025),(21.763767,47.105214),(21.74351,47.091597),(21.69421,47.069169),(21.671886,47.054726),(21.632819,47.022686),(21.63427,47.019422),(21.636643,47.014082),(21.645221,47.01124),(21.654833,47.009948),(21.661757,47.006072),(21.670749,46.994394),(21.671369,46.99336),(21.667545,46.992378),(21.648528,46.942976),(21.640053,46.935689),(21.594371,46.910006),(21.589927,46.908869),(21.588687,46.906182),(21.587137,46.8944),(21.588067,46.882204),(21.591477,46.871533),(21.591788,46.860707),(21.583416,46.847943),(21.573081,46.841767),(21.536597,46.835023),(21.51572,46.821588),(21.502904,46.80531),(21.48151,46.764976),(21.477066,46.760222),(21.473655,46.754873),(21.471381,46.749034),(21.470451,46.743014),(21.472622,46.740197),(21.475206,46.737846),(21.478203,46.735934),(21.505178,46.723247),(21.501767,46.703507),(21.483577,46.684852),(21.463527,46.677049),(21.436241,46.673741),(21.425493,46.662011),(21.423539,46.658231),(21.416811,46.645216),(21.396037,46.626354),(21.374436,46.618448),(21.337643,46.620411),(21.316249,46.616639),(21.300953,46.603926),(21.295268,46.585039),(21.291341,46.546721),(21.278938,46.528401),(21.261679,46.513338),(21.247623,46.497473),(21.245142,46.47688),(21.274391,46.438355),(21.280695,46.416393),(21.257544,46.404171),(21.21517,46.402905),(21.195636,46.398099),(21.17879,46.384457),(21.168661,46.362753),(21.164527,46.318259),(21.155949,46.298932),(21.144476,46.283739),(21.134865,46.27852),(21.105616,46.278675),(21.099208,46.27635),(21.051459,46.236094),(21.033475,46.231339),(21.013942,46.24307),(21.007017,46.248858),(20.999162,46.251597),(20.990584,46.251597),(20.981489,46.248858),(20.961748,46.248341),(20.924438,46.259555),(20.906558,46.26219),(20.899737,46.260692),(20.885061,46.255007),(20.875139,46.254387),(20.866974,46.257126),(20.848991,46.267771),(20.839689,46.271079),(20.819638,46.271699),(20.798658,46.267616),(20.787369,46.26339),(20.778504,46.260072),(20.739333,46.237489),(20.734992,46.231908),(20.735509,46.222503),(20.744811,46.200282),(20.744707,46.192272),(20.736646,46.186691),(20.727137,46.187725),(20.717836,46.189998),(20.710291,46.188086),(20.70533,46.180645),(20.704368,46.168526),(20.704193,46.16633),(20.698819,46.15646),(20.683523,46.144678),(20.663989,46.137753),(20.607558,46.129485),(20.600117,46.12964),(20.588025,46.132844),(20.578103,46.137547),(20.548957,46.15615),(20.509373,46.167674),(20.468549,46.174134),(20.444157,46.1469),(20.283237,46.1438),(20.242826,46.108091),(20.188462,46.140389),(20.170479,46.145505),(20.145364,46.137082),(20.138026,46.136461),(20.130378,46.139355),(20.120146,46.149226),(20.114772,46.152223),(20.098442,46.154962),(20.088623,46.154135),(20.063405,46.145298),(20.034983,46.142973),(19.993125,46.159406),(19.92915,46.16354),(19.888946,46.15739),(19.873649,46.152992),(19.79045,46.129072),(19.772984,46.131552),(19.711889,46.15871),(19.690095,46.168398),(19.669321,46.1731),(19.647824,46.173875),(19.589739,46.165969),(19.568449,46.166434),(19.549948,46.16416),(19.525247,46.156409),(19.501993,46.145608),(19.487523,46.134239),(19.48928,46.126023),(19.496722,46.116876),(19.499305,46.108608),(19.47295,46.098686),(19.465922,46.091968),(19.460858,46.084475),(19.453727,46.07755),(19.43688,46.06799),(19.428302,46.06551),(19.417243,46.064321),(19.404738,46.060239),(19.396573,46.051557),(19.389131,46.041532),(19.378899,46.033677),(19.362156,46.029646),(19.325156,46.029491),(19.306966,46.026649),(19.298315,46.022123),(19.286915,46.016159),(19.279474,46.003808),(19.274823,45.991612),(19.263454,45.981432),(19.235652,45.977711),(19.148009,45.984068),(19.125788,45.993111),(19.125788,45.993266),(19.111009,46.012955),(19.088478,46.018846),(19.06543,46.012025),(19.049721,45.993111),(19.048584,45.963449),(19.03091,45.960038),(19.005589,45.96257),(18.981818,45.950788),(18.978717,45.947171),(18.977684,45.943502),(18.97882,45.939781),(18.986469,45.931254),(18.988742,45.927017),(18.987502,45.923813),(18.981818,45.921849),(18.962697,45.927947),(18.901306,45.931203),(18.886526,45.930428),(18.876604,45.922418),(18.865442,45.918077),(18.845392,45.913943),(18.828339,45.905726),(18.822451,45.905582),(18.817797,45.905468),(18.804878,45.913633),(18.794852,45.903039),(18.790408,45.893892),(18.785964,45.886916),(18.775525,45.882834),(18.76333,45.88397),(18.723849,45.89844),(18.674343,45.910377),(18.655636,45.907587),(18.633002,45.891929),(18.629281,45.886864),(18.626284,45.874824),(18.623597,45.868674),(18.62215,45.868416),(18.60737,45.856685),(18.585459,45.82692),(18.57347,45.816688),(18.530269,45.79085),(18.504224,45.784028),(18.481797,45.791418),(18.465467,45.783718),(18.43074,45.753642),(18.411723,45.743204),(18.404385,45.741809),(18.397564,45.741343),(18.390743,45.741809),(18.384128,45.7431),(18.383818,45.743204),(18.367178,45.75819),(18.351158,45.758397),(18.334932,45.751989),(18.317672,45.747286),(18.300516,45.751834),(18.283256,45.764908),(18.260518,45.765115),(18.229822,45.781238),(18.211219,45.785372),(18.12895,45.785372),(18.120165,45.783408),(18.102905,45.774623),(18.092053,45.771729),(18.080477,45.771729),(17.975367,45.792141),(17.906234,45.792141),(17.889791,45.792141),(17.88049,45.788524),(17.875735,45.780669),(17.870051,45.773486),(17.858062,45.771729),(17.857959,45.775863),(17.838218,45.799635),(17.809176,45.814414),(17.687323,45.840614),(17.664689,45.841647),(17.656524,45.84542),(17.654669,45.852113),(17.653217,45.857357),(17.65208,45.868829),(17.646912,45.883712),(17.645775,45.891825),(17.638437,45.901334),(17.591102,45.936215),(17.554308,45.947791),(17.511933,45.95394),(17.426667,45.956731),(17.418192,45.95301),(17.415402,45.949703),(17.411578,45.946602),(17.406203,45.943657),(17.399692,45.959935),(17.38915,45.963087),(17.365276,45.956731),(17.345328,45.955697),(17.342124,45.958643),(17.343675,45.967531),(17.337887,45.984636),(17.327138,45.972027),(17.316596,45.973784),(17.306613,45.979914),(17.304814,45.981019),(17.290138,45.984636),(17.290138,45.991457),(17.296959,45.992646),(17.309362,45.996625),(17.316803,45.997659),(17.307811,46.006392),(17.291482,46.007942),(17.275875,46.012025),(17.268951,46.028716),(17.266574,46.038793),(17.254068,46.070832),(17.24859,46.080238),(17.208593,46.116566),(17.197327,46.121165),(17.116195,46.123129),(17.101209,46.128193),(17.052943,46.153463),(17.041264,46.162196),(17.036303,46.172997),(17.028035,46.18049),(16.974808,46.210565),(16.9653,46.219454),(16.940702,46.251493),(16.903288,46.281931),(16.896054,46.286271),(16.889232,46.292163),(16.879312,46.312062),(16.871766,46.327199),(16.875073,46.342857),(16.865461,46.359135),(16.859411,46.364758),(16.850475,46.373062),(16.837659,46.381873),(16.832388,46.381925),(16.830218,46.377351),(16.827531,46.374018),(16.820916,46.3781),(16.816575,46.381976),(16.812338,46.385025),(16.807894,46.387351),(16.803449,46.388694),(16.776474,46.39288),(16.769343,46.39611),(16.761901,46.381873),(16.75508,46.381873),(16.742885,46.399624),(16.712395,46.412672),(16.693585,46.429622),(16.677462,46.44869),(16.659272,46.464193),(16.637671,46.474477),(16.61111,46.478069),(16.602118,46.482048),(16.594263,46.482978),(16.588062,46.479567),(16.583721,46.470653),(16.577623,46.470653),(16.564291,46.479929),(16.521089,46.498532),(16.515302,46.501711),(16.500832,46.544809),(16.467139,46.564704),(16.430242,46.604392),(16.394585,46.619016),(16.376395,46.629093),(16.372246,46.636341),(16.368437,46.642994),(16.377636,46.652864),(16.396652,46.659143),(16.402607,46.663109),(16.410502,46.668367),(16.405024,46.687255),(16.390038,46.694154),(16.371434,46.694929),(16.366216,46.696467),(16.365383,46.696712),(16.357585,46.699011),(16.357275,46.715832),(16.343426,46.714178),(16.334124,46.721749),(16.325546,46.733273),(16.314177,46.743324),(16.300431,46.772082),(16.298157,46.775802),(16.29949,46.77951),(16.302188,46.787016),(16.311097,46.797519),(16.3149,46.802002),(16.321825,46.813268),(16.327509,46.825463),(16.329783,46.834403),(16.325339,46.839442),(16.310663,46.84001),(16.301878,46.843214),(16.297392,46.847033),(16.282241,46.859932),(16.272009,46.863962),(16.179486,46.858468),(16.135376,46.855849),(16.130246,46.856708),(16.094035,46.862774),(16.110055,46.867916),(16.122871,46.876365),(16.159148,46.910316),(16.170723,46.918533),(16.196148,46.931297),(16.217025,46.937395),(16.22395,46.941064),(16.230668,46.94835),(16.231185,46.954422),(16.230358,46.959977),(16.232942,46.966075),(16.24307,46.972018),(16.252992,46.973516),(16.261054,46.97809),(16.265394,46.993257),(16.274903,47.004315),(16.288545,47.005582),(16.325856,47.00044),(16.366577,47.003825),(16.387764,47.002042),(16.405024,46.993153),(16.410398,46.990415),(16.415566,46.989433),(16.420424,46.99026),(16.424764,46.992998),(16.424764,46.993102),(16.441404,46.99522),(16.467449,46.995427),(16.486363,46.998554),(16.481919,47.00938),(16.467553,47.018423),(16.45329,47.021679),(16.424661,47.024082),(16.437167,47.031782),(16.481919,47.04421),(16.493184,47.049145),(16.497215,47.054622),(16.493701,47.059816),(16.481919,47.063898),(16.461765,47.068498),(16.454323,47.081701),(16.460835,47.0963),(16.481919,47.10524),(16.50476,47.125833),(16.509514,47.137537),(16.497318,47.149681),(16.480885,47.150767),(16.447089,47.139708),(16.433653,47.145754),(16.433963,47.151283),(16.442128,47.168336),(16.441818,47.177121),(16.4351,47.183581),(16.426728,47.184124),(16.41877,47.183659),(16.412776,47.187173),(16.409262,47.203683),(16.424661,47.225594),(16.421354,47.243035),(16.421354,47.243061),(16.421354,47.243138),(16.452463,47.254584),(16.466622,47.263421),(16.473237,47.276805),(16.469206,47.293238),(16.43882,47.336569),(16.436133,47.338559),(16.431689,47.339721),(16.427142,47.341375),(16.424351,47.345199),(16.424971,47.351116),(16.429312,47.353803),(16.434273,47.35556),(16.436443,47.358506),(16.433963,47.39685),(16.444091,47.40951),(16.456597,47.411836),(16.46993,47.405531),(16.481919,47.392302),(16.589406,47.425633),(16.626973,47.445549),(16.640875,47.452919),(16.636845,47.4932),(16.648213,47.501546),(16.677359,47.509866),(16.688004,47.52263),(16.689141,47.53803),(16.68139,47.550561),(16.66754,47.560096),(16.65059,47.566555),(16.656172,47.585934),(16.647697,47.606139),(16.63023,47.622004),(16.608422,47.628773),(16.575453,47.624949),(16.509617,47.64314),(16.481919,47.638954),(16.425901,47.654276),(16.407815,47.66133),(16.4166,47.668823),(16.431792,47.685463),(16.43913,47.690475),(16.444918,47.68554),(16.449879,47.682414),(16.45453,47.681768),(16.461145,47.684532),(16.47303,47.691767),(16.512924,47.706004),(16.521399,47.711533),(16.526877,47.720137),(16.52512,47.733315),(16.531115,47.742978),(16.567805,47.754192),(16.609766,47.750627),(16.689865,47.729568),(16.702474,47.7236),(16.707848,47.714608),(16.711569,47.704066),(16.719217,47.693731),(16.730379,47.685902),(16.741128,47.681458),(16.797455,47.675463),(16.80624,47.676884),(16.817299,47.684248),(16.836936,47.705358),(16.850165,47.712929),(16.864738,47.686729),(16.902668,47.682026),(16.98194,47.695436),(17.054804,47.702025),(17.075371,47.708484),(17.064002,47.71329),(17.055527,47.720913),(17.050566,47.730989),(17.048706,47.763649),(17.041988,47.783906),(17.040644,47.801114),(17.05563,47.812354),(17.049119,47.818684),(17.039507,47.837365),(17.031652,47.841345),(17.010672,47.847882),(17.004367,47.852377),(17.004057,47.863281),(17.016563,47.867699),(17.051186,47.872893),(17.067619,47.881626),(17.077541,47.891729),(17.083329,47.904829),(17.087463,47.922632),(17.085396,47.924621),(17.080125,47.925758),(17.075164,47.927773),(17.07413,47.932114),(17.076818,47.934956),(17.086119,47.93922),(17.088083,47.940899),(17.090874,47.949477),(17.095731,47.95573),(17.096145,47.961931),(17.085603,47.970148),(17.148338,48.005443),(17.184821,48.020274),(17.220892,48.015055),(17.262316,48.007283),(17.272671,48.00534),(17.337887,47.998725),(17.36941,47.981207),(17.472039,47.888809),(17.481858,47.882711),(17.492193,47.879818),(17.517308,47.876252),(17.526609,47.872118),(17.560406,47.837986),(17.572601,47.829536),(17.582937,47.829795),(17.592962,47.833102),(17.604227,47.834239),(17.61911,47.829226),(17.639884,47.819201),(17.658384,47.807316),(17.666239,47.797032),(17.676678,47.789177),(17.719245,47.773669),(17.741997,47.76538),(17.825713,47.750006),(17.883532,47.752521),(18.11262,47.762486),(18.23592,47.753882),(18.273024,47.756259),(18.347851,47.776775),(18.552593,47.792846),(18.597448,47.79065),(18.633829,47.779824),(18.663698,47.775896),(18.692843,47.777963),(18.717234,47.788118),(18.750307,47.81362),(18.767671,47.822302),(18.790305,47.826332),(18.814916,47.832194),(18.816453,47.83256),(18.778006,47.851447),(18.748757,47.870723),(18.742246,47.889455),(18.744726,47.910513),(18.754751,47.951803),(18.751444,47.963353),(18.744519,47.967357),(18.743176,47.971052),(18.756198,47.981827),(18.765293,47.985393),(18.784724,47.987615),(18.794232,47.993144),(18.821001,48.030454),(18.838467,48.040015),(18.933595,48.054349),(18.981818,48.061615),(18.996494,48.066214),(19.019017,48.065497),(19.038662,48.064871),(19.098503,48.070736),(19.222526,48.060582),(19.233482,48.06208),(19.29322,48.087764),(19.428199,48.085852),(19.481735,48.111328),(19.483286,48.116496),(19.483803,48.121767),(19.483286,48.127193),(19.481735,48.13267),(19.481425,48.133342),(19.481219,48.133962),(19.481425,48.134427),(19.481735,48.134892),(19.493621,48.150705),(19.503026,48.189411),(19.513982,48.203958),(19.531241,48.21065),(19.623226,48.227006),(19.633871,48.226773),(19.643896,48.224809),(19.655265,48.21835),(19.676969,48.200392),(19.686994,48.196904),(19.73309,48.202899),(19.756551,48.200315),(19.774327,48.185897),(19.774844,48.176079),(19.76916,48.167449),(19.766679,48.159),(19.776084,48.149517),(19.785593,48.14869),(19.821663,48.157914),(19.846261,48.152669),(19.884295,48.129621),(19.905069,48.124299),(19.928633,48.130087),(19.973902,48.158379),(19.99695,48.167914),(20.034983,48.175872),(20.038303,48.177233),(20.078082,48.193545),(20.096995,48.198429),(20.105263,48.202795),(20.112601,48.211735),(20.118079,48.229719),(20.122006,48.236747),(20.134512,48.246669),(20.14309,48.247805),(20.153322,48.245273),(20.170892,48.244033),(20.187636,48.248994),(20.217815,48.267598),(20.22908,48.270905),(20.249027,48.264187),(20.260293,48.255893),(20.272385,48.252456),(20.295226,48.260415),(20.324268,48.279948),(20.349279,48.305476),(20.370157,48.334338),(20.409017,48.413713),(20.420593,48.429241),(20.435579,48.442393),(20.465968,48.46379),(20.468239,48.465389),(20.481674,48.478747),(20.482501,48.482261),(20.482915,48.485827),(20.482811,48.489367),(20.482191,48.492881),(20.480227,48.510218),(20.480538,48.518538),(20.481674,48.526083),(20.51051,48.533783),(20.572522,48.536573),(20.784085,48.569052),(20.800311,48.569233),(20.815814,48.563807),(20.845477,48.545823),(20.859946,48.543317),(20.891365,48.541095),(20.945832,48.518978),(20.981489,48.516859)]
+Isle of Man	[(-4.612131,54.056952),(-4.620758,54.069648),(-4.631256,54.070624),(-4.643219,54.066596),(-4.656402,54.063788),(-4.67101,54.067043),(-4.689687,54.081529),(-4.704498,54.084866),(-4.725982,54.079006),(-4.745595,54.067369),(-4.766225,54.059231),(-4.790151,54.063788),(-4.790151,54.071234),(-4.78482,54.073065),(-4.781321,54.074774),(-4.777089,54.076239),(-4.769683,54.07746),(-4.770863,54.096829),(-4.737172,54.124905),(-4.728139,54.142564),(-4.727651,54.172593),(-4.723785,54.185452),(-4.714467,54.200344),(-4.71109,54.209906),(-4.71227,54.21662),(-4.710276,54.220649),(-4.68814,54.223782),(-4.663971,54.233547),(-4.643056,54.249416),(-4.612457,54.265448),(-4.598378,54.276597),(-4.554596,54.339179),(-4.530995,54.366116),(-4.495351,54.385891),(-4.442006,54.404364),(-4.404449,54.409654),(-4.385732,54.415717),(-4.367787,54.419013),(-4.351308,54.413804),(-4.357086,54.3994),(-4.377553,54.361884),(-4.3756,54.348334),(-4.370229,54.340888),(-4.363759,54.324286),(-4.358225,54.317613),(-4.350494,54.314765),(-4.332183,54.313422),(-4.324696,54.310207),(-4.319407,54.304592),(-4.313222,54.2956),(-4.31192,54.287177),(-4.320953,54.283515),(-4.326731,54.280341),(-4.34081,54.263007),(-4.348256,54.259508),(-4.35436,54.251532),(-4.359771,54.242255),(-4.365631,54.235053),(-4.371816,54.231269),(-4.399159,54.222073),(-4.390777,54.194729),(-4.412587,54.18008),(-4.446889,54.169135),(-4.475494,54.153144),(-4.474599,54.140815),(-4.529286,54.119086),(-4.543772,54.108466),(-4.549794,54.100653),(-4.563832,54.096829),(-4.579579,54.094428),(-4.590932,54.091051),(-4.598948,54.083889),(-4.612131,54.056952)]
+Iraq	[(42.89674,37.324906),(42.937048,37.320152),(42.979629,37.331831),(43.005158,37.347256),(43.043501,37.360253),(43.083706,37.368831),(43.114815,37.371131),(43.131971,37.367255),(43.263385,37.310695),(43.270309,37.30868),(43.278629,37.30775),(43.287518,37.309145),(43.296871,37.316741),(43.305656,37.319971),(43.324156,37.322219),(43.336145,37.32023),(43.362505,37.303908),(43.376039,37.295528),(43.41676,37.279173),(43.463269,37.248684),(43.479599,37.243361),(43.492415,37.244756),(43.517116,37.252301),(43.529518,37.253903),(43.542437,37.252301),(43.550602,37.248735),(43.568896,37.237702),(43.594217,37.22946),(43.618298,37.226979),(43.720824,37.232612),(43.746921,37.230648),(43.770641,37.225843),(43.780562,37.220365),(43.80206,37.20357),(43.809398,37.199694),(43.822007,37.202381),(43.83999,37.217109),(43.89363,37.224912),(43.924171,37.253076),(43.953782,37.287467),(43.990369,37.312504),(44.035586,37.31824),(44.069025,37.313727),(44.088037,37.31116),(44.184465,37.279173),(44.206893,37.26752),(44.223171,37.254058),(44.235005,37.236772),(44.243532,37.213828),(44.248544,37.191917),(44.249629,37.179437),(44.248337,37.16967),(44.240121,37.157966),(44.230199,37.154322),(44.218779,37.152617),(44.205963,37.146623),(44.18922,37.129208),(44.180641,37.108925),(44.180021,37.087608),(44.187463,37.066938),(44.22777,36.994125),(44.234281,36.983661),(44.243273,36.97777),(44.284821,36.969166),(44.297223,36.969941),(44.306628,36.977227),(44.315879,36.99397),(44.315982,36.99397),(44.316137,36.994022),(44.316137,36.994125),(44.33164,37.015468),(44.335154,37.031152),(44.343112,37.042443),(44.428068,37.064767),(44.454423,37.076343),(44.479228,37.092001),(44.503412,37.116624),(44.539379,37.143677),(44.57824,37.166415),(44.610279,37.178352),(44.628934,37.179024),(44.733786,37.167242),(44.753836,37.159154),(44.766135,37.14192),(44.752544,37.113136),(44.752699,37.103318),(44.760658,37.085644),(44.766549,37.078952),(44.773628,37.076343),(44.781121,37.074482),(44.788356,37.070245),(44.792232,37.063734),(44.797296,37.048489),(44.801895,37.043528),(44.811197,37.041926),(44.830938,37.046835),(44.840601,37.047197),(44.847577,37.044045),(44.858946,37.034123),(44.880754,37.024925),(44.887368,37.015933),(44.885715,37.005081),(44.874759,36.994022),(44.869178,36.967357),(44.874863,36.949658),(44.884061,36.933354),(44.888815,36.910926),(44.883441,36.886845),(44.869643,36.868965),(44.834141,36.834032),(44.823393,36.809331),(44.831248,36.791916),(44.851195,36.781219),(44.87724,36.776464),(44.908245,36.77786),(44.922715,36.775896),(44.935221,36.767111),(44.944419,36.758274),(44.954754,36.752331),(44.966433,36.749334),(44.979456,36.749024),(44.996199,36.741686),(45.010978,36.725563),(45.035266,36.689596),(45.045911,36.668047),(45.04431,36.64934),(45.024879,36.613167),(45.014182,36.579009),(45.013252,36.557925),(45.010255,36.556013),(44.997852,36.552085),(44.993408,36.549656),(44.991393,36.53374),(45.005914,36.518702),(45.009525,36.516196),(45.025344,36.505215),(45.03816,36.494001),(45.03909,36.479842),(45.045498,36.471625),(45.054076,36.464959),(45.062086,36.455347),(45.066892,36.442376),(45.068546,36.432506),(45.072266,36.423411),(45.083739,36.412817),(45.110817,36.402534),(45.139963,36.404394),(45.19598,36.422429),(45.221301,36.42093),(45.238871,36.402999),(45.24962,36.377936),(45.254478,36.354785),(45.25701,36.311687),(45.263934,36.294272),(45.282693,36.274893),(45.258508,36.262232),(45.264193,36.250192),(45.282796,36.238409),(45.297369,36.22673),(45.30202,36.207558),(45.299539,36.161411),(45.304604,36.140379),(45.33561,36.10772),(45.348322,36.087514),(45.344188,36.067464),(45.331889,36.051599),(45.31959,36.031032),(45.313699,36.010413),(45.32021,35.99429),(45.32021,35.994135),(45.32021,35.994083),(45.320313,35.994031),(45.32052,35.99398),(45.33809,35.979304),(45.359587,35.976875),(45.381808,35.982973),(45.401549,35.99398),(45.4016,35.994031),(45.401859,35.994031),(45.401962,35.994083),(45.402169,35.994238),(45.419946,35.998269),(45.453122,36.011653),(45.47927,36.012015),(45.501424,36.005435),(45.53999,35.99398),(45.576939,35.96623),(45.589858,35.959615),(45.617039,35.955429),(45.646857,35.933208),(45.69321,35.879878),(45.718739,35.828305),(45.731038,35.815128),(45.749021,35.810994),(45.786745,35.820244),(45.797907,35.818383),(45.814185,35.80934),(45.834752,35.810528),(45.854079,35.818332),(45.878315,35.83523),(45.888496,35.834868),(45.898779,35.832181),(45.909115,35.831302),(45.941257,35.840346),(46.004923,35.837969),(46.024973,35.843291),(46.0443,35.852283),(46.060423,35.857244),(46.07696,35.856986),(46.107759,35.847425),(46.115045,35.846444),(46.119851,35.842878),(46.124812,35.822466),(46.129101,35.815541),(46.135199,35.810012),(46.143364,35.804534),(46.163518,35.797506),(46.184963,35.798178),(46.227441,35.805723),(46.246407,35.811407),(46.263512,35.821122),(46.281392,35.828305),(46.302992,35.826548),(46.319632,35.816885),(46.327074,35.8035),(46.325058,35.787843),(46.313379,35.771513),(46.297515,35.759886),(46.267129,35.744124),(46.253486,35.727743),(46.23788,35.715547),(46.217003,35.713583),(46.177729,35.715392),(46.127603,35.693688),(46.107035,35.689812),(46.037065,35.691569),(46.016498,35.68573),(46.003786,35.674258),(45.995879,35.658393),(45.992365,35.640875),(45.992314,35.62439),(46.002029,35.585943),(45.999238,35.572145),(45.968698,35.579742),(45.963892,35.579742),(45.959344,35.578708),(45.968026,35.558503),(45.97924,35.539486),(45.983115,35.5353),(45.984562,35.531062),(45.983219,35.52698),(45.97924,35.523001),(45.971333,35.51804),(45.966062,35.511477),(45.963582,35.503415),(45.963995,35.494165),(45.977017,35.46533),(46.040993,35.381562),(46.096287,35.341151),(46.120161,35.318517),(46.127396,35.289062),(46.125285,35.284989),(46.120058,35.274902),(46.107655,35.262758),(46.098767,35.250046),(46.101454,35.234285),(46.115407,35.226326),(46.154164,35.226636),(46.169254,35.216249),(46.165481,35.189946),(46.143829,35.159612),(46.130393,35.131397),(46.151064,35.111605),(46.143106,35.099512),(46.132357,35.094758),(46.119954,35.092743),(46.09453,35.085818),(46.07665,35.089694),(46.066573,35.088815),(46.039753,35.075535),(46.025077,35.064269),(46.009212,35.06091),(45.97924,35.071555),(45.966372,35.070729),(45.956037,35.074243),(45.934953,35.085456),(45.920173,35.089642),(45.913197,35.087317),(45.899399,35.06861),(45.898366,35.063907),(45.901156,35.051608),(45.899089,35.046906),(45.893095,35.044374),(45.879039,35.043237),(45.872476,35.041428),(45.861882,35.032798),(45.857025,35.021274),(45.856818,35.008045),(45.859712,34.994403),(45.859712,34.994248),(45.868962,34.968358),(45.866327,34.949547),(45.857852,34.931306),(45.850203,34.906811),(45.835011,34.890171),(45.808036,34.897871),(45.796214,34.903043),(45.77827,34.910893),(45.755119,34.909963),(45.748504,34.89074),(45.750468,34.865367),(45.745404,34.840975),(45.717705,34.825111),(45.689231,34.82263),(45.676571,34.818289),(45.666752,34.80692),(45.6636,34.794932),(45.665925,34.774726),(45.662825,34.763254),(45.635023,34.736951),(45.627375,34.720828),(45.642258,34.706875),(45.650526,34.702999),(45.659517,34.697211),(45.666856,34.689977),(45.67037,34.681812),(45.67347,34.671166),(45.678379,34.66512),(45.683495,34.660211),(45.687629,34.653235),(45.690782,34.634321),(45.691247,34.615511),(45.694451,34.598561),(45.705613,34.58559),(45.708558,34.579079),(45.7083,34.568382),(45.705613,34.557737),(45.70153,34.551277),(45.695588,34.550244),(45.673573,34.556652),(45.604844,34.561147),(45.573941,34.567297),(45.539628,34.582231),(45.500664,34.591688),(45.49653,34.564248),(45.50485,34.523785),(45.503455,34.494175),(45.4987,34.486242),(45.493016,34.479008),(45.486505,34.472729),(45.47927,34.467251),(45.426767,34.45751),(45.417052,34.444359),(45.447954,34.36209),(45.46077,34.340463),(45.47927,34.329146),(45.499217,34.342401),(45.521541,34.342504),(45.542212,34.331601),(45.55756,34.311964),(45.563038,34.289278),(45.561022,34.264602),(45.54769,34.216491),(45.542729,34.207474),(45.528673,34.18856),(45.526657,34.17931),(45.531463,34.167916),(45.538801,34.159234),(45.544537,34.15063),(45.544537,34.139494),(45.534357,34.128202),(45.493946,34.100685),(45.47927,34.087636),(45.454879,34.06986),(45.443613,34.047664),(45.43519,34.022136),(45.419946,33.99436),(45.419946,33.994257),(45.419739,33.994257),(45.411471,33.987151),(45.401755,33.981622),(45.380361,33.97356),(45.401032,33.949453),(45.423718,33.938782),(45.449711,33.937387),(45.47927,33.941185),(45.481751,33.940875),(45.483921,33.940048),(45.485781,33.938653),(45.574768,33.803933),(45.588204,33.791504),(45.603604,33.78073),(45.616729,33.768689),(45.623912,33.752075),(45.628202,33.731844),(45.635126,33.714171),(45.645151,33.697918),(45.658794,33.681692),(45.673987,33.669031),(45.721116,33.640764),(45.72463,33.633036),(45.727989,33.625649),(45.72773,33.590096),(45.734552,33.583119),(45.752018,33.586762),(45.768451,33.595909),(45.797545,33.619319),(45.815787,33.625804),(45.864363,33.626424),(45.885964,33.63092),(45.882036,33.600198),(45.89971,33.58516),(45.920897,33.572991),(45.927925,33.550873),(45.915626,33.535809),(45.868187,33.511573),(45.852581,33.494365),(45.869737,33.482118),(45.899399,33.476304),(45.929682,33.479508),(45.948182,33.494262),(45.953143,33.496587),(45.958156,33.497388),(45.963272,33.496561),(45.964487,33.495991),(45.968232,33.494236),(45.971385,33.492763),(45.974434,33.490799),(46.008023,33.455659),(46.019392,33.438399),(46.027454,33.419512),(46.030503,33.399203),(46.031071,33.382511),(46.036239,33.367939),(46.069725,33.34086),(46.109516,33.293705),(46.141349,33.272105),(46.155301,33.260219),(46.164189,33.243347),(46.164396,33.233063),(46.15835,33.213865),(46.157678,33.205675),(46.162122,33.196373),(46.173698,33.190223),(46.174318,33.18118),(46.167187,33.168338),(46.153441,33.154256),(46.126466,33.131777),(46.105382,33.118393),(46.089155,33.11568),(46.072412,33.116765),(46.050398,33.115112),(46.030296,33.105681),(46.029314,33.093511),(46.043267,33.08346),(46.087192,33.079222),(46.106002,33.072504),(46.12042,33.061678),(46.126156,33.047984),(46.119489,33.031008),(46.104658,33.018063),(46.088018,33.00672),(46.075719,32.994499),(46.075719,32.994344),(46.09701,32.95432),(46.15556,32.948352),(46.273433,32.959488),(46.379629,32.931764),(46.479312,32.891792),(46.507321,32.868021),(46.600613,32.822541),(46.604421,32.820685),(46.650361,32.789369),(46.715887,32.756012),(46.757332,32.716195),(47.058398,32.494478),(47.058605,32.494478),(47.058657,32.4944),(47.090593,32.474556),(47.12103,32.461043),(47.152553,32.455178),(47.187796,32.458382),(47.20547,32.46404),(47.251255,32.48546),(47.265311,32.484685),(47.321948,32.468226),(47.343342,32.458692),(47.356106,32.446186),(47.36732,32.430761),(47.384115,32.41257),(47.410832,32.395285),(47.416413,32.387973),(47.417963,32.376423),(47.414346,32.36986),(47.408765,32.364331),(47.39998,32.345779),(47.395949,32.34198),(47.395794,32.33702),(47.40246,32.323506),(47.407059,32.31777),(47.436877,32.293689),(47.441579,32.288185),(47.445352,32.28263),(47.463025,32.26183),(47.469433,32.25612),(47.479148,32.252063),(47.484522,32.239351),(47.504004,32.226742),(47.509224,32.213797),(47.507673,32.199844),(47.502351,32.190129),(47.496408,32.181344),(47.492481,32.170492),(47.490413,32.15654),(47.491344,32.148633),(47.498165,32.144137),(47.513823,32.140313),(47.52669,32.133389),(47.534752,32.123157),(47.54364,32.114578),(47.55873,32.112976),(47.578057,32.106155),(47.580232,32.103495),(47.595007,32.085433),(47.617796,32.04187),(47.633144,32.026935),(47.668077,32.012414),(47.677947,31.994689),(47.677947,31.994534),(47.68265,31.976912),(47.71841,31.922342),(47.725231,31.914332),(47.743318,31.904255),(47.750966,31.898209),(47.756547,31.889166),(47.761715,31.871647),(47.76528,31.864103),(47.781352,31.848858),(47.820781,31.823588),(47.834475,31.805708),(47.837266,31.784469),(47.831323,31.761835),(47.678929,31.407851),(47.676443,31.236517),(47.672935,30.994698),(48.001545,30.994647),(48.012242,30.989066),(48.015446,30.97625),(48.012035,30.494574),(48.012035,30.494522),(48.013586,30.463878),(48.119419,30.450804),(48.130581,30.447497),(48.140916,30.441916),(48.15766,30.426309),(48.170475,30.406672),(48.179467,30.384865),(48.187684,30.340836),(48.192076,30.331276),(48.200086,30.323938),(48.211196,30.319649),(48.222979,30.318099),(48.235071,30.318512),(48.271658,30.323835),(48.284267,30.323318),(48.296359,30.319753),(48.305713,30.312828),(48.326021,30.283476),(48.358164,30.251798),(48.397025,30.220999),(48.403588,30.212524),(48.408704,30.202344),(48.410616,30.191543),(48.408032,30.180898),(48.400745,30.172268),(48.391134,30.164775),(48.383279,30.156455),(48.381108,30.145345),(48.383072,30.13842),(48.395578,30.115217),(48.415525,30.095632),(48.421209,30.085348),(48.423948,30.083643),(48.44219,30.03393),(48.444257,30.020908),(48.453145,30.001426),(48.457796,29.994863),(48.464307,29.989127),(48.478157,29.979618),(48.49304,29.971763),(48.523994,29.964115),(48.531025,29.961351),(48.531016,29.96133),(48.530772,29.960761),(48.530772,29.956204),(48.554942,29.956488),(48.559255,29.946601),(48.546886,29.934719),(48.520518,29.9289),(48.411876,29.938422),(48.33546,29.961412),(48.299571,29.984524),(48.264659,29.993964),(48.209239,30.024482),(48.165782,30.037543),(48.119151,30.044989),(48.076345,30.04564),(48.038259,30.036851),(47.969005,30.004055),(47.961925,30.030341),(47.958507,30.060614),(47.951671,30.088324),(47.934825,30.107082),(47.947113,30.07453),(47.948497,30.062323),(47.946056,30.049384),(47.941742,30.037258),(47.940929,30.026516),(47.948497,30.017646),(47.948009,29.994045),(47.731432,30.088552),(47.674175,30.098216),(47.415793,30.098216),(47.358225,30.092118),(47.197098,30.03424),(47.144698,30.003338),(47.110488,29.960911),(47.025429,29.772137),(46.988842,29.712658),(46.983674,29.698292),(46.97985,29.668061),(46.97737,29.657984),(46.957836,29.620441),(46.883112,29.512515),(46.85345,29.44456),(46.838567,29.424975),(46.774488,29.363532),(46.711856,29.271393),(46.561468,29.124167),(46.532436,29.095745),(46.488614,29.08758),(46.444896,29.079415),(46.427322,29.076143),(46.401178,29.071276),(46.357459,29.063137),(46.252143,29.071457),(46.17592,29.077477),(46.099697,29.083575),(46.02363,29.089595),(45.947355,29.095641),(45.844932,29.103754),(45.742406,29.111868),(45.63988,29.120032),(45.537406,29.12812),(45.434932,29.136207),(45.332406,29.144372),(45.229983,29.152459),(45.127457,29.160624),(45.047824,29.166903),(44.968293,29.173259),(44.888712,29.179512),(44.808923,29.185894),(44.717456,29.193103),(44.710893,29.195273),(44.70464,29.197495),(44.698232,29.199718),(44.691825,29.201836),(44.614878,29.256071),(44.519742,29.323328),(44.424296,29.390533),(44.328953,29.45779),(44.233661,29.524995),(44.119146,29.605817),(44.004631,29.686613),(43.890065,29.767383),(43.824013,29.81398),(43.775498,29.848205),(43.660983,29.929027),(43.546365,30.009797),(43.431746,30.090568),(43.317231,30.171338),(43.229071,30.233505),(43.140963,30.295671),(43.052907,30.357786),(42.964747,30.420005),(42.859017,30.494522),(42.858913,30.494574),(42.85881,30.494626),(42.858707,30.494677),(42.783413,30.551045),(42.763932,30.565629),(42.669157,30.636684),(42.574486,30.707636),(42.479712,30.778639),(42.395169,30.841581),(42.31073,30.904523),(42.22629,30.967465),(42.141644,31.030407),(42.075395,31.079861),(41.986202,31.125285),(41.898558,31.169985),(41.810708,31.214685),(41.723065,31.259385),(41.635422,31.304034),(41.547572,31.348734),(41.459825,31.393434),(41.372182,31.438134),(41.284539,31.482834),(41.196689,31.527586),(41.109046,31.572286),(41.021299,31.616934),(40.933553,31.661634),(40.845909,31.706335),(40.758163,31.751086),(40.670313,31.795683),(40.58267,31.840435),(40.479834,31.892835),(40.424126,31.920533),(40.37028,31.938465),(40.029318,31.994379),(40.029112,31.994431),(40.029008,31.994482),(40.028802,31.994482),(39.9486,32.00611),(39.750989,32.034893),(39.553275,32.063729),(39.355561,32.092564),(39.157744,32.121348),(39.154953,32.120573),(39.152163,32.119746),(39.149269,32.118919),(39.146375,32.118144),(39.146168,32.125844),(39.266471,32.212867),(39.291999,32.244519),(39.271122,32.311956),(39.256342,32.342678),(39.235775,32.352858),(39.046329,32.308494),(39.036201,32.313352),(39.028759,32.328338),(38.979977,32.472102),(38.978633,32.47373),(38.97822,32.47497),(38.978633,32.475693),(38.979977,32.476055),(39.057181,32.496596),(38.990002,32.705576),(38.94277,32.852337),(38.897191,32.994344),(38.862568,33.10072),(38.82102,33.229032),(38.774511,33.371685),(38.885099,33.427108),(38.995686,33.482479),(39.106274,33.537928),(39.216862,33.593325),(39.327449,33.648722),(39.438037,33.704094),(39.548624,33.759491),(39.659212,33.81481),(39.769696,33.870233),(39.880387,33.925605),(39.990871,33.980976),(40.101459,34.036373),(40.173111,34.072283),(40.212046,34.091796),(40.322634,34.147167),(40.433221,34.202539),(40.543809,34.257988),(40.690467,34.331497),(40.936033,34.386068),(40.965282,34.401855),(40.98802,34.42852),(41.023986,34.494175),(41.023986,34.49433),(41.195656,34.768473),(41.204234,34.793123),(41.206508,34.819323),(41.198033,34.994041),(41.192326,35.158904),(41.191521,35.182143),(41.20134,35.243018),(41.243095,35.366525),(41.25188,35.46409),(41.261078,35.494165),(41.261181,35.494165),(41.261285,35.494165),(41.261285,35.49432),(41.308458,35.552248),(41.34221,35.593694),(41.358023,35.623925),(41.363501,35.655241),(41.359263,35.792752),(41.354509,35.825566),(41.343657,35.857657),(41.266349,35.994238),(41.266349,35.994342),(41.266246,35.99429),(41.240614,36.043021),(41.236687,36.060332),(41.236583,36.077024),(41.268829,36.327965),(41.276994,36.354785),(41.365258,36.493898),(41.365258,36.494001),(41.365361,36.494053),(41.365361,36.494156),(41.385411,36.516377),(41.414867,36.527384),(41.479773,36.536117),(41.789935,36.589292),(41.817323,36.599731),(41.843781,36.617869),(41.978554,36.733625),(42.178438,36.90532),(42.281584,36.99397),(42.281894,36.99397),(42.281894,36.994022),(42.281894,36.994125),(42.34587,37.042908),(42.376806,37.062001),(42.377186,37.062235),(42.376875,37.076756),(42.371191,37.087944),(42.363646,37.09815),(42.357238,37.109984),(42.401887,37.114144),(42.459144,37.129311),(42.545237,37.140887),(42.561257,37.146623),(42.564668,37.152049),(42.576967,37.17923),(42.702334,37.325346),(42.706158,37.333226),(42.707398,37.340151),(42.709465,37.347179),(42.715666,37.355292),(42.722177,37.358909),(42.77158,37.374903),(42.780468,37.375498),(42.792457,37.374335),(42.801139,37.36909),(42.80548,37.351856),(42.814058,37.346817),(42.89674,37.324906)]
+Israel	[(35.803633,33.248463),(35.807664,33.201721),(35.830195,33.189991),(35.833399,33.161129),(35.822443,33.14157),(35.811488,33.126765),(35.811488,33.111908),(35.848902,33.098678),(35.845801,33.085423),(35.85903,32.99021),(35.864611,32.97773),(35.888073,32.944941),(35.874017,32.922333),(35.866885,32.920782),(35.849729,32.895823),(35.83805,32.866031),(35.841874,32.853577),(35.834226,32.827946),(35.784203,32.777949),(35.75759,32.744347),(35.757435,32.744282),(35.740175,32.740535),(35.685191,32.711234),(35.652015,32.686171),(35.635995,32.679143),(35.612334,32.681535),(35.612224,32.681546),(35.593827,32.670358),(35.578737,32.653434),(35.569849,32.646768),(35.562718,32.64421),(35.560547,32.640903),(35.560031,32.632686),(35.564061,32.625477),(35.572536,32.62124),(35.572536,32.615013),(35.565612,32.615013),(35.565612,32.607546),(35.571296,32.598554),(35.574397,32.572767),(35.579978,32.560391),(35.575844,32.554965),(35.574397,32.554396),(35.57388,32.556748),(35.572536,32.560391),(35.570159,32.556825),(35.565612,32.546102),(35.55941,32.55295),(35.562821,32.532021),(35.565612,32.525587),(35.551969,32.525587),(35.551969,32.518817),(35.55724,32.519334),(35.561374,32.519179),(35.568505,32.510265),(35.570573,32.506027),(35.579978,32.497733),(35.579978,32.49148),(35.570986,32.489207),(35.564991,32.48391),(35.561271,32.477089),(35.55941,32.470396),(35.563131,32.468174),(35.565405,32.466314),(35.568092,32.46497),(35.572536,32.464195),(35.572536,32.456728),(35.566232,32.453111),(35.55941,32.450527),(35.565612,32.443706),(35.551969,32.436212),(35.554139,32.434455),(35.556207,32.434791),(35.55786,32.43412),(35.55941,32.429443),(35.551969,32.429443),(35.551969,32.423242),(35.55817,32.417997),(35.5591,32.413966),(35.554863,32.411175),(35.545148,32.409573),(35.549592,32.39854),(35.551969,32.395285),(35.556827,32.390918),(35.560961,32.384717),(35.480139,32.402416),(35.456678,32.40761),(35.432803,32.408256),(35.406862,32.414793),(35.401384,32.440011),(35.401797,32.470965),(35.392909,32.494478),(35.363143,32.51011),(35.333378,32.513081),(35.270436,32.510471),(35.252246,32.515949),(35.22372,32.535896),(35.210359,32.541868),(35.208631,32.54264),(35.190751,32.54171),(35.176798,32.532692),(35.151683,32.507914),(35.120678,32.491325),(35.090705,32.479233),(35.06435,32.463136),(35.044713,32.43412),(35.03273,32.3822),(35.028797,32.365157),(35.021562,32.34459),(35.017841,32.342213),(35.004509,32.338053),(35.000685,32.335728),(34.996551,32.323041),(34.993037,32.29157),(34.989936,32.27847),(35.002442,32.275137),(35.009366,32.267644),(35.011123,32.257102),(35.007609,32.24439),(35.000271,32.232013),(34.961411,32.201576),(34.948078,32.186874),(34.946115,32.177262),(34.962341,32.146359),(34.967302,32.129461),(34.979911,32.035203),(34.980428,32.016548),(34.978671,31.994379),(34.978671,31.993707),(34.978981,31.993087),(34.979601,31.99257),(34.980324,31.992157),(34.981151,31.98885),(34.981461,31.985232),(34.981151,31.981615),(34.980324,31.978204),(34.976087,31.948232),(34.995827,31.909165),(35.007713,31.875678),(34.980324,31.862604),(34.953246,31.854439),(34.947326,31.840925),(34.945391,31.836507),(34.954796,31.819764),(34.987766,31.814803),(35.003372,31.814648),(35.010503,31.815889),(35.020425,31.82116),(35.038099,31.837386),(35.04554,31.841417),(35.059699,31.839401),(35.111893,31.818059),(35.181449,31.804106),(35.198399,31.795166),(35.206254,31.782764),(35.208011,31.766124),(35.206564,31.744627),(35.202843,31.738942),(35.198296,31.737702),(35.193128,31.739873),(35.187443,31.744472),(35.125742,31.733103),(35.106725,31.724938),(35.088845,31.712587),(35.054015,31.682202),(34.973606,31.63037),(34.955313,31.61187),(34.953176,31.60832),(34.93733,31.582001),(34.932885,31.554923),(34.932472,31.526966),(34.926788,31.494409),(34.881726,31.429866),(34.867153,31.396431),(34.878832,31.362841),(34.900949,31.348475),(34.927408,31.34491),(34.9549,31.34863),(34.980324,31.356175),(35.040166,31.363203),(35.164913,31.362273),(35.223307,31.381031),(35.332344,31.458804),(35.390118,31.487071),(35.458125,31.491929),(35.458538,31.491619),(35.457128,31.433524),(35.456884,31.423509),(35.452854,31.400823),(35.435077,31.360619),(35.416473,31.331835),(35.423915,31.324601),(35.422261,31.303),(35.408205,31.282019),(35.3957,31.25768),(35.401177,31.230291),(35.410686,31.204608),(35.421331,31.184506),(35.436214,31.159546),(35.443242,31.132209),(35.438488,31.103736),(35.391565,31.023947),(35.385158,30.994647),(35.385261,30.963279),(35.374099,30.945141),(35.34711,30.92271),(35.334928,30.912585),(35.322216,30.88995),(35.319528,30.867316),(35.320045,30.84494),(35.316635,30.822823),(35.310847,30.813314),(35.293897,30.800188),(35.286145,30.792333),(35.279531,30.780241),(35.27612,30.768976),(35.271573,30.743706),(35.263882,30.719967),(35.263821,30.71978),(35.205324,30.617099),(35.162122,30.494677),(35.157368,30.470854),(35.140005,30.430185),(35.140005,30.406155),(35.144965,30.395872),(35.159332,30.375615),(35.162122,30.361404),(35.159952,30.347503),(35.154474,30.336754),(35.147756,30.32647),(35.141762,30.313965),(35.132356,30.261875),(35.125225,30.244667),(35.124812,30.21609),(35.145276,30.154905),(35.145276,30.123382),(35.129049,30.089741),(35.086261,30.034034),(35.074686,29.994604),(35.074065,29.982564),(35.070345,29.973727),(35.065384,29.965976),(35.061456,29.957346),(35.054118,29.923394),(35.053188,29.862623),(35.048951,29.842314),(35.002545,29.733096),(34.995104,29.708162),(34.989833,29.651964),(34.980324,29.627004),(34.966992,29.608116),(34.95986,29.586206),(34.95558,29.558987),(34.955577,29.558987),(34.951345,29.54564),(34.944998,29.536851),(34.927745,29.518012),(34.91977,29.507392),(34.915782,29.50023),(34.914073,29.493801),(34.910818,29.489936),(34.903005,29.489691),(34.893728,29.490546),(34.886729,29.490058),(34.878108,29.504298),(34.855267,29.545717),(34.848239,29.569643),(34.8501,29.63876),(34.824365,29.7417),(34.785194,29.835699),(34.741373,29.940241),(34.735068,29.994553),(34.735585,30.000702),(34.734965,30.006697),(34.733208,30.012588),(34.730417,30.018169),(34.69166,30.114545),(34.632645,30.26203),(34.599469,30.344506),(34.58841,30.35882),(34.53384,30.400213),(34.526915,30.409618),(34.524745,30.421142),(34.526502,30.438712),(34.53601,30.468581),(34.536217,30.482172),(34.526295,30.494522),(34.526295,30.494574),(34.510379,30.513332),(34.504384,30.530334),(34.502214,30.571675),(34.480407,30.651205),(34.418808,30.7913),(34.367855,30.907417),(34.329511,30.994492),(34.297989,31.078776),(34.258611,31.184144),(34.248351,31.211449),(34.264399,31.224193),(34.315869,31.256905),(34.350905,31.289254),(34.353799,31.306359),(34.345531,31.340724),(34.345841,31.357725),(34.367339,31.392814),(34.480407,31.485624),(34.495496,31.494409),(34.495703,31.494409),(34.528259,31.520144),(34.530429,31.541383),(34.511412,31.561589),(34.481204,31.583141),(34.481212,31.583157),(34.489513,31.600409),(34.513927,31.627143),(34.602712,31.757758),(34.60963,31.76553),(34.665945,31.873887),(34.693207,31.926459),(34.711925,31.951606),(34.743337,32.039862),(34.743988,32.044623),(34.742686,32.055609),(34.743337,32.06037),(34.757009,32.066596),(34.837657,32.280707),(34.87322,32.430325),(34.904145,32.560614),(34.909841,32.570258),(34.915863,32.614895),(34.920909,32.628241),(34.919119,32.642971),(34.942068,32.724514),(34.94752,32.814154),(34.955577,32.834377),(34.97047,32.841376),(34.983165,32.838772),(35.003429,32.827541),(35.018728,32.825019),(35.02768,32.826606),(35.062755,32.858344),(35.067068,32.866848),(35.075531,32.893093),(35.0796,32.905829),(35.07781,32.917873),(35.06544,32.923082),(35.071544,32.937934),(35.078461,32.998847),(35.09197,33.031195),(35.096202,33.05036),(35.092133,33.067694),(35.096446,33.071357),(35.101817,33.077623),(35.106456,33.080756),(35.09962,33.087592),(35.104259,33.088528),(35.105235,33.089016),(35.185273,33.083977),(35.189614,33.085527),(35.200673,33.092736),(35.207184,33.094803),(35.213178,33.094441),(35.227338,33.091366),(35.234469,33.090927),(35.271469,33.101185),(35.283665,33.101185),(35.288825,33.099201),(35.29462,33.096973),(35.305783,33.089377),(35.315704,33.079222),(35.322629,33.067363),(35.331931,33.057156),(35.34516,33.05558),(35.401591,33.067931),(35.449443,33.085217),(35.480139,33.087387),(35.4851,33.102606),(35.503703,33.130615),(35.512282,33.147409),(35.517656,33.172886),(35.520033,33.222185),(35.527784,33.244251),(35.53688,33.257868),(35.542771,33.271536),(35.549489,33.281019),(35.561167,33.28213),(35.566955,33.276187),(35.585042,33.252209),(35.597754,33.244354),(35.597858,33.24438),(35.598064,33.244251),(35.603852,33.240091),(35.603892,33.240323),(35.604576,33.244251),(35.604576,33.244303),(35.604576,33.244354),(35.601475,33.262725),(35.610363,33.27027),(35.624716,33.272924),(35.640542,33.275851),(35.66049,33.289261),(35.698523,33.32267),(35.716197,33.326727),(35.729426,33.327812),(35.743689,33.331171),(35.757538,33.336313),(35.769423,33.342643),(35.785753,33.357887),(35.8057,33.391348),(35.8211,33.406722),(35.822443,33.401373),(35.816966,33.395198),(35.815415,33.378868),(35.812315,33.373365),(35.809938,33.360032),(35.793505,33.349929),(35.785753,33.342875),(35.763842,33.334401),(35.802083,33.31249),(35.768597,33.272699),(35.775625,33.264896),(35.803633,33.248463)]
+Jamaica	[(-76.263743,18.012356),(-76.256785,17.996324),(-76.248769,17.977851),(-76.234039,17.953925),(-76.21524,17.934963),(-76.187978,17.915473),(-76.198394,17.907416),(-76.250071,17.894965),(-76.286488,17.875881),(-76.307362,17.870103),(-76.325185,17.874498),(-76.318227,17.879299),(-76.315419,17.882717),(-76.311513,17.894965),(-76.329579,17.888658),(-76.345611,17.865871),(-76.363026,17.860826),(-76.378529,17.865058),(-76.396555,17.872992),(-76.414906,17.877509),(-76.444936,17.866767),(-76.523549,17.860256),(-76.57901,17.868313),(-76.587066,17.867987),(-76.594594,17.866604),(-76.602773,17.867621),(-76.613149,17.874498),(-76.617665,17.883531),(-76.6197,17.895087),(-76.622711,17.905015),(-76.630523,17.909247),(-76.63858,17.911607),(-76.643951,17.917222),(-76.64859,17.923896),(-76.654775,17.929145),(-76.684804,17.936021),(-76.692291,17.940009),(-76.707672,17.94595),(-76.728424,17.94477),(-76.764638,17.936591),(-76.7801,17.934801),(-76.832265,17.936591),(-76.832265,17.943427),(-76.722401,17.949612),(-76.729319,17.955959),(-76.734364,17.960598),(-76.747467,17.963446),(-76.777659,17.963853),(-76.798164,17.96342),(-76.819056,17.975273),(-76.836829,17.986359),(-76.849967,17.992276),(-76.853069,17.981968),(-76.857761,17.971398),(-76.870173,17.95805),(-76.874005,17.950349),(-76.887156,17.951856),(-76.891037,17.944502),(-76.894944,17.921681),(-76.912828,17.861287),(-76.926096,17.843329),(-76.942128,17.833564),(-76.955312,17.833441),(-76.964019,17.837226),(-76.972076,17.842434),(-76.983062,17.846584),(-77.038319,17.846584),(-77.038319,17.85399),(-77.017201,17.860826),(-77.027984,17.869818),(-77.041493,17.887152),(-77.051991,17.894965),(-77.064198,17.899482),(-77.093007,17.902493),(-77.119109,17.893803),(-77.141652,17.881134),(-77.158079,17.849875),(-77.161977,17.840766),(-77.154408,17.813056),(-77.161692,17.810289),(-77.174387,17.802924),(-77.181711,17.799994),(-77.179107,17.794745),(-77.177358,17.784613),(-77.174916,17.778266),(-77.185618,17.782904),(-77.19636,17.783393),(-77.206776,17.779853),(-77.216461,17.772121),(-77.198883,17.761786),(-77.180328,17.75788),(-77.160878,17.759426),(-77.140736,17.765286),(-77.130605,17.727688),(-77.133656,17.710435),(-77.158111,17.703192),(-77.178944,17.704169),(-77.197581,17.708197),(-77.216054,17.716702),(-77.302887,17.790839),(-77.320872,17.812445),(-77.395619,17.853949),(-77.417714,17.861721),(-77.441029,17.864651),(-77.459462,17.857408),(-77.480621,17.843736),(-77.50182,17.841946),(-77.545481,17.85399),(-77.588368,17.860989),(-77.723866,17.853583),(-77.730702,17.854804),(-77.751536,17.868313),(-77.786733,17.884955),(-77.795562,17.891547),(-77.799916,17.899115),(-77.810292,17.92475),(-77.812367,17.932847),(-77.816151,17.939195),(-77.834055,17.945299),(-77.83967,17.949612),(-77.841135,17.970608),(-77.839345,17.995836),(-77.84557,18.017035),(-77.871002,18.025946),(-77.940338,18.026516),(-77.956288,18.032172),(-77.97997,18.084459),(-77.987864,18.095364),(-77.996449,18.10102),(-78.006418,18.105862),(-78.014394,18.107856),(-78.020579,18.113105),(-78.02538,18.12519),(-78.031484,18.148871),(-78.050282,18.185126),(-78.075185,18.198432),(-78.148793,18.196682),(-78.193756,18.203925),(-78.210194,18.204088),(-78.219594,18.195868),(-78.227284,18.19184),(-78.234039,18.193183),(-78.258656,18.202623),(-78.261138,18.204088),(-78.275136,18.206244),(-78.305898,18.215644),(-78.32315,18.217719),(-78.340728,18.221869),(-78.357737,18.232733),(-78.370269,18.248114),(-78.374664,18.26557),(-78.36913,18.273871),(-78.354319,18.28384),(-78.34732,18.292222),(-78.34439,18.305365),(-78.345815,18.335517),(-78.343902,18.344062),(-78.336293,18.355902),(-78.335439,18.36343),(-78.331939,18.367377),(-78.316396,18.368598),(-78.30663,18.374661),(-78.298695,18.386379),(-78.288401,18.394355),(-78.271637,18.389065),(-78.261301,18.417385),(-78.230621,18.444241),(-78.194976,18.455471),(-78.16926,18.436835),(-78.154408,18.453518),(-78.138539,18.453843),(-78.119985,18.447333),(-78.097239,18.443061),(-78.032541,18.450629),(-78.010976,18.450507),(-78.000152,18.446682),(-77.992421,18.443996),(-77.981353,18.441352),(-77.96996,18.443061),(-77.959828,18.449897),(-77.958852,18.456448),(-77.959137,18.464097),(-77.952952,18.474433),(-77.930287,18.502021),(-77.919993,18.511176),(-77.902333,18.518785),(-77.861887,18.525092),(-77.81607,18.523424),(-77.735544,18.5067),(-77.66454,18.491929),(-77.56725,18.49018),(-77.524281,18.480211),(-77.454986,18.475328),(-77.428863,18.469224),(-77.408274,18.457343),(-77.376536,18.465155),(-77.325307,18.465033),(-77.272613,18.459377),(-77.236318,18.450507),(-77.231842,18.446031),(-77.228139,18.433661),(-77.223297,18.429389),(-77.217437,18.429348),(-77.212026,18.431789),(-77.208852,18.434963),(-77.209625,18.436835),(-77.164947,18.429389),(-77.159413,18.426215),(-77.142568,18.412095),(-77.137359,18.408922),(-77.104726,18.407864),(-77.070343,18.413357),(-77.051991,18.416327),(-77.040028,18.413479),(-77.019154,18.40412),(-77.007314,18.402086),(-76.94815,18.404486),(-76.936615,18.410295),(-76.920338,18.412195),(-76.907118,18.411205),(-76.894919,18.409251),(-76.887827,18.400552),(-76.890916,18.389947),(-76.890948,18.376441),(-76.879783,18.366769),(-76.844211,18.345447),(-76.812754,18.32801),(-76.807622,18.318308),(-76.798329,18.29206),(-76.792388,18.283393),(-76.782826,18.277818),(-76.764638,18.273017),(-76.71288,18.269192),(-76.695709,18.26557),(-76.68102,18.258124),(-76.661977,18.239814),(-76.647328,18.23078),(-76.63036,18.225735),(-76.597158,18.227748),(-76.57977,18.21603),(-76.574208,18.214667),(-76.569203,18.21011),(-76.563059,18.205959),(-76.554799,18.204088),(-76.479726,18.204088),(-76.474477,18.201077),(-76.466624,18.186754),(-76.463002,18.182359),(-76.389394,18.169176),(-76.351145,18.155992),(-76.346262,18.135199),(-76.31786,18.10928),(-76.295806,18.079169),(-76.263743,18.012356)]
+Jersey	[(-2.082672,49.26024),(-2.06786,49.250678),(-2.02066,49.235256),(-2.021962,49.225491),(-2.017323,49.221381),(-2.011871,49.215277),(-2.00829,49.21247),(-2.016998,49.207221),(-2.020985,49.200751),(-2.022043,49.19245),(-2.021962,49.181383),(-2.024526,49.171332),(-2.031158,49.171454),(-2.040028,49.175727),(-2.049224,49.17829),(-2.079986,49.178697),(-2.096995,49.183661),(-2.120229,49.199164),(-2.128896,49.20307),(-2.137929,49.205634),(-2.144846,49.205634),(-2.152943,49.199937),(-2.160634,49.190741),(-2.168691,49.17829),(-2.177154,49.180162),(-2.189687,49.189114),(-2.200103,49.191962),(-2.202952,49.190416),(-2.223378,49.184719),(-2.233632,49.184516),(-2.226471,49.206),(-2.233225,49.228502),(-2.242014,49.247952),(-2.241119,49.26024),(-2.22936,49.263007),(-2.215199,49.26024),(-2.196278,49.253404),(-2.182729,49.254055),(-2.172353,49.256252),(-2.162709,49.260403),(-2.151682,49.267035),(-2.143788,49.261868),(-2.121978,49.258287),(-2.110666,49.253404),(-2.103871,49.258205),(-2.097564,49.25967),(-2.082672,49.26024)]
+Jordan	[(39.046329,32.308494),(39.235775,32.352858),(39.256342,32.342678),(39.271122,32.311956),(39.291999,32.244519),(39.266471,32.212867),(39.146168,32.125844),(39.146375,32.118144),(39.136246,32.115353),(39.116816,32.102899),(38.998064,32.006936),(38.96344,31.994482),(38.96344,31.994327),(38.963337,31.994379),(38.849752,31.966319),(38.624856,31.91087),(38.400167,31.855369),(38.175375,31.799921),(37.986522,31.753358),(37.950479,31.744472),(37.761412,31.69612),(37.702742,31.681116),(37.455005,31.617709),(37.207269,31.554354),(36.997912,31.500814),(36.959532,31.490999),(37.089653,31.370076),(37.219774,31.249101),(37.221722,31.247292),(37.349895,31.12823),(37.480017,31.007256),(37.483117,31.004103),(37.486321,31.0009),(37.489422,30.997696),(37.492626,30.994492),(37.602283,30.883232),(37.712044,30.772025),(37.821908,30.660869),(37.931565,30.549661),(37.981071,30.499483),(37.981381,30.498811),(37.980968,30.498398),(37.980038,30.498088),(37.97332,30.494522),(37.900146,30.459072),(37.779327,30.400419),(37.670703,30.347606),(37.647552,30.330863),(37.634529,30.312776),(37.605177,30.250713),(37.56921,30.174955),(37.536137,30.105295),(37.491696,30.011193),(37.470198,29.994553),(37.352376,29.973314),(37.218534,29.949129),(37.075804,29.923291),(36.931936,29.897246),(36.84295,29.881226),(36.756237,29.865517),(36.728745,29.853528),(36.70487,29.831152),(36.649576,29.7494),(36.603584,29.681471),(36.541263,29.589409),(36.477081,29.494609),(36.399979,29.438902),(36.283707,29.35485),(36.177977,29.278369),(36.069457,29.200028),(36.043825,29.190881),(36.016437,29.189951),(35.912464,29.205686),(35.797225,29.223075),(35.740251,29.231731),(35.622042,29.249689),(35.473628,29.272065),(35.334618,29.293148),(35.179072,29.316661),(35.060319,29.334696),(34.949385,29.351686),(34.949392,29.351711),(34.962413,29.359768),(34.969005,29.450832),(34.976085,29.477037),(34.997813,29.517971),(34.996837,29.533881),(34.976085,29.552151),(34.962413,29.552151),(34.961599,29.555406),(34.961599,29.558092),(34.960216,29.559516),(34.95558,29.558987),(34.95986,29.586206),(34.966992,29.608116),(34.980324,29.627004),(34.989833,29.651964),(34.995104,29.708162),(35.002545,29.733096),(35.048951,29.842314),(35.053188,29.862623),(35.054118,29.923394),(35.061456,29.957346),(35.065384,29.965976),(35.070345,29.973727),(35.074065,29.982564),(35.074686,29.994604),(35.086261,30.034034),(35.129049,30.089741),(35.145276,30.123382),(35.145276,30.154905),(35.124812,30.21609),(35.125225,30.244667),(35.132356,30.261875),(35.141762,30.313965),(35.147756,30.32647),(35.154474,30.336754),(35.159952,30.347503),(35.162122,30.361404),(35.159332,30.375615),(35.144965,30.395872),(35.140005,30.406155),(35.140005,30.430185),(35.157368,30.470854),(35.162122,30.494677),(35.205324,30.617099),(35.263821,30.71978),(35.263882,30.719967),(35.271573,30.743706),(35.27612,30.768976),(35.279531,30.780241),(35.286145,30.792333),(35.293897,30.800188),(35.310847,30.813314),(35.316635,30.822823),(35.320045,30.84494),(35.319528,30.867316),(35.322216,30.88995),(35.334928,30.912585),(35.34711,30.92271),(35.374099,30.945141),(35.385261,30.963279),(35.385158,30.994647),(35.391565,31.023947),(35.438488,31.103736),(35.443242,31.132209),(35.436214,31.159546),(35.421331,31.184506),(35.410686,31.204608),(35.401177,31.230291),(35.3957,31.25768),(35.408205,31.282019),(35.422261,31.303),(35.423915,31.324601),(35.416473,31.331835),(35.435077,31.360619),(35.452854,31.400823),(35.456884,31.423509),(35.457128,31.433524),(35.458538,31.491619),(35.458125,31.491929),(35.458745,31.491567),(35.459158,31.491877),(35.459055,31.492808),(35.458745,31.494409),(35.464222,31.568565),(35.480139,31.641119),(35.502479,31.68536),(35.527578,31.735067),(35.55941,31.765349),(35.538326,31.819299),(35.538326,31.826741),(35.549075,31.839195),(35.524684,31.919241),(35.527474,31.927355),(35.533676,31.9303),(35.5406,31.932006),(35.545148,31.936605),(35.545871,31.944563),(35.53998,31.955622),(35.538326,31.963942),(35.537706,31.977584),(35.535536,31.988229),(35.524684,32.011691),(35.522824,32.057838),(35.528301,32.075098),(35.545148,32.086828),(35.534606,32.09923),(35.535226,32.110806),(35.551969,32.135197),(35.546698,32.141605),(35.546698,32.147031),(35.551246,32.151527),(35.55941,32.155093),(35.55941,32.162534),(35.555173,32.174394),(35.559562,32.190371),(35.572536,32.237594),(35.55941,32.237594),(35.561064,32.243149),(35.563751,32.246818),(35.567575,32.249506),(35.572536,32.251908),(35.564578,32.263587),(35.560857,32.28263),(35.561167,32.301699),(35.565612,32.313352),(35.556517,32.328209),(35.557343,32.358207),(35.551969,32.367948),(35.551969,32.374821),(35.55941,32.374821),(35.55941,32.367948),(35.565612,32.367948),(35.563958,32.377043),(35.560961,32.384717),(35.556827,32.390918),(35.551969,32.395285),(35.549592,32.39854),(35.545148,32.409573),(35.554863,32.411175),(35.5591,32.413966),(35.55817,32.417997),(35.551969,32.423242),(35.551969,32.429443),(35.55941,32.429443),(35.55786,32.43412),(35.556207,32.434791),(35.554139,32.434455),(35.551969,32.436212),(35.565612,32.443706),(35.55941,32.450527),(35.566232,32.453111),(35.572536,32.456728),(35.572536,32.464195),(35.568092,32.46497),(35.565405,32.466314),(35.563131,32.468174),(35.55941,32.470396),(35.561271,32.477089),(35.564991,32.48391),(35.570986,32.489207),(35.579978,32.49148),(35.579978,32.497733),(35.570573,32.506027),(35.568505,32.510265),(35.561374,32.519179),(35.55724,32.519334),(35.551969,32.518817),(35.551969,32.525587),(35.565612,32.525587),(35.562821,32.532021),(35.55941,32.55295),(35.565612,32.546102),(35.570159,32.556825),(35.572536,32.560391),(35.57388,32.556748),(35.574397,32.554396),(35.575844,32.554965),(35.579978,32.560391),(35.574397,32.572767),(35.571296,32.598554),(35.565612,32.607546),(35.565612,32.615013),(35.572536,32.615013),(35.572536,32.62124),(35.564061,32.625477),(35.560031,32.632686),(35.560547,32.640903),(35.562718,32.64421),(35.569849,32.646768),(35.578737,32.653434),(35.593827,32.670358),(35.612224,32.681546),(35.612334,32.681535),(35.635995,32.679143),(35.652015,32.686171),(35.685191,32.711234),(35.740175,32.740535),(35.757435,32.744282),(35.75759,32.744347),(35.763842,32.746969),(35.769734,32.748054),(35.774901,32.747279),(35.779139,32.744514),(35.779139,32.744462),(35.779035,32.744359),(35.779035,32.744282),(35.788234,32.734411),(35.895721,32.713276),(35.905229,32.708573),(35.922489,32.693768),(35.92745,32.692373),(35.940369,32.692502),(35.944193,32.690771),(35.945743,32.684104),(35.9444,32.677619),(35.941196,32.673536),(35.937475,32.674002),(35.94657,32.664441),(35.955355,32.657439),(35.965794,32.654365),(35.980263,32.656612),(36.003621,32.655088),(36.008272,32.643719),(36.005275,32.626692),(36.005998,32.607907),(36.015403,32.591164),(36.060465,32.533261),(36.066046,32.521608),(36.066253,32.517319),(36.06987,32.516595),(36.081906,32.516265),(36.096225,32.515872),(36.133226,32.520109),(36.13953,32.519541),(36.149865,32.51613),(36.15586,32.5152),(36.160821,32.517215),(36.17219,32.525923),(36.177357,32.527318),(36.188209,32.52228),(36.220765,32.494581),(36.285258,32.456935),(36.373108,32.386422),(36.387887,32.379317),(36.407627,32.374227),(36.463955,32.369395),(36.480181,32.360791),(36.516684,32.357014),(36.653504,32.342859),(36.689574,32.319656),(36.706937,32.328338),(36.728641,32.327795),(36.792513,32.313533),(36.806569,32.313042),(36.819385,32.316788),(36.980099,32.410038),(37.133165,32.494478),(37.133165,32.494529),(37.133371,32.494529),(37.133371,32.494581),(37.244062,32.554396),(37.415214,32.64713),(37.494606,32.690056),(37.586677,32.739837),(37.758036,32.832519),(37.929395,32.92533),(38.056726,32.994292),(38.056726,32.994344),(38.230875,33.086302),(38.315742,33.13118),(38.529565,33.244251),(38.774511,33.371685),(38.82102,33.229032),(38.862568,33.10072),(38.897191,32.994344),(38.94277,32.852337),(38.990002,32.705576),(39.057181,32.496596),(38.979977,32.476055),(38.978633,32.475693),(38.97822,32.47497),(38.978633,32.47373),(38.979977,32.472102),(39.028759,32.328338),(39.036201,32.313352),(39.046329,32.308494)]
+Baykonur Cosmodrome	[(63.383914,45.565824),(63.324279,45.567969),(63.26635,45.574222),(63.210488,45.584376),(63.156899,45.598251),(63.105946,45.615615),(63.057835,45.636285),(63.012929,45.660005),(62.971484,45.686644),(62.933864,45.715945),(62.900274,45.7477),(62.871025,45.781703),(62.846479,45.817773),(62.826893,45.855703),(62.812527,45.895184),(62.803639,45.936164),(62.800642,45.978332),(62.803639,46.0205),(62.812527,46.061427),(62.826893,46.100986),(62.846479,46.13889),(62.871025,46.17496),(62.900274,46.208964),(62.933864,46.240719),(62.971484,46.270019),(63.012929,46.296658),(63.057835,46.320378),(63.105946,46.341048),(63.156899,46.358412),(63.210488,46.372261),(63.26635,46.382441),(63.324279,46.388694),(63.383914,46.390839),(63.443548,46.388694),(63.501477,46.382441),(63.557391,46.372261),(63.610928,46.358412),(63.661881,46.341048),(63.70994,46.320378),(63.754899,46.296658),(63.796343,46.270019),(63.833964,46.240719),(63.867553,46.208964),(63.896699,46.17496),(63.921297,46.13889),(63.940934,46.100986),(63.9553,46.061427),(63.964085,46.0205),(63.967134,45.978332),(63.964085,45.936164),(63.9553,45.895184),(63.940934,45.855703),(63.921297,45.817773),(63.896699,45.781703),(63.867553,45.7477),(63.833964,45.715945),(63.796343,45.686644),(63.754899,45.660005),(63.70994,45.636285),(63.661881,45.615615),(63.610928,45.598251),(63.557391,45.584376),(63.501477,45.574222),(63.443548,45.567969),(63.383914,45.565824)]
+Siachen Glacier	[(76.976417,35.578656),(77.017552,35.584599),(77.039049,35.585013),(77.058169,35.580103),(77.071089,35.571008),(77.092276,35.547805),(77.105298,35.537987),(77.141265,35.525378),(77.177542,35.523156),(77.250819,35.530701),(77.281102,35.528013),(77.305389,35.517833),(77.352002,35.486052),(77.383731,35.471996),(77.412773,35.469412),(77.476438,35.477164),(77.512199,35.478456),(77.519608,35.477439),(77.660613,35.458095),(77.689655,35.462694),(77.716734,35.475407),(77.74743,35.49432),(77.760349,35.498093),(77.773578,35.498971),(77.800346,35.495406),(77.424659,35.302924),(77.048971,35.110442),(76.913161,35.378277),(76.777351,35.646112),(76.782837,35.645732),(76.824592,35.647799),(76.842989,35.641288),(76.856941,35.628576),(76.880506,35.60067),(76.896422,35.589612),(76.915026,35.583152),(76.9358,35.579638),(76.976417,35.578656)]
+Kosovo	[(20.8647,43.217337),(20.8616,43.217518),(20.851471,43.219818),(20.839999,43.212092),(20.840619,43.206976),(20.839069,43.192455),(20.836071,43.179433),(20.832041,43.178606),(20.838552,43.170467),(20.912494,43.138805),(20.993431,43.104148),(21.005157,43.099128),(21.025827,43.093366),(21.092593,43.090678),(21.10851,43.081558),(21.124012,43.058277),(21.139309,43.005826),(21.147887,42.992622),(21.165354,42.985103),(21.17941,42.990581),(21.193052,42.997893),(21.209795,42.995878),(21.225298,42.973554),(21.226745,42.942522),(21.23243,42.910896),(21.260542,42.886556),(21.2716,42.884283),(21.294958,42.884386),(21.306327,42.882448),(21.316972,42.877616),(21.336403,42.865473),(21.346738,42.860847),(21.378777,42.855292),(21.398931,42.854569),(21.40844,42.846998),(21.408419,42.841743),(21.408336,42.820747),(21.404099,42.803978),(21.39056,42.770414),(21.387149,42.754962),(21.383945,42.749976),(21.379191,42.747004),(21.378674,42.744136),(21.388699,42.739046),(21.405546,42.7353),(21.4178,42.73557),(21.441823,42.736101),(21.542488,42.725817),(21.565226,42.720184),(21.580522,42.710211),(21.612665,42.680393),(21.629408,42.672203),(21.644084,42.672306),(21.687389,42.686827),(21.708886,42.687189),(21.738652,42.68215),(21.74425,42.679425),(21.764387,42.669619),(21.772758,42.647501),(21.767074,42.638716),(21.756532,42.633626),(21.744543,42.629647),(21.734725,42.624247),(21.735551,42.621276),(21.730074,42.601018),(21.728833,42.598305),(21.726973,42.596393),(21.720152,42.593887),(21.718291,42.591019),(21.719738,42.586678),(21.726766,42.577945),(21.727697,42.574147),(21.717671,42.551151),(21.667855,42.490095),(21.627858,42.460381),(21.618969,42.449245),(21.616902,42.433923),(21.621863,42.402167),(21.617419,42.386639),(21.596645,42.372092),(21.537321,42.35863),(21.51603,42.341939),(21.514893,42.317832),(21.553857,42.273984),(21.564066,42.246289),(21.561815,42.247164),(21.519854,42.239025),(21.499287,42.238663),(21.48151,42.247784),(21.471973,42.23913),(21.467557,42.235123),(21.457222,42.237035),(21.44792,42.244141),(21.436345,42.24688),(21.419912,42.240058),(21.421462,42.231351),(21.428697,42.222566),(21.429834,42.215848),(21.419085,42.215021),(21.384255,42.224943),(21.366788,42.223858),(21.360602,42.220114),(21.353766,42.215977),(21.294958,42.148979),(21.293718,42.140168),(21.295785,42.134794),(21.298782,42.129419),(21.300332,42.120893),(21.301263,42.10061),(21.300796,42.098425),(21.299299,42.091411),(21.28886,42.089706),(21.245727,42.096167),(21.237804,42.097354),(21.229298,42.103822),(21.225402,42.106785),(21.216203,42.121151),(21.199873,42.14115),(21.164423,42.16704),(21.12639,42.188925),(21.112954,42.194402),(21.106236,42.195798),(21.098484,42.195953),(21.074403,42.184455),(21.04094,42.15997),(21.029238,42.151408),(21.003916,42.141951),(20.975145,42.134658),(20.90417,42.116668),(20.810543,42.092936),(20.784912,42.082032),(20.765378,42.064333),(20.755353,42.042784),(20.743054,41.993484),(20.741814,41.970773),(20.751439,41.940338),(20.754423,41.930904),(20.751052,41.910218),(20.750495,41.906797),(20.739953,41.888039),(20.723313,41.866619),(20.714398,41.859163),(20.702953,41.849591),(20.681456,41.84401),(20.671844,41.849307),(20.652827,41.86928),(20.643422,41.873647),(20.637014,41.870365),(20.626162,41.855198),(20.61872,41.850522),(20.602391,41.849876),(20.590298,41.854733),(20.567147,41.873182),(20.567767,41.88052),(20.562703,41.892845),(20.562496,41.900105),(20.567251,41.912172),(20.573348,41.917675),(20.580583,41.921732),(20.588748,41.929586),(20.59929,41.94788),(20.59929,41.960567),(20.594329,41.973718),(20.589678,41.993639),(20.558259,42.055109),(20.552161,42.07379),(20.551954,42.105803),(20.549371,42.123476),(20.538622,42.150116),(20.500795,42.211223),(20.481674,42.230705),(20.473665,42.237123),(20.456973,42.250497),(20.333363,42.317883),(20.317964,42.319821),(20.249647,42.318607),(20.237762,42.319924),(20.229597,42.32672),(20.220915,42.343101),(20.219468,42.350207),(20.221225,42.36372),(20.218848,42.371446),(20.21306,42.377518),(20.197454,42.38744),(20.192803,42.393693),(20.194043,42.4001),(20.204379,42.411831),(20.204689,42.420099),(20.199728,42.427799),(20.186292,42.437437),(20.180814,42.443095),(20.152702,42.493402),(20.152702,42.493428),(20.152599,42.493609),(20.152599,42.493712),(20.152392,42.493712),(20.135546,42.509629),(20.085626,42.530015),(20.064956,42.546758),(20.077048,42.55991),(20.078185,42.572906),(20.075394,42.586962),(20.075704,42.603085),(20.079218,42.61125),(20.090587,42.627348),(20.10392,42.653108),(20.101956,42.656674),(20.094205,42.666983),(20.037006,42.707363),(20.03612,42.707989),(20.024751,42.723414),(20.026508,42.743206),(20.034673,42.751423),(20.055638,42.763866),(20.065059,42.769458),(20.076325,42.773437),(20.112085,42.766538),(20.149498,42.749872),(20.183398,42.742508),(20.208409,42.763282),(20.20996,42.772972),(20.208409,42.782093),(20.209236,42.791704),(20.217608,42.802737),(20.226083,42.806768),(20.264427,42.817258),(20.345352,42.827439),(20.428034,42.840642),(20.4763,42.855525),(20.498831,42.877875),(20.494367,42.887467),(20.488909,42.899191),(20.466688,42.909501),(20.450979,42.922032),(20.459454,42.950015),(20.476403,42.966371),(20.493457,42.970195),(20.51113,42.970195),(20.530457,42.975156),(20.538415,42.980659),(20.543893,42.987248),(20.553401,43.002596),(20.562393,43.009495),(20.572832,43.00934),(20.584304,43.006911),(20.596396,43.007092),(20.617273,43.02213),(20.643835,43.052257),(20.664919,43.085407),(20.669157,43.109799),(20.661818,43.115948),(20.65169,43.11631),(20.640941,43.115276),(20.632053,43.117266),(20.626058,43.123725),(20.620581,43.133337),(20.612106,43.154938),(20.600117,43.173826),(20.597533,43.184962),(20.604044,43.197959),(20.612312,43.202274),(20.644869,43.203307),(20.666986,43.209663),(20.745328,43.252865),(20.769512,43.260849),(20.79442,43.263071),(20.809717,43.25961),(20.819432,43.257412),(20.838449,43.245863),(20.848474,43.238137),(20.855088,43.231445),(20.8647,43.217337)]
+Laos	[(101.867921,22.378842),(101.877275,22.391864),(101.881512,22.412173),(101.891641,22.429691),(101.909366,22.435893),(101.952877,22.436874),(101.97422,22.445143),(101.994994,22.447416),(102.014579,22.446073),(102.075919,22.43243),(102.085531,22.429123),(102.095349,22.423129),(102.099948,22.41486),(102.10062,22.405765),(102.107345,22.397549),(102.118655,22.397549),(102.125425,22.383648),(102.131368,22.373726),(102.141393,22.342152),(102.144183,22.338586),(102.152865,22.332488),(102.156121,22.328096),(102.156121,22.32267),(102.152813,22.310836),(102.154364,22.304686),(102.168885,22.289648),(102.186196,22.278383),(102.200562,22.265464),(102.20697,22.245413),(102.226246,22.228412),(102.286449,22.200041),(102.358072,22.134722),(102.38944,22.117101),(102.398793,22.108884),(102.405408,22.098291),(102.415226,22.073486),(102.422151,22.06222),(102.442615,22.047441),(102.467626,22.034005),(102.482871,22.021396),(102.474086,22.00889),(102.471244,22.005996),(102.469073,22.002844),(102.467316,21.999227),(102.466386,21.995351),(102.478065,21.957576),(102.515892,21.939179),(102.56023,21.925433),(102.59103,21.901352),(102.625136,21.828643),(102.634593,21.787767),(102.629787,21.729114),(102.631906,21.706273),(102.636815,21.683639),(102.643326,21.668033),(102.650664,21.657801),(102.653455,21.656302),(102.657434,21.658421),(102.710299,21.659299),(102.721151,21.661676),(102.752157,21.6809),(102.774688,21.707875),(102.786676,21.739914),(102.789157,21.820323),(102.806727,21.836084),(102.826467,21.821305),(102.834942,21.775623),(102.831893,21.73578),(102.835149,21.716453),(102.84719,21.704464),(102.864501,21.705653),(102.937003,21.735057),(102.942636,21.738984),(102.947804,21.737124),(102.95602,21.723946),(102.959896,21.713043),(102.961756,21.701519),(102.960826,21.632841),(102.964133,21.608605),(102.974107,21.586694),(102.974934,21.583903),(102.975295,21.581009),(102.974934,21.578167),(102.974107,21.575325),(102.954108,21.55729),(102.916591,21.513572),(102.89499,21.495278),(102.84967,21.425412),(102.86476,21.432181),(102.884758,21.444067),(102.904189,21.452697),(102.918038,21.450113),(102.916798,21.438641),(102.883828,21.38836),(102.879642,21.367896),(102.878816,21.322162),(102.875198,21.305316),(102.863003,21.293792),(102.829155,21.285885),(102.812773,21.273896),(102.801301,21.254828),(102.809156,21.25059),(102.828173,21.252451),(102.850187,21.251676),(102.865121,21.246198),(102.878144,21.23762),(102.887859,21.226923),(102.892975,21.215089),(102.891786,21.205994),(102.883001,21.186098),(102.883001,21.176435),(102.889099,21.166409),(102.89592,21.164549),(102.904189,21.164187),(102.914421,21.1584),(102.925634,21.141656),(102.925885,21.14064),(102.935298,21.102382),(102.942171,21.084864),(102.946822,21.075872),(102.951576,21.068999),(102.959482,21.065795),(102.974107,21.067656),(102.99917,21.057372),(103.014518,21.040526),(103.0371,20.995464),(103.06821,20.931282),(103.08671,20.901981),(103.115287,20.868391),(103.130015,20.854904),(103.136371,20.85046),(103.146965,20.846016),(103.165051,20.84369),(103.175232,20.84121),(103.183655,20.837076),(103.197091,20.827825),(103.206909,20.82457),(103.218588,20.824363),(103.225829,20.826413),(103.238122,20.829892),(103.247113,20.830719),(103.263392,20.826378),(103.319822,20.797853),(103.347676,20.789068),(103.358321,20.787725),(103.363799,20.787621),(103.389115,20.794288),(103.390877,20.794753),(103.411238,20.805605),(103.418266,20.811806),(103.421315,20.81811),(103.426586,20.820694),(103.440435,20.815733),(103.452579,20.804313),(103.470872,20.770878),(103.481621,20.757907),(103.489373,20.752481),(103.497331,20.748347),(103.505961,20.74597),(103.516089,20.745505),(103.516089,20.745557),(103.516141,20.745505),(103.516141,20.74535),(103.577946,20.732896),(103.597376,20.722354),(103.63603,20.682821),(103.657941,20.664735),(103.661145,20.660756),(103.665383,20.658275),(103.676338,20.656518),(103.685433,20.657655),(103.697629,20.661531),(103.708481,20.66675),(103.714268,20.671711),(103.713752,20.679824),(103.703623,20.699254),(103.702383,20.708711),(103.70724,20.721837),(103.713442,20.725764),(103.72202,20.72685),(103.734371,20.730932),(103.754576,20.742921),(103.758607,20.749742),(103.755196,20.759406),(103.753026,20.77987),(103.756746,20.795993),(103.76517,20.81625),(103.775557,20.834905),(103.785324,20.845964),(103.796434,20.84953),(103.816691,20.846894),(103.82682,20.847669),(103.83576,20.852268),(103.850488,20.864774),(103.858601,20.86958),(103.932136,20.891801),(103.952187,20.900276),(103.962315,20.902705),(103.973994,20.902343),(104.010581,20.908079),(104.056676,20.958825),(104.092282,20.961202),(104.099155,20.957688),(104.114244,20.947043),(104.122616,20.943167),(104.132072,20.941669),(104.154758,20.941255),(104.165404,20.939757),(104.193877,20.929886),(104.201267,20.925442),(104.207107,20.917639),(104.217545,20.89702),(104.221059,20.892008),(104.228036,20.892318),(104.250566,20.89826),(104.260023,20.898932),(104.269067,20.896193),(104.278937,20.891542),(104.287877,20.885755),(104.295267,20.879812),(104.307204,20.864619),(104.323224,20.833872),(104.336349,20.81904),(104.344669,20.813666),(104.360327,20.808085),(104.367975,20.803124),(104.37335,20.795734),(104.38167,20.778371),(104.389059,20.770981),(104.409316,20.765194),(104.432157,20.765762),(104.452621,20.763592),(104.466161,20.749639),(104.475669,20.71822),(104.492309,20.702097),(104.543882,20.678739),(104.600726,20.660549),(104.615195,20.646493),(104.614071,20.642616),(104.607237,20.619053),(104.542642,20.535699),(104.520731,20.519265),(104.495823,20.511927),(104.469675,20.516165),(104.444973,20.534613),(104.423786,20.495443),(104.423682,20.495443),(104.366425,20.458494),(104.35981,20.439735),(104.39154,20.420667),(104.432364,20.411055),(104.575508,20.414052),(104.589357,20.406818),(104.612301,20.376742),(104.628425,20.365812),(104.666407,20.351782),(104.680928,20.340982),(104.684648,20.333049),(104.687697,20.321706),(104.689299,20.310002),(104.688628,20.301036),(104.681858,20.287471),(104.674106,20.2853),(104.665838,20.285714),(104.657363,20.279616),(104.653539,20.266464),(104.651989,20.246104),(104.653023,20.225795),(104.657053,20.212695),(104.69085,20.196546),(104.733586,20.204763),(104.778803,20.219025),(104.819162,20.220989),(104.907994,20.175333),(104.908976,20.167814),(104.903446,20.157091),(104.904893,20.134638),(104.918381,20.115724),(104.95688,20.091798),(104.964425,20.076088),(104.961169,20.072109),(104.947475,20.069525),(104.943961,20.067097),(104.943651,20.060947),(104.946441,20.052188),(104.948302,20.033662),(104.951454,20.021518),(104.953211,20.009271),(104.94949,19.995499),(104.945688,19.992373),(104.935693,19.984156),(104.922463,19.982244),(104.892905,19.9855),(104.873836,19.982657),(104.86903,19.977748),(104.86717,19.969144),(104.85792,19.955217),(104.835337,19.938887),(104.780663,19.908088),(104.761801,19.885506),(104.755549,19.867006),(104.760716,19.86145),(104.790275,19.859667),(104.80924,19.853673),(104.81663,19.848092),(104.816888,19.838997),(104.81508,19.822409),(104.805003,19.790886),(104.785211,19.776933),(104.760716,19.766521),(104.736738,19.745669),(104.717773,19.740192),(104.704182,19.738693),(104.691676,19.735463),(104.675967,19.724689),(104.663048,19.711227),(104.65478,19.697972),(104.62305,19.61808),(104.614265,19.607435),(104.604963,19.606479),(104.587807,19.615961),(104.579229,19.618028),(104.570237,19.61529),(104.554837,19.605445),(104.546156,19.601931),(104.522798,19.599373),(104.505848,19.60281),(104.449107,19.635159),(104.423786,19.645779),(104.415414,19.650817),(104.401255,19.664434),(104.391746,19.676836),(104.380068,19.685285),(104.360017,19.687456),(104.341879,19.683012),(104.295267,19.654874),(104.277025,19.68389),(104.242143,19.695181),(104.228966,19.706008),(104.200203,19.698586),(104.158169,19.68774),(104.13631,19.687456),(104.131246,19.682443),(104.124476,19.675906),(104.11719,19.660997),(104.109231,19.654874),(104.088716,19.651902),(104.069699,19.658026),(104.021743,19.681435),(104.010271,19.684562),(104.000969,19.680738),(103.995182,19.664899),(103.997662,19.652522),(104.017351,19.600407),(104.028926,19.586041),(104.06019,19.568161),(104.071559,19.559143),(104.077967,19.542891),(104.079259,19.525709),(104.082515,19.509301),(104.093987,19.495633),(104.093987,19.495581),(104.094142,19.495529),(104.094142,19.495478),(104.089956,19.48367),(104.081274,19.479303),(104.070526,19.477029),(104.060501,19.471293),(104.054041,19.46057),(104.049907,19.437471),(104.046548,19.427497),(104.038796,19.41339),(104.03828,19.412925),(104.035127,19.416671),(104.0204,19.414992),(103.99668,19.40693),(103.973994,19.395665),(103.952807,19.390962),(103.941025,19.38135),(103.921284,19.352773),(103.905885,19.341792),(103.870021,19.326883),(103.85674,19.317194),(103.84842,19.299908),(103.858549,19.295335),(103.876739,19.2958),(103.892655,19.293888),(103.905885,19.270039),(103.910949,19.263011),(103.917977,19.258154),(103.943143,19.245596),(103.972754,19.225288),(103.973994,19.225288),(103.995182,19.23384),(104.016162,19.234874),(104.036729,19.230249),(104.14773,19.182887),(104.187831,19.156584),(104.198115,19.146946),(104.201732,19.127051),(104.201836,19.109171),(104.210621,19.100747),(104.239559,19.108886),(104.259603,19.10413),(104.25992,19.104055),(104.274338,19.093461),(104.287257,19.08049),(104.302863,19.068656),(104.321983,19.060466),(104.33914,19.055195),(104.35516,19.047882),(104.372006,19.033568),(104.400738,18.992279),(104.413244,18.983106),(104.431072,18.979334),(104.46213,18.982408),(104.48094,18.977706),(104.497683,18.967991),(104.509879,18.956363),(104.544295,18.906806),(104.556078,18.89647),(104.589667,18.879107),(104.603982,18.868694),(104.631215,18.842365),(104.646201,18.832547),(104.65633,18.829704),(104.675657,18.828206),(104.685579,18.824769),(104.69085,18.819318),(104.702529,18.802471),(104.71028,18.796089),(104.721959,18.792007),(104.762887,18.786451),(104.801644,18.775134),(104.81539,18.773661),(104.872906,18.777976),(104.899364,18.770612),(104.909234,18.745679),(104.919725,18.735576),(104.937243,18.731158),(104.95688,18.731674),(104.97383,18.736067),(104.99016,18.733018),(105.040337,18.705009),(105.064574,18.696638),(105.076976,18.697516),(105.088655,18.700565),(105.100282,18.702064),(105.112684,18.698343),(105.141106,18.653074),(105.162862,18.638993),(105.169477,18.630569),(105.169477,18.618327),(105.169477,18.61486),(105.162087,18.598194),(105.152062,18.596799),(105.140331,18.600468),(105.128136,18.598918),(105.113615,18.580831),(105.100489,18.551169),(105.085244,18.495771),(105.079973,18.454353),(105.090774,18.426525),(105.113976,18.405131),(105.145447,18.383168),(105.162862,18.366012),(105.162242,18.353894),(105.155989,18.340639),(105.156661,18.319839),(105.166169,18.306791),(105.214745,18.277852),(105.220481,18.270798),(105.229266,18.255321),(105.235933,18.249456),(105.246475,18.246381),(105.25692,18.247464),(105.283113,18.250179),(105.288023,18.253409),(105.292518,18.252737),(105.299288,18.24204),(105.300838,18.23093),(105.294379,18.206952),(105.29505,18.195609),(105.305592,18.181062),(105.321871,18.170081),(105.340112,18.162639),(105.355925,18.158738),(105.363315,18.155224),(105.365537,18.151038),(105.368328,18.149953),(105.377474,18.155689),(105.381557,18.162768),(105.386104,18.184938),(105.391995,18.194214),(105.410031,18.201888),(105.431373,18.200544),(105.451423,18.192715),(105.46672,18.180959),(105.472817,18.171993),(105.480879,18.144811),(105.481189,18.138713),(105.479122,18.133494),(105.476848,18.129644),(105.476021,18.127318),(105.480621,18.123649),(105.491989,18.121066),(105.496072,18.118146),(105.512505,18.082825),(105.52067,18.0759),(105.538136,18.066728),(105.546508,18.058951),(105.551882,18.047943),(105.555551,18.025154),(105.559324,18.015336),(105.566145,18.008256),(105.589813,17.99575),(105.589813,17.995595),(105.603431,17.969184),(105.606039,17.964124),(105.594154,17.888108),(105.605212,17.85426),(105.64397,17.820102),(105.669808,17.773076),(105.692029,17.744086),(105.701227,17.727601),(105.713836,17.689464),(105.723086,17.673496),(105.735282,17.664039),(105.787424,17.642077),(105.819876,17.621561),(105.846025,17.597997),(105.911137,17.516813),(105.932169,17.495729),(105.932324,17.495729),(106.019296,17.394495),(106.185435,17.257397),(106.207295,17.246287),(106.221816,17.244892),(106.233391,17.251971),(106.247912,17.266234),(106.252356,17.274554),(106.254785,17.283184),(106.259953,17.28923),(106.272614,17.28985),(106.284551,17.284786),(106.28667,17.276569),(106.285688,17.265976),(106.287961,17.25378),(106.293129,17.246907),(106.306978,17.232954),(106.310544,17.227115),(106.309769,17.217917),(106.301656,17.202),(106.300829,17.191562),(106.306358,17.176524),(106.336537,17.128568),(106.384648,17.085367),(106.394932,17.068003),(106.394363,17.062215),(106.387904,17.051673),(106.387129,17.047178),(106.40402,17.014642),(106.408833,17.005371),(106.411365,16.995811),(106.411365,16.995708),(106.420253,16.98868),(106.437203,16.980463),(106.45653,16.97359),(106.473738,16.970697),(106.496838,16.963927),(106.524536,16.989248),(106.533425,16.97266),(106.53355,16.950638),(106.535078,16.683531),(106.540659,16.659139),(106.549754,16.637797),(106.57244,16.613561),(106.591405,16.60245),(106.611559,16.594595),(106.624943,16.59351),(106.640188,16.586637),(106.644322,16.57532),(106.639671,16.521783),(106.64117,16.510363),(106.655174,16.47083),(106.670677,16.444424),(106.692898,16.427887),(106.722664,16.432486),(106.72256,16.421634),(106.725713,16.417139),(106.732482,16.417552),(106.742404,16.421531),(106.751511,16.428268),(106.752533,16.429024),(106.754393,16.436569),(106.7546,16.444269),(106.759147,16.452485),(106.786122,16.469125),(106.797336,16.47946),(106.801418,16.4961),(106.822864,16.530982),(106.846687,16.530052),(106.86405,16.504058),(106.866841,16.463854),(106.862603,16.430574),(106.861363,16.427887),(106.858211,16.424632),(106.855885,16.420343),(106.855885,16.414658),(106.859865,16.411816),(106.866531,16.414038),(106.872835,16.417345),(106.876298,16.418017),(106.888442,16.390887),(106.897743,16.378536),(106.915003,16.364739),(106.939498,16.351716),(106.946009,16.346135),(106.95066,16.336317),(106.954071,16.313837),(106.956551,16.307068),(106.9673,16.299885),(106.980219,16.298334),(107.014325,16.29942),(107.053393,16.295234),(107.06798,16.290809),(107.070601,16.290015),(107.089101,16.281075),(107.108273,16.267484),(107.116851,16.254616),(107.127497,16.200976),(107.133336,16.188212),(107.13599,16.184784),(107.142018,16.176998),(107.154369,16.166043),(107.169665,16.156896),(107.183204,16.153227),(107.197157,16.151005),(107.212815,16.146664),(107.238808,16.129818),(107.275912,16.084032),(107.298959,16.064189),(107.326864,16.056075),(107.355907,16.059279),(107.41151,16.073077),(107.431044,16.073697),(107.435643,16.068839),(107.433421,16.057367),(107.433292,16.055461),(107.432129,16.038299),(107.436729,16.026878),(107.44355,16.01892),(107.444738,16.00998),(107.432698,15.995924),(107.418022,15.983573),(107.390633,15.935824),(107.375544,15.919081),(107.361074,15.912312),(107.322937,15.905852),(107.305057,15.899134),(107.235656,15.855519),(107.227232,15.853297),(107.218086,15.854796),(107.208835,15.859136),(107.198604,15.862082),(107.186253,15.859395),(107.175246,15.848543),(107.150183,15.794283),(107.148787,15.773457),(107.16026,15.758729),(107.215295,15.727517),(107.225682,15.71682),(107.230023,15.702402),(107.23457,15.660931),(107.239118,15.645119),(107.24873,15.631088),(107.265421,15.61866),(107.303558,15.599747),(107.316426,15.58874),(107.369342,15.496058),(107.381641,15.488539),(107.388669,15.492518),(107.394974,15.501484),(107.405051,15.508589),(107.412234,15.508796),(107.432129,15.503887),(107.437969,15.505592),(107.442981,15.509209),(107.447891,15.508124),(107.453368,15.495954),(107.453368,15.495903),(107.456469,15.488332),(107.46081,15.484379),(107.466546,15.484353),(107.473781,15.488255),(107.487475,15.481408),(107.490162,15.461512),(107.489645,15.437922),(107.493934,15.420042),(107.512641,15.409422),(107.555584,15.415753),(107.573154,15.411231),(107.57636,15.403054),(107.577702,15.39963),(107.579872,15.361234),(107.58659,15.343354),(107.598476,15.330616),(107.643073,15.297853),(107.657594,15.282427),(107.664105,15.268552),(107.664363,15.253153),(107.656818,15.205688),(107.653976,15.199564),(107.647465,15.197652),(107.642607,15.202458),(107.636716,15.205068),(107.62726,15.196515),(107.623591,15.187239),(107.621317,15.154528),(107.615787,15.135511),(107.6054,15.120603),(107.599199,15.114789),(107.584988,15.104299),(107.580492,15.096754),(107.580802,15.086936),(107.590001,15.0689),(107.589071,15.058178),(107.578012,15.047248),(107.562612,15.045801),(107.535224,15.0504),(107.518997,15.04885),(107.502386,15.044037),(107.473781,15.03575),(107.455074,15.034122),(107.445565,15.025389),(107.444687,15.011824),(107.451405,14.995933),(107.449906,14.981102),(107.453937,14.967873),(107.461947,14.956814),(107.473781,14.948236),(107.48949,14.940304),(107.549642,14.895268),(107.558168,14.886715),(107.555326,14.876199),(107.540598,14.856846),(107.498844,14.81765),(107.490885,14.80424),(107.494296,14.788763),(107.504321,14.773182),(107.509282,14.758635),(107.498068,14.745949),(107.504425,14.736285),(107.514657,14.728224),(107.522253,14.718689),(107.520393,14.704582),(107.506905,14.693445),(107.473781,14.646265),(107.458226,14.638798),(107.451766,14.632183),(107.443808,14.609549),(107.440449,14.603916),(107.433266,14.59433),(107.430321,14.586243),(107.429752,14.578336),(107.430941,14.569887),(107.430941,14.561386),(107.42784,14.553712),(107.414921,14.543429),(107.403449,14.543894),(107.380143,14.554048),(107.361384,14.557924),(107.351566,14.561619),(107.332704,14.578233),(107.305677,14.597224),(107.28728,14.598516),(107.272191,14.585364),(107.254517,14.560973),(107.249453,14.556632),(107.237878,14.549811),(107.233899,14.544927),(107.2324,14.538313),(107.230281,14.518262),(107.219739,14.497979),(107.211213,14.493458),(107.195968,14.495964),(107.195813,14.495964),(107.195606,14.496067),(107.195503,14.496119),(107.180568,14.496171),(107.172455,14.484259),(107.166823,14.467154),(107.158709,14.451522),(107.131424,14.427544),(107.10078,14.407623),(107.078559,14.400776),(107.067862,14.406124),(107.059336,14.418036),(107.042954,14.430722),(107.030345,14.436097),(107.027245,14.43527),(107.026573,14.430231),(106.997376,14.395143),(106.977945,14.365429),(106.973656,14.363026),(106.961099,14.360391),(106.950143,14.334863),(106.94973,14.328661),(106.946113,14.32352),(106.933607,14.320161),(106.923478,14.321918),(106.904771,14.333312),(106.895676,14.33631),(106.885083,14.335534),(106.879295,14.332692),(106.874592,14.328351),(106.835835,14.307061),(106.820849,14.307577),(106.806896,14.312926),(106.792995,14.322589),(106.766692,14.348324),(106.731655,14.396719),(106.723904,14.411602),(106.719253,14.417881),(106.711502,14.425839),(106.707161,14.429301),(106.6344,14.450902),(106.622049,14.457594),(106.605358,14.466637),(106.585669,14.495964),(106.575386,14.50201),(106.552441,14.506945),(106.54376,14.512113),(106.540246,14.521673),(106.534975,14.553247),(106.530996,14.56596),(106.518438,14.585002),(106.512496,14.590351),(106.49105,14.570998),(106.483763,14.567484),(106.477149,14.56689),(106.47224,14.564073),(106.470586,14.554255),(106.470948,14.544643),(106.47317,14.537486),(106.477511,14.532602),(106.484849,14.530019),(106.484849,14.523817),(106.469449,14.524696),(106.456685,14.5279),(106.445781,14.529088),(106.43648,14.523817),(106.434309,14.519606),(106.432655,14.512423),(106.433586,14.505705),(106.445161,14.499478),(106.44082,14.492631),(106.433482,14.486636),(106.429503,14.485964),(106.41922,14.466457),(106.393795,14.456173),(106.339999,14.448988),(106.333437,14.448111),(106.320156,14.444494),(106.306462,14.445476),(106.296746,14.447879),(106.235975,14.484362),(106.230084,14.49046),(106.220782,14.473485),(106.210654,14.421395),(106.203936,14.399897),(106.189156,14.378891),(106.17324,14.369667),(106.15412,14.367548),(106.119031,14.369512),(106.095002,14.373646),(106.079447,14.372716),(106.068647,14.373439),(106.063531,14.372922),(106.060585,14.36884),(106.058105,14.353104),(106.055418,14.348428),(106.038158,14.347652),(105.994129,14.362406),(105.973975,14.365843),(105.969428,14.354861),(105.967826,14.343363),(105.96917,14.33202),(105.973975,14.321298),(105.993406,14.30595),(106.004516,14.289982),(106.007979,14.270758),(106.004051,14.245927),(106.012474,14.225774),(106.026272,14.213035),(106.060585,14.191848),(106.076191,14.174511),(106.10172,14.11516),(106.115259,14.100303),(106.131279,14.086997),(106.144559,14.072398),(106.149469,14.053562),(106.142079,14.03501),(106.126421,14.022013),(106.108489,14.01036),(106.094071,13.996175),(106.081979,13.980957),(106.08384,13.934008),(106.069163,13.916542),(106.049216,13.915457),(105.997437,13.928298),(105.973975,13.92928),(105.949171,13.919591),(105.924573,13.91711),(105.899665,13.922614),(105.895581,13.924799),(105.873051,13.936851),(105.787113,14.010154),(105.770164,14.0347),(105.758898,14.062476),(105.744015,14.086945),(105.716007,14.101543),(105.705155,14.102009),(105.683657,14.098856),(105.669343,14.100407),(105.653272,14.107047),(105.643143,14.113455),(105.632911,14.114023),(105.617253,14.10299),(105.609863,14.120741),(105.594567,14.136348),(105.576532,14.144022),(105.561391,14.138156),(105.555551,14.146089),(105.548937,14.153117),(105.541237,14.159189),(105.533175,14.16433),(105.50527,14.145055),(105.490491,14.136916),(105.473851,14.132523),(105.45008,14.11715),(105.422175,14.107874),(105.392461,14.10374),(105.36409,14.10405),(105.347864,14.106065),(105.337787,14.109993),(105.329467,14.117563),(105.303939,14.152393),(105.296601,14.156837),(105.282183,14.161256),(105.27531,14.164821),(105.256913,14.182443),(105.197434,14.270293),(105.187977,14.291015),(105.184256,14.314166),(105.184308,14.34574),(105.198209,14.345224),(105.250454,14.357187),(105.268592,14.36437),(105.275724,14.372095),(105.287712,14.393283),(105.29474,14.399071),(105.304662,14.398192),(105.322232,14.386384),(105.3351,14.385712),(105.340836,14.390105),(105.359646,14.408269),(105.367656,14.414548),(105.379231,14.418242),(105.40569,14.423048),(105.415973,14.428164),(105.420314,14.435218),(105.428892,14.458163),(105.433853,14.467929),(105.440365,14.475345),(105.463671,14.495964),(105.495452,14.537124),(105.507544,14.564048),(105.510128,14.593581),(105.495762,14.659881),(105.497364,14.690422),(105.505115,14.736363),(105.50155,14.745949),(105.490697,14.763803),(105.489147,14.786334),(105.49385,14.808994),(105.50155,14.827339),(105.5062,14.830414),(105.52005,14.833463),(105.524391,14.837235),(105.52408,14.842532),(105.516949,14.856536),(105.515864,14.871677),(105.517776,14.877672),(105.52191,14.878705),(105.53762,14.878034),(105.543046,14.880101),(105.550642,14.902296),(105.534157,14.934025),(105.543924,14.953094),(105.58356,14.977588),(105.593068,14.990792),(105.566455,14.995933),(105.566352,14.995933),(105.566145,14.995933),(105.566145,14.995985),(105.553536,15.005338),(105.524287,15.045956),(105.52284,15.050039),(105.52315,15.061175),(105.520877,15.066136),(105.516536,15.067143),(105.503565,15.064896),(105.498294,15.066136),(105.473851,15.09063),(105.45194,15.094765),(105.44362,15.111353),(105.443775,15.133806),(105.447703,15.155303),(105.454421,15.175535),(105.463102,15.189436),(105.503927,15.231061),(105.531574,15.252894),(105.560254,15.270929),(105.563975,15.272531),(105.564801,15.299455),(105.561494,15.320901),(105.558032,15.325138),(105.53855,15.321521),(105.519378,15.321056),(105.499017,15.324673),(105.483308,15.334517),(105.477468,15.352811),(105.486253,15.374902),(105.5062,15.387589),(105.552813,15.402033),(105.588366,15.423788),(105.592243,15.427546),(105.604282,15.439214),(105.61038,15.457171),(105.612034,15.499468),(105.616271,15.521276),(105.640869,15.583313),(105.650998,15.634602),(105.640921,15.68199),(105.612912,15.72147),(105.568522,15.749376),(105.525424,15.763483),(105.50341,15.766171),(105.462379,15.762812),(105.447961,15.764879),(105.435662,15.771648),(105.423001,15.783896),(105.412046,15.79976),(105.372565,15.882132),(105.360628,15.919391),(105.362488,15.95479),(105.386518,15.980783),(105.407395,15.988896),(105.418144,15.994735),(105.423932,16.002125),(105.423232,16.00504),(105.422071,16.009877),(105.414475,16.015199),(105.404915,16.018817),(105.288539,16.047394),(105.247405,16.049151),(105.237225,16.050804),(105.106979,16.095853),(105.079301,16.105426),(105.058114,16.121188),(105.042456,16.141445),(105.032586,16.165268),(105.028865,16.191468),(105.029744,16.236013),(105.026385,16.257665),(105.015481,16.276734),(105.007419,16.283555),(104.988028,16.293963),(104.979307,16.298645),(104.971504,16.304329),(104.952074,16.324431),(104.944064,16.330839),(104.917296,16.345567),(104.908046,16.35337),(104.901586,16.362465),(104.897039,16.372749),(104.887737,16.403909),(104.879469,16.421841),(104.868927,16.438429),(104.855491,16.454087),(104.838851,16.46773),(104.78273,16.497082),(104.76516,16.511345),(104.754515,16.528915),(104.749502,16.549327),(104.748417,16.571909),(104.753016,16.614801),(104.763713,16.656762),(104.777563,16.694021),(104.77901,16.704873),(104.778338,16.715828),(104.756789,16.798459),(104.756324,16.809879),(104.75791,16.818895),(104.758442,16.82192),(104.765212,16.844658),(104.767072,16.85613),(104.766401,16.86817),(104.762887,16.879074),(104.753016,16.899848),(104.749657,16.910804),(104.74634,16.943532),(104.740356,17.002581),(104.745317,17.024802),(104.809912,17.171666),(104.81446,17.194042),(104.818335,17.240241),(104.816423,17.300082),(104.819989,17.348916),(104.819317,17.36106),(104.816423,17.372791),(104.792704,17.423485),(104.788932,17.428963),(104.781645,17.435268),(104.764644,17.444414),(104.756789,17.449944),(104.749657,17.45816),(104.734258,17.486892),(104.714517,17.515263),(104.702632,17.527303),(104.65509,17.556087),(104.636383,17.562443),(104.481198,17.640423),(104.452001,17.665951),(104.422287,17.699799),(104.417843,17.707602),(104.411642,17.727395),(104.408903,17.733699),(104.404872,17.739952),(104.3903,17.75716),(104.367769,17.800568),(104.352627,17.819327),(104.287567,17.856741),(104.281982,17.861488),(104.278265,17.864647),(104.270307,17.874001),(104.264312,17.884646),(104.255114,17.91498),(104.210879,18.008618),(104.203329,18.018644),(104.198115,18.025568),(104.13569,18.079673),(104.122357,18.095279),(104.110937,18.114554),(104.068407,18.215401),(104.018643,18.299117),(104.000039,18.318444),(103.975441,18.330665),(103.951257,18.332991),(103.929294,18.32759),(103.910019,18.315317),(103.893689,18.297256),(103.889503,18.291159),(103.885938,18.286999),(103.881287,18.284415),(103.873949,18.283226),(103.857774,18.286482),(103.848989,18.296352),(103.842219,18.309116),(103.832091,18.320666),(103.81726,18.330355),(103.801395,18.338262),(103.7846,18.343894),(103.767185,18.346685),(103.709101,18.349708),(103.695562,18.353222),(103.638614,18.377949),(103.629932,18.38322),(103.621354,18.390765),(103.607143,18.400403),(103.5488,18.415415),(103.523169,18.417688),(103.497744,18.423734),(103.489114,18.424432),(103.4748,18.422158),(103.469942,18.421977),(103.451545,18.425311),(103.396768,18.441408),(103.38664,18.441459),(103.306851,18.425672),(103.282564,18.41557),(103.260756,18.400196),(103.244065,18.380068),(103.233988,18.35578),(103.233678,18.349269),(103.235331,18.345264),(103.238018,18.341569),(103.240189,18.335988),(103.248664,18.332629),(103.290418,18.305137),(103.296516,18.296895),(103.295379,18.287774),(103.286336,18.280332),(103.27352,18.276069),(103.236727,18.269997),(103.214919,18.262297),(103.185205,18.25775),(103.17673,18.254856),(103.168204,18.249766),(103.1573,18.237027),(103.150892,18.221499),(103.145104,18.188012),(103.138593,18.166722),(103.126656,18.151865),(103.110068,18.141814),(103.089087,18.134786),(103.089404,18.135223),(103.090087,18.136165),(103.090586,18.136853),(103.092756,18.141194),(103.092133,18.140882),(103.087703,18.138667),(103.07994,18.134786),(103.07131,18.125561),(103.066349,18.112255),(103.064799,18.094039),(103.073067,18.035515),(103.06821,18.025774),(103.058288,18.019263),(103.049399,18.005),(103.037927,17.990686),(103.020461,17.984226),(103.003821,17.988567),(102.972918,18.007739),(102.954935,18.012132),(102.938605,18.008928),(102.852719,17.972031),(102.838043,17.963763),(102.831893,17.953117),(102.774067,17.922731),(102.737377,17.890434),(102.722184,17.881804),(102.686734,17.873535),(102.672988,17.865371),(102.667614,17.850074),(102.67335,17.831781),(102.68291,17.817363),(102.68291,17.810077),(102.660793,17.812867),(102.609426,17.837),(102.595267,17.840824),(102.595577,17.850074),(102.61232,17.91529),(102.599608,17.955184),(102.567517,17.970842),(102.482044,17.971152),(102.445509,17.977767),(102.412229,17.9942),(102.385151,18.016059),(102.366392,18.038797),(102.336523,18.03704),(102.306706,18.051457),(102.25658,18.094039),(102.233119,18.124166),(102.225574,18.128197),(102.221801,18.131608),(102.191571,18.152071),(102.182114,18.169228),(102.178393,18.185971),(102.171934,18.200286),(102.153537,18.210104),(102.107385,18.212377),(102.078503,18.213799),(102.071268,18.208502),(102.055527,18.192345),(101.904301,18.037117),(101.883786,18.030839),(101.845184,18.052129),(101.806064,18.062387),(101.796659,18.073575),(101.790407,18.073575),(101.773922,18.058563),(101.765757,18.040321),(101.75692,17.997817),(101.732581,17.932033),(101.729067,17.912189),(101.636204,17.894826),(101.619874,17.884646),(101.611141,17.865526),(101.600392,17.854364),(101.577551,17.868109),(101.577551,17.852917),(101.575071,17.839791),(101.570523,17.828887),(101.564012,17.820309),(101.545505,17.813672),(101.53404,17.80956),(101.556261,17.792145),(101.53652,17.779123),(101.502724,17.765377),(101.482983,17.745791),(101.479004,17.737988),(101.474198,17.730598),(101.470426,17.722589),(101.468307,17.720367),(101.459109,17.739487),(101.457352,17.745791),(101.45606,17.750184),(101.453476,17.751011),(101.449807,17.749254),(101.44526,17.745791),(101.43203,17.733596),(101.416993,17.732355),(101.401851,17.733751),(101.388002,17.729307),(101.381904,17.720728),(101.388364,17.717783),(101.398751,17.717163),(101.404022,17.715561),(101.403092,17.709463),(101.401593,17.706672),(101.383765,17.684916),(101.37746,17.682643),(101.369864,17.683159),(101.357306,17.679025),(101.247029,17.592157),(101.228632,17.568489),(101.20853,17.531282),(101.202174,17.523169),(101.190288,17.518725),(101.176956,17.5164),(101.166724,17.510612),(101.164243,17.495781),(101.164243,17.495729),(101.14719,17.472475),(101.141816,17.467152),(101.132307,17.461674),(101.128897,17.461158),(101.124659,17.463948),(101.09603,17.475265),(101.066161,17.492215),(101.049315,17.495729),(101.035466,17.512627),(101.019032,17.526632),(101.000842,17.538207),(100.981515,17.547612),(100.937738,17.555486),(100.901934,17.561927),(100.886017,17.57376),(100.885656,17.595878),(100.899453,17.616962),(100.932939,17.654531),(100.953817,17.699799),(100.955878,17.707532),(100.96069,17.725586),(100.958726,17.745791),(100.956401,17.75592),(100.958571,17.764136),(100.964876,17.770596),(100.974281,17.775505),(100.975211,17.777624),(100.975521,17.779794),(100.975211,17.781913),(100.974281,17.78398),(100.967718,17.791008),(100.965186,17.797623),(100.967046,17.803824),(100.974281,17.80925),(100.994796,17.817725),(101.000274,17.830489),(100.997122,17.864595),(101.000842,17.884801),(101.008284,17.89524),(101.039806,17.912034),(101.066161,17.933997),(101.081974,17.958336),(101.094893,17.984381),(101.112308,18.011305),(101.125434,18.02133),(101.157525,18.04045),(101.165173,18.053421),(101.162073,18.067451),(101.144968,18.104736),(101.141609,18.123959),(101.14564,18.141943),(101.160523,18.179512),(101.162796,18.195299),(101.159282,18.204058),(101.152771,18.209071),(101.145536,18.212998),(101.139645,18.218708),(101.131739,18.238862),(101.12838,18.245735),(101.127966,18.280952),(101.130137,18.291159),(101.135408,18.298393),(101.152409,18.316377),(101.155407,18.322888),(101.145536,18.336246),(101.082284,18.364203),(101.074089,18.371613),(101.05102,18.39247),(101.037016,18.410454),(101.030298,18.427791),(101.035621,18.447841),(101.064714,18.476419),(101.071949,18.495668),(101.073809,18.505771),(101.077892,18.510422),(101.142074,18.544296),(101.155355,18.556724),(101.159127,18.567705),(101.158145,18.589978),(101.160884,18.599796),(101.167757,18.606359),(101.185327,18.612534),(101.194112,18.616798),(101.221914,18.642042),(101.23473,18.658449),(101.240104,18.673642),(101.234782,18.68948),(101.211269,18.711908),(101.205843,18.730072),(101.209202,18.746325),(101.223981,18.778545),(101.228632,18.795624),(101.223309,18.855491),(101.224911,18.874766),(101.232921,18.892724),(101.257261,18.919492),(101.267286,18.934453),(101.277001,18.96706),(101.283926,18.981478),(101.326404,19.020546),(101.317877,19.05013),(101.291161,19.078992),(101.247442,19.115785),(101.235712,19.12811),(101.229149,19.143587),(101.226772,19.167152),(101.229872,19.225804),(101.209512,19.309417),(101.209253,19.315592),(101.210907,19.320631),(101.211269,19.326367),(101.207755,19.334687),(101.201967,19.338666),(101.185017,19.341999),(101.178454,19.346624),(101.172356,19.376389),(101.177782,19.417214),(101.192872,19.452793),(101.2153,19.466358),(101.238244,19.472301),(101.251731,19.494444),(101.256951,19.522789),(101.254884,19.547154),(101.25106,19.560306),(101.246202,19.570279),(101.238244,19.578186),(101.225015,19.585214),(101.207961,19.589555),(101.197316,19.586868),(101.188324,19.580744),(101.176852,19.574749),(101.152668,19.568367),(101.124659,19.565112),(101.095824,19.567282),(101.068228,19.577127),(101.024303,19.602861),(101.002548,19.610613),(100.974281,19.613481),(100.885656,19.612447),(100.879816,19.613584),(100.874597,19.612912),(100.865037,19.607151),(100.861213,19.602603),(100.849017,19.582527),(100.808451,19.536535),(100.762614,19.495478),(100.753002,19.48243),(100.745509,19.485013),(100.738171,19.495039),(100.729231,19.50465),(100.714762,19.512454),(100.633268,19.542167),(100.607016,19.540927),(100.585984,19.525967),(100.574758,19.508347),(100.566657,19.495633),(100.549294,19.494548),(100.520613,19.502609),(100.491829,19.514469),(100.474259,19.524985),(100.46196,19.537103),(100.458963,19.551831),(100.458963,19.568057),(100.455553,19.584671),(100.447491,19.597771),(100.427079,19.621801),(100.418862,19.634358),(100.41292,19.651566),(100.410491,19.684252),(100.407235,19.699936),(100.400466,19.71164),(100.390048,19.724387),(100.383826,19.732001),(100.379175,19.745669),(100.383516,19.763859),(100.407659,19.794257),(100.420516,19.810446),(100.43142,19.838273),(100.438448,19.847213),(100.446251,19.852123),(100.46563,19.859771),(100.474259,19.865352),(100.483975,19.8807),(100.487954,19.896978),(100.492656,19.931653),(100.518546,19.995421),(100.518546,19.995499),(100.543351,20.06658),(100.550586,20.106526),(100.548674,20.158021),(100.546503,20.167917),(100.541956,20.166729),(100.536685,20.153474),(100.529243,20.149727),(100.51281,20.155282),(100.496377,20.164868),(100.488936,20.173343),(100.485628,20.178769),(100.468782,20.18572),(100.46103,20.190707),(100.45731,20.196391),(100.452142,20.21024),(100.447336,20.218044),(100.421601,20.250186),(100.364395,20.368965),(100.344345,20.389971),(100.306518,20.399686),(100.270241,20.391831),(100.240372,20.372814),(100.220683,20.348992),(100.209159,20.312999),(100.207196,20.311139),(100.201718,20.310312),(100.179497,20.302483),(100.176397,20.300622),(100.167095,20.292613),(100.167715,20.253623),(100.152522,20.239153),(100.134642,20.239102),(100.116607,20.248016),(100.102964,20.263596),(100.09728,20.283233),(100.099295,20.317805),(100.097642,20.334936),(100.097073,20.348371),(100.099812,20.362221),(100.111129,20.37483),(100.120948,20.388782),(100.125237,20.406404),(100.127407,20.42785),(100.136657,20.459217),(100.149266,20.548101),(100.160067,20.582672),(100.172934,20.609079),(100.172934,20.622102),(100.180169,20.638173),(100.202338,20.667939),(100.207196,20.680754),(100.21133,20.697394),(100.221613,20.70959),(100.248744,20.731966),(100.27453,20.76199),(100.290188,20.775012),(100.329669,20.786019),(100.341968,20.799507),(100.351115,20.81532),(100.364809,20.828187),(100.383671,20.831701),(100.470849,20.818265),(100.513379,20.807),(100.536685,20.807672),(100.569034,20.8178),(100.598903,20.833458),(100.607776,20.839881),(100.626602,20.853509),(100.65213,20.876608),(100.65213,20.882757),(100.623088,20.888545),(100.534204,20.873921),(100.515704,20.886478),(100.517823,20.906322),(100.527073,20.94694),(100.529243,20.968437),(100.533274,20.97345),(100.551981,20.985335),(100.557252,20.992001),(100.555753,20.999856),(100.543454,21.0274),(100.561851,21.0351),(100.606758,21.043936),(100.625516,21.054117),(100.637557,21.069671),(100.689388,21.15933),(100.721066,21.280666),(100.722565,21.292707),(100.721996,21.303662),(100.725407,21.311672),(100.738378,21.314772),(100.747731,21.314256),(100.756671,21.312447),(100.764991,21.309191),(100.772588,21.30423),(100.791966,21.297357),(100.8146,21.3002),(100.851342,21.314772),(100.862453,21.323299),(100.896043,21.355752),(100.909943,21.360093),(101.003426,21.405981),(101.143159,21.513417),(101.157112,21.519669),(101.161143,21.534707),(101.159024,21.552691),(101.174527,21.551657),(101.186567,21.535327),(101.187756,21.505872),(101.168274,21.424533),(101.171426,21.403398),(101.179126,21.398178),(101.207961,21.383502),(101.226462,21.370893),(101.230802,21.371772),(101.233128,21.37172),(101.234782,21.363658),(101.222844,21.335081),(101.207445,21.314824),(101.209512,21.308675),(101.2184,21.299941),(101.220364,21.296272),(101.219072,21.282475),(101.208995,21.245526),(101.220364,21.233692),(101.234782,21.206252),(101.244342,21.192868),(101.259741,21.179484),(101.275296,21.174109),(101.292711,21.176073),(101.313898,21.184755),(101.362267,21.215812),(101.381491,21.222478),(101.495127,21.242839),(101.517607,21.242632),(101.539104,21.23886),(101.5729,21.228163),(101.57967,21.227594),(101.583959,21.22439),(101.588197,21.213332),(101.586646,21.204237),(101.580962,21.194728),(101.577241,21.185168),(101.581789,21.175659),(101.596517,21.173386),(101.635946,21.189457),(101.655118,21.189199),(101.670155,21.177055),(101.688294,21.145842),(101.704262,21.135093),(101.717905,21.134473),(101.73749,21.137574),(101.75599,21.143258),(101.766739,21.150648),(101.768453,21.16045),(101.770201,21.17044),(101.763586,21.184651),(101.760072,21.195968),(101.77356,21.207389),(101.796039,21.202945),(101.805238,21.204495),(101.813299,21.209559),(101.819294,21.215967),(101.82149,21.221071),(101.822808,21.224132),(101.823738,21.234467),(101.820224,21.247283),(101.812266,21.258135),(101.801155,21.267075),(101.788546,21.274206),(101.736508,21.292293),(101.722504,21.30423),(101.715114,21.321129),(101.715579,21.338182),(101.725553,21.375389),(101.729687,21.474246),(101.744259,21.495588),(101.748239,21.514502),(101.734751,21.554396),(101.736198,21.570881),(101.750926,21.579666),(101.772682,21.582508),(101.793559,21.588244),(101.806168,21.605969),(101.803842,21.625916),(101.789528,21.634029),(101.770821,21.638835),(101.755938,21.648654),(101.752321,21.659144),(101.755628,21.680021),(101.754801,21.689788),(101.749117,21.698057),(101.732787,21.711441),(101.72855,21.717539),(101.727981,21.73268),(101.73165,21.750508),(101.751546,21.80637),(101.751081,21.816137),(101.726173,21.837273),(101.721263,21.844353),(101.708706,21.869571),(101.685865,21.898613),(101.683075,21.907139),(101.682454,21.914839),(101.680594,21.922642),(101.673669,21.931376),(101.638116,21.940884),(101.616309,21.953648),(101.6068,21.967601),(101.600392,22.007495),(101.592176,22.028114),(101.564942,22.069507),(101.555434,22.090332),(101.55502,22.112398),(101.561842,22.130072),(101.566958,22.149347),(101.561532,22.176115),(101.549026,22.19353),(101.518227,22.228205),(101.515746,22.245362),(101.531714,22.263397),(101.540654,22.271458),(101.55099,22.276678),(101.563702,22.276781),(101.575743,22.273112),(101.58799,22.271355),(101.601219,22.276988),(101.606128,22.284842),(101.619874,22.326442),(101.62251,22.342358),(101.623698,22.346647),(101.641113,22.363287),(101.643697,22.364683),(101.645713,22.384526),(101.644162,22.404008),(101.645092,22.424214),(101.654549,22.446125),(101.668657,22.462299),(101.689121,22.478887),(101.71315,22.491548),(101.741779,22.496044),(101.750616,22.496044),(101.75506,22.495527),(101.784877,22.472221),(101.817795,22.406334),(101.8426,22.383338),(101.867921,22.378842)]
+Lebanon	[(36.391194,34.622487),(36.415999,34.622901),(36.440184,34.62936),(36.436256,34.597838),(36.429125,34.593187),(36.418479,34.600318),(36.4037,34.603832),(36.388921,34.596236),(36.386853,34.584247),(36.388094,34.569519),(36.383546,34.553809),(36.364012,34.541097),(36.336624,34.52885),(36.319881,34.514122),(36.329851,34.498603),(36.332697,34.494175),(36.335384,34.493477),(36.338174,34.493296),(36.340965,34.493477),(36.343652,34.494175),(36.363082,34.499032),(36.392331,34.500143),(36.41972,34.498335),(36.433466,34.49433),(36.433466,34.494175),(36.439873,34.477457),(36.449795,34.464538),(36.463231,34.455237),(36.480181,34.449139),(36.494651,34.434256),(36.501885,34.430303),(36.509223,34.432421),(36.52514,34.422939),(36.530617,34.41418),(36.52979,34.403095),(36.526276,34.386688),(36.523589,34.379789),(36.519972,34.375061),(36.516768,34.369867),(36.515941,34.36165),(36.518628,34.353641),(36.523589,34.345889),(36.54519,34.320723),(36.555835,34.311085),(36.562967,34.308501),(36.570305,34.308966),(36.576816,34.307674),(36.581984,34.299897),(36.579917,34.286901),(36.570305,34.275868),(36.56276,34.262949),(36.567514,34.244138),(36.574026,34.229746),(36.59821,34.209851),(36.603554,34.200101),(36.604101,34.199102),(36.575886,34.173264),(36.552735,34.140992),(36.507983,34.109185),(36.488449,34.088644),(36.482662,34.07451),(36.480698,34.062754),(36.47522,34.053504),(36.45889,34.046708),(36.445144,34.04614),(36.423647,34.052806),(36.412175,34.053633),(36.391091,34.044719),(36.357811,34.009553),(36.31802,33.980511),(36.302311,33.964388),(36.288565,33.946508),(36.267171,33.910386),(36.268928,33.906769),(36.275336,33.897209),(36.28164,33.891111),(36.311096,33.87199),(36.35037,33.866409),(36.36763,33.857547),(36.369594,33.837006),(36.357501,33.823776),(36.338278,33.821193),(36.300554,33.828686),(36.249187,33.849744),(36.231824,33.852534),(36.216631,33.847754),(36.202679,33.838297),(36.186556,33.83021),(36.165678,33.829797),(36.157617,33.83406),(36.144904,33.847418),(36.13829,33.850622),(36.102426,33.832277),(36.085063,33.82605),(36.06646,33.821994),(36.05044,33.816438),(36.040518,33.805612),(36.027082,33.784296),(35.994009,33.760705),(35.980263,33.743549),(35.974165,33.732154),(35.955872,33.718124),(35.948431,33.70921),(35.946984,33.700838),(35.949878,33.6827),(35.94719,33.673088),(35.942436,33.669212),(35.929414,33.665078),(35.925383,33.661667),(35.921559,33.640299),(35.934788,33.6334),(35.956906,33.629938),(35.980263,33.619008),(35.994526,33.615701),(36.012923,33.608027),(36.029666,33.59764),(36.038451,33.586349),(36.035247,33.567797),(36.019847,33.55263),(35.99928,33.541261),(35.980263,33.533949),(35.956802,33.534207),(35.933238,33.527825),(35.921869,33.51457),(35.935408,33.494262),(35.919492,33.462351),(35.888486,33.440415),(35.870089,33.431242),(35.845116,33.418742),(35.8211,33.406722),(35.8057,33.391348),(35.785753,33.357887),(35.769423,33.342643),(35.757538,33.336313),(35.743689,33.331171),(35.729426,33.327812),(35.716197,33.326727),(35.698523,33.32267),(35.66049,33.289261),(35.640542,33.275851),(35.624716,33.272924),(35.610363,33.27027),(35.601475,33.262725),(35.604576,33.244354),(35.604576,33.244303),(35.604576,33.244251),(35.603892,33.240323),(35.603852,33.240091),(35.598064,33.244251),(35.597858,33.24438),(35.597754,33.244354),(35.585042,33.252209),(35.566955,33.276187),(35.561167,33.28213),(35.549489,33.281019),(35.542771,33.271536),(35.53688,33.257868),(35.527784,33.244251),(35.520033,33.222185),(35.517656,33.172886),(35.512282,33.147409),(35.503703,33.130615),(35.4851,33.102606),(35.480139,33.087387),(35.449443,33.085217),(35.401591,33.067931),(35.34516,33.05558),(35.331931,33.057156),(35.322629,33.067363),(35.315704,33.079222),(35.305783,33.089377),(35.29462,33.096973),(35.288825,33.099201),(35.283665,33.101185),(35.271469,33.101185),(35.234469,33.090927),(35.227338,33.091366),(35.213178,33.094441),(35.207184,33.094803),(35.200673,33.092736),(35.189614,33.085527),(35.185273,33.083977),(35.105235,33.089016),(35.105235,33.090644),(35.106456,33.095038),(35.101899,33.094468),(35.100434,33.095689),(35.100434,33.098212),(35.09962,33.101264),(35.105805,33.112454),(35.114757,33.123725),(35.125499,33.132514),(35.147634,33.140326),(35.154796,33.150295),(35.160981,33.161689),(35.167817,33.170152),(35.161794,33.176947),(35.167817,33.177883),(35.171072,33.176581),(35.174653,33.170152),(35.204763,33.224799),(35.209158,33.254625),(35.188324,33.280015),(35.209727,33.293402),(35.224783,33.311998),(35.243663,33.355699),(35.246104,33.368883),(35.246755,33.395819),(35.250499,33.409735),(35.268728,33.432603),(35.275076,33.444973),(35.271007,33.457506),(35.323009,33.490912),(35.349132,33.513861),(35.360362,33.543443),(35.362478,33.556342),(35.400645,33.643134),(35.394379,33.64997),(35.409923,33.661282),(35.421641,33.702338),(35.438487,33.711371),(35.437836,33.723375),(35.477306,33.8039),(35.481293,33.823676),(35.483002,33.86518),(35.483246,33.872463),(35.479991,33.884263),(35.473806,33.893866),(35.47047,33.902086),(35.475841,33.90998),(35.486583,33.912991),(35.499766,33.9112),(35.511241,33.90705),(35.517345,33.902533),(35.524181,33.902533),(35.533865,33.90705),(35.548106,33.906195),(35.557465,33.905666),(35.572032,33.90998),(35.57838,33.916693),(35.587901,33.936591),(35.59311,33.94477),(35.593435,33.94892),(35.59197,33.950426),(35.585704,33.950914),(35.594249,33.959296),(35.606293,33.983222),(35.613536,33.99315),(35.620128,33.995103),(35.636729,33.995307),(35.64088,33.999416),(35.640391,34.008531),(35.635753,34.013251),(35.630382,34.016099),(35.627208,34.019843),(35.626964,34.044257),(35.643321,34.08808),(35.647716,34.119127),(35.644542,34.130845),(35.630382,34.152818),(35.627208,34.166938),(35.627208,34.201117),(35.630382,34.208441),(35.644542,34.216986),(35.647716,34.222154),(35.648285,34.253607),(35.653005,34.284857),(35.665212,34.311347),(35.688731,34.328315),(35.705821,34.316596),(35.722179,34.33747),(35.737315,34.369208),(35.750743,34.389797),(35.806163,34.414984),(35.823578,34.434516),(35.805431,34.458686),(35.805431,34.464911),(35.823985,34.460842),(35.903331,34.477973),(35.956798,34.520087),(35.972911,34.529771),(35.983165,34.538642),(35.98878,34.55272),(35.989594,34.599677),(35.986827,34.620795),(35.980642,34.638495),(35.9699,34.649848),(35.9699,34.649849),(35.98264,34.650238),(35.991425,34.648222),(35.998763,34.64538),(36.01623,34.633649),(36.037934,34.62843),(36.060775,34.627913),(36.087234,34.631014),(36.11214,34.629532),(36.15586,34.626931),(36.160201,34.628068),(36.17219,34.634063),(36.178287,34.635303),(36.183352,34.633494),(36.195134,34.626208),(36.201232,34.624451),(36.26159,34.627242),(36.271512,34.630962),(36.28071,34.639127),(36.284431,34.648326),(36.284844,34.667911),(36.288151,34.675559),(36.308925,34.687548),(36.323808,34.679486),(36.347373,34.64414),(36.367526,34.629205),(36.391194,34.622487)]
+Liberia	[(-9.722115,8.435636),(-9.718188,8.438272),(-9.717981,8.452689),(-9.7155,8.473334),(-9.703253,8.487261),(-9.683513,8.487054),(-9.663514,8.477856),(-9.650543,8.464807),(-9.645117,8.443413),(-9.653385,8.43145),(-9.666511,8.422381),(-9.675916,8.409643),(-9.67726,8.39153),(-9.668372,8.38874),(-9.653385,8.392099),(-9.636125,8.392564),(-9.628064,8.391634),(-9.619537,8.392719),(-9.612148,8.396336),(-9.607342,8.402925),(-9.600159,8.410883),(-9.592045,8.405095),(-9.579178,8.387293),(-9.529052,8.366312),(-9.511482,8.353781),(-9.504351,8.346158),(-9.499131,8.343471),(-9.511482,8.336133),(-9.515616,8.334376),(-9.522282,8.330681),(-9.528483,8.32572),(-9.539387,8.314584),(-9.530189,8.30598),(-9.525124,8.295438),(-9.521249,8.284405),(-9.515616,8.274406),(-9.510758,8.270065),(-9.509156,8.265595),(-9.51081,8.261047),(-9.515616,8.256603),(-9.525435,8.24079),(-9.531894,8.212316),(-9.530137,8.185496),(-9.515616,8.174877),(-9.491328,8.169968),(-9.481406,8.164697),(-9.478099,8.152785),(-9.478047,8.141287),(-9.459805,8.068785),(-9.461873,8.058424),(-9.472776,8.040363),(-9.474223,8.028813),(-9.462183,8.043464),(-9.451537,8.051758),(-9.440944,8.050569),(-9.429265,8.036901),(-9.424149,8.026178),(-9.42234,8.015791),(-9.424562,8.005817),(-9.431745,7.996567),(-9.433093,7.993468),(-9.446008,7.950058),(-9.448437,7.907839),(-9.43867,7.866239),(-9.415674,7.824433),(-9.389681,7.791464),(-9.380999,7.77441),(-9.355471,7.741906),(-9.366374,7.716171),(-9.376245,7.680566),(-9.374694,7.646925),(-9.353507,7.62243),(-9.364411,7.614265),(-9.372989,7.601346),(-9.378777,7.586256),(-9.38366,7.55954),(-9.390817,7.548223),(-9.408697,7.527449),(-9.404925,7.513599),(-9.4134,7.492257),(-9.436086,7.458564),(-9.456705,7.443061),(-9.466213,7.433449),(-9.470244,7.420995),(-9.470864,7.407353),(-9.4735,7.39557),(-9.479701,7.38539),(-9.490708,7.376037),(-9.487099,7.373204),(-9.486626,7.372833),(-9.478357,7.376915),(-9.449263,7.405079),(-9.438101,7.421564),(-9.418723,7.387767),(-9.407354,7.378052),(-9.392264,7.39986),(-9.386477,7.401668),(-9.381412,7.404975),(-9.379242,7.415828),(-9.375159,7.41929),(-9.365961,7.421099),(-9.349218,7.421564),(-9.335007,7.419652),(-9.327772,7.417068),(-9.319401,7.411952),(-9.312424,7.403322),(-9.3055,7.383478),(-9.299505,7.376605),(-9.283796,7.374073),(-9.249715,7.383065),(-9.234341,7.381308),(-9.219872,7.360999),(-9.206281,7.298367),(-9.181476,7.275681),(-9.17543,7.274596),(-9.15308,7.275474),(-9.147473,7.271392),(-9.146905,7.25408),(-9.139153,7.247879),(-9.11962,7.237957),(-9.116054,7.224676),(-9.125407,7.190208),(-9.113935,7.200388),(-9.106085,7.202975),(-9.100448,7.204833),(-9.086392,7.20721),(-9.073111,7.211344),(-9.059261,7.221369),(-9.046652,7.232738),(-9.032855,7.240283),(-9.015698,7.238887),(-9.007637,7.243487),(-8.985467,7.25005),(-8.981023,7.250566),(-8.977716,7.266224),(-8.973117,7.267671),(-8.962575,7.262969),(-8.9572,7.286481),(-8.944385,7.278678),(-8.925419,7.248603),(-8.91219,7.250153),(-8.868885,7.266638),(-8.857827,7.273046),(-8.851367,7.292889),(-8.855915,7.311855),(-8.863304,7.32989),(-8.865371,7.346891),(-8.860617,7.35764),(-8.851626,7.371489),(-8.83341,7.393865),(-8.82403,7.399808),(-8.807701,7.40451),(-8.799226,7.41221),(-8.795453,7.421099),(-8.793955,7.441511),(-8.790389,7.450812),(-8.784394,7.455722),(-8.756489,7.472413),(-8.739539,7.490552),(-8.729617,7.50869),(-8.725742,7.528534),(-8.726827,7.55184),(-8.729514,7.556387),(-8.73401,7.557679),(-8.738041,7.559488),(-8.739178,7.565689),(-8.737369,7.571425),(-8.731478,7.581761),(-8.730031,7.587445),(-8.727576,7.622017),(-8.720677,7.642739),(-8.694477,7.674416),(-8.686571,7.694364),(-8.567405,7.688214),(-8.57278,7.650749),(-8.566527,7.623412),(-8.54782,7.600777),(-8.515625,7.577161),(-8.485446,7.557989),(-8.44364,7.537112),(-8.425605,7.50192),(-8.405141,7.431279),(-8.393049,7.334334),(-8.387675,7.314955),(-8.38106,7.303018),(-8.364007,7.278885),(-8.357547,7.265708),(-8.349692,7.234702),(-8.34499,7.226795),(-8.333001,7.211861),(-8.32897,7.204006),(-8.328453,7.197391),(-8.330572,7.184731),(-8.329745,7.178323),(-8.326231,7.17207),(-8.311503,7.15729),(-8.305354,7.146903),(-8.302615,7.137602),(-8.30122,7.11321),(-8.284115,7.017867),(-8.286647,6.993786),(-8.29414,6.984381),(-8.314552,6.968568),(-8.319978,6.95999),(-8.321219,6.942265),(-8.319978,6.925832),(-8.320909,6.910174),(-8.333673,6.882578),(-8.328763,6.875085),(-8.320599,6.869659),(-8.315715,6.86382),(-8.314966,6.850281),(-8.316619,6.836276),(-8.324991,6.806252),(-8.337497,6.777262),(-8.351759,6.755351),(-8.441646,6.65531),(-8.461313,6.633421),(-8.533557,6.576344),(-8.547148,6.56004),(-8.549473,6.560143),(-8.566113,6.550919),(-8.567198,6.550609),(-8.566113,6.549059),(-8.570609,6.535132),(-8.572728,6.530843),(-8.577327,6.528026),(-8.589368,6.526063),(-8.594122,6.523892),(-8.61872,6.492835),(-8.601847,6.49175),(-8.592106,6.489683),(-8.568077,6.490406),(-8.556501,6.487021),(-8.545339,6.477203),(-8.515625,6.437593),(-8.497229,6.431366),(-8.484775,6.441572),(-8.47692,6.460149),(-8.472372,6.47865),(-8.467515,6.487073),(-8.46121,6.482887),(-8.449635,6.467927),(-8.418267,6.451209),(-8.405089,6.436327),(-8.406485,6.430539),(-8.413874,6.424183),(-8.419042,6.407646),(-8.417233,6.398189),(-8.408242,6.379922),(-8.405968,6.372248),(-8.410981,6.363179),(-8.420153,6.358088),(-8.423693,6.351991),(-8.411807,6.340028),(-8.401059,6.35044),(-8.388811,6.355091),(-8.376564,6.35473),(-8.36597,6.350079),(-8.352948,6.36106),(-8.342613,6.356952),(-8.332949,6.34597),(-8.322356,6.336462),(-8.317498,6.336979),(-8.314191,6.341526),(-8.310005,6.344627),(-8.302718,6.340648),(-8.297706,6.332586),(-8.296569,6.324395),(-8.296569,6.317497),(-8.29507,6.313363),(-8.285975,6.310055),(-8.208486,6.292537),(-8.196575,6.288144),(-8.185723,6.28184),(-8.179057,6.276853),(-8.170582,6.274011),(-8.154355,6.274218),(-8.140609,6.277577),(-8.118285,6.289901),(-8.106606,6.294681),(-8.060098,6.301141),(-8.033019,6.301761),(-8.015708,6.297782),(-7.999378,6.286697),(-7.934886,6.271427),(-7.929511,6.270755),(-7.925222,6.272512),(-7.920545,6.273804),(-7.91437,6.271737),(-7.912665,6.26843),(-7.910029,6.256777),(-7.906567,6.251997),(-7.862125,6.216392),(-7.846622,6.197478),(-7.844142,6.183965),(-7.857371,6.145388),(-7.862022,6.124382),(-7.864502,6.101696),(-7.861815,6.08149),(-7.850911,6.067564),(-7.850498,6.07224),(-7.840886,6.077356),(-7.82838,6.080715),(-7.819389,6.080095),(-7.809674,6.071207),(-7.805695,6.062034),(-7.802439,6.039245),(-7.799235,6.035679),(-7.793861,6.034077),(-7.788745,6.031493),(-7.786471,6.025111),(-7.78859,6.019789),(-7.797736,6.01475),(-7.799958,6.010151),(-7.800682,5.981729),(-7.799648,5.974468),(-7.786626,5.958165),(-7.747145,5.937597),(-7.73495,5.925634),(-7.717173,5.900752),(-7.70322,5.907883),(-7.691541,5.927727),(-7.680483,5.94093),(-7.674023,5.935737),(-7.663119,5.923102),(-7.64834,5.911294),(-7.630615,5.908607),(-7.629116,5.904938),(-7.608497,5.893698),(-7.605758,5.89313),(-7.584158,5.883699),(-7.579093,5.877188),(-7.587207,5.866775),(-7.579507,5.860341),(-7.566278,5.843727),(-7.559146,5.839851),(-7.547571,5.845432),(-7.535194,5.855845),(-7.527779,5.858842),(-7.531086,5.842022),(-7.515583,5.839231),(-7.508813,5.826183),(-7.503904,5.812101),(-7.494396,5.806184),(-7.486644,5.813806),(-7.481683,5.830214),(-7.478583,5.859876),(-7.446543,5.845949),(-7.442047,5.811274),(-7.448559,5.769055),(-7.449489,5.732364),(-7.43104,5.653971),(-7.417963,5.627757),(-7.396676,5.585087),(-7.384118,5.568964),(-7.405099,5.5724),(-7.41192,5.560359),(-7.407114,5.541394),(-7.393627,5.523979),(-7.41347,5.522816),(-7.419982,5.523127),(-7.409852,5.513417),(-7.408148,5.511784),(-7.41347,5.503489),(-7.425149,5.494162),(-7.432384,5.479563),(-7.431712,5.441917),(-7.436208,5.431323),(-7.450212,5.438713),(-7.449954,5.422771),(-7.446027,5.404917),(-7.439102,5.387812),(-7.429697,5.374298),(-7.414866,5.365978),(-7.404375,5.367994),(-7.396934,5.366444),(-7.391456,5.347685),(-7.388821,5.328384),(-7.389751,5.317144),(-7.39559,5.306783),(-7.407683,5.289859),(-7.410111,5.283167),(-7.41378,5.266708),(-7.418793,5.260455),(-7.428508,5.25614),(-7.430834,5.25999),(-7.430885,5.267535),(-7.434089,5.274072),(-7.435175,5.279291),(-7.43011,5.284252),(-7.428508,5.288154),(-7.439929,5.290169),(-7.442409,5.287379),(-7.468247,5.273452),(-7.475689,5.264228),(-7.479926,5.255158),(-7.490468,5.222189),(-7.482252,5.17506),(-7.483027,5.158239),(-7.488918,5.140669),(-7.515841,5.091809),(-7.529923,5.09739),(-7.546847,5.0977),(-7.563229,5.090156),(-7.575786,5.072069),(-7.578163,5.054731),(-7.57036,4.99688),(-7.570205,4.99688),(-7.5716,4.975382),(-7.564624,4.961585),(-7.555322,4.948433),(-7.549586,4.929054),(-7.549534,4.913887),(-7.553462,4.914249),(-7.561782,4.920166),(-7.574959,4.921561),(-7.6055,4.897428),(-7.605965,4.887997),(-7.598834,4.857095),(-7.600229,4.845804),(-7.605862,4.825133),(-7.605997,4.817363),(-7.606017,4.816193),(-7.601004,4.804643),(-7.593408,4.797434),(-7.585553,4.791543),(-7.579558,4.784283),(-7.576871,4.775291),(-7.572479,4.723356),(-7.576871,4.509338),(-7.575424,4.500347),(-7.572737,4.491122),(-7.570929,4.48071),(-7.572841,4.455388),(-7.565709,4.435208),(-7.564314,4.425829),(-7.567415,4.415933),(-7.577853,4.397278),(-7.579197,4.387149),(-7.573771,4.375393),(-7.540666,4.352845),(-7.541005,4.352769),(-7.593251,4.347235),(-7.608225,4.349433),(-7.631663,4.35928),(-7.644439,4.361518),(-7.712717,4.361518),(-7.721018,4.364691),(-7.725413,4.371772),(-7.728627,4.378811),(-7.733225,4.382025),(-7.749501,4.383246),(-7.788726,4.398912),(-7.801015,4.406317),(-7.812327,4.416083),(-7.818267,4.427191),(-7.823801,4.440741),(-7.832875,4.452216),(-7.862904,4.461371),(-7.88683,4.48017),(-7.89802,4.484442),(-7.91454,4.486518),(-7.924428,4.491685),(-7.9322,4.498358),(-7.942006,4.504869),(-7.959869,4.51203),(-8.003163,4.523505),(-8.037506,4.528754),(-8.100331,4.55329),(-8.222035,4.568061),(-8.257314,4.579983),(-8.300201,4.627265),(-8.316029,4.635199),(-8.335357,4.638821),(-8.438547,4.676174),(-8.549957,4.754869),(-8.607533,4.786933),(-8.74706,4.837714),(-8.778147,4.854315),(-8.848297,4.91356),(-8.874338,4.930121),(-8.9051,4.944322),(-8.915517,4.946275),(-8.936106,4.95539),(-8.966786,4.96011),(-8.991322,4.967515),(-9.014801,4.978461),(-9.031972,4.991441),(-9.028717,4.993638),(-9.028066,4.994289),(-9.027821,4.995429),(-9.025787,4.998928),(-9.069651,5.010972),(-9.10497,5.031562),(-9.162262,5.080878),(-9.17809,5.09101),(-9.212758,5.107408),(-9.243967,5.130561),(-9.261952,5.137274),(-9.278717,5.145738),(-9.291982,5.163479),(-9.278961,5.163479),(-9.292144,5.181627),(-9.312245,5.192613),(-9.334462,5.200995),(-9.354075,5.211168),(-9.470815,5.320461),(-9.477935,5.335354),(-9.488515,5.371649),(-9.497467,5.38939),(-9.508046,5.399604),(-9.524281,5.410793),(-9.541819,5.419827),(-9.556508,5.423489),(-9.559397,5.425035),(-9.587636,5.430732),(-9.593658,5.430325),(-9.59496,5.440009),(-9.583079,5.454901),(-9.580719,5.464504),(-9.596995,5.488349),(-9.696767,5.546373),(-9.842112,5.685452),(-9.979644,5.798082),(-10.015207,5.838121),(-10.022613,5.844224),(-10.039947,5.854315),(-10.046213,5.861721),(-10.049062,5.871772),(-10.044789,5.884467),(-10.046213,5.89643),(-10.055531,5.91177),(-10.071278,5.924791),(-10.089101,5.933987),(-10.104237,5.937445),(-10.11498,5.943305),(-10.185699,5.999091),(-10.226552,6.043606),(-10.279897,6.076972),(-10.298166,6.084906),(-10.336008,6.092231),(-10.353668,6.102362),(-10.364125,6.115668),(-10.36148,6.129218),(-10.352284,6.123521),(-10.344472,6.122707),(-10.338124,6.126776),(-10.333567,6.136054),(-10.353627,6.140611),(-10.367991,6.151801),(-10.380605,6.165351),(-10.395619,6.176988),(-10.428131,6.197008),(-10.444692,6.203843),(-10.463938,6.204983),(-10.463938,6.197496),(-10.41218,6.171047),(-10.389394,6.152167),(-10.381947,6.129218),(-10.397125,6.147854),(-10.424875,6.164618),(-10.456695,6.177476),(-10.659413,6.227484),(-10.788319,6.292955),(-10.807851,6.310858),(-10.800364,6.327826),(-10.795562,6.319648),(-10.790354,6.31391),(-10.78307,6.310004),(-10.772369,6.307359),(-10.789052,6.334947),(-10.792348,6.359036),(-10.782338,6.381415),(-10.759389,6.404202),(-10.773671,6.404202),(-10.784088,6.401272),(-10.792348,6.396226),(-10.800364,6.389879),(-10.82433,6.43773),(-10.85733,6.472846),(-10.895904,6.49901),(-11.053619,6.584174),(-11.233062,6.648098),(-11.353179,6.701158),(-11.374867,6.726874),(-11.375722,6.766669),(-11.369944,6.788886),(-11.368642,6.798245),(-11.368276,6.811347),(-11.381947,6.836819),(-11.38561,6.841783),(-11.404408,6.847073),(-11.424224,6.85932),(-11.44107,6.873277),(-11.450795,6.883368),(-11.476186,6.91942),(-11.444491,6.933945),(-11.436739,6.938544),(-11.438858,6.963865),(-11.434672,6.980815),(-11.407283,6.99637),(-11.397723,7.012803),(-11.391522,7.031768),(-11.3893,7.046703),(-11.392917,7.066857),(-11.389714,7.073523),(-11.367906,7.075952),(-11.360465,7.078639),(-11.355142,7.084065),(-11.353127,7.092798),(-11.356434,7.105356),(-11.370593,7.128403),(-11.373229,7.138842),(-11.370128,7.142614),(-11.352041,7.159254),(-11.317211,7.213566),(-11.30021,7.21708),(-11.217889,7.25408),(-11.209259,7.262194),(-11.144213,7.345193),(-11.126319,7.368027),(-10.977904,7.484919),(-10.937028,7.50776),(-10.898994,7.516493),(-10.885713,7.522178),(-10.874603,7.530859),(-10.864025,7.543684),(-10.730581,7.705474),(-10.692598,7.737565),(-10.645418,7.763041),(-10.638131,7.765522),(-10.615187,7.769036),(-10.617668,8.010778),(-10.616221,8.022509),(-10.612138,8.031862),(-10.603147,8.039226),(-10.577825,8.053153),(-10.56718,8.063204),(-10.543977,8.10607),(-10.529249,8.124286),(-10.505736,8.135835),(-10.485738,8.138858),(-10.405071,8.139272),(-10.384555,8.142114),(-10.364918,8.148212),(-10.34554,8.159348),(-10.320942,8.183119),(-10.318151,8.201645),(-10.326006,8.221541),(-10.333292,8.249756),(-10.331277,8.272287),(-10.313655,8.310347),(-10.282908,8.432949),(-10.282236,8.484625),(-10.271332,8.484109),(-10.260842,8.485917),(-10.240275,8.493746),(-10.23242,8.477055),(-10.215625,8.486589),(-10.181829,8.519584),(-10.164879,8.524649),(-10.147981,8.524287),(-10.091085,8.510102),(-10.076099,8.501498),(-10.069277,8.486873),(-10.079354,8.439951),(-10.075013,8.426644),(-10.061681,8.422174),(-10.04039,8.425663),(-10.000186,8.449305),(-9.961119,8.479561),(-9.944169,8.488346),(-9.928149,8.493436),(-9.911354,8.495658),(-9.891872,8.495917),(-9.886911,8.49664),(-9.872804,8.500361),(-9.868153,8.498087),(-9.863502,8.49354),(-9.858644,8.487054),(-9.849704,8.48969),(-9.831617,8.499017),(-9.806813,8.506252),(-9.805469,8.512789),(-9.808828,8.520463),(-9.808854,8.528473),(-9.802007,8.53718),(-9.794824,8.544544),(-9.790018,8.553071),(-9.790586,8.565396),(-9.773585,8.563018),(-9.763043,8.54997),(-9.757307,8.53271),(-9.750899,8.485866),(-9.7463,8.468063),(-9.735913,8.450493),(-9.722115,8.435636)]
+Libya	[(19.291677,30.287055),(19.338552,30.298814),(19.418956,30.333238),(19.530528,30.396796),(19.551036,30.404934),(19.596039,30.412014),(19.616384,30.421373),(19.748871,30.510932),(19.914317,30.682929),(19.958181,30.749701),(19.982188,30.778632),(20.018728,30.803778),(20.036469,30.819078),(20.099864,30.935004),(20.146658,31.045559),(20.152354,31.088202),(20.146658,31.216783),(20.128103,31.242987),(20.103282,31.308743),(20.082205,31.336615),(20.038341,31.375881),(20.022227,31.396796),(19.954845,31.559475),(19.948904,31.60102),(19.948009,31.645087),(19.944347,31.661444),(19.926931,31.699164),(19.920665,31.717719),(19.917247,31.759223),(19.919688,31.804674),(19.934337,31.888414),(19.948009,31.925971),(19.945811,31.935981),(19.941742,31.946926),(19.940115,31.95775),(19.944591,31.967515),(19.957205,31.982733),(20.048025,32.146064),(20.071544,32.176418),(20.261729,32.339545),(20.277192,32.360826),(20.32545,32.409817),(20.345714,32.419908),(20.385509,32.434638),(20.403331,32.447333),(20.416759,32.459459),(20.562673,32.557847),(20.79656,32.643012),(20.934093,32.722602),(21.050955,32.772284),(21.09669,32.781073),(21.286794,32.771145),(21.331879,32.774644),(21.414806,32.793402),(21.4546,32.812567),(21.608653,32.930732),(21.62322,32.936754),(21.671723,32.939887),(21.716319,32.950385),(21.743663,32.930854),(21.787446,32.915961),(21.836111,32.906562),(21.877452,32.903225),(22.096202,32.923082),(22.101329,32.926418),(22.111827,32.940904),(22.11671,32.944159),(22.138845,32.947577),(22.149587,32.947943),(22.161388,32.944159),(22.169444,32.938218),(22.171072,32.932929),(22.171072,32.926256),(22.175059,32.916246),(22.206798,32.888129),(22.247325,32.880845),(22.33961,32.882148),(22.379161,32.870347),(22.477306,32.807074),(22.496755,32.797309),(22.513845,32.790961),(22.532237,32.787543),(22.578868,32.784613),(22.812511,32.724514),(22.86671,32.694159),(22.884532,32.689765),(22.895844,32.688178),(22.92921,32.676703),(22.942638,32.675035),(22.976899,32.676703),(22.999685,32.670559),(23.041352,32.652533),(23.086436,32.64647),(23.10613,32.639838),(23.118663,32.62934),(23.120942,32.61522),(23.115245,32.604926),(23.097911,32.586656),(23.094412,32.577379),(23.103852,32.516343),(23.113292,32.5008),(23.128673,32.488471),(23.148936,32.478095),(23.140961,32.458564),(23.128429,32.395494),(23.108653,32.40233),(23.112153,32.411933),(23.109874,32.420315),(23.103363,32.428168),(23.094412,32.436469),(23.079112,32.354438),(23.080577,32.334052),(23.095551,32.323554),(23.156505,32.303534),(23.178966,32.299954),(23.195079,32.291653),(23.214529,32.272406),(23.230805,32.250637),(23.2435,32.220608),(23.257335,32.213772),(23.273204,32.209703),(23.285411,32.203762),(23.293224,32.192328),(23.302501,32.170722),(23.312185,32.162746),(23.310395,32.179267),(23.299083,32.224189),(23.31837,32.217841),(23.36199,32.217108),(23.37086,32.214016),(23.398936,32.194037),(23.405284,32.19066),(23.531098,32.181383),(23.669688,32.183254),(23.840343,32.149115),(23.998709,32.093899),(23.975271,32.074205),(23.970714,32.066596),(23.97877,32.062242),(24.004893,32.052924),(24.067882,32.011176),(24.090668,32.005764),(24.280935,32.007554),(24.546072,31.991441),(24.636241,32.014879),(24.658539,32.028632),(24.670258,32.032416),(24.710623,32.02558),(24.718598,32.027533),(24.726329,32.031317),(24.733735,32.033149),(24.741873,32.028998),(24.74586,32.02619),(24.758067,32.019965),(24.771983,32.01675),(24.791759,32.007758),(24.824392,32.002997),(24.865408,31.989325),(24.9817,31.967922),(25.017914,31.949042),(25.033376,31.916327),(25.024425,31.876614),(25.022227,31.854682),(25.029552,31.8369),(25.063731,31.804104),(25.116873,31.737982),(25.122081,31.720852),(25.136729,31.692572),(25.156261,31.663072),(25.152517,31.659817),(25.15089,31.65648),(25.088422,31.613524),(25.060413,31.579366),(25.023723,31.494409),(24.861252,31.38036),(24.848953,31.34863),(24.848643,31.312043),(24.858565,31.227914),(24.859495,31.145955),(24.882646,31.039088),(24.889571,31.018831),(24.924607,30.956768),(24.93763,30.905763),(24.981245,30.825406),(24.994887,30.785099),(24.988583,30.750579),(24.973597,30.716266),(24.961194,30.676268),(24.950652,30.621233),(24.92037,30.552348),(24.917063,30.532453),(24.907658,30.498656),(24.888124,30.464343),(24.829729,30.387552),(24.799447,30.360835),(24.772369,30.331018),(24.76286,30.317065),(24.746117,30.282752),(24.704672,30.217898),(24.688653,30.182758),(24.688343,30.144156),(24.697334,30.122607),(24.72555,30.078372),(24.811643,29.89089),(24.81619,29.868411),(24.81495,29.848567),(24.798207,29.796425),(24.804925,29.7548),(24.856188,29.679482),(24.870657,29.638347),(24.870554,29.614007),(24.861562,29.541557),(24.863836,29.502903),(24.873758,29.468332),(24.956647,29.292683),(24.97432,29.23894),(24.981245,29.181372),(24.981245,29.057917),(24.981245,28.890176),(24.981245,28.491544),(24.981245,28.096701),(24.981245,28.018549),(24.981245,27.666503),(24.981245,27.627824),(24.981245,27.475456),(24.981245,27.138035),(24.981245,27.049239),(24.981245,26.859964),(24.981245,26.664523),(24.981245,26.372707),(24.981245,26.080838),(24.981245,25.78897),(24.981245,25.497256),(24.981245,25.205439),(24.981245,24.913571),(24.981245,24.621728),(24.981245,24.329963),(24.981245,24.038146),(24.981245,23.746278),(24.981245,23.454435),(24.981245,23.16267),(24.981245,22.870801),(24.981245,22.578985),(24.981245,22.287168),(24.981245,21.995351),(24.981245,21.870811),(24.981141,21.746167),(24.981141,21.621575),(24.981141,21.497035),(24.981141,21.372443),(24.981038,21.247851),(24.980935,21.123311),(24.980935,20.998719),(24.980935,20.874128),(24.980831,20.749536),(24.980831,20.624944),(24.980831,20.500352),(24.980728,20.405319),(24.980625,20.310234),(24.980625,20.215098),(24.980521,20.120013),(24.980521,20.008391),(24.980521,20.002062),(24.979591,20.000512),(24.978661,19.999013),(24.977731,19.997463),(24.976801,19.995964),(24.974527,19.995654),(24.972356,19.995421),(24.970186,19.995189),(24.968016,19.994956),(24.867247,19.994956),(24.721312,19.995034),(24.599149,19.99506),(24.474609,19.995189),(24.34087,19.995292),(24.227906,19.995318),(24.142433,19.995421),(23.981306,19.995421),(23.981306,19.870597),(23.981306,19.745824),(23.981306,19.621026),(23.981306,19.496124),(23.857799,19.557179),(23.734292,19.618132),(23.610786,19.67911),(23.487279,19.740166),(23.363772,19.80117),(23.240162,19.862096),(23.116759,19.923152),(22.993149,19.984104),(22.869642,20.045108),(22.746136,20.106061),(22.622629,20.167091),(22.499122,20.228095),(22.375616,20.289124),(22.252109,20.350077),(22.128602,20.411055),(22.005096,20.472033),(21.881486,20.533063),(21.758082,20.59399),(21.634472,20.654968),(21.510966,20.716049),(21.387459,20.777027),(21.263952,20.838006),(21.140342,20.899036),(21.016939,20.959962),(20.893329,21.02094),(20.769926,21.08197),(20.646419,21.142897),(20.522809,21.203926),(20.399406,21.265008),(20.275796,21.325935),(20.152289,21.386913),(20.028782,21.447943),(19.905276,21.508869),(19.781665,21.569899),(19.658262,21.630877),(19.534652,21.691855),(19.411145,21.752885),(19.287639,21.813915),(19.185837,21.864177),(19.164132,21.874893),(19.040729,21.935871),(18.917119,21.99685),(18.793612,22.05788),(18.670105,22.118806),(18.546599,22.179836),(18.422989,22.240866),(18.299585,22.301844),(18.175975,22.362822),(18.052469,22.423852),(17.928962,22.484779),(17.805455,22.545757),(17.681949,22.606787),(17.558442,22.667765),(17.434832,22.728795),(17.311429,22.789799),(17.187922,22.850751),(17.064312,22.911755),(16.940909,22.972733),(16.817299,23.03366),(16.693792,23.094664),(16.570285,23.15572),(16.446779,23.216724),(16.323169,23.277728),(16.199765,23.338706),(16.076155,23.399632),(15.985101,23.44472),(15.964637,23.442214),(15.920196,23.422034),(15.862525,23.395937),(15.804854,23.369789),(15.747183,23.343641),(15.689616,23.317518),(15.631945,23.291344),(15.574274,23.265196),(15.516499,23.239048),(15.458829,23.212899),(15.401158,23.186751),(15.343487,23.160577),(15.285816,23.134455),(15.228145,23.108358),(15.170371,23.082261),(15.112907,23.056113),(15.055236,23.029965),(14.997461,23.003817),(14.979909,22.995664),(14.979271,22.995368),(14.979168,22.995316),(14.808016,22.908887),(14.63707,22.822536),(14.466021,22.736184),(14.294869,22.649833),(14.23172,22.617949),(14.216217,22.616295),(14.201644,22.62322),(14.156169,22.660737),(14.031009,22.763702),(13.906055,22.866616),(13.780895,22.969633),(13.655786,23.072624),(13.599562,23.119029),(13.482257,23.179672),(13.380661,23.202383),(13.292398,23.222098),(13.204134,23.241709),(13.115871,23.261449),(13.027607,23.281138),(12.939447,23.300827),(12.851184,23.32049),(12.763024,23.340179),(12.674657,23.359893),(12.586497,23.379582),(12.498337,23.399245),(12.409971,23.418882),(12.321811,23.438622),(12.233651,23.458285),(12.145284,23.477948),(12.057021,23.497611),(11.968861,23.517351),(11.89238,23.660056),(11.822306,23.790642),(11.71014,24.000137),(11.708618,24.00298),(11.636478,24.137649),(11.567128,24.26684),(11.541393,24.29751),(11.50863,24.313814),(11.46724,24.326339),(11.149996,24.422335),(10.911354,24.494501),(10.720668,24.552301),(10.699067,24.556125),(10.677363,24.553851),(10.566776,24.516463),(10.450194,24.476931),(10.410506,24.473288),(10.391799,24.47998),(10.260335,24.576641),(10.242248,24.595115),(10.229742,24.629945),(10.212172,24.722859),(10.193362,24.749937),(10.044534,24.829622),(10.032028,24.856339),(10.029961,24.995065),(10.025517,25.1364),(10.021383,25.26802),(10.007947,25.331426),(9.9695,25.395402),(9.816744,25.588465),(9.693961,25.743494),(9.541309,25.936351),(9.401162,26.113394),(9.377804,26.168946),(9.402506,26.216179),(9.416458,26.23225),(9.434752,26.271989),(9.468858,26.301031),(9.477643,26.315552),(9.481364,26.332606),(9.482604,26.352553),(9.835761,26.504223),(9.854571,26.524377),(9.896326,26.652793),(9.894052,26.67398),(9.88258,26.701782),(9.885474,26.736612),(9.910588,26.843117),(9.906661,26.857483),(9.890848,26.869576),(9.846096,26.891951),(9.835141,26.900995),(9.825529,26.92058),(9.806099,27.025122),(9.721349,27.291875),(9.721866,27.308463),(9.726517,27.32469),(9.743053,27.364119),(9.756283,27.42303),(9.770545,27.444217),(9.813643,27.486489),(9.821602,27.505687),(9.81168,27.526538),(9.797107,27.548914),(9.793903,27.569739),(9.818501,27.585733),(9.846613,27.599298),(9.863356,27.619246),(9.931274,27.818642),(9.934256,27.827398),(9.93591,27.866724),(9.789872,28.209442),(9.776953,28.267578),(9.827276,28.618647),(9.851264,28.785996),(9.848267,28.975726),(9.826149,29.128533),(9.746929,29.368428),(9.667709,29.608323),(9.54968,29.802316),(9.421729,29.968714),(9.369487,30.022794),(9.310005,30.084366),(9.286544,30.117129),(9.519708,30.228905),(9.743467,30.331328),(9.772922,30.338098),(9.845786,30.342283),(9.871314,30.355151),(9.995648,30.494522),(10.101171,30.641697),(10.192225,30.731252),(10.253927,30.841788),(10.26974,30.882147),(10.270153,30.915633),(10.245038,30.985707),(10.240594,31.021157),(10.246175,31.059552),(10.244832,31.078156),(10.213206,31.135362),(10.182717,31.240782),(10.108096,31.411831),(10.106235,31.429194),(10.116881,31.494409),(10.13259,31.517561),(10.196462,31.57859),(10.263952,31.680496),(10.315422,31.715843),(10.427766,31.714603),(10.482543,31.733103),(10.498873,31.744317),(10.513549,31.757029),(10.525538,31.772067),(10.542384,31.806638),(10.584552,31.84028),(10.597575,31.873508),(10.605946,31.953606),(10.628477,31.974122),(10.647288,31.971951),(10.665271,31.963218),(10.683564,31.957017),(10.703098,31.962185),(10.736585,31.985387),(10.772861,32.004508),(10.805624,32.032361),(10.845932,32.111788),(10.873217,32.136696),(11.182341,32.262223),(11.444035,32.36849),(11.513901,32.407997),(11.526085,32.417863),(11.546354,32.434275),(11.564131,32.465487),(11.560617,32.507578),(11.537363,32.543519),(11.47039,32.599277),(11.449926,32.637957),(11.449203,32.693018),(11.463775,32.798464),(11.456541,32.902101),(11.474421,32.969875),(11.474937,33.025841),(11.477418,33.041214),(11.506047,33.136376),(11.505112,33.181225),(11.505138,33.18122),(11.52589,33.176947),(11.560232,33.16592),(11.574962,33.157945),(11.587657,33.13231),(11.603038,33.121487),(11.635753,33.10871),(11.756602,33.092515),(11.793468,33.080756),(11.77296,33.099351),(11.707774,33.117174),(11.691091,33.135972),(11.739268,33.112982),(11.847016,33.082831),(12.08074,32.957831),(12.122406,32.921332),(12.160655,32.911689),(12.224864,32.875922),(12.303884,32.843085),(12.348318,32.832668),(12.729828,32.79857),(12.824392,32.804348),(13.074474,32.86636),(13.115489,32.882148),(13.147716,32.903998),(13.164724,32.912746),(13.187755,32.916246),(13.257091,32.918647),(13.351736,32.904242),(13.363129,32.899563),(13.373546,32.892035),(13.571462,32.802802),(13.616954,32.793402),(13.78712,32.799628),(13.830333,32.794094),(13.915294,32.772773),(13.991222,32.744574),(14.175548,32.717678),(14.185313,32.714504),(14.20338,32.700344),(14.209321,32.697211),(14.226329,32.690904),(14.262462,32.660305),(14.317149,32.630439),(14.404063,32.56684),(14.449392,32.525377),(14.469493,32.519029),(14.631602,32.495673),(14.647634,32.488267),(14.662934,32.476752),(14.706716,32.456285),(14.726817,32.450751),(14.911143,32.443915),(15.114757,32.412787),(15.160004,32.398668),(15.181977,32.395494),(15.195974,32.389797),(15.233246,32.347113),(15.269705,32.328843),(15.283051,32.317288),(15.292166,32.280911),(15.300792,32.26081),(15.322602,32.224189),(15.364513,32.174709),(15.370453,32.159084),(15.368663,32.138007),(15.35963,32.102118),(15.356863,32.061672),(15.355235,32.03852),(15.361095,31.965318),(15.370453,31.929389),(15.490408,31.664862),(15.514415,31.628363),(15.622813,31.49726),(15.687511,31.437812),(15.761485,31.388129),(16.044607,31.275539),(16.358653,31.227118),(16.728038,31.223822),(16.941905,31.183295),(17.16033,31.118801),(17.330577,31.086493),(17.365896,31.086615),(17.375011,31.083075),(17.382009,31.078762),(17.41863,31.062161),(17.447276,31.038723),(17.457774,31.033352),(17.466807,31.029975),(17.613943,30.992499),(17.691742,30.959662),(17.776052,30.935207),(17.848643,30.923651),(17.861664,30.913642),(17.889171,30.877916),(17.907481,30.863511),(17.926768,30.85517),(18.016856,30.837877),(18.175304,30.786078),(18.208344,30.769232),(18.235688,30.746812),(18.324229,30.656887),(18.56837,30.500067),(18.623302,30.445746),(18.653168,30.422309),(18.719249,30.391506),(18.760997,30.384223),(18.780528,30.375922),(18.925955,30.293362),(18.968028,30.277737),(19.056814,30.266181),(19.146007,30.264716),(19.239757,30.273993),(19.291677,30.287055)]
+Saint Lucia	[(-60.88679,14.010077),(-60.882965,13.980618),(-60.883046,13.954413),(-60.89509,13.877346),(-60.892201,13.833197),(-60.904612,13.784247),(-60.907297,13.77733),(-60.910308,13.776109),(-60.922841,13.772691),(-60.927113,13.769924),(-60.931752,13.760321),(-60.940785,13.722113),(-60.947011,13.716295),(-60.950103,13.714667),(-60.955068,13.714667),(-60.973378,13.739),(-61.048166,13.76732),(-61.064931,13.786933),(-61.068105,13.792182),(-61.074208,13.798733),(-61.078114,13.806301),(-61.071156,13.821967),(-61.070058,13.832099),(-61.071156,13.851793),(-61.072743,13.858222),(-61.075592,13.863267),(-61.078114,13.869615),(-61.078521,13.879788),(-61.075917,13.890367),(-61.066884,13.909003),(-61.064931,13.917304),(-61.059478,13.93122),(-61.035553,13.964911),(-61.026601,13.987372),(-61.002268,14.023139),(-60.99706,14.027167),(-60.987294,14.032538),(-60.98233,14.03734),(-60.97997,14.043524),(-60.976064,14.061184),(-60.972076,14.068101),(-60.947621,14.102281),(-60.933461,14.111884),(-60.914133,14.105699),(-60.918609,14.088446),(-60.911936,14.079495),(-60.901031,14.073391),(-60.892974,14.064683),(-60.890207,14.052232),(-60.88679,14.010077)]
+Liechtenstein	[(9.581203,47.05687),(9.560636,47.0524),(9.499554,47.059351),(9.477023,47.063898),(9.475886,47.073226),(9.487565,47.083949),(9.502861,47.094698),(9.51237,47.10803),(9.511853,47.129372),(9.503481,47.145392),(9.492629,47.15981),(9.484981,47.176346),(9.487358,47.210014),(9.504618,47.243732),(9.521155,47.262801),(9.53025,47.253654),(9.547096,47.243035),(9.540378,47.229108),(9.544823,47.220323),(9.554331,47.211615),(9.562909,47.19774),(9.561876,47.190609),(9.551954,47.175571),(9.552057,47.16689),(9.581823,47.154901),(9.605594,47.132266),(9.615723,47.106764),(9.608798,47.080771),(9.581203,47.05687)]
+Lesotho	[(28.980846,-28.909035),(28.995418,-28.908312),(29.018983,-28.913996),(29.040532,-28.922988),(29.049679,-28.933013),(29.049989,-28.95265),(29.055776,-28.965363),(29.069006,-28.973321),(29.091536,-28.978592),(29.125953,-28.992441),(29.208429,-29.068922),(29.241398,-29.077707),(29.281396,-29.078637),(29.311781,-29.089799),(29.316846,-29.147367),(29.32806,-29.159356),(29.343717,-29.169795),(29.357463,-29.183334),(29.365008,-29.200284),(29.375964,-29.235527),(29.403869,-29.268703),(29.413997,-29.290304),(29.414928,-29.296402),(29.413997,-29.311698),(29.415031,-29.318933),(29.419475,-29.325031),(29.432808,-29.336606),(29.435908,-29.342394),(29.432239,-29.356967),(29.413739,-29.380118),(29.411879,-29.395827),(29.41255,-29.410297),(29.4079,-29.421459),(29.399528,-29.430347),(29.388159,-29.437789),(29.361804,-29.447917),(29.332039,-29.455979),(29.303823,-29.466831),(29.282739,-29.485641),(29.275505,-29.506622),(29.275199,-29.528295),(29.275143,-29.532253),(29.282016,-29.556128),(29.296279,-29.571631),(29.279949,-29.581449),(29.278398,-29.597055),(29.278605,-29.613592),(29.26734,-29.626098),(29.190342,-29.646871),(29.1613,-29.666922),(29.145073,-29.691933),(29.132413,-29.720252),(29.113757,-29.750121),(29.113599,-29.752851),(29.11231,-29.775132),(29.106316,-29.801591),(29.105799,-29.825569),(29.120372,-29.843449),(29.132981,-29.852027),(29.135772,-29.859158),(29.135151,-29.868047),(29.137322,-29.882103),(29.148277,-29.901326),(29.150654,-29.911145),(29.144246,-29.919723),(29.132774,-29.924684),(29.106316,-29.931505),(29.09412,-29.936259),(29.015786,-29.978587),(28.976298,-29.999925),(28.860026,-30.066381),(28.795637,-30.089428),(28.729491,-30.101831),(28.639678,-30.131493),(28.605881,-30.131286),(28.557306,-30.114957),(28.540562,-30.113303),(28.524336,-30.116714),(28.480928,-30.139348),(28.456226,-30.146996),(28.407961,-30.140898),(28.383879,-30.144205),(28.364087,-30.159295),(28.355596,-30.17324),(28.338663,-30.201049),(28.323005,-30.214692),(28.313703,-30.22079),(28.3013,-30.2365),(28.294376,-30.242494),(28.284712,-30.246215),(28.255308,-30.249935),(28.237015,-30.256343),(28.216034,-30.267402),(28.200635,-30.282492),(28.198464,-30.301095),(28.20942,-30.314634),(28.224096,-30.320525),(28.235775,-30.329414),(28.238462,-30.352255),(28.231434,-30.373855),(28.218205,-30.387395),(28.133249,-30.445376),(28.125394,-30.457261),(28.127564,-30.465116),(28.139243,-30.482686),(28.142447,-30.492608),(28.141207,-30.500773),(28.124257,-30.547282),(28.120846,-30.553379),(28.112837,-30.562474),(28.104878,-30.568366),(28.096352,-30.572396),(28.088032,-30.577564),(28.081572,-30.586866),(28.075836,-30.60702),(28.076508,-30.623246),(28.078988,-30.639266),(28.078782,-30.658799),(28.054701,-30.649704),(27.936568,-30.640816),(27.915588,-30.634925),(27.895641,-30.626243),(27.886132,-30.619732),(27.878277,-30.612911),(27.869802,-30.607123),(27.858227,-30.603712),(27.849545,-30.604952),(27.830425,-30.613117),(27.8204,-30.614564),(27.778438,-30.609707),(27.743608,-30.600302),(27.713533,-30.583765),(27.659531,-30.530538),(27.598604,-30.490334),(27.5923,-30.481859),(27.590646,-30.472868),(27.590129,-30.463876),(27.586822,-30.454987),(27.562741,-30.425532),(27.536593,-30.403208),(27.533364,-30.393425),(27.529668,-30.382227),(27.493184,-30.367654),(27.477475,-30.356286),(27.466726,-30.341093),(27.459388,-30.316598),(27.452102,-30.310087),(27.43603,-30.30988),(27.414843,-30.317528),(27.407815,-30.318562),(27.397635,-30.317218),(27.377708,-30.312324),(27.377016,-30.312154),(27.366164,-30.311017),(27.367817,-30.295411),(27.345545,-30.241564),(27.343685,-30.212935),(27.365544,-30.165806),(27.38053,-30.152577),(27.381357,-30.142655),(27.371952,-30.135937),(27.356655,-30.132216),(27.334434,-30.132216),(27.322032,-30.1348),(27.312782,-30.131596),(27.300431,-30.114957),(27.293713,-30.100901),(27.280174,-30.053462),(27.265911,-30.033308),(27.217956,-29.998064),(27.198835,-29.978531),(27.17135,-29.921495),(27.088765,-29.750121),(27.088661,-29.750121),(27.088661,-29.750018),(27.080135,-29.735135),(27.050989,-29.696791),(27.037657,-29.686456),(27.024531,-29.680048),(27.010217,-29.669919),(27.002155,-29.666508),(27.014454,-29.641704),(27.014867,-29.625581),(27.022412,-29.616176),(27.032954,-29.616176),(27.042359,-29.628061),(27.049181,-29.620516),(27.056829,-29.604393),(27.062203,-29.600156),(27.072022,-29.599949),(27.075122,-29.605117),(27.077706,-29.611318),(27.085871,-29.614419),(27.090418,-29.611628),(27.122768,-29.581759),(27.128142,-29.578555),(27.156357,-29.568633),(27.18571,-29.565946),(27.195838,-29.562639),(27.213718,-29.554061),(27.24183,-29.548996),(27.263121,-29.541141),(27.295677,-29.524398),(27.300307,-29.52012),(27.302498,-29.518094),(27.309113,-29.509205),(27.314074,-29.498663),(27.316038,-29.487191),(27.321412,-29.483574),(27.344873,-29.484504),(27.350247,-29.480267),(27.354485,-29.462283),(27.365544,-29.446677),(27.407092,-29.406886),(27.413706,-29.402545),(27.417634,-29.396551),(27.41908,-29.383838),(27.416187,-29.375984),(27.410295,-29.369782),(27.406265,-29.363995),(27.408642,-29.35707),(27.417634,-29.350662),(27.426832,-29.347975),(27.436134,-29.343531),(27.445849,-29.331955),(27.448329,-29.322964),(27.450293,-29.299709),(27.45329,-29.291648),(27.469878,-29.282449),(27.510686,-29.270753),(27.518919,-29.268393),(27.528893,-29.260952),(27.527239,-29.249376),(27.520986,-29.226122),(27.521503,-29.21651),(27.528169,-29.207622),(27.538246,-29.202351),(27.548478,-29.19894),(27.555713,-29.195426),(27.61297,-29.133828),(27.635605,-29.096621),(27.634479,-29.091041),(27.630747,-29.07254),(27.637517,-29.065718),(27.64439,-29.07254),(27.649351,-29.070886),(27.658601,-29.066752),(27.664957,-29.065718),(27.656275,-29.055796),(27.64377,-29.044531),(27.63917,-29.035333),(27.655035,-29.031508),(27.667489,-29.026651),(27.679736,-29.015075),(27.699063,-28.990581),(27.702887,-28.989341),(27.707642,-28.990684),(27.711672,-28.990994),(27.713326,-28.98686),(27.713378,-28.979522),(27.714463,-28.976421),(27.716685,-28.973217),(27.71901,-28.967843),(27.720044,-28.959782),(27.720147,-28.945932),(27.728312,-28.937974),(27.744074,-28.93322),(27.754771,-28.925468),(27.747432,-28.908622),(27.861327,-28.915443),(27.887992,-28.904901),(27.897294,-28.889812),(27.903599,-28.873999),(27.91166,-28.86077),(27.926233,-28.853431),(27.945043,-28.855499),(27.956929,-28.86511),(27.966231,-28.875652),(27.977496,-28.880717),(28.004678,-28.880717),(28.013566,-28.878443),(28.014806,-28.872552),(28.014496,-28.8648),(28.018734,-28.856842),(28.056561,-28.812504),(28.100899,-28.770853),(28.104103,-28.765065),(28.131698,-28.729305),(28.145031,-28.714732),(28.154953,-28.70233),(28.164048,-28.70543),(28.218116,-28.700652),(28.23071,-28.699539),(28.250864,-28.707394),(28.273912,-28.709564),(28.297063,-28.706877),(28.317217,-28.700056),(28.33644,-28.684656),(28.363519,-28.643625),(28.382949,-28.626469),(28.403413,-28.618924),(28.542629,-28.610759),(28.562473,-28.606522),(28.619421,-28.572415),(28.634303,-28.570761),(28.653217,-28.58306),(28.66655,-28.59722),(28.675645,-28.613756),(28.681742,-28.633393),(28.688977,-28.674424),(28.699519,-28.68848),(28.743857,-28.689514),(28.758637,-28.700469),(28.787679,-28.748735),(28.795947,-28.754316),(28.82716,-28.759277),(28.827937,-28.759534),(28.843696,-28.764755),(28.858786,-28.772816),(28.859014,-28.77299),(28.872842,-28.783565),(28.885658,-28.797208),(28.925862,-28.859529),(28.980846,-28.909035)]
+Luxembourg	[(6.038628,50.148413),(6.061366,50.150738),(6.070048,50.154201),(6.076456,50.158645),(6.084207,50.159317),(6.097126,50.151307),(6.101467,50.142108),(6.10033,50.132652),(6.102604,50.124745),(6.117487,50.120456),(6.110562,50.105987),(6.105704,50.092241),(6.0994,50.064129),(6.101157,50.063405),(6.107151,50.063767),(6.109425,50.06356),(6.105704,50.060305),(6.096403,50.048626),(6.107255,50.044595),(6.113766,50.036378),(6.119967,50.015501),(6.117177,50.004391),(6.121517,49.996278),(6.138777,49.979328),(6.15397,49.951216),(6.161928,49.942482),(6.172677,49.956228),(6.189834,49.938297),(6.2227,49.887137),(6.238306,49.876905),(6.272206,49.867138),(6.286779,49.86104),(6.291533,49.855563),(6.295568,49.848616),(6.301558,49.838303),(6.302592,49.834944),(6.310653,49.834479),(6.325639,49.84037),(6.334424,49.840215),(6.351374,49.83329),(6.380106,49.815565),(6.397056,49.808589),(6.414523,49.805488),(6.462478,49.805488),(6.493278,49.799597),(6.497205,49.799442),(6.502579,49.79567),(6.502269,49.795876),(6.500099,49.794481),(6.499996,49.786058),(6.498549,49.785386),(6.493794,49.76363),(6.493691,49.756551),(6.496378,49.752106),(6.495965,49.748231),(6.48625,49.742701),(6.485526,49.733761),(6.4878,49.725596),(6.492554,49.718413),(6.499686,49.712212),(6.491004,49.714434),(6.486353,49.712936),(6.482942,49.708078),(6.489764,49.702962),(6.491727,49.700792),(6.418243,49.669889),(6.402741,49.655782),(6.404498,49.652474),(6.410905,49.649632),(6.417003,49.645756),(6.417933,49.639142),(6.415246,49.634646),(6.407701,49.627411),(6.397573,49.613872),(6.371528,49.592995),(6.356438,49.577595),(6.350754,49.566588),(6.350754,49.53491),(6.348809,49.52529),(6.342279,49.493001),(6.34538,49.462718),(6.345307,49.455349),(6.325329,49.456724),(6.298768,49.466232),(6.251117,49.48946),(6.249365,49.490314),(6.221976,49.497445),(6.193554,49.499409),(6.13609,49.495275),(6.142601,49.486076),(6.114386,49.484371),(6.107255,49.48251),(6.101984,49.476413),(6.102087,49.470005),(6.099813,49.46463),(6.087721,49.461633),(6.078006,49.452021),(6.06333,49.448456),(5.978064,49.445097),(5.9607,49.441324),(5.946954,49.469953),(5.928144,49.482304),(5.864686,49.492174),(5.839571,49.499874),(5.822104,49.510519),(5.790685,49.537753),(5.814456,49.545142),(5.8374,49.56111),(5.846909,49.576717),(5.829959,49.582763),(5.841224,49.589687),(5.849183,49.599713),(5.861998,49.62276),(5.869957,49.628858),(5.879878,49.634853),(5.885459,49.643534),(5.879878,49.657745),(5.872644,49.661724),(5.852593,49.663223),(5.845772,49.666582),(5.842258,49.67392),(5.843705,49.677486),(5.846702,49.68069),(5.847219,49.687201),(5.848769,49.69273),(5.853627,49.696296),(5.857347,49.70043),(5.856403,49.705807),(5.856004,49.708078),(5.850216,49.714021),(5.843705,49.714331),(5.837297,49.712936),(5.831716,49.713607),(5.825721,49.715778),(5.811769,49.718517),(5.805361,49.721876),(5.805774,49.724201),(5.803604,49.738154),(5.802054,49.742856),(5.778489,49.773035),(5.771875,49.779392),(5.759162,49.784456),(5.748414,49.785644),(5.738285,49.788848),(5.727743,49.800217),(5.721645,49.812775),(5.720198,49.824712),(5.724642,49.834272),(5.736528,49.83944),(5.726916,49.845227),(5.728673,49.848845),(5.730533,49.85117),(5.73198,49.854167),(5.731877,49.859955),(5.758129,49.858198),(5.748827,49.867293),(5.726709,49.878197),(5.714927,49.881866),(5.718958,49.891374),(5.753581,49.930183),(5.757612,49.93654),(5.759989,49.941604),(5.76371,49.946823),(5.771565,49.953541),(5.778593,49.95659),(5.793372,49.958812),(5.80164,49.963825),(5.812596,49.977571),(5.808565,49.9831),(5.801537,49.988681),(5.802674,50.002479),(5.808875,50.007801),(5.829132,50.013589),(5.836367,50.01855),(5.838847,50.026457),(5.838847,50.035862),(5.83771,50.047437),(5.843705,50.053638),(5.858278,50.061803),(5.864375,50.067488),(5.866856,50.074309),(5.86882,50.090535),(5.872437,50.096892),(5.888973,50.106607),(5.92618,50.118337),(5.941063,50.128311),(5.949021,50.142677),(5.953156,50.156371),(5.96163,50.165621),(5.982921,50.167068),(5.998321,50.174975),(6.004729,50.170479),(6.008036,50.160919),(6.014134,50.153581),(6.022967,50.15082),(6.027363,50.149447),(6.038628,50.148413)]
+Latvia	[(25.333678,58.031808),(25.339879,58.032583),(25.34639,58.034443),(25.356519,58.034753),(25.39662,58.023178),(25.457185,57.984059),(25.496614,57.970597),(25.53196,57.966437),(25.541676,57.96282),(25.550254,57.955327),(25.551816,57.94986),(25.552114,57.948815),(25.552941,57.942175),(25.558315,57.934243),(25.579399,57.919463),(25.601517,57.912203),(25.625081,57.910291),(25.650093,57.911428),(25.7038,57.921327),(25.714998,57.923391),(25.730295,57.923132),(25.745384,57.90918),(25.754686,57.888897),(25.767502,57.868924),(25.792616,57.855979),(26.002733,57.845979),(26.014515,57.842827),(26.021956,57.837944),(26.025264,57.828409),(26.02175,57.822415),(26.016065,57.816472),(26.013068,57.8073),(26.016065,57.786681),(26.024747,57.774356),(26.135231,57.724772),(26.168511,57.70405),(26.263182,57.620825),(26.297185,57.599147),(26.33863,57.583153),(26.351325,57.580203),(26.430678,57.561764),(26.430924,57.561707),(26.447564,57.552922),(26.48105,57.527136),(26.49955,57.515819),(26.515053,57.517266),(26.528696,57.52388),(26.542235,57.528169),(26.551743,57.526826),(26.570243,57.519591),(26.579855,57.517834),(26.590087,57.520366),(26.594841,57.52649),(26.598355,57.533854),(26.604763,57.540313),(26.634322,57.554421),(26.666982,57.56486),(26.700468,57.570751),(26.778086,57.568477),(26.795759,57.571319),(26.816327,57.581189),(26.828315,57.595039),(26.838547,57.60987),(26.854154,57.622556),(26.872654,57.627181),(26.884953,57.622091),(26.896115,57.614986),(26.911618,57.613435),(26.929188,57.615554),(26.946551,57.615347),(26.981071,57.608991),(27.004635,57.598914),(27.041326,57.568451),(27.061531,57.555661),(27.085354,57.549434),(27.165659,57.546695),(27.319965,57.516129),(27.352935,57.527601),(27.528169,57.528479),(27.522795,57.492022),(27.525637,57.46838),(27.514837,57.44789),(27.511323,57.430397),(27.536283,57.415695),(27.640824,57.389005),(27.694409,57.356375),(27.707952,57.348129),(27.809134,57.313945),(27.827738,57.304953),(27.840295,57.290639),(27.846134,57.267307),(27.841174,57.211212),(27.833939,57.18049),(27.824327,57.15907),(27.794045,57.143387),(27.700975,57.118789),(27.682217,57.103699),(27.696066,57.085457),(27.722059,57.07799),(27.745469,57.067991),(27.75074,57.042359),(27.745779,57.031455),(27.729552,57.009855),(27.723351,56.998796),(27.720767,56.988667),(27.718545,56.96872),(27.715135,56.957403),(27.648731,56.879268),(27.62837,56.844154),(27.644379,56.841772),(27.661185,56.839271),(27.744074,56.864799),(27.786397,56.871258),(27.830838,56.864282),(27.852232,56.854309),(27.891506,56.829711),(27.913521,56.82015),(27.918895,56.805888),(27.900085,56.783047),(27.876107,56.759431),(27.865461,56.742687),(27.882618,56.725479),(27.98101,56.687006),(27.991345,56.669979),(27.992172,56.624994),(27.997443,56.603833),(28.010982,56.587555),(28.028656,56.576754),(28.108651,56.55518),(28.126117,56.547764),(28.132215,56.535982),(28.125239,56.527145),(28.099246,56.513399),(28.093251,56.501591),(28.096455,56.491953),(28.104517,56.483065),(28.156503,56.44622),(28.164255,56.437952),(28.167872,56.427125),(28.164255,56.392812),(28.167148,56.369868),(28.174435,56.349637),(28.214794,56.281372),(28.217275,56.270727),(28.215311,56.255999),(28.20942,56.248144),(28.201358,56.241684),(28.193142,56.231039),(28.184408,56.207526),(28.178621,56.18391),(28.169112,56.161741),(28.148907,56.142414),(28.110976,56.156806),(28.06824,56.147582),(28.0511,56.140666),(28.023798,56.12965),(27.98101,56.118023),(27.939669,56.113062),(27.92706,56.109367),(27.911453,56.100246),(27.901532,56.089342),(27.892747,56.077095),(27.880654,56.063866),(27.812545,56.034514),(27.781229,56.016375),(27.776991,55.992397),(27.744435,55.959738),(27.64501,55.922841),(27.617156,55.878554),(27.610128,55.83096),(27.601498,55.809618),(27.592713,55.794244),(27.564601,55.792229),(27.438821,55.79874),(27.405851,55.804347),(27.374587,55.814837),(27.349627,55.831219),(27.329163,55.817576),(27.282448,55.791867),(27.263018,55.787216),(27.235526,55.795846),(27.173204,55.825741),(27.151448,55.832459),(27.110779,55.836283),(26.981071,55.826878),(26.979426,55.826291),(26.957817,55.818584),(26.900146,55.778715),(26.842785,55.719339),(26.822838,55.70611),(26.743049,55.682856),(26.720105,55.681874),(26.666878,55.693966),(26.64011,55.695568),(26.615615,55.687971),(26.594531,55.666991),(26.537481,55.669523),(26.48105,55.678308),(26.34235,55.716342),(26.279718,55.743239),(26.226905,55.796931),(26.203754,55.827446),(26.178639,55.84959),(26.079421,55.89814),(26.017616,55.937362),(25.961251,55.958459),(25.871268,55.992139),(25.795496,56.04013),(25.766261,56.058647),(25.708797,56.081048),(25.696602,56.087895),(25.687817,56.098334),(25.669213,56.132027),(25.661875,56.140812),(25.649679,56.143809),(25.590045,56.141122),(25.572888,56.143034),(25.522762,56.156573),(25.454808,56.149649),(25.349086,56.159876),(25.109196,56.183083),(25.073125,56.197811),(25.04398,56.22799),(25.026203,56.260185),(25.016488,56.2699),(24.983208,56.290493),(24.973183,56.300751),(24.962124,56.319277),(24.936286,56.379919),(24.910138,56.421958),(24.892258,56.438727),(24.870967,56.442602),(24.857118,56.435368),(24.853397,56.424722),(24.852157,56.413664),(24.845852,56.40493),(24.837688,56.403948),(24.81557,56.408806),(24.805545,56.408548),(24.71504,56.386253),(24.678628,56.377283),(24.639147,56.359972),(24.557911,56.29858),(24.538998,56.287625),(24.481327,56.26884),(24.44722,56.260521),(24.414354,56.265507),(24.350792,56.291552),(24.318546,56.29858),(24.287644,56.295531),(24.166824,56.260314),(24.140422,56.2576),(24.138919,56.257446),(24.108637,56.260701),(24.07515,56.271192),(23.981306,56.312404),(23.871107,56.332072),(23.858109,56.334392),(23.825036,56.334909),(23.7561,56.325969),(23.724991,56.328811),(23.723647,56.332118),(23.724784,56.338397),(23.723544,56.345812),(23.715069,56.352737),(23.706697,56.354442),(23.679412,56.351859),(23.609856,56.353822),(23.577713,56.348603),(23.517561,56.328656),(23.481595,56.330103),(23.37804,56.35463),(23.310649,56.370591),(23.288428,56.373046),(23.17257,56.357956),(23.154173,56.351394),(23.162854,56.341007),(23.112728,56.310879),(23.062292,56.304161),(23.016714,56.32385),(22.981367,56.373175),(22.956976,56.401985),(22.924523,56.412113),(22.888969,56.408444),(22.859603,56.39707),(22.822927,56.382864),(22.681437,56.350308),(22.666347,56.349094),(22.649087,56.353099),(22.604749,56.379092),(22.578222,56.387003),(22.57581,56.387722),(22.511731,56.395964),(22.214902,56.390383),(22.195265,56.394853),(22.158161,56.410253),(22.139144,56.415705),(22.094082,56.41741),(21.983173,56.388353),(21.965322,56.383677),(21.684495,56.310104),(21.596025,56.307882),(21.558921,56.297288),(21.419292,56.237395),(21.403685,56.234476),(21.358313,56.233235),(21.327618,56.224373),(21.290411,56.206932),(21.254857,56.185202),(21.229639,56.163188),(21.212586,56.130994),(21.205351,56.103424),(21.190365,56.084459),(21.150161,56.07818),(21.091353,56.077896),(21.053398,56.072604),(21.053396,56.072618),(21.053396,56.072943),(21.052582,56.077541),(21.042735,56.114569),(21.028819,56.147406),(20.98406,56.210435),(20.973399,56.232001),(20.969086,56.253485),(20.971039,56.25967),(20.980235,56.279283),(20.982677,56.290758),(20.982677,56.301459),(20.981456,56.310492),(20.970958,56.34984),(20.968598,56.369818),(20.970551,56.388983),(20.979015,56.404364),(20.992524,56.417914),(20.998383,56.425686),(21.003184,56.434801),(21.005382,56.445868),(21.005544,56.465522),(21.01059,56.475735),(21.003266,56.49258),(21.000499,56.510647),(21.006358,56.519965),(21.024262,56.510484),(21.030528,56.500149),(21.035818,56.473944),(21.044688,56.462104),(21.030528,56.448432),(21.037446,56.444648),(21.044688,56.442206),(21.044688,56.427965),(21.044688,56.421129),(21.030528,56.408108),(21.053396,56.38996),(21.061778,56.38703),(21.07016,56.38935),(21.077159,56.395209),(21.079763,56.403062),(21.068614,56.424058),(21.066661,56.44184),(21.068126,56.458808),(21.072113,56.46955),(21.067638,56.476386),(21.063243,56.493964),(21.05836,56.503648),(21.052908,56.511054),(21.048106,56.515611),(21.030528,56.524156),(21.019542,56.527086),(21.010509,56.527777),(21.003103,56.530015),(20.996349,56.537828),(20.992198,56.548896),(20.995128,56.553371),(21.000336,56.557685),(21.010509,56.5987),(21.046153,56.656195),(21.05836,56.688666),(21.065196,56.774319),(21.061209,56.794135),(21.05421,56.811957),(21.052745,56.828925),(21.065196,56.84634),(21.147227,56.87641),(21.156749,56.885565),(21.222911,56.907701),(21.240977,56.91828),(21.277599,56.949123),(21.287771,56.955512),(21.300141,56.95954),(21.328217,56.973619),(21.360118,56.989691),(21.382498,57.008938),(21.401622,57.037502),(21.413585,57.073188),(21.414806,57.113837),(21.411876,57.124457),(21.401052,57.151313),(21.403168,57.162055),(21.412608,57.176215),(21.414806,57.184882),(21.412608,57.250067),(21.414806,57.270901),(21.421397,57.288723),(21.433604,57.306464),(21.449474,57.320014),(21.466563,57.325507),(21.480235,57.333645),(21.517751,57.3876),(21.589122,57.438788),(21.699229,57.555325),(21.729666,57.573798),(21.771658,57.586127),(21.955903,57.592963),(21.999278,57.600328),(22.194509,57.65762),(22.483735,57.742499),(22.526134,57.749661),(22.549083,57.750637),(22.560313,57.752753),(22.572602,57.756822),(22.585785,57.759711),(22.600271,57.758043),(22.610362,57.754625),(22.610118,57.753485),(22.604991,57.751044),(22.600271,57.743842),(22.590831,57.706122),(22.587169,57.664984),(22.590994,57.644761),(22.600759,57.630113),(22.656098,57.585761),(22.878917,57.481269),(22.950369,57.432807),(23.031423,57.394477),(23.083344,57.378241),(23.117524,57.373928),(23.130219,57.370795),(23.133149,57.362982),(23.133556,57.353095),(23.138031,57.343166),(23.160167,57.31859),(23.164561,57.313666),(23.174571,57.297349),(23.182384,57.277655),(23.190196,57.242499),(23.198741,57.224189),(23.213552,57.216254),(23.222423,57.207017),(23.250499,57.114447),(23.260916,57.098944),(23.274913,57.092719),(23.292654,57.088935),(23.340099,57.05858),(23.422862,57.040229),(23.508556,57.031236),(23.520844,57.02558),(23.569672,56.986274),(23.578624,56.982082),(23.585134,56.979071),(23.632009,56.970933),(23.69516,56.967271),(23.866059,56.99018),(23.926931,57.006334),(23.952891,57.013251),(23.991222,57.031236),(24.009288,57.0456),(24.021983,57.059027),(24.035655,57.068996),(24.074555,57.074937),(24.113048,57.088731),(24.210785,57.123725),(24.219249,57.138007),(24.238617,57.149563),(24.261241,57.157457),(24.278575,57.161038),(24.278819,57.17178),(24.288748,57.1789),(24.312673,57.1883),(24.379161,57.230211),(24.400645,57.258124),(24.408865,57.298163),(24.405528,57.344468),(24.381602,57.469428),(24.379893,57.506537),(24.375173,57.528551),(24.364513,57.538398),(24.358572,57.55036),(24.362966,57.576606),(24.374766,57.613471),(24.363048,57.672268),(24.357677,57.685492),(24.313731,57.725043),(24.299571,57.743842),(24.299571,57.761908),(24.288829,57.808905),(24.285981,57.832587),(24.288829,57.845282),(24.296153,57.857367),(24.306159,57.868186),(24.349655,57.85864),(24.378181,57.859441),(24.401539,57.866469),(24.412701,57.876572),(24.429134,57.900343),(24.441639,57.908094),(24.481327,57.919308),(24.53383,57.945069),(24.553881,57.94742),(24.624057,57.943958),(24.684829,57.947575),(24.700435,57.95419),(24.718832,57.981837),(24.733508,57.992198),(24.764721,57.987909),(24.790765,57.978994),(24.81681,57.976669),(24.827417,57.981877),(24.848333,57.992146),(24.872518,58.00044),(24.949309,58.006435),(24.974837,58.01584),(25.034857,58.048574),(25.048838,58.056199),(25.070645,58.063615),(25.094209,58.067309),(25.141028,58.068007),(25.16697,58.058731),(25.180716,58.038164),(25.189914,58.013514),(25.20211,57.991965),(25.216786,57.985376),(25.232496,57.985376),(25.264535,57.994187),(25.284379,58.00814),(25.277557,58.024108),(25.249549,58.051186),(25.250686,58.068498),(25.263501,58.075138),(25.281692,58.073407),(25.299572,58.065604),(25.306393,58.058731),(25.318278,58.040619),(25.324583,58.034753),(25.333678,58.031808)]
+Saint Martin	[(-63.017569,18.033391),(-63.085886,18.058511),(-63.107004,18.062109),(-63.107004,18.06212),(-63.107004,18.066962),(-63.115305,18.065375),(-63.130523,18.060248),(-63.134348,18.059475),(-63.14387,18.064683),(-63.14684,18.070299),(-63.143625,18.074164),(-63.113759,18.074652),(-63.096099,18.078803),(-63.083811,18.087958),(-63.079091,18.104193),(-63.070872,18.110012),(-63.052113,18.116848),(-63.031402,18.121894),(-63.017649,18.122138),(-63.017934,18.100531),(-63.011098,18.070746),(-63.010732,18.040839),(-63.017568,18.033393),(-63.017569,18.033391)]
+Morocco	[(-5.40549,35.926519),(-5.399322,35.924465),(-5.398859,35.924504),(-5.389718,35.902047),(-5.378401,35.881687),(-5.362898,35.863807),(-5.340726,35.847366),(-5.340728,35.847357),(-5.34081,35.847113),(-5.345693,35.832587),(-5.342356,35.807685),(-5.327382,35.755845),(-5.322621,35.713772),(-5.318756,35.701728),(-5.312652,35.69245),(-5.304799,35.685207),(-5.298899,35.684312),(-5.28189,35.68651),(-5.276763,35.685207),(-5.27538,35.679389),(-5.277455,35.664211),(-5.276763,35.657904),(-5.259999,35.604722),(-5.24942,35.584621),(-5.228424,35.568508),(-5.186187,35.543769),(-5.150787,35.516099),(-5.066274,35.417467),(-5.050852,35.407538),(-5.026357,35.403998),(-5.008209,35.399237),(-4.988515,35.387885),(-4.954701,35.362454),(-4.926503,35.330308),(-4.909332,35.314521),(-4.86498,35.301988),(-4.810618,35.259996),(-4.770497,35.241034),(-4.628285,35.20539),(-4.495432,35.180772),(-4.494252,35.180569),(-4.376047,35.151842),(-4.347646,35.150133),(-4.327056,35.154771),(-4.269399,35.184882),(-4.130605,35.204779),(-4.046702,35.235907),(-3.961293,35.250434),(-3.919342,35.266832),(-3.909413,35.255276),(-3.91253,35.250918),(-3.924673,35.247556),(-3.929529,35.24382),(-3.925046,35.237842),(-3.918467,35.230893),(-3.903901,35.214173),(-3.889257,35.208407),(-3.86856,35.207343),(-3.840891,35.20539),(-3.821929,35.206773),(-3.787465,35.209215),(-3.764801,35.218451),(-3.755523,35.236396),(-3.747141,35.263658),(-3.726226,35.282294),(-3.699574,35.290839),(-3.673573,35.287909),(-3.654205,35.277004),(-3.612213,35.245347),(-3.590972,35.233303),(-3.516021,35.223538),(-3.489329,35.211005),(-3.477406,35.210679),(-3.464752,35.211819),(-3.453847,35.211615),(-3.44286,35.208645),(-3.423248,35.200832),(-3.412913,35.197943),(-3.36205,35.194525),(-3.319244,35.201809),(-3.195139,35.238227),(-3.17394,35.249091),(-3.128651,35.28856),(-3.118031,35.294135),(-3.109731,35.293647),(-3.100413,35.289537),(-3.08967,35.286282),(-3.077056,35.287909),(-3.0454,35.314439),(-3.006256,35.393541),(-2.980824,35.424506),(-2.982818,35.435004),(-2.977935,35.443305),(-2.968577,35.446438),(-2.956654,35.44123),(-2.952219,35.433051),(-2.95759,35.415839),(-2.952952,35.403998),(-2.963043,35.373481),(-2.949778,35.334947),(-2.94811,35.330268),(-2.947825,35.329779),(-2.947818,35.329768),(-2.96692,35.313866),(-2.963768,35.286219),(-2.943046,35.267874),(-2.912907,35.276916),(-2.899037,35.259996),(-2.907948,35.250963),(-2.912343,35.235785),(-2.913319,35.219062),(-2.90982,35.186713),(-2.905141,35.17357),(-2.896392,35.161811),(-2.881988,35.146715),(-2.856068,35.131293),(-2.820953,35.121894),(-2.748118,35.115953),(-2.791819,35.145168),(-2.868276,35.217353),(-2.883168,35.238511),(-2.878407,35.246324),(-2.864858,35.237616),(-2.816396,35.194525),(-2.808665,35.183783),(-2.761098,35.143256),(-2.718332,35.122992),(-2.666737,35.108222),(-2.563222,35.096137),(-2.517486,35.099351),(-2.493316,35.104397),(-2.477203,35.112616),(-2.456125,35.132473),(-2.437123,35.145087),(-2.416737,35.149156),(-2.321441,35.118842),(-2.299062,35.115953),(-2.275258,35.109565),(-2.248687,35.097235),(-2.222564,35.089301),(-2.221126,35.049955),(-2.211669,35.023445),(-2.193789,35.003601),(-2.1633,34.994041),(-2.126041,34.971923),(-2.094932,34.947687),(-2.061239,34.929704),(-2.01628,34.926241),(-2.00362,34.91818),(-1.999692,34.906346),(-1.9984,34.892703),(-1.993491,34.878854),(-1.979745,34.865263),(-1.926725,34.838081),(-1.892825,34.811675),(-1.787716,34.756691),(-1.769526,34.741343),(-1.773143,34.734057),(-1.786114,34.72584),(-1.810505,34.680727),(-1.862957,34.613599),(-1.871121,34.596649),(-1.750664,34.494175),(-1.714232,34.485054),(-1.702966,34.479679),(-1.809626,34.372451),(-1.771334,34.334701),(-1.746064,34.290311),(-1.674751,34.105956),(-1.672085,34.092021),(-1.669635,34.079213),(-1.672115,34.059188),(-1.718728,33.898087),(-1.722087,33.851165),(-1.713043,33.801995),(-1.702501,33.772823),(-1.703225,33.761816),(-1.710821,33.747063),(-1.72095,33.736366),(-1.732577,33.727865),(-1.74224,33.717762),(-1.746788,33.702388),(-1.740742,33.686601),(-1.725394,33.677713),(-1.690719,33.667326),(-1.673252,33.6565),(-1.6624,33.644692),(-1.617338,33.554439),(-1.612739,33.521469),(-1.6254,33.494236),(-1.640386,33.475529),(-1.659145,33.41977),(-1.672839,33.394604),(-1.683226,33.36923),(-1.683381,33.270839),(-1.674234,33.237972),(-1.623591,33.196605),(-1.605608,33.168028),(-1.592069,33.136609),(-1.571398,33.111985),(-1.545508,33.091831),(-1.516363,33.073977),(-1.499516,33.060205),(-1.493057,33.039483),(-1.493367,33.016151),(-1.496519,32.994292),(-1.498844,32.984008),(-1.502978,32.974629),(-1.50887,32.966309),(-1.516363,32.959488),(-1.558789,32.93365),(-1.423345,32.742395),(-1.390531,32.718779),(-1.32702,32.69891),(-1.047502,32.517009),(-1.031999,32.4944),(-1.08998,32.439442),(-1.123157,32.417945),(-1.16026,32.404948),(-1.201705,32.399858),(-1.217983,32.392623),(-1.234158,32.374614),(-1.244131,32.356915),(-1.257515,32.320845),(-1.273423,32.229442),(-1.275499,32.217518),(-1.275189,32.209069),(-1.276636,32.200852),(-1.282992,32.190181),(-1.289193,32.184858),(-1.305678,32.173722),(-1.309554,32.167443),(-1.305161,32.151165),(-1.288986,32.150907),(-1.251831,32.163516),(-1.232711,32.163723),(-1.211833,32.158348),(-1.195607,32.146049),(-1.190594,32.125224),(-1.210335,32.08967),(-1.249557,32.08166),(-1.324953,32.084709),(-1.333428,32.085071),(-1.357406,32.086053),(-1.395388,32.087552),(-1.445618,32.089515),(-1.506337,32.091944),(-1.575791,32.094735),(-1.652375,32.097835),(-1.734334,32.101091),(-1.819962,32.104501),(-1.907553,32.107964),(-1.995455,32.111478),(-2.081858,32.11494),(-2.165109,32.118299),(-2.243398,32.1214),(-2.315177,32.124294),(-2.378636,32.126774),(-2.516147,32.1322),(-2.695567,32.08967),(-2.881189,32.076286),(-2.938731,32.048639),(-2.869769,31.89243),(-2.827836,31.794586),(-3.002556,31.77362),(-3.21921,31.717709),(-3.511564,31.672745),(-3.548745,31.669954),(-3.591378,31.678274),(-3.659507,31.647821),(-3.673484,31.389234),(-3.747467,31.385166),(-3.802502,31.350646),(-3.815189,31.337158),(-3.81922,31.318865),(-3.812915,31.243365),(-3.814982,31.220524),(-3.836169,31.189777),(-3.842836,31.170192),(-3.839322,31.152828),(-3.827462,31.143837),(-3.810796,31.142906),(-3.792968,31.149676),(-3.763719,31.173447),(-3.748862,31.180217),(-3.731421,31.176341),(-3.717107,31.163267),(-3.689718,31.125595),(-3.671942,31.110867),(-3.635872,31.095674),(-3.624141,31.086527),(-3.614529,31.068027),(-3.610085,31.050302),(-3.608741,31.030872),(-3.554674,30.955927),(-3.610585,30.879049),(-3.659507,30.837116),(-3.652518,30.774217),(-3.645529,30.711317),(-3.834228,30.627452),(-4.001959,30.592507),(-4.155714,30.585519),(-4.274524,30.557563),(-4.372368,30.508641),(-4.484189,30.382842),(-4.623966,30.284999),(-4.770731,30.229088),(-4.875564,30.180166),(-4.95943,30.124256),(-5.071251,30.04039),(-5.176083,29.97749),(-5.273927,29.886635),(-5.343815,29.767825),(-5.43467,29.642026),(-5.539503,29.523216),(-5.637346,29.495261),(-5.721212,29.523216),(-5.756156,29.614071),(-5.881955,29.600093),(-6.000765,29.579127),(-6.126564,29.579127),(-6.27333,29.579127),(-6.413107,29.565149),(-6.559872,29.530205),(-6.699649,29.516227),(-6.783515,29.446339),(-6.958236,29.509238),(-7.070057,29.516227),(-7.146934,29.509238),(-7.258755,29.467305),(-7.34961,29.383439),(-7.463286,29.389137),(-7.48406,29.382445),(-7.506126,29.380223),(-7.528502,29.380947),(-7.572686,29.387613),(-7.619453,29.389422),(-7.653611,29.376193),(-7.714667,29.321829),(-7.729989,29.311158),(-7.777996,29.289324),(-7.839129,29.239043),(-7.945014,29.176231),(-8.036326,29.099853),(-8.069658,29.079337),(-8.182312,29.035541),(-8.250474,28.994769),(-8.316774,28.939062),(-8.333259,28.93038),(-8.368451,28.916531),(-8.383489,28.905782),(-8.417802,28.852349),(-8.430411,28.841006),(-8.475835,28.818759),(-8.520819,28.787081),(-8.648847,28.725948),(-8.667606,28.711685),(-8.678768,28.692823),(-8.682385,28.6659),(-8.682385,28.620218),(-8.682385,28.560273),(-8.682385,28.500406),(-8.682385,28.440487),(-8.682385,28.380543),(-8.682385,28.320624),(-8.682385,28.260679),(-8.682385,28.20076),(-8.682385,28.140893),(-8.682385,28.080949),(-8.682385,28.02103),(-8.682385,27.961085),(-8.682385,27.90114),(-8.682385,27.841222),(-8.682385,27.781354),(-8.682385,27.721436),(-8.682385,27.661439),(-8.752562,27.661439),(-8.816537,27.661465),(-8.817034,27.661465),(-8.817035,27.661464),(-8.818449,27.659398),(-8.81292,27.613354),(-8.783619,27.530362),(-8.773387,27.46003),(-8.788012,27.416054),(-8.801706,27.360424),(-8.795841,27.307688),(-8.773387,27.250069),(-8.752872,27.190486),(-8.752872,27.150463),(-8.793903,27.12018),(-8.888109,27.103566),(-9.000919,27.089924),(-9.083446,27.089924),(-9.207469,27.099691),(-9.284622,27.097727),(-9.352008,27.097727),(-9.412056,27.08796),(-9.486315,27.049875),(-9.568843,26.990292),(-9.672351,26.910219),(-9.734362,26.860429),(-9.816864,26.84968),(-9.899365,26.84968),(-9.979929,26.889729),(-10.031709,26.910219),(-10.065867,26.908281),(-10.122039,26.879962),(-10.188443,26.860429),(-10.250455,26.860429),(-10.353963,26.900478),(-10.477986,26.960035),(-10.550282,26.990292),(-10.653273,27.000058),(-10.756781,27.019592),(-10.829076,27.009825),(-10.921835,27.009825),(-11.045859,26.969802),(-11.149366,26.940501),(-11.262641,26.910219),(-11.391574,26.882908),(-11.36031,26.793043),(-11.315868,26.744208),(-11.315868,26.683644),(-11.3369,26.632897),(-11.398912,26.583081),(-11.469709,26.519597),(-11.510688,26.469807),(-11.55221,26.400457),(-11.582983,26.360408),(-11.63621,26.294985),(-11.683546,26.212975),(-11.698222,26.162177),(-11.717239,26.103576),(-11.753877,26.086006),(-11.879864,26.070399),(-11.959911,26.049884),(-12.029752,26.03035),(-12.055823,25.99583),(-12.055823,25.99583),(-12.060009,25.990301),(-12.080059,25.919969),(-12.080059,25.870205),(-12.100058,25.830156),(-12.129849,25.730549),(-12.169873,25.639728),(-12.200155,25.51958),(-12.229946,25.42),(-12.26997,25.259803),(-12.310019,25.110432),(-12.359835,24.969795),(-12.399884,24.879955),(-12.430141,24.830165),(-12.499982,24.7696),(-12.56003,24.730533),(-12.629845,24.679761),(-12.709943,24.629971),(-12.819781,24.570388),(-12.910137,24.51959),(-12.946879,24.496749),(-12.94688,24.496748),(-12.990184,24.4698),(-13.060025,24.400476),(-13.120099,24.299862),(-13.160122,24.219815),(-13.229963,24.0899),(-13.279753,24.019594),(-13.31001,23.980553),(-13.390108,23.940504),(-13.479948,23.910221),(-13.580045,23.870198),(-13.660118,23.830123),(-13.769982,23.790125),(-13.839797,23.750076),(-13.890129,23.690493),(-13.930127,23.620187),(-13.979943,23.519599),(-14.019992,23.410252),(-14.039991,23.33992),(-14.100065,23.099676),(-14.120089,22.960047),(-14.140088,22.870181),(-14.169906,22.759852),(-14.189904,22.589914),(-14.189904,22.450259),(-14.209955,22.370186),(-14.220187,22.309647),(-14.270003,22.240297),(-14.310052,22.190507),(-14.379841,22.120201),(-14.439915,22.080152),(-14.459914,22.040103),(-14.519988,21.990338),(-14.580036,21.91024),(-14.629852,21.860424),(-14.620085,21.820375),(-14.609827,21.750069),(-14.640109,21.679763),(-14.669875,21.599665),(-14.749974,21.500084),(-14.839813,21.450268),(-14.970167,21.440501),(-15.149872,21.440501),(-15.289992,21.450268),(-15.45993,21.450268),(-15.609818,21.469802),(-15.749964,21.490317),(-15.919876,21.500084),(-16.040024,21.500084),(-16.189886,21.48055),(-16.580043,21.48055),(-16.729956,21.469802),(-16.950149,21.429753),(-17.013743,21.419971),(-17.013743,21.419989),(-17.012807,21.445217),(-16.971059,21.592597),(-16.966908,21.636542),(-16.970326,21.674465),(-16.968007,21.697252),(-16.95108,21.724758),(-16.947662,21.736029),(-16.946401,21.748277),(-16.947011,21.759996),(-16.950266,21.765367),(-16.963246,21.775621),(-16.966908,21.781155),(-16.961537,21.795803),(-16.956939,21.82567),(-16.937815,21.866604),(-16.929799,21.907945),(-16.92101,21.931301),(-16.81664,22.130561),(-16.78067,22.165717),(-16.775054,22.174954),(-16.773427,22.180976),(-16.762074,22.205024),(-16.756337,22.210191),(-16.739898,22.221137),(-16.73412,22.226752),(-16.717885,22.260972),(-16.706776,22.275458),(-16.682607,22.284084),(-16.677154,22.289537),(-16.670318,22.29442),(-16.659006,22.295071),(-16.650258,22.291693),(-16.642649,22.285956),(-16.631703,22.273912),(-16.52184,22.314887),(-16.502187,22.329901),(-16.482167,22.352281),(-16.466624,22.377387),(-16.431508,22.493069),(-16.429351,22.510443),(-16.419545,22.521796),(-16.369781,22.568264),(-16.357289,22.583075),(-16.34439,22.646959),(-16.341379,22.732001),(-16.336822,22.75373),(-16.324859,22.789496),(-16.316477,22.806057),(-16.296457,22.832099),(-16.296254,22.84219),(-16.299957,22.850165),(-16.302113,22.856757),(-16.302154,22.868313),(-16.300608,22.875067),(-16.291737,22.893459),(-16.289622,22.899807),(-16.284779,22.903388),(-16.262603,22.905585),(-16.238637,22.911566),(-16.206451,22.937974),(-16.172963,22.973456),(-16.163238,22.993232),(-16.156484,23.013495),(-16.152577,23.035224),(-16.151275,23.059068),(-16.159535,23.082465),(-16.179067,23.086127),(-16.220204,23.075873),(-16.213124,23.094428),(-16.196034,23.126166),(-16.186676,23.137926),(-16.139272,23.178534),(-16.135121,23.185126),(-16.060414,23.34455),(-16.049143,23.3581),(-16.038319,23.363918),(-16.025543,23.374945),(-15.981191,23.445787),(-15.967193,23.512926),(-15.956451,23.531724),(-15.941314,23.551337),(-15.905507,23.610297),(-15.857086,23.661811),(-15.853871,23.667914),(-15.837392,23.679348),(-15.830393,23.685981),(-15.825063,23.696723),(-15.820058,23.717231),(-15.81607,23.727607),(-15.800649,23.750637),(-15.78482,23.768988),(-15.772613,23.787828),(-15.76769,23.812649),(-15.765452,23.856757),(-15.769154,23.875678),(-15.781972,23.898261),(-15.778676,23.903713),(-15.775136,23.911933),(-15.786773,23.903876),(-15.787953,23.892157),(-15.786,23.878363),(-15.788197,23.864163),(-15.795318,23.856635),(-15.820872,23.840277),(-15.830393,23.836249),(-15.843577,23.835883),(-15.852203,23.838121),(-15.861724,23.836168),(-15.877553,23.823188),(-15.888173,23.810736),(-15.895334,23.798774),(-15.91039,23.765326),(-15.923329,23.743598),(-15.925933,23.73725),(-15.92809,23.725165),(-15.937489,23.705227),(-15.939605,23.696234),(-15.948232,23.684312),(-15.994862,23.645006),(-16.009755,23.655422),(-16.003163,23.672105),(-15.981191,23.696234),(-15.975819,23.710761),(-15.939605,23.774807),(-15.877553,23.853583),(-15.871246,23.869208),(-15.856801,23.886949),(-15.840932,23.902655),(-15.768137,23.959866),(-15.735748,23.971177),(-15.692616,23.995795),(-15.679555,24.007514),(-15.646637,24.010403),(-15.620107,24.026272),(-15.599233,24.048326),(-15.583323,24.070258),(-15.542348,24.114244),(-15.514394,24.152167),(-15.476064,24.177802),(-15.459706,24.191881),(-15.453033,24.210191),(-15.444692,24.221869),(-15.353383,24.291083),(-15.298248,24.34516),(-15.229563,24.440741),(-15.203969,24.467475),(-15.171864,24.494127),(-15.153554,24.505601),(-15.133412,24.514635),(-15.112701,24.520575),(-15.069407,24.527289),(-15.048329,24.538275),(-15.014801,24.562445),(-15.01537,24.585679),(-15.012237,24.591539),(-14.999989,24.614488),(-14.976226,24.641425),(-14.952138,24.659247),(-14.926991,24.67178),(-14.907826,24.685492),(-14.895619,24.705715),(-14.885854,24.770738),(-14.861928,24.830146),(-14.853424,24.876614),(-14.83967,24.905341),(-14.836049,24.918687),(-14.837961,24.935126),(-14.84203,24.950263),(-14.84317,24.965277),(-14.836049,24.981391),(-14.843495,24.987616),(-14.837229,25.001695),(-14.83259,25.017564),(-14.829742,25.034247),(-14.829213,25.050238),(-14.831899,25.065741),(-14.84142,25.087551),(-14.843495,25.100531),(-14.842437,25.189032),(-14.849721,25.214179),(-14.819244,25.330227),(-14.812123,25.346096),(-14.782053,25.446926),(-14.736195,25.50552),(-14.723134,25.515815),(-14.714915,25.52558),(-14.68517,25.590888),(-14.678334,25.635565),(-14.676259,25.641913),(-14.66686,25.659735),(-14.661366,25.691311),(-14.620961,25.783596),(-14.546457,25.879218),(-14.519521,25.923774),(-14.513905,25.936957),(-14.511057,25.956855),(-14.494985,26.001614),(-14.486562,26.015448),(-14.490346,26.03148),(-14.480377,26.087795),(-14.483306,26.102484),(-14.492828,26.132717),(-14.490061,26.142727),(-14.482289,26.153876),(-14.471791,26.183051),(-14.466135,26.194241),(-14.410146,26.260077),(-14.400746,26.266303),(-14.353179,26.275946),(-14.29894,26.302232),(-14.215932,26.375474),(-14.202056,26.392239),(-14.192779,26.409491),(-14.180247,26.424384),(-14.157053,26.433783),(-14.046864,26.444403),(-14.02774,26.452379),(-13.923736,26.500881),(-13.742014,26.618109),(-13.619985,26.68891),(-13.561106,26.749091),(-13.500885,26.858303),(-13.480336,26.911689),(-13.461049,26.992743),(-13.431996,27.050767),(-13.402455,27.177191),(-13.383656,27.215277),(-13.301096,27.324449),(-13.300771,27.330024),(-13.307769,27.339342),(-13.307932,27.344957),(-13.29426,27.351752),(-13.240834,27.465399),(-13.20759,27.56745),(-13.205434,27.588568),(-13.200795,27.606513),(-13.180979,27.644843),(-13.178254,27.662491),(-13.178253,27.662502),(-13.178212,27.662787),(-13.177561,27.667141),(-13.171254,27.685004),(-13.160512,27.694648),(-13.13036,27.708075),(-13.097971,27.732245),(-13.061431,27.742906),(-13.045155,27.759833),(-13.003,27.821031),(-12.979563,27.893704),(-12.968088,27.914618),(-12.952382,27.928616),(-12.933095,27.938707),(-12.838938,27.970404),(-12.657826,27.998033),(-12.513539,27.995429),(-12.335032,28.047268),(-12.061431,28.089016),(-12.050404,28.096015),(-12.027903,28.116889),(-12.023101,28.119574),(-12.005605,28.123196),(-11.782379,28.21011),(-11.485585,28.325629),(-11.452789,28.348456),(-11.428822,28.375922),(-11.389312,28.434882),(-11.374013,28.449774),(-11.355946,28.463853),(-11.340972,28.479682),(-11.334706,28.499742),(-11.325917,28.515204),(-11.266469,28.551581),(-11.219635,28.602484),(-11.211822,28.616767),(-11.170318,28.639716),(-11.162465,28.647406),(-11.154205,28.661078),(-11.149159,28.66767),(-11.11498,28.69184),(-11.111562,28.695746),(-11.091054,28.726304),(-11.0631,28.752387),(-11.047597,28.761705),(-10.762603,28.890204),(-10.694203,28.930569),(-10.612416,28.967719),(-10.573801,28.990424),(-10.450917,29.09219),(-10.34789,29.229397),(-10.320872,29.257961),(-10.301991,29.271877),(-10.264027,29.284125),(-10.248402,29.299384),(-10.224355,29.333075),(-10.199127,29.361274),(-10.187571,29.378974),(-10.182729,29.397284),(-10.177642,29.405829),(-10.141754,29.428616),(-10.137034,29.434963),(-10.128163,29.455959),(-10.086985,29.509955),(-10.080922,29.521145),(-10.078684,29.542304),(-10.072621,29.564683),(-10.063629,29.584947),(-10.052968,29.599921),(-10.005279,29.638414),(-9.997792,29.650824),(-9.991689,29.666815),(-9.949941,29.71601),(-9.820221,29.838935),(-9.717926,29.996568),(-9.655141,30.126899),(-9.645253,30.164008),(-9.628407,30.291409),(-9.610015,30.357815),(-9.60733,30.377631),(-9.611643,30.404364),(-9.622711,30.417426),(-9.638173,30.426663),(-9.655141,30.442206),(-9.666249,30.459296),(-9.691762,30.509589),(-9.700063,30.542711),(-9.708404,30.547512),(-9.719553,30.548529),(-9.730824,30.552069),(-9.739817,30.559882),(-9.758168,30.586819),(-9.829661,30.628607),(-9.850942,30.629625),(-9.874013,30.633979),(-9.888539,30.648261),(-9.886708,30.686672),(-9.865631,30.72427),(-9.839019,30.759833),(-9.820221,30.792304),(-9.81371,30.814683),(-9.812896,30.827135),(-9.816803,30.836656),(-9.823842,30.845649),(-9.824371,30.851955),(-9.821889,30.859117),(-9.820221,30.87108),(-9.827707,31.06745),(-9.831451,31.085354),(-9.847524,31.121283),(-9.835032,31.144761),(-9.808949,31.2862),(-9.80663,31.343451),(-9.810902,31.366848),(-9.821523,31.379462),(-9.834788,31.388821),(-9.847524,31.402411),(-9.816233,31.436835),(-9.792958,31.47134),(-9.769643,31.53148),(-9.758168,31.545803),(-9.739613,31.560004),(-9.733266,31.567369),(-9.727651,31.58515),(-9.713612,31.597846),(-9.707631,31.60932),(-9.694203,31.625718),(-9.68928,31.635199),(-9.675201,31.715399),(-9.667307,31.731147),(-9.575795,31.816107),(-9.53539,31.864488),(-9.527943,31.871243),(-9.513295,31.880845),(-9.504954,31.888414),(-9.497426,31.898139),(-9.488678,31.915351),(-9.483795,31.922553),(-9.366119,32.026313),(-9.354075,32.046698),(-9.346425,32.06151),(-9.334828,32.10163),(-9.333079,32.118069),(-9.328114,32.130439),(-9.291982,32.168931),(-9.27774,32.196601),(-9.270009,32.227484),(-9.26476,32.330634),(-9.268951,32.335517),(-9.28775,32.343492),(-9.291982,32.350816),(-9.289662,32.372463),(-9.283355,32.387763),(-9.256256,32.432563),(-9.24885,32.452541),(-9.246938,32.472317),(-9.254791,32.488267),(-9.263661,32.498481),(-9.272369,32.512926),(-9.27831,32.529527),(-9.278961,32.546332),(-9.259918,32.57689),(-9.112172,32.682847),(-8.998525,32.797105),(-8.901682,32.854804),(-8.867787,32.881903),(-8.754709,33.010647),(-8.62914,33.127631),(-8.62149,33.13935),(-8.620351,33.152004),(-8.621002,33.173529),(-8.611887,33.186265),(-8.529164,33.268704),(-8.521148,33.272528),(-8.512522,33.270494),(-8.502797,33.261542),(-8.49413,33.259508),(-8.469797,33.260647),(-8.45165,33.264228),(-8.415028,33.280015),(-8.378774,33.304674),(-8.320221,33.365383),(-8.284657,33.389838),(-8.243153,33.404527),(-8.106557,33.430854),(-8.011545,33.466417),(-7.962554,33.484809),(-7.916249,33.494574),(-7.891428,33.503363),(-7.86974,33.526557),(-7.844797,33.535956),(-7.777984,33.55329),(-7.738189,33.570624),(-7.719472,33.574205),(-7.700999,33.58275),(-7.684438,33.599921),(-7.667551,33.612698),(-7.647857,33.608344),(-7.63622,33.614569),(-7.626617,33.613227),(-7.617258,33.609361),(-7.606191,33.608344),(-7.596669,33.611558),(-7.579254,33.620754),(-7.549957,33.625556),(-7.529124,33.632636),(-7.510243,33.641547),(-7.49706,33.64997),(-7.463287,33.68651),(-7.434316,33.698228),(-7.406361,33.726996),(-7.387115,33.732489),(-7.393951,33.725043),(-7.37385,33.719306),(-7.35261,33.724677),(-7.341135,33.731106),(-7.267486,33.772406),(-7.229319,33.80093),(-7.192942,33.817694),(-7.152577,33.830064),(-7.117014,33.834866),(-7.116567,33.834906),(-7.099477,33.840277),(-7.06786,33.863674),(-7.031809,33.874254),(-6.927358,33.944159),(-6.822092,34.039618),(-6.733754,34.162584),(-6.667795,34.280504),(-6.557932,34.417711),(-6.54776,34.434719),(-6.530914,34.474026),(-6.507924,34.504788),(-6.292104,34.880805),(-6.205393,35.124579),(-6.023915,35.501166),(-6.018544,35.520209),(-6.016672,35.544623),(-6.012318,35.558824),(-5.990834,35.598538),(-5.970041,35.652533),(-5.968251,35.660956),(-5.96524,35.670233),(-5.952056,35.685492),(-5.949045,35.69538),(-5.943105,35.742377),(-5.936187,35.765611),(-5.927235,35.780748),(-5.90803,35.797349),(-5.873402,35.801988),(-5.781402,35.79092),(-5.769276,35.792792),(-5.74234,35.814887),(-5.729888,35.822659),(-5.711741,35.830634),(-5.693512,35.834296),(-5.680898,35.829169),(-5.663442,35.835883),(-5.639719,35.836371),(-5.615956,35.831529),(-5.598988,35.822333),(-5.540028,35.850979),(-5.523264,35.863267),(-5.487457,35.896959),(-5.468861,35.910346),(-5.44811,35.918524),(-5.440027,35.918106),(-5.435452,35.914417),(-5.423497,35.908956),(-5.414198,35.909398),(-5.410361,35.917073),(-5.408,35.924748),(-5.40549,35.926519)]
+Monaco	[(7.437454,43.743361),(7.432845,43.739853),(7.417957,43.730904),(7.404319,43.717969),(7.380723,43.719273),(7.36575,43.72273),(7.367263,43.734125),(7.372655,43.745832),(7.387538,43.757899),(7.406969,43.763506),(7.426246,43.755464),(7.437454,43.743361)]
+Moldova	[(27.606873,48.457819),(27.627026,48.451256),(27.751773,48.451979),(27.78526,48.441566),(27.849855,48.40963),(27.864841,48.398907),(27.885371,48.378444),(27.896674,48.367178),(27.904529,48.362475),(27.92644,48.339428),(27.967057,48.328886),(28.003177,48.325883),(28.055941,48.321496),(28.076405,48.314933),(28.092838,48.302066),(28.098315,48.284108),(28.078678,48.244912),(28.093251,48.237444),(28.115575,48.236747),(28.131078,48.239589),(28.162084,48.257185),(28.178517,48.258864),(28.185752,48.242379),(28.189369,48.223052),(28.199911,48.211735),(28.216965,48.208144),(28.240322,48.211632),(28.261716,48.219952),(28.277529,48.229124),(28.294479,48.236488),(28.340575,48.240106),(28.357731,48.238607),(28.36817,48.230623),(28.37003,48.211632),(28.363364,48.191013),(28.352253,48.181866),(28.337887,48.175484),(28.322178,48.163211),(28.315563,48.149284),(28.317424,48.135358),(28.328586,48.127012),(28.349566,48.129725),(28.364966,48.141507),(28.37556,48.156648),(28.388634,48.168586),(28.411578,48.170704),(28.427288,48.163366),(28.436899,48.149853),(28.435659,48.134686),(28.419019,48.122232),(28.447441,48.082751),(28.459379,48.074457),(28.479584,48.064923),(28.490023,48.065491),(28.493744,48.074819),(28.494157,48.091846),(28.49979,48.108914),(28.501082,48.112827),(28.501113,48.112889),(28.519323,48.149129),(28.541596,48.155951),(28.573635,48.154969),(28.665619,48.129337),(28.735072,48.128691),(28.771246,48.124454),(28.799255,48.111793),(28.805921,48.103809),(28.80835,48.096574),(28.809176,48.089779),(28.811554,48.082906),(28.827573,48.057016),(28.830777,48.030868),(28.832534,48.024822),(28.839252,48.018285),(28.855685,48.007923),(28.862085,48.000502),(28.882557,47.976763),(28.914803,47.953146),(28.936087,47.942164),(28.950356,47.934801),(28.980846,47.926378),(29.017226,47.931081),(29.061047,47.96976),(29.092725,47.980173),(29.110037,47.979656),(29.123989,47.975987),(29.136288,47.968184),(29.147967,47.955369),(29.155822,47.939866),(29.164607,47.905604),(29.172565,47.891006),(29.186621,47.883642),(29.225999,47.87558),(29.236024,47.870723),(29.232768,47.85708),(29.21742,47.842895),(29.19892,47.829485),(29.186724,47.818219),(29.177733,47.800701),(29.177836,47.78972),(29.187448,47.783209),(29.221968,47.774811),(29.234732,47.766801),(29.238608,47.756001),(29.22667,47.743237),(29.196956,47.717502),(29.191479,47.686264),(29.192409,47.650917),(29.182074,47.613219),(29.156184,47.582781),(29.130501,47.55963),(29.117426,47.533327),(29.130397,47.4932),(29.130501,47.493097),(29.130604,47.493045),(29.130656,47.492942),(29.137189,47.484008),(29.140009,47.480152),(29.155615,47.449999),(29.163884,47.439379),(29.182074,47.429871),(29.192409,47.435814),(29.201866,47.446588),(29.21835,47.451601),(29.232613,47.44633),(29.2507,47.425375),(29.281396,47.411474),(29.288217,47.400777),(29.292713,47.388866),(29.300826,47.378194),(29.314675,47.372717),(29.330385,47.370495),(29.345836,47.365844),(29.35891,47.352718),(29.364078,47.336879),(29.364491,47.322436),(29.367592,47.308225),(29.370882,47.304434),(29.380821,47.29298),(29.394464,47.284712),(29.409553,47.279751),(29.425573,47.278666),(29.441696,47.282128),(29.459163,47.293497),(29.466087,47.307449),(29.470635,47.322746),(29.480867,47.338274),(29.501072,47.339825),(29.520968,47.33892),(29.539881,47.334218),(29.556573,47.324038),(29.57006,47.306778),(29.579259,47.283601),(29.580189,47.26045),(29.568717,47.243138),(29.544015,47.23425),(29.540398,47.212546),(29.55063,47.160172),(29.544842,47.135574),(29.530373,47.123688),(29.508669,47.119399),(29.480867,47.117487),(29.478593,47.114645),(29.47787,47.111544),(29.478696,47.108469),(29.480867,47.10524),(29.511459,47.066017),(29.520141,47.059919),(29.530993,47.066017),(29.539726,47.078885),(29.551353,47.090202),(29.570164,47.091442),(29.583393,47.085215),(29.594865,47.074595),(29.6021,47.061005),(29.60303,47.04576),(29.595433,47.032143),(29.583393,47.02279),(29.572489,47.011757),(29.564996,46.974498),(29.560626,46.961256),(29.559828,46.95884),(29.558691,46.94574),(29.567476,46.934656),(29.573161,46.933725),(29.598482,46.935379),(29.607577,46.93202),(29.623287,46.91954),(29.631865,46.914398),(29.648092,46.910419),(29.680855,46.908559),(29.696151,46.904683),(29.712481,46.893444),(29.735838,46.867192),(29.754132,46.85802),(29.785758,46.854661),(29.815213,46.856624),(29.843635,46.854144),(29.872212,46.837711),(29.876915,46.830786),(29.884873,46.812673),(29.889627,46.80717),(29.898516,46.806653),(29.907714,46.810942),(29.917429,46.813965),(29.928178,46.809754),(29.930658,46.803087),(29.930452,46.781642),(29.931795,46.772443),(29.935671,46.765157),(29.946678,46.750739),(29.951122,46.743117),(29.952621,46.724694),(29.944404,46.662476),(29.94027,46.650797),(29.935413,46.641857),(29.931899,46.632374),(29.931279,46.619171),(29.934948,46.608836),(29.947402,46.588346),(29.949675,46.578863),(29.9381,46.55734),(29.916086,46.554369),(29.898826,46.553129),(29.901926,46.53083),(29.916086,46.518815),(29.960217,46.505948),(29.962078,46.503442),(29.967039,46.493856),(29.970553,46.491737),(29.977064,46.493184),(29.989259,46.498687),(29.994944,46.498532),(30.00285,46.494217),(30.009413,46.488068),(30.021712,46.470653),(30.014064,46.462023),(30.060005,46.436805),(30.077006,46.422826),(30.086928,46.428873),(30.102017,46.430733),(30.118244,46.428692),(30.131576,46.422826),(30.107185,46.391898),(30.08114,46.374199),(30.037267,46.368928),(29.918669,46.373656),(29.902546,46.371176),(29.884666,46.3642),(29.847769,46.341462),(29.828132,46.339395),(29.808185,46.354691),(29.80617,46.361564),(29.806738,46.380891),(29.805085,46.389986),(29.80033,46.398358),(29.779557,46.421095),(29.72695,46.455796),(29.714134,46.47117),(29.713824,46.443058),(29.702869,46.42833),(29.682715,46.42293),(29.654396,46.422697),(29.647988,46.416393),(29.652949,46.391898),(29.645508,46.375594),(29.632072,46.36606),(29.615639,46.361822),(29.598586,46.363063),(29.582979,46.369651),(29.56944,46.382286),(29.555643,46.404197),(29.541432,46.413034),(29.527479,46.416651),(29.49606,46.420811),(29.480867,46.425152),(29.475079,46.432257),(29.473322,46.439802),(29.475286,46.447554),(29.480867,46.455512),(29.486241,46.462488),(29.488205,46.469361),(29.486448,46.475872),(29.480867,46.482048),(29.457612,46.484709),(29.456724,46.484366),(29.436838,46.476699),(29.418235,46.462488),(29.374723,46.416186),(29.362114,46.415928),(29.344234,46.434169),(29.320773,46.468741),(29.306717,46.471997),(29.289147,46.451636),(29.285943,46.439492),(29.290697,46.419261),(29.290077,46.410243),(29.283256,46.397427),(29.278192,46.395877),(29.27137,46.397427),(29.259175,46.394353),(29.222898,46.366473),(29.200677,46.35712),(29.183727,46.367171),(29.183417,46.37761),(29.190342,46.387196),(29.199282,46.396497),(29.205638,46.406109),(29.207602,46.417891),(29.206775,46.502511),(29.200212,46.523983),(29.184244,46.538039),(29.183059,46.538042),(29.162747,46.538091),(29.074948,46.503674),(29.055915,46.49874),(29.020326,46.489515),(28.945809,46.454788),(28.925448,46.432774),(28.919247,46.404662),(28.927309,46.368024),(28.944879,46.32074),(28.945809,46.304978),(28.939918,46.286995),(28.93289,46.272629),(28.93351,46.258986),(28.950615,46.243122),(28.95077,46.24307),(28.984112,46.221221),(29.009836,46.204364),(29.015365,46.182609),(29.00348,46.158941),(28.980846,46.132121),(28.946429,46.105094),(28.938781,46.089281),(28.941158,46.064683),(28.958935,46.021016),(28.956868,46.001379),(28.93196,45.993163),(28.757603,45.961175),(28.74024,45.953217),(28.729181,45.938644),(28.728406,45.921953),(28.742307,45.887329),(28.746441,45.870586),(28.745046,45.850484),(28.738276,45.837565),(28.725564,45.82878),(28.706392,45.821132),(28.677298,45.816584),(28.669753,45.812037),(28.669392,45.806301),(28.671924,45.797257),(28.673267,45.78687),(28.669753,45.77731),(28.643605,45.76651),(28.576684,45.761911),(28.560613,45.743204),(28.563525,45.735494),(28.567641,45.7246),(28.56144,45.71659),(28.532501,45.710079),(28.515241,45.702018),(28.504182,45.693698),(28.480928,45.669462),(28.474003,45.657938),(28.482891,45.650755),(28.498498,45.644295),(28.511314,45.635045),(28.516895,45.620989),(28.518755,45.607036),(28.523096,45.593239),(28.536893,45.579803),(28.510435,45.571018),(28.504596,45.567246),(28.503743,45.566102),(28.498239,45.558719),(28.497981,45.556445),(28.500048,45.554585),(28.506456,45.520582),(28.502012,45.508748),(28.480928,45.501978),(28.416849,45.503787),(28.341918,45.517636),(28.270501,45.521512),(28.270423,45.521471),(28.217275,45.493348),(28.217171,45.493193),(28.217171,45.493142),(28.20849,45.481411),(28.201565,45.468854),(28.199498,45.461774),(28.172936,45.484357),(28.165908,45.494589),(28.165391,45.528282),(28.164048,45.530607),(28.161567,45.532726),(28.157743,45.538927),(28.140949,45.560218),(28.118004,45.572723),(28.062142,45.593601),(28.074751,45.604866),(28.091184,45.615976),(28.107721,45.6244),(28.120846,45.627707),(28.153713,45.6275),(28.167975,45.632461),(28.161774,45.645432),(28.163738,45.661503),(28.154953,45.761807),(28.146478,45.771161),(28.128908,45.795035),(28.113302,45.825369),(28.110511,45.854308),(28.114955,45.859734),(28.128184,45.8664),(28.131078,45.871361),(28.129115,45.875134),(28.120226,45.887846),(28.117436,45.895236),(28.118779,45.903142),(28.12281,45.910791),(28.124981,45.918387),(28.120846,45.926293),(28.114852,45.933218),(28.112371,45.939213),(28.110511,45.950426),(28.08612,46.000552),(28.082709,46.014712),(28.084466,46.024582),(28.096869,46.05967),(28.096558,46.065045),(28.090461,46.06799),(28.090151,46.073365),(28.092838,46.078377),(28.100796,46.081995),(28.107823,46.096103),(28.110506,46.101491),(28.127358,46.135325),(28.133249,46.159974),(28.144721,46.183229),(28.141517,46.191962),(28.135626,46.198835),(28.129321,46.204674),(28.110976,46.225603),(28.108961,46.23413),(28.120846,46.237851),(28.132112,46.239918),(28.134489,46.245344),(28.131078,46.262397),(28.135212,46.269322),(28.144928,46.272939),(28.156296,46.275368),(28.165753,46.27883),(28.177794,46.287047),(28.191333,46.307769),(28.192883,46.311231),(28.191953,46.323504),(28.187922,46.343787),(28.190351,46.351074),(28.202392,46.353916),(28.207146,46.358153),(28.212934,46.388694),(28.219548,46.393345),(28.226796,46.395548),(28.228643,46.39611),(28.233294,46.401768),(28.22606,46.415359),(28.240219,46.420268),(28.246058,46.427865),(28.247247,46.436185),(28.247144,46.467191),(28.2458,46.475511),(28.242338,46.476518),(28.2381,46.475588),(28.234121,46.478069),(28.221099,46.495768),(28.219032,46.503726),(28.221099,46.541191),(28.224768,46.548736),(28.234121,46.553129),(28.225439,46.569562),(28.230504,46.583902),(28.240529,46.596382),(28.247144,46.607156),(28.24735,46.620825),(28.245085,46.631451),(28.24425,46.635372),(28.234121,46.662424),(28.178104,46.739836),(28.178156,46.758646),(28.137796,46.80624),(28.121518,46.8343),(28.122615,46.84227),(28.124257,46.854195),(28.124257,46.861637),(28.113095,46.87143),(28.114335,46.883393),(28.11356,46.894761),(28.096869,46.902616),(28.105447,46.91768),(28.104994,46.920185),(28.102295,46.935121),(28.082709,46.971527),(28.069067,46.988503),(28.038146,47.015483),(28.037027,47.016459),(28.028036,47.03297),(28.008295,47.026304),(27.986591,47.033228),(27.96313,47.043383),(27.938739,47.046638),(27.938429,47.061056),(27.925923,47.068756),(27.897604,47.081417),(27.867012,47.104645),(27.85771,47.109322),(27.848202,47.111415),(27.843757,47.114386),(27.849855,47.121724),(27.849855,47.12852),(27.80655,47.144617),(27.794665,47.155831),(27.805879,47.158234),(27.807687,47.162471),(27.804793,47.168492),(27.802106,47.176346),(27.800349,47.176966),(27.788309,47.204277),(27.763039,47.226317),(27.752393,47.238926),(27.753634,47.251432),(27.733273,47.275617),(27.722835,47.283317),(27.697823,47.287502),(27.689865,47.290887),(27.68232,47.295254),(27.671727,47.299853),(27.6447,47.303987),(27.636948,47.306674),(27.624029,47.321428),(27.599948,47.360728),(27.588724,47.367389),(27.586409,47.368764),(27.572353,47.375197),(27.580311,47.405996),(27.562534,47.416538),(27.565531,47.428269),(27.569356,47.438553),(27.574782,47.446252),(27.582998,47.450671),(27.575867,47.460412),(27.563154,47.468344),(27.548168,47.474261),(27.534526,47.477982),(27.532975,47.477413),(27.50724,47.477982),(27.501453,47.479945),(27.497525,47.482426),(27.492564,47.484545),(27.483676,47.485423),(27.473134,47.491779),(27.466726,47.506352),(27.459491,47.533224),(27.456908,47.533896),(27.446056,47.534877),(27.442128,47.536634),(27.440061,47.541027),(27.440268,47.550096),(27.438976,47.553713),(27.435824,47.55994),(27.431342,47.572638),(27.429404,47.57813),(27.428382,47.581024),(27.397066,47.589086),(27.369161,47.60831),(27.304049,47.666549),(27.281104,47.693007),(27.272009,47.71497),(27.295057,47.718174),(27.295057,47.724427),(27.289579,47.731687),(27.29113,47.74241),(27.288114,47.75068),(27.287512,47.752332),(27.282448,47.755691),(27.264671,47.764553),(27.260847,47.769075),(27.256196,47.77755),(27.244879,47.792588),(27.231082,47.807083),(27.219196,47.813775),(27.253406,47.828089),(27.245809,47.83659),(27.234906,47.840208),(27.222813,47.842662),(27.212375,47.847933),(27.213202,47.854134),(27.211548,47.885011),(27.212375,47.889507),(27.194185,47.904054),(27.17155,47.912632),(27.160698,47.921727),(27.178268,47.937928),(27.178268,47.942096),(27.178268,47.944129),(27.171964,47.946429),(27.150983,47.957797),(27.162869,47.965006),(27.169793,47.973791),(27.16876,47.983067),(27.157184,47.991955),(27.143748,47.986839),(27.134602,48.000456),(27.121476,48.013194),(27.095793,48.005598),(27.093364,48.00844),(27.091452,48.011851),(27.090005,48.015623),(27.088971,48.019809),(27.109332,48.026088),(27.109332,48.033503),(27.083184,48.043658),(27.059206,48.05805),(27.041739,48.077273),(27.034298,48.101768),(27.036882,48.107349),(27.047424,48.116496),(27.047955,48.121409),(27.048044,48.122232),(27.042773,48.127296),(27.033678,48.132386),(27.025099,48.135048),(27.012697,48.128123),(26.99399,48.132412),(26.966602,48.143367),(26.966602,48.149594),(26.986239,48.150421),(26.997607,48.15794),(26.997607,48.16657),(26.963088,48.175381),(26.955646,48.186),(26.950582,48.197524),(26.938128,48.204811),(26.929085,48.199049),(26.917716,48.187964),(26.908001,48.184528),(26.90397,48.201452),(26.897665,48.208971),(26.855497,48.237832),(26.844749,48.23331),(26.821908,48.252534),(26.804906,48.25827),(26.76372,48.252741),(26.744031,48.255583),(26.733127,48.27075),(26.722379,48.259769),(26.711475,48.261319),(26.688531,48.274832),(26.665741,48.274212),(26.617889,48.258968),(26.618613,48.267184),(26.625124,48.282894),(26.636079,48.294883),(26.6691,48.30881),(26.67401,48.321703),(26.679797,48.330178),(26.699434,48.325113),(26.712974,48.314907),(26.723619,48.302582),(26.735918,48.291834),(26.754573,48.286149),(26.774365,48.287183),(26.785734,48.294108),(26.790075,48.307053),(26.789351,48.32594),(26.78408,48.345164),(26.778189,48.357204),(26.777518,48.36617),(26.78806,48.375963),(26.793589,48.376273),(26.810074,48.371881),(26.816947,48.371726),(26.825628,48.377772),(26.828419,48.385136),(26.831933,48.391363),(26.842785,48.39374),(26.875961,48.383999),(26.908724,48.36524),(26.943244,48.351262),(26.981071,48.35568),(26.990579,48.362372),(26.997814,48.361545),(27.004635,48.358755),(27.015591,48.359401),(27.027683,48.357747),(27.033057,48.360202),(27.031817,48.36524),(27.02851,48.370795),(27.027786,48.374774),(27.0282,48.381389),(27.025409,48.389864),(27.02634,48.397099),(27.037398,48.399683),(27.048044,48.397667),(27.068818,48.388882),(27.175788,48.361804),(27.208551,48.360615),(27.246481,48.373741),(27.25193,48.37831),(27.306012,48.42366),(27.342186,48.436114),(27.36141,48.432807),(27.389832,48.415005),(27.403474,48.411491),(27.420217,48.417149),(27.480885,48.451411),(27.50383,48.472365),(27.503896,48.472365),(27.545171,48.472365),(27.557057,48.474355),(27.582998,48.486034),(27.604806,48.484122),(27.606873,48.457819)]
+Macedonia	[(22.345023,42.313439),(22.443622,42.214427),(22.481449,42.193317),(22.494678,42.164559),(22.506939,42.148927),(22.510181,42.144793),(22.531058,42.129109),(22.617771,42.082704),(22.627177,42.079127),(22.675856,42.060612),(22.705725,42.055935),(22.710272,42.05299),(22.713993,42.048623),(22.718437,42.044463),(22.725052,42.042474),(22.77063,42.043998),(22.780862,42.043171),(22.785306,42.039141),(22.787684,42.032578),(22.791094,42.025808),(22.798949,42.021235),(22.805977,42.02139),(22.821273,42.025369),(22.826958,42.025085),(22.838223,42.019478),(22.843701,42.014465),(22.845621,42.007408),(22.845768,42.006869),(22.846595,41.993639),(22.846905,41.993484),(22.85476,41.982632),(22.857137,41.971884),(22.858894,41.94788),(22.866335,41.924884),(22.877084,41.902043),(22.878634,41.895015),(22.878221,41.880261),(22.880804,41.872691),(22.882088,41.871618),(22.885042,41.869151),(22.896721,41.864448),(22.901372,41.860418),(22.907676,41.848584),(22.918322,41.814348),(22.939716,41.776702),(22.945917,41.769338),(22.956872,41.765669),(22.98054,41.764739),(22.991185,41.760992),(23.008859,41.739934),(23.009582,41.71637),(22.998627,41.693115),(22.985435,41.677198),(22.976613,41.666553),(22.970101,41.652032),(22.967001,41.647046),(22.961523,41.644488),(22.945813,41.641077),(22.940852,41.63764),(22.936098,41.626168),(22.932998,41.612345),(22.932068,41.597953),(22.933721,41.584595),(22.936925,41.57891),(22.946434,41.567748),(22.948707,41.560978),(22.94788,41.555139),(22.943023,41.538551),(22.943599,41.523201),(22.946227,41.453233),(22.94757,41.448376),(22.953358,41.438195),(22.954598,41.432408),(22.952118,41.427705),(22.940542,41.416905),(22.937339,41.410755),(22.939406,41.389413),(22.94447,41.368432),(22.940852,41.349829),(22.916978,41.335773),(22.826027,41.340992),(22.796818,41.337039),(22.780966,41.334894),(22.762293,41.3225),(22.751303,41.315205),(22.742003,41.28703),(22.740865,41.283579),(22.736731,41.204411),(22.727222,41.165809),(22.71575,41.145603),(22.704898,41.139661),(22.691875,41.14457),(22.674099,41.15661),(22.666347,41.164517),(22.661903,41.172268),(22.657185,41.176986),(22.656115,41.178056),(22.64454,41.180227),(22.629347,41.177074),(22.625936,41.169788),(22.626763,41.160796),(22.624489,41.152631),(22.607333,41.135992),(22.590176,41.125139),(22.586634,41.124085),(22.571263,41.119507),(22.549248,41.118525),(22.516589,41.122246),(22.500673,41.122142),(22.481449,41.11775),(22.467496,41.115011),(22.451477,41.113667),(22.421814,41.114649),(22.410446,41.117905),(22.389258,41.128343),(22.380163,41.131702),(22.367658,41.132374),(22.342336,41.128964),(22.323422,41.128498),(22.315051,41.124416),(22.308746,41.124984),(22.306679,41.128447),(22.305232,41.141624),(22.302649,41.1455),(22.29345,41.147515),(22.262961,41.150461),(22.225134,41.159608),(22.213637,41.160684),(22.205807,41.161416),(22.183173,41.159918),(22.160332,41.151908),(22.124365,41.127207),(22.103384,41.121522),(22.095943,41.123641),(22.062767,41.13718),(22.060286,41.140022),(22.058632,41.145087),(22.055532,41.149892),(22.048194,41.151856),(22.04406,41.149944),(22.033828,41.141263),(22.029074,41.138575),(21.965098,41.124364),(21.934712,41.11191),(21.925545,41.106754),(21.909081,41.097493),(21.901226,41.090775),(21.897195,41.081266),(21.896333,41.064705),(21.896162,41.061422),(21.894301,41.053826),(21.880659,41.038426),(21.845002,41.012381),(21.831463,40.993726),(21.831359,40.993675),(21.831359,40.993623),(21.831256,40.99352),(21.793636,40.973572),(21.783714,40.964167),(21.781853,40.955899),(21.78175,40.945099),(21.778133,40.93373),(21.765524,40.923911),(21.757091,40.922506),(21.736998,40.919157),(21.685115,40.927994),(21.6569,40.918227),(21.654833,40.9143),(21.652662,40.901381),(21.648838,40.895799),(21.643877,40.894456),(21.629511,40.895076),(21.623724,40.894404),(21.613698,40.888306),(21.590341,40.870685),(21.581556,40.866292),(21.55365,40.870426),(21.509519,40.900502),(21.505731,40.900903),(21.42942,40.908977),(21.404926,40.908615),(21.381258,40.900502),(21.344878,40.873062),(21.329271,40.866292),(21.295372,40.860866),(21.260955,40.860815),(21.245824,40.863226),(21.209072,40.869083),(21.183027,40.870168),(21.112127,40.853942),(20.965262,40.849394),(20.964849,40.875956),(20.956684,40.894766),(20.939941,40.907065),(20.890228,40.918279),(20.837415,40.924066),(20.836544,40.923904),(20.816951,40.920242),(20.783672,40.899055),(20.766102,40.893732),(20.740883,40.89797),(20.730573,40.904611),(20.717216,40.913214),(20.702746,40.936314),(20.683419,40.99383),(20.664092,41.059149),(20.65386,41.075272),(20.643008,41.081576),(20.634129,41.082576),(20.631536,41.082868),(20.618927,41.082403),(20.605284,41.083488),(20.597419,41.086273),(20.576966,41.093513),(20.569938,41.107104),(20.570558,41.124829),(20.565494,41.147412),(20.549681,41.170615),(20.51268,41.210147),(20.500071,41.23552),(20.483121,41.289471),(20.477747,41.319598),(20.478108,41.321585),(20.481674,41.341199),(20.49604,41.337788),(20.510407,41.344403),(20.523429,41.356805),(20.532937,41.370447),(20.539965,41.387139),(20.540172,41.400678),(20.539049,41.402944),(20.534074,41.412977),(20.522189,41.42569),(20.514644,41.429462),(20.498004,41.431477),(20.490873,41.436025),(20.488909,41.441451),(20.486842,41.457781),(20.483535,41.46548),(20.481597,41.468269),(20.470822,41.483774),(20.463174,41.489768),(20.452012,41.493592),(20.444984,41.508475),(20.447878,41.53545),(20.444157,41.549661),(20.49294,41.557671),(20.507409,41.56227),(20.520845,41.568368),(20.52932,41.574879),(20.534694,41.585266),(20.53467,41.587324),(20.534591,41.594026),(20.513404,41.640405),(20.508339,41.661748),(20.500381,41.734095),(20.503275,41.744637),(20.511337,41.757943),(20.521155,41.767658),(20.54441,41.784763),(20.550921,41.793522),(20.550136,41.80006),(20.54844,41.814193),(20.540482,41.839437),(20.540786,41.844865),(20.541722,41.86158),(20.567147,41.873182),(20.590298,41.854733),(20.602391,41.849876),(20.61872,41.850522),(20.626162,41.855198),(20.637014,41.870365),(20.643422,41.873647),(20.652827,41.86928),(20.671844,41.849307),(20.681456,41.84401),(20.702953,41.849591),(20.714398,41.859163),(20.723313,41.866619),(20.739953,41.888039),(20.750495,41.906797),(20.751052,41.910218),(20.754423,41.930904),(20.751439,41.940338),(20.741814,41.970773),(20.743054,41.993484),(20.755353,42.042784),(20.765378,42.064333),(20.784912,42.082032),(20.810543,42.092936),(20.90417,42.116668),(20.975145,42.134658),(21.003916,42.141951),(21.029238,42.151408),(21.04094,42.15997),(21.074403,42.184455),(21.098484,42.195953),(21.106236,42.195798),(21.112954,42.194402),(21.12639,42.188925),(21.164423,42.16704),(21.199873,42.14115),(21.216203,42.121151),(21.225402,42.106785),(21.229298,42.103822),(21.237804,42.097354),(21.245727,42.096167),(21.28886,42.089706),(21.299299,42.091411),(21.300796,42.098425),(21.301263,42.10061),(21.300332,42.120893),(21.298782,42.129419),(21.295785,42.134794),(21.293718,42.140168),(21.294958,42.148979),(21.353766,42.215977),(21.360602,42.220114),(21.366788,42.223858),(21.384255,42.224943),(21.419085,42.215021),(21.429834,42.215848),(21.428697,42.222566),(21.421462,42.231351),(21.419912,42.240058),(21.436345,42.24688),(21.44792,42.244141),(21.457222,42.237035),(21.467557,42.235123),(21.471973,42.23913),(21.48151,42.247784),(21.499287,42.238663),(21.519854,42.239025),(21.561815,42.247164),(21.564066,42.246289),(21.575044,42.242022),(21.624654,42.242772),(21.65969,42.235563),(21.676886,42.234945),(21.67695,42.234943),(21.69204,42.242022),(21.706509,42.25507),(21.719521,42.260957),(21.8172,42.305145),(21.837354,42.308556),(21.877352,42.30822),(21.88438,42.309512),(21.918279,42.331345),(21.929028,42.335117),(21.941534,42.333102),(21.994967,42.312612),(22.027627,42.303956),(22.045407,42.302424),(22.060906,42.301088),(22.095529,42.305817),(22.233402,42.348889),(22.259757,42.369095),(22.268852,42.370335),(22.273296,42.365477),(22.27402,42.348476),(22.276914,42.341241),(22.29159,42.328399),(22.307609,42.31933),(22.325283,42.314318),(22.345023,42.313439)]
+Mali	[(-4.821226,24.994755),(-4.744925,24.947057),(-4.668677,24.899334),(-4.592351,24.851688),(-4.516025,24.803991),(-4.404946,24.731308),(-4.325235,24.679218),(-4.245498,24.627077),(-4.165865,24.574987),(-4.086154,24.522897),(-4.006495,24.470807),(-3.926732,24.418717),(-3.846996,24.366576),(-3.767336,24.314434),(-3.687625,24.262344),(-3.608018,24.210203),(-3.528281,24.158113),(-3.448544,24.106023),(-3.368808,24.053959),(-3.289123,24.001844),(-3.209489,23.949702),(-3.129649,23.897612),(-3.043065,23.840923),(-2.956404,23.784234),(-2.869768,23.727623),(-2.783107,23.670985),(-2.696446,23.614348),(-2.609836,23.557685),(-2.523226,23.500996),(-2.436513,23.444358),(-2.349852,23.387747),(-2.26319,23.331109),(-2.176632,23.274446),(-2.089919,23.217757),(-2.00331,23.161042),(-1.916648,23.104456),(-1.830039,23.047819),(-1.743326,22.991182),(-1.656716,22.93457),(-1.570054,22.877881),(-1.483496,22.821166),(-1.396783,22.764555),(-1.310122,22.707969),(-1.223512,22.65128),(-1.136903,22.594643),(-1.05019,22.537954),(-0.96358,22.481265),(-0.876918,22.424627),(-0.790309,22.368041),(-0.703647,22.311404),(-0.616934,22.254767),(-0.530325,22.198078),(-0.443663,22.141389),(-0.357028,22.084751),(-0.270392,22.028114),(-0.183731,21.971477),(-0.097044,21.914839),(-0.010408,21.85815),(0.003735,21.848899),(0.076253,21.801461),(0.162966,21.744824),(0.249499,21.688238),(0.33616,21.631601),(0.422795,21.574963),(0.509457,21.518274),(0.596067,21.461585),(0.682676,21.404896),(0.769389,21.34831),(0.855999,21.291673),(0.942609,21.235036),(1.029322,21.178347),(1.146524,21.101711),(1.15934,21.081505),(1.177943,21.017323),(1.180114,20.995309),(1.167505,20.886013),(1.145284,20.795889),(1.14456,20.776252),(1.147247,20.751448),(1.154585,20.738787),(1.168538,20.733464),(1.191276,20.73057),(1.212463,20.73088),(1.252254,20.738994),(1.273338,20.739407),(1.296696,20.733464),(1.310545,20.722716),(1.331526,20.687937),(1.346925,20.669127),(1.363978,20.657707),(1.40718,20.645046),(1.447487,20.638741),(1.465781,20.633522),(1.483454,20.622618),(1.520351,20.616986),(1.559729,20.597504),(1.623704,20.551253),(1.643961,20.522676),(1.650059,20.487019),(1.649232,20.412089),(1.659154,20.397516),(1.778113,20.304291),(1.799197,20.294886),(1.820901,20.293594),(1.838885,20.29592),(1.855008,20.294835),(1.870614,20.283543),(1.880329,20.263054),(1.883843,20.24414),(1.891388,20.231789),(1.913402,20.231092),(1.924254,20.23613),(1.941204,20.251116),(1.95526,20.254915),(1.967146,20.253416),(1.975621,20.248429),(1.983372,20.241918),(1.993397,20.235949),(2.056339,20.215046),(2.071222,20.213263),(2.097474,20.224193),(2.138195,20.260728),(2.161346,20.274939),(2.18243,20.278505),(2.200826,20.273906),(2.21819,20.264087),(2.279581,20.21794),(2.316478,20.180165),(2.348208,20.137635),(2.388722,20.067407),(2.400401,20.056555),(2.415697,20.051284),(2.439882,20.04609),(2.459312,20.038778),(2.495382,20.020097),(2.514812,20.015937),(2.525665,20.015162),(2.616925,19.998367),(2.671805,19.996222),(2.946001,19.941652),(3.072608,19.88889),(3.130485,19.845224),(3.147022,19.837938),(3.183195,19.827731),(3.198802,19.820523),(3.212754,19.807758),(3.216785,19.794064),(3.198285,19.592397),(3.199422,19.553769),(3.212238,19.517156),(3.217509,19.511162),(3.222883,19.508061),(3.228051,19.504159),(3.232288,19.495478),(3.231668,19.489044),(3.22619,19.4692),(3.225984,19.459692),(3.234769,19.441347),(3.247481,19.426464),(3.25823,19.410393),(3.260813,19.388327),(3.250995,19.36546),(3.232701,19.351843),(3.211514,19.340862),(3.192911,19.325798),(3.183816,19.307505),(3.178855,19.268722),(3.17441,19.251643),(3.152706,19.230197),(3.13927,19.221929),(3.134206,19.212859),(3.126558,19.193352),(3.111779,19.171337),(3.102684,19.153561),(3.10413,19.135526),(3.120874,19.112814),(3.138754,19.096045),(3.158597,19.08155),(3.179785,19.07),(3.225984,19.05106),(3.284895,18.995741),(3.308356,18.981685),(3.318381,18.977706),(3.333057,18.975561),(3.358689,18.976853),(3.439717,18.995638),(3.439821,18.995638),(3.54462,19.015068),(3.715566,19.046901),(3.790291,19.06077),(3.886512,19.07863),(4.057561,19.110437),(4.22861,19.142244),(4.229023,19.018582),(4.229436,18.894946),(4.22985,18.771284),(4.230263,18.647648),(4.230271,18.645374),(4.230677,18.524038),(4.23109,18.400325),(4.231504,18.276741),(4.231917,18.153105),(4.232227,18.029443),(4.232408,17.975234),(4.23264,17.905782),(4.233054,17.78212),(4.233364,17.658458),(4.233777,17.534796),(4.234294,17.411186),(4.234707,17.287525),(4.235018,17.163915),(4.235328,17.100818),(4.235638,16.995863),(4.222305,16.986561),(4.21166,16.986044),(4.203702,16.982789),(4.197811,16.965219),(4.19657,16.947132),(4.202048,16.848895),(4.197604,16.838508),(4.184581,16.818509),(4.181998,16.809621),(4.182308,16.746472),(4.183031,16.612682),(4.183444,16.526538),(4.183961,16.416053),(4.1759,16.392644),(4.16174,16.379983),(4.118229,16.358331),(4.094768,16.340812),(4.075647,16.321072),(4.060558,16.298334),(3.971158,16.086099),(3.96692,16.058504),(3.970848,16.030857),(3.98325,16.00135),(3.983973,16.00011),(3.98449,15.998766),(3.984697,15.997371),(3.984594,15.995924),(3.9848,15.989826),(3.98418,15.986881),(3.98325,15.983987),(3.925062,15.927608),(3.909869,15.904767),(3.903462,15.886318),(3.89447,15.78865),(3.886512,15.750099),(3.873849,15.720882),(3.871215,15.714804),(3.846101,15.685297),(3.808377,15.665582),(3.728899,15.65088),(3.692208,15.63145),(3.614074,15.547734),(3.526534,15.495954),(3.516508,15.469186),(3.507103,15.353973),(3.48881,15.357539),(3.483332,15.359296),(3.380393,15.376324),(3.19229,15.40751),(3.073021,15.427199),(3.03354,15.42645),(3.017521,15.422832),(3.010286,15.417665),(3.007806,15.407665),(3.005842,15.389294),(3.005739,15.35232),(3.000158,15.339117),(2.950651,15.337463),(2.85412,15.334207),(2.757485,15.331081),(2.660953,15.327825),(2.564215,15.324595),(2.467684,15.321417),(2.371049,15.318239),(2.274517,15.314984),(2.177882,15.311831),(2.081351,15.308576),(1.984612,15.305398),(1.888081,15.302194),(1.791446,15.29899),(1.694914,15.295734),(1.598383,15.292608),(1.501748,15.289352),(1.405216,15.286148),(1.331526,15.283616),(1.297832,15.275735),(1.270857,15.259897),(1.203161,15.198789),(1.123063,15.126313),(1.057537,15.067118),(0.973718,14.991257),(0.949327,14.979552),(0.922145,14.973971),(0.769183,14.969062),(0.739934,14.958339),(0.711408,14.947461),(0.683813,14.940872),(0.670067,14.939735),(0.514831,14.993556),(0.483515,14.992109),(0.418791,14.969888),(0.387035,14.963248),(0.353187,14.963429),(0.221257,14.995933),(0.213196,14.985417),(0.212782,14.960716),(0.218467,14.910977),(-0.033197,14.995933),(-0.033404,14.995933),(-0.166988,15.049677),(-0.236699,15.065619),(-0.299176,15.054741),(-0.361472,15.017741),(-0.397671,15.002135),(-0.425732,15.0026),(-0.435602,15.015157),(-0.458649,15.075463),(-0.4679,15.079908),(-0.500343,15.079721),(-0.719719,15.078461),(-0.752895,15.069727),(-0.771272,15.056619),(-0.782816,15.048385),(-0.836249,14.996088),(-0.836404,14.995985),(-1.043138,14.818062),(-1.043317,14.817908),(-1.07856,14.796359),(-1.116697,14.780443),(-1.307745,14.734657),(-1.350275,14.714969),(-1.69692,14.496119),(-1.766683,14.483174),(-1.836963,14.479582),(-1.919129,14.485861),(-1.967033,14.483742),(-1.997057,14.470694),(-2.005015,14.444236),(-2.023412,14.198643),(-2.027288,14.188127),(-2.035918,14.181229),(-2.085008,14.159668),(-2.104337,14.151179),(-2.11984,14.148776),(-2.151879,14.15614),(-2.385612,14.264712),(-2.46168,14.280912),(-2.516147,14.267864),(-2.597382,14.222311),(-2.619758,14.203604),(-2.676265,14.141729),(-2.69319,14.123196),(-2.840855,14.042994),(-2.867288,14.000542),(-2.861552,14.00173),(-2.858606,14.000232),(-2.85703,13.997777),(-2.855377,13.996175),(-2.89447,13.866571),(-2.912169,13.837942),(-2.928059,13.799624),(-2.923383,13.746035),(-2.895245,13.651648),(-2.930473,13.638523),(-2.965008,13.625655),(-2.97232,13.624467),(-2.979322,13.627567),(-2.986402,13.632063),(-2.994774,13.634983),(-3.019113,13.637515),(-3.026968,13.635345),(-3.038621,13.629583),(-3.05601,13.61085),(-3.067508,13.606767),(-3.07451,13.622141),(-3.077301,13.636791),(-3.08221,13.646222),(-3.100039,13.662733),(-3.125102,13.67728),(-3.146031,13.67666),(-3.167941,13.672112),(-3.195821,13.674903),(-3.240418,13.707976),(-3.267057,13.717045),(-3.286952,13.69777),(-3.266282,13.682344),(-3.259719,13.658315),(-3.263905,13.602659),(-3.269176,13.579095),(-3.283955,13.542198),(-3.248634,13.292781),(-3.262406,13.283919),(-3.42653,13.27423),(-3.448544,13.265781),(-3.452265,13.237514),(-3.440586,13.202839),(-3.439475,13.184855),(-3.449475,13.16881),(-3.461593,13.165761),(-3.473922,13.167601),(-3.516111,13.1739),(-3.538487,13.173409),(-3.54505,13.174494),(-3.553913,13.180256),(-3.569958,13.196767),(-3.576599,13.199299),(-3.589802,13.197387),(-3.596882,13.199402),(-3.678711,13.26175),(-3.724419,13.288828),(-3.798626,13.347145),(-3.817101,13.35469),(-3.85808,13.365516),(-3.8926,13.378926),(-3.908878,13.381975),(-3.928825,13.38027),(-3.948411,13.380838),(-3.971613,13.386755),(-3.984042,13.39647),(-3.971613,13.40833),(-3.963009,13.413162),(-3.942726,13.431946),(-3.934923,13.434892),(-3.925544,13.436313),(-3.918593,13.440318),(-3.917973,13.451066),(-3.923399,13.453754),(-3.94748,13.458198),(-3.956059,13.46166),(-3.959288,13.467939),(-3.964482,13.487808),(-3.965468,13.489217),(-3.970321,13.496154),(-3.974094,13.498945),(-3.977737,13.499926),(-3.981251,13.49897),(-3.984481,13.496051),(-3.997968,13.480522),(-3.992232,13.476233),(-3.979468,13.47538),(-3.971613,13.469954),(-3.97691,13.460627),(-3.990217,13.449129),(-4.005358,13.439517),(-4.016029,13.43577),(-4.028199,13.431533),(-4.043495,13.414454),(-4.052539,13.409002),(-4.079307,13.402129),(-4.087549,13.397995),(-4.104267,13.382698),(-4.114654,13.364534),(-4.131578,13.323839),(-4.147106,13.299603),(-4.16602,13.278157),(-4.176872,13.272369),(-4.186458,13.272834),(-4.195837,13.274695),(-4.205501,13.272989),(-4.220668,13.262835),(-4.23878,13.246789),(-4.253508,13.22909),(-4.258107,13.21413),(-4.251209,13.204751),(-4.230021,13.193149),(-4.227773,13.184442),(-4.234801,13.175605),(-4.24617,13.172479),(-4.310197,13.175553),(-4.327044,13.168551),(-4.339601,13.135298),(-4.345906,13.127133),(-4.351073,13.118322),(-4.351073,13.106075),(-4.345363,13.097057),(-4.316398,13.070857),(-4.289733,13.01347),(-4.276918,12.996236),(-4.24785,12.971948),(-4.229324,12.948952),(-4.221314,12.921254),(-4.224647,12.864513),(-4.211883,12.819193),(-4.213278,12.807178),(-4.23413,12.74235),(-4.243974,12.729922),(-4.245472,12.728936),(-4.257642,12.72093),(-4.276298,12.714677),(-4.297227,12.712145),(-4.310921,12.716021),(-4.339446,12.73279),(-4.36885,12.738991),(-4.402026,12.736562),(-4.435254,12.728423),(-4.464296,12.717261),(-4.46437,12.717251),(-4.474942,12.715762),(-4.481711,12.717416),(-4.485251,12.714677),(-4.491323,12.662794),(-4.482538,12.646258),(-4.439078,12.613288),(-4.42249,12.597217),(-4.401406,12.550398),(-4.392647,12.537427),(-4.387247,12.533965),(-4.386885,12.530192),(-4.393448,12.516446),(-4.407607,12.497946),(-4.426624,12.479653),(-4.443678,12.459447),(-4.451636,12.435314),(-4.415359,12.350307),(-4.406135,12.307467),(-4.435823,12.301731),(-4.444814,12.309431),(-4.452669,12.320283),(-4.462488,12.328189),(-4.47719,12.327311),(-4.488171,12.320696),(-4.490703,12.313823),(-4.490496,12.305762),(-4.49401,12.290104),(-4.492253,12.278838),(-4.493545,12.272844),(-4.497421,12.26871),(-4.585529,12.197241),(-4.560466,12.149492),(-4.570233,12.138898),(-4.600309,12.137555),(-4.636121,12.117556),(-4.646663,12.098022),(-4.648678,12.081951),(-4.652737,12.071627),(-4.653716,12.069135),(-4.673586,12.05973),(-4.683715,12.059058),(-4.704023,12.061487),(-4.714617,12.059007),(-4.725133,12.050118),(-4.732281,12.037263),(-4.738983,12.02521),(-4.746889,12.015082),(-4.761281,12.006607),(-4.789522,12.001801),(-4.806808,11.996271),(-4.826238,12.012705),(-4.847245,12.013066),(-4.889955,11.997925),(-4.910677,11.998132),(-4.932071,12.003144),(-4.95375,12.005108),(-4.975454,11.996271),(-4.984523,11.988572),(-4.994238,11.983249),(-5.004703,11.980665),(-5.016046,11.981285),(-5.034313,11.97927),(-5.073768,11.98051),(-5.089323,11.97927),(-5.103947,11.972759),(-5.136994,11.953122),(-5.167819,11.943665),(-5.182909,11.930901),(-5.209471,11.901497),(-5.248228,11.870439),(-5.268227,11.843051),(-5.275151,11.837418),(-5.282489,11.836436),(-5.288019,11.839123),(-5.293445,11.843206),(-5.300163,11.846358),(-5.306519,11.846048),(-5.311066,11.842896),(-5.314839,11.83933),(-5.319025,11.837418),(-5.353803,11.831734),(-5.357058,11.829615),(-5.364552,11.82176),(-5.369874,11.820158),(-5.37561,11.822225),(-5.387909,11.830804),(-5.392302,11.832354),(-5.405944,11.830442),(-5.412352,11.82853),(-5.412197,11.823569),(-5.405996,11.812303),(-5.400415,11.810185),(-5.374525,11.79525),(-5.370649,11.791064),(-5.353286,11.794527),(-5.344656,11.793907),(-5.334269,11.790806),(-5.314787,11.782486),(-5.298974,11.772668),(-5.28714,11.758922),(-5.279544,11.739026),(-5.278562,11.721456),(-5.280681,11.699494),(-5.289259,11.660426),(-5.294788,11.650298),(-5.302281,11.639859),(-5.307811,11.629007),(-5.307604,11.617638),(-5.299956,11.606424),(-5.290964,11.604461),(-5.280732,11.605753),(-5.269467,11.604099),(-5.233914,11.575987),(-5.224663,11.54077),(-5.224612,11.45801),(-5.219186,11.435143),(-5.218307,11.422198),(-5.22642,11.41349),(-5.248176,11.403181),(-5.263472,11.390184),(-5.267865,11.37202),(-5.26094,11.267737),(-5.262852,11.251588),(-5.275255,11.230711),(-5.306726,11.199395),(-5.316182,11.176322),(-5.322332,11.135549),(-5.332512,11.12157),(-5.356283,11.106894),(-5.373026,11.099763),(-5.390131,11.094699),(-5.489764,11.082115),(-5.504233,11.072684),(-5.507334,11.056949),(-5.505602,11.047985),(-5.495603,10.996203),(-5.501804,10.97021),(-5.479118,10.975533),(-5.465579,10.947886),(-5.447027,10.877993),(-5.43509,10.856909),(-5.431421,10.844688),(-5.445322,10.786991),(-5.445012,10.778568),(-5.446459,10.768698),(-5.45297,10.763969),(-5.461186,10.760042),(-5.467956,10.752678),(-5.473072,10.737873),(-5.482632,10.684233),(-5.482115,10.675215),(-5.477154,10.658808),(-5.475914,10.650385),(-5.460566,10.644571),(-5.470488,10.635605),(-5.477413,10.61956),(-5.47855,10.604238),(-5.471057,10.597365),(-5.468111,10.58783),(-5.48165,10.535327),(-5.505163,10.499179),(-5.508987,10.490937),(-5.5171,10.439984),(-5.522578,10.425489),(-5.549708,10.435643),(-5.571722,10.44988),(-5.584383,10.454247),(-5.594047,10.453937),(-5.621797,10.446935),(-5.677556,10.441508),(-5.806282,10.413474),(-5.87806,10.37606),(-5.893305,10.365027),(-5.904829,10.348284),(-5.908963,10.330068),(-5.904725,10.275291),(-5.916404,10.266635),(-5.963016,10.282733),(-5.974747,10.273638),(-5.978313,10.248626),(-5.985237,10.227284),(-5.997123,10.208189),(-6.015933,10.18987),(-6.105333,10.189276),(-6.180884,10.215838),(-6.19432,10.224183),(-6.214009,10.247851),(-6.224809,10.255034),(-6.240002,10.251933),(-6.243309,10.289011),(-6.240674,10.302576),(-6.228323,10.31609),(-6.225894,10.314488),(-6.22114,10.310354),(-6.21437,10.307796),(-6.206154,10.310819),(-6.203984,10.316038),(-6.205379,10.322627),(-6.207808,10.328518),(-6.208324,10.33198),(-6.183933,10.358852),(-6.198764,10.370815),(-6.195664,10.389212),(-6.180574,10.420218),(-6.196904,10.439157),(-6.200366,10.448769),(-6.198196,10.457399),(-6.187499,10.475408),(-6.185793,10.481325),(-6.190289,10.491144),(-6.196129,10.494684),(-6.20419,10.494373),(-6.215662,10.492616),(-6.222432,10.494632),(-6.228168,10.500575),(-6.233491,10.507577),(-6.238658,10.512744),(-6.24765,10.51383),(-6.256022,10.511608),(-6.261293,10.514088),(-6.260931,10.529152),(-6.256228,10.537239),(-6.237935,10.551941),(-6.231372,10.560235),(-6.230028,10.572043),(-6.232871,10.58411),(-6.238658,10.597985),(-6.2307,10.606925),(-6.219797,10.61186),(-6.209771,10.617751),(-6.204449,10.629611),(-6.207808,10.637543),(-6.216903,10.645088),(-6.227755,10.65085),(-6.246617,10.657619),(-6.249459,10.665603),(-6.244446,10.706867),(-6.245841,10.720742),(-6.25597,10.726478),(-6.28,10.723274),(-6.303564,10.713171),(-6.322219,10.700485),(-6.341701,10.691442),(-6.367539,10.692268),(-6.388055,10.695524),(-6.409811,10.694387),(-6.427019,10.686093),(-6.433995,10.667929),(-6.435856,10.628706),(-6.430688,10.61496),(-6.419061,10.6077),(-6.406658,10.60186),(-6.399217,10.592481),(-6.402783,10.569123),(-6.42149,10.556592),(-6.445984,10.552251),(-6.466965,10.553543),(-6.52138,10.564214),(-6.537555,10.569692),(-6.578069,10.591138),(-6.598585,10.604909),(-6.613623,10.618474),(-6.633983,10.65302),(-6.647109,10.66134),(-6.669175,10.654157),(-6.667883,10.650901),(-6.681939,10.627389),(-6.684213,10.626562),(-6.688967,10.607855),(-6.691086,10.589432),(-6.689225,10.580931),(-6.685608,10.574007),(-6.682817,10.565971),(-6.687778,10.52047),(-6.697545,10.488301),(-6.695788,10.471197),(-6.683076,10.451689),(-6.675634,10.447865),(-6.664627,10.444557),(-6.653982,10.440036),(-6.647781,10.432698),(-6.647936,10.421871),(-6.653052,10.413061),(-6.659615,10.405361),(-6.663955,10.397997),(-6.66827,10.36584),(-6.668916,10.361022),(-6.677391,10.349034),(-6.700336,10.34167),(-6.722557,10.344047),(-6.760229,10.366113),(-6.782088,10.373037),(-6.803895,10.370867),(-6.862755,10.34384),(-6.88203,10.341256),(-6.938719,10.348336),(-6.96125,10.344874),(-6.973136,10.33229),(-6.997113,10.25276),(-6.994891,10.239402),(-6.984298,10.230384),(-6.971172,10.222065),(-6.961612,10.211032),(-6.95939,10.185503),(-6.971637,10.164419),(-6.992411,10.149097),(-7.015769,10.140881),(-7.040522,10.140054),(-7.058247,10.15597),(-7.073129,10.178527),(-7.089459,10.19757),(-7.106357,10.207259),(-7.204749,10.234493),(-7.284021,10.246559),(-7.346963,10.247903),(-7.363396,10.252192),(-7.371819,10.264517),(-7.372698,10.288598),(-7.366342,10.329448),(-7.372336,10.34477),(-7.395022,10.346217),(-7.422204,10.336089),(-7.431402,10.333737),(-7.444425,10.334202),(-7.445768,10.340378),(-7.443288,10.349964),(-7.444683,10.360816),(-7.461478,10.388643),(-7.465457,10.398617),(-7.46618,10.40748),(-7.465354,10.417996),(-7.46618,10.429494),(-7.471606,10.441095),(-7.480236,10.450293),(-7.489848,10.456107),(-7.501475,10.458639),(-7.515841,10.457812),(-7.539613,10.427633),(-7.547416,10.420502),(-7.556382,10.417272),(-7.574339,10.417531),(-7.584416,10.416523),(-7.607774,10.418719),(-7.643689,10.440475),(-7.664411,10.437142),(-7.670044,10.42877),(-7.673971,10.416394),(-7.679036,10.405929),(-7.687924,10.403087),(-7.69981,10.404534),(-7.708646,10.402467),(-7.722289,10.391331),(-7.722289,10.384484),(-7.726785,10.382882),(-7.736035,10.378282),(-7.723994,10.363606),(-7.735337,10.347096),(-7.757429,10.334047),(-7.777583,10.329862),(-7.764405,10.312912),(-7.776342,10.292732),(-7.778254,10.27834),(-7.783835,10.270434),(-7.791225,10.265783),(-7.797736,10.260279),(-7.80125,10.249453),(-7.805074,10.241831),(-7.829001,10.211652),(-7.838664,10.203719),(-7.847423,10.197932),(-7.857216,10.194418),(-7.882847,10.190826),(-7.892253,10.184832),(-7.910959,10.169406),(-7.929046,10.160957),(-7.949872,10.155428),(-7.970904,10.155066),(-7.989663,10.161991),(-7.96801,10.209998),(-7.962584,10.233252),(-7.9646,10.258936),(-7.971214,10.281802),(-7.981549,10.307021),(-7.996277,10.32826),(-8.015708,10.339344),(-8.070071,10.341876),(-8.096116,10.346734),(-8.115495,10.360247),(-8.120921,10.373037),(-8.122109,10.399496),(-8.125417,10.411665),(-8.135442,10.427323),(-8.142056,10.429649),(-8.150583,10.424533),(-8.165983,10.418099),(-8.18903,10.413629),(-8.210579,10.414068),(-8.228873,10.423422),(-8.253884,10.469827),(-8.284425,10.511246),(-8.295535,10.537446),(-8.311142,10.735289),(-8.315586,10.753092),(-8.341941,10.763246),(-8.339822,10.783865),(-8.318893,10.83952),(-8.311814,10.847246),(-8.305871,10.856289),(-8.303649,10.874893),(-8.305096,10.978246),(-8.311142,11.000803),(-8.326593,11.02385),(-8.347315,11.043126),(-8.369329,11.054236),(-8.381318,11.053926),(-8.400645,11.043332),(-8.410464,11.041911),(-8.429067,11.048293),(-8.438162,11.04974),(-8.448704,11.047105),(-8.469013,11.046381),(-8.489064,11.052737),(-8.505755,11.052789),(-8.531645,10.999046),(-8.541567,10.983775),(-8.55955,10.971605),(-8.575622,10.966748),(-8.593347,10.964707),(-8.611382,10.965146),(-8.628228,10.967833),(-8.647969,10.965818),(-8.665229,10.956955),(-8.680938,10.952304),(-8.696234,10.962743),(-8.70073,10.978452),(-8.696906,10.996048),(-8.68869,11.012559),(-8.679801,11.025194),(-8.63368,11.071289),(-8.623112,11.091262),(-8.622389,11.102605),(-8.624921,11.112191),(-8.624611,11.122035),(-8.615413,11.13405),(-8.607222,11.137151),(-8.586991,11.137461),(-8.578154,11.14206),(-8.569679,11.157796),(-8.563943,11.193426),(-8.551799,11.210738),(-8.544616,11.214975),(-8.5241,11.22376),(-8.515625,11.229057),(-8.51206,11.230298),(-8.502138,11.231176),(-8.498779,11.233501),(-8.497022,11.24071),(-8.499244,11.246705),(-8.502345,11.25164),(-8.50312,11.255412),(-8.492578,11.277788),(-8.483224,11.28492),(-8.44457,11.276264),(-8.426897,11.274197),(-8.406691,11.275282),(-8.388398,11.281406),(-8.376719,11.294661),(-8.371035,11.32055),(-8.381267,11.325098),(-8.39956,11.322152),(-8.417957,11.325511),(-8.42607,11.340472),(-8.414133,11.353468),(-8.393359,11.363003),(-8.375324,11.367654),(-8.397648,11.385895),(-8.427724,11.40008),(-8.488134,11.418193),(-8.51578,11.418968),(-8.527563,11.423387),(-8.535521,11.438088),(-8.539425,11.456312),(-8.543996,11.477647),(-8.549577,11.490127),(-8.575208,11.470283),(-8.602183,11.472092),(-8.656754,11.496431),(-8.667967,11.510875),(-8.679026,11.52984),(-8.687346,11.55002),(-8.690705,11.568029),(-8.712874,11.640066),(-8.726517,11.649471),(-8.740366,11.646164),(-8.756541,11.638826),(-8.777211,11.635932),(-8.795195,11.641926),(-8.81168,11.651745),(-8.828526,11.659186),(-8.847233,11.657946),(-8.797004,11.913227),(-8.79783,11.925113),(-8.803205,11.934932),(-8.809974,11.94444),(-8.814909,11.955395),(-8.816434,11.976841),(-8.815452,11.995703),(-8.819793,12.012653),(-8.837983,12.028156),(-8.858757,12.031825),(-8.88165,12.029189),(-8.903715,12.030378),(-8.922112,12.045364),(-8.926298,12.064278),(-8.921957,12.086033),(-8.906971,12.125359),(-8.906041,12.147735),(-8.913896,12.169853),(-8.927021,12.187371),(-8.942008,12.195846),(-8.961696,12.187991),(-8.97384,12.187578),(-8.981178,12.198946),(-8.984537,12.20892),(-8.994278,12.224836),(-8.99756,12.23481),(-8.995906,12.26101),(-8.985261,12.282094),(-8.972135,12.301989),(-8.963092,12.32421),(-8.964745,12.346276),(-8.975907,12.368704),(-8.993839,12.387514),(-9.027765,12.404751),(-9.147318,12.465493),(-9.189486,12.479239),(-9.265864,12.495207),(-9.278938,12.494432),(-9.286379,12.488128),(-9.294079,12.483787),(-9.308187,12.488955),(-9.321519,12.496603),(-9.327307,12.497533),(-9.33418,12.496293),(-9.350872,12.484614),(-9.398155,12.473245),(-9.412573,12.455365),(-9.407251,12.445133),(-9.392781,12.428028),(-9.374694,12.41113),(-9.347151,12.396454),(-9.344464,12.389012),(-9.343947,12.380124),(-9.339167,12.370616),(-9.331648,12.366326),(-9.314801,12.362657),(-9.309169,12.357748),(-9.308497,12.345036),(-9.312889,12.32607),(-9.321829,12.310206),(-9.335007,12.306537),(-9.331906,12.282766),(-9.336816,12.269846),(-9.360173,12.246644),(-9.421513,12.257082),(-9.438877,12.254757),(-9.479598,12.235843),(-9.495876,12.224681),(-9.515616,12.20706),(-9.628167,12.170163),(-9.66,12.149802),(-9.675141,12.133989),(-9.682273,12.118538),(-9.683668,12.101485),(-9.681549,12.080814),(-9.686303,12.068153),(-9.698809,12.050997),(-9.722994,12.025417),(-9.778649,12.026657),(-9.796632,12.032342),(-9.806813,12.038439),(-9.823039,12.050893),(-9.833684,12.055131),(-9.840661,12.055028),(-9.861125,12.051875),(-9.870736,12.052082),(-9.888772,12.060557),(-9.923188,12.087584),(-9.941533,12.092751),(-9.961584,12.096007),(-9.996414,12.114145),(-10.015534,12.119881),(-10.027678,12.125669),(-10.04809,12.141379),(-10.060182,12.147528),(-10.070363,12.149854),(-10.087002,12.150577),(-10.09034,12.151584),(-10.097286,12.153678),(-10.105192,12.158639),(-10.118835,12.170163),(-10.128654,12.174503),(-10.135837,12.175485),(-10.160228,12.174503),(-10.179762,12.178224),(-10.21485,12.194606),(-10.247819,12.201065),(-10.254124,12.207215),(-10.258981,12.213778),(-10.26694,12.217808),(-10.304974,12.202874),(-10.31102,12.19104),(-10.313603,12.191143),(-10.316497,12.196879),(-10.323577,12.201995),(-10.325592,12.199773),(-10.329882,12.19042),(-10.339338,12.185459),(-10.348433,12.184787),(-10.354118,12.18086),(-10.353394,12.166494),(-10.368225,12.171506),(-10.37484,12.174814),(-10.381403,12.180136),(-10.39458,12.17161),(-10.428945,12.143394),(-10.435973,12.135178),(-10.445688,12.120708),(-10.493489,12.124429),(-10.511628,12.118073),(-10.512661,12.108461),(-10.504445,12.088359),(-10.507959,12.084586),(-10.517312,12.080349),(-10.517674,12.070737),(-10.514883,12.060144),(-10.51509,12.052909),(-10.535399,12.038698),(-10.555449,12.029344),(-10.566508,12.017252),(-10.55948,11.995186),(-10.574983,11.990329),(-10.595653,11.97989),(-10.613792,11.967694),(-10.621543,11.957669),(-10.625264,11.943872),(-10.634152,11.925423),(-10.645159,11.90837),(-10.655081,11.898965),(-10.669964,11.89204),(-10.711357,11.890386),(-10.740347,11.919894),(-10.781017,11.99622),(-10.807785,12.022833),(-10.812436,12.033427),(-10.811041,12.04154),(-10.801222,12.059213),(-10.798535,12.068102),(-10.804943,12.095955),(-10.822926,12.110476),(-10.846387,12.12138),(-10.869642,12.138433),(-10.909794,12.200135),(-10.927675,12.212951),(-10.952117,12.219462),(-10.972013,12.218583),(-11.015473,12.204424),(-11.038779,12.205251),(-11.052318,12.202512),(-11.059811,12.192435),(-11.072782,12.149492),(-11.084306,12.136573),(-11.116604,12.113732),(-11.117477,12.112702),(-11.122081,12.107272),(-11.136292,12.085103),(-11.14425,12.081331),(-11.152725,12.080866),(-11.159392,12.077507),(-11.165644,12.04862),(-11.176342,12.029499),(-11.191173,12.01441),(-11.206986,12.010172),(-11.223315,12.009294),(-11.25551,11.996168),(-11.274992,11.996271),(-11.294681,12.003093),(-11.315144,12.013325),(-11.334678,12.026192),(-11.351318,12.040403),(-11.391729,12.093733),(-11.409557,12.107893),(-11.470794,12.134609),(-11.489604,12.151197),(-11.507794,12.191608),(-11.491671,12.220909),(-11.463249,12.249951),(-11.444594,12.289484),(-11.444904,12.312531),(-11.451467,12.352115),(-11.447229,12.374543),(-11.431675,12.382966),(-11.407594,12.381933),(-11.388628,12.384465),(-11.388422,12.403895),(-11.386561,12.430457),(-11.379792,12.456864),(-11.377776,12.480221),(-11.390437,12.497533),(-11.392607,12.491848),(-11.400514,12.479549),(-11.402374,12.488541),(-11.408679,12.504923),(-11.410849,12.513346),(-11.416999,12.529314),(-11.42475,12.526368),(-11.430383,12.515723),(-11.429814,12.508333),(-11.437876,12.515361),(-11.449451,12.535205),(-11.456686,12.539753),(-11.467797,12.543525),(-11.460614,12.549829),(-11.43984,12.559286),(-11.437359,12.570758),(-11.438599,12.577993),(-11.440925,12.584866),(-11.441803,12.595511),(-11.436636,12.627086),(-11.436842,12.637473),(-11.441752,12.647756),(-11.449555,12.653182),(-11.457151,12.655973),(-11.460975,12.658402),(-11.461905,12.673129),(-11.455756,12.680622),(-11.447953,12.685945),(-11.437359,12.712248),(-11.424182,12.716383),(-11.410332,12.718811),(-11.402168,12.73173),(-11.404028,12.741213),(-11.41457,12.759713),(-11.41457,12.764209),(-11.407594,12.77147),(-11.405423,12.782348),(-11.406353,12.794285),(-11.408472,12.804491),(-11.411676,12.812888),(-11.416017,12.820071),(-11.419686,12.824671),(-11.420978,12.825575),(-11.423458,12.826402),(-11.428161,12.827022),(-11.432088,12.829347),(-11.432502,12.835523),(-11.430021,12.841052),(-11.427024,12.845238),(-11.425474,12.849553),(-11.428626,12.865805),(-11.424905,12.876166),(-11.419324,12.886501),(-11.415138,12.896656),(-11.417309,12.901953),(-11.423096,12.907069),(-11.427954,12.912495),(-11.427231,12.918618),(-11.420668,12.922029),(-11.413588,12.919703),(-11.407283,12.916293),(-11.402891,12.916396),(-11.394209,12.923321),(-11.387801,12.927119),(-11.384443,12.933114),(-11.386561,12.959107),(-11.388835,12.970553),(-11.393434,12.980811),(-11.401806,12.989492),(-11.404235,12.972103),(-11.411521,12.960709),(-11.423096,12.956006),(-11.438703,12.9589),(-11.435964,12.968848),(-11.433535,12.988356),(-11.433432,12.99696),(-11.430124,13.00099),(-11.424543,13.005202),(-11.422993,13.009414),(-11.431675,13.01347),(-11.435654,13.016726),(-11.43953,13.023005),(-11.445162,13.035226),(-11.45896,13.054682),(-11.456945,13.060444),(-11.451415,13.068067),(-11.450278,13.075095),(-11.46082,13.079177),(-11.477098,13.083285),(-11.489707,13.090778),(-11.501541,13.099589),(-11.515391,13.107754),(-11.533064,13.111811),(-11.538077,13.128011),(-11.538542,13.16297),(-11.547843,13.176199),(-11.559729,13.186922),(-11.569341,13.199195),(-11.572338,13.217101),(-11.568566,13.227902),(-11.555802,13.245911),(-11.554251,13.256866),(-11.55854,13.266504),(-11.581175,13.286141),(-11.605824,13.319653),(-11.613007,13.339058),(-11.613111,13.360813),(-11.620345,13.357532),(-11.632903,13.35438),(-11.643962,13.355594),(-11.646597,13.365516),(-11.645253,13.379753),(-11.649801,13.38412),(-11.674967,13.383215),(-11.694501,13.379184),(-11.70401,13.380373),(-11.714035,13.388099),(-11.719771,13.397891),(-11.726902,13.405798),(-11.741217,13.407813),(-11.756513,13.399803),(-11.76659,13.383164),(-11.772533,13.362674),(-11.775116,13.343347),(-11.817078,13.312341),(-11.822555,13.306708),(-11.828136,13.307277),(-11.840022,13.316889),(-11.844569,13.323839),(-11.850771,13.34314),(-11.854595,13.350556),(-11.862346,13.356085),(-11.888804,13.368875),(-11.897589,13.371175),(-11.899967,13.382182),(-11.885652,13.43577),(-11.883482,13.453547),(-11.890406,13.465148),(-11.898468,13.468507),(-11.907718,13.469644),(-11.918157,13.474708),(-11.923841,13.481142),(-11.932729,13.496051),(-11.939034,13.50295),(-11.996808,13.544161),(-12.015153,13.564444),(-12.037323,13.598267),(-12.049828,13.634363),(-12.070395,13.673249),(-12.083883,13.692964),(-12.097629,13.70441),(-12.012311,13.751177),(-11.978825,13.784819),(-11.962908,13.829467),(-11.956966,13.870007),(-11.956811,13.890342),(-11.962908,13.909152),(-11.980375,13.929642),(-11.99903,13.943569),(-12.015308,13.959304),(-12.025334,13.985246),(-12.02523,14.026742),(-12.002751,14.103456),(-11.995413,14.144022),(-11.997583,14.166165),(-12.03448,14.250268),(-12.044299,14.264919),(-12.058355,14.274091),(-12.097784,14.28807),(-12.10998,14.298146),(-12.119591,14.310575),(-12.127808,14.324295),(-12.113029,14.329592),(-12.108688,14.34202),(-12.115612,14.35512),(-12.208837,14.388761),(-12.22173,14.391242),(-12.21987,14.434598),(-12.222428,14.454933),(-12.234184,14.498574),(-12.236432,14.519451),(-12.230386,14.536685),(-12.211472,14.547976),(-12.204186,14.554255),(-12.201447,14.565184),(-12.200465,14.577354),(-12.198398,14.58756),(-12.191008,14.597999),(-12.171526,14.616422),(-12.165945,14.625181),(-12.165015,14.641872),(-12.172611,14.647918),(-12.182792,14.650244),(-12.18982,14.655954),(-12.192197,14.666884),(-12.190285,14.673653),(-12.185841,14.68081),(-12.180311,14.692825),(-12.191422,14.693445),(-12.207648,14.696598),(-12.222815,14.70329),(-12.230489,14.714555),(-12.236613,14.728456),(-12.256508,14.745794),(-12.26413,14.774939),(-12.246793,14.767007),(-12.224779,14.763441),(-12.203256,14.76618),(-12.160209,14.781011),(-12.138867,14.784525),(-12.123674,14.776644),(-12.081454,14.740032),(-12.070395,14.734399),(-12.062334,14.746259),(-12.057063,14.761942),(-12.049673,14.767213),(-12.03107,14.762821),(-12.011071,14.762743),(-11.991486,14.76804),(-11.973967,14.779848),(-11.950299,14.811552),(-11.935985,14.823618),(-11.895729,14.832067),(-11.877487,14.841524),(-11.862605,14.854082),(-11.854698,14.867311),(-11.850822,14.876483),(-11.845603,14.883227),(-11.840487,14.888498),(-11.837076,14.893097),(-11.833097,14.894699),(-11.826069,14.89656),(-11.820385,14.89997),(-11.820437,14.906404),(-11.827361,14.915576),(-11.8301,14.920331),(-11.830927,14.926429),(-11.825811,14.962473),(-11.820592,14.980275),(-11.813202,14.995933),(-11.813202,14.996088),(-11.811083,15.014304),(-11.81377,15.028541),(-11.82116,15.039755),(-11.832839,15.049005),(-11.839195,15.049005),(-11.844466,15.044328),(-11.851029,15.041951),(-11.860899,15.049005),(-11.859142,15.054069),(-11.856765,15.084248),(-11.845138,15.124556),(-11.844208,15.13484),(-11.847308,15.148741),(-11.848187,15.158146),(-11.845655,15.179075),(-11.826793,15.23256),(-11.821057,15.280102),(-11.816923,15.296096),(-11.783488,15.365885),(-11.767675,15.437198),(-11.754859,15.469083),(-11.729434,15.496058),(-11.727057,15.506987),(-11.727057,15.541171),(-11.70174,15.537425),(-11.69755,15.536805),(-11.670833,15.528407),(-11.644117,15.526444),(-11.614868,15.541171),(-11.579211,15.577965),(-11.562571,15.587241),(-11.535958,15.594915),(-11.524279,15.600289),(-11.515391,15.610082),(-11.513117,15.615043),(-11.512342,15.620185),(-11.513117,15.625275),(-11.515391,15.630262),(-11.519576,15.632742),(-11.522987,15.635248),(-11.525623,15.638349),(-11.527328,15.642561),(-11.524382,15.643465),(-11.515391,15.644421),(-11.458236,15.632949),(-11.434827,15.623389),(-11.409557,15.602201),(-11.316901,15.471667),(-11.298195,15.451048),(-11.045393,15.270206),(-11.012734,15.239588),(-10.98519,15.187498),(-10.948035,15.151996),(-10.915169,15.102904),(-10.906229,15.119776),(-10.890881,15.176749),(-10.882251,15.192846),(-10.855328,15.217651),(-10.844062,15.234549),(-10.834399,15.271395),(-10.827216,15.287698),(-10.811041,15.303124),(-10.800189,15.306845),(-10.790112,15.306845),(-10.78174,15.308421),(-10.770682,15.324673),(-10.754507,15.333639),(-10.746807,15.341132),(-10.738901,15.362164),(-10.740141,15.403583),(-10.736368,15.422626),(-10.725361,15.433064),(-10.709187,15.433865),(-10.64888,15.424874),(-10.607126,15.424434),(-10.587385,15.427251),(-10.584746,15.428127),(-10.551522,15.439162),(-10.534985,15.441694),(-10.515503,15.437741),(-10.500414,15.440351),(-10.398405,15.438697),(-10.370758,15.433504),(-10.322647,15.437095),(-10.308746,15.435209),(-10.223221,15.402033),(-10.214488,15.401981),(-10.196091,15.405288),(-10.188391,15.40472),(-10.167979,15.395185),(-10.131599,15.372629),(-10.108293,15.365885),(-10.067624,15.364748),(-9.951403,15.381207),(-9.835596,15.371104),(-9.797356,15.380303),(-9.740719,15.4126),(-9.720823,15.42092),(-9.672118,15.430661),(-9.42389,15.440532),(-9.435879,15.495903),(-9.435879,15.495954),(-9.451847,15.559206),(-9.451692,15.588326),(-9.437016,15.614888),(-9.375935,15.685917),(-9.356453,15.697854),(-9.332423,15.687571),(-9.329322,15.655247),(-9.342965,15.586931),(-9.349218,15.495644),(-9.175843,15.495593),(-9.141379,15.495581),(-9.018592,15.495541),(-9.003216,15.495526),(-8.911157,15.495438),(-8.843409,15.495438),(-8.769253,15.495438),(-8.68931,15.495438),(-8.60394,15.495386),(-8.470202,15.495283),(-8.327006,15.495283),(-8.175801,15.495205),(-8.017826,15.495128),(-7.854529,15.495076),(-7.6872,15.495024),(-7.517237,15.494973),(-7.345878,15.494921),(-7.174519,15.494818),(-7.004503,15.494818),(-6.837175,15.49474),(-6.673929,15.494663),(-6.516006,15.494611),(-6.364749,15.494559),(-6.320145,15.494543),(-6.221605,15.494508),(-6.087815,15.494456),(-6.010817,15.494378),(-5.938212,15.494353),(-5.870257,15.494353),(-5.807315,15.494353),(-5.673163,15.494301),(-5.515964,15.494249),(-5.515602,15.494146),(-5.515292,15.494042),(-5.514982,15.493913),(-5.514672,15.493836),(-5.514362,15.493732),(-5.514051,15.493629),(-5.513741,15.493526),(-5.51338,15.493422),(-5.513121,15.493422),(-5.512966,15.493422),(-5.51276,15.493422),(-5.512553,15.493422),(-5.512294,15.493422),(-5.512191,15.493422),(-5.511933,15.493422),(-5.511726,15.493422),(-5.511623,15.493526),(-5.511519,15.493681),(-5.511364,15.493732),(-5.511313,15.493887),(-5.511261,15.493991),(-5.511106,15.494042),(-5.510951,15.494197),(-5.510951,15.494301),(-5.510951,15.494508),(-5.510951,15.494663),(-5.510951,15.494818),(-5.510951,15.495076),(-5.510951,15.495283),(-5.510951,15.495438),(-5.510951,15.49567),(-5.510951,15.495903),(-5.509917,15.500812),(-5.508987,15.505695),(-5.508761,15.5069),(-5.508057,15.510656),(-5.507075,15.51554),(-5.488368,15.612666),(-5.469558,15.709792),(-5.4508,15.80684),(-5.431989,15.90394),(-5.413799,15.998559),(-5.395454,16.093179),(-5.377212,16.187799),(-5.358919,16.282366),(-5.353286,16.311977),(-5.354268,16.318385),(-5.355301,16.324793),(-5.360107,16.329909),(-5.364913,16.334921),(-5.404963,16.36169),(-5.445942,16.389027),(-5.485371,16.415433),(-5.529709,16.444992),(-5.566503,16.469487),(-5.60588,16.495893),(-5.614562,16.511861),(-5.623347,16.527829),(-5.627688,16.568137),(-5.63761,16.658364),(-5.647583,16.748643),(-5.657454,16.838818),(-5.667324,16.929097),(-5.677297,17.019324),(-5.687168,17.109499),(-5.697038,17.199726),(-5.70696,17.289954),(-5.716933,17.380181),(-5.726803,17.470356),(-5.736674,17.560583),(-5.746647,17.650758),(-5.756466,17.741037),(-5.766387,17.831264),(-5.776361,17.92144),(-5.78618,18.011667),(-5.79636,18.104374),(-5.80654,18.197082),(-5.816772,18.289892),(-5.826952,18.382548),(-5.837081,18.475333),(-5.847364,18.568067),(-5.857545,18.6608),(-5.867673,18.753585),(-5.877802,18.846318),(-5.888034,18.939052),(-5.898214,19.031785),(-5.908394,19.12457),(-5.914802,19.182887),(-5.92121,19.24123),(-5.927566,19.299547),(-5.934026,19.357941),(-5.949115,19.495478),(-5.949115,19.495529),(-5.949115,19.495581),(-5.949115,19.495633),(-5.963533,19.620612),(-5.977847,19.745618),(-5.992162,19.870597),(-6.00658,19.995525),(-6.020946,20.12053),(-6.035363,20.245484),(-6.049678,20.370489),(-6.064095,20.495443),(-6.076756,20.603343),(-6.083577,20.661892),(-6.098615,20.790722),(-6.113705,20.919551),(-6.120526,20.978204),(-6.134634,21.098868),(-6.148741,21.219533),(-6.162901,21.340197),(-6.177008,21.460862),(-6.191116,21.581578),(-6.205224,21.702242),(-6.219383,21.822855),(-6.233491,21.943571),(-6.247598,22.064236),(-6.261706,22.184952),(-6.275865,22.305616),(-6.289973,22.426281),(-6.304132,22.546997),(-6.318188,22.667661),(-6.332296,22.7883),(-6.346455,22.908965),(-6.360563,23.029655),(-6.371634,23.123981),(-6.374722,23.150293),(-6.388778,23.270958),(-6.402938,23.391674),(-6.417045,23.512339),(-6.431205,23.633029),(-6.445312,23.753719),(-6.45942,23.874409),(-6.466603,23.93624),(-6.482571,24.072304),(-6.498436,24.208368),(-6.505671,24.270277),(-6.506338,24.275967),(-6.515851,24.357067),(-6.525514,24.436727),(-6.535178,24.51636),(-6.54479,24.595993),(-6.554453,24.675549),(-6.564168,24.755234),(-6.57378,24.834868),(-6.583392,24.914424),(-6.593107,24.994134),(-6.371674,24.994238),(-6.150188,24.994341),(-5.928755,24.994444),(-5.707321,24.9946),(-5.485939,24.994703),(-5.264454,24.994806),(-5.043072,24.99491),(-4.821613,24.995065),(-4.821536,24.994961),(-4.821355,24.994806),(-4.821226,24.994755)]
+Montenegro	[(19.054991,43.5067),(19.076386,43.507242),(19.096023,43.512901),(19.122791,43.535948),(19.147699,43.538145),(19.195345,43.532796),(19.175191,43.509619),(19.175914,43.480887),(19.192244,43.454532),(19.218392,43.438202),(19.355645,43.393063),(19.372285,43.384226),(19.414039,43.338389),(19.473054,43.293276),(19.485146,43.280098),(19.502303,43.251935),(19.512431,43.240643),(19.547845,43.218815),(19.549948,43.217518),(19.580851,43.187804),(19.598111,43.176203),(19.618678,43.168245),(19.663016,43.158504),(19.684617,43.156721),(19.69733,43.160209),(19.705494,43.166178),(19.713556,43.165609),(19.742805,43.126516),(19.761202,43.108739),(19.781769,43.096466),(19.805127,43.089955),(19.838303,43.088353),(19.872203,43.090368),(19.883778,43.095691),(19.907136,43.113261),(19.916644,43.117059),(19.92915,43.113907),(19.936591,43.105897),(19.942276,43.095639),(19.949821,43.085924),(19.959742,43.07856),(20.019894,43.047348),(20.054388,43.022221),(20.056344,43.020796),(20.116942,42.976654),(20.129464,42.973605),(20.14092,42.970815),(20.19456,42.966836),(20.223189,42.957663),(20.275589,42.929887),(20.337084,42.906969),(20.35362,42.890975),(20.355171,42.86617),(20.345352,42.827439),(20.264427,42.817258),(20.226083,42.806768),(20.217608,42.802737),(20.209236,42.791704),(20.208409,42.782093),(20.20996,42.772972),(20.208409,42.763282),(20.183398,42.742508),(20.149498,42.749872),(20.112085,42.766538),(20.076325,42.773437),(20.065059,42.769458),(20.055638,42.763866),(20.034673,42.751423),(20.026508,42.743206),(20.024751,42.723414),(20.03612,42.707989),(20.037006,42.707363),(20.094205,42.666983),(20.101956,42.656674),(20.10392,42.653108),(20.090587,42.627348),(20.079218,42.61125),(20.075704,42.603085),(20.075394,42.586962),(20.078185,42.572906),(20.077048,42.55991),(20.064956,42.546758),(20.039221,42.557765),(20.017723,42.546241),(19.981757,42.510765),(19.956332,42.505314),(19.907549,42.506399),(19.882745,42.493609),(19.882745,42.493557),(19.882538,42.493402),(19.873339,42.486839),(19.835512,42.470251),(19.829063,42.468723),(19.819596,42.466479),(19.801406,42.468132),(19.784456,42.474566),(19.75159,42.493402),(19.73433,42.524382),(19.730919,42.533658),(19.730299,42.540428),(19.732159,42.555543),(19.733916,42.562597),(19.741358,42.574405),(19.746009,42.579934),(19.747766,42.578901),(19.746885,42.58893),(19.746009,42.5989),(19.737534,42.624402),(19.722134,42.64608),(19.699293,42.654814),(19.676039,42.646675),(19.658037,42.634613),(19.647927,42.627838),(19.621779,42.604997),(19.605035,42.584844),(19.599248,42.571046),(19.593667,42.54482),(19.588086,42.532857),(19.575683,42.522341),(19.561317,42.516243),(19.549328,42.508595),(19.543747,42.493557),(19.543747,42.493402),(19.531655,42.474773),(19.517806,42.45803),(19.501476,42.444129),(19.481735,42.434491),(19.468403,42.41811),(19.417243,42.374107),(19.412076,42.368397),(19.402671,42.352015),(19.400707,42.344755),(19.401327,42.331061),(19.400397,42.325893),(19.304589,42.215099),(19.274926,42.191276),(19.272033,42.180682),(19.281956,42.164723),(19.282058,42.164559),(19.297767,42.151666),(19.355025,42.12004),(19.369998,42.106507),(19.372491,42.104253),(19.374869,42.094667),(19.356575,42.064798),(19.351718,42.047615),(19.350581,42.027823),(19.354198,42.008703),(19.363396,41.993639),(19.363707,41.993484),(19.371045,41.98656),(19.365774,41.969713),(19.359779,41.965993),(19.351614,41.965166),(19.346447,41.961548),(19.352854,41.938501),(19.350477,41.931369),(19.346653,41.926176),(19.345413,41.921189),(19.34593,41.914471),(19.34531,41.910337),(19.347687,41.906358),(19.356989,41.89964),(19.364947,41.888995),(19.364223,41.862846),(19.365122,41.852372),(19.365082,41.852362),(19.346934,41.863959),(19.310232,41.894517),(19.293224,41.900784),(19.220225,41.91885),(19.202973,41.927069),(19.178477,41.933905),(19.170258,41.937974),(19.162283,41.947943),(19.161957,41.953437),(19.163259,41.95897),(19.16033,41.96898),(19.15561,41.970649),(19.145274,41.977607),(19.13795,41.985297),(19.142914,41.988837),(19.143565,41.993069),(19.139171,42.042426),(19.08253,42.081204),(19.074718,42.095649),(19.083832,42.110093),(19.076427,42.115953),(19.063975,42.120185),(19.048676,42.140204),(19.01059,42.139553),(19.002126,42.150214),(18.999848,42.161078),(18.994802,42.163642),(18.988048,42.163723),(18.981619,42.16706),(18.968028,42.188707),(18.953461,42.199856),(18.913341,42.222235),(18.901703,42.237494),(18.894705,42.270494),(18.885997,42.284369),(18.871593,42.290473),(18.854015,42.290473),(18.838878,42.285712),(18.831391,42.277533),(18.826508,42.282213),(18.820486,42.286689),(18.817638,42.291164),(18.801524,42.284369),(18.793956,42.280341),(18.788748,42.276028),(18.786388,42.274115),(18.778575,42.27147),(18.771983,42.276923),(18.762462,42.291164),(18.729503,42.311591),(18.714529,42.325263),(18.714122,42.338935),(18.708344,42.342475),(18.699718,42.34984),(18.693614,42.353217),(18.693614,42.359442),(18.695811,42.373765),(18.678477,42.385972),(18.658539,42.386623),(18.653168,42.366278),(18.646495,42.366278),(18.638438,42.370307),(18.61671,42.368069),(18.612315,42.36994),(18.607107,42.37641),(18.5949,42.383734),(18.580903,42.389838),(18.570649,42.392971),(18.573009,42.39643),(18.57309,42.397528),(18.574067,42.398261),(18.578136,42.400377),(18.552989,42.413642),(18.545177,42.42357),(18.550141,42.435126),(18.562836,42.438544),(18.644949,42.418362),(18.656505,42.415513),(18.685557,42.403998),(18.70045,42.392971),(18.708181,42.408515),(18.706554,42.421047),(18.683849,42.458808),(18.683279,42.468085),(18.687348,42.482896),(18.654145,42.451809),(18.608653,42.44538),(18.502452,42.455634),(18.502452,42.448188),(18.521251,42.437974),(18.51295,42.409003),(18.529796,42.400377),(18.510265,42.40526),(18.49643,42.416327),(18.497816,42.431158),(18.492855,42.442372),(18.475492,42.449813),(18.467741,42.453379),(18.454925,42.464722),(18.444279,42.477925),(18.437148,42.493402),(18.436425,42.510765),(18.442006,42.543012),(18.437355,42.559212),(18.44769,42.566214),(18.458956,42.569728),(18.470531,42.569056),(18.481797,42.563682),(18.492132,42.564767),(18.495852,42.570865),(18.493682,42.579831),(18.486654,42.58983),(18.506798,42.59849),(18.517247,42.602982),(18.538434,42.618304),(18.542832,42.626429),(18.549596,42.638923),(18.550009,42.668069),(18.539674,42.695457),(18.522518,42.71189),(18.502157,42.727445),(18.46743,42.769199),(18.453891,42.793151),(18.444589,42.817078),(18.443659,42.834467),(18.453478,42.845655),(18.465984,42.852812),(18.473322,42.862553),(18.467637,42.881699),(18.443969,42.916865),(18.434047,42.936889),(18.433531,42.954201),(18.452754,42.993398),(18.483037,43.014637),(18.538951,43.023887),(18.598379,43.024455),(18.638996,43.020243),(18.621116,43.09644),(18.620599,43.122563),(18.621128,43.124578),(18.629074,43.154886),(18.645301,43.180182),(18.688399,43.224469),(18.664318,43.233176),(18.679511,43.24948),(18.807151,43.318029),(18.833506,43.324153),(18.830302,43.328157),(18.824618,43.337408),(18.821207,43.341387),(18.839604,43.34782),(18.899135,43.351903),(18.923423,43.346838),(18.950295,43.333067),(18.957323,43.325858),(18.957943,43.318985),(18.957116,43.311828),(18.959493,43.303456),(18.968589,43.292216),(18.988949,43.272941),(18.989506,43.272016),(18.992463,43.267102),(19.002902,43.273949),(19.01086,43.28232),(19.017164,43.291157),(19.022535,43.296546),(19.024709,43.298728),(19.036285,43.303327),(19.062536,43.304386),(19.069668,43.30883),(19.039592,43.350714),(19.00993,43.410995),(18.975306,43.444274),(18.968278,43.448098),(18.946264,43.443938),(18.946368,43.44908),(18.950708,43.457297),(18.951225,43.463808),(18.937893,43.478949),(18.930658,43.482282),(18.915258,43.485383),(18.905647,43.490628),(18.90513,43.499051),(18.911021,43.507268),(18.920529,43.512203),(18.938926,43.518947),(18.962697,43.5383),(18.977477,43.546232),(19.000214,43.547886),(19.01427,43.537783),(19.025019,43.523029),(19.038145,43.511015),(19.054991,43.5067)]
+Mongolia	[(100.005968,51.731727),(100.098262,51.738652),(100.210296,51.726224),(100.510898,51.726895),(100.571101,51.704804),(100.638901,51.69204),(101.069469,51.553444),(101.117011,51.527838),(101.158766,51.521223),(101.200727,51.520913),(101.241551,51.515177),(101.279688,51.492595),(101.315448,51.463604),(101.350175,51.450452),(101.387795,51.450556),(101.482053,51.47288),(101.526392,51.475826),(101.569852,51.470089),(101.643697,51.450091),(101.696614,51.452442),(101.723692,51.450582),(101.742192,51.444845),(101.795316,51.419395),(101.821774,51.413581),(101.901873,51.417069),(101.920683,51.413039),(101.955616,51.393789),(101.97422,51.387226),(102.051217,51.383609),(102.074679,51.374824),(102.091267,51.364644),(102.183871,51.323897),(102.193379,51.307205),(102.179272,51.286431),(102.135295,51.240284),(102.133796,51.230853),(102.139688,51.220931),(102.147646,51.202638),(102.150023,51.185404),(102.148783,51.16879),(102.142168,51.134839),(102.146509,51.097632),(102.165371,51.057556),(102.191984,51.020582),(102.219373,50.992651),(102.229656,50.979267),(102.231051,50.964901),(102.225574,50.950741),(102.215238,50.938184),(102.239475,50.912294),(102.231878,50.88475),(102.212758,50.856742),(102.203043,50.829353),(102.216789,50.798864),(102.245676,50.778762),(102.307533,50.748221),(102.329392,50.718817),(102.320245,50.696131),(102.296836,50.674944),(102.275907,50.650191),(102.271566,50.620942),(102.282418,50.590608),(102.302933,50.563892),(102.327635,50.545546),(102.372697,50.533661),(102.471864,50.524927),(102.513101,50.503688),(102.586585,50.41527),(102.617798,50.399302),(102.619529,50.399009),(102.762595,50.374807),(102.887135,50.314966),(102.927391,50.302977),(102.974107,50.295639),(103.130015,50.309127),(103.20169,50.296983),(103.240189,50.244376),(103.253108,50.214972),(103.276776,50.197557),(103.306593,50.190426),(103.407104,50.197299),(103.43873,50.192596),(103.473973,50.182003),(103.533918,50.153787),(103.601407,50.13353),(103.66807,50.131205),(103.785272,50.186137),(103.845423,50.18469),(103.973994,50.148723),(104.03952,50.141178),(104.121685,50.148258),(104.198115,50.170014),(104.247466,50.206601),(104.268963,50.228873),(104.321363,50.254298),(104.349502,50.271868),(104.377225,50.28918),(104.405802,50.300548),(104.474119,50.313261),(104.576955,50.309488),(104.610441,50.314191),(104.632455,50.323751),(104.671884,50.348297),(104.697051,50.353207),(104.789552,50.352638),(104.81849,50.358323),(104.879004,50.383902),(104.901586,50.389794),(104.934246,50.393256),(105.050104,50.383489),(105.078216,50.385143),(105.10576,50.390052),(105.13134,50.398062),(105.240739,50.458006),(105.278462,50.472579),(105.32864,50.476455),(105.639371,50.421936),(105.779259,50.428913),(105.806544,50.424365),(105.854706,50.410929),(105.904212,50.403798),(105.958059,50.403591),(105.984879,50.399767),(106.038933,50.371397),(106.043274,50.364782),(106.043274,50.355532),(106.044462,50.346024),(106.048183,50.338117),(106.055934,50.33357),(106.135309,50.32711),(106.160941,50.319617),(106.201197,50.299722),(106.222281,50.292384),(106.244863,50.290265),(106.439787,50.327937),(106.548204,50.335792),(106.656518,50.327007),(106.746176,50.307421),(106.788293,50.291505),(106.936449,50.209133),(106.973656,50.196369),(106.982699,50.187119),(106.997996,50.149808),(107.006057,50.140196),(107.026211,50.125727),(107.033601,50.118802),(107.039233,50.10826),(107.048432,50.084644),(107.057113,50.074102),(107.070291,50.066247),(107.100728,50.056791),(107.114629,50.050486),(107.164497,50.01886),(107.192196,50.006044),(107.224907,49.997053),(107.254879,49.998913),(107.280407,50.007595),(107.30485,50.010023),(107.364071,49.976124),(107.729321,49.971938),(107.744604,49.967353),(107.750508,49.965582),(107.78694,49.948218),(107.80792,49.943878),(107.839185,49.946565),(107.850967,49.946048),(107.898199,49.935506),(107.946517,49.933491),(107.95649,49.923362),(107.952614,49.897472),(107.944398,49.880419),(107.935509,49.866621),(107.930032,49.851429),(107.932357,49.830293),(107.950031,49.782492),(107.955767,49.745544),(107.954836,49.732779),(107.949359,49.720635),(107.926828,49.68286),(107.927448,49.670044),(107.939489,49.663223),(107.962898,49.661104),(108.002792,49.663171),(108.015815,49.65573),(108.007546,49.633612),(108.005273,49.617799),(108.015711,49.602245),(108.032661,49.589326),(108.106197,49.554341),(108.126454,49.547158),(108.209911,49.540233),(108.23637,49.532482),(108.250529,49.522405),(108.259521,49.509641),(108.267272,49.495843),(108.277142,49.48251),(108.334865,49.436363),(108.473668,49.35642),(108.538057,49.32743),(108.569973,49.325719),(108.60844,49.323657),(108.751067,49.341175),(108.858967,49.340555),(108.930488,49.348824),(109.032962,49.327895),(109.058025,49.329083),(109.160603,49.346653),(109.286693,49.33854),(109.311911,49.332545),(109.336303,49.323347),(109.390976,49.309291),(109.411233,49.303193),(109.450714,49.305932),(109.462083,49.300454),(109.4657,49.29446),(109.469834,49.276632),(109.474382,49.269138),(109.491849,49.262782),(109.51624,49.255909),(109.728527,49.266451),(109.784957,49.251362),(109.81772,49.227746),(109.83219,49.226867),(109.913115,49.21369),(110.181419,49.161962),(110.225034,49.165372),(110.268339,49.177051),(110.30937,49.195861),(110.34544,49.220614),(110.361046,49.234619),(110.371175,49.24175),(110.382234,49.240045),(110.43329,49.202631),(110.451273,49.194569),(110.508221,49.184337),(110.603615,49.145322),(110.644957,49.136743),(110.688055,49.134521),(110.731359,49.137674),(110.841017,49.162427),(110.965557,49.207385),(111.13857,49.291566),(111.273549,49.32283),(111.291739,49.330788),(111.320988,49.355335),(111.338454,49.36474),(111.362742,49.367634),(111.385066,49.362259),(111.429611,49.346395),(111.454519,49.343087),(111.479117,49.343346),(111.503509,49.347067),(111.616473,49.386444),(111.661019,49.396366),(112.030195,49.411869),(112.126405,49.43994),(112.432238,49.529174),(112.473269,49.534135),(112.58427,49.526332),(112.671396,49.495946),(112.701472,49.491295),(112.733718,49.492794),(112.777126,49.501372),(112.868077,49.531655),(112.926161,49.566536),(112.947348,49.576096),(112.969776,49.583021),(112.992824,49.587155),(113.043673,49.588602),(113.06083,49.595992),(113.071578,49.617748),(113.074162,49.653353),(113.077159,49.669011),(113.087495,49.687408),(113.156741,49.777376),(113.182683,49.801974),(113.212448,49.822025),(113.415537,49.92238),(113.442305,49.946048),(113.458532,49.957262),(113.510415,49.981033),(113.527881,49.992815),(113.579661,50.019945),(113.75226,50.078598),(113.773138,50.081647),(113.815822,50.076893),(113.836803,50.076944),(113.849825,50.080717),(113.973125,50.160505),(113.993279,50.16867),(114.035137,50.176938),(114.055291,50.183811),(114.118233,50.224377),(114.200088,50.25621),(114.286285,50.276881),(114.333,50.272333),(114.424984,50.241844),(114.473043,50.234041),(114.659699,50.251404),(114.75375,50.236211),(114.997352,50.144331),(115.015232,50.132858),(115.028048,50.119888),(115.049649,50.090845),(115.063395,50.077513),(115.210156,49.97168),(115.368699,49.895405),(115.387819,49.891064),(115.450141,49.891426),(115.472982,49.887085),(115.508536,49.886775),(115.578195,49.893648),(115.683409,49.87768),(115.716275,49.877784),(115.750898,49.884967),(116.053619,49.998448),(116.135371,50.014416),(116.21764,50.013848),(116.300529,49.99297),(116.575447,49.92176),(116.617202,49.897317),(116.653375,49.863831),(116.684278,49.823265),(116.472921,49.516462),(116.457728,49.492794),(116.247767,49.181469),(116.037806,48.870145),(116.033568,48.852368),(116.047624,48.817693),(116.048038,48.799761),(116.028194,48.767464),(115.800404,48.530372),(115.791206,48.513836),(115.786555,48.49301),(115.786555,48.473011),(115.809292,48.273954),(115.799991,48.242328),(115.770845,48.224086),(115.536441,48.149155),(115.51422,48.131637),(115.51453,48.122103),(115.545846,47.992989),(115.561866,47.933199),(115.575715,47.909738),(115.5999,47.887414),(115.852701,47.705565),(115.914506,47.683912),(115.9729,47.709053),(116.084314,47.806928),(116.181569,47.849587),(116.243891,47.862894),(116.428893,47.835143),(116.49969,47.836358),(116.751664,47.874133),(116.822047,47.876304),(116.85326,47.872118),(116.972839,47.83765),(117.047356,47.81946),(117.069681,47.810158),(117.317107,47.654069),(117.360826,47.650865),(117.399893,47.685669),(117.43648,47.730499),(117.47286,47.757241),(117.527224,47.78649),(117.741681,47.977589),(117.766899,47.993144),(117.815165,48.004823),(117.972778,47.997898),(117.997169,47.999991),(118.064039,48.019577),(118.122536,48.027509),(118.182481,48.028206),(118.206252,48.023297),(118.254311,48.002859),(118.280046,47.998131),(118.472799,47.989449),(118.542252,47.966246),(118.605246,47.914673),(118.713301,47.793621),(118.767406,47.756156),(118.972614,47.695126),(119.059585,47.673474),(119.08346,47.661562),(119.096947,47.646602),(119.104233,47.62774),(119.116532,47.556039),(119.122113,47.53896),(119.133896,47.527539),(119.157564,47.517669),(119.251046,47.492942),(119.291044,47.48439),(119.310112,47.476095),(119.31776,47.462117),(119.312593,47.452247),(119.288822,47.429147),(119.281897,47.414859),(119.320654,47.40703),(119.475994,47.309206),(119.49067,47.297166),(119.503899,47.279182),(119.512994,47.262672),(119.525086,47.250812),(119.587356,47.238358),(119.629421,47.216086),(119.699959,47.159526),(119.728898,47.128649),(119.753961,47.094439),(119.760524,47.074595),(119.761713,47.015478),(119.764968,47.003825),(119.767294,46.998114),(119.770136,46.992998),(119.784295,46.978322),(119.81742,46.954913),(119.831683,46.942149),(119.83685,46.93357),(119.839692,46.925664),(119.843516,46.918171),(119.852301,46.910729),(119.862947,46.909024),(119.879225,46.908146),(119.892919,46.90551),(119.896433,46.898586),(119.890439,46.88825),(119.884961,46.880912),(119.881447,46.872851),(119.88124,46.860552),(119.883101,46.855436),(119.886821,46.851457),(119.891627,46.848485),(119.896795,46.84647),(119.902893,46.842413),(119.902118,46.837349),(119.898914,46.831251),(119.897983,46.824378),(119.898655,46.802054),(119.885891,46.770066),(119.883101,46.753013),(119.887183,46.74428),(119.903358,46.7264),(119.907027,46.718312),(119.904185,46.708933),(119.897983,46.701647),(119.890335,46.694774),(119.872662,46.673225),(119.85442,46.65966),(119.834421,46.650952),(119.817265,46.651624),(119.796284,46.658833),(119.782228,46.655629),(119.770033,46.643562),(119.754426,46.62439),(119.740267,46.613254),(119.719648,46.602712),(119.697789,46.594883),(119.680116,46.591628),(119.658773,46.596175),(119.623478,46.616329),(119.602188,46.619688),(119.575884,46.619171),(119.501263,46.628008),(119.452946,46.627491),(119.363287,46.613047),(119.316934,46.611678),(119.062376,46.660951),(119.036951,46.668729),(119.014058,46.683301),(118.984913,46.724539),(118.967239,46.740456),(118.947034,46.737148),(118.922074,46.715496),(118.907088,46.709398),(118.890551,46.713532),(118.879648,46.72733),(118.875203,46.74397),(118.867452,46.758336),(118.846523,46.765493),(118.816241,46.758181),(118.792211,46.737768),(118.753816,46.691156),(118.720071,46.676739),(118.684621,46.683457),(118.647414,46.697719),(118.60938,46.705781),(118.595169,46.703042),(118.567729,46.689735),(118.551967,46.685756),(118.472799,46.685679),(118.435179,46.691156),(118.371203,46.713971),(118.335547,46.722162),(118.30082,46.724849),(118.268987,46.722937),(118.238291,46.715393),(118.206045,46.700923),(118.169045,46.678496),(118.155506,46.674568),(118.101969,46.67307),(118.083882,46.668264),(118.005541,46.626974),(117.972778,46.623409),(117.923789,46.615192),(117.900638,46.607596),(117.878313,46.596382),(117.859297,46.580285),(117.832735,46.542793),(117.817025,46.527471),(117.797595,46.520262),(117.696206,46.512253),(117.673365,46.516025),(117.625202,46.535662),(117.607529,46.550545),(117.582001,46.591989),(117.568151,46.603539),(117.556266,46.601601),(117.510067,46.578476),(117.501799,46.577261),(117.491774,46.579096),(117.47286,46.584677),(117.393795,46.57137),(117.410125,46.539796),(117.412502,46.524629),(117.405474,46.510806),(117.369197,46.475691),(117.357518,46.448406),(117.353074,46.379496),(117.337468,46.357275),(117.301708,46.350144),(116.957853,46.366422),(116.831659,46.386369),(116.814606,46.38673),(116.804581,46.382906),(116.78484,46.365905),(116.722002,46.328698),(116.707325,46.324228),(116.64521,46.318466),(116.603559,46.309319),(116.581959,46.298012),(116.568316,46.290871),(116.548265,46.259296),(116.539584,46.24121),(116.525114,46.226792),(116.357166,46.105559),(116.213195,45.908155),(116.207098,45.88087),(116.220947,45.849761),(116.242134,45.82692),(116.251643,45.803252),(116.230352,45.769766),(116.169891,45.709097),(116.143949,45.694628),(116.094856,45.676541),(116.078733,45.673389),(116.063334,45.673337),(116.011967,45.678557),(116.002149,45.675559),(115.982822,45.659643),(115.767331,45.530142),(115.6924,45.468957),(115.667389,45.454281),(115.63783,45.444359),(115.472982,45.412785),(115.33728,45.394698),(115.126337,45.39444),(114.938855,45.373769),(114.905265,45.377748),(114.737317,45.425032),(114.703313,45.427151),(114.66931,45.42281),(114.533711,45.3855),(114.52379,45.38028),(114.519449,45.370927),(114.511697,45.325503),(114.502292,45.303231),(114.473043,45.259202),(114.418886,45.20148),(114.211767,45.06216),(114.163605,45.040146),(114.149342,45.030069),(114.139214,45.019165),(114.120403,44.993224),(114.089294,44.961753),(114.055291,44.940565),(114.01705,44.927285),(113.973125,44.919326),(113.913801,44.915451),(113.889306,44.908268),(113.83763,44.867908),(113.735621,44.815922),(113.672472,44.768173),(113.635058,44.746262),(113.604776,44.739699),(113.532429,44.74528),(113.517133,44.749518),(113.488917,44.766261),(113.473208,44.770705),(113.104858,44.794373),(113.016905,44.82109),(112.973186,44.821245),(112.748497,44.865273),(112.614242,44.908836),(112.586027,44.923822),(112.564529,44.943924),(112.523912,44.993275),(112.441333,45.052393),(112.412807,45.066036),(112.379631,45.070738),(112.107606,45.067379),(112.011488,45.087482),(111.984637,45.087154),(111.973351,45.087017),(111.958261,45.084536),(111.947926,45.077715),(111.938521,45.068981),(111.926739,45.06092),(111.906275,45.05415),(111.863177,45.046295),(111.843333,45.039526),(111.786489,45.008572),(111.760651,44.989296),(111.738533,44.9663),(111.551361,44.69319),(111.541026,44.668231),(111.540096,44.652211),(111.544436,44.618105),(111.543816,44.601258),(111.538235,44.58343),(111.530174,44.570614),(111.508986,44.546584),(111.483768,44.506432),(111.473226,44.495321),(111.470849,44.493306),(111.446871,44.475891),(111.424134,44.448037),(111.406357,44.416463),(111.397055,44.387369),(111.396435,44.346597),(111.410595,44.326081),(111.473226,44.298848),(111.49059,44.282621),(111.498134,44.264431),(111.503715,44.225725),(111.519425,44.18857),(111.543816,44.156737),(111.634457,44.065942),(111.66815,44.041344),(111.780701,43.986205),(111.811397,43.964294),(111.838785,43.938792),(111.930563,43.820143),(111.944309,43.786372),(111.947926,43.756968),(111.945136,43.72387),(111.933353,43.696636),(111.910409,43.684983),(111.893252,43.682606),(111.845813,43.666922),(111.77264,43.669299),(111.753829,43.663202),(111.59725,43.523391),(111.567691,43.50254),(111.535031,43.490732),(111.428681,43.483936),(111.401396,43.475513),(111.338558,43.438177),(111.096092,43.366656),(110.973412,43.3156),(110.933724,43.287772),(110.796989,43.148918),(110.680096,43.057657),(110.66573,43.0374),(110.641029,42.987791),(110.608163,42.944667),(110.566718,42.91056),(110.473391,42.854905),(110.449413,42.837335),(110.424815,42.785245),(110.406728,42.768605),(110.139871,42.682615),(110.105661,42.666673),(110.093156,42.657862),(110.084267,42.650059),(110.074862,42.643522),(110.060186,42.638355),(110.042719,42.635952),(109.987322,42.636468),(109.912701,42.62882),(109.667342,42.54898),(109.518307,42.467331),(109.510349,42.464748),(109.504871,42.464928),(109.500013,42.463327),(109.493812,42.455213),(109.490092,42.451286),(109.485131,42.449296),(109.328551,42.440486),(109.280285,42.428316),(109.253414,42.425939),(108.994463,42.449529),(108.961287,42.447539),(108.862688,42.40886),(108.82853,42.400049),(108.796852,42.398369),(108.536455,42.435111),(108.319775,42.432553),(108.234768,42.450072),(108.177355,42.454309),(108.04968,42.43912),(107.622396,42.388286),(107.195113,42.337453),(106.767829,42.286619),(106.318218,42.140052),(105.868607,41.993484),(105.473851,41.840341),(105.402744,41.811532),(105.358199,41.785848),(105.344557,41.78112),(105.325953,41.776702),(105.274483,41.755463),(105.218259,41.748435),(105.200896,41.743474),(105.014809,41.596144),(104.97383,41.586145),(104.935434,41.622422),(104.913678,41.638338),(104.892336,41.644772),(104.601243,41.645444),(104.504918,41.656554),(104.497993,41.665778),(104.500784,41.870598),(104.110885,41.813082),(103.720986,41.755566),(103.691427,41.759235),(103.398112,41.876411),(103.104797,41.993588),(103.104435,41.993639),(103.104383,41.993639),(103.073481,42.004517),(102.727042,42.064548),(102.380603,42.124579),(102.034164,42.18461),(101.97422,42.20789),(101.886473,42.278015),(101.735371,42.461156),(101.637599,42.515442),(101.524945,42.537456),(101.41074,42.544872),(101.21871,42.529834),(100.818132,42.578729),(100.417553,42.627623),(100.016975,42.676518),(99.971551,42.676285),(99.621903,42.597443),(99.474476,42.564199),(99.068355,42.60391),(98.662234,42.643622),(98.256113,42.683333),(97.849992,42.723045),(97.521632,42.755152),(97.193271,42.78726),(97.19068,42.787061),(96.832669,42.759604),(96.474659,42.732147),(96.379264,42.720546),(96.36634,42.722923),(96.357767,42.724499),(96.350635,42.740906),(96.337199,42.86648),(96.330688,42.889709),(96.318699,42.910069),(96.294308,42.933272),(95.908492,43.214547),(95.874385,43.247103),(95.854955,43.284543),(95.845446,43.326478),(95.841416,43.372522),(95.832837,43.408902),(95.692484,43.630542),(95.589235,43.869494),(95.535284,43.95768),(95.510273,43.979125),(95.474926,43.986619),(95.422733,43.988634),(95.327545,44.006669),(95.318967,44.017108),(95.31876,44.040724),(95.328269,44.09824),(95.321447,44.148417),(95.322688,44.158236),(95.327132,44.168313),(95.340568,44.187537),(95.347492,44.214925),(95.359688,44.231823),(95.389247,44.260762),(95.397722,44.280502),(95.379428,44.287117),(95.036814,44.254974),(94.993819,44.259418),(94.905762,44.294248),(94.720864,44.335796),(94.69823,44.343496),(94.683967,44.356622),(94.672598,44.373778),(94.657199,44.388816),(94.588055,44.4361),(94.460311,44.493306),(94.430132,44.504468),(94.366364,44.504313),(94.338458,44.512116),(94.321922,44.528033),(94.295464,44.571389),(94.27748,44.589579),(94.195005,44.65433),(94.181879,44.660841),(94.165342,44.665854),(94.149012,44.667197),(94.103744,44.651643),(94.058579,44.651281),(93.97507,44.659962),(93.927424,44.672933),(93.874507,44.714223),(93.714,44.874575),(93.688265,44.891059),(93.525278,44.951263),(93.420582,44.955087),(93.399911,44.960564),(93.36136,44.978393),(93.341,44.984852),(93.317229,44.985886),(93.268963,44.980098),(93.244158,44.981545),(93.165713,45.007642),(93.139152,45.009864),(93.075941,45.005192),(93.052439,45.003456),(93.033112,45.007642),(93.013888,45.009295),(92.994458,45.008365),(92.974924,45.004696),(92.945055,45.005833),(92.91622,45.014566),(92.861029,45.037872),(92.847593,45.039112),(92.81421,45.033893),(92.798914,45.03317),(92.752715,45.037976),(92.63851,45.0156),(92.572054,45.013016),(92.475109,44.997461),(92.458986,44.997926),(92.413821,45.011259),(92.396458,45.013119),(92.347365,45.007642),(92.331036,45.007848),(92.285354,45.019527),(92.267887,45.019527),(92.218898,45.010122),(92.19368,45.014514),(92.108414,45.058181),(92.075651,45.068878),(92.042991,45.074821),(92.009401,45.076216),(91.975088,45.073374),(91.919071,45.065571),(91.746989,45.072444),(91.724664,45.070738),(91.683633,45.061178),(91.662963,45.059525),(91.563951,45.077146),(91.552272,45.075338),(91.54328,45.071824),(91.533978,45.0711),(91.521783,45.077456),(91.45605,45.137453),(91.43848,45.146134),(91.41688,45.145669),(91.399723,45.136884),(91.3836,45.124224),(91.366547,45.11425),(91.346703,45.113733),(91.249138,45.129701),(91.184336,45.153834),(91.169763,45.163549),(91.147749,45.187217),(91.135036,45.197862),(91.101343,45.210678),(91.056798,45.217551),(91.011323,45.218946),(90.975149,45.214864),(90.90549,45.185977),(90.873243,45.186184),(90.857637,45.215071),(90.860324,45.231659),(90.865905,45.242563),(90.866629,45.25357),(90.854433,45.270623),(90.837173,45.280028),(90.796556,45.292844),(90.790975,45.304316),(90.790458,45.337699),(90.778055,45.365294),(90.762553,45.391597),(90.753251,45.42095),(90.737955,45.441724),(90.672325,45.475675),(90.651138,45.493142),(90.696613,45.730026),(90.710773,45.752196),(90.919235,45.950065),(90.975149,45.987323),(90.986208,45.993111),(91.002435,46.021843),(91.005432,46.068094),(90.995923,46.113724),(90.975149,46.140544),(90.948794,46.168294),(90.899185,46.281672),(90.896188,46.302033),(90.906006,46.317303),(90.935772,46.343865),(90.975149,46.416548),(90.986105,46.435255),(91.001401,46.475045),(91.014113,46.493184),(91.035611,46.529073),(91.045326,46.551087),(91.047496,46.566409),(91.03251,46.579923),(91.011323,46.585323),(90.995923,46.594625),(90.998094,46.620256),(91.011736,46.662941),(91.014292,46.689844),(91.01556,46.703197),(91.004812,46.74043),(90.975149,46.774149),(90.939389,46.79885),(90.925333,46.813139),(90.919959,46.833628),(90.922749,46.841586),(90.934428,46.856831),(90.936495,46.864427),(90.932775,46.874789),(90.92585,46.880654),(90.917685,46.885408),(90.91014,46.892384),(90.900322,46.910678),(90.893707,46.92817),(90.885129,46.944733),(90.869833,46.960339),(90.849472,46.973206),(90.828182,46.982301),(90.805547,46.986849),(90.78188,46.986332),(90.742399,46.991861),(90.712116,47.014702),(90.46872,47.308922),(90.466343,47.316338),(90.468514,47.323521),(90.475232,47.33029),(90.485567,47.344915),(90.490011,47.361839),(90.487221,47.378194),(90.475232,47.391088),(90.448153,47.404033),(90.441745,47.430543),(90.443606,47.462789),(90.441228,47.493045),(90.427276,47.506559),(90.394616,47.524671),(90.381594,47.538391),(90.352035,47.588311),(90.338496,47.60278),(90.327437,47.623037),(90.337462,47.63699),(90.349554,47.64779),(90.3448,47.658642),(90.32351,47.670166),(90.302116,47.678512),(90.209718,47.695746),(90.163416,47.710009),(90.119956,47.730137),(90.082852,47.756104),(90.070657,47.76985),(90.058771,47.789513),(90.052157,47.8107),(90.055981,47.828916),(90.064352,47.85062),(90.059856,47.868811),(90.044612,47.879766),(90.002496,47.880386),(89.96317,47.888654),(89.946685,47.883177),(89.939037,47.870852),(89.937642,47.857545),(89.934438,47.844264),(89.921364,47.832094),(89.889066,47.824317),(89.783543,47.818504),(89.751296,47.824317),(89.740238,47.836151),(89.731143,47.864754),(89.723391,47.878164),(89.707268,47.889042),(89.672025,47.89408),(89.655282,47.899816),(89.643913,47.912761),(89.636161,47.929582),(89.627376,47.943948),(89.613424,47.949581),(89.596577,47.952578),(89.583245,47.962035),(89.575648,47.976039),(89.576217,47.992886),(89.571876,48.020455),(89.5418,48.031023),(89.503663,48.029989),(89.475344,48.022961),(89.425425,48.021644),(89.409198,48.023116),(89.369201,48.038154),(89.354266,48.038774),(89.334268,48.032366),(89.285692,48.005598),(89.268587,47.993144),(89.243989,47.980225),(89.218719,47.976969),(89.167146,47.983997),(89.074697,47.984256),(89.045913,47.992886),(89.04581,47.992989),(89.045551,47.992989),(88.932328,48.096962),(88.916825,48.105954),(88.889282,48.110915),(88.831456,48.105153),(88.805411,48.105954),(88.775335,48.120552),(88.709189,48.166363),(88.680664,48.17303),(88.655446,48.171169),(88.635809,48.175846),(88.596225,48.197679),(88.580774,48.211994),(88.573487,48.229719),(88.568836,48.249201),(88.56124,48.268269),(88.558759,48.288087),(88.57297,48.32532),(88.565116,48.342993),(88.50269,48.392551),(88.479126,48.400148),(88.459127,48.398132),(88.439645,48.393714),(88.416701,48.394101),(88.383421,48.408674),(88.332107,48.453994),(88.304873,48.469006),(88.235627,48.493191),(88.21785,48.495),(88.183485,48.492752),(88.165967,48.493734),(88.148293,48.499366),(88.115737,48.516497),(88.088245,48.526083),(88.071812,48.538795),(88.062511,48.542878),(88.051969,48.543188),(88.028301,48.539622),(88.016622,48.539803),(87.983032,48.552335),(87.95182,48.575202),(87.942828,48.599489),(87.975488,48.616517),(87.989647,48.624165),(87.997812,48.635172),(88.003393,48.645998),(88.010162,48.653414),(88.055018,48.673413),(88.063854,48.682611),(88.05941,48.708087),(88.033779,48.72912),(87.975488,48.755992),(87.95244,48.761107),(87.907585,48.758834),(87.841697,48.779349),(87.821078,48.788289),(87.805885,48.800588),(87.802165,48.80958),(87.800511,48.830302),(87.796067,48.839759),(87.787489,48.84658),(87.77674,48.85118),(87.754726,48.857277),(87.737879,48.86937),(87.735709,48.886733),(87.743615,48.905181),(87.756896,48.920374),(87.835858,48.945902),(87.8726,48.96802),(87.872238,49.00409),(87.856942,49.015614),(87.837821,49.02042),(87.821905,49.02874),(87.815962,49.050599),(87.821078,49.071838),(87.829657,49.085997),(87.835548,49.100725),(87.832447,49.123876),(87.818081,49.154003),(87.816324,49.165837),(87.836995,49.159998),(87.855185,49.158964),(87.956781,49.168886),(87.975488,49.175811),(87.992954,49.191727),(88.029748,49.21555),(88.108503,49.247434),(88.143953,49.27074),(88.148397,49.296579),(88.129173,49.325931),(88.115531,49.356575),(88.135788,49.386082),(88.145606,49.397193),(88.161729,49.430111),(88.174752,49.443857),(88.19997,49.454347),(88.37877,49.475793),(88.401921,49.475844),(88.451117,49.465147),(88.475405,49.463649),(88.538761,49.466542),(88.557829,49.47109),(88.599739,49.488918),(88.614157,49.492794),(88.615759,49.492949),(88.633535,49.491244),(88.648676,49.483596),(88.67467,49.459825),(88.69565,49.446957),(88.719421,49.442926),(88.870627,49.436002),(88.875329,49.441789),(88.854865,49.473881),(88.856157,49.511501),(88.858741,49.527366),(88.868198,49.538114),(88.88892,49.54168),(88.90835,49.535944),(88.919099,49.52318),(88.926954,49.507419),(88.937599,49.492846),(88.947573,49.482821),(88.954704,49.471865),(88.962662,49.46215),(88.975323,49.455845),(89.01408,49.460548),(89.160738,49.502716),(89.195258,49.521526),(89.215619,49.545452),(89.201563,49.570619),(89.178205,49.598472),(89.187352,49.621985),(89.216445,49.634491),(89.252205,49.629427),(89.310703,49.59315),(89.339435,49.580799),(89.37194,49.581678),(89.39783,49.598989),(89.418604,49.624207),(89.4416,49.643586),(89.475344,49.643431),(89.520303,49.663171),(89.616318,49.685444),(89.682308,49.708336),(89.702411,49.719964),(89.712642,49.735157),(89.701532,49.75314),(89.683704,49.76115),(89.638952,49.775464),(89.626446,49.788022),(89.627376,49.796807),(89.641949,49.808124),(89.643551,49.818872),(89.638952,49.824815),(89.621072,49.835047),(89.615336,49.84192),(89.615284,49.854529),(89.621072,49.893338),(89.623862,49.902692),(89.633211,49.907939),(89.667684,49.92729),(89.720704,49.939744),(89.866432,49.942741),(89.920175,49.950854),(89.969423,49.96708),(89.996243,49.992764),(89.997091,50.003664),(89.998723,50.024648),(90.004924,50.050745),(90.020531,50.070743),(90.051226,50.084179),(90.182433,50.102473),(90.222947,50.11441),(90.34387,50.174665),(90.363921,50.179781),(90.404952,50.182623),(90.425002,50.186912),(90.475232,50.21461),(90.51895,50.218383),(90.604939,50.205981),(90.648451,50.206652),(90.666434,50.210373),(90.683901,50.216212),(90.699714,50.225152),(90.712633,50.237968),(90.717387,50.252024),(90.717594,50.280756),(90.726586,50.291867),(90.762449,50.305716),(90.839964,50.320806),(90.877068,50.339357),(90.948588,50.397493),(90.975149,50.413926),(91.012046,50.425295),(91.129765,50.426174),(91.163355,50.432788),(91.260093,50.466585),(91.297507,50.466378),(91.382153,50.454958),(91.415743,50.461365),(91.432486,50.478057),(91.440031,50.498572),(91.450366,50.519088),(91.475067,50.535986),(91.575733,50.561979),(91.602708,50.579601),(91.653144,50.640063),(91.679602,50.656547),(91.749779,50.684091),(91.824193,50.701558),(91.899951,50.707242),(92.062732,50.686313),(92.15885,50.689103),(92.242772,50.720006),(92.294449,50.791268),(92.297033,50.809871),(92.297446,50.827596),(92.301683,50.843358),(92.315223,50.855863),(92.33548,50.863615),(92.360905,50.868369),(92.384572,50.865579),(92.399869,50.850592),(92.418989,50.811732),(92.443277,50.786307),(92.474903,50.770494),(92.516451,50.760624),(92.554588,50.743002),(92.611845,50.687657),(92.649776,50.674066),(92.671893,50.675616),(92.695251,50.68192),(92.717369,50.692152),(92.735249,50.705227),(92.746617,50.721453),(92.753439,50.754681),(92.76026,50.770752),(92.796123,50.788012),(92.857722,50.795505),(92.921077,50.792456),(92.961695,50.777884),(92.973994,50.742175),(92.973374,50.694374),(92.991874,50.65479),(93.002933,50.634843),(93.011408,50.623319),(93.02288,50.616291),(93.04262,50.609884),(93.104942,50.598825),(93.139152,50.599445),(93.188348,50.599807),(93.421512,50.609367),(93.536337,50.584717),(93.886961,50.574976),(94.237586,50.565235),(94.25867,50.557535),(94.273346,50.544771),(94.278204,50.529217),(94.279754,50.492681),(94.319751,50.429016),(94.327503,50.404366),(94.332257,50.301013),(94.344349,50.249182),(94.354478,50.223602),(94.368534,50.202725),(94.391788,50.185568),(94.474987,50.162262),(94.491731,50.152289),(94.498552,50.139525),(94.502273,50.125055),(94.509094,50.109862),(94.520876,50.09777),(94.563974,50.071002),(94.574413,50.058548),(94.592293,50.029816),(94.603455,50.019739),(94.624539,50.015191),(94.650997,50.017827),(94.746392,50.040358),(94.921575,50.045887),(94.953718,50.040616),(94.98059,50.024751),(95.004051,49.992764),(95.021621,49.969819),(95.028339,49.963411),(95.076398,49.945531),(95.354727,49.947702),(95.399789,49.938865),(95.445161,49.914422),(95.461697,49.90264),(95.477201,49.894083),(95.480611,49.892201),(95.500661,49.886724),(95.520608,49.889617),(95.537145,49.900728),(95.56319,49.9276),(95.583964,49.936695),(95.680495,49.945996),(95.721423,49.958502),(95.75894,49.993074),(95.787672,50.011729),(95.827876,50.020152),(95.867047,50.014984),(95.892162,49.992919),(95.892162,49.992764),(95.904461,49.964807),(95.922651,49.944601),(95.946319,49.938503),(95.974844,49.952456),(95.985696,49.964962),(95.998305,49.975917),(96.011948,49.985219),(96.026624,49.992815),(96.04099,49.997931),(96.055976,49.99881),(96.071066,49.996743),(96.085949,49.992919),(96.086052,49.992867),(96.086259,49.992815),(96.086362,49.992764),(96.235603,49.9492),(96.281182,49.926256),(96.32335,49.897886),(96.346294,49.888584),(96.372856,49.886052),(96.399108,49.891736),(96.44882,49.913957),(96.474659,49.921657),(96.503287,49.922122),(96.523855,49.915766),(96.539254,49.901865),(96.553,49.879851),(96.56809,49.861764),(96.585143,49.857526),(96.604366,49.862901),(96.625967,49.873391),(96.680227,49.90972),(96.701932,49.91375),(96.969202,49.886672),(97.005892,49.865278),(97.042273,49.823213),(97.057259,49.812723),(97.08527,49.805838),(97.10015,49.802181),(97.119891,49.793654),(97.128986,49.775826),(97.152964,49.750246),(97.205053,49.734071),(97.262311,49.726113),(97.301688,49.725545),(97.343339,49.734175),(97.390778,49.749471),(97.474598,49.788693),(97.542707,49.822748),(97.57361,49.847501),(97.581258,49.877939),(97.571749,49.896749),(97.563171,49.908944),(97.566582,49.916799),(97.642236,49.930028),(97.7336,49.958347),(97.756338,49.961499),(97.777525,49.956177),(97.810701,49.931165),(97.829925,49.92331),(97.847391,49.93008),(97.874573,49.953955),(97.906199,49.973075),(98.047999,50.023046),(98.105567,50.06387),(98.262457,50.283805),(98.269278,50.299412),(98.272275,50.318997),(98.270105,50.335947),(98.261836,50.367469),(98.266281,50.400697),(98.298217,50.460125),(98.300594,50.492785),(98.300697,50.492836),(98.300697,50.49294),(98.293462,50.518623),(98.275376,50.537692),(98.251294,50.550559),(98.22556,50.557639),(98.163341,50.564667),(98.135953,50.570971),(98.060092,50.608902),(98.038491,50.622958),(98.023298,50.642026),(97.974515,50.723158),(97.944026,50.774473),(97.947437,50.79597),(97.990225,50.835606),(97.984644,50.846923),(97.953018,50.86284),(97.938755,50.874415),(97.92966,50.886611),(97.919428,50.897411),(97.871989,50.9171),(97.835713,50.940716),(97.808531,50.970482),(97.80636,51.001126),(97.870129,51.086805),(97.885632,51.120111),(97.894727,51.153855),(97.900308,51.168428),(97.92904,51.21504),(97.931727,51.230414),(97.92811,51.251472),(97.916328,51.285889),(97.915708,51.300617),(97.922839,51.318471),(97.933794,51.331777),(97.962216,51.355445),(97.974515,51.368597),(98.020611,51.435182),(98.039731,51.4573),(98.050893,51.46642),(98.066706,51.469263),(98.111355,51.484714),(98.137813,51.485877),(98.220392,51.475205),(98.2299,51.492879),(98.233828,51.516521),(98.224319,51.560006),(98.228247,51.583416),(98.238685,51.601477),(98.263387,51.635196),(98.273515,51.654833),(98.33222,51.718317),(98.425031,51.746222),(98.618714,51.780665),(98.651373,51.797485),(98.682689,51.819474),(98.711111,51.845105),(98.776637,51.930113),(98.791727,51.9775),(98.800201,51.992745),(98.838545,52.025275),(98.846504,52.039331),(98.848881,52.056307),(98.849604,52.090129),(98.855599,52.106691),(98.886398,52.128551),(98.927636,52.129584),(98.937652,52.124687),(98.962465,52.112557),(98.974454,52.080388),(98.994712,52.058296),(99.025097,52.045532),(99.19873,52.006594),(99.232837,51.994243),(99.255988,51.977914),(99.274694,51.959491),(99.295365,51.943549),(99.32389,51.934221),(99.556848,51.891459),(99.679321,51.888669),(99.709655,51.880581),(99.783966,51.837612),(99.848665,51.789346),(99.917911,51.749478),(100.005968,51.731727)]
+Montserrat	[(-62.147369,16.744289),(-62.147694,16.737047),(-62.151763,16.724514),(-62.150787,16.720364),(-62.147572,16.715888),(-62.14391,16.70897),(-62.141184,16.70185),(-62.140533,16.696479),(-62.144032,16.688218),(-62.14977,16.681789),(-62.157826,16.677314),(-62.167877,16.67536),(-62.218861,16.688707),(-62.230133,16.727607),(-62.218861,16.776313),(-62.202016,16.819322),(-62.189443,16.814439),(-62.182932,16.81273),(-62.174672,16.813137),(-62.179311,16.794501),(-62.170033,16.777004),(-62.156321,16.760321),(-62.147369,16.744289)]
+Namibia	[(13.184911,-16.964183),(13.19814,-16.957362),(13.205478,-16.963046),(13.212092,-16.972761),(13.222841,-16.977929),(13.245269,-16.98134),(13.257154,-16.98165),(13.267489,-16.977929),(13.267489,-16.98537),(13.293018,-16.973795),(13.308417,-16.970178),(13.315238,-16.974415),(13.321543,-16.974932),(13.345947,-16.968711),(13.363711,-16.964183),(13.382004,-16.970384),(13.417248,-16.993742),(13.435128,-16.999013),(13.458899,-17.001803),(13.479776,-17.010278),(13.494659,-17.024024),(13.507785,-17.063505),(13.522254,-17.076941),(13.530936,-17.093271),(13.521324,-17.1219),(13.606487,-17.167375),(13.69413,-17.236621),(13.790403,-17.288091),(13.884351,-17.338527),(13.896857,-17.349069),(13.942745,-17.408187),(13.957318,-17.419142),(13.980573,-17.423587),(13.992975,-17.421313),(14.008891,-17.411494),(14.017883,-17.40922),(14.029148,-17.410461),(14.047442,-17.416042),(14.069146,-17.418626),(14.085372,-17.423587),(14.097258,-17.423587),(14.108213,-17.420486),(14.123923,-17.411598),(14.130744,-17.40922),(14.174979,-17.416248),(14.197097,-17.412941),(14.206502,-17.393097),(14.207432,-17.388033),(14.218801,-17.388136),(14.219112,-17.388136),(14.287427,-17.388136),(14.543949,-17.38824),(14.800574,-17.388343),(15.057199,-17.388343),(15.313721,-17.388447),(15.559114,-17.388545),(15.570243,-17.38855),(15.826765,-17.388653),(16.08339,-17.388653),(16.339808,-17.388653),(16.59633,-17.388757),(16.852852,-17.388757),(17.109477,-17.38886),(17.278972,-17.388928),(17.366102,-17.388963),(17.622624,-17.388963),(17.879146,-17.389067),(18.000483,-17.389116),(18.135668,-17.38917),(18.392293,-17.389273),(18.445726,-17.389273),(18.453581,-17.389893),(18.455028,-17.395991),(18.458645,-17.405293),(18.465157,-17.40922),(18.471668,-17.414285),(18.488101,-17.452112),(18.489858,-17.462447),(18.492752,-17.464514),(18.516626,-17.471336),(18.55094,-17.535311),(18.554144,-17.54637),(18.567476,-17.553294),(18.619669,-17.594842),(18.622873,-17.60218),(18.627937,-17.619854),(18.633312,-17.628949),(18.64282,-17.638044),(18.66132,-17.646725),(18.670932,-17.653133),(18.728293,-17.710907),(18.74824,-17.736332),(18.761986,-17.747701),(18.800847,-17.756589),(18.89004,-17.799274),(19.020575,-17.822322),(19.105118,-17.818188),(19.139327,-17.805269),(19.160825,-17.800928),(19.17209,-17.801238),(19.201856,-17.807129),(19.246608,-17.804028),(19.262421,-17.81395),(19.421274,-17.859426),(19.59284,-17.857255),(19.649787,-17.844956),(19.672628,-17.842682),(19.693195,-17.847747),(19.702187,-17.86573),(19.711282,-17.872965),(19.732056,-17.88206),(19.755207,-17.889088),(19.77102,-17.890328),(19.775981,-17.885057),(19.78766,-17.866454),(19.793964,-17.862319),(19.951991,-17.862319),(19.989508,-17.882783),(20.024545,-17.894566),(20.03426,-17.895909),(20.092551,-17.890328),(20.119939,-17.890741),(20.132962,-17.888778),(20.147121,-17.882783),(20.154563,-17.890328),(20.169239,-17.878132),(20.193113,-17.872138),(20.219882,-17.873378),(20.243446,-17.882783),(20.278173,-17.854878),(20.288921,-17.861596),(20.302771,-17.860769),(20.336154,-17.854878),(20.347729,-17.858909),(20.386797,-17.890328),(20.412635,-17.884127),(20.437543,-17.894462),(20.460074,-17.913686),(20.479504,-17.934356),(20.489529,-17.942108),(20.523946,-17.958541),(20.552885,-17.979108),(20.565494,-17.985206),(20.590712,-17.978798),(20.630089,-17.976938),(20.666263,-17.980245),(20.682179,-17.988617),(20.68962,-17.996988),(20.706157,-18.00381),(20.722487,-18.006497),(20.729928,-18.002363),(20.737473,-17.993474),(20.754423,-17.997918),(20.784602,-18.012595),(20.806202,-18.031405),(20.831937,-18.029338),(20.8616,-18.018796),(20.894466,-18.012595),(20.908315,-17.986136),(20.986455,-17.965771),(21.000713,-17.962055),(21.09311,-17.938077),(21.10944,-17.945002),(21.12608,-17.941074),(21.143133,-17.933736),(21.161323,-17.930636),(21.175792,-17.93322),(21.216617,-17.930636),(21.23274,-17.93446),(21.278112,-17.958541),(21.335059,-17.977971),(21.364825,-17.992027),(21.381154,-18.012595),(21.386839,-18.014455),(21.405546,-18.009287),(21.477583,-17.996058),(21.728523,-17.949859),(21.979464,-17.903764),(22.230508,-17.857565),(22.481449,-17.811366),(22.685674,-17.772816),(22.889796,-17.734059),(23.093918,-17.695405),(23.29804,-17.656854),(23.381652,-17.641144),(23.422373,-17.633496),(23.45741,-17.626778),(23.47622,-17.626365),(23.505986,-17.620474),(23.548774,-17.611999),(23.591769,-17.603524),(23.634557,-17.595049),(23.677242,-17.586677),(23.72003,-17.578202),(23.762818,-17.569727),(23.805606,-17.561356),(23.848497,-17.552881),(23.891389,-17.544406),(23.934177,-17.536034),(23.976965,-17.52756),(24.01965,-17.519085),(24.062541,-17.510713),(24.105329,-17.502238),(24.148117,-17.493763),(24.190905,-17.485288),(24.220464,-17.4795),(24.238758,-17.478157),(24.257361,-17.480844),(24.310278,-17.482601),(24.321337,-17.488699),(24.329398,-17.485081),(24.371256,-17.473713),(24.388929,-17.471336),(24.407016,-17.474539),(24.449288,-17.489112),(24.47926,-17.494487),(24.498173,-17.503478),(24.523598,-17.507819),(24.53166,-17.5134),(24.537861,-17.520325),(24.546543,-17.526526),(24.562459,-17.53221),(24.571244,-17.533451),(24.580752,-17.532831),(24.591294,-17.528386),(24.606487,-17.515157),(24.617443,-17.509163),(24.622817,-17.502341),(24.629742,-17.49552),(24.639457,-17.49242),(24.684415,-17.49242),(24.769785,-17.505442),(24.775056,-17.507612),(24.780017,-17.512263),(24.786838,-17.516914),(24.79738,-17.519085),(24.829523,-17.517741),(24.898252,-17.531074),(24.924917,-17.542959),(24.93763,-17.560736),(24.95799,-17.551744),(24.969987,-17.559962),(24.971116,-17.560736),(24.982588,-17.576549),(24.998505,-17.588021),(25.008013,-17.588538),(25.02672,-17.58275),(25.036952,-17.5812),(25.040569,-17.584507),(25.033851,-17.60156),(25.033851,-17.608485),(25.040053,-17.616133),(25.045324,-17.619957),(25.052558,-17.621404),(25.064237,-17.621507),(25.067028,-17.625331),(25.085218,-17.640938),(25.088525,-17.642695),(25.096897,-17.67215),(25.098757,-17.676801),(25.107955,-17.678868),(25.115087,-17.684242),(25.120048,-17.691064),(25.122631,-17.697885),(25.131416,-17.686516),(25.138548,-17.686103),(25.153327,-17.700986),(25.156428,-17.70667),(25.155291,-17.719382),(25.156841,-17.72517),(25.161182,-17.729408),(25.172448,-17.735092),(25.177822,-17.738813),(25.190741,-17.755349),(25.198182,-17.75845),(25.215132,-17.759277),(25.228878,-17.762481),(25.242417,-17.770335),(25.253476,-17.781497),(25.259781,-17.794107),(25.194152,-17.782324),(25.153947,-17.781808),(25.120874,-17.813537),(25.087905,-17.826766),(25.057002,-17.827696),(25.047494,-17.807129),(25.019692,-17.823769),(25.007083,-17.825733),(24.998505,-17.81395),(24.983312,-17.820462),(24.975147,-17.816327),(24.968636,-17.807646),(24.958094,-17.800928),(24.964295,-17.786665),(24.953339,-17.788422),(24.948585,-17.79328),(24.945175,-17.799998),(24.93763,-17.807129),(24.931119,-17.81054),(24.857428,-17.833587),(24.838101,-17.835034),(24.820841,-17.839272),(24.79738,-17.858082),(24.776916,-17.862319),(24.770715,-17.865523),(24.764514,-17.879683),(24.756039,-17.882783),(24.74684,-17.88423),(24.738159,-17.887641),(24.730717,-17.891878),(24.725343,-17.895909),(24.698471,-17.928879),(24.664055,-17.949859),(24.649172,-17.962778),(24.598632,-18.020759),(24.595015,-18.022826),(24.591811,-18.028407),(24.577755,-18.044427),(24.574551,-18.050422),(24.564423,-18.052799),(24.518431,-18.057346),(24.505615,-18.060344),(24.471508,-18.029958),(24.469751,-18.014455),(24.465101,-18.008667),(24.458486,-18.005773),(24.451045,-17.998952),(24.433888,-17.967223),(24.421589,-17.956474),(24.399471,-17.95234),(24.365262,-17.950789),(24.350586,-17.95606),(24.334256,-17.971563),(24.305834,-18.019416),(24.296429,-18.026237),(24.287437,-18.02448),(24.270074,-18.015798),(24.259222,-18.012595),(24.238241,-18.009907),(24.218294,-18.012595),(24.183051,-18.029441),(24.135095,-18.085458),(24.101609,-18.108816),(24.065125,-18.115224),(24.05696,-18.119048),(24.028125,-18.145816),(24.02027,-18.151604),(23.991744,-18.163386),(23.979652,-18.171861),(23.974898,-18.177029),(23.971177,-18.18385),(23.966733,-18.180646),(23.961979,-18.177856),(23.956604,-18.176615),(23.950817,-18.177649),(23.915987,-18.201213),(23.912886,-18.235733),(23.89697,-18.250203),(23.867514,-18.269426),(23.855215,-18.280072),(23.837232,-18.305807),(23.825553,-18.317072),(23.809843,-18.321723),(23.715792,-18.419081),(23.700909,-18.42797),(23.680136,-18.431484),(23.656468,-18.458252),(23.649853,-18.46342),(23.645409,-18.466004),(23.609856,-18.477682),(23.592182,-18.478199),(23.57916,-18.467864),(23.571305,-18.426006),(23.555492,-18.383115),(23.546604,-18.369472),(23.560763,-18.348491),(23.551461,-18.327511),(23.518802,-18.293714),(23.527277,-18.277695),(23.521696,-18.268186),(23.511257,-18.260331),(23.505676,-18.249376),(23.501542,-18.23749),(23.49131,-18.23315),(23.477771,-18.230876),(23.464128,-18.225501),(23.458754,-18.217647),(23.444284,-18.200697),(23.429401,-18.188501),(23.418859,-18.198423),(23.410281,-18.197389),(23.40129,-18.194289),(23.395812,-18.191395),(23.394468,-18.186227),(23.396329,-18.169381),(23.395812,-18.163386),(23.389714,-18.153258),(23.359535,-18.119151),(23.348063,-18.09445),(23.336591,-18.07936),(23.3338,-18.073986),(23.33256,-18.067061),(23.3338,-18.04329),(23.330596,-18.039983),(23.323258,-18.039156),(23.31592,-18.037089),(23.312716,-18.029958),(23.312819,-18.016522),(23.311476,-18.009804),(23.305688,-18.005463),(23.292769,-17.998952),(23.254942,-17.997402),(23.185799,-18.003086),(23.099602,-18.010217),(22.981367,-18.020036),(22.894034,-18.036159),(22.809698,-18.051869),(22.725258,-18.067475),(22.640922,-18.083185),(22.556483,-18.098791),(22.472147,-18.1145),(22.387811,-18.13021),(22.303475,-18.145816),(22.219036,-18.161526),(22.134597,-18.177236),(22.050261,-18.192842),(21.966028,-18.208552),(21.881486,-18.224158),(21.79715,-18.239867),(21.71271,-18.255577),(21.628478,-18.271183),(21.544039,-18.28679),(21.526985,-18.289994),(21.509829,-18.293198),(21.492879,-18.296401),(21.475722,-18.299502),(21.456809,-18.300226),(21.437895,-18.301052),(21.39087,-18.302913),(21.343947,-18.304773),(21.296818,-18.306633),(21.249896,-18.308494),(21.193466,-18.310768),(21.136932,-18.312938),(21.080604,-18.315212),(21.024174,-18.317382),(20.993436,-18.318612),(20.975081,-18.319346),(20.975081,-18.347768),(20.975081,-18.388592),(20.975081,-18.429313),(20.975081,-18.470138),(20.975081,-18.511065),(20.975081,-18.551993),(20.975081,-18.592714),(20.975081,-18.633539),(20.975081,-18.674363),(20.975081,-18.715187),(20.975081,-18.756012),(20.975081,-18.796836),(20.975081,-18.83766),(20.975081,-18.878381),(20.975081,-18.919206),(20.975081,-18.96003),(20.975081,-19.000958),(20.975494,-19.125912),(20.975609,-19.172106),(20.975804,-19.250865),(20.976321,-19.375819),(20.976735,-19.500876),(20.977045,-19.625829),(20.977561,-19.750783),(20.977975,-19.87584),(20.978285,-20.000794),(20.978698,-20.125851),(20.979112,-20.250804),(20.97936,-20.351028),(20.979422,-20.375758),(20.979835,-20.500711),(20.980249,-20.625768),(20.980662,-20.750722),(20.981075,-20.875779),(20.981486,-20.999958),(20.981489,-21.000733),(20.981592,-21.058403),(20.981902,-21.116074),(20.982109,-21.173642),(20.982212,-21.231209),(20.982419,-21.28888),(20.982626,-21.346448),(20.982832,-21.404119),(20.983039,-21.46179),(20.983143,-21.519357),(20.983453,-21.577028),(20.983659,-21.634699),(20.983866,-21.69237),(20.984073,-21.750041),(20.984279,-21.807608),(20.984486,-21.865176),(20.984693,-21.922847),(20.984796,-21.963981),(20.97198,-22.000671),(20.914723,-22.000671),(20.680629,-22.000671),(20.446534,-22.000671),(20.21244,-22.000671),(19.978346,-22.000671),(19.978449,-22.086764),(19.978656,-22.237246),(19.978863,-22.387625),(19.978966,-22.538106),(19.979173,-22.688588),(19.979276,-22.860671),(19.979586,-23.032546),(19.979793,-23.204526),(19.979855,-23.308551),(19.979896,-23.376505),(19.980103,-23.548587),(19.98031,-23.720567),(19.980483,-23.864489),(19.980516,-23.892494),(19.980723,-24.064473),(19.980826,-24.236556),(19.981137,-24.408431),(19.981343,-24.580411),(19.981447,-24.752493),(19.981757,-24.764999),(19.981757,-24.821016),(19.981757,-24.877137),(19.981757,-24.933257),(19.98186,-24.989275),(19.981963,-25.045395),(19.981963,-25.101412),(19.981963,-25.15743),(19.981963,-25.21355),(19.981963,-25.269671),(19.981963,-25.325688),(19.981963,-25.381705),(19.982067,-25.437826),(19.982067,-25.493843),(19.982067,-25.549964),(19.982067,-25.606084),(19.982067,-25.618988),(19.982067,-25.662102),(19.982067,-25.718119),(19.982067,-25.774136),(19.982067,-25.830257),(19.98217,-25.886274),(19.982273,-25.942395),(19.982273,-25.998515),(19.982273,-26.054533),(19.982273,-26.11055),(19.982273,-26.16667),(19.982377,-26.222688),(19.982377,-26.278808),(19.982377,-26.334826),(19.982377,-26.390946),(19.982377,-26.446963),(19.982377,-26.503084),(19.98248,-26.559101),(19.982583,-26.615119),(19.982583,-26.671239),(19.982583,-26.727256),(19.982583,-26.783377),(19.982583,-26.839394),(19.982687,-26.895515),(19.982687,-26.951532),(19.982687,-27.007653),(19.982687,-27.06367),(19.982687,-27.119687),(19.982687,-27.175808),(19.98279,-27.231928),(19.982894,-27.287946),(19.982894,-27.344066),(19.982894,-27.400187),(19.982894,-27.456101),(19.982894,-27.512118),(19.982894,-27.568239),(19.982894,-27.624359),(19.982997,-27.680376),(19.982997,-27.736497),(19.982997,-27.792618),(19.982997,-27.848532),(19.982997,-27.904652),(19.982997,-27.960773),(19.982997,-28.01679),(19.982997,-28.072911),(19.9831,-28.129031),(19.983204,-28.185049),(19.983204,-28.241066),(19.983204,-28.297186),(19.983204,-28.353204),(19.983204,-28.392684),(19.981653,-28.422347),(19.950544,-28.429271),(19.940209,-28.430202),(19.907859,-28.426481),(19.896697,-28.427721),(19.870342,-28.440847),(19.82559,-28.47671),(19.796342,-28.484152),(19.748076,-28.487149),(19.725338,-28.494177),(19.705598,-28.508026),(19.688338,-28.515984),(19.587982,-28.522702),(19.579197,-28.525183),(19.568759,-28.531177),(19.562351,-28.538102),(19.55646,-28.546163),(19.547571,-28.555879),(19.542197,-28.564043),(19.533722,-28.58244),(19.527417,-28.585954),(19.517806,-28.589365),(19.511708,-28.598047),(19.482872,-28.678248),(19.472434,-28.692718),(19.45507,-28.705223),(19.434607,-28.713492),(19.353475,-28.731889),(19.339005,-28.73747),(19.32836,-28.735816),(19.304485,-28.718659),(19.290016,-28.719693),(19.277304,-28.729408),(19.265935,-28.742637),(19.248571,-28.771576),(19.244954,-28.792453),(19.251569,-28.814261),(19.288879,-28.871001),(19.288362,-28.883094),(19.27658,-28.889502),(19.243714,-28.891879),(19.237616,-28.895599),(19.226661,-28.911516),(19.218496,-28.918854),(19.161548,-28.945416),(19.120207,-28.957508),(19.081657,-28.959368),(19.064707,-28.939834),(19.060056,-28.9357),(19.048997,-28.932393),(19.01396,-28.928466),(19.006932,-28.926295),(18.99639,-28.915547),(18.971172,-28.88051),(18.954533,-28.866661),(18.745656,-28.839892),(18.553937,-28.864697),(18.51766,-28.882267),(18.496163,-28.888261),(18.491615,-28.886298),(18.479419,-28.876272),(18.474975,-28.873999),(18.469394,-28.874929),(18.460713,-28.87989),(18.455235,-28.88144),(18.435701,-28.884231),(18.424746,-28.887228),(18.416994,-28.891672),(18.397564,-28.898907),(18.373069,-28.895186),(18.331005,-28.88144),(18.30868,-28.879993),(18.220727,-28.891259),(18.18507,-28.902214),(18.166467,-28.901904),(18.082441,-28.875962),(18.044097,-28.858392),(17.983326,-28.813744),(17.949529,-28.794727),(17.913252,-28.781291),(17.746338,-28.748632),(17.714091,-28.751112),(17.703239,-28.755556),(17.683396,-28.767545),(17.673784,-28.771576),(17.660968,-28.772299),(17.628722,-28.764135),(17.607121,-28.75566),(17.602574,-28.735403),(17.603401,-28.710805),(17.598026,-28.689617),(17.582937,-28.680212),(17.565987,-28.683519),(17.54697,-28.691374),(17.526609,-28.695818),(17.485165,-28.700159),(17.44093,-28.709564),(17.403619,-28.704293),(17.401759,-28.674218),(17.414265,-28.63267),(17.420569,-28.593396),(17.409614,-28.571382),(17.373027,-28.559393),(17.365276,-28.542546),(17.359488,-28.519808),(17.332409,-28.488596),(17.324244,-28.470509),(17.328172,-28.456143),(17.341194,-28.442811),(17.358558,-28.432785),(17.375404,-28.428961),(17.39132,-28.418833),(17.399692,-28.395268),(17.402069,-28.367776),(17.400002,-28.346382),(17.394834,-28.335117),(17.378918,-28.316307),(17.371993,-28.306075),(17.368066,-28.293776),(17.367033,-28.283544),(17.364139,-28.273312),(17.355044,-28.261013),(17.35122,-28.251401),(17.349773,-28.238689),(17.345742,-28.22763),(17.334476,-28.222876),(17.308638,-28.224116),(17.245179,-28.237448),(17.21314,-28.232074),(17.191953,-28.20882),(17.187095,-28.162001),(17.189782,-28.139367),(17.189989,-28.116836),(17.180894,-28.099472),(17.155779,-28.092548),(17.136349,-28.084693),(17.123223,-28.066503),(17.111751,-28.046039),(17.097798,-28.031156),(17.086533,-28.027022),(17.076404,-28.026815),(17.056664,-28.031156),(17.045398,-28.036324),(17.012015,-28.058338),(16.98535,-28.05224),(16.973775,-28.055031),(16.959512,-28.06857),(16.947523,-28.072704),(16.937498,-28.07105),(16.927473,-28.060198),(16.919618,-28.058338),(16.91352,-28.062679),(16.896467,-28.079939),(16.892953,-28.082626),(16.885512,-28.162001),(16.878173,-28.172026),(16.873833,-28.171509),(16.868665,-28.167892),(16.852025,-28.168305),(16.847788,-28.165411),(16.843757,-28.163861),(16.837659,-28.168202),(16.835695,-28.174196),(16.838383,-28.179467),(16.855953,-28.199415),(16.856366,-28.206649),(16.84107,-28.209853),(16.819779,-28.20975),(16.814301,-28.213471),(16.810271,-28.222876),(16.813268,-28.229904),(16.820813,-28.240032),(16.8266,-28.251918),(16.824637,-28.264527),(16.815232,-28.270831),(16.805103,-28.267731),(16.795181,-28.26122),(16.786499,-28.257602),(16.768723,-28.265354),(16.764382,-28.283234),(16.768413,-28.303698),(16.775544,-28.319097),(16.796835,-28.347829),(16.803863,-28.366123),(16.793217,-28.374288),(16.778541,-28.382969),(16.773374,-28.402916),(16.772133,-28.425757),(16.769343,-28.442604),(16.758387,-28.459657),(16.740404,-28.480948),(16.720457,-28.496037),(16.703817,-28.494487),(16.699683,-28.485185),(16.696789,-28.472473),(16.692345,-28.461104),(16.683457,-28.456246),(16.673121,-28.45976),(16.597364,-28.526216),(16.559123,-28.537068),(16.531528,-28.549677),(16.50538,-28.565387),(16.487071,-28.572931),(16.468516,-28.585138),(16.458507,-28.600518),(16.445811,-28.610528),(16.419444,-28.607029),(16.407888,-28.600518),(16.346853,-28.556085),(16.315929,-28.524347),(16.301036,-28.50449),(16.19337,-28.408787),(16.175792,-28.402114),(16.167979,-28.395766),(16.107677,-28.323337),(16.04363,-28.257094),(15.911143,-28.171319),(15.884288,-28.147638),(15.833181,-28.089288),(15.761485,-28.038344),(15.747813,-28.024591),(15.716807,-27.980401),(15.684255,-27.949884),(15.678884,-27.942804),(15.677989,-27.931248),(15.684581,-27.910821),(15.685802,-27.9013),(15.673025,-27.869887),(15.646007,-27.836602),(15.546235,-27.747817),(15.533539,-27.730157),(15.528656,-27.70615),(15.529063,-27.654229),(15.526866,-27.646173),(15.520681,-27.633722),(15.425059,-27.496515),(15.408946,-27.464532),(15.396821,-27.448663),(15.380382,-27.44199),(15.371755,-27.433038),(15.342459,-27.380548),(15.301606,-27.333103),(15.295258,-27.322442),(15.281749,-27.243341),(15.276215,-27.233575),(15.269542,-27.226332),(15.263682,-27.218357),(15.261241,-27.205743),(15.268077,-27.164809),(15.254161,-27.100193),(15.261241,-27.085626),(15.241222,-27.048761),(15.235362,-27.029474),(15.233246,-27.006931),(15.234223,-26.965427),(15.228526,-26.945571),(15.212738,-26.927992),(15.20574,-26.925551),(15.187511,-26.924249),(15.178559,-26.921157),(15.176606,-26.916762),(15.169688,-26.906183),(15.162364,-26.897068),(15.158865,-26.897068),(15.155935,-26.875095),(15.148936,-26.856378),(15.116873,-26.796157),(15.111664,-26.779229),(15.116222,-26.752048),(15.105724,-26.732354),(15.091563,-26.712172),(15.083018,-26.695245),(15.080821,-26.672133),(15.083507,-26.652114),(15.091807,-26.637953),(15.106619,-26.632582),(15.116954,-26.630304),(15.127126,-26.626723),(15.134613,-26.62713),(15.137706,-26.636651),(15.137706,-26.6749),(15.144542,-26.6749),(15.148448,-26.655043),(15.168142,-26.602797),(15.168712,-26.592218),(15.162283,-26.579034),(15.141938,-26.517999),(15.128754,-26.457615),(15.105642,-26.420587),(15.07252,-26.389744),(15.034679,-26.366306),(14.975271,-26.344171),(14.966319,-26.335219),(14.958832,-26.257013),(14.962657,-26.181329),(14.942556,-26.153904),(14.939138,-26.147149),(14.943126,-26.135349),(14.949067,-26.135024),(14.956879,-26.137628),(14.966319,-26.133559),(14.979828,-26.101658),(14.979015,-26.05877),(14.968272,-26.015802),(14.952647,-25.98268),(14.907725,-25.915297),(14.90211,-25.882501),(14.91863,-25.845473),(14.911143,-25.845473),(14.859874,-25.790297),(14.842784,-25.763604),(14.840343,-25.751723),(14.840343,-25.743341),(14.842784,-25.729425),(14.842784,-25.650323),(14.846934,-25.629815),(14.876964,-25.578058),(14.879731,-25.561456),(14.879568,-25.53867),(14.875336,-25.518487),(14.853282,-25.498712),(14.847016,-25.473321),(14.842784,-25.42783),(14.818044,-25.366957),(14.812511,-25.320082),(14.802419,-25.282892),(14.80128,-25.262791),(14.832286,-25.188165),(14.829356,-25.176446),(14.84962,-25.105076),(14.853282,-25.064223),(14.843272,-25.026056),(14.829438,-25.000095),(14.808767,-24.961114),(14.796153,-24.92197),(14.792979,-24.841892),(14.780772,-24.803399),(14.723481,-24.703546),(14.699474,-24.673028),(14.650157,-24.628839),(14.636078,-24.598891),(14.601899,-24.562433),(14.595876,-24.537205),(14.59962,-24.526544),(14.61378,-24.511651),(14.616954,-24.505792),(14.616954,-24.464776),(14.612315,-24.445733),(14.590099,-24.40838),(14.568126,-24.35768),(14.513927,-24.261489),(14.493175,-24.192315),(14.473643,-24.159112),(14.466807,-24.113214),(14.459239,-24.098321),(14.464203,-24.07822),(14.464122,-24.044692),(14.459646,-24.010431),(14.451915,-23.988458),(14.459239,-23.974542),(14.465831,-23.947198),(14.472911,-23.933852),(14.479177,-23.931085),(14.488292,-23.92962),(14.496593,-23.925958),(14.500255,-23.916436),(14.513927,-23.892267),(14.506033,-23.88006),(14.507091,-23.823907),(14.489513,-23.776056),(14.486583,-23.758477),(14.500255,-23.614435),(14.495291,-23.578546),(14.48406,-23.551039),(14.446951,-23.460382),(14.434337,-23.415216),(14.435069,-23.405532),(14.443126,-23.396661),(14.467459,-23.356052),(14.479747,-23.344822),(14.479503,-23.365818),(14.484386,-23.374933),(14.490408,-23.369724),(14.493419,-23.347833),(14.491954,-23.309177),(14.473481,-23.192804),(14.462738,-23.157403),(14.445567,-23.13128),(14.431326,-23.103285),(14.420665,-23.070977),(14.413829,-23.036228),(14.410167,-22.970798),(14.411388,-22.961196),(14.416026,-22.951593),(14.429047,-22.93255),(14.431895,-22.923028),(14.431895,-22.881768),(14.435069,-22.879815),(14.440929,-22.879815),(14.443858,-22.883477),(14.438162,-22.892267),(14.442719,-22.898533),(14.44809,-22.908136),(14.451915,-22.912205),(14.445974,-22.932387),(14.444347,-22.952813),(14.451671,-22.963311),(14.472911,-22.95379),(14.471446,-22.965102),(14.459239,-22.995294),(14.474294,-22.982192),(14.496837,-22.941827),(14.510509,-22.933282),(14.521983,-22.923435),(14.529307,-22.90016),(14.534353,-22.854181),(14.527517,-22.679457),(14.508556,-22.548028),(14.485118,-22.512384),(14.474294,-22.467869),(14.438162,-22.398858),(14.418712,-22.339776),(14.386485,-22.276462),(14.380382,-22.268487),(14.315196,-22.200291),(14.294281,-22.167413),(14.293468,-22.143324),(14.291352,-22.134454),(14.137218,-21.946384),(14.062022,-21.880955),(14.05421,-21.864679),(13.97169,-21.792739),(13.952322,-21.783949),(13.952159,-21.77337),(13.956391,-21.762953),(13.958995,-21.758396),(13.96518,-21.733168),(13.965831,-21.726739),(13.962657,-21.714044),(13.958263,-21.704848),(13.87794,-21.592218),(13.862804,-21.528009),(13.831716,-21.456476),(13.729259,-21.330255),(13.66684,-21.232354),(13.628103,-21.187595),(13.602712,-21.158136),(13.513357,-21.007908),(13.471934,-20.955011),(13.459158,-20.918064),(13.444835,-20.904067),(13.417735,-20.883884),(13.397634,-20.849298),(13.387218,-20.816095),(13.37672,-20.733575),(13.349457,-20.644464),(13.262706,-20.485121),(13.239024,-20.397149),(13.233572,-20.354669),(13.213064,-20.27337),(13.177745,-20.189223),(13.154633,-20.154229),(13.114425,-20.142573),(13.07088,-20.114229),(13.037345,-20.059465),(13.005382,-19.935479),(12.927745,-19.794692),(12.918468,-19.765558),(12.875987,-19.712009),(12.802501,-19.584731),(12.793956,-19.5617),(12.783051,-19.54697),(12.757579,-19.49684),(12.749278,-19.486017),(12.7046,-19.410821),(12.691091,-19.379002),(12.686046,-19.359796),(12.679698,-19.31406),(12.668305,-19.292413),(12.636241,-19.252618),(12.615733,-19.217543),(12.567393,-19.102309),(12.546723,-19.071466),(12.516449,-19.03753),(12.480317,-19.011),(12.470388,-18.997654),(12.458669,-18.925551),(12.450043,-18.904555),(12.286876,-18.697686),(12.174731,-18.627939),(12.125743,-18.574802),(12.11964,-18.569513),(12.102061,-18.545994),(12.091645,-18.540704),(12.082042,-18.534356),(12.031889,-18.50535),(12.015961,-18.452895),(12.012462,-18.434503),(11.999522,-18.403497),(11.99822,-18.39186),(11.998546,-18.381768),(11.997569,-18.372003),(11.999522,-18.361912),(11.976085,-18.329767),(11.937348,-18.23211),(11.931163,-18.225356),(11.849082,-18.143183),(11.83364,-18.098045),(11.826524,-18.03922),(11.808499,-17.991542),(11.796911,-17.956089),(11.784037,-17.859645),(11.760941,-17.786424),(11.745552,-17.683948),(11.734031,-17.632721),(11.726736,-17.599867),(11.717621,-17.546319),(11.72169,-17.467869),(11.755138,-17.266697),(11.766124,-17.252699),(11.766184,-17.252751),(11.779518,-17.254915),(11.796882,-17.263803),(11.80763,-17.26587),(11.82241,-17.264423),(11.827474,-17.260082),(11.829644,-17.253468),(11.835536,-17.245406),(11.853932,-17.233417),(11.894963,-17.214607),(11.942092,-17.180501),(11.98302,-17.161897),(12.028909,-17.148978),(12.075211,-17.142983),(12.082239,-17.14133),(12.08813,-17.139159),(12.095261,-17.139676),(12.105597,-17.146084),(12.13991,-17.156006),(12.151279,-17.153629),(12.156653,-17.149081),(12.16151,-17.146291),(12.170709,-17.149185),(12.177117,-17.154766),(12.179494,-17.161587),(12.181148,-17.169235),(12.185075,-17.17709),(12.190656,-17.182568),(12.200474,-17.189286),(12.21174,-17.195177),(12.222282,-17.197657),(12.23179,-17.201895),(12.236545,-17.2113),(12.239335,-17.220705),(12.242642,-17.224839),(12.314679,-17.218121),(12.379482,-17.220395),(12.393951,-17.21471),(12.407594,-17.204065),(12.417929,-17.203445),(12.4417,-17.216984),(12.46051,-17.223082),(12.519215,-17.227836),(12.554561,-17.235588),(12.56717,-17.234554),(12.591458,-17.222565),(12.63621,-17.185151),(12.660705,-17.17709),(12.685923,-17.173576),(12.704733,-17.164274),(12.739873,-17.135542),(12.784315,-17.115078),(12.818318,-17.104846),(12.824932,-17.096371),(12.833097,-17.081799),(12.842296,-17.074047),(12.849944,-17.070843),(12.867721,-17.065572),(12.876402,-17.059784),(12.880536,-17.050793),(12.882293,-17.039527),(12.887151,-17.029812),(12.911025,-17.023508),(12.930456,-17.014206),(12.961668,-17.007385),(13.014275,-16.977929),(13.121762,-16.959842),(13.1445,-16.952401),(13.166307,-16.951057),(13.184911,-16.964183)]
+Niger	[(14.216217,22.616295),(14.23172,22.617949),(14.294869,22.649833),(14.466021,22.736184),(14.63707,22.822536),(14.808016,22.908887),(14.979168,22.995316),(14.979271,22.995368),(14.979909,22.995664),(14.991984,22.933097),(15.003973,22.87044),(15.015858,22.807782),(15.02795,22.745176),(15.039939,22.682544),(15.051928,22.619861),(15.064021,22.557177),(15.075906,22.494597),(15.087998,22.431914),(15.099987,22.369282),(15.11208,22.306598),(15.124069,22.243966),(15.136058,22.181335),(15.14815,22.118651),(15.156315,22.076173),(15.16448,22.033695),(15.172024,21.993387),(15.172438,21.973647),(15.173265,21.921557),(15.174608,21.847918),(15.176055,21.763427),(15.177502,21.678988),(15.178846,21.605297),(15.179776,21.553208),(15.180086,21.533467),(15.180396,21.507267),(15.18453,21.491196),(15.20024,21.476468),(15.247472,21.453265),(15.266592,21.440656),(15.301009,21.40133),(15.32478,21.366707),(15.34142,21.342161),(15.358266,21.317718),(15.375009,21.293223),(15.391753,21.268729),(15.408496,21.244234),(15.425342,21.219791),(15.441982,21.195193),(15.458829,21.17075),(15.475572,21.146256),(15.492212,21.121761),(15.509058,21.097266),(15.525801,21.072772),(15.542544,21.048277),(15.559288,21.023782),(15.576134,20.999339),(15.592774,20.974793),(15.60931,20.95066),(15.569003,20.928905),(15.544301,20.890302),(15.536033,20.844052),(15.544198,20.79899),(15.556084,20.773669),(15.570243,20.751913),(15.588123,20.732792),(15.669462,20.671866),(15.697264,20.642875),(15.755555,20.582001),(15.813846,20.521074),(15.872033,20.460199),(15.930324,20.399324),(15.953992,20.374571),(15.968151,20.352816),(15.970322,20.336331),(15.962984,20.319226),(15.94252,20.283957),(15.902419,20.214943),(15.862318,20.145955),(15.822321,20.076993),(15.782323,20.00803),(15.767234,19.982037),(15.736021,19.903541),(15.732404,19.861838),(15.728373,19.816259),(15.724342,19.770577),(15.720208,19.724999),(15.716177,19.679317),(15.712146,19.633764),(15.708116,19.588108),(15.704085,19.542529),(15.700054,19.496873),(15.696023,19.451243),(15.692096,19.405638),(15.687962,19.360008),(15.683931,19.314404),(15.6799,19.268747),(15.67587,19.223169),(15.671839,19.177539),(15.667808,19.131882),(15.663777,19.086304),(15.659747,19.040648),(15.655716,18.995069),(15.651582,18.949387),(15.647551,18.903834),(15.64352,18.858178),(15.639593,18.8126),(15.635562,18.766943),(15.631531,18.721313),(15.6275,18.675709),(15.62347,18.630078),(15.619439,18.584474),(15.615305,18.538818),(15.611274,18.493239),(15.607243,18.447583),(15.603213,18.402004),(15.599182,18.356348),(15.595151,18.310718),(15.59112,18.265088),(15.587193,18.219483),(15.583162,18.173879),(15.579028,18.128249),(15.574997,18.082644),(15.570966,18.03704),(15.567698,18.000039),(15.566936,17.991409),(15.562905,17.945779),(15.558874,17.900149),(15.554843,17.85457),(15.550813,17.808888),(15.546782,17.76331),(15.542648,17.717679),(15.538617,17.672049),(15.53469,17.626367),(15.530659,17.580737),(15.526628,17.535107),(15.522597,17.489528),(15.518567,17.443846),(15.514536,17.398267),(15.510505,17.352637),(15.506371,17.307058),(15.50234,17.261376),(15.498309,17.215746),(15.494279,17.170116),(15.490248,17.124537),(15.486217,17.078907),(15.48229,17.033277),(15.478259,16.987698),(15.474125,16.942068),(15.471954,16.916746),(15.468517,16.90491),(15.465547,16.89468),(15.452421,16.876232),(15.418418,16.840885),(15.3624,16.782646),(15.30628,16.7242),(15.250159,16.665909),(15.194039,16.607566),(15.137918,16.549275),(15.081797,16.490881),(15.02578,16.432538),(14.969659,16.374247),(14.913539,16.315904),(14.857418,16.257613),(14.801401,16.199219),(14.745384,16.140876),(14.689263,16.082534),(14.633143,16.024243),(14.576919,15.965797),(14.520798,15.907557),(14.482144,15.86725),(14.423543,15.806323),(14.368973,15.749634),(14.340447,15.710722),(14.310682,15.669949),(14.280709,15.629254),(14.250944,15.588455),(14.221178,15.547734),(14.191206,15.507039),(14.16144,15.466292),(14.131571,15.425545),(14.101702,15.384876),(14.071833,15.344181),(14.042068,15.303434),(14.012199,15.262687),(13.98233,15.221992),(13.952564,15.181219),(13.922592,15.140498),(13.892826,15.0997),(13.862957,15.059056),(13.833915,15.019601),(13.808077,14.965573),(13.775417,14.897438),(13.760534,14.866355),(13.75516,14.847209),(13.75392,14.825944),(13.75795,14.805532),(13.772006,14.762873),(13.773247,14.742512),(13.764358,14.719077),(13.749165,14.711248),(13.730045,14.709646),(13.709995,14.705124),(13.700021,14.697734),(13.668085,14.662879),(13.648345,14.649417),(13.644727,14.644249),(13.646278,14.639056),(13.657026,14.629651),(13.660334,14.623734),(13.666742,14.585519),(13.665605,14.56689),(13.657853,14.548725),(13.624264,14.521311),(13.608052,14.518266),(13.584369,14.513818),(13.543855,14.510562),(13.507785,14.495964),(13.482257,14.483587),(13.449494,14.439042),(13.449184,14.380131),(13.468304,14.310678),(13.482257,14.259777),(13.492695,14.213862),(13.499723,14.181978),(13.506958,14.150119),(13.514193,14.118235),(13.521324,14.086428),(13.528455,14.054518),(13.53569,14.022737),(13.542821,13.990853),(13.549953,13.958994),(13.557188,13.927161),(13.564319,13.895225),(13.57145,13.863418),(13.578582,13.831534),(13.585816,13.799727),(13.592948,13.767843),(13.600182,13.735984),(13.607314,13.7041),(13.35999,13.714409),(13.35892,13.714232),(13.329915,13.709423),(13.320716,13.702291),(13.321233,13.685109),(13.30604,13.674644),(13.266146,13.638032),(13.259221,13.628963),(13.253847,13.618911),(13.253537,13.614881),(13.258601,13.607801),(13.260048,13.602142),(13.257258,13.594236),(13.25085,13.592763),(13.243822,13.593254),(13.239481,13.591575),(13.230179,13.577751),(13.232246,13.572894),(13.246405,13.571085),(13.228112,13.548037),(13.203927,13.539381),(13.176952,13.534472),(13.150184,13.522664),(13.153698,13.5307),(13.155868,13.540777),(13.153698,13.548761),(13.143983,13.550621),(13.138402,13.546539),(13.13096,13.529821),(13.123519,13.522664),(13.123829,13.533439),(13.123519,13.536953),(13.107086,13.531552),(13.088276,13.530596),(13.07701,13.534679),(13.082488,13.544394),(13.082488,13.550621),(13.054893,13.548373),(13.029261,13.539175),(12.939344,13.495069),(12.911749,13.489901),(12.883844,13.495999),(12.87971,13.479695),(12.870614,13.478868),(12.857799,13.484914),(12.842296,13.489126),(12.842296,13.481685),(12.850564,13.479385),(12.857592,13.475328),(12.863897,13.469282),(12.870201,13.461247),(12.857075,13.450653),(12.829273,13.420293),(12.82855,13.417451),(12.829997,13.409364),(12.829273,13.406625),(12.826276,13.406056),(12.817594,13.407296),(12.815011,13.406625),(12.81067,13.404299),(12.797337,13.399648),(12.794547,13.396057),(12.798474,13.384275),(12.804779,13.376859),(12.805192,13.372983),(12.791136,13.371846),(12.788966,13.375464),(12.783281,13.382337),(12.77739,13.386703),(12.7746,13.382698),(12.773256,13.382233),(12.766538,13.365671),(12.740803,13.33482),(12.72437,13.322289),(12.701736,13.31725),(12.690057,13.311979),(12.683132,13.288932),(12.674347,13.283712),(12.659155,13.286606),(12.649233,13.293608),(12.640654,13.302393),(12.630009,13.310377),(12.628769,13.294177),(12.626805,13.28826),(12.62019,13.281438),(12.613266,13.276503),(12.606134,13.27423),(12.602724,13.279992),(12.597556,13.276503),(12.561073,13.242759),(12.558179,13.226532),(12.545156,13.208213),(12.538335,13.193356),(12.554251,13.187542),(12.547947,13.165451),(12.542572,13.15478),(12.534511,13.145917),(12.526966,13.143643),(12.504332,13.139613),(12.499784,13.135969),(12.491206,13.082639),(12.486659,13.070805),(12.472706,13.064165),(12.456376,13.067421),(12.437256,13.074009),(12.414312,13.077627),(12.386742,13.07858),(12.351576,13.079797),(12.335247,13.084474),(12.325738,13.078815),(12.3184,13.083854),(12.310959,13.092639),(12.301037,13.098116),(12.291528,13.096824),(12.285327,13.092019),(12.280883,13.086851),(12.277162,13.084474),(12.269204,13.085869),(12.267447,13.089641),(12.267034,13.095171),(12.26321,13.101863),(12.251841,13.108012),(12.201405,13.125427),(12.184765,13.122094),(12.163784,13.107961),(12.149625,13.105584),(12.116449,13.102845),(12.057641,13.116772),(12.038004,13.126358),(11.991908,13.162092),(11.852795,13.245394),(11.742311,13.289448),(11.440004,13.364431),(10.953005,13.361899),(10.771311,13.382698),(10.674986,13.375102),(10.647882,13.369406),(10.161529,13.267202),(10.119775,13.250097),(9.930122,13.145969),(9.912449,13.1292),(9.908211,13.118787),(9.904387,13.094344),(9.899736,13.084319),(9.891778,13.076231),(9.887747,13.075508),(9.882683,13.076231),(9.872038,13.072562),(9.852814,13.060444),(9.819328,13.029206),(9.647657,12.830538),(9.640734,12.822526),(9.629262,12.812785),(9.61841,12.805783),(9.611485,12.802941),(9.590298,12.80139),(9.377908,12.825782),(9.359821,12.824593),(9.306491,12.809839),(9.269387,12.809788),(8.977872,12.843183),(8.942792,12.847201),(8.679346,12.923579),(8.642655,12.944353),(8.625499,12.964791),(8.596767,13.011403),(8.577233,13.032436),(8.533515,13.06463),(8.50964,13.075921),(8.482665,13.081554),(8.47078,13.081657),(8.445975,13.078712),(8.434503,13.075095),(8.423134,13.069488),(8.419,13.066697),(8.415176,13.067059),(8.405151,13.070857),(8.397813,13.075405),(8.297974,13.164624),(8.273066,13.193873),(8.259836,13.205216),(8.246728,13.211292),(8.245677,13.211779),(8.216015,13.219608),(8.201442,13.226377),(8.167646,13.252371),(8.14005,13.269114),(8.116589,13.29105),(8.105117,13.299654),(8.077522,13.310016),(7.823997,13.345285),(7.789684,13.341977),(7.755578,13.327146),(7.391982,13.112534),(7.360667,13.102638),(7.324803,13.102845),(7.22052,13.121577),(7.198196,13.117392),(7.137424,13.047241),(7.090089,13.006391),(7.068695,12.996081),(7.062921,12.99514),(7.044924,12.992206),(6.970509,12.991844),(6.937127,12.995409),(6.906637,13.006856),(6.874185,13.030498),(6.837908,13.063493),(6.778687,13.130285),(6.753879,13.1749),(6.672543,13.321178),(6.509297,13.496051),(6.368944,13.626275),(6.302178,13.663844),(6.284208,13.667656),(6.229831,13.679192),(6.210608,13.675265),(6.152833,13.643561),(6.142395,13.640822),(6.13578,13.643664),(6.129476,13.649065),(6.12038,13.654077),(5.837349,13.763748),(5.554317,13.873418),(5.521761,13.880291),(5.374069,13.855254),(5.346268,13.841559),(5.334795,13.826702),(5.318052,13.789935),(5.304203,13.773941),(5.273507,13.752521),(5.262035,13.747741),(5.227618,13.741333),(5.084371,13.747534),(4.983189,13.72968),(4.925105,13.733091),(4.902367,13.742987),(4.879836,13.764019),(4.856892,13.774096),(4.824852,13.770737),(4.625845,13.723151),(4.506732,13.694669),(4.452575,13.673766),(4.405756,13.641236),(4.248453,13.494139),(4.220548,13.480625),(4.190472,13.475018),(4.125774,13.472977),(4.123707,13.233586),(4.120325,13.210608),(4.088773,12.996236),(3.929093,12.750386),(3.864394,12.689666),(3.6457,12.528539),(3.641565,12.517997),(3.651487,12.26902),(3.624512,12.137658),(3.623995,12.09425),(3.648903,12.021024),(3.653554,11.986815),(3.636604,11.953587),(3.619551,11.936275),(3.608492,11.921961),(3.603945,11.905579),(3.609733,11.848787),(3.612937,11.838968),(3.618621,11.828375),(3.622032,11.825016),(3.626269,11.822535),(3.64973,11.797834),(3.662029,11.779489),(3.66699,11.759697),(3.659859,11.738096),(3.647767,11.726004),(3.5964,11.695773),(3.589372,11.701509),(3.58007,11.717374),(3.571699,11.72187),(3.568185,11.729518),(3.566221,11.738354),(3.5625,11.746003),(3.557436,11.761815),(3.553715,11.76967),(3.549271,11.773753),(3.54369,11.77706),(3.536972,11.782899),(3.503486,11.829977),(3.495424,11.837521),(3.484262,11.84517),(3.447675,11.857985),(3.40282,11.88527),(3.391658,11.888836),(3.380909,11.895037),(3.369127,11.897311),(3.355071,11.889043),(3.341635,11.882893),(3.327786,11.886407),(3.315487,11.894572),(3.307012,11.902375),(3.292749,11.918653),(3.269908,11.956532),(3.26257,11.974722),(3.257609,11.997408),(3.255129,12.018751),(3.252028,12.024125),(3.238489,12.034202),(3.235389,12.039525),(3.063409,12.193779),(3.022895,12.252483),(3.013077,12.271087),(3.009356,12.276306),(3.000984,12.27889),(2.967808,12.282559),(2.956026,12.286848),(2.944967,12.292481),(2.936802,12.300852),(2.930394,12.323332),(2.922643,12.335631),(2.912618,12.346328),(2.892257,12.357076),(2.844301,12.399244),(2.832416,12.384051),(2.808645,12.383225),(2.798413,12.381209),(2.778156,12.381933),(2.768544,12.380072),(2.757485,12.372941),(2.741465,12.354131),(2.732267,12.346793),(2.721828,12.344261),(2.711286,12.351237),(2.700434,12.347103),(2.69506,12.341212),(2.692166,12.334029),(2.690202,12.326174),(2.686895,12.318422),(2.672942,12.296718),(2.663847,12.291551),(2.628604,12.300801),(2.621679,12.299509),(2.60969,12.290775),(2.603593,12.28783),(2.598632,12.288347),(2.590053,12.293308),(2.586126,12.294031),(2.550573,12.284523),(2.546025,12.281629),(2.53693,12.27305),(2.531246,12.269691),(2.523701,12.269175),(2.5206,12.273671),(2.51905,12.279148),(2.516259,12.281422),(2.504477,12.281835),(2.495072,12.283231),(2.488044,12.280388),(2.483393,12.268038),(2.477709,12.257599),(2.472644,12.259253),(2.46696,12.265041),(2.459519,12.266746),(2.454351,12.263025),(2.446083,12.251811),(2.443706,12.249228),(2.43089,12.247987),(2.407946,12.248918),(2.3942,12.247212),(2.370015,12.236257),(2.36123,12.218894),(2.362057,12.196156),(2.371875,12.140449),(2.405568,12.046708),(2.41115,12.036786),(2.418281,12.028673),(2.428616,12.020353),(2.439262,12.015598),(2.44877,12.013376),(2.455281,12.008674),(2.457348,11.99622),(2.456728,11.979063),(2.44939,11.977513),(2.438951,11.981285),(2.428926,11.980355),(2.422002,11.973172),(2.414147,11.958703),(2.407429,11.95121),(2.398747,11.948781),(2.389342,11.950073),(2.380867,11.947902),(2.375183,11.935035),(2.376526,11.924079),(2.388205,11.906768),(2.390169,11.896536),(2.338079,11.940099),(2.258807,12.048775),(2.188527,12.145461),(2.113803,12.247987),(2.070912,12.306898),(2.051792,12.341935),(2.054169,12.370926),(2.069258,12.383328),(2.126929,12.39511),(2.131477,12.398521),(2.138711,12.408339),(2.145016,12.41175),(2.148013,12.410768),(2.158762,12.405652),(2.163826,12.404774),(2.223254,12.409735),(2.23793,12.413455),(2.244958,12.424152),(2.242994,12.446166),(2.243098,12.451179),(2.246302,12.461669),(2.246302,12.465907),(2.242271,12.473452),(2.229559,12.487146),(2.223874,12.494846),(2.215709,12.510349),(2.210852,12.523061),(2.203204,12.583316),(2.2,12.595925),(2.193282,12.609464),(2.18429,12.620626),(2.165997,12.631737),(2.155455,12.640005),(2.144809,12.650753),(2.140985,12.656128),(2.135197,12.67561),(2.109049,12.705634),(2.068948,12.716279),(1.971693,12.724237),(1.962495,12.719121),(1.945545,12.700828),(1.934486,12.693542),(1.926631,12.694989),(1.919603,12.698347),(1.911438,12.696642),(1.906994,12.691836),(1.900173,12.678452),(1.883223,12.653957),(1.872681,12.634217),(1.860692,12.61706),(1.843742,12.606105),(1.826069,12.604193),(1.699462,12.61489),(1.597039,12.623675),(1.563863,12.63215),(1.535854,12.647498),(1.467124,12.704394),(1.412037,12.749869),(1.330595,12.817177),(1.304806,12.838508),(1.230756,12.899756),(1.170915,12.949211),(1.113968,12.996236),(1.083789,13.01099),(1.012269,13.016881),(0.983536,13.032358),(0.974648,13.048326),(0.971754,13.067317),(0.971661,13.085782),(0.971341,13.149405),(0.970824,13.243534),(0.970411,13.328335),(0.983536,13.36841),(1.004724,13.364844),(1.084719,13.33358),(1.138462,13.320377),(1.160683,13.311307),(1.167608,13.313426),(1.177633,13.34761),(1.182387,13.358695),(1.187658,13.364121),(1.205745,13.358901),(1.222075,13.344613),(1.241505,13.335544),(1.268687,13.34606),(1.249567,13.367066),(1.23427,13.377583),(1.217424,13.381768),(1.175049,13.38691),(1.157169,13.392646),(1.048235,13.441945),(1.015266,13.465665),(0.996559,13.496051),(0.991391,13.541113),(0.95098,13.583203),(0.896927,13.614932),(0.850728,13.628601),(0.813108,13.625035),(0.795331,13.625965),(0.775694,13.635293),(0.763705,13.646429),(0.762878,13.653044),(0.766289,13.657178),(0.767012,13.660873),(0.766185,13.666971),(0.766392,13.67511),(0.763498,13.682034),(0.75337,13.684101),(0.620665,13.679967),(0.59431,13.688881),(0.58046,13.713789),(0.584801,13.729008),(0.594516,13.74986),(0.600511,13.768721),(0.593689,13.778101),(0.574466,13.785025),(0.5632,13.796782),(0.552968,13.810037),(0.519275,13.831637),(0.504082,13.845358),(0.499926,13.851015),(0.49199,13.861817),(0.483515,13.880343),(0.47566,13.888947),(0.454809,13.902357),(0.448634,13.909617),(0.448065,13.920108),(0.456256,13.938143),(0.456695,13.94685),(0.445921,13.958581),(0.428377,13.967495),(0.411866,13.978424),(0.403934,13.996072),(0.401866,14.013797),(0.391376,14.022582),(0.378354,14.028809),(0.369155,14.039067),(0.369052,14.047852),(0.37732,14.063949),(0.378457,14.070434),(0.37422,14.078883),(0.368742,14.084154),(0.362463,14.088857),(0.356262,14.095704),(0.343575,14.114333),(0.339157,14.12578),(0.343472,14.137536),(0.367398,14.173787),(0.372153,14.185647),(0.377424,14.216601),(0.381118,14.22567),(0.390601,14.237633),(0.391635,14.245927),(0.388792,14.251612),(0.346366,14.307577),(0.202382,14.435545),(0.18865,14.44775),(0.158832,14.496119),(0.152941,14.54671),(0.219707,14.731221),(0.213092,14.761632),(0.184102,14.819562),(0.185756,14.84819),(0.198003,14.863797),(0.211852,14.874804),(0.220844,14.888214),(0.218467,14.910977),(0.212782,14.960716),(0.213196,14.985417),(0.221257,14.995933),(0.353187,14.963429),(0.387035,14.963248),(0.418791,14.969888),(0.483515,14.992109),(0.514831,14.993556),(0.670067,14.939735),(0.683813,14.940872),(0.711408,14.947461),(0.739934,14.958339),(0.769183,14.969062),(0.922145,14.973971),(0.949327,14.979552),(0.973718,14.991257),(1.057537,15.067118),(1.123063,15.126313),(1.203161,15.198789),(1.270857,15.259897),(1.297832,15.275735),(1.331526,15.283616),(1.405216,15.286148),(1.501748,15.289352),(1.598383,15.292608),(1.694914,15.295734),(1.791446,15.29899),(1.888081,15.302194),(1.984612,15.305398),(2.081351,15.308576),(2.177882,15.311831),(2.274517,15.314984),(2.371049,15.318239),(2.467684,15.321417),(2.564215,15.324595),(2.660953,15.327825),(2.757485,15.331081),(2.85412,15.334207),(2.950651,15.337463),(3.000158,15.339117),(3.005739,15.35232),(3.005842,15.389294),(3.007806,15.407665),(3.010286,15.417665),(3.017521,15.422832),(3.03354,15.42645),(3.073021,15.427199),(3.19229,15.40751),(3.380393,15.376324),(3.483332,15.359296),(3.48881,15.357539),(3.507103,15.353973),(3.516508,15.469186),(3.526534,15.495954),(3.614074,15.547734),(3.692208,15.63145),(3.728899,15.65088),(3.808377,15.665582),(3.846101,15.685297),(3.871215,15.714804),(3.873849,15.720882),(3.886512,15.750099),(3.89447,15.78865),(3.903462,15.886318),(3.909869,15.904767),(3.925062,15.927608),(3.98325,15.983987),(3.98418,15.986881),(3.9848,15.989826),(3.984594,15.995924),(3.984697,15.997371),(3.98449,15.998766),(3.983973,16.00011),(3.98325,16.00135),(3.970848,16.030857),(3.96692,16.058504),(3.971158,16.086099),(4.060558,16.298334),(4.075647,16.321072),(4.094768,16.340812),(4.118229,16.358331),(4.16174,16.379983),(4.1759,16.392644),(4.183961,16.416053),(4.183444,16.526538),(4.183031,16.612682),(4.182308,16.746472),(4.181998,16.809621),(4.184581,16.818509),(4.197604,16.838508),(4.202048,16.848895),(4.19657,16.947132),(4.197811,16.965219),(4.203702,16.982789),(4.21166,16.986044),(4.222305,16.986561),(4.235638,16.995863),(4.235328,17.100818),(4.235018,17.163915),(4.234707,17.287525),(4.234294,17.411186),(4.233777,17.534796),(4.233364,17.658458),(4.233054,17.78212),(4.23264,17.905782),(4.232408,17.975234),(4.232227,18.029443),(4.231917,18.153105),(4.231504,18.276741),(4.23109,18.400325),(4.230677,18.524038),(4.230271,18.645374),(4.230263,18.647648),(4.22985,18.771284),(4.229436,18.894946),(4.229023,19.018582),(4.22861,19.142244),(4.417229,19.178417),(4.605848,19.214616),(4.794467,19.250764),(4.983189,19.286963),(5.082821,19.306006),(5.301826,19.347993),(5.520831,19.389903),(5.620463,19.408997),(5.749344,19.433699),(5.794302,19.449796),(5.837607,19.478631),(5.916362,19.546276),(5.979407,19.600536),(6.042556,19.654745),(6.105601,19.709005),(6.168646,19.763213),(6.231692,19.817474),(6.294737,19.871682),(6.357782,19.925917),(6.420931,19.980177),(6.483769,20.034385),(6.546918,20.088646),(6.609963,20.142854),(6.672957,20.197115),(6.736105,20.251323),(6.799047,20.305532),(6.862092,20.35974),(6.925138,20.414001),(6.982808,20.46361),(7.020532,20.495443),(7.098047,20.558746),(7.169464,20.616986),(7.240881,20.675173),(7.312297,20.733464),(7.383611,20.791652),(7.482726,20.872577),(7.613778,20.94973),(7.681887,20.989831),(7.74979,21.029984),(7.8179,21.070085),(7.886009,21.110237),(7.953912,21.15039),(8.022022,21.190491),(8.090131,21.230592),(8.158034,21.270744),(8.226143,21.310845),(8.294253,21.350946),(8.362259,21.391047),(8.430265,21.431148),(8.498375,21.4713),(8.566381,21.51135),(8.634491,21.551502),(8.702497,21.591655),(8.770606,21.631807),(8.838613,21.671908),(8.906722,21.712061),(8.974832,21.75211),(9.042838,21.792263),(9.110844,21.832364),(9.178953,21.872516),(9.24696,21.912565),(9.314966,21.952718),(9.383075,21.992819),(9.451082,22.03292),(9.519088,22.073072),(9.587197,22.113225),(9.655203,22.153326),(9.723313,22.193427),(9.791319,22.233579),(9.859325,22.27368),(9.927435,22.313781),(9.995441,22.353882),(10.063447,22.394035),(10.131557,22.434136),(10.199563,22.474237),(10.267569,22.514337),(10.335679,22.554542),(10.403788,22.594643),(10.471691,22.634744),(10.539801,22.674896),(10.607807,22.714945),(10.675813,22.755046),(10.743923,22.795199),(10.812032,22.835326),(10.880038,22.875375),(10.948148,22.915527),(11.016257,22.955654),(11.084367,22.995755),(11.15227,23.035882),(11.220379,23.07606),(11.288489,23.116161),(11.356392,23.156262),(11.424501,23.196415),(11.492611,23.236516),(11.560514,23.276591),(11.628623,23.316717),(11.696733,23.356844),(11.764739,23.396945),(11.832745,23.437046),(11.900855,23.477173),(11.968861,23.517351),(12.057021,23.497611),(12.145284,23.477948),(12.233651,23.458285),(12.321811,23.438622),(12.409971,23.418882),(12.498337,23.399245),(12.586497,23.379582),(12.674657,23.359893),(12.763024,23.340179),(12.851184,23.32049),(12.939447,23.300827),(13.027607,23.281138),(13.115871,23.261449),(13.204134,23.241709),(13.292398,23.222098),(13.380661,23.202383),(13.482257,23.179672),(13.599562,23.119029),(13.655786,23.072624),(13.780895,22.969633),(13.906055,22.866616),(14.031009,22.763702),(14.156169,22.660737),(14.201644,22.62322),(14.216217,22.616295)]
+Norfolk Island	[(167.984141,-29.017836),(167.996349,-29.025649),(167.99464,-29.042576),(167.985037,-29.059259),(167.973481,-29.066339),(167.970063,-29.068943),(167.967947,-29.072035),(167.966482,-29.075779),(167.966645,-29.080011),(167.960704,-29.065606),(167.95045,-29.056573),(167.939708,-29.055759),(167.932628,-29.066339),(167.926443,-29.066339),(167.924327,-29.055597),(167.920177,-29.045505),(167.918305,-29.036391),(167.922374,-29.028741),(167.929942,-29.019464),(167.930512,-29.01214),(167.924571,-29.008722),(167.91212,-29.011651),(167.926524,-28.997491),(167.945567,-29.001235),(167.965831,-29.011814),(167.984141,-29.017836)]
+Niue	[(-169.851145,-18.965102),(-169.825307,-18.96795),(-169.822621,-18.972589),(-169.79426,-19.047133),(-169.782908,-19.068943),(-169.796864,-19.073907),(-169.805979,-19.081964),(-169.823842,-19.102309),(-169.865427,-19.129653),(-169.872996,-19.125909),(-169.880971,-19.129083),(-169.898915,-19.142755),(-169.902048,-19.132989),(-169.909983,-19.128595),(-169.921091,-19.128025),(-169.933705,-19.129653),(-169.930531,-19.126397),(-169.927968,-19.122817),(-169.924794,-19.119317),(-169.919423,-19.115981),(-169.924062,-19.099379),(-169.926259,-19.094903),(-169.950429,-19.087335),(-169.947703,-19.069431),(-169.926259,-19.03753),(-169.927968,-19.031834),(-169.931589,-19.026544),(-169.934397,-19.020929),(-169.933705,-19.013604),(-169.930247,-19.008396),(-169.926381,-19.00742),(-169.921824,-19.007013),(-169.916005,-19.003106),(-169.895823,-18.965102),(-169.863718,-18.964044),(-169.851145,-18.965102)]
+Nepal	[(81.779018,30.358045),(81.801497,30.3613),(81.822788,30.368173),(81.844389,30.371171),(81.887177,30.354996),(81.92149,30.357373),(81.941231,30.353962),(81.950119,30.348381),(81.962108,30.333653),(81.969032,30.328279),(81.978851,30.326832),(81.988463,30.329778),(81.998178,30.334067),(82.007635,30.336806),(82.049854,30.339235),(82.073212,30.337219),(82.088767,30.330088),(82.093211,30.31474),(82.0821,30.257327),(82.084994,30.230817),(82.095898,30.213454),(82.114243,30.202189),(82.140391,30.194024),(82.155688,30.181363),(82.150985,30.162243),(82.127576,30.124364),(82.128713,30.110773),(82.135224,30.089741),(82.144526,30.069432),(82.153827,30.058166),(82.17424,30.055479),(82.192171,30.061474),(82.210671,30.064419),(82.255733,30.039666),(82.27599,30.036927),(82.296506,30.036824),(82.318882,30.031811),(82.32715,30.025714),(82.339087,30.009229),(82.347304,30.003441),(82.363737,30.001167),(82.379137,30.003234),(82.394433,30.003131),(82.409781,29.994604),(82.422855,29.97967),(82.438926,29.965769),(82.457065,29.95409),(82.475823,29.945512),(82.524244,29.932386),(82.541814,29.923239),(82.618502,29.839833),(82.635865,29.829033),(82.646407,29.829343),(82.666974,29.835028),(82.67731,29.834407),(82.688988,29.827741),(82.689195,29.819576),(82.684648,29.809706),(82.681754,29.797717),(82.690952,29.780741),(82.751517,29.739323),(82.77012,29.714156),(82.781076,29.705113),(82.793065,29.699506),(82.805157,29.695966),(82.815544,29.690127),(82.822365,29.677957),(82.836576,29.659793),(82.857454,29.666201),(82.880088,29.681109),(82.899725,29.688422),(82.90913,29.684623),(82.923703,29.669663),(82.931919,29.664185),(82.9421,29.662945),(82.964321,29.665891),(82.975896,29.66403),(83.032895,29.620467),(83.040905,29.610287),(83.054496,29.586051),(83.064935,29.57879),(83.079559,29.579643),(83.085553,29.590391),(83.088447,29.604421),(83.093357,29.615144),(83.100281,29.617676),(83.126688,29.623413),(83.150046,29.625635),(83.162086,29.62517),(83.173558,29.621268),(83.187253,29.612095),(83.19087,29.606902),(83.194487,29.593647),(83.197175,29.589099),(83.204926,29.584914),(83.221876,29.579824),(83.229317,29.575948),(83.252572,29.5552),(83.26084,29.542048),(83.26332,29.527088),(83.25991,29.518768),(83.254019,29.51329),(83.248748,29.506572),(83.247197,29.494738),(83.26394,29.473008),(83.327968,29.485023),(83.355201,29.460735),(83.357785,29.442752),(83.355201,29.427972),(83.35701,29.415363),(83.38724,29.393504),(83.389411,29.382445),(83.388274,29.370224),(83.393132,29.356245),(83.405017,29.346479),(83.417781,29.340898),(83.428168,29.333456),(83.437212,29.305241),(83.448219,29.296766),(83.475814,29.286921),(83.493384,29.276147),(83.502996,29.261032),(83.512504,29.223489),(83.514571,29.20181),(83.517052,29.191708),(83.523718,29.183594),(83.535965,29.179228),(83.56139,29.176231),(83.572035,29.168402),(83.583818,29.162149),(83.624435,29.155457),(83.639266,29.154759),(83.654992,29.160414),(83.65601,29.160779),(83.663399,29.174809),(83.66774,29.192328),(83.675078,29.208761),(83.69549,29.226176),(83.719727,29.233591),(83.745358,29.23447),(83.770628,29.232248),(83.79321,29.234754),(83.837859,29.254004),(83.86163,29.260205),(83.868865,29.263435),(83.877391,29.276767),(83.883438,29.282012),(83.914392,29.289402),(83.93315,29.291779),(83.945553,29.291831),(83.957955,29.28904),(83.967257,29.284699),(83.973251,29.277025),(83.975835,29.263745),(83.988237,29.269532),(84.000898,29.27253),(84.012525,29.270204),(84.021517,29.259766),(84.035211,29.247622),(84.05304,29.25036),(84.072057,29.256975),(84.08973,29.256613),(84.099135,29.247001),(84.105336,29.219923),(84.112364,29.209097),(84.126007,29.206255),(84.141975,29.20827),(84.155462,29.206642),(84.161663,29.192534),(84.155204,29.175946),(84.141716,29.160263),(84.13226,29.143804),(84.137996,29.124657),(84.160113,29.105486),(84.166211,29.098458),(84.169725,29.088923),(84.175461,29.057401),(84.198199,29.045308),(84.220575,29.0389),(84.231427,29.025981),(84.206725,28.940664),(84.225291,28.914115),(84.235147,28.90002),(84.285997,28.873743),(84.354003,28.861289),(84.366302,28.856741),(84.376586,28.848835),(84.393071,28.82434),(84.41431,28.808269),(84.422733,28.799173),(84.437822,28.753336),(84.450845,28.73388),(84.475753,28.727292),(84.498594,28.72786),(84.515647,28.7214),(84.531977,28.712693),(84.551821,28.706388),(84.607218,28.698198),(84.616209,28.69365),(84.625821,28.67608),(84.632642,28.668794),(84.65228,28.662386),(84.671141,28.658949),(84.682975,28.650759),(84.677756,28.604405),(84.69083,28.596137),(84.736615,28.594173),(84.755632,28.585414),(84.781781,28.558904),(84.799144,28.546631),(84.81196,28.54198),(84.823949,28.540533),(84.879294,28.543634),(84.891438,28.541773),(84.907871,28.537019),(84.918723,28.535675),(84.92849,28.538466),(84.936448,28.54477),(84.948954,28.568283),(84.954948,28.574303),(84.984766,28.588592),(84.994067,28.590814),(85.002491,28.594431),(85.009157,28.602545),(85.018769,28.619856),(85.02528,28.628409),(85.032101,28.634067),(85.054942,28.638692),(85.075044,28.631664),(85.11189,28.608823),(85.160982,28.595),(85.16801,28.583192),(85.156952,28.533143),(85.153748,28.524901),(85.14765,28.515832),(85.140363,28.510922),(85.123155,28.504592),(85.117212,28.497331),(85.115662,28.491492),(85.115559,28.472733),(85.109461,28.459298),(85.083674,28.445526),(85.077577,28.435681),(85.08569,28.381008),(85.08569,28.361526),(85.081867,28.331702),(85.080212,28.318789),(85.087395,28.304113),(85.109409,28.292254),(85.134162,28.291969),(85.154574,28.300858),(85.173591,28.30432),(85.205734,28.278275),(85.223924,28.271686),(85.243406,28.267914),(85.259581,28.266932),(85.27312,28.269826),(85.301025,28.281066),(85.312601,28.282771),(85.325727,28.277397),(85.334822,28.268689),(85.345364,28.261248),(85.362572,28.259672),(85.377817,28.265976),(85.401381,28.288791),(85.41523,28.296439),(85.43156,28.297059),(85.44665,28.29215),(85.475692,28.279102),(85.497551,28.282616),(85.52065,28.282926),(85.543698,28.280394),(85.565299,28.275381),(85.585504,28.263186),(85.59894,28.250835),(85.611807,28.251145),(85.639093,28.287887),(85.646947,28.2937),(85.668135,28.300548),(85.675059,28.306387),(85.676196,28.31512),(85.67599,28.324732),(85.679142,28.332897),(85.692939,28.335222),(85.698004,28.313441),(85.699761,28.269102),(85.715574,28.243368),(85.734487,28.221534),(85.756605,28.203241),(85.782753,28.1881),(85.826885,28.170478),(85.848279,28.158928),(85.863368,28.143348),(85.867037,28.132935),(85.87174,28.110921),(85.889103,28.090276),(85.891067,28.080897),(85.889827,28.071259),(85.890447,28.059193),(85.898302,28.036016),(85.908947,28.022425),(85.943984,27.994726),(85.956593,27.976226),(85.956283,27.956873),(85.951838,27.936797),(85.951218,27.91623),(85.96269,27.891374),(85.98026,27.885172),(86.026459,27.889927),(86.051419,27.88755),(86.0546,27.888013),(86.061703,27.889048),(86.075655,27.894784),(86.107178,27.922845),(86.112862,27.926798),(86.112242,27.937262),(86.107178,27.944239),(86.100563,27.950233),(86.095602,27.957855),(86.095085,27.968888),(86.098031,27.977518),(86.098134,27.985631),(86.089401,27.994726),(86.089401,27.994881),(86.089298,27.994933),(86.089298,27.994881),(86.079169,28.001134),(86.077619,28.006948),(86.079531,28.01333),(86.079531,28.02165),(86.083923,28.038548),(86.084699,28.043871),(86.081546,28.0517),(86.070177,28.066712),(86.068731,28.076763),(86.15596,28.156525),(86.176011,28.153011),(86.186036,28.133529),(86.187173,28.108699),(86.180765,28.088752),(86.172238,28.071828),(86.17446,28.062448),(86.18185,28.054878),(86.189137,28.043612),(86.19601,28.01457),(86.203038,28.002581),(86.217765,27.994985),(86.21792,27.994933),(86.218385,27.994726),(86.238539,27.989559),(86.259003,27.987647),(86.278072,27.983694),(86.29466,27.972376),(86.318224,27.945789),(86.327733,27.939691),(86.337551,27.938037),(86.345613,27.940931),(86.353674,27.944807),(86.362976,27.946099),(86.371968,27.941965),(86.405713,27.917005),(86.425298,27.909925),(86.438837,27.910856),(86.475476,27.927599),(86.496921,27.937882),(86.510461,27.952429),(86.516765,27.971369),(86.516764,27.971432),(86.516455,27.994726),(86.516197,28.012245),(86.522295,28.023717),(86.530925,28.03369),(86.538366,28.047178),(86.540743,28.062164),(86.54126,28.07821),(86.544154,28.093015),(86.553559,28.104151),(86.569527,28.106606),(86.583118,28.098028),(86.596864,28.086504),(86.612315,28.080277),(86.627146,28.083481),(86.64947,28.10118),(86.661976,28.106838),(86.680063,28.105727),(86.699648,28.098751),(86.717683,28.088261),(86.731739,28.076918),(86.735977,28.064851),(86.732204,28.034957),(86.739801,28.021495),(86.76998,28.01209),(86.840466,28.014777),(86.868165,27.994881),(86.868165,27.994726),(86.876898,27.970645),(86.893073,27.954186),(86.914725,27.945117),(86.940357,27.943102),(86.970226,27.947443),(86.982093,27.950674),(86.988726,27.952481),(87.005676,27.951499),(87.030532,27.938089),(87.062003,27.908427),(87.116522,27.844581),(87.155796,27.825796),(87.181996,27.824504),(87.232897,27.829724),(87.290516,27.816081),(87.313926,27.828587),(87.335837,27.846363),(87.363845,27.855252),(87.385343,27.849412),(87.380692,27.835821),(87.369116,27.819078),(87.369116,27.803937),(87.38679,27.804402),(87.47557,27.826701),(87.514534,27.835201),(87.531587,27.836803),(87.551327,27.831894),(87.555978,27.827088),(87.559802,27.819078),(87.565073,27.810862),(87.573342,27.805022),(87.589981,27.804609),(87.621091,27.819543),(87.636077,27.823652),(87.659951,27.819879),(87.678529,27.813351),(87.700466,27.805642),(87.726821,27.807761),(87.756379,27.82037),(87.779841,27.839439),(87.798651,27.863468),(87.814154,27.89096),(87.825884,27.906566),(87.836685,27.908323),(87.856115,27.898608),(87.93456,27.895301),(87.945205,27.892304),(87.966392,27.882744),(87.978433,27.880522),(87.991817,27.88264),(88.018121,27.892149),(88.029954,27.893337),(88.052795,27.886516),(88.095739,27.865329),(88.118218,27.860885),(88.143023,27.855717),(88.156407,27.851273),(88.164623,27.845356),(88.166587,27.833599),(88.154598,27.815151),(88.159662,27.77412),(88.149327,27.748772),(88.134858,27.723167),(88.11088,27.639503),(88.048765,27.545348),(88.02334,27.494912),(88.0221,27.484241),(88.02334,27.474655),(88.028094,27.455121),(88.030781,27.450729),(88.039773,27.442357),(88.041633,27.438068),(88.039308,27.42949),(88.034812,27.423805),(88.029593,27.418741),(88.02582,27.412075),(88.017242,27.389234),(88.014762,27.378072),(88.015795,27.364222),(88.020136,27.35337),(88.032538,27.333888),(88.035122,27.322571),(88.029024,27.298076),(88.004663,27.249163),(87.989337,27.218391),(87.985461,27.14837),(87.970837,27.119224),(87.969183,27.110801),(87.970733,27.10274),(87.975488,27.095143),(87.9913,27.081501),(88.009491,27.045637),(88.027371,27.035353),(88.042822,27.028946),(88.055948,27.018042),(88.076877,26.99179),(88.096824,26.959337),(88.11181,26.924301),(88.12044,26.90885),(88.142816,26.878412),(88.151394,26.862806),(88.155321,26.845598),(88.159042,26.802551),(88.167827,26.762915),(88.169067,26.744002),(88.167517,26.725037),(88.163383,26.705141),(88.14664,26.661216),(88.101681,26.581944),(88.087136,26.5391),(88.079822,26.517556),(88.07915,26.507375),(88.082251,26.494921),(88.082251,26.49487),(88.074189,26.453942),(88.044321,26.405676),(88.006648,26.369864),(87.975488,26.366557),(87.961225,26.378959),(87.928979,26.396426),(87.914768,26.40826),(87.908515,26.41782),(87.902004,26.435287),(87.897301,26.443452),(87.894769,26.442935),(87.870688,26.460712),(87.869809,26.464639),(87.852084,26.46066),(87.821595,26.437509),(87.804439,26.437354),(87.785938,26.445984),(87.768988,26.451461),(87.756173,26.446914),(87.749455,26.425727),(87.74222,26.410482),(87.727544,26.403764),(87.710904,26.405676),(87.697572,26.41627),(87.68119,26.424228),(87.659641,26.41751),(87.648745,26.409993),(87.623984,26.392912),(87.586984,26.378029),(87.552051,26.386711),(87.480324,26.423401),(87.449628,26.428621),(87.416452,26.426967),(87.384206,26.418647),(87.356404,26.403712),(87.344932,26.389346),(87.326225,26.353328),(87.314029,26.343768),(87.30049,26.34599),(87.258425,26.36294),(87.2453,26.370226),(87.236308,26.3833),(87.229435,26.398752),(87.2191,26.408105),(87.188455,26.399578),(87.135022,26.394204),(87.10629,26.404746),(87.083294,26.432083),(87.066706,26.465621),(87.056681,26.49487),(87.056474,26.49487),(87.056474,26.494921),(87.045002,26.544272),(87.044433,26.561171),(87.041333,26.580187),(87.029912,26.579774),(87.015443,26.568974),(86.985212,26.540655),(86.972448,26.531973),(86.935153,26.520289),(86.907129,26.51151),(86.875968,26.494921),(86.865684,26.472442),(86.846357,26.45265),(86.821863,26.438129),(86.796438,26.431514),(86.78724,26.433065),(86.751893,26.445519),(86.738199,26.44371),(86.730706,26.433788),(86.724091,26.421954),(86.713601,26.414565),(86.695204,26.418234),(86.625337,26.456319),(86.5579,26.484018),(86.537953,26.49487),(86.537746,26.49487),(86.52431,26.509081),(86.510616,26.520139),(86.494906,26.527839),(86.475476,26.531973),(86.444832,26.543084),(86.383647,26.572849),(86.353674,26.582616),(86.344838,26.582616),(86.323185,26.580084),(86.316002,26.580963),(86.309026,26.587991),(86.308613,26.60215),(86.301378,26.609023),(86.284428,26.61202),(86.263086,26.609075),(86.225155,26.597396),(86.202883,26.58458),(86.195855,26.582668),(86.185364,26.584425),(86.179266,26.588611),(86.17446,26.593313),(86.167794,26.596621),(86.152653,26.600651),(86.146355,26.601356),(86.144798,26.60153),(86.122061,26.60029),(86.115859,26.602563),(86.110692,26.606749),(86.041704,26.645455),(86.01137,26.654447),(85.975713,26.64437),(85.952148,26.642044),(85.934682,26.632897),(85.866366,26.579929),(85.844765,26.568509),(85.828538,26.566131),(85.821614,26.571713),(85.819753,26.579516),(85.819547,26.588301),(85.817635,26.596724),(85.809728,26.603028),(85.800065,26.600703),(85.789988,26.597034),(85.780996,26.599204),(85.727046,26.6376),(85.712887,26.653206),(85.702241,26.68845),(85.709631,26.76245),(85.701828,26.796608),(85.687772,26.811853),(85.609379,26.851024),(85.598578,26.854383),(85.519462,26.826426),(85.475692,26.805238),(85.439622,26.78772),(85.421535,26.782656),(85.40319,26.787617),(85.385878,26.788444),(85.369238,26.775008),(85.355352,26.759912),(85.353219,26.757593),(85.337044,26.746792),(85.302369,26.737336),(85.28728,26.736974),(85.194934,26.758885),(85.165685,26.786273),(85.16553,26.820793),(85.162016,26.851024),(85.122845,26.8657),(85.100211,26.863529),(85.043987,26.843737),(85.018562,26.845804),(85.016857,26.85924),(85.018045,26.874433),(85.000837,26.882236),(84.988176,26.883787),(84.975774,26.886887),(84.952726,26.897636),(84.944251,26.915723),(84.938567,26.9366),(84.924046,26.955668),(84.901567,26.967192),(84.851751,26.982127),(84.828289,26.994839),(84.828134,26.994943),(84.817489,27.0106),(84.801934,27.013753),(84.785501,27.008482),(84.771962,26.99918),(84.760697,26.999025),(84.640239,27.028377),(84.627268,27.03649),(84.62148,27.057988),(84.630369,27.080829),(84.644528,27.103721),(84.654398,27.125374),(84.659824,27.165113),(84.657654,27.203405),(84.648197,27.240716),(84.631919,27.277044),(84.606546,27.310479),(84.577039,27.329031),(84.289408,27.376108),(84.267703,27.388562),(84.248893,27.412436),(84.239023,27.431143),(84.225536,27.440393),(84.195253,27.436053),(84.185848,27.438636),(84.175099,27.462976),(84.165746,27.472174),(84.141716,27.480753),(84.130968,27.486411),(84.121563,27.494964),(84.11717,27.513283),(84.099548,27.516874),(84.079601,27.509536),(84.028907,27.453726),(84.007668,27.440807),(83.975835,27.439722),(83.935941,27.446078),(83.923022,27.449954),(83.922043,27.449696),(83.899871,27.443856),(83.853517,27.440962),(83.834087,27.434037),(83.842717,27.418069),(83.87119,27.38944),(83.873671,27.380087),(83.87765,27.369907),(83.877391,27.361742),(83.867521,27.358383),(83.861733,27.354507),(83.854602,27.34505),(83.85334,27.346194),(83.847988,27.351045),(83.801995,27.365928),(83.663399,27.43228),(83.590432,27.45662),(83.480981,27.469746),(83.387034,27.470469),(83.360989,27.462201),(83.355925,27.452486),(83.353857,27.44029),(83.355821,27.428663),(83.370962,27.410214),(83.369567,27.398174),(83.362746,27.385616),(83.341145,27.356936),(83.32435,27.341691),(83.304868,27.331925),(83.282441,27.330943),(83.259496,27.338126),(83.249419,27.348099),(83.243115,27.362155),(83.231591,27.381224),(83.21924,27.393781),(83.169631,27.431195),(83.132786,27.444217),(83.010468,27.443391),(82.947164,27.457317),(82.901275,27.480365),(82.876264,27.487548),(82.752137,27.494964),(82.72971,27.518166),(82.718857,27.556123),(82.709246,27.630924),(82.69705,27.669397),(82.679687,27.694409),(82.673891,27.696458),(82.652143,27.70415),(82.526156,27.675211),(82.440683,27.666426),(82.401926,27.677175),(82.347924,27.726009),(82.270409,27.760477),(82.151037,27.848275),(82.107422,27.863572),(82.090369,27.872331),(82.071662,27.89003),(82.051611,27.905171),(82.050212,27.905586),(82.02722,27.912406),(81.975905,27.916953),(81.946398,27.905352),(81.906091,27.863107),(81.883198,27.849051),(81.855654,27.850937),(81.827852,27.865639),(81.800154,27.884087),(81.750131,27.909667),(81.710392,27.94752),(81.688946,27.963204),(81.665433,27.9708),(81.615049,27.981239),(81.59536,27.994726),(81.59536,27.994778),(81.595102,27.994881),(81.582183,28.013278),(81.561925,28.025991),(81.473455,28.066402),(81.458211,28.07728),(81.454025,28.086607),(81.45294,28.097046),(81.448237,28.111412),(81.435267,28.129783),(81.417335,28.147017),(81.396044,28.160634),(81.373203,28.167843),(81.357907,28.165982),(81.351447,28.15681),(81.347262,28.144433),(81.338115,28.132728),(81.323697,28.126243),(81.307057,28.123814),(81.296205,28.12831),(81.299409,28.142521),(81.283079,28.146087),(81.276775,28.153787),(81.280754,28.161977),(81.295947,28.167455),(81.282356,28.191588),(81.224323,28.250783),(81.210732,28.278637),(81.190372,28.338116),(81.169701,28.361319),(81.146344,28.372249),(81.047066,28.389088),(81.000409,28.397002),(80.993175,28.407828),(80.991314,28.420256),(80.9878,28.430979),(80.976018,28.436922),(80.960515,28.432271),(80.941188,28.432684),(80.921344,28.436198),(80.905273,28.440849),(80.88667,28.452786),(80.881864,28.466842),(80.880365,28.48188),(80.872252,28.496866),(80.857989,28.502447),(80.81701,28.502551),(80.798406,28.505703),(80.781663,28.514746),(80.743526,28.549964),(80.727093,28.559679),(80.695777,28.567508),(80.67862,28.574717),(80.668182,28.586344),(80.648338,28.619753),(80.635625,28.627866),(80.598522,28.633783),(80.581365,28.638951),(80.563589,28.647038),(80.556871,28.655022),(80.557387,28.66435),(80.559041,28.673031),(80.555837,28.678948),(80.534444,28.679555),(80.517596,28.680033),(80.497546,28.670137),(80.487624,28.656469),(80.484937,28.639287),(80.493412,28.575647),(80.488451,28.562444),(80.468814,28.571849),(80.426543,28.616807),(80.408352,28.626342),(80.388302,28.627246),(80.369078,28.622647),(80.349751,28.620218),(80.329701,28.627479),(80.318332,28.640113),(80.291047,28.689671),(80.283399,28.695356),(80.265209,28.699283),(80.257044,28.702745),(80.249396,28.710213),(80.238957,28.726258),(80.233273,28.732718),(80.216426,28.741942),(80.181183,28.74729),(80.162063,28.753285),(80.147593,28.76331),(80.11421,28.802584),(80.081861,28.819353),(80.073054,28.820925),(80.054782,28.824185),(80.036386,28.837026),(80.030288,28.87767),(80.031115,28.897798),(80.033905,28.915936),(80.04052,28.932809),(80.052922,28.949113),(80.068425,28.959939),(80.085168,28.967484),(80.099431,28.977276),(80.107906,28.994588),(80.107906,28.994769),(80.104702,29.027609),(80.113073,29.072206),(80.132607,29.110214),(80.16351,29.123366),(80.180563,29.121324),(80.20144,29.121169),(80.220664,29.126079),(80.233066,29.139308),(80.230482,29.154733),(80.213739,29.196565),(80.218803,29.211086),(80.236063,29.213076),(80.248672,29.204394),(80.258181,29.202456),(80.278748,29.268085),(80.282779,29.291314),(80.280092,29.31015),(80.272754,29.315705),(80.263555,29.315318),(80.254977,29.316635),(80.249499,29.326997),(80.242161,29.367408),(80.220974,29.400119),(80.213739,29.416888),(80.217666,29.434639),(80.228312,29.441718),(80.257457,29.450064),(80.263452,29.459237),(80.266242,29.47213),(80.273064,29.478667),(80.282055,29.4843),(80.29115,29.494609),(80.29146,29.494738),(80.311511,29.508122),(80.320089,29.515822),(80.327221,29.52484),(80.327634,29.52993),(80.32505,29.535511),(80.323603,29.54166),(80.327221,29.548585),(80.332698,29.552461),(80.345101,29.558352),(80.350785,29.562073),(80.373316,29.58419),(80.385201,29.604835),(80.386752,29.626823),(80.377553,29.652946),(80.363911,29.679714),(80.354402,29.70488),(80.354299,29.730279),(80.368975,29.757926),(80.395227,29.776582),(80.454861,29.790586),(80.476152,29.80614),(80.527312,29.862416),(80.549533,29.89368),(80.562865,29.929699),(80.57134,29.946855),(80.586223,29.954142),(80.622293,29.958173),(80.641413,29.963444),(80.654126,29.970575),(80.680171,29.992072),(80.715827,30.013311),(80.725749,30.022768),(80.755721,30.064574),(80.769674,30.077287),(80.829825,30.117129),(80.849669,30.143381),(80.83644,30.170046),(80.850393,30.181931),(80.867911,30.200173),(80.883879,30.210405),(80.893646,30.198106),(80.903309,30.180433),(80.920828,30.17666),(80.988162,30.196556),(80.996017,30.196969),(81.006507,30.188908),(81.019426,30.172268),(81.030898,30.152734),(81.043663,30.12023),(81.066607,30.087157),(81.074203,30.071912),(81.084454,30.027876),(81.084849,30.026179),(81.097768,30.016929),(81.124588,30.022768),(81.148101,30.023233),(81.194506,30.004475),(81.21683,30.008195),(81.227269,30.022458),(81.225719,30.050467),(81.239516,30.058787),(81.257086,30.063541),(81.266801,30.069949),(81.267903,30.072053),(81.272021,30.079922),(81.275948,30.095373),(81.274501,30.102195),(81.266336,30.117749),(81.266956,30.125087),(81.277705,30.131857),(81.29326,30.132839),(81.309538,30.132064),(81.322405,30.133769),(81.33827,30.143536),(81.350052,30.15723),(81.357287,30.17356),(81.361834,30.204772),(81.374392,30.223118),(81.377854,30.232626),(81.376924,30.241204),(81.370516,30.257276),(81.369017,30.266061),(81.368036,30.301046),(81.37155,30.31691),(81.382143,30.331276),(81.387259,30.345126),(81.384882,30.360939),(81.387518,30.373909),(81.407413,30.37918),(81.42612,30.372514),(81.46281,30.341353),(81.483067,30.331896),(81.509371,30.328382),(81.520688,30.331948),(81.531953,30.370344),(81.536811,30.37856),(81.544252,30.382643),(81.563269,30.385588),(81.576705,30.390963),(81.581976,30.399438),(81.585077,30.408119),(81.591588,30.414269),(81.614015,30.416904),(81.635719,30.410961),(81.757366,30.362902),(81.779018,30.358045)]
+Nauru	[(166.938813,-0.490411),(166.955577,-0.497979),(166.958263,-0.517673),(166.951345,-0.539158),(166.938813,-0.551853),(166.916352,-0.54754),(166.906993,-0.524835),(166.913422,-0.500177),(166.938813,-0.490411)]
+Poland	[(19.002126,54.344916),(19.377208,54.377631),(19.459972,54.401028),(19.499278,54.406399),(19.531016,54.414944),(19.59254,54.452379),(19.609548,54.456732),(19.63077,54.446652),(19.680276,54.436678),(19.758256,54.434256),(19.964703,54.427842),(20.35207,54.415749),(20.640838,54.406784),(20.929606,54.397818),(21.287413,54.386759),(21.720772,54.373271),(21.998946,54.364667),(22.27712,54.356063),(22.510388,54.348777),(22.698387,54.342937),(22.76722,54.35627),(22.78603,54.36521),(22.811344,54.392633),(22.812695,54.394097),(22.837603,54.400918),(22.858894,54.399213),(22.918838,54.381126),(22.92969,54.380299),(22.952428,54.38309),(22.96266,54.381695),(22.973305,54.37539),(22.97899,54.367587),(22.983434,54.359784),(22.989738,54.353376),(23.001004,54.34888),(23.035317,54.346503),(23.041622,54.340974),(23.038004,54.331465),(23.032216,54.320148),(23.032113,54.309554),(23.050096,54.294827),(23.073041,54.294878),(23.096915,54.300821),(23.117069,54.303457),(23.135259,54.298289),(23.197271,54.267851),(23.235408,54.254157),(23.316023,54.236277),(23.33599,54.226294),(23.354471,54.217054),(23.364082,54.208269),(23.382273,54.187856),(23.391471,54.180105),(23.401806,54.175971),(23.423304,54.172508),(23.432502,54.169305),(23.449039,54.154938),(23.462991,54.13494),(23.473947,54.112564),(23.481595,54.091221),(23.496167,54.044558),(23.496477,54.021975),(23.481595,54.006627),(23.469502,54.000684),(23.464128,53.996757),(23.45927,53.992313),(23.45865,53.981616),(23.462888,53.972521),(23.470949,53.965286),(23.481595,53.960118),(23.487486,53.955622),(23.49038,53.95061),(23.48976,53.945132),(23.485625,53.939293),(23.486866,53.909992),(23.497201,53.885549),(23.51043,53.862502),(23.520662,53.837335),(23.52986,53.78416),(23.540402,53.763593),(23.56469,53.742457),(23.56469,53.742405),(23.564794,53.742405),(23.567068,53.681014),(23.590942,53.611251),(23.675795,53.455705),(23.722924,53.397104),(23.742974,53.365478),(23.782972,53.270936),(23.800645,53.242462),(23.818628,53.227967),(23.828447,53.213833),(23.836198,53.199286),(23.848084,53.183809),(23.865964,53.172001),(23.883121,53.163991),(23.893663,53.151951),(23.891389,53.127714),(23.882397,53.113297),(23.870305,53.101256),(23.860693,53.087484),(23.859349,53.067976),(23.867928,53.051027),(23.89821,53.02754),(23.909682,53.012734),(23.911336,53.00506),(23.908959,52.993046),(23.909062,52.986664),(23.917537,52.95881),(23.91795,52.9508),(23.914953,52.944625),(23.903894,52.931137),(23.901104,52.923257),(23.902034,52.912534),(23.905445,52.906539),(23.909476,52.901501),(23.912059,52.893853),(23.920426,52.772625),(23.922498,52.742596),(23.908752,52.699859),(23.868961,52.670042),(23.736153,52.614903),(23.569031,52.585887),(23.480458,52.554416),(23.392298,52.509638),(23.270548,52.395123),(23.230447,52.365074),(23.21205,52.347504),(23.165645,52.289393),(23.168746,52.288928),(23.176099,52.285136),(23.183525,52.281306),(23.19448,52.271462),(23.197684,52.25831),(23.189726,52.240533),(23.212257,52.231671),(23.284191,52.219734),(23.29959,52.223428),(23.312716,52.215289),(23.374831,52.200949),(23.395812,52.19958),(23.395812,52.193379),(23.388474,52.184154),(23.391368,52.182501),(23.405734,52.185911),(23.418239,52.182501),(23.427231,52.17679),(23.43674,52.175679),(23.450485,52.185911),(23.454413,52.181467),(23.464335,52.176351),(23.470949,52.171623),(23.487693,52.181622),(23.491517,52.174103),(23.488726,52.16214),(23.484695,52.158626),(23.512497,52.124442),(23.531928,52.120644),(23.579366,52.121548),(23.598177,52.11452),(23.604791,52.106769),(23.609856,52.09863),(23.61585,52.0923),(23.625255,52.089716),(23.637451,52.084471),(23.641482,52.072921),(23.642515,52.061397),(23.650783,52.048943),(23.664943,52.011168),(23.676415,51.994088),(23.660705,51.98688),(23.647579,51.97409),(23.628666,51.946339),(23.622155,51.927943),(23.621431,51.895567),(23.61492,51.88425),(23.618847,51.883268),(23.620604,51.883217),(23.621328,51.882028),(23.621845,51.877429),(23.609856,51.873269),(23.605721,51.851591),(23.594559,51.843297),(23.610269,51.825184),(23.628666,51.809759),(23.617504,51.786504),(23.59828,51.77467),(23.577299,51.766686),(23.56035,51.754542),(23.556319,51.747359),(23.552288,51.736636),(23.546604,51.713589),(23.550221,51.708421),(23.556939,51.701393),(23.559213,51.695166),(23.550014,51.692427),(23.546087,51.689637),(23.549291,51.683203),(23.555389,51.676304),(23.56035,51.671963),(23.547534,51.662067),(23.541436,51.659742),(23.532444,51.658967),(23.532444,51.6515),(23.543813,51.6438),(23.545157,51.63411),(23.539886,51.607109),(23.5434,51.592743),(23.552081,51.578817),(23.573992,51.555304),(23.567171,51.55489),(23.56035,51.555304),(23.572752,51.539672),(23.588668,51.535899),(23.602311,51.530783),(23.606238,51.517399),(23.608099,51.511224),(23.614817,51.49722),(23.630526,51.490424),(23.648613,51.486212),(23.662772,51.480192),(23.647166,51.460193),(23.648716,51.453966),(23.689437,51.416423),(23.697602,51.404435),(23.686027,51.40105),(23.678895,51.394073),(23.677655,51.38379),(23.683856,51.370276),(23.665563,51.365806),(23.647786,51.353998),(23.63404,51.339296),(23.628666,51.325964),(23.635177,51.304699),(23.650887,51.299609),(23.670214,51.299376),(23.687267,51.2924),(23.742664,51.216255),(23.765195,51.199021),(23.816045,51.178789),(23.863587,51.148274),(23.874749,51.13613),(23.858213,51.13073),(23.854492,51.121532),(23.869271,51.10174),(23.895523,51.076108),(23.904205,51.062724),(23.915987,51.020866),(23.915987,51.014665),(23.911749,51.00681),(23.919087,51.002728),(23.9318,50.999472),(23.943995,50.994201),(23.955054,50.983556),(23.957845,50.975339),(23.958878,50.966348),(23.964356,50.953222),(23.979342,50.937512),(24.046935,50.898031),(24.130237,50.868937),(24.143156,50.856432),(24.130857,50.839069),(24.100472,50.834986),(24.067295,50.834831),(24.046935,50.829095),(24.020477,50.838552),(23.992881,50.836226),(23.969937,50.825168),(23.957638,50.808011),(23.959498,50.788891),(23.974278,50.776178),(23.997946,50.769202),(24.025851,50.767032),(24.025851,50.76083),(24.012828,50.743312),(24.026884,50.728016),(24.05417,50.717164),(24.081041,50.712978),(24.074943,50.690189),(24.082798,50.669156),(24.108165,50.630287),(24.10843,50.629882),(24.085279,50.604406),(24.095407,50.556864),(24.102539,50.543634),(24.107706,50.540844),(24.106466,50.538622),(24.09396,50.52715),(24.075047,50.514282),(24.010658,50.492785),(24.007867,50.480744),(24.009418,50.461469),(24.007764,50.448498),(24.003217,50.437698),(23.981306,50.40478),(23.928699,50.390827),(23.747522,50.38938),(23.713002,50.382404),(23.695742,50.376771),(23.682203,50.368245),(23.671247,50.353568),(23.658677,50.327005),(23.658018,50.325611),(23.644169,50.312692),(23.565311,50.257812),(23.536372,50.242826),(23.536268,50.242826),(23.536165,50.242774),(23.536062,50.242774),(23.481595,50.215954),(23.436429,50.193475),(23.207916,50.03395),(23.177841,50.003977),(23.141254,49.985477),(23.101463,49.957107),(22.993046,49.854426),(22.951188,49.826624),(22.945917,49.818356),(22.937752,49.798202),(22.933101,49.79107),(22.924419,49.785438),(22.906746,49.7812),(22.897961,49.777428),(22.888246,49.769728),(22.826648,49.697381),(22.809801,49.686322),(22.798846,49.683273),(22.777348,49.680483),(22.766186,49.67423),(22.758951,49.6656),(22.741692,49.633664),(22.665831,49.567363),(22.640922,49.528761),(22.660146,49.493001),(22.666864,49.478376),(22.673065,49.435847),(22.676786,49.424478),(22.679576,49.418948),(22.692599,49.405513),(22.7142,49.39063),(22.719781,49.382982),(22.724225,49.367065),(22.737764,49.275391),(22.73394,49.26087),(22.717094,49.230433),(22.702934,49.195034),(22.687121,49.173382),(22.681747,49.161238),(22.687845,49.155915),(22.692496,49.157931),(22.705725,49.168835),(22.721434,49.1616),(22.720194,49.161186),(22.71637,49.160566),(22.748823,49.14558),(22.778072,49.12031),(22.796469,49.11137),(22.841324,49.094886),(22.853416,49.084757),(22.853519,49.076282),(22.844424,49.056697),(22.843184,49.043106),(22.847525,49.033701),(22.863751,49.015356),(22.865014,49.013237),(22.866955,49.009981),(22.855276,48.994013),(22.835019,48.999749),(22.812902,49.012875),(22.795022,49.019025),(22.783963,49.02135),(22.765463,49.038403),(22.755334,49.044708),(22.744482,49.045535),(22.721951,49.041039),(22.685778,49.042796),(22.664384,49.041452),(22.642886,49.043157),(22.618288,49.054216),(22.580771,49.08145),(22.560721,49.085532),(22.539637,49.0722),(22.505013,49.083413),(22.426775,49.085635),(22.390085,49.093025),(22.339442,49.12646),(22.318151,49.131989),(22.262858,49.130594),(22.215936,49.139999),(22.208494,49.144185),(22.20622,49.150489),(22.209011,49.156949),(22.208908,49.163977),(22.197952,49.171987),(22.189684,49.17302),(22.165706,49.171108),(22.155681,49.171522),(22.144105,49.174881),(22.111549,49.188627),(22.040752,49.197463),(22.012434,49.211054),(22.005819,49.242887),(21.99321,49.278182),(21.964478,49.308568),(21.928408,49.330788),(21.874561,49.348358),(21.837871,49.370424),(21.819577,49.377246),(21.799423,49.374817),(21.782164,49.364482),(21.768004,49.353474),(21.757566,49.348927),(21.742166,49.357092),(21.708576,49.390888),(21.69173,49.402154),(21.681808,49.404066),(21.666305,49.401792),(21.65876,49.402464),(21.648632,49.407063),(21.630028,49.418897),(21.6199,49.423341),(21.601193,49.426493),(21.529569,49.421222),(21.514422,49.417213),(21.496186,49.412386),(21.48151,49.415228),(21.444406,49.409905),(21.42787,49.409802),(21.330408,49.427785),(21.274391,49.447267),(21.260542,49.449438),(21.242455,49.441273),(21.211242,49.411094),(21.194086,49.400603),(21.172588,49.398278),(21.157292,49.405151),(21.143029,49.415538),(21.124943,49.423651),(21.10944,49.424581),(21.068822,49.419207),(21.053526,49.414453),(21.033269,49.399673),(21.045464,49.390578),(21.068512,49.381431),(21.080708,49.366342),(21.072543,49.357195),(21.054043,49.354766),(21.032959,49.354611),(21.017249,49.352441),(20.996682,49.339367),(20.964022,49.308103),(20.942422,49.295855),(20.91896,49.290326),(20.900564,49.2926),(20.884337,49.300299),(20.868007,49.31141),(20.849301,49.320505),(20.833591,49.322055),(20.816538,49.321383),(20.79411,49.323657),(20.778297,49.331202),(20.689517,49.4005),(20.673911,49.402309),(20.636084,49.39833),(20.614483,49.400448),(20.605284,49.400035),(20.595053,49.396263),(20.579136,49.383395),(20.567664,49.376367),(20.543996,49.370838),(20.522085,49.374352),(20.437543,49.402515),(20.421936,49.40019),(20.422143,49.382982),(20.370467,49.38169),(20.329539,49.391767),(20.317653,49.391612),(20.307422,49.386599),(20.303701,49.380398),(20.301634,49.371199),(20.296466,49.356937),(20.289335,49.343087),(20.284374,49.338643),(20.207169,49.334199),(20.191976,49.328618),(20.170169,49.311617),(20.16035,49.305622),(20.138336,49.307327),(20.135856,49.308878),(20.130171,49.303917),(20.111051,49.275856),(20.105367,49.263971),(20.098442,49.25286),(20.08604,49.243042),(20.080355,49.208109),(20.07002,49.183097),(20.050486,49.173227),(20.01731,49.183872),(19.965737,49.215653),(19.937935,49.22511),(19.905896,49.222785),(19.887809,49.214),(19.868292,49.200788),(19.854219,49.191262),(19.831998,49.185888),(19.785903,49.188162),(19.760685,49.194208),(19.747766,49.205887),(19.747787,49.205956),(19.751797,49.219064),(19.789624,49.259475),(19.794068,49.261852),(19.800476,49.263041),(19.806263,49.265263),(19.808641,49.270895),(19.80678,49.275236),(19.806415,49.275488),(19.798822,49.280714),(19.798563,49.281081),(19.796962,49.28335),(19.79686,49.283399),(19.783216,49.290016),(19.779702,49.293375),(19.779713,49.293453),(19.780322,49.297612),(19.78797,49.305105),(19.78952,49.309188),(19.783629,49.357557),(19.778565,49.374197),(19.769263,49.39311),(19.769056,49.393213),(19.760065,49.397658),(19.726578,49.388873),(19.706321,49.387529),(19.684514,49.389079),(19.627044,49.401868),(19.627097,49.402165),(19.62922,49.413936),(19.6286,49.429594),(19.63015,49.43502),(19.634801,49.441324),(19.594804,49.441583),(19.573926,49.445252),(19.55677,49.453882),(19.551602,49.461013),(19.535479,49.492846),(19.517289,49.543282),(19.505197,49.563384),(19.481735,49.573513),(19.474191,49.578732),(19.457344,49.598059),(19.44889,49.600313),(19.443392,49.60178),(19.437604,49.600126),(19.43378,49.595165),(19.347067,49.532998),(19.339522,49.528761),(19.325363,49.52504),(19.315027,49.523955),(19.284228,49.524162),(19.265005,49.521475),(19.248675,49.516255),(19.234102,49.507212),(19.220459,49.493001),(19.20444,49.460548),(19.206197,49.459411),(19.209401,49.456414),(19.211364,49.45166),(19.208987,49.444993),(19.204543,49.442823),(19.192244,49.442616),(19.18935,49.442203),(19.182322,49.422721),(19.179738,49.410267),(19.172504,49.402257),(19.141705,49.394195),(19.11659,49.39094),(19.106255,49.391405),(19.096643,49.394609),(19.076799,49.404066),(19.067601,49.406133),(19.045793,49.402774),(19.007139,49.388098),(18.981818,49.386806),(18.962284,49.389183),(18.956703,49.400448),(18.960837,49.433315),(18.958253,49.448146),(18.953396,49.461685),(18.952362,49.475948),(18.961147,49.492794),(18.932208,49.504318),(18.833196,49.510261),(18.837434,49.526952),(18.83454,49.547623),(18.820174,49.590256),(18.81573,49.599299),(18.803947,49.616766),(18.799297,49.626378),(18.792579,49.660794),(18.788444,49.668597),(18.773458,49.675832),(18.757852,49.674075),(18.742246,49.669683),(18.727673,49.668907),(18.715064,49.673817),(18.695427,49.688854),(18.682404,49.695779),(18.668142,49.69857),(18.637343,49.700327),(18.62401,49.706373),(18.617706,49.713866),(18.60768,49.74296),(18.584116,49.774379),(18.566753,49.804765),(18.566339,49.831585),(18.593831,49.852204),(18.567269,49.861454),(18.562929,49.873701),(18.565409,49.889049),(18.559208,49.907187),(18.544428,49.912975),(18.505051,49.896697),(18.481797,49.896645),(18.407486,49.923155),(18.368832,49.932044),(18.328524,49.92884),(18.330695,49.92884),(18.332452,49.928271),(18.333795,49.927135),(18.334932,49.925429),(18.306923,49.909668),(18.292454,49.907808),(18.27261,49.918298),(18.267029,49.925067),(18.260105,49.94057),(18.255867,49.946048),(18.243982,49.951732),(18.22052,49.954885),(18.208738,49.958295),(18.177216,49.975814),(18.162023,49.98124),(18.098151,49.989043),(18.085128,49.998758),(18.091639,50.017207),(18.033245,50.041805),(18.019074,50.044087),(18.002446,50.046765),(18.00689,50.024131),(18.012161,50.022684),(18.020119,50.024286),(18.028698,50.024131),(18.035726,50.017207),(18.037483,50.007233),(18.032418,50.00284),(17.999862,49.996588),(17.959761,49.995812),(17.941571,49.992764),(17.912116,49.975814),(17.875735,49.968682),(17.839355,49.973643),(17.774553,50.015191),(17.763287,50.025216),(17.755433,50.037154),(17.749852,50.049504),(17.74303,50.060563),(17.731971,50.06909),(17.722566,50.075136),(17.719466,50.080872),(17.72267,50.08635),(17.731971,50.091466),(17.732385,50.092189),(17.732592,50.092964),(17.732385,50.093894),(17.731971,50.094876),(17.717915,50.096788),(17.690734,50.10547),(17.677608,50.107744),(17.666963,50.106142),(17.658488,50.102989),(17.648359,50.101801),(17.632753,50.106348),(17.584177,50.145881),(17.58211,50.153167),(17.589448,50.163244),(17.600403,50.16681),(17.648669,50.167998),(17.675334,50.174716),(17.717915,50.191098),(17.738173,50.202363),(17.747578,50.217504),(17.731971,50.236005),(17.721429,50.242722),(17.719156,50.252799),(17.721119,50.261946),(17.731971,50.280653),(17.734245,50.283805),(17.734969,50.286802),(17.734452,50.28949),(17.731971,50.291763),(17.713575,50.30768),(17.707994,50.311039),(17.691044,50.315069),(17.684533,50.312382),(17.681949,50.305561),(17.676368,50.297396),(17.646705,50.271093),(17.629549,50.262101),(17.606398,50.258225),(17.516998,50.268354),(17.469352,50.265563),(17.44,50.242722),(17.434832,50.2405),(17.429561,50.239777),(17.424187,50.240552),(17.419122,50.242722),(17.409821,50.261326),(17.388013,50.272643),(17.365896,50.271558),(17.355044,50.253264),(17.341711,50.259724),(17.334786,50.270008),(17.332823,50.282668),(17.334063,50.295691),(17.329515,50.298223),(17.325381,50.301117),(17.321867,50.304476),(17.319077,50.308248),(17.337474,50.313002),(17.316803,50.318635),(17.269881,50.317757),(17.24611,50.322149),(17.210866,50.336412),(17.201048,50.343233),(17.195053,50.351915),(17.188852,50.364834),(17.185442,50.375686),(17.187612,50.378476),(17.175933,50.38075),(17.145444,50.376719),(17.131698,50.376823),(17.118882,50.381164),(17.095628,50.393669),(17.084672,50.397958),(16.98194,50.416355),(16.958789,50.414598),(16.944005,50.420267),(16.915794,50.431083),(16.892953,50.432943),(16.865771,50.422401),(16.865874,50.408449),(16.897914,50.378218),(16.909283,50.359925),(16.916724,50.338634),(16.926543,50.319255),(16.945249,50.306905),(16.969641,50.297758),(16.987831,50.284942),(16.998373,50.26701),(16.99982,50.242722),(17.012842,50.231664),(17.014806,50.218486),(17.008398,50.20996),(16.996306,50.212905),(16.98566,50.223137),(16.98101,50.229183),(16.975015,50.231819),(16.960339,50.231974),(16.957548,50.229235),(16.957755,50.217143),(16.955275,50.213474),(16.946283,50.21306),(16.927783,50.217298),(16.918998,50.217091),(16.907009,50.211768),(16.890369,50.196937),(16.880964,50.191563),(16.869762,50.189729),(16.857606,50.187739),(16.837556,50.188617),(16.817712,50.186757),(16.795284,50.174406),(16.777301,50.15694),(16.766449,50.1434),(16.754253,50.13229),(16.732033,50.121955),(16.701233,50.094928),(16.660616,50.093016),(16.618654,50.10702),(16.584238,50.127432),(16.566668,50.142212),(16.557263,50.154718),(16.545894,50.188824),(16.535042,50.207738),(16.50476,50.227995),(16.492047,50.242722),(16.477578,50.255332),(16.452153,50.284994),(16.437787,50.297965),(16.415566,50.307938),(16.371021,50.318377),(16.353244,50.333518),(16.35066,50.342251),(16.351487,50.351346),(16.350764,50.360648),(16.343736,50.36995),(16.334227,50.371862),(16.288649,50.371862),(16.27697,50.369433),(16.269839,50.365454),(16.2625,50.36442),(16.249685,50.371035),(16.24493,50.376823),(16.232011,50.402609),(16.199559,50.406278),(16.190153,50.424158),(16.198008,50.440023),(16.217955,50.437129),(16.216095,50.440178),(16.211237,50.451289),(16.217335,50.45165),(16.226534,50.455371),(16.232011,50.456766),(16.247411,50.464983),(16.264981,50.471649),(16.279967,50.479866),(16.287719,50.492785),(16.303428,50.49604),(16.335468,50.490356),(16.352624,50.492785),(16.362029,50.501208),(16.382596,50.514179),(16.391175,50.521827),(16.388384,50.521258),(16.388281,50.52715),(16.389624,50.534849),(16.391175,50.539914),(16.395516,50.545701),(16.398306,50.548492),(16.398306,50.551799),(16.394482,50.559344),(16.425901,50.567561),(16.416806,50.586629),(16.331644,50.644042),(16.300948,50.6551),(16.268288,50.660423),(16.232011,50.660888),(16.219092,50.659131),(16.211754,50.649106),(16.204519,50.636342),(16.192324,50.626575),(16.175477,50.624095),(16.160284,50.628642),(16.128658,50.644042),(16.086491,50.64678),(16.024479,50.608592),(15.982001,50.603631),(15.979934,50.606628),(15.97921,50.60978),(15.980037,50.612984),(15.982001,50.61624),(15.996367,50.623681),(15.998641,50.635567),(15.993163,50.649364),(15.984481,50.662904),(15.971459,50.678613),(15.958023,50.686881),(15.941486,50.68838),(15.882265,50.674221),(15.854567,50.673704),(15.848159,50.675151),(15.797619,50.729773),(15.794415,50.735871),(15.792245,50.742692),(15.76744,50.744191),(15.684345,50.731426),(15.673803,50.733545),(15.666464,50.738093),(15.653235,50.75096),(15.641866,50.755766),(15.441775,50.800208),(15.400124,50.797986),(15.390822,50.790648),(15.381314,50.780002),(15.370255,50.772613),(15.368579,50.772949),(15.356096,50.775455),(15.349688,50.783723),(15.350515,50.793232),(15.353305,50.803257),(15.352995,50.812972),(15.341006,50.83173),(15.325813,50.839689),(15.307727,50.844753),(15.28778,50.854881),(15.277134,50.865734),(15.265352,50.88227),(15.25605,50.899892),(15.253053,50.914103),(15.260081,50.932499),(15.268763,50.94299),(15.269796,50.952653),(15.253776,50.969035),(15.227111,50.977406),(15.170164,50.977975),(15.160759,50.992651),(15.156108,51.007844),(15.144429,51.011564),(15.13151,51.005828),(15.122518,50.992754),(15.122518,50.992651),(15.119211,50.982471),(15.107946,50.981024),(15.09389,50.985416),(15.082107,50.992754),(15.073632,51.002624),(15.02299,51.009652),(15.003973,51.020685),(15.001182,51.012443),(14.996531,51.007844),(14.982062,51.001177),(14.976377,51.000402),(14.970693,50.998697),(14.965629,50.996062),(14.961081,50.992651),(14.960978,50.992651),(14.965215,50.981334),(14.981442,50.973221),(14.996635,50.959216),(14.997771,50.930174),(14.994671,50.92511),(14.984852,50.918082),(14.982062,50.914671),(14.981132,50.90909),(14.981752,50.905266),(14.982889,50.902424),(14.984129,50.867697),(14.982062,50.859067),(14.867857,50.86439),(14.831683,50.857982),(14.810393,50.858447),(14.810496,50.877051),(14.824655,50.89183),(14.860209,50.916842),(14.910645,50.992651),(14.955293,51.064042),(14.958291,51.075514),(14.958497,51.094738),(14.960254,51.104582),(14.965629,51.111507),(14.97338,51.116132),(14.979995,51.122798),(14.982062,51.13564),(14.983199,51.160909),(14.991364,51.18897),(15.004903,51.215609),(15.022059,51.23677),(15.017925,51.239561),(15.014308,51.242661),(15.019476,51.271678),(15.004903,51.291289),(14.982269,51.308006),(14.963768,51.328393),(14.960978,51.335291),(14.956637,51.353223),(14.956637,51.354153),(14.950648,51.396539),(14.946922,51.422909),(14.955397,51.435415),(14.945061,51.449186),(14.926561,51.46133),(14.910955,51.468978),(14.888321,51.475748),(14.841399,51.48443),(14.818558,51.492595),(14.818558,51.492698),(14.797474,51.502103),(14.732155,51.515823),(14.710037,51.530241),(14.70677,51.540828),(14.704559,51.547992),(14.712724,51.567422),(14.732155,51.58662),(14.743937,51.606644),(14.742283,51.632974),(14.732465,51.658347),(14.719546,51.675632),(14.67097,51.700773),(14.648439,51.717206),(14.638103,51.742631),(14.634176,51.769012),(14.620327,51.780536),(14.60224,51.788313),(14.585807,51.803893),(14.58281,51.825081),(14.595936,51.842418),(14.653296,51.878617),(14.671693,51.893888),(14.687093,51.911897),(14.695568,51.931457),(14.699082,51.992512),(14.704456,52.002227),(14.726057,52.026438),(14.730294,52.035895),(14.732155,52.045067),(14.735359,52.054033),(14.743007,52.062534),(14.761403,52.076667),(14.696394,52.106691),(14.686369,52.121032),(14.692467,52.146973),(14.703216,52.165163),(14.70704,52.179452),(14.69257,52.193379),(14.69257,52.19958),(14.712104,52.215444),(14.712414,52.235908),(14.696911,52.253478),(14.668903,52.260997),(14.640481,52.265054),(14.606581,52.275751),(14.584153,52.291228),(14.590148,52.309418),(14.569167,52.338512),(14.545396,52.382153),(14.539815,52.421866),(14.591595,52.449797),(14.615779,52.473284),(14.632316,52.496745),(14.627665,52.507416),(14.609061,52.517803),(14.616813,52.541032),(14.644821,52.576921),(14.613712,52.592527),(14.607965,52.596463),(14.549943,52.636194),(14.490102,52.650638),(14.46137,52.674564),(14.442353,52.679964),(14.431915,52.686088),(14.397705,52.727119),(14.382202,52.738152),(14.275955,52.78572),(14.24867,52.794582),(14.21601,52.817992),(14.19596,52.823366),(14.173739,52.824348),(14.152758,52.828327),(14.135395,52.836595),(14.123923,52.850651),(14.150485,52.86463),(14.16082,52.876748),(14.164954,52.895661),(14.16268,52.908167),(14.150485,52.943643),(14.14449,52.953694),(14.14449,52.959921),(14.192859,52.981651),(14.253734,53.000875),(14.312645,53.029219),(14.343341,53.048624),(14.356777,53.066684),(14.359568,53.075056),(14.38954,53.131668),(14.387473,53.146137),(14.381478,53.160296),(14.377861,53.176549),(14.380651,53.189855),(14.387783,53.202077),(14.397705,53.210991),(14.408247,53.214402),(14.415585,53.22099),(14.44163,53.251841),(14.428607,53.259076),(14.42468,53.264657),(14.409384,53.272434),(14.403286,53.27879),(14.400185,53.288609),(14.399565,53.306747),(14.398015,53.315222),(14.391261,53.334017),(14.370316,53.392298),(14.359878,53.444077),(14.338897,53.465213),(14.328458,53.48609),(14.30417,53.508518),(14.296936,53.529137),(14.296212,53.551306),(14.298899,53.587893),(14.297039,53.597763),(14.276058,53.636624),(14.260969,53.656209),(14.265103,53.671764),(14.263863,53.699876),(14.263901,53.699976),(14.263927,53.699978),(14.273692,53.700629),(14.291677,53.705268),(14.304861,53.712551),(14.306163,53.720689),(14.288585,53.727973),(14.29835,53.731431),(14.301606,53.734849),(14.29835,53.738267),(14.288585,53.741645),(14.2942,53.749091),(14.304047,53.743883),(14.318044,53.739732),(14.330414,53.734198),(14.342052,53.714911),(14.356212,53.708441),(14.383556,53.700629),(14.403575,53.687812),(14.414561,53.682359),(14.458669,53.677883),(14.51238,53.666449),(14.531016,53.657782),(14.546235,53.644761),(14.579112,53.607245),(14.590587,53.598375),(14.595876,53.601304),(14.597016,53.617336),(14.601573,53.626654),(14.610037,53.632758),(14.62379,53.639228),(14.623057,53.643012),(14.622813,53.646959),(14.62379,53.652818),(14.613048,53.65469),(14.587413,53.656073),(14.575938,53.659654),(14.544932,53.704047),(14.551443,53.726142),(14.575938,53.769517),(14.587413,53.763495),(14.597341,53.765204),(14.608246,53.769029),(14.62379,53.769517),(14.61671,53.794745),(14.620372,53.814846),(14.627289,53.832709),(14.630626,53.851508),(14.62379,53.851508),(14.621349,53.839545),(14.613536,53.83161),(14.58961,53.817328),(14.595876,53.810492),(14.587087,53.812649),(14.580089,53.815334),(14.574474,53.819078),(14.569102,53.824164),(14.574229,53.827094),(14.583263,53.834215),(14.58961,53.837836),(14.575857,53.854804),(14.552094,53.862779),(14.441173,53.869615),(14.425548,53.879828),(14.438162,53.899319),(14.434906,53.901313),(14.434093,53.901597),(14.433767,53.902411),(14.431895,53.906155),(14.422048,53.896145),(14.414236,53.894721),(14.405772,53.897406),(14.393809,53.899319),(14.385102,53.897284),(14.378266,53.89232),(14.371593,53.885891),(14.363048,53.879381),(14.392914,53.875963),(14.40919,53.871568),(14.417654,53.865139),(14.415701,53.853013),(14.405284,53.844184),(14.392589,53.840725),(14.383556,53.844672),(14.356212,53.834459),(14.342621,53.831855),(14.328298,53.831),(14.328298,53.824164),(14.342052,53.82099),(14.341319,53.818915),(14.328298,53.817328),(14.318858,53.818183),(14.303071,53.823065),(14.291352,53.824164),(14.274669,53.830797),(14.226573,53.871975),(14.203136,53.878323),(14.200857,53.87816),(14.200819,53.878157),(14.192756,53.893766),(14.175289,53.906478),(14.184798,53.908132),(14.193066,53.911491),(14.210076,53.938457),(14.226573,53.934027),(14.237478,53.928656),(14.268077,53.92182),(14.367035,53.916978),(14.406749,53.92182),(14.445567,53.934027),(14.517345,53.965237),(14.781912,54.034613),(15.010102,54.06981),(15.288341,54.138861),(15.468516,54.167141),(15.665782,54.198432),(15.859711,54.249986),(16.020844,54.261786),(16.131521,54.283515),(16.118907,54.276028),(16.069347,54.263007),(16.091075,54.253974),(16.17921,54.263007),(16.17921,54.269192),(16.172374,54.269192),(16.172374,54.276597),(16.220063,54.276597),(16.219574,54.28148),(16.218516,54.282375),(16.216645,54.28205),(16.213227,54.283515),(16.21518,54.299628),(16.192149,54.300279),(16.137706,54.290269),(16.17213,54.300238),(16.213552,54.316107),(16.275401,54.358588),(16.262869,54.343695),(16.240489,54.330024),(16.231781,54.322577),(16.240896,54.32453),(16.259044,54.326728),(16.274913,54.330471),(16.288829,54.340237),(16.323904,54.349921),(16.336762,54.358588),(16.32488,54.373114),(16.305024,54.373481),(16.296235,54.367255),(16.281586,54.358588),(16.323985,54.401313),(16.439789,54.488267),(16.439789,54.482123),(16.434418,54.472357),(16.444509,54.469875),(16.460623,54.473456),(16.473399,54.482123),(16.479747,54.495551),(16.473888,54.499661),(16.460948,54.496487),(16.446056,54.488267),(16.466563,54.512152),(16.501313,54.532416),(16.569591,54.557196),(16.778494,54.575141),(16.85963,54.59394),(16.902192,54.598131),(16.939952,54.606024),(17.035818,54.66706),(17.337413,54.74901),(17.715668,54.790432),(17.885427,54.824123),(18.152354,54.838324),(18.316905,54.838324),(18.339529,54.833482),(18.375824,54.815131),(18.389171,54.811103),(18.410167,54.808295),(18.75172,54.69009),(18.813975,54.643215),(18.824067,54.632229),(18.834321,54.616685),(18.835297,54.603095),(18.817638,54.598131),(18.813243,54.601549),(18.80836,54.608832),(18.802257,54.616034),(18.784028,54.623521),(18.771821,54.642279),(18.755382,54.654486),(18.707774,54.701239),(18.698497,54.703803),(18.663422,54.707994),(18.654552,54.71015),(18.64503,54.71955),(18.61671,54.725246),(18.556977,54.74901),(18.49822,54.765367),(18.48878,54.773179),(18.456309,54.787665),(18.447765,54.789984),(18.435557,54.786811),(18.42921,54.781684),(18.41505,54.753119),(18.413097,54.746527),(18.413097,54.73192),(18.418468,54.728217),(18.442393,54.721991),(18.447765,54.718248),(18.459809,54.706041),(18.474457,54.687567),(18.473888,54.679918),(18.470063,54.673285),(18.470388,54.666734),(18.481944,54.659613),(18.475922,54.640082),(18.487315,54.631781),(18.506358,54.634101),(18.52296,54.646552),(18.5171,54.62995),(18.525157,54.616685),(18.537608,54.605455),(18.562836,54.560004),(18.570649,54.55036),(18.566742,54.527411),(18.567556,54.48786),(18.574067,54.450385),(18.588064,54.433661),(18.60377,54.430609),(18.634288,54.416938),(18.649913,54.413804),(18.663341,54.412991),(18.680024,54.40998),(18.694347,54.404527),(18.70045,54.395819),(18.717296,54.382025),(18.885916,54.350165),(18.923188,54.348538),(18.954356,54.358588),(18.962901,54.353502),(18.97462,54.349758),(19.002126,54.344916)]
+Paraguay	[(-58.158797,-20.165125),(-58.158332,-20.181144),(-58.152337,-20.184658),(-58.144069,-20.183521),(-58.137041,-20.185588),(-58.12991,-20.192513),(-58.120505,-20.203882),(-58.118541,-20.214424),(-58.155283,-20.226413),(-58.162672,-20.243156),(-58.156316,-20.261656),(-58.137041,-20.274369),(-58.130943,-20.272818),(-58.126241,-20.267031),(-58.120039,-20.261346),(-58.109756,-20.260726),(-58.10309,-20.264447),(-58.09508,-20.272198),(-58.090325,-20.281707),(-58.099937,-20.309199),(-58.097715,-20.334623),(-58.090791,-20.359428),(-58.082987,-20.376171),(-58.067123,-20.393534),(-58.045625,-20.409347),(-58.023146,-20.420716),(-58.004181,-20.42516),(-57.989401,-20.433119),(-57.99214,-20.450895),(-58.007902,-20.479834),(-58.01002,-20.500091),(-58.008935,-20.525723),(-58.004749,-20.549804),(-57.993329,-20.573782),(-57.992554,-20.585047),(-57.993639,-20.606751),(-57.990952,-20.620601),(-57.977826,-20.640134),(-57.973123,-20.651193),(-57.973588,-20.661942),(-57.981082,-20.681165),(-57.980616,-20.692741),(-57.974415,-20.704006),(-57.96501,-20.711034),(-57.95638,-20.709898),(-57.947182,-20.675068),(-57.934004,-20.66742),(-57.918088,-20.669797),(-57.90429,-20.678995),(-57.900208,-20.685196),(-57.894472,-20.699976),(-57.890648,-20.706384),(-57.884343,-20.711965),(-57.868944,-20.722197),(-57.86021,-20.730258),(-57.857678,-20.73987),(-57.865275,-20.747415),(-57.877005,-20.752376),(-57.898761,-20.756613),(-57.906667,-20.762194),(-57.917933,-20.77408),(-57.933074,-20.784622),(-57.940412,-20.793613),(-57.933953,-20.799711),(-57.908011,-20.801985),(-57.887651,-20.805912),(-57.870701,-20.816454),(-57.859642,-20.831647),(-57.85711,-20.849734),(-57.867393,-20.860069),(-57.908683,-20.881567),(-57.917933,-20.894382),(-57.914832,-20.905648),(-57.908011,-20.910505),(-57.901138,-20.912366),(-57.898089,-20.914846),(-57.893025,-20.914846),(-57.869925,-20.932726),(-57.847033,-20.955981),(-57.840315,-20.955981),(-57.836026,-20.938514),(-57.817577,-20.953604),(-57.816027,-20.975411),(-57.82538,-20.998562),(-57.852459,-21.037836),(-57.851735,-21.051996),(-57.836026,-21.082485),(-57.829876,-21.12703),(-57.833959,-21.173849),(-57.84786,-21.216223),(-57.870701,-21.247643),(-57.899019,-21.267176),(-57.90429,-21.274928),(-57.90491,-21.287433),(-57.89995,-21.295081),(-57.893645,-21.300352),(-57.890648,-21.305934),(-57.882328,-21.316372),(-57.866308,-21.32092),(-57.855559,-21.330738),(-57.863311,-21.356886),(-57.929922,-21.453108),(-57.94527,-21.487214),(-57.949145,-21.508298),(-57.948112,-21.530519),(-57.939792,-21.548193),(-57.921602,-21.555427),(-57.912093,-21.564006),(-57.919328,-21.583953),(-57.932144,-21.60669),(-57.939017,-21.623744),(-57.934831,-21.640693),(-57.924341,-21.658677),(-57.911783,-21.673043),(-57.901138,-21.678934),(-57.895609,-21.688442),(-57.939017,-21.755312),(-57.938448,-21.774639),(-57.934779,-21.792932),(-57.93571,-21.812053),(-57.948939,-21.83386),(-57.955915,-21.85112),(-57.946665,-21.865486),(-57.932764,-21.881919),(-57.925374,-21.904967),(-57.929922,-21.917369),(-57.953228,-21.958193),(-57.962633,-21.966978),(-57.964855,-21.976694),(-57.986818,-22.035295),(-57.988368,-22.049041),(-57.988006,-22.06413),(-57.986249,-22.074465),(-57.973134,-22.081048),(-57.972865,-22.081183),(-57.961393,-22.090072),(-57.952453,-22.105988),(-57.939999,-22.11839),(-57.906254,-22.128932),(-57.895505,-22.128932),(-57.878194,-22.122111),(-57.871372,-22.121181),(-57.862846,-22.125832),(-57.848686,-22.140301),(-57.843881,-22.143712),(-57.831788,-22.141128),(-57.815769,-22.128312),(-57.805485,-22.128622),(-57.795305,-22.130999),(-57.787502,-22.129656),(-57.775409,-22.123971),(-57.777786,-22.122318),(-57.777425,-22.117047),(-57.775616,-22.111156),(-57.773652,-22.107745),(-57.769932,-22.107435),(-57.760268,-22.110742),(-57.756186,-22.110639),(-57.736342,-22.103714),(-57.723268,-22.104748),(-57.709935,-22.108469),(-57.689626,-22.109295),(-57.678516,-22.106401),(-57.670816,-22.102371),(-57.663685,-22.100614),(-57.654486,-22.104541),(-57.638932,-22.144539),(-57.627201,-22.165106),(-57.614075,-22.176991),(-57.596712,-22.181022),(-57.572734,-22.177715),(-57.564001,-22.174408),(-57.55997,-22.171617),(-57.554699,-22.170274),(-57.542297,-22.171514),(-57.534597,-22.174408),(-57.511188,-22.188774),(-57.472482,-22.180299),(-57.463955,-22.180402),(-57.443182,-22.187947),(-57.432278,-22.18867),(-57.41786,-22.193838),(-57.384994,-22.213268),(-57.378638,-22.213372),(-57.37502,-22.207274),(-57.366649,-22.209134),(-57.351249,-22.217196),(-57.339932,-22.216989),(-57.334816,-22.211718),(-57.333059,-22.205414),(-57.331767,-22.202416),(-57.316316,-22.203657),(-57.271667,-22.213785),(-57.252444,-22.210581),(-57.227484,-22.191254),(-57.21379,-22.188154),(-57.209449,-22.192081),(-57.2064,-22.207481),(-57.199527,-22.212855),(-57.189967,-22.213578),(-57.183611,-22.210891),(-57.177926,-22.207377),(-57.170382,-22.205724),(-57.154155,-22.207997),(-57.124183,-22.218539),(-57.115036,-22.22288),(-57.114623,-22.225051),(-57.113279,-22.229391),(-57.108473,-22.233525),(-57.090748,-22.236419),(-57.085064,-22.238073),(-57.079224,-22.23859),(-57.071628,-22.235696),(-57.059484,-22.232699),(-57.027651,-22.235076),(-57.011167,-22.233836),(-56.986465,-22.24138),(-56.975717,-22.24169),(-56.964554,-22.234869),(-56.965485,-22.250889),(-56.960524,-22.254816),(-56.9521,-22.253576),(-56.942592,-22.253989),(-56.924944,-22.262361),(-56.91479,-22.262878),(-56.90368,-22.236936),(-56.892001,-22.252232),(-56.881717,-22.277244),(-56.879547,-22.289956),(-56.85606,-22.29316),(-56.842856,-22.289026),(-56.84284,-22.28901),(-56.819654,-22.265462),(-56.813142,-22.25616),(-56.811902,-22.249649),(-56.808285,-22.247995),(-56.794565,-22.252542),(-56.786994,-22.251819),(-56.754361,-22.242621),(-56.74679,-22.243964),(-56.745601,-22.248408),(-56.743534,-22.250372),(-56.733199,-22.244067),(-56.728548,-22.237453),(-56.720538,-22.21947),(-56.715371,-22.215439),(-56.698602,-22.2235),(-56.664573,-22.259984),(-56.648811,-22.263498),(-56.644135,-22.255436),(-56.654703,-22.23735),(-56.648346,-22.231355),(-56.637184,-22.228254),(-56.629174,-22.22474),(-56.59574,-22.201486),(-56.584965,-22.190531),(-56.567912,-22.162315),(-56.565302,-22.159938),(-56.558016,-22.156424),(-56.554605,-22.152083),(-56.549076,-22.13627),(-56.545975,-22.130069),(-56.530679,-22.109089),(-56.521636,-22.09989),(-56.5113,-22.091415),(-56.493834,-22.086558),(-56.421797,-22.074465),(-56.407637,-22.075809),(-56.397302,-22.086248),(-56.370844,-22.147329),(-56.347331,-22.180402),(-56.316842,-22.207687),(-56.261083,-22.23859),(-56.231524,-22.265358),(-56.214264,-22.275383),(-56.196798,-22.279311),(-56.024715,-22.287372),(-56.011357,-22.283858),(-55.998567,-22.277244),(-55.985234,-22.283238),(-55.970868,-22.293884),(-55.955262,-22.301325),(-55.89294,-22.306803),(-55.874388,-22.317345),(-55.872011,-22.310213),(-55.86103,-22.289543),(-55.810775,-22.353105),(-55.770157,-22.381423),(-55.760235,-22.391965),(-55.751579,-22.416253),(-55.748298,-22.500899),(-55.74127,-22.537176),(-55.723932,-22.569629),(-55.697913,-22.595571),(-55.664685,-22.612727),(-55.644351,-22.619548),(-55.631199,-22.626783),(-55.62368,-22.638669),(-55.620476,-22.659339),(-55.62151,-22.667091),(-55.627013,-22.683627),(-55.627788,-22.692102),(-55.62567,-22.700784),(-55.619184,-22.716907),(-55.618332,-22.725692),(-55.628589,-22.758971),(-55.645927,-22.78791),(-55.659001,-22.818296),(-55.656572,-22.85571),(-55.6343,-22.932811),(-55.634351,-22.950071),(-55.639984,-22.983764),(-55.637814,-23.000714),(-55.611459,-23.029136),(-55.600684,-23.044535),(-55.595232,-23.064069),(-55.600142,-23.100553),(-55.599392,-23.117089),(-55.588669,-23.130112),(-55.560867,-23.145925),(-55.557147,-23.15471),(-55.535236,-23.229124),(-55.535649,-23.245867),(-55.559007,-23.291342),(-55.562159,-23.307879),(-55.555596,-23.330306),(-55.524875,-23.360485),(-55.513868,-23.379399),(-55.515547,-23.410198),(-55.542471,-23.465802),(-55.539913,-23.500528),(-55.533796,-23.530444),(-55.533066,-23.534015),(-55.533892,-23.569981),(-55.530533,-23.603468),(-55.51131,-23.629409),(-55.466971,-23.673231),(-55.445319,-23.735449),(-55.430178,-23.928564),(-55.420669,-23.954506),(-55.398035,-23.97683),(-55.367184,-23.989646),(-55.304346,-23.99409),(-55.27272,-24.000394),(-55.272668,-24.000498),(-55.272565,-24.000498),(-55.27241,-24.000601),(-55.272358,-24.000601),(-55.23683,-24.012693),(-55.200864,-24.019515),(-55.165439,-24.016827),(-55.131281,-24.000601),(-55.131204,-24.000601),(-55.131075,-24.000601),(-55.131075,-24.000394),(-55.105572,-23.988509),(-55.042294,-23.989026),(-55.011495,-23.980551),(-54.994571,-23.973109),(-54.961059,-23.971766),(-54.943644,-23.969182),(-54.926746,-23.95988),(-54.904887,-23.933008),(-54.891916,-23.920606),(-54.827424,-23.887016),(-54.696838,-23.845158),(-54.679784,-23.836683),(-54.654592,-23.811465),(-54.639218,-23.804437),(-54.612553,-23.811155),(-54.443158,-23.899935),(-54.422901,-23.913785),(-54.367607,-23.984685),(-54.273608,-24.036465),(-54.24575,-24.050393),(-54.245289,-24.050624),(-54.266218,-24.06592),(-54.301048,-24.089898),(-54.324767,-24.118217),(-54.334637,-24.148912),(-54.331847,-24.165036),(-54.318979,-24.196765),(-54.314122,-24.234179),(-54.306267,-24.246684),(-54.282651,-24.275313),(-54.274331,-24.298257),(-54.26105,-24.32947),(-54.262187,-24.358512),(-54.271696,-24.389415),(-54.284098,-24.411325),(-54.322907,-24.464345),(-54.334534,-24.496695),(-54.334792,-24.527287),(-54.320685,-24.595914),(-54.321305,-24.628366),(-54.358429,-24.731422),(-54.371121,-24.766653),(-54.39975,-24.80479),(-54.407294,-24.821223),(-54.453286,-25.002814),(-54.462278,-25.03723),(-54.46419,-25.055937),(-54.463312,-25.072784),(-54.455199,-25.092111),(-54.429722,-25.130558),(-54.426621,-25.149472),(-54.435665,-25.167042),(-54.46941,-25.195464),(-54.48145,-25.21324),(-54.503568,-25.278663),(-54.528476,-25.314319),(-54.547079,-25.336644),(-54.575656,-25.360311),(-54.597981,-25.397518),(-54.609814,-25.432762),(-54.61183,-25.444027),(-54.61245,-25.465525),(-54.608523,-25.487642),(-54.598497,-25.505832),(-54.591469,-25.524746),(-54.594156,-25.54862),(-54.599944,-25.572702),(-54.600203,-25.574945),(-54.602218,-25.592442),(-54.58625,-25.624688),(-54.583356,-25.644842),(-54.598497,-25.653834),(-54.633715,-25.652077),(-54.642887,-25.661585),(-54.643146,-25.68794),(-54.62493,-25.740237),(-54.622062,-25.759977),(-54.617152,-25.773516),(-54.594518,-25.798734),(-54.587904,-25.810827),(-54.589557,-25.832944),(-54.599221,-25.850721),(-54.610073,-25.866534),(-54.61524,-25.882863),(-54.607334,-25.927925),(-54.606404,-25.946632),(-54.61524,-25.961722),(-54.62369,-25.964306),(-54.647952,-25.965649),(-54.656194,-25.969163),(-54.662266,-25.979912),(-54.661594,-25.989937),(-54.658261,-26.000376),(-54.653326,-26.030761),(-54.642526,-26.062801),(-54.643146,-26.085228),(-54.663816,-26.149204),(-54.659941,-26.164397),(-54.641854,-26.184034),(-54.638288,-26.196953),(-54.644696,-26.208218),(-54.656194,-26.222998),(-54.664333,-26.236227),(-54.664974,-26.238863),(-54.666142,-26.243668),(-54.663661,-26.263305),(-54.663661,-26.308367),(-54.679061,-26.33989),(-54.68043,-26.345264),(-54.683402,-26.350845),(-54.693065,-26.411927),(-54.697664,-26.428153),(-54.706475,-26.441796),(-54.737171,-26.473215),(-54.765309,-26.494092),(-54.780347,-26.510422),(-54.789829,-26.528509),(-54.78877,-26.542565),(-54.783499,-26.556724),(-54.780347,-26.575224),(-54.781277,-26.598169),(-54.784946,-26.622767),(-54.793059,-26.644987),(-54.807012,-26.661214),(-54.817321,-26.665761),(-54.822825,-26.663281),(-54.827424,-26.658113),(-54.834969,-26.654393),(-54.879359,-26.654393),(-54.903337,-26.65987),(-54.919899,-26.674133),(-54.930725,-26.693977),(-54.943877,-26.739969),(-54.951137,-26.757539),(-54.961007,-26.772318),(-54.97527,-26.787821),(-54.991781,-26.794642),(-55.040744,-26.798466),(-55.060898,-26.805184),(-55.125778,-26.863579),(-55.132677,-26.880632),(-55.118879,-26.920009),(-55.122315,-26.941714),(-55.138361,-26.953702),(-55.161564,-26.95732),(-55.2012,-26.955459),(-55.216651,-26.951222),(-55.235177,-26.94223),(-55.256545,-26.934582),(-55.2806,-26.934272),(-55.329409,-26.958457),(-55.376228,-26.963831),(-55.39633,-26.969309),(-55.414003,-26.979851),(-55.43085,-26.996387),(-55.442761,-27.015508),(-55.448833,-27.035868),(-55.451313,-27.082067),(-55.461855,-27.097983),(-55.486402,-27.10005),(-55.513997,-27.097466),(-55.533841,-27.09943),(-55.545365,-27.115243),(-55.549524,-27.13581),(-55.555338,-27.153794),(-55.571745,-27.161545),(-55.598281,-27.16754),(-55.598979,-27.182629),(-55.574872,-27.223557),(-55.570583,-27.235339),(-55.568671,-27.245984),(-55.570712,-27.256423),(-55.58407,-27.276784),(-55.583243,-27.283501),(-55.580763,-27.291666),(-55.581641,-27.305516),(-55.591331,-27.328357),(-55.60748,-27.345513),(-55.628719,-27.356365),(-55.653627,-27.360086),(-55.681713,-27.379413),(-55.717499,-27.417343),(-55.754732,-27.443698),(-55.815167,-27.41414),(-55.842091,-27.407422),(-55.854157,-27.40122),(-55.862787,-27.391092),(-55.877851,-27.353575),(-55.892837,-27.334868),(-55.913094,-27.32784),(-55.936374,-27.328253),(-55.960662,-27.331561),(-55.966094,-27.331723),(-55.984847,-27.332284),(-56.006887,-27.328253),(-56.006894,-27.328251),(-56.073756,-27.304896),(-56.074246,-27.304811),(-56.098948,-27.300555),(-56.124554,-27.298901),(-56.149979,-27.31182),(-56.168892,-27.324739),(-56.205428,-27.362153),(-56.22801,-27.371248),(-56.256768,-27.378276),(-56.279842,-27.389645),(-56.285319,-27.411349),(-56.281469,-27.438634),(-56.285319,-27.460958),(-56.296998,-27.480905),(-56.31648,-27.500439),(-56.335988,-27.525657),(-56.349657,-27.556353),(-56.367537,-27.580641),(-56.399731,-27.586842),(-56.400299,-27.586636),(-56.431357,-27.57537),(-56.461484,-27.553873),(-56.487323,-27.527208),(-56.50621,-27.500129),(-56.54644,-27.455067),(-56.546933,-27.455003),(-56.613,-27.446386),(-56.638016,-27.452912),(-56.683125,-27.464679),(-56.734233,-27.500439),(-56.771155,-27.506744),(-56.771511,-27.506548),(-56.807458,-27.486797),(-56.869263,-27.431503),(-56.904351,-27.418687),(-56.904447,-27.418696),(-56.94099,-27.422098),(-56.977318,-27.435327),(-57.076227,-27.484006),(-57.10899,-27.490621),(-57.148161,-27.488967),(-57.156687,-27.487727),(-57.180097,-27.487313),(-57.180453,-27.487214),(-57.191207,-27.484213),(-57.200406,-27.478942),(-57.227071,-27.458685),(-57.237096,-27.45424),(-57.237588,-27.45412),(-57.283026,-27.443015),(-57.292493,-27.440701),(-57.302983,-27.435534),(-57.310116,-27.429208),(-57.326289,-27.414863),(-57.335229,-27.409489),(-57.356466,-27.404343),(-57.360396,-27.403391),(-57.386699,-27.403494),(-57.487675,-27.416413),(-57.513358,-27.41414),(-57.519938,-27.412099),(-57.535682,-27.407215),(-57.697791,-27.333524),(-57.698183,-27.333398),(-57.709367,-27.329804),(-57.811583,-27.310683),(-57.811913,-27.310583),(-57.854784,-27.297557),(-57.855088,-27.297499),(-57.899504,-27.288961),(-57.913385,-27.286292),(-57.94403,-27.274613),(-57.944356,-27.274551),(-58.003664,-27.263303),(-58.021958,-27.259834),(-58.022046,-27.259831),(-58.053532,-27.259007),(-58.113993,-27.268929),(-58.128824,-27.269652),(-58.238223,-27.257043),(-58.510765,-27.278437),(-58.600165,-27.312957),(-58.604196,-27.316264),(-58.604135,-27.315548),(-58.599907,-27.266138),(-58.60156,-27.245674),(-58.614014,-27.226657),(-58.638716,-27.210121),(-58.652358,-27.198029),(-58.658404,-27.18511),(-58.653289,-27.156274),(-58.638819,-27.135914),(-58.616133,-27.123821),(-58.56549,-27.115966),(-58.560529,-27.105528),(-58.56239,-27.090128),(-58.562183,-27.072145),(-58.559703,-27.06336),(-58.556395,-27.055505),(-58.551693,-27.048167),(-58.54544,-27.041036),(-58.536259,-27.036294),(-58.536035,-27.036178),(-58.530505,-27.040519),(-58.528025,-27.047754),(-58.528025,-27.051681),(-58.527043,-27.054161),(-58.520032,-27.058368),(-58.519808,-27.058502),(-58.51154,-27.060156),(-58.507561,-27.055092),(-58.506734,-27.038452),(-58.504874,-27.031527),(-58.50136,-27.023672),(-58.492368,-27.00972),(-58.47454,-26.990083),(-58.466633,-26.975923),(-58.481619,-26.963831),(-58.483686,-26.950602),(-58.47547,-26.937993),(-58.459812,-26.928174),(-58.415525,-26.917529),(-58.393873,-26.909674),(-58.384674,-26.897065),(-58.374701,-26.887557),(-58.328916,-26.884146),(-58.31579,-26.874121),(-58.322146,-26.856758),(-58.340388,-26.844459),(-58.352377,-26.830506),(-58.340026,-26.808595),(-58.323335,-26.803841),(-58.305506,-26.809112),(-58.288556,-26.811489),(-58.27481,-26.798363),(-58.278479,-26.790198),(-58.286541,-26.778726),(-58.287936,-26.768598),(-58.2714,-26.764257),(-58.259256,-26.764463),(-58.251763,-26.763223),(-58.247939,-26.758159),(-58.2452,-26.680231),(-58.240652,-26.661214),(-58.235536,-26.649845),(-58.232281,-26.648605),(-58.227165,-26.652015),(-58.195694,-26.657493),(-58.18386,-26.65677),(-58.178641,-26.650672),(-58.181379,-26.641577),(-58.187167,-26.633619),(-58.192076,-26.624627),(-58.192283,-26.612845),(-58.188511,-26.609744),(-58.171509,-26.598582),(-58.164946,-26.592278),(-58.170527,-26.5868),(-58.179312,-26.57264),(-58.18541,-26.564992),(-58.207993,-26.550213),(-58.213367,-26.544529),(-58.217346,-26.527579),(-58.214194,-26.512386),(-58.208716,-26.496883),(-58.205926,-26.479416),(-58.202722,-26.471561),(-58.188666,-26.462053),(-58.18541,-26.451718),(-58.209595,-26.431254),(-58.213057,-26.418645),(-58.206184,-26.402728),(-58.172698,-26.349295),(-58.167633,-26.335032),(-58.164946,-26.318599),(-58.170011,-26.28656),(-58.169959,-26.270333),(-58.161846,-26.263305),(-58.145981,-26.260101),(-58.123295,-26.251523),(-58.105983,-26.239534),(-58.106604,-26.226098),(-58.121228,-26.216693),(-58.137144,-26.209459),(-58.148927,-26.19933),(-58.151304,-26.18145),(-58.141175,-26.184757),(-58.133217,-26.188995),(-58.127636,-26.194679),(-58.124019,-26.201914),(-58.115234,-26.190958),(-58.106293,-26.170288),(-58.096682,-26.136698),(-58.086501,-26.12719),(-58.021596,-26.105692),(-57.988213,-26.088536),(-57.872716,-26.010298),(-57.859694,-25.994278),(-57.85959,-25.980945),(-57.905841,-25.968646),(-57.898244,-25.953557),(-57.863311,-25.927615),(-57.85711,-25.919864),(-57.851374,-25.908392),(-57.852407,-25.897953),(-57.875352,-25.890202),(-57.878194,-25.883174),(-57.875352,-25.876146),(-57.854216,-25.868911),(-57.833235,-25.858782),(-57.819662,-25.849779),(-57.812823,-25.845243),(-57.801868,-25.831394),(-57.817061,-25.797494),(-57.820626,-25.77827),(-57.805588,-25.769899),(-57.787243,-25.764111),(-57.767916,-25.750675),(-57.75107,-25.734862),(-57.740373,-25.72215),(-57.751121,-25.719566),(-57.760578,-25.715639),(-57.768485,-25.709954),(-57.774582,-25.701686),(-57.753705,-25.672747),(-57.741251,-25.661895),(-57.719909,-25.653834),(-57.708695,-25.652903),(-57.698205,-25.653627),(-57.688335,-25.652697),(-57.678981,-25.647012),(-57.67526,-25.639261),(-57.670041,-25.616937),(-57.668077,-25.612286),(-57.638777,-25.6158),(-57.623067,-25.615386),(-57.616298,-25.609185),(-57.611647,-25.585931),(-57.600691,-25.578799),(-57.587152,-25.575699),(-57.575318,-25.564433),(-57.570047,-25.546657),(-57.556921,-25.45984),(-57.55811,-25.44351),(-57.565293,-25.430385),(-57.578729,-25.416742),(-57.640792,-25.37261),(-57.641206,-25.360518),(-57.671488,-25.290135),(-57.671976,-25.289831),(-57.702339,-25.270911),(-57.721769,-25.246106),(-57.754067,-25.180891),(-57.766004,-25.167868),(-57.79732,-25.153916),(-57.81241,-25.143684),(-57.85649,-25.096762),(-57.870701,-25.085289),(-57.890493,-25.078675),(-57.969764,-25.078468),(-57.983769,-25.074231),(-57.989866,-25.064102),(-57.993639,-25.052733),(-58.00046,-25.044362),(-58.009814,-25.042501),(-58.032138,-25.045085),(-58.04206,-25.044362),(-58.111513,-25.012322),(-58.124019,-25.012942),(-58.133889,-24.997853),(-58.224064,-24.941216),(-58.242513,-24.941732),(-58.259152,-24.952998),(-58.287264,-24.979766),(-58.299305,-24.987724),(-58.311966,-24.993615),(-58.323283,-24.995269),(-58.335995,-24.991858),(-58.341318,-24.986174),(-58.344367,-24.978319),(-58.350568,-24.968604),(-58.414802,-24.903078),(-58.438521,-24.872796),(-58.450769,-24.861737),(-58.473403,-24.851299),(-58.694216,-24.812024),(-58.699384,-24.80727),(-58.701916,-24.799312),(-58.708117,-24.795075),(-58.715972,-24.791871),(-58.723258,-24.786703),(-58.737469,-24.782776),(-58.788474,-24.781639),(-58.809196,-24.776781),(-59.000916,-24.644179),(-59.032697,-24.637048),(-59.042412,-24.630537),(-59.062463,-24.612347),(-59.072178,-24.606766),(-59.078327,-24.605629),(-59.097189,-24.605422),(-59.116981,-24.598807),(-59.154395,-24.576277),(-59.177908,-24.568732),(-59.206485,-24.550232),(-59.248084,-24.537209),(-59.257644,-24.530181),(-59.263122,-24.523463),(-59.27046,-24.518192),(-59.285601,-24.516125),(-59.295058,-24.512921),(-59.308081,-24.498762),(-59.340973,-24.4876),(-59.357406,-24.468996),(-59.377766,-24.433546),(-59.387094,-24.423831),(-59.426032,-24.392515),(-59.450268,-24.382387),(-59.453808,-24.374532),(-59.456289,-24.365437),(-59.459725,-24.358512),(-59.4659,-24.353551),(-59.487656,-24.344766),(-59.51042,-24.332674),(-59.521143,-24.325026),(-59.53202,-24.31407),(-59.539979,-24.308799),(-59.558427,-24.305389),(-59.575403,-24.29588),(-59.600518,-24.292883),(-59.610517,-24.289576),(-59.617726,-24.283478),(-59.635322,-24.261464),(-59.67364,-24.225394),(-60.033669,-24.007009),(-60.05173,-24.002875),(-60.072375,-24.004839),(-60.119297,-24.020238),(-60.143249,-24.025199),(-60.218128,-24.027369),(-60.296418,-24.016414),(-60.328018,-24.017964),(-60.337372,-24.016414),(-60.348043,-24.010833),(-60.367577,-23.99471),(-60.378351,-23.988509),(-60.38742,-23.987165),(-60.423051,-23.988509),(-60.484882,-23.977347),(-60.517723,-23.955746),(-60.535964,-23.947581),(-60.57175,-23.946031),(-60.577538,-23.94417),(-60.593584,-23.912234),(-60.594617,-23.90655),(-60.603841,-23.90469),(-60.621153,-23.895801),(-60.63216,-23.892287),(-60.64371,-23.891357),(-60.689676,-23.893631),(-60.699417,-23.891254),(-60.719855,-23.875027),(-60.729286,-23.872133),(-60.787776,-23.873445),(-60.816852,-23.874097),(-60.837625,-23.871823),(-60.866358,-23.855907),(-60.899947,-23.830482),(-60.936663,-23.813842),(-60.974826,-23.824074),(-61.006349,-23.805471),(-61.015806,-23.796686),(-61.030224,-23.77462),(-61.036244,-23.768832),(-61.038053,-23.755396),(-61.04999,-23.734726),(-61.066216,-23.715709),(-61.092519,-23.70186),(-61.10965,-23.675608),(-61.118849,-23.66641),(-61.109754,-23.649977),(-61.10624,-23.627239),(-61.109857,-23.606982),(-61.122233,-23.598197),(-61.139493,-23.592719),(-61.154454,-23.580317),(-61.167812,-23.566571),(-61.18024,-23.557166),(-61.187733,-23.556235),(-61.20768,-23.557579),(-61.214398,-23.557166),(-61.223571,-23.551275),(-61.242924,-23.533084),(-61.251941,-23.52926),(-61.272612,-23.523576),(-61.282947,-23.509933),(-61.288967,-23.49412),(-61.296951,-23.481408),(-61.36178,-23.454743),(-61.384853,-23.453709),(-61.398677,-23.450092),(-61.408728,-23.443581),(-61.42051,-23.433659),(-61.435703,-23.423737),(-61.451929,-23.417433),(-61.4703,-23.414125),(-61.491849,-23.413195),(-61.501073,-23.407821),(-61.510375,-23.38436),(-61.526343,-23.374748),(-61.525465,-23.364723),(-61.520788,-23.35325),(-61.51606,-23.344982),(-61.533965,-23.344569),(-61.545773,-23.342605),(-61.554636,-23.338368),(-61.60515,-23.289275),(-61.619619,-23.282867),(-61.666851,-23.282867),(-61.680313,-23.27925),(-61.688762,-23.274496),(-61.70442,-23.258372),(-61.718528,-23.249277),(-61.732997,-23.243386),(-61.744263,-23.234808),(-61.74881,-23.217341),(-61.749482,-23.198841),(-61.752273,-23.187059),(-61.758474,-23.177447),(-61.769274,-23.165562),(-61.780023,-23.15688),(-61.802657,-23.144994),(-61.814284,-23.135176),(-61.83697,-23.104687),(-61.84498,-23.097245),(-61.956446,-23.034407),(-61.992051,-22.99813),(-62.0059,-22.978906),(-62.006055,-22.974359),(-62.008949,-22.969708),(-62.003782,-22.94635),(-62.006055,-22.936842),(-62.017166,-22.921752),(-62.035821,-22.884855),(-62.050446,-22.864495),(-62.071633,-22.843928),(-62.080831,-22.832352),(-62.084604,-22.820156),(-62.089358,-22.81995),(-62.099228,-22.813748),(-62.107858,-22.806514),(-62.108788,-22.803),(-62.115868,-22.799796),(-62.119744,-22.792148),(-62.122534,-22.783156),(-62.126151,-22.775715),(-62.153488,-22.747809),(-62.159741,-22.737164),(-62.164082,-22.725899),(-62.1708,-22.71732),(-62.184184,-22.713703),(-62.188267,-22.708329),(-62.175916,-22.684867),(-62.195036,-22.673602),(-62.194623,-22.66058),(-62.187646,-22.638565),(-62.192969,-22.62823),(-62.196586,-22.626473),(-62.202529,-22.627197),(-62.214932,-22.624303),(-62.239736,-22.613761),(-62.25281,-22.603632),(-62.252965,-22.591126),(-62.238858,-22.57304),(-62.233225,-22.556296),(-62.241183,-22.538416),(-62.263352,-22.514439),(-62.26883,-22.512992),(-62.2756,-22.513508),(-62.281387,-22.512061),(-62.283816,-22.504827),(-62.28361,-22.493768),(-62.28454,-22.488704),(-62.287227,-22.483949),(-62.294513,-22.479815),(-62.305727,-22.476715),(-62.341357,-22.472261),(-62.348722,-22.47134),(-62.368256,-22.464416),(-62.43807,-22.419664),(-62.454969,-22.403851),(-62.461945,-22.388761),(-62.470575,-22.381837),(-62.510727,-22.370158),(-62.523388,-22.364887),(-62.547624,-22.335328),(-62.564678,-22.321996),(-62.588294,-22.316414),(-62.599611,-22.315174),(-62.61315,-22.311454),(-62.625294,-22.305046),(-62.632684,-22.295951),(-62.630824,-22.287682),(-62.624209,-22.278897),(-62.620282,-22.268459),(-62.626431,-22.255023),(-62.61961,-22.255023),(-62.624829,-22.247271),(-62.631805,-22.24076),(-62.640384,-22.236213),(-62.650357,-22.234456),(-62.627516,-22.184536),(-62.599404,-22.089865),(-62.572843,-22.000775),(-62.529228,-21.865073),(-62.492796,-21.751798),(-62.446184,-21.606897),(-62.411974,-21.500857),(-62.37549,-21.384482),(-62.340402,-21.272861),(-62.307898,-21.169301),(-62.275703,-21.066568),(-62.271879,-21.000939),(-62.271886,-21.000424),(-62.273791,-20.854798),(-62.275031,-20.75868),(-62.276168,-20.670727),(-62.277305,-20.579776),(-62.26883,-20.553111),(-62.232398,-20.501021),(-62.210573,-20.471305),(-62.189662,-20.442834),(-62.144962,-20.382062),(-62.10021,-20.321187),(-62.05551,-20.260416),(-62.01081,-20.199541),(-61.99417,-20.175667),(-61.977582,-20.151792),(-61.960942,-20.128021),(-61.94425,-20.104146),(-61.931383,-20.078308),(-61.92474,-20.065128),(-61.918412,-20.052573),(-61.905545,-20.026735),(-61.892574,-20.000897),(-61.892522,-20.000897),(-61.86441,-19.927413),(-61.836298,-19.853826),(-61.808186,-19.780342),(-61.780074,-19.706961),(-61.761213,-19.657765),(-61.753203,-19.64588),(-61.737235,-19.639575),(-61.648222,-19.62676),(-61.626725,-19.623659),(-61.579544,-19.616838),(-61.532286,-19.610016),(-61.51084,-19.606916),(-61.17236,-19.537463),(-60.833931,-19.467906),(-60.495476,-19.398453),(-60.156995,-19.329),(-60.006384,-19.298097),(-59.924322,-19.297064),(-59.735858,-19.29479),(-59.547498,-19.292413),(-59.359085,-19.290139),(-59.170725,-19.287762),(-59.089541,-19.286729),(-59.069646,-19.291483),(-59.039673,-19.311637),(-59.011096,-19.330964),(-58.96066,-19.360523),(-58.867436,-19.4153),(-58.774108,-19.470077),(-58.680832,-19.52475),(-58.587504,-19.579424),(-58.49428,-19.634201),(-58.401004,-19.688875),(-58.30778,-19.743652),(-58.214452,-19.798325),(-58.175282,-19.821373),(-58.164429,-19.832949),(-58.161174,-19.847211),(-58.164223,-19.880284),(-58.162207,-19.912324),(-58.145154,-19.969581),(-58.141847,-20.000897),(-58.144482,-20.023118),(-58.143139,-20.065286),(-58.144741,-20.086163),(-58.15952,-20.13908),(-58.158797,-20.165125)]
+Qatar	[(51.215258,24.62585),(51.147451,24.576279),(51.095465,24.560182),(51.038879,24.559872),(50.978883,24.567726),(50.928602,24.587208),(50.881008,24.636404),(50.807872,24.746649),(50.826671,24.748684),(50.852794,24.770006),(50.85963,24.7956),(50.851085,24.890815),(50.842784,24.916083),(50.799978,24.988756),(50.796641,25.003607),(50.807384,25.031643),(50.809744,25.051215),(50.808604,25.069159),(50.802419,25.076972),(50.775727,25.091864),(50.768403,25.1258),(50.766938,25.162584),(50.757823,25.186225),(50.764985,25.204291),(50.763438,25.225287),(50.759044,25.247504),(50.757823,25.269355),(50.765798,25.323554),(50.765147,25.344468),(50.750987,25.419623),(50.762462,25.462714),(50.763845,25.482408),(50.750987,25.494696),(50.778005,25.527045),(50.797093,25.529896),(50.808484,25.517239),(50.811648,25.498887),(50.820508,25.491293),(50.820486,25.471829),(50.847179,25.467353),(50.831309,25.507799),(50.827891,25.525051),(50.826671,25.543118),(50.828624,25.554348),(50.832205,25.566148),(50.832856,25.578518),(50.826671,25.590888),(50.818533,25.595771),(50.79656,25.599595),(50.785004,25.60456),(50.796397,25.617255),(50.809581,25.620592),(50.823497,25.622138),(50.836925,25.628811),(50.84018,25.634508),(50.846528,25.649848),(50.850597,25.652981),(50.857188,25.650824),(50.863536,25.641425),(50.870942,25.639309),(50.87615,25.631781),(50.874278,25.614936),(50.867686,25.587836),(50.867686,25.567043),(50.868663,25.559556),(50.87672,25.540595),(50.881521,25.535142),(50.888682,25.529486),(50.898692,25.532213),(50.900727,25.534857),(50.900076,25.53974),(50.904145,25.563137),(50.904796,25.587063),(50.90919,25.597724),(50.920584,25.608344),(50.927501,25.60517),(50.93572,25.598334),(50.949555,25.597724),(50.955903,25.604682),(50.9699,25.633857),(50.97755,25.646145),(50.94988,25.636461),(50.924327,25.63231),(50.903168,25.640123),(50.888682,25.666653),(50.887543,25.680894),(50.894867,25.728095),(50.897309,25.732571),(50.906993,25.739936),(50.90919,25.745103),(50.90797,25.749254),(50.902843,25.755276),(50.901703,25.759467),(50.901703,25.789537),(50.915538,25.786444),(50.920258,25.794379),(50.923595,25.805162),(50.932872,25.810614),(50.939708,25.807196),(50.945567,25.798489),(50.949229,25.787014),(50.949555,25.775295),(50.963715,25.783881),(50.972992,25.797512),(50.975922,25.813788),(50.970714,25.830512),(50.963878,25.823676),(50.949392,25.837958),(50.951182,25.85928),(50.977306,25.916449),(50.981456,25.935858),(50.984223,25.98135),(50.992524,25.975735),(50.995616,25.972846),(50.998546,25.967027),(51.004731,25.967027),(51.027354,26.026923),(51.047374,26.053046),(51.075938,26.06391),(51.091075,26.066962),(51.133149,26.082099),(51.141856,26.087795),(51.147227,26.103095),(51.170584,26.124579),(51.176117,26.139594),(51.194347,26.133531),(51.214854,26.13935),(51.251231,26.160102),(51.33074,26.121161),(51.346853,26.104885),(51.348481,26.085639),(51.346365,26.060696),(51.347179,26.039008),(51.357677,26.029731),(51.376638,26.022895),(51.382498,26.006171),(51.383474,25.985582),(51.388438,25.967027),(51.403982,25.954088),(51.416515,25.952094),(51.424327,25.950873),(51.46754,25.954047),(51.491954,25.95189),(51.511974,25.946112),(51.52947,25.937323),(51.546072,25.926093),(51.559418,25.913764),(51.570323,25.898383),(51.577485,25.880845),(51.594737,25.771877),(51.594493,25.758246),(51.591563,25.746649),(51.583507,25.741767),(51.577647,25.745063),(51.572032,25.759508),(51.563324,25.762885),(51.555431,25.758694),(51.54835,25.748847),(51.544607,25.737372),(51.546072,25.728095),(51.555024,25.720649),(51.56365,25.721625),(51.570323,25.727484),(51.573985,25.734931),(51.590099,25.7119),(51.576834,25.688666),(51.556814,25.681627),(51.552908,25.707587),(51.539317,25.703925),(51.505138,25.687161),(51.519705,25.681708),(51.534923,25.673245),(51.54713,25.663153),(51.552908,25.652981),(51.54949,25.631171),(51.535899,25.622382),(51.518809,25.61872),(51.505138,25.612006),(51.498302,25.615912),(51.491384,25.618232),(51.493663,25.565823),(51.491547,25.550645),(51.491384,25.549302),(51.48585,25.540513),(51.47755,25.531073),(51.471934,25.521389),(51.474294,25.512112),(51.510997,25.454291),(51.516938,25.440172),(51.518809,25.426215),(51.515717,25.382839),(51.511974,25.330227),(51.513194,25.308254),(51.518809,25.297065),(51.531261,25.292182),(51.590017,25.283759),(51.599132,25.274888),(51.607595,25.255113),(51.611095,25.237535),(51.614594,25.219794),(51.616547,25.137193),(51.605724,25.034247),(51.611013,25.022366),(51.602306,25.013821),(51.586925,24.953437),(51.574067,24.934394),(51.539399,24.898871),(51.528819,24.874416),(51.520844,24.870592),(51.511729,24.867865),(51.505138,24.864081),(51.500255,24.855373),(51.474213,24.764472),(51.47283,24.759426),(51.46754,24.748684),(51.455821,24.740668),(51.450369,24.721666),(51.443614,24.679755),(51.430431,24.664496),(51.389985,24.642483),(51.381521,24.635077),(51.37615,24.611884),(51.363536,24.59634),(51.349783,24.583808),(51.340587,24.569892),(51.328949,24.584784),(51.332693,24.598863),(51.341645,24.614691),(51.346853,24.635077),(51.339122,24.646186),(51.321137,24.648179),(51.285981,24.645006),(51.284434,24.662502),(51.278087,24.662991),(51.267914,24.656195),(51.254568,24.651801),(51.23699,24.650051),(51.220958,24.644232),(51.212576,24.633694),(51.214854,24.627183),(51.215258,24.62585)]
+Romania	[(26.722379,48.259769),(26.733127,48.27075),(26.744031,48.255583),(26.76372,48.252741),(26.804906,48.25827),(26.821908,48.252534),(26.844749,48.23331),(26.855497,48.237832),(26.897665,48.208971),(26.90397,48.201452),(26.908001,48.184528),(26.917716,48.187964),(26.929085,48.199049),(26.938128,48.204811),(26.950582,48.197524),(26.955646,48.186),(26.963088,48.175381),(26.997607,48.16657),(26.997607,48.15794),(26.986239,48.150421),(26.966602,48.149594),(26.966602,48.143367),(26.99399,48.132412),(27.012697,48.128123),(27.025099,48.135048),(27.033678,48.132386),(27.042773,48.127296),(27.048044,48.122232),(27.047955,48.121409),(27.047424,48.116496),(27.036882,48.107349),(27.034298,48.101768),(27.041739,48.077273),(27.059206,48.05805),(27.083184,48.043658),(27.109332,48.033503),(27.109332,48.026088),(27.088971,48.019809),(27.090005,48.015623),(27.091452,48.011851),(27.093364,48.00844),(27.095793,48.005598),(27.121476,48.013194),(27.134602,48.000456),(27.143748,47.986839),(27.157184,47.991955),(27.16876,47.983067),(27.169793,47.973791),(27.162869,47.965006),(27.150983,47.957797),(27.171964,47.946429),(27.178268,47.944129),(27.178268,47.942096),(27.178268,47.937928),(27.160698,47.921727),(27.17155,47.912632),(27.194185,47.904054),(27.212375,47.889507),(27.211548,47.885011),(27.213202,47.854134),(27.212375,47.847933),(27.222813,47.842662),(27.234906,47.840208),(27.245809,47.83659),(27.253406,47.828089),(27.219196,47.813775),(27.231082,47.807083),(27.244879,47.792588),(27.256196,47.77755),(27.260847,47.769075),(27.264671,47.764553),(27.282448,47.755691),(27.287512,47.752332),(27.288114,47.75068),(27.29113,47.74241),(27.289579,47.731687),(27.295057,47.724427),(27.295057,47.718174),(27.272009,47.71497),(27.281104,47.693007),(27.304049,47.666549),(27.369161,47.60831),(27.397066,47.589086),(27.428382,47.581024),(27.429404,47.57813),(27.431342,47.572638),(27.435824,47.55994),(27.438976,47.553713),(27.440268,47.550096),(27.440061,47.541027),(27.442128,47.536634),(27.446056,47.534877),(27.456908,47.533896),(27.459491,47.533224),(27.466726,47.506352),(27.473134,47.491779),(27.483676,47.485423),(27.492564,47.484545),(27.497525,47.482426),(27.501453,47.479945),(27.50724,47.477982),(27.532975,47.477413),(27.534526,47.477982),(27.548168,47.474261),(27.563154,47.468344),(27.575867,47.460412),(27.582998,47.450671),(27.574782,47.446252),(27.569356,47.438553),(27.565531,47.428269),(27.562534,47.416538),(27.580311,47.405996),(27.572353,47.375197),(27.586409,47.368764),(27.588724,47.367389),(27.599948,47.360728),(27.624029,47.321428),(27.636948,47.306674),(27.6447,47.303987),(27.671727,47.299853),(27.68232,47.295254),(27.689865,47.290887),(27.697823,47.287502),(27.722835,47.283317),(27.733273,47.275617),(27.753634,47.251432),(27.752393,47.238926),(27.763039,47.226317),(27.788309,47.204277),(27.800349,47.176966),(27.802106,47.176346),(27.804793,47.168492),(27.807687,47.162471),(27.805879,47.158234),(27.794665,47.155831),(27.80655,47.144617),(27.849855,47.12852),(27.849855,47.121724),(27.843757,47.114386),(27.848202,47.111415),(27.85771,47.109322),(27.867012,47.104645),(27.897604,47.081417),(27.925923,47.068756),(27.938429,47.061056),(27.938739,47.046638),(27.96313,47.043383),(27.986591,47.033228),(28.008295,47.026304),(28.028036,47.03297),(28.037027,47.016459),(28.038146,47.015483),(28.069067,46.988503),(28.082709,46.971527),(28.102295,46.935121),(28.104994,46.920185),(28.105447,46.91768),(28.096869,46.902616),(28.11356,46.894761),(28.114335,46.883393),(28.113095,46.87143),(28.124257,46.861637),(28.124257,46.854195),(28.122615,46.84227),(28.121518,46.8343),(28.137796,46.80624),(28.178156,46.758646),(28.178104,46.739836),(28.234121,46.662424),(28.24425,46.635372),(28.245085,46.631451),(28.24735,46.620825),(28.247144,46.607156),(28.240529,46.596382),(28.230504,46.583902),(28.225439,46.569562),(28.234121,46.553129),(28.224768,46.548736),(28.221099,46.541191),(28.219032,46.503726),(28.221099,46.495768),(28.234121,46.478069),(28.2381,46.475588),(28.242338,46.476518),(28.2458,46.475511),(28.247144,46.467191),(28.247247,46.436185),(28.246058,46.427865),(28.240219,46.420268),(28.22606,46.415359),(28.233294,46.401768),(28.228643,46.39611),(28.226796,46.395548),(28.219548,46.393345),(28.212934,46.388694),(28.207146,46.358153),(28.202392,46.353916),(28.190351,46.351074),(28.187922,46.343787),(28.191953,46.323504),(28.192883,46.311231),(28.191333,46.307769),(28.177794,46.287047),(28.165753,46.27883),(28.156296,46.275368),(28.144928,46.272939),(28.135212,46.269322),(28.131078,46.262397),(28.134489,46.245344),(28.132112,46.239918),(28.120846,46.237851),(28.108961,46.23413),(28.110976,46.225603),(28.129321,46.204674),(28.135626,46.198835),(28.141517,46.191962),(28.144721,46.183229),(28.133249,46.159974),(28.127358,46.135325),(28.110506,46.101491),(28.107823,46.096103),(28.100796,46.081995),(28.092838,46.078377),(28.090151,46.073365),(28.090461,46.06799),(28.096558,46.065045),(28.096869,46.05967),(28.084466,46.024582),(28.082709,46.014712),(28.08612,46.000552),(28.110511,45.950426),(28.112371,45.939213),(28.114852,45.933218),(28.120846,45.926293),(28.124981,45.918387),(28.12281,45.910791),(28.118779,45.903142),(28.117436,45.895236),(28.120226,45.887846),(28.129115,45.875134),(28.131078,45.871361),(28.128184,45.8664),(28.114955,45.859734),(28.110511,45.854308),(28.113302,45.825369),(28.128908,45.795035),(28.146478,45.771161),(28.154953,45.761807),(28.163738,45.661503),(28.161774,45.645432),(28.167975,45.632461),(28.153713,45.6275),(28.120846,45.627707),(28.107721,45.6244),(28.091184,45.615976),(28.074751,45.604866),(28.062142,45.593601),(28.118004,45.572723),(28.140949,45.560218),(28.157743,45.538927),(28.161567,45.532726),(28.164048,45.530607),(28.165391,45.528282),(28.165908,45.494589),(28.172936,45.484357),(28.199498,45.461774),(28.212934,45.450198),(28.215146,45.450365),(28.237635,45.452059),(28.266884,45.440483),(28.286418,45.421725),(28.281198,45.401829),(28.310809,45.347827),(28.330239,45.322919),(28.353287,45.312429),(28.370237,45.309225),(28.40517,45.295066),(28.494157,45.278891),(28.577046,45.248092),(28.710061,45.226956),(28.747371,45.23047),(28.778687,45.23109),(28.7914,45.234966),(28.802665,45.244165),(28.774295,45.253363),(28.767267,45.257755),(28.762564,45.265145),(28.75967,45.274189),(28.761531,45.281837),(28.79016,45.292069),(28.788609,45.307106),(28.789746,45.321421),(28.816308,45.326072),(28.831811,45.322299),(28.858114,45.30907),(28.880852,45.306176),(28.893616,45.29982),(28.910049,45.287366),(28.929893,45.279098),(28.952837,45.285092),(28.957384,45.292017),(28.960433,45.311292),(28.96648,45.319871),(28.973663,45.323695),(28.982448,45.325503),(29.004617,45.326072),(29.018156,45.330878),(29.069522,45.360798),(29.110295,45.369066),(29.127503,45.374544),(29.141869,45.385086),(29.150138,45.387877),(29.174322,45.388962),(29.179386,45.391856),(29.183107,45.398987),(29.191582,45.40617),(29.206672,45.41542),(29.228169,45.42374),(29.244602,45.424205),(29.260828,45.422035),(29.281809,45.422293),(29.290491,45.424619),(29.299276,45.428908),(29.307027,45.434127),(29.312815,45.439346),(29.322117,45.443842),(29.332969,45.442137),(29.343924,45.438106),(29.353743,45.435936),(29.430637,45.430406),(29.569699,45.394956),(29.616362,45.365346),(29.628145,45.360798),(29.650262,45.346122),(29.667109,45.311861),(29.672276,45.272948),(29.659254,45.244165),(29.66499,45.23786),(29.666488,45.230625),(29.664215,45.223184),(29.659079,45.215887),(29.659075,45.215881),(29.659028,45.215888),(29.650157,45.217231),(29.623871,45.216498),(29.623871,45.210273),(29.638845,45.195624),(29.64975,45.177802),(29.667003,45.164211),(29.699555,45.161811),(29.676524,45.144599),(29.664399,45.116929),(29.656261,45.028957),(29.650727,45.012112),(29.637543,44.98371),(29.634939,44.96955),(29.633637,44.953355),(29.63087,44.938666),(29.623871,44.929104),(29.630382,44.90766),(29.605154,44.880032),(29.617849,44.861477),(29.611176,44.849311),(29.603201,44.845404),(29.593761,44.844306),(29.583507,44.840277),(29.569347,44.824897),(29.561778,44.820258),(29.542003,44.827826),(29.531098,44.826239),(29.520518,44.822496),(29.510997,44.820502),(29.315929,44.798774),(29.192068,44.792873),(29.156098,44.78441),(29.055837,44.735175),(29.026378,44.714667),(29.000743,44.68891),(28.993907,44.696357),(28.994884,44.711127),(28.981293,44.729438),(28.974946,44.74494),(28.997325,44.751614),(29.021495,44.754706),(29.058279,44.768297),(29.098155,44.775377),(29.120616,44.786566),(29.138682,44.804023),(29.144705,44.826646),(29.138845,44.839179),(29.125987,44.852484),(29.096365,44.875067),(29.101817,44.859117),(29.103363,44.851304),(29.10377,44.840277),(29.087901,44.842719),(29.073497,44.835435),(29.060313,44.832343),(29.048595,44.847154),(29.044119,44.865546),(29.041759,44.925686),(29.052094,44.944648),(29.098806,44.956977),(29.110606,44.970038),(29.101736,44.980292),(29.058279,45.000963),(29.045177,45.004828),(29.014415,45.004828),(28.983246,45.012274),(28.97283,45.010972),(28.969249,45.005845),(28.966075,44.996568),(28.960216,44.987698),(28.949229,44.98371),(28.927013,44.982611),(28.91684,44.979682),(28.880056,44.954779),(28.869395,44.943345),(28.863536,44.922309),(28.865082,44.916571),(28.87436,44.911566),(28.876638,44.904853),(28.874685,44.899115),(28.870128,44.89643),(28.865489,44.89468),(28.863536,44.891547),(28.866466,44.882636),(28.873546,44.874986),(28.881521,44.869696),(28.904063,44.862738),(28.952403,44.826646),(28.939708,44.816881),(28.934093,44.814195),(28.924978,44.813056),(28.934418,44.807522),(28.938731,44.80622),(28.938731,44.798774),(28.92628,44.792955),(28.925466,44.783677),(28.932953,44.773505),(28.946137,44.765204),(28.936371,44.759955),(28.923839,44.757799),(28.879405,44.756578),(28.868826,44.753567),(28.808442,44.726874),(28.79835,44.720201),(28.788829,44.706244),(28.78712,44.693305),(28.793712,44.687893),(28.80836,44.696357),(28.80421,44.684231),(28.785411,44.679674),(28.781016,44.665269),(28.784028,44.649237),(28.792491,44.644721),(28.845551,44.651557),(28.869477,44.661811),(28.891368,44.677191),(28.911957,44.696357),(28.897716,44.716783),(28.967459,44.700995),(28.983409,44.692613),(28.987559,44.675279),(28.97934,44.655341),(28.962087,44.63939),(28.938731,44.634263),(28.956391,44.651109),(28.972667,44.670233),(28.975352,44.686835),(28.952403,44.696357),(28.952403,44.68891),(28.959972,44.681952),(28.957774,44.678778),(28.938731,44.675238),(28.924164,44.682074),(28.918224,44.682685),(28.913829,44.679918),(28.909434,44.675198),(28.904552,44.668402),(28.885427,44.658108),(28.854177,44.634345),(28.836274,44.627427),(28.787852,44.609605),(28.774181,44.600775),(28.791515,44.623847),(28.794688,44.634263),(28.779796,44.63581),(28.766938,44.633734),(28.757823,44.626776),(28.753673,44.613756),(28.766775,44.613756),(28.76059,44.603705),(28.764415,44.595893),(28.774425,44.590155),(28.787852,44.586493),(28.748057,44.577786),(28.732677,44.567857),(28.732677,44.552314),(28.737153,44.557074),(28.743907,44.561998),(28.746918,44.565985),(28.761078,44.560207),(28.774181,44.552314),(28.765636,44.538886),(28.753429,44.513495),(28.745616,44.486151),(28.750255,44.466702),(28.758474,44.465277),(28.766368,44.472602),(28.771983,44.48371),(28.778331,44.507392),(28.788097,44.515367),(28.80836,44.525051),(28.838145,44.554023),(28.855642,44.567694),(28.873546,44.573432),(28.892426,44.577053),(28.906261,44.587714),(28.914887,44.601386),(28.924978,44.620551),(28.918468,44.60102),(28.909679,44.584215),(28.844005,44.49372),(28.796723,44.467922),(28.706554,44.381049),(28.6963,44.358344),(28.693126,44.346137),(28.680186,44.353339),(28.664399,44.348375),(28.651215,44.340033),(28.64088,44.328559),(28.635102,44.316392),(28.632335,44.302436),(28.631033,44.26435),(28.635265,44.252021),(28.651215,44.23078),(28.665212,44.199286),(28.668142,44.184312),(28.664887,44.175605),(28.671723,44.168687),(28.658376,44.174465),(28.645844,44.172024),(28.636241,44.164293),(28.63087,44.154486),(28.637462,44.135891),(28.654145,44.054918),(28.671235,44.003323),(28.671723,43.997382),(28.669119,43.989163),(28.660004,43.979804),(28.654959,43.961371),(28.64088,43.932196),(28.637706,43.918647),(28.61378,43.884182),(28.609386,43.874498),(28.593516,43.819525),(28.587657,43.810248),(28.584483,43.800849),(28.589203,43.791327),(28.584809,43.782416),(28.58253,43.772366),(28.581879,43.761705),(28.583018,43.751044),(28.57838,43.741278),(28.434574,43.735213),(28.221254,43.761981),(28.014806,43.830039),(27.98101,43.84934),(27.935845,43.964398),(27.912074,43.993233),(27.912074,43.993336),(27.85647,43.988634),(27.787327,43.960419),(27.721698,43.94874),(27.682515,43.987256),(27.676119,43.993543),(27.656275,44.023877),(27.633434,44.029768),(27.574523,44.016281),(27.383837,44.015092),(27.372882,44.020725),(27.353555,44.045271),(27.341669,44.053074),(27.285342,44.072453),(27.26431,44.089765),(27.269012,44.112399),(27.252662,44.121519),(27.251132,44.122373),(27.226741,44.120719),(27.205553,44.129246),(27.100237,44.14449),(27.027476,44.177046),(27.001535,44.165109),(26.884126,44.156531),(26.789455,44.115965),(26.753695,44.10811),(26.708685,44.10811),(26.697212,44.106094),(26.677317,44.097051),(26.667808,44.095087),(26.647758,44.093382),(26.614168,44.084855),(26.415791,44.063789),(26.332335,44.054926),(26.310518,44.052609),(26.231453,44.027495),(26.150734,44.012405),(26.116214,43.998866),(26.079317,43.969049),(26.061644,43.949773),(26.054306,43.934322),(25.934003,43.870321),(25.924495,43.858616),(25.916433,43.844379),(25.869304,43.800893),(25.839332,43.788439),(25.806259,43.763661),(25.804399,43.759914),(25.781144,43.732009),(25.739596,43.718935),(25.732948,43.718781),(25.671384,43.717359),(25.653503,43.708134),(25.637897,43.697282),(25.616503,43.687748),(25.593869,43.680668),(25.575059,43.677387),(25.556558,43.670359),(25.533821,43.668679),(25.488759,43.67054),(25.48245,43.669715),(25.467417,43.667749),(25.426075,43.654391),(25.403131,43.65005),(25.35962,43.654287),(25.323033,43.669713),(25.28872,43.688962),(25.285405,43.690391),(25.252339,43.704646),(25.211308,43.711881),(25.0816,43.718935),(24.963675,43.749605),(24.752628,43.738804),(24.705603,43.743765),(24.661763,43.755657),(24.500137,43.799498),(24.466341,43.802418),(24.431201,43.794176),(24.375494,43.763867),(24.358234,43.760017),(24.336705,43.759251),(24.159383,43.752938),(24.149606,43.75472),(23.799922,43.818463),(23.742871,43.8427),(23.720753,43.845826),(23.636107,43.832158),(23.620854,43.83401),(23.592699,43.837429),(23.484695,43.880604),(23.325151,43.886592),(23.234478,43.877297),(23.196961,43.86275),(23.161924,43.857324),(23.131849,43.847945),(23.052551,43.84282),(22.919562,43.834225),(22.888763,43.839522),(22.863441,43.855412),(22.851039,43.874352),(22.850522,43.896986),(22.874707,43.972046),(22.885869,43.994525),(22.905816,44.003982),(22.926486,44.006152),(22.966277,44.015557),(22.988085,44.017676),(23.023018,44.031629),(23.040071,44.062325),(23.030976,44.093072),(23.008307,44.100446),(22.988085,44.107025),(22.942609,44.111469),(22.906436,44.122889),(22.69164,44.228435),(22.690739,44.228878),(22.685364,44.243657),(22.689498,44.291716),(22.68154,44.305307),(22.662523,44.311663),(22.621182,44.315901),(22.582838,44.328406),(22.549352,44.348974),(22.522687,44.37507),(22.505117,44.404061),(22.50398,44.411709),(22.506357,44.427522),(22.505427,44.435015),(22.500983,44.44194),(22.480002,44.455789),(22.477005,44.463954),(22.477212,44.476976),(22.479795,44.490412),(22.484136,44.499766),(22.491061,44.50421),(22.500363,44.50638),(22.535503,44.507517),(22.548422,44.511703),(22.55669,44.52147),(22.55979,44.538781),(22.565578,44.555421),(22.580461,44.565498),(22.600305,44.569787),(22.621182,44.569219),(22.642163,44.563121),(22.678543,44.545551),(22.700144,44.54183),(22.719367,44.544362),(22.741692,44.551855),(22.759262,44.564671),(22.765153,44.58281),(22.714716,44.623065),(22.700144,44.63061),(22.621182,44.637432),(22.587489,44.649369),(22.553279,44.669161),(22.483723,44.72399),(22.468943,44.730191),(22.450547,44.732981),(22.426052,44.733653),(22.41551,44.727814),(22.38068,44.700528),(22.361146,44.692054),(22.319702,44.685336),(22.304922,44.677377),(22.299031,44.661668),(22.185136,44.515113),(22.172114,44.505347),(22.148239,44.500902),(22.126639,44.502659),(22.104314,44.509636),(22.086951,44.52178),(22.076306,44.550718),(22.067107,44.55723),(22.055739,44.562139),(22.045197,44.569219),(22.039822,44.576867),(22.036174,44.589489),(22.034243,44.596168),(22.032174,44.603325),(22.004269,44.651539),(21.994347,44.658567),(21.962411,44.662288),(21.871977,44.695981),(21.855441,44.698461),(21.838284,44.695206),(21.801697,44.683889),(21.756842,44.677274),(21.705166,44.677067),(21.65628,44.687661),(21.619693,44.713913),(21.610288,44.731948),(21.604293,44.749983),(21.595612,44.765951),(21.578042,44.777681),(21.558405,44.78166),(21.49722,44.778043),(21.41216,44.784813),(21.395934,44.790239),(21.378571,44.816645),(21.360587,44.826412),(21.359841,44.826644),(21.3598,44.826657),(21.342811,44.831942),(21.346428,44.845636),(21.355523,44.856591),(21.368545,44.86486),(21.395314,44.871629),(21.453398,44.869562),(21.48151,44.872611),(21.522128,44.880776),(21.536287,44.889302),(21.539078,44.908474),(21.531016,44.924649),(21.51634,44.933899),(21.48151,44.943563),(21.456499,44.952348),(21.40844,44.958342),(21.385185,44.969504),(21.384565,44.97493),(21.387046,44.981545),(21.383945,44.986661),(21.366995,44.987281),(21.353456,44.989813),(21.351389,44.998236),(21.356143,45.008572),(21.363378,45.01653),(21.3733,45.020096),(21.398828,45.021387),(21.409266,45.023971),(21.421875,45.031413),(21.425079,45.036219),(21.425596,45.043247),(21.429524,45.057303),(21.432521,45.061488),(21.440996,45.068723),(21.443786,45.072909),(21.444406,45.07787),(21.444406,45.08526),(21.443786,45.091461),(21.442443,45.092908),(21.449987,45.101021),(21.458566,45.107325),(21.469004,45.111046),(21.48151,45.111563),(21.494119,45.119314),(21.49784,45.131872),(21.493292,45.145101),(21.484388,45.152702),(21.459393,45.17404),(21.433761,45.188819),(21.405546,45.199671),(21.299299,45.223184),(21.257131,45.224114),(21.239251,45.229385),(21.206075,45.245922),(21.189745,45.259564),(21.155638,45.295169),(21.139412,45.303696),(21.12918,45.301887),(21.113057,45.28933),(21.103342,45.286074),(21.09156,45.288089),(21.082775,45.293671),(21.0743,45.300544),(21.063964,45.30628),(21.016668,45.321482),(20.981489,45.33279),(20.966193,45.341575),(20.927642,45.37749),(20.863047,45.418728),(20.830387,45.452524),(20.816021,45.462859),(20.799484,45.468544),(20.781604,45.472574),(20.767135,45.479344),(20.760727,45.493348),(20.783155,45.506061),(20.797624,45.516499),(20.800208,45.530504),(20.787392,45.553655),(20.75804,45.58926),(20.754423,45.605589),(20.762174,45.630601),(20.773233,45.648894),(20.777264,45.657524),(20.779951,45.671684),(20.779124,45.72367),(20.781604,45.733954),(20.785532,45.743411),(20.785739,45.752557),(20.77747,45.762324),(20.765171,45.766768),(20.754113,45.763564),(20.745328,45.754986),(20.739436,45.743411),(20.726827,45.736176),(20.713392,45.733334),(20.700059,45.735401),(20.68807,45.7431),(20.678562,45.75664),(20.655617,45.77731),(20.645902,45.788731),(20.64349,45.795141),(20.642285,45.798343),(20.640114,45.818703),(20.636704,45.827023),(20.629676,45.833276),(20.612312,45.841492),(20.605284,45.846143),(20.572108,45.887691),(20.556709,45.89844),(20.538002,45.903711),(20.499865,45.906656),(20.481674,45.912703),(20.429068,45.946706),(20.410258,45.955594),(20.370984,45.96779),(20.35393,45.976678),(20.338634,45.992801),(20.317653,46.038586),(20.305665,46.053572),(20.242826,46.108091),(20.283237,46.1438),(20.444157,46.1469),(20.468549,46.174134),(20.509373,46.167674),(20.548957,46.15615),(20.578103,46.137547),(20.588025,46.132844),(20.600117,46.12964),(20.607558,46.129485),(20.663989,46.137753),(20.683523,46.144678),(20.698819,46.15646),(20.704193,46.16633),(20.704368,46.168526),(20.70533,46.180645),(20.710291,46.188086),(20.717836,46.189998),(20.727137,46.187725),(20.736646,46.186691),(20.744707,46.192272),(20.744811,46.200282),(20.735509,46.222503),(20.734992,46.231908),(20.739333,46.237489),(20.778504,46.260072),(20.787369,46.26339),(20.798658,46.267616),(20.819638,46.271699),(20.839689,46.271079),(20.848991,46.267771),(20.866974,46.257126),(20.875139,46.254387),(20.885061,46.255007),(20.899737,46.260692),(20.906558,46.26219),(20.924438,46.259555),(20.961748,46.248341),(20.981489,46.248858),(20.990584,46.251597),(20.999162,46.251597),(21.007017,46.248858),(21.013942,46.24307),(21.033475,46.231339),(21.051459,46.236094),(21.099208,46.27635),(21.105616,46.278675),(21.134865,46.27852),(21.144476,46.283739),(21.155949,46.298932),(21.164527,46.318259),(21.168661,46.362753),(21.17879,46.384457),(21.195636,46.398099),(21.21517,46.402905),(21.257544,46.404171),(21.280695,46.416393),(21.274391,46.438355),(21.245142,46.47688),(21.247623,46.497473),(21.261679,46.513338),(21.278938,46.528401),(21.291341,46.546721),(21.295268,46.585039),(21.300953,46.603926),(21.316249,46.616639),(21.337643,46.620411),(21.374436,46.618448),(21.396037,46.626354),(21.416811,46.645216),(21.423539,46.658231),(21.425493,46.662011),(21.436241,46.673741),(21.463527,46.677049),(21.483577,46.684852),(21.501767,46.703507),(21.505178,46.723247),(21.478203,46.735934),(21.475206,46.737846),(21.472622,46.740197),(21.470451,46.743014),(21.471381,46.749034),(21.473655,46.754873),(21.477066,46.760222),(21.48151,46.764976),(21.502904,46.80531),(21.51572,46.821588),(21.536597,46.835023),(21.573081,46.841767),(21.583416,46.847943),(21.591788,46.860707),(21.591477,46.871533),(21.588067,46.882204),(21.587137,46.8944),(21.588687,46.906182),(21.589927,46.908869),(21.594371,46.910006),(21.640053,46.935689),(21.648528,46.942976),(21.667545,46.992378),(21.671369,46.99336),(21.670749,46.994394),(21.661757,47.006072),(21.654833,47.009948),(21.645221,47.01124),(21.636643,47.014082),(21.63427,47.019422),(21.632819,47.022686),(21.671886,47.054726),(21.69421,47.069169),(21.74351,47.091597),(21.763767,47.105214),(21.770485,47.114025),(21.775446,47.131672),(21.77989,47.140741),(21.789398,47.150301),(21.811516,47.164693),(21.819887,47.172729),(21.825985,47.185054),(21.825675,47.194278),(21.823298,47.203321),(21.823608,47.214923),(21.827742,47.226007),(21.839318,47.240839),(21.844589,47.249934),(21.856061,47.285745),(21.862159,47.297424),(21.900813,47.335742),(21.919003,47.349669),(21.936986,47.357162),(21.981531,47.366102),(22.001582,47.393827),(22.000238,47.427184),(21.991453,47.461807),(21.988869,47.492942),(22.007886,47.517411),(22.037445,47.539322),(22.09956,47.570948),(22.148549,47.579345),(22.154177,47.582213),(22.162089,47.586244),(22.16736,47.593789),(22.167608,47.594862),(22.169117,47.601385),(22.16984,47.608775),(22.172837,47.615389),(22.197642,47.639315),(22.200743,47.647945),(22.204153,47.666291),(22.207874,47.673732),(22.215212,47.679933),(22.232162,47.688253),(22.23981,47.693472),(22.261721,47.715848),(22.27309,47.723755),(22.29159,47.730705),(22.309366,47.735046),(22.322079,47.735873),(22.368278,47.73117),(22.382644,47.732023),(22.395873,47.735692),(22.407345,47.743082),(22.423675,47.782563),(22.454371,47.787394),(22.528475,47.761039),(22.562994,47.757215),(22.601235,47.760936),(22.637719,47.771555),(22.666967,47.78879),(22.691669,47.8107),(22.703864,47.817186),(22.724225,47.82349),(22.745826,47.824989),(22.75182,47.827676),(22.760295,47.838916),(22.758331,47.846228),(22.753267,47.852687),(22.752854,47.86124),(22.763602,47.874753),(22.779622,47.882298),(22.819723,47.892323),(22.836053,47.902452),(22.861167,47.933819),(22.877601,47.946739),(22.897858,47.950976),(22.915841,47.959193),(22.924213,47.972732),(22.915738,47.992989),(22.924109,48.004823),(22.939302,48.00565),(22.957079,48.00012),(22.972478,47.992886),(22.988188,47.986374),(23.004415,47.983067),(23.020331,47.984721),(23.063119,48.007458),(23.076555,48.024512),(23.098982,48.071227),(23.118619,48.091536),(23.139083,48.098125),(23.161718,48.095903),(23.231377,48.079728),(23.248637,48.071227),(23.289772,48.038206),(23.337521,48.010869),(23.360052,47.993144),(23.367286,47.991206),(23.374728,47.99056),(23.382169,47.991129),(23.390127,47.993067),(23.391574,47.993454),(23.393021,47.993583),(23.394468,47.993454),(23.396019,47.993067),(23.460821,47.971337),(23.481595,47.972163),(23.485476,47.974234),(23.488519,47.975858),(23.494307,47.980535),(23.499371,47.986219),(23.503712,47.992886),(23.514461,47.998983),(23.525623,48.00118),(23.563243,48.005753),(23.581744,48.001567),(23.646132,47.996606),(23.687267,47.987253),(23.710521,47.985083),(23.780078,47.987511),(23.796511,47.981982),(23.848394,47.949658),(23.855215,47.934233),(23.876609,47.93444),(23.977275,47.962293),(24.008798,47.961208),(24.025231,47.95325),(24.074943,47.944181),(24.094787,47.937928),(24.131167,47.914544),(24.148737,47.912115),(24.150184,47.912916),(24.209302,47.897594),(24.231006,47.897026),(24.297876,47.919789),(24.347175,47.920875),(24.386242,47.94369),(24.409187,47.952061),(24.428514,47.952526),(24.485564,47.943199),(24.542098,47.943819),(24.561632,47.940537),(24.569808,47.937289),(24.608451,47.921934),(24.633669,47.908291),(24.649275,47.895217),(24.655993,47.879301),(24.656923,47.866201),(24.661471,47.853876),(24.679144,47.84013),(24.712837,47.825919),(24.793659,47.804473),(24.808232,47.79574),(24.820738,47.784087),(24.854431,47.743133),(24.877789,47.718742),(24.896599,47.710061),(24.928858,47.713938),(24.94238,47.715563),(25.017418,47.724582),(25.079947,47.742927),(25.08005,47.743082),(25.080257,47.743133),(25.121908,47.770315),(25.218956,47.878474),(25.261744,47.898576),(25.752516,47.934595),(25.818351,47.952578),(25.870958,47.957022),(25.90124,47.965962),(25.918087,47.968158),(25.965732,47.964903),(26.029294,47.977796),(26.10253,47.978267),(26.125723,47.978416),(26.173058,47.993144),(26.18267,48.003273),(26.204788,48.037379),(26.217087,48.048024),(26.243235,48.062907),(26.255327,48.072338),(26.270727,48.093603),(26.286953,48.124712),(26.297495,48.156338),(26.296152,48.178998),(26.30349,48.212045),(26.311758,48.20972),(26.330258,48.208506),(26.347311,48.212097),(26.380488,48.223207),(26.397437,48.226205),(26.44467,48.227729),(26.461309,48.230391),(26.5874,48.249356),(26.617889,48.258968),(26.665741,48.274212),(26.688531,48.274832),(26.711475,48.261319),(26.722379,48.259769)]
+Rwanda	[(30.471786,-1.066837),(30.463856,-1.075127),(30.456156,-1.086082),(30.453004,-1.097348),(30.456311,-1.108097),(30.470884,-1.118122),(30.474191,-1.131764),(30.472072,-1.137656),(30.4683,-1.14334),(30.465613,-1.149334),(30.467266,-1.155329),(30.476051,-1.16122),(30.48401,-1.15998),(30.490521,-1.156466),(30.494655,-1.155329),(30.506954,-1.164217),(30.511191,-1.170418),(30.515119,-1.196257),(30.521217,-1.210829),(30.539407,-1.241008),(30.545298,-1.261369),(30.5546,-1.273461),(30.556615,-1.281626),(30.555633,-1.284727),(30.553359,-1.289067),(30.550982,-1.294959),(30.549949,-1.3024),(30.555323,-1.31842),(30.568242,-1.328135),(30.597698,-1.340331),(30.60824,-1.347772),(30.623226,-1.362035),(30.632424,-1.367616),(30.698467,-1.39211),(30.718104,-1.394901),(30.737534,-1.406683),(30.743219,-1.432831),(30.741358,-1.458876),(30.738258,-1.470658),(30.732935,-1.476446),(30.738878,-1.489469),(30.755414,-1.511586),(30.767817,-1.524815),(30.772261,-1.532463),(30.781976,-1.56843),(30.791588,-1.590961),(30.807246,-1.60326),(30.831017,-1.594165),(30.838303,-1.615352),(30.837476,-1.641087),(30.824557,-1.719946),(30.824247,-1.730694),(30.826521,-1.735862),(30.835409,-1.749504),(30.83789,-1.758703),(30.826418,-1.786195),(30.829932,-1.796737),(30.83789,-1.836838),(30.832412,-1.853788),(30.822232,-1.868774),(30.816599,-1.884173),(30.824247,-1.902053),(30.808021,-1.914766),(30.801923,-1.921277),(30.796962,-1.929338),(30.826934,-1.934093),(30.829932,-1.960551),(30.816754,-2.018739),(30.835461,-2.014708),(30.853496,-2.0237),(30.868741,-2.038996),(30.879438,-2.053465),(30.887809,-2.082507),(30.853393,-2.193818),(30.844711,-2.237847),(30.848949,-2.306266),(30.844711,-2.326627),(30.834376,-2.345334),(30.821353,-2.354739),(30.804559,-2.36218),(30.789107,-2.371069),(30.775155,-2.374479),(30.76792,-2.378613),(30.758825,-2.381094),(30.75066,-2.37913),(30.698467,-2.353395),(30.687718,-2.349985),(30.674799,-2.351742),(30.663327,-2.360733),(30.649064,-2.387605),(30.63785,-2.39701),(30.616921,-2.398147),(30.595217,-2.391946),(30.573927,-2.389259),(30.5546,-2.400628),(30.521733,-2.399387),(30.488454,-2.383781),(30.434142,-2.339236),(30.428406,-2.331381),(30.423238,-2.317325),(30.418484,-2.311847),(30.415073,-2.313088),(30.383447,-2.305543),(30.37859,-2.303062),(30.362518,-2.307817),(30.352752,-2.316912),(30.34861,-2.322352),(30.344018,-2.328384),(30.331151,-2.340269),(30.316785,-2.347608),(30.297974,-2.353705),(30.278854,-2.357633),(30.262731,-2.358356),(30.250329,-2.355566),(30.219116,-2.340373),(30.207489,-2.339236),(30.203923,-2.345954),(30.203407,-2.355359),(30.20134,-2.362387),(30.156174,-2.419024),(30.139121,-2.430807),(30.116797,-2.43153),(30.093853,-2.422642),(30.072975,-2.408792),(30.056542,-2.394426),(30.025536,-2.357736),(30.013341,-2.348331),(30.00192,-2.3443),(29.992308,-2.34399),(29.983885,-2.344817),(29.976134,-2.34368),(29.95852,-2.328533),(29.956781,-2.327038),(29.949934,-2.321149),(29.941924,-2.316602),(29.931692,-2.316912),(29.928798,-2.322493),(29.928901,-2.331795),(29.92239,-2.382954),(29.929573,-2.459849),(29.907921,-2.5354),(29.903726,-2.637947),(29.90327,-2.649088),(29.897896,-2.671102),(29.888387,-2.692909),(29.876191,-2.71358),(29.862859,-2.731667),(29.842395,-2.752441),(29.823585,-2.763499),(29.803379,-2.767324),(29.778523,-2.7666),(29.756199,-2.759882),(29.744727,-2.759985),(29.737285,-2.769287),(29.733978,-2.790268),(29.729637,-2.79957),(29.719922,-2.805461),(29.697546,-2.808251),(29.678684,-2.805357),(29.637087,-2.791629),(29.626388,-2.788097),(29.619256,-2.787684),(29.589491,-2.798433),(29.582049,-2.80298),(29.574091,-2.806081),(29.563756,-2.805667),(29.541845,-2.808561),(29.523138,-2.820447),(29.504121,-2.826855),(29.480867,-2.813729),(29.444675,-2.806989),(29.425366,-2.803394),(29.407435,-2.805461),(29.364285,-2.824168),(29.339687,-2.826441),(29.33085,-2.807424),(29.329661,-2.794919),(29.32036,-2.774145),(29.318086,-2.762569),(29.321497,-2.752131),(29.335346,-2.735181),(29.337516,-2.723812),(29.331418,-2.71141),(29.309714,-2.691049),(29.309481,-2.690127),(29.306045,-2.67658),(29.307337,-2.664797),(29.306614,-2.660147),(29.294418,-2.651052),(29.276125,-2.640613),(29.254989,-2.635549),(29.212769,-2.630278),(29.190445,-2.623456),(29.129725,-2.596998),(29.113447,-2.594621),(29.05526,-2.598445),(29.032574,-2.620666),(29.015365,-2.720711),(29.000121,-2.703658),(28.979605,-2.69353),(28.949736,-2.690326),(28.936404,-2.685055),(28.899093,-2.660663),(28.891342,-2.652705),(28.89806,-2.576327),(28.891342,-2.553073),(28.881058,-2.542634),(28.869845,-2.53726),(28.860956,-2.531162),(28.857236,-2.518346),(28.860853,-2.505221),(28.878216,-2.489718),(28.874702,-2.477522),(28.864574,-2.459435),(28.860853,-2.439592),(28.858838,-2.418198),(28.866331,-2.391946),(28.880387,-2.379854),(28.907258,-2.370552),(28.928136,-2.364454),(28.945447,-2.354222),(28.959658,-2.339753),(28.971234,-2.321666),(28.978779,-2.306783),(28.982189,-2.296034),(28.983378,-2.287353),(28.993661,-2.277741),(29.002136,-2.274744),(29.03092,-2.275674),(29.075413,-2.263892),(29.10983,-2.23671),(29.134841,-2.197746),(29.150551,-2.15041),(29.156339,-2.108656),(29.154272,-2.072689),(29.12771,-1.915696),(29.12554,-1.879109),(29.130501,-1.843349),(29.149311,-1.799321),(29.18664,-1.739618),(29.212253,-1.698655),(29.233337,-1.658657),(29.245429,-1.640984),(29.293695,-1.600986),(29.303823,-1.587861),(29.331212,-1.53143),(29.342787,-1.516547),(29.358497,-1.509933),(29.434926,-1.506832),(29.437407,-1.506212),(29.439629,-1.504765),(29.441696,-1.502595),(29.445065,-1.497287),(29.46433,-1.466938),(29.498747,-1.431074),(29.538641,-1.402342),(29.577915,-1.38839),(29.618119,-1.39056),(29.6391,-1.38901),(29.657703,-1.383945),(29.678322,-1.37237),(29.693774,-1.361208),(29.710517,-1.352526),(29.734805,-1.348185),(29.74669,-1.350872),(29.767981,-1.363792),(29.774906,-1.366272),(29.783174,-1.361414),(29.789168,-1.341674),(29.798212,-1.330925),(29.807462,-1.325138),(29.816143,-1.322554),(29.825024,-1.323881),(29.825135,-1.323897),(29.836091,-1.329478),(29.864203,-1.370303),(29.868647,-1.391283),(29.871024,-1.432418),(29.880739,-1.453605),(29.897896,-1.469625),(29.917429,-1.475206),(29.938462,-1.472932),(29.960424,-1.464767),(30.028327,-1.427147),(30.038662,-1.424977),(30.047757,-1.403169),(30.06078,-1.389733),(30.065984,-1.386945),(30.095506,-1.37113),(30.136331,-1.355213),(30.147183,-1.345085),(30.15235,-1.329892),(30.158448,-1.291135),(30.165579,-1.277492),(30.173434,-1.272841),(30.181392,-1.271497),(30.189351,-1.270877),(30.19674,-1.268707),(30.212192,-1.259509),(30.256685,-1.217237),(30.269759,-1.200494),(30.280508,-1.182407),(30.28242,-1.175793),(30.284642,-1.161427),(30.287536,-1.155432),(30.29095,-1.152621),(30.294564,-1.149644),(30.311307,-1.1421),(30.317405,-1.137035),(30.322572,-1.121843),(30.329032,-1.080501),(30.337455,-1.066239),(30.352752,-1.060761),(30.369288,-1.063241),(30.386341,-1.068202),(30.403188,-1.070373),(30.418897,-1.066445),(30.432023,-1.060554),(30.445614,-1.058694),(30.460829,-1.063428),(30.471786,-1.066837)]
+Western Sahara	[(-8.752562,27.661439),(-8.682385,27.661439),(-8.682385,27.567414),(-8.682385,27.473466),(-8.682385,27.379467),(-8.682385,27.285416),(-8.682282,27.27167),(-8.68223,27.232706),(-8.68223,27.172141),(-8.682075,27.093696),(-8.68192,27.000834),(-8.681817,26.897171),(-8.681662,26.786325),(-8.681558,26.671913),(-8.681455,26.55745),(-8.6813,26.446604),(-8.681145,26.342993),(-8.681042,26.250182),(-8.680938,26.171634),(-8.680861,26.111121),(-8.680861,26.072208),(-8.680809,26.058411),(-8.680809,26.013142),(-8.687656,26.000016),(-8.707216,25.995004),(-8.792043,25.995004),(-8.892863,25.994952),(-8.993581,25.994952),(-9.094246,25.994952),(-9.195015,25.994952),(-9.295733,25.994952),(-9.39645,25.994952),(-9.497168,25.994952),(-9.597885,25.994952),(-9.698654,25.994952),(-9.799371,25.994952),(-9.900037,25.994952),(-10.000806,25.994952),(-10.101523,25.994952),(-10.202292,25.994952),(-10.302958,25.994952),(-10.403675,25.994952),(-10.504445,25.994952),(-10.605162,25.994952),(-10.705879,25.994952),(-10.806597,25.994952),(-10.907314,25.994952),(-11.008083,25.994952),(-11.108749,25.994952),(-11.209518,25.994952),(-11.310235,25.994952),(-11.410953,25.994952),(-11.511722,25.994952),(-11.612439,25.994952),(-11.713208,25.994952),(-11.813822,25.994952),(-11.914591,25.994952),(-12.015308,25.9949),(-12.015308,25.919246),(-12.015308,25.843695),(-12.015308,25.768092),(-12.015308,25.69249),(-12.015308,25.616939),(-12.015308,25.541336),(-12.015308,25.465734),(-12.015308,25.390183),(-12.015308,25.31458),(-12.015308,25.238926),(-12.015308,25.163323),(-12.015308,25.087798),(-12.015308,25.012247),(-12.015308,24.936619),(-12.015308,24.861016),(-12.015308,24.785465),(-12.015308,24.709862),(-12.015308,24.63426),(-12.015308,24.558631),(-12.015308,24.48308),(-12.015308,24.407478),(-12.015308,24.331901),(-12.015308,24.256298),(-12.015308,24.180696),(-12.015308,24.105093),(-12.015308,24.029542),(-12.015308,23.95394),(-12.015308,23.878311),(-12.015308,23.802734),(-12.015308,23.727106),(-12.015308,23.651477),(-12.015308,23.575926),(-12.015308,23.495182),(-12.019339,23.460998),(-12.032723,23.444978),(-12.134578,23.419347),(-12.353892,23.322479),(-12.389911,23.312532),(-12.558376,23.290285),(-12.619432,23.270829),(-12.682219,23.230754),(-12.789938,23.161869),(-12.915098,23.082055),(-13.015247,23.018002),(-13.034342,22.995213),(-13.034342,22.995161),(-13.119892,22.88354),(-13.152293,22.820004),(-13.165497,22.752695),(-13.15498,22.688797),(-13.106353,22.560226),(-13.09333,22.495476),(-13.076833,22.245439),(-13.060335,21.995403),(-13.032093,21.581939),(-13.026177,21.49533),(-13.015247,21.333428),(-13.161724,21.333428),(-13.203091,21.333376),(-13.319854,21.333376),(-13.501419,21.333376),(-13.736909,21.333324),(-14.015496,21.333273),(-14.295598,21.333226),(-14.326485,21.333221),(-14.658971,21.333169),(-15.002258,21.333169),(-15.345544,21.333066),(-15.678082,21.333066),(-15.989019,21.333014),(-16.26771,21.332911),(-16.503148,21.332911),(-16.684636,21.332911),(-16.801425,21.332859),(-16.842817,21.332859),(-16.958831,21.332859),(-16.968339,21.324591),(-16.985703,21.237826),(-17.004926,21.141915),(-17.047378,21.0274),(-17.054019,20.995464),(-17.077428,20.904513),(-17.081175,20.874748),(-17.056874,20.766913),(-17.068349,20.792467),(-17.100209,20.837592),(-17.104644,20.862494),(-17.101389,20.876166),(-17.092275,20.899888),(-17.090403,20.914008),(-17.090403,20.961819),(-17.086293,20.979315),(-17.06786,21.030911),(-17.026763,21.328925),(-17.017445,21.365058),(-17.015248,21.379828),(-17.013743,21.419971),(-16.950149,21.429753),(-16.729956,21.469802),(-16.580043,21.48055),(-16.189886,21.48055),(-16.040024,21.500084),(-15.919876,21.500084),(-15.749964,21.490317),(-15.609818,21.469802),(-15.45993,21.450268),(-15.289992,21.450268),(-15.149872,21.440501),(-14.970167,21.440501),(-14.839813,21.450268),(-14.749974,21.500084),(-14.669875,21.599665),(-14.640109,21.679763),(-14.609827,21.750069),(-14.620085,21.820375),(-14.629852,21.860424),(-14.580036,21.91024),(-14.519988,21.990338),(-14.459914,22.040103),(-14.439915,22.080152),(-14.379841,22.120201),(-14.310052,22.190507),(-14.270003,22.240297),(-14.220187,22.309647),(-14.209955,22.370186),(-14.189904,22.450259),(-14.189904,22.589914),(-14.169906,22.759852),(-14.140088,22.870181),(-14.120089,22.960047),(-14.100065,23.099676),(-14.039991,23.33992),(-14.019992,23.410252),(-13.979943,23.519599),(-13.930127,23.620187),(-13.890129,23.690493),(-13.839797,23.750076),(-13.769982,23.790125),(-13.660118,23.830123),(-13.580045,23.870198),(-13.479948,23.910221),(-13.390108,23.940504),(-13.31001,23.980553),(-13.279753,24.019594),(-13.229963,24.0899),(-13.160122,24.219815),(-13.120099,24.299862),(-13.060025,24.400476),(-12.990184,24.4698),(-12.94688,24.496748),(-12.946879,24.496749),(-12.910137,24.51959),(-12.819781,24.570388),(-12.709943,24.629971),(-12.629845,24.679761),(-12.56003,24.730533),(-12.499982,24.7696),(-12.430141,24.830165),(-12.399884,24.879955),(-12.359835,24.969795),(-12.310019,25.110432),(-12.26997,25.259803),(-12.229946,25.42),(-12.200155,25.51958),(-12.169873,25.639728),(-12.129849,25.730549),(-12.100058,25.830156),(-12.080059,25.870205),(-12.080059,25.919969),(-12.060009,25.990301),(-12.055823,25.99583),(-12.055823,25.99583),(-12.029752,26.03035),(-11.959911,26.049884),(-11.879864,26.070399),(-11.753877,26.086006),(-11.717239,26.103576),(-11.698222,26.162177),(-11.683546,26.212975),(-11.63621,26.294985),(-11.582983,26.360408),(-11.55221,26.400457),(-11.510688,26.469807),(-11.469709,26.519597),(-11.398912,26.583081),(-11.3369,26.632897),(-11.315868,26.683644),(-11.315868,26.744208),(-11.36031,26.793043),(-11.391574,26.882908),(-11.262641,26.910219),(-11.149366,26.940501),(-11.045859,26.969802),(-10.921835,27.009825),(-10.829076,27.009825),(-10.756781,27.019592),(-10.653273,27.000058),(-10.550282,26.990292),(-10.477986,26.960035),(-10.353963,26.900478),(-10.250455,26.860429),(-10.188443,26.860429),(-10.122039,26.879962),(-10.065867,26.908281),(-10.031709,26.910219),(-9.979929,26.889729),(-9.899365,26.84968),(-9.816864,26.84968),(-9.734362,26.860429),(-9.672351,26.910219),(-9.568843,26.990292),(-9.486315,27.049875),(-9.412056,27.08796),(-9.352008,27.097727),(-9.284622,27.097727),(-9.207469,27.099691),(-9.083446,27.089924),(-9.000919,27.089924),(-8.888109,27.103566),(-8.793903,27.12018),(-8.752872,27.150463),(-8.752872,27.190486),(-8.773387,27.250069),(-8.795841,27.307688),(-8.801706,27.360424),(-8.788012,27.416054),(-8.773387,27.46003),(-8.783619,27.530362),(-8.81292,27.613354),(-8.818449,27.659398),(-8.817035,27.661464),(-8.817034,27.661465),(-8.816537,27.661465),(-8.752562,27.661439)]
+Scarborough Reef	[(117.753887,15.154369),(117.755692,15.151887),(117.753887,15.150082),(117.751856,15.151887),(117.753887,15.154369)]
+South Sudan	[(33.96912,9.838341),(33.904886,9.7107),(33.883905,9.619853),(33.877704,9.543424),(33.881425,9.499215),(33.888711,9.470818),(33.892019,9.464281),(33.894809,9.459475),(33.897755,9.456582),(33.900855,9.45529),(34.070698,9.454592),(34.083096,9.205117),(34.097473,8.915836),(34.11185,8.626555),(34.107251,8.601531),(34.103169,8.579322),(34.090249,8.556507),(34.069579,8.533615),(33.970774,8.445377),(33.95031,8.433207),(33.931706,8.428143),(33.875172,8.427936),(33.840859,8.423983),(33.824116,8.419487),(33.808096,8.412614),(33.797658,8.405612),(33.756213,8.370136),(33.751872,8.368793),(33.74102,8.367087),(33.695545,8.372875),(33.671309,8.400289),(33.651672,8.434499),(33.620407,8.460699),(33.600099,8.463955),(33.585371,8.458115),(33.57116,8.450131),(33.552143,8.446824),(33.537053,8.453206),(33.521964,8.465324),(33.505117,8.474884),(33.484757,8.474006),(33.490338,8.466513),(33.489924,8.462921),(33.480519,8.45765),(33.413133,8.449718),(33.400162,8.452638),(33.392101,8.451862),(33.384608,8.448013),(33.370862,8.437393),(33.361353,8.434293),(33.25273,8.458167),(33.23516,8.455635),(33.206427,8.430572),(33.207358,8.426593),(33.210355,8.420779),(33.202913,8.414113),(33.187824,8.411038),(33.174078,8.404475),(33.16953,8.397421),(33.167877,8.389722),(33.16798,8.372823),(33.166843,8.368276),(33.161882,8.361506),(33.161159,8.356106),(33.163329,8.352954),(33.172321,8.34652),(33.174078,8.343058),(33.171804,8.330888),(33.163123,8.312052),(33.161159,8.304585),(33.164363,8.292777),(33.171391,8.283113),(33.178419,8.275672),(33.185757,8.26451),(33.194852,8.259239),(33.208288,8.253683),(33.206893,8.240738),(33.199865,8.235519),(33.190511,8.232419),(33.181623,8.225726),(33.173975,8.21459),(33.169944,8.205495),(33.16829,8.195392),(33.16798,8.181362),(33.171081,8.175962),(33.184723,8.166247),(33.187824,8.160898),(33.185137,8.14108),(33.177282,8.127102),(33.164776,8.117051),(33.147516,8.109067),(33.117544,8.104158),(33.11341,8.099093),(33.111343,8.090644),(33.106589,8.08049),(33.100594,8.071033),(33.043853,8.013465),(33.031141,7.996309),(33.026077,7.986284),(33.021633,7.965251),(33.016775,7.958327),(33.012021,7.953314),(33.007569,7.944058),(33.006801,7.942462),(32.993572,7.928148),(32.9898,7.917244),(33.015018,7.850633),(33.023493,7.835078),(33.040753,7.824846),(33.044629,7.816423),(33.047677,7.807277),(33.051295,7.801127),(33.058323,7.797975),(33.085401,7.794978),(33.107519,7.785211),(33.120851,7.783299),(33.126949,7.791567),(33.132117,7.793944),(33.164518,7.801127),(33.172941,7.799628),(33.201467,7.788156),(33.233919,7.783195),(33.242394,7.780715),(33.257794,7.767434),(33.273503,7.749192),(33.29159,7.733069),(33.347142,7.718961),(33.359803,7.719272),(33.384401,7.735446),(33.393289,7.739735),(33.436491,7.748572),(33.462329,7.749502),(33.479537,7.743146),(33.488477,7.73617),(33.506823,7.73095),(33.516796,7.726093),(33.526511,7.717101),(33.540361,7.698911),(33.550851,7.691315),(33.572297,7.685217),(33.637202,7.691315),(33.647744,7.688627),(33.675029,7.670851),(33.706552,7.661859),(33.71606,7.657156),(33.729445,7.642119),(33.761071,7.598142),(33.811507,7.560987),(33.821429,7.558403),(33.842099,7.555922),(33.852538,7.553545),(33.882407,7.536079),(34.006534,7.409936),(34.02369,7.382445),(34.030615,7.3487),(34.031132,7.255372),(34.033612,7.250256),(34.04002,7.247259),(34.085909,7.211499),(34.113194,7.177548),(34.132417,7.163388),(34.151124,7.167471),(34.167764,7.175377),(34.181407,7.167212),(34.190915,7.149539),(34.195773,7.129023),(34.195773,7.09774),(34.195773,7.086959),(34.198253,7.064376),(34.206005,7.054506),(34.213756,7.051974),(34.219957,7.046134),(34.229879,7.03337),(34.270807,7.003398),(34.275665,6.997403),(34.280729,6.980092),(34.287653,6.975286),(34.294475,6.972237),(34.297575,6.968568),(34.439169,6.934875),(34.503661,6.89002),(34.512343,6.876842),(34.519061,6.861649),(34.523298,6.844183),(34.524745,6.824572),(34.522575,6.821781),(34.513273,6.815296),(34.511102,6.814314),(34.512136,6.808268),(34.516683,6.798062),(34.517924,6.793824),(34.524745,6.752871),(34.53632,6.743078),(34.553994,6.739254),(34.596679,6.739202),(34.618486,6.736541),(34.635539,6.729823),(34.703545,6.684916),(34.709643,6.674012),(34.714501,6.655667),(34.726593,6.641947),(34.733518,6.637606),(34.743543,6.596808),(34.753878,6.556423),(34.776099,6.499449),(34.784264,6.44183),(34.792739,6.421676),(34.832633,6.353541),(34.839041,6.327599),(34.839764,6.268688),(34.844725,6.248689),(34.879969,6.187634),(34.898882,6.13867),(34.915522,6.119705),(34.934436,6.102368),(34.951489,6.08118),(34.959447,6.061724),(34.967964,6.008131),(34.969782,5.996689),(34.95924,5.975502),(34.955726,5.964211),(34.955313,5.952558),(34.960377,5.941706),(34.97681,5.924032),(34.979911,5.912844),(34.977741,5.898659),(34.974537,5.887239),(34.972676,5.876257),(34.974433,5.863106),(34.984355,5.841014),(35.06528,5.726447),(35.079543,5.699782),(35.088225,5.64175),(35.098663,5.622474),(35.143312,5.58966),(35.22341,5.542996),(35.261961,5.511887),(35.269299,5.491785),(35.27364,5.479873),(35.267645,5.468556),(35.258964,5.458143),(35.251832,5.447369),(35.250695,5.435147),(35.254623,5.425923),(35.287489,5.374092),(35.302372,5.357374),(35.320769,5.348719),(35.344953,5.352362),(35.367484,5.368046),(35.408205,5.412565),(35.430219,5.427215),(35.448203,5.430755),(35.469287,5.430755),(35.490164,5.428042),(35.508044,5.423417),(35.530782,5.410084),(35.57388,5.375332),(35.598168,5.368743),(35.621939,5.373782),(35.639819,5.382076),(35.658319,5.386417),(35.683641,5.379595),(35.749373,5.339158),(35.80415,5.318023),(35.809111,5.309109),(35.782033,5.26986),(35.775315,5.24658),(35.778415,5.22715),(35.798259,5.189271),(35.807147,5.165267),(35.807354,5.144674),(35.799189,5.124624),(35.760949,5.076332),(35.755884,5.063439),(35.751647,4.854356),(35.760018,4.805728),(35.784513,4.764181),(35.920835,4.619332),(35.856536,4.619603),(35.781222,4.619922),(35.778439,4.678338),(35.739402,4.681127),(35.711518,4.661608),(35.705939,4.619962),(35.705846,4.619447),(35.700365,4.589111),(35.61214,4.619497),(35.610641,4.620014),(35.562607,4.707137),(35.52218,4.780461),(35.570836,4.904313),(35.49564,4.926429),(35.396117,4.926429),(35.433715,5.003836),(35.411598,5.030376),(35.333563,4.987281),(35.263419,4.948545),(35.245726,4.98172),(35.176189,4.955564),(35.094298,4.924761),(35.00272,4.890314),(34.920829,4.859511),(34.844751,4.830895),(34.763589,4.800366),(34.666277,4.76498),(34.598159,4.73092),(34.529156,4.696419),(34.459674,4.660609),(34.381188,4.620158),(34.280109,4.520061),(34.179133,4.419912),(34.078157,4.319841),(33.977078,4.219692),(33.896049,4.138353),(33.813677,4.056033),(33.701901,3.944076),(33.606196,3.848087),(33.532609,3.774293),(33.527716,3.771431),(33.490648,3.749746),(33.447343,3.744372),(33.286526,3.752537),(33.19542,3.757059),(33.164466,3.763053),(33.143486,3.774086),(33.01724,3.87718),(32.997241,3.885526),(32.979568,3.879196),(32.9189,3.83416),(32.840352,3.794291),(32.756429,3.769022),(32.599281,3.756283),(32.415571,3.741297),(32.371801,3.731065),(32.187782,3.61916),(32.175948,3.605595),(32.174863,3.59265),(32.179203,3.556864),(32.178997,3.541361),(32.175929,3.527234),(32.174552,3.520897),(32.16799,3.512242),(32.155846,3.511776),(32.093007,3.524463),(32.076161,3.53317),(32.060864,3.548958),(32.054226,3.559572),(32.041537,3.57986),(32.030168,3.585932),(32.022236,3.58642),(31.943662,3.591255),(31.93002,3.59836),(31.923095,3.615284),(31.920046,3.661302),(31.916274,3.680267),(31.901908,3.704297),(31.830697,3.783879),(31.80703,3.803722),(31.801107,3.806472),(31.780985,3.815815),(31.777884,3.816435),(31.775714,3.810699),(31.696132,3.721273),(31.68683,3.712824),(31.668537,3.70502),(31.564771,3.689802),(31.547201,3.680991),(31.535522,3.666444),(31.53452,3.665563),(31.523739,3.656083),(31.505446,3.659855),(31.377702,3.729308),(31.29502,3.774189),(31.255745,3.786669),(31.214818,3.792354),(31.167585,3.792405),(31.141489,3.785119),(31.104408,3.756175),(31.077668,3.735303),(31.068677,3.731737),(31.04966,3.727991),(31.040358,3.724218),(31.009559,3.699775),(30.995968,3.693522),(30.985788,3.692127),(30.965996,3.692618),(30.955505,3.689001),(30.944447,3.679286),(30.939382,3.668408),(30.936282,3.656858),(30.931734,3.645102),(30.865692,3.548958),(30.843781,3.505911),(30.839543,3.490202),(30.827658,3.511105),(30.837683,3.562678),(30.823214,3.580429),(30.792105,3.592702),(30.779082,3.602598),(30.772261,3.617558),(30.76916,3.651845),(30.765129,3.661716),(30.746939,3.674867),(30.731333,3.663498),(30.714642,3.64381),(30.693351,3.63195),(30.665394,3.632053),(30.653767,3.630606),(30.636455,3.624095),(30.604932,3.60668),(30.592427,3.603528),(30.572635,3.601047),(30.562248,3.601358),(30.553463,3.60451),(30.543024,3.612907),(30.543438,3.617868),(30.549329,3.624095),(30.55491,3.636394),(30.562248,3.675332),(30.562868,3.694866),(30.53889,3.84155),(30.525247,3.867543),(30.515532,3.87085),(30.505507,3.869765),(30.495482,3.867078),(30.48587,3.865579),(30.465716,3.866096),(30.456828,3.867595),(30.418949,3.879713),(30.33792,3.927875),(30.270948,3.94945),(30.205887,3.95038),(30.189351,3.95609),(30.182116,3.965521),(30.180462,3.97565),(30.180359,3.986218),(30.178085,3.997096),(30.171574,4.00818),(30.147493,4.036654),(30.138501,4.059702),(30.133023,4.082801),(30.122688,4.102464),(30.099795,4.115099),(30.057782,4.123651),(30.0429,4.133108),(30.027913,4.15445),(30.004762,4.19928),(29.989363,4.21778),(29.966005,4.23181),(29.954171,4.233825),(29.942647,4.233774),(29.932157,4.236151),(29.924147,4.245582),(29.923217,4.257752),(29.929315,4.268371),(29.93686,4.278319),(29.940115,4.288344),(29.930348,4.308653),(29.908489,4.329194),(29.882703,4.344025),(29.860689,4.347281),(29.814852,4.346764),(29.787825,4.368804),(29.776198,4.405624),(29.776766,4.449342),(29.785654,4.479366),(29.786998,4.489675),(29.785448,4.498564),(29.778523,4.5151),(29.777696,4.523859),(29.783691,4.533833),(29.788295,4.539366),(29.793302,4.545383),(29.796713,4.556028),(29.784621,4.563288),(29.774492,4.5675),(29.751755,4.581272),(29.74514,4.583907),(29.722919,4.578197),(29.715323,4.57967),(29.700802,4.5883),(29.671863,4.613983),(29.660287,4.622122),(29.618533,4.641578),(29.606751,4.643904),(29.576675,4.644446),(29.546392,4.657365),(29.535024,4.660699),(29.528822,4.659872),(29.513268,4.652146),(29.508462,4.65535),(29.498127,4.665608),(29.494096,4.668295),(29.472599,4.672197),(29.457612,4.669535),(29.449241,4.657055),(29.44676,4.622122),(29.44366,4.604707),(29.44459,4.594475),(29.44273,4.583442),(29.423919,4.566053),(29.417305,4.555485),(29.410897,4.532283),(29.402629,4.512077),(29.390226,4.493758),(29.33886,4.449549),(29.328938,4.434924),(29.318706,4.411076),(29.303927,4.387149),(29.28739,4.383584),(29.267443,4.387873),(29.242845,4.387356),(29.23158,4.375548),(29.228686,4.356712),(29.221296,4.340692),(29.19613,4.337075),(29.173495,4.348004),(29.10983,4.412367),(29.098564,4.420532),(29.058877,4.437689),(29.055983,4.4365),(29.053193,4.450789),(29.042341,4.455336),(28.994075,4.487453),(28.98622,4.495928),(28.925552,4.480813),(28.903641,4.478591),(28.856202,4.482467),(28.825713,4.478384),(28.815274,4.478281),(28.789953,4.48859),(28.785095,4.507995),(28.783648,4.530371),(28.769179,4.549775),(28.755433,4.553987),(28.746855,4.54931),(28.738173,4.540887),(28.72453,4.533988),(28.704067,4.533988),(28.695178,4.532593),(28.653734,4.452701),(28.638644,4.432082),(28.623658,4.422367),(28.58242,4.412626),(28.570535,4.405107),(28.566711,4.394126),(28.564282,4.382602),(28.557306,4.373533),(28.54821,4.37082),(28.538495,4.371827),(28.52878,4.373843),(28.519272,4.374411),(28.496844,4.369011),(28.482426,4.358986),(28.443927,4.308498),(28.425427,4.290824),(28.404137,4.277828),(28.381502,4.275296),(28.357421,4.282866),(28.349101,4.292349),(28.345846,4.306379),(28.336854,4.327489),(28.303161,4.352242),(28.261045,4.350382),(28.216965,4.342036),(28.177587,4.347229),(28.158725,4.360794),(28.140225,4.37932),(28.112371,4.414641),(28.108341,4.433994),(28.101726,4.442133),(28.085551,4.443322),(28.076301,4.437689),(28.059765,4.420067),(28.04974,4.419137),(28.019044,4.462752),(28.014186,4.472209),(28.011241,4.480141),(28.009587,4.488383),(28.008915,4.499081),(28.012119,4.521766),(28.01708,4.539052),(28.014031,4.550033),(27.96251,4.557449),(27.951244,4.55595),(27.944526,4.557294),(27.934294,4.568172),(27.92923,4.569981),(27.920342,4.565278),(27.916104,4.562152),(27.917861,4.560756),(27.917035,4.558431),(27.916414,4.553573),(27.914037,4.54931),(27.907939,4.54869),(27.89099,4.555847),(27.885512,4.556674),(27.856935,4.552462),(27.849132,4.553212),(27.83766,4.559981),(27.819469,4.579567),(27.809238,4.58799),(27.801383,4.590574),(27.776888,4.595741),(27.772444,4.595819),(27.765209,4.612071),(27.760765,4.635997),(27.758801,4.677157),(27.766863,4.735449),(27.763142,4.757101),(27.759215,4.766273),(27.7526,4.777668),(27.744229,4.787848),(27.734823,4.793197),(27.725832,4.792784),(27.706505,4.787435),(27.699063,4.787435),(27.685938,4.797899),(27.679736,4.814488),(27.671882,4.855906),(27.658756,4.879652),(27.640979,4.890943),(27.552716,4.900529),(27.532562,4.907583),(27.514578,4.92244),(27.509204,4.932439),(27.505018,4.953859),(27.501349,4.96329),(27.492823,4.973031),(27.461558,4.99688),(27.45453,4.999799),(27.447864,5.003468),(27.441818,5.007964),(27.43634,5.013158),(27.443058,5.05778),(27.441301,5.070725),(27.431173,5.083618),(27.402131,5.104496),(27.385801,5.143847),(27.358516,5.166766),(27.30131,5.205187),(27.280898,5.23056),(27.264465,5.260145),(27.2378,5.32319),(27.233665,5.33828),(27.228239,5.387605),(27.220126,5.413082),(27.218059,5.42551),(27.220126,5.440883),(27.260744,5.550257),(27.258884,5.559972),(27.261054,5.577593),(27.257127,5.586068),(27.247515,5.592605),(27.240073,5.591985),(27.234596,5.588833),(27.231082,5.587593),(27.227309,5.586714),(27.222607,5.584363),(27.217336,5.585397),(27.211341,5.594879),(27.210669,5.601623),(27.215165,5.616144),(27.216716,5.633456),(27.219196,5.639993),(27.218369,5.645315),(27.201109,5.656968),(27.196407,5.661464),(27.194288,5.667304),(27.193823,5.676321),(27.190774,5.691824),(27.182351,5.707456),(27.170413,5.72035),(27.156254,5.727481),(27.136307,5.734018),(27.131449,5.741459),(27.130933,5.752131),(27.123801,5.768745),(27.11481,5.775282),(27.072745,5.791224),(27.063547,5.790862),(27.045356,5.784919),(27.036055,5.785126),(27.029543,5.78988),(27.021999,5.805099),(27.003499,5.819284),(26.99182,5.847706),(26.981071,5.859204),(26.937456,5.848507),(26.916475,5.849644),(26.903763,5.866982),(26.894255,5.889667),(26.882059,5.891941),(26.865316,5.885973),(26.842165,5.884267),(26.81891,5.894628),(26.810849,5.912379),(26.805061,5.957183),(26.794364,5.970489),(26.776329,5.981884),(26.705016,6.009789),(26.634322,6.006482),(26.602179,6.010616),(26.543578,6.030847),(26.527972,6.043172),(26.51805,6.061156),(26.509885,6.082679),(26.498827,6.099836),(26.48105,6.104951),(26.440639,6.076995),(26.424826,6.072447),(26.421312,6.09366),(26.42927,6.113091),(26.4456,6.130221),(26.46534,6.144303),(26.48353,6.154457),(26.500067,6.167971),(26.509472,6.186394),(26.508955,6.205462),(26.495829,6.221146),(26.4795,6.225073),(26.464927,6.224402),(26.455625,6.230474),(26.455315,6.254451),(26.452008,6.28029),(26.436195,6.29171),(26.394647,6.300547),(26.375837,6.312587),(26.351755,6.344368),(26.335219,6.360595),(26.315789,6.371576),(26.300699,6.377829),(26.28964,6.387208),(26.282819,6.407853),(26.285093,6.425888),(26.290674,6.444672),(26.289124,6.459426),(26.27021,6.465653),(26.277031,6.477358),(26.286436,6.484179),(26.296462,6.489527),(26.30504,6.496917),(26.324367,6.537199),(26.356096,6.579496),(26.372323,6.609804),(26.379867,6.619778),(26.379224,6.631362),(26.378007,6.65329),(26.329741,6.680575),(26.270623,6.702486),(26.236207,6.72003),(26.219464,6.737523),(26.178743,6.765919),(26.147634,6.804702),(26.131821,6.81173),(26.113734,6.816458),(26.091203,6.830334),(26.080971,6.842348),(26.077354,6.85333),(26.0757,6.864647),(26.071566,6.877462),(26.071152,6.88356),(26.073116,6.88971),(26.073633,6.895136),(26.069189,6.899063),(26.063401,6.899063),(26.05689,6.89741),(26.050585,6.896686),(26.045418,6.899683),(26.035806,6.922266),(26.032292,6.974097),(26.026091,6.99668),(25.981132,7.000297),(25.969453,7.003553),(25.966766,7.009857),(25.966249,7.017454),(25.960461,7.024482),(25.950436,7.028564),(25.930386,7.03151),(25.920257,7.034145),(25.888735,7.05187),(25.884084,7.061069),(25.881707,7.079827),(25.877469,7.087734),(25.860726,7.095537),(25.815767,7.099774),(25.800781,7.104942),(25.791686,7.121117),(25.791583,7.134398),(25.786209,7.142666),(25.7613,7.143751),(25.750242,7.146542),(25.734429,7.162406),(25.724507,7.166695),(25.705077,7.166385),(25.697015,7.168607),(25.672727,7.187831),(25.65402,7.195376),(25.592422,7.211241),(25.576609,7.219819),(25.53165,7.260695),(25.516768,7.269945),(25.500335,7.272787),(25.481163,7.266173),(25.455118,7.278213),(25.416154,7.307772),(25.360033,7.335574),(25.346804,7.345031),(25.335952,7.359604),(25.330577,7.374125),(25.32417,7.402908),(25.316211,7.417223),(25.3097,7.422029),(25.292957,7.427196),(25.285102,7.431589),(25.279211,7.438358),(25.269599,7.454223),(25.263295,7.461044),(25.249962,7.469984),(25.190431,7.501197),(25.169037,7.551168),(25.164593,7.567343),(25.165213,7.5799),(25.186504,7.600106),(25.252546,7.62243),(25.274974,7.641964),(25.279418,7.659482),(25.276421,7.674261),(25.270633,7.688162),(25.266809,7.703097),(25.270633,7.746143),(25.269909,7.760768),(25.264535,7.777718),(25.249652,7.804331),(25.23942,7.835957),(25.229705,7.851615),(25.216889,7.864069),(25.191568,7.872389),(25.18547,7.877918),(25.180509,7.884016),(25.173171,7.888564),(25.148573,7.892594),(25.134414,7.892543),(25.103408,7.885773),(25.089559,7.884895),(25.059173,7.896108),(25.029304,7.918846),(24.981245,7.972331),(24.972666,7.976982),(24.964812,7.982615),(24.958094,7.989178),(24.952616,7.996567),(24.950549,8.014396),(24.930085,8.035454),(24.927811,8.070956),(24.917993,8.087027),(24.832107,8.16573),(24.800171,8.180277),(24.742293,8.18684),(24.710564,8.204307),(24.69041,8.206632),(24.670876,8.206839),(24.614859,8.217148),(24.544682,8.206115),(24.51285,8.207149),(24.481327,8.226657),(24.471508,8.22893),(24.464274,8.233194),(24.458899,8.239757),(24.454869,8.248671),(24.431097,8.271408),(24.396578,8.267817),(24.332085,8.245725),(24.326814,8.248567),(24.310278,8.261564),(24.302733,8.26544),(24.295498,8.266525),(24.281029,8.266525),(24.263186,8.268505),(24.257051,8.269186),(24.222428,8.277196),(24.206615,8.283268),(24.17995,8.297712),(24.152872,8.317891),(24.131374,8.343058),(24.121556,8.372307),(24.125173,8.404889),(24.137162,8.438866),(24.193179,8.532426),(24.203204,8.543459),(24.243719,8.570176),(24.25054,8.579632),(24.245579,8.591802),(24.218397,8.613041),(24.211266,8.627071),(24.21509,8.64136),(24.233487,8.667767),(24.235761,8.682003),(24.217674,8.691512),(24.180467,8.690711),(24.170328,8.689327),(24.174782,8.695646),(24.176953,8.709857),(24.182999,8.717919),(24.240566,8.761534),(24.270849,8.775719),(24.380093,8.844216),(24.402882,8.848893),(24.493833,8.858349),(24.542874,8.874653),(24.552795,8.880079),(24.558377,8.886746),(24.558377,8.993354),(24.559307,8.999865),(24.565353,9.014851),(24.655993,9.167297),(24.659869,9.176986),(24.660954,9.182283),(24.680178,9.373357),(24.686999,9.391366),(24.694957,9.402916),(24.723948,9.429219),(24.785236,9.497509),(24.792522,9.520402),(24.794383,9.532184),(24.792677,9.798369),(24.796398,9.818859),(24.799809,9.825215),(24.803685,9.829169),(24.807302,9.830047),(24.816759,9.830745),(24.827611,9.832683),(24.836292,9.836636),(24.844819,9.841674),(24.879287,9.869915),(24.913859,9.890715),(24.926933,9.90521),(24.954373,9.942237),(24.967861,9.955957),(24.976284,9.967351),(24.984965,9.985593),(24.990702,10.00306),(25.016901,10.056752),(25.027754,10.086155),(25.028994,10.092047),(25.029304,10.098248),(25.028684,10.103906),(25.025583,10.114164),(25.017367,10.133),(25.015816,10.138039),(25.013646,10.149072),(25.014421,10.157366),(25.017057,10.168011),(25.067028,10.27493),(25.07695,10.286867),(25.084081,10.293223),(25.090282,10.295755),(25.105992,10.300354),(25.120564,10.30609),(25.131261,10.308287),(25.156893,10.306245),(25.168365,10.308132),(25.19255,10.317433),(25.198286,10.317588),(25.209965,10.316116),(25.216631,10.316968),(25.225623,10.320611),(25.232754,10.322317),(25.239575,10.323014),(25.251512,10.320999),(25.25699,10.319216),(25.267067,10.314798),(25.272803,10.313015),(25.278694,10.312007),(25.28474,10.311852),(25.290166,10.313093),(25.299778,10.316658),(25.305359,10.317123),(25.316211,10.315573),(25.321999,10.315651),(25.327425,10.316581),(25.346029,10.325262),(25.351145,10.326813),(25.362927,10.32813),(25.369335,10.328208),(25.381272,10.329448),(25.391504,10.332652),(25.400961,10.336993),(25.415844,10.342031),(25.427212,10.344124),(25.439305,10.345209),(25.479509,10.343814),(25.490826,10.345597),(25.503383,10.349163),(25.506484,10.349628),(25.58033,10.375311),(25.623324,10.385853),(25.629061,10.386706),(25.661358,10.387016),(25.684148,10.390685),(25.699961,10.395026),(25.705748,10.395956),(25.745901,10.394405),(25.753962,10.395336),(25.762799,10.397739),(25.78378,10.407893),(25.82848,10.419546),(25.839332,10.420554),(25.843053,10.417815),(25.886512,10.364304),(25.891628,10.355984),(25.893644,10.351333),(25.894884,10.34583),(25.90093,10.191059),(25.902791,10.185529),(25.905426,10.181266),(25.911937,10.174212),(25.919689,10.167856),(25.955707,10.146901),(25.9709,10.140312),(25.998082,10.132458),(26.000872,10.131062),(26.007229,10.125998),(26.010794,10.122691),(26.016685,10.114862),(26.076423,10.01771),(26.088206,10.002827),(26.102313,9.988163),(26.102623,9.987841),(26.179466,9.95898),(26.368163,9.739717),(26.556859,9.520454),(26.600887,9.49198),(26.625744,9.480663),(26.683621,9.476012),(26.694318,9.476942),(27.080393,9.606831),(27.33924,9.612799),(27.385129,9.60479),(27.528066,9.605358),(27.609301,9.595178),(27.615089,9.595798),(27.635915,9.601379),(27.641496,9.601947),(27.769602,9.583318),(27.868355,9.588511),(27.884788,9.591379),(27.895072,9.59541),(27.997076,9.38493),(28.04511,9.331407),(28.44383,9.327981),(28.84255,9.324556),(28.843841,9.324545),(28.831489,9.349248),(28.827372,9.38493),(28.828745,9.427474),(28.84933,9.465901),(28.913833,9.529031),(28.989476,9.58709),(29.009474,9.603239),(29.132258,9.667731),(29.252354,9.711165),(29.483089,9.761679),(29.567321,9.841364),(29.613882,9.914461),(29.615432,10.058147),(29.64587,10.081711),(29.700957,10.115017),(29.967814,10.243329),(30.012979,10.270485),(30.248779,10.121257),(30.484578,9.972028),(30.749265,9.735763),(30.765284,9.724291),(30.779082,9.719873),(30.793035,9.728012),(30.804817,9.738942),(30.824092,9.746176),(30.83696,9.749354),(30.94991,9.752446),(30.950234,9.752455),(31.164382,9.764005),(31.234817,9.792323),(31.449816,10.003279),(31.664816,10.214236),(31.774215,10.348775),(31.801965,10.376241),(31.864184,10.472127),(31.929865,10.636923),(31.942887,10.655552),(32.17848,10.853202),(32.414073,11.050851),(32.430713,11.082193),(32.435363,11.107023),(32.364153,11.240013),(32.348754,11.30758),(32.345705,11.41163),(32.359812,11.573481),(32.354852,11.675774),(32.352991,11.687376),(32.34834,11.703163),(32.34524,11.709106),(32.082207,11.999811),(32.414434,12.001271),(32.746662,12.002731),(32.748213,12.026812),(32.747592,12.039525),(32.745577,12.051126),(32.73302,12.085982),(32.725733,12.132336),(32.725268,12.145255),(32.726198,12.157941),(32.730074,12.181893),(32.730384,12.194864),(32.729712,12.201065),(32.728524,12.206853),(32.728834,12.211917),(32.731779,12.216155),(33.209218,12.210367),(33.203017,12.128098),(33.144984,11.934673),(33.146018,11.81866),(33.132427,11.686213),(33.129016,11.67549),(33.115994,11.646939),(33.104573,11.630583),(33.091447,11.614796),(33.087727,11.608853),(33.083231,11.599164),(33.082921,11.584565),(33.132504,11.213903),(33.182088,10.843241),(33.178367,10.824534),(33.174646,10.812287),(33.14824,10.766036),(33.141418,10.750818),(33.140023,10.739036),(33.15072,10.730974),(33.370603,10.650901),(33.3813,10.645785),(33.389827,10.639248),(33.468995,10.543905),(33.685545,10.367973),(33.902096,10.192041),(33.916978,10.174522),(33.961782,10.064038),(33.966794,10.047269),(33.968345,10.020811),(33.96726,10.000269),(33.956097,9.933994),(33.959818,9.904203),(33.96726,9.884514),(33.973254,9.861776),(33.973254,9.854852),(33.972376,9.848883),(33.96912,9.838341)]
+Senegal	[(-14.912496,16.640639),(-14.882007,16.647667),(-14.711216,16.635782),(-14.699692,16.637125),(-14.665896,16.645652),(-14.655974,16.64591),(-14.647189,16.643533),(-14.619077,16.630666),(-14.60807,16.628805),(-14.597011,16.629167),(-14.555128,16.640587),(-14.544456,16.640846),(-14.503916,16.632681),(-14.49309,16.632474),(-14.482393,16.633663),(-14.471954,16.636402),(-14.462058,16.640794),(-14.435832,16.655987),(-14.426247,16.659604),(-14.406635,16.660793),(-14.343254,16.63666),(-14.335529,16.631544),(-14.331343,16.624103),(-14.331756,16.613147),(-14.337027,16.59413),(-14.335322,16.586482),(-14.325968,16.5824),(-14.28765,16.585707),(-14.277961,16.581263),(-14.274576,16.573511),(-14.273258,16.555631),(-14.268065,16.54788),(-14.257652,16.543177),(-14.233674,16.541575),(-14.22228,16.539612),(-14.214166,16.534961),(-14.197191,16.513463),(-14.190085,16.507107),(-14.166392,16.490881),(-14.13244,16.45264),(-14.073038,16.400654),(-14.039836,16.382102),(-14.033066,16.376056),(-14.0156,16.35585),(-14.006711,16.350269),(-13.987049,16.34288),(-13.97785,16.33797),(-13.971856,16.331201),(-13.971158,16.324224),(-13.977463,16.308825),(-13.979323,16.30035),(-13.977282,16.293839),(-13.967437,16.281385),(-13.963045,16.272393),(-13.962683,16.26397),(-13.967799,16.246038),(-13.964078,16.23007),(-13.947051,16.22113),(-13.907829,16.210019),(-13.899586,16.205317),(-13.883825,16.193741),(-13.877236,16.186868),(-13.872275,16.178755),(-13.863826,16.151832),(-13.859072,16.142272),(-13.852767,16.133487),(-13.844835,16.126045),(-13.835766,16.120568),(-13.827317,16.1185),(-13.819203,16.119276),(-13.811323,16.122066),(-13.794941,16.131213),(-13.778818,16.143202),(-13.771997,16.150437),(-13.754246,16.175345),(-13.746701,16.182373),(-13.738226,16.187127),(-13.729416,16.189504),(-13.72014,16.189969),(-13.71058,16.188884),(-13.712621,16.176068),(-13.718306,16.159288),(-13.722775,16.146096),(-13.719571,16.135605),(-13.714843,16.132763),(-13.704482,16.128836),(-13.69996,16.125632),(-13.698849,16.123926),(-13.697299,16.120361),(-13.696007,16.118914),(-13.693578,16.117519),(-13.687454,16.115245),(-13.68469,16.113798),(-13.678127,16.108217),(-13.675931,16.106925),(-13.668954,16.105736),(-13.662417,16.107442),(-13.635029,16.121601),(-13.629267,16.12279),(-13.610482,16.122893),(-13.606968,16.123255),(-13.599398,16.125477),(-13.569064,16.138189),(-13.516405,16.149041),(-13.502789,16.154416),(-13.497259,16.156069),(-13.491549,16.156276),(-13.484934,16.154984),(-13.4831,16.141031),(-13.499869,16.110646),(-13.501703,16.095143),(-13.491549,16.088425),(-13.455091,16.102222),(-13.440028,16.101861),(-13.435067,16.096538),(-13.427031,16.08305),(-13.422096,16.077211),(-13.394578,16.059279),(-13.388558,16.052096),(-13.386052,16.044396),(-13.385044,16.026878),(-13.383674,16.019178),(-13.369774,15.985485),(-13.36334,15.975098),(-13.355795,15.965538),(-13.34701,15.956753),(-13.321766,15.93815),(-13.315927,15.93045),(-13.31373,15.92213),(-13.314351,15.913603),(-13.318175,15.896705),(-13.318175,15.888489),(-13.31603,15.881771),(-13.311767,15.875776),(-13.293654,15.855312),(-13.284766,15.839913),(-13.27996,15.82286),(-13.279676,15.803533),(-13.281898,15.795109),(-13.285231,15.786634),(-13.287453,15.778159),(-13.286135,15.769633),(-13.280968,15.762812),(-13.273965,15.757489),(-13.258669,15.748807),(-13.250659,15.742761),(-13.243941,15.735785),(-13.232547,15.71961),(-13.228258,15.71129),(-13.227121,15.703952),(-13.228878,15.696614),(-13.243993,15.673721),(-13.247662,15.665608),(-13.248747,15.65672),(-13.2473,15.648297),(-13.237844,15.62344),(-13.222806,15.623854),(-13.192808,15.62897),(-13.178235,15.628194),(-13.171052,15.625352),(-13.152552,15.612407),(-13.145239,15.609539),(-13.122218,15.603493),(-13.109712,15.596413),(-13.099015,15.586879),(-13.091806,15.575123),(-13.089455,15.561041),(-13.095087,15.523421),(-13.094958,15.514713),(-13.093098,15.506212),(-13.089584,15.49704),(-13.083845,15.49275),(-13.05323,15.485102),(-13.038889,15.486885),(-13.023774,15.495954),(-13.010545,15.50629),(-12.995843,15.514222),(-12.980185,15.516289),(-12.96432,15.509158),(-12.958016,15.501742),(-12.954941,15.493061),(-12.95091,15.465414),(-12.947603,15.458618),(-12.937552,15.445777),(-12.933056,15.438284),(-12.93117,15.430532),(-12.931015,15.397046),(-12.927217,15.380742),(-12.918974,15.365368),(-12.90683,15.352682),(-12.847273,15.313278),(-12.834535,15.30023),(-12.828049,15.283874),(-12.83345,15.269999),(-12.850038,15.26739),(-12.884196,15.270826),(-12.894376,15.263359),(-12.888356,15.250879),(-12.865489,15.228684),(-12.856782,15.221992),(-12.847893,15.218943),(-12.838333,15.218762),(-12.816965,15.223077),(-12.806397,15.223077),(-12.79632,15.220287),(-12.787225,15.214163),(-12.78198,15.20729),(-12.779474,15.199616),(-12.779267,15.191399),(-12.784667,15.166026),(-12.783995,15.158146),(-12.780921,15.149076),(-12.779758,15.146389),(-12.754566,15.13856),(-12.746639,15.131136),(-12.717049,15.10342),(-12.690306,15.092387),(-12.689585,15.092479),(-12.679273,15.093783),(-12.647647,15.103162),(-12.632273,15.105436),(-12.622946,15.102258),(-12.615065,15.094609),(-12.602146,15.078771),(-12.547059,15.047171),(-12.529592,15.034355),(-12.518973,15.028283),(-12.495563,15.023012),(-12.484892,15.017276),(-12.476262,15.007741),(-12.471508,14.998),(-12.448202,14.918212),(-12.447633,14.907437),(-12.433836,14.899428),(-12.400091,14.860386),(-12.382495,14.84602),(-12.319579,14.817185),(-12.26413,14.774939),(-12.256508,14.745794),(-12.236613,14.728456),(-12.230489,14.714555),(-12.222815,14.70329),(-12.207648,14.696598),(-12.191422,14.693445),(-12.180311,14.692825),(-12.185841,14.68081),(-12.190285,14.673653),(-12.192197,14.666884),(-12.18982,14.655954),(-12.182792,14.650244),(-12.172611,14.647918),(-12.165015,14.641872),(-12.165945,14.625181),(-12.171526,14.616422),(-12.191008,14.597999),(-12.198398,14.58756),(-12.200465,14.577354),(-12.201447,14.565184),(-12.204186,14.554255),(-12.211472,14.547976),(-12.230386,14.536685),(-12.236432,14.519451),(-12.234184,14.498574),(-12.222428,14.454933),(-12.21987,14.434598),(-12.22173,14.391242),(-12.208837,14.388761),(-12.115612,14.35512),(-12.108688,14.34202),(-12.113029,14.329592),(-12.127808,14.324295),(-12.119591,14.310575),(-12.10998,14.298146),(-12.097784,14.28807),(-12.058355,14.274091),(-12.044299,14.264919),(-12.03448,14.250268),(-11.997583,14.166165),(-11.995413,14.144022),(-12.002751,14.103456),(-12.02523,14.026742),(-12.025334,13.985246),(-12.015308,13.959304),(-11.99903,13.943569),(-11.980375,13.929642),(-11.962908,13.909152),(-11.956811,13.890342),(-11.956966,13.870007),(-11.962908,13.829467),(-11.978825,13.784819),(-12.012311,13.751177),(-12.097629,13.70441),(-12.083883,13.692964),(-12.070395,13.673249),(-12.049828,13.634363),(-12.037323,13.598267),(-12.015153,13.564444),(-11.996808,13.544161),(-11.939034,13.50295),(-11.932729,13.496051),(-11.923841,13.481142),(-11.918157,13.474708),(-11.907718,13.469644),(-11.898468,13.468507),(-11.890406,13.465148),(-11.883482,13.453547),(-11.885652,13.43577),(-11.899967,13.382182),(-11.897589,13.371175),(-11.888804,13.368875),(-11.862346,13.356085),(-11.854595,13.350556),(-11.850771,13.34314),(-11.844569,13.323839),(-11.840022,13.316889),(-11.828136,13.307277),(-11.822555,13.306708),(-11.817078,13.312341),(-11.775116,13.343347),(-11.772533,13.362674),(-11.76659,13.383164),(-11.756513,13.399803),(-11.741217,13.407813),(-11.726902,13.405798),(-11.719771,13.397891),(-11.714035,13.388099),(-11.70401,13.380373),(-11.694501,13.379184),(-11.674967,13.383215),(-11.649801,13.38412),(-11.645253,13.379753),(-11.646597,13.365516),(-11.643962,13.355594),(-11.632903,13.35438),(-11.620345,13.357532),(-11.613111,13.360813),(-11.613007,13.339058),(-11.605824,13.319653),(-11.581175,13.286141),(-11.55854,13.266504),(-11.554251,13.256866),(-11.555802,13.245911),(-11.568566,13.227902),(-11.572338,13.217101),(-11.569341,13.199195),(-11.559729,13.186922),(-11.547843,13.176199),(-11.538542,13.16297),(-11.538077,13.128011),(-11.533064,13.111811),(-11.515391,13.107754),(-11.501541,13.099589),(-11.489707,13.090778),(-11.477098,13.083285),(-11.46082,13.079177),(-11.450278,13.075095),(-11.451415,13.068067),(-11.456945,13.060444),(-11.45896,13.054682),(-11.445162,13.035226),(-11.43953,13.023005),(-11.435654,13.016726),(-11.431675,13.01347),(-11.422993,13.009414),(-11.424543,13.005202),(-11.430124,13.00099),(-11.433432,12.99696),(-11.433535,12.988356),(-11.435964,12.968848),(-11.438703,12.9589),(-11.423096,12.956006),(-11.411521,12.960709),(-11.404235,12.972103),(-11.401806,12.989492),(-11.393434,12.980811),(-11.388835,12.970553),(-11.386561,12.959107),(-11.384443,12.933114),(-11.387801,12.927119),(-11.394209,12.923321),(-11.402891,12.916396),(-11.407283,12.916293),(-11.413588,12.919703),(-11.420668,12.922029),(-11.427231,12.918618),(-11.427954,12.912495),(-11.423096,12.907069),(-11.417309,12.901953),(-11.415138,12.896656),(-11.419324,12.886501),(-11.424905,12.876166),(-11.428626,12.865805),(-11.425474,12.849553),(-11.427024,12.845238),(-11.430021,12.841052),(-11.432502,12.835523),(-11.432088,12.829347),(-11.428161,12.827022),(-11.423458,12.826402),(-11.420978,12.825575),(-11.419686,12.824671),(-11.416017,12.820071),(-11.411676,12.812888),(-11.408472,12.804491),(-11.406353,12.794285),(-11.405423,12.782348),(-11.407594,12.77147),(-11.41457,12.764209),(-11.41457,12.759713),(-11.404028,12.741213),(-11.402168,12.73173),(-11.410332,12.718811),(-11.424182,12.716383),(-11.437359,12.712248),(-11.447953,12.685945),(-11.455756,12.680622),(-11.461905,12.673129),(-11.460975,12.658402),(-11.457151,12.655973),(-11.449555,12.653182),(-11.441752,12.647756),(-11.436842,12.637473),(-11.436636,12.627086),(-11.441803,12.595511),(-11.440925,12.584866),(-11.438599,12.577993),(-11.437359,12.570758),(-11.43984,12.559286),(-11.460614,12.549829),(-11.467797,12.543525),(-11.456686,12.539753),(-11.449451,12.535205),(-11.437876,12.515361),(-11.429814,12.508333),(-11.430383,12.515723),(-11.42475,12.526368),(-11.416999,12.529314),(-11.410849,12.513346),(-11.408679,12.504923),(-11.402374,12.488541),(-11.400514,12.479549),(-11.392607,12.491848),(-11.390437,12.497533),(-11.377776,12.480221),(-11.379792,12.456864),(-11.386561,12.430457),(-11.388422,12.403895),(-11.416017,12.40498),(-11.481646,12.428235),(-11.515391,12.431645),(-11.601535,12.425238),(-11.643083,12.417641),(-11.720029,12.389477),(-11.757805,12.383328),(-11.839609,12.386687),(-11.860176,12.391079),(-11.920637,12.416039),(-11.921981,12.417693),(-11.923944,12.418778),(-11.930869,12.418726),(-11.93521,12.417021),(-11.946269,12.409425),(-11.984303,12.389012),(-11.997583,12.386377),(-12.018874,12.388444),(-12.07918,12.408133),(-12.103985,12.407357),(-12.121917,12.398728),(-12.155041,12.369014),(-12.192042,12.348756),(-12.36092,12.305607),(-12.377121,12.313668),(-12.405517,12.356456),(-12.423397,12.369117),(-12.466754,12.384465),(-12.48776,12.389477),(-12.505072,12.390253),(-12.521918,12.386894),(-12.541452,12.379452),(-12.570649,12.363691),(-12.57813,12.361528),(-12.579408,12.361159),(-12.593671,12.361572),(-12.597314,12.365448),(-12.598064,12.372424),(-12.603412,12.381933),(-12.63155,12.41268),(-12.648009,12.425754),(-12.667517,12.433661),(-12.688058,12.435986),(-12.752654,12.432421),(-12.773272,12.435056),(-12.779164,12.443273),(-12.783479,12.453091),(-12.799421,12.460636),(-12.829057,12.462755),(-12.838617,12.466372),(-12.849133,12.475829),(-12.851252,12.484355),(-12.84965,12.491073),(-12.849211,12.495001),(-12.874042,12.516395),(-12.913135,12.536342),(-12.949489,12.535928),(-12.966232,12.496086),(-12.969514,12.476811),(-12.981038,12.466992),(-12.997419,12.465855),(-13.015247,12.472676),(-13.034626,12.470558),(-13.051989,12.472263),(-13.066743,12.480118),(-13.078267,12.496241),(-13.082711,12.515671),(-13.079094,12.532156),(-13.064211,12.566159),(-13.060413,12.583367),(-13.059327,12.60347),(-13.063642,12.62228),(-13.076458,12.635922),(-13.091703,12.638196),(-13.108988,12.635406),(-13.127308,12.634837),(-13.145317,12.643932),(-13.154696,12.632822),(-13.162629,12.638144),(-13.169217,12.638765),(-13.176271,12.637731),(-13.185211,12.637783),(-13.197872,12.634062),(-13.201903,12.63339),(-13.20645,12.635664),(-13.21601,12.645741),(-13.22154,12.648376),(-13.229084,12.647808),(-13.246008,12.643157),(-13.25469,12.641813),(-13.263398,12.643209),(-13.275722,12.651064),(-13.284146,12.653337),(-13.292931,12.652717),(-13.322877,12.646516),(-13.327709,12.644914),(-13.330034,12.642072),(-13.332773,12.639643),(-13.338613,12.63923),(-13.343444,12.640987),(-13.352049,12.646981),(-13.356648,12.648893),(-13.359801,12.649737),(-13.404758,12.661761),(-13.728279,12.673388),(-14.082753,12.674835),(-14.343108,12.675897),(-14.437305,12.676282),(-14.791728,12.67778),(-14.87216,12.678109),(-15.146228,12.679227),(-15.195114,12.679434),(-15.223795,12.675196),(-15.249736,12.663621),(-15.307821,12.622693),(-15.368644,12.595356),(-15.421731,12.557122),(-15.424609,12.555049),(-15.677049,12.439294),(-15.711517,12.432214),(-15.883964,12.442182),(-15.893883,12.442756),(-15.973258,12.437226),(-15.992482,12.440689),(-16.05501,12.461204),(-16.090512,12.464305),(-16.166063,12.451437),(-16.172832,12.448544),(-16.177173,12.445236),(-16.181876,12.443376),(-16.190092,12.444771),(-16.211693,12.453143),(-16.22239,12.455055),(-16.23288,12.452884),(-16.30192,12.416194),(-16.382019,12.373819),(-16.412301,12.361727),(-16.462686,12.361314),(-16.514879,12.34855),(-16.533327,12.347826),(-16.668874,12.356715),(-16.705616,12.348033),(-16.728437,12.332531),(-16.735015,12.34516),(-16.739735,12.358385),(-16.74413,12.378852),(-16.750478,12.385647),(-16.765492,12.395982),(-16.788482,12.417955),(-16.798736,12.430894),(-16.802968,12.443793),(-16.802968,12.485419),(-16.800771,12.494452),(-16.790924,12.503241),(-16.788686,12.512397),(-16.781361,12.522935),(-16.731679,12.552069),(-16.709869,12.552802),(-16.678822,12.550238),(-16.645375,12.570746),(-16.634674,12.579495),(-16.628977,12.587633),(-16.624623,12.596015),(-16.618031,12.605455),(-16.579742,12.632799),(-16.56135,12.611802),(-16.54719,12.573879),(-16.533315,12.565334),(-16.532704,12.580878),(-16.52245,12.593085),(-16.50475,12.598049),(-16.485097,12.593736),(-16.451568,12.575019),(-16.421457,12.566881),(-16.388336,12.551581),(-16.370961,12.550238),(-16.351308,12.559516),(-16.32726,12.58869),(-16.30956,12.598049),(-16.286285,12.597073),(-16.266469,12.590033),(-16.246693,12.587958),(-16.223866,12.601752),(-16.212229,12.60635),(-16.204457,12.597602),(-16.198598,12.584906),(-16.19286,12.577582),(-16.11498,12.606106),(-16.097076,12.610256),(-16.07311,12.611721),(-16.057607,12.616197),(-16.044667,12.625474),(-16.029775,12.632961),(-16.007883,12.632148),(-15.990346,12.62287),(-15.963857,12.60224),(-15.947987,12.58983),(-15.939605,12.580634),(-15.927968,12.578599),(-15.863881,12.577582),(-15.857737,12.573188),(-15.844797,12.559882),(-15.839996,12.557074),(-15.831166,12.558254),(-15.805531,12.564521),(-15.794057,12.571479),(-15.782948,12.584662),(-15.768788,12.592597),(-15.747874,12.583726),(-15.742421,12.588324),(-15.736073,12.591376),(-15.729604,12.591498),(-15.715932,12.581773),(-15.710113,12.58275),(-15.704986,12.585191),(-15.699452,12.583726),(-15.69164,12.574897),(-15.684926,12.557929),(-15.679555,12.550238),(-15.673085,12.54442),(-15.665924,12.540188),(-15.65689,12.537584),(-15.644765,12.537258),(-15.633412,12.539537),(-15.587717,12.55801),(-15.569407,12.576321),(-15.538686,12.615424),(-15.527252,12.623725),(-15.517079,12.628852),(-15.509836,12.63581),(-15.507069,12.649563),(-15.512807,12.655666),(-15.523752,12.660346),(-15.529856,12.665758),(-15.521311,12.673774),(-15.531077,12.696438),(-15.540191,12.726874),(-15.543446,12.758043),(-15.534901,12.783026),(-15.523346,12.789862),(-15.509023,12.790351),(-15.494008,12.789049),(-15.480336,12.790473),(-15.46642,12.796454),(-15.456939,12.803656),(-15.450673,12.812812),(-15.446156,12.824612),(-15.425608,12.804999),(-15.406809,12.799709),(-15.394032,12.810248),(-15.391591,12.838202),(-15.407053,12.822333),(-15.421783,12.822821),(-15.436879,12.829291),(-15.453033,12.831448),(-15.468129,12.824897),(-15.492787,12.807115),(-15.510732,12.803453),(-15.520863,12.803412),(-15.535878,12.801337),(-15.549469,12.794338),(-15.555409,12.779608),(-15.555409,12.721584),(-15.544097,12.684068),(-15.542348,12.673774),(-15.541737,12.657457),(-15.54247,12.6494),(-15.545481,12.642727),(-15.569692,12.62226),(-15.577382,12.612494),(-15.627756,12.567613),(-15.641021,12.559475),(-15.652903,12.558905),(-15.663319,12.563463),(-15.672109,12.570746),(-15.666412,12.600653),(-15.696767,12.614163),(-15.76769,12.625393),(-15.815826,12.595364),(-15.833485,12.591254),(-15.836903,12.594428),(-15.841298,12.601467),(-15.8485,12.608547),(-15.860463,12.611721),(-15.87267,12.609565),(-15.889556,12.600165),(-15.901723,12.598049),(-15.913319,12.601223),(-15.928375,12.608873),(-15.953277,12.625393),(-15.954457,12.630316),(-15.953196,12.637397),(-15.952707,12.643744),(-15.956451,12.64643),(-15.969716,12.648179),(-15.976674,12.650214),(-15.981191,12.652655),(-15.987457,12.660956),(-16.001088,12.687445),(-16.00475,12.690823),(-16.009348,12.692694),(-16.013173,12.696194),(-16.016957,12.717515),(-16.022125,12.72899),(-16.02831,12.72899),(-16.02831,12.721584),(-16.029775,12.717475),(-16.040517,12.696967),(-16.045155,12.690497),(-16.048899,12.656399),(-16.076812,12.638983),(-16.117747,12.632148),(-16.128326,12.627672),(-16.148915,12.614447),(-16.155019,12.611721),(-16.165598,12.61286),(-16.189809,12.619127),(-16.22761,12.619127),(-16.23884,12.616523),(-16.257924,12.608222),(-16.268625,12.605455),(-16.28067,12.605455),(-16.312978,12.611721),(-16.323842,12.609565),(-16.337758,12.600165),(-16.346791,12.598049),(-16.350209,12.593329),(-16.355133,12.582587),(-16.361969,12.571234),(-16.370961,12.564521),(-16.411977,12.577582),(-16.44518,12.596137),(-16.460683,12.608873),(-16.467193,12.62226),(-16.471181,12.624579),(-16.480336,12.627387),(-16.489573,12.631822),(-16.494496,12.638983),(-16.492828,12.648912),(-16.48648,12.657782),(-16.477284,12.66413),(-16.467193,12.666327),(-16.467193,12.673774),(-16.482574,12.67414),(-16.492299,12.681708),(-16.497914,12.693834),(-16.501332,12.707913),(-16.508168,12.625393),(-16.515696,12.625393),(-16.52892,12.642768),(-16.565663,12.673896),(-16.570221,12.69359),(-16.581939,12.684394),(-16.58967,12.673285),(-16.598785,12.664008),(-16.614613,12.660102),(-16.626576,12.662543),(-16.634674,12.669379),(-16.638661,12.679999),(-16.637929,12.69359),(-16.623769,12.719713),(-16.603831,12.739325),(-16.590728,12.76203),(-16.596913,12.797309),(-16.601389,12.770209),(-16.603749,12.762519),(-16.60912,12.75373),(-16.613759,12.749416),(-16.61852,12.746527),(-16.638417,12.728502),(-16.646881,12.718207),(-16.651031,12.705268),(-16.652252,12.684027),(-16.64509,12.648586),(-16.647206,12.632229),(-16.677317,12.619574),(-16.721059,12.583726),(-16.754628,12.572211),(-16.773101,12.582953),(-16.780873,12.608832),(-16.782541,12.642727),(-16.777089,12.678046),(-16.76122,12.713202),(-16.735463,12.732896),(-16.700551,12.721584),(-16.698964,12.736396),(-16.713246,12.747301),(-16.733957,12.75137),(-16.751536,12.745429),(-16.772125,12.720649),(-16.783559,12.712592),(-16.796213,12.715318),(-16.790273,12.723456),(-16.788238,12.732082),(-16.790273,12.740546),(-16.796213,12.748847),(-16.774485,12.778551),(-16.770131,12.793362),(-16.775054,12.81094),(-16.782541,12.81094),(-16.787221,12.799872),(-16.794057,12.794989),(-16.800282,12.798814),(-16.802968,12.814032),(-16.800526,12.825995),(-16.794545,12.838772),(-16.75886,12.890774),(-16.755238,12.903469),(-16.756256,12.916246),(-16.760976,12.939683),(-16.762074,12.951158),(-16.759836,12.972073),(-16.749989,13.013617),(-16.747792,13.040269),(-16.749338,13.056627),(-16.753651,13.065009),(-16.752125,13.088039),(-16.748508,13.099227),(-16.742152,13.107392),(-16.726339,13.122637),(-16.723186,13.132249),(-16.708407,13.156692),(-16.673525,13.164314),(-16.630014,13.1639),(-16.465218,13.162428),(-16.313289,13.161084),(-16.092062,13.15912),(-15.961734,13.157984),(-15.897441,13.157399),(-15.870784,13.157157),(-15.833318,13.156847),(-15.8266,13.161678),(-15.82474,13.232914),(-15.824367,13.248512),(-15.822673,13.319421),(-15.818694,13.333528),(-15.807118,13.339781),(-15.737407,13.346344),(-15.6925,13.360348),(-15.679891,13.360658),(-15.612453,13.354225),(-15.596123,13.355827),(-15.566048,13.365671),(-15.542948,13.377996),(-15.519539,13.3866),(-15.488326,13.385256),(-15.379237,13.362519),(-15.342392,13.36257),(-15.309836,13.368436),(-15.277073,13.380296),(-15.248341,13.398977),(-15.227774,13.425176),(-15.221728,13.452823),(-15.217955,13.51468),(-15.203951,13.536901),(-15.181331,13.559843),(-15.160491,13.580981),(-15.13765,13.589973),(-15.110158,13.57248),(-15.065251,13.531268),(-15.01559,13.496051),(-15.015435,13.495999),(-15.015229,13.495844),(-15.015074,13.495741),(-14.949703,13.463081),(-14.915907,13.454425),(-14.877614,13.451376),(-14.862576,13.447061),(-14.829142,13.427011),(-14.810797,13.421172),(-14.790333,13.417348),(-14.779636,13.410888),(-14.759482,13.38337),(-14.731577,13.359005),(-14.698142,13.345181),(-14.661607,13.340918),(-14.624555,13.345181),(-14.592154,13.35314),(-14.580733,13.34916),(-14.552109,13.323094),(-14.542854,13.314666),(-14.529574,13.307277),(-14.515104,13.303168),(-14.483633,13.301928),(-14.470326,13.298259),(-14.459139,13.286916),(-14.45149,13.276865),(-14.442034,13.268545),(-14.43144,13.26144),(-14.394982,13.242965),(-14.368834,13.235705),(-14.341781,13.233638),(-14.284911,13.238547),(-14.230625,13.228574),(-14.201687,13.229555),(-14.179827,13.240123),(-14.131794,13.275573),(-14.116808,13.282162),(-14.099496,13.281955),(-14.056579,13.297174),(-14.016272,13.297639),(-13.976119,13.308207),(-13.900568,13.314563),(-13.851036,13.33575),(-13.822562,13.378203),(-13.818713,13.429362),(-13.84269,13.476646),(-13.852793,13.484811),(-13.875479,13.497911),(-13.882504,13.503782),(-13.8846,13.505533),(-13.889793,13.513957),(-13.896175,13.532922),(-13.901343,13.541629),(-13.918086,13.554988),(-13.94209,13.566925),(-13.967489,13.575581),(-13.988495,13.579146),(-14.001905,13.577028),(-14.022266,13.565323),(-14.034022,13.560207),(-14.044461,13.558605),(-14.06185,13.560052),(-14.072599,13.55969),(-14.092882,13.554729),(-14.139132,13.531552),(-14.196829,13.518788),(-14.215794,13.510753),(-14.271217,13.476956),(-14.329947,13.456441),(-14.347285,13.452358),(-14.365553,13.454839),(-14.389582,13.465872),(-14.462135,13.516656),(-14.470275,13.522354),(-14.480378,13.533129),(-14.486863,13.546539),(-14.500221,13.589973),(-14.50973,13.609093),(-14.523243,13.625655),(-14.542596,13.640822),(-14.585539,13.660459),(-14.626674,13.663508),(-14.667188,13.652889),(-14.728579,13.619325),(-14.74093,13.615449),(-14.754934,13.620384),(-14.796017,13.644698),(-14.802942,13.65232),(-14.822372,13.7172),(-14.831312,13.735623),(-14.843973,13.752676),(-14.860314,13.765595),(-14.879268,13.780581),(-14.915803,13.792441),(-15.016779,13.796885),(-15.07631,13.818951),(-15.097704,13.819984),(-15.17062,13.793784),(-15.245964,13.746733),(-15.267255,13.741798),(-15.27573,13.748051),(-15.295108,13.773191),(-15.304462,13.781873),(-15.347766,13.788643),(-15.394069,13.771512),(-15.43634,13.741178),(-15.467501,13.708286),(-15.478611,13.691258),(-15.488946,13.670329),(-15.496801,13.648341),(-15.49803,13.641522),(-15.50047,13.627981),(-15.502486,13.588267),(-15.518195,13.5831),(-15.567133,13.583255),(-15.629196,13.583513),(-15.691363,13.58372),(-15.753426,13.583978),(-15.815593,13.584185),(-15.877708,13.584443),(-15.939772,13.58465),(-16.001938,13.584908),(-16.064054,13.585115),(-16.085383,13.585168),(-16.126117,13.58527),(-16.188232,13.585528),(-16.250295,13.585735),(-16.312462,13.585994),(-16.374577,13.5862),(-16.436641,13.586459),(-16.498756,13.586665),(-16.561399,13.586914),(-16.561513,13.587104),(-16.57136,13.601793),(-16.576405,13.61225),(-16.575754,13.640326),(-16.558665,13.655911),(-16.533518,13.668606),(-16.508168,13.687974),(-16.513499,13.690863),(-16.523793,13.698391),(-16.529286,13.700995),(-16.516591,13.712836),(-16.507232,13.728095),(-16.508901,13.74022),(-16.529286,13.742621),(-16.526601,13.72663),(-16.531484,13.707261),(-16.542104,13.693671),(-16.556549,13.69477),(-16.56371,13.673774),(-16.579254,13.659573),(-16.598866,13.654202),(-16.618031,13.660061),(-16.635569,13.678046),(-16.640004,13.696479),(-16.631703,13.735785),(-16.62975,13.760484),(-16.627105,13.770453),(-16.618031,13.783596),(-16.582509,13.824693),(-16.576405,13.838813),(-16.570546,13.83511),(-16.554921,13.827948),(-16.549143,13.82453),(-16.551381,13.829088),(-16.556549,13.845649),(-16.52184,13.851793),(-16.520131,13.832017),(-16.512929,13.8133),(-16.501576,13.801988),(-16.48705,13.804633),(-16.494618,13.82746),(-16.496327,13.852729),(-16.5006,13.872707),(-16.515696,13.879788),(-16.510365,13.893297),(-16.488678,13.986396),(-16.48705,14.002631),(-16.508901,13.971381),(-16.518056,13.95185),(-16.52595,13.910468),(-16.536204,13.885728),(-16.549428,13.869289),(-16.562815,13.872952),(-16.570221,13.872952),(-16.58023,13.859524),(-16.59789,13.854315),(-16.618642,13.85163),(-16.637929,13.845649),(-16.648671,13.836859),(-16.652252,13.828559),(-16.65392,13.820054),(-16.659006,13.810858),(-16.664459,13.805976),(-16.675933,13.799547),(-16.682525,13.794094),(-16.692494,13.775702),(-16.700063,13.769029),(-16.710194,13.773627),(-16.713368,13.783352),(-16.71345,13.795722),(-16.715321,13.806342),(-16.724477,13.810858),(-16.737213,13.819648),(-16.742421,13.839423),(-16.741078,13.860419),(-16.73412,13.872952),(-16.740224,13.886623),(-16.744456,13.902167),(-16.747792,13.934394),(-16.746816,13.951361),(-16.743398,13.961086),(-16.737213,13.967678),(-16.714223,13.985582),(-16.702504,13.989976),(-16.689687,13.990546),(-16.660268,13.98725),(-16.646311,13.982978),(-16.63679,13.974921),(-16.637929,13.961656),(-16.623931,13.973944),(-16.612904,13.988715),(-16.598988,13.996812),(-16.576405,13.988959),(-16.576772,14.010972),(-16.568918,14.020819),(-16.556264,14.026923),(-16.542348,14.03734),(-16.554799,14.033108),(-16.568349,14.030341),(-16.580963,14.032782),(-16.590728,14.043606),(-16.545522,14.07099),(-16.529286,14.085191),(-16.503326,14.116278),(-16.489125,14.128241),(-16.457021,14.137356),(-16.441477,14.156562),(-16.429351,14.160956),(-16.42101,14.157131),(-16.412994,14.149807),(-16.404693,14.145413),(-16.394887,14.150377),(-16.388824,14.154853),(-16.372629,14.162421),(-16.364735,14.167792),(-16.427724,14.170111),(-16.454742,14.180162),(-16.452952,14.20185),(-16.468739,14.193834),(-16.474599,14.179389),(-16.471506,14.164252),(-16.460357,14.15412),(-16.472768,14.147366),(-16.483062,14.148139),(-16.493072,14.151842),(-16.50475,14.15412),(-16.513173,14.151028),(-16.516754,14.143459),(-16.518788,14.134263),(-16.52184,14.126166),(-16.547515,14.081855),(-16.556549,14.071519),(-16.566803,14.066962),(-16.58845,14.061957),(-16.600331,14.054185),(-16.60912,14.043199),(-16.621571,14.019965),(-16.631703,14.010077),(-16.654164,14.002753),(-16.675404,14.006903),(-16.697011,14.014228),(-16.721059,14.016303),(-16.697581,14.05744),(-16.696848,14.064683),(-16.680002,14.069403),(-16.652252,14.099514),(-16.665639,14.095649),(-16.678578,14.076117),(-16.689687,14.071519),(-16.711781,14.070868),(-16.72053,14.068915),(-16.727895,14.064683),(-16.716135,14.051337),(-16.717112,14.042385),(-16.73412,14.023139),(-16.73705,14.015448),(-16.739613,14.001125),(-16.7447,13.992743),(-16.764556,13.970608),(-16.76887,13.961656),(-16.773427,13.93358),(-16.76887,13.838813),(-16.775054,13.838813),(-16.780995,14.030748),(-16.786,14.059719),(-16.802561,14.107856),(-16.82079,14.143459),(-16.829701,14.15412),(-16.842763,14.160061),(-16.868804,14.165758),(-16.878733,14.174547),(-16.883901,14.188951),(-16.892405,14.242865),(-16.898915,14.259955),(-16.906972,14.272528),(-16.925893,14.291246),(-16.93456,14.295885),(-16.941151,14.297268),(-16.945465,14.301418),(-16.947011,14.314521),(-16.94579,14.324774),(-16.940745,14.344428),(-16.939565,14.355862),(-16.944447,14.372382),(-16.956532,14.390123),(-16.987945,14.421047),(-17.059478,14.453925),(-17.070465,14.465399),(-17.076161,14.478583),(-17.11148,14.530219),(-17.137847,14.599026),(-17.178212,14.653144),(-17.206939,14.6789),(-17.22411,14.690416),(-17.243764,14.699286),(-17.265452,14.702826),(-17.281646,14.707261),(-17.324045,14.728909),(-17.330556,14.736314),(-17.363596,14.735907),(-17.392323,14.739325),(-17.417388,14.737698),(-17.439809,14.722073),(-17.431386,14.71247),(-17.419342,14.70897),(-17.426829,14.694403),(-17.439809,14.688463),(-17.436391,14.685289),(-17.430247,14.678046),(-17.426829,14.674872),(-17.433013,14.660549),(-17.436391,14.659573),(-17.439809,14.653754),(-17.452952,14.662055),(-17.520172,14.743069),(-17.536041,14.757392),(-17.370961,14.800279),(-17.322133,14.839016),(-17.172963,14.900824),(-17.138661,14.92772),(-16.979726,15.111884),(-16.947906,15.157864),(-16.878245,15.2331),(-16.739166,15.472398),(-16.669667,15.561835),(-16.53893,15.774359),(-16.534291,15.784369),(-16.536,15.794664),(-16.542348,15.808824),(-16.542346,15.808848),(-16.519736,15.846372),(-16.509918,15.901511),(-16.507541,16.010393),(-16.501598,16.021866),(-16.4878,16.066049),(-16.470437,16.106357),(-16.465993,16.174053),(-16.458758,16.194155),(-16.444185,16.206299),(-16.407288,16.214825),(-16.391682,16.224747),(-16.385378,16.234927),(-16.381088,16.246658),(-16.340161,16.415898),(-16.334941,16.455793),(-16.327397,16.474551),(-16.313547,16.49331),(-16.295099,16.510621),(-16.273808,16.523179),(-16.251019,16.527623),(-16.217946,16.521525),(-16.206732,16.52075),(-16.195363,16.522714),(-16.185183,16.527313),(-16.155779,16.547518),(-16.144307,16.552686),(-16.132266,16.554753),(-16.119657,16.552376),(-16.110459,16.54695),(-16.103069,16.53956),(-16.090977,16.522197),(-16.074027,16.504885),(-16.05377,16.495428),(-16.031187,16.492896),(-16.007313,16.496152),(-16.000181,16.501061),(-15.993102,16.504627),(-15.985609,16.505867),(-15.977289,16.503955),(-15.96437,16.498994),(-15.958065,16.498426),(-15.950675,16.499821),(-15.91104,16.516874),(-15.896932,16.518424),(-15.861999,16.51026),(-15.853575,16.51026),(-15.828926,16.514549),(-15.812958,16.513773),(-15.767741,16.499459),(-15.735288,16.497702),(-15.726813,16.495273),(-15.703197,16.484421),(-15.687539,16.480546),(-15.672191,16.481372),(-15.657412,16.486178),(-15.643614,16.494653),(-15.621497,16.514239),(-15.609663,16.521318),(-15.594418,16.523644),(-15.551475,16.515117),(-15.536696,16.516512),(-15.52481,16.522197),(-15.515198,16.53093),(-15.49091,16.56452),(-15.478508,16.575165),(-15.463987,16.58147),(-15.448846,16.580178),(-15.43944,16.572685),(-15.433704,16.562504),(-15.426883,16.553151),(-15.414532,16.548035),(-15.399805,16.548345),(-15.385749,16.551756),(-15.343632,16.568706),(-15.328026,16.571961),(-15.295935,16.573046),(-15.248599,16.565812),(-15.232476,16.56638),(-15.125093,16.58271),(-15.104009,16.590358),(-15.097498,16.594492),(-15.093208,16.600176),(-15.092847,16.607618),(-15.096154,16.613974),(-15.112329,16.629219),(-15.118271,16.642603),(-15.116256,16.655522),(-15.107574,16.665392),(-15.093312,16.669165),(-15.078894,16.664979),(-15.069851,16.655264),(-15.061996,16.643791),(-15.051557,16.63418),(-15.044374,16.631906),(-15.036933,16.632578),(-15.029853,16.635471),(-15.023652,16.639967),(-15.018743,16.646117),(-15.016521,16.652576),(-15.013368,16.666581),(-15.006909,16.675831),(-14.996625,16.682445),(-14.974301,16.691385),(-14.962932,16.685804),(-14.949858,16.672317),(-14.948934,16.670553),(-14.941331,16.656039),(-14.930944,16.643378),(-14.912496,16.640639)]
+Serranilla Bank	[(-78.637074,15.862087),(-78.640411,15.864),(-78.636871,15.867296),(-78.637074,15.862087)]
+Singapore	[(103.960785,1.391099),(103.985688,1.385443),(103.999522,1.380316),(104.003429,1.374172),(103.991873,1.354926),(103.974864,1.334459),(103.954356,1.318101),(103.931895,1.311469),(103.907237,1.308743),(103.887706,1.301256),(103.852712,1.277289),(103.846934,1.271918),(103.844086,1.2685),(103.838878,1.266262),(103.82602,1.264309),(103.801606,1.264797),(103.789561,1.26789),(103.784434,1.273871),(103.77589,1.287584),(103.755138,1.297105),(103.730154,1.302924),(103.708751,1.305243),(103.665294,1.304104),(103.647634,1.308417),(103.640391,1.322252),(103.644705,1.338039),(103.674571,1.380316),(103.678884,1.399237),(103.683849,1.409898),(103.695079,1.421332),(103.708344,1.429389),(103.717947,1.430976),(103.739757,1.428127),(103.762218,1.430976),(103.79005,1.444281),(103.804942,1.448635),(103.831554,1.447089),(103.857188,1.438707),(103.932465,1.401109),(103.960785,1.391099)]
+San Marino	[(12.42945,43.892056),(12.399581,43.903218),(12.385629,43.924534),(12.395654,43.948409),(12.411049,43.959661),(12.421389,43.967219),(12.453325,43.979053),(12.48216,43.982567),(12.489188,43.97311),(12.492392,43.956419),(12.490325,43.939159),(12.483094,43.929205),(12.48216,43.927919),(12.479576,43.9258),(12.478026,43.923216),(12.477494,43.920051),(12.478287,43.917038),(12.460456,43.895259),(12.42945,43.892056)]
+Somaliland	[(48.939112,11.24913),(48.939111,11.136737),(48.939111,11.024367),(48.939111,10.912022),(48.939111,10.7996),(48.939111,10.687333),(48.939111,10.574937),(48.939111,10.462567),(48.939111,10.350119),(48.939111,10.2378),(48.939111,10.12543),(48.939111,10.013033),(48.939111,9.900715),(48.939111,9.788422),(48.939111,9.676),(48.939111,9.563603),(48.939111,9.562701),(48.939111,9.451233),(48.879114,9.360308),(48.819325,9.269384),(48.759225,9.178511),(48.699229,9.087689),(48.639336,8.996661),(48.579184,8.90584),(48.519188,8.814915),(48.459243,8.723887),(48.399299,8.633118),(48.339147,8.54209),(48.279099,8.451165),(48.219155,8.360318),(48.159003,8.269419),(48.099058,8.17852),(48.039114,8.087492),(47.979169,7.996567),(47.836697,7.996516),(47.653918,7.996516),(47.52359,7.996516),(47.36608,7.996516),(47.210586,7.996516),(47.068114,7.996516),(46.97923,7.996567),(46.920526,8.025609),(46.857377,8.046745),(46.773558,8.074909),(46.689532,8.102969),(46.605713,8.131133),(46.521687,8.159245),(46.437713,8.187357),(46.353842,8.215469),(46.269816,8.243555),(46.185894,8.271641),(46.101919,8.299727),(46.018049,8.327891),(45.934126,8.356003),(45.850203,8.384115),(45.766384,8.412227),(45.682358,8.440313),(45.598436,8.468425),(45.514462,8.496537),(45.51441,8.496537),(45.426147,8.525476),(45.33809,8.554414),(45.249878,8.583276),(45.16177,8.612137),(45.073558,8.641153),(44.985553,8.67004),(44.89729,8.698928),(44.809233,8.72784),(44.721073,8.756779),(44.633017,8.785718),(44.544753,8.814605),(44.456697,8.843544),(44.368537,8.872457),(44.280377,8.901396),(44.192217,8.930283),(44.104057,8.959222),(44.023855,8.985525),(43.984788,9.008314),(43.914921,9.071489),(43.78759,9.186701),(43.698449,9.267162),(43.621502,9.336899),(43.60724,9.344625),(43.59122,9.343591),(43.566829,9.334315),(43.548225,9.336072),(43.471227,9.382012),(43.419034,9.413018),(43.406322,9.42865),(43.401981,9.447409),(43.399449,9.480947),(43.393351,9.49893),(43.370665,9.544225),(43.361518,9.553165),(43.341364,9.566394),(43.331753,9.575076),(43.325086,9.585902),(43.315578,9.607658),(43.305966,9.617554),(43.297698,9.621533),(43.270671,9.628354),(43.248812,9.652332),(43.235273,9.691787),(43.206334,9.851209),(43.187214,9.883326),(43.149852,9.899991),(43.104273,9.907923),(43.067686,9.922522),(43.039884,9.949988),(43.020764,9.996419),(43.012599,10.029286),(42.999887,10.061971),(42.981903,10.091633),(42.958235,10.115559),(42.862324,10.177158),(42.836279,10.208086),(42.808167,10.269116),(42.78946,10.333324),(42.776644,10.42461),(42.765792,10.451947),(42.750393,10.471636),(42.695202,10.524708),(42.668537,10.56623),(42.64859,10.611033),(42.647247,10.63222),(42.660269,10.641625),(42.680216,10.647672),(42.699646,10.65855),(42.711635,10.675163),(42.718973,10.694852),(42.728585,10.735496),(42.738094,10.759784),(42.749876,10.775829),(42.785636,10.804406),(42.801242,10.820788),(42.80765,10.83611),(42.811578,10.85262),(42.819432,10.872567),(42.834832,10.888406),(42.876793,10.905744),(42.893536,10.919671),(42.901185,10.936595),(42.911313,10.977367),(42.923715,10.998787),(43.188815,11.407764),(43.240733,11.48786),(43.252696,11.47309),(43.266938,11.462348),(43.288341,11.460354),(43.282725,11.498928),(43.29713,11.482245),(43.320079,11.446112),(43.33961,11.426174),(43.352387,11.419745),(43.375987,11.391588),(43.394216,11.385199),(43.413829,11.380927),(43.44337,11.359565),(43.459727,11.35106),(43.466319,11.367906),(43.478201,11.37995),(43.489431,11.380927),(43.494395,11.364732),(43.479015,11.271796),(43.488129,11.238918),(43.506358,11.20897),(43.529307,11.186591),(43.535655,11.183743),(43.551931,11.179836),(43.559093,11.176011),(43.562999,11.170315),(43.568207,11.155422),(43.583181,11.135159),(43.591645,11.107489),(43.617442,11.070787),(43.658946,10.987982),(43.755626,10.894232),(43.8296,10.802965),(43.92213,10.724189),(44.028168,10.652167),(44.097504,10.58926),(44.149587,10.559149),(44.274262,10.456732),(44.303722,10.439846),(44.347554,10.414511),(44.3892,10.397207),(44.465258,10.401481),(44.541423,10.392743),(44.586149,10.383585),(44.627329,10.390613),(44.661857,10.402411),(44.721063,10.419384),(44.750662,10.427865),(44.790324,10.423484),(44.854784,10.414529),(44.899366,10.411814),(44.962009,10.415799),(44.994151,10.442694),(44.987966,10.460395),(45.001475,10.460395),(45.111339,10.52558),(45.12672,10.531968),(45.157237,10.541083),(45.252289,10.600531),(45.320567,10.662095),(45.33725,10.670844),(45.354747,10.66885),(45.37322,10.662421),(45.392426,10.658393),(45.40919,10.659491),(45.445323,10.667792),(45.487071,10.684719),(45.516612,10.701972),(45.542979,10.721666),(45.573009,10.758124),(45.586111,10.765855),(45.662283,10.790595),(45.673106,10.79621),(45.684906,10.808905),(45.694591,10.822252),(45.706391,10.832831),(45.72462,10.837144),(45.737966,10.843573),(45.753591,10.871731),(45.769298,10.878119),(45.787364,10.877753),(45.802745,10.875312),(45.816905,10.869208),(45.831309,10.857611),(45.84018,10.844672),(45.84669,10.832261),(45.855642,10.823961),(45.872325,10.823472),(45.868175,10.841376),(45.884451,10.841213),(45.97755,10.79914),(46.012543,10.794745),(46.047618,10.785305),(46.063731,10.778795),(46.102224,10.770657),(46.137218,10.776313),(46.207367,10.79621),(46.237559,10.792426),(46.263194,10.776842),(46.30714,10.731024),(46.335134,10.709703),(46.370128,10.696845),(46.408702,10.691596),(46.447765,10.693101),(46.482432,10.701361),(46.499848,10.708482),(46.52768,10.726223),(46.56072,10.731676),(46.588715,10.743313),(46.629161,10.745063),(46.646251,10.747748),(46.659679,10.75434),(46.694102,10.781928),(46.782237,10.821723),(46.821951,10.852607),(46.865977,10.871894),(46.871837,10.878079),(46.881358,10.893134),(46.886485,10.898586),(46.893565,10.901557),(46.9074,10.903144),(46.913829,10.905463),(47.008067,10.938951),(47.082774,10.995266),(47.132335,11.035793),(47.167654,11.072089),(47.180675,11.080471),(47.226736,11.093817),(47.23878,11.101264),(47.263357,11.120795),(47.366873,11.172797),(47.386241,11.180121),(47.405935,11.184638),(47.437022,11.179836),(47.489513,11.192816),(47.522716,11.186957),(47.677745,11.107978),(47.71046,11.101264),(47.767345,11.130194),(47.892833,11.132554),(47.948253,11.125149),(48.130382,11.136664),(48.160818,11.145657),(48.173513,11.157131),(48.195811,11.186835),(48.215587,11.196234),(48.217296,11.203681),(48.2199,11.211127),(48.22934,11.214504),(48.246593,11.21426),(48.255138,11.215074),(48.273611,11.220404),(48.2942,11.222602),(48.30421,11.227525),(48.310557,11.234768),(48.313324,11.242011),(48.314952,11.24901),(48.31837,11.25552),(48.331309,11.268704),(48.342784,11.275458),(48.373057,11.282172),(48.444347,11.289252),(48.478526,11.296332),(48.506847,11.313544),(48.521983,11.319281),(48.585948,11.316962),(48.636892,11.329413),(48.654796,11.330634),(48.723888,11.315253),(48.762462,11.301011),(48.800629,11.279039),(48.888845,11.250556),(48.904063,11.247748),(48.921153,11.248033),(48.939112,11.24913)]
+Somalia	[(50.797864,11.989119),(50.867055,11.942891),(50.970083,11.932323),(51.029307,11.885077),(51.048839,11.878648),(51.127696,11.878648),(51.147227,11.873603),(51.181163,11.855373),(51.199718,11.851304),(51.222911,11.850775),(51.247081,11.847561),(51.267345,11.839423),(51.292698,11.833108),(51.277354,11.800605),(51.266381,11.759286),(51.249359,11.728775),(51.255708,11.681655),(51.247801,11.652391),(51.22954,11.635897),(51.212529,11.607947),(51.181245,11.578829),(51.148123,11.536038),(51.124766,11.511786),(51.12086,11.505316),(51.121918,11.494127),(51.126638,11.478827),(51.127696,11.470893),(51.125011,11.447984),(51.118419,11.426256),(51.086192,11.357164),(51.081309,11.341498),(51.079356,11.275946),(51.07252,11.233791),(51.085948,11.187974),(51.130945,11.160752),(51.17444,11.158764),(51.189504,11.138306),(51.164399,11.116767),(51.142263,11.068427),(51.131358,11.052883),(51.12379,11.038764),(51.118337,11.016913),(51.115082,10.993354),(51.124522,10.85456),(51.138194,10.676744),(51.160655,10.598456),(51.154307,10.587714),(51.131358,10.58393),(51.107432,10.576565),(51.101899,10.55858),(51.107188,10.515041),(51.102224,10.494696),(51.092296,10.482164),(51.076915,10.475816),(51.055675,10.474066),(51.035818,10.467515),(51.018321,10.452094),(51.010102,10.434027),(51.018403,10.41942),(51.038097,10.416083),(51.19044,10.446112),(51.200938,10.44477),(51.211925,10.44184),(51.220388,10.442043),(51.223888,10.449856),(51.219574,10.461005),(51.210216,10.467108),(51.200857,10.471503),(51.196544,10.477444),(51.195811,10.500312),(51.193044,10.521186),(51.186778,10.541571),(51.176117,10.562812),(51.191742,10.548977),(51.20734,10.538096),(51.220647,10.524928),(51.237966,10.515024),(51.24662,10.50909),(51.257942,10.503801),(51.280556,10.48733),(51.292532,10.480075),(51.3112,10.476055),(51.325879,10.47268),(51.335871,10.474614),(51.345875,10.480494),(51.35721,10.48374),(51.377856,10.48169),(51.395173,10.479023),(51.403077,10.456707),(51.417038,10.447485),(51.410965,10.429814),(51.397509,10.395793),(51.38502,10.391506),(51.380154,10.387339),(51.372569,10.381415),(51.37608,10.367693),(51.367419,10.367726),(51.349458,10.375002),(51.336131,10.374395),(51.320079,10.378485),(51.300831,10.372566),(51.272873,10.377905),(51.265391,10.396877),(51.26295,10.408596),(51.256602,10.420315),(51.240977,10.425605),(51.090099,10.407313),(51.017125,10.381916),(50.927389,10.327844),(50.90988,10.295635),(50.901703,10.234442),(50.912814,10.176853),(50.8838,10.101264),(50.888682,10.05565),(50.900401,10.024075),(50.901703,10.011664),(50.89975,10.000718),(50.890798,9.986029),(50.877696,9.916653),(50.881196,9.905463),(50.86964,9.884467),(50.863129,9.866034),(50.854015,9.816107),(50.840587,9.779771),(50.833263,9.768785),(50.838634,9.740912),(50.836925,9.73078),(50.831716,9.712063),(50.824474,9.651068),(50.806163,9.624457),(50.805512,9.59394),(50.812999,9.541164),(50.836762,9.477037),(50.840343,9.456122),(50.837413,9.437201),(50.830333,9.419623),(50.768321,9.319281),(50.748302,9.303534),(50.706309,9.285712),(50.689464,9.274848),(50.676768,9.259182),(50.646983,9.211371),(50.641124,9.196357),(50.649181,9.132514),(50.648448,9.110419),(50.633637,9.073188),(50.604503,9.037909),(50.494884,8.951972),(50.464122,8.920559),(50.439708,8.88817),(50.422048,8.857123),(50.40797,8.816352),(50.389822,8.733547),(50.374278,8.698879),(50.326508,8.641099),(50.319591,8.620347),(50.322602,8.55976),(50.319591,8.541815),(50.303477,8.504584),(50.290212,8.486762),(50.274913,8.479153),(50.256196,8.472561),(50.246104,8.456448),(50.239106,8.436347),(50.230154,8.41767),(50.166026,8.33336),(50.156423,8.320624),(50.141368,8.287991),(50.113048,8.19953),(50.091075,8.161038),(50.058279,8.130316),(49.929373,8.051744),(49.842052,7.962714),(49.824229,7.933905),(49.812511,7.897528),(49.803233,7.82689),(49.808604,7.815009),(49.823416,7.805325),(49.827647,7.782904),(49.825043,7.757758),(49.819347,7.739936),(49.790782,7.69953),(49.760916,7.667304),(49.752208,7.650295),(49.748302,7.606635),(49.744151,7.589057),(49.640798,7.409125),(49.586599,7.314765),(49.520518,7.239651),(49.367035,7.025702),(49.293224,6.880927),(49.247325,6.810614),(49.197927,6.67357),(49.074718,6.415269),(49.072032,6.393297),(49.074067,6.370795),(49.083507,6.329047),(49.085623,6.307359),(49.0713,6.219916),(49.036143,6.144232),(48.951491,5.99872),(48.850108,5.824449),(48.695811,5.587348),(48.646739,5.480048),(48.620128,5.443996),(48.548106,5.375067),(48.448009,5.208726),(48.328868,5.079657),(48.202403,4.908922),(48.055675,4.612942),(47.948497,4.457099),(47.840587,4.341376),(47.577973,4.059882),(47.489268,3.936347),(47.335623,3.778754),(47.206716,3.644599),(47.039806,3.469265),(47.01295,3.441067),(46.834239,3.232489),(46.700043,3.113267),(46.625743,3.023912),(46.487804,2.90884),(46.414317,2.833441),(46.351573,2.788642),(46.34962,2.780178),(46.3449,2.770087),(46.339203,2.761705),(46.334483,2.758246),(46.317638,2.751899),(46.307628,2.736029),(46.299815,2.715766),(46.289399,2.696234),(46.275401,2.685858),(46.236501,2.667629),(46.142345,2.568915),(46.13087,2.554023),(46.114513,2.523261),(46.104991,2.510565),(46.062999,2.484036),(46.047618,2.455064),(46.027029,2.438137),(45.826345,2.308824),(45.711925,2.24433),(45.605642,2.183051),(45.266205,1.987291),(45.232188,1.967678),(45.210704,1.963121),(45.199718,1.959621),(45.001475,1.86636),(44.831554,1.749701),(44.823985,1.740302),(44.812185,1.735582),(44.67628,1.6376),(44.550059,1.559068),(44.332774,1.38996),(44.221365,1.275621),(44.198416,1.265692),(44.157888,1.24079),(44.145518,1.22956),(44.1421,1.221381),(44.139659,1.211168),(44.138031,1.191596),(44.133962,1.187567),(44.115001,1.182034),(44.11085,1.17829),(44.10377,1.168362),(44.032888,1.09748),(44.012543,1.084215),(43.990977,1.078599),(43.97877,1.068671),(43.932628,1.009833),(43.819835,0.949449),(43.781912,0.921617),(43.734223,0.854967),(43.717296,0.845282),(43.703461,0.840522),(43.658946,0.804918),(43.467621,0.620551),(43.285492,0.414984),(43.184906,0.31627),(43.09018,0.223375),(42.891124,0.003079),(42.770274,-0.129327),(42.712087,-0.17669),(42.647797,-0.228936),(42.580333,-0.29754),(42.555919,-0.332127),(42.553559,-0.34238),(42.553966,-0.351251),(42.550792,-0.357599),(42.526622,-0.362726),(42.519298,-0.369317),(42.479747,-0.422052),(42.474457,-0.438653),(42.486501,-0.449395),(42.47641,-0.465997),(42.47283,-0.469903),(42.472911,-0.4638),(42.472423,-0.458673),(42.47047,-0.454034),(42.465994,-0.449395),(42.412608,-0.490981),(42.404552,-0.500909),(42.39796,-0.517348),(42.38266,-0.535252),(42.349864,-0.565606),(42.250255,-0.685642),(42.246755,-0.694268),(42.246755,-0.701918),(42.245291,-0.707452),(42.236339,-0.709568),(42.232595,-0.713067),(42.192231,-0.776137),(42.166515,-0.802667),(42.151622,-0.813897),(42.135509,-0.82171),(42.116466,-0.826267),(42.086599,-0.825616),(42.071544,-0.828709),(42.062511,-0.839288),(42.081716,-0.843438),(42.080903,-0.862888),(42.071951,-0.884454),(42.065684,-0.894464),(42.051443,-0.902032),(42.036957,-0.920017),(42.025564,-0.941583),(42.020844,-0.960056),(42.016368,-0.968032),(41.983165,-0.994073),(41.971934,-0.99977),(41.967947,-0.992852),(41.963634,-0.95086),(41.964692,-0.911554),(41.958832,-0.894464),(41.95281,-0.894464),(41.955414,-0.909601),(41.952403,-0.920831),(41.94752,-0.930841),(41.94516,-0.942966),(41.946462,-0.954767),(41.951427,-0.969415),(41.95281,-0.980401),(41.955577,-0.992934),(41.96225,-0.998956),(41.969249,-1.003188),(41.973155,-1.011163),(41.97169,-1.023614),(41.961436,-1.044122),(41.958832,-1.055841),(41.953461,-1.068617),(41.930024,-1.089939),(41.924653,-1.097101),(41.923025,-1.110121),(41.918305,-1.121026),(41.911632,-1.130955),(41.873871,-1.176039),(41.869477,-1.186212),(41.872895,-1.195489),(41.880707,-1.19492),(41.890147,-1.189386),(41.897472,-1.183201),(41.885427,-1.209649),(41.862804,-1.212335),(41.84197,-1.196954),(41.835297,-1.168878),(41.829112,-1.168878),(41.830251,-1.189223),(41.84197,-1.224867),(41.842784,-1.24391),(41.836599,-1.262302),(41.73227,-1.431085),(41.708751,-1.460056),(41.689708,-1.489516),(41.65211,-1.565118),(41.633311,-1.580336),(41.610606,-1.593194),(41.575043,-1.652602),(41.554861,-1.669692),(41.561046,-1.669692),(41.535105,-1.696283),(41.535103,-1.696269),(41.535944,-1.676312),(41.53858,-1.613699),(41.534963,-1.594785),(41.522871,-1.572771),(41.484527,-1.523162),(41.434194,-1.458049),(41.383758,-1.39304),(41.332185,-1.326378),(41.282989,-1.262816),(41.237307,-1.203905),(41.18222,-1.132695),(41.13106,-1.066445),(41.081554,-1.002573),(41.056129,-0.969604),(41.030601,-0.936738),(41.00528,-0.903768),(40.979751,-0.870798),(40.978821,-0.794834),(40.977891,-0.724347),(40.976961,-0.653861),(40.975514,-0.545237),(40.974067,-0.436716),(40.97262,-0.328299),(40.971173,-0.219675),(40.97045,-0.152186),(40.969623,-0.084697),(40.968486,-0.002738),(40.968486,0.122319),(40.968486,0.247273),(40.968486,0.37233),(40.968486,0.497283),(40.968486,0.62234),(40.968486,0.747242),(40.968486,0.872248),(40.968486,0.997201),(40.968486,1.122207),(40.968486,1.230295),(40.968486,1.247212),(40.968486,1.372191),(40.968486,1.497145),(40.968486,1.62215),(40.968486,1.747181),(40.968486,1.872135),(40.968486,1.997166),(40.968486,2.103619),(40.968486,2.210047),(40.968486,2.316501),(40.968486,2.422954),(40.968486,2.49711),(40.967142,2.631727),(40.965902,2.760608),(40.965385,2.814145),(40.979751,2.841895),(41.013961,2.875795),(41.096127,2.957082),(41.178396,3.03842),(41.260665,3.119811),(41.342727,3.201149),(41.394506,3.27515),(41.446183,3.349047),(41.497963,3.423074),(41.549639,3.497023),(41.633562,3.617093),(41.717381,3.737163),(41.801303,3.857182),(41.885019,3.977226),(41.898455,3.996915),(41.912201,4.007974),(41.917472,4.020453),(41.916645,4.051098),(41.923466,4.070554),(41.941243,4.086212),(42.011833,4.129491),(42.068367,4.174553),(42.102887,4.19189),(42.13534,4.200081),(42.221846,4.200959),(42.297294,4.201734),(42.415013,4.221707),(42.568285,4.247856),(42.718663,4.273487),(42.78977,4.285605),(42.831628,4.302322),(42.868938,4.326765),(42.870195,4.328171),(42.899634,4.361104),(42.914724,4.393299),(42.9325,4.463217),(42.945936,4.496858),(42.952551,4.507581),(42.960406,4.517374),(43.03544,4.578895),(43.119259,4.647702),(43.232792,4.701497),(43.346997,4.755654),(43.459342,4.808829),(43.528485,4.841566),(43.640519,4.867353),(43.716484,4.884793),(43.815186,4.907479),(43.845158,4.914352),(43.932284,4.945203),(43.968975,4.953962),(44.029126,4.950448),(44.081009,4.947451),(44.132789,4.94448),(44.184672,4.941431),(44.236452,4.938485),(44.288335,4.935488),(44.340115,4.932439),(44.391998,4.929468),(44.443726,4.926445),(44.495557,4.923473),(44.547441,4.920476),(44.596808,4.917643),(44.59922,4.917505),(44.651104,4.914507),(44.702883,4.911562),(44.754766,4.908565),(44.806546,4.905541),(44.858378,4.902544),(44.912586,4.899392),(44.941525,4.911484),(45.020642,4.99688),(45.0209,4.99688),(45.077744,5.059072),(45.185024,5.176248),(45.292356,5.293476),(45.399585,5.410704),(45.506865,5.527881),(45.518477,5.540564),(45.614146,5.645057),(45.721426,5.762337),(45.828706,5.879513),(45.935986,5.996689),(45.99681,6.059192),(46.057839,6.12172),(46.118818,6.184223),(46.179899,6.246726),(46.240981,6.309228),(46.302062,6.371731),(46.362937,6.43426),(46.423915,6.496736),(46.466963,6.538292),(46.488046,6.558645),(46.508406,6.578308),(46.55321,6.621457),(46.598065,6.664633),(46.618425,6.684244),(46.667001,6.731115),(46.715577,6.777985),(46.764101,6.824882),(46.812729,6.871675),(46.861408,6.918597),(46.909984,6.965467),(46.95856,7.012286),(47.007032,7.059208),(47.055608,7.106079),(47.104287,7.153001),(47.152863,7.19982),(47.201439,7.246691),(47.250118,7.293509),(47.298797,7.34038),(47.347373,7.387302),(47.395949,7.434173),(47.444525,7.481043),(47.493101,7.527914),(47.532388,7.565864),(47.541676,7.574836),(47.590252,7.621655),(47.638932,7.668525),(47.687507,7.715396),(47.736032,7.762215),(47.784659,7.809137),(47.833183,7.855956),(47.881811,7.902826),(47.930593,7.949697),(47.979169,7.996567),(48.039114,8.087492),(48.099058,8.17852),(48.159003,8.269419),(48.219155,8.360318),(48.279099,8.451165),(48.339147,8.54209),(48.399299,8.633118),(48.459243,8.723887),(48.519188,8.814915),(48.579184,8.90584),(48.639336,8.996661),(48.699229,9.087689),(48.759225,9.178511),(48.819325,9.269384),(48.879114,9.360308),(48.939111,9.451233),(48.939111,9.562701),(48.939111,9.563603),(48.939111,9.676),(48.939111,9.788422),(48.939111,9.900715),(48.939111,10.013033),(48.939111,10.12543),(48.939111,10.2378),(48.939111,10.350119),(48.939111,10.462567),(48.939111,10.574937),(48.939111,10.687333),(48.939111,10.7996),(48.939111,10.912022),(48.939111,11.024367),(48.939111,11.136737),(48.939112,11.24913),(48.939138,11.249132),(48.976817,11.25141),(49.108409,11.276597),(49.239594,11.300279),(49.278087,11.316962),(49.293305,11.337958),(49.303477,11.345445),(49.315929,11.340522),(49.32545,11.33511),(49.335704,11.334621),(49.400076,11.340522),(49.4192,11.344794),(49.435069,11.35106),(49.488617,11.381741),(49.507335,11.385199),(49.521739,11.393785),(49.544444,11.436713),(49.558604,11.453518),(49.576834,11.460028),(49.59962,11.461737),(49.644542,11.460354),(49.650076,11.462144),(49.666026,11.471137),(49.675304,11.473944),(49.686778,11.474351),(49.716319,11.46776),(49.804861,11.458401),(49.851248,11.464911),(49.880707,11.488227),(49.88852,11.487291),(49.906423,11.498725),(49.917979,11.501899),(49.921886,11.503852),(49.934418,11.512885),(49.942149,11.51557),(49.949474,11.51496),(49.956309,11.512519),(49.961111,11.509955),(49.962657,11.508734),(50.053884,11.511379),(50.07252,11.508734),(50.131521,11.539944),(50.151134,11.557929),(50.161876,11.563381),(50.197602,11.562649),(50.206554,11.566799),(50.214366,11.572659),(50.225434,11.578111),(50.268321,11.589301),(50.28891,11.602444),(50.372325,11.668931),(50.418142,11.678046),(50.437022,11.690619),(50.470388,11.727851),(50.500824,11.754828),(50.512706,11.771226),(50.517589,11.79267),(50.518891,11.815253),(50.52296,11.837958),(50.52947,11.859524),(50.538585,11.878648),(50.561209,11.907904),(50.575938,11.920966),(50.589854,11.926459),(50.602061,11.927965),(50.627452,11.940131),(50.632091,11.946763),(50.636485,11.951606),(50.641124,11.954413),(50.647146,11.954047),(50.655935,11.948432),(50.661469,11.947577),(50.682953,11.953355),(50.724864,11.971137),(50.761567,11.978746),(50.771983,11.985785),(50.797864,11.989119)]
+Republic of Serbia	[(19.690095,46.168398),(19.711889,46.15871),(19.772984,46.131552),(19.79045,46.129072),(19.873649,46.152992),(19.888946,46.15739),(19.92915,46.16354),(19.993125,46.159406),(20.034983,46.142973),(20.063405,46.145298),(20.088623,46.154135),(20.098442,46.154962),(20.114772,46.152223),(20.120146,46.149226),(20.130378,46.139355),(20.138026,46.136461),(20.145364,46.137082),(20.170479,46.145505),(20.188462,46.140389),(20.242826,46.108091),(20.305665,46.053572),(20.317653,46.038586),(20.338634,45.992801),(20.35393,45.976678),(20.370984,45.96779),(20.410258,45.955594),(20.429068,45.946706),(20.481674,45.912703),(20.499865,45.906656),(20.538002,45.903711),(20.556709,45.89844),(20.572108,45.887691),(20.605284,45.846143),(20.612312,45.841492),(20.629676,45.833276),(20.636704,45.827023),(20.640114,45.818703),(20.642285,45.798343),(20.64349,45.795141),(20.645902,45.788731),(20.655617,45.77731),(20.678562,45.75664),(20.68807,45.7431),(20.700059,45.735401),(20.713392,45.733334),(20.726827,45.736176),(20.739436,45.743411),(20.745328,45.754986),(20.754113,45.763564),(20.765171,45.766768),(20.77747,45.762324),(20.785739,45.752557),(20.785532,45.743411),(20.781604,45.733954),(20.779124,45.72367),(20.779951,45.671684),(20.777264,45.657524),(20.773233,45.648894),(20.762174,45.630601),(20.754423,45.605589),(20.75804,45.58926),(20.787392,45.553655),(20.800208,45.530504),(20.797624,45.516499),(20.783155,45.506061),(20.760727,45.493348),(20.767135,45.479344),(20.781604,45.472574),(20.799484,45.468544),(20.816021,45.462859),(20.830387,45.452524),(20.863047,45.418728),(20.927642,45.37749),(20.966193,45.341575),(20.981489,45.33279),(21.016668,45.321482),(21.063964,45.30628),(21.0743,45.300544),(21.082775,45.293671),(21.09156,45.288089),(21.103342,45.286074),(21.113057,45.28933),(21.12918,45.301887),(21.139412,45.303696),(21.155638,45.295169),(21.189745,45.259564),(21.206075,45.245922),(21.239251,45.229385),(21.257131,45.224114),(21.299299,45.223184),(21.405546,45.199671),(21.433761,45.188819),(21.459393,45.17404),(21.484388,45.152702),(21.493292,45.145101),(21.49784,45.131872),(21.494119,45.119314),(21.48151,45.111563),(21.469004,45.111046),(21.458566,45.107325),(21.449987,45.101021),(21.442443,45.092908),(21.443786,45.091461),(21.444406,45.08526),(21.444406,45.07787),(21.443786,45.072909),(21.440996,45.068723),(21.432521,45.061488),(21.429524,45.057303),(21.425596,45.043247),(21.425079,45.036219),(21.421875,45.031413),(21.409266,45.023971),(21.398828,45.021387),(21.3733,45.020096),(21.363378,45.01653),(21.356143,45.008572),(21.351389,44.998236),(21.353456,44.989813),(21.366995,44.987281),(21.383945,44.986661),(21.387046,44.981545),(21.384565,44.97493),(21.385185,44.969504),(21.40844,44.958342),(21.456499,44.952348),(21.48151,44.943563),(21.51634,44.933899),(21.531016,44.924649),(21.539078,44.908474),(21.536287,44.889302),(21.522128,44.880776),(21.48151,44.872611),(21.453398,44.869562),(21.395314,44.871629),(21.368545,44.86486),(21.355523,44.856591),(21.346428,44.845636),(21.342811,44.831942),(21.3598,44.826657),(21.359841,44.826644),(21.360587,44.826412),(21.378571,44.816645),(21.395934,44.790239),(21.41216,44.784813),(21.49722,44.778043),(21.558405,44.78166),(21.578042,44.777681),(21.595612,44.765951),(21.604293,44.749983),(21.610288,44.731948),(21.619693,44.713913),(21.65628,44.687661),(21.705166,44.677067),(21.756842,44.677274),(21.801697,44.683889),(21.838284,44.695206),(21.855441,44.698461),(21.871977,44.695981),(21.962411,44.662288),(21.994347,44.658567),(22.004269,44.651539),(22.032174,44.603325),(22.034243,44.596168),(22.036174,44.589489),(22.039822,44.576867),(22.045197,44.569219),(22.055739,44.562139),(22.067107,44.55723),(22.076306,44.550718),(22.086951,44.52178),(22.104314,44.509636),(22.126639,44.502659),(22.148239,44.500902),(22.172114,44.505347),(22.185136,44.515113),(22.299031,44.661668),(22.304922,44.677377),(22.319702,44.685336),(22.361146,44.692054),(22.38068,44.700528),(22.41551,44.727814),(22.426052,44.733653),(22.450547,44.732981),(22.468943,44.730191),(22.483723,44.72399),(22.553279,44.669161),(22.587489,44.649369),(22.621182,44.637432),(22.700144,44.63061),(22.714716,44.623065),(22.765153,44.58281),(22.759262,44.564671),(22.741692,44.551855),(22.719367,44.544362),(22.700144,44.54183),(22.678543,44.545551),(22.642163,44.563121),(22.621182,44.569219),(22.600305,44.569787),(22.580461,44.565498),(22.565578,44.555421),(22.55979,44.538781),(22.55669,44.52147),(22.548422,44.511703),(22.535503,44.507517),(22.500363,44.50638),(22.491061,44.50421),(22.484136,44.499766),(22.479795,44.490412),(22.477212,44.476976),(22.477005,44.463954),(22.480002,44.455789),(22.500983,44.44194),(22.505427,44.435015),(22.506357,44.427522),(22.50398,44.411709),(22.505117,44.404061),(22.522687,44.37507),(22.549352,44.348974),(22.582838,44.328406),(22.621182,44.315901),(22.662523,44.311663),(22.68154,44.305307),(22.689498,44.291716),(22.685364,44.243657),(22.690739,44.228878),(22.69164,44.228435),(22.648777,44.213995),(22.639992,44.207329),(22.624799,44.189397),(22.608573,44.175858),(22.606196,44.174566),(22.604852,44.168468),(22.605989,44.163145),(22.607953,44.159993),(22.6094,44.159941),(22.599065,44.130331),(22.597101,44.119065),(22.598134,44.109298),(22.604646,44.088163),(22.604749,44.079378),(22.592967,44.063926),(22.57519,44.061394),(22.554623,44.062428),(22.534159,44.057157),(22.522583,44.044703),(22.514935,44.030285),(22.50367,44.019898),(22.481449,44.019433),(22.465885,44.017624),(22.43432,44.013955),(22.411789,44.006927),(22.399594,43.993336),(22.39732,43.980934),(22.396803,43.951944),(22.394529,43.936337),(22.391945,43.931867),(22.382024,43.918561),(22.379026,43.913496),(22.377063,43.883524),(22.367554,43.852751),(22.354738,43.829703),(22.349467,43.807921),(22.362593,43.780843),(22.388535,43.758286),(22.389568,43.750509),(22.385848,43.733817),(22.386054,43.725498),(22.390498,43.712449),(22.396906,43.699401),(22.404865,43.687179),(22.41396,43.676663),(22.426465,43.668214),(22.455921,43.656406),(22.466256,43.64912),(22.472871,43.635942),(22.473801,43.612998),(22.481449,43.600647),(22.481759,43.599975),(22.481966,43.599459),(22.481759,43.598942),(22.481449,43.598529),(22.478142,43.594911),(22.477108,43.591294),(22.478142,43.587573),(22.481449,43.584137),(22.482689,43.581734),(22.483103,43.579279),(22.482689,43.576695),(22.481449,43.574111),(22.478658,43.569176),(22.477625,43.564164),(22.478452,43.559229),(22.490647,43.540883),(22.509354,43.493341),(22.518863,43.474247),(22.532609,43.464842),(22.565785,43.453344),(22.57271,43.44815),(22.586766,43.43443),(22.596274,43.429159),(22.606919,43.427402),(22.62852,43.428255),(22.637822,43.426369),(22.645367,43.420297),(22.656529,43.403192),(22.658926,43.401295),(22.664694,43.396732),(22.674202,43.394148),(22.693219,43.394872),(22.702934,43.394045),(22.719367,43.388671),(22.724343,43.38606),(22.73301,43.381513),(22.80453,43.328984),(22.817139,43.315497),(22.820756,43.307539),(22.823857,43.289297),(22.826958,43.28139),(22.833159,43.274647),(22.857343,43.256947),(22.883802,43.230592),(22.897754,43.220335),(22.915531,43.212247),(22.964727,43.204418),(22.981367,43.198992),(22.982902,43.187318),(22.984571,43.174627),(22.974029,43.141192),(22.955632,43.108274),(22.935271,43.085562),(22.927107,43.081144),(22.910157,43.075279),(22.901682,43.069749),(22.896721,43.062721),(22.889486,43.044376),(22.884215,43.036651),(22.842254,43.007505),(22.829025,42.993656),(22.829025,42.993501),(22.828921,42.993449),(22.828818,42.993449),(22.815796,42.989703),(22.788097,42.984897),(22.776418,42.979729),(22.76939,42.97128),(22.763189,42.958645),(22.745516,42.910069),(22.739579,42.898858),(22.738798,42.897383),(22.727015,42.886892),(22.69663,42.87741),(22.666244,42.871932),(22.5909,42.886892),(22.563615,42.884283),(22.549972,42.877358),(22.544785,42.871706),(22.544494,42.871389),(22.53757,42.868341),(22.519793,42.870356),(22.506047,42.870123),(22.497055,42.864413),(22.481449,42.84674),(22.470907,42.840125),(22.445482,42.830178),(22.436801,42.824286),(22.430446,42.817077),(22.427395,42.813615),(22.425845,42.809843),(22.429359,42.806122),(22.45313,42.763592),(22.466566,42.748529),(22.481449,42.739821),(22.482586,42.736824),(22.482896,42.733775),(22.482586,42.730675),(22.481449,42.727677),(22.468116,42.718324),(22.442072,42.681685),(22.449203,42.667965),(22.444552,42.64329),(22.441318,42.632891),(22.428842,42.592776),(22.425328,42.572855),(22.429669,42.571408),(22.481449,42.535622),(22.512145,42.519189),(22.524857,42.507665),(22.532505,42.493557),(22.532505,42.493402),(22.536536,42.47839),(22.533125,42.45759),(22.519483,42.420926),(22.508838,42.404932),(22.497572,42.399196),(22.485066,42.397155),(22.46977,42.391703),(22.454371,42.376768),(22.438454,42.340052),(22.423985,42.325893),(22.405795,42.321552),(22.364144,42.320984),(22.345023,42.313439),(22.325283,42.314318),(22.307609,42.31933),(22.29159,42.328399),(22.276914,42.341241),(22.27402,42.348476),(22.273296,42.365477),(22.268852,42.370335),(22.259757,42.369095),(22.233402,42.348889),(22.095529,42.305817),(22.060906,42.301088),(22.045407,42.302424),(22.027627,42.303956),(21.994967,42.312612),(21.941534,42.333102),(21.929028,42.335117),(21.918279,42.331345),(21.88438,42.309512),(21.877352,42.30822),(21.837354,42.308556),(21.8172,42.305145),(21.719521,42.260957),(21.706509,42.25507),(21.69204,42.242022),(21.67695,42.234943),(21.676886,42.234945),(21.65969,42.235563),(21.624654,42.242772),(21.575044,42.242022),(21.564066,42.246289),(21.553857,42.273984),(21.514893,42.317832),(21.51603,42.341939),(21.537321,42.35863),(21.596645,42.372092),(21.617419,42.386639),(21.621863,42.402167),(21.616902,42.433923),(21.618969,42.449245),(21.627858,42.460381),(21.667855,42.490095),(21.717671,42.551151),(21.727697,42.574147),(21.726766,42.577945),(21.719738,42.586678),(21.718291,42.591019),(21.720152,42.593887),(21.726973,42.596393),(21.728833,42.598305),(21.730074,42.601018),(21.735551,42.621276),(21.734725,42.624247),(21.744543,42.629647),(21.756532,42.633626),(21.767074,42.638716),(21.772758,42.647501),(21.764387,42.669619),(21.74425,42.679425),(21.738652,42.68215),(21.708886,42.687189),(21.687389,42.686827),(21.644084,42.672306),(21.629408,42.672203),(21.612665,42.680393),(21.580522,42.710211),(21.565226,42.720184),(21.542488,42.725817),(21.441823,42.736101),(21.4178,42.73557),(21.405546,42.7353),(21.388699,42.739046),(21.378674,42.744136),(21.379191,42.747004),(21.383945,42.749976),(21.387149,42.754962),(21.39056,42.770414),(21.404099,42.803978),(21.408336,42.820747),(21.408419,42.841743),(21.40844,42.846998),(21.398931,42.854569),(21.378777,42.855292),(21.346738,42.860847),(21.336403,42.865473),(21.316972,42.877616),(21.306327,42.882448),(21.294958,42.884386),(21.2716,42.884283),(21.260542,42.886556),(21.23243,42.910896),(21.226745,42.942522),(21.225298,42.973554),(21.209795,42.995878),(21.193052,42.997893),(21.17941,42.990581),(21.165354,42.985103),(21.147887,42.992622),(21.139309,43.005826),(21.124012,43.058277),(21.10851,43.081558),(21.092593,43.090678),(21.025827,43.093366),(21.005157,43.099128),(20.993431,43.104148),(20.912494,43.138805),(20.838552,43.170467),(20.832041,43.178606),(20.836071,43.179433),(20.839069,43.192455),(20.840619,43.206976),(20.839999,43.212092),(20.851471,43.219818),(20.8616,43.217518),(20.8647,43.217337),(20.855088,43.231445),(20.848474,43.238137),(20.838449,43.245863),(20.819432,43.257412),(20.809717,43.25961),(20.79442,43.263071),(20.769512,43.260849),(20.745328,43.252865),(20.666986,43.209663),(20.644869,43.203307),(20.612312,43.202274),(20.604044,43.197959),(20.597533,43.184962),(20.600117,43.173826),(20.612106,43.154938),(20.620581,43.133337),(20.626058,43.123725),(20.632053,43.117266),(20.640941,43.115276),(20.65169,43.11631),(20.661818,43.115948),(20.669157,43.109799),(20.664919,43.085407),(20.643835,43.052257),(20.617273,43.02213),(20.596396,43.007092),(20.584304,43.006911),(20.572832,43.00934),(20.562393,43.009495),(20.553401,43.002596),(20.543893,42.987248),(20.538415,42.980659),(20.530457,42.975156),(20.51113,42.970195),(20.493457,42.970195),(20.476403,42.966371),(20.459454,42.950015),(20.450979,42.922032),(20.466688,42.909501),(20.488909,42.899191),(20.494367,42.887467),(20.498831,42.877875),(20.4763,42.855525),(20.428034,42.840642),(20.345352,42.827439),(20.355171,42.86617),(20.35362,42.890975),(20.337084,42.906969),(20.275589,42.929887),(20.223189,42.957663),(20.19456,42.966836),(20.14092,42.970815),(20.129464,42.973605),(20.116942,42.976654),(20.056344,43.020796),(20.054388,43.022221),(20.019894,43.047348),(19.959742,43.07856),(19.949821,43.085924),(19.942276,43.095639),(19.936591,43.105897),(19.92915,43.113907),(19.916644,43.117059),(19.907136,43.113261),(19.883778,43.095691),(19.872203,43.090368),(19.838303,43.088353),(19.805127,43.089955),(19.781769,43.096466),(19.761202,43.108739),(19.742805,43.126516),(19.713556,43.165609),(19.705494,43.166178),(19.69733,43.160209),(19.684617,43.156721),(19.663016,43.158504),(19.618678,43.168245),(19.598111,43.176203),(19.580851,43.187804),(19.549948,43.217518),(19.547845,43.218815),(19.512431,43.240643),(19.502303,43.251935),(19.485146,43.280098),(19.473054,43.293276),(19.414039,43.338389),(19.372285,43.384226),(19.355645,43.393063),(19.218392,43.438202),(19.192244,43.454532),(19.175914,43.480887),(19.175191,43.509619),(19.195345,43.532796),(19.217462,43.532796),(19.229451,43.549746),(19.238856,43.572122),(19.252706,43.588633),(19.263661,43.590958),(19.289189,43.587935),(19.300868,43.588297),(19.31265,43.593154),(19.335801,43.606513),(19.34655,43.608838),(19.363396,43.601577),(19.38045,43.585584),(19.394609,43.566463),(19.402877,43.549643),(19.410732,43.540754),(19.41931,43.549255),(19.431816,43.57114),(19.443908,43.571864),(19.481735,43.560831),(19.48959,43.564448),(19.491761,43.568608),(19.48897,43.573181),(19.481735,43.578116),(19.476878,43.588684),(19.475638,43.602559),(19.477498,43.616977),(19.481735,43.628914),(19.507367,43.647182),(19.505713,43.67364),(19.481735,43.729218),(19.461685,43.762136),(19.359469,43.842209),(19.305932,43.904737),(19.275443,43.933263),(19.241027,43.952357),(19.229348,43.95768),(19.240717,43.965741),(19.242887,43.972821),(19.238133,43.985378),(19.238029,43.99251),(19.243507,44.002018),(19.252085,44.007496),(19.272756,44.012405),(19.287329,44.013025),(19.300558,44.009511),(19.325879,43.996592),(19.351718,43.979125),(19.364637,43.973286),(19.379106,43.973854),(19.393989,43.977058),(19.447112,43.979797),(19.50406,43.975663),(19.528554,43.977213),(19.552222,43.983415),(19.593357,44.005584),(19.61041,44.019278),(19.618885,44.035711),(19.611443,44.054521),(19.598938,44.062583),(19.589946,44.060309),(19.583848,44.054315),(19.580231,44.051524),(19.570929,44.056898),(19.554599,44.071265),(19.522043,44.08501),(19.516189,44.091194),(19.498169,44.110229),(19.482666,44.120667),(19.476361,44.127023),(19.474191,44.144903),(19.465716,44.15281),(19.459721,44.152707),(19.448456,44.144438),(19.442565,44.143198),(19.435537,44.146092),(19.424891,44.153792),(19.381173,44.177098),(19.362363,44.191206),(19.356058,44.204021),(19.353991,44.22433),(19.341589,44.245828),(19.324329,44.263966),(19.307379,44.274198),(19.295907,44.2758),(19.263661,44.270167),(19.249502,44.270736),(19.240717,44.272699),(19.220046,44.280244),(19.177155,44.286962),(19.157001,44.293577),(19.138914,44.309338),(19.116693,44.343703),(19.108942,44.36365),(19.107185,44.382718),(19.115763,44.403596),(19.129612,44.416153),(19.141394,44.430829),(19.143358,44.458218),(19.127339,44.502556),(19.129922,44.518317),(19.165269,44.526689),(19.173124,44.531443),(19.179635,44.538264),(19.185319,44.546223),(19.187283,44.553302),(19.18625,44.569322),(19.188317,44.57604),(19.193278,44.580587),(19.20413,44.585135),(19.208677,44.588391),(19.255703,44.645648),(19.270069,44.67562),(19.277614,44.684871),(19.288259,44.693035),(19.308413,44.705128),(19.318025,44.715463),(19.32836,44.733963),(19.363707,44.854628),(19.367841,44.859278),(19.373112,44.86026),(19.376626,44.862999),(19.375695,44.873128),(19.372802,44.881448),(19.368667,44.887132),(19.362776,44.891111),(19.356993,44.895869),(19.356982,44.895877),(19.353165,44.899018),(19.352958,44.898087),(19.350271,44.897002),(19.340142,44.896227),(19.33022,44.898708),(19.31017,44.91235),(19.301281,44.91235),(19.293013,44.909405),(19.283815,44.908371),(19.239476,44.915141),(19.229554,44.913745),(19.211881,44.908371),(19.201856,44.908371),(19.196895,44.913177),(19.193174,44.921549),(19.18687,44.927543),(19.174261,44.925424),(19.08455,44.878967),(19.068427,44.874833),(19.047757,44.872714),(19.015821,44.865635),(18.994323,44.894832),(18.991429,44.914934),(19.018405,44.925683),(19.031944,44.922634),(19.052098,44.906976),(19.06667,44.905684),(19.078659,44.910852),(19.087858,44.919326),(19.103567,44.93824),(19.113076,44.942426),(19.124548,44.94594),(19.131679,44.953175),(19.127649,44.968419),(19.118554,44.97555),(19.09809,44.970021),(19.087238,44.977101),(19.085171,44.987281),(19.088478,44.999477),(19.093232,45.011517),(19.095402,45.020922),(19.094266,45.031413),(19.085997,45.06092),(19.082277,45.084949),(19.079176,45.094613),(19.071528,45.107067),(19.064087,45.113578),(19.054165,45.120606),(19.046207,45.128358),(19.044863,45.137246),(19.060056,45.146858),(19.116073,45.142879),(19.137674,45.146031),(19.141705,45.162154),(19.128785,45.181068),(19.121861,45.195795),(19.143875,45.199516),(19.155761,45.194969),(19.174571,45.175797),(19.185319,45.168045),(19.204543,45.162878),(19.225937,45.161947),(19.267795,45.165823),(19.272756,45.168355),(19.275753,45.172851),(19.279474,45.177244),(19.286709,45.179517),(19.291359,45.177709),(19.299421,45.168975),(19.304279,45.166547),(19.390682,45.169337),(19.393929,45.171624),(19.405358,45.179672),(19.407838,45.203133),(19.397296,45.223287),(19.378073,45.229592),(19.363086,45.248247),(19.162065,45.285041),(19.124755,45.298115),(19.098813,45.319871),(19.096229,45.329121),(19.095402,45.340489),(19.091992,45.349998),(19.08207,45.354029),(19.040832,45.354029),(19.020988,45.357233),(19.003625,45.366121),(18.988742,45.379247),(18.975927,45.394956),(19.028637,45.412165),(19.037422,45.422293),(19.031634,45.434024),(19.012258,45.448468),(19.003005,45.455366),(18.99639,45.473815),(19.00962,45.498671),(19.017926,45.497807),(19.077212,45.491643),(19.106255,45.511642),(19.095092,45.526059),(19.082277,45.531175),(19.067807,45.533398),(19.050961,45.538927),(19.040936,45.545025),(19.036491,45.549469),(19.033391,45.554637),(19.02719,45.562595),(19.018095,45.567401),(19.009206,45.565489),(19.000628,45.561199),(18.983161,45.55474),(18.973136,45.546265),(18.960217,45.539134),(18.941717,45.538927),(18.932002,45.545541),(18.912054,45.568227),(18.90358,45.573085),(18.90699,45.581663),(18.90823,45.600422),(18.912365,45.619232),(18.924457,45.627707),(18.935412,45.633391),(18.962904,45.660108),(18.968485,45.668738),(18.962697,45.683052),(18.948125,45.692044),(18.931071,45.698917),(18.917325,45.706565),(18.908954,45.719433),(18.90482,45.749767),(18.900169,45.764908),(18.871127,45.789971),(18.863995,45.798549),(18.848699,45.809556),(18.844978,45.815706),(18.846735,45.819995),(18.850353,45.824232),(18.85242,45.830072),(18.855314,45.857357),(18.887146,45.859476),(18.899755,45.861388),(18.90699,45.867951),(18.903993,45.875702),(18.893451,45.883867),(18.872884,45.895236),(18.881979,45.902626),(18.889834,45.907897),(18.90699,45.9157),(18.901306,45.931203),(18.962697,45.927947),(18.981818,45.921849),(18.987502,45.923813),(18.988742,45.927017),(18.986469,45.931254),(18.97882,45.939781),(18.977684,45.943502),(18.978717,45.947171),(18.981818,45.950788),(19.005589,45.96257),(19.03091,45.960038),(19.048584,45.963449),(19.049721,45.993111),(19.06543,46.012025),(19.088478,46.018846),(19.111009,46.012955),(19.125788,45.993266),(19.125788,45.993111),(19.148009,45.984068),(19.235652,45.977711),(19.263454,45.981432),(19.274823,45.991612),(19.279474,46.003808),(19.286915,46.016159),(19.298315,46.022123),(19.306966,46.026649),(19.325156,46.029491),(19.362156,46.029646),(19.378899,46.033677),(19.389131,46.041532),(19.396573,46.051557),(19.404738,46.060239),(19.417243,46.064321),(19.428302,46.06551),(19.43688,46.06799),(19.453727,46.07755),(19.460858,46.084475),(19.465922,46.091968),(19.47295,46.098686),(19.499305,46.108608),(19.496722,46.116876),(19.48928,46.126023),(19.487523,46.134239),(19.501993,46.145608),(19.525247,46.156409),(19.549948,46.16416),(19.568449,46.166434),(19.589739,46.165969),(19.647824,46.173875),(19.669321,46.1731),(19.690095,46.168398)]
+Suriname	[(-54.170965,5.348376),(-54.19046,5.325748),(-54.269163,5.269085),(-54.311331,5.225806),(-54.320652,5.212454),(-54.332002,5.196196),(-54.343577,5.156379),(-54.350037,5.149583),(-54.365437,5.138757),(-54.369881,5.132375),(-54.37231,5.121058),(-54.375617,5.114883),(-54.430239,5.053388),(-54.448636,5.024294),(-54.454785,5.008533),(-54.457576,4.99135),(-54.448842,4.951482),(-54.450806,4.936728),(-54.455509,4.931431),(-54.482122,4.912802),(-54.486721,4.902958),(-54.484964,4.892752),(-54.47866,4.87867),(-54.47866,4.755189),(-54.475404,4.741727),(-54.467291,4.736198),(-54.457007,4.73333),(-54.447344,4.727852),(-54.435458,4.709404),(-54.435148,4.692376),(-54.438559,4.673282),(-54.437732,4.648735),(-54.425278,4.61605),(-54.423469,4.604345),(-54.423469,4.563392),(-54.428172,4.546158),(-54.447964,4.509545),(-54.450806,4.484224),(-54.433443,4.376375),(-54.402954,4.312942),(-54.394117,4.269818),(-54.393187,4.244393),(-54.399595,4.227262),(-54.41055,4.208581),(-54.406571,4.191528),(-54.394892,4.177911),(-54.38249,4.169566),(-54.3489,4.160522),(-54.338565,4.152332),(-54.334689,4.131713),(-54.337583,4.116649),(-54.351019,4.082078),(-54.355153,4.066523),(-54.353861,4.041718),(-54.344353,4.024949),(-54.310194,3.994202),(-54.30389,3.984461),(-54.293141,3.949812),(-54.286475,3.940717),(-54.272522,3.929529),(-54.265804,3.922527),(-54.241051,3.876354),(-54.222241,3.866199),(-54.218004,3.857647),(-54.214541,3.858215),(-54.207048,3.846485),(-54.197488,3.826899),(-54.18736,3.814678),(-54.181623,3.811009),(-54.170203,3.805815),(-54.136097,3.795738),(-54.125503,3.788736),(-54.104781,3.75804),(-54.094445,3.747059),(-54.074033,3.676107),(-54.050675,3.640554),(-54.050107,3.634534),(-54.03941,3.636446),(-54.028403,3.639831),(-54.017861,3.641458),(-54.008818,3.637919),(-53.994813,3.623604),(-53.988819,3.610995),(-53.990266,3.595699),(-53.998276,3.573039),(-54.006285,3.531026),(-54.00303,3.455397),(-54.019359,3.415374),(-54.055688,3.377676),(-54.060339,3.364214),(-54.062716,3.346696),(-54.069486,3.327085),(-54.080234,3.309722),(-54.080805,3.309314),(-54.114289,3.285382),(-54.140024,3.245023),(-54.176559,3.200581),(-54.19046,3.178102),(-54.211182,3.127407),(-54.18798,3.130973),(-54.177076,3.116555),(-54.174699,3.093921),(-54.177024,3.072785),(-54.179453,3.070305),(-54.184001,3.067979),(-54.188496,3.06462),(-54.190667,3.059143),(-54.188548,3.058316),(-54.179195,3.051598),(-54.177024,3.048911),(-54.170875,3.024829),(-54.169169,3.010722),(-54.173614,3.004521),(-54.185137,2.997803),(-54.179763,2.983747),(-54.168756,2.971396),(-54.163433,2.969742),(-54.162968,2.955996),(-54.170203,2.925404),(-54.173252,2.919513),(-54.18705,2.899307),(-54.190667,2.887835),(-54.191339,2.877345),(-54.189633,2.870627),(-54.18338,2.863857),(-54.170203,2.853057),(-54.182192,2.846546),(-54.18891,2.838277),(-54.204723,2.791769),(-54.212526,2.776421),(-54.285338,2.677977),(-54.320426,2.606664),(-54.359442,2.508013),(-54.375617,2.483777),(-54.423469,2.435925),(-54.435458,2.431119),(-54.450548,2.428948),(-54.472613,2.42869),(-54.483311,2.422851),(-54.493387,2.417063),(-54.520311,2.348902),(-54.531576,2.340168),(-54.551162,2.338101),(-54.584751,2.348333),(-54.599221,2.345801),(-54.615292,2.326267),(-54.634128,2.320118),(-54.653378,2.316501),(-54.67286,2.315984),(-54.692497,2.318981),(-54.704124,2.32482),(-54.706553,2.332882),(-54.705442,2.342545),(-54.706734,2.353191),(-54.715699,2.375928),(-54.709963,2.39479),(-54.707276,2.395876),(-54.702031,2.395721),(-54.697251,2.397322),(-54.695597,2.403524),(-54.696838,2.409105),(-54.701101,2.419905),(-54.702548,2.425745),(-54.703194,2.445847),(-54.707664,2.450343),(-54.721177,2.457991),(-54.743036,2.466517),(-54.759805,2.465794),(-54.775494,2.457335),(-54.792491,2.448172),(-54.841919,2.433496),(-54.880289,2.447345),(-54.978577,2.54305),(-54.982815,2.552352),(-54.979559,2.566098),(-54.960232,2.585683),(-54.953669,2.599067),(-54.959095,2.608989),(-54.976872,2.606922),(-55.017748,2.590592),(-55.037747,2.577932),(-55.076298,2.54522),(-55.112471,2.527805),(-55.120894,2.524808),(-55.128852,2.525687),(-55.136604,2.5338),(-55.13309,2.552869),(-55.137793,2.56217),(-55.171951,2.559328),(-55.25192,2.497885),(-55.275252,2.499332),(-55.286982,2.513905),(-55.302795,2.519692),(-55.32052,2.518297),(-55.337754,2.511269),(-55.354523,2.494888),(-55.360079,2.476232),(-55.362766,2.457939),(-55.37106,2.442539),(-55.399585,2.430189),(-55.435552,2.43086),(-55.474309,2.435821),(-55.51131,2.43639),(-55.568206,2.431274),(-55.587326,2.433858),(-55.608306,2.433961),(-55.645384,2.416649),(-55.724294,2.396909),(-55.744112,2.401043),(-55.754602,2.409415),(-55.766126,2.431274),(-55.773568,2.440059),(-55.783128,2.445175),(-55.853769,2.462642),(-55.870668,2.47091),(-55.925031,2.515662),(-55.9472,2.528167),(-55.971023,2.530338),(-55.983012,2.526462),(-55.989239,2.520829),(-55.996913,2.503259),(-56.007507,2.460678),(-56.008179,2.416288),(-56.013346,2.398821),(-56.042569,2.355103),(-56.050243,2.347041),(-56.062155,2.341564),(-56.07342,2.34239),(-56.082283,2.347713),(-56.091455,2.351899),(-56.10378,2.349057),(-56.116803,2.333089),(-56.131995,2.304357),(-56.143881,2.274746),(-56.146775,2.256194),(-56.135251,2.248546),(-56.091455,2.245911),(-56.072929,2.241518),(-56.054016,2.224051),(-56.044843,2.184726),(-56.03133,2.163487),(-56.004406,2.144986),(-55.995776,2.13739),(-55.959965,2.090985),(-55.925806,2.061684),(-55.918262,2.050393),(-55.915135,2.037655),(-55.916763,2.028508),(-55.92038,2.019387),(-55.923584,2.006597),(-55.922344,1.962155),(-55.916763,1.922235),(-55.922034,1.886217),(-55.953815,1.853273),(-56.019651,1.833507),(-56.082644,1.846555),(-56.145276,1.871773),(-56.209768,1.888542),(-56.257931,1.885648),(-56.273796,1.887509),(-56.292709,1.895467),(-56.328624,1.918463),(-56.347951,1.926602),(-56.367175,1.928876),(-56.396527,1.921667),(-56.415182,1.919703),(-56.429807,1.9227),(-56.481819,1.941614),(-56.4851,1.953215),(-56.491198,1.962905),(-56.499983,1.969984),(-56.520964,1.976728),(-56.529387,1.981792),(-56.536493,1.988639),(-56.542074,1.997166),(-56.579772,2.016803),(-56.677802,2.018405),(-56.70519,2.029645),(-56.801464,2.165967),(-56.80875,2.195784),(-56.816346,2.217592),(-56.826191,2.261672),(-56.838877,2.281102),(-56.847792,2.285856),(-56.870865,2.290146),(-56.880141,2.294796),(-56.88443,2.303736),(-56.883887,2.339755),(-56.89505,2.362079),(-56.930836,2.393292),(-56.938458,2.41143),(-56.932024,2.425796),(-56.930241,2.436183),(-56.935073,2.445898),(-56.951635,2.461246),(-56.956364,2.470031),(-56.959593,2.483777),(-56.957526,2.493492),(-56.952617,2.504551),(-56.951274,2.515455),(-56.959593,2.524705),(-56.980006,2.509719),(-56.994113,2.504861),(-57.000573,2.514163),(-56.995302,2.547856),(-56.997111,2.555142),(-57.02238,2.584546),(-57.027238,2.59359),(-57.02791,2.610591),(-57.023155,2.623665),(-57.020468,2.635447),(-57.027238,2.648212),(-57.048012,2.636481),(-57.05597,2.642372),(-57.061964,2.68175),(-57.071886,2.700095),(-57.097725,2.72738),(-57.102944,2.740454),(-57.099016,2.750376),(-57.092144,2.763037),(-57.08987,2.773889),(-57.099533,2.778591),(-57.133743,2.773424),(-57.13705,2.77115),(-57.143665,2.790012),(-57.126405,2.82603),(-57.133381,2.832593),(-57.145215,2.830423),(-57.165266,2.821069),(-57.174619,2.818951),(-57.186608,2.82324),(-57.191052,2.832593),(-57.194256,2.841998),(-57.202266,2.846236),(-57.206348,2.856571),(-57.219629,2.908299),(-57.210328,2.918221),(-57.194721,2.930623),(-57.183818,2.944679),(-57.188623,2.95951),(-57.221851,2.963024),(-57.234615,2.970362),(-57.226451,2.983385),(-57.22118,2.992583),(-57.2218,3.000438),(-57.224694,3.009171),(-57.226451,3.021264),(-57.223247,3.024778),(-57.209242,3.024054),(-57.205987,3.028137),(-57.20702,3.035681),(-57.211774,3.048342),(-57.21286,3.056042),(-57.222213,3.078263),(-57.239473,3.094128),(-57.248568,3.112369),(-57.233324,3.14167),(-57.236734,3.143478),(-57.237406,3.143995),(-57.237613,3.144874),(-57.239473,3.147871),(-57.246243,3.141618),(-57.254976,3.13583),(-57.264898,3.132626),(-57.274923,3.13428),(-57.286033,3.142393),(-57.284173,3.148956),(-57.277714,3.156914),(-57.274923,3.169007),(-57.285672,3.192106),(-57.287946,3.203113),(-57.287119,3.21536),(-57.281744,3.235928),(-57.280452,3.247813),(-57.284018,3.25975),(-57.290271,3.267967),(-57.292493,3.276287),(-57.284225,3.288793),(-57.282778,3.295045),(-57.280452,3.329772),(-57.283553,3.343802),(-57.308409,3.39491),(-57.340035,3.370157),(-57.366752,3.36561),(-57.393469,3.373826),(-57.425043,3.387495),(-57.423958,3.369382),(-57.430934,3.360623),(-57.459201,3.353336),(-57.461682,3.349978),(-57.468761,3.343182),(-57.476254,3.338945),(-57.479717,3.343389),(-57.482042,3.348556),(-57.487985,3.351528),(-57.49584,3.352975),(-57.503901,3.353336),(-57.509637,3.357677),(-57.522401,3.365248),(-57.535269,3.36778),(-57.545036,3.348143),(-57.554234,3.346748),(-57.565138,3.349822),(-57.596193,3.367121),(-57.596402,3.367237),(-57.613249,3.376643),(-57.641464,3.38243),(-57.649939,3.385944),(-57.654848,3.39013),(-57.658207,3.39522),(-57.662548,3.40708),(-57.664615,3.417544),(-57.663995,3.425839),(-57.658931,3.443899),(-57.658362,3.450617),(-57.660533,3.462994),(-57.660688,3.469505),(-57.645495,3.498987),(-57.644048,3.51666),(-57.660429,3.535186),(-57.681255,3.547304),(-57.685131,3.549164),(-57.687249,3.552162),(-57.697998,3.553609),(-57.702856,3.555676),(-57.707351,3.560662),(-57.708643,3.564125),(-57.709522,3.56769),(-57.71748,3.582444),(-57.722493,3.599962),(-57.72611,3.607197),(-57.764247,3.631588),(-57.813133,3.651845),(-57.829773,3.662439),(-57.840987,3.680991),(-57.846929,3.702101),(-57.849617,3.747473),(-57.853854,3.76667),(-57.875145,3.812197),(-57.925839,3.886405),(-57.942117,3.905447),(-58.007902,3.957279),(-58.032138,3.987716),(-58.042008,4.023037),(-58.055082,4.108071),(-58.067691,4.151143),(-58.065934,4.171839),(-58.052033,4.193104),(-57.964958,4.282039),(-57.953848,4.299015),(-57.947388,4.318756),(-57.94527,4.343922),(-57.94806,4.360484),(-57.953486,4.375703),(-57.956639,4.391438),(-57.952659,4.409732),(-57.942789,4.425106),(-57.931317,4.437844),(-57.92186,4.450944),(-57.914471,4.484069),(-57.896074,4.52851),(-57.879124,4.556829),(-57.863311,4.60773),(-57.845431,4.633517),(-57.837421,4.65088),(-57.836026,4.669845),(-57.844346,4.687519),(-57.871166,4.721728),(-57.88455,4.762863),(-57.901138,4.773922),(-57.91783,4.782371),(-57.925374,4.796142),(-57.918501,4.829758),(-57.90243,4.852728),(-57.884188,4.872262),(-57.870701,4.888928),(-57.85034,4.922801),(-57.842795,4.929881),(-57.830238,4.933059),(-57.820575,4.930294),(-57.810963,4.92554),(-57.798457,4.92306),(-57.773962,4.926445),(-57.762335,4.93554),(-57.747297,4.964013),(-57.720477,4.9898),(-57.686939,5.006259),(-57.64937,5.008429),(-57.610096,4.99135),(-57.566223,5.007086),(-57.543279,5.011091),(-57.517596,5.012434),(-57.512221,5.009153),(-57.496873,4.994657),(-57.490259,4.99135),(-57.47734,4.992487),(-57.460493,4.997629),(-57.381377,5.005742),(-57.35621,5.012434),(-57.345513,5.01662),(-57.338072,5.020754),(-57.329442,5.024087),(-57.315231,5.026103),(-57.306497,5.024449),(-57.298694,5.021116),(-57.290478,5.020289),(-57.280452,5.026103),(-57.316936,5.058969),(-57.321432,5.070157),(-57.320192,5.083412),(-57.317091,5.094755),(-57.302208,5.128474),(-57.295542,5.157206),(-57.288979,5.171029),(-57.277714,5.17692),(-57.259937,5.1763),(-57.247276,5.172373),(-57.23875,5.162012),(-57.233324,5.142116),(-57.217769,5.14855),(-57.202008,5.157619),(-57.189812,5.16922),(-57.184903,5.183147),(-57.192396,5.203172),(-57.225727,5.243609),(-57.232522,5.260572),(-57.233324,5.262574),(-57.237613,5.268723),(-57.247638,5.271772),(-57.259007,5.271204),(-57.26743,5.266295),(-57.269187,5.256709),(-57.264019,5.247045),(-57.253787,5.234927),(-57.256423,5.228287),(-57.263037,5.223997),(-57.271667,5.222861),(-57.280452,5.225341),(-57.285465,5.230819),(-57.287274,5.238699),(-57.288824,5.30854),(-57.292028,5.311331),(-57.298332,5.311021),(-57.308409,5.313475),(-57.322827,5.30761),(-57.331715,5.30761),(-57.335695,5.316886),(-57.332284,5.327867),(-57.324119,5.33859),(-57.275491,5.387398),(-57.265208,5.403366),(-57.261229,5.42675),(-57.260092,5.448196),(-57.25694,5.464086),(-57.24767,5.484931),(-57.233998,5.498969),(-57.225087,5.507514),(-57.193023,5.519721),(-57.179514,5.530585),(-57.170155,5.542792),(-57.163686,5.557074),(-57.139638,5.665107),(-57.134877,5.759914),(-57.128,5.793158),(-57.12577,5.818145),(-57.113847,5.858844),(-57.102283,5.886416),(-57.075795,5.929999),(-57.071645,5.94123),(-57.066029,5.9501),(-57.057688,5.955878),(-57.03482,5.959906),(-57.027903,5.964423),(-57.022694,5.96894),(-57.017445,5.970933),(-57.012807,5.973863),(-57.000111,5.987982),(-56.994496,5.992662),(-56.98469,5.996283),(-56.974599,5.998114),(-56.963872,6.009152),(-56.956537,6.011574),(-56.928844,6.004262),(-56.866972,5.989637),(-56.830356,5.985557),(-56.780724,5.985508),(-56.702631,5.98219),(-56.659512,5.979716),(-56.642432,5.973223),(-56.611422,5.953647),(-56.593104,5.945753),(-56.57395,5.940756),(-56.526859,5.936549),(-56.418314,5.911349),(-56.355024,5.89467),(-56.303807,5.892508),(-56.256766,5.880406),(-56.222834,5.870753),(-56.19164,5.862616),(-56.124257,5.848049),(-56.083036,5.834366),(-56.058595,5.827737),(-56.037994,5.824164),(-55.999182,5.810713),(-55.936006,5.804661),(-55.917877,5.784735),(-55.903554,5.776353),(-55.897694,5.763007),(-55.897694,5.676703),(-55.897247,5.676703),(-55.890248,5.676703),(-55.884999,5.69245),(-55.88329,5.708075),(-55.884023,5.741929),(-55.887278,5.759467),(-55.90453,5.797187),(-55.915362,5.821771),(-55.899963,5.841964),(-55.910003,5.850918),(-55.922245,5.850353),(-55.933959,5.849827),(-55.947872,5.861521),(-55.951169,5.881511),(-55.946669,5.896493),(-55.930433,5.91758),(-55.923613,5.927845),(-55.910395,5.941616),(-55.900654,5.951945),(-55.886052,5.962954),(-55.86799,5.969813),(-55.844382,5.975962),(-55.820095,5.977275),(-55.729089,5.981216),(-55.678578,5.985256),(-55.637318,5.985907),(-55.394988,5.973876),(-55.335967,5.962708),(-55.307871,5.94335),(-55.292045,5.936727),(-55.270823,5.929999),(-55.263783,5.926418),(-55.253204,5.917792),(-55.242909,5.909369),(-55.2329,5.903266),(-55.229766,5.902411),(-55.221425,5.900214),(-55.21288,5.900214),(-55.202433,5.898761),(-55.188361,5.897395),(-55.176908,5.90129),(-55.164052,5.906684),(-55.14784,5.908177),(-55.130727,5.895855),(-55.110829,5.881171),(-55.103107,5.866412),(-55.115101,5.837128),(-55.129872,5.820746),(-55.128611,5.821357),(-55.101039,5.830499),(-55.091712,5.852791),(-55.090749,5.875117),(-55.08552,5.882799),(-55.063423,5.882883),(-55.030385,5.859768),(-55.010121,5.855536),(-54.99706,5.858466),(-54.988922,5.863674),(-54.981191,5.865465),(-54.958811,5.851793),(-54.950307,5.850287),(-54.941803,5.852118),(-54.931956,5.855536),(-54.924143,5.860419),(-54.918691,5.867092),(-54.911977,5.87287),(-54.900258,5.875393),(-54.890777,5.873358),(-54.880727,5.868354),(-54.863026,5.855536),(-54.867543,5.863674),(-54.874338,5.871568),(-54.882192,5.878363),(-54.890289,5.882799),(-54.903472,5.885403),(-54.91258,5.884025),(-54.921851,5.876625),(-54.933319,5.869672),(-54.956207,5.867575),(-54.971566,5.877267),(-54.985634,5.880387),(-55.001517,5.871259),(-55.016591,5.871975),(-55.031728,5.884467),(-55.047271,5.892279),(-55.105295,5.908922),(-55.12564,5.918647),(-55.142974,5.930121),(-55.15038,5.940863),(-55.154124,5.951361),(-55.159966,5.958114),(-55.153323,5.968592),(-55.1445,5.974248),(-55.116851,5.985256),(-55.085301,5.990649),(-55.044799,5.993105),(-55.013905,5.993394),(-54.77359,5.985256),(-54.75536,5.980943),(-54.712555,5.976184),(-54.673556,5.969192),(-54.471781,5.94097),(-54.34863,5.913755),(-54.252699,5.894808),(-54.169342,5.867906),(-54.097396,5.847339),(-54.074456,5.844887),(-54.062032,5.840559),(-54.036731,5.842351),(-54.030944,5.834184),(-54.020462,5.83025),(-54.014687,5.820148),(-54.016307,5.809704),(-53.992085,5.763497),(-53.986357,5.745665),(-53.99592,5.734524),(-54.019753,5.688979),(-54.031148,5.66931),(-54.036439,5.629502),(-54.050364,5.552069),(-54.061106,5.512885),(-54.073598,5.489814),(-54.091786,5.467922),(-54.10912,5.452826),(-54.118479,5.442776),(-54.122548,5.433417),(-54.128529,5.414293),(-54.170969,5.348375),(-54.170965,5.348376)]
+Slovakia	[(19.706321,49.387529),(19.726578,49.388873),(19.760065,49.397658),(19.769056,49.393213),(19.769263,49.39311),(19.778565,49.374197),(19.783629,49.357557),(19.78952,49.309188),(19.78797,49.305105),(19.780322,49.297612),(19.779713,49.293453),(19.779702,49.293375),(19.783216,49.290016),(19.79686,49.283399),(19.796962,49.28335),(19.798563,49.281081),(19.798822,49.280714),(19.806415,49.275488),(19.80678,49.275236),(19.808641,49.270895),(19.806263,49.265263),(19.800476,49.263041),(19.794068,49.261852),(19.789624,49.259475),(19.751797,49.219064),(19.747787,49.205956),(19.747766,49.205887),(19.760685,49.194208),(19.785903,49.188162),(19.831998,49.185888),(19.854219,49.191262),(19.868292,49.200788),(19.887809,49.214),(19.905896,49.222785),(19.937935,49.22511),(19.965737,49.215653),(20.01731,49.183872),(20.050486,49.173227),(20.07002,49.183097),(20.080355,49.208109),(20.08604,49.243042),(20.098442,49.25286),(20.105367,49.263971),(20.111051,49.275856),(20.130171,49.303917),(20.135856,49.308878),(20.138336,49.307327),(20.16035,49.305622),(20.170169,49.311617),(20.191976,49.328618),(20.207169,49.334199),(20.284374,49.338643),(20.289335,49.343087),(20.296466,49.356937),(20.301634,49.371199),(20.303701,49.380398),(20.307422,49.386599),(20.317653,49.391612),(20.329539,49.391767),(20.370467,49.38169),(20.422143,49.382982),(20.421936,49.40019),(20.437543,49.402515),(20.522085,49.374352),(20.543996,49.370838),(20.567664,49.376367),(20.579136,49.383395),(20.595053,49.396263),(20.605284,49.400035),(20.614483,49.400448),(20.636084,49.39833),(20.673911,49.402309),(20.689517,49.4005),(20.778297,49.331202),(20.79411,49.323657),(20.816538,49.321383),(20.833591,49.322055),(20.849301,49.320505),(20.868007,49.31141),(20.884337,49.300299),(20.900564,49.2926),(20.91896,49.290326),(20.942422,49.295855),(20.964022,49.308103),(20.996682,49.339367),(21.017249,49.352441),(21.032959,49.354611),(21.054043,49.354766),(21.072543,49.357195),(21.080708,49.366342),(21.068512,49.381431),(21.045464,49.390578),(21.033269,49.399673),(21.053526,49.414453),(21.068822,49.419207),(21.10944,49.424581),(21.124943,49.423651),(21.143029,49.415538),(21.157292,49.405151),(21.172588,49.398278),(21.194086,49.400603),(21.211242,49.411094),(21.242455,49.441273),(21.260542,49.449438),(21.274391,49.447267),(21.330408,49.427785),(21.42787,49.409802),(21.444406,49.409905),(21.48151,49.415228),(21.496186,49.412386),(21.514422,49.417213),(21.529569,49.421222),(21.601193,49.426493),(21.6199,49.423341),(21.630028,49.418897),(21.648632,49.407063),(21.65876,49.402464),(21.666305,49.401792),(21.681808,49.404066),(21.69173,49.402154),(21.708576,49.390888),(21.742166,49.357092),(21.757566,49.348927),(21.768004,49.353474),(21.782164,49.364482),(21.799423,49.374817),(21.819577,49.377246),(21.837871,49.370424),(21.874561,49.348358),(21.928408,49.330788),(21.964478,49.308568),(21.99321,49.278182),(22.005819,49.242887),(22.012434,49.211054),(22.040752,49.197463),(22.111549,49.188627),(22.144105,49.174881),(22.155681,49.171522),(22.165706,49.171108),(22.189684,49.17302),(22.197952,49.171987),(22.208908,49.163977),(22.209011,49.156949),(22.20622,49.150489),(22.208494,49.144185),(22.215936,49.139999),(22.262858,49.130594),(22.318151,49.131989),(22.339442,49.12646),(22.390085,49.093025),(22.426775,49.085635),(22.505013,49.083413),(22.539637,49.0722),(22.531989,49.055715),(22.524754,49.032874),(22.520103,49.009826),(22.520516,48.992928),(22.505013,48.984246),(22.466566,48.980526),(22.448996,48.971431),(22.427292,48.929469),(22.41489,48.911693),(22.41365,48.906783),(22.413753,48.893864),(22.411789,48.887766),(22.402384,48.878826),(22.378406,48.865442),(22.370799,48.858248),(22.368898,48.856451),(22.362283,48.844255),(22.36156,48.836452),(22.363523,48.828287),(22.365694,48.794387),(22.36342,48.787617),(22.356495,48.776145),(22.347814,48.767877),(22.338409,48.762968),(22.330761,48.756405),(22.32766,48.743021),(22.3289,48.721575),(22.322492,48.700336),(22.310297,48.681681),(22.294277,48.667625),(22.282185,48.662405),(22.25552,48.656773),(22.243221,48.651192),(22.235676,48.644164),(22.225237,48.628222),(22.219036,48.620935),(22.153717,48.585873),(22.138731,48.569595),(22.136664,48.549337),(22.148343,48.508823),(22.144829,48.493114),(22.13377,48.476835),(22.13284,48.404798),(22.113926,48.38865),(22.09646,48.379425),(22.077856,48.375808),(22.018015,48.379735),(21.999928,48.37896),(21.981531,48.374723),(21.929338,48.372914),(21.914765,48.36909),(21.884276,48.357463),(21.841178,48.353174),(21.789398,48.335526),(21.759012,48.333769),(21.727697,48.340901),(21.701238,48.353949),(21.67757,48.372346),(21.621553,48.429655),(21.613388,48.440352),(21.600366,48.481641),(21.591684,48.49301),(21.574631,48.495568),(21.537734,48.495232),(21.521818,48.50009),(21.5151,48.507118),(21.506005,48.526496),(21.49939,48.535075),(21.490812,48.540268),(21.472725,48.544997),(21.439135,48.558329),(21.424563,48.561275),(21.372679,48.550345),(21.338573,48.549854),(21.32183,48.54758),(21.302296,48.539907),(21.293925,48.530579),(21.28824,48.519934),(21.276561,48.50872),(21.261782,48.50319),(21.250413,48.506498),(21.238011,48.513448),(21.219924,48.518719),(21.186748,48.513707),(21.109336,48.489109),(21.084015,48.49301),(21.063861,48.506239),(21.035956,48.514637),(21.0065,48.518151),(20.981489,48.516859),(20.945832,48.518978),(20.891365,48.541095),(20.859946,48.543317),(20.845477,48.545823),(20.815814,48.563807),(20.800311,48.569233),(20.784085,48.569052),(20.572522,48.536573),(20.51051,48.533783),(20.481674,48.526083),(20.480538,48.518538),(20.480227,48.510218),(20.482191,48.492881),(20.482811,48.489367),(20.482915,48.485827),(20.482501,48.482261),(20.481674,48.478747),(20.468239,48.465389),(20.465968,48.46379),(20.435579,48.442393),(20.420593,48.429241),(20.409017,48.413713),(20.370157,48.334338),(20.349279,48.305476),(20.324268,48.279948),(20.295226,48.260415),(20.272385,48.252456),(20.260293,48.255893),(20.249027,48.264187),(20.22908,48.270905),(20.217815,48.267598),(20.187636,48.248994),(20.170892,48.244033),(20.153322,48.245273),(20.14309,48.247805),(20.134512,48.246669),(20.122006,48.236747),(20.118079,48.229719),(20.112601,48.211735),(20.105263,48.202795),(20.096995,48.198429),(20.078082,48.193545),(20.038303,48.177233),(20.034983,48.175872),(19.99695,48.167914),(19.973902,48.158379),(19.928633,48.130087),(19.905069,48.124299),(19.884295,48.129621),(19.846261,48.152669),(19.821663,48.157914),(19.785593,48.14869),(19.776084,48.149517),(19.766679,48.159),(19.76916,48.167449),(19.774844,48.176079),(19.774327,48.185897),(19.756551,48.200315),(19.73309,48.202899),(19.686994,48.196904),(19.676969,48.200392),(19.655265,48.21835),(19.643896,48.224809),(19.633871,48.226773),(19.623226,48.227006),(19.531241,48.21065),(19.513982,48.203958),(19.503026,48.189411),(19.493621,48.150705),(19.481735,48.134892),(19.481425,48.134427),(19.481219,48.133962),(19.481425,48.133342),(19.481735,48.13267),(19.483286,48.127193),(19.483803,48.121767),(19.483286,48.116496),(19.481735,48.111328),(19.428199,48.085852),(19.29322,48.087764),(19.233482,48.06208),(19.222526,48.060582),(19.098503,48.070736),(19.038662,48.064871),(19.019017,48.065497),(18.996494,48.066214),(18.981818,48.061615),(18.933595,48.054349),(18.838467,48.040015),(18.821001,48.030454),(18.794232,47.993144),(18.784724,47.987615),(18.765293,47.985393),(18.756198,47.981827),(18.743176,47.971052),(18.744519,47.967357),(18.751444,47.963353),(18.754751,47.951803),(18.744726,47.910513),(18.742246,47.889455),(18.748757,47.870723),(18.778006,47.851447),(18.816453,47.83256),(18.814916,47.832194),(18.790305,47.826332),(18.767671,47.822302),(18.750307,47.81362),(18.717234,47.788118),(18.692843,47.777963),(18.663698,47.775896),(18.633829,47.779824),(18.597448,47.79065),(18.552593,47.792846),(18.347851,47.776775),(18.273024,47.756259),(18.23592,47.753882),(18.11262,47.762486),(17.883532,47.752521),(17.825713,47.750006),(17.741997,47.76538),(17.719245,47.773669),(17.676678,47.789177),(17.666239,47.797032),(17.658384,47.807316),(17.639884,47.819201),(17.61911,47.829226),(17.604227,47.834239),(17.592962,47.833102),(17.582937,47.829795),(17.572601,47.829536),(17.560406,47.837986),(17.526609,47.872118),(17.517308,47.876252),(17.492193,47.879818),(17.481858,47.882711),(17.472039,47.888809),(17.36941,47.981207),(17.337887,47.998725),(17.272671,48.00534),(17.262316,48.007283),(17.220892,48.015055),(17.184821,48.020274),(17.148338,48.005443),(17.12498,48.019525),(17.092631,48.02725),(17.069686,48.035674),(17.075061,48.052081),(17.063072,48.058773),(17.059144,48.060427),(17.064829,48.07903),(17.069996,48.089159),(17.080228,48.097608),(17.067206,48.106936),(17.062455,48.112724),(17.047465,48.130991),(17.036923,48.135513),(17.020904,48.137166),(17.007158,48.142799),(16.98194,48.161299),(16.974808,48.17688),(16.974705,48.198558),(16.969951,48.216645),(16.954345,48.25256),(16.953931,48.25734),(16.955275,48.268786),(16.954345,48.273127),(16.950624,48.276589),(16.944423,48.27801),(16.933364,48.284728),(16.924269,48.287519),(16.916621,48.2908),(16.913313,48.296691),(16.912073,48.301239),(16.908869,48.306975),(16.905459,48.311988),(16.902771,48.314106),(16.898431,48.316173),(16.900291,48.321238),(16.904218,48.327025),(16.906492,48.33147),(16.901945,48.339402),(16.891713,48.347024),(16.881171,48.352812),(16.875486,48.355034),(16.855332,48.356455),(16.847581,48.359582),(16.84448,48.365602),(16.845101,48.376583),(16.846858,48.381131),(16.849338,48.384102),(16.851922,48.390407),(16.86081,48.443788),(16.864944,48.458077),(16.875073,48.471539),(16.901221,48.496602),(16.906492,48.509908),(16.913934,48.519339),(16.93047,48.528202),(16.946903,48.539726),(16.949055,48.544836),(16.954345,48.557399),(16.945043,48.604166),(16.947523,48.623157),(16.963336,48.635947),(16.974808,48.649874),(17.025348,48.746328),(17.049946,48.774027),(17.084362,48.793715),(17.098728,48.805756),(17.10462,48.824618),(17.113715,48.83392),(17.167458,48.859758),(17.21221,48.866062),(17.260269,48.857794),(17.374371,48.819605),(17.391734,48.821776),(17.411225,48.830216),(17.429561,48.838157),(17.453332,48.842756),(17.467905,48.838105),(17.498497,48.816763),(17.535084,48.812991),(17.727217,48.86291),(17.744891,48.872574),(17.77941,48.911744),(17.795533,48.920581),(17.820131,48.923371),(17.841215,48.920994),(17.860336,48.921718),(17.878733,48.933552),(17.886897,48.947246),(17.894649,48.9782),(17.90085,48.993031),(17.914079,49.010498),(17.93506,49.019386),(17.959244,49.021867),(18.012885,49.019128),(18.046061,49.029153),(18.075516,49.047188),(18.09629,49.070288),(18.102905,49.09225),(18.10163,49.136928),(18.101458,49.142945),(18.105075,49.169765),(18.117788,49.202579),(18.136495,49.233068),(18.160576,49.2587),(18.190031,49.276942),(18.324597,49.311255),(18.361586,49.330191),(18.385162,49.342261),(18.387642,49.389751),(18.416788,49.385462),(18.439215,49.395074),(18.481797,49.429077),(18.514663,49.440601),(18.522931,49.446079),(18.527995,49.454864),(18.530476,49.473467),(18.535643,49.481684),(18.556211,49.490159),(18.600446,49.485973),(18.628971,49.495791),(18.635896,49.496721),(18.64282,49.495791),(18.675583,49.485043),(18.704522,49.479255),(18.732531,49.480288),(18.773562,49.504886),(18.792269,49.509537),(18.833196,49.510261),(18.932208,49.504318),(18.961147,49.492794),(18.952362,49.475948),(18.953396,49.461685),(18.958253,49.448146),(18.960837,49.433315),(18.956703,49.400448),(18.962284,49.389183),(18.981818,49.386806),(19.007139,49.388098),(19.045793,49.402774),(19.067601,49.406133),(19.076799,49.404066),(19.096643,49.394609),(19.106255,49.391405),(19.11659,49.39094),(19.141705,49.394195),(19.172504,49.402257),(19.179738,49.410267),(19.182322,49.422721),(19.18935,49.442203),(19.192244,49.442616),(19.204543,49.442823),(19.208987,49.444993),(19.211364,49.45166),(19.209401,49.456414),(19.206197,49.459411),(19.20444,49.460548),(19.220459,49.493001),(19.234102,49.507212),(19.248675,49.516255),(19.265005,49.521475),(19.284228,49.524162),(19.315027,49.523955),(19.325363,49.52504),(19.339522,49.528761),(19.347067,49.532998),(19.43378,49.595165),(19.437604,49.600126),(19.443392,49.60178),(19.44889,49.600313),(19.457344,49.598059),(19.474191,49.578732),(19.481735,49.573513),(19.505197,49.563384),(19.517289,49.543282),(19.535479,49.492846),(19.551602,49.461013),(19.55677,49.453882),(19.573926,49.445252),(19.594804,49.441583),(19.634801,49.441324),(19.63015,49.43502),(19.6286,49.429594),(19.62922,49.413936),(19.627097,49.402165),(19.627044,49.401868),(19.684514,49.389079),(19.706321,49.387529)]
+Slovenia	[(16.343426,46.714178),(16.357275,46.715832),(16.357585,46.699011),(16.365383,46.696712),(16.366216,46.696467),(16.371434,46.694929),(16.390038,46.694154),(16.405024,46.687255),(16.410502,46.668367),(16.402607,46.663109),(16.396652,46.659143),(16.377636,46.652864),(16.368437,46.642994),(16.372246,46.636341),(16.376395,46.629093),(16.394585,46.619016),(16.430242,46.604392),(16.467139,46.564704),(16.500832,46.544809),(16.515302,46.501711),(16.491117,46.515146),(16.481298,46.519022),(16.470756,46.520262),(16.449052,46.51835),(16.440371,46.519022),(16.431999,46.523208),(16.415153,46.535559),(16.406264,46.539486),(16.394895,46.540106),(16.382183,46.539383),(16.369471,46.540571),(16.357895,46.546979),(16.351694,46.539486),(16.351254,46.539922),(16.344149,46.546979),(16.340276,46.543827),(16.32999,46.535455),(16.310663,46.530985),(16.295367,46.524448),(16.263947,46.515922),(16.260931,46.513576),(16.234905,46.493339),(16.234188,46.484892),(16.233665,46.47874),(16.237489,46.465072),(16.249375,46.437528),(16.250098,46.429441),(16.248238,46.413344),(16.250925,46.404998),(16.257023,46.399908),(16.274076,46.392105),(16.278727,46.387351),(16.279936,46.378661),(16.280277,46.376214),(16.275626,46.373165),(16.252785,46.373424),(16.217129,46.367352),(16.208654,46.367093),(16.191807,46.369781),(16.177544,46.375594),(16.153567,46.391433),(16.143851,46.394714),(16.131552,46.393061),(16.123181,46.386885),(16.115533,46.379289),(16.106024,46.373734),(16.094345,46.372261),(16.088654,46.373086),(16.057965,46.377532),(16.057448,46.359652),(16.059722,46.345312),(16.059619,46.332315),(16.052384,46.318595),(16.049922,46.316735),(16.038948,46.308441),(16.019208,46.298829),(15.998434,46.291542),(15.993668,46.290613),(15.982001,46.288339),(15.948721,46.284204),(15.918903,46.272827),(15.883712,46.2594),(15.880895,46.259341),(15.879323,46.259308),(15.834206,46.258366),(15.81829,46.255524),(15.803097,46.250511),(15.799526,46.248607),(15.789144,46.24307),(15.768887,46.21935),(15.749767,46.210772),(15.677975,46.214462),(15.661297,46.21532),(15.639799,46.207672),(15.626571,46.19521),(15.62285,46.191704),(15.604349,46.167002),(15.589983,46.138684),(15.58988,46.113517),(15.603833,46.090986),(15.623605,46.076415),(15.631531,46.070574),(15.643727,46.06551),(15.671735,46.057397),(15.683931,46.051144),(15.69288,46.041636),(15.697987,46.036209),(15.693646,46.025771),(15.681967,46.013523),(15.674319,45.993318),(15.674216,45.993163),(15.675381,45.972486),(15.67711,45.941796),(15.67556,45.925157),(15.670392,45.912651),(15.663364,45.900817),(15.659436,45.888828),(15.663674,45.876064),(15.675456,45.855962),(15.676076,45.841699),(15.666051,45.831674),(15.645587,45.824129),(15.626054,45.820202),(15.587296,45.81922),(15.549748,45.823693),(15.523527,45.826816),(15.513916,45.823406),(15.495312,45.812657),(15.48539,45.810176),(15.473918,45.811572),(15.462549,45.814207),(15.451284,45.815137),(15.440328,45.811468),(15.435574,45.802115),(15.439502,45.791676),(15.441052,45.782168),(15.429755,45.775691),(15.429063,45.775295),(15.331031,45.752486),(15.303799,45.746149),(15.263492,45.730388),(15.255017,45.723463),(15.249913,45.713732),(15.248919,45.711836),(15.250883,45.70765),(15.258221,45.705118),(15.267832,45.698452),(15.277754,45.685016),(15.283025,45.680107),(15.291914,45.675559),(15.304936,45.672149),(15.30907,45.674164),(15.310414,45.678195),(15.314961,45.680882),(15.327054,45.683156),(15.330774,45.684551),(15.333875,45.682639),(15.350034,45.669619),(15.351962,45.668066),(15.368291,45.649049),(15.373769,45.640213),(15.353099,45.640316),(15.339146,45.636905),(15.326744,45.632255),(15.297391,45.625692),(15.291604,45.61825),(15.287883,45.610344),(15.281062,45.606158),(15.268556,45.601662),(15.269589,45.593446),(15.276721,45.582697),(15.282179,45.571494),(15.282612,45.570605),(15.288606,45.54456),(15.296668,45.522959),(15.311034,45.505906),(15.361367,45.482031),(15.351755,45.47614),(15.333875,45.458518),(15.325193,45.452834),(15.314031,45.450509),(15.281578,45.450974),(15.225849,45.43645),(15.18422,45.4256),(15.139262,45.430045),(15.066128,45.473934),(15.056166,45.479912),(15.007383,45.480843),(14.997461,45.487199),(14.986299,45.490868),(14.977341,45.491728),(14.962631,45.493142),(14.945372,45.50451),(14.922634,45.514949),(14.904444,45.514432),(14.900826,45.493142),(14.881603,45.469784),(14.838815,45.458983),(14.797164,45.465185),(14.781454,45.493142),(14.781351,45.493193),(14.781247,45.493348),(14.781144,45.493348),(14.688333,45.522029),(14.668489,45.533966),(14.668179,45.539134),(14.671693,45.556807),(14.669833,45.564558),(14.664045,45.570036),(14.663675,45.570187),(14.657327,45.572775),(14.650299,45.574842),(14.615986,45.594066),(14.603067,45.603574),(14.593868,45.616183),(14.592938,45.629671),(14.594075,45.648016),(14.591905,45.663364),(14.580949,45.667808),(14.569095,45.664252),(14.563896,45.662692),(14.556145,45.656697),(14.543639,45.63644),(14.533097,45.625692),(14.507879,45.605848),(14.498577,45.596184),(14.492273,45.58342),(14.491502,45.579165),(14.487415,45.5566),(14.482144,45.542441),(14.468915,45.525594),(14.429744,45.505389),(14.411244,45.493193),(14.372797,45.477845),(14.326805,45.4749),(14.280399,45.481101),(14.240608,45.493348),(14.218698,45.497172),(14.193066,45.491901),(14.145524,45.476243),(14.119686,45.472884),(14.117321,45.472976),(14.116747,45.472998),(14.092917,45.473918),(14.066665,45.480274),(14.041551,45.493142),(14.041551,45.493193),(14.028322,45.50265),(14.013956,45.507973),(13.987476,45.511909),(13.971891,45.514226),(13.964966,45.51097),(13.961452,45.50389),(13.961452,45.493142),(13.98264,45.475313),(13.969824,45.462963),(13.923005,45.448958),(13.908432,45.438881),(13.899647,45.429218),(13.889002,45.423637),(13.835568,45.429114),(13.819859,45.432628),(13.806526,45.442137),(13.759294,45.463169),(13.65997,45.459978),(13.629018,45.458983),(13.589529,45.488837),(13.591645,45.493109),(13.589122,45.501614),(13.595958,45.511908),(13.595958,45.518134),(13.586192,45.519477),(13.578624,45.523383),(13.572765,45.529975),(13.568614,45.539252),(13.58961,45.535793),(13.675141,45.544745),(13.75294,45.552883),(13.75294,45.559068),(13.742361,45.56977),(13.727387,45.581204),(13.711762,45.593207),(13.761051,45.596236),(13.800532,45.58125),(13.847764,45.584661),(13.867926,45.602169),(13.887038,45.618767),(13.894686,45.631841),(13.893641,45.633758),(13.893136,45.634683),(13.884144,45.635148),(13.869158,45.641143),(13.858409,45.649359),(13.778724,45.743411),(13.709478,45.765321),(13.699908,45.770524),(13.660334,45.792038),(13.643591,45.795655),(13.609174,45.798601),(13.581269,45.809246),(13.574172,45.819028),(13.565973,45.83033),(13.56928,45.86454),(13.599306,45.912327),(13.608244,45.926552),(13.615325,45.945912),(13.622817,45.966394),(13.605867,45.985411),(13.600735,45.984574),(13.571657,45.97983),(13.539411,45.96903),(13.509439,45.967428),(13.482257,45.989235),(13.481843,45.990372),(13.481223,45.991354),(13.480396,45.992284),(13.479466,45.993111),(13.474815,45.995747),(13.461793,46.006392),(13.477089,46.016055),(13.482257,46.018433),(13.490008,46.025564),(13.492799,46.032489),(13.490318,46.038948),(13.482257,46.044839),(13.505098,46.066027),(13.522585,46.075298),(13.616409,46.125041),(13.645037,46.161731),(13.641071,46.171405),(13.637389,46.180386),(13.627366,46.181733),(13.613928,46.183539),(13.584473,46.181317),(13.559048,46.184107),(13.528972,46.204829),(13.510162,46.213976),(13.482257,46.217904),(13.468304,46.223433),(13.438332,46.22488),(13.422829,46.228601),(13.437402,46.210927),(13.410116,46.207982),(13.401641,46.216663),(13.398127,46.230513),(13.384898,46.243122),(13.384795,46.243225),(13.384692,46.243328),(13.378594,46.268391),(13.373013,46.280277),(13.365261,46.290302),(13.391306,46.301568),(13.395638,46.306728),(13.409806,46.323608),(13.423242,46.344847),(13.434094,46.353864),(13.447323,46.354846),(13.459726,46.359032),(13.483704,46.37115),(13.530006,46.388332),(13.554397,46.405954),(13.575688,46.426676),(13.600182,46.442644),(13.634082,46.445719),(13.658783,46.445125),(13.67749,46.452075),(13.685853,46.464047),(13.688446,46.467759),(13.689893,46.493339),(13.695474,46.498636),(13.699194,46.504837),(13.701055,46.511891),(13.700951,46.519746),(13.716093,46.518867),(13.782135,46.507782),(13.795778,46.507886),(13.860683,46.51525),(13.890862,46.511787),(13.98233,46.481918),(13.998763,46.480523),(14.014922,46.482531),(14.032456,46.484709),(14.050026,46.484399),(14.066355,46.48104),(14.081032,46.47595),(14.137255,46.442438),(14.147933,46.440425),(14.149865,46.440061),(14.242323,46.438237),(14.362151,46.435875),(14.395844,46.440991),(14.40649,46.439337),(14.411244,46.434635),(14.414448,46.429002),(14.420029,46.424351),(14.437145,46.418884),(14.450931,46.414481),(14.467675,46.412672),(14.502194,46.418356),(14.515837,46.40536),(14.527102,46.388229),(14.540332,46.378643),(14.557695,46.38394),(14.562108,46.391737),(14.566997,46.400373),(14.575368,46.419726),(14.590148,46.434428),(14.599863,46.437167),(14.621567,46.43851),(14.631696,46.440577),(14.642031,46.445228),(14.662081,46.459698),(14.666629,46.460524),(14.672546,46.459791),(14.679961,46.458871),(14.687093,46.471221),(14.698772,46.480962),(14.703733,46.487758),(14.709727,46.492512),(14.726367,46.497706),(14.735255,46.493339),(14.760887,46.496284),(14.783004,46.503261),(14.788585,46.506646),(14.796663,46.519401),(14.807189,46.536024),(14.814519,46.551337),(14.822278,46.567546),(14.833647,46.584393),(14.85039,46.601136),(14.862999,46.604831),(14.877055,46.603642),(14.894063,46.605215),(14.897726,46.605554),(14.919507,46.615017),(14.933589,46.621135),(14.947955,46.619274),(14.967179,46.600257),(15.004386,46.636844),(15.061954,46.649557),(15.085723,46.647795),(15.105591,46.646323),(15.172557,46.64136),(15.204891,46.638963),(15.332784,46.64358),(15.388135,46.645578),(15.417591,46.637955),(15.435381,46.627195),(15.440018,46.62439),(15.462653,46.614649),(15.492625,46.618293),(15.511228,46.628369),(15.513939,46.632545),(15.517636,46.63824),(15.520308,46.64772),(15.52084,46.649608),(15.530659,46.663845),(15.545955,46.671881),(15.567349,46.675757),(15.58864,46.675963),(15.603729,46.673018),(15.616648,46.67555),(15.621745,46.678175),(15.626984,46.680873),(15.632978,46.689632),(15.632875,46.702473),(15.635975,46.717563),(15.652098,46.710819),(15.728683,46.70299),(15.755141,46.704024),(15.78461,46.7122),(15.822941,46.722834),(15.850743,46.724488),(15.878545,46.720715),(15.946344,46.697151),(15.986962,46.69219),(15.997917,46.686919),(16.016593,46.670757),(16.016727,46.670641),(16.016723,46.670691),(16.014557,46.693714),(16.003291,46.709191),(15.982001,46.718545),(15.970529,46.743014),(15.969702,46.760532),(15.970985,46.77505),(15.971252,46.778076),(15.978177,46.809134),(15.97735,46.816213),(15.972906,46.818435),(15.971976,46.820632),(15.981691,46.827685),(15.987582,46.830011),(16.028441,46.836947),(16.032024,46.837556),(16.052936,46.84606),(16.094035,46.862774),(16.130246,46.856708),(16.135376,46.855849),(16.179486,46.858468),(16.272009,46.863962),(16.282241,46.859932),(16.297392,46.847033),(16.301878,46.843214),(16.310663,46.84001),(16.325339,46.839442),(16.329783,46.834403),(16.327509,46.825463),(16.321825,46.813268),(16.3149,46.802002),(16.311097,46.797519),(16.302188,46.787016),(16.29949,46.77951),(16.298157,46.775802),(16.300431,46.772082),(16.314177,46.743324),(16.325546,46.733273),(16.334124,46.721749),(16.343426,46.714178)]
+Swaziland	[(31.863357,-25.989937),(31.891882,-25.983839),(31.949243,-25.958104),(31.975288,-25.980429),(32.00402,-25.994381),(32.070579,-26.009781),(32.057454,-26.0412),(32.062725,-26.077167),(32.074559,-26.114167),(32.081432,-26.14879),(32.077814,-26.175455),(32.044741,-26.25452),(32.039884,-26.283666),(32.052338,-26.386812),(32.059831,-26.414821),(32.107063,-26.500293),(32.117398,-26.582252),(32.113884,-26.840014),(32.097761,-26.833503),(32.073163,-26.811386),(32.057144,-26.808595),(31.990068,-26.808285),(31.992238,-26.838257),(31.975288,-26.926624),(31.959682,-27.00879),(31.942112,-27.10067),(31.944204,-27.162338),(31.944851,-27.181389),(31.947383,-27.255493),(31.952964,-27.270169),(31.959785,-27.281021),(31.964849,-27.291666),(31.967743,-27.303035),(31.96826,-27.316264),(31.878602,-27.315231),(31.782535,-27.313991),(31.636911,-27.312234),(31.52653,-27.31089),(31.459454,-27.298694),(31.35667,-27.267068),(31.280137,-27.243504),(31.244707,-27.232586),(31.157043,-27.205573),(31.141954,-27.196478),(31.126503,-27.182629),(31.078754,-27.11824),(30.976073,-27.035041),(30.953645,-27.000315),(30.949408,-26.975407),(30.959743,-26.936133),(30.960983,-26.911224),(30.955092,-26.891381),(30.944447,-26.876601),(30.915818,-26.849419),(30.902589,-26.831333),(30.885294,-26.785641),(30.880213,-26.772215),(30.868741,-26.784927),(30.853393,-26.796606),(30.836443,-26.805081),(30.819803,-26.807975),(30.80244,-26.808905),(30.79567,-26.785547),(30.785697,-26.716921),(30.784146,-26.578842),(30.782906,-26.472388),(30.804559,-26.397457),(30.897318,-26.291727),(30.897334,-26.291709),(30.969871,-26.209148),(31.037774,-26.100111),(31.091621,-25.983633),(31.106866,-25.930923),(31.119836,-25.910045),(31.20841,-25.838628),(31.309282,-25.757393),(31.337394,-25.744681),(31.372017,-25.736412),(31.401473,-25.735999),(31.426898,-25.743647),(31.532835,-25.805556),(31.638771,-25.867464),(31.7306,-25.921207),(31.746966,-25.93079),(31.834573,-25.982082),(31.863357,-25.989937)]
+Sint Maarten	[(-63.017569,18.033391),(-63.030629,18.01911),(-63.097646,18.035956),(-63.112172,18.043036),(-63.118886,18.0515),(-63.107004,18.059475),(-63.107004,18.062109),(-63.085886,18.058511),(-63.017569,18.033391)]
+Syria	[(42.236832,37.286304),(42.267218,37.274522),(42.272902,37.276744),(42.279207,37.282273),(42.285822,37.286562),(42.292023,37.285064),(42.296364,37.279689),(42.301428,37.269923),(42.305769,37.264548),(42.339875,37.242637),(42.346696,37.239769),(42.353208,37.227031),(42.335328,37.171169),(42.346696,37.158431),(42.354551,37.15241),(42.356515,37.138277),(42.357238,37.109984),(42.363646,37.09815),(42.371191,37.087944),(42.376875,37.076756),(42.377186,37.062235),(42.376806,37.062001),(42.34587,37.042908),(42.281894,36.994125),(42.281894,36.994022),(42.281894,36.99397),(42.281584,36.99397),(42.178438,36.90532),(41.978554,36.733625),(41.843781,36.617869),(41.817323,36.599731),(41.789935,36.589292),(41.479773,36.536117),(41.414867,36.527384),(41.385411,36.516377),(41.365361,36.494156),(41.365361,36.494053),(41.365258,36.494001),(41.365258,36.493898),(41.276994,36.354785),(41.268829,36.327965),(41.236583,36.077024),(41.236687,36.060332),(41.240614,36.043021),(41.266246,35.99429),(41.266349,35.994342),(41.266349,35.994238),(41.343657,35.857657),(41.354509,35.825566),(41.359263,35.792752),(41.363501,35.655241),(41.358023,35.623925),(41.34221,35.593694),(41.308458,35.552248),(41.261285,35.49432),(41.261285,35.494165),(41.261181,35.494165),(41.261078,35.494165),(41.25188,35.46409),(41.243095,35.366525),(41.20134,35.243018),(41.191521,35.182143),(41.192326,35.158904),(41.198033,34.994041),(41.206508,34.819323),(41.204234,34.793123),(41.195656,34.768473),(41.023986,34.49433),(41.023986,34.494175),(40.98802,34.42852),(40.965282,34.401855),(40.936033,34.386068),(40.690467,34.331497),(40.543809,34.257988),(40.433221,34.202539),(40.322634,34.147167),(40.212046,34.091796),(40.173111,34.072283),(40.101459,34.036373),(39.990871,33.980976),(39.880387,33.925605),(39.769696,33.870233),(39.659212,33.81481),(39.548624,33.759491),(39.438037,33.704094),(39.327449,33.648722),(39.216862,33.593325),(39.106274,33.537928),(38.995686,33.482479),(38.885099,33.427108),(38.774511,33.371685),(38.529565,33.244251),(38.315742,33.13118),(38.230875,33.086302),(38.056726,32.994344),(38.056726,32.994292),(37.929395,32.92533),(37.758036,32.832519),(37.586677,32.739837),(37.494606,32.690056),(37.415214,32.64713),(37.244062,32.554396),(37.133371,32.494581),(37.133371,32.494529),(37.133165,32.494529),(37.133165,32.494478),(36.980099,32.410038),(36.819385,32.316788),(36.806569,32.313042),(36.792513,32.313533),(36.728641,32.327795),(36.706937,32.328338),(36.689574,32.319656),(36.653504,32.342859),(36.516684,32.357014),(36.480181,32.360791),(36.463955,32.369395),(36.407627,32.374227),(36.387887,32.379317),(36.373108,32.386422),(36.285258,32.456935),(36.220765,32.494581),(36.188209,32.52228),(36.177357,32.527318),(36.17219,32.525923),(36.160821,32.517215),(36.15586,32.5152),(36.149865,32.51613),(36.13953,32.519541),(36.133226,32.520109),(36.096225,32.515872),(36.081906,32.516265),(36.06987,32.516595),(36.066253,32.517319),(36.066046,32.521608),(36.060465,32.533261),(36.015403,32.591164),(36.005998,32.607907),(36.005275,32.626692),(36.008272,32.643719),(36.003621,32.655088),(35.980263,32.656612),(35.965794,32.654365),(35.955355,32.657439),(35.94657,32.664441),(35.937475,32.674002),(35.941196,32.673536),(35.9444,32.677619),(35.945743,32.684104),(35.944193,32.690771),(35.940369,32.692502),(35.92745,32.692373),(35.922489,32.693768),(35.905229,32.708573),(35.895721,32.713276),(35.788234,32.734411),(35.779035,32.744282),(35.779035,32.744359),(35.779139,32.744462),(35.779139,32.744514),(35.774901,32.747279),(35.769734,32.748054),(35.763842,32.746969),(35.75759,32.744347),(35.784203,32.777949),(35.834226,32.827946),(35.841874,32.853577),(35.83805,32.866031),(35.849729,32.895823),(35.866885,32.920782),(35.874017,32.922333),(35.888073,32.944941),(35.864611,32.97773),(35.85903,32.99021),(35.845801,33.085423),(35.848902,33.098678),(35.811488,33.111908),(35.811488,33.126765),(35.822443,33.14157),(35.833399,33.161129),(35.830195,33.189991),(35.807664,33.201721),(35.803633,33.248463),(35.775625,33.264896),(35.768597,33.272699),(35.802083,33.31249),(35.763842,33.334401),(35.785753,33.342875),(35.793505,33.349929),(35.809938,33.360032),(35.812315,33.373365),(35.815415,33.378868),(35.816966,33.395198),(35.822443,33.401373),(35.8211,33.406722),(35.845116,33.418742),(35.870089,33.431242),(35.888486,33.440415),(35.919492,33.462351),(35.935408,33.494262),(35.921869,33.51457),(35.933238,33.527825),(35.956802,33.534207),(35.980263,33.533949),(35.99928,33.541261),(36.019847,33.55263),(36.035247,33.567797),(36.038451,33.586349),(36.029666,33.59764),(36.012923,33.608027),(35.994526,33.615701),(35.980263,33.619008),(35.956906,33.629938),(35.934788,33.6334),(35.921559,33.640299),(35.925383,33.661667),(35.929414,33.665078),(35.942436,33.669212),(35.94719,33.673088),(35.949878,33.6827),(35.946984,33.700838),(35.948431,33.70921),(35.955872,33.718124),(35.974165,33.732154),(35.980263,33.743549),(35.994009,33.760705),(36.027082,33.784296),(36.040518,33.805612),(36.05044,33.816438),(36.06646,33.821994),(36.085063,33.82605),(36.102426,33.832277),(36.13829,33.850622),(36.144904,33.847418),(36.157617,33.83406),(36.165678,33.829797),(36.186556,33.83021),(36.202679,33.838297),(36.216631,33.847754),(36.231824,33.852534),(36.249187,33.849744),(36.300554,33.828686),(36.338278,33.821193),(36.357501,33.823776),(36.369594,33.837006),(36.36763,33.857547),(36.35037,33.866409),(36.311096,33.87199),(36.28164,33.891111),(36.275336,33.897209),(36.268928,33.906769),(36.267171,33.910386),(36.288565,33.946508),(36.302311,33.964388),(36.31802,33.980511),(36.357811,34.009553),(36.391091,34.044719),(36.412175,34.053633),(36.423647,34.052806),(36.445144,34.04614),(36.45889,34.046708),(36.47522,34.053504),(36.480698,34.062754),(36.482662,34.07451),(36.488449,34.088644),(36.507983,34.109185),(36.552735,34.140992),(36.575886,34.173264),(36.604101,34.199102),(36.603554,34.200101),(36.59821,34.209851),(36.574026,34.229746),(36.567514,34.244138),(36.56276,34.262949),(36.570305,34.275868),(36.579917,34.286901),(36.581984,34.299897),(36.576816,34.307674),(36.570305,34.308966),(36.562967,34.308501),(36.555835,34.311085),(36.54519,34.320723),(36.523589,34.345889),(36.518628,34.353641),(36.515941,34.36165),(36.516768,34.369867),(36.519972,34.375061),(36.523589,34.379789),(36.526276,34.386688),(36.52979,34.403095),(36.530617,34.41418),(36.52514,34.422939),(36.509223,34.432421),(36.501885,34.430303),(36.494651,34.434256),(36.480181,34.449139),(36.463231,34.455237),(36.449795,34.464538),(36.439873,34.477457),(36.433466,34.494175),(36.433466,34.49433),(36.41972,34.498335),(36.392331,34.500143),(36.363082,34.499032),(36.343652,34.494175),(36.340965,34.493477),(36.338174,34.493296),(36.335384,34.493477),(36.332697,34.494175),(36.329851,34.498603),(36.319881,34.514122),(36.336624,34.52885),(36.364012,34.541097),(36.383546,34.553809),(36.388094,34.569519),(36.386853,34.584247),(36.388921,34.596236),(36.4037,34.603832),(36.418479,34.600318),(36.429125,34.593187),(36.436256,34.597838),(36.440184,34.62936),(36.415999,34.622901),(36.391194,34.622487),(36.367526,34.629205),(36.347373,34.64414),(36.323808,34.679486),(36.308925,34.687548),(36.288151,34.675559),(36.284844,34.667911),(36.284431,34.648326),(36.28071,34.639127),(36.271512,34.630962),(36.26159,34.627242),(36.201232,34.624451),(36.195134,34.626208),(36.183352,34.633494),(36.178287,34.635303),(36.17219,34.634063),(36.160201,34.628068),(36.15586,34.626931),(36.11214,34.629532),(36.087234,34.631014),(36.060775,34.627913),(36.037934,34.62843),(36.01623,34.633649),(35.998763,34.64538),(35.991425,34.648222),(35.98264,34.650238),(35.9699,34.649849),(35.965668,34.668443),(35.947439,34.69953),(35.940929,34.726223),(35.931163,34.740953),(35.928966,34.749823),(35.928966,34.790717),(35.926036,34.796942),(35.908458,34.821763),(35.904552,34.831773),(35.899099,34.852769),(35.866873,34.924221),(35.872895,34.926907),(35.873546,34.931627),(35.879568,34.938056),(35.881358,34.944973),(35.879568,34.95189),(35.873546,34.958319),(35.873546,34.965155),(35.878591,34.96955),(35.878917,34.97016),(35.876638,34.971666),(35.873546,34.978827),(35.881602,34.992865),(35.88738,35.00019),(35.895356,35.006781),(35.900564,35.021918),(35.897309,35.036566),(35.891449,35.049954),(35.887869,35.061347),(35.887869,35.109198),(35.894216,35.12108),(35.941254,35.180569),(35.962413,35.197943),(35.953298,35.224799),(35.915294,35.287909),(35.928966,35.321479),(35.924083,35.338528),(35.916677,35.403306),(35.918956,35.41767),(35.908865,35.425727),(35.860606,35.479071),(35.840099,35.487372),(35.830089,35.493476),(35.825857,35.503323),(35.81837,35.508938),(35.802257,35.506903),(35.786794,35.502183),(35.781261,35.499579),(35.770518,35.504218),(35.771983,35.515448),(35.77711,35.52912),(35.778087,35.541164),(35.771983,35.546332),(35.737071,35.561672),(35.73878,35.566596),(35.740896,35.576483),(35.743337,35.582099),(35.737071,35.582099),(35.723399,35.575914),(35.723399,35.582099),(35.743419,35.587958),(35.763357,35.598293),(35.778494,35.612738),(35.784353,35.630561),(35.782074,35.64175),(35.773204,35.655463),(35.771169,35.667792),(35.776622,35.675116),(35.800059,35.681464),(35.838552,35.742092),(35.840343,35.747463),(35.840099,35.770819),(35.835948,35.789984),(35.825369,35.813463),(35.81186,35.835395),(35.798595,35.849677),(35.846853,35.847235),(35.87086,35.851793),(35.881033,35.866685),(35.885265,35.885972),(35.911305,35.91775),(35.920835,35.915122),(35.940576,35.918377),(35.96073,35.924372),(35.980263,35.926852),(35.992769,35.915277),(35.993079,35.902357),(35.990082,35.889283),(35.992356,35.877346),(36.003931,35.869181),(36.019434,35.866184),(36.05075,35.865409),(36.080309,35.854195),(36.138497,35.819779),(36.155308,35.822232),(36.157617,35.822569),(36.168779,35.852076),(36.174877,35.922666),(36.196891,35.951708),(36.229034,35.961165),(36.253115,35.955636),(36.269031,35.958736),(36.277403,35.99398),(36.277403,35.994031),(36.277506,35.994187),(36.277506,35.994238),(36.29735,36.000749),(36.336727,35.988244),(36.358018,35.99398),(36.355538,36.022402),(36.358638,36.166992),(36.360498,36.181669),(36.366286,36.189213),(36.374451,36.19588),(36.375795,36.20451),(36.361429,36.218152),(36.373004,36.227609),(36.385613,36.215465),(36.398119,36.20823),(36.411865,36.204458),(36.439253,36.201409),(36.445248,36.19991),(36.450726,36.19991),(36.4592,36.203114),(36.463955,36.208799),(36.465298,36.21593),(36.468916,36.22239),(36.480181,36.225542),(36.498578,36.227867),(36.574439,36.218359),(36.593456,36.2181),(36.664253,36.229004),(36.67004,36.237324),(36.66911,36.259855),(36.665493,36.274014),(36.658465,36.290499),(36.648761,36.305719),(36.648646,36.305899),(36.637071,36.316802),(36.620741,36.322022),(36.587771,36.324812),(36.577643,36.332874),(36.58219,36.333081),(36.587771,36.342124),(36.594283,36.35711),(36.594489,36.365947),(36.593352,36.373492),(36.590562,36.380364),(36.585704,36.387031),(36.580847,36.389873),(36.565034,36.395609),(36.558006,36.400622),(36.552735,36.408166),(36.533821,36.462478),(36.531237,36.479015),(36.535475,36.494001),(36.565344,36.5325),(36.569995,36.575701),(36.569271,36.620143),(36.582811,36.662414),(36.594696,36.685824),(36.598107,36.705461),(36.598934,36.724788),(36.603274,36.746957),(36.615677,36.766594),(36.632006,36.784319),(36.643272,36.803646),(36.639861,36.828089),(36.649163,36.828554),(36.658568,36.827521),(36.659563,36.827243),(36.843673,36.775844),(36.906822,36.772589),(36.925942,36.768971),(36.945889,36.762667),(36.964699,36.75383),(36.980099,36.742255),(37.010588,36.719517),(37.018443,36.706649),(37.019476,36.685824),(37.010795,36.653733),(37.014515,36.642261),(37.033326,36.628721),(37.053066,36.619936),(37.062368,36.622107),(37.070119,36.631512),(37.085622,36.644173),(37.104432,36.650994),(37.120969,36.649909),(37.137402,36.645878),(37.156109,36.643914),(37.219671,36.657143),(37.241892,36.65859),(37.404466,36.634458),(37.446117,36.634199),(37.593395,36.710525),(37.654063,36.732126),(37.819738,36.760548),(37.980038,36.819666),(38.007943,36.825764),(38.026005,36.835006),(38.122975,36.884623),(38.190051,36.905526),(38.224261,36.908394),(38.28989,36.901702),(38.479956,36.855736),(38.529358,36.833722),(38.635192,36.744039),(38.66413,36.719517),(38.725005,36.693937),(38.795389,36.686651),(38.957963,36.692904),(38.979977,36.698175),(39.03217,36.701172),(39.185856,36.659521),(39.239599,36.661278),(39.441708,36.692373),(39.765252,36.742151),(39.979812,36.806953),(40.079238,36.854857),(40.115205,36.864728),(40.152722,36.87036),(40.190136,36.884416),(40.261409,36.922785),(40.393741,36.994022),(40.413894,37.004022),(40.435185,37.01061),(40.456993,37.014124),(40.479834,37.015158),(40.525722,37.025881),(40.659461,37.085257),(40.708967,37.100476),(40.896449,37.122696),(41.135091,37.084249),(41.179739,37.069625),(41.20134,37.064974),(41.479773,37.075568),(41.896365,37.154283),(42.009249,37.175613),(42.052968,37.196645),(42.128312,37.253283),(42.178541,37.306303),(42.193011,37.313227),(42.211201,37.324906),(42.22257,37.313951),(42.22381,37.302375),(42.222156,37.292402),(42.22319,37.288139),(42.236832,37.286304)]
+Chad	[(23.981306,19.496124),(23.981512,19.263838),(23.981719,19.031553),(23.981926,18.799293),(23.982133,18.567033),(23.982236,18.334799),(23.982443,18.102514),(23.982753,17.870228),(23.982856,17.637943),(23.983063,17.405657),(23.983269,17.173371),(23.983476,16.941138),(23.983683,16.7088),(23.983786,16.476515),(23.983993,16.244229),(23.984303,16.011944),(23.984406,15.779658),(23.984406,15.72194),(23.984406,15.72116),(23.972624,15.691085),(23.945546,15.692222),(23.829067,15.731031),(23.707524,15.748859),(23.592699,15.749014),(23.52707,15.735165),(23.395812,15.688346),(23.320571,15.681318),(23.166782,15.712944),(23.119249,15.707224),(23.094642,15.704262),(23.068493,15.686692),(23.004518,15.611425),(22.92566,15.563935),(22.906746,15.541404),(22.899511,15.510191),(22.906849,15.481408),(22.923593,15.455569),(22.944987,15.433116),(22.966484,15.404823),(22.976406,15.373636),(22.97837,15.340202),(22.965657,15.223904),(22.958009,15.201631),(22.913257,15.121688),(22.905506,15.112567),(22.871606,15.0997),(22.848765,15.087504),(22.829025,15.071639),(22.738901,14.97981),(22.727222,14.959036),(22.721951,14.934671),(22.721021,14.915938),(22.715337,14.899428),(22.695493,14.88147),(22.658906,14.857415),(22.650844,14.841938),(22.650844,14.816151),(22.659009,14.761271),(22.66459,14.743752),(22.67968,14.711816),(22.681437,14.702928),(22.676579,14.688975),(22.666347,14.681741),(22.465429,14.629289),(22.422745,14.609084),(22.382334,14.579111),(22.363523,14.543532),(22.386364,14.506532),(22.417164,14.484104),(22.424915,14.470436),(22.439074,14.362923),(22.442382,14.356928),(22.447343,14.351632),(22.45096,14.345792),(22.449926,14.338377),(22.444862,14.333364),(22.431323,14.327214),(22.426982,14.323003),(22.418094,14.30595),(22.41706,14.298095),(22.419954,14.286235),(22.429049,14.264608),(22.441038,14.249855),(22.457678,14.241147),(22.514109,14.231458),(22.531885,14.220632),(22.540877,14.201176),(22.547698,14.169033),(22.546355,14.139707),(22.531472,14.122627),(22.508217,14.113636),(22.481449,14.108546),(22.458711,14.096117),(22.421608,14.06214),(22.402281,14.049299),(22.243531,13.975427),(22.214695,13.956617),(22.190614,13.932794),(22.180762,13.920555),(22.099353,13.819416),(22.074962,13.780323),(22.073722,13.771357),(22.09708,13.749756),(22.112893,13.729835),(22.116303,13.715185),(22.11434,13.699708),(22.11434,13.677383),(22.132116,13.638652),(22.195885,13.580464),(22.210561,13.541733),(22.211181,13.484191),(22.215625,13.464993),(22.228648,13.441119),(22.263995,13.399183),(22.275984,13.376316),(22.267612,13.334562),(22.232265,13.289035),(22.139971,13.193511),(22.123435,13.182168),(22.016051,13.140233),(21.998378,13.130595),(21.964065,13.098349),(21.935126,13.059152),(21.85296,12.905725),(21.827846,12.831104),(21.811826,12.799969),(21.809449,12.793665),(21.813686,12.782296),(21.840868,12.748939),(21.880142,12.676282),(21.900813,12.656438),(21.935953,12.63954),(21.97719,12.63184),(22.019668,12.631426),(22.058736,12.636697),(22.105865,12.650392),(22.144105,12.671269),(22.176248,12.7015),(22.204877,12.743358),(22.33014,12.661451),(22.43246,12.62383),(22.445689,12.611066),(22.395873,12.496086),(22.372825,12.463116),(22.374892,12.450869),(22.407965,12.399761),(22.481449,12.176674),(22.484033,12.164737),(22.484756,12.152541),(22.483826,12.140345),(22.458091,12.03043),(22.464499,12.032962),(22.470494,12.036114),(22.481449,12.044279),(22.546458,12.064433),(22.585525,12.071357),(22.598858,12.063244),(22.607333,12.077714),(22.612397,12.072804),(22.613534,12.05725),(22.610537,12.039628),(22.592863,11.988933),(22.537053,11.68089),(22.541704,11.632986),(22.561754,11.586012),(22.592347,11.543663),(22.628107,11.509841),(22.662523,11.493072),(22.743035,11.466097),(22.76877,11.442326),(22.771561,11.433308),(22.771871,11.403181),(22.781792,11.398892),(22.87698,11.40884),(22.900442,11.408245),(22.914808,11.396101),(22.928347,11.32515),(22.953668,11.250942),(22.954536,11.237843),(22.956459,11.2088),(22.952015,11.191049),(22.935168,11.155883),(22.928967,11.137926),(22.92566,11.118134),(22.925143,11.097954),(22.922352,11.087076),(22.906539,11.069894),(22.900235,11.059895),(22.861064,10.919154),(22.805977,10.924502),(22.745102,10.943803),(22.719884,10.964655),(22.682677,10.974137),(22.673169,10.975068),(22.638339,10.974137),(22.62821,10.976127),(22.60909,10.985222),(22.600822,10.987806),(22.57705,10.985119),(22.55576,10.978969),(22.534676,10.98052),(22.511938,11.000828),(22.502843,10.992173),(22.490751,10.993154),(22.476281,10.99796),(22.460468,11.000828),(22.447136,10.99827),(22.437627,10.991552),(22.419231,10.970727),(22.407035,10.963053),(22.391842,10.958505),(22.36469,10.954209),(22.361146,10.953648),(22.339442,10.947731),(22.318772,10.939359),(22.305956,10.932564),(22.287249,10.91595),(22.2765,10.908534),(22.268439,10.908999),(22.253039,10.915304),(22.24012,10.905899),(22.229371,10.891972),(22.200639,10.868666),(22.189787,10.837298),(22.176351,10.816214),(22.148239,10.830761),(22.132426,10.828539),(22.048607,10.836988),(22.029487,10.828746),(22.018325,10.809884),(22.0114,10.789291),(22.004889,10.775519),(22.014604,10.754564),(22.003855,10.743273),(21.943084,10.728261),(21.925617,10.720122),(21.895025,10.699193),(21.872081,10.677592),(21.86836,10.676223),(21.863606,10.667929),(21.852754,10.670151),(21.83291,10.679944),(21.822575,10.678755),(21.803558,10.673665),(21.795393,10.672476),(21.784851,10.669324),(21.778753,10.66227),(21.774205,10.655165),(21.768418,10.651987),(21.753431,10.650721),(21.736482,10.646173),(21.722632,10.636716),(21.716845,10.621007),(21.714674,10.601395),(21.705476,10.571811),(21.703305,10.552406),(21.705476,10.53202),(21.714674,10.493702),(21.716845,10.47732),(21.720462,10.468018),(21.738032,10.44802),(21.744233,10.439106),(21.74444,10.432439),(21.742786,10.425773),(21.743613,10.418978),(21.751054,10.41182),(21.720462,10.360816),(21.716845,10.339809),(21.717775,10.328983),(21.722116,10.314178),(21.723046,10.305987),(21.718808,10.296634),(21.708886,10.293533),(21.697414,10.292422),(21.688939,10.288908),(21.67695,10.269168),(21.668889,10.249195),(21.65628,10.233666),(21.630648,10.227439),(21.625274,10.224493),(21.593441,10.214546),(21.589721,10.216613),(21.579282,10.212272),(21.566673,10.214494),(21.554477,10.218654),(21.544969,10.219997),(21.513239,10.200515),(21.485437,10.164316),(21.433348,10.046055),(21.406889,10.005566),(21.374333,9.973113),(21.339503,9.95991),(21.326067,9.962752),(21.28514,9.978591),(21.27129,9.987247),(21.256924,9.975749),(21.205661,9.916838),(21.198427,9.902988),(21.195429,9.887305),(21.187264,9.885134),(21.131971,9.849426),(21.121739,9.831907),(21.106753,9.79545),(21.105926,9.791884),(21.106753,9.778061),(21.105202,9.77403),(21.101585,9.774237),(21.097037,9.775373),(21.09311,9.77434),(21.080294,9.762609),(21.073163,9.757648),(21.065825,9.754496),(21.062207,9.756201),(21.052906,9.765891),(21.048358,9.768165),(21.042674,9.767079),(21.04009,9.764754),(21.039056,9.76217),(21.037816,9.760671),(21.032339,9.75801),(21.025621,9.753256),(21.019936,9.747933),(21.017352,9.743592),(21.014252,9.724472),(21.000092,9.697394),(20.996888,9.682175),(20.996062,9.648301),(20.989964,9.635615),(20.975804,9.630964),(20.975804,9.624168),(20.980145,9.619931),(20.981799,9.616778),(20.983143,9.603678),(20.96764,9.610603),(20.962265,9.606934),(20.960508,9.598123),(20.955961,9.589416),(20.934257,9.577065),(20.925058,9.569598),(20.921234,9.558978),(20.912656,9.544328),(20.874209,9.502496),(20.86377,9.493789),(20.841446,9.484409),(20.834314,9.462473),(20.832661,9.437255),(20.82615,9.418083),(20.820258,9.416222),(20.813884,9.418847),(20.81323,9.419116),(20.806719,9.423328),(20.801965,9.42555),(20.798244,9.423379),(20.792353,9.414),(20.788322,9.411881),(20.77654,9.407799),(20.771062,9.398058),(20.766618,9.38656),(20.757937,9.377129),(20.750495,9.384545),(20.740883,9.377129),(20.695822,9.363461),(20.654894,9.342971),(20.667916,9.302017),(20.616653,9.302017),(20.609729,9.302792),(20.592882,9.308218),(20.592262,9.308063),(20.573555,9.309149),(20.572315,9.308218),(20.550921,9.320259),(20.541826,9.321629),(20.538208,9.311939),(20.537278,9.299201),(20.533661,9.289641),(20.526426,9.283621),(20.514231,9.281502),(20.496144,9.270882),(20.502655,9.247421),(20.51299,9.223883),(20.507203,9.213263),(20.481778,9.204659),(20.467618,9.184143),(20.455423,9.159313),(20.435166,9.138126),(20.423073,9.143241),(20.412428,9.142053),(20.40292,9.136989),(20.384419,9.123579),(20.378322,9.120065),(20.359408,9.116421),(20.276829,9.120736),(20.256985,9.116421),(20.234454,9.13456),(20.222982,9.14195),(20.212647,9.144973),(20.197971,9.140503),(20.169549,9.120891),(20.154563,9.116421),(20.137613,9.121822),(20.125727,9.133785),(20.117149,9.145748),(20.109604,9.151174),(20.101026,9.148073),(20.099579,9.141174),(20.100509,9.134146),(20.099372,9.13071),(20.090587,9.131123),(20.076945,9.13673),(20.068676,9.138126),(20.060512,9.134353),(20.031159,9.11022),(20.028369,9.104562),(20.029919,9.098981),(20.030332,9.093865),(20.024338,9.089756),(20.01793,9.091048),(20.014416,9.106345),(20.006871,9.11022),(20.002944,9.108515),(19.999533,9.104303),(19.997156,9.098619),(19.996329,9.092831),(19.993022,9.084589),(19.985477,9.083193),(19.976486,9.084175),(19.969044,9.082883),(19.943413,9.065882),(19.932091,9.063331),(19.928737,9.062575),(19.914474,9.069267),(19.902175,9.0518),(19.889463,9.046374),(19.80554,9.051128),(19.784663,9.048751),(19.758411,9.041982),(19.746836,9.04131),(19.738154,9.039372),(19.713969,9.02914),(19.709008,9.024567),(19.700017,9.020587),(19.656402,9.021259),(19.640072,9.013999),(19.613614,9.031672),(19.583125,9.025342),(19.553772,9.013327),(19.530828,9.013999),(19.52132,9.008831),(19.515842,9.009451),(19.511811,9.012293),(19.506644,9.013999),(19.430162,9.012862),(19.420964,9.017435),(19.38262,9.003198),(19.369391,9.000382),(19.352234,9.002061),(19.333321,9.006557),(19.316268,9.01312),(19.304795,9.020846),(19.295494,9.009503),(19.285778,9.01281),(19.275236,9.021983),(19.263248,9.028261),(19.253429,9.027951),(19.232862,9.022293),(19.192037,9.020174),(19.179635,9.015265),(19.174571,9.003767),(19.168783,9.002216),(19.142118,9.008676),(19.133643,9.007177),(19.126718,9.007177),(19.10057,9.015265),(19.060676,9.00418),(19.021919,8.985215),(18.999491,8.969635),(18.984815,8.956431),(18.97851,8.949455),(18.975927,8.941988),(18.971896,8.938215),(18.952052,8.931988),(18.936446,8.923358),(18.928591,8.921679),(18.922907,8.918216),(18.920736,8.907855),(18.917739,8.898812),(18.910608,8.894239),(18.901409,8.89398),(18.892727,8.897933),(18.86968,8.864111),(18.869783,8.849409),(18.886526,8.835844),(18.902959,8.84481),(18.909677,8.835327),(18.912468,8.818403),(18.917325,8.805148),(18.929108,8.796544),(19.048687,8.745669),(19.057782,8.729701),(19.073492,8.720528),(19.103877,8.698049),(19.124135,8.675079),(19.091475,8.652858),(19.081657,8.637226),(19.072261,8.631872),(19.061296,8.625624),(19.020472,8.545578),(18.920529,8.432122),(18.910401,8.412976),(18.901306,8.388636),(18.887457,8.370963),(18.8549,8.339802),(18.813042,8.276421),(18.791235,8.257378),(18.773768,8.248619),(18.715064,8.228672),(18.672586,8.20751),(18.638583,8.177642),(18.618636,8.138652),(18.617912,8.090127),(18.589283,8.047882),(18.508255,8.030674),(18.070452,8.019202),(17.977228,7.997187),(17.897853,7.967473),(17.858785,7.960445),(17.817238,7.962099),(17.679778,7.985198),(17.661795,7.986284),(17.639884,7.985043),(17.62066,7.978739),(17.59999,7.950369),(17.580766,7.940602),(17.559786,7.934711),(17.523819,7.93099),(17.503665,7.926236),(17.487232,7.914453),(17.478344,7.891819),(17.466355,7.884119),(17.419122,7.898227),(17.405997,7.883034),(17.385739,7.870477),(17.250864,7.822831),(17.234637,7.811617),(17.23379,7.810801),(17.220685,7.798181),(17.214484,7.786813),(17.211073,7.768312),(17.204562,7.763817),(17.196397,7.76516),(17.188645,7.764127),(17.170559,7.747539),(17.135522,7.705112),(17.116298,7.68687),(17.101932,7.677724),(17.095525,7.67824),(17.090254,7.683822),(17.079091,7.689919),(17.059351,7.696534),(17.045605,7.6847),(17.041058,7.675502),(17.042091,7.667027),(17.038991,7.662479),(17.008295,7.667647),(16.997546,7.666717),(16.988968,7.660774),(16.98194,7.648733),(16.962716,7.650697),(16.919618,7.644082),(16.880654,7.632869),(16.865461,7.624445),(16.854816,7.611475),(16.847168,7.591579),(16.848098,7.584706),(16.852439,7.580262),(16.855849,7.575404),(16.853886,7.567498),(16.850372,7.565896),(16.839623,7.567446),(16.836729,7.567498),(16.815071,7.549544),(16.812854,7.547706),(16.805516,7.543675),(16.782365,7.541143),(16.768619,7.550238),(16.746709,7.586566),(16.709812,7.627753),(16.686867,7.645788),(16.6632,7.657415),(16.624546,7.66868),(16.61421,7.679584),(16.609869,7.701598),(16.611833,7.713897),(16.616174,7.723871),(16.618138,7.734309),(16.613073,7.74821),(16.605219,7.757202),(16.596434,7.761129),(16.586822,7.763558),(16.576383,7.767796),(16.560157,7.779733),(16.549305,7.794719),(16.54486,7.813013),(16.550235,7.843502),(16.550752,7.8527),(16.550131,7.861692),(16.548685,7.870012),(16.509204,7.858281),(16.491737,7.849238),(16.475717,7.835802),(16.469413,7.825828),(16.457217,7.799628),(16.450913,7.792084),(16.437373,7.788363),(16.427245,7.791464),(16.41815,7.795856),(16.407401,7.796063),(16.392208,7.783609),(16.387041,7.762628),(16.387144,7.694674),(16.38301,7.680669),(16.370814,7.672504),(16.282758,7.660102),(16.26188,7.651885),(16.227257,7.625582),(16.207207,7.613542),(16.185606,7.610751),(16.162662,7.611113),(16.128762,7.599486),(16.0652,7.591217),(16.042979,7.583931),(16.026339,7.574888),(16.012283,7.560315),(15.990372,7.529412),(15.975696,7.515201),(15.94314,7.495306),(15.92526,7.488175),(15.793899,7.457996),(15.758345,7.455567),(15.720001,7.468641),(15.668532,7.516287),(15.624813,7.519749),(15.55195,7.509879),(15.515569,7.512204),(15.481049,7.523263),(15.521977,7.576076),(15.548952,7.630801),(15.562181,7.690178),(15.562905,7.792445),(15.540787,7.796838),(15.509368,7.804021),(15.487871,7.804951),(15.440742,7.839419),(15.406532,7.921585),(15.345347,8.13599),(15.210706,8.421822),(15.183703,8.479148),(15.16851,8.498604),(15.110736,8.555138),(15.068568,8.623867),(15.051928,8.643789),(15.031258,8.658749),(15.005833,8.66663),(14.968523,8.672159),(14.955087,8.676216),(14.951469,8.68283),(14.951469,8.692106),(14.949092,8.704276),(14.940101,8.729649),(14.934416,8.739003),(14.927285,8.745075),(14.919947,8.74771),(14.913332,8.752438),(14.908268,8.764841),(14.89938,8.774323),(14.859899,8.803314),(14.846049,8.810988),(14.836748,8.813003),(14.827963,8.813158),(14.819178,8.811608),(14.809876,8.808611),(14.793856,8.813623),(14.571699,8.99099),(14.349542,9.168356),(14.331145,9.200215),(14.321327,9.243158),(14.036486,9.568771),(13.947603,9.637759),(13.945949,9.652642),(14.006721,9.739277),(14.088473,9.809635),(14.119789,9.85201),(14.168365,9.94774),(14.170638,9.957843),(14.171155,9.96761),(14.173532,9.975025),(14.181697,9.978178),(14.196341,9.979147),(14.440493,9.995308),(14.732465,9.923814),(14.772566,9.921747),(14.898139,9.960478),(14.944131,9.958825),(15.002422,9.945053),(15.033015,9.942857),(15.06123,9.949239),(15.071669,9.955957),(15.089445,9.972183),(15.100711,9.978901),(15.109599,9.981537),(15.155488,9.986523),(15.214916,9.984095),(15.382968,9.930196),(15.439398,9.931695),(15.663777,9.98611),(15.681244,9.991278),(15.637939,10.029957),(15.602799,10.04099),(15.536137,10.080523),(15.490144,10.120107),(15.490661,10.124448),(15.476399,10.132742),(15.439192,10.185245),(15.301422,10.311749),(15.29057,10.328983),(15.284266,10.349292),(15.282199,10.374588),(15.278374,10.394276),(15.268763,10.406343),(15.255637,10.41704),(15.241167,10.432904),(15.227215,10.470137),(15.218326,10.487216),(15.198173,10.496492),(15.193315,10.501195),(15.186597,10.505871),(15.176055,10.50799),(15.164686,10.509075),(15.153628,10.511969),(15.144429,10.51631),(15.138228,10.521659),(15.131717,10.540701),(15.132337,10.565403),(15.138435,10.589691),(15.14846,10.607338),(15.149907,10.623125),(15.142259,10.647207),(15.065881,10.793115),(15.06309,10.830761),(15.075596,10.873498),(15.079007,10.898147),(15.072702,10.915769),(15.06247,10.930703),(15.035185,10.994627),(15.02883,11.080218),(15.021233,11.182549),(15.028261,11.244483),(15.033325,11.26027),(15.056373,11.29342),(15.06309,11.309931),(15.062264,11.320034),(15.057819,11.325356),(15.052548,11.329801),(15.049448,11.337268),(15.049448,11.348714),(15.054305,11.364088),(15.06061,11.416126),(15.067018,11.435556),(15.076113,11.453307),(15.122312,11.503227),(15.135644,11.530822),(15.123862,11.563171),(15.09575,11.598156),(15.085208,11.615881),(15.069395,11.660788),(15.066501,11.680632),(15.068258,11.700114),(15.076113,11.721456),(15.079834,11.722593),(15.086345,11.72218),(15.093063,11.722903),(15.097197,11.727657),(15.095957,11.734117),(15.085311,11.744039),(15.083554,11.748173),(15.089135,11.75763),(15.105362,11.772719),(15.110943,11.782899),(15.086345,11.840467),(15.079834,11.851216),(15.06278,11.853489),(15.050998,11.861603),(15.044177,11.877312),(15.042006,11.902375),(15.046967,11.910179),(15.056579,11.918447),(15.063401,11.927283),(15.05937,11.936792),(15.055546,11.942476),(15.050585,11.952863),(15.048311,11.962785),(15.052548,11.967229),(15.081177,11.971673),(15.076836,11.982836),(15.05968,11.997305),(15.049448,12.011929),(15.051205,12.024228),(15.053685,12.031877),(15.053065,12.038026),(15.045727,12.046088),(15.04056,12.055648),(15.04087,12.067585),(15.04459,12.078385),(15.049448,12.084586),(15.030431,12.100916),(15.011827,12.108616),(14.993844,12.106704),(14.976791,12.094147),(14.964802,12.092441),(14.950746,12.103345),(14.928732,12.128615),(14.9031,12.145875),(14.898036,12.152799),(14.894832,12.167372),(14.899896,12.171765),(14.907441,12.17347),(14.911575,12.180136),(14.910128,12.190368),(14.905891,12.195639),(14.90093,12.200032),(14.898036,12.207473),(14.898036,12.219462),(14.9031,12.236257),(14.904857,12.248401),(14.906304,12.317957),(14.908268,12.326897),(14.891215,12.402655),(14.877469,12.427201),(14.876849,12.431594),(14.878502,12.443066),(14.877469,12.447045),(14.872404,12.450404),(14.865893,12.452574),(14.861862,12.452006),(14.863826,12.447045),(14.855455,12.454538),(14.85101,12.455158),(14.849563,12.457019),(14.850184,12.468129),(14.852044,12.474692),(14.860105,12.490091),(14.863826,12.495466),(14.830753,12.618249),(14.819178,12.638816),(14.786208,12.63122),(14.768845,12.633235),(14.761403,12.649358),(14.758716,12.658815),(14.752102,12.668944),(14.743317,12.67716),(14.734118,12.680416),(14.728847,12.677212),(14.713654,12.65251),(14.702079,12.668995),(14.716755,12.70181),(14.709934,12.718243),(14.694017,12.723721),(14.664458,12.715969),(14.648129,12.725116),(14.641721,12.730904),(14.624254,12.741885),(14.62074,12.747853),(14.620327,12.754055),(14.618363,12.759196),(14.610612,12.762349),(14.603997,12.760798),(14.584877,12.746355),(14.575265,12.744908),(14.570717,12.750386),(14.569374,12.75961),(14.569374,12.769403),(14.560692,12.766224),(14.554801,12.766896),(14.55108,12.771573),(14.549013,12.780461),(14.549013,12.818211),(14.53103,12.836246),(14.500437,12.859113),(14.490102,12.873608),(14.490619,12.886346),(14.506122,12.93208),(14.507672,12.95244),(14.504675,12.969003),(14.496303,12.983808),(14.482144,12.99882),(14.481041,13.000508),(14.435429,13.070289),(14.418169,13.081141),(14.064908,13.077988),(13.836111,13.391044),(13.607314,13.7041),(13.600182,13.735984),(13.592948,13.767843),(13.585816,13.799727),(13.578582,13.831534),(13.57145,13.863418),(13.564319,13.895225),(13.557188,13.927161),(13.549953,13.958994),(13.542821,13.990853),(13.53569,14.022737),(13.528455,14.054518),(13.521324,14.086428),(13.514193,14.118235),(13.506958,14.150119),(13.499723,14.181978),(13.492695,14.213862),(13.482257,14.259777),(13.468304,14.310678),(13.449184,14.380131),(13.449494,14.439042),(13.482257,14.483587),(13.507785,14.495964),(13.543855,14.510562),(13.584369,14.513818),(13.608052,14.518266),(13.624264,14.521311),(13.657853,14.548725),(13.665605,14.56689),(13.666742,14.585519),(13.660334,14.623734),(13.657026,14.629651),(13.646278,14.639056),(13.644727,14.644249),(13.648345,14.649417),(13.668085,14.662879),(13.700021,14.697734),(13.709995,14.705124),(13.730045,14.709646),(13.749165,14.711248),(13.764358,14.719077),(13.773247,14.742512),(13.772006,14.762873),(13.75795,14.805532),(13.75392,14.825944),(13.75516,14.847209),(13.760534,14.866355),(13.775417,14.897438),(13.808077,14.965573),(13.833915,15.019601),(13.862957,15.059056),(13.892826,15.0997),(13.922592,15.140498),(13.952564,15.181219),(13.98233,15.221992),(14.012199,15.262687),(14.042068,15.303434),(14.071833,15.344181),(14.101702,15.384876),(14.131571,15.425545),(14.16144,15.466292),(14.191206,15.507039),(14.221178,15.547734),(14.250944,15.588455),(14.280709,15.629254),(14.310682,15.669949),(14.340447,15.710722),(14.368973,15.749634),(14.423543,15.806323),(14.482144,15.86725),(14.520798,15.907557),(14.576919,15.965797),(14.633143,16.024243),(14.689263,16.082534),(14.745384,16.140876),(14.801401,16.199219),(14.857418,16.257613),(14.913539,16.315904),(14.969659,16.374247),(15.02578,16.432538),(15.081797,16.490881),(15.137918,16.549275),(15.194039,16.607566),(15.250159,16.665909),(15.30628,16.7242),(15.3624,16.782646),(15.418418,16.840885),(15.452421,16.876232),(15.465547,16.89468),(15.468517,16.90491),(15.471954,16.916746),(15.474125,16.942068),(15.478259,16.987698),(15.48229,17.033277),(15.486217,17.078907),(15.490248,17.124537),(15.494279,17.170116),(15.498309,17.215746),(15.50234,17.261376),(15.506371,17.307058),(15.510505,17.352637),(15.514536,17.398267),(15.518567,17.443846),(15.522597,17.489528),(15.526628,17.535107),(15.530659,17.580737),(15.53469,17.626367),(15.538617,17.672049),(15.542648,17.717679),(15.546782,17.76331),(15.550813,17.808888),(15.554843,17.85457),(15.558874,17.900149),(15.562905,17.945779),(15.566936,17.991409),(15.567698,18.000039),(15.570966,18.03704),(15.574997,18.082644),(15.579028,18.128249),(15.583162,18.173879),(15.587193,18.219483),(15.59112,18.265088),(15.595151,18.310718),(15.599182,18.356348),(15.603213,18.402004),(15.607243,18.447583),(15.611274,18.493239),(15.615305,18.538818),(15.619439,18.584474),(15.62347,18.630078),(15.6275,18.675709),(15.631531,18.721313),(15.635562,18.766943),(15.639593,18.8126),(15.64352,18.858178),(15.647551,18.903834),(15.651582,18.949387),(15.655716,18.995069),(15.659747,19.040648),(15.663777,19.086304),(15.667808,19.131882),(15.671839,19.177539),(15.67587,19.223169),(15.6799,19.268747),(15.683931,19.314404),(15.687962,19.360008),(15.692096,19.405638),(15.696023,19.451243),(15.700054,19.496873),(15.704085,19.542529),(15.708116,19.588108),(15.712146,19.633764),(15.716177,19.679317),(15.720208,19.724999),(15.724342,19.770577),(15.728373,19.816259),(15.732404,19.861838),(15.736021,19.903541),(15.767234,19.982037),(15.782323,20.00803),(15.822321,20.076993),(15.862318,20.145955),(15.902419,20.214943),(15.94252,20.283957),(15.962984,20.319226),(15.970322,20.336331),(15.968151,20.352816),(15.953992,20.374571),(15.930324,20.399324),(15.872033,20.460199),(15.813846,20.521074),(15.755555,20.582001),(15.697264,20.642875),(15.669462,20.671866),(15.588123,20.732792),(15.570243,20.751913),(15.556084,20.773669),(15.544198,20.79899),(15.536033,20.844052),(15.544301,20.890302),(15.569003,20.928905),(15.60931,20.95066),(15.592774,20.974793),(15.576134,20.999339),(15.559288,21.023782),(15.542544,21.048277),(15.525801,21.072772),(15.509058,21.097266),(15.492212,21.121761),(15.475572,21.146256),(15.458829,21.17075),(15.441982,21.195193),(15.425342,21.219791),(15.408496,21.244234),(15.391753,21.268729),(15.375009,21.293223),(15.358266,21.317718),(15.34142,21.342161),(15.32478,21.366707),(15.301009,21.40133),(15.266592,21.440656),(15.247472,21.453265),(15.20024,21.476468),(15.18453,21.491196),(15.180396,21.507267),(15.180086,21.533467),(15.179776,21.553208),(15.178846,21.605297),(15.177502,21.678988),(15.176055,21.763427),(15.174608,21.847918),(15.173265,21.921557),(15.172438,21.973647),(15.172024,21.993387),(15.16448,22.033695),(15.156315,22.076173),(15.14815,22.118651),(15.136058,22.181335),(15.124069,22.243966),(15.11208,22.306598),(15.099987,22.369282),(15.087998,22.431914),(15.075906,22.494597),(15.064021,22.557177),(15.051928,22.619861),(15.039939,22.682544),(15.02795,22.745176),(15.015858,22.807782),(15.003973,22.87044),(14.991984,22.933097),(14.979909,22.995664),(14.997461,23.003817),(15.055236,23.029965),(15.112907,23.056113),(15.170371,23.082261),(15.228145,23.108358),(15.285816,23.134455),(15.343487,23.160577),(15.401158,23.186751),(15.458829,23.212899),(15.516499,23.239048),(15.574274,23.265196),(15.631945,23.291344),(15.689616,23.317518),(15.747183,23.343641),(15.804854,23.369789),(15.862525,23.395937),(15.920196,23.422034),(15.964637,23.442214),(15.985101,23.44472),(16.076155,23.399632),(16.199765,23.338706),(16.323169,23.277728),(16.446779,23.216724),(16.570285,23.15572),(16.693792,23.094664),(16.817299,23.03366),(16.940909,22.972733),(17.064312,22.911755),(17.187922,22.850751),(17.311429,22.789799),(17.434832,22.728795),(17.558442,22.667765),(17.681949,22.606787),(17.805455,22.545757),(17.928962,22.484779),(18.052469,22.423852),(18.175975,22.362822),(18.299585,22.301844),(18.422989,22.240866),(18.546599,22.179836),(18.670105,22.118806),(18.793612,22.05788),(18.917119,21.99685),(19.040729,21.935871),(19.164132,21.874893),(19.185837,21.864177),(19.287639,21.813915),(19.411145,21.752885),(19.534652,21.691855),(19.658262,21.630877),(19.781665,21.569899),(19.905276,21.508869),(20.028782,21.447943),(20.152289,21.386913),(20.275796,21.325935),(20.399406,21.265008),(20.522809,21.203926),(20.646419,21.142897),(20.769926,21.08197),(20.893329,21.02094),(21.016939,20.959962),(21.140342,20.899036),(21.263952,20.838006),(21.387459,20.777027),(21.510966,20.716049),(21.634472,20.654968),(21.758082,20.59399),(21.881486,20.533063),(22.005096,20.472033),(22.128602,20.411055),(22.252109,20.350077),(22.375616,20.289124),(22.499122,20.228095),(22.622629,20.167091),(22.746136,20.106061),(22.869642,20.045108),(22.993149,19.984104),(23.116759,19.923152),(23.240162,19.862096),(23.363772,19.80117),(23.487279,19.740166),(23.610786,19.67911),(23.734292,19.618132),(23.857799,19.557179),(23.981306,19.496124)]
+Togo	[(0.487649,10.933236),(0.612603,10.976566),(0.675338,10.988529),(0.77156,10.990364),(0.901474,10.992741),(0.875843,10.931169),(0.872949,10.911299),(0.875326,10.900524),(0.883698,10.880216),(0.885144,10.869389),(0.869538,10.839908),(0.867575,10.829211),(0.866024,10.80637),(0.862924,10.796086),(0.850005,10.77769),(0.795641,10.726478),(0.781275,10.693044),(0.789233,10.602946),(0.78851,10.563852),(0.773833,10.508145),(0.759881,10.405154),(0.760708,10.382158),(0.768769,10.367094),(0.844423,10.317175),(0.939508,10.254517),(0.997106,10.216553),(1.082238,10.16044),(1.225485,10.066053),(1.331009,9.996471),(1.343825,9.962442),(1.343942,9.954756),(1.345065,9.881103),(1.346925,9.771834),(1.348165,9.694164),(1.35602,9.647474),(1.354573,9.635304),(1.352196,9.625357),(1.352506,9.60528),(1.351266,9.595074),(1.345065,9.582388),(1.327288,9.555309),(1.323154,9.542313),(1.326358,9.521952),(1.336486,9.497509),(1.351266,9.482549),(1.368422,9.490843),(1.379895,9.462473),(1.386716,9.361135),(1.401185,9.321267),(1.420146,9.292317),(1.425267,9.284499),(1.505158,9.201455),(1.567273,9.13673),(1.587841,9.100893),(1.595799,9.076811),(1.601173,9.049526),(1.602827,8.924392),(1.604274,8.815225),(1.605514,8.722492),(1.607204,8.588617),(1.607581,8.558755),(1.609028,8.546973),(1.614092,8.535785),(1.63993,8.503255),(1.644168,8.493488),(1.640447,8.475815),(1.607581,8.421864),(1.606031,8.413389),(1.606031,8.396026),(1.60107,8.371635),(1.603945,8.367476),(1.603964,8.367449),(1.609855,8.365485),(1.614919,8.356261),(1.625564,8.270478),(1.623807,8.155886),(1.621327,7.996567),(1.621947,7.838282),(1.622774,7.640052),(1.622855,7.62246),(1.623251,7.536385),(1.623704,7.4381),(1.624324,7.288807),(1.624944,7.143648),(1.625668,6.996783),(1.607478,6.991409),(1.531927,6.991926),(1.551357,6.920871),(1.562623,6.904283),(1.564223,6.903089),(1.579056,6.892035),(1.588047,6.881235),(1.590114,6.867334),(1.58257,6.825347),(1.58319,6.808268),(1.587531,6.791034),(1.595179,6.77057),(1.60107,6.746437),(1.597039,6.73096),(1.589182,6.72046),(1.574301,6.700574),(1.566033,6.678146),(1.572441,6.666907),(1.58536,6.656442),(1.596316,6.636418),(1.596522,6.62864),(1.594765,6.620269),(1.594145,6.611045),(1.597349,6.600813),(1.603344,6.592596),(1.611198,6.58469),(1.61957,6.577998),(1.627425,6.573347),(1.63683,6.572261),(1.646648,6.573192),(1.653883,6.570659),(1.655227,6.559213),(1.657811,6.552263),(1.67445,6.538594),(1.680755,6.530068),(1.681995,6.520017),(1.679515,6.498571),(1.681685,6.489838),(1.6883,6.484437),(1.709797,6.473404),(1.718375,6.466997),(1.74411,6.425733),(1.76354,6.350647),(1.782351,6.277267),(1.761577,6.276026),(1.633109,6.245692),(1.612439,6.234763),(1.619663,6.213899),(1.61964,6.213894),(1.619314,6.213813),(1.429535,6.181952),(1.271007,6.133734),(1.199555,6.102525),(1.19158,6.101874),(1.185396,6.100491),(1.187968,6.135647),(1.176186,6.151512),(1.093401,6.160917),(1.079655,6.167919),(1.068906,6.180347),(1.05578,6.20063),(1.048132,6.20939),(1.040587,6.213472),(1.033146,6.216547),(1.025188,6.222334),(1.009685,6.244452),(0.983536,6.324602),(0.907262,6.324912),(0.886798,6.33039),(0.873879,6.340131),(0.841323,6.379224),(0.816208,6.395063),(0.766805,6.419351),(0.745721,6.4409),(0.729908,6.465085),(0.71792,6.48883),(0.711718,6.513376),(0.713076,6.533936),(0.713475,6.53999),(0.71978,6.552728),(0.726808,6.562107),(0.727428,6.571435),(0.714612,6.583914),(0.705517,6.585775),(0.677612,6.584896),(0.668207,6.585827),(0.659422,6.601717),(0.645366,6.612026),(0.63224,6.62399),(0.626659,6.644893),(0.635341,6.695381),(0.634307,6.711607),(0.625832,6.727756),(0.611259,6.741528),(0.593793,6.751114),(0.576636,6.754731),(0.570022,6.763516),(0.541083,6.817182),(0.528887,6.826535),(0.519275,6.832246),(0.516071,6.841806),(0.522789,6.862838),(0.543873,6.897926),(0.54625,6.914773),(0.534468,6.935909),(0.506046,6.957819),(0.494574,6.973116),(0.509147,6.977611),(0.523823,6.978697),(0.565991,6.989652),(0.57891,6.996783),(0.59803,7.0312),(0.598754,7.074711),(0.59431,7.119722),(0.59772,7.158892),(0.621801,7.218837),(0.631103,7.265242),(0.644436,7.301933),(0.645676,7.323585),(0.629656,7.389162),(0.623042,7.397896),(0.586248,7.384357),(0.566404,7.380791),(0.548214,7.383271),(0.516692,7.411022),(0.500568,7.45505),(0.495608,7.504298),(0.499432,7.562382),(0.503049,7.574681),(0.50925,7.585378),(0.519379,7.595196),(0.532505,7.601036),(0.548524,7.605377),(0.562063,7.612301),(0.567748,7.625737),(0.567438,7.652919),(0.570538,7.683925),(0.583354,7.704285),(0.612293,7.699428),(0.609502,7.718961),(0.611673,7.771258),(0.602578,7.828412),(0.603405,7.888305),(0.602688,7.893132),(0.592863,7.959309),(0.593689,7.996567),(0.593173,8.015739),(0.583974,8.05305),(0.580254,8.100075),(0.574983,8.124621),(0.579943,8.131701),(0.587798,8.137721),(0.593276,8.150666),(0.591519,8.16449),(0.584594,8.173068),(0.576843,8.180484),(0.572709,8.191),(0.573846,8.203945),(0.579013,8.207821),(0.586661,8.208751),(0.595033,8.21273),(0.628313,8.24247),(0.645056,8.253425),(0.689187,8.272855),(0.705207,8.282751),(0.712752,8.29797),(0.708825,8.322568),(0.705104,8.325979),(0.693115,8.327891),(0.689187,8.331301),(0.688567,8.33603),(0.689394,8.346055),(0.686914,8.360731),(0.687224,8.372203),(0.685053,8.382564),(0.646709,8.414165),(0.63379,8.452018),(0.616324,8.488759),(0.550798,8.519326),(0.524753,8.538033),(0.500568,8.560176),(0.483515,8.579787),(0.443518,8.606866),(0.403727,8.662082),(0.374426,8.724766),(0.368084,8.761481),(0.365874,8.774272),(0.372669,8.783754),(0.385278,8.78608),(0.397112,8.781532),(0.407809,8.759053),(0.4183,8.770603),(0.424966,8.78732),(0.419592,8.791247),(0.430134,8.794736),(0.439409,8.793444),(0.449512,8.790369),(0.462483,8.788302),(0.47349,8.793547),(0.477004,8.80675),(0.478451,8.822331),(0.483515,8.834811),(0.483629,8.834973),(0.505633,8.866333),(0.493127,8.915219),(0.444887,8.996455),(0.444887,8.996558),(0.44468,8.996558),(0.43127,9.02759),(0.441554,9.058182),(0.458478,9.08924),(0.463749,9.12146),(0.463646,9.137092),(0.469976,9.14673),(0.49261,9.166754),(0.504703,9.187166),(0.504393,9.203109),(0.49199,9.238895),(0.49292,9.258609),(0.501085,9.268195),(0.512351,9.274706),(0.522479,9.285067),(0.526613,9.297651),(0.528267,9.326951),(0.537569,9.377646),(0.531368,9.401107),(0.513281,9.416791),(0.483515,9.426842),(0.482792,9.427875),(0.482585,9.428857),(0.482792,9.429839),(0.489406,9.441027),(0.49168,9.451285),(0.489923,9.461129),(0.483515,9.470017),(0.430444,9.489189),(0.411659,9.492238),(0.371429,9.490016),(0.34895,9.486037),(0.333783,9.479474),(0.328796,9.471568),(0.325747,9.451336),(0.32182,9.442836),(0.314223,9.436479),(0.26849,9.420641),(0.249886,9.416946),(0.23136,9.418961),(0.226813,9.432345),(0.234977,9.443766),(0.227949,9.459734),(0.228053,9.473971),(0.26973,9.482342),(0.28531,9.488363),(0.2981,9.497096),(0.301924,9.507457),(0.293139,9.518283),(0.279006,9.519007),(0.253503,9.514252),(0.243116,9.518697),(0.23322,9.525595),(0.225908,9.531926),(0.223402,9.534794),(0.223066,9.541176),(0.227743,9.569339),(0.230197,9.575747),(0.28053,9.570166),(0.30456,9.571562),(0.32244,9.583137),(0.33616,9.574197),(0.354608,9.571096),(0.370809,9.575644),(0.377734,9.589416),(0.369155,9.610138),(0.349363,9.61391),(0.308797,9.603678),(0.277636,9.606986),(0.261694,9.627941),(0.260971,9.657164),(0.275285,9.685586),(0.301924,9.657835),(0.318719,9.648611),(0.336651,9.650833),(0.347089,9.663158),(0.34988,9.680651),(0.347606,9.698841),(0.342955,9.713543),(0.336289,9.72349),(0.329132,9.731293),(0.323887,9.742068),(0.32244,9.760671),(0.343886,9.838393),(0.344196,9.849762),(0.339674,9.889837),(0.341715,9.903789),(0.349777,9.918956),(0.362592,9.932676),(0.369569,9.938826),(0.370189,9.947017),(0.363393,9.966783),(0.35143,9.990451),(0.349777,9.997169),(0.35174,10.006419),(0.355125,10.01262),(0.355719,10.018976),(0.349777,10.02882),(0.367295,10.032128),(0.382746,10.029596),(0.393908,10.03249),(0.39457,10.035557),(0.398146,10.052127),(0.395149,10.072358),(0.387087,10.078947),(0.37608,10.081582),(0.363393,10.089669),(0.353601,10.115508),(0.358846,10.18633),(0.357192,10.219997),(0.364427,10.233407),(0.367295,10.249815),(0.372049,10.265137),(0.396596,10.283224),(0.376183,10.299941),(0.366597,10.304488),(0.32275,10.297254),(0.308797,10.297099),(0.317582,10.31733),(0.307066,10.333272),(0.290039,10.348491),(0.278825,10.366629),(0.28022,10.375182),(0.283553,10.385775),(0.283114,10.396808),(0.273244,10.406601),(0.263012,10.408926),(0.253943,10.406084),(0.244563,10.401537),(0.23322,10.398617),(0.223609,10.399961),(0.197073,10.41027),(0.194437,10.407376),(0.19175,10.400839),(0.187513,10.394948),(0.179865,10.394173),(0.176971,10.397687),(0.126018,10.491609),(0.110179,10.508249),(0.057262,10.541115),(0.04902,10.550959),(0.037341,10.57318),(0.029434,10.582533),(0.020339,10.588037),(-0.010925,10.598269),(-0.019968,10.604341),(-0.026221,10.610361),(-0.033352,10.615064),(-0.056452,10.618009),(-0.068363,10.621058),(-0.079344,10.626252),(-0.088129,10.633486),(-0.098336,10.654157),(-0.09769,10.675008),(-0.091564,10.700254),(-0.088129,10.714412),(-0.082807,10.756218),(-0.07521,10.773659),(-0.061103,10.791358),(-0.04069,10.805026),(-0.032061,10.813165),(-0.0302,10.823785),(-0.035316,10.843448),(-0.036091,10.853137),(-0.014439,10.953596),(-0.009581,10.963001),(-0.001571,10.971295),(0.007188,10.976799),(0.01419,10.983672),(0.016567,10.996203),(0.019409,11.031628),(0.016205,11.062582),(0.001116,11.085991),(-0.032267,11.098574),(-0.051077,11.098264),(-0.085029,11.089402),(-0.103348,11.087541),(-0.121745,11.092192),(-0.14208,11.103329),(-0.158668,11.118444),(-0.166109,11.13498),(-0.115062,11.124658),(-0.063118,11.114155),(0.059588,11.089402),(0.287558,11.043436),(0.374779,11.025808),(0.486616,11.003205),(0.488786,11.001784),(0.49013,10.999511),(0.490647,10.996358),(0.489303,10.991914),(0.48858,10.987754),(0.487133,10.983672),(0.483619,10.979693),(0.499742,10.975688),(0.487649,10.933236)]
+Uganda	[(34.108026,3.868938),(34.123736,3.872039),(34.163423,3.886198),(34.182854,3.886095),(34.204971,3.874545),(34.207555,3.860877),(34.196703,3.847389),(34.148954,3.822688),(34.150814,3.81721),(34.166524,3.811319),(34.17903,3.7961),(34.159082,3.783362),(34.152468,3.775636),(34.16518,3.77083),(34.173655,3.771399),(34.190915,3.775843),(34.210552,3.777135),(34.230396,3.782742),(34.240938,3.78362),(34.241558,3.778737),(34.263779,3.750056),(34.278868,3.709723),(34.290444,3.70316),(34.295095,3.707346),(34.299436,3.716932),(34.309874,3.726699),(34.337056,3.734579),(34.35504,3.727371),(34.387492,3.692747),(34.406303,3.682929),(34.425009,3.677193),(34.439686,3.667736),(34.446403,3.646704),(34.443923,3.566295),(34.434518,3.52622),(34.415501,3.497023),(34.406199,3.492294),(34.395967,3.489607),(34.386872,3.485628),(34.381291,3.476869),(34.382118,3.466043),(34.394417,3.444623),(34.398551,3.433642),(34.397001,3.424159),(34.386976,3.399664),(34.383978,3.388347),(34.386562,3.376384),(34.394417,3.365661),(34.403822,3.355404),(34.41116,3.344707),(34.424079,3.304812),(34.434001,3.182029),(34.444853,3.159136),(34.46573,3.145856),(34.512859,3.132368),(34.53384,3.118467),(34.545556,3.097501),(34.545622,3.097383),(34.574664,2.946126),(34.58469,2.928711),(34.616419,2.893416),(34.631405,2.869542),(34.6405,2.860137),(34.654143,2.856519),(34.660344,2.858638),(34.671506,2.867785),(34.67564,2.8698),(34.678121,2.871557),(34.682565,2.87936),(34.685045,2.880962),(34.688869,2.879154),(34.69104,2.875691),(34.692693,2.872229),(34.694657,2.87042),(34.696517,2.867733),(34.724836,2.854142),(34.730107,2.85285),(34.736928,2.844375),(34.740959,2.835539),(34.76132,2.772493),(34.776512,2.685625),(34.81868,2.597982),(34.828086,2.588784),(34.841832,2.58775),(34.849893,2.59514),(34.856508,2.60346),(34.865603,2.604855),(34.875628,2.591212),(34.881312,2.541448),(34.8871,2.522379),(34.914385,2.494371),(34.923584,2.477318),(34.920896,2.454632),(34.906117,2.436907),(34.885963,2.425434),(34.867876,2.411482),(34.859091,2.38678),(34.865603,2.347506),(34.904284,2.254255),(34.922343,2.210719),(34.967509,2.101914),(34.967612,2.082561),(34.958207,2.037965),(34.956657,2.018508),(34.957897,1.997838),(34.962031,1.977813),(34.969162,1.960295),(34.977947,1.949908),(35.001408,1.927997),(35.006473,1.916861),(35.002752,1.906138),(34.984045,1.88247),(34.979704,1.8703),(34.978671,1.675945),(34.972676,1.654241),(34.940947,1.587036),(34.933712,1.575693),(34.92348,1.566107),(34.913558,1.56156),(34.892578,1.55727),(34.882553,1.552232),(34.859505,1.517919),(34.838421,1.437174),(34.778993,1.388547),(34.780747,1.371789),(34.782714,1.352993),(34.800077,1.312324),(34.810516,1.272533),(34.797907,1.231916),(34.766074,1.217498),(34.683805,1.209075),(34.663031,1.196362),(34.628925,1.163599),(34.580452,1.152541),(34.573631,1.134247),(34.571977,1.111716),(34.566883,1.103022),(34.561228,1.093371),(34.560065,1.093149),(34.540351,1.089392),(34.524021,1.098642),(34.507485,1.102518),(34.487021,1.082467),(34.477203,1.064587),(34.468831,1.044227),(34.463663,1.022936),(34.463043,0.978081),(34.457152,0.957617),(34.431211,0.893538),(34.402375,0.856073),(34.388009,0.815817),(34.370852,0.800211),(34.30667,0.768068),(34.298402,0.759283),(34.296252,0.746746),(34.292304,0.72373),(34.276181,0.680838),(34.2521,0.655),(34.219751,0.638567),(34.179133,0.623891),(34.149574,0.603634),(34.132417,0.572834),(34.131588,0.569433),(34.107509,0.470722),(34.104409,0.462247),(34.097381,0.451808),(34.080121,0.431344),(34.075677,0.422249),(34.07671,0.403852),(34.087976,0.367369),(34.085185,0.347008),(34.076607,0.333779),(34.04064,0.305874),(33.960266,0.198677),(33.951757,0.187328),(33.893569,0.109814),(33.890468,0.090073),(33.921578,-0.01297),(33.95248,-0.115702),(33.953514,-0.154356),(33.935117,-0.313106),(33.911346,-0.519295),(33.894809,-0.662749),(33.89853,-0.799072),(33.904214,-1.002573),(33.822255,-1.002573),(33.639269,-1.002573),(33.631777,-1.002573),(33.456128,-1.002573),(33.426415,-1.002573),(33.27309,-1.002573),(33.089949,-1.002573),(32.906963,-1.002573),(32.847225,-1.002573),(32.723873,-1.002573),(32.722268,-1.002573),(32.540835,-1.002573),(32.357642,-1.002573),(32.174552,-1.002573),(31.991411,-1.002573),(31.986193,-1.002573),(31.808373,-1.002573),(31.625335,-1.002573),(31.442246,-1.002573),(31.280493,-1.002573),(31.259156,-1.002573),(31.076118,-1.002573),(30.892977,-1.002573),(30.828381,-1.002573),(30.812465,-0.994719),(30.777118,-0.98583),(30.739498,-1.005467),(30.701567,-1.017456),(30.687098,-1.025001),(30.651338,-1.062828),(30.638626,-1.07337),(30.614544,-1.065825),(30.592737,-1.063448),(30.542301,-1.068099),(30.523697,-1.07244),(30.511657,-1.07337),(30.506024,-1.070786),(30.500856,-1.065205),(30.493415,-1.060244),(30.481012,-1.059107),(30.472951,-1.065619),(30.471786,-1.066837),(30.460829,-1.063428),(30.445614,-1.058694),(30.432023,-1.060554),(30.418897,-1.066445),(30.403188,-1.070373),(30.386341,-1.068202),(30.369288,-1.063241),(30.352752,-1.060761),(30.337455,-1.066239),(30.329032,-1.080501),(30.322572,-1.121843),(30.317405,-1.137035),(30.311307,-1.1421),(30.294564,-1.149644),(30.29095,-1.152621),(30.287536,-1.155432),(30.284642,-1.161427),(30.28242,-1.175793),(30.280508,-1.182407),(30.269759,-1.200494),(30.256685,-1.217237),(30.212192,-1.259509),(30.19674,-1.268707),(30.189351,-1.270877),(30.181392,-1.271497),(30.173434,-1.272841),(30.165579,-1.277492),(30.158448,-1.291135),(30.15235,-1.329892),(30.147183,-1.345085),(30.136331,-1.355213),(30.095506,-1.37113),(30.065984,-1.386945),(30.06078,-1.389733),(30.047757,-1.403169),(30.038662,-1.424977),(30.028327,-1.427147),(29.960424,-1.464767),(29.938462,-1.472932),(29.917429,-1.475206),(29.897896,-1.469625),(29.880739,-1.453605),(29.871024,-1.432418),(29.868647,-1.391283),(29.864203,-1.370303),(29.836091,-1.329478),(29.825135,-1.323897),(29.825024,-1.323881),(29.816143,-1.322554),(29.807462,-1.325138),(29.798212,-1.330925),(29.789168,-1.341674),(29.783174,-1.361414),(29.774906,-1.366272),(29.767981,-1.363792),(29.74669,-1.350872),(29.734805,-1.348185),(29.710517,-1.352526),(29.693774,-1.361208),(29.678322,-1.37237),(29.657703,-1.383945),(29.6391,-1.38901),(29.618119,-1.39056),(29.577915,-1.38839),(29.58732,-1.329685),(29.587113,-1.310565),(29.583186,-1.299299),(29.571507,-1.279249),(29.57099,-1.268604),(29.580447,-1.243282),(29.581429,-1.234807),(29.575538,-1.213206),(29.565254,-1.19791),(29.557038,-1.181787),(29.556934,-1.157706),(29.56913,-1.095901),(29.57006,-1.077918),(29.565926,-1.058591),(29.551198,-1.020143),(29.54846,-1.002573),(29.551353,-0.990584),(29.551518,-0.990305),(29.556521,-0.981799),(29.560345,-0.972084),(29.559157,-0.957305),(29.555281,-0.938495),(29.554661,-0.928573),(29.556004,-0.919478),(29.567166,-0.901908),(29.596725,-0.891882),(29.607991,-0.878447),(29.610781,-0.863977),(29.613365,-0.803826),(29.611091,-0.782742),(29.602203,-0.743778),(29.60303,-0.7229),(29.615536,-0.644146),(29.618843,-0.638978),(29.624424,-0.634844),(29.629281,-0.62978),(29.630573,-0.622028),(29.628248,-0.616034),(29.620496,-0.605388),(29.618843,-0.599394),(29.622874,-0.588438),(29.632175,-0.585751),(29.642821,-0.585028),(29.650882,-0.57955),(29.653053,-0.565597),(29.649745,-0.504309),(29.645094,-0.48891),(29.634615,-0.466968),(29.631865,-0.461211),(29.629385,-0.442401),(29.650981,-0.316455),(29.653983,-0.298947),(29.670569,-0.200867),(29.676617,-0.165105),(29.694032,-0.063096),(29.709018,-0.026302),(29.714341,-0.007492),(29.713462,0.011628),(29.701628,0.055243),(29.703075,0.072503),(29.711809,0.099582),(29.755785,0.16087),(29.761263,0.172135),(29.773045,0.167484),(29.780383,0.16118),(29.787205,0.158493),(29.797127,0.164797),(29.800641,0.172445),(29.832628,0.336983),(29.839605,0.358481),(29.851077,0.377187),(29.903909,0.438229),(29.922907,0.46018),(29.926083,0.467073),(29.940477,0.498317),(29.937996,0.537281),(29.919496,0.618103),(29.920013,0.63867),(29.932312,0.723161),(29.926834,0.774889),(29.928281,0.785018),(29.947298,0.824602),(29.960217,0.832095),(29.982194,0.849017),(29.996391,0.859949),(30.038352,0.878914),(30.145116,0.90315),(30.154831,0.90868),(30.165683,0.921444),(30.18377,0.955137),(30.18687,0.958754),(30.191521,0.974877),(30.214052,0.998545),(30.220977,1.017097),(30.215602,1.057766),(30.215292,1.077093),(30.228005,1.08903),(30.231519,1.097764),(30.234102,1.108099),(30.236169,1.129493),(30.238857,1.136004),(30.269346,1.167268),(30.277976,1.171609),(30.286502,1.174296),(30.295701,1.172643),(30.306553,1.163909),(30.323813,1.155848),(30.33606,1.16887),(30.348204,1.189024),(30.364947,1.202047),(30.376626,1.20308),(30.39926,1.2006),(30.412696,1.202047),(30.43161,1.207008),(30.445562,1.212795),(30.458275,1.221684),(30.478274,1.238634),(30.553704,1.335632),(30.597284,1.391673),(30.681724,1.500349),(30.817013,1.609515),(30.95442,1.720671),(31.025837,1.778239),(31.096018,1.866363),(31.119113,1.895363),(31.183295,1.976211),(31.242826,2.051168),(31.271455,2.102999),(31.280096,2.151441),(31.280447,2.15341),(31.27874,2.156021),(31.267476,2.173253),(31.21089,2.205345),(31.190116,2.221519),(31.182468,2.238728),(31.179058,2.25976),(31.177559,2.30291),(31.129242,2.284668),(31.112602,2.282084),(31.099063,2.282704),(31.055241,2.290249),(31.040668,2.297897),(31.035501,2.30694),(31.038808,2.310971),(31.044389,2.313917),(31.045939,2.319653),(31.043562,2.327043),(31.041288,2.331228),(30.984858,2.394635),(30.968011,2.405436),(30.930907,2.405591),(30.914474,2.378151),(30.900573,2.345956),(30.87179,2.332055),(30.854943,2.339703),(30.83634,2.356343),(30.819803,2.37598),(30.809675,2.392362),(30.806987,2.406986),(30.807142,2.422179),(30.80492,2.434374),(30.794998,2.440111),(30.724925,2.440782),(30.710559,2.445123),(30.707665,2.46228),(30.71676,2.483105),(30.729369,2.503466),(30.737017,2.519537),(30.737844,2.537469),(30.73402,2.574469),(30.73526,2.593073),(30.739395,2.603305),(30.758928,2.633794),(30.761254,2.641597),(30.762013,2.645781),(30.764303,2.658392),(30.797686,2.74836),(30.798926,2.753528),(30.799133,2.76345),(30.801613,2.769083),(30.80585,2.771873),(30.817943,2.774199),(30.82187,2.776162),(30.828691,2.786084),(30.853393,2.853367),(30.85484,2.89321),(30.843988,2.932794),(30.82094,2.973153),(30.803628,2.989069),(30.757068,3.02147),(30.745079,3.036302),(30.743839,3.055474),(30.74787,3.076713),(30.763416,3.123437),(30.804197,3.246005),(30.822129,3.281403),(30.825746,3.283677),(30.837786,3.286416),(30.842437,3.288741),(30.845641,3.293909),(30.846882,3.304399),(30.84869,3.309256),(30.868482,3.343337),(30.897318,3.375015),(30.904933,3.386035),(30.91003,3.393412),(30.916335,3.414806),(30.914474,3.426484),(30.904449,3.447465),(30.902899,3.458911),(30.909617,3.487178),(30.909307,3.496144),(30.896388,3.519967),(30.880161,3.514412),(30.861248,3.498211),(30.839543,3.490202),(30.843781,3.505911),(30.865692,3.548958),(30.931734,3.645102),(30.936282,3.656858),(30.939382,3.668408),(30.944447,3.679286),(30.955505,3.689001),(30.965996,3.692618),(30.985788,3.692127),(30.995968,3.693522),(31.009559,3.699775),(31.040358,3.724218),(31.04966,3.727991),(31.068677,3.731737),(31.077668,3.735303),(31.104408,3.756175),(31.141489,3.785119),(31.167585,3.792405),(31.214818,3.792354),(31.255745,3.786669),(31.29502,3.774189),(31.377702,3.729308),(31.505446,3.659855),(31.523739,3.656083),(31.53452,3.665563),(31.535522,3.666444),(31.547201,3.680991),(31.564771,3.689802),(31.668537,3.70502),(31.68683,3.712824),(31.696132,3.721273),(31.775714,3.810699),(31.777884,3.816435),(31.780985,3.815815),(31.801107,3.806472),(31.80703,3.803722),(31.830697,3.783879),(31.901908,3.704297),(31.916274,3.680267),(31.920046,3.661302),(31.923095,3.615284),(31.93002,3.59836),(31.943662,3.591255),(32.022236,3.58642),(32.030168,3.585932),(32.041537,3.57986),(32.054226,3.559572),(32.060864,3.548958),(32.076161,3.53317),(32.093007,3.524463),(32.155846,3.511776),(32.16799,3.512242),(32.174552,3.520897),(32.175929,3.527234),(32.178997,3.541361),(32.179203,3.556864),(32.174863,3.59265),(32.175948,3.605595),(32.187782,3.61916),(32.371801,3.731065),(32.415571,3.741297),(32.599281,3.756283),(32.756429,3.769022),(32.840352,3.794291),(32.9189,3.83416),(32.979568,3.879196),(32.997241,3.885526),(33.01724,3.87718),(33.143486,3.774086),(33.164466,3.763053),(33.19542,3.757059),(33.286526,3.752537),(33.447343,3.744372),(33.490648,3.749746),(33.527716,3.771431),(33.532609,3.774293),(33.606196,3.848087),(33.701901,3.944076),(33.813677,4.056033),(33.896049,4.138353),(33.977078,4.219692),(34.006017,4.205713),(34.028548,4.188014),(34.041054,4.164812),(34.03971,4.134038),(34.04095,4.120421),(34.049735,4.109466),(34.060897,4.09926),(34.069269,4.08802),(34.072369,4.076419),(34.072679,4.064663),(34.069786,4.041357),(34.065858,4.02743),(34.061517,4.017921),(34.061104,4.007767),(34.068959,3.991876),(34.080844,3.980792),(34.09552,3.970999),(34.107096,3.959501),(34.109576,3.943352),(34.098931,3.917721),(34.086219,3.894673),(34.084772,3.877336),(34.108026,3.868938)]
+Uruguay	[(-56.906367,-30.108549),(-56.869211,-30.102968),(-56.831281,-30.102037),(-56.795159,-30.123845),(-56.776607,-30.150923),(-56.766995,-30.161362),(-56.704777,-30.198362),(-56.673745,-30.211281),(-56.656821,-30.221307),(-56.641783,-30.233916),(-56.632585,-30.247455),(-56.629278,-30.267712),(-56.63243,-30.278151),(-56.631345,-30.284662),(-56.615403,-30.293344),(-56.605196,-30.295617),(-56.595611,-30.295411),(-56.585818,-30.296548),(-56.575017,-30.302439),(-56.569617,-30.30802),(-56.560781,-30.320525),(-56.523754,-30.357319),(-56.5113,-30.366001),(-56.494557,-30.379333),(-56.441279,-30.408789),(-56.424639,-30.423568),(-56.400454,-30.458915),(-56.385985,-30.475761),(-56.372601,-30.48589),(-56.326531,-30.508318),(-56.267956,-30.551106),(-56.23509,-30.565368),(-56.215091,-30.581905),(-56.183517,-30.614564),(-56.177832,-30.62552),(-56.175171,-30.636062),(-56.170804,-30.645777),(-56.159642,-30.653942),(-56.140315,-30.664794),(-56.131685,-30.671925),(-56.125045,-30.680297),(-56.091894,-30.736107),(-56.076857,-30.752334),(-56.011357,-30.798222),(-55.995311,-30.825818),(-55.988955,-30.85579),(-55.993864,-30.885452),(-56.011357,-30.912634),(-56.015517,-30.934338),(-56.016344,-30.999864),(-56.02239,-31.045546),(-56.022183,-31.067147),(-56.017018,-31.074296),(-56.011357,-31.082133),(-56.009874,-31.081945),(-55.985157,-31.078825),(-55.919347,-31.082443),(-55.888186,-31.076965),(-55.86426,-31.076758),(-55.854596,-31.074588),(-55.846586,-31.069317),(-55.842142,-31.063943),(-55.838396,-31.058155),(-55.832479,-31.051747),(-55.778141,-31.020431),(-55.763594,-31.008442),(-55.755507,-30.992939),(-55.744887,-30.958626),(-55.731891,-30.945397),(-55.712745,-30.943433),(-55.688302,-30.947774),(-55.665822,-30.949324),(-55.652748,-30.938989),(-55.651069,-30.919972),(-55.654583,-30.878734),(-55.649673,-30.860958),(-55.634041,-30.847625),(-55.612906,-30.843388),(-55.591873,-30.848348),(-55.563865,-30.87646),(-55.527484,-30.894547),(-55.51131,-30.906123),(-55.489089,-30.929687),(-55.44258,-30.965551),(-55.368579,-31.037381),(-55.353852,-31.056294),(-55.348426,-31.072728),(-55.344963,-31.108488),(-55.338039,-31.125644),(-55.326928,-31.134946),(-55.2937,-31.153653),(-55.282228,-31.169052),(-55.268741,-31.2106),(-55.259981,-31.228687),(-55.244349,-31.244603),(-55.227554,-31.253492),(-55.18828,-31.266514),(-55.169625,-31.276436),(-55.122238,-31.31354),(-55.102446,-31.324288),(-55.087253,-31.326769),(-55.074256,-31.320568),(-55.061105,-31.304858),(-55.042346,-31.272612),(-55.029375,-31.268788),(-55.011495,-31.287805),(-54.995346,-31.311783),(-54.969637,-31.340825),(-54.940802,-31.36563),(-54.900288,-31.382063),(-54.887808,-31.393225),(-54.876155,-31.406351),(-54.863365,-31.417616),(-54.849903,-31.425057),(-54.819776,-31.435289),(-54.654127,-31.455753),(-54.619685,-31.45565),(-54.604543,-31.459784),(-54.591521,-31.471049),(-54.573848,-31.502469),(-54.562375,-31.515905),(-54.509665,-31.552285),(-54.495041,-31.565617),(-54.483155,-31.583911),(-54.47897,-31.601481),(-54.477368,-31.642098),(-54.467221,-31.664237),(-54.463725,-31.671864),(-54.436492,-31.694292),(-54.403677,-31.714652),(-54.373498,-31.73894),(-54.342957,-31.769326),(-54.274228,-31.823379),(-54.218779,-31.856659),(-54.169583,-31.895933),(-54.146277,-31.909886),(-54.135063,-31.908956),(-54.125503,-31.898517),(-54.107313,-31.883944),(-54.088451,-31.878156),(-54.068814,-31.879913),(-54.049745,-31.887148),(-54.03264,-31.898104),(-54.026646,-31.904821),(-54.017706,-31.919601),(-54.008714,-31.926526),(-53.998896,-31.92973),(-53.965978,-31.93252),(-53.948769,-31.936964),(-53.934352,-31.942545),(-53.905826,-31.959288),(-53.894148,-31.97014),(-53.889755,-31.980372),(-53.887275,-31.990501),(-53.881435,-32.00125),(-53.8711,-32.011482),(-53.858077,-32.021197),(-53.83043,-32.036441),(-53.771829,-32.047087),(-53.757308,-32.055045),(-53.751366,-32.068791),(-53.750022,-32.104034),(-53.721445,-32.162428),(-53.670595,-32.226404),(-53.658555,-32.254309),(-53.651837,-32.288312),(-53.648684,-32.338645),(-53.643879,-32.355595),(-53.634783,-32.368721),(-53.609307,-32.387841),(-53.59892,-32.399933),(-53.58197,-32.425772),(-53.5613,-32.449543),(-53.537632,-32.470213),(-53.474638,-32.508247),(-53.415624,-32.564161),(-53.35909,-32.580284),(-53.316043,-32.602712),(-53.299093,-32.607156),(-53.266899,-32.607363),(-53.233723,-32.624622),(-53.201477,-32.637232),(-53.186129,-32.64674),(-53.119776,-32.707408),(-53.110836,-32.722394),(-53.11404,-32.740584),(-53.126856,-32.754847),(-53.163081,-32.778722),(-53.182836,-32.799904),(-53.203854,-32.82244),(-53.270826,-32.863781),(-53.298835,-32.889102),(-53.307,-32.907189),(-53.309584,-32.944396),(-53.316302,-32.96269),(-53.327309,-32.973645),(-53.44911,-33.042065),(-53.48332,-33.067283),(-53.511535,-33.099219),(-53.511587,-33.099322),(-53.511639,-33.099426),(-53.520662,-33.124979),(-53.536857,-33.170842),(-53.536133,-33.244636),(-53.514016,-33.394911),(-53.536805,-33.559863),(-53.539647,-33.649263),(-53.511535,-33.690294),(-53.491071,-33.690294),(-53.473191,-33.6874),(-53.456707,-33.687503),(-53.440428,-33.697115),(-53.430817,-33.713445),(-53.423634,-33.731015),(-53.411283,-33.74228),(-53.379095,-33.740676),(-53.396352,-33.750584),(-53.414784,-33.764418),(-53.450917,-33.801528),(-53.473053,-33.834568),(-53.485585,-33.869317),(-53.505523,-33.952325),(-53.524648,-34.002374),(-53.529937,-34.04811),(-53.539459,-34.062433),(-53.574452,-34.082696),(-53.591217,-34.095473),(-53.639963,-34.147638),(-53.693593,-34.181736),(-53.711008,-34.198826),(-53.746653,-34.25742),(-53.755971,-34.267673),(-53.75829,-34.278497),(-53.779897,-34.336033),(-53.763661,-34.372491),(-53.764882,-34.390395),(-53.805776,-34.400974),(-53.898305,-34.443943),(-53.972239,-34.487237),(-54.124623,-34.610447),(-54.13679,-34.623956),(-54.14094,-34.641046),(-54.140492,-34.656427),(-54.145904,-34.667576),(-54.236806,-34.684503),(-54.259674,-34.685968),(-54.255605,-34.677504),(-54.249501,-34.670994),(-54.23233,-34.658136),(-54.239329,-34.65309),(-54.245676,-34.646905),(-54.250478,-34.639337),(-54.252838,-34.630792),(-54.25121,-34.618341),(-54.241078,-34.594008),(-54.238596,-34.589776),(-54.253285,-34.577569),(-54.280344,-34.567966),(-54.308949,-34.562188),(-54.328603,-34.561782),(-54.317372,-34.568617),(-54.280141,-34.582289),(-54.288157,-34.594822),(-54.304433,-34.608575),(-54.32311,-34.619399),(-54.33849,-34.623956),(-54.344635,-34.630629),(-54.344797,-34.64422),(-54.337392,-34.654718),(-54.321156,-34.65252),(-54.322581,-34.644708),(-54.307688,-34.647393),(-54.289215,-34.660252),(-54.280141,-34.682306),(-54.288075,-34.695001),(-54.306467,-34.707696),(-54.530792,-34.806899),(-54.542063,-34.811782),(-54.604156,-34.82643),(-54.636464,-34.84881),(-54.65689,-34.856622),(-54.699452,-34.867446),(-54.872711,-34.936212),(-54.893707,-34.939223),(-54.913726,-34.945245),(-54.93932,-34.969903),(-54.958608,-34.973403),(-54.953969,-34.963311),(-54.951812,-34.956964),(-54.951772,-34.952895),(-54.962229,-34.93963),(-54.975738,-34.928481),(-54.99356,-34.920994),(-55.03307,-34.916762),(-55.035471,-34.912856),(-55.034535,-34.906508),(-55.041127,-34.897638),(-55.051259,-34.891371),(-55.060374,-34.887791),(-55.082143,-34.883966),(-55.129791,-34.885919),(-55.22175,-34.903741),(-55.260243,-34.897638),(-55.286488,-34.876235),(-55.338287,-34.81878),(-55.376943,-34.801446),(-55.401926,-34.799981),(-55.468204,-34.795402),(-55.509636,-34.799065),(-55.561173,-34.787834),(-55.601794,-34.772415),(-55.646731,-34.7811),(-55.693448,-34.764741),(-55.756503,-34.782666),(-55.792051,-34.774134),(-55.858786,-34.793061),(-55.889101,-34.803475),(-55.954432,-34.839402),(-56.004052,-34.869102),(-56.069634,-34.901003),(-56.105198,-34.898416),(-56.135633,-34.912829),(-56.149892,-34.920343),(-56.156088,-34.941188),(-56.17729,-34.916325),(-56.19451,-34.913509),(-56.213002,-34.907693),(-56.204661,-34.898696),(-56.203455,-34.887503),(-56.214589,-34.879588),(-56.230551,-34.87775),(-56.236508,-34.892884),(-56.256337,-34.906183),(-56.265824,-34.906266),(-56.287976,-34.903489),(-56.311269,-34.906183),(-56.342763,-34.883966),(-56.402943,-34.85475),(-56.418446,-34.843032),(-56.420766,-34.82822),(-56.403751,-34.816051),(-56.386848,-34.80187),(-56.361282,-34.796636),(-56.37612,-34.782729),(-56.395738,-34.77588),(-56.448432,-34.758272),(-56.485088,-34.75355),(-56.520444,-34.754821),(-56.5419,-34.767022),(-56.558013,-34.765069),(-56.573598,-34.758966),(-56.610951,-34.739435),(-56.628529,-34.732599),(-56.646362,-34.722642),(-56.713544,-34.707037),(-56.795289,-34.698492),(-56.873891,-34.67018),(-56.890696,-34.660089),(-56.904164,-34.635512),(-56.919749,-34.623224),(-56.95287,-34.603448),(-56.976577,-34.581046),(-56.997417,-34.564069),(-57.015788,-34.552091),(-57.042717,-34.538125),(-57.057425,-34.527127),(-57.055898,-34.513442),(-57.062408,-34.506524),(-57.077016,-34.498142),(-57.08316,-34.493585),(-57.101959,-34.475844),(-57.120025,-34.462986),(-57.151964,-34.450932),(-57.203198,-34.442073),(-57.292158,-34.440333),(-57.346942,-34.443459),(-57.3652,-34.43044),(-57.411428,-34.431506),(-57.436974,-34.444576),(-57.44913,-34.431538),(-57.474663,-34.429541),(-57.502635,-34.440582),(-57.537914,-34.453614),(-57.569475,-34.426504),(-57.594997,-34.425473),(-57.624177,-34.430452),(-57.664324,-34.445438),(-57.7203,-34.463373),(-57.738535,-34.461318),(-57.764115,-34.474295),(-57.793302,-34.472197),(-57.82251,-34.475109),(-57.855354,-34.470967),(-57.845585,-34.462979),(-57.854048,-34.447882),(-57.882019,-34.440724),(-57.90019,-34.416525),(-57.8976,-34.376339),(-57.92276,-34.353692),(-57.942738,-34.326267),(-58.016916,-34.253106),(-58.049794,-34.240004),(-58.061391,-34.224705),(-58.076975,-34.19199),(-58.094594,-34.17783),(-58.119374,-34.169203),(-58.145904,-34.165134),(-58.169097,-34.163995),(-58.196197,-34.159438),(-58.20873,-34.147638),(-58.220326,-34.11004),(-58.231842,-34.0888),(-58.316518,-33.986505),(-58.334828,-33.973321),(-58.372426,-33.95436),(-58.388824,-33.942071),(-58.402699,-33.922784),(-58.410024,-33.902276),(-58.434641,-33.784926),(-58.439361,-33.6985),(-58.425771,-33.612888),(-58.429026,-33.592055),(-58.435048,-33.572361),(-58.438344,-33.551446),(-58.433217,-33.527765),(-58.419586,-33.508233),(-58.385365,-33.47031),(-58.37857,-33.448663),(-58.384877,-33.429132),(-58.412587,-33.409601),(-58.418935,-33.389907),(-58.412587,-33.371677),(-58.397206,-33.355645),(-58.361195,-33.325779),(-58.350738,-33.305759),(-58.349233,-33.28281),(-58.366038,-33.196059),(-58.366933,-33.153741),(-58.351389,-33.121677),(-58.310292,-33.108819),(-58.217356,-33.113539),(-58.174428,-33.110447),(-58.137766,-33.095147),(-58.100168,-33.065606),(-58.08373,-33.04754),(-58.076975,-33.030694),(-58.075307,-33.007501),(-58.070668,-32.989516),(-58.055816,-32.951837),(-58.048492,-32.911716),(-58.057118,-32.881768),(-58.077219,-32.857843),(-58.120473,-32.819268),(-58.130767,-32.802667),(-58.136138,-32.784356),(-58.137766,-32.763442),(-58.135854,-32.718357),(-58.137685,-32.695571),(-58.145172,-32.678155),(-58.137766,-32.670668),(-58.14623,-32.644952),(-58.157216,-32.575128),(-58.169097,-32.560805),(-58.177113,-32.545017),(-58.197418,-32.469822),(-58.200103,-32.447198),(-58.200112,-32.44713),(-58.199724,-32.444789),(-58.189958,-32.433936),(-58.164946,-32.389495),(-58.101591,-32.31136),(-58.096527,-32.280974),(-58.106914,-32.251829),(-58.17523,-32.174107),(-58.186547,-32.15292),(-58.180863,-32.132456),(-58.158797,-32.101554),(-58.148306,-32.0629),(-58.145309,-32.01789),(-58.14903,-31.975205),(-58.158797,-31.943889),(-58.190319,-31.913296),(-58.202618,-31.893143),(-58.196004,-31.872575),(-58.168615,-31.846014),(-58.152854,-31.835988),(-58.13084,-31.827824),(-58.083453,-31.819762),(-58.059268,-31.811494),(-58.048881,-31.797128),(-57.988626,-31.642822),(-57.979583,-31.598794),(-57.986818,-31.554145),(-58.013328,-31.52562),(-58.038978,-31.508637),(-58.050793,-31.500815),(-58.075236,-31.475184),(-58.062575,-31.444281),(-58.043558,-31.430639),(-58.005938,-31.411001),(-57.990228,-31.399323),(-57.980513,-31.380512),(-57.975552,-31.33514),(-57.966354,-31.314573),(-57.959481,-31.307959),(-57.942996,-31.296797),(-57.935606,-31.290285),(-57.914832,-31.252458),(-57.905117,-31.240986),(-57.905014,-31.215044),(-57.911732,-31.170603),(-57.899019,-31.126471),(-57.87375,-31.093088),(-57.855249,-31.058982),(-57.863311,-31.012266),(-57.905479,-30.958833),(-57.911732,-30.947361),(-57.90398,-30.929687),(-57.885325,-30.918835),(-57.842795,-30.909223),(-57.819644,-30.9116),(-57.807242,-30.90757),(-57.801868,-30.89248),(-57.796132,-30.868399),(-57.794995,-30.85796),(-57.796028,-30.816206),(-57.799397,-30.791461),(-57.801868,-30.773314),(-57.808659,-30.747331),(-57.817887,-30.712026),(-57.826207,-30.689702),(-57.848531,-30.647947),(-57.863311,-30.62862),(-57.88579,-30.589863),(-57.889769,-30.550796),(-57.877109,-30.514829),(-57.849617,-30.48527),(-57.652729,-30.329104),(-57.631077,-30.297064),(-57.623739,-30.2581),(-57.63795,-30.215105),(-57.642446,-30.193091),(-57.633971,-30.183583),(-57.611698,-30.182963),(-57.586842,-30.204047),(-57.567463,-30.256343),(-57.535992,-30.27443),(-57.510981,-30.276704),(-57.467211,-30.269883),(-57.44313,-30.269469),(-57.429797,-30.275464),(-57.414811,-30.295721),(-57.399257,-30.299131),(-57.389386,-30.294894),(-57.366597,-30.277221),(-57.353833,-30.27195),(-57.334299,-30.272673),(-57.321742,-30.279804),(-57.310993,-30.288279),(-57.296472,-30.293344),(-57.288617,-30.29076),(-57.276215,-30.277737),(-57.270376,-30.275154),(-57.262469,-30.278668),(-57.250067,-30.29045),(-57.245054,-30.293344),(-57.212601,-30.287349),(-57.183714,-30.267505),(-57.163819,-30.23929),(-57.158341,-30.207871),(-57.150848,-30.182343),(-57.129557,-30.149993),(-57.102272,-30.121158),(-57.077106,-30.106068),(-57.067235,-30.106792),(-57.048529,-30.114543),(-57.037883,-30.114647),(-57.018298,-30.105758),(-57.01127,-30.103484),(-56.97458,-30.09749),(-56.954529,-30.09687),(-56.906367,-30.108549)]
+Vatican	[(12.453137,41.902752),(12.452714,41.903016),(12.452767,41.903439),(12.453031,41.903915),(12.453983,41.903862),(12.454035,41.902752),(12.453137,41.902752)]
+Akrotiri Sovereign Base Area	[(32.840809,34.699467),(32.845992,34.699467),(32.853766,34.699467),(32.85969,34.700578),(32.86043,34.687621),(32.865613,34.678735),(32.884504,34.666607),(32.913667,34.66028),(32.917246,34.667136),(32.929752,34.662485),(32.936056,34.657731),(32.942258,34.667136),(32.954712,34.677316),(32.987526,34.673389),(32.9898,34.646103),(32.970266,34.646103),(32.965615,34.651581),(32.95404,34.642951),(32.95559,34.628895),(32.962515,34.625019),(32.969543,34.632047),(32.99073,34.634425),(33.015635,34.634425),(33.009939,34.624905),(33.009125,34.597398),(33.030284,34.574774),(33.030284,34.568549),(32.940929,34.568549),(32.940929,34.574774),(32.944672,34.593695),(32.915863,34.63939),(32.913585,34.656684),(32.857432,34.669013),(32.834321,34.670966),(32.812836,34.668647),(32.760671,34.653225),(32.760102,34.66911),(32.766766,34.676144),(32.778613,34.673182),(32.798604,34.670961),(32.806009,34.68577),(32.819336,34.687621),(32.822668,34.691323),(32.827481,34.696506),(32.832294,34.700948),(32.835626,34.699838),(32.840809,34.699467)]
+Zambia	[(31.119836,-8.616631),(31.141024,-8.606192),(31.161384,-8.591723),(31.182675,-8.580767),(31.206756,-8.580767),(31.218435,-8.588725),(31.237349,-8.613943),(31.248046,-8.621902),(31.260913,-8.623969),(31.269388,-8.621075),(31.277088,-8.61601),(31.328816,-8.597717),(31.340391,-8.595237),(31.347523,-8.592446),(31.350107,-8.588519),(31.353311,-8.587175),(31.362199,-8.592343),(31.36592,-8.598647),(31.369227,-8.616837),(31.372638,-8.623865),(31.38597,-8.632547),(31.398838,-8.633787),(31.412428,-8.63234),(31.427518,-8.633477),(31.443228,-8.641539),(31.464725,-8.666137),(31.480641,-8.676162),(31.519089,-8.687014),(31.539036,-8.70355),(31.54596,-8.728975),(31.545857,-8.766286),(31.55335,-8.809074),(31.576449,-8.839666),(31.672671,-8.913047),(31.689621,-8.919558),(31.709775,-8.919661),(31.730238,-8.912426),(31.764345,-8.894133),(31.787599,-8.892169),(31.936634,-8.93258),(31.917824,-8.973095),(31.917721,-9.022497),(31.938081,-9.061771),(31.980559,-9.0719),(32.001385,-9.063322),(32.015802,-9.052676),(32.031719,-9.045958),(32.057247,-9.049576),(32.086031,-9.066112),(32.096418,-9.069109),(32.105823,-9.068283),(32.125046,-9.063735),(32.134141,-9.064148),(32.145574,-9.070265),(32.154812,-9.075207),(32.191606,-9.112208),(32.211294,-9.12678),(32.231448,-9.133808),(32.252739,-9.136495),(32.383015,-9.133912),(32.423426,-9.143834),(32.459703,-9.168018),(32.470658,-9.181867),(32.490089,-9.227343),(32.504455,-9.249253),(32.518046,-9.258245),(32.555614,-9.261242),(32.641604,-9.279846),(32.713228,-9.28584),(32.725837,-9.292558),(32.739686,-9.307338),(32.743407,-9.314986),(32.746507,-9.329972),(32.752295,-9.337413),(32.759633,-9.339997),(32.776996,-9.33824),(32.784334,-9.339687),(32.83074,-9.370176),(32.905464,-9.398185),(32.920863,-9.4079),(32.923034,-9.466294),(32.927788,-9.479834),(32.937503,-9.487792),(32.943601,-9.485725),(32.950267,-9.480867),(32.961895,-9.48035),(32.968613,-9.484381),(32.983082,-9.497714),(32.99197,-9.501848),(32.992384,-9.529133),(32.97471,-9.601273),(32.986906,-9.628455),(33.000135,-9.632796),(33.011194,-9.627835),(33.022253,-9.62029),(33.03574,-9.616983),(33.046747,-9.622047),(33.050778,-9.632693),(33.053052,-9.644785),(33.058323,-9.654293),(33.08044,-9.662251),(33.089225,-9.643958),(33.092533,-9.614399),(33.09832,-9.588458),(33.121471,-9.599516),(33.175422,-9.602307),(33.19542,-9.616259),(33.209838,-9.641374),(33.214282,-9.654707),(33.215781,-9.6699),(33.21299,-9.680648),(33.207823,-9.68871),(33.204567,-9.698115),(33.207254,-9.712894),(33.216711,-9.727054),(33.241774,-9.74235),(33.25273,-9.754029),(33.267199,-9.781211),(33.275777,-9.793303),(33.287766,-9.803845),(33.299962,-9.810253),(33.336962,-9.823689),(33.343473,-9.83144),(33.359183,-9.870921),(33.365591,-9.898826),(33.35846,-9.91991),(33.328797,-9.965489),(33.309987,-10.012721),(33.304716,-10.037939),(33.304096,-10.063777),(33.317532,-10.082071),(33.399181,-10.117934),(33.420161,-10.135608),(33.436491,-10.153281),(33.454578,-10.16806),(33.480519,-10.177052),(33.499123,-10.201237),(33.518967,-10.214983),(33.533281,-10.231209),(33.535606,-10.262732),(33.529302,-10.318646),(33.532919,-10.342623),(33.559171,-10.404325),(33.567646,-10.416004),(33.595551,-10.440602),(33.603199,-10.44918),(33.622733,-10.494035),(33.638184,-10.511605),(33.665418,-10.515119),(33.665573,-10.541371),(33.672652,-10.559561),(33.673523,-10.569367),(33.673849,-10.573048),(33.674203,-10.577028),(33.657769,-10.601316),(33.642266,-10.615268),(33.603096,-10.643277),(33.59028,-10.648961),(33.576947,-10.657643),(33.528268,-10.711593),(33.51199,-10.751797),(33.500983,-10.769161),(33.480519,-10.781563),(33.465326,-10.784354),(33.447136,-10.802234),(33.43401,-10.808125),(33.418663,-10.807298),(33.385538,-10.80089),(33.37174,-10.803267),(33.357839,-10.808745),(33.332621,-10.813602),(33.319082,-10.81815),(33.306886,-10.828589),(33.288128,-10.856701),(33.2734,-10.865589),(33.261204,-10.865279),(33.250766,-10.862488),(33.241412,-10.865692),(33.232576,-10.883262),(33.231697,-10.897628),(33.239604,-10.903106),(33.252109,-10.903106),(33.265855,-10.901142),(33.280325,-10.913338),(33.28787,-10.944861),(33.29096,-10.975086),(33.293967,-11.004495),(33.303682,-11.034571),(33.3181,-11.062269),(33.3366,-11.087384),(33.358873,-11.109398),(33.390912,-11.164795),(33.382231,-11.194664),(33.368485,-11.222673),(33.298308,-11.32923),(33.29681,-11.335741),(33.300272,-11.347007),(33.298928,-11.353104),(33.293347,-11.357755),(33.278051,-11.364266),(33.273503,-11.369641),(33.27185,-11.383697),(33.273814,-11.396616),(33.273607,-11.409432),(33.265184,-11.423074),(33.239707,-11.402404),(33.230302,-11.416563),(33.234953,-11.501726),(33.233816,-11.514025),(33.227305,-11.532732),(33.212629,-11.563841),(33.215936,-11.571592),(33.232679,-11.57769),(33.249319,-11.577793),(33.266889,-11.575623),(33.283219,-11.578414),(33.296758,-11.593606),(33.302649,-11.60973),(33.314018,-11.7722),(33.310607,-11.808787),(33.297378,-11.846511),(33.297481,-11.862531),(33.308747,-11.884441),(33.312674,-11.898704),(33.309315,-11.91431),(33.303579,-11.930227),(33.294226,-11.981283),(33.2549,-12.072647),(33.251283,-12.105823),(33.25273,-12.139516),(33.260274,-12.155743),(33.288386,-12.182201),(33.299962,-12.195947),(33.312467,-12.228606),(33.330141,-12.298266),(33.349468,-12.327929),(33.384608,-12.340021),(33.458298,-12.31811),(33.497366,-12.331546),(33.514109,-12.331029),(33.525581,-12.335267),(33.527131,-12.355627),(33.51814,-12.37175),(33.513887,-12.374281),(33.487754,-12.389837),(33.480519,-12.406373),(33.465326,-12.409061),(33.460779,-12.416502),(33.459952,-12.4411),(33.451115,-12.452986),(33.420781,-12.464974),(33.409412,-12.475206),(33.393755,-12.498254),(33.373239,-12.518511),(33.350398,-12.532671),(33.32828,-12.537632),(33.320322,-12.535048),(33.311951,-12.52988),(33.302236,-12.525126),(33.28973,-12.524196),(33.263168,-12.528536),(33.255107,-12.531947),(33.243634,-12.544763),(33.226995,-12.579076),(33.21299,-12.588584),(33.202913,-12.591788),(33.196816,-12.595406),(33.192371,-12.599023),(33.187307,-12.60233),(33.181313,-12.608222),(33.178005,-12.615043),(33.173251,-12.620004),(33.163019,-12.620417),(33.158782,-12.615353),(33.146896,-12.593235),(33.13992,-12.586311),(33.13036,-12.583727),(33.122815,-12.584554),(33.107002,-12.588688),(33.099044,-12.593235),(33.089949,-12.60078),(33.081267,-12.604811),(33.074239,-12.5983),(33.070002,-12.590445),(33.064627,-12.584967),(33.057703,-12.583417),(33.049538,-12.586827),(33.035378,-12.599126),(33.024836,-12.612666),(32.994141,-12.672507),(32.958071,-12.725217),(32.944635,-12.752399),(32.941121,-12.769865),(32.947012,-12.843246),(32.953523,-12.854098),(32.980498,-12.870738),(33.005044,-12.892959),(33.013571,-12.917247),(33.00892,-12.945049),(32.981532,-13.00613),(32.965925,-13.116821),(32.967114,-13.134184),(32.9713,-13.150927),(32.979051,-13.167877),(32.995071,-13.190873),(32.998171,-13.202449),(32.992797,-13.216401),(32.962721,-13.22498),(32.937865,-13.255882),(32.919623,-13.294846),(32.905487,-13.351391),(32.892131,-13.404814),(32.874251,-13.443158),(32.845829,-13.45804),(32.827432,-13.460831),(32.819061,-13.471683),(32.816891,-13.487393),(32.817511,-13.505583),(32.813066,-13.528217),(32.800044,-13.537105),(32.763199,-13.54248),(32.749814,-13.550851),(32.722839,-13.573382),(32.71023,-13.575346),(32.691627,-13.569145),(32.677261,-13.567801),(32.667649,-13.575553),(32.663308,-13.596327),(32.67509,-13.628056),(32.706716,-13.635084),(32.743407,-13.635394),(32.769865,-13.646866),(32.807795,-13.699163),(32.813377,-13.711152),(32.80485,-13.722004),(32.768108,-13.739057),(32.757359,-13.750219),(32.763044,-13.777194),(32.791879,-13.789803),(32.828776,-13.797038),(32.85942,-13.808097),(32.874148,-13.820602),(32.923912,-13.880444),(32.927891,-13.895636),(32.930062,-13.910519),(32.93616,-13.926229),(32.944428,-13.932947),(32.962515,-13.932017),(32.970576,-13.936047),(32.976261,-13.944522),(32.976674,-13.949793),(32.974814,-13.955478),(32.9713,-14.005914),(32.976467,-14.021107),(32.999825,-14.050459),(33.01817,-14.046222),(33.049434,-13.996612),(33.062974,-13.981729),(33.076926,-13.974495),(33.111601,-13.964573),(33.120645,-13.955891),(33.130256,-13.93057),(33.140282,-13.924989),(33.154544,-13.936564),(33.185654,-13.993822),(33.202707,-14.013872),(33.13005,-14.038057),(33.042923,-14.067099),(32.917143,-14.10906),(32.744957,-14.166421),(32.576802,-14.222542),(32.425493,-14.272978),(32.320383,-14.308014),(32.227366,-14.33902),(32.147061,-14.353386),(32.108768,-14.364859),(32.033269,-14.398758),(31.932913,-14.431108),(31.801345,-14.473586),(31.658408,-14.519578),(31.589679,-14.554821),(31.496661,-14.60257),(31.410878,-14.633576),(31.306802,-14.658174),(31.178024,-14.68856),(31.074465,-14.713054),(31.056585,-14.714398),(30.915094,-14.746024),(30.815772,-14.768245),(30.676969,-14.817647),(30.591807,-14.848136),(30.48556,-14.885964),(30.392491,-14.931025),(30.318438,-14.966992),(30.230898,-14.977224),(30.214465,-14.981462),(30.214421,-14.981966),(30.213845,-14.98849),(30.220977,-15.018359),(30.220977,-15.063007),(30.225834,-15.106312),(30.263145,-15.231266),(30.287949,-15.278911),(30.320505,-15.299478),(30.334871,-15.304749),(30.347481,-15.317875),(30.357919,-15.335652),(30.364947,-15.354152),(30.369185,-15.374719),(30.371768,-15.439832),(30.374921,-15.451304),(30.389648,-15.471148),(30.392852,-15.480759),(30.390165,-15.490785),(30.371768,-15.525408),(30.365257,-15.547422),(30.367428,-15.561271),(30.395953,-15.590623),(30.401224,-15.598478),(30.412696,-15.627934),(30.410371,-15.630414),(30.396263,-15.635995),(30.356679,-15.651498),(30.32805,-15.652428),(30.296196,-15.639042),(30.280094,-15.632275),(30.254876,-15.628864),(30.246091,-15.632068),(30.231002,-15.644677),(30.223147,-15.649741),(30.207231,-15.653152),(30.195552,-15.649121),(30.16992,-15.632171),(30.130129,-15.623696),(30.090029,-15.629381),(30.050238,-15.640129),(30.010654,-15.646227),(29.967504,-15.641473),(29.881773,-15.618839),(29.837331,-15.614808),(29.814283,-15.619666),(29.773252,-15.638062),(29.73005,-15.644677),(29.672793,-15.663281),(29.648505,-15.666588),(29.62799,-15.663591),(29.608559,-15.658423),(29.587217,-15.655736),(29.563446,-15.662144),(29.526239,-15.692839),(29.508462,-15.703588),(29.422059,-15.71103),(29.406969,-15.714233),(29.186311,-15.812832),(29.150964,-15.848799),(29.141869,-15.854483),(29.121716,-15.859341),(29.102182,-15.870916),(29.086162,-15.884559),(29.076344,-15.895411),(29.055053,-15.934375),(29.042341,-15.946261),(29.018053,-15.950602),(28.972784,-15.951428),(28.951287,-15.955252),(28.946862,-15.957235),(28.932373,-15.963727),(28.898887,-15.995457),(28.877183,-16.022018),(28.874082,-16.028943),(28.860336,-16.049407),(28.857236,-16.060466),(28.859303,-16.069561),(28.86385,-16.076589),(28.868501,-16.08217),(28.870981,-16.087234),(28.8654,-16.121237),(28.852481,-16.162785),(28.847107,-16.202679),(28.86416,-16.231205),(28.840286,-16.284741),(28.836772,-16.306342),(28.840492,-16.323602),(28.857029,-16.36546),(28.857236,-16.388198),(28.833051,-16.426438),(28.829124,-16.434603),(28.822509,-16.470776),(28.808866,-16.486279),(28.769282,-16.515218),(28.761117,-16.532271),(28.741377,-16.550668),(28.73285,-16.55811),(28.718794,-16.56028),(28.690734,-16.56028),(28.643295,-16.568755),(28.280113,-16.706524),(28.21252,-16.748589),(28.113922,-16.827551),(28.022993,-16.865393),(27.868562,-16.929663),(27.816886,-16.959636),(27.777301,-17.001183),(27.641186,-17.198484),(27.624856,-17.233314),(27.604495,-17.312792),(27.577314,-17.363125),(27.524294,-17.415112),(27.422078,-17.504822),(27.157081,-17.769302),(27.146952,-17.783875),(27.145299,-17.794107),(27.146539,-17.818911),(27.149019,-17.842476),(27.11543,-17.882163),(27.078171,-17.916993),(27.048457,-17.944278),(27.021275,-17.958541),(27.006289,-17.962675),(26.95916,-17.964742),(26.94867,-17.968876),(26.912031,-17.992027),(26.88826,-17.984586),(26.794002,-18.026237),(26.769714,-18.029028),(26.753591,-18.032955),(26.740569,-18.0405),(26.71194,-18.065821),(26.700003,-18.069232),(26.685689,-18.066751),(26.628844,-18.049181),(26.612721,-18.041223),(26.598872,-18.029958),(26.583369,-18.013215),(26.570243,-18.002879),(26.553604,-17.996471),(26.527145,-17.992027),(26.485494,-17.979315),(26.408599,-17.939007),(26.362711,-17.930636),(26.325504,-17.93601),(26.318269,-17.934356),(26.311965,-17.928362),(26.3038,-17.922781),(26.294291,-17.918543),(26.248299,-17.913376),(26.239204,-17.910172),(26.233933,-17.903971),(26.228249,-17.894669),(26.221117,-17.886297),(26.211919,-17.882783),(26.203031,-17.887227),(26.167477,-17.913582),(26.158589,-17.918337),(26.135438,-17.922574),(26.118591,-17.931566),(26.101228,-17.935803),(26.095234,-17.938077),(26.0942,-17.941901),(26.096164,-17.954614),(26.095234,-17.958541),(26.081178,-17.962365),(26.062471,-17.962882),(26.046554,-17.966292),(26.04056,-17.978488),(26.033739,-17.971563),(25.978548,-17.998952),(25.966973,-18.000502),(25.924495,-17.998952),(25.86362,-17.971563),(25.853491,-17.959988),(25.846153,-17.943658),(25.847497,-17.929395),(25.86362,-17.923814),(25.849667,-17.906658),(25.804399,-17.888158),(25.794683,-17.872655),(25.786002,-17.862216),(25.765951,-17.849814),(25.743834,-17.839375),(25.70642,-17.829867),(25.694224,-17.819428),(25.681409,-17.81147),(25.657017,-17.81395),(25.603997,-17.836171),(25.536818,-17.848677),(25.530927,-17.850951),(25.522142,-17.860149),(25.516458,-17.862319),(25.510153,-17.861183),(25.500748,-17.856015),(25.49558,-17.854878),(25.420288,-17.854878),(25.409539,-17.853018),(25.376466,-17.841235),(25.345254,-17.842579),(25.335538,-17.841235),(25.315901,-17.83214),(25.285412,-17.809299),(25.266705,-17.800928),(25.259781,-17.794107),(25.253476,-17.781497),(25.242417,-17.770335),(25.228878,-17.762481),(25.215132,-17.759277),(25.198182,-17.75845),(25.190741,-17.755349),(25.177822,-17.738813),(25.172448,-17.735092),(25.161182,-17.729408),(25.156841,-17.72517),(25.155291,-17.719382),(25.156428,-17.70667),(25.153327,-17.700986),(25.138548,-17.686103),(25.131416,-17.686516),(25.122631,-17.697885),(25.120048,-17.691064),(25.115087,-17.684242),(25.107955,-17.678868),(25.098757,-17.676801),(25.096897,-17.67215),(25.088525,-17.642695),(25.085218,-17.640938),(25.067028,-17.625331),(25.064237,-17.621507),(25.052558,-17.621404),(25.045324,-17.619957),(25.040053,-17.616133),(25.033851,-17.608485),(25.033851,-17.60156),(25.040569,-17.584507),(25.036952,-17.5812),(25.02672,-17.58275),(25.008013,-17.588538),(24.998505,-17.588021),(24.982588,-17.576549),(24.971116,-17.560736),(24.969987,-17.559962),(24.95799,-17.551744),(24.93763,-17.560736),(24.924917,-17.542959),(24.898252,-17.531074),(24.829523,-17.517741),(24.79738,-17.519085),(24.786838,-17.516914),(24.780017,-17.512263),(24.775056,-17.507612),(24.769785,-17.505442),(24.684415,-17.49242),(24.639457,-17.49242),(24.629742,-17.49552),(24.622817,-17.502341),(24.617443,-17.509163),(24.606487,-17.515157),(24.591294,-17.528386),(24.580752,-17.532831),(24.571244,-17.533451),(24.562459,-17.53221),(24.546543,-17.526526),(24.537861,-17.520325),(24.53166,-17.5134),(24.523598,-17.507819),(24.498173,-17.503478),(24.47926,-17.494487),(24.449288,-17.489112),(24.407016,-17.474539),(24.388929,-17.471336),(24.371256,-17.473713),(24.329398,-17.485081),(24.321337,-17.488699),(24.310278,-17.482601),(24.257361,-17.480844),(24.238758,-17.478157),(24.220464,-17.4795),(24.190905,-17.485288),(24.148117,-17.493763),(24.105329,-17.502238),(24.062541,-17.510713),(24.01965,-17.519085),(23.976965,-17.52756),(23.934177,-17.536034),(23.891389,-17.544406),(23.848497,-17.552881),(23.805606,-17.561356),(23.762818,-17.569727),(23.72003,-17.578202),(23.677242,-17.586677),(23.634557,-17.595049),(23.591769,-17.603524),(23.548774,-17.611999),(23.505986,-17.620474),(23.47622,-17.626365),(23.45741,-17.626778),(23.422373,-17.633496),(23.381652,-17.641144),(23.375968,-17.628225),(23.375141,-17.615409),(23.382273,-17.601043),(23.359432,-17.582853),(23.340621,-17.560736),(23.320158,-17.54637),(23.305378,-17.539548),(23.290805,-17.535414),(23.258352,-17.532831),(23.241299,-17.535104),(23.224246,-17.539342),(23.206986,-17.541202),(23.189726,-17.536551),(23.177531,-17.524046),(23.17691,-17.509783),(23.179081,-17.494177),(23.176187,-17.478157),(23.165748,-17.467408),(23.121513,-17.450872),(23.097639,-17.432165),(23.073041,-17.405086),(23.054127,-17.375321),(23.046376,-17.348449),(23.040381,-17.33708),(22.998627,-17.293775),(22.984157,-17.285817),(22.936512,-17.273311),(22.876154,-17.248093),(22.849179,-17.23104),(22.809388,-17.196417),(22.778278,-17.180397),(22.765153,-17.169649),(22.755851,-17.154869),(22.744792,-17.108257),(22.730736,-17.081592),(22.710479,-17.055444),(22.665624,-17.008625),(22.651671,-16.998703),(22.592037,-16.975449),(22.579324,-16.975345),(22.573433,-16.971004),(22.569196,-16.962426),(22.569299,-16.944959),(22.567232,-16.936898),(22.554519,-16.924185),(22.522894,-16.914677),(22.508527,-16.906202),(22.499742,-16.89349),(22.489097,-16.865378),(22.416647,-16.75448),(22.408895,-16.745798),(22.399594,-16.740424),(22.383574,-16.73753),(22.377993,-16.734843),(22.372618,-16.728849),(22.365797,-16.71686),(22.350088,-16.696292),(22.343473,-16.683167),(22.333654,-16.673658),(22.306989,-16.669214),(22.303062,-16.66694),(22.295621,-16.659189),(22.290763,-16.656398),(22.287352,-16.658259),(22.283735,-16.661359),(22.274123,-16.663633),(22.259034,-16.669214),(22.251282,-16.670041),(22.237743,-16.665493),(22.15165,-16.597694),(22.145139,-16.584051),(22.142452,-16.567101),(22.138111,-16.552632),(22.127259,-16.546431),(22.108138,-16.54395),(22.104004,-16.536716),(22.106588,-16.525967),(22.107312,-16.512324),(22.101731,-16.497958),(22.084574,-16.470156),(22.079923,-16.457754),(22.08075,-16.441011),(22.086021,-16.422304),(22.094289,-16.404734),(22.103591,-16.391918),(22.105555,-16.379413),(22.089122,-16.371971),(22.055842,-16.364633),(22.054188,-16.358639),(22.053672,-16.336521),(22.052018,-16.326806),(22.048607,-16.322362),(22.036618,-16.312233),(22.032174,-16.306342),(22.02773,-16.291666),(22.025973,-16.278954),(22.022356,-16.266345),(22.01171,-16.252289),(22.019875,-16.253115),(22.045197,-16.252289),(22.010367,-16.198132),(21.983805,-16.165886),(21.981531,-16.144285),(21.981531,-16.128162),(21.981531,-16.067494),(21.981531,-16.004035),(21.980601,-16.001244),(21.980808,-15.956079),(21.980911,-15.853967),(21.981221,-15.751957),(21.981428,-15.649948),(21.981531,-15.547835),(21.981531,-15.503807),(21.981531,-15.473525),(21.981531,-15.452337),(21.981531,-15.412546),(21.981428,-15.261858),(21.981325,-15.11117),(21.981221,-14.960481),(21.981118,-14.809793),(21.981014,-14.659104),(21.980911,-14.508416),(21.980808,-14.357624),(21.980704,-14.206935),(21.980601,-14.05635),(21.980498,-13.905558),(21.980394,-13.754973),(21.980353,-13.694822),(21.980291,-13.604181),(21.980188,-13.453493),(21.980084,-13.302701),(21.979981,-13.152168),(21.979878,-13.001479),(22.104211,-13.001479),(22.228545,-13.001479),(22.352775,-13.001479),(22.477005,-13.001479),(22.601235,-13.001479),(22.725465,-13.001479),(22.849799,-13.001479),(22.974029,-13.001479),(23.098362,-13.001479),(23.222696,-13.001479),(23.346926,-13.001479),(23.471259,-13.001479),(23.595593,-13.001479),(23.719823,-13.001479),(23.844157,-13.001479),(23.968283,-13.001479),(24.000633,-13.001479),(23.988851,-12.965099),(23.971797,-12.93337),(23.949576,-12.904638),(23.895109,-12.849757),(23.874749,-12.821749),(23.865654,-12.789709),(23.872269,-12.750125),(23.891699,-12.705063),(23.910716,-12.631269),(23.928699,-12.561609),(23.940791,-12.532774),(23.98606,-12.467662),(24.019856,-12.419189),(24.028021,-12.402136),(24.030812,-12.385083),(24.020993,-12.340021),(24.016859,-12.278939),(24.006627,-12.253721),(23.981306,-12.227676),(23.959602,-12.19667),(23.954331,-12.151919),(23.961049,-12.011669),(23.967043,-11.882891),(23.98854,-11.834212),(23.990194,-11.824083),(23.985543,-11.799485),(23.981306,-11.724761),(23.972727,-11.700577),(23.962289,-11.68156),(23.954641,-11.662233),(23.954641,-11.636911),(23.959912,-11.617171),(23.977688,-11.577277),(24.005387,-11.535212),(24.009728,-11.52343),(24.009831,-11.507203),(24.007247,-11.483122),(24.007557,-11.470513),(24.009935,-11.459454),(24.020787,-11.444572),(24.052102,-11.42049),(24.061714,-11.406951),(24.061094,-11.394962),(24.016963,-11.298431),(24.011175,-11.272903),(24.015309,-11.130482),(23.995775,-11.127382),(23.990091,-11.113532),(23.994535,-11.074982),(23.993708,-11.019585),(23.997325,-11.001705),(24.003733,-10.982481),(24.000013,-10.967805),(23.980582,-10.938349),(23.974278,-10.921399),(23.967457,-10.872307),(24.00146,-10.873444),(24.048382,-10.882332),(24.09148,-10.897835),(24.114218,-10.919229),(24.114321,-10.927911),(24.10874,-10.945791),(24.108016,-10.954989),(24.110497,-10.965945),(24.117525,-10.986098),(24.119385,-10.99757),(24.117732,-11.03085),(24.124243,-11.043252),(24.144397,-11.040359),(24.16455,-11.033951),(24.181294,-11.034467),(24.218294,-11.045216),(24.238034,-11.048007),(24.275138,-11.047903),(24.293845,-11.05028),(24.316376,-11.060099),(24.345315,-11.078289),(24.370533,-11.1002),(24.381798,-11.12056),(24.378284,-11.132136),(24.369913,-11.140921),(24.362471,-11.150533),(24.361748,-11.164692),(24.367432,-11.176268),(24.384382,-11.191254),(24.391307,-11.199832),(24.396578,-11.217402),(24.397818,-11.238279),(24.396061,-11.259673),(24.392237,-11.279104),(24.384485,-11.295227),(24.352446,-11.345043),(24.33994,-11.358065),(24.298289,-11.370571),(24.285473,-11.381216),(24.293948,-11.3992),(24.310071,-11.406641),(24.351722,-11.407055),(24.370223,-11.410155),(24.392547,-11.423384),(24.426447,-11.45408),(24.446497,-11.463589),(24.469648,-11.465552),(24.490939,-11.461522),(24.532693,-11.446122),(24.542512,-11.445398),(24.554191,-11.446329),(24.564733,-11.444675),(24.571244,-11.436407),(24.574448,-11.425141),(24.578582,-11.415633),(24.584576,-11.407365),(24.593258,-11.399613),(24.60225,-11.395686),(24.624677,-11.390828),(24.635219,-11.385867),(24.645038,-11.376049),(24.663331,-11.351657),(24.67408,-11.341632),(24.712527,-11.326026),(24.787975,-11.325819),(24.826732,-11.317551),(24.901043,-11.281274),(24.942901,-11.268562),(24.981245,-11.271869),(25.124285,-11.259157),(25.184023,-11.246651),(25.278798,-11.199935),(25.31032,-11.194768),(25.322516,-11.205413),(25.324583,-11.227841),(25.323343,-11.253472),(25.32541,-11.273936),(25.324893,-11.283651),(25.317142,-11.290473),(25.296264,-11.298431),(25.284689,-11.307319),(25.290166,-11.315897),(25.301329,-11.324476),(25.306496,-11.333054),(25.298021,-11.351451),(25.286342,-11.360649),(25.277971,-11.371811),(25.279004,-11.396306),(25.286652,-11.416563),(25.309287,-11.455424),(25.316728,-11.472994),(25.315385,-11.482502),(25.301742,-11.498418),(25.297711,-11.507927),(25.297505,-11.517229),(25.300398,-11.535005),(25.327373,-11.616654),(25.336779,-11.633501),(25.344943,-11.642182),(25.351971,-11.64611),(25.360446,-11.647247),(25.373159,-11.647143),(25.386388,-11.64983),(25.392796,-11.656445),(25.39755,-11.66492),(25.406335,-11.673085),(25.463593,-11.70006),(25.481163,-11.715253),(25.482816,-11.72042),(25.483281,-11.725795),(25.482816,-11.731169),(25.474135,-11.756181),(25.480439,-11.769823),(25.49558,-11.776541),(25.515217,-11.775818),(25.524519,-11.77096),(25.530617,-11.764242),(25.537645,-11.758351),(25.550254,-11.756594),(25.561003,-11.753287),(25.56493,-11.743985),(25.567824,-11.733753),(25.575679,-11.727345),(25.621464,-11.728895),(25.655777,-11.750496),(25.687403,-11.778711),(25.725644,-11.800519),(25.744041,-11.803826),(25.801608,-11.80424),(25.812667,-11.802999),(25.832511,-11.793801),(25.839849,-11.791941),(25.850701,-11.793801),(25.855765,-11.797212),(25.859589,-11.801966),(25.914159,-11.845581),(25.935553,-11.853642),(25.949816,-11.863978),(25.963562,-11.895087),(25.981132,-11.903045),(25.994051,-11.904802),(26.16665,-11.902425),(26.189078,-11.9109),(26.209335,-11.923612),(26.229592,-11.933121),(26.265559,-11.930847),(26.28623,-11.940562),(26.298012,-11.941182),(26.309174,-11.936531),(26.328811,-11.923302),(26.339146,-11.918961),(26.376353,-11.912863),(26.414594,-11.91183),(26.438365,-11.919065),(26.455418,-11.931984),(26.470715,-11.94697),(26.489111,-11.960819),(26.524871,-11.972291),(26.6059,-11.977769),(26.643521,-11.985521),(26.662744,-11.996579),(26.679797,-12.009602),(26.697057,-12.017457),(26.717418,-12.013012),(26.732559,-11.998336),(26.744186,-11.98118),(26.759379,-11.968674),(26.785011,-11.968364),(26.831726,-11.973325),(26.874204,-11.964333),(26.912755,-11.942526),(26.947688,-11.909143),(26.967325,-11.870385),(26.971356,-11.78853),(26.981071,-11.749049),(26.996367,-11.727035),(27.011147,-11.713186),(27.021482,-11.69789),(27.023239,-11.671121),(27.010837,-11.62885),(27.010268,-11.609833),(27.023756,-11.59557),(27.032437,-11.59433),(27.054452,-11.597534),(27.064373,-11.59712),(27.102201,-11.584925),(27.144989,-11.581307),(27.173617,-11.570559),(27.180129,-11.569629),(27.197182,-11.59371),(27.20762,-11.639392),(27.211961,-11.688278),(27.209998,-11.721971),(27.234182,-11.809097),(27.420734,-11.921959),(27.467553,-12.001644),(27.47179,-12.041641),(27.52047,-12.179617),(27.536076,-12.200081),(27.589836,-12.242958),(27.595297,-12.247313),(27.638189,-12.293615),(27.666197,-12.30271),(27.710742,-12.306328),(27.756734,-12.304261),(27.788309,-12.296509),(27.807274,-12.28142),(27.818281,-12.267777),(27.831407,-12.259922),(27.856676,-12.262403),(27.877037,-12.269948),(27.933881,-12.303331),(27.948454,-12.321417),(27.952226,-12.346532),(27.958686,-12.367823),(27.98101,-12.374541),(27.998993,-12.37144),(28.014031,-12.37051),(28.08767,-12.377538),(28.096869,-12.383016),(28.100434,-12.391491),(28.10245,-12.401206),(28.106997,-12.410197),(28.131285,-12.429214),(28.145961,-12.423117),(28.160741,-12.408751),(28.185752,-12.402446),(28.204976,-12.410818),(28.220065,-12.42539),(28.237532,-12.437069),(28.263887,-12.436966),(28.283834,-12.434072),(28.303678,-12.435416),(28.322488,-12.4411),(28.339748,-12.450505),(28.42274,-12.521302),(28.436434,-12.542799),(28.455916,-12.592098),(28.468267,-12.614629),(28.502012,-12.649563),(28.512295,-12.668373),(28.511624,-12.694418),(28.500151,-12.710954),(28.483977,-12.72222),(28.474003,-12.736482),(28.480928,-12.762114),(28.501598,-12.788469),(28.523613,-12.810173),(28.539425,-12.833841),(28.542836,-12.885621),(28.553378,-12.894922),(28.568468,-12.895543),(28.583971,-12.888721),(28.593686,-12.876732),(28.608155,-12.847897),(28.621178,-12.839422),(28.667893,-12.849344),(28.707994,-12.889755),(28.77569,-12.976571),(28.793363,-12.991557),(28.800598,-13.002409),(28.809435,-13.038376),(28.813621,-13.04282),(28.827057,-13.047575),(28.830881,-13.051812),(28.83026,-13.056876),(28.825506,-13.067832),(28.8253,-13.072379),(28.826023,-13.076823),(28.824628,-13.087262),(28.825816,-13.092843),(28.829744,-13.097184),(28.835428,-13.098941),(28.840906,-13.100078),(28.844213,-13.102352),(28.85367,-13.137078),(28.86323,-13.142659),(28.882712,-13.143589),(28.891859,-13.14731),(28.903434,-13.162296),(28.93413,-13.309626),(28.950356,-13.350967),(28.980846,-13.380216),(28.993971,-13.395925),(29.010301,-13.399439),(29.028491,-13.395512),(29.046681,-13.388897),(29.065386,-13.388676),(29.072933,-13.388587),(29.098048,-13.38466),(29.122129,-13.38435),(29.144453,-13.394478),(29.153393,-13.406984),(29.160163,-13.422074),(29.168948,-13.433856),(29.184141,-13.436853),(29.194786,-13.430962),(29.21401,-13.408328),(29.227446,-13.400783),(29.250183,-13.391585),(29.308267,-13.353654),(29.449551,-13.300324),(29.470015,-13.287818),(29.527996,-13.234075),(29.551043,-13.224153),(29.574401,-13.225393),(29.592798,-13.235625),(29.609851,-13.249474),(29.629075,-13.261463),(29.641064,-13.262807),(29.649745,-13.259913),(29.657497,-13.26012),(29.666592,-13.271178),(29.669176,-13.281204),(29.667522,-13.291952),(29.663595,-13.301874),(29.658892,-13.309522),(29.651502,-13.314587),(29.633622,-13.318928),(29.626594,-13.326369),(29.625044,-13.334844),(29.627008,-13.354894),(29.625147,-13.364196),(29.618946,-13.367297),(29.609438,-13.369054),(29.601686,-13.374428),(29.601686,-13.388381),(29.60551,-13.399956),(29.610678,-13.411015),(29.617396,-13.421247),(29.626078,-13.429825),(29.641477,-13.438507),(29.663078,-13.446878),(29.702869,-13.457627),(29.767154,-13.458351),(29.782244,-13.455663),(29.797643,-13.424244),(29.797747,-13.31376),(29.797953,-13.164363),(29.798212,-13.02277),(29.79847,-12.873012),(29.798677,-12.698345),(29.798987,-12.54869),(29.799142,-12.382292),(29.7994,-12.265813),(29.799607,-12.159463),(29.799582,-12.159036),(29.799397,-12.15582),(29.799297,-12.154089),(29.756095,-12.157603),(29.734908,-12.164838),(29.701267,-12.189022),(29.648918,-12.212793),(29.631865,-12.215997),(29.621117,-12.21021),(29.603185,-12.192846),(29.590317,-12.188092),(29.576727,-12.188092),(29.56758,-12.191709),(29.553059,-12.205145),(29.533473,-12.216721),(29.489548,-12.2315),(29.474252,-12.242662),(29.467948,-12.255272),(29.455907,-12.294339),(29.451825,-12.3178),(29.448156,-12.326792),(29.446554,-12.33506),(29.450378,-12.342915),(29.480453,-12.380535),(29.49606,-12.386323),(29.511459,-12.387356),(29.523448,-12.392524),(29.528202,-12.410508),(29.524688,-12.429214),(29.514663,-12.44389),(29.499677,-12.453089),(29.480453,-12.454949),(29.473012,-12.452469),(29.468774,-12.448438),(29.46526,-12.444201),(29.459886,-12.441307),(29.453323,-12.44079),(29.439216,-12.44203),(29.432601,-12.441307),(29.405936,-12.431695),(29.364388,-12.409267),(29.356533,-12.407614),(29.316432,-12.406683),(29.304857,-12.404823),(29.295503,-12.400999),(29.283049,-12.390457),(29.265066,-12.370923),(29.254989,-12.366169),(29.173392,-12.367616),(29.148949,-12.373714),(29.128123,-12.382809),(29.11107,-12.393454),(29.100218,-12.374024),(29.084405,-12.376401),(29.067249,-12.384773),(29.052779,-12.383842),(29.042651,-12.378778),(29.035106,-12.378882),(29.030352,-12.376194),(29.028595,-12.363069),(29.026114,-12.353043),(28.944672,-12.206076),(28.918731,-12.174346),(28.859509,-12.14179),(28.850414,-12.130008),(28.84597,-12.111301),(28.835015,-12.092181),(28.821475,-12.075748),(28.808866,-12.064585),(28.773623,-12.045879),(28.759877,-12.035233),(28.754193,-12.020144),(28.751092,-11.992238),(28.741997,-11.98428),(28.707064,-11.989448),(28.686032,-11.984074),(28.636887,-11.957615),(28.623865,-11.947797),(28.606191,-11.91028),(28.592652,-11.900461),(28.569191,-11.91369),(28.566091,-11.904492),(28.554205,-11.885062),(28.549451,-11.879584),(28.540562,-11.872039),(28.531571,-11.866458),(28.521132,-11.865735),(28.507851,-11.872763),(28.497154,-11.857363),(28.488886,-11.808684),(28.476794,-11.798245),(28.460671,-11.793388),(28.452506,-11.780779),(28.442687,-11.711635),(28.439587,-11.701507),(28.425117,-11.688071),(28.418399,-11.678873),(28.42212,-11.674738),(28.42274,-11.664713),(28.40548,-11.605182),(28.399589,-11.596087),(28.384913,-11.581307),(28.37742,-11.571076),(28.365586,-11.54162),(28.360315,-11.533558),(28.355664,-11.518159),(28.354424,-11.464725),(28.357008,-11.446949),(28.408581,-11.372431),(28.411991,-11.368401),(28.434212,-11.351244),(28.439587,-11.348247),(28.43199,-11.31104),(28.436176,-11.289129),(28.445581,-11.274556),(28.45509,-11.263704),(28.473693,-11.22567),(28.472453,-11.191977),(28.473693,-11.181229),(28.476225,-11.175441),(28.484752,-11.162832),(28.487336,-11.153427),(28.486922,-11.140921),(28.476174,-11.087694),(28.476794,-11.077979),(28.490953,-11.058652),(28.504079,-11.034364),(28.507851,-11.023615),(28.508626,-11.013487),(28.506663,-10.992093),(28.507851,-10.982068),(28.513794,-10.972869),(28.531364,-10.955092),(28.535085,-10.944447),(28.537358,-10.934112),(28.547177,-10.913751),(28.549451,-10.902899),(28.549451,-10.858561),(28.554412,-10.834996),(28.563507,-10.811949),(28.576529,-10.790658),(28.593479,-10.772881),(28.60092,-10.763166),(28.608052,-10.741359),(28.623245,-10.716864),(28.627585,-10.711696),(28.633477,-10.708906),(28.646189,-10.709836),(28.651873,-10.708389),(28.665878,-10.697434),(28.681536,-10.681931),(28.694351,-10.663327),(28.699622,-10.643174),(28.694248,-10.636766),(28.67089,-10.619092),(28.665516,-10.608964),(28.66717,-10.597388),(28.672699,-10.576098),(28.672337,-10.564315),(28.648049,-10.53765),(28.634924,-10.51946),(28.634717,-10.505714),(28.638748,-10.496206),(28.630479,-10.481013),(28.634717,-10.471608),(28.640608,-10.462616),(28.644535,-10.451041),(28.646086,-10.438431),(28.644949,-10.426546),(28.637714,-10.407012),(28.628619,-10.391096),(28.620868,-10.373319),(28.617767,-10.348308),(28.620713,-10.327327),(28.626449,-10.311411),(28.629239,-10.295908),(28.623865,-10.276374),(28.622108,-10.275857),(28.613323,-10.27069),(28.610842,-10.268829),(28.608052,-10.263558),(28.605985,-10.252913),(28.604021,-10.248366),(28.569915,-10.219633),(28.57932,-10.201133),(28.604021,-10.172711),(28.619627,-10.141912),(28.628516,-10.102741),(28.631255,-10.023056),(28.623865,-9.951019),(28.627947,-9.929419),(28.658695,-9.864823),(28.668462,-9.821622),(28.678073,-9.803845),(28.696522,-9.796507),(28.698486,-9.791959),(28.672337,-9.765501),(28.66996,-9.750928),(28.663656,-9.745037),(28.654974,-9.741937),(28.644949,-9.735115),(28.631255,-9.715582),(28.625157,-9.695634),(28.623865,-9.649126),(28.621798,-9.638274),(28.612909,-9.6175),(28.610842,-9.607888),(28.606502,-9.594349),(28.587588,-9.573161),(28.583557,-9.563756),(28.588621,-9.558279),(28.611101,-9.551044),(28.617767,-9.543292),(28.586296,-9.544016),(28.5741,-9.539158),(28.569191,-9.525929),(28.568726,-9.508979),(28.566866,-9.495957),(28.562783,-9.484898),(28.5556,-9.474459),(28.531571,-9.456889),(28.519685,-9.445624),(28.514724,-9.430018),(28.516274,-9.415548),(28.518135,-9.397461),(28.515964,-9.378341),(28.495397,-9.353226),(28.460464,-9.335036),(28.411371,-9.324908),(28.368532,-9.308578),(28.35246,-9.271991),(28.372304,-9.235094),(28.415092,-9.207085),(28.506198,-9.164401),(28.59906,-9.096395),(28.765407,-8.934027),(28.893099,-8.765769),(28.930461,-8.679883),(28.935474,-8.590792),(28.892789,-8.501909),(28.889172,-8.483099),(28.915268,-8.472867),(29.035106,-8.45478),(29.208119,-8.428528),(29.365938,-8.40455),(29.575844,-8.372729),(29.592281,-8.370237),(29.858105,-8.329826),(30.123618,-8.289519),(30.32495,-8.258926),(30.581781,-8.219962),(30.752107,-8.194124),(30.778255,-8.289105),(30.828278,-8.388117),(30.891892,-8.479171),(30.959536,-8.550485),(30.992351,-8.57591),(31.03364,-8.600301),(31.077824,-8.61632),(31.119836,-8.616631)]
+Zimbabwe	[(30.010654,-15.646227),(30.050238,-15.640129),(30.090029,-15.629381),(30.130129,-15.623696),(30.16992,-15.632171),(30.195552,-15.649121),(30.207231,-15.653152),(30.223147,-15.649741),(30.231002,-15.644677),(30.246091,-15.632068),(30.254876,-15.628864),(30.280094,-15.632275),(30.296196,-15.639042),(30.32805,-15.652428),(30.356679,-15.651498),(30.396263,-15.635995),(30.39771,-15.716817),(30.39926,-15.812005),(30.401327,-15.931688),(30.402568,-16.001244),(30.514809,-16.000418),(30.586587,-16.000004),(30.74973,-15.998867),(30.857424,-15.998144),(30.901865,-16.007136),(30.942173,-16.034524),(30.958296,-16.05106),(30.973075,-16.062016),(30.989767,-16.06429),(31.012039,-16.054885),(31.023718,-16.045169),(31.042218,-16.024912),(31.056895,-16.017574),(31.065421,-16.019641),(31.073328,-16.025532),(31.080872,-16.025946),(31.089037,-16.01189),(31.1141,-15.996904),(31.15849,-16.000211),(31.259983,-16.023465),(31.278897,-16.030287),(31.29533,-16.041655),(31.309592,-16.059019),(31.328351,-16.092815),(31.340908,-16.106664),(31.360339,-16.116896),(31.37026,-16.123718),(31.374601,-16.132916),(31.377754,-16.142218),(31.384006,-16.148832),(31.387727,-16.149556),(31.395582,-16.147695),(31.399613,-16.147282),(31.404315,-16.149866),(31.404057,-16.154517),(31.402713,-16.159374),(31.404574,-16.162268),(31.424107,-16.164749),(31.445708,-16.164955),(31.465655,-16.167746),(31.480641,-16.177978),(31.519192,-16.196478),(31.686107,-16.207227),(31.710705,-16.217872),(31.738197,-16.239783),(31.798761,-16.303655),(31.818088,-16.319571),(31.86005,-16.340759),(31.871935,-16.35037),(31.88072,-16.368044),(31.88563,-16.406284),(31.894363,-16.421477),(31.910279,-16.428919),(32.014149,-16.444938),(32.211759,-16.440184),(32.290463,-16.45176),(32.393661,-16.491757),(32.5521,-16.553355),(32.671783,-16.599761),(32.6831,-16.609889),(32.687906,-16.624255),(32.68863,-16.647303),(32.698655,-16.686784),(32.725217,-16.706421),(32.73095,-16.708656),(32.731314,-16.708798),(32.739893,-16.703217),(32.753845,-16.697946),(32.769348,-16.695466),(32.800664,-16.697326),(32.862004,-16.710452),(32.893372,-16.712415),(32.909598,-16.708075),(32.93957,-16.689781),(32.95621,-16.683063),(32.968509,-16.681616),(32.961585,-16.710348),(32.933369,-16.815768),(32.916213,-16.847911),(32.900503,-16.867755),(32.828776,-16.935141),(32.83012,-16.941549),(32.886757,-17.038184),(32.928512,-17.109497),(32.954143,-17.167168),(32.967786,-17.22887),(32.96909,-17.266115),(32.969439,-17.276102),(32.973212,-17.297909),(32.983599,-17.317753),(32.992384,-17.324678),(33.014656,-17.336667),(33.021633,-17.345555),(33.022459,-17.361471),(33.016258,-17.377181),(33.011651,-17.383991),(32.997448,-17.404983),(32.958174,-17.478467),(32.951663,-17.486218),(32.942981,-17.491593),(32.936573,-17.498311),(32.936676,-17.509369),(32.947218,-17.543166),(32.951663,-17.551434),(32.969129,-17.56456),(33.006646,-17.580993),(33.020392,-17.598563),(33.024526,-17.619233),(33.020599,-17.638457),(33.004063,-17.675561),(33.000238,-17.713905),(33.003184,-17.757726),(32.999102,-17.794313),(32.973573,-17.810643),(32.957037,-17.817981),(32.946082,-17.834724),(32.939674,-17.855498),(32.936883,-17.875032),(32.938433,-17.894566),(32.950267,-17.922574),(32.952128,-17.940247),(32.948149,-17.95327),(32.940397,-17.959988),(32.932439,-17.964949),(32.927375,-17.972907),(32.928977,-17.982312),(32.941224,-17.996265),(32.940294,-18.004843),(32.934919,-18.024583),(32.93709,-18.047114),(32.972282,-18.150261),(32.975537,-18.183333),(32.974865,-18.190775),(32.965925,-18.212169),(32.958174,-18.225398),(32.952283,-18.233046),(32.950526,-18.241314),(32.95497,-18.256301),(32.970163,-18.277488),(33.016878,-18.313661),(33.034965,-18.332885),(33.042768,-18.352005),(33.038066,-18.363064),(33.00923,-18.383941),(32.988198,-18.41319),(32.985356,-18.412467),(32.986803,-18.422285),(32.999515,-18.436651),(33.003029,-18.446883),(32.996414,-18.46714),(32.978586,-18.48006),(32.956624,-18.489878),(32.937142,-18.50104),(32.919313,-18.510032),(32.900296,-18.515303),(32.88314,-18.522124),(32.870737,-18.535767),(32.868257,-18.552613),(32.871668,-18.57318),(32.884483,-18.609044),(32.914559,-18.665888),(32.92231,-18.693173),(32.920243,-18.726246),(32.913267,-18.753014),(32.902518,-18.774512),(32.885207,-18.787844),(32.858852,-18.790015),(32.817924,-18.787018),(32.787642,-18.791255),(32.69142,-18.83425),(32.68987,-18.843241),(32.696794,-18.897192),(32.703202,-18.911868),(32.71576,-18.919826),(32.705063,-18.927474),(32.692247,-18.934295),(32.682532,-18.942667),(32.681085,-18.954966),(32.68863,-18.97729),(32.690283,-18.988246),(32.68863,-19.000958),(32.691058,-19.01429),(32.698965,-19.022249),(32.710282,-19.025969),(32.723873,-19.026589),(32.785988,-19.017701),(32.803351,-19.019561),(32.814203,-19.023799),(32.819991,-19.028346),(32.822988,-19.035168),(32.825262,-19.046847),(32.830223,-19.059146),(32.83813,-19.066897),(32.847483,-19.073925),(32.855906,-19.083744),(32.862262,-19.118057),(32.83322,-19.241977),(32.832187,-19.266678),(32.828673,-19.284558),(32.820715,-19.301301),(32.806142,-19.323419),(32.768831,-19.363623),(32.766454,-19.373442),(32.768521,-19.402794),(32.762217,-19.443412),(32.763354,-19.463979),(32.773947,-19.475864),(32.793119,-19.476691),(32.811309,-19.474521),(32.825365,-19.479172),(32.832187,-19.500876),(32.832497,-19.519273),(32.825365,-19.59162),(32.825675,-19.600818),(32.828156,-19.610636),(32.829603,-19.623659),(32.825365,-19.633271),(32.819474,-19.641952),(32.81627,-19.652081),(32.819629,-19.674302),(32.83105,-19.685154),(32.849137,-19.689081),(32.872184,-19.690218),(32.894715,-19.684327),(32.924584,-19.655285),(32.943188,-19.64929),(32.960964,-19.658799),(32.962411,-19.679056),(32.954143,-19.717813),(32.962411,-19.735383),(32.979051,-19.751403),(33.0006,-19.764322),(33.022769,-19.773107),(33.032795,-19.784166),(33.029642,-19.80339),(33.022873,-19.826851),(33.021322,-19.868088),(33.001995,-19.927),(32.998378,-20.000897),(33.004373,-20.024255),(33.007266,-20.032006),(32.95373,-20.030249),(32.940087,-20.041515),(32.934299,-20.072107),(32.926548,-20.086473),(32.910683,-20.091124),(32.894405,-20.094018),(32.88531,-20.10301),(32.877869,-20.151689),(32.872908,-20.167192),(32.859265,-20.190859),(32.857095,-20.200575),(32.858335,-20.207499),(32.865053,-20.220935),(32.86557,-20.228893),(32.858438,-20.259486),(32.852961,-20.273852),(32.845209,-20.286668),(32.800767,-20.338551),(32.735862,-20.414205),(32.704443,-20.471773),(32.671783,-20.531821),(32.646462,-20.557969),(32.603674,-20.56479),(32.556545,-20.559312),(32.513136,-20.564583),(32.481614,-20.603031),(32.471072,-20.645509),(32.469108,-20.68685),(32.483474,-20.794233),(32.49722,-20.898103),(32.491019,-20.936344),(32.467661,-20.980165),(32.417122,-21.040937),(32.339814,-21.134058),(32.345343,-21.142843),(32.359864,-21.151421),(32.368856,-21.162997),(32.373352,-21.163617),(32.377744,-21.16341),(32.380638,-21.165477),(32.380535,-21.172195),(32.376866,-21.178499),(32.37299,-21.183977),(32.37175,-21.187905),(32.444613,-21.304693),(32.445849,-21.308994),(32.447197,-21.313685),(32.408543,-21.290327),(32.37299,-21.327948),(32.324517,-21.378177),(32.272221,-21.432541),(32.219718,-21.486904),(32.167318,-21.541268),(32.114814,-21.595632),(32.062415,-21.649995),(32.010015,-21.704462),(31.957615,-21.758826),(31.905215,-21.813189),(31.852712,-21.867553),(31.800312,-21.92202),(31.747808,-21.976384),(31.695512,-22.030747),(31.643112,-22.085214),(31.590712,-22.139578),(31.538209,-22.193941),(31.485809,-22.248305),(31.433822,-22.302048),(31.36871,-22.345043),(31.288922,-22.39734),(31.265616,-22.365507),(31.255642,-22.357962),(31.24572,-22.357549),(31.229597,-22.363957),(31.221536,-22.364887),(31.213474,-22.36189),(31.197868,-22.352588),(31.190685,-22.350624),(31.183657,-22.34556),(31.163348,-22.322616),(31.152599,-22.316414),(31.137717,-22.318482),(31.10454,-22.333364),(31.097048,-22.334922),(31.087642,-22.336878),(31.07033,-22.333674),(31.036121,-22.319618),(30.927187,-22.295744),(30.867087,-22.289646),(30.83789,-22.282308),(30.805282,-22.294504),(30.693919,-22.302772),(30.674282,-22.30856),(30.647411,-22.32644),(30.632424,-22.330677),(30.625551,-22.32861),(30.610307,-22.318688),(30.601108,-22.316414),(30.57217,-22.316621),(30.507367,-22.309593),(30.488454,-22.310213),(30.46923,-22.315071),(30.431713,-22.331194),(30.412696,-22.336878),(30.372078,-22.343493),(30.334975,-22.344733),(30.300765,-22.336982),(30.269346,-22.316414),(30.25529,-22.304736),(30.240407,-22.296157),(30.2217,-22.290886),(30.196999,-22.289129),(30.15266,-22.294814),(30.13509,-22.293574),(30.111113,-22.282308),(30.082587,-22.262878),(30.067911,-22.25709),(30.038145,-22.253783),(30.035872,-22.250579),(30.034528,-22.246135),(30.015511,-22.227014),(30.005279,-22.22226),(29.983782,-22.217713),(29.973963,-22.213992),(29.946678,-22.198282),(29.932105,-22.194355),(29.896035,-22.191358),(29.871489,-22.179265),(29.837331,-22.172444),(29.779246,-22.136374),(29.758886,-22.130896),(29.691448,-22.1341),(29.679614,-22.138338),(29.661424,-22.126452),(29.641064,-22.129242),(29.60396,-22.145055),(29.570164,-22.141955),(29.551043,-22.145986),(29.542517,-22.162522),(29.53182,-22.172444),(29.506912,-22.170067),(29.456889,-22.158801),(29.436115,-22.163142),(29.399528,-22.182159),(29.378031,-22.192908),(29.363251,-22.192288),(29.356947,-22.190944),(29.350074,-22.186707),(29.273644,-22.125108),(29.26734,-22.115807),(29.259588,-22.096066),(29.254111,-22.087074),(29.244395,-22.075706),(29.239331,-22.072605),(29.144867,-22.075292),(29.10797,-22.069194),(29.070763,-22.051004),(29.040532,-22.020929),(29.021567,-21.982791),(29.013815,-21.940417),(29.017949,-21.898145),(29.028905,-21.876648),(29.045441,-21.852567),(29.057637,-21.829209),(29.05526,-21.809985),(29.038723,-21.797893),(28.998726,-21.786008),(28.980846,-21.774845),(28.951907,-21.768334),(28.891032,-21.764924),(28.860853,-21.757379),(28.714195,-21.693507),(28.66841,-21.679968),(28.629704,-21.651339),(28.6157,-21.647101),(28.585934,-21.644414),(28.553998,-21.636559),(28.542939,-21.638316),(28.532501,-21.643071),(28.497309,-21.651546),(28.481393,-21.657437),(28.464598,-21.660331),(28.443101,-21.655783),(28.361762,-21.616302),(28.321919,-21.603486),(28.284867,-21.596872),(28.165702,-21.595218),(28.090771,-21.581266),(28.032893,-21.577855),(28.016563,-21.572894),(28.002559,-21.564212),(27.990415,-21.551913),(27.984731,-21.542922),(27.975739,-21.522561),(27.970571,-21.514396),(27.963698,-21.510469),(27.958066,-21.511502),(27.953208,-21.510469),(27.949281,-21.500754),(27.954448,-21.487835),(27.950418,-21.482047),(27.943338,-21.479876),(27.939876,-21.478016),(27.941943,-21.468508),(27.949642,-21.456519),(27.953001,-21.448664),(27.950211,-21.438329),(27.920549,-21.381174),(27.904219,-21.364741),(27.897811,-21.35544),(27.896157,-21.347895),(27.896674,-21.332392),(27.8944,-21.32433),(27.884995,-21.310171),(27.849132,-21.269657),(27.823604,-21.231726),(27.793838,-21.197413),(27.724385,-21.149664),(27.709192,-21.134471),(27.674775,-21.090133),(27.666611,-21.071219),(27.666817,-21.053753),(27.678961,-21.000733),(27.680356,-20.979649),(27.672657,-20.923528),(27.672605,-20.913709),(27.675085,-20.891282),(27.674775,-20.879913),(27.676016,-20.866684),(27.681803,-20.857589),(27.689038,-20.849011),(27.694412,-20.837745),(27.709605,-20.756716),(27.707332,-20.716719),(27.682475,-20.637344),(27.690382,-20.60148),(27.702629,-20.566134),(27.705575,-20.526653),(27.698133,-20.509083),(27.683767,-20.49606),(27.66599,-20.489136),(27.625786,-20.488619),(27.590853,-20.473323),(27.534112,-20.483038),(27.45391,-20.473323),(27.340739,-20.473013),(27.306012,-20.477354),(27.268392,-20.49575),(27.283998,-20.35147),(27.266015,-20.234164),(27.214907,-20.110451),(27.201781,-20.092984),(27.183746,-20.082339),(27.16292,-20.076551),(27.141888,-20.073347),(27.129692,-20.072934),(27.119771,-20.073864),(27.109642,-20.073244),(27.097343,-20.068903),(27.086491,-20.060532),(27.069231,-20.03738),(27.060136,-20.027562),(27.02665,-20.010095),(26.9943,-20.006788),(26.961072,-20.007201),(26.925054,-20.000897),(26.811882,-19.94643),(26.774469,-19.939815),(26.750801,-19.939609),(26.730957,-19.935888),(26.713904,-19.927413),(26.698608,-19.91253),(26.684758,-19.894547),(26.67717,-19.886815),(26.673803,-19.883385),(26.659437,-19.875737),(26.614065,-19.863438),(26.595565,-19.855583),(26.581922,-19.842147),(26.574791,-19.819513),(26.566316,-19.800806),(26.549263,-19.784063),(26.508852,-19.759258),(26.489731,-19.75192),(26.450251,-19.743342),(26.431854,-19.73652),(26.412837,-19.71957),(26.385242,-19.679056),(26.362711,-19.667584),(26.332325,-19.662416),(26.324367,-19.659109),(26.312171,-19.651358),(26.312481,-19.649601),(26.319096,-19.646293),(26.326331,-19.633891),(26.333462,-19.613014),(26.330981,-19.604952),(26.32106,-19.592033),(26.313205,-19.584178),(26.30349,-19.577254),(26.292638,-19.572499),(26.239101,-19.571466),(26.194452,-19.5602),(26.155488,-19.537153),(26.13027,-19.501082),(26.034359,-19.243734),(26.011414,-19.199809),(25.981132,-19.161775),(25.956534,-19.122088),(25.948576,-19.103277),(25.944855,-19.079196),(25.948059,-19.058732),(25.964389,-19.021629),(25.9678,-19.000958),(25.967449,-18.999925),(25.940721,-18.921273),(25.815251,-18.813993),(25.779491,-18.738752),(25.773393,-18.665578),(25.761921,-18.630335),(25.736909,-18.608734),(25.698255,-18.590234),(25.669523,-18.566049),(25.622084,-18.501143),(25.608442,-18.487708),(25.574439,-18.465693),(25.508499,-18.399134),(25.49558,-18.378877),(25.490516,-18.365545),(25.481163,-18.323377),(25.473204,-18.303429),(25.440855,-18.2532),(25.408816,-18.175995),(25.387525,-18.138995),(25.357449,-18.115844),(25.323446,-18.09662),(25.296368,-18.068612),(25.255026,-18.001122),(25.226088,-17.931876),(25.21937,-17.908001),(25.21937,-17.879786),(25.259781,-17.794107),(25.266705,-17.800928),(25.285412,-17.809299),(25.315901,-17.83214),(25.335538,-17.841235),(25.345254,-17.842579),(25.376466,-17.841235),(25.409539,-17.853018),(25.420288,-17.854878),(25.49558,-17.854878),(25.500748,-17.856015),(25.510153,-17.861183),(25.516458,-17.862319),(25.522142,-17.860149),(25.530927,-17.850951),(25.536818,-17.848677),(25.603997,-17.836171),(25.657017,-17.81395),(25.681409,-17.81147),(25.694224,-17.819428),(25.70642,-17.829867),(25.743834,-17.839375),(25.765951,-17.849814),(25.786002,-17.862216),(25.794683,-17.872655),(25.804399,-17.888158),(25.849667,-17.906658),(25.86362,-17.923814),(25.847497,-17.929395),(25.846153,-17.943658),(25.853491,-17.959988),(25.86362,-17.971563),(25.924495,-17.998952),(25.966973,-18.000502),(25.978548,-17.998952),(26.033739,-17.971563),(26.04056,-17.978488),(26.046554,-17.966292),(26.062471,-17.962882),(26.081178,-17.962365),(26.095234,-17.958541),(26.096164,-17.954614),(26.0942,-17.941901),(26.095234,-17.938077),(26.101228,-17.935803),(26.118591,-17.931566),(26.135438,-17.922574),(26.158589,-17.918337),(26.167477,-17.913582),(26.203031,-17.887227),(26.211919,-17.882783),(26.221117,-17.886297),(26.228249,-17.894669),(26.233933,-17.903971),(26.239204,-17.910172),(26.248299,-17.913376),(26.294291,-17.918543),(26.3038,-17.922781),(26.311965,-17.928362),(26.318269,-17.934356),(26.325504,-17.93601),(26.362711,-17.930636),(26.408599,-17.939007),(26.485494,-17.979315),(26.527145,-17.992027),(26.553604,-17.996471),(26.570243,-18.002879),(26.583369,-18.013215),(26.598872,-18.029958),(26.612721,-18.041223),(26.628844,-18.049181),(26.685689,-18.066751),(26.700003,-18.069232),(26.71194,-18.065821),(26.740569,-18.0405),(26.753591,-18.032955),(26.769714,-18.029028),(26.794002,-18.026237),(26.88826,-17.984586),(26.912031,-17.992027),(26.94867,-17.968876),(26.95916,-17.964742),(27.006289,-17.962675),(27.021275,-17.958541),(27.048457,-17.944278),(27.078171,-17.916993),(27.11543,-17.882163),(27.149019,-17.842476),(27.146539,-17.818911),(27.145299,-17.794107),(27.146952,-17.783875),(27.157081,-17.769302),(27.422078,-17.504822),(27.524294,-17.415112),(27.577314,-17.363125),(27.604495,-17.312792),(27.624856,-17.233314),(27.641186,-17.198484),(27.777301,-17.001183),(27.816886,-16.959636),(27.868562,-16.929663),(28.022993,-16.865393),(28.113922,-16.827551),(28.21252,-16.748589),(28.280113,-16.706524),(28.643295,-16.568755),(28.690734,-16.56028),(28.718794,-16.56028),(28.73285,-16.55811),(28.741377,-16.550668),(28.761117,-16.532271),(28.769282,-16.515218),(28.808866,-16.486279),(28.822509,-16.470776),(28.829124,-16.434603),(28.833051,-16.426438),(28.857236,-16.388198),(28.857029,-16.36546),(28.840492,-16.323602),(28.836772,-16.306342),(28.840286,-16.284741),(28.86416,-16.231205),(28.847107,-16.202679),(28.852481,-16.162785),(28.8654,-16.121237),(28.870981,-16.087234),(28.868501,-16.08217),(28.86385,-16.076589),(28.859303,-16.069561),(28.857236,-16.060466),(28.860336,-16.049407),(28.874082,-16.028943),(28.877183,-16.022018),(28.898887,-15.995457),(28.932373,-15.963727),(28.946862,-15.957235),(28.951287,-15.955252),(28.972784,-15.951428),(29.018053,-15.950602),(29.042341,-15.946261),(29.055053,-15.934375),(29.076344,-15.895411),(29.086162,-15.884559),(29.102182,-15.870916),(29.121716,-15.859341),(29.141869,-15.854483),(29.150964,-15.848799),(29.186311,-15.812832),(29.406969,-15.714233),(29.422059,-15.71103),(29.508462,-15.703588),(29.526239,-15.692839),(29.563446,-15.662144),(29.587217,-15.655736),(29.608559,-15.658423),(29.62799,-15.663591),(29.648505,-15.666588),(29.672793,-15.663281),(29.73005,-15.644677),(29.773252,-15.638062),(29.814283,-15.619666),(29.837331,-15.614808),(29.881773,-15.618839),(29.967504,-15.641473),(30.010654,-15.646227)]
diff --git a/tests/queries/0_stateless/00825_protobuf_format_array_3dim.proto b/tests/queries/0_stateless/format_schemas/00825_protobuf_format_array_3dim.proto
similarity index 100%
rename from tests/queries/0_stateless/00825_protobuf_format_array_3dim.proto
rename to tests/queries/0_stateless/format_schemas/00825_protobuf_format_array_3dim.proto
diff --git a/tests/queries/0_stateless/00825_protobuf_format_array_of_arrays.proto b/tests/queries/0_stateless/format_schemas/00825_protobuf_format_array_of_arrays.proto
similarity index 100%
rename from tests/queries/0_stateless/00825_protobuf_format_array_of_arrays.proto
rename to tests/queries/0_stateless/format_schemas/00825_protobuf_format_array_of_arrays.proto
diff --git a/tests/queries/0_stateless/00825_protobuf_format_enum_mapping.proto b/tests/queries/0_stateless/format_schemas/00825_protobuf_format_enum_mapping.proto
similarity index 100%
rename from tests/queries/0_stateless/00825_protobuf_format_enum_mapping.proto
rename to tests/queries/0_stateless/format_schemas/00825_protobuf_format_enum_mapping.proto
diff --git a/tests/queries/0_stateless/00825_protobuf_format_map.proto b/tests/queries/0_stateless/format_schemas/00825_protobuf_format_map.proto
similarity index 100%
rename from tests/queries/0_stateless/00825_protobuf_format_map.proto
rename to tests/queries/0_stateless/format_schemas/00825_protobuf_format_map.proto
diff --git a/tests/queries/0_stateless/format_schemas/00825_protobuf_format_nested_in_nested.proto b/tests/queries/0_stateless/format_schemas/00825_protobuf_format_nested_in_nested.proto
new file mode 100644
index 00000000000..f9617572f94
--- /dev/null
+++ b/tests/queries/0_stateless/format_schemas/00825_protobuf_format_nested_in_nested.proto
@@ -0,0 +1,11 @@
+syntax = "proto3";
+
+message MessageType {
+  message XType {
+    message YType {
+      int32 z=3;
+    };
+    repeated YType y=2;
+  };
+  repeated XType x=1;
+};
\ No newline at end of file
diff --git a/tests/queries/0_stateless/00825_protobuf_format_nested_optional.proto b/tests/queries/0_stateless/format_schemas/00825_protobuf_format_nested_optional.proto
similarity index 100%
rename from tests/queries/0_stateless/00825_protobuf_format_nested_optional.proto
rename to tests/queries/0_stateless/format_schemas/00825_protobuf_format_nested_optional.proto
diff --git a/tests/queries/0_stateless/format_schemas/00825_protobuf_format_no_length_delimiter.proto b/tests/queries/0_stateless/format_schemas/00825_protobuf_format_no_length_delimiter.proto
new file mode 100644
index 00000000000..9726d0dede1
--- /dev/null
+++ b/tests/queries/0_stateless/format_schemas/00825_protobuf_format_no_length_delimiter.proto
@@ -0,0 +1,6 @@
+syntax = "proto3";
+
+message Message {
+  int32 x = 1;
+  string str = 2;
+};
diff --git a/tests/queries/0_stateless/00825_protobuf_format.proto b/tests/queries/0_stateless/format_schemas/00825_protobuf_format_persons.proto
similarity index 97%
rename from tests/queries/0_stateless/00825_protobuf_format.proto
rename to tests/queries/0_stateless/format_schemas/00825_protobuf_format_persons.proto
index 0d9bdd83ccd..b588619f488 100644
--- a/tests/queries/0_stateless/00825_protobuf_format.proto
+++ b/tests/queries/0_stateless/format_schemas/00825_protobuf_format_persons.proto
@@ -143,9 +143,3 @@ message StrPerson {
   MeasureUnits measureUnits = 21;
   NestinessA nestiness_a = 22;
 };
-
-message NumberAndSquare
-{
-  uint32 number = 1;
-  uint64 square = 2;
-};
diff --git a/tests/queries/0_stateless/00825_protobuf_format_syntax2.proto b/tests/queries/0_stateless/format_schemas/00825_protobuf_format_persons_syntax2.proto
similarity index 100%
rename from tests/queries/0_stateless/00825_protobuf_format_syntax2.proto
rename to tests/queries/0_stateless/format_schemas/00825_protobuf_format_persons_syntax2.proto
diff --git a/tests/queries/0_stateless/format_schemas/00825_protobuf_format_squares.proto b/tests/queries/0_stateless/format_schemas/00825_protobuf_format_squares.proto
new file mode 100644
index 00000000000..bca321568f3
--- /dev/null
+++ b/tests/queries/0_stateless/format_schemas/00825_protobuf_format_squares.proto
@@ -0,0 +1,6 @@
+syntax = "proto3";
+
+message NumberAndSquare {
+  uint32 number = 1;
+  uint64 square = 2;
+};
diff --git a/tests/queries/0_stateless/format_schemas/00825_protobuf_format_syntax2.proto b/tests/queries/0_stateless/format_schemas/00825_protobuf_format_syntax2.proto
new file mode 100644
index 00000000000..d4abea38d4e
--- /dev/null
+++ b/tests/queries/0_stateless/format_schemas/00825_protobuf_format_syntax2.proto
@@ -0,0 +1,63 @@
+syntax = "proto2";
+
+message Syntax2Person {
+  enum Gender {
+    female = 0;
+    male = 1;
+  };
+
+  enum ZodiacSign {
+    aries = 0;
+    taurus = 1;
+    gemini = 2;
+    cancer = 3;
+    leo = 4;
+    virgo = 5;
+    libra = 6;
+    scorpius = 7;
+    sagittarius = 8;
+    capricorn = 9;
+    aquarius = 10;
+    pisces = 11;
+  };
+
+  required string uuid = 1;
+  required string name = 2;
+  required string surname = 3;
+  required Gender gender = 4;
+  required uint32 birthDate = 5;
+  optional bytes photo = 6;
+  optional string phoneNumber = 7;
+  optional bool isOnline = 8;
+  optional fixed32 visitTime = 9;
+  optional uint32 age = 10;
+  optional ZodiacSign zodiacSign = 11;
+  repeated string songs = 12;
+  repeated uint32 color = 13;
+  optional string hometown = 14 [default='Moscow'];
+  repeated float location = 15 [packed=true];
+  optional double pi = 16;
+  optional double lotteryWin = 17;
+  optional float someRatio = 18;
+  optional float temperature = 19;
+  optional sint64 randomBigNumber = 20;
+  optional group MeasureUnits = 21 {
+    repeated float coef = 1;
+    repeated string unit = 2;
+  };
+  optional group Nestiness = 22
+  {
+    optional group A = 1 {
+      message SubB {
+        optional group C = 1 {
+          optional uint32 d = 1;
+          repeated uint32 e = 2;
+        };
+      };
+      optional SubB b = 100;
+    };
+  };
+  optional string newFieldStr = 23 [default='abc'];
+  optional int32 newFieldInt = 24 [default=-11];
+  optional bool newBool = 25 [default=true];
+};
diff --git a/tests/queries/0_stateless/00825_protobuf_format_table_default.proto b/tests/queries/0_stateless/format_schemas/00825_protobuf_format_table_default.proto
similarity index 100%
rename from tests/queries/0_stateless/00825_protobuf_format_table_default.proto
rename to tests/queries/0_stateless/format_schemas/00825_protobuf_format_table_default.proto
diff --git a/tests/queries/0_stateless/helpers/httpechoserver.py b/tests/queries/0_stateless/helpers/httpechoserver.py
deleted file mode 100644
index a1176c5e72d..00000000000
--- a/tests/queries/0_stateless/helpers/httpechoserver.py
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/usr/bin/env python3
-
-import sys
-import os
-import time
-import subprocess
-import threading
-from io import StringIO, SEEK_END
-from http.server import BaseHTTPRequestHandler, HTTPServer
-
-CLICKHOUSE_HOST = os.environ.get('CLICKHOUSE_HOST', '127.0.0.1')
-CLICKHOUSE_PORT_HTTP = os.environ.get('CLICKHOUSE_PORT_HTTP', '8123')
-
-# IP-address of this host accessible from outside world.
-HTTP_SERVER_HOST = os.environ.get('HTTP_SERVER_HOST', subprocess.check_output(['hostname', '-i']).decode('utf-8').strip())
-HTTP_SERVER_PORT = int(os.environ.get('CLICKHOUSE_TEST_HOST_EXPOSED_PORT', 51234))
-
-# IP address and port of the HTTP server started from this script.
-HTTP_SERVER_ADDRESS = (HTTP_SERVER_HOST, HTTP_SERVER_PORT)
-HTTP_SERVER_URL_STR = 'http://' + ':'.join(str(s) for s in HTTP_SERVER_ADDRESS) + "/"
-
-ostream = StringIO()
-istream = sys.stdout
-
-class EchoCSVHTTPServer(BaseHTTPRequestHandler):
-    def _set_headers(self):
-        self.send_response(200)
-        self.send_header('Content-type', 'text/plain')
-        self.end_headers()
-
-    def do_GET(self):
-        self._set_headers()
-        with open(CSV_DATA, 'r') as fl:
-            ostream.seek(0)
-            for row in ostream:
-                self.wfile.write(row + '\n')
-        return
-
-    def read_chunk(self):
-        msg = ''
-        while True:
-            sym = self.rfile.read(1)
-            if sym == '':
-                break
-            msg += sym.decode('utf-8')
-            if msg.endswith('\r\n'):
-                break
-        length = int(msg[:-2], 16)
-        if length == 0:
-            return ''
-        content = self.rfile.read(length)
-        self.rfile.read(2) # read sep \r\n
-        return content.decode('utf-8')
-
-    def do_POST(self):
-        while True:
-            chunk = self.read_chunk()
-            if not chunk:
-                break
-            istream.write(chunk)
-            istream.flush()
-        text = ""
-        self._set_headers()
-        self.wfile.write("ok")
-
-    def log_message(self, format, *args):
-        return
-
-def start_server(requests_amount, test_data="Hello,2,-2,7.7\nWorld,2,-5,8.8"):
-    ostream = StringIO(test_data.decode("utf-8"))
-
-    httpd = HTTPServer(HTTP_SERVER_ADDRESS, EchoCSVHTTPServer)
-
-    def real_func():
-        for i in range(requests_amount):
-            httpd.handle_request()
-
-    t = threading.Thread(target=real_func)
-    return t
-
-def run(requests_amount=1):
-    t = start_server(requests_amount)
-    t.start()
-    t.join()
-
-if __name__ == "__main__":
-    exception_text = ''
-    for i in range(1, 5):
-        try:
-            run(int(sys.argv[1]) if len(sys.argv) > 1 else 1)
-            break
-        except Exception as ex:
-            exception_text = str(ex)
-            time.sleep(1)
-
-    if exception_text:
-        print("Exception: {}".format(exception_text), file=sys.stderr)
-        os._exit(1)
-
diff --git a/tests/queries/0_stateless/helpers/protobuf_length_delimited_encoder.py b/tests/queries/0_stateless/helpers/protobuf_length_delimited_encoder.py
index 3ed42f1c820..86c5048c8a3 100755
--- a/tests/queries/0_stateless/helpers/protobuf_length_delimited_encoder.py
+++ b/tests/queries/0_stateless/helpers/protobuf_length_delimited_encoder.py
@@ -12,18 +12,18 @@ import tempfile
 
 def read_varint(input):
     res = 0
-    shift = 0
+    multiplier = 1
     while True:
         c = input.read(1)
         if len(c) == 0:
             return None
         b = c[0]
         if b < 0x80:
-            res += b << shift
+            res += b * multiplier
             break
         b -= 0x80
-        res += b << shift
-        shift = shift << 7
+        res += b * multiplier
+        multiplier *= 0x80
     return res
 
 def write_varint(output, value):
diff --git a/tests/queries/1_stateful/00159_parallel_formatting_http.reference b/tests/queries/1_stateful/00159_parallel_formatting_http.reference
index 499a0b8a7c7..8eabf5d4f03 100644
--- a/tests/queries/1_stateful/00159_parallel_formatting_http.reference
+++ b/tests/queries/1_stateful/00159_parallel_formatting_http.reference
@@ -1,12 +1,12 @@
 TSV, false
-8a984bbbfb127c430f67173f5371c6cb  -
+6e4ce4996dd0e036d27cb0d2166c8e59  -
 TSV, true
-8a984bbbfb127c430f67173f5371c6cb  -
+6e4ce4996dd0e036d27cb0d2166c8e59  -
 CSV, false
-ea1c740f03f5dcc43a3044528ad0a98f  -
+ab6b3616f31e8a952c802ca92562e418  -
 CSV, true
-ea1c740f03f5dcc43a3044528ad0a98f  -
+ab6b3616f31e8a952c802ca92562e418  -
 JSONCompactEachRow, false
-ba1081a754a06ef6563840b2d8d4d327  -
+1651b540b43bd6c62446f4c340bf13c7  -
 JSONCompactEachRow, true
-ba1081a754a06ef6563840b2d8d4d327  -
+1651b540b43bd6c62446f4c340bf13c7  -
diff --git a/tests/queries/1_stateful/00159_parallel_formatting_http.sh b/tests/queries/1_stateful/00159_parallel_formatting_http.sh
index 8fd8c15b7c7..a4e68de6a3f 100755
--- a/tests/queries/1_stateful/00159_parallel_formatting_http.sh
+++ b/tests/queries/1_stateful/00159_parallel_formatting_http.sh
@@ -10,8 +10,8 @@ FORMATS=('TSV' 'CSV' 'JSONCompactEachRow')
 for format in "${FORMATS[@]}"
 do
     echo "$format, false";
-    ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&query=SELECT+ClientEventTime+as+a,MobilePhoneModel+as+b,ClientIP6+as+c+FROM+test.hits+ORDER+BY+a,b,c+Format+$format&output_format_parallel_formatting=false" -d' ' | md5sum
+    ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&query=SELECT+ClientEventTime+as+a,MobilePhoneModel+as+b,ClientIP6+as+c+FROM+test.hits+ORDER+BY+a,b,c+LIMIT+1000000+Format+$format&output_format_parallel_formatting=false" -d' ' | md5sum
 
     echo "$format, true";
-    ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&query=SELECT+ClientEventTime+as+a,MobilePhoneModel+as+b,ClientIP6+as+c+FROM+test.hits+ORDER+BY+a,b,c+Format+$format&output_format_parallel_formatting=true" -d' ' | md5sum
+    ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&query=SELECT+ClientEventTime+as+a,MobilePhoneModel+as+b,ClientIP6+as+c+FROM+test.hits+ORDER+BY+a,b,c+LIMIT+1000000+Format+$format&output_format_parallel_formatting=true" -d' ' | md5sum
 done
diff --git a/tests/queries/1_stateful/00161_parallel_parsing_with_names.reference b/tests/queries/1_stateful/00161_parallel_parsing_with_names.reference
new file mode 100644
index 00000000000..fb0ba75c148
--- /dev/null
+++ b/tests/queries/1_stateful/00161_parallel_parsing_with_names.reference
@@ -0,0 +1,8 @@
+TSVWithNames, false
+29caf86494f169d6339f6c5610b20731  -
+TSVWithNames, true
+29caf86494f169d6339f6c5610b20731  -
+CSVWithNames, false
+29caf86494f169d6339f6c5610b20731  -
+CSVWithNames, true
+29caf86494f169d6339f6c5610b20731  -
diff --git a/tests/queries/1_stateful/00161_parallel_parsing_with_names.sh b/tests/queries/1_stateful/00161_parallel_parsing_with_names.sh
new file mode 100755
index 00000000000..ca9984900e1
--- /dev/null
+++ b/tests/queries/1_stateful/00161_parallel_parsing_with_names.sh
@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+FORMATS=('TSVWithNames' 'CSVWithNames')
+$CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS parsing_with_names"
+
+for format in "${FORMATS[@]}"
+do
+    # Columns are permuted
+    $CLICKHOUSE_CLIENT -q "CREATE TABLE parsing_with_names(c FixedString(16), a DateTime,  b String) ENGINE=Memory()"
+    
+    echo "$format, false";
+    $CLICKHOUSE_CLIENT --output_format_parallel_formatting=false -q \
+    "SELECT URLRegions as d, ClientEventTime as a, MobilePhoneModel as b, ParamPrice as e, ClientIP6 as c FROM test.hits LIMIT 50000 Format $format" | \
+    $CLICKHOUSE_CLIENT --input_format_skip_unknown_fields=1 --input_format_parallel_parsing=false -q "INSERT INTO parsing_with_names FORMAT $format"
+
+    $CLICKHOUSE_CLIENT -q "SELECT * FROM parsing_with_names;" | md5sum
+    $CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS parsing_with_names"
+
+    
+    $CLICKHOUSE_CLIENT -q "CREATE TABLE parsing_with_names(c FixedString(16), a DateTime,  b String) ENGINE=Memory()"
+    echo "$format, true";
+    $CLICKHOUSE_CLIENT --output_format_parallel_formatting=false -q \
+    "SELECT URLRegions as d, ClientEventTime as a, MobilePhoneModel as b, ParamPrice as e, ClientIP6 as c FROM test.hits LIMIT 50000 Format $format" | \
+    $CLICKHOUSE_CLIENT --input_format_skip_unknown_fields=1 --input_format_parallel_parsing=true -q "INSERT INTO parsing_with_names FORMAT $format"
+
+    $CLICKHOUSE_CLIENT -q "SELECT * FROM parsing_with_names;" | md5sum
+    $CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS parsing_with_names"
+done
\ No newline at end of file
diff --git a/tests/queries/1_stateful/00162_mmap_compression_none.reference b/tests/queries/1_stateful/00162_mmap_compression_none.reference
new file mode 100644
index 00000000000..3495cc537c1
--- /dev/null
+++ b/tests/queries/1_stateful/00162_mmap_compression_none.reference
@@ -0,0 +1 @@
+687074654
diff --git a/tests/queries/1_stateful/00162_mmap_compression_none.sql b/tests/queries/1_stateful/00162_mmap_compression_none.sql
new file mode 100644
index 00000000000..2178644214a
--- /dev/null
+++ b/tests/queries/1_stateful/00162_mmap_compression_none.sql
@@ -0,0 +1,8 @@
+DROP TABLE IF EXISTS hits_none;
+CREATE TABLE hits_none (Title String CODEC(NONE)) ENGINE = MergeTree ORDER BY tuple();
+INSERT INTO hits_none SELECT Title FROM test.hits;
+
+SET min_bytes_to_use_mmap_io = 1;
+SELECT sum(length(Title)) FROM hits_none;
+
+DROP TABLE hits_none;
diff --git a/tests/queries/1_stateful/00163_column_oriented_formats.reference b/tests/queries/1_stateful/00163_column_oriented_formats.reference
new file mode 100644
index 00000000000..cb20aca4392
--- /dev/null
+++ b/tests/queries/1_stateful/00163_column_oriented_formats.reference
@@ -0,0 +1,12 @@
+Parquet
+6b397d4643bc1f920f3eb8aa87ee180c  -
+7fe6d8c57ddc5fe37bbdcb7f73c5fa78  -
+d8746733270cbeff7ab3550c9b944fb6  -
+Arrow
+6b397d4643bc1f920f3eb8aa87ee180c  -
+7fe6d8c57ddc5fe37bbdcb7f73c5fa78  -
+d8746733270cbeff7ab3550c9b944fb6  -
+ORC
+6b397d4643bc1f920f3eb8aa87ee180c  -
+7fe6d8c57ddc5fe37bbdcb7f73c5fa78  -
+d8746733270cbeff7ab3550c9b944fb6  -
diff --git a/tests/queries/1_stateful/00163_column_oriented_formats.sh b/tests/queries/1_stateful/00163_column_oriented_formats.sh
new file mode 100755
index 00000000000..1363ccf3c00
--- /dev/null
+++ b/tests/queries/1_stateful/00163_column_oriented_formats.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+
+FORMATS=('Parquet' 'Arrow' 'ORC')
+
+for format in "${FORMATS[@]}"
+do
+    echo $format
+    $CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS 00163_column_oriented SYNC"
+    $CLICKHOUSE_CLIENT -q "CREATE TABLE 00163_column_oriented(ClientEventTime DateTime, MobilePhoneModel String, ClientIP6 FixedString(16)) ENGINE=File($format)"
+    $CLICKHOUSE_CLIENT -q "INSERT INTO 00163_column_oriented SELECT ClientEventTime, MobilePhoneModel, ClientIP6 FROM test.hits ORDER BY ClientEventTime, MobilePhoneModel, ClientIP6 LIMIT 100"
+    $CLICKHOUSE_CLIENT -q "SELECT ClientEventTime from 00163_column_oriented" | md5sum
+    $CLICKHOUSE_CLIENT -q "SELECT MobilePhoneModel from 00163_column_oriented" | md5sum
+    $CLICKHOUSE_CLIENT -q "SELECT ClientIP6 from 00163_column_oriented" | md5sum
+    $CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS 00163_column_oriented SYNC"
+done
diff --git a/tests/queries/query_test.py b/tests/queries/query_test.py
index 417a51fe523..6ebeccbeeac 100644
--- a/tests/queries/query_test.py
+++ b/tests/queries/query_test.py
@@ -1,5 +1,3 @@
-import pytest
-
 import difflib
 import os
 import random
@@ -7,6 +5,8 @@ import string
 import subprocess
 import sys
 
+import pytest
+
 
 SKIP_LIST = [
     # these couple of tests hangs everything
@@ -14,44 +14,63 @@ SKIP_LIST = [
     "00987_distributed_stack_overflow",
 
     # just fail
+    "00133_long_shard_memory_tracker_and_exception_safety",
     "00505_secure",
     "00505_shard_secure",
     "00646_url_engine",
     "00725_memory_tracking",  # BROKEN
+    "00738_lock_for_inner_table",
+    "00821_distributed_storage_with_join_on",
+    "00825_protobuf_format_array_3dim",
+    "00825_protobuf_format_array_of_arrays",
+    "00825_protobuf_format_enum_mapping",
+    "00825_protobuf_format_nested_in_nested",
+    "00825_protobuf_format_nested_optional",
+    "00825_protobuf_format_no_length_delimiter",
+    "00825_protobuf_format_persons",
+    "00825_protobuf_format_squares",
+    "00825_protobuf_format_table_default",
     "00834_cancel_http_readonly_queries_on_client_close",
+    "00877_memory_limit_for_new_delete",
+    "00900_parquet_load",
     "00933_test_fix_extra_seek_on_compressed_cache",
     "00965_logs_level_bugfix",
     "00965_send_logs_level_concurrent_queries",
+    "00974_query_profiler",
     "00990_hasToken",
     "00990_metric_log_table_not_empty",
     "01014_lazy_database_concurrent_recreate_reattach_and_show_tables",
+    "01017_uniqCombined_memory_usage",
     "01018_Distributed__shard_num",
-    "01018_ip_dictionary",
+    "01018_ip_dictionary_long",
+    "01035_lc_empty_part_bug",  # FLAKY
     "01050_clickhouse_dict_source_with_subquery",
     "01053_ssd_dictionary",
     "01054_cache_dictionary_overflow_cell",
     "01057_http_compression_prefer_brotli",
     "01080_check_for_error_incorrect_size_of_nested_column",
     "01083_expressions_in_engine_arguments",
-    # "01086_odbc_roundtrip",
+    "01086_odbc_roundtrip",
     "01088_benchmark_query_id",
+    "01092_memory_profiler",
     "01098_temporary_and_external_tables",
     "01099_parallel_distributed_insert_select",
     "01103_check_cpu_instructions_at_startup",
     "01114_database_atomic",
     "01148_zookeeper_path_macros_unfolding",
+    "01175_distributed_ddl_output_mode_long",
     "01181_db_atomic_drop_on_cluster",  # tcp port in reference
     "01280_ssd_complex_key_dictionary",
     "01293_client_interactive_vertical_multiline",  # expect-test
     "01293_client_interactive_vertical_singleline",  # expect-test
-    "01293_system_distribution_queue",  # FLAKY
     "01293_show_clusters",
-    "01294_lazy_database_concurrent_recreate_reattach_and_show_tables",
+    "01293_show_settings",
+    "01293_system_distribution_queue",  # FLAKY
+    "01294_lazy_database_concurrent_recreate_reattach_and_show_tables_long",
     "01294_system_distributed_on_cluster",
     "01300_client_save_history_when_terminated",  # expect-test
     "01304_direct_io",
     "01306_benchmark_json",
-    "01035_lc_empty_part_bug",  # FLAKY
     "01320_create_sync_race_condition_zookeeper",
     "01355_CSV_input_format_allow_errors",
     "01370_client_autocomplete_word_break_characters",  # expect-test
@@ -66,18 +85,33 @@ SKIP_LIST = [
     "01514_distributed_cancel_query_on_error",
     "01520_client_print_query_id",  # expect-test
     "01526_client_start_and_exit",  # expect-test
+    "01526_max_untracked_memory",
     "01527_dist_sharding_key_dictGet_reload",
+    "01528_play",
     "01545_url_file_format_settings",
     "01553_datetime64_comparison",
     "01555_system_distribution_queue_mask",
     "01558_ttest_scipy",
     "01561_mann_whitney_scipy",
     "01582_distinct_optimization",
+    "01591_window_functions",
     "01599_multiline_input_and_singleline_comments",  # expect-test
     "01601_custom_tld",
+    "01606_git_import",
     "01610_client_spawn_editor",  # expect-test
+    "01658_read_file_to_stringcolumn",
+    "01666_merge_tree_max_query_limit",
+    "01674_unicode_asan",
     "01676_clickhouse_client_autocomplete",  # expect-test (partially)
     "01683_text_log_deadlock",  # secure tcp
+    "01684_ssd_cache_dictionary_simple_key",
+    "01685_ssd_cache_dictionary_complex_key",
+    "01746_executable_pool_dictionary",
+    "01747_executable_pool_dictionary_implicit_key",
+    "01747_join_view_filter_dictionary",
+    "01748_dictionary_table_dot",
+    "01754_cluster_all_replicas_shard_num",
+    "01759_optimize_skip_unused_shards_zero_shards",
 ]
 
 
diff --git a/tests/queries/shell_config.sh b/tests/queries/shell_config.sh
index d20b5669cc5..ea7fa2e7921 100644
--- a/tests/queries/shell_config.sh
+++ b/tests/queries/shell_config.sh
@@ -5,6 +5,13 @@ export ASAN_OPTIONS=detect_odr_violation=0
 
 export CLICKHOUSE_DATABASE=${CLICKHOUSE_DATABASE:="test"}
 export CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL=${CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL:="warning"}
+
+# Unique zookeeper path (based on test name and current database) to avoid overlaps
+export CLICKHOUSE_TEST_PATH="${BASH_SOURCE[1]}"
+CLICKHOUSE_TEST_NAME="$(basename "$CLICKHOUSE_TEST_PATH" .sh)"
+export CLICKHOUSE_TEST_NAME
+export CLICKHOUSE_TEST_ZOOKEEPER_PREFIX="${CLICKHOUSE_TEST_NAME}_${CLICKHOUSE_DATABASE}"
+
 [ -v CLICKHOUSE_CONFIG_CLIENT ] && CLICKHOUSE_CLIENT_OPT0+=" --config-file=${CLICKHOUSE_CONFIG_CLIENT} "
 [ -v CLICKHOUSE_HOST ] && CLICKHOUSE_CLIENT_OPT0+=" --host=${CLICKHOUSE_HOST} "
 [ -v CLICKHOUSE_PORT_TCP ] && CLICKHOUSE_CLIENT_OPT0+=" --port=${CLICKHOUSE_PORT_TCP} "
@@ -16,14 +23,21 @@ export CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL=${CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL
 [ -v CLICKHOUSE_LOG_COMMENT ] && CLICKHOUSE_BENCHMARK_OPT0+=" --log_comment='${CLICKHOUSE_LOG_COMMENT}' "
 
 export CLICKHOUSE_BINARY=${CLICKHOUSE_BINARY:="clickhouse"}
+# client
 [ -x "$CLICKHOUSE_BINARY-client" ] && CLICKHOUSE_CLIENT_BINARY=${CLICKHOUSE_CLIENT_BINARY:=$CLICKHOUSE_BINARY-client}
 [ -x "$CLICKHOUSE_BINARY" ] && CLICKHOUSE_CLIENT_BINARY=${CLICKHOUSE_CLIENT_BINARY:=$CLICKHOUSE_BINARY client}
 export CLICKHOUSE_CLIENT_BINARY=${CLICKHOUSE_CLIENT_BINARY:=$CLICKHOUSE_BINARY-client}
 export CLICKHOUSE_CLIENT_OPT="${CLICKHOUSE_CLIENT_OPT0:-} ${CLICKHOUSE_CLIENT_OPT:-}"
 export CLICKHOUSE_CLIENT=${CLICKHOUSE_CLIENT:="$CLICKHOUSE_CLIENT_BINARY ${CLICKHOUSE_CLIENT_OPT:-}"}
+# local
 [ -x "${CLICKHOUSE_BINARY}-local" ] && CLICKHOUSE_LOCAL=${CLICKHOUSE_LOCAL:="${CLICKHOUSE_BINARY}-local"}
 [ -x "${CLICKHOUSE_BINARY}" ] && CLICKHOUSE_LOCAL=${CLICKHOUSE_LOCAL:="${CLICKHOUSE_BINARY} local"}
 export CLICKHOUSE_LOCAL=${CLICKHOUSE_LOCAL:="${CLICKHOUSE_BINARY}-local"}
+# server
+[ -x "${CLICKHOUSE_BINARY}-server" ] && CLICKHOUSE_SERVER_BINARY=${CLICKHOUSE_SERVER_BINARY:="${CLICKHOUSE_BINARY}-server"}
+[ -x "${CLICKHOUSE_BINARY}" ] && CLICKHOUSE_SERVER_BINARY=${CLICKHOUSE_SERVER_BINARY:="${CLICKHOUSE_BINARY} server"}
+export CLICKHOUSE_SERVER_BINARY=${CLICKHOUSE_SERVER_BINARY:="${CLICKHOUSE_BINARY}-server"}
+# others
 export CLICKHOUSE_OBFUSCATOR=${CLICKHOUSE_OBFUSCATOR:="${CLICKHOUSE_BINARY}-obfuscator"}
 export CLICKHOUSE_COMPRESSOR=${CLICKHOUSE_COMPRESSOR:="${CLICKHOUSE_BINARY}-compressor"}
 export CLICKHOUSE_BENCHMARK=${CLICKHOUSE_BENCHMARK:="${CLICKHOUSE_BINARY}-benchmark ${CLICKHOUSE_BENCHMARK_OPT0:-}"}
@@ -56,6 +70,8 @@ export CLICKHOUSE_PORT_HTTPS=${CLICKHOUSE_PORT_HTTPS:="8443"}
 export CLICKHOUSE_PORT_HTTP_PROTO=${CLICKHOUSE_PORT_HTTP_PROTO:="http"}
 export CLICKHOUSE_PORT_MYSQL=${CLICKHOUSE_PORT_MYSQL:=$(${CLICKHOUSE_EXTRACT_CONFIG} --try --key=mysql_port 2>/dev/null)} 2>/dev/null
 export CLICKHOUSE_PORT_MYSQL=${CLICKHOUSE_PORT_MYSQL:="9004"}
+export CLICKHOUSE_PORT_POSTGRESQL=${CLICKHOUSE_PORT_POSTGRESQL:=$(${CLICKHOUSE_EXTRACT_CONFIG} --try --key=postgresql_port 2>/dev/null)} 2>/dev/null
+export CLICKHOUSE_PORT_POSTGRESQL=${CLICKHOUSE_PORT_POSTGRESQL:="9005"}
 
 # Add database and log comment to url params
 if [ -v CLICKHOUSE_URL_PARAMS ]
diff --git a/tests/queries/skip_list.json b/tests/queries/skip_list.json
index 39ec8bac3cf..08a66c7499d 100644
--- a/tests/queries/skip_list.json
+++ b/tests/queries/skip_list.json
@@ -45,6 +45,7 @@
         "capnproto",
         "query_profiler",
         "memory_profiler",
+        "01175_distributed_ddl_output_mode_long",  /// issue 21600
         "01103_check_cpu_instructions_at_startup",
         "01086_odbc_roundtrip", /// can't pass because odbc libraries are not instrumented
         "00877_memory_limit_for_new_delete", /// memory limits don't work correctly under msan because it replaces malloc/free
@@ -95,7 +96,8 @@
         "01370_client_autocomplete_word_break_characters",
         "01676_clickhouse_client_autocomplete",
         "01193_metadata_loading",
-        "01455_time_zones"
+        "01455_time_zones",
+        "01755_client_highlight_multi_line_comment_regression"
     ],
     "release-build": [
     ],
@@ -103,164 +105,69 @@
         "00604_show_create_database",
         "00609_mv_index_in_in",
         "00510_materizlized_view_and_deduplication_zookeeper",
-        "00738_lock_for_inner_table"
+        "00738_lock_for_inner_table",
+        "01153_attach_mv_uuid"
     ],
     "database-replicated": [
-        /// Tests with DETACH TABLE (it's not allowed)
-        /// and tests with SET (session and query settings are not supported)
         "memory_tracking",
         "memory_usage",
         "live_view",
-        "01413_alter_update_supertype",
-        "01149_zookeeper_mutation_stuck_after_replace_partition",
-        "00836_indices_alter_replicated_zookeeper",
-        "00652_mutations_alter_update",
-        "01715_tuple_insert_null_as_default",
-        "00825_protobuf_format_map",
-        "00152_insert_different_granularity",
-        "01715_background_checker_blather_zookeeper",
-        "01714_alter_drop_version",
-        "01114_materialize_clear_index_compact_parts",
-        "00814_replicated_minimalistic_part_header_zookeeper",
-        "01188_attach_table_from_pat",
-        "01415_sticking_mutations",
-        "01130_in_memory_parts",
-        "01110_dictionary_layout_without_arguments",
-        "01018_ddl_dictionaries_create",
-        "01018_ddl_dictionaries_select",
-        "01414_freeze_does_not_prevent_alters",
-        "01018_ddl_dictionaries_bad_queries",
-        "01686_rocksdb",
-        "01550_mutation_subquery",
-        "01070_mutations_with_dependencies",
-        "01070_materialize_ttl",
-        "01055_compact_parts",
-        "01017_mutations_with_nondeterministic_functions_zookeeper",
-        "00926_adaptive_index_granularity_pk",
-        "00910_zookeeper_test_alter_compression_codecs",
-        "00908_bloom_filter_index",
-        "00616_final_single_part",
-        "00446_clear_column_in_partition_zookeeper",
-        "01533_multiple_nested",
-        "01213_alter_rename_column_zookeeper",
-        "01575_disable_detach_table_of_dictionary",
-        "01457_create_as_table_function_structure",
-        "01415_inconsistent_merge_tree_settings",
-        "01413_allow_non_metadata_alters",
-        "01378_alter_rename_with_ttl_zookeeper",
-        "01349_mutation_datetime_key",
-        "01325_freeze_mutation_stuck",
-        "01272_suspicious_codecs",
         "01181_db_atomic_drop_on_cluster",
-        "00957_delta_diff_bug",
-        "00910_zookeeper_custom_compression_codecs_replicated",
-        "00899_long_attach_memory_limit",
-        "00804_test_custom_compression_codes_log_storages",
-        "00804_test_alter_compression_codecs",
-        "00804_test_delta_codec_no_type_alter",
-        "00804_test_custom_compression_codecs",
-        "00753_alter_attach",
-        "00715_fetch_merged_or_mutated_part_zookeeper",
-        "00688_low_cardinality_serialization",
-        "01575_disable_detach_table_of_dictionary",
-        "00738_lock_for_inner_table",
-        "01666_blns",
-        "01652_ignore_and_low_cardinality",
-        "01651_map_functions",
-        "01650_fetch_patition_with_macro_in_zk_path",
-        "01648_mutations_and_escaping",
-        "01640_marks_corruption_regression",
-        "01622_byte_size",
-        "01611_string_to_low_cardinality_key_alter",
-        "01602_show_create_view",
-        "01600_log_queries_with_extensive_info",
-        "01560_ttl_remove_empty_parts",
-        "01554_bloom_filter_index_big_integer_uuid",
-        "01550_type_map_formats_input",
-        "01550_type_map_formats",
-        "01550_create_map_type",
-        "01532_primary_key_without_order_by_zookeeper",
-        "01511_alter_version_versioned_collapsing_merge_tree_zookeeper",
-        "01509_parallel_quorum_insert_no_replicas",
-        "01504_compression_multiple_streams",
-        "01494_storage_join_persistency",
-        "01493_storage_set_persistency",
-        "01493_alter_remove_properties_zookeeper",
-        "01475_read_subcolumns_storages",
-        "01475_read_subcolumns",
-        "01451_replicated_detach_drop_part",
-        "01451_detach_drop_part",
-        "01440_big_int_exotic_casts",
-        "01430_modify_sample_by_zookeeper",
-        "01417_freeze_partition_verbose_zookeeper",
-        "01417_freeze_partition_verbose",
-        "01396_inactive_replica_cleanup_nodes_zookeeper",
-        "01375_compact_parts_codecs",
-        "01357_version_collapsing_attach_detach_zookeeper",
-        "01355_alter_column_with_order",
-        "01291_geo_types",
-        "01270_optimize_skip_unused_shards_low_cardinality",
-        "01182_materialized_view_different_structure",
-        "01150_ddl_guard_rwr",
-        "01148_zookeeper_path_macros_unfolding",
-        "01135_default_and_alter_zookeeper",
-        "01130_in_memory_parts_partitons",
-        "01127_month_partitioning_consistency_select",
-        "01114_database_atomic",
-        "01083_expressions_in_engine_arguments",
-        "01073_attach_if_not_exists",
-        "01072_optimize_skip_unused_shards_const_expr_eval",
-        "01071_prohibition_secondary_index_with_old_format_merge_tree",
-        "01062_alter_on_mutataion_zookeeper",
-        "01060_shutdown_table_after_detach",
-        "01056_create_table_as",
-        "01035_avg",
-        "01021_only_tuple_columns",
-        "01019_alter_materialized_view_query",
-        "01019_alter_materialized_view_consistent",
-        "01019_alter_materialized_view_atomic",
-        "01015_attach_part",
-        "00989_parallel_parts_loading",
+        "01175_distributed_ddl_output_mode",
+        "01415_sticking_mutations",
         "00980_zookeeper_merge_tree_alter_settings",
-        "00980_merge_alter_settings",
+        "01148_zookeeper_path_macros_unfolding",
+        "01294_system_distributed_on_cluster",
+        "01269_create_with_null",
+        "01451_replicated_detach_drop_and_quorum",
+        "01188_attach_table_from_path",
+        "01149_zookeeper_mutation_stuck_after_replace_partition",
+        /// user_files
+        "01721_engine_file_truncate_on_insert",
+        /// Fails due to additional replicas or shards
+        "quorum",
+        "01650_drop_part_and_deduplication_zookeeper",
+        "01532_execute_merges_on_single_replica",
+        "00652_replicated_mutations_default_database_zookeeper",
+        "00620_optimize_on_nonleader_replica_zookeeper",
+        /// grep -c
+        "01018_ddl_dictionaries_bad_queries",
+        "00908_bloom_filter_index",
+        /// Unsupported type of ALTER query
+        "01650_fetch_patition_with_macro_in_zk_path",
+        "01451_detach_drop_part",
+        "01451_replicated_detach_drop_part",
+        "01417_freeze_partition_verbose",
+        "01417_freeze_partition_verbose_zookeeper",
+        "01130_in_memory_parts_partitons",
+        "01060_shutdown_table_after_detach",
+        "01021_only_tuple_columns",
+        "01015_attach_part",
         "00955_test_final_mark",
-        "00933_reserved_word",
-        "00926_zookeeper_adaptive_index_granularity_replicated_merge_tree",
-        "00926_adaptive_index_granularity_replacing_merge_tree",
-        "00926_adaptive_index_granularity_merge_tree",
-        "00925_zookeeper_empty_replicated_merge_tree_optimize_final",
-        "00800_low_cardinality_distinct_numeric",
-        "00754_alter_modify_order_by_replicated_zookeeper",
-        "00751_low_cardinality_nullable_group_by",
-        "00751_default_databasename_for_view",
-        "00719_parallel_ddl_table",
-        "00718_low_cardinaliry_alter",
-        "00717_low_cardinaliry_distributed_group_by",
-        "00688_low_cardinality_syntax",
-        "00688_low_cardinality_nullable_cast",
-        "00688_low_cardinality_in",
-        "00652_replicated_mutations_zookeeper",
-        "00634_rename_view",
+        "00753_alter_attach",
+        "00626_replace_partition_from_table_zookeeper",
         "00626_replace_partition_from_table",
-        "00625_arrays_in_nested",
+        "00152_insert_different_granularity",
+        "00054_merge_tree_partitions",
+        "01781_merge_tree_deduplication",
+        /// Old syntax is not allowed
+        "01062_alter_on_mutataion_zookeeper",
+        "00925_zookeeper_empty_replicated_merge_tree_optimize_final",
+        "00754_alter_modify_order_by_replicated_zookeeper",
+        "00652_replicated_mutations_zookeeper",
         "00623_replicated_truncate_table_zookeeper",
-        "00619_union_highlite",
-        "00599_create_view_with_subquery",
-        "00571_non_exist_database_when_create_materializ_view",
-        "00553_buff_exists_materlized_column",
         "00516_deduplication_after_drop_partition_zookeeper",
-        "00508_materialized_view_to",
         "00446_clear_column_in_partition_concurrent_zookeeper",
-        "00423_storage_log_single_thread",
-        "00311_array_primary_key",
         "00236_replicated_drop_on_non_leader_zookeeper",
         "00226_zookeeper_deduplication_and_unexpected_parts",
         "00215_primary_key_order_zookeeper",
-        "00180_attach_materialized_view",
         "00121_drop_column_zookeeper",
-        "00116_storage_set",
         "00083_create_merge_tree_zookeeper",
-        "00062_replicated_merge_tree_alter_zookeeper"
+        "00062_replicated_merge_tree_alter_zookeeper",
+        /// Does not support renaming of multiple tables in single query
+        "00634_rename_view",
+        "00140_rename",
+        "01783_http_chunk_size"
     ],
     "polymorphic-parts": [
         "01508_partition_pruning_long", /// bug, shoud be fixed
@@ -275,19 +182,23 @@
         "00534_functions_bad_arguments4",
         "00534_functions_bad_arguments9",
         "00564_temporary_table_management",
+        "00600_replace_running_query",
         "00626_replace_partition_from_table_zookeeper",
         "00652_replicated_mutations_zookeeper",
         "00687_top_and_offset",
         "00746_sql_fuzzy",
         "00763_create_query_as_table_engine_bug",
         "00765_sql_compatibility_aliases",
-        "00825_protobuf_format_input",
-        "00825_protobuf_format_nested_optional",
         "00825_protobuf_format_array_3dim",
-        "00825_protobuf_format_map",
         "00825_protobuf_format_array_of_arrays",
-        "00825_protobuf_format_table_default",
         "00825_protobuf_format_enum_mapping",
+        "00825_protobuf_format_map",
+        "00825_protobuf_format_nested_in_nested",
+        "00825_protobuf_format_nested_optional",
+        "00825_protobuf_format_no_length_delimiter",
+        "00825_protobuf_format_persons",
+        "00825_protobuf_format_squares",
+        "00825_protobuf_format_table_default",
         "00826_cross_to_inner_join",
         "00834_not_between",
         "00909_kill_not_initialized_query",
@@ -300,7 +211,7 @@
         "00954_client_prepared_statements",
         "00956_sensitive_data_masking",
         "00969_columns_clause",
-        "00975_indices_mutation_replicated_zookeeper",
+        "00975_indices_mutation_replicated_zookeeper_long",
         "00975_values_list",
         "00976_system_stop_ttl_merges",
         "00977_int_div",
@@ -389,7 +300,7 @@
         "01293_pretty_max_value_width",
         "01293_show_settings",
         "01294_create_settings_profile",
-        "01294_lazy_database_concurrent_recreate_reattach_and_show_tables",
+        "01294_lazy_database_concurrent_recreate_reattach_and_show_tables_long",
         "01295_create_row_policy",
         "01296_create_row_policy_in_current_database",
         "01297_create_quota",
@@ -435,8 +346,8 @@
         "01504_compression_multiple_streams",
         "01508_explain_header",
         "01508_partition_pruning_long",
-        "01509_check_parallel_quorum_inserts",
-        "01509_parallel_quorum_and_merge",
+        "01509_check_parallel_quorum_inserts_long",
+        "01509_parallel_quorum_and_merge_long",
         "01515_mv_and_array_join_optimisation_bag",
         "01516_create_table_primary_key",
         "01517_drop_mv_with_inner_table",
@@ -480,7 +391,10 @@
         "01655_plan_optimizations",
         "01475_read_subcolumns_storages",
         "01674_clickhouse_client_query_param_cte",
-        "01666_merge_tree_max_query_limit"
+        "01666_merge_tree_max_query_limit",
+        "01786_explain_merge_tree",
+        "01666_merge_tree_max_query_limit",
+        "01802_test_postgresql_protocol_with_row_policy" /// It cannot parse DROP ROW POLICY
     ],
     "parallel":
     [
@@ -515,6 +429,7 @@
         "00571_non_exist_database_when_create_materializ_view",
         "00575_illegal_column_exception_when_drop_depen_column",
         "00599_create_view_with_subquery",
+        "00600_replace_running_query",
         "00604_show_create_database",
         "00612_http_max_query_size",
         "00619_union_highlite",
@@ -566,12 +481,14 @@
         "00933_test_fix_extra_seek_on_compressed_cache",
         "00933_ttl_replicated_zookeeper",
         "00933_ttl_with_default",
+        "00950_dict_get",
         "00955_test_final_mark",
         "00976_ttl_with_old_parts",
         "00980_merge_alter_settings",
         "00980_zookeeper_merge_tree_alter_settings",
         "00988_constraints_replication_zookeeper",
         "00989_parallel_parts_loading",
+        "00992_system_parts_race_condition_zookeeper_long",
         "00993_system_parts_race_condition_drop_zookeeper",
         "01012_show_tables_limit",
         "01013_sync_replica_timeout_zookeeper",
@@ -584,7 +501,7 @@
         "01018_ddl_dictionaries_select",
         "01018_ddl_dictionaries_special",
         "01018_dictionaries_from_dictionaries",
-        "01018_ip_dictionary",
+        "01018_ip_dictionary_long",
         "01021_only_tuple_columns",
         "01023_materialized_view_query_context",
         "01031_mutations_interpreter_and_context",
@@ -644,6 +561,8 @@
         "01135_default_and_alter_zookeeper",
         "01148_zookeeper_path_macros_unfolding",
         "01150_ddl_guard_rwr",
+        "01153_attach_mv_uuid",
+        "01152_cross_replication",
         "01185_create_or_replace_table",
         "01190_full_attach_syntax",
         "01191_rename_dictionary",
@@ -673,7 +592,7 @@
         "01281_unsucceeded_insert_select_queries_counter",
         "01293_system_distribution_queue",
         "01294_lazy_database_concurrent",
-        "01294_lazy_database_concurrent_recreate_reattach_and_show_tables",
+        "01294_lazy_database_concurrent_recreate_reattach_and_show_tables_long",
         "01294_system_distributed_on_cluster",
         "01296_create_row_policy_in_current_database",
         "01297_create_quota",
@@ -728,6 +647,9 @@
         "01530_drop_database_atomic_sync",
         "01541_max_memory_usage_for_user_long",
         "01542_dictionary_load_exception_race",
+        "01545_system_errors", // looks at the difference of values in system.errors
+        "01560_optimize_on_insert_zookeeper",
+        "01563_distributed_query_finish", // looks at system.errors which is global
         "01575_disable_detach_table_of_dictionary",
         "01593_concurrent_alter_mutations_kill",
         "01593_concurrent_alter_mutations_kill_many_replicas",
@@ -738,12 +660,30 @@
         "01601_detach_permanently",
         "01602_show_create_view",
         "01603_rename_overwrite_bug",
+        "01666_blns",
         "01646_system_restart_replicas_smoke", // system restart replicas is a global query
         "01656_test_query_log_factories_info",
+        "01658_read_file_to_stringcolumn",
         "01669_columns_declaration_serde",
         "01676_dictget_in_default_expression",
+        "01681_cache_dictionary_simple_key",
+        "01682_cache_dictionary_complex_key",
+        "01683_flat_dictionary",
+        "01684_ssd_cache_dictionary_simple_key",
+        "01685_ssd_cache_dictionary_complex_key",
         "01700_system_zookeeper_path_in",
+        "01702_system_query_log", // It's ok to execute in parallel with oter tests but not several instances of the same test.
+        "01702_system_query_log", // Runs many global system queries
         "01715_background_checker_blather_zookeeper",
+        "01721_engine_file_truncate_on_insert", // It's ok to execute in parallel but not several instances of the same test.
+        "01722_long_brotli_http_compression_json_format", // It is broken in some unimaginable way with the genius error 'cannot write to ofstream'. Not sure how to debug this
+        "01747_alter_partition_key_enum_zookeeper",
+        "01748_dictionary_table_dot", // creates database
+        "01760_polygon_dictionaries",
+        "01760_system_dictionaries",
+        "01761_alter_decimal_zookeeper",
+        "01360_materialized_view_with_join_on_query_log", // creates and drops MVs on query_log, which may interrupt flushes.
+        "01509_parallel_quorum_insert_no_replicas", // It's ok to execute in parallel with oter tests but not several instances of the same test.
         "attach",
         "ddl_dictionaries",
         "dictionary",
@@ -753,6 +693,22 @@
         "memory_limit",
         "polygon_dicts", // they use an explicitly specified database
         "01658_read_file_to_stringcolumn",
-        "01721_engine_file_truncate_on_insert" // It's ok to execute in parallel but not several instances of the same test.
+        "01721_engine_file_truncate_on_insert", // It's ok to execute in parallel but not several instances of the same test.
+        "01702_system_query_log", // It's ok to execute in parallel with oter tests but not several instances of the same test.
+        "01748_dictionary_table_dot", // creates database
+        "00950_dict_get",
+        "01683_flat_dictionary",
+        "01681_cache_dictionary_simple_key",
+        "01682_cache_dictionary_complex_key",
+        "01684_ssd_cache_dictionary_simple_key",
+        "01685_ssd_cache_dictionary_complex_key",
+        "01737_clickhouse_server_wait_server_pool_long", // This test is fully compatible to run in parallel, however under ASAN processes are pretty heavy and may fail under flaky adress check.
+        "01760_system_dictionaries",
+        "01760_polygon_dictionaries",
+        "01778_hierarchical_dictionaries",
+        "01780_clickhouse_dictionary_source_loop",
+        "01785_dictionary_element_count",
+        "01802_test_postgresql_protocol_with_row_policy", /// Creates database and users
+        "01804_dictionary_decimal256_type"
     ]
 }
diff --git a/tests/server-test.xml b/tests/server-test.xml
index 0b5e8f760a8..dd21d55c78c 100644
--- a/tests/server-test.xml
+++ b/tests/server-test.xml
@@ -140,4 +140,4 @@
             <replace>[hidden]</replace>
         </rule>
     </query_masking_rules>
-</yandex>
\ No newline at end of file
+</yandex>
diff --git a/tests/testflows/aes_encryption/configs/clickhouse/config.xml b/tests/testflows/aes_encryption/configs/clickhouse/config.xml
index d34d2c35253..beeeafa5704 100644
--- a/tests/testflows/aes_encryption/configs/clickhouse/config.xml
+++ b/tests/testflows/aes_encryption/configs/clickhouse/config.xml
@@ -406,7 +406,7 @@
             </retention>
             <retention>
                 <age>86400</age>
-                <precision>60</precision>
+                <precision>7200</precision>
             </retention>
         </pattern>
         <default>
diff --git a/tests/testflows/aes_encryption/docker-compose/zookeeper-service.yml b/tests/testflows/aes_encryption/docker-compose/zookeeper-service.yml
index f3df33358be..f27405b97a2 100644
--- a/tests/testflows/aes_encryption/docker-compose/zookeeper-service.yml
+++ b/tests/testflows/aes_encryption/docker-compose/zookeeper-service.yml
@@ -2,7 +2,7 @@ version: '2.3'
 
 services:
   zookeeper:
-    image: zookeeper:3.4.12
+    image: zookeeper:3.6.2
     expose:
       - "2181"
     environment:
diff --git a/tests/testflows/example/configs/clickhouse/config.xml b/tests/testflows/example/configs/clickhouse/config.xml
index d34d2c35253..beeeafa5704 100644
--- a/tests/testflows/example/configs/clickhouse/config.xml
+++ b/tests/testflows/example/configs/clickhouse/config.xml
@@ -406,7 +406,7 @@
             </retention>
             <retention>
                 <age>86400</age>
-                <precision>60</precision>
+                <precision>7200</precision>
             </retention>
         </pattern>
         <default>
diff --git a/tests/testflows/example/docker-compose/zookeeper-service.yml b/tests/testflows/example/docker-compose/zookeeper-service.yml
index 6691a2df31c..ca732a48dbd 100644
--- a/tests/testflows/example/docker-compose/zookeeper-service.yml
+++ b/tests/testflows/example/docker-compose/zookeeper-service.yml
@@ -2,7 +2,7 @@ version: '2.3'
 
 services:
   zookeeper:
-    image: zookeeper:3.4.12
+    image: zookeeper:3.6.2
     expose:
       - "2181"
     environment:
diff --git a/tests/testflows/helpers/cluster.py b/tests/testflows/helpers/cluster.py
index 5e8717e7a8e..cc676134024 100755
--- a/tests/testflows/helpers/cluster.py
+++ b/tests/testflows/helpers/cluster.py
@@ -26,7 +26,7 @@ class Node(object):
     def repr(self):
         return f"Node(name='{self.name}')"
 
-    def restart(self, timeout=300, retries=5):
+    def restart(self, timeout=300, retries=5, safe=True):
         """Restart node.
         """
         with self.cluster.lock:
@@ -48,7 +48,7 @@ class Node(object):
             if r.exitcode == 0:
                 break
 
-    def stop(self, timeout=300, retries=5):
+    def stop(self, timeout=300, retries=5, safe=True):
         """Stop node.
         """
         with self.cluster.lock:
@@ -65,6 +65,44 @@ class Node(object):
     def command(self, *args, **kwargs):
         return self.cluster.command(self.name, *args, **kwargs)
 
+    def cmd(self, cmd, message=None, exitcode=None, steps=True, shell_command="bash --noediting", no_checks=False,
+            raise_on_exception=False, step=By, *args, **kwargs):
+        """Execute and check command.
+        :param cmd: command
+        :param message: expected message that should be in the output, default: None
+        :param exitcode: expected exitcode, default: None
+        """
+
+        command = f"{cmd}"
+        with Step("executing command", description=command, format_description=False) if steps else NullStep():
+            try:
+                r = self.cluster.bash(self.name, command=shell_command)(command, *args, **kwargs)
+            except ExpectTimeoutError:
+                self.cluster.close_bash(self.name)
+                raise
+
+        if no_checks:
+            return r
+
+        if exitcode is not None:
+            with Then(f"exitcode should be {exitcode}") if steps else NullStep():
+                assert r.exitcode == exitcode, error(r.output)
+
+        if message is not None:
+            with Then(f"output should contain message", description=message) if steps else NullStep():
+                assert message in r.output, error(r.output)
+
+        if message is None or "Exception:" not in message:
+            with Then("check if output has exception") if steps else NullStep():
+                if "Exception:" in r.output:
+                    if raise_on_exception:
+                        raise QueryRuntimeException(r.output)
+                    assert False, error(r.output)
+
+        return r
+
+
+
 class ClickHouseNode(Node):
     """Node with ClickHouse server.
     """
@@ -163,7 +201,7 @@ class ClickHouseNode(Node):
                     echo -e \"{sql[:100]}...\" > {query.name}
                     {command}
                 """
-                with step("executing command", description=description, format_description=False) if steps else NullStep():
+                with Step("executing command", description=description, format_description=False) if steps else NullStep():
                     try:
                         r = self.cluster.bash(None)(command, *args, **kwargs)
                     except ExpectTimeoutError:
@@ -173,7 +211,7 @@ class ClickHouseNode(Node):
             for setting in settings:
                 name, value = setting
                 command += f" --{name} \"{value}\""
-            with step("executing command", description=command, format_description=False) if steps else NullStep():
+            with Step("executing command", description=command, format_description=False) if steps else NullStep():
                 try:
                     r = self.cluster.bash(self.name)(command, *args, **kwargs)
                 except ExpectTimeoutError:
@@ -227,7 +265,7 @@ class Cluster(object):
                 self.configs_dir = caller_configs_dir
 
         if not os.path.exists(self.configs_dir):
-            raise TypeError("configs directory '{self.configs_dir}' does not exist")
+            raise TypeError(f"configs directory '{self.configs_dir}' does not exist")
 
         # auto set docker-compose project directory
         if docker_compose_project_dir is None:
@@ -256,7 +294,7 @@ class Cluster(object):
         shell.timeout = timeout
         return shell
 
-    def bash(self, node, timeout=300):
+    def bash(self, node, timeout=300, command="bash --noediting"):
         """Returns thread-local bash terminal
         to a specific node.
         :param node: name of the service
@@ -278,7 +316,7 @@ class Cluster(object):
                     self._bash[id] = Shell().__enter__()
                 else:
                     self._bash[id] = Shell(command=[
-                        "/bin/bash", "--noediting", "-c", f"{self.docker_compose} exec {node} bash --noediting"
+                        "/bin/bash", "--noediting", "-c", f"{self.docker_compose} exec {node} {command}"
                     ], name=node).__enter__()
 
                 self._bash[id].timeout = timeout
diff --git a/tests/testflows/kerberos/configs/clickhouse/common.xml b/tests/testflows/kerberos/configs/clickhouse/common.xml
new file mode 100644
index 00000000000..df952b28c82
--- /dev/null
+++ b/tests/testflows/kerberos/configs/clickhouse/common.xml
@@ -0,0 +1,6 @@
+<yandex>
+    <timezone>Europe/Moscow</timezone>
+    <listen_host replace="replace">0.0.0.0</listen_host>
+    <path>/var/lib/clickhouse/</path>
+    <tmp_path>/var/lib/clickhouse/tmp/</tmp_path>
+</yandex>
diff --git a/tests/testflows/kerberos/configs/clickhouse/config.d/logs.xml b/tests/testflows/kerberos/configs/clickhouse/config.d/logs.xml
new file mode 100644
index 00000000000..bdf1bbc11c1
--- /dev/null
+++ b/tests/testflows/kerberos/configs/clickhouse/config.d/logs.xml
@@ -0,0 +1,17 @@
+<yandex>
+    <shutdown_wait_unfinished>3</shutdown_wait_unfinished>
+    <logger>
+        <level>trace</level>
+        <log>/var/log/clickhouse-server/log.log</log>
+        <errorlog>/var/log/clickhouse-server/log.err.log</errorlog>
+        <size>1000M</size>
+        <count>10</count>
+        <stderr>/var/log/clickhouse-server/stderr.log</stderr>
+        <stdout>/var/log/clickhouse-server/stdout.log</stdout>
+    </logger>
+    <part_log>
+        <database>system</database>
+        <table>part_log</table>
+        <flush_interval_milliseconds>500</flush_interval_milliseconds>
+    </part_log>
+</yandex>
diff --git a/tests/testflows/kerberos/configs/clickhouse/config.d/ports.xml b/tests/testflows/kerberos/configs/clickhouse/config.d/ports.xml
new file mode 100644
index 00000000000..fbc6cea74c0
--- /dev/null
+++ b/tests/testflows/kerberos/configs/clickhouse/config.d/ports.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<yandex>
+    <https_port>8443</https_port>
+    <tcp_port_secure>9440</tcp_port_secure>
+</yandex>
\ No newline at end of file
diff --git a/tests/testflows/kerberos/configs/clickhouse/config.d/remote.xml b/tests/testflows/kerberos/configs/clickhouse/config.d/remote.xml
new file mode 100644
index 00000000000..51be2a6e8e3
--- /dev/null
+++ b/tests/testflows/kerberos/configs/clickhouse/config.d/remote.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0"?>
+<yandex>
+    <remote_servers>
+        <replicated_cluster>
+            <shard>
+                <internal_replication>true</internal_replication>
+                <replica>
+                    <host>clickhouse1</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>clickhouse2</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>clickhouse3</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </replicated_cluster>
+        <!--
+        <replicated_cluster_readonly>
+            <shard>
+                <internal_replication>true</internal_replication>
+                <replica>
+                    <host>clickhouse1</host>
+                    <port>9000</port>
+                    <user>readonly</user>
+                </replica>
+                <replica>
+                    <host>clickhouse2</host>
+                    <port>9000</port>
+                    <user>readonly</user>
+                </replica>
+                <replica>
+                    <host>clickhouse3</host>
+                    <port>9000</port>
+                    <user>readonly</user>
+                </replica>
+            </shard>
+        </replicated_cluster_readonly>
+        -->
+        <replicated_cluster_secure>
+            <shard>
+                <internal_replication>true</internal_replication>
+                <replica>
+                    <host>clickhouse1</host>
+                    <port>9440</port>
+                    <secure>1</secure>
+                </replica>
+                <replica>
+                    <host>clickhouse2</host>
+                    <port>9440</port>
+                    <secure>1</secure>
+                </replica>
+                <replica>
+                    <host>clickhouse3</host>
+                    <port>9440</port>
+                    <secure>1</secure>
+                </replica>
+            </shard>
+        </replicated_cluster_secure>
+        <sharded_cluster>
+            <shard>
+                <replica>
+                    <host>clickhouse1</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+            <shard>
+                <replica>
+                    <host>clickhouse2</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+            <shard>
+                <replica>
+                    <host>clickhouse3</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </sharded_cluster>
+        <sharded_cluster_secure>
+            <shard>
+                <replica>
+                    <host>clickhouse1</host>
+                    <port>9440</port>
+                    <secure>1</secure>
+                </replica>
+            </shard>
+            <shard>
+                <replica>
+                    <host>clickhouse2</host>
+                    <port>9440</port>
+                    <secure>1</secure>
+                </replica>
+            </shard>
+            <shard>
+                <replica>
+                    <host>clickhouse3</host>
+                    <port>9440</port>
+                    <secure>1</secure>
+                </replica>
+            </shard>
+        </sharded_cluster_secure>
+    </remote_servers>
+</yandex>
diff --git a/tests/testflows/kerberos/configs/clickhouse/config.d/ssl.xml b/tests/testflows/kerberos/configs/clickhouse/config.d/ssl.xml
new file mode 100644
index 00000000000..ca65ffd5e04
--- /dev/null
+++ b/tests/testflows/kerberos/configs/clickhouse/config.d/ssl.xml
@@ -0,0 +1,17 @@
+<yandex>
+    <openSSL>
+        <server>
+            <certificateFile>/etc/clickhouse-server/ssl/server.crt</certificateFile>
+            <privateKeyFile>/etc/clickhouse-server/ssl/server.key</privateKeyFile>
+            <verificationMode>none</verificationMode>
+            <cacheSessions>true</cacheSessions>
+        </server>
+        <client>
+            <cacheSessions>true</cacheSessions>
+            <verificationMode>none</verificationMode>
+            <invalidCertificateHandler>
+                <name>AcceptCertificateHandler</name>
+            </invalidCertificateHandler>
+        </client>
+    </openSSL>
+</yandex>
diff --git a/tests/testflows/kerberos/configs/clickhouse/config.d/storage.xml b/tests/testflows/kerberos/configs/clickhouse/config.d/storage.xml
new file mode 100644
index 00000000000..618fd6b6d24
--- /dev/null
+++ b/tests/testflows/kerberos/configs/clickhouse/config.d/storage.xml
@@ -0,0 +1,20 @@
+<yandex>
+
+<storage_configuration>
+    <disks>
+        <default>
+            <keep_free_space_bytes>1024</keep_free_space_bytes>
+        </default>
+    </disks>
+    <policies>
+        <default>
+            <volumes>
+                <default>
+                    <disk>default</disk>
+                </default>
+            </volumes>
+        </default>
+    </policies>
+</storage_configuration>
+
+</yandex>
diff --git a/tests/testflows/kerberos/configs/clickhouse/config.d/zookeeper.xml b/tests/testflows/kerberos/configs/clickhouse/config.d/zookeeper.xml
new file mode 100644
index 00000000000..96270e7b645
--- /dev/null
+++ b/tests/testflows/kerberos/configs/clickhouse/config.d/zookeeper.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<yandex>
+    <zookeeper>
+	    <node index="1">
+		    <host>zookeeper</host>
+		    <port>2181</port>
+	    </node>
+        <session_timeout_ms>15000</session_timeout_ms>
+    </zookeeper>
+</yandex>
diff --git a/tests/testflows/kerberos/configs/clickhouse/config.xml b/tests/testflows/kerberos/configs/clickhouse/config.xml
new file mode 100644
index 00000000000..a0133238f25
--- /dev/null
+++ b/tests/testflows/kerberos/configs/clickhouse/config.xml
@@ -0,0 +1,440 @@
+<?xml version="1.0"?>
+<!--
+  NOTE: User and query level settings are set up in "users.xml" file.
+-->
+<yandex>
+    <logger>
+        <!-- Possible levels: https://github.com/pocoproject/poco/blob/develop/Foundation/include/Poco/Logger.h#L105 -->
+        <level>trace</level>
+        <log>/var/log/clickhouse-server/clickhouse-server.log</log>
+        <errorlog>/var/log/clickhouse-server/clickhouse-server.err.log</errorlog>
+        <size>1000M</size>
+        <count>10</count>
+        <!-- <console>1</console> --> <!-- Default behavior is autodetection (log to console if not daemon mode and is tty) -->
+    </logger>
+    <!--display_name>production</display_name--> <!-- It is the name that will be shown in the client -->
+    <http_port>8123</http_port>
+    <tcp_port>9000</tcp_port>
+
+    <!-- For HTTPS and SSL over native protocol. -->
+    <!--
+    <https_port>8443</https_port>
+    <tcp_port_secure>9440</tcp_port_secure>
+    -->
+
+    <!-- Used with https_port and tcp_port_secure. Full ssl options list: https://github.com/ClickHouse-Extras/poco/blob/master/NetSSL_OpenSSL/include/Poco/Net/SSLManager.h#L71 -->
+    <openSSL>
+        <server> <!-- Used for https server AND secure tcp port -->
+            <!-- openssl req -subj "/CN=localhost" -new -newkey rsa:2048 -days 365 -nodes -x509 -keyout /etc/clickhouse-server/server.key -out /etc/clickhouse-server/server.crt -->
+            <certificateFile>/etc/clickhouse-server/server.crt</certificateFile>
+            <privateKeyFile>/etc/clickhouse-server/server.key</privateKeyFile>
+            <!-- openssl dhparam -out /etc/clickhouse-server/dhparam.pem 4096 -->
+            <dhParamsFile>/etc/clickhouse-server/dhparam.pem</dhParamsFile>
+            <verificationMode>none</verificationMode>
+            <loadDefaultCAFile>true</loadDefaultCAFile>
+            <cacheSessions>true</cacheSessions>
+            <disableProtocols>sslv2,sslv3</disableProtocols>
+            <preferServerCiphers>true</preferServerCiphers>
+        </server>
+
+        <client> <!-- Used for connecting to https dictionary source -->
+            <loadDefaultCAFile>true</loadDefaultCAFile>
+            <cacheSessions>true</cacheSessions>
+            <disableProtocols>sslv2,sslv3</disableProtocols>
+            <preferServerCiphers>true</preferServerCiphers>
+            <!-- Use for self-signed: <verificationMode>none</verificationMode> -->
+            <invalidCertificateHandler>
+                <!-- Use for self-signed: <name>AcceptCertificateHandler</name> -->
+                <name>RejectCertificateHandler</name>
+            </invalidCertificateHandler>
+        </client>
+    </openSSL>
+
+    <!-- Default root page on http[s] server. For example load UI from https://tabix.io/ when opening http://localhost:8123 -->
+    <!--
+    <http_server_default_response><![CDATA[<html ng-app="SMI2"><head><base href="http://ui.tabix.io/"></head><body><div ui-view="" class="content-ui"></div><script src="http://loader.tabix.io/master.js"></script></body></html>]]></http_server_default_response>
+    -->
+
+    <!-- Port for communication between replicas. Used for data exchange. -->
+    <interserver_http_port>9009</interserver_http_port>
+
+    <!-- Hostname that is used by other replicas to request this server.
+         If not specified, than it is determined analoguous to 'hostname -f' command.
+         This setting could be used to switch replication to another network interface.
+      -->
+    <!--
+    <interserver_http_host>example.yandex.ru</interserver_http_host>
+    -->
+
+    <!-- Listen specified host. use :: (wildcard IPv6 address), if you want to accept connections both with IPv4 and IPv6 from everywhere. -->
+    <!--<listen_host>::</listen_host> -->
+    <!-- Same for hosts with disabled ipv6: -->
+    <listen_host>0.0.0.0</listen_host>
+
+    <!-- Default values - try listen localhost on ipv4 and ipv6: -->
+    <!--<listen_host>::1</listen_host>
+    <listen_host>127.0.0.1</listen_host> -->
+    <!-- Don't exit if ipv6 or ipv4 unavailable, but listen_host with this protocol specified -->
+    <!--<listen_try>0</listen_try> -->
+
+    <!-- Allow listen on same address:port -->
+    <!-- <listen_reuse_port>0</listen_reuse_port> -->
+
+    <!-- <listen_backlog>64</listen_backlog> -->
+
+    <max_connections>4096</max_connections>
+    <keep_alive_timeout>3</keep_alive_timeout>
+
+    <!-- Maximum number of concurrent queries. -->
+    <max_concurrent_queries>100</max_concurrent_queries>
+
+    <!-- Set limit on number of open files (default: maximum). This setting makes sense on Mac OS X because getrlimit() fails to retrieve
+         correct maximum value. -->
+    <!-- <max_open_files>262144</max_open_files> -->
+
+    <!-- Size of cache of uncompressed blocks of data, used in tables of MergeTree family.
+         In bytes. Cache is single for server. Memory is allocated only on demand.
+         Cache is used when 'use_uncompressed_cache' user setting turned on (off by default).
+         Uncompressed cache is advantageous only for very short queries and in rare cases.
+      -->
+    <uncompressed_cache_size>8589934592</uncompressed_cache_size>
+
+    <!-- Approximate size of mark cache, used in tables of MergeTree family.
+         In bytes. Cache is single for server. Memory is allocated only on demand.
+         You should not lower this value.
+      -->
+    <mark_cache_size>5368709120</mark_cache_size>
+
+
+    <!-- Path to data directory, with trailing slash. -->
+    <path>/var/lib/clickhouse/</path>
+
+    <!-- Path to temporary data for processing hard queries. -->
+    <tmp_path>/var/lib/clickhouse/tmp/</tmp_path>
+
+    <!-- Directory with user provided files that are accessible by 'file' table function. -->
+    <user_files_path>/var/lib/clickhouse/user_files/</user_files_path>
+
+    <!-- Sources to read users, roles, access rights, profiles of settings, quotas. -->
+    <user_directories>
+        <users_xml>
+            <!-- Path to configuration file with predefined users. -->
+            <path>users.xml</path>
+        </users_xml>
+        <local_directory>
+            <!-- Path to folder where users created by SQL commands are stored. -->
+            <path>/var/lib/clickhouse/access/</path>
+        </local_directory>
+    </user_directories>
+
+    <!-- Default profile of settings. -->
+    <default_profile>default</default_profile>
+
+    <!-- System profile of settings. This settings are used by internal processes (Buffer storage, Distibuted DDL worker and so on). -->
+    <!-- <system_profile>default</system_profile> -->
+
+    <!-- Default database. -->
+    <default_database>default</default_database>
+
+    <!-- Server time zone could be set here.
+
+         Time zone is used when converting between String and DateTime types,
+          when printing DateTime in text formats and parsing DateTime from text,
+          it is used in date and time related functions, if specific time zone was not passed as an argument.
+
+         Time zone is specified as identifier from IANA time zone database, like UTC or Africa/Abidjan.
+         If not specified, system time zone at server startup is used.
+
+         Please note, that server could display time zone alias instead of specified name.
+         Example: W-SU is an alias for Europe/Moscow and Zulu is an alias for UTC.
+    -->
+    <!-- <timezone>Europe/Moscow</timezone> -->
+
+    <!-- You can specify umask here (see "man umask"). Server will apply it on startup.
+         Number is always parsed as octal. Default umask is 027 (other users cannot read logs, data files, etc; group can only read).
+    -->
+    <!-- <umask>022</umask> -->
+
+    <!-- Perform mlockall after startup to lower first queries latency
+          and to prevent clickhouse executable from being paged out under high IO load.
+         Enabling this option is recommended but will lead to increased startup time for up to a few seconds.
+    -->
+    <mlock_executable>false</mlock_executable>
+
+    <!-- Configuration of clusters that could be used in Distributed tables.
+         https://clickhouse.yandex/docs/en/table_engines/distributed/
+      -->
+    <remote_servers incl="remote" >
+        <!-- Test only shard config for testing distributed storage -->
+        <test_shard_localhost>
+            <shard>
+                <replica>
+                    <host>localhost</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </test_shard_localhost>
+        <test_cluster_two_shards_localhost>
+             <shard>
+                 <replica>
+                     <host>localhost</host>
+                     <port>9000</port>
+                 </replica>
+             </shard>
+             <shard>
+                 <replica>
+                     <host>localhost</host>
+                     <port>9000</port>
+                 </replica>
+             </shard>
+         </test_cluster_two_shards_localhost>
+        <test_shard_localhost_secure>
+            <shard>
+                <replica>
+                    <host>localhost</host>
+                    <port>9440</port>
+                    <secure>1</secure>
+                </replica>
+            </shard>
+        </test_shard_localhost_secure>
+        <test_unavailable_shard>
+            <shard>
+                <replica>
+                    <host>localhost</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+            <shard>
+                <replica>
+                    <host>localhost</host>
+                    <port>1</port>
+                </replica>
+            </shard>
+        </test_unavailable_shard>
+    </remote_servers>
+
+
+    <!-- If element has 'incl' attribute, then for it's value will be used corresponding substitution from another file.
+         By default, path to file with substitutions is /etc/metrika.xml. It could be changed in config in 'include_from' element.
+         Values for substitutions are specified in /yandex/name_of_substitution elements in that file.
+      -->
+
+    <!-- ZooKeeper is used to store metadata about replicas, when using Replicated tables.
+         Optional. If you don't use replicated tables, you could omit that.
+
+         See https://clickhouse.yandex/docs/en/table_engines/replication/
+      -->
+    <zookeeper incl="zookeeper" optional="true" />
+
+    <!-- Substitutions for parameters of replicated tables.
+          Optional. If you don't use replicated tables, you could omit that.
+
+         See https://clickhouse.yandex/docs/en/table_engines/replication/#creating-replicated-tables
+      -->
+    <macros incl="macros" optional="true" />
+
+
+    <!-- Reloading interval for embedded dictionaries, in seconds. Default: 3600. -->
+    <builtin_dictionaries_reload_interval>3600</builtin_dictionaries_reload_interval>
+
+
+    <!-- Maximum session timeout, in seconds. Default: 3600. -->
+    <max_session_timeout>3600</max_session_timeout>
+
+    <!-- Default session timeout, in seconds. Default: 60. -->
+    <default_session_timeout>60</default_session_timeout>
+
+    <!-- Sending data to Graphite for monitoring. Several sections can be defined. -->
+    <!--
+        interval - send every X second
+        root_path - prefix for keys
+        hostname_in_path - append hostname to root_path (default = true)
+        metrics - send data from table system.metrics
+        events - send data from table system.events
+        asynchronous_metrics - send data from table system.asynchronous_metrics
+    -->
+    <!--
+    <graphite>
+        <host>localhost</host>
+        <port>42000</port>
+        <timeout>0.1</timeout>
+        <interval>60</interval>
+        <root_path>one_min</root_path>
+        <hostname_in_path>true</hostname_in_path>
+
+        <metrics>true</metrics>
+        <events>true</events>
+        <asynchronous_metrics>true</asynchronous_metrics>
+    </graphite>
+    <graphite>
+        <host>localhost</host>
+        <port>42000</port>
+        <timeout>0.1</timeout>
+        <interval>1</interval>
+        <root_path>one_sec</root_path>
+
+        <metrics>true</metrics>
+        <events>true</events>
+        <asynchronous_metrics>false</asynchronous_metrics>
+    </graphite>
+    -->
+
+
+    <!-- Query log. Used only for queries with setting log_queries = 1. -->
+    <query_log>
+        <!-- What table to insert data. If table is not exist, it will be created.
+             When query log structure is changed after system update,
+              then old table will be renamed and new table will be created automatically.
+        -->
+        <database>system</database>
+        <table>query_log</table>
+        <!--
+            PARTITION BY expr https://clickhouse.yandex/docs/en/table_engines/custom_partitioning_key/
+            Example:
+                event_date
+                toMonday(event_date)
+                toYYYYMM(event_date)
+                toStartOfHour(event_time)
+        -->
+        <partition_by>toYYYYMM(event_date)</partition_by>
+        <!-- Interval of flushing data. -->
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+    </query_log>
+
+    <!-- Trace log. Stores stack traces collected by query profilers.
+         See query_profiler_real_time_period_ns and query_profiler_cpu_time_period_ns settings. -->
+    <trace_log>
+        <database>system</database>
+        <table>trace_log</table>
+
+        <partition_by>toYYYYMM(event_date)</partition_by>
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+    </trace_log>
+
+    <!-- Query thread log. Has information about all threads participated in query execution.
+         Used only for queries with setting log_query_threads = 1. -->
+    <query_thread_log>
+        <database>system</database>
+        <table>query_thread_log</table>
+        <partition_by>toYYYYMM(event_date)</partition_by>
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+    </query_thread_log>
+
+    <!-- Uncomment if use part log.
+         Part log contains information about all actions with parts in MergeTree tables (creation, deletion, merges, downloads).
+    <part_log>
+        <database>system</database>
+        <table>part_log</table>
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+    </part_log>
+    -->
+
+    <!-- Uncomment to write text log into table.
+         Text log contains all information from usual server log but stores it in structured and efficient way.
+    <text_log>
+        <database>system</database>
+        <table>text_log</table>
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+    </text_log>
+    -->
+
+    <!-- Parameters for embedded dictionaries, used in Yandex.Metrica.
+         See https://clickhouse.yandex/docs/en/dicts/internal_dicts/
+    -->
+
+    <!-- Path to file with region hierarchy. -->
+    <!-- <path_to_regions_hierarchy_file>/opt/geo/regions_hierarchy.txt</path_to_regions_hierarchy_file> -->
+
+    <!-- Path to directory with files containing names of regions -->
+    <!-- <path_to_regions_names_files>/opt/geo/</path_to_regions_names_files> -->
+
+
+    <!-- Configuration of external dictionaries. See:
+         https://clickhouse.yandex/docs/en/dicts/external_dicts/
+    -->
+    <dictionaries_config>*_dictionary.xml</dictionaries_config>
+
+    <!-- Uncomment if you want data to be compressed 30-100% better.
+         Don't do that if you just started using ClickHouse.
+      -->
+    <compression incl="compression">
+    <!--
+        <!- - Set of variants. Checked in order. Last matching case wins. If nothing matches, lz4 will be used. - ->
+        <case>
+
+            <!- - Conditions. All must be satisfied. Some conditions may be omitted. - ->
+            <min_part_size>10000000000</min_part_size>        <!- - Min part size in bytes. - ->
+            <min_part_size_ratio>0.01</min_part_size_ratio>   <!- - Min size of part relative to whole table size. - ->
+
+            <!- - What compression method to use. - ->
+            <method>zstd</method>
+        </case>
+    -->
+    </compression>
+
+    <!-- Allow to execute distributed DDL queries (CREATE, DROP, ALTER, RENAME) on cluster.
+         Works only if ZooKeeper is enabled. Comment it if such functionality isn't required. -->
+    <distributed_ddl>
+        <!-- Path in ZooKeeper to queue with DDL queries -->
+        <path>/clickhouse/task_queue/ddl</path>
+
+        <!-- Settings from this profile will be used to execute DDL queries -->
+        <!-- <profile>default</profile> -->
+    </distributed_ddl>
+
+    <!-- Settings to fine tune MergeTree tables. See documentation in source code, in MergeTreeSettings.h -->
+    <!--
+    <merge_tree>
+        <max_suspicious_broken_parts>5</max_suspicious_broken_parts>
+    </merge_tree>
+    -->
+
+    <!-- Protection from accidental DROP.
+         If size of a MergeTree table is greater than max_table_size_to_drop (in bytes) than table could not be dropped with any DROP query.
+         If you want do delete one table and don't want to restart clickhouse-server, you could create special file <clickhouse-path>/flags/force_drop_table and make DROP once.
+         By default max_table_size_to_drop is 50GB; max_table_size_to_drop=0 allows to DROP any tables.
+         The same for max_partition_size_to_drop.
+         Uncomment to disable protection.
+    -->
+    <!-- <max_table_size_to_drop>0</max_table_size_to_drop> -->
+    <!-- <max_partition_size_to_drop>0</max_partition_size_to_drop> -->
+
+    <!-- Example of parameters for GraphiteMergeTree table engine -->
+    <graphite_rollup_example>
+        <pattern>
+            <regexp>click_cost</regexp>
+            <function>any</function>
+            <retention>
+                <age>0</age>
+                <precision>3600</precision>
+            </retention>
+            <retention>
+                <age>86400</age>
+                <precision>60</precision>
+            </retention>
+        </pattern>
+        <default>
+            <function>max</function>
+            <retention>
+                <age>0</age>
+                <precision>60</precision>
+            </retention>
+            <retention>
+                <age>3600</age>
+                <precision>300</precision>
+            </retention>
+            <retention>
+                <age>86400</age>
+                <precision>3600</precision>
+            </retention>
+        </default>
+    </graphite_rollup_example>
+
+    <!-- Directory in <clickhouse-path> containing schema files for various input formats.
+         The directory will be created if it doesn't exist.
+      -->
+    <format_schema_path>/var/lib/clickhouse/format_schemas/</format_schema_path>
+
+    <!-- Uncomment to disable ClickHouse internal DNS caching. -->
+    <!-- <disable_internal_dns_cache>1</disable_internal_dns_cache> -->
+</yandex>
diff --git a/tests/testflows/kerberos/configs/clickhouse/ssl/dhparam.pem b/tests/testflows/kerberos/configs/clickhouse/ssl/dhparam.pem
new file mode 100644
index 00000000000..2e6cee0798d
--- /dev/null
+++ b/tests/testflows/kerberos/configs/clickhouse/ssl/dhparam.pem
@@ -0,0 +1,8 @@
+-----BEGIN DH PARAMETERS-----
+MIIBCAKCAQEAua92DDli13gJ+//ZXyGaggjIuidqB0crXfhUlsrBk9BV1hH3i7fR
+XGP9rUdk2ubnB3k2ejBStL5oBrkHm9SzUFSQHqfDjLZjKoUpOEmuDc4cHvX1XTR5
+Pr1vf5cd0yEncJWG5W4zyUB8k++SUdL2qaeslSs+f491HBLDYn/h8zCgRbBvxhxb
+9qeho1xcbnWeqkN6Kc9bgGozA16P9NLuuLttNnOblkH+lMBf42BSne/TWt3AlGZf
+slKmmZcySUhF8aKfJnLKbkBCFqOtFRh8zBA9a7g+BT/lSANATCDPaAk1YVih2EKb
+dpc3briTDbRsiqg2JKMI7+VdULY9bh3EawIBAg==
+-----END DH PARAMETERS-----
diff --git a/tests/testflows/kerberos/configs/clickhouse/ssl/server.crt b/tests/testflows/kerberos/configs/clickhouse/ssl/server.crt
new file mode 100644
index 00000000000..7ade2d96273
--- /dev/null
+++ b/tests/testflows/kerberos/configs/clickhouse/ssl/server.crt
@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIC/TCCAeWgAwIBAgIJANjx1QSR77HBMA0GCSqGSIb3DQEBCwUAMBQxEjAQBgNV
+BAMMCWxvY2FsaG9zdDAgFw0xODA3MzAxODE2MDhaGA8yMjkyMDUxNDE4MTYwOFow
+FDESMBAGA1UEAwwJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAs9uSo6lJG8o8pw0fbVGVu0tPOljSWcVSXH9uiJBwlZLQnhN4SFSFohfI
+4K8U1tBDTnxPLUo/V1K9yzoLiRDGMkwVj6+4+hE2udS2ePTQv5oaMeJ9wrs+5c9T
+4pOtlq3pLAdm04ZMB1nbrEysceVudHRkQbGHzHp6VG29Fw7Ga6YpqyHQihRmEkTU
+7UCYNA+Vk7aDPdMS/khweyTpXYZimaK9f0ECU3/VOeG3fH6Sp2X6FN4tUj/aFXEj
+sRmU5G2TlYiSIUMF2JPdhSihfk1hJVALrHPTU38SOL+GyyBRWdNcrIwVwbpvsvPg
+pryMSNxnpr0AK0dFhjwnupIv5hJIOQIDAQABo1AwTjAdBgNVHQ4EFgQUjPLb3uYC
+kcamyZHK4/EV8jAP0wQwHwYDVR0jBBgwFoAUjPLb3uYCkcamyZHK4/EV8jAP0wQw
+DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAM/ocuDvfPus/KpMVD51j
+4IdlU8R0vmnYLQ+ygzOAo7+hUWP5j0yvq4ILWNmQX6HNvUggCgFv9bjwDFhb/5Vr
+85ieWfTd9+LTjrOzTw4avdGwpX9G+6jJJSSq15tw5ElOIFb/qNA9O4dBiu8vn03C
+L/zRSXrARhSqTW5w/tZkUcSTT+M5h28+Lgn9ysx4Ff5vi44LJ1NnrbJbEAIYsAAD
++UA+4MBFKx1r6hHINULev8+lCfkpwIaeS8RL+op4fr6kQPxnULw8wT8gkuc8I4+L
+P9gg/xDHB44T3ADGZ5Ib6O0DJaNiToO6rnoaaxs0KkotbvDWvRoxEytSbXKoYjYp
+0g==
+-----END CERTIFICATE-----
diff --git a/tests/testflows/kerberos/configs/clickhouse/ssl/server.key b/tests/testflows/kerberos/configs/clickhouse/ssl/server.key
new file mode 100644
index 00000000000..f0fb61ac443
--- /dev/null
+++ b/tests/testflows/kerberos/configs/clickhouse/ssl/server.key
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCz25KjqUkbyjyn
+DR9tUZW7S086WNJZxVJcf26IkHCVktCeE3hIVIWiF8jgrxTW0ENOfE8tSj9XUr3L
+OguJEMYyTBWPr7j6ETa51LZ49NC/mhox4n3Cuz7lz1Pik62WreksB2bThkwHWdus
+TKxx5W50dGRBsYfMenpUbb0XDsZrpimrIdCKFGYSRNTtQJg0D5WTtoM90xL+SHB7
+JOldhmKZor1/QQJTf9U54bd8fpKnZfoU3i1SP9oVcSOxGZTkbZOViJIhQwXYk92F
+KKF+TWElUAusc9NTfxI4v4bLIFFZ01ysjBXBum+y8+CmvIxI3GemvQArR0WGPCe6
+ki/mEkg5AgMBAAECggEATrbIBIxwDJOD2/BoUqWkDCY3dGevF8697vFuZKIiQ7PP
+TX9j4vPq0DfsmDjHvAPFkTHiTQXzlroFik3LAp+uvhCCVzImmHq0IrwvZ9xtB43f
+7Pkc5P6h1l3Ybo8HJ6zRIY3TuLtLxuPSuiOMTQSGRL0zq3SQ5DKuGwkz+kVjHXUN
+MR2TECFwMHKQ5VLrC+7PMpsJYyOMlDAWhRfUalxC55xOXTpaN8TxNnwQ8K2ISVY5
+212Jz/a4hn4LdwxSz3Tiu95PN072K87HLWx3EdT6vW4Ge5P/A3y+smIuNAlanMnu
+plHBRtpATLiTxZt/n6npyrfQVbYjSH7KWhB8hBHtaQKBgQDh9Cq1c/KtqDtE0Ccr
+/r9tZNTUwBE6VP+3OJeKdEdtsfuxjOCkS1oAjgBJiSDOiWPh1DdoDeVZjPKq6pIu
+Mq12OE3Doa8znfCXGbkSzEKOb2unKZMJxzrz99kXt40W5DtrqKPNb24CNqTiY8Aa
+CjtcX+3weat82VRXvph6U8ltMwKBgQDLxjiQQzNoY7qvg7CwJCjf9qq8jmLK766g
+1FHXopqS+dTxDLM8eJSRrpmxGWJvNeNc1uPhsKsKgotqAMdBUQTf7rSTbt4MyoH5
+bUcRLtr+0QTK9hDWMOOvleqNXha68vATkohWYfCueNsC60qD44o8RZAS6UNy3ENq
+cM1cxqe84wKBgQDKkHutWnooJtajlTxY27O/nZKT/HA1bDgniMuKaz4R4Gr1PIez
+on3YW3V0d0P7BP6PWRIm7bY79vkiMtLEKdiKUGWeyZdo3eHvhDb/3DCawtau8L2K
+GZsHVp2//mS1Lfz7Qh8/L/NedqCQ+L4iWiPnZ3THjjwn3CoZ05ucpvrAMwKBgB54
+nay039MUVq44Owub3KDg+dcIU62U+cAC/9oG7qZbxYPmKkc4oL7IJSNecGHA5SbU
+2268RFdl/gLz6tfRjbEOuOHzCjFPdvAdbysanpTMHLNc6FefJ+zxtgk9sJh0C4Jh
+vxFrw9nTKKzfEl12gQ1SOaEaUIO0fEBGbe8ZpauRAoGAMAlGV+2/K4ebvAJKOVTa
+dKAzQ+TD2SJmeR1HZmKDYddNqwtZlzg3v4ZhCk4eaUmGeC1Bdh8MDuB3QQvXz4Dr
+vOIP4UVaOr+uM+7TgAgVnP4/K6IeJGzUDhX93pmpWhODfdu/oojEKVcpCojmEmS1
+KCBtmIrQLqzMpnBpLNuSY+Q=
+-----END PRIVATE KEY-----
diff --git a/tests/testflows/kerberos/configs/clickhouse/users.xml b/tests/testflows/kerberos/configs/clickhouse/users.xml
new file mode 100644
index 00000000000..86b2cd9e1e3
--- /dev/null
+++ b/tests/testflows/kerberos/configs/clickhouse/users.xml
@@ -0,0 +1,133 @@
+<?xml version="1.0"?>
+<yandex>
+    <!-- Profiles of settings. -->
+    <profiles>
+        <!-- Default settings. -->
+        <default>
+            <!-- Maximum memory usage for processing single query, in bytes. -->
+            <max_memory_usage>10000000000</max_memory_usage>
+
+            <!-- Use cache of uncompressed blocks of data. Meaningful only for processing many of very short queries. -->
+            <use_uncompressed_cache>0</use_uncompressed_cache>
+
+            <!-- How to choose between replicas during distributed query processing.
+                 random - choose random replica from set of replicas with minimum number of errors
+                 nearest_hostname - from set of replicas with minimum number of errors, choose replica
+                  with minimum number of different symbols between replica's hostname and local hostname
+                  (Hamming distance).
+                 in_order - first live replica is chosen in specified order.
+                 first_or_random - if first replica one has higher number of errors, pick a random one from replicas with minimum number of errors.
+            -->
+            <load_balancing>random</load_balancing>
+        </default>
+
+        <!-- Profile that allows only read queries. -->
+        <readonly>
+            <readonly>1</readonly>
+        </readonly>
+    </profiles>
+
+    <!-- Users and ACL. -->
+    <users>
+        <!-- If user name was not specified, 'default' user is used. -->
+        <default>
+            <!-- Password could be specified in plaintext or in SHA256 (in hex format).
+
+                 If you want to specify password in plaintext (not recommended), place it in 'password' element.
+                 Example: <password>qwerty</password>.
+                 Password could be empty.
+
+                 If you want to specify SHA256, place it in 'password_sha256_hex' element.
+                 Example: <password_sha256_hex>65e84be33532fb784c48129675f9eff3a682b27168c0ea744b2cf58ee02337c5</password_sha256_hex>
+                 Restrictions of SHA256: impossibility to connect to ClickHouse using MySQL JS client (as of July 2019).
+
+                 If you want to specify double SHA1, place it in 'password_double_sha1_hex' element.
+                 Example: <password_double_sha1_hex>e395796d6546b1b65db9d665cd43f0e858dd4303</password_double_sha1_hex>
+
+                 How to generate decent password:
+                 Execute: PASSWORD=$(base64 < /dev/urandom | head -c8); echo "$PASSWORD"; echo -n "$PASSWORD" | sha256sum | tr -d '-'
+                 In first line will be password and in second - corresponding SHA256.
+
+                 How to generate double SHA1:
+                 Execute: PASSWORD=$(base64 < /dev/urandom | head -c8); echo "$PASSWORD"; echo -n "$PASSWORD" | openssl dgst -sha1 -binary | openssl dgst -sha1
+                 In first line will be password and in second - corresponding double SHA1.
+            -->
+            <password></password>
+
+            <!-- List of networks with open access.
+
+                 To open access from everywhere, specify:
+                    <ip>::/0</ip>
+
+                 To open access only from localhost, specify:
+                    <ip>::1</ip>
+                    <ip>127.0.0.1</ip>
+
+                 Each element of list has one of the following forms:
+                 <ip> IP-address or network mask. Examples: 213.180.204.3 or 10.0.0.1/8 or 10.0.0.1/255.255.255.0
+                     2a02:6b8::3 or 2a02:6b8::3/64 or 2a02:6b8::3/ffff:ffff:ffff:ffff::.
+                 <host> Hostname. Example: server01.yandex.ru.
+                     To check access, DNS query is performed, and all received addresses compared to peer address.
+                 <host_regexp> Regular expression for host names. Example, ^server\d\d-\d\d-\d\.yandex\.ru$
+                     To check access, DNS PTR query is performed for peer address and then regexp is applied.
+                     Then, for result of PTR query, another DNS query is performed and all received addresses compared to peer address.
+                     Strongly recommended that regexp is ends with $
+                 All results of DNS requests are cached till server restart.
+            -->
+            <networks incl="networks" replace="replace">
+                <ip>::/0</ip>
+            </networks>
+
+            <!-- Settings profile for user. -->
+            <profile>default</profile>
+
+            <!-- Quota for user. -->
+            <quota>default</quota>
+
+            <!-- Allow access management -->
+            <access_management>1</access_management>
+
+            <!-- Example of row level security policy. -->
+            <!-- <databases>
+                <test>
+                    <filtered_table1>
+                        <filter>a = 1</filter>
+                    </filtered_table1>
+                    <filtered_table2>
+                        <filter>a + b &lt; 1 or c - d &gt; 5</filter>
+                    </filtered_table2>
+                </test>
+            </databases> -->
+        </default>
+
+        <!-- Example of user with readonly access. -->
+        <!-- <readonly>
+            <password></password>
+            <networks incl="networks" replace="replace">
+                <ip>::1</ip>
+                <ip>127.0.0.1</ip>
+            </networks>
+            <profile>readonly</profile>
+            <quota>default</quota>
+        </readonly> -->
+    </users>
+
+    <!-- Quotas. -->
+    <quotas>
+        <!-- Name of quota. -->
+        <default>
+            <!-- Limits for time interval. You could specify many intervals with different limits. -->
+            <interval>
+                <!-- Length of interval. -->
+                <duration>3600</duration>
+
+                <!-- No limits. Just calculate resource usage for time interval. -->
+                <queries>0</queries>
+                <errors>0</errors>
+                <result_rows>0</result_rows>
+                <read_rows>0</read_rows>
+                <execution_time>0</execution_time>
+            </interval>
+        </default>
+    </quotas>
+</yandex>
diff --git a/tests/testflows/kerberos/configs/clickhouse1/config.d/kerberos.xml b/tests/testflows/kerberos/configs/clickhouse1/config.d/kerberos.xml
new file mode 100644
index 00000000000..ceaa497c561
--- /dev/null
+++ b/tests/testflows/kerberos/configs/clickhouse1/config.d/kerberos.xml
@@ -0,0 +1,5 @@
+<yandex>
+    <kerberos>
+        <realm>EXAMPLE.COM</realm>
+    </kerberos>
+</yandex>
\ No newline at end of file
diff --git a/tests/testflows/kerberos/configs/clickhouse1/config.d/macros.xml b/tests/testflows/kerberos/configs/clickhouse1/config.d/macros.xml
new file mode 100644
index 00000000000..6cdcc1b440c
--- /dev/null
+++ b/tests/testflows/kerberos/configs/clickhouse1/config.d/macros.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<yandex>
+    <macros>
+        <replica>clickhouse1</replica>
+        <shard>01</shard>
+        <shard2>01</shard2>
+    </macros>
+</yandex>
diff --git a/tests/testflows/kerberos/configs/clickhouse1/users.d/kerberos-users.xml b/tests/testflows/kerberos/configs/clickhouse1/users.d/kerberos-users.xml
new file mode 100644
index 00000000000..7029f20217f
--- /dev/null
+++ b/tests/testflows/kerberos/configs/clickhouse1/users.d/kerberos-users.xml
@@ -0,0 +1,10 @@
+<yandex>
+    <users>
+        <kerberos_user>
+            <kerberos>
+                <realm>EXAMPLE.COM</realm>
+            </kerberos>
+            <access_management>1</access_management>
+        </kerberos_user>
+    </users>
+</yandex>
\ No newline at end of file
diff --git a/tests/testflows/kerberos/configs/clickhouse2/config.d/kerberos.xml b/tests/testflows/kerberos/configs/clickhouse2/config.d/kerberos.xml
new file mode 100644
index 00000000000..ceaa497c561
--- /dev/null
+++ b/tests/testflows/kerberos/configs/clickhouse2/config.d/kerberos.xml
@@ -0,0 +1,5 @@
+<yandex>
+    <kerberos>
+        <realm>EXAMPLE.COM</realm>
+    </kerberos>
+</yandex>
\ No newline at end of file
diff --git a/tests/testflows/kerberos/configs/clickhouse2/config.d/macros.xml b/tests/testflows/kerberos/configs/clickhouse2/config.d/macros.xml
new file mode 100644
index 00000000000..a114a9ce4ab
--- /dev/null
+++ b/tests/testflows/kerberos/configs/clickhouse2/config.d/macros.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<yandex>
+    <macros>
+        <replica>clickhouse2</replica>
+        <shard>01</shard>
+        <shard2>02</shard2>
+    </macros>
+</yandex>
diff --git a/tests/testflows/kerberos/configs/clickhouse3/config.d/macros.xml b/tests/testflows/kerberos/configs/clickhouse3/config.d/macros.xml
new file mode 100644
index 00000000000..904a27b0172
--- /dev/null
+++ b/tests/testflows/kerberos/configs/clickhouse3/config.d/macros.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<yandex>
+    <macros>
+        <replica>clickhouse3</replica>
+        <shard>01</shard>
+        <shard2>03</shard2>
+    </macros>
+</yandex>
diff --git a/tests/testflows/kerberos/configs/kerberos/etc/krb5.conf b/tests/testflows/kerberos/configs/kerberos/etc/krb5.conf
new file mode 100644
index 00000000000..b963fc25daa
--- /dev/null
+++ b/tests/testflows/kerberos/configs/kerberos/etc/krb5.conf
@@ -0,0 +1,38 @@
+[kdc]
+    require-preauth = false
+
+[libdefaults]
+	default_realm = EXAMPLE.COM
+	ticket_lifetime  = 24000
+	dns_lookup_realm = false
+    	dns_lookup_kdc = false
+    	dns_fallback = false
+	rdns = false
+
+[realms]
+	EXAMPLE.COM = {
+		kdc = kerberos
+		admin_server = kerberos
+	}
+	OTHER.COM = {
+		kdc = kerberos
+		admin_server = kerberos
+	}
+
+[domain_realm]
+	docker-compose_default = EXAMPLE.COM
+	.docker-compose_default = EXAMPLE.COM
+
+[appdefaults]
+    validate         = false
+    pam              = {
+	debug           = false
+	ticket_lifetime = 36000
+	renew_lifetime  = 36000
+	forwardable     = true
+	krb4_convert    = false
+    }
+
+[logging]
+    kdc              = FILE:/var/log/krb5kdc.log
+    admin_server     = FILE:/var/log/kadmin.log
diff --git a/tests/testflows/kerberos/configs/kerberos/etc/krb5kdc/kdc.conf b/tests/testflows/kerberos/configs/kerberos/etc/krb5kdc/kdc.conf
new file mode 100644
index 00000000000..9afe5351467
--- /dev/null
+++ b/tests/testflows/kerberos/configs/kerberos/etc/krb5kdc/kdc.conf
@@ -0,0 +1,15 @@
+[kdcdefaults]
+         kdc_ports = 88
+
+[realms]
+   EXAMPLE.COM = {
+       kadmind_port = 749
+       max_life = 12h 0m 0s
+       max_renewable_life = 7d 0h 0m 0s
+       master_key_type = des3-hmac-sha1
+       supported_enctypes = des3-hmac-sha1:normal des-cbc-crc:normal des-cbc-crc:v4
+   }
+
+[logging]
+   kdc = FILE:/usr/local/var/krb5kdc/kdc.log
+   admin_server = FILE:/usr/local/var/krb5kdc/kadmin.log
diff --git a/tests/testflows/kerberos/configs/kerberos/etc/supervisord.conf b/tests/testflows/kerberos/configs/kerberos/etc/supervisord.conf
new file mode 100644
index 00000000000..bec4ae41077
--- /dev/null
+++ b/tests/testflows/kerberos/configs/kerberos/etc/supervisord.conf
@@ -0,0 +1,31 @@
+[inet_http_server]
+port=9001
+
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
+
+[supervisorctl]
+serverurl = http://127.0.0.1:9001
+
+[program:krb5kdc]
+command = /usr/sbin/krb5kdc -n
+startretries = 1
+startsecs = 5
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+
+[program:kadmind]
+command = /usr/sbin/kadmind -nofork
+startretries = 1
+startsecs = 5
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+
+
+[supervisord]
+logfile = /tmp/supervisord_zbx_server.log
+loglevel = critical
+nodaemon = true
+user = root
+pidfile = /tmp/supervisord_zbx_server.pid
+directory = /tmp
\ No newline at end of file
diff --git a/tests/testflows/kerberos/docker-compose/clickhouse-service.yml b/tests/testflows/kerberos/docker-compose/clickhouse-service.yml
new file mode 100644
index 00000000000..14736a264b8
--- /dev/null
+++ b/tests/testflows/kerberos/docker-compose/clickhouse-service.yml
@@ -0,0 +1,32 @@
+version: '2.3'
+
+services:
+  clickhouse:
+    image: yandex/clickhouse-integration-test:21454
+    expose:
+      - "9000"
+      - "9009"
+      - "8123"
+    volumes:
+      - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/ssl:/etc/clickhouse-server/ssl"
+      - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.xml:/etc/clickhouse-server/config.xml"
+      - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/users.xml:/etc/clickhouse-server/users.xml"
+      - "${CLICKHOUSE_TESTS_SERVER_BIN_PATH:-/usr/bin/clickhouse}:/usr/bin/clickhouse"
+      - "${CLICKHOUSE_TESTS_ODBC_BRIDGE_BIN_PATH:-/usr/bin/clickhouse-odbc-bridge}:/usr/bin/clickhouse-odbc-bridge"
+      - "${CLICKHOUSE_TESTS_DIR}/configs/kerberos/etc/krb5.conf:/etc/krb5.conf"
+    entrypoint: bash -c "clickhouse server --config-file=/etc/clickhouse-server/config.xml --log-file=/var/log/clickhouse-server/clickhouse-server.log --errorlog-file=/var/log/clickhouse-server/clickhouse-server.err.log"
+    healthcheck:
+      test: clickhouse client --query='select 1'
+      interval: 10s
+      timeout: 10s
+      retries: 3
+      start_period: 300s
+
+    environment:
+      KRB5_CLIENT_KTNAME: /etc/krb5.keytab
+      KRB5_KTNAME: /etc/krb5.keytab
+
+    cap_add:
+      - SYS_PTRACE
+    security_opt:
+      - label:disable
diff --git a/tests/testflows/kerberos/docker-compose/docker-compose.yml b/tests/testflows/kerberos/docker-compose/docker-compose.yml
new file mode 100644
index 00000000000..d1a74662a83
--- /dev/null
+++ b/tests/testflows/kerberos/docker-compose/docker-compose.yml
@@ -0,0 +1,75 @@
+version: '2.3'
+
+services:
+
+  zookeeper:
+    extends:
+      file: zookeeper-service.yml
+      service: zookeeper
+
+  kerberos:
+    extends:
+      file: kerberos-service.yml
+      service: kerberos
+    hostname: kerberos
+    depends_on:
+      zookeeper:
+        condition: service_healthy
+
+  clickhouse1:
+    extends:
+      file: clickhouse-service.yml
+      service: clickhouse
+    hostname: clickhouse1
+    volumes:
+      - "${CLICKHOUSE_TESTS_DIR}/_instances/clickhouse1/database/:/var/lib/clickhouse/"
+      - "${CLICKHOUSE_TESTS_DIR}/_instances/clickhouse1/logs/:/var/log/clickhouse-server/"
+      - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse1/config.d:/etc/clickhouse-server/config.d"
+      - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse1/users.d:/etc/clickhouse-server/users.d"
+    depends_on:
+      zookeeper:
+        condition: service_healthy
+
+  clickhouse2:
+    extends:
+      file: clickhouse-service.yml
+      service: clickhouse
+    hostname: clickhouse2
+    volumes:
+      - "${CLICKHOUSE_TESTS_DIR}/_instances/clickhouse2/database/:/var/lib/clickhouse/"
+      - "${CLICKHOUSE_TESTS_DIR}/_instances/clickhouse2/logs/:/var/log/clickhouse-server/"
+      - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse2/config.d:/etc/clickhouse-server/config.d"
+      - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse2/users.d:/etc/clickhouse-server/users.d"
+    depends_on:
+      zookeeper:
+        condition: service_healthy
+
+  clickhouse3:
+    extends:
+      file: clickhouse-service.yml
+      service: clickhouse
+    hostname: clickhouse3
+    volumes:
+      - "${CLICKHOUSE_TESTS_DIR}/_instances/clickhouse3/database/:/var/lib/clickhouse/"
+      - "${CLICKHOUSE_TESTS_DIR}/_instances/clickhouse3/logs/:/var/log/clickhouse-server/"
+      - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse3/config.d:/etc/clickhouse-server/config.d"
+      - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse3/users.d:/etc/clickhouse-server/users.d"
+    depends_on:
+      zookeeper:
+        condition: service_healthy
+
+  # dummy service which does nothing, but allows to postpone
+  # 'docker-compose up -d' till all dependecies will go healthy
+  all_services_ready:
+    image: hello-world
+    depends_on:
+      clickhouse1:
+        condition: service_healthy
+      clickhouse2:
+        condition: service_healthy
+      clickhouse3:
+        condition: service_healthy
+      zookeeper:
+        condition: service_healthy
+      kerberos:
+        condition: service_healthy
diff --git a/tests/testflows/kerberos/docker-compose/kerberos-service.yml b/tests/testflows/kerberos/docker-compose/kerberos-service.yml
new file mode 100644
index 00000000000..3f21e93e0b6
--- /dev/null
+++ b/tests/testflows/kerberos/docker-compose/kerberos-service.yml
@@ -0,0 +1,27 @@
+version: '2.3'
+
+services:
+    kerberos:
+        image: zvonand/docker-krb5-server:1.0.0
+        restart: always
+        expose:
+            - "88"
+            - "464"
+            - "749"
+        healthcheck:
+            test: echo 1
+            interval: 10s
+            timeout: 10s
+            retries: 3
+            start_period: 300s
+        environment:
+            KRB5_PASS: pwd
+            KRB5_REALM: EXAMPLE.COM
+            KRB5_KDC: localhost
+        volumes:
+            - "${CLICKHOUSE_TESTS_DIR}/configs/kerberos/etc/krb5kdc/kdc.conf:/etc/krb5kdc/kdc.conf"
+            - "${CLICKHOUSE_TESTS_DIR}/_instances/kerberos/krb5kdc/log/kdc.log:/usr/local/var/krb5kdc/kdc.log"
+            - "${CLICKHOUSE_TESTS_DIR}/_instances/kerberos/krb5kdc/log/kadmin.log:/usr/local/var/krb5kdc/kadmin.log"
+            - "${CLICKHOUSE_TESTS_DIR}/_instances/kerberos/var/log:/var/log"
+        security_opt:
+            - label:disable
diff --git a/tests/testflows/kerberos/docker-compose/zookeeper-service.yml b/tests/testflows/kerberos/docker-compose/zookeeper-service.yml
new file mode 100644
index 00000000000..6691a2df31c
--- /dev/null
+++ b/tests/testflows/kerberos/docker-compose/zookeeper-service.yml
@@ -0,0 +1,18 @@
+version: '2.3'
+
+services:
+  zookeeper:
+    image: zookeeper:3.4.12
+    expose:
+      - "2181"
+    environment:
+      ZOO_TICK_TIME: 500
+      ZOO_MY_ID: 1
+    healthcheck:
+      test: echo stat | nc localhost 2181
+      interval: 10s
+      timeout: 10s
+      retries: 3
+      start_period: 300s
+    security_opt:
+      - label:disable
diff --git a/tests/testflows/kerberos/regression.py b/tests/testflows/kerberos/regression.py
new file mode 100644
index 00000000000..9675ba6e3c8
--- /dev/null
+++ b/tests/testflows/kerberos/regression.py
@@ -0,0 +1,38 @@
+import sys
+from testflows.core import *
+
+append_path(sys.path, "..")
+
+from helpers.cluster import Cluster
+from helpers.argparser import argparser
+from kerberos.requirements.requirements import *
+
+xfails = {
+}
+
+
+@TestModule
+@Name("kerberos")
+@ArgumentParser(argparser)
+@Requirements(
+    RQ_SRS_016_Kerberos("1.0")
+)
+@XFails(xfails)
+def regression(self, local, clickhouse_binary_path, stress=None, parallel=None):
+    """ClickHouse Kerberos authentication test regression module.
+    """
+    nodes = {
+        "clickhouse": ("clickhouse1", "clickhouse2", "clickhouse3"),
+        "kerberos": ("kerberos", ),
+    }
+
+    with Cluster(local, clickhouse_binary_path, nodes=nodes) as cluster:
+        self.context.cluster = cluster
+
+        Feature(run=load("kerberos.tests.generic", "generic"), flags=TE)
+        Feature(run=load("kerberos.tests.config", "config"), flags=TE)
+        Feature(run=load("kerberos.tests.parallel", "parallel"), flags=TE)
+
+
+if main():
+    regression()
diff --git a/tests/testflows/kerberos/requirements/requirements.md b/tests/testflows/kerberos/requirements/requirements.md
new file mode 100644
index 00000000000..2121dd343b8
--- /dev/null
+++ b/tests/testflows/kerberos/requirements/requirements.md
@@ -0,0 +1,281 @@
+# QA-SRS016 ClickHouse Kerberos Authentication
+# Software Requirements Specification
+
+## Table of Contents
+
+* 1 [Revision History](#revision-history)
+* 2 [Introduction](#introduction)
+* 3 [Terminology](#terminology)
+* 4 [Requirements](#requirements)
+  * 4.1 [Generic](#generic)
+    * 4.1.1 [RQ.SRS-016.Kerberos](#rqsrs-016kerberos)
+  * 4.2 [Configuration](#configuration)
+    * 4.2.1 [RQ.SRS-016.Kerberos.Configuration.MultipleAuthMethods](#rqsrs-016kerberosconfigurationmultipleauthmethods)
+    * 4.2.2 [RQ.SRS-016.Kerberos.Configuration.KerberosNotEnabled](#rqsrs-016kerberosconfigurationkerberosnotenabled)
+    * 4.2.3 [RQ.SRS-016.Kerberos.Configuration.MultipleKerberosSections](#rqsrs-016kerberosconfigurationmultiplekerberossections)
+    * 4.2.4 [RQ.SRS-016.Kerberos.Configuration.WrongUserRealm](#rqsrs-016kerberosconfigurationwronguserrealm)
+    * 4.2.5 [RQ.SRS-016.Kerberos.Configuration.PrincipalAndRealmSpecified](#rqsrs-016kerberosconfigurationprincipalandrealmspecified)
+    * 4.2.6 [RQ.SRS-016.Kerberos.Configuration.MultiplePrincipalSections](#rqsrs-016kerberosconfigurationmultipleprincipalsections)
+    * 4.2.7 [RQ.SRS-016.Kerberos.Configuration.MultipleRealmSections](#rqsrs-016kerberosconfigurationmultiplerealmsections)
+  * 4.3 [Valid User](#valid-user)
+    * 4.3.1 [RQ.SRS-016.Kerberos.ValidUser.XMLConfiguredUser](#rqsrs-016kerberosvaliduserxmlconfigureduser)
+    * 4.3.2 [RQ.SRS-016.Kerberos.ValidUser.RBACConfiguredUser](#rqsrs-016kerberosvaliduserrbacconfigureduser)
+    * 4.3.3 [RQ.SRS-016.Kerberos.ValidUser.KerberosNotConfigured](#rqsrs-016kerberosvaliduserkerberosnotconfigured)
+  * 4.4 [Invalid User](#invalid-user)
+    * 4.4.1 [RQ.SRS-016.Kerberos.InvalidUser](#rqsrs-016kerberosinvaliduser)
+    * 4.4.2 [RQ.SRS-016.Kerberos.InvalidUser.UserDeleted](#rqsrs-016kerberosinvaliduseruserdeleted)
+  * 4.5 [Kerberos Not Available](#kerberos-not-available)
+    * 4.5.1 [RQ.SRS-016.Kerberos.KerberosNotAvailable.InvalidServerTicket](#rqsrs-016kerberoskerberosnotavailableinvalidserverticket)
+    * 4.5.2 [RQ.SRS-016.Kerberos.KerberosNotAvailable.InvalidClientTicket](#rqsrs-016kerberoskerberosnotavailableinvalidclientticket)
+    * 4.5.3 [RQ.SRS-016.Kerberos.KerberosNotAvailable.ValidTickets](#rqsrs-016kerberoskerberosnotavailablevalidtickets)
+  * 4.6 [Kerberos Restarted](#kerberos-restarted)
+    * 4.6.1 [RQ.SRS-016.Kerberos.KerberosServerRestarted](#rqsrs-016kerberoskerberosserverrestarted)
+  * 4.7 [Performance](#performance)
+    * 4.7.1 [RQ.SRS-016.Kerberos.Performance](#rqsrs-016kerberosperformance)
+  * 4.8 [Parallel Requests processing](#parallel-requests-processing)
+    * 4.8.1 [RQ.SRS-016.Kerberos.Parallel](#rqsrs-016kerberosparallel)
+    * 4.8.2 [RQ.SRS-016.Kerberos.Parallel.ValidRequests.KerberosAndNonKerberos](#rqsrs-016kerberosparallelvalidrequestskerberosandnonkerberos)
+    * 4.8.3 [RQ.SRS-016.Kerberos.Parallel.ValidRequests.SameCredentials](#rqsrs-016kerberosparallelvalidrequestssamecredentials)
+    * 4.8.4 [RQ.SRS-016.Kerberos.Parallel.ValidRequests.DifferentCredentials](#rqsrs-016kerberosparallelvalidrequestsdifferentcredentials)
+    * 4.8.5 [RQ.SRS-016.Kerberos.Parallel.ValidInvalid](#rqsrs-016kerberosparallelvalidinvalid)
+    * 4.8.6 [RQ.SRS-016.Kerberos.Parallel.Deletion](#rqsrs-016kerberosparalleldeletion)
+* 5 [References](#references)
+
+## Revision History
+
+This document is stored in an electronic form using [Git] source control management software
+hosted in a [GitHub Repository].  
+All the updates are tracked using the [Git]'s [Revision History].
+
+## Introduction
+
+This document specifies the behavior for authenticating existing users via [Kerberos] authentication protocol.
+Existing [ClickHouse] users, that are properly configured, have an ability to authenticate using [Kerberos]. Kerberos authentication is only supported for HTTP requests, and users configured to authenticate via Kerberos cannot be authenticated by any other means of authentication.
+
+In order to use Kerberos authentication, Kerberos needs to be properly configured in the environment: Kerberos server must be present and user's and server's credentials must be set up. Configuring the Kerberos environment is outside the scope of this document.
+
+## Terminology
+
+* **Principal** -
+  A unique identity that uses [Kerberos].
+
+* **Realm** -
+  A logical group of resources and identities that use [Kerberos].
+
+* **Ticket** -
+  An encrypted block of data that authenticates principal.
+
+* **Credentials** -
+  A Kerberos ticket and a session key.
+
+* **Kerberized request** -
+  A HTTP query to ClickHouse server, which uses GSS [SPNEGO] and [Kerberos] to authenticate client.
+
+* **Unkerberized request** -
+  A HTTP query to ClickHouse server, which uses any other mean of authentication than GSS [SPNEGO] or [Kerberos].
+
+For a more detailed descriprion, visit [Kerberos terminology].
+
+## Requirements
+
+### Generic
+
+#### RQ.SRS-016.Kerberos
+version: 1.0
+
+[ClickHouse] SHALL support user authentication using [Kerberos] server.
+
+### Configuration
+
+#### RQ.SRS-016.Kerberos.Configuration.MultipleAuthMethods
+version: 1.0
+
+[ClickHouse] SHALL generate an exception and TERMINATE in case some user in `users.xml` has a `<kerberos>` section specified alongside with any other authentication method's section, e.g. `ldap`, `password`.
+
+#### RQ.SRS-016.Kerberos.Configuration.KerberosNotEnabled
+version: 1.0
+
+[ClickHouse] SHALL reject [Kerberos] authentication in case user is properly configured for using Kerberos, but Kerberos itself is not enabled in `config.xml`. For example:
+
+```xml
+<yandex>
+    <!- ... -->
+    <kerberos />
+</yandex>
+```
+```xml
+<yandex>
+    <!- ... -->
+    <kerberos>
+        <principal>HTTP/clickhouse.example.com@EXAMPLE.COM</principal>
+    </kerberos>
+</yandex>
+```
+```xml
+<yandex>
+    <!- ... -->
+    <kerberos>
+        <realm>EXAMPLE.COM</realm>
+    </kerberos>
+</yandex>
+```
+
+#### RQ.SRS-016.Kerberos.Configuration.MultipleKerberosSections
+version: 1.0
+
+[ClickHouse] SHALL disable [Kerberos] and reject [Kerberos] authentication in case multiple `kerberos` sections are present in `config.xml`.
+
+#### RQ.SRS-016.Kerberos.Configuration.WrongUserRealm
+version: 1.0
+
+[ClickHouse] SHALL reject [Kerberos] authentication if user's realm specified in `users.xml` doesn't match the realm of the principal trying to authenticate.
+
+#### RQ.SRS-016.Kerberos.Configuration.PrincipalAndRealmSpecified
+version: 1.0
+
+[ClickHouse] SHALL generate an exception and disable [Kerberos] in case both `realm` and `principal` sections are defined in `config.xml`.
+
+#### RQ.SRS-016.Kerberos.Configuration.MultiplePrincipalSections
+version: 1.0
+
+[ClickHouse] SHALL generate an exception and disable [Kerberos] in case multiple `principal` sections are specified inside `kerberos` section in `config.xml`.
+
+#### RQ.SRS-016.Kerberos.Configuration.MultipleRealmSections
+version: 1.0
+
+[ClickHouse] SHALL generate an exception and disable [Kerberos] in case multiple `realm` sections are specified inside `kerberos` section in `config.xml`.
+
+### Valid User
+
+#### RQ.SRS-016.Kerberos.ValidUser.XMLConfiguredUser
+version: 1.0
+
+[ClickHouse] SHALL accept [Kerberos] authentication for a user that is configured in `users.xml` and has [Kerberos] enabled, i.e.:
+
+```xml
+<yandex>
+    <!- ... -->
+    <users>
+        <!- ... -->
+        <my_user>
+            <!- ... -->
+            <kerberos>
+                <realm>EXAMPLE.COM</realm>
+            </kerberos>
+        </my_user>
+    </users>
+</yandex>
+```
+
+#### RQ.SRS-016.Kerberos.ValidUser.RBACConfiguredUser
+version: 1.0
+
+[ClickHouse] SHALL accept [Kerberos] authentication if user is configured to authenticate via [Kerberos] using SQL queries
+
+```sql
+CREATE USER my_user IDENTIFIED WITH kerberos REALM 'EXAMPLE.COM'
+```
+
+or
+
+```sql
+CREATE USER my_user IDENTIFIED WITH kerberos
+```
+
+#### RQ.SRS-016.Kerberos.ValidUser.KerberosNotConfigured
+version: 1.0
+
+[ClickHouse] SHALL reject [Kerberos] authentication if username is valid but [ClickHouse] user is not configured to be authenticated using [Kerberos].
+
+### Invalid User
+
+#### RQ.SRS-016.Kerberos.InvalidUser
+version: 1.0
+
+[ClickHouse] SHALL reject [Kerberos] authentication if name of the principal attempting to authenticate does not translate to a valid [ClickHouse] username configured in `users.xml` or via SQL workflow.
+
+#### RQ.SRS-016.Kerberos.InvalidUser.UserDeleted
+version: 1.0
+
+[ClickHouse] SHALL reject [Kerberos] authentication if [ClickHouse] user was removed from the database using an SQL query.
+
+### Kerberos Not Available
+
+#### RQ.SRS-016.Kerberos.KerberosNotAvailable.InvalidServerTicket
+version: 1.0
+
+[ClickHouse] SHALL reject [Kerberos] authentication if [ClickHouse] user is configured to be authenticated using [Kerberos] and [Kerberos] server is unavailable, but [ClickHouse] doesn't have a valid Kerberos ticket or the ticket is expired.
+
+#### RQ.SRS-016.Kerberos.KerberosNotAvailable.InvalidClientTicket
+version: 1.0
+
+[ClickHouse] SHALL reject [Kerberos] authentication if [ClickHouse] user is configured to to be authenticated using [Kerberos] and [Kerberos] server is unavailable, but the client doesn't have a valid Kerberos ticket or the ticket is expired.
+
+#### RQ.SRS-016.Kerberos.KerberosNotAvailable.ValidTickets
+version: 1.0
+
+[ClickHouse] SHALL accept [Kerberos] authentication if no [Kerberos] server is reachable, but [ClickHouse] is configured to use valid credentials and [ClickHouse] has already processed some valid kerberized request (so it was granted a ticket), and the client has a valid ticket as well.
+
+### Kerberos Restarted
+
+#### RQ.SRS-016.Kerberos.KerberosServerRestarted
+version: 1.0
+
+[ClickHouse] SHALL accept [Kerberos] authentication if [Kerberos] server was restarted.
+
+### Performance
+
+#### RQ.SRS-016.Kerberos.Performance
+version: 1.0
+
+[ClickHouse]'s performance for [Kerberos] authentication SHALL be comparable to regular authentication.
+
+### Parallel Requests processing
+
+#### RQ.SRS-016.Kerberos.Parallel
+version: 1.0
+
+[ClickHouse] SHALL support parallel authentication using [Kerberos].
+
+#### RQ.SRS-016.Kerberos.Parallel.ValidRequests.KerberosAndNonKerberos
+version: 1.0
+
+[ClickHouse] SHALL support processing of simultaneous kerberized (for users configured to authenticate via [Kerberos]) and non-kerberized (for users configured to authenticate with any other means) requests.
+
+#### RQ.SRS-016.Kerberos.Parallel.ValidRequests.SameCredentials
+version: 1.0
+
+[ClickHouse] SHALL support processing of simultaneously sent [Kerberos] requests under the same credentials.
+
+#### RQ.SRS-016.Kerberos.Parallel.ValidRequests.DifferentCredentials
+version: 1.0
+
+[ClickHouse] SHALL support processing of simultaneously sent [Kerberos] requests under different credentials.
+
+#### RQ.SRS-016.Kerberos.Parallel.ValidInvalid
+version: 1.0
+
+[ClickHouse] SHALL support parallel authentication of users using [Kerberos] server, some of which are valid and some invalid. Valid users' authentication should not be affected by invalid users' attempts.
+
+#### RQ.SRS-016.Kerberos.Parallel.Deletion
+version: 1.0
+
+[ClickHouse] SHALL not crash when two or more [Kerberos] users are simultaneously deleting one another.
+
+## References
+
+* **ClickHouse:** https://clickhouse.tech
+* **GitHub Repository:** https://github.com/ClickHouse/ClickHouse/blob/master/tests/testflows/kerberos/requirements/requirements.md
+* **Revision History:** https://github.com/ClickHouse/ClickHouse/commits/master/tests/testflows/kerberos/requirements/requirements.md
+* **Git:** https://git-scm.com/
+* **Kerberos terminology:** https://web.mit.edu/kerberos/kfw-4.1/kfw-4.1/kfw-4.1-help/html/kerberos_terminology.htm
+
+[Kerberos]: https://en.wikipedia.org/wiki/Kerberos_(protocol)
+[SPNEGO]: https://en.wikipedia.org/wiki/SPNEGO
+[ClickHouse]: https://clickhouse.tech
+[GitHub]: https://gitlab.com
+[GitHub Repository]: https://github.com/ClickHouse/ClickHouse/blob/master/tests/testflows/kerberos/requirements/requirements.md
+[Revision History]: https://github.com/ClickHouse/ClickHouse/commits/master/tests/testflows/kerberos/requirements/requirements.md
+[Git]: https://git-scm.com/
+[Kerberos terminology]: https://web.mit.edu/kerberos/kfw-4.1/kfw-4.1/kfw-4.1-help/html/kerberos_terminology.htm
+
diff --git a/tests/testflows/kerberos/requirements/requirements.py b/tests/testflows/kerberos/requirements/requirements.py
new file mode 100644
index 00000000000..5c49e7d127f
--- /dev/null
+++ b/tests/testflows/kerberos/requirements/requirements.py
@@ -0,0 +1,800 @@
+# These requirements were auto generated
+# from software requirements specification (SRS)
+# document by TestFlows v1.6.201216.1172002.
+# Do not edit by hand but re-generate instead
+# using 'tfs requirements generate' command.
+from testflows.core import Specification
+from testflows.core import Requirement
+
+Heading = Specification.Heading
+
+RQ_SRS_016_Kerberos = Requirement(
+    name='RQ.SRS-016.Kerberos',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support user authentication using [Kerberos] server.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.1.1')
+
+RQ_SRS_016_Kerberos_Configuration_MultipleAuthMethods = Requirement(
+    name='RQ.SRS-016.Kerberos.Configuration.MultipleAuthMethods',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        "[ClickHouse] SHALL generate an exception and TERMINATE in case some user in `users.xml` has a `<kerberos>` section specified alongside with any other authentication method's section, e.g. `ldap`, `password`.\n"
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.2.1')
+
+RQ_SRS_016_Kerberos_Configuration_KerberosNotEnabled = Requirement(
+    name='RQ.SRS-016.Kerberos.Configuration.KerberosNotEnabled',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL reject [Kerberos] authentication in case user is properly configured for using Kerberos, but Kerberos itself is not enabled in `config.xml`. For example:\n'
+        '\n'
+        '```xml\n'
+        '<yandex>\n'
+        '    <!- ... -->\n'
+        '    <kerberos />\n'
+        '</yandex>\n'
+        '```\n'
+        '```xml\n'
+        '<yandex>\n'
+        '    <!- ... -->\n'
+        '    <kerberos>\n'
+        '        <principal>HTTP/clickhouse.example.com@EXAMPLE.COM</principal>\n'
+        '    </kerberos>\n'
+        '</yandex>\n'
+        '```\n'
+        '```xml\n'
+        '<yandex>\n'
+        '    <!- ... -->\n'
+        '    <kerberos>\n'
+        '        <realm>EXAMPLE.COM</realm>\n'
+        '    </kerberos>\n'
+        '</yandex>\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.2.2')
+
+RQ_SRS_016_Kerberos_Configuration_MultipleKerberosSections = Requirement(
+    name='RQ.SRS-016.Kerberos.Configuration.MultipleKerberosSections',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL disable [Kerberos] and reject [Kerberos] authentication in case multiple `kerberos` sections are present in `config.xml`.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.2.3')
+
+RQ_SRS_016_Kerberos_Configuration_WrongUserRealm = Requirement(
+    name='RQ.SRS-016.Kerberos.Configuration.WrongUserRealm',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        "[ClickHouse] SHALL reject [Kerberos] authentication if user's realm specified in `users.xml` doesn't match the realm of the principal trying to authenticate.\n"
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.2.4')
+
+RQ_SRS_016_Kerberos_Configuration_PrincipalAndRealmSpecified = Requirement(
+    name='RQ.SRS-016.Kerberos.Configuration.PrincipalAndRealmSpecified',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL generate an exception and disable [Kerberos] in case both `realm` and `principal` sections are defined in `config.xml`.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.2.5')
+
+RQ_SRS_016_Kerberos_Configuration_MultiplePrincipalSections = Requirement(
+    name='RQ.SRS-016.Kerberos.Configuration.MultiplePrincipalSections',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL generate an exception and disable [Kerberos] in case multiple `principal` sections are specified inside `kerberos` section in `config.xml`.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.2.6')
+
+RQ_SRS_016_Kerberos_Configuration_MultipleRealmSections = Requirement(
+    name='RQ.SRS-016.Kerberos.Configuration.MultipleRealmSections',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL generate an exception and disable [Kerberos] in case multiple `realm` sections are specified inside `kerberos` section in `config.xml`.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.2.7')
+
+RQ_SRS_016_Kerberos_ValidUser_XMLConfiguredUser = Requirement(
+    name='RQ.SRS-016.Kerberos.ValidUser.XMLConfiguredUser',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL accept [Kerberos] authentication for a user that is configured in `users.xml` and has [Kerberos] enabled, i.e.:\n'
+        '\n'
+        '```xml\n'
+        '<yandex>\n'
+        '    <!- ... -->\n'
+        '    <users>\n'
+        '        <!- ... -->\n'
+        '        <my_user>\n'
+        '            <!- ... -->\n'
+        '            <kerberos>\n'
+        '                <realm>EXAMPLE.COM</realm>\n'
+        '            </kerberos>\n'
+        '        </my_user>\n'
+        '    </users>\n'
+        '</yandex>\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.3.1')
+
+RQ_SRS_016_Kerberos_ValidUser_RBACConfiguredUser = Requirement(
+    name='RQ.SRS-016.Kerberos.ValidUser.RBACConfiguredUser',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL accept [Kerberos] authentication if user is configured to authenticate via [Kerberos] using SQL queries\n'
+        '\n'
+        '```sql\n'
+        "CREATE USER my_user IDENTIFIED WITH kerberos REALM 'EXAMPLE.COM'\n"
+        '```\n'
+        '\n'
+        'or\n'
+        '\n'
+        '```sql\n'
+        'CREATE USER my_user IDENTIFIED WITH kerberos\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.3.2')
+
+RQ_SRS_016_Kerberos_ValidUser_KerberosNotConfigured = Requirement(
+    name='RQ.SRS-016.Kerberos.ValidUser.KerberosNotConfigured',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL reject [Kerberos] authentication if username is valid but [ClickHouse] user is not configured to be authenticated using [Kerberos].\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.3.3')
+
+RQ_SRS_016_Kerberos_InvalidUser = Requirement(
+    name='RQ.SRS-016.Kerberos.InvalidUser',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL reject [Kerberos] authentication if name of the principal attempting to authenticate does not translate to a valid [ClickHouse] username configured in `users.xml` or via SQL workflow.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.4.1')
+
+RQ_SRS_016_Kerberos_InvalidUser_UserDeleted = Requirement(
+    name='RQ.SRS-016.Kerberos.InvalidUser.UserDeleted',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL reject [Kerberos] authentication if [ClickHouse] user was removed from the database using an SQL query.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.4.2')
+
+RQ_SRS_016_Kerberos_KerberosNotAvailable_InvalidServerTicket = Requirement(
+    name='RQ.SRS-016.Kerberos.KerberosNotAvailable.InvalidServerTicket',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        "[ClickHouse] SHALL reject [Kerberos] authentication if [ClickHouse] user is configured to be authenticated using [Kerberos] and [Kerberos] server is unavailable, but [ClickHouse] doesn't have a valid Kerberos ticket or the ticket is expired.\n"
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.5.1')
+
+RQ_SRS_016_Kerberos_KerberosNotAvailable_InvalidClientTicket = Requirement(
+    name='RQ.SRS-016.Kerberos.KerberosNotAvailable.InvalidClientTicket',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        "[ClickHouse] SHALL reject [Kerberos] authentication if [ClickHouse] user is configured to to be authenticated using [Kerberos] and [Kerberos] server is unavailable, but the client doesn't have a valid Kerberos ticket or the ticket is expired.\n"
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.5.2')
+
+RQ_SRS_016_Kerberos_KerberosNotAvailable_ValidTickets = Requirement(
+    name='RQ.SRS-016.Kerberos.KerberosNotAvailable.ValidTickets',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL accept [Kerberos] authentication if no [Kerberos] server is reachable, but [ClickHouse] is configured to use valid credentials and [ClickHouse] has already processed some valid kerberized request (so it was granted a ticket), and the client has a valid ticket as well.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.5.3')
+
+RQ_SRS_016_Kerberos_KerberosServerRestarted = Requirement(
+    name='RQ.SRS-016.Kerberos.KerberosServerRestarted',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL accept [Kerberos] authentication if [Kerberos] server was restarted.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.6.1')
+
+RQ_SRS_016_Kerberos_Performance = Requirement(
+    name='RQ.SRS-016.Kerberos.Performance',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        "[ClickHouse]'s performance for [Kerberos] authentication SHALL be comparable to regular authentication.\n"
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.7.1')
+
+RQ_SRS_016_Kerberos_Parallel = Requirement(
+    name='RQ.SRS-016.Kerberos.Parallel',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support parallel authentication using [Kerberos].\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.8.1')
+
+RQ_SRS_016_Kerberos_Parallel_ValidRequests_KerberosAndNonKerberos = Requirement(
+    name='RQ.SRS-016.Kerberos.Parallel.ValidRequests.KerberosAndNonKerberos',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support processing of simultaneous kerberized (for users configured to authenticate via [Kerberos]) and non-kerberized (for users configured to authenticate with any other means) requests.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.8.2')
+
+RQ_SRS_016_Kerberos_Parallel_ValidRequests_SameCredentials = Requirement(
+    name='RQ.SRS-016.Kerberos.Parallel.ValidRequests.SameCredentials',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support processing of simultaneously sent [Kerberos] requests under the same credentials.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.8.3')
+
+RQ_SRS_016_Kerberos_Parallel_ValidRequests_DifferentCredentials = Requirement(
+    name='RQ.SRS-016.Kerberos.Parallel.ValidRequests.DifferentCredentials',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support processing of simultaneously sent [Kerberos] requests under different credentials.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.8.4')
+
+RQ_SRS_016_Kerberos_Parallel_ValidInvalid = Requirement(
+    name='RQ.SRS-016.Kerberos.Parallel.ValidInvalid',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        "[ClickHouse] SHALL support parallel authentication of users using [Kerberos] server, some of which are valid and some invalid. Valid users' authentication should not be affected by invalid users' attempts.\n"
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.8.5')
+
+RQ_SRS_016_Kerberos_Parallel_Deletion = Requirement(
+    name='RQ.SRS-016.Kerberos.Parallel.Deletion',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL not crash when two or more [Kerberos] users are simultaneously deleting one another.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.8.6')
+
+QA_SRS016_ClickHouse_Kerberos_Authentication = Specification(
+    name='QA-SRS016 ClickHouse Kerberos Authentication', 
+    description=None,
+    author='Andrey Zvonov',
+    date='December 14, 2020', 
+    status='-', 
+    approved_by='-',
+    approved_date='-',
+    approved_version='-',
+    version=None,
+    group=None,
+    type=None,
+    link=None,
+    uid=None,
+    parent=None,
+    children=None,
+    headings=(
+        Heading(name='Revision History', level=1, num='1'),
+        Heading(name='Introduction', level=1, num='2'),
+        Heading(name='Terminology', level=1, num='3'),
+        Heading(name='Requirements', level=1, num='4'),
+        Heading(name='Generic', level=2, num='4.1'),
+        Heading(name='RQ.SRS-016.Kerberos', level=3, num='4.1.1'),
+        Heading(name='Configuration', level=2, num='4.2'),
+        Heading(name='RQ.SRS-016.Kerberos.Configuration.MultipleAuthMethods', level=3, num='4.2.1'),
+        Heading(name='RQ.SRS-016.Kerberos.Configuration.KerberosNotEnabled', level=3, num='4.2.2'),
+        Heading(name='RQ.SRS-016.Kerberos.Configuration.MultipleKerberosSections', level=3, num='4.2.3'),
+        Heading(name='RQ.SRS-016.Kerberos.Configuration.WrongUserRealm', level=3, num='4.2.4'),
+        Heading(name='RQ.SRS-016.Kerberos.Configuration.PrincipalAndRealmSpecified', level=3, num='4.2.5'),
+        Heading(name='RQ.SRS-016.Kerberos.Configuration.MultiplePrincipalSections', level=3, num='4.2.6'),
+        Heading(name='RQ.SRS-016.Kerberos.Configuration.MultipleRealmSections', level=3, num='4.2.7'),
+        Heading(name='Valid User', level=2, num='4.3'),
+        Heading(name='RQ.SRS-016.Kerberos.ValidUser.XMLConfiguredUser', level=3, num='4.3.1'),
+        Heading(name='RQ.SRS-016.Kerberos.ValidUser.RBACConfiguredUser', level=3, num='4.3.2'),
+        Heading(name='RQ.SRS-016.Kerberos.ValidUser.KerberosNotConfigured', level=3, num='4.3.3'),
+        Heading(name='Invalid User', level=2, num='4.4'),
+        Heading(name='RQ.SRS-016.Kerberos.InvalidUser', level=3, num='4.4.1'),
+        Heading(name='RQ.SRS-016.Kerberos.InvalidUser.UserDeleted', level=3, num='4.4.2'),
+        Heading(name='Kerberos Not Available', level=2, num='4.5'),
+        Heading(name='RQ.SRS-016.Kerberos.KerberosNotAvailable.InvalidServerTicket', level=3, num='4.5.1'),
+        Heading(name='RQ.SRS-016.Kerberos.KerberosNotAvailable.InvalidClientTicket', level=3, num='4.5.2'),
+        Heading(name='RQ.SRS-016.Kerberos.KerberosNotAvailable.ValidTickets', level=3, num='4.5.3'),
+        Heading(name='Kerberos Restarted', level=2, num='4.6'),
+        Heading(name='RQ.SRS-016.Kerberos.KerberosServerRestarted', level=3, num='4.6.1'),
+        Heading(name='Performance', level=2, num='4.7'),
+        Heading(name='RQ.SRS-016.Kerberos.Performance', level=3, num='4.7.1'),
+        Heading(name='Parallel Requests processing', level=2, num='4.8'),
+        Heading(name='RQ.SRS-016.Kerberos.Parallel', level=3, num='4.8.1'),
+        Heading(name='RQ.SRS-016.Kerberos.Parallel.ValidRequests.KerberosAndNonKerberos', level=3, num='4.8.2'),
+        Heading(name='RQ.SRS-016.Kerberos.Parallel.ValidRequests.SameCredentials', level=3, num='4.8.3'),
+        Heading(name='RQ.SRS-016.Kerberos.Parallel.ValidRequests.DifferentCredentials', level=3, num='4.8.4'),
+        Heading(name='RQ.SRS-016.Kerberos.Parallel.ValidInvalid', level=3, num='4.8.5'),
+        Heading(name='RQ.SRS-016.Kerberos.Parallel.Deletion', level=3, num='4.8.6'),
+        Heading(name='References', level=1, num='5'),
+        ),
+    requirements=(
+        RQ_SRS_016_Kerberos,
+        RQ_SRS_016_Kerberos_Configuration_MultipleAuthMethods,
+        RQ_SRS_016_Kerberos_Configuration_KerberosNotEnabled,
+        RQ_SRS_016_Kerberos_Configuration_MultipleKerberosSections,
+        RQ_SRS_016_Kerberos_Configuration_WrongUserRealm,
+        RQ_SRS_016_Kerberos_Configuration_PrincipalAndRealmSpecified,
+        RQ_SRS_016_Kerberos_Configuration_MultiplePrincipalSections,
+        RQ_SRS_016_Kerberos_Configuration_MultipleRealmSections,
+        RQ_SRS_016_Kerberos_ValidUser_XMLConfiguredUser,
+        RQ_SRS_016_Kerberos_ValidUser_RBACConfiguredUser,
+        RQ_SRS_016_Kerberos_ValidUser_KerberosNotConfigured,
+        RQ_SRS_016_Kerberos_InvalidUser,
+        RQ_SRS_016_Kerberos_InvalidUser_UserDeleted,
+        RQ_SRS_016_Kerberos_KerberosNotAvailable_InvalidServerTicket,
+        RQ_SRS_016_Kerberos_KerberosNotAvailable_InvalidClientTicket,
+        RQ_SRS_016_Kerberos_KerberosNotAvailable_ValidTickets,
+        RQ_SRS_016_Kerberos_KerberosServerRestarted,
+        RQ_SRS_016_Kerberos_Performance,
+        RQ_SRS_016_Kerberos_Parallel,
+        RQ_SRS_016_Kerberos_Parallel_ValidRequests_KerberosAndNonKerberos,
+        RQ_SRS_016_Kerberos_Parallel_ValidRequests_SameCredentials,
+        RQ_SRS_016_Kerberos_Parallel_ValidRequests_DifferentCredentials,
+        RQ_SRS_016_Kerberos_Parallel_ValidInvalid,
+        RQ_SRS_016_Kerberos_Parallel_Deletion,
+        ),
+    content='''
+# QA-SRS016 ClickHouse Kerberos Authentication
+# Software Requirements Specification
+
+(c) 2020 Altinity LTD. All Rights Reserved.
+
+**Document status:** Confidential
+
+**Author:** Andrey Zvonov
+
+**Date:** December 14, 2020
+
+## Approval
+
+**Status:** -
+
+**Version:** -
+
+**Approved by:** -
+
+**Date:** -
+
+
+## Table of Contents
+
+* 1 [Revision History](#revision-history)
+* 2 [Introduction](#introduction)
+* 3 [Terminology](#terminology)
+* 4 [Requirements](#requirements)
+  * 4.1 [Generic](#generic)
+    * 4.1.1 [RQ.SRS-016.Kerberos](#rqsrs-016kerberos)
+  * 4.2 [Configuration](#configuration)
+    * 4.2.1 [RQ.SRS-016.Kerberos.Configuration.MultipleAuthMethods](#rqsrs-016kerberosconfigurationmultipleauthmethods)
+    * 4.2.2 [RQ.SRS-016.Kerberos.Configuration.KerberosNotEnabled](#rqsrs-016kerberosconfigurationkerberosnotenabled)
+    * 4.2.3 [RQ.SRS-016.Kerberos.Configuration.MultipleKerberosSections](#rqsrs-016kerberosconfigurationmultiplekerberossections)
+    * 4.2.4 [RQ.SRS-016.Kerberos.Configuration.WrongUserRealm](#rqsrs-016kerberosconfigurationwronguserrealm)
+    * 4.2.5 [RQ.SRS-016.Kerberos.Configuration.PrincipalAndRealmSpecified](#rqsrs-016kerberosconfigurationprincipalandrealmspecified)
+    * 4.2.6 [RQ.SRS-016.Kerberos.Configuration.MultiplePrincipalSections](#rqsrs-016kerberosconfigurationmultipleprincipalsections)
+    * 4.2.7 [RQ.SRS-016.Kerberos.Configuration.MultipleRealmSections](#rqsrs-016kerberosconfigurationmultiplerealmsections)
+  * 4.3 [Valid User](#valid-user)
+    * 4.3.1 [RQ.SRS-016.Kerberos.ValidUser.XMLConfiguredUser](#rqsrs-016kerberosvaliduserxmlconfigureduser)
+    * 4.3.2 [RQ.SRS-016.Kerberos.ValidUser.RBACConfiguredUser](#rqsrs-016kerberosvaliduserrbacconfigureduser)
+    * 4.3.3 [RQ.SRS-016.Kerberos.ValidUser.KerberosNotConfigured](#rqsrs-016kerberosvaliduserkerberosnotconfigured)
+  * 4.4 [Invalid User](#invalid-user)
+    * 4.4.1 [RQ.SRS-016.Kerberos.InvalidUser](#rqsrs-016kerberosinvaliduser)
+    * 4.4.2 [RQ.SRS-016.Kerberos.InvalidUser.UserDeleted](#rqsrs-016kerberosinvaliduseruserdeleted)
+  * 4.5 [Kerberos Not Available](#kerberos-not-available)
+    * 4.5.1 [RQ.SRS-016.Kerberos.KerberosNotAvailable.InvalidServerTicket](#rqsrs-016kerberoskerberosnotavailableinvalidserverticket)
+    * 4.5.2 [RQ.SRS-016.Kerberos.KerberosNotAvailable.InvalidClientTicket](#rqsrs-016kerberoskerberosnotavailableinvalidclientticket)
+    * 4.5.3 [RQ.SRS-016.Kerberos.KerberosNotAvailable.ValidTickets](#rqsrs-016kerberoskerberosnotavailablevalidtickets)
+  * 4.6 [Kerberos Restarted](#kerberos-restarted)
+    * 4.6.1 [RQ.SRS-016.Kerberos.KerberosServerRestarted](#rqsrs-016kerberoskerberosserverrestarted)
+  * 4.7 [Performance](#performance)
+    * 4.7.1 [RQ.SRS-016.Kerberos.Performance](#rqsrs-016kerberosperformance)
+  * 4.8 [Parallel Requests processing](#parallel-requests-processing)
+    * 4.8.1 [RQ.SRS-016.Kerberos.Parallel](#rqsrs-016kerberosparallel)
+    * 4.8.2 [RQ.SRS-016.Kerberos.Parallel.ValidRequests.KerberosAndNonKerberos](#rqsrs-016kerberosparallelvalidrequestskerberosandnonkerberos)
+    * 4.8.3 [RQ.SRS-016.Kerberos.Parallel.ValidRequests.SameCredentials](#rqsrs-016kerberosparallelvalidrequestssamecredentials)
+    * 4.8.4 [RQ.SRS-016.Kerberos.Parallel.ValidRequests.DifferentCredentials](#rqsrs-016kerberosparallelvalidrequestsdifferentcredentials)
+    * 4.8.5 [RQ.SRS-016.Kerberos.Parallel.ValidInvalid](#rqsrs-016kerberosparallelvalidinvalid)
+    * 4.8.6 [RQ.SRS-016.Kerberos.Parallel.Deletion](#rqsrs-016kerberosparalleldeletion)
+* 5 [References](#references)
+
+## Revision History
+
+This document is stored in an electronic form using [Git] source control management software
+hosted in a [GitLab Repository].  
+All the updates are tracked using the [Git]'s [Revision History].
+
+## Introduction
+
+This document specifies the behavior for authenticating existing users using [Kerberos] authentication protocol.
+Existing [ClickHouse] users, that are properly configured, have an ability to authenticate using [Kerberos]. Kerberos authentication is only supported for HTTP requests, and users configured to authenticate via Kerberos cannot be authenticated by any other means of authentication.
+
+In order to use Kerberos authentication, Kerberos needs to be properly configured in the environment: Kerberos server must be present and user's and server's credentials must be set up. Configuring the Kerberos environment is outside the scope of this document.
+
+## Terminology
+
+* **Principal** -
+  A unique identity that uses [Kerberos].
+
+* **Realm** -
+  A logical group of resources and identities that use [Kerberos].
+
+* **Ticket** -
+  An encrypted block of data that authenticates principal.
+
+* **Credentials** -
+  A Kerberos ticket and a session key.
+
+* **Kerberized request** -
+  A HTTP query to ClickHouse server, which uses GSS [SPNEGO] and [Kerberos] to authenticate client.
+
+* **Unkerberized request** -
+  A HTTP query to ClickHouse server, which uses any other mean of authentication than GSS [SPNEGO] or [Kerberos].
+
+For a more detailed descriprion, visit [Kerberos terminology].
+
+## Requirements
+
+### Generic
+
+#### RQ.SRS-016.Kerberos
+version: 1.0
+
+[ClickHouse] SHALL support user authentication using [Kerberos] server.
+
+### Configuration
+
+#### RQ.SRS-016.Kerberos.Configuration.MultipleAuthMethods
+version: 1.0
+
+[ClickHouse] SHALL generate an exception and TERMINATE in case some user in `users.xml` has a `<kerberos>` section specified alongside with any other authentication method's section, e.g. `ldap`, `password`.
+
+#### RQ.SRS-016.Kerberos.Configuration.KerberosNotEnabled
+version: 1.0
+
+[ClickHouse] SHALL reject [Kerberos] authentication in case user is properly configured for using Kerberos, but Kerberos itself is not enabled in `config.xml`. For example:
+
+```xml
+<yandex>
+    <!- ... -->
+    <kerberos />
+</yandex>
+```
+```xml
+<yandex>
+    <!- ... -->
+    <kerberos>
+        <principal>HTTP/clickhouse.example.com@EXAMPLE.COM</principal>
+    </kerberos>
+</yandex>
+```
+```xml
+<yandex>
+    <!- ... -->
+    <kerberos>
+        <realm>EXAMPLE.COM</realm>
+    </kerberos>
+</yandex>
+```
+
+#### RQ.SRS-016.Kerberos.Configuration.MultipleKerberosSections
+version: 1.0
+
+[ClickHouse] SHALL disable [Kerberos] and reject [Kerberos] authentication in case multiple `kerberos` sections are present in `config.xml`.
+
+#### RQ.SRS-016.Kerberos.Configuration.WrongUserRealm
+version: 1.0
+
+[ClickHouse] SHALL reject [Kerberos] authentication if user's realm specified in `users.xml` doesn't match the realm of the principal trying to authenticate.
+
+#### RQ.SRS-016.Kerberos.Configuration.PrincipalAndRealmSpecified
+version: 1.0
+
+[ClickHouse] SHALL generate an exception and disable [Kerberos] in case both `realm` and `principal` sections are defined in `config.xml`.
+
+#### RQ.SRS-016.Kerberos.Configuration.MultiplePrincipalSections
+version: 1.0
+
+[ClickHouse] SHALL generate an exception and disable [Kerberos] in case multiple `principal` sections are specified inside `kerberos` section in `config.xml`.
+
+#### RQ.SRS-016.Kerberos.Configuration.MultipleRealmSections
+version: 1.0
+
+[ClickHouse] SHALL generate an exception and disable [Kerberos] in case multiple `realm` sections are specified inside `kerberos` section in `config.xml`.
+
+### Valid User
+
+#### RQ.SRS-016.Kerberos.ValidUser.XMLConfiguredUser
+version: 1.0
+
+[ClickHouse] SHALL accept [Kerberos] authentication for a user that is configured in `users.xml` and has [Kerberos] enabled, i.e.:
+
+```xml
+<yandex>
+    <!- ... -->
+    <users>
+        <!- ... -->
+        <my_user>
+            <!- ... -->
+            <kerberos>
+                <realm>EXAMPLE.COM</realm>
+            </kerberos>
+        </my_user>
+    </users>
+</yandex>
+```
+
+#### RQ.SRS-016.Kerberos.ValidUser.RBACConfiguredUser
+version: 1.0
+
+[ClickHouse] SHALL accept [Kerberos] authentication if user is configured to authenticate via [Kerberos] using SQL queries
+
+```sql
+CREATE USER my_user IDENTIFIED WITH kerberos REALM 'EXAMPLE.COM'
+```
+
+or
+
+```sql
+CREATE USER my_user IDENTIFIED WITH kerberos
+```
+
+#### RQ.SRS-016.Kerberos.ValidUser.KerberosNotConfigured
+version: 1.0
+
+[ClickHouse] SHALL reject [Kerberos] authentication if username is valid but [ClickHouse] user is not configured to be authenticated using [Kerberos].
+
+### Invalid User
+
+#### RQ.SRS-016.Kerberos.InvalidUser
+version: 1.0
+
+[ClickHouse] SHALL reject [Kerberos] authentication if name of the principal attempting to authenticate does not translate to a valid [ClickHouse] username configured in `users.xml` or via SQL workflow.
+
+#### RQ.SRS-016.Kerberos.InvalidUser.UserDeleted
+version: 1.0
+
+[ClickHouse] SHALL reject [Kerberos] authentication if [ClickHouse] user was removed from the database using an SQL query.
+
+### Kerberos Not Available
+
+#### RQ.SRS-016.Kerberos.KerberosNotAvailable.InvalidServerTicket
+version: 1.0
+
+[ClickHouse] SHALL reject [Kerberos] authentication if [ClickHouse] user is configured to be authenticated using [Kerberos] and [Kerberos] server is unavailable, but [ClickHouse] doesn't have a valid Kerberos ticket or the ticket is expired.
+
+#### RQ.SRS-016.Kerberos.KerberosNotAvailable.InvalidClientTicket
+version: 1.0
+
+[ClickHouse] SHALL reject [Kerberos] authentication if [ClickHouse] user is configured to to be authenticated using [Kerberos] and [Kerberos] server is unavailable, but the client doesn't have a valid Kerberos ticket or the ticket is expired.
+
+#### RQ.SRS-016.Kerberos.KerberosNotAvailable.ValidTickets
+version: 1.0
+
+[ClickHouse] SHALL accept [Kerberos] authentication if no [Kerberos] server is reachable, but [ClickHouse] is configured to use valid credentials and [ClickHouse] has already processed some valid kerberized request (so it was granted a ticket), and the client has a valid ticket as well.
+
+### Kerberos Restarted
+
+#### RQ.SRS-016.Kerberos.KerberosServerRestarted
+version: 1.0
+
+[ClickHouse] SHALL accept [Kerberos] authentication if [Kerberos] server was restarted.
+
+### Performance
+
+#### RQ.SRS-016.Kerberos.Performance
+version: 1.0
+
+[ClickHouse]'s performance for [Kerberos] authentication SHALL be comparable to regular authentication.
+
+### Parallel Requests processing
+
+#### RQ.SRS-016.Kerberos.Parallel
+version: 1.0
+
+[ClickHouse] SHALL support parallel authentication using [Kerberos].
+
+#### RQ.SRS-016.Kerberos.Parallel.ValidRequests.KerberosAndNonKerberos
+version: 1.0
+
+[ClickHouse] SHALL support processing of simultaneous kerberized (for users configured to authenticate via [Kerberos]) and non-kerberized (for users configured to authenticate with any other means) requests.
+
+#### RQ.SRS-016.Kerberos.Parallel.ValidRequests.SameCredentials
+version: 1.0
+
+[ClickHouse] SHALL support processing of simultaneously sent [Kerberos] requests under the same credentials.
+
+#### RQ.SRS-016.Kerberos.Parallel.ValidRequests.DifferentCredentials
+version: 1.0
+
+[ClickHouse] SHALL support processing of simultaneously sent [Kerberos] requests under different credentials.
+
+#### RQ.SRS-016.Kerberos.Parallel.ValidInvalid
+version: 1.0
+
+[ClickHouse] SHALL support parallel authentication of users using [Kerberos] server, some of which are valid and some invalid. Valid users' authentication should not be affected by invalid users' attempts.
+
+#### RQ.SRS-016.Kerberos.Parallel.Deletion
+version: 1.0
+
+[ClickHouse] SHALL not crash when two or more [Kerberos] users are simultaneously deleting one another.
+
+## References
+
+* **ClickHouse:** https://clickhouse.tech
+* **Gitlab Repository:** https://gitlab.com/altinity-qa/documents/qa-srs016-clickhouse-kerberos-authentication/-/blob/master/QA_SRS016_ClickHouse_Kerberos_Authentication.md
+* **Revision History:** https://gitlab.com/altinity-qa/documents/qa-srs016-clickhouse-kerberos-authentication/-/commits/master/QA_SRS016_ClickHouse_Kerberos_Authentication.md
+* **Git:** https://git-scm.com/
+* **Kerberos terminology:** https://web.mit.edu/kerberos/kfw-4.1/kfw-4.1/kfw-4.1-help/html/kerberos_terminology.htm
+
+[Kerberos]: https://en.wikipedia.org/wiki/Kerberos_(protocol)
+[SPNEGO]: https://en.wikipedia.org/wiki/SPNEGO
+[ClickHouse]: https://clickhouse.tech
+[GitLab]: https://gitlab.com
+[GitLab Repository]: https://gitlab.com/altinity-qa/documents/qa-srs016-clickhouse-kerberos-authentication/-/blob/master/QA_SRS016_ClickHouse_Kerberos_Authentication.md
+[Revision History]: https://gitlab.com/altinity-qa/documents/qa-srs016-clickhouse-kerberos-authentication/-/commits/master/QA_SRS016_ClickHouse_Kerberos_Authentication.md
+[Git]: https://git-scm.com/
+[Kerberos terminology]: https://web.mit.edu/kerberos/kfw-4.1/kfw-4.1/kfw-4.1-help/html/kerberos_terminology.htm
+''')
diff --git a/tests/testflows/kerberos/tests/common.py b/tests/testflows/kerberos/tests/common.py
new file mode 100644
index 00000000000..e768a78cad5
--- /dev/null
+++ b/tests/testflows/kerberos/tests/common.py
@@ -0,0 +1,225 @@
+from testflows.core import *
+from testflows.asserts import error
+from contextlib import contextmanager
+import xml.etree.ElementTree as xmltree
+
+import time
+import uuid
+
+
+def getuid():
+    return str(uuid.uuid1()).replace('-', '_')
+
+
+def xml_append(root, tag, text=Null):
+    element = xmltree.Element(tag)
+    if text:
+        element.text = text
+    root.append(element)
+
+
+def xml_write(data, filename):
+    strdata = xmltree.tostring(data)
+    with open(filename, "wb") as f:
+        f.write(strdata)
+
+
+def xml_parse_file(filename):
+    return xmltree.parse(filename).getroot()
+
+
+def create_default_config(filename):
+    contents = ""
+    if "kerberos_users.xml" in filename:
+        contents = "<yandex><users><kerberos_user><kerberos><realm>EXAMPLE.COM" \
+               "</realm></kerberos></kerberos_user></users></yandex>"
+    elif "kerberos.xml" in filename:
+        contents = "<yandex><kerberos><realm>EXAMPLE.COM</realm></kerberos></yandex>"
+
+    with open(filename, "w") as f:
+        f.write(contents)
+
+
+def test_select_query(node, krb_auth=True, req="SELECT currentUser()"):
+    """ Helper forming a HTTP query to ClickHouse server
+    """
+    if krb_auth:
+        return f"echo '{req}' | curl --negotiate -u : 'http://{node.name}:8123/' --data-binary @-"
+    else:
+        return f"echo '{req}' | curl 'http://{node.name}:8123/' --data-binary @-"
+
+
+@TestStep(Given)
+def kinit_no_keytab(self, node, principal="kerberos_user", lifetime_option="-l 10:00"):
+    """ Helper for obtaining Kerberos ticket for client
+    """
+    try:
+        node.cmd("echo pwd | kinit admin/admin")
+        node.cmd(f"kadmin -w pwd -q \"add_principal -pw pwd {principal}\"")
+        node.cmd(f"echo pwd | kinit {lifetime_option} {principal}")
+        yield
+    finally:
+        node.cmd("kdestroy")
+
+
+@TestStep(Given)
+def create_server_principal(self, node):
+    """ Helper for obtaining Kerberos ticket for server
+    """
+    try:
+        node.cmd("echo pwd | kinit admin/admin")
+        node.cmd(f"kadmin -w pwd -q \"add_principal -randkey HTTP/docker-compose_{node.name}_1.docker-compose_default\"")
+        node.cmd(f"kadmin -w pwd -q \"ktadd -k /etc/krb5.keytab HTTP/docker-compose_{node.name}_1.docker-compose_default\"")
+        yield
+    finally:
+        node.cmd("kdestroy")
+        node.cmd("rm /etc/krb5.keytab")
+
+
+@TestStep(Given)
+def save_file_state(self, node, filename):
+    """ Save current file and then restore it, restarting the node
+    """
+    try:
+        with When("I save file state"):
+            with open(filename, 'r') as f:
+                a = f.read()
+        yield
+    finally:
+        with Finally("I restore initial state"):
+            with open(filename, 'w') as f:
+                f.write(a)
+            node.restart()
+
+
+@TestStep(Given)
+def temp_erase(self, node, filename=None):
+    """ Temporary erasing config file and restarting the node
+    """
+    if filename is None:
+        filename = f"kerberos/configs/{node.name}/config.d/kerberos.xml"
+    with When("I save file state"):
+        with open(filename, 'r') as f:
+            a = f.read()
+    try:
+        with Then("I overwrite file to be dummy"):
+            with open(filename, 'w') as f:
+                f.write("<yandex></yandex>\n")
+            node.restart()
+            yield
+    finally:
+        with Finally("I restore initial file state"):
+            with open(filename, 'w') as f:
+                f.write(a)
+            node.restart()
+
+
+def restart(node, config_path, safe=False, timeout=60):
+    """Restart ClickHouse server and wait for config to be reloaded.
+    """
+
+    filename = '/etc/clickhouse-server/config.xml' if 'config.d' in config_path else '/etc/clickhouse-server/users.xml'
+    with When("I restart ClickHouse server node"):
+        with node.cluster.shell(node.name) as bash:
+            bash.expect(bash.prompt)
+
+            with By("closing terminal to the node to be restarted"):
+                bash.close()
+
+            with And("getting current log size"):
+                logsize = \
+                    node.command("stat --format=%s /var/log/clickhouse-server/clickhouse-server.log").output.split(" ")[0].strip()
+
+            with And("restarting ClickHouse server"):
+                node.restart(safe=safe)
+
+            with Then("tailing the log file from using previous log size as the offset"):
+                bash.prompt = bash.__class__.prompt
+                bash.open()
+                bash.send(f"tail -c +{logsize} -f /var/log/clickhouse-server/clickhouse-server.log")
+
+            with And("waiting for config reload message in the log file"):
+                bash.expect(
+                    f"ConfigReloader: Loaded config '{filename}', performed update on configuration",
+                    timeout=timeout)
+
+
+@TestStep
+def check_wrong_config(self, node, client, config_path, modify_file, log_error="", output="",
+                       tail=120, timeout=60, healthy_on_restart=True):
+    """Check that ClickHouse errors when trying to load invalid configuration file.
+    """
+    preprocessed_name = "config.xml" if "config.d" in config_path else "users.xml"
+
+    full_config_path = "/etc/clickhouse-server/config.d/kerberos.xml" if "config.d" in config_path else "/etc/clickhouse-server/users.d/kerberos-users.xml"
+
+    uid = getuid()
+
+    try:
+        with Given("I save config file to restore it later"):
+            with open(config_path, 'r') as f:
+                initial_contents = f.read()
+
+        with And("I prepare the error log by writing empty lines into it"):
+            node.command("echo -e \"%s\" > /var/log/clickhouse-server/clickhouse-server.err.log" % ("-\\n" * tail))
+
+        with When("I modify xml file"):
+            root = xml_parse_file(config_path)
+            root = modify_file(root)
+            root.append(xmltree.fromstring(f"<comment>{uid}</comment>"))
+            config_contents = xmltree.tostring(root, encoding='utf8', method='xml').decode('utf-8')
+            command = f"cat <<HEREDOC > {full_config_path}\n{config_contents}\nHEREDOC"
+            node.command(command, steps=False, exitcode=0)
+            # time.sleep(1)
+
+        with Then(f"{preprocessed_name} should be updated", description=f"timeout {timeout}"):
+            started = time.time()
+            command = f"cat /var/lib/clickhouse/preprocessed_configs/{preprocessed_name} | grep {uid} > /dev/null"
+            while time.time() - started < timeout:
+                exitcode = node.command(command, steps=False).exitcode
+                if exitcode == 0:
+                    break
+                time.sleep(1)
+            assert exitcode == 0, error()
+
+        with When("I restart ClickHouse to apply the config changes"):
+            if output:
+                node.restart(safe=False, wait_healthy=True)
+            else:
+                node.restart(safe=False, wait_healthy=False)
+
+        if output != "":
+            with Then(f"check {output} is in output"):
+                time.sleep(5)
+                started = time.time()
+                while time.time() - started < timeout:
+                    kinit_no_keytab(node=client)
+                    create_server_principal(node=node)
+                    r = client.cmd(test_select_query(node=node), no_checks=True)
+                    if output in r.output:
+                        assert True, error()
+                        break
+                    time.sleep(1)
+                else:
+                    assert False, error()
+
+    finally:
+        with Finally("I restore original config"):
+            with By("restoring the (correct) config file"):
+                with open(config_path, 'w') as f:
+                    f.write(initial_contents)
+            with And("restarting the node"):
+                node.restart(safe=False)
+
+    if log_error != "":
+        with Then("error log should contain the expected error message"):
+            started = time.time()
+            command = f"tail -n {tail} /var/log/clickhouse-server/clickhouse-server.err.log | grep \"{log_error}\""
+            while time.time() - started < timeout:
+                exitcode = node.command(command, steps=False).exitcode
+                if exitcode == 0:
+                    break
+                time.sleep(1)
+            assert exitcode == 0, error()
+
+
diff --git a/tests/testflows/kerberos/tests/config.py b/tests/testflows/kerberos/tests/config.py
new file mode 100644
index 00000000000..3f4bf15deb5
--- /dev/null
+++ b/tests/testflows/kerberos/tests/config.py
@@ -0,0 +1,163 @@
+from testflows.core import *
+from kerberos.tests.common import *
+from kerberos.requirements.requirements import *
+
+import time
+import datetime
+import itertools
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_016_Kerberos_Configuration_KerberosNotEnabled("1.0")
+)
+def kerberos_not_enabled(self):
+    """ClickHouse SHALL reject Kerberos authentication if user is properly configured for Kerberos,
+    but Kerberos itself is not enabled in config.xml.
+    """
+    ch_nodes = self.context.ch_nodes
+    config_path = f"kerberos/configs/{ch_nodes[0].name}/config.d/kerberos.xml"
+
+    def modify_file(root):
+        return xmltree.fromstring("<yandex></yandex>")
+
+    check_wrong_config(node=ch_nodes[0], client=ch_nodes[2], config_path=config_path, modify_file=modify_file,
+                       output="Kerberos is not enabled")
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_016_Kerberos_Configuration_MultipleKerberosSections("1.0")
+)
+def multiple_kerberos(self):
+    """ClickHouse SHALL disable Kerberos authentication if more than one kerberos sections specified in config.xml.
+    """
+    ch_nodes = self.context.ch_nodes
+    config_path = f"kerberos/configs/{ch_nodes[0].name}/config.d/kerberos.xml"
+
+    def modify_file(root):
+        second_section = "<kerberos><realm>EXAM.COM</realm></kerberos>"
+        root.append(xmltree.fromstring(second_section))
+        return root
+
+    check_wrong_config(node=ch_nodes[0], client=ch_nodes[2], config_path=config_path, modify_file=modify_file,
+                       log_error="Multiple kerberos sections are not allowed", healthy_on_restart=False)
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_016_Kerberos_Configuration_WrongUserRealm("1.0")
+)
+def wrong_user_realm(self):
+    """ClickHouse SHALL reject Kerberos authentication if user's realm specified in users.xml
+    doesn't match the realm of the principal trying to authenticate.
+    """
+
+    ch_nodes = self.context.ch_nodes
+    config_path = f"kerberos/configs/{ch_nodes[0].name}/users.d/kerberos-users.xml"
+
+    def modify_file(root):
+        krb = root.find('users').find('kerberos_user')
+        krb.find('kerberos').find('realm').text = "OTHER.COM"
+        return root
+
+    check_wrong_config(node=ch_nodes[0], client=ch_nodes[2], config_path=config_path, modify_file=modify_file,
+                       output="Authentication failed")
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_016_Kerberos_Configuration_MultipleAuthMethods("1.0")
+)
+def multiple_auth_methods(self):
+    """ClickHouse SHALL reject Kerberos authentication if other
+    auth method is specified for user alongside with Kerberos.
+    """
+    ch_nodes = self.context.ch_nodes
+    config_path = f"kerberos/configs/{ch_nodes[0].name}/users.d/kerberos-users.xml"
+
+    def modify_file(root):
+        krb = root.find('users').find('kerberos_user')
+        xml_append(krb, 'password', 'qwerty')
+        return root
+
+    check_wrong_config(node=ch_nodes[0], client=ch_nodes[2], config_path=config_path, modify_file=modify_file,
+                       log_error="More than one field of", healthy_on_restart=False)
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_016_Kerberos_Configuration_PrincipalAndRealmSpecified("1.0")
+)
+def principal_and_realm_specified(self):
+    """ClickHouse SHALL drop an exception if both realm and principal fields are specified in config.xml.
+    """
+    ch_nodes = self.context.ch_nodes
+    config_path = f"kerberos/configs/{ch_nodes[0].name}/config.d/kerberos.xml"
+
+    def modify_file(root):
+        krb = root.find('kerberos')
+        xml_append(krb, 'principal', 'HTTP/srv1@EXAMPLE.COM')
+        return root
+
+    check_wrong_config(node=ch_nodes[0], client=ch_nodes[2], config_path=config_path, modify_file=modify_file,
+                       log_error="Realm and principal name cannot be specified simultaneously",
+                       output="Kerberos is not enabled")
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_016_Kerberos_Configuration_MultipleRealmSections("1.0")
+)
+def multiple_realm(self):
+    """ClickHouse SHALL throw an exception and disable Kerberos if more than one realm is specified in config.xml.
+    """
+    ch_nodes = self.context.ch_nodes
+    config_path = f"kerberos/configs/{ch_nodes[0].name}/config.d/kerberos.xml"
+
+    def modify_file(root):
+        krb = root.find('kerberos')
+        xml_append(krb, 'realm', 'EXAM.COM')
+        return root
+
+    check_wrong_config(node=ch_nodes[0], client=ch_nodes[2], config_path=config_path, modify_file=modify_file,
+                       log_error="Multiple realm sections are not allowed")
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_016_Kerberos_Configuration_MultiplePrincipalSections("1.0")
+)
+def multiple_principal(self):
+    """ClickHouse SHALL throw an exception and disable Kerberos if more than one principal is specified in config.xml.
+    """
+    ch_nodes = self.context.ch_nodes
+    config_path = f"kerberos/configs/{ch_nodes[0].name}/config.d/kerberos.xml"
+
+    def modify_file(root):
+        krb = root.find('kerberos')
+        krb.remove(krb.find('realm'))
+        xml_append(krb, 'principal', 'HTTP/s1@EXAMPLE.COM')
+        xml_append(krb, 'principal', 'HTTP/s2@EXAMPLE.COM')
+        return root
+
+    check_wrong_config(node=ch_nodes[0], client=ch_nodes[2], config_path=config_path, modify_file=modify_file,
+                       log_error="Multiple principal sections are not allowed")
+
+
+
+
+
+
+
+@TestFeature
+def config(self):
+    """Perform ClickHouse Kerberos authentication testing for incorrect configuration files
+    """
+
+    self.context.ch_nodes = [self.context.cluster.node(f"clickhouse{i}") for i in range(1, 4)]
+    self.context.krb_server = self.context.cluster.node("kerberos")
+    self.context.clients = [self.context.cluster.node(f"krb-client{i}") for i in range(1, 6)]
+
+    for scenario in loads(current_module(), Scenario, Suite):
+        Scenario(run=scenario, flags=TE)
diff --git a/tests/testflows/kerberos/tests/generic.py b/tests/testflows/kerberos/tests/generic.py
new file mode 100644
index 00000000000..3276fd5ec5f
--- /dev/null
+++ b/tests/testflows/kerberos/tests/generic.py
@@ -0,0 +1,332 @@
+from testflows.core import *
+from kerberos.tests.common import *
+from kerberos.requirements.requirements import *
+
+import time
+import datetime
+import itertools
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_016_Kerberos_ValidUser_XMLConfiguredUser("1.0")
+)
+def xml_configured_user(self):
+    """ClickHouse SHALL accept Kerberos authentication for valid XML-configured user
+    """
+    ch_nodes = self.context.ch_nodes
+
+    with Given("kinit for client"):
+        kinit_no_keytab(node=ch_nodes[2])
+
+    with And("kinit for server"):
+        create_server_principal(node=ch_nodes[0])
+
+    with When("I attempt to authenticate"):
+        r = ch_nodes[2].cmd(test_select_query(node=ch_nodes[0]))
+
+    with Then(f"I expect 'kerberos_user'"):
+        assert r.output == "kerberos_user", error()
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_016_Kerberos_ValidUser_RBACConfiguredUser("1.0")
+)
+def rbac_configured_user(self):
+    """ClickHouse SHALL accept Kerberos authentication for valid RBAC-configured user
+    """
+    ch_nodes = self.context.ch_nodes
+
+    with Given("kinit for client"):
+        kinit_no_keytab(node=ch_nodes[2], principal="krb_rbac")
+
+    with And("kinit for server"):
+        create_server_principal(node=ch_nodes[0])
+
+    with When("I create a RBAC user"):
+        ch_nodes[0].query("CREATE USER krb_rbac IDENTIFIED WITH kerberos REALM 'EXAMPLE.COM'")
+
+    with When("I attempt to authenticate"):
+        r = ch_nodes[2].cmd(test_select_query(node=ch_nodes[0]))
+
+    with Then("I restore server original state"):
+        ch_nodes[0].query("DROP USER krb_rbac")
+
+    with Finally("I expect 'krb_rbac'"):
+        assert r.output == "krb_rbac", error()
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_016_Kerberos_KerberosNotAvailable_InvalidServerTicket("1.0")
+)
+def invalid_server_ticket(self):
+    """ClickHouse SHALL reject Kerberos authentication no Kerberos server is reachable
+    and CH-server has no valid ticket (or the existing ticket is outdated).
+    """
+    ch_nodes = self.context.ch_nodes
+
+    with Given("kinit for client"):
+        kinit_no_keytab(node=ch_nodes[2])
+
+    with And("setting up server principal"):
+        create_server_principal(node=ch_nodes[0])
+
+    with And("I kill kerberos-server"):
+        self.context.krb_server.stop()
+
+    with When("I attempt to authenticate as kerberos_user"):
+        r = ch_nodes[2].cmd(test_select_query(node=ch_nodes[0]))
+
+    with Then("I start kerberos server again"):
+        self.context.krb_server.start()
+        ch_nodes[2].cmd("kdestroy")
+        while True:
+            kinit_no_keytab(node=ch_nodes[2])
+            if ch_nodes[2].cmd(test_select_query(node=ch_nodes[0])).output == "kerberos_user":
+                break
+        ch_nodes[2].cmd("kdestroy")
+
+    with And("I expect the user to be default"):
+        assert r.output == "default", error()
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_016_Kerberos_KerberosNotAvailable_InvalidClientTicket("1.0")
+)
+def invalid_client_ticket(self):
+    """ClickHouse SHALL reject Kerberos authentication no Kerberos server is reachable
+    and client has no valid ticket (or the existing ticket is outdated).
+    """
+    ch_nodes = self.context.ch_nodes
+
+    with Given("kinit for client"):
+        kinit_no_keytab(node=ch_nodes[2], lifetime_option="-l 00:00:05")
+
+    with And("setting up server principal"):
+        create_server_principal(node=ch_nodes[0])
+
+    with And("I kill kerberos-server"):
+        self.context.krb_server.stop()
+
+    with And("I wait until client ticket is expired"):
+        time.sleep(10)
+
+    with When("I attempt to authenticate as kerberos_user"):
+        r = ch_nodes[2].cmd(test_select_query(node=ch_nodes[0]))
+
+    with Then("I expect the user to be default"):
+        assert r.output == "default", error()
+
+    with Finally("I start kerberos server again"):
+        self.context.krb_server.start()
+        ch_nodes[2].cmd("kdestroy")
+        while True:
+            kinit_no_keytab(node=ch_nodes[2])
+            if ch_nodes[2].cmd(test_select_query(node=ch_nodes[0])).output == "kerberos_user":
+                break
+        ch_nodes[2].cmd("kdestroy")
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_016_Kerberos_KerberosNotAvailable_ValidTickets("1.0")
+)
+def kerberos_unreachable_valid_tickets(self):
+    """ClickHouse SHALL accept Kerberos authentication if no Kerberos server is reachable
+    but both CH-server and client have valid tickets.
+    """
+    ch_nodes = self.context.ch_nodes
+
+    with Given("kinit for client"):
+        kinit_no_keytab(node=ch_nodes[2])
+
+    with And("setting up server principal"):
+        create_server_principal(node=ch_nodes[0])
+
+    with And("make sure server obtained ticket"):
+        ch_nodes[2].cmd(test_select_query(node=ch_nodes[0]))
+
+    with And("I kill kerberos-server"):
+        self.context.krb_server.stop()
+
+    with When("I attempt to authenticate as kerberos_user"):
+        r = ch_nodes[2].cmd(test_select_query(node=ch_nodes[0]))
+
+    with Then("I expect the user to be default"):
+        assert r.output == "kerberos_user", error()
+
+    with Finally("I start kerberos server again"):
+        self.context.krb_server.start()
+        ch_nodes[2].cmd("kdestroy")
+        while True:
+            kinit_no_keytab(node=ch_nodes[2])
+            if ch_nodes[2].cmd(test_select_query(node=ch_nodes[0])).output == "kerberos_user":
+                break
+        ch_nodes[2].cmd("kdestroy")
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_016_Kerberos_ValidUser_KerberosNotConfigured("1.0")
+)
+def kerberos_not_configured(self):
+    """ClickHouse SHALL reject Kerberos authentication if user is not a kerberos-auth user.
+    """
+    ch_nodes = self.context.ch_nodes
+
+    with Given("kinit for client"):
+        kinit_no_keytab(node=ch_nodes[2], principal="unkerberized")
+
+    with And('Kinit for server'):
+        create_server_principal(node=ch_nodes[0])
+
+    with By("I add non-Kerberos user to ClickHouse"):
+        ch_nodes[0].query("CREATE USER unkerberized IDENTIFIED WITH plaintext_password BY 'qwerty'")
+
+    with When("I attempt to authenticate"):
+        r = ch_nodes[2].cmd(test_select_query(node=ch_nodes[0]), no_checks=True)
+
+    with Then("I expect authentication failure"):
+        assert "Authentication failed" in r.output, error()
+
+    with Finally("I drop the user"):
+        ch_nodes[0].query("DROP USER unkerberized")
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_016_Kerberos_KerberosServerRestarted("1.0")
+)
+def kerberos_server_restarted(self):
+    """ClickHouse SHALL accept Kerberos authentication if Kerberos server was restarted.
+    """
+    ch_nodes = self.context.ch_nodes
+    krb_server = self.context.krb_server
+
+    with Given("I obtain keytab for user"):
+        kinit_no_keytab(node=ch_nodes[2])
+    with And("I create server principal"):
+        create_server_principal(node=ch_nodes[0])
+    with And("I obtain server ticket"):
+        ch_nodes[2].cmd(test_select_query(node=ch_nodes[0]), no_checks=True)
+    with By("I dump, restart and restore kerberos server"):
+        krb_server.cmd("kdb5_util dump dump.dmp", shell_command="/bin/sh")
+        krb_server.restart()
+        krb_server.cmd("kdb5_util load dump.dmp", shell_command="/bin/sh")
+
+    with When("I attempt to authenticate"):
+        r = ch_nodes[2].cmd(test_select_query(node=ch_nodes[0]))
+
+    with And("I wait for kerberos to be healthy"):
+        ch_nodes[2].cmd("kdestroy")
+        while True:
+            kinit_no_keytab(node=ch_nodes[2])
+            if ch_nodes[2].cmd(test_select_query(node=ch_nodes[0])).output == "kerberos_user":
+                break
+
+    with Then(f"I expect kerberos_user"):
+        assert r.output == "kerberos_user", error()
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_016_Kerberos_InvalidUser("1.0")
+)
+def invalid_user(self):
+    """ClickHouse SHALL reject Kerberos authentication for invalid principal
+    """
+    ch_nodes = self.context.ch_nodes
+
+    with Given("I obtain keytab for invalid user"):
+        kinit_no_keytab(node=ch_nodes[2], principal="invalid")
+
+    with And("I create server principal"):
+        create_server_principal(node=ch_nodes[0])
+
+    with When("I attempt to authenticate"):
+        r = ch_nodes[2].cmd(test_select_query(node=ch_nodes[0]), no_checks=True)
+
+    with Then(f"I expect default"):
+        assert "Authentication failed: password is incorrect or there is no user with such name" in r.output, error()
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_016_Kerberos_InvalidUser_UserDeleted("1.0")
+)
+def user_deleted(self):
+    """ClickHouse SHALL reject Kerberos authentication if Kerberos user was deleted prior to query.
+    """
+    ch_nodes = self.context.ch_nodes
+
+    with Given("I obtain keytab for a user"):
+        kinit_no_keytab(node=ch_nodes[2], principal="krb_rbac")
+
+    with And("I create server principal"):
+        create_server_principal(node=ch_nodes[0])
+
+    with And("I create and then delete kerberized user"):
+        ch_nodes[0].query("CREATE USER krb_rbac IDENTIFIED WITH kerberos REALM 'EXAMPLE.COM'")
+        ch_nodes[0].query("DROP USER krb_rbac")
+
+    with When("I attempt to authenticate"):
+        r = ch_nodes[2].cmd(test_select_query(node=ch_nodes[0]), no_checks=True)
+
+    with Then(f"I expect error"):
+        assert "Authentication failed: password is incorrect or there is no user with such name" in r.output, error()
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_016_Kerberos_Performance("1.0")
+)
+def authentication_performance(self):
+    """ClickHouse's performance for Kerberos authentication SHALL shall be comparable to regular authentication.
+    """
+    ch_nodes = self.context.ch_nodes
+
+    with Given("I obtain keytab for a user"):
+        kinit_no_keytab(node=ch_nodes[2])
+
+    with And("I create server principal"):
+        create_server_principal(node=ch_nodes[0])
+
+    with And("I create a password-identified user"):
+        ch_nodes[0].query("CREATE USER pwd_user IDENTIFIED WITH plaintext_password BY 'pwd'")
+
+    with When("I measure kerberos auth time"):
+        start_time_krb = time.time()
+        for i in range(100):
+            ch_nodes[2].cmd(test_select_query(node=ch_nodes[0]))
+        krb_time = (time.time() - start_time_krb) / 100
+
+    with And("I measure password auth time"):
+        start_time_usual = time.time()
+        for i in range(100):
+            ch_nodes[2].cmd(f"echo 'SELECT 1' | curl 'http://pwd_user:pwd@clickhouse1:8123/' -d @-")
+        usual_time = (time.time() - start_time_usual) / 100
+
+    with Then("measuring the performance compared to password auth"):
+        metric("percentage_improvement", units="%", value=100*(krb_time - usual_time)/usual_time)
+
+    with Finally("I drop pwd_user"):
+        ch_nodes[0].query("DROP USER pwd_user")
+
+
+
+
+
+@TestFeature
+def generic(self):
+    """Perform ClickHouse Kerberos authentication testing
+    """
+
+    self.context.ch_nodes = [self.context.cluster.node(f"clickhouse{i}") for i in range(1, 4)]
+    self.context.krb_server = self.context.cluster.node("kerberos")
+    self.context.clients = [self.context.cluster.node(f"krb-client{i}") for i in range(1, 6)]
+
+    for scenario in loads(current_module(), Scenario, Suite):
+        Scenario(run=scenario, flags=TE)
diff --git a/tests/testflows/kerberos/tests/parallel.py b/tests/testflows/kerberos/tests/parallel.py
new file mode 100644
index 00000000000..694245e524c
--- /dev/null
+++ b/tests/testflows/kerberos/tests/parallel.py
@@ -0,0 +1,204 @@
+from testflows.core import *
+from kerberos.tests.common import *
+from kerberos.requirements.requirements import *
+from multiprocessing.dummy import Pool
+
+import time
+import datetime
+import itertools
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_016_Kerberos_Parallel_ValidRequests_SameCredentials("1.0")
+)
+def valid_requests_same_credentials(self):
+    """ClickHouse should be able to process parallel requests sent under the same credentials.
+    """
+    ch_nodes = self.context.ch_nodes
+
+    with Given("kinit for clients"):
+        kinit_no_keytab(node=ch_nodes[1])
+        kinit_no_keytab(node=ch_nodes[2])
+
+    with And('create server principal'):
+        create_server_principal(node=ch_nodes[0])
+
+    def helper(cmd):
+        return cmd(test_select_query(node=ch_nodes[0]))
+
+    for i in range(15):
+        pool = Pool(2)
+        tasks = []
+        with When("I try simultaneous authentication"):
+            tasks.append(pool.apply_async(helper, (ch_nodes[1].cmd, )))
+            tasks.append(pool.apply_async(helper, (ch_nodes[2].cmd, )))
+            tasks[0].wait(timeout=200)
+            tasks[1].wait(timeout=200)
+
+        with Then(f"I expect requests to success"):
+            assert tasks[0].get(timeout=300).output == "kerberos_user", error()
+            assert tasks[1].get(timeout=300).output == "kerberos_user", error()
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_016_Kerberos_Parallel_ValidRequests_DifferentCredentials("1.0")
+)
+def valid_requests_different_credentials(self):
+    """ClickHouse should be able to process parallel requests by different users.
+    """
+    ch_nodes = self.context.ch_nodes
+
+    with Given("kinit for clients"):
+        kinit_no_keytab(node=ch_nodes[1], principal="krb1")
+        kinit_no_keytab(node=ch_nodes[2], principal="krb2")
+
+    with And("create server principal"):
+        create_server_principal(node=ch_nodes[0])
+
+    def helper(cmd):
+        return cmd(test_select_query(node=ch_nodes[0]))
+
+    for i in range(15):
+        pool = Pool(2)
+        tasks = []
+
+        with And("add 2 kerberos users via RBAC"):
+            ch_nodes[0].query("CREATE USER krb1 IDENTIFIED WITH kerberos REALM 'EXAMPLE.COM'")
+            ch_nodes[0].query("CREATE USER krb2 IDENTIFIED WITH kerberos REALM 'EXAMPLE.COM'")
+
+        with When("I try simultaneous authentication for valid and invalid"):
+            tasks.append(pool.apply_async(helper, (ch_nodes[1].cmd, )))
+            tasks.append(pool.apply_async(helper, (ch_nodes[2].cmd, )))
+            tasks[0].wait(timeout=200)
+            tasks[1].wait(timeout=200)
+
+        with Then(f"I expect have auth failure"):
+            assert tasks[1].get(timeout=300).output == "krb2", error()
+            assert tasks[0].get(timeout=300).output == "krb1", error()
+
+        with Finally("I make sure both users are removed"):
+            ch_nodes[0].query("DROP USER krb1", no_checks=True)
+            ch_nodes[0].query("DROP USER krb2", no_checks=True)
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_016_Kerberos_Parallel_ValidInvalid("1.0")
+)
+def valid_invalid(self):
+    """Valid users' Kerberos authentication should not be affected by invalid users' attempts.
+    """
+    ch_nodes = self.context.ch_nodes
+
+    with Given("kinit for clients"):
+        kinit_no_keytab(node=ch_nodes[2])
+        kinit_no_keytab(node=ch_nodes[1], principal="invalid_user")
+
+    with And('create server principal'):
+        create_server_principal(node=ch_nodes[0])
+
+    def helper(cmd):
+        return cmd(test_select_query(node=ch_nodes[0]), no_checks=True)
+
+    for i in range(15):
+        pool = Pool(2)
+        tasks = []
+        with When("I try simultaneous authentication for valid and invalid"):
+            tasks.append(pool.apply_async(helper, (ch_nodes[1].cmd, )))     # invalid
+            tasks.append(pool.apply_async(helper, (ch_nodes[2].cmd, )))     # valid
+
+        with Then(f"I expect have auth failure"):
+            assert tasks[1].get(timeout=300).output == "kerberos_user", error()
+            assert tasks[0].get(timeout=300).output != "kerberos_user", error()
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_016_Kerberos_Parallel_Deletion("1.0")
+)
+def deletion(self):
+    """ClickHouse SHALL NOT crash when 2 Kerberos users are simultaneously deleting one another.
+    """
+    ch_nodes = self.context.ch_nodes
+
+    with Given("kinit for clients"):
+        kinit_no_keytab(node=ch_nodes[1], principal="krb1")
+        kinit_no_keytab(node=ch_nodes[2], principal="krb2")
+
+    with And("create server principal"):
+        create_server_principal(node=ch_nodes[0])
+
+    def helper(cmd, todel):
+        return cmd(test_select_query(node=ch_nodes[0], req=f"DROP USER {todel}"), no_checks=True)
+
+    for i in range(15):
+        pool = Pool(2)
+        tasks = []
+
+        with And("add 2 kerberos users via RBAC"):
+            ch_nodes[0].query("CREATE USER krb1 IDENTIFIED WITH kerberos REALM 'EXAMPLE.COM'")
+            ch_nodes[0].query("CREATE USER krb2 IDENTIFIED WITH kerberos REALM 'EXAMPLE.COM'")
+            ch_nodes[0].query("GRANT ACCESS MANAGEMENT ON *.* TO krb1")
+            ch_nodes[0].query("GRANT ACCESS MANAGEMENT ON *.* TO krb2")
+
+
+        with When("I try simultaneous authentication for valid and invalid"):
+            tasks.append(pool.apply_async(helper, (ch_nodes[1].cmd, "krb2")))
+            tasks.append(pool.apply_async(helper, (ch_nodes[2].cmd, "krb1")))
+            tasks[0].wait(timeout=200)
+            tasks[1].wait(timeout=200)
+
+        with Then(f"I check CH is alive"):
+            assert ch_nodes[0].query("SELECT 1").output == "1", error()
+
+        with Finally("I make sure both users are removed"):
+            ch_nodes[0].query("DROP USER krb1", no_checks=True)
+            ch_nodes[0].query("DROP USER krb2", no_checks=True)
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_016_Kerberos_Parallel_ValidRequests_KerberosAndNonKerberos("1.0")
+)
+def kerberos_and_nonkerberos(self):
+    """ClickHouse SHALL support processing of simultaneous kerberized and non-kerberized requests.
+    """
+    ch_nodes = self.context.ch_nodes
+
+    with Given("kinit for clients"):
+        kinit_no_keytab(node=ch_nodes[2])
+
+    with And('create server principal'):
+        create_server_principal(node=ch_nodes[0])
+
+    def helper(cmd, krb_auth):
+        return cmd(test_select_query(node=ch_nodes[0], krb_auth=krb_auth), no_checks=True)
+
+    for i in range(15):
+        pool = Pool(2)
+        tasks = []
+        with When("I try simultaneous authentication for valid and invalid"):
+            tasks.append(pool.apply_async(helper, (ch_nodes[1].cmd, False)))  # non-kerberos
+            tasks.append(pool.apply_async(helper, (ch_nodes[2].cmd, True)))  # kerberos
+
+        with Then(f"I expect have auth failure"):
+            assert tasks[1].get(timeout=300).output == "kerberos_user", error()
+            assert tasks[0].get(timeout=300).output == "default", error()
+
+
+@TestFeature
+@Requirements(
+    RQ_SRS_016_Kerberos_Parallel("1.0")
+)
+def parallel(self):
+    """Perform ClickHouse Kerberos authentication testing for incorrect configuration files
+    """
+
+    self.context.ch_nodes = [self.context.cluster.node(f"clickhouse{i}") for i in range(1, 4)]
+    self.context.krb_server = self.context.cluster.node("kerberos")
+    self.context.clients = [self.context.cluster.node(f"krb-client{i}") for i in range(1, 6)]
+
+    for scenario in loads(current_module(), Scenario, Suite):
+        Scenario(run=scenario, flags=TE)
diff --git a/tests/testflows/ldap/authentication/configs/clickhouse/config.xml b/tests/testflows/ldap/authentication/configs/clickhouse/config.xml
index e28a0c8e255..3db8338b865 100644
--- a/tests/testflows/ldap/authentication/configs/clickhouse/config.xml
+++ b/tests/testflows/ldap/authentication/configs/clickhouse/config.xml
@@ -412,7 +412,7 @@
             </retention>
             <retention>
                 <age>86400</age>
-                <precision>60</precision>
+                <precision>7200</precision>
             </retention>
         </pattern>
         <default>
diff --git a/tests/testflows/ldap/authentication/docker-compose/zookeeper-service.yml b/tests/testflows/ldap/authentication/docker-compose/zookeeper-service.yml
index 6691a2df31c..ca732a48dbd 100644
--- a/tests/testflows/ldap/authentication/docker-compose/zookeeper-service.yml
+++ b/tests/testflows/ldap/authentication/docker-compose/zookeeper-service.yml
@@ -2,7 +2,7 @@ version: '2.3'
 
 services:
   zookeeper:
-    image: zookeeper:3.4.12
+    image: zookeeper:3.6.2
     expose:
       - "2181"
     environment:
diff --git a/tests/testflows/ldap/authentication/requirements/requirements.md b/tests/testflows/ldap/authentication/requirements/requirements.md
index 27ce8c921a0..e27a0ca14f7 100644
--- a/tests/testflows/ldap/authentication/requirements/requirements.md
+++ b/tests/testflows/ldap/authentication/requirements/requirements.md
@@ -468,7 +468,7 @@ version: 1.0
 the following RBAC command
 
 ```sql
-CREATE USER name IDENTIFIED WITH ldap_server BY 'server_name'
+CREATE USER name IDENTIFIED WITH ldap SERVER 'server_name'
 ```
 
 #### RQ.SRS-007.LDAP.Configuration.User.Syntax
diff --git a/tests/testflows/ldap/authentication/requirements/requirements.py b/tests/testflows/ldap/authentication/requirements/requirements.py
index 25b943d18c2..2437711dd22 100644
--- a/tests/testflows/ldap/authentication/requirements/requirements.py
+++ b/tests/testflows/ldap/authentication/requirements/requirements.py
@@ -903,7 +903,7 @@ RQ_SRS_007_LDAP_Configuration_User_RBAC = Requirement(
         'the following RBAC command\n'
         '\n'
         '```sql\n'
-        "CREATE USER name IDENTIFIED WITH ldap_server BY 'server_name'\n"
+        "CREATE USER name IDENTIFIED WITH ldap SERVER 'server_name'\n"
         '```\n'
         '\n'
         ),
@@ -1841,7 +1841,7 @@ version: 1.0
 the following RBAC command
 
 ```sql
-CREATE USER name IDENTIFIED WITH ldap_server BY 'server_name'
+CREATE USER name IDENTIFIED WITH ldap SERVER 'server_name'
 ```
 
 #### RQ.SRS-007.LDAP.Configuration.User.Syntax
diff --git a/tests/testflows/ldap/authentication/tests/authentications.py b/tests/testflows/ldap/authentication/tests/authentications.py
index b54cc880bbc..909cc61cdbb 100644
--- a/tests/testflows/ldap/authentication/tests/authentications.py
+++ b/tests/testflows/ldap/authentication/tests/authentications.py
@@ -747,10 +747,7 @@ def verification_cooldown_performance(self, server, rbac=False, iterations=5000)
         no_vcd_time = repeat_requests(server=server, iterations=iterations, vcd_value="0", rbac=rbac)
         metric("login_with_vcd_value_0", units="seconds", value=no_vcd_time)
 
-    with Then("The performance with verification cooldown parameter set is better than the performance with no verification cooldown parameter."):
-        assert no_vcd_time > vcd_time, error()
-
-    with And("Log the performance improvement as a percentage."):
+    with Then("Log the performance improvement as a percentage"):
         metric("percentage_improvement", units="%", value=100*(no_vcd_time - vcd_time)/vcd_time)
 
 @TestOutline
diff --git a/tests/testflows/ldap/authentication/tests/common.py b/tests/testflows/ldap/authentication/tests/common.py
index 7f9f16e827c..6b6ce0413a4 100644
--- a/tests/testflows/ldap/authentication/tests/common.py
+++ b/tests/testflows/ldap/authentication/tests/common.py
@@ -248,7 +248,7 @@ def add_users_identified_with_ldap(*users):
     try:
         with Given("I create users"):
             for user in users:
-                node.query(f"CREATE USER '{user['username']}' IDENTIFIED WITH ldap_server BY '{user['server']}'")
+                node.query(f"CREATE USER '{user['username']}' IDENTIFIED WITH ldap SERVER '{user['server']}'")
         yield
     finally:
         with Finally("I remove users"):
diff --git a/tests/testflows/ldap/external_user_directory/configs/clickhouse/config.xml b/tests/testflows/ldap/external_user_directory/configs/clickhouse/config.xml
index e28a0c8e255..3db8338b865 100644
--- a/tests/testflows/ldap/external_user_directory/configs/clickhouse/config.xml
+++ b/tests/testflows/ldap/external_user_directory/configs/clickhouse/config.xml
@@ -412,7 +412,7 @@
             </retention>
             <retention>
                 <age>86400</age>
-                <precision>60</precision>
+                <precision>7200</precision>
             </retention>
         </pattern>
         <default>
diff --git a/tests/testflows/ldap/external_user_directory/docker-compose/zookeeper-service.yml b/tests/testflows/ldap/external_user_directory/docker-compose/zookeeper-service.yml
index 6691a2df31c..ca732a48dbd 100644
--- a/tests/testflows/ldap/external_user_directory/docker-compose/zookeeper-service.yml
+++ b/tests/testflows/ldap/external_user_directory/docker-compose/zookeeper-service.yml
@@ -2,7 +2,7 @@ version: '2.3'
 
 services:
   zookeeper:
-    image: zookeeper:3.4.12
+    image: zookeeper:3.6.2
     expose:
       - "2181"
     environment:
diff --git a/tests/testflows/ldap/role_mapping/configs/clickhouse/config.xml b/tests/testflows/ldap/role_mapping/configs/clickhouse/config.xml
index e28a0c8e255..3db8338b865 100644
--- a/tests/testflows/ldap/role_mapping/configs/clickhouse/config.xml
+++ b/tests/testflows/ldap/role_mapping/configs/clickhouse/config.xml
@@ -412,7 +412,7 @@
             </retention>
             <retention>
                 <age>86400</age>
-                <precision>60</precision>
+                <precision>7200</precision>
             </retention>
         </pattern>
         <default>
diff --git a/tests/testflows/ldap/role_mapping/docker-compose/zookeeper-service.yml b/tests/testflows/ldap/role_mapping/docker-compose/zookeeper-service.yml
index 6691a2df31c..ca732a48dbd 100644
--- a/tests/testflows/ldap/role_mapping/docker-compose/zookeeper-service.yml
+++ b/tests/testflows/ldap/role_mapping/docker-compose/zookeeper-service.yml
@@ -2,7 +2,7 @@ version: '2.3'
 
 services:
   zookeeper:
-    image: zookeeper:3.4.12
+    image: zookeeper:3.6.2
     expose:
       - "2181"
     environment:
diff --git a/tests/testflows/rbac/configs/clickhouse/config.xml b/tests/testflows/rbac/configs/clickhouse/config.xml
index 4ec12232539..265bcd1882a 100644
--- a/tests/testflows/rbac/configs/clickhouse/config.xml
+++ b/tests/testflows/rbac/configs/clickhouse/config.xml
@@ -418,7 +418,7 @@
             </retention>
             <retention>
                 <age>86400</age>
-                <precision>60</precision>
+                <precision>7200</precision>
             </retention>
         </pattern>
         <default>
diff --git a/tests/testflows/rbac/docker-compose/clickhouse-service.yml b/tests/testflows/rbac/docker-compose/clickhouse-service.yml
index d5f981ca8b7..2d79443dcbb 100755
--- a/tests/testflows/rbac/docker-compose/clickhouse-service.yml
+++ b/tests/testflows/rbac/docker-compose/clickhouse-service.yml
@@ -20,7 +20,7 @@ services:
       test: clickhouse client --query='select 1'
       interval: 10s
       timeout: 10s
-      retries: 10
+      retries: 3
       start_period: 300s
     cap_add:
       - SYS_PTRACE
diff --git a/tests/testflows/rbac/helper/common.py b/tests/testflows/rbac/helper/common.py
index 47e38560714..a234a62eabd 100755
--- a/tests/testflows/rbac/helper/common.py
+++ b/tests/testflows/rbac/helper/common.py
@@ -2,6 +2,7 @@ import uuid
 
 from contextlib import contextmanager
 from multiprocessing.dummy import Pool
+from multiprocessing import TimeoutError as PoolTaskTimeoutError
 
 from testflows.core.name import basename, parentname
 from testflows._core.testtype import TestSubType
@@ -27,9 +28,16 @@ def instrument_clickhouse_server_log(self, node=None, clickhouse_server_log="/va
     try:
         with And("adding test name start message to the clickhouse-server.log"):
             node.command(f"echo -e \"\\n-- start: {current().name} --\\n\" >> {clickhouse_server_log}")
+        with And("dump memory info"):
+            node.command(f"echo -e \"\\n-- {current().name} -- top --\\n\" && top -bn1")
+            node.command(f"echo -e \"\\n-- {current().name} -- df --\\n\" && df -h")
+            node.command(f"echo -e \"\\n-- {current().name} -- free --\\n\" && free -mh")
         yield
 
     finally:
+        if self.context.cluster.terminating is True:
+            return
+
         with Finally("adding test name end message to the clickhouse-server.log", flags=TE):
            node.command(f"echo -e \"\\n-- end: {current().name} --\\n\" >> {clickhouse_server_log}")
 
@@ -38,14 +46,20 @@ def instrument_clickhouse_server_log(self, node=None, clickhouse_server_log="/va
                 with Then("dumping clickhouse-server.log for this test"):
                     node.command(f"tail -c +{logsize} {clickhouse_server_log}")
 
-def join(tasks):
+def join(tasks, polling_timeout=5):
     """Join all parallel tests.
     """
     exc = None
     while tasks:
         try:
-            tasks[0].get()
-            tasks.pop(0)
+            try:
+                tasks[0].get(timeout=polling_timeout)
+                tasks.pop(0)
+
+            except PoolTaskTimeoutError as e:
+                task = tasks.pop(0)
+                tasks.append(task)
+                continue
 
         except KeyboardInterrupt as e:
             current().context.cluster.terminating = True
@@ -133,6 +147,23 @@ def role(node, role):
         for role in roles:
             with Finally("I drop the role"):
                 node.query(f"DROP ROLE IF EXISTS {role}")
+
+@TestStep(Given)
+def row_policy(self, name, table, node=None):
+    """Create a row policy with a given name on a given table.
+    """
+    if node is None:
+        node = self.context.node
+
+    try:
+        with Given(f"I create row policy {name}"):
+            node.query(f"CREATE ROW POLICY {name} ON {table}")
+        yield
+
+    finally:
+        with Finally(f"I delete row policy {name}"):
+            node.query(f"DROP ROW POLICY IF EXISTS {name} ON {table}")
+
 tables = {
     "table0" : 1 << 0,
     "table1" : 1 << 1,
diff --git a/tests/testflows/rbac/regression.py b/tests/testflows/rbac/regression.py
index e89be3bab20..a07cb8da805 100755
--- a/tests/testflows/rbac/regression.py
+++ b/tests/testflows/rbac/regression.py
@@ -27,6 +27,8 @@ issue_17655 = "https://github.com/ClickHouse/ClickHouse/issues/17655"
 issue_17766 = "https://github.com/ClickHouse/ClickHouse/issues/17766"
 issue_18110 = "https://github.com/ClickHouse/ClickHouse/issues/18110"
 issue_18206 = "https://github.com/ClickHouse/ClickHouse/issues/18206"
+issue_21083 = "https://github.com/ClickHouse/ClickHouse/issues/21083"
+issue_21084 = "https://github.com/ClickHouse/ClickHouse/issues/21084"
 
 xfails = {
     "syntax/show create quota/I show create quota current":
@@ -131,6 +133,10 @@ xfails = {
         [(Fail, issue_18206)],
     "privileges/system replication queues/:/:/:/:/SYSTEM:":
         [(Fail, issue_18206)],
+    "privileges/: row policy/nested live:":
+        [(Fail, issue_21083)],
+    "privileges/: row policy/nested mat:":
+        [(Fail, issue_21084)],
 }
 
 xflags = {
@@ -160,9 +166,9 @@ def regression(self, local, clickhouse_binary_path, stress=None, parallel=None):
         if parallel is not None:
             self.context.parallel = parallel
 
-        Feature(run=load("rbac.tests.syntax.feature", "feature"), flags=TE)
-        Feature(run=load("rbac.tests.privileges.feature", "feature"), flags=TE)
-        Feature(run=load("rbac.tests.views.feature", "feature"), flags=TE)
+        Feature(run=load("rbac.tests.syntax.feature", "feature"))
+        Feature(run=load("rbac.tests.privileges.feature", "feature"))
+        Feature(run=load("rbac.tests.views.feature", "feature"))
 
 if main():
     regression()
diff --git a/tests/testflows/rbac/requirements/requirements.md b/tests/testflows/rbac/requirements/requirements.md
index ae6a038c15e..163417e1617 100644
--- a/tests/testflows/rbac/requirements/requirements.md
+++ b/tests/testflows/rbac/requirements/requirements.md
@@ -9,556 +9,588 @@
 * 5 [Requirements](#requirements)
   * 5.1 [Generic](#generic)
     * 5.1.1 [RQ.SRS-006.RBAC](#rqsrs-006rbac)
-    * 5.1.2 [Login](#login)
-      * 5.1.2.1 [RQ.SRS-006.RBAC.Login](#rqsrs-006rbaclogin)
-      * 5.1.2.2 [RQ.SRS-006.RBAC.Login.DefaultUser](#rqsrs-006rbaclogindefaultuser)
-    * 5.1.3 [User](#user)
-      * 5.1.3.1 [RQ.SRS-006.RBAC.User](#rqsrs-006rbacuser)
-      * 5.1.3.2 [RQ.SRS-006.RBAC.User.Roles](#rqsrs-006rbacuserroles)
-      * 5.1.3.3 [RQ.SRS-006.RBAC.User.Privileges](#rqsrs-006rbacuserprivileges)
-      * 5.1.3.4 [RQ.SRS-006.RBAC.User.Variables](#rqsrs-006rbacuservariables)
-      * 5.1.3.5 [RQ.SRS-006.RBAC.User.Variables.Constraints](#rqsrs-006rbacuservariablesconstraints)
-      * 5.1.3.6 [RQ.SRS-006.RBAC.User.SettingsProfile](#rqsrs-006rbacusersettingsprofile)
-      * 5.1.3.7 [RQ.SRS-006.RBAC.User.Quotas](#rqsrs-006rbacuserquotas)
-      * 5.1.3.8 [RQ.SRS-006.RBAC.User.RowPolicies](#rqsrs-006rbacuserrowpolicies)
-      * 5.1.3.9 [RQ.SRS-006.RBAC.User.AccountLock](#rqsrs-006rbacuseraccountlock)
-      * 5.1.3.10 [RQ.SRS-006.RBAC.User.AccountLock.DenyAccess](#rqsrs-006rbacuseraccountlockdenyaccess)
-      * 5.1.3.11 [RQ.SRS-006.RBAC.User.DefaultRole](#rqsrs-006rbacuserdefaultrole)
-      * 5.1.3.12 [RQ.SRS-006.RBAC.User.RoleSelection](#rqsrs-006rbacuserroleselection)
-      * 5.1.3.13 [RQ.SRS-006.RBAC.User.ShowCreate](#rqsrs-006rbacusershowcreate)
-      * 5.1.3.14 [RQ.SRS-006.RBAC.User.ShowPrivileges](#rqsrs-006rbacusershowprivileges)
-    * 5.1.4 [Role](#role)
-      * 5.1.4.1 [RQ.SRS-006.RBAC.Role](#rqsrs-006rbacrole)
-      * 5.1.4.2 [RQ.SRS-006.RBAC.Role.Privileges](#rqsrs-006rbacroleprivileges)
-      * 5.1.4.3 [RQ.SRS-006.RBAC.Role.Variables](#rqsrs-006rbacrolevariables)
-      * 5.1.4.4 [RQ.SRS-006.RBAC.Role.SettingsProfile](#rqsrs-006rbacrolesettingsprofile)
-      * 5.1.4.5 [RQ.SRS-006.RBAC.Role.Quotas](#rqsrs-006rbacrolequotas)
-      * 5.1.4.6 [RQ.SRS-006.RBAC.Role.RowPolicies](#rqsrs-006rbacrolerowpolicies)
-    * 5.1.5 [Partial Revokes](#partial-revokes)
-      * 5.1.5.1 [RQ.SRS-006.RBAC.PartialRevokes](#rqsrs-006rbacpartialrevokes)
-    * 5.1.6 [Settings Profile](#settings-profile)
-      * 5.1.6.1 [RQ.SRS-006.RBAC.SettingsProfile](#rqsrs-006rbacsettingsprofile)
-      * 5.1.6.2 [RQ.SRS-006.RBAC.SettingsProfile.Constraints](#rqsrs-006rbacsettingsprofileconstraints)
-      * 5.1.6.3 [RQ.SRS-006.RBAC.SettingsProfile.ShowCreate](#rqsrs-006rbacsettingsprofileshowcreate)
-    * 5.1.7 [Quotas](#quotas)
-      * 5.1.7.1 [RQ.SRS-006.RBAC.Quotas](#rqsrs-006rbacquotas)
-      * 5.1.7.2 [RQ.SRS-006.RBAC.Quotas.Keyed](#rqsrs-006rbacquotaskeyed)
-      * 5.1.7.3 [RQ.SRS-006.RBAC.Quotas.Queries](#rqsrs-006rbacquotasqueries)
-      * 5.1.7.4 [RQ.SRS-006.RBAC.Quotas.Errors](#rqsrs-006rbacquotaserrors)
-      * 5.1.7.5 [RQ.SRS-006.RBAC.Quotas.ResultRows](#rqsrs-006rbacquotasresultrows)
-      * 5.1.7.6 [RQ.SRS-006.RBAC.Quotas.ReadRows](#rqsrs-006rbacquotasreadrows)
-      * 5.1.7.7 [RQ.SRS-006.RBAC.Quotas.ResultBytes](#rqsrs-006rbacquotasresultbytes)
-      * 5.1.7.8 [RQ.SRS-006.RBAC.Quotas.ReadBytes](#rqsrs-006rbacquotasreadbytes)
-      * 5.1.7.9 [RQ.SRS-006.RBAC.Quotas.ExecutionTime](#rqsrs-006rbacquotasexecutiontime)
-      * 5.1.7.10 [RQ.SRS-006.RBAC.Quotas.ShowCreate](#rqsrs-006rbacquotasshowcreate)
-    * 5.1.8 [Row Policy](#row-policy)
-      * 5.1.8.1 [RQ.SRS-006.RBAC.RowPolicy](#rqsrs-006rbacrowpolicy)
-      * 5.1.8.2 [RQ.SRS-006.RBAC.RowPolicy.Condition](#rqsrs-006rbacrowpolicycondition)
-      * 5.1.8.3 [RQ.SRS-006.RBAC.RowPolicy.ShowCreate](#rqsrs-006rbacrowpolicyshowcreate)
-  * 5.2 [Specific](#specific)
-      * 5.2.8.1 [RQ.SRS-006.RBAC.User.Use.DefaultRole](#rqsrs-006rbacuserusedefaultrole)
-      * 5.2.8.2 [RQ.SRS-006.RBAC.User.Use.AllRolesWhenNoDefaultRole](#rqsrs-006rbacuseruseallroleswhennodefaultrole)
-      * 5.2.8.3 [RQ.SRS-006.RBAC.User.Create](#rqsrs-006rbacusercreate)
-      * 5.2.8.4 [RQ.SRS-006.RBAC.User.Create.IfNotExists](#rqsrs-006rbacusercreateifnotexists)
-      * 5.2.8.5 [RQ.SRS-006.RBAC.User.Create.Replace](#rqsrs-006rbacusercreatereplace)
-      * 5.2.8.6 [RQ.SRS-006.RBAC.User.Create.Password.NoPassword](#rqsrs-006rbacusercreatepasswordnopassword)
-      * 5.2.8.7 [RQ.SRS-006.RBAC.User.Create.Password.NoPassword.Login](#rqsrs-006rbacusercreatepasswordnopasswordlogin)
-      * 5.2.8.8 [RQ.SRS-006.RBAC.User.Create.Password.PlainText](#rqsrs-006rbacusercreatepasswordplaintext)
-      * 5.2.8.9 [RQ.SRS-006.RBAC.User.Create.Password.PlainText.Login](#rqsrs-006rbacusercreatepasswordplaintextlogin)
-      * 5.2.8.10 [RQ.SRS-006.RBAC.User.Create.Password.Sha256Password](#rqsrs-006rbacusercreatepasswordsha256password)
-      * 5.2.8.11 [RQ.SRS-006.RBAC.User.Create.Password.Sha256Password.Login](#rqsrs-006rbacusercreatepasswordsha256passwordlogin)
-      * 5.2.8.12 [RQ.SRS-006.RBAC.User.Create.Password.Sha256Hash](#rqsrs-006rbacusercreatepasswordsha256hash)
-      * 5.2.8.13 [RQ.SRS-006.RBAC.User.Create.Password.Sha256Hash.Login](#rqsrs-006rbacusercreatepasswordsha256hashlogin)
-      * 5.2.8.14 [RQ.SRS-006.RBAC.User.Create.Password.DoubleSha1Password](#rqsrs-006rbacusercreatepassworddoublesha1password)
-      * 5.2.8.15 [RQ.SRS-006.RBAC.User.Create.Password.DoubleSha1Password.Login](#rqsrs-006rbacusercreatepassworddoublesha1passwordlogin)
-      * 5.2.8.16 [RQ.SRS-006.RBAC.User.Create.Password.DoubleSha1Hash](#rqsrs-006rbacusercreatepassworddoublesha1hash)
-      * 5.2.8.17 [RQ.SRS-006.RBAC.User.Create.Password.DoubleSha1Hash.Login](#rqsrs-006rbacusercreatepassworddoublesha1hashlogin)
-      * 5.2.8.18 [RQ.SRS-006.RBAC.User.Create.Host.Name](#rqsrs-006rbacusercreatehostname)
-      * 5.2.8.19 [RQ.SRS-006.RBAC.User.Create.Host.Regexp](#rqsrs-006rbacusercreatehostregexp)
-      * 5.2.8.20 [RQ.SRS-006.RBAC.User.Create.Host.IP](#rqsrs-006rbacusercreatehostip)
-      * 5.2.8.21 [RQ.SRS-006.RBAC.User.Create.Host.Any](#rqsrs-006rbacusercreatehostany)
-      * 5.2.8.22 [RQ.SRS-006.RBAC.User.Create.Host.None](#rqsrs-006rbacusercreatehostnone)
-      * 5.2.8.23 [RQ.SRS-006.RBAC.User.Create.Host.Local](#rqsrs-006rbacusercreatehostlocal)
-      * 5.2.8.24 [RQ.SRS-006.RBAC.User.Create.Host.Like](#rqsrs-006rbacusercreatehostlike)
-      * 5.2.8.25 [RQ.SRS-006.RBAC.User.Create.Host.Default](#rqsrs-006rbacusercreatehostdefault)
-      * 5.2.8.26 [RQ.SRS-006.RBAC.User.Create.DefaultRole](#rqsrs-006rbacusercreatedefaultrole)
-      * 5.2.8.27 [RQ.SRS-006.RBAC.User.Create.DefaultRole.None](#rqsrs-006rbacusercreatedefaultrolenone)
-      * 5.2.8.28 [RQ.SRS-006.RBAC.User.Create.DefaultRole.All](#rqsrs-006rbacusercreatedefaultroleall)
-      * 5.2.8.29 [RQ.SRS-006.RBAC.User.Create.Settings](#rqsrs-006rbacusercreatesettings)
-      * 5.2.8.30 [RQ.SRS-006.RBAC.User.Create.OnCluster](#rqsrs-006rbacusercreateoncluster)
-      * 5.2.8.31 [RQ.SRS-006.RBAC.User.Create.Syntax](#rqsrs-006rbacusercreatesyntax)
-      * 5.2.8.32 [RQ.SRS-006.RBAC.User.Alter](#rqsrs-006rbacuseralter)
-      * 5.2.8.33 [RQ.SRS-006.RBAC.User.Alter.OrderOfEvaluation](#rqsrs-006rbacuseralterorderofevaluation)
-      * 5.2.8.34 [RQ.SRS-006.RBAC.User.Alter.IfExists](#rqsrs-006rbacuseralterifexists)
-      * 5.2.8.35 [RQ.SRS-006.RBAC.User.Alter.Cluster](#rqsrs-006rbacuseraltercluster)
-      * 5.2.8.36 [RQ.SRS-006.RBAC.User.Alter.Rename](#rqsrs-006rbacuseralterrename)
-      * 5.2.8.37 [RQ.SRS-006.RBAC.User.Alter.Password.PlainText](#rqsrs-006rbacuseralterpasswordplaintext)
-      * 5.2.8.38 [RQ.SRS-006.RBAC.User.Alter.Password.Sha256Password](#rqsrs-006rbacuseralterpasswordsha256password)
-      * 5.2.8.39 [RQ.SRS-006.RBAC.User.Alter.Password.DoubleSha1Password](#rqsrs-006rbacuseralterpassworddoublesha1password)
-      * 5.2.8.40 [RQ.SRS-006.RBAC.User.Alter.Host.AddDrop](#rqsrs-006rbacuseralterhostadddrop)
-      * 5.2.8.41 [RQ.SRS-006.RBAC.User.Alter.Host.Local](#rqsrs-006rbacuseralterhostlocal)
-      * 5.2.8.42 [RQ.SRS-006.RBAC.User.Alter.Host.Name](#rqsrs-006rbacuseralterhostname)
-      * 5.2.8.43 [RQ.SRS-006.RBAC.User.Alter.Host.Regexp](#rqsrs-006rbacuseralterhostregexp)
-      * 5.2.8.44 [RQ.SRS-006.RBAC.User.Alter.Host.IP](#rqsrs-006rbacuseralterhostip)
-      * 5.2.8.45 [RQ.SRS-006.RBAC.User.Alter.Host.Like](#rqsrs-006rbacuseralterhostlike)
-      * 5.2.8.46 [RQ.SRS-006.RBAC.User.Alter.Host.Any](#rqsrs-006rbacuseralterhostany)
-      * 5.2.8.47 [RQ.SRS-006.RBAC.User.Alter.Host.None](#rqsrs-006rbacuseralterhostnone)
-      * 5.2.8.48 [RQ.SRS-006.RBAC.User.Alter.DefaultRole](#rqsrs-006rbacuseralterdefaultrole)
-      * 5.2.8.49 [RQ.SRS-006.RBAC.User.Alter.DefaultRole.All](#rqsrs-006rbacuseralterdefaultroleall)
-      * 5.2.8.50 [RQ.SRS-006.RBAC.User.Alter.DefaultRole.AllExcept](#rqsrs-006rbacuseralterdefaultroleallexcept)
-      * 5.2.8.51 [RQ.SRS-006.RBAC.User.Alter.Settings](#rqsrs-006rbacuseraltersettings)
-      * 5.2.8.52 [RQ.SRS-006.RBAC.User.Alter.Settings.Min](#rqsrs-006rbacuseraltersettingsmin)
-      * 5.2.8.53 [RQ.SRS-006.RBAC.User.Alter.Settings.Max](#rqsrs-006rbacuseraltersettingsmax)
-      * 5.2.8.54 [RQ.SRS-006.RBAC.User.Alter.Settings.Profile](#rqsrs-006rbacuseraltersettingsprofile)
-      * 5.2.8.55 [RQ.SRS-006.RBAC.User.Alter.Syntax](#rqsrs-006rbacuseraltersyntax)
-      * 5.2.8.56 [RQ.SRS-006.RBAC.SetDefaultRole](#rqsrs-006rbacsetdefaultrole)
-      * 5.2.8.57 [RQ.SRS-006.RBAC.SetDefaultRole.CurrentUser](#rqsrs-006rbacsetdefaultrolecurrentuser)
-      * 5.2.8.58 [RQ.SRS-006.RBAC.SetDefaultRole.All](#rqsrs-006rbacsetdefaultroleall)
-      * 5.2.8.59 [RQ.SRS-006.RBAC.SetDefaultRole.AllExcept](#rqsrs-006rbacsetdefaultroleallexcept)
-      * 5.2.8.60 [RQ.SRS-006.RBAC.SetDefaultRole.None](#rqsrs-006rbacsetdefaultrolenone)
-      * 5.2.8.61 [RQ.SRS-006.RBAC.SetDefaultRole.Syntax](#rqsrs-006rbacsetdefaultrolesyntax)
-      * 5.2.8.62 [RQ.SRS-006.RBAC.SetRole](#rqsrs-006rbacsetrole)
-      * 5.2.8.63 [RQ.SRS-006.RBAC.SetRole.Default](#rqsrs-006rbacsetroledefault)
-      * 5.2.8.64 [RQ.SRS-006.RBAC.SetRole.None](#rqsrs-006rbacsetrolenone)
-      * 5.2.8.65 [RQ.SRS-006.RBAC.SetRole.All](#rqsrs-006rbacsetroleall)
-      * 5.2.8.66 [RQ.SRS-006.RBAC.SetRole.AllExcept](#rqsrs-006rbacsetroleallexcept)
-      * 5.2.8.67 [RQ.SRS-006.RBAC.SetRole.Syntax](#rqsrs-006rbacsetrolesyntax)
-      * 5.2.8.68 [RQ.SRS-006.RBAC.User.ShowCreateUser](#rqsrs-006rbacusershowcreateuser)
-      * 5.2.8.69 [RQ.SRS-006.RBAC.User.ShowCreateUser.For](#rqsrs-006rbacusershowcreateuserfor)
-      * 5.2.8.70 [RQ.SRS-006.RBAC.User.ShowCreateUser.Syntax](#rqsrs-006rbacusershowcreateusersyntax)
-      * 5.2.8.71 [RQ.SRS-006.RBAC.User.Drop](#rqsrs-006rbacuserdrop)
-      * 5.2.8.72 [RQ.SRS-006.RBAC.User.Drop.IfExists](#rqsrs-006rbacuserdropifexists)
-      * 5.2.8.73 [RQ.SRS-006.RBAC.User.Drop.OnCluster](#rqsrs-006rbacuserdroponcluster)
-      * 5.2.8.74 [RQ.SRS-006.RBAC.User.Drop.Syntax](#rqsrs-006rbacuserdropsyntax)
-      * 5.2.8.75 [RQ.SRS-006.RBAC.Role.Create](#rqsrs-006rbacrolecreate)
-      * 5.2.8.76 [RQ.SRS-006.RBAC.Role.Create.IfNotExists](#rqsrs-006rbacrolecreateifnotexists)
-      * 5.2.8.77 [RQ.SRS-006.RBAC.Role.Create.Replace](#rqsrs-006rbacrolecreatereplace)
-      * 5.2.8.78 [RQ.SRS-006.RBAC.Role.Create.Settings](#rqsrs-006rbacrolecreatesettings)
-      * 5.2.8.79 [RQ.SRS-006.RBAC.Role.Create.Syntax](#rqsrs-006rbacrolecreatesyntax)
-      * 5.2.8.80 [RQ.SRS-006.RBAC.Role.Alter](#rqsrs-006rbacrolealter)
-      * 5.2.8.81 [RQ.SRS-006.RBAC.Role.Alter.IfExists](#rqsrs-006rbacrolealterifexists)
-      * 5.2.8.82 [RQ.SRS-006.RBAC.Role.Alter.Cluster](#rqsrs-006rbacrolealtercluster)
-      * 5.2.8.83 [RQ.SRS-006.RBAC.Role.Alter.Rename](#rqsrs-006rbacrolealterrename)
-      * 5.2.8.84 [RQ.SRS-006.RBAC.Role.Alter.Settings](#rqsrs-006rbacrolealtersettings)
-      * 5.2.8.85 [RQ.SRS-006.RBAC.Role.Alter.Syntax](#rqsrs-006rbacrolealtersyntax)
-      * 5.2.8.86 [RQ.SRS-006.RBAC.Role.Drop](#rqsrs-006rbacroledrop)
-      * 5.2.8.87 [RQ.SRS-006.RBAC.Role.Drop.IfExists](#rqsrs-006rbacroledropifexists)
-      * 5.2.8.88 [RQ.SRS-006.RBAC.Role.Drop.Cluster](#rqsrs-006rbacroledropcluster)
-      * 5.2.8.89 [RQ.SRS-006.RBAC.Role.Drop.Syntax](#rqsrs-006rbacroledropsyntax)
-      * 5.2.8.90 [RQ.SRS-006.RBAC.Role.ShowCreate](#rqsrs-006rbacroleshowcreate)
-      * 5.2.8.91 [RQ.SRS-006.RBAC.Role.ShowCreate.Syntax](#rqsrs-006rbacroleshowcreatesyntax)
-      * 5.2.8.92 [RQ.SRS-006.RBAC.Grant.Privilege.To](#rqsrs-006rbacgrantprivilegeto)
-      * 5.2.8.93 [RQ.SRS-006.RBAC.Grant.Privilege.ToCurrentUser](#rqsrs-006rbacgrantprivilegetocurrentuser)
-      * 5.2.8.94 [RQ.SRS-006.RBAC.Grant.Privilege.Select](#rqsrs-006rbacgrantprivilegeselect)
-      * 5.2.8.95 [RQ.SRS-006.RBAC.Grant.Privilege.Insert](#rqsrs-006rbacgrantprivilegeinsert)
-      * 5.2.8.96 [RQ.SRS-006.RBAC.Grant.Privilege.Alter](#rqsrs-006rbacgrantprivilegealter)
-      * 5.2.8.97 [RQ.SRS-006.RBAC.Grant.Privilege.Create](#rqsrs-006rbacgrantprivilegecreate)
-      * 5.2.8.98 [RQ.SRS-006.RBAC.Grant.Privilege.Drop](#rqsrs-006rbacgrantprivilegedrop)
-      * 5.2.8.99 [RQ.SRS-006.RBAC.Grant.Privilege.Truncate](#rqsrs-006rbacgrantprivilegetruncate)
-      * 5.2.8.100 [RQ.SRS-006.RBAC.Grant.Privilege.Optimize](#rqsrs-006rbacgrantprivilegeoptimize)
-      * 5.2.8.101 [RQ.SRS-006.RBAC.Grant.Privilege.Show](#rqsrs-006rbacgrantprivilegeshow)
-      * 5.2.8.102 [RQ.SRS-006.RBAC.Grant.Privilege.KillQuery](#rqsrs-006rbacgrantprivilegekillquery)
-      * 5.2.8.103 [RQ.SRS-006.RBAC.Grant.Privilege.AccessManagement](#rqsrs-006rbacgrantprivilegeaccessmanagement)
-      * 5.2.8.104 [RQ.SRS-006.RBAC.Grant.Privilege.System](#rqsrs-006rbacgrantprivilegesystem)
-      * 5.2.8.105 [RQ.SRS-006.RBAC.Grant.Privilege.Introspection](#rqsrs-006rbacgrantprivilegeintrospection)
-      * 5.2.8.106 [RQ.SRS-006.RBAC.Grant.Privilege.Sources](#rqsrs-006rbacgrantprivilegesources)
-      * 5.2.8.107 [RQ.SRS-006.RBAC.Grant.Privilege.DictGet](#rqsrs-006rbacgrantprivilegedictget)
-      * 5.2.8.108 [RQ.SRS-006.RBAC.Grant.Privilege.None](#rqsrs-006rbacgrantprivilegenone)
-      * 5.2.8.109 [RQ.SRS-006.RBAC.Grant.Privilege.All](#rqsrs-006rbacgrantprivilegeall)
-      * 5.2.8.110 [RQ.SRS-006.RBAC.Grant.Privilege.GrantOption](#rqsrs-006rbacgrantprivilegegrantoption)
-      * 5.2.8.111 [RQ.SRS-006.RBAC.Grant.Privilege.On](#rqsrs-006rbacgrantprivilegeon)
-      * 5.2.8.112 [RQ.SRS-006.RBAC.Grant.Privilege.PrivilegeColumns](#rqsrs-006rbacgrantprivilegeprivilegecolumns)
-      * 5.2.8.113 [RQ.SRS-006.RBAC.Grant.Privilege.OnCluster](#rqsrs-006rbacgrantprivilegeoncluster)
-      * 5.2.8.114 [RQ.SRS-006.RBAC.Grant.Privilege.Syntax](#rqsrs-006rbacgrantprivilegesyntax)
-      * 5.2.8.115 [RQ.SRS-006.RBAC.Revoke.Privilege.Cluster](#rqsrs-006rbacrevokeprivilegecluster)
-      * 5.2.8.116 [RQ.SRS-006.RBAC.Revoke.Privilege.Any](#rqsrs-006rbacrevokeprivilegeany)
-      * 5.2.8.117 [RQ.SRS-006.RBAC.Revoke.Privilege.Select](#rqsrs-006rbacrevokeprivilegeselect)
-      * 5.2.8.118 [RQ.SRS-006.RBAC.Revoke.Privilege.Insert](#rqsrs-006rbacrevokeprivilegeinsert)
-      * 5.2.8.119 [RQ.SRS-006.RBAC.Revoke.Privilege.Alter](#rqsrs-006rbacrevokeprivilegealter)
-      * 5.2.8.120 [RQ.SRS-006.RBAC.Revoke.Privilege.Create](#rqsrs-006rbacrevokeprivilegecreate)
-      * 5.2.8.121 [RQ.SRS-006.RBAC.Revoke.Privilege.Drop](#rqsrs-006rbacrevokeprivilegedrop)
-      * 5.2.8.122 [RQ.SRS-006.RBAC.Revoke.Privilege.Truncate](#rqsrs-006rbacrevokeprivilegetruncate)
-      * 5.2.8.123 [RQ.SRS-006.RBAC.Revoke.Privilege.Optimize](#rqsrs-006rbacrevokeprivilegeoptimize)
-      * 5.2.8.124 [RQ.SRS-006.RBAC.Revoke.Privilege.Show](#rqsrs-006rbacrevokeprivilegeshow)
-      * 5.2.8.125 [RQ.SRS-006.RBAC.Revoke.Privilege.KillQuery](#rqsrs-006rbacrevokeprivilegekillquery)
-      * 5.2.8.126 [RQ.SRS-006.RBAC.Revoke.Privilege.AccessManagement](#rqsrs-006rbacrevokeprivilegeaccessmanagement)
-      * 5.2.8.127 [RQ.SRS-006.RBAC.Revoke.Privilege.System](#rqsrs-006rbacrevokeprivilegesystem)
-      * 5.2.8.128 [RQ.SRS-006.RBAC.Revoke.Privilege.Introspection](#rqsrs-006rbacrevokeprivilegeintrospection)
-      * 5.2.8.129 [RQ.SRS-006.RBAC.Revoke.Privilege.Sources](#rqsrs-006rbacrevokeprivilegesources)
-      * 5.2.8.130 [RQ.SRS-006.RBAC.Revoke.Privilege.DictGet](#rqsrs-006rbacrevokeprivilegedictget)
-      * 5.2.8.131 [RQ.SRS-006.RBAC.Revoke.Privilege.PrivelegeColumns](#rqsrs-006rbacrevokeprivilegeprivelegecolumns)
-      * 5.2.8.132 [RQ.SRS-006.RBAC.Revoke.Privilege.Multiple](#rqsrs-006rbacrevokeprivilegemultiple)
-      * 5.2.8.133 [RQ.SRS-006.RBAC.Revoke.Privilege.All](#rqsrs-006rbacrevokeprivilegeall)
-      * 5.2.8.134 [RQ.SRS-006.RBAC.Revoke.Privilege.None](#rqsrs-006rbacrevokeprivilegenone)
-      * 5.2.8.135 [RQ.SRS-006.RBAC.Revoke.Privilege.On](#rqsrs-006rbacrevokeprivilegeon)
-      * 5.2.8.136 [RQ.SRS-006.RBAC.Revoke.Privilege.From](#rqsrs-006rbacrevokeprivilegefrom)
-      * 5.2.8.137 [RQ.SRS-006.RBAC.Revoke.Privilege.Syntax](#rqsrs-006rbacrevokeprivilegesyntax)
-      * 5.2.8.138 [RQ.SRS-006.RBAC.PartialRevoke.Syntax](#rqsrs-006rbacpartialrevokesyntax)
-      * 5.2.8.139 [RQ.SRS-006.RBAC.Grant.Role](#rqsrs-006rbacgrantrole)
-      * 5.2.8.140 [RQ.SRS-006.RBAC.Grant.Role.CurrentUser](#rqsrs-006rbacgrantrolecurrentuser)
-      * 5.2.8.141 [RQ.SRS-006.RBAC.Grant.Role.AdminOption](#rqsrs-006rbacgrantroleadminoption)
-      * 5.2.8.142 [RQ.SRS-006.RBAC.Grant.Role.OnCluster](#rqsrs-006rbacgrantroleoncluster)
-      * 5.2.8.143 [RQ.SRS-006.RBAC.Grant.Role.Syntax](#rqsrs-006rbacgrantrolesyntax)
-      * 5.2.8.144 [RQ.SRS-006.RBAC.Revoke.Role](#rqsrs-006rbacrevokerole)
-      * 5.2.8.145 [RQ.SRS-006.RBAC.Revoke.Role.Keywords](#rqsrs-006rbacrevokerolekeywords)
-      * 5.2.8.146 [RQ.SRS-006.RBAC.Revoke.Role.Cluster](#rqsrs-006rbacrevokerolecluster)
-      * 5.2.8.147 [RQ.SRS-006.RBAC.Revoke.AdminOption](#rqsrs-006rbacrevokeadminoption)
-      * 5.2.8.148 [RQ.SRS-006.RBAC.Revoke.Role.Syntax](#rqsrs-006rbacrevokerolesyntax)
-      * 5.2.8.149 [RQ.SRS-006.RBAC.Show.Grants](#rqsrs-006rbacshowgrants)
-      * 5.2.8.150 [RQ.SRS-006.RBAC.Show.Grants.For](#rqsrs-006rbacshowgrantsfor)
-      * 5.2.8.151 [RQ.SRS-006.RBAC.Show.Grants.Syntax](#rqsrs-006rbacshowgrantssyntax)
-      * 5.2.8.152 [RQ.SRS-006.RBAC.SettingsProfile.Create](#rqsrs-006rbacsettingsprofilecreate)
-      * 5.2.8.153 [RQ.SRS-006.RBAC.SettingsProfile.Create.IfNotExists](#rqsrs-006rbacsettingsprofilecreateifnotexists)
-      * 5.2.8.154 [RQ.SRS-006.RBAC.SettingsProfile.Create.Replace](#rqsrs-006rbacsettingsprofilecreatereplace)
-      * 5.2.8.155 [RQ.SRS-006.RBAC.SettingsProfile.Create.Variables](#rqsrs-006rbacsettingsprofilecreatevariables)
-      * 5.2.8.156 [RQ.SRS-006.RBAC.SettingsProfile.Create.Variables.Value](#rqsrs-006rbacsettingsprofilecreatevariablesvalue)
-      * 5.2.8.157 [RQ.SRS-006.RBAC.SettingsProfile.Create.Variables.Constraints](#rqsrs-006rbacsettingsprofilecreatevariablesconstraints)
-      * 5.2.8.158 [RQ.SRS-006.RBAC.SettingsProfile.Create.Assignment](#rqsrs-006rbacsettingsprofilecreateassignment)
-      * 5.2.8.159 [RQ.SRS-006.RBAC.SettingsProfile.Create.Assignment.None](#rqsrs-006rbacsettingsprofilecreateassignmentnone)
-      * 5.2.8.160 [RQ.SRS-006.RBAC.SettingsProfile.Create.Assignment.All](#rqsrs-006rbacsettingsprofilecreateassignmentall)
-      * 5.2.8.161 [RQ.SRS-006.RBAC.SettingsProfile.Create.Assignment.AllExcept](#rqsrs-006rbacsettingsprofilecreateassignmentallexcept)
-      * 5.2.8.162 [RQ.SRS-006.RBAC.SettingsProfile.Create.Inherit](#rqsrs-006rbacsettingsprofilecreateinherit)
-      * 5.2.8.163 [RQ.SRS-006.RBAC.SettingsProfile.Create.OnCluster](#rqsrs-006rbacsettingsprofilecreateoncluster)
-      * 5.2.8.164 [RQ.SRS-006.RBAC.SettingsProfile.Create.Syntax](#rqsrs-006rbacsettingsprofilecreatesyntax)
-      * 5.2.8.165 [RQ.SRS-006.RBAC.SettingsProfile.Alter](#rqsrs-006rbacsettingsprofilealter)
-      * 5.2.8.166 [RQ.SRS-006.RBAC.SettingsProfile.Alter.IfExists](#rqsrs-006rbacsettingsprofilealterifexists)
-      * 5.2.8.167 [RQ.SRS-006.RBAC.SettingsProfile.Alter.Rename](#rqsrs-006rbacsettingsprofilealterrename)
-      * 5.2.8.168 [RQ.SRS-006.RBAC.SettingsProfile.Alter.Variables](#rqsrs-006rbacsettingsprofilealtervariables)
-      * 5.2.8.169 [RQ.SRS-006.RBAC.SettingsProfile.Alter.Variables.Value](#rqsrs-006rbacsettingsprofilealtervariablesvalue)
-      * 5.2.8.170 [RQ.SRS-006.RBAC.SettingsProfile.Alter.Variables.Constraints](#rqsrs-006rbacsettingsprofilealtervariablesconstraints)
-      * 5.2.8.171 [RQ.SRS-006.RBAC.SettingsProfile.Alter.Assignment](#rqsrs-006rbacsettingsprofilealterassignment)
-      * 5.2.8.172 [RQ.SRS-006.RBAC.SettingsProfile.Alter.Assignment.None](#rqsrs-006rbacsettingsprofilealterassignmentnone)
-      * 5.2.8.173 [RQ.SRS-006.RBAC.SettingsProfile.Alter.Assignment.All](#rqsrs-006rbacsettingsprofilealterassignmentall)
-      * 5.2.8.174 [RQ.SRS-006.RBAC.SettingsProfile.Alter.Assignment.AllExcept](#rqsrs-006rbacsettingsprofilealterassignmentallexcept)
-      * 5.2.8.175 [RQ.SRS-006.RBAC.SettingsProfile.Alter.Assignment.Inherit](#rqsrs-006rbacsettingsprofilealterassignmentinherit)
-      * 5.2.8.176 [RQ.SRS-006.RBAC.SettingsProfile.Alter.Assignment.OnCluster](#rqsrs-006rbacsettingsprofilealterassignmentoncluster)
-      * 5.2.8.177 [RQ.SRS-006.RBAC.SettingsProfile.Alter.Syntax](#rqsrs-006rbacsettingsprofilealtersyntax)
-      * 5.2.8.178 [RQ.SRS-006.RBAC.SettingsProfile.Drop](#rqsrs-006rbacsettingsprofiledrop)
-      * 5.2.8.179 [RQ.SRS-006.RBAC.SettingsProfile.Drop.IfExists](#rqsrs-006rbacsettingsprofiledropifexists)
-      * 5.2.8.180 [RQ.SRS-006.RBAC.SettingsProfile.Drop.OnCluster](#rqsrs-006rbacsettingsprofiledroponcluster)
-      * 5.2.8.181 [RQ.SRS-006.RBAC.SettingsProfile.Drop.Syntax](#rqsrs-006rbacsettingsprofiledropsyntax)
-      * 5.2.8.182 [RQ.SRS-006.RBAC.SettingsProfile.ShowCreateSettingsProfile](#rqsrs-006rbacsettingsprofileshowcreatesettingsprofile)
-      * 5.2.8.183 [RQ.SRS-006.RBAC.Quota.Create](#rqsrs-006rbacquotacreate)
-      * 5.2.8.184 [RQ.SRS-006.RBAC.Quota.Create.IfNotExists](#rqsrs-006rbacquotacreateifnotexists)
-      * 5.2.8.185 [RQ.SRS-006.RBAC.Quota.Create.Replace](#rqsrs-006rbacquotacreatereplace)
-      * 5.2.8.186 [RQ.SRS-006.RBAC.Quota.Create.Cluster](#rqsrs-006rbacquotacreatecluster)
-      * 5.2.8.187 [RQ.SRS-006.RBAC.Quota.Create.Interval](#rqsrs-006rbacquotacreateinterval)
-      * 5.2.8.188 [RQ.SRS-006.RBAC.Quota.Create.Interval.Randomized](#rqsrs-006rbacquotacreateintervalrandomized)
-      * 5.2.8.189 [RQ.SRS-006.RBAC.Quota.Create.Queries](#rqsrs-006rbacquotacreatequeries)
-      * 5.2.8.190 [RQ.SRS-006.RBAC.Quota.Create.Errors](#rqsrs-006rbacquotacreateerrors)
-      * 5.2.8.191 [RQ.SRS-006.RBAC.Quota.Create.ResultRows](#rqsrs-006rbacquotacreateresultrows)
-      * 5.2.8.192 [RQ.SRS-006.RBAC.Quota.Create.ReadRows](#rqsrs-006rbacquotacreatereadrows)
-      * 5.2.8.193 [RQ.SRS-006.RBAC.Quota.Create.ResultBytes](#rqsrs-006rbacquotacreateresultbytes)
-      * 5.2.8.194 [RQ.SRS-006.RBAC.Quota.Create.ReadBytes](#rqsrs-006rbacquotacreatereadbytes)
-      * 5.2.8.195 [RQ.SRS-006.RBAC.Quota.Create.ExecutionTime](#rqsrs-006rbacquotacreateexecutiontime)
-      * 5.2.8.196 [RQ.SRS-006.RBAC.Quota.Create.NoLimits](#rqsrs-006rbacquotacreatenolimits)
-      * 5.2.8.197 [RQ.SRS-006.RBAC.Quota.Create.TrackingOnly](#rqsrs-006rbacquotacreatetrackingonly)
-      * 5.2.8.198 [RQ.SRS-006.RBAC.Quota.Create.KeyedBy](#rqsrs-006rbacquotacreatekeyedby)
-      * 5.2.8.199 [RQ.SRS-006.RBAC.Quota.Create.KeyedByOptions](#rqsrs-006rbacquotacreatekeyedbyoptions)
-      * 5.2.8.200 [RQ.SRS-006.RBAC.Quota.Create.Assignment](#rqsrs-006rbacquotacreateassignment)
-      * 5.2.8.201 [RQ.SRS-006.RBAC.Quota.Create.Assignment.None](#rqsrs-006rbacquotacreateassignmentnone)
-      * 5.2.8.202 [RQ.SRS-006.RBAC.Quota.Create.Assignment.All](#rqsrs-006rbacquotacreateassignmentall)
-      * 5.2.8.203 [RQ.SRS-006.RBAC.Quota.Create.Assignment.Except](#rqsrs-006rbacquotacreateassignmentexcept)
-      * 5.2.8.204 [RQ.SRS-006.RBAC.Quota.Create.Syntax](#rqsrs-006rbacquotacreatesyntax)
-      * 5.2.8.205 [RQ.SRS-006.RBAC.Quota.Alter](#rqsrs-006rbacquotaalter)
-      * 5.2.8.206 [RQ.SRS-006.RBAC.Quota.Alter.IfExists](#rqsrs-006rbacquotaalterifexists)
-      * 5.2.8.207 [RQ.SRS-006.RBAC.Quota.Alter.Rename](#rqsrs-006rbacquotaalterrename)
-      * 5.2.8.208 [RQ.SRS-006.RBAC.Quota.Alter.Cluster](#rqsrs-006rbacquotaaltercluster)
-      * 5.2.8.209 [RQ.SRS-006.RBAC.Quota.Alter.Interval](#rqsrs-006rbacquotaalterinterval)
-      * 5.2.8.210 [RQ.SRS-006.RBAC.Quota.Alter.Interval.Randomized](#rqsrs-006rbacquotaalterintervalrandomized)
-      * 5.2.8.211 [RQ.SRS-006.RBAC.Quota.Alter.Queries](#rqsrs-006rbacquotaalterqueries)
-      * 5.2.8.212 [RQ.SRS-006.RBAC.Quota.Alter.Errors](#rqsrs-006rbacquotaaltererrors)
-      * 5.2.8.213 [RQ.SRS-006.RBAC.Quota.Alter.ResultRows](#rqsrs-006rbacquotaalterresultrows)
-      * 5.2.8.214 [RQ.SRS-006.RBAC.Quota.Alter.ReadRows](#rqsrs-006rbacquotaalterreadrows)
-      * 5.2.8.215 [RQ.SRS-006.RBAC.Quota.ALter.ResultBytes](#rqsrs-006rbacquotaalterresultbytes)
-      * 5.2.8.216 [RQ.SRS-006.RBAC.Quota.Alter.ReadBytes](#rqsrs-006rbacquotaalterreadbytes)
-      * 5.2.8.217 [RQ.SRS-006.RBAC.Quota.Alter.ExecutionTime](#rqsrs-006rbacquotaalterexecutiontime)
-      * 5.2.8.218 [RQ.SRS-006.RBAC.Quota.Alter.NoLimits](#rqsrs-006rbacquotaalternolimits)
-      * 5.2.8.219 [RQ.SRS-006.RBAC.Quota.Alter.TrackingOnly](#rqsrs-006rbacquotaaltertrackingonly)
-      * 5.2.8.220 [RQ.SRS-006.RBAC.Quota.Alter.KeyedBy](#rqsrs-006rbacquotaalterkeyedby)
-      * 5.2.8.221 [RQ.SRS-006.RBAC.Quota.Alter.KeyedByOptions](#rqsrs-006rbacquotaalterkeyedbyoptions)
-      * 5.2.8.222 [RQ.SRS-006.RBAC.Quota.Alter.Assignment](#rqsrs-006rbacquotaalterassignment)
-      * 5.2.8.223 [RQ.SRS-006.RBAC.Quota.Alter.Assignment.None](#rqsrs-006rbacquotaalterassignmentnone)
-      * 5.2.8.224 [RQ.SRS-006.RBAC.Quota.Alter.Assignment.All](#rqsrs-006rbacquotaalterassignmentall)
-      * 5.2.8.225 [RQ.SRS-006.RBAC.Quota.Alter.Assignment.Except](#rqsrs-006rbacquotaalterassignmentexcept)
-      * 5.2.8.226 [RQ.SRS-006.RBAC.Quota.Alter.Syntax](#rqsrs-006rbacquotaaltersyntax)
-      * 5.2.8.227 [RQ.SRS-006.RBAC.Quota.Drop](#rqsrs-006rbacquotadrop)
-      * 5.2.8.228 [RQ.SRS-006.RBAC.Quota.Drop.IfExists](#rqsrs-006rbacquotadropifexists)
-      * 5.2.8.229 [RQ.SRS-006.RBAC.Quota.Drop.Cluster](#rqsrs-006rbacquotadropcluster)
-      * 5.2.8.230 [RQ.SRS-006.RBAC.Quota.Drop.Syntax](#rqsrs-006rbacquotadropsyntax)
-      * 5.2.8.231 [RQ.SRS-006.RBAC.Quota.ShowQuotas](#rqsrs-006rbacquotashowquotas)
-      * 5.2.8.232 [RQ.SRS-006.RBAC.Quota.ShowQuotas.IntoOutfile](#rqsrs-006rbacquotashowquotasintooutfile)
-      * 5.2.8.233 [RQ.SRS-006.RBAC.Quota.ShowQuotas.Format](#rqsrs-006rbacquotashowquotasformat)
-      * 5.2.8.234 [RQ.SRS-006.RBAC.Quota.ShowQuotas.Settings](#rqsrs-006rbacquotashowquotassettings)
-      * 5.2.8.235 [RQ.SRS-006.RBAC.Quota.ShowQuotas.Syntax](#rqsrs-006rbacquotashowquotassyntax)
-      * 5.2.8.236 [RQ.SRS-006.RBAC.Quota.ShowCreateQuota.Name](#rqsrs-006rbacquotashowcreatequotaname)
-      * 5.2.8.237 [RQ.SRS-006.RBAC.Quota.ShowCreateQuota.Current](#rqsrs-006rbacquotashowcreatequotacurrent)
-      * 5.2.8.238 [RQ.SRS-006.RBAC.Quota.ShowCreateQuota.Syntax](#rqsrs-006rbacquotashowcreatequotasyntax)
-      * 5.2.8.239 [RQ.SRS-006.RBAC.RowPolicy.Create](#rqsrs-006rbacrowpolicycreate)
-      * 5.2.8.240 [RQ.SRS-006.RBAC.RowPolicy.Create.IfNotExists](#rqsrs-006rbacrowpolicycreateifnotexists)
-      * 5.2.8.241 [RQ.SRS-006.RBAC.RowPolicy.Create.Replace](#rqsrs-006rbacrowpolicycreatereplace)
-      * 5.2.8.242 [RQ.SRS-006.RBAC.RowPolicy.Create.OnCluster](#rqsrs-006rbacrowpolicycreateoncluster)
-      * 5.2.8.243 [RQ.SRS-006.RBAC.RowPolicy.Create.On](#rqsrs-006rbacrowpolicycreateon)
-      * 5.2.8.244 [RQ.SRS-006.RBAC.RowPolicy.Create.Access](#rqsrs-006rbacrowpolicycreateaccess)
-      * 5.2.8.245 [RQ.SRS-006.RBAC.RowPolicy.Create.Access.Permissive](#rqsrs-006rbacrowpolicycreateaccesspermissive)
-      * 5.2.8.246 [RQ.SRS-006.RBAC.RowPolicy.Create.Access.Restrictive](#rqsrs-006rbacrowpolicycreateaccessrestrictive)
-      * 5.2.8.247 [RQ.SRS-006.RBAC.RowPolicy.Create.ForSelect](#rqsrs-006rbacrowpolicycreateforselect)
-      * 5.2.8.248 [RQ.SRS-006.RBAC.RowPolicy.Create.Condition](#rqsrs-006rbacrowpolicycreatecondition)
-      * 5.2.8.249 [RQ.SRS-006.RBAC.RowPolicy.Create.Assignment](#rqsrs-006rbacrowpolicycreateassignment)
-      * 5.2.8.250 [RQ.SRS-006.RBAC.RowPolicy.Create.Assignment.None](#rqsrs-006rbacrowpolicycreateassignmentnone)
-      * 5.2.8.251 [RQ.SRS-006.RBAC.RowPolicy.Create.Assignment.All](#rqsrs-006rbacrowpolicycreateassignmentall)
-      * 5.2.8.252 [RQ.SRS-006.RBAC.RowPolicy.Create.Assignment.AllExcept](#rqsrs-006rbacrowpolicycreateassignmentallexcept)
-      * 5.2.8.253 [RQ.SRS-006.RBAC.RowPolicy.Create.Syntax](#rqsrs-006rbacrowpolicycreatesyntax)
-      * 5.2.8.254 [RQ.SRS-006.RBAC.RowPolicy.Alter](#rqsrs-006rbacrowpolicyalter)
-      * 5.2.8.255 [RQ.SRS-006.RBAC.RowPolicy.Alter.IfExists](#rqsrs-006rbacrowpolicyalterifexists)
-      * 5.2.8.256 [RQ.SRS-006.RBAC.RowPolicy.Alter.ForSelect](#rqsrs-006rbacrowpolicyalterforselect)
-      * 5.2.8.257 [RQ.SRS-006.RBAC.RowPolicy.Alter.OnCluster](#rqsrs-006rbacrowpolicyalteroncluster)
-      * 5.2.8.258 [RQ.SRS-006.RBAC.RowPolicy.Alter.On](#rqsrs-006rbacrowpolicyalteron)
-      * 5.2.8.259 [RQ.SRS-006.RBAC.RowPolicy.Alter.Rename](#rqsrs-006rbacrowpolicyalterrename)
-      * 5.2.8.260 [RQ.SRS-006.RBAC.RowPolicy.Alter.Access](#rqsrs-006rbacrowpolicyalteraccess)
-      * 5.2.8.261 [RQ.SRS-006.RBAC.RowPolicy.Alter.Access.Permissive](#rqsrs-006rbacrowpolicyalteraccesspermissive)
-      * 5.2.8.262 [RQ.SRS-006.RBAC.RowPolicy.Alter.Access.Restrictive](#rqsrs-006rbacrowpolicyalteraccessrestrictive)
-      * 5.2.8.263 [RQ.SRS-006.RBAC.RowPolicy.Alter.Condition](#rqsrs-006rbacrowpolicyaltercondition)
-      * 5.2.8.264 [RQ.SRS-006.RBAC.RowPolicy.Alter.Condition.None](#rqsrs-006rbacrowpolicyalterconditionnone)
-      * 5.2.8.265 [RQ.SRS-006.RBAC.RowPolicy.Alter.Assignment](#rqsrs-006rbacrowpolicyalterassignment)
-      * 5.2.8.266 [RQ.SRS-006.RBAC.RowPolicy.Alter.Assignment.None](#rqsrs-006rbacrowpolicyalterassignmentnone)
-      * 5.2.8.267 [RQ.SRS-006.RBAC.RowPolicy.Alter.Assignment.All](#rqsrs-006rbacrowpolicyalterassignmentall)
-      * 5.2.8.268 [RQ.SRS-006.RBAC.RowPolicy.Alter.Assignment.AllExcept](#rqsrs-006rbacrowpolicyalterassignmentallexcept)
-      * 5.2.8.269 [RQ.SRS-006.RBAC.RowPolicy.Alter.Syntax](#rqsrs-006rbacrowpolicyaltersyntax)
-      * 5.2.8.270 [RQ.SRS-006.RBAC.RowPolicy.Drop](#rqsrs-006rbacrowpolicydrop)
-      * 5.2.8.271 [RQ.SRS-006.RBAC.RowPolicy.Drop.IfExists](#rqsrs-006rbacrowpolicydropifexists)
-      * 5.2.8.272 [RQ.SRS-006.RBAC.RowPolicy.Drop.On](#rqsrs-006rbacrowpolicydropon)
-      * 5.2.8.273 [RQ.SRS-006.RBAC.RowPolicy.Drop.OnCluster](#rqsrs-006rbacrowpolicydroponcluster)
-      * 5.2.8.274 [RQ.SRS-006.RBAC.RowPolicy.Drop.Syntax](#rqsrs-006rbacrowpolicydropsyntax)
-      * 5.2.8.275 [RQ.SRS-006.RBAC.RowPolicy.ShowCreateRowPolicy](#rqsrs-006rbacrowpolicyshowcreaterowpolicy)
-      * 5.2.8.276 [RQ.SRS-006.RBAC.RowPolicy.ShowCreateRowPolicy.On](#rqsrs-006rbacrowpolicyshowcreaterowpolicyon)
-      * 5.2.8.277 [RQ.SRS-006.RBAC.RowPolicy.ShowCreateRowPolicy.Syntax](#rqsrs-006rbacrowpolicyshowcreaterowpolicysyntax)
-      * 5.2.8.278 [RQ.SRS-006.RBAC.RowPolicy.ShowRowPolicies](#rqsrs-006rbacrowpolicyshowrowpolicies)
-      * 5.2.8.279 [RQ.SRS-006.RBAC.RowPolicy.ShowRowPolicies.On](#rqsrs-006rbacrowpolicyshowrowpolicieson)
-      * 5.2.8.280 [RQ.SRS-006.RBAC.RowPolicy.ShowRowPolicies.Syntax](#rqsrs-006rbacrowpolicyshowrowpoliciessyntax)
-    * 5.2.9 [Table Privileges](#table-privileges)
-      * 5.2.9.1 [RQ.SRS-006.RBAC.Table.PublicTables](#rqsrs-006rbactablepublictables)
-      * 5.2.9.2 [RQ.SRS-006.RBAC.Table.SensitiveTables](#rqsrs-006rbactablesensitivetables)
-    * 5.2.10 [Distributed Tables](#distributed-tables)
-      * 5.2.10.1 [RQ.SRS-006.RBAC.DistributedTable.Create](#rqsrs-006rbacdistributedtablecreate)
-      * 5.2.10.2 [RQ.SRS-006.RBAC.DistributedTable.Select](#rqsrs-006rbacdistributedtableselect)
-      * 5.2.10.3 [RQ.SRS-006.RBAC.DistributedTable.Insert](#rqsrs-006rbacdistributedtableinsert)
-      * 5.2.10.4 [RQ.SRS-006.RBAC.DistributedTable.SpecialTables](#rqsrs-006rbacdistributedtablespecialtables)
-      * 5.2.10.5 [RQ.SRS-006.RBAC.DistributedTable.LocalUser](#rqsrs-006rbacdistributedtablelocaluser)
-      * 5.2.10.6 [RQ.SRS-006.RBAC.DistributedTable.SameUserDifferentNodesDifferentPrivileges](#rqsrs-006rbacdistributedtablesameuserdifferentnodesdifferentprivileges)
-    * 5.2.11 [Views](#views)
-      * 5.2.11.1 [View](#view)
-        * 5.2.11.1.1 [RQ.SRS-006.RBAC.View](#rqsrs-006rbacview)
-        * 5.2.11.1.2 [RQ.SRS-006.RBAC.View.Create](#rqsrs-006rbacviewcreate)
-        * 5.2.11.1.3 [RQ.SRS-006.RBAC.View.Select](#rqsrs-006rbacviewselect)
-        * 5.2.11.1.4 [RQ.SRS-006.RBAC.View.Drop](#rqsrs-006rbacviewdrop)
-      * 5.2.11.2 [Materialized View](#materialized-view)
-        * 5.2.11.2.1 [RQ.SRS-006.RBAC.MaterializedView](#rqsrs-006rbacmaterializedview)
-        * 5.2.11.2.2 [RQ.SRS-006.RBAC.MaterializedView.Create](#rqsrs-006rbacmaterializedviewcreate)
-        * 5.2.11.2.3 [RQ.SRS-006.RBAC.MaterializedView.Select](#rqsrs-006rbacmaterializedviewselect)
-        * 5.2.11.2.4 [RQ.SRS-006.RBAC.MaterializedView.Select.TargetTable](#rqsrs-006rbacmaterializedviewselecttargettable)
-        * 5.2.11.2.5 [RQ.SRS-006.RBAC.MaterializedView.Select.SourceTable](#rqsrs-006rbacmaterializedviewselectsourcetable)
-        * 5.2.11.2.6 [RQ.SRS-006.RBAC.MaterializedView.Drop](#rqsrs-006rbacmaterializedviewdrop)
-        * 5.2.11.2.7 [RQ.SRS-006.RBAC.MaterializedView.ModifyQuery](#rqsrs-006rbacmaterializedviewmodifyquery)
-        * 5.2.11.2.8 [RQ.SRS-006.RBAC.MaterializedView.Insert](#rqsrs-006rbacmaterializedviewinsert)
-        * 5.2.11.2.9 [RQ.SRS-006.RBAC.MaterializedView.Insert.SourceTable](#rqsrs-006rbacmaterializedviewinsertsourcetable)
-        * 5.2.11.2.10 [RQ.SRS-006.RBAC.MaterializedView.Insert.TargetTable](#rqsrs-006rbacmaterializedviewinserttargettable)
-      * 5.2.11.3 [Live View](#live-view)
-        * 5.2.11.3.1 [RQ.SRS-006.RBAC.LiveView](#rqsrs-006rbacliveview)
-        * 5.2.11.3.2 [RQ.SRS-006.RBAC.LiveView.Create](#rqsrs-006rbacliveviewcreate)
-        * 5.2.11.3.3 [RQ.SRS-006.RBAC.LiveView.Select](#rqsrs-006rbacliveviewselect)
-        * 5.2.11.3.4 [RQ.SRS-006.RBAC.LiveView.Drop](#rqsrs-006rbacliveviewdrop)
-        * 5.2.11.3.5 [RQ.SRS-006.RBAC.LiveView.Refresh](#rqsrs-006rbacliveviewrefresh)
-    * 5.2.12 [Select](#select)
-      * 5.2.12.1 [RQ.SRS-006.RBAC.Select](#rqsrs-006rbacselect)
-      * 5.2.12.2 [RQ.SRS-006.RBAC.Select.Column](#rqsrs-006rbacselectcolumn)
-      * 5.2.12.3 [RQ.SRS-006.RBAC.Select.Cluster](#rqsrs-006rbacselectcluster)
-      * 5.2.12.4 [RQ.SRS-006.RBAC.Select.TableEngines](#rqsrs-006rbacselecttableengines)
-    * 5.2.13 [Insert](#insert)
-      * 5.2.13.1 [RQ.SRS-006.RBAC.Insert](#rqsrs-006rbacinsert)
-      * 5.2.13.2 [RQ.SRS-006.RBAC.Insert.Column](#rqsrs-006rbacinsertcolumn)
-      * 5.2.13.3 [RQ.SRS-006.RBAC.Insert.Cluster](#rqsrs-006rbacinsertcluster)
-      * 5.2.13.4 [RQ.SRS-006.RBAC.Insert.TableEngines](#rqsrs-006rbacinserttableengines)
-    * 5.2.14 [Alter](#alter)
-      * 5.2.14.1 [Alter Column](#alter-column)
-        * 5.2.14.1.1 [RQ.SRS-006.RBAC.Privileges.AlterColumn](#rqsrs-006rbacprivilegesaltercolumn)
-        * 5.2.14.1.2 [RQ.SRS-006.RBAC.Privileges.AlterColumn.Grant](#rqsrs-006rbacprivilegesaltercolumngrant)
-        * 5.2.14.1.3 [RQ.SRS-006.RBAC.Privileges.AlterColumn.Revoke](#rqsrs-006rbacprivilegesaltercolumnrevoke)
-        * 5.2.14.1.4 [RQ.SRS-006.RBAC.Privileges.AlterColumn.Column](#rqsrs-006rbacprivilegesaltercolumncolumn)
-        * 5.2.14.1.5 [RQ.SRS-006.RBAC.Privileges.AlterColumn.Cluster](#rqsrs-006rbacprivilegesaltercolumncluster)
-        * 5.2.14.1.6 [RQ.SRS-006.RBAC.Privileges.AlterColumn.TableEngines](#rqsrs-006rbacprivilegesaltercolumntableengines)
-      * 5.2.14.2 [Alter Index](#alter-index)
-        * 5.2.14.2.1 [RQ.SRS-006.RBAC.Privileges.AlterIndex](#rqsrs-006rbacprivilegesalterindex)
-        * 5.2.14.2.2 [RQ.SRS-006.RBAC.Privileges.AlterIndex.Grant](#rqsrs-006rbacprivilegesalterindexgrant)
-        * 5.2.14.2.3 [RQ.SRS-006.RBAC.Privileges.AlterIndex.Revoke](#rqsrs-006rbacprivilegesalterindexrevoke)
-        * 5.2.14.2.4 [RQ.SRS-006.RBAC.Privileges.AlterIndex.Cluster](#rqsrs-006rbacprivilegesalterindexcluster)
-        * 5.2.14.2.5 [RQ.SRS-006.RBAC.Privileges.AlterIndex.TableEngines](#rqsrs-006rbacprivilegesalterindextableengines)
-      * 5.2.14.3 [Alter Constraint](#alter-constraint)
-        * 5.2.14.3.1 [RQ.SRS-006.RBAC.Privileges.AlterConstraint](#rqsrs-006rbacprivilegesalterconstraint)
-        * 5.2.14.3.2 [RQ.SRS-006.RBAC.Privileges.AlterConstraint.Grant](#rqsrs-006rbacprivilegesalterconstraintgrant)
-        * 5.2.14.3.3 [RQ.SRS-006.RBAC.Privileges.AlterConstraint.Revoke](#rqsrs-006rbacprivilegesalterconstraintrevoke)
-        * 5.2.14.3.4 [RQ.SRS-006.RBAC.Privileges.AlterConstraint.Cluster](#rqsrs-006rbacprivilegesalterconstraintcluster)
-        * 5.2.14.3.5 [RQ.SRS-006.RBAC.Privileges.AlterConstraint.TableEngines](#rqsrs-006rbacprivilegesalterconstrainttableengines)
-      * 5.2.14.4 [Alter TTL](#alter-ttl)
-        * 5.2.14.4.1 [RQ.SRS-006.RBAC.Privileges.AlterTTL](#rqsrs-006rbacprivilegesalterttl)
-        * 5.2.14.4.2 [RQ.SRS-006.RBAC.Privileges.AlterTTL.Grant](#rqsrs-006rbacprivilegesalterttlgrant)
-        * 5.2.14.4.3 [RQ.SRS-006.RBAC.Privileges.AlterTTL.Revoke](#rqsrs-006rbacprivilegesalterttlrevoke)
-        * 5.2.14.4.4 [RQ.SRS-006.RBAC.Privileges.AlterTTL.Cluster](#rqsrs-006rbacprivilegesalterttlcluster)
-        * 5.2.14.4.5 [RQ.SRS-006.RBAC.Privileges.AlterTTL.TableEngines](#rqsrs-006rbacprivilegesalterttltableengines)
-      * 5.2.14.5 [Alter Settings](#alter-settings)
-        * 5.2.14.5.1 [RQ.SRS-006.RBAC.Privileges.AlterSettings](#rqsrs-006rbacprivilegesaltersettings)
-        * 5.2.14.5.2 [RQ.SRS-006.RBAC.Privileges.AlterSettings.Grant](#rqsrs-006rbacprivilegesaltersettingsgrant)
-        * 5.2.14.5.3 [RQ.SRS-006.RBAC.Privileges.AlterSettings.Revoke](#rqsrs-006rbacprivilegesaltersettingsrevoke)
-        * 5.2.14.5.4 [RQ.SRS-006.RBAC.Privileges.AlterSettings.Cluster](#rqsrs-006rbacprivilegesaltersettingscluster)
-        * 5.2.14.5.5 [RQ.SRS-006.RBAC.Privileges.AlterSettings.TableEngines](#rqsrs-006rbacprivilegesaltersettingstableengines)
-      * 5.2.14.6 [Alter Update](#alter-update)
-        * 5.2.14.6.1 [RQ.SRS-006.RBAC.Privileges.AlterUpdate](#rqsrs-006rbacprivilegesalterupdate)
-        * 5.2.14.6.2 [RQ.SRS-006.RBAC.Privileges.AlterUpdate.Grant](#rqsrs-006rbacprivilegesalterupdategrant)
-        * 5.2.14.6.3 [RQ.SRS-006.RBAC.Privileges.AlterUpdate.Revoke](#rqsrs-006rbacprivilegesalterupdaterevoke)
-        * 5.2.14.6.4 [RQ.SRS-006.RBAC.Privileges.AlterUpdate.TableEngines](#rqsrs-006rbacprivilegesalterupdatetableengines)
-      * 5.2.14.7 [Alter Delete](#alter-delete)
-        * 5.2.14.7.1 [RQ.SRS-006.RBAC.Privileges.AlterDelete](#rqsrs-006rbacprivilegesalterdelete)
-        * 5.2.14.7.2 [RQ.SRS-006.RBAC.Privileges.AlterDelete.Grant](#rqsrs-006rbacprivilegesalterdeletegrant)
-        * 5.2.14.7.3 [RQ.SRS-006.RBAC.Privileges.AlterDelete.Revoke](#rqsrs-006rbacprivilegesalterdeleterevoke)
-        * 5.2.14.7.4 [RQ.SRS-006.RBAC.Privileges.AlterDelete.TableEngines](#rqsrs-006rbacprivilegesalterdeletetableengines)
-      * 5.2.14.8 [Alter Freeze Partition](#alter-freeze-partition)
-        * 5.2.14.8.1 [RQ.SRS-006.RBAC.Privileges.AlterFreeze](#rqsrs-006rbacprivilegesalterfreeze)
-        * 5.2.14.8.2 [RQ.SRS-006.RBAC.Privileges.AlterFreeze.Grant](#rqsrs-006rbacprivilegesalterfreezegrant)
-        * 5.2.14.8.3 [RQ.SRS-006.RBAC.Privileges.AlterFreeze.Revoke](#rqsrs-006rbacprivilegesalterfreezerevoke)
-        * 5.2.14.8.4 [RQ.SRS-006.RBAC.Privileges.AlterFreeze.TableEngines](#rqsrs-006rbacprivilegesalterfreezetableengines)
-      * 5.2.14.9 [Alter Fetch Partition](#alter-fetch-partition)
-        * 5.2.14.9.1 [RQ.SRS-006.RBAC.Privileges.AlterFetch](#rqsrs-006rbacprivilegesalterfetch)
-        * 5.2.14.9.2 [RQ.SRS-006.RBAC.Privileges.AlterFetch.Grant](#rqsrs-006rbacprivilegesalterfetchgrant)
-        * 5.2.14.9.3 [RQ.SRS-006.RBAC.Privileges.AlterFetch.Revoke](#rqsrs-006rbacprivilegesalterfetchrevoke)
-        * 5.2.14.9.4 [RQ.SRS-006.RBAC.Privileges.AlterFetch.TableEngines](#rqsrs-006rbacprivilegesalterfetchtableengines)
-      * 5.2.14.10 [Alter Move Partition](#alter-move-partition)
-        * 5.2.14.10.1 [RQ.SRS-006.RBAC.Privileges.AlterMove](#rqsrs-006rbacprivilegesaltermove)
-        * 5.2.14.10.2 [RQ.SRS-006.RBAC.Privileges.AlterMove.Grant](#rqsrs-006rbacprivilegesaltermovegrant)
-        * 5.2.14.10.3 [RQ.SRS-006.RBAC.Privileges.AlterMove.Revoke](#rqsrs-006rbacprivilegesaltermoverevoke)
-        * 5.2.14.10.4 [RQ.SRS-006.RBAC.Privileges.AlterMove.TableEngines](#rqsrs-006rbacprivilegesaltermovetableengines)
-    * 5.2.15 [RQ.SRS-006.RBAC.Privileges.CreateTable](#rqsrs-006rbacprivilegescreatetable)
-    * 5.2.16 [RQ.SRS-006.RBAC.Privileges.CreateDatabase](#rqsrs-006rbacprivilegescreatedatabase)
-    * 5.2.17 [RQ.SRS-006.RBAC.Privileges.CreateDictionary](#rqsrs-006rbacprivilegescreatedictionary)
-    * 5.2.18 [RQ.SRS-006.RBAC.Privileges.CreateTemporaryTable](#rqsrs-006rbacprivilegescreatetemporarytable)
-    * 5.2.19 [RQ.SRS-006.RBAC.Privileges.AttachDatabase](#rqsrs-006rbacprivilegesattachdatabase)
-    * 5.2.20 [RQ.SRS-006.RBAC.Privileges.AttachDictionary](#rqsrs-006rbacprivilegesattachdictionary)
-    * 5.2.21 [RQ.SRS-006.RBAC.Privileges.AttachTemporaryTable](#rqsrs-006rbacprivilegesattachtemporarytable)
-    * 5.2.22 [RQ.SRS-006.RBAC.Privileges.AttachTable](#rqsrs-006rbacprivilegesattachtable)
-    * 5.2.23 [RQ.SRS-006.RBAC.Privileges.DropTable](#rqsrs-006rbacprivilegesdroptable)
-    * 5.2.24 [RQ.SRS-006.RBAC.Privileges.DropDatabase](#rqsrs-006rbacprivilegesdropdatabase)
-    * 5.2.25 [RQ.SRS-006.RBAC.Privileges.DropDictionary](#rqsrs-006rbacprivilegesdropdictionary)
-    * 5.2.26 [RQ.SRS-006.RBAC.Privileges.DetachTable](#rqsrs-006rbacprivilegesdetachtable)
-    * 5.2.27 [RQ.SRS-006.RBAC.Privileges.DetachView](#rqsrs-006rbacprivilegesdetachview)
-    * 5.2.28 [RQ.SRS-006.RBAC.Privileges.DetachDatabase](#rqsrs-006rbacprivilegesdetachdatabase)
-    * 5.2.29 [RQ.SRS-006.RBAC.Privileges.DetachDictionary](#rqsrs-006rbacprivilegesdetachdictionary)
-    * 5.2.30 [RQ.SRS-006.RBAC.Privileges.Truncate](#rqsrs-006rbacprivilegestruncate)
-    * 5.2.31 [RQ.SRS-006.RBAC.Privileges.Optimize](#rqsrs-006rbacprivilegesoptimize)
-    * 5.2.32 [RQ.SRS-006.RBAC.Privileges.KillQuery](#rqsrs-006rbacprivilegeskillquery)
-    * 5.2.33 [Kill Mutation](#kill-mutation)
-      * 5.2.33.1 [RQ.SRS-006.RBAC.Privileges.KillMutation](#rqsrs-006rbacprivilegeskillmutation)
-      * 5.2.33.2 [RQ.SRS-006.RBAC.Privileges.KillMutation.AlterUpdate](#rqsrs-006rbacprivilegeskillmutationalterupdate)
-      * 5.2.33.3 [RQ.SRS-006.RBAC.Privileges.KillMutation.AlterDelete](#rqsrs-006rbacprivilegeskillmutationalterdelete)
-      * 5.2.33.4 [RQ.SRS-006.RBAC.Privileges.KillMutation.AlterDropColumn](#rqsrs-006rbacprivilegeskillmutationalterdropcolumn)
-    * 5.2.34 [Show](#show)
-      * 5.2.34.1 [RQ.SRS-006.RBAC.ShowTables.Privilege](#rqsrs-006rbacshowtablesprivilege)
-      * 5.2.34.2 [RQ.SRS-006.RBAC.ShowTables.RequiredPrivilege](#rqsrs-006rbacshowtablesrequiredprivilege)
-      * 5.2.34.3 [RQ.SRS-006.RBAC.ExistsTable.RequiredPrivilege](#rqsrs-006rbacexiststablerequiredprivilege)
-      * 5.2.34.4 [RQ.SRS-006.RBAC.CheckTable.RequiredPrivilege](#rqsrs-006rbacchecktablerequiredprivilege)
-      * 5.2.34.5 [RQ.SRS-006.RBAC.ShowDatabases.Privilege](#rqsrs-006rbacshowdatabasesprivilege)
-      * 5.2.34.6 [RQ.SRS-006.RBAC.ShowDatabases.RequiredPrivilege](#rqsrs-006rbacshowdatabasesrequiredprivilege)
-      * 5.2.34.7 [RQ.SRS-006.RBAC.ShowCreateDatabase.RequiredPrivilege](#rqsrs-006rbacshowcreatedatabaserequiredprivilege)
-      * 5.2.34.8 [RQ.SRS-006.RBAC.UseDatabase.RequiredPrivilege](#rqsrs-006rbacusedatabaserequiredprivilege)
-      * 5.2.34.9 [RQ.SRS-006.RBAC.ShowColumns.Privilege](#rqsrs-006rbacshowcolumnsprivilege)
-      * 5.2.34.10 [RQ.SRS-006.RBAC.ShowCreateTable.RequiredPrivilege](#rqsrs-006rbacshowcreatetablerequiredprivilege)
-      * 5.2.34.11 [RQ.SRS-006.RBAC.DescribeTable.RequiredPrivilege](#rqsrs-006rbacdescribetablerequiredprivilege)
-      * 5.2.34.12 [RQ.SRS-006.RBAC.ShowDictionaries.Privilege](#rqsrs-006rbacshowdictionariesprivilege)
-      * 5.2.34.13 [RQ.SRS-006.RBAC.ShowDictionaries.RequiredPrivilege](#rqsrs-006rbacshowdictionariesrequiredprivilege)
-      * 5.2.34.14 [RQ.SRS-006.RBAC.ShowCreateDictionary.RequiredPrivilege](#rqsrs-006rbacshowcreatedictionaryrequiredprivilege)
-      * 5.2.34.15 [RQ.SRS-006.RBAC.ExistsDictionary.RequiredPrivilege](#rqsrs-006rbacexistsdictionaryrequiredprivilege)
-    * 5.2.35 [Access Management](#access-management)
-      * 5.2.35.1 [RQ.SRS-006.RBAC.Privileges.CreateUser](#rqsrs-006rbacprivilegescreateuser)
-      * 5.2.35.2 [RQ.SRS-006.RBAC.Privileges.CreateUser.DefaultRole](#rqsrs-006rbacprivilegescreateuserdefaultrole)
-      * 5.2.35.3 [RQ.SRS-006.RBAC.Privileges.AlterUser](#rqsrs-006rbacprivilegesalteruser)
-      * 5.2.35.4 [RQ.SRS-006.RBAC.Privileges.DropUser](#rqsrs-006rbacprivilegesdropuser)
-      * 5.2.35.5 [RQ.SRS-006.RBAC.Privileges.CreateRole](#rqsrs-006rbacprivilegescreaterole)
-      * 5.2.35.6 [RQ.SRS-006.RBAC.Privileges.AlterRole](#rqsrs-006rbacprivilegesalterrole)
-      * 5.2.35.7 [RQ.SRS-006.RBAC.Privileges.DropRole](#rqsrs-006rbacprivilegesdroprole)
-      * 5.2.35.8 [RQ.SRS-006.RBAC.Privileges.CreateRowPolicy](#rqsrs-006rbacprivilegescreaterowpolicy)
-      * 5.2.35.9 [RQ.SRS-006.RBAC.Privileges.AlterRowPolicy](#rqsrs-006rbacprivilegesalterrowpolicy)
-      * 5.2.35.10 [RQ.SRS-006.RBAC.Privileges.DropRowPolicy](#rqsrs-006rbacprivilegesdroprowpolicy)
-      * 5.2.35.11 [RQ.SRS-006.RBAC.Privileges.CreateQuota](#rqsrs-006rbacprivilegescreatequota)
-      * 5.2.35.12 [RQ.SRS-006.RBAC.Privileges.AlterQuota](#rqsrs-006rbacprivilegesalterquota)
-      * 5.2.35.13 [RQ.SRS-006.RBAC.Privileges.DropQuota](#rqsrs-006rbacprivilegesdropquota)
-      * 5.2.35.14 [RQ.SRS-006.RBAC.Privileges.CreateSettingsProfile](#rqsrs-006rbacprivilegescreatesettingsprofile)
-      * 5.2.35.15 [RQ.SRS-006.RBAC.Privileges.AlterSettingsProfile](#rqsrs-006rbacprivilegesaltersettingsprofile)
-      * 5.2.35.16 [RQ.SRS-006.RBAC.Privileges.DropSettingsProfile](#rqsrs-006rbacprivilegesdropsettingsprofile)
-      * 5.2.35.17 [RQ.SRS-006.RBAC.Privileges.RoleAdmin](#rqsrs-006rbacprivilegesroleadmin)
-      * 5.2.35.18 [Show Access](#show-access)
-        * 5.2.35.18.1 [RQ.SRS-006.RBAC.ShowUsers.Privilege](#rqsrs-006rbacshowusersprivilege)
-        * 5.2.35.18.2 [RQ.SRS-006.RBAC.ShowUsers.RequiredPrivilege](#rqsrs-006rbacshowusersrequiredprivilege)
-        * 5.2.35.18.3 [RQ.SRS-006.RBAC.ShowCreateUser.RequiredPrivilege](#rqsrs-006rbacshowcreateuserrequiredprivilege)
-        * 5.2.35.18.4 [RQ.SRS-006.RBAC.ShowRoles.Privilege](#rqsrs-006rbacshowrolesprivilege)
-        * 5.2.35.18.5 [RQ.SRS-006.RBAC.ShowRoles.RequiredPrivilege](#rqsrs-006rbacshowrolesrequiredprivilege)
-        * 5.2.35.18.6 [RQ.SRS-006.RBAC.ShowCreateRole.RequiredPrivilege](#rqsrs-006rbacshowcreaterolerequiredprivilege)
-        * 5.2.35.18.7 [RQ.SRS-006.RBAC.ShowRowPolicies.Privilege](#rqsrs-006rbacshowrowpoliciesprivilege)
-        * 5.2.35.18.8 [RQ.SRS-006.RBAC.ShowRowPolicies.RequiredPrivilege](#rqsrs-006rbacshowrowpoliciesrequiredprivilege)
-        * 5.2.35.18.9 [RQ.SRS-006.RBAC.ShowCreateRowPolicy.RequiredPrivilege](#rqsrs-006rbacshowcreaterowpolicyrequiredprivilege)
-        * 5.2.35.18.10 [RQ.SRS-006.RBAC.ShowQuotas.Privilege](#rqsrs-006rbacshowquotasprivilege)
-        * 5.2.35.18.11 [RQ.SRS-006.RBAC.ShowQuotas.RequiredPrivilege](#rqsrs-006rbacshowquotasrequiredprivilege)
-        * 5.2.35.18.12 [RQ.SRS-006.RBAC.ShowCreateQuota.RequiredPrivilege](#rqsrs-006rbacshowcreatequotarequiredprivilege)
-        * 5.2.35.18.13 [RQ.SRS-006.RBAC.ShowSettingsProfiles.Privilege](#rqsrs-006rbacshowsettingsprofilesprivilege)
-        * 5.2.35.18.14 [RQ.SRS-006.RBAC.ShowSettingsProfiles.RequiredPrivilege](#rqsrs-006rbacshowsettingsprofilesrequiredprivilege)
-        * 5.2.35.18.15 [RQ.SRS-006.RBAC.ShowCreateSettingsProfile.RequiredPrivilege](#rqsrs-006rbacshowcreatesettingsprofilerequiredprivilege)
-    * 5.2.36 [dictGet](#dictget)
-      * 5.2.36.1 [RQ.SRS-006.RBAC.dictGet.Privilege](#rqsrs-006rbacdictgetprivilege)
-      * 5.2.36.2 [RQ.SRS-006.RBAC.dictGet.RequiredPrivilege](#rqsrs-006rbacdictgetrequiredprivilege)
-      * 5.2.36.3 [RQ.SRS-006.RBAC.dictGet.Type.RequiredPrivilege](#rqsrs-006rbacdictgettyperequiredprivilege)
-      * 5.2.36.4 [RQ.SRS-006.RBAC.dictGet.OrDefault.RequiredPrivilege](#rqsrs-006rbacdictgetordefaultrequiredprivilege)
-      * 5.2.36.5 [RQ.SRS-006.RBAC.dictHas.RequiredPrivilege](#rqsrs-006rbacdicthasrequiredprivilege)
-      * 5.2.36.6 [RQ.SRS-006.RBAC.dictGetHierarchy.RequiredPrivilege](#rqsrs-006rbacdictgethierarchyrequiredprivilege)
-      * 5.2.36.7 [RQ.SRS-006.RBAC.dictIsIn.RequiredPrivilege](#rqsrs-006rbacdictisinrequiredprivilege)
-    * 5.2.37 [Introspection](#introspection)
-      * 5.2.37.1 [RQ.SRS-006.RBAC.Privileges.Introspection](#rqsrs-006rbacprivilegesintrospection)
-      * 5.2.37.2 [RQ.SRS-006.RBAC.Privileges.Introspection.addressToLine](#rqsrs-006rbacprivilegesintrospectionaddresstoline)
-      * 5.2.37.3 [RQ.SRS-006.RBAC.Privileges.Introspection.addressToSymbol](#rqsrs-006rbacprivilegesintrospectionaddresstosymbol)
-      * 5.2.37.4 [RQ.SRS-006.RBAC.Privileges.Introspection.demangle](#rqsrs-006rbacprivilegesintrospectiondemangle)
-    * 5.2.38 [System](#system)
-      * 5.2.38.1 [RQ.SRS-006.RBAC.Privileges.System.Shutdown](#rqsrs-006rbacprivilegessystemshutdown)
-      * 5.2.38.2 [RQ.SRS-006.RBAC.Privileges.System.DropCache](#rqsrs-006rbacprivilegessystemdropcache)
-      * 5.2.38.3 [RQ.SRS-006.RBAC.Privileges.System.DropCache.DNS](#rqsrs-006rbacprivilegessystemdropcachedns)
-      * 5.2.38.4 [RQ.SRS-006.RBAC.Privileges.System.DropCache.Mark](#rqsrs-006rbacprivilegessystemdropcachemark)
-      * 5.2.38.5 [RQ.SRS-006.RBAC.Privileges.System.DropCache.Uncompressed](#rqsrs-006rbacprivilegessystemdropcacheuncompressed)
-      * 5.2.38.6 [RQ.SRS-006.RBAC.Privileges.System.Reload](#rqsrs-006rbacprivilegessystemreload)
-      * 5.2.38.7 [RQ.SRS-006.RBAC.Privileges.System.Reload.Config](#rqsrs-006rbacprivilegessystemreloadconfig)
-      * 5.2.38.8 [RQ.SRS-006.RBAC.Privileges.System.Reload.Dictionary](#rqsrs-006rbacprivilegessystemreloaddictionary)
-      * 5.2.38.9 [RQ.SRS-006.RBAC.Privileges.System.Reload.Dictionaries](#rqsrs-006rbacprivilegessystemreloaddictionaries)
-      * 5.2.38.10 [RQ.SRS-006.RBAC.Privileges.System.Reload.EmbeddedDictionaries](#rqsrs-006rbacprivilegessystemreloadembeddeddictionaries)
-      * 5.2.38.11 [RQ.SRS-006.RBAC.Privileges.System.Merges](#rqsrs-006rbacprivilegessystemmerges)
-      * 5.2.38.12 [RQ.SRS-006.RBAC.Privileges.System.TTLMerges](#rqsrs-006rbacprivilegessystemttlmerges)
-      * 5.2.38.13 [RQ.SRS-006.RBAC.Privileges.System.Fetches](#rqsrs-006rbacprivilegessystemfetches)
-      * 5.2.38.14 [RQ.SRS-006.RBAC.Privileges.System.Moves](#rqsrs-006rbacprivilegessystemmoves)
-      * 5.2.38.15 [RQ.SRS-006.RBAC.Privileges.System.Sends](#rqsrs-006rbacprivilegessystemsends)
-      * 5.2.38.16 [RQ.SRS-006.RBAC.Privileges.System.Sends.Distributed](#rqsrs-006rbacprivilegessystemsendsdistributed)
-      * 5.2.38.17 [RQ.SRS-006.RBAC.Privileges.System.Sends.Replicated](#rqsrs-006rbacprivilegessystemsendsreplicated)
-      * 5.2.38.18 [RQ.SRS-006.RBAC.Privileges.System.ReplicationQueues](#rqsrs-006rbacprivilegessystemreplicationqueues)
-      * 5.2.38.19 [RQ.SRS-006.RBAC.Privileges.System.SyncReplica](#rqsrs-006rbacprivilegessystemsyncreplica)
-      * 5.2.38.20 [RQ.SRS-006.RBAC.Privileges.System.RestartReplica](#rqsrs-006rbacprivilegessystemrestartreplica)
-      * 5.2.38.21 [RQ.SRS-006.RBAC.Privileges.System.Flush](#rqsrs-006rbacprivilegessystemflush)
-      * 5.2.38.22 [RQ.SRS-006.RBAC.Privileges.System.Flush.Distributed](#rqsrs-006rbacprivilegessystemflushdistributed)
-      * 5.2.38.23 [RQ.SRS-006.RBAC.Privileges.System.Flush.Logs](#rqsrs-006rbacprivilegessystemflushlogs)
-    * 5.2.39 [Sources](#sources)
-      * 5.2.39.1 [RQ.SRS-006.RBAC.Privileges.Sources](#rqsrs-006rbacprivilegessources)
-      * 5.2.39.2 [RQ.SRS-006.RBAC.Privileges.Sources.File](#rqsrs-006rbacprivilegessourcesfile)
-      * 5.2.39.3 [RQ.SRS-006.RBAC.Privileges.Sources.URL](#rqsrs-006rbacprivilegessourcesurl)
-      * 5.2.39.4 [RQ.SRS-006.RBAC.Privileges.Sources.Remote](#rqsrs-006rbacprivilegessourcesremote)
-      * 5.2.39.5 [RQ.SRS-006.RBAC.Privileges.Sources.MySQL](#rqsrs-006rbacprivilegessourcesmysql)
-      * 5.2.39.6 [RQ.SRS-006.RBAC.Privileges.Sources.ODBC](#rqsrs-006rbacprivilegessourcesodbc)
-      * 5.2.39.7 [RQ.SRS-006.RBAC.Privileges.Sources.JDBC](#rqsrs-006rbacprivilegessourcesjdbc)
-      * 5.2.39.8 [RQ.SRS-006.RBAC.Privileges.Sources.HDFS](#rqsrs-006rbacprivilegessourceshdfs)
-      * 5.2.39.9 [RQ.SRS-006.RBAC.Privileges.Sources.S3](#rqsrs-006rbacprivilegessourcess3)
-    * 5.2.40 [RQ.SRS-006.RBAC.Privileges.GrantOption](#rqsrs-006rbacprivilegesgrantoption)
-    * 5.2.41 [RQ.SRS-006.RBAC.Privileges.All](#rqsrs-006rbacprivilegesall)
-    * 5.2.42 [RQ.SRS-006.RBAC.Privileges.AdminOption](#rqsrs-006rbacprivilegesadminoption)
+  * 5.2 [Login](#login)
+    * 5.2.1 [RQ.SRS-006.RBAC.Login](#rqsrs-006rbaclogin)
+    * 5.2.2 [RQ.SRS-006.RBAC.Login.DefaultUser](#rqsrs-006rbaclogindefaultuser)
+  * 5.3 [User](#user)
+    * 5.3.1 [RQ.SRS-006.RBAC.User](#rqsrs-006rbacuser)
+    * 5.3.2 [RQ.SRS-006.RBAC.User.Roles](#rqsrs-006rbacuserroles)
+    * 5.3.3 [RQ.SRS-006.RBAC.User.Privileges](#rqsrs-006rbacuserprivileges)
+    * 5.3.4 [RQ.SRS-006.RBAC.User.Variables](#rqsrs-006rbacuservariables)
+    * 5.3.5 [RQ.SRS-006.RBAC.User.Variables.Constraints](#rqsrs-006rbacuservariablesconstraints)
+    * 5.3.6 [RQ.SRS-006.RBAC.User.SettingsProfile](#rqsrs-006rbacusersettingsprofile)
+    * 5.3.7 [RQ.SRS-006.RBAC.User.Quotas](#rqsrs-006rbacuserquotas)
+    * 5.3.8 [RQ.SRS-006.RBAC.User.RowPolicies](#rqsrs-006rbacuserrowpolicies)
+    * 5.3.9 [RQ.SRS-006.RBAC.User.DefaultRole](#rqsrs-006rbacuserdefaultrole)
+    * 5.3.10 [RQ.SRS-006.RBAC.User.RoleSelection](#rqsrs-006rbacuserroleselection)
+    * 5.3.11 [RQ.SRS-006.RBAC.User.ShowCreate](#rqsrs-006rbacusershowcreate)
+    * 5.3.12 [RQ.SRS-006.RBAC.User.ShowPrivileges](#rqsrs-006rbacusershowprivileges)
+    * 5.3.13 [RQ.SRS-006.RBAC.User.Use.DefaultRole](#rqsrs-006rbacuserusedefaultrole)
+    * 5.3.14 [RQ.SRS-006.RBAC.User.Use.AllRolesWhenNoDefaultRole](#rqsrs-006rbacuseruseallroleswhennodefaultrole)
+    * 5.3.15 [Create User](#create-user)
+      * 5.3.15.1 [RQ.SRS-006.RBAC.User.Create](#rqsrs-006rbacusercreate)
+      * 5.3.15.2 [RQ.SRS-006.RBAC.User.Create.IfNotExists](#rqsrs-006rbacusercreateifnotexists)
+      * 5.3.15.3 [RQ.SRS-006.RBAC.User.Create.Replace](#rqsrs-006rbacusercreatereplace)
+      * 5.3.15.4 [RQ.SRS-006.RBAC.User.Create.Password.NoPassword](#rqsrs-006rbacusercreatepasswordnopassword)
+      * 5.3.15.5 [RQ.SRS-006.RBAC.User.Create.Password.NoPassword.Login](#rqsrs-006rbacusercreatepasswordnopasswordlogin)
+      * 5.3.15.6 [RQ.SRS-006.RBAC.User.Create.Password.PlainText](#rqsrs-006rbacusercreatepasswordplaintext)
+      * 5.3.15.7 [RQ.SRS-006.RBAC.User.Create.Password.PlainText.Login](#rqsrs-006rbacusercreatepasswordplaintextlogin)
+      * 5.3.15.8 [RQ.SRS-006.RBAC.User.Create.Password.Sha256Password](#rqsrs-006rbacusercreatepasswordsha256password)
+      * 5.3.15.9 [RQ.SRS-006.RBAC.User.Create.Password.Sha256Password.Login](#rqsrs-006rbacusercreatepasswordsha256passwordlogin)
+      * 5.3.15.10 [RQ.SRS-006.RBAC.User.Create.Password.Sha256Hash](#rqsrs-006rbacusercreatepasswordsha256hash)
+      * 5.3.15.11 [RQ.SRS-006.RBAC.User.Create.Password.Sha256Hash.Login](#rqsrs-006rbacusercreatepasswordsha256hashlogin)
+      * 5.3.15.12 [RQ.SRS-006.RBAC.User.Create.Password.DoubleSha1Password](#rqsrs-006rbacusercreatepassworddoublesha1password)
+      * 5.3.15.13 [RQ.SRS-006.RBAC.User.Create.Password.DoubleSha1Password.Login](#rqsrs-006rbacusercreatepassworddoublesha1passwordlogin)
+      * 5.3.15.14 [RQ.SRS-006.RBAC.User.Create.Password.DoubleSha1Hash](#rqsrs-006rbacusercreatepassworddoublesha1hash)
+      * 5.3.15.15 [RQ.SRS-006.RBAC.User.Create.Password.DoubleSha1Hash.Login](#rqsrs-006rbacusercreatepassworddoublesha1hashlogin)
+      * 5.3.15.16 [RQ.SRS-006.RBAC.User.Create.Host.Name](#rqsrs-006rbacusercreatehostname)
+      * 5.3.15.17 [RQ.SRS-006.RBAC.User.Create.Host.Regexp](#rqsrs-006rbacusercreatehostregexp)
+      * 5.3.15.18 [RQ.SRS-006.RBAC.User.Create.Host.IP](#rqsrs-006rbacusercreatehostip)
+      * 5.3.15.19 [RQ.SRS-006.RBAC.User.Create.Host.Any](#rqsrs-006rbacusercreatehostany)
+      * 5.3.15.20 [RQ.SRS-006.RBAC.User.Create.Host.None](#rqsrs-006rbacusercreatehostnone)
+      * 5.3.15.21 [RQ.SRS-006.RBAC.User.Create.Host.Local](#rqsrs-006rbacusercreatehostlocal)
+      * 5.3.15.22 [RQ.SRS-006.RBAC.User.Create.Host.Like](#rqsrs-006rbacusercreatehostlike)
+      * 5.3.15.23 [RQ.SRS-006.RBAC.User.Create.Host.Default](#rqsrs-006rbacusercreatehostdefault)
+      * 5.3.15.24 [RQ.SRS-006.RBAC.User.Create.DefaultRole](#rqsrs-006rbacusercreatedefaultrole)
+      * 5.3.15.25 [RQ.SRS-006.RBAC.User.Create.DefaultRole.None](#rqsrs-006rbacusercreatedefaultrolenone)
+      * 5.3.15.26 [RQ.SRS-006.RBAC.User.Create.DefaultRole.All](#rqsrs-006rbacusercreatedefaultroleall)
+      * 5.3.15.27 [RQ.SRS-006.RBAC.User.Create.Settings](#rqsrs-006rbacusercreatesettings)
+      * 5.3.15.28 [RQ.SRS-006.RBAC.User.Create.OnCluster](#rqsrs-006rbacusercreateoncluster)
+      * 5.3.15.29 [RQ.SRS-006.RBAC.User.Create.Syntax](#rqsrs-006rbacusercreatesyntax)
+    * 5.3.16 [Alter User](#alter-user)
+      * 5.3.16.1 [RQ.SRS-006.RBAC.User.Alter](#rqsrs-006rbacuseralter)
+      * 5.3.16.2 [RQ.SRS-006.RBAC.User.Alter.OrderOfEvaluation](#rqsrs-006rbacuseralterorderofevaluation)
+      * 5.3.16.3 [RQ.SRS-006.RBAC.User.Alter.IfExists](#rqsrs-006rbacuseralterifexists)
+      * 5.3.16.4 [RQ.SRS-006.RBAC.User.Alter.Cluster](#rqsrs-006rbacuseraltercluster)
+      * 5.3.16.5 [RQ.SRS-006.RBAC.User.Alter.Rename](#rqsrs-006rbacuseralterrename)
+      * 5.3.16.6 [RQ.SRS-006.RBAC.User.Alter.Password.PlainText](#rqsrs-006rbacuseralterpasswordplaintext)
+      * 5.3.16.7 [RQ.SRS-006.RBAC.User.Alter.Password.Sha256Password](#rqsrs-006rbacuseralterpasswordsha256password)
+      * 5.3.16.8 [RQ.SRS-006.RBAC.User.Alter.Password.DoubleSha1Password](#rqsrs-006rbacuseralterpassworddoublesha1password)
+      * 5.3.16.9 [RQ.SRS-006.RBAC.User.Alter.Host.AddDrop](#rqsrs-006rbacuseralterhostadddrop)
+      * 5.3.16.10 [RQ.SRS-006.RBAC.User.Alter.Host.Local](#rqsrs-006rbacuseralterhostlocal)
+      * 5.3.16.11 [RQ.SRS-006.RBAC.User.Alter.Host.Name](#rqsrs-006rbacuseralterhostname)
+      * 5.3.16.12 [RQ.SRS-006.RBAC.User.Alter.Host.Regexp](#rqsrs-006rbacuseralterhostregexp)
+      * 5.3.16.13 [RQ.SRS-006.RBAC.User.Alter.Host.IP](#rqsrs-006rbacuseralterhostip)
+      * 5.3.16.14 [RQ.SRS-006.RBAC.User.Alter.Host.Like](#rqsrs-006rbacuseralterhostlike)
+      * 5.3.16.15 [RQ.SRS-006.RBAC.User.Alter.Host.Any](#rqsrs-006rbacuseralterhostany)
+      * 5.3.16.16 [RQ.SRS-006.RBAC.User.Alter.Host.None](#rqsrs-006rbacuseralterhostnone)
+      * 5.3.16.17 [RQ.SRS-006.RBAC.User.Alter.DefaultRole](#rqsrs-006rbacuseralterdefaultrole)
+      * 5.3.16.18 [RQ.SRS-006.RBAC.User.Alter.DefaultRole.All](#rqsrs-006rbacuseralterdefaultroleall)
+      * 5.3.16.19 [RQ.SRS-006.RBAC.User.Alter.DefaultRole.AllExcept](#rqsrs-006rbacuseralterdefaultroleallexcept)
+      * 5.3.16.20 [RQ.SRS-006.RBAC.User.Alter.Settings](#rqsrs-006rbacuseraltersettings)
+      * 5.3.16.21 [RQ.SRS-006.RBAC.User.Alter.Settings.Min](#rqsrs-006rbacuseraltersettingsmin)
+      * 5.3.16.22 [RQ.SRS-006.RBAC.User.Alter.Settings.Max](#rqsrs-006rbacuseraltersettingsmax)
+      * 5.3.16.23 [RQ.SRS-006.RBAC.User.Alter.Settings.Profile](#rqsrs-006rbacuseraltersettingsprofile)
+      * 5.3.16.24 [RQ.SRS-006.RBAC.User.Alter.Syntax](#rqsrs-006rbacuseraltersyntax)
+    * 5.3.17 [Show Create User](#show-create-user)
+      * 5.3.17.1 [RQ.SRS-006.RBAC.User.ShowCreateUser](#rqsrs-006rbacusershowcreateuser)
+      * 5.3.17.2 [RQ.SRS-006.RBAC.User.ShowCreateUser.For](#rqsrs-006rbacusershowcreateuserfor)
+      * 5.3.17.3 [RQ.SRS-006.RBAC.User.ShowCreateUser.Syntax](#rqsrs-006rbacusershowcreateusersyntax)
+    * 5.3.18 [Drop User](#drop-user)
+      * 5.3.18.1 [RQ.SRS-006.RBAC.User.Drop](#rqsrs-006rbacuserdrop)
+      * 5.3.18.2 [RQ.SRS-006.RBAC.User.Drop.IfExists](#rqsrs-006rbacuserdropifexists)
+      * 5.3.18.3 [RQ.SRS-006.RBAC.User.Drop.OnCluster](#rqsrs-006rbacuserdroponcluster)
+      * 5.3.18.4 [RQ.SRS-006.RBAC.User.Drop.Syntax](#rqsrs-006rbacuserdropsyntax)
+  * 5.4 [Role](#role)
+    * 5.4.1 [RQ.SRS-006.RBAC.Role](#rqsrs-006rbacrole)
+    * 5.4.2 [RQ.SRS-006.RBAC.Role.Privileges](#rqsrs-006rbacroleprivileges)
+    * 5.4.3 [RQ.SRS-006.RBAC.Role.Variables](#rqsrs-006rbacrolevariables)
+    * 5.4.4 [RQ.SRS-006.RBAC.Role.SettingsProfile](#rqsrs-006rbacrolesettingsprofile)
+    * 5.4.5 [RQ.SRS-006.RBAC.Role.Quotas](#rqsrs-006rbacrolequotas)
+    * 5.4.6 [RQ.SRS-006.RBAC.Role.RowPolicies](#rqsrs-006rbacrolerowpolicies)
+    * 5.4.7 [Create Role](#create-role)
+      * 5.4.7.1 [RQ.SRS-006.RBAC.Role.Create](#rqsrs-006rbacrolecreate)
+      * 5.4.7.2 [RQ.SRS-006.RBAC.Role.Create.IfNotExists](#rqsrs-006rbacrolecreateifnotexists)
+      * 5.4.7.3 [RQ.SRS-006.RBAC.Role.Create.Replace](#rqsrs-006rbacrolecreatereplace)
+      * 5.4.7.4 [RQ.SRS-006.RBAC.Role.Create.Settings](#rqsrs-006rbacrolecreatesettings)
+      * 5.4.7.5 [RQ.SRS-006.RBAC.Role.Create.Syntax](#rqsrs-006rbacrolecreatesyntax)
+    * 5.4.8 [Alter Role](#alter-role)
+      * 5.4.8.1 [RQ.SRS-006.RBAC.Role.Alter](#rqsrs-006rbacrolealter)
+      * 5.4.8.2 [RQ.SRS-006.RBAC.Role.Alter.IfExists](#rqsrs-006rbacrolealterifexists)
+      * 5.4.8.3 [RQ.SRS-006.RBAC.Role.Alter.Cluster](#rqsrs-006rbacrolealtercluster)
+      * 5.4.8.4 [RQ.SRS-006.RBAC.Role.Alter.Rename](#rqsrs-006rbacrolealterrename)
+      * 5.4.8.5 [RQ.SRS-006.RBAC.Role.Alter.Settings](#rqsrs-006rbacrolealtersettings)
+      * 5.4.8.6 [RQ.SRS-006.RBAC.Role.Alter.Syntax](#rqsrs-006rbacrolealtersyntax)
+    * 5.4.9 [Drop Role](#drop-role)
+      * 5.4.9.1 [RQ.SRS-006.RBAC.Role.Drop](#rqsrs-006rbacroledrop)
+      * 5.4.9.2 [RQ.SRS-006.RBAC.Role.Drop.IfExists](#rqsrs-006rbacroledropifexists)
+      * 5.4.9.3 [RQ.SRS-006.RBAC.Role.Drop.Cluster](#rqsrs-006rbacroledropcluster)
+      * 5.4.9.4 [RQ.SRS-006.RBAC.Role.Drop.Syntax](#rqsrs-006rbacroledropsyntax)
+    * 5.4.10 [Show Create Role](#show-create-role)
+      * 5.4.10.1 [RQ.SRS-006.RBAC.Role.ShowCreate](#rqsrs-006rbacroleshowcreate)
+      * 5.4.10.2 [RQ.SRS-006.RBAC.Role.ShowCreate.Syntax](#rqsrs-006rbacroleshowcreatesyntax)
+  * 5.5 [Partial Revokes](#partial-revokes)
+    * 5.5.1 [RQ.SRS-006.RBAC.PartialRevokes](#rqsrs-006rbacpartialrevokes)
+    * 5.5.2 [RQ.SRS-006.RBAC.PartialRevoke.Syntax](#rqsrs-006rbacpartialrevokesyntax)
+  * 5.6 [Settings Profile](#settings-profile)
+    * 5.6.1 [RQ.SRS-006.RBAC.SettingsProfile](#rqsrs-006rbacsettingsprofile)
+    * 5.6.2 [RQ.SRS-006.RBAC.SettingsProfile.Constraints](#rqsrs-006rbacsettingsprofileconstraints)
+    * 5.6.3 [Create Settings Profile](#create-settings-profile)
+      * 5.6.3.1 [RQ.SRS-006.RBAC.SettingsProfile.Create](#rqsrs-006rbacsettingsprofilecreate)
+      * 5.6.3.2 [RQ.SRS-006.RBAC.SettingsProfile.Create.IfNotExists](#rqsrs-006rbacsettingsprofilecreateifnotexists)
+      * 5.6.3.3 [RQ.SRS-006.RBAC.SettingsProfile.Create.Replace](#rqsrs-006rbacsettingsprofilecreatereplace)
+      * 5.6.3.4 [RQ.SRS-006.RBAC.SettingsProfile.Create.Variables](#rqsrs-006rbacsettingsprofilecreatevariables)
+      * 5.6.3.5 [RQ.SRS-006.RBAC.SettingsProfile.Create.Variables.Value](#rqsrs-006rbacsettingsprofilecreatevariablesvalue)
+      * 5.6.3.6 [RQ.SRS-006.RBAC.SettingsProfile.Create.Variables.Constraints](#rqsrs-006rbacsettingsprofilecreatevariablesconstraints)
+      * 5.6.3.7 [RQ.SRS-006.RBAC.SettingsProfile.Create.Assignment](#rqsrs-006rbacsettingsprofilecreateassignment)
+      * 5.6.3.8 [RQ.SRS-006.RBAC.SettingsProfile.Create.Assignment.None](#rqsrs-006rbacsettingsprofilecreateassignmentnone)
+      * 5.6.3.9 [RQ.SRS-006.RBAC.SettingsProfile.Create.Assignment.All](#rqsrs-006rbacsettingsprofilecreateassignmentall)
+      * 5.6.3.10 [RQ.SRS-006.RBAC.SettingsProfile.Create.Assignment.AllExcept](#rqsrs-006rbacsettingsprofilecreateassignmentallexcept)
+      * 5.6.3.11 [RQ.SRS-006.RBAC.SettingsProfile.Create.Inherit](#rqsrs-006rbacsettingsprofilecreateinherit)
+      * 5.6.3.12 [RQ.SRS-006.RBAC.SettingsProfile.Create.OnCluster](#rqsrs-006rbacsettingsprofilecreateoncluster)
+      * 5.6.3.13 [RQ.SRS-006.RBAC.SettingsProfile.Create.Syntax](#rqsrs-006rbacsettingsprofilecreatesyntax)
+    * 5.6.4 [Alter Settings Profile](#alter-settings-profile)
+      * 5.6.4.1 [RQ.SRS-006.RBAC.SettingsProfile.Alter](#rqsrs-006rbacsettingsprofilealter)
+      * 5.6.4.2 [RQ.SRS-006.RBAC.SettingsProfile.Alter.IfExists](#rqsrs-006rbacsettingsprofilealterifexists)
+      * 5.6.4.3 [RQ.SRS-006.RBAC.SettingsProfile.Alter.Rename](#rqsrs-006rbacsettingsprofilealterrename)
+      * 5.6.4.4 [RQ.SRS-006.RBAC.SettingsProfile.Alter.Variables](#rqsrs-006rbacsettingsprofilealtervariables)
+      * 5.6.4.5 [RQ.SRS-006.RBAC.SettingsProfile.Alter.Variables.Value](#rqsrs-006rbacsettingsprofilealtervariablesvalue)
+      * 5.6.4.6 [RQ.SRS-006.RBAC.SettingsProfile.Alter.Variables.Constraints](#rqsrs-006rbacsettingsprofilealtervariablesconstraints)
+      * 5.6.4.7 [RQ.SRS-006.RBAC.SettingsProfile.Alter.Assignment](#rqsrs-006rbacsettingsprofilealterassignment)
+      * 5.6.4.8 [RQ.SRS-006.RBAC.SettingsProfile.Alter.Assignment.None](#rqsrs-006rbacsettingsprofilealterassignmentnone)
+      * 5.6.4.9 [RQ.SRS-006.RBAC.SettingsProfile.Alter.Assignment.All](#rqsrs-006rbacsettingsprofilealterassignmentall)
+      * 5.6.4.10 [RQ.SRS-006.RBAC.SettingsProfile.Alter.Assignment.AllExcept](#rqsrs-006rbacsettingsprofilealterassignmentallexcept)
+      * 5.6.4.11 [RQ.SRS-006.RBAC.SettingsProfile.Alter.Assignment.Inherit](#rqsrs-006rbacsettingsprofilealterassignmentinherit)
+      * 5.6.4.12 [RQ.SRS-006.RBAC.SettingsProfile.Alter.Assignment.OnCluster](#rqsrs-006rbacsettingsprofilealterassignmentoncluster)
+      * 5.6.4.13 [RQ.SRS-006.RBAC.SettingsProfile.Alter.Syntax](#rqsrs-006rbacsettingsprofilealtersyntax)
+    * 5.6.5 [Drop Settings Profile](#drop-settings-profile)
+      * 5.6.5.1 [RQ.SRS-006.RBAC.SettingsProfile.Drop](#rqsrs-006rbacsettingsprofiledrop)
+      * 5.6.5.2 [RQ.SRS-006.RBAC.SettingsProfile.Drop.IfExists](#rqsrs-006rbacsettingsprofiledropifexists)
+      * 5.6.5.3 [RQ.SRS-006.RBAC.SettingsProfile.Drop.OnCluster](#rqsrs-006rbacsettingsprofiledroponcluster)
+      * 5.6.5.4 [RQ.SRS-006.RBAC.SettingsProfile.Drop.Syntax](#rqsrs-006rbacsettingsprofiledropsyntax)
+    * 5.6.6 [Show Create Settings Profile](#show-create-settings-profile)
+      * 5.6.6.1 [RQ.SRS-006.RBAC.SettingsProfile.ShowCreateSettingsProfile](#rqsrs-006rbacsettingsprofileshowcreatesettingsprofile)
+  * 5.7 [Quotas](#quotas)
+    * 5.7.1 [RQ.SRS-006.RBAC.Quotas](#rqsrs-006rbacquotas)
+    * 5.7.2 [RQ.SRS-006.RBAC.Quotas.Keyed](#rqsrs-006rbacquotaskeyed)
+    * 5.7.3 [RQ.SRS-006.RBAC.Quotas.Queries](#rqsrs-006rbacquotasqueries)
+    * 5.7.4 [RQ.SRS-006.RBAC.Quotas.Errors](#rqsrs-006rbacquotaserrors)
+    * 5.7.5 [RQ.SRS-006.RBAC.Quotas.ResultRows](#rqsrs-006rbacquotasresultrows)
+    * 5.7.6 [RQ.SRS-006.RBAC.Quotas.ReadRows](#rqsrs-006rbacquotasreadrows)
+    * 5.7.7 [RQ.SRS-006.RBAC.Quotas.ResultBytes](#rqsrs-006rbacquotasresultbytes)
+    * 5.7.8 [RQ.SRS-006.RBAC.Quotas.ReadBytes](#rqsrs-006rbacquotasreadbytes)
+    * 5.7.9 [RQ.SRS-006.RBAC.Quotas.ExecutionTime](#rqsrs-006rbacquotasexecutiontime)
+    * 5.7.10 [Create Quotas](#create-quotas)
+      * 5.7.10.1 [RQ.SRS-006.RBAC.Quota.Create](#rqsrs-006rbacquotacreate)
+      * 5.7.10.2 [RQ.SRS-006.RBAC.Quota.Create.IfNotExists](#rqsrs-006rbacquotacreateifnotexists)
+      * 5.7.10.3 [RQ.SRS-006.RBAC.Quota.Create.Replace](#rqsrs-006rbacquotacreatereplace)
+      * 5.7.10.4 [RQ.SRS-006.RBAC.Quota.Create.Cluster](#rqsrs-006rbacquotacreatecluster)
+      * 5.7.10.5 [RQ.SRS-006.RBAC.Quota.Create.Interval](#rqsrs-006rbacquotacreateinterval)
+      * 5.7.10.6 [RQ.SRS-006.RBAC.Quota.Create.Interval.Randomized](#rqsrs-006rbacquotacreateintervalrandomized)
+      * 5.7.10.7 [RQ.SRS-006.RBAC.Quota.Create.Queries](#rqsrs-006rbacquotacreatequeries)
+      * 5.7.10.8 [RQ.SRS-006.RBAC.Quota.Create.Errors](#rqsrs-006rbacquotacreateerrors)
+      * 5.7.10.9 [RQ.SRS-006.RBAC.Quota.Create.ResultRows](#rqsrs-006rbacquotacreateresultrows)
+      * 5.7.10.10 [RQ.SRS-006.RBAC.Quota.Create.ReadRows](#rqsrs-006rbacquotacreatereadrows)
+      * 5.7.10.11 [RQ.SRS-006.RBAC.Quota.Create.ResultBytes](#rqsrs-006rbacquotacreateresultbytes)
+      * 5.7.10.12 [RQ.SRS-006.RBAC.Quota.Create.ReadBytes](#rqsrs-006rbacquotacreatereadbytes)
+      * 5.7.10.13 [RQ.SRS-006.RBAC.Quota.Create.ExecutionTime](#rqsrs-006rbacquotacreateexecutiontime)
+      * 5.7.10.14 [RQ.SRS-006.RBAC.Quota.Create.NoLimits](#rqsrs-006rbacquotacreatenolimits)
+      * 5.7.10.15 [RQ.SRS-006.RBAC.Quota.Create.TrackingOnly](#rqsrs-006rbacquotacreatetrackingonly)
+      * 5.7.10.16 [RQ.SRS-006.RBAC.Quota.Create.KeyedBy](#rqsrs-006rbacquotacreatekeyedby)
+      * 5.7.10.17 [RQ.SRS-006.RBAC.Quota.Create.KeyedByOptions](#rqsrs-006rbacquotacreatekeyedbyoptions)
+      * 5.7.10.18 [RQ.SRS-006.RBAC.Quota.Create.Assignment](#rqsrs-006rbacquotacreateassignment)
+      * 5.7.10.19 [RQ.SRS-006.RBAC.Quota.Create.Assignment.None](#rqsrs-006rbacquotacreateassignmentnone)
+      * 5.7.10.20 [RQ.SRS-006.RBAC.Quota.Create.Assignment.All](#rqsrs-006rbacquotacreateassignmentall)
+      * 5.7.10.21 [RQ.SRS-006.RBAC.Quota.Create.Assignment.Except](#rqsrs-006rbacquotacreateassignmentexcept)
+      * 5.7.10.22 [RQ.SRS-006.RBAC.Quota.Create.Syntax](#rqsrs-006rbacquotacreatesyntax)
+    * 5.7.11 [Alter Quota](#alter-quota)
+      * 5.7.11.1 [RQ.SRS-006.RBAC.Quota.Alter](#rqsrs-006rbacquotaalter)
+      * 5.7.11.2 [RQ.SRS-006.RBAC.Quota.Alter.IfExists](#rqsrs-006rbacquotaalterifexists)
+      * 5.7.11.3 [RQ.SRS-006.RBAC.Quota.Alter.Rename](#rqsrs-006rbacquotaalterrename)
+      * 5.7.11.4 [RQ.SRS-006.RBAC.Quota.Alter.Cluster](#rqsrs-006rbacquotaaltercluster)
+      * 5.7.11.5 [RQ.SRS-006.RBAC.Quota.Alter.Interval](#rqsrs-006rbacquotaalterinterval)
+      * 5.7.11.6 [RQ.SRS-006.RBAC.Quota.Alter.Interval.Randomized](#rqsrs-006rbacquotaalterintervalrandomized)
+      * 5.7.11.7 [RQ.SRS-006.RBAC.Quota.Alter.Queries](#rqsrs-006rbacquotaalterqueries)
+      * 5.7.11.8 [RQ.SRS-006.RBAC.Quota.Alter.Errors](#rqsrs-006rbacquotaaltererrors)
+      * 5.7.11.9 [RQ.SRS-006.RBAC.Quota.Alter.ResultRows](#rqsrs-006rbacquotaalterresultrows)
+      * 5.7.11.10 [RQ.SRS-006.RBAC.Quota.Alter.ReadRows](#rqsrs-006rbacquotaalterreadrows)
+      * 5.7.11.11 [RQ.SRS-006.RBAC.Quota.ALter.ResultBytes](#rqsrs-006rbacquotaalterresultbytes)
+      * 5.7.11.12 [RQ.SRS-006.RBAC.Quota.Alter.ReadBytes](#rqsrs-006rbacquotaalterreadbytes)
+      * 5.7.11.13 [RQ.SRS-006.RBAC.Quota.Alter.ExecutionTime](#rqsrs-006rbacquotaalterexecutiontime)
+      * 5.7.11.14 [RQ.SRS-006.RBAC.Quota.Alter.NoLimits](#rqsrs-006rbacquotaalternolimits)
+      * 5.7.11.15 [RQ.SRS-006.RBAC.Quota.Alter.TrackingOnly](#rqsrs-006rbacquotaaltertrackingonly)
+      * 5.7.11.16 [RQ.SRS-006.RBAC.Quota.Alter.KeyedBy](#rqsrs-006rbacquotaalterkeyedby)
+      * 5.7.11.17 [RQ.SRS-006.RBAC.Quota.Alter.KeyedByOptions](#rqsrs-006rbacquotaalterkeyedbyoptions)
+      * 5.7.11.18 [RQ.SRS-006.RBAC.Quota.Alter.Assignment](#rqsrs-006rbacquotaalterassignment)
+      * 5.7.11.19 [RQ.SRS-006.RBAC.Quota.Alter.Assignment.None](#rqsrs-006rbacquotaalterassignmentnone)
+      * 5.7.11.20 [RQ.SRS-006.RBAC.Quota.Alter.Assignment.All](#rqsrs-006rbacquotaalterassignmentall)
+      * 5.7.11.21 [RQ.SRS-006.RBAC.Quota.Alter.Assignment.Except](#rqsrs-006rbacquotaalterassignmentexcept)
+      * 5.7.11.22 [RQ.SRS-006.RBAC.Quota.Alter.Syntax](#rqsrs-006rbacquotaaltersyntax)
+    * 5.7.12 [Drop Quota](#drop-quota)
+      * 5.7.12.1 [RQ.SRS-006.RBAC.Quota.Drop](#rqsrs-006rbacquotadrop)
+      * 5.7.12.2 [RQ.SRS-006.RBAC.Quota.Drop.IfExists](#rqsrs-006rbacquotadropifexists)
+      * 5.7.12.3 [RQ.SRS-006.RBAC.Quota.Drop.Cluster](#rqsrs-006rbacquotadropcluster)
+      * 5.7.12.4 [RQ.SRS-006.RBAC.Quota.Drop.Syntax](#rqsrs-006rbacquotadropsyntax)
+    * 5.7.13 [Show Quotas](#show-quotas)
+      * 5.7.13.1 [RQ.SRS-006.RBAC.Quota.ShowQuotas](#rqsrs-006rbacquotashowquotas)
+      * 5.7.13.2 [RQ.SRS-006.RBAC.Quota.ShowQuotas.IntoOutfile](#rqsrs-006rbacquotashowquotasintooutfile)
+      * 5.7.13.3 [RQ.SRS-006.RBAC.Quota.ShowQuotas.Format](#rqsrs-006rbacquotashowquotasformat)
+      * 5.7.13.4 [RQ.SRS-006.RBAC.Quota.ShowQuotas.Settings](#rqsrs-006rbacquotashowquotassettings)
+      * 5.7.13.5 [RQ.SRS-006.RBAC.Quota.ShowQuotas.Syntax](#rqsrs-006rbacquotashowquotassyntax)
+    * 5.7.14 [Show Create Quota](#show-create-quota)
+      * 5.7.14.1 [RQ.SRS-006.RBAC.Quota.ShowCreateQuota.Name](#rqsrs-006rbacquotashowcreatequotaname)
+      * 5.7.14.2 [RQ.SRS-006.RBAC.Quota.ShowCreateQuota.Current](#rqsrs-006rbacquotashowcreatequotacurrent)
+      * 5.7.14.3 [RQ.SRS-006.RBAC.Quota.ShowCreateQuota.Syntax](#rqsrs-006rbacquotashowcreatequotasyntax)
+  * 5.8 [Row Policy](#row-policy)
+    * 5.8.1 [RQ.SRS-006.RBAC.RowPolicy](#rqsrs-006rbacrowpolicy)
+    * 5.8.2 [RQ.SRS-006.RBAC.RowPolicy.Condition](#rqsrs-006rbacrowpolicycondition)
+    * 5.8.3 [RQ.SRS-006.RBAC.RowPolicy.Restriction](#rqsrs-006rbacrowpolicyrestriction)
+    * 5.8.4 [RQ.SRS-006.RBAC.RowPolicy.Nesting](#rqsrs-006rbacrowpolicynesting)
+    * 5.8.5 [Create Row Policy](#create-row-policy)
+      * 5.8.5.1 [RQ.SRS-006.RBAC.RowPolicy.Create](#rqsrs-006rbacrowpolicycreate)
+      * 5.8.5.2 [RQ.SRS-006.RBAC.RowPolicy.Create.IfNotExists](#rqsrs-006rbacrowpolicycreateifnotexists)
+      * 5.8.5.3 [RQ.SRS-006.RBAC.RowPolicy.Create.Replace](#rqsrs-006rbacrowpolicycreatereplace)
+      * 5.8.5.4 [RQ.SRS-006.RBAC.RowPolicy.Create.OnCluster](#rqsrs-006rbacrowpolicycreateoncluster)
+      * 5.8.5.5 [RQ.SRS-006.RBAC.RowPolicy.Create.On](#rqsrs-006rbacrowpolicycreateon)
+      * 5.8.5.6 [RQ.SRS-006.RBAC.RowPolicy.Create.Access](#rqsrs-006rbacrowpolicycreateaccess)
+      * 5.8.5.7 [RQ.SRS-006.RBAC.RowPolicy.Create.Access.Permissive](#rqsrs-006rbacrowpolicycreateaccesspermissive)
+      * 5.8.5.8 [RQ.SRS-006.RBAC.RowPolicy.Create.Access.Restrictive](#rqsrs-006rbacrowpolicycreateaccessrestrictive)
+      * 5.8.5.9 [RQ.SRS-006.RBAC.RowPolicy.Create.ForSelect](#rqsrs-006rbacrowpolicycreateforselect)
+      * 5.8.5.10 [RQ.SRS-006.RBAC.RowPolicy.Create.Condition](#rqsrs-006rbacrowpolicycreatecondition)
+      * 5.8.5.11 [RQ.SRS-006.RBAC.RowPolicy.Create.Assignment](#rqsrs-006rbacrowpolicycreateassignment)
+      * 5.8.5.12 [RQ.SRS-006.RBAC.RowPolicy.Create.Assignment.None](#rqsrs-006rbacrowpolicycreateassignmentnone)
+      * 5.8.5.13 [RQ.SRS-006.RBAC.RowPolicy.Create.Assignment.All](#rqsrs-006rbacrowpolicycreateassignmentall)
+      * 5.8.5.14 [RQ.SRS-006.RBAC.RowPolicy.Create.Assignment.AllExcept](#rqsrs-006rbacrowpolicycreateassignmentallexcept)
+      * 5.8.5.15 [RQ.SRS-006.RBAC.RowPolicy.Create.Syntax](#rqsrs-006rbacrowpolicycreatesyntax)
+    * 5.8.6 [Alter Row Policy](#alter-row-policy)
+      * 5.8.6.1 [RQ.SRS-006.RBAC.RowPolicy.Alter](#rqsrs-006rbacrowpolicyalter)
+      * 5.8.6.2 [RQ.SRS-006.RBAC.RowPolicy.Alter.IfExists](#rqsrs-006rbacrowpolicyalterifexists)
+      * 5.8.6.3 [RQ.SRS-006.RBAC.RowPolicy.Alter.ForSelect](#rqsrs-006rbacrowpolicyalterforselect)
+      * 5.8.6.4 [RQ.SRS-006.RBAC.RowPolicy.Alter.OnCluster](#rqsrs-006rbacrowpolicyalteroncluster)
+      * 5.8.6.5 [RQ.SRS-006.RBAC.RowPolicy.Alter.On](#rqsrs-006rbacrowpolicyalteron)
+      * 5.8.6.6 [RQ.SRS-006.RBAC.RowPolicy.Alter.Rename](#rqsrs-006rbacrowpolicyalterrename)
+      * 5.8.6.7 [RQ.SRS-006.RBAC.RowPolicy.Alter.Access](#rqsrs-006rbacrowpolicyalteraccess)
+      * 5.8.6.8 [RQ.SRS-006.RBAC.RowPolicy.Alter.Access.Permissive](#rqsrs-006rbacrowpolicyalteraccesspermissive)
+      * 5.8.6.9 [RQ.SRS-006.RBAC.RowPolicy.Alter.Access.Restrictive](#rqsrs-006rbacrowpolicyalteraccessrestrictive)
+      * 5.8.6.10 [RQ.SRS-006.RBAC.RowPolicy.Alter.Condition](#rqsrs-006rbacrowpolicyaltercondition)
+      * 5.8.6.11 [RQ.SRS-006.RBAC.RowPolicy.Alter.Condition.None](#rqsrs-006rbacrowpolicyalterconditionnone)
+      * 5.8.6.12 [RQ.SRS-006.RBAC.RowPolicy.Alter.Assignment](#rqsrs-006rbacrowpolicyalterassignment)
+      * 5.8.6.13 [RQ.SRS-006.RBAC.RowPolicy.Alter.Assignment.None](#rqsrs-006rbacrowpolicyalterassignmentnone)
+      * 5.8.6.14 [RQ.SRS-006.RBAC.RowPolicy.Alter.Assignment.All](#rqsrs-006rbacrowpolicyalterassignmentall)
+      * 5.8.6.15 [RQ.SRS-006.RBAC.RowPolicy.Alter.Assignment.AllExcept](#rqsrs-006rbacrowpolicyalterassignmentallexcept)
+      * 5.8.6.16 [RQ.SRS-006.RBAC.RowPolicy.Alter.Syntax](#rqsrs-006rbacrowpolicyaltersyntax)
+    * 5.8.7 [Drop Row Policy](#drop-row-policy)
+      * 5.8.7.1 [RQ.SRS-006.RBAC.RowPolicy.Drop](#rqsrs-006rbacrowpolicydrop)
+      * 5.8.7.2 [RQ.SRS-006.RBAC.RowPolicy.Drop.IfExists](#rqsrs-006rbacrowpolicydropifexists)
+      * 5.8.7.3 [RQ.SRS-006.RBAC.RowPolicy.Drop.On](#rqsrs-006rbacrowpolicydropon)
+      * 5.8.7.4 [RQ.SRS-006.RBAC.RowPolicy.Drop.OnCluster](#rqsrs-006rbacrowpolicydroponcluster)
+      * 5.8.7.5 [RQ.SRS-006.RBAC.RowPolicy.Drop.Syntax](#rqsrs-006rbacrowpolicydropsyntax)
+    * 5.8.8 [Show Create Row Policy](#show-create-row-policy)
+      * 5.8.8.1 [RQ.SRS-006.RBAC.RowPolicy.ShowCreateRowPolicy](#rqsrs-006rbacrowpolicyshowcreaterowpolicy)
+      * 5.8.8.2 [RQ.SRS-006.RBAC.RowPolicy.ShowCreateRowPolicy.On](#rqsrs-006rbacrowpolicyshowcreaterowpolicyon)
+      * 5.8.8.3 [RQ.SRS-006.RBAC.RowPolicy.ShowCreateRowPolicy.Syntax](#rqsrs-006rbacrowpolicyshowcreaterowpolicysyntax)
+      * 5.8.8.4 [RQ.SRS-006.RBAC.RowPolicy.ShowRowPolicies](#rqsrs-006rbacrowpolicyshowrowpolicies)
+      * 5.8.8.5 [RQ.SRS-006.RBAC.RowPolicy.ShowRowPolicies.On](#rqsrs-006rbacrowpolicyshowrowpolicieson)
+      * 5.8.8.6 [RQ.SRS-006.RBAC.RowPolicy.ShowRowPolicies.Syntax](#rqsrs-006rbacrowpolicyshowrowpoliciessyntax)
+  * 5.9 [Set Default Role](#set-default-role)
+    * 5.9.1 [RQ.SRS-006.RBAC.SetDefaultRole](#rqsrs-006rbacsetdefaultrole)
+    * 5.9.2 [RQ.SRS-006.RBAC.SetDefaultRole.CurrentUser](#rqsrs-006rbacsetdefaultrolecurrentuser)
+    * 5.9.3 [RQ.SRS-006.RBAC.SetDefaultRole.All](#rqsrs-006rbacsetdefaultroleall)
+    * 5.9.4 [RQ.SRS-006.RBAC.SetDefaultRole.AllExcept](#rqsrs-006rbacsetdefaultroleallexcept)
+    * 5.9.5 [RQ.SRS-006.RBAC.SetDefaultRole.None](#rqsrs-006rbacsetdefaultrolenone)
+    * 5.9.6 [RQ.SRS-006.RBAC.SetDefaultRole.Syntax](#rqsrs-006rbacsetdefaultrolesyntax)
+  * 5.10 [Set Role](#set-role)
+    * 5.10.1 [RQ.SRS-006.RBAC.SetRole](#rqsrs-006rbacsetrole)
+    * 5.10.2 [RQ.SRS-006.RBAC.SetRole.Default](#rqsrs-006rbacsetroledefault)
+    * 5.10.3 [RQ.SRS-006.RBAC.SetRole.None](#rqsrs-006rbacsetrolenone)
+    * 5.10.4 [RQ.SRS-006.RBAC.SetRole.All](#rqsrs-006rbacsetroleall)
+    * 5.10.5 [RQ.SRS-006.RBAC.SetRole.AllExcept](#rqsrs-006rbacsetroleallexcept)
+    * 5.10.6 [RQ.SRS-006.RBAC.SetRole.Syntax](#rqsrs-006rbacsetrolesyntax)
+  * 5.11 [Grant](#grant)
+    * 5.11.1 [RQ.SRS-006.RBAC.Grant.Privilege.To](#rqsrs-006rbacgrantprivilegeto)
+    * 5.11.2 [RQ.SRS-006.RBAC.Grant.Privilege.ToCurrentUser](#rqsrs-006rbacgrantprivilegetocurrentuser)
+    * 5.11.3 [RQ.SRS-006.RBAC.Grant.Privilege.Select](#rqsrs-006rbacgrantprivilegeselect)
+    * 5.11.4 [RQ.SRS-006.RBAC.Grant.Privilege.Insert](#rqsrs-006rbacgrantprivilegeinsert)
+    * 5.11.5 [RQ.SRS-006.RBAC.Grant.Privilege.Alter](#rqsrs-006rbacgrantprivilegealter)
+    * 5.11.6 [RQ.SRS-006.RBAC.Grant.Privilege.Create](#rqsrs-006rbacgrantprivilegecreate)
+    * 5.11.7 [RQ.SRS-006.RBAC.Grant.Privilege.Drop](#rqsrs-006rbacgrantprivilegedrop)
+    * 5.11.8 [RQ.SRS-006.RBAC.Grant.Privilege.Truncate](#rqsrs-006rbacgrantprivilegetruncate)
+    * 5.11.9 [RQ.SRS-006.RBAC.Grant.Privilege.Optimize](#rqsrs-006rbacgrantprivilegeoptimize)
+    * 5.11.10 [RQ.SRS-006.RBAC.Grant.Privilege.Show](#rqsrs-006rbacgrantprivilegeshow)
+    * 5.11.11 [RQ.SRS-006.RBAC.Grant.Privilege.KillQuery](#rqsrs-006rbacgrantprivilegekillquery)
+    * 5.11.12 [RQ.SRS-006.RBAC.Grant.Privilege.AccessManagement](#rqsrs-006rbacgrantprivilegeaccessmanagement)
+    * 5.11.13 [RQ.SRS-006.RBAC.Grant.Privilege.System](#rqsrs-006rbacgrantprivilegesystem)
+    * 5.11.14 [RQ.SRS-006.RBAC.Grant.Privilege.Introspection](#rqsrs-006rbacgrantprivilegeintrospection)
+    * 5.11.15 [RQ.SRS-006.RBAC.Grant.Privilege.Sources](#rqsrs-006rbacgrantprivilegesources)
+    * 5.11.16 [RQ.SRS-006.RBAC.Grant.Privilege.DictGet](#rqsrs-006rbacgrantprivilegedictget)
+    * 5.11.17 [RQ.SRS-006.RBAC.Grant.Privilege.None](#rqsrs-006rbacgrantprivilegenone)
+    * 5.11.18 [RQ.SRS-006.RBAC.Grant.Privilege.All](#rqsrs-006rbacgrantprivilegeall)
+    * 5.11.19 [RQ.SRS-006.RBAC.Grant.Privilege.GrantOption](#rqsrs-006rbacgrantprivilegegrantoption)
+    * 5.11.20 [RQ.SRS-006.RBAC.Grant.Privilege.On](#rqsrs-006rbacgrantprivilegeon)
+    * 5.11.21 [RQ.SRS-006.RBAC.Grant.Privilege.PrivilegeColumns](#rqsrs-006rbacgrantprivilegeprivilegecolumns)
+    * 5.11.22 [RQ.SRS-006.RBAC.Grant.Privilege.OnCluster](#rqsrs-006rbacgrantprivilegeoncluster)
+    * 5.11.23 [RQ.SRS-006.RBAC.Grant.Privilege.Syntax](#rqsrs-006rbacgrantprivilegesyntax)
+  * 5.12 [Revoke](#revoke)
+    * 5.12.1 [RQ.SRS-006.RBAC.Revoke.Privilege.Cluster](#rqsrs-006rbacrevokeprivilegecluster)
+    * 5.12.2 [RQ.SRS-006.RBAC.Revoke.Privilege.Select](#rqsrs-006rbacrevokeprivilegeselect)
+    * 5.12.3 [RQ.SRS-006.RBAC.Revoke.Privilege.Insert](#rqsrs-006rbacrevokeprivilegeinsert)
+    * 5.12.4 [RQ.SRS-006.RBAC.Revoke.Privilege.Alter](#rqsrs-006rbacrevokeprivilegealter)
+    * 5.12.5 [RQ.SRS-006.RBAC.Revoke.Privilege.Create](#rqsrs-006rbacrevokeprivilegecreate)
+    * 5.12.6 [RQ.SRS-006.RBAC.Revoke.Privilege.Drop](#rqsrs-006rbacrevokeprivilegedrop)
+    * 5.12.7 [RQ.SRS-006.RBAC.Revoke.Privilege.Truncate](#rqsrs-006rbacrevokeprivilegetruncate)
+    * 5.12.8 [RQ.SRS-006.RBAC.Revoke.Privilege.Optimize](#rqsrs-006rbacrevokeprivilegeoptimize)
+    * 5.12.9 [RQ.SRS-006.RBAC.Revoke.Privilege.Show](#rqsrs-006rbacrevokeprivilegeshow)
+    * 5.12.10 [RQ.SRS-006.RBAC.Revoke.Privilege.KillQuery](#rqsrs-006rbacrevokeprivilegekillquery)
+    * 5.12.11 [RQ.SRS-006.RBAC.Revoke.Privilege.AccessManagement](#rqsrs-006rbacrevokeprivilegeaccessmanagement)
+    * 5.12.12 [RQ.SRS-006.RBAC.Revoke.Privilege.System](#rqsrs-006rbacrevokeprivilegesystem)
+    * 5.12.13 [RQ.SRS-006.RBAC.Revoke.Privilege.Introspection](#rqsrs-006rbacrevokeprivilegeintrospection)
+    * 5.12.14 [RQ.SRS-006.RBAC.Revoke.Privilege.Sources](#rqsrs-006rbacrevokeprivilegesources)
+    * 5.12.15 [RQ.SRS-006.RBAC.Revoke.Privilege.DictGet](#rqsrs-006rbacrevokeprivilegedictget)
+    * 5.12.16 [RQ.SRS-006.RBAC.Revoke.Privilege.PrivilegeColumns](#rqsrs-006rbacrevokeprivilegeprivilegecolumns)
+    * 5.12.17 [RQ.SRS-006.RBAC.Revoke.Privilege.Multiple](#rqsrs-006rbacrevokeprivilegemultiple)
+    * 5.12.18 [RQ.SRS-006.RBAC.Revoke.Privilege.All](#rqsrs-006rbacrevokeprivilegeall)
+    * 5.12.19 [RQ.SRS-006.RBAC.Revoke.Privilege.None](#rqsrs-006rbacrevokeprivilegenone)
+    * 5.12.20 [RQ.SRS-006.RBAC.Revoke.Privilege.On](#rqsrs-006rbacrevokeprivilegeon)
+    * 5.12.21 [RQ.SRS-006.RBAC.Revoke.Privilege.From](#rqsrs-006rbacrevokeprivilegefrom)
+    * 5.12.22 [RQ.SRS-006.RBAC.Revoke.Privilege.Syntax](#rqsrs-006rbacrevokeprivilegesyntax)
+  * 5.13 [Grant Role](#grant-role)
+    * 5.13.1 [RQ.SRS-006.RBAC.Grant.Role](#rqsrs-006rbacgrantrole)
+    * 5.13.2 [RQ.SRS-006.RBAC.Grant.Role.CurrentUser](#rqsrs-006rbacgrantrolecurrentuser)
+    * 5.13.3 [RQ.SRS-006.RBAC.Grant.Role.AdminOption](#rqsrs-006rbacgrantroleadminoption)
+    * 5.13.4 [RQ.SRS-006.RBAC.Grant.Role.OnCluster](#rqsrs-006rbacgrantroleoncluster)
+    * 5.13.5 [RQ.SRS-006.RBAC.Grant.Role.Syntax](#rqsrs-006rbacgrantrolesyntax)
+  * 5.14 [Revoke Role](#revoke-role)
+    * 5.14.1 [RQ.SRS-006.RBAC.Revoke.Role](#rqsrs-006rbacrevokerole)
+    * 5.14.2 [RQ.SRS-006.RBAC.Revoke.Role.Keywords](#rqsrs-006rbacrevokerolekeywords)
+    * 5.14.3 [RQ.SRS-006.RBAC.Revoke.Role.Cluster](#rqsrs-006rbacrevokerolecluster)
+    * 5.14.4 [RQ.SRS-006.RBAC.Revoke.AdminOption](#rqsrs-006rbacrevokeadminoption)
+    * 5.14.5 [RQ.SRS-006.RBAC.Revoke.Role.Syntax](#rqsrs-006rbacrevokerolesyntax)
+  * 5.15 [Show Grants](#show-grants)
+    * 5.15.1 [RQ.SRS-006.RBAC.Show.Grants](#rqsrs-006rbacshowgrants)
+    * 5.15.2 [RQ.SRS-006.RBAC.Show.Grants.For](#rqsrs-006rbacshowgrantsfor)
+    * 5.15.3 [RQ.SRS-006.RBAC.Show.Grants.Syntax](#rqsrs-006rbacshowgrantssyntax)
+  * 5.16 [Table Privileges](#table-privileges)
+    * 5.16.1 [RQ.SRS-006.RBAC.Table.PublicTables](#rqsrs-006rbactablepublictables)
+    * 5.16.2 [RQ.SRS-006.RBAC.Table.SensitiveTables](#rqsrs-006rbactablesensitivetables)
+  * 5.17 [Distributed Tables](#distributed-tables)
+    * 5.17.1 [RQ.SRS-006.RBAC.DistributedTable.Create](#rqsrs-006rbacdistributedtablecreate)
+    * 5.17.2 [RQ.SRS-006.RBAC.DistributedTable.Select](#rqsrs-006rbacdistributedtableselect)
+    * 5.17.3 [RQ.SRS-006.RBAC.DistributedTable.Insert](#rqsrs-006rbacdistributedtableinsert)
+    * 5.17.4 [RQ.SRS-006.RBAC.DistributedTable.SpecialTables](#rqsrs-006rbacdistributedtablespecialtables)
+    * 5.17.5 [RQ.SRS-006.RBAC.DistributedTable.LocalUser](#rqsrs-006rbacdistributedtablelocaluser)
+    * 5.17.6 [RQ.SRS-006.RBAC.DistributedTable.SameUserDifferentNodesDifferentPrivileges](#rqsrs-006rbacdistributedtablesameuserdifferentnodesdifferentprivileges)
+  * 5.18 [Views](#views)
+    * 5.18.1 [View](#view)
+      * 5.18.1.1 [RQ.SRS-006.RBAC.View](#rqsrs-006rbacview)
+      * 5.18.1.2 [RQ.SRS-006.RBAC.View.Create](#rqsrs-006rbacviewcreate)
+      * 5.18.1.3 [RQ.SRS-006.RBAC.View.Select](#rqsrs-006rbacviewselect)
+      * 5.18.1.4 [RQ.SRS-006.RBAC.View.Drop](#rqsrs-006rbacviewdrop)
+    * 5.18.2 [Materialized View](#materialized-view)
+      * 5.18.2.1 [RQ.SRS-006.RBAC.MaterializedView](#rqsrs-006rbacmaterializedview)
+      * 5.18.2.2 [RQ.SRS-006.RBAC.MaterializedView.Create](#rqsrs-006rbacmaterializedviewcreate)
+      * 5.18.2.3 [RQ.SRS-006.RBAC.MaterializedView.Select](#rqsrs-006rbacmaterializedviewselect)
+      * 5.18.2.4 [RQ.SRS-006.RBAC.MaterializedView.Select.TargetTable](#rqsrs-006rbacmaterializedviewselecttargettable)
+      * 5.18.2.5 [RQ.SRS-006.RBAC.MaterializedView.Select.SourceTable](#rqsrs-006rbacmaterializedviewselectsourcetable)
+      * 5.18.2.6 [RQ.SRS-006.RBAC.MaterializedView.Drop](#rqsrs-006rbacmaterializedviewdrop)
+      * 5.18.2.7 [RQ.SRS-006.RBAC.MaterializedView.ModifyQuery](#rqsrs-006rbacmaterializedviewmodifyquery)
+      * 5.18.2.8 [RQ.SRS-006.RBAC.MaterializedView.Insert](#rqsrs-006rbacmaterializedviewinsert)
+      * 5.18.2.9 [RQ.SRS-006.RBAC.MaterializedView.Insert.SourceTable](#rqsrs-006rbacmaterializedviewinsertsourcetable)
+      * 5.18.2.10 [RQ.SRS-006.RBAC.MaterializedView.Insert.TargetTable](#rqsrs-006rbacmaterializedviewinserttargettable)
+    * 5.18.3 [Live View](#live-view)
+      * 5.18.3.1 [RQ.SRS-006.RBAC.LiveView](#rqsrs-006rbacliveview)
+      * 5.18.3.2 [RQ.SRS-006.RBAC.LiveView.Create](#rqsrs-006rbacliveviewcreate)
+      * 5.18.3.3 [RQ.SRS-006.RBAC.LiveView.Select](#rqsrs-006rbacliveviewselect)
+      * 5.18.3.4 [RQ.SRS-006.RBAC.LiveView.Drop](#rqsrs-006rbacliveviewdrop)
+      * 5.18.3.5 [RQ.SRS-006.RBAC.LiveView.Refresh](#rqsrs-006rbacliveviewrefresh)
+  * 5.19 [Select](#select)
+    * 5.19.1 [RQ.SRS-006.RBAC.Select](#rqsrs-006rbacselect)
+    * 5.19.2 [RQ.SRS-006.RBAC.Select.Column](#rqsrs-006rbacselectcolumn)
+    * 5.19.3 [RQ.SRS-006.RBAC.Select.Cluster](#rqsrs-006rbacselectcluster)
+    * 5.19.4 [RQ.SRS-006.RBAC.Select.TableEngines](#rqsrs-006rbacselecttableengines)
+  * 5.20 [Insert](#insert)
+    * 5.20.1 [RQ.SRS-006.RBAC.Insert](#rqsrs-006rbacinsert)
+    * 5.20.2 [RQ.SRS-006.RBAC.Insert.Column](#rqsrs-006rbacinsertcolumn)
+    * 5.20.3 [RQ.SRS-006.RBAC.Insert.Cluster](#rqsrs-006rbacinsertcluster)
+    * 5.20.4 [RQ.SRS-006.RBAC.Insert.TableEngines](#rqsrs-006rbacinserttableengines)
+  * 5.21 [Alter](#alter)
+    * 5.21.1 [Alter Column](#alter-column)
+      * 5.21.1.1 [RQ.SRS-006.RBAC.Privileges.AlterColumn](#rqsrs-006rbacprivilegesaltercolumn)
+      * 5.21.1.2 [RQ.SRS-006.RBAC.Privileges.AlterColumn.Grant](#rqsrs-006rbacprivilegesaltercolumngrant)
+      * 5.21.1.3 [RQ.SRS-006.RBAC.Privileges.AlterColumn.Revoke](#rqsrs-006rbacprivilegesaltercolumnrevoke)
+      * 5.21.1.4 [RQ.SRS-006.RBAC.Privileges.AlterColumn.Column](#rqsrs-006rbacprivilegesaltercolumncolumn)
+      * 5.21.1.5 [RQ.SRS-006.RBAC.Privileges.AlterColumn.Cluster](#rqsrs-006rbacprivilegesaltercolumncluster)
+      * 5.21.1.6 [RQ.SRS-006.RBAC.Privileges.AlterColumn.TableEngines](#rqsrs-006rbacprivilegesaltercolumntableengines)
+    * 5.21.2 [Alter Index](#alter-index)
+      * 5.21.2.1 [RQ.SRS-006.RBAC.Privileges.AlterIndex](#rqsrs-006rbacprivilegesalterindex)
+      * 5.21.2.2 [RQ.SRS-006.RBAC.Privileges.AlterIndex.Grant](#rqsrs-006rbacprivilegesalterindexgrant)
+      * 5.21.2.3 [RQ.SRS-006.RBAC.Privileges.AlterIndex.Revoke](#rqsrs-006rbacprivilegesalterindexrevoke)
+      * 5.21.2.4 [RQ.SRS-006.RBAC.Privileges.AlterIndex.Cluster](#rqsrs-006rbacprivilegesalterindexcluster)
+      * 5.21.2.5 [RQ.SRS-006.RBAC.Privileges.AlterIndex.TableEngines](#rqsrs-006rbacprivilegesalterindextableengines)
+    * 5.21.3 [Alter Constraint](#alter-constraint)
+      * 5.21.3.1 [RQ.SRS-006.RBAC.Privileges.AlterConstraint](#rqsrs-006rbacprivilegesalterconstraint)
+      * 5.21.3.2 [RQ.SRS-006.RBAC.Privileges.AlterConstraint.Grant](#rqsrs-006rbacprivilegesalterconstraintgrant)
+      * 5.21.3.3 [RQ.SRS-006.RBAC.Privileges.AlterConstraint.Revoke](#rqsrs-006rbacprivilegesalterconstraintrevoke)
+      * 5.21.3.4 [RQ.SRS-006.RBAC.Privileges.AlterConstraint.Cluster](#rqsrs-006rbacprivilegesalterconstraintcluster)
+      * 5.21.3.5 [RQ.SRS-006.RBAC.Privileges.AlterConstraint.TableEngines](#rqsrs-006rbacprivilegesalterconstrainttableengines)
+    * 5.21.4 [Alter TTL](#alter-ttl)
+      * 5.21.4.1 [RQ.SRS-006.RBAC.Privileges.AlterTTL](#rqsrs-006rbacprivilegesalterttl)
+      * 5.21.4.2 [RQ.SRS-006.RBAC.Privileges.AlterTTL.Grant](#rqsrs-006rbacprivilegesalterttlgrant)
+      * 5.21.4.3 [RQ.SRS-006.RBAC.Privileges.AlterTTL.Revoke](#rqsrs-006rbacprivilegesalterttlrevoke)
+      * 5.21.4.4 [RQ.SRS-006.RBAC.Privileges.AlterTTL.Cluster](#rqsrs-006rbacprivilegesalterttlcluster)
+      * 5.21.4.5 [RQ.SRS-006.RBAC.Privileges.AlterTTL.TableEngines](#rqsrs-006rbacprivilegesalterttltableengines)
+    * 5.21.5 [Alter Settings](#alter-settings)
+      * 5.21.5.1 [RQ.SRS-006.RBAC.Privileges.AlterSettings](#rqsrs-006rbacprivilegesaltersettings)
+      * 5.21.5.2 [RQ.SRS-006.RBAC.Privileges.AlterSettings.Grant](#rqsrs-006rbacprivilegesaltersettingsgrant)
+      * 5.21.5.3 [RQ.SRS-006.RBAC.Privileges.AlterSettings.Revoke](#rqsrs-006rbacprivilegesaltersettingsrevoke)
+      * 5.21.5.4 [RQ.SRS-006.RBAC.Privileges.AlterSettings.Cluster](#rqsrs-006rbacprivilegesaltersettingscluster)
+      * 5.21.5.5 [RQ.SRS-006.RBAC.Privileges.AlterSettings.TableEngines](#rqsrs-006rbacprivilegesaltersettingstableengines)
+    * 5.21.6 [Alter Update](#alter-update)
+      * 5.21.6.1 [RQ.SRS-006.RBAC.Privileges.AlterUpdate](#rqsrs-006rbacprivilegesalterupdate)
+      * 5.21.6.2 [RQ.SRS-006.RBAC.Privileges.AlterUpdate.Grant](#rqsrs-006rbacprivilegesalterupdategrant)
+      * 5.21.6.3 [RQ.SRS-006.RBAC.Privileges.AlterUpdate.Revoke](#rqsrs-006rbacprivilegesalterupdaterevoke)
+      * 5.21.6.4 [RQ.SRS-006.RBAC.Privileges.AlterUpdate.TableEngines](#rqsrs-006rbacprivilegesalterupdatetableengines)
+    * 5.21.7 [Alter Delete](#alter-delete)
+      * 5.21.7.1 [RQ.SRS-006.RBAC.Privileges.AlterDelete](#rqsrs-006rbacprivilegesalterdelete)
+      * 5.21.7.2 [RQ.SRS-006.RBAC.Privileges.AlterDelete.Grant](#rqsrs-006rbacprivilegesalterdeletegrant)
+      * 5.21.7.3 [RQ.SRS-006.RBAC.Privileges.AlterDelete.Revoke](#rqsrs-006rbacprivilegesalterdeleterevoke)
+      * 5.21.7.4 [RQ.SRS-006.RBAC.Privileges.AlterDelete.TableEngines](#rqsrs-006rbacprivilegesalterdeletetableengines)
+    * 5.21.8 [Alter Freeze Partition](#alter-freeze-partition)
+      * 5.21.8.1 [RQ.SRS-006.RBAC.Privileges.AlterFreeze](#rqsrs-006rbacprivilegesalterfreeze)
+      * 5.21.8.2 [RQ.SRS-006.RBAC.Privileges.AlterFreeze.Grant](#rqsrs-006rbacprivilegesalterfreezegrant)
+      * 5.21.8.3 [RQ.SRS-006.RBAC.Privileges.AlterFreeze.Revoke](#rqsrs-006rbacprivilegesalterfreezerevoke)
+      * 5.21.8.4 [RQ.SRS-006.RBAC.Privileges.AlterFreeze.TableEngines](#rqsrs-006rbacprivilegesalterfreezetableengines)
+    * 5.21.9 [Alter Fetch Partition](#alter-fetch-partition)
+      * 5.21.9.1 [RQ.SRS-006.RBAC.Privileges.AlterFetch](#rqsrs-006rbacprivilegesalterfetch)
+      * 5.21.9.2 [RQ.SRS-006.RBAC.Privileges.AlterFetch.Grant](#rqsrs-006rbacprivilegesalterfetchgrant)
+      * 5.21.9.3 [RQ.SRS-006.RBAC.Privileges.AlterFetch.Revoke](#rqsrs-006rbacprivilegesalterfetchrevoke)
+      * 5.21.9.4 [RQ.SRS-006.RBAC.Privileges.AlterFetch.TableEngines](#rqsrs-006rbacprivilegesalterfetchtableengines)
+    * 5.21.10 [Alter Move Partition](#alter-move-partition)
+      * 5.21.10.1 [RQ.SRS-006.RBAC.Privileges.AlterMove](#rqsrs-006rbacprivilegesaltermove)
+      * 5.21.10.2 [RQ.SRS-006.RBAC.Privileges.AlterMove.Grant](#rqsrs-006rbacprivilegesaltermovegrant)
+      * 5.21.10.3 [RQ.SRS-006.RBAC.Privileges.AlterMove.Revoke](#rqsrs-006rbacprivilegesaltermoverevoke)
+      * 5.21.10.4 [RQ.SRS-006.RBAC.Privileges.AlterMove.TableEngines](#rqsrs-006rbacprivilegesaltermovetableengines)
+  * 5.22 [Create](#create)
+    * 5.22.1 [RQ.SRS-006.RBAC.Privileges.CreateTable](#rqsrs-006rbacprivilegescreatetable)
+    * 5.22.2 [RQ.SRS-006.RBAC.Privileges.CreateDatabase](#rqsrs-006rbacprivilegescreatedatabase)
+    * 5.22.3 [RQ.SRS-006.RBAC.Privileges.CreateDictionary](#rqsrs-006rbacprivilegescreatedictionary)
+    * 5.22.4 [RQ.SRS-006.RBAC.Privileges.CreateTemporaryTable](#rqsrs-006rbacprivilegescreatetemporarytable)
+  * 5.23 [Attach](#attach)
+    * 5.23.1 [RQ.SRS-006.RBAC.Privileges.AttachDatabase](#rqsrs-006rbacprivilegesattachdatabase)
+    * 5.23.2 [RQ.SRS-006.RBAC.Privileges.AttachDictionary](#rqsrs-006rbacprivilegesattachdictionary)
+    * 5.23.3 [RQ.SRS-006.RBAC.Privileges.AttachTemporaryTable](#rqsrs-006rbacprivilegesattachtemporarytable)
+    * 5.23.4 [RQ.SRS-006.RBAC.Privileges.AttachTable](#rqsrs-006rbacprivilegesattachtable)
+  * 5.24 [Drop](#drop)
+    * 5.24.1 [RQ.SRS-006.RBAC.Privileges.DropTable](#rqsrs-006rbacprivilegesdroptable)
+    * 5.24.2 [RQ.SRS-006.RBAC.Privileges.DropDatabase](#rqsrs-006rbacprivilegesdropdatabase)
+    * 5.24.3 [RQ.SRS-006.RBAC.Privileges.DropDictionary](#rqsrs-006rbacprivilegesdropdictionary)
+  * 5.25 [Detach](#detach)
+    * 5.25.1 [RQ.SRS-006.RBAC.Privileges.DetachTable](#rqsrs-006rbacprivilegesdetachtable)
+    * 5.25.2 [RQ.SRS-006.RBAC.Privileges.DetachView](#rqsrs-006rbacprivilegesdetachview)
+    * 5.25.3 [RQ.SRS-006.RBAC.Privileges.DetachDatabase](#rqsrs-006rbacprivilegesdetachdatabase)
+    * 5.25.4 [RQ.SRS-006.RBAC.Privileges.DetachDictionary](#rqsrs-006rbacprivilegesdetachdictionary)
+  * 5.26 [Truncate](#truncate)
+    * 5.26.1 [RQ.SRS-006.RBAC.Privileges.Truncate](#rqsrs-006rbacprivilegestruncate)
+  * 5.27 [Optimize](#optimize)
+    * 5.27.1 [RQ.SRS-006.RBAC.Privileges.Optimize](#rqsrs-006rbacprivilegesoptimize)
+  * 5.28 [Kill Query](#kill-query)
+    * 5.28.1 [RQ.SRS-006.RBAC.Privileges.KillQuery](#rqsrs-006rbacprivilegeskillquery)
+  * 5.29 [Kill Mutation](#kill-mutation)
+    * 5.29.1 [RQ.SRS-006.RBAC.Privileges.KillMutation](#rqsrs-006rbacprivilegeskillmutation)
+    * 5.29.2 [RQ.SRS-006.RBAC.Privileges.KillMutation.AlterUpdate](#rqsrs-006rbacprivilegeskillmutationalterupdate)
+    * 5.29.3 [RQ.SRS-006.RBAC.Privileges.KillMutation.AlterDelete](#rqsrs-006rbacprivilegeskillmutationalterdelete)
+    * 5.29.4 [RQ.SRS-006.RBAC.Privileges.KillMutation.AlterDropColumn](#rqsrs-006rbacprivilegeskillmutationalterdropcolumn)
+  * 5.30 [Show](#show)
+    * 5.30.1 [RQ.SRS-006.RBAC.ShowTables.Privilege](#rqsrs-006rbacshowtablesprivilege)
+    * 5.30.2 [RQ.SRS-006.RBAC.ShowTables.RequiredPrivilege](#rqsrs-006rbacshowtablesrequiredprivilege)
+    * 5.30.3 [RQ.SRS-006.RBAC.ExistsTable.RequiredPrivilege](#rqsrs-006rbacexiststablerequiredprivilege)
+    * 5.30.4 [RQ.SRS-006.RBAC.CheckTable.RequiredPrivilege](#rqsrs-006rbacchecktablerequiredprivilege)
+    * 5.30.5 [RQ.SRS-006.RBAC.ShowDatabases.Privilege](#rqsrs-006rbacshowdatabasesprivilege)
+    * 5.30.6 [RQ.SRS-006.RBAC.ShowDatabases.RequiredPrivilege](#rqsrs-006rbacshowdatabasesrequiredprivilege)
+    * 5.30.7 [RQ.SRS-006.RBAC.ShowCreateDatabase.RequiredPrivilege](#rqsrs-006rbacshowcreatedatabaserequiredprivilege)
+    * 5.30.8 [RQ.SRS-006.RBAC.UseDatabase.RequiredPrivilege](#rqsrs-006rbacusedatabaserequiredprivilege)
+    * 5.30.9 [RQ.SRS-006.RBAC.ShowColumns.Privilege](#rqsrs-006rbacshowcolumnsprivilege)
+    * 5.30.10 [RQ.SRS-006.RBAC.ShowCreateTable.RequiredPrivilege](#rqsrs-006rbacshowcreatetablerequiredprivilege)
+    * 5.30.11 [RQ.SRS-006.RBAC.DescribeTable.RequiredPrivilege](#rqsrs-006rbacdescribetablerequiredprivilege)
+    * 5.30.12 [RQ.SRS-006.RBAC.ShowDictionaries.Privilege](#rqsrs-006rbacshowdictionariesprivilege)
+    * 5.30.13 [RQ.SRS-006.RBAC.ShowDictionaries.RequiredPrivilege](#rqsrs-006rbacshowdictionariesrequiredprivilege)
+    * 5.30.14 [RQ.SRS-006.RBAC.ShowCreateDictionary.RequiredPrivilege](#rqsrs-006rbacshowcreatedictionaryrequiredprivilege)
+    * 5.30.15 [RQ.SRS-006.RBAC.ExistsDictionary.RequiredPrivilege](#rqsrs-006rbacexistsdictionaryrequiredprivilege)
+  * 5.31 [Access Management](#access-management)
+    * 5.31.1 [RQ.SRS-006.RBAC.Privileges.CreateUser](#rqsrs-006rbacprivilegescreateuser)
+    * 5.31.2 [RQ.SRS-006.RBAC.Privileges.CreateUser.DefaultRole](#rqsrs-006rbacprivilegescreateuserdefaultrole)
+    * 5.31.3 [RQ.SRS-006.RBAC.Privileges.AlterUser](#rqsrs-006rbacprivilegesalteruser)
+    * 5.31.4 [RQ.SRS-006.RBAC.Privileges.DropUser](#rqsrs-006rbacprivilegesdropuser)
+    * 5.31.5 [RQ.SRS-006.RBAC.Privileges.CreateRole](#rqsrs-006rbacprivilegescreaterole)
+    * 5.31.6 [RQ.SRS-006.RBAC.Privileges.AlterRole](#rqsrs-006rbacprivilegesalterrole)
+    * 5.31.7 [RQ.SRS-006.RBAC.Privileges.DropRole](#rqsrs-006rbacprivilegesdroprole)
+    * 5.31.8 [RQ.SRS-006.RBAC.Privileges.CreateRowPolicy](#rqsrs-006rbacprivilegescreaterowpolicy)
+    * 5.31.9 [RQ.SRS-006.RBAC.Privileges.AlterRowPolicy](#rqsrs-006rbacprivilegesalterrowpolicy)
+    * 5.31.10 [RQ.SRS-006.RBAC.Privileges.DropRowPolicy](#rqsrs-006rbacprivilegesdroprowpolicy)
+    * 5.31.11 [RQ.SRS-006.RBAC.Privileges.CreateQuota](#rqsrs-006rbacprivilegescreatequota)
+    * 5.31.12 [RQ.SRS-006.RBAC.Privileges.AlterQuota](#rqsrs-006rbacprivilegesalterquota)
+    * 5.31.13 [RQ.SRS-006.RBAC.Privileges.DropQuota](#rqsrs-006rbacprivilegesdropquota)
+    * 5.31.14 [RQ.SRS-006.RBAC.Privileges.CreateSettingsProfile](#rqsrs-006rbacprivilegescreatesettingsprofile)
+    * 5.31.15 [RQ.SRS-006.RBAC.Privileges.AlterSettingsProfile](#rqsrs-006rbacprivilegesaltersettingsprofile)
+    * 5.31.16 [RQ.SRS-006.RBAC.Privileges.DropSettingsProfile](#rqsrs-006rbacprivilegesdropsettingsprofile)
+    * 5.31.17 [RQ.SRS-006.RBAC.Privileges.RoleAdmin](#rqsrs-006rbacprivilegesroleadmin)
+    * 5.31.18 [Show Access](#show-access)
+      * 5.31.18.1 [RQ.SRS-006.RBAC.ShowUsers.Privilege](#rqsrs-006rbacshowusersprivilege)
+      * 5.31.18.2 [RQ.SRS-006.RBAC.ShowUsers.RequiredPrivilege](#rqsrs-006rbacshowusersrequiredprivilege)
+      * 5.31.18.3 [RQ.SRS-006.RBAC.ShowCreateUser.RequiredPrivilege](#rqsrs-006rbacshowcreateuserrequiredprivilege)
+      * 5.31.18.4 [RQ.SRS-006.RBAC.ShowRoles.Privilege](#rqsrs-006rbacshowrolesprivilege)
+      * 5.31.18.5 [RQ.SRS-006.RBAC.ShowRoles.RequiredPrivilege](#rqsrs-006rbacshowrolesrequiredprivilege)
+      * 5.31.18.6 [RQ.SRS-006.RBAC.ShowCreateRole.RequiredPrivilege](#rqsrs-006rbacshowcreaterolerequiredprivilege)
+      * 5.31.18.7 [RQ.SRS-006.RBAC.ShowRowPolicies.Privilege](#rqsrs-006rbacshowrowpoliciesprivilege)
+      * 5.31.18.8 [RQ.SRS-006.RBAC.ShowRowPolicies.RequiredPrivilege](#rqsrs-006rbacshowrowpoliciesrequiredprivilege)
+      * 5.31.18.9 [RQ.SRS-006.RBAC.ShowCreateRowPolicy.RequiredPrivilege](#rqsrs-006rbacshowcreaterowpolicyrequiredprivilege)
+      * 5.31.18.10 [RQ.SRS-006.RBAC.ShowQuotas.Privilege](#rqsrs-006rbacshowquotasprivilege)
+      * 5.31.18.11 [RQ.SRS-006.RBAC.ShowQuotas.RequiredPrivilege](#rqsrs-006rbacshowquotasrequiredprivilege)
+      * 5.31.18.12 [RQ.SRS-006.RBAC.ShowCreateQuota.RequiredPrivilege](#rqsrs-006rbacshowcreatequotarequiredprivilege)
+      * 5.31.18.13 [RQ.SRS-006.RBAC.ShowSettingsProfiles.Privilege](#rqsrs-006rbacshowsettingsprofilesprivilege)
+      * 5.31.18.14 [RQ.SRS-006.RBAC.ShowSettingsProfiles.RequiredPrivilege](#rqsrs-006rbacshowsettingsprofilesrequiredprivilege)
+      * 5.31.18.15 [RQ.SRS-006.RBAC.ShowCreateSettingsProfile.RequiredPrivilege](#rqsrs-006rbacshowcreatesettingsprofilerequiredprivilege)
+  * 5.32 [dictGet](#dictget)
+    * 5.32.1 [RQ.SRS-006.RBAC.dictGet.Privilege](#rqsrs-006rbacdictgetprivilege)
+    * 5.32.2 [RQ.SRS-006.RBAC.dictGet.RequiredPrivilege](#rqsrs-006rbacdictgetrequiredprivilege)
+    * 5.32.3 [RQ.SRS-006.RBAC.dictGet.Type.RequiredPrivilege](#rqsrs-006rbacdictgettyperequiredprivilege)
+    * 5.32.4 [RQ.SRS-006.RBAC.dictGet.OrDefault.RequiredPrivilege](#rqsrs-006rbacdictgetordefaultrequiredprivilege)
+    * 5.32.5 [RQ.SRS-006.RBAC.dictHas.RequiredPrivilege](#rqsrs-006rbacdicthasrequiredprivilege)
+    * 5.32.6 [RQ.SRS-006.RBAC.dictGetHierarchy.RequiredPrivilege](#rqsrs-006rbacdictgethierarchyrequiredprivilege)
+    * 5.32.7 [RQ.SRS-006.RBAC.dictIsIn.RequiredPrivilege](#rqsrs-006rbacdictisinrequiredprivilege)
+  * 5.33 [Introspection](#introspection)
+    * 5.33.1 [RQ.SRS-006.RBAC.Privileges.Introspection](#rqsrs-006rbacprivilegesintrospection)
+    * 5.33.2 [RQ.SRS-006.RBAC.Privileges.Introspection.addressToLine](#rqsrs-006rbacprivilegesintrospectionaddresstoline)
+    * 5.33.3 [RQ.SRS-006.RBAC.Privileges.Introspection.addressToSymbol](#rqsrs-006rbacprivilegesintrospectionaddresstosymbol)
+    * 5.33.4 [RQ.SRS-006.RBAC.Privileges.Introspection.demangle](#rqsrs-006rbacprivilegesintrospectiondemangle)
+  * 5.34 [System](#system)
+    * 5.34.1 [RQ.SRS-006.RBAC.Privileges.System.Shutdown](#rqsrs-006rbacprivilegessystemshutdown)
+    * 5.34.2 [RQ.SRS-006.RBAC.Privileges.System.DropCache](#rqsrs-006rbacprivilegessystemdropcache)
+    * 5.34.3 [RQ.SRS-006.RBAC.Privileges.System.DropCache.DNS](#rqsrs-006rbacprivilegessystemdropcachedns)
+    * 5.34.4 [RQ.SRS-006.RBAC.Privileges.System.DropCache.Mark](#rqsrs-006rbacprivilegessystemdropcachemark)
+    * 5.34.5 [RQ.SRS-006.RBAC.Privileges.System.DropCache.Uncompressed](#rqsrs-006rbacprivilegessystemdropcacheuncompressed)
+    * 5.34.6 [RQ.SRS-006.RBAC.Privileges.System.Reload](#rqsrs-006rbacprivilegessystemreload)
+    * 5.34.7 [RQ.SRS-006.RBAC.Privileges.System.Reload.Config](#rqsrs-006rbacprivilegessystemreloadconfig)
+    * 5.34.8 [RQ.SRS-006.RBAC.Privileges.System.Reload.Dictionary](#rqsrs-006rbacprivilegessystemreloaddictionary)
+    * 5.34.9 [RQ.SRS-006.RBAC.Privileges.System.Reload.Dictionaries](#rqsrs-006rbacprivilegessystemreloaddictionaries)
+    * 5.34.10 [RQ.SRS-006.RBAC.Privileges.System.Reload.EmbeddedDictionaries](#rqsrs-006rbacprivilegessystemreloadembeddeddictionaries)
+    * 5.34.11 [RQ.SRS-006.RBAC.Privileges.System.Merges](#rqsrs-006rbacprivilegessystemmerges)
+    * 5.34.12 [RQ.SRS-006.RBAC.Privileges.System.TTLMerges](#rqsrs-006rbacprivilegessystemttlmerges)
+    * 5.34.13 [RQ.SRS-006.RBAC.Privileges.System.Fetches](#rqsrs-006rbacprivilegessystemfetches)
+    * 5.34.14 [RQ.SRS-006.RBAC.Privileges.System.Moves](#rqsrs-006rbacprivilegessystemmoves)
+    * 5.34.15 [RQ.SRS-006.RBAC.Privileges.System.Sends](#rqsrs-006rbacprivilegessystemsends)
+    * 5.34.16 [RQ.SRS-006.RBAC.Privileges.System.Sends.Distributed](#rqsrs-006rbacprivilegessystemsendsdistributed)
+    * 5.34.17 [RQ.SRS-006.RBAC.Privileges.System.Sends.Replicated](#rqsrs-006rbacprivilegessystemsendsreplicated)
+    * 5.34.18 [RQ.SRS-006.RBAC.Privileges.System.ReplicationQueues](#rqsrs-006rbacprivilegessystemreplicationqueues)
+    * 5.34.19 [RQ.SRS-006.RBAC.Privileges.System.SyncReplica](#rqsrs-006rbacprivilegessystemsyncreplica)
+    * 5.34.20 [RQ.SRS-006.RBAC.Privileges.System.RestartReplica](#rqsrs-006rbacprivilegessystemrestartreplica)
+    * 5.34.21 [RQ.SRS-006.RBAC.Privileges.System.Flush](#rqsrs-006rbacprivilegessystemflush)
+    * 5.34.22 [RQ.SRS-006.RBAC.Privileges.System.Flush.Distributed](#rqsrs-006rbacprivilegessystemflushdistributed)
+    * 5.34.23 [RQ.SRS-006.RBAC.Privileges.System.Flush.Logs](#rqsrs-006rbacprivilegessystemflushlogs)
+  * 5.35 [Sources](#sources)
+    * 5.35.1 [RQ.SRS-006.RBAC.Privileges.Sources](#rqsrs-006rbacprivilegessources)
+    * 5.35.2 [RQ.SRS-006.RBAC.Privileges.Sources.File](#rqsrs-006rbacprivilegessourcesfile)
+    * 5.35.3 [RQ.SRS-006.RBAC.Privileges.Sources.URL](#rqsrs-006rbacprivilegessourcesurl)
+    * 5.35.4 [RQ.SRS-006.RBAC.Privileges.Sources.Remote](#rqsrs-006rbacprivilegessourcesremote)
+    * 5.35.5 [RQ.SRS-006.RBAC.Privileges.Sources.MySQL](#rqsrs-006rbacprivilegessourcesmysql)
+    * 5.35.6 [RQ.SRS-006.RBAC.Privileges.Sources.ODBC](#rqsrs-006rbacprivilegessourcesodbc)
+    * 5.35.7 [RQ.SRS-006.RBAC.Privileges.Sources.JDBC](#rqsrs-006rbacprivilegessourcesjdbc)
+    * 5.35.8 [RQ.SRS-006.RBAC.Privileges.Sources.HDFS](#rqsrs-006rbacprivilegessourceshdfs)
+    * 5.35.9 [RQ.SRS-006.RBAC.Privileges.Sources.S3](#rqsrs-006rbacprivilegessourcess3)
+  * 5.36 [RQ.SRS-006.RBAC.Privileges.GrantOption](#rqsrs-006rbacprivilegesgrantoption)
+  * 5.37 [RQ.SRS-006.RBAC.Privileges.All](#rqsrs-006rbacprivilegesall)
+  * 5.38 [RQ.SRS-006.RBAC.Privileges.RoleAll](#rqsrs-006rbacprivilegesroleall)
+  * 5.39 [RQ.SRS-006.RBAC.Privileges.None](#rqsrs-006rbacprivilegesnone)
+  * 5.40 [RQ.SRS-006.RBAC.Privileges.AdminOption](#rqsrs-006rbacprivilegesadminoption)
 * 6 [References](#references)
 
 ## Revision History
@@ -631,256 +663,103 @@ version: 1.0
 
 [ClickHouse] SHALL support role based access control.
 
-#### Login
+### Login
 
-##### RQ.SRS-006.RBAC.Login
+#### RQ.SRS-006.RBAC.Login
 version: 1.0
 
 [ClickHouse] SHALL only allow access to the server for a given
 user only when correct username and password are used during
 the connection to the server.
 
-##### RQ.SRS-006.RBAC.Login.DefaultUser
+#### RQ.SRS-006.RBAC.Login.DefaultUser
 version: 1.0
 
 [ClickHouse] SHALL use the **default user** when no username and password
 are specified during the connection to the server.
 
-#### User
+### User
 
-##### RQ.SRS-006.RBAC.User
+#### RQ.SRS-006.RBAC.User
 version: 1.0
 
 [ClickHouse] SHALL support creation and manipulation of
 one or more **user** accounts to which roles, privileges,
 settings profile, quotas and row policies can be assigned.
 
-##### RQ.SRS-006.RBAC.User.Roles
+#### RQ.SRS-006.RBAC.User.Roles
 version: 1.0
 
 [ClickHouse] SHALL support assigning one or more **roles**
 to a **user**.
 
-##### RQ.SRS-006.RBAC.User.Privileges
+#### RQ.SRS-006.RBAC.User.Privileges
 version: 1.0
 
 [ClickHouse] SHALL support assigning one or more privileges to a **user**.
 
-##### RQ.SRS-006.RBAC.User.Variables
+#### RQ.SRS-006.RBAC.User.Variables
 version: 1.0
 
 [ClickHouse] SHALL support assigning one or more variables to a **user**.
 
-##### RQ.SRS-006.RBAC.User.Variables.Constraints
+#### RQ.SRS-006.RBAC.User.Variables.Constraints
 version: 1.0
 
 [ClickHouse] SHALL support assigning min, max and read-only constraints
 for the variables that can be set and read by the **user**.
 
-##### RQ.SRS-006.RBAC.User.SettingsProfile
+#### RQ.SRS-006.RBAC.User.SettingsProfile
 version: 1.0
 
 [ClickHouse] SHALL support assigning one or more **settings profiles**
 to a **user**.
 
-##### RQ.SRS-006.RBAC.User.Quotas
+#### RQ.SRS-006.RBAC.User.Quotas
 version: 1.0
 
 [ClickHouse] SHALL support assigning one or more **quotas** to a **user**.
 
-##### RQ.SRS-006.RBAC.User.RowPolicies
+#### RQ.SRS-006.RBAC.User.RowPolicies
 version: 1.0
 
 [ClickHouse] SHALL support assigning one or more **row policies** to a **user**.
 
-##### RQ.SRS-006.RBAC.User.AccountLock
-version: 1.0
-
-[ClickHouse] SHALL support locking and unlocking of **user** accounts.
-
-##### RQ.SRS-006.RBAC.User.AccountLock.DenyAccess
-version: 1.0
-
-[ClickHouse] SHALL deny access to the user whose account is locked.
-
-##### RQ.SRS-006.RBAC.User.DefaultRole
+#### RQ.SRS-006.RBAC.User.DefaultRole
 version: 1.0
 
 [ClickHouse] SHALL support assigning a default role to a **user**.
 
-##### RQ.SRS-006.RBAC.User.RoleSelection
+#### RQ.SRS-006.RBAC.User.RoleSelection
 version: 1.0
 
 [ClickHouse] SHALL support selection of one or more **roles** from the available roles
-that are assigned to a **user**.
+that are assigned to a **user** using `SET ROLE` statement.
 
-##### RQ.SRS-006.RBAC.User.ShowCreate
+#### RQ.SRS-006.RBAC.User.ShowCreate
 version: 1.0
 
 [ClickHouse] SHALL support showing the command of how **user** account was created.
 
-##### RQ.SRS-006.RBAC.User.ShowPrivileges
+#### RQ.SRS-006.RBAC.User.ShowPrivileges
 version: 1.0
 
 [ClickHouse] SHALL support listing the privileges of the **user**.
 
-#### Role
-
-##### RQ.SRS-006.RBAC.Role
-version: 1.0
-
-[ClikHouse] SHALL support creation and manipulation of **roles**
-to which privileges, settings profile, quotas and row policies can be
-assigned.
-
-##### RQ.SRS-006.RBAC.Role.Privileges
-version: 1.0
-
-[ClickHouse] SHALL support assigning one or more privileges to a **role**.
-
-##### RQ.SRS-006.RBAC.Role.Variables
-version: 1.0
-
-[ClickHouse] SHALL support assigning one or more variables to a **role**.
-
-##### RQ.SRS-006.RBAC.Role.SettingsProfile
-version: 1.0
-
-[ClickHouse] SHALL support assigning one or more **settings profiles**
-to a **role**.
-
-##### RQ.SRS-006.RBAC.Role.Quotas
-version: 1.0
-
-[ClickHouse] SHALL support assigning one or more **quotas** to a **role**.
-
-##### RQ.SRS-006.RBAC.Role.RowPolicies
-version: 1.0
-
-[ClickHouse] SHALL support assigning one or more **row policies** to a **role**.
-
-#### Partial Revokes
-
-##### RQ.SRS-006.RBAC.PartialRevokes
-version: 1.0
-
-[ClickHouse] SHALL support partial revoking of privileges granted
-to a **user** or a **role**.
-
-#### Settings Profile
-
-##### RQ.SRS-006.RBAC.SettingsProfile
-version: 1.0
-
-[ClickHouse] SHALL support creation and manipulation of **settings profiles**
-that can include value definition for one or more variables and can
-can be assigned to one or more **users** or **roles**.
-
-##### RQ.SRS-006.RBAC.SettingsProfile.Constraints
-version: 1.0
-
-[ClickHouse] SHALL support assigning min, max and read-only constraints
-for the variables specified in the **settings profile**.
-
-##### RQ.SRS-006.RBAC.SettingsProfile.ShowCreate
-version: 1.0
-
-[ClickHouse] SHALL support showing the command of how **setting profile** was created.
-
-#### Quotas
-
-##### RQ.SRS-006.RBAC.Quotas
-version: 1.0
-
-[ClickHouse] SHALL support creation and manipulation of **quotas**
-that can be used to limit resource usage by a **user** or a **role**
-over a period of time.
-
-##### RQ.SRS-006.RBAC.Quotas.Keyed
-version: 1.0
-
-[ClickHouse] SHALL support creating **quotas** that are keyed
-so that a quota is tracked separately for each key value.
-
-##### RQ.SRS-006.RBAC.Quotas.Queries
-version: 1.0
-
-[ClickHouse] SHALL support setting **queries** quota to limit the total number of requests.
-
-##### RQ.SRS-006.RBAC.Quotas.Errors
-version: 1.0
-
-[ClickHouse] SHALL support setting **errors** quota to limit the number of queries that threw an exception.
-
-##### RQ.SRS-006.RBAC.Quotas.ResultRows
-version: 1.0
-
-[ClickHouse] SHALL support setting **result rows** quota to limit the
-the total number of rows given as the result.
-
-##### RQ.SRS-006.RBAC.Quotas.ReadRows
-version: 1.0
-
-[ClickHouse] SHALL support setting **read rows** quota to limit the total
-number of source rows read from tables for running the query on all remote servers.
-
-##### RQ.SRS-006.RBAC.Quotas.ResultBytes
-version: 1.0
-
-[ClickHouse] SHALL support setting **result bytes** quota to limit the total number
-of bytes that can be returned as the result.
-
-##### RQ.SRS-006.RBAC.Quotas.ReadBytes
-version: 1.0
-
-[ClickHouse] SHALL support setting **read bytes** quota to limit the total number
-of source bytes read from tables for running the query on all remote servers.
-
-##### RQ.SRS-006.RBAC.Quotas.ExecutionTime
-version: 1.0
-
-[ClickHouse] SHALL support setting **execution time** quota to limit the maximum
-query execution time.
-
-##### RQ.SRS-006.RBAC.Quotas.ShowCreate
-version: 1.0
-
-[ClickHouse] SHALL support showing the command of how **quota** was created.
-
-#### Row Policy
-
-##### RQ.SRS-006.RBAC.RowPolicy
-version: 1.0
-
-[ClickHouse] SHALL support creation and manipulation of table **row policies**
-that can be used to limit access to the table contents for a **user** or a **role**
-using a specified **condition**.
-
-##### RQ.SRS-006.RBAC.RowPolicy.Condition
-version: 1.0
-
-[ClickHouse] SHALL support row policy **conditions** that can be any SQL
-expression that returns a boolean.
-
-##### RQ.SRS-006.RBAC.RowPolicy.ShowCreate
-version: 1.0
-
-[ClickHouse] SHALL support showing the command of how **row policy** was created.
-
-### Specific
-
-##### RQ.SRS-006.RBAC.User.Use.DefaultRole
+#### RQ.SRS-006.RBAC.User.Use.DefaultRole
 version: 1.0
 
 [ClickHouse] SHALL by default use default role or roles assigned
 to the user if specified.
 
-##### RQ.SRS-006.RBAC.User.Use.AllRolesWhenNoDefaultRole
+#### RQ.SRS-006.RBAC.User.Use.AllRolesWhenNoDefaultRole
 version: 1.0
 
 [ClickHouse] SHALL by default use all the roles assigned to the user
 if no default role or roles are specified for the user.
 
+#### Create User
+
 ##### RQ.SRS-006.RBAC.User.Create
 version: 1.0
 
@@ -1078,6 +957,8 @@ CREATE USER [IF NOT EXISTS | OR REPLACE] name [ON CLUSTER cluster_name]
     [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | PROFILE 'profile_name'] [,...]
 ```
 
+#### Alter User
+
 ##### RQ.SRS-006.RBAC.User.Alter
 version: 1.0
 
@@ -1094,7 +975,8 @@ the left.
 version: 1.0
 
 [ClickHouse] SHALL support `IF EXISTS` clause in the `ALTER USER` statement
-to skip raising an exception (producing a warning instead) if a user with the specified **name** does not exist. If the `IF EXISTS` clause is not specified then an exception SHALL be raised if a user with the **name** does not exist.
+to skip raising an exception (producing a warning instead) if a user with the specified **name** does not exist.
+If the `IF EXISTS` clause is not specified then an exception SHALL be raised if a user with the **name** does not exist.
 
 ##### RQ.SRS-006.RBAC.User.Alter.Cluster
 version: 1.0
@@ -1132,7 +1014,8 @@ to some password as identification when altering user account using
 ##### RQ.SRS-006.RBAC.User.Alter.Host.AddDrop
 version: 1.0
 
-[ClickHouse] SHALL support altering user by adding and dropping access to hosts with the `ADD HOST` or the `DROP HOST`in the `ALTER USER` statement.
+[ClickHouse] SHALL support altering user by adding and dropping access to hosts
+with the `ADD HOST` or the `DROP HOST` in the `ALTER USER` statement.
 
 ##### RQ.SRS-006.RBAC.User.Alter.Host.Local
 version: 1.0
@@ -1164,7 +1047,8 @@ which user can access the server using the `HOST IP` clause in the
 ##### RQ.SRS-006.RBAC.User.Alter.Host.Like
 version: 1.0
 
-[ClickHouse] SHALL support specifying sone or more similar hosts using `LIKE` command syntax using the `HOST LIKE` clause in the `ALTER USER` statement.
+[ClickHouse] SHALL support specifying one or more similar hosts using `LIKE` command syntax
+using the `HOST LIKE` clause in the `ALTER USER` statement.
 
 ##### RQ.SRS-006.RBAC.User.Alter.Host.Any
 version: 1.0
@@ -1207,7 +1091,6 @@ version: 1.0
 
 [ClickHouse] SHALL support specifying a minimum value for the variable specifed using `SETTINGS` with `MIN` clause in the `ALTER USER` statement.
 
-
 ##### RQ.SRS-006.RBAC.User.Alter.Settings.Max
 version: 1.0
 
@@ -1232,85 +1115,7 @@ ALTER USER [IF EXISTS] name [ON CLUSTER cluster_name]
     [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | PROFILE 'profile_name'] [,...]
 ```
 
-##### RQ.SRS-006.RBAC.SetDefaultRole
-version: 1.0
-
-[ClickHouse] SHALL support setting or changing granted roles to default for one or more
-users using `SET DEFAULT ROLE` statement which
-SHALL permanently change the default roles for the user or users if successful.
-
-##### RQ.SRS-006.RBAC.SetDefaultRole.CurrentUser
-version: 1.0
-
-[ClickHouse] SHALL support setting or changing granted roles to default for
-the current user using `CURRENT_USER` clause in the `SET DEFAULT ROLE` statement.
-
-##### RQ.SRS-006.RBAC.SetDefaultRole.All
-version: 1.0
-
-[ClickHouse] SHALL support setting or changing all granted roles to default
-for one or more users using `ALL` clause in the `SET DEFAULT ROLE` statement.
-
-##### RQ.SRS-006.RBAC.SetDefaultRole.AllExcept
-version: 1.0
-
-[ClickHouse] SHALL support setting or changing all granted roles except those specified
-to default for one or more users using `ALL EXCEPT` clause in the `SET DEFAULT ROLE` statement.
-
-##### RQ.SRS-006.RBAC.SetDefaultRole.None
-version: 1.0
-
-[ClickHouse] SHALL support removing all granted roles from default
-for one or more users using `NONE` clause in the `SET DEFAULT ROLE` statement.
-
-##### RQ.SRS-006.RBAC.SetDefaultRole.Syntax
-version: 1.0
-
-[ClickHouse] SHALL support the following syntax for the `SET DEFAULT ROLE` statement.
-
-```sql
-SET DEFAULT ROLE
-    {NONE | role [,...] | ALL | ALL EXCEPT role [,...]}
-    TO {user|CURRENT_USER} [,...]
-
-```
-
-##### RQ.SRS-006.RBAC.SetRole
-version: 1.0
-
-[ClickHouse] SHALL support activating role or roles for the current user
-using `SET ROLE` statement.
-
-##### RQ.SRS-006.RBAC.SetRole.Default
-version: 1.0
-
-[ClickHouse] SHALL support activating default roles for the current user
-using `DEFAULT` clause in the `SET ROLE` statement.
-
-##### RQ.SRS-006.RBAC.SetRole.None
-version: 1.0
-
-[ClickHouse] SHALL support activating no roles for the current user
-using `NONE` clause in the `SET ROLE` statement.
-
-##### RQ.SRS-006.RBAC.SetRole.All
-version: 1.0
-
-[ClickHouse] SHALL support activating all roles for the current user
-using `ALL` clause in the `SET ROLE` statement.
-
-##### RQ.SRS-006.RBAC.SetRole.AllExcept
-version: 1.0
-
-[ClickHouse] SHALL support activating all roles except those specified
-for the current user using `ALL EXCEPT` clause in the `SET ROLE` statement.
-
-##### RQ.SRS-006.RBAC.SetRole.Syntax
-version: 1.0
-
-```sql
-SET ROLE {DEFAULT | NONE | role [,...] | ALL | ALL EXCEPT role [,...]}
-```
+#### Show Create User
 
 ##### RQ.SRS-006.RBAC.User.ShowCreateUser
 version: 1.0
@@ -1333,6 +1138,8 @@ version: 1.0
 SHOW CREATE USER [name | CURRENT_USER]
 ```
 
+#### Drop User
+
 ##### RQ.SRS-006.RBAC.User.Drop
 version: 1.0
 
@@ -1361,6 +1168,43 @@ version: 1.0
 DROP USER [IF EXISTS] name [,...] [ON CLUSTER cluster_name]
 ```
 
+### Role
+
+#### RQ.SRS-006.RBAC.Role
+version: 1.0
+
+[ClikHouse] SHALL support creation and manipulation of **roles**
+to which privileges, settings profile, quotas and row policies can be
+assigned.
+
+#### RQ.SRS-006.RBAC.Role.Privileges
+version: 1.0
+
+[ClickHouse] SHALL support assigning one or more privileges to a **role**.
+
+#### RQ.SRS-006.RBAC.Role.Variables
+version: 1.0
+
+[ClickHouse] SHALL support assigning one or more variables to a **role**.
+
+#### RQ.SRS-006.RBAC.Role.SettingsProfile
+version: 1.0
+
+[ClickHouse] SHALL support assigning one or more **settings profiles**
+to a **role**.
+
+#### RQ.SRS-006.RBAC.Role.Quotas
+version: 1.0
+
+[ClickHouse] SHALL support assigning one or more **quotas** to a **role**.
+
+#### RQ.SRS-006.RBAC.Role.RowPolicies
+version: 1.0
+
+[ClickHouse] SHALL support assigning one or more **row policies** to a **role**.
+
+#### Create Role
+
 ##### RQ.SRS-006.RBAC.Role.Create
 version: 1.0
 
@@ -1396,6 +1240,8 @@ CREATE ROLE [IF NOT EXISTS | OR REPLACE] name
     [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | PROFILE 'profile_name'] [,...]
 ```
 
+#### Alter Role
+
 ##### RQ.SRS-006.RBAC.Role.Alter
 version: 1.0
 
@@ -1442,6 +1288,8 @@ ALTER ROLE [IF EXISTS] name [ON CLUSTER cluster_name]
     [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | PROFILE 'profile_name'] [,...]
 ```
 
+#### Drop Role
+
 ##### RQ.SRS-006.RBAC.Role.Drop
 version: 1.0
 
@@ -1469,6 +1317,8 @@ version: 1.0
 DROP ROLE [IF EXISTS] name [,...] [ON CLUSTER cluster_name]
 ```
 
+#### Show Create Role
+
 ##### RQ.SRS-006.RBAC.Role.ShowCreate
 version: 1.0
 
@@ -1484,326 +1334,15 @@ version: 1.0
 SHOW CREATE ROLE name
 ```
 
-##### RQ.SRS-006.RBAC.Grant.Privilege.To
+### Partial Revokes
+
+#### RQ.SRS-006.RBAC.PartialRevokes
 version: 1.0
 
-[ClickHouse] SHALL support granting privileges to one or more users or roles using `TO` clause
-in the `GRANT PRIVILEGE` statement.
+[ClickHouse] SHALL support partial revoking of privileges granted
+to a **user** or a **role**.
 
-##### RQ.SRS-006.RBAC.Grant.Privilege.ToCurrentUser
-version: 1.0
-
-[ClickHouse] SHALL support granting privileges to current user using `TO CURRENT_USER` clause
-in the `GRANT PRIVILEGE` statement.
-
-##### RQ.SRS-006.RBAC.Grant.Privilege.Select
-version: 1.0
-
-[ClickHouse] SHALL support granting the **select** privilege to one or more users or roles
-for a database or a table using the `GRANT SELECT` statement.
-
-##### RQ.SRS-006.RBAC.Grant.Privilege.Insert
-version: 1.0
-
-[ClickHouse] SHALL support granting the **insert** privilege to one or more users or roles
-for a database or a table using the `GRANT INSERT` statement.
-
-##### RQ.SRS-006.RBAC.Grant.Privilege.Alter
-version: 1.0
-
-[ClickHouse] SHALL support granting the **alter** privilege to one or more users or roles
-for a database or a table using the `GRANT ALTER` statement.
-
-##### RQ.SRS-006.RBAC.Grant.Privilege.Create
-version: 1.0
-
-[ClickHouse] SHALL support granting the **create** privilege to one or more users or roles
-using the `GRANT CREATE` statement.
-
-##### RQ.SRS-006.RBAC.Grant.Privilege.Drop
-version: 1.0
-
-[ClickHouse] SHALL support granting the **drop** privilege to one or more users or roles
-using the `GRANT DROP` statement.
-
-##### RQ.SRS-006.RBAC.Grant.Privilege.Truncate
-version: 1.0
-
-[ClickHouse] SHALL support granting the **truncate** privilege to one or more users or roles
-for a database or a table using `GRANT TRUNCATE` statement.
-
-##### RQ.SRS-006.RBAC.Grant.Privilege.Optimize
-version: 1.0
-
-[ClickHouse] SHALL support granting the **optimize** privilege to one or more users or roles
-for a database or a table using `GRANT OPTIMIZE` statement.
-
-##### RQ.SRS-006.RBAC.Grant.Privilege.Show
-version: 1.0
-
-[ClickHouse] SHALL support granting the **show** privilege to one or more users or roles
-for a database or a table using `GRANT SHOW` statement.
-
-##### RQ.SRS-006.RBAC.Grant.Privilege.KillQuery
-version: 1.0
-
-[ClickHouse] SHALL support granting the **kill query** privilege to one or more users or roles
-for a database or a table using `GRANT KILL QUERY` statement.
-
-##### RQ.SRS-006.RBAC.Grant.Privilege.AccessManagement
-version: 1.0
-
-[ClickHouse] SHALL support granting the **access management** privileges to one or more users or roles
-for a database or a table using `GRANT ACCESS MANAGEMENT` statement.
-
-##### RQ.SRS-006.RBAC.Grant.Privilege.System
-version: 1.0
-
-[ClickHouse] SHALL support granting the **system** privileges to one or more users or roles
-for a database or a table using `GRANT SYSTEM` statement.
-
-##### RQ.SRS-006.RBAC.Grant.Privilege.Introspection
-version: 1.0
-
-[ClickHouse] SHALL support granting the **introspection** privileges to one or more users or roles
-for a database or a table using `GRANT INTROSPECTION` statement.
-
-##### RQ.SRS-006.RBAC.Grant.Privilege.Sources
-version: 1.0
-
-[ClickHouse] SHALL support granting the **sources** privileges to one or more users or roles
-for a database or a table using `GRANT SOURCES` statement.
-
-##### RQ.SRS-006.RBAC.Grant.Privilege.DictGet
-version: 1.0
-
-[ClickHouse] SHALL support granting the **dictGet** privilege to one or more users or roles
-for a database or a table using `GRANT dictGet` statement.
-
-##### RQ.SRS-006.RBAC.Grant.Privilege.None
-version: 1.0
-
-[ClickHouse] SHALL support granting no privileges to one or more users or roles
-for a database or a table using `GRANT NONE` statement.
-
-##### RQ.SRS-006.RBAC.Grant.Privilege.All
-version: 1.0
-
-[ClickHouse] SHALL support granting the **all** privileges to one or more users or roles
-for a database or a table using the `GRANT ALL` or `GRANT ALL PRIVILEGES` statements.
-
-##### RQ.SRS-006.RBAC.Grant.Privilege.GrantOption
-version: 1.0
-
-[ClickHouse] SHALL support granting the **grant option** privilege to one or more users or roles
-for a database or a table using the `WITH GRANT OPTION` clause in the `GRANT` statement.
-
-##### RQ.SRS-006.RBAC.Grant.Privilege.On
-version: 1.0
-
-[ClickHouse] SHALL support the `ON` clause in the `GRANT` privilege statement
-which SHALL allow to specify one or more tables to which the privilege SHALL
-be granted using the following patterns
-
-* `*.*` any table in any database
-* `database.*` any table in the specified database
-* `database.table` specific table in the specified database
-* `*` any table in the current database
-* `table` specific table in the current database
-
-##### RQ.SRS-006.RBAC.Grant.Privilege.PrivilegeColumns
-version: 1.0
-
-[ClickHouse] SHALL support granting the privilege **some_privilege** to one or more users or roles
-for a database or a table using the `GRANT some_privilege(column)` statement for one column.
-Multiple columns will be supported with `GRANT some_privilege(column1, column2...)` statement.
-The privileges will be granted for only the specified columns.
-
-##### RQ.SRS-006.RBAC.Grant.Privilege.OnCluster
-version: 1.0
-
-[ClickHouse] SHALL support specifying cluster on which to grant privileges using the `ON CLUSTER`
-clause in the `GRANT PRIVILEGE` statement.
-
-##### RQ.SRS-006.RBAC.Grant.Privilege.Syntax
-version: 1.0
-
-[ClickHouse] SHALL support the following syntax for the `GRANT` statement that
-grants explicit privileges to a user or a role.
-
-```sql
-GRANT [ON CLUSTER cluster_name] privilege[(column_name [,...])] [,...]
-    ON {db.table|db.*|*.*|table|*}
-    TO {user | role | CURRENT_USER} [,...]
-    [WITH GRANT OPTION]
-```
-
-##### RQ.SRS-006.RBAC.Revoke.Privilege.Cluster
-version: 1.0
-
-[ClickHouse] SHALL support revoking privileges to one or more users or roles
-for a database or a table on some specific cluster using the `REVOKE ON CLUSTER cluster_name` statement.
-
-##### RQ.SRS-006.RBAC.Revoke.Privilege.Any
-version: 1.0
-
-[ClickHouse] SHALL support revoking ANY privilege to one or more users or roles
-for a database or a table using the `REVOKE some_privilege` statement.
-**some_privilege** refers to any Clickhouse defined privilege, whose hierarchy includes
-SELECT, INSERT, ALTER, CREATE, DROP, TRUNCATE, OPTIMIZE, SHOW, KILL QUERY, ACCESS MANAGEMENT,
-SYSTEM, INTROSPECTION, SOURCES, dictGet and all of their sub-privileges.
-
-##### RQ.SRS-006.RBAC.Revoke.Privilege.Select
-version: 1.0
-
-[ClickHouse] SHALL support revoking the **select** privilege to one or more users or roles
-for a database or a table using the `REVOKE SELECT` statement.
-
-##### RQ.SRS-006.RBAC.Revoke.Privilege.Insert
-version: 1.0
-
-[ClickHouse] SHALL support revoking the **insert** privilege to one or more users or roles
-for a database or a table using the `REVOKE INSERT` statement.
-
-##### RQ.SRS-006.RBAC.Revoke.Privilege.Alter
-version: 1.0
-
-[ClickHouse] SHALL support revoking the **alter** privilege to one or more users or roles
-for a database or a table using the `REVOKE ALTER` statement.
-
-##### RQ.SRS-006.RBAC.Revoke.Privilege.Create
-version: 1.0
-
-[ClickHouse] SHALL support revoking the **create** privilege to one or more users or roles
-using the `REVOKE CREATE` statement.
-
-##### RQ.SRS-006.RBAC.Revoke.Privilege.Drop
-version: 1.0
-
-[ClickHouse] SHALL support revoking the **drop** privilege to one or more users or roles
-using the `REVOKE DROP` statement.
-
-##### RQ.SRS-006.RBAC.Revoke.Privilege.Truncate
-version: 1.0
-
-[ClickHouse] SHALL support revoking the **truncate** privilege to one or more users or roles
-for a database or a table using the `REVOKE TRUNCATE` statement.
-
-##### RQ.SRS-006.RBAC.Revoke.Privilege.Optimize
-version: 1.0
-
-[ClickHouse] SHALL support revoking the **optimize** privilege to one or more users or roles
-for a database or a table using the `REVOKE OPTIMIZE` statement.
-
-##### RQ.SRS-006.RBAC.Revoke.Privilege.Show
-version: 1.0
-
-[ClickHouse] SHALL support revoking the **show** privilege to one or more users or roles
-for a database or a table using the `REVOKE SHOW` statement.
-
-##### RQ.SRS-006.RBAC.Revoke.Privilege.KillQuery
-version: 1.0
-
-[ClickHouse] SHALL support revoking the **kill query** privilege to one or more users or roles
-for a database or a table using the `REVOKE KILL QUERY` statement.
-
-##### RQ.SRS-006.RBAC.Revoke.Privilege.AccessManagement
-version: 1.0
-
-[ClickHouse] SHALL support revoking the **access management** privilege to one or more users or roles
-for a database or a table using the `REVOKE ACCESS MANAGEMENT` statement.
-
-##### RQ.SRS-006.RBAC.Revoke.Privilege.System
-version: 1.0
-
-[ClickHouse] SHALL support revoking the **system** privilege to one or more users or roles
-for a database or a table using the `REVOKE SYSTEM` statement.
-
-##### RQ.SRS-006.RBAC.Revoke.Privilege.Introspection
-version: 1.0
-
-[ClickHouse] SHALL support revoking the **introspection** privilege to one or more users or roles
-for a database or a table using the `REVOKE INTROSPECTION` statement.
-
-##### RQ.SRS-006.RBAC.Revoke.Privilege.Sources
-version: 1.0
-
-[ClickHouse] SHALL support revoking the **sources** privilege to one or more users or roles
-for a database or a table using the `REVOKE SOURCES` statement.
-
-##### RQ.SRS-006.RBAC.Revoke.Privilege.DictGet
-version: 1.0
-
-[ClickHouse] SHALL support revoking the **dictGet** privilege to one or more users or roles
-for a database or a table using the `REVOKE dictGet` statement.
-
-##### RQ.SRS-006.RBAC.Revoke.Privilege.PrivelegeColumns
-version: 1.0
-
-[ClickHouse] SHALL support revoking the privilege **some_privilege** to one or more users or roles
-for a database or a table using the `REVOKE some_privilege(column)` statement for one column.
-Multiple columns will be supported with `REVOKE some_privilege(column1, column2...)` statement.
-The privileges will be revoked for only the specified columns.
-
-##### RQ.SRS-006.RBAC.Revoke.Privilege.Multiple
-version: 1.0
-
-[ClickHouse] SHALL support revoking MULTIPLE **privileges** to one or more users or roles
-for a database or a table using the `REVOKE privilege1, privilege2...` statement.
-**privileges** refers to any set of Clickhouse defined privilege, whose hierarchy includes
-SELECT, INSERT, ALTER, CREATE, DROP, TRUNCATE, OPTIMIZE, SHOW, KILL QUERY, ACCESS MANAGEMENT,
-SYSTEM, INTROSPECTION, SOURCES, dictGet and all of their sub-privileges.
-
-##### RQ.SRS-006.RBAC.Revoke.Privilege.All
-version: 1.0
-
-[ClickHouse] SHALL support revoking **all** privileges to one or more users or roles
-for a database or a table using the `REVOKE ALL` or `REVOKE ALL PRIVILEGES` statements.
-
-##### RQ.SRS-006.RBAC.Revoke.Privilege.None
-version: 1.0
-
-[ClickHouse] SHALL support revoking **no** privileges to one or more users or roles
-for a database or a table using the `REVOKE NONE` statement.
-
-##### RQ.SRS-006.RBAC.Revoke.Privilege.On
-version: 1.0
-
-[ClickHouse] SHALL support the `ON` clause in the `REVOKE` privilege statement
-which SHALL allow to specify one or more tables to which the privilege SHALL
-be revoked using the following patterns
-
-* `db.table` specific table in the specified database
-* `db.*` any table in the specified database
-* `*.*` any table in any database
-* `table` specific table in the current database
-* `*` any table in the current database
-
-##### RQ.SRS-006.RBAC.Revoke.Privilege.From
-version: 1.0
-
-[ClickHouse] SHALL support the `FROM` clause in the `REVOKE` privilege statement
-which SHALL allow to specify one or more users to which the privilege SHALL
-be revoked using the following patterns
-
-* `{user | CURRENT_USER} [,...]` some combination of users by name, which may include the current user
-* `ALL` all users
-* `ALL EXCEPT {user | CURRENT_USER} [,...]` the logical reverse of the first pattern
-
-##### RQ.SRS-006.RBAC.Revoke.Privilege.Syntax
-version: 1.0
-
-[ClickHouse] SHALL support the following syntax for the `REVOKE` statement that
-revokes explicit privileges of a user or a role.
-
-```sql
-REVOKE [ON CLUSTER cluster_name] privilege
-    [(column_name [,...])] [,...]
-    ON {db.table|db.*|*.*|table|*}
-    FROM {user | CURRENT_USER} [,...] | ALL | ALL EXCEPT {user | CURRENT_USER} [,...]
-```
-
-##### RQ.SRS-006.RBAC.PartialRevoke.Syntax
+#### RQ.SRS-006.RBAC.PartialRevoke.Syntax
 version: 1.0
 
 [ClickHouse] SHALL support partial revokes by using `partial_revokes` variable
@@ -1821,102 +1360,22 @@ To enable partial revokes the `partial revokes` variable SHALL be set to `1`
 SET partial_revokes = 1
 ```
 
-##### RQ.SRS-006.RBAC.Grant.Role
+### Settings Profile
+
+#### RQ.SRS-006.RBAC.SettingsProfile
 version: 1.0
 
-[ClickHouse] SHALL support granting one or more roles to
-one or more users or roles using the `GRANT` role statement.
+[ClickHouse] SHALL support creation and manipulation of **settings profiles**
+that can include value definition for one or more variables and can
+can be assigned to one or more **users** or **roles**.
 
-##### RQ.SRS-006.RBAC.Grant.Role.CurrentUser
+#### RQ.SRS-006.RBAC.SettingsProfile.Constraints
 version: 1.0
 
-[ClickHouse] SHALL support granting one or more roles to current user using
-`TO CURRENT_USER` clause in the `GRANT` role statement.
+[ClickHouse] SHALL support assigning min, max and read-only constraints
+for the variables specified in the **settings profile**.
 
-##### RQ.SRS-006.RBAC.Grant.Role.AdminOption
-version: 1.0
-
-[ClickHouse] SHALL support granting `admin option` privilege
-to one or more users or roles using the `WITH ADMIN OPTION` clause
-in the `GRANT` role statement.
-
-##### RQ.SRS-006.RBAC.Grant.Role.OnCluster
-version: 1.0
-
-[ClickHouse] SHALL support specifying cluster on which the user is to be granted one or more roles
-using `ON CLUSTER` clause in the `GRANT` statement.
-
-##### RQ.SRS-006.RBAC.Grant.Role.Syntax
-version: 1.0
-
-[ClickHouse] SHALL support the following syntax for `GRANT` role statement
-
-``` sql
-GRANT
-    ON CLUSTER cluster_name
-    role [, role ...]
-    TO {user | role | CURRENT_USER} [,...]
-    [WITH ADMIN OPTION]
-```
-
-##### RQ.SRS-006.RBAC.Revoke.Role
-version: 1.0
-
-[ClickHouse] SHALL support revoking one or more roles from
-one or more users or roles using the `REVOKE` role statement.
-
-##### RQ.SRS-006.RBAC.Revoke.Role.Keywords
-version: 1.0
-
-[ClickHouse] SHALL support revoking one or more roles from
-special groupings of one or more users or roles with the `ALL`, `ALL EXCEPT`,
-and `CURRENT_USER` keywords.
-
-##### RQ.SRS-006.RBAC.Revoke.Role.Cluster
-version: 1.0
-
-[ClickHouse] SHALL support revoking one or more roles from
-one or more users or roles from one or more clusters
-using the `REVOKE ON CLUSTER` role statement.
-
-##### RQ.SRS-006.RBAC.Revoke.AdminOption
-version: 1.0
-
-[ClickHouse] SHALL support revoking `admin option` privilege
-in one or more users or roles using the `ADMIN OPTION FOR` clause
-in the `REVOKE` role statement.
-
-##### RQ.SRS-006.RBAC.Revoke.Role.Syntax
-version: 1.0
-
-[ClickHouse] SHALL support the following syntax for the `REVOKE` role statement
-
-```sql
-REVOKE [ON CLUSTER cluster_name] [ADMIN OPTION FOR]
-    role [,...]
-    FROM {user | role | CURRENT_USER} [,...] | ALL | ALL EXCEPT {user_name | role_name | CURRENT_USER} [,...]
-```
-
-##### RQ.SRS-006.RBAC.Show.Grants
-version: 1.0
-
-[ClickHouse] SHALL support listing all the privileges granted to current user and role
-using the `SHOW GRANTS` statement.
-
-##### RQ.SRS-006.RBAC.Show.Grants.For
-version: 1.0
-
-[ClickHouse] SHALL support listing all the privileges granted to a user or a role
-using the `FOR` clause in the `SHOW GRANTS` statement.
-
-##### RQ.SRS-006.RBAC.Show.Grants.Syntax
-version: 1.0
-
-[Clickhouse] SHALL use the following syntax for the `SHOW GRANTS` statement
-
-``` sql
-SHOW GRANTS [FOR user_or_role]
-```
+#### Create Settings Profile
 
 ##### RQ.SRS-006.RBAC.SettingsProfile.Create
 version: 1.0
@@ -2002,6 +1461,8 @@ CREATE SETTINGS PROFILE [IF NOT EXISTS | OR REPLACE] name
     [TO {user_or_role [,...] | NONE | ALL | ALL EXCEPT user_or_role [,...]}]
 ```
 
+#### Alter Settings Profile
+
 ##### RQ.SRS-006.RBAC.SettingsProfile.Alter
 version: 1.0
 
@@ -2087,6 +1548,8 @@ ALTER SETTINGS PROFILE [IF EXISTS] name
     [TO {user_or_role [,...] | NONE | ALL | ALL EXCEPT user_or_role [,...]]}
 ```
 
+#### Drop Settings Profile
+
 ##### RQ.SRS-006.RBAC.SettingsProfile.Drop
 version: 1.0
 
@@ -2115,6 +1578,8 @@ version: 1.0
 DROP SETTINGS PROFILE [IF EXISTS] name [,name,...]
 ```
 
+#### Show Create Settings Profile
+
 ##### RQ.SRS-006.RBAC.SettingsProfile.ShowCreateSettingsProfile
 version: 1.0
 
@@ -2125,6 +1590,63 @@ using the `SHOW CREATE SETTINGS PROFILE` statement with the following syntax
 SHOW CREATE SETTINGS PROFILE name
 ```
 
+### Quotas
+
+#### RQ.SRS-006.RBAC.Quotas
+version: 1.0
+
+[ClickHouse] SHALL support creation and manipulation of **quotas**
+that can be used to limit resource usage by a **user** or a **role**
+over a period of time.
+
+#### RQ.SRS-006.RBAC.Quotas.Keyed
+version: 1.0
+
+[ClickHouse] SHALL support creating **quotas** that are keyed
+so that a quota is tracked separately for each key value.
+
+#### RQ.SRS-006.RBAC.Quotas.Queries
+version: 1.0
+
+[ClickHouse] SHALL support setting **queries** quota to limit the total number of requests.
+
+#### RQ.SRS-006.RBAC.Quotas.Errors
+version: 1.0
+
+[ClickHouse] SHALL support setting **errors** quota to limit the number of queries that threw an exception.
+
+#### RQ.SRS-006.RBAC.Quotas.ResultRows
+version: 1.0
+
+[ClickHouse] SHALL support setting **result rows** quota to limit the
+the total number of rows given as the result.
+
+#### RQ.SRS-006.RBAC.Quotas.ReadRows
+version: 1.0
+
+[ClickHouse] SHALL support setting **read rows** quota to limit the total
+number of source rows read from tables for running the query on all remote servers.
+
+#### RQ.SRS-006.RBAC.Quotas.ResultBytes
+version: 1.0
+
+[ClickHouse] SHALL support setting **result bytes** quota to limit the total number
+of bytes that can be returned as the result.
+
+#### RQ.SRS-006.RBAC.Quotas.ReadBytes
+version: 1.0
+
+[ClickHouse] SHALL support setting **read bytes** quota to limit the total number
+of source bytes read from tables for running the query on all remote servers.
+
+#### RQ.SRS-006.RBAC.Quotas.ExecutionTime
+version: 1.0
+
+[ClickHouse] SHALL support setting **execution time** quota to limit the maximum
+query execution time.
+
+#### Create Quotas
+
 ##### RQ.SRS-006.RBAC.Quota.Create
 version: 1.0
 
@@ -2163,7 +1685,6 @@ of `{SECOND | MINUTE | HOUR | DAY | MONTH}`. Thus, the complete syntax SHALL be:
 `FOR INTERVAL number {SECOND | MINUTE | HOUR | DAY}` where number is some real number
 to define the interval.
 
-
 ##### RQ.SRS-006.RBAC.Quota.Create.Interval.Randomized
 version: 1.0
 
@@ -2286,6 +1807,8 @@ CREATE QUOTA [IF NOT EXISTS | OR REPLACE] name [ON CLUSTER cluster_name]
     [TO {role [,...] | ALL | ALL EXCEPT role [,...]}]
 ```
 
+#### Alter Quota
+
 ##### RQ.SRS-006.RBAC.Quota.Alter
 version: 1.0
 
@@ -2444,6 +1967,8 @@ ALTER QUOTA [IF EXIST] name
     [TO {user_or_role [,...] | NONE | ALL} [EXCEPT user_or_role [,...]]]
 ```
 
+#### Drop Quota
+
 ##### RQ.SRS-006.RBAC.Quota.Drop
 version: 1.0
 
@@ -2472,6 +1997,8 @@ version: 1.0
 DROP QUOTA [IF EXISTS] name [,name...]
 ```
 
+#### Show Quotas
+
 ##### RQ.SRS-006.RBAC.Quota.ShowQuotas
 version: 1.0
 
@@ -2496,7 +2023,6 @@ version: 1.0
 
 [ClickHouse] SHALL support the `SETTINGS` clause in the `SHOW QUOTAS` statement to define settings in the showing of all quotas.
 
-
 ##### RQ.SRS-006.RBAC.Quota.ShowQuotas.Syntax
 version: 1.0
 
@@ -2505,6 +2031,9 @@ with the following syntax
 ``` sql
 SHOW QUOTAS
 ```
+
+#### Show Create Quota
+
 ##### RQ.SRS-006.RBAC.Quota.ShowCreateQuota.Name
 version: 1.0
 
@@ -2532,6 +2061,34 @@ using the `SHOW CREATE QUOTA` statement.
 SHOW CREATE QUOTA [name | CURRENT]
 ```
 
+### Row Policy
+
+#### RQ.SRS-006.RBAC.RowPolicy
+version: 1.0
+
+[ClickHouse] SHALL support creation and manipulation of table **row policies**
+that can be used to limit access to the table contents for a **user** or a **role**
+using a specified **condition**.
+
+#### RQ.SRS-006.RBAC.RowPolicy.Condition
+version: 1.0
+
+[ClickHouse] SHALL support row policy **conditions** that can be any SQL
+expression that returns a boolean.
+
+#### RQ.SRS-006.RBAC.RowPolicy.Restriction
+version: 1.0
+
+[ClickHouse] SHALL restrict all access to a table when a row policy with a condition is created on that table.
+All users require a permissive row policy in order to view the table.
+
+#### RQ.SRS-006.RBAC.RowPolicy.Nesting
+version: 1.0
+
+[ClickHouse] SHALL restrict rows of tables or views created on top of a table with row policies according to those policies.
+
+#### Create Row Policy
+
 ##### RQ.SRS-006.RBAC.RowPolicy.Create
 version: 1.0
 
@@ -2586,14 +2143,14 @@ version: 1.0
 
 [ClickHouse] SHALL support specifying which rows are affected
 using the `FOR SELECT` clause in the `CREATE ROW POLICY` statement.
-REQUIRES CONFIRMATION
+REQUIRES CONDITION.
 
 ##### RQ.SRS-006.RBAC.RowPolicy.Create.Condition
 version: 1.0
 
 [ClickHouse] SHALL support specifying a condition that
 that can be any SQL expression which returns a boolean using the `USING`
-clause in the `CREATE ROW POLOCY` statement.
+clause in the `CREATE ROW POLICY` statement.
 
 ##### RQ.SRS-006.RBAC.RowPolicy.Create.Assignment
 version: 1.0
@@ -2632,6 +2189,8 @@ CREATE [ROW] POLICY [IF NOT EXISTS | OR REPLACE] policy_name [ON CLUSTER cluster
     [TO {role [,...] | ALL | ALL EXCEPT role [,...]}]
 ```
 
+#### Alter Row Policy
+
 ##### RQ.SRS-006.RBAC.RowPolicy.Alter
 version: 1.0
 
@@ -2738,6 +2297,8 @@ ALTER [ROW] POLICY [IF EXISTS] name [ON CLUSTER cluster_name] ON [database.]tabl
     [TO {role [,...] | ALL | ALL EXCEPT role [,...]}]
 ```
 
+#### Drop Row Policy
+
 ##### RQ.SRS-006.RBAC.RowPolicy.Drop
 version: 1.0
 
@@ -2772,6 +2333,8 @@ version: 1.0
 DROP [ROW] POLICY [IF EXISTS] name [,...] ON [database.]table [,...] [ON CLUSTER cluster_name]
 ```
 
+#### Show Create Row Policy
+
 ##### RQ.SRS-006.RBAC.RowPolicy.ShowCreateRowPolicy
 version: 1.0
 
@@ -2813,9 +2376,510 @@ version: 1.0
 SHOW [ROW] POLICIES [ON [database.]table]
 ```
 
-#### Table Privileges
+### Set Default Role
 
-##### RQ.SRS-006.RBAC.Table.PublicTables
+#### RQ.SRS-006.RBAC.SetDefaultRole
+version: 1.0
+
+[ClickHouse] SHALL support setting or changing granted roles to default for one or more
+users using `SET DEFAULT ROLE` statement which
+SHALL permanently change the default roles for the user or users if successful.
+
+#### RQ.SRS-006.RBAC.SetDefaultRole.CurrentUser
+version: 1.0
+
+[ClickHouse] SHALL support setting or changing granted roles to default for
+the current user using `CURRENT_USER` clause in the `SET DEFAULT ROLE` statement.
+
+#### RQ.SRS-006.RBAC.SetDefaultRole.All
+version: 1.0
+
+[ClickHouse] SHALL support setting or changing all granted roles to default
+for one or more users using `ALL` clause in the `SET DEFAULT ROLE` statement.
+
+#### RQ.SRS-006.RBAC.SetDefaultRole.AllExcept
+version: 1.0
+
+[ClickHouse] SHALL support setting or changing all granted roles except those specified
+to default for one or more users using `ALL EXCEPT` clause in the `SET DEFAULT ROLE` statement.
+
+#### RQ.SRS-006.RBAC.SetDefaultRole.None
+version: 1.0
+
+[ClickHouse] SHALL support removing all granted roles from default
+for one or more users using `NONE` clause in the `SET DEFAULT ROLE` statement.
+
+#### RQ.SRS-006.RBAC.SetDefaultRole.Syntax
+version: 1.0
+
+[ClickHouse] SHALL support the following syntax for the `SET DEFAULT ROLE` statement.
+
+```sql
+SET DEFAULT ROLE
+    {NONE | role [,...] | ALL | ALL EXCEPT role [,...]}
+    TO {user|CURRENT_USER} [,...]
+
+```
+
+### Set Role
+
+#### RQ.SRS-006.RBAC.SetRole
+version: 1.0
+
+[ClickHouse] SHALL support activating role or roles for the current user
+using `SET ROLE` statement.
+
+#### RQ.SRS-006.RBAC.SetRole.Default
+version: 1.0
+
+[ClickHouse] SHALL support activating default roles for the current user
+using `DEFAULT` clause in the `SET ROLE` statement.
+
+#### RQ.SRS-006.RBAC.SetRole.None
+version: 1.0
+
+[ClickHouse] SHALL support activating no roles for the current user
+using `NONE` clause in the `SET ROLE` statement.
+
+#### RQ.SRS-006.RBAC.SetRole.All
+version: 1.0
+
+[ClickHouse] SHALL support activating all roles for the current user
+using `ALL` clause in the `SET ROLE` statement.
+
+#### RQ.SRS-006.RBAC.SetRole.AllExcept
+version: 1.0
+
+[ClickHouse] SHALL support activating all roles except those specified
+for the current user using `ALL EXCEPT` clause in the `SET ROLE` statement.
+
+#### RQ.SRS-006.RBAC.SetRole.Syntax
+version: 1.0
+
+```sql
+SET ROLE {DEFAULT | NONE | role [,...] | ALL | ALL EXCEPT role [,...]}
+```
+
+### Grant
+
+#### RQ.SRS-006.RBAC.Grant.Privilege.To
+version: 1.0
+
+[ClickHouse] SHALL support granting privileges to one or more users or roles using `TO` clause
+in the `GRANT PRIVILEGE` statement.
+
+#### RQ.SRS-006.RBAC.Grant.Privilege.ToCurrentUser
+version: 1.0
+
+[ClickHouse] SHALL support granting privileges to current user using `TO CURRENT_USER` clause
+in the `GRANT PRIVILEGE` statement.
+
+#### RQ.SRS-006.RBAC.Grant.Privilege.Select
+version: 1.0
+
+[ClickHouse] SHALL support granting the **select** privilege to one or more users or roles
+for a database or a table using the `GRANT SELECT` statement.
+
+#### RQ.SRS-006.RBAC.Grant.Privilege.Insert
+version: 1.0
+
+[ClickHouse] SHALL support granting the **insert** privilege to one or more users or roles
+for a database or a table using the `GRANT INSERT` statement.
+
+#### RQ.SRS-006.RBAC.Grant.Privilege.Alter
+version: 1.0
+
+[ClickHouse] SHALL support granting the **alter** privilege to one or more users or roles
+for a database or a table using the `GRANT ALTER` statement.
+
+#### RQ.SRS-006.RBAC.Grant.Privilege.Create
+version: 1.0
+
+[ClickHouse] SHALL support granting the **create** privilege to one or more users or roles
+using the `GRANT CREATE` statement.
+
+#### RQ.SRS-006.RBAC.Grant.Privilege.Drop
+version: 1.0
+
+[ClickHouse] SHALL support granting the **drop** privilege to one or more users or roles
+using the `GRANT DROP` statement.
+
+#### RQ.SRS-006.RBAC.Grant.Privilege.Truncate
+version: 1.0
+
+[ClickHouse] SHALL support granting the **truncate** privilege to one or more users or roles
+for a database or a table using `GRANT TRUNCATE` statement.
+
+#### RQ.SRS-006.RBAC.Grant.Privilege.Optimize
+version: 1.0
+
+[ClickHouse] SHALL support granting the **optimize** privilege to one or more users or roles
+for a database or a table using `GRANT OPTIMIZE` statement.
+
+#### RQ.SRS-006.RBAC.Grant.Privilege.Show
+version: 1.0
+
+[ClickHouse] SHALL support granting the **show** privilege to one or more users or roles
+for a database or a table using `GRANT SHOW` statement.
+
+#### RQ.SRS-006.RBAC.Grant.Privilege.KillQuery
+version: 1.0
+
+[ClickHouse] SHALL support granting the **kill query** privilege to one or more users or roles
+for a database or a table using `GRANT KILL QUERY` statement.
+
+#### RQ.SRS-006.RBAC.Grant.Privilege.AccessManagement
+version: 1.0
+
+[ClickHouse] SHALL support granting the **access management** privileges to one or more users or roles
+for a database or a table using `GRANT ACCESS MANAGEMENT` statement.
+
+#### RQ.SRS-006.RBAC.Grant.Privilege.System
+version: 1.0
+
+[ClickHouse] SHALL support granting the **system** privileges to one or more users or roles
+for a database or a table using `GRANT SYSTEM` statement.
+
+#### RQ.SRS-006.RBAC.Grant.Privilege.Introspection
+version: 1.0
+
+[ClickHouse] SHALL support granting the **introspection** privileges to one or more users or roles
+for a database or a table using `GRANT INTROSPECTION` statement.
+
+#### RQ.SRS-006.RBAC.Grant.Privilege.Sources
+version: 1.0
+
+[ClickHouse] SHALL support granting the **sources** privileges to one or more users or roles
+for a database or a table using `GRANT SOURCES` statement.
+
+#### RQ.SRS-006.RBAC.Grant.Privilege.DictGet
+version: 1.0
+
+[ClickHouse] SHALL support granting the **dictGet** privilege to one or more users or roles
+for a database or a table using `GRANT dictGet` statement.
+
+#### RQ.SRS-006.RBAC.Grant.Privilege.None
+version: 1.0
+
+[ClickHouse] SHALL support granting no privileges to one or more users or roles
+for a database or a table using `GRANT NONE` statement.
+
+#### RQ.SRS-006.RBAC.Grant.Privilege.All
+version: 1.0
+
+[ClickHouse] SHALL support granting the **all** privileges to one or more users or roles
+using the `GRANT ALL` or `GRANT ALL PRIVILEGES` statements.
+
+#### RQ.SRS-006.RBAC.Grant.Privilege.GrantOption
+version: 1.0
+
+[ClickHouse] SHALL support granting the **grant option** privilege to one or more users or roles
+for a database or a table using the `WITH GRANT OPTION` clause in the `GRANT` statement.
+
+#### RQ.SRS-006.RBAC.Grant.Privilege.On
+version: 1.0
+
+[ClickHouse] SHALL support the `ON` clause in the `GRANT` privilege statement
+which SHALL allow to specify one or more tables to which the privilege SHALL
+be granted using the following patterns
+
+* `*.*` any table in any database
+* `database.*` any table in the specified database
+* `database.table` specific table in the specified database
+* `*` any table in the current database
+* `table` specific table in the current database
+
+#### RQ.SRS-006.RBAC.Grant.Privilege.PrivilegeColumns
+version: 1.0
+
+[ClickHouse] SHALL support granting the privilege **some_privilege** to one or more users or roles
+for a database or a table using the `GRANT some_privilege(column)` statement for one column.
+Multiple columns will be supported with `GRANT some_privilege(column1, column2...)` statement.
+The privileges will be granted for only the specified columns.
+
+#### RQ.SRS-006.RBAC.Grant.Privilege.OnCluster
+version: 1.0
+
+[ClickHouse] SHALL support specifying cluster on which to grant privileges using the `ON CLUSTER`
+clause in the `GRANT PRIVILEGE` statement.
+
+#### RQ.SRS-006.RBAC.Grant.Privilege.Syntax
+version: 1.0
+
+[ClickHouse] SHALL support the following syntax for the `GRANT` statement that
+grants explicit privileges to a user or a role.
+
+```sql
+GRANT [ON CLUSTER cluster_name] privilege[(column_name [,...])] [,...]
+    ON {db.table|db.*|*.*|table|*}
+    TO {user | role | CURRENT_USER} [,...]
+    [WITH GRANT OPTION]
+```
+
+### Revoke
+
+#### RQ.SRS-006.RBAC.Revoke.Privilege.Cluster
+version: 1.0
+
+[ClickHouse] SHALL support revoking privileges to one or more users or roles
+for a database or a table on some specific cluster using the `REVOKE ON CLUSTER cluster_name` statement.
+
+#### RQ.SRS-006.RBAC.Revoke.Privilege.Select
+version: 1.0
+
+[ClickHouse] SHALL support revoking the **select** privilege to one or more users or roles
+for a database or a table using the `REVOKE SELECT` statement.
+
+#### RQ.SRS-006.RBAC.Revoke.Privilege.Insert
+version: 1.0
+
+[ClickHouse] SHALL support revoking the **insert** privilege to one or more users or roles
+for a database or a table using the `REVOKE INSERT` statement.
+
+#### RQ.SRS-006.RBAC.Revoke.Privilege.Alter
+version: 1.0
+
+[ClickHouse] SHALL support revoking the **alter** privilege to one or more users or roles
+for a database or a table using the `REVOKE ALTER` statement.
+
+#### RQ.SRS-006.RBAC.Revoke.Privilege.Create
+version: 1.0
+
+[ClickHouse] SHALL support revoking the **create** privilege to one or more users or roles
+using the `REVOKE CREATE` statement.
+
+#### RQ.SRS-006.RBAC.Revoke.Privilege.Drop
+version: 1.0
+
+[ClickHouse] SHALL support revoking the **drop** privilege to one or more users or roles
+using the `REVOKE DROP` statement.
+
+#### RQ.SRS-006.RBAC.Revoke.Privilege.Truncate
+version: 1.0
+
+[ClickHouse] SHALL support revoking the **truncate** privilege to one or more users or roles
+for a database or a table using the `REVOKE TRUNCATE` statement.
+
+#### RQ.SRS-006.RBAC.Revoke.Privilege.Optimize
+version: 1.0
+
+[ClickHouse] SHALL support revoking the **optimize** privilege to one or more users or roles
+for a database or a table using the `REVOKE OPTIMIZE` statement.
+
+#### RQ.SRS-006.RBAC.Revoke.Privilege.Show
+version: 1.0
+
+[ClickHouse] SHALL support revoking the **show** privilege to one or more users or roles
+for a database or a table using the `REVOKE SHOW` statement.
+
+#### RQ.SRS-006.RBAC.Revoke.Privilege.KillQuery
+version: 1.0
+
+[ClickHouse] SHALL support revoking the **kill query** privilege to one or more users or roles
+for a database or a table using the `REVOKE KILL QUERY` statement.
+
+#### RQ.SRS-006.RBAC.Revoke.Privilege.AccessManagement
+version: 1.0
+
+[ClickHouse] SHALL support revoking the **access management** privilege to one or more users or roles
+for a database or a table using the `REVOKE ACCESS MANAGEMENT` statement.
+
+#### RQ.SRS-006.RBAC.Revoke.Privilege.System
+version: 1.0
+
+[ClickHouse] SHALL support revoking the **system** privilege to one or more users or roles
+for a database or a table using the `REVOKE SYSTEM` statement.
+
+#### RQ.SRS-006.RBAC.Revoke.Privilege.Introspection
+version: 1.0
+
+[ClickHouse] SHALL support revoking the **introspection** privilege to one or more users or roles
+for a database or a table using the `REVOKE INTROSPECTION` statement.
+
+#### RQ.SRS-006.RBAC.Revoke.Privilege.Sources
+version: 1.0
+
+[ClickHouse] SHALL support revoking the **sources** privilege to one or more users or roles
+for a database or a table using the `REVOKE SOURCES` statement.
+
+#### RQ.SRS-006.RBAC.Revoke.Privilege.DictGet
+version: 1.0
+
+[ClickHouse] SHALL support revoking the **dictGet** privilege to one or more users or roles
+for a database or a table using the `REVOKE dictGet` statement.
+
+#### RQ.SRS-006.RBAC.Revoke.Privilege.PrivilegeColumns
+version: 1.0
+
+[ClickHouse] SHALL support revoking the privilege **some_privilege** to one or more users or roles
+for a database or a table using the `REVOKE some_privilege(column)` statement for one column.
+Multiple columns will be supported with `REVOKE some_privilege(column1, column2...)` statement.
+The privileges will be revoked for only the specified columns.
+
+#### RQ.SRS-006.RBAC.Revoke.Privilege.Multiple
+version: 1.0
+
+[ClickHouse] SHALL support revoking MULTIPLE **privileges** to one or more users or roles
+for a database or a table using the `REVOKE privilege1, privilege2...` statement.
+**privileges** refers to any set of Clickhouse defined privilege, whose hierarchy includes
+SELECT, INSERT, ALTER, CREATE, DROP, TRUNCATE, OPTIMIZE, SHOW, KILL QUERY, ACCESS MANAGEMENT,
+SYSTEM, INTROSPECTION, SOURCES, dictGet and all of their sub-privileges.
+
+#### RQ.SRS-006.RBAC.Revoke.Privilege.All
+version: 1.0
+
+[ClickHouse] SHALL support revoking **all** privileges to one or more users or roles
+for a database or a table using the `REVOKE ALL` or `REVOKE ALL PRIVILEGES` statements.
+
+#### RQ.SRS-006.RBAC.Revoke.Privilege.None
+version: 1.0
+
+[ClickHouse] SHALL support revoking **no** privileges to one or more users or roles
+for a database or a table using the `REVOKE NONE` statement.
+
+#### RQ.SRS-006.RBAC.Revoke.Privilege.On
+version: 1.0
+
+[ClickHouse] SHALL support the `ON` clause in the `REVOKE` privilege statement
+which SHALL allow to specify one or more tables to which the privilege SHALL
+be revoked using the following patterns
+
+* `db.table` specific table in the specified database
+* `db.*` any table in the specified database
+* `*.*` any table in any database
+* `table` specific table in the current database
+* `*` any table in the current database
+
+#### RQ.SRS-006.RBAC.Revoke.Privilege.From
+version: 1.0
+
+[ClickHouse] SHALL support the `FROM` clause in the `REVOKE` privilege statement
+which SHALL allow to specify one or more users to which the privilege SHALL
+be revoked using the following patterns
+
+* `{user | CURRENT_USER} [,...]` some combination of users by name, which may include the current user
+* `ALL` all users
+* `ALL EXCEPT {user | CURRENT_USER} [,...]` the logical reverse of the first pattern
+
+#### RQ.SRS-006.RBAC.Revoke.Privilege.Syntax
+version: 1.0
+
+[ClickHouse] SHALL support the following syntax for the `REVOKE` statement that
+revokes explicit privileges of a user or a role.
+
+```sql
+REVOKE [ON CLUSTER cluster_name] privilege
+    [(column_name [,...])] [,...]
+    ON {db.table|db.*|*.*|table|*}
+    FROM {user | CURRENT_USER} [,...] | ALL | ALL EXCEPT {user | CURRENT_USER} [,...]
+```
+
+### Grant Role
+
+#### RQ.SRS-006.RBAC.Grant.Role
+version: 1.0
+
+[ClickHouse] SHALL support granting one or more roles to
+one or more users or roles using the `GRANT` role statement.
+
+#### RQ.SRS-006.RBAC.Grant.Role.CurrentUser
+version: 1.0
+
+[ClickHouse] SHALL support granting one or more roles to current user using
+`TO CURRENT_USER` clause in the `GRANT` role statement.
+
+#### RQ.SRS-006.RBAC.Grant.Role.AdminOption
+version: 1.0
+
+[ClickHouse] SHALL support granting `admin option` privilege
+to one or more users or roles using the `WITH ADMIN OPTION` clause
+in the `GRANT` role statement.
+
+#### RQ.SRS-006.RBAC.Grant.Role.OnCluster
+version: 1.0
+
+[ClickHouse] SHALL support specifying cluster on which the user is to be granted one or more roles
+using `ON CLUSTER` clause in the `GRANT` statement.
+
+#### RQ.SRS-006.RBAC.Grant.Role.Syntax
+version: 1.0
+
+[ClickHouse] SHALL support the following syntax for `GRANT` role statement
+
+``` sql
+GRANT
+    ON CLUSTER cluster_name
+    role [, role ...]
+    TO {user | role | CURRENT_USER} [,...]
+    [WITH ADMIN OPTION]
+```
+
+### Revoke Role
+
+#### RQ.SRS-006.RBAC.Revoke.Role
+version: 1.0
+
+[ClickHouse] SHALL support revoking one or more roles from
+one or more users or roles using the `REVOKE` role statement.
+
+#### RQ.SRS-006.RBAC.Revoke.Role.Keywords
+version: 1.0
+
+[ClickHouse] SHALL support revoking one or more roles from
+special groupings of one or more users or roles with the `ALL`, `ALL EXCEPT`,
+and `CURRENT_USER` keywords.
+
+#### RQ.SRS-006.RBAC.Revoke.Role.Cluster
+version: 1.0
+
+[ClickHouse] SHALL support revoking one or more roles from
+one or more users or roles from one or more clusters
+using the `REVOKE ON CLUSTER` role statement.
+
+#### RQ.SRS-006.RBAC.Revoke.AdminOption
+version: 1.0
+
+[ClickHouse] SHALL support revoking `admin option` privilege
+in one or more users or roles using the `ADMIN OPTION FOR` clause
+in the `REVOKE` role statement.
+
+#### RQ.SRS-006.RBAC.Revoke.Role.Syntax
+version: 1.0
+
+[ClickHouse] SHALL support the following syntax for the `REVOKE` role statement
+
+```sql
+REVOKE [ON CLUSTER cluster_name] [ADMIN OPTION FOR]
+    role [,...]
+    FROM {user | role | CURRENT_USER} [,...] | ALL | ALL EXCEPT {user_name | role_name | CURRENT_USER} [,...]
+```
+
+### Show Grants
+
+#### RQ.SRS-006.RBAC.Show.Grants
+version: 1.0
+
+[ClickHouse] SHALL support listing all the privileges granted to current user and role
+using the `SHOW GRANTS` statement.
+
+#### RQ.SRS-006.RBAC.Show.Grants.For
+version: 1.0
+
+[ClickHouse] SHALL support listing all the privileges granted to a user or a role
+using the `FOR` clause in the `SHOW GRANTS` statement.
+
+#### RQ.SRS-006.RBAC.Show.Grants.Syntax
+version: 1.0
+
+[Clickhouse] SHALL use the following syntax for the `SHOW GRANTS` statement
+
+``` sql
+SHOW GRANTS [FOR user_or_role]
+```
+
+### Table Privileges
+
+#### RQ.SRS-006.RBAC.Table.PublicTables
 version: 1.0
 
 [ClickHouse] SHALL support that a user without any privileges will be able to access the following tables
@@ -2825,7 +2889,7 @@ version: 1.0
 * system.contributors
 * system.functions
 
-##### RQ.SRS-006.RBAC.Table.SensitiveTables
+#### RQ.SRS-006.RBAC.Table.SensitiveTables
 version: 1.0
 
 [ClickHouse] SHALL not support a user with no privileges accessing the following `system` tables:
@@ -2842,15 +2906,15 @@ version: 1.0
 * zookeeper
 * macros
 
-#### Distributed Tables
+### Distributed Tables
 
-##### RQ.SRS-006.RBAC.DistributedTable.Create
+#### RQ.SRS-006.RBAC.DistributedTable.Create
 version: 1.0
 
 [ClickHouse] SHALL successfully `CREATE` a distributed table if and only if
 the user has **create table** privilege on the table and **remote** privilege on *.*
 
-##### RQ.SRS-006.RBAC.DistributedTable.Select
+#### RQ.SRS-006.RBAC.DistributedTable.Select
 version: 1.0
 
 [ClickHouse] SHALL successfully `SELECT` from a distributed table if and only if
@@ -2858,7 +2922,7 @@ the user has **select** privilege on the table and on the remote table specified
 
 Does not require **select** privilege for the remote table if the remote table does not exist on the same server as the user.
 
-##### RQ.SRS-006.RBAC.DistributedTable.Insert
+#### RQ.SRS-006.RBAC.DistributedTable.Insert
 version: 1.0
 
 [ClickHouse] SHALL successfully `INSERT` into a distributed table if and only if
@@ -2867,7 +2931,7 @@ the user has **insert** privilege on the table and on the remote table specified
 Does not require **insert** privilege for the remote table if the remote table does not exist on the same server as the user,
 insert executes into the remote table on a different server.
 
-##### RQ.SRS-006.RBAC.DistributedTable.SpecialTables
+#### RQ.SRS-006.RBAC.DistributedTable.SpecialTables
 version: 1.0
 
 [ClickHouse] SHALL successfully execute a query using a distributed table that uses one of the special tables if and only if
@@ -2877,29 +2941,29 @@ Special tables include:
 * distributed table
 * source table of a materialized view
 
-##### RQ.SRS-006.RBAC.DistributedTable.LocalUser
+#### RQ.SRS-006.RBAC.DistributedTable.LocalUser
 version: 1.0
 
 [ClickHouse] SHALL successfully execute a query using a distributed table from
 a user present locally, but not remotely.
 
-##### RQ.SRS-006.RBAC.DistributedTable.SameUserDifferentNodesDifferentPrivileges
+#### RQ.SRS-006.RBAC.DistributedTable.SameUserDifferentNodesDifferentPrivileges
 version: 1.0
 
 [ClickHouse] SHALL successfully execute a query using a distributed table by a user that exists on multiple nodes
 if and only if the user has the required privileges on the node the query is being executed from.
 
-#### Views
+### Views
 
-##### View
+#### View
 
-###### RQ.SRS-006.RBAC.View
+##### RQ.SRS-006.RBAC.View
 version: 1.0
 
 [ClickHouse] SHALL support controlling access to **create**, **select** and **drop**
 privileges for a view for users or roles.
 
-###### RQ.SRS-006.RBAC.View.Create
+##### RQ.SRS-006.RBAC.View.Create
 version: 1.0
 
 [ClickHouse] SHALL only successfully execute a `CREATE VIEW` command if and only if
@@ -2917,7 +2981,7 @@ CREATE VIEW view AS SELECT column FROM table0 JOIN table1 USING column UNION ALL
 CREATE VIEW view0 AS SELECT column FROM view1 UNION ALL SELECT column FROM view2
 ```
 
-###### RQ.SRS-006.RBAC.View.Select
+##### RQ.SRS-006.RBAC.View.Select
 version: 1.0
 
 [ClickHouse] SHALL only successfully `SELECT` from a view if and only if
@@ -2937,21 +3001,21 @@ CREATE VIEW view0 AS SELECT column FROM view1 UNION ALL SELECT column FROM view2
 SELECT * FROM view
 ```
 
-###### RQ.SRS-006.RBAC.View.Drop
+##### RQ.SRS-006.RBAC.View.Drop
 version: 1.0
 
 [ClickHouse] SHALL only successfully execute a `DROP VIEW` command if and only if
 the user has **drop view** privilege on that view either explicitly or through a role.
 
-##### Materialized View
+#### Materialized View
 
-###### RQ.SRS-006.RBAC.MaterializedView
+##### RQ.SRS-006.RBAC.MaterializedView
 version: 1.0
 
 [ClickHouse] SHALL support controlling access to **create**, **select**, **alter** and **drop**
 privileges for a materialized view for users or roles.
 
-###### RQ.SRS-006.RBAC.MaterializedView.Create
+##### RQ.SRS-006.RBAC.MaterializedView.Create
 version: 1.0
 
 [ClickHouse] SHALL only successfully execute a `CREATE MATERIALIZED VIEW` command if and only if
@@ -2983,7 +3047,7 @@ For example,
 CREATE MATERIALIZED VIEW view TO target_table AS SELECT * FROM source_table
 ```
 
-###### RQ.SRS-006.RBAC.MaterializedView.Select
+##### RQ.SRS-006.RBAC.MaterializedView.Select
 version: 1.0
 
 [ClickHouse] SHALL only successfully `SELECT` from a materialized view if and only if
@@ -3003,25 +3067,25 @@ CREATE MATERIALIZED VIEW view0 ENGINE = Memory AS SELECT column FROM view1 UNION
 SELECT * FROM view
 ```
 
-###### RQ.SRS-006.RBAC.MaterializedView.Select.TargetTable
+##### RQ.SRS-006.RBAC.MaterializedView.Select.TargetTable
 version: 1.0
 
 [ClickHouse] SHALL only successfully `SELECT` from the target table, implicit or explicit, of a materialized view if and only if
 the user has `SELECT` privilege for the table, either explicitly or through a role.
 
-###### RQ.SRS-006.RBAC.MaterializedView.Select.SourceTable
+##### RQ.SRS-006.RBAC.MaterializedView.Select.SourceTable
 version: 1.0
 
 [ClickHouse] SHALL only successfully `SELECT` from the source table of a materialized view if and only if
 the user has `SELECT` privilege for the table, either explicitly or through a role.
 
-###### RQ.SRS-006.RBAC.MaterializedView.Drop
+##### RQ.SRS-006.RBAC.MaterializedView.Drop
 version: 1.0
 
 [ClickHouse] SHALL only successfully execute a `DROP VIEW` command if and only if
 the user has **drop view** privilege on that view either explicitly or through a role.
 
-###### RQ.SRS-006.RBAC.MaterializedView.ModifyQuery
+##### RQ.SRS-006.RBAC.MaterializedView.ModifyQuery
 version: 1.0
 
 [ClickHouse] SHALL only successfully execute a `MODIFY QUERY` command if and only if
@@ -3034,33 +3098,33 @@ For example,
 ALTER TABLE view MODIFY QUERY SELECT * FROM source_table
 ```
 
-###### RQ.SRS-006.RBAC.MaterializedView.Insert
+##### RQ.SRS-006.RBAC.MaterializedView.Insert
 version: 1.0
 
 [ClickHouse] SHALL only succesfully `INSERT` into a materialized view if and only if
 the user has `INSERT` privilege on the view, either explicitly or through a role.
 
-###### RQ.SRS-006.RBAC.MaterializedView.Insert.SourceTable
+##### RQ.SRS-006.RBAC.MaterializedView.Insert.SourceTable
 version: 1.0
 
 [ClickHouse] SHALL only succesfully `INSERT` into a source table of a materialized view if and only if
 the user has `INSERT` privilege on the source table, either explicitly or through a role.
 
-###### RQ.SRS-006.RBAC.MaterializedView.Insert.TargetTable
+##### RQ.SRS-006.RBAC.MaterializedView.Insert.TargetTable
 version: 1.0
 
 [ClickHouse] SHALL only succesfully `INSERT` into a target table of a materialized view if and only if
 the user has `INSERT` privelege on the target table, either explicitly or through a role.
 
-##### Live View
+#### Live View
 
-###### RQ.SRS-006.RBAC.LiveView
+##### RQ.SRS-006.RBAC.LiveView
 version: 1.0
 
 [ClickHouse] SHALL support controlling access to **create**, **select**, **alter** and **drop**
 privileges for a live view for users or roles.
 
-###### RQ.SRS-006.RBAC.LiveView.Create
+##### RQ.SRS-006.RBAC.LiveView.Create
 version: 1.0
 
 [ClickHouse] SHALL only successfully execute a `CREATE LIVE VIEW` command if and only if
@@ -3078,7 +3142,7 @@ CREATE LIVE VIEW view AS SELECT column FROM table0 JOIN table1 USING column UNIO
 CREATE LIVE VIEW view0 AS SELECT column FROM view1 UNION ALL SELECT column FROM view2
 ```
 
-###### RQ.SRS-006.RBAC.LiveView.Select
+##### RQ.SRS-006.RBAC.LiveView.Select
 version: 1.0
 
 [ClickHouse] SHALL only successfully `SELECT` from a live view if and only if
@@ -3098,28 +3162,28 @@ CREATE LIVE VIEW view0 AS SELECT column FROM view1 UNION ALL SELECT column FROM
 SELECT * FROM view
 ```
 
-###### RQ.SRS-006.RBAC.LiveView.Drop
+##### RQ.SRS-006.RBAC.LiveView.Drop
 version: 1.0
 
 [ClickHouse] SHALL only successfully execute a `DROP VIEW` command if and only if
 the user has **drop view** privilege on that view either explicitly or through a role.
 
-###### RQ.SRS-006.RBAC.LiveView.Refresh
+##### RQ.SRS-006.RBAC.LiveView.Refresh
 version: 1.0
 
 [ClickHouse] SHALL only successfully execute an `ALTER LIVE VIEW REFRESH` command if and only if
 the user has **refresh** privilege on that view either explicitly or through a role.
 
-#### Select
+### Select
 
-##### RQ.SRS-006.RBAC.Select
+#### RQ.SRS-006.RBAC.Select
 version: 1.0
 
 [ClickHouse] SHALL execute `SELECT` if and only if the user
 has the **select** privilege for the destination table
 either because of the explicit grant or through one of the roles assigned to the user.
 
-##### RQ.SRS-006.RBAC.Select.Column
+#### RQ.SRS-006.RBAC.Select.Column
 version: 1.0
 
 [ClickHouse] SHALL support granting or revoking **select** privilege
@@ -3128,7 +3192,7 @@ Any `SELECT` statements SHALL not to be executed, unless the user
 has the **select** privilege for the destination column
 either because of the explicit grant or through one of the roles assigned to the user.
 
-##### RQ.SRS-006.RBAC.Select.Cluster
+#### RQ.SRS-006.RBAC.Select.Cluster
 version: 1.0
 
 [ClickHouse] SHALL support granting or revoking **select** privilege
@@ -3136,7 +3200,7 @@ on a specified cluster to one or more **users** or **roles**.
 Any `SELECT` statements SHALL succeed only on nodes where
 the table exists and privilege was granted.
 
-##### RQ.SRS-006.RBAC.Select.TableEngines
+#### RQ.SRS-006.RBAC.Select.TableEngines
 version: 1.0
 
 [ClickHouse] SHALL support controlling access to the **select** privilege
@@ -3157,16 +3221,16 @@ on tables created using the following engines
 * ReplicatedVersionedCollapsingMergeTree
 * ReplicatedGraphiteMergeTree
 
-#### Insert
+### Insert
 
-##### RQ.SRS-006.RBAC.Insert
+#### RQ.SRS-006.RBAC.Insert
 version: 1.0
 
 [ClickHouse] SHALL execute `INSERT INTO` if and only if the user
 has the **insert** privilege for the destination table
 either because of the explicit grant or through one of the roles assigned to the user.
 
-##### RQ.SRS-006.RBAC.Insert.Column
+#### RQ.SRS-006.RBAC.Insert.Column
 version: 1.0
 
 [ClickHouse] SHALL support granting or revoking **insert** privilege
@@ -3175,7 +3239,7 @@ Any `INSERT INTO` statements SHALL not to be executed, unless the user
 has the **insert** privilege for the destination column
 either because of the explicit grant or through one of the roles assigned to the user.
 
-##### RQ.SRS-006.RBAC.Insert.Cluster
+#### RQ.SRS-006.RBAC.Insert.Cluster
 version: 1.0
 
 [ClickHouse] SHALL support granting or revoking **insert** privilege
@@ -3183,7 +3247,7 @@ on a specified cluster to one or more **users** or **roles**.
 Any `INSERT INTO` statements SHALL succeed only on nodes where
 the table exists and privilege was granted.
 
-##### RQ.SRS-006.RBAC.Insert.TableEngines
+#### RQ.SRS-006.RBAC.Insert.TableEngines
 version: 1.0
 
 [ClickHouse] SHALL support controlling access to the **insert** privilege
@@ -3204,11 +3268,11 @@ on tables created using the following engines
 * ReplicatedVersionedCollapsingMergeTree
 * ReplicatedGraphiteMergeTree
 
-#### Alter
+### Alter
 
-##### Alter Column
+#### Alter Column
 
-###### RQ.SRS-006.RBAC.Privileges.AlterColumn
+##### RQ.SRS-006.RBAC.Privileges.AlterColumn
 version: 1.0
 
 [ClickHouse] SHALL support controlling access to the **alter column** privilege
@@ -3218,19 +3282,19 @@ return an error, unless the user has the **alter column** privilege for
 the destination table either because of the explicit grant or through one of
 the roles assigned to the user.
 
-###### RQ.SRS-006.RBAC.Privileges.AlterColumn.Grant
+##### RQ.SRS-006.RBAC.Privileges.AlterColumn.Grant
 version: 1.0
 
 [ClickHouse] SHALL support granting **alter column** privilege
 for a database or a specific table to one or more **users** or **roles**.
 
-###### RQ.SRS-006.RBAC.Privileges.AlterColumn.Revoke
+##### RQ.SRS-006.RBAC.Privileges.AlterColumn.Revoke
 version: 1.0
 
 [ClickHouse] SHALL support revoking **alter column** privilege
 for a database or a specific table to one or more **users** or **roles**
 
-###### RQ.SRS-006.RBAC.Privileges.AlterColumn.Column
+##### RQ.SRS-006.RBAC.Privileges.AlterColumn.Column
 version: 1.0
 
 [ClickHouse] SHALL support granting or revoking **alter column** privilege
@@ -3239,7 +3303,7 @@ Any `ALTER TABLE ... ADD|DROP|CLEAR|COMMENT|MODIFY COLUMN` statements SHALL retu
 unless the user has the **alter column** privilege for the destination column
 either because of the explicit grant or through one of the roles assigned to the user.
 
-###### RQ.SRS-006.RBAC.Privileges.AlterColumn.Cluster
+##### RQ.SRS-006.RBAC.Privileges.AlterColumn.Cluster
 version: 1.0
 
 [ClickHouse] SHALL support granting or revoking **alter column** privilege
@@ -3247,7 +3311,7 @@ on a specified cluster to one or more **users** or **roles**.
 Any `ALTER TABLE ... ADD|DROP|CLEAR|COMMENT|MODIFY COLUMN`
 statements SHALL succeed only on nodes where the table exists and privilege was granted.
 
-###### RQ.SRS-006.RBAC.Privileges.AlterColumn.TableEngines
+##### RQ.SRS-006.RBAC.Privileges.AlterColumn.TableEngines
 version: 1.0
 
 [ClickHouse] SHALL support controlling access to the **alter column** privilege
@@ -3268,9 +3332,9 @@ on tables created using the following engines
 * ReplicatedVersionedCollapsingMergeTree
 * ReplicatedGraphiteMergeTree
 
-##### Alter Index
+#### Alter Index
 
-###### RQ.SRS-006.RBAC.Privileges.AlterIndex
+##### RQ.SRS-006.RBAC.Privileges.AlterIndex
 version: 1.0
 
 [ClickHouse] SHALL support controlling access to the **alter index** privilege
@@ -3280,19 +3344,19 @@ return an error, unless the user has the **alter index** privilege for
 the destination table either because of the explicit grant or through one of
 the roles assigned to the user.
 
-###### RQ.SRS-006.RBAC.Privileges.AlterIndex.Grant
+##### RQ.SRS-006.RBAC.Privileges.AlterIndex.Grant
 version: 1.0
 
 [ClickHouse] SHALL support granting **alter index** privilege
 for a database or a specific table to one or more **users** or **roles**.
 
-###### RQ.SRS-006.RBAC.Privileges.AlterIndex.Revoke
+##### RQ.SRS-006.RBAC.Privileges.AlterIndex.Revoke
 version: 1.0
 
 [ClickHouse] SHALL support revoking **alter index** privilege
 for a database or a specific table to one or more **users** or **roles**
 
-###### RQ.SRS-006.RBAC.Privileges.AlterIndex.Cluster
+##### RQ.SRS-006.RBAC.Privileges.AlterIndex.Cluster
 version: 1.0
 
 [ClickHouse] SHALL support granting or revoking **alter index** privilege
@@ -3300,7 +3364,7 @@ on a specified cluster to one or more **users** or **roles**.
 Any `ALTER TABLE ... ORDER BY | ADD|DROP|MATERIALIZE|CLEAR INDEX`
 statements SHALL succeed only on nodes where the table exists and privilege was granted.
 
-###### RQ.SRS-006.RBAC.Privileges.AlterIndex.TableEngines
+##### RQ.SRS-006.RBAC.Privileges.AlterIndex.TableEngines
 version: 1.0
 
 [ClickHouse] SHALL support controlling access to the **alter index** privilege
@@ -3321,9 +3385,9 @@ on tables created using the following engines
 * ReplicatedVersionedCollapsingMergeTree
 * ReplicatedGraphiteMergeTree
 
-##### Alter Constraint
+#### Alter Constraint
 
-###### RQ.SRS-006.RBAC.Privileges.AlterConstraint
+##### RQ.SRS-006.RBAC.Privileges.AlterConstraint
 version: 1.0
 
 [ClickHouse] SHALL support controlling access to the **alter constraint** privilege
@@ -3333,19 +3397,19 @@ return an error, unless the user has the **alter constraint** privilege for
 the destination table either because of the explicit grant or through one of
 the roles assigned to the user.
 
-###### RQ.SRS-006.RBAC.Privileges.AlterConstraint.Grant
+##### RQ.SRS-006.RBAC.Privileges.AlterConstraint.Grant
 version: 1.0
 
 [ClickHouse] SHALL support granting **alter constraint** privilege
 for a database or a specific table to one or more **users** or **roles**.
 
-###### RQ.SRS-006.RBAC.Privileges.AlterConstraint.Revoke
+##### RQ.SRS-006.RBAC.Privileges.AlterConstraint.Revoke
 version: 1.0
 
 [ClickHouse] SHALL support revoking **alter constraint** privilege
 for a database or a specific table to one or more **users** or **roles**
 
-###### RQ.SRS-006.RBAC.Privileges.AlterConstraint.Cluster
+##### RQ.SRS-006.RBAC.Privileges.AlterConstraint.Cluster
 version: 1.0
 
 [ClickHouse] SHALL support granting or revoking **alter constraint** privilege
@@ -3353,7 +3417,7 @@ on a specified cluster to one or more **users** or **roles**.
 Any `ALTER TABLE ... ADD|DROP CONSTRAINT`
 statements SHALL succeed only on nodes where the table exists and privilege was granted.
 
-###### RQ.SRS-006.RBAC.Privileges.AlterConstraint.TableEngines
+##### RQ.SRS-006.RBAC.Privileges.AlterConstraint.TableEngines
 version: 1.0
 
 [ClickHouse] SHALL support controlling access to the **alter constraint** privilege
@@ -3374,9 +3438,9 @@ on tables created using the following engines
 * ReplicatedVersionedCollapsingMergeTree
 * ReplicatedGraphiteMergeTree
 
-##### Alter TTL
+#### Alter TTL
 
-###### RQ.SRS-006.RBAC.Privileges.AlterTTL
+##### RQ.SRS-006.RBAC.Privileges.AlterTTL
 version: 1.0
 
 [ClickHouse] SHALL support controlling access to the **alter ttl** or **alter materialize ttl** privilege
@@ -3386,19 +3450,19 @@ return an error, unless the user has the **alter ttl** or **alter materialize tt
 the destination table either because of the explicit grant or through one of
 the roles assigned to the user.
 
-###### RQ.SRS-006.RBAC.Privileges.AlterTTL.Grant
+##### RQ.SRS-006.RBAC.Privileges.AlterTTL.Grant
 version: 1.0
 
 [ClickHouse] SHALL support granting **alter ttl** or **alter materialize ttl** privilege
 for a database or a specific table to one or more **users** or **roles**.
 
-###### RQ.SRS-006.RBAC.Privileges.AlterTTL.Revoke
+##### RQ.SRS-006.RBAC.Privileges.AlterTTL.Revoke
 version: 1.0
 
 [ClickHouse] SHALL support revoking **alter ttl** or **alter materialize ttl** privilege
 for a database or a specific table to one or more **users** or **roles**
 
-###### RQ.SRS-006.RBAC.Privileges.AlterTTL.Cluster
+##### RQ.SRS-006.RBAC.Privileges.AlterTTL.Cluster
 version: 1.0
 
 [ClickHouse] SHALL support granting or revoking **alter ttl** or **alter materialize ttl** privilege
@@ -3406,7 +3470,7 @@ on a specified cluster to one or more **users** or **roles**.
 Any `ALTER TABLE ... ALTER TTL | ALTER MATERIALIZE TTL`
 statements SHALL succeed only on nodes where the table exists and privilege was granted.
 
-###### RQ.SRS-006.RBAC.Privileges.AlterTTL.TableEngines
+##### RQ.SRS-006.RBAC.Privileges.AlterTTL.TableEngines
 version: 1.0
 
 [ClickHouse] SHALL support controlling access to the **alter ttl** or **alter materialize ttl** privilege
@@ -3414,9 +3478,9 @@ on tables created using the following engines
 
 * MergeTree
 
-##### Alter Settings
+#### Alter Settings
 
-###### RQ.SRS-006.RBAC.Privileges.AlterSettings
+##### RQ.SRS-006.RBAC.Privileges.AlterSettings
 version: 1.0
 
 [ClickHouse] SHALL support controlling access to the **alter settings** privilege
@@ -3427,19 +3491,19 @@ the destination table either because of the explicit grant or through one of
 the roles assigned to the user. The **alter settings** privilege allows
 modifying table engine settings. It doesn’t affect settings or server configuration parameters.
 
-###### RQ.SRS-006.RBAC.Privileges.AlterSettings.Grant
+##### RQ.SRS-006.RBAC.Privileges.AlterSettings.Grant
 version: 1.0
 
 [ClickHouse] SHALL support granting **alter settings** privilege
 for a database or a specific table to one or more **users** or **roles**.
 
-###### RQ.SRS-006.RBAC.Privileges.AlterSettings.Revoke
+##### RQ.SRS-006.RBAC.Privileges.AlterSettings.Revoke
 version: 1.0
 
 [ClickHouse] SHALL support revoking **alter settings** privilege
 for a database or a specific table to one or more **users** or **roles**
 
-###### RQ.SRS-006.RBAC.Privileges.AlterSettings.Cluster
+##### RQ.SRS-006.RBAC.Privileges.AlterSettings.Cluster
 version: 1.0
 
 [ClickHouse] SHALL support granting or revoking **alter settings** privilege
@@ -3447,7 +3511,7 @@ on a specified cluster to one or more **users** or **roles**.
 Any `ALTER TABLE ... MODIFY SETTING setting`
 statements SHALL succeed only on nodes where the table exists and privilege was granted.
 
-###### RQ.SRS-006.RBAC.Privileges.AlterSettings.TableEngines
+##### RQ.SRS-006.RBAC.Privileges.AlterSettings.TableEngines
 version: 1.0
 
 [ClickHouse] SHALL support controlling access to the **alter settings** privilege
@@ -3468,27 +3532,27 @@ on tables created using the following engines
 * ReplicatedVersionedCollapsingMergeTree
 * ReplicatedGraphiteMergeTree
 
-##### Alter Update
+#### Alter Update
 
-###### RQ.SRS-006.RBAC.Privileges.AlterUpdate
+##### RQ.SRS-006.RBAC.Privileges.AlterUpdate
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `ALTER UPDATE` statement if and only if the user has **alter update** privilege for that column,
 either directly or through a role.
 
-###### RQ.SRS-006.RBAC.Privileges.AlterUpdate.Grant
+##### RQ.SRS-006.RBAC.Privileges.AlterUpdate.Grant
 version: 1.0
 
 [ClickHouse] SHALL support granting **alter update** privilege on a column level
 to one or more **users** or **roles**.
 
-###### RQ.SRS-006.RBAC.Privileges.AlterUpdate.Revoke
+##### RQ.SRS-006.RBAC.Privileges.AlterUpdate.Revoke
 version: 1.0
 
 [ClickHouse] SHALL support revoking **alter update** privilege on a column level
 from one or more **users** or **roles**.
 
-###### RQ.SRS-006.RBAC.Privileges.AlterUpdate.TableEngines
+##### RQ.SRS-006.RBAC.Privileges.AlterUpdate.TableEngines
 version: 1.0
 
 [ClickHouse] SHALL support controlling access to the **alter update** privilege
@@ -3509,27 +3573,27 @@ on tables created using the following engines
 * ReplicatedVersionedCollapsingMergeTree
 * ReplicatedGraphiteMergeTree
 
-##### Alter Delete
+#### Alter Delete
 
-###### RQ.SRS-006.RBAC.Privileges.AlterDelete
+##### RQ.SRS-006.RBAC.Privileges.AlterDelete
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `ALTER DELETE` statement if and only if the user has **alter delete** privilege for that table,
 either directly or through a role.
 
-###### RQ.SRS-006.RBAC.Privileges.AlterDelete.Grant
+##### RQ.SRS-006.RBAC.Privileges.AlterDelete.Grant
 version: 1.0
 
 [ClickHouse] SHALL support granting **alter delete** privilege on a column level
 to one or more **users** or **roles**.
 
-###### RQ.SRS-006.RBAC.Privileges.AlterDelete.Revoke
+##### RQ.SRS-006.RBAC.Privileges.AlterDelete.Revoke
 version: 1.0
 
 [ClickHouse] SHALL support revoking **alter delete** privilege on a column level
 from one or more **users** or **roles**.
 
-###### RQ.SRS-006.RBAC.Privileges.AlterDelete.TableEngines
+##### RQ.SRS-006.RBAC.Privileges.AlterDelete.TableEngines
 version: 1.0
 
 [ClickHouse] SHALL support controlling access to the **alter delete** privilege
@@ -3550,27 +3614,27 @@ on tables created using the following engines
 * ReplicatedVersionedCollapsingMergeTree
 * ReplicatedGraphiteMergeTree
 
-##### Alter Freeze Partition
+#### Alter Freeze Partition
 
-###### RQ.SRS-006.RBAC.Privileges.AlterFreeze
+##### RQ.SRS-006.RBAC.Privileges.AlterFreeze
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `ALTER FREEZE` statement if and only if the user has **alter freeze** privilege for that table,
 either directly or through a role.
 
-###### RQ.SRS-006.RBAC.Privileges.AlterFreeze.Grant
+##### RQ.SRS-006.RBAC.Privileges.AlterFreeze.Grant
 version: 1.0
 
 [ClickHouse] SHALL support granting **alter freeze** privilege on a column level
 to one or more **users** or **roles**.
 
-###### RQ.SRS-006.RBAC.Privileges.AlterFreeze.Revoke
+##### RQ.SRS-006.RBAC.Privileges.AlterFreeze.Revoke
 version: 1.0
 
 [ClickHouse] SHALL support revoking **alter freeze** privilege on a column level
 from one or more **users** or **roles**.
 
-###### RQ.SRS-006.RBAC.Privileges.AlterFreeze.TableEngines
+##### RQ.SRS-006.RBAC.Privileges.AlterFreeze.TableEngines
 version: 1.0
 
 [ClickHouse] SHALL support controlling access to the **alter freeze** privilege
@@ -3591,27 +3655,27 @@ on tables created using the following engines
 * ReplicatedVersionedCollapsingMergeTree
 * ReplicatedGraphiteMergeTree
 
-##### Alter Fetch Partition
+#### Alter Fetch Partition
 
-###### RQ.SRS-006.RBAC.Privileges.AlterFetch
+##### RQ.SRS-006.RBAC.Privileges.AlterFetch
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `ALTER FETCH` statement if and only if the user has **alter fetch** privilege for that table,
 either directly or through a role.
 
-###### RQ.SRS-006.RBAC.Privileges.AlterFetch.Grant
+##### RQ.SRS-006.RBAC.Privileges.AlterFetch.Grant
 version: 1.0
 
 [ClickHouse] SHALL support granting **alter fetch** privilege on a column level
 to one or more **users** or **roles**.
 
-###### RQ.SRS-006.RBAC.Privileges.AlterFetch.Revoke
+##### RQ.SRS-006.RBAC.Privileges.AlterFetch.Revoke
 version: 1.0
 
 [ClickHouse] SHALL support revoking **alter fetch** privilege on a column level
 from one or more **users** or **roles**.
 
-###### RQ.SRS-006.RBAC.Privileges.AlterFetch.TableEngines
+##### RQ.SRS-006.RBAC.Privileges.AlterFetch.TableEngines
 version: 1.0
 
 [ClickHouse] SHALL support controlling access to the **alter fetch** privilege
@@ -3625,9 +3689,9 @@ on tables created using the following engines
 * ReplicatedVersionedCollapsingMergeTree
 * ReplicatedGraphiteMergeTree
 
-##### Alter Move Partition
+#### Alter Move Partition
 
-###### RQ.SRS-006.RBAC.Privileges.AlterMove
+##### RQ.SRS-006.RBAC.Privileges.AlterMove
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `ALTER MOVE` statement if and only if the user has **alter move**, **select**, and **alter delete** privilege on the source table
@@ -3637,19 +3701,19 @@ For example,
 ALTER TABLE source_table MOVE PARTITION 1 TO target_table
 ```
 
-###### RQ.SRS-006.RBAC.Privileges.AlterMove.Grant
+##### RQ.SRS-006.RBAC.Privileges.AlterMove.Grant
 version: 1.0
 
 [ClickHouse] SHALL support granting **alter move** privilege on a column level
 to one or more **users** or **roles**.
 
-###### RQ.SRS-006.RBAC.Privileges.AlterMove.Revoke
+##### RQ.SRS-006.RBAC.Privileges.AlterMove.Revoke
 version: 1.0
 
 [ClickHouse] SHALL support revoking **alter move** privilege on a column level
 from one or more **users** or **roles**.
 
-###### RQ.SRS-006.RBAC.Privileges.AlterMove.TableEngines
+##### RQ.SRS-006.RBAC.Privileges.AlterMove.TableEngines
 version: 1.0
 
 [ClickHouse] SHALL support controlling access to the **alter move** privilege
@@ -3670,6 +3734,8 @@ on tables created using the following engines
 * ReplicatedVersionedCollapsingMergeTree
 * ReplicatedGraphiteMergeTree
 
+### Create
+
 #### RQ.SRS-006.RBAC.Privileges.CreateTable
 version: 1.0
 
@@ -3706,6 +3772,8 @@ version: 1.0
 [ClickHouse] SHALL successfully execute `CREATE TEMPORARY TABLE` statement if and only if the user has **create temporary table** privilege on the table,
 either directly or through a role.
 
+### Attach
+
 #### RQ.SRS-006.RBAC.Privileges.AttachDatabase
 version: 1.0
 
@@ -3730,6 +3798,8 @@ version: 1.0
 [ClickHouse] SHALL successfully execute `ATTACH TABLE` statement if and only if the user has **create table** privilege on the table,
 either directly or through a role.
 
+### Drop
+
 #### RQ.SRS-006.RBAC.Privileges.DropTable
 version: 1.0
 
@@ -3748,6 +3818,8 @@ version: 1.0
 [ClickHouse] SHALL successfully execute `DROP DICTIONARY` statement if and only if the user has **drop dictionary** privilege on the dictionary,
 either directly or through a role.
 
+### Detach
+
 #### RQ.SRS-006.RBAC.Privileges.DetachTable
 version: 1.0
 
@@ -3772,354 +3844,360 @@ version: 1.0
 [ClickHouse] SHALL successfully execute `DETACH DICTIONARY` statement if and only if the user has **drop dictionary** privilege on the dictionary,
 either directly or through a role.
 
+### Truncate
+
 #### RQ.SRS-006.RBAC.Privileges.Truncate
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `TRUNCATE TABLE` statement if and only if the user has **truncate table** privilege on the table,
 either directly or through a role.
 
+### Optimize
+
 #### RQ.SRS-006.RBAC.Privileges.Optimize
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `OPTIMIZE TABLE` statement if and only if the user has **optimize table** privilege on the table,
 either directly or through a role.
 
+### Kill Query
+
 #### RQ.SRS-006.RBAC.Privileges.KillQuery
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `KILL QUERY` statement if and only if the user has **kill query** privilege,
 either directly or through a role.
 
-#### Kill Mutation
+### Kill Mutation
 
-##### RQ.SRS-006.RBAC.Privileges.KillMutation
+#### RQ.SRS-006.RBAC.Privileges.KillMutation
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `KILL MUTATION` statement if and only if
 the user has the privilege that created the mutation, either directly or through a role.
 For example, to `KILL MUTATION` after `ALTER UPDATE` query, the user needs `ALTER UPDATE` privilege.
 
-##### RQ.SRS-006.RBAC.Privileges.KillMutation.AlterUpdate
+#### RQ.SRS-006.RBAC.Privileges.KillMutation.AlterUpdate
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `KILL MUTATION` query on an `ALTER UPDATE` mutation if and only if
 the user has `ALTER UPDATE` privilege on the table where the mutation was created, either directly or through a role.
 
-##### RQ.SRS-006.RBAC.Privileges.KillMutation.AlterDelete
+#### RQ.SRS-006.RBAC.Privileges.KillMutation.AlterDelete
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `KILL MUTATION` query on an `ALTER DELETE` mutation if and only if
 the user has `ALTER DELETE` privilege on the table where the mutation was created, either directly or through a role.
 
-##### RQ.SRS-006.RBAC.Privileges.KillMutation.AlterDropColumn
+#### RQ.SRS-006.RBAC.Privileges.KillMutation.AlterDropColumn
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `KILL MUTATION` query on an `ALTER DROP COLUMN` mutation if and only if
 the user has `ALTER DROP COLUMN` privilege on the table where the mutation was created, either directly or through a role.
 
-#### Show
+### Show
 
-##### RQ.SRS-006.RBAC.ShowTables.Privilege
+#### RQ.SRS-006.RBAC.ShowTables.Privilege
 version: 1.0
 
 [ClickHouse] SHALL grant **show tables** privilege on a table to a user if that user has recieved any grant,
 including `SHOW TABLES`, on that table, either directly or through a role.
 
-##### RQ.SRS-006.RBAC.ShowTables.RequiredPrivilege
+#### RQ.SRS-006.RBAC.ShowTables.RequiredPrivilege
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `SHOW TABLES` statement if and only if the user has **show tables** privilege,
 or any privilege on the table either directly or through a role.
 
-##### RQ.SRS-006.RBAC.ExistsTable.RequiredPrivilege
+#### RQ.SRS-006.RBAC.ExistsTable.RequiredPrivilege
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `EXISTS table` statement if and only if the user has **show tables** privilege,
 or any privilege on the table either directly or through a role.
 
-##### RQ.SRS-006.RBAC.CheckTable.RequiredPrivilege
+#### RQ.SRS-006.RBAC.CheckTable.RequiredPrivilege
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `CHECK table` statement if and only if the user has **show tables** privilege,
 or any privilege on the table either directly or through a role.
 
-##### RQ.SRS-006.RBAC.ShowDatabases.Privilege
+#### RQ.SRS-006.RBAC.ShowDatabases.Privilege
 version: 1.0
 
 [ClickHouse] SHALL grant **show databases** privilege on a database to a user if that user has recieved any grant,
 including `SHOW DATABASES`, on that table, either directly or through a role.
 
-##### RQ.SRS-006.RBAC.ShowDatabases.RequiredPrivilege
+#### RQ.SRS-006.RBAC.ShowDatabases.RequiredPrivilege
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `SHOW DATABASES` statement if and only if the user has **show databases** privilege,
 or any privilege on the database either directly or through a role.
 
-##### RQ.SRS-006.RBAC.ShowCreateDatabase.RequiredPrivilege
+#### RQ.SRS-006.RBAC.ShowCreateDatabase.RequiredPrivilege
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `SHOW CREATE DATABASE` statement if and only if the user has **show databases** privilege,
 or any privilege on the database either directly or through a role.
 
-##### RQ.SRS-006.RBAC.UseDatabase.RequiredPrivilege
+#### RQ.SRS-006.RBAC.UseDatabase.RequiredPrivilege
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `USE database` statement if and only if the user has **show databases** privilege,
 or any privilege on the database either directly or through a role.
 
-##### RQ.SRS-006.RBAC.ShowColumns.Privilege
+#### RQ.SRS-006.RBAC.ShowColumns.Privilege
 version: 1.0
 
 [ClickHouse] SHALL support granting or revoking the `SHOW COLUMNS` privilege.
 
-##### RQ.SRS-006.RBAC.ShowCreateTable.RequiredPrivilege
+#### RQ.SRS-006.RBAC.ShowCreateTable.RequiredPrivilege
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `SHOW CREATE TABLE` statement if and only if the user has **show columns** privilege on that table,
 either directly or through a role.
 
-##### RQ.SRS-006.RBAC.DescribeTable.RequiredPrivilege
+#### RQ.SRS-006.RBAC.DescribeTable.RequiredPrivilege
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `DESCRIBE table` statement if and only if the user has **show columns** privilege on that table,
 either directly or through a role.
 
-##### RQ.SRS-006.RBAC.ShowDictionaries.Privilege
+#### RQ.SRS-006.RBAC.ShowDictionaries.Privilege
 version: 1.0
 
 [ClickHouse] SHALL grant **show dictionaries** privilege on a dictionary to a user if that user has recieved any grant,
 including `SHOW DICTIONARIES`, on that dictionary, either directly or through a role.
 
-##### RQ.SRS-006.RBAC.ShowDictionaries.RequiredPrivilege
+#### RQ.SRS-006.RBAC.ShowDictionaries.RequiredPrivilege
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `SHOW DICTIONARIES` statement if and only if the user has **show dictionaries** privilege,
 or any privilege on the dictionary either directly or through a role.
 
-##### RQ.SRS-006.RBAC.ShowCreateDictionary.RequiredPrivilege
+#### RQ.SRS-006.RBAC.ShowCreateDictionary.RequiredPrivilege
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `SHOW CREATE DICTIONARY` statement if and only if the user has **show dictionaries** privilege,
 or any privilege on the dictionary either directly or through a role.
 
-##### RQ.SRS-006.RBAC.ExistsDictionary.RequiredPrivilege
+#### RQ.SRS-006.RBAC.ExistsDictionary.RequiredPrivilege
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `EXISTS dictionary` statement if and only if the user has **show dictionaries** privilege,
 or any privilege on the dictionary either directly or through a role.
 
-#### Access Management
+### Access Management
 
-##### RQ.SRS-006.RBAC.Privileges.CreateUser
+#### RQ.SRS-006.RBAC.Privileges.CreateUser
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `CREATE USER` statement if and only if the user has **create user** privilege,
 or either directly or through a role.
 
-##### RQ.SRS-006.RBAC.Privileges.CreateUser.DefaultRole
+#### RQ.SRS-006.RBAC.Privileges.CreateUser.DefaultRole
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `CREATE USER` statement with `DEFAULT ROLE <role>` clause if and only if
 the user has **create user** privilege and the role with **admin option**, or either directly or through a role.
 
-##### RQ.SRS-006.RBAC.Privileges.AlterUser
+#### RQ.SRS-006.RBAC.Privileges.AlterUser
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `ALTER USER` statement if and only if the user has **alter user** privilege,
 or either directly or through a role.
 
-##### RQ.SRS-006.RBAC.Privileges.DropUser
+#### RQ.SRS-006.RBAC.Privileges.DropUser
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `DROP USER` statement if and only if the user has **drop user** privilege,
 or either directly or through a role.
 
-##### RQ.SRS-006.RBAC.Privileges.CreateRole
+#### RQ.SRS-006.RBAC.Privileges.CreateRole
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `CREATE ROLE` statement if and only if the user has **create role** privilege,
 or either directly or through a role.
 
-##### RQ.SRS-006.RBAC.Privileges.AlterRole
+#### RQ.SRS-006.RBAC.Privileges.AlterRole
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `ALTER ROLE` statement if and only if the user has **alter role** privilege,
 or either directly or through a role.
 
-##### RQ.SRS-006.RBAC.Privileges.DropRole
+#### RQ.SRS-006.RBAC.Privileges.DropRole
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `DROP ROLE` statement if and only if the user has **drop role** privilege,
 or either directly or through a role.
 
-##### RQ.SRS-006.RBAC.Privileges.CreateRowPolicy
+#### RQ.SRS-006.RBAC.Privileges.CreateRowPolicy
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `CREATE ROW POLICY` statement if and only if the user has **create row policy** privilege,
 or either directly or through a role.
 
-##### RQ.SRS-006.RBAC.Privileges.AlterRowPolicy
+#### RQ.SRS-006.RBAC.Privileges.AlterRowPolicy
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `ALTER ROW POLICY` statement if and only if the user has **alter row policy** privilege,
 or either directly or through a role.
 
-##### RQ.SRS-006.RBAC.Privileges.DropRowPolicy
+#### RQ.SRS-006.RBAC.Privileges.DropRowPolicy
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `DROP ROW POLICY` statement if and only if the user has **drop row policy** privilege,
 or either directly or through a role.
 
-##### RQ.SRS-006.RBAC.Privileges.CreateQuota
+#### RQ.SRS-006.RBAC.Privileges.CreateQuota
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `CREATE QUOTA` statement if and only if the user has **create quota** privilege,
 or either directly or through a role.
 
-##### RQ.SRS-006.RBAC.Privileges.AlterQuota
+#### RQ.SRS-006.RBAC.Privileges.AlterQuota
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `ALTER QUOTA` statement if and only if the user has **alter quota** privilege,
 or either directly or through a role.
 
-##### RQ.SRS-006.RBAC.Privileges.DropQuota
+#### RQ.SRS-006.RBAC.Privileges.DropQuota
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `DROP QUOTA` statement if and only if the user has **drop quota** privilege,
 or either directly or through a role.
 
-##### RQ.SRS-006.RBAC.Privileges.CreateSettingsProfile
+#### RQ.SRS-006.RBAC.Privileges.CreateSettingsProfile
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `CREATE SETTINGS PROFILE` statement if and only if the user has **create settings profile** privilege,
 or either directly or through a role.
 
-##### RQ.SRS-006.RBAC.Privileges.AlterSettingsProfile
+#### RQ.SRS-006.RBAC.Privileges.AlterSettingsProfile
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `ALTER SETTINGS PROFILE` statement if and only if the user has **alter settings profile** privilege,
 or either directly or through a role.
 
-##### RQ.SRS-006.RBAC.Privileges.DropSettingsProfile
+#### RQ.SRS-006.RBAC.Privileges.DropSettingsProfile
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `DROP SETTINGS PROFILE` statement if and only if the user has **drop settings profile** privilege,
 or either directly or through a role.
 
-##### RQ.SRS-006.RBAC.Privileges.RoleAdmin
+#### RQ.SRS-006.RBAC.Privileges.RoleAdmin
 version: 1.0
 
 [ClickHouse] SHALL successfully execute any role grant or revoke by a user with `ROLE ADMIN` privilege.
 
-##### Show Access
+#### Show Access
 
-###### RQ.SRS-006.RBAC.ShowUsers.Privilege
+##### RQ.SRS-006.RBAC.ShowUsers.Privilege
 version: 1.0
 
 [ClickHouse] SHALL successfully grant `SHOW USERS` privilege when
 the user is granted `SHOW USERS`, `SHOW CREATE USER`, `SHOW ACCESS`, or `ACCESS MANAGEMENT`.
 
-###### RQ.SRS-006.RBAC.ShowUsers.RequiredPrivilege
+##### RQ.SRS-006.RBAC.ShowUsers.RequiredPrivilege
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `SHOW USERS` statement if and only if the user has **show users** privilege,
 either directly or through a role.
 
-###### RQ.SRS-006.RBAC.ShowCreateUser.RequiredPrivilege
+##### RQ.SRS-006.RBAC.ShowCreateUser.RequiredPrivilege
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `SHOW CREATE USER` statement if and only if the user has **show users** privilege,
 either directly or through a role.
 
-###### RQ.SRS-006.RBAC.ShowRoles.Privilege
+##### RQ.SRS-006.RBAC.ShowRoles.Privilege
 version: 1.0
 
 [ClickHouse] SHALL successfully grant `SHOW ROLES` privilege when
 the user is granted `SHOW ROLES`, `SHOW CREATE ROLE`, `SHOW ACCESS`, or `ACCESS MANAGEMENT`.
 
-###### RQ.SRS-006.RBAC.ShowRoles.RequiredPrivilege
+##### RQ.SRS-006.RBAC.ShowRoles.RequiredPrivilege
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `SHOW ROLES` statement if and only if the user has **show roles** privilege,
 either directly or through a role.
 
-###### RQ.SRS-006.RBAC.ShowCreateRole.RequiredPrivilege
+##### RQ.SRS-006.RBAC.ShowCreateRole.RequiredPrivilege
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `SHOW CREATE ROLE` statement if and only if the user has **show roles** privilege,
 either directly or through a role.
 
-###### RQ.SRS-006.RBAC.ShowRowPolicies.Privilege
+##### RQ.SRS-006.RBAC.ShowRowPolicies.Privilege
 version: 1.0
 
 [ClickHouse] SHALL successfully grant `SHOW ROW POLICIES` privilege when
 the user is granted `SHOW ROW POLICIES`, `SHOW POLICIES`, `SHOW CREATE ROW POLICY`,
 `SHOW CREATE POLICY`, `SHOW ACCESS`, or `ACCESS MANAGEMENT`.
 
-###### RQ.SRS-006.RBAC.ShowRowPolicies.RequiredPrivilege
+##### RQ.SRS-006.RBAC.ShowRowPolicies.RequiredPrivilege
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `SHOW ROW POLICIES` or `SHOW POLICIES` statement if and only if
 the user has **show row policies** privilege, either directly or through a role.
 
-###### RQ.SRS-006.RBAC.ShowCreateRowPolicy.RequiredPrivilege
+##### RQ.SRS-006.RBAC.ShowCreateRowPolicy.RequiredPrivilege
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `SHOW CREATE ROW POLICY` or `SHOW CREATE POLICY` statement
 if and only if the user has **show row policies** privilege,either directly or through a role.
 
-###### RQ.SRS-006.RBAC.ShowQuotas.Privilege
+##### RQ.SRS-006.RBAC.ShowQuotas.Privilege
 version: 1.0
 
 [ClickHouse] SHALL successfully grant `SHOW QUOTAS` privilege when
 the user is granted `SHOW QUOTAS`, `SHOW CREATE QUOTA`, `SHOW ACCESS`, or `ACCESS MANAGEMENT`.
 
-###### RQ.SRS-006.RBAC.ShowQuotas.RequiredPrivilege
+##### RQ.SRS-006.RBAC.ShowQuotas.RequiredPrivilege
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `SHOW QUOTAS` statement if and only if the user has **show quotas** privilege,
 either directly or through a role.
 
-###### RQ.SRS-006.RBAC.ShowCreateQuota.RequiredPrivilege
+##### RQ.SRS-006.RBAC.ShowCreateQuota.RequiredPrivilege
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `SHOW CREATE QUOTA` statement if and only if
 the user has **show quotas** privilege, either directly or through a role.
 
-###### RQ.SRS-006.RBAC.ShowSettingsProfiles.Privilege
+##### RQ.SRS-006.RBAC.ShowSettingsProfiles.Privilege
 version: 1.0
 
 [ClickHouse] SHALL successfully grant `SHOW SETTINGS PROFILES` privilege when
 the user is granted `SHOW SETTINGS PROFILES`, `SHOW PROFILES`, `SHOW CREATE SETTINGS PROFILE`,
 `SHOW SETTINGS PROFILE`, `SHOW ACCESS`, or `ACCESS MANAGEMENT`.
 
-###### RQ.SRS-006.RBAC.ShowSettingsProfiles.RequiredPrivilege
+##### RQ.SRS-006.RBAC.ShowSettingsProfiles.RequiredPrivilege
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `SHOW SETTINGS PROFILES` or `SHOW PROFILES` statement
 if and only if the user has **show settings profiles** privilege, either directly or through a role.
 
-###### RQ.SRS-006.RBAC.ShowCreateSettingsProfile.RequiredPrivilege
+##### RQ.SRS-006.RBAC.ShowCreateSettingsProfile.RequiredPrivilege
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `SHOW CREATE SETTINGS PROFILE` or `SHOW CREATE PROFILE` statement
 if and only if the user has **show settings profiles** privilege, either directly or through a role.
 
-#### dictGet
+### dictGet
 
-##### RQ.SRS-006.RBAC.dictGet.Privilege
+#### RQ.SRS-006.RBAC.dictGet.Privilege
 version: 1.0
 
 [ClickHouse] SHALL successfully grant `dictGet` privilege when
 the user is granted `dictGet`, `dictHas`, `dictGetHierarchy`, or `dictIsIn`.
 
-##### RQ.SRS-006.RBAC.dictGet.RequiredPrivilege
+#### RQ.SRS-006.RBAC.dictGet.RequiredPrivilege
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `dictGet` statement
 if and only if the user has **dictGet** privilege on that dictionary, either directly or through a role.
 
-##### RQ.SRS-006.RBAC.dictGet.Type.RequiredPrivilege
+#### RQ.SRS-006.RBAC.dictGet.Type.RequiredPrivilege
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `dictGet[TYPE]` statement
@@ -4141,270 +4219,283 @@ Available types:
 * UUID
 * String
 
-##### RQ.SRS-006.RBAC.dictGet.OrDefault.RequiredPrivilege
+#### RQ.SRS-006.RBAC.dictGet.OrDefault.RequiredPrivilege
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `dictGetOrDefault` statement
 if and only if the user has **dictGet** privilege on that dictionary, either directly or through a role.
 
-##### RQ.SRS-006.RBAC.dictHas.RequiredPrivilege
+#### RQ.SRS-006.RBAC.dictHas.RequiredPrivilege
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `dictHas` statement
 if and only if the user has **dictGet** privilege, either directly or through a role.
 
-##### RQ.SRS-006.RBAC.dictGetHierarchy.RequiredPrivilege
+#### RQ.SRS-006.RBAC.dictGetHierarchy.RequiredPrivilege
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `dictGetHierarchy` statement
 if and only if the user has **dictGet** privilege, either directly or through a role.
 
-##### RQ.SRS-006.RBAC.dictIsIn.RequiredPrivilege
+#### RQ.SRS-006.RBAC.dictIsIn.RequiredPrivilege
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `dictIsIn` statement
 if and only if the user has **dictGet** privilege, either directly or through a role.
 
-#### Introspection
+### Introspection
 
-##### RQ.SRS-006.RBAC.Privileges.Introspection
+#### RQ.SRS-006.RBAC.Privileges.Introspection
 version: 1.0
 
 [ClickHouse] SHALL successfully grant `INTROSPECTION` privilege when
 the user is granted `INTROSPECTION` or `INTROSPECTION FUNCTIONS`.
 
-##### RQ.SRS-006.RBAC.Privileges.Introspection.addressToLine
+#### RQ.SRS-006.RBAC.Privileges.Introspection.addressToLine
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `addressToLine` statement if and only if
 the user has **introspection** privilege, either directly or through a role.
 
-##### RQ.SRS-006.RBAC.Privileges.Introspection.addressToSymbol
+#### RQ.SRS-006.RBAC.Privileges.Introspection.addressToSymbol
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `addressToSymbol` statement if and only if
 the user has **introspection** privilege, either directly or through a role.
 
-##### RQ.SRS-006.RBAC.Privileges.Introspection.demangle
+#### RQ.SRS-006.RBAC.Privileges.Introspection.demangle
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `demangle` statement if and only if
 the user has **introspection** privilege, either directly or through a role.
 
-#### System
+### System
 
-##### RQ.SRS-006.RBAC.Privileges.System.Shutdown
+#### RQ.SRS-006.RBAC.Privileges.System.Shutdown
 version: 1.0
 
 [ClickHouse] SHALL successfully grant `SYSTEM SHUTDOWN` privilege when
 the user is granted `SYSTEM`, `SYSTEM SHUTDOWN`, `SHUTDOWN`,or `SYSTEM KILL`.
 
-##### RQ.SRS-006.RBAC.Privileges.System.DropCache
+#### RQ.SRS-006.RBAC.Privileges.System.DropCache
 version: 1.0
 
 [ClickHouse] SHALL successfully grant `SYSTEM DROP CACHE` privilege when
 the user is granted `SYSTEM`, `SYSTEM DROP CACHE`, or `DROP CACHE`.
 
-##### RQ.SRS-006.RBAC.Privileges.System.DropCache.DNS
+#### RQ.SRS-006.RBAC.Privileges.System.DropCache.DNS
 version: 1.0
 
 [ClickHouse] SHALL successfully grant `SYSTEM DROP DNS CACHE` privilege when
 the user is granted `SYSTEM`, `SYSTEM DROP CACHE`, `DROP CACHE`, `SYSTEM DROP DNS CACHE`,
 `SYSTEM DROP DNS`, `DROP DNS CACHE`, or `DROP DNS`.
 
-##### RQ.SRS-006.RBAC.Privileges.System.DropCache.Mark
+#### RQ.SRS-006.RBAC.Privileges.System.DropCache.Mark
 version: 1.0
 
 [ClickHouse] SHALL successfully grant `SYSTEM DROP MARK CACHE` privilege when
 the user is granted `SYSTEM`, `SYSTEM DROP CACHE`, `DROP CACHE`, `SYSTEM DROP MARK CACHE`,
 `SYSTEM DROP MARK`, `DROP MARK CACHE`, or `DROP MARKS`.
 
-##### RQ.SRS-006.RBAC.Privileges.System.DropCache.Uncompressed
+#### RQ.SRS-006.RBAC.Privileges.System.DropCache.Uncompressed
 version: 1.0
 
 [ClickHouse] SHALL successfully grant `SYSTEM DROP UNCOMPRESSED CACHE` privilege when
 the user is granted `SYSTEM`, `SYSTEM DROP CACHE`, `DROP CACHE`, `SYSTEM DROP UNCOMPRESSED CACHE`,
 `SYSTEM DROP UNCOMPRESSED`, `DROP UNCOMPRESSED CACHE`, or `DROP UNCOMPRESSED`.
 
-##### RQ.SRS-006.RBAC.Privileges.System.Reload
+#### RQ.SRS-006.RBAC.Privileges.System.Reload
 version: 1.0
 
 [ClickHouse] SHALL successfully grant `SYSTEM RELOAD` privilege when
 the user is granted `SYSTEM` or `SYSTEM RELOAD`.
 
-##### RQ.SRS-006.RBAC.Privileges.System.Reload.Config
+#### RQ.SRS-006.RBAC.Privileges.System.Reload.Config
 version: 1.0
 
 [ClickHouse] SHALL successfully grant `SYSTEM RELOAD CONFIG` privilege when
 the user is granted `SYSTEM`, `SYSTEM RELOAD`, `SYSTEM RELOAD CONFIG`, or `RELOAD CONFIG`.
 
-##### RQ.SRS-006.RBAC.Privileges.System.Reload.Dictionary
+#### RQ.SRS-006.RBAC.Privileges.System.Reload.Dictionary
 version: 1.0
 
 [ClickHouse] SHALL successfully grant `SYSTEM RELOAD DICTIONARY` privilege when
 the user is granted `SYSTEM`, `SYSTEM RELOAD`, `SYSTEM RELOAD DICTIONARIES`, `RELOAD DICTIONARIES`, or `RELOAD DICTIONARY`.
 
-##### RQ.SRS-006.RBAC.Privileges.System.Reload.Dictionaries
+#### RQ.SRS-006.RBAC.Privileges.System.Reload.Dictionaries
 version: 1.0
 
 [ClickHouse] SHALL successfully grant `SYSTEM RELOAD DICTIONARIES` privilege when
 the user is granted `SYSTEM`, `SYSTEM RELOAD`, `SYSTEM RELOAD DICTIONARIES`, `RELOAD DICTIONARIES`, or `RELOAD DICTIONARY`.
 
-##### RQ.SRS-006.RBAC.Privileges.System.Reload.EmbeddedDictionaries
+#### RQ.SRS-006.RBAC.Privileges.System.Reload.EmbeddedDictionaries
 version: 1.0
 
 [ClickHouse] SHALL successfully grant `SYSTEM RELOAD EMBEDDED DICTIONARIES` privilege when
 the user is granted `SYSTEM`, `SYSTEM RELOAD`, `SYSTEM RELOAD DICTIONARY ON *.*`, or `SYSTEM RELOAD EMBEDDED DICTIONARIES`.
 
-##### RQ.SRS-006.RBAC.Privileges.System.Merges
+#### RQ.SRS-006.RBAC.Privileges.System.Merges
 version: 1.0
 
 [ClickHouse] SHALL successfully grant `SYSTEM MERGES` privilege when
 the user is granted `SYSTEM`, `SYSTEM MERGES`, `SYSTEM STOP MERGES`, `SYSTEM START MERGES`, `STOP MERGES`, or `START MERGES`.
 
-##### RQ.SRS-006.RBAC.Privileges.System.TTLMerges
+#### RQ.SRS-006.RBAC.Privileges.System.TTLMerges
 version: 1.0
 
 [ClickHouse] SHALL successfully grant `SYSTEM TTL MERGES` privilege when
 the user is granted `SYSTEM`, `SYSTEM TTL MERGES`, `SYSTEM STOP TTL MERGES`, `SYSTEM START TTL MERGES`, `STOP TTL MERGES`, or `START TTL MERGES`.
 
-##### RQ.SRS-006.RBAC.Privileges.System.Fetches
+#### RQ.SRS-006.RBAC.Privileges.System.Fetches
 version: 1.0
 
 [ClickHouse] SHALL successfully grant `SYSTEM FETCHES` privilege when
 the user is granted `SYSTEM`, `SYSTEM FETCHES`, `SYSTEM STOP FETCHES`, `SYSTEM START FETCHES`, `STOP FETCHES`, or `START FETCHES`.
 
-##### RQ.SRS-006.RBAC.Privileges.System.Moves
+#### RQ.SRS-006.RBAC.Privileges.System.Moves
 version: 1.0
 
 [ClickHouse] SHALL successfully grant `SYSTEM MOVES` privilege when
 the user is granted `SYSTEM`, `SYSTEM MOVES`, `SYSTEM STOP MOVES`, `SYSTEM START MOVES`, `STOP MOVES`, or `START MOVES`.
 
-##### RQ.SRS-006.RBAC.Privileges.System.Sends
+#### RQ.SRS-006.RBAC.Privileges.System.Sends
 version: 1.0
 
 [ClickHouse] SHALL successfully grant `SYSTEM SENDS` privilege when
 the user is granted `SYSTEM`, `SYSTEM SENDS`, `SYSTEM STOP SENDS`, `SYSTEM START SENDS`, `STOP SENDS`, or `START SENDS`.
 
-##### RQ.SRS-006.RBAC.Privileges.System.Sends.Distributed
+#### RQ.SRS-006.RBAC.Privileges.System.Sends.Distributed
 version: 1.0
 
 [ClickHouse] SHALL successfully grant `SYSTEM DISTRIBUTED SENDS` privilege when
 the user is granted `SYSTEM`, `SYSTEM DISTRIBUTED SENDS`, `SYSTEM STOP DISTRIBUTED SENDS`,
 `SYSTEM START DISTRIBUTED SENDS`, `STOP DISTRIBUTED SENDS`, or `START DISTRIBUTED SENDS`.
 
-##### RQ.SRS-006.RBAC.Privileges.System.Sends.Replicated
+#### RQ.SRS-006.RBAC.Privileges.System.Sends.Replicated
 version: 1.0
 
 [ClickHouse] SHALL successfully grant `SYSTEM REPLICATED SENDS` privilege when
 the user is granted `SYSTEM`, `SYSTEM REPLICATED SENDS`, `SYSTEM STOP REPLICATED SENDS`,
 `SYSTEM START REPLICATED SENDS`, `STOP REPLICATED SENDS`, or `START REPLICATED SENDS`.
 
-##### RQ.SRS-006.RBAC.Privileges.System.ReplicationQueues
+#### RQ.SRS-006.RBAC.Privileges.System.ReplicationQueues
 version: 1.0
 
 [ClickHouse] SHALL successfully grant `SYSTEM REPLICATION QUEUES` privilege when
 the user is granted `SYSTEM`, `SYSTEM REPLICATION QUEUES`, `SYSTEM STOP REPLICATION QUEUES`,
 `SYSTEM START REPLICATION QUEUES`, `STOP REPLICATION QUEUES`, or `START REPLICATION QUEUES`.
 
-##### RQ.SRS-006.RBAC.Privileges.System.SyncReplica
+#### RQ.SRS-006.RBAC.Privileges.System.SyncReplica
 version: 1.0
 
 [ClickHouse] SHALL successfully grant `SYSTEM SYNC REPLICA` privilege when
 the user is granted `SYSTEM`, `SYSTEM SYNC REPLICA`, or `SYNC REPLICA`.
 
-##### RQ.SRS-006.RBAC.Privileges.System.RestartReplica
+#### RQ.SRS-006.RBAC.Privileges.System.RestartReplica
 version: 1.0
 
 [ClickHouse] SHALL successfully grant `SYSTEM RESTART REPLICA` privilege when
 the user is granted `SYSTEM`, `SYSTEM RESTART REPLICA`, or `RESTART REPLICA`.
 
-##### RQ.SRS-006.RBAC.Privileges.System.Flush
+#### RQ.SRS-006.RBAC.Privileges.System.Flush
 version: 1.0
 
 [ClickHouse] SHALL successfully grant `SYSTEM FLUSH` privilege when
 the user is granted `SYSTEM` or `SYSTEM FLUSH`.
 
-##### RQ.SRS-006.RBAC.Privileges.System.Flush.Distributed
+#### RQ.SRS-006.RBAC.Privileges.System.Flush.Distributed
 version: 1.0
 
 [ClickHouse] SHALL successfully grant `SYSTEM FLUSH DISTRIBUTED` privilege when
 the user is granted `SYSTEM`, `SYSTEM FLUSH DISTRIBUTED`, or `FLUSH DISTRIBUTED`.
 
-##### RQ.SRS-006.RBAC.Privileges.System.Flush.Logs
+#### RQ.SRS-006.RBAC.Privileges.System.Flush.Logs
 version: 1.0
 
 [ClickHouse] SHALL successfully grant `SYSTEM FLUSH LOGS` privilege when
 the user is granted `SYSTEM`, `SYSTEM FLUSH LOGS`, or `FLUSH LOGS`.
 
-#### Sources
+### Sources
 
-##### RQ.SRS-006.RBAC.Privileges.Sources
+#### RQ.SRS-006.RBAC.Privileges.Sources
 version: 1.0
 
 [ClickHouse] SHALL support granting or revoking `SOURCES` privilege from
 the user, either directly or through a role.
 
-##### RQ.SRS-006.RBAC.Privileges.Sources.File
+#### RQ.SRS-006.RBAC.Privileges.Sources.File
 version: 1.0
 
 [ClickHouse] SHALL support the use of `FILE` source by a user if and only if
 the user has `FILE` or `SOURCES` privileges granted to them directly or through a role.
 
-##### RQ.SRS-006.RBAC.Privileges.Sources.URL
+#### RQ.SRS-006.RBAC.Privileges.Sources.URL
 version: 1.0
 
 [ClickHouse] SHALL support the use of `URL` source by a user if and only if
 the user has `URL` or `SOURCES` privileges granted to them directly or through a role.
 
-##### RQ.SRS-006.RBAC.Privileges.Sources.Remote
+#### RQ.SRS-006.RBAC.Privileges.Sources.Remote
 version: 1.0
 
 [ClickHouse] SHALL support the use of `REMOTE` source by a user if and only if
 the user has `REMOTE` or `SOURCES` privileges granted to them directly or through a role.
 
-##### RQ.SRS-006.RBAC.Privileges.Sources.MySQL
+#### RQ.SRS-006.RBAC.Privileges.Sources.MySQL
 version: 1.0
 
 [ClickHouse] SHALL support the use of `MySQL` source by a user if and only if
 the user has `MySQL` or `SOURCES` privileges granted to them directly or through a role.
 
-##### RQ.SRS-006.RBAC.Privileges.Sources.ODBC
+#### RQ.SRS-006.RBAC.Privileges.Sources.ODBC
 version: 1.0
 
 [ClickHouse] SHALL support the use of `ODBC` source by a user if and only if
 the user has `ODBC` or `SOURCES` privileges granted to them directly or through a role.
 
-##### RQ.SRS-006.RBAC.Privileges.Sources.JDBC
+#### RQ.SRS-006.RBAC.Privileges.Sources.JDBC
 version: 1.0
 
 [ClickHouse] SHALL support the use of `JDBC` source by a user if and only if
 the user has `JDBC` or `SOURCES` privileges granted to them directly or through a role.
 
-##### RQ.SRS-006.RBAC.Privileges.Sources.HDFS
+#### RQ.SRS-006.RBAC.Privileges.Sources.HDFS
 version: 1.0
 
 [ClickHouse] SHALL support the use of `HDFS` source by a user if and only if
 the user has `HDFS` or `SOURCES` privileges granted to them directly or through a role.
 
-##### RQ.SRS-006.RBAC.Privileges.Sources.S3
+#### RQ.SRS-006.RBAC.Privileges.Sources.S3
 version: 1.0
 
 [ClickHouse] SHALL support the use of `S3` source by a user if and only if
 the user has `S3` or `SOURCES` privileges granted to them directly or through a role.
 
-#### RQ.SRS-006.RBAC.Privileges.GrantOption
+### RQ.SRS-006.RBAC.Privileges.GrantOption
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `GRANT` or `REVOKE` privilege statements by a user if and only if
 the user has that privilege with `GRANT OPTION`, either directly or through a role.
 
-#### RQ.SRS-006.RBAC.Privileges.All
+### RQ.SRS-006.RBAC.Privileges.All
 version: 1.0
 
-[ClickHouse] SHALL support granting or revoking `ALL` privilege.
+[ClickHouse] SHALL support granting or revoking `ALL` privilege
+using `GRANT ALL ON *.* TO user`.
 
-#### RQ.SRS-006.RBAC.Privileges.AdminOption
+### RQ.SRS-006.RBAC.Privileges.RoleAll
+version: 1.0
+
+[ClickHouse] SHALL support granting a role named `ALL` using `GRANT ALL TO user`.
+This shall only grant the user the privileges that have been granted to the role.
+
+### RQ.SRS-006.RBAC.Privileges.None
+version: 1.0
+
+[ClickHouse] SHALL support granting or revoking `NONE` privilege
+using `GRANT NONE TO user` or `GRANT USAGE ON *.* TO user`.
+
+### RQ.SRS-006.RBAC.Privileges.AdminOption
 version: 1.0
 
 [ClickHouse] SHALL support a user granting or revoking a role if and only if
diff --git a/tests/testflows/rbac/requirements/requirements.py b/tests/testflows/rbac/requirements/requirements.py
index f276d811f19..27f455d3fe6 100755
--- a/tests/testflows/rbac/requirements/requirements.py
+++ b/tests/testflows/rbac/requirements/requirements.py
@@ -1,28 +1,9983 @@
 # These requirements were auto generated
 # from software requirements specification (SRS)
-# document by TestFlows v1.6.201124.1002350.
+# document by TestFlows v1.6.201216.1172002.
 # Do not edit by hand but re-generate instead
 # using 'tfs requirements generate' command.
 from testflows.core import Specification
 from testflows.core import Requirement
 
+Heading = Specification.Heading
+
+RQ_SRS_006_RBAC = Requirement(
+    name='RQ.SRS-006.RBAC',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support role based access control.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.1.1')
+
+RQ_SRS_006_RBAC_Login = Requirement(
+    name='RQ.SRS-006.RBAC.Login',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL only allow access to the server for a given\n'
+        'user only when correct username and password are used during\n'
+        'the connection to the server.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.2.1')
+
+RQ_SRS_006_RBAC_Login_DefaultUser = Requirement(
+    name='RQ.SRS-006.RBAC.Login.DefaultUser',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL use the **default user** when no username and password\n'
+        'are specified during the connection to the server.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.2.2')
+
+RQ_SRS_006_RBAC_User = Requirement(
+    name='RQ.SRS-006.RBAC.User',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support creation and manipulation of\n'
+        'one or more **user** accounts to which roles, privileges,\n'
+        'settings profile, quotas and row policies can be assigned.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.3.1')
+
+RQ_SRS_006_RBAC_User_Roles = Requirement(
+    name='RQ.SRS-006.RBAC.User.Roles',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support assigning one or more **roles**\n'
+        'to a **user**.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.3.2')
+
+RQ_SRS_006_RBAC_User_Privileges = Requirement(
+    name='RQ.SRS-006.RBAC.User.Privileges',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support assigning one or more privileges to a **user**.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.3.3')
+
+RQ_SRS_006_RBAC_User_Variables = Requirement(
+    name='RQ.SRS-006.RBAC.User.Variables',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support assigning one or more variables to a **user**.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.3.4')
+
+RQ_SRS_006_RBAC_User_Variables_Constraints = Requirement(
+    name='RQ.SRS-006.RBAC.User.Variables.Constraints',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support assigning min, max and read-only constraints\n'
+        'for the variables that can be set and read by the **user**.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.3.5')
+
+RQ_SRS_006_RBAC_User_SettingsProfile = Requirement(
+    name='RQ.SRS-006.RBAC.User.SettingsProfile',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support assigning one or more **settings profiles**\n'
+        'to a **user**.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.3.6')
+
+RQ_SRS_006_RBAC_User_Quotas = Requirement(
+    name='RQ.SRS-006.RBAC.User.Quotas',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support assigning one or more **quotas** to a **user**.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.3.7')
+
+RQ_SRS_006_RBAC_User_RowPolicies = Requirement(
+    name='RQ.SRS-006.RBAC.User.RowPolicies',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support assigning one or more **row policies** to a **user**.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.3.8')
+
+RQ_SRS_006_RBAC_User_DefaultRole = Requirement(
+    name='RQ.SRS-006.RBAC.User.DefaultRole',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support assigning a default role to a **user**.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.3.9')
+
+RQ_SRS_006_RBAC_User_RoleSelection = Requirement(
+    name='RQ.SRS-006.RBAC.User.RoleSelection',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support selection of one or more **roles** from the available roles\n'
+        'that are assigned to a **user** using `SET ROLE` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.3.10')
+
+RQ_SRS_006_RBAC_User_ShowCreate = Requirement(
+    name='RQ.SRS-006.RBAC.User.ShowCreate',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support showing the command of how **user** account was created.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.3.11')
+
+RQ_SRS_006_RBAC_User_ShowPrivileges = Requirement(
+    name='RQ.SRS-006.RBAC.User.ShowPrivileges',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support listing the privileges of the **user**.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.3.12')
+
+RQ_SRS_006_RBAC_User_Use_DefaultRole = Requirement(
+    name='RQ.SRS-006.RBAC.User.Use.DefaultRole',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL by default use default role or roles assigned\n'
+        'to the user if specified.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.3.13')
+
+RQ_SRS_006_RBAC_User_Use_AllRolesWhenNoDefaultRole = Requirement(
+    name='RQ.SRS-006.RBAC.User.Use.AllRolesWhenNoDefaultRole',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL by default use all the roles assigned to the user\n'
+        'if no default role or roles are specified for the user.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.3.14')
+
+RQ_SRS_006_RBAC_User_Create = Requirement(
+    name='RQ.SRS-006.RBAC.User.Create',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support creating **user** accounts using `CREATE USER` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.3.15.1')
+
+RQ_SRS_006_RBAC_User_Create_IfNotExists = Requirement(
+    name='RQ.SRS-006.RBAC.User.Create.IfNotExists',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support `IF NOT EXISTS` clause in the `CREATE USER` statement\n'
+        'to skip raising an exception if a user with the same **name** already exists.\n'
+        'If the `IF NOT EXISTS` clause is not specified then an exception SHALL be\n'
+        'raised if a user with the same **name** already exists.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.3.15.2')
+
+RQ_SRS_006_RBAC_User_Create_Replace = Requirement(
+    name='RQ.SRS-006.RBAC.User.Create.Replace',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support `OR REPLACE` clause in the `CREATE USER` statement\n'
+        'to replace existing user account if already exists.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.3.15.3')
+
+RQ_SRS_006_RBAC_User_Create_Password_NoPassword = Requirement(
+    name='RQ.SRS-006.RBAC.User.Create.Password.NoPassword',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support specifying no password when creating\n'
+        'user account using `IDENTIFIED WITH NO_PASSWORD` clause .\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.3.15.4')
+
+RQ_SRS_006_RBAC_User_Create_Password_NoPassword_Login = Requirement(
+    name='RQ.SRS-006.RBAC.User.Create.Password.NoPassword.Login',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL use no password for the user when connecting to the server\n'
+        'when an account was created with `IDENTIFIED WITH NO_PASSWORD` clause.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.3.15.5')
+
+RQ_SRS_006_RBAC_User_Create_Password_PlainText = Requirement(
+    name='RQ.SRS-006.RBAC.User.Create.Password.PlainText',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support specifying plaintext password when creating\n'
+        'user account using `IDENTIFIED WITH PLAINTEXT_PASSWORD BY` clause.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.3.15.6')
+
+RQ_SRS_006_RBAC_User_Create_Password_PlainText_Login = Requirement(
+    name='RQ.SRS-006.RBAC.User.Create.Password.PlainText.Login',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL use the plaintext password passed by the user when connecting to the server\n'
+        'when an account was created with `IDENTIFIED WITH PLAINTEXT_PASSWORD` clause\n'
+        'and compare the password with the one used in the `CREATE USER` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.3.15.7')
+
+RQ_SRS_006_RBAC_User_Create_Password_Sha256Password = Requirement(
+    name='RQ.SRS-006.RBAC.User.Create.Password.Sha256Password',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support specifying the result of applying SHA256\n'
+        'to some password when creating user account using `IDENTIFIED WITH SHA256_PASSWORD BY` or `IDENTIFIED BY`\n'
+        'clause.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.3.15.8')
+
+RQ_SRS_006_RBAC_User_Create_Password_Sha256Password_Login = Requirement(
+    name='RQ.SRS-006.RBAC.User.Create.Password.Sha256Password.Login',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL calculate `SHA256` of the password passed by the user when connecting to the server\n'
+        "when an account was created with `IDENTIFIED WITH SHA256_PASSWORD` or with 'IDENTIFIED BY' clause\n"
+        'and compare the calculated hash to the one used in the `CREATE USER` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.3.15.9')
+
+RQ_SRS_006_RBAC_User_Create_Password_Sha256Hash = Requirement(
+    name='RQ.SRS-006.RBAC.User.Create.Password.Sha256Hash',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support specifying the result of applying SHA256\n'
+        'to some already calculated hash when creating user account using `IDENTIFIED WITH SHA256_HASH`\n'
+        'clause.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.3.15.10')
+
+RQ_SRS_006_RBAC_User_Create_Password_Sha256Hash_Login = Requirement(
+    name='RQ.SRS-006.RBAC.User.Create.Password.Sha256Hash.Login',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL calculate `SHA256` of the already calculated hash passed by\n'
+        'the user when connecting to the server\n'
+        'when an account was created with `IDENTIFIED WITH SHA256_HASH` clause\n'
+        'and compare the calculated hash to the one used in the `CREATE USER` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.3.15.11')
+
+RQ_SRS_006_RBAC_User_Create_Password_DoubleSha1Password = Requirement(
+    name='RQ.SRS-006.RBAC.User.Create.Password.DoubleSha1Password',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support specifying the result of applying SHA1 two times\n'
+        'to a password when creating user account using `IDENTIFIED WITH DOUBLE_SHA1_PASSWORD`\n'
+        'clause.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.3.15.12')
+
+RQ_SRS_006_RBAC_User_Create_Password_DoubleSha1Password_Login = Requirement(
+    name='RQ.SRS-006.RBAC.User.Create.Password.DoubleSha1Password.Login',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL calculate `SHA1` two times over the password passed by\n'
+        'the user when connecting to the server\n'
+        'when an account was created with `IDENTIFIED WITH DOUBLE_SHA1_PASSWORD` clause\n'
+        'and compare the calculated value to the one used in the `CREATE USER` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.3.15.13')
+
+RQ_SRS_006_RBAC_User_Create_Password_DoubleSha1Hash = Requirement(
+    name='RQ.SRS-006.RBAC.User.Create.Password.DoubleSha1Hash',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support specifying the result of applying SHA1 two times\n'
+        'to a hash when creating user account using `IDENTIFIED WITH DOUBLE_SHA1_HASH`\n'
+        'clause.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.3.15.14')
+
+RQ_SRS_006_RBAC_User_Create_Password_DoubleSha1Hash_Login = Requirement(
+    name='RQ.SRS-006.RBAC.User.Create.Password.DoubleSha1Hash.Login',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL calculate `SHA1` two times over the hash passed by\n'
+        'the user when connecting to the server\n'
+        'when an account was created with `IDENTIFIED WITH DOUBLE_SHA1_HASH` clause\n'
+        'and compare the calculated value to the one used in the `CREATE USER` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.3.15.15')
+
+RQ_SRS_006_RBAC_User_Create_Host_Name = Requirement(
+    name='RQ.SRS-006.RBAC.User.Create.Host.Name',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support specifying one or more hostnames from\n'
+        'which user can access the server using the `HOST NAME` clause\n'
+        'in the `CREATE USER` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.3.15.16')
+
+RQ_SRS_006_RBAC_User_Create_Host_Regexp = Requirement(
+    name='RQ.SRS-006.RBAC.User.Create.Host.Regexp',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support specifying one or more regular expressions\n'
+        'to match hostnames from which user can access the server\n'
+        'using the `HOST REGEXP` clause in the `CREATE USER` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.3.15.17')
+
+RQ_SRS_006_RBAC_User_Create_Host_IP = Requirement(
+    name='RQ.SRS-006.RBAC.User.Create.Host.IP',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support specifying one or more IP address or subnet from\n'
+        'which user can access the server using the `HOST IP` clause in the\n'
+        '`CREATE USER` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.3.15.18')
+
+RQ_SRS_006_RBAC_User_Create_Host_Any = Requirement(
+    name='RQ.SRS-006.RBAC.User.Create.Host.Any',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support specifying `HOST ANY` clause in the `CREATE USER` statement\n'
+        'to indicate that user can access the server from any host.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.3.15.19')
+
+RQ_SRS_006_RBAC_User_Create_Host_None = Requirement(
+    name='RQ.SRS-006.RBAC.User.Create.Host.None',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support fobidding access from any host using `HOST NONE` clause in the\n'
+        '`CREATE USER` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.3.15.20')
+
+RQ_SRS_006_RBAC_User_Create_Host_Local = Requirement(
+    name='RQ.SRS-006.RBAC.User.Create.Host.Local',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support limiting user access to local only using `HOST LOCAL` clause in the\n'
+        '`CREATE USER` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.3.15.21')
+
+RQ_SRS_006_RBAC_User_Create_Host_Like = Requirement(
+    name='RQ.SRS-006.RBAC.User.Create.Host.Like',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support specifying host using `LIKE` command syntax using the\n'
+        '`HOST LIKE` clause in the `CREATE USER` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.3.15.22')
+
+RQ_SRS_006_RBAC_User_Create_Host_Default = Requirement(
+    name='RQ.SRS-006.RBAC.User.Create.Host.Default',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support user access to server from any host\n'
+        'if no `HOST` clause is specified in the `CREATE USER` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.3.15.23')
+
+RQ_SRS_006_RBAC_User_Create_DefaultRole = Requirement(
+    name='RQ.SRS-006.RBAC.User.Create.DefaultRole',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support specifying one or more default roles\n'
+        'using `DEFAULT ROLE` clause in the `CREATE USER` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.3.15.24')
+
+RQ_SRS_006_RBAC_User_Create_DefaultRole_None = Requirement(
+    name='RQ.SRS-006.RBAC.User.Create.DefaultRole.None',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support specifying no default roles\n'
+        'using `DEFAULT ROLE NONE` clause in the `CREATE USER` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.3.15.25')
+
+RQ_SRS_006_RBAC_User_Create_DefaultRole_All = Requirement(
+    name='RQ.SRS-006.RBAC.User.Create.DefaultRole.All',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support specifying all roles to be used as default\n'
+        'using `DEFAULT ROLE ALL` clause in the `CREATE USER` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.3.15.26')
+
+RQ_SRS_006_RBAC_User_Create_Settings = Requirement(
+    name='RQ.SRS-006.RBAC.User.Create.Settings',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support specifying settings and profile\n'
+        'using `SETTINGS` clause in the `CREATE USER` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.3.15.27')
+
+RQ_SRS_006_RBAC_User_Create_OnCluster = Requirement(
+    name='RQ.SRS-006.RBAC.User.Create.OnCluster',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support specifying cluster on which the user\n'
+        'will be created using `ON CLUSTER` clause in the `CREATE USER` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.3.15.28')
+
+RQ_SRS_006_RBAC_User_Create_Syntax = Requirement(
+    name='RQ.SRS-006.RBAC.User.Create.Syntax',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support the following syntax for `CREATE USER` statement.\n'
+        '\n'
+        '```sql\n'
+        'CREATE USER [IF NOT EXISTS | OR REPLACE] name [ON CLUSTER cluster_name]\n'
+        "    [IDENTIFIED [WITH {NO_PASSWORD|PLAINTEXT_PASSWORD|SHA256_PASSWORD|SHA256_HASH|DOUBLE_SHA1_PASSWORD|DOUBLE_SHA1_HASH}] BY {'password'|'hash'}]\n"
+        "    [HOST {LOCAL | NAME 'name' | NAME REGEXP 'name_regexp' | IP 'address' | LIKE 'pattern'} [,...] | ANY | NONE]\n"
+        '    [DEFAULT ROLE role [,...]]\n'
+        "    [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | PROFILE 'profile_name'] [,...]\n"
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.3.15.29')
+
+RQ_SRS_006_RBAC_User_Alter = Requirement(
+    name='RQ.SRS-006.RBAC.User.Alter',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support altering **user** accounts using `ALTER USER` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.3.16.1')
+
+RQ_SRS_006_RBAC_User_Alter_OrderOfEvaluation = Requirement(
+    name='RQ.SRS-006.RBAC.User.Alter.OrderOfEvaluation',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support evaluating `ALTER USER` statement from left to right\n'
+        'where things defined on the right override anything that was previously defined on\n'
+        'the left.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.3.16.2')
+
+RQ_SRS_006_RBAC_User_Alter_IfExists = Requirement(
+    name='RQ.SRS-006.RBAC.User.Alter.IfExists',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support `IF EXISTS` clause in the `ALTER USER` statement\n'
+        'to skip raising an exception (producing a warning instead) if a user with the specified **name** does not exist.\n'
+        'If the `IF EXISTS` clause is not specified then an exception SHALL be raised if a user with the **name** does not exist.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.3.16.3')
+
+RQ_SRS_006_RBAC_User_Alter_Cluster = Requirement(
+    name='RQ.SRS-006.RBAC.User.Alter.Cluster',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support specifying the cluster the user is on\n'
+        'when altering user account using `ON CLUSTER` clause in the `ALTER USER` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.3.16.4')
+
+RQ_SRS_006_RBAC_User_Alter_Rename = Requirement(
+    name='RQ.SRS-006.RBAC.User.Alter.Rename',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support specifying a new name for the user when\n'
+        'altering user account using `RENAME` clause in the `ALTER USER` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.3.16.5')
+
+RQ_SRS_006_RBAC_User_Alter_Password_PlainText = Requirement(
+    name='RQ.SRS-006.RBAC.User.Alter.Password.PlainText',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support specifying plaintext password when altering\n'
+        'user account using `IDENTIFIED WITH PLAINTEXT_PASSWORD BY` or\n'
+        'using shorthand `IDENTIFIED BY` clause in the `ALTER USER` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.3.16.6')
+
+RQ_SRS_006_RBAC_User_Alter_Password_Sha256Password = Requirement(
+    name='RQ.SRS-006.RBAC.User.Alter.Password.Sha256Password',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support specifying the result of applying SHA256\n'
+        'to some password as identification when altering user account using\n'
+        '`IDENTIFIED WITH SHA256_PASSWORD` clause in the `ALTER USER` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.3.16.7')
+
+RQ_SRS_006_RBAC_User_Alter_Password_DoubleSha1Password = Requirement(
+    name='RQ.SRS-006.RBAC.User.Alter.Password.DoubleSha1Password',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support specifying the result of applying Double SHA1\n'
+        'to some password as identification when altering user account using\n'
+        '`IDENTIFIED WITH DOUBLE_SHA1_PASSWORD` clause in the `ALTER USER` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.3.16.8')
+
+RQ_SRS_006_RBAC_User_Alter_Host_AddDrop = Requirement(
+    name='RQ.SRS-006.RBAC.User.Alter.Host.AddDrop',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support altering user by adding and dropping access to hosts\n'
+        'with the `ADD HOST` or the `DROP HOST` in the `ALTER USER` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.3.16.9')
+
+RQ_SRS_006_RBAC_User_Alter_Host_Local = Requirement(
+    name='RQ.SRS-006.RBAC.User.Alter.Host.Local',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support limiting user access to local only using `HOST LOCAL` clause in the\n'
+        '`ALTER USER` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.3.16.10')
+
+RQ_SRS_006_RBAC_User_Alter_Host_Name = Requirement(
+    name='RQ.SRS-006.RBAC.User.Alter.Host.Name',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support specifying one or more hostnames from\n'
+        'which user can access the server using the `HOST NAME` clause\n'
+        'in the `ALTER USER` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.3.16.11')
+
+RQ_SRS_006_RBAC_User_Alter_Host_Regexp = Requirement(
+    name='RQ.SRS-006.RBAC.User.Alter.Host.Regexp',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support specifying one or more regular expressions\n'
+        'to match hostnames from which user can access the server\n'
+        'using the `HOST REGEXP` clause in the `ALTER USER` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.3.16.12')
+
+RQ_SRS_006_RBAC_User_Alter_Host_IP = Requirement(
+    name='RQ.SRS-006.RBAC.User.Alter.Host.IP',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support specifying one or more IP address or subnet from\n'
+        'which user can access the server using the `HOST IP` clause in the\n'
+        '`ALTER USER` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.3.16.13')
+
+RQ_SRS_006_RBAC_User_Alter_Host_Like = Requirement(
+    name='RQ.SRS-006.RBAC.User.Alter.Host.Like',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support specifying one or more similar hosts using `LIKE` command syntax\n'
+        'using the `HOST LIKE` clause in the `ALTER USER` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.3.16.14')
+
+RQ_SRS_006_RBAC_User_Alter_Host_Any = Requirement(
+    name='RQ.SRS-006.RBAC.User.Alter.Host.Any',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support specifying `HOST ANY` clause in the `ALTER USER` statement\n'
+        'to indicate that user can access the server from any host.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.3.16.15')
+
+RQ_SRS_006_RBAC_User_Alter_Host_None = Requirement(
+    name='RQ.SRS-006.RBAC.User.Alter.Host.None',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support fobidding access from any host using `HOST NONE` clause in the\n'
+        '`ALTER USER` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.3.16.16')
+
+RQ_SRS_006_RBAC_User_Alter_DefaultRole = Requirement(
+    name='RQ.SRS-006.RBAC.User.Alter.DefaultRole',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support specifying one or more default roles\n'
+        'using `DEFAULT ROLE` clause in the `ALTER USER` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.3.16.17')
+
+RQ_SRS_006_RBAC_User_Alter_DefaultRole_All = Requirement(
+    name='RQ.SRS-006.RBAC.User.Alter.DefaultRole.All',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support specifying all roles to be used as default\n'
+        'using `DEFAULT ROLE ALL` clause in the `ALTER USER` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.3.16.18')
+
+RQ_SRS_006_RBAC_User_Alter_DefaultRole_AllExcept = Requirement(
+    name='RQ.SRS-006.RBAC.User.Alter.DefaultRole.AllExcept',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support specifying one or more roles which will not be used as default\n'
+        'using `DEFAULT ROLE ALL EXCEPT` clause in the `ALTER USER` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.3.16.19')
+
+RQ_SRS_006_RBAC_User_Alter_Settings = Requirement(
+    name='RQ.SRS-006.RBAC.User.Alter.Settings',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support specifying one or more variables\n'
+        'using `SETTINGS` clause in the `ALTER USER` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.3.16.20')
+
+RQ_SRS_006_RBAC_User_Alter_Settings_Min = Requirement(
+    name='RQ.SRS-006.RBAC.User.Alter.Settings.Min',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support specifying a minimum value for the variable specifed using `SETTINGS` with `MIN` clause in the `ALTER USER` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.3.16.21')
+
+RQ_SRS_006_RBAC_User_Alter_Settings_Max = Requirement(
+    name='RQ.SRS-006.RBAC.User.Alter.Settings.Max',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support specifying a maximum value for the variable specifed using `SETTINGS` with `MAX` clause in the `ALTER USER` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.3.16.22')
+
+RQ_SRS_006_RBAC_User_Alter_Settings_Profile = Requirement(
+    name='RQ.SRS-006.RBAC.User.Alter.Settings.Profile',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support specifying the name of a profile for the variable specifed using `SETTINGS` with `PROFILE` clause in the `ALTER USER` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.3.16.23')
+
+RQ_SRS_006_RBAC_User_Alter_Syntax = Requirement(
+    name='RQ.SRS-006.RBAC.User.Alter.Syntax',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support the following syntax for the `ALTER USER` statement.\n'
+        '\n'
+        '```sql\n'
+        'ALTER USER [IF EXISTS] name [ON CLUSTER cluster_name]\n'
+        '    [RENAME TO new_name]\n'
+        "    [IDENTIFIED [WITH {PLAINTEXT_PASSWORD|SHA256_PASSWORD|DOUBLE_SHA1_PASSWORD}] BY {'password'|'hash'}]\n"
+        "    [[ADD|DROP] HOST {LOCAL | NAME 'name' | REGEXP 'name_regexp' | IP 'address' | LIKE 'pattern'} [,...] | ANY | NONE]\n"
+        '    [DEFAULT ROLE role [,...] | ALL | ALL EXCEPT role [,...] ]\n'
+        "    [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | PROFILE 'profile_name'] [,...]\n"
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.3.16.24')
+
+RQ_SRS_006_RBAC_User_ShowCreateUser = Requirement(
+    name='RQ.SRS-006.RBAC.User.ShowCreateUser',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support showing the `CREATE USER` statement used to create the current user object\n'
+        'using the `SHOW CREATE USER` statement with `CURRENT_USER` or no argument.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.3.17.1')
+
+RQ_SRS_006_RBAC_User_ShowCreateUser_For = Requirement(
+    name='RQ.SRS-006.RBAC.User.ShowCreateUser.For',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support showing the `CREATE USER` statement used to create the specified user object\n'
+        'using the `FOR` clause in the `SHOW CREATE USER` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.3.17.2')
+
+RQ_SRS_006_RBAC_User_ShowCreateUser_Syntax = Requirement(
+    name='RQ.SRS-006.RBAC.User.ShowCreateUser.Syntax',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support showing the following syntax for `SHOW CREATE USER` statement.\n'
+        '\n'
+        '```sql\n'
+        'SHOW CREATE USER [name | CURRENT_USER]\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.3.17.3')
+
+RQ_SRS_006_RBAC_User_Drop = Requirement(
+    name='RQ.SRS-006.RBAC.User.Drop',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support removing a user account using `DROP USER` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.3.18.1')
+
+RQ_SRS_006_RBAC_User_Drop_IfExists = Requirement(
+    name='RQ.SRS-006.RBAC.User.Drop.IfExists',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support using `IF EXISTS` clause in the `DROP USER` statement\n'
+        'to skip raising an exception if the user account does not exist.\n'
+        'If the `IF EXISTS` clause is not specified then an exception SHALL be\n'
+        'raised if a user does not exist.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.3.18.2')
+
+RQ_SRS_006_RBAC_User_Drop_OnCluster = Requirement(
+    name='RQ.SRS-006.RBAC.User.Drop.OnCluster',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support using `ON CLUSTER` clause in the `DROP USER` statement\n'
+        'to specify the name of the cluster the user should be dropped from.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.3.18.3')
+
+RQ_SRS_006_RBAC_User_Drop_Syntax = Requirement(
+    name='RQ.SRS-006.RBAC.User.Drop.Syntax',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support the following syntax for `DROP USER` statement\n'
+        '\n'
+        '```sql\n'
+        'DROP USER [IF EXISTS] name [,...] [ON CLUSTER cluster_name]\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.3.18.4')
+
+RQ_SRS_006_RBAC_Role = Requirement(
+    name='RQ.SRS-006.RBAC.Role',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClikHouse] SHALL support creation and manipulation of **roles**\n'
+        'to which privileges, settings profile, quotas and row policies can be\n'
+        'assigned.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.4.1')
+
+RQ_SRS_006_RBAC_Role_Privileges = Requirement(
+    name='RQ.SRS-006.RBAC.Role.Privileges',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support assigning one or more privileges to a **role**.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.4.2')
+
+RQ_SRS_006_RBAC_Role_Variables = Requirement(
+    name='RQ.SRS-006.RBAC.Role.Variables',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support assigning one or more variables to a **role**.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.4.3')
+
+RQ_SRS_006_RBAC_Role_SettingsProfile = Requirement(
+    name='RQ.SRS-006.RBAC.Role.SettingsProfile',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support assigning one or more **settings profiles**\n'
+        'to a **role**.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.4.4')
+
+RQ_SRS_006_RBAC_Role_Quotas = Requirement(
+    name='RQ.SRS-006.RBAC.Role.Quotas',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support assigning one or more **quotas** to a **role**.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.4.5')
+
+RQ_SRS_006_RBAC_Role_RowPolicies = Requirement(
+    name='RQ.SRS-006.RBAC.Role.RowPolicies',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support assigning one or more **row policies** to a **role**.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.4.6')
+
+RQ_SRS_006_RBAC_Role_Create = Requirement(
+    name='RQ.SRS-006.RBAC.Role.Create',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support creating a **role** using `CREATE ROLE` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.4.7.1')
+
+RQ_SRS_006_RBAC_Role_Create_IfNotExists = Requirement(
+    name='RQ.SRS-006.RBAC.Role.Create.IfNotExists',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support `IF NOT EXISTS` clause in the `CREATE ROLE` statement\n'
+        'to raising an exception if a role with the same **name** already exists.\n'
+        'If the `IF NOT EXISTS` clause is not specified then an exception SHALL be\n'
+        'raised if a role with the same **name** already exists.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.4.7.2')
+
+RQ_SRS_006_RBAC_Role_Create_Replace = Requirement(
+    name='RQ.SRS-006.RBAC.Role.Create.Replace',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support `OR REPLACE` clause in the `CREATE ROLE` statement\n'
+        'to replace existing role if it already exists.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.4.7.3')
+
+RQ_SRS_006_RBAC_Role_Create_Settings = Requirement(
+    name='RQ.SRS-006.RBAC.Role.Create.Settings',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support specifying settings and profile using `SETTINGS`\n'
+        'clause in the `CREATE ROLE` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.4.7.4')
+
+RQ_SRS_006_RBAC_Role_Create_Syntax = Requirement(
+    name='RQ.SRS-006.RBAC.Role.Create.Syntax',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support the following syntax for the `CREATE ROLE` statement\n'
+        '\n'
+        '``` sql\n'
+        'CREATE ROLE [IF NOT EXISTS | OR REPLACE] name\n'
+        "    [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | PROFILE 'profile_name'] [,...]\n"
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.4.7.5')
+
+RQ_SRS_006_RBAC_Role_Alter = Requirement(
+    name='RQ.SRS-006.RBAC.Role.Alter',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support altering one **role** using `ALTER ROLE` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.4.8.1')
+
+RQ_SRS_006_RBAC_Role_Alter_IfExists = Requirement(
+    name='RQ.SRS-006.RBAC.Role.Alter.IfExists',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support altering one **role** using `ALTER ROLE IF EXISTS` statement, where no exception\n'
+        'will be thrown if the role does not exist.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.4.8.2')
+
+RQ_SRS_006_RBAC_Role_Alter_Cluster = Requirement(
+    name='RQ.SRS-006.RBAC.Role.Alter.Cluster',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support altering one **role** using `ALTER ROLE role ON CLUSTER` statement to specify the\n'
+        'cluster location of the specified role.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.4.8.3')
+
+RQ_SRS_006_RBAC_Role_Alter_Rename = Requirement(
+    name='RQ.SRS-006.RBAC.Role.Alter.Rename',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support altering one **role** using `ALTER ROLE role RENAME TO` statement which renames the\n'
+        'role to a specified new name. If the new name already exists, that an exception SHALL be raised unless the\n'
+        '`IF EXISTS` clause is specified, by which no exception will be raised and nothing will change.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.4.8.4')
+
+RQ_SRS_006_RBAC_Role_Alter_Settings = Requirement(
+    name='RQ.SRS-006.RBAC.Role.Alter.Settings',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support altering the settings of one **role** using `ALTER ROLE role SETTINGS ...` statement.\n'
+        'Altering variable values, creating max and min values, specifying readonly or writable, and specifying the\n'
+        'profiles for which this alter change shall be applied to, are all supported, using the following syntax.\n'
+        '\n'
+        '```sql\n'
+        "[SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | PROFILE 'profile_name'] [,...]\n"
+        '```\n'
+        '\n'
+        'One or more variables and profiles may be specified as shown above.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.4.8.5')
+
+RQ_SRS_006_RBAC_Role_Alter_Syntax = Requirement(
+    name='RQ.SRS-006.RBAC.Role.Alter.Syntax',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '```sql\n'
+        'ALTER ROLE [IF EXISTS] name [ON CLUSTER cluster_name]\n'
+        '    [RENAME TO new_name]\n'
+        "    [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | PROFILE 'profile_name'] [,...]\n"
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.4.8.6')
+
+RQ_SRS_006_RBAC_Role_Drop = Requirement(
+    name='RQ.SRS-006.RBAC.Role.Drop',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support removing one or more roles using `DROP ROLE` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.4.9.1')
+
+RQ_SRS_006_RBAC_Role_Drop_IfExists = Requirement(
+    name='RQ.SRS-006.RBAC.Role.Drop.IfExists',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support using `IF EXISTS` clause in the `DROP ROLE` statement\n'
+        'to skip raising an exception if the role does not exist.\n'
+        'If the `IF EXISTS` clause is not specified then an exception SHALL be\n'
+        'raised if a role does not exist.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.4.9.2')
+
+RQ_SRS_006_RBAC_Role_Drop_Cluster = Requirement(
+    name='RQ.SRS-006.RBAC.Role.Drop.Cluster',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support using `ON CLUSTER` clause in the `DROP ROLE` statement to specify the cluster from which to drop the specified role.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.4.9.3')
+
+RQ_SRS_006_RBAC_Role_Drop_Syntax = Requirement(
+    name='RQ.SRS-006.RBAC.Role.Drop.Syntax',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support the following syntax for the `DROP ROLE` statement\n'
+        '\n'
+        '``` sql\n'
+        'DROP ROLE [IF EXISTS] name [,...] [ON CLUSTER cluster_name]\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.4.9.4')
+
+RQ_SRS_006_RBAC_Role_ShowCreate = Requirement(
+    name='RQ.SRS-006.RBAC.Role.ShowCreate',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support viewing the settings for a role upon creation with the `SHOW CREATE ROLE`\n'
+        'statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.4.10.1')
+
+RQ_SRS_006_RBAC_Role_ShowCreate_Syntax = Requirement(
+    name='RQ.SRS-006.RBAC.Role.ShowCreate.Syntax',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support the following syntax for the `SHOW CREATE ROLE` command.\n'
+        '\n'
+        '```sql\n'
+        'SHOW CREATE ROLE name\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.4.10.2')
+
+RQ_SRS_006_RBAC_PartialRevokes = Requirement(
+    name='RQ.SRS-006.RBAC.PartialRevokes',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support partial revoking of privileges granted\n'
+        'to a **user** or a **role**.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.5.1')
+
+RQ_SRS_006_RBAC_PartialRevoke_Syntax = Requirement(
+    name='RQ.SRS-006.RBAC.PartialRevoke.Syntax',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support partial revokes by using `partial_revokes` variable\n'
+        'that can be set or unset using the following syntax.\n'
+        '\n'
+        'To disable partial revokes the `partial_revokes` variable SHALL be set to `0`\n'
+        '\n'
+        '```sql\n'
+        'SET partial_revokes = 0\n'
+        '```\n'
+        '\n'
+        'To enable partial revokes the `partial revokes` variable SHALL be set to `1`\n'
+        '\n'
+        '```sql\n'
+        'SET partial_revokes = 1\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.5.2')
+
+RQ_SRS_006_RBAC_SettingsProfile = Requirement(
+    name='RQ.SRS-006.RBAC.SettingsProfile',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support creation and manipulation of **settings profiles**\n'
+        'that can include value definition for one or more variables and can\n'
+        'can be assigned to one or more **users** or **roles**.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.6.1')
+
+RQ_SRS_006_RBAC_SettingsProfile_Constraints = Requirement(
+    name='RQ.SRS-006.RBAC.SettingsProfile.Constraints',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support assigning min, max and read-only constraints\n'
+        'for the variables specified in the **settings profile**.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.6.2')
+
+RQ_SRS_006_RBAC_SettingsProfile_Create = Requirement(
+    name='RQ.SRS-006.RBAC.SettingsProfile.Create',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support creating settings profile using the `CREATE SETTINGS PROFILE` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.6.3.1')
+
+RQ_SRS_006_RBAC_SettingsProfile_Create_IfNotExists = Requirement(
+    name='RQ.SRS-006.RBAC.SettingsProfile.Create.IfNotExists',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support `IF NOT EXISTS` clause in the `CREATE SETTINGS PROFILE` statement\n'
+        'to skip raising an exception if a settings profile with the same **name** already exists.\n'
+        'If `IF NOT EXISTS` clause is not specified then an exception SHALL be raised if\n'
+        'a settings profile with the same **name** already exists.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.6.3.2')
+
+RQ_SRS_006_RBAC_SettingsProfile_Create_Replace = Requirement(
+    name='RQ.SRS-006.RBAC.SettingsProfile.Create.Replace',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support `OR REPLACE` clause in the `CREATE SETTINGS PROFILE` statement\n'
+        'to replace existing settings profile if it already exists.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.6.3.3')
+
+RQ_SRS_006_RBAC_SettingsProfile_Create_Variables = Requirement(
+    name='RQ.SRS-006.RBAC.SettingsProfile.Create.Variables',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support assigning values and constraints to one or more\n'
+        'variables in the `CREATE SETTINGS PROFILE` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.6.3.4')
+
+RQ_SRS_006_RBAC_SettingsProfile_Create_Variables_Value = Requirement(
+    name='RQ.SRS-006.RBAC.SettingsProfile.Create.Variables.Value',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support assigning variable value in the `CREATE SETTINGS PROFILE` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.6.3.5')
+
+RQ_SRS_006_RBAC_SettingsProfile_Create_Variables_Constraints = Requirement(
+    name='RQ.SRS-006.RBAC.SettingsProfile.Create.Variables.Constraints',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support setting `MIN`, `MAX`, `READONLY`, and `WRITABLE`\n'
+        'constraints for the variables in the `CREATE SETTINGS PROFILE` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.6.3.6')
+
+RQ_SRS_006_RBAC_SettingsProfile_Create_Assignment = Requirement(
+    name='RQ.SRS-006.RBAC.SettingsProfile.Create.Assignment',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support assigning settings profile to one or more users\n'
+        'or roles in the `CREATE SETTINGS PROFILE` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.6.3.7')
+
+RQ_SRS_006_RBAC_SettingsProfile_Create_Assignment_None = Requirement(
+    name='RQ.SRS-006.RBAC.SettingsProfile.Create.Assignment.None',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support assigning settings profile to no users or roles using\n'
+        '`TO NONE` clause in the `CREATE SETTINGS PROFILE` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.6.3.8')
+
+RQ_SRS_006_RBAC_SettingsProfile_Create_Assignment_All = Requirement(
+    name='RQ.SRS-006.RBAC.SettingsProfile.Create.Assignment.All',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support assigning settings profile to all current users and roles\n'
+        'using `TO ALL` clause in the `CREATE SETTINGS PROFILE` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.6.3.9')
+
+RQ_SRS_006_RBAC_SettingsProfile_Create_Assignment_AllExcept = Requirement(
+    name='RQ.SRS-006.RBAC.SettingsProfile.Create.Assignment.AllExcept',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support excluding assignment to one or more users or roles using\n'
+        'the `ALL EXCEPT` clause in the `CREATE SETTINGS PROFILE` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.6.3.10')
+
+RQ_SRS_006_RBAC_SettingsProfile_Create_Inherit = Requirement(
+    name='RQ.SRS-006.RBAC.SettingsProfile.Create.Inherit',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support inheriting profile settings from indicated profile using\n'
+        'the `INHERIT` clause in the `CREATE SETTINGS PROFILE` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.6.3.11')
+
+RQ_SRS_006_RBAC_SettingsProfile_Create_OnCluster = Requirement(
+    name='RQ.SRS-006.RBAC.SettingsProfile.Create.OnCluster',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support specifying what cluster to create settings profile on\n'
+        'using `ON CLUSTER` clause in the `CREATE SETTINGS PROFILE` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.6.3.12')
+
+RQ_SRS_006_RBAC_SettingsProfile_Create_Syntax = Requirement(
+    name='RQ.SRS-006.RBAC.SettingsProfile.Create.Syntax',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support the following syntax for the `CREATE SETTINGS PROFILE` statement.\n'
+        '\n'
+        '``` sql\n'
+        'CREATE SETTINGS PROFILE [IF NOT EXISTS | OR REPLACE] name\n'
+        '    [ON CLUSTER cluster_name]\n'
+        "    [SET varname [= value] [MIN min] [MAX max] [READONLY|WRITABLE] | [INHERIT 'profile_name'] [,...]]\n"
+        '    [TO {user_or_role [,...] | NONE | ALL | ALL EXCEPT user_or_role [,...]}]\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.6.3.13')
+
+RQ_SRS_006_RBAC_SettingsProfile_Alter = Requirement(
+    name='RQ.SRS-006.RBAC.SettingsProfile.Alter',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support altering settings profile using the `ALTER STETTINGS PROFILE` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.6.4.1')
+
+RQ_SRS_006_RBAC_SettingsProfile_Alter_IfExists = Requirement(
+    name='RQ.SRS-006.RBAC.SettingsProfile.Alter.IfExists',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support `IF EXISTS` clause in the `ALTER SETTINGS PROFILE` statement\n'
+        'to not raise exception if a settings profile does not exist.\n'
+        'If the `IF EXISTS` clause is not specified then an exception SHALL be\n'
+        'raised if a settings profile does not exist.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.6.4.2')
+
+RQ_SRS_006_RBAC_SettingsProfile_Alter_Rename = Requirement(
+    name='RQ.SRS-006.RBAC.SettingsProfile.Alter.Rename',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support renaming settings profile using the `RANAME TO` clause\n'
+        'in the `ALTER SETTINGS PROFILE` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.6.4.3')
+
+RQ_SRS_006_RBAC_SettingsProfile_Alter_Variables = Requirement(
+    name='RQ.SRS-006.RBAC.SettingsProfile.Alter.Variables',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support altering values and constraints of one or more\n'
+        'variables in the `ALTER SETTINGS PROFILE` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.6.4.4')
+
+RQ_SRS_006_RBAC_SettingsProfile_Alter_Variables_Value = Requirement(
+    name='RQ.SRS-006.RBAC.SettingsProfile.Alter.Variables.Value',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support altering value of the variable in the `ALTER SETTINGS PROFILE` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.6.4.5')
+
+RQ_SRS_006_RBAC_SettingsProfile_Alter_Variables_Constraints = Requirement(
+    name='RQ.SRS-006.RBAC.SettingsProfile.Alter.Variables.Constraints',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support altering `MIN`, `MAX`, `READONLY`, and `WRITABLE`\n'
+        'constraints for the variables in the `ALTER SETTINGS PROFILE` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.6.4.6')
+
+RQ_SRS_006_RBAC_SettingsProfile_Alter_Assignment = Requirement(
+    name='RQ.SRS-006.RBAC.SettingsProfile.Alter.Assignment',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support reassigning settings profile to one or more users\n'
+        'or roles using the `TO` clause in the `ALTER SETTINGS PROFILE` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.6.4.7')
+
+RQ_SRS_006_RBAC_SettingsProfile_Alter_Assignment_None = Requirement(
+    name='RQ.SRS-006.RBAC.SettingsProfile.Alter.Assignment.None',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support reassigning settings profile to no users or roles using the\n'
+        '`TO NONE` clause in the `ALTER SETTINGS PROFILE` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.6.4.8')
+
+RQ_SRS_006_RBAC_SettingsProfile_Alter_Assignment_All = Requirement(
+    name='RQ.SRS-006.RBAC.SettingsProfile.Alter.Assignment.All',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support reassigning settings profile to all current users and roles\n'
+        'using the `TO ALL` clause in the `ALTER SETTINGS PROFILE` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.6.4.9')
+
+RQ_SRS_006_RBAC_SettingsProfile_Alter_Assignment_AllExcept = Requirement(
+    name='RQ.SRS-006.RBAC.SettingsProfile.Alter.Assignment.AllExcept',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support excluding assignment to one or more users or roles using\n'
+        'the `TO ALL EXCEPT` clause in the `ALTER SETTINGS PROFILE` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.6.4.10')
+
+RQ_SRS_006_RBAC_SettingsProfile_Alter_Assignment_Inherit = Requirement(
+    name='RQ.SRS-006.RBAC.SettingsProfile.Alter.Assignment.Inherit',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support altering the settings profile by inheriting settings from\n'
+        'specified profile using `INHERIT` clause in the `ALTER SETTINGS PROFILE` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.6.4.11')
+
+RQ_SRS_006_RBAC_SettingsProfile_Alter_Assignment_OnCluster = Requirement(
+    name='RQ.SRS-006.RBAC.SettingsProfile.Alter.Assignment.OnCluster',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support altering the settings profile on a specified cluster using\n'
+        '`ON CLUSTER` clause in the `ALTER SETTINGS PROFILE` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.6.4.12')
+
+RQ_SRS_006_RBAC_SettingsProfile_Alter_Syntax = Requirement(
+    name='RQ.SRS-006.RBAC.SettingsProfile.Alter.Syntax',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support the following syntax for the `ALTER SETTINGS PROFILE` statement.\n'
+        '\n'
+        '``` sql\n'
+        'ALTER SETTINGS PROFILE [IF EXISTS] name\n'
+        '    [ON CLUSTER cluster_name]\n'
+        '    [RENAME TO new_name]\n'
+        "    [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | INHERIT 'profile_name'] [,...]\n"
+        '    [TO {user_or_role [,...] | NONE | ALL | ALL EXCEPT user_or_role [,...]]}\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.6.4.13')
+
+RQ_SRS_006_RBAC_SettingsProfile_Drop = Requirement(
+    name='RQ.SRS-006.RBAC.SettingsProfile.Drop',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support removing one or more settings profiles using the `DROP SETTINGS PROFILE` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.6.5.1')
+
+RQ_SRS_006_RBAC_SettingsProfile_Drop_IfExists = Requirement(
+    name='RQ.SRS-006.RBAC.SettingsProfile.Drop.IfExists',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support using `IF EXISTS` clause in the `DROP SETTINGS PROFILE` statement\n'
+        'to skip raising an exception if the settings profile does not exist.\n'
+        'If the `IF EXISTS` clause is not specified then an exception SHALL be\n'
+        'raised if a settings profile does not exist.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.6.5.2')
+
+RQ_SRS_006_RBAC_SettingsProfile_Drop_OnCluster = Requirement(
+    name='RQ.SRS-006.RBAC.SettingsProfile.Drop.OnCluster',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support dropping one or more settings profiles on specified cluster using\n'
+        '`ON CLUSTER` clause in the `DROP SETTINGS PROFILE` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.6.5.3')
+
+RQ_SRS_006_RBAC_SettingsProfile_Drop_Syntax = Requirement(
+    name='RQ.SRS-006.RBAC.SettingsProfile.Drop.Syntax',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support the following syntax for the `DROP SETTINGS PROFILE` statement\n'
+        '\n'
+        '``` sql\n'
+        'DROP SETTINGS PROFILE [IF EXISTS] name [,name,...]\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.6.5.4')
+
+RQ_SRS_006_RBAC_SettingsProfile_ShowCreateSettingsProfile = Requirement(
+    name='RQ.SRS-006.RBAC.SettingsProfile.ShowCreateSettingsProfile',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support showing the `CREATE SETTINGS PROFILE` statement used to create the settings profile\n'
+        'using the `SHOW CREATE SETTINGS PROFILE` statement with the following syntax\n'
+        '\n'
+        '``` sql\n'
+        'SHOW CREATE SETTINGS PROFILE name\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.6.6.1')
+
+RQ_SRS_006_RBAC_Quotas = Requirement(
+    name='RQ.SRS-006.RBAC.Quotas',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support creation and manipulation of **quotas**\n'
+        'that can be used to limit resource usage by a **user** or a **role**\n'
+        'over a period of time.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.7.1')
+
+RQ_SRS_006_RBAC_Quotas_Keyed = Requirement(
+    name='RQ.SRS-006.RBAC.Quotas.Keyed',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support creating **quotas** that are keyed\n'
+        'so that a quota is tracked separately for each key value.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.7.2')
+
+RQ_SRS_006_RBAC_Quotas_Queries = Requirement(
+    name='RQ.SRS-006.RBAC.Quotas.Queries',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support setting **queries** quota to limit the total number of requests.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.7.3')
+
+RQ_SRS_006_RBAC_Quotas_Errors = Requirement(
+    name='RQ.SRS-006.RBAC.Quotas.Errors',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support setting **errors** quota to limit the number of queries that threw an exception.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.7.4')
+
+RQ_SRS_006_RBAC_Quotas_ResultRows = Requirement(
+    name='RQ.SRS-006.RBAC.Quotas.ResultRows',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support setting **result rows** quota to limit the\n'
+        'the total number of rows given as the result.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.7.5')
+
+RQ_SRS_006_RBAC_Quotas_ReadRows = Requirement(
+    name='RQ.SRS-006.RBAC.Quotas.ReadRows',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support setting **read rows** quota to limit the total\n'
+        'number of source rows read from tables for running the query on all remote servers.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.7.6')
+
+RQ_SRS_006_RBAC_Quotas_ResultBytes = Requirement(
+    name='RQ.SRS-006.RBAC.Quotas.ResultBytes',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support setting **result bytes** quota to limit the total number\n'
+        'of bytes that can be returned as the result.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.7.7')
+
+RQ_SRS_006_RBAC_Quotas_ReadBytes = Requirement(
+    name='RQ.SRS-006.RBAC.Quotas.ReadBytes',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support setting **read bytes** quota to limit the total number\n'
+        'of source bytes read from tables for running the query on all remote servers.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.7.8')
+
+RQ_SRS_006_RBAC_Quotas_ExecutionTime = Requirement(
+    name='RQ.SRS-006.RBAC.Quotas.ExecutionTime',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support setting **execution time** quota to limit the maximum\n'
+        'query execution time.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.7.9')
+
+RQ_SRS_006_RBAC_Quota_Create = Requirement(
+    name='RQ.SRS-006.RBAC.Quota.Create',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support creating quotas using the `CREATE QUOTA` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.7.10.1')
+
+RQ_SRS_006_RBAC_Quota_Create_IfNotExists = Requirement(
+    name='RQ.SRS-006.RBAC.Quota.Create.IfNotExists',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support `IF NOT EXISTS` clause in the `CREATE QUOTA` statement\n'
+        'to skip raising an exception if a quota with the same **name** already exists.\n'
+        'If `IF NOT EXISTS` clause is not specified then an exception SHALL be raised if\n'
+        'a quota with the same **name** already exists.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.7.10.2')
+
+RQ_SRS_006_RBAC_Quota_Create_Replace = Requirement(
+    name='RQ.SRS-006.RBAC.Quota.Create.Replace',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support `OR REPLACE` clause in the `CREATE QUOTA` statement\n'
+        'to replace existing quota if it already exists.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.7.10.3')
+
+RQ_SRS_006_RBAC_Quota_Create_Cluster = Requirement(
+    name='RQ.SRS-006.RBAC.Quota.Create.Cluster',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support creating quotas on a specific cluster with the\n'
+        '`ON CLUSTER` clause in the `CREATE QUOTA` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.7.10.4')
+
+RQ_SRS_006_RBAC_Quota_Create_Interval = Requirement(
+    name='RQ.SRS-006.RBAC.Quota.Create.Interval',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support defining the quota interval that specifies\n'
+        'a period of time over for which the quota SHALL apply using the\n'
+        '`FOR INTERVAL` clause in the `CREATE QUOTA` statement.\n'
+        '\n'
+        'This statement SHALL also support a number and a time period which will be one\n'
+        'of `{SECOND | MINUTE | HOUR | DAY | MONTH}`. Thus, the complete syntax SHALL be:\n'
+        '\n'
+        '`FOR INTERVAL number {SECOND | MINUTE | HOUR | DAY}` where number is some real number\n'
+        'to define the interval.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.7.10.5')
+
+RQ_SRS_006_RBAC_Quota_Create_Interval_Randomized = Requirement(
+    name='RQ.SRS-006.RBAC.Quota.Create.Interval.Randomized',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support defining the quota randomized interval that specifies\n'
+        'a period of time over for which the quota SHALL apply using the\n'
+        '`FOR RANDOMIZED INTERVAL` clause in the `CREATE QUOTA` statement.\n'
+        '\n'
+        'This statement SHALL also support a number and a time period which will be one\n'
+        'of `{SECOND | MINUTE | HOUR | DAY | MONTH}`. Thus, the complete syntax SHALL be:\n'
+        '\n'
+        '`FOR [RANDOMIZED] INTERVAL number {SECOND | MINUTE | HOUR | DAY}` where number is some\n'
+        'real number to define the interval.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.7.10.6')
+
+RQ_SRS_006_RBAC_Quota_Create_Queries = Requirement(
+    name='RQ.SRS-006.RBAC.Quota.Create.Queries',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support limiting number of requests over a period of time\n'
+        'using the `QUERIES` clause in the `CREATE QUOTA` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.7.10.7')
+
+RQ_SRS_006_RBAC_Quota_Create_Errors = Requirement(
+    name='RQ.SRS-006.RBAC.Quota.Create.Errors',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support limiting number of queries that threw an exception\n'
+        'using the `ERRORS` clause in the `CREATE QUOTA` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.7.10.8')
+
+RQ_SRS_006_RBAC_Quota_Create_ResultRows = Requirement(
+    name='RQ.SRS-006.RBAC.Quota.Create.ResultRows',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support limiting the total number of rows given as the result\n'
+        'using the `RESULT ROWS` clause in the `CREATE QUOTA` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.7.10.9')
+
+RQ_SRS_006_RBAC_Quota_Create_ReadRows = Requirement(
+    name='RQ.SRS-006.RBAC.Quota.Create.ReadRows',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support limiting the total number of source rows read from tables\n'
+        'for running the query on all remote servers\n'
+        'using the `READ ROWS` clause in the `CREATE QUOTA` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.7.10.10')
+
+RQ_SRS_006_RBAC_Quota_Create_ResultBytes = Requirement(
+    name='RQ.SRS-006.RBAC.Quota.Create.ResultBytes',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support limiting the total number of bytes that can be returned as the result\n'
+        'using the `RESULT BYTES` clause in the `CREATE QUOTA` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.7.10.11')
+
+RQ_SRS_006_RBAC_Quota_Create_ReadBytes = Requirement(
+    name='RQ.SRS-006.RBAC.Quota.Create.ReadBytes',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support limiting the total number of source bytes read from tables\n'
+        'for running the query on all remote servers\n'
+        'using the `READ BYTES` clause in the `CREATE QUOTA` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.7.10.12')
+
+RQ_SRS_006_RBAC_Quota_Create_ExecutionTime = Requirement(
+    name='RQ.SRS-006.RBAC.Quota.Create.ExecutionTime',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support limiting the maximum query execution time\n'
+        'using the `EXECUTION TIME` clause in the `CREATE QUOTA` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.7.10.13')
+
+RQ_SRS_006_RBAC_Quota_Create_NoLimits = Requirement(
+    name='RQ.SRS-006.RBAC.Quota.Create.NoLimits',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support limiting the maximum query execution time\n'
+        'using the `NO LIMITS` clause in the `CREATE QUOTA` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.7.10.14')
+
+RQ_SRS_006_RBAC_Quota_Create_TrackingOnly = Requirement(
+    name='RQ.SRS-006.RBAC.Quota.Create.TrackingOnly',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support limiting the maximum query execution time\n'
+        'using the `TRACKING ONLY` clause in the `CREATE QUOTA` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.7.10.15')
+
+RQ_SRS_006_RBAC_Quota_Create_KeyedBy = Requirement(
+    name='RQ.SRS-006.RBAC.Quota.Create.KeyedBy',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support to track quota for some key\n'
+        'following the `KEYED BY` clause in the `CREATE QUOTA` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.7.10.16')
+
+RQ_SRS_006_RBAC_Quota_Create_KeyedByOptions = Requirement(
+    name='RQ.SRS-006.RBAC.Quota.Create.KeyedByOptions',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support to track quota separately for some parameter\n'
+        "using the `KEYED BY 'parameter'` clause in the `CREATE QUOTA` statement.\n"
+        '\n'
+        "'parameter' can be one of:\n"
+        "`{'none' | 'user name' | 'ip address' | 'client key' | 'client key or user name' | 'client key or ip address'}`\n"
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.7.10.17')
+
+RQ_SRS_006_RBAC_Quota_Create_Assignment = Requirement(
+    name='RQ.SRS-006.RBAC.Quota.Create.Assignment',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support assigning quota to one or more users\n'
+        'or roles using the `TO` clause in the `CREATE QUOTA` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.7.10.18')
+
+RQ_SRS_006_RBAC_Quota_Create_Assignment_None = Requirement(
+    name='RQ.SRS-006.RBAC.Quota.Create.Assignment.None',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support assigning quota to no users or roles using\n'
+        '`TO NONE` clause in the `CREATE QUOTA` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.7.10.19')
+
+RQ_SRS_006_RBAC_Quota_Create_Assignment_All = Requirement(
+    name='RQ.SRS-006.RBAC.Quota.Create.Assignment.All',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support assigning quota to all current users and roles\n'
+        'using `TO ALL` clause in the `CREATE QUOTA` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.7.10.20')
+
+RQ_SRS_006_RBAC_Quota_Create_Assignment_Except = Requirement(
+    name='RQ.SRS-006.RBAC.Quota.Create.Assignment.Except',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support excluding assignment of quota to one or more users or roles using\n'
+        'the `EXCEPT` clause in the `CREATE QUOTA` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.7.10.21')
+
+RQ_SRS_006_RBAC_Quota_Create_Syntax = Requirement(
+    name='RQ.SRS-006.RBAC.Quota.Create.Syntax',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support the following syntax for the `CREATE QUOTA` statement\n'
+        '\n'
+        '```sql\n'
+        'CREATE QUOTA [IF NOT EXISTS | OR REPLACE] name [ON CLUSTER cluster_name]\n'
+        "    [KEYED BY {'none' | 'user name' | 'ip address' | 'client key' | 'client key or user name' | 'client key or ip address'}]\n"
+        '    [FOR [RANDOMIZED] INTERVAL number {SECOND | MINUTE | HOUR | DAY}\n'
+        '        {MAX { {QUERIES | ERRORS | RESULT ROWS | RESULT BYTES | READ ROWS | READ BYTES | EXECUTION TIME} = number } [,...] |\n'
+        '         NO LIMITS | TRACKING ONLY} [,...]]\n'
+        '    [TO {role [,...] | ALL | ALL EXCEPT role [,...]}]\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.7.10.22')
+
+RQ_SRS_006_RBAC_Quota_Alter = Requirement(
+    name='RQ.SRS-006.RBAC.Quota.Alter',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support altering quotas using the `ALTER QUOTA` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.7.11.1')
+
+RQ_SRS_006_RBAC_Quota_Alter_IfExists = Requirement(
+    name='RQ.SRS-006.RBAC.Quota.Alter.IfExists',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support `IF EXISTS` clause in the `ALTER QUOTA` statement\n'
+        'to skip raising an exception if a quota does not exist.\n'
+        'If the `IF EXISTS` clause is not specified then an exception SHALL be raised if\n'
+        'a quota does not exist.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.7.11.2')
+
+RQ_SRS_006_RBAC_Quota_Alter_Rename = Requirement(
+    name='RQ.SRS-006.RBAC.Quota.Alter.Rename',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support `RENAME TO` clause in the `ALTER QUOTA` statement\n'
+        'to rename the quota to the specified name.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.7.11.3')
+
+RQ_SRS_006_RBAC_Quota_Alter_Cluster = Requirement(
+    name='RQ.SRS-006.RBAC.Quota.Alter.Cluster',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support altering quotas on a specific cluster with the\n'
+        '`ON CLUSTER` clause in the `ALTER QUOTA` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.7.11.4')
+
+RQ_SRS_006_RBAC_Quota_Alter_Interval = Requirement(
+    name='RQ.SRS-006.RBAC.Quota.Alter.Interval',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support redefining the quota interval that specifies\n'
+        'a period of time over for which the quota SHALL apply using the\n'
+        '`FOR INTERVAL` clause in the `ALTER QUOTA` statement.\n'
+        '\n'
+        'This statement SHALL also support a number and a time period which will be one\n'
+        'of `{SECOND | MINUTE | HOUR | DAY | MONTH}`. Thus, the complete syntax SHALL be:\n'
+        '\n'
+        '`FOR INTERVAL number {SECOND | MINUTE | HOUR | DAY}` where number is some real number\n'
+        'to define the interval.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.7.11.5')
+
+RQ_SRS_006_RBAC_Quota_Alter_Interval_Randomized = Requirement(
+    name='RQ.SRS-006.RBAC.Quota.Alter.Interval.Randomized',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support redefining the quota randomized interval that specifies\n'
+        'a period of time over for which the quota SHALL apply using the\n'
+        '`FOR RANDOMIZED INTERVAL` clause in the `ALTER QUOTA` statement.\n'
+        '\n'
+        'This statement SHALL also support a number and a time period which will be one\n'
+        'of `{SECOND | MINUTE | HOUR | DAY | MONTH}`. Thus, the complete syntax SHALL be:\n'
+        '\n'
+        '`FOR [RANDOMIZED] INTERVAL number {SECOND | MINUTE | HOUR | DAY}` where number is some\n'
+        'real number to define the interval.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.7.11.6')
+
+RQ_SRS_006_RBAC_Quota_Alter_Queries = Requirement(
+    name='RQ.SRS-006.RBAC.Quota.Alter.Queries',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support altering the limit of number of requests over a period of time\n'
+        'using the `QUERIES` clause in the `ALTER QUOTA` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.7.11.7')
+
+RQ_SRS_006_RBAC_Quota_Alter_Errors = Requirement(
+    name='RQ.SRS-006.RBAC.Quota.Alter.Errors',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support altering the limit of number of queries that threw an exception\n'
+        'using the `ERRORS` clause in the `ALTER QUOTA` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.7.11.8')
+
+RQ_SRS_006_RBAC_Quota_Alter_ResultRows = Requirement(
+    name='RQ.SRS-006.RBAC.Quota.Alter.ResultRows',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support altering the limit of the total number of rows given as the result\n'
+        'using the `RESULT ROWS` clause in the `ALTER QUOTA` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.7.11.9')
+
+RQ_SRS_006_RBAC_Quota_Alter_ReadRows = Requirement(
+    name='RQ.SRS-006.RBAC.Quota.Alter.ReadRows',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support altering the limit of the total number of source rows read from tables\n'
+        'for running the query on all remote servers\n'
+        'using the `READ ROWS` clause in the `ALTER QUOTA` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.7.11.10')
+
+RQ_SRS_006_RBAC_Quota_ALter_ResultBytes = Requirement(
+    name='RQ.SRS-006.RBAC.Quota.ALter.ResultBytes',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support altering the limit of the total number of bytes that can be returned as the result\n'
+        'using the `RESULT BYTES` clause in the `ALTER QUOTA` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.7.11.11')
+
+RQ_SRS_006_RBAC_Quota_Alter_ReadBytes = Requirement(
+    name='RQ.SRS-006.RBAC.Quota.Alter.ReadBytes',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support altering the limit of the total number of source bytes read from tables\n'
+        'for running the query on all remote servers\n'
+        'using the `READ BYTES` clause in the `ALTER QUOTA` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.7.11.12')
+
+RQ_SRS_006_RBAC_Quota_Alter_ExecutionTime = Requirement(
+    name='RQ.SRS-006.RBAC.Quota.Alter.ExecutionTime',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support altering the limit of the maximum query execution time\n'
+        'using the `EXECUTION TIME` clause in the `ALTER QUOTA` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.7.11.13')
+
+RQ_SRS_006_RBAC_Quota_Alter_NoLimits = Requirement(
+    name='RQ.SRS-006.RBAC.Quota.Alter.NoLimits',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support limiting the maximum query execution time\n'
+        'using the `NO LIMITS` clause in the `ALTER QUOTA` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.7.11.14')
+
+RQ_SRS_006_RBAC_Quota_Alter_TrackingOnly = Requirement(
+    name='RQ.SRS-006.RBAC.Quota.Alter.TrackingOnly',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support limiting the maximum query execution time\n'
+        'using the `TRACKING ONLY` clause in the `ALTER QUOTA` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.7.11.15')
+
+RQ_SRS_006_RBAC_Quota_Alter_KeyedBy = Requirement(
+    name='RQ.SRS-006.RBAC.Quota.Alter.KeyedBy',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support altering quota to track quota separately for some key\n'
+        'following the `KEYED BY` clause in the `ALTER QUOTA` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.7.11.16')
+
+RQ_SRS_006_RBAC_Quota_Alter_KeyedByOptions = Requirement(
+    name='RQ.SRS-006.RBAC.Quota.Alter.KeyedByOptions',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support altering quota to track quota separately for some parameter\n'
+        "using the `KEYED BY 'parameter'` clause in the `ALTER QUOTA` statement.\n"
+        '\n'
+        "'parameter' can be one of:\n"
+        "`{'none' | 'user name' | 'ip address' | 'client key' | 'client key or user name' | 'client key or ip address'}`\n"
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.7.11.17')
+
+RQ_SRS_006_RBAC_Quota_Alter_Assignment = Requirement(
+    name='RQ.SRS-006.RBAC.Quota.Alter.Assignment',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support reassigning quota to one or more users\n'
+        'or roles using the `TO` clause in the `ALTER QUOTA` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.7.11.18')
+
+RQ_SRS_006_RBAC_Quota_Alter_Assignment_None = Requirement(
+    name='RQ.SRS-006.RBAC.Quota.Alter.Assignment.None',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support reassigning quota to no users or roles using\n'
+        '`TO NONE` clause in the `ALTER QUOTA` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.7.11.19')
+
+RQ_SRS_006_RBAC_Quota_Alter_Assignment_All = Requirement(
+    name='RQ.SRS-006.RBAC.Quota.Alter.Assignment.All',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support reassigning quota to all current users and roles\n'
+        'using `TO ALL` clause in the `ALTER QUOTA` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.7.11.20')
+
+RQ_SRS_006_RBAC_Quota_Alter_Assignment_Except = Requirement(
+    name='RQ.SRS-006.RBAC.Quota.Alter.Assignment.Except',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support excluding assignment of quota to one or more users or roles using\n'
+        'the `EXCEPT` clause in the `ALTER QUOTA` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.7.11.21')
+
+RQ_SRS_006_RBAC_Quota_Alter_Syntax = Requirement(
+    name='RQ.SRS-006.RBAC.Quota.Alter.Syntax',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support the following syntax for the `ALTER QUOTA` statement\n'
+        '\n'
+        '``` sql\n'
+        'ALTER QUOTA [IF EXIST] name\n'
+        '    {{{QUERIES | ERRORS | RESULT ROWS | READ ROWS | RESULT BYTES | READ BYTES | EXECUTION TIME} number} [, ...] FOR INTERVAL number time_unit} [, ...]\n'
+        '    [KEYED BY USERNAME | KEYED BY IP | NOT KEYED] [ALLOW CUSTOM KEY | DISALLOW CUSTOM KEY]\n'
+        '    [TO {user_or_role [,...] | NONE | ALL} [EXCEPT user_or_role [,...]]]\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.7.11.22')
+
+RQ_SRS_006_RBAC_Quota_Drop = Requirement(
+    name='RQ.SRS-006.RBAC.Quota.Drop',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support removing one or more quotas using the `DROP QUOTA` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.7.12.1')
+
+RQ_SRS_006_RBAC_Quota_Drop_IfExists = Requirement(
+    name='RQ.SRS-006.RBAC.Quota.Drop.IfExists',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support using `IF EXISTS` clause in the `DROP QUOTA` statement\n'
+        'to skip raising an exception when the quota does not exist.\n'
+        'If the `IF EXISTS` clause is not specified then an exception SHALL be\n'
+        'raised if the quota does not exist.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.7.12.2')
+
+RQ_SRS_006_RBAC_Quota_Drop_Cluster = Requirement(
+    name='RQ.SRS-006.RBAC.Quota.Drop.Cluster',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support using `ON CLUSTER` clause in the `DROP QUOTA` statement\n'
+        'to indicate the cluster the quota to be dropped is located on.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.7.12.3')
+
+RQ_SRS_006_RBAC_Quota_Drop_Syntax = Requirement(
+    name='RQ.SRS-006.RBAC.Quota.Drop.Syntax',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support the following syntax for the `DROP QUOTA` statement\n'
+        '\n'
+        '``` sql\n'
+        'DROP QUOTA [IF EXISTS] name [,name...]\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.7.12.4')
+
+RQ_SRS_006_RBAC_Quota_ShowQuotas = Requirement(
+    name='RQ.SRS-006.RBAC.Quota.ShowQuotas',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support showing all of the current quotas\n'
+        'using the `SHOW QUOTAS` statement with the following syntax\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.7.13.1')
+
+RQ_SRS_006_RBAC_Quota_ShowQuotas_IntoOutfile = Requirement(
+    name='RQ.SRS-006.RBAC.Quota.ShowQuotas.IntoOutfile',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support the `INTO OUTFILE` clause in the `SHOW QUOTAS` statement to define an outfile by some given string literal.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.7.13.2')
+
+RQ_SRS_006_RBAC_Quota_ShowQuotas_Format = Requirement(
+    name='RQ.SRS-006.RBAC.Quota.ShowQuotas.Format',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support the `FORMAT` clause in the `SHOW QUOTAS` statement to define a format for the output quota list.\n'
+        '\n'
+        'The types of valid formats are many, listed in output column:\n'
+        'https://clickhouse.tech/docs/en/interfaces/formats/\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.7.13.3')
+
+RQ_SRS_006_RBAC_Quota_ShowQuotas_Settings = Requirement(
+    name='RQ.SRS-006.RBAC.Quota.ShowQuotas.Settings',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support the `SETTINGS` clause in the `SHOW QUOTAS` statement to define settings in the showing of all quotas.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.7.13.4')
+
+RQ_SRS_006_RBAC_Quota_ShowQuotas_Syntax = Requirement(
+    name='RQ.SRS-006.RBAC.Quota.ShowQuotas.Syntax',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support using the `SHOW QUOTAS` statement\n'
+        'with the following syntax\n'
+        '``` sql\n'
+        'SHOW QUOTAS\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.7.13.5')
+
+RQ_SRS_006_RBAC_Quota_ShowCreateQuota_Name = Requirement(
+    name='RQ.SRS-006.RBAC.Quota.ShowCreateQuota.Name',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support showing the `CREATE QUOTA` statement used to create the quota with some given name\n'
+        'using the `SHOW CREATE QUOTA` statement with the following syntax\n'
+        '\n'
+        '``` sql\n'
+        'SHOW CREATE QUOTA name\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.7.14.1')
+
+RQ_SRS_006_RBAC_Quota_ShowCreateQuota_Current = Requirement(
+    name='RQ.SRS-006.RBAC.Quota.ShowCreateQuota.Current',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support showing the `CREATE QUOTA` statement used to create the CURRENT quota\n'
+        'using the `SHOW CREATE QUOTA CURRENT` statement or the shorthand form\n'
+        '`SHOW CREATE QUOTA`\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.7.14.2')
+
+RQ_SRS_006_RBAC_Quota_ShowCreateQuota_Syntax = Requirement(
+    name='RQ.SRS-006.RBAC.Quota.ShowCreateQuota.Syntax',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support the following syntax when\n'
+        'using the `SHOW CREATE QUOTA` statement.\n'
+        '\n'
+        '```sql\n'
+        'SHOW CREATE QUOTA [name | CURRENT]\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.7.14.3')
+
+RQ_SRS_006_RBAC_RowPolicy = Requirement(
+    name='RQ.SRS-006.RBAC.RowPolicy',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support creation and manipulation of table **row policies**\n'
+        'that can be used to limit access to the table contents for a **user** or a **role**\n'
+        'using a specified **condition**.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.8.1')
+
+RQ_SRS_006_RBAC_RowPolicy_Condition = Requirement(
+    name='RQ.SRS-006.RBAC.RowPolicy.Condition',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support row policy **conditions** that can be any SQL\n'
+        'expression that returns a boolean.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.8.2')
+
+RQ_SRS_006_RBAC_RowPolicy_Restriction = Requirement(
+    name='RQ.SRS-006.RBAC.RowPolicy.Restriction',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL restrict all access to a table when a row policy with a condition is created on that table.\n'
+        'All users require a permissive row policy in order to view the table.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.8.3')
+
+RQ_SRS_006_RBAC_RowPolicy_Nesting = Requirement(
+    name='RQ.SRS-006.RBAC.RowPolicy.Nesting',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL restrict rows of tables or views created on top of a table with row policies according to those policies.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.8.4')
+
+RQ_SRS_006_RBAC_RowPolicy_Create = Requirement(
+    name='RQ.SRS-006.RBAC.RowPolicy.Create',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support creating row policy using the `CREATE ROW POLICY` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.8.5.1')
+
+RQ_SRS_006_RBAC_RowPolicy_Create_IfNotExists = Requirement(
+    name='RQ.SRS-006.RBAC.RowPolicy.Create.IfNotExists',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support `IF NOT EXISTS` clause in the `CREATE ROW POLICY` statement\n'
+        'to skip raising an exception if a row policy with the same **name** already exists.\n'
+        'If the `IF NOT EXISTS` clause is not specified then an exception SHALL be raised if\n'
+        'a row policy with the same **name** already exists.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.8.5.2')
+
+RQ_SRS_006_RBAC_RowPolicy_Create_Replace = Requirement(
+    name='RQ.SRS-006.RBAC.RowPolicy.Create.Replace',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support `OR REPLACE` clause in the `CREATE ROW POLICY` statement\n'
+        'to replace existing row policy if it already exists.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.8.5.3')
+
+RQ_SRS_006_RBAC_RowPolicy_Create_OnCluster = Requirement(
+    name='RQ.SRS-006.RBAC.RowPolicy.Create.OnCluster',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support specifying cluster on which to create the role policy\n'
+        'using the `ON CLUSTER` clause in the `CREATE ROW POLICY` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.8.5.4')
+
+RQ_SRS_006_RBAC_RowPolicy_Create_On = Requirement(
+    name='RQ.SRS-006.RBAC.RowPolicy.Create.On',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support specifying table on which to create the role policy\n'
+        'using the `ON` clause in the `CREATE ROW POLICY` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.8.5.5')
+
+RQ_SRS_006_RBAC_RowPolicy_Create_Access = Requirement(
+    name='RQ.SRS-006.RBAC.RowPolicy.Create.Access',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support allowing or restricting access to rows using the\n'
+        '`AS` clause in the `CREATE ROW POLICY` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.8.5.6')
+
+RQ_SRS_006_RBAC_RowPolicy_Create_Access_Permissive = Requirement(
+    name='RQ.SRS-006.RBAC.RowPolicy.Create.Access.Permissive',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support allowing access to rows using the\n'
+        '`AS PERMISSIVE` clause in the `CREATE ROW POLICY` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.8.5.7')
+
+RQ_SRS_006_RBAC_RowPolicy_Create_Access_Restrictive = Requirement(
+    name='RQ.SRS-006.RBAC.RowPolicy.Create.Access.Restrictive',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support restricting access to rows using the\n'
+        '`AS RESTRICTIVE` clause in the `CREATE ROW POLICY` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.8.5.8')
+
+RQ_SRS_006_RBAC_RowPolicy_Create_ForSelect = Requirement(
+    name='RQ.SRS-006.RBAC.RowPolicy.Create.ForSelect',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support specifying which rows are affected\n'
+        'using the `FOR SELECT` clause in the `CREATE ROW POLICY` statement.\n'
+        'REQUIRES CONDITION.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.8.5.9')
+
+RQ_SRS_006_RBAC_RowPolicy_Create_Condition = Requirement(
+    name='RQ.SRS-006.RBAC.RowPolicy.Create.Condition',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support specifying a condition that\n'
+        'that can be any SQL expression which returns a boolean using the `USING`\n'
+        'clause in the `CREATE ROW POLICY` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.8.5.10')
+
+RQ_SRS_006_RBAC_RowPolicy_Create_Assignment = Requirement(
+    name='RQ.SRS-006.RBAC.RowPolicy.Create.Assignment',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support assigning row policy to one or more users\n'
+        'or roles using the `TO` clause in the `CREATE ROW POLICY` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.8.5.11')
+
+RQ_SRS_006_RBAC_RowPolicy_Create_Assignment_None = Requirement(
+    name='RQ.SRS-006.RBAC.RowPolicy.Create.Assignment.None',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support assigning row policy to no users or roles using\n'
+        'the `TO NONE` clause in the `CREATE ROW POLICY` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.8.5.12')
+
+RQ_SRS_006_RBAC_RowPolicy_Create_Assignment_All = Requirement(
+    name='RQ.SRS-006.RBAC.RowPolicy.Create.Assignment.All',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support assigning row policy to all current users and roles\n'
+        'using `TO ALL` clause in the `CREATE ROW POLICY` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.8.5.13')
+
+RQ_SRS_006_RBAC_RowPolicy_Create_Assignment_AllExcept = Requirement(
+    name='RQ.SRS-006.RBAC.RowPolicy.Create.Assignment.AllExcept',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support excluding assignment of row policy to one or more users or roles using\n'
+        'the `ALL EXCEPT` clause in the `CREATE ROW POLICY` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.8.5.14')
+
+RQ_SRS_006_RBAC_RowPolicy_Create_Syntax = Requirement(
+    name='RQ.SRS-006.RBAC.RowPolicy.Create.Syntax',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support the following syntax for the `CRETE ROW POLICY` statement\n'
+        '\n'
+        '``` sql\n'
+        'CREATE [ROW] POLICY [IF NOT EXISTS | OR REPLACE] policy_name [ON CLUSTER cluster_name] ON [db.]table\n'
+        '    [AS {PERMISSIVE | RESTRICTIVE}]\n'
+        '    [FOR SELECT]\n'
+        '    [USING condition]\n'
+        '    [TO {role [,...] | ALL | ALL EXCEPT role [,...]}]\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.8.5.15')
+
+RQ_SRS_006_RBAC_RowPolicy_Alter = Requirement(
+    name='RQ.SRS-006.RBAC.RowPolicy.Alter',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support altering row policy using the `ALTER ROW POLICY` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.8.6.1')
+
+RQ_SRS_006_RBAC_RowPolicy_Alter_IfExists = Requirement(
+    name='RQ.SRS-006.RBAC.RowPolicy.Alter.IfExists',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support the `IF EXISTS` clause in the `ALTER ROW POLICY` statement\n'
+        'to skip raising an exception if a row policy does not exist.\n'
+        'If the `IF EXISTS` clause is not specified then an exception SHALL be raised if\n'
+        'a row policy does not exist.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.8.6.2')
+
+RQ_SRS_006_RBAC_RowPolicy_Alter_ForSelect = Requirement(
+    name='RQ.SRS-006.RBAC.RowPolicy.Alter.ForSelect',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support modifying rows on which to apply the row policy\n'
+        'using the `FOR SELECT` clause in the `ALTER ROW POLICY` statement.\n'
+        'REQUIRES FUNCTION CONFIRMATION.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.8.6.3')
+
+RQ_SRS_006_RBAC_RowPolicy_Alter_OnCluster = Requirement(
+    name='RQ.SRS-006.RBAC.RowPolicy.Alter.OnCluster',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support specifying cluster on which to alter the row policy\n'
+        'using the `ON CLUSTER` clause in the `ALTER ROW POLICY` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.8.6.4')
+
+RQ_SRS_006_RBAC_RowPolicy_Alter_On = Requirement(
+    name='RQ.SRS-006.RBAC.RowPolicy.Alter.On',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support specifying table on which to alter the row policy\n'
+        'using the `ON` clause in the `ALTER ROW POLICY` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.8.6.5')
+
+RQ_SRS_006_RBAC_RowPolicy_Alter_Rename = Requirement(
+    name='RQ.SRS-006.RBAC.RowPolicy.Alter.Rename',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support renaming the row policy using the `RENAME` clause\n'
+        'in the `ALTER ROW POLICY` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.8.6.6')
+
+RQ_SRS_006_RBAC_RowPolicy_Alter_Access = Requirement(
+    name='RQ.SRS-006.RBAC.RowPolicy.Alter.Access',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support altering access to rows using the\n'
+        '`AS` clause in the `ALTER ROW POLICY` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.8.6.7')
+
+RQ_SRS_006_RBAC_RowPolicy_Alter_Access_Permissive = Requirement(
+    name='RQ.SRS-006.RBAC.RowPolicy.Alter.Access.Permissive',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support permitting access to rows using the\n'
+        '`AS PERMISSIVE` clause in the `ALTER ROW POLICY` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.8.6.8')
+
+RQ_SRS_006_RBAC_RowPolicy_Alter_Access_Restrictive = Requirement(
+    name='RQ.SRS-006.RBAC.RowPolicy.Alter.Access.Restrictive',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support restricting access to rows using the\n'
+        '`AS RESTRICTIVE` clause in the `ALTER ROW POLICY` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.8.6.9')
+
+RQ_SRS_006_RBAC_RowPolicy_Alter_Condition = Requirement(
+    name='RQ.SRS-006.RBAC.RowPolicy.Alter.Condition',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support re-specifying the row policy condition\n'
+        'using the `USING` clause in the `ALTER ROW POLICY` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.8.6.10')
+
+RQ_SRS_006_RBAC_RowPolicy_Alter_Condition_None = Requirement(
+    name='RQ.SRS-006.RBAC.RowPolicy.Alter.Condition.None',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support removing the row policy condition\n'
+        'using the `USING NONE` clause in the `ALTER ROW POLICY` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.8.6.11')
+
+RQ_SRS_006_RBAC_RowPolicy_Alter_Assignment = Requirement(
+    name='RQ.SRS-006.RBAC.RowPolicy.Alter.Assignment',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support reassigning row policy to one or more users\n'
+        'or roles using the `TO` clause in the `ALTER ROW POLICY` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.8.6.12')
+
+RQ_SRS_006_RBAC_RowPolicy_Alter_Assignment_None = Requirement(
+    name='RQ.SRS-006.RBAC.RowPolicy.Alter.Assignment.None',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support reassigning row policy to no users or roles using\n'
+        'the `TO NONE` clause in the `ALTER ROW POLICY` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.8.6.13')
+
+RQ_SRS_006_RBAC_RowPolicy_Alter_Assignment_All = Requirement(
+    name='RQ.SRS-006.RBAC.RowPolicy.Alter.Assignment.All',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support reassigning row policy to all current users and roles\n'
+        'using the `TO ALL` clause in the `ALTER ROW POLICY` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.8.6.14')
+
+RQ_SRS_006_RBAC_RowPolicy_Alter_Assignment_AllExcept = Requirement(
+    name='RQ.SRS-006.RBAC.RowPolicy.Alter.Assignment.AllExcept',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support excluding assignment of row policy to one or more users or roles using\n'
+        'the `ALL EXCEPT` clause in the `ALTER ROW POLICY` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.8.6.15')
+
+RQ_SRS_006_RBAC_RowPolicy_Alter_Syntax = Requirement(
+    name='RQ.SRS-006.RBAC.RowPolicy.Alter.Syntax',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support the following syntax for the `ALTER ROW POLICY` statement\n'
+        '\n'
+        '``` sql\n'
+        'ALTER [ROW] POLICY [IF EXISTS] name [ON CLUSTER cluster_name] ON [database.]table\n'
+        '    [RENAME TO new_name]\n'
+        '    [AS {PERMISSIVE | RESTRICTIVE}]\n'
+        '    [FOR SELECT]\n'
+        '    [USING {condition | NONE}][,...]\n'
+        '    [TO {role [,...] | ALL | ALL EXCEPT role [,...]}]\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.8.6.16')
+
+RQ_SRS_006_RBAC_RowPolicy_Drop = Requirement(
+    name='RQ.SRS-006.RBAC.RowPolicy.Drop',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support removing one or more row policies using the `DROP ROW POLICY` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.8.7.1')
+
+RQ_SRS_006_RBAC_RowPolicy_Drop_IfExists = Requirement(
+    name='RQ.SRS-006.RBAC.RowPolicy.Drop.IfExists',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support using the `IF EXISTS` clause in the `DROP ROW POLICY` statement\n'
+        'to skip raising an exception when the row policy does not exist.\n'
+        'If the `IF EXISTS` clause is not specified then an exception SHALL be\n'
+        'raised if the row policy does not exist.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.8.7.2')
+
+RQ_SRS_006_RBAC_RowPolicy_Drop_On = Requirement(
+    name='RQ.SRS-006.RBAC.RowPolicy.Drop.On',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support removing row policy from one or more specified tables\n'
+        'using the `ON` clause in the `DROP ROW POLICY` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.8.7.3')
+
+RQ_SRS_006_RBAC_RowPolicy_Drop_OnCluster = Requirement(
+    name='RQ.SRS-006.RBAC.RowPolicy.Drop.OnCluster',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support removing row policy from specified cluster\n'
+        'using the `ON CLUSTER` clause in the `DROP ROW POLICY` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.8.7.4')
+
+RQ_SRS_006_RBAC_RowPolicy_Drop_Syntax = Requirement(
+    name='RQ.SRS-006.RBAC.RowPolicy.Drop.Syntax',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support the following syntax for the `DROP ROW POLICY` statement.\n'
+        '\n'
+        '``` sql\n'
+        'DROP [ROW] POLICY [IF EXISTS] name [,...] ON [database.]table [,...] [ON CLUSTER cluster_name]\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.8.7.5')
+
+RQ_SRS_006_RBAC_RowPolicy_ShowCreateRowPolicy = Requirement(
+    name='RQ.SRS-006.RBAC.RowPolicy.ShowCreateRowPolicy',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support showing the `CREATE ROW POLICY` statement used to create the row policy\n'
+        'using the `SHOW CREATE ROW POLICY` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.8.8.1')
+
+RQ_SRS_006_RBAC_RowPolicy_ShowCreateRowPolicy_On = Requirement(
+    name='RQ.SRS-006.RBAC.RowPolicy.ShowCreateRowPolicy.On',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support showing statement used to create row policy on specific table\n'
+        'using the `ON` in the `SHOW CREATE ROW POLICY` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.8.8.2')
+
+RQ_SRS_006_RBAC_RowPolicy_ShowCreateRowPolicy_Syntax = Requirement(
+    name='RQ.SRS-006.RBAC.RowPolicy.ShowCreateRowPolicy.Syntax',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support the following syntax for `SHOW CREATE ROW POLICY`.\n'
+        '\n'
+        '``` sql\n'
+        'SHOW CREATE [ROW] POLICY name ON [database.]table\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.8.8.3')
+
+RQ_SRS_006_RBAC_RowPolicy_ShowRowPolicies = Requirement(
+    name='RQ.SRS-006.RBAC.RowPolicy.ShowRowPolicies',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support showing row policies using the `SHOW ROW POLICIES` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.8.8.4')
+
+RQ_SRS_006_RBAC_RowPolicy_ShowRowPolicies_On = Requirement(
+    name='RQ.SRS-006.RBAC.RowPolicy.ShowRowPolicies.On',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support showing row policies on a specific table\n'
+        'using the `ON` clause in the `SHOW ROW POLICIES` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.8.8.5')
+
+RQ_SRS_006_RBAC_RowPolicy_ShowRowPolicies_Syntax = Requirement(
+    name='RQ.SRS-006.RBAC.RowPolicy.ShowRowPolicies.Syntax',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support the following syntax for `SHOW ROW POLICIES`.\n'
+        '\n'
+        '```sql\n'
+        'SHOW [ROW] POLICIES [ON [database.]table]\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.8.8.6')
+
+RQ_SRS_006_RBAC_SetDefaultRole = Requirement(
+    name='RQ.SRS-006.RBAC.SetDefaultRole',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support setting or changing granted roles to default for one or more\n'
+        'users using `SET DEFAULT ROLE` statement which\n'
+        'SHALL permanently change the default roles for the user or users if successful.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.9.1')
+
+RQ_SRS_006_RBAC_SetDefaultRole_CurrentUser = Requirement(
+    name='RQ.SRS-006.RBAC.SetDefaultRole.CurrentUser',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support setting or changing granted roles to default for\n'
+        'the current user using `CURRENT_USER` clause in the `SET DEFAULT ROLE` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.9.2')
+
+RQ_SRS_006_RBAC_SetDefaultRole_All = Requirement(
+    name='RQ.SRS-006.RBAC.SetDefaultRole.All',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support setting or changing all granted roles to default\n'
+        'for one or more users using `ALL` clause in the `SET DEFAULT ROLE` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.9.3')
+
+RQ_SRS_006_RBAC_SetDefaultRole_AllExcept = Requirement(
+    name='RQ.SRS-006.RBAC.SetDefaultRole.AllExcept',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support setting or changing all granted roles except those specified\n'
+        'to default for one or more users using `ALL EXCEPT` clause in the `SET DEFAULT ROLE` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.9.4')
+
+RQ_SRS_006_RBAC_SetDefaultRole_None = Requirement(
+    name='RQ.SRS-006.RBAC.SetDefaultRole.None',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support removing all granted roles from default\n'
+        'for one or more users using `NONE` clause in the `SET DEFAULT ROLE` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.9.5')
+
+RQ_SRS_006_RBAC_SetDefaultRole_Syntax = Requirement(
+    name='RQ.SRS-006.RBAC.SetDefaultRole.Syntax',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support the following syntax for the `SET DEFAULT ROLE` statement.\n'
+        '\n'
+        '```sql\n'
+        'SET DEFAULT ROLE\n'
+        '    {NONE | role [,...] | ALL | ALL EXCEPT role [,...]}\n'
+        '    TO {user|CURRENT_USER} [,...]\n'
+        '\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.9.6')
+
+RQ_SRS_006_RBAC_SetRole = Requirement(
+    name='RQ.SRS-006.RBAC.SetRole',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support activating role or roles for the current user\n'
+        'using `SET ROLE` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.10.1')
+
+RQ_SRS_006_RBAC_SetRole_Default = Requirement(
+    name='RQ.SRS-006.RBAC.SetRole.Default',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support activating default roles for the current user\n'
+        'using `DEFAULT` clause in the `SET ROLE` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.10.2')
+
+RQ_SRS_006_RBAC_SetRole_None = Requirement(
+    name='RQ.SRS-006.RBAC.SetRole.None',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support activating no roles for the current user\n'
+        'using `NONE` clause in the `SET ROLE` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.10.3')
+
+RQ_SRS_006_RBAC_SetRole_All = Requirement(
+    name='RQ.SRS-006.RBAC.SetRole.All',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support activating all roles for the current user\n'
+        'using `ALL` clause in the `SET ROLE` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.10.4')
+
+RQ_SRS_006_RBAC_SetRole_AllExcept = Requirement(
+    name='RQ.SRS-006.RBAC.SetRole.AllExcept',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support activating all roles except those specified\n'
+        'for the current user using `ALL EXCEPT` clause in the `SET ROLE` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.10.5')
+
+RQ_SRS_006_RBAC_SetRole_Syntax = Requirement(
+    name='RQ.SRS-006.RBAC.SetRole.Syntax',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '```sql\n'
+        'SET ROLE {DEFAULT | NONE | role [,...] | ALL | ALL EXCEPT role [,...]}\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.10.6')
+
+RQ_SRS_006_RBAC_Grant_Privilege_To = Requirement(
+    name='RQ.SRS-006.RBAC.Grant.Privilege.To',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support granting privileges to one or more users or roles using `TO` clause\n'
+        'in the `GRANT PRIVILEGE` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.11.1')
+
+RQ_SRS_006_RBAC_Grant_Privilege_ToCurrentUser = Requirement(
+    name='RQ.SRS-006.RBAC.Grant.Privilege.ToCurrentUser',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support granting privileges to current user using `TO CURRENT_USER` clause\n'
+        'in the `GRANT PRIVILEGE` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.11.2')
+
+RQ_SRS_006_RBAC_Grant_Privilege_Select = Requirement(
+    name='RQ.SRS-006.RBAC.Grant.Privilege.Select',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support granting the **select** privilege to one or more users or roles\n'
+        'for a database or a table using the `GRANT SELECT` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.11.3')
+
+RQ_SRS_006_RBAC_Grant_Privilege_Insert = Requirement(
+    name='RQ.SRS-006.RBAC.Grant.Privilege.Insert',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support granting the **insert** privilege to one or more users or roles\n'
+        'for a database or a table using the `GRANT INSERT` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.11.4')
+
+RQ_SRS_006_RBAC_Grant_Privilege_Alter = Requirement(
+    name='RQ.SRS-006.RBAC.Grant.Privilege.Alter',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support granting the **alter** privilege to one or more users or roles\n'
+        'for a database or a table using the `GRANT ALTER` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.11.5')
+
+RQ_SRS_006_RBAC_Grant_Privilege_Create = Requirement(
+    name='RQ.SRS-006.RBAC.Grant.Privilege.Create',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support granting the **create** privilege to one or more users or roles\n'
+        'using the `GRANT CREATE` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.11.6')
+
+RQ_SRS_006_RBAC_Grant_Privilege_Drop = Requirement(
+    name='RQ.SRS-006.RBAC.Grant.Privilege.Drop',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support granting the **drop** privilege to one or more users or roles\n'
+        'using the `GRANT DROP` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.11.7')
+
+RQ_SRS_006_RBAC_Grant_Privilege_Truncate = Requirement(
+    name='RQ.SRS-006.RBAC.Grant.Privilege.Truncate',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support granting the **truncate** privilege to one or more users or roles\n'
+        'for a database or a table using `GRANT TRUNCATE` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.11.8')
+
+RQ_SRS_006_RBAC_Grant_Privilege_Optimize = Requirement(
+    name='RQ.SRS-006.RBAC.Grant.Privilege.Optimize',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support granting the **optimize** privilege to one or more users or roles\n'
+        'for a database or a table using `GRANT OPTIMIZE` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.11.9')
+
+RQ_SRS_006_RBAC_Grant_Privilege_Show = Requirement(
+    name='RQ.SRS-006.RBAC.Grant.Privilege.Show',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support granting the **show** privilege to one or more users or roles\n'
+        'for a database or a table using `GRANT SHOW` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.11.10')
+
+RQ_SRS_006_RBAC_Grant_Privilege_KillQuery = Requirement(
+    name='RQ.SRS-006.RBAC.Grant.Privilege.KillQuery',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support granting the **kill query** privilege to one or more users or roles\n'
+        'for a database or a table using `GRANT KILL QUERY` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.11.11')
+
+RQ_SRS_006_RBAC_Grant_Privilege_AccessManagement = Requirement(
+    name='RQ.SRS-006.RBAC.Grant.Privilege.AccessManagement',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support granting the **access management** privileges to one or more users or roles\n'
+        'for a database or a table using `GRANT ACCESS MANAGEMENT` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.11.12')
+
+RQ_SRS_006_RBAC_Grant_Privilege_System = Requirement(
+    name='RQ.SRS-006.RBAC.Grant.Privilege.System',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support granting the **system** privileges to one or more users or roles\n'
+        'for a database or a table using `GRANT SYSTEM` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.11.13')
+
+RQ_SRS_006_RBAC_Grant_Privilege_Introspection = Requirement(
+    name='RQ.SRS-006.RBAC.Grant.Privilege.Introspection',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support granting the **introspection** privileges to one or more users or roles\n'
+        'for a database or a table using `GRANT INTROSPECTION` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.11.14')
+
+RQ_SRS_006_RBAC_Grant_Privilege_Sources = Requirement(
+    name='RQ.SRS-006.RBAC.Grant.Privilege.Sources',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support granting the **sources** privileges to one or more users or roles\n'
+        'for a database or a table using `GRANT SOURCES` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.11.15')
+
+RQ_SRS_006_RBAC_Grant_Privilege_DictGet = Requirement(
+    name='RQ.SRS-006.RBAC.Grant.Privilege.DictGet',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support granting the **dictGet** privilege to one or more users or roles\n'
+        'for a database or a table using `GRANT dictGet` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.11.16')
+
+RQ_SRS_006_RBAC_Grant_Privilege_None = Requirement(
+    name='RQ.SRS-006.RBAC.Grant.Privilege.None',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support granting no privileges to one or more users or roles\n'
+        'for a database or a table using `GRANT NONE` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.11.17')
+
+RQ_SRS_006_RBAC_Grant_Privilege_All = Requirement(
+    name='RQ.SRS-006.RBAC.Grant.Privilege.All',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support granting the **all** privileges to one or more users or roles\n'
+        'using the `GRANT ALL` or `GRANT ALL PRIVILEGES` statements.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.11.18')
+
+RQ_SRS_006_RBAC_Grant_Privilege_GrantOption = Requirement(
+    name='RQ.SRS-006.RBAC.Grant.Privilege.GrantOption',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support granting the **grant option** privilege to one or more users or roles\n'
+        'for a database or a table using the `WITH GRANT OPTION` clause in the `GRANT` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.11.19')
+
+RQ_SRS_006_RBAC_Grant_Privilege_On = Requirement(
+    name='RQ.SRS-006.RBAC.Grant.Privilege.On',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support the `ON` clause in the `GRANT` privilege statement\n'
+        'which SHALL allow to specify one or more tables to which the privilege SHALL\n'
+        'be granted using the following patterns\n'
+        '\n'
+        '* `*.*` any table in any database\n'
+        '* `database.*` any table in the specified database\n'
+        '* `database.table` specific table in the specified database\n'
+        '* `*` any table in the current database\n'
+        '* `table` specific table in the current database\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.11.20')
+
+RQ_SRS_006_RBAC_Grant_Privilege_PrivilegeColumns = Requirement(
+    name='RQ.SRS-006.RBAC.Grant.Privilege.PrivilegeColumns',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support granting the privilege **some_privilege** to one or more users or roles\n'
+        'for a database or a table using the `GRANT some_privilege(column)` statement for one column.\n'
+        'Multiple columns will be supported with `GRANT some_privilege(column1, column2...)` statement.\n'
+        'The privileges will be granted for only the specified columns.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.11.21')
+
+RQ_SRS_006_RBAC_Grant_Privilege_OnCluster = Requirement(
+    name='RQ.SRS-006.RBAC.Grant.Privilege.OnCluster',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support specifying cluster on which to grant privileges using the `ON CLUSTER`\n'
+        'clause in the `GRANT PRIVILEGE` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.11.22')
+
+RQ_SRS_006_RBAC_Grant_Privilege_Syntax = Requirement(
+    name='RQ.SRS-006.RBAC.Grant.Privilege.Syntax',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support the following syntax for the `GRANT` statement that\n'
+        'grants explicit privileges to a user or a role.\n'
+        '\n'
+        '```sql\n'
+        'GRANT [ON CLUSTER cluster_name] privilege[(column_name [,...])] [,...]\n'
+        '    ON {db.table|db.*|*.*|table|*}\n'
+        '    TO {user | role | CURRENT_USER} [,...]\n'
+        '    [WITH GRANT OPTION]\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.11.23')
+
+RQ_SRS_006_RBAC_Revoke_Privilege_Cluster = Requirement(
+    name='RQ.SRS-006.RBAC.Revoke.Privilege.Cluster',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support revoking privileges to one or more users or roles\n'
+        'for a database or a table on some specific cluster using the `REVOKE ON CLUSTER cluster_name` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.12.1')
+
+RQ_SRS_006_RBAC_Revoke_Privilege_Select = Requirement(
+    name='RQ.SRS-006.RBAC.Revoke.Privilege.Select',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support revoking the **select** privilege to one or more users or roles\n'
+        'for a database or a table using the `REVOKE SELECT` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.12.2')
+
+RQ_SRS_006_RBAC_Revoke_Privilege_Insert = Requirement(
+    name='RQ.SRS-006.RBAC.Revoke.Privilege.Insert',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support revoking the **insert** privilege to one or more users or roles\n'
+        'for a database or a table using the `REVOKE INSERT` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.12.3')
+
+RQ_SRS_006_RBAC_Revoke_Privilege_Alter = Requirement(
+    name='RQ.SRS-006.RBAC.Revoke.Privilege.Alter',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support revoking the **alter** privilege to one or more users or roles\n'
+        'for a database or a table using the `REVOKE ALTER` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.12.4')
+
+RQ_SRS_006_RBAC_Revoke_Privilege_Create = Requirement(
+    name='RQ.SRS-006.RBAC.Revoke.Privilege.Create',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support revoking the **create** privilege to one or more users or roles\n'
+        'using the `REVOKE CREATE` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.12.5')
+
+RQ_SRS_006_RBAC_Revoke_Privilege_Drop = Requirement(
+    name='RQ.SRS-006.RBAC.Revoke.Privilege.Drop',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support revoking the **drop** privilege to one or more users or roles\n'
+        'using the `REVOKE DROP` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.12.6')
+
+RQ_SRS_006_RBAC_Revoke_Privilege_Truncate = Requirement(
+    name='RQ.SRS-006.RBAC.Revoke.Privilege.Truncate',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support revoking the **truncate** privilege to one or more users or roles\n'
+        'for a database or a table using the `REVOKE TRUNCATE` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.12.7')
+
+RQ_SRS_006_RBAC_Revoke_Privilege_Optimize = Requirement(
+    name='RQ.SRS-006.RBAC.Revoke.Privilege.Optimize',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support revoking the **optimize** privilege to one or more users or roles\n'
+        'for a database or a table using the `REVOKE OPTIMIZE` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.12.8')
+
+RQ_SRS_006_RBAC_Revoke_Privilege_Show = Requirement(
+    name='RQ.SRS-006.RBAC.Revoke.Privilege.Show',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support revoking the **show** privilege to one or more users or roles\n'
+        'for a database or a table using the `REVOKE SHOW` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.12.9')
+
+RQ_SRS_006_RBAC_Revoke_Privilege_KillQuery = Requirement(
+    name='RQ.SRS-006.RBAC.Revoke.Privilege.KillQuery',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support revoking the **kill query** privilege to one or more users or roles\n'
+        'for a database or a table using the `REVOKE KILL QUERY` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.12.10')
+
+RQ_SRS_006_RBAC_Revoke_Privilege_AccessManagement = Requirement(
+    name='RQ.SRS-006.RBAC.Revoke.Privilege.AccessManagement',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support revoking the **access management** privilege to one or more users or roles\n'
+        'for a database or a table using the `REVOKE ACCESS MANAGEMENT` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.12.11')
+
+RQ_SRS_006_RBAC_Revoke_Privilege_System = Requirement(
+    name='RQ.SRS-006.RBAC.Revoke.Privilege.System',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support revoking the **system** privilege to one or more users or roles\n'
+        'for a database or a table using the `REVOKE SYSTEM` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.12.12')
+
+RQ_SRS_006_RBAC_Revoke_Privilege_Introspection = Requirement(
+    name='RQ.SRS-006.RBAC.Revoke.Privilege.Introspection',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support revoking the **introspection** privilege to one or more users or roles\n'
+        'for a database or a table using the `REVOKE INTROSPECTION` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.12.13')
+
+RQ_SRS_006_RBAC_Revoke_Privilege_Sources = Requirement(
+    name='RQ.SRS-006.RBAC.Revoke.Privilege.Sources',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support revoking the **sources** privilege to one or more users or roles\n'
+        'for a database or a table using the `REVOKE SOURCES` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.12.14')
+
+RQ_SRS_006_RBAC_Revoke_Privilege_DictGet = Requirement(
+    name='RQ.SRS-006.RBAC.Revoke.Privilege.DictGet',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support revoking the **dictGet** privilege to one or more users or roles\n'
+        'for a database or a table using the `REVOKE dictGet` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.12.15')
+
+RQ_SRS_006_RBAC_Revoke_Privilege_PrivilegeColumns = Requirement(
+    name='RQ.SRS-006.RBAC.Revoke.Privilege.PrivilegeColumns',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support revoking the privilege **some_privilege** to one or more users or roles\n'
+        'for a database or a table using the `REVOKE some_privilege(column)` statement for one column.\n'
+        'Multiple columns will be supported with `REVOKE some_privilege(column1, column2...)` statement.\n'
+        'The privileges will be revoked for only the specified columns.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.12.16')
+
+RQ_SRS_006_RBAC_Revoke_Privilege_Multiple = Requirement(
+    name='RQ.SRS-006.RBAC.Revoke.Privilege.Multiple',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support revoking MULTIPLE **privileges** to one or more users or roles\n'
+        'for a database or a table using the `REVOKE privilege1, privilege2...` statement.\n'
+        '**privileges** refers to any set of Clickhouse defined privilege, whose hierarchy includes\n'
+        'SELECT, INSERT, ALTER, CREATE, DROP, TRUNCATE, OPTIMIZE, SHOW, KILL QUERY, ACCESS MANAGEMENT,\n'
+        'SYSTEM, INTROSPECTION, SOURCES, dictGet and all of their sub-privileges.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.12.17')
+
+RQ_SRS_006_RBAC_Revoke_Privilege_All = Requirement(
+    name='RQ.SRS-006.RBAC.Revoke.Privilege.All',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support revoking **all** privileges to one or more users or roles\n'
+        'for a database or a table using the `REVOKE ALL` or `REVOKE ALL PRIVILEGES` statements.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.12.18')
+
+RQ_SRS_006_RBAC_Revoke_Privilege_None = Requirement(
+    name='RQ.SRS-006.RBAC.Revoke.Privilege.None',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support revoking **no** privileges to one or more users or roles\n'
+        'for a database or a table using the `REVOKE NONE` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.12.19')
+
+RQ_SRS_006_RBAC_Revoke_Privilege_On = Requirement(
+    name='RQ.SRS-006.RBAC.Revoke.Privilege.On',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support the `ON` clause in the `REVOKE` privilege statement\n'
+        'which SHALL allow to specify one or more tables to which the privilege SHALL\n'
+        'be revoked using the following patterns\n'
+        '\n'
+        '* `db.table` specific table in the specified database\n'
+        '* `db.*` any table in the specified database\n'
+        '* `*.*` any table in any database\n'
+        '* `table` specific table in the current database\n'
+        '* `*` any table in the current database\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.12.20')
+
+RQ_SRS_006_RBAC_Revoke_Privilege_From = Requirement(
+    name='RQ.SRS-006.RBAC.Revoke.Privilege.From',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support the `FROM` clause in the `REVOKE` privilege statement\n'
+        'which SHALL allow to specify one or more users to which the privilege SHALL\n'
+        'be revoked using the following patterns\n'
+        '\n'
+        '* `{user | CURRENT_USER} [,...]` some combination of users by name, which may include the current user\n'
+        '* `ALL` all users\n'
+        '* `ALL EXCEPT {user | CURRENT_USER} [,...]` the logical reverse of the first pattern\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.12.21')
+
+RQ_SRS_006_RBAC_Revoke_Privilege_Syntax = Requirement(
+    name='RQ.SRS-006.RBAC.Revoke.Privilege.Syntax',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support the following syntax for the `REVOKE` statement that\n'
+        'revokes explicit privileges of a user or a role.\n'
+        '\n'
+        '```sql\n'
+        'REVOKE [ON CLUSTER cluster_name] privilege\n'
+        '    [(column_name [,...])] [,...]\n'
+        '    ON {db.table|db.*|*.*|table|*}\n'
+        '    FROM {user | CURRENT_USER} [,...] | ALL | ALL EXCEPT {user | CURRENT_USER} [,...]\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.12.22')
+
+RQ_SRS_006_RBAC_Grant_Role = Requirement(
+    name='RQ.SRS-006.RBAC.Grant.Role',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support granting one or more roles to\n'
+        'one or more users or roles using the `GRANT` role statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.13.1')
+
+RQ_SRS_006_RBAC_Grant_Role_CurrentUser = Requirement(
+    name='RQ.SRS-006.RBAC.Grant.Role.CurrentUser',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support granting one or more roles to current user using\n'
+        '`TO CURRENT_USER` clause in the `GRANT` role statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.13.2')
+
+RQ_SRS_006_RBAC_Grant_Role_AdminOption = Requirement(
+    name='RQ.SRS-006.RBAC.Grant.Role.AdminOption',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support granting `admin option` privilege\n'
+        'to one or more users or roles using the `WITH ADMIN OPTION` clause\n'
+        'in the `GRANT` role statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.13.3')
+
+RQ_SRS_006_RBAC_Grant_Role_OnCluster = Requirement(
+    name='RQ.SRS-006.RBAC.Grant.Role.OnCluster',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support specifying cluster on which the user is to be granted one or more roles\n'
+        'using `ON CLUSTER` clause in the `GRANT` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.13.4')
+
+RQ_SRS_006_RBAC_Grant_Role_Syntax = Requirement(
+    name='RQ.SRS-006.RBAC.Grant.Role.Syntax',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support the following syntax for `GRANT` role statement\n'
+        '\n'
+        '``` sql\n'
+        'GRANT\n'
+        '    ON CLUSTER cluster_name\n'
+        '    role [, role ...]\n'
+        '    TO {user | role | CURRENT_USER} [,...]\n'
+        '    [WITH ADMIN OPTION]\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.13.5')
+
+RQ_SRS_006_RBAC_Revoke_Role = Requirement(
+    name='RQ.SRS-006.RBAC.Revoke.Role',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support revoking one or more roles from\n'
+        'one or more users or roles using the `REVOKE` role statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.14.1')
+
+RQ_SRS_006_RBAC_Revoke_Role_Keywords = Requirement(
+    name='RQ.SRS-006.RBAC.Revoke.Role.Keywords',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support revoking one or more roles from\n'
+        'special groupings of one or more users or roles with the `ALL`, `ALL EXCEPT`,\n'
+        'and `CURRENT_USER` keywords.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.14.2')
+
+RQ_SRS_006_RBAC_Revoke_Role_Cluster = Requirement(
+    name='RQ.SRS-006.RBAC.Revoke.Role.Cluster',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support revoking one or more roles from\n'
+        'one or more users or roles from one or more clusters\n'
+        'using the `REVOKE ON CLUSTER` role statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.14.3')
+
+RQ_SRS_006_RBAC_Revoke_AdminOption = Requirement(
+    name='RQ.SRS-006.RBAC.Revoke.AdminOption',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support revoking `admin option` privilege\n'
+        'in one or more users or roles using the `ADMIN OPTION FOR` clause\n'
+        'in the `REVOKE` role statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.14.4')
+
+RQ_SRS_006_RBAC_Revoke_Role_Syntax = Requirement(
+    name='RQ.SRS-006.RBAC.Revoke.Role.Syntax',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support the following syntax for the `REVOKE` role statement\n'
+        '\n'
+        '```sql\n'
+        'REVOKE [ON CLUSTER cluster_name] [ADMIN OPTION FOR]\n'
+        '    role [,...]\n'
+        '    FROM {user | role | CURRENT_USER} [,...] | ALL | ALL EXCEPT {user_name | role_name | CURRENT_USER} [,...]\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.14.5')
+
+RQ_SRS_006_RBAC_Show_Grants = Requirement(
+    name='RQ.SRS-006.RBAC.Show.Grants',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support listing all the privileges granted to current user and role\n'
+        'using the `SHOW GRANTS` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.15.1')
+
+RQ_SRS_006_RBAC_Show_Grants_For = Requirement(
+    name='RQ.SRS-006.RBAC.Show.Grants.For',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support listing all the privileges granted to a user or a role\n'
+        'using the `FOR` clause in the `SHOW GRANTS` statement.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.15.2')
+
+RQ_SRS_006_RBAC_Show_Grants_Syntax = Requirement(
+    name='RQ.SRS-006.RBAC.Show.Grants.Syntax',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[Clickhouse] SHALL use the following syntax for the `SHOW GRANTS` statement\n'
+        '\n'
+        '``` sql\n'
+        'SHOW GRANTS [FOR user_or_role]\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.15.3')
+
+RQ_SRS_006_RBAC_Table_PublicTables = Requirement(
+    name='RQ.SRS-006.RBAC.Table.PublicTables',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support that a user without any privileges will be able to access the following tables\n'
+        '\n'
+        '* system.one\n'
+        '* system.numbers\n'
+        '* system.contributors\n'
+        '* system.functions\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.16.1')
+
+RQ_SRS_006_RBAC_Table_SensitiveTables = Requirement(
+    name='RQ.SRS-006.RBAC.Table.SensitiveTables',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL not support a user with no privileges accessing the following `system` tables:\n'
+        '\n'
+        '* processes\n'
+        '* query_log\n'
+        '* query_thread_log\n'
+        '* clusters\n'
+        '* events\n'
+        '* graphite_retentions\n'
+        '* stack_trace\n'
+        '* trace_log\n'
+        '* user_directories\n'
+        '* zookeeper\n'
+        '* macros\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.16.2')
+
+RQ_SRS_006_RBAC_DistributedTable_Create = Requirement(
+    name='RQ.SRS-006.RBAC.DistributedTable.Create',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully `CREATE` a distributed table if and only if\n'
+        'the user has **create table** privilege on the table and **remote** privilege on *.*\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.17.1')
+
+RQ_SRS_006_RBAC_DistributedTable_Select = Requirement(
+    name='RQ.SRS-006.RBAC.DistributedTable.Select',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully `SELECT` from a distributed table if and only if\n'
+        'the user has **select** privilege on the table and on the remote table specified in the `CREATE` query of the distributed table.\n'
+        '\n'
+        'Does not require **select** privilege for the remote table if the remote table does not exist on the same server as the user.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.17.2')
+
+RQ_SRS_006_RBAC_DistributedTable_Insert = Requirement(
+    name='RQ.SRS-006.RBAC.DistributedTable.Insert',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully `INSERT` into a distributed table if and only if\n'
+        'the user has **insert** privilege on the table and on the remote table specified in the `CREATE` query of the distributed table.\n'
+        '\n'
+        'Does not require **insert** privilege for the remote table if the remote table does not exist on the same server as the user,\n'
+        'insert executes into the remote table on a different server.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.17.3')
+
+RQ_SRS_006_RBAC_DistributedTable_SpecialTables = Requirement(
+    name='RQ.SRS-006.RBAC.DistributedTable.SpecialTables',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute a query using a distributed table that uses one of the special tables if and only if\n'
+        'the user has the necessary privileges to interact with that special table, either granted directly or through a role.\n'
+        'Special tables include:\n'
+        '* materialized view\n'
+        '* distributed table\n'
+        '* source table of a materialized view\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.17.4')
+
+RQ_SRS_006_RBAC_DistributedTable_LocalUser = Requirement(
+    name='RQ.SRS-006.RBAC.DistributedTable.LocalUser',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute a query using a distributed table from\n'
+        'a user present locally, but not remotely.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.17.5')
+
+RQ_SRS_006_RBAC_DistributedTable_SameUserDifferentNodesDifferentPrivileges = Requirement(
+    name='RQ.SRS-006.RBAC.DistributedTable.SameUserDifferentNodesDifferentPrivileges',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute a query using a distributed table by a user that exists on multiple nodes\n'
+        'if and only if the user has the required privileges on the node the query is being executed from.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.17.6')
+
+RQ_SRS_006_RBAC_View = Requirement(
+    name='RQ.SRS-006.RBAC.View',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support controlling access to **create**, **select** and **drop**\n'
+        'privileges for a view for users or roles.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.18.1.1')
+
+RQ_SRS_006_RBAC_View_Create = Requirement(
+    name='RQ.SRS-006.RBAC.View.Create',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL only successfully execute a `CREATE VIEW` command if and only if\n'
+        'the user has **create view** privilege either explicitly or through roles.\n'
+        '\n'
+        'If the stored query includes one or more source tables, the user must have **select** privilege\n'
+        'on all the source tables either explicitly or through a role.\n'
+        'For example,\n'
+        '```sql\n'
+        'CREATE VIEW view AS SELECT * FROM source_table\n'
+        'CREATE VIEW view AS SELECT * FROM table0 WHERE column IN (SELECT column FROM table1 WHERE column IN (SELECT column FROM table2 WHERE expression))\n'
+        'CREATE VIEW view AS SELECT * FROM table0 JOIN table1 USING column\n'
+        'CREATE VIEW view AS SELECT * FROM table0 UNION ALL SELECT * FROM table1 UNION ALL SELECT * FROM table2\n'
+        'CREATE VIEW view AS SELECT column FROM table0 JOIN table1 USING column UNION ALL SELECT column FROM table2 WHERE column IN (SELECT column FROM table3 WHERE column IN (SELECT column FROM table4 WHERE expression))\n'
+        'CREATE VIEW view0 AS SELECT column FROM view1 UNION ALL SELECT column FROM view2\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.18.1.2')
+
+RQ_SRS_006_RBAC_View_Select = Requirement(
+    name='RQ.SRS-006.RBAC.View.Select',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL only successfully `SELECT` from a view if and only if\n'
+        'the user has **select** privilege for that view either explicitly or through a role.\n'
+        '\n'
+        'If the stored query includes one or more source tables, the user must have **select** privilege\n'
+        'on all the source tables either explicitly or through a role.\n'
+        'For example,\n'
+        '```sql\n'
+        'CREATE VIEW view AS SELECT * FROM source_table\n'
+        'CREATE VIEW view AS SELECT * FROM table0 WHERE column IN (SELECT column FROM table1 WHERE column IN (SELECT column FROM table2 WHERE expression))\n'
+        'CREATE VIEW view AS SELECT * FROM table0 JOIN table1 USING column\n'
+        'CREATE VIEW view AS SELECT * FROM table0 UNION ALL SELECT * FROM table1 UNION ALL SELECT * FROM table2\n'
+        'CREATE VIEW view AS SELECT column FROM table0 JOIN table1 USING column UNION ALL SELECT column FROM table2 WHERE column IN (SELECT column FROM table3 WHERE column IN (SELECT column FROM table4 WHERE expression))\n'
+        'CREATE VIEW view0 AS SELECT column FROM view1 UNION ALL SELECT column FROM view2\n'
+        '\n'
+        'SELECT * FROM view\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.18.1.3')
+
+RQ_SRS_006_RBAC_View_Drop = Requirement(
+    name='RQ.SRS-006.RBAC.View.Drop',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL only successfully execute a `DROP VIEW` command if and only if\n'
+        'the user has **drop view** privilege on that view either explicitly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.18.1.4')
+
+RQ_SRS_006_RBAC_MaterializedView = Requirement(
+    name='RQ.SRS-006.RBAC.MaterializedView',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support controlling access to **create**, **select**, **alter** and **drop**\n'
+        'privileges for a materialized view for users or roles.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.18.2.1')
+
+RQ_SRS_006_RBAC_MaterializedView_Create = Requirement(
+    name='RQ.SRS-006.RBAC.MaterializedView.Create',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL only successfully execute a `CREATE MATERIALIZED VIEW` command if and only if\n'
+        'the user has **create view** privilege either explicitly or through roles.\n'
+        '\n'
+        'If `POPULATE` is specified, the user must have `INSERT` privilege on the view,\n'
+        'either explicitly or through roles.\n'
+        'For example,\n'
+        '```sql\n'
+        'CREATE MATERIALIZED VIEW view ENGINE = Memory POPULATE AS SELECT * FROM source_table\n'
+        '```\n'
+        '\n'
+        'If the stored query includes one or more source tables, the user must have **select** privilege\n'
+        'on all the source tables either explicitly or through a role.\n'
+        'For example,\n'
+        '```sql\n'
+        'CREATE MATERIALIZED VIEW view ENGINE = Memory AS SELECT * FROM source_table\n'
+        'CREATE MATERIALIZED VIEW view ENGINE = Memory AS SELECT * FROM table0 WHERE column IN (SELECT column FROM table1 WHERE column IN (SELECT column FROM table2 WHERE expression))\n'
+        'CREATE MATERIALIZED VIEW view ENGINE = Memory AS SELECT * FROM table0 JOIN table1 USING column\n'
+        'CREATE MATERIALIZED VIEW view ENGINE = Memory AS SELECT * FROM table0 UNION ALL SELECT * FROM table1 UNION ALL SELECT * FROM table2\n'
+        'CREATE MATERIALIZED VIEW view ENGINE = Memory AS SELECT column FROM table0 JOIN table1 USING column UNION ALL SELECT column FROM table2 WHERE column IN (SELECT column FROM table3 WHERE column IN (SELECT column FROM table4 WHERE expression))\n'
+        'CREATE MATERIALIZED VIEW view0 ENGINE = Memory AS SELECT column FROM view1 UNION ALL SELECT column FROM view2\n'
+        '```\n'
+        '\n'
+        'If the materialized view has a target table explicitly declared in the `TO` clause, the user must have\n'
+        '**insert** and **select** privilege on the target table.\n'
+        'For example,\n'
+        '```sql\n'
+        'CREATE MATERIALIZED VIEW view TO target_table AS SELECT * FROM source_table\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.18.2.2')
+
+RQ_SRS_006_RBAC_MaterializedView_Select = Requirement(
+    name='RQ.SRS-006.RBAC.MaterializedView.Select',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL only successfully `SELECT` from a materialized view if and only if\n'
+        'the user has **select** privilege for that view either explicitly or through a role.\n'
+        '\n'
+        'If the stored query includes one or more source tables, the user must have **select** privilege\n'
+        'on all the source tables either explicitly or through a role.\n'
+        'For example,\n'
+        '```sql\n'
+        'CREATE MATERIALIZED VIEW view ENGINE = Memory AS SELECT * FROM source_table\n'
+        'CREATE MATERIALIZED VIEW view ENGINE = Memory AS SELECT * FROM table0 WHERE column IN (SELECT column FROM table1 WHERE column IN (SELECT column FROM table2 WHERE expression))\n'
+        'CREATE MATERIALIZED VIEW view ENGINE = Memory AS SELECT * FROM table0 JOIN table1 USING column\n'
+        'CREATE MATERIALIZED VIEW view ENGINE = Memory AS SELECT * FROM table0 UNION ALL SELECT * FROM table1 UNION ALL SELECT * FROM table2\n'
+        'CREATE MATERIALIZED VIEW view ENGINE = Memory AS SELECT column FROM table0 JOIN table1 USING column UNION ALL SELECT column FROM table2 WHERE column IN (SELECT column FROM table3 WHERE column IN (SELECT column FROM table4 WHERE expression))\n'
+        'CREATE MATERIALIZED VIEW view0 ENGINE = Memory AS SELECT column FROM view1 UNION ALL SELECT column FROM view2\n'
+        '\n'
+        'SELECT * FROM view\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.18.2.3')
+
+RQ_SRS_006_RBAC_MaterializedView_Select_TargetTable = Requirement(
+    name='RQ.SRS-006.RBAC.MaterializedView.Select.TargetTable',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL only successfully `SELECT` from the target table, implicit or explicit, of a materialized view if and only if\n'
+        'the user has `SELECT` privilege for the table, either explicitly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.18.2.4')
+
+RQ_SRS_006_RBAC_MaterializedView_Select_SourceTable = Requirement(
+    name='RQ.SRS-006.RBAC.MaterializedView.Select.SourceTable',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL only successfully `SELECT` from the source table of a materialized view if and only if\n'
+        'the user has `SELECT` privilege for the table, either explicitly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.18.2.5')
+
+RQ_SRS_006_RBAC_MaterializedView_Drop = Requirement(
+    name='RQ.SRS-006.RBAC.MaterializedView.Drop',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL only successfully execute a `DROP VIEW` command if and only if\n'
+        'the user has **drop view** privilege on that view either explicitly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.18.2.6')
+
+RQ_SRS_006_RBAC_MaterializedView_ModifyQuery = Requirement(
+    name='RQ.SRS-006.RBAC.MaterializedView.ModifyQuery',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL only successfully execute a `MODIFY QUERY` command if and only if\n'
+        'the user has **modify query** privilege on that view either explicitly or through a role.\n'
+        '\n'
+        'If the new query includes one or more source tables, the user must have **select** privilege\n'
+        'on all the source tables either explicitly or through a role.\n'
+        'For example,\n'
+        '```sql\n'
+        'ALTER TABLE view MODIFY QUERY SELECT * FROM source_table\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.18.2.7')
+
+RQ_SRS_006_RBAC_MaterializedView_Insert = Requirement(
+    name='RQ.SRS-006.RBAC.MaterializedView.Insert',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL only succesfully `INSERT` into a materialized view if and only if\n'
+        'the user has `INSERT` privilege on the view, either explicitly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.18.2.8')
+
+RQ_SRS_006_RBAC_MaterializedView_Insert_SourceTable = Requirement(
+    name='RQ.SRS-006.RBAC.MaterializedView.Insert.SourceTable',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL only succesfully `INSERT` into a source table of a materialized view if and only if\n'
+        'the user has `INSERT` privilege on the source table, either explicitly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.18.2.9')
+
+RQ_SRS_006_RBAC_MaterializedView_Insert_TargetTable = Requirement(
+    name='RQ.SRS-006.RBAC.MaterializedView.Insert.TargetTable',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL only succesfully `INSERT` into a target table of a materialized view if and only if\n'
+        'the user has `INSERT` privelege on the target table, either explicitly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.18.2.10')
+
+RQ_SRS_006_RBAC_LiveView = Requirement(
+    name='RQ.SRS-006.RBAC.LiveView',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support controlling access to **create**, **select**, **alter** and **drop**\n'
+        'privileges for a live view for users or roles.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.18.3.1')
+
+RQ_SRS_006_RBAC_LiveView_Create = Requirement(
+    name='RQ.SRS-006.RBAC.LiveView.Create',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL only successfully execute a `CREATE LIVE VIEW` command if and only if\n'
+        'the user has **create view** privilege either explicitly or through roles.\n'
+        '\n'
+        'If the stored query includes one or more source tables, the user must have **select** privilege\n'
+        'on all the source tables either explicitly or through a role.\n'
+        'For example,\n'
+        '```sql\n'
+        'CREATE LIVE VIEW view AS SELECT * FROM source_table\n'
+        'CREATE LIVE VIEW view AS SELECT * FROM table0 WHERE column IN (SELECT column FROM table1 WHERE column IN (SELECT column FROM table2 WHERE expression))\n'
+        'CREATE LIVE VIEW view AS SELECT * FROM table0 JOIN table1 USING column\n'
+        'CREATE LIVE VIEW view AS SELECT * FROM table0 UNION ALL SELECT * FROM table1 UNION ALL SELECT * FROM table2\n'
+        'CREATE LIVE VIEW view AS SELECT column FROM table0 JOIN table1 USING column UNION ALL SELECT column FROM table2 WHERE column IN (SELECT column FROM table3 WHERE column IN (SELECT column FROM table4 WHERE expression))\n'
+        'CREATE LIVE VIEW view0 AS SELECT column FROM view1 UNION ALL SELECT column FROM view2\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.18.3.2')
+
+RQ_SRS_006_RBAC_LiveView_Select = Requirement(
+    name='RQ.SRS-006.RBAC.LiveView.Select',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL only successfully `SELECT` from a live view if and only if\n'
+        'the user has **select** privilege for that view either explicitly or through a role.\n'
+        '\n'
+        'If the stored query includes one or more source tables, the user must have **select** privilege\n'
+        'on all the source tables either explicitly or through a role.\n'
+        'For example,\n'
+        '```sql\n'
+        'CREATE LIVE VIEW view AS SELECT * FROM source_table\n'
+        'CREATE LIVE VIEW view AS SELECT * FROM table0 WHERE column IN (SELECT column FROM table1 WHERE column IN (SELECT column FROM table2 WHERE expression))\n'
+        'CREATE LIVE VIEW view AS SELECT * FROM table0 JOIN table1 USING column\n'
+        'CREATE LIVE VIEW view AS SELECT * FROM table0 UNION ALL SELECT * FROM table1 UNION ALL SELECT * FROM table2\n'
+        'CREATE LIVE VIEW view AS SELECT column FROM table0 JOIN table1 USING column UNION ALL SELECT column FROM table2 WHERE column IN (SELECT column FROM table3 WHERE column IN (SELECT column FROM table4 WHERE expression))\n'
+        'CREATE LIVE VIEW view0 AS SELECT column FROM view1 UNION ALL SELECT column FROM view2\n'
+        '\n'
+        'SELECT * FROM view\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.18.3.3')
+
+RQ_SRS_006_RBAC_LiveView_Drop = Requirement(
+    name='RQ.SRS-006.RBAC.LiveView.Drop',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL only successfully execute a `DROP VIEW` command if and only if\n'
+        'the user has **drop view** privilege on that view either explicitly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.18.3.4')
+
+RQ_SRS_006_RBAC_LiveView_Refresh = Requirement(
+    name='RQ.SRS-006.RBAC.LiveView.Refresh',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL only successfully execute an `ALTER LIVE VIEW REFRESH` command if and only if\n'
+        'the user has **refresh** privilege on that view either explicitly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.18.3.5')
+
+RQ_SRS_006_RBAC_Select = Requirement(
+    name='RQ.SRS-006.RBAC.Select',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL execute `SELECT` if and only if the user\n'
+        'has the **select** privilege for the destination table\n'
+        'either because of the explicit grant or through one of the roles assigned to the user.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.19.1')
+
+RQ_SRS_006_RBAC_Select_Column = Requirement(
+    name='RQ.SRS-006.RBAC.Select.Column',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support granting or revoking **select** privilege\n'
+        'for one or more specified columns in a table to one or more **users** or **roles**.\n'
+        'Any `SELECT` statements SHALL not to be executed, unless the user\n'
+        'has the **select** privilege for the destination column\n'
+        'either because of the explicit grant or through one of the roles assigned to the user.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.19.2')
+
+RQ_SRS_006_RBAC_Select_Cluster = Requirement(
+    name='RQ.SRS-006.RBAC.Select.Cluster',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support granting or revoking **select** privilege\n'
+        'on a specified cluster to one or more **users** or **roles**.\n'
+        'Any `SELECT` statements SHALL succeed only on nodes where\n'
+        'the table exists and privilege was granted.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.19.3')
+
+RQ_SRS_006_RBAC_Select_TableEngines = Requirement(
+    name='RQ.SRS-006.RBAC.Select.TableEngines',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support controlling access to the **select** privilege\n'
+        'on tables created using the following engines\n'
+        '\n'
+        '* MergeTree\n'
+        '* ReplacingMergeTree\n'
+        '* SummingMergeTree\n'
+        '* AggregatingMergeTree\n'
+        '* CollapsingMergeTree\n'
+        '* VersionedCollapsingMergeTree\n'
+        '* GraphiteMergeTree\n'
+        '* ReplicatedMergeTree\n'
+        '* ReplicatedSummingMergeTree\n'
+        '* ReplicatedReplacingMergeTree\n'
+        '* ReplicatedAggregatingMergeTree\n'
+        '* ReplicatedCollapsingMergeTree\n'
+        '* ReplicatedVersionedCollapsingMergeTree\n'
+        '* ReplicatedGraphiteMergeTree\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.19.4')
+
+RQ_SRS_006_RBAC_Insert = Requirement(
+    name='RQ.SRS-006.RBAC.Insert',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL execute `INSERT INTO` if and only if the user\n'
+        'has the **insert** privilege for the destination table\n'
+        'either because of the explicit grant or through one of the roles assigned to the user.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.20.1')
+
+RQ_SRS_006_RBAC_Insert_Column = Requirement(
+    name='RQ.SRS-006.RBAC.Insert.Column',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support granting or revoking **insert** privilege\n'
+        'for one or more specified columns in a table to one or more **users** or **roles**.\n'
+        'Any `INSERT INTO` statements SHALL not to be executed, unless the user\n'
+        'has the **insert** privilege for the destination column\n'
+        'either because of the explicit grant or through one of the roles assigned to the user.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.20.2')
+
+RQ_SRS_006_RBAC_Insert_Cluster = Requirement(
+    name='RQ.SRS-006.RBAC.Insert.Cluster',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support granting or revoking **insert** privilege\n'
+        'on a specified cluster to one or more **users** or **roles**.\n'
+        'Any `INSERT INTO` statements SHALL succeed only on nodes where\n'
+        'the table exists and privilege was granted.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.20.3')
+
+RQ_SRS_006_RBAC_Insert_TableEngines = Requirement(
+    name='RQ.SRS-006.RBAC.Insert.TableEngines',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support controlling access to the **insert** privilege\n'
+        'on tables created using the following engines\n'
+        '\n'
+        '* MergeTree\n'
+        '* ReplacingMergeTree\n'
+        '* SummingMergeTree\n'
+        '* AggregatingMergeTree\n'
+        '* CollapsingMergeTree\n'
+        '* VersionedCollapsingMergeTree\n'
+        '* GraphiteMergeTree\n'
+        '* ReplicatedMergeTree\n'
+        '* ReplicatedSummingMergeTree\n'
+        '* ReplicatedReplacingMergeTree\n'
+        '* ReplicatedAggregatingMergeTree\n'
+        '* ReplicatedCollapsingMergeTree\n'
+        '* ReplicatedVersionedCollapsingMergeTree\n'
+        '* ReplicatedGraphiteMergeTree\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.20.4')
+
+RQ_SRS_006_RBAC_Privileges_AlterColumn = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.AlterColumn',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support controlling access to the **alter column** privilege\n'
+        'for a database or a specific table to one or more **users** or **roles**.\n'
+        'Any `ALTER TABLE ... ADD|DROP|CLEAR|COMMENT|MODIFY COLUMN` statements SHALL\n'
+        'return an error, unless the user has the **alter column** privilege for\n'
+        'the destination table either because of the explicit grant or through one of\n'
+        'the roles assigned to the user.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.21.1.1')
+
+RQ_SRS_006_RBAC_Privileges_AlterColumn_Grant = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.AlterColumn.Grant',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support granting **alter column** privilege\n'
+        'for a database or a specific table to one or more **users** or **roles**.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.21.1.2')
+
+RQ_SRS_006_RBAC_Privileges_AlterColumn_Revoke = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.AlterColumn.Revoke',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support revoking **alter column** privilege\n'
+        'for a database or a specific table to one or more **users** or **roles**\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.21.1.3')
+
+RQ_SRS_006_RBAC_Privileges_AlterColumn_Column = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.AlterColumn.Column',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support granting or revoking **alter column** privilege\n'
+        'for one or more specified columns in a table to one or more **users** or **roles**.\n'
+        'Any `ALTER TABLE ... ADD|DROP|CLEAR|COMMENT|MODIFY COLUMN` statements SHALL return an error,\n'
+        'unless the user has the **alter column** privilege for the destination column\n'
+        'either because of the explicit grant or through one of the roles assigned to the user.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.21.1.4')
+
+RQ_SRS_006_RBAC_Privileges_AlterColumn_Cluster = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.AlterColumn.Cluster',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support granting or revoking **alter column** privilege\n'
+        'on a specified cluster to one or more **users** or **roles**.\n'
+        'Any `ALTER TABLE ... ADD|DROP|CLEAR|COMMENT|MODIFY COLUMN`\n'
+        'statements SHALL succeed only on nodes where the table exists and privilege was granted.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.21.1.5')
+
+RQ_SRS_006_RBAC_Privileges_AlterColumn_TableEngines = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.AlterColumn.TableEngines',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support controlling access to the **alter column** privilege\n'
+        'on tables created using the following engines\n'
+        '\n'
+        '* MergeTree\n'
+        '* ReplacingMergeTree\n'
+        '* SummingMergeTree\n'
+        '* AggregatingMergeTree\n'
+        '* CollapsingMergeTree\n'
+        '* VersionedCollapsingMergeTree\n'
+        '* GraphiteMergeTree\n'
+        '* ReplicatedMergeTree\n'
+        '* ReplicatedSummingMergeTree\n'
+        '* ReplicatedReplacingMergeTree\n'
+        '* ReplicatedAggregatingMergeTree\n'
+        '* ReplicatedCollapsingMergeTree\n'
+        '* ReplicatedVersionedCollapsingMergeTree\n'
+        '* ReplicatedGraphiteMergeTree\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.21.1.6')
+
+RQ_SRS_006_RBAC_Privileges_AlterIndex = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.AlterIndex',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support controlling access to the **alter index** privilege\n'
+        'for a database or a specific table to one or more **users** or **roles**.\n'
+        'Any `ALTER TABLE ... ORDER BY | ADD|DROP|MATERIALIZE|CLEAR INDEX` statements SHALL\n'
+        'return an error, unless the user has the **alter index** privilege for\n'
+        'the destination table either because of the explicit grant or through one of\n'
+        'the roles assigned to the user.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.21.2.1')
+
+RQ_SRS_006_RBAC_Privileges_AlterIndex_Grant = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.AlterIndex.Grant',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support granting **alter index** privilege\n'
+        'for a database or a specific table to one or more **users** or **roles**.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.21.2.2')
+
+RQ_SRS_006_RBAC_Privileges_AlterIndex_Revoke = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.AlterIndex.Revoke',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support revoking **alter index** privilege\n'
+        'for a database or a specific table to one or more **users** or **roles**\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.21.2.3')
+
+RQ_SRS_006_RBAC_Privileges_AlterIndex_Cluster = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.AlterIndex.Cluster',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support granting or revoking **alter index** privilege\n'
+        'on a specified cluster to one or more **users** or **roles**.\n'
+        'Any `ALTER TABLE ... ORDER BY | ADD|DROP|MATERIALIZE|CLEAR INDEX`\n'
+        'statements SHALL succeed only on nodes where the table exists and privilege was granted.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.21.2.4')
+
+RQ_SRS_006_RBAC_Privileges_AlterIndex_TableEngines = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.AlterIndex.TableEngines',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support controlling access to the **alter index** privilege\n'
+        'on tables created using the following engines\n'
+        '\n'
+        '* MergeTree\n'
+        '* ReplacingMergeTree\n'
+        '* SummingMergeTree\n'
+        '* AggregatingMergeTree\n'
+        '* CollapsingMergeTree\n'
+        '* VersionedCollapsingMergeTree\n'
+        '* GraphiteMergeTree\n'
+        '* ReplicatedMergeTree\n'
+        '* ReplicatedSummingMergeTree\n'
+        '* ReplicatedReplacingMergeTree\n'
+        '* ReplicatedAggregatingMergeTree\n'
+        '* ReplicatedCollapsingMergeTree\n'
+        '* ReplicatedVersionedCollapsingMergeTree\n'
+        '* ReplicatedGraphiteMergeTree\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.21.2.5')
+
+RQ_SRS_006_RBAC_Privileges_AlterConstraint = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.AlterConstraint',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support controlling access to the **alter constraint** privilege\n'
+        'for a database or a specific table to one or more **users** or **roles**.\n'
+        'Any `ALTER TABLE ... ADD|CREATE CONSTRAINT` statements SHALL\n'
+        'return an error, unless the user has the **alter constraint** privilege for\n'
+        'the destination table either because of the explicit grant or through one of\n'
+        'the roles assigned to the user.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.21.3.1')
+
+RQ_SRS_006_RBAC_Privileges_AlterConstraint_Grant = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.AlterConstraint.Grant',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support granting **alter constraint** privilege\n'
+        'for a database or a specific table to one or more **users** or **roles**.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.21.3.2')
+
+RQ_SRS_006_RBAC_Privileges_AlterConstraint_Revoke = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.AlterConstraint.Revoke',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support revoking **alter constraint** privilege\n'
+        'for a database or a specific table to one or more **users** or **roles**\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.21.3.3')
+
+RQ_SRS_006_RBAC_Privileges_AlterConstraint_Cluster = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.AlterConstraint.Cluster',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support granting or revoking **alter constraint** privilege\n'
+        'on a specified cluster to one or more **users** or **roles**.\n'
+        'Any `ALTER TABLE ... ADD|DROP CONSTRAINT`\n'
+        'statements SHALL succeed only on nodes where the table exists and privilege was granted.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.21.3.4')
+
+RQ_SRS_006_RBAC_Privileges_AlterConstraint_TableEngines = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.AlterConstraint.TableEngines',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support controlling access to the **alter constraint** privilege\n'
+        'on tables created using the following engines\n'
+        '\n'
+        '* MergeTree\n'
+        '* ReplacingMergeTree\n'
+        '* SummingMergeTree\n'
+        '* AggregatingMergeTree\n'
+        '* CollapsingMergeTree\n'
+        '* VersionedCollapsingMergeTree\n'
+        '* GraphiteMergeTree\n'
+        '* ReplicatedMergeTree\n'
+        '* ReplicatedSummingMergeTree\n'
+        '* ReplicatedReplacingMergeTree\n'
+        '* ReplicatedAggregatingMergeTree\n'
+        '* ReplicatedCollapsingMergeTree\n'
+        '* ReplicatedVersionedCollapsingMergeTree\n'
+        '* ReplicatedGraphiteMergeTree\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.21.3.5')
+
+RQ_SRS_006_RBAC_Privileges_AlterTTL = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.AlterTTL',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support controlling access to the **alter ttl** or **alter materialize ttl** privilege\n'
+        'for a database or a specific table to one or more **users** or **roles**.\n'
+        'Any `ALTER TABLE ... ALTER TTL | ALTER MATERIALIZE TTL` statements SHALL\n'
+        'return an error, unless the user has the **alter ttl** or **alter materialize ttl** privilege for\n'
+        'the destination table either because of the explicit grant or through one of\n'
+        'the roles assigned to the user.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.21.4.1')
+
+RQ_SRS_006_RBAC_Privileges_AlterTTL_Grant = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.AlterTTL.Grant',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support granting **alter ttl** or **alter materialize ttl** privilege\n'
+        'for a database or a specific table to one or more **users** or **roles**.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.21.4.2')
+
+RQ_SRS_006_RBAC_Privileges_AlterTTL_Revoke = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.AlterTTL.Revoke',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support revoking **alter ttl** or **alter materialize ttl** privilege\n'
+        'for a database or a specific table to one or more **users** or **roles**\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.21.4.3')
+
+RQ_SRS_006_RBAC_Privileges_AlterTTL_Cluster = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.AlterTTL.Cluster',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support granting or revoking **alter ttl** or **alter materialize ttl** privilege\n'
+        'on a specified cluster to one or more **users** or **roles**.\n'
+        'Any `ALTER TABLE ... ALTER TTL | ALTER MATERIALIZE TTL`\n'
+        'statements SHALL succeed only on nodes where the table exists and privilege was granted.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.21.4.4')
+
+RQ_SRS_006_RBAC_Privileges_AlterTTL_TableEngines = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.AlterTTL.TableEngines',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support controlling access to the **alter ttl** or **alter materialize ttl** privilege\n'
+        'on tables created using the following engines\n'
+        '\n'
+        '* MergeTree\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.21.4.5')
+
+RQ_SRS_006_RBAC_Privileges_AlterSettings = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.AlterSettings',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support controlling access to the **alter settings** privilege\n'
+        'for a database or a specific table to one or more **users** or **roles**.\n'
+        'Any `ALTER TABLE ... MODIFY SETTING setting` statements SHALL\n'
+        'return an error, unless the user has the **alter settings** privilege for\n'
+        'the destination table either because of the explicit grant or through one of\n'
+        'the roles assigned to the user. The **alter settings** privilege allows\n'
+        'modifying table engine settings. It doesn’t affect settings or server configuration parameters.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.21.5.1')
+
+RQ_SRS_006_RBAC_Privileges_AlterSettings_Grant = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.AlterSettings.Grant',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support granting **alter settings** privilege\n'
+        'for a database or a specific table to one or more **users** or **roles**.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.21.5.2')
+
+RQ_SRS_006_RBAC_Privileges_AlterSettings_Revoke = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.AlterSettings.Revoke',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support revoking **alter settings** privilege\n'
+        'for a database or a specific table to one or more **users** or **roles**\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.21.5.3')
+
+RQ_SRS_006_RBAC_Privileges_AlterSettings_Cluster = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.AlterSettings.Cluster',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support granting or revoking **alter settings** privilege\n'
+        'on a specified cluster to one or more **users** or **roles**.\n'
+        'Any `ALTER TABLE ... MODIFY SETTING setting`\n'
+        'statements SHALL succeed only on nodes where the table exists and privilege was granted.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.21.5.4')
+
+RQ_SRS_006_RBAC_Privileges_AlterSettings_TableEngines = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.AlterSettings.TableEngines',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support controlling access to the **alter settings** privilege\n'
+        'on tables created using the following engines\n'
+        '\n'
+        '* MergeTree\n'
+        '* ReplacingMergeTree\n'
+        '* SummingMergeTree\n'
+        '* AggregatingMergeTree\n'
+        '* CollapsingMergeTree\n'
+        '* VersionedCollapsingMergeTree\n'
+        '* GraphiteMergeTree\n'
+        '* ReplicatedMergeTree\n'
+        '* ReplicatedSummingMergeTree\n'
+        '* ReplicatedReplacingMergeTree\n'
+        '* ReplicatedAggregatingMergeTree\n'
+        '* ReplicatedCollapsingMergeTree\n'
+        '* ReplicatedVersionedCollapsingMergeTree\n'
+        '* ReplicatedGraphiteMergeTree\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.21.5.5')
+
+RQ_SRS_006_RBAC_Privileges_AlterUpdate = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.AlterUpdate',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `ALTER UPDATE` statement if and only if the user has **alter update** privilege for that column,\n'
+        'either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.21.6.1')
+
+RQ_SRS_006_RBAC_Privileges_AlterUpdate_Grant = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.AlterUpdate.Grant',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support granting **alter update** privilege on a column level\n'
+        'to one or more **users** or **roles**.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.21.6.2')
+
+RQ_SRS_006_RBAC_Privileges_AlterUpdate_Revoke = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.AlterUpdate.Revoke',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support revoking **alter update** privilege on a column level\n'
+        'from one or more **users** or **roles**.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.21.6.3')
+
+RQ_SRS_006_RBAC_Privileges_AlterUpdate_TableEngines = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.AlterUpdate.TableEngines',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support controlling access to the **alter update** privilege\n'
+        'on tables created using the following engines\n'
+        '\n'
+        '* MergeTree\n'
+        '* ReplacingMergeTree\n'
+        '* SummingMergeTree\n'
+        '* AggregatingMergeTree\n'
+        '* CollapsingMergeTree\n'
+        '* VersionedCollapsingMergeTree\n'
+        '* GraphiteMergeTree\n'
+        '* ReplicatedMergeTree\n'
+        '* ReplicatedSummingMergeTree\n'
+        '* ReplicatedReplacingMergeTree\n'
+        '* ReplicatedAggregatingMergeTree\n'
+        '* ReplicatedCollapsingMergeTree\n'
+        '* ReplicatedVersionedCollapsingMergeTree\n'
+        '* ReplicatedGraphiteMergeTree\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.21.6.4')
+
+RQ_SRS_006_RBAC_Privileges_AlterDelete = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.AlterDelete',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `ALTER DELETE` statement if and only if the user has **alter delete** privilege for that table,\n'
+        'either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.21.7.1')
+
+RQ_SRS_006_RBAC_Privileges_AlterDelete_Grant = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.AlterDelete.Grant',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support granting **alter delete** privilege on a column level\n'
+        'to one or more **users** or **roles**.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.21.7.2')
+
+RQ_SRS_006_RBAC_Privileges_AlterDelete_Revoke = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.AlterDelete.Revoke',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support revoking **alter delete** privilege on a column level\n'
+        'from one or more **users** or **roles**.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.21.7.3')
+
+RQ_SRS_006_RBAC_Privileges_AlterDelete_TableEngines = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.AlterDelete.TableEngines',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support controlling access to the **alter delete** privilege\n'
+        'on tables created using the following engines\n'
+        '\n'
+        '* MergeTree\n'
+        '* ReplacingMergeTree\n'
+        '* SummingMergeTree\n'
+        '* AggregatingMergeTree\n'
+        '* CollapsingMergeTree\n'
+        '* VersionedCollapsingMergeTree\n'
+        '* GraphiteMergeTree\n'
+        '* ReplicatedMergeTree\n'
+        '* ReplicatedSummingMergeTree\n'
+        '* ReplicatedReplacingMergeTree\n'
+        '* ReplicatedAggregatingMergeTree\n'
+        '* ReplicatedCollapsingMergeTree\n'
+        '* ReplicatedVersionedCollapsingMergeTree\n'
+        '* ReplicatedGraphiteMergeTree\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.21.7.4')
+
+RQ_SRS_006_RBAC_Privileges_AlterFreeze = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.AlterFreeze',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `ALTER FREEZE` statement if and only if the user has **alter freeze** privilege for that table,\n'
+        'either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.21.8.1')
+
+RQ_SRS_006_RBAC_Privileges_AlterFreeze_Grant = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.AlterFreeze.Grant',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support granting **alter freeze** privilege on a column level\n'
+        'to one or more **users** or **roles**.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.21.8.2')
+
+RQ_SRS_006_RBAC_Privileges_AlterFreeze_Revoke = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.AlterFreeze.Revoke',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support revoking **alter freeze** privilege on a column level\n'
+        'from one or more **users** or **roles**.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.21.8.3')
+
+RQ_SRS_006_RBAC_Privileges_AlterFreeze_TableEngines = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.AlterFreeze.TableEngines',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support controlling access to the **alter freeze** privilege\n'
+        'on tables created using the following engines\n'
+        '\n'
+        '* MergeTree\n'
+        '* ReplacingMergeTree\n'
+        '* SummingMergeTree\n'
+        '* AggregatingMergeTree\n'
+        '* CollapsingMergeTree\n'
+        '* VersionedCollapsingMergeTree\n'
+        '* GraphiteMergeTree\n'
+        '* ReplicatedMergeTree\n'
+        '* ReplicatedSummingMergeTree\n'
+        '* ReplicatedReplacingMergeTree\n'
+        '* ReplicatedAggregatingMergeTree\n'
+        '* ReplicatedCollapsingMergeTree\n'
+        '* ReplicatedVersionedCollapsingMergeTree\n'
+        '* ReplicatedGraphiteMergeTree\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.21.8.4')
+
+RQ_SRS_006_RBAC_Privileges_AlterFetch = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.AlterFetch',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `ALTER FETCH` statement if and only if the user has **alter fetch** privilege for that table,\n'
+        'either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.21.9.1')
+
+RQ_SRS_006_RBAC_Privileges_AlterFetch_Grant = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.AlterFetch.Grant',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support granting **alter fetch** privilege on a column level\n'
+        'to one or more **users** or **roles**.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.21.9.2')
+
+RQ_SRS_006_RBAC_Privileges_AlterFetch_Revoke = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.AlterFetch.Revoke',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support revoking **alter fetch** privilege on a column level\n'
+        'from one or more **users** or **roles**.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.21.9.3')
+
+RQ_SRS_006_RBAC_Privileges_AlterFetch_TableEngines = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.AlterFetch.TableEngines',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support controlling access to the **alter fetch** privilege\n'
+        'on tables created using the following engines\n'
+        '\n'
+        '* ReplicatedMergeTree\n'
+        '* ReplicatedSummingMergeTree\n'
+        '* ReplicatedReplacingMergeTree\n'
+        '* ReplicatedAggregatingMergeTree\n'
+        '* ReplicatedCollapsingMergeTree\n'
+        '* ReplicatedVersionedCollapsingMergeTree\n'
+        '* ReplicatedGraphiteMergeTree\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.21.9.4')
+
+RQ_SRS_006_RBAC_Privileges_AlterMove = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.AlterMove',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `ALTER MOVE` statement if and only if the user has **alter move**, **select**, and **alter delete** privilege on the source table\n'
+        'and **insert** privilege on the target table, either directly or through a role.\n'
+        'For example,\n'
+        '```sql\n'
+        'ALTER TABLE source_table MOVE PARTITION 1 TO target_table\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.21.10.1')
+
+RQ_SRS_006_RBAC_Privileges_AlterMove_Grant = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.AlterMove.Grant',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support granting **alter move** privilege on a column level\n'
+        'to one or more **users** or **roles**.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.21.10.2')
+
+RQ_SRS_006_RBAC_Privileges_AlterMove_Revoke = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.AlterMove.Revoke',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support revoking **alter move** privilege on a column level\n'
+        'from one or more **users** or **roles**.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.21.10.3')
+
+RQ_SRS_006_RBAC_Privileges_AlterMove_TableEngines = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.AlterMove.TableEngines',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support controlling access to the **alter move** privilege\n'
+        'on tables created using the following engines\n'
+        '\n'
+        '* MergeTree\n'
+        '* ReplacingMergeTree\n'
+        '* SummingMergeTree\n'
+        '* AggregatingMergeTree\n'
+        '* CollapsingMergeTree\n'
+        '* VersionedCollapsingMergeTree\n'
+        '* GraphiteMergeTree\n'
+        '* ReplicatedMergeTree\n'
+        '* ReplicatedSummingMergeTree\n'
+        '* ReplicatedReplacingMergeTree\n'
+        '* ReplicatedAggregatingMergeTree\n'
+        '* ReplicatedCollapsingMergeTree\n'
+        '* ReplicatedVersionedCollapsingMergeTree\n'
+        '* ReplicatedGraphiteMergeTree\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.21.10.4')
+
+RQ_SRS_006_RBAC_Privileges_CreateTable = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.CreateTable',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL only successfully execute a `CREATE TABLE` command if and only if\n'
+        'the user has **create table** privilege either explicitly or through roles.\n'
+        '\n'
+        'If the stored query includes one or more source tables, the user must have **select** privilege\n'
+        "on all the source tables and **insert** for the table they're trying to create either explicitly or through a role.\n"
+        'For example,\n'
+        '```sql\n'
+        'CREATE TABLE table AS SELECT * FROM source_table\n'
+        'CREATE TABLE table AS SELECT * FROM table0 WHERE column IN (SELECT column FROM table1 WHERE column IN (SELECT column FROM table2 WHERE expression))\n'
+        'CREATE TABLE table AS SELECT * FROM table0 JOIN table1 USING column\n'
+        'CREATE TABLE table AS SELECT * FROM table0 UNION ALL SELECT * FROM table1 UNION ALL SELECT * FROM table2\n'
+        'CREATE TABLE table AS SELECT column FROM table0 JOIN table1 USING column UNION ALL SELECT column FROM table2 WHERE column IN (SELECT column FROM table3 WHERE column IN (SELECT column FROM table4 WHERE expression))\n'
+        'CREATE TABLE table0 AS SELECT column FROM table1 UNION ALL SELECT column FROM table2\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.22.1')
+
+RQ_SRS_006_RBAC_Privileges_CreateDatabase = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.CreateDatabase',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `CREATE DATABASE` statement if and only if the user has **create database** privilege on the database,\n'
+        'either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.22.2')
+
+RQ_SRS_006_RBAC_Privileges_CreateDictionary = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.CreateDictionary',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `CREATE DICTIONARY` statement if and only if the user has **create dictionary** privilege on the dictionary,\n'
+        'either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.22.3')
+
+RQ_SRS_006_RBAC_Privileges_CreateTemporaryTable = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.CreateTemporaryTable',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `CREATE TEMPORARY TABLE` statement if and only if the user has **create temporary table** privilege on the table,\n'
+        'either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.22.4')
+
+RQ_SRS_006_RBAC_Privileges_AttachDatabase = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.AttachDatabase',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `ATTACH DATABASE` statement if and only if the user has **create database** privilege on the database,\n'
+        'either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.23.1')
+
+RQ_SRS_006_RBAC_Privileges_AttachDictionary = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.AttachDictionary',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `ATTACH DICTIONARY` statement if and only if the user has **create dictionary** privilege on the dictionary,\n'
+        'either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.23.2')
+
+RQ_SRS_006_RBAC_Privileges_AttachTemporaryTable = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.AttachTemporaryTable',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `ATTACH TEMPORARY TABLE` statement if and only if the user has **create temporary table** privilege on the table,\n'
+        'either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.23.3')
+
+RQ_SRS_006_RBAC_Privileges_AttachTable = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.AttachTable',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `ATTACH TABLE` statement if and only if the user has **create table** privilege on the table,\n'
+        'either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.23.4')
+
+RQ_SRS_006_RBAC_Privileges_DropTable = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.DropTable',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `DROP TABLE` statement if and only if the user has **drop table** privilege on the table,\n'
+        'either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.24.1')
+
+RQ_SRS_006_RBAC_Privileges_DropDatabase = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.DropDatabase',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `DROP DATABASE` statement if and only if the user has **drop database** privilege on the database,\n'
+        'either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.24.2')
+
+RQ_SRS_006_RBAC_Privileges_DropDictionary = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.DropDictionary',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `DROP DICTIONARY` statement if and only if the user has **drop dictionary** privilege on the dictionary,\n'
+        'either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.24.3')
+
+RQ_SRS_006_RBAC_Privileges_DetachTable = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.DetachTable',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `DETACH TABLE` statement if and only if the user has **drop table** privilege on the table,\n'
+        'either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.25.1')
+
+RQ_SRS_006_RBAC_Privileges_DetachView = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.DetachView',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `DETACH VIEW` statement if and only if the user has **drop view** privilege on the view,\n'
+        'either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.25.2')
+
+RQ_SRS_006_RBAC_Privileges_DetachDatabase = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.DetachDatabase',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `DETACH DATABASE` statement if and only if the user has **drop database** privilege on the database,\n'
+        'either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.25.3')
+
+RQ_SRS_006_RBAC_Privileges_DetachDictionary = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.DetachDictionary',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `DETACH DICTIONARY` statement if and only if the user has **drop dictionary** privilege on the dictionary,\n'
+        'either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.25.4')
+
+RQ_SRS_006_RBAC_Privileges_Truncate = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.Truncate',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `TRUNCATE TABLE` statement if and only if the user has **truncate table** privilege on the table,\n'
+        'either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.26.1')
+
+RQ_SRS_006_RBAC_Privileges_Optimize = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.Optimize',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `OPTIMIZE TABLE` statement if and only if the user has **optimize table** privilege on the table,\n'
+        'either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.27.1')
+
+RQ_SRS_006_RBAC_Privileges_KillQuery = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.KillQuery',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `KILL QUERY` statement if and only if the user has **kill query** privilege,\n'
+        'either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.28.1')
+
+RQ_SRS_006_RBAC_Privileges_KillMutation = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.KillMutation',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `KILL MUTATION` statement if and only if\n'
+        'the user has the privilege that created the mutation, either directly or through a role.\n'
+        'For example, to `KILL MUTATION` after `ALTER UPDATE` query, the user needs `ALTER UPDATE` privilege.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.29.1')
+
+RQ_SRS_006_RBAC_Privileges_KillMutation_AlterUpdate = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.KillMutation.AlterUpdate',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `KILL MUTATION` query on an `ALTER UPDATE` mutation if and only if\n'
+        'the user has `ALTER UPDATE` privilege on the table where the mutation was created, either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.29.2')
+
+RQ_SRS_006_RBAC_Privileges_KillMutation_AlterDelete = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.KillMutation.AlterDelete',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `KILL MUTATION` query on an `ALTER DELETE` mutation if and only if\n'
+        'the user has `ALTER DELETE` privilege on the table where the mutation was created, either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.29.3')
+
+RQ_SRS_006_RBAC_Privileges_KillMutation_AlterDropColumn = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.KillMutation.AlterDropColumn',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `KILL MUTATION` query on an `ALTER DROP COLUMN` mutation if and only if\n'
+        'the user has `ALTER DROP COLUMN` privilege on the table where the mutation was created, either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.29.4')
+
+RQ_SRS_006_RBAC_ShowTables_Privilege = Requirement(
+    name='RQ.SRS-006.RBAC.ShowTables.Privilege',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL grant **show tables** privilege on a table to a user if that user has recieved any grant,\n'
+        'including `SHOW TABLES`, on that table, either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.30.1')
+
+RQ_SRS_006_RBAC_ShowTables_RequiredPrivilege = Requirement(
+    name='RQ.SRS-006.RBAC.ShowTables.RequiredPrivilege',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `SHOW TABLES` statement if and only if the user has **show tables** privilege,\n'
+        'or any privilege on the table either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.30.2')
+
+RQ_SRS_006_RBAC_ExistsTable_RequiredPrivilege = Requirement(
+    name='RQ.SRS-006.RBAC.ExistsTable.RequiredPrivilege',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `EXISTS table` statement if and only if the user has **show tables** privilege,\n'
+        'or any privilege on the table either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.30.3')
+
+RQ_SRS_006_RBAC_CheckTable_RequiredPrivilege = Requirement(
+    name='RQ.SRS-006.RBAC.CheckTable.RequiredPrivilege',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `CHECK table` statement if and only if the user has **show tables** privilege,\n'
+        'or any privilege on the table either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.30.4')
+
+RQ_SRS_006_RBAC_ShowDatabases_Privilege = Requirement(
+    name='RQ.SRS-006.RBAC.ShowDatabases.Privilege',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL grant **show databases** privilege on a database to a user if that user has recieved any grant,\n'
+        'including `SHOW DATABASES`, on that table, either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.30.5')
+
+RQ_SRS_006_RBAC_ShowDatabases_RequiredPrivilege = Requirement(
+    name='RQ.SRS-006.RBAC.ShowDatabases.RequiredPrivilege',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `SHOW DATABASES` statement if and only if the user has **show databases** privilege,\n'
+        'or any privilege on the database either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.30.6')
+
+RQ_SRS_006_RBAC_ShowCreateDatabase_RequiredPrivilege = Requirement(
+    name='RQ.SRS-006.RBAC.ShowCreateDatabase.RequiredPrivilege',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `SHOW CREATE DATABASE` statement if and only if the user has **show databases** privilege,\n'
+        'or any privilege on the database either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.30.7')
+
+RQ_SRS_006_RBAC_UseDatabase_RequiredPrivilege = Requirement(
+    name='RQ.SRS-006.RBAC.UseDatabase.RequiredPrivilege',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `USE database` statement if and only if the user has **show databases** privilege,\n'
+        'or any privilege on the database either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.30.8')
+
+RQ_SRS_006_RBAC_ShowColumns_Privilege = Requirement(
+    name='RQ.SRS-006.RBAC.ShowColumns.Privilege',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support granting or revoking the `SHOW COLUMNS` privilege.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.30.9')
+
+RQ_SRS_006_RBAC_ShowCreateTable_RequiredPrivilege = Requirement(
+    name='RQ.SRS-006.RBAC.ShowCreateTable.RequiredPrivilege',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `SHOW CREATE TABLE` statement if and only if the user has **show columns** privilege on that table,\n'
+        'either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.30.10')
+
+RQ_SRS_006_RBAC_DescribeTable_RequiredPrivilege = Requirement(
+    name='RQ.SRS-006.RBAC.DescribeTable.RequiredPrivilege',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `DESCRIBE table` statement if and only if the user has **show columns** privilege on that table,\n'
+        'either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.30.11')
+
+RQ_SRS_006_RBAC_ShowDictionaries_Privilege = Requirement(
+    name='RQ.SRS-006.RBAC.ShowDictionaries.Privilege',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL grant **show dictionaries** privilege on a dictionary to a user if that user has recieved any grant,\n'
+        'including `SHOW DICTIONARIES`, on that dictionary, either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.30.12')
+
+RQ_SRS_006_RBAC_ShowDictionaries_RequiredPrivilege = Requirement(
+    name='RQ.SRS-006.RBAC.ShowDictionaries.RequiredPrivilege',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `SHOW DICTIONARIES` statement if and only if the user has **show dictionaries** privilege,\n'
+        'or any privilege on the dictionary either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.30.13')
+
+RQ_SRS_006_RBAC_ShowCreateDictionary_RequiredPrivilege = Requirement(
+    name='RQ.SRS-006.RBAC.ShowCreateDictionary.RequiredPrivilege',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `SHOW CREATE DICTIONARY` statement if and only if the user has **show dictionaries** privilege,\n'
+        'or any privilege on the dictionary either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.30.14')
+
+RQ_SRS_006_RBAC_ExistsDictionary_RequiredPrivilege = Requirement(
+    name='RQ.SRS-006.RBAC.ExistsDictionary.RequiredPrivilege',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `EXISTS dictionary` statement if and only if the user has **show dictionaries** privilege,\n'
+        'or any privilege on the dictionary either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.30.15')
+
+RQ_SRS_006_RBAC_Privileges_CreateUser = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.CreateUser',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `CREATE USER` statement if and only if the user has **create user** privilege,\n'
+        'or either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.31.1')
+
+RQ_SRS_006_RBAC_Privileges_CreateUser_DefaultRole = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.CreateUser.DefaultRole',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `CREATE USER` statement with `DEFAULT ROLE <role>` clause if and only if\n'
+        'the user has **create user** privilege and the role with **admin option**, or either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.31.2')
+
+RQ_SRS_006_RBAC_Privileges_AlterUser = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.AlterUser',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `ALTER USER` statement if and only if the user has **alter user** privilege,\n'
+        'or either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.31.3')
+
+RQ_SRS_006_RBAC_Privileges_DropUser = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.DropUser',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `DROP USER` statement if and only if the user has **drop user** privilege,\n'
+        'or either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.31.4')
+
+RQ_SRS_006_RBAC_Privileges_CreateRole = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.CreateRole',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `CREATE ROLE` statement if and only if the user has **create role** privilege,\n'
+        'or either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.31.5')
+
+RQ_SRS_006_RBAC_Privileges_AlterRole = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.AlterRole',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `ALTER ROLE` statement if and only if the user has **alter role** privilege,\n'
+        'or either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.31.6')
+
+RQ_SRS_006_RBAC_Privileges_DropRole = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.DropRole',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `DROP ROLE` statement if and only if the user has **drop role** privilege,\n'
+        'or either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.31.7')
+
+RQ_SRS_006_RBAC_Privileges_CreateRowPolicy = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.CreateRowPolicy',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `CREATE ROW POLICY` statement if and only if the user has **create row policy** privilege,\n'
+        'or either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.31.8')
+
+RQ_SRS_006_RBAC_Privileges_AlterRowPolicy = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.AlterRowPolicy',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `ALTER ROW POLICY` statement if and only if the user has **alter row policy** privilege,\n'
+        'or either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.31.9')
+
+RQ_SRS_006_RBAC_Privileges_DropRowPolicy = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.DropRowPolicy',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `DROP ROW POLICY` statement if and only if the user has **drop row policy** privilege,\n'
+        'or either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.31.10')
+
+RQ_SRS_006_RBAC_Privileges_CreateQuota = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.CreateQuota',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `CREATE QUOTA` statement if and only if the user has **create quota** privilege,\n'
+        'or either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.31.11')
+
+RQ_SRS_006_RBAC_Privileges_AlterQuota = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.AlterQuota',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `ALTER QUOTA` statement if and only if the user has **alter quota** privilege,\n'
+        'or either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.31.12')
+
+RQ_SRS_006_RBAC_Privileges_DropQuota = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.DropQuota',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `DROP QUOTA` statement if and only if the user has **drop quota** privilege,\n'
+        'or either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.31.13')
+
+RQ_SRS_006_RBAC_Privileges_CreateSettingsProfile = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.CreateSettingsProfile',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `CREATE SETTINGS PROFILE` statement if and only if the user has **create settings profile** privilege,\n'
+        'or either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.31.14')
+
+RQ_SRS_006_RBAC_Privileges_AlterSettingsProfile = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.AlterSettingsProfile',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `ALTER SETTINGS PROFILE` statement if and only if the user has **alter settings profile** privilege,\n'
+        'or either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.31.15')
+
+RQ_SRS_006_RBAC_Privileges_DropSettingsProfile = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.DropSettingsProfile',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `DROP SETTINGS PROFILE` statement if and only if the user has **drop settings profile** privilege,\n'
+        'or either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.31.16')
+
+RQ_SRS_006_RBAC_Privileges_RoleAdmin = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.RoleAdmin',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute any role grant or revoke by a user with `ROLE ADMIN` privilege.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.31.17')
+
+RQ_SRS_006_RBAC_ShowUsers_Privilege = Requirement(
+    name='RQ.SRS-006.RBAC.ShowUsers.Privilege',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully grant `SHOW USERS` privilege when\n'
+        'the user is granted `SHOW USERS`, `SHOW CREATE USER`, `SHOW ACCESS`, or `ACCESS MANAGEMENT`.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.31.18.1')
+
+RQ_SRS_006_RBAC_ShowUsers_RequiredPrivilege = Requirement(
+    name='RQ.SRS-006.RBAC.ShowUsers.RequiredPrivilege',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `SHOW USERS` statement if and only if the user has **show users** privilege,\n'
+        'either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.31.18.2')
+
+RQ_SRS_006_RBAC_ShowCreateUser_RequiredPrivilege = Requirement(
+    name='RQ.SRS-006.RBAC.ShowCreateUser.RequiredPrivilege',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `SHOW CREATE USER` statement if and only if the user has **show users** privilege,\n'
+        'either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.31.18.3')
+
+RQ_SRS_006_RBAC_ShowRoles_Privilege = Requirement(
+    name='RQ.SRS-006.RBAC.ShowRoles.Privilege',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully grant `SHOW ROLES` privilege when\n'
+        'the user is granted `SHOW ROLES`, `SHOW CREATE ROLE`, `SHOW ACCESS`, or `ACCESS MANAGEMENT`.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.31.18.4')
+
+RQ_SRS_006_RBAC_ShowRoles_RequiredPrivilege = Requirement(
+    name='RQ.SRS-006.RBAC.ShowRoles.RequiredPrivilege',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `SHOW ROLES` statement if and only if the user has **show roles** privilege,\n'
+        'either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.31.18.5')
+
+RQ_SRS_006_RBAC_ShowCreateRole_RequiredPrivilege = Requirement(
+    name='RQ.SRS-006.RBAC.ShowCreateRole.RequiredPrivilege',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `SHOW CREATE ROLE` statement if and only if the user has **show roles** privilege,\n'
+        'either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.31.18.6')
+
+RQ_SRS_006_RBAC_ShowRowPolicies_Privilege = Requirement(
+    name='RQ.SRS-006.RBAC.ShowRowPolicies.Privilege',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully grant `SHOW ROW POLICIES` privilege when\n'
+        'the user is granted `SHOW ROW POLICIES`, `SHOW POLICIES`, `SHOW CREATE ROW POLICY`,\n'
+        '`SHOW CREATE POLICY`, `SHOW ACCESS`, or `ACCESS MANAGEMENT`.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.31.18.7')
+
+RQ_SRS_006_RBAC_ShowRowPolicies_RequiredPrivilege = Requirement(
+    name='RQ.SRS-006.RBAC.ShowRowPolicies.RequiredPrivilege',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `SHOW ROW POLICIES` or `SHOW POLICIES` statement if and only if\n'
+        'the user has **show row policies** privilege, either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.31.18.8')
+
+RQ_SRS_006_RBAC_ShowCreateRowPolicy_RequiredPrivilege = Requirement(
+    name='RQ.SRS-006.RBAC.ShowCreateRowPolicy.RequiredPrivilege',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `SHOW CREATE ROW POLICY` or `SHOW CREATE POLICY` statement\n'
+        'if and only if the user has **show row policies** privilege,either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.31.18.9')
+
+RQ_SRS_006_RBAC_ShowQuotas_Privilege = Requirement(
+    name='RQ.SRS-006.RBAC.ShowQuotas.Privilege',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully grant `SHOW QUOTAS` privilege when\n'
+        'the user is granted `SHOW QUOTAS`, `SHOW CREATE QUOTA`, `SHOW ACCESS`, or `ACCESS MANAGEMENT`.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.31.18.10')
+
+RQ_SRS_006_RBAC_ShowQuotas_RequiredPrivilege = Requirement(
+    name='RQ.SRS-006.RBAC.ShowQuotas.RequiredPrivilege',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `SHOW QUOTAS` statement if and only if the user has **show quotas** privilege,\n'
+        'either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.31.18.11')
+
+RQ_SRS_006_RBAC_ShowCreateQuota_RequiredPrivilege = Requirement(
+    name='RQ.SRS-006.RBAC.ShowCreateQuota.RequiredPrivilege',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `SHOW CREATE QUOTA` statement if and only if\n'
+        'the user has **show quotas** privilege, either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.31.18.12')
+
+RQ_SRS_006_RBAC_ShowSettingsProfiles_Privilege = Requirement(
+    name='RQ.SRS-006.RBAC.ShowSettingsProfiles.Privilege',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully grant `SHOW SETTINGS PROFILES` privilege when\n'
+        'the user is granted `SHOW SETTINGS PROFILES`, `SHOW PROFILES`, `SHOW CREATE SETTINGS PROFILE`,\n'
+        '`SHOW SETTINGS PROFILE`, `SHOW ACCESS`, or `ACCESS MANAGEMENT`.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.31.18.13')
+
+RQ_SRS_006_RBAC_ShowSettingsProfiles_RequiredPrivilege = Requirement(
+    name='RQ.SRS-006.RBAC.ShowSettingsProfiles.RequiredPrivilege',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `SHOW SETTINGS PROFILES` or `SHOW PROFILES` statement\n'
+        'if and only if the user has **show settings profiles** privilege, either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.31.18.14')
+
+RQ_SRS_006_RBAC_ShowCreateSettingsProfile_RequiredPrivilege = Requirement(
+    name='RQ.SRS-006.RBAC.ShowCreateSettingsProfile.RequiredPrivilege',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `SHOW CREATE SETTINGS PROFILE` or `SHOW CREATE PROFILE` statement\n'
+        'if and only if the user has **show settings profiles** privilege, either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='5.31.18.15')
+
+RQ_SRS_006_RBAC_dictGet_Privilege = Requirement(
+    name='RQ.SRS-006.RBAC.dictGet.Privilege',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully grant `dictGet` privilege when\n'
+        'the user is granted `dictGet`, `dictHas`, `dictGetHierarchy`, or `dictIsIn`.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.32.1')
+
+RQ_SRS_006_RBAC_dictGet_RequiredPrivilege = Requirement(
+    name='RQ.SRS-006.RBAC.dictGet.RequiredPrivilege',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `dictGet` statement\n'
+        'if and only if the user has **dictGet** privilege on that dictionary, either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.32.2')
+
+RQ_SRS_006_RBAC_dictGet_Type_RequiredPrivilege = Requirement(
+    name='RQ.SRS-006.RBAC.dictGet.Type.RequiredPrivilege',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `dictGet[TYPE]` statement\n'
+        'if and only if the user has **dictGet** privilege on that dictionary, either directly or through a role.\n'
+        'Available types:\n'
+        '\n'
+        '* Int8\n'
+        '* Int16\n'
+        '* Int32\n'
+        '* Int64\n'
+        '* UInt8\n'
+        '* UInt16\n'
+        '* UInt32\n'
+        '* UInt64\n'
+        '* Float32\n'
+        '* Float64\n'
+        '* Date\n'
+        '* DateTime\n'
+        '* UUID\n'
+        '* String\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.32.3')
+
+RQ_SRS_006_RBAC_dictGet_OrDefault_RequiredPrivilege = Requirement(
+    name='RQ.SRS-006.RBAC.dictGet.OrDefault.RequiredPrivilege',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `dictGetOrDefault` statement\n'
+        'if and only if the user has **dictGet** privilege on that dictionary, either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.32.4')
+
+RQ_SRS_006_RBAC_dictHas_RequiredPrivilege = Requirement(
+    name='RQ.SRS-006.RBAC.dictHas.RequiredPrivilege',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `dictHas` statement\n'
+        'if and only if the user has **dictGet** privilege, either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.32.5')
+
+RQ_SRS_006_RBAC_dictGetHierarchy_RequiredPrivilege = Requirement(
+    name='RQ.SRS-006.RBAC.dictGetHierarchy.RequiredPrivilege',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `dictGetHierarchy` statement\n'
+        'if and only if the user has **dictGet** privilege, either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.32.6')
+
+RQ_SRS_006_RBAC_dictIsIn_RequiredPrivilege = Requirement(
+    name='RQ.SRS-006.RBAC.dictIsIn.RequiredPrivilege',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `dictIsIn` statement\n'
+        'if and only if the user has **dictGet** privilege, either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.32.7')
+
+RQ_SRS_006_RBAC_Privileges_Introspection = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.Introspection',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully grant `INTROSPECTION` privilege when\n'
+        'the user is granted `INTROSPECTION` or `INTROSPECTION FUNCTIONS`.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.33.1')
+
+RQ_SRS_006_RBAC_Privileges_Introspection_addressToLine = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.Introspection.addressToLine',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `addressToLine` statement if and only if\n'
+        'the user has **introspection** privilege, either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.33.2')
+
+RQ_SRS_006_RBAC_Privileges_Introspection_addressToSymbol = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.Introspection.addressToSymbol',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `addressToSymbol` statement if and only if\n'
+        'the user has **introspection** privilege, either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.33.3')
+
+RQ_SRS_006_RBAC_Privileges_Introspection_demangle = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.Introspection.demangle',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `demangle` statement if and only if\n'
+        'the user has **introspection** privilege, either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.33.4')
+
+RQ_SRS_006_RBAC_Privileges_System_Shutdown = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.System.Shutdown',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully grant `SYSTEM SHUTDOWN` privilege when\n'
+        'the user is granted `SYSTEM`, `SYSTEM SHUTDOWN`, `SHUTDOWN`,or `SYSTEM KILL`.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.34.1')
+
+RQ_SRS_006_RBAC_Privileges_System_DropCache = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.System.DropCache',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully grant `SYSTEM DROP CACHE` privilege when\n'
+        'the user is granted `SYSTEM`, `SYSTEM DROP CACHE`, or `DROP CACHE`.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.34.2')
+
+RQ_SRS_006_RBAC_Privileges_System_DropCache_DNS = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.System.DropCache.DNS',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully grant `SYSTEM DROP DNS CACHE` privilege when\n'
+        'the user is granted `SYSTEM`, `SYSTEM DROP CACHE`, `DROP CACHE`, `SYSTEM DROP DNS CACHE`,\n'
+        '`SYSTEM DROP DNS`, `DROP DNS CACHE`, or `DROP DNS`.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.34.3')
+
+RQ_SRS_006_RBAC_Privileges_System_DropCache_Mark = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.System.DropCache.Mark',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully grant `SYSTEM DROP MARK CACHE` privilege when\n'
+        'the user is granted `SYSTEM`, `SYSTEM DROP CACHE`, `DROP CACHE`, `SYSTEM DROP MARK CACHE`,\n'
+        '`SYSTEM DROP MARK`, `DROP MARK CACHE`, or `DROP MARKS`.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.34.4')
+
+RQ_SRS_006_RBAC_Privileges_System_DropCache_Uncompressed = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.System.DropCache.Uncompressed',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully grant `SYSTEM DROP UNCOMPRESSED CACHE` privilege when\n'
+        'the user is granted `SYSTEM`, `SYSTEM DROP CACHE`, `DROP CACHE`, `SYSTEM DROP UNCOMPRESSED CACHE`,\n'
+        '`SYSTEM DROP UNCOMPRESSED`, `DROP UNCOMPRESSED CACHE`, or `DROP UNCOMPRESSED`.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.34.5')
+
+RQ_SRS_006_RBAC_Privileges_System_Reload = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.System.Reload',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully grant `SYSTEM RELOAD` privilege when\n'
+        'the user is granted `SYSTEM` or `SYSTEM RELOAD`.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.34.6')
+
+RQ_SRS_006_RBAC_Privileges_System_Reload_Config = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.System.Reload.Config',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully grant `SYSTEM RELOAD CONFIG` privilege when\n'
+        'the user is granted `SYSTEM`, `SYSTEM RELOAD`, `SYSTEM RELOAD CONFIG`, or `RELOAD CONFIG`.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.34.7')
+
+RQ_SRS_006_RBAC_Privileges_System_Reload_Dictionary = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.System.Reload.Dictionary',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully grant `SYSTEM RELOAD DICTIONARY` privilege when\n'
+        'the user is granted `SYSTEM`, `SYSTEM RELOAD`, `SYSTEM RELOAD DICTIONARIES`, `RELOAD DICTIONARIES`, or `RELOAD DICTIONARY`.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.34.8')
+
+RQ_SRS_006_RBAC_Privileges_System_Reload_Dictionaries = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.System.Reload.Dictionaries',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully grant `SYSTEM RELOAD DICTIONARIES` privilege when\n'
+        'the user is granted `SYSTEM`, `SYSTEM RELOAD`, `SYSTEM RELOAD DICTIONARIES`, `RELOAD DICTIONARIES`, or `RELOAD DICTIONARY`.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.34.9')
+
+RQ_SRS_006_RBAC_Privileges_System_Reload_EmbeddedDictionaries = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.System.Reload.EmbeddedDictionaries',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully grant `SYSTEM RELOAD EMBEDDED DICTIONARIES` privilege when\n'
+        'the user is granted `SYSTEM`, `SYSTEM RELOAD`, `SYSTEM RELOAD DICTIONARY ON *.*`, or `SYSTEM RELOAD EMBEDDED DICTIONARIES`.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.34.10')
+
+RQ_SRS_006_RBAC_Privileges_System_Merges = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.System.Merges',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully grant `SYSTEM MERGES` privilege when\n'
+        'the user is granted `SYSTEM`, `SYSTEM MERGES`, `SYSTEM STOP MERGES`, `SYSTEM START MERGES`, `STOP MERGES`, or `START MERGES`.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.34.11')
+
+RQ_SRS_006_RBAC_Privileges_System_TTLMerges = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.System.TTLMerges',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully grant `SYSTEM TTL MERGES` privilege when\n'
+        'the user is granted `SYSTEM`, `SYSTEM TTL MERGES`, `SYSTEM STOP TTL MERGES`, `SYSTEM START TTL MERGES`, `STOP TTL MERGES`, or `START TTL MERGES`.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.34.12')
+
+RQ_SRS_006_RBAC_Privileges_System_Fetches = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.System.Fetches',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully grant `SYSTEM FETCHES` privilege when\n'
+        'the user is granted `SYSTEM`, `SYSTEM FETCHES`, `SYSTEM STOP FETCHES`, `SYSTEM START FETCHES`, `STOP FETCHES`, or `START FETCHES`.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.34.13')
+
+RQ_SRS_006_RBAC_Privileges_System_Moves = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.System.Moves',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully grant `SYSTEM MOVES` privilege when\n'
+        'the user is granted `SYSTEM`, `SYSTEM MOVES`, `SYSTEM STOP MOVES`, `SYSTEM START MOVES`, `STOP MOVES`, or `START MOVES`.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.34.14')
+
+RQ_SRS_006_RBAC_Privileges_System_Sends = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.System.Sends',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully grant `SYSTEM SENDS` privilege when\n'
+        'the user is granted `SYSTEM`, `SYSTEM SENDS`, `SYSTEM STOP SENDS`, `SYSTEM START SENDS`, `STOP SENDS`, or `START SENDS`.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.34.15')
+
+RQ_SRS_006_RBAC_Privileges_System_Sends_Distributed = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.System.Sends.Distributed',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully grant `SYSTEM DISTRIBUTED SENDS` privilege when\n'
+        'the user is granted `SYSTEM`, `SYSTEM DISTRIBUTED SENDS`, `SYSTEM STOP DISTRIBUTED SENDS`,\n'
+        '`SYSTEM START DISTRIBUTED SENDS`, `STOP DISTRIBUTED SENDS`, or `START DISTRIBUTED SENDS`.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.34.16')
+
+RQ_SRS_006_RBAC_Privileges_System_Sends_Replicated = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.System.Sends.Replicated',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully grant `SYSTEM REPLICATED SENDS` privilege when\n'
+        'the user is granted `SYSTEM`, `SYSTEM REPLICATED SENDS`, `SYSTEM STOP REPLICATED SENDS`,\n'
+        '`SYSTEM START REPLICATED SENDS`, `STOP REPLICATED SENDS`, or `START REPLICATED SENDS`.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.34.17')
+
+RQ_SRS_006_RBAC_Privileges_System_ReplicationQueues = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.System.ReplicationQueues',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully grant `SYSTEM REPLICATION QUEUES` privilege when\n'
+        'the user is granted `SYSTEM`, `SYSTEM REPLICATION QUEUES`, `SYSTEM STOP REPLICATION QUEUES`,\n'
+        '`SYSTEM START REPLICATION QUEUES`, `STOP REPLICATION QUEUES`, or `START REPLICATION QUEUES`.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.34.18')
+
+RQ_SRS_006_RBAC_Privileges_System_SyncReplica = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.System.SyncReplica',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully grant `SYSTEM SYNC REPLICA` privilege when\n'
+        'the user is granted `SYSTEM`, `SYSTEM SYNC REPLICA`, or `SYNC REPLICA`.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.34.19')
+
+RQ_SRS_006_RBAC_Privileges_System_RestartReplica = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.System.RestartReplica',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully grant `SYSTEM RESTART REPLICA` privilege when\n'
+        'the user is granted `SYSTEM`, `SYSTEM RESTART REPLICA`, or `RESTART REPLICA`.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.34.20')
+
+RQ_SRS_006_RBAC_Privileges_System_Flush = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.System.Flush',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully grant `SYSTEM FLUSH` privilege when\n'
+        'the user is granted `SYSTEM` or `SYSTEM FLUSH`.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.34.21')
+
+RQ_SRS_006_RBAC_Privileges_System_Flush_Distributed = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.System.Flush.Distributed',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully grant `SYSTEM FLUSH DISTRIBUTED` privilege when\n'
+        'the user is granted `SYSTEM`, `SYSTEM FLUSH DISTRIBUTED`, or `FLUSH DISTRIBUTED`.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.34.22')
+
+RQ_SRS_006_RBAC_Privileges_System_Flush_Logs = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.System.Flush.Logs',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully grant `SYSTEM FLUSH LOGS` privilege when\n'
+        'the user is granted `SYSTEM`, `SYSTEM FLUSH LOGS`, or `FLUSH LOGS`.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.34.23')
+
+RQ_SRS_006_RBAC_Privileges_Sources = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.Sources',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support granting or revoking `SOURCES` privilege from\n'
+        'the user, either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.35.1')
+
+RQ_SRS_006_RBAC_Privileges_Sources_File = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.Sources.File',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support the use of `FILE` source by a user if and only if\n'
+        'the user has `FILE` or `SOURCES` privileges granted to them directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.35.2')
+
+RQ_SRS_006_RBAC_Privileges_Sources_URL = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.Sources.URL',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support the use of `URL` source by a user if and only if\n'
+        'the user has `URL` or `SOURCES` privileges granted to them directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.35.3')
+
+RQ_SRS_006_RBAC_Privileges_Sources_Remote = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.Sources.Remote',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support the use of `REMOTE` source by a user if and only if\n'
+        'the user has `REMOTE` or `SOURCES` privileges granted to them directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.35.4')
+
+RQ_SRS_006_RBAC_Privileges_Sources_MySQL = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.Sources.MySQL',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support the use of `MySQL` source by a user if and only if\n'
+        'the user has `MySQL` or `SOURCES` privileges granted to them directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.35.5')
+
+RQ_SRS_006_RBAC_Privileges_Sources_ODBC = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.Sources.ODBC',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support the use of `ODBC` source by a user if and only if\n'
+        'the user has `ODBC` or `SOURCES` privileges granted to them directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.35.6')
+
+RQ_SRS_006_RBAC_Privileges_Sources_JDBC = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.Sources.JDBC',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support the use of `JDBC` source by a user if and only if\n'
+        'the user has `JDBC` or `SOURCES` privileges granted to them directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.35.7')
+
+RQ_SRS_006_RBAC_Privileges_Sources_HDFS = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.Sources.HDFS',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support the use of `HDFS` source by a user if and only if\n'
+        'the user has `HDFS` or `SOURCES` privileges granted to them directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.35.8')
+
+RQ_SRS_006_RBAC_Privileges_Sources_S3 = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.Sources.S3',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support the use of `S3` source by a user if and only if\n'
+        'the user has `S3` or `SOURCES` privileges granted to them directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='5.35.9')
+
+RQ_SRS_006_RBAC_Privileges_GrantOption = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.GrantOption',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL successfully execute `GRANT` or `REVOKE` privilege statements by a user if and only if\n'
+        'the user has that privilege with `GRANT OPTION`, either directly or through a role.\n'
+        '\n'
+        ),
+    link=None,
+    level=2,
+    num='5.36')
+
+RQ_SRS_006_RBAC_Privileges_All = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.All',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support granting or revoking `ALL` privilege\n'
+        'using `GRANT ALL ON *.* TO user`.\n'
+        '\n'
+        ),
+    link=None,
+    level=2,
+    num='5.37')
+
+RQ_SRS_006_RBAC_Privileges_RoleAll = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.RoleAll',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support granting a role named `ALL` using `GRANT ALL TO user`.\n'
+        'This shall only grant the user the privileges that have been granted to the role.\n'
+        '\n'
+        ),
+    link=None,
+    level=2,
+    num='5.38')
+
+RQ_SRS_006_RBAC_Privileges_None = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.None',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support granting or revoking `NONE` privilege\n'
+        'using `GRANT NONE TO user` or `GRANT USAGE ON *.* TO user`.\n'
+        '\n'
+        ),
+    link=None,
+    level=2,
+    num='5.39')
+
+RQ_SRS_006_RBAC_Privileges_AdminOption = Requirement(
+    name='RQ.SRS-006.RBAC.Privileges.AdminOption',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support a user granting or revoking a role if and only if\n'
+        'the user has that role with `ADMIN OPTION` privilege.\n'
+        '\n'
+        ),
+    link=None,
+    level=2,
+    num='5.40')
+
 SRS_006_ClickHouse_Role_Based_Access_Control = Specification(
-        name='SRS-006 ClickHouse Role Based Access Control', 
-        description=None,
-        author=None,
-        date=None, 
-        status=None, 
-        approved_by=None,
-        approved_date=None,
-        approved_version=None,
-        version=None,
-        group=None,
-        type=None,
-        link=None,
-        uid=None,
-        parent=None,
-        children=None,
-        content='''
+    name='SRS-006 ClickHouse Role Based Access Control', 
+    description=None,
+    author=None,
+    date=None, 
+    status=None, 
+    approved_by=None,
+    approved_date=None,
+    approved_version=None,
+    version=None,
+    group=None,
+    type=None,
+    link=None,
+    uid=None,
+    parent=None,
+    children=None,
+    headings=(
+        Heading(name='Revision History', level=1, num='1'),
+        Heading(name='Introduction', level=1, num='2'),
+        Heading(name='Terminology', level=1, num='3'),
+        Heading(name='Privilege Definitions', level=1, num='4'),
+        Heading(name='Requirements', level=1, num='5'),
+        Heading(name='Generic', level=2, num='5.1'),
+        Heading(name='RQ.SRS-006.RBAC', level=3, num='5.1.1'),
+        Heading(name='Login', level=2, num='5.2'),
+        Heading(name='RQ.SRS-006.RBAC.Login', level=3, num='5.2.1'),
+        Heading(name='RQ.SRS-006.RBAC.Login.DefaultUser', level=3, num='5.2.2'),
+        Heading(name='User', level=2, num='5.3'),
+        Heading(name='RQ.SRS-006.RBAC.User', level=3, num='5.3.1'),
+        Heading(name='RQ.SRS-006.RBAC.User.Roles', level=3, num='5.3.2'),
+        Heading(name='RQ.SRS-006.RBAC.User.Privileges', level=3, num='5.3.3'),
+        Heading(name='RQ.SRS-006.RBAC.User.Variables', level=3, num='5.3.4'),
+        Heading(name='RQ.SRS-006.RBAC.User.Variables.Constraints', level=3, num='5.3.5'),
+        Heading(name='RQ.SRS-006.RBAC.User.SettingsProfile', level=3, num='5.3.6'),
+        Heading(name='RQ.SRS-006.RBAC.User.Quotas', level=3, num='5.3.7'),
+        Heading(name='RQ.SRS-006.RBAC.User.RowPolicies', level=3, num='5.3.8'),
+        Heading(name='RQ.SRS-006.RBAC.User.DefaultRole', level=3, num='5.3.9'),
+        Heading(name='RQ.SRS-006.RBAC.User.RoleSelection', level=3, num='5.3.10'),
+        Heading(name='RQ.SRS-006.RBAC.User.ShowCreate', level=3, num='5.3.11'),
+        Heading(name='RQ.SRS-006.RBAC.User.ShowPrivileges', level=3, num='5.3.12'),
+        Heading(name='RQ.SRS-006.RBAC.User.Use.DefaultRole', level=3, num='5.3.13'),
+        Heading(name='RQ.SRS-006.RBAC.User.Use.AllRolesWhenNoDefaultRole', level=3, num='5.3.14'),
+        Heading(name='Create User', level=3, num='5.3.15'),
+        Heading(name='RQ.SRS-006.RBAC.User.Create', level=4, num='5.3.15.1'),
+        Heading(name='RQ.SRS-006.RBAC.User.Create.IfNotExists', level=4, num='5.3.15.2'),
+        Heading(name='RQ.SRS-006.RBAC.User.Create.Replace', level=4, num='5.3.15.3'),
+        Heading(name='RQ.SRS-006.RBAC.User.Create.Password.NoPassword', level=4, num='5.3.15.4'),
+        Heading(name='RQ.SRS-006.RBAC.User.Create.Password.NoPassword.Login', level=4, num='5.3.15.5'),
+        Heading(name='RQ.SRS-006.RBAC.User.Create.Password.PlainText', level=4, num='5.3.15.6'),
+        Heading(name='RQ.SRS-006.RBAC.User.Create.Password.PlainText.Login', level=4, num='5.3.15.7'),
+        Heading(name='RQ.SRS-006.RBAC.User.Create.Password.Sha256Password', level=4, num='5.3.15.8'),
+        Heading(name='RQ.SRS-006.RBAC.User.Create.Password.Sha256Password.Login', level=4, num='5.3.15.9'),
+        Heading(name='RQ.SRS-006.RBAC.User.Create.Password.Sha256Hash', level=4, num='5.3.15.10'),
+        Heading(name='RQ.SRS-006.RBAC.User.Create.Password.Sha256Hash.Login', level=4, num='5.3.15.11'),
+        Heading(name='RQ.SRS-006.RBAC.User.Create.Password.DoubleSha1Password', level=4, num='5.3.15.12'),
+        Heading(name='RQ.SRS-006.RBAC.User.Create.Password.DoubleSha1Password.Login', level=4, num='5.3.15.13'),
+        Heading(name='RQ.SRS-006.RBAC.User.Create.Password.DoubleSha1Hash', level=4, num='5.3.15.14'),
+        Heading(name='RQ.SRS-006.RBAC.User.Create.Password.DoubleSha1Hash.Login', level=4, num='5.3.15.15'),
+        Heading(name='RQ.SRS-006.RBAC.User.Create.Host.Name', level=4, num='5.3.15.16'),
+        Heading(name='RQ.SRS-006.RBAC.User.Create.Host.Regexp', level=4, num='5.3.15.17'),
+        Heading(name='RQ.SRS-006.RBAC.User.Create.Host.IP', level=4, num='5.3.15.18'),
+        Heading(name='RQ.SRS-006.RBAC.User.Create.Host.Any', level=4, num='5.3.15.19'),
+        Heading(name='RQ.SRS-006.RBAC.User.Create.Host.None', level=4, num='5.3.15.20'),
+        Heading(name='RQ.SRS-006.RBAC.User.Create.Host.Local', level=4, num='5.3.15.21'),
+        Heading(name='RQ.SRS-006.RBAC.User.Create.Host.Like', level=4, num='5.3.15.22'),
+        Heading(name='RQ.SRS-006.RBAC.User.Create.Host.Default', level=4, num='5.3.15.23'),
+        Heading(name='RQ.SRS-006.RBAC.User.Create.DefaultRole', level=4, num='5.3.15.24'),
+        Heading(name='RQ.SRS-006.RBAC.User.Create.DefaultRole.None', level=4, num='5.3.15.25'),
+        Heading(name='RQ.SRS-006.RBAC.User.Create.DefaultRole.All', level=4, num='5.3.15.26'),
+        Heading(name='RQ.SRS-006.RBAC.User.Create.Settings', level=4, num='5.3.15.27'),
+        Heading(name='RQ.SRS-006.RBAC.User.Create.OnCluster', level=4, num='5.3.15.28'),
+        Heading(name='RQ.SRS-006.RBAC.User.Create.Syntax', level=4, num='5.3.15.29'),
+        Heading(name='Alter User', level=3, num='5.3.16'),
+        Heading(name='RQ.SRS-006.RBAC.User.Alter', level=4, num='5.3.16.1'),
+        Heading(name='RQ.SRS-006.RBAC.User.Alter.OrderOfEvaluation', level=4, num='5.3.16.2'),
+        Heading(name='RQ.SRS-006.RBAC.User.Alter.IfExists', level=4, num='5.3.16.3'),
+        Heading(name='RQ.SRS-006.RBAC.User.Alter.Cluster', level=4, num='5.3.16.4'),
+        Heading(name='RQ.SRS-006.RBAC.User.Alter.Rename', level=4, num='5.3.16.5'),
+        Heading(name='RQ.SRS-006.RBAC.User.Alter.Password.PlainText', level=4, num='5.3.16.6'),
+        Heading(name='RQ.SRS-006.RBAC.User.Alter.Password.Sha256Password', level=4, num='5.3.16.7'),
+        Heading(name='RQ.SRS-006.RBAC.User.Alter.Password.DoubleSha1Password', level=4, num='5.3.16.8'),
+        Heading(name='RQ.SRS-006.RBAC.User.Alter.Host.AddDrop', level=4, num='5.3.16.9'),
+        Heading(name='RQ.SRS-006.RBAC.User.Alter.Host.Local', level=4, num='5.3.16.10'),
+        Heading(name='RQ.SRS-006.RBAC.User.Alter.Host.Name', level=4, num='5.3.16.11'),
+        Heading(name='RQ.SRS-006.RBAC.User.Alter.Host.Regexp', level=4, num='5.3.16.12'),
+        Heading(name='RQ.SRS-006.RBAC.User.Alter.Host.IP', level=4, num='5.3.16.13'),
+        Heading(name='RQ.SRS-006.RBAC.User.Alter.Host.Like', level=4, num='5.3.16.14'),
+        Heading(name='RQ.SRS-006.RBAC.User.Alter.Host.Any', level=4, num='5.3.16.15'),
+        Heading(name='RQ.SRS-006.RBAC.User.Alter.Host.None', level=4, num='5.3.16.16'),
+        Heading(name='RQ.SRS-006.RBAC.User.Alter.DefaultRole', level=4, num='5.3.16.17'),
+        Heading(name='RQ.SRS-006.RBAC.User.Alter.DefaultRole.All', level=4, num='5.3.16.18'),
+        Heading(name='RQ.SRS-006.RBAC.User.Alter.DefaultRole.AllExcept', level=4, num='5.3.16.19'),
+        Heading(name='RQ.SRS-006.RBAC.User.Alter.Settings', level=4, num='5.3.16.20'),
+        Heading(name='RQ.SRS-006.RBAC.User.Alter.Settings.Min', level=4, num='5.3.16.21'),
+        Heading(name='RQ.SRS-006.RBAC.User.Alter.Settings.Max', level=4, num='5.3.16.22'),
+        Heading(name='RQ.SRS-006.RBAC.User.Alter.Settings.Profile', level=4, num='5.3.16.23'),
+        Heading(name='RQ.SRS-006.RBAC.User.Alter.Syntax', level=4, num='5.3.16.24'),
+        Heading(name='Show Create User', level=3, num='5.3.17'),
+        Heading(name='RQ.SRS-006.RBAC.User.ShowCreateUser', level=4, num='5.3.17.1'),
+        Heading(name='RQ.SRS-006.RBAC.User.ShowCreateUser.For', level=4, num='5.3.17.2'),
+        Heading(name='RQ.SRS-006.RBAC.User.ShowCreateUser.Syntax', level=4, num='5.3.17.3'),
+        Heading(name='Drop User', level=3, num='5.3.18'),
+        Heading(name='RQ.SRS-006.RBAC.User.Drop', level=4, num='5.3.18.1'),
+        Heading(name='RQ.SRS-006.RBAC.User.Drop.IfExists', level=4, num='5.3.18.2'),
+        Heading(name='RQ.SRS-006.RBAC.User.Drop.OnCluster', level=4, num='5.3.18.3'),
+        Heading(name='RQ.SRS-006.RBAC.User.Drop.Syntax', level=4, num='5.3.18.4'),
+        Heading(name='Role', level=2, num='5.4'),
+        Heading(name='RQ.SRS-006.RBAC.Role', level=3, num='5.4.1'),
+        Heading(name='RQ.SRS-006.RBAC.Role.Privileges', level=3, num='5.4.2'),
+        Heading(name='RQ.SRS-006.RBAC.Role.Variables', level=3, num='5.4.3'),
+        Heading(name='RQ.SRS-006.RBAC.Role.SettingsProfile', level=3, num='5.4.4'),
+        Heading(name='RQ.SRS-006.RBAC.Role.Quotas', level=3, num='5.4.5'),
+        Heading(name='RQ.SRS-006.RBAC.Role.RowPolicies', level=3, num='5.4.6'),
+        Heading(name='Create Role', level=3, num='5.4.7'),
+        Heading(name='RQ.SRS-006.RBAC.Role.Create', level=4, num='5.4.7.1'),
+        Heading(name='RQ.SRS-006.RBAC.Role.Create.IfNotExists', level=4, num='5.4.7.2'),
+        Heading(name='RQ.SRS-006.RBAC.Role.Create.Replace', level=4, num='5.4.7.3'),
+        Heading(name='RQ.SRS-006.RBAC.Role.Create.Settings', level=4, num='5.4.7.4'),
+        Heading(name='RQ.SRS-006.RBAC.Role.Create.Syntax', level=4, num='5.4.7.5'),
+        Heading(name='Alter Role', level=3, num='5.4.8'),
+        Heading(name='RQ.SRS-006.RBAC.Role.Alter', level=4, num='5.4.8.1'),
+        Heading(name='RQ.SRS-006.RBAC.Role.Alter.IfExists', level=4, num='5.4.8.2'),
+        Heading(name='RQ.SRS-006.RBAC.Role.Alter.Cluster', level=4, num='5.4.8.3'),
+        Heading(name='RQ.SRS-006.RBAC.Role.Alter.Rename', level=4, num='5.4.8.4'),
+        Heading(name='RQ.SRS-006.RBAC.Role.Alter.Settings', level=4, num='5.4.8.5'),
+        Heading(name='RQ.SRS-006.RBAC.Role.Alter.Syntax', level=4, num='5.4.8.6'),
+        Heading(name='Drop Role', level=3, num='5.4.9'),
+        Heading(name='RQ.SRS-006.RBAC.Role.Drop', level=4, num='5.4.9.1'),
+        Heading(name='RQ.SRS-006.RBAC.Role.Drop.IfExists', level=4, num='5.4.9.2'),
+        Heading(name='RQ.SRS-006.RBAC.Role.Drop.Cluster', level=4, num='5.4.9.3'),
+        Heading(name='RQ.SRS-006.RBAC.Role.Drop.Syntax', level=4, num='5.4.9.4'),
+        Heading(name='Show Create Role', level=3, num='5.4.10'),
+        Heading(name='RQ.SRS-006.RBAC.Role.ShowCreate', level=4, num='5.4.10.1'),
+        Heading(name='RQ.SRS-006.RBAC.Role.ShowCreate.Syntax', level=4, num='5.4.10.2'),
+        Heading(name='Partial Revokes', level=2, num='5.5'),
+        Heading(name='RQ.SRS-006.RBAC.PartialRevokes', level=3, num='5.5.1'),
+        Heading(name='RQ.SRS-006.RBAC.PartialRevoke.Syntax', level=3, num='5.5.2'),
+        Heading(name='Settings Profile', level=2, num='5.6'),
+        Heading(name='RQ.SRS-006.RBAC.SettingsProfile', level=3, num='5.6.1'),
+        Heading(name='RQ.SRS-006.RBAC.SettingsProfile.Constraints', level=3, num='5.6.2'),
+        Heading(name='Create Settings Profile', level=3, num='5.6.3'),
+        Heading(name='RQ.SRS-006.RBAC.SettingsProfile.Create', level=4, num='5.6.3.1'),
+        Heading(name='RQ.SRS-006.RBAC.SettingsProfile.Create.IfNotExists', level=4, num='5.6.3.2'),
+        Heading(name='RQ.SRS-006.RBAC.SettingsProfile.Create.Replace', level=4, num='5.6.3.3'),
+        Heading(name='RQ.SRS-006.RBAC.SettingsProfile.Create.Variables', level=4, num='5.6.3.4'),
+        Heading(name='RQ.SRS-006.RBAC.SettingsProfile.Create.Variables.Value', level=4, num='5.6.3.5'),
+        Heading(name='RQ.SRS-006.RBAC.SettingsProfile.Create.Variables.Constraints', level=4, num='5.6.3.6'),
+        Heading(name='RQ.SRS-006.RBAC.SettingsProfile.Create.Assignment', level=4, num='5.6.3.7'),
+        Heading(name='RQ.SRS-006.RBAC.SettingsProfile.Create.Assignment.None', level=4, num='5.6.3.8'),
+        Heading(name='RQ.SRS-006.RBAC.SettingsProfile.Create.Assignment.All', level=4, num='5.6.3.9'),
+        Heading(name='RQ.SRS-006.RBAC.SettingsProfile.Create.Assignment.AllExcept', level=4, num='5.6.3.10'),
+        Heading(name='RQ.SRS-006.RBAC.SettingsProfile.Create.Inherit', level=4, num='5.6.3.11'),
+        Heading(name='RQ.SRS-006.RBAC.SettingsProfile.Create.OnCluster', level=4, num='5.6.3.12'),
+        Heading(name='RQ.SRS-006.RBAC.SettingsProfile.Create.Syntax', level=4, num='5.6.3.13'),
+        Heading(name='Alter Settings Profile', level=3, num='5.6.4'),
+        Heading(name='RQ.SRS-006.RBAC.SettingsProfile.Alter', level=4, num='5.6.4.1'),
+        Heading(name='RQ.SRS-006.RBAC.SettingsProfile.Alter.IfExists', level=4, num='5.6.4.2'),
+        Heading(name='RQ.SRS-006.RBAC.SettingsProfile.Alter.Rename', level=4, num='5.6.4.3'),
+        Heading(name='RQ.SRS-006.RBAC.SettingsProfile.Alter.Variables', level=4, num='5.6.4.4'),
+        Heading(name='RQ.SRS-006.RBAC.SettingsProfile.Alter.Variables.Value', level=4, num='5.6.4.5'),
+        Heading(name='RQ.SRS-006.RBAC.SettingsProfile.Alter.Variables.Constraints', level=4, num='5.6.4.6'),
+        Heading(name='RQ.SRS-006.RBAC.SettingsProfile.Alter.Assignment', level=4, num='5.6.4.7'),
+        Heading(name='RQ.SRS-006.RBAC.SettingsProfile.Alter.Assignment.None', level=4, num='5.6.4.8'),
+        Heading(name='RQ.SRS-006.RBAC.SettingsProfile.Alter.Assignment.All', level=4, num='5.6.4.9'),
+        Heading(name='RQ.SRS-006.RBAC.SettingsProfile.Alter.Assignment.AllExcept', level=4, num='5.6.4.10'),
+        Heading(name='RQ.SRS-006.RBAC.SettingsProfile.Alter.Assignment.Inherit', level=4, num='5.6.4.11'),
+        Heading(name='RQ.SRS-006.RBAC.SettingsProfile.Alter.Assignment.OnCluster', level=4, num='5.6.4.12'),
+        Heading(name='RQ.SRS-006.RBAC.SettingsProfile.Alter.Syntax', level=4, num='5.6.4.13'),
+        Heading(name='Drop Settings Profile', level=3, num='5.6.5'),
+        Heading(name='RQ.SRS-006.RBAC.SettingsProfile.Drop', level=4, num='5.6.5.1'),
+        Heading(name='RQ.SRS-006.RBAC.SettingsProfile.Drop.IfExists', level=4, num='5.6.5.2'),
+        Heading(name='RQ.SRS-006.RBAC.SettingsProfile.Drop.OnCluster', level=4, num='5.6.5.3'),
+        Heading(name='RQ.SRS-006.RBAC.SettingsProfile.Drop.Syntax', level=4, num='5.6.5.4'),
+        Heading(name='Show Create Settings Profile', level=3, num='5.6.6'),
+        Heading(name='RQ.SRS-006.RBAC.SettingsProfile.ShowCreateSettingsProfile', level=4, num='5.6.6.1'),
+        Heading(name='Quotas', level=2, num='5.7'),
+        Heading(name='RQ.SRS-006.RBAC.Quotas', level=3, num='5.7.1'),
+        Heading(name='RQ.SRS-006.RBAC.Quotas.Keyed', level=3, num='5.7.2'),
+        Heading(name='RQ.SRS-006.RBAC.Quotas.Queries', level=3, num='5.7.3'),
+        Heading(name='RQ.SRS-006.RBAC.Quotas.Errors', level=3, num='5.7.4'),
+        Heading(name='RQ.SRS-006.RBAC.Quotas.ResultRows', level=3, num='5.7.5'),
+        Heading(name='RQ.SRS-006.RBAC.Quotas.ReadRows', level=3, num='5.7.6'),
+        Heading(name='RQ.SRS-006.RBAC.Quotas.ResultBytes', level=3, num='5.7.7'),
+        Heading(name='RQ.SRS-006.RBAC.Quotas.ReadBytes', level=3, num='5.7.8'),
+        Heading(name='RQ.SRS-006.RBAC.Quotas.ExecutionTime', level=3, num='5.7.9'),
+        Heading(name='Create Quotas', level=3, num='5.7.10'),
+        Heading(name='RQ.SRS-006.RBAC.Quota.Create', level=4, num='5.7.10.1'),
+        Heading(name='RQ.SRS-006.RBAC.Quota.Create.IfNotExists', level=4, num='5.7.10.2'),
+        Heading(name='RQ.SRS-006.RBAC.Quota.Create.Replace', level=4, num='5.7.10.3'),
+        Heading(name='RQ.SRS-006.RBAC.Quota.Create.Cluster', level=4, num='5.7.10.4'),
+        Heading(name='RQ.SRS-006.RBAC.Quota.Create.Interval', level=4, num='5.7.10.5'),
+        Heading(name='RQ.SRS-006.RBAC.Quota.Create.Interval.Randomized', level=4, num='5.7.10.6'),
+        Heading(name='RQ.SRS-006.RBAC.Quota.Create.Queries', level=4, num='5.7.10.7'),
+        Heading(name='RQ.SRS-006.RBAC.Quota.Create.Errors', level=4, num='5.7.10.8'),
+        Heading(name='RQ.SRS-006.RBAC.Quota.Create.ResultRows', level=4, num='5.7.10.9'),
+        Heading(name='RQ.SRS-006.RBAC.Quota.Create.ReadRows', level=4, num='5.7.10.10'),
+        Heading(name='RQ.SRS-006.RBAC.Quota.Create.ResultBytes', level=4, num='5.7.10.11'),
+        Heading(name='RQ.SRS-006.RBAC.Quota.Create.ReadBytes', level=4, num='5.7.10.12'),
+        Heading(name='RQ.SRS-006.RBAC.Quota.Create.ExecutionTime', level=4, num='5.7.10.13'),
+        Heading(name='RQ.SRS-006.RBAC.Quota.Create.NoLimits', level=4, num='5.7.10.14'),
+        Heading(name='RQ.SRS-006.RBAC.Quota.Create.TrackingOnly', level=4, num='5.7.10.15'),
+        Heading(name='RQ.SRS-006.RBAC.Quota.Create.KeyedBy', level=4, num='5.7.10.16'),
+        Heading(name='RQ.SRS-006.RBAC.Quota.Create.KeyedByOptions', level=4, num='5.7.10.17'),
+        Heading(name='RQ.SRS-006.RBAC.Quota.Create.Assignment', level=4, num='5.7.10.18'),
+        Heading(name='RQ.SRS-006.RBAC.Quota.Create.Assignment.None', level=4, num='5.7.10.19'),
+        Heading(name='RQ.SRS-006.RBAC.Quota.Create.Assignment.All', level=4, num='5.7.10.20'),
+        Heading(name='RQ.SRS-006.RBAC.Quota.Create.Assignment.Except', level=4, num='5.7.10.21'),
+        Heading(name='RQ.SRS-006.RBAC.Quota.Create.Syntax', level=4, num='5.7.10.22'),
+        Heading(name='Alter Quota', level=3, num='5.7.11'),
+        Heading(name='RQ.SRS-006.RBAC.Quota.Alter', level=4, num='5.7.11.1'),
+        Heading(name='RQ.SRS-006.RBAC.Quota.Alter.IfExists', level=4, num='5.7.11.2'),
+        Heading(name='RQ.SRS-006.RBAC.Quota.Alter.Rename', level=4, num='5.7.11.3'),
+        Heading(name='RQ.SRS-006.RBAC.Quota.Alter.Cluster', level=4, num='5.7.11.4'),
+        Heading(name='RQ.SRS-006.RBAC.Quota.Alter.Interval', level=4, num='5.7.11.5'),
+        Heading(name='RQ.SRS-006.RBAC.Quota.Alter.Interval.Randomized', level=4, num='5.7.11.6'),
+        Heading(name='RQ.SRS-006.RBAC.Quota.Alter.Queries', level=4, num='5.7.11.7'),
+        Heading(name='RQ.SRS-006.RBAC.Quota.Alter.Errors', level=4, num='5.7.11.8'),
+        Heading(name='RQ.SRS-006.RBAC.Quota.Alter.ResultRows', level=4, num='5.7.11.9'),
+        Heading(name='RQ.SRS-006.RBAC.Quota.Alter.ReadRows', level=4, num='5.7.11.10'),
+        Heading(name='RQ.SRS-006.RBAC.Quota.ALter.ResultBytes', level=4, num='5.7.11.11'),
+        Heading(name='RQ.SRS-006.RBAC.Quota.Alter.ReadBytes', level=4, num='5.7.11.12'),
+        Heading(name='RQ.SRS-006.RBAC.Quota.Alter.ExecutionTime', level=4, num='5.7.11.13'),
+        Heading(name='RQ.SRS-006.RBAC.Quota.Alter.NoLimits', level=4, num='5.7.11.14'),
+        Heading(name='RQ.SRS-006.RBAC.Quota.Alter.TrackingOnly', level=4, num='5.7.11.15'),
+        Heading(name='RQ.SRS-006.RBAC.Quota.Alter.KeyedBy', level=4, num='5.7.11.16'),
+        Heading(name='RQ.SRS-006.RBAC.Quota.Alter.KeyedByOptions', level=4, num='5.7.11.17'),
+        Heading(name='RQ.SRS-006.RBAC.Quota.Alter.Assignment', level=4, num='5.7.11.18'),
+        Heading(name='RQ.SRS-006.RBAC.Quota.Alter.Assignment.None', level=4, num='5.7.11.19'),
+        Heading(name='RQ.SRS-006.RBAC.Quota.Alter.Assignment.All', level=4, num='5.7.11.20'),
+        Heading(name='RQ.SRS-006.RBAC.Quota.Alter.Assignment.Except', level=4, num='5.7.11.21'),
+        Heading(name='RQ.SRS-006.RBAC.Quota.Alter.Syntax', level=4, num='5.7.11.22'),
+        Heading(name='Drop Quota', level=3, num='5.7.12'),
+        Heading(name='RQ.SRS-006.RBAC.Quota.Drop', level=4, num='5.7.12.1'),
+        Heading(name='RQ.SRS-006.RBAC.Quota.Drop.IfExists', level=4, num='5.7.12.2'),
+        Heading(name='RQ.SRS-006.RBAC.Quota.Drop.Cluster', level=4, num='5.7.12.3'),
+        Heading(name='RQ.SRS-006.RBAC.Quota.Drop.Syntax', level=4, num='5.7.12.4'),
+        Heading(name='Show Quotas', level=3, num='5.7.13'),
+        Heading(name='RQ.SRS-006.RBAC.Quota.ShowQuotas', level=4, num='5.7.13.1'),
+        Heading(name='RQ.SRS-006.RBAC.Quota.ShowQuotas.IntoOutfile', level=4, num='5.7.13.2'),
+        Heading(name='RQ.SRS-006.RBAC.Quota.ShowQuotas.Format', level=4, num='5.7.13.3'),
+        Heading(name='RQ.SRS-006.RBAC.Quota.ShowQuotas.Settings', level=4, num='5.7.13.4'),
+        Heading(name='RQ.SRS-006.RBAC.Quota.ShowQuotas.Syntax', level=4, num='5.7.13.5'),
+        Heading(name='Show Create Quota', level=3, num='5.7.14'),
+        Heading(name='RQ.SRS-006.RBAC.Quota.ShowCreateQuota.Name', level=4, num='5.7.14.1'),
+        Heading(name='RQ.SRS-006.RBAC.Quota.ShowCreateQuota.Current', level=4, num='5.7.14.2'),
+        Heading(name='RQ.SRS-006.RBAC.Quota.ShowCreateQuota.Syntax', level=4, num='5.7.14.3'),
+        Heading(name='Row Policy', level=2, num='5.8'),
+        Heading(name='RQ.SRS-006.RBAC.RowPolicy', level=3, num='5.8.1'),
+        Heading(name='RQ.SRS-006.RBAC.RowPolicy.Condition', level=3, num='5.8.2'),
+        Heading(name='RQ.SRS-006.RBAC.RowPolicy.Restriction', level=3, num='5.8.3'),
+        Heading(name='RQ.SRS-006.RBAC.RowPolicy.Nesting', level=3, num='5.8.4'),
+        Heading(name='Create Row Policy', level=3, num='5.8.5'),
+        Heading(name='RQ.SRS-006.RBAC.RowPolicy.Create', level=4, num='5.8.5.1'),
+        Heading(name='RQ.SRS-006.RBAC.RowPolicy.Create.IfNotExists', level=4, num='5.8.5.2'),
+        Heading(name='RQ.SRS-006.RBAC.RowPolicy.Create.Replace', level=4, num='5.8.5.3'),
+        Heading(name='RQ.SRS-006.RBAC.RowPolicy.Create.OnCluster', level=4, num='5.8.5.4'),
+        Heading(name='RQ.SRS-006.RBAC.RowPolicy.Create.On', level=4, num='5.8.5.5'),
+        Heading(name='RQ.SRS-006.RBAC.RowPolicy.Create.Access', level=4, num='5.8.5.6'),
+        Heading(name='RQ.SRS-006.RBAC.RowPolicy.Create.Access.Permissive', level=4, num='5.8.5.7'),
+        Heading(name='RQ.SRS-006.RBAC.RowPolicy.Create.Access.Restrictive', level=4, num='5.8.5.8'),
+        Heading(name='RQ.SRS-006.RBAC.RowPolicy.Create.ForSelect', level=4, num='5.8.5.9'),
+        Heading(name='RQ.SRS-006.RBAC.RowPolicy.Create.Condition', level=4, num='5.8.5.10'),
+        Heading(name='RQ.SRS-006.RBAC.RowPolicy.Create.Assignment', level=4, num='5.8.5.11'),
+        Heading(name='RQ.SRS-006.RBAC.RowPolicy.Create.Assignment.None', level=4, num='5.8.5.12'),
+        Heading(name='RQ.SRS-006.RBAC.RowPolicy.Create.Assignment.All', level=4, num='5.8.5.13'),
+        Heading(name='RQ.SRS-006.RBAC.RowPolicy.Create.Assignment.AllExcept', level=4, num='5.8.5.14'),
+        Heading(name='RQ.SRS-006.RBAC.RowPolicy.Create.Syntax', level=4, num='5.8.5.15'),
+        Heading(name='Alter Row Policy', level=3, num='5.8.6'),
+        Heading(name='RQ.SRS-006.RBAC.RowPolicy.Alter', level=4, num='5.8.6.1'),
+        Heading(name='RQ.SRS-006.RBAC.RowPolicy.Alter.IfExists', level=4, num='5.8.6.2'),
+        Heading(name='RQ.SRS-006.RBAC.RowPolicy.Alter.ForSelect', level=4, num='5.8.6.3'),
+        Heading(name='RQ.SRS-006.RBAC.RowPolicy.Alter.OnCluster', level=4, num='5.8.6.4'),
+        Heading(name='RQ.SRS-006.RBAC.RowPolicy.Alter.On', level=4, num='5.8.6.5'),
+        Heading(name='RQ.SRS-006.RBAC.RowPolicy.Alter.Rename', level=4, num='5.8.6.6'),
+        Heading(name='RQ.SRS-006.RBAC.RowPolicy.Alter.Access', level=4, num='5.8.6.7'),
+        Heading(name='RQ.SRS-006.RBAC.RowPolicy.Alter.Access.Permissive', level=4, num='5.8.6.8'),
+        Heading(name='RQ.SRS-006.RBAC.RowPolicy.Alter.Access.Restrictive', level=4, num='5.8.6.9'),
+        Heading(name='RQ.SRS-006.RBAC.RowPolicy.Alter.Condition', level=4, num='5.8.6.10'),
+        Heading(name='RQ.SRS-006.RBAC.RowPolicy.Alter.Condition.None', level=4, num='5.8.6.11'),
+        Heading(name='RQ.SRS-006.RBAC.RowPolicy.Alter.Assignment', level=4, num='5.8.6.12'),
+        Heading(name='RQ.SRS-006.RBAC.RowPolicy.Alter.Assignment.None', level=4, num='5.8.6.13'),
+        Heading(name='RQ.SRS-006.RBAC.RowPolicy.Alter.Assignment.All', level=4, num='5.8.6.14'),
+        Heading(name='RQ.SRS-006.RBAC.RowPolicy.Alter.Assignment.AllExcept', level=4, num='5.8.6.15'),
+        Heading(name='RQ.SRS-006.RBAC.RowPolicy.Alter.Syntax', level=4, num='5.8.6.16'),
+        Heading(name='Drop Row Policy', level=3, num='5.8.7'),
+        Heading(name='RQ.SRS-006.RBAC.RowPolicy.Drop', level=4, num='5.8.7.1'),
+        Heading(name='RQ.SRS-006.RBAC.RowPolicy.Drop.IfExists', level=4, num='5.8.7.2'),
+        Heading(name='RQ.SRS-006.RBAC.RowPolicy.Drop.On', level=4, num='5.8.7.3'),
+        Heading(name='RQ.SRS-006.RBAC.RowPolicy.Drop.OnCluster', level=4, num='5.8.7.4'),
+        Heading(name='RQ.SRS-006.RBAC.RowPolicy.Drop.Syntax', level=4, num='5.8.7.5'),
+        Heading(name='Show Create Row Policy', level=3, num='5.8.8'),
+        Heading(name='RQ.SRS-006.RBAC.RowPolicy.ShowCreateRowPolicy', level=4, num='5.8.8.1'),
+        Heading(name='RQ.SRS-006.RBAC.RowPolicy.ShowCreateRowPolicy.On', level=4, num='5.8.8.2'),
+        Heading(name='RQ.SRS-006.RBAC.RowPolicy.ShowCreateRowPolicy.Syntax', level=4, num='5.8.8.3'),
+        Heading(name='RQ.SRS-006.RBAC.RowPolicy.ShowRowPolicies', level=4, num='5.8.8.4'),
+        Heading(name='RQ.SRS-006.RBAC.RowPolicy.ShowRowPolicies.On', level=4, num='5.8.8.5'),
+        Heading(name='RQ.SRS-006.RBAC.RowPolicy.ShowRowPolicies.Syntax', level=4, num='5.8.8.6'),
+        Heading(name='Set Default Role', level=2, num='5.9'),
+        Heading(name='RQ.SRS-006.RBAC.SetDefaultRole', level=3, num='5.9.1'),
+        Heading(name='RQ.SRS-006.RBAC.SetDefaultRole.CurrentUser', level=3, num='5.9.2'),
+        Heading(name='RQ.SRS-006.RBAC.SetDefaultRole.All', level=3, num='5.9.3'),
+        Heading(name='RQ.SRS-006.RBAC.SetDefaultRole.AllExcept', level=3, num='5.9.4'),
+        Heading(name='RQ.SRS-006.RBAC.SetDefaultRole.None', level=3, num='5.9.5'),
+        Heading(name='RQ.SRS-006.RBAC.SetDefaultRole.Syntax', level=3, num='5.9.6'),
+        Heading(name='Set Role', level=2, num='5.10'),
+        Heading(name='RQ.SRS-006.RBAC.SetRole', level=3, num='5.10.1'),
+        Heading(name='RQ.SRS-006.RBAC.SetRole.Default', level=3, num='5.10.2'),
+        Heading(name='RQ.SRS-006.RBAC.SetRole.None', level=3, num='5.10.3'),
+        Heading(name='RQ.SRS-006.RBAC.SetRole.All', level=3, num='5.10.4'),
+        Heading(name='RQ.SRS-006.RBAC.SetRole.AllExcept', level=3, num='5.10.5'),
+        Heading(name='RQ.SRS-006.RBAC.SetRole.Syntax', level=3, num='5.10.6'),
+        Heading(name='Grant', level=2, num='5.11'),
+        Heading(name='RQ.SRS-006.RBAC.Grant.Privilege.To', level=3, num='5.11.1'),
+        Heading(name='RQ.SRS-006.RBAC.Grant.Privilege.ToCurrentUser', level=3, num='5.11.2'),
+        Heading(name='RQ.SRS-006.RBAC.Grant.Privilege.Select', level=3, num='5.11.3'),
+        Heading(name='RQ.SRS-006.RBAC.Grant.Privilege.Insert', level=3, num='5.11.4'),
+        Heading(name='RQ.SRS-006.RBAC.Grant.Privilege.Alter', level=3, num='5.11.5'),
+        Heading(name='RQ.SRS-006.RBAC.Grant.Privilege.Create', level=3, num='5.11.6'),
+        Heading(name='RQ.SRS-006.RBAC.Grant.Privilege.Drop', level=3, num='5.11.7'),
+        Heading(name='RQ.SRS-006.RBAC.Grant.Privilege.Truncate', level=3, num='5.11.8'),
+        Heading(name='RQ.SRS-006.RBAC.Grant.Privilege.Optimize', level=3, num='5.11.9'),
+        Heading(name='RQ.SRS-006.RBAC.Grant.Privilege.Show', level=3, num='5.11.10'),
+        Heading(name='RQ.SRS-006.RBAC.Grant.Privilege.KillQuery', level=3, num='5.11.11'),
+        Heading(name='RQ.SRS-006.RBAC.Grant.Privilege.AccessManagement', level=3, num='5.11.12'),
+        Heading(name='RQ.SRS-006.RBAC.Grant.Privilege.System', level=3, num='5.11.13'),
+        Heading(name='RQ.SRS-006.RBAC.Grant.Privilege.Introspection', level=3, num='5.11.14'),
+        Heading(name='RQ.SRS-006.RBAC.Grant.Privilege.Sources', level=3, num='5.11.15'),
+        Heading(name='RQ.SRS-006.RBAC.Grant.Privilege.DictGet', level=3, num='5.11.16'),
+        Heading(name='RQ.SRS-006.RBAC.Grant.Privilege.None', level=3, num='5.11.17'),
+        Heading(name='RQ.SRS-006.RBAC.Grant.Privilege.All', level=3, num='5.11.18'),
+        Heading(name='RQ.SRS-006.RBAC.Grant.Privilege.GrantOption', level=3, num='5.11.19'),
+        Heading(name='RQ.SRS-006.RBAC.Grant.Privilege.On', level=3, num='5.11.20'),
+        Heading(name='RQ.SRS-006.RBAC.Grant.Privilege.PrivilegeColumns', level=3, num='5.11.21'),
+        Heading(name='RQ.SRS-006.RBAC.Grant.Privilege.OnCluster', level=3, num='5.11.22'),
+        Heading(name='RQ.SRS-006.RBAC.Grant.Privilege.Syntax', level=3, num='5.11.23'),
+        Heading(name='Revoke', level=2, num='5.12'),
+        Heading(name='RQ.SRS-006.RBAC.Revoke.Privilege.Cluster', level=3, num='5.12.1'),
+        Heading(name='RQ.SRS-006.RBAC.Revoke.Privilege.Select', level=3, num='5.12.2'),
+        Heading(name='RQ.SRS-006.RBAC.Revoke.Privilege.Insert', level=3, num='5.12.3'),
+        Heading(name='RQ.SRS-006.RBAC.Revoke.Privilege.Alter', level=3, num='5.12.4'),
+        Heading(name='RQ.SRS-006.RBAC.Revoke.Privilege.Create', level=3, num='5.12.5'),
+        Heading(name='RQ.SRS-006.RBAC.Revoke.Privilege.Drop', level=3, num='5.12.6'),
+        Heading(name='RQ.SRS-006.RBAC.Revoke.Privilege.Truncate', level=3, num='5.12.7'),
+        Heading(name='RQ.SRS-006.RBAC.Revoke.Privilege.Optimize', level=3, num='5.12.8'),
+        Heading(name='RQ.SRS-006.RBAC.Revoke.Privilege.Show', level=3, num='5.12.9'),
+        Heading(name='RQ.SRS-006.RBAC.Revoke.Privilege.KillQuery', level=3, num='5.12.10'),
+        Heading(name='RQ.SRS-006.RBAC.Revoke.Privilege.AccessManagement', level=3, num='5.12.11'),
+        Heading(name='RQ.SRS-006.RBAC.Revoke.Privilege.System', level=3, num='5.12.12'),
+        Heading(name='RQ.SRS-006.RBAC.Revoke.Privilege.Introspection', level=3, num='5.12.13'),
+        Heading(name='RQ.SRS-006.RBAC.Revoke.Privilege.Sources', level=3, num='5.12.14'),
+        Heading(name='RQ.SRS-006.RBAC.Revoke.Privilege.DictGet', level=3, num='5.12.15'),
+        Heading(name='RQ.SRS-006.RBAC.Revoke.Privilege.PrivilegeColumns', level=3, num='5.12.16'),
+        Heading(name='RQ.SRS-006.RBAC.Revoke.Privilege.Multiple', level=3, num='5.12.17'),
+        Heading(name='RQ.SRS-006.RBAC.Revoke.Privilege.All', level=3, num='5.12.18'),
+        Heading(name='RQ.SRS-006.RBAC.Revoke.Privilege.None', level=3, num='5.12.19'),
+        Heading(name='RQ.SRS-006.RBAC.Revoke.Privilege.On', level=3, num='5.12.20'),
+        Heading(name='RQ.SRS-006.RBAC.Revoke.Privilege.From', level=3, num='5.12.21'),
+        Heading(name='RQ.SRS-006.RBAC.Revoke.Privilege.Syntax', level=3, num='5.12.22'),
+        Heading(name='Grant Role', level=2, num='5.13'),
+        Heading(name='RQ.SRS-006.RBAC.Grant.Role', level=3, num='5.13.1'),
+        Heading(name='RQ.SRS-006.RBAC.Grant.Role.CurrentUser', level=3, num='5.13.2'),
+        Heading(name='RQ.SRS-006.RBAC.Grant.Role.AdminOption', level=3, num='5.13.3'),
+        Heading(name='RQ.SRS-006.RBAC.Grant.Role.OnCluster', level=3, num='5.13.4'),
+        Heading(name='RQ.SRS-006.RBAC.Grant.Role.Syntax', level=3, num='5.13.5'),
+        Heading(name='Revoke Role', level=2, num='5.14'),
+        Heading(name='RQ.SRS-006.RBAC.Revoke.Role', level=3, num='5.14.1'),
+        Heading(name='RQ.SRS-006.RBAC.Revoke.Role.Keywords', level=3, num='5.14.2'),
+        Heading(name='RQ.SRS-006.RBAC.Revoke.Role.Cluster', level=3, num='5.14.3'),
+        Heading(name='RQ.SRS-006.RBAC.Revoke.AdminOption', level=3, num='5.14.4'),
+        Heading(name='RQ.SRS-006.RBAC.Revoke.Role.Syntax', level=3, num='5.14.5'),
+        Heading(name='Show Grants', level=2, num='5.15'),
+        Heading(name='RQ.SRS-006.RBAC.Show.Grants', level=3, num='5.15.1'),
+        Heading(name='RQ.SRS-006.RBAC.Show.Grants.For', level=3, num='5.15.2'),
+        Heading(name='RQ.SRS-006.RBAC.Show.Grants.Syntax', level=3, num='5.15.3'),
+        Heading(name='Table Privileges', level=2, num='5.16'),
+        Heading(name='RQ.SRS-006.RBAC.Table.PublicTables', level=3, num='5.16.1'),
+        Heading(name='RQ.SRS-006.RBAC.Table.SensitiveTables', level=3, num='5.16.2'),
+        Heading(name='Distributed Tables', level=2, num='5.17'),
+        Heading(name='RQ.SRS-006.RBAC.DistributedTable.Create', level=3, num='5.17.1'),
+        Heading(name='RQ.SRS-006.RBAC.DistributedTable.Select', level=3, num='5.17.2'),
+        Heading(name='RQ.SRS-006.RBAC.DistributedTable.Insert', level=3, num='5.17.3'),
+        Heading(name='RQ.SRS-006.RBAC.DistributedTable.SpecialTables', level=3, num='5.17.4'),
+        Heading(name='RQ.SRS-006.RBAC.DistributedTable.LocalUser', level=3, num='5.17.5'),
+        Heading(name='RQ.SRS-006.RBAC.DistributedTable.SameUserDifferentNodesDifferentPrivileges', level=3, num='5.17.6'),
+        Heading(name='Views', level=2, num='5.18'),
+        Heading(name='View', level=3, num='5.18.1'),
+        Heading(name='RQ.SRS-006.RBAC.View', level=4, num='5.18.1.1'),
+        Heading(name='RQ.SRS-006.RBAC.View.Create', level=4, num='5.18.1.2'),
+        Heading(name='RQ.SRS-006.RBAC.View.Select', level=4, num='5.18.1.3'),
+        Heading(name='RQ.SRS-006.RBAC.View.Drop', level=4, num='5.18.1.4'),
+        Heading(name='Materialized View', level=3, num='5.18.2'),
+        Heading(name='RQ.SRS-006.RBAC.MaterializedView', level=4, num='5.18.2.1'),
+        Heading(name='RQ.SRS-006.RBAC.MaterializedView.Create', level=4, num='5.18.2.2'),
+        Heading(name='RQ.SRS-006.RBAC.MaterializedView.Select', level=4, num='5.18.2.3'),
+        Heading(name='RQ.SRS-006.RBAC.MaterializedView.Select.TargetTable', level=4, num='5.18.2.4'),
+        Heading(name='RQ.SRS-006.RBAC.MaterializedView.Select.SourceTable', level=4, num='5.18.2.5'),
+        Heading(name='RQ.SRS-006.RBAC.MaterializedView.Drop', level=4, num='5.18.2.6'),
+        Heading(name='RQ.SRS-006.RBAC.MaterializedView.ModifyQuery', level=4, num='5.18.2.7'),
+        Heading(name='RQ.SRS-006.RBAC.MaterializedView.Insert', level=4, num='5.18.2.8'),
+        Heading(name='RQ.SRS-006.RBAC.MaterializedView.Insert.SourceTable', level=4, num='5.18.2.9'),
+        Heading(name='RQ.SRS-006.RBAC.MaterializedView.Insert.TargetTable', level=4, num='5.18.2.10'),
+        Heading(name='Live View', level=3, num='5.18.3'),
+        Heading(name='RQ.SRS-006.RBAC.LiveView', level=4, num='5.18.3.1'),
+        Heading(name='RQ.SRS-006.RBAC.LiveView.Create', level=4, num='5.18.3.2'),
+        Heading(name='RQ.SRS-006.RBAC.LiveView.Select', level=4, num='5.18.3.3'),
+        Heading(name='RQ.SRS-006.RBAC.LiveView.Drop', level=4, num='5.18.3.4'),
+        Heading(name='RQ.SRS-006.RBAC.LiveView.Refresh', level=4, num='5.18.3.5'),
+        Heading(name='Select', level=2, num='5.19'),
+        Heading(name='RQ.SRS-006.RBAC.Select', level=3, num='5.19.1'),
+        Heading(name='RQ.SRS-006.RBAC.Select.Column', level=3, num='5.19.2'),
+        Heading(name='RQ.SRS-006.RBAC.Select.Cluster', level=3, num='5.19.3'),
+        Heading(name='RQ.SRS-006.RBAC.Select.TableEngines', level=3, num='5.19.4'),
+        Heading(name='Insert', level=2, num='5.20'),
+        Heading(name='RQ.SRS-006.RBAC.Insert', level=3, num='5.20.1'),
+        Heading(name='RQ.SRS-006.RBAC.Insert.Column', level=3, num='5.20.2'),
+        Heading(name='RQ.SRS-006.RBAC.Insert.Cluster', level=3, num='5.20.3'),
+        Heading(name='RQ.SRS-006.RBAC.Insert.TableEngines', level=3, num='5.20.4'),
+        Heading(name='Alter', level=2, num='5.21'),
+        Heading(name='Alter Column', level=3, num='5.21.1'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.AlterColumn', level=4, num='5.21.1.1'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.AlterColumn.Grant', level=4, num='5.21.1.2'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.AlterColumn.Revoke', level=4, num='5.21.1.3'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.AlterColumn.Column', level=4, num='5.21.1.4'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.AlterColumn.Cluster', level=4, num='5.21.1.5'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.AlterColumn.TableEngines', level=4, num='5.21.1.6'),
+        Heading(name='Alter Index', level=3, num='5.21.2'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.AlterIndex', level=4, num='5.21.2.1'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.AlterIndex.Grant', level=4, num='5.21.2.2'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.AlterIndex.Revoke', level=4, num='5.21.2.3'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.AlterIndex.Cluster', level=4, num='5.21.2.4'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.AlterIndex.TableEngines', level=4, num='5.21.2.5'),
+        Heading(name='Alter Constraint', level=3, num='5.21.3'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.AlterConstraint', level=4, num='5.21.3.1'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.AlterConstraint.Grant', level=4, num='5.21.3.2'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.AlterConstraint.Revoke', level=4, num='5.21.3.3'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.AlterConstraint.Cluster', level=4, num='5.21.3.4'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.AlterConstraint.TableEngines', level=4, num='5.21.3.5'),
+        Heading(name='Alter TTL', level=3, num='5.21.4'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.AlterTTL', level=4, num='5.21.4.1'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.AlterTTL.Grant', level=4, num='5.21.4.2'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.AlterTTL.Revoke', level=4, num='5.21.4.3'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.AlterTTL.Cluster', level=4, num='5.21.4.4'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.AlterTTL.TableEngines', level=4, num='5.21.4.5'),
+        Heading(name='Alter Settings', level=3, num='5.21.5'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.AlterSettings', level=4, num='5.21.5.1'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.AlterSettings.Grant', level=4, num='5.21.5.2'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.AlterSettings.Revoke', level=4, num='5.21.5.3'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.AlterSettings.Cluster', level=4, num='5.21.5.4'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.AlterSettings.TableEngines', level=4, num='5.21.5.5'),
+        Heading(name='Alter Update', level=3, num='5.21.6'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.AlterUpdate', level=4, num='5.21.6.1'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.AlterUpdate.Grant', level=4, num='5.21.6.2'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.AlterUpdate.Revoke', level=4, num='5.21.6.3'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.AlterUpdate.TableEngines', level=4, num='5.21.6.4'),
+        Heading(name='Alter Delete', level=3, num='5.21.7'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.AlterDelete', level=4, num='5.21.7.1'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.AlterDelete.Grant', level=4, num='5.21.7.2'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.AlterDelete.Revoke', level=4, num='5.21.7.3'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.AlterDelete.TableEngines', level=4, num='5.21.7.4'),
+        Heading(name='Alter Freeze Partition', level=3, num='5.21.8'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.AlterFreeze', level=4, num='5.21.8.1'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.AlterFreeze.Grant', level=4, num='5.21.8.2'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.AlterFreeze.Revoke', level=4, num='5.21.8.3'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.AlterFreeze.TableEngines', level=4, num='5.21.8.4'),
+        Heading(name='Alter Fetch Partition', level=3, num='5.21.9'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.AlterFetch', level=4, num='5.21.9.1'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.AlterFetch.Grant', level=4, num='5.21.9.2'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.AlterFetch.Revoke', level=4, num='5.21.9.3'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.AlterFetch.TableEngines', level=4, num='5.21.9.4'),
+        Heading(name='Alter Move Partition', level=3, num='5.21.10'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.AlterMove', level=4, num='5.21.10.1'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.AlterMove.Grant', level=4, num='5.21.10.2'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.AlterMove.Revoke', level=4, num='5.21.10.3'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.AlterMove.TableEngines', level=4, num='5.21.10.4'),
+        Heading(name='Create', level=2, num='5.22'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.CreateTable', level=3, num='5.22.1'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.CreateDatabase', level=3, num='5.22.2'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.CreateDictionary', level=3, num='5.22.3'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.CreateTemporaryTable', level=3, num='5.22.4'),
+        Heading(name='Attach', level=2, num='5.23'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.AttachDatabase', level=3, num='5.23.1'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.AttachDictionary', level=3, num='5.23.2'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.AttachTemporaryTable', level=3, num='5.23.3'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.AttachTable', level=3, num='5.23.4'),
+        Heading(name='Drop', level=2, num='5.24'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.DropTable', level=3, num='5.24.1'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.DropDatabase', level=3, num='5.24.2'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.DropDictionary', level=3, num='5.24.3'),
+        Heading(name='Detach', level=2, num='5.25'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.DetachTable', level=3, num='5.25.1'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.DetachView', level=3, num='5.25.2'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.DetachDatabase', level=3, num='5.25.3'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.DetachDictionary', level=3, num='5.25.4'),
+        Heading(name='Truncate', level=2, num='5.26'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.Truncate', level=3, num='5.26.1'),
+        Heading(name='Optimize', level=2, num='5.27'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.Optimize', level=3, num='5.27.1'),
+        Heading(name='Kill Query', level=2, num='5.28'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.KillQuery', level=3, num='5.28.1'),
+        Heading(name='Kill Mutation', level=2, num='5.29'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.KillMutation', level=3, num='5.29.1'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.KillMutation.AlterUpdate', level=3, num='5.29.2'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.KillMutation.AlterDelete', level=3, num='5.29.3'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.KillMutation.AlterDropColumn', level=3, num='5.29.4'),
+        Heading(name='Show', level=2, num='5.30'),
+        Heading(name='RQ.SRS-006.RBAC.ShowTables.Privilege', level=3, num='5.30.1'),
+        Heading(name='RQ.SRS-006.RBAC.ShowTables.RequiredPrivilege', level=3, num='5.30.2'),
+        Heading(name='RQ.SRS-006.RBAC.ExistsTable.RequiredPrivilege', level=3, num='5.30.3'),
+        Heading(name='RQ.SRS-006.RBAC.CheckTable.RequiredPrivilege', level=3, num='5.30.4'),
+        Heading(name='RQ.SRS-006.RBAC.ShowDatabases.Privilege', level=3, num='5.30.5'),
+        Heading(name='RQ.SRS-006.RBAC.ShowDatabases.RequiredPrivilege', level=3, num='5.30.6'),
+        Heading(name='RQ.SRS-006.RBAC.ShowCreateDatabase.RequiredPrivilege', level=3, num='5.30.7'),
+        Heading(name='RQ.SRS-006.RBAC.UseDatabase.RequiredPrivilege', level=3, num='5.30.8'),
+        Heading(name='RQ.SRS-006.RBAC.ShowColumns.Privilege', level=3, num='5.30.9'),
+        Heading(name='RQ.SRS-006.RBAC.ShowCreateTable.RequiredPrivilege', level=3, num='5.30.10'),
+        Heading(name='RQ.SRS-006.RBAC.DescribeTable.RequiredPrivilege', level=3, num='5.30.11'),
+        Heading(name='RQ.SRS-006.RBAC.ShowDictionaries.Privilege', level=3, num='5.30.12'),
+        Heading(name='RQ.SRS-006.RBAC.ShowDictionaries.RequiredPrivilege', level=3, num='5.30.13'),
+        Heading(name='RQ.SRS-006.RBAC.ShowCreateDictionary.RequiredPrivilege', level=3, num='5.30.14'),
+        Heading(name='RQ.SRS-006.RBAC.ExistsDictionary.RequiredPrivilege', level=3, num='5.30.15'),
+        Heading(name='Access Management', level=2, num='5.31'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.CreateUser', level=3, num='5.31.1'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.CreateUser.DefaultRole', level=3, num='5.31.2'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.AlterUser', level=3, num='5.31.3'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.DropUser', level=3, num='5.31.4'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.CreateRole', level=3, num='5.31.5'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.AlterRole', level=3, num='5.31.6'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.DropRole', level=3, num='5.31.7'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.CreateRowPolicy', level=3, num='5.31.8'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.AlterRowPolicy', level=3, num='5.31.9'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.DropRowPolicy', level=3, num='5.31.10'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.CreateQuota', level=3, num='5.31.11'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.AlterQuota', level=3, num='5.31.12'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.DropQuota', level=3, num='5.31.13'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.CreateSettingsProfile', level=3, num='5.31.14'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.AlterSettingsProfile', level=3, num='5.31.15'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.DropSettingsProfile', level=3, num='5.31.16'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.RoleAdmin', level=3, num='5.31.17'),
+        Heading(name='Show Access', level=3, num='5.31.18'),
+        Heading(name='RQ.SRS-006.RBAC.ShowUsers.Privilege', level=4, num='5.31.18.1'),
+        Heading(name='RQ.SRS-006.RBAC.ShowUsers.RequiredPrivilege', level=4, num='5.31.18.2'),
+        Heading(name='RQ.SRS-006.RBAC.ShowCreateUser.RequiredPrivilege', level=4, num='5.31.18.3'),
+        Heading(name='RQ.SRS-006.RBAC.ShowRoles.Privilege', level=4, num='5.31.18.4'),
+        Heading(name='RQ.SRS-006.RBAC.ShowRoles.RequiredPrivilege', level=4, num='5.31.18.5'),
+        Heading(name='RQ.SRS-006.RBAC.ShowCreateRole.RequiredPrivilege', level=4, num='5.31.18.6'),
+        Heading(name='RQ.SRS-006.RBAC.ShowRowPolicies.Privilege', level=4, num='5.31.18.7'),
+        Heading(name='RQ.SRS-006.RBAC.ShowRowPolicies.RequiredPrivilege', level=4, num='5.31.18.8'),
+        Heading(name='RQ.SRS-006.RBAC.ShowCreateRowPolicy.RequiredPrivilege', level=4, num='5.31.18.9'),
+        Heading(name='RQ.SRS-006.RBAC.ShowQuotas.Privilege', level=4, num='5.31.18.10'),
+        Heading(name='RQ.SRS-006.RBAC.ShowQuotas.RequiredPrivilege', level=4, num='5.31.18.11'),
+        Heading(name='RQ.SRS-006.RBAC.ShowCreateQuota.RequiredPrivilege', level=4, num='5.31.18.12'),
+        Heading(name='RQ.SRS-006.RBAC.ShowSettingsProfiles.Privilege', level=4, num='5.31.18.13'),
+        Heading(name='RQ.SRS-006.RBAC.ShowSettingsProfiles.RequiredPrivilege', level=4, num='5.31.18.14'),
+        Heading(name='RQ.SRS-006.RBAC.ShowCreateSettingsProfile.RequiredPrivilege', level=4, num='5.31.18.15'),
+        Heading(name='dictGet', level=2, num='5.32'),
+        Heading(name='RQ.SRS-006.RBAC.dictGet.Privilege', level=3, num='5.32.1'),
+        Heading(name='RQ.SRS-006.RBAC.dictGet.RequiredPrivilege', level=3, num='5.32.2'),
+        Heading(name='RQ.SRS-006.RBAC.dictGet.Type.RequiredPrivilege', level=3, num='5.32.3'),
+        Heading(name='RQ.SRS-006.RBAC.dictGet.OrDefault.RequiredPrivilege', level=3, num='5.32.4'),
+        Heading(name='RQ.SRS-006.RBAC.dictHas.RequiredPrivilege', level=3, num='5.32.5'),
+        Heading(name='RQ.SRS-006.RBAC.dictGetHierarchy.RequiredPrivilege', level=3, num='5.32.6'),
+        Heading(name='RQ.SRS-006.RBAC.dictIsIn.RequiredPrivilege', level=3, num='5.32.7'),
+        Heading(name='Introspection', level=2, num='5.33'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.Introspection', level=3, num='5.33.1'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.Introspection.addressToLine', level=3, num='5.33.2'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.Introspection.addressToSymbol', level=3, num='5.33.3'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.Introspection.demangle', level=3, num='5.33.4'),
+        Heading(name='System', level=2, num='5.34'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.System.Shutdown', level=3, num='5.34.1'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.System.DropCache', level=3, num='5.34.2'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.System.DropCache.DNS', level=3, num='5.34.3'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.System.DropCache.Mark', level=3, num='5.34.4'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.System.DropCache.Uncompressed', level=3, num='5.34.5'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.System.Reload', level=3, num='5.34.6'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.System.Reload.Config', level=3, num='5.34.7'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.System.Reload.Dictionary', level=3, num='5.34.8'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.System.Reload.Dictionaries', level=3, num='5.34.9'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.System.Reload.EmbeddedDictionaries', level=3, num='5.34.10'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.System.Merges', level=3, num='5.34.11'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.System.TTLMerges', level=3, num='5.34.12'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.System.Fetches', level=3, num='5.34.13'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.System.Moves', level=3, num='5.34.14'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.System.Sends', level=3, num='5.34.15'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.System.Sends.Distributed', level=3, num='5.34.16'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.System.Sends.Replicated', level=3, num='5.34.17'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.System.ReplicationQueues', level=3, num='5.34.18'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.System.SyncReplica', level=3, num='5.34.19'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.System.RestartReplica', level=3, num='5.34.20'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.System.Flush', level=3, num='5.34.21'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.System.Flush.Distributed', level=3, num='5.34.22'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.System.Flush.Logs', level=3, num='5.34.23'),
+        Heading(name='Sources', level=2, num='5.35'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.Sources', level=3, num='5.35.1'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.Sources.File', level=3, num='5.35.2'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.Sources.URL', level=3, num='5.35.3'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.Sources.Remote', level=3, num='5.35.4'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.Sources.MySQL', level=3, num='5.35.5'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.Sources.ODBC', level=3, num='5.35.6'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.Sources.JDBC', level=3, num='5.35.7'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.Sources.HDFS', level=3, num='5.35.8'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.Sources.S3', level=3, num='5.35.9'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.GrantOption', level=2, num='5.36'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.All', level=2, num='5.37'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.RoleAll', level=2, num='5.38'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.None', level=2, num='5.39'),
+        Heading(name='RQ.SRS-006.RBAC.Privileges.AdminOption', level=2, num='5.40'),
+        Heading(name='References', level=1, num='6'),
+        ),
+    requirements=(
+        RQ_SRS_006_RBAC,
+        RQ_SRS_006_RBAC_Login,
+        RQ_SRS_006_RBAC_Login_DefaultUser,
+        RQ_SRS_006_RBAC_User,
+        RQ_SRS_006_RBAC_User_Roles,
+        RQ_SRS_006_RBAC_User_Privileges,
+        RQ_SRS_006_RBAC_User_Variables,
+        RQ_SRS_006_RBAC_User_Variables_Constraints,
+        RQ_SRS_006_RBAC_User_SettingsProfile,
+        RQ_SRS_006_RBAC_User_Quotas,
+        RQ_SRS_006_RBAC_User_RowPolicies,
+        RQ_SRS_006_RBAC_User_DefaultRole,
+        RQ_SRS_006_RBAC_User_RoleSelection,
+        RQ_SRS_006_RBAC_User_ShowCreate,
+        RQ_SRS_006_RBAC_User_ShowPrivileges,
+        RQ_SRS_006_RBAC_User_Use_DefaultRole,
+        RQ_SRS_006_RBAC_User_Use_AllRolesWhenNoDefaultRole,
+        RQ_SRS_006_RBAC_User_Create,
+        RQ_SRS_006_RBAC_User_Create_IfNotExists,
+        RQ_SRS_006_RBAC_User_Create_Replace,
+        RQ_SRS_006_RBAC_User_Create_Password_NoPassword,
+        RQ_SRS_006_RBAC_User_Create_Password_NoPassword_Login,
+        RQ_SRS_006_RBAC_User_Create_Password_PlainText,
+        RQ_SRS_006_RBAC_User_Create_Password_PlainText_Login,
+        RQ_SRS_006_RBAC_User_Create_Password_Sha256Password,
+        RQ_SRS_006_RBAC_User_Create_Password_Sha256Password_Login,
+        RQ_SRS_006_RBAC_User_Create_Password_Sha256Hash,
+        RQ_SRS_006_RBAC_User_Create_Password_Sha256Hash_Login,
+        RQ_SRS_006_RBAC_User_Create_Password_DoubleSha1Password,
+        RQ_SRS_006_RBAC_User_Create_Password_DoubleSha1Password_Login,
+        RQ_SRS_006_RBAC_User_Create_Password_DoubleSha1Hash,
+        RQ_SRS_006_RBAC_User_Create_Password_DoubleSha1Hash_Login,
+        RQ_SRS_006_RBAC_User_Create_Host_Name,
+        RQ_SRS_006_RBAC_User_Create_Host_Regexp,
+        RQ_SRS_006_RBAC_User_Create_Host_IP,
+        RQ_SRS_006_RBAC_User_Create_Host_Any,
+        RQ_SRS_006_RBAC_User_Create_Host_None,
+        RQ_SRS_006_RBAC_User_Create_Host_Local,
+        RQ_SRS_006_RBAC_User_Create_Host_Like,
+        RQ_SRS_006_RBAC_User_Create_Host_Default,
+        RQ_SRS_006_RBAC_User_Create_DefaultRole,
+        RQ_SRS_006_RBAC_User_Create_DefaultRole_None,
+        RQ_SRS_006_RBAC_User_Create_DefaultRole_All,
+        RQ_SRS_006_RBAC_User_Create_Settings,
+        RQ_SRS_006_RBAC_User_Create_OnCluster,
+        RQ_SRS_006_RBAC_User_Create_Syntax,
+        RQ_SRS_006_RBAC_User_Alter,
+        RQ_SRS_006_RBAC_User_Alter_OrderOfEvaluation,
+        RQ_SRS_006_RBAC_User_Alter_IfExists,
+        RQ_SRS_006_RBAC_User_Alter_Cluster,
+        RQ_SRS_006_RBAC_User_Alter_Rename,
+        RQ_SRS_006_RBAC_User_Alter_Password_PlainText,
+        RQ_SRS_006_RBAC_User_Alter_Password_Sha256Password,
+        RQ_SRS_006_RBAC_User_Alter_Password_DoubleSha1Password,
+        RQ_SRS_006_RBAC_User_Alter_Host_AddDrop,
+        RQ_SRS_006_RBAC_User_Alter_Host_Local,
+        RQ_SRS_006_RBAC_User_Alter_Host_Name,
+        RQ_SRS_006_RBAC_User_Alter_Host_Regexp,
+        RQ_SRS_006_RBAC_User_Alter_Host_IP,
+        RQ_SRS_006_RBAC_User_Alter_Host_Like,
+        RQ_SRS_006_RBAC_User_Alter_Host_Any,
+        RQ_SRS_006_RBAC_User_Alter_Host_None,
+        RQ_SRS_006_RBAC_User_Alter_DefaultRole,
+        RQ_SRS_006_RBAC_User_Alter_DefaultRole_All,
+        RQ_SRS_006_RBAC_User_Alter_DefaultRole_AllExcept,
+        RQ_SRS_006_RBAC_User_Alter_Settings,
+        RQ_SRS_006_RBAC_User_Alter_Settings_Min,
+        RQ_SRS_006_RBAC_User_Alter_Settings_Max,
+        RQ_SRS_006_RBAC_User_Alter_Settings_Profile,
+        RQ_SRS_006_RBAC_User_Alter_Syntax,
+        RQ_SRS_006_RBAC_User_ShowCreateUser,
+        RQ_SRS_006_RBAC_User_ShowCreateUser_For,
+        RQ_SRS_006_RBAC_User_ShowCreateUser_Syntax,
+        RQ_SRS_006_RBAC_User_Drop,
+        RQ_SRS_006_RBAC_User_Drop_IfExists,
+        RQ_SRS_006_RBAC_User_Drop_OnCluster,
+        RQ_SRS_006_RBAC_User_Drop_Syntax,
+        RQ_SRS_006_RBAC_Role,
+        RQ_SRS_006_RBAC_Role_Privileges,
+        RQ_SRS_006_RBAC_Role_Variables,
+        RQ_SRS_006_RBAC_Role_SettingsProfile,
+        RQ_SRS_006_RBAC_Role_Quotas,
+        RQ_SRS_006_RBAC_Role_RowPolicies,
+        RQ_SRS_006_RBAC_Role_Create,
+        RQ_SRS_006_RBAC_Role_Create_IfNotExists,
+        RQ_SRS_006_RBAC_Role_Create_Replace,
+        RQ_SRS_006_RBAC_Role_Create_Settings,
+        RQ_SRS_006_RBAC_Role_Create_Syntax,
+        RQ_SRS_006_RBAC_Role_Alter,
+        RQ_SRS_006_RBAC_Role_Alter_IfExists,
+        RQ_SRS_006_RBAC_Role_Alter_Cluster,
+        RQ_SRS_006_RBAC_Role_Alter_Rename,
+        RQ_SRS_006_RBAC_Role_Alter_Settings,
+        RQ_SRS_006_RBAC_Role_Alter_Syntax,
+        RQ_SRS_006_RBAC_Role_Drop,
+        RQ_SRS_006_RBAC_Role_Drop_IfExists,
+        RQ_SRS_006_RBAC_Role_Drop_Cluster,
+        RQ_SRS_006_RBAC_Role_Drop_Syntax,
+        RQ_SRS_006_RBAC_Role_ShowCreate,
+        RQ_SRS_006_RBAC_Role_ShowCreate_Syntax,
+        RQ_SRS_006_RBAC_PartialRevokes,
+        RQ_SRS_006_RBAC_PartialRevoke_Syntax,
+        RQ_SRS_006_RBAC_SettingsProfile,
+        RQ_SRS_006_RBAC_SettingsProfile_Constraints,
+        RQ_SRS_006_RBAC_SettingsProfile_Create,
+        RQ_SRS_006_RBAC_SettingsProfile_Create_IfNotExists,
+        RQ_SRS_006_RBAC_SettingsProfile_Create_Replace,
+        RQ_SRS_006_RBAC_SettingsProfile_Create_Variables,
+        RQ_SRS_006_RBAC_SettingsProfile_Create_Variables_Value,
+        RQ_SRS_006_RBAC_SettingsProfile_Create_Variables_Constraints,
+        RQ_SRS_006_RBAC_SettingsProfile_Create_Assignment,
+        RQ_SRS_006_RBAC_SettingsProfile_Create_Assignment_None,
+        RQ_SRS_006_RBAC_SettingsProfile_Create_Assignment_All,
+        RQ_SRS_006_RBAC_SettingsProfile_Create_Assignment_AllExcept,
+        RQ_SRS_006_RBAC_SettingsProfile_Create_Inherit,
+        RQ_SRS_006_RBAC_SettingsProfile_Create_OnCluster,
+        RQ_SRS_006_RBAC_SettingsProfile_Create_Syntax,
+        RQ_SRS_006_RBAC_SettingsProfile_Alter,
+        RQ_SRS_006_RBAC_SettingsProfile_Alter_IfExists,
+        RQ_SRS_006_RBAC_SettingsProfile_Alter_Rename,
+        RQ_SRS_006_RBAC_SettingsProfile_Alter_Variables,
+        RQ_SRS_006_RBAC_SettingsProfile_Alter_Variables_Value,
+        RQ_SRS_006_RBAC_SettingsProfile_Alter_Variables_Constraints,
+        RQ_SRS_006_RBAC_SettingsProfile_Alter_Assignment,
+        RQ_SRS_006_RBAC_SettingsProfile_Alter_Assignment_None,
+        RQ_SRS_006_RBAC_SettingsProfile_Alter_Assignment_All,
+        RQ_SRS_006_RBAC_SettingsProfile_Alter_Assignment_AllExcept,
+        RQ_SRS_006_RBAC_SettingsProfile_Alter_Assignment_Inherit,
+        RQ_SRS_006_RBAC_SettingsProfile_Alter_Assignment_OnCluster,
+        RQ_SRS_006_RBAC_SettingsProfile_Alter_Syntax,
+        RQ_SRS_006_RBAC_SettingsProfile_Drop,
+        RQ_SRS_006_RBAC_SettingsProfile_Drop_IfExists,
+        RQ_SRS_006_RBAC_SettingsProfile_Drop_OnCluster,
+        RQ_SRS_006_RBAC_SettingsProfile_Drop_Syntax,
+        RQ_SRS_006_RBAC_SettingsProfile_ShowCreateSettingsProfile,
+        RQ_SRS_006_RBAC_Quotas,
+        RQ_SRS_006_RBAC_Quotas_Keyed,
+        RQ_SRS_006_RBAC_Quotas_Queries,
+        RQ_SRS_006_RBAC_Quotas_Errors,
+        RQ_SRS_006_RBAC_Quotas_ResultRows,
+        RQ_SRS_006_RBAC_Quotas_ReadRows,
+        RQ_SRS_006_RBAC_Quotas_ResultBytes,
+        RQ_SRS_006_RBAC_Quotas_ReadBytes,
+        RQ_SRS_006_RBAC_Quotas_ExecutionTime,
+        RQ_SRS_006_RBAC_Quota_Create,
+        RQ_SRS_006_RBAC_Quota_Create_IfNotExists,
+        RQ_SRS_006_RBAC_Quota_Create_Replace,
+        RQ_SRS_006_RBAC_Quota_Create_Cluster,
+        RQ_SRS_006_RBAC_Quota_Create_Interval,
+        RQ_SRS_006_RBAC_Quota_Create_Interval_Randomized,
+        RQ_SRS_006_RBAC_Quota_Create_Queries,
+        RQ_SRS_006_RBAC_Quota_Create_Errors,
+        RQ_SRS_006_RBAC_Quota_Create_ResultRows,
+        RQ_SRS_006_RBAC_Quota_Create_ReadRows,
+        RQ_SRS_006_RBAC_Quota_Create_ResultBytes,
+        RQ_SRS_006_RBAC_Quota_Create_ReadBytes,
+        RQ_SRS_006_RBAC_Quota_Create_ExecutionTime,
+        RQ_SRS_006_RBAC_Quota_Create_NoLimits,
+        RQ_SRS_006_RBAC_Quota_Create_TrackingOnly,
+        RQ_SRS_006_RBAC_Quota_Create_KeyedBy,
+        RQ_SRS_006_RBAC_Quota_Create_KeyedByOptions,
+        RQ_SRS_006_RBAC_Quota_Create_Assignment,
+        RQ_SRS_006_RBAC_Quota_Create_Assignment_None,
+        RQ_SRS_006_RBAC_Quota_Create_Assignment_All,
+        RQ_SRS_006_RBAC_Quota_Create_Assignment_Except,
+        RQ_SRS_006_RBAC_Quota_Create_Syntax,
+        RQ_SRS_006_RBAC_Quota_Alter,
+        RQ_SRS_006_RBAC_Quota_Alter_IfExists,
+        RQ_SRS_006_RBAC_Quota_Alter_Rename,
+        RQ_SRS_006_RBAC_Quota_Alter_Cluster,
+        RQ_SRS_006_RBAC_Quota_Alter_Interval,
+        RQ_SRS_006_RBAC_Quota_Alter_Interval_Randomized,
+        RQ_SRS_006_RBAC_Quota_Alter_Queries,
+        RQ_SRS_006_RBAC_Quota_Alter_Errors,
+        RQ_SRS_006_RBAC_Quota_Alter_ResultRows,
+        RQ_SRS_006_RBAC_Quota_Alter_ReadRows,
+        RQ_SRS_006_RBAC_Quota_ALter_ResultBytes,
+        RQ_SRS_006_RBAC_Quota_Alter_ReadBytes,
+        RQ_SRS_006_RBAC_Quota_Alter_ExecutionTime,
+        RQ_SRS_006_RBAC_Quota_Alter_NoLimits,
+        RQ_SRS_006_RBAC_Quota_Alter_TrackingOnly,
+        RQ_SRS_006_RBAC_Quota_Alter_KeyedBy,
+        RQ_SRS_006_RBAC_Quota_Alter_KeyedByOptions,
+        RQ_SRS_006_RBAC_Quota_Alter_Assignment,
+        RQ_SRS_006_RBAC_Quota_Alter_Assignment_None,
+        RQ_SRS_006_RBAC_Quota_Alter_Assignment_All,
+        RQ_SRS_006_RBAC_Quota_Alter_Assignment_Except,
+        RQ_SRS_006_RBAC_Quota_Alter_Syntax,
+        RQ_SRS_006_RBAC_Quota_Drop,
+        RQ_SRS_006_RBAC_Quota_Drop_IfExists,
+        RQ_SRS_006_RBAC_Quota_Drop_Cluster,
+        RQ_SRS_006_RBAC_Quota_Drop_Syntax,
+        RQ_SRS_006_RBAC_Quota_ShowQuotas,
+        RQ_SRS_006_RBAC_Quota_ShowQuotas_IntoOutfile,
+        RQ_SRS_006_RBAC_Quota_ShowQuotas_Format,
+        RQ_SRS_006_RBAC_Quota_ShowQuotas_Settings,
+        RQ_SRS_006_RBAC_Quota_ShowQuotas_Syntax,
+        RQ_SRS_006_RBAC_Quota_ShowCreateQuota_Name,
+        RQ_SRS_006_RBAC_Quota_ShowCreateQuota_Current,
+        RQ_SRS_006_RBAC_Quota_ShowCreateQuota_Syntax,
+        RQ_SRS_006_RBAC_RowPolicy,
+        RQ_SRS_006_RBAC_RowPolicy_Condition,
+        RQ_SRS_006_RBAC_RowPolicy_Restriction,
+        RQ_SRS_006_RBAC_RowPolicy_Nesting,
+        RQ_SRS_006_RBAC_RowPolicy_Create,
+        RQ_SRS_006_RBAC_RowPolicy_Create_IfNotExists,
+        RQ_SRS_006_RBAC_RowPolicy_Create_Replace,
+        RQ_SRS_006_RBAC_RowPolicy_Create_OnCluster,
+        RQ_SRS_006_RBAC_RowPolicy_Create_On,
+        RQ_SRS_006_RBAC_RowPolicy_Create_Access,
+        RQ_SRS_006_RBAC_RowPolicy_Create_Access_Permissive,
+        RQ_SRS_006_RBAC_RowPolicy_Create_Access_Restrictive,
+        RQ_SRS_006_RBAC_RowPolicy_Create_ForSelect,
+        RQ_SRS_006_RBAC_RowPolicy_Create_Condition,
+        RQ_SRS_006_RBAC_RowPolicy_Create_Assignment,
+        RQ_SRS_006_RBAC_RowPolicy_Create_Assignment_None,
+        RQ_SRS_006_RBAC_RowPolicy_Create_Assignment_All,
+        RQ_SRS_006_RBAC_RowPolicy_Create_Assignment_AllExcept,
+        RQ_SRS_006_RBAC_RowPolicy_Create_Syntax,
+        RQ_SRS_006_RBAC_RowPolicy_Alter,
+        RQ_SRS_006_RBAC_RowPolicy_Alter_IfExists,
+        RQ_SRS_006_RBAC_RowPolicy_Alter_ForSelect,
+        RQ_SRS_006_RBAC_RowPolicy_Alter_OnCluster,
+        RQ_SRS_006_RBAC_RowPolicy_Alter_On,
+        RQ_SRS_006_RBAC_RowPolicy_Alter_Rename,
+        RQ_SRS_006_RBAC_RowPolicy_Alter_Access,
+        RQ_SRS_006_RBAC_RowPolicy_Alter_Access_Permissive,
+        RQ_SRS_006_RBAC_RowPolicy_Alter_Access_Restrictive,
+        RQ_SRS_006_RBAC_RowPolicy_Alter_Condition,
+        RQ_SRS_006_RBAC_RowPolicy_Alter_Condition_None,
+        RQ_SRS_006_RBAC_RowPolicy_Alter_Assignment,
+        RQ_SRS_006_RBAC_RowPolicy_Alter_Assignment_None,
+        RQ_SRS_006_RBAC_RowPolicy_Alter_Assignment_All,
+        RQ_SRS_006_RBAC_RowPolicy_Alter_Assignment_AllExcept,
+        RQ_SRS_006_RBAC_RowPolicy_Alter_Syntax,
+        RQ_SRS_006_RBAC_RowPolicy_Drop,
+        RQ_SRS_006_RBAC_RowPolicy_Drop_IfExists,
+        RQ_SRS_006_RBAC_RowPolicy_Drop_On,
+        RQ_SRS_006_RBAC_RowPolicy_Drop_OnCluster,
+        RQ_SRS_006_RBAC_RowPolicy_Drop_Syntax,
+        RQ_SRS_006_RBAC_RowPolicy_ShowCreateRowPolicy,
+        RQ_SRS_006_RBAC_RowPolicy_ShowCreateRowPolicy_On,
+        RQ_SRS_006_RBAC_RowPolicy_ShowCreateRowPolicy_Syntax,
+        RQ_SRS_006_RBAC_RowPolicy_ShowRowPolicies,
+        RQ_SRS_006_RBAC_RowPolicy_ShowRowPolicies_On,
+        RQ_SRS_006_RBAC_RowPolicy_ShowRowPolicies_Syntax,
+        RQ_SRS_006_RBAC_SetDefaultRole,
+        RQ_SRS_006_RBAC_SetDefaultRole_CurrentUser,
+        RQ_SRS_006_RBAC_SetDefaultRole_All,
+        RQ_SRS_006_RBAC_SetDefaultRole_AllExcept,
+        RQ_SRS_006_RBAC_SetDefaultRole_None,
+        RQ_SRS_006_RBAC_SetDefaultRole_Syntax,
+        RQ_SRS_006_RBAC_SetRole,
+        RQ_SRS_006_RBAC_SetRole_Default,
+        RQ_SRS_006_RBAC_SetRole_None,
+        RQ_SRS_006_RBAC_SetRole_All,
+        RQ_SRS_006_RBAC_SetRole_AllExcept,
+        RQ_SRS_006_RBAC_SetRole_Syntax,
+        RQ_SRS_006_RBAC_Grant_Privilege_To,
+        RQ_SRS_006_RBAC_Grant_Privilege_ToCurrentUser,
+        RQ_SRS_006_RBAC_Grant_Privilege_Select,
+        RQ_SRS_006_RBAC_Grant_Privilege_Insert,
+        RQ_SRS_006_RBAC_Grant_Privilege_Alter,
+        RQ_SRS_006_RBAC_Grant_Privilege_Create,
+        RQ_SRS_006_RBAC_Grant_Privilege_Drop,
+        RQ_SRS_006_RBAC_Grant_Privilege_Truncate,
+        RQ_SRS_006_RBAC_Grant_Privilege_Optimize,
+        RQ_SRS_006_RBAC_Grant_Privilege_Show,
+        RQ_SRS_006_RBAC_Grant_Privilege_KillQuery,
+        RQ_SRS_006_RBAC_Grant_Privilege_AccessManagement,
+        RQ_SRS_006_RBAC_Grant_Privilege_System,
+        RQ_SRS_006_RBAC_Grant_Privilege_Introspection,
+        RQ_SRS_006_RBAC_Grant_Privilege_Sources,
+        RQ_SRS_006_RBAC_Grant_Privilege_DictGet,
+        RQ_SRS_006_RBAC_Grant_Privilege_None,
+        RQ_SRS_006_RBAC_Grant_Privilege_All,
+        RQ_SRS_006_RBAC_Grant_Privilege_GrantOption,
+        RQ_SRS_006_RBAC_Grant_Privilege_On,
+        RQ_SRS_006_RBAC_Grant_Privilege_PrivilegeColumns,
+        RQ_SRS_006_RBAC_Grant_Privilege_OnCluster,
+        RQ_SRS_006_RBAC_Grant_Privilege_Syntax,
+        RQ_SRS_006_RBAC_Revoke_Privilege_Cluster,
+        RQ_SRS_006_RBAC_Revoke_Privilege_Select,
+        RQ_SRS_006_RBAC_Revoke_Privilege_Insert,
+        RQ_SRS_006_RBAC_Revoke_Privilege_Alter,
+        RQ_SRS_006_RBAC_Revoke_Privilege_Create,
+        RQ_SRS_006_RBAC_Revoke_Privilege_Drop,
+        RQ_SRS_006_RBAC_Revoke_Privilege_Truncate,
+        RQ_SRS_006_RBAC_Revoke_Privilege_Optimize,
+        RQ_SRS_006_RBAC_Revoke_Privilege_Show,
+        RQ_SRS_006_RBAC_Revoke_Privilege_KillQuery,
+        RQ_SRS_006_RBAC_Revoke_Privilege_AccessManagement,
+        RQ_SRS_006_RBAC_Revoke_Privilege_System,
+        RQ_SRS_006_RBAC_Revoke_Privilege_Introspection,
+        RQ_SRS_006_RBAC_Revoke_Privilege_Sources,
+        RQ_SRS_006_RBAC_Revoke_Privilege_DictGet,
+        RQ_SRS_006_RBAC_Revoke_Privilege_PrivilegeColumns,
+        RQ_SRS_006_RBAC_Revoke_Privilege_Multiple,
+        RQ_SRS_006_RBAC_Revoke_Privilege_All,
+        RQ_SRS_006_RBAC_Revoke_Privilege_None,
+        RQ_SRS_006_RBAC_Revoke_Privilege_On,
+        RQ_SRS_006_RBAC_Revoke_Privilege_From,
+        RQ_SRS_006_RBAC_Revoke_Privilege_Syntax,
+        RQ_SRS_006_RBAC_Grant_Role,
+        RQ_SRS_006_RBAC_Grant_Role_CurrentUser,
+        RQ_SRS_006_RBAC_Grant_Role_AdminOption,
+        RQ_SRS_006_RBAC_Grant_Role_OnCluster,
+        RQ_SRS_006_RBAC_Grant_Role_Syntax,
+        RQ_SRS_006_RBAC_Revoke_Role,
+        RQ_SRS_006_RBAC_Revoke_Role_Keywords,
+        RQ_SRS_006_RBAC_Revoke_Role_Cluster,
+        RQ_SRS_006_RBAC_Revoke_AdminOption,
+        RQ_SRS_006_RBAC_Revoke_Role_Syntax,
+        RQ_SRS_006_RBAC_Show_Grants,
+        RQ_SRS_006_RBAC_Show_Grants_For,
+        RQ_SRS_006_RBAC_Show_Grants_Syntax,
+        RQ_SRS_006_RBAC_Table_PublicTables,
+        RQ_SRS_006_RBAC_Table_SensitiveTables,
+        RQ_SRS_006_RBAC_DistributedTable_Create,
+        RQ_SRS_006_RBAC_DistributedTable_Select,
+        RQ_SRS_006_RBAC_DistributedTable_Insert,
+        RQ_SRS_006_RBAC_DistributedTable_SpecialTables,
+        RQ_SRS_006_RBAC_DistributedTable_LocalUser,
+        RQ_SRS_006_RBAC_DistributedTable_SameUserDifferentNodesDifferentPrivileges,
+        RQ_SRS_006_RBAC_View,
+        RQ_SRS_006_RBAC_View_Create,
+        RQ_SRS_006_RBAC_View_Select,
+        RQ_SRS_006_RBAC_View_Drop,
+        RQ_SRS_006_RBAC_MaterializedView,
+        RQ_SRS_006_RBAC_MaterializedView_Create,
+        RQ_SRS_006_RBAC_MaterializedView_Select,
+        RQ_SRS_006_RBAC_MaterializedView_Select_TargetTable,
+        RQ_SRS_006_RBAC_MaterializedView_Select_SourceTable,
+        RQ_SRS_006_RBAC_MaterializedView_Drop,
+        RQ_SRS_006_RBAC_MaterializedView_ModifyQuery,
+        RQ_SRS_006_RBAC_MaterializedView_Insert,
+        RQ_SRS_006_RBAC_MaterializedView_Insert_SourceTable,
+        RQ_SRS_006_RBAC_MaterializedView_Insert_TargetTable,
+        RQ_SRS_006_RBAC_LiveView,
+        RQ_SRS_006_RBAC_LiveView_Create,
+        RQ_SRS_006_RBAC_LiveView_Select,
+        RQ_SRS_006_RBAC_LiveView_Drop,
+        RQ_SRS_006_RBAC_LiveView_Refresh,
+        RQ_SRS_006_RBAC_Select,
+        RQ_SRS_006_RBAC_Select_Column,
+        RQ_SRS_006_RBAC_Select_Cluster,
+        RQ_SRS_006_RBAC_Select_TableEngines,
+        RQ_SRS_006_RBAC_Insert,
+        RQ_SRS_006_RBAC_Insert_Column,
+        RQ_SRS_006_RBAC_Insert_Cluster,
+        RQ_SRS_006_RBAC_Insert_TableEngines,
+        RQ_SRS_006_RBAC_Privileges_AlterColumn,
+        RQ_SRS_006_RBAC_Privileges_AlterColumn_Grant,
+        RQ_SRS_006_RBAC_Privileges_AlterColumn_Revoke,
+        RQ_SRS_006_RBAC_Privileges_AlterColumn_Column,
+        RQ_SRS_006_RBAC_Privileges_AlterColumn_Cluster,
+        RQ_SRS_006_RBAC_Privileges_AlterColumn_TableEngines,
+        RQ_SRS_006_RBAC_Privileges_AlterIndex,
+        RQ_SRS_006_RBAC_Privileges_AlterIndex_Grant,
+        RQ_SRS_006_RBAC_Privileges_AlterIndex_Revoke,
+        RQ_SRS_006_RBAC_Privileges_AlterIndex_Cluster,
+        RQ_SRS_006_RBAC_Privileges_AlterIndex_TableEngines,
+        RQ_SRS_006_RBAC_Privileges_AlterConstraint,
+        RQ_SRS_006_RBAC_Privileges_AlterConstraint_Grant,
+        RQ_SRS_006_RBAC_Privileges_AlterConstraint_Revoke,
+        RQ_SRS_006_RBAC_Privileges_AlterConstraint_Cluster,
+        RQ_SRS_006_RBAC_Privileges_AlterConstraint_TableEngines,
+        RQ_SRS_006_RBAC_Privileges_AlterTTL,
+        RQ_SRS_006_RBAC_Privileges_AlterTTL_Grant,
+        RQ_SRS_006_RBAC_Privileges_AlterTTL_Revoke,
+        RQ_SRS_006_RBAC_Privileges_AlterTTL_Cluster,
+        RQ_SRS_006_RBAC_Privileges_AlterTTL_TableEngines,
+        RQ_SRS_006_RBAC_Privileges_AlterSettings,
+        RQ_SRS_006_RBAC_Privileges_AlterSettings_Grant,
+        RQ_SRS_006_RBAC_Privileges_AlterSettings_Revoke,
+        RQ_SRS_006_RBAC_Privileges_AlterSettings_Cluster,
+        RQ_SRS_006_RBAC_Privileges_AlterSettings_TableEngines,
+        RQ_SRS_006_RBAC_Privileges_AlterUpdate,
+        RQ_SRS_006_RBAC_Privileges_AlterUpdate_Grant,
+        RQ_SRS_006_RBAC_Privileges_AlterUpdate_Revoke,
+        RQ_SRS_006_RBAC_Privileges_AlterUpdate_TableEngines,
+        RQ_SRS_006_RBAC_Privileges_AlterDelete,
+        RQ_SRS_006_RBAC_Privileges_AlterDelete_Grant,
+        RQ_SRS_006_RBAC_Privileges_AlterDelete_Revoke,
+        RQ_SRS_006_RBAC_Privileges_AlterDelete_TableEngines,
+        RQ_SRS_006_RBAC_Privileges_AlterFreeze,
+        RQ_SRS_006_RBAC_Privileges_AlterFreeze_Grant,
+        RQ_SRS_006_RBAC_Privileges_AlterFreeze_Revoke,
+        RQ_SRS_006_RBAC_Privileges_AlterFreeze_TableEngines,
+        RQ_SRS_006_RBAC_Privileges_AlterFetch,
+        RQ_SRS_006_RBAC_Privileges_AlterFetch_Grant,
+        RQ_SRS_006_RBAC_Privileges_AlterFetch_Revoke,
+        RQ_SRS_006_RBAC_Privileges_AlterFetch_TableEngines,
+        RQ_SRS_006_RBAC_Privileges_AlterMove,
+        RQ_SRS_006_RBAC_Privileges_AlterMove_Grant,
+        RQ_SRS_006_RBAC_Privileges_AlterMove_Revoke,
+        RQ_SRS_006_RBAC_Privileges_AlterMove_TableEngines,
+        RQ_SRS_006_RBAC_Privileges_CreateTable,
+        RQ_SRS_006_RBAC_Privileges_CreateDatabase,
+        RQ_SRS_006_RBAC_Privileges_CreateDictionary,
+        RQ_SRS_006_RBAC_Privileges_CreateTemporaryTable,
+        RQ_SRS_006_RBAC_Privileges_AttachDatabase,
+        RQ_SRS_006_RBAC_Privileges_AttachDictionary,
+        RQ_SRS_006_RBAC_Privileges_AttachTemporaryTable,
+        RQ_SRS_006_RBAC_Privileges_AttachTable,
+        RQ_SRS_006_RBAC_Privileges_DropTable,
+        RQ_SRS_006_RBAC_Privileges_DropDatabase,
+        RQ_SRS_006_RBAC_Privileges_DropDictionary,
+        RQ_SRS_006_RBAC_Privileges_DetachTable,
+        RQ_SRS_006_RBAC_Privileges_DetachView,
+        RQ_SRS_006_RBAC_Privileges_DetachDatabase,
+        RQ_SRS_006_RBAC_Privileges_DetachDictionary,
+        RQ_SRS_006_RBAC_Privileges_Truncate,
+        RQ_SRS_006_RBAC_Privileges_Optimize,
+        RQ_SRS_006_RBAC_Privileges_KillQuery,
+        RQ_SRS_006_RBAC_Privileges_KillMutation,
+        RQ_SRS_006_RBAC_Privileges_KillMutation_AlterUpdate,
+        RQ_SRS_006_RBAC_Privileges_KillMutation_AlterDelete,
+        RQ_SRS_006_RBAC_Privileges_KillMutation_AlterDropColumn,
+        RQ_SRS_006_RBAC_ShowTables_Privilege,
+        RQ_SRS_006_RBAC_ShowTables_RequiredPrivilege,
+        RQ_SRS_006_RBAC_ExistsTable_RequiredPrivilege,
+        RQ_SRS_006_RBAC_CheckTable_RequiredPrivilege,
+        RQ_SRS_006_RBAC_ShowDatabases_Privilege,
+        RQ_SRS_006_RBAC_ShowDatabases_RequiredPrivilege,
+        RQ_SRS_006_RBAC_ShowCreateDatabase_RequiredPrivilege,
+        RQ_SRS_006_RBAC_UseDatabase_RequiredPrivilege,
+        RQ_SRS_006_RBAC_ShowColumns_Privilege,
+        RQ_SRS_006_RBAC_ShowCreateTable_RequiredPrivilege,
+        RQ_SRS_006_RBAC_DescribeTable_RequiredPrivilege,
+        RQ_SRS_006_RBAC_ShowDictionaries_Privilege,
+        RQ_SRS_006_RBAC_ShowDictionaries_RequiredPrivilege,
+        RQ_SRS_006_RBAC_ShowCreateDictionary_RequiredPrivilege,
+        RQ_SRS_006_RBAC_ExistsDictionary_RequiredPrivilege,
+        RQ_SRS_006_RBAC_Privileges_CreateUser,
+        RQ_SRS_006_RBAC_Privileges_CreateUser_DefaultRole,
+        RQ_SRS_006_RBAC_Privileges_AlterUser,
+        RQ_SRS_006_RBAC_Privileges_DropUser,
+        RQ_SRS_006_RBAC_Privileges_CreateRole,
+        RQ_SRS_006_RBAC_Privileges_AlterRole,
+        RQ_SRS_006_RBAC_Privileges_DropRole,
+        RQ_SRS_006_RBAC_Privileges_CreateRowPolicy,
+        RQ_SRS_006_RBAC_Privileges_AlterRowPolicy,
+        RQ_SRS_006_RBAC_Privileges_DropRowPolicy,
+        RQ_SRS_006_RBAC_Privileges_CreateQuota,
+        RQ_SRS_006_RBAC_Privileges_AlterQuota,
+        RQ_SRS_006_RBAC_Privileges_DropQuota,
+        RQ_SRS_006_RBAC_Privileges_CreateSettingsProfile,
+        RQ_SRS_006_RBAC_Privileges_AlterSettingsProfile,
+        RQ_SRS_006_RBAC_Privileges_DropSettingsProfile,
+        RQ_SRS_006_RBAC_Privileges_RoleAdmin,
+        RQ_SRS_006_RBAC_ShowUsers_Privilege,
+        RQ_SRS_006_RBAC_ShowUsers_RequiredPrivilege,
+        RQ_SRS_006_RBAC_ShowCreateUser_RequiredPrivilege,
+        RQ_SRS_006_RBAC_ShowRoles_Privilege,
+        RQ_SRS_006_RBAC_ShowRoles_RequiredPrivilege,
+        RQ_SRS_006_RBAC_ShowCreateRole_RequiredPrivilege,
+        RQ_SRS_006_RBAC_ShowRowPolicies_Privilege,
+        RQ_SRS_006_RBAC_ShowRowPolicies_RequiredPrivilege,
+        RQ_SRS_006_RBAC_ShowCreateRowPolicy_RequiredPrivilege,
+        RQ_SRS_006_RBAC_ShowQuotas_Privilege,
+        RQ_SRS_006_RBAC_ShowQuotas_RequiredPrivilege,
+        RQ_SRS_006_RBAC_ShowCreateQuota_RequiredPrivilege,
+        RQ_SRS_006_RBAC_ShowSettingsProfiles_Privilege,
+        RQ_SRS_006_RBAC_ShowSettingsProfiles_RequiredPrivilege,
+        RQ_SRS_006_RBAC_ShowCreateSettingsProfile_RequiredPrivilege,
+        RQ_SRS_006_RBAC_dictGet_Privilege,
+        RQ_SRS_006_RBAC_dictGet_RequiredPrivilege,
+        RQ_SRS_006_RBAC_dictGet_Type_RequiredPrivilege,
+        RQ_SRS_006_RBAC_dictGet_OrDefault_RequiredPrivilege,
+        RQ_SRS_006_RBAC_dictHas_RequiredPrivilege,
+        RQ_SRS_006_RBAC_dictGetHierarchy_RequiredPrivilege,
+        RQ_SRS_006_RBAC_dictIsIn_RequiredPrivilege,
+        RQ_SRS_006_RBAC_Privileges_Introspection,
+        RQ_SRS_006_RBAC_Privileges_Introspection_addressToLine,
+        RQ_SRS_006_RBAC_Privileges_Introspection_addressToSymbol,
+        RQ_SRS_006_RBAC_Privileges_Introspection_demangle,
+        RQ_SRS_006_RBAC_Privileges_System_Shutdown,
+        RQ_SRS_006_RBAC_Privileges_System_DropCache,
+        RQ_SRS_006_RBAC_Privileges_System_DropCache_DNS,
+        RQ_SRS_006_RBAC_Privileges_System_DropCache_Mark,
+        RQ_SRS_006_RBAC_Privileges_System_DropCache_Uncompressed,
+        RQ_SRS_006_RBAC_Privileges_System_Reload,
+        RQ_SRS_006_RBAC_Privileges_System_Reload_Config,
+        RQ_SRS_006_RBAC_Privileges_System_Reload_Dictionary,
+        RQ_SRS_006_RBAC_Privileges_System_Reload_Dictionaries,
+        RQ_SRS_006_RBAC_Privileges_System_Reload_EmbeddedDictionaries,
+        RQ_SRS_006_RBAC_Privileges_System_Merges,
+        RQ_SRS_006_RBAC_Privileges_System_TTLMerges,
+        RQ_SRS_006_RBAC_Privileges_System_Fetches,
+        RQ_SRS_006_RBAC_Privileges_System_Moves,
+        RQ_SRS_006_RBAC_Privileges_System_Sends,
+        RQ_SRS_006_RBAC_Privileges_System_Sends_Distributed,
+        RQ_SRS_006_RBAC_Privileges_System_Sends_Replicated,
+        RQ_SRS_006_RBAC_Privileges_System_ReplicationQueues,
+        RQ_SRS_006_RBAC_Privileges_System_SyncReplica,
+        RQ_SRS_006_RBAC_Privileges_System_RestartReplica,
+        RQ_SRS_006_RBAC_Privileges_System_Flush,
+        RQ_SRS_006_RBAC_Privileges_System_Flush_Distributed,
+        RQ_SRS_006_RBAC_Privileges_System_Flush_Logs,
+        RQ_SRS_006_RBAC_Privileges_Sources,
+        RQ_SRS_006_RBAC_Privileges_Sources_File,
+        RQ_SRS_006_RBAC_Privileges_Sources_URL,
+        RQ_SRS_006_RBAC_Privileges_Sources_Remote,
+        RQ_SRS_006_RBAC_Privileges_Sources_MySQL,
+        RQ_SRS_006_RBAC_Privileges_Sources_ODBC,
+        RQ_SRS_006_RBAC_Privileges_Sources_JDBC,
+        RQ_SRS_006_RBAC_Privileges_Sources_HDFS,
+        RQ_SRS_006_RBAC_Privileges_Sources_S3,
+        RQ_SRS_006_RBAC_Privileges_GrantOption,
+        RQ_SRS_006_RBAC_Privileges_All,
+        RQ_SRS_006_RBAC_Privileges_RoleAll,
+        RQ_SRS_006_RBAC_Privileges_None,
+        RQ_SRS_006_RBAC_Privileges_AdminOption,
+        ),
+    content='''
 # SRS-006 ClickHouse Role Based Access Control
 # Software Requirements Specification
 
@@ -34,556 +9989,588 @@ SRS_006_ClickHouse_Role_Based_Access_Control = Specification(
 * 5 [Requirements](#requirements)
   * 5.1 [Generic](#generic)
     * 5.1.1 [RQ.SRS-006.RBAC](#rqsrs-006rbac)
-    * 5.1.2 [Login](#login)
-      * 5.1.2.1 [RQ.SRS-006.RBAC.Login](#rqsrs-006rbaclogin)
-      * 5.1.2.2 [RQ.SRS-006.RBAC.Login.DefaultUser](#rqsrs-006rbaclogindefaultuser)
-    * 5.1.3 [User](#user)
-      * 5.1.3.1 [RQ.SRS-006.RBAC.User](#rqsrs-006rbacuser)
-      * 5.1.3.2 [RQ.SRS-006.RBAC.User.Roles](#rqsrs-006rbacuserroles)
-      * 5.1.3.3 [RQ.SRS-006.RBAC.User.Privileges](#rqsrs-006rbacuserprivileges)
-      * 5.1.3.4 [RQ.SRS-006.RBAC.User.Variables](#rqsrs-006rbacuservariables)
-      * 5.1.3.5 [RQ.SRS-006.RBAC.User.Variables.Constraints](#rqsrs-006rbacuservariablesconstraints)
-      * 5.1.3.6 [RQ.SRS-006.RBAC.User.SettingsProfile](#rqsrs-006rbacusersettingsprofile)
-      * 5.1.3.7 [RQ.SRS-006.RBAC.User.Quotas](#rqsrs-006rbacuserquotas)
-      * 5.1.3.8 [RQ.SRS-006.RBAC.User.RowPolicies](#rqsrs-006rbacuserrowpolicies)
-      * 5.1.3.9 [RQ.SRS-006.RBAC.User.AccountLock](#rqsrs-006rbacuseraccountlock)
-      * 5.1.3.10 [RQ.SRS-006.RBAC.User.AccountLock.DenyAccess](#rqsrs-006rbacuseraccountlockdenyaccess)
-      * 5.1.3.11 [RQ.SRS-006.RBAC.User.DefaultRole](#rqsrs-006rbacuserdefaultrole)
-      * 5.1.3.12 [RQ.SRS-006.RBAC.User.RoleSelection](#rqsrs-006rbacuserroleselection)
-      * 5.1.3.13 [RQ.SRS-006.RBAC.User.ShowCreate](#rqsrs-006rbacusershowcreate)
-      * 5.1.3.14 [RQ.SRS-006.RBAC.User.ShowPrivileges](#rqsrs-006rbacusershowprivileges)
-    * 5.1.4 [Role](#role)
-      * 5.1.4.1 [RQ.SRS-006.RBAC.Role](#rqsrs-006rbacrole)
-      * 5.1.4.2 [RQ.SRS-006.RBAC.Role.Privileges](#rqsrs-006rbacroleprivileges)
-      * 5.1.4.3 [RQ.SRS-006.RBAC.Role.Variables](#rqsrs-006rbacrolevariables)
-      * 5.1.4.4 [RQ.SRS-006.RBAC.Role.SettingsProfile](#rqsrs-006rbacrolesettingsprofile)
-      * 5.1.4.5 [RQ.SRS-006.RBAC.Role.Quotas](#rqsrs-006rbacrolequotas)
-      * 5.1.4.6 [RQ.SRS-006.RBAC.Role.RowPolicies](#rqsrs-006rbacrolerowpolicies)
-    * 5.1.5 [Partial Revokes](#partial-revokes)
-      * 5.1.5.1 [RQ.SRS-006.RBAC.PartialRevokes](#rqsrs-006rbacpartialrevokes)
-    * 5.1.6 [Settings Profile](#settings-profile)
-      * 5.1.6.1 [RQ.SRS-006.RBAC.SettingsProfile](#rqsrs-006rbacsettingsprofile)
-      * 5.1.6.2 [RQ.SRS-006.RBAC.SettingsProfile.Constraints](#rqsrs-006rbacsettingsprofileconstraints)
-      * 5.1.6.3 [RQ.SRS-006.RBAC.SettingsProfile.ShowCreate](#rqsrs-006rbacsettingsprofileshowcreate)
-    * 5.1.7 [Quotas](#quotas)
-      * 5.1.7.1 [RQ.SRS-006.RBAC.Quotas](#rqsrs-006rbacquotas)
-      * 5.1.7.2 [RQ.SRS-006.RBAC.Quotas.Keyed](#rqsrs-006rbacquotaskeyed)
-      * 5.1.7.3 [RQ.SRS-006.RBAC.Quotas.Queries](#rqsrs-006rbacquotasqueries)
-      * 5.1.7.4 [RQ.SRS-006.RBAC.Quotas.Errors](#rqsrs-006rbacquotaserrors)
-      * 5.1.7.5 [RQ.SRS-006.RBAC.Quotas.ResultRows](#rqsrs-006rbacquotasresultrows)
-      * 5.1.7.6 [RQ.SRS-006.RBAC.Quotas.ReadRows](#rqsrs-006rbacquotasreadrows)
-      * 5.1.7.7 [RQ.SRS-006.RBAC.Quotas.ResultBytes](#rqsrs-006rbacquotasresultbytes)
-      * 5.1.7.8 [RQ.SRS-006.RBAC.Quotas.ReadBytes](#rqsrs-006rbacquotasreadbytes)
-      * 5.1.7.9 [RQ.SRS-006.RBAC.Quotas.ExecutionTime](#rqsrs-006rbacquotasexecutiontime)
-      * 5.1.7.10 [RQ.SRS-006.RBAC.Quotas.ShowCreate](#rqsrs-006rbacquotasshowcreate)
-    * 5.1.8 [Row Policy](#row-policy)
-      * 5.1.8.1 [RQ.SRS-006.RBAC.RowPolicy](#rqsrs-006rbacrowpolicy)
-      * 5.1.8.2 [RQ.SRS-006.RBAC.RowPolicy.Condition](#rqsrs-006rbacrowpolicycondition)
-      * 5.1.8.3 [RQ.SRS-006.RBAC.RowPolicy.ShowCreate](#rqsrs-006rbacrowpolicyshowcreate)
-  * 5.2 [Specific](#specific)
-      * 5.2.8.1 [RQ.SRS-006.RBAC.User.Use.DefaultRole](#rqsrs-006rbacuserusedefaultrole)
-      * 5.2.8.2 [RQ.SRS-006.RBAC.User.Use.AllRolesWhenNoDefaultRole](#rqsrs-006rbacuseruseallroleswhennodefaultrole)
-      * 5.2.8.3 [RQ.SRS-006.RBAC.User.Create](#rqsrs-006rbacusercreate)
-      * 5.2.8.4 [RQ.SRS-006.RBAC.User.Create.IfNotExists](#rqsrs-006rbacusercreateifnotexists)
-      * 5.2.8.5 [RQ.SRS-006.RBAC.User.Create.Replace](#rqsrs-006rbacusercreatereplace)
-      * 5.2.8.6 [RQ.SRS-006.RBAC.User.Create.Password.NoPassword](#rqsrs-006rbacusercreatepasswordnopassword)
-      * 5.2.8.7 [RQ.SRS-006.RBAC.User.Create.Password.NoPassword.Login](#rqsrs-006rbacusercreatepasswordnopasswordlogin)
-      * 5.2.8.8 [RQ.SRS-006.RBAC.User.Create.Password.PlainText](#rqsrs-006rbacusercreatepasswordplaintext)
-      * 5.2.8.9 [RQ.SRS-006.RBAC.User.Create.Password.PlainText.Login](#rqsrs-006rbacusercreatepasswordplaintextlogin)
-      * 5.2.8.10 [RQ.SRS-006.RBAC.User.Create.Password.Sha256Password](#rqsrs-006rbacusercreatepasswordsha256password)
-      * 5.2.8.11 [RQ.SRS-006.RBAC.User.Create.Password.Sha256Password.Login](#rqsrs-006rbacusercreatepasswordsha256passwordlogin)
-      * 5.2.8.12 [RQ.SRS-006.RBAC.User.Create.Password.Sha256Hash](#rqsrs-006rbacusercreatepasswordsha256hash)
-      * 5.2.8.13 [RQ.SRS-006.RBAC.User.Create.Password.Sha256Hash.Login](#rqsrs-006rbacusercreatepasswordsha256hashlogin)
-      * 5.2.8.14 [RQ.SRS-006.RBAC.User.Create.Password.DoubleSha1Password](#rqsrs-006rbacusercreatepassworddoublesha1password)
-      * 5.2.8.15 [RQ.SRS-006.RBAC.User.Create.Password.DoubleSha1Password.Login](#rqsrs-006rbacusercreatepassworddoublesha1passwordlogin)
-      * 5.2.8.16 [RQ.SRS-006.RBAC.User.Create.Password.DoubleSha1Hash](#rqsrs-006rbacusercreatepassworddoublesha1hash)
-      * 5.2.8.17 [RQ.SRS-006.RBAC.User.Create.Password.DoubleSha1Hash.Login](#rqsrs-006rbacusercreatepassworddoublesha1hashlogin)
-      * 5.2.8.18 [RQ.SRS-006.RBAC.User.Create.Host.Name](#rqsrs-006rbacusercreatehostname)
-      * 5.2.8.19 [RQ.SRS-006.RBAC.User.Create.Host.Regexp](#rqsrs-006rbacusercreatehostregexp)
-      * 5.2.8.20 [RQ.SRS-006.RBAC.User.Create.Host.IP](#rqsrs-006rbacusercreatehostip)
-      * 5.2.8.21 [RQ.SRS-006.RBAC.User.Create.Host.Any](#rqsrs-006rbacusercreatehostany)
-      * 5.2.8.22 [RQ.SRS-006.RBAC.User.Create.Host.None](#rqsrs-006rbacusercreatehostnone)
-      * 5.2.8.23 [RQ.SRS-006.RBAC.User.Create.Host.Local](#rqsrs-006rbacusercreatehostlocal)
-      * 5.2.8.24 [RQ.SRS-006.RBAC.User.Create.Host.Like](#rqsrs-006rbacusercreatehostlike)
-      * 5.2.8.25 [RQ.SRS-006.RBAC.User.Create.Host.Default](#rqsrs-006rbacusercreatehostdefault)
-      * 5.2.8.26 [RQ.SRS-006.RBAC.User.Create.DefaultRole](#rqsrs-006rbacusercreatedefaultrole)
-      * 5.2.8.27 [RQ.SRS-006.RBAC.User.Create.DefaultRole.None](#rqsrs-006rbacusercreatedefaultrolenone)
-      * 5.2.8.28 [RQ.SRS-006.RBAC.User.Create.DefaultRole.All](#rqsrs-006rbacusercreatedefaultroleall)
-      * 5.2.8.29 [RQ.SRS-006.RBAC.User.Create.Settings](#rqsrs-006rbacusercreatesettings)
-      * 5.2.8.30 [RQ.SRS-006.RBAC.User.Create.OnCluster](#rqsrs-006rbacusercreateoncluster)
-      * 5.2.8.31 [RQ.SRS-006.RBAC.User.Create.Syntax](#rqsrs-006rbacusercreatesyntax)
-      * 5.2.8.32 [RQ.SRS-006.RBAC.User.Alter](#rqsrs-006rbacuseralter)
-      * 5.2.8.33 [RQ.SRS-006.RBAC.User.Alter.OrderOfEvaluation](#rqsrs-006rbacuseralterorderofevaluation)
-      * 5.2.8.34 [RQ.SRS-006.RBAC.User.Alter.IfExists](#rqsrs-006rbacuseralterifexists)
-      * 5.2.8.35 [RQ.SRS-006.RBAC.User.Alter.Cluster](#rqsrs-006rbacuseraltercluster)
-      * 5.2.8.36 [RQ.SRS-006.RBAC.User.Alter.Rename](#rqsrs-006rbacuseralterrename)
-      * 5.2.8.37 [RQ.SRS-006.RBAC.User.Alter.Password.PlainText](#rqsrs-006rbacuseralterpasswordplaintext)
-      * 5.2.8.38 [RQ.SRS-006.RBAC.User.Alter.Password.Sha256Password](#rqsrs-006rbacuseralterpasswordsha256password)
-      * 5.2.8.39 [RQ.SRS-006.RBAC.User.Alter.Password.DoubleSha1Password](#rqsrs-006rbacuseralterpassworddoublesha1password)
-      * 5.2.8.40 [RQ.SRS-006.RBAC.User.Alter.Host.AddDrop](#rqsrs-006rbacuseralterhostadddrop)
-      * 5.2.8.41 [RQ.SRS-006.RBAC.User.Alter.Host.Local](#rqsrs-006rbacuseralterhostlocal)
-      * 5.2.8.42 [RQ.SRS-006.RBAC.User.Alter.Host.Name](#rqsrs-006rbacuseralterhostname)
-      * 5.2.8.43 [RQ.SRS-006.RBAC.User.Alter.Host.Regexp](#rqsrs-006rbacuseralterhostregexp)
-      * 5.2.8.44 [RQ.SRS-006.RBAC.User.Alter.Host.IP](#rqsrs-006rbacuseralterhostip)
-      * 5.2.8.45 [RQ.SRS-006.RBAC.User.Alter.Host.Like](#rqsrs-006rbacuseralterhostlike)
-      * 5.2.8.46 [RQ.SRS-006.RBAC.User.Alter.Host.Any](#rqsrs-006rbacuseralterhostany)
-      * 5.2.8.47 [RQ.SRS-006.RBAC.User.Alter.Host.None](#rqsrs-006rbacuseralterhostnone)
-      * 5.2.8.48 [RQ.SRS-006.RBAC.User.Alter.DefaultRole](#rqsrs-006rbacuseralterdefaultrole)
-      * 5.2.8.49 [RQ.SRS-006.RBAC.User.Alter.DefaultRole.All](#rqsrs-006rbacuseralterdefaultroleall)
-      * 5.2.8.50 [RQ.SRS-006.RBAC.User.Alter.DefaultRole.AllExcept](#rqsrs-006rbacuseralterdefaultroleallexcept)
-      * 5.2.8.51 [RQ.SRS-006.RBAC.User.Alter.Settings](#rqsrs-006rbacuseraltersettings)
-      * 5.2.8.52 [RQ.SRS-006.RBAC.User.Alter.Settings.Min](#rqsrs-006rbacuseraltersettingsmin)
-      * 5.2.8.53 [RQ.SRS-006.RBAC.User.Alter.Settings.Max](#rqsrs-006rbacuseraltersettingsmax)
-      * 5.2.8.54 [RQ.SRS-006.RBAC.User.Alter.Settings.Profile](#rqsrs-006rbacuseraltersettingsprofile)
-      * 5.2.8.55 [RQ.SRS-006.RBAC.User.Alter.Syntax](#rqsrs-006rbacuseraltersyntax)
-      * 5.2.8.56 [RQ.SRS-006.RBAC.SetDefaultRole](#rqsrs-006rbacsetdefaultrole)
-      * 5.2.8.57 [RQ.SRS-006.RBAC.SetDefaultRole.CurrentUser](#rqsrs-006rbacsetdefaultrolecurrentuser)
-      * 5.2.8.58 [RQ.SRS-006.RBAC.SetDefaultRole.All](#rqsrs-006rbacsetdefaultroleall)
-      * 5.2.8.59 [RQ.SRS-006.RBAC.SetDefaultRole.AllExcept](#rqsrs-006rbacsetdefaultroleallexcept)
-      * 5.2.8.60 [RQ.SRS-006.RBAC.SetDefaultRole.None](#rqsrs-006rbacsetdefaultrolenone)
-      * 5.2.8.61 [RQ.SRS-006.RBAC.SetDefaultRole.Syntax](#rqsrs-006rbacsetdefaultrolesyntax)
-      * 5.2.8.62 [RQ.SRS-006.RBAC.SetRole](#rqsrs-006rbacsetrole)
-      * 5.2.8.63 [RQ.SRS-006.RBAC.SetRole.Default](#rqsrs-006rbacsetroledefault)
-      * 5.2.8.64 [RQ.SRS-006.RBAC.SetRole.None](#rqsrs-006rbacsetrolenone)
-      * 5.2.8.65 [RQ.SRS-006.RBAC.SetRole.All](#rqsrs-006rbacsetroleall)
-      * 5.2.8.66 [RQ.SRS-006.RBAC.SetRole.AllExcept](#rqsrs-006rbacsetroleallexcept)
-      * 5.2.8.67 [RQ.SRS-006.RBAC.SetRole.Syntax](#rqsrs-006rbacsetrolesyntax)
-      * 5.2.8.68 [RQ.SRS-006.RBAC.User.ShowCreateUser](#rqsrs-006rbacusershowcreateuser)
-      * 5.2.8.69 [RQ.SRS-006.RBAC.User.ShowCreateUser.For](#rqsrs-006rbacusershowcreateuserfor)
-      * 5.2.8.70 [RQ.SRS-006.RBAC.User.ShowCreateUser.Syntax](#rqsrs-006rbacusershowcreateusersyntax)
-      * 5.2.8.71 [RQ.SRS-006.RBAC.User.Drop](#rqsrs-006rbacuserdrop)
-      * 5.2.8.72 [RQ.SRS-006.RBAC.User.Drop.IfExists](#rqsrs-006rbacuserdropifexists)
-      * 5.2.8.73 [RQ.SRS-006.RBAC.User.Drop.OnCluster](#rqsrs-006rbacuserdroponcluster)
-      * 5.2.8.74 [RQ.SRS-006.RBAC.User.Drop.Syntax](#rqsrs-006rbacuserdropsyntax)
-      * 5.2.8.75 [RQ.SRS-006.RBAC.Role.Create](#rqsrs-006rbacrolecreate)
-      * 5.2.8.76 [RQ.SRS-006.RBAC.Role.Create.IfNotExists](#rqsrs-006rbacrolecreateifnotexists)
-      * 5.2.8.77 [RQ.SRS-006.RBAC.Role.Create.Replace](#rqsrs-006rbacrolecreatereplace)
-      * 5.2.8.78 [RQ.SRS-006.RBAC.Role.Create.Settings](#rqsrs-006rbacrolecreatesettings)
-      * 5.2.8.79 [RQ.SRS-006.RBAC.Role.Create.Syntax](#rqsrs-006rbacrolecreatesyntax)
-      * 5.2.8.80 [RQ.SRS-006.RBAC.Role.Alter](#rqsrs-006rbacrolealter)
-      * 5.2.8.81 [RQ.SRS-006.RBAC.Role.Alter.IfExists](#rqsrs-006rbacrolealterifexists)
-      * 5.2.8.82 [RQ.SRS-006.RBAC.Role.Alter.Cluster](#rqsrs-006rbacrolealtercluster)
-      * 5.2.8.83 [RQ.SRS-006.RBAC.Role.Alter.Rename](#rqsrs-006rbacrolealterrename)
-      * 5.2.8.84 [RQ.SRS-006.RBAC.Role.Alter.Settings](#rqsrs-006rbacrolealtersettings)
-      * 5.2.8.85 [RQ.SRS-006.RBAC.Role.Alter.Syntax](#rqsrs-006rbacrolealtersyntax)
-      * 5.2.8.86 [RQ.SRS-006.RBAC.Role.Drop](#rqsrs-006rbacroledrop)
-      * 5.2.8.87 [RQ.SRS-006.RBAC.Role.Drop.IfExists](#rqsrs-006rbacroledropifexists)
-      * 5.2.8.88 [RQ.SRS-006.RBAC.Role.Drop.Cluster](#rqsrs-006rbacroledropcluster)
-      * 5.2.8.89 [RQ.SRS-006.RBAC.Role.Drop.Syntax](#rqsrs-006rbacroledropsyntax)
-      * 5.2.8.90 [RQ.SRS-006.RBAC.Role.ShowCreate](#rqsrs-006rbacroleshowcreate)
-      * 5.2.8.91 [RQ.SRS-006.RBAC.Role.ShowCreate.Syntax](#rqsrs-006rbacroleshowcreatesyntax)
-      * 5.2.8.92 [RQ.SRS-006.RBAC.Grant.Privilege.To](#rqsrs-006rbacgrantprivilegeto)
-      * 5.2.8.93 [RQ.SRS-006.RBAC.Grant.Privilege.ToCurrentUser](#rqsrs-006rbacgrantprivilegetocurrentuser)
-      * 5.2.8.94 [RQ.SRS-006.RBAC.Grant.Privilege.Select](#rqsrs-006rbacgrantprivilegeselect)
-      * 5.2.8.95 [RQ.SRS-006.RBAC.Grant.Privilege.Insert](#rqsrs-006rbacgrantprivilegeinsert)
-      * 5.2.8.96 [RQ.SRS-006.RBAC.Grant.Privilege.Alter](#rqsrs-006rbacgrantprivilegealter)
-      * 5.2.8.97 [RQ.SRS-006.RBAC.Grant.Privilege.Create](#rqsrs-006rbacgrantprivilegecreate)
-      * 5.2.8.98 [RQ.SRS-006.RBAC.Grant.Privilege.Drop](#rqsrs-006rbacgrantprivilegedrop)
-      * 5.2.8.99 [RQ.SRS-006.RBAC.Grant.Privilege.Truncate](#rqsrs-006rbacgrantprivilegetruncate)
-      * 5.2.8.100 [RQ.SRS-006.RBAC.Grant.Privilege.Optimize](#rqsrs-006rbacgrantprivilegeoptimize)
-      * 5.2.8.101 [RQ.SRS-006.RBAC.Grant.Privilege.Show](#rqsrs-006rbacgrantprivilegeshow)
-      * 5.2.8.102 [RQ.SRS-006.RBAC.Grant.Privilege.KillQuery](#rqsrs-006rbacgrantprivilegekillquery)
-      * 5.2.8.103 [RQ.SRS-006.RBAC.Grant.Privilege.AccessManagement](#rqsrs-006rbacgrantprivilegeaccessmanagement)
-      * 5.2.8.104 [RQ.SRS-006.RBAC.Grant.Privilege.System](#rqsrs-006rbacgrantprivilegesystem)
-      * 5.2.8.105 [RQ.SRS-006.RBAC.Grant.Privilege.Introspection](#rqsrs-006rbacgrantprivilegeintrospection)
-      * 5.2.8.106 [RQ.SRS-006.RBAC.Grant.Privilege.Sources](#rqsrs-006rbacgrantprivilegesources)
-      * 5.2.8.107 [RQ.SRS-006.RBAC.Grant.Privilege.DictGet](#rqsrs-006rbacgrantprivilegedictget)
-      * 5.2.8.108 [RQ.SRS-006.RBAC.Grant.Privilege.None](#rqsrs-006rbacgrantprivilegenone)
-      * 5.2.8.109 [RQ.SRS-006.RBAC.Grant.Privilege.All](#rqsrs-006rbacgrantprivilegeall)
-      * 5.2.8.110 [RQ.SRS-006.RBAC.Grant.Privilege.GrantOption](#rqsrs-006rbacgrantprivilegegrantoption)
-      * 5.2.8.111 [RQ.SRS-006.RBAC.Grant.Privilege.On](#rqsrs-006rbacgrantprivilegeon)
-      * 5.2.8.112 [RQ.SRS-006.RBAC.Grant.Privilege.PrivilegeColumns](#rqsrs-006rbacgrantprivilegeprivilegecolumns)
-      * 5.2.8.113 [RQ.SRS-006.RBAC.Grant.Privilege.OnCluster](#rqsrs-006rbacgrantprivilegeoncluster)
-      * 5.2.8.114 [RQ.SRS-006.RBAC.Grant.Privilege.Syntax](#rqsrs-006rbacgrantprivilegesyntax)
-      * 5.2.8.115 [RQ.SRS-006.RBAC.Revoke.Privilege.Cluster](#rqsrs-006rbacrevokeprivilegecluster)
-      * 5.2.8.116 [RQ.SRS-006.RBAC.Revoke.Privilege.Any](#rqsrs-006rbacrevokeprivilegeany)
-      * 5.2.8.117 [RQ.SRS-006.RBAC.Revoke.Privilege.Select](#rqsrs-006rbacrevokeprivilegeselect)
-      * 5.2.8.118 [RQ.SRS-006.RBAC.Revoke.Privilege.Insert](#rqsrs-006rbacrevokeprivilegeinsert)
-      * 5.2.8.119 [RQ.SRS-006.RBAC.Revoke.Privilege.Alter](#rqsrs-006rbacrevokeprivilegealter)
-      * 5.2.8.120 [RQ.SRS-006.RBAC.Revoke.Privilege.Create](#rqsrs-006rbacrevokeprivilegecreate)
-      * 5.2.8.121 [RQ.SRS-006.RBAC.Revoke.Privilege.Drop](#rqsrs-006rbacrevokeprivilegedrop)
-      * 5.2.8.122 [RQ.SRS-006.RBAC.Revoke.Privilege.Truncate](#rqsrs-006rbacrevokeprivilegetruncate)
-      * 5.2.8.123 [RQ.SRS-006.RBAC.Revoke.Privilege.Optimize](#rqsrs-006rbacrevokeprivilegeoptimize)
-      * 5.2.8.124 [RQ.SRS-006.RBAC.Revoke.Privilege.Show](#rqsrs-006rbacrevokeprivilegeshow)
-      * 5.2.8.125 [RQ.SRS-006.RBAC.Revoke.Privilege.KillQuery](#rqsrs-006rbacrevokeprivilegekillquery)
-      * 5.2.8.126 [RQ.SRS-006.RBAC.Revoke.Privilege.AccessManagement](#rqsrs-006rbacrevokeprivilegeaccessmanagement)
-      * 5.2.8.127 [RQ.SRS-006.RBAC.Revoke.Privilege.System](#rqsrs-006rbacrevokeprivilegesystem)
-      * 5.2.8.128 [RQ.SRS-006.RBAC.Revoke.Privilege.Introspection](#rqsrs-006rbacrevokeprivilegeintrospection)
-      * 5.2.8.129 [RQ.SRS-006.RBAC.Revoke.Privilege.Sources](#rqsrs-006rbacrevokeprivilegesources)
-      * 5.2.8.130 [RQ.SRS-006.RBAC.Revoke.Privilege.DictGet](#rqsrs-006rbacrevokeprivilegedictget)
-      * 5.2.8.131 [RQ.SRS-006.RBAC.Revoke.Privilege.PrivelegeColumns](#rqsrs-006rbacrevokeprivilegeprivelegecolumns)
-      * 5.2.8.132 [RQ.SRS-006.RBAC.Revoke.Privilege.Multiple](#rqsrs-006rbacrevokeprivilegemultiple)
-      * 5.2.8.133 [RQ.SRS-006.RBAC.Revoke.Privilege.All](#rqsrs-006rbacrevokeprivilegeall)
-      * 5.2.8.134 [RQ.SRS-006.RBAC.Revoke.Privilege.None](#rqsrs-006rbacrevokeprivilegenone)
-      * 5.2.8.135 [RQ.SRS-006.RBAC.Revoke.Privilege.On](#rqsrs-006rbacrevokeprivilegeon)
-      * 5.2.8.136 [RQ.SRS-006.RBAC.Revoke.Privilege.From](#rqsrs-006rbacrevokeprivilegefrom)
-      * 5.2.8.137 [RQ.SRS-006.RBAC.Revoke.Privilege.Syntax](#rqsrs-006rbacrevokeprivilegesyntax)
-      * 5.2.8.138 [RQ.SRS-006.RBAC.PartialRevoke.Syntax](#rqsrs-006rbacpartialrevokesyntax)
-      * 5.2.8.139 [RQ.SRS-006.RBAC.Grant.Role](#rqsrs-006rbacgrantrole)
-      * 5.2.8.140 [RQ.SRS-006.RBAC.Grant.Role.CurrentUser](#rqsrs-006rbacgrantrolecurrentuser)
-      * 5.2.8.141 [RQ.SRS-006.RBAC.Grant.Role.AdminOption](#rqsrs-006rbacgrantroleadminoption)
-      * 5.2.8.142 [RQ.SRS-006.RBAC.Grant.Role.OnCluster](#rqsrs-006rbacgrantroleoncluster)
-      * 5.2.8.143 [RQ.SRS-006.RBAC.Grant.Role.Syntax](#rqsrs-006rbacgrantrolesyntax)
-      * 5.2.8.144 [RQ.SRS-006.RBAC.Revoke.Role](#rqsrs-006rbacrevokerole)
-      * 5.2.8.145 [RQ.SRS-006.RBAC.Revoke.Role.Keywords](#rqsrs-006rbacrevokerolekeywords)
-      * 5.2.8.146 [RQ.SRS-006.RBAC.Revoke.Role.Cluster](#rqsrs-006rbacrevokerolecluster)
-      * 5.2.8.147 [RQ.SRS-006.RBAC.Revoke.AdminOption](#rqsrs-006rbacrevokeadminoption)
-      * 5.2.8.148 [RQ.SRS-006.RBAC.Revoke.Role.Syntax](#rqsrs-006rbacrevokerolesyntax)
-      * 5.2.8.149 [RQ.SRS-006.RBAC.Show.Grants](#rqsrs-006rbacshowgrants)
-      * 5.2.8.150 [RQ.SRS-006.RBAC.Show.Grants.For](#rqsrs-006rbacshowgrantsfor)
-      * 5.2.8.151 [RQ.SRS-006.RBAC.Show.Grants.Syntax](#rqsrs-006rbacshowgrantssyntax)
-      * 5.2.8.152 [RQ.SRS-006.RBAC.SettingsProfile.Create](#rqsrs-006rbacsettingsprofilecreate)
-      * 5.2.8.153 [RQ.SRS-006.RBAC.SettingsProfile.Create.IfNotExists](#rqsrs-006rbacsettingsprofilecreateifnotexists)
-      * 5.2.8.154 [RQ.SRS-006.RBAC.SettingsProfile.Create.Replace](#rqsrs-006rbacsettingsprofilecreatereplace)
-      * 5.2.8.155 [RQ.SRS-006.RBAC.SettingsProfile.Create.Variables](#rqsrs-006rbacsettingsprofilecreatevariables)
-      * 5.2.8.156 [RQ.SRS-006.RBAC.SettingsProfile.Create.Variables.Value](#rqsrs-006rbacsettingsprofilecreatevariablesvalue)
-      * 5.2.8.157 [RQ.SRS-006.RBAC.SettingsProfile.Create.Variables.Constraints](#rqsrs-006rbacsettingsprofilecreatevariablesconstraints)
-      * 5.2.8.158 [RQ.SRS-006.RBAC.SettingsProfile.Create.Assignment](#rqsrs-006rbacsettingsprofilecreateassignment)
-      * 5.2.8.159 [RQ.SRS-006.RBAC.SettingsProfile.Create.Assignment.None](#rqsrs-006rbacsettingsprofilecreateassignmentnone)
-      * 5.2.8.160 [RQ.SRS-006.RBAC.SettingsProfile.Create.Assignment.All](#rqsrs-006rbacsettingsprofilecreateassignmentall)
-      * 5.2.8.161 [RQ.SRS-006.RBAC.SettingsProfile.Create.Assignment.AllExcept](#rqsrs-006rbacsettingsprofilecreateassignmentallexcept)
-      * 5.2.8.162 [RQ.SRS-006.RBAC.SettingsProfile.Create.Inherit](#rqsrs-006rbacsettingsprofilecreateinherit)
-      * 5.2.8.163 [RQ.SRS-006.RBAC.SettingsProfile.Create.OnCluster](#rqsrs-006rbacsettingsprofilecreateoncluster)
-      * 5.2.8.164 [RQ.SRS-006.RBAC.SettingsProfile.Create.Syntax](#rqsrs-006rbacsettingsprofilecreatesyntax)
-      * 5.2.8.165 [RQ.SRS-006.RBAC.SettingsProfile.Alter](#rqsrs-006rbacsettingsprofilealter)
-      * 5.2.8.166 [RQ.SRS-006.RBAC.SettingsProfile.Alter.IfExists](#rqsrs-006rbacsettingsprofilealterifexists)
-      * 5.2.8.167 [RQ.SRS-006.RBAC.SettingsProfile.Alter.Rename](#rqsrs-006rbacsettingsprofilealterrename)
-      * 5.2.8.168 [RQ.SRS-006.RBAC.SettingsProfile.Alter.Variables](#rqsrs-006rbacsettingsprofilealtervariables)
-      * 5.2.8.169 [RQ.SRS-006.RBAC.SettingsProfile.Alter.Variables.Value](#rqsrs-006rbacsettingsprofilealtervariablesvalue)
-      * 5.2.8.170 [RQ.SRS-006.RBAC.SettingsProfile.Alter.Variables.Constraints](#rqsrs-006rbacsettingsprofilealtervariablesconstraints)
-      * 5.2.8.171 [RQ.SRS-006.RBAC.SettingsProfile.Alter.Assignment](#rqsrs-006rbacsettingsprofilealterassignment)
-      * 5.2.8.172 [RQ.SRS-006.RBAC.SettingsProfile.Alter.Assignment.None](#rqsrs-006rbacsettingsprofilealterassignmentnone)
-      * 5.2.8.173 [RQ.SRS-006.RBAC.SettingsProfile.Alter.Assignment.All](#rqsrs-006rbacsettingsprofilealterassignmentall)
-      * 5.2.8.174 [RQ.SRS-006.RBAC.SettingsProfile.Alter.Assignment.AllExcept](#rqsrs-006rbacsettingsprofilealterassignmentallexcept)
-      * 5.2.8.175 [RQ.SRS-006.RBAC.SettingsProfile.Alter.Assignment.Inherit](#rqsrs-006rbacsettingsprofilealterassignmentinherit)
-      * 5.2.8.176 [RQ.SRS-006.RBAC.SettingsProfile.Alter.Assignment.OnCluster](#rqsrs-006rbacsettingsprofilealterassignmentoncluster)
-      * 5.2.8.177 [RQ.SRS-006.RBAC.SettingsProfile.Alter.Syntax](#rqsrs-006rbacsettingsprofilealtersyntax)
-      * 5.2.8.178 [RQ.SRS-006.RBAC.SettingsProfile.Drop](#rqsrs-006rbacsettingsprofiledrop)
-      * 5.2.8.179 [RQ.SRS-006.RBAC.SettingsProfile.Drop.IfExists](#rqsrs-006rbacsettingsprofiledropifexists)
-      * 5.2.8.180 [RQ.SRS-006.RBAC.SettingsProfile.Drop.OnCluster](#rqsrs-006rbacsettingsprofiledroponcluster)
-      * 5.2.8.181 [RQ.SRS-006.RBAC.SettingsProfile.Drop.Syntax](#rqsrs-006rbacsettingsprofiledropsyntax)
-      * 5.2.8.182 [RQ.SRS-006.RBAC.SettingsProfile.ShowCreateSettingsProfile](#rqsrs-006rbacsettingsprofileshowcreatesettingsprofile)
-      * 5.2.8.183 [RQ.SRS-006.RBAC.Quota.Create](#rqsrs-006rbacquotacreate)
-      * 5.2.8.184 [RQ.SRS-006.RBAC.Quota.Create.IfNotExists](#rqsrs-006rbacquotacreateifnotexists)
-      * 5.2.8.185 [RQ.SRS-006.RBAC.Quota.Create.Replace](#rqsrs-006rbacquotacreatereplace)
-      * 5.2.8.186 [RQ.SRS-006.RBAC.Quota.Create.Cluster](#rqsrs-006rbacquotacreatecluster)
-      * 5.2.8.187 [RQ.SRS-006.RBAC.Quota.Create.Interval](#rqsrs-006rbacquotacreateinterval)
-      * 5.2.8.188 [RQ.SRS-006.RBAC.Quota.Create.Interval.Randomized](#rqsrs-006rbacquotacreateintervalrandomized)
-      * 5.2.8.189 [RQ.SRS-006.RBAC.Quota.Create.Queries](#rqsrs-006rbacquotacreatequeries)
-      * 5.2.8.190 [RQ.SRS-006.RBAC.Quota.Create.Errors](#rqsrs-006rbacquotacreateerrors)
-      * 5.2.8.191 [RQ.SRS-006.RBAC.Quota.Create.ResultRows](#rqsrs-006rbacquotacreateresultrows)
-      * 5.2.8.192 [RQ.SRS-006.RBAC.Quota.Create.ReadRows](#rqsrs-006rbacquotacreatereadrows)
-      * 5.2.8.193 [RQ.SRS-006.RBAC.Quota.Create.ResultBytes](#rqsrs-006rbacquotacreateresultbytes)
-      * 5.2.8.194 [RQ.SRS-006.RBAC.Quota.Create.ReadBytes](#rqsrs-006rbacquotacreatereadbytes)
-      * 5.2.8.195 [RQ.SRS-006.RBAC.Quota.Create.ExecutionTime](#rqsrs-006rbacquotacreateexecutiontime)
-      * 5.2.8.196 [RQ.SRS-006.RBAC.Quota.Create.NoLimits](#rqsrs-006rbacquotacreatenolimits)
-      * 5.2.8.197 [RQ.SRS-006.RBAC.Quota.Create.TrackingOnly](#rqsrs-006rbacquotacreatetrackingonly)
-      * 5.2.8.198 [RQ.SRS-006.RBAC.Quota.Create.KeyedBy](#rqsrs-006rbacquotacreatekeyedby)
-      * 5.2.8.199 [RQ.SRS-006.RBAC.Quota.Create.KeyedByOptions](#rqsrs-006rbacquotacreatekeyedbyoptions)
-      * 5.2.8.200 [RQ.SRS-006.RBAC.Quota.Create.Assignment](#rqsrs-006rbacquotacreateassignment)
-      * 5.2.8.201 [RQ.SRS-006.RBAC.Quota.Create.Assignment.None](#rqsrs-006rbacquotacreateassignmentnone)
-      * 5.2.8.202 [RQ.SRS-006.RBAC.Quota.Create.Assignment.All](#rqsrs-006rbacquotacreateassignmentall)
-      * 5.2.8.203 [RQ.SRS-006.RBAC.Quota.Create.Assignment.Except](#rqsrs-006rbacquotacreateassignmentexcept)
-      * 5.2.8.204 [RQ.SRS-006.RBAC.Quota.Create.Syntax](#rqsrs-006rbacquotacreatesyntax)
-      * 5.2.8.205 [RQ.SRS-006.RBAC.Quota.Alter](#rqsrs-006rbacquotaalter)
-      * 5.2.8.206 [RQ.SRS-006.RBAC.Quota.Alter.IfExists](#rqsrs-006rbacquotaalterifexists)
-      * 5.2.8.207 [RQ.SRS-006.RBAC.Quota.Alter.Rename](#rqsrs-006rbacquotaalterrename)
-      * 5.2.8.208 [RQ.SRS-006.RBAC.Quota.Alter.Cluster](#rqsrs-006rbacquotaaltercluster)
-      * 5.2.8.209 [RQ.SRS-006.RBAC.Quota.Alter.Interval](#rqsrs-006rbacquotaalterinterval)
-      * 5.2.8.210 [RQ.SRS-006.RBAC.Quota.Alter.Interval.Randomized](#rqsrs-006rbacquotaalterintervalrandomized)
-      * 5.2.8.211 [RQ.SRS-006.RBAC.Quota.Alter.Queries](#rqsrs-006rbacquotaalterqueries)
-      * 5.2.8.212 [RQ.SRS-006.RBAC.Quota.Alter.Errors](#rqsrs-006rbacquotaaltererrors)
-      * 5.2.8.213 [RQ.SRS-006.RBAC.Quota.Alter.ResultRows](#rqsrs-006rbacquotaalterresultrows)
-      * 5.2.8.214 [RQ.SRS-006.RBAC.Quota.Alter.ReadRows](#rqsrs-006rbacquotaalterreadrows)
-      * 5.2.8.215 [RQ.SRS-006.RBAC.Quota.ALter.ResultBytes](#rqsrs-006rbacquotaalterresultbytes)
-      * 5.2.8.216 [RQ.SRS-006.RBAC.Quota.Alter.ReadBytes](#rqsrs-006rbacquotaalterreadbytes)
-      * 5.2.8.217 [RQ.SRS-006.RBAC.Quota.Alter.ExecutionTime](#rqsrs-006rbacquotaalterexecutiontime)
-      * 5.2.8.218 [RQ.SRS-006.RBAC.Quota.Alter.NoLimits](#rqsrs-006rbacquotaalternolimits)
-      * 5.2.8.219 [RQ.SRS-006.RBAC.Quota.Alter.TrackingOnly](#rqsrs-006rbacquotaaltertrackingonly)
-      * 5.2.8.220 [RQ.SRS-006.RBAC.Quota.Alter.KeyedBy](#rqsrs-006rbacquotaalterkeyedby)
-      * 5.2.8.221 [RQ.SRS-006.RBAC.Quota.Alter.KeyedByOptions](#rqsrs-006rbacquotaalterkeyedbyoptions)
-      * 5.2.8.222 [RQ.SRS-006.RBAC.Quota.Alter.Assignment](#rqsrs-006rbacquotaalterassignment)
-      * 5.2.8.223 [RQ.SRS-006.RBAC.Quota.Alter.Assignment.None](#rqsrs-006rbacquotaalterassignmentnone)
-      * 5.2.8.224 [RQ.SRS-006.RBAC.Quota.Alter.Assignment.All](#rqsrs-006rbacquotaalterassignmentall)
-      * 5.2.8.225 [RQ.SRS-006.RBAC.Quota.Alter.Assignment.Except](#rqsrs-006rbacquotaalterassignmentexcept)
-      * 5.2.8.226 [RQ.SRS-006.RBAC.Quota.Alter.Syntax](#rqsrs-006rbacquotaaltersyntax)
-      * 5.2.8.227 [RQ.SRS-006.RBAC.Quota.Drop](#rqsrs-006rbacquotadrop)
-      * 5.2.8.228 [RQ.SRS-006.RBAC.Quota.Drop.IfExists](#rqsrs-006rbacquotadropifexists)
-      * 5.2.8.229 [RQ.SRS-006.RBAC.Quota.Drop.Cluster](#rqsrs-006rbacquotadropcluster)
-      * 5.2.8.230 [RQ.SRS-006.RBAC.Quota.Drop.Syntax](#rqsrs-006rbacquotadropsyntax)
-      * 5.2.8.231 [RQ.SRS-006.RBAC.Quota.ShowQuotas](#rqsrs-006rbacquotashowquotas)
-      * 5.2.8.232 [RQ.SRS-006.RBAC.Quota.ShowQuotas.IntoOutfile](#rqsrs-006rbacquotashowquotasintooutfile)
-      * 5.2.8.233 [RQ.SRS-006.RBAC.Quota.ShowQuotas.Format](#rqsrs-006rbacquotashowquotasformat)
-      * 5.2.8.234 [RQ.SRS-006.RBAC.Quota.ShowQuotas.Settings](#rqsrs-006rbacquotashowquotassettings)
-      * 5.2.8.235 [RQ.SRS-006.RBAC.Quota.ShowQuotas.Syntax](#rqsrs-006rbacquotashowquotassyntax)
-      * 5.2.8.236 [RQ.SRS-006.RBAC.Quota.ShowCreateQuota.Name](#rqsrs-006rbacquotashowcreatequotaname)
-      * 5.2.8.237 [RQ.SRS-006.RBAC.Quota.ShowCreateQuota.Current](#rqsrs-006rbacquotashowcreatequotacurrent)
-      * 5.2.8.238 [RQ.SRS-006.RBAC.Quota.ShowCreateQuota.Syntax](#rqsrs-006rbacquotashowcreatequotasyntax)
-      * 5.2.8.239 [RQ.SRS-006.RBAC.RowPolicy.Create](#rqsrs-006rbacrowpolicycreate)
-      * 5.2.8.240 [RQ.SRS-006.RBAC.RowPolicy.Create.IfNotExists](#rqsrs-006rbacrowpolicycreateifnotexists)
-      * 5.2.8.241 [RQ.SRS-006.RBAC.RowPolicy.Create.Replace](#rqsrs-006rbacrowpolicycreatereplace)
-      * 5.2.8.242 [RQ.SRS-006.RBAC.RowPolicy.Create.OnCluster](#rqsrs-006rbacrowpolicycreateoncluster)
-      * 5.2.8.243 [RQ.SRS-006.RBAC.RowPolicy.Create.On](#rqsrs-006rbacrowpolicycreateon)
-      * 5.2.8.244 [RQ.SRS-006.RBAC.RowPolicy.Create.Access](#rqsrs-006rbacrowpolicycreateaccess)
-      * 5.2.8.245 [RQ.SRS-006.RBAC.RowPolicy.Create.Access.Permissive](#rqsrs-006rbacrowpolicycreateaccesspermissive)
-      * 5.2.8.246 [RQ.SRS-006.RBAC.RowPolicy.Create.Access.Restrictive](#rqsrs-006rbacrowpolicycreateaccessrestrictive)
-      * 5.2.8.247 [RQ.SRS-006.RBAC.RowPolicy.Create.ForSelect](#rqsrs-006rbacrowpolicycreateforselect)
-      * 5.2.8.248 [RQ.SRS-006.RBAC.RowPolicy.Create.Condition](#rqsrs-006rbacrowpolicycreatecondition)
-      * 5.2.8.249 [RQ.SRS-006.RBAC.RowPolicy.Create.Assignment](#rqsrs-006rbacrowpolicycreateassignment)
-      * 5.2.8.250 [RQ.SRS-006.RBAC.RowPolicy.Create.Assignment.None](#rqsrs-006rbacrowpolicycreateassignmentnone)
-      * 5.2.8.251 [RQ.SRS-006.RBAC.RowPolicy.Create.Assignment.All](#rqsrs-006rbacrowpolicycreateassignmentall)
-      * 5.2.8.252 [RQ.SRS-006.RBAC.RowPolicy.Create.Assignment.AllExcept](#rqsrs-006rbacrowpolicycreateassignmentallexcept)
-      * 5.2.8.253 [RQ.SRS-006.RBAC.RowPolicy.Create.Syntax](#rqsrs-006rbacrowpolicycreatesyntax)
-      * 5.2.8.254 [RQ.SRS-006.RBAC.RowPolicy.Alter](#rqsrs-006rbacrowpolicyalter)
-      * 5.2.8.255 [RQ.SRS-006.RBAC.RowPolicy.Alter.IfExists](#rqsrs-006rbacrowpolicyalterifexists)
-      * 5.2.8.256 [RQ.SRS-006.RBAC.RowPolicy.Alter.ForSelect](#rqsrs-006rbacrowpolicyalterforselect)
-      * 5.2.8.257 [RQ.SRS-006.RBAC.RowPolicy.Alter.OnCluster](#rqsrs-006rbacrowpolicyalteroncluster)
-      * 5.2.8.258 [RQ.SRS-006.RBAC.RowPolicy.Alter.On](#rqsrs-006rbacrowpolicyalteron)
-      * 5.2.8.259 [RQ.SRS-006.RBAC.RowPolicy.Alter.Rename](#rqsrs-006rbacrowpolicyalterrename)
-      * 5.2.8.260 [RQ.SRS-006.RBAC.RowPolicy.Alter.Access](#rqsrs-006rbacrowpolicyalteraccess)
-      * 5.2.8.261 [RQ.SRS-006.RBAC.RowPolicy.Alter.Access.Permissive](#rqsrs-006rbacrowpolicyalteraccesspermissive)
-      * 5.2.8.262 [RQ.SRS-006.RBAC.RowPolicy.Alter.Access.Restrictive](#rqsrs-006rbacrowpolicyalteraccessrestrictive)
-      * 5.2.8.263 [RQ.SRS-006.RBAC.RowPolicy.Alter.Condition](#rqsrs-006rbacrowpolicyaltercondition)
-      * 5.2.8.264 [RQ.SRS-006.RBAC.RowPolicy.Alter.Condition.None](#rqsrs-006rbacrowpolicyalterconditionnone)
-      * 5.2.8.265 [RQ.SRS-006.RBAC.RowPolicy.Alter.Assignment](#rqsrs-006rbacrowpolicyalterassignment)
-      * 5.2.8.266 [RQ.SRS-006.RBAC.RowPolicy.Alter.Assignment.None](#rqsrs-006rbacrowpolicyalterassignmentnone)
-      * 5.2.8.267 [RQ.SRS-006.RBAC.RowPolicy.Alter.Assignment.All](#rqsrs-006rbacrowpolicyalterassignmentall)
-      * 5.2.8.268 [RQ.SRS-006.RBAC.RowPolicy.Alter.Assignment.AllExcept](#rqsrs-006rbacrowpolicyalterassignmentallexcept)
-      * 5.2.8.269 [RQ.SRS-006.RBAC.RowPolicy.Alter.Syntax](#rqsrs-006rbacrowpolicyaltersyntax)
-      * 5.2.8.270 [RQ.SRS-006.RBAC.RowPolicy.Drop](#rqsrs-006rbacrowpolicydrop)
-      * 5.2.8.271 [RQ.SRS-006.RBAC.RowPolicy.Drop.IfExists](#rqsrs-006rbacrowpolicydropifexists)
-      * 5.2.8.272 [RQ.SRS-006.RBAC.RowPolicy.Drop.On](#rqsrs-006rbacrowpolicydropon)
-      * 5.2.8.273 [RQ.SRS-006.RBAC.RowPolicy.Drop.OnCluster](#rqsrs-006rbacrowpolicydroponcluster)
-      * 5.2.8.274 [RQ.SRS-006.RBAC.RowPolicy.Drop.Syntax](#rqsrs-006rbacrowpolicydropsyntax)
-      * 5.2.8.275 [RQ.SRS-006.RBAC.RowPolicy.ShowCreateRowPolicy](#rqsrs-006rbacrowpolicyshowcreaterowpolicy)
-      * 5.2.8.276 [RQ.SRS-006.RBAC.RowPolicy.ShowCreateRowPolicy.On](#rqsrs-006rbacrowpolicyshowcreaterowpolicyon)
-      * 5.2.8.277 [RQ.SRS-006.RBAC.RowPolicy.ShowCreateRowPolicy.Syntax](#rqsrs-006rbacrowpolicyshowcreaterowpolicysyntax)
-      * 5.2.8.278 [RQ.SRS-006.RBAC.RowPolicy.ShowRowPolicies](#rqsrs-006rbacrowpolicyshowrowpolicies)
-      * 5.2.8.279 [RQ.SRS-006.RBAC.RowPolicy.ShowRowPolicies.On](#rqsrs-006rbacrowpolicyshowrowpolicieson)
-      * 5.2.8.280 [RQ.SRS-006.RBAC.RowPolicy.ShowRowPolicies.Syntax](#rqsrs-006rbacrowpolicyshowrowpoliciessyntax)
-    * 5.2.9 [Table Privileges](#table-privileges)
-      * 5.2.9.1 [RQ.SRS-006.RBAC.Table.PublicTables](#rqsrs-006rbactablepublictables)
-      * 5.2.9.2 [RQ.SRS-006.RBAC.Table.SensitiveTables](#rqsrs-006rbactablesensitivetables)
-    * 5.2.10 [Distributed Tables](#distributed-tables)
-      * 5.2.10.1 [RQ.SRS-006.RBAC.DistributedTable.Create](#rqsrs-006rbacdistributedtablecreate)
-      * 5.2.10.2 [RQ.SRS-006.RBAC.DistributedTable.Select](#rqsrs-006rbacdistributedtableselect)
-      * 5.2.10.3 [RQ.SRS-006.RBAC.DistributedTable.Insert](#rqsrs-006rbacdistributedtableinsert)
-      * 5.2.10.4 [RQ.SRS-006.RBAC.DistributedTable.SpecialTables](#rqsrs-006rbacdistributedtablespecialtables)
-      * 5.2.10.5 [RQ.SRS-006.RBAC.DistributedTable.LocalUser](#rqsrs-006rbacdistributedtablelocaluser)
-      * 5.2.10.6 [RQ.SRS-006.RBAC.DistributedTable.SameUserDifferentNodesDifferentPrivileges](#rqsrs-006rbacdistributedtablesameuserdifferentnodesdifferentprivileges)
-    * 5.2.11 [Views](#views)
-      * 5.2.11.1 [View](#view)
-        * 5.2.11.1.1 [RQ.SRS-006.RBAC.View](#rqsrs-006rbacview)
-        * 5.2.11.1.2 [RQ.SRS-006.RBAC.View.Create](#rqsrs-006rbacviewcreate)
-        * 5.2.11.1.3 [RQ.SRS-006.RBAC.View.Select](#rqsrs-006rbacviewselect)
-        * 5.2.11.1.4 [RQ.SRS-006.RBAC.View.Drop](#rqsrs-006rbacviewdrop)
-      * 5.2.11.2 [Materialized View](#materialized-view)
-        * 5.2.11.2.1 [RQ.SRS-006.RBAC.MaterializedView](#rqsrs-006rbacmaterializedview)
-        * 5.2.11.2.2 [RQ.SRS-006.RBAC.MaterializedView.Create](#rqsrs-006rbacmaterializedviewcreate)
-        * 5.2.11.2.3 [RQ.SRS-006.RBAC.MaterializedView.Select](#rqsrs-006rbacmaterializedviewselect)
-        * 5.2.11.2.4 [RQ.SRS-006.RBAC.MaterializedView.Select.TargetTable](#rqsrs-006rbacmaterializedviewselecttargettable)
-        * 5.2.11.2.5 [RQ.SRS-006.RBAC.MaterializedView.Select.SourceTable](#rqsrs-006rbacmaterializedviewselectsourcetable)
-        * 5.2.11.2.6 [RQ.SRS-006.RBAC.MaterializedView.Drop](#rqsrs-006rbacmaterializedviewdrop)
-        * 5.2.11.2.7 [RQ.SRS-006.RBAC.MaterializedView.ModifyQuery](#rqsrs-006rbacmaterializedviewmodifyquery)
-        * 5.2.11.2.8 [RQ.SRS-006.RBAC.MaterializedView.Insert](#rqsrs-006rbacmaterializedviewinsert)
-        * 5.2.11.2.9 [RQ.SRS-006.RBAC.MaterializedView.Insert.SourceTable](#rqsrs-006rbacmaterializedviewinsertsourcetable)
-        * 5.2.11.2.10 [RQ.SRS-006.RBAC.MaterializedView.Insert.TargetTable](#rqsrs-006rbacmaterializedviewinserttargettable)
-      * 5.2.11.3 [Live View](#live-view)
-        * 5.2.11.3.1 [RQ.SRS-006.RBAC.LiveView](#rqsrs-006rbacliveview)
-        * 5.2.11.3.2 [RQ.SRS-006.RBAC.LiveView.Create](#rqsrs-006rbacliveviewcreate)
-        * 5.2.11.3.3 [RQ.SRS-006.RBAC.LiveView.Select](#rqsrs-006rbacliveviewselect)
-        * 5.2.11.3.4 [RQ.SRS-006.RBAC.LiveView.Drop](#rqsrs-006rbacliveviewdrop)
-        * 5.2.11.3.5 [RQ.SRS-006.RBAC.LiveView.Refresh](#rqsrs-006rbacliveviewrefresh)
-    * 5.2.12 [Select](#select)
-      * 5.2.12.1 [RQ.SRS-006.RBAC.Select](#rqsrs-006rbacselect)
-      * 5.2.12.2 [RQ.SRS-006.RBAC.Select.Column](#rqsrs-006rbacselectcolumn)
-      * 5.2.12.3 [RQ.SRS-006.RBAC.Select.Cluster](#rqsrs-006rbacselectcluster)
-      * 5.2.12.4 [RQ.SRS-006.RBAC.Select.TableEngines](#rqsrs-006rbacselecttableengines)
-    * 5.2.13 [Insert](#insert)
-      * 5.2.13.1 [RQ.SRS-006.RBAC.Insert](#rqsrs-006rbacinsert)
-      * 5.2.13.2 [RQ.SRS-006.RBAC.Insert.Column](#rqsrs-006rbacinsertcolumn)
-      * 5.2.13.3 [RQ.SRS-006.RBAC.Insert.Cluster](#rqsrs-006rbacinsertcluster)
-      * 5.2.13.4 [RQ.SRS-006.RBAC.Insert.TableEngines](#rqsrs-006rbacinserttableengines)
-    * 5.2.14 [Alter](#alter)
-      * 5.2.14.1 [Alter Column](#alter-column)
-        * 5.2.14.1.1 [RQ.SRS-006.RBAC.Privileges.AlterColumn](#rqsrs-006rbacprivilegesaltercolumn)
-        * 5.2.14.1.2 [RQ.SRS-006.RBAC.Privileges.AlterColumn.Grant](#rqsrs-006rbacprivilegesaltercolumngrant)
-        * 5.2.14.1.3 [RQ.SRS-006.RBAC.Privileges.AlterColumn.Revoke](#rqsrs-006rbacprivilegesaltercolumnrevoke)
-        * 5.2.14.1.4 [RQ.SRS-006.RBAC.Privileges.AlterColumn.Column](#rqsrs-006rbacprivilegesaltercolumncolumn)
-        * 5.2.14.1.5 [RQ.SRS-006.RBAC.Privileges.AlterColumn.Cluster](#rqsrs-006rbacprivilegesaltercolumncluster)
-        * 5.2.14.1.6 [RQ.SRS-006.RBAC.Privileges.AlterColumn.TableEngines](#rqsrs-006rbacprivilegesaltercolumntableengines)
-      * 5.2.14.2 [Alter Index](#alter-index)
-        * 5.2.14.2.1 [RQ.SRS-006.RBAC.Privileges.AlterIndex](#rqsrs-006rbacprivilegesalterindex)
-        * 5.2.14.2.2 [RQ.SRS-006.RBAC.Privileges.AlterIndex.Grant](#rqsrs-006rbacprivilegesalterindexgrant)
-        * 5.2.14.2.3 [RQ.SRS-006.RBAC.Privileges.AlterIndex.Revoke](#rqsrs-006rbacprivilegesalterindexrevoke)
-        * 5.2.14.2.4 [RQ.SRS-006.RBAC.Privileges.AlterIndex.Cluster](#rqsrs-006rbacprivilegesalterindexcluster)
-        * 5.2.14.2.5 [RQ.SRS-006.RBAC.Privileges.AlterIndex.TableEngines](#rqsrs-006rbacprivilegesalterindextableengines)
-      * 5.2.14.3 [Alter Constraint](#alter-constraint)
-        * 5.2.14.3.1 [RQ.SRS-006.RBAC.Privileges.AlterConstraint](#rqsrs-006rbacprivilegesalterconstraint)
-        * 5.2.14.3.2 [RQ.SRS-006.RBAC.Privileges.AlterConstraint.Grant](#rqsrs-006rbacprivilegesalterconstraintgrant)
-        * 5.2.14.3.3 [RQ.SRS-006.RBAC.Privileges.AlterConstraint.Revoke](#rqsrs-006rbacprivilegesalterconstraintrevoke)
-        * 5.2.14.3.4 [RQ.SRS-006.RBAC.Privileges.AlterConstraint.Cluster](#rqsrs-006rbacprivilegesalterconstraintcluster)
-        * 5.2.14.3.5 [RQ.SRS-006.RBAC.Privileges.AlterConstraint.TableEngines](#rqsrs-006rbacprivilegesalterconstrainttableengines)
-      * 5.2.14.4 [Alter TTL](#alter-ttl)
-        * 5.2.14.4.1 [RQ.SRS-006.RBAC.Privileges.AlterTTL](#rqsrs-006rbacprivilegesalterttl)
-        * 5.2.14.4.2 [RQ.SRS-006.RBAC.Privileges.AlterTTL.Grant](#rqsrs-006rbacprivilegesalterttlgrant)
-        * 5.2.14.4.3 [RQ.SRS-006.RBAC.Privileges.AlterTTL.Revoke](#rqsrs-006rbacprivilegesalterttlrevoke)
-        * 5.2.14.4.4 [RQ.SRS-006.RBAC.Privileges.AlterTTL.Cluster](#rqsrs-006rbacprivilegesalterttlcluster)
-        * 5.2.14.4.5 [RQ.SRS-006.RBAC.Privileges.AlterTTL.TableEngines](#rqsrs-006rbacprivilegesalterttltableengines)
-      * 5.2.14.5 [Alter Settings](#alter-settings)
-        * 5.2.14.5.1 [RQ.SRS-006.RBAC.Privileges.AlterSettings](#rqsrs-006rbacprivilegesaltersettings)
-        * 5.2.14.5.2 [RQ.SRS-006.RBAC.Privileges.AlterSettings.Grant](#rqsrs-006rbacprivilegesaltersettingsgrant)
-        * 5.2.14.5.3 [RQ.SRS-006.RBAC.Privileges.AlterSettings.Revoke](#rqsrs-006rbacprivilegesaltersettingsrevoke)
-        * 5.2.14.5.4 [RQ.SRS-006.RBAC.Privileges.AlterSettings.Cluster](#rqsrs-006rbacprivilegesaltersettingscluster)
-        * 5.2.14.5.5 [RQ.SRS-006.RBAC.Privileges.AlterSettings.TableEngines](#rqsrs-006rbacprivilegesaltersettingstableengines)
-      * 5.2.14.6 [Alter Update](#alter-update)
-        * 5.2.14.6.1 [RQ.SRS-006.RBAC.Privileges.AlterUpdate](#rqsrs-006rbacprivilegesalterupdate)
-        * 5.2.14.6.2 [RQ.SRS-006.RBAC.Privileges.AlterUpdate.Grant](#rqsrs-006rbacprivilegesalterupdategrant)
-        * 5.2.14.6.3 [RQ.SRS-006.RBAC.Privileges.AlterUpdate.Revoke](#rqsrs-006rbacprivilegesalterupdaterevoke)
-        * 5.2.14.6.4 [RQ.SRS-006.RBAC.Privileges.AlterUpdate.TableEngines](#rqsrs-006rbacprivilegesalterupdatetableengines)
-      * 5.2.14.7 [Alter Delete](#alter-delete)
-        * 5.2.14.7.1 [RQ.SRS-006.RBAC.Privileges.AlterDelete](#rqsrs-006rbacprivilegesalterdelete)
-        * 5.2.14.7.2 [RQ.SRS-006.RBAC.Privileges.AlterDelete.Grant](#rqsrs-006rbacprivilegesalterdeletegrant)
-        * 5.2.14.7.3 [RQ.SRS-006.RBAC.Privileges.AlterDelete.Revoke](#rqsrs-006rbacprivilegesalterdeleterevoke)
-        * 5.2.14.7.4 [RQ.SRS-006.RBAC.Privileges.AlterDelete.TableEngines](#rqsrs-006rbacprivilegesalterdeletetableengines)
-      * 5.2.14.8 [Alter Freeze Partition](#alter-freeze-partition)
-        * 5.2.14.8.1 [RQ.SRS-006.RBAC.Privileges.AlterFreeze](#rqsrs-006rbacprivilegesalterfreeze)
-        * 5.2.14.8.2 [RQ.SRS-006.RBAC.Privileges.AlterFreeze.Grant](#rqsrs-006rbacprivilegesalterfreezegrant)
-        * 5.2.14.8.3 [RQ.SRS-006.RBAC.Privileges.AlterFreeze.Revoke](#rqsrs-006rbacprivilegesalterfreezerevoke)
-        * 5.2.14.8.4 [RQ.SRS-006.RBAC.Privileges.AlterFreeze.TableEngines](#rqsrs-006rbacprivilegesalterfreezetableengines)
-      * 5.2.14.9 [Alter Fetch Partition](#alter-fetch-partition)
-        * 5.2.14.9.1 [RQ.SRS-006.RBAC.Privileges.AlterFetch](#rqsrs-006rbacprivilegesalterfetch)
-        * 5.2.14.9.2 [RQ.SRS-006.RBAC.Privileges.AlterFetch.Grant](#rqsrs-006rbacprivilegesalterfetchgrant)
-        * 5.2.14.9.3 [RQ.SRS-006.RBAC.Privileges.AlterFetch.Revoke](#rqsrs-006rbacprivilegesalterfetchrevoke)
-        * 5.2.14.9.4 [RQ.SRS-006.RBAC.Privileges.AlterFetch.TableEngines](#rqsrs-006rbacprivilegesalterfetchtableengines)
-      * 5.2.14.10 [Alter Move Partition](#alter-move-partition)
-        * 5.2.14.10.1 [RQ.SRS-006.RBAC.Privileges.AlterMove](#rqsrs-006rbacprivilegesaltermove)
-        * 5.2.14.10.2 [RQ.SRS-006.RBAC.Privileges.AlterMove.Grant](#rqsrs-006rbacprivilegesaltermovegrant)
-        * 5.2.14.10.3 [RQ.SRS-006.RBAC.Privileges.AlterMove.Revoke](#rqsrs-006rbacprivilegesaltermoverevoke)
-        * 5.2.14.10.4 [RQ.SRS-006.RBAC.Privileges.AlterMove.TableEngines](#rqsrs-006rbacprivilegesaltermovetableengines)
-    * 5.2.15 [RQ.SRS-006.RBAC.Privileges.CreateTable](#rqsrs-006rbacprivilegescreatetable)
-    * 5.2.16 [RQ.SRS-006.RBAC.Privileges.CreateDatabase](#rqsrs-006rbacprivilegescreatedatabase)
-    * 5.2.17 [RQ.SRS-006.RBAC.Privileges.CreateDictionary](#rqsrs-006rbacprivilegescreatedictionary)
-    * 5.2.18 [RQ.SRS-006.RBAC.Privileges.CreateTemporaryTable](#rqsrs-006rbacprivilegescreatetemporarytable)
-    * 5.2.19 [RQ.SRS-006.RBAC.Privileges.AttachDatabase](#rqsrs-006rbacprivilegesattachdatabase)
-    * 5.2.20 [RQ.SRS-006.RBAC.Privileges.AttachDictionary](#rqsrs-006rbacprivilegesattachdictionary)
-    * 5.2.21 [RQ.SRS-006.RBAC.Privileges.AttachTemporaryTable](#rqsrs-006rbacprivilegesattachtemporarytable)
-    * 5.2.22 [RQ.SRS-006.RBAC.Privileges.AttachTable](#rqsrs-006rbacprivilegesattachtable)
-    * 5.2.23 [RQ.SRS-006.RBAC.Privileges.DropTable](#rqsrs-006rbacprivilegesdroptable)
-    * 5.2.24 [RQ.SRS-006.RBAC.Privileges.DropDatabase](#rqsrs-006rbacprivilegesdropdatabase)
-    * 5.2.25 [RQ.SRS-006.RBAC.Privileges.DropDictionary](#rqsrs-006rbacprivilegesdropdictionary)
-    * 5.2.26 [RQ.SRS-006.RBAC.Privileges.DetachTable](#rqsrs-006rbacprivilegesdetachtable)
-    * 5.2.27 [RQ.SRS-006.RBAC.Privileges.DetachView](#rqsrs-006rbacprivilegesdetachview)
-    * 5.2.28 [RQ.SRS-006.RBAC.Privileges.DetachDatabase](#rqsrs-006rbacprivilegesdetachdatabase)
-    * 5.2.29 [RQ.SRS-006.RBAC.Privileges.DetachDictionary](#rqsrs-006rbacprivilegesdetachdictionary)
-    * 5.2.30 [RQ.SRS-006.RBAC.Privileges.Truncate](#rqsrs-006rbacprivilegestruncate)
-    * 5.2.31 [RQ.SRS-006.RBAC.Privileges.Optimize](#rqsrs-006rbacprivilegesoptimize)
-    * 5.2.32 [RQ.SRS-006.RBAC.Privileges.KillQuery](#rqsrs-006rbacprivilegeskillquery)
-    * 5.2.33 [Kill Mutation](#kill-mutation)
-      * 5.2.33.1 [RQ.SRS-006.RBAC.Privileges.KillMutation](#rqsrs-006rbacprivilegeskillmutation)
-      * 5.2.33.2 [RQ.SRS-006.RBAC.Privileges.KillMutation.AlterUpdate](#rqsrs-006rbacprivilegeskillmutationalterupdate)
-      * 5.2.33.3 [RQ.SRS-006.RBAC.Privileges.KillMutation.AlterDelete](#rqsrs-006rbacprivilegeskillmutationalterdelete)
-      * 5.2.33.4 [RQ.SRS-006.RBAC.Privileges.KillMutation.AlterDropColumn](#rqsrs-006rbacprivilegeskillmutationalterdropcolumn)
-    * 5.2.34 [Show](#show)
-      * 5.2.34.1 [RQ.SRS-006.RBAC.ShowTables.Privilege](#rqsrs-006rbacshowtablesprivilege)
-      * 5.2.34.2 [RQ.SRS-006.RBAC.ShowTables.RequiredPrivilege](#rqsrs-006rbacshowtablesrequiredprivilege)
-      * 5.2.34.3 [RQ.SRS-006.RBAC.ExistsTable.RequiredPrivilege](#rqsrs-006rbacexiststablerequiredprivilege)
-      * 5.2.34.4 [RQ.SRS-006.RBAC.CheckTable.RequiredPrivilege](#rqsrs-006rbacchecktablerequiredprivilege)
-      * 5.2.34.5 [RQ.SRS-006.RBAC.ShowDatabases.Privilege](#rqsrs-006rbacshowdatabasesprivilege)
-      * 5.2.34.6 [RQ.SRS-006.RBAC.ShowDatabases.RequiredPrivilege](#rqsrs-006rbacshowdatabasesrequiredprivilege)
-      * 5.2.34.7 [RQ.SRS-006.RBAC.ShowCreateDatabase.RequiredPrivilege](#rqsrs-006rbacshowcreatedatabaserequiredprivilege)
-      * 5.2.34.8 [RQ.SRS-006.RBAC.UseDatabase.RequiredPrivilege](#rqsrs-006rbacusedatabaserequiredprivilege)
-      * 5.2.34.9 [RQ.SRS-006.RBAC.ShowColumns.Privilege](#rqsrs-006rbacshowcolumnsprivilege)
-      * 5.2.34.10 [RQ.SRS-006.RBAC.ShowCreateTable.RequiredPrivilege](#rqsrs-006rbacshowcreatetablerequiredprivilege)
-      * 5.2.34.11 [RQ.SRS-006.RBAC.DescribeTable.RequiredPrivilege](#rqsrs-006rbacdescribetablerequiredprivilege)
-      * 5.2.34.12 [RQ.SRS-006.RBAC.ShowDictionaries.Privilege](#rqsrs-006rbacshowdictionariesprivilege)
-      * 5.2.34.13 [RQ.SRS-006.RBAC.ShowDictionaries.RequiredPrivilege](#rqsrs-006rbacshowdictionariesrequiredprivilege)
-      * 5.2.34.14 [RQ.SRS-006.RBAC.ShowCreateDictionary.RequiredPrivilege](#rqsrs-006rbacshowcreatedictionaryrequiredprivilege)
-      * 5.2.34.15 [RQ.SRS-006.RBAC.ExistsDictionary.RequiredPrivilege](#rqsrs-006rbacexistsdictionaryrequiredprivilege)
-    * 5.2.35 [Access Management](#access-management)
-      * 5.2.35.1 [RQ.SRS-006.RBAC.Privileges.CreateUser](#rqsrs-006rbacprivilegescreateuser)
-      * 5.2.35.2 [RQ.SRS-006.RBAC.Privileges.CreateUser.DefaultRole](#rqsrs-006rbacprivilegescreateuserdefaultrole)
-      * 5.2.35.3 [RQ.SRS-006.RBAC.Privileges.AlterUser](#rqsrs-006rbacprivilegesalteruser)
-      * 5.2.35.4 [RQ.SRS-006.RBAC.Privileges.DropUser](#rqsrs-006rbacprivilegesdropuser)
-      * 5.2.35.5 [RQ.SRS-006.RBAC.Privileges.CreateRole](#rqsrs-006rbacprivilegescreaterole)
-      * 5.2.35.6 [RQ.SRS-006.RBAC.Privileges.AlterRole](#rqsrs-006rbacprivilegesalterrole)
-      * 5.2.35.7 [RQ.SRS-006.RBAC.Privileges.DropRole](#rqsrs-006rbacprivilegesdroprole)
-      * 5.2.35.8 [RQ.SRS-006.RBAC.Privileges.CreateRowPolicy](#rqsrs-006rbacprivilegescreaterowpolicy)
-      * 5.2.35.9 [RQ.SRS-006.RBAC.Privileges.AlterRowPolicy](#rqsrs-006rbacprivilegesalterrowpolicy)
-      * 5.2.35.10 [RQ.SRS-006.RBAC.Privileges.DropRowPolicy](#rqsrs-006rbacprivilegesdroprowpolicy)
-      * 5.2.35.11 [RQ.SRS-006.RBAC.Privileges.CreateQuota](#rqsrs-006rbacprivilegescreatequota)
-      * 5.2.35.12 [RQ.SRS-006.RBAC.Privileges.AlterQuota](#rqsrs-006rbacprivilegesalterquota)
-      * 5.2.35.13 [RQ.SRS-006.RBAC.Privileges.DropQuota](#rqsrs-006rbacprivilegesdropquota)
-      * 5.2.35.14 [RQ.SRS-006.RBAC.Privileges.CreateSettingsProfile](#rqsrs-006rbacprivilegescreatesettingsprofile)
-      * 5.2.35.15 [RQ.SRS-006.RBAC.Privileges.AlterSettingsProfile](#rqsrs-006rbacprivilegesaltersettingsprofile)
-      * 5.2.35.16 [RQ.SRS-006.RBAC.Privileges.DropSettingsProfile](#rqsrs-006rbacprivilegesdropsettingsprofile)
-      * 5.2.35.17 [RQ.SRS-006.RBAC.Privileges.RoleAdmin](#rqsrs-006rbacprivilegesroleadmin)
-      * 5.2.35.18 [Show Access](#show-access)
-        * 5.2.35.18.1 [RQ.SRS-006.RBAC.ShowUsers.Privilege](#rqsrs-006rbacshowusersprivilege)
-        * 5.2.35.18.2 [RQ.SRS-006.RBAC.ShowUsers.RequiredPrivilege](#rqsrs-006rbacshowusersrequiredprivilege)
-        * 5.2.35.18.3 [RQ.SRS-006.RBAC.ShowCreateUser.RequiredPrivilege](#rqsrs-006rbacshowcreateuserrequiredprivilege)
-        * 5.2.35.18.4 [RQ.SRS-006.RBAC.ShowRoles.Privilege](#rqsrs-006rbacshowrolesprivilege)
-        * 5.2.35.18.5 [RQ.SRS-006.RBAC.ShowRoles.RequiredPrivilege](#rqsrs-006rbacshowrolesrequiredprivilege)
-        * 5.2.35.18.6 [RQ.SRS-006.RBAC.ShowCreateRole.RequiredPrivilege](#rqsrs-006rbacshowcreaterolerequiredprivilege)
-        * 5.2.35.18.7 [RQ.SRS-006.RBAC.ShowRowPolicies.Privilege](#rqsrs-006rbacshowrowpoliciesprivilege)
-        * 5.2.35.18.8 [RQ.SRS-006.RBAC.ShowRowPolicies.RequiredPrivilege](#rqsrs-006rbacshowrowpoliciesrequiredprivilege)
-        * 5.2.35.18.9 [RQ.SRS-006.RBAC.ShowCreateRowPolicy.RequiredPrivilege](#rqsrs-006rbacshowcreaterowpolicyrequiredprivilege)
-        * 5.2.35.18.10 [RQ.SRS-006.RBAC.ShowQuotas.Privilege](#rqsrs-006rbacshowquotasprivilege)
-        * 5.2.35.18.11 [RQ.SRS-006.RBAC.ShowQuotas.RequiredPrivilege](#rqsrs-006rbacshowquotasrequiredprivilege)
-        * 5.2.35.18.12 [RQ.SRS-006.RBAC.ShowCreateQuota.RequiredPrivilege](#rqsrs-006rbacshowcreatequotarequiredprivilege)
-        * 5.2.35.18.13 [RQ.SRS-006.RBAC.ShowSettingsProfiles.Privilege](#rqsrs-006rbacshowsettingsprofilesprivilege)
-        * 5.2.35.18.14 [RQ.SRS-006.RBAC.ShowSettingsProfiles.RequiredPrivilege](#rqsrs-006rbacshowsettingsprofilesrequiredprivilege)
-        * 5.2.35.18.15 [RQ.SRS-006.RBAC.ShowCreateSettingsProfile.RequiredPrivilege](#rqsrs-006rbacshowcreatesettingsprofilerequiredprivilege)
-    * 5.2.36 [dictGet](#dictget)
-      * 5.2.36.1 [RQ.SRS-006.RBAC.dictGet.Privilege](#rqsrs-006rbacdictgetprivilege)
-      * 5.2.36.2 [RQ.SRS-006.RBAC.dictGet.RequiredPrivilege](#rqsrs-006rbacdictgetrequiredprivilege)
-      * 5.2.36.3 [RQ.SRS-006.RBAC.dictGet.Type.RequiredPrivilege](#rqsrs-006rbacdictgettyperequiredprivilege)
-      * 5.2.36.4 [RQ.SRS-006.RBAC.dictGet.OrDefault.RequiredPrivilege](#rqsrs-006rbacdictgetordefaultrequiredprivilege)
-      * 5.2.36.5 [RQ.SRS-006.RBAC.dictHas.RequiredPrivilege](#rqsrs-006rbacdicthasrequiredprivilege)
-      * 5.2.36.6 [RQ.SRS-006.RBAC.dictGetHierarchy.RequiredPrivilege](#rqsrs-006rbacdictgethierarchyrequiredprivilege)
-      * 5.2.36.7 [RQ.SRS-006.RBAC.dictIsIn.RequiredPrivilege](#rqsrs-006rbacdictisinrequiredprivilege)
-    * 5.2.37 [Introspection](#introspection)
-      * 5.2.37.1 [RQ.SRS-006.RBAC.Privileges.Introspection](#rqsrs-006rbacprivilegesintrospection)
-      * 5.2.37.2 [RQ.SRS-006.RBAC.Privileges.Introspection.addressToLine](#rqsrs-006rbacprivilegesintrospectionaddresstoline)
-      * 5.2.37.3 [RQ.SRS-006.RBAC.Privileges.Introspection.addressToSymbol](#rqsrs-006rbacprivilegesintrospectionaddresstosymbol)
-      * 5.2.37.4 [RQ.SRS-006.RBAC.Privileges.Introspection.demangle](#rqsrs-006rbacprivilegesintrospectiondemangle)
-    * 5.2.38 [System](#system)
-      * 5.2.38.1 [RQ.SRS-006.RBAC.Privileges.System.Shutdown](#rqsrs-006rbacprivilegessystemshutdown)
-      * 5.2.38.2 [RQ.SRS-006.RBAC.Privileges.System.DropCache](#rqsrs-006rbacprivilegessystemdropcache)
-      * 5.2.38.3 [RQ.SRS-006.RBAC.Privileges.System.DropCache.DNS](#rqsrs-006rbacprivilegessystemdropcachedns)
-      * 5.2.38.4 [RQ.SRS-006.RBAC.Privileges.System.DropCache.Mark](#rqsrs-006rbacprivilegessystemdropcachemark)
-      * 5.2.38.5 [RQ.SRS-006.RBAC.Privileges.System.DropCache.Uncompressed](#rqsrs-006rbacprivilegessystemdropcacheuncompressed)
-      * 5.2.38.6 [RQ.SRS-006.RBAC.Privileges.System.Reload](#rqsrs-006rbacprivilegessystemreload)
-      * 5.2.38.7 [RQ.SRS-006.RBAC.Privileges.System.Reload.Config](#rqsrs-006rbacprivilegessystemreloadconfig)
-      * 5.2.38.8 [RQ.SRS-006.RBAC.Privileges.System.Reload.Dictionary](#rqsrs-006rbacprivilegessystemreloaddictionary)
-      * 5.2.38.9 [RQ.SRS-006.RBAC.Privileges.System.Reload.Dictionaries](#rqsrs-006rbacprivilegessystemreloaddictionaries)
-      * 5.2.38.10 [RQ.SRS-006.RBAC.Privileges.System.Reload.EmbeddedDictionaries](#rqsrs-006rbacprivilegessystemreloadembeddeddictionaries)
-      * 5.2.38.11 [RQ.SRS-006.RBAC.Privileges.System.Merges](#rqsrs-006rbacprivilegessystemmerges)
-      * 5.2.38.12 [RQ.SRS-006.RBAC.Privileges.System.TTLMerges](#rqsrs-006rbacprivilegessystemttlmerges)
-      * 5.2.38.13 [RQ.SRS-006.RBAC.Privileges.System.Fetches](#rqsrs-006rbacprivilegessystemfetches)
-      * 5.2.38.14 [RQ.SRS-006.RBAC.Privileges.System.Moves](#rqsrs-006rbacprivilegessystemmoves)
-      * 5.2.38.15 [RQ.SRS-006.RBAC.Privileges.System.Sends](#rqsrs-006rbacprivilegessystemsends)
-      * 5.2.38.16 [RQ.SRS-006.RBAC.Privileges.System.Sends.Distributed](#rqsrs-006rbacprivilegessystemsendsdistributed)
-      * 5.2.38.17 [RQ.SRS-006.RBAC.Privileges.System.Sends.Replicated](#rqsrs-006rbacprivilegessystemsendsreplicated)
-      * 5.2.38.18 [RQ.SRS-006.RBAC.Privileges.System.ReplicationQueues](#rqsrs-006rbacprivilegessystemreplicationqueues)
-      * 5.2.38.19 [RQ.SRS-006.RBAC.Privileges.System.SyncReplica](#rqsrs-006rbacprivilegessystemsyncreplica)
-      * 5.2.38.20 [RQ.SRS-006.RBAC.Privileges.System.RestartReplica](#rqsrs-006rbacprivilegessystemrestartreplica)
-      * 5.2.38.21 [RQ.SRS-006.RBAC.Privileges.System.Flush](#rqsrs-006rbacprivilegessystemflush)
-      * 5.2.38.22 [RQ.SRS-006.RBAC.Privileges.System.Flush.Distributed](#rqsrs-006rbacprivilegessystemflushdistributed)
-      * 5.2.38.23 [RQ.SRS-006.RBAC.Privileges.System.Flush.Logs](#rqsrs-006rbacprivilegessystemflushlogs)
-    * 5.2.39 [Sources](#sources)
-      * 5.2.39.1 [RQ.SRS-006.RBAC.Privileges.Sources](#rqsrs-006rbacprivilegessources)
-      * 5.2.39.2 [RQ.SRS-006.RBAC.Privileges.Sources.File](#rqsrs-006rbacprivilegessourcesfile)
-      * 5.2.39.3 [RQ.SRS-006.RBAC.Privileges.Sources.URL](#rqsrs-006rbacprivilegessourcesurl)
-      * 5.2.39.4 [RQ.SRS-006.RBAC.Privileges.Sources.Remote](#rqsrs-006rbacprivilegessourcesremote)
-      * 5.2.39.5 [RQ.SRS-006.RBAC.Privileges.Sources.MySQL](#rqsrs-006rbacprivilegessourcesmysql)
-      * 5.2.39.6 [RQ.SRS-006.RBAC.Privileges.Sources.ODBC](#rqsrs-006rbacprivilegessourcesodbc)
-      * 5.2.39.7 [RQ.SRS-006.RBAC.Privileges.Sources.JDBC](#rqsrs-006rbacprivilegessourcesjdbc)
-      * 5.2.39.8 [RQ.SRS-006.RBAC.Privileges.Sources.HDFS](#rqsrs-006rbacprivilegessourceshdfs)
-      * 5.2.39.9 [RQ.SRS-006.RBAC.Privileges.Sources.S3](#rqsrs-006rbacprivilegessourcess3)
-    * 5.2.40 [RQ.SRS-006.RBAC.Privileges.GrantOption](#rqsrs-006rbacprivilegesgrantoption)
-    * 5.2.41 [RQ.SRS-006.RBAC.Privileges.All](#rqsrs-006rbacprivilegesall)
-    * 5.2.42 [RQ.SRS-006.RBAC.Privileges.AdminOption](#rqsrs-006rbacprivilegesadminoption)
+  * 5.2 [Login](#login)
+    * 5.2.1 [RQ.SRS-006.RBAC.Login](#rqsrs-006rbaclogin)
+    * 5.2.2 [RQ.SRS-006.RBAC.Login.DefaultUser](#rqsrs-006rbaclogindefaultuser)
+  * 5.3 [User](#user)
+    * 5.3.1 [RQ.SRS-006.RBAC.User](#rqsrs-006rbacuser)
+    * 5.3.2 [RQ.SRS-006.RBAC.User.Roles](#rqsrs-006rbacuserroles)
+    * 5.3.3 [RQ.SRS-006.RBAC.User.Privileges](#rqsrs-006rbacuserprivileges)
+    * 5.3.4 [RQ.SRS-006.RBAC.User.Variables](#rqsrs-006rbacuservariables)
+    * 5.3.5 [RQ.SRS-006.RBAC.User.Variables.Constraints](#rqsrs-006rbacuservariablesconstraints)
+    * 5.3.6 [RQ.SRS-006.RBAC.User.SettingsProfile](#rqsrs-006rbacusersettingsprofile)
+    * 5.3.7 [RQ.SRS-006.RBAC.User.Quotas](#rqsrs-006rbacuserquotas)
+    * 5.3.8 [RQ.SRS-006.RBAC.User.RowPolicies](#rqsrs-006rbacuserrowpolicies)
+    * 5.3.9 [RQ.SRS-006.RBAC.User.DefaultRole](#rqsrs-006rbacuserdefaultrole)
+    * 5.3.10 [RQ.SRS-006.RBAC.User.RoleSelection](#rqsrs-006rbacuserroleselection)
+    * 5.3.11 [RQ.SRS-006.RBAC.User.ShowCreate](#rqsrs-006rbacusershowcreate)
+    * 5.3.12 [RQ.SRS-006.RBAC.User.ShowPrivileges](#rqsrs-006rbacusershowprivileges)
+    * 5.3.13 [RQ.SRS-006.RBAC.User.Use.DefaultRole](#rqsrs-006rbacuserusedefaultrole)
+    * 5.3.14 [RQ.SRS-006.RBAC.User.Use.AllRolesWhenNoDefaultRole](#rqsrs-006rbacuseruseallroleswhennodefaultrole)
+    * 5.3.15 [Create User](#create-user)
+      * 5.3.15.1 [RQ.SRS-006.RBAC.User.Create](#rqsrs-006rbacusercreate)
+      * 5.3.15.2 [RQ.SRS-006.RBAC.User.Create.IfNotExists](#rqsrs-006rbacusercreateifnotexists)
+      * 5.3.15.3 [RQ.SRS-006.RBAC.User.Create.Replace](#rqsrs-006rbacusercreatereplace)
+      * 5.3.15.4 [RQ.SRS-006.RBAC.User.Create.Password.NoPassword](#rqsrs-006rbacusercreatepasswordnopassword)
+      * 5.3.15.5 [RQ.SRS-006.RBAC.User.Create.Password.NoPassword.Login](#rqsrs-006rbacusercreatepasswordnopasswordlogin)
+      * 5.3.15.6 [RQ.SRS-006.RBAC.User.Create.Password.PlainText](#rqsrs-006rbacusercreatepasswordplaintext)
+      * 5.3.15.7 [RQ.SRS-006.RBAC.User.Create.Password.PlainText.Login](#rqsrs-006rbacusercreatepasswordplaintextlogin)
+      * 5.3.15.8 [RQ.SRS-006.RBAC.User.Create.Password.Sha256Password](#rqsrs-006rbacusercreatepasswordsha256password)
+      * 5.3.15.9 [RQ.SRS-006.RBAC.User.Create.Password.Sha256Password.Login](#rqsrs-006rbacusercreatepasswordsha256passwordlogin)
+      * 5.3.15.10 [RQ.SRS-006.RBAC.User.Create.Password.Sha256Hash](#rqsrs-006rbacusercreatepasswordsha256hash)
+      * 5.3.15.11 [RQ.SRS-006.RBAC.User.Create.Password.Sha256Hash.Login](#rqsrs-006rbacusercreatepasswordsha256hashlogin)
+      * 5.3.15.12 [RQ.SRS-006.RBAC.User.Create.Password.DoubleSha1Password](#rqsrs-006rbacusercreatepassworddoublesha1password)
+      * 5.3.15.13 [RQ.SRS-006.RBAC.User.Create.Password.DoubleSha1Password.Login](#rqsrs-006rbacusercreatepassworddoublesha1passwordlogin)
+      * 5.3.15.14 [RQ.SRS-006.RBAC.User.Create.Password.DoubleSha1Hash](#rqsrs-006rbacusercreatepassworddoublesha1hash)
+      * 5.3.15.15 [RQ.SRS-006.RBAC.User.Create.Password.DoubleSha1Hash.Login](#rqsrs-006rbacusercreatepassworddoublesha1hashlogin)
+      * 5.3.15.16 [RQ.SRS-006.RBAC.User.Create.Host.Name](#rqsrs-006rbacusercreatehostname)
+      * 5.3.15.17 [RQ.SRS-006.RBAC.User.Create.Host.Regexp](#rqsrs-006rbacusercreatehostregexp)
+      * 5.3.15.18 [RQ.SRS-006.RBAC.User.Create.Host.IP](#rqsrs-006rbacusercreatehostip)
+      * 5.3.15.19 [RQ.SRS-006.RBAC.User.Create.Host.Any](#rqsrs-006rbacusercreatehostany)
+      * 5.3.15.20 [RQ.SRS-006.RBAC.User.Create.Host.None](#rqsrs-006rbacusercreatehostnone)
+      * 5.3.15.21 [RQ.SRS-006.RBAC.User.Create.Host.Local](#rqsrs-006rbacusercreatehostlocal)
+      * 5.3.15.22 [RQ.SRS-006.RBAC.User.Create.Host.Like](#rqsrs-006rbacusercreatehostlike)
+      * 5.3.15.23 [RQ.SRS-006.RBAC.User.Create.Host.Default](#rqsrs-006rbacusercreatehostdefault)
+      * 5.3.15.24 [RQ.SRS-006.RBAC.User.Create.DefaultRole](#rqsrs-006rbacusercreatedefaultrole)
+      * 5.3.15.25 [RQ.SRS-006.RBAC.User.Create.DefaultRole.None](#rqsrs-006rbacusercreatedefaultrolenone)
+      * 5.3.15.26 [RQ.SRS-006.RBAC.User.Create.DefaultRole.All](#rqsrs-006rbacusercreatedefaultroleall)
+      * 5.3.15.27 [RQ.SRS-006.RBAC.User.Create.Settings](#rqsrs-006rbacusercreatesettings)
+      * 5.3.15.28 [RQ.SRS-006.RBAC.User.Create.OnCluster](#rqsrs-006rbacusercreateoncluster)
+      * 5.3.15.29 [RQ.SRS-006.RBAC.User.Create.Syntax](#rqsrs-006rbacusercreatesyntax)
+    * 5.3.16 [Alter User](#alter-user)
+      * 5.3.16.1 [RQ.SRS-006.RBAC.User.Alter](#rqsrs-006rbacuseralter)
+      * 5.3.16.2 [RQ.SRS-006.RBAC.User.Alter.OrderOfEvaluation](#rqsrs-006rbacuseralterorderofevaluation)
+      * 5.3.16.3 [RQ.SRS-006.RBAC.User.Alter.IfExists](#rqsrs-006rbacuseralterifexists)
+      * 5.3.16.4 [RQ.SRS-006.RBAC.User.Alter.Cluster](#rqsrs-006rbacuseraltercluster)
+      * 5.3.16.5 [RQ.SRS-006.RBAC.User.Alter.Rename](#rqsrs-006rbacuseralterrename)
+      * 5.3.16.6 [RQ.SRS-006.RBAC.User.Alter.Password.PlainText](#rqsrs-006rbacuseralterpasswordplaintext)
+      * 5.3.16.7 [RQ.SRS-006.RBAC.User.Alter.Password.Sha256Password](#rqsrs-006rbacuseralterpasswordsha256password)
+      * 5.3.16.8 [RQ.SRS-006.RBAC.User.Alter.Password.DoubleSha1Password](#rqsrs-006rbacuseralterpassworddoublesha1password)
+      * 5.3.16.9 [RQ.SRS-006.RBAC.User.Alter.Host.AddDrop](#rqsrs-006rbacuseralterhostadddrop)
+      * 5.3.16.10 [RQ.SRS-006.RBAC.User.Alter.Host.Local](#rqsrs-006rbacuseralterhostlocal)
+      * 5.3.16.11 [RQ.SRS-006.RBAC.User.Alter.Host.Name](#rqsrs-006rbacuseralterhostname)
+      * 5.3.16.12 [RQ.SRS-006.RBAC.User.Alter.Host.Regexp](#rqsrs-006rbacuseralterhostregexp)
+      * 5.3.16.13 [RQ.SRS-006.RBAC.User.Alter.Host.IP](#rqsrs-006rbacuseralterhostip)
+      * 5.3.16.14 [RQ.SRS-006.RBAC.User.Alter.Host.Like](#rqsrs-006rbacuseralterhostlike)
+      * 5.3.16.15 [RQ.SRS-006.RBAC.User.Alter.Host.Any](#rqsrs-006rbacuseralterhostany)
+      * 5.3.16.16 [RQ.SRS-006.RBAC.User.Alter.Host.None](#rqsrs-006rbacuseralterhostnone)
+      * 5.3.16.17 [RQ.SRS-006.RBAC.User.Alter.DefaultRole](#rqsrs-006rbacuseralterdefaultrole)
+      * 5.3.16.18 [RQ.SRS-006.RBAC.User.Alter.DefaultRole.All](#rqsrs-006rbacuseralterdefaultroleall)
+      * 5.3.16.19 [RQ.SRS-006.RBAC.User.Alter.DefaultRole.AllExcept](#rqsrs-006rbacuseralterdefaultroleallexcept)
+      * 5.3.16.20 [RQ.SRS-006.RBAC.User.Alter.Settings](#rqsrs-006rbacuseraltersettings)
+      * 5.3.16.21 [RQ.SRS-006.RBAC.User.Alter.Settings.Min](#rqsrs-006rbacuseraltersettingsmin)
+      * 5.3.16.22 [RQ.SRS-006.RBAC.User.Alter.Settings.Max](#rqsrs-006rbacuseraltersettingsmax)
+      * 5.3.16.23 [RQ.SRS-006.RBAC.User.Alter.Settings.Profile](#rqsrs-006rbacuseraltersettingsprofile)
+      * 5.3.16.24 [RQ.SRS-006.RBAC.User.Alter.Syntax](#rqsrs-006rbacuseraltersyntax)
+    * 5.3.17 [Show Create User](#show-create-user)
+      * 5.3.17.1 [RQ.SRS-006.RBAC.User.ShowCreateUser](#rqsrs-006rbacusershowcreateuser)
+      * 5.3.17.2 [RQ.SRS-006.RBAC.User.ShowCreateUser.For](#rqsrs-006rbacusershowcreateuserfor)
+      * 5.3.17.3 [RQ.SRS-006.RBAC.User.ShowCreateUser.Syntax](#rqsrs-006rbacusershowcreateusersyntax)
+    * 5.3.18 [Drop User](#drop-user)
+      * 5.3.18.1 [RQ.SRS-006.RBAC.User.Drop](#rqsrs-006rbacuserdrop)
+      * 5.3.18.2 [RQ.SRS-006.RBAC.User.Drop.IfExists](#rqsrs-006rbacuserdropifexists)
+      * 5.3.18.3 [RQ.SRS-006.RBAC.User.Drop.OnCluster](#rqsrs-006rbacuserdroponcluster)
+      * 5.3.18.4 [RQ.SRS-006.RBAC.User.Drop.Syntax](#rqsrs-006rbacuserdropsyntax)
+  * 5.4 [Role](#role)
+    * 5.4.1 [RQ.SRS-006.RBAC.Role](#rqsrs-006rbacrole)
+    * 5.4.2 [RQ.SRS-006.RBAC.Role.Privileges](#rqsrs-006rbacroleprivileges)
+    * 5.4.3 [RQ.SRS-006.RBAC.Role.Variables](#rqsrs-006rbacrolevariables)
+    * 5.4.4 [RQ.SRS-006.RBAC.Role.SettingsProfile](#rqsrs-006rbacrolesettingsprofile)
+    * 5.4.5 [RQ.SRS-006.RBAC.Role.Quotas](#rqsrs-006rbacrolequotas)
+    * 5.4.6 [RQ.SRS-006.RBAC.Role.RowPolicies](#rqsrs-006rbacrolerowpolicies)
+    * 5.4.7 [Create Role](#create-role)
+      * 5.4.7.1 [RQ.SRS-006.RBAC.Role.Create](#rqsrs-006rbacrolecreate)
+      * 5.4.7.2 [RQ.SRS-006.RBAC.Role.Create.IfNotExists](#rqsrs-006rbacrolecreateifnotexists)
+      * 5.4.7.3 [RQ.SRS-006.RBAC.Role.Create.Replace](#rqsrs-006rbacrolecreatereplace)
+      * 5.4.7.4 [RQ.SRS-006.RBAC.Role.Create.Settings](#rqsrs-006rbacrolecreatesettings)
+      * 5.4.7.5 [RQ.SRS-006.RBAC.Role.Create.Syntax](#rqsrs-006rbacrolecreatesyntax)
+    * 5.4.8 [Alter Role](#alter-role)
+      * 5.4.8.1 [RQ.SRS-006.RBAC.Role.Alter](#rqsrs-006rbacrolealter)
+      * 5.4.8.2 [RQ.SRS-006.RBAC.Role.Alter.IfExists](#rqsrs-006rbacrolealterifexists)
+      * 5.4.8.3 [RQ.SRS-006.RBAC.Role.Alter.Cluster](#rqsrs-006rbacrolealtercluster)
+      * 5.4.8.4 [RQ.SRS-006.RBAC.Role.Alter.Rename](#rqsrs-006rbacrolealterrename)
+      * 5.4.8.5 [RQ.SRS-006.RBAC.Role.Alter.Settings](#rqsrs-006rbacrolealtersettings)
+      * 5.4.8.6 [RQ.SRS-006.RBAC.Role.Alter.Syntax](#rqsrs-006rbacrolealtersyntax)
+    * 5.4.9 [Drop Role](#drop-role)
+      * 5.4.9.1 [RQ.SRS-006.RBAC.Role.Drop](#rqsrs-006rbacroledrop)
+      * 5.4.9.2 [RQ.SRS-006.RBAC.Role.Drop.IfExists](#rqsrs-006rbacroledropifexists)
+      * 5.4.9.3 [RQ.SRS-006.RBAC.Role.Drop.Cluster](#rqsrs-006rbacroledropcluster)
+      * 5.4.9.4 [RQ.SRS-006.RBAC.Role.Drop.Syntax](#rqsrs-006rbacroledropsyntax)
+    * 5.4.10 [Show Create Role](#show-create-role)
+      * 5.4.10.1 [RQ.SRS-006.RBAC.Role.ShowCreate](#rqsrs-006rbacroleshowcreate)
+      * 5.4.10.2 [RQ.SRS-006.RBAC.Role.ShowCreate.Syntax](#rqsrs-006rbacroleshowcreatesyntax)
+  * 5.5 [Partial Revokes](#partial-revokes)
+    * 5.5.1 [RQ.SRS-006.RBAC.PartialRevokes](#rqsrs-006rbacpartialrevokes)
+    * 5.5.2 [RQ.SRS-006.RBAC.PartialRevoke.Syntax](#rqsrs-006rbacpartialrevokesyntax)
+  * 5.6 [Settings Profile](#settings-profile)
+    * 5.6.1 [RQ.SRS-006.RBAC.SettingsProfile](#rqsrs-006rbacsettingsprofile)
+    * 5.6.2 [RQ.SRS-006.RBAC.SettingsProfile.Constraints](#rqsrs-006rbacsettingsprofileconstraints)
+    * 5.6.3 [Create Settings Profile](#create-settings-profile)
+      * 5.6.3.1 [RQ.SRS-006.RBAC.SettingsProfile.Create](#rqsrs-006rbacsettingsprofilecreate)
+      * 5.6.3.2 [RQ.SRS-006.RBAC.SettingsProfile.Create.IfNotExists](#rqsrs-006rbacsettingsprofilecreateifnotexists)
+      * 5.6.3.3 [RQ.SRS-006.RBAC.SettingsProfile.Create.Replace](#rqsrs-006rbacsettingsprofilecreatereplace)
+      * 5.6.3.4 [RQ.SRS-006.RBAC.SettingsProfile.Create.Variables](#rqsrs-006rbacsettingsprofilecreatevariables)
+      * 5.6.3.5 [RQ.SRS-006.RBAC.SettingsProfile.Create.Variables.Value](#rqsrs-006rbacsettingsprofilecreatevariablesvalue)
+      * 5.6.3.6 [RQ.SRS-006.RBAC.SettingsProfile.Create.Variables.Constraints](#rqsrs-006rbacsettingsprofilecreatevariablesconstraints)
+      * 5.6.3.7 [RQ.SRS-006.RBAC.SettingsProfile.Create.Assignment](#rqsrs-006rbacsettingsprofilecreateassignment)
+      * 5.6.3.8 [RQ.SRS-006.RBAC.SettingsProfile.Create.Assignment.None](#rqsrs-006rbacsettingsprofilecreateassignmentnone)
+      * 5.6.3.9 [RQ.SRS-006.RBAC.SettingsProfile.Create.Assignment.All](#rqsrs-006rbacsettingsprofilecreateassignmentall)
+      * 5.6.3.10 [RQ.SRS-006.RBAC.SettingsProfile.Create.Assignment.AllExcept](#rqsrs-006rbacsettingsprofilecreateassignmentallexcept)
+      * 5.6.3.11 [RQ.SRS-006.RBAC.SettingsProfile.Create.Inherit](#rqsrs-006rbacsettingsprofilecreateinherit)
+      * 5.6.3.12 [RQ.SRS-006.RBAC.SettingsProfile.Create.OnCluster](#rqsrs-006rbacsettingsprofilecreateoncluster)
+      * 5.6.3.13 [RQ.SRS-006.RBAC.SettingsProfile.Create.Syntax](#rqsrs-006rbacsettingsprofilecreatesyntax)
+    * 5.6.4 [Alter Settings Profile](#alter-settings-profile)
+      * 5.6.4.1 [RQ.SRS-006.RBAC.SettingsProfile.Alter](#rqsrs-006rbacsettingsprofilealter)
+      * 5.6.4.2 [RQ.SRS-006.RBAC.SettingsProfile.Alter.IfExists](#rqsrs-006rbacsettingsprofilealterifexists)
+      * 5.6.4.3 [RQ.SRS-006.RBAC.SettingsProfile.Alter.Rename](#rqsrs-006rbacsettingsprofilealterrename)
+      * 5.6.4.4 [RQ.SRS-006.RBAC.SettingsProfile.Alter.Variables](#rqsrs-006rbacsettingsprofilealtervariables)
+      * 5.6.4.5 [RQ.SRS-006.RBAC.SettingsProfile.Alter.Variables.Value](#rqsrs-006rbacsettingsprofilealtervariablesvalue)
+      * 5.6.4.6 [RQ.SRS-006.RBAC.SettingsProfile.Alter.Variables.Constraints](#rqsrs-006rbacsettingsprofilealtervariablesconstraints)
+      * 5.6.4.7 [RQ.SRS-006.RBAC.SettingsProfile.Alter.Assignment](#rqsrs-006rbacsettingsprofilealterassignment)
+      * 5.6.4.8 [RQ.SRS-006.RBAC.SettingsProfile.Alter.Assignment.None](#rqsrs-006rbacsettingsprofilealterassignmentnone)
+      * 5.6.4.9 [RQ.SRS-006.RBAC.SettingsProfile.Alter.Assignment.All](#rqsrs-006rbacsettingsprofilealterassignmentall)
+      * 5.6.4.10 [RQ.SRS-006.RBAC.SettingsProfile.Alter.Assignment.AllExcept](#rqsrs-006rbacsettingsprofilealterassignmentallexcept)
+      * 5.6.4.11 [RQ.SRS-006.RBAC.SettingsProfile.Alter.Assignment.Inherit](#rqsrs-006rbacsettingsprofilealterassignmentinherit)
+      * 5.6.4.12 [RQ.SRS-006.RBAC.SettingsProfile.Alter.Assignment.OnCluster](#rqsrs-006rbacsettingsprofilealterassignmentoncluster)
+      * 5.6.4.13 [RQ.SRS-006.RBAC.SettingsProfile.Alter.Syntax](#rqsrs-006rbacsettingsprofilealtersyntax)
+    * 5.6.5 [Drop Settings Profile](#drop-settings-profile)
+      * 5.6.5.1 [RQ.SRS-006.RBAC.SettingsProfile.Drop](#rqsrs-006rbacsettingsprofiledrop)
+      * 5.6.5.2 [RQ.SRS-006.RBAC.SettingsProfile.Drop.IfExists](#rqsrs-006rbacsettingsprofiledropifexists)
+      * 5.6.5.3 [RQ.SRS-006.RBAC.SettingsProfile.Drop.OnCluster](#rqsrs-006rbacsettingsprofiledroponcluster)
+      * 5.6.5.4 [RQ.SRS-006.RBAC.SettingsProfile.Drop.Syntax](#rqsrs-006rbacsettingsprofiledropsyntax)
+    * 5.6.6 [Show Create Settings Profile](#show-create-settings-profile)
+      * 5.6.6.1 [RQ.SRS-006.RBAC.SettingsProfile.ShowCreateSettingsProfile](#rqsrs-006rbacsettingsprofileshowcreatesettingsprofile)
+  * 5.7 [Quotas](#quotas)
+    * 5.7.1 [RQ.SRS-006.RBAC.Quotas](#rqsrs-006rbacquotas)
+    * 5.7.2 [RQ.SRS-006.RBAC.Quotas.Keyed](#rqsrs-006rbacquotaskeyed)
+    * 5.7.3 [RQ.SRS-006.RBAC.Quotas.Queries](#rqsrs-006rbacquotasqueries)
+    * 5.7.4 [RQ.SRS-006.RBAC.Quotas.Errors](#rqsrs-006rbacquotaserrors)
+    * 5.7.5 [RQ.SRS-006.RBAC.Quotas.ResultRows](#rqsrs-006rbacquotasresultrows)
+    * 5.7.6 [RQ.SRS-006.RBAC.Quotas.ReadRows](#rqsrs-006rbacquotasreadrows)
+    * 5.7.7 [RQ.SRS-006.RBAC.Quotas.ResultBytes](#rqsrs-006rbacquotasresultbytes)
+    * 5.7.8 [RQ.SRS-006.RBAC.Quotas.ReadBytes](#rqsrs-006rbacquotasreadbytes)
+    * 5.7.9 [RQ.SRS-006.RBAC.Quotas.ExecutionTime](#rqsrs-006rbacquotasexecutiontime)
+    * 5.7.10 [Create Quotas](#create-quotas)
+      * 5.7.10.1 [RQ.SRS-006.RBAC.Quota.Create](#rqsrs-006rbacquotacreate)
+      * 5.7.10.2 [RQ.SRS-006.RBAC.Quota.Create.IfNotExists](#rqsrs-006rbacquotacreateifnotexists)
+      * 5.7.10.3 [RQ.SRS-006.RBAC.Quota.Create.Replace](#rqsrs-006rbacquotacreatereplace)
+      * 5.7.10.4 [RQ.SRS-006.RBAC.Quota.Create.Cluster](#rqsrs-006rbacquotacreatecluster)
+      * 5.7.10.5 [RQ.SRS-006.RBAC.Quota.Create.Interval](#rqsrs-006rbacquotacreateinterval)
+      * 5.7.10.6 [RQ.SRS-006.RBAC.Quota.Create.Interval.Randomized](#rqsrs-006rbacquotacreateintervalrandomized)
+      * 5.7.10.7 [RQ.SRS-006.RBAC.Quota.Create.Queries](#rqsrs-006rbacquotacreatequeries)
+      * 5.7.10.8 [RQ.SRS-006.RBAC.Quota.Create.Errors](#rqsrs-006rbacquotacreateerrors)
+      * 5.7.10.9 [RQ.SRS-006.RBAC.Quota.Create.ResultRows](#rqsrs-006rbacquotacreateresultrows)
+      * 5.7.10.10 [RQ.SRS-006.RBAC.Quota.Create.ReadRows](#rqsrs-006rbacquotacreatereadrows)
+      * 5.7.10.11 [RQ.SRS-006.RBAC.Quota.Create.ResultBytes](#rqsrs-006rbacquotacreateresultbytes)
+      * 5.7.10.12 [RQ.SRS-006.RBAC.Quota.Create.ReadBytes](#rqsrs-006rbacquotacreatereadbytes)
+      * 5.7.10.13 [RQ.SRS-006.RBAC.Quota.Create.ExecutionTime](#rqsrs-006rbacquotacreateexecutiontime)
+      * 5.7.10.14 [RQ.SRS-006.RBAC.Quota.Create.NoLimits](#rqsrs-006rbacquotacreatenolimits)
+      * 5.7.10.15 [RQ.SRS-006.RBAC.Quota.Create.TrackingOnly](#rqsrs-006rbacquotacreatetrackingonly)
+      * 5.7.10.16 [RQ.SRS-006.RBAC.Quota.Create.KeyedBy](#rqsrs-006rbacquotacreatekeyedby)
+      * 5.7.10.17 [RQ.SRS-006.RBAC.Quota.Create.KeyedByOptions](#rqsrs-006rbacquotacreatekeyedbyoptions)
+      * 5.7.10.18 [RQ.SRS-006.RBAC.Quota.Create.Assignment](#rqsrs-006rbacquotacreateassignment)
+      * 5.7.10.19 [RQ.SRS-006.RBAC.Quota.Create.Assignment.None](#rqsrs-006rbacquotacreateassignmentnone)
+      * 5.7.10.20 [RQ.SRS-006.RBAC.Quota.Create.Assignment.All](#rqsrs-006rbacquotacreateassignmentall)
+      * 5.7.10.21 [RQ.SRS-006.RBAC.Quota.Create.Assignment.Except](#rqsrs-006rbacquotacreateassignmentexcept)
+      * 5.7.10.22 [RQ.SRS-006.RBAC.Quota.Create.Syntax](#rqsrs-006rbacquotacreatesyntax)
+    * 5.7.11 [Alter Quota](#alter-quota)
+      * 5.7.11.1 [RQ.SRS-006.RBAC.Quota.Alter](#rqsrs-006rbacquotaalter)
+      * 5.7.11.2 [RQ.SRS-006.RBAC.Quota.Alter.IfExists](#rqsrs-006rbacquotaalterifexists)
+      * 5.7.11.3 [RQ.SRS-006.RBAC.Quota.Alter.Rename](#rqsrs-006rbacquotaalterrename)
+      * 5.7.11.4 [RQ.SRS-006.RBAC.Quota.Alter.Cluster](#rqsrs-006rbacquotaaltercluster)
+      * 5.7.11.5 [RQ.SRS-006.RBAC.Quota.Alter.Interval](#rqsrs-006rbacquotaalterinterval)
+      * 5.7.11.6 [RQ.SRS-006.RBAC.Quota.Alter.Interval.Randomized](#rqsrs-006rbacquotaalterintervalrandomized)
+      * 5.7.11.7 [RQ.SRS-006.RBAC.Quota.Alter.Queries](#rqsrs-006rbacquotaalterqueries)
+      * 5.7.11.8 [RQ.SRS-006.RBAC.Quota.Alter.Errors](#rqsrs-006rbacquotaaltererrors)
+      * 5.7.11.9 [RQ.SRS-006.RBAC.Quota.Alter.ResultRows](#rqsrs-006rbacquotaalterresultrows)
+      * 5.7.11.10 [RQ.SRS-006.RBAC.Quota.Alter.ReadRows](#rqsrs-006rbacquotaalterreadrows)
+      * 5.7.11.11 [RQ.SRS-006.RBAC.Quota.ALter.ResultBytes](#rqsrs-006rbacquotaalterresultbytes)
+      * 5.7.11.12 [RQ.SRS-006.RBAC.Quota.Alter.ReadBytes](#rqsrs-006rbacquotaalterreadbytes)
+      * 5.7.11.13 [RQ.SRS-006.RBAC.Quota.Alter.ExecutionTime](#rqsrs-006rbacquotaalterexecutiontime)
+      * 5.7.11.14 [RQ.SRS-006.RBAC.Quota.Alter.NoLimits](#rqsrs-006rbacquotaalternolimits)
+      * 5.7.11.15 [RQ.SRS-006.RBAC.Quota.Alter.TrackingOnly](#rqsrs-006rbacquotaaltertrackingonly)
+      * 5.7.11.16 [RQ.SRS-006.RBAC.Quota.Alter.KeyedBy](#rqsrs-006rbacquotaalterkeyedby)
+      * 5.7.11.17 [RQ.SRS-006.RBAC.Quota.Alter.KeyedByOptions](#rqsrs-006rbacquotaalterkeyedbyoptions)
+      * 5.7.11.18 [RQ.SRS-006.RBAC.Quota.Alter.Assignment](#rqsrs-006rbacquotaalterassignment)
+      * 5.7.11.19 [RQ.SRS-006.RBAC.Quota.Alter.Assignment.None](#rqsrs-006rbacquotaalterassignmentnone)
+      * 5.7.11.20 [RQ.SRS-006.RBAC.Quota.Alter.Assignment.All](#rqsrs-006rbacquotaalterassignmentall)
+      * 5.7.11.21 [RQ.SRS-006.RBAC.Quota.Alter.Assignment.Except](#rqsrs-006rbacquotaalterassignmentexcept)
+      * 5.7.11.22 [RQ.SRS-006.RBAC.Quota.Alter.Syntax](#rqsrs-006rbacquotaaltersyntax)
+    * 5.7.12 [Drop Quota](#drop-quota)
+      * 5.7.12.1 [RQ.SRS-006.RBAC.Quota.Drop](#rqsrs-006rbacquotadrop)
+      * 5.7.12.2 [RQ.SRS-006.RBAC.Quota.Drop.IfExists](#rqsrs-006rbacquotadropifexists)
+      * 5.7.12.3 [RQ.SRS-006.RBAC.Quota.Drop.Cluster](#rqsrs-006rbacquotadropcluster)
+      * 5.7.12.4 [RQ.SRS-006.RBAC.Quota.Drop.Syntax](#rqsrs-006rbacquotadropsyntax)
+    * 5.7.13 [Show Quotas](#show-quotas)
+      * 5.7.13.1 [RQ.SRS-006.RBAC.Quota.ShowQuotas](#rqsrs-006rbacquotashowquotas)
+      * 5.7.13.2 [RQ.SRS-006.RBAC.Quota.ShowQuotas.IntoOutfile](#rqsrs-006rbacquotashowquotasintooutfile)
+      * 5.7.13.3 [RQ.SRS-006.RBAC.Quota.ShowQuotas.Format](#rqsrs-006rbacquotashowquotasformat)
+      * 5.7.13.4 [RQ.SRS-006.RBAC.Quota.ShowQuotas.Settings](#rqsrs-006rbacquotashowquotassettings)
+      * 5.7.13.5 [RQ.SRS-006.RBAC.Quota.ShowQuotas.Syntax](#rqsrs-006rbacquotashowquotassyntax)
+    * 5.7.14 [Show Create Quota](#show-create-quota)
+      * 5.7.14.1 [RQ.SRS-006.RBAC.Quota.ShowCreateQuota.Name](#rqsrs-006rbacquotashowcreatequotaname)
+      * 5.7.14.2 [RQ.SRS-006.RBAC.Quota.ShowCreateQuota.Current](#rqsrs-006rbacquotashowcreatequotacurrent)
+      * 5.7.14.3 [RQ.SRS-006.RBAC.Quota.ShowCreateQuota.Syntax](#rqsrs-006rbacquotashowcreatequotasyntax)
+  * 5.8 [Row Policy](#row-policy)
+    * 5.8.1 [RQ.SRS-006.RBAC.RowPolicy](#rqsrs-006rbacrowpolicy)
+    * 5.8.2 [RQ.SRS-006.RBAC.RowPolicy.Condition](#rqsrs-006rbacrowpolicycondition)
+    * 5.8.3 [RQ.SRS-006.RBAC.RowPolicy.Restriction](#rqsrs-006rbacrowpolicyrestriction)
+    * 5.8.4 [RQ.SRS-006.RBAC.RowPolicy.Nesting](#rqsrs-006rbacrowpolicynesting)
+    * 5.8.5 [Create Row Policy](#create-row-policy)
+      * 5.8.5.1 [RQ.SRS-006.RBAC.RowPolicy.Create](#rqsrs-006rbacrowpolicycreate)
+      * 5.8.5.2 [RQ.SRS-006.RBAC.RowPolicy.Create.IfNotExists](#rqsrs-006rbacrowpolicycreateifnotexists)
+      * 5.8.5.3 [RQ.SRS-006.RBAC.RowPolicy.Create.Replace](#rqsrs-006rbacrowpolicycreatereplace)
+      * 5.8.5.4 [RQ.SRS-006.RBAC.RowPolicy.Create.OnCluster](#rqsrs-006rbacrowpolicycreateoncluster)
+      * 5.8.5.5 [RQ.SRS-006.RBAC.RowPolicy.Create.On](#rqsrs-006rbacrowpolicycreateon)
+      * 5.8.5.6 [RQ.SRS-006.RBAC.RowPolicy.Create.Access](#rqsrs-006rbacrowpolicycreateaccess)
+      * 5.8.5.7 [RQ.SRS-006.RBAC.RowPolicy.Create.Access.Permissive](#rqsrs-006rbacrowpolicycreateaccesspermissive)
+      * 5.8.5.8 [RQ.SRS-006.RBAC.RowPolicy.Create.Access.Restrictive](#rqsrs-006rbacrowpolicycreateaccessrestrictive)
+      * 5.8.5.9 [RQ.SRS-006.RBAC.RowPolicy.Create.ForSelect](#rqsrs-006rbacrowpolicycreateforselect)
+      * 5.8.5.10 [RQ.SRS-006.RBAC.RowPolicy.Create.Condition](#rqsrs-006rbacrowpolicycreatecondition)
+      * 5.8.5.11 [RQ.SRS-006.RBAC.RowPolicy.Create.Assignment](#rqsrs-006rbacrowpolicycreateassignment)
+      * 5.8.5.12 [RQ.SRS-006.RBAC.RowPolicy.Create.Assignment.None](#rqsrs-006rbacrowpolicycreateassignmentnone)
+      * 5.8.5.13 [RQ.SRS-006.RBAC.RowPolicy.Create.Assignment.All](#rqsrs-006rbacrowpolicycreateassignmentall)
+      * 5.8.5.14 [RQ.SRS-006.RBAC.RowPolicy.Create.Assignment.AllExcept](#rqsrs-006rbacrowpolicycreateassignmentallexcept)
+      * 5.8.5.15 [RQ.SRS-006.RBAC.RowPolicy.Create.Syntax](#rqsrs-006rbacrowpolicycreatesyntax)
+    * 5.8.6 [Alter Row Policy](#alter-row-policy)
+      * 5.8.6.1 [RQ.SRS-006.RBAC.RowPolicy.Alter](#rqsrs-006rbacrowpolicyalter)
+      * 5.8.6.2 [RQ.SRS-006.RBAC.RowPolicy.Alter.IfExists](#rqsrs-006rbacrowpolicyalterifexists)
+      * 5.8.6.3 [RQ.SRS-006.RBAC.RowPolicy.Alter.ForSelect](#rqsrs-006rbacrowpolicyalterforselect)
+      * 5.8.6.4 [RQ.SRS-006.RBAC.RowPolicy.Alter.OnCluster](#rqsrs-006rbacrowpolicyalteroncluster)
+      * 5.8.6.5 [RQ.SRS-006.RBAC.RowPolicy.Alter.On](#rqsrs-006rbacrowpolicyalteron)
+      * 5.8.6.6 [RQ.SRS-006.RBAC.RowPolicy.Alter.Rename](#rqsrs-006rbacrowpolicyalterrename)
+      * 5.8.6.7 [RQ.SRS-006.RBAC.RowPolicy.Alter.Access](#rqsrs-006rbacrowpolicyalteraccess)
+      * 5.8.6.8 [RQ.SRS-006.RBAC.RowPolicy.Alter.Access.Permissive](#rqsrs-006rbacrowpolicyalteraccesspermissive)
+      * 5.8.6.9 [RQ.SRS-006.RBAC.RowPolicy.Alter.Access.Restrictive](#rqsrs-006rbacrowpolicyalteraccessrestrictive)
+      * 5.8.6.10 [RQ.SRS-006.RBAC.RowPolicy.Alter.Condition](#rqsrs-006rbacrowpolicyaltercondition)
+      * 5.8.6.11 [RQ.SRS-006.RBAC.RowPolicy.Alter.Condition.None](#rqsrs-006rbacrowpolicyalterconditionnone)
+      * 5.8.6.12 [RQ.SRS-006.RBAC.RowPolicy.Alter.Assignment](#rqsrs-006rbacrowpolicyalterassignment)
+      * 5.8.6.13 [RQ.SRS-006.RBAC.RowPolicy.Alter.Assignment.None](#rqsrs-006rbacrowpolicyalterassignmentnone)
+      * 5.8.6.14 [RQ.SRS-006.RBAC.RowPolicy.Alter.Assignment.All](#rqsrs-006rbacrowpolicyalterassignmentall)
+      * 5.8.6.15 [RQ.SRS-006.RBAC.RowPolicy.Alter.Assignment.AllExcept](#rqsrs-006rbacrowpolicyalterassignmentallexcept)
+      * 5.8.6.16 [RQ.SRS-006.RBAC.RowPolicy.Alter.Syntax](#rqsrs-006rbacrowpolicyaltersyntax)
+    * 5.8.7 [Drop Row Policy](#drop-row-policy)
+      * 5.8.7.1 [RQ.SRS-006.RBAC.RowPolicy.Drop](#rqsrs-006rbacrowpolicydrop)
+      * 5.8.7.2 [RQ.SRS-006.RBAC.RowPolicy.Drop.IfExists](#rqsrs-006rbacrowpolicydropifexists)
+      * 5.8.7.3 [RQ.SRS-006.RBAC.RowPolicy.Drop.On](#rqsrs-006rbacrowpolicydropon)
+      * 5.8.7.4 [RQ.SRS-006.RBAC.RowPolicy.Drop.OnCluster](#rqsrs-006rbacrowpolicydroponcluster)
+      * 5.8.7.5 [RQ.SRS-006.RBAC.RowPolicy.Drop.Syntax](#rqsrs-006rbacrowpolicydropsyntax)
+    * 5.8.8 [Show Create Row Policy](#show-create-row-policy)
+      * 5.8.8.1 [RQ.SRS-006.RBAC.RowPolicy.ShowCreateRowPolicy](#rqsrs-006rbacrowpolicyshowcreaterowpolicy)
+      * 5.8.8.2 [RQ.SRS-006.RBAC.RowPolicy.ShowCreateRowPolicy.On](#rqsrs-006rbacrowpolicyshowcreaterowpolicyon)
+      * 5.8.8.3 [RQ.SRS-006.RBAC.RowPolicy.ShowCreateRowPolicy.Syntax](#rqsrs-006rbacrowpolicyshowcreaterowpolicysyntax)
+      * 5.8.8.4 [RQ.SRS-006.RBAC.RowPolicy.ShowRowPolicies](#rqsrs-006rbacrowpolicyshowrowpolicies)
+      * 5.8.8.5 [RQ.SRS-006.RBAC.RowPolicy.ShowRowPolicies.On](#rqsrs-006rbacrowpolicyshowrowpolicieson)
+      * 5.8.8.6 [RQ.SRS-006.RBAC.RowPolicy.ShowRowPolicies.Syntax](#rqsrs-006rbacrowpolicyshowrowpoliciessyntax)
+  * 5.9 [Set Default Role](#set-default-role)
+    * 5.9.1 [RQ.SRS-006.RBAC.SetDefaultRole](#rqsrs-006rbacsetdefaultrole)
+    * 5.9.2 [RQ.SRS-006.RBAC.SetDefaultRole.CurrentUser](#rqsrs-006rbacsetdefaultrolecurrentuser)
+    * 5.9.3 [RQ.SRS-006.RBAC.SetDefaultRole.All](#rqsrs-006rbacsetdefaultroleall)
+    * 5.9.4 [RQ.SRS-006.RBAC.SetDefaultRole.AllExcept](#rqsrs-006rbacsetdefaultroleallexcept)
+    * 5.9.5 [RQ.SRS-006.RBAC.SetDefaultRole.None](#rqsrs-006rbacsetdefaultrolenone)
+    * 5.9.6 [RQ.SRS-006.RBAC.SetDefaultRole.Syntax](#rqsrs-006rbacsetdefaultrolesyntax)
+  * 5.10 [Set Role](#set-role)
+    * 5.10.1 [RQ.SRS-006.RBAC.SetRole](#rqsrs-006rbacsetrole)
+    * 5.10.2 [RQ.SRS-006.RBAC.SetRole.Default](#rqsrs-006rbacsetroledefault)
+    * 5.10.3 [RQ.SRS-006.RBAC.SetRole.None](#rqsrs-006rbacsetrolenone)
+    * 5.10.4 [RQ.SRS-006.RBAC.SetRole.All](#rqsrs-006rbacsetroleall)
+    * 5.10.5 [RQ.SRS-006.RBAC.SetRole.AllExcept](#rqsrs-006rbacsetroleallexcept)
+    * 5.10.6 [RQ.SRS-006.RBAC.SetRole.Syntax](#rqsrs-006rbacsetrolesyntax)
+  * 5.11 [Grant](#grant)
+    * 5.11.1 [RQ.SRS-006.RBAC.Grant.Privilege.To](#rqsrs-006rbacgrantprivilegeto)
+    * 5.11.2 [RQ.SRS-006.RBAC.Grant.Privilege.ToCurrentUser](#rqsrs-006rbacgrantprivilegetocurrentuser)
+    * 5.11.3 [RQ.SRS-006.RBAC.Grant.Privilege.Select](#rqsrs-006rbacgrantprivilegeselect)
+    * 5.11.4 [RQ.SRS-006.RBAC.Grant.Privilege.Insert](#rqsrs-006rbacgrantprivilegeinsert)
+    * 5.11.5 [RQ.SRS-006.RBAC.Grant.Privilege.Alter](#rqsrs-006rbacgrantprivilegealter)
+    * 5.11.6 [RQ.SRS-006.RBAC.Grant.Privilege.Create](#rqsrs-006rbacgrantprivilegecreate)
+    * 5.11.7 [RQ.SRS-006.RBAC.Grant.Privilege.Drop](#rqsrs-006rbacgrantprivilegedrop)
+    * 5.11.8 [RQ.SRS-006.RBAC.Grant.Privilege.Truncate](#rqsrs-006rbacgrantprivilegetruncate)
+    * 5.11.9 [RQ.SRS-006.RBAC.Grant.Privilege.Optimize](#rqsrs-006rbacgrantprivilegeoptimize)
+    * 5.11.10 [RQ.SRS-006.RBAC.Grant.Privilege.Show](#rqsrs-006rbacgrantprivilegeshow)
+    * 5.11.11 [RQ.SRS-006.RBAC.Grant.Privilege.KillQuery](#rqsrs-006rbacgrantprivilegekillquery)
+    * 5.11.12 [RQ.SRS-006.RBAC.Grant.Privilege.AccessManagement](#rqsrs-006rbacgrantprivilegeaccessmanagement)
+    * 5.11.13 [RQ.SRS-006.RBAC.Grant.Privilege.System](#rqsrs-006rbacgrantprivilegesystem)
+    * 5.11.14 [RQ.SRS-006.RBAC.Grant.Privilege.Introspection](#rqsrs-006rbacgrantprivilegeintrospection)
+    * 5.11.15 [RQ.SRS-006.RBAC.Grant.Privilege.Sources](#rqsrs-006rbacgrantprivilegesources)
+    * 5.11.16 [RQ.SRS-006.RBAC.Grant.Privilege.DictGet](#rqsrs-006rbacgrantprivilegedictget)
+    * 5.11.17 [RQ.SRS-006.RBAC.Grant.Privilege.None](#rqsrs-006rbacgrantprivilegenone)
+    * 5.11.18 [RQ.SRS-006.RBAC.Grant.Privilege.All](#rqsrs-006rbacgrantprivilegeall)
+    * 5.11.19 [RQ.SRS-006.RBAC.Grant.Privilege.GrantOption](#rqsrs-006rbacgrantprivilegegrantoption)
+    * 5.11.20 [RQ.SRS-006.RBAC.Grant.Privilege.On](#rqsrs-006rbacgrantprivilegeon)
+    * 5.11.21 [RQ.SRS-006.RBAC.Grant.Privilege.PrivilegeColumns](#rqsrs-006rbacgrantprivilegeprivilegecolumns)
+    * 5.11.22 [RQ.SRS-006.RBAC.Grant.Privilege.OnCluster](#rqsrs-006rbacgrantprivilegeoncluster)
+    * 5.11.23 [RQ.SRS-006.RBAC.Grant.Privilege.Syntax](#rqsrs-006rbacgrantprivilegesyntax)
+  * 5.12 [Revoke](#revoke)
+    * 5.12.1 [RQ.SRS-006.RBAC.Revoke.Privilege.Cluster](#rqsrs-006rbacrevokeprivilegecluster)
+    * 5.12.2 [RQ.SRS-006.RBAC.Revoke.Privilege.Select](#rqsrs-006rbacrevokeprivilegeselect)
+    * 5.12.3 [RQ.SRS-006.RBAC.Revoke.Privilege.Insert](#rqsrs-006rbacrevokeprivilegeinsert)
+    * 5.12.4 [RQ.SRS-006.RBAC.Revoke.Privilege.Alter](#rqsrs-006rbacrevokeprivilegealter)
+    * 5.12.5 [RQ.SRS-006.RBAC.Revoke.Privilege.Create](#rqsrs-006rbacrevokeprivilegecreate)
+    * 5.12.6 [RQ.SRS-006.RBAC.Revoke.Privilege.Drop](#rqsrs-006rbacrevokeprivilegedrop)
+    * 5.12.7 [RQ.SRS-006.RBAC.Revoke.Privilege.Truncate](#rqsrs-006rbacrevokeprivilegetruncate)
+    * 5.12.8 [RQ.SRS-006.RBAC.Revoke.Privilege.Optimize](#rqsrs-006rbacrevokeprivilegeoptimize)
+    * 5.12.9 [RQ.SRS-006.RBAC.Revoke.Privilege.Show](#rqsrs-006rbacrevokeprivilegeshow)
+    * 5.12.10 [RQ.SRS-006.RBAC.Revoke.Privilege.KillQuery](#rqsrs-006rbacrevokeprivilegekillquery)
+    * 5.12.11 [RQ.SRS-006.RBAC.Revoke.Privilege.AccessManagement](#rqsrs-006rbacrevokeprivilegeaccessmanagement)
+    * 5.12.12 [RQ.SRS-006.RBAC.Revoke.Privilege.System](#rqsrs-006rbacrevokeprivilegesystem)
+    * 5.12.13 [RQ.SRS-006.RBAC.Revoke.Privilege.Introspection](#rqsrs-006rbacrevokeprivilegeintrospection)
+    * 5.12.14 [RQ.SRS-006.RBAC.Revoke.Privilege.Sources](#rqsrs-006rbacrevokeprivilegesources)
+    * 5.12.15 [RQ.SRS-006.RBAC.Revoke.Privilege.DictGet](#rqsrs-006rbacrevokeprivilegedictget)
+    * 5.12.16 [RQ.SRS-006.RBAC.Revoke.Privilege.PrivilegeColumns](#rqsrs-006rbacrevokeprivilegeprivilegecolumns)
+    * 5.12.17 [RQ.SRS-006.RBAC.Revoke.Privilege.Multiple](#rqsrs-006rbacrevokeprivilegemultiple)
+    * 5.12.18 [RQ.SRS-006.RBAC.Revoke.Privilege.All](#rqsrs-006rbacrevokeprivilegeall)
+    * 5.12.19 [RQ.SRS-006.RBAC.Revoke.Privilege.None](#rqsrs-006rbacrevokeprivilegenone)
+    * 5.12.20 [RQ.SRS-006.RBAC.Revoke.Privilege.On](#rqsrs-006rbacrevokeprivilegeon)
+    * 5.12.21 [RQ.SRS-006.RBAC.Revoke.Privilege.From](#rqsrs-006rbacrevokeprivilegefrom)
+    * 5.12.22 [RQ.SRS-006.RBAC.Revoke.Privilege.Syntax](#rqsrs-006rbacrevokeprivilegesyntax)
+  * 5.13 [Grant Role](#grant-role)
+    * 5.13.1 [RQ.SRS-006.RBAC.Grant.Role](#rqsrs-006rbacgrantrole)
+    * 5.13.2 [RQ.SRS-006.RBAC.Grant.Role.CurrentUser](#rqsrs-006rbacgrantrolecurrentuser)
+    * 5.13.3 [RQ.SRS-006.RBAC.Grant.Role.AdminOption](#rqsrs-006rbacgrantroleadminoption)
+    * 5.13.4 [RQ.SRS-006.RBAC.Grant.Role.OnCluster](#rqsrs-006rbacgrantroleoncluster)
+    * 5.13.5 [RQ.SRS-006.RBAC.Grant.Role.Syntax](#rqsrs-006rbacgrantrolesyntax)
+  * 5.14 [Revoke Role](#revoke-role)
+    * 5.14.1 [RQ.SRS-006.RBAC.Revoke.Role](#rqsrs-006rbacrevokerole)
+    * 5.14.2 [RQ.SRS-006.RBAC.Revoke.Role.Keywords](#rqsrs-006rbacrevokerolekeywords)
+    * 5.14.3 [RQ.SRS-006.RBAC.Revoke.Role.Cluster](#rqsrs-006rbacrevokerolecluster)
+    * 5.14.4 [RQ.SRS-006.RBAC.Revoke.AdminOption](#rqsrs-006rbacrevokeadminoption)
+    * 5.14.5 [RQ.SRS-006.RBAC.Revoke.Role.Syntax](#rqsrs-006rbacrevokerolesyntax)
+  * 5.15 [Show Grants](#show-grants)
+    * 5.15.1 [RQ.SRS-006.RBAC.Show.Grants](#rqsrs-006rbacshowgrants)
+    * 5.15.2 [RQ.SRS-006.RBAC.Show.Grants.For](#rqsrs-006rbacshowgrantsfor)
+    * 5.15.3 [RQ.SRS-006.RBAC.Show.Grants.Syntax](#rqsrs-006rbacshowgrantssyntax)
+  * 5.16 [Table Privileges](#table-privileges)
+    * 5.16.1 [RQ.SRS-006.RBAC.Table.PublicTables](#rqsrs-006rbactablepublictables)
+    * 5.16.2 [RQ.SRS-006.RBAC.Table.SensitiveTables](#rqsrs-006rbactablesensitivetables)
+  * 5.17 [Distributed Tables](#distributed-tables)
+    * 5.17.1 [RQ.SRS-006.RBAC.DistributedTable.Create](#rqsrs-006rbacdistributedtablecreate)
+    * 5.17.2 [RQ.SRS-006.RBAC.DistributedTable.Select](#rqsrs-006rbacdistributedtableselect)
+    * 5.17.3 [RQ.SRS-006.RBAC.DistributedTable.Insert](#rqsrs-006rbacdistributedtableinsert)
+    * 5.17.4 [RQ.SRS-006.RBAC.DistributedTable.SpecialTables](#rqsrs-006rbacdistributedtablespecialtables)
+    * 5.17.5 [RQ.SRS-006.RBAC.DistributedTable.LocalUser](#rqsrs-006rbacdistributedtablelocaluser)
+    * 5.17.6 [RQ.SRS-006.RBAC.DistributedTable.SameUserDifferentNodesDifferentPrivileges](#rqsrs-006rbacdistributedtablesameuserdifferentnodesdifferentprivileges)
+  * 5.18 [Views](#views)
+    * 5.18.1 [View](#view)
+      * 5.18.1.1 [RQ.SRS-006.RBAC.View](#rqsrs-006rbacview)
+      * 5.18.1.2 [RQ.SRS-006.RBAC.View.Create](#rqsrs-006rbacviewcreate)
+      * 5.18.1.3 [RQ.SRS-006.RBAC.View.Select](#rqsrs-006rbacviewselect)
+      * 5.18.1.4 [RQ.SRS-006.RBAC.View.Drop](#rqsrs-006rbacviewdrop)
+    * 5.18.2 [Materialized View](#materialized-view)
+      * 5.18.2.1 [RQ.SRS-006.RBAC.MaterializedView](#rqsrs-006rbacmaterializedview)
+      * 5.18.2.2 [RQ.SRS-006.RBAC.MaterializedView.Create](#rqsrs-006rbacmaterializedviewcreate)
+      * 5.18.2.3 [RQ.SRS-006.RBAC.MaterializedView.Select](#rqsrs-006rbacmaterializedviewselect)
+      * 5.18.2.4 [RQ.SRS-006.RBAC.MaterializedView.Select.TargetTable](#rqsrs-006rbacmaterializedviewselecttargettable)
+      * 5.18.2.5 [RQ.SRS-006.RBAC.MaterializedView.Select.SourceTable](#rqsrs-006rbacmaterializedviewselectsourcetable)
+      * 5.18.2.6 [RQ.SRS-006.RBAC.MaterializedView.Drop](#rqsrs-006rbacmaterializedviewdrop)
+      * 5.18.2.7 [RQ.SRS-006.RBAC.MaterializedView.ModifyQuery](#rqsrs-006rbacmaterializedviewmodifyquery)
+      * 5.18.2.8 [RQ.SRS-006.RBAC.MaterializedView.Insert](#rqsrs-006rbacmaterializedviewinsert)
+      * 5.18.2.9 [RQ.SRS-006.RBAC.MaterializedView.Insert.SourceTable](#rqsrs-006rbacmaterializedviewinsertsourcetable)
+      * 5.18.2.10 [RQ.SRS-006.RBAC.MaterializedView.Insert.TargetTable](#rqsrs-006rbacmaterializedviewinserttargettable)
+    * 5.18.3 [Live View](#live-view)
+      * 5.18.3.1 [RQ.SRS-006.RBAC.LiveView](#rqsrs-006rbacliveview)
+      * 5.18.3.2 [RQ.SRS-006.RBAC.LiveView.Create](#rqsrs-006rbacliveviewcreate)
+      * 5.18.3.3 [RQ.SRS-006.RBAC.LiveView.Select](#rqsrs-006rbacliveviewselect)
+      * 5.18.3.4 [RQ.SRS-006.RBAC.LiveView.Drop](#rqsrs-006rbacliveviewdrop)
+      * 5.18.3.5 [RQ.SRS-006.RBAC.LiveView.Refresh](#rqsrs-006rbacliveviewrefresh)
+  * 5.19 [Select](#select)
+    * 5.19.1 [RQ.SRS-006.RBAC.Select](#rqsrs-006rbacselect)
+    * 5.19.2 [RQ.SRS-006.RBAC.Select.Column](#rqsrs-006rbacselectcolumn)
+    * 5.19.3 [RQ.SRS-006.RBAC.Select.Cluster](#rqsrs-006rbacselectcluster)
+    * 5.19.4 [RQ.SRS-006.RBAC.Select.TableEngines](#rqsrs-006rbacselecttableengines)
+  * 5.20 [Insert](#insert)
+    * 5.20.1 [RQ.SRS-006.RBAC.Insert](#rqsrs-006rbacinsert)
+    * 5.20.2 [RQ.SRS-006.RBAC.Insert.Column](#rqsrs-006rbacinsertcolumn)
+    * 5.20.3 [RQ.SRS-006.RBAC.Insert.Cluster](#rqsrs-006rbacinsertcluster)
+    * 5.20.4 [RQ.SRS-006.RBAC.Insert.TableEngines](#rqsrs-006rbacinserttableengines)
+  * 5.21 [Alter](#alter)
+    * 5.21.1 [Alter Column](#alter-column)
+      * 5.21.1.1 [RQ.SRS-006.RBAC.Privileges.AlterColumn](#rqsrs-006rbacprivilegesaltercolumn)
+      * 5.21.1.2 [RQ.SRS-006.RBAC.Privileges.AlterColumn.Grant](#rqsrs-006rbacprivilegesaltercolumngrant)
+      * 5.21.1.3 [RQ.SRS-006.RBAC.Privileges.AlterColumn.Revoke](#rqsrs-006rbacprivilegesaltercolumnrevoke)
+      * 5.21.1.4 [RQ.SRS-006.RBAC.Privileges.AlterColumn.Column](#rqsrs-006rbacprivilegesaltercolumncolumn)
+      * 5.21.1.5 [RQ.SRS-006.RBAC.Privileges.AlterColumn.Cluster](#rqsrs-006rbacprivilegesaltercolumncluster)
+      * 5.21.1.6 [RQ.SRS-006.RBAC.Privileges.AlterColumn.TableEngines](#rqsrs-006rbacprivilegesaltercolumntableengines)
+    * 5.21.2 [Alter Index](#alter-index)
+      * 5.21.2.1 [RQ.SRS-006.RBAC.Privileges.AlterIndex](#rqsrs-006rbacprivilegesalterindex)
+      * 5.21.2.2 [RQ.SRS-006.RBAC.Privileges.AlterIndex.Grant](#rqsrs-006rbacprivilegesalterindexgrant)
+      * 5.21.2.3 [RQ.SRS-006.RBAC.Privileges.AlterIndex.Revoke](#rqsrs-006rbacprivilegesalterindexrevoke)
+      * 5.21.2.4 [RQ.SRS-006.RBAC.Privileges.AlterIndex.Cluster](#rqsrs-006rbacprivilegesalterindexcluster)
+      * 5.21.2.5 [RQ.SRS-006.RBAC.Privileges.AlterIndex.TableEngines](#rqsrs-006rbacprivilegesalterindextableengines)
+    * 5.21.3 [Alter Constraint](#alter-constraint)
+      * 5.21.3.1 [RQ.SRS-006.RBAC.Privileges.AlterConstraint](#rqsrs-006rbacprivilegesalterconstraint)
+      * 5.21.3.2 [RQ.SRS-006.RBAC.Privileges.AlterConstraint.Grant](#rqsrs-006rbacprivilegesalterconstraintgrant)
+      * 5.21.3.3 [RQ.SRS-006.RBAC.Privileges.AlterConstraint.Revoke](#rqsrs-006rbacprivilegesalterconstraintrevoke)
+      * 5.21.3.4 [RQ.SRS-006.RBAC.Privileges.AlterConstraint.Cluster](#rqsrs-006rbacprivilegesalterconstraintcluster)
+      * 5.21.3.5 [RQ.SRS-006.RBAC.Privileges.AlterConstraint.TableEngines](#rqsrs-006rbacprivilegesalterconstrainttableengines)
+    * 5.21.4 [Alter TTL](#alter-ttl)
+      * 5.21.4.1 [RQ.SRS-006.RBAC.Privileges.AlterTTL](#rqsrs-006rbacprivilegesalterttl)
+      * 5.21.4.2 [RQ.SRS-006.RBAC.Privileges.AlterTTL.Grant](#rqsrs-006rbacprivilegesalterttlgrant)
+      * 5.21.4.3 [RQ.SRS-006.RBAC.Privileges.AlterTTL.Revoke](#rqsrs-006rbacprivilegesalterttlrevoke)
+      * 5.21.4.4 [RQ.SRS-006.RBAC.Privileges.AlterTTL.Cluster](#rqsrs-006rbacprivilegesalterttlcluster)
+      * 5.21.4.5 [RQ.SRS-006.RBAC.Privileges.AlterTTL.TableEngines](#rqsrs-006rbacprivilegesalterttltableengines)
+    * 5.21.5 [Alter Settings](#alter-settings)
+      * 5.21.5.1 [RQ.SRS-006.RBAC.Privileges.AlterSettings](#rqsrs-006rbacprivilegesaltersettings)
+      * 5.21.5.2 [RQ.SRS-006.RBAC.Privileges.AlterSettings.Grant](#rqsrs-006rbacprivilegesaltersettingsgrant)
+      * 5.21.5.3 [RQ.SRS-006.RBAC.Privileges.AlterSettings.Revoke](#rqsrs-006rbacprivilegesaltersettingsrevoke)
+      * 5.21.5.4 [RQ.SRS-006.RBAC.Privileges.AlterSettings.Cluster](#rqsrs-006rbacprivilegesaltersettingscluster)
+      * 5.21.5.5 [RQ.SRS-006.RBAC.Privileges.AlterSettings.TableEngines](#rqsrs-006rbacprivilegesaltersettingstableengines)
+    * 5.21.6 [Alter Update](#alter-update)
+      * 5.21.6.1 [RQ.SRS-006.RBAC.Privileges.AlterUpdate](#rqsrs-006rbacprivilegesalterupdate)
+      * 5.21.6.2 [RQ.SRS-006.RBAC.Privileges.AlterUpdate.Grant](#rqsrs-006rbacprivilegesalterupdategrant)
+      * 5.21.6.3 [RQ.SRS-006.RBAC.Privileges.AlterUpdate.Revoke](#rqsrs-006rbacprivilegesalterupdaterevoke)
+      * 5.21.6.4 [RQ.SRS-006.RBAC.Privileges.AlterUpdate.TableEngines](#rqsrs-006rbacprivilegesalterupdatetableengines)
+    * 5.21.7 [Alter Delete](#alter-delete)
+      * 5.21.7.1 [RQ.SRS-006.RBAC.Privileges.AlterDelete](#rqsrs-006rbacprivilegesalterdelete)
+      * 5.21.7.2 [RQ.SRS-006.RBAC.Privileges.AlterDelete.Grant](#rqsrs-006rbacprivilegesalterdeletegrant)
+      * 5.21.7.3 [RQ.SRS-006.RBAC.Privileges.AlterDelete.Revoke](#rqsrs-006rbacprivilegesalterdeleterevoke)
+      * 5.21.7.4 [RQ.SRS-006.RBAC.Privileges.AlterDelete.TableEngines](#rqsrs-006rbacprivilegesalterdeletetableengines)
+    * 5.21.8 [Alter Freeze Partition](#alter-freeze-partition)
+      * 5.21.8.1 [RQ.SRS-006.RBAC.Privileges.AlterFreeze](#rqsrs-006rbacprivilegesalterfreeze)
+      * 5.21.8.2 [RQ.SRS-006.RBAC.Privileges.AlterFreeze.Grant](#rqsrs-006rbacprivilegesalterfreezegrant)
+      * 5.21.8.3 [RQ.SRS-006.RBAC.Privileges.AlterFreeze.Revoke](#rqsrs-006rbacprivilegesalterfreezerevoke)
+      * 5.21.8.4 [RQ.SRS-006.RBAC.Privileges.AlterFreeze.TableEngines](#rqsrs-006rbacprivilegesalterfreezetableengines)
+    * 5.21.9 [Alter Fetch Partition](#alter-fetch-partition)
+      * 5.21.9.1 [RQ.SRS-006.RBAC.Privileges.AlterFetch](#rqsrs-006rbacprivilegesalterfetch)
+      * 5.21.9.2 [RQ.SRS-006.RBAC.Privileges.AlterFetch.Grant](#rqsrs-006rbacprivilegesalterfetchgrant)
+      * 5.21.9.3 [RQ.SRS-006.RBAC.Privileges.AlterFetch.Revoke](#rqsrs-006rbacprivilegesalterfetchrevoke)
+      * 5.21.9.4 [RQ.SRS-006.RBAC.Privileges.AlterFetch.TableEngines](#rqsrs-006rbacprivilegesalterfetchtableengines)
+    * 5.21.10 [Alter Move Partition](#alter-move-partition)
+      * 5.21.10.1 [RQ.SRS-006.RBAC.Privileges.AlterMove](#rqsrs-006rbacprivilegesaltermove)
+      * 5.21.10.2 [RQ.SRS-006.RBAC.Privileges.AlterMove.Grant](#rqsrs-006rbacprivilegesaltermovegrant)
+      * 5.21.10.3 [RQ.SRS-006.RBAC.Privileges.AlterMove.Revoke](#rqsrs-006rbacprivilegesaltermoverevoke)
+      * 5.21.10.4 [RQ.SRS-006.RBAC.Privileges.AlterMove.TableEngines](#rqsrs-006rbacprivilegesaltermovetableengines)
+  * 5.22 [Create](#create)
+    * 5.22.1 [RQ.SRS-006.RBAC.Privileges.CreateTable](#rqsrs-006rbacprivilegescreatetable)
+    * 5.22.2 [RQ.SRS-006.RBAC.Privileges.CreateDatabase](#rqsrs-006rbacprivilegescreatedatabase)
+    * 5.22.3 [RQ.SRS-006.RBAC.Privileges.CreateDictionary](#rqsrs-006rbacprivilegescreatedictionary)
+    * 5.22.4 [RQ.SRS-006.RBAC.Privileges.CreateTemporaryTable](#rqsrs-006rbacprivilegescreatetemporarytable)
+  * 5.23 [Attach](#attach)
+    * 5.23.1 [RQ.SRS-006.RBAC.Privileges.AttachDatabase](#rqsrs-006rbacprivilegesattachdatabase)
+    * 5.23.2 [RQ.SRS-006.RBAC.Privileges.AttachDictionary](#rqsrs-006rbacprivilegesattachdictionary)
+    * 5.23.3 [RQ.SRS-006.RBAC.Privileges.AttachTemporaryTable](#rqsrs-006rbacprivilegesattachtemporarytable)
+    * 5.23.4 [RQ.SRS-006.RBAC.Privileges.AttachTable](#rqsrs-006rbacprivilegesattachtable)
+  * 5.24 [Drop](#drop)
+    * 5.24.1 [RQ.SRS-006.RBAC.Privileges.DropTable](#rqsrs-006rbacprivilegesdroptable)
+    * 5.24.2 [RQ.SRS-006.RBAC.Privileges.DropDatabase](#rqsrs-006rbacprivilegesdropdatabase)
+    * 5.24.3 [RQ.SRS-006.RBAC.Privileges.DropDictionary](#rqsrs-006rbacprivilegesdropdictionary)
+  * 5.25 [Detach](#detach)
+    * 5.25.1 [RQ.SRS-006.RBAC.Privileges.DetachTable](#rqsrs-006rbacprivilegesdetachtable)
+    * 5.25.2 [RQ.SRS-006.RBAC.Privileges.DetachView](#rqsrs-006rbacprivilegesdetachview)
+    * 5.25.3 [RQ.SRS-006.RBAC.Privileges.DetachDatabase](#rqsrs-006rbacprivilegesdetachdatabase)
+    * 5.25.4 [RQ.SRS-006.RBAC.Privileges.DetachDictionary](#rqsrs-006rbacprivilegesdetachdictionary)
+  * 5.26 [Truncate](#truncate)
+    * 5.26.1 [RQ.SRS-006.RBAC.Privileges.Truncate](#rqsrs-006rbacprivilegestruncate)
+  * 5.27 [Optimize](#optimize)
+    * 5.27.1 [RQ.SRS-006.RBAC.Privileges.Optimize](#rqsrs-006rbacprivilegesoptimize)
+  * 5.28 [Kill Query](#kill-query)
+    * 5.28.1 [RQ.SRS-006.RBAC.Privileges.KillQuery](#rqsrs-006rbacprivilegeskillquery)
+  * 5.29 [Kill Mutation](#kill-mutation)
+    * 5.29.1 [RQ.SRS-006.RBAC.Privileges.KillMutation](#rqsrs-006rbacprivilegeskillmutation)
+    * 5.29.2 [RQ.SRS-006.RBAC.Privileges.KillMutation.AlterUpdate](#rqsrs-006rbacprivilegeskillmutationalterupdate)
+    * 5.29.3 [RQ.SRS-006.RBAC.Privileges.KillMutation.AlterDelete](#rqsrs-006rbacprivilegeskillmutationalterdelete)
+    * 5.29.4 [RQ.SRS-006.RBAC.Privileges.KillMutation.AlterDropColumn](#rqsrs-006rbacprivilegeskillmutationalterdropcolumn)
+  * 5.30 [Show](#show)
+    * 5.30.1 [RQ.SRS-006.RBAC.ShowTables.Privilege](#rqsrs-006rbacshowtablesprivilege)
+    * 5.30.2 [RQ.SRS-006.RBAC.ShowTables.RequiredPrivilege](#rqsrs-006rbacshowtablesrequiredprivilege)
+    * 5.30.3 [RQ.SRS-006.RBAC.ExistsTable.RequiredPrivilege](#rqsrs-006rbacexiststablerequiredprivilege)
+    * 5.30.4 [RQ.SRS-006.RBAC.CheckTable.RequiredPrivilege](#rqsrs-006rbacchecktablerequiredprivilege)
+    * 5.30.5 [RQ.SRS-006.RBAC.ShowDatabases.Privilege](#rqsrs-006rbacshowdatabasesprivilege)
+    * 5.30.6 [RQ.SRS-006.RBAC.ShowDatabases.RequiredPrivilege](#rqsrs-006rbacshowdatabasesrequiredprivilege)
+    * 5.30.7 [RQ.SRS-006.RBAC.ShowCreateDatabase.RequiredPrivilege](#rqsrs-006rbacshowcreatedatabaserequiredprivilege)
+    * 5.30.8 [RQ.SRS-006.RBAC.UseDatabase.RequiredPrivilege](#rqsrs-006rbacusedatabaserequiredprivilege)
+    * 5.30.9 [RQ.SRS-006.RBAC.ShowColumns.Privilege](#rqsrs-006rbacshowcolumnsprivilege)
+    * 5.30.10 [RQ.SRS-006.RBAC.ShowCreateTable.RequiredPrivilege](#rqsrs-006rbacshowcreatetablerequiredprivilege)
+    * 5.30.11 [RQ.SRS-006.RBAC.DescribeTable.RequiredPrivilege](#rqsrs-006rbacdescribetablerequiredprivilege)
+    * 5.30.12 [RQ.SRS-006.RBAC.ShowDictionaries.Privilege](#rqsrs-006rbacshowdictionariesprivilege)
+    * 5.30.13 [RQ.SRS-006.RBAC.ShowDictionaries.RequiredPrivilege](#rqsrs-006rbacshowdictionariesrequiredprivilege)
+    * 5.30.14 [RQ.SRS-006.RBAC.ShowCreateDictionary.RequiredPrivilege](#rqsrs-006rbacshowcreatedictionaryrequiredprivilege)
+    * 5.30.15 [RQ.SRS-006.RBAC.ExistsDictionary.RequiredPrivilege](#rqsrs-006rbacexistsdictionaryrequiredprivilege)
+  * 5.31 [Access Management](#access-management)
+    * 5.31.1 [RQ.SRS-006.RBAC.Privileges.CreateUser](#rqsrs-006rbacprivilegescreateuser)
+    * 5.31.2 [RQ.SRS-006.RBAC.Privileges.CreateUser.DefaultRole](#rqsrs-006rbacprivilegescreateuserdefaultrole)
+    * 5.31.3 [RQ.SRS-006.RBAC.Privileges.AlterUser](#rqsrs-006rbacprivilegesalteruser)
+    * 5.31.4 [RQ.SRS-006.RBAC.Privileges.DropUser](#rqsrs-006rbacprivilegesdropuser)
+    * 5.31.5 [RQ.SRS-006.RBAC.Privileges.CreateRole](#rqsrs-006rbacprivilegescreaterole)
+    * 5.31.6 [RQ.SRS-006.RBAC.Privileges.AlterRole](#rqsrs-006rbacprivilegesalterrole)
+    * 5.31.7 [RQ.SRS-006.RBAC.Privileges.DropRole](#rqsrs-006rbacprivilegesdroprole)
+    * 5.31.8 [RQ.SRS-006.RBAC.Privileges.CreateRowPolicy](#rqsrs-006rbacprivilegescreaterowpolicy)
+    * 5.31.9 [RQ.SRS-006.RBAC.Privileges.AlterRowPolicy](#rqsrs-006rbacprivilegesalterrowpolicy)
+    * 5.31.10 [RQ.SRS-006.RBAC.Privileges.DropRowPolicy](#rqsrs-006rbacprivilegesdroprowpolicy)
+    * 5.31.11 [RQ.SRS-006.RBAC.Privileges.CreateQuota](#rqsrs-006rbacprivilegescreatequota)
+    * 5.31.12 [RQ.SRS-006.RBAC.Privileges.AlterQuota](#rqsrs-006rbacprivilegesalterquota)
+    * 5.31.13 [RQ.SRS-006.RBAC.Privileges.DropQuota](#rqsrs-006rbacprivilegesdropquota)
+    * 5.31.14 [RQ.SRS-006.RBAC.Privileges.CreateSettingsProfile](#rqsrs-006rbacprivilegescreatesettingsprofile)
+    * 5.31.15 [RQ.SRS-006.RBAC.Privileges.AlterSettingsProfile](#rqsrs-006rbacprivilegesaltersettingsprofile)
+    * 5.31.16 [RQ.SRS-006.RBAC.Privileges.DropSettingsProfile](#rqsrs-006rbacprivilegesdropsettingsprofile)
+    * 5.31.17 [RQ.SRS-006.RBAC.Privileges.RoleAdmin](#rqsrs-006rbacprivilegesroleadmin)
+    * 5.31.18 [Show Access](#show-access)
+      * 5.31.18.1 [RQ.SRS-006.RBAC.ShowUsers.Privilege](#rqsrs-006rbacshowusersprivilege)
+      * 5.31.18.2 [RQ.SRS-006.RBAC.ShowUsers.RequiredPrivilege](#rqsrs-006rbacshowusersrequiredprivilege)
+      * 5.31.18.3 [RQ.SRS-006.RBAC.ShowCreateUser.RequiredPrivilege](#rqsrs-006rbacshowcreateuserrequiredprivilege)
+      * 5.31.18.4 [RQ.SRS-006.RBAC.ShowRoles.Privilege](#rqsrs-006rbacshowrolesprivilege)
+      * 5.31.18.5 [RQ.SRS-006.RBAC.ShowRoles.RequiredPrivilege](#rqsrs-006rbacshowrolesrequiredprivilege)
+      * 5.31.18.6 [RQ.SRS-006.RBAC.ShowCreateRole.RequiredPrivilege](#rqsrs-006rbacshowcreaterolerequiredprivilege)
+      * 5.31.18.7 [RQ.SRS-006.RBAC.ShowRowPolicies.Privilege](#rqsrs-006rbacshowrowpoliciesprivilege)
+      * 5.31.18.8 [RQ.SRS-006.RBAC.ShowRowPolicies.RequiredPrivilege](#rqsrs-006rbacshowrowpoliciesrequiredprivilege)
+      * 5.31.18.9 [RQ.SRS-006.RBAC.ShowCreateRowPolicy.RequiredPrivilege](#rqsrs-006rbacshowcreaterowpolicyrequiredprivilege)
+      * 5.31.18.10 [RQ.SRS-006.RBAC.ShowQuotas.Privilege](#rqsrs-006rbacshowquotasprivilege)
+      * 5.31.18.11 [RQ.SRS-006.RBAC.ShowQuotas.RequiredPrivilege](#rqsrs-006rbacshowquotasrequiredprivilege)
+      * 5.31.18.12 [RQ.SRS-006.RBAC.ShowCreateQuota.RequiredPrivilege](#rqsrs-006rbacshowcreatequotarequiredprivilege)
+      * 5.31.18.13 [RQ.SRS-006.RBAC.ShowSettingsProfiles.Privilege](#rqsrs-006rbacshowsettingsprofilesprivilege)
+      * 5.31.18.14 [RQ.SRS-006.RBAC.ShowSettingsProfiles.RequiredPrivilege](#rqsrs-006rbacshowsettingsprofilesrequiredprivilege)
+      * 5.31.18.15 [RQ.SRS-006.RBAC.ShowCreateSettingsProfile.RequiredPrivilege](#rqsrs-006rbacshowcreatesettingsprofilerequiredprivilege)
+  * 5.32 [dictGet](#dictget)
+    * 5.32.1 [RQ.SRS-006.RBAC.dictGet.Privilege](#rqsrs-006rbacdictgetprivilege)
+    * 5.32.2 [RQ.SRS-006.RBAC.dictGet.RequiredPrivilege](#rqsrs-006rbacdictgetrequiredprivilege)
+    * 5.32.3 [RQ.SRS-006.RBAC.dictGet.Type.RequiredPrivilege](#rqsrs-006rbacdictgettyperequiredprivilege)
+    * 5.32.4 [RQ.SRS-006.RBAC.dictGet.OrDefault.RequiredPrivilege](#rqsrs-006rbacdictgetordefaultrequiredprivilege)
+    * 5.32.5 [RQ.SRS-006.RBAC.dictHas.RequiredPrivilege](#rqsrs-006rbacdicthasrequiredprivilege)
+    * 5.32.6 [RQ.SRS-006.RBAC.dictGetHierarchy.RequiredPrivilege](#rqsrs-006rbacdictgethierarchyrequiredprivilege)
+    * 5.32.7 [RQ.SRS-006.RBAC.dictIsIn.RequiredPrivilege](#rqsrs-006rbacdictisinrequiredprivilege)
+  * 5.33 [Introspection](#introspection)
+    * 5.33.1 [RQ.SRS-006.RBAC.Privileges.Introspection](#rqsrs-006rbacprivilegesintrospection)
+    * 5.33.2 [RQ.SRS-006.RBAC.Privileges.Introspection.addressToLine](#rqsrs-006rbacprivilegesintrospectionaddresstoline)
+    * 5.33.3 [RQ.SRS-006.RBAC.Privileges.Introspection.addressToSymbol](#rqsrs-006rbacprivilegesintrospectionaddresstosymbol)
+    * 5.33.4 [RQ.SRS-006.RBAC.Privileges.Introspection.demangle](#rqsrs-006rbacprivilegesintrospectiondemangle)
+  * 5.34 [System](#system)
+    * 5.34.1 [RQ.SRS-006.RBAC.Privileges.System.Shutdown](#rqsrs-006rbacprivilegessystemshutdown)
+    * 5.34.2 [RQ.SRS-006.RBAC.Privileges.System.DropCache](#rqsrs-006rbacprivilegessystemdropcache)
+    * 5.34.3 [RQ.SRS-006.RBAC.Privileges.System.DropCache.DNS](#rqsrs-006rbacprivilegessystemdropcachedns)
+    * 5.34.4 [RQ.SRS-006.RBAC.Privileges.System.DropCache.Mark](#rqsrs-006rbacprivilegessystemdropcachemark)
+    * 5.34.5 [RQ.SRS-006.RBAC.Privileges.System.DropCache.Uncompressed](#rqsrs-006rbacprivilegessystemdropcacheuncompressed)
+    * 5.34.6 [RQ.SRS-006.RBAC.Privileges.System.Reload](#rqsrs-006rbacprivilegessystemreload)
+    * 5.34.7 [RQ.SRS-006.RBAC.Privileges.System.Reload.Config](#rqsrs-006rbacprivilegessystemreloadconfig)
+    * 5.34.8 [RQ.SRS-006.RBAC.Privileges.System.Reload.Dictionary](#rqsrs-006rbacprivilegessystemreloaddictionary)
+    * 5.34.9 [RQ.SRS-006.RBAC.Privileges.System.Reload.Dictionaries](#rqsrs-006rbacprivilegessystemreloaddictionaries)
+    * 5.34.10 [RQ.SRS-006.RBAC.Privileges.System.Reload.EmbeddedDictionaries](#rqsrs-006rbacprivilegessystemreloadembeddeddictionaries)
+    * 5.34.11 [RQ.SRS-006.RBAC.Privileges.System.Merges](#rqsrs-006rbacprivilegessystemmerges)
+    * 5.34.12 [RQ.SRS-006.RBAC.Privileges.System.TTLMerges](#rqsrs-006rbacprivilegessystemttlmerges)
+    * 5.34.13 [RQ.SRS-006.RBAC.Privileges.System.Fetches](#rqsrs-006rbacprivilegessystemfetches)
+    * 5.34.14 [RQ.SRS-006.RBAC.Privileges.System.Moves](#rqsrs-006rbacprivilegessystemmoves)
+    * 5.34.15 [RQ.SRS-006.RBAC.Privileges.System.Sends](#rqsrs-006rbacprivilegessystemsends)
+    * 5.34.16 [RQ.SRS-006.RBAC.Privileges.System.Sends.Distributed](#rqsrs-006rbacprivilegessystemsendsdistributed)
+    * 5.34.17 [RQ.SRS-006.RBAC.Privileges.System.Sends.Replicated](#rqsrs-006rbacprivilegessystemsendsreplicated)
+    * 5.34.18 [RQ.SRS-006.RBAC.Privileges.System.ReplicationQueues](#rqsrs-006rbacprivilegessystemreplicationqueues)
+    * 5.34.19 [RQ.SRS-006.RBAC.Privileges.System.SyncReplica](#rqsrs-006rbacprivilegessystemsyncreplica)
+    * 5.34.20 [RQ.SRS-006.RBAC.Privileges.System.RestartReplica](#rqsrs-006rbacprivilegessystemrestartreplica)
+    * 5.34.21 [RQ.SRS-006.RBAC.Privileges.System.Flush](#rqsrs-006rbacprivilegessystemflush)
+    * 5.34.22 [RQ.SRS-006.RBAC.Privileges.System.Flush.Distributed](#rqsrs-006rbacprivilegessystemflushdistributed)
+    * 5.34.23 [RQ.SRS-006.RBAC.Privileges.System.Flush.Logs](#rqsrs-006rbacprivilegessystemflushlogs)
+  * 5.35 [Sources](#sources)
+    * 5.35.1 [RQ.SRS-006.RBAC.Privileges.Sources](#rqsrs-006rbacprivilegessources)
+    * 5.35.2 [RQ.SRS-006.RBAC.Privileges.Sources.File](#rqsrs-006rbacprivilegessourcesfile)
+    * 5.35.3 [RQ.SRS-006.RBAC.Privileges.Sources.URL](#rqsrs-006rbacprivilegessourcesurl)
+    * 5.35.4 [RQ.SRS-006.RBAC.Privileges.Sources.Remote](#rqsrs-006rbacprivilegessourcesremote)
+    * 5.35.5 [RQ.SRS-006.RBAC.Privileges.Sources.MySQL](#rqsrs-006rbacprivilegessourcesmysql)
+    * 5.35.6 [RQ.SRS-006.RBAC.Privileges.Sources.ODBC](#rqsrs-006rbacprivilegessourcesodbc)
+    * 5.35.7 [RQ.SRS-006.RBAC.Privileges.Sources.JDBC](#rqsrs-006rbacprivilegessourcesjdbc)
+    * 5.35.8 [RQ.SRS-006.RBAC.Privileges.Sources.HDFS](#rqsrs-006rbacprivilegessourceshdfs)
+    * 5.35.9 [RQ.SRS-006.RBAC.Privileges.Sources.S3](#rqsrs-006rbacprivilegessourcess3)
+  * 5.36 [RQ.SRS-006.RBAC.Privileges.GrantOption](#rqsrs-006rbacprivilegesgrantoption)
+  * 5.37 [RQ.SRS-006.RBAC.Privileges.All](#rqsrs-006rbacprivilegesall)
+  * 5.38 [RQ.SRS-006.RBAC.Privileges.RoleAll](#rqsrs-006rbacprivilegesroleall)
+  * 5.39 [RQ.SRS-006.RBAC.Privileges.None](#rqsrs-006rbacprivilegesnone)
+  * 5.40 [RQ.SRS-006.RBAC.Privileges.AdminOption](#rqsrs-006rbacprivilegesadminoption)
 * 6 [References](#references)
 
 ## Revision History
@@ -656,256 +10643,103 @@ version: 1.0
 
 [ClickHouse] SHALL support role based access control.
 
-#### Login
+### Login
 
-##### RQ.SRS-006.RBAC.Login
+#### RQ.SRS-006.RBAC.Login
 version: 1.0
 
 [ClickHouse] SHALL only allow access to the server for a given
 user only when correct username and password are used during
 the connection to the server.
 
-##### RQ.SRS-006.RBAC.Login.DefaultUser
+#### RQ.SRS-006.RBAC.Login.DefaultUser
 version: 1.0
 
 [ClickHouse] SHALL use the **default user** when no username and password
 are specified during the connection to the server.
 
-#### User
+### User
 
-##### RQ.SRS-006.RBAC.User
+#### RQ.SRS-006.RBAC.User
 version: 1.0
 
 [ClickHouse] SHALL support creation and manipulation of
 one or more **user** accounts to which roles, privileges,
 settings profile, quotas and row policies can be assigned.
 
-##### RQ.SRS-006.RBAC.User.Roles
+#### RQ.SRS-006.RBAC.User.Roles
 version: 1.0
 
 [ClickHouse] SHALL support assigning one or more **roles**
 to a **user**.
 
-##### RQ.SRS-006.RBAC.User.Privileges
+#### RQ.SRS-006.RBAC.User.Privileges
 version: 1.0
 
 [ClickHouse] SHALL support assigning one or more privileges to a **user**.
 
-##### RQ.SRS-006.RBAC.User.Variables
+#### RQ.SRS-006.RBAC.User.Variables
 version: 1.0
 
 [ClickHouse] SHALL support assigning one or more variables to a **user**.
 
-##### RQ.SRS-006.RBAC.User.Variables.Constraints
+#### RQ.SRS-006.RBAC.User.Variables.Constraints
 version: 1.0
 
 [ClickHouse] SHALL support assigning min, max and read-only constraints
 for the variables that can be set and read by the **user**.
 
-##### RQ.SRS-006.RBAC.User.SettingsProfile
+#### RQ.SRS-006.RBAC.User.SettingsProfile
 version: 1.0
 
 [ClickHouse] SHALL support assigning one or more **settings profiles**
 to a **user**.
 
-##### RQ.SRS-006.RBAC.User.Quotas
+#### RQ.SRS-006.RBAC.User.Quotas
 version: 1.0
 
 [ClickHouse] SHALL support assigning one or more **quotas** to a **user**.
 
-##### RQ.SRS-006.RBAC.User.RowPolicies
+#### RQ.SRS-006.RBAC.User.RowPolicies
 version: 1.0
 
 [ClickHouse] SHALL support assigning one or more **row policies** to a **user**.
 
-##### RQ.SRS-006.RBAC.User.AccountLock
-version: 1.0
-
-[ClickHouse] SHALL support locking and unlocking of **user** accounts.
-
-##### RQ.SRS-006.RBAC.User.AccountLock.DenyAccess
-version: 1.0
-
-[ClickHouse] SHALL deny access to the user whose account is locked.
-
-##### RQ.SRS-006.RBAC.User.DefaultRole
+#### RQ.SRS-006.RBAC.User.DefaultRole
 version: 1.0
 
 [ClickHouse] SHALL support assigning a default role to a **user**.
 
-##### RQ.SRS-006.RBAC.User.RoleSelection
+#### RQ.SRS-006.RBAC.User.RoleSelection
 version: 1.0
 
 [ClickHouse] SHALL support selection of one or more **roles** from the available roles
-that are assigned to a **user**.
+that are assigned to a **user** using `SET ROLE` statement.
 
-##### RQ.SRS-006.RBAC.User.ShowCreate
+#### RQ.SRS-006.RBAC.User.ShowCreate
 version: 1.0
 
 [ClickHouse] SHALL support showing the command of how **user** account was created.
 
-##### RQ.SRS-006.RBAC.User.ShowPrivileges
+#### RQ.SRS-006.RBAC.User.ShowPrivileges
 version: 1.0
 
 [ClickHouse] SHALL support listing the privileges of the **user**.
 
-#### Role
-
-##### RQ.SRS-006.RBAC.Role
-version: 1.0
-
-[ClikHouse] SHALL support creation and manipulation of **roles**
-to which privileges, settings profile, quotas and row policies can be
-assigned.
-
-##### RQ.SRS-006.RBAC.Role.Privileges
-version: 1.0
-
-[ClickHouse] SHALL support assigning one or more privileges to a **role**.
-
-##### RQ.SRS-006.RBAC.Role.Variables
-version: 1.0
-
-[ClickHouse] SHALL support assigning one or more variables to a **role**.
-
-##### RQ.SRS-006.RBAC.Role.SettingsProfile
-version: 1.0
-
-[ClickHouse] SHALL support assigning one or more **settings profiles**
-to a **role**.
-
-##### RQ.SRS-006.RBAC.Role.Quotas
-version: 1.0
-
-[ClickHouse] SHALL support assigning one or more **quotas** to a **role**.
-
-##### RQ.SRS-006.RBAC.Role.RowPolicies
-version: 1.0
-
-[ClickHouse] SHALL support assigning one or more **row policies** to a **role**.
-
-#### Partial Revokes
-
-##### RQ.SRS-006.RBAC.PartialRevokes
-version: 1.0
-
-[ClickHouse] SHALL support partial revoking of privileges granted
-to a **user** or a **role**.
-
-#### Settings Profile
-
-##### RQ.SRS-006.RBAC.SettingsProfile
-version: 1.0
-
-[ClickHouse] SHALL support creation and manipulation of **settings profiles**
-that can include value definition for one or more variables and can
-can be assigned to one or more **users** or **roles**.
-
-##### RQ.SRS-006.RBAC.SettingsProfile.Constraints
-version: 1.0
-
-[ClickHouse] SHALL support assigning min, max and read-only constraints
-for the variables specified in the **settings profile**.
-
-##### RQ.SRS-006.RBAC.SettingsProfile.ShowCreate
-version: 1.0
-
-[ClickHouse] SHALL support showing the command of how **setting profile** was created.
-
-#### Quotas
-
-##### RQ.SRS-006.RBAC.Quotas
-version: 1.0
-
-[ClickHouse] SHALL support creation and manipulation of **quotas**
-that can be used to limit resource usage by a **user** or a **role**
-over a period of time.
-
-##### RQ.SRS-006.RBAC.Quotas.Keyed
-version: 1.0
-
-[ClickHouse] SHALL support creating **quotas** that are keyed
-so that a quota is tracked separately for each key value.
-
-##### RQ.SRS-006.RBAC.Quotas.Queries
-version: 1.0
-
-[ClickHouse] SHALL support setting **queries** quota to limit the total number of requests.
-
-##### RQ.SRS-006.RBAC.Quotas.Errors
-version: 1.0
-
-[ClickHouse] SHALL support setting **errors** quota to limit the number of queries that threw an exception.
-
-##### RQ.SRS-006.RBAC.Quotas.ResultRows
-version: 1.0
-
-[ClickHouse] SHALL support setting **result rows** quota to limit the
-the total number of rows given as the result.
-
-##### RQ.SRS-006.RBAC.Quotas.ReadRows
-version: 1.0
-
-[ClickHouse] SHALL support setting **read rows** quota to limit the total
-number of source rows read from tables for running the query on all remote servers.
-
-##### RQ.SRS-006.RBAC.Quotas.ResultBytes
-version: 1.0
-
-[ClickHouse] SHALL support setting **result bytes** quota to limit the total number
-of bytes that can be returned as the result.
-
-##### RQ.SRS-006.RBAC.Quotas.ReadBytes
-version: 1.0
-
-[ClickHouse] SHALL support setting **read bytes** quota to limit the total number
-of source bytes read from tables for running the query on all remote servers.
-
-##### RQ.SRS-006.RBAC.Quotas.ExecutionTime
-version: 1.0
-
-[ClickHouse] SHALL support setting **execution time** quota to limit the maximum
-query execution time.
-
-##### RQ.SRS-006.RBAC.Quotas.ShowCreate
-version: 1.0
-
-[ClickHouse] SHALL support showing the command of how **quota** was created.
-
-#### Row Policy
-
-##### RQ.SRS-006.RBAC.RowPolicy
-version: 1.0
-
-[ClickHouse] SHALL support creation and manipulation of table **row policies**
-that can be used to limit access to the table contents for a **user** or a **role**
-using a specified **condition**.
-
-##### RQ.SRS-006.RBAC.RowPolicy.Condition
-version: 1.0
-
-[ClickHouse] SHALL support row policy **conditions** that can be any SQL
-expression that returns a boolean.
-
-##### RQ.SRS-006.RBAC.RowPolicy.ShowCreate
-version: 1.0
-
-[ClickHouse] SHALL support showing the command of how **row policy** was created.
-
-### Specific
-
-##### RQ.SRS-006.RBAC.User.Use.DefaultRole
+#### RQ.SRS-006.RBAC.User.Use.DefaultRole
 version: 1.0
 
 [ClickHouse] SHALL by default use default role or roles assigned
 to the user if specified.
 
-##### RQ.SRS-006.RBAC.User.Use.AllRolesWhenNoDefaultRole
+#### RQ.SRS-006.RBAC.User.Use.AllRolesWhenNoDefaultRole
 version: 1.0
 
 [ClickHouse] SHALL by default use all the roles assigned to the user
 if no default role or roles are specified for the user.
 
+#### Create User
+
 ##### RQ.SRS-006.RBAC.User.Create
 version: 1.0
 
@@ -1103,6 +10937,8 @@ CREATE USER [IF NOT EXISTS | OR REPLACE] name [ON CLUSTER cluster_name]
     [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | PROFILE 'profile_name'] [,...]
 ```
 
+#### Alter User
+
 ##### RQ.SRS-006.RBAC.User.Alter
 version: 1.0
 
@@ -1119,7 +10955,8 @@ the left.
 version: 1.0
 
 [ClickHouse] SHALL support `IF EXISTS` clause in the `ALTER USER` statement
-to skip raising an exception (producing a warning instead) if a user with the specified **name** does not exist. If the `IF EXISTS` clause is not specified then an exception SHALL be raised if a user with the **name** does not exist.
+to skip raising an exception (producing a warning instead) if a user with the specified **name** does not exist.
+If the `IF EXISTS` clause is not specified then an exception SHALL be raised if a user with the **name** does not exist.
 
 ##### RQ.SRS-006.RBAC.User.Alter.Cluster
 version: 1.0
@@ -1157,7 +10994,8 @@ to some password as identification when altering user account using
 ##### RQ.SRS-006.RBAC.User.Alter.Host.AddDrop
 version: 1.0
 
-[ClickHouse] SHALL support altering user by adding and dropping access to hosts with the `ADD HOST` or the `DROP HOST`in the `ALTER USER` statement.
+[ClickHouse] SHALL support altering user by adding and dropping access to hosts
+with the `ADD HOST` or the `DROP HOST` in the `ALTER USER` statement.
 
 ##### RQ.SRS-006.RBAC.User.Alter.Host.Local
 version: 1.0
@@ -1189,7 +11027,8 @@ which user can access the server using the `HOST IP` clause in the
 ##### RQ.SRS-006.RBAC.User.Alter.Host.Like
 version: 1.0
 
-[ClickHouse] SHALL support specifying sone or more similar hosts using `LIKE` command syntax using the `HOST LIKE` clause in the `ALTER USER` statement.
+[ClickHouse] SHALL support specifying one or more similar hosts using `LIKE` command syntax
+using the `HOST LIKE` clause in the `ALTER USER` statement.
 
 ##### RQ.SRS-006.RBAC.User.Alter.Host.Any
 version: 1.0
@@ -1232,7 +11071,6 @@ version: 1.0
 
 [ClickHouse] SHALL support specifying a minimum value for the variable specifed using `SETTINGS` with `MIN` clause in the `ALTER USER` statement.
 
-
 ##### RQ.SRS-006.RBAC.User.Alter.Settings.Max
 version: 1.0
 
@@ -1257,85 +11095,7 @@ ALTER USER [IF EXISTS] name [ON CLUSTER cluster_name]
     [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | PROFILE 'profile_name'] [,...]
 ```
 
-##### RQ.SRS-006.RBAC.SetDefaultRole
-version: 1.0
-
-[ClickHouse] SHALL support setting or changing granted roles to default for one or more
-users using `SET DEFAULT ROLE` statement which
-SHALL permanently change the default roles for the user or users if successful.
-
-##### RQ.SRS-006.RBAC.SetDefaultRole.CurrentUser
-version: 1.0
-
-[ClickHouse] SHALL support setting or changing granted roles to default for
-the current user using `CURRENT_USER` clause in the `SET DEFAULT ROLE` statement.
-
-##### RQ.SRS-006.RBAC.SetDefaultRole.All
-version: 1.0
-
-[ClickHouse] SHALL support setting or changing all granted roles to default
-for one or more users using `ALL` clause in the `SET DEFAULT ROLE` statement.
-
-##### RQ.SRS-006.RBAC.SetDefaultRole.AllExcept
-version: 1.0
-
-[ClickHouse] SHALL support setting or changing all granted roles except those specified
-to default for one or more users using `ALL EXCEPT` clause in the `SET DEFAULT ROLE` statement.
-
-##### RQ.SRS-006.RBAC.SetDefaultRole.None
-version: 1.0
-
-[ClickHouse] SHALL support removing all granted roles from default
-for one or more users using `NONE` clause in the `SET DEFAULT ROLE` statement.
-
-##### RQ.SRS-006.RBAC.SetDefaultRole.Syntax
-version: 1.0
-
-[ClickHouse] SHALL support the following syntax for the `SET DEFAULT ROLE` statement.
-
-```sql
-SET DEFAULT ROLE
-    {NONE | role [,...] | ALL | ALL EXCEPT role [,...]}
-    TO {user|CURRENT_USER} [,...]
-
-```
-
-##### RQ.SRS-006.RBAC.SetRole
-version: 1.0
-
-[ClickHouse] SHALL support activating role or roles for the current user
-using `SET ROLE` statement.
-
-##### RQ.SRS-006.RBAC.SetRole.Default
-version: 1.0
-
-[ClickHouse] SHALL support activating default roles for the current user
-using `DEFAULT` clause in the `SET ROLE` statement.
-
-##### RQ.SRS-006.RBAC.SetRole.None
-version: 1.0
-
-[ClickHouse] SHALL support activating no roles for the current user
-using `NONE` clause in the `SET ROLE` statement.
-
-##### RQ.SRS-006.RBAC.SetRole.All
-version: 1.0
-
-[ClickHouse] SHALL support activating all roles for the current user
-using `ALL` clause in the `SET ROLE` statement.
-
-##### RQ.SRS-006.RBAC.SetRole.AllExcept
-version: 1.0
-
-[ClickHouse] SHALL support activating all roles except those specified
-for the current user using `ALL EXCEPT` clause in the `SET ROLE` statement.
-
-##### RQ.SRS-006.RBAC.SetRole.Syntax
-version: 1.0
-
-```sql
-SET ROLE {DEFAULT | NONE | role [,...] | ALL | ALL EXCEPT role [,...]}
-```
+#### Show Create User
 
 ##### RQ.SRS-006.RBAC.User.ShowCreateUser
 version: 1.0
@@ -1358,6 +11118,8 @@ version: 1.0
 SHOW CREATE USER [name | CURRENT_USER]
 ```
 
+#### Drop User
+
 ##### RQ.SRS-006.RBAC.User.Drop
 version: 1.0
 
@@ -1386,6 +11148,43 @@ version: 1.0
 DROP USER [IF EXISTS] name [,...] [ON CLUSTER cluster_name]
 ```
 
+### Role
+
+#### RQ.SRS-006.RBAC.Role
+version: 1.0
+
+[ClikHouse] SHALL support creation and manipulation of **roles**
+to which privileges, settings profile, quotas and row policies can be
+assigned.
+
+#### RQ.SRS-006.RBAC.Role.Privileges
+version: 1.0
+
+[ClickHouse] SHALL support assigning one or more privileges to a **role**.
+
+#### RQ.SRS-006.RBAC.Role.Variables
+version: 1.0
+
+[ClickHouse] SHALL support assigning one or more variables to a **role**.
+
+#### RQ.SRS-006.RBAC.Role.SettingsProfile
+version: 1.0
+
+[ClickHouse] SHALL support assigning one or more **settings profiles**
+to a **role**.
+
+#### RQ.SRS-006.RBAC.Role.Quotas
+version: 1.0
+
+[ClickHouse] SHALL support assigning one or more **quotas** to a **role**.
+
+#### RQ.SRS-006.RBAC.Role.RowPolicies
+version: 1.0
+
+[ClickHouse] SHALL support assigning one or more **row policies** to a **role**.
+
+#### Create Role
+
 ##### RQ.SRS-006.RBAC.Role.Create
 version: 1.0
 
@@ -1421,6 +11220,8 @@ CREATE ROLE [IF NOT EXISTS | OR REPLACE] name
     [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | PROFILE 'profile_name'] [,...]
 ```
 
+#### Alter Role
+
 ##### RQ.SRS-006.RBAC.Role.Alter
 version: 1.0
 
@@ -1467,6 +11268,8 @@ ALTER ROLE [IF EXISTS] name [ON CLUSTER cluster_name]
     [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | PROFILE 'profile_name'] [,...]
 ```
 
+#### Drop Role
+
 ##### RQ.SRS-006.RBAC.Role.Drop
 version: 1.0
 
@@ -1494,6 +11297,8 @@ version: 1.0
 DROP ROLE [IF EXISTS] name [,...] [ON CLUSTER cluster_name]
 ```
 
+#### Show Create Role
+
 ##### RQ.SRS-006.RBAC.Role.ShowCreate
 version: 1.0
 
@@ -1509,326 +11314,15 @@ version: 1.0
 SHOW CREATE ROLE name
 ```
 
-##### RQ.SRS-006.RBAC.Grant.Privilege.To
+### Partial Revokes
+
+#### RQ.SRS-006.RBAC.PartialRevokes
 version: 1.0
 
-[ClickHouse] SHALL support granting privileges to one or more users or roles using `TO` clause
-in the `GRANT PRIVILEGE` statement.
+[ClickHouse] SHALL support partial revoking of privileges granted
+to a **user** or a **role**.
 
-##### RQ.SRS-006.RBAC.Grant.Privilege.ToCurrentUser
-version: 1.0
-
-[ClickHouse] SHALL support granting privileges to current user using `TO CURRENT_USER` clause
-in the `GRANT PRIVILEGE` statement.
-
-##### RQ.SRS-006.RBAC.Grant.Privilege.Select
-version: 1.0
-
-[ClickHouse] SHALL support granting the **select** privilege to one or more users or roles
-for a database or a table using the `GRANT SELECT` statement.
-
-##### RQ.SRS-006.RBAC.Grant.Privilege.Insert
-version: 1.0
-
-[ClickHouse] SHALL support granting the **insert** privilege to one or more users or roles
-for a database or a table using the `GRANT INSERT` statement.
-
-##### RQ.SRS-006.RBAC.Grant.Privilege.Alter
-version: 1.0
-
-[ClickHouse] SHALL support granting the **alter** privilege to one or more users or roles
-for a database or a table using the `GRANT ALTER` statement.
-
-##### RQ.SRS-006.RBAC.Grant.Privilege.Create
-version: 1.0
-
-[ClickHouse] SHALL support granting the **create** privilege to one or more users or roles
-using the `GRANT CREATE` statement.
-
-##### RQ.SRS-006.RBAC.Grant.Privilege.Drop
-version: 1.0
-
-[ClickHouse] SHALL support granting the **drop** privilege to one or more users or roles
-using the `GRANT DROP` statement.
-
-##### RQ.SRS-006.RBAC.Grant.Privilege.Truncate
-version: 1.0
-
-[ClickHouse] SHALL support granting the **truncate** privilege to one or more users or roles
-for a database or a table using `GRANT TRUNCATE` statement.
-
-##### RQ.SRS-006.RBAC.Grant.Privilege.Optimize
-version: 1.0
-
-[ClickHouse] SHALL support granting the **optimize** privilege to one or more users or roles
-for a database or a table using `GRANT OPTIMIZE` statement.
-
-##### RQ.SRS-006.RBAC.Grant.Privilege.Show
-version: 1.0
-
-[ClickHouse] SHALL support granting the **show** privilege to one or more users or roles
-for a database or a table using `GRANT SHOW` statement.
-
-##### RQ.SRS-006.RBAC.Grant.Privilege.KillQuery
-version: 1.0
-
-[ClickHouse] SHALL support granting the **kill query** privilege to one or more users or roles
-for a database or a table using `GRANT KILL QUERY` statement.
-
-##### RQ.SRS-006.RBAC.Grant.Privilege.AccessManagement
-version: 1.0
-
-[ClickHouse] SHALL support granting the **access management** privileges to one or more users or roles
-for a database or a table using `GRANT ACCESS MANAGEMENT` statement.
-
-##### RQ.SRS-006.RBAC.Grant.Privilege.System
-version: 1.0
-
-[ClickHouse] SHALL support granting the **system** privileges to one or more users or roles
-for a database or a table using `GRANT SYSTEM` statement.
-
-##### RQ.SRS-006.RBAC.Grant.Privilege.Introspection
-version: 1.0
-
-[ClickHouse] SHALL support granting the **introspection** privileges to one or more users or roles
-for a database or a table using `GRANT INTROSPECTION` statement.
-
-##### RQ.SRS-006.RBAC.Grant.Privilege.Sources
-version: 1.0
-
-[ClickHouse] SHALL support granting the **sources** privileges to one or more users or roles
-for a database or a table using `GRANT SOURCES` statement.
-
-##### RQ.SRS-006.RBAC.Grant.Privilege.DictGet
-version: 1.0
-
-[ClickHouse] SHALL support granting the **dictGet** privilege to one or more users or roles
-for a database or a table using `GRANT dictGet` statement.
-
-##### RQ.SRS-006.RBAC.Grant.Privilege.None
-version: 1.0
-
-[ClickHouse] SHALL support granting no privileges to one or more users or roles
-for a database or a table using `GRANT NONE` statement.
-
-##### RQ.SRS-006.RBAC.Grant.Privilege.All
-version: 1.0
-
-[ClickHouse] SHALL support granting the **all** privileges to one or more users or roles
-for a database or a table using the `GRANT ALL` or `GRANT ALL PRIVILEGES` statements.
-
-##### RQ.SRS-006.RBAC.Grant.Privilege.GrantOption
-version: 1.0
-
-[ClickHouse] SHALL support granting the **grant option** privilege to one or more users or roles
-for a database or a table using the `WITH GRANT OPTION` clause in the `GRANT` statement.
-
-##### RQ.SRS-006.RBAC.Grant.Privilege.On
-version: 1.0
-
-[ClickHouse] SHALL support the `ON` clause in the `GRANT` privilege statement
-which SHALL allow to specify one or more tables to which the privilege SHALL
-be granted using the following patterns
-
-* `*.*` any table in any database
-* `database.*` any table in the specified database
-* `database.table` specific table in the specified database
-* `*` any table in the current database
-* `table` specific table in the current database
-
-##### RQ.SRS-006.RBAC.Grant.Privilege.PrivilegeColumns
-version: 1.0
-
-[ClickHouse] SHALL support granting the privilege **some_privilege** to one or more users or roles
-for a database or a table using the `GRANT some_privilege(column)` statement for one column.
-Multiple columns will be supported with `GRANT some_privilege(column1, column2...)` statement.
-The privileges will be granted for only the specified columns.
-
-##### RQ.SRS-006.RBAC.Grant.Privilege.OnCluster
-version: 1.0
-
-[ClickHouse] SHALL support specifying cluster on which to grant privileges using the `ON CLUSTER`
-clause in the `GRANT PRIVILEGE` statement.
-
-##### RQ.SRS-006.RBAC.Grant.Privilege.Syntax
-version: 1.0
-
-[ClickHouse] SHALL support the following syntax for the `GRANT` statement that
-grants explicit privileges to a user or a role.
-
-```sql
-GRANT [ON CLUSTER cluster_name] privilege[(column_name [,...])] [,...]
-    ON {db.table|db.*|*.*|table|*}
-    TO {user | role | CURRENT_USER} [,...]
-    [WITH GRANT OPTION]
-```
-
-##### RQ.SRS-006.RBAC.Revoke.Privilege.Cluster
-version: 1.0
-
-[ClickHouse] SHALL support revoking privileges to one or more users or roles
-for a database or a table on some specific cluster using the `REVOKE ON CLUSTER cluster_name` statement.
-
-##### RQ.SRS-006.RBAC.Revoke.Privilege.Any
-version: 1.0
-
-[ClickHouse] SHALL support revoking ANY privilege to one or more users or roles
-for a database or a table using the `REVOKE some_privilege` statement.
-**some_privilege** refers to any Clickhouse defined privilege, whose hierarchy includes
-SELECT, INSERT, ALTER, CREATE, DROP, TRUNCATE, OPTIMIZE, SHOW, KILL QUERY, ACCESS MANAGEMENT,
-SYSTEM, INTROSPECTION, SOURCES, dictGet and all of their sub-privileges.
-
-##### RQ.SRS-006.RBAC.Revoke.Privilege.Select
-version: 1.0
-
-[ClickHouse] SHALL support revoking the **select** privilege to one or more users or roles
-for a database or a table using the `REVOKE SELECT` statement.
-
-##### RQ.SRS-006.RBAC.Revoke.Privilege.Insert
-version: 1.0
-
-[ClickHouse] SHALL support revoking the **insert** privilege to one or more users or roles
-for a database or a table using the `REVOKE INSERT` statement.
-
-##### RQ.SRS-006.RBAC.Revoke.Privilege.Alter
-version: 1.0
-
-[ClickHouse] SHALL support revoking the **alter** privilege to one or more users or roles
-for a database or a table using the `REVOKE ALTER` statement.
-
-##### RQ.SRS-006.RBAC.Revoke.Privilege.Create
-version: 1.0
-
-[ClickHouse] SHALL support revoking the **create** privilege to one or more users or roles
-using the `REVOKE CREATE` statement.
-
-##### RQ.SRS-006.RBAC.Revoke.Privilege.Drop
-version: 1.0
-
-[ClickHouse] SHALL support revoking the **drop** privilege to one or more users or roles
-using the `REVOKE DROP` statement.
-
-##### RQ.SRS-006.RBAC.Revoke.Privilege.Truncate
-version: 1.0
-
-[ClickHouse] SHALL support revoking the **truncate** privilege to one or more users or roles
-for a database or a table using the `REVOKE TRUNCATE` statement.
-
-##### RQ.SRS-006.RBAC.Revoke.Privilege.Optimize
-version: 1.0
-
-[ClickHouse] SHALL support revoking the **optimize** privilege to one or more users or roles
-for a database or a table using the `REVOKE OPTIMIZE` statement.
-
-##### RQ.SRS-006.RBAC.Revoke.Privilege.Show
-version: 1.0
-
-[ClickHouse] SHALL support revoking the **show** privilege to one or more users or roles
-for a database or a table using the `REVOKE SHOW` statement.
-
-##### RQ.SRS-006.RBAC.Revoke.Privilege.KillQuery
-version: 1.0
-
-[ClickHouse] SHALL support revoking the **kill query** privilege to one or more users or roles
-for a database or a table using the `REVOKE KILL QUERY` statement.
-
-##### RQ.SRS-006.RBAC.Revoke.Privilege.AccessManagement
-version: 1.0
-
-[ClickHouse] SHALL support revoking the **access management** privilege to one or more users or roles
-for a database or a table using the `REVOKE ACCESS MANAGEMENT` statement.
-
-##### RQ.SRS-006.RBAC.Revoke.Privilege.System
-version: 1.0
-
-[ClickHouse] SHALL support revoking the **system** privilege to one or more users or roles
-for a database or a table using the `REVOKE SYSTEM` statement.
-
-##### RQ.SRS-006.RBAC.Revoke.Privilege.Introspection
-version: 1.0
-
-[ClickHouse] SHALL support revoking the **introspection** privilege to one or more users or roles
-for a database or a table using the `REVOKE INTROSPECTION` statement.
-
-##### RQ.SRS-006.RBAC.Revoke.Privilege.Sources
-version: 1.0
-
-[ClickHouse] SHALL support revoking the **sources** privilege to one or more users or roles
-for a database or a table using the `REVOKE SOURCES` statement.
-
-##### RQ.SRS-006.RBAC.Revoke.Privilege.DictGet
-version: 1.0
-
-[ClickHouse] SHALL support revoking the **dictGet** privilege to one or more users or roles
-for a database or a table using the `REVOKE dictGet` statement.
-
-##### RQ.SRS-006.RBAC.Revoke.Privilege.PrivelegeColumns
-version: 1.0
-
-[ClickHouse] SHALL support revoking the privilege **some_privilege** to one or more users or roles
-for a database or a table using the `REVOKE some_privilege(column)` statement for one column.
-Multiple columns will be supported with `REVOKE some_privilege(column1, column2...)` statement.
-The privileges will be revoked for only the specified columns.
-
-##### RQ.SRS-006.RBAC.Revoke.Privilege.Multiple
-version: 1.0
-
-[ClickHouse] SHALL support revoking MULTIPLE **privileges** to one or more users or roles
-for a database or a table using the `REVOKE privilege1, privilege2...` statement.
-**privileges** refers to any set of Clickhouse defined privilege, whose hierarchy includes
-SELECT, INSERT, ALTER, CREATE, DROP, TRUNCATE, OPTIMIZE, SHOW, KILL QUERY, ACCESS MANAGEMENT,
-SYSTEM, INTROSPECTION, SOURCES, dictGet and all of their sub-privileges.
-
-##### RQ.SRS-006.RBAC.Revoke.Privilege.All
-version: 1.0
-
-[ClickHouse] SHALL support revoking **all** privileges to one or more users or roles
-for a database or a table using the `REVOKE ALL` or `REVOKE ALL PRIVILEGES` statements.
-
-##### RQ.SRS-006.RBAC.Revoke.Privilege.None
-version: 1.0
-
-[ClickHouse] SHALL support revoking **no** privileges to one or more users or roles
-for a database or a table using the `REVOKE NONE` statement.
-
-##### RQ.SRS-006.RBAC.Revoke.Privilege.On
-version: 1.0
-
-[ClickHouse] SHALL support the `ON` clause in the `REVOKE` privilege statement
-which SHALL allow to specify one or more tables to which the privilege SHALL
-be revoked using the following patterns
-
-* `db.table` specific table in the specified database
-* `db.*` any table in the specified database
-* `*.*` any table in any database
-* `table` specific table in the current database
-* `*` any table in the current database
-
-##### RQ.SRS-006.RBAC.Revoke.Privilege.From
-version: 1.0
-
-[ClickHouse] SHALL support the `FROM` clause in the `REVOKE` privilege statement
-which SHALL allow to specify one or more users to which the privilege SHALL
-be revoked using the following patterns
-
-* `{user | CURRENT_USER} [,...]` some combination of users by name, which may include the current user
-* `ALL` all users
-* `ALL EXCEPT {user | CURRENT_USER} [,...]` the logical reverse of the first pattern
-
-##### RQ.SRS-006.RBAC.Revoke.Privilege.Syntax
-version: 1.0
-
-[ClickHouse] SHALL support the following syntax for the `REVOKE` statement that
-revokes explicit privileges of a user or a role.
-
-```sql
-REVOKE [ON CLUSTER cluster_name] privilege
-    [(column_name [,...])] [,...]
-    ON {db.table|db.*|*.*|table|*}
-    FROM {user | CURRENT_USER} [,...] | ALL | ALL EXCEPT {user | CURRENT_USER} [,...]
-```
-
-##### RQ.SRS-006.RBAC.PartialRevoke.Syntax
+#### RQ.SRS-006.RBAC.PartialRevoke.Syntax
 version: 1.0
 
 [ClickHouse] SHALL support partial revokes by using `partial_revokes` variable
@@ -1846,102 +11340,22 @@ To enable partial revokes the `partial revokes` variable SHALL be set to `1`
 SET partial_revokes = 1
 ```
 
-##### RQ.SRS-006.RBAC.Grant.Role
+### Settings Profile
+
+#### RQ.SRS-006.RBAC.SettingsProfile
 version: 1.0
 
-[ClickHouse] SHALL support granting one or more roles to
-one or more users or roles using the `GRANT` role statement.
+[ClickHouse] SHALL support creation and manipulation of **settings profiles**
+that can include value definition for one or more variables and can
+can be assigned to one or more **users** or **roles**.
 
-##### RQ.SRS-006.RBAC.Grant.Role.CurrentUser
+#### RQ.SRS-006.RBAC.SettingsProfile.Constraints
 version: 1.0
 
-[ClickHouse] SHALL support granting one or more roles to current user using
-`TO CURRENT_USER` clause in the `GRANT` role statement.
+[ClickHouse] SHALL support assigning min, max and read-only constraints
+for the variables specified in the **settings profile**.
 
-##### RQ.SRS-006.RBAC.Grant.Role.AdminOption
-version: 1.0
-
-[ClickHouse] SHALL support granting `admin option` privilege
-to one or more users or roles using the `WITH ADMIN OPTION` clause
-in the `GRANT` role statement.
-
-##### RQ.SRS-006.RBAC.Grant.Role.OnCluster
-version: 1.0
-
-[ClickHouse] SHALL support specifying cluster on which the user is to be granted one or more roles
-using `ON CLUSTER` clause in the `GRANT` statement.
-
-##### RQ.SRS-006.RBAC.Grant.Role.Syntax
-version: 1.0
-
-[ClickHouse] SHALL support the following syntax for `GRANT` role statement
-
-``` sql
-GRANT
-    ON CLUSTER cluster_name
-    role [, role ...]
-    TO {user | role | CURRENT_USER} [,...]
-    [WITH ADMIN OPTION]
-```
-
-##### RQ.SRS-006.RBAC.Revoke.Role
-version: 1.0
-
-[ClickHouse] SHALL support revoking one or more roles from
-one or more users or roles using the `REVOKE` role statement.
-
-##### RQ.SRS-006.RBAC.Revoke.Role.Keywords
-version: 1.0
-
-[ClickHouse] SHALL support revoking one or more roles from
-special groupings of one or more users or roles with the `ALL`, `ALL EXCEPT`,
-and `CURRENT_USER` keywords.
-
-##### RQ.SRS-006.RBAC.Revoke.Role.Cluster
-version: 1.0
-
-[ClickHouse] SHALL support revoking one or more roles from
-one or more users or roles from one or more clusters
-using the `REVOKE ON CLUSTER` role statement.
-
-##### RQ.SRS-006.RBAC.Revoke.AdminOption
-version: 1.0
-
-[ClickHouse] SHALL support revoking `admin option` privilege
-in one or more users or roles using the `ADMIN OPTION FOR` clause
-in the `REVOKE` role statement.
-
-##### RQ.SRS-006.RBAC.Revoke.Role.Syntax
-version: 1.0
-
-[ClickHouse] SHALL support the following syntax for the `REVOKE` role statement
-
-```sql
-REVOKE [ON CLUSTER cluster_name] [ADMIN OPTION FOR]
-    role [,...]
-    FROM {user | role | CURRENT_USER} [,...] | ALL | ALL EXCEPT {user_name | role_name | CURRENT_USER} [,...]
-```
-
-##### RQ.SRS-006.RBAC.Show.Grants
-version: 1.0
-
-[ClickHouse] SHALL support listing all the privileges granted to current user and role
-using the `SHOW GRANTS` statement.
-
-##### RQ.SRS-006.RBAC.Show.Grants.For
-version: 1.0
-
-[ClickHouse] SHALL support listing all the privileges granted to a user or a role
-using the `FOR` clause in the `SHOW GRANTS` statement.
-
-##### RQ.SRS-006.RBAC.Show.Grants.Syntax
-version: 1.0
-
-[Clickhouse] SHALL use the following syntax for the `SHOW GRANTS` statement
-
-``` sql
-SHOW GRANTS [FOR user_or_role]
-```
+#### Create Settings Profile
 
 ##### RQ.SRS-006.RBAC.SettingsProfile.Create
 version: 1.0
@@ -2027,6 +11441,8 @@ CREATE SETTINGS PROFILE [IF NOT EXISTS | OR REPLACE] name
     [TO {user_or_role [,...] | NONE | ALL | ALL EXCEPT user_or_role [,...]}]
 ```
 
+#### Alter Settings Profile
+
 ##### RQ.SRS-006.RBAC.SettingsProfile.Alter
 version: 1.0
 
@@ -2112,6 +11528,8 @@ ALTER SETTINGS PROFILE [IF EXISTS] name
     [TO {user_or_role [,...] | NONE | ALL | ALL EXCEPT user_or_role [,...]]}
 ```
 
+#### Drop Settings Profile
+
 ##### RQ.SRS-006.RBAC.SettingsProfile.Drop
 version: 1.0
 
@@ -2140,6 +11558,8 @@ version: 1.0
 DROP SETTINGS PROFILE [IF EXISTS] name [,name,...]
 ```
 
+#### Show Create Settings Profile
+
 ##### RQ.SRS-006.RBAC.SettingsProfile.ShowCreateSettingsProfile
 version: 1.0
 
@@ -2150,6 +11570,63 @@ using the `SHOW CREATE SETTINGS PROFILE` statement with the following syntax
 SHOW CREATE SETTINGS PROFILE name
 ```
 
+### Quotas
+
+#### RQ.SRS-006.RBAC.Quotas
+version: 1.0
+
+[ClickHouse] SHALL support creation and manipulation of **quotas**
+that can be used to limit resource usage by a **user** or a **role**
+over a period of time.
+
+#### RQ.SRS-006.RBAC.Quotas.Keyed
+version: 1.0
+
+[ClickHouse] SHALL support creating **quotas** that are keyed
+so that a quota is tracked separately for each key value.
+
+#### RQ.SRS-006.RBAC.Quotas.Queries
+version: 1.0
+
+[ClickHouse] SHALL support setting **queries** quota to limit the total number of requests.
+
+#### RQ.SRS-006.RBAC.Quotas.Errors
+version: 1.0
+
+[ClickHouse] SHALL support setting **errors** quota to limit the number of queries that threw an exception.
+
+#### RQ.SRS-006.RBAC.Quotas.ResultRows
+version: 1.0
+
+[ClickHouse] SHALL support setting **result rows** quota to limit the
+the total number of rows given as the result.
+
+#### RQ.SRS-006.RBAC.Quotas.ReadRows
+version: 1.0
+
+[ClickHouse] SHALL support setting **read rows** quota to limit the total
+number of source rows read from tables for running the query on all remote servers.
+
+#### RQ.SRS-006.RBAC.Quotas.ResultBytes
+version: 1.0
+
+[ClickHouse] SHALL support setting **result bytes** quota to limit the total number
+of bytes that can be returned as the result.
+
+#### RQ.SRS-006.RBAC.Quotas.ReadBytes
+version: 1.0
+
+[ClickHouse] SHALL support setting **read bytes** quota to limit the total number
+of source bytes read from tables for running the query on all remote servers.
+
+#### RQ.SRS-006.RBAC.Quotas.ExecutionTime
+version: 1.0
+
+[ClickHouse] SHALL support setting **execution time** quota to limit the maximum
+query execution time.
+
+#### Create Quotas
+
 ##### RQ.SRS-006.RBAC.Quota.Create
 version: 1.0
 
@@ -2188,7 +11665,6 @@ of `{SECOND | MINUTE | HOUR | DAY | MONTH}`. Thus, the complete syntax SHALL be:
 `FOR INTERVAL number {SECOND | MINUTE | HOUR | DAY}` where number is some real number
 to define the interval.
 
-
 ##### RQ.SRS-006.RBAC.Quota.Create.Interval.Randomized
 version: 1.0
 
@@ -2311,6 +11787,8 @@ CREATE QUOTA [IF NOT EXISTS | OR REPLACE] name [ON CLUSTER cluster_name]
     [TO {role [,...] | ALL | ALL EXCEPT role [,...]}]
 ```
 
+#### Alter Quota
+
 ##### RQ.SRS-006.RBAC.Quota.Alter
 version: 1.0
 
@@ -2469,6 +11947,8 @@ ALTER QUOTA [IF EXIST] name
     [TO {user_or_role [,...] | NONE | ALL} [EXCEPT user_or_role [,...]]]
 ```
 
+#### Drop Quota
+
 ##### RQ.SRS-006.RBAC.Quota.Drop
 version: 1.0
 
@@ -2497,6 +11977,8 @@ version: 1.0
 DROP QUOTA [IF EXISTS] name [,name...]
 ```
 
+#### Show Quotas
+
 ##### RQ.SRS-006.RBAC.Quota.ShowQuotas
 version: 1.0
 
@@ -2521,7 +12003,6 @@ version: 1.0
 
 [ClickHouse] SHALL support the `SETTINGS` clause in the `SHOW QUOTAS` statement to define settings in the showing of all quotas.
 
-
 ##### RQ.SRS-006.RBAC.Quota.ShowQuotas.Syntax
 version: 1.0
 
@@ -2530,6 +12011,9 @@ with the following syntax
 ``` sql
 SHOW QUOTAS
 ```
+
+#### Show Create Quota
+
 ##### RQ.SRS-006.RBAC.Quota.ShowCreateQuota.Name
 version: 1.0
 
@@ -2557,6 +12041,34 @@ using the `SHOW CREATE QUOTA` statement.
 SHOW CREATE QUOTA [name | CURRENT]
 ```
 
+### Row Policy
+
+#### RQ.SRS-006.RBAC.RowPolicy
+version: 1.0
+
+[ClickHouse] SHALL support creation and manipulation of table **row policies**
+that can be used to limit access to the table contents for a **user** or a **role**
+using a specified **condition**.
+
+#### RQ.SRS-006.RBAC.RowPolicy.Condition
+version: 1.0
+
+[ClickHouse] SHALL support row policy **conditions** that can be any SQL
+expression that returns a boolean.
+
+#### RQ.SRS-006.RBAC.RowPolicy.Restriction
+version: 1.0
+
+[ClickHouse] SHALL restrict all access to a table when a row policy with a condition is created on that table.
+All users require a permissive row policy in order to view the table.
+
+#### RQ.SRS-006.RBAC.RowPolicy.Nesting
+version: 1.0
+
+[ClickHouse] SHALL restrict rows of tables or views created on top of a table with row policies according to those policies.
+
+#### Create Row Policy
+
 ##### RQ.SRS-006.RBAC.RowPolicy.Create
 version: 1.0
 
@@ -2611,14 +12123,14 @@ version: 1.0
 
 [ClickHouse] SHALL support specifying which rows are affected
 using the `FOR SELECT` clause in the `CREATE ROW POLICY` statement.
-REQUIRES CONFIRMATION
+REQUIRES CONDITION.
 
 ##### RQ.SRS-006.RBAC.RowPolicy.Create.Condition
 version: 1.0
 
 [ClickHouse] SHALL support specifying a condition that
 that can be any SQL expression which returns a boolean using the `USING`
-clause in the `CREATE ROW POLOCY` statement.
+clause in the `CREATE ROW POLICY` statement.
 
 ##### RQ.SRS-006.RBAC.RowPolicy.Create.Assignment
 version: 1.0
@@ -2657,6 +12169,8 @@ CREATE [ROW] POLICY [IF NOT EXISTS | OR REPLACE] policy_name [ON CLUSTER cluster
     [TO {role [,...] | ALL | ALL EXCEPT role [,...]}]
 ```
 
+#### Alter Row Policy
+
 ##### RQ.SRS-006.RBAC.RowPolicy.Alter
 version: 1.0
 
@@ -2763,6 +12277,8 @@ ALTER [ROW] POLICY [IF EXISTS] name [ON CLUSTER cluster_name] ON [database.]tabl
     [TO {role [,...] | ALL | ALL EXCEPT role [,...]}]
 ```
 
+#### Drop Row Policy
+
 ##### RQ.SRS-006.RBAC.RowPolicy.Drop
 version: 1.0
 
@@ -2797,6 +12313,8 @@ version: 1.0
 DROP [ROW] POLICY [IF EXISTS] name [,...] ON [database.]table [,...] [ON CLUSTER cluster_name]
 ```
 
+#### Show Create Row Policy
+
 ##### RQ.SRS-006.RBAC.RowPolicy.ShowCreateRowPolicy
 version: 1.0
 
@@ -2838,9 +12356,510 @@ version: 1.0
 SHOW [ROW] POLICIES [ON [database.]table]
 ```
 
-#### Table Privileges
+### Set Default Role
 
-##### RQ.SRS-006.RBAC.Table.PublicTables
+#### RQ.SRS-006.RBAC.SetDefaultRole
+version: 1.0
+
+[ClickHouse] SHALL support setting or changing granted roles to default for one or more
+users using `SET DEFAULT ROLE` statement which
+SHALL permanently change the default roles for the user or users if successful.
+
+#### RQ.SRS-006.RBAC.SetDefaultRole.CurrentUser
+version: 1.0
+
+[ClickHouse] SHALL support setting or changing granted roles to default for
+the current user using `CURRENT_USER` clause in the `SET DEFAULT ROLE` statement.
+
+#### RQ.SRS-006.RBAC.SetDefaultRole.All
+version: 1.0
+
+[ClickHouse] SHALL support setting or changing all granted roles to default
+for one or more users using `ALL` clause in the `SET DEFAULT ROLE` statement.
+
+#### RQ.SRS-006.RBAC.SetDefaultRole.AllExcept
+version: 1.0
+
+[ClickHouse] SHALL support setting or changing all granted roles except those specified
+to default for one or more users using `ALL EXCEPT` clause in the `SET DEFAULT ROLE` statement.
+
+#### RQ.SRS-006.RBAC.SetDefaultRole.None
+version: 1.0
+
+[ClickHouse] SHALL support removing all granted roles from default
+for one or more users using `NONE` clause in the `SET DEFAULT ROLE` statement.
+
+#### RQ.SRS-006.RBAC.SetDefaultRole.Syntax
+version: 1.0
+
+[ClickHouse] SHALL support the following syntax for the `SET DEFAULT ROLE` statement.
+
+```sql
+SET DEFAULT ROLE
+    {NONE | role [,...] | ALL | ALL EXCEPT role [,...]}
+    TO {user|CURRENT_USER} [,...]
+
+```
+
+### Set Role
+
+#### RQ.SRS-006.RBAC.SetRole
+version: 1.0
+
+[ClickHouse] SHALL support activating role or roles for the current user
+using `SET ROLE` statement.
+
+#### RQ.SRS-006.RBAC.SetRole.Default
+version: 1.0
+
+[ClickHouse] SHALL support activating default roles for the current user
+using `DEFAULT` clause in the `SET ROLE` statement.
+
+#### RQ.SRS-006.RBAC.SetRole.None
+version: 1.0
+
+[ClickHouse] SHALL support activating no roles for the current user
+using `NONE` clause in the `SET ROLE` statement.
+
+#### RQ.SRS-006.RBAC.SetRole.All
+version: 1.0
+
+[ClickHouse] SHALL support activating all roles for the current user
+using `ALL` clause in the `SET ROLE` statement.
+
+#### RQ.SRS-006.RBAC.SetRole.AllExcept
+version: 1.0
+
+[ClickHouse] SHALL support activating all roles except those specified
+for the current user using `ALL EXCEPT` clause in the `SET ROLE` statement.
+
+#### RQ.SRS-006.RBAC.SetRole.Syntax
+version: 1.0
+
+```sql
+SET ROLE {DEFAULT | NONE | role [,...] | ALL | ALL EXCEPT role [,...]}
+```
+
+### Grant
+
+#### RQ.SRS-006.RBAC.Grant.Privilege.To
+version: 1.0
+
+[ClickHouse] SHALL support granting privileges to one or more users or roles using `TO` clause
+in the `GRANT PRIVILEGE` statement.
+
+#### RQ.SRS-006.RBAC.Grant.Privilege.ToCurrentUser
+version: 1.0
+
+[ClickHouse] SHALL support granting privileges to current user using `TO CURRENT_USER` clause
+in the `GRANT PRIVILEGE` statement.
+
+#### RQ.SRS-006.RBAC.Grant.Privilege.Select
+version: 1.0
+
+[ClickHouse] SHALL support granting the **select** privilege to one or more users or roles
+for a database or a table using the `GRANT SELECT` statement.
+
+#### RQ.SRS-006.RBAC.Grant.Privilege.Insert
+version: 1.0
+
+[ClickHouse] SHALL support granting the **insert** privilege to one or more users or roles
+for a database or a table using the `GRANT INSERT` statement.
+
+#### RQ.SRS-006.RBAC.Grant.Privilege.Alter
+version: 1.0
+
+[ClickHouse] SHALL support granting the **alter** privilege to one or more users or roles
+for a database or a table using the `GRANT ALTER` statement.
+
+#### RQ.SRS-006.RBAC.Grant.Privilege.Create
+version: 1.0
+
+[ClickHouse] SHALL support granting the **create** privilege to one or more users or roles
+using the `GRANT CREATE` statement.
+
+#### RQ.SRS-006.RBAC.Grant.Privilege.Drop
+version: 1.0
+
+[ClickHouse] SHALL support granting the **drop** privilege to one or more users or roles
+using the `GRANT DROP` statement.
+
+#### RQ.SRS-006.RBAC.Grant.Privilege.Truncate
+version: 1.0
+
+[ClickHouse] SHALL support granting the **truncate** privilege to one or more users or roles
+for a database or a table using `GRANT TRUNCATE` statement.
+
+#### RQ.SRS-006.RBAC.Grant.Privilege.Optimize
+version: 1.0
+
+[ClickHouse] SHALL support granting the **optimize** privilege to one or more users or roles
+for a database or a table using `GRANT OPTIMIZE` statement.
+
+#### RQ.SRS-006.RBAC.Grant.Privilege.Show
+version: 1.0
+
+[ClickHouse] SHALL support granting the **show** privilege to one or more users or roles
+for a database or a table using `GRANT SHOW` statement.
+
+#### RQ.SRS-006.RBAC.Grant.Privilege.KillQuery
+version: 1.0
+
+[ClickHouse] SHALL support granting the **kill query** privilege to one or more users or roles
+for a database or a table using `GRANT KILL QUERY` statement.
+
+#### RQ.SRS-006.RBAC.Grant.Privilege.AccessManagement
+version: 1.0
+
+[ClickHouse] SHALL support granting the **access management** privileges to one or more users or roles
+for a database or a table using `GRANT ACCESS MANAGEMENT` statement.
+
+#### RQ.SRS-006.RBAC.Grant.Privilege.System
+version: 1.0
+
+[ClickHouse] SHALL support granting the **system** privileges to one or more users or roles
+for a database or a table using `GRANT SYSTEM` statement.
+
+#### RQ.SRS-006.RBAC.Grant.Privilege.Introspection
+version: 1.0
+
+[ClickHouse] SHALL support granting the **introspection** privileges to one or more users or roles
+for a database or a table using `GRANT INTROSPECTION` statement.
+
+#### RQ.SRS-006.RBAC.Grant.Privilege.Sources
+version: 1.0
+
+[ClickHouse] SHALL support granting the **sources** privileges to one or more users or roles
+for a database or a table using `GRANT SOURCES` statement.
+
+#### RQ.SRS-006.RBAC.Grant.Privilege.DictGet
+version: 1.0
+
+[ClickHouse] SHALL support granting the **dictGet** privilege to one or more users or roles
+for a database or a table using `GRANT dictGet` statement.
+
+#### RQ.SRS-006.RBAC.Grant.Privilege.None
+version: 1.0
+
+[ClickHouse] SHALL support granting no privileges to one or more users or roles
+for a database or a table using `GRANT NONE` statement.
+
+#### RQ.SRS-006.RBAC.Grant.Privilege.All
+version: 1.0
+
+[ClickHouse] SHALL support granting the **all** privileges to one or more users or roles
+using the `GRANT ALL` or `GRANT ALL PRIVILEGES` statements.
+
+#### RQ.SRS-006.RBAC.Grant.Privilege.GrantOption
+version: 1.0
+
+[ClickHouse] SHALL support granting the **grant option** privilege to one or more users or roles
+for a database or a table using the `WITH GRANT OPTION` clause in the `GRANT` statement.
+
+#### RQ.SRS-006.RBAC.Grant.Privilege.On
+version: 1.0
+
+[ClickHouse] SHALL support the `ON` clause in the `GRANT` privilege statement
+which SHALL allow to specify one or more tables to which the privilege SHALL
+be granted using the following patterns
+
+* `*.*` any table in any database
+* `database.*` any table in the specified database
+* `database.table` specific table in the specified database
+* `*` any table in the current database
+* `table` specific table in the current database
+
+#### RQ.SRS-006.RBAC.Grant.Privilege.PrivilegeColumns
+version: 1.0
+
+[ClickHouse] SHALL support granting the privilege **some_privilege** to one or more users or roles
+for a database or a table using the `GRANT some_privilege(column)` statement for one column.
+Multiple columns will be supported with `GRANT some_privilege(column1, column2...)` statement.
+The privileges will be granted for only the specified columns.
+
+#### RQ.SRS-006.RBAC.Grant.Privilege.OnCluster
+version: 1.0
+
+[ClickHouse] SHALL support specifying cluster on which to grant privileges using the `ON CLUSTER`
+clause in the `GRANT PRIVILEGE` statement.
+
+#### RQ.SRS-006.RBAC.Grant.Privilege.Syntax
+version: 1.0
+
+[ClickHouse] SHALL support the following syntax for the `GRANT` statement that
+grants explicit privileges to a user or a role.
+
+```sql
+GRANT [ON CLUSTER cluster_name] privilege[(column_name [,...])] [,...]
+    ON {db.table|db.*|*.*|table|*}
+    TO {user | role | CURRENT_USER} [,...]
+    [WITH GRANT OPTION]
+```
+
+### Revoke
+
+#### RQ.SRS-006.RBAC.Revoke.Privilege.Cluster
+version: 1.0
+
+[ClickHouse] SHALL support revoking privileges to one or more users or roles
+for a database or a table on some specific cluster using the `REVOKE ON CLUSTER cluster_name` statement.
+
+#### RQ.SRS-006.RBAC.Revoke.Privilege.Select
+version: 1.0
+
+[ClickHouse] SHALL support revoking the **select** privilege to one or more users or roles
+for a database or a table using the `REVOKE SELECT` statement.
+
+#### RQ.SRS-006.RBAC.Revoke.Privilege.Insert
+version: 1.0
+
+[ClickHouse] SHALL support revoking the **insert** privilege to one or more users or roles
+for a database or a table using the `REVOKE INSERT` statement.
+
+#### RQ.SRS-006.RBAC.Revoke.Privilege.Alter
+version: 1.0
+
+[ClickHouse] SHALL support revoking the **alter** privilege to one or more users or roles
+for a database or a table using the `REVOKE ALTER` statement.
+
+#### RQ.SRS-006.RBAC.Revoke.Privilege.Create
+version: 1.0
+
+[ClickHouse] SHALL support revoking the **create** privilege to one or more users or roles
+using the `REVOKE CREATE` statement.
+
+#### RQ.SRS-006.RBAC.Revoke.Privilege.Drop
+version: 1.0
+
+[ClickHouse] SHALL support revoking the **drop** privilege to one or more users or roles
+using the `REVOKE DROP` statement.
+
+#### RQ.SRS-006.RBAC.Revoke.Privilege.Truncate
+version: 1.0
+
+[ClickHouse] SHALL support revoking the **truncate** privilege to one or more users or roles
+for a database or a table using the `REVOKE TRUNCATE` statement.
+
+#### RQ.SRS-006.RBAC.Revoke.Privilege.Optimize
+version: 1.0
+
+[ClickHouse] SHALL support revoking the **optimize** privilege to one or more users or roles
+for a database or a table using the `REVOKE OPTIMIZE` statement.
+
+#### RQ.SRS-006.RBAC.Revoke.Privilege.Show
+version: 1.0
+
+[ClickHouse] SHALL support revoking the **show** privilege to one or more users or roles
+for a database or a table using the `REVOKE SHOW` statement.
+
+#### RQ.SRS-006.RBAC.Revoke.Privilege.KillQuery
+version: 1.0
+
+[ClickHouse] SHALL support revoking the **kill query** privilege to one or more users or roles
+for a database or a table using the `REVOKE KILL QUERY` statement.
+
+#### RQ.SRS-006.RBAC.Revoke.Privilege.AccessManagement
+version: 1.0
+
+[ClickHouse] SHALL support revoking the **access management** privilege to one or more users or roles
+for a database or a table using the `REVOKE ACCESS MANAGEMENT` statement.
+
+#### RQ.SRS-006.RBAC.Revoke.Privilege.System
+version: 1.0
+
+[ClickHouse] SHALL support revoking the **system** privilege to one or more users or roles
+for a database or a table using the `REVOKE SYSTEM` statement.
+
+#### RQ.SRS-006.RBAC.Revoke.Privilege.Introspection
+version: 1.0
+
+[ClickHouse] SHALL support revoking the **introspection** privilege to one or more users or roles
+for a database or a table using the `REVOKE INTROSPECTION` statement.
+
+#### RQ.SRS-006.RBAC.Revoke.Privilege.Sources
+version: 1.0
+
+[ClickHouse] SHALL support revoking the **sources** privilege to one or more users or roles
+for a database or a table using the `REVOKE SOURCES` statement.
+
+#### RQ.SRS-006.RBAC.Revoke.Privilege.DictGet
+version: 1.0
+
+[ClickHouse] SHALL support revoking the **dictGet** privilege to one or more users or roles
+for a database or a table using the `REVOKE dictGet` statement.
+
+#### RQ.SRS-006.RBAC.Revoke.Privilege.PrivilegeColumns
+version: 1.0
+
+[ClickHouse] SHALL support revoking the privilege **some_privilege** to one or more users or roles
+for a database or a table using the `REVOKE some_privilege(column)` statement for one column.
+Multiple columns will be supported with `REVOKE some_privilege(column1, column2...)` statement.
+The privileges will be revoked for only the specified columns.
+
+#### RQ.SRS-006.RBAC.Revoke.Privilege.Multiple
+version: 1.0
+
+[ClickHouse] SHALL support revoking MULTIPLE **privileges** to one or more users or roles
+for a database or a table using the `REVOKE privilege1, privilege2...` statement.
+**privileges** refers to any set of Clickhouse defined privilege, whose hierarchy includes
+SELECT, INSERT, ALTER, CREATE, DROP, TRUNCATE, OPTIMIZE, SHOW, KILL QUERY, ACCESS MANAGEMENT,
+SYSTEM, INTROSPECTION, SOURCES, dictGet and all of their sub-privileges.
+
+#### RQ.SRS-006.RBAC.Revoke.Privilege.All
+version: 1.0
+
+[ClickHouse] SHALL support revoking **all** privileges to one or more users or roles
+for a database or a table using the `REVOKE ALL` or `REVOKE ALL PRIVILEGES` statements.
+
+#### RQ.SRS-006.RBAC.Revoke.Privilege.None
+version: 1.0
+
+[ClickHouse] SHALL support revoking **no** privileges to one or more users or roles
+for a database or a table using the `REVOKE NONE` statement.
+
+#### RQ.SRS-006.RBAC.Revoke.Privilege.On
+version: 1.0
+
+[ClickHouse] SHALL support the `ON` clause in the `REVOKE` privilege statement
+which SHALL allow to specify one or more tables to which the privilege SHALL
+be revoked using the following patterns
+
+* `db.table` specific table in the specified database
+* `db.*` any table in the specified database
+* `*.*` any table in any database
+* `table` specific table in the current database
+* `*` any table in the current database
+
+#### RQ.SRS-006.RBAC.Revoke.Privilege.From
+version: 1.0
+
+[ClickHouse] SHALL support the `FROM` clause in the `REVOKE` privilege statement
+which SHALL allow to specify one or more users to which the privilege SHALL
+be revoked using the following patterns
+
+* `{user | CURRENT_USER} [,...]` some combination of users by name, which may include the current user
+* `ALL` all users
+* `ALL EXCEPT {user | CURRENT_USER} [,...]` the logical reverse of the first pattern
+
+#### RQ.SRS-006.RBAC.Revoke.Privilege.Syntax
+version: 1.0
+
+[ClickHouse] SHALL support the following syntax for the `REVOKE` statement that
+revokes explicit privileges of a user or a role.
+
+```sql
+REVOKE [ON CLUSTER cluster_name] privilege
+    [(column_name [,...])] [,...]
+    ON {db.table|db.*|*.*|table|*}
+    FROM {user | CURRENT_USER} [,...] | ALL | ALL EXCEPT {user | CURRENT_USER} [,...]
+```
+
+### Grant Role
+
+#### RQ.SRS-006.RBAC.Grant.Role
+version: 1.0
+
+[ClickHouse] SHALL support granting one or more roles to
+one or more users or roles using the `GRANT` role statement.
+
+#### RQ.SRS-006.RBAC.Grant.Role.CurrentUser
+version: 1.0
+
+[ClickHouse] SHALL support granting one or more roles to current user using
+`TO CURRENT_USER` clause in the `GRANT` role statement.
+
+#### RQ.SRS-006.RBAC.Grant.Role.AdminOption
+version: 1.0
+
+[ClickHouse] SHALL support granting `admin option` privilege
+to one or more users or roles using the `WITH ADMIN OPTION` clause
+in the `GRANT` role statement.
+
+#### RQ.SRS-006.RBAC.Grant.Role.OnCluster
+version: 1.0
+
+[ClickHouse] SHALL support specifying cluster on which the user is to be granted one or more roles
+using `ON CLUSTER` clause in the `GRANT` statement.
+
+#### RQ.SRS-006.RBAC.Grant.Role.Syntax
+version: 1.0
+
+[ClickHouse] SHALL support the following syntax for `GRANT` role statement
+
+``` sql
+GRANT
+    ON CLUSTER cluster_name
+    role [, role ...]
+    TO {user | role | CURRENT_USER} [,...]
+    [WITH ADMIN OPTION]
+```
+
+### Revoke Role
+
+#### RQ.SRS-006.RBAC.Revoke.Role
+version: 1.0
+
+[ClickHouse] SHALL support revoking one or more roles from
+one or more users or roles using the `REVOKE` role statement.
+
+#### RQ.SRS-006.RBAC.Revoke.Role.Keywords
+version: 1.0
+
+[ClickHouse] SHALL support revoking one or more roles from
+special groupings of one or more users or roles with the `ALL`, `ALL EXCEPT`,
+and `CURRENT_USER` keywords.
+
+#### RQ.SRS-006.RBAC.Revoke.Role.Cluster
+version: 1.0
+
+[ClickHouse] SHALL support revoking one or more roles from
+one or more users or roles from one or more clusters
+using the `REVOKE ON CLUSTER` role statement.
+
+#### RQ.SRS-006.RBAC.Revoke.AdminOption
+version: 1.0
+
+[ClickHouse] SHALL support revoking `admin option` privilege
+in one or more users or roles using the `ADMIN OPTION FOR` clause
+in the `REVOKE` role statement.
+
+#### RQ.SRS-006.RBAC.Revoke.Role.Syntax
+version: 1.0
+
+[ClickHouse] SHALL support the following syntax for the `REVOKE` role statement
+
+```sql
+REVOKE [ON CLUSTER cluster_name] [ADMIN OPTION FOR]
+    role [,...]
+    FROM {user | role | CURRENT_USER} [,...] | ALL | ALL EXCEPT {user_name | role_name | CURRENT_USER} [,...]
+```
+
+### Show Grants
+
+#### RQ.SRS-006.RBAC.Show.Grants
+version: 1.0
+
+[ClickHouse] SHALL support listing all the privileges granted to current user and role
+using the `SHOW GRANTS` statement.
+
+#### RQ.SRS-006.RBAC.Show.Grants.For
+version: 1.0
+
+[ClickHouse] SHALL support listing all the privileges granted to a user or a role
+using the `FOR` clause in the `SHOW GRANTS` statement.
+
+#### RQ.SRS-006.RBAC.Show.Grants.Syntax
+version: 1.0
+
+[Clickhouse] SHALL use the following syntax for the `SHOW GRANTS` statement
+
+``` sql
+SHOW GRANTS [FOR user_or_role]
+```
+
+### Table Privileges
+
+#### RQ.SRS-006.RBAC.Table.PublicTables
 version: 1.0
 
 [ClickHouse] SHALL support that a user without any privileges will be able to access the following tables
@@ -2850,7 +12869,7 @@ version: 1.0
 * system.contributors
 * system.functions
 
-##### RQ.SRS-006.RBAC.Table.SensitiveTables
+#### RQ.SRS-006.RBAC.Table.SensitiveTables
 version: 1.0
 
 [ClickHouse] SHALL not support a user with no privileges accessing the following `system` tables:
@@ -2867,15 +12886,15 @@ version: 1.0
 * zookeeper
 * macros
 
-#### Distributed Tables
+### Distributed Tables
 
-##### RQ.SRS-006.RBAC.DistributedTable.Create
+#### RQ.SRS-006.RBAC.DistributedTable.Create
 version: 1.0
 
 [ClickHouse] SHALL successfully `CREATE` a distributed table if and only if
 the user has **create table** privilege on the table and **remote** privilege on *.*
 
-##### RQ.SRS-006.RBAC.DistributedTable.Select
+#### RQ.SRS-006.RBAC.DistributedTable.Select
 version: 1.0
 
 [ClickHouse] SHALL successfully `SELECT` from a distributed table if and only if
@@ -2883,7 +12902,7 @@ the user has **select** privilege on the table and on the remote table specified
 
 Does not require **select** privilege for the remote table if the remote table does not exist on the same server as the user.
 
-##### RQ.SRS-006.RBAC.DistributedTable.Insert
+#### RQ.SRS-006.RBAC.DistributedTable.Insert
 version: 1.0
 
 [ClickHouse] SHALL successfully `INSERT` into a distributed table if and only if
@@ -2892,7 +12911,7 @@ the user has **insert** privilege on the table and on the remote table specified
 Does not require **insert** privilege for the remote table if the remote table does not exist on the same server as the user,
 insert executes into the remote table on a different server.
 
-##### RQ.SRS-006.RBAC.DistributedTable.SpecialTables
+#### RQ.SRS-006.RBAC.DistributedTable.SpecialTables
 version: 1.0
 
 [ClickHouse] SHALL successfully execute a query using a distributed table that uses one of the special tables if and only if
@@ -2902,29 +12921,29 @@ Special tables include:
 * distributed table
 * source table of a materialized view
 
-##### RQ.SRS-006.RBAC.DistributedTable.LocalUser
+#### RQ.SRS-006.RBAC.DistributedTable.LocalUser
 version: 1.0
 
 [ClickHouse] SHALL successfully execute a query using a distributed table from
 a user present locally, but not remotely.
 
-##### RQ.SRS-006.RBAC.DistributedTable.SameUserDifferentNodesDifferentPrivileges
+#### RQ.SRS-006.RBAC.DistributedTable.SameUserDifferentNodesDifferentPrivileges
 version: 1.0
 
 [ClickHouse] SHALL successfully execute a query using a distributed table by a user that exists on multiple nodes
 if and only if the user has the required privileges on the node the query is being executed from.
 
-#### Views
+### Views
 
-##### View
+#### View
 
-###### RQ.SRS-006.RBAC.View
+##### RQ.SRS-006.RBAC.View
 version: 1.0
 
 [ClickHouse] SHALL support controlling access to **create**, **select** and **drop**
 privileges for a view for users or roles.
 
-###### RQ.SRS-006.RBAC.View.Create
+##### RQ.SRS-006.RBAC.View.Create
 version: 1.0
 
 [ClickHouse] SHALL only successfully execute a `CREATE VIEW` command if and only if
@@ -2942,7 +12961,7 @@ CREATE VIEW view AS SELECT column FROM table0 JOIN table1 USING column UNION ALL
 CREATE VIEW view0 AS SELECT column FROM view1 UNION ALL SELECT column FROM view2
 ```
 
-###### RQ.SRS-006.RBAC.View.Select
+##### RQ.SRS-006.RBAC.View.Select
 version: 1.0
 
 [ClickHouse] SHALL only successfully `SELECT` from a view if and only if
@@ -2962,21 +12981,21 @@ CREATE VIEW view0 AS SELECT column FROM view1 UNION ALL SELECT column FROM view2
 SELECT * FROM view
 ```
 
-###### RQ.SRS-006.RBAC.View.Drop
+##### RQ.SRS-006.RBAC.View.Drop
 version: 1.0
 
 [ClickHouse] SHALL only successfully execute a `DROP VIEW` command if and only if
 the user has **drop view** privilege on that view either explicitly or through a role.
 
-##### Materialized View
+#### Materialized View
 
-###### RQ.SRS-006.RBAC.MaterializedView
+##### RQ.SRS-006.RBAC.MaterializedView
 version: 1.0
 
 [ClickHouse] SHALL support controlling access to **create**, **select**, **alter** and **drop**
 privileges for a materialized view for users or roles.
 
-###### RQ.SRS-006.RBAC.MaterializedView.Create
+##### RQ.SRS-006.RBAC.MaterializedView.Create
 version: 1.0
 
 [ClickHouse] SHALL only successfully execute a `CREATE MATERIALIZED VIEW` command if and only if
@@ -3008,7 +13027,7 @@ For example,
 CREATE MATERIALIZED VIEW view TO target_table AS SELECT * FROM source_table
 ```
 
-###### RQ.SRS-006.RBAC.MaterializedView.Select
+##### RQ.SRS-006.RBAC.MaterializedView.Select
 version: 1.0
 
 [ClickHouse] SHALL only successfully `SELECT` from a materialized view if and only if
@@ -3028,25 +13047,25 @@ CREATE MATERIALIZED VIEW view0 ENGINE = Memory AS SELECT column FROM view1 UNION
 SELECT * FROM view
 ```
 
-###### RQ.SRS-006.RBAC.MaterializedView.Select.TargetTable
+##### RQ.SRS-006.RBAC.MaterializedView.Select.TargetTable
 version: 1.0
 
 [ClickHouse] SHALL only successfully `SELECT` from the target table, implicit or explicit, of a materialized view if and only if
 the user has `SELECT` privilege for the table, either explicitly or through a role.
 
-###### RQ.SRS-006.RBAC.MaterializedView.Select.SourceTable
+##### RQ.SRS-006.RBAC.MaterializedView.Select.SourceTable
 version: 1.0
 
 [ClickHouse] SHALL only successfully `SELECT` from the source table of a materialized view if and only if
 the user has `SELECT` privilege for the table, either explicitly or through a role.
 
-###### RQ.SRS-006.RBAC.MaterializedView.Drop
+##### RQ.SRS-006.RBAC.MaterializedView.Drop
 version: 1.0
 
 [ClickHouse] SHALL only successfully execute a `DROP VIEW` command if and only if
 the user has **drop view** privilege on that view either explicitly or through a role.
 
-###### RQ.SRS-006.RBAC.MaterializedView.ModifyQuery
+##### RQ.SRS-006.RBAC.MaterializedView.ModifyQuery
 version: 1.0
 
 [ClickHouse] SHALL only successfully execute a `MODIFY QUERY` command if and only if
@@ -3059,33 +13078,33 @@ For example,
 ALTER TABLE view MODIFY QUERY SELECT * FROM source_table
 ```
 
-###### RQ.SRS-006.RBAC.MaterializedView.Insert
+##### RQ.SRS-006.RBAC.MaterializedView.Insert
 version: 1.0
 
 [ClickHouse] SHALL only succesfully `INSERT` into a materialized view if and only if
 the user has `INSERT` privilege on the view, either explicitly or through a role.
 
-###### RQ.SRS-006.RBAC.MaterializedView.Insert.SourceTable
+##### RQ.SRS-006.RBAC.MaterializedView.Insert.SourceTable
 version: 1.0
 
 [ClickHouse] SHALL only succesfully `INSERT` into a source table of a materialized view if and only if
 the user has `INSERT` privilege on the source table, either explicitly or through a role.
 
-###### RQ.SRS-006.RBAC.MaterializedView.Insert.TargetTable
+##### RQ.SRS-006.RBAC.MaterializedView.Insert.TargetTable
 version: 1.0
 
 [ClickHouse] SHALL only succesfully `INSERT` into a target table of a materialized view if and only if
 the user has `INSERT` privelege on the target table, either explicitly or through a role.
 
-##### Live View
+#### Live View
 
-###### RQ.SRS-006.RBAC.LiveView
+##### RQ.SRS-006.RBAC.LiveView
 version: 1.0
 
 [ClickHouse] SHALL support controlling access to **create**, **select**, **alter** and **drop**
 privileges for a live view for users or roles.
 
-###### RQ.SRS-006.RBAC.LiveView.Create
+##### RQ.SRS-006.RBAC.LiveView.Create
 version: 1.0
 
 [ClickHouse] SHALL only successfully execute a `CREATE LIVE VIEW` command if and only if
@@ -3103,7 +13122,7 @@ CREATE LIVE VIEW view AS SELECT column FROM table0 JOIN table1 USING column UNIO
 CREATE LIVE VIEW view0 AS SELECT column FROM view1 UNION ALL SELECT column FROM view2
 ```
 
-###### RQ.SRS-006.RBAC.LiveView.Select
+##### RQ.SRS-006.RBAC.LiveView.Select
 version: 1.0
 
 [ClickHouse] SHALL only successfully `SELECT` from a live view if and only if
@@ -3123,28 +13142,28 @@ CREATE LIVE VIEW view0 AS SELECT column FROM view1 UNION ALL SELECT column FROM
 SELECT * FROM view
 ```
 
-###### RQ.SRS-006.RBAC.LiveView.Drop
+##### RQ.SRS-006.RBAC.LiveView.Drop
 version: 1.0
 
 [ClickHouse] SHALL only successfully execute a `DROP VIEW` command if and only if
 the user has **drop view** privilege on that view either explicitly or through a role.
 
-###### RQ.SRS-006.RBAC.LiveView.Refresh
+##### RQ.SRS-006.RBAC.LiveView.Refresh
 version: 1.0
 
 [ClickHouse] SHALL only successfully execute an `ALTER LIVE VIEW REFRESH` command if and only if
 the user has **refresh** privilege on that view either explicitly or through a role.
 
-#### Select
+### Select
 
-##### RQ.SRS-006.RBAC.Select
+#### RQ.SRS-006.RBAC.Select
 version: 1.0
 
 [ClickHouse] SHALL execute `SELECT` if and only if the user
 has the **select** privilege for the destination table
 either because of the explicit grant or through one of the roles assigned to the user.
 
-##### RQ.SRS-006.RBAC.Select.Column
+#### RQ.SRS-006.RBAC.Select.Column
 version: 1.0
 
 [ClickHouse] SHALL support granting or revoking **select** privilege
@@ -3153,7 +13172,7 @@ Any `SELECT` statements SHALL not to be executed, unless the user
 has the **select** privilege for the destination column
 either because of the explicit grant or through one of the roles assigned to the user.
 
-##### RQ.SRS-006.RBAC.Select.Cluster
+#### RQ.SRS-006.RBAC.Select.Cluster
 version: 1.0
 
 [ClickHouse] SHALL support granting or revoking **select** privilege
@@ -3161,7 +13180,7 @@ on a specified cluster to one or more **users** or **roles**.
 Any `SELECT` statements SHALL succeed only on nodes where
 the table exists and privilege was granted.
 
-##### RQ.SRS-006.RBAC.Select.TableEngines
+#### RQ.SRS-006.RBAC.Select.TableEngines
 version: 1.0
 
 [ClickHouse] SHALL support controlling access to the **select** privilege
@@ -3182,16 +13201,16 @@ on tables created using the following engines
 * ReplicatedVersionedCollapsingMergeTree
 * ReplicatedGraphiteMergeTree
 
-#### Insert
+### Insert
 
-##### RQ.SRS-006.RBAC.Insert
+#### RQ.SRS-006.RBAC.Insert
 version: 1.0
 
 [ClickHouse] SHALL execute `INSERT INTO` if and only if the user
 has the **insert** privilege for the destination table
 either because of the explicit grant or through one of the roles assigned to the user.
 
-##### RQ.SRS-006.RBAC.Insert.Column
+#### RQ.SRS-006.RBAC.Insert.Column
 version: 1.0
 
 [ClickHouse] SHALL support granting or revoking **insert** privilege
@@ -3200,7 +13219,7 @@ Any `INSERT INTO` statements SHALL not to be executed, unless the user
 has the **insert** privilege for the destination column
 either because of the explicit grant or through one of the roles assigned to the user.
 
-##### RQ.SRS-006.RBAC.Insert.Cluster
+#### RQ.SRS-006.RBAC.Insert.Cluster
 version: 1.0
 
 [ClickHouse] SHALL support granting or revoking **insert** privilege
@@ -3208,7 +13227,7 @@ on a specified cluster to one or more **users** or **roles**.
 Any `INSERT INTO` statements SHALL succeed only on nodes where
 the table exists and privilege was granted.
 
-##### RQ.SRS-006.RBAC.Insert.TableEngines
+#### RQ.SRS-006.RBAC.Insert.TableEngines
 version: 1.0
 
 [ClickHouse] SHALL support controlling access to the **insert** privilege
@@ -3229,11 +13248,11 @@ on tables created using the following engines
 * ReplicatedVersionedCollapsingMergeTree
 * ReplicatedGraphiteMergeTree
 
-#### Alter
+### Alter
 
-##### Alter Column
+#### Alter Column
 
-###### RQ.SRS-006.RBAC.Privileges.AlterColumn
+##### RQ.SRS-006.RBAC.Privileges.AlterColumn
 version: 1.0
 
 [ClickHouse] SHALL support controlling access to the **alter column** privilege
@@ -3243,19 +13262,19 @@ return an error, unless the user has the **alter column** privilege for
 the destination table either because of the explicit grant or through one of
 the roles assigned to the user.
 
-###### RQ.SRS-006.RBAC.Privileges.AlterColumn.Grant
+##### RQ.SRS-006.RBAC.Privileges.AlterColumn.Grant
 version: 1.0
 
 [ClickHouse] SHALL support granting **alter column** privilege
 for a database or a specific table to one or more **users** or **roles**.
 
-###### RQ.SRS-006.RBAC.Privileges.AlterColumn.Revoke
+##### RQ.SRS-006.RBAC.Privileges.AlterColumn.Revoke
 version: 1.0
 
 [ClickHouse] SHALL support revoking **alter column** privilege
 for a database or a specific table to one or more **users** or **roles**
 
-###### RQ.SRS-006.RBAC.Privileges.AlterColumn.Column
+##### RQ.SRS-006.RBAC.Privileges.AlterColumn.Column
 version: 1.0
 
 [ClickHouse] SHALL support granting or revoking **alter column** privilege
@@ -3264,7 +13283,7 @@ Any `ALTER TABLE ... ADD|DROP|CLEAR|COMMENT|MODIFY COLUMN` statements SHALL retu
 unless the user has the **alter column** privilege for the destination column
 either because of the explicit grant or through one of the roles assigned to the user.
 
-###### RQ.SRS-006.RBAC.Privileges.AlterColumn.Cluster
+##### RQ.SRS-006.RBAC.Privileges.AlterColumn.Cluster
 version: 1.0
 
 [ClickHouse] SHALL support granting or revoking **alter column** privilege
@@ -3272,7 +13291,7 @@ on a specified cluster to one or more **users** or **roles**.
 Any `ALTER TABLE ... ADD|DROP|CLEAR|COMMENT|MODIFY COLUMN`
 statements SHALL succeed only on nodes where the table exists and privilege was granted.
 
-###### RQ.SRS-006.RBAC.Privileges.AlterColumn.TableEngines
+##### RQ.SRS-006.RBAC.Privileges.AlterColumn.TableEngines
 version: 1.0
 
 [ClickHouse] SHALL support controlling access to the **alter column** privilege
@@ -3293,9 +13312,9 @@ on tables created using the following engines
 * ReplicatedVersionedCollapsingMergeTree
 * ReplicatedGraphiteMergeTree
 
-##### Alter Index
+#### Alter Index
 
-###### RQ.SRS-006.RBAC.Privileges.AlterIndex
+##### RQ.SRS-006.RBAC.Privileges.AlterIndex
 version: 1.0
 
 [ClickHouse] SHALL support controlling access to the **alter index** privilege
@@ -3305,19 +13324,19 @@ return an error, unless the user has the **alter index** privilege for
 the destination table either because of the explicit grant or through one of
 the roles assigned to the user.
 
-###### RQ.SRS-006.RBAC.Privileges.AlterIndex.Grant
+##### RQ.SRS-006.RBAC.Privileges.AlterIndex.Grant
 version: 1.0
 
 [ClickHouse] SHALL support granting **alter index** privilege
 for a database or a specific table to one or more **users** or **roles**.
 
-###### RQ.SRS-006.RBAC.Privileges.AlterIndex.Revoke
+##### RQ.SRS-006.RBAC.Privileges.AlterIndex.Revoke
 version: 1.0
 
 [ClickHouse] SHALL support revoking **alter index** privilege
 for a database or a specific table to one or more **users** or **roles**
 
-###### RQ.SRS-006.RBAC.Privileges.AlterIndex.Cluster
+##### RQ.SRS-006.RBAC.Privileges.AlterIndex.Cluster
 version: 1.0
 
 [ClickHouse] SHALL support granting or revoking **alter index** privilege
@@ -3325,7 +13344,7 @@ on a specified cluster to one or more **users** or **roles**.
 Any `ALTER TABLE ... ORDER BY | ADD|DROP|MATERIALIZE|CLEAR INDEX`
 statements SHALL succeed only on nodes where the table exists and privilege was granted.
 
-###### RQ.SRS-006.RBAC.Privileges.AlterIndex.TableEngines
+##### RQ.SRS-006.RBAC.Privileges.AlterIndex.TableEngines
 version: 1.0
 
 [ClickHouse] SHALL support controlling access to the **alter index** privilege
@@ -3346,9 +13365,9 @@ on tables created using the following engines
 * ReplicatedVersionedCollapsingMergeTree
 * ReplicatedGraphiteMergeTree
 
-##### Alter Constraint
+#### Alter Constraint
 
-###### RQ.SRS-006.RBAC.Privileges.AlterConstraint
+##### RQ.SRS-006.RBAC.Privileges.AlterConstraint
 version: 1.0
 
 [ClickHouse] SHALL support controlling access to the **alter constraint** privilege
@@ -3358,19 +13377,19 @@ return an error, unless the user has the **alter constraint** privilege for
 the destination table either because of the explicit grant or through one of
 the roles assigned to the user.
 
-###### RQ.SRS-006.RBAC.Privileges.AlterConstraint.Grant
+##### RQ.SRS-006.RBAC.Privileges.AlterConstraint.Grant
 version: 1.0
 
 [ClickHouse] SHALL support granting **alter constraint** privilege
 for a database or a specific table to one or more **users** or **roles**.
 
-###### RQ.SRS-006.RBAC.Privileges.AlterConstraint.Revoke
+##### RQ.SRS-006.RBAC.Privileges.AlterConstraint.Revoke
 version: 1.0
 
 [ClickHouse] SHALL support revoking **alter constraint** privilege
 for a database or a specific table to one or more **users** or **roles**
 
-###### RQ.SRS-006.RBAC.Privileges.AlterConstraint.Cluster
+##### RQ.SRS-006.RBAC.Privileges.AlterConstraint.Cluster
 version: 1.0
 
 [ClickHouse] SHALL support granting or revoking **alter constraint** privilege
@@ -3378,7 +13397,7 @@ on a specified cluster to one or more **users** or **roles**.
 Any `ALTER TABLE ... ADD|DROP CONSTRAINT`
 statements SHALL succeed only on nodes where the table exists and privilege was granted.
 
-###### RQ.SRS-006.RBAC.Privileges.AlterConstraint.TableEngines
+##### RQ.SRS-006.RBAC.Privileges.AlterConstraint.TableEngines
 version: 1.0
 
 [ClickHouse] SHALL support controlling access to the **alter constraint** privilege
@@ -3399,9 +13418,9 @@ on tables created using the following engines
 * ReplicatedVersionedCollapsingMergeTree
 * ReplicatedGraphiteMergeTree
 
-##### Alter TTL
+#### Alter TTL
 
-###### RQ.SRS-006.RBAC.Privileges.AlterTTL
+##### RQ.SRS-006.RBAC.Privileges.AlterTTL
 version: 1.0
 
 [ClickHouse] SHALL support controlling access to the **alter ttl** or **alter materialize ttl** privilege
@@ -3411,19 +13430,19 @@ return an error, unless the user has the **alter ttl** or **alter materialize tt
 the destination table either because of the explicit grant or through one of
 the roles assigned to the user.
 
-###### RQ.SRS-006.RBAC.Privileges.AlterTTL.Grant
+##### RQ.SRS-006.RBAC.Privileges.AlterTTL.Grant
 version: 1.0
 
 [ClickHouse] SHALL support granting **alter ttl** or **alter materialize ttl** privilege
 for a database or a specific table to one or more **users** or **roles**.
 
-###### RQ.SRS-006.RBAC.Privileges.AlterTTL.Revoke
+##### RQ.SRS-006.RBAC.Privileges.AlterTTL.Revoke
 version: 1.0
 
 [ClickHouse] SHALL support revoking **alter ttl** or **alter materialize ttl** privilege
 for a database or a specific table to one or more **users** or **roles**
 
-###### RQ.SRS-006.RBAC.Privileges.AlterTTL.Cluster
+##### RQ.SRS-006.RBAC.Privileges.AlterTTL.Cluster
 version: 1.0
 
 [ClickHouse] SHALL support granting or revoking **alter ttl** or **alter materialize ttl** privilege
@@ -3431,7 +13450,7 @@ on a specified cluster to one or more **users** or **roles**.
 Any `ALTER TABLE ... ALTER TTL | ALTER MATERIALIZE TTL`
 statements SHALL succeed only on nodes where the table exists and privilege was granted.
 
-###### RQ.SRS-006.RBAC.Privileges.AlterTTL.TableEngines
+##### RQ.SRS-006.RBAC.Privileges.AlterTTL.TableEngines
 version: 1.0
 
 [ClickHouse] SHALL support controlling access to the **alter ttl** or **alter materialize ttl** privilege
@@ -3439,9 +13458,9 @@ on tables created using the following engines
 
 * MergeTree
 
-##### Alter Settings
+#### Alter Settings
 
-###### RQ.SRS-006.RBAC.Privileges.AlterSettings
+##### RQ.SRS-006.RBAC.Privileges.AlterSettings
 version: 1.0
 
 [ClickHouse] SHALL support controlling access to the **alter settings** privilege
@@ -3452,19 +13471,19 @@ the destination table either because of the explicit grant or through one of
 the roles assigned to the user. The **alter settings** privilege allows
 modifying table engine settings. It doesn’t affect settings or server configuration parameters.
 
-###### RQ.SRS-006.RBAC.Privileges.AlterSettings.Grant
+##### RQ.SRS-006.RBAC.Privileges.AlterSettings.Grant
 version: 1.0
 
 [ClickHouse] SHALL support granting **alter settings** privilege
 for a database or a specific table to one or more **users** or **roles**.
 
-###### RQ.SRS-006.RBAC.Privileges.AlterSettings.Revoke
+##### RQ.SRS-006.RBAC.Privileges.AlterSettings.Revoke
 version: 1.0
 
 [ClickHouse] SHALL support revoking **alter settings** privilege
 for a database or a specific table to one or more **users** or **roles**
 
-###### RQ.SRS-006.RBAC.Privileges.AlterSettings.Cluster
+##### RQ.SRS-006.RBAC.Privileges.AlterSettings.Cluster
 version: 1.0
 
 [ClickHouse] SHALL support granting or revoking **alter settings** privilege
@@ -3472,7 +13491,7 @@ on a specified cluster to one or more **users** or **roles**.
 Any `ALTER TABLE ... MODIFY SETTING setting`
 statements SHALL succeed only on nodes where the table exists and privilege was granted.
 
-###### RQ.SRS-006.RBAC.Privileges.AlterSettings.TableEngines
+##### RQ.SRS-006.RBAC.Privileges.AlterSettings.TableEngines
 version: 1.0
 
 [ClickHouse] SHALL support controlling access to the **alter settings** privilege
@@ -3493,27 +13512,27 @@ on tables created using the following engines
 * ReplicatedVersionedCollapsingMergeTree
 * ReplicatedGraphiteMergeTree
 
-##### Alter Update
+#### Alter Update
 
-###### RQ.SRS-006.RBAC.Privileges.AlterUpdate
+##### RQ.SRS-006.RBAC.Privileges.AlterUpdate
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `ALTER UPDATE` statement if and only if the user has **alter update** privilege for that column,
 either directly or through a role.
 
-###### RQ.SRS-006.RBAC.Privileges.AlterUpdate.Grant
+##### RQ.SRS-006.RBAC.Privileges.AlterUpdate.Grant
 version: 1.0
 
 [ClickHouse] SHALL support granting **alter update** privilege on a column level
 to one or more **users** or **roles**.
 
-###### RQ.SRS-006.RBAC.Privileges.AlterUpdate.Revoke
+##### RQ.SRS-006.RBAC.Privileges.AlterUpdate.Revoke
 version: 1.0
 
 [ClickHouse] SHALL support revoking **alter update** privilege on a column level
 from one or more **users** or **roles**.
 
-###### RQ.SRS-006.RBAC.Privileges.AlterUpdate.TableEngines
+##### RQ.SRS-006.RBAC.Privileges.AlterUpdate.TableEngines
 version: 1.0
 
 [ClickHouse] SHALL support controlling access to the **alter update** privilege
@@ -3534,27 +13553,27 @@ on tables created using the following engines
 * ReplicatedVersionedCollapsingMergeTree
 * ReplicatedGraphiteMergeTree
 
-##### Alter Delete
+#### Alter Delete
 
-###### RQ.SRS-006.RBAC.Privileges.AlterDelete
+##### RQ.SRS-006.RBAC.Privileges.AlterDelete
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `ALTER DELETE` statement if and only if the user has **alter delete** privilege for that table,
 either directly or through a role.
 
-###### RQ.SRS-006.RBAC.Privileges.AlterDelete.Grant
+##### RQ.SRS-006.RBAC.Privileges.AlterDelete.Grant
 version: 1.0
 
 [ClickHouse] SHALL support granting **alter delete** privilege on a column level
 to one or more **users** or **roles**.
 
-###### RQ.SRS-006.RBAC.Privileges.AlterDelete.Revoke
+##### RQ.SRS-006.RBAC.Privileges.AlterDelete.Revoke
 version: 1.0
 
 [ClickHouse] SHALL support revoking **alter delete** privilege on a column level
 from one or more **users** or **roles**.
 
-###### RQ.SRS-006.RBAC.Privileges.AlterDelete.TableEngines
+##### RQ.SRS-006.RBAC.Privileges.AlterDelete.TableEngines
 version: 1.0
 
 [ClickHouse] SHALL support controlling access to the **alter delete** privilege
@@ -3575,27 +13594,27 @@ on tables created using the following engines
 * ReplicatedVersionedCollapsingMergeTree
 * ReplicatedGraphiteMergeTree
 
-##### Alter Freeze Partition
+#### Alter Freeze Partition
 
-###### RQ.SRS-006.RBAC.Privileges.AlterFreeze
+##### RQ.SRS-006.RBAC.Privileges.AlterFreeze
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `ALTER FREEZE` statement if and only if the user has **alter freeze** privilege for that table,
 either directly or through a role.
 
-###### RQ.SRS-006.RBAC.Privileges.AlterFreeze.Grant
+##### RQ.SRS-006.RBAC.Privileges.AlterFreeze.Grant
 version: 1.0
 
 [ClickHouse] SHALL support granting **alter freeze** privilege on a column level
 to one or more **users** or **roles**.
 
-###### RQ.SRS-006.RBAC.Privileges.AlterFreeze.Revoke
+##### RQ.SRS-006.RBAC.Privileges.AlterFreeze.Revoke
 version: 1.0
 
 [ClickHouse] SHALL support revoking **alter freeze** privilege on a column level
 from one or more **users** or **roles**.
 
-###### RQ.SRS-006.RBAC.Privileges.AlterFreeze.TableEngines
+##### RQ.SRS-006.RBAC.Privileges.AlterFreeze.TableEngines
 version: 1.0
 
 [ClickHouse] SHALL support controlling access to the **alter freeze** privilege
@@ -3616,27 +13635,27 @@ on tables created using the following engines
 * ReplicatedVersionedCollapsingMergeTree
 * ReplicatedGraphiteMergeTree
 
-##### Alter Fetch Partition
+#### Alter Fetch Partition
 
-###### RQ.SRS-006.RBAC.Privileges.AlterFetch
+##### RQ.SRS-006.RBAC.Privileges.AlterFetch
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `ALTER FETCH` statement if and only if the user has **alter fetch** privilege for that table,
 either directly or through a role.
 
-###### RQ.SRS-006.RBAC.Privileges.AlterFetch.Grant
+##### RQ.SRS-006.RBAC.Privileges.AlterFetch.Grant
 version: 1.0
 
 [ClickHouse] SHALL support granting **alter fetch** privilege on a column level
 to one or more **users** or **roles**.
 
-###### RQ.SRS-006.RBAC.Privileges.AlterFetch.Revoke
+##### RQ.SRS-006.RBAC.Privileges.AlterFetch.Revoke
 version: 1.0
 
 [ClickHouse] SHALL support revoking **alter fetch** privilege on a column level
 from one or more **users** or **roles**.
 
-###### RQ.SRS-006.RBAC.Privileges.AlterFetch.TableEngines
+##### RQ.SRS-006.RBAC.Privileges.AlterFetch.TableEngines
 version: 1.0
 
 [ClickHouse] SHALL support controlling access to the **alter fetch** privilege
@@ -3650,9 +13669,9 @@ on tables created using the following engines
 * ReplicatedVersionedCollapsingMergeTree
 * ReplicatedGraphiteMergeTree
 
-##### Alter Move Partition
+#### Alter Move Partition
 
-###### RQ.SRS-006.RBAC.Privileges.AlterMove
+##### RQ.SRS-006.RBAC.Privileges.AlterMove
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `ALTER MOVE` statement if and only if the user has **alter move**, **select**, and **alter delete** privilege on the source table
@@ -3662,19 +13681,19 @@ For example,
 ALTER TABLE source_table MOVE PARTITION 1 TO target_table
 ```
 
-###### RQ.SRS-006.RBAC.Privileges.AlterMove.Grant
+##### RQ.SRS-006.RBAC.Privileges.AlterMove.Grant
 version: 1.0
 
 [ClickHouse] SHALL support granting **alter move** privilege on a column level
 to one or more **users** or **roles**.
 
-###### RQ.SRS-006.RBAC.Privileges.AlterMove.Revoke
+##### RQ.SRS-006.RBAC.Privileges.AlterMove.Revoke
 version: 1.0
 
 [ClickHouse] SHALL support revoking **alter move** privilege on a column level
 from one or more **users** or **roles**.
 
-###### RQ.SRS-006.RBAC.Privileges.AlterMove.TableEngines
+##### RQ.SRS-006.RBAC.Privileges.AlterMove.TableEngines
 version: 1.0
 
 [ClickHouse] SHALL support controlling access to the **alter move** privilege
@@ -3695,6 +13714,8 @@ on tables created using the following engines
 * ReplicatedVersionedCollapsingMergeTree
 * ReplicatedGraphiteMergeTree
 
+### Create
+
 #### RQ.SRS-006.RBAC.Privileges.CreateTable
 version: 1.0
 
@@ -3731,6 +13752,8 @@ version: 1.0
 [ClickHouse] SHALL successfully execute `CREATE TEMPORARY TABLE` statement if and only if the user has **create temporary table** privilege on the table,
 either directly or through a role.
 
+### Attach
+
 #### RQ.SRS-006.RBAC.Privileges.AttachDatabase
 version: 1.0
 
@@ -3755,6 +13778,8 @@ version: 1.0
 [ClickHouse] SHALL successfully execute `ATTACH TABLE` statement if and only if the user has **create table** privilege on the table,
 either directly or through a role.
 
+### Drop
+
 #### RQ.SRS-006.RBAC.Privileges.DropTable
 version: 1.0
 
@@ -3773,6 +13798,8 @@ version: 1.0
 [ClickHouse] SHALL successfully execute `DROP DICTIONARY` statement if and only if the user has **drop dictionary** privilege on the dictionary,
 either directly or through a role.
 
+### Detach
+
 #### RQ.SRS-006.RBAC.Privileges.DetachTable
 version: 1.0
 
@@ -3797,354 +13824,360 @@ version: 1.0
 [ClickHouse] SHALL successfully execute `DETACH DICTIONARY` statement if and only if the user has **drop dictionary** privilege on the dictionary,
 either directly or through a role.
 
+### Truncate
+
 #### RQ.SRS-006.RBAC.Privileges.Truncate
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `TRUNCATE TABLE` statement if and only if the user has **truncate table** privilege on the table,
 either directly or through a role.
 
+### Optimize
+
 #### RQ.SRS-006.RBAC.Privileges.Optimize
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `OPTIMIZE TABLE` statement if and only if the user has **optimize table** privilege on the table,
 either directly or through a role.
 
+### Kill Query
+
 #### RQ.SRS-006.RBAC.Privileges.KillQuery
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `KILL QUERY` statement if and only if the user has **kill query** privilege,
 either directly or through a role.
 
-#### Kill Mutation
+### Kill Mutation
 
-##### RQ.SRS-006.RBAC.Privileges.KillMutation
+#### RQ.SRS-006.RBAC.Privileges.KillMutation
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `KILL MUTATION` statement if and only if
 the user has the privilege that created the mutation, either directly or through a role.
 For example, to `KILL MUTATION` after `ALTER UPDATE` query, the user needs `ALTER UPDATE` privilege.
 
-##### RQ.SRS-006.RBAC.Privileges.KillMutation.AlterUpdate
+#### RQ.SRS-006.RBAC.Privileges.KillMutation.AlterUpdate
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `KILL MUTATION` query on an `ALTER UPDATE` mutation if and only if
 the user has `ALTER UPDATE` privilege on the table where the mutation was created, either directly or through a role.
 
-##### RQ.SRS-006.RBAC.Privileges.KillMutation.AlterDelete
+#### RQ.SRS-006.RBAC.Privileges.KillMutation.AlterDelete
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `KILL MUTATION` query on an `ALTER DELETE` mutation if and only if
 the user has `ALTER DELETE` privilege on the table where the mutation was created, either directly or through a role.
 
-##### RQ.SRS-006.RBAC.Privileges.KillMutation.AlterDropColumn
+#### RQ.SRS-006.RBAC.Privileges.KillMutation.AlterDropColumn
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `KILL MUTATION` query on an `ALTER DROP COLUMN` mutation if and only if
 the user has `ALTER DROP COLUMN` privilege on the table where the mutation was created, either directly or through a role.
 
-#### Show
+### Show
 
-##### RQ.SRS-006.RBAC.ShowTables.Privilege
+#### RQ.SRS-006.RBAC.ShowTables.Privilege
 version: 1.0
 
 [ClickHouse] SHALL grant **show tables** privilege on a table to a user if that user has recieved any grant,
 including `SHOW TABLES`, on that table, either directly or through a role.
 
-##### RQ.SRS-006.RBAC.ShowTables.RequiredPrivilege
+#### RQ.SRS-006.RBAC.ShowTables.RequiredPrivilege
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `SHOW TABLES` statement if and only if the user has **show tables** privilege,
 or any privilege on the table either directly or through a role.
 
-##### RQ.SRS-006.RBAC.ExistsTable.RequiredPrivilege
+#### RQ.SRS-006.RBAC.ExistsTable.RequiredPrivilege
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `EXISTS table` statement if and only if the user has **show tables** privilege,
 or any privilege on the table either directly or through a role.
 
-##### RQ.SRS-006.RBAC.CheckTable.RequiredPrivilege
+#### RQ.SRS-006.RBAC.CheckTable.RequiredPrivilege
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `CHECK table` statement if and only if the user has **show tables** privilege,
 or any privilege on the table either directly or through a role.
 
-##### RQ.SRS-006.RBAC.ShowDatabases.Privilege
+#### RQ.SRS-006.RBAC.ShowDatabases.Privilege
 version: 1.0
 
 [ClickHouse] SHALL grant **show databases** privilege on a database to a user if that user has recieved any grant,
 including `SHOW DATABASES`, on that table, either directly or through a role.
 
-##### RQ.SRS-006.RBAC.ShowDatabases.RequiredPrivilege
+#### RQ.SRS-006.RBAC.ShowDatabases.RequiredPrivilege
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `SHOW DATABASES` statement if and only if the user has **show databases** privilege,
 or any privilege on the database either directly or through a role.
 
-##### RQ.SRS-006.RBAC.ShowCreateDatabase.RequiredPrivilege
+#### RQ.SRS-006.RBAC.ShowCreateDatabase.RequiredPrivilege
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `SHOW CREATE DATABASE` statement if and only if the user has **show databases** privilege,
 or any privilege on the database either directly or through a role.
 
-##### RQ.SRS-006.RBAC.UseDatabase.RequiredPrivilege
+#### RQ.SRS-006.RBAC.UseDatabase.RequiredPrivilege
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `USE database` statement if and only if the user has **show databases** privilege,
 or any privilege on the database either directly or through a role.
 
-##### RQ.SRS-006.RBAC.ShowColumns.Privilege
+#### RQ.SRS-006.RBAC.ShowColumns.Privilege
 version: 1.0
 
 [ClickHouse] SHALL support granting or revoking the `SHOW COLUMNS` privilege.
 
-##### RQ.SRS-006.RBAC.ShowCreateTable.RequiredPrivilege
+#### RQ.SRS-006.RBAC.ShowCreateTable.RequiredPrivilege
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `SHOW CREATE TABLE` statement if and only if the user has **show columns** privilege on that table,
 either directly or through a role.
 
-##### RQ.SRS-006.RBAC.DescribeTable.RequiredPrivilege
+#### RQ.SRS-006.RBAC.DescribeTable.RequiredPrivilege
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `DESCRIBE table` statement if and only if the user has **show columns** privilege on that table,
 either directly or through a role.
 
-##### RQ.SRS-006.RBAC.ShowDictionaries.Privilege
+#### RQ.SRS-006.RBAC.ShowDictionaries.Privilege
 version: 1.0
 
 [ClickHouse] SHALL grant **show dictionaries** privilege on a dictionary to a user if that user has recieved any grant,
 including `SHOW DICTIONARIES`, on that dictionary, either directly or through a role.
 
-##### RQ.SRS-006.RBAC.ShowDictionaries.RequiredPrivilege
+#### RQ.SRS-006.RBAC.ShowDictionaries.RequiredPrivilege
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `SHOW DICTIONARIES` statement if and only if the user has **show dictionaries** privilege,
 or any privilege on the dictionary either directly or through a role.
 
-##### RQ.SRS-006.RBAC.ShowCreateDictionary.RequiredPrivilege
+#### RQ.SRS-006.RBAC.ShowCreateDictionary.RequiredPrivilege
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `SHOW CREATE DICTIONARY` statement if and only if the user has **show dictionaries** privilege,
 or any privilege on the dictionary either directly or through a role.
 
-##### RQ.SRS-006.RBAC.ExistsDictionary.RequiredPrivilege
+#### RQ.SRS-006.RBAC.ExistsDictionary.RequiredPrivilege
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `EXISTS dictionary` statement if and only if the user has **show dictionaries** privilege,
 or any privilege on the dictionary either directly or through a role.
 
-#### Access Management
+### Access Management
 
-##### RQ.SRS-006.RBAC.Privileges.CreateUser
+#### RQ.SRS-006.RBAC.Privileges.CreateUser
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `CREATE USER` statement if and only if the user has **create user** privilege,
 or either directly or through a role.
 
-##### RQ.SRS-006.RBAC.Privileges.CreateUser.DefaultRole
+#### RQ.SRS-006.RBAC.Privileges.CreateUser.DefaultRole
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `CREATE USER` statement with `DEFAULT ROLE <role>` clause if and only if
 the user has **create user** privilege and the role with **admin option**, or either directly or through a role.
 
-##### RQ.SRS-006.RBAC.Privileges.AlterUser
+#### RQ.SRS-006.RBAC.Privileges.AlterUser
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `ALTER USER` statement if and only if the user has **alter user** privilege,
 or either directly or through a role.
 
-##### RQ.SRS-006.RBAC.Privileges.DropUser
+#### RQ.SRS-006.RBAC.Privileges.DropUser
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `DROP USER` statement if and only if the user has **drop user** privilege,
 or either directly or through a role.
 
-##### RQ.SRS-006.RBAC.Privileges.CreateRole
+#### RQ.SRS-006.RBAC.Privileges.CreateRole
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `CREATE ROLE` statement if and only if the user has **create role** privilege,
 or either directly or through a role.
 
-##### RQ.SRS-006.RBAC.Privileges.AlterRole
+#### RQ.SRS-006.RBAC.Privileges.AlterRole
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `ALTER ROLE` statement if and only if the user has **alter role** privilege,
 or either directly or through a role.
 
-##### RQ.SRS-006.RBAC.Privileges.DropRole
+#### RQ.SRS-006.RBAC.Privileges.DropRole
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `DROP ROLE` statement if and only if the user has **drop role** privilege,
 or either directly or through a role.
 
-##### RQ.SRS-006.RBAC.Privileges.CreateRowPolicy
+#### RQ.SRS-006.RBAC.Privileges.CreateRowPolicy
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `CREATE ROW POLICY` statement if and only if the user has **create row policy** privilege,
 or either directly or through a role.
 
-##### RQ.SRS-006.RBAC.Privileges.AlterRowPolicy
+#### RQ.SRS-006.RBAC.Privileges.AlterRowPolicy
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `ALTER ROW POLICY` statement if and only if the user has **alter row policy** privilege,
 or either directly or through a role.
 
-##### RQ.SRS-006.RBAC.Privileges.DropRowPolicy
+#### RQ.SRS-006.RBAC.Privileges.DropRowPolicy
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `DROP ROW POLICY` statement if and only if the user has **drop row policy** privilege,
 or either directly or through a role.
 
-##### RQ.SRS-006.RBAC.Privileges.CreateQuota
+#### RQ.SRS-006.RBAC.Privileges.CreateQuota
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `CREATE QUOTA` statement if and only if the user has **create quota** privilege,
 or either directly or through a role.
 
-##### RQ.SRS-006.RBAC.Privileges.AlterQuota
+#### RQ.SRS-006.RBAC.Privileges.AlterQuota
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `ALTER QUOTA` statement if and only if the user has **alter quota** privilege,
 or either directly or through a role.
 
-##### RQ.SRS-006.RBAC.Privileges.DropQuota
+#### RQ.SRS-006.RBAC.Privileges.DropQuota
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `DROP QUOTA` statement if and only if the user has **drop quota** privilege,
 or either directly or through a role.
 
-##### RQ.SRS-006.RBAC.Privileges.CreateSettingsProfile
+#### RQ.SRS-006.RBAC.Privileges.CreateSettingsProfile
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `CREATE SETTINGS PROFILE` statement if and only if the user has **create settings profile** privilege,
 or either directly or through a role.
 
-##### RQ.SRS-006.RBAC.Privileges.AlterSettingsProfile
+#### RQ.SRS-006.RBAC.Privileges.AlterSettingsProfile
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `ALTER SETTINGS PROFILE` statement if and only if the user has **alter settings profile** privilege,
 or either directly or through a role.
 
-##### RQ.SRS-006.RBAC.Privileges.DropSettingsProfile
+#### RQ.SRS-006.RBAC.Privileges.DropSettingsProfile
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `DROP SETTINGS PROFILE` statement if and only if the user has **drop settings profile** privilege,
 or either directly or through a role.
 
-##### RQ.SRS-006.RBAC.Privileges.RoleAdmin
+#### RQ.SRS-006.RBAC.Privileges.RoleAdmin
 version: 1.0
 
 [ClickHouse] SHALL successfully execute any role grant or revoke by a user with `ROLE ADMIN` privilege.
 
-##### Show Access
+#### Show Access
 
-###### RQ.SRS-006.RBAC.ShowUsers.Privilege
+##### RQ.SRS-006.RBAC.ShowUsers.Privilege
 version: 1.0
 
 [ClickHouse] SHALL successfully grant `SHOW USERS` privilege when
 the user is granted `SHOW USERS`, `SHOW CREATE USER`, `SHOW ACCESS`, or `ACCESS MANAGEMENT`.
 
-###### RQ.SRS-006.RBAC.ShowUsers.RequiredPrivilege
+##### RQ.SRS-006.RBAC.ShowUsers.RequiredPrivilege
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `SHOW USERS` statement if and only if the user has **show users** privilege,
 either directly or through a role.
 
-###### RQ.SRS-006.RBAC.ShowCreateUser.RequiredPrivilege
+##### RQ.SRS-006.RBAC.ShowCreateUser.RequiredPrivilege
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `SHOW CREATE USER` statement if and only if the user has **show users** privilege,
 either directly or through a role.
 
-###### RQ.SRS-006.RBAC.ShowRoles.Privilege
+##### RQ.SRS-006.RBAC.ShowRoles.Privilege
 version: 1.0
 
 [ClickHouse] SHALL successfully grant `SHOW ROLES` privilege when
 the user is granted `SHOW ROLES`, `SHOW CREATE ROLE`, `SHOW ACCESS`, or `ACCESS MANAGEMENT`.
 
-###### RQ.SRS-006.RBAC.ShowRoles.RequiredPrivilege
+##### RQ.SRS-006.RBAC.ShowRoles.RequiredPrivilege
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `SHOW ROLES` statement if and only if the user has **show roles** privilege,
 either directly or through a role.
 
-###### RQ.SRS-006.RBAC.ShowCreateRole.RequiredPrivilege
+##### RQ.SRS-006.RBAC.ShowCreateRole.RequiredPrivilege
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `SHOW CREATE ROLE` statement if and only if the user has **show roles** privilege,
 either directly or through a role.
 
-###### RQ.SRS-006.RBAC.ShowRowPolicies.Privilege
+##### RQ.SRS-006.RBAC.ShowRowPolicies.Privilege
 version: 1.0
 
 [ClickHouse] SHALL successfully grant `SHOW ROW POLICIES` privilege when
 the user is granted `SHOW ROW POLICIES`, `SHOW POLICIES`, `SHOW CREATE ROW POLICY`,
 `SHOW CREATE POLICY`, `SHOW ACCESS`, or `ACCESS MANAGEMENT`.
 
-###### RQ.SRS-006.RBAC.ShowRowPolicies.RequiredPrivilege
+##### RQ.SRS-006.RBAC.ShowRowPolicies.RequiredPrivilege
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `SHOW ROW POLICIES` or `SHOW POLICIES` statement if and only if
 the user has **show row policies** privilege, either directly or through a role.
 
-###### RQ.SRS-006.RBAC.ShowCreateRowPolicy.RequiredPrivilege
+##### RQ.SRS-006.RBAC.ShowCreateRowPolicy.RequiredPrivilege
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `SHOW CREATE ROW POLICY` or `SHOW CREATE POLICY` statement
 if and only if the user has **show row policies** privilege,either directly or through a role.
 
-###### RQ.SRS-006.RBAC.ShowQuotas.Privilege
+##### RQ.SRS-006.RBAC.ShowQuotas.Privilege
 version: 1.0
 
 [ClickHouse] SHALL successfully grant `SHOW QUOTAS` privilege when
 the user is granted `SHOW QUOTAS`, `SHOW CREATE QUOTA`, `SHOW ACCESS`, or `ACCESS MANAGEMENT`.
 
-###### RQ.SRS-006.RBAC.ShowQuotas.RequiredPrivilege
+##### RQ.SRS-006.RBAC.ShowQuotas.RequiredPrivilege
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `SHOW QUOTAS` statement if and only if the user has **show quotas** privilege,
 either directly or through a role.
 
-###### RQ.SRS-006.RBAC.ShowCreateQuota.RequiredPrivilege
+##### RQ.SRS-006.RBAC.ShowCreateQuota.RequiredPrivilege
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `SHOW CREATE QUOTA` statement if and only if
 the user has **show quotas** privilege, either directly or through a role.
 
-###### RQ.SRS-006.RBAC.ShowSettingsProfiles.Privilege
+##### RQ.SRS-006.RBAC.ShowSettingsProfiles.Privilege
 version: 1.0
 
 [ClickHouse] SHALL successfully grant `SHOW SETTINGS PROFILES` privilege when
 the user is granted `SHOW SETTINGS PROFILES`, `SHOW PROFILES`, `SHOW CREATE SETTINGS PROFILE`,
 `SHOW SETTINGS PROFILE`, `SHOW ACCESS`, or `ACCESS MANAGEMENT`.
 
-###### RQ.SRS-006.RBAC.ShowSettingsProfiles.RequiredPrivilege
+##### RQ.SRS-006.RBAC.ShowSettingsProfiles.RequiredPrivilege
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `SHOW SETTINGS PROFILES` or `SHOW PROFILES` statement
 if and only if the user has **show settings profiles** privilege, either directly or through a role.
 
-###### RQ.SRS-006.RBAC.ShowCreateSettingsProfile.RequiredPrivilege
+##### RQ.SRS-006.RBAC.ShowCreateSettingsProfile.RequiredPrivilege
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `SHOW CREATE SETTINGS PROFILE` or `SHOW CREATE PROFILE` statement
 if and only if the user has **show settings profiles** privilege, either directly or through a role.
 
-#### dictGet
+### dictGet
 
-##### RQ.SRS-006.RBAC.dictGet.Privilege
+#### RQ.SRS-006.RBAC.dictGet.Privilege
 version: 1.0
 
 [ClickHouse] SHALL successfully grant `dictGet` privilege when
 the user is granted `dictGet`, `dictHas`, `dictGetHierarchy`, or `dictIsIn`.
 
-##### RQ.SRS-006.RBAC.dictGet.RequiredPrivilege
+#### RQ.SRS-006.RBAC.dictGet.RequiredPrivilege
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `dictGet` statement
 if and only if the user has **dictGet** privilege on that dictionary, either directly or through a role.
 
-##### RQ.SRS-006.RBAC.dictGet.Type.RequiredPrivilege
+#### RQ.SRS-006.RBAC.dictGet.Type.RequiredPrivilege
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `dictGet[TYPE]` statement
@@ -4166,270 +14199,283 @@ Available types:
 * UUID
 * String
 
-##### RQ.SRS-006.RBAC.dictGet.OrDefault.RequiredPrivilege
+#### RQ.SRS-006.RBAC.dictGet.OrDefault.RequiredPrivilege
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `dictGetOrDefault` statement
 if and only if the user has **dictGet** privilege on that dictionary, either directly or through a role.
 
-##### RQ.SRS-006.RBAC.dictHas.RequiredPrivilege
+#### RQ.SRS-006.RBAC.dictHas.RequiredPrivilege
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `dictHas` statement
 if and only if the user has **dictGet** privilege, either directly or through a role.
 
-##### RQ.SRS-006.RBAC.dictGetHierarchy.RequiredPrivilege
+#### RQ.SRS-006.RBAC.dictGetHierarchy.RequiredPrivilege
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `dictGetHierarchy` statement
 if and only if the user has **dictGet** privilege, either directly or through a role.
 
-##### RQ.SRS-006.RBAC.dictIsIn.RequiredPrivilege
+#### RQ.SRS-006.RBAC.dictIsIn.RequiredPrivilege
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `dictIsIn` statement
 if and only if the user has **dictGet** privilege, either directly or through a role.
 
-#### Introspection
+### Introspection
 
-##### RQ.SRS-006.RBAC.Privileges.Introspection
+#### RQ.SRS-006.RBAC.Privileges.Introspection
 version: 1.0
 
 [ClickHouse] SHALL successfully grant `INTROSPECTION` privilege when
 the user is granted `INTROSPECTION` or `INTROSPECTION FUNCTIONS`.
 
-##### RQ.SRS-006.RBAC.Privileges.Introspection.addressToLine
+#### RQ.SRS-006.RBAC.Privileges.Introspection.addressToLine
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `addressToLine` statement if and only if
 the user has **introspection** privilege, either directly or through a role.
 
-##### RQ.SRS-006.RBAC.Privileges.Introspection.addressToSymbol
+#### RQ.SRS-006.RBAC.Privileges.Introspection.addressToSymbol
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `addressToSymbol` statement if and only if
 the user has **introspection** privilege, either directly or through a role.
 
-##### RQ.SRS-006.RBAC.Privileges.Introspection.demangle
+#### RQ.SRS-006.RBAC.Privileges.Introspection.demangle
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `demangle` statement if and only if
 the user has **introspection** privilege, either directly or through a role.
 
-#### System
+### System
 
-##### RQ.SRS-006.RBAC.Privileges.System.Shutdown
+#### RQ.SRS-006.RBAC.Privileges.System.Shutdown
 version: 1.0
 
 [ClickHouse] SHALL successfully grant `SYSTEM SHUTDOWN` privilege when
 the user is granted `SYSTEM`, `SYSTEM SHUTDOWN`, `SHUTDOWN`,or `SYSTEM KILL`.
 
-##### RQ.SRS-006.RBAC.Privileges.System.DropCache
+#### RQ.SRS-006.RBAC.Privileges.System.DropCache
 version: 1.0
 
 [ClickHouse] SHALL successfully grant `SYSTEM DROP CACHE` privilege when
 the user is granted `SYSTEM`, `SYSTEM DROP CACHE`, or `DROP CACHE`.
 
-##### RQ.SRS-006.RBAC.Privileges.System.DropCache.DNS
+#### RQ.SRS-006.RBAC.Privileges.System.DropCache.DNS
 version: 1.0
 
 [ClickHouse] SHALL successfully grant `SYSTEM DROP DNS CACHE` privilege when
 the user is granted `SYSTEM`, `SYSTEM DROP CACHE`, `DROP CACHE`, `SYSTEM DROP DNS CACHE`,
 `SYSTEM DROP DNS`, `DROP DNS CACHE`, or `DROP DNS`.
 
-##### RQ.SRS-006.RBAC.Privileges.System.DropCache.Mark
+#### RQ.SRS-006.RBAC.Privileges.System.DropCache.Mark
 version: 1.0
 
 [ClickHouse] SHALL successfully grant `SYSTEM DROP MARK CACHE` privilege when
 the user is granted `SYSTEM`, `SYSTEM DROP CACHE`, `DROP CACHE`, `SYSTEM DROP MARK CACHE`,
 `SYSTEM DROP MARK`, `DROP MARK CACHE`, or `DROP MARKS`.
 
-##### RQ.SRS-006.RBAC.Privileges.System.DropCache.Uncompressed
+#### RQ.SRS-006.RBAC.Privileges.System.DropCache.Uncompressed
 version: 1.0
 
 [ClickHouse] SHALL successfully grant `SYSTEM DROP UNCOMPRESSED CACHE` privilege when
 the user is granted `SYSTEM`, `SYSTEM DROP CACHE`, `DROP CACHE`, `SYSTEM DROP UNCOMPRESSED CACHE`,
 `SYSTEM DROP UNCOMPRESSED`, `DROP UNCOMPRESSED CACHE`, or `DROP UNCOMPRESSED`.
 
-##### RQ.SRS-006.RBAC.Privileges.System.Reload
+#### RQ.SRS-006.RBAC.Privileges.System.Reload
 version: 1.0
 
 [ClickHouse] SHALL successfully grant `SYSTEM RELOAD` privilege when
 the user is granted `SYSTEM` or `SYSTEM RELOAD`.
 
-##### RQ.SRS-006.RBAC.Privileges.System.Reload.Config
+#### RQ.SRS-006.RBAC.Privileges.System.Reload.Config
 version: 1.0
 
 [ClickHouse] SHALL successfully grant `SYSTEM RELOAD CONFIG` privilege when
 the user is granted `SYSTEM`, `SYSTEM RELOAD`, `SYSTEM RELOAD CONFIG`, or `RELOAD CONFIG`.
 
-##### RQ.SRS-006.RBAC.Privileges.System.Reload.Dictionary
+#### RQ.SRS-006.RBAC.Privileges.System.Reload.Dictionary
 version: 1.0
 
 [ClickHouse] SHALL successfully grant `SYSTEM RELOAD DICTIONARY` privilege when
 the user is granted `SYSTEM`, `SYSTEM RELOAD`, `SYSTEM RELOAD DICTIONARIES`, `RELOAD DICTIONARIES`, or `RELOAD DICTIONARY`.
 
-##### RQ.SRS-006.RBAC.Privileges.System.Reload.Dictionaries
+#### RQ.SRS-006.RBAC.Privileges.System.Reload.Dictionaries
 version: 1.0
 
 [ClickHouse] SHALL successfully grant `SYSTEM RELOAD DICTIONARIES` privilege when
 the user is granted `SYSTEM`, `SYSTEM RELOAD`, `SYSTEM RELOAD DICTIONARIES`, `RELOAD DICTIONARIES`, or `RELOAD DICTIONARY`.
 
-##### RQ.SRS-006.RBAC.Privileges.System.Reload.EmbeddedDictionaries
+#### RQ.SRS-006.RBAC.Privileges.System.Reload.EmbeddedDictionaries
 version: 1.0
 
 [ClickHouse] SHALL successfully grant `SYSTEM RELOAD EMBEDDED DICTIONARIES` privilege when
 the user is granted `SYSTEM`, `SYSTEM RELOAD`, `SYSTEM RELOAD DICTIONARY ON *.*`, or `SYSTEM RELOAD EMBEDDED DICTIONARIES`.
 
-##### RQ.SRS-006.RBAC.Privileges.System.Merges
+#### RQ.SRS-006.RBAC.Privileges.System.Merges
 version: 1.0
 
 [ClickHouse] SHALL successfully grant `SYSTEM MERGES` privilege when
 the user is granted `SYSTEM`, `SYSTEM MERGES`, `SYSTEM STOP MERGES`, `SYSTEM START MERGES`, `STOP MERGES`, or `START MERGES`.
 
-##### RQ.SRS-006.RBAC.Privileges.System.TTLMerges
+#### RQ.SRS-006.RBAC.Privileges.System.TTLMerges
 version: 1.0
 
 [ClickHouse] SHALL successfully grant `SYSTEM TTL MERGES` privilege when
 the user is granted `SYSTEM`, `SYSTEM TTL MERGES`, `SYSTEM STOP TTL MERGES`, `SYSTEM START TTL MERGES`, `STOP TTL MERGES`, or `START TTL MERGES`.
 
-##### RQ.SRS-006.RBAC.Privileges.System.Fetches
+#### RQ.SRS-006.RBAC.Privileges.System.Fetches
 version: 1.0
 
 [ClickHouse] SHALL successfully grant `SYSTEM FETCHES` privilege when
 the user is granted `SYSTEM`, `SYSTEM FETCHES`, `SYSTEM STOP FETCHES`, `SYSTEM START FETCHES`, `STOP FETCHES`, or `START FETCHES`.
 
-##### RQ.SRS-006.RBAC.Privileges.System.Moves
+#### RQ.SRS-006.RBAC.Privileges.System.Moves
 version: 1.0
 
 [ClickHouse] SHALL successfully grant `SYSTEM MOVES` privilege when
 the user is granted `SYSTEM`, `SYSTEM MOVES`, `SYSTEM STOP MOVES`, `SYSTEM START MOVES`, `STOP MOVES`, or `START MOVES`.
 
-##### RQ.SRS-006.RBAC.Privileges.System.Sends
+#### RQ.SRS-006.RBAC.Privileges.System.Sends
 version: 1.0
 
 [ClickHouse] SHALL successfully grant `SYSTEM SENDS` privilege when
 the user is granted `SYSTEM`, `SYSTEM SENDS`, `SYSTEM STOP SENDS`, `SYSTEM START SENDS`, `STOP SENDS`, or `START SENDS`.
 
-##### RQ.SRS-006.RBAC.Privileges.System.Sends.Distributed
+#### RQ.SRS-006.RBAC.Privileges.System.Sends.Distributed
 version: 1.0
 
 [ClickHouse] SHALL successfully grant `SYSTEM DISTRIBUTED SENDS` privilege when
 the user is granted `SYSTEM`, `SYSTEM DISTRIBUTED SENDS`, `SYSTEM STOP DISTRIBUTED SENDS`,
 `SYSTEM START DISTRIBUTED SENDS`, `STOP DISTRIBUTED SENDS`, or `START DISTRIBUTED SENDS`.
 
-##### RQ.SRS-006.RBAC.Privileges.System.Sends.Replicated
+#### RQ.SRS-006.RBAC.Privileges.System.Sends.Replicated
 version: 1.0
 
 [ClickHouse] SHALL successfully grant `SYSTEM REPLICATED SENDS` privilege when
 the user is granted `SYSTEM`, `SYSTEM REPLICATED SENDS`, `SYSTEM STOP REPLICATED SENDS`,
 `SYSTEM START REPLICATED SENDS`, `STOP REPLICATED SENDS`, or `START REPLICATED SENDS`.
 
-##### RQ.SRS-006.RBAC.Privileges.System.ReplicationQueues
+#### RQ.SRS-006.RBAC.Privileges.System.ReplicationQueues
 version: 1.0
 
 [ClickHouse] SHALL successfully grant `SYSTEM REPLICATION QUEUES` privilege when
 the user is granted `SYSTEM`, `SYSTEM REPLICATION QUEUES`, `SYSTEM STOP REPLICATION QUEUES`,
 `SYSTEM START REPLICATION QUEUES`, `STOP REPLICATION QUEUES`, or `START REPLICATION QUEUES`.
 
-##### RQ.SRS-006.RBAC.Privileges.System.SyncReplica
+#### RQ.SRS-006.RBAC.Privileges.System.SyncReplica
 version: 1.0
 
 [ClickHouse] SHALL successfully grant `SYSTEM SYNC REPLICA` privilege when
 the user is granted `SYSTEM`, `SYSTEM SYNC REPLICA`, or `SYNC REPLICA`.
 
-##### RQ.SRS-006.RBAC.Privileges.System.RestartReplica
+#### RQ.SRS-006.RBAC.Privileges.System.RestartReplica
 version: 1.0
 
 [ClickHouse] SHALL successfully grant `SYSTEM RESTART REPLICA` privilege when
 the user is granted `SYSTEM`, `SYSTEM RESTART REPLICA`, or `RESTART REPLICA`.
 
-##### RQ.SRS-006.RBAC.Privileges.System.Flush
+#### RQ.SRS-006.RBAC.Privileges.System.Flush
 version: 1.0
 
 [ClickHouse] SHALL successfully grant `SYSTEM FLUSH` privilege when
 the user is granted `SYSTEM` or `SYSTEM FLUSH`.
 
-##### RQ.SRS-006.RBAC.Privileges.System.Flush.Distributed
+#### RQ.SRS-006.RBAC.Privileges.System.Flush.Distributed
 version: 1.0
 
 [ClickHouse] SHALL successfully grant `SYSTEM FLUSH DISTRIBUTED` privilege when
 the user is granted `SYSTEM`, `SYSTEM FLUSH DISTRIBUTED`, or `FLUSH DISTRIBUTED`.
 
-##### RQ.SRS-006.RBAC.Privileges.System.Flush.Logs
+#### RQ.SRS-006.RBAC.Privileges.System.Flush.Logs
 version: 1.0
 
 [ClickHouse] SHALL successfully grant `SYSTEM FLUSH LOGS` privilege when
 the user is granted `SYSTEM`, `SYSTEM FLUSH LOGS`, or `FLUSH LOGS`.
 
-#### Sources
+### Sources
 
-##### RQ.SRS-006.RBAC.Privileges.Sources
+#### RQ.SRS-006.RBAC.Privileges.Sources
 version: 1.0
 
 [ClickHouse] SHALL support granting or revoking `SOURCES` privilege from
 the user, either directly or through a role.
 
-##### RQ.SRS-006.RBAC.Privileges.Sources.File
+#### RQ.SRS-006.RBAC.Privileges.Sources.File
 version: 1.0
 
 [ClickHouse] SHALL support the use of `FILE` source by a user if and only if
 the user has `FILE` or `SOURCES` privileges granted to them directly or through a role.
 
-##### RQ.SRS-006.RBAC.Privileges.Sources.URL
+#### RQ.SRS-006.RBAC.Privileges.Sources.URL
 version: 1.0
 
 [ClickHouse] SHALL support the use of `URL` source by a user if and only if
 the user has `URL` or `SOURCES` privileges granted to them directly or through a role.
 
-##### RQ.SRS-006.RBAC.Privileges.Sources.Remote
+#### RQ.SRS-006.RBAC.Privileges.Sources.Remote
 version: 1.0
 
 [ClickHouse] SHALL support the use of `REMOTE` source by a user if and only if
 the user has `REMOTE` or `SOURCES` privileges granted to them directly or through a role.
 
-##### RQ.SRS-006.RBAC.Privileges.Sources.MySQL
+#### RQ.SRS-006.RBAC.Privileges.Sources.MySQL
 version: 1.0
 
 [ClickHouse] SHALL support the use of `MySQL` source by a user if and only if
 the user has `MySQL` or `SOURCES` privileges granted to them directly or through a role.
 
-##### RQ.SRS-006.RBAC.Privileges.Sources.ODBC
+#### RQ.SRS-006.RBAC.Privileges.Sources.ODBC
 version: 1.0
 
 [ClickHouse] SHALL support the use of `ODBC` source by a user if and only if
 the user has `ODBC` or `SOURCES` privileges granted to them directly or through a role.
 
-##### RQ.SRS-006.RBAC.Privileges.Sources.JDBC
+#### RQ.SRS-006.RBAC.Privileges.Sources.JDBC
 version: 1.0
 
 [ClickHouse] SHALL support the use of `JDBC` source by a user if and only if
 the user has `JDBC` or `SOURCES` privileges granted to them directly or through a role.
 
-##### RQ.SRS-006.RBAC.Privileges.Sources.HDFS
+#### RQ.SRS-006.RBAC.Privileges.Sources.HDFS
 version: 1.0
 
 [ClickHouse] SHALL support the use of `HDFS` source by a user if and only if
 the user has `HDFS` or `SOURCES` privileges granted to them directly or through a role.
 
-##### RQ.SRS-006.RBAC.Privileges.Sources.S3
+#### RQ.SRS-006.RBAC.Privileges.Sources.S3
 version: 1.0
 
 [ClickHouse] SHALL support the use of `S3` source by a user if and only if
 the user has `S3` or `SOURCES` privileges granted to them directly or through a role.
 
-#### RQ.SRS-006.RBAC.Privileges.GrantOption
+### RQ.SRS-006.RBAC.Privileges.GrantOption
 version: 1.0
 
 [ClickHouse] SHALL successfully execute `GRANT` or `REVOKE` privilege statements by a user if and only if
 the user has that privilege with `GRANT OPTION`, either directly or through a role.
 
-#### RQ.SRS-006.RBAC.Privileges.All
+### RQ.SRS-006.RBAC.Privileges.All
 version: 1.0
 
-[ClickHouse] SHALL support granting or revoking `ALL` privilege.
+[ClickHouse] SHALL support granting or revoking `ALL` privilege
+using `GRANT ALL ON *.* TO user`.
 
-#### RQ.SRS-006.RBAC.Privileges.AdminOption
+### RQ.SRS-006.RBAC.Privileges.RoleAll
+version: 1.0
+
+[ClickHouse] SHALL support granting a role named `ALL` using `GRANT ALL TO user`.
+This shall only grant the user the privileges that have been granted to the role.
+
+### RQ.SRS-006.RBAC.Privileges.None
+version: 1.0
+
+[ClickHouse] SHALL support granting or revoking `NONE` privilege
+using `GRANT NONE TO user` or `GRANT USAGE ON *.* TO user`.
+
+### RQ.SRS-006.RBAC.Privileges.AdminOption
 version: 1.0
 
 [ClickHouse] SHALL support a user granting or revoking a role if and only if
@@ -4451,7845 +14497,3 @@ the user has that role with `ADMIN OPTION` privilege.
 [MySQL]: https://dev.mysql.com/doc/refman/8.0/en/account-management-statements.html
 [PostgreSQL]: https://www.postgresql.org/docs/12/user-manag.html
 ''')
-
-RQ_SRS_006_RBAC = Requirement(
-        name='RQ.SRS-006.RBAC',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support role based access control.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Login = Requirement(
-        name='RQ.SRS-006.RBAC.Login',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL only allow access to the server for a given\n'
-        'user only when correct username and password are used during\n'
-        'the connection to the server.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Login_DefaultUser = Requirement(
-        name='RQ.SRS-006.RBAC.Login.DefaultUser',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL use the **default user** when no username and password\n'
-        'are specified during the connection to the server.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User = Requirement(
-        name='RQ.SRS-006.RBAC.User',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support creation and manipulation of\n'
-        'one or more **user** accounts to which roles, privileges,\n'
-        'settings profile, quotas and row policies can be assigned.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Roles = Requirement(
-        name='RQ.SRS-006.RBAC.User.Roles',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support assigning one or more **roles**\n'
-        'to a **user**.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Privileges = Requirement(
-        name='RQ.SRS-006.RBAC.User.Privileges',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support assigning one or more privileges to a **user**.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Variables = Requirement(
-        name='RQ.SRS-006.RBAC.User.Variables',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support assigning one or more variables to a **user**.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Variables_Constraints = Requirement(
-        name='RQ.SRS-006.RBAC.User.Variables.Constraints',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support assigning min, max and read-only constraints\n'
-        'for the variables that can be set and read by the **user**.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_SettingsProfile = Requirement(
-        name='RQ.SRS-006.RBAC.User.SettingsProfile',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support assigning one or more **settings profiles**\n'
-        'to a **user**.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Quotas = Requirement(
-        name='RQ.SRS-006.RBAC.User.Quotas',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support assigning one or more **quotas** to a **user**.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_RowPolicies = Requirement(
-        name='RQ.SRS-006.RBAC.User.RowPolicies',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support assigning one or more **row policies** to a **user**.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_AccountLock = Requirement(
-        name='RQ.SRS-006.RBAC.User.AccountLock',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support locking and unlocking of **user** accounts.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_AccountLock_DenyAccess = Requirement(
-        name='RQ.SRS-006.RBAC.User.AccountLock.DenyAccess',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL deny access to the user whose account is locked.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_DefaultRole = Requirement(
-        name='RQ.SRS-006.RBAC.User.DefaultRole',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support assigning a default role to a **user**.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_RoleSelection = Requirement(
-        name='RQ.SRS-006.RBAC.User.RoleSelection',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support selection of one or more **roles** from the available roles\n'
-        'that are assigned to a **user**.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_ShowCreate = Requirement(
-        name='RQ.SRS-006.RBAC.User.ShowCreate',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support showing the command of how **user** account was created.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_ShowPrivileges = Requirement(
-        name='RQ.SRS-006.RBAC.User.ShowPrivileges',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support listing the privileges of the **user**.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Role = Requirement(
-        name='RQ.SRS-006.RBAC.Role',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClikHouse] SHALL support creation and manipulation of **roles**\n'
-        'to which privileges, settings profile, quotas and row policies can be\n'
-        'assigned.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Role_Privileges = Requirement(
-        name='RQ.SRS-006.RBAC.Role.Privileges',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support assigning one or more privileges to a **role**.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Role_Variables = Requirement(
-        name='RQ.SRS-006.RBAC.Role.Variables',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support assigning one or more variables to a **role**.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Role_SettingsProfile = Requirement(
-        name='RQ.SRS-006.RBAC.Role.SettingsProfile',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support assigning one or more **settings profiles**\n'
-        'to a **role**.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Role_Quotas = Requirement(
-        name='RQ.SRS-006.RBAC.Role.Quotas',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support assigning one or more **quotas** to a **role**.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Role_RowPolicies = Requirement(
-        name='RQ.SRS-006.RBAC.Role.RowPolicies',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support assigning one or more **row policies** to a **role**.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_PartialRevokes = Requirement(
-        name='RQ.SRS-006.RBAC.PartialRevokes',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support partial revoking of privileges granted\n'
-        'to a **user** or a **role**.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_SettingsProfile = Requirement(
-        name='RQ.SRS-006.RBAC.SettingsProfile',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support creation and manipulation of **settings profiles**\n'
-        'that can include value definition for one or more variables and can\n'
-        'can be assigned to one or more **users** or **roles**.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_SettingsProfile_Constraints = Requirement(
-        name='RQ.SRS-006.RBAC.SettingsProfile.Constraints',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support assigning min, max and read-only constraints\n'
-        'for the variables specified in the **settings profile**.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_SettingsProfile_ShowCreate = Requirement(
-        name='RQ.SRS-006.RBAC.SettingsProfile.ShowCreate',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support showing the command of how **setting profile** was created.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quotas = Requirement(
-        name='RQ.SRS-006.RBAC.Quotas',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support creation and manipulation of **quotas**\n'
-        'that can be used to limit resource usage by a **user** or a **role**\n'
-        'over a period of time.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quotas_Keyed = Requirement(
-        name='RQ.SRS-006.RBAC.Quotas.Keyed',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support creating **quotas** that are keyed\n'
-        'so that a quota is tracked separately for each key value.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quotas_Queries = Requirement(
-        name='RQ.SRS-006.RBAC.Quotas.Queries',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support setting **queries** quota to limit the total number of requests.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quotas_Errors = Requirement(
-        name='RQ.SRS-006.RBAC.Quotas.Errors',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support setting **errors** quota to limit the number of queries that threw an exception.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quotas_ResultRows = Requirement(
-        name='RQ.SRS-006.RBAC.Quotas.ResultRows',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support setting **result rows** quota to limit the\n'
-        'the total number of rows given as the result.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quotas_ReadRows = Requirement(
-        name='RQ.SRS-006.RBAC.Quotas.ReadRows',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support setting **read rows** quota to limit the total\n'
-        'number of source rows read from tables for running the query on all remote servers.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quotas_ResultBytes = Requirement(
-        name='RQ.SRS-006.RBAC.Quotas.ResultBytes',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support setting **result bytes** quota to limit the total number\n'
-        'of bytes that can be returned as the result.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quotas_ReadBytes = Requirement(
-        name='RQ.SRS-006.RBAC.Quotas.ReadBytes',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support setting **read bytes** quota to limit the total number\n'
-        'of source bytes read from tables for running the query on all remote servers.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quotas_ExecutionTime = Requirement(
-        name='RQ.SRS-006.RBAC.Quotas.ExecutionTime',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support setting **execution time** quota to limit the maximum\n'
-        'query execution time.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quotas_ShowCreate = Requirement(
-        name='RQ.SRS-006.RBAC.Quotas.ShowCreate',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support showing the command of how **quota** was created.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_RowPolicy = Requirement(
-        name='RQ.SRS-006.RBAC.RowPolicy',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support creation and manipulation of table **row policies**\n'
-        'that can be used to limit access to the table contents for a **user** or a **role**\n'
-        'using a specified **condition**.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_RowPolicy_Condition = Requirement(
-        name='RQ.SRS-006.RBAC.RowPolicy.Condition',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support row policy **conditions** that can be any SQL\n'
-        'expression that returns a boolean.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_RowPolicy_ShowCreate = Requirement(
-        name='RQ.SRS-006.RBAC.RowPolicy.ShowCreate',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support showing the command of how **row policy** was created.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Use_DefaultRole = Requirement(
-        name='RQ.SRS-006.RBAC.User.Use.DefaultRole',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL by default use default role or roles assigned\n'
-        'to the user if specified.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Use_AllRolesWhenNoDefaultRole = Requirement(
-        name='RQ.SRS-006.RBAC.User.Use.AllRolesWhenNoDefaultRole',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL by default use all the roles assigned to the user\n'
-        'if no default role or roles are specified for the user.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Create = Requirement(
-        name='RQ.SRS-006.RBAC.User.Create',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support creating **user** accounts using `CREATE USER` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Create_IfNotExists = Requirement(
-        name='RQ.SRS-006.RBAC.User.Create.IfNotExists',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support `IF NOT EXISTS` clause in the `CREATE USER` statement\n'
-        'to skip raising an exception if a user with the same **name** already exists.\n'
-        'If the `IF NOT EXISTS` clause is not specified then an exception SHALL be\n'
-        'raised if a user with the same **name** already exists.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Create_Replace = Requirement(
-        name='RQ.SRS-006.RBAC.User.Create.Replace',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support `OR REPLACE` clause in the `CREATE USER` statement\n'
-        'to replace existing user account if already exists.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Create_Password_NoPassword = Requirement(
-        name='RQ.SRS-006.RBAC.User.Create.Password.NoPassword',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support specifying no password when creating\n'
-        'user account using `IDENTIFIED WITH NO_PASSWORD` clause .\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Create_Password_NoPassword_Login = Requirement(
-        name='RQ.SRS-006.RBAC.User.Create.Password.NoPassword.Login',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL use no password for the user when connecting to the server\n'
-        'when an account was created with `IDENTIFIED WITH NO_PASSWORD` clause.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Create_Password_PlainText = Requirement(
-        name='RQ.SRS-006.RBAC.User.Create.Password.PlainText',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support specifying plaintext password when creating\n'
-        'user account using `IDENTIFIED WITH PLAINTEXT_PASSWORD BY` clause.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Create_Password_PlainText_Login = Requirement(
-        name='RQ.SRS-006.RBAC.User.Create.Password.PlainText.Login',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL use the plaintext password passed by the user when connecting to the server\n'
-        'when an account was created with `IDENTIFIED WITH PLAINTEXT_PASSWORD` clause\n'
-        'and compare the password with the one used in the `CREATE USER` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Create_Password_Sha256Password = Requirement(
-        name='RQ.SRS-006.RBAC.User.Create.Password.Sha256Password',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support specifying the result of applying SHA256\n'
-        'to some password when creating user account using `IDENTIFIED WITH SHA256_PASSWORD BY` or `IDENTIFIED BY`\n'
-        'clause.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Create_Password_Sha256Password_Login = Requirement(
-        name='RQ.SRS-006.RBAC.User.Create.Password.Sha256Password.Login',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL calculate `SHA256` of the password passed by the user when connecting to the server\n'
-        "when an account was created with `IDENTIFIED WITH SHA256_PASSWORD` or with 'IDENTIFIED BY' clause\n"
-        'and compare the calculated hash to the one used in the `CREATE USER` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Create_Password_Sha256Hash = Requirement(
-        name='RQ.SRS-006.RBAC.User.Create.Password.Sha256Hash',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support specifying the result of applying SHA256\n'
-        'to some already calculated hash when creating user account using `IDENTIFIED WITH SHA256_HASH`\n'
-        'clause.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Create_Password_Sha256Hash_Login = Requirement(
-        name='RQ.SRS-006.RBAC.User.Create.Password.Sha256Hash.Login',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL calculate `SHA256` of the already calculated hash passed by\n'
-        'the user when connecting to the server\n'
-        'when an account was created with `IDENTIFIED WITH SHA256_HASH` clause\n'
-        'and compare the calculated hash to the one used in the `CREATE USER` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Create_Password_DoubleSha1Password = Requirement(
-        name='RQ.SRS-006.RBAC.User.Create.Password.DoubleSha1Password',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support specifying the result of applying SHA1 two times\n'
-        'to a password when creating user account using `IDENTIFIED WITH DOUBLE_SHA1_PASSWORD`\n'
-        'clause.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Create_Password_DoubleSha1Password_Login = Requirement(
-        name='RQ.SRS-006.RBAC.User.Create.Password.DoubleSha1Password.Login',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL calculate `SHA1` two times over the password passed by\n'
-        'the user when connecting to the server\n'
-        'when an account was created with `IDENTIFIED WITH DOUBLE_SHA1_PASSWORD` clause\n'
-        'and compare the calculated value to the one used in the `CREATE USER` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Create_Password_DoubleSha1Hash = Requirement(
-        name='RQ.SRS-006.RBAC.User.Create.Password.DoubleSha1Hash',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support specifying the result of applying SHA1 two times\n'
-        'to a hash when creating user account using `IDENTIFIED WITH DOUBLE_SHA1_HASH`\n'
-        'clause.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Create_Password_DoubleSha1Hash_Login = Requirement(
-        name='RQ.SRS-006.RBAC.User.Create.Password.DoubleSha1Hash.Login',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL calculate `SHA1` two times over the hash passed by\n'
-        'the user when connecting to the server\n'
-        'when an account was created with `IDENTIFIED WITH DOUBLE_SHA1_HASH` clause\n'
-        'and compare the calculated value to the one used in the `CREATE USER` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Create_Host_Name = Requirement(
-        name='RQ.SRS-006.RBAC.User.Create.Host.Name',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support specifying one or more hostnames from\n'
-        'which user can access the server using the `HOST NAME` clause\n'
-        'in the `CREATE USER` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Create_Host_Regexp = Requirement(
-        name='RQ.SRS-006.RBAC.User.Create.Host.Regexp',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support specifying one or more regular expressions\n'
-        'to match hostnames from which user can access the server\n'
-        'using the `HOST REGEXP` clause in the `CREATE USER` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Create_Host_IP = Requirement(
-        name='RQ.SRS-006.RBAC.User.Create.Host.IP',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support specifying one or more IP address or subnet from\n'
-        'which user can access the server using the `HOST IP` clause in the\n'
-        '`CREATE USER` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Create_Host_Any = Requirement(
-        name='RQ.SRS-006.RBAC.User.Create.Host.Any',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support specifying `HOST ANY` clause in the `CREATE USER` statement\n'
-        'to indicate that user can access the server from any host.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Create_Host_None = Requirement(
-        name='RQ.SRS-006.RBAC.User.Create.Host.None',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support fobidding access from any host using `HOST NONE` clause in the\n'
-        '`CREATE USER` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Create_Host_Local = Requirement(
-        name='RQ.SRS-006.RBAC.User.Create.Host.Local',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support limiting user access to local only using `HOST LOCAL` clause in the\n'
-        '`CREATE USER` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Create_Host_Like = Requirement(
-        name='RQ.SRS-006.RBAC.User.Create.Host.Like',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support specifying host using `LIKE` command syntax using the\n'
-        '`HOST LIKE` clause in the `CREATE USER` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Create_Host_Default = Requirement(
-        name='RQ.SRS-006.RBAC.User.Create.Host.Default',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support user access to server from any host\n'
-        'if no `HOST` clause is specified in the `CREATE USER` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Create_DefaultRole = Requirement(
-        name='RQ.SRS-006.RBAC.User.Create.DefaultRole',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support specifying one or more default roles\n'
-        'using `DEFAULT ROLE` clause in the `CREATE USER` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Create_DefaultRole_None = Requirement(
-        name='RQ.SRS-006.RBAC.User.Create.DefaultRole.None',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support specifying no default roles\n'
-        'using `DEFAULT ROLE NONE` clause in the `CREATE USER` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Create_DefaultRole_All = Requirement(
-        name='RQ.SRS-006.RBAC.User.Create.DefaultRole.All',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support specifying all roles to be used as default\n'
-        'using `DEFAULT ROLE ALL` clause in the `CREATE USER` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Create_Settings = Requirement(
-        name='RQ.SRS-006.RBAC.User.Create.Settings',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support specifying settings and profile\n'
-        'using `SETTINGS` clause in the `CREATE USER` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Create_OnCluster = Requirement(
-        name='RQ.SRS-006.RBAC.User.Create.OnCluster',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support specifying cluster on which the user\n'
-        'will be created using `ON CLUSTER` clause in the `CREATE USER` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Create_Syntax = Requirement(
-        name='RQ.SRS-006.RBAC.User.Create.Syntax',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support the following syntax for `CREATE USER` statement.\n'
-        '\n'
-        '```sql\n'
-        'CREATE USER [IF NOT EXISTS | OR REPLACE] name [ON CLUSTER cluster_name]\n'
-        "    [IDENTIFIED [WITH {NO_PASSWORD|PLAINTEXT_PASSWORD|SHA256_PASSWORD|SHA256_HASH|DOUBLE_SHA1_PASSWORD|DOUBLE_SHA1_HASH}] BY {'password'|'hash'}]\n"
-        "    [HOST {LOCAL | NAME 'name' | NAME REGEXP 'name_regexp' | IP 'address' | LIKE 'pattern'} [,...] | ANY | NONE]\n"
-        '    [DEFAULT ROLE role [,...]]\n'
-        "    [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | PROFILE 'profile_name'] [,...]\n"
-        '```\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Alter = Requirement(
-        name='RQ.SRS-006.RBAC.User.Alter',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support altering **user** accounts using `ALTER USER` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Alter_OrderOfEvaluation = Requirement(
-        name='RQ.SRS-006.RBAC.User.Alter.OrderOfEvaluation',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support evaluating `ALTER USER` statement from left to right\n'
-        'where things defined on the right override anything that was previously defined on\n'
-        'the left.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Alter_IfExists = Requirement(
-        name='RQ.SRS-006.RBAC.User.Alter.IfExists',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support `IF EXISTS` clause in the `ALTER USER` statement\n'
-        'to skip raising an exception (producing a warning instead) if a user with the specified **name** does not exist. If the `IF EXISTS` clause is not specified then an exception SHALL be raised if a user with the **name** does not exist.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Alter_Cluster = Requirement(
-        name='RQ.SRS-006.RBAC.User.Alter.Cluster',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support specifying the cluster the user is on\n'
-        'when altering user account using `ON CLUSTER` clause in the `ALTER USER` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Alter_Rename = Requirement(
-        name='RQ.SRS-006.RBAC.User.Alter.Rename',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support specifying a new name for the user when\n'
-        'altering user account using `RENAME` clause in the `ALTER USER` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Alter_Password_PlainText = Requirement(
-        name='RQ.SRS-006.RBAC.User.Alter.Password.PlainText',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support specifying plaintext password when altering\n'
-        'user account using `IDENTIFIED WITH PLAINTEXT_PASSWORD BY` or\n'
-        'using shorthand `IDENTIFIED BY` clause in the `ALTER USER` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Alter_Password_Sha256Password = Requirement(
-        name='RQ.SRS-006.RBAC.User.Alter.Password.Sha256Password',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support specifying the result of applying SHA256\n'
-        'to some password as identification when altering user account using\n'
-        '`IDENTIFIED WITH SHA256_PASSWORD` clause in the `ALTER USER` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Alter_Password_DoubleSha1Password = Requirement(
-        name='RQ.SRS-006.RBAC.User.Alter.Password.DoubleSha1Password',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support specifying the result of applying Double SHA1\n'
-        'to some password as identification when altering user account using\n'
-        '`IDENTIFIED WITH DOUBLE_SHA1_PASSWORD` clause in the `ALTER USER` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Alter_Host_AddDrop = Requirement(
-        name='RQ.SRS-006.RBAC.User.Alter.Host.AddDrop',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support altering user by adding and dropping access to hosts with the `ADD HOST` or the `DROP HOST`in the `ALTER USER` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Alter_Host_Local = Requirement(
-        name='RQ.SRS-006.RBAC.User.Alter.Host.Local',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support limiting user access to local only using `HOST LOCAL` clause in the\n'
-        '`ALTER USER` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Alter_Host_Name = Requirement(
-        name='RQ.SRS-006.RBAC.User.Alter.Host.Name',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support specifying one or more hostnames from\n'
-        'which user can access the server using the `HOST NAME` clause\n'
-        'in the `ALTER USER` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Alter_Host_Regexp = Requirement(
-        name='RQ.SRS-006.RBAC.User.Alter.Host.Regexp',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support specifying one or more regular expressions\n'
-        'to match hostnames from which user can access the server\n'
-        'using the `HOST REGEXP` clause in the `ALTER USER` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Alter_Host_IP = Requirement(
-        name='RQ.SRS-006.RBAC.User.Alter.Host.IP',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support specifying one or more IP address or subnet from\n'
-        'which user can access the server using the `HOST IP` clause in the\n'
-        '`ALTER USER` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Alter_Host_Like = Requirement(
-        name='RQ.SRS-006.RBAC.User.Alter.Host.Like',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support specifying sone or more similar hosts using `LIKE` command syntax using the `HOST LIKE` clause in the `ALTER USER` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Alter_Host_Any = Requirement(
-        name='RQ.SRS-006.RBAC.User.Alter.Host.Any',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support specifying `HOST ANY` clause in the `ALTER USER` statement\n'
-        'to indicate that user can access the server from any host.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Alter_Host_None = Requirement(
-        name='RQ.SRS-006.RBAC.User.Alter.Host.None',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support fobidding access from any host using `HOST NONE` clause in the\n'
-        '`ALTER USER` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Alter_DefaultRole = Requirement(
-        name='RQ.SRS-006.RBAC.User.Alter.DefaultRole',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support specifying one or more default roles\n'
-        'using `DEFAULT ROLE` clause in the `ALTER USER` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Alter_DefaultRole_All = Requirement(
-        name='RQ.SRS-006.RBAC.User.Alter.DefaultRole.All',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support specifying all roles to be used as default\n'
-        'using `DEFAULT ROLE ALL` clause in the `ALTER USER` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Alter_DefaultRole_AllExcept = Requirement(
-        name='RQ.SRS-006.RBAC.User.Alter.DefaultRole.AllExcept',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support specifying one or more roles which will not be used as default\n'
-        'using `DEFAULT ROLE ALL EXCEPT` clause in the `ALTER USER` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Alter_Settings = Requirement(
-        name='RQ.SRS-006.RBAC.User.Alter.Settings',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support specifying one or more variables\n'
-        'using `SETTINGS` clause in the `ALTER USER` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Alter_Settings_Min = Requirement(
-        name='RQ.SRS-006.RBAC.User.Alter.Settings.Min',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support specifying a minimum value for the variable specifed using `SETTINGS` with `MIN` clause in the `ALTER USER` statement.\n'
-        '\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Alter_Settings_Max = Requirement(
-        name='RQ.SRS-006.RBAC.User.Alter.Settings.Max',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support specifying a maximum value for the variable specifed using `SETTINGS` with `MAX` clause in the `ALTER USER` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Alter_Settings_Profile = Requirement(
-        name='RQ.SRS-006.RBAC.User.Alter.Settings.Profile',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support specifying the name of a profile for the variable specifed using `SETTINGS` with `PROFILE` clause in the `ALTER USER` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Alter_Syntax = Requirement(
-        name='RQ.SRS-006.RBAC.User.Alter.Syntax',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support the following syntax for the `ALTER USER` statement.\n'
-        '\n'
-        '```sql\n'
-        'ALTER USER [IF EXISTS] name [ON CLUSTER cluster_name]\n'
-        '    [RENAME TO new_name]\n'
-        "    [IDENTIFIED [WITH {PLAINTEXT_PASSWORD|SHA256_PASSWORD|DOUBLE_SHA1_PASSWORD}] BY {'password'|'hash'}]\n"
-        "    [[ADD|DROP] HOST {LOCAL | NAME 'name' | REGEXP 'name_regexp' | IP 'address' | LIKE 'pattern'} [,...] | ANY | NONE]\n"
-        '    [DEFAULT ROLE role [,...] | ALL | ALL EXCEPT role [,...] ]\n'
-        "    [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | PROFILE 'profile_name'] [,...]\n"
-        '```\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_SetDefaultRole = Requirement(
-        name='RQ.SRS-006.RBAC.SetDefaultRole',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support setting or changing granted roles to default for one or more\n'
-        'users using `SET DEFAULT ROLE` statement which\n'
-        'SHALL permanently change the default roles for the user or users if successful.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_SetDefaultRole_CurrentUser = Requirement(
-        name='RQ.SRS-006.RBAC.SetDefaultRole.CurrentUser',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support setting or changing granted roles to default for\n'
-        'the current user using `CURRENT_USER` clause in the `SET DEFAULT ROLE` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_SetDefaultRole_All = Requirement(
-        name='RQ.SRS-006.RBAC.SetDefaultRole.All',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support setting or changing all granted roles to default\n'
-        'for one or more users using `ALL` clause in the `SET DEFAULT ROLE` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_SetDefaultRole_AllExcept = Requirement(
-        name='RQ.SRS-006.RBAC.SetDefaultRole.AllExcept',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support setting or changing all granted roles except those specified\n'
-        'to default for one or more users using `ALL EXCEPT` clause in the `SET DEFAULT ROLE` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_SetDefaultRole_None = Requirement(
-        name='RQ.SRS-006.RBAC.SetDefaultRole.None',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support removing all granted roles from default\n'
-        'for one or more users using `NONE` clause in the `SET DEFAULT ROLE` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_SetDefaultRole_Syntax = Requirement(
-        name='RQ.SRS-006.RBAC.SetDefaultRole.Syntax',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support the following syntax for the `SET DEFAULT ROLE` statement.\n'
-        '\n'
-        '```sql\n'
-        'SET DEFAULT ROLE\n'
-        '    {NONE | role [,...] | ALL | ALL EXCEPT role [,...]}\n'
-        '    TO {user|CURRENT_USER} [,...]\n'
-        '\n'
-        '```\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_SetRole = Requirement(
-        name='RQ.SRS-006.RBAC.SetRole',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support activating role or roles for the current user\n'
-        'using `SET ROLE` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_SetRole_Default = Requirement(
-        name='RQ.SRS-006.RBAC.SetRole.Default',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support activating default roles for the current user\n'
-        'using `DEFAULT` clause in the `SET ROLE` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_SetRole_None = Requirement(
-        name='RQ.SRS-006.RBAC.SetRole.None',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support activating no roles for the current user\n'
-        'using `NONE` clause in the `SET ROLE` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_SetRole_All = Requirement(
-        name='RQ.SRS-006.RBAC.SetRole.All',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support activating all roles for the current user\n'
-        'using `ALL` clause in the `SET ROLE` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_SetRole_AllExcept = Requirement(
-        name='RQ.SRS-006.RBAC.SetRole.AllExcept',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support activating all roles except those specified\n'
-        'for the current user using `ALL EXCEPT` clause in the `SET ROLE` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_SetRole_Syntax = Requirement(
-        name='RQ.SRS-006.RBAC.SetRole.Syntax',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '```sql\n'
-        'SET ROLE {DEFAULT | NONE | role [,...] | ALL | ALL EXCEPT role [,...]}\n'
-        '```\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_ShowCreateUser = Requirement(
-        name='RQ.SRS-006.RBAC.User.ShowCreateUser',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support showing the `CREATE USER` statement used to create the current user object\n'
-        'using the `SHOW CREATE USER` statement with `CURRENT_USER` or no argument.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_ShowCreateUser_For = Requirement(
-        name='RQ.SRS-006.RBAC.User.ShowCreateUser.For',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support showing the `CREATE USER` statement used to create the specified user object\n'
-        'using the `FOR` clause in the `SHOW CREATE USER` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_ShowCreateUser_Syntax = Requirement(
-        name='RQ.SRS-006.RBAC.User.ShowCreateUser.Syntax',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support showing the following syntax for `SHOW CREATE USER` statement.\n'
-        '\n'
-        '```sql\n'
-        'SHOW CREATE USER [name | CURRENT_USER]\n'
-        '```\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Drop = Requirement(
-        name='RQ.SRS-006.RBAC.User.Drop',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support removing a user account using `DROP USER` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Drop_IfExists = Requirement(
-        name='RQ.SRS-006.RBAC.User.Drop.IfExists',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support using `IF EXISTS` clause in the `DROP USER` statement\n'
-        'to skip raising an exception if the user account does not exist.\n'
-        'If the `IF EXISTS` clause is not specified then an exception SHALL be\n'
-        'raised if a user does not exist.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Drop_OnCluster = Requirement(
-        name='RQ.SRS-006.RBAC.User.Drop.OnCluster',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support using `ON CLUSTER` clause in the `DROP USER` statement\n'
-        'to specify the name of the cluster the user should be dropped from.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_User_Drop_Syntax = Requirement(
-        name='RQ.SRS-006.RBAC.User.Drop.Syntax',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support the following syntax for `DROP USER` statement\n'
-        '\n'
-        '```sql\n'
-        'DROP USER [IF EXISTS] name [,...] [ON CLUSTER cluster_name]\n'
-        '```\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Role_Create = Requirement(
-        name='RQ.SRS-006.RBAC.Role.Create',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support creating a **role** using `CREATE ROLE` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Role_Create_IfNotExists = Requirement(
-        name='RQ.SRS-006.RBAC.Role.Create.IfNotExists',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support `IF NOT EXISTS` clause in the `CREATE ROLE` statement\n'
-        'to raising an exception if a role with the same **name** already exists.\n'
-        'If the `IF NOT EXISTS` clause is not specified then an exception SHALL be\n'
-        'raised if a role with the same **name** already exists.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Role_Create_Replace = Requirement(
-        name='RQ.SRS-006.RBAC.Role.Create.Replace',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support `OR REPLACE` clause in the `CREATE ROLE` statement\n'
-        'to replace existing role if it already exists.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Role_Create_Settings = Requirement(
-        name='RQ.SRS-006.RBAC.Role.Create.Settings',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support specifying settings and profile using `SETTINGS`\n'
-        'clause in the `CREATE ROLE` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Role_Create_Syntax = Requirement(
-        name='RQ.SRS-006.RBAC.Role.Create.Syntax',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support the following syntax for the `CREATE ROLE` statement\n'
-        '\n'
-        '``` sql\n'
-        'CREATE ROLE [IF NOT EXISTS | OR REPLACE] name\n'
-        "    [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | PROFILE 'profile_name'] [,...]\n"
-        '```\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Role_Alter = Requirement(
-        name='RQ.SRS-006.RBAC.Role.Alter',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support altering one **role** using `ALTER ROLE` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Role_Alter_IfExists = Requirement(
-        name='RQ.SRS-006.RBAC.Role.Alter.IfExists',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support altering one **role** using `ALTER ROLE IF EXISTS` statement, where no exception\n'
-        'will be thrown if the role does not exist.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Role_Alter_Cluster = Requirement(
-        name='RQ.SRS-006.RBAC.Role.Alter.Cluster',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support altering one **role** using `ALTER ROLE role ON CLUSTER` statement to specify the\n'
-        'cluster location of the specified role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Role_Alter_Rename = Requirement(
-        name='RQ.SRS-006.RBAC.Role.Alter.Rename',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support altering one **role** using `ALTER ROLE role RENAME TO` statement which renames the\n'
-        'role to a specified new name. If the new name already exists, that an exception SHALL be raised unless the\n'
-        '`IF EXISTS` clause is specified, by which no exception will be raised and nothing will change.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Role_Alter_Settings = Requirement(
-        name='RQ.SRS-006.RBAC.Role.Alter.Settings',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support altering the settings of one **role** using `ALTER ROLE role SETTINGS ...` statement.\n'
-        'Altering variable values, creating max and min values, specifying readonly or writable, and specifying the\n'
-        'profiles for which this alter change shall be applied to, are all supported, using the following syntax.\n'
-        '\n'
-        '```sql\n'
-        "[SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | PROFILE 'profile_name'] [,...]\n"
-        '```\n'
-        '\n'
-        'One or more variables and profiles may be specified as shown above.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Role_Alter_Syntax = Requirement(
-        name='RQ.SRS-006.RBAC.Role.Alter.Syntax',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '```sql\n'
-        'ALTER ROLE [IF EXISTS] name [ON CLUSTER cluster_name]\n'
-        '    [RENAME TO new_name]\n'
-        "    [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | PROFILE 'profile_name'] [,...]\n"
-        '```\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Role_Drop = Requirement(
-        name='RQ.SRS-006.RBAC.Role.Drop',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support removing one or more roles using `DROP ROLE` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Role_Drop_IfExists = Requirement(
-        name='RQ.SRS-006.RBAC.Role.Drop.IfExists',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support using `IF EXISTS` clause in the `DROP ROLE` statement\n'
-        'to skip raising an exception if the role does not exist.\n'
-        'If the `IF EXISTS` clause is not specified then an exception SHALL be\n'
-        'raised if a role does not exist.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Role_Drop_Cluster = Requirement(
-        name='RQ.SRS-006.RBAC.Role.Drop.Cluster',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support using `ON CLUSTER` clause in the `DROP ROLE` statement to specify the cluster from which to drop the specified role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Role_Drop_Syntax = Requirement(
-        name='RQ.SRS-006.RBAC.Role.Drop.Syntax',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support the following syntax for the `DROP ROLE` statement\n'
-        '\n'
-        '``` sql\n'
-        'DROP ROLE [IF EXISTS] name [,...] [ON CLUSTER cluster_name]\n'
-        '```\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Role_ShowCreate = Requirement(
-        name='RQ.SRS-006.RBAC.Role.ShowCreate',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support viewing the settings for a role upon creation with the `SHOW CREATE ROLE`\n'
-        'statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Role_ShowCreate_Syntax = Requirement(
-        name='RQ.SRS-006.RBAC.Role.ShowCreate.Syntax',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support the following syntax for the `SHOW CREATE ROLE` command.\n'
-        '\n'
-        '```sql\n'
-        'SHOW CREATE ROLE name\n'
-        '```\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Grant_Privilege_To = Requirement(
-        name='RQ.SRS-006.RBAC.Grant.Privilege.To',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support granting privileges to one or more users or roles using `TO` clause\n'
-        'in the `GRANT PRIVILEGE` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Grant_Privilege_ToCurrentUser = Requirement(
-        name='RQ.SRS-006.RBAC.Grant.Privilege.ToCurrentUser',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support granting privileges to current user using `TO CURRENT_USER` clause\n'
-        'in the `GRANT PRIVILEGE` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Grant_Privilege_Select = Requirement(
-        name='RQ.SRS-006.RBAC.Grant.Privilege.Select',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support granting the **select** privilege to one or more users or roles\n'
-        'for a database or a table using the `GRANT SELECT` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Grant_Privilege_Insert = Requirement(
-        name='RQ.SRS-006.RBAC.Grant.Privilege.Insert',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support granting the **insert** privilege to one or more users or roles\n'
-        'for a database or a table using the `GRANT INSERT` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Grant_Privilege_Alter = Requirement(
-        name='RQ.SRS-006.RBAC.Grant.Privilege.Alter',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support granting the **alter** privilege to one or more users or roles\n'
-        'for a database or a table using the `GRANT ALTER` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Grant_Privilege_Create = Requirement(
-        name='RQ.SRS-006.RBAC.Grant.Privilege.Create',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support granting the **create** privilege to one or more users or roles\n'
-        'using the `GRANT CREATE` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Grant_Privilege_Drop = Requirement(
-        name='RQ.SRS-006.RBAC.Grant.Privilege.Drop',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support granting the **drop** privilege to one or more users or roles\n'
-        'using the `GRANT DROP` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Grant_Privilege_Truncate = Requirement(
-        name='RQ.SRS-006.RBAC.Grant.Privilege.Truncate',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support granting the **truncate** privilege to one or more users or roles\n'
-        'for a database or a table using `GRANT TRUNCATE` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Grant_Privilege_Optimize = Requirement(
-        name='RQ.SRS-006.RBAC.Grant.Privilege.Optimize',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support granting the **optimize** privilege to one or more users or roles\n'
-        'for a database or a table using `GRANT OPTIMIZE` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Grant_Privilege_Show = Requirement(
-        name='RQ.SRS-006.RBAC.Grant.Privilege.Show',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support granting the **show** privilege to one or more users or roles\n'
-        'for a database or a table using `GRANT SHOW` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Grant_Privilege_KillQuery = Requirement(
-        name='RQ.SRS-006.RBAC.Grant.Privilege.KillQuery',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support granting the **kill query** privilege to one or more users or roles\n'
-        'for a database or a table using `GRANT KILL QUERY` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Grant_Privilege_AccessManagement = Requirement(
-        name='RQ.SRS-006.RBAC.Grant.Privilege.AccessManagement',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support granting the **access management** privileges to one or more users or roles\n'
-        'for a database or a table using `GRANT ACCESS MANAGEMENT` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Grant_Privilege_System = Requirement(
-        name='RQ.SRS-006.RBAC.Grant.Privilege.System',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support granting the **system** privileges to one or more users or roles\n'
-        'for a database or a table using `GRANT SYSTEM` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Grant_Privilege_Introspection = Requirement(
-        name='RQ.SRS-006.RBAC.Grant.Privilege.Introspection',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support granting the **introspection** privileges to one or more users or roles\n'
-        'for a database or a table using `GRANT INTROSPECTION` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Grant_Privilege_Sources = Requirement(
-        name='RQ.SRS-006.RBAC.Grant.Privilege.Sources',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support granting the **sources** privileges to one or more users or roles\n'
-        'for a database or a table using `GRANT SOURCES` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Grant_Privilege_DictGet = Requirement(
-        name='RQ.SRS-006.RBAC.Grant.Privilege.DictGet',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support granting the **dictGet** privilege to one or more users or roles\n'
-        'for a database or a table using `GRANT dictGet` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Grant_Privilege_None = Requirement(
-        name='RQ.SRS-006.RBAC.Grant.Privilege.None',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support granting no privileges to one or more users or roles\n'
-        'for a database or a table using `GRANT NONE` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Grant_Privilege_All = Requirement(
-        name='RQ.SRS-006.RBAC.Grant.Privilege.All',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support granting the **all** privileges to one or more users or roles\n'
-        'for a database or a table using the `GRANT ALL` or `GRANT ALL PRIVILEGES` statements.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Grant_Privilege_GrantOption = Requirement(
-        name='RQ.SRS-006.RBAC.Grant.Privilege.GrantOption',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support granting the **grant option** privilege to one or more users or roles\n'
-        'for a database or a table using the `WITH GRANT OPTION` clause in the `GRANT` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Grant_Privilege_On = Requirement(
-        name='RQ.SRS-006.RBAC.Grant.Privilege.On',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support the `ON` clause in the `GRANT` privilege statement\n'
-        'which SHALL allow to specify one or more tables to which the privilege SHALL\n'
-        'be granted using the following patterns\n'
-        '\n'
-        '* `*.*` any table in any database\n'
-        '* `database.*` any table in the specified database\n'
-        '* `database.table` specific table in the specified database\n'
-        '* `*` any table in the current database\n'
-        '* `table` specific table in the current database\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Grant_Privilege_PrivilegeColumns = Requirement(
-        name='RQ.SRS-006.RBAC.Grant.Privilege.PrivilegeColumns',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support granting the privilege **some_privilege** to one or more users or roles\n'
-        'for a database or a table using the `GRANT some_privilege(column)` statement for one column.\n'
-        'Multiple columns will be supported with `GRANT some_privilege(column1, column2...)` statement.\n'
-        'The privileges will be granted for only the specified columns.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Grant_Privilege_OnCluster = Requirement(
-        name='RQ.SRS-006.RBAC.Grant.Privilege.OnCluster',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support specifying cluster on which to grant privileges using the `ON CLUSTER`\n'
-        'clause in the `GRANT PRIVILEGE` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Grant_Privilege_Syntax = Requirement(
-        name='RQ.SRS-006.RBAC.Grant.Privilege.Syntax',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support the following syntax for the `GRANT` statement that\n'
-        'grants explicit privileges to a user or a role.\n'
-        '\n'
-        '```sql\n'
-        'GRANT [ON CLUSTER cluster_name] privilege[(column_name [,...])] [,...]\n'
-        '    ON {db.table|db.*|*.*|table|*}\n'
-        '    TO {user | role | CURRENT_USER} [,...]\n'
-        '    [WITH GRANT OPTION]\n'
-        '```\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Revoke_Privilege_Cluster = Requirement(
-        name='RQ.SRS-006.RBAC.Revoke.Privilege.Cluster',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support revoking privileges to one or more users or roles\n'
-        'for a database or a table on some specific cluster using the `REVOKE ON CLUSTER cluster_name` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Revoke_Privilege_Any = Requirement(
-        name='RQ.SRS-006.RBAC.Revoke.Privilege.Any',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support revoking ANY privilege to one or more users or roles\n'
-        'for a database or a table using the `REVOKE some_privilege` statement.\n'
-        '**some_privilege** refers to any Clickhouse defined privilege, whose hierarchy includes\n'
-        'SELECT, INSERT, ALTER, CREATE, DROP, TRUNCATE, OPTIMIZE, SHOW, KILL QUERY, ACCESS MANAGEMENT,\n'
-        'SYSTEM, INTROSPECTION, SOURCES, dictGet and all of their sub-privileges.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Revoke_Privilege_Select = Requirement(
-        name='RQ.SRS-006.RBAC.Revoke.Privilege.Select',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support revoking the **select** privilege to one or more users or roles\n'
-        'for a database or a table using the `REVOKE SELECT` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Revoke_Privilege_Insert = Requirement(
-        name='RQ.SRS-006.RBAC.Revoke.Privilege.Insert',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support revoking the **insert** privilege to one or more users or roles\n'
-        'for a database or a table using the `REVOKE INSERT` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Revoke_Privilege_Alter = Requirement(
-        name='RQ.SRS-006.RBAC.Revoke.Privilege.Alter',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support revoking the **alter** privilege to one or more users or roles\n'
-        'for a database or a table using the `REVOKE ALTER` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Revoke_Privilege_Create = Requirement(
-        name='RQ.SRS-006.RBAC.Revoke.Privilege.Create',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support revoking the **create** privilege to one or more users or roles\n'
-        'using the `REVOKE CREATE` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Revoke_Privilege_Drop = Requirement(
-        name='RQ.SRS-006.RBAC.Revoke.Privilege.Drop',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support revoking the **drop** privilege to one or more users or roles\n'
-        'using the `REVOKE DROP` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Revoke_Privilege_Truncate = Requirement(
-        name='RQ.SRS-006.RBAC.Revoke.Privilege.Truncate',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support revoking the **truncate** privilege to one or more users or roles\n'
-        'for a database or a table using the `REVOKE TRUNCATE` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Revoke_Privilege_Optimize = Requirement(
-        name='RQ.SRS-006.RBAC.Revoke.Privilege.Optimize',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support revoking the **optimize** privilege to one or more users or roles\n'
-        'for a database or a table using the `REVOKE OPTIMIZE` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Revoke_Privilege_Show = Requirement(
-        name='RQ.SRS-006.RBAC.Revoke.Privilege.Show',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support revoking the **show** privilege to one or more users or roles\n'
-        'for a database or a table using the `REVOKE SHOW` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Revoke_Privilege_KillQuery = Requirement(
-        name='RQ.SRS-006.RBAC.Revoke.Privilege.KillQuery',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support revoking the **kill query** privilege to one or more users or roles\n'
-        'for a database or a table using the `REVOKE KILL QUERY` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Revoke_Privilege_AccessManagement = Requirement(
-        name='RQ.SRS-006.RBAC.Revoke.Privilege.AccessManagement',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support revoking the **access management** privilege to one or more users or roles\n'
-        'for a database or a table using the `REVOKE ACCESS MANAGEMENT` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Revoke_Privilege_System = Requirement(
-        name='RQ.SRS-006.RBAC.Revoke.Privilege.System',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support revoking the **system** privilege to one or more users or roles\n'
-        'for a database or a table using the `REVOKE SYSTEM` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Revoke_Privilege_Introspection = Requirement(
-        name='RQ.SRS-006.RBAC.Revoke.Privilege.Introspection',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support revoking the **introspection** privilege to one or more users or roles\n'
-        'for a database or a table using the `REVOKE INTROSPECTION` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Revoke_Privilege_Sources = Requirement(
-        name='RQ.SRS-006.RBAC.Revoke.Privilege.Sources',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support revoking the **sources** privilege to one or more users or roles\n'
-        'for a database or a table using the `REVOKE SOURCES` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Revoke_Privilege_DictGet = Requirement(
-        name='RQ.SRS-006.RBAC.Revoke.Privilege.DictGet',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support revoking the **dictGet** privilege to one or more users or roles\n'
-        'for a database or a table using the `REVOKE dictGet` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Revoke_Privilege_PrivelegeColumns = Requirement(
-        name='RQ.SRS-006.RBAC.Revoke.Privilege.PrivelegeColumns',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support revoking the privilege **some_privilege** to one or more users or roles\n'
-        'for a database or a table using the `REVOKE some_privilege(column)` statement for one column.\n'
-        'Multiple columns will be supported with `REVOKE some_privilege(column1, column2...)` statement.\n'
-        'The privileges will be revoked for only the specified columns.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Revoke_Privilege_Multiple = Requirement(
-        name='RQ.SRS-006.RBAC.Revoke.Privilege.Multiple',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support revoking MULTIPLE **privileges** to one or more users or roles\n'
-        'for a database or a table using the `REVOKE privilege1, privilege2...` statement.\n'
-        '**privileges** refers to any set of Clickhouse defined privilege, whose hierarchy includes\n'
-        'SELECT, INSERT, ALTER, CREATE, DROP, TRUNCATE, OPTIMIZE, SHOW, KILL QUERY, ACCESS MANAGEMENT,\n'
-        'SYSTEM, INTROSPECTION, SOURCES, dictGet and all of their sub-privileges.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Revoke_Privilege_All = Requirement(
-        name='RQ.SRS-006.RBAC.Revoke.Privilege.All',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support revoking **all** privileges to one or more users or roles\n'
-        'for a database or a table using the `REVOKE ALL` or `REVOKE ALL PRIVILEGES` statements.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Revoke_Privilege_None = Requirement(
-        name='RQ.SRS-006.RBAC.Revoke.Privilege.None',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support revoking **no** privileges to one or more users or roles\n'
-        'for a database or a table using the `REVOKE NONE` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Revoke_Privilege_On = Requirement(
-        name='RQ.SRS-006.RBAC.Revoke.Privilege.On',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support the `ON` clause in the `REVOKE` privilege statement\n'
-        'which SHALL allow to specify one or more tables to which the privilege SHALL\n'
-        'be revoked using the following patterns\n'
-        '\n'
-        '* `db.table` specific table in the specified database\n'
-        '* `db.*` any table in the specified database\n'
-        '* `*.*` any table in any database\n'
-        '* `table` specific table in the current database\n'
-        '* `*` any table in the current database\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Revoke_Privilege_From = Requirement(
-        name='RQ.SRS-006.RBAC.Revoke.Privilege.From',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support the `FROM` clause in the `REVOKE` privilege statement\n'
-        'which SHALL allow to specify one or more users to which the privilege SHALL\n'
-        'be revoked using the following patterns\n'
-        '\n'
-        '* `{user | CURRENT_USER} [,...]` some combination of users by name, which may include the current user\n'
-        '* `ALL` all users\n'
-        '* `ALL EXCEPT {user | CURRENT_USER} [,...]` the logical reverse of the first pattern\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Revoke_Privilege_Syntax = Requirement(
-        name='RQ.SRS-006.RBAC.Revoke.Privilege.Syntax',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support the following syntax for the `REVOKE` statement that\n'
-        'revokes explicit privileges of a user or a role.\n'
-        '\n'
-        '```sql\n'
-        'REVOKE [ON CLUSTER cluster_name] privilege\n'
-        '    [(column_name [,...])] [,...]\n'
-        '    ON {db.table|db.*|*.*|table|*}\n'
-        '    FROM {user | CURRENT_USER} [,...] | ALL | ALL EXCEPT {user | CURRENT_USER} [,...]\n'
-        '```\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_PartialRevoke_Syntax = Requirement(
-        name='RQ.SRS-006.RBAC.PartialRevoke.Syntax',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support partial revokes by using `partial_revokes` variable\n'
-        'that can be set or unset using the following syntax.\n'
-        '\n'
-        'To disable partial revokes the `partial_revokes` variable SHALL be set to `0`\n'
-        '\n'
-        '```sql\n'
-        'SET partial_revokes = 0\n'
-        '```\n'
-        '\n'
-        'To enable partial revokes the `partial revokes` variable SHALL be set to `1`\n'
-        '\n'
-        '```sql\n'
-        'SET partial_revokes = 1\n'
-        '```\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Grant_Role = Requirement(
-        name='RQ.SRS-006.RBAC.Grant.Role',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support granting one or more roles to\n'
-        'one or more users or roles using the `GRANT` role statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Grant_Role_CurrentUser = Requirement(
-        name='RQ.SRS-006.RBAC.Grant.Role.CurrentUser',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support granting one or more roles to current user using\n'
-        '`TO CURRENT_USER` clause in the `GRANT` role statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Grant_Role_AdminOption = Requirement(
-        name='RQ.SRS-006.RBAC.Grant.Role.AdminOption',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support granting `admin option` privilege\n'
-        'to one or more users or roles using the `WITH ADMIN OPTION` clause\n'
-        'in the `GRANT` role statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Grant_Role_OnCluster = Requirement(
-        name='RQ.SRS-006.RBAC.Grant.Role.OnCluster',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support specifying cluster on which the user is to be granted one or more roles\n'
-        'using `ON CLUSTER` clause in the `GRANT` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Grant_Role_Syntax = Requirement(
-        name='RQ.SRS-006.RBAC.Grant.Role.Syntax',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support the following syntax for `GRANT` role statement\n'
-        '\n'
-        '``` sql\n'
-        'GRANT\n'
-        '    ON CLUSTER cluster_name\n'
-        '    role [, role ...]\n'
-        '    TO {user | role | CURRENT_USER} [,...]\n'
-        '    [WITH ADMIN OPTION]\n'
-        '```\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Revoke_Role = Requirement(
-        name='RQ.SRS-006.RBAC.Revoke.Role',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support revoking one or more roles from\n'
-        'one or more users or roles using the `REVOKE` role statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Revoke_Role_Keywords = Requirement(
-        name='RQ.SRS-006.RBAC.Revoke.Role.Keywords',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support revoking one or more roles from\n'
-        'special groupings of one or more users or roles with the `ALL`, `ALL EXCEPT`,\n'
-        'and `CURRENT_USER` keywords.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Revoke_Role_Cluster = Requirement(
-        name='RQ.SRS-006.RBAC.Revoke.Role.Cluster',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support revoking one or more roles from\n'
-        'one or more users or roles from one or more clusters\n'
-        'using the `REVOKE ON CLUSTER` role statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Revoke_AdminOption = Requirement(
-        name='RQ.SRS-006.RBAC.Revoke.AdminOption',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support revoking `admin option` privilege\n'
-        'in one or more users or roles using the `ADMIN OPTION FOR` clause\n'
-        'in the `REVOKE` role statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Revoke_Role_Syntax = Requirement(
-        name='RQ.SRS-006.RBAC.Revoke.Role.Syntax',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support the following syntax for the `REVOKE` role statement\n'
-        '\n'
-        '```sql\n'
-        'REVOKE [ON CLUSTER cluster_name] [ADMIN OPTION FOR]\n'
-        '    role [,...]\n'
-        '    FROM {user | role | CURRENT_USER} [,...] | ALL | ALL EXCEPT {user_name | role_name | CURRENT_USER} [,...]\n'
-        '```\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Show_Grants = Requirement(
-        name='RQ.SRS-006.RBAC.Show.Grants',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support listing all the privileges granted to current user and role\n'
-        'using the `SHOW GRANTS` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Show_Grants_For = Requirement(
-        name='RQ.SRS-006.RBAC.Show.Grants.For',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support listing all the privileges granted to a user or a role\n'
-        'using the `FOR` clause in the `SHOW GRANTS` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Show_Grants_Syntax = Requirement(
-        name='RQ.SRS-006.RBAC.Show.Grants.Syntax',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[Clickhouse] SHALL use the following syntax for the `SHOW GRANTS` statement\n'
-        '\n'
-        '``` sql\n'
-        'SHOW GRANTS [FOR user_or_role]\n'
-        '```\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_SettingsProfile_Create = Requirement(
-        name='RQ.SRS-006.RBAC.SettingsProfile.Create',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support creating settings profile using the `CREATE SETTINGS PROFILE` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_SettingsProfile_Create_IfNotExists = Requirement(
-        name='RQ.SRS-006.RBAC.SettingsProfile.Create.IfNotExists',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support `IF NOT EXISTS` clause in the `CREATE SETTINGS PROFILE` statement\n'
-        'to skip raising an exception if a settings profile with the same **name** already exists.\n'
-        'If `IF NOT EXISTS` clause is not specified then an exception SHALL be raised if\n'
-        'a settings profile with the same **name** already exists.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_SettingsProfile_Create_Replace = Requirement(
-        name='RQ.SRS-006.RBAC.SettingsProfile.Create.Replace',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support `OR REPLACE` clause in the `CREATE SETTINGS PROFILE` statement\n'
-        'to replace existing settings profile if it already exists.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_SettingsProfile_Create_Variables = Requirement(
-        name='RQ.SRS-006.RBAC.SettingsProfile.Create.Variables',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support assigning values and constraints to one or more\n'
-        'variables in the `CREATE SETTINGS PROFILE` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_SettingsProfile_Create_Variables_Value = Requirement(
-        name='RQ.SRS-006.RBAC.SettingsProfile.Create.Variables.Value',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support assigning variable value in the `CREATE SETTINGS PROFILE` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_SettingsProfile_Create_Variables_Constraints = Requirement(
-        name='RQ.SRS-006.RBAC.SettingsProfile.Create.Variables.Constraints',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support setting `MIN`, `MAX`, `READONLY`, and `WRITABLE`\n'
-        'constraints for the variables in the `CREATE SETTINGS PROFILE` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_SettingsProfile_Create_Assignment = Requirement(
-        name='RQ.SRS-006.RBAC.SettingsProfile.Create.Assignment',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support assigning settings profile to one or more users\n'
-        'or roles in the `CREATE SETTINGS PROFILE` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_SettingsProfile_Create_Assignment_None = Requirement(
-        name='RQ.SRS-006.RBAC.SettingsProfile.Create.Assignment.None',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support assigning settings profile to no users or roles using\n'
-        '`TO NONE` clause in the `CREATE SETTINGS PROFILE` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_SettingsProfile_Create_Assignment_All = Requirement(
-        name='RQ.SRS-006.RBAC.SettingsProfile.Create.Assignment.All',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support assigning settings profile to all current users and roles\n'
-        'using `TO ALL` clause in the `CREATE SETTINGS PROFILE` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_SettingsProfile_Create_Assignment_AllExcept = Requirement(
-        name='RQ.SRS-006.RBAC.SettingsProfile.Create.Assignment.AllExcept',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support excluding assignment to one or more users or roles using\n'
-        'the `ALL EXCEPT` clause in the `CREATE SETTINGS PROFILE` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_SettingsProfile_Create_Inherit = Requirement(
-        name='RQ.SRS-006.RBAC.SettingsProfile.Create.Inherit',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support inheriting profile settings from indicated profile using\n'
-        'the `INHERIT` clause in the `CREATE SETTINGS PROFILE` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_SettingsProfile_Create_OnCluster = Requirement(
-        name='RQ.SRS-006.RBAC.SettingsProfile.Create.OnCluster',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support specifying what cluster to create settings profile on\n'
-        'using `ON CLUSTER` clause in the `CREATE SETTINGS PROFILE` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_SettingsProfile_Create_Syntax = Requirement(
-        name='RQ.SRS-006.RBAC.SettingsProfile.Create.Syntax',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support the following syntax for the `CREATE SETTINGS PROFILE` statement.\n'
-        '\n'
-        '``` sql\n'
-        'CREATE SETTINGS PROFILE [IF NOT EXISTS | OR REPLACE] name\n'
-        '    [ON CLUSTER cluster_name]\n'
-        "    [SET varname [= value] [MIN min] [MAX max] [READONLY|WRITABLE] | [INHERIT 'profile_name'] [,...]]\n"
-        '    [TO {user_or_role [,...] | NONE | ALL | ALL EXCEPT user_or_role [,...]}]\n'
-        '```\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_SettingsProfile_Alter = Requirement(
-        name='RQ.SRS-006.RBAC.SettingsProfile.Alter',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support altering settings profile using the `ALTER STETTINGS PROFILE` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_SettingsProfile_Alter_IfExists = Requirement(
-        name='RQ.SRS-006.RBAC.SettingsProfile.Alter.IfExists',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support `IF EXISTS` clause in the `ALTER SETTINGS PROFILE` statement\n'
-        'to not raise exception if a settings profile does not exist.\n'
-        'If the `IF EXISTS` clause is not specified then an exception SHALL be\n'
-        'raised if a settings profile does not exist.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_SettingsProfile_Alter_Rename = Requirement(
-        name='RQ.SRS-006.RBAC.SettingsProfile.Alter.Rename',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support renaming settings profile using the `RANAME TO` clause\n'
-        'in the `ALTER SETTINGS PROFILE` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_SettingsProfile_Alter_Variables = Requirement(
-        name='RQ.SRS-006.RBAC.SettingsProfile.Alter.Variables',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support altering values and constraints of one or more\n'
-        'variables in the `ALTER SETTINGS PROFILE` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_SettingsProfile_Alter_Variables_Value = Requirement(
-        name='RQ.SRS-006.RBAC.SettingsProfile.Alter.Variables.Value',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support altering value of the variable in the `ALTER SETTINGS PROFILE` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_SettingsProfile_Alter_Variables_Constraints = Requirement(
-        name='RQ.SRS-006.RBAC.SettingsProfile.Alter.Variables.Constraints',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support altering `MIN`, `MAX`, `READONLY`, and `WRITABLE`\n'
-        'constraints for the variables in the `ALTER SETTINGS PROFILE` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_SettingsProfile_Alter_Assignment = Requirement(
-        name='RQ.SRS-006.RBAC.SettingsProfile.Alter.Assignment',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support reassigning settings profile to one or more users\n'
-        'or roles using the `TO` clause in the `ALTER SETTINGS PROFILE` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_SettingsProfile_Alter_Assignment_None = Requirement(
-        name='RQ.SRS-006.RBAC.SettingsProfile.Alter.Assignment.None',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support reassigning settings profile to no users or roles using the\n'
-        '`TO NONE` clause in the `ALTER SETTINGS PROFILE` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_SettingsProfile_Alter_Assignment_All = Requirement(
-        name='RQ.SRS-006.RBAC.SettingsProfile.Alter.Assignment.All',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support reassigning settings profile to all current users and roles\n'
-        'using the `TO ALL` clause in the `ALTER SETTINGS PROFILE` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_SettingsProfile_Alter_Assignment_AllExcept = Requirement(
-        name='RQ.SRS-006.RBAC.SettingsProfile.Alter.Assignment.AllExcept',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support excluding assignment to one or more users or roles using\n'
-        'the `TO ALL EXCEPT` clause in the `ALTER SETTINGS PROFILE` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_SettingsProfile_Alter_Assignment_Inherit = Requirement(
-        name='RQ.SRS-006.RBAC.SettingsProfile.Alter.Assignment.Inherit',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support altering the settings profile by inheriting settings from\n'
-        'specified profile using `INHERIT` clause in the `ALTER SETTINGS PROFILE` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_SettingsProfile_Alter_Assignment_OnCluster = Requirement(
-        name='RQ.SRS-006.RBAC.SettingsProfile.Alter.Assignment.OnCluster',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support altering the settings profile on a specified cluster using\n'
-        '`ON CLUSTER` clause in the `ALTER SETTINGS PROFILE` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_SettingsProfile_Alter_Syntax = Requirement(
-        name='RQ.SRS-006.RBAC.SettingsProfile.Alter.Syntax',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support the following syntax for the `ALTER SETTINGS PROFILE` statement.\n'
-        '\n'
-        '``` sql\n'
-        'ALTER SETTINGS PROFILE [IF EXISTS] name\n'
-        '    [ON CLUSTER cluster_name]\n'
-        '    [RENAME TO new_name]\n'
-        "    [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | INHERIT 'profile_name'] [,...]\n"
-        '    [TO {user_or_role [,...] | NONE | ALL | ALL EXCEPT user_or_role [,...]]}\n'
-        '```\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_SettingsProfile_Drop = Requirement(
-        name='RQ.SRS-006.RBAC.SettingsProfile.Drop',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support removing one or more settings profiles using the `DROP SETTINGS PROFILE` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_SettingsProfile_Drop_IfExists = Requirement(
-        name='RQ.SRS-006.RBAC.SettingsProfile.Drop.IfExists',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support using `IF EXISTS` clause in the `DROP SETTINGS PROFILE` statement\n'
-        'to skip raising an exception if the settings profile does not exist.\n'
-        'If the `IF EXISTS` clause is not specified then an exception SHALL be\n'
-        'raised if a settings profile does not exist.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_SettingsProfile_Drop_OnCluster = Requirement(
-        name='RQ.SRS-006.RBAC.SettingsProfile.Drop.OnCluster',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support dropping one or more settings profiles on specified cluster using\n'
-        '`ON CLUSTER` clause in the `DROP SETTINGS PROFILE` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_SettingsProfile_Drop_Syntax = Requirement(
-        name='RQ.SRS-006.RBAC.SettingsProfile.Drop.Syntax',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support the following syntax for the `DROP SETTINGS PROFILE` statement\n'
-        '\n'
-        '``` sql\n'
-        'DROP SETTINGS PROFILE [IF EXISTS] name [,name,...]\n'
-        '```\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_SettingsProfile_ShowCreateSettingsProfile = Requirement(
-        name='RQ.SRS-006.RBAC.SettingsProfile.ShowCreateSettingsProfile',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support showing the `CREATE SETTINGS PROFILE` statement used to create the settings profile\n'
-        'using the `SHOW CREATE SETTINGS PROFILE` statement with the following syntax\n'
-        '\n'
-        '``` sql\n'
-        'SHOW CREATE SETTINGS PROFILE name\n'
-        '```\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quota_Create = Requirement(
-        name='RQ.SRS-006.RBAC.Quota.Create',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support creating quotas using the `CREATE QUOTA` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quota_Create_IfNotExists = Requirement(
-        name='RQ.SRS-006.RBAC.Quota.Create.IfNotExists',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support `IF NOT EXISTS` clause in the `CREATE QUOTA` statement\n'
-        'to skip raising an exception if a quota with the same **name** already exists.\n'
-        'If `IF NOT EXISTS` clause is not specified then an exception SHALL be raised if\n'
-        'a quota with the same **name** already exists.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quota_Create_Replace = Requirement(
-        name='RQ.SRS-006.RBAC.Quota.Create.Replace',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support `OR REPLACE` clause in the `CREATE QUOTA` statement\n'
-        'to replace existing quota if it already exists.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quota_Create_Cluster = Requirement(
-        name='RQ.SRS-006.RBAC.Quota.Create.Cluster',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support creating quotas on a specific cluster with the\n'
-        '`ON CLUSTER` clause in the `CREATE QUOTA` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quota_Create_Interval = Requirement(
-        name='RQ.SRS-006.RBAC.Quota.Create.Interval',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support defining the quota interval that specifies\n'
-        'a period of time over for which the quota SHALL apply using the\n'
-        '`FOR INTERVAL` clause in the `CREATE QUOTA` statement.\n'
-        '\n'
-        'This statement SHALL also support a number and a time period which will be one\n'
-        'of `{SECOND | MINUTE | HOUR | DAY | MONTH}`. Thus, the complete syntax SHALL be:\n'
-        '\n'
-        '`FOR INTERVAL number {SECOND | MINUTE | HOUR | DAY}` where number is some real number\n'
-        'to define the interval.\n'
-        '\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quota_Create_Interval_Randomized = Requirement(
-        name='RQ.SRS-006.RBAC.Quota.Create.Interval.Randomized',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support defining the quota randomized interval that specifies\n'
-        'a period of time over for which the quota SHALL apply using the\n'
-        '`FOR RANDOMIZED INTERVAL` clause in the `CREATE QUOTA` statement.\n'
-        '\n'
-        'This statement SHALL also support a number and a time period which will be one\n'
-        'of `{SECOND | MINUTE | HOUR | DAY | MONTH}`. Thus, the complete syntax SHALL be:\n'
-        '\n'
-        '`FOR [RANDOMIZED] INTERVAL number {SECOND | MINUTE | HOUR | DAY}` where number is some\n'
-        'real number to define the interval.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quota_Create_Queries = Requirement(
-        name='RQ.SRS-006.RBAC.Quota.Create.Queries',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support limiting number of requests over a period of time\n'
-        'using the `QUERIES` clause in the `CREATE QUOTA` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quota_Create_Errors = Requirement(
-        name='RQ.SRS-006.RBAC.Quota.Create.Errors',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support limiting number of queries that threw an exception\n'
-        'using the `ERRORS` clause in the `CREATE QUOTA` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quota_Create_ResultRows = Requirement(
-        name='RQ.SRS-006.RBAC.Quota.Create.ResultRows',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support limiting the total number of rows given as the result\n'
-        'using the `RESULT ROWS` clause in the `CREATE QUOTA` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quota_Create_ReadRows = Requirement(
-        name='RQ.SRS-006.RBAC.Quota.Create.ReadRows',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support limiting the total number of source rows read from tables\n'
-        'for running the query on all remote servers\n'
-        'using the `READ ROWS` clause in the `CREATE QUOTA` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quota_Create_ResultBytes = Requirement(
-        name='RQ.SRS-006.RBAC.Quota.Create.ResultBytes',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support limiting the total number of bytes that can be returned as the result\n'
-        'using the `RESULT BYTES` clause in the `CREATE QUOTA` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quota_Create_ReadBytes = Requirement(
-        name='RQ.SRS-006.RBAC.Quota.Create.ReadBytes',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support limiting the total number of source bytes read from tables\n'
-        'for running the query on all remote servers\n'
-        'using the `READ BYTES` clause in the `CREATE QUOTA` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quota_Create_ExecutionTime = Requirement(
-        name='RQ.SRS-006.RBAC.Quota.Create.ExecutionTime',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support limiting the maximum query execution time\n'
-        'using the `EXECUTION TIME` clause in the `CREATE QUOTA` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quota_Create_NoLimits = Requirement(
-        name='RQ.SRS-006.RBAC.Quota.Create.NoLimits',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support limiting the maximum query execution time\n'
-        'using the `NO LIMITS` clause in the `CREATE QUOTA` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quota_Create_TrackingOnly = Requirement(
-        name='RQ.SRS-006.RBAC.Quota.Create.TrackingOnly',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support limiting the maximum query execution time\n'
-        'using the `TRACKING ONLY` clause in the `CREATE QUOTA` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quota_Create_KeyedBy = Requirement(
-        name='RQ.SRS-006.RBAC.Quota.Create.KeyedBy',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support to track quota for some key\n'
-        'following the `KEYED BY` clause in the `CREATE QUOTA` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quota_Create_KeyedByOptions = Requirement(
-        name='RQ.SRS-006.RBAC.Quota.Create.KeyedByOptions',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support to track quota separately for some parameter\n'
-        "using the `KEYED BY 'parameter'` clause in the `CREATE QUOTA` statement.\n"
-        '\n'
-        "'parameter' can be one of:\n"
-        "`{'none' | 'user name' | 'ip address' | 'client key' | 'client key or user name' | 'client key or ip address'}`\n"
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quota_Create_Assignment = Requirement(
-        name='RQ.SRS-006.RBAC.Quota.Create.Assignment',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support assigning quota to one or more users\n'
-        'or roles using the `TO` clause in the `CREATE QUOTA` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quota_Create_Assignment_None = Requirement(
-        name='RQ.SRS-006.RBAC.Quota.Create.Assignment.None',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support assigning quota to no users or roles using\n'
-        '`TO NONE` clause in the `CREATE QUOTA` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quota_Create_Assignment_All = Requirement(
-        name='RQ.SRS-006.RBAC.Quota.Create.Assignment.All',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support assigning quota to all current users and roles\n'
-        'using `TO ALL` clause in the `CREATE QUOTA` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quota_Create_Assignment_Except = Requirement(
-        name='RQ.SRS-006.RBAC.Quota.Create.Assignment.Except',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support excluding assignment of quota to one or more users or roles using\n'
-        'the `EXCEPT` clause in the `CREATE QUOTA` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quota_Create_Syntax = Requirement(
-        name='RQ.SRS-006.RBAC.Quota.Create.Syntax',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support the following syntax for the `CREATE QUOTA` statement\n'
-        '\n'
-        '```sql\n'
-        'CREATE QUOTA [IF NOT EXISTS | OR REPLACE] name [ON CLUSTER cluster_name]\n'
-        "    [KEYED BY {'none' | 'user name' | 'ip address' | 'client key' | 'client key or user name' | 'client key or ip address'}]\n"
-        '    [FOR [RANDOMIZED] INTERVAL number {SECOND | MINUTE | HOUR | DAY}\n'
-        '        {MAX { {QUERIES | ERRORS | RESULT ROWS | RESULT BYTES | READ ROWS | READ BYTES | EXECUTION TIME} = number } [,...] |\n'
-        '         NO LIMITS | TRACKING ONLY} [,...]]\n'
-        '    [TO {role [,...] | ALL | ALL EXCEPT role [,...]}]\n'
-        '```\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quota_Alter = Requirement(
-        name='RQ.SRS-006.RBAC.Quota.Alter',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support altering quotas using the `ALTER QUOTA` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quota_Alter_IfExists = Requirement(
-        name='RQ.SRS-006.RBAC.Quota.Alter.IfExists',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support `IF EXISTS` clause in the `ALTER QUOTA` statement\n'
-        'to skip raising an exception if a quota does not exist.\n'
-        'If the `IF EXISTS` clause is not specified then an exception SHALL be raised if\n'
-        'a quota does not exist.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quota_Alter_Rename = Requirement(
-        name='RQ.SRS-006.RBAC.Quota.Alter.Rename',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support `RENAME TO` clause in the `ALTER QUOTA` statement\n'
-        'to rename the quota to the specified name.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quota_Alter_Cluster = Requirement(
-        name='RQ.SRS-006.RBAC.Quota.Alter.Cluster',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support altering quotas on a specific cluster with the\n'
-        '`ON CLUSTER` clause in the `ALTER QUOTA` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quota_Alter_Interval = Requirement(
-        name='RQ.SRS-006.RBAC.Quota.Alter.Interval',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support redefining the quota interval that specifies\n'
-        'a period of time over for which the quota SHALL apply using the\n'
-        '`FOR INTERVAL` clause in the `ALTER QUOTA` statement.\n'
-        '\n'
-        'This statement SHALL also support a number and a time period which will be one\n'
-        'of `{SECOND | MINUTE | HOUR | DAY | MONTH}`. Thus, the complete syntax SHALL be:\n'
-        '\n'
-        '`FOR INTERVAL number {SECOND | MINUTE | HOUR | DAY}` where number is some real number\n'
-        'to define the interval.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quota_Alter_Interval_Randomized = Requirement(
-        name='RQ.SRS-006.RBAC.Quota.Alter.Interval.Randomized',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support redefining the quota randomized interval that specifies\n'
-        'a period of time over for which the quota SHALL apply using the\n'
-        '`FOR RANDOMIZED INTERVAL` clause in the `ALTER QUOTA` statement.\n'
-        '\n'
-        'This statement SHALL also support a number and a time period which will be one\n'
-        'of `{SECOND | MINUTE | HOUR | DAY | MONTH}`. Thus, the complete syntax SHALL be:\n'
-        '\n'
-        '`FOR [RANDOMIZED] INTERVAL number {SECOND | MINUTE | HOUR | DAY}` where number is some\n'
-        'real number to define the interval.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quota_Alter_Queries = Requirement(
-        name='RQ.SRS-006.RBAC.Quota.Alter.Queries',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support altering the limit of number of requests over a period of time\n'
-        'using the `QUERIES` clause in the `ALTER QUOTA` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quota_Alter_Errors = Requirement(
-        name='RQ.SRS-006.RBAC.Quota.Alter.Errors',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support altering the limit of number of queries that threw an exception\n'
-        'using the `ERRORS` clause in the `ALTER QUOTA` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quota_Alter_ResultRows = Requirement(
-        name='RQ.SRS-006.RBAC.Quota.Alter.ResultRows',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support altering the limit of the total number of rows given as the result\n'
-        'using the `RESULT ROWS` clause in the `ALTER QUOTA` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quota_Alter_ReadRows = Requirement(
-        name='RQ.SRS-006.RBAC.Quota.Alter.ReadRows',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support altering the limit of the total number of source rows read from tables\n'
-        'for running the query on all remote servers\n'
-        'using the `READ ROWS` clause in the `ALTER QUOTA` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quota_ALter_ResultBytes = Requirement(
-        name='RQ.SRS-006.RBAC.Quota.ALter.ResultBytes',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support altering the limit of the total number of bytes that can be returned as the result\n'
-        'using the `RESULT BYTES` clause in the `ALTER QUOTA` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quota_Alter_ReadBytes = Requirement(
-        name='RQ.SRS-006.RBAC.Quota.Alter.ReadBytes',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support altering the limit of the total number of source bytes read from tables\n'
-        'for running the query on all remote servers\n'
-        'using the `READ BYTES` clause in the `ALTER QUOTA` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quota_Alter_ExecutionTime = Requirement(
-        name='RQ.SRS-006.RBAC.Quota.Alter.ExecutionTime',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support altering the limit of the maximum query execution time\n'
-        'using the `EXECUTION TIME` clause in the `ALTER QUOTA` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quota_Alter_NoLimits = Requirement(
-        name='RQ.SRS-006.RBAC.Quota.Alter.NoLimits',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support limiting the maximum query execution time\n'
-        'using the `NO LIMITS` clause in the `ALTER QUOTA` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quota_Alter_TrackingOnly = Requirement(
-        name='RQ.SRS-006.RBAC.Quota.Alter.TrackingOnly',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support limiting the maximum query execution time\n'
-        'using the `TRACKING ONLY` clause in the `ALTER QUOTA` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quota_Alter_KeyedBy = Requirement(
-        name='RQ.SRS-006.RBAC.Quota.Alter.KeyedBy',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support altering quota to track quota separately for some key\n'
-        'following the `KEYED BY` clause in the `ALTER QUOTA` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quota_Alter_KeyedByOptions = Requirement(
-        name='RQ.SRS-006.RBAC.Quota.Alter.KeyedByOptions',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support altering quota to track quota separately for some parameter\n'
-        "using the `KEYED BY 'parameter'` clause in the `ALTER QUOTA` statement.\n"
-        '\n'
-        "'parameter' can be one of:\n"
-        "`{'none' | 'user name' | 'ip address' | 'client key' | 'client key or user name' | 'client key or ip address'}`\n"
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quota_Alter_Assignment = Requirement(
-        name='RQ.SRS-006.RBAC.Quota.Alter.Assignment',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support reassigning quota to one or more users\n'
-        'or roles using the `TO` clause in the `ALTER QUOTA` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quota_Alter_Assignment_None = Requirement(
-        name='RQ.SRS-006.RBAC.Quota.Alter.Assignment.None',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support reassigning quota to no users or roles using\n'
-        '`TO NONE` clause in the `ALTER QUOTA` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quota_Alter_Assignment_All = Requirement(
-        name='RQ.SRS-006.RBAC.Quota.Alter.Assignment.All',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support reassigning quota to all current users and roles\n'
-        'using `TO ALL` clause in the `ALTER QUOTA` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quota_Alter_Assignment_Except = Requirement(
-        name='RQ.SRS-006.RBAC.Quota.Alter.Assignment.Except',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support excluding assignment of quota to one or more users or roles using\n'
-        'the `EXCEPT` clause in the `ALTER QUOTA` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quota_Alter_Syntax = Requirement(
-        name='RQ.SRS-006.RBAC.Quota.Alter.Syntax',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support the following syntax for the `ALTER QUOTA` statement\n'
-        '\n'
-        '``` sql\n'
-        'ALTER QUOTA [IF EXIST] name\n'
-        '    {{{QUERIES | ERRORS | RESULT ROWS | READ ROWS | RESULT BYTES | READ BYTES | EXECUTION TIME} number} [, ...] FOR INTERVAL number time_unit} [, ...]\n'
-        '    [KEYED BY USERNAME | KEYED BY IP | NOT KEYED] [ALLOW CUSTOM KEY | DISALLOW CUSTOM KEY]\n'
-        '    [TO {user_or_role [,...] | NONE | ALL} [EXCEPT user_or_role [,...]]]\n'
-        '```\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quota_Drop = Requirement(
-        name='RQ.SRS-006.RBAC.Quota.Drop',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support removing one or more quotas using the `DROP QUOTA` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quota_Drop_IfExists = Requirement(
-        name='RQ.SRS-006.RBAC.Quota.Drop.IfExists',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support using `IF EXISTS` clause in the `DROP QUOTA` statement\n'
-        'to skip raising an exception when the quota does not exist.\n'
-        'If the `IF EXISTS` clause is not specified then an exception SHALL be\n'
-        'raised if the quota does not exist.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quota_Drop_Cluster = Requirement(
-        name='RQ.SRS-006.RBAC.Quota.Drop.Cluster',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support using `ON CLUSTER` clause in the `DROP QUOTA` statement\n'
-        'to indicate the cluster the quota to be dropped is located on.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quota_Drop_Syntax = Requirement(
-        name='RQ.SRS-006.RBAC.Quota.Drop.Syntax',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support the following syntax for the `DROP QUOTA` statement\n'
-        '\n'
-        '``` sql\n'
-        'DROP QUOTA [IF EXISTS] name [,name...]\n'
-        '```\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quota_ShowQuotas = Requirement(
-        name='RQ.SRS-006.RBAC.Quota.ShowQuotas',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support showing all of the current quotas\n'
-        'using the `SHOW QUOTAS` statement with the following syntax\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quota_ShowQuotas_IntoOutfile = Requirement(
-        name='RQ.SRS-006.RBAC.Quota.ShowQuotas.IntoOutfile',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support the `INTO OUTFILE` clause in the `SHOW QUOTAS` statement to define an outfile by some given string literal.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quota_ShowQuotas_Format = Requirement(
-        name='RQ.SRS-006.RBAC.Quota.ShowQuotas.Format',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support the `FORMAT` clause in the `SHOW QUOTAS` statement to define a format for the output quota list.\n'
-        '\n'
-        'The types of valid formats are many, listed in output column:\n'
-        'https://clickhouse.tech/docs/en/interfaces/formats/\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quota_ShowQuotas_Settings = Requirement(
-        name='RQ.SRS-006.RBAC.Quota.ShowQuotas.Settings',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support the `SETTINGS` clause in the `SHOW QUOTAS` statement to define settings in the showing of all quotas.\n'
-        '\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quota_ShowQuotas_Syntax = Requirement(
-        name='RQ.SRS-006.RBAC.Quota.ShowQuotas.Syntax',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support using the `SHOW QUOTAS` statement\n'
-        'with the following syntax\n'
-        '``` sql\n'
-        'SHOW QUOTAS\n'
-        '```\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quota_ShowCreateQuota_Name = Requirement(
-        name='RQ.SRS-006.RBAC.Quota.ShowCreateQuota.Name',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support showing the `CREATE QUOTA` statement used to create the quota with some given name\n'
-        'using the `SHOW CREATE QUOTA` statement with the following syntax\n'
-        '\n'
-        '``` sql\n'
-        'SHOW CREATE QUOTA name\n'
-        '```\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quota_ShowCreateQuota_Current = Requirement(
-        name='RQ.SRS-006.RBAC.Quota.ShowCreateQuota.Current',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support showing the `CREATE QUOTA` statement used to create the CURRENT quota\n'
-        'using the `SHOW CREATE QUOTA CURRENT` statement or the shorthand form\n'
-        '`SHOW CREATE QUOTA`\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Quota_ShowCreateQuota_Syntax = Requirement(
-        name='RQ.SRS-006.RBAC.Quota.ShowCreateQuota.Syntax',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support the following syntax when\n'
-        'using the `SHOW CREATE QUOTA` statement.\n'
-        '\n'
-        '```sql\n'
-        'SHOW CREATE QUOTA [name | CURRENT]\n'
-        '```\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_RowPolicy_Create = Requirement(
-        name='RQ.SRS-006.RBAC.RowPolicy.Create',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support creating row policy using the `CREATE ROW POLICY` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_RowPolicy_Create_IfNotExists = Requirement(
-        name='RQ.SRS-006.RBAC.RowPolicy.Create.IfNotExists',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support `IF NOT EXISTS` clause in the `CREATE ROW POLICY` statement\n'
-        'to skip raising an exception if a row policy with the same **name** already exists.\n'
-        'If the `IF NOT EXISTS` clause is not specified then an exception SHALL be raised if\n'
-        'a row policy with the same **name** already exists.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_RowPolicy_Create_Replace = Requirement(
-        name='RQ.SRS-006.RBAC.RowPolicy.Create.Replace',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support `OR REPLACE` clause in the `CREATE ROW POLICY` statement\n'
-        'to replace existing row policy if it already exists.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_RowPolicy_Create_OnCluster = Requirement(
-        name='RQ.SRS-006.RBAC.RowPolicy.Create.OnCluster',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support specifying cluster on which to create the role policy\n'
-        'using the `ON CLUSTER` clause in the `CREATE ROW POLICY` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_RowPolicy_Create_On = Requirement(
-        name='RQ.SRS-006.RBAC.RowPolicy.Create.On',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support specifying table on which to create the role policy\n'
-        'using the `ON` clause in the `CREATE ROW POLICY` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_RowPolicy_Create_Access = Requirement(
-        name='RQ.SRS-006.RBAC.RowPolicy.Create.Access',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support allowing or restricting access to rows using the\n'
-        '`AS` clause in the `CREATE ROW POLICY` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_RowPolicy_Create_Access_Permissive = Requirement(
-        name='RQ.SRS-006.RBAC.RowPolicy.Create.Access.Permissive',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support allowing access to rows using the\n'
-        '`AS PERMISSIVE` clause in the `CREATE ROW POLICY` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_RowPolicy_Create_Access_Restrictive = Requirement(
-        name='RQ.SRS-006.RBAC.RowPolicy.Create.Access.Restrictive',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support restricting access to rows using the\n'
-        '`AS RESTRICTIVE` clause in the `CREATE ROW POLICY` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_RowPolicy_Create_ForSelect = Requirement(
-        name='RQ.SRS-006.RBAC.RowPolicy.Create.ForSelect',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support specifying which rows are affected\n'
-        'using the `FOR SELECT` clause in the `CREATE ROW POLICY` statement.\n'
-        'REQUIRES CONFIRMATION\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_RowPolicy_Create_Condition = Requirement(
-        name='RQ.SRS-006.RBAC.RowPolicy.Create.Condition',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support specifying a condition that\n'
-        'that can be any SQL expression which returns a boolean using the `USING`\n'
-        'clause in the `CREATE ROW POLOCY` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_RowPolicy_Create_Assignment = Requirement(
-        name='RQ.SRS-006.RBAC.RowPolicy.Create.Assignment',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support assigning row policy to one or more users\n'
-        'or roles using the `TO` clause in the `CREATE ROW POLICY` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_RowPolicy_Create_Assignment_None = Requirement(
-        name='RQ.SRS-006.RBAC.RowPolicy.Create.Assignment.None',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support assigning row policy to no users or roles using\n'
-        'the `TO NONE` clause in the `CREATE ROW POLICY` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_RowPolicy_Create_Assignment_All = Requirement(
-        name='RQ.SRS-006.RBAC.RowPolicy.Create.Assignment.All',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support assigning row policy to all current users and roles\n'
-        'using `TO ALL` clause in the `CREATE ROW POLICY` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_RowPolicy_Create_Assignment_AllExcept = Requirement(
-        name='RQ.SRS-006.RBAC.RowPolicy.Create.Assignment.AllExcept',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support excluding assignment of row policy to one or more users or roles using\n'
-        'the `ALL EXCEPT` clause in the `CREATE ROW POLICY` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_RowPolicy_Create_Syntax = Requirement(
-        name='RQ.SRS-006.RBAC.RowPolicy.Create.Syntax',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support the following syntax for the `CRETE ROW POLICY` statement\n'
-        '\n'
-        '``` sql\n'
-        'CREATE [ROW] POLICY [IF NOT EXISTS | OR REPLACE] policy_name [ON CLUSTER cluster_name] ON [db.]table\n'
-        '    [AS {PERMISSIVE | RESTRICTIVE}]\n'
-        '    [FOR SELECT]\n'
-        '    [USING condition]\n'
-        '    [TO {role [,...] | ALL | ALL EXCEPT role [,...]}]\n'
-        '```\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_RowPolicy_Alter = Requirement(
-        name='RQ.SRS-006.RBAC.RowPolicy.Alter',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support altering row policy using the `ALTER ROW POLICY` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_RowPolicy_Alter_IfExists = Requirement(
-        name='RQ.SRS-006.RBAC.RowPolicy.Alter.IfExists',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support the `IF EXISTS` clause in the `ALTER ROW POLICY` statement\n'
-        'to skip raising an exception if a row policy does not exist.\n'
-        'If the `IF EXISTS` clause is not specified then an exception SHALL be raised if\n'
-        'a row policy does not exist.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_RowPolicy_Alter_ForSelect = Requirement(
-        name='RQ.SRS-006.RBAC.RowPolicy.Alter.ForSelect',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support modifying rows on which to apply the row policy\n'
-        'using the `FOR SELECT` clause in the `ALTER ROW POLICY` statement.\n'
-        'REQUIRES FUNCTION CONFIRMATION.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_RowPolicy_Alter_OnCluster = Requirement(
-        name='RQ.SRS-006.RBAC.RowPolicy.Alter.OnCluster',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support specifying cluster on which to alter the row policy\n'
-        'using the `ON CLUSTER` clause in the `ALTER ROW POLICY` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_RowPolicy_Alter_On = Requirement(
-        name='RQ.SRS-006.RBAC.RowPolicy.Alter.On',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support specifying table on which to alter the row policy\n'
-        'using the `ON` clause in the `ALTER ROW POLICY` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_RowPolicy_Alter_Rename = Requirement(
-        name='RQ.SRS-006.RBAC.RowPolicy.Alter.Rename',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support renaming the row policy using the `RENAME` clause\n'
-        'in the `ALTER ROW POLICY` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_RowPolicy_Alter_Access = Requirement(
-        name='RQ.SRS-006.RBAC.RowPolicy.Alter.Access',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support altering access to rows using the\n'
-        '`AS` clause in the `ALTER ROW POLICY` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_RowPolicy_Alter_Access_Permissive = Requirement(
-        name='RQ.SRS-006.RBAC.RowPolicy.Alter.Access.Permissive',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support permitting access to rows using the\n'
-        '`AS PERMISSIVE` clause in the `ALTER ROW POLICY` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_RowPolicy_Alter_Access_Restrictive = Requirement(
-        name='RQ.SRS-006.RBAC.RowPolicy.Alter.Access.Restrictive',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support restricting access to rows using the\n'
-        '`AS RESTRICTIVE` clause in the `ALTER ROW POLICY` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_RowPolicy_Alter_Condition = Requirement(
-        name='RQ.SRS-006.RBAC.RowPolicy.Alter.Condition',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support re-specifying the row policy condition\n'
-        'using the `USING` clause in the `ALTER ROW POLICY` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_RowPolicy_Alter_Condition_None = Requirement(
-        name='RQ.SRS-006.RBAC.RowPolicy.Alter.Condition.None',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support removing the row policy condition\n'
-        'using the `USING NONE` clause in the `ALTER ROW POLICY` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_RowPolicy_Alter_Assignment = Requirement(
-        name='RQ.SRS-006.RBAC.RowPolicy.Alter.Assignment',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support reassigning row policy to one or more users\n'
-        'or roles using the `TO` clause in the `ALTER ROW POLICY` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_RowPolicy_Alter_Assignment_None = Requirement(
-        name='RQ.SRS-006.RBAC.RowPolicy.Alter.Assignment.None',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support reassigning row policy to no users or roles using\n'
-        'the `TO NONE` clause in the `ALTER ROW POLICY` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_RowPolicy_Alter_Assignment_All = Requirement(
-        name='RQ.SRS-006.RBAC.RowPolicy.Alter.Assignment.All',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support reassigning row policy to all current users and roles\n'
-        'using the `TO ALL` clause in the `ALTER ROW POLICY` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_RowPolicy_Alter_Assignment_AllExcept = Requirement(
-        name='RQ.SRS-006.RBAC.RowPolicy.Alter.Assignment.AllExcept',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support excluding assignment of row policy to one or more users or roles using\n'
-        'the `ALL EXCEPT` clause in the `ALTER ROW POLICY` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_RowPolicy_Alter_Syntax = Requirement(
-        name='RQ.SRS-006.RBAC.RowPolicy.Alter.Syntax',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support the following syntax for the `ALTER ROW POLICY` statement\n'
-        '\n'
-        '``` sql\n'
-        'ALTER [ROW] POLICY [IF EXISTS] name [ON CLUSTER cluster_name] ON [database.]table\n'
-        '    [RENAME TO new_name]\n'
-        '    [AS {PERMISSIVE | RESTRICTIVE}]\n'
-        '    [FOR SELECT]\n'
-        '    [USING {condition | NONE}][,...]\n'
-        '    [TO {role [,...] | ALL | ALL EXCEPT role [,...]}]\n'
-        '```\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_RowPolicy_Drop = Requirement(
-        name='RQ.SRS-006.RBAC.RowPolicy.Drop',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support removing one or more row policies using the `DROP ROW POLICY` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_RowPolicy_Drop_IfExists = Requirement(
-        name='RQ.SRS-006.RBAC.RowPolicy.Drop.IfExists',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support using the `IF EXISTS` clause in the `DROP ROW POLICY` statement\n'
-        'to skip raising an exception when the row policy does not exist.\n'
-        'If the `IF EXISTS` clause is not specified then an exception SHALL be\n'
-        'raised if the row policy does not exist.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_RowPolicy_Drop_On = Requirement(
-        name='RQ.SRS-006.RBAC.RowPolicy.Drop.On',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support removing row policy from one or more specified tables\n'
-        'using the `ON` clause in the `DROP ROW POLICY` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_RowPolicy_Drop_OnCluster = Requirement(
-        name='RQ.SRS-006.RBAC.RowPolicy.Drop.OnCluster',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support removing row policy from specified cluster\n'
-        'using the `ON CLUSTER` clause in the `DROP ROW POLICY` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_RowPolicy_Drop_Syntax = Requirement(
-        name='RQ.SRS-006.RBAC.RowPolicy.Drop.Syntax',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support the following syntax for the `DROP ROW POLICY` statement.\n'
-        '\n'
-        '``` sql\n'
-        'DROP [ROW] POLICY [IF EXISTS] name [,...] ON [database.]table [,...] [ON CLUSTER cluster_name]\n'
-        '```\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_RowPolicy_ShowCreateRowPolicy = Requirement(
-        name='RQ.SRS-006.RBAC.RowPolicy.ShowCreateRowPolicy',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support showing the `CREATE ROW POLICY` statement used to create the row policy\n'
-        'using the `SHOW CREATE ROW POLICY` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_RowPolicy_ShowCreateRowPolicy_On = Requirement(
-        name='RQ.SRS-006.RBAC.RowPolicy.ShowCreateRowPolicy.On',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support showing statement used to create row policy on specific table\n'
-        'using the `ON` in the `SHOW CREATE ROW POLICY` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_RowPolicy_ShowCreateRowPolicy_Syntax = Requirement(
-        name='RQ.SRS-006.RBAC.RowPolicy.ShowCreateRowPolicy.Syntax',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support the following syntax for `SHOW CREATE ROW POLICY`.\n'
-        '\n'
-        '``` sql\n'
-        'SHOW CREATE [ROW] POLICY name ON [database.]table\n'
-        '```\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_RowPolicy_ShowRowPolicies = Requirement(
-        name='RQ.SRS-006.RBAC.RowPolicy.ShowRowPolicies',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support showing row policies using the `SHOW ROW POLICIES` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_RowPolicy_ShowRowPolicies_On = Requirement(
-        name='RQ.SRS-006.RBAC.RowPolicy.ShowRowPolicies.On',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support showing row policies on a specific table\n'
-        'using the `ON` clause in the `SHOW ROW POLICIES` statement.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_RowPolicy_ShowRowPolicies_Syntax = Requirement(
-        name='RQ.SRS-006.RBAC.RowPolicy.ShowRowPolicies.Syntax',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support the following syntax for `SHOW ROW POLICIES`.\n'
-        '\n'
-        '```sql\n'
-        'SHOW [ROW] POLICIES [ON [database.]table]\n'
-        '```\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Table_PublicTables = Requirement(
-        name='RQ.SRS-006.RBAC.Table.PublicTables',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support that a user without any privileges will be able to access the following tables\n'
-        '\n'
-        '* system.one\n'
-        '* system.numbers\n'
-        '* system.contributors\n'
-        '* system.functions\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Table_SensitiveTables = Requirement(
-        name='RQ.SRS-006.RBAC.Table.SensitiveTables',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL not support a user with no privileges accessing the following `system` tables:\n'
-        '\n'
-        '* processes\n'
-        '* query_log\n'
-        '* query_thread_log\n'
-        '* clusters\n'
-        '* events\n'
-        '* graphite_retentions\n'
-        '* stack_trace\n'
-        '* trace_log\n'
-        '* user_directories\n'
-        '* zookeeper\n'
-        '* macros\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_DistributedTable_Create = Requirement(
-        name='RQ.SRS-006.RBAC.DistributedTable.Create',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully `CREATE` a distributed table if and only if\n'
-        'the user has **create table** privilege on the table and **remote** privilege on *.*\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_DistributedTable_Select = Requirement(
-        name='RQ.SRS-006.RBAC.DistributedTable.Select',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully `SELECT` from a distributed table if and only if\n'
-        'the user has **select** privilege on the table and on the remote table specified in the `CREATE` query of the distributed table.\n'
-        '\n'
-        'Does not require **select** privilege for the remote table if the remote table does not exist on the same server as the user.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_DistributedTable_Insert = Requirement(
-        name='RQ.SRS-006.RBAC.DistributedTable.Insert',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully `INSERT` into a distributed table if and only if\n'
-        'the user has **insert** privilege on the table and on the remote table specified in the `CREATE` query of the distributed table.\n'
-        '\n'
-        'Does not require **insert** privilege for the remote table if the remote table does not exist on the same server as the user,\n'
-        'insert executes into the remote table on a different server.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_DistributedTable_SpecialTables = Requirement(
-        name='RQ.SRS-006.RBAC.DistributedTable.SpecialTables',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute a query using a distributed table that uses one of the special tables if and only if\n'
-        'the user has the necessary privileges to interact with that special table, either granted directly or through a role.\n'
-        'Special tables include:\n'
-        '* materialized view\n'
-        '* distributed table\n'
-        '* source table of a materialized view\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_DistributedTable_LocalUser = Requirement(
-        name='RQ.SRS-006.RBAC.DistributedTable.LocalUser',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute a query using a distributed table from\n'
-        'a user present locally, but not remotely.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_DistributedTable_SameUserDifferentNodesDifferentPrivileges = Requirement(
-        name='RQ.SRS-006.RBAC.DistributedTable.SameUserDifferentNodesDifferentPrivileges',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute a query using a distributed table by a user that exists on multiple nodes\n'
-        'if and only if the user has the required privileges on the node the query is being executed from.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_View = Requirement(
-        name='RQ.SRS-006.RBAC.View',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support controlling access to **create**, **select** and **drop**\n'
-        'privileges for a view for users or roles.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_View_Create = Requirement(
-        name='RQ.SRS-006.RBAC.View.Create',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL only successfully execute a `CREATE VIEW` command if and only if\n'
-        'the user has **create view** privilege either explicitly or through roles.\n'
-        '\n'
-        'If the stored query includes one or more source tables, the user must have **select** privilege\n'
-        'on all the source tables either explicitly or through a role.\n'
-        'For example,\n'
-        '```sql\n'
-        'CREATE VIEW view AS SELECT * FROM source_table\n'
-        'CREATE VIEW view AS SELECT * FROM table0 WHERE column IN (SELECT column FROM table1 WHERE column IN (SELECT column FROM table2 WHERE expression))\n'
-        'CREATE VIEW view AS SELECT * FROM table0 JOIN table1 USING column\n'
-        'CREATE VIEW view AS SELECT * FROM table0 UNION ALL SELECT * FROM table1 UNION ALL SELECT * FROM table2\n'
-        'CREATE VIEW view AS SELECT column FROM table0 JOIN table1 USING column UNION ALL SELECT column FROM table2 WHERE column IN (SELECT column FROM table3 WHERE column IN (SELECT column FROM table4 WHERE expression))\n'
-        'CREATE VIEW view0 AS SELECT column FROM view1 UNION ALL SELECT column FROM view2\n'
-        '```\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_View_Select = Requirement(
-        name='RQ.SRS-006.RBAC.View.Select',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL only successfully `SELECT` from a view if and only if\n'
-        'the user has **select** privilege for that view either explicitly or through a role.\n'
-        '\n'
-        'If the stored query includes one or more source tables, the user must have **select** privilege\n'
-        'on all the source tables either explicitly or through a role.\n'
-        'For example,\n'
-        '```sql\n'
-        'CREATE VIEW view AS SELECT * FROM source_table\n'
-        'CREATE VIEW view AS SELECT * FROM table0 WHERE column IN (SELECT column FROM table1 WHERE column IN (SELECT column FROM table2 WHERE expression))\n'
-        'CREATE VIEW view AS SELECT * FROM table0 JOIN table1 USING column\n'
-        'CREATE VIEW view AS SELECT * FROM table0 UNION ALL SELECT * FROM table1 UNION ALL SELECT * FROM table2\n'
-        'CREATE VIEW view AS SELECT column FROM table0 JOIN table1 USING column UNION ALL SELECT column FROM table2 WHERE column IN (SELECT column FROM table3 WHERE column IN (SELECT column FROM table4 WHERE expression))\n'
-        'CREATE VIEW view0 AS SELECT column FROM view1 UNION ALL SELECT column FROM view2\n'
-        '\n'
-        'SELECT * FROM view\n'
-        '```\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_View_Drop = Requirement(
-        name='RQ.SRS-006.RBAC.View.Drop',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL only successfully execute a `DROP VIEW` command if and only if\n'
-        'the user has **drop view** privilege on that view either explicitly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_MaterializedView = Requirement(
-        name='RQ.SRS-006.RBAC.MaterializedView',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support controlling access to **create**, **select**, **alter** and **drop**\n'
-        'privileges for a materialized view for users or roles.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_MaterializedView_Create = Requirement(
-        name='RQ.SRS-006.RBAC.MaterializedView.Create',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL only successfully execute a `CREATE MATERIALIZED VIEW` command if and only if\n'
-        'the user has **create view** privilege either explicitly or through roles.\n'
-        '\n'
-        'If `POPULATE` is specified, the user must have `INSERT` privilege on the view,\n'
-        'either explicitly or through roles.\n'
-        'For example,\n'
-        '```sql\n'
-        'CREATE MATERIALIZED VIEW view ENGINE = Memory POPULATE AS SELECT * FROM source_table\n'
-        '```\n'
-        '\n'
-        'If the stored query includes one or more source tables, the user must have **select** privilege\n'
-        'on all the source tables either explicitly or through a role.\n'
-        'For example,\n'
-        '```sql\n'
-        'CREATE MATERIALIZED VIEW view ENGINE = Memory AS SELECT * FROM source_table\n'
-        'CREATE MATERIALIZED VIEW view ENGINE = Memory AS SELECT * FROM table0 WHERE column IN (SELECT column FROM table1 WHERE column IN (SELECT column FROM table2 WHERE expression))\n'
-        'CREATE MATERIALIZED VIEW view ENGINE = Memory AS SELECT * FROM table0 JOIN table1 USING column\n'
-        'CREATE MATERIALIZED VIEW view ENGINE = Memory AS SELECT * FROM table0 UNION ALL SELECT * FROM table1 UNION ALL SELECT * FROM table2\n'
-        'CREATE MATERIALIZED VIEW view ENGINE = Memory AS SELECT column FROM table0 JOIN table1 USING column UNION ALL SELECT column FROM table2 WHERE column IN (SELECT column FROM table3 WHERE column IN (SELECT column FROM table4 WHERE expression))\n'
-        'CREATE MATERIALIZED VIEW view0 ENGINE = Memory AS SELECT column FROM view1 UNION ALL SELECT column FROM view2\n'
-        '```\n'
-        '\n'
-        'If the materialized view has a target table explicitly declared in the `TO` clause, the user must have\n'
-        '**insert** and **select** privilege on the target table.\n'
-        'For example,\n'
-        '```sql\n'
-        'CREATE MATERIALIZED VIEW view TO target_table AS SELECT * FROM source_table\n'
-        '```\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_MaterializedView_Select = Requirement(
-        name='RQ.SRS-006.RBAC.MaterializedView.Select',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL only successfully `SELECT` from a materialized view if and only if\n'
-        'the user has **select** privilege for that view either explicitly or through a role.\n'
-        '\n'
-        'If the stored query includes one or more source tables, the user must have **select** privilege\n'
-        'on all the source tables either explicitly or through a role.\n'
-        'For example,\n'
-        '```sql\n'
-        'CREATE MATERIALIZED VIEW view ENGINE = Memory AS SELECT * FROM source_table\n'
-        'CREATE MATERIALIZED VIEW view ENGINE = Memory AS SELECT * FROM table0 WHERE column IN (SELECT column FROM table1 WHERE column IN (SELECT column FROM table2 WHERE expression))\n'
-        'CREATE MATERIALIZED VIEW view ENGINE = Memory AS SELECT * FROM table0 JOIN table1 USING column\n'
-        'CREATE MATERIALIZED VIEW view ENGINE = Memory AS SELECT * FROM table0 UNION ALL SELECT * FROM table1 UNION ALL SELECT * FROM table2\n'
-        'CREATE MATERIALIZED VIEW view ENGINE = Memory AS SELECT column FROM table0 JOIN table1 USING column UNION ALL SELECT column FROM table2 WHERE column IN (SELECT column FROM table3 WHERE column IN (SELECT column FROM table4 WHERE expression))\n'
-        'CREATE MATERIALIZED VIEW view0 ENGINE = Memory AS SELECT column FROM view1 UNION ALL SELECT column FROM view2\n'
-        '\n'
-        'SELECT * FROM view\n'
-        '```\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_MaterializedView_Select_TargetTable = Requirement(
-        name='RQ.SRS-006.RBAC.MaterializedView.Select.TargetTable',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL only successfully `SELECT` from the target table, implicit or explicit, of a materialized view if and only if\n'
-        'the user has `SELECT` privilege for the table, either explicitly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_MaterializedView_Select_SourceTable = Requirement(
-        name='RQ.SRS-006.RBAC.MaterializedView.Select.SourceTable',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL only successfully `SELECT` from the source table of a materialized view if and only if\n'
-        'the user has `SELECT` privilege for the table, either explicitly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_MaterializedView_Drop = Requirement(
-        name='RQ.SRS-006.RBAC.MaterializedView.Drop',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL only successfully execute a `DROP VIEW` command if and only if\n'
-        'the user has **drop view** privilege on that view either explicitly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_MaterializedView_ModifyQuery = Requirement(
-        name='RQ.SRS-006.RBAC.MaterializedView.ModifyQuery',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL only successfully execute a `MODIFY QUERY` command if and only if\n'
-        'the user has **modify query** privilege on that view either explicitly or through a role.\n'
-        '\n'
-        'If the new query includes one or more source tables, the user must have **select** privilege\n'
-        'on all the source tables either explicitly or through a role.\n'
-        'For example,\n'
-        '```sql\n'
-        'ALTER TABLE view MODIFY QUERY SELECT * FROM source_table\n'
-        '```\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_MaterializedView_Insert = Requirement(
-        name='RQ.SRS-006.RBAC.MaterializedView.Insert',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL only succesfully `INSERT` into a materialized view if and only if\n'
-        'the user has `INSERT` privilege on the view, either explicitly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_MaterializedView_Insert_SourceTable = Requirement(
-        name='RQ.SRS-006.RBAC.MaterializedView.Insert.SourceTable',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL only succesfully `INSERT` into a source table of a materialized view if and only if\n'
-        'the user has `INSERT` privilege on the source table, either explicitly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_MaterializedView_Insert_TargetTable = Requirement(
-        name='RQ.SRS-006.RBAC.MaterializedView.Insert.TargetTable',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL only succesfully `INSERT` into a target table of a materialized view if and only if\n'
-        'the user has `INSERT` privelege on the target table, either explicitly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_LiveView = Requirement(
-        name='RQ.SRS-006.RBAC.LiveView',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support controlling access to **create**, **select**, **alter** and **drop**\n'
-        'privileges for a live view for users or roles.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_LiveView_Create = Requirement(
-        name='RQ.SRS-006.RBAC.LiveView.Create',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL only successfully execute a `CREATE LIVE VIEW` command if and only if\n'
-        'the user has **create view** privilege either explicitly or through roles.\n'
-        '\n'
-        'If the stored query includes one or more source tables, the user must have **select** privilege\n'
-        'on all the source tables either explicitly or through a role.\n'
-        'For example,\n'
-        '```sql\n'
-        'CREATE LIVE VIEW view AS SELECT * FROM source_table\n'
-        'CREATE LIVE VIEW view AS SELECT * FROM table0 WHERE column IN (SELECT column FROM table1 WHERE column IN (SELECT column FROM table2 WHERE expression))\n'
-        'CREATE LIVE VIEW view AS SELECT * FROM table0 JOIN table1 USING column\n'
-        'CREATE LIVE VIEW view AS SELECT * FROM table0 UNION ALL SELECT * FROM table1 UNION ALL SELECT * FROM table2\n'
-        'CREATE LIVE VIEW view AS SELECT column FROM table0 JOIN table1 USING column UNION ALL SELECT column FROM table2 WHERE column IN (SELECT column FROM table3 WHERE column IN (SELECT column FROM table4 WHERE expression))\n'
-        'CREATE LIVE VIEW view0 AS SELECT column FROM view1 UNION ALL SELECT column FROM view2\n'
-        '```\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_LiveView_Select = Requirement(
-        name='RQ.SRS-006.RBAC.LiveView.Select',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL only successfully `SELECT` from a live view if and only if\n'
-        'the user has **select** privilege for that view either explicitly or through a role.\n'
-        '\n'
-        'If the stored query includes one or more source tables, the user must have **select** privilege\n'
-        'on all the source tables either explicitly or through a role.\n'
-        'For example,\n'
-        '```sql\n'
-        'CREATE LIVE VIEW view AS SELECT * FROM source_table\n'
-        'CREATE LIVE VIEW view AS SELECT * FROM table0 WHERE column IN (SELECT column FROM table1 WHERE column IN (SELECT column FROM table2 WHERE expression))\n'
-        'CREATE LIVE VIEW view AS SELECT * FROM table0 JOIN table1 USING column\n'
-        'CREATE LIVE VIEW view AS SELECT * FROM table0 UNION ALL SELECT * FROM table1 UNION ALL SELECT * FROM table2\n'
-        'CREATE LIVE VIEW view AS SELECT column FROM table0 JOIN table1 USING column UNION ALL SELECT column FROM table2 WHERE column IN (SELECT column FROM table3 WHERE column IN (SELECT column FROM table4 WHERE expression))\n'
-        'CREATE LIVE VIEW view0 AS SELECT column FROM view1 UNION ALL SELECT column FROM view2\n'
-        '\n'
-        'SELECT * FROM view\n'
-        '```\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_LiveView_Drop = Requirement(
-        name='RQ.SRS-006.RBAC.LiveView.Drop',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL only successfully execute a `DROP VIEW` command if and only if\n'
-        'the user has **drop view** privilege on that view either explicitly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_LiveView_Refresh = Requirement(
-        name='RQ.SRS-006.RBAC.LiveView.Refresh',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL only successfully execute an `ALTER LIVE VIEW REFRESH` command if and only if\n'
-        'the user has **refresh** privilege on that view either explicitly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Select = Requirement(
-        name='RQ.SRS-006.RBAC.Select',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL execute `SELECT` if and only if the user\n'
-        'has the **select** privilege for the destination table\n'
-        'either because of the explicit grant or through one of the roles assigned to the user.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Select_Column = Requirement(
-        name='RQ.SRS-006.RBAC.Select.Column',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support granting or revoking **select** privilege\n'
-        'for one or more specified columns in a table to one or more **users** or **roles**.\n'
-        'Any `SELECT` statements SHALL not to be executed, unless the user\n'
-        'has the **select** privilege for the destination column\n'
-        'either because of the explicit grant or through one of the roles assigned to the user.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Select_Cluster = Requirement(
-        name='RQ.SRS-006.RBAC.Select.Cluster',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support granting or revoking **select** privilege\n'
-        'on a specified cluster to one or more **users** or **roles**.\n'
-        'Any `SELECT` statements SHALL succeed only on nodes where\n'
-        'the table exists and privilege was granted.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Select_TableEngines = Requirement(
-        name='RQ.SRS-006.RBAC.Select.TableEngines',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support controlling access to the **select** privilege\n'
-        'on tables created using the following engines\n'
-        '\n'
-        '* MergeTree\n'
-        '* ReplacingMergeTree\n'
-        '* SummingMergeTree\n'
-        '* AggregatingMergeTree\n'
-        '* CollapsingMergeTree\n'
-        '* VersionedCollapsingMergeTree\n'
-        '* GraphiteMergeTree\n'
-        '* ReplicatedMergeTree\n'
-        '* ReplicatedSummingMergeTree\n'
-        '* ReplicatedReplacingMergeTree\n'
-        '* ReplicatedAggregatingMergeTree\n'
-        '* ReplicatedCollapsingMergeTree\n'
-        '* ReplicatedVersionedCollapsingMergeTree\n'
-        '* ReplicatedGraphiteMergeTree\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Insert = Requirement(
-        name='RQ.SRS-006.RBAC.Insert',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL execute `INSERT INTO` if and only if the user\n'
-        'has the **insert** privilege for the destination table\n'
-        'either because of the explicit grant or through one of the roles assigned to the user.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Insert_Column = Requirement(
-        name='RQ.SRS-006.RBAC.Insert.Column',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support granting or revoking **insert** privilege\n'
-        'for one or more specified columns in a table to one or more **users** or **roles**.\n'
-        'Any `INSERT INTO` statements SHALL not to be executed, unless the user\n'
-        'has the **insert** privilege for the destination column\n'
-        'either because of the explicit grant or through one of the roles assigned to the user.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Insert_Cluster = Requirement(
-        name='RQ.SRS-006.RBAC.Insert.Cluster',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support granting or revoking **insert** privilege\n'
-        'on a specified cluster to one or more **users** or **roles**.\n'
-        'Any `INSERT INTO` statements SHALL succeed only on nodes where\n'
-        'the table exists and privilege was granted.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Insert_TableEngines = Requirement(
-        name='RQ.SRS-006.RBAC.Insert.TableEngines',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support controlling access to the **insert** privilege\n'
-        'on tables created using the following engines\n'
-        '\n'
-        '* MergeTree\n'
-        '* ReplacingMergeTree\n'
-        '* SummingMergeTree\n'
-        '* AggregatingMergeTree\n'
-        '* CollapsingMergeTree\n'
-        '* VersionedCollapsingMergeTree\n'
-        '* GraphiteMergeTree\n'
-        '* ReplicatedMergeTree\n'
-        '* ReplicatedSummingMergeTree\n'
-        '* ReplicatedReplacingMergeTree\n'
-        '* ReplicatedAggregatingMergeTree\n'
-        '* ReplicatedCollapsingMergeTree\n'
-        '* ReplicatedVersionedCollapsingMergeTree\n'
-        '* ReplicatedGraphiteMergeTree\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_AlterColumn = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.AlterColumn',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support controlling access to the **alter column** privilege\n'
-        'for a database or a specific table to one or more **users** or **roles**.\n'
-        'Any `ALTER TABLE ... ADD|DROP|CLEAR|COMMENT|MODIFY COLUMN` statements SHALL\n'
-        'return an error, unless the user has the **alter column** privilege for\n'
-        'the destination table either because of the explicit grant or through one of\n'
-        'the roles assigned to the user.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_AlterColumn_Grant = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.AlterColumn.Grant',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support granting **alter column** privilege\n'
-        'for a database or a specific table to one or more **users** or **roles**.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_AlterColumn_Revoke = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.AlterColumn.Revoke',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support revoking **alter column** privilege\n'
-        'for a database or a specific table to one or more **users** or **roles**\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_AlterColumn_Column = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.AlterColumn.Column',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support granting or revoking **alter column** privilege\n'
-        'for one or more specified columns in a table to one or more **users** or **roles**.\n'
-        'Any `ALTER TABLE ... ADD|DROP|CLEAR|COMMENT|MODIFY COLUMN` statements SHALL return an error,\n'
-        'unless the user has the **alter column** privilege for the destination column\n'
-        'either because of the explicit grant or through one of the roles assigned to the user.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_AlterColumn_Cluster = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.AlterColumn.Cluster',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support granting or revoking **alter column** privilege\n'
-        'on a specified cluster to one or more **users** or **roles**.\n'
-        'Any `ALTER TABLE ... ADD|DROP|CLEAR|COMMENT|MODIFY COLUMN`\n'
-        'statements SHALL succeed only on nodes where the table exists and privilege was granted.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_AlterColumn_TableEngines = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.AlterColumn.TableEngines',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support controlling access to the **alter column** privilege\n'
-        'on tables created using the following engines\n'
-        '\n'
-        '* MergeTree\n'
-        '* ReplacingMergeTree\n'
-        '* SummingMergeTree\n'
-        '* AggregatingMergeTree\n'
-        '* CollapsingMergeTree\n'
-        '* VersionedCollapsingMergeTree\n'
-        '* GraphiteMergeTree\n'
-        '* ReplicatedMergeTree\n'
-        '* ReplicatedSummingMergeTree\n'
-        '* ReplicatedReplacingMergeTree\n'
-        '* ReplicatedAggregatingMergeTree\n'
-        '* ReplicatedCollapsingMergeTree\n'
-        '* ReplicatedVersionedCollapsingMergeTree\n'
-        '* ReplicatedGraphiteMergeTree\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_AlterIndex = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.AlterIndex',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support controlling access to the **alter index** privilege\n'
-        'for a database or a specific table to one or more **users** or **roles**.\n'
-        'Any `ALTER TABLE ... ORDER BY | ADD|DROP|MATERIALIZE|CLEAR INDEX` statements SHALL\n'
-        'return an error, unless the user has the **alter index** privilege for\n'
-        'the destination table either because of the explicit grant or through one of\n'
-        'the roles assigned to the user.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_AlterIndex_Grant = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.AlterIndex.Grant',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support granting **alter index** privilege\n'
-        'for a database or a specific table to one or more **users** or **roles**.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_AlterIndex_Revoke = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.AlterIndex.Revoke',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support revoking **alter index** privilege\n'
-        'for a database or a specific table to one or more **users** or **roles**\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_AlterIndex_Cluster = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.AlterIndex.Cluster',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support granting or revoking **alter index** privilege\n'
-        'on a specified cluster to one or more **users** or **roles**.\n'
-        'Any `ALTER TABLE ... ORDER BY | ADD|DROP|MATERIALIZE|CLEAR INDEX`\n'
-        'statements SHALL succeed only on nodes where the table exists and privilege was granted.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_AlterIndex_TableEngines = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.AlterIndex.TableEngines',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support controlling access to the **alter index** privilege\n'
-        'on tables created using the following engines\n'
-        '\n'
-        '* MergeTree\n'
-        '* ReplacingMergeTree\n'
-        '* SummingMergeTree\n'
-        '* AggregatingMergeTree\n'
-        '* CollapsingMergeTree\n'
-        '* VersionedCollapsingMergeTree\n'
-        '* GraphiteMergeTree\n'
-        '* ReplicatedMergeTree\n'
-        '* ReplicatedSummingMergeTree\n'
-        '* ReplicatedReplacingMergeTree\n'
-        '* ReplicatedAggregatingMergeTree\n'
-        '* ReplicatedCollapsingMergeTree\n'
-        '* ReplicatedVersionedCollapsingMergeTree\n'
-        '* ReplicatedGraphiteMergeTree\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_AlterConstraint = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.AlterConstraint',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support controlling access to the **alter constraint** privilege\n'
-        'for a database or a specific table to one or more **users** or **roles**.\n'
-        'Any `ALTER TABLE ... ADD|CREATE CONSTRAINT` statements SHALL\n'
-        'return an error, unless the user has the **alter constraint** privilege for\n'
-        'the destination table either because of the explicit grant or through one of\n'
-        'the roles assigned to the user.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_AlterConstraint_Grant = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.AlterConstraint.Grant',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support granting **alter constraint** privilege\n'
-        'for a database or a specific table to one or more **users** or **roles**.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_AlterConstraint_Revoke = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.AlterConstraint.Revoke',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support revoking **alter constraint** privilege\n'
-        'for a database or a specific table to one or more **users** or **roles**\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_AlterConstraint_Cluster = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.AlterConstraint.Cluster',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support granting or revoking **alter constraint** privilege\n'
-        'on a specified cluster to one or more **users** or **roles**.\n'
-        'Any `ALTER TABLE ... ADD|DROP CONSTRAINT`\n'
-        'statements SHALL succeed only on nodes where the table exists and privilege was granted.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_AlterConstraint_TableEngines = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.AlterConstraint.TableEngines',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support controlling access to the **alter constraint** privilege\n'
-        'on tables created using the following engines\n'
-        '\n'
-        '* MergeTree\n'
-        '* ReplacingMergeTree\n'
-        '* SummingMergeTree\n'
-        '* AggregatingMergeTree\n'
-        '* CollapsingMergeTree\n'
-        '* VersionedCollapsingMergeTree\n'
-        '* GraphiteMergeTree\n'
-        '* ReplicatedMergeTree\n'
-        '* ReplicatedSummingMergeTree\n'
-        '* ReplicatedReplacingMergeTree\n'
-        '* ReplicatedAggregatingMergeTree\n'
-        '* ReplicatedCollapsingMergeTree\n'
-        '* ReplicatedVersionedCollapsingMergeTree\n'
-        '* ReplicatedGraphiteMergeTree\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_AlterTTL = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.AlterTTL',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support controlling access to the **alter ttl** or **alter materialize ttl** privilege\n'
-        'for a database or a specific table to one or more **users** or **roles**.\n'
-        'Any `ALTER TABLE ... ALTER TTL | ALTER MATERIALIZE TTL` statements SHALL\n'
-        'return an error, unless the user has the **alter ttl** or **alter materialize ttl** privilege for\n'
-        'the destination table either because of the explicit grant or through one of\n'
-        'the roles assigned to the user.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_AlterTTL_Grant = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.AlterTTL.Grant',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support granting **alter ttl** or **alter materialize ttl** privilege\n'
-        'for a database or a specific table to one or more **users** or **roles**.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_AlterTTL_Revoke = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.AlterTTL.Revoke',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support revoking **alter ttl** or **alter materialize ttl** privilege\n'
-        'for a database or a specific table to one or more **users** or **roles**\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_AlterTTL_Cluster = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.AlterTTL.Cluster',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support granting or revoking **alter ttl** or **alter materialize ttl** privilege\n'
-        'on a specified cluster to one or more **users** or **roles**.\n'
-        'Any `ALTER TABLE ... ALTER TTL | ALTER MATERIALIZE TTL`\n'
-        'statements SHALL succeed only on nodes where the table exists and privilege was granted.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_AlterTTL_TableEngines = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.AlterTTL.TableEngines',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support controlling access to the **alter ttl** or **alter materialize ttl** privilege\n'
-        'on tables created using the following engines\n'
-        '\n'
-        '* MergeTree\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_AlterSettings = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.AlterSettings',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support controlling access to the **alter settings** privilege\n'
-        'for a database or a specific table to one or more **users** or **roles**.\n'
-        'Any `ALTER TABLE ... MODIFY SETTING setting` statements SHALL\n'
-        'return an error, unless the user has the **alter settings** privilege for\n'
-        'the destination table either because of the explicit grant or through one of\n'
-        'the roles assigned to the user. The **alter settings** privilege allows\n'
-        'modifying table engine settings. It doesn’t affect settings or server configuration parameters.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_AlterSettings_Grant = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.AlterSettings.Grant',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support granting **alter settings** privilege\n'
-        'for a database or a specific table to one or more **users** or **roles**.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_AlterSettings_Revoke = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.AlterSettings.Revoke',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support revoking **alter settings** privilege\n'
-        'for a database or a specific table to one or more **users** or **roles**\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_AlterSettings_Cluster = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.AlterSettings.Cluster',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support granting or revoking **alter settings** privilege\n'
-        'on a specified cluster to one or more **users** or **roles**.\n'
-        'Any `ALTER TABLE ... MODIFY SETTING setting`\n'
-        'statements SHALL succeed only on nodes where the table exists and privilege was granted.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_AlterSettings_TableEngines = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.AlterSettings.TableEngines',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support controlling access to the **alter settings** privilege\n'
-        'on tables created using the following engines\n'
-        '\n'
-        '* MergeTree\n'
-        '* ReplacingMergeTree\n'
-        '* SummingMergeTree\n'
-        '* AggregatingMergeTree\n'
-        '* CollapsingMergeTree\n'
-        '* VersionedCollapsingMergeTree\n'
-        '* GraphiteMergeTree\n'
-        '* ReplicatedMergeTree\n'
-        '* ReplicatedSummingMergeTree\n'
-        '* ReplicatedReplacingMergeTree\n'
-        '* ReplicatedAggregatingMergeTree\n'
-        '* ReplicatedCollapsingMergeTree\n'
-        '* ReplicatedVersionedCollapsingMergeTree\n'
-        '* ReplicatedGraphiteMergeTree\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_AlterUpdate = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.AlterUpdate',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `ALTER UPDATE` statement if and only if the user has **alter update** privilege for that column,\n'
-        'either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_AlterUpdate_Grant = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.AlterUpdate.Grant',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support granting **alter update** privilege on a column level\n'
-        'to one or more **users** or **roles**.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_AlterUpdate_Revoke = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.AlterUpdate.Revoke',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support revoking **alter update** privilege on a column level\n'
-        'from one or more **users** or **roles**.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_AlterUpdate_TableEngines = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.AlterUpdate.TableEngines',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support controlling access to the **alter update** privilege\n'
-        'on tables created using the following engines\n'
-        '\n'
-        '* MergeTree\n'
-        '* ReplacingMergeTree\n'
-        '* SummingMergeTree\n'
-        '* AggregatingMergeTree\n'
-        '* CollapsingMergeTree\n'
-        '* VersionedCollapsingMergeTree\n'
-        '* GraphiteMergeTree\n'
-        '* ReplicatedMergeTree\n'
-        '* ReplicatedSummingMergeTree\n'
-        '* ReplicatedReplacingMergeTree\n'
-        '* ReplicatedAggregatingMergeTree\n'
-        '* ReplicatedCollapsingMergeTree\n'
-        '* ReplicatedVersionedCollapsingMergeTree\n'
-        '* ReplicatedGraphiteMergeTree\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_AlterDelete = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.AlterDelete',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `ALTER DELETE` statement if and only if the user has **alter delete** privilege for that table,\n'
-        'either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_AlterDelete_Grant = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.AlterDelete.Grant',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support granting **alter delete** privilege on a column level\n'
-        'to one or more **users** or **roles**.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_AlterDelete_Revoke = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.AlterDelete.Revoke',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support revoking **alter delete** privilege on a column level\n'
-        'from one or more **users** or **roles**.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_AlterDelete_TableEngines = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.AlterDelete.TableEngines',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support controlling access to the **alter delete** privilege\n'
-        'on tables created using the following engines\n'
-        '\n'
-        '* MergeTree\n'
-        '* ReplacingMergeTree\n'
-        '* SummingMergeTree\n'
-        '* AggregatingMergeTree\n'
-        '* CollapsingMergeTree\n'
-        '* VersionedCollapsingMergeTree\n'
-        '* GraphiteMergeTree\n'
-        '* ReplicatedMergeTree\n'
-        '* ReplicatedSummingMergeTree\n'
-        '* ReplicatedReplacingMergeTree\n'
-        '* ReplicatedAggregatingMergeTree\n'
-        '* ReplicatedCollapsingMergeTree\n'
-        '* ReplicatedVersionedCollapsingMergeTree\n'
-        '* ReplicatedGraphiteMergeTree\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_AlterFreeze = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.AlterFreeze',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `ALTER FREEZE` statement if and only if the user has **alter freeze** privilege for that table,\n'
-        'either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_AlterFreeze_Grant = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.AlterFreeze.Grant',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support granting **alter freeze** privilege on a column level\n'
-        'to one or more **users** or **roles**.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_AlterFreeze_Revoke = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.AlterFreeze.Revoke',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support revoking **alter freeze** privilege on a column level\n'
-        'from one or more **users** or **roles**.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_AlterFreeze_TableEngines = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.AlterFreeze.TableEngines',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support controlling access to the **alter freeze** privilege\n'
-        'on tables created using the following engines\n'
-        '\n'
-        '* MergeTree\n'
-        '* ReplacingMergeTree\n'
-        '* SummingMergeTree\n'
-        '* AggregatingMergeTree\n'
-        '* CollapsingMergeTree\n'
-        '* VersionedCollapsingMergeTree\n'
-        '* GraphiteMergeTree\n'
-        '* ReplicatedMergeTree\n'
-        '* ReplicatedSummingMergeTree\n'
-        '* ReplicatedReplacingMergeTree\n'
-        '* ReplicatedAggregatingMergeTree\n'
-        '* ReplicatedCollapsingMergeTree\n'
-        '* ReplicatedVersionedCollapsingMergeTree\n'
-        '* ReplicatedGraphiteMergeTree\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_AlterFetch = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.AlterFetch',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `ALTER FETCH` statement if and only if the user has **alter fetch** privilege for that table,\n'
-        'either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_AlterFetch_Grant = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.AlterFetch.Grant',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support granting **alter fetch** privilege on a column level\n'
-        'to one or more **users** or **roles**.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_AlterFetch_Revoke = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.AlterFetch.Revoke',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support revoking **alter fetch** privilege on a column level\n'
-        'from one or more **users** or **roles**.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_AlterFetch_TableEngines = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.AlterFetch.TableEngines',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support controlling access to the **alter fetch** privilege\n'
-        'on tables created using the following engines\n'
-        '\n'
-        '* ReplicatedMergeTree\n'
-        '* ReplicatedSummingMergeTree\n'
-        '* ReplicatedReplacingMergeTree\n'
-        '* ReplicatedAggregatingMergeTree\n'
-        '* ReplicatedCollapsingMergeTree\n'
-        '* ReplicatedVersionedCollapsingMergeTree\n'
-        '* ReplicatedGraphiteMergeTree\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_AlterMove = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.AlterMove',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `ALTER MOVE` statement if and only if the user has **alter move**, **select**, and **alter delete** privilege on the source table\n'
-        'and **insert** privilege on the target table, either directly or through a role.\n'
-        'For example,\n'
-        '```sql\n'
-        'ALTER TABLE source_table MOVE PARTITION 1 TO target_table\n'
-        '```\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_AlterMove_Grant = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.AlterMove.Grant',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support granting **alter move** privilege on a column level\n'
-        'to one or more **users** or **roles**.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_AlterMove_Revoke = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.AlterMove.Revoke',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support revoking **alter move** privilege on a column level\n'
-        'from one or more **users** or **roles**.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_AlterMove_TableEngines = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.AlterMove.TableEngines',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support controlling access to the **alter move** privilege\n'
-        'on tables created using the following engines\n'
-        '\n'
-        '* MergeTree\n'
-        '* ReplacingMergeTree\n'
-        '* SummingMergeTree\n'
-        '* AggregatingMergeTree\n'
-        '* CollapsingMergeTree\n'
-        '* VersionedCollapsingMergeTree\n'
-        '* GraphiteMergeTree\n'
-        '* ReplicatedMergeTree\n'
-        '* ReplicatedSummingMergeTree\n'
-        '* ReplicatedReplacingMergeTree\n'
-        '* ReplicatedAggregatingMergeTree\n'
-        '* ReplicatedCollapsingMergeTree\n'
-        '* ReplicatedVersionedCollapsingMergeTree\n'
-        '* ReplicatedGraphiteMergeTree\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_CreateTable = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.CreateTable',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL only successfully execute a `CREATE TABLE` command if and only if\n'
-        'the user has **create table** privilege either explicitly or through roles.\n'
-        '\n'
-        'If the stored query includes one or more source tables, the user must have **select** privilege\n'
-        "on all the source tables and **insert** for the table they're trying to create either explicitly or through a role.\n"
-        'For example,\n'
-        '```sql\n'
-        'CREATE TABLE table AS SELECT * FROM source_table\n'
-        'CREATE TABLE table AS SELECT * FROM table0 WHERE column IN (SELECT column FROM table1 WHERE column IN (SELECT column FROM table2 WHERE expression))\n'
-        'CREATE TABLE table AS SELECT * FROM table0 JOIN table1 USING column\n'
-        'CREATE TABLE table AS SELECT * FROM table0 UNION ALL SELECT * FROM table1 UNION ALL SELECT * FROM table2\n'
-        'CREATE TABLE table AS SELECT column FROM table0 JOIN table1 USING column UNION ALL SELECT column FROM table2 WHERE column IN (SELECT column FROM table3 WHERE column IN (SELECT column FROM table4 WHERE expression))\n'
-        'CREATE TABLE table0 AS SELECT column FROM table1 UNION ALL SELECT column FROM table2\n'
-        '```\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_CreateDatabase = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.CreateDatabase',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `CREATE DATABASE` statement if and only if the user has **create database** privilege on the database,\n'
-        'either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_CreateDictionary = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.CreateDictionary',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `CREATE DICTIONARY` statement if and only if the user has **create dictionary** privilege on the dictionary,\n'
-        'either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_CreateTemporaryTable = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.CreateTemporaryTable',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `CREATE TEMPORARY TABLE` statement if and only if the user has **create temporary table** privilege on the table,\n'
-        'either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_AttachDatabase = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.AttachDatabase',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `ATTACH DATABASE` statement if and only if the user has **create database** privilege on the database,\n'
-        'either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_AttachDictionary = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.AttachDictionary',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `ATTACH DICTIONARY` statement if and only if the user has **create dictionary** privilege on the dictionary,\n'
-        'either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_AttachTemporaryTable = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.AttachTemporaryTable',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `ATTACH TEMPORARY TABLE` statement if and only if the user has **create temporary table** privilege on the table,\n'
-        'either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_AttachTable = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.AttachTable',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `ATTACH TABLE` statement if and only if the user has **create table** privilege on the table,\n'
-        'either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_DropTable = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.DropTable',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `DROP TABLE` statement if and only if the user has **drop table** privilege on the table,\n'
-        'either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_DropDatabase = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.DropDatabase',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `DROP DATABASE` statement if and only if the user has **drop database** privilege on the database,\n'
-        'either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_DropDictionary = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.DropDictionary',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `DROP DICTIONARY` statement if and only if the user has **drop dictionary** privilege on the dictionary,\n'
-        'either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_DetachTable = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.DetachTable',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `DETACH TABLE` statement if and only if the user has **drop table** privilege on the table,\n'
-        'either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_DetachView = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.DetachView',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `DETACH VIEW` statement if and only if the user has **drop view** privilege on the view,\n'
-        'either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_DetachDatabase = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.DetachDatabase',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `DETACH DATABASE` statement if and only if the user has **drop database** privilege on the database,\n'
-        'either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_DetachDictionary = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.DetachDictionary',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `DETACH DICTIONARY` statement if and only if the user has **drop dictionary** privilege on the dictionary,\n'
-        'either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_Truncate = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.Truncate',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `TRUNCATE TABLE` statement if and only if the user has **truncate table** privilege on the table,\n'
-        'either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_Optimize = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.Optimize',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `OPTIMIZE TABLE` statement if and only if the user has **optimize table** privilege on the table,\n'
-        'either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_KillQuery = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.KillQuery',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `KILL QUERY` statement if and only if the user has **kill query** privilege,\n'
-        'either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_KillMutation = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.KillMutation',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `KILL MUTATION` statement if and only if\n'
-        'the user has the privilege that created the mutation, either directly or through a role.\n'
-        'For example, to `KILL MUTATION` after `ALTER UPDATE` query, the user needs `ALTER UPDATE` privilege.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_KillMutation_AlterUpdate = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.KillMutation.AlterUpdate',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `KILL MUTATION` query on an `ALTER UPDATE` mutation if and only if\n'
-        'the user has `ALTER UPDATE` privilege on the table where the mutation was created, either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_KillMutation_AlterDelete = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.KillMutation.AlterDelete',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `KILL MUTATION` query on an `ALTER DELETE` mutation if and only if\n'
-        'the user has `ALTER DELETE` privilege on the table where the mutation was created, either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_KillMutation_AlterDropColumn = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.KillMutation.AlterDropColumn',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `KILL MUTATION` query on an `ALTER DROP COLUMN` mutation if and only if\n'
-        'the user has `ALTER DROP COLUMN` privilege on the table where the mutation was created, either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_ShowTables_Privilege = Requirement(
-        name='RQ.SRS-006.RBAC.ShowTables.Privilege',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL grant **show tables** privilege on a table to a user if that user has recieved any grant,\n'
-        'including `SHOW TABLES`, on that table, either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_ShowTables_RequiredPrivilege = Requirement(
-        name='RQ.SRS-006.RBAC.ShowTables.RequiredPrivilege',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `SHOW TABLES` statement if and only if the user has **show tables** privilege,\n'
-        'or any privilege on the table either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_ExistsTable_RequiredPrivilege = Requirement(
-        name='RQ.SRS-006.RBAC.ExistsTable.RequiredPrivilege',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `EXISTS table` statement if and only if the user has **show tables** privilege,\n'
-        'or any privilege on the table either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_CheckTable_RequiredPrivilege = Requirement(
-        name='RQ.SRS-006.RBAC.CheckTable.RequiredPrivilege',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `CHECK table` statement if and only if the user has **show tables** privilege,\n'
-        'or any privilege on the table either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_ShowDatabases_Privilege = Requirement(
-        name='RQ.SRS-006.RBAC.ShowDatabases.Privilege',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL grant **show databases** privilege on a database to a user if that user has recieved any grant,\n'
-        'including `SHOW DATABASES`, on that table, either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_ShowDatabases_RequiredPrivilege = Requirement(
-        name='RQ.SRS-006.RBAC.ShowDatabases.RequiredPrivilege',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `SHOW DATABASES` statement if and only if the user has **show databases** privilege,\n'
-        'or any privilege on the database either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_ShowCreateDatabase_RequiredPrivilege = Requirement(
-        name='RQ.SRS-006.RBAC.ShowCreateDatabase.RequiredPrivilege',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `SHOW CREATE DATABASE` statement if and only if the user has **show databases** privilege,\n'
-        'or any privilege on the database either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_UseDatabase_RequiredPrivilege = Requirement(
-        name='RQ.SRS-006.RBAC.UseDatabase.RequiredPrivilege',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `USE database` statement if and only if the user has **show databases** privilege,\n'
-        'or any privilege on the database either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_ShowColumns_Privilege = Requirement(
-        name='RQ.SRS-006.RBAC.ShowColumns.Privilege',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support granting or revoking the `SHOW COLUMNS` privilege.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_ShowCreateTable_RequiredPrivilege = Requirement(
-        name='RQ.SRS-006.RBAC.ShowCreateTable.RequiredPrivilege',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `SHOW CREATE TABLE` statement if and only if the user has **show columns** privilege on that table,\n'
-        'either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_DescribeTable_RequiredPrivilege = Requirement(
-        name='RQ.SRS-006.RBAC.DescribeTable.RequiredPrivilege',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `DESCRIBE table` statement if and only if the user has **show columns** privilege on that table,\n'
-        'either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_ShowDictionaries_Privilege = Requirement(
-        name='RQ.SRS-006.RBAC.ShowDictionaries.Privilege',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL grant **show dictionaries** privilege on a dictionary to a user if that user has recieved any grant,\n'
-        'including `SHOW DICTIONARIES`, on that dictionary, either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_ShowDictionaries_RequiredPrivilege = Requirement(
-        name='RQ.SRS-006.RBAC.ShowDictionaries.RequiredPrivilege',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `SHOW DICTIONARIES` statement if and only if the user has **show dictionaries** privilege,\n'
-        'or any privilege on the dictionary either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_ShowCreateDictionary_RequiredPrivilege = Requirement(
-        name='RQ.SRS-006.RBAC.ShowCreateDictionary.RequiredPrivilege',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `SHOW CREATE DICTIONARY` statement if and only if the user has **show dictionaries** privilege,\n'
-        'or any privilege on the dictionary either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_ExistsDictionary_RequiredPrivilege = Requirement(
-        name='RQ.SRS-006.RBAC.ExistsDictionary.RequiredPrivilege',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `EXISTS dictionary` statement if and only if the user has **show dictionaries** privilege,\n'
-        'or any privilege on the dictionary either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_CreateUser = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.CreateUser',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `CREATE USER` statement if and only if the user has **create user** privilege,\n'
-        'or either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_CreateUser_DefaultRole = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.CreateUser.DefaultRole',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `CREATE USER` statement with `DEFAULT ROLE <role>` clause if and only if\n'
-        'the user has **create user** privilege and the role with **admin option**, or either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_AlterUser = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.AlterUser',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `ALTER USER` statement if and only if the user has **alter user** privilege,\n'
-        'or either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_DropUser = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.DropUser',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `DROP USER` statement if and only if the user has **drop user** privilege,\n'
-        'or either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_CreateRole = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.CreateRole',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `CREATE ROLE` statement if and only if the user has **create role** privilege,\n'
-        'or either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_AlterRole = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.AlterRole',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `ALTER ROLE` statement if and only if the user has **alter role** privilege,\n'
-        'or either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_DropRole = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.DropRole',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `DROP ROLE` statement if and only if the user has **drop role** privilege,\n'
-        'or either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_CreateRowPolicy = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.CreateRowPolicy',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `CREATE ROW POLICY` statement if and only if the user has **create row policy** privilege,\n'
-        'or either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_AlterRowPolicy = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.AlterRowPolicy',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `ALTER ROW POLICY` statement if and only if the user has **alter row policy** privilege,\n'
-        'or either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_DropRowPolicy = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.DropRowPolicy',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `DROP ROW POLICY` statement if and only if the user has **drop row policy** privilege,\n'
-        'or either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_CreateQuota = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.CreateQuota',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `CREATE QUOTA` statement if and only if the user has **create quota** privilege,\n'
-        'or either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_AlterQuota = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.AlterQuota',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `ALTER QUOTA` statement if and only if the user has **alter quota** privilege,\n'
-        'or either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_DropQuota = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.DropQuota',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `DROP QUOTA` statement if and only if the user has **drop quota** privilege,\n'
-        'or either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_CreateSettingsProfile = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.CreateSettingsProfile',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `CREATE SETTINGS PROFILE` statement if and only if the user has **create settings profile** privilege,\n'
-        'or either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_AlterSettingsProfile = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.AlterSettingsProfile',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `ALTER SETTINGS PROFILE` statement if and only if the user has **alter settings profile** privilege,\n'
-        'or either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_DropSettingsProfile = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.DropSettingsProfile',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `DROP SETTINGS PROFILE` statement if and only if the user has **drop settings profile** privilege,\n'
-        'or either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_RoleAdmin = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.RoleAdmin',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute any role grant or revoke by a user with `ROLE ADMIN` privilege.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_ShowUsers_Privilege = Requirement(
-        name='RQ.SRS-006.RBAC.ShowUsers.Privilege',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully grant `SHOW USERS` privilege when\n'
-        'the user is granted `SHOW USERS`, `SHOW CREATE USER`, `SHOW ACCESS`, or `ACCESS MANAGEMENT`.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_ShowUsers_RequiredPrivilege = Requirement(
-        name='RQ.SRS-006.RBAC.ShowUsers.RequiredPrivilege',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `SHOW USERS` statement if and only if the user has **show users** privilege,\n'
-        'either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_ShowCreateUser_RequiredPrivilege = Requirement(
-        name='RQ.SRS-006.RBAC.ShowCreateUser.RequiredPrivilege',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `SHOW CREATE USER` statement if and only if the user has **show users** privilege,\n'
-        'either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_ShowRoles_Privilege = Requirement(
-        name='RQ.SRS-006.RBAC.ShowRoles.Privilege',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully grant `SHOW ROLES` privilege when\n'
-        'the user is granted `SHOW ROLES`, `SHOW CREATE ROLE`, `SHOW ACCESS`, or `ACCESS MANAGEMENT`.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_ShowRoles_RequiredPrivilege = Requirement(
-        name='RQ.SRS-006.RBAC.ShowRoles.RequiredPrivilege',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `SHOW ROLES` statement if and only if the user has **show roles** privilege,\n'
-        'either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_ShowCreateRole_RequiredPrivilege = Requirement(
-        name='RQ.SRS-006.RBAC.ShowCreateRole.RequiredPrivilege',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `SHOW CREATE ROLE` statement if and only if the user has **show roles** privilege,\n'
-        'either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_ShowRowPolicies_Privilege = Requirement(
-        name='RQ.SRS-006.RBAC.ShowRowPolicies.Privilege',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully grant `SHOW ROW POLICIES` privilege when\n'
-        'the user is granted `SHOW ROW POLICIES`, `SHOW POLICIES`, `SHOW CREATE ROW POLICY`,\n'
-        '`SHOW CREATE POLICY`, `SHOW ACCESS`, or `ACCESS MANAGEMENT`.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_ShowRowPolicies_RequiredPrivilege = Requirement(
-        name='RQ.SRS-006.RBAC.ShowRowPolicies.RequiredPrivilege',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `SHOW ROW POLICIES` or `SHOW POLICIES` statement if and only if\n'
-        'the user has **show row policies** privilege, either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_ShowCreateRowPolicy_RequiredPrivilege = Requirement(
-        name='RQ.SRS-006.RBAC.ShowCreateRowPolicy.RequiredPrivilege',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `SHOW CREATE ROW POLICY` or `SHOW CREATE POLICY` statement\n'
-        'if and only if the user has **show row policies** privilege,either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_ShowQuotas_Privilege = Requirement(
-        name='RQ.SRS-006.RBAC.ShowQuotas.Privilege',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully grant `SHOW QUOTAS` privilege when\n'
-        'the user is granted `SHOW QUOTAS`, `SHOW CREATE QUOTA`, `SHOW ACCESS`, or `ACCESS MANAGEMENT`.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_ShowQuotas_RequiredPrivilege = Requirement(
-        name='RQ.SRS-006.RBAC.ShowQuotas.RequiredPrivilege',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `SHOW QUOTAS` statement if and only if the user has **show quotas** privilege,\n'
-        'either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_ShowCreateQuota_RequiredPrivilege = Requirement(
-        name='RQ.SRS-006.RBAC.ShowCreateQuota.RequiredPrivilege',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `SHOW CREATE QUOTA` statement if and only if\n'
-        'the user has **show quotas** privilege, either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_ShowSettingsProfiles_Privilege = Requirement(
-        name='RQ.SRS-006.RBAC.ShowSettingsProfiles.Privilege',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully grant `SHOW SETTINGS PROFILES` privilege when\n'
-        'the user is granted `SHOW SETTINGS PROFILES`, `SHOW PROFILES`, `SHOW CREATE SETTINGS PROFILE`,\n'
-        '`SHOW SETTINGS PROFILE`, `SHOW ACCESS`, or `ACCESS MANAGEMENT`.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_ShowSettingsProfiles_RequiredPrivilege = Requirement(
-        name='RQ.SRS-006.RBAC.ShowSettingsProfiles.RequiredPrivilege',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `SHOW SETTINGS PROFILES` or `SHOW PROFILES` statement\n'
-        'if and only if the user has **show settings profiles** privilege, either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_ShowCreateSettingsProfile_RequiredPrivilege = Requirement(
-        name='RQ.SRS-006.RBAC.ShowCreateSettingsProfile.RequiredPrivilege',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `SHOW CREATE SETTINGS PROFILE` or `SHOW CREATE PROFILE` statement\n'
-        'if and only if the user has **show settings profiles** privilege, either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_dictGet_Privilege = Requirement(
-        name='RQ.SRS-006.RBAC.dictGet.Privilege',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully grant `dictGet` privilege when\n'
-        'the user is granted `dictGet`, `dictHas`, `dictGetHierarchy`, or `dictIsIn`.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_dictGet_RequiredPrivilege = Requirement(
-        name='RQ.SRS-006.RBAC.dictGet.RequiredPrivilege',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `dictGet` statement\n'
-        'if and only if the user has **dictGet** privilege on that dictionary, either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_dictGet_Type_RequiredPrivilege = Requirement(
-        name='RQ.SRS-006.RBAC.dictGet.Type.RequiredPrivilege',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `dictGet[TYPE]` statement\n'
-        'if and only if the user has **dictGet** privilege on that dictionary, either directly or through a role.\n'
-        'Available types:\n'
-        '\n'
-        '* Int8\n'
-        '* Int16\n'
-        '* Int32\n'
-        '* Int64\n'
-        '* UInt8\n'
-        '* UInt16\n'
-        '* UInt32\n'
-        '* UInt64\n'
-        '* Float32\n'
-        '* Float64\n'
-        '* Date\n'
-        '* DateTime\n'
-        '* UUID\n'
-        '* String\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_dictGet_OrDefault_RequiredPrivilege = Requirement(
-        name='RQ.SRS-006.RBAC.dictGet.OrDefault.RequiredPrivilege',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `dictGetOrDefault` statement\n'
-        'if and only if the user has **dictGet** privilege on that dictionary, either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_dictHas_RequiredPrivilege = Requirement(
-        name='RQ.SRS-006.RBAC.dictHas.RequiredPrivilege',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `dictHas` statement\n'
-        'if and only if the user has **dictGet** privilege, either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_dictGetHierarchy_RequiredPrivilege = Requirement(
-        name='RQ.SRS-006.RBAC.dictGetHierarchy.RequiredPrivilege',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `dictGetHierarchy` statement\n'
-        'if and only if the user has **dictGet** privilege, either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_dictIsIn_RequiredPrivilege = Requirement(
-        name='RQ.SRS-006.RBAC.dictIsIn.RequiredPrivilege',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `dictIsIn` statement\n'
-        'if and only if the user has **dictGet** privilege, either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_Introspection = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.Introspection',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully grant `INTROSPECTION` privilege when\n'
-        'the user is granted `INTROSPECTION` or `INTROSPECTION FUNCTIONS`.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_Introspection_addressToLine = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.Introspection.addressToLine',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `addressToLine` statement if and only if\n'
-        'the user has **introspection** privilege, either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_Introspection_addressToSymbol = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.Introspection.addressToSymbol',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `addressToSymbol` statement if and only if\n'
-        'the user has **introspection** privilege, either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_Introspection_demangle = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.Introspection.demangle',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `demangle` statement if and only if\n'
-        'the user has **introspection** privilege, either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_System_Shutdown = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.System.Shutdown',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully grant `SYSTEM SHUTDOWN` privilege when\n'
-        'the user is granted `SYSTEM`, `SYSTEM SHUTDOWN`, `SHUTDOWN`,or `SYSTEM KILL`.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_System_DropCache = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.System.DropCache',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully grant `SYSTEM DROP CACHE` privilege when\n'
-        'the user is granted `SYSTEM`, `SYSTEM DROP CACHE`, or `DROP CACHE`.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_System_DropCache_DNS = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.System.DropCache.DNS',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully grant `SYSTEM DROP DNS CACHE` privilege when\n'
-        'the user is granted `SYSTEM`, `SYSTEM DROP CACHE`, `DROP CACHE`, `SYSTEM DROP DNS CACHE`,\n'
-        '`SYSTEM DROP DNS`, `DROP DNS CACHE`, or `DROP DNS`.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_System_DropCache_Mark = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.System.DropCache.Mark',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully grant `SYSTEM DROP MARK CACHE` privilege when\n'
-        'the user is granted `SYSTEM`, `SYSTEM DROP CACHE`, `DROP CACHE`, `SYSTEM DROP MARK CACHE`,\n'
-        '`SYSTEM DROP MARK`, `DROP MARK CACHE`, or `DROP MARKS`.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_System_DropCache_Uncompressed = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.System.DropCache.Uncompressed',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully grant `SYSTEM DROP UNCOMPRESSED CACHE` privilege when\n'
-        'the user is granted `SYSTEM`, `SYSTEM DROP CACHE`, `DROP CACHE`, `SYSTEM DROP UNCOMPRESSED CACHE`,\n'
-        '`SYSTEM DROP UNCOMPRESSED`, `DROP UNCOMPRESSED CACHE`, or `DROP UNCOMPRESSED`.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_System_Reload = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.System.Reload',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully grant `SYSTEM RELOAD` privilege when\n'
-        'the user is granted `SYSTEM` or `SYSTEM RELOAD`.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_System_Reload_Config = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.System.Reload.Config',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully grant `SYSTEM RELOAD CONFIG` privilege when\n'
-        'the user is granted `SYSTEM`, `SYSTEM RELOAD`, `SYSTEM RELOAD CONFIG`, or `RELOAD CONFIG`.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_System_Reload_Dictionary = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.System.Reload.Dictionary',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully grant `SYSTEM RELOAD DICTIONARY` privilege when\n'
-        'the user is granted `SYSTEM`, `SYSTEM RELOAD`, `SYSTEM RELOAD DICTIONARIES`, `RELOAD DICTIONARIES`, or `RELOAD DICTIONARY`.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_System_Reload_Dictionaries = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.System.Reload.Dictionaries',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully grant `SYSTEM RELOAD DICTIONARIES` privilege when\n'
-        'the user is granted `SYSTEM`, `SYSTEM RELOAD`, `SYSTEM RELOAD DICTIONARIES`, `RELOAD DICTIONARIES`, or `RELOAD DICTIONARY`.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_System_Reload_EmbeddedDictionaries = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.System.Reload.EmbeddedDictionaries',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully grant `SYSTEM RELOAD EMBEDDED DICTIONARIES` privilege when\n'
-        'the user is granted `SYSTEM`, `SYSTEM RELOAD`, `SYSTEM RELOAD DICTIONARY ON *.*`, or `SYSTEM RELOAD EMBEDDED DICTIONARIES`.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_System_Merges = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.System.Merges',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully grant `SYSTEM MERGES` privilege when\n'
-        'the user is granted `SYSTEM`, `SYSTEM MERGES`, `SYSTEM STOP MERGES`, `SYSTEM START MERGES`, `STOP MERGES`, or `START MERGES`.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_System_TTLMerges = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.System.TTLMerges',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully grant `SYSTEM TTL MERGES` privilege when\n'
-        'the user is granted `SYSTEM`, `SYSTEM TTL MERGES`, `SYSTEM STOP TTL MERGES`, `SYSTEM START TTL MERGES`, `STOP TTL MERGES`, or `START TTL MERGES`.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_System_Fetches = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.System.Fetches',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully grant `SYSTEM FETCHES` privilege when\n'
-        'the user is granted `SYSTEM`, `SYSTEM FETCHES`, `SYSTEM STOP FETCHES`, `SYSTEM START FETCHES`, `STOP FETCHES`, or `START FETCHES`.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_System_Moves = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.System.Moves',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully grant `SYSTEM MOVES` privilege when\n'
-        'the user is granted `SYSTEM`, `SYSTEM MOVES`, `SYSTEM STOP MOVES`, `SYSTEM START MOVES`, `STOP MOVES`, or `START MOVES`.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_System_Sends = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.System.Sends',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully grant `SYSTEM SENDS` privilege when\n'
-        'the user is granted `SYSTEM`, `SYSTEM SENDS`, `SYSTEM STOP SENDS`, `SYSTEM START SENDS`, `STOP SENDS`, or `START SENDS`.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_System_Sends_Distributed = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.System.Sends.Distributed',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully grant `SYSTEM DISTRIBUTED SENDS` privilege when\n'
-        'the user is granted `SYSTEM`, `SYSTEM DISTRIBUTED SENDS`, `SYSTEM STOP DISTRIBUTED SENDS`,\n'
-        '`SYSTEM START DISTRIBUTED SENDS`, `STOP DISTRIBUTED SENDS`, or `START DISTRIBUTED SENDS`.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_System_Sends_Replicated = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.System.Sends.Replicated',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully grant `SYSTEM REPLICATED SENDS` privilege when\n'
-        'the user is granted `SYSTEM`, `SYSTEM REPLICATED SENDS`, `SYSTEM STOP REPLICATED SENDS`,\n'
-        '`SYSTEM START REPLICATED SENDS`, `STOP REPLICATED SENDS`, or `START REPLICATED SENDS`.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_System_ReplicationQueues = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.System.ReplicationQueues',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully grant `SYSTEM REPLICATION QUEUES` privilege when\n'
-        'the user is granted `SYSTEM`, `SYSTEM REPLICATION QUEUES`, `SYSTEM STOP REPLICATION QUEUES`,\n'
-        '`SYSTEM START REPLICATION QUEUES`, `STOP REPLICATION QUEUES`, or `START REPLICATION QUEUES`.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_System_SyncReplica = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.System.SyncReplica',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully grant `SYSTEM SYNC REPLICA` privilege when\n'
-        'the user is granted `SYSTEM`, `SYSTEM SYNC REPLICA`, or `SYNC REPLICA`.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_System_RestartReplica = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.System.RestartReplica',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully grant `SYSTEM RESTART REPLICA` privilege when\n'
-        'the user is granted `SYSTEM`, `SYSTEM RESTART REPLICA`, or `RESTART REPLICA`.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_System_Flush = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.System.Flush',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully grant `SYSTEM FLUSH` privilege when\n'
-        'the user is granted `SYSTEM` or `SYSTEM FLUSH`.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_System_Flush_Distributed = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.System.Flush.Distributed',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully grant `SYSTEM FLUSH DISTRIBUTED` privilege when\n'
-        'the user is granted `SYSTEM`, `SYSTEM FLUSH DISTRIBUTED`, or `FLUSH DISTRIBUTED`.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_System_Flush_Logs = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.System.Flush.Logs',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully grant `SYSTEM FLUSH LOGS` privilege when\n'
-        'the user is granted `SYSTEM`, `SYSTEM FLUSH LOGS`, or `FLUSH LOGS`.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_Sources = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.Sources',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support granting or revoking `SOURCES` privilege from\n'
-        'the user, either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_Sources_File = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.Sources.File',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support the use of `FILE` source by a user if and only if\n'
-        'the user has `FILE` or `SOURCES` privileges granted to them directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_Sources_URL = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.Sources.URL',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support the use of `URL` source by a user if and only if\n'
-        'the user has `URL` or `SOURCES` privileges granted to them directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_Sources_Remote = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.Sources.Remote',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support the use of `REMOTE` source by a user if and only if\n'
-        'the user has `REMOTE` or `SOURCES` privileges granted to them directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_Sources_MySQL = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.Sources.MySQL',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support the use of `MySQL` source by a user if and only if\n'
-        'the user has `MySQL` or `SOURCES` privileges granted to them directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_Sources_ODBC = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.Sources.ODBC',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support the use of `ODBC` source by a user if and only if\n'
-        'the user has `ODBC` or `SOURCES` privileges granted to them directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_Sources_JDBC = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.Sources.JDBC',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support the use of `JDBC` source by a user if and only if\n'
-        'the user has `JDBC` or `SOURCES` privileges granted to them directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_Sources_HDFS = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.Sources.HDFS',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support the use of `HDFS` source by a user if and only if\n'
-        'the user has `HDFS` or `SOURCES` privileges granted to them directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_Sources_S3 = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.Sources.S3',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support the use of `S3` source by a user if and only if\n'
-        'the user has `S3` or `SOURCES` privileges granted to them directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_GrantOption = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.GrantOption',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL successfully execute `GRANT` or `REVOKE` privilege statements by a user if and only if\n'
-        'the user has that privilege with `GRANT OPTION`, either directly or through a role.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_All = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.All',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support granting or revoking `ALL` privilege.\n'
-        '\n'
-        ),
-        link=None)
-
-RQ_SRS_006_RBAC_Privileges_AdminOption = Requirement(
-        name='RQ.SRS-006.RBAC.Privileges.AdminOption',
-        version='1.0',
-        priority=None,
-        group=None,
-        type=None,
-        uid=None,
-        description=(
-        '[ClickHouse] SHALL support a user granting or revoking a role if and only if\n'
-        'the user has that role with `ADMIN OPTION` privilege.\n'
-        '\n'
-        ),
-        link=None)
diff --git a/tests/testflows/rbac/tests/privileges/admin_option.py b/tests/testflows/rbac/tests/privileges/admin_option.py
index 88dadc8522c..f6115839bf5 100644
--- a/tests/testflows/rbac/tests/privileges/admin_option.py
+++ b/tests/testflows/rbac/tests/privileges/admin_option.py
@@ -17,7 +17,7 @@ def privileges_granted_directly(self, node=None):
 
     with user(node, f"{user_name}"):
 
-        Suite(test=grant_role, flags=TE)(grant_target_name=user_name, user_name=user_name)
+        Suite(test=grant_role)(grant_target_name=user_name, user_name=user_name)
 
 @TestSuite
 def privileges_granted_via_role(self, node=None):
@@ -35,7 +35,7 @@ def privileges_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(test=grant_role, flags=TE)(grant_target_name=role_name, user_name=user_name)
+        Suite(test=grant_role)(grant_target_name=role_name, user_name=user_name)
 
 @TestSuite
 def grant_role(self, grant_target_name, user_name, node=None):
@@ -52,7 +52,13 @@ def grant_role(self, grant_target_name, user_name, node=None):
 
         with user(node, target_user_name), role(node, grant_role_name):
 
-            with When("I check the user can't grant a role"):
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I check the user can't grant a role"):
                 node.query(f"GRANT {grant_role_name} TO {target_user_name}", settings=[("user",user_name)],
                     exitcode=exitcode, message=message)
 
@@ -109,6 +115,7 @@ def grant_role(self, grant_target_name, user_name, node=None):
 @Name("admin option")
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_AdminOption("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 def feature(self, node="clickhouse1"):
     """Check the RBAC functionality of ADMIN OPTION.
diff --git a/tests/testflows/rbac/tests/privileges/all_role.py b/tests/testflows/rbac/tests/privileges/all_role.py
new file mode 100644
index 00000000000..629848a2746
--- /dev/null
+++ b/tests/testflows/rbac/tests/privileges/all_role.py
@@ -0,0 +1,37 @@
+from testflows.core import *
+from testflows.asserts import error
+
+from rbac.requirements import *
+from rbac.helper.common import *
+import rbac.helper.errors as errors
+
+@TestScenario
+def privilege_check(self, node=None):
+    '''Check that a role named ALL only grants privileges that it already has.
+    '''
+
+    user_name = f"user_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+
+    with user(node, f"{user_name}"), role(node, "ALL"):
+
+        with When("I grant the ALL role to the user"):
+            node.query(f"GRANT ALL TO {user_name}")
+
+        with Then("I check the user doesn't have any privileges"):
+            output = node.query("SHOW TABLES", settings=[("user",user_name)]).output
+            assert output == '', error()
+
+@TestFeature
+@Name("all role")
+@Requirements(
+    RQ_SRS_006_RBAC_Privileges_RoleAll("1.0"),
+)
+def feature(self, node="clickhouse1"):
+    """Check the RBAC functionality of the role 'ALL'.
+    """
+    self.context.node = self.context.cluster.node(node)
+
+    Scenario(run=privilege_check, setup=instrument_clickhouse_server_log)
diff --git a/tests/testflows/rbac/tests/privileges/alter/alter_column.py b/tests/testflows/rbac/tests/privileges/alter/alter_column.py
index 430872029b5..fe767ec15fa 100755
--- a/tests/testflows/rbac/tests/privileges/alter/alter_column.py
+++ b/tests/testflows/rbac/tests/privileges/alter/alter_column.py
@@ -354,6 +354,10 @@ def check_add_column_when_privilege_is_not_granted(table, user, node, column=Non
         node.query(f"ALTER TABLE {table} ADD COLUMN {column} String",
             settings = [("user", user)], exitcode=exitcode, message=message)
 
+    with Then("I try to ADD COLUMN"):
+        node.query(f"ALTER TABLE {table} ADD COLUMN {column} String",
+            settings = [("user", user)], exitcode=exitcode, message=message)
+
 def check_clear_column_when_privilege_is_not_granted(table, user, node, column=None):
     """Ensures CLEAR COLUMN errors as expected without the required privilege
     for the specified user.
@@ -366,6 +370,13 @@ def check_clear_column_when_privilege_is_not_granted(table, user, node, column=N
         node.query(f"ALTER TABLE {table} CLEAR COLUMN {column}",
             settings = [("user", user)], exitcode=exitcode, message=message)
 
+    with And(f"I grant NONE to the user"):
+        node.query(f"GRANT NONE TO {user}")
+
+    with Then("I try to CLEAR COLUMN"):
+        node.query(f"ALTER TABLE {table} CLEAR COLUMN {column}",
+            settings = [("user", user)], exitcode=exitcode, message=message)
+
 def check_modify_column_when_privilege_is_not_granted(table, user, node, column=None):
     """Ensures MODIFY COLUMN errors as expected without the required privilege
     for the specified user.
@@ -378,6 +389,13 @@ def check_modify_column_when_privilege_is_not_granted(table, user, node, column=
         node.query(f"ALTER TABLE {table} MODIFY COLUMN {column} String",
             settings = [("user", user)], exitcode=exitcode, message=message)
 
+    with And(f"I grant NONE to the user"):
+        node.query(f"GRANT NONE TO {user}")
+
+    with Then("I try to MODIFY COLUMN"):
+        node.query(f"ALTER TABLE {table} MODIFY COLUMN {column} String",
+            settings = [("user", user)], exitcode=exitcode, message=message)
+
 def check_rename_column_when_privilege_is_not_granted(table, user, node, column=None):
     """Ensures RENAME COLUMN errors as expected without the required privilege
     for the specified user.
@@ -392,6 +410,13 @@ def check_rename_column_when_privilege_is_not_granted(table, user, node, column=
         node.query(f"ALTER TABLE {table} RENAME COLUMN {column} TO {new_column}",
             settings = [("user", user)], exitcode=exitcode, message=message)
 
+    with And(f"I grant NONE to the user"):
+        node.query(f"GRANT NONE TO {user}")
+
+    with Then("I try to RENAME COLUMN"):
+        node.query(f"ALTER TABLE {table} RENAME COLUMN {column} TO {new_column}",
+            settings = [("user", user)], exitcode=exitcode, message=message)
+
 def check_comment_column_when_privilege_is_not_granted(table, user, node, column=None):
     """Ensures COMMENT COLUMN errors as expected without the required privilege
     for the specified user.
@@ -404,6 +429,13 @@ def check_comment_column_when_privilege_is_not_granted(table, user, node, column
         node.query(f"ALTER TABLE {table} COMMENT COLUMN {column} 'This is a comment.'",
             settings = [("user", user)], exitcode=exitcode, message=message)
 
+    with And(f"I grant NONE to the user"):
+        node.query(f"GRANT NONE TO {user}")
+
+    with When("I try to COMMENT COLUMN"):
+        node.query(f"ALTER TABLE {table} COMMENT COLUMN {column} 'This is a comment.'",
+            settings = [("user", user)], exitcode=exitcode, message=message)
+
 def check_drop_column_when_privilege_is_not_granted(table, user, node, column=None):
     """Ensures DROP COLUMN errors as expected without the required privilege
     for the specified user.
@@ -416,6 +448,13 @@ def check_drop_column_when_privilege_is_not_granted(table, user, node, column=No
         node.query(f"ALTER TABLE {table} DROP COLUMN {column}",
             settings = [("user", user)], exitcode=exitcode, message=message)
 
+    with And(f"I grant NONE to the user"):
+        node.query(f"GRANT NONE TO {user}")
+
+    with Then("I try to DROP COLUMN"):
+        node.query(f"ALTER TABLE {table} DROP COLUMN {column}",
+            settings = [("user", user)], exitcode=exitcode, message=message)
+
 @TestScenario
 def user_with_some_privileges(self, permutation, table_type, node=None):
     """Check that user with some privileges of ALTER COLUMN is able
@@ -676,7 +715,8 @@ def scenario_parallelization(self, table_type, permutation):
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_AlterColumn("1.0"),
     RQ_SRS_006_RBAC_Privileges_AlterColumn_TableEngines("1.0"),
-    RQ_SRS_006_RBAC_Privileges_All("1.0")
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 @Examples("table_type", [
     (key,) for key in table_types.keys()
diff --git a/tests/testflows/rbac/tests/privileges/alter/alter_constraint.py b/tests/testflows/rbac/tests/privileges/alter/alter_constraint.py
index 59ff1828222..58f4349459c 100755
--- a/tests/testflows/rbac/tests/privileges/alter/alter_constraint.py
+++ b/tests/testflows/rbac/tests/privileges/alter/alter_constraint.py
@@ -275,7 +275,8 @@ def user_with_privileges_on_cluster(self, table_type, node=None):
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_AlterConstraint("1.0"),
     RQ_SRS_006_RBAC_Privileges_AlterConstraint_TableEngines("1.0"),
-    RQ_SRS_006_RBAC_Privileges_All("1.0")
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 @Examples("table_type", [
     (key,) for key in table_types.keys()
diff --git a/tests/testflows/rbac/tests/privileges/alter/alter_delete.py b/tests/testflows/rbac/tests/privileges/alter/alter_delete.py
index 9f46e6cdb3d..93d520f91bd 100644
--- a/tests/testflows/rbac/tests/privileges/alter/alter_delete.py
+++ b/tests/testflows/rbac/tests/privileges/alter/alter_delete.py
@@ -1,5 +1,3 @@
-from multiprocessing.dummy import Pool
-
 from testflows.core import *
 from testflows.asserts import error
 
@@ -11,7 +9,8 @@ aliases = {"ALTER DELETE", "DELETE", "ALL"}
 
 @TestSuite
 def privilege_granted_directly_or_via_role(self, table_type, privilege, node=None):
-    """Check that user is only able to execute ALTER DELETE when they have required privilege, either directly or via role.
+    """Check that user is only able to execute ALTER DELETE when they have required privilege,
+    either directly or via role.
     """
     role_name = f"role_{getuid()}"
     user_name = f"user_{getuid()}"
@@ -21,13 +20,16 @@ def privilege_granted_directly_or_via_role(self, table_type, privilege, node=Non
 
     with Suite("user with direct privilege", setup=instrument_clickhouse_server_log):
         with user(node, user_name):
+
             with When(f"I run checks that {user_name} is only able to execute ALTER DELETE with required privileges"):
                 privilege_check(grant_target_name=user_name, user_name=user_name, table_type=table_type, privilege=privilege, node=node)
 
     with Suite("user with privilege via role", setup=instrument_clickhouse_server_log):
         with user(node, user_name), role(node, role_name):
+
             with When("I grant the role to the user"):
                 node.query(f"GRANT {role_name} TO {user_name}")
+
             with And(f"I run checks that {user_name} with {role_name} is only able to execute ALTER DELETE with required privileges"):
                 privilege_check(grant_target_name=role_name, user_name=user_name, table_type=table_type, privilege=privilege, node=node)
 
@@ -38,26 +40,41 @@ def privilege_check(grant_target_name, user_name, table_type, privilege, node=No
 
     with Scenario("user without privilege", setup=instrument_clickhouse_server_log):
         table_name = f"merge_tree_{getuid()}"
+
         with table(node, table_name, table_type):
-            with When("I attempt to delete columns without privilege"):
+
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I attempt to delete columns without privilege"):
                 node.query(f"ALTER TABLE {table_name} DELETE WHERE 1", settings = [("user", user_name)],
                     exitcode=exitcode, message=message)
 
     with Scenario("user with privilege", setup=instrument_clickhouse_server_log):
         table_name = f"merge_tree_{getuid()}"
+
         with table(node, table_name, table_type):
+
             with When("I grant the delete privilege"):
                 node.query(f"GRANT {privilege} ON {table_name} TO {grant_target_name}")
+
             with Then("I attempt to delete columns"):
                 node.query(f"ALTER TABLE {table_name} DELETE WHERE 1", settings = [("user", user_name)])
 
     with Scenario("user with revoked privilege", setup=instrument_clickhouse_server_log):
         table_name = f"merge_tree_{getuid()}"
+
         with table(node, table_name, table_type):
+
             with When("I grant the delete privilege"):
                 node.query(f"GRANT {privilege} ON {table_name} TO {grant_target_name}")
+
             with And("I revoke the delete privilege"):
                 node.query(f"REVOKE {privilege} ON {table_name} FROM {grant_target_name}")
+
             with Then("I attempt to delete columns"):
                 node.query(f"ALTER TABLE {table_name} DELETE WHERE 1", settings = [("user", user_name)],
                     exitcode=exitcode, message=message)
@@ -65,7 +82,8 @@ def privilege_check(grant_target_name, user_name, table_type, privilege, node=No
 @TestFeature
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_AlterDelete("1.0"),
-    RQ_SRS_006_RBAC_Privileges_All("1.0")
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 @Examples("table_type", [
     (key,) for key in table_types.keys()
diff --git a/tests/testflows/rbac/tests/privileges/alter/alter_fetch.py b/tests/testflows/rbac/tests/privileges/alter/alter_fetch.py
index 56f2d48e7d2..b4ff0b65fd4 100644
--- a/tests/testflows/rbac/tests/privileges/alter/alter_fetch.py
+++ b/tests/testflows/rbac/tests/privileges/alter/alter_fetch.py
@@ -1,5 +1,3 @@
-from multiprocessing.dummy import Pool
-
 from testflows.core import *
 from testflows.asserts import error
 
@@ -41,9 +39,16 @@ def privilege_check(grant_target_name, user_name, table_type, privilege, node=No
 
     with Scenario("user without privilege", setup=instrument_clickhouse_server_log):
         table_name = f"merge_tree_{getuid()}"
+
         with table(node, table_name, table_type):
 
-            with When("I attempt to fetch a partition without privilege"):
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I attempt to fetch a partition without privilege"):
                 node.query(f"ALTER TABLE {table_name} FETCH PARTITION 1 FROM '/clickhouse/'", settings = [("user", user_name)],
                     exitcode=exitcode, message=message)
 
@@ -75,7 +80,8 @@ def privilege_check(grant_target_name, user_name, table_type, privilege, node=No
 @TestFeature
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_AlterFetch("1.0"),
-    RQ_SRS_006_RBAC_Privileges_All("1.0")
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 @Examples("table_type",[
     ("ReplicatedMergeTree-sharded_cluster",),
diff --git a/tests/testflows/rbac/tests/privileges/alter/alter_freeze.py b/tests/testflows/rbac/tests/privileges/alter/alter_freeze.py
index 32bd4602044..775e2be270d 100644
--- a/tests/testflows/rbac/tests/privileges/alter/alter_freeze.py
+++ b/tests/testflows/rbac/tests/privileges/alter/alter_freeze.py
@@ -1,5 +1,3 @@
-from multiprocessing.dummy import Pool
-
 from testflows.core import *
 from testflows.asserts import error
 
@@ -38,14 +36,22 @@ def privilege_check(grant_target_name, user_name, table_type, privilege, node=No
 
     with Scenario("user without privilege", setup=instrument_clickhouse_server_log):
         table_name = f"merge_tree_{getuid()}"
+
         with table(node, table_name, table_type):
 
-            with When("I attempt to freeze partitions without privilege"):
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I attempt to freeze partitions without privilege"):
                 node.query(f"ALTER TABLE {table_name} FREEZE", settings = [("user", user_name)],
                     exitcode=exitcode, message=message)
 
     with Scenario("user with privilege", setup=instrument_clickhouse_server_log):
         table_name = f"merge_tree_{getuid()}"
+
         with table(node, table_name, table_type):
 
             with When("I grant the freeze privilege"):
@@ -56,6 +62,7 @@ def privilege_check(grant_target_name, user_name, table_type, privilege, node=No
 
     with Scenario("user with revoked privilege", setup=instrument_clickhouse_server_log):
         table_name = f"merge_tree_{getuid()}"
+
         with table(node, table_name, table_type):
 
             with When("I grant the freeze privilege"):
@@ -70,7 +77,8 @@ def privilege_check(grant_target_name, user_name, table_type, privilege, node=No
 @TestFeature
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_AlterFreeze("1.0"),
-    RQ_SRS_006_RBAC_Privileges_All("1.0")
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 @Examples("table_type", [
     (key,) for key in table_types.keys()
diff --git a/tests/testflows/rbac/tests/privileges/alter/alter_index.py b/tests/testflows/rbac/tests/privileges/alter/alter_index.py
index cd2729f5641..eeb126e95a5 100755
--- a/tests/testflows/rbac/tests/privileges/alter/alter_index.py
+++ b/tests/testflows/rbac/tests/privileges/alter/alter_index.py
@@ -26,7 +26,7 @@ aliases = {
     "MATERIALIZE INDEX" : ["ALTER MATERIALIZE INDEX", "MATERIALIZE INDEX"],
     "CLEAR INDEX": ["ALTER CLEAR INDEX", "CLEAR INDEX"],
     "DROP INDEX": ["ALTER DROP INDEX", "DROP INDEX"],
-    "ALTER INDEX": ["ALTER INDEX", "INDEX"] # super-privilege
+    "ALTER INDEX": ["ALTER INDEX", "INDEX", "ALL"] # super-privilege
 }
 
 # Extra permutation is for 'ALTER INDEX' super-privilege
@@ -302,7 +302,6 @@ def check_drop_index_when_privilege_is_not_granted(table, user, node):
                     settings = [("user", user)], exitcode=exitcode, message=message)
 
 @TestScenario
-@Flags(TE)
 def user_with_some_privileges(self, table_type, node=None):
     """Check that user with any permutation of ALTER INDEX subprivileges is able
     to alter the table for privileges granted, and not for privileges not granted.
@@ -325,7 +324,6 @@ def user_with_some_privileges(self, table_type, node=None):
                     alter_index_privilege_handler(permutation, table_name, user_name, node)
 
 @TestScenario
-@Flags(TE)
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_AlterIndex_Revoke("1.0"),
 )
@@ -355,7 +353,6 @@ def user_with_revoked_privileges(self, table_type, node=None):
                     alter_index_privilege_handler(0, table_name, user_name, node)
 
 @TestScenario
-@Flags(TE)
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_AlterIndex_Grant("1.0"),
 )
@@ -385,7 +382,6 @@ def role_with_some_privileges(self, table_type, node=None):
                     alter_index_privilege_handler(permutation, table_name, user_name, node)
 
 @TestScenario
-@Flags(TE)
 def user_with_revoked_role(self, table_type, node=None):
     """Check that user with a role that has ALTER INDEX privilege on a table is unable to
     ALTER INDEX from that table after the role with privilege has been revoked from the user.
@@ -416,7 +412,6 @@ def user_with_revoked_role(self, table_type, node=None):
                     alter_index_privilege_handler(0, table_name, user_name, node)
 
 @TestScenario
-@Flags(TE)
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_AlterIndex_Cluster("1.0"),
 )
@@ -451,12 +446,13 @@ def user_with_privileges_on_cluster(self, table_type, node=None):
 @TestFeature
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_AlterIndex("1.0"),
-    RQ_SRS_006_RBAC_Privileges_AlterIndex_TableEngines("1.0")
+    RQ_SRS_006_RBAC_Privileges_AlterIndex_TableEngines("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 @Examples("table_type", [
     (key,) for key in table_types.keys()
 ])
-@Flags(TE)
 @Name("alter index")
 def feature(self, node="clickhouse1", stress=None, parallel=None):
     self.context.node = self.context.cluster.node(node)
diff --git a/tests/testflows/rbac/tests/privileges/alter/alter_move.py b/tests/testflows/rbac/tests/privileges/alter/alter_move.py
index b53375434fe..d370edc35de 100644
--- a/tests/testflows/rbac/tests/privileges/alter/alter_move.py
+++ b/tests/testflows/rbac/tests/privileges/alter/alter_move.py
@@ -7,7 +7,7 @@ from rbac.requirements import *
 from rbac.helper.common import *
 import rbac.helper.errors as errors
 
-aliases = {"ALTER MOVE PARTITION", "ALTER MOVE PART", "MOVE PARTITION", "MOVE PART"}
+aliases = {"ALTER MOVE PARTITION", "ALTER MOVE PART", "MOVE PARTITION", "MOVE PART", "ALL"}
 
 @TestSuite
 def privilege_granted_directly_or_via_role(self, table_type, privilege, node=None):
@@ -45,7 +45,13 @@ def privilege_check(grant_target_name, user_name, table_type, privilege, node=No
 
         with table(node, f"{source_table_name},{target_table_name}", table_type):
 
-            with When("I attempt to move partition without privilege"):
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I attempt to move partition without privilege"):
                 node.query(f"ALTER TABLE {source_table_name} MOVE PARTITION 1 TO TABLE {target_table_name}", settings = [("user", user_name)],
                     exitcode=exitcode, message=message)
 
@@ -151,6 +157,8 @@ def privilege_check(grant_target_name, user_name, table_type, privilege, node=No
 @TestFeature
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_AlterMove("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 @Examples("table_type", [
     (key,) for key in table_types.keys()
diff --git a/tests/testflows/rbac/tests/privileges/alter/alter_quota.py b/tests/testflows/rbac/tests/privileges/alter/alter_quota.py
index 4d0d55c86de..faad7c001f4 100644
--- a/tests/testflows/rbac/tests/privileges/alter/alter_quota.py
+++ b/tests/testflows/rbac/tests/privileges/alter/alter_quota.py
@@ -31,7 +31,7 @@ def alter_quota_granted_directly(self, node=None):
 
     with user(node, f"{user_name}"):
 
-        Suite(run=alter_quota, flags=TE,
+        Suite(run=alter_quota,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[user_name,user_name]) for row in alter_quota.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
@@ -52,13 +52,14 @@ def alter_quota_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(run=alter_quota, flags=TE,
+        Suite(run=alter_quota,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[role_name,user_name]) for row in alter_quota.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
 
 @TestOutline(Suite)
 @Examples("privilege",[
+    ("ALL",),
     ("ACCESS MANAGEMENT",),
     ("ALTER QUOTA",),
 ])
@@ -75,7 +76,13 @@ def alter_quota(self, privilege, grant_target_name, user_name, node=None):
 
         with quota(node, alter_quota_name):
 
-            with When("I check the user can't alter a quota"):
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I check the user can't alter a quota"):
                 node.query(f"ALTER QUOTA {alter_quota_name}", settings=[("user",user_name)],
                     exitcode=exitcode, message=message)
 
@@ -127,6 +134,8 @@ def alter_quota(self, privilege, grant_target_name, user_name, node=None):
 @Name("alter quota")
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_AlterQuota("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 def feature(self, node="clickhouse1"):
     """Check the RBAC functionality of ALTER QUOTA.
diff --git a/tests/testflows/rbac/tests/privileges/alter/alter_role.py b/tests/testflows/rbac/tests/privileges/alter/alter_role.py
index cf98d66a689..49e8baa191b 100644
--- a/tests/testflows/rbac/tests/privileges/alter/alter_role.py
+++ b/tests/testflows/rbac/tests/privileges/alter/alter_role.py
@@ -17,7 +17,7 @@ def privileges_granted_directly(self, node=None):
 
     with user(node, f"{user_name}"):
 
-        Suite(run=alter_role, flags=TE,
+        Suite(run=alter_role,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[user_name,user_name]) for row in alter_role.examples
             ], args=Args(name="privilege={privilege}", format_name=True)))
@@ -38,13 +38,14 @@ def privileges_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(run=alter_role, flags=TE,
+        Suite(run=alter_role,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[role_name,user_name]) for row in alter_role.examples
             ], args=Args(name="privilege={privilege}", format_name=True)))
 
 @TestOutline(Suite)
 @Examples("privilege",[
+    ("ALL",),
     ("ACCESS MANAGEMENT",),
     ("ALTER ROLE",),
 ])
@@ -58,14 +59,22 @@ def alter_role(self, privilege, grant_target_name, user_name, node=None):
 
     with Scenario("ALTER ROLE without privilege"):
         alter_role_name = f"alter_role_{getuid()}"
+
         with role(node, alter_role_name):
 
-            with When("I check the user can't alter a role"):
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I check the user can't alter a role"):
                 node.query(f"ALTER ROLE {alter_role_name}", settings=[("user",user_name)],
                     exitcode=exitcode, message=message)
 
     with Scenario("ALTER ROLE with privilege"):
         alter_role_name = f"alter_role_{getuid()}"
+
         with role(node, alter_role_name):
 
             with When(f"I grant {privilege}"):
@@ -93,6 +102,7 @@ def alter_role(self, privilege, grant_target_name, user_name, node=None):
 
     with Scenario("ALTER ROLE with revoked privilege"):
         alter_role_name = f"alter_role_{getuid()}"
+
         with role(node, alter_role_name):
             with When(f"I grant {privilege} on the database"):
                 node.query(f"GRANT {privilege} ON *.* TO {grant_target_name}")
@@ -108,6 +118,8 @@ def alter_role(self, privilege, grant_target_name, user_name, node=None):
 @Name("alter role")
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_AlterRole("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 def feature(self, node="clickhouse1"):
     """Check the RBAC functionality of ALTER ROLE.
diff --git a/tests/testflows/rbac/tests/privileges/alter/alter_row_policy.py b/tests/testflows/rbac/tests/privileges/alter/alter_row_policy.py
index 6d13d30b823..a0d1e4271bc 100644
--- a/tests/testflows/rbac/tests/privileges/alter/alter_row_policy.py
+++ b/tests/testflows/rbac/tests/privileges/alter/alter_row_policy.py
@@ -17,7 +17,7 @@ def privileges_granted_directly(self, node=None):
 
     with user(node, f"{user_name}"):
 
-        Suite(run=alter_row_policy, flags=TE,
+        Suite(run=alter_row_policy,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[user_name,user_name]) for row in alter_row_policy.examples
             ], args=Args(name="privilege={privilege}", format_name=True)))
@@ -38,13 +38,14 @@ def privileges_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(run=alter_row_policy, flags=TE,
+        Suite(run=alter_row_policy,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[role_name,user_name]) for row in alter_row_policy.examples
             ], args=Args(name="privilege={privilege}", format_name=True)))
 
 @TestOutline(Suite)
 @Examples("privilege",[
+    ("ALL",),
     ("ACCESS MANAGEMENT",),
     ("ALTER ROW POLICY",),
     ("ALTER POLICY",),
@@ -65,7 +66,13 @@ def alter_row_policy(self, privilege, grant_target_name, user_name, node=None):
             with Given("I have a row policy"):
                 node.query(f"CREATE ROW POLICY {alter_row_policy_name} ON {table_name}")
 
-            with When("I check the user can't alter a row policy"):
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I check the user can't alter a row policy"):
                 node.query(f"ALTER ROW POLICY {alter_row_policy_name} ON {table_name}", settings=[("user",user_name)],
                     exitcode=exitcode, message=message)
 
@@ -130,15 +137,986 @@ def alter_row_policy(self, privilege, grant_target_name, user_name, node=None):
              with Finally("I drop the row policy"):
                 node.query(f"DROP ROW POLICY IF EXISTS {alter_row_policy_name} ON {table_name}")
 
+@TestScenario
+@Requirements(
+    RQ_SRS_006_RBAC_RowPolicy_Restriction("1.0")
+)
+def no_grants(self, node=None):
+    """Check that user is unable to select from a table without a row policy
+    after a row policy has been altered to have a condition.
+    """
+
+    table_name = f"table_{getuid()}"
+    pol_name = f"pol_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+
+    with table(node, table_name):
+
+        with Given("I have a row policy"):
+            row_policy(name=pol_name, table=table_name)
+
+        with When("The table has some values"):
+            node.query(f"INSERT INTO {table_name} (y) VALUES (1)")
+
+        with Then("I try to select from the table"):
+            output = node.query(f"SELECT * FROM {table_name}").output
+            assert '1' in output, error()
+
+        with When("I alter the row policy to have a condition"):
+            node.query(f"ALTER POLICY {pol_name} ON {table_name} FOR SELECT USING 1")
+
+        with Then("I try to select from the table"):
+            output = node.query(f"SELECT * FROM {table_name}").output
+            assert '' == output, error()
+
+@TestScenario
+@Requirements(
+    RQ_SRS_006_RBAC_RowPolicy_Alter_Access_Permissive("1.0"),
+)
+def permissive(self, node=None):
+    """Check that user is able to see from a table when they have a PERMISSIVE policy.
+    """
+
+    table_name = f"table_{getuid()}"
+    pol_name = f"pol_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+
+    with table(node, table_name):
+
+        with Given("I have a row policy"):
+            row_policy(name=pol_name, table=table_name)
+
+        with And("The table has some values"):
+            node.query(f"INSERT INTO {table_name} (y) VALUES (1), (2)")
+
+        with When("I alter a row policy to be permissive"):
+            node.query(f"ALTER ROW POLICY {pol_name} ON {table_name} AS PERMISSIVE FOR SELECT USING y=1 TO default")
+
+        with Then("I try to select from the table"):
+            output = node.query(f"SELECT * FROM {table_name}").output
+            assert '1' in output and '2' not in output, error()
+
+@TestScenario
+@Requirements(
+    RQ_SRS_006_RBAC_RowPolicy_Alter_Access_Restrictive("1.0")
+)
+def restrictive(self, node=None):
+    """Check that user is able to see values they have a RESTRICTIVE policy for.
+    """
+
+    table_name = f"table_{getuid()}"
+    perm_pol_name = f"perm_pol_{getuid()}"
+    pol_name = f"pol_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+
+    with table(node, table_name):
+
+        with Given("I have a row policy"):
+            row_policy(name=pol_name, table=table_name)
+
+        with And("I have a second row policy"):
+            row_policy(name=perm_pol_name, table=table_name)
+
+        with And("I alter a row policy to be permissive"):
+            node.query(f"ALTER ROW POLICY {perm_pol_name} ON {table_name} FOR SELECT USING y=1 OR y=2 TO default")
+
+        with And("I alter a row policy to be restrictive"):
+            node.query(f"ALTER ROW POLICY {pol_name} ON {table_name} AS RESTRICTIVE FOR SELECT USING y=1 TO default")
+
+        with When("The table has some values"):
+            node.query(f"INSERT INTO {table_name} (y) VALUES (1), (2)")
+
+        with Then("I try to select from the table"):
+            output = node.query(f"SELECT * FROM {table_name}").output
+            assert '1' in output and '2' not in output, error()
+
+@TestScenario
+@Requirements(
+    RQ_SRS_006_RBAC_RowPolicy_Alter_ForSelect("1.0"),
+)
+def for_select(self, node=None):
+    """Check that user is able to see values allowed by the row policy condition in the FOR SELECT clause.
+    """
+
+    table_name = f"table_{getuid()}"
+    pol_name = f"pol_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+
+    with table(node, table_name):
+
+        with Given("I have a row policy"):
+            row_policy(name=pol_name, table=table_name)
+
+        with And("The table has some values"):
+            node.query(f"INSERT INTO {table_name} (y) VALUES (1)")
+
+        with Given("I alter therow policy to use FOR SELECT"):
+            node.query(f"Alter ROW POLICY {pol_name} ON {table_name} FOR SELECT USING 1 TO default")
+
+        with Then("I try to select from the table"):
+            output = node.query(f"SELECT * FROM {table_name}").output
+            assert '1' in output, error()
+
+@TestScenario
+@Requirements(
+    RQ_SRS_006_RBAC_RowPolicy_Alter_Condition("1.0")
+)
+def condition(self, node=None):
+    """Check that user is able to see values allowed by the row policy condition.
+    """
+
+    table_name = f"table_{getuid()}"
+    pol_name = f"pol_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+
+    with table(node, table_name):
+
+        with Given("I have a row policy"):
+            row_policy(name=pol_name, table=table_name)
+
+        with And("The table has some values"):
+            node.query(f"INSERT INTO {table_name} (y) VALUES (1),(2)")
+
+        with When("I alter a row policy to be permissive"):
+            node.query(f"ALTER ROW POLICY {pol_name} ON {table_name} FOR SELECT USING y=1 TO default")
+
+        with Then("I try to select from the table"):
+            output = node.query(f"SELECT * FROM {table_name}").output
+            assert '1' in output, error()
+
+@TestScenario
+@Requirements(
+    RQ_SRS_006_RBAC_RowPolicy_Alter_Condition_None("1.0")
+)
+def remove_condition(self, node=None):
+    """Check that user is able to see the table after row policy condition has been removed.
+    """
+
+    table_name = f"table_{getuid()}"
+    pol_name = f"pol_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+
+    with table(node, table_name):
+
+        with Given("I have a row policy"):
+            row_policy(name=pol_name, table=table_name)
+
+        with And("The row policy has a condition"):
+            node.query(f"ALTER ROW POLICY {pol_name} ON {table_name} FOR SELECT USING 1")
+
+        with And("The table has some values"):
+            node.query(f"INSERT INTO {table_name} (y) VALUES (1)")
+
+        with When("I alter a row policy to not have a condition"):
+            node.query(f"ALTER ROW POLICY {pol_name} ON {table_name} FOR SELECT USING NONE")
+
+        with Then("I try to select from the table"):
+            output = node.query(f"SELECT * FROM {table_name}").output
+            assert '1' in output, error()
+
+@TestScenario
+@Requirements(
+    RQ_SRS_006_RBAC_RowPolicy_Alter_IfExists("1.0")
+)
+def if_exists(self, node=None):
+    """Check that a row policy altered using IF EXISTS restricts rows as expected.
+    """
+
+    table_name = f"table_{getuid()}"
+    pol_name = f"pol_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+
+    with table(node, table_name):
+
+        with Given("I have a row policy"):
+            row_policy(name=pol_name, table=table_name)
+
+        with And("The table has some values"):
+            node.query(f"INSERT INTO {table_name} (y) VALUES (1)")
+
+        with When("I have alter a row policy to be permissive using IF EXISTS clause"):
+            node.query(f"ALTER ROW POLICY IF EXISTS {pol_name} ON {table_name} FOR SELECT USING 1 TO default")
+
+        with Then("I select from the table"):
+            output = node.query(f"SELECT * FROM {table_name}").output
+            assert '1' in output, error()
+
+@TestScenario
+@Requirements(
+    RQ_SRS_006_RBAC_RowPolicy_Alter_Rename("1.0")
+)
+def rename(self, node=None):
+    """Check that a row policy altered using RENAME restricts rows as expected.
+    """
+
+    table_name = f"table_{getuid()}"
+    pol_name = f"pol_{getuid()}"
+    pol_new_name = f"pol_new_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+
+    with table(node, table_name):
+        try:
+            with Given("I have a row policy"):
+                row_policy(name=pol_name, table=table_name)
+
+            with And("The table has some values"):
+                node.query(f"INSERT INTO {table_name} (y) VALUES (1)")
+
+            with And("The row policy is permissive"):
+                node.query(f"ALTER ROW POLICY {pol_name} ON {table_name} FOR SELECT USING y=1 TO default")
+
+            with When("I have alter a row policy by renaming it"):
+                node.query(f"ALTER ROW POLICY {pol_name} ON {table_name} RENAME TO {pol_new_name}")
+
+            with Then("I select from the table"):
+                output = node.query(f"SELECT * FROM {table_name}").output
+                assert '1' in output, error()
+
+        finally:
+            with Finally("I drop the row policy"):
+                node.query(f"DROP ROW POLICY IF EXISTS {pol_new_name} ON {table_name}")
+
+@TestScenario
+@Requirements(
+    RQ_SRS_006_RBAC_RowPolicy_Alter_OnCluster("1.0")
+)
+def on_cluster(self, node=None):
+    """Check that a row policy altered using ON CLUSTER applies to the nodes of the cluster correctly.
+    """
+
+    table_name = f"table_{getuid()}"
+    pol_name = f"pol_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+        node2 = self.context.node2
+
+    try:
+        with Given("I have a table on a cluster"):
+            node.query(f"CREATE TABLE {table_name} ON CLUSTER sharded_cluster (x UInt64) ENGINE = Memory")
+
+        with And("I have a row policy on a cluster on that table"):
+            node.query(f"CREATE ROW POLICY {pol_name} ON CLUSTER sharded_cluster ON {table_name}")
+
+        with And("The table has some values on the first node"):
+            node.query(f"INSERT INTO {table_name} (x) VALUES (1)")
+
+        with And("The table has some values on the second node"):
+            node2.query(f"INSERT INTO {table_name} (x) VALUES (1)")
+
+        with When("I alter the row policy to have a condition"):
+            node.query(f"ALTER ROW POLICY {pol_name} ON CLUSTER sharded_cluster ON {table_name} FOR SELECT USING 1")
+
+        with Then("I select from the table"):
+            output = node.query(f"SELECT * FROM {table_name}").output
+            assert '' == output, error()
+
+        with And("I select from another node on the cluster"):
+            output = node2.query(f"SELECT * FROM {table_name}").output
+            assert '' == output, error()
+
+    finally:
+        with Finally("I drop the row policy", flags=TE):
+            node.query(f"DROP ROW POLICY IF EXISTS {pol_name} ON CLUSTER sharded_cluster ON {table_name}")
+
+        with And("I drop the table", flags=TE):
+            node.query(f"DROP TABLE {table_name} ON CLUSTER sharded_cluster")
+
+@TestScenario
+def diff_policies_on_diff_nodes(self, node=None):
+    """Check that a row policy altered on a node, does not effect row policy on a different node.
+    """
+
+    table_name = f"table_{getuid()}"
+    pol_name = f"pol_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+        node2 = self.context.node2
+
+    try:
+        with Given("I have a table on a cluster"):
+            node.query(f"CREATE TABLE {table_name} ON CLUSTER sharded_cluster (x UInt64) ENGINE = Memory")
+
+        with And("I have a row policy on the cluster"):
+            node.query(f"CREATE ROW POLICY {pol_name} ON CLUSTER sharded_cluster ON {table_name}")
+
+        with And("The table has some values on the first node"):
+            node.query(f"INSERT INTO {table_name} (x) VALUES (1)")
+
+        with And("The table has some values on the second node"):
+            node2.query(f"INSERT INTO {table_name} (x) VALUES (1)")
+
+        with When("I alter the row policy on the first node"):
+            node.query(f"ALTER ROW POLICY {pol_name} ON {table_name} FOR SELECT USING 1")
+
+        with Then("I select from the table"):
+            output = node.query(f"SELECT * FROM {table_name}").output
+            assert '' == output, error()
+
+        with And("I select from another node on the cluster"):
+            output = node2.query(f"SELECT * FROM {table_name}").output
+            assert '1' in output, error()
+
+    finally:
+        with Finally("I drop the row policy", flags=TE):
+            node.query(f"DROP ROW POLICY IF EXISTS {pol_name} ON CLUSTER sharded_cluster ON {table_name}")
+
+        with And("I drop the table", flags=TE):
+            node.query(f"DROP TABLE {table_name} ON CLUSTER sharded_cluster")
+
+@TestScenario
+@Requirements(
+    RQ_SRS_006_RBAC_RowPolicy_Alter_Assignment("1.0"),
+)
+def assignment(self, node=None):
+    """Check that user is able to see rows from a table when they have PERMISSIVE policy assigned to them.
+    """
+
+    table_name = f"table_{getuid()}"
+    pol_name = f"pol_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+
+    with table(node, table_name):
+
+        with Given("I have a row policy"):
+            row_policy(name=pol_name, table=table_name)
+
+        with And("The row policy is permissive"):
+            node.query(f"ALTER ROW POLICY {pol_name} ON {table_name} FOR SELECT USING 1")
+
+        with And("The table has some values"):
+            node.query(f"INSERT INTO {table_name} (y) VALUES (1)")
+
+        with When("I alter a row policy to be assigned to default"):
+            node.query(f"ALTER ROW POLICY {pol_name} ON {table_name} TO default")
+
+        with Then("I try to select from the table"):
+            output = node.query(f"SELECT * FROM {table_name}").output
+            assert '1' in output, error()
+
+@TestScenario
+@Requirements(
+    RQ_SRS_006_RBAC_RowPolicy_Alter_Assignment_None("1.0"),
+)
+def assignment_none(self, node=None):
+    """Check that no one is affected when a row policy is altered to be assigned to NONE.
+    """
+
+    table_name = f"table_{getuid()}"
+    pol_name = f"pol_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+
+    with table(node, table_name):
+
+        with Given("I have a row policy"):
+            row_policy(name=pol_name, table=table_name)
+
+        with And("The row policy is permissive"):
+            node.query(f"ALTER ROW POLICY {pol_name} ON {table_name} FOR SELECT USING 1")
+
+        with And("The table has some values"):
+            node.query(f"INSERT INTO {table_name} (y) VALUES (1)")
+
+        with When("I alter a row policy to be assigned to NONE"):
+            node.query(f"ALTER ROW POLICY {pol_name} ON {table_name} TO NONE")
+
+        with Then("I try to select from the table"):
+            output = node.query(f"SELECT * FROM {table_name}").output
+            assert '' == output, error()
+
+@TestScenario
+@Requirements(
+    RQ_SRS_006_RBAC_RowPolicy_Alter_Assignment_All("1.0"),
+)
+def assignment_all(self, node=None):
+    """Check that everyone is effected with a row policy is altered to be assigned to ALL.
+    """
+
+    table_name = f"table_{getuid()}"
+    pol_name = f"pol_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+
+    with table(node, table_name):
+
+        with Given("I have a row policy"):
+            row_policy(name=pol_name, table=table_name)
+
+        with And("The row policy is permissive"):
+            node.query(f"ALTER ROW POLICY {pol_name} ON {table_name} FOR SELECT USING 1")
+
+        with And("The table has some values"):
+            node.query(f"INSERT INTO {table_name} (y) VALUES (1)")
+
+        with When("I alter a row policy to be assigned to ALL"):
+            node.query(f"ALTER ROW POLICY {pol_name} ON {table_name} TO ALL")
+
+        with Then("I try to select from the table"):
+            output = node.query(f"SELECT * FROM {table_name}").output
+            assert '1' in output, error()
+
+@TestScenario
+@Requirements(
+    RQ_SRS_006_RBAC_RowPolicy_Alter_Assignment_AllExcept("1.0"),
+)
+def assignment_all_except(self, node=None):
+    """Check that everyone is except the specified user is effect by a row policy is altered to be assigned to ALL EXCEPT.
+    """
+
+    table_name = f"table_{getuid()}"
+    pol_name = f"pol_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+
+    with table(node, table_name):
+
+        with Given("I have a row policy"):
+            row_policy(name=pol_name, table=table_name)
+
+        with And("The row policy is permissive"):
+            node.query(f"ALTER ROW POLICY {pol_name} ON {table_name} FOR SELECT USING 1")
+
+        with And("The table has some values"):
+            node.query(f"INSERT INTO {table_name} (y) VALUES (1)")
+
+        with When("I alter a row policy to be assigned to ALL EXCEPT default"):
+            node.query(f"ALTER ROW POLICY {pol_name} ON {table_name} TO ALL EXCEPT default")
+
+        with Then("I try to select from the table"):
+            output = node.query(f"SELECT * FROM {table_name}").output
+            assert '' == output, error()
+
+@TestScenario
+@Requirements(
+    RQ_SRS_006_RBAC_RowPolicy_Nesting("1.0")
+)
+def nested_view(self, node=None):
+    """Check that if a user has a row policy on a table and a view is altered to use a condition on that table,
+    the user is only able to access the rows specified by the assigned policies.
+    """
+
+    table_name = f"table_{getuid()}"
+    view_name = f"view_{getuid()}"
+    pol_name = f"pol_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+
+    with table(node, table_name):
+
+        try:
+            with Given("I have a row policy"):
+                row_policy(name=pol_name, table=table_name)
+
+            with And("The table has some values"):
+                node.query(f"INSERT INTO {table_name} (y) VALUES (1),(2)")
+
+            with And("There is a view on the table"):
+                node.query(f"CREATE VIEW {view_name} AS SELECT * FROM {table_name}")
+
+            with When("I alter the row policy to be permissive"):
+                node.query(f"ALTER ROW POLICY {pol_name} ON {table_name} FOR SELECT USING y=1 TO default")
+
+            with Then("I try to select from the view"):
+                output = node.query(f"SELECT * FROM {view_name}").output
+                assert '1' in output and '2' not in output, error()
+
+        finally:
+            with Finally("I drop the view", flags=TE):
+                node.query(f"DROP VIEW IF EXISTS {view_name}")
+
+@TestScenario
+@Requirements(
+    RQ_SRS_006_RBAC_RowPolicy_Nesting("1.0")
+)
+def nested_live_view_before_policy(self, node=None):
+    """Check that if a live view exists on a table and then a row policy is created,
+    the user is only able to select rows specified by the assigned policies from the view.
+    """
+
+    table_name = f"table_{getuid()}"
+    view_name = f"view_{getuid()}"
+    pol_name = f"pol_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+
+    with table(node, table_name):
+        try:
+            with Given("I add allow_experimental_live_view to the default query settings"):
+                default_query_settings = getsattr(current().context, "default_query_settings", [])
+                default_query_settings.append(("allow_experimental_live_view", 1))
+
+            with And("I have a row policy"):
+                row_policy(name=pol_name, table=table_name)
+
+            with And("The table has some values"):
+                node.query(f"INSERT INTO {table_name} (y) VALUES (1),(2)")
+
+            with And("There exists a live view on the table"):
+                node.query(f"CREATE LIVE VIEW {view_name} AS SELECT * FROM {table_name}")
+
+            with When("I alter the row policy to be permissive"):
+                node.query(f"ALTER ROW POLICY {pol_name} ON {table_name} FOR SELECT USING y=1 TO default")
+
+            with Then("I try to select from the view"):
+                output = node.query(f"SELECT * FROM {view_name}").output
+                assert '1' in output and '2' not in output, error()
+
+        finally:
+            with Finally("I drop the live view", flags=TE):
+                node.query(f"DROP VIEW IF EXISTS {view_name}")
+
+            with And("I remove allow_experimental_live_view from the default query settings", flags=TE):
+                if default_query_settings:
+                    try:
+                        default_query_settings.pop(default_query_settings.index(("allow_experimental_live_view", 1)))
+                    except ValueError:
+                        pass
+
+@TestScenario
+@Requirements(
+    RQ_SRS_006_RBAC_RowPolicy_Nesting("1.0")
+)
+def nested_live_view_after_policy(self, node=None):
+    """Check that if a user has a row policy on a table and a materialized view is created on that table,
+    the user is only able to select rows specified by the assigned policies from the view.
+    """
+
+    table_name = f"table_{getuid()}"
+    view_name = f"view_{getuid()}"
+    pol_name = f"pol_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+
+    with table(node, table_name):
+        try:
+            with Given("I add allow_experimental_live_view to the default query settings"):
+                default_query_settings = getsattr(current().context, "default_query_settings", [])
+                default_query_settings.append(("allow_experimental_live_view", 1))
+
+            with And("I have a row policy"):
+                row_policy(name=pol_name, table=table_name)
+
+            with And("The table has some values"):
+                node.query(f"INSERT INTO {table_name} (y) VALUES (1),(2)")
+
+            with When("I alter the row policy to be permissive"):
+                node.query(f"ALTER ROW POLICY {pol_name} ON {table_name} FOR SELECT USING y=1 TO default")
+
+            with And("I create a live view on the table"):
+                node.query(f"CREATE LIVE VIEW {view_name} AS SELECT * FROM {table_name}")
+
+            with Then("I try to select from the view"):
+                output = node.query(f"SELECT * FROM {view_name}").output
+                assert '1' in output and '2' not in output, error()
+
+        finally:
+            with Finally("I drop the live view", flags=TE):
+                node.query(f"DROP VIEW IF EXISTS {view_name}")
+
+            with And("I remove allow_experimental_live_view from the default query settings", flags=TE):
+                if default_query_settings:
+                    try:
+                        default_query_settings.pop(default_query_settings.index(("allow_experimental_live_view", 1)))
+                    except ValueError:
+                        pass
+
+@TestScenario
+@Requirements(
+    RQ_SRS_006_RBAC_RowPolicy_Nesting("1.0")
+)
+def nested_mat_view_before_policy(self, node=None):
+    """Check that if a materialized view exists on a table and then a row policy is created,
+    the user is only able to select rows specified by the assigned policies from the view.
+    """
+
+    table_name = f"table_{getuid()}"
+    view_name = f"view_{getuid()}"
+    pol_name = f"pol_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+
+    with table(node, table_name):
+        try:
+            with Given("I have a row policy"):
+                row_policy(name=pol_name, table=table_name)
+
+            with And("There exists a mat view on the table"):
+                node.query(f"CREATE MATERIALIZED VIEW {view_name} ENGINE = Memory AS SELECT * FROM {table_name}")
+
+            with And("The table has some values"):
+                node.query(f"INSERT INTO {table_name} (y) VALUES (1),(2)")
+
+            with When("I alter the row policy"):
+                node.query(f"ALTER ROW POLICY {pol_name} ON {table_name} FOR SELECT USING y=1 TO default")
+
+            with Then("I try to select from the view"):
+                output = node.query(f"SELECT * FROM {view_name}").output
+                assert '1' in output and '2' not in output, error()
+
+        finally:
+            with Finally("I drop the materialized view", flags=TE):
+                node.query(f"DROP VIEW IF EXISTS {view_name}")
+
+@TestScenario
+@Requirements(
+    RQ_SRS_006_RBAC_RowPolicy_Nesting("1.0")
+)
+def nested_mat_view_after_policy(self, node=None):
+    """Check that if a user has a row policy on a table and a materialized view is created on that table,
+    the user is only able to select rows specified by the assigned policies from the view.
+    """
+
+    table_name = f"table_{getuid()}"
+    view_name = f"view_{getuid()}"
+    pol_name = f"pol_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+
+    with table(node, table_name):
+        try:
+            with Given("I have a row policy"):
+                row_policy(name=pol_name, table=table_name)
+
+            with And("I alter the row policy"):
+                node.query(f"ALTER ROW POLICY {pol_name} ON {table_name} FOR SELECT USING y=1 TO default")
+
+            with When("I create a mat view on the table"):
+                node.query(f"CREATE MATERIALIZED VIEW {view_name} ENGINE = Memory AS SELECT * FROM {table_name}")
+
+            with And("The table has some values"):
+                node.query(f"INSERT INTO {table_name} (y) VALUES (1),(2)")
+
+            with Then("I try to select from the view"):
+                output = node.query(f"SELECT * FROM {view_name}").output
+                assert '1' in output and '2' not in output, error()
+
+        finally:
+            with Finally("I drop the materialized view", flags=TE):
+                node.query(f"DROP VIEW IF EXISTS {view_name}")
+
+@TestScenario
+@Requirements(
+    RQ_SRS_006_RBAC_RowPolicy_Nesting("1.0")
+)
+def populate_mat_view(self, node=None):
+    """Check that if a user has a row policy on a table and a materialized view is created using POPULATE from that table,
+    the user can only select the rows from the materialized view specified in the row policy.
+    """
+
+    table_name = f"table_{getuid()}"
+    view_name = f"view_{getuid()}"
+    pol_name = f"pol_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+
+    with table(node, table_name):
+        try:
+            with Given("I have a row policy"):
+                row_policy(name=pol_name, table=table_name)
+
+            with And("I alter a row policy on the table"):
+                node.query(f"ALTER ROW POLICY {pol_name} ON {table_name} FOR SELECT USING y=1 TO default")
+
+            with And("The table has some values"):
+                node.query(f"INSERT INTO {table_name} (y) VALUES (1),(2)")
+
+            with When("I create a mat view populated by the table"):
+                node.query(f"CREATE MATERIALIZED VIEW {view_name} ENGINE = Memory POPULATE AS SELECT * FROM {table_name}")
+
+            with Then("I try to select from the view"):
+                output = node.query(f"SELECT * FROM {view_name}").output
+                assert '1' in output and '2' not in output, error()
+
+        finally:
+            with Finally("I drop the materialized view", flags=TE):
+                node.query(f"DROP VIEW IF EXISTS {view_name}")
+
+@TestScenario
+@Requirements(
+    RQ_SRS_006_RBAC_RowPolicy_Nesting("1.0")
+)
+def dist_table(self, node=None):
+    """Check that if a user has a row policy on a table and a distributed table is created on that table,
+    the user is only able to access the rows specified by the assigned policies.
+    """
+
+    table_name = f"table_{getuid()}"
+    dist_table_name = f"dist_table_{getuid()}"
+    pol_name = f"pol_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+        node2 = self.context.node2
+
+    try:
+        with Given("I have a table on a cluster"):
+            node.query(f"CREATE TABLE {table_name} ON CLUSTER sharded_cluster (x UInt64) ENGINE = Memory")
+
+        with And("I have a row policy"):
+            node.query(f"CREATE ROW POLICY {pol_name} ON CLUSTER sharded_cluster ON {table_name}")
+
+        with And("I have a distributed table"):
+            node.query(f"CREATE TABLE {dist_table_name} (x UInt64) ENGINE = Distributed(sharded_cluster, default, {table_name}, rand())")
+
+        with And("The table has some values on the first node"):
+            node.query(f"INSERT INTO {table_name} (x) VALUES (1)")
+
+        with When("I alter the row policy to be permissive"):
+            node.query(f"ALTER ROW POLICY {pol_name} ON {table_name} ON CLUSTER sharded_cluster FOR SELECT USING 1")
+
+        with Then("I select from the distributed table"):
+            output = node.query(f"SELECT * FROM {dist_table_name}").output
+            assert '' == output, error()
+
+    finally:
+        with Finally("I drop the row policy", flags=TE):
+            node.query(f"DROP ROW POLICY IF EXISTS {pol_name} ON CLUSTER sharded_cluster ON {table_name}")
+
+        with And("I drop the table", flags=TE):
+            node.query(f"DROP TABLE IF EXISTS {table_name} ON CLUSTER sharded_cluster")
+
+        with And("I drop the distributed table", flags=TE):
+            node.query(f"DROP TABLE IF EXISTS {dist_table_name}")
+
+@TestScenario
+@Requirements(
+    RQ_SRS_006_RBAC_RowPolicy_Nesting("1.0")
+)
+def dist_table_diff_policies_on_diff_nodes(self, node=None):
+    """Check that user is only able to select from the distributed table what is allowed by the row policies on each node.
+    """
+
+    table_name = f"table_{getuid()}"
+    dist_table_name = f"dist_table_{getuid()}"
+    pol_name = f"pol_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+        node2 = self.context.node2
+
+    try:
+        with Given("I have a table on a cluster"):
+            node.query(f"CREATE TABLE {table_name} ON CLUSTER sharded_cluster (x UInt64) ENGINE = Memory")
+
+        with And("I have a row policy"):
+            node.query(f"CREATE ROW POLICY {pol_name} ON CLUSTER sharded_cluster ON {table_name}")
+
+        with And("I have a distributed table"):
+            node.query(f"CREATE TABLE {dist_table_name} (x UInt64) ENGINE = Distributed(sharded_cluster, default, {table_name}, rand())")
+
+        with And("The table has some values on the first node"):
+            node.query(f"INSERT INTO {table_name} (x) VALUES (1)")
+
+        with And("The table has some values on the second node"):
+            node2.query(f"INSERT INTO {table_name} (x) VALUES (2)")
+
+        with When("I alter the row policy to be permissive on the first node"):
+            node.query(f"ALTER ROW POLICY {pol_name} ON {table_name} FOR SELECT USING 1")
+
+        with Then("I select from the distributed table"):
+            output = node.query(f"SELECT * FROM {dist_table_name}").output
+            assert '1' not in output and '2' in output, error()
+
+    finally:
+        with Finally("I drop the row policy", flags=TE):
+            node.query(f"DROP ROW POLICY IF EXISTS {pol_name} ON {table_name} ON CLUSTER sharded_cluster")
+
+        with And("I drop the table", flags=TE):
+            node.query(f"DROP TABLE IF EXISTS {table_name} ON CLUSTER sharded_cluster")
+
+        with And("I drop the distributed table", flags=TE):
+            node.query(f"DROP TABLE IF EXISTS {dist_table_name}")
+
+@TestScenario
+@Requirements(
+    RQ_SRS_006_RBAC_RowPolicy_Nesting("1.0")
+)
+def dist_table_on_dist_table(self, node=None):
+    """Check that if a user has a row policy on a table and a distributed table is created on that table,
+    and another distributed table is created on top of that,
+    the user is only able to access rows on any of the tables specified by the assigned policies.
+    """
+    table_name = f"table_{getuid()}"
+    dist_table_name = f"dist_table_{getuid()}"
+    dist_table_2_name = f"dist_table_2_{getuid()}"
+    pol_name = f"pol_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+        node2 = self.context.node2
+
+    try:
+        with Given("I have a table on a cluster"):
+            node.query(f"CREATE TABLE {table_name} ON CLUSTER sharded_cluster (x UInt64) ENGINE = Memory")
+
+        with And("I have a row policy"):
+            node.query(f"CREATE ROW POLICY {pol_name} ON CLUSTER sharded_cluster ON {table_name}")
+
+        with And("I have a distributed table on a cluster"):
+            node.query(f"CREATE TABLE {dist_table_name} ON CLUSTER sharded_cluster (x UInt64) ENGINE = Distributed(sharded_cluster, default, {table_name}, rand())")
+
+        with And("I have a distributed table on the other distributed table"):
+            node.query(f"CREATE TABLE {dist_table_2_name} (x UInt64) ENGINE = Distributed(sharded_cluster, default, {dist_table_name}, rand())")
+
+        with And("The table has some values on the first node"):
+            node.query(f"INSERT INTO {table_name} (x) VALUES (1)")
+
+        with When("I alter the row policy to be permissive on the first node"):
+            node.query(f"ALTER ROW POLICY {pol_name} ON {table_name} FOR SELECT USING 1")
+
+        with Then("I select from the second distributed table"):
+            output = node.query(f"SELECT * FROM {dist_table_2_name}").output
+            assert '' == output, error()
+
+    finally:
+        with Finally("I drop the row policy", flags=TE):
+            node.query(f"DROP ROW POLICY IF EXISTS {pol_name} ON CLUSTER sharded_cluster ON {table_name}")
+
+        with And("I drop the table", flags=TE):
+            node.query(f"DROP TABLE IF EXISTS {table_name} ON CLUSTER sharded_cluster")
+
+        with And("I drop the distributed table", flags=TE):
+            node.query(f"DROP TABLE IF EXISTS {dist_table_name} ON CLUSTER sharded_cluster")
+
+        with And("I drop the outer distributed table", flags=TE):
+            node.query(f"DROP TABLE IF EXISTS {dist_table_2_name}")
+
+@TestScenario
+def policy_before_table(self, node=None):
+    """Check that if the policy is created and altered before the table,
+    then it is still applied correctly.
+    """
+    table_name = f"table_{getuid()}"
+    pol_name = f"pol_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+
+    with Given("I have a row policy"):
+        row_policy(name=pol_name, table=table_name)
+
+    with And("I alter the row policy"):
+        node.query(f"ALTER ROW POLICY {pol_name} ON {table_name} FOR SELECT USING y=1 TO default")
+
+    with table(node, table_name):
+        with When("The table has some values"):
+            node.query(f"INSERT INTO {table_name} (y) VALUES (1), (2)")
+
+        with Then("I try to select from the table"):
+            output = node.query(f"SELECT * FROM {table_name}").output
+            assert '1' in output and '2' not in output, error()
+
+@TestScenario
+@Requirements(
+    RQ_SRS_006_RBAC_RowPolicy_Nesting("1.0"),
+)
+def dict(self, node=None):
+    """Check that if a user has a row policy on a table and a dictionary is created on that table,
+    the user is only able to access the rows specified by the assigned policies.
+    """
+
+    table_name = f"table_{getuid()}"
+    dict_name = f"view_{getuid()}"
+    pol_name = f"pol_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+
+    try:
+        with Given("I have a row policy"):
+            row_policy(name=pol_name, table=table_name)
+
+        with And("I have a table"):
+            node.query(f"CREATE TABLE {table_name} (key UInt64, val UInt64 DEFAULT 5) ENGINE = Memory")
+
+        with And("The table has some values"):
+            node.query(f"INSERT INTO {table_name} (key) VALUES (1),(2)")
+
+        with And("I create a dict on the table"):
+            node.query(f"CREATE DICTIONARY {dict_name} (key UInt64 DEFAULT 0, val UInt64 DEFAULT 5) PRIMARY KEY key SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE {table_name} PASSWORD '' DB 'default')) LIFETIME(MIN 0 MAX 0) LAYOUT(FLAT())")
+
+        with When("I alter the row policy to be permissive"):
+            node.query(f"ALTER ROW POLICY {pol_name} ON {table_name} FOR SELECT USING key=1 TO default")
+
+        with Then("I try to select from the dict"):
+            output = node.query(f"SELECT * FROM {dict_name}").output
+            assert '1' in output and '2' not in output, error()
+
+    finally:
+        with Finally("I drop the materialized view", flags=TE):
+            node.query(f"DROP DICTIONARY IF EXISTS {dict_name}")
+
+        with And("I drop the table", flags=TE):
+            node.query(f"DROP TABLE IF EXISTS {table_name}")
+
+
 @TestFeature
 @Name("alter row policy")
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_AlterRowPolicy("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 def feature(self, node="clickhouse1"):
     """Check the RBAC functionality of ALTER ROW POLICY.
     """
     self.context.node = self.context.cluster.node(node)
+    self.context.node2 = self.context.cluster.node("clickhouse2")
 
     Suite(run=privileges_granted_directly, setup=instrument_clickhouse_server_log)
     Suite(run=privileges_granted_via_role, setup=instrument_clickhouse_server_log)
+
+    Scenario(run=no_grants, setup=instrument_clickhouse_server_log)
+    Scenario(run=permissive, setup=instrument_clickhouse_server_log)
+    Scenario(run=restrictive, setup=instrument_clickhouse_server_log)
+    Scenario(run=for_select, setup=instrument_clickhouse_server_log)
+    Scenario(run=condition, setup=instrument_clickhouse_server_log)
+    Scenario(run=remove_condition, setup=instrument_clickhouse_server_log)
+    Scenario(run=if_exists, setup=instrument_clickhouse_server_log)
+    Scenario(run=rename, setup=instrument_clickhouse_server_log)
+    Scenario(run=on_cluster, setup=instrument_clickhouse_server_log)
+    Scenario(run=assignment, setup=instrument_clickhouse_server_log)
+    Scenario(run=assignment_none, setup=instrument_clickhouse_server_log)
+    Scenario(run=assignment_all, setup=instrument_clickhouse_server_log)
+    Scenario(run=assignment_all_except, setup=instrument_clickhouse_server_log)
+    Scenario(run=nested_view, setup=instrument_clickhouse_server_log)
+    Scenario(run=nested_live_view_before_policy, setup=instrument_clickhouse_server_log)
+    Scenario(run=nested_live_view_after_policy, setup=instrument_clickhouse_server_log)
+    Scenario(run=nested_mat_view_before_policy, setup=instrument_clickhouse_server_log)
+    Scenario(run=nested_mat_view_after_policy, setup=instrument_clickhouse_server_log)
+    Scenario(run=populate_mat_view, setup=instrument_clickhouse_server_log)
+    Scenario(run=dist_table, setup=instrument_clickhouse_server_log)
+    Scenario(run=dist_table_on_dist_table, setup=instrument_clickhouse_server_log)
+    Scenario(run=dist_table_diff_policies_on_diff_nodes, setup=instrument_clickhouse_server_log)
+    Scenario(run=diff_policies_on_diff_nodes, setup=instrument_clickhouse_server_log)
+    Scenario(run=policy_before_table, setup=instrument_clickhouse_server_log)
+    Scenario(run=dict, setup=instrument_clickhouse_server_log)
diff --git a/tests/testflows/rbac/tests/privileges/alter/alter_settings.py b/tests/testflows/rbac/tests/privileges/alter/alter_settings.py
index 6ac482fa33d..c2c2110ddf0 100755
--- a/tests/testflows/rbac/tests/privileges/alter/alter_settings.py
+++ b/tests/testflows/rbac/tests/privileges/alter/alter_settings.py
@@ -1,7 +1,5 @@
 import json
 
-from multiprocessing.dummy import Pool
-
 from testflows.core import *
 from testflows.asserts import error
 
@@ -10,7 +8,7 @@ from rbac.helper.common import *
 import rbac.helper.errors as errors
 from rbac.helper.tables import table_types
 
-aliases = {"ALTER SETTINGS", "ALTER SETTING", "ALTER MODIFY SETTING", "MODIFY SETTING"}
+aliases = {"ALTER SETTINGS", "ALTER SETTING", "ALTER MODIFY SETTING", "MODIFY SETTING", "ALL"}
 
 def check_alter_settings_when_privilege_is_granted(table, user, node):
     """Ensures ADD SETTINGS runs as expected when the privilege is granted to the specified user
@@ -21,7 +19,7 @@ def check_alter_settings_when_privilege_is_granted(table, user, node):
 
     with And(f"I modify settings"):
         node.query(f"ALTER TABLE {table} MODIFY SETTING merge_with_ttl_timeout=5",
-            settings = [("user", user)])
+            settings=[("user", user)])
 
     with Then("I verify that the setting is in the table"):
         output = json.loads(node.query(f"SHOW CREATE TABLE {table} FORMAT JSONEachRow").output)
@@ -30,10 +28,16 @@ def check_alter_settings_when_privilege_is_granted(table, user, node):
 def check_alter_settings_when_privilege_is_not_granted(table, user, node):
     """Ensures CLEAR SETTINGS runs as expected when the privilege is granted to the specified user
     """
-    with When("I try to use ALTER SETTING, has not been granted"):
+    with When("I grant the user NONE privilege"):
+        node.query(f"GRANT NONE TO {user}")
+
+    with And("I grant the user USAGE privilege"):
+        node.query(f"GRANT USAGE ON *.* TO {user}")
+
+    with Then("I try to use ALTER SETTING, has not been granted"):
         exitcode, message = errors.not_enough_privileges(user)
         node.query(f"ALTER TABLE {table} MODIFY SETTING merge_with_ttl_timeout=5",
-            settings = [("user", user)], exitcode=exitcode, message=message)
+            settings=[("user", user)], exitcode=exitcode, message=message)
 
 @TestScenario
 def user_with_privileges(self, privilege, table_type, node=None):
@@ -53,6 +57,7 @@ def user_with_privileges(self, privilege, table_type, node=None):
         with Then(f"I try to ALTER SETTINGS"):
             check_alter_settings_when_privilege_is_granted(table_name, user_name, node)
 
+
 @TestScenario
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_AlterSettings_Revoke("1.0"),
@@ -180,7 +185,9 @@ def scenario_parallelization(self, table_type, privilege):
 @TestFeature
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_AlterSettings("1.0"),
-    RQ_SRS_006_RBAC_Privileges_AlterSettings_TableEngines("1.0")
+    RQ_SRS_006_RBAC_Privileges_AlterSettings_TableEngines("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 @Examples("table_type", [
     (key,) for key in table_types.keys()
@@ -208,7 +215,9 @@ def feature(self, node="clickhouse1", stress=None, parallel=None):
                 tasks = []
                 try:
                     for alias in aliases:
-                        run_scenario(pool, tasks, Suite(test=scenario_parallelization, name=alias, setup=instrument_clickhouse_server_log), {"table_type": table_type, "privilege": alias})
+                        run_scenario(pool, tasks, Suite(test=scenario_parallelization, name=alias,
+                                                        setup=instrument_clickhouse_server_log),
+                                     {"table_type": table_type, "privilege": alias})
                 finally:
                     join(tasks)
             finally:
diff --git a/tests/testflows/rbac/tests/privileges/alter/alter_settings_profile.py b/tests/testflows/rbac/tests/privileges/alter/alter_settings_profile.py
index 9212b745544..cd4648305f7 100644
--- a/tests/testflows/rbac/tests/privileges/alter/alter_settings_profile.py
+++ b/tests/testflows/rbac/tests/privileges/alter/alter_settings_profile.py
@@ -31,7 +31,7 @@ def alter_settings_profile_granted_directly(self, node=None):
 
     with user(node, f"{user_name}"):
 
-        Suite(run=alter_settings_profile, flags=TE,
+        Suite(run=alter_settings_profile,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[user_name,user_name]) for row in alter_settings_profile.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
@@ -52,13 +52,14 @@ def alter_settings_profile_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(run=alter_settings_profile, flags=TE,
+        Suite(run=alter_settings_profile,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[role_name,user_name]) for row in alter_settings_profile.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
 
 @TestOutline(Suite)
 @Examples("privilege",[
+    ("ALL",),
     ("ACCESS MANAGEMENT",),
     ("ALTER SETTINGS PROFILE",),
     ("ALTER PROFILE",),
@@ -76,7 +77,13 @@ def alter_settings_profile(self, privilege, grant_target_name, user_name, node=N
 
         with settings_profile(node, alter_settings_profile_name):
 
-            with When("I check the user can't alter a settings_profile"):
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I check the user can't alter a settings_profile"):
                 node.query(f"ALTER SETTINGS PROFILE {alter_settings_profile_name}", settings=[("user",user_name)],
                     exitcode=exitcode, message=message)
 
@@ -128,6 +135,8 @@ def alter_settings_profile(self, privilege, grant_target_name, user_name, node=N
 @Name("alter settings profile")
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_AlterSettingsProfile("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 def feature(self, node="clickhouse1"):
     """Check the RBAC functionality of ALTER SETTINGS PROFILE.
diff --git a/tests/testflows/rbac/tests/privileges/alter/alter_ttl.py b/tests/testflows/rbac/tests/privileges/alter/alter_ttl.py
index 00240f19bb4..8fa7136076e 100755
--- a/tests/testflows/rbac/tests/privileges/alter/alter_ttl.py
+++ b/tests/testflows/rbac/tests/privileges/alter/alter_ttl.py
@@ -16,7 +16,7 @@ subprivileges = {
 
 aliases = {
     "TTL" : ["ALTER TTL", "ALTER MODIFY TTL", "MODIFY TTL"],
-    "MATERIALIZE TTL": ["ALTER MATERIALIZE TTL", "MATERIALIZE TTL"],
+    "MATERIALIZE TTL": ["ALTER MATERIALIZE TTL", "MATERIALIZE TTL", "ALL"],
 }
 
 permutation_count = (1 << len(subprivileges))
@@ -250,7 +250,9 @@ def user_with_privileges_on_cluster(self, table_type, node=None):
 @TestFeature
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_AlterTTL("1.0"),
-    RQ_SRS_006_RBAC_Privileges_AlterTTL_TableEngines("1.0")
+    RQ_SRS_006_RBAC_Privileges_AlterTTL_TableEngines("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 @Examples("table_type", [
     (key,) for key in table_types.keys()
diff --git a/tests/testflows/rbac/tests/privileges/alter/alter_update.py b/tests/testflows/rbac/tests/privileges/alter/alter_update.py
index 3b3e3990497..d205740b901 100644
--- a/tests/testflows/rbac/tests/privileges/alter/alter_update.py
+++ b/tests/testflows/rbac/tests/privileges/alter/alter_update.py
@@ -7,7 +7,7 @@ from rbac.requirements import *
 from rbac.helper.common import *
 import rbac.helper.errors as errors
 
-aliases = {"ALTER UPDATE", "UPDATE"}
+aliases = {"ALTER UPDATE", "UPDATE", "ALL"}
 
 @TestSuite
 def privilege_granted_directly_or_via_role(self, table_type, privilege, node=None):
@@ -38,26 +38,41 @@ def privilege_check(grant_target_name, user_name, table_type, privilege, node=No
 
     with Scenario("user without privilege", setup=instrument_clickhouse_server_log):
         table_name = f"merge_tree_{getuid()}"
+
         with table(node, table_name, table_type):
-            with When("I attempt to update a column without privilege"):
+
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I attempt to update a column without privilege"):
                 node.query(f"ALTER TABLE {table_name} UPDATE a = x WHERE 1", settings = [("user", user_name)],
                     exitcode=exitcode, message=message)
 
     with Scenario("user with privilege", setup=instrument_clickhouse_server_log):
         table_name = f"merge_tree_{getuid()}"
+
         with table(node, table_name, table_type):
+
             with When("I grant the update privilege"):
                 node.query(f"GRANT {privilege} ON {table_name} TO {grant_target_name}")
+
             with Then("I attempt to update a column"):
                 node.query(f"ALTER TABLE {table_name} UPDATE a = x WHERE 1", settings = [("user", user_name)])
 
     with Scenario("user with revoked privilege", setup=instrument_clickhouse_server_log):
         table_name = f"merge_tree_{getuid()}"
+
         with table(node, table_name, table_type):
+
             with When("I grant the update privilege"):
                 node.query(f"GRANT {privilege} ON {table_name} TO {grant_target_name}")
+
             with And("I revoke the update privilege"):
                 node.query(f"REVOKE {privilege} ON {table_name} FROM {grant_target_name}")
+
             with Then("I attempt to update a column"):
                 node.query(f"ALTER TABLE {table_name} UPDATE a = x WHERE 1", settings = [("user", user_name)],
                     exitcode=exitcode, message=message)
@@ -65,7 +80,9 @@ def privilege_check(grant_target_name, user_name, table_type, privilege, node=No
 @TestFeature
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_AlterUpdate("1.0"),
-    RQ_SRS_006_RBAC_Privileges_AlterUpdate_TableEngines("1.0")
+    RQ_SRS_006_RBAC_Privileges_AlterUpdate_TableEngines("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 @Examples("table_type", [
     (key,) for key in table_types.keys()
diff --git a/tests/testflows/rbac/tests/privileges/alter/alter_user.py b/tests/testflows/rbac/tests/privileges/alter/alter_user.py
index 2531f4a3451..bcf3014c9be 100644
--- a/tests/testflows/rbac/tests/privileges/alter/alter_user.py
+++ b/tests/testflows/rbac/tests/privileges/alter/alter_user.py
@@ -17,7 +17,7 @@ def alter_user_granted_directly(self, node=None):
 
     with user(node, f"{user_name}"):
 
-        Suite(run=alter_user, flags=TE,
+        Suite(run=alter_user,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[user_name,user_name]) for row in alter_user.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
@@ -38,13 +38,14 @@ def alter_user_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(run=alter_user, flags=TE,
+        Suite(run=alter_user,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[role_name,user_name]) for row in alter_user.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
 
 @TestOutline(Suite)
 @Examples("privilege",[
+    ("ALL",),
     ("ACCESS MANAGEMENT",),
     ("ALTER USER",),
 ])
@@ -61,7 +62,13 @@ def alter_user(self, privilege, grant_target_name, user_name, node=None):
         alter_user_name = f"alter_user_{getuid()}"
         with user(node, alter_user_name):
 
-            with When("I check the user can't alter a user"):
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I check the user can't alter a user"):
                 node.query(f"ALTER USER {alter_user_name}", settings=[("user",user_name)],
                     exitcode=exitcode, message=message)
 
@@ -108,6 +115,8 @@ def alter_user(self, privilege, grant_target_name, user_name, node=None):
 @Name("alter user")
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_AlterUser("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 def feature(self, node="clickhouse1"):
     """Check the RBAC functionality of ALTER USER.
diff --git a/tests/testflows/rbac/tests/privileges/attach/attach_database.py b/tests/testflows/rbac/tests/privileges/attach/attach_database.py
index 0f1a9a07975..3fecbe2571f 100644
--- a/tests/testflows/rbac/tests/privileges/attach/attach_database.py
+++ b/tests/testflows/rbac/tests/privileges/attach/attach_database.py
@@ -12,13 +12,13 @@ def privilege_granted_directly_or_via_role(self, node=None):
     if node is None:
         node = self.context.node
 
-    with Suite("user with direct privilege", setup=instrument_clickhouse_server_log):
+    with Suite("user with direct privilege"):
         with user(node, user_name):
 
             with When(f"I run checks that {user_name} is only able to execute CREATE DATABASE with required privileges"):
                 privilege_check(grant_target_name=user_name, user_name=user_name, node=node)
 
-    with Suite("user with privilege via role", setup=instrument_clickhouse_server_log):
+    with Suite("user with privilege via role"):
         with user(node, user_name), role(node, role_name):
 
             with When("I grant the role to the user"):
@@ -32,11 +32,17 @@ def privilege_check(grant_target_name, user_name, node=None):
     """
     exitcode, message = errors.not_enough_privileges(name=f"{user_name}")
 
-    with Scenario("user without privilege", setup=instrument_clickhouse_server_log):
+    with Scenario("user without privilege"):
         db_name = f"db_{getuid()}"
 
         try:
-            with When("I attempt to attach a database without privilege"):
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I attempt to attach a database without privilege"):
                 node.query(f"ATTACH DATABASE {db_name}", settings = [("user", user_name)],
                     exitcode=exitcode, message=message)
 
@@ -44,14 +50,14 @@ def privilege_check(grant_target_name, user_name, node=None):
             with Finally("I drop the database"):
                 node.query(f"DROP DATABASE IF EXISTS {db_name}")
 
-    with Scenario("user with privilege", setup=instrument_clickhouse_server_log):
+    with Scenario("user with privilege"):
         db_name = f"db_{getuid()}"
 
         try:
             with When("I grant create database privilege"):
                 node.query(f"GRANT CREATE DATABASE ON {db_name}.* TO {grant_target_name}")
 
-            with Then("I attempt to attach aa database"):
+            with Then("I attempt to attach a database"):
                 node.query(f"ATTACH DATABASE {db_name}", settings = [("user", user_name)],
                     exitcode=80, message="DB::Exception: Received from localhost:9000. DB::Exception: Database engine must be specified for ATTACH DATABASE query")
 
@@ -59,7 +65,7 @@ def privilege_check(grant_target_name, user_name, node=None):
             with Finally("I drop the database"):
                 node.query(f"DROP DATABASE IF EXISTS {db_name}")
 
-    with Scenario("user with revoked privilege", setup=instrument_clickhouse_server_log):
+    with Scenario("user with revoked privilege"):
         db_name = f"db_{getuid()}"
 
         try:
@@ -77,9 +83,44 @@ def privilege_check(grant_target_name, user_name, node=None):
             with Finally("I drop the database"):
                 node.query(f"DROP DATABASE IF EXISTS {db_name}")
 
+    with Scenario("user with revoked ALL privilege"):
+        db_name = f"db_{getuid()}"
+
+        try:
+            with When("I grant the create database privilege"):
+                node.query(f"GRANT CREATE DATABASE ON {db_name}.* TO {grant_target_name}")
+
+            with And("I revoke ALL privilege"):
+                node.query(f"REVOKE ALL ON *.* FROM {grant_target_name}")
+
+            with Then("I attempt to attach a database"):
+                node.query(f"ATTACH DATABASE {db_name}", settings = [("user", user_name)],
+                    exitcode=exitcode, message=message)
+
+        finally:
+            with Finally("I drop the database"):
+                node.query(f"DROP DATABASE IF EXISTS {db_name}")
+
+    with Scenario("user with ALL privilege"):
+        db_name = f"db_{getuid()}"
+
+        try:
+            with When("I grant ALL privilege"):
+                node.query(f"GRANT ALL ON *.* TO {grant_target_name}")
+
+            with Then("I attempt to attach a database"):
+                node.query(f"ATTACH DATABASE {db_name}", settings = [("user", user_name)],
+                    exitcode=80, message="DB::Exception: Received from localhost:9000. DB::Exception: Database engine must be specified for ATTACH DATABASE query")
+
+        finally:
+            with Finally("I drop the database"):
+                node.query(f"DROP DATABASE IF EXISTS {db_name}")
+
 @TestFeature
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_AttachDatabase("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 @Name("attach database")
 def feature(self, node="clickhouse1", stress=None, parallel=None):
@@ -92,5 +133,5 @@ def feature(self, node="clickhouse1", stress=None, parallel=None):
     if stress is not None:
         self.context.stress = stress
 
-    with Suite(test=privilege_granted_directly_or_via_role):
+    with Suite(test=privilege_granted_directly_or_via_role, setup=instrument_clickhouse_server_log):
         privilege_granted_directly_or_via_role()
diff --git a/tests/testflows/rbac/tests/privileges/attach/attach_dictionary.py b/tests/testflows/rbac/tests/privileges/attach/attach_dictionary.py
index 62ff70ac75a..390a7f03aba 100644
--- a/tests/testflows/rbac/tests/privileges/attach/attach_dictionary.py
+++ b/tests/testflows/rbac/tests/privileges/attach/attach_dictionary.py
@@ -12,13 +12,13 @@ def privilege_granted_directly_or_via_role(self, node=None):
     if node is None:
         node = self.context.node
 
-    with Suite("user with direct privilege", setup=instrument_clickhouse_server_log):
+    with Suite("user with direct privilege"):
         with user(node, user_name):
 
             with When(f"I run checks that {user_name} is only able to execute CREATE DICTIONARY with required privileges"):
                 privilege_check(grant_target_name=user_name, user_name=user_name, node=node)
 
-    with Suite("user with privilege via role", setup=instrument_clickhouse_server_log):
+    with Suite("user with privilege via role"):
         with user(node, user_name), role(node, role_name):
 
             with When("I grant the role to the user"):
@@ -32,11 +32,17 @@ def privilege_check(grant_target_name, user_name, node=None):
     """
     exitcode, message = errors.not_enough_privileges(name=f"{user_name}")
 
-    with Scenario("user without privilege", setup=instrument_clickhouse_server_log):
+    with Scenario("user without privilege"):
         dict_name = f"dict_{getuid()}"
 
         try:
-            with When("I attempt to attach a dictionary without privilege"):
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I attempt to attach a dictionary without privilege"):
                 node.query(f"ATTACH DICTIONARY {dict_name}", settings = [("user", user_name)],
                     exitcode=exitcode, message=message)
 
@@ -44,7 +50,7 @@ def privilege_check(grant_target_name, user_name, node=None):
             with Finally("I drop the dictionary"):
                 node.query(f"DROP DICTIONARY IF EXISTS {dict_name}")
 
-    with Scenario("user with privilege", setup=instrument_clickhouse_server_log):
+    with Scenario("user with privilege"):
         dict_name = f"dict_{getuid()}"
 
         try:
@@ -59,7 +65,7 @@ def privilege_check(grant_target_name, user_name, node=None):
             with Finally("I drop the dictionary"):
                 node.query(f"DROP DICTIONARY IF EXISTS {dict_name}")
 
-    with Scenario("user with revoked privilege", setup=instrument_clickhouse_server_log):
+    with Scenario("user with revoked privilege"):
         dict_name = f"dict_{getuid()}"
 
         try:
@@ -77,9 +83,44 @@ def privilege_check(grant_target_name, user_name, node=None):
             with Finally("I drop the dictionary"):
                 node.query(f"DROP DICTIONARY IF EXISTS {dict_name}")
 
+    with Scenario("user with revoked ALL privilege"):
+        db_name = f"db_{getuid()}"
+
+        try:
+            with When("I grant the create database privilege"):
+                node.query(f"GRANT CREATE DATABASE ON {db_name}.* TO {grant_target_name}")
+
+            with And("I revoke ALL privilege"):
+                node.query(f"REVOKE ALL ON *.* FROM {grant_target_name}")
+
+            with Then("I attempt to attach a database"):
+                node.query(f"ATTACH DATABASE {db_name}", settings = [("user", user_name)],
+                    exitcode=exitcode, message=message)
+
+        finally:
+            with Finally("I drop the database"):
+                node.query(f"DROP DATABASE IF EXISTS {db_name}")
+
+    with Scenario("user with ALL privilege"):
+        dict_name = f"dict_{getuid()}"
+
+        try:
+            with When("I grant ALL privilege"):
+                node.query(f"GRANT ALL ON *.* TO {grant_target_name}")
+
+            with Then("I attempt to attach a dictionary"):
+                node.query(f"ATTACH DICTIONARY {dict_name}", settings = [("user", user_name)],
+                    exitcode=231, message=f"DB::Exception: Dictionary `{dict_name}` doesn't exist.")
+
+        finally:
+            with Finally("I drop the dictionary"):
+                node.query(f"DROP DICTIONARY IF EXISTS {dict_name}")
+
 @TestFeature
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_AttachDictionary("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 @Name("attach dictionary")
 def feature(self, node="clickhouse1", stress=None, parallel=None):
@@ -92,5 +133,5 @@ def feature(self, node="clickhouse1", stress=None, parallel=None):
     if stress is not None:
         self.context.stress = stress
 
-    with Suite(test=privilege_granted_directly_or_via_role):
+    with Suite(test=privilege_granted_directly_or_via_role, setup=instrument_clickhouse_server_log):
         privilege_granted_directly_or_via_role()
diff --git a/tests/testflows/rbac/tests/privileges/attach/attach_table.py b/tests/testflows/rbac/tests/privileges/attach/attach_table.py
index 55c9efd369c..411140506ea 100644
--- a/tests/testflows/rbac/tests/privileges/attach/attach_table.py
+++ b/tests/testflows/rbac/tests/privileges/attach/attach_table.py
@@ -12,13 +12,13 @@ def privilege_granted_directly_or_via_role(self, node=None):
     if node is None:
         node = self.context.node
 
-    with Suite("user with direct privilege", setup=instrument_clickhouse_server_log):
+    with Suite("user with direct privilege"):
         with user(node, user_name):
 
             with When(f"I run checks that {user_name} is only able to execute CREATE TABLE with required privileges"):
                 privilege_check(grant_target_name=user_name, user_name=user_name, node=node)
 
-    with Suite("user with privilege via role", setup=instrument_clickhouse_server_log):
+    with Suite("user with privilege via role"):
         with user(node, user_name), role(node, role_name):
 
             with When("I grant the role to the user"):
@@ -32,12 +32,17 @@ def privilege_check(grant_target_name, user_name, node=None):
     """
     exitcode, message = errors.not_enough_privileges(name=f"{user_name}")
 
-    with Scenario("user without privilege", setup=instrument_clickhouse_server_log):
+    with Scenario("user without privilege"):
         table_name = f"table_{getuid()}"
 
         try:
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
 
-            with When("I attempt to attach a table without privilege"):
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I attempt to attach a table without privilege"):
                 node.query(f"ATTACH TABLE {table_name}", settings = [("user", user_name)],
                     exitcode=exitcode, message=message)
 
@@ -45,7 +50,7 @@ def privilege_check(grant_target_name, user_name, node=None):
             with Finally("I drop the  table"):
                 node.query(f"DROP TABLE IF EXISTS {table_name}")
 
-    with Scenario("user with privilege", setup=instrument_clickhouse_server_log):
+    with Scenario("user with privilege"):
         table_name = f"table_{getuid()}"
 
         try:
@@ -60,7 +65,7 @@ def privilege_check(grant_target_name, user_name, node=None):
             with Finally("I drop the table"):
                 node.query(f"DROP TABLE IF EXISTS {table_name}")
 
-    with Scenario("user with revoked privilege", setup=instrument_clickhouse_server_log):
+    with Scenario("user with revoked privilege"):
         table_name = f"table_{getuid()}"
 
         try:
@@ -78,9 +83,44 @@ def privilege_check(grant_target_name, user_name, node=None):
             with Finally("I drop the table"):
                 node.query(f"DROP TABLE IF EXISTS {table_name}")
 
+    with Scenario("user with revoked ALL privilege"):
+        table_name = f"table_{getuid()}"
+
+        try:
+            with When("I grant the create  table privilege"):
+                node.query(f"GRANT CREATE TABLE ON *.* TO {grant_target_name}")
+
+            with And("I revoke ALL privilege"):
+                node.query(f"REVOKE ALL ON *.* FROM {grant_target_name}")
+
+            with Then("I attempt to attach a table"):
+                node.query(f"ATTACH TABLE {table_name}", settings = [("user", user_name)],
+                    exitcode=exitcode, message=message)
+
+        finally:
+            with Finally("I drop the table"):
+                node.query(f"DROP TABLE IF EXISTS {table_name}")
+
+    with Scenario("user with ALL privilege"):
+        table_name = f"table_{getuid()}"
+
+        try:
+            with When("I grant ALL privilege"):
+                node.query(f"GRANT ALL ON *.* TO {grant_target_name}")
+
+            with Then("I attempt to attach a table"):
+                node.query(f"ATTACH TABLE {table_name}", settings = [("user", user_name)],
+                    exitcode=134, message=f"DB::Exception: Table `{table_name}` doesn't exist.")
+
+        finally:
+            with Finally("I drop the table"):
+                node.query(f"DROP TABLE IF EXISTS {table_name}")
+
 @TestFeature
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_AttachTable("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 @Name("attach table")
 def feature(self, node="clickhouse1", stress=None, parallel=None):
@@ -93,5 +133,5 @@ def feature(self, node="clickhouse1", stress=None, parallel=None):
     if stress is not None:
         self.context.stress = stress
 
-    with Suite(test=privilege_granted_directly_or_via_role):
+    with Suite(test=privilege_granted_directly_or_via_role, setup=instrument_clickhouse_server_log):
         privilege_granted_directly_or_via_role()
diff --git a/tests/testflows/rbac/tests/privileges/attach/attach_temp_table.py b/tests/testflows/rbac/tests/privileges/attach/attach_temp_table.py
index fad47e71967..2662a24d5a2 100644
--- a/tests/testflows/rbac/tests/privileges/attach/attach_temp_table.py
+++ b/tests/testflows/rbac/tests/privileges/attach/attach_temp_table.py
@@ -12,13 +12,13 @@ def privilege_granted_directly_or_via_role(self, node=None):
     if node is None:
         node = self.context.node
 
-    with Suite("user with direct privilege", setup=instrument_clickhouse_server_log):
+    with Suite("user with direct privilege"):
         with user(node, user_name):
 
             with When(f"I run checks that {user_name} is only able to execute CREATE TEMPORARY TABLE with required privileges"):
                 privilege_check(grant_target_name=user_name, user_name=user_name, node=node)
 
-    with Suite("user with privilege via role", setup=instrument_clickhouse_server_log):
+    with Suite("user with privilege via role"):
         with user(node, user_name), role(node, role_name):
 
             with When("I grant the role to the user"):
@@ -32,10 +32,16 @@ def privilege_check(grant_target_name, user_name, node=None):
     """
     exitcode, message = errors.not_enough_privileges(name=f"{user_name}")
 
-    with Scenario("user without privilege", setup=instrument_clickhouse_server_log):
+    with Scenario("user without privilege"):
         temp_table_name = f"temp_table_{getuid()}"
 
         try:
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
             with When("I attempt to attach a temporary table without privilege"):
                 node.query(f"ATTACH TEMPORARY TABLE {temp_table_name} (x Int8)", settings = [("user", user_name)],
                     exitcode=exitcode, message=message)
@@ -44,12 +50,13 @@ def privilege_check(grant_target_name, user_name, node=None):
             with Finally("I drop the temporary table"):
                 node.query(f"DROP TEMPORARY TABLE IF EXISTS {temp_table_name}")
 
-    with Scenario("user with privilege", setup=instrument_clickhouse_server_log):
+    with Scenario("user with privilege"):
         temp_table_name = f"temp_table_{getuid()}"
 
         try:
             with When("I grant create temporary table privilege"):
                 node.query(f"GRANT CREATE TEMPORARY TABLE ON *.* TO {grant_target_name}")
+
             with Then("I attempt to attach a temporary table"):
                 node.query(f"ATTACH TEMPORARY TABLE {temp_table_name} (x Int8)", settings = [("user", user_name)])
 
@@ -57,7 +64,7 @@ def privilege_check(grant_target_name, user_name, node=None):
             with Finally("I drop the temporary table"):
                 node.query(f"DROP TEMPORARY TABLE IF EXISTS {temp_table_name}")
 
-    with Scenario("user with revoked privilege", setup=instrument_clickhouse_server_log):
+    with Scenario("user with revoked privilege"):
         temp_table_name = f"temp_table_{getuid()}"
 
         try:
@@ -75,9 +82,43 @@ def privilege_check(grant_target_name, user_name, node=None):
             with Finally("I drop the temporary table"):
                 node.query(f"DROP TEMPORARY TABLE IF EXISTS {temp_table_name}")
 
+    with Scenario("user with revoked ALL privilege"):
+        temp_table_name = f"temp_table_{getuid()}"
+
+        try:
+            with When("I grant the create temporary table privilege"):
+                node.query(f"GRANT CREATE TEMPORARY TABLE ON *.* TO {grant_target_name}")
+
+            with And("I revoke ALL privilege"):
+                node.query(f"REVOKE ALL ON *.* FROM {grant_target_name}")
+
+            with Then("I attempt to attach a temporary table"):
+                node.query(f"ATTACH TEMPORARY TABLE {temp_table_name} (x Int8)", settings = [("user", user_name)],
+                    exitcode=exitcode, message=message)
+
+        finally:
+            with Finally("I drop the temporary table"):
+                node.query(f"DROP TEMPORARY TABLE IF EXISTS {temp_table_name}")
+
+    with Scenario("user with ALL privilege"):
+        temp_table_name = f"temp_table_{getuid()}"
+
+        try:
+            with When("I grant ALL privilege"):
+                node.query(f"GRANT ALL ON *.* TO {grant_target_name}")
+
+            with Then("I attempt to attach a temporary table"):
+                node.query(f"ATTACH TEMPORARY TABLE {temp_table_name} (x Int8)", settings = [("user", user_name)])
+
+        finally:
+            with Finally("I drop the temporary table"):
+                node.query(f"DROP TEMPORARY TABLE IF EXISTS {temp_table_name}")
+
 @TestFeature
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_AttachTemporaryTable("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 @Name("attach temporary table")
 def feature(self, node="clickhouse1", stress=None, parallel=None):
@@ -90,5 +131,5 @@ def feature(self, node="clickhouse1", stress=None, parallel=None):
     if stress is not None:
         self.context.stress = stress
 
-    with Suite(test=privilege_granted_directly_or_via_role):
+    with Suite(test=privilege_granted_directly_or_via_role, setup=instrument_clickhouse_server_log):
         privilege_granted_directly_or_via_role()
diff --git a/tests/testflows/rbac/tests/privileges/create/create_database.py b/tests/testflows/rbac/tests/privileges/create/create_database.py
index deefe4b4ce8..8367d49e050 100644
--- a/tests/testflows/rbac/tests/privileges/create/create_database.py
+++ b/tests/testflows/rbac/tests/privileges/create/create_database.py
@@ -12,13 +12,13 @@ def privilege_granted_directly_or_via_role(self, node=None):
     if node is None:
         node = self.context.node
 
-    with Suite("user with direct privilege", setup=instrument_clickhouse_server_log):
+    with Suite("user with direct privilege"):
         with user(node, user_name):
 
             with When(f"I run checks that {user_name} is only able to execute CREATE DATABASE with required privileges"):
                 privilege_check(grant_target_name=user_name, user_name=user_name, node=node)
 
-    with Suite("user with privilege via role", setup=instrument_clickhouse_server_log):
+    with Suite("user with privilege via role"):
         with user(node, user_name), role(node, role_name):
 
             with When("I grant the role to the user"):
@@ -32,11 +32,17 @@ def privilege_check(grant_target_name, user_name, node=None):
     """
     exitcode, message = errors.not_enough_privileges(name=f"{user_name}")
 
-    with Scenario("user without privilege", setup=instrument_clickhouse_server_log):
+    with Scenario("user without privilege"):
         db_name = f"db_{getuid()}"
 
         try:
-            with When("I attempt to create a database without privilege"):
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I attempt to create a database without privilege"):
                 node.query(f"CREATE DATABASE {db_name}", settings = [("user", user_name)],
                     exitcode=exitcode, message=message)
 
@@ -44,7 +50,7 @@ def privilege_check(grant_target_name, user_name, node=None):
             with Finally("I drop the database"):
                 node.query(f"DROP DATABASE IF EXISTS {db_name}")
 
-    with Scenario("user with privilege", setup=instrument_clickhouse_server_log):
+    with Scenario("user with privilege"):
         db_name = f"db_{getuid()}"
 
         try:
@@ -58,7 +64,7 @@ def privilege_check(grant_target_name, user_name, node=None):
             with Finally("I drop the database"):
                 node.query(f"DROP DATABASE IF EXISTS {db_name}")
 
-    with Scenario("user with revoked privilege", setup=instrument_clickhouse_server_log):
+    with Scenario("user with revoked privilege"):
         db_name = f"db_{getuid()}"
 
         try:
@@ -76,9 +82,43 @@ def privilege_check(grant_target_name, user_name, node=None):
             with Finally("I drop the database"):
                 node.query(f"DROP DATABASE IF EXISTS {db_name}")
 
+    with Scenario("user with revoked ALL privilege"):
+        db_name = f"db_{getuid()}"
+
+        try:
+            with When("I grant the create database privilege"):
+                node.query(f"GRANT CREATE DATABASE ON {db_name}.* TO {grant_target_name}")
+
+            with And("I revoke ALL privilege"):
+                node.query(f"REVOKE ALL ON *.* FROM {grant_target_name}")
+
+            with Then("I attempt to create a database"):
+                node.query(f"CREATE DATABASE {db_name}", settings = [("user", user_name)],
+                    exitcode=exitcode, message=message)
+
+        finally:
+            with Finally("I drop the database"):
+                node.query(f"DROP DATABASE IF EXISTS {db_name}")
+
+    with Scenario("user with ALL privilege"):
+        db_name = f"db_{getuid()}"
+
+        try:
+            with When("I grant ALL privilege"):
+                node.query(f"GRANT ALL ON *.* TO {grant_target_name}")
+
+            with Then("I attempt to create a database"):
+                node.query(f"CREATE DATABASE {db_name}", settings = [("user", user_name)])
+
+        finally:
+            with Finally("I drop the database"):
+                node.query(f"DROP DATABASE IF EXISTS {db_name}")
+
 @TestFeature
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_CreateDatabase("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 @Name("create database")
 def feature(self, node="clickhouse1", stress=None, parallel=None):
@@ -91,5 +131,5 @@ def feature(self, node="clickhouse1", stress=None, parallel=None):
     if stress is not None:
         self.context.stress = stress
 
-    with Suite(test=privilege_granted_directly_or_via_role):
+    with Suite(test=privilege_granted_directly_or_via_role, setup=instrument_clickhouse_server_log):
         privilege_granted_directly_or_via_role()
diff --git a/tests/testflows/rbac/tests/privileges/create/create_dictionary.py b/tests/testflows/rbac/tests/privileges/create/create_dictionary.py
index 0dbc3e1f6bb..73734f5d556 100644
--- a/tests/testflows/rbac/tests/privileges/create/create_dictionary.py
+++ b/tests/testflows/rbac/tests/privileges/create/create_dictionary.py
@@ -12,13 +12,13 @@ def privilege_granted_directly_or_via_role(self, node=None):
     if node is None:
         node = self.context.node
 
-    with Suite("user with direct privilege", setup=instrument_clickhouse_server_log):
+    with Suite("user with direct privilege"):
         with user(node, user_name):
 
             with When(f"I run checks that {user_name} is only able to execute CREATE DICTIONARY with required privileges"):
                 privilege_check(grant_target_name=user_name, user_name=user_name, node=node)
 
-    with Suite("user with privilege via role", setup=instrument_clickhouse_server_log):
+    with Suite("user with privilege via role"):
         with user(node, user_name), role(node, role_name):
 
             with When("I grant the role to the user"):
@@ -32,11 +32,17 @@ def privilege_check(grant_target_name, user_name, node=None):
     """
     exitcode, message = errors.not_enough_privileges(name=f"{user_name}")
 
-    with Scenario("user without privilege", setup=instrument_clickhouse_server_log):
+    with Scenario("user without privilege"):
         dict_name = f"dict_{getuid()}"
 
         try:
-            with When("I attempt to create a dictionary without privilege"):
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I attempt to create a dictionary without privilege"):
                 node.query(f"CREATE DICTIONARY {dict_name}(x Int32, y Int32) PRIMARY KEY x LAYOUT(FLAT()) SOURCE(CLICKHOUSE()) LIFETIME(0)", settings = [("user", user_name)],
                     exitcode=exitcode, message=message)
 
@@ -44,7 +50,7 @@ def privilege_check(grant_target_name, user_name, node=None):
             with Finally("I drop the dictionary"):
                 node.query(f"DROP DICTIONARY IF EXISTS {dict_name}")
 
-    with Scenario("user with privilege", setup=instrument_clickhouse_server_log):
+    with Scenario("user with privilege"):
         dict_name = f"dict_{getuid()}"
 
         try:
@@ -58,7 +64,7 @@ def privilege_check(grant_target_name, user_name, node=None):
             with Finally("I drop the dictionary"):
                 node.query(f"DROP DICTIONARY IF EXISTS {dict_name}")
 
-    with Scenario("user with revoked privilege", setup=instrument_clickhouse_server_log):
+    with Scenario("user with revoked privilege"):
         dict_name = f"dict_{getuid()}"
 
         try:
@@ -76,9 +82,44 @@ def privilege_check(grant_target_name, user_name, node=None):
             with Finally("I drop the dictionary"):
                 node.query(f"DROP DICTIONARY IF EXISTS {dict_name}")
 
+
+    with Scenario("user with revoked ALL privilege"):
+        dict_name = f"dict_{getuid()}"
+
+        try:
+            with When("I grant the create dictionary privilege"):
+                node.query(f"GRANT CREATE DICTIONARY ON {dict_name} TO {grant_target_name}")
+
+            with And("I revoke ALL privilege"):
+                node.query(f"REVOKE ALL ON *.* FROM {grant_target_name}")
+
+            with Then("I attempt to create a dictionary"):
+                node.query(f"CREATE DICTIONARY {dict_name}(x Int32, y Int32) PRIMARY KEY x LAYOUT(FLAT()) SOURCE(CLICKHOUSE()) LIFETIME(0)", settings = [("user", user_name)],
+                    exitcode=exitcode, message=message)
+
+        finally:
+            with Finally("I drop the dictionary"):
+                node.query(f"DROP DICTIONARY IF EXISTS {dict_name}")
+
+    with Scenario("user with ALL privilege"):
+        dict_name = f"dict_{getuid()}"
+
+        try:
+            with When("I grant ALL privilege"):
+                node.query(f"GRANT ALL ON *.* TO {grant_target_name}")
+
+            with Then("I attempt to create a dictionary"):
+                node.query(f"CREATE DICTIONARY {dict_name}(x Int32, y Int32) PRIMARY KEY x LAYOUT(FLAT()) SOURCE(CLICKHOUSE()) LIFETIME(0)", settings = [("user", user_name)])
+
+        finally:
+            with Finally("I drop the dictionary"):
+                node.query(f"DROP DICTIONARY IF EXISTS {dict_name}")
+
 @TestFeature
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_CreateDictionary("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 @Name("create dictionary")
 def feature(self, node="clickhouse1", stress=None, parallel=None):
@@ -91,5 +132,5 @@ def feature(self, node="clickhouse1", stress=None, parallel=None):
     if stress is not None:
         self.context.stress = stress
 
-    with Suite(test=privilege_granted_directly_or_via_role):
+    with Suite(test=privilege_granted_directly_or_via_role, setup=instrument_clickhouse_server_log):
         privilege_granted_directly_or_via_role()
diff --git a/tests/testflows/rbac/tests/privileges/create/create_quota.py b/tests/testflows/rbac/tests/privileges/create/create_quota.py
index e7f4f4d5f7c..d6e50ea904e 100644
--- a/tests/testflows/rbac/tests/privileges/create/create_quota.py
+++ b/tests/testflows/rbac/tests/privileges/create/create_quota.py
@@ -17,7 +17,7 @@ def privileges_granted_directly(self, node=None):
 
     with user(node, f"{user_name}"):
 
-        Suite(run=create_quota, flags=TE,
+        Suite(run=create_quota,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[user_name,user_name]) for row in create_quota.examples
             ], args=Args(name="privilege={privilege}", format_name=True)))
@@ -38,13 +38,14 @@ def privileges_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(run=create_quota, flags=TE,
+        Suite(run=create_quota,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[role_name,user_name]) for row in create_quota.examples
             ], args=Args(name="privilege={privilege}", format_name=True)))
 
 @TestOutline(Suite)
 @Examples("privilege",[
+    ("ALL",),
     ("ACCESS MANAGEMENT",),
     ("CREATE QUOTA",),
 ])
@@ -60,7 +61,13 @@ def create_quota(self, privilege, grant_target_name, user_name, node=None):
         create_quota_name = f"create_quota_{getuid()}"
 
         try:
-            with When("I check the user can't create a quota"):
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I check the user can't create a quota"):
                 node.query(f"CREATE QUOTA {create_quota_name}", settings=[("user",user_name)],
                     exitcode=exitcode, message=message)
 
@@ -118,6 +125,8 @@ def create_quota(self, privilege, grant_target_name, user_name, node=None):
 @Name("create quota")
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_CreateQuota("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 def feature(self, node="clickhouse1"):
     """Check the RBAC functionality of CREATE QUOTA.
diff --git a/tests/testflows/rbac/tests/privileges/create/create_role.py b/tests/testflows/rbac/tests/privileges/create/create_role.py
index 9d8af913893..c442036b625 100644
--- a/tests/testflows/rbac/tests/privileges/create/create_role.py
+++ b/tests/testflows/rbac/tests/privileges/create/create_role.py
@@ -17,7 +17,7 @@ def privileges_granted_directly(self, node=None):
 
     with user(node, f"{user_name}"):
 
-        Suite(run=create_role, flags=TE,
+        Suite(run=create_role,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[user_name,user_name]) for row in create_role.examples
             ], args=Args(name="privilege={privilege}", format_name=True)))
@@ -38,13 +38,14 @@ def privileges_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(run=create_role, flags=TE,
+        Suite(run=create_role,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[role_name,user_name]) for row in create_role.examples
             ], args=Args(name="privilege={privilege}", format_name=True)))
 
 @TestOutline(Suite)
 @Examples("privilege",[
+    ("ALL",),
     ("ACCESS MANAGEMENT",),
     ("CREATE ROLE",),
 ])
@@ -60,7 +61,13 @@ def create_role(self, privilege, grant_target_name, user_name, node=None):
         create_role_name = f"create_role_{getuid()}"
 
         try:
-            with When("I check the user can't create a role"):
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I check the user can't create a role"):
                 node.query(f"CREATE ROLE {create_role_name}", settings=[("user",user_name)],
                     exitcode=exitcode, message=message)
 
@@ -118,6 +125,8 @@ def create_role(self, privilege, grant_target_name, user_name, node=None):
 @Name("create role")
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_CreateRole("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 def feature(self, node="clickhouse1"):
     """Check the RBAC functionality of CREATE ROLE.
diff --git a/tests/testflows/rbac/tests/privileges/create/create_row_policy.py b/tests/testflows/rbac/tests/privileges/create/create_row_policy.py
index 040cc631cc3..8e670333492 100644
--- a/tests/testflows/rbac/tests/privileges/create/create_row_policy.py
+++ b/tests/testflows/rbac/tests/privileges/create/create_row_policy.py
@@ -17,7 +17,7 @@ def privileges_granted_directly(self, node=None):
 
     with user(node, f"{user_name}"):
 
-        Suite(run=create_row_policy, flags=TE,
+        Suite(run=create_row_policy,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[user_name,user_name]) for row in create_row_policy.examples
             ], args=Args(name="privilege={privilege}", format_name=True)))
@@ -38,13 +38,14 @@ def privileges_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(run=create_row_policy, flags=TE,
+        Suite(run=create_row_policy,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[role_name,user_name]) for row in create_row_policy.examples
             ], args=Args(name="privilege={privilege}", format_name=True)))
 
 @TestOutline(Suite)
 @Examples("privilege",[
+    ("ALL",),
     ("ACCESS MANAGEMENT",),
     ("CREATE ROW POLICY",),
     ("CREATE POLICY",),
@@ -62,7 +63,13 @@ def create_row_policy(self, privilege, grant_target_name, user_name, node=None):
         table_name = f"table_name_{getuid()}"
 
         try:
-            with When("I check the user can't create a row policy"):
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I check the user can't create a row policy"):
                 node.query(f"CREATE ROW POLICY {create_row_policy_name} ON {table_name}", settings=[("user",user_name)],
                     exitcode=exitcode, message=message)
 
@@ -119,15 +126,962 @@ def create_row_policy(self, privilege, grant_target_name, user_name, node=None):
             with Finally("I drop the row policy"):
                 node.query(f"DROP ROW POLICY IF EXISTS {create_row_policy_name} ON {table_name}")
 
+@TestScenario
+@Requirements(
+    RQ_SRS_006_RBAC_RowPolicy_Restriction("1.0")
+)
+def no_grants(self, node=None):
+    """Check that user is unable to select from a table without a row policy
+    after a row policy with a condition has been created on that table.
+    """
+
+    table_name = f"table_{getuid()}"
+    pol_name = f"pol_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+
+    with table(node, table_name):
+        try:
+            with Given("I have a row policy"):
+                node.query(f"CREATE ROW POLICY {pol_name} ON {table_name}")
+
+            with When("The table has some values"):
+                node.query(f"INSERT INTO {table_name} (y) VALUES (1)")
+
+            with Then("I try to select from the table"):
+                output = node.query(f"SELECT * FROM {table_name}").output
+                assert '1' in output, error()
+
+            with When("I create a row policy with a condition"):
+                node.query(f"CREATE ROW POLICY OR REPLACE {pol_name} ON {table_name} FOR SELECT USING 1")
+
+            with Then("I try to select from the table"):
+                output = node.query(f"SELECT * FROM {table_name}").output
+                assert '' == output, error()
+
+        finally:
+            with Finally("I drop the row policy"):
+                node.query(f"DROP ROW POLICY IF EXISTS {pol_name} ON {table_name}")
+
+@TestScenario
+@Requirements(
+    RQ_SRS_006_RBAC_RowPolicy_Create_Access_Permissive("1.0"),
+)
+def permissive(self, node=None):
+    """Check that user is able to see from a table when they have a PERMISSIVE policy.
+    """
+
+    table_name = f"table_{getuid()}"
+    pol_name = f"pol_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+
+    with table(node, table_name):
+        try:
+            with Given("I have a row policy"):
+                node.query(f"CREATE ROW POLICY {pol_name} ON {table_name} AS PERMISSIVE FOR SELECT USING y=1 TO default")
+
+            with When("The table has some values"):
+                node.query(f"INSERT INTO {table_name} (y) VALUES (1), (2)")
+
+            with Then("I try to select from the table"):
+                output = node.query(f"SELECT * FROM {table_name}").output
+                assert '1' in output and '2' not in output, error()
+
+        finally:
+            with Finally("I drop the row policy"):
+                node.query(f"DROP ROW POLICY IF EXISTS {pol_name} ON {table_name}")
+
+@TestScenario
+@Requirements(
+    RQ_SRS_006_RBAC_RowPolicy_Create_Access_Restrictive("1.0")
+)
+def restrictive(self, node=None):
+    """Check that user is able to see values they have a RESTRICTIVE policy for.
+    """
+
+    table_name = f"table_{getuid()}"
+    perm_pol_name = f"perm_pol_{getuid()}"
+    pol_name = f"pol_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+
+    with table(node, table_name):
+        try:
+            with Given("I have a permissive row policy"):
+                node.query(f"CREATE ROW POLICY {perm_pol_name} ON {table_name} FOR SELECT USING y=1 OR y=2 TO default")
+
+            with And("I have a restrictive row policy"):
+                node.query(f"CREATE ROW POLICY {pol_name} ON {table_name} AS RESTRICTIVE FOR SELECT USING y=1 TO default")
+
+            with When("The table has some values"):
+                node.query(f"INSERT INTO {table_name} (y) VALUES (1), (2)")
+
+            with Then("I try to select from the table"):
+                output = node.query(f"SELECT * FROM {table_name}").output
+                assert '1' in output and '2' not in output, error()
+
+        finally:
+            with Finally("I drop the restrictive row policy", flags=TE):
+                node.query(f"DROP ROW POLICY IF EXISTS {pol_name} ON {table_name}")
+
+            with And("I drop the permissive row policy", flags=TE):
+                node.query(f"DROP ROW POLICY IF EXISTS {perm_pol_name} ON {table_name}")
+
+@TestScenario
+@Requirements(
+    RQ_SRS_006_RBAC_RowPolicy_Create_ForSelect("1.0"),
+)
+def for_select(self, node=None):
+    """Check that user is able to see values allowed by the row policy condition in the FOR SELECT clause.
+    """
+
+    table_name = f"table_{getuid()}"
+    pol_name = f"pol_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+
+    with table(node, table_name):
+        try:
+            with Given("I have a restrictive row policy"):
+                node.query(f"CREATE ROW POLICY {pol_name} ON {table_name} FOR SELECT USING 1 TO default")
+
+            with When("The table has some values"):
+                node.query(f"INSERT INTO {table_name} (y) VALUES (1)")
+
+            with Then("I try to select from the table"):
+                output = node.query(f"SELECT * FROM {table_name}").output
+                assert '1' in output, error()
+
+        finally:
+            with Finally("I drop the row policy"):
+                node.query(f"DROP ROW POLICY IF EXISTS {pol_name} ON {table_name}")
+
+@TestScenario
+@Requirements(
+    RQ_SRS_006_RBAC_RowPolicy_Create_Condition("1.0")
+)
+def condition(self, node=None):
+    """Check that user is able to see values allowed by the row policy condition.
+    """
+
+    table_name = f"table_{getuid()}"
+    pol_name = f"pol_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+
+    with table(node, table_name):
+        try:
+            with Given("I have a restrictive row policy"):
+                node.query(f"CREATE ROW POLICY {pol_name} ON {table_name} FOR SELECT USING y=1 TO default")
+
+            with When("The table has some values"):
+                node.query(f"INSERT INTO {table_name} (y) VALUES (1),(2)")
+
+            with Then("I try to select from the table"):
+                output = node.query(f"SELECT * FROM {table_name}").output
+                assert '1' in output, error()
+
+        finally:
+            with Finally("I drop the row policy"):
+                node.query(f"DROP ROW POLICY IF EXISTS {pol_name} ON {table_name}")
+
+@TestScenario
+@Requirements(
+    RQ_SRS_006_RBAC_RowPolicy_Create_IfNotExists("1.0")
+)
+def if_not_exists(self, node=None):
+    """Check that a row policy created using IF NOT EXISTS does not replace a row policy with the same name.
+    """
+
+    table_name = f"table_{getuid()}"
+    pol_name = f"pol_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+
+    with table(node, table_name):
+        try:
+            with Given("I have a row policy"):
+                node.query(f"CREATE ROW POLICY {pol_name} ON {table_name} FOR SELECT USING 1 TO default")
+
+            with When("The table has some values"):
+                node.query(f"INSERT INTO {table_name} (y) VALUES (1)")
+
+            with Then("I select from the table"):
+                output = node.query(f"SELECT * FROM {table_name}").output
+                assert '1' in output, error()
+
+            with When("I create another row policy with the same name using IF NOT EXISTS"):
+                node.query(f"CREATE ROW POLICY IF NOT EXISTS {pol_name} ON {table_name}")
+
+            with Then("I select from the table again"):
+                output = node.query(f"SELECT * FROM {table_name}").output
+                assert '1' in output, error()
+
+        finally:
+            with Finally("I drop the row policy"):
+                node.query(f"DROP ROW POLICY IF EXISTS {pol_name} ON {table_name}")
+
+@TestScenario
+@Requirements(
+    RQ_SRS_006_RBAC_RowPolicy_Create_Replace("1.0")
+)
+def or_replace(self, node=None):
+    """Check that a row policy created using OR REPLACE does replace the row policy with the same name.
+    """
+
+    table_name = f"table_{getuid()}"
+    pol_name = f"pol_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+
+    with table(node, table_name):
+        try:
+            with Given("I have a row policy"):
+                node.query(f"CREATE ROW POLICY {pol_name} ON {table_name} FOR SELECT USING 1 TO default")
+
+            with When("The table has some values"):
+                node.query(f"INSERT INTO {table_name} (y) VALUES (1)")
+
+            with Then("I select from the table"):
+                output = node.query(f"SELECT * FROM {table_name}").output
+                assert '1' in output, error()
+
+            with When("I create another row policy with the same name using OR REPLACE"):
+                node.query(f"CREATE ROW POLICY OR REPLACE {pol_name} ON {table_name} AS RESTRICTIVE FOR SELECT USING 1 TO default")
+
+            with Then("I can no longer select from the table"):
+                output = node.query(f"SELECT * FROM {table_name}").output
+                assert output == '', error()
+
+        finally:
+            with Finally("I drop the row policy"):
+                node.query(f"DROP ROW POLICY IF EXISTS {pol_name} ON {table_name}")
+
+@TestScenario
+@Requirements(
+    RQ_SRS_006_RBAC_RowPolicy_Create_OnCluster("1.0")
+)
+def on_cluster(self, node=None):
+    """Check that a row policy created using ON CLUSTER applies to the nodes of the cluster correctly.
+    """
+
+    table_name = f"table_{getuid()}"
+    pol_name = f"pol_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+        node2 = self.context.node2
+
+    try:
+        with Given("I have a table on a cluster"):
+            node.query(f"CREATE TABLE {table_name} ON CLUSTER sharded_cluster (x UInt64) ENGINE = Memory")
+
+        with And("I have a row policy"):
+            node.query(f"CREATE ROW POLICY {pol_name} ON CLUSTER sharded_cluster ON {table_name} FOR SELECT USING 1")
+
+        with When("I insert some values into the table on the first node"):
+            node.query(f"INSERT INTO {table_name} (x) VALUES (1)")
+
+        with And("I insert some values into the table on the second node"):
+            node2.query(f"INSERT INTO {table_name} (x) VALUES (1)")
+
+        with Then("I select from the table"):
+            output = node.query(f"SELECT * FROM {table_name}").output
+            assert '' == output, error()
+
+        with And("I select from another node on the cluster"):
+            output = node2.query(f"SELECT * FROM {table_name}").output
+            assert '' == output, error()
+
+    finally:
+        with Finally("I drop the row policy", flags=TE):
+            node.query(f"DROP ROW POLICY IF EXISTS {pol_name} ON CLUSTER sharded_cluster ON {table_name}")
+
+        with And("I drop the table", flags=TE):
+            node.query(f"DROP TABLE {table_name} ON CLUSTER sharded_cluster")
+
+@TestScenario
+def diff_policies_on_diff_nodes(self, node=None):
+    """Check that a row policy created on a node, does not effect a different node.
+    """
+
+    table_name = f"table_{getuid()}"
+    pol_name = f"pol_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+        node2 = self.context.node2
+
+    try:
+        with Given("I have a table on a cluster"):
+            node.query(f"CREATE TABLE {table_name} ON CLUSTER sharded_cluster (x UInt64) ENGINE = Memory")
+
+        with And("I have a row policy on one node"):
+            node.query(f"CREATE ROW POLICY {pol_name} ON {table_name} FOR SELECT USING 1")
+
+        with When("I insert some values into the table on the first node"):
+            node.query(f"INSERT INTO {table_name} (x) VALUES (1)")
+
+        with And("I insert some values into the table on the second node"):
+            node2.query(f"INSERT INTO {table_name} (x) VALUES (1)")
+
+        with Then("I select from the table"):
+            output = node.query(f"SELECT * FROM {table_name}").output
+            assert '' == output, error()
+
+        with And("I select from another node on the cluster"):
+            output = node2.query(f"SELECT * FROM {table_name}").output
+            assert '1' in output, error()
+
+    finally:
+        with Finally("I drop the row policy", flags=TE):
+            node.query(f"DROP ROW POLICY IF EXISTS {pol_name} ON {table_name}")
+
+        with And("I drop the table", flags=TE):
+            node.query(f"DROP TABLE {table_name} ON CLUSTER sharded_cluster")
+
+@TestScenario
+@Requirements(
+    RQ_SRS_006_RBAC_RowPolicy_Create_Assignment("1.0"),
+)
+def assignment(self, node=None):
+    """Check that user is able to see rows from a table when they have PERMISSIVE policy assigned to them.
+    """
+
+    table_name = f"table_{getuid()}"
+    pol_name = f"pol_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+
+    with table(node, table_name):
+        try:
+            with Given("I have a row policy"):
+                node.query(f"CREATE ROW POLICY {pol_name} ON {table_name} AS PERMISSIVE FOR SELECT USING y=1 TO default")
+
+            with When("The table has some values"):
+                node.query(f"INSERT INTO {table_name} (y) VALUES (1)")
+
+            with Then("I try to select from the table"):
+                output = node.query(f"SELECT * FROM {table_name}").output
+                assert '1' in output, error()
+
+        finally:
+            with Finally("I drop the row policy"):
+                node.query(f"DROP ROW POLICY IF EXISTS {pol_name} ON {table_name}")
+
+@TestScenario
+@Requirements(
+    RQ_SRS_006_RBAC_RowPolicy_Create_Assignment_None("1.0"),
+)
+def assignment_none(self, node=None):
+    """Check that no one is affected when a row policy is assigned to NONE.
+    """
+
+    table_name = f"table_{getuid()}"
+    pol_name = f"pol_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+
+    with table(node, table_name):
+        try:
+            with Given("I have a row policy"):
+                node.query(f"CREATE ROW POLICY {pol_name} ON {table_name} AS PERMISSIVE FOR SELECT USING y=1 TO NONE")
+
+            with When("The table has some values"):
+                node.query(f"INSERT INTO {table_name} (y) VALUES (1)")
+
+            with Then("I try to select from the table"):
+                output = node.query(f"SELECT * FROM {table_name}").output
+                assert '' == output, error()
+
+        finally:
+            with Finally("I drop the row policy"):
+                node.query(f"DROP ROW POLICY IF EXISTS {pol_name} ON {table_name}")
+
+@TestScenario
+@Requirements(
+    RQ_SRS_006_RBAC_RowPolicy_Create_Assignment_All("1.0"),
+)
+def assignment_all(self, node=None):
+    """Check that everyone is effected with a row policy is assigned to ALL.
+    """
+
+    table_name = f"table_{getuid()}"
+    pol_name = f"pol_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+
+    with table(node, table_name):
+        try:
+            with Given("I have a row policy"):
+                node.query(f"CREATE ROW POLICY {pol_name} ON {table_name} AS PERMISSIVE FOR SELECT USING y=1 TO ALL")
+
+            with When("The table has some values"):
+                node.query(f"INSERT INTO {table_name} (y) VALUES (1)")
+
+            with Then("I try to select from the table"):
+                output = node.query(f"SELECT * FROM {table_name}").output
+                assert '1' in output, error()
+
+        finally:
+            with Finally("I drop the row policy"):
+                node.query(f"DROP ROW POLICY IF EXISTS {pol_name} ON {table_name}")
+
+@TestScenario
+@Requirements(
+    RQ_SRS_006_RBAC_RowPolicy_Create_Assignment_AllExcept("1.0"),
+)
+def assignment_all_except(self, node=None):
+    """Check that everyone is except the specified user is effect by a row policy assigned to ALL EXCEPT.
+    """
+
+    table_name = f"table_{getuid()}"
+    pol_name = f"pol_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+
+    with table(node, table_name):
+        try:
+            with Given("I have a row policy"):
+                node.query(f"CREATE ROW POLICY {pol_name} ON {table_name} AS PERMISSIVE FOR SELECT USING y=1 TO ALL EXCEPT default")
+
+            with When("The table has some values"):
+                node.query(f"INSERT INTO {table_name} (y) VALUES (1)")
+
+            with Then("I try to select from the table"):
+                output = node.query(f"SELECT * FROM {table_name}").output
+                assert '' == output, error()
+
+        finally:
+            with Finally("I drop the row policy"):
+                node.query(f"DROP ROW POLICY IF EXISTS {pol_name} ON {table_name}")
+
+@TestScenario
+@Requirements(
+    RQ_SRS_006_RBAC_RowPolicy_Nesting("1.0"),
+)
+def nested_view(self, node=None):
+    """Check that if a user has a row policy on a table and a view is created on that table,
+    the user is only able to select rows specified by the assigned policies from the view.
+    """
+
+    table_name = f"table_{getuid()}"
+    view_name = f"view_{getuid()}"
+    pol_name = f"pol_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+
+    with table(node, table_name):
+        try:
+            with Given("I have a row policy"):
+                node.query(f"CREATE ROW POLICY {pol_name} ON {table_name} AS PERMISSIVE FOR SELECT USING y=1 TO default")
+
+            with When("The table has some values"):
+                node.query(f"INSERT INTO {table_name} (y) VALUES (1),(2)")
+
+            with And("I create a view on the table"):
+                node.query(f"CREATE VIEW {view_name} AS SELECT * FROM {table_name}")
+
+            with Then("I try to select from the view"):
+                output = node.query(f"SELECT * FROM {view_name}").output
+                assert '1' in output and '2' not in output, error()
+
+        finally:
+            with Finally("I drop the row policy", flags=TE):
+                node.query(f"DROP ROW POLICY IF EXISTS {pol_name} ON {table_name}")
+
+            with And("I drop the view", flags=TE):
+                node.query(f"DROP VIEW IF EXISTS {view_name}")
+
+@TestScenario
+@Requirements(
+    RQ_SRS_006_RBAC_RowPolicy_Nesting("1.0"),
+)
+def nested_live_view_after_policy(self, node=None):
+    """Check that if a user has a row policy on a table and a live view is created on that table,
+    the user is only able to select rows specified by the assigned policies from the view.
+    """
+
+    table_name = f"table_{getuid()}"
+    view_name = f"view_{getuid()}"
+    pol_name = f"pol_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+
+    with table(node, table_name):
+        try:
+            with Given("I add allow_experimental_live_view to the default query settings"):
+                default_query_settings = getsattr(current().context, "default_query_settings", [])
+                default_query_settings.append(("allow_experimental_live_view", 1))
+
+            with And("I have a row policy"):
+                node.query(f"CREATE ROW POLICY {pol_name} ON {table_name} AS PERMISSIVE FOR SELECT USING y=1 TO default")
+
+            with When("The table has some values"):
+                node.query(f"INSERT INTO {table_name} (y) VALUES (1),(2)")
+
+            with And("I create a live view on the table"):
+                node.query(f"CREATE LIVE VIEW {view_name} AS SELECT * FROM {table_name}")
+
+            with Then("I try to select from the view"):
+                output = node.query(f"SELECT * FROM {view_name}").output
+                assert '1' in output and '2' not in output, error()
+
+        finally:
+            with Finally("I drop the row policy", flags=TE):
+                node.query(f"DROP ROW POLICY IF EXISTS {pol_name} ON {table_name}")
+
+            with And("I drop the live view", flags=TE):
+                node.query(f"DROP VIEW IF EXISTS {view_name}")
+
+            with And("I remove allow_experimental_live_view from the default query settings", flags=TE):
+                if default_query_settings:
+                    try:
+                        default_query_settings.pop(default_query_settings.index(("allow_experimental_live_view", 1)))
+                    except ValueError:
+                        pass
+
+@TestScenario
+@Requirements(
+    RQ_SRS_006_RBAC_RowPolicy_Nesting("1.0"),
+)
+def nested_live_view_before_policy(self, node=None):
+    """Check that if a live view exists on a table and then a row policy is created,
+    the user is only able to select rows specified by the assigned policies from the view.
+    """
+
+    table_name = f"table_{getuid()}"
+    view_name = f"view_{getuid()}"
+    pol_name = f"pol_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+
+    with table(node, table_name):
+        try:
+            with Given("I add allow_experimental_live_view to the default query settings"):
+                default_query_settings = getsattr(current().context, "default_query_settings", [])
+                default_query_settings.append(("allow_experimental_live_view", 1))
+
+            with And("There is a live view on the table"):
+                node.query(f"CREATE LIVE VIEW {view_name} AS SELECT * FROM {table_name}")
+
+            with And("There is a row policy"):
+                node.query(f"CREATE ROW POLICY {pol_name} ON {table_name} AS PERMISSIVE FOR SELECT USING y=1 TO default")
+
+            with When("I insert values into the table"):
+                node.query(f"INSERT INTO {table_name} (y) VALUES (1),(2)")
+
+            with Then("I try to select from the view"):
+                output = node.query(f"SELECT * FROM {view_name}").output
+                assert '1' in output and '2' not in output, error()
+
+        finally:
+            with Finally("I drop the row policy", flags=TE):
+                node.query(f"DROP ROW POLICY IF EXISTS {pol_name} ON {table_name}")
+
+            with And("I drop the live view", flags=TE):
+                node.query(f"DROP VIEW IF EXISTS {view_name}")
+
+            with And("I remove allow_experimental_live_view from the default query settings", flags=TE):
+                if default_query_settings:
+                    try:
+                        default_query_settings.pop(default_query_settings.index(("allow_experimental_live_view", 1)))
+                    except ValueError:
+                        pass
+
+@TestScenario
+@Requirements(
+    RQ_SRS_006_RBAC_RowPolicy_Nesting("1.0"),
+)
+def nested_mat_view_after_policy(self, node=None):
+    """Check that if a user has a row policy on a table and a materialized view is created on that table,
+    the user is only able to select rows specified by the assigned policies from the view.
+    """
+
+    table_name = f"table_{getuid()}"
+    view_name = f"view_{getuid()}"
+    pol_name = f"pol_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+
+    with table(node, table_name):
+        try:
+            with Given("I have a row policy"):
+                node.query(f"CREATE ROW POLICY {pol_name} ON {table_name} AS PERMISSIVE FOR SELECT USING y=1 TO default")
+
+            with When("I create a view on the table"):
+                node.query(f"CREATE MATERIALIZED VIEW {view_name} ENGINE = Memory AS SELECT * FROM {table_name}")
+
+            with And("I insert some values on the table"):
+                node.query(f"INSERT INTO {table_name} (y) VALUES (1),(2)")
+
+            with Then("I try to select from the view"):
+                output = node.query(f"SELECT * FROM {view_name}").output
+                assert '1' in output and '2' not in output, error()
+
+        finally:
+            with Finally("I drop the row policy", flags=TE):
+                node.query(f"DROP ROW POLICY IF EXISTS {pol_name} ON {table_name}")
+
+            with And("I drop the materialized view", flags=TE):
+                node.query(f"DROP VIEW IF EXISTS {view_name}")
+
+@TestScenario
+@Requirements(
+    RQ_SRS_006_RBAC_RowPolicy_Nesting("1.0"),
+)
+def nested_mat_view_before_policy(self, node=None):
+    """Check that if a materialized view exists on a table and then a row policy is created,
+    the user is only able to select rows specified by the assigned policies from the view.
+    """
+
+    table_name = f"table_{getuid()}"
+    view_name = f"view_{getuid()}"
+    pol_name = f"pol_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+
+    with table(node, table_name):
+        try:
+            with Given("I have a view on the table"):
+                node.query(f"CREATE MATERIALIZED VIEW {view_name} ENGINE = Memory AS SELECT * FROM {table_name}")
+
+            with And("I have some values on the table"):
+                node.query(f"INSERT INTO {table_name} (y) VALUES (1),(2)")
+
+            with When("I create a row policy"):
+                node.query(f"CREATE ROW POLICY {pol_name} ON {table_name} AS PERMISSIVE FOR SELECT USING y=1 TO default")
+
+            with Then("I try to select from the view"):
+                output = node.query(f"SELECT * FROM {view_name}").output
+                assert '1' in output and '2' not in output, error()
+
+        finally:
+            with Finally("I drop the row policy", flags=TE):
+                node.query(f"DROP ROW POLICY IF EXISTS {pol_name} ON {table_name}")
+
+            with And("I drop the materialized view", flags=TE):
+                node.query(f"DROP VIEW IF EXISTS {view_name}")
+
+@TestScenario
+def populate_mat_view(self, node=None):
+    """Check that if a user has a row policy on a table and a materialized view is created using POPULATE from that table,
+    the user can only select the rows from the materialized view specified in the row policy.
+    """
+
+    table_name = f"table_{getuid()}"
+    view_name = f"view_{getuid()}"
+    pol_name = f"pol_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+
+    with table(node, table_name):
+        try:
+            with Given("I have a row policy"):
+                node.query(f"CREATE ROW POLICY {pol_name} ON {table_name} AS PERMISSIVE FOR SELECT USING y=1 TO default")
+
+            with And("The table has some values"):
+                node.query(f"INSERT INTO {table_name} (y) VALUES (1),(2)")
+
+            with When("I create a mat view with POPULATE from the table"):
+                node.query(f"CREATE MATERIALIZED VIEW {view_name} ENGINE = Memory POPULATE AS SELECT * FROM {table_name}")
+
+            with Then("I try to select from the view"):
+                output = node.query(f"SELECT * FROM {view_name}").output
+                assert '1' in output and '2' not in output, error()
+
+        finally:
+            with Finally("I drop the row policy", flags=TE):
+                node.query(f"DROP ROW POLICY IF EXISTS {pol_name} ON {table_name}")
+
+            with And("I drop the materialized view", flags=TE):
+                node.query(f"DROP VIEW IF EXISTS {view_name}")
+
+@TestScenario
+@Requirements(
+    RQ_SRS_006_RBAC_RowPolicy_Nesting("1.0")
+)
+def dist_table(self, node=None):
+    """Check that if a user has a row policy on a table and a distributed table is created on that table,
+    the user is only able to select rows specified by the assigned policies from the distributed table.
+    """
+
+    table_name = f"table_{getuid()}"
+    dist_table_name = f"dist_table_{getuid()}"
+    pol_name = f"pol_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+        node2 = self.context.node2
+
+    try:
+        with Given("I have a table on a cluster"):
+            node.query(f"CREATE TABLE {table_name} ON CLUSTER sharded_cluster (x UInt64) ENGINE = Memory")
+
+        with And("I have a row policy"):
+            node.query(f"CREATE ROW POLICY {pol_name} ON CLUSTER sharded_cluster ON {table_name} FOR SELECT USING 1")
+
+        with And("I have a distributed table"):
+            node.query(f"CREATE TABLE {dist_table_name} (x UInt64) ENGINE = Distributed(sharded_cluster, default, {table_name}, rand())")
+
+        with When("I insert some values into the table on the first node"):
+            node.query(f"INSERT INTO {table_name} (x) VALUES (1)")
+
+        with Then("I select from the table"):
+            output = node.query(f"SELECT * FROM {dist_table_name}").output
+            assert '' == output, error()
+
+    finally:
+        with Finally("I drop the row policy", flags=TE):
+            node.query(f"DROP ROW POLICY IF EXISTS {pol_name} ON CLUSTER sharded_cluster ON {table_name}")
+
+        with And("I drop the table", flags=TE):
+            node.query(f"DROP TABLE IF EXISTS {table_name} ON CLUSTER sharded_cluster")
+
+        with And("I drop the distributed table", flags=TE):
+            node.query(f"DROP TABLE IF EXISTS {dist_table_name}")
+
+@TestScenario
+@Requirements(
+    RQ_SRS_006_RBAC_RowPolicy_Nesting("1.0")
+)
+def dist_table_diff_policies_on_diff_nodes(self, node=None):
+    """Check that the user can only access the rows of the distributed table that are allowed
+    by row policies on the the source tables. The row policies are different on different nodes.
+    """
+
+    table_name = f"table_{getuid()}"
+    dist_table_name = f"dist_table_{getuid()}"
+    pol_name = f"pol_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+        node2 = self.context.node2
+
+    try:
+        with Given("I have a table on a cluster"):
+            node.query(f"CREATE TABLE {table_name} ON CLUSTER sharded_cluster (x UInt64) ENGINE = Memory")
+
+        with And("I have a row policy"):
+            node.query(f"CREATE ROW POLICY {pol_name} ON {table_name} FOR SELECT USING 1")
+
+        with And("I have a distributed table"):
+            node.query(f"CREATE TABLE {dist_table_name} (x UInt64) ENGINE = Distributed(sharded_cluster, default, {table_name}, rand())")
+
+        with When("I insert some values into the table on the first node"):
+            node.query(f"INSERT INTO {table_name} (x) VALUES (1)")
+
+        with And("I insert some values into the table on the second node"):
+            node2.query(f"INSERT INTO {table_name} (x) VALUES (2)")
+
+        with Then("I select from the table"):
+            output = node.query(f"SELECT * FROM {dist_table_name}").output
+            assert '2' in output and '1' not in output, error()
+
+    finally:
+        with Finally("I drop the row policy", flags=TE):
+            node.query(f"DROP ROW POLICY IF EXISTS {pol_name} ON CLUSTER sharded_cluster ON {table_name}")
+
+        with And("I drop the table", flags=TE):
+            node.query(f"DROP TABLE IF EXISTS {table_name} ON CLUSTER sharded_cluster")
+
+        with And("I drop the distributed table", flags=TE):
+            node.query(f"DROP TABLE IF EXISTS {dist_table_name}")
+
+@TestScenario
+@Requirements(
+    RQ_SRS_006_RBAC_RowPolicy_Nesting("1.0")
+)
+def dist_table_on_dist_table(self, node=None):
+    """Check that if a user has a row policy on a table and a distributed table is created on that table,
+    and another distributed table is created on top of that,
+    the user is only able to access rows on any of the tables specified by the assigned policies.
+    """
+    table_name = f"table_{getuid()}"
+    dist_table_name = f"dist_table_{getuid()}"
+    dist_table_2_name = f"dist_table_2_{getuid()}"
+    pol_name = f"pol_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+        node2 = self.context.node2
+
+    try:
+        with Given("I have a table on a cluster"):
+            node.query(f"CREATE TABLE {table_name} ON CLUSTER sharded_cluster (x UInt64) ENGINE = Memory")
+
+        with And("I have a row policy"):
+            node.query(f"CREATE ROW POLICY {pol_name} ON CLUSTER sharded_cluster ON {table_name} FOR SELECT USING 1")
+
+        with And("I have a distributed table on a cluster"):
+            node.query(f"CREATE TABLE {dist_table_name} ON CLUSTER sharded_cluster (x UInt64) ENGINE = Distributed(sharded_cluster, default, {table_name}, rand())")
+
+        with And("I have a distributed table on the other distributed table"):
+            node.query(f"CREATE TABLE {dist_table_2_name} (x UInt64) ENGINE = Distributed(sharded_cluster, default, {dist_table_name}, rand())")
+
+        with When("I insert some values into the table on the first node"):
+            node.query(f"INSERT INTO {dist_table_2_name} (x) VALUES (1)")
+
+        with Then("I select from the table"):
+            output = node.query(f"SELECT * FROM {dist_table_2_name}").output
+            assert '' == output, error()
+
+    finally:
+        with Finally("I drop the row policy", flags=TE):
+            node.query(f"DROP ROW POLICY IF EXISTS {pol_name} ON CLUSTER sharded_cluster ON {table_name}")
+
+        with And("I drop the table", flags=TE):
+            node.query(f"DROP TABLE IF EXISTS {table_name} ON CLUSTER sharded_cluster")
+
+        with And("I drop the distributed table", flags=TE):
+            node.query(f"DROP TABLE IF EXISTS {dist_table_name} ON CLUSTER sharded_cluster")
+
+        with And("I drop the outer distributed table", flags=TE):
+            node.query(f"DROP TABLE IF EXISTS {dist_table_2_name}")
+
+@TestScenario
+def no_table(self, node=None):
+    """Check that row policy is not created when the table is not specified.
+    """
+    pol_name = f"pol_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+
+    with When("I try to create a row policy without a table"):
+        node.query(f"CREATE ROW POLICY {pol_name}",
+            exitcode=62, message='Exception: Syntax error')
+
+    with And("I try to create a row policy on a database"):
+        node.query(f"CREATE ROW POLICY {pol_name} ON default.*",
+            exitcode=62, message='Exception: Syntax error')
+
+@TestScenario
+def policy_before_table(self, node=None):
+    """Check that if the policy is created before the table,
+    then it is still applied correctly.
+    """
+    table_name = f"table_{getuid()}"
+    pol_name = f"pol_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+
+    try:
+        with Given("I have a row policy"):
+            node.query(f"CREATE ROW POLICY {pol_name} ON {table_name} AS PERMISSIVE FOR SELECT USING y=1 TO default")
+
+        with table(node, table_name):
+            with When("The table has some values"):
+                node.query(f"INSERT INTO {table_name} (y) VALUES (1), (2)")
+
+            with Then("I try to select from the table"):
+                output = node.query(f"SELECT * FROM {table_name}").output
+                assert '1' in output and '2' not in output, error()
+
+    finally:
+        with Finally("I drop the row policy"):
+            node.query(f"DROP ROW POLICY IF EXISTS {pol_name} ON {table_name}")
+
+@TestScenario
+@Requirements(
+    RQ_SRS_006_RBAC_RowPolicy_Nesting("1.0"),
+)
+def dict(self, node=None):
+    """Check that if a user has a row policy on a table and a dictionary is created on that table,
+    the user is only able to select rows specified by the assigned policies from the dict.
+    """
+
+    table_name = f"table_{getuid()}"
+    dict_name = f"view_{getuid()}"
+    pol_name = f"pol_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+
+    try:
+        with Given("I have a row policy"):
+            node.query(f"CREATE ROW POLICY {pol_name} ON {table_name} AS PERMISSIVE FOR SELECT USING key=1 TO default")
+
+        with And("I have a table"):
+            node.query(f"CREATE TABLE {table_name} (key UInt64, val UInt64 DEFAULT 5) ENGINE = Memory")
+
+        with When("The table has some values"):
+            node.query(f"INSERT INTO {table_name} (key) VALUES (1),(2)")
+
+        with And("I create a dict on the table"):
+            node.query(f"CREATE DICTIONARY {dict_name} (key UInt64 DEFAULT 0, val UInt64 DEFAULT 5) PRIMARY KEY key SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE {table_name} PASSWORD '' DB 'default')) LIFETIME(MIN 0 MAX 0) LAYOUT(FLAT())")
+
+        with Then("I try to select from the dict"):
+            output = node.query(f"SELECT * FROM {dict_name}").output
+            assert '1' in output and '2' not in output, error()
+
+    finally:
+        with Finally("I drop the row policy", flags=TE):
+            node.query(f"DROP ROW POLICY IF EXISTS {pol_name} ON {table_name}")
+
+        with And("I drop the materialized view", flags=TE):
+            node.query(f"DROP DICTIONARY IF EXISTS {dict_name}")
+
+        with And("I drop the table", flags=TE):
+            node.query(f"DROP TABLE IF EXISTS {table_name}")
+
 @TestFeature
 @Name("create row policy")
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_CreateRowPolicy("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 def feature(self, node="clickhouse1"):
     """Check the RBAC functionality of CREATE ROW POLICY.
     """
     self.context.node = self.context.cluster.node(node)
+    self.context.node2 = self.context.cluster.node("clickhouse2")
 
     Suite(run=privileges_granted_directly, setup=instrument_clickhouse_server_log)
     Suite(run=privileges_granted_via_role, setup=instrument_clickhouse_server_log)
+
+    Scenario(run=no_grants, setup=instrument_clickhouse_server_log)
+    Scenario(run=permissive, setup=instrument_clickhouse_server_log)
+    Scenario(run=restrictive, setup=instrument_clickhouse_server_log)
+    Scenario(run=for_select, setup=instrument_clickhouse_server_log)
+    Scenario(run=condition, setup=instrument_clickhouse_server_log)
+    Scenario(run=if_not_exists, setup=instrument_clickhouse_server_log)
+    Scenario(run=or_replace, setup=instrument_clickhouse_server_log)
+    Scenario(run=on_cluster, setup=instrument_clickhouse_server_log)
+    Scenario(run=assignment, setup=instrument_clickhouse_server_log)
+    Scenario(run=assignment_none, setup=instrument_clickhouse_server_log)
+    Scenario(run=assignment_all, setup=instrument_clickhouse_server_log)
+    Scenario(run=assignment_all_except, setup=instrument_clickhouse_server_log)
+    Scenario(run=nested_view, setup=instrument_clickhouse_server_log)
+    Scenario(run=nested_live_view_before_policy, setup=instrument_clickhouse_server_log)
+    Scenario(run=nested_live_view_after_policy, setup=instrument_clickhouse_server_log)
+    Scenario(run=nested_mat_view_before_policy, setup=instrument_clickhouse_server_log)
+    Scenario(run=nested_mat_view_after_policy, setup=instrument_clickhouse_server_log)
+    Scenario(run=populate_mat_view, setup=instrument_clickhouse_server_log)
+    Scenario(run=dist_table, setup=instrument_clickhouse_server_log)
+    Scenario(run=dist_table_on_dist_table, setup=instrument_clickhouse_server_log)
+    Scenario(run=dist_table_diff_policies_on_diff_nodes, setup=instrument_clickhouse_server_log)
+    Scenario(run=diff_policies_on_diff_nodes, setup=instrument_clickhouse_server_log)
+    Scenario(run=no_table, setup=instrument_clickhouse_server_log)
+    Scenario(run=policy_before_table, setup=instrument_clickhouse_server_log)
+    Scenario(run=dict, setup=instrument_clickhouse_server_log)
diff --git a/tests/testflows/rbac/tests/privileges/create/create_settings_profile.py b/tests/testflows/rbac/tests/privileges/create/create_settings_profile.py
index 8b206564647..938de560391 100644
--- a/tests/testflows/rbac/tests/privileges/create/create_settings_profile.py
+++ b/tests/testflows/rbac/tests/privileges/create/create_settings_profile.py
@@ -17,7 +17,7 @@ def privileges_granted_directly(self, node=None):
 
     with user(node, f"{user_name}"):
 
-        Suite(run=create_settings_profile, flags=TE,
+        Suite(run=create_settings_profile,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[user_name,user_name]) for row in create_settings_profile.examples
             ], args=Args(name="privilege={privilege}", format_name=True)))
@@ -38,13 +38,14 @@ def privileges_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(run=create_settings_profile, flags=TE,
+        Suite(run=create_settings_profile,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[role_name,user_name]) for row in create_settings_profile.examples
             ], args=Args(name="privilege={privilege}", format_name=True)))
 
 @TestOutline(Suite)
 @Examples("privilege",[
+    ("ALL",),
     ("ACCESS MANAGEMENT",),
     ("CREATE SETTINGS PROFILE",),
     ("CREATE PROFILE",),
@@ -61,7 +62,13 @@ def create_settings_profile(self, privilege, grant_target_name, user_name, node=
         create_settings_profile_name = f"create_settings_profile_{getuid()}"
 
         try:
-            with When("I check the user can't create a settings_profile"):
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I check the user can't create a settings_profile"):
                 node.query(f"CREATE SETTINGS PROFILE {create_settings_profile_name}", settings=[("user",user_name)],
                     exitcode=exitcode, message=message)
 
@@ -119,6 +126,8 @@ def create_settings_profile(self, privilege, grant_target_name, user_name, node=
 @Name("create settings profile")
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_CreateSettingsProfile("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 def feature(self, node="clickhouse1"):
     """Check the RBAC functionality of CREATE SETTINGS PROFILE.
diff --git a/tests/testflows/rbac/tests/privileges/create/create_table.py b/tests/testflows/rbac/tests/privileges/create/create_table.py
index 919e683f0f1..88d055f2915 100644
--- a/tests/testflows/rbac/tests/privileges/create/create_table.py
+++ b/tests/testflows/rbac/tests/privileges/create/create_table.py
@@ -6,6 +6,9 @@ from rbac.helper.common import *
 import rbac.helper.errors as errors
 
 @TestScenario
+@Requirements(
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
+)
 def create_without_create_table_privilege(self, node=None):
     """Check that user is unable to create a table without CREATE TABLE privilege.
     """
@@ -21,7 +24,13 @@ def create_without_create_table_privilege(self, node=None):
             with Given("I don't have a table"):
                 node.query(f"DROP TABLE IF EXISTS {table_name}")
 
-            with When("I try to create a table without CREATE TABLE privilege as the user"):
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {user_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {user_name}")
+
+            with Then("I try to create a table without CREATE TABLE privilege as the user"):
                 node.query(f"CREATE TABLE {table_name} (x Int8) ENGINE = Memory", settings = [("user", f"{user_name}")],
                     exitcode=exitcode, message=message)
 
@@ -74,6 +83,54 @@ def create_with_create_table_privilege(self, grant_target_name, user_name, node=
         with Then("I drop the table"):
             node.query(f"DROP TABLE IF EXISTS {table_name}")
 
+@TestScenario
+@Requirements(
+    RQ_SRS_006_RBAC_Privileges_All("1.0")
+)
+def create_with_all_privilege_granted_directly_or_via_role(self, node=None):
+    """Check that user is able to create a table with ALL privilege, either granted directly or through a role.
+    """
+    user_name = f"user_{getuid()}"
+    role_name = f"role_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+
+    with user(node, f"{user_name}"):
+
+        Scenario(test=create_with_all_privilege,
+            name="create with ALL privilege granted directly")(grant_target_name=user_name, user_name=user_name)
+
+    with user(node, f"{user_name}"), role(node, f"{role_name}"):
+
+        with When("I grant the role to the user"):
+            node.query(f"GRANT {role_name} TO {user_name}")
+
+        Scenario(test=create_with_all_privilege,
+            name="create with ALL privilege granted through a role")(grant_target_name=role_name, user_name=user_name)
+
+@TestOutline
+def create_with_all_privilege(self, grant_target_name, user_name, node=None):
+    """Check that user is able to create a table with the granted privileges.
+    """
+    table_name = f"table_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+    try:
+        with Given("I don't have a table"):
+            node.query(f"DROP TABLE IF EXISTS {table_name}")
+
+        with When("I grant ALL privilege"):
+            node.query(f"GRANT ALL ON *.* TO {grant_target_name}")
+
+        with Then("I try to create a table without privilege as the user"):
+            node.query(f"CREATE TABLE {table_name} (x Int8) ENGINE = Memory", settings = [("user", f"{user_name}")])
+
+    finally:
+        with Then("I drop the table"):
+            node.query(f"DROP TABLE IF EXISTS {table_name}")
+
 @TestScenario
 def create_with_revoked_create_table_privilege_revoked_directly_or_from_role(self, node=None):
     """Check that user is unable to create table after the CREATE TABLE privilege is revoked, either directly or from a role.
@@ -125,6 +182,57 @@ def create_with_revoked_create_table_privilege(self, grant_target_name, user_nam
         with Finally("I drop the table"):
             node.query(f"DROP TABLE IF EXISTS {table_name}")
 
+@TestScenario
+def create_with_all_privileges_revoked_directly_or_from_role(self, node=None):
+    """Check that user is unable to create table after ALL privileges are revoked, either directly or from a role.
+    """
+    user_name = f"user_{getuid()}"
+    role_name = f"role_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+
+    with user(node, f"{user_name}"):
+
+        Scenario(test=create_with_revoked_all_privilege,
+            name="create with all privilege revoked directly")(grant_target_name=user_name, user_name=user_name)
+
+    with user(node, f"{user_name}"), role(node, f"{role_name}"):
+
+        with When("I grant the role to the user"):
+            node.query(f"GRANT {role_name} TO {user_name}")
+
+        Scenario(test=create_with_revoked_all_privilege,
+            name="create with all privilege revoked from a role")(grant_target_name=role_name, user_name=user_name)
+
+@TestOutline
+def create_with_revoked_all_privilege(self, grant_target_name, user_name, node=None):
+    """Revoke ALL privilege and check the user is unable to create a table.
+    """
+    table_name = f"table_{getuid()}"
+    exitcode, message = errors.not_enough_privileges(name=f"{user_name}")
+
+    if node is None:
+        node = self.context.node
+
+    try:
+        with Given("I don't have a table"):
+            node.query(f"DROP TABLE IF EXISTS {table_name}")
+
+        with When("I grant CREATE TABLE privilege"):
+            node.query(f"GRANT CREATE TABLE ON {table_name} TO {grant_target_name}")
+
+        with And("I revoke ALL privilege"):
+            node.query(f"REVOKE ALL ON *.* FROM {grant_target_name}")
+
+        with Then("I try to create a table on the table as the user"):
+            node.query(f"CREATE TABLE {table_name} (x Int8) ENGINE = Memory", settings = [("user", f"{user_name}")],
+                exitcode=exitcode, message=message)
+
+    finally:
+        with Finally("I drop the table"):
+            node.query(f"DROP TABLE IF EXISTS {table_name}")
+
 @TestScenario
 def create_without_source_table_privilege(self, node=None):
     """Check that user is unable to create a table without select
diff --git a/tests/testflows/rbac/tests/privileges/create/create_temp_table.py b/tests/testflows/rbac/tests/privileges/create/create_temp_table.py
index 5dbbcc04732..ac38e0269cf 100644
--- a/tests/testflows/rbac/tests/privileges/create/create_temp_table.py
+++ b/tests/testflows/rbac/tests/privileges/create/create_temp_table.py
@@ -12,13 +12,13 @@ def privilege_granted_directly_or_via_role(self, node=None):
     if node is None:
         node = self.context.node
 
-    with Suite("user with direct privilege", setup=instrument_clickhouse_server_log):
+    with Suite("user with direct privilege"):
         with user(node, user_name):
 
             with When(f"I run checks that {user_name} is only able to execute CREATE TEMPORARY TABLE with required privileges"):
                 privilege_check(grant_target_name=user_name, user_name=user_name, node=node)
 
-    with Suite("user with privilege via role", setup=instrument_clickhouse_server_log):
+    with Suite("user with privilege via role"):
         with user(node, user_name), role(node, role_name):
 
             with When("I grant the role to the user"):
@@ -32,11 +32,17 @@ def privilege_check(grant_target_name, user_name, node=None):
     """
     exitcode, message = errors.not_enough_privileges(name=f"{user_name}")
 
-    with Scenario("user without privilege", setup=instrument_clickhouse_server_log):
+    with Scenario("user without privilege"):
         temp_table_name = f"temp_table_{getuid()}"
 
         try:
-            with When("I attempt to create a temporary table without privilege"):
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I attempt to create a temporary table without privilege"):
                 node.query(f"CREATE TEMPORARY TABLE {temp_table_name} (x Int8)", settings = [("user", user_name)],
                     exitcode=exitcode, message=message)
 
@@ -44,7 +50,7 @@ def privilege_check(grant_target_name, user_name, node=None):
             with Finally("I drop the temporary table"):
                 node.query(f"DROP TEMPORARY TABLE IF EXISTS {temp_table_name}")
 
-    with Scenario("user with privilege", setup=instrument_clickhouse_server_log):
+    with Scenario("user with privilege"):
         temp_table_name = f"temp_table_{getuid()}"
 
         try:
@@ -58,7 +64,7 @@ def privilege_check(grant_target_name, user_name, node=None):
             with Finally("I drop the temporary table"):
                 node.query(f"DROP TEMPORARY TABLE IF EXISTS {temp_table_name}")
 
-    with Scenario("user with revoked privilege", setup=instrument_clickhouse_server_log):
+    with Scenario("user with revoked privilege"):
         temp_table_name = f"temp_table_{getuid()}"
 
         try:
@@ -76,9 +82,43 @@ def privilege_check(grant_target_name, user_name, node=None):
             with Finally("I drop the temporary table"):
                 node.query(f"DROP TEMPORARY TABLE IF EXISTS {temp_table_name}")
 
+    with Scenario("user with revoked ALL privilege"):
+        temp_table_name = f"temp_table_{getuid()}"
+
+        try:
+            with When("I grant the create temporary table privilege"):
+                node.query(f"GRANT CREATE TEMPORARY TABLE ON *.* TO {grant_target_name}")
+
+            with And("I revoke ALL privilege"):
+                node.query(f"REVOKE ALL ON *.* FROM {grant_target_name}")
+
+            with Then("I attempt to create a temporary table"):
+                node.query(f"CREATE TEMPORARY TABLE {temp_table_name} (x Int8)", settings = [("user", user_name)],
+                    exitcode=exitcode, message=message)
+
+        finally:
+            with Finally("I drop the temporary table"):
+                node.query(f"DROP TEMPORARY TABLE IF EXISTS {temp_table_name}")
+
+    with Scenario("user with ALL privilege"):
+        temp_table_name = f"temp_table_{getuid()}"
+
+        try:
+            with When("I grant ALL privilege"):
+                node.query(f"GRANT ALL ON *.* TO {grant_target_name}")
+
+            with Then("I attempt to create aa temporary table"):
+                node.query(f"CREATE TEMPORARY TABLE {temp_table_name} (x Int8)", settings = [("user", user_name)])
+
+        finally:
+            with Finally("I drop the temporary table"):
+                node.query(f"DROP TEMPORARY TABLE IF EXISTS {temp_table_name}")
+
 @TestFeature
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_CreateTemporaryTable("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 @Name("create temporary table")
 def feature(self, node="clickhouse1", stress=None, parallel=None):
@@ -91,5 +131,5 @@ def feature(self, node="clickhouse1", stress=None, parallel=None):
     if stress is not None:
         self.context.stress = stress
 
-    with Suite(test=privilege_granted_directly_or_via_role):
+    with Suite(test=privilege_granted_directly_or_via_role, setup=instrument_clickhouse_server_log):
         privilege_granted_directly_or_via_role()
diff --git a/tests/testflows/rbac/tests/privileges/create/create_user.py b/tests/testflows/rbac/tests/privileges/create/create_user.py
index 02fe238b618..b055deecea2 100644
--- a/tests/testflows/rbac/tests/privileges/create/create_user.py
+++ b/tests/testflows/rbac/tests/privileges/create/create_user.py
@@ -17,7 +17,7 @@ def create_user_granted_directly(self, node=None):
 
     with user(node, f"{user_name}"):
 
-        Suite(run=create_user, flags=TE,
+        Suite(run=create_user,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[user_name,user_name]) for row in create_user.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
@@ -38,13 +38,14 @@ def create_user_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(run=create_user, flags=TE,
+        Suite(run=create_user,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[role_name,user_name]) for row in create_user.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
 
 @TestOutline(Suite)
 @Examples("privilege",[
+    ("ALL",),
     ("ACCESS MANAGEMENT",),
     ("CREATE USER",),
 ])
@@ -60,7 +61,13 @@ def create_user(self, privilege, grant_target_name, user_name, node=None):
         create_user_name = f"create_user_{getuid()}"
 
         try:
-            with When("I check the user can't create a user"):
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I check the user can't create a user"):
                 node.query(f"CREATE USER {create_user_name}", settings=[("user",user_name)],
                     exitcode=exitcode, message=message)
 
@@ -127,7 +134,7 @@ def default_role_granted_directly(self, node=None):
 
     with user(node, f"{user_name}"):
 
-        Suite(test=default_role, flags=TE)(grant_target_name=user_name, user_name=user_name)
+        Suite(test=default_role)(grant_target_name=user_name, user_name=user_name)
 
 @TestSuite
 def default_role_granted_via_role(self, node=None):
@@ -145,7 +152,7 @@ def default_role_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(test=default_role, flags=TE)(grant_target_name=role_name, user_name=user_name)
+        Suite(test=default_role)(grant_target_name=role_name, user_name=user_name)
 
 @TestSuite
 @Requirements(
@@ -215,7 +222,7 @@ def default_role(self, grant_target_name, user_name, node=None):
                     settings = [("user", f"{user_name}")])
 
         finally:
-            with Finally("I drop the user", flags=TE):
+            with Finally("I drop the user"):
                 node.query(f"DROP USER IF EXISTS {create_user_name} ON CLUSTER sharded_cluster")
 
             with And("I drop the role from the cluster"):
@@ -264,6 +271,8 @@ def default_role(self, grant_target_name, user_name, node=None):
 @Name("create user")
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_CreateUser("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 def feature(self, node="clickhouse1"):
     """Check the RBAC functionality of CREATE USER.
diff --git a/tests/testflows/rbac/tests/privileges/detach/detach_database.py b/tests/testflows/rbac/tests/privileges/detach/detach_database.py
index 8f4576c3399..12eeb39aa1b 100644
--- a/tests/testflows/rbac/tests/privileges/detach/detach_database.py
+++ b/tests/testflows/rbac/tests/privileges/detach/detach_database.py
@@ -12,13 +12,13 @@ def privilege_granted_directly_or_via_role(self, node=None):
     if node is None:
         node = self.context.node
 
-    with Suite("user with direct privilege", setup=instrument_clickhouse_server_log):
+    with Suite("user with direct privilege"):
         with user(node, user_name):
 
             with When(f"I run checks that {user_name} is only able to execute DETACH DATABASE with required privileges"):
                 privilege_check(grant_target_name=user_name, user_name=user_name, node=node)
 
-    with Suite("user with privilege via role", setup=instrument_clickhouse_server_log):
+    with Suite("user with privilege via role"):
         with user(node, user_name), role(node, role_name):
 
             with When("I grant the role to the user"):
@@ -39,7 +39,13 @@ def privilege_check(grant_target_name, user_name, node=None):
             with Given("I have a database"):
                 node.query(f"CREATE DATABASE {db_name}")
 
-            with When("I attempt to detach the database"):
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I attempt to detach the database"):
                 node.query(f"DETACH DATABASE {db_name}", settings = [("user", user_name)],
                     exitcode=exitcode, message=message)
         finally:
@@ -48,7 +54,7 @@ def privilege_check(grant_target_name, user_name, node=None):
             with And("I drop the database", flags=TE):
                 node.query(f"DROP DATABASE IF EXISTS {db_name}")
 
-    with Scenario("user with privilege", setup=instrument_clickhouse_server_log):
+    with Scenario("user with privilege"):
         db_name = f"db_{getuid()}"
 
         try:
@@ -67,7 +73,7 @@ def privilege_check(grant_target_name, user_name, node=None):
             with And("I drop the database", flags=TE):
                 node.query(f"DROP DATABASE IF EXISTS {db_name}")
 
-    with Scenario("user with revoked privilege", setup=instrument_clickhouse_server_log):
+    with Scenario("user with revoked privilege"):
         db_name = f"db_{getuid()}"
 
         try:
@@ -90,9 +96,53 @@ def privilege_check(grant_target_name, user_name, node=None):
             with And("I drop the database", flags=TE):
                 node.query(f"DROP DATABASE IF EXISTS {db_name}")
 
+    with Scenario("user with revoked ALL privilege"):
+        db_name = f"db_{getuid()}"
+
+        try:
+            with Given("I have a database"):
+                node.query(f"CREATE DATABASE {db_name}")
+
+            with When("I grant the drop database privilege"):
+                node.query(f"GRANT DROP DATABASE ON {db_name}.* TO {grant_target_name}")
+
+            with And("I revoke ALL privilege"):
+                node.query(f"REVOKE ALL ON *.* FROM {grant_target_name}")
+
+            with Then("I attempt to detach a database"):
+                node.query(f"DETACH DATABASE {db_name}", settings = [("user", user_name)],
+                    exitcode=exitcode, message=message)
+
+        finally:
+            with Finally("I reattach the database", flags=TE):
+                node.query(f"ATTACH DATABASE IF NOT EXISTS {db_name}")
+            with And("I drop the database", flags=TE):
+                node.query(f"DROP DATABASE IF EXISTS {db_name}")
+
+    with Scenario("user with ALL privilege"):
+        db_name = f"db_{getuid()}"
+
+        try:
+            with Given("I have a database"):
+                node.query(f"CREATE DATABASE {db_name}")
+
+            with When("I grant ALL privilege"):
+                node.query(f"GRANT ALL ON *.* TO {grant_target_name}")
+
+            with Then("I attempt to detach a database"):
+                node.query(f"DETACH DATABASE {db_name}", settings = [("user", user_name)])
+
+        finally:
+            with Finally("I reattach the database", flags=TE):
+                node.query(f"ATTACH DATABASE IF NOT EXISTS {db_name}")
+            with And("I drop the database", flags=TE):
+                node.query(f"DROP DATABASE IF EXISTS {db_name}")
+
 @TestFeature
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_DetachDatabase("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 @Name("detach database")
 def feature(self, node="clickhouse1", stress=None, parallel=None):
@@ -105,5 +155,5 @@ def feature(self, node="clickhouse1", stress=None, parallel=None):
     if stress is not None:
         self.context.stress = stress
 
-    with Suite(test=privilege_granted_directly_or_via_role):
+    with Suite(test=privilege_granted_directly_or_via_role, setup=instrument_clickhouse_server_log):
         privilege_granted_directly_or_via_role()
diff --git a/tests/testflows/rbac/tests/privileges/detach/detach_dictionary.py b/tests/testflows/rbac/tests/privileges/detach/detach_dictionary.py
index 5ae992e3623..17b37ce6dc0 100644
--- a/tests/testflows/rbac/tests/privileges/detach/detach_dictionary.py
+++ b/tests/testflows/rbac/tests/privileges/detach/detach_dictionary.py
@@ -12,13 +12,13 @@ def privilege_granted_directly_or_via_role(self, node=None):
     if node is None:
         node = self.context.node
 
-    with Suite("user with direct privilege", setup=instrument_clickhouse_server_log):
+    with Suite("user with direct privilege"):
         with user(node, user_name):
 
             with When(f"I run checks that {user_name} is only able to execute DETACH DICTIONARY with required privileges"):
                 privilege_check(grant_target_name=user_name, user_name=user_name, node=node)
 
-    with Suite("user with privilege via role", setup=instrument_clickhouse_server_log):
+    with Suite("user with privilege via role"):
         with user(node, user_name), role(node, role_name):
 
             with When("I grant the role to the user"):
@@ -32,14 +32,20 @@ def privilege_check(grant_target_name, user_name, node=None):
     """
     exitcode, message = errors.not_enough_privileges(name=f"{user_name}")
 
-    with Scenario("user without privilege", setup=instrument_clickhouse_server_log):
+    with Scenario("user without privilege"):
         dict_name = f"dict_{getuid()}"
 
         try:
             with Given("I have a dictionary"):
                 node.query(f"CREATE DICTIONARY {dict_name}(x Int32, y Int32) PRIMARY KEY x LAYOUT(FLAT()) SOURCE(CLICKHOUSE()) LIFETIME(0)")
 
-            with When("I attempt to detach a dictionary without privilege"):
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I attempt to detach a dictionary without privilege"):
                 node.query(f"DETACH DICTIONARY {dict_name}", settings = [("user", user_name)], exitcode=exitcode, message=message)
 
         finally:
@@ -48,7 +54,7 @@ def privilege_check(grant_target_name, user_name, node=None):
             with And("I drop the dictionary", flags=TE):
                 node.query(f"DROP DICTIONARY IF EXISTS {dict_name}")
 
-    with Scenario("user with privilege", setup=instrument_clickhouse_server_log):
+    with Scenario("user with privilege"):
         dict_name = f"dict_{getuid()}"
 
         try:
@@ -67,7 +73,7 @@ def privilege_check(grant_target_name, user_name, node=None):
             with And("I drop the dictionary", flags=TE):
                 node.query(f"DROP DICTIONARY IF EXISTS {dict_name}")
 
-    with Scenario("user with revoked privilege", setup=instrument_clickhouse_server_log):
+    with Scenario("user with revoked privilege"):
         dict_name = f"dict_{getuid()}"
 
         try:
@@ -89,9 +95,52 @@ def privilege_check(grant_target_name, user_name, node=None):
             with And("I drop the dictionary", flags=TE):
                 node.query(f"DROP DICTIONARY IF EXISTS {dict_name}")
 
+    with Scenario("user with revoked ALL privilege"):
+        dict_name = f"dict_{getuid()}"
+
+        try:
+            with Given("I have a dictionary"):
+                node.query(f"CREATE DICTIONARY {dict_name}(x Int32, y Int32) PRIMARY KEY x LAYOUT(FLAT()) SOURCE(CLICKHOUSE()) LIFETIME(0)")
+
+            with When("I grant the drop dictionary privilege"):
+                node.query(f"GRANT DROP DICTIONARY ON {dict_name} TO {grant_target_name}")
+
+            with And("I revoke ALL privilege"):
+                node.query(f"REVOKE ALL ON *.* FROM {grant_target_name}")
+
+            with Then("I attempt to detach a dictionary"):
+                node.query(f"DETACH DICTIONARY {dict_name}", settings = [("user", user_name)], exitcode=exitcode, message=message)
+
+        finally:
+            with Finally("I reattach the dictionary", flags=TE):
+                node.query(f"ATTACH DICTIONARY IF NOT EXISTS {dict_name}")
+            with And("I drop the dictionary", flags=TE):
+                node.query(f"DROP DICTIONARY IF EXISTS {dict_name}")
+
+    with Scenario("user with ALL privilege"):
+        dict_name = f"dict_{getuid()}"
+
+        try:
+            with Given("I have a dictionary"):
+                node.query(f"CREATE DICTIONARY {dict_name}(x Int32, y Int32) PRIMARY KEY x LAYOUT(FLAT()) SOURCE(CLICKHOUSE()) LIFETIME(0)")
+
+            with When("I grant ALL privilege"):
+                node.query(f"GRANT ALL ON *.* TO {grant_target_name}")
+
+            with Then("I attempt to detach a dictionary"):
+                node.query(f"DETACH DICTIONARY {dict_name}", settings = [("user", user_name)])
+
+        finally:
+            with Finally("I reattach the dictionary", flags=TE):
+                node.query(f"ATTACH DICTIONARY IF NOT EXISTS {dict_name}")
+            with And("I drop the dictionary", flags=TE):
+                node.query(f"DROP DICTIONARY IF EXISTS {dict_name}")
+
 @TestFeature
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_DetachDictionary("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 @Name("detach dictionary")
 def feature(self, node="clickhouse1", stress=None, parallel=None):
@@ -104,5 +153,5 @@ def feature(self, node="clickhouse1", stress=None, parallel=None):
     if stress is not None:
         self.context.stress = stress
 
-    with Suite(test=privilege_granted_directly_or_via_role):
+    with Suite(test=privilege_granted_directly_or_via_role, setup=instrument_clickhouse_server_log):
         privilege_granted_directly_or_via_role()
diff --git a/tests/testflows/rbac/tests/privileges/detach/detach_table.py b/tests/testflows/rbac/tests/privileges/detach/detach_table.py
index 38a4a5dfde1..b5a01b361fc 100644
--- a/tests/testflows/rbac/tests/privileges/detach/detach_table.py
+++ b/tests/testflows/rbac/tests/privileges/detach/detach_table.py
@@ -12,13 +12,13 @@ def privilege_granted_directly_or_via_role(self, node=None):
     if node is None:
         node = self.context.node
 
-    with Suite("user with direct privilege", setup=instrument_clickhouse_server_log):
+    with Suite("user with direct privilege"):
         with user(node, user_name):
 
             with When(f"I run checks that {user_name} is only able to execute DETACH TABLE with required privileges"):
                 privilege_check(grant_target_name=user_name, user_name=user_name, node=node)
 
-    with Suite("user with privilege via role", setup=instrument_clickhouse_server_log):
+    with Suite("user with privilege via role"):
         with user(node, user_name), role(node, role_name):
 
             with When("I grant the role to the user"):
@@ -32,13 +32,19 @@ def privilege_check(grant_target_name, user_name, node=None):
     """
     exitcode, message = errors.not_enough_privileges(name=f"{user_name}")
 
-    with Scenario("user without privilege", setup=instrument_clickhouse_server_log):
+    with Scenario("user without privilege"):
         table_name = f"table_{getuid()}"
 
         try:
             with Given("I have a table"):
                 node.query(f"CREATE TABLE {table_name} (x Int8) ENGINE=Memory")
 
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
             with When("I attempt to detach a table without privilege"):
                 node.query(f"DETACH TABLE {table_name}", settings = [("user", user_name)],
                     exitcode=exitcode, message=message)
@@ -49,7 +55,7 @@ def privilege_check(grant_target_name, user_name, node=None):
             with And("I drop the table", flags=TE):
                 node.query(f"DROP TABLE IF EXISTS {table_name}")
 
-    with Scenario("user with privilege", setup=instrument_clickhouse_server_log):
+    with Scenario("user with privilege"):
         table_name = f"table_{getuid()}"
 
         try:
@@ -68,7 +74,7 @@ def privilege_check(grant_target_name, user_name, node=None):
             with And("I drop the table", flags=TE):
                 node.query(f"DROP TABLE IF EXISTS {table_name}")
 
-    with Scenario("user with revoked privilege", setup=instrument_clickhouse_server_log):
+    with Scenario("user with revoked privilege"):
         table_name = f"table_{getuid()}"
 
         try:
@@ -91,9 +97,53 @@ def privilege_check(grant_target_name, user_name, node=None):
             with And("I drop the table", flags=TE):
                 node.query(f"DROP TABLE IF EXISTS {table_name}")
 
+    with Scenario("user with revoked ALL privilege"):
+        table_name = f"table_{getuid()}"
+
+        try:
+            with Given("I have a table"):
+                node.query(f"CREATE TABLE {table_name} (x Int8) ENGINE=Memory")
+
+            with When("I grant the drop table privilege"):
+                node.query(f"GRANT DROP TABLE ON *.* TO {grant_target_name}")
+
+            with And("I revoke ALL privilege"):
+                node.query(f"REVOKE ALL ON *.* FROM {grant_target_name}")
+
+            with Then("I attempt to detach a table"):
+                node.query(f"DETACH TABLE {table_name}", settings = [("user", user_name)],
+                    exitcode=exitcode, message=message)
+
+        finally:
+            with Finally("I reattach the table", flags=TE):
+                node.query(f"ATTACH TABLE IF NOT EXISTS {table_name}")
+            with And("I drop the table", flags=TE):
+                node.query(f"DROP TABLE IF EXISTS {table_name}")
+
+    with Scenario("user with ALL privilege"):
+        table_name = f"table_{getuid()}"
+
+        try:
+            with Given("I have a table"):
+                node.query(f"CREATE TABLE {table_name} (x Int8) ENGINE=Memory")
+
+            with When("I grant ALL privilege"):
+                node.query(f"GRANT ALL ON *.* TO {grant_target_name}")
+
+            with Then("I attempt to detach a table"):
+                node.query(f"DETACH TABLE {table_name}", settings = [("user", user_name)])
+
+        finally:
+            with Finally("I reattach the table", flags=TE):
+                node.query(f"ATTACH TABLE IF NOT EXISTS {table_name}")
+            with And("I drop the table", flags=TE):
+                node.query(f"DROP TABLE IF EXISTS {table_name}")
+
 @TestFeature
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_DetachTable("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 @Name("detach table")
 def feature(self, node="clickhouse1", stress=None, parallel=None):
@@ -106,5 +156,5 @@ def feature(self, node="clickhouse1", stress=None, parallel=None):
     if stress is not None:
         self.context.stress = stress
 
-    with Suite(test=privilege_granted_directly_or_via_role):
+    with Suite(test=privilege_granted_directly_or_via_role, setup=instrument_clickhouse_server_log):
         privilege_granted_directly_or_via_role()
diff --git a/tests/testflows/rbac/tests/privileges/detach/detach_view.py b/tests/testflows/rbac/tests/privileges/detach/detach_view.py
index e6e8adad065..c3c9f70a35a 100644
--- a/tests/testflows/rbac/tests/privileges/detach/detach_view.py
+++ b/tests/testflows/rbac/tests/privileges/detach/detach_view.py
@@ -12,13 +12,13 @@ def privilege_granted_directly_or_via_role(self, node=None):
     if node is None:
         node = self.context.node
 
-    with Suite("user with direct privilege", setup=instrument_clickhouse_server_log):
+    with Suite("user with direct privilege"):
         with user(node, user_name):
 
             with When(f"I run checks that {user_name} is only able to execute DETACH VIEW with required privileges"):
                 privilege_check(grant_target_name=user_name, user_name=user_name, node=node)
 
-    with Suite("user with privilege via role", setup=instrument_clickhouse_server_log):
+    with Suite("user with privilege via role"):
         with user(node, user_name), role(node, role_name):
 
             with When("I grant the role to the user"):
@@ -32,13 +32,19 @@ def privilege_check(grant_target_name, user_name, node=None):
     """
     exitcode, message = errors.not_enough_privileges(name=f"{user_name}")
 
-    with Scenario("user without privilege", setup=instrument_clickhouse_server_log):
+    with Scenario("user without privilege"):
         view_name = f"view_{getuid()}"
 
         try:
             with Given("I have a view"):
                 node.query(f"CREATE VIEW {view_name} AS SELECT 1")
 
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
             with When("I attempt to drop a view without privilege"):
                 node.query(f"DETACH VIEW {view_name}", settings = [("user", user_name)],
                     exitcode=exitcode, message=message)
@@ -49,7 +55,7 @@ def privilege_check(grant_target_name, user_name, node=None):
             with And("I drop the view", flags=TE):
                 node.query(f"DROP VIEW IF EXISTS {view_name}")
 
-    with Scenario("user with privilege", setup=instrument_clickhouse_server_log):
+    with Scenario("user with privilege"):
         view_name = f"view_{getuid()}"
 
         try:
@@ -68,7 +74,7 @@ def privilege_check(grant_target_name, user_name, node=None):
             with And("I drop the table", flags=TE):
                 node.query(f"DROP VIEW IF EXISTS {view_name}")
 
-    with Scenario("user with revoked privilege", setup=instrument_clickhouse_server_log):
+    with Scenario("user with revoked privilege"):
         view_name = f"view_{getuid()}"
 
         try:
@@ -91,9 +97,53 @@ def privilege_check(grant_target_name, user_name, node=None):
             with And("I drop the view", flags=TE):
                 node.query(f"DROP VIEW IF EXISTS {view_name}")
 
+    with Scenario("user with revoked ALL privilege"):
+        view_name = f"view_{getuid()}"
+
+        try:
+            with Given("I have a view"):
+                node.query(f"CREATE VIEW {view_name} AS SELECT 1")
+
+            with When("I grant the drop view privilege"):
+                node.query(f"GRANT DROP VIEW ON {view_name} TO {grant_target_name}")
+
+            with And("I revoke ALL privilege"):
+                node.query(f"REVOKE ALL ON *.* FROM {grant_target_name}")
+
+            with Then("I attempt to drop a  view"):
+                node.query(f"DETACH VIEW {view_name}", settings = [("user", user_name)],
+                    exitcode=exitcode, message=message)
+
+        finally:
+            with Finally("I reattach the view as a table", flags=TE):
+                node.query(f"ATTACH VIEW IF NOT EXISTS {view_name} AS SELECT 1")
+            with And("I drop the view", flags=TE):
+                node.query(f"DROP VIEW IF EXISTS {view_name}")
+
+    with Scenario("user with ALL privilege"):
+        view_name = f"view_{getuid()}"
+
+        try:
+            with Given("I have a view"):
+                node.query(f"CREATE VIEW {view_name} AS SELECT 1")
+
+            with When("I grant ALL privilege"):
+                node.query(f"GRANT ALL ON *.* TO {grant_target_name}")
+
+            with Then("I attempt to drop a view"):
+                node.query(f"DETACH VIEW {view_name}", settings = [("user", user_name)])
+
+        finally:
+            with Finally("I reattach the view as a table", flags=TE):
+                node.query(f"ATTACH VIEW IF NOT EXISTS {view_name} AS SELECT 1")
+            with And("I drop the table", flags=TE):
+                node.query(f"DROP VIEW IF EXISTS {view_name}")
+
 @TestFeature
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_DetachView("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 @Name("detach view")
 def feature(self, node="clickhouse1", stress=None, parallel=None):
@@ -106,5 +156,5 @@ def feature(self, node="clickhouse1", stress=None, parallel=None):
     if stress is not None:
         self.context.stress = stress
 
-    with Suite(test=privilege_granted_directly_or_via_role):
+    with Suite(test=privilege_granted_directly_or_via_role, setup=instrument_clickhouse_server_log):
         privilege_granted_directly_or_via_role()
diff --git a/tests/testflows/rbac/tests/privileges/dictGet.py b/tests/testflows/rbac/tests/privileges/dictGet.py
index 532fa798eb2..21de4a36b77 100644
--- a/tests/testflows/rbac/tests/privileges/dictGet.py
+++ b/tests/testflows/rbac/tests/privileges/dictGet.py
@@ -39,8 +39,8 @@ def dictGet_granted_directly(self, node=None):
 
     with user(node, f"{user_name}"):
 
-        Suite(run=dictGet_check, setup=instrument_clickhouse_server_log,
-            examples=Examples("privilege grant_target_name user_name", [
+        Suite(run=dictGet_check,
+            examples=Examples("privilege on grant_target_name user_name", [
                 tuple(list(row)+[user_name,user_name]) for row in dictGet_check.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
 
@@ -60,60 +60,67 @@ def dictGet_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(run=dictGet_check, setup=instrument_clickhouse_server_log,
-            examples=Examples("privilege grant_target_name user_name", [
+        Suite(run=dictGet_check,
+            examples=Examples("privilege on grant_target_name user_name", [
                 tuple(list(row)+[role_name,user_name]) for row in dictGet_check.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
 
 @TestOutline(Suite)
-@Examples("privilege",[
-    ("dictGet",),
-    ("dictHas",),
-    ("dictGetHierarchy",),
-    ("dictIsIn",),
+@Examples("privilege on",[
+    ("ALL", "*.*"),
+    ("dictGet", "dict"),
+    ("dictHas", "dict"),
+    ("dictGetHierarchy", "dict"),
+    ("dictIsIn", "dict"),
 ])
 @Requirements(
     RQ_SRS_006_RBAC_dictGet_RequiredPrivilege("1.0")
 )
-def dictGet_check(self, privilege, grant_target_name, user_name, node=None):
+def dictGet_check(self, privilege, on, grant_target_name, user_name, node=None):
     """Check that user is able to execute `dictGet` if and only if they have the necessary privileges.
     """
     if node is None:
         node = self.context.node
 
+    dict_name = f"dict_{getuid()}"
+    table_name = f"table_{getuid()}"
+
+    on = on.replace("dict", f"{dict_name}")
+
     exitcode, message = errors.not_enough_privileges(name=f"{user_name}")
 
-    with Scenario("user without privilege", setup=instrument_clickhouse_server_log):
-        dict_name = f"dict_{getuid()}"
-        table_name = f"table_{getuid()}"
+    with Scenario("user without privilege"):
 
         with dict_setup(node, table_name, dict_name):
 
-            with When("I attempt to dictGet without privilege"):
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I attempt to dictGet without privilege"):
                 node.query(f"SELECT dictGet ({dict_name},'y',toUInt64(1))", settings = [("user", user_name)], exitcode=exitcode, message=message)
 
-    with Scenario("user with privilege", setup=instrument_clickhouse_server_log):
-        dict_name = f"dict_{getuid()}"
-        table_name = f"table_{getuid()}"
+    with Scenario("user with privilege"):
 
         with dict_setup(node, table_name, dict_name):
 
             with When(f"I grant privilege"):
-                node.query(f"GRANT {privilege} ON {dict_name} TO {grant_target_name}")
+                node.query(f"GRANT {privilege} ON {on} TO {grant_target_name}")
 
             with Then("I attempt to dictGet with privilege"):
                 node.query(f"SELECT dictGet ({dict_name},'y',toUInt64(1))", settings = [("user", user_name)])
 
-    with Scenario("user with revoked privilege", setup=instrument_clickhouse_server_log):
-        dict_name = f"dict_{getuid()}"
+    with Scenario("user with revoked privilege"):
 
         with dict_setup(node, table_name, dict_name):
 
             with When("I grant privilege"):
-                node.query(f"GRANT {privilege} ON {dict_name} TO {grant_target_name}")
+                node.query(f"GRANT {privilege} ON {on} TO {grant_target_name}")
 
             with And("I revoke privilege"):
-                node.query(f"REVOKE {privilege} ON {dict_name} FROM {grant_target_name}")
+                node.query(f"REVOKE {privilege} ON {on} FROM {grant_target_name}")
 
             with When("I attempt to dictGet without privilege"):
                 node.query(f"SELECT dictGet ({dict_name},'y',toUInt64(1))", settings = [("user", user_name)], exitcode=exitcode, message=message)
@@ -130,8 +137,8 @@ def dictGetOrDefault_granted_directly(self, node=None):
 
     with user(node, f"{user_name}"):
 
-        Suite(run=dictGetOrDefault_check, setup=instrument_clickhouse_server_log,
-            examples=Examples("privilege grant_target_name user_name", [
+        Suite(run=dictGetOrDefault_check,
+            examples=Examples("privilege on grant_target_name user_name", [
                 tuple(list(row)+[user_name,user_name]) for row in dictGetOrDefault_check.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
 
@@ -151,60 +158,67 @@ def dictGetOrDefault_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(run=dictGetOrDefault_check, setup=instrument_clickhouse_server_log,
-            examples=Examples("privilege grant_target_name user_name", [
+        Suite(run=dictGetOrDefault_check,
+            examples=Examples("privilege on grant_target_name user_name", [
                 tuple(list(row)+[role_name,user_name]) for row in dictGetOrDefault_check.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
 
 @TestOutline(Suite)
-@Examples("privilege",[
-    ("dictGet",),
-    ("dictHas",),
-    ("dictGetHierarchy",),
-    ("dictIsIn",),
+@Examples("privilege on",[
+    ("ALL", "*.*"),
+    ("dictGet", "dict"),
+    ("dictHas", "dict"),
+    ("dictGetHierarchy", "dict"),
+    ("dictIsIn", "dict"),
 ])
 @Requirements(
     RQ_SRS_006_RBAC_dictGet_OrDefault_RequiredPrivilege("1.0")
 )
-def dictGetOrDefault_check(self, privilege, grant_target_name, user_name, node=None):
+def dictGetOrDefault_check(self, privilege, on, grant_target_name, user_name, node=None):
     """Check that user is able to execute `dictGetOrDefault` if and only if they have the necessary privileges.
     """
     if node is None:
         node = self.context.node
 
+    dict_name = f"dict_{getuid()}"
+    table_name = f"table_{getuid()}"
+
+    on = on.replace("dict", f"{dict_name}")
+
     exitcode, message = errors.not_enough_privileges(name=f"{user_name}")
 
-    with Scenario("user without privilege", setup=instrument_clickhouse_server_log):
-        dict_name = f"dict_{getuid()}"
-        table_name = f"table_{getuid()}"
+    with Scenario("user without privilege"):
 
         with dict_setup(node, table_name, dict_name):
 
-            with When("I attempt to dictGetOrDefault without privilege"):
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I attempt to dictGetOrDefault without privilege"):
                 node.query(f"SELECT dictGetOrDefault ({dict_name},'y',toUInt64(1),toUInt64(1))", settings = [("user", user_name)], exitcode=exitcode, message=message)
 
-    with Scenario("user with privilege", setup=instrument_clickhouse_server_log):
-        dict_name = f"dict_{getuid()}"
-        table_name = f"table_{getuid()}"
+    with Scenario("user with privilege"):
 
         with dict_setup(node, table_name, dict_name):
 
             with When(f"I grant privilege"):
-                node.query(f"GRANT {privilege} ON {dict_name} TO {grant_target_name}")
+                node.query(f"GRANT {privilege} ON {on} TO {grant_target_name}")
 
             with Then("I attempt to dictGetOrDefault with privilege"):
                 node.query(f"SELECT dictGetOrDefault ({dict_name},'y',toUInt64(1),toUInt64(1))", settings = [("user", user_name)])
 
-    with Scenario("user with revoked privilege", setup=instrument_clickhouse_server_log):
-        dict_name = f"dict_{getuid()}"
+    with Scenario("user with revoked privilege"):
 
         with dict_setup(node, table_name, dict_name):
 
             with When("I grant privilege"):
-                node.query(f"GRANT {privilege} ON {dict_name} TO {grant_target_name}")
+                node.query(f"GRANT {privilege} ON {on} TO {grant_target_name}")
 
             with And("I revoke privilege"):
-                node.query(f"REVOKE {privilege} ON {dict_name} FROM {grant_target_name}")
+                node.query(f"REVOKE {privilege} ON {on} FROM {grant_target_name}")
 
             with When("I attempt to dictGetOrDefault without privilege"):
                 node.query(f"SELECT dictGetOrDefault ({dict_name},'y',toUInt64(1),toUInt64(1))", settings = [("user", user_name)], exitcode=exitcode, message=message)
@@ -221,8 +235,8 @@ def dictHas_granted_directly(self, node=None):
 
     with user(node, f"{user_name}"):
 
-        Suite(run=dictHas_check, setup=instrument_clickhouse_server_log,
-            examples=Examples("privilege grant_target_name user_name", [
+        Suite(run=dictHas_check,
+            examples=Examples("privilege on grant_target_name user_name", [
                 tuple(list(row)+[user_name,user_name]) for row in dictHas_check.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
 
@@ -242,60 +256,67 @@ def dictHas_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(run=dictHas_check, setup=instrument_clickhouse_server_log,
-            examples=Examples("privilege grant_target_name user_name", [
+        Suite(run=dictHas_check,
+            examples=Examples("privilege on grant_target_name user_name", [
                 tuple(list(row)+[role_name,user_name]) for row in dictHas_check.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
 
 @TestOutline(Suite)
-@Examples("privilege",[
-    ("dictGet",),
-    ("dictHas",),
-    ("dictGetHierarchy",),
-    ("dictIsIn",),
+@Examples("privilege on",[
+    ("ALL", "*.*"),
+    ("dictGet", "dict"),
+    ("dictHas", "dict"),
+    ("dictGetHierarchy", "dict"),
+    ("dictIsIn", "dict"),
 ])
 @Requirements(
     RQ_SRS_006_RBAC_dictHas_RequiredPrivilege("1.0")
 )
-def dictHas_check(self, privilege, grant_target_name, user_name, node=None):
+def dictHas_check(self, privilege, on, grant_target_name, user_name, node=None):
     """Check that user is able to execute `dictHas` if and only if they have the necessary privileges.
     """
     if node is None:
         node = self.context.node
 
+    dict_name = f"dict_{getuid()}"
+    table_name = f"table_{getuid()}"
+
+    on = on.replace("dict", f"{dict_name}")
+
     exitcode, message = errors.not_enough_privileges(name=f"{user_name}")
 
-    with Scenario("user without privilege", setup=instrument_clickhouse_server_log):
-        dict_name = f"dict_{getuid()}"
-        table_name = f"table_{getuid()}"
+    with Scenario("user without privilege"):
 
         with dict_setup(node, table_name, dict_name):
 
-            with When("I attempt to dictHas without privilege"):
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I attempt to dictHas without privilege"):
                 node.query(f"SELECT dictHas({dict_name},toUInt64(1))", settings = [("user", user_name)], exitcode=exitcode, message=message)
 
-    with Scenario("user with privilege", setup=instrument_clickhouse_server_log):
-        dict_name = f"dict_{getuid()}"
-        table_name = f"table_{getuid()}"
+    with Scenario("user with privilege"):
 
         with dict_setup(node, table_name, dict_name):
 
             with When("I grant privilege"):
-                node.query(f"GRANT {privilege} ON {dict_name} TO {grant_target_name}")
+                node.query(f"GRANT {privilege} ON {on} TO {grant_target_name}")
 
             with Then("I attempt to dictHas with privilege"):
                 node.query(f"SELECT dictHas({dict_name},toUInt64(1))", settings = [("user", user_name)])
 
-    with Scenario("user with revoked privilege", setup=instrument_clickhouse_server_log):
-        dict_name = f"dict_{getuid()}"
+    with Scenario("user with revoked privilege"):
 
         with dict_setup(node, table_name, dict_name):
 
             with When("I grant privilege"):
-                node.query(f"GRANT {privilege} ON {dict_name} TO {grant_target_name}")
+                node.query(f"GRANT {privilege} ON {on} TO {grant_target_name}")
 
             with And("I revoke privilege"):
-                node.query(f"REVOKE {privilege} ON {dict_name} FROM {grant_target_name}")
+                node.query(f"REVOKE {privilege} ON {on} FROM {grant_target_name}")
 
             with When("I attempt to dictHas without privilege"):
                 node.query(f"SELECT dictHas({dict_name},toUInt64(1))", settings = [("user", user_name)], exitcode=exitcode, message=message)
@@ -311,8 +332,8 @@ def dictGetHierarchy_granted_directly(self, node=None):
         node = self.context.node
 
     with user(node, f"{user_name}"):
-        Suite(run=dictGetHierarchy_check, setup=instrument_clickhouse_server_log,
-            examples=Examples("privilege grant_target_name user_name", [
+        Suite(run=dictGetHierarchy_check,
+            examples=Examples("privilege on grant_target_name user_name", [
                 tuple(list(row)+[user_name,user_name]) for row in dictGetHierarchy_check.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
 
@@ -332,60 +353,67 @@ def dictGetHierarchy_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(run=dictGetHierarchy_check, setup=instrument_clickhouse_server_log,
-            examples=Examples("privilege grant_target_name user_name", [
+        Suite(run=dictGetHierarchy_check,
+            examples=Examples("privilege on grant_target_name user_name", [
                 tuple(list(row)+[role_name,user_name]) for row in dictGetHierarchy_check.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
 
 @TestOutline(Suite)
-@Examples("privilege",[
-    ("dictGet",),
-    ("dictHas",),
-    ("dictGetHierarchy",),
-    ("dictIsIn",),
+@Examples("privilege on",[
+    ("ALL", "*.*"),
+    ("dictGet", "dict"),
+    ("dictHas", "dict"),
+    ("dictGetHierarchy", "dict"),
+    ("dictIsIn", "dict"),
 ])
 @Requirements(
     RQ_SRS_006_RBAC_dictGetHierarchy_RequiredPrivilege("1.0")
 )
-def dictGetHierarchy_check(self, privilege, grant_target_name, user_name, node=None):
+def dictGetHierarchy_check(self, privilege, on, grant_target_name, user_name, node=None):
     """Check that user is able to execute `dictGetHierarchy` if and only if they have the necessary privileges.
     """
     if node is None:
         node = self.context.node
 
+    dict_name = f"dict_{getuid()}"
+    table_name = f"table_{getuid()}"
+
+    on = on.replace("dict", f"{dict_name}")
+
     exitcode, message = errors.not_enough_privileges(name=f"{user_name}")
 
-    with Scenario("user without privilege", setup=instrument_clickhouse_server_log):
-        dict_name = f"dict_{getuid()}"
-        table_name = f"table_{getuid()}"
+    with Scenario("user without privilege"):
 
         with dict_setup(node, table_name, dict_name):
 
-            with When("I attempt to dictGetHierarchy without privilege"):
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I attempt to dictGetHierarchy without privilege"):
                 node.query(f"SELECT dictGetHierarchy({dict_name},toUInt64(1))", settings = [("user", user_name)], exitcode=exitcode, message=message)
 
-    with Scenario("user with privilege", setup=instrument_clickhouse_server_log):
-        dict_name = f"dict_{getuid()}"
-        table_name = f"table_{getuid()}"
+    with Scenario("user with privilege"):
 
         with dict_setup(node, table_name, dict_name):
 
             with When("I grant privilege"):
-                node.query(f"GRANT {privilege} ON {dict_name} TO {grant_target_name}")
+                node.query(f"GRANT {privilege} ON {on} TO {grant_target_name}")
 
             with Then("I attempt to dictGetHierarchy with privilege"):
                 node.query(f"SELECT dictGetHierarchy({dict_name},toUInt64(1))", settings = [("user", user_name)])
 
-    with Scenario("user with revoked privilege", setup=instrument_clickhouse_server_log):
-        dict_name = f"dict_{getuid()}"
+    with Scenario("user with revoked privilege"):
 
         with dict_setup(node, table_name, dict_name):
 
             with When("I grant privilege"):
-                node.query(f"GRANT {privilege} ON {dict_name} TO {grant_target_name}")
+                node.query(f"GRANT {privilege} ON {on} TO {grant_target_name}")
 
             with And("I revoke privilege"):
-                node.query(f"REVOKE {privilege} ON {dict_name} FROM {grant_target_name}")
+                node.query(f"REVOKE {privilege} ON {on} FROM {grant_target_name}")
 
             with When("I attempt to dictGetHierarchy without privilege"):
                 node.query(f"SELECT dictGetHierarchy({dict_name},toUInt64(1))", settings = [("user", user_name)], exitcode=exitcode, message=message)
@@ -401,8 +429,8 @@ def dictIsIn_granted_directly(self, node=None):
         node = self.context.node
 
     with user(node, f"{user_name}"):
-        Suite(run=dictIsIn_check, setup=instrument_clickhouse_server_log,
-            examples=Examples("privilege grant_target_name user_name", [
+        Suite(run=dictIsIn_check,
+            examples=Examples("privilege on grant_target_name user_name", [
                 tuple(list(row)+[user_name,user_name]) for row in dictIsIn_check.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
 
@@ -422,60 +450,67 @@ def dictIsIn_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(run=dictIsIn_check, setup=instrument_clickhouse_server_log,
-            examples=Examples("privilege grant_target_name user_name", [
+        Suite(run=dictIsIn_check,
+            examples=Examples("privilege on grant_target_name user_name", [
                 tuple(list(row)+[role_name,user_name]) for row in dictIsIn_check.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
 
 @TestOutline(Suite)
-@Examples("privilege",[
-    ("dictGet",),
-    ("dictHas",),
-    ("dictGetHierarchy",),
-    ("dictIsIn",),
+@Examples("privilege on",[
+    ("ALL", "*.*"),
+    ("dictGet", "dict"),
+    ("dictHas", "dict"),
+    ("dictGetHierarchy", "dict"),
+    ("dictIsIn", "dict"),
 ])
 @Requirements(
     RQ_SRS_006_RBAC_dictIsIn_RequiredPrivilege("1.0")
 )
-def dictIsIn_check(self, privilege, grant_target_name, user_name, node=None):
+def dictIsIn_check(self, privilege, on, grant_target_name, user_name, node=None):
     """Check that user is able to execute `dictIsIn` if and only if they have the necessary privileges.
     """
     if node is None:
         node = self.context.node
 
+    dict_name = f"dict_{getuid()}"
+    table_name = f"table_{getuid()}"
+
+    on = on.replace("dict", f"{dict_name}")
+
     exitcode, message = errors.not_enough_privileges(name=f"{user_name}")
 
-    with Scenario("user without privilege", setup=instrument_clickhouse_server_log):
-        dict_name = f"dict_{getuid()}"
-        table_name = f"table_{getuid()}"
+    with Scenario("user without privilege"):
 
         with dict_setup(node, table_name, dict_name):
 
-            with When("I attempt to dictIsIn without privilege"):
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I attempt to dictIsIn without privilege"):
                 node.query(f"SELECT dictIsIn({dict_name},toUInt64(1),toUInt64(1))", settings = [("user", user_name)], exitcode=exitcode, message=message)
 
-    with Scenario("user with privilege", setup=instrument_clickhouse_server_log):
-        dict_name = f"dict_{getuid()}"
-        table_name = f"table_{getuid()}"
+    with Scenario("user with privilege"):
 
         with dict_setup(node, table_name, dict_name):
 
             with When("I grant privilege"):
-                node.query(f"GRANT {privilege} ON {dict_name} TO {grant_target_name}")
+                node.query(f"GRANT {privilege} ON {on} TO {grant_target_name}")
 
             with Then("I attempt to dictIsIn with privilege"):
                 node.query(f"SELECT dictIsIn({dict_name},toUInt64(1),toUInt64(1))", settings = [("user", user_name)])
 
-    with Scenario("user with revoked privilege", setup=instrument_clickhouse_server_log):
-        dict_name = f"dict_{getuid()}"
+    with Scenario("user with revoked privilege"):
 
         with dict_setup(node, table_name, dict_name):
 
             with When("I grant privilege"):
-                node.query(f"GRANT {privilege} ON {dict_name} TO {grant_target_name}")
+                node.query(f"GRANT {privilege} ON {on} TO {grant_target_name}")
 
             with And("I revoke privilege"):
-                node.query(f"REVOKE {privilege} ON {dict_name} FROM {grant_target_name}")
+                node.query(f"REVOKE {privilege} ON {on} FROM {grant_target_name}")
 
             with When("I attempt to dictIsIn without privilege"):
                 node.query(f"SELECT dictIsIn({dict_name},toUInt64(1),toUInt64(1))", settings = [("user", user_name)], exitcode=exitcode, message=message)
@@ -507,8 +542,8 @@ def dictGetType_granted_directly(self, type, node=None):
         node = self.context.node
 
     with user(node, f"{user_name}"):
-        Suite(run=dictGetType_check, setup=instrument_clickhouse_server_log,
-            examples=Examples("privilege grant_target_name user_name type", [
+        Suite(run=dictGetType_check,
+            examples=Examples("privilege on grant_target_name user_name type", [
                 tuple(list(row)+[user_name,user_name,type]) for row in dictGetType_check.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
 
@@ -544,67 +579,76 @@ def dictGetType_granted_via_role(self, type, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(run=dictGetType_check, setup=instrument_clickhouse_server_log,
-            examples=Examples("privilege grant_target_name user_name type", [
+        Suite(run=dictGetType_check,
+            examples=Examples("privilege on grant_target_name user_name type", [
                 tuple(list(row)+[role_name,user_name,type]) for row in dictGetType_check.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
 
 @TestOutline(Suite)
-@Examples("privilege",[
-    ("dictGet",),
-    ("dictHas",),
-    ("dictGetHierarchy",),
-    ("dictIsIn",),
+@Examples("privilege on",[
+    ("ALL", "*.*"),
+    ("dictGet", "dict"),
+    ("dictHas", "dict"),
+    ("dictGetHierarchy", "dict"),
+    ("dictIsIn", "dict"),
 ])
 @Requirements(
     RQ_SRS_006_RBAC_dictGet_Type_RequiredPrivilege("1.0")
 )
-def dictGetType_check(self, privilege, grant_target_name, user_name, type, node=None):
+def dictGetType_check(self, privilege, on, grant_target_name, user_name, type, node=None):
     """Check that user is able to execute `dictGet` if and only if they have the necessary privileges.
     """
     if node is None:
         node = self.context.node
 
+    dict_name = f"dict_{getuid()}"
+    table_name = f"table_{getuid()}"
+
+    on = on.replace("dict", f"{dict_name}")
+
     exitcode, message = errors.not_enough_privileges(name=f"{user_name}")
 
-    with Scenario("user without privilege", setup=instrument_clickhouse_server_log):
-        dict_name = f"dict_{getuid()}"
-        table_name = f"table_{getuid()}"
+    with Scenario("user without privilege"):
 
         with dict_setup(node, table_name, dict_name, type):
 
-            with When("I attempt to dictGet without privilege"):
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I attempt to dictGet without privilege"):
                 node.query(f"SELECT dictGet{type}({dict_name},'z',toUInt64(1))", settings = [("user", user_name)], exitcode=exitcode, message=message)
 
-    with Scenario("user with privilege", setup=instrument_clickhouse_server_log):
-        dict_name = f"dict_{getuid()}"
-        table_name = f"table_{getuid()}"
+    with Scenario("user with privilege"):
 
         with dict_setup(node, table_name, dict_name, type):
 
             with When("I grant privilege"):
-                node.query(f"GRANT {privilege} ON {dict_name} TO {grant_target_name}")
+                node.query(f"GRANT {privilege} ON {on} TO {grant_target_name}")
 
             with Then("I attempt to dictGet with privilege"):
                 node.query(f"SELECT dictGet{type}({dict_name},'z',toUInt64(1))", settings = [("user", user_name)])
 
-    with Scenario("user with revoked privilege", setup=instrument_clickhouse_server_log):
-        dict_name = f"dict_{getuid()}"
+    with Scenario("user with revoked privilege"):
 
         with dict_setup(node, table_name, dict_name, type):
 
             with When("I grant privilege"):
-                node.query(f"GRANT {privilege} ON {dict_name} TO {grant_target_name}")
+                node.query(f"GRANT {privilege} ON {on} TO {grant_target_name}")
 
             with And("I revoke privilege"):
-                node.query(f"REVOKE {privilege} ON {dict_name} FROM {grant_target_name}")
+                node.query(f"REVOKE {privilege} ON {on} FROM {grant_target_name}")
 
             with When("I attempt to dictGet without privilege"):
                 node.query(f"SELECT dictGet{type}({dict_name},'z',toUInt64(1))", settings = [("user", user_name)], exitcode=exitcode, message=message)
 
 @TestFeature
 @Requirements(
-    RQ_SRS_006_RBAC_dictGet_Privilege("1.0")
+    RQ_SRS_006_RBAC_dictGet_Privilege("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 @Name("dictGet")
 def feature(self, node="clickhouse1", stress=None, parallel=None):
@@ -622,23 +666,23 @@ def feature(self, node="clickhouse1", stress=None, parallel=None):
         tasks = []
         try:
 
-            run_scenario(pool, tasks, Suite(test=dictGet_granted_directly))
-            run_scenario(pool, tasks, Suite(test=dictGet_granted_via_role))
-            run_scenario(pool, tasks, Suite(test=dictGetOrDefault_granted_directly))
-            run_scenario(pool, tasks, Suite(test=dictGetOrDefault_granted_via_role))
-            run_scenario(pool, tasks, Suite(test=dictHas_granted_directly))
-            run_scenario(pool, tasks, Suite(test=dictHas_granted_via_role))
-            run_scenario(pool, tasks, Suite(test=dictGetHierarchy_granted_directly))
-            run_scenario(pool, tasks, Suite(test=dictGetHierarchy_granted_via_role))
-            run_scenario(pool, tasks, Suite(test=dictIsIn_granted_directly))
-            run_scenario(pool, tasks, Suite(test=dictIsIn_granted_via_role))
+            run_scenario(pool, tasks, Suite(test=dictGet_granted_directly, setup=instrument_clickhouse_server_log))
+            run_scenario(pool, tasks, Suite(test=dictGet_granted_via_role, setup=instrument_clickhouse_server_log))
+            run_scenario(pool, tasks, Suite(test=dictGetOrDefault_granted_directly, setup=instrument_clickhouse_server_log))
+            run_scenario(pool, tasks, Suite(test=dictGetOrDefault_granted_via_role, setup=instrument_clickhouse_server_log))
+            run_scenario(pool, tasks, Suite(test=dictHas_granted_directly, setup=instrument_clickhouse_server_log))
+            run_scenario(pool, tasks, Suite(test=dictHas_granted_via_role, setup=instrument_clickhouse_server_log))
+            run_scenario(pool, tasks, Suite(test=dictGetHierarchy_granted_directly, setup=instrument_clickhouse_server_log))
+            run_scenario(pool, tasks, Suite(test=dictGetHierarchy_granted_via_role, setup=instrument_clickhouse_server_log))
+            run_scenario(pool, tasks, Suite(test=dictIsIn_granted_directly, setup=instrument_clickhouse_server_log))
+            run_scenario(pool, tasks, Suite(test=dictIsIn_granted_via_role, setup=instrument_clickhouse_server_log))
 
             for example in dictGetType_granted_directly.examples:
                 type, = example
 
                 with Example(example):
-                    run_scenario(pool, tasks, Suite(test=dictGetType_granted_directly),{"type" : type})
-                    run_scenario(pool, tasks, Suite(test=dictGetType_granted_via_role),{"type" : type})
+                    run_scenario(pool, tasks, Suite(test=dictGetType_granted_directly, setup=instrument_clickhouse_server_log),{"type" : type})
+                    run_scenario(pool, tasks, Suite(test=dictGetType_granted_via_role, setup=instrument_clickhouse_server_log),{"type" : type})
 
         finally:
             join(tasks)
diff --git a/tests/testflows/rbac/tests/privileges/distributed_table.py b/tests/testflows/rbac/tests/privileges/distributed_table.py
index 5b62448a446..ba001ea7f2c 100755
--- a/tests/testflows/rbac/tests/privileges/distributed_table.py
+++ b/tests/testflows/rbac/tests/privileges/distributed_table.py
@@ -69,6 +69,7 @@ def create(self):
     create_scenarios=[
     create_without_privilege,
     create_with_privilege_granted_directly_or_via_role,
+    create_with_all_privilege_granted_directly_or_via_role,
     ]
 
     for scenario in create_scenarios:
@@ -79,18 +80,30 @@ def create_without_privilege(self, node=None):
     """Check that user is unable to create a distributed table without privileges.
     """
     user_name = f"user_{getuid()}"
+
     table0_name = f"table0_{getuid()}"
     table1_name = f"table1_{getuid()}"
+
     exitcode, message = errors.not_enough_privileges(name=f"{user_name}")
+
     cluster = self.context.cluster_name
+
     if node is None:
         node = self.context.node
 
     with Given("I have a user"):
         user(name=user_name)
+
     with And("I have a table on a cluster"):
         table(name=table0_name, cluster=cluster)
-    with When("I attempt to create the distributed table without privilege"):
+
+    with When("I grant the user NONE privilege"):
+        node.query(f"GRANT NONE TO {user_name}")
+
+    with And("I grant the user USAGE privilege"):
+        node.query(f"GRANT USAGE ON *.* TO {user_name}")
+
+    with Then("I attempt to create the distributed table without privilege"):
         node.query(f"CREATE TABLE {table1_name} (a UInt64) ENGINE = Distributed(sharded_cluster, default, {table0_name}, rand())", settings = [("user", f"{user_name}")],
             exitcode=exitcode, message=message)
 
@@ -101,20 +114,25 @@ def create_with_privilege_granted_directly_or_via_role(self, node=None):
     """
     user_name = f"user_{getuid()}"
     role_name = f"role_{getuid()}"
+
     if node is None:
         node = self.context.node
 
     with Given("I have a user"):
         user(name=user_name)
+
     Scenario(test=create_with_privilege,
         name="create with privilege granted directly")(grant_target_name=user_name, user_name=user_name)
 
     with Given("I have a user"):
         user(name=user_name)
+
     with And("I have a role"):
         role(name=role_name)
+
     with When("I grant the role to the user"):
         node.query(f"GRANT {role_name} TO {user_name} ON CLUSTER one_shard_cluster")
+
     Scenario(test=create_with_privilege,
         name="create with privilege granted through a role")(grant_target_name=role_name, user_name=user_name)
 
@@ -138,20 +156,24 @@ def create_with_privilege(self, user_name, grant_target_name, node=None):
 
         with When("I grant create table privilege"):
             node.query(f"GRANT CREATE ON {table1_name} TO {grant_target_name}")
+
         with Then("I attempt to create the distributed table as the user"):
             node.query(f"CREATE TABLE {table1_name} (a UInt64) ENGINE = Distributed({cluster}, default, {table0_name}, rand())", settings = [("user", f"{user_name}")],
                 exitcode=exitcode, message=message)
 
         with When("I revoke the create table privilege"):
             node.query(f"REVOKE CREATE TABLE ON {table1_name} FROM {grant_target_name}")
+
         with And("I grant remote privilege"):
             node.query(f"GRANT REMOTE ON *.* to {grant_target_name}")
+
         with Then("I attempt to create the distributed table as the user"):
             node.query(f"CREATE TABLE {table1_name} (a UInt64) ENGINE = Distributed({cluster}, default, {table0_name}, rand())", settings = [("user", f"{user_name}")],
                 exitcode=exitcode, message=message)
 
         with When("I grant create table privilege"):
             node.query(f"GRANT CREATE ON {table1_name} TO {grant_target_name}")
+
         with Then("I attempt to create the distributed table as the user"):
             node.query(f"CREATE TABLE {table1_name} (a UInt64) ENGINE = Distributed({cluster}, default, {table0_name}, rand())", settings = [("user", f"{user_name}")])
 
@@ -159,6 +181,62 @@ def create_with_privilege(self, user_name, grant_target_name, node=None):
         with Finally("I drop the distributed table"):
             node.query(f"DROP TABLE IF EXISTS {table1_name}")
 
+@TestScenario
+def create_with_all_privilege_granted_directly_or_via_role(self, node=None):
+    """Check that user is able to create a distributed table if and only if
+    they have ALL privilege granted either directly or through a role.
+    """
+    user_name = f"user_{getuid()}"
+    role_name = f"role_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+
+    with Given("I have a user"):
+        user(name=user_name)
+
+    Scenario(test=create_with_privilege,
+        name="create with privilege granted directly")(grant_target_name=user_name, user_name=user_name)
+
+    with Given("I have a user"):
+        user(name=user_name)
+
+    with And("I have a role"):
+        role(name=role_name)
+
+    with When("I grant the role to the user"):
+        node.query(f"GRANT {role_name} TO {user_name} ON CLUSTER one_shard_cluster")
+
+    Scenario(test=create_with_privilege,
+        name="create with privilege granted through a role")(grant_target_name=role_name, user_name=user_name)
+
+@TestOutline
+def create_with_privilege(self, user_name, grant_target_name, node=None):
+    """Grant ALL privilege and check the user is able is create the table.
+    """
+    table0_name = f"table0_{getuid()}"
+    table1_name = f"table1_{getuid()}"
+
+    exitcode, message = errors.not_enough_privileges(name=f"{user_name}")
+    cluster = self.context.cluster_name
+
+    if node is None:
+        node = self.context.node
+
+    try:
+        with Given("I have a table on a cluster"):
+            table(name=table0_name, cluster=cluster)
+
+        with When("I grant ALL privilege"):
+            node.query(f"GRANT ALL ON *.* TO {grant_target_name}")
+
+        with Then("I create the distributed table as the user"):
+            node.query(f"CREATE TABLE {table1_name} (a UInt64) ENGINE = Distributed({cluster}, default, {table0_name}, rand())", settings = [("user", f"{user_name}")])
+
+    finally:
+        with Finally("I drop the distributed table"):
+            node.query(f"DROP TABLE IF EXISTS {table1_name}")
+
 @TestSuite
 @Requirements(
     RQ_SRS_006_RBAC_DistributedTable_Select("1.0"),
@@ -169,6 +247,7 @@ def select(self):
     select_scenarios = [
         select_without_privilege,
         select_with_privilege_granted_directly_or_via_role,
+        select_with_all_privilege_granted_directly_or_via_role
     ]
 
     for scenario in select_scenarios:
@@ -191,11 +270,19 @@ def select_without_privilege(self, node=None):
     try:
         with Given("I have a user"):
             user(name=user_name)
+
         with And("I have a table on a cluster"):
             table(name=table0_name, cluster=cluster)
+
         with And("I have a distributed table"):
             node.query(f"CREATE TABLE {table1_name} (a UInt64) ENGINE = Distributed({cluster}, default, {table0_name}, rand())")
 
+        with When("I grant the user NONE privilege"):
+            node.query(f"GRANT NONE TO {user_name}")
+
+        with And("I grant the user USAGE privilege"):
+            node.query(f"GRANT USAGE ON *.* TO {user_name}")
+
         with Then("I attempt to select from the distributed table as the user"):
             node.query(f"SELECT * FROM {table1_name}", settings = [("user", f"{user_name}")],
                 exitcode=exitcode, message=message)
@@ -222,8 +309,10 @@ def select_with_privilege_granted_directly_or_via_role(self, node=None):
 
     with Given("I have a user"):
         user(name=user_name)
+
     with And("I have a role"):
         role(name=role_name)
+
     with When("I grant the role to the user"):
         node.query(f"GRANT {role_name} TO {user_name} ON CLUSTER one_shard_cluster")
 
@@ -247,25 +336,89 @@ def select_with_privilege(self, user_name, grant_target_name, node=None):
     try:
         with Given("I have a table on a cluster"):
             table(name=table0_name, cluster=cluster)
+
         with And("I have a distributed table"):
             node.query(f"CREATE TABLE {table1_name} (a UInt64) ENGINE = Distributed({cluster}, default, {table0_name}, rand())")
 
         with When("I grant select privilege on the distributed table"):
             node.query(f"GRANT SELECT ON {table1_name} TO {grant_target_name}")
+
         with Then("I attempt to select from the distributed table as the user"):
             node.query(f"SELECT * FROM {table1_name}", settings = [("user", f"{user_name}")],
                 exitcode=exitcode, message=message)
 
         with When("I revoke select privilege on the distributed table"):
             node.query(f"REVOKE SELECT ON {table1_name} FROM {grant_target_name}")
+
         with And("I grant select privilege on the table used by the distributed table"):
             node.query(f"GRANT SELECT ON {table0_name} to {grant_target_name}")
+
         with Then("I attempt to select from the distributed table as the user"):
             node.query(f"SELECT * FROM {table1_name}", settings = [("user", f"{user_name}")],
                 exitcode=exitcode, message=message)
 
         with When("I grant the user select privilege on the distributed table"):
             node.query(f"GRANT SELECT ON {table1_name} TO {grant_target_name}")
+
+        with Then("I attempt to select from the distributed table as the user"):
+            node.query(f"SELECT * FROM {table1_name}", settings = [("user", f"{user_name}")])
+
+    finally:
+        with Finally("I drop the distributed table"):
+            node.query(f"DROP TABLE IF EXISTS {table1_name}")
+
+@TestScenario
+def select_with_all_privilege_granted_directly_or_via_role(self, node=None):
+    """Check that user is able to select from a distributed table if and only if
+    they have ALL privilege.
+    """
+    user_name = f"user_{getuid()}"
+    role_name = f"role_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+
+    with Given("I have a user"):
+        user(name=user_name)
+
+    Scenario(test=select_with_privilege,
+        name="select with privilege granted directly")(grant_target_name=user_name, user_name=user_name)
+
+    with Given("I have a user"):
+        user(name=user_name)
+
+    with And("I have a role"):
+        role(name=role_name)
+
+    with When("I grant the role to the user"):
+        node.query(f"GRANT {role_name} TO {user_name} ON CLUSTER one_shard_cluster")
+
+    Scenario(test=select_with_privilege,
+        name="select with privilege granted through a role")(grant_target_name=role_name, user_name=user_name)
+
+@TestOutline
+def select_with_privilege(self, user_name, grant_target_name, node=None):
+    """Grant ALL and check the user is able to select from the distributed table.
+    """
+    table0_name = f"table0_{getuid()}"
+    table1_name = f"table1_{getuid()}"
+
+    exitcode, message = errors.not_enough_privileges(name=f"{user_name}")
+    cluster = self.context.cluster_name
+
+    if node is None:
+        node = self.context.node
+
+    try:
+        with Given("I have a table on a cluster"):
+            table(name=table0_name, cluster=cluster)
+
+        with And("I have a distributed table"):
+            node.query(f"CREATE TABLE {table1_name} (a UInt64) ENGINE = Distributed({cluster}, default, {table0_name}, rand())")
+
+        with When("I grant ALL privilege"):
+            node.query(f"GRANT ALL ON *.* TO {grant_target_name}")
+
         with Then("I attempt to select from the distributed table as the user"):
             node.query(f"SELECT * FROM {table1_name}", settings = [("user", f"{user_name}")])
 
@@ -293,10 +446,12 @@ def insert_without_privilege(self, node=None):
     """Check that user is unable to insert into a distributed table without privileges.
     """
     user_name = f"user_{getuid()}"
+
     table0_name = f"table0_{getuid()}"
     table1_name = f"table1_{getuid()}"
 
     exitcode, message = errors.not_enough_privileges(name=f"{user_name}")
+
     cluster = self.context.cluster_name
 
     if node is None:
@@ -305,11 +460,19 @@ def insert_without_privilege(self, node=None):
     try:
         with Given("I have a user"):
             user(name=user_name)
+
         with And("I have a table on a cluster"):
             table(name=table0_name, cluster=cluster)
+
         with And("I have a distributed table"):
             node.query(f"CREATE TABLE {table1_name} (a UInt64) ENGINE = Distributed({cluster}, default, {table0_name}, rand())")
 
+        with When("I grant the user NONE privilege"):
+            node.query(f"GRANT NONE TO {user_name}")
+
+        with And("I grant the user USAGE privilege"):
+            node.query(f"GRANT USAGE ON *.* TO {user_name}")
+
         with Then("I attempt to insert into the distributed table as the user"):
             node.query(f"INSERT INTO {table1_name} VALUES (8888)", settings = [("user", f"{user_name}")],
                 exitcode=exitcode, message=message)
@@ -336,8 +499,10 @@ def insert_with_privilege_granted_directly_or_via_role(self, node=None):
 
     with Given("I have a user"):
         user(name=user_name)
+
     with And("I have a role"):
         role(name=role_name)
+
     with When("I grant the role to the user"):
         node.query(f"GRANT {role_name} TO {user_name} ON CLUSTER one_shard_cluster")
 
@@ -361,25 +526,43 @@ def insert_with_privilege(self, user_name, grant_target_name, node=None):
     try:
         with Given("I have a table on a cluster"):
             table(name=table0_name, cluster=cluster)
+
         with And("I have a distributed table"):
             node.query(f"CREATE TABLE {table1_name} (a UInt64) ENGINE = Distributed({cluster}, default, {table0_name}, rand())")
 
         with When("I grant insert privilege on the distributed table"):
             node.query(f"GRANT INSERT ON {table1_name} TO {grant_target_name}")
+
         with Then("I attempt to insert into the distributed table as the user"):
             node.query(f"INSERT INTO {table1_name} VALUES (8888)", settings = [("user", f"{user_name}")],
                 exitcode=exitcode, message=message)
 
         with When("I revoke the insert privilege on the distributed table"):
             node.query(f"REVOKE INSERT ON {table1_name} FROM {grant_target_name}")
+
         with And("I grant insert privilege on the table used by the distributed table"):
             node.query(f"GRANT INSERT ON {table0_name} to {grant_target_name}")
+
         with Then("I attempt to insert into the distributed table as the user"):
             node.query(f"INSERT INTO {table1_name} VALUES (8888)", settings = [("user", f"{user_name}")],
                 exitcode=exitcode, message=message)
 
         with When("I grant insert privilege on the distributed table"):
             node.query(f"GRANT INSERT ON {table1_name} TO {grant_target_name}")
+
+        with Then("I attempt to insert into the distributed table as the user"):
+            node.query(f"INSERT INTO {table1_name} VALUES (8888)", settings = [("user", f"{user_name}")])
+
+        with When("I revoke ALL privileges"):
+            node.query(f"REVOKE ALL ON *.* FROM {grant_target_name}")
+
+        with Then("I attempt to insert into the distributed table as the user"):
+            node.query(f"INSERT INTO {table1_name} VALUES (8888)", settings = [("user", f"{user_name}")],
+                exitcode=exitcode, message=message)
+
+        with When("I grant ALL privilege"):
+            node.query(f"GRANT ALL ON *.* To {grant_target_name}")
+
         with Then("I attempt to insert into the distributed table as the user"):
             node.query(f"INSERT INTO {table1_name} VALUES (8888)", settings = [("user", f"{user_name}")])
 
@@ -426,8 +609,10 @@ def select_with_table_on_materialized_view_privilege_granted_directly_or_via_rol
 
     with Given("I have a user"):
         user(name=user_name)
+
     with And("I have a role"):
         role(name=role_name)
+
     with When("I grant the role to the user"):
         node.query(f"GRANT {role_name} TO {user_name} ON CLUSTER one_shard_cluster")
 
@@ -452,33 +637,63 @@ def select_with_table_on_materialized_view(self, user_name, grant_target_name, n
     try:
         with Given("I have a table on a cluster"):
             table(name=table0_name, cluster=cluster)
+
         with And("I have a materialized view on a cluster"):
             node.query(f"CREATE MATERIALIZED VIEW {view_name} ON CLUSTER {cluster} ENGINE = Memory() AS SELECT * FROM {table0_name}")
+
         with And("I have a distributed table on the materialized view"):
             node.query(f"CREATE TABLE {table1_name} (a UInt64) ENGINE = Distributed({cluster}, default, {view_name}, rand())")
 
+        with When("I grant the user NONE privilege"):
+            node.query(f"GRANT NONE TO {grant_target_name}")
+
+        with And("I grant the user USAGE privilege"):
+            node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+        with Then("I attempt to select from the distributed table as the user"):
+            node.query(f"SELECT * FROM {table1_name}", settings = [("user", f"{user_name}")],
+                exitcode=exitcode, message=message)
+
         with When("I grant select privilege on the distributed table"):
             node.query(f"GRANT SELECT ON {table1_name} TO {grant_target_name}")
+
         with Then("I attempt to select from the distributed table as the user"):
             node.query(f"SELECT * FROM {table1_name}", settings = [("user", f"{user_name}")],
                 exitcode=exitcode, message=message)
 
         with When("I revoke the select privilege on the distributed table"):
             node.query(f"REVOKE SELECT ON {table1_name} FROM {grant_target_name}")
+
         with And("I grant select privilege on the materialized view"):
             node.query(f"GRANT SELECT ON {view_name} to {grant_target_name}")
+
         with Then("I attempt to select from the distributed table as the user"):
             node.query(f"SELECT * FROM {table1_name}", settings = [("user", f"{user_name}")],
                 exitcode=exitcode, message=message)
 
         with When("I grant select privilege on the distributed table"):
             node.query(f"GRANT SELECT ON {table1_name} TO {grant_target_name}")
+
+        with Then("I attempt to select from the distributed table as the user"):
+            node.query(f"SELECT * FROM {table1_name}", settings = [("user", f"{user_name}")])
+
+        with When("I revoke ALL privileges"):
+            node.query(f"REVOKE ALL ON *.* FROM {grant_target_name}")
+
+        with Then("I attempt to select from the distributed table as the user"):
+            node.query(f"SELECT * FROM {table1_name}", settings = [("user", f"{user_name}")],
+                exitcode=exitcode, message=message)
+
+        with When("I grant ALL privilege"):
+            node.query(f"GRANT ALL ON *.* To {grant_target_name}")
+
         with Then("I attempt to select from the distributed table as the user"):
             node.query(f"SELECT * FROM {table1_name}", settings = [("user", f"{user_name}")])
 
     finally:
         with Finally("I drop the distributed table"):
             node.query(f"DROP TABLE IF EXISTS {table1_name}")
+
         with And("I drop the view"):
             node.query(f"DROP VIEW IF EXISTS {view_name}")
 
@@ -501,8 +716,10 @@ def select_with_table_on_source_table_of_materialized_view_privilege_granted_dir
 
     with Given("I have a user"):
         user(name=user_name)
+
     with And("I have a role"):
         role(name=role_name)
+
     with When("I grant the role to the user"):
         node.query(f"GRANT {role_name} TO {user_name} ON CLUSTER one_shard_cluster")
 
@@ -527,33 +744,53 @@ def select_with_table_on_source_table_of_materialized_view(self, user_name, gran
     try:
         with Given("I have a table on a cluster"):
             table(name=table0_name, cluster=cluster)
+
         with And("I have a materialized view on a cluster"):
             node.query(f"CREATE MATERIALIZED VIEW {view_name} ON CLUSTER {cluster} ENGINE = Memory() AS SELECT * FROM {table0_name}")
+
         with And("I have a distributed table using the source table of the materialized view"):
             node.query(f"CREATE TABLE {table1_name} (a UInt64) ENGINE = Distributed({cluster}, default, {table0_name}, rand())")
 
         with When("I grant select privilege on the distributed table"):
             node.query(f"GRANT SELECT ON {table1_name} TO {grant_target_name}")
+
         with Then("I attempt to select from the distributed table as the user"):
             node.query(f"SELECT * FROM {table1_name}", settings = [("user", f"{user_name}")],
                 exitcode=exitcode, message=message)
 
         with When("I revoke select privilege on the distributed table"):
             node.query(f"REVOKE SELECT ON {table1_name} FROM {grant_target_name}")
+
         with And("I grant select privilege on the source table"):
             node.query(f"GRANT SELECT ON {table0_name} to {grant_target_name}")
+
         with Then("I attempt to select from the distributed table as the user"):
             node.query(f"SELECT * FROM {table1_name}", settings = [("user", f"{user_name}")],
                 exitcode=exitcode, message=message)
 
         with When("I grant select privilege on the distributed table"):
             node.query(f"GRANT SELECT ON {table1_name} TO {grant_target_name}")
+
+        with Then("I attempt to select from the distributed table as the user"):
+            node.query(f"SELECT * FROM {table1_name}", settings = [("user", f"{user_name}")])
+
+        with When("I revoke ALL privileges"):
+            node.query(f"REVOKE ALL ON *.* FROM {grant_target_name}")
+
+        with Then("I attempt to select from the distributed table as the user"):
+            node.query(f"SELECT * FROM {table1_name}", settings = [("user", f"{user_name}")],
+                exitcode=exitcode, message=message)
+
+        with When("I grant ALL privilege"):
+            node.query(f"GRANT ALL ON *.* To {grant_target_name}")
+
         with Then("I attempt to select from the distributed table as the user"):
             node.query(f"SELECT * FROM {table1_name}", settings = [("user", f"{user_name}")])
 
     finally:
         with Finally("I drop the distributed table"):
             node.query(f"DROP TABLE IF EXISTS {table1_name}")
+
         with And("I drop the view"):
             node.query(f"DROP VIEW IF EXISTS {view_name}")
 
@@ -576,8 +813,10 @@ def select_with_table_on_distributed_table_privilege_granted_directly_or_via_rol
 
     with Given("I have a user"):
         user(name=user_name)
+
     with And("I have a role"):
         role(name=role_name)
+
     with When("I grant the role to the user"):
         node.query(f"GRANT {role_name} TO {user_name} ON CLUSTER one_shard_cluster")
 
@@ -602,26 +841,47 @@ def select_with_table_on_distributed_table(self, user_name, grant_target_name, n
     try:
         with Given("I have a table on a cluster"):
             table(name=table0_name, cluster=cluster)
+
         with And("I have a distributed table on a cluster"):
             node.query(f"CREATE TABLE {table1_name} ON CLUSTER {cluster} (a UInt64) ENGINE = Distributed({cluster}, default, {table0_name}, rand())")
+
         with And("I have a distributed table on that distributed table"):
             node.query(f"CREATE TABLE {table2_name} (a UInt64) ENGINE = Distributed({cluster}, default, {table1_name}, rand())")
 
         for permutation in permutations(table_count=3):
+
             with grant_select_on_table(node, permutation, grant_target_name, table0_name, table1_name, table2_name) as tables_granted:
+
                 with When(f"permutation={permutation}, tables granted = {tables_granted}"):
+
                     with Then("I attempt to select from the distributed table as the user"):
                         node.query(f"SELECT * FROM {table2_name}", settings = [("user", f"{user_name}")],
                             exitcode=exitcode, message=message)
 
         with When("I grant select on all tables"):
+
             with grant_select_on_table(node, max(permutations(table_count=3))+1, grant_target_name, table0_name, table1_name, table2_name):
+
                 with Then("I attempt to select from the distributed table as the user"):
                         node.query(f"SELECT * FROM {table2_name}", settings = [("user", f"{user_name}")])
 
+        with When("I revoke ALL privileges"):
+            node.query(f"REVOKE ALL ON *.* FROM {grant_target_name}")
+
+        with Then("I attempt to select from the distributed table as the user"):
+                node.query(f"SELECT * FROM {table2_name}", settings = [("user", f"{user_name}")],
+                    exitcode=exitcode, message=message)
+
+        with When("I grant ALL privilege"):
+            node.query(f"GRANT ALL ON *.* To {grant_target_name}")
+
+        with Then("I attempt to select from the distributed table as the user"):
+                node.query(f"SELECT * FROM {table2_name}", settings = [("user", f"{user_name}")])
+
     finally:
         with Finally("I drop the first distributed table"):
             node.query(f"DROP TABLE IF EXISTS {table1_name}")
+
         with And("I drop the other distributed table"):
             node.query(f"DROP TABLE IF EXISTS {table2_name}")
 
@@ -644,8 +904,10 @@ def insert_with_table_on_materialized_view_privilege_granted_directly_or_via_rol
 
     with Given("I have a user"):
         user(name=user_name)
+
     with And("I have a role"):
         role(name=role_name)
+
     with When("I grant the role to the user"):
         node.query(f"GRANT {role_name} TO {user_name} ON CLUSTER one_shard_cluster")
 
@@ -671,35 +933,56 @@ def insert_with_table_on_materialized_view(self, user_name, grant_target_name, n
     try:
         with Given(f"I have a table on cluster {cluster}"):
             table(name=table0_name, cluster=cluster)
+
         with And("I have another table on the same cluster"):
             table(name=table1_name, cluster=cluster)
+
         with And("I have a materialized view on a cluster"):
             node.query(f"CREATE MATERIALIZED VIEW {view_name} ON CLUSTER {cluster} TO {table0_name} AS SELECT * FROM {table1_name}")
+
         with And("I have a distributed table on the materialized view"):
             node.query(f"CREATE TABLE {table2_name} (a UInt64) ENGINE = Distributed({cluster}, default, {view_name}, rand())")
 
         with When("I grant insert privilege on the distributed table"):
             node.query(f"GRANT INSERT ON {table2_name} TO {grant_target_name}")
+
         with Then("I attempt to insert into the distributed table as the user"):
             node.query(f"INSERT INTO {table2_name} VALUES (8888)", settings = [("user", f"{user_name}")],
                 exitcode=exitcode, message=message)
 
         with When("I revoke the insert privilege on the distributed table"):
             node.query(f"REVOKE INSERT ON {table2_name} FROM {grant_target_name}")
+
         with And("I grant insert privilege on the view"):
             node.query(f"GRANT INSERT ON {view_name} to {grant_target_name}")
+
         with Then("I attempt insert into the distributed table as the user"):
             node.query(f"INSERT INTO {table2_name} VALUES (8888)", settings = [("user", f"{user_name}")],
                 exitcode=exitcode, message=message)
 
         with When("I grant insert privilege on the distributed table"):
             node.query(f"GRANT INSERT ON {table2_name} TO {grant_target_name}")
+
+        with Then("I attempt to insert into the distributed table as the user"):
+            node.query(f"INSERT INTO {table2_name} VALUES (8888)", settings = [("user", f"{user_name}")])
+
+        with When("I revoke ALL privileges"):
+            node.query(f"REVOKE ALL ON *.* FROM {grant_target_name}")
+
+        with Then("I attempt insert into the distributed table as the user"):
+            node.query(f"INSERT INTO {table2_name} VALUES (8888)", settings = [("user", f"{user_name}")],
+                exitcode=exitcode, message=message)
+
+        with When("I grant ALL privilege"):
+            node.query(f"GRANT ALL ON *.* To {grant_target_name}")
+
         with Then("I attempt to insert into the distributed table as the user"):
             node.query(f"INSERT INTO {table2_name} VALUES (8888)", settings = [("user", f"{user_name}")])
 
     finally:
         with Finally("I drop the distributed table"):
             node.query(f"DROP TABLE IF EXISTS {table2_name}")
+
         with And("I drop the view"):
             node.query(f"DROP VIEW IF EXISTS {view_name}")
 
@@ -722,8 +1005,10 @@ def insert_with_table_on_source_table_of_materialized_view_privilege_granted_dir
 
     with Given("I have a user"):
         user(name=user_name)
+
     with And("I have a role"):
         role(name=role_name)
+
     with When("I grant the role to the user"):
         node.query(f"GRANT {role_name} TO {user_name} ON CLUSTER one_shard_cluster")
 
@@ -748,33 +1033,53 @@ def insert_with_table_on_source_table_of_materialized_view(self, user_name, gran
     try:
         with Given("I have a table on a cluster"):
             table(name=table0_name, cluster=cluster)
+
         with And("I have a materialized view on a cluster"):
             node.query(f"CREATE MATERIALIZED VIEW {view_name} ON CLUSTER {cluster} ENGINE = Memory() AS SELECT * FROM {table0_name}")
+
         with And("I have a distributed table on the materialized view"):
             node.query(f"CREATE TABLE {table1_name} (a UInt64) ENGINE = Distributed({cluster}, default, {table0_name}, rand())")
 
         with When("I grant insert privilege on the distributed table"):
             node.query(f"GRANT INSERT ON {table1_name} TO {grant_target_name}")
+
         with Then("I attempt to insert into the distributed table as the user"):
             node.query(f"INSERT INTO {table1_name} VALUES (8888)", settings = [("user", f"{user_name}")],
                 exitcode=exitcode, message=message)
 
         with When("I revoke insert privilege on the distributed table"):
             node.query(f"REVOKE INSERT ON {table1_name} FROM {grant_target_name}")
+
         with And("I grant insert privilege on the source table"):
             node.query(f"GRANT INSERT ON {table0_name} to {grant_target_name}")
+
         with Then("I attempt insert into the distributed table as the user"):
             node.query(f"INSERT INTO {table1_name} VALUES (8888)", settings = [("user", f"{user_name}")],
                 exitcode=exitcode, message=message)
 
         with When("I grant insert privilege on the distributed table"):
             node.query(f"GRANT INSERT ON {table1_name} TO {grant_target_name}")
+
+        with Then("I attempt to insert into the distributed table as the user"):
+            node.query(f"INSERT INTO {table1_name} VALUES (8888)", settings = [("user", f"{user_name}")])
+
+        with When("I revoke ALL privileges"):
+            node.query(f"REVOKE ALL ON *.* FROM {grant_target_name}")
+
+        with Then("I attempt insert into the distributed table as the user"):
+            node.query(f"INSERT INTO {table1_name} VALUES (8888)", settings = [("user", f"{user_name}")],
+                exitcode=exitcode, message=message)
+
+        with When("I grant ALL privilege"):
+            node.query(f"GRANT ALL ON *.* To {grant_target_name}")
+
         with Then("I attempt to insert into the distributed table as the user"):
             node.query(f"INSERT INTO {table1_name} VALUES (8888)", settings = [("user", f"{user_name}")])
 
     finally:
         with Finally("I drop the distributed table"):
             node.query(f"DROP TABLE IF EXISTS {table1_name}")
+
         with And("I drop the view"):
             node.query(f"DROP VIEW IF EXISTS {view_name}")
 
@@ -797,8 +1102,10 @@ def insert_with_table_on_distributed_table_privilege_granted_directly_or_via_rol
 
     with Given("I have a user"):
         user(name=user_name)
+
     with And("I have a role"):
         role(name=role_name)
+
     with When("I grant the role to the user"):
         node.query(f"GRANT {role_name} TO {user_name} ON CLUSTER one_shard_cluster")
 
@@ -823,47 +1130,70 @@ def insert_with_table_on_distributed_table(self, user_name, grant_target_name, n
     try:
         with Given("I have a table on a cluster"):
             table(name=table0_name, cluster=cluster)
+
         with And("I have a distributed table on a cluster"):
             node.query(f"CREATE TABLE {table1_name} ON CLUSTER {cluster} (a UInt64) ENGINE = Distributed({cluster}, default, {table0_name}, rand())")
+
         with And("I have a distributed table on that distributed table"):
             node.query(f"CREATE TABLE {table2_name} (a UInt64) ENGINE = Distributed({cluster}, default, {table1_name}, rand())")
 
         with When("I grant insert privilege on the outer distributed table"):
             node.query(f"GRANT INSERT ON {table2_name} TO {grant_target_name}")
+
         with Then("I attempt to insert into the outer distributed table as the user"):
             node.query(f"INSERT INTO {table2_name} VALUES (8888)", settings = [("user", f"{user_name}")],
                 exitcode=exitcode, message=message)
 
         with When("I revoke the insert privilege on the outer distributed table"):
             node.query(f"REVOKE INSERT ON {table2_name} FROM {grant_target_name}")
+
         with And("I grant insert privilege on the inner distributed table"):
             node.query(f"GRANT INSERT ON {table1_name} to {grant_target_name}")
+
         with Then("I attempt insert into the outer distributed table as the user"):
             node.query(f"INSERT INTO {table2_name} VALUES (8888)", settings = [("user", f"{user_name}")],
                 exitcode=exitcode, message=message)
 
         with When("I revoke the insert privilege on the inner distributed table"):
             node.query(f"REVOKE INSERT ON {table1_name} FROM {grant_target_name}")
+
         with And("I grant insert privilege on the innermost table"):
             node.query(f"GRANT INSERT ON {table0_name} to {grant_target_name}")
+
         with Then("I attempt insert into the outer distributed table as the user"):
             node.query(f"INSERT INTO {table2_name} VALUES (8888)", settings = [("user", f"{user_name}")],
                 exitcode=exitcode, message=message)
 
         with When("I grant insert privilege on the inner distributed table"):
             node.query(f"GRANT INSERT ON {table1_name} to {grant_target_name}")
+
         with Then("I attempt insert into the outer distributed table as the user"):
             node.query(f"INSERT INTO {table2_name} VALUES (8888)", settings = [("user", f"{user_name}")],
                 exitcode=exitcode, message=message)
 
         with When("I grant insert privilege on the outer distributed table"):
             node.query(f"GRANT INSERT ON {table2_name} to {grant_target_name}")
+
+        with Then("I attempt insert into the outer distributed table as the user"):
+            node.query(f"INSERT INTO {table2_name} VALUES (8888)", settings = [("user", f"{user_name}")])
+
+        with When("I revoke ALL privileges"):
+            node.query(f"REVOKE ALL ON *.* FROM {grant_target_name}")
+
+        with Then("I attempt insert into the outer distributed table as the user"):
+            node.query(f"INSERT INTO {table2_name} VALUES (8888)", settings = [("user", f"{user_name}")],
+                exitcode=exitcode, message=message)
+
+        with When("I grant ALL privilege"):
+            node.query(f"GRANT ALL ON *.* To {grant_target_name}")
+
         with Then("I attempt insert into the outer distributed table as the user"):
             node.query(f"INSERT INTO {table2_name} VALUES (8888)", settings = [("user", f"{user_name}")])
 
     finally:
         with Finally("I drop the outer distributed table"):
             node.query(f"DROP TABLE IF EXISTS {table1_name}")
+
         with And("I drop the inner distributed table"):
             node.query(f"DROP TABLE IF EXISTS {table2_name}")
 
@@ -882,6 +1212,7 @@ def local_user(self, cluster, node=None):
     is able to execute queries they have privileges to.
     """
     user_name = f"user_{getuid()}"
+
     table0_name = f"table0_{getuid()}"
     table1_name = f"table1_{getuid()}"
 
@@ -891,22 +1222,35 @@ def local_user(self, cluster, node=None):
     try:
         with Given("I have a user on one node"):
             node.query(f"CREATE USER {user_name}")
+
         with And("I have a table on a cluster"):
             table(name=table0_name, cluster=cluster)
+
         with And("I have a distributed table"):
             node.query(f"CREATE TABLE {table1_name} (a UInt64) ENGINE = Distributed({cluster}, default, {table0_name}, rand())")
 
         with When("I grant select privilege on the distributed table"):
             node.query(f"GRANT SELECT ON {table1_name} TO {user_name}")
+
         with And("I grant select privilege on the other table"):
             node.query(f"GRANT SELECT ON {table0_name} TO {user_name}")
 
         with Then("I select from the distributed table as the user"):
             node.query(f"SELECT * FROM {table1_name}", settings = [("user", f"{user_name}")])
 
+        with When("I revoke ALL privileges"):
+            node.query(f"REVOKE ALL ON *.* FROM {user_name}")
+
+        with And("I grant ALL privilege"):
+            node.query(f"GRANT ALL ON *.* To {user_name}")
+
+        with Then("I select from the distributed table as the user"):
+            node.query(f"SELECT * FROM {table1_name}", settings = [("user", f"{user_name}")])
+
     finally:
         with Finally("I drop the user"):
             node.query(f"DROP USER IF EXISTS {user_name}")
+
         with And("I drop the distributed table"):
             node.query(f"DROP TABLE IF EXISTS {table1_name}")
 
@@ -919,8 +1263,10 @@ def multiple_node_user(self, node=None):
     if and only if they have the required privileges on the node they are executing the query from.
     """
     user_name = f"user_{getuid()}"
+
     table0_name = f"table0_{getuid()}"
     table1_name = f"table1_{getuid()}"
+
     exitcode, message = errors.not_enough_privileges(name=f"{user_name}")
 
     if node is None:
@@ -931,13 +1277,16 @@ def multiple_node_user(self, node=None):
     try:
         with Given("I have a user on a cluster with two nodes"):
             node.query(f"CREATE USER {user_name} ON CLUSTER sharded_cluster12")
+
         with And("I have a table on a cluster"):
             table(name=table0_name, cluster="sharded_cluster12")
+
         with And("I have a distributed table"):
             node.query(f"CREATE TABLE {table1_name} ON CLUSTER sharded_cluster12 (a UInt64) ENGINE = Distributed(sharded_cluster12, default, {table0_name}, rand())")
 
         with When("I grant select privilege on the distributed table on one node"):
             node.query(f"GRANT SELECT ON {table1_name} TO {user_name}")
+
         with And("I grant select privilege on the other table on one node"):
             node.query(f"GRANT SELECT ON {table0_name} TO {user_name}")
 
@@ -951,6 +1300,7 @@ def multiple_node_user(self, node=None):
     finally:
         with Finally("I drop the user"):
             node.query(f"DROP USER IF EXISTS {user_name}")
+
         with And("I drop the distributed table"):
             node.query(f"DROP TABLE IF EXISTS {table1_name}")
 
@@ -973,13 +1323,19 @@ def cluster_tests(self, cluster, node=None):
     pool = Pool(3)
 
     try:
-        for suite in loads(current_module(), Suite):
-            run_scenario(pool, tasks, Suite(test=suite))
+        try:
+            for suite in loads(current_module(), Suite):
+                run_scenario(pool, tasks, Suite(test=suite))
+        finally:
+            join(tasks)
     finally:
-        join(tasks)
-
+        pool.close()
 
 @TestFeature
+@Requirements(
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
+)
 @Name("distributed table")
 def feature(self, node="clickhouse1"):
     """Check the RBAC functionality of queries executed using distributed tables.
@@ -992,9 +1348,13 @@ def feature(self, node="clickhouse1"):
     pool = Pool(3)
 
     try:
-        run_scenario(pool, tasks, Feature(test=cluster_tests))
-        run_scenario(pool, tasks, Scenario(test=local_user))
-        run_scenario(pool, tasks, Scenario(test=multiple_node_user))
+        try:
+            run_scenario(pool, tasks, Feature(test=cluster_tests))
+            run_scenario(pool, tasks, Scenario(test=local_user))
+            run_scenario(pool, tasks, Scenario(test=multiple_node_user))
 
+        finally:
+            join(tasks)
     finally:
-        join(tasks)
+        pool.close()
+
diff --git a/tests/testflows/rbac/tests/privileges/drop/drop_database.py b/tests/testflows/rbac/tests/privileges/drop/drop_database.py
index fd31b8d5411..274003e763f 100644
--- a/tests/testflows/rbac/tests/privileges/drop/drop_database.py
+++ b/tests/testflows/rbac/tests/privileges/drop/drop_database.py
@@ -12,13 +12,13 @@ def privilege_granted_directly_or_via_role(self, node=None):
     if node is None:
         node = self.context.node
 
-    with Suite("user with direct privilege", setup=instrument_clickhouse_server_log):
+    with Suite("user with direct privilege"):
         with user(node, user_name):
 
             with When(f"I run checks that {user_name} is only able to execute DROP DATABASE with required privileges"):
                 privilege_check(grant_target_name=user_name, user_name=user_name, node=node)
 
-    with Suite("user with privilege via role", setup=instrument_clickhouse_server_log):
+    with Suite("user with privilege via role"):
         with user(node, user_name), role(node, role_name):
 
             with When("I grant the role to the user"):
@@ -32,21 +32,27 @@ def privilege_check(grant_target_name, user_name, node=None):
     """
     exitcode, message = errors.not_enough_privileges(name=f"{user_name}")
 
-    with Scenario("user without privilege", setup=instrument_clickhouse_server_log):
+    with Scenario("user without privilege"):
         db_name = f"db_{getuid()}"
 
         try:
             with Given("I have a database"):
                 node.query(f"CREATE DATABASE {db_name}")
 
-            with When("I attempt to drop the database"):
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I attempt to drop the database"):
                 node.query(f"DROP DATABASE {db_name}", settings = [("user", user_name)],
                     exitcode=exitcode, message=message)
         finally:
             with Finally("I drop the database"):
                 node.query(f"DROP DATABASE IF EXISTS {db_name}")
 
-    with Scenario("user with privilege", setup=instrument_clickhouse_server_log):
+    with Scenario("user with privilege"):
         db_name = f"db_{getuid()}"
 
         try:
@@ -63,7 +69,7 @@ def privilege_check(grant_target_name, user_name, node=None):
             with Finally("I drop the database"):
                 node.query(f"DROP DATABASE IF EXISTS {db_name}")
 
-    with Scenario("user with revoked privilege", setup=instrument_clickhouse_server_log):
+    with Scenario("user with revoked privilege"):
         db_name = f"db_{getuid()}"
 
         try:
@@ -84,9 +90,49 @@ def privilege_check(grant_target_name, user_name, node=None):
             with Finally("I drop the database"):
                 node.query(f"DROP DATABASE IF EXISTS {db_name}")
 
+    with Scenario("user with revoked ALL privilege"):
+        db_name = f"db_{getuid()}"
+
+        try:
+            with Given("I have a database"):
+                node.query(f"CREATE DATABASE {db_name}")
+
+            with When("I grant the drop database privilege"):
+                node.query(f"GRANT DROP DATABASE ON {db_name}.* TO {grant_target_name}")
+
+            with And("I revoke ALL privilege"):
+                node.query(f"REVOKE ALL ON *.* FROM {grant_target_name}")
+
+            with Then("I attempt to drop a database"):
+                node.query(f"DROP DATABASE {db_name}", settings = [("user", user_name)],
+                    exitcode=exitcode, message=message)
+
+        finally:
+            with Finally("I drop the database"):
+                node.query(f"DROP DATABASE IF EXISTS {db_name}")
+
+    with Scenario("user with ALL privilege"):
+        db_name = f"db_{getuid()}"
+
+        try:
+            with Given("I have a database"):
+                node.query(f"CREATE DATABASE {db_name}")
+
+            with When("I grant ALL privilege"):
+                node.query(f"GRANT ALL ON *.* TO {grant_target_name}")
+
+            with Then("I attempt to drop a database"):
+                node.query(f"DROP DATABASE {db_name}", settings = [("user", user_name)])
+
+        finally:
+            with Finally("I drop the database"):
+                node.query(f"DROP DATABASE IF EXISTS {db_name}")
+
 @TestFeature
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_DropDatabase("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 @Name("drop database")
 def feature(self, node="clickhouse1", stress=None, parallel=None):
@@ -99,5 +145,5 @@ def feature(self, node="clickhouse1", stress=None, parallel=None):
     if stress is not None:
         self.context.stress = stress
 
-    with Suite(test=privilege_granted_directly_or_via_role):
+    with Suite(test=privilege_granted_directly_or_via_role, setup=instrument_clickhouse_server_log):
         privilege_granted_directly_or_via_role()
diff --git a/tests/testflows/rbac/tests/privileges/drop/drop_dictionary.py b/tests/testflows/rbac/tests/privileges/drop/drop_dictionary.py
index 14e6da0ebe9..c3f07885bd5 100644
--- a/tests/testflows/rbac/tests/privileges/drop/drop_dictionary.py
+++ b/tests/testflows/rbac/tests/privileges/drop/drop_dictionary.py
@@ -12,12 +12,12 @@ def privilege_granted_directly_or_via_role(self, node=None):
     if node is None:
         node = self.context.node
 
-    with Suite("user with direct privilege", setup=instrument_clickhouse_server_log):
+    with Suite("user with direct privilege"):
         with user(node, user_name):
             with When(f"I run checks that {user_name} is only able to execute DROP DICTIONARY with required privileges"):
                 privilege_check(grant_target_name=user_name, user_name=user_name, node=node)
 
-    with Suite("user with privilege via role", setup=instrument_clickhouse_server_log):
+    with Suite("user with privilege via role"):
         with user(node, user_name), role(node, role_name):
             with When("I grant the role to the user"):
                 node.query(f"GRANT {role_name} TO {user_name}")
@@ -29,21 +29,27 @@ def privilege_check(grant_target_name, user_name, node=None):
     """
     exitcode, message = errors.not_enough_privileges(name=f"{user_name}")
 
-    with Scenario("user without privilege", setup=instrument_clickhouse_server_log):
+    with Scenario("user without privilege"):
         dict_name = f"dict_{getuid()}"
 
         try:
             with Given("I have a dictionary"):
                 node.query(f"CREATE DICTIONARY {dict_name}(x Int32, y Int32) PRIMARY KEY x LAYOUT(FLAT()) SOURCE(CLICKHOUSE()) LIFETIME(0)")
 
-            with When("I attempt to drop a dictionary without privilege"):
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I attempt to drop a dictionary without privilege"):
                 node.query(f"DROP DICTIONARY {dict_name}", settings = [("user", user_name)], exitcode=exitcode, message=message)
 
         finally:
             with Finally("I drop the dictionary"):
                 node.query(f"DROP DICTIONARY IF EXISTS {dict_name}")
 
-    with Scenario("user with privilege", setup=instrument_clickhouse_server_log):
+    with Scenario("user with privilege"):
         dict_name = f"dict_{getuid()}"
 
         try:
@@ -60,7 +66,7 @@ def privilege_check(grant_target_name, user_name, node=None):
             with Finally("I drop the dictionary"):
                 node.query(f"DROP DICTIONARY IF EXISTS {dict_name}")
 
-    with Scenario("user with revoked privilege", setup=instrument_clickhouse_server_log):
+    with Scenario("user with revoked privilege"):
         dict_name = f"dict_{getuid()}"
 
         try:
@@ -80,9 +86,27 @@ def privilege_check(grant_target_name, user_name, node=None):
             with Finally("I drop the dictionary"):
                 node.query(f"DROP DICTIONARY IF EXISTS {dict_name}")
 
+    with Scenario("user with ALL privilege"):
+        dict_name = f"db_{getuid()}"
+
+        try:
+            with Given("I have a dictionary"):
+                node.query(f"CREATE DICTIONARY {dict_name}(x Int32, y Int32) PRIMARY KEY x LAYOUT(FLAT()) SOURCE(CLICKHOUSE()) LIFETIME(0)")
+
+            with When("I grant ALL privilege"):
+                node.query(f"GRANT ALL ON *.* TO {grant_target_name}")
+
+            with Then("I drop the dictionary"):
+                node.query(f"DROP DICTIONARY {dict_name}", settings = [("user", user_name)])
+
+        finally:
+            with Finally("I drop the dictionary"):
+                node.query(f"DROP DICTIONARY IF EXISTS {dict_name}")
 @TestFeature
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_DropDictionary("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 @Name("drop dictionary")
 def feature(self, node="clickhouse1", stress=None, parallel=None):
@@ -95,5 +119,5 @@ def feature(self, node="clickhouse1", stress=None, parallel=None):
     if stress is not None:
         self.context.stress = stress
 
-    with Suite(test=privilege_granted_directly_or_via_role):
+    with Suite(test=privilege_granted_directly_or_via_role, setup=instrument_clickhouse_server_log):
         privilege_granted_directly_or_via_role()
diff --git a/tests/testflows/rbac/tests/privileges/drop/drop_quota.py b/tests/testflows/rbac/tests/privileges/drop/drop_quota.py
index de25f0e15b1..b8727556a26 100644
--- a/tests/testflows/rbac/tests/privileges/drop/drop_quota.py
+++ b/tests/testflows/rbac/tests/privileges/drop/drop_quota.py
@@ -17,7 +17,7 @@ def privileges_granted_directly(self, node=None):
 
     with user(node, f"{user_name}"):
 
-        Suite(run=drop_quota, flags=TE,
+        Suite(run=drop_quota,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[user_name,user_name]) for row in drop_quota.examples
             ], args=Args(name="privilege={privilege}", format_name=True)))
@@ -38,13 +38,14 @@ def privileges_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(run=drop_quota, flags=TE,
+        Suite(run=drop_quota,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[role_name,user_name]) for row in drop_quota.examples
             ], args=Args(name="privilege={privilege}", format_name=True)))
 
 @TestOutline(Suite)
 @Examples("privilege",[
+    ("ALL",),
     ("ACCESS MANAGEMENT",),
     ("DROP QUOTA",),
 ])
@@ -63,7 +64,13 @@ def drop_quota(self, privilege, grant_target_name, user_name, node=None):
             with Given("I have a quota"):
                 node.query(f"CREATE QUOTA {drop_row_policy_name}")
 
-            with When("I check the user can't drop a quota"):
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I check the user can't drop a quota"):
                 node.query(f"DROP QUOTA {drop_row_policy_name}", settings=[("user",user_name)],
                     exitcode=exitcode, message=message)
 
@@ -129,6 +136,8 @@ def drop_quota(self, privilege, grant_target_name, user_name, node=None):
 @Name("drop quota")
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_DropQuota("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 def feature(self, node="clickhouse1"):
     """Check the RBAC functionality of DROP QUOTA.
diff --git a/tests/testflows/rbac/tests/privileges/drop/drop_role.py b/tests/testflows/rbac/tests/privileges/drop/drop_role.py
index 4b6b7c04741..ca9eb1b0947 100644
--- a/tests/testflows/rbac/tests/privileges/drop/drop_role.py
+++ b/tests/testflows/rbac/tests/privileges/drop/drop_role.py
@@ -17,7 +17,7 @@ def privileges_granted_directly(self, node=None):
 
     with user(node, f"{user_name}"):
 
-        Suite(run=drop_role, flags=TE,
+        Suite(run=drop_role,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[user_name,user_name]) for row in drop_role.examples
             ], args=Args(name="privilege={privilege}", format_name=True)))
@@ -38,13 +38,14 @@ def privileges_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(run=drop_role, flags=TE,
+        Suite(run=drop_role,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[role_name,user_name]) for row in drop_role.examples
             ], args=Args(name="privilege={privilege}", format_name=True)))
 
 @TestOutline(Suite)
 @Examples("privilege",[
+    ("ALL",),
     ("ACCESS MANAGEMENT",),
     ("DROP ROLE",),
 ])
@@ -58,14 +59,22 @@ def drop_role(self, privilege, grant_target_name, user_name, node=None):
 
     with Scenario("DROP ROLE without privilege"):
         drop_role_name = f"drop_role_{getuid()}"
+
         with role(node, drop_role_name):
 
-            with When("I check the user can't drop a role"):
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I check the user can't drop a role"):
                 node.query(f"DROP ROLE {drop_role_name}", settings=[("user",user_name)],
                     exitcode=exitcode, message=message)
 
     with Scenario("DROP ROLE with privilege"):
         drop_role_name = f"drop_role_{getuid()}"
+
         with role(node, drop_role_name):
 
             with When(f"I grant {privilege}"):
@@ -93,6 +102,7 @@ def drop_role(self, privilege, grant_target_name, user_name, node=None):
 
     with Scenario("DROP ROLE with revoked privilege"):
         drop_role_name = f"drop_role_{getuid()}"
+
         with role(node, drop_role_name):
             with When(f"I grant {privilege}"):
                 node.query(f"GRANT {privilege} ON *.* TO {grant_target_name}")
@@ -108,6 +118,8 @@ def drop_role(self, privilege, grant_target_name, user_name, node=None):
 @Name("drop role")
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_DropRole("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 def feature(self, node="clickhouse1"):
     """Check the RBAC functionality of DROP ROLE.
diff --git a/tests/testflows/rbac/tests/privileges/drop/drop_row_policy.py b/tests/testflows/rbac/tests/privileges/drop/drop_row_policy.py
index 6e8a2aaa3d5..ad7fed94df0 100644
--- a/tests/testflows/rbac/tests/privileges/drop/drop_row_policy.py
+++ b/tests/testflows/rbac/tests/privileges/drop/drop_row_policy.py
@@ -17,7 +17,7 @@ def privileges_granted_directly(self, node=None):
 
     with user(node, f"{user_name}"):
 
-        Suite(run=drop_row_policy, flags=TE,
+        Suite(run=drop_row_policy,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[user_name,user_name]) for row in drop_row_policy.examples
             ], args=Args(name="privilege={privilege}", format_name=True)))
@@ -38,13 +38,14 @@ def privileges_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(run=drop_row_policy, flags=TE,
+        Suite(run=drop_row_policy,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[role_name,user_name]) for row in drop_row_policy.examples
             ], args=Args(name="privilege={privilege}", format_name=True)))
 
 @TestOutline(Suite)
 @Examples("privilege",[
+    ("ALL",),
     ("ACCESS MANAGEMENT",),
     ("DROP ROW POLICY",),
     ("DROP POLICY",),
@@ -65,7 +66,13 @@ def drop_row_policy(self, privilege, grant_target_name, user_name, node=None):
             with Given("I have a row policy"):
                 node.query(f"CREATE ROW POLICY {drop_row_policy_name} ON {table_name}")
 
-            with When("I check the user can't drop a row policy"):
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I check the user can't drop a row policy"):
                 node.query(f"DROP ROW POLICY {drop_row_policy_name} ON {table_name}", settings=[("user",user_name)],
                     exitcode=exitcode, message=message)
 
@@ -130,15 +137,140 @@ def drop_row_policy(self, privilege, grant_target_name, user_name, node=None):
              with Finally("I drop the row policy"):
                 node.query(f"DROP ROW POLICY IF EXISTS {drop_row_policy_name} ON {table_name}")
 
+@TestScenario
+@Requirements(
+    RQ_SRS_006_RBAC_RowPolicy_Restriction("1.0")
+)
+def drop_all_pol_with_conditions(self, node=None):
+    """Check that when all policies with conditions are dropped, the table becomes unrestricted.
+    """
+
+    if node is None:
+        node = self.context.node
+
+    table_name = f"table_{getuid()}"
+    pol_name = f"pol_{getuid()}"
+
+    with table(node, table_name):
+
+        with Given("I have a row policy"):
+            row_policy(name=pol_name, table=table_name)
+
+        with And("The row policy has a condition"):
+            node.query(f"ALTER ROW POLICY {pol_name} ON {table_name} FOR SELECT USING 1")
+
+        with And("The table has some values"):
+            node.query(f"INSERT INTO {table_name} (y) VALUES (1),(2)")
+
+        with And("I can't see any of the rows on the table"):
+            output = node.query(f"SELECT * FROM {table_name}").output
+            assert '' == output, error()
+
+        with When("I drop the row policy"):
+            node.query(f"DROP ROW POLICY {pol_name} ON {table_name}")
+
+        with Then("I select all the rows from the table"):
+            output = node.query(f"SELECT * FROM {table_name}").output
+            assert '1' in output and '2' in output, error()
+
+@TestScenario
+@Requirements(
+    RQ_SRS_006_RBAC_RowPolicy_Drop_On("1.0"),
+)
+def drop_on(self, node=None):
+    """Check that when a row policy is dropped, users are able to access rows restricted by that policy.
+    """
+
+    if node is None:
+        node = self.context.node
+
+    table_name = f"table_{getuid()}"
+    pol_name = f"pol_{getuid()}"
+
+    with table(node, table_name):
+
+        with Given("I have a row policy"):
+            row_policy(name=pol_name, table=table_name)
+
+        with And("The row policy has a condition"):
+            node.query(f"ALTER ROW POLICY {pol_name} ON {table_name} FOR SELECT USING y=1 TO default")
+
+        with And("The table has some values"):
+            node.query(f"INSERT INTO {table_name} (y) VALUES (1),(2)")
+
+        with And("I can't see one of the rows on the table"):
+            output = node.query(f"SELECT * FROM {table_name}").output
+            assert '1' in output and '2' not in output, error()
+
+        with When("I drop the row policy"):
+            node.query(f"DROP ROW POLICY {pol_name} ON {table_name}")
+
+        with Then("I select all the rows from the table"):
+            output = node.query(f"SELECT * FROM {table_name}").output
+            assert '1' in output and '2' in output, error()
+
+@TestScenario
+@Requirements(
+    RQ_SRS_006_RBAC_RowPolicy_Drop_OnCluster("1.0"),
+)
+def drop_on_cluster(self, node=None):
+    """Check that when a row policy is dropped on a cluster, it works on all nodes.
+    """
+
+    if node is None:
+        node = self.context.node
+        node2 = self.context.node2
+
+    table_name = f"table_{getuid()}"
+    pol_name = f"pol_{getuid()}"
+
+    try:
+        with Given("I have a table on a cluster"):
+            node.query(f"CREATE TABLE {table_name} ON CLUSTER sharded_cluster (x UInt64) ENGINE = Memory")
+
+        with And("I have a row policy"):
+            node.query(f"CREATE ROW POLICY {pol_name} ON CLUSTER sharded_cluster ON {table_name} FOR SELECT USING 1")
+
+        with And("There are some values on the table on the first node"):
+            node.query(f"INSERT INTO {table_name} (x) VALUES (1)")
+
+        with And("There are some values on the table on the second node"):
+            node2.query(f"INSERT INTO {table_name} (x) VALUES (1)")
+
+        with When("I drop the row policy on cluster"):
+            node.query(f"DROP ROW POLICY {pol_name} ON {table_name} ON CLUSTER sharded_cluster")
+
+        with Then("I select from the table"):
+            output = node.query(f"SELECT * FROM {table_name}").output
+            assert '1' in output, error()
+
+        with And("I select from another node on the cluster"):
+            output = node2.query(f"SELECT * FROM {table_name}").output
+            assert '1' in output, error()
+
+    finally:
+        with Finally("I drop the row policy", flags=TE):
+            node.query(f"DROP ROW POLICY IF EXISTS {pol_name} ON CLUSTER sharded_cluster ON {table_name}")
+
+        with And("I drop the table", flags=TE):
+            node.query(f"DROP TABLE {table_name} ON CLUSTER sharded_cluster")
+
 @TestFeature
 @Name("drop row policy")
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_DropRowPolicy("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 def feature(self, node="clickhouse1"):
     """Check the RBAC functionality of DROP ROW POLICY.
     """
     self.context.node = self.context.cluster.node(node)
+    self.context.node2 = self.context.cluster.node("clickhouse2")
 
     Suite(run=privileges_granted_directly, setup=instrument_clickhouse_server_log)
     Suite(run=privileges_granted_via_role, setup=instrument_clickhouse_server_log)
+
+    Scenario(run=drop_all_pol_with_conditions, setup=instrument_clickhouse_server_log)
+    Scenario(run=drop_on, setup=instrument_clickhouse_server_log)
+    Scenario(run=drop_on_cluster, setup=instrument_clickhouse_server_log)
diff --git a/tests/testflows/rbac/tests/privileges/drop/drop_settings_profile.py b/tests/testflows/rbac/tests/privileges/drop/drop_settings_profile.py
index 51139653283..3aa9ef2c369 100644
--- a/tests/testflows/rbac/tests/privileges/drop/drop_settings_profile.py
+++ b/tests/testflows/rbac/tests/privileges/drop/drop_settings_profile.py
@@ -17,7 +17,7 @@ def privileges_granted_directly(self, node=None):
 
     with user(node, f"{user_name}"):
 
-        Suite(run=drop_settings_profile, flags=TE,
+        Suite(run=drop_settings_profile,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[user_name,user_name]) for row in drop_settings_profile.examples
             ], args=Args(name="privilege={privilege}", format_name=True)))
@@ -38,13 +38,14 @@ def privileges_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(run=drop_settings_profile, flags=TE,
+        Suite(run=drop_settings_profile,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[role_name,user_name]) for row in drop_settings_profile.examples
             ], args=Args(name="privilege={privilege}", format_name=True)))
 
 @TestOutline(Suite)
 @Examples("privilege",[
+    ("ALL",),
     ("ACCESS MANAGEMENT",),
     ("DROP SETTINGS PROFILE",),
     ("DROP PROFILE",),
@@ -64,7 +65,13 @@ def drop_settings_profile(self, privilege, grant_target_name, user_name, node=No
             with Given("I have a settings_profile"):
                 node.query(f"CREATE SETTINGS PROFILE {drop_row_policy_name}")
 
-            with When("I check the user can't drop a settings_profile"):
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I check the user can't drop a settings_profile"):
                 node.query(f"DROP SETTINGS PROFILE {drop_row_policy_name}", settings=[("user",user_name)],
                     exitcode=exitcode, message=message)
 
@@ -130,6 +137,8 @@ def drop_settings_profile(self, privilege, grant_target_name, user_name, node=No
 @Name("drop settings profile")
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_DropSettingsProfile("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 def feature(self, node="clickhouse1"):
     """Check the RBAC functionality of DROP SETTINGS PROFILE.
diff --git a/tests/testflows/rbac/tests/privileges/drop/drop_table.py b/tests/testflows/rbac/tests/privileges/drop/drop_table.py
index e5deac646eb..1fd394daf96 100644
--- a/tests/testflows/rbac/tests/privileges/drop/drop_table.py
+++ b/tests/testflows/rbac/tests/privileges/drop/drop_table.py
@@ -12,13 +12,13 @@ def privilege_granted_directly_or_via_role(self, node=None):
     if node is None:
         node = self.context.node
 
-    with Suite("user with direct privilege", setup=instrument_clickhouse_server_log):
+    with Suite("user with direct privilege"):
         with user(node, user_name):
 
             with When(f"I run checks that {user_name} is only able to execute DROP  TABLE with required privileges"):
                 privilege_check(grant_target_name=user_name, user_name=user_name, node=node)
 
-    with Suite("user with privilege via role", setup=instrument_clickhouse_server_log):
+    with Suite("user with privilege via role"):
         with user(node, user_name), role(node, role_name):
 
             with When("I grant the role to the user"):
@@ -32,14 +32,20 @@ def privilege_check(grant_target_name, user_name, node=None):
     """
     exitcode, message = errors.not_enough_privileges(name=f"{user_name}")
 
-    with Scenario("user without privilege", setup=instrument_clickhouse_server_log):
+    with Scenario("user without privilege"):
         table_name = f"table_{getuid()}"
 
         try:
             with Given("I have a table"):
                 node.query(f"CREATE TABLE {table_name} (x Int8) ENGINE=Memory")
 
-            with When("I attempt to drop a table without privilege"):
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I attempt to drop a table without privilege"):
                 node.query(f"DROP TABLE {table_name}", settings = [("user", user_name)],
                     exitcode=exitcode, message=message)
 
@@ -47,7 +53,7 @@ def privilege_check(grant_target_name, user_name, node=None):
             with Finally("I drop the table"):
                 node.query(f"DROP TABLE IF EXISTS {table_name}")
 
-    with Scenario("user with privilege", setup=instrument_clickhouse_server_log):
+    with Scenario("user with privilege"):
         table_name = f"table_{getuid()}"
 
         try:
@@ -64,7 +70,7 @@ def privilege_check(grant_target_name, user_name, node=None):
             with Finally("I drop the table"):
                 node.query(f"DROP TABLE IF EXISTS {table_name}")
 
-    with Scenario("user with revoked privilege", setup=instrument_clickhouse_server_log):
+    with Scenario("user with revoked privilege"):
         table_name = f"table_{getuid()}"
         try:
             with Given("I have a table"):
@@ -84,9 +90,48 @@ def privilege_check(grant_target_name, user_name, node=None):
             with Finally("I drop the table"):
                 node.query(f"DROP TABLE IF EXISTS {table_name}")
 
+    with Scenario("user with revoked ALL privilege"):
+        table_name = f"table_{getuid()}"
+        try:
+            with Given("I have a table"):
+                node.query(f"CREATE TABLE {table_name} (x Int8) ENGINE=Memory")
+
+            with When("I grant the drop table privilege"):
+                node.query(f"GRANT DROP TABLE ON *.* TO {grant_target_name}")
+
+            with And("I revoke ALL privilege"):
+                node.query(f"REVOKE ALL ON *.* FROM {grant_target_name}")
+
+            with Then("I attempt to drop a  table"):
+                node.query(f"DROP TABLE {table_name}", settings = [("user", user_name)],
+                    exitcode=exitcode, message=message)
+
+        finally:
+            with Finally("I drop the table"):
+                node.query(f"DROP TABLE IF EXISTS {table_name}")
+
+    with Scenario("user with ALL privilege"):
+        table_name = f"table_{getuid()}"
+
+        try:
+            with Given("I have a table"):
+                node.query(f"CREATE TABLE {table_name} (x Int8) ENGINE=Memory")
+
+            with When("I grant ALL privilege"):
+                node.query(f"GRANT ALL ON *.* TO {grant_target_name}")
+
+            with Then("I drop the table"):
+                node.query(f"DROP TABLE {table_name}", settings = [("user", user_name)])
+
+        finally:
+            with Finally("I drop the table"):
+                node.query(f"DROP TABLE IF EXISTS {table_name}")
+
 @TestFeature
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_DropTable("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 @Name("drop table")
 def feature(self, node="clickhouse1", stress=None, parallel=None):
@@ -99,5 +144,5 @@ def feature(self, node="clickhouse1", stress=None, parallel=None):
     if stress is not None:
         self.context.stress = stress
 
-    with Suite(test=privilege_granted_directly_or_via_role):
+    with Suite(test=privilege_granted_directly_or_via_role, setup=instrument_clickhouse_server_log):
         privilege_granted_directly_or_via_role()
diff --git a/tests/testflows/rbac/tests/privileges/drop/drop_user.py b/tests/testflows/rbac/tests/privileges/drop/drop_user.py
index 9aec34cca81..c3f1df8ae15 100644
--- a/tests/testflows/rbac/tests/privileges/drop/drop_user.py
+++ b/tests/testflows/rbac/tests/privileges/drop/drop_user.py
@@ -17,7 +17,7 @@ def drop_user_granted_directly(self, node=None):
 
     with user(node, f"{user_name}"):
 
-        Suite(run=drop_user, flags=TE,
+        Suite(run=drop_user,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[user_name,user_name]) for row in drop_user.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
@@ -38,13 +38,14 @@ def drop_user_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(run=drop_user, flags=TE,
+        Suite(run=drop_user,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[role_name,user_name]) for row in drop_user.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
 
 @TestOutline(Suite)
 @Examples("privilege",[
+    ("ALL",),
     ("ACCESS MANAGEMENT",),
     ("DROP USER",),
 ])
@@ -59,14 +60,22 @@ def drop_user(self, privilege, grant_target_name, user_name, node=None):
     with Scenario("DROP USER without privilege"):
 
         drop_user_name = f"drop_user_{getuid()}"
+
         with user(node, drop_user_name):
 
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
             with When("I check the user can't drop a user"):
                 node.query(f"DROP USER {drop_user_name}", settings=[("user",user_name)],
                     exitcode=exitcode, message=message)
 
     with Scenario("DROP USER with privilege"):
         drop_user_name = f"drop_user_{getuid()}"
+
         with user(node, drop_user_name):
             with When(f"I grant {privilege}"):
                 node.query(f"GRANT {privilege} ON *.* TO {grant_target_name}")
@@ -76,6 +85,7 @@ def drop_user(self, privilege, grant_target_name, user_name, node=None):
 
     with Scenario("DROP USER on cluster"):
         drop_user_name = f"drop_user_{getuid()}"
+
         try:
             with Given("I have a user on a cluster"):
                 node.query(f"CREATE USER {drop_user_name} ON CLUSTER sharded_cluster")
@@ -93,6 +103,7 @@ def drop_user(self, privilege, grant_target_name, user_name, node=None):
 
     with Scenario("DROP USER with revoked privilege"):
         drop_user_name = f"drop_user_{getuid()}"
+
         with user(node, drop_user_name):
             with When(f"I grant {privilege}"):
                 node.query(f"GRANT {privilege} ON *.* TO {grant_target_name}")
@@ -108,6 +119,8 @@ def drop_user(self, privilege, grant_target_name, user_name, node=None):
 @Name("drop user")
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_DropUser("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 def feature(self, node="clickhouse1"):
     """Check the RBAC functionality of DROP USER.
diff --git a/tests/testflows/rbac/tests/privileges/feature.py b/tests/testflows/rbac/tests/privileges/feature.py
index e7a0cf2d368..7302a971ec1 100755
--- a/tests/testflows/rbac/tests/privileges/feature.py
+++ b/tests/testflows/rbac/tests/privileges/feature.py
@@ -11,91 +11,92 @@ def feature(self):
 
     try:
         try:
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.insert", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.select", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.public_tables", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.distributed_table", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.grant_option", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.truncate", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.optimize", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.kill_query", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.kill_mutation", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.role_admin", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.dictGet", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.introspection", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.sources", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.admin_option", "feature"), flags=TE), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.insert", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.select", "feature"), ), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.public_tables", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.distributed_table", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.grant_option", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.truncate", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.optimize", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.kill_query", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.kill_mutation", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.role_admin", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.dictGet", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.introspection", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.sources", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.admin_option", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.all_role", "feature")), {})
 
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.show.show_tables", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.show.show_dictionaries", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.show.show_databases", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.show.show_columns", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.show.show_users", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.show.show_roles", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.show.show_quotas", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.show.show_settings_profiles", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.show.show_row_policies", "feature"), flags=TE), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.show.show_tables", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.show.show_dictionaries", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.show.show_databases", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.show.show_columns", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.show.show_users", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.show.show_roles", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.show.show_quotas", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.show.show_settings_profiles", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.show.show_row_policies", "feature")), {})
 
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.alter.alter_column", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.alter.alter_index", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.alter.alter_constraint", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.alter.alter_ttl", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.alter.alter_settings", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.alter.alter_update", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.alter.alter_delete", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.alter.alter_freeze", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.alter.alter_fetch", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.alter.alter_move", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.alter.alter_user", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.alter.alter_role", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.alter.alter_row_policy", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.alter.alter_quota", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.alter.alter_settings_profile", "feature"), flags=TE), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.alter.alter_column", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.alter.alter_index", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.alter.alter_constraint", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.alter.alter_ttl", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.alter.alter_settings", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.alter.alter_update", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.alter.alter_delete", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.alter.alter_freeze", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.alter.alter_fetch", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.alter.alter_move", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.alter.alter_user", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.alter.alter_role", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.alter.alter_row_policy", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.alter.alter_quota", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.alter.alter_settings_profile", "feature")), {})
 
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.create.create_database", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.create.create_dictionary", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.create.create_temp_table", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.create.create_table", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.create.create_user", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.create.create_role", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.create.create_row_policy", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.create.create_quota", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.create.create_settings_profile", "feature"), flags=TE), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.create.create_database", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.create.create_dictionary", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.create.create_temp_table", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.create.create_table", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.create.create_user", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.create.create_role", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.create.create_row_policy", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.create.create_quota", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.create.create_settings_profile", "feature")), {})
 
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.attach.attach_database", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.attach.attach_dictionary", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.attach.attach_temp_table", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.attach.attach_table", "feature"), flags=TE), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.attach.attach_database", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.attach.attach_dictionary", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.attach.attach_temp_table", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.attach.attach_table", "feature")), {})
 
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.drop.drop_database", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.drop.drop_dictionary", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.drop.drop_table", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.drop.drop_user", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.drop.drop_role", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.drop.drop_row_policy", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.drop.drop_quota", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.drop.drop_settings_profile", "feature"), flags=TE), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.drop.drop_database", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.drop.drop_dictionary", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.drop.drop_table", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.drop.drop_user", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.drop.drop_role", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.drop.drop_row_policy", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.drop.drop_quota", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.drop.drop_settings_profile", "feature")), {})
 
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.detach.detach_database", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.detach.detach_dictionary", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.detach.detach_table", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.detach.detach_view", "feature"), flags=TE), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.detach.detach_database", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.detach.detach_dictionary", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.detach.detach_table", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.detach.detach_view", "feature")), {})
 
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.system.drop_cache", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.system.reload", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.system.flush", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.system.merges", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.system.moves", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.system.replication_queues", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.system.ttl_merges", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.system.restart_replica", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.system.sends", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.system.sync_replica", "feature"), flags=TE), {})
-            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.system.fetches", "feature"), flags=TE), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.system.drop_cache", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.system.reload", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.system.flush", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.system.merges", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.system.moves", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.system.replication_queues", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.system.ttl_merges", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.system.restart_replica", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.system.sends", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.system.sync_replica", "feature")), {})
+            run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.system.fetches", "feature")), {})
 
         finally:
             join(tasks)
     finally:
         pool.close()
 
-    Feature(test=load("rbac.tests.privileges.system.shutdown", "feature"), flags=TE)
+    Feature(test=load("rbac.tests.privileges.system.shutdown", "feature"))
diff --git a/tests/testflows/rbac/tests/privileges/grant_option.py b/tests/testflows/rbac/tests/privileges/grant_option.py
index f337aec2619..bc8b73eb32f 100644
--- a/tests/testflows/rbac/tests/privileges/grant_option.py
+++ b/tests/testflows/rbac/tests/privileges/grant_option.py
@@ -89,7 +89,7 @@ def grant_option_check(grant_option_target, grant_target, user_name, table_type,
 @Examples("privilege", [
     ("ALTER MOVE PARTITION",), ("ALTER MOVE PART",), ("MOVE PARTITION",), ("MOVE PART",),
     ("ALTER DELETE",), ("DELETE",),
-    ("ALTER FETCH PARTITION",), ("FETCH PARTITION",),
+    ("ALTER FETCH PARTITION",), ("ALTER FETCH PART",), ("FETCH PARTITION",),
     ("ALTER FREEZE PARTITION",), ("FREEZE PARTITION",),
     ("ALTER UPDATE",), ("UPDATE",),
     ("ALTER ADD COLUMN",), ("ADD COLUMN",),
diff --git a/tests/testflows/rbac/tests/privileges/insert.py b/tests/testflows/rbac/tests/privileges/insert.py
index 78478967d37..305ce62f5e4 100755
--- a/tests/testflows/rbac/tests/privileges/insert.py
+++ b/tests/testflows/rbac/tests/privileges/insert.py
@@ -16,6 +16,9 @@ def input_output_equality_check(node, input_columns, input_data, table_name):
     return input_dict == output_dict
 
 @TestScenario
+@Requirements(
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
+)
 def without_privilege(self, table_type, node=None):
     """Check that user without insert privilege on a table is not able to insert on that table.
     """
@@ -28,7 +31,13 @@ def without_privilege(self, table_type, node=None):
     with table(node, table_name, table_type):
         with user(node, user_name):
 
-            with When("I run INSERT without privilege"):
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {user_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {user_name}")
+
+            with Then("I run INSERT without privilege"):
                 exitcode, message = errors.not_enough_privileges(name=user_name)
 
                 node.query(f"INSERT INTO {table_name} (d) VALUES ('2020-01-01')", settings = [("user", user_name)],
@@ -60,6 +69,34 @@ def user_with_privilege(self, table_type, node=None):
                 output = node.query(f"SELECT d FROM {table_name} FORMAT JSONEachRow").output
                 assert output == '{"d":"2020-01-01"}', error()
 
+@TestScenario
+@Requirements(
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Grant_Privilege_Insert("1.0"),
+)
+def all_privilege(self, table_type, node=None):
+    """Check that user can insert into a table on which they have insert privilege.
+    """
+    user_name = f"user_{getuid()}"
+    table_name = f"table_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+
+    with table(node, table_name, table_type):
+
+        with user(node, user_name):
+
+            with When("I grant insert privilege"):
+                node.query(f"GRANT ALL ON *.* TO {user_name}")
+
+            with And("I use INSERT"):
+                node.query(f"INSERT INTO {table_name} (d) VALUES ('2020-01-01')", settings=[("user",user_name)])
+
+            with Then("I check the insert functioned"):
+                output = node.query(f"SELECT d FROM {table_name} FORMAT JSONEachRow").output
+                assert output == '{"d":"2020-01-01"}', error()
+
 @TestScenario
 @Requirements(
     RQ_SRS_006_RBAC_Revoke_Privilege_Insert("1.0"),
@@ -82,7 +119,31 @@ def user_with_revoked_privilege(self, table_type, node=None):
             with And("I revoke insert privilege"):
                 node.query(f"REVOKE INSERT ON {table_name} FROM {user_name}")
 
-            with And("I use INSERT"):
+            with Then("I use INSERT"):
+                exitcode, message = errors.not_enough_privileges(name=user_name)
+                node.query(f"INSERT INTO {table_name} (d) VALUES ('2020-01-01')",
+                    settings=[("user",user_name)], exitcode=exitcode, message=message)
+
+@TestScenario
+def user_with_all_revoked_privilege(self, table_type, node=None):
+    """Check that user is unable to insert into a table after ALL privilege has been revoked from user.
+    """
+    user_name = f"user_{getuid()}"
+    table_name = f"table_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+
+    with table(node, table_name, table_type):
+        with user(node, user_name):
+
+            with When("I grant insert privilege"):
+                node.query(f"GRANT INSERT ON {table_name} TO {user_name}")
+
+            with And("I revoke ALL privilege"):
+                node.query(f"REVOKE ALL ON *.* FROM {user_name}")
+
+            with Then("I use INSERT"):
                 exitcode, message = errors.not_enough_privileges(name=user_name)
                 node.query(f"INSERT INTO {table_name} (d) VALUES ('2020-01-01')",
                     settings=[("user",user_name)], exitcode=exitcode, message=message)
@@ -111,26 +172,36 @@ def user_column_privileges(self, grant_columns, insert_columns_pass, data_fail,
     """
     user_name = f"user_{getuid()}"
     table_name = f"table_{getuid()}"
+
     if node is None:
         node = self.context.node
+
     with table(node, table_name, table_type):
+
         with user(node, user_name):
+
             with When("I grant insert privilege"):
                 node.query(f"GRANT INSERT({grant_columns}) ON {table_name} TO {user_name}")
+
             if insert_columns_fail is not None:
                 with And("I insert into a column without insert privilege"):
                     exitcode, message = errors.not_enough_privileges(name=user_name)
                     node.query(f"INSERT INTO {table_name} ({insert_columns_fail}) VALUES ({data_fail})",
                         settings=[("user",user_name)], exitcode=exitcode, message=message)
+
             with And("I insert into granted column"):
                 node.query(f"INSERT INTO {table_name} ({insert_columns_pass}) VALUES ({data_pass})",
                     settings=[("user",user_name)])
+
             with Then("I check the insert functioned"):
                 input_equals_output = input_output_equality_check(node, insert_columns_pass, data_pass, table_name)
                 assert input_equals_output, error()
+
             if revoke_columns is not None:
+
                 with When("I revoke insert privilege from columns"):
                     node.query(f"REVOKE INSERT({revoke_columns}) ON {table_name} FROM {user_name}")
+
                 with And("I insert into revoked columns"):
                     exitcode, message = errors.not_enough_privileges(name=user_name)
                     node.query(f"INSERT INTO {table_name} ({insert_columns_pass}) VALUES ({data_pass})",
@@ -147,16 +218,23 @@ def role_with_privilege(self, table_type, node=None):
     user_name = f"user_{getuid()}"
     role_name = f"role_{getuid()}"
     table_name = f"table_{getuid()}"
+
     if node is None:
         node = self.context.node
+
     with table(node, table_name, table_type):
+
         with user(node, user_name), role(node, role_name):
+
             with When("I grant insert privilege to a role"):
                 node.query(f"GRANT INSERT ON {table_name} TO {role_name}")
+
             with And("I grant the role to a user"):
                 node.query(f"GRANT {role_name} TO {user_name}")
+
             with And("I insert into the table"):
                 node.query(f"INSERT INTO {table_name} (d) VALUES ('2020-01-01')", settings=[("user",user_name)])
+
             with Then("I check the data matches the input"):
                 output = node.query(f"SELECT d FROM {table_name} FORMAT JSONEachRow").output
                 assert output == '{"d":"2020-01-01"}', error()
@@ -173,16 +251,23 @@ def role_with_revoked_privilege(self, table_type, node=None):
     user_name = f"user_{getuid()}"
     role_name = f"role_{getuid()}"
     table_name = f"table_{getuid()}"
+
     if node is None:
         node = self.context.node
+
     with table(node, table_name, table_type):
+
         with user(node, user_name), role(node, role_name):
+
             with When("I grant privilege to a role"):
                 node.query(f"GRANT INSERT ON {table_name} TO {role_name}")
+
             with And("I grant the role to a user"):
                 node.query(f"GRANT {role_name} TO {user_name}")
+
             with And("I revoke privilege from the role"):
                 node.query(f"REVOKE INSERT ON {table_name} FROM {role_name}")
+
             with And("I insert into the table"):
                 exitcode, message = errors.not_enough_privileges(name=user_name)
                 node.query(f"INSERT INTO {table_name} (d) VALUES ('2020-01-01')",
@@ -196,16 +281,23 @@ def user_with_revoked_role(self, table_type, node=None):
     user_name = f"user_{getuid()}"
     role_name = f"role_{getuid()}"
     table_name = f"table_{getuid()}"
+
     if node is None:
         node = self.context.node
+
     with table(node, table_name, table_type):
+
         with user(node, user_name), role(node, role_name):
+
             with When("I grant privilege to a role"):
                 node.query(f"GRANT INSERT ON {table_name} TO {role_name}")
+
             with And("I grant the role to a user"):
                 node.query(f"GRANT {role_name} TO {user_name}")
+
             with And("I revoke the role from the user"):
                 node.query(f"REVOKE {role_name} FROM {user_name}")
+
             with And("I insert into the table"):
                 exitcode, message = errors.not_enough_privileges(name=user_name)
                 node.query(f"INSERT INTO {table_name} (d) VALUES ('2020-01-01')",
@@ -235,32 +327,43 @@ def role_column_privileges(self, grant_columns, insert_columns_pass, data_fail,
     user_name = f"user_{getuid()}"
     role_name = f"role_{getuid()}"
     table_name = f"table_{getuid()}"
+
     if node is None:
         node = self.context.node
+
     with table(node, table_name, table_type):
         with user(node, user_name), role(node, role_name):
-                with When("I grant insert privilege"):
-                    node.query(f"GRANT INSERT({grant_columns}) ON {table_name} TO {role_name}")
-                with And("I grant the role to a user"):
-                    node.query(f"GRANT {role_name} TO {user_name}")
-                if insert_columns_fail is not None:
-                    with And("I insert into columns without insert privilege"):
-                        exitcode, message = errors.not_enough_privileges(name=user_name)
-                        node.query(f"INSERT INTO {table_name} ({insert_columns_fail}) VALUES ({data_fail})",
-                            settings=[("user",user_name)], exitcode=exitcode, message=message)
-                with And("I insert into granted column"):
+
+            with When("I grant insert privilege"):
+                node.query(f"GRANT INSERT({grant_columns}) ON {table_name} TO {role_name}")
+
+            with And("I grant the role to a user"):
+                node.query(f"GRANT {role_name} TO {user_name}")
+
+            if insert_columns_fail is not None:
+                with And("I insert into columns without insert privilege"):
+                    exitcode, message = errors.not_enough_privileges(name=user_name)
+
+                    node.query(f"INSERT INTO {table_name} ({insert_columns_fail}) VALUES ({data_fail})",
+                        settings=[("user",user_name)], exitcode=exitcode, message=message)
+
+            with And("I insert into granted column"):
+                node.query(f"INSERT INTO {table_name} ({insert_columns_pass}) VALUES ({data_pass})",
+                    settings=[("user",user_name)])
+
+            with Then("I check the insert functioned"):
+                input_equals_output = input_output_equality_check(node, insert_columns_pass, data_pass, table_name)
+                assert input_equals_output, error()
+
+            if revoke_columns is not None:
+                with When("I revoke insert privilege from columns"):
+                    node.query(f"REVOKE INSERT({revoke_columns}) ON {table_name} FROM {role_name}")
+
+                with And("I insert into revoked columns"):
+                    exitcode, message = errors.not_enough_privileges(name=user_name)
+
                     node.query(f"INSERT INTO {table_name} ({insert_columns_pass}) VALUES ({data_pass})",
-                            settings=[("user",user_name)])
-                with Then("I check the insert functioned"):
-                    input_equals_output = input_output_equality_check(node, insert_columns_pass, data_pass, table_name)
-                    assert input_equals_output, error()
-                if revoke_columns is not None:
-                    with When("I revoke insert privilege from columns"):
-                        node.query(f"REVOKE INSERT({revoke_columns}) ON {table_name} FROM {role_name}")
-                    with And("I insert into revoked columns"):
-                        exitcode, message = errors.not_enough_privileges(name=user_name)
-                        node.query(f"INSERT INTO {table_name} ({insert_columns_pass}) VALUES ({data_pass})",
-                            settings=[("user",user_name)], exitcode=exitcode, message=message)
+                        settings=[("user",user_name)], exitcode=exitcode, message=message)
 
 @TestScenario
 @Requirements(
@@ -272,29 +375,40 @@ def user_with_privilege_on_cluster(self, table_type, node=None):
     """
     user_name = f"user_{getuid()}"
     table_name = f"table_{getuid()}"
+
     if node is None:
         node = self.context.node
+
     with table(node, table_name, table_type):
+
         try:
             with Given("I have a user on a cluster"):
                 node.query(f"CREATE USER OR REPLACE {user_name} ON CLUSTER sharded_cluster")
+
             with When("I grant insert privilege on a cluster without the node with the table"):
                 node.query(f"GRANT ON CLUSTER sharded_cluster23 INSERT ON {table_name} TO {user_name}")
+
             with And("I insert into the table expecting a fail"):
                 exitcode, message = errors.not_enough_privileges(name=user_name)
                 node.query(f"INSERT INTO {table_name} (d) VALUES ('2020-01-01')", settings=[("user",user_name)],
                     exitcode=exitcode, message=message)
+
             with And("I grant insert privilege on cluster including all nodes"):
                 node.query(f"GRANT ON CLUSTER sharded_cluster INSERT ON {table_name} TO {user_name}")
+
             with And("I revoke insert privilege on cluster without the node with the table"):
                 node.query(f"REVOKE ON CLUSTER sharded_cluster23 INSERT ON {table_name} FROM {user_name}")
+
             with And("I insert into the table"):
                 node.query(f"INSERT INTO {table_name} (d) VALUES ('2020-01-01')", settings=[("user",user_name)])
+
             with And("I check that I can read inserted data"):
                 output = node.query(f"SELECT d FROM {table_name} FORMAT JSONEachRow").output
                 assert output == '{"d":"2020-01-01"}', error()
+
             with And("I revoke insert privilege on cluster with all nodes"):
                 node.query(f"REVOKE ON CLUSTER sharded_cluster INSERT ON {table_name} FROM {user_name}")
+
             with Then("I insert into table expecting fail"):
                 exitcode, message = errors.not_enough_privileges(name=user_name)
                 node.query(f"INSERT INTO {table_name} (d) VALUES ('2020-01-01')", settings=[("user",user_name)],
@@ -314,33 +428,46 @@ def role_with_privilege_on_cluster(self, table_type, node=None):
     user_name = f"user_{getuid()}"
     role_name = f"role_{getuid()}"
     table_name = f"table_{getuid()}"
+
     if node is None:
         node = self.context.node
+
     with table(node, table_name, table_type):
+
         try:
             with Given("I have a user on a cluster"):
                 node.query(f"CREATE USER OR REPLACE {user_name} ON CLUSTER sharded_cluster")
+
             with And("I have a role on a cluster"):
                 node.query(f"CREATE ROLE OR REPLACE {role_name} ON CLUSTER sharded_cluster")
+
             with When("I grant the role to the user"):
                 node.query(f"GRANT {role_name} TO {user_name}")
+
             with And("I grant insert privilege on a cluster without the node with the table"):
                 node.query(f"GRANT ON CLUSTER sharded_cluster23 INSERT ON {table_name} TO {role_name}")
+
             with And("I insert into the table expecting a fail"):
                 exitcode, message = errors.not_enough_privileges(name=user_name)
                 node.query(f"INSERT INTO {table_name} (d) VALUES ('2020-01-01')", settings=[("user",user_name)],
                     exitcode=exitcode, message=message)
+
             with And("I grant insert privilege on cluster including all nodes"):
                 node.query(f"GRANT ON CLUSTER sharded_cluster INSERT ON {table_name} TO {role_name}")
+
             with And("I revoke insert privilege on cluster without the table node"):
                 node.query(f"REVOKE ON CLUSTER sharded_cluster23 INSERT ON {table_name} FROM {role_name}")
+
             with And("I insert into the table"):
                 node.query(f"INSERT INTO {table_name} (d) VALUES ('2020-01-01')", settings=[("user",user_name)])
+
             with And("I check that I can read inserted data"):
                 output = node.query(f"SELECT d FROM {table_name} FORMAT JSONEachRow").output
                 assert output == '{"d":"2020-01-01"}', error()
+
             with And("I revoke insert privilege on cluster with all nodes"):
                 node.query(f"REVOKE ON CLUSTER sharded_cluster INSERT ON {table_name} FROM {role_name}")
+
             with Then("I insert into table expecting fail"):
                 exitcode, message = errors.not_enough_privileges(name=user_name)
                 node.query(f"INSERT INTO {table_name} (d) VALUES ('2020-01-01')", settings=[("user",user_name)],
@@ -357,7 +484,6 @@ def role_with_privilege_on_cluster(self, table_type, node=None):
 @Examples("table_type", [
     (key,) for key in table_types.keys()
 ])
-@Flags(TE)
 @Name("insert")
 def feature(self, table_type, parallel=None, stress=None, node="clickhouse1"):
     """Check the RBAC functionality of INSERT.
@@ -377,7 +503,10 @@ def feature(self, table_type, parallel=None, stress=None, node="clickhouse1"):
     pool = Pool(10)
 
     try:
-        for scenario in loads(current_module(), Scenario):
-            run_scenario(pool, tasks, Scenario(test=scenario, setup=instrument_clickhouse_server_log), {"table_type" : table_type})
+        try:
+            for scenario in loads(current_module(), Scenario):
+                run_scenario(pool, tasks, Scenario(test=scenario, setup=instrument_clickhouse_server_log), {"table_type" : table_type})
+        finally:
+            join(tasks)
     finally:
-        join(tasks)
+        pool.close()
diff --git a/tests/testflows/rbac/tests/privileges/introspection.py b/tests/testflows/rbac/tests/privileges/introspection.py
index f8d774902ab..a8d62cf8618 100644
--- a/tests/testflows/rbac/tests/privileges/introspection.py
+++ b/tests/testflows/rbac/tests/privileges/introspection.py
@@ -35,7 +35,7 @@ def addressToLine_privileges_granted_directly(self, node=None):
 
     with user(node, f"{user_name}"):
 
-        Suite(run=addressToLine, flags=TE,
+        Suite(run=addressToLine,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[user_name,user_name]) for row in addressToLine.examples
             ], args=Args(name="privilege={privilege}", format_name=True)))
@@ -56,13 +56,14 @@ def addressToLine_privileges_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(run=addressToLine, flags=TE,
+        Suite(run=addressToLine,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[role_name,user_name]) for row in addressToLine.examples
             ], args=Args(name="privilege={privilege}", format_name=True)))
 
 @TestOutline(Suite)
 @Examples("privilege",[
+    ("ALL",),
     ("INTROSPECTION",),
     ("INTROSPECTION FUNCTIONS",),
     ("addressToLine",),
@@ -80,7 +81,13 @@ def addressToLine(self, privilege, grant_target_name, user_name, node=None):
 
     with Scenario("addressToLine without privilege"):
 
-        with When("I check the user can't use addressToLine"):
+        with When("I grant the user NONE privilege"):
+            node.query(f"GRANT NONE TO {grant_target_name}")
+
+        with And("I grant the user USAGE privilege"):
+            node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+        with Then("I check the user can't use addressToLine"):
             node.query(f"WITH addressToLine(toUInt64(dummy)) AS addr SELECT 1 WHERE addr = ''", settings=[("user",user_name)],
                 exitcode=exitcode, message=message)
 
@@ -116,7 +123,7 @@ def addressToSymbol_privileges_granted_directly(self, node=None):
 
     with user(node, f"{user_name}"):
 
-        Suite(run=addressToSymbol, flags=TE,
+        Suite(run=addressToSymbol,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[user_name,user_name]) for row in addressToSymbol.examples
             ], args=Args(name="privilege={privilege}", format_name=True)))
@@ -137,13 +144,14 @@ def addressToSymbol_privileges_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(run=addressToSymbol, flags=TE,
+        Suite(run=addressToSymbol,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[role_name,user_name]) for row in addressToSymbol.examples
             ], args=Args(name="privilege={privilege}", format_name=True)))
 
 @TestOutline(Suite)
 @Examples("privilege",[
+    ("ALL",),
     ("INTROSPECTION",),
     ("INTROSPECTION FUNCTIONS",),
     ("addressToSymbol",),
@@ -161,7 +169,13 @@ def addressToSymbol(self, privilege, grant_target_name, user_name, node=None):
 
     with Scenario("addressToSymbol without privilege"):
 
-        with When("I check the user can't use addressToSymbol"):
+        with When("I grant the user NONE privilege"):
+            node.query(f"GRANT NONE TO {grant_target_name}")
+
+        with And("I grant the user USAGE privilege"):
+            node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+        with Then("I check the user can't use addressToSymbol"):
             node.query(f"WITH addressToSymbol(toUInt64(dummy)) AS addr SELECT 1 WHERE addr = ''", settings=[("user",user_name)],
                 exitcode=exitcode, message=message)
 
@@ -197,7 +211,7 @@ def demangle_privileges_granted_directly(self, node=None):
 
     with user(node, f"{user_name}"):
 
-        Suite(run=demangle, flags=TE,
+        Suite(run=demangle,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[user_name,user_name]) for row in demangle.examples
             ], args=Args(name="privilege={privilege}", format_name=True)))
@@ -218,13 +232,14 @@ def demangle_privileges_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(run=demangle, flags=TE,
+        Suite(run=demangle,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[role_name,user_name]) for row in demangle.examples
             ], args=Args(name="privilege={privilege}", format_name=True)))
 
 @TestOutline(Suite)
 @Examples("privilege",[
+    ("ALL",),
     ("INTROSPECTION",),
     ("INTROSPECTION FUNCTIONS",),
     ("demangle",),
@@ -242,7 +257,13 @@ def demangle(self, privilege, grant_target_name, user_name, node=None):
 
     with Scenario("demangle without privilege"):
 
-        with When("I check the user can't use demangle"):
+        with When("I grant the user NONE privilege"):
+            node.query(f"GRANT NONE TO {grant_target_name}")
+
+        with And("I grant the user USAGE privilege"):
+            node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+        with Then("I check the user can't use demangle"):
             node.query(f"WITH demangle(toString(dummy)) AS addr SELECT 1 WHERE addr = ''", settings=[("user",user_name)],
                 exitcode=exitcode, message=message)
 
@@ -270,6 +291,8 @@ def demangle(self, privilege, grant_target_name, user_name, node=None):
 @Name("introspection")
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_Introspection("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 def feature(self, node="clickhouse1"):
     """Check the RBAC functionality of INTROSPECTION.
diff --git a/tests/testflows/rbac/tests/privileges/kill_mutation.py b/tests/testflows/rbac/tests/privileges/kill_mutation.py
index 41d4a837480..9a27836cad4 100644
--- a/tests/testflows/rbac/tests/privileges/kill_mutation.py
+++ b/tests/testflows/rbac/tests/privileges/kill_mutation.py
@@ -14,8 +14,16 @@ def no_privilege(self, node=None):
         table_name = f"merge_tree_{getuid()}"
 
         with table(node, table_name):
+
             with user(node, user_name):
-                with When("I attempt to kill mutation on table"):
+
+                with When("I grant the user NONE privilege"):
+                    node.query(f"GRANT NONE TO {user_name}")
+
+                with And("I grant the user USAGE privilege"):
+                    node.query(f"GRANT USAGE ON *.* TO {user_name}")
+
+                with Then("I attempt to kill mutation on table"):
                     node.query(f"KILL MUTATION WHERE database = 'default' AND table = '{table_name}'", settings = [("user", user_name)])
 
     with Scenario("kill mutation on cluster"):
@@ -23,8 +31,16 @@ def no_privilege(self, node=None):
         table_name = f"merge_tree_{getuid()}"
 
         with table(node, table_name):
+
             with user(node, user_name):
-                with When("I attempt to kill mutation on cluster"):
+
+                with When("I grant the user NONE privilege"):
+                    node.query(f"GRANT NONE TO {user_name}")
+
+                with And("I grant the user USAGE privilege"):
+                    node.query(f"GRANT USAGE ON *.* TO {user_name}")
+
+                with Then("I attempt to kill mutation on cluster"):
                     node.query(f"KILL MUTATION ON CLUSTER sharded_cluster WHERE database = 'default' AND table = '{table_name}'", settings = [("user", user_name)])
 
 @TestSuite
@@ -40,9 +56,9 @@ def privileges_granted_directly(self, node=None):
 
     with user(node, f"{user_name}"):
 
-        Suite(test=update, setup=instrument_clickhouse_server_log)(user_name=user_name, grant_target_name=user_name)
-        Suite(test=delete, setup=instrument_clickhouse_server_log)(user_name=user_name, grant_target_name=user_name)
-        Suite(test=drop_column, setup=instrument_clickhouse_server_log)(user_name=user_name, grant_target_name=user_name)
+        Suite(test=update)(user_name=user_name, grant_target_name=user_name)
+        Suite(test=delete)(user_name=user_name, grant_target_name=user_name)
+        Suite(test=drop_column)(user_name=user_name, grant_target_name=user_name)
 
 @TestSuite
 def privileges_granted_via_role(self, node=None):
@@ -61,9 +77,9 @@ def privileges_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(test=update, setup=instrument_clickhouse_server_log)(user_name=user_name, grant_target_name=role_name)
-        Suite(test=delete, setup=instrument_clickhouse_server_log)(user_name=user_name, grant_target_name=role_name)
-        Suite(test=drop_column, setup=instrument_clickhouse_server_log)(user_name=user_name, grant_target_name=role_name)
+        Suite(test=update)(user_name=user_name, grant_target_name=role_name)
+        Suite(test=delete)(user_name=user_name, grant_target_name=role_name)
+        Suite(test=drop_column)(user_name=user_name, grant_target_name=role_name)
 
 @TestSuite
 @Requirements(
@@ -78,6 +94,9 @@ def update(self, user_name, grant_target_name, node=None):
     if node is None:
         node = self.context.node
 
+    with Given("The user has no privilege"):
+        node.query(f"REVOKE ALL ON *.* FROM {grant_target_name}")
+
     with Scenario("KILL ALTER UPDATE without privilege"):
         table_name = f"merge_tree_{getuid()}"
 
@@ -86,7 +105,13 @@ def update(self, user_name, grant_target_name, node=None):
             with Given("I have an ALTER UPDATE mutation"):
                 node.query(f"ALTER TABLE {table_name} UPDATE a = x WHERE 1")
 
-            with When("I try to KILL MUTATION"):
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I try to KILL MUTATION"):
                 node.query(f"KILL MUTATION WHERE database = 'default' AND table = '{table_name}'", settings = [("user", user_name)],
                     exitcode=exitcode, message="Exception: Not allowed to kill mutation.")
 
@@ -101,7 +126,7 @@ def update(self, user_name, grant_target_name, node=None):
             with When("I grant the ALTER UPDATE privilege"):
                 node.query(f"GRANT ALTER UPDATE ON {table_name} TO {grant_target_name}")
 
-            with When("I try to KILL MUTATION"):
+            with Then("I try to KILL MUTATION"):
                 node.query(f"KILL MUTATION WHERE database = 'default' AND table = '{table_name}'", settings = [("user", user_name)])
 
     with Scenario("KILL ALTER UPDATE with revoked privilege"):
@@ -118,10 +143,42 @@ def update(self, user_name, grant_target_name, node=None):
             with And("I revoke the ALTER UPDATE privilege"):
                 node.query(f"REVOKE ALTER UPDATE ON {table_name} FROM {grant_target_name}")
 
-            with When("I try to KILL MUTATION"):
+            with Then("I try to KILL MUTATION"):
                 node.query(f"KILL MUTATION WHERE database = 'default' AND table = '{table_name}'", settings = [("user", user_name)],
                     exitcode=exitcode, message="Exception: Not allowed to kill mutation.")
 
+    with Scenario("KILL ALTER UPDATE with revoked ALL privilege"):
+        table_name = f"merge_tree_{getuid()}"
+
+        with table(node, table_name):
+
+            with Given("I have an ALTER UPDATE mutation"):
+                node.query(f"ALTER TABLE {table_name} UPDATE a = x WHERE 1")
+
+            with When("I grant the ALTER UPDATE privilege"):
+                node.query(f"GRANT ALTER UPDATE ON {table_name} TO {grant_target_name}")
+
+            with And("I revoke ALL privilege"):
+                node.query(f"REVOKE ALL ON *.* FROM {grant_target_name}")
+
+            with Then("I try to KILL MUTATION"):
+                node.query(f"KILL MUTATION WHERE database = 'default' AND table = '{table_name}'", settings = [("user", user_name)],
+                    exitcode=exitcode, message="Exception: Not allowed to kill mutation.")
+
+    with Scenario("KILL ALTER UPDATE with ALL privilege"):
+        table_name = f"merge_tree_{getuid()}"
+
+        with table(node, table_name):
+
+            with Given("I have an ALTER UPDATE mutation"):
+                node.query(f"ALTER TABLE {table_name} UPDATE a = x WHERE 1")
+
+            with When("I grant the ALL privilege"):
+                node.query(f"GRANT ALL ON *.* TO {grant_target_name}")
+
+            with Then("I try to KILL MUTATION"):
+                node.query(f"KILL MUTATION WHERE database = 'default' AND table = '{table_name}'", settings = [("user", user_name)])
+
 @TestSuite
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_KillMutation_AlterDelete("1.0")
@@ -135,6 +192,9 @@ def delete(self, user_name, grant_target_name, node=None):
     if node is None:
         node = self.context.node
 
+    with Given("The user has no privilege"):
+        node.query(f"REVOKE ALL ON *.* FROM {grant_target_name}")
+
     with Scenario("KILL ALTER DELETE without privilege"):
         table_name = f"merge_tree_{getuid()}"
 
@@ -143,7 +203,13 @@ def delete(self, user_name, grant_target_name, node=None):
             with Given("I have an ALTER DELETE mutation"):
                 node.query(f"ALTER TABLE {table_name} DELETE WHERE 1")
 
-            with When("I try to KILL MUTATION"):
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I try to KILL MUTATION"):
                 node.query(f"KILL MUTATION WHERE database = 'default' AND table = '{table_name}'", settings = [("user", user_name)],
                     exitcode=exitcode, message="Exception: Not allowed to kill mutation.")
 
@@ -158,7 +224,7 @@ def delete(self, user_name, grant_target_name, node=None):
             with When("I grant the ALTER DELETE privilege"):
                 node.query(f"GRANT ALTER DELETE ON {table_name} TO {grant_target_name}")
 
-            with When("I try to KILL MUTATION"):
+            with Then("I try to KILL MUTATION"):
                 node.query(f"KILL MUTATION WHERE database = 'default' AND table = '{table_name}'", settings = [("user", user_name)])
 
     with Scenario("KILL ALTER DELETE with revoked privilege"):
@@ -175,10 +241,42 @@ def delete(self, user_name, grant_target_name, node=None):
             with And("I revoke the ALTER DELETE privilege"):
                 node.query(f"REVOKE ALTER DELETE ON {table_name} FROM {grant_target_name}")
 
-            with When("I try to KILL MUTATION"):
+            with Then("I try to KILL MUTATION"):
                 node.query(f"KILL MUTATION WHERE database = 'default' AND table = '{table_name}'", settings = [("user", user_name)],
                     exitcode=exitcode, message="Exception: Not allowed to kill mutation.")
 
+    with Scenario("KILL ALTER DELETE with revoked ALL privilege"):
+        table_name = f"merge_tree_{getuid()}"
+
+        with table(node, table_name):
+
+            with Given("I have an ALTER DELETE mutation"):
+                node.query(f"ALTER TABLE {table_name} DELETE WHERE 1")
+
+            with When("I grant the ALTER DELETE privilege"):
+                node.query(f"GRANT ALTER DELETE ON {table_name} TO {grant_target_name}")
+
+            with And("I revoke ALL privilege"):
+                node.query(f"REVOKE ALL ON *.* FROM {grant_target_name}")
+
+            with Then("I try to KILL MUTATION"):
+                node.query(f"KILL MUTATION WHERE database = 'default' AND table = '{table_name}'", settings = [("user", user_name)],
+                    exitcode=exitcode, message="Exception: Not allowed to kill mutation.")
+
+    with Scenario("KILL ALTER DELETE with ALL privilege"):
+        table_name = f"merge_tree_{getuid()}"
+
+        with table(node, table_name):
+
+            with Given("I have an ALTER DELETE mutation"):
+                node.query(f"ALTER TABLE {table_name} DELETE WHERE 1")
+
+            with When("I grant the ALL privilege"):
+                node.query(f"GRANT ALL ON *.* TO {grant_target_name}")
+
+            with Then("I try to KILL MUTATION"):
+                node.query(f"KILL MUTATION WHERE database = 'default' AND table = '{table_name}'", settings = [("user", user_name)])
+
 @TestSuite
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_KillMutation_AlterDropColumn("1.0")
@@ -192,6 +290,9 @@ def drop_column(self, user_name, grant_target_name, node=None):
     if node is None:
         node = self.context.node
 
+    with Given("The user has no privilege"):
+        node.query(f"REVOKE ALL ON *.* FROM {grant_target_name}")
+
     with Scenario("KILL ALTER DROP COLUMN without privilege"):
         table_name = f"merge_tree_{getuid()}"
 
@@ -200,7 +301,13 @@ def drop_column(self, user_name, grant_target_name, node=None):
             with Given("I have an ALTER DROP COLUMN mutation"):
                 node.query(f"ALTER TABLE {table_name} DROP COLUMN x")
 
-            with When("I try to KILL MUTATION"):
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I try to KILL MUTATION"):
                 node.query(f"KILL MUTATION WHERE database = 'default' AND table = '{table_name}'", settings = [("user", user_name)],
                     exitcode=exitcode, message="Exception: Not allowed to kill mutation.")
 
@@ -215,7 +322,7 @@ def drop_column(self, user_name, grant_target_name, node=None):
             with When("I grant the ALTER DROP COLUMN privilege"):
                 node.query(f"GRANT ALTER DROP COLUMN ON {table_name} TO {grant_target_name}")
 
-            with When("I try to KILL MUTATION"):
+            with Then("I try to KILL MUTATION"):
                 node.query(f"KILL MUTATION WHERE database = 'default' AND table = '{table_name}'", settings = [("user", user_name)])
 
     with Scenario("KILL ALTER DROP COLUMN with revoked privilege"):
@@ -232,13 +339,47 @@ def drop_column(self, user_name, grant_target_name, node=None):
             with And("I revoke the ALTER DROP COLUMN privilege"):
                 node.query(f"REVOKE ALTER DROP COLUMN ON {table_name} FROM {grant_target_name}")
 
-            with When("I try to KILL MUTATION"):
+            with Then("I try to KILL MUTATION"):
                 node.query(f"KILL MUTATION WHERE database = 'default' AND table = '{table_name}'", settings = [("user", user_name)],
                     exitcode=exitcode, message="Exception: Not allowed to kill mutation.")
 
+    with Scenario("KILL ALTER DROP COLUMN with revoked privilege"):
+        table_name = f"merge_tree_{getuid()}"
+
+        with table(node, table_name):
+
+            with Given("I have an ALTER DROP COLUMN mutation"):
+                node.query(f"ALTER TABLE {table_name} DROP COLUMN x")
+
+            with When("I grant the ALTER DROP COLUMN privilege"):
+                node.query(f"GRANT ALTER DROP COLUMN ON {table_name} TO {grant_target_name}")
+
+            with And("I revoke ALL privilege"):
+                node.query(f"REVOKE ALL ON *.* FROM {grant_target_name}")
+
+            with Then("I try to KILL MUTATION"):
+                node.query(f"KILL MUTATION WHERE database = 'default' AND table = '{table_name}'", settings = [("user", user_name)],
+                    exitcode=exitcode, message="Exception: Not allowed to kill mutation.")
+
+    with Scenario("KILL ALTER DROP COLUMN with ALL privilege"):
+        table_name = f"merge_tree_{getuid()}"
+
+        with table(node, table_name):
+
+            with Given("I have an ALTER DROP COLUMN mutation"):
+                node.query(f"ALTER TABLE {table_name} DROP COLUMN x")
+
+            with When("I grant the ALL privilege"):
+                node.query(f"GRANT ALL ON *.* TO {grant_target_name}")
+
+            with Then("I try to KILL MUTATION"):
+                node.query(f"KILL MUTATION WHERE database = 'default' AND table = '{table_name}'", settings = [("user", user_name)])
+
 @TestFeature
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_KillMutation("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 @Name("kill mutation")
 def feature(self, node="clickhouse1", stress=None, parallel=None):
diff --git a/tests/testflows/rbac/tests/privileges/kill_query.py b/tests/testflows/rbac/tests/privileges/kill_query.py
index 161ee7b35e0..d1f96e23fd8 100644
--- a/tests/testflows/rbac/tests/privileges/kill_query.py
+++ b/tests/testflows/rbac/tests/privileges/kill_query.py
@@ -12,13 +12,13 @@ def privilege_granted_directly_or_via_role(self, node=None):
     if node is None:
         node = self.context.node
 
-    with Suite("user with direct privilege", setup=instrument_clickhouse_server_log):
+    with Suite("user with direct privilege"):
         with user(node, user_name):
 
             with When(f"I run checks that {user_name} is only able to execute KILL QUERY with required privileges"):
                 privilege_check(grant_target_name=user_name, user_name=user_name, node=node)
 
-    with Suite("user with privilege via role", setup=instrument_clickhouse_server_log):
+    with Suite("user with privilege via role"):
         with user(node, user_name), role(node, role_name):
 
             with When("I grant the role to the user"):
@@ -32,20 +32,27 @@ def privilege_check(grant_target_name, user_name, node=None):
     """
     exitcode, message = errors.not_enough_privileges(name=f"{user_name}")
 
-    with Scenario("user without privilege", setup=instrument_clickhouse_server_log):
+    with Scenario("user without privilege"):
 
-        with When("I attempt to kill a query without privilege"):
+        with When("I grant the user NONE privilege"):
+            node.query(f"GRANT NONE TO {grant_target_name}")
+
+        with And("I grant the user USAGE privilege"):
+            node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+        with Then("I attempt to kill a query without privilege"):
             node.query(f"KILL QUERY WHERE user ='default'", settings = [("user", user_name)],
                 exitcode=exitcode, message=message)
 
-    with Scenario("user with privilege", setup=instrument_clickhouse_server_log):
+    with Scenario("user with privilege"):
+
         with When("I grant kill query privilege"):
             node.query(f"GRANT KILL QUERY TO {grant_target_name}")
 
         with Then("I attempt to kill a query"):
             node.query(f"KILL QUERY WHERE 1", settings = [("user", user_name)])
 
-    with Scenario("user with revoked privilege", setup=instrument_clickhouse_server_log):
+    with Scenario("user with revoked privilege"):
 
         with When("I grant the kill query privilege"):
             node.query(f"GRANT KILL QUERY TO {grant_target_name}")
@@ -57,7 +64,19 @@ def privilege_check(grant_target_name, user_name, node=None):
             node.query(f"KILL QUERY WHERE 1", settings = [("user", user_name)],
                 exitcode=exitcode, message=message)
 
-    with Scenario("execute on cluster", setup=instrument_clickhouse_server_log):
+    with Scenario("user with revoked ALL privilege"):
+
+        with When("I grant the kill query privilege"):
+            node.query(f"GRANT KILL QUERY TO {grant_target_name}")
+
+        with And("I revoke ALL privilege"):
+            node.query(f"REVOKE ALL ON *.* FROM {grant_target_name}")
+
+        with Then("I attempt to kill a query"):
+            node.query(f"KILL QUERY WHERE 1", settings = [("user", user_name)],
+                exitcode=exitcode, message=message)
+
+    with Scenario("execute on cluster"):
 
         with When("I grant the truncate privilege"):
             node.query(f"GRANT KILL QUERY TO {grant_target_name}")
@@ -65,9 +84,22 @@ def privilege_check(grant_target_name, user_name, node=None):
         with Then("I attempt to kill a query"):
             node.query(f"KILL QUERY ON CLUSTER WHERE 1'", settings = [("user", user_name)])
 
+    with Scenario("user with ALL privilege"):
+
+        with When("I revoke ALL privilege"):
+            node.query(f"REVOKE ALL ON *.* FROM {grant_target_name}")
+
+        with And("I grant ALL privilege"):
+            node.query(f"GRANT ALL ON *.* ON {grant_target_name}")
+
+        with Then("I attempt to kill a query"):
+            node.query(f"KILL QUERY WHERE 1", settings = [("user", user_name)])
+
 @TestFeature
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_KillQuery("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 @Name("kill query")
 def feature(self, node="clickhouse1", stress=None, parallel=None):
@@ -80,5 +112,5 @@ def feature(self, node="clickhouse1", stress=None, parallel=None):
     if stress is not None:
         self.context.stress = stress
 
-    with Suite(test=privilege_granted_directly_or_via_role):
+    with Suite(test=privilege_granted_directly_or_via_role, setup=instrument_clickhouse_server_log):
         privilege_granted_directly_or_via_role()
diff --git a/tests/testflows/rbac/tests/privileges/optimize.py b/tests/testflows/rbac/tests/privileges/optimize.py
index b0e8b69e372..7d3f41a43b4 100644
--- a/tests/testflows/rbac/tests/privileges/optimize.py
+++ b/tests/testflows/rbac/tests/privileges/optimize.py
@@ -12,13 +12,13 @@ def privilege_granted_directly_or_via_role(self, table_type, node=None):
     if node is None:
         node = self.context.node
 
-    with Suite("user with direct privilege", setup=instrument_clickhouse_server_log):
+    with Suite("user with direct privilege"):
         with user(node, user_name):
 
             with When(f"I run checks that {user_name} is only able to execute OPTIMIZE with required privileges"):
                 privilege_check(grant_target_name=user_name, user_name=user_name, table_type=table_type, node=node)
 
-    with Suite("user with privilege via role", setup=instrument_clickhouse_server_log):
+    with Suite("user with privilege via role"):
         with user(node, user_name), role(node, role_name):
 
             with When("I grant the role to the user"):
@@ -32,16 +32,22 @@ def privilege_check(grant_target_name, user_name, table_type, node=None):
     """
     exitcode, message = errors.not_enough_privileges(name=f"{user_name}")
 
-    with Scenario("user without privilege", setup=instrument_clickhouse_server_log):
+    with Scenario("user without privilege"):
         table_name = f"merge_tree_{getuid()}"
 
         with table(node, table_name, table_type):
 
-            with When("I attempt to optimize a table without privilege"):
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I attempt to optimize a table without privilege"):
                 node.query(f"OPTIMIZE TABLE {table_name} FINAL", settings = [("user", user_name)],
                     exitcode=exitcode, message=message)
 
-    with Scenario("user with privilege", setup=instrument_clickhouse_server_log):
+    with Scenario("user with privilege"):
         table_name = f"merge_tree_{getuid()}"
 
         with table(node, table_name, table_type):
@@ -52,7 +58,7 @@ def privilege_check(grant_target_name, user_name, table_type, node=None):
             with Then("I attempt to optimize a table"):
                 node.query(f"OPTIMIZE TABLE {table_name}", settings = [("user", user_name)])
 
-    with Scenario("user with revoked privilege", setup=instrument_clickhouse_server_log):
+    with Scenario("user with revoked privilege"):
         table_name = f"merge_tree_{getuid()}"
 
         with table(node, table_name, table_type):
@@ -67,7 +73,22 @@ def privilege_check(grant_target_name, user_name, table_type, node=None):
                 node.query(f"OPTIMIZE TABLE {table_name}", settings = [("user", user_name)],
                     exitcode=exitcode, message=message)
 
-    with Scenario("execute on cluster", setup=instrument_clickhouse_server_log):
+    with Scenario("user with revoked ALL privilege"):
+        table_name = f"merge_tree_{getuid()}"
+
+        with table(node, table_name, table_type):
+
+            with When("I grant the optimize privilege"):
+                node.query(f"GRANT OPTIMIZE ON {table_name} TO {grant_target_name}")
+
+            with And("I revoke ALL privilege"):
+                node.query(f"REVOKE ALL ON *.* FROM {grant_target_name}")
+
+            with Then("I attempt to optimize a table"):
+                node.query(f"OPTIMIZE TABLE {table_name}", settings = [("user", user_name)],
+                    exitcode=exitcode, message=message)
+
+    with Scenario("execute on cluster"):
         table_name = f"merge_tree_{getuid()}"
 
         try:
@@ -84,9 +105,24 @@ def privilege_check(grant_target_name, user_name, table_type, node=None):
             with Finally("I drop the table from the cluster"):
                 node.query(f"DROP TABLE IF EXISTS {table_name} ON CLUSTER sharded_cluster")
 
+    with Scenario("user with ALL privilege"):
+        table_name = f"merge_tree_{getuid()}"
+
+        with table(node, table_name, table_type):
+
+            with When("I revoke ALL privilege"):
+                node.query(f"REVOKE ALL ON *.* FROM {grant_target_name}")
+
+            with And("I grant ALL privilege"):
+                node.query(f"GRANT ALL ON *.* TO {grant_target_name}")
+
+            with Then("I attempt to optimize a table"):
+                node.query(f"OPTIMIZE TABLE {table_name}", settings = [("user", user_name)])
 @TestFeature
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_Optimize("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 @Examples("table_type", [
     (key,) for key in table_types.keys()
@@ -109,5 +145,5 @@ def feature(self, node="clickhouse1", stress=None, parallel=None):
             continue
 
         with Example(str(example)):
-            with Suite(test=privilege_granted_directly_or_via_role):
+            with Suite(test=privilege_granted_directly_or_via_role, setup=instrument_clickhouse_server_log):
                 privilege_granted_directly_or_via_role(table_type=table_type)
diff --git a/tests/testflows/rbac/tests/privileges/public_tables.py b/tests/testflows/rbac/tests/privileges/public_tables.py
index 98077438946..ed17c1a77ea 100755
--- a/tests/testflows/rbac/tests/privileges/public_tables.py
+++ b/tests/testflows/rbac/tests/privileges/public_tables.py
@@ -95,5 +95,5 @@ def sensitive_tables(self, node=None):
 def feature(self, node="clickhouse1"):
     self.context.node = self.context.cluster.node(node)
 
-    Scenario(run=public_tables, setup=instrument_clickhouse_server_log, flags=TE)
-    Scenario(run=sensitive_tables, setup=instrument_clickhouse_server_log, flags=TE)
\ No newline at end of file
+    Scenario(run=public_tables, setup=instrument_clickhouse_server_log)
+    Scenario(run=sensitive_tables, setup=instrument_clickhouse_server_log)
diff --git a/tests/testflows/rbac/tests/privileges/role_admin.py b/tests/testflows/rbac/tests/privileges/role_admin.py
index 955b0fcd258..8deea7874cd 100644
--- a/tests/testflows/rbac/tests/privileges/role_admin.py
+++ b/tests/testflows/rbac/tests/privileges/role_admin.py
@@ -17,7 +17,7 @@ def privileges_granted_directly(self, node=None):
 
     with user(node, f"{user_name}"):
 
-        Suite(test=role_admin, flags=TE)(grant_target_name=user_name, user_name=user_name)
+        Suite(test=role_admin)(grant_target_name=user_name, user_name=user_name)
 
 @TestSuite
 def privileges_granted_via_role(self, node=None):
@@ -35,7 +35,7 @@ def privileges_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(test=role_admin, flags=TE)(grant_target_name=role_name, user_name=user_name)
+        Suite(test=role_admin)(grant_target_name=role_name, user_name=user_name)
 
 @TestSuite
 def role_admin(self, grant_target_name, user_name, node=None):
@@ -52,7 +52,13 @@ def role_admin(self, grant_target_name, user_name, node=None):
 
         with user(node, target_user_name), role(node, role_admin_name):
 
-            with When("I check the user can't grant a role"):
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I check the user can't grant a role"):
                 node.query(f"GRANT {role_admin_name} TO {target_user_name}", settings=[("user",user_name)],
                     exitcode=exitcode, message=message)
 
@@ -105,10 +111,40 @@ def role_admin(self, grant_target_name, user_name, node=None):
                 node.query(f"GRANT {role_admin_name} TO {target_user_name}", settings=[("user",user_name)],
                     exitcode=exitcode, message=message)
 
+    with Scenario("Grant role with revoked ALL privilege"):
+        role_admin_name = f"role_admin_{getuid()}"
+        target_user_name = f"target_user_{getuid()}"
+
+        with user(node, target_user_name), role(node, role_admin_name):
+
+            with When(f"I grant ROLE ADMIN"):
+                node.query(f"GRANT ROLE ADMIN ON *.* TO {grant_target_name}")
+
+            with And("I revoke ALL privilege"):
+                node.query(f"REVOKE ALL ON *.* FROM {grant_target_name}")
+
+            with Then("I check the user cannot grant a role"):
+                node.query(f"GRANT {role_admin_name} TO {target_user_name}", settings=[("user",user_name)],
+                    exitcode=exitcode, message=message)
+
+    with Scenario("Grant role with ALL privilege"):
+        role_admin_name = f"role_admin_{getuid()}"
+        target_user_name = f"target_user_{getuid()}"
+
+        with user(node, target_user_name), role(node, role_admin_name):
+
+            with When(f"I grant ALL privilege"):
+                node.query(f"GRANT ALL ON *.* TO {grant_target_name}")
+
+            with Then("I check the user can grant a role"):
+                node.query(f"GRANT {role_admin_name} TO {target_user_name}", settings = [("user", f"{user_name}")])
+
 @TestFeature
 @Name("role admin")
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_RoleAdmin("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 def feature(self, node="clickhouse1"):
     """Check the RBAC functionality of ROLE ADMIN.
diff --git a/tests/testflows/rbac/tests/privileges/select.py b/tests/testflows/rbac/tests/privileges/select.py
index e58dd8184d2..036ea944ae1 100755
--- a/tests/testflows/rbac/tests/privileges/select.py
+++ b/tests/testflows/rbac/tests/privileges/select.py
@@ -9,17 +9,31 @@ from rbac.helper.common import *
 import rbac.helper.errors as errors
 
 @TestScenario
+@Requirements(
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
+)
 def without_privilege(self, table_type, node=None):
     """Check that user without select privilege on a table is not able to select on that table.
     """
     user_name = f"user_{getuid()}"
     table_name = f"table_{getuid()}"
+
     if node is None:
         node = self.context.node
+
     with table(node, table_name, table_type):
+
         with user(node, user_name):
-            with When("I run SELECT without privilege"):
+
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {user_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {user_name}")
+
+            with Then("I run SELECT without privilege"):
                 exitcode, message = errors.not_enough_privileges(name=user_name)
+
                 node.query(f"SELECT * FROM {table_name}", settings = [("user",user_name)],
                             exitcode=exitcode, message=message)
 
@@ -32,16 +46,52 @@ def user_with_privilege(self, table_type, node=None):
     """
     user_name = f"user_{getuid()}"
     table_name = f"table_{getuid()}"
+
     if node is None:
         node = self.context.node
+
     with table(node, table_name, table_type):
+
         with Given("I have some data inserted into table"):
             node.query(f"INSERT INTO {table_name} (d) VALUES ('2020-01-01')")
+
         with user(node, user_name):
+
             with When("I grant privilege"):
                 node.query(f"GRANT SELECT ON {table_name} TO {user_name}")
+
             with Then("I verify SELECT command"):
                 user_select = node.query(f"SELECT d FROM {table_name}", settings = [("user",user_name)])
+
+                default = node.query(f"SELECT d FROM {table_name}")
+                assert user_select.output == default.output, error()
+
+@TestScenario
+@Requirements(
+    RQ_SRS_006_RBAC_Privileges_All("1.0")
+)
+def user_with_all_privilege(self, table_type, node=None):
+    """Check that user can select from a table if have ALL privilege.
+    """
+    user_name = f"user_{getuid()}"
+    table_name = f"table_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+
+    with table(node, table_name, table_type):
+
+        with Given("I have some data inserted into table"):
+            node.query(f"INSERT INTO {table_name} (d) VALUES ('2020-01-01')")
+
+        with user(node, user_name):
+
+            with When("I grant privilege"):
+                node.query(f"GRANT ALL ON *.* TO {user_name}")
+
+            with Then("I verify SELECT command"):
+                user_select = node.query(f"SELECT d FROM {table_name}", settings = [("user",user_name)])
+
                 default = node.query(f"SELECT d FROM {table_name}")
                 assert user_select.output == default.output, error()
 
@@ -55,15 +105,47 @@ def user_with_revoked_privilege(self, table_type, node=None):
     """
     user_name = f"user_{getuid()}"
     table_name = f"table_{getuid()}"
+
     if node is None:
         node = self.context.node
+
     with table(node, table_name, table_type):
+
         with user(node, user_name):
+
             with When("I grant privilege"):
                 node.query(f"GRANT SELECT ON {table_name} TO {user_name}")
+
             with And("I revoke privilege"):
                 node.query(f"REVOKE SELECT ON {table_name} FROM {user_name}")
-            with And("I use SELECT, throws exception"):
+
+            with Then("I use SELECT, throws exception"):
+                exitcode, message = errors.not_enough_privileges(name=user_name)
+                node.query(f"SELECT * FROM {table_name}", settings = [("user",user_name)],
+                    exitcode=exitcode, message=message)
+
+@TestScenario
+def user_with_revoked_all_privilege(self, table_type, node=None):
+    """Check that user is unable to select from a table after ALL privilege
+    on that table has been revoked from the user.
+    """
+    user_name = f"user_{getuid()}"
+    table_name = f"table_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+
+    with table(node, table_name, table_type):
+
+        with user(node, user_name):
+
+            with When("I grant privilege"):
+                node.query(f"GRANT SELECT ON {table_name} TO {user_name}")
+
+            with And("I revoke ALL privilege"):
+                node.query(f"REVOKE ALL ON *.* FROM {user_name}")
+
+            with Then("I use SELECT, throws exception"):
                 exitcode, message = errors.not_enough_privileges(name=user_name)
                 node.query(f"SELECT * FROM {table_name}", settings = [("user",user_name)],
                     exitcode=exitcode, message=message)
@@ -90,25 +172,35 @@ def user_column_privileges(self, grant_columns, select_columns_pass, data_pass,
     """
     user_name = f"user_{getuid()}"
     table_name = f"table_{getuid()}"
+
     if node is None:
         node = self.context.node
+
     with table(node, table_name, table_type), user(node, user_name):
+
         with Given("The table has some data on some columns"):
             node.query(f"INSERT INTO {table_name} ({select_columns_pass}) VALUES ({data_pass})")
+
         with When("I grant select privilege"):
             node.query(f"GRANT SELECT({grant_columns}) ON {table_name} TO {user_name}")
+
         if select_columns_fail is not None:
+
             with And("I select from not granted column"):
                 exitcode, message = errors.not_enough_privileges(name=user_name)
                 node.query(f"SELECT ({select_columns_fail}) FROM {table_name}",
                     settings = [("user",user_name)], exitcode=exitcode, message=message)
+
         with Then("I select from granted column, verify correct result"):
             user_select = node.query(f"SELECT ({select_columns_pass}) FROM {table_name}", settings = [("user",user_name)])
             default = node.query(f"SELECT ({select_columns_pass}) FROM {table_name}")
             assert user_select.output == default.output
+
         if revoke_columns is not None:
+
             with When("I revoke select privilege for columns from user"):
                 node.query(f"REVOKE SELECT({revoke_columns}) ON {table_name} FROM {user_name}")
+
             with And("I select from revoked columns"):
                 exitcode, message = errors.not_enough_privileges(name=user_name)
                 node.query(f"SELECT ({select_columns_pass}) FROM {table_name}", settings = [("user",user_name)], exitcode=exitcode, message=message)
@@ -124,17 +216,25 @@ def role_with_privilege(self, table_type, node=None):
     user_name = f"user_{getuid()}"
     role_name = f"role_{getuid()}"
     table_name = f"table_{getuid()}"
+
     if node is None:
         node = self.context.node
+
     with table(node, table_name, table_type):
+
         with Given("I have some data inserted into table"):
             node.query(f"INSERT INTO {table_name} (d) VALUES ('2020-01-01')")
+
         with user(node, user_name):
+
             with role(node, role_name):
+
                 with When("I grant select privilege to a role"):
                     node.query(f"GRANT SELECT ON {table_name} TO {role_name}")
+
                 with And("I grant role to the user"):
                     node.query(f"GRANT {role_name} TO {user_name}")
+
                 with Then("I verify SELECT command"):
                     user_select = node.query(f"SELECT d FROM {table_name}", settings = [("user",user_name)])
                     default = node.query(f"SELECT d FROM {table_name}")
@@ -151,16 +251,23 @@ def role_with_revoked_privilege(self, table_type, node=None):
     user_name = f"user_{getuid()}"
     role_name = f"role_{getuid()}"
     table_name = f"table_{getuid()}"
+
     if node is None:
         node = self.context.node
+
     with table(node, table_name, table_type):
+
         with user(node, user_name), role(node, role_name):
+
             with When("I grant privilege to a role"):
                 node.query(f"GRANT SELECT ON {table_name} TO {role_name}")
+
             with And("I grant the role to a user"):
                 node.query(f"GRANT {role_name} TO {user_name}")
+
             with And("I revoke privilege from the role"):
                 node.query(f"REVOKE SELECT ON {table_name} FROM {role_name}")
+
             with And("I select from the table"):
                 exitcode, message = errors.not_enough_privileges(name=user_name)
                 node.query(f"SELECT * FROM {table_name}", settings = [("user",user_name)],
@@ -174,16 +281,23 @@ def user_with_revoked_role(self, table_type, node=None):
     user_name = f"user_{getuid()}"
     role_name = f"role_{getuid()}"
     table_name = f"table_{getuid()}"
+
     if node is None:
         node = self.context.node
+
     with table(node, table_name, table_type):
+
         with user(node, user_name), role(node, role_name):
+
             with When("I grant privilege to a role"):
                 node.query(f"GRANT SELECT ON {table_name} TO {role_name}")
+
             with And("I grant the role to a user"):
                 node.query(f"GRANT {role_name} TO {user_name}")
+
             with And("I revoke the role from the user"):
                 node.query(f"REVOKE {role_name} FROM {user_name}")
+
             with And("I select from the table"):
                 exitcode, message = errors.not_enough_privileges(name=user_name)
                 node.query(f"SELECT * FROM {table_name}", settings = [("user",user_name)],
@@ -212,28 +326,39 @@ def role_column_privileges(self, grant_columns, select_columns_pass, data_pass,
     user_name = f"user_{getuid()}"
     role_name = f"role_{getuid()}"
     table_name = f"table_{getuid()}"
+
     if node is None:
         node = self.context.node
+
     with table(node, table_name, table_type):
+
         with Given("The table has some data on some columns"):
             node.query(f"INSERT INTO {table_name} ({select_columns_pass}) VALUES ({data_pass})")
+
         with user(node, user_name), role(node, role_name):
+
             with When("I grant select privilege"):
                 node.query(f"GRANT SELECT({grant_columns}) ON {table_name} TO {role_name}")
+
             with And("I grant the role to a user"):
                 node.query(f"GRANT {role_name} TO {user_name}")
+
             if select_columns_fail is not None:
                 with And("I select from not granted column"):
                     exitcode, message = errors.not_enough_privileges(name=user_name)
                     node.query(f"SELECT ({select_columns_fail}) FROM {table_name}",
                         settings = [("user",user_name)], exitcode=exitcode, message=message)
+
             with Then("I verify SELECT command"):
                 user_select = node.query(f"SELECT d FROM {table_name}", settings = [("user",user_name)])
                 default = node.query(f"SELECT d FROM {table_name}")
                 assert user_select.output == default.output, error()
+
             if revoke_columns is not None:
+
                 with When("I revoke select privilege for columns from role"):
                     node.query(f"REVOKE SELECT({revoke_columns}) ON {table_name} FROM {role_name}")
+
                 with And("I select from revoked columns"):
                     exitcode, message = errors.not_enough_privileges(name=user_name)
                     node.query(f"SELECT ({select_columns_pass}) FROM {table_name}",
@@ -250,20 +375,26 @@ def user_with_privilege_on_cluster(self, table_type, node=None):
     user_name = f"user_{getuid()}"
     role_name = f"role_{getuid()}"
     table_name = f"table_{getuid()}"
+
     if node is None:
         node = self.context.node
+
     with table(node, table_name, table_type):
         try:
             with Given("I have some data inserted into table"):
                 node.query(f"INSERT INTO {table_name} (d) VALUES ('2020-01-01')")
+
             with Given("I have a user on a cluster"):
                 node.query(f"CREATE USER OR REPLACE {user_name} ON CLUSTER sharded_cluster")
+
             with When("I grant select privilege on a cluster"):
                 node.query(f"GRANT ON CLUSTER sharded_cluster SELECT ON {table_name} TO {user_name}")
+
             with Then("I verify SELECT command"):
                 user_select = node.query(f"SELECT d FROM {table_name}", settings = [("user",user_name)])
                 default = node.query(f"SELECT d FROM {table_name}")
                 assert user_select.output == default.output, error()
+
         finally:
             with Finally("I drop the user"):
                 node.query(f"DROP USER {user_name} ON CLUSTER sharded_cluster")
@@ -291,7 +422,10 @@ def feature(self, table_type, parallel=None, stress=None, node="clickhouse1"):
     pool = Pool(10)
 
     try:
-        for scenario in loads(current_module(), Scenario):
-            run_scenario(pool, tasks, Scenario(test=scenario, setup=instrument_clickhouse_server_log), {"table_type" : table_type})
+        try:
+            for scenario in loads(current_module(), Scenario):
+                run_scenario(pool, tasks, Scenario(test=scenario, setup=instrument_clickhouse_server_log), {"table_type" : table_type})
+        finally:
+            join(tasks)
     finally:
-        join(tasks)
+        pool.close()
diff --git a/tests/testflows/rbac/tests/privileges/show/show_columns.py b/tests/testflows/rbac/tests/privileges/show/show_columns.py
index 996663cdcbc..108200e7a57 100644
--- a/tests/testflows/rbac/tests/privileges/show/show_columns.py
+++ b/tests/testflows/rbac/tests/privileges/show/show_columns.py
@@ -18,7 +18,7 @@ def describe_with_privilege_granted_directly(self, node=None):
     with user(node, f"{user_name}"):
         table_name = f"table_name_{getuid()}"
 
-        Suite(test=describe, setup=instrument_clickhouse_server_log)(grant_target_name=user_name, user_name=user_name, table_name=table_name)
+        Suite(test=describe)(grant_target_name=user_name, user_name=user_name, table_name=table_name)
 
 @TestSuite
 def describe_with_privilege_granted_via_role(self, node=None):
@@ -37,7 +37,7 @@ def describe_with_privilege_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(test=describe, setup=instrument_clickhouse_server_log)(grant_target_name=role_name, user_name=user_name, table_name=table_name)
+        Suite(test=describe)(grant_target_name=role_name, user_name=user_name, table_name=table_name)
 
 @TestSuite
 @Requirements(
@@ -54,11 +54,19 @@ def describe(self, grant_target_name, user_name, table_name, node=None):
     with table(node, table_name):
 
         with Scenario("DESCRIBE table without privilege"):
-            with When(f"I attempt to DESCRIBE {table_name}"):
+
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then(f"I attempt to DESCRIBE {table_name}"):
                 node.query(f"DESCRIBE {table_name}", settings=[("user",user_name)],
                     exitcode=exitcode, message=message)
 
         with Scenario("DESCRIBE with privilege"):
+
             with When(f"I grant SHOW COLUMNS on the table"):
                 node.query(f"GRANT SHOW COLUMNS ON {table_name} TO {grant_target_name}")
 
@@ -66,6 +74,7 @@ def describe(self, grant_target_name, user_name, table_name, node=None):
                 node.query(f"DESCRIBE TABLE {table_name}", settings=[("user",user_name)])
 
         with Scenario("DESCRIBE with revoked privilege"):
+
             with When(f"I grant SHOW COLUMNS on the table"):
                 node.query(f"GRANT SHOW COLUMNS ON {table_name} TO {grant_target_name}")
 
@@ -76,6 +85,26 @@ def describe(self, grant_target_name, user_name, table_name, node=None):
                 node.query(f"DESCRIBE {table_name}", settings=[("user",user_name)],
                     exitcode=exitcode, message=message)
 
+        with Scenario("DESCRIBE with revoked ALL privilege"):
+
+            with When(f"I grant SHOW COLUMNS on the table"):
+                node.query(f"GRANT SHOW COLUMNS ON {table_name} TO {grant_target_name}")
+
+            with And("I revoke ALL privilege"):
+                node.query(f"REVOKE ALL ON *.* FROM {grant_target_name}")
+
+            with Then(f"I attempt to DESCRIBE {table_name}"):
+                node.query(f"DESCRIBE {table_name}", settings=[("user",user_name)],
+                    exitcode=exitcode, message=message)
+
+        with Scenario("DESCRIBE with ALL privilege"):
+
+            with When(f"I grant SHOW COLUMNS on the table"):
+                node.query(f"GRANT ALL ON *.* TO {grant_target_name}")
+
+            with Then(f"I attempt to DESCRIBE {table_name}"):
+                node.query(f"DESCRIBE TABLE {table_name}", settings=[("user",user_name)])
+
 @TestSuite
 def show_create_with_privilege_granted_directly(self, node=None):
     """Check that user is able to execute SHOW CREATE on a table if and only if
@@ -89,7 +118,7 @@ def show_create_with_privilege_granted_directly(self, node=None):
     with user(node, f"{user_name}"):
         table_name = f"table_name_{getuid()}"
 
-        Suite(test=show_create, setup=instrument_clickhouse_server_log)(grant_target_name=user_name, user_name=user_name, table_name=table_name)
+        Suite(test=show_create)(grant_target_name=user_name, user_name=user_name, table_name=table_name)
 
 @TestSuite
 def show_create_with_privilege_granted_via_role(self, node=None):
@@ -108,7 +137,7 @@ def show_create_with_privilege_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(test=show_create, setup=instrument_clickhouse_server_log)(grant_target_name=role_name, user_name=user_name, table_name=table_name)
+        Suite(test=show_create)(grant_target_name=role_name, user_name=user_name, table_name=table_name)
 
 @TestSuite
 @Requirements(
@@ -125,11 +154,19 @@ def show_create(self, grant_target_name, user_name, table_name, node=None):
     with table(node, table_name):
 
         with Scenario("SHOW CREATE without privilege"):
-            with When(f"I attempt to SHOW CREATE {table_name}"):
+
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then(f"I attempt to SHOW CREATE {table_name}"):
                 node.query(f"SHOW CREATE TABLE {table_name}", settings=[("user",user_name)],
                     exitcode=exitcode, message=message)
 
         with Scenario("SHOW CREATE with privilege"):
+
             with When(f"I grant SHOW COLUMNS on the table"):
                 node.query(f"GRANT SHOW COLUMNS ON {table_name} TO {grant_target_name}")
 
@@ -137,6 +174,7 @@ def show_create(self, grant_target_name, user_name, table_name, node=None):
                 node.query(f"SHOW CREATE TABLE {table_name}", settings=[("user",user_name)])
 
         with Scenario("SHOW CREATE with revoked privilege"):
+
             with When(f"I grant SHOW COLUMNS on the table"):
                 node.query(f"GRANT SHOW COLUMNS ON {table_name} TO {grant_target_name}")
 
@@ -147,10 +185,20 @@ def show_create(self, grant_target_name, user_name, table_name, node=None):
                 node.query(f"SHOW CREATE TABLE {table_name}", settings=[("user",user_name)],
                     exitcode=exitcode, message=message)
 
+        with Scenario("SHOW CREATE with ALL privilege"):
+
+            with When(f"I grant SHOW COLUMNS on the table"):
+                node.query(f"GRANT ALL ON *.* TO {grant_target_name}")
+
+            with Then(f"I attempt to SHOW CREATE {table_name}"):
+                node.query(f"SHOW CREATE TABLE {table_name}", settings=[("user",user_name)])
+
 @TestFeature
 @Name("show columns")
 @Requirements(
-    RQ_SRS_006_RBAC_ShowColumns_Privilege("1.0")
+    RQ_SRS_006_RBAC_ShowColumns_Privilege("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 def feature(self, node="clickhouse1"):
     """Check the RBAC functionality of SHOW COLUMNS.
diff --git a/tests/testflows/rbac/tests/privileges/show/show_databases.py b/tests/testflows/rbac/tests/privileges/show/show_databases.py
index 27d10ef2b73..39a46947afe 100644
--- a/tests/testflows/rbac/tests/privileges/show/show_databases.py
+++ b/tests/testflows/rbac/tests/privileges/show/show_databases.py
@@ -20,7 +20,7 @@ def dict_privileges_granted_directly(self, node=None):
     with user(node, f"{user_name}"):
         db_name = f"db_name_{getuid()}"
 
-        Suite(run=check_privilege, flags=TE,
+        Suite(run=check_privilege,
             examples=Examples("privilege on grant_target_name user_name db_name", [
                 tuple(list(row)+[user_name,user_name,db_name]) for row in check_privilege.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
@@ -44,13 +44,14 @@ def dict_privileges_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(run=check_privilege, flags=TE,
+        Suite(run=check_privilege,
             examples=Examples("privilege on grant_target_name user_name db_name", [
                 tuple(list(row)+[role_name,user_name,db_name]) for row in check_privilege.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
 
 @TestOutline(Suite)
 @Examples("privilege on",[
+    ("ALL", "*.*"),
     ("SHOW","*.*"),
     ("SHOW DATABASES","db"),
     ("CREATE DATABASE","db"),
@@ -65,9 +66,9 @@ def check_privilege(self, privilege, on, grant_target_name, user_name, db_name,
 
     on = on.replace("db", f"{db_name}")
 
-    Suite(test=show_db, setup=instrument_clickhouse_server_log)(privilege=privilege, on=on, grant_target_name=grant_target_name, user_name=user_name, db_name=db_name)
-    Suite(test=use, setup=instrument_clickhouse_server_log)(privilege=privilege, on=on, grant_target_name=grant_target_name, user_name=user_name, db_name=db_name)
-    Suite(test=show_create, setup=instrument_clickhouse_server_log)(privilege=privilege, on=on, grant_target_name=grant_target_name, user_name=user_name, db_name=db_name)
+    Suite(test=show_db)(privilege=privilege, on=on, grant_target_name=grant_target_name, user_name=user_name, db_name=db_name)
+    Suite(test=use)(privilege=privilege, on=on, grant_target_name=grant_target_name, user_name=user_name, db_name=db_name)
+    Suite(test=show_create)(privilege=privilege, on=on, grant_target_name=grant_target_name, user_name=user_name, db_name=db_name)
 
 @TestSuite
 @Requirements(
@@ -83,14 +84,23 @@ def show_db(self, privilege, on, grant_target_name, user_name, db_name, node=Non
 
     try:
         with Given("I have a database"):
+
             node.query(f"CREATE DATABASE {db_name}")
 
         with Scenario("SHOW DATABASES without privilege"):
-            with When("I check the user doesn't see the database"):
+
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I check the user doesn't see the database"):
                 output = node.query("SHOW DATABASES", settings = [("user", f"{user_name}")]).output
                 assert output == '', error()
 
         with Scenario("SHOW DATABASES with privilege"):
+
             with When(f"I grant {privilege} on the database"):
                 node.query(f"GRANT {privilege} ON {db_name}.* TO {grant_target_name}")
 
@@ -98,6 +108,7 @@ def show_db(self, privilege, on, grant_target_name, user_name, db_name, node=Non
                 output = node.query("SHOW DATABASES", settings = [("user", f"{user_name}")], message = f'{db_name}')
 
         with Scenario("SHOW DATABASES with revoked privilege"):
+
             with When(f"I grant {privilege} on the database"):
                 node.query(f"GRANT {privilege} ON {db_name}.* TO {grant_target_name}")
 
@@ -130,11 +141,19 @@ def use(self, privilege, on, grant_target_name, user_name, db_name, node=None):
             node.query(f"CREATE DATABASE {db_name}")
 
         with Scenario("USE without privilege"):
-            with When(f"I attempt to USE {db_name}"):
+
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then(f"I attempt to USE {db_name}"):
                 node.query(f"USE {db_name}", settings=[("user",user_name)],
                     exitcode=exitcode, message=message)
 
         with Scenario("USE with privilege"):
+
             with When(f"I grant {privilege} on the database"):
                 node.query(f"GRANT {privilege} ON {db_name}.* TO {grant_target_name}")
 
@@ -142,6 +161,7 @@ def use(self, privilege, on, grant_target_name, user_name, db_name, node=None):
                 node.query(f"USE {db_name}", settings=[("user",user_name)])
 
         with Scenario("USE with revoked privilege"):
+
             with When(f"I grant {privilege} on the database"):
                 node.query(f"GRANT {privilege} ON {db_name}.* TO {grant_target_name}")
 
@@ -174,11 +194,19 @@ def show_create(self, privilege, on, grant_target_name, user_name, db_name, node
             node.query(f"CREATE DATABASE {db_name}")
 
         with Scenario("SHOW CREATE without privilege"):
-            with When(f"I attempt to SHOW CREATE {db_name}"):
+
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then(f"I attempt to SHOW CREATE {db_name}"):
                 node.query(f"SHOW CREATE DATABASE {db_name}", settings=[("user",user_name)],
                     exitcode=exitcode, message=message)
 
         with Scenario("SHOW CREATE with privilege"):
+
             with When(f"I grant {privilege} on the database"):
                 node.query(f"GRANT {privilege} ON {db_name}.* TO {grant_target_name}")
 
@@ -186,6 +214,7 @@ def show_create(self, privilege, on, grant_target_name, user_name, db_name, node
                 node.query(f"SHOW CREATE DATABASE {db_name}", settings=[("user",user_name)])
 
         with Scenario("SHOW CREATE with revoked privilege"):
+
             with When(f"I grant {privilege} on the database"):
                 node.query(f"GRANT {privilege} ON {db_name}.* TO {grant_target_name}")
 
@@ -203,7 +232,9 @@ def show_create(self, privilege, on, grant_target_name, user_name, db_name, node
 @TestFeature
 @Name("show databases")
 @Requirements(
-    RQ_SRS_006_RBAC_ShowDatabases_Privilege("1.0")
+    RQ_SRS_006_RBAC_ShowDatabases_Privilege("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 def feature(self, node="clickhouse1"):
     """Check the RBAC functionality of SHOW DATABASES.
diff --git a/tests/testflows/rbac/tests/privileges/show/show_dictionaries.py b/tests/testflows/rbac/tests/privileges/show/show_dictionaries.py
index ec5617af904..5b717b5f47c 100644
--- a/tests/testflows/rbac/tests/privileges/show/show_dictionaries.py
+++ b/tests/testflows/rbac/tests/privileges/show/show_dictionaries.py
@@ -20,7 +20,7 @@ def dict_privileges_granted_directly(self, node=None):
     with user(node, f"{user_name}"):
         dict_name = f"dict_name_{getuid()}"
 
-        Suite(run=check_privilege, flags=TE,
+        Suite(run=check_privilege,
             examples=Examples("privilege on grant_target_name user_name dict_name", [
                 tuple(list(row)+[user_name,user_name,dict_name]) for row in check_privilege.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
@@ -44,13 +44,14 @@ def dict_privileges_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(run=check_privilege, flags=TE,
+        Suite(run=check_privilege,
             examples=Examples("privilege on grant_target_name user_name dict_name", [
                 tuple(list(row)+[role_name,user_name,dict_name]) for row in check_privilege.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
 
 @TestOutline(Suite)
 @Examples("privilege on",[
+    ("ALL", "*.*"),
     ("SHOW","*.*"),
     ("SHOW DICTIONARIES","dict"),
     ("CREATE DICTIONARY","dict"),
@@ -65,9 +66,9 @@ def check_privilege(self, privilege, on, grant_target_name, user_name, dict_name
 
     on = on.replace("dict", f"{dict_name}")
 
-    Suite(test=show_dict, setup=instrument_clickhouse_server_log)(privilege=privilege, on=on, grant_target_name=grant_target_name, user_name=user_name, dict_name=dict_name)
-    Suite(test=exists, setup=instrument_clickhouse_server_log)(privilege=privilege, on=on, grant_target_name=grant_target_name, user_name=user_name, dict_name=dict_name)
-    Suite(test=show_create, setup=instrument_clickhouse_server_log)(privilege=privilege, on=on, grant_target_name=grant_target_name, user_name=user_name, dict_name=dict_name)
+    Suite(test=show_dict)(privilege=privilege, on=on, grant_target_name=grant_target_name, user_name=user_name, dict_name=dict_name)
+    Suite(test=exists)(privilege=privilege, on=on, grant_target_name=grant_target_name, user_name=user_name, dict_name=dict_name)
+    Suite(test=show_create)(privilege=privilege, on=on, grant_target_name=grant_target_name, user_name=user_name, dict_name=dict_name)
 
 @TestSuite
 @Requirements(
@@ -87,7 +88,14 @@ def show_dict(self, privilege, on, grant_target_name, user_name, dict_name, node
             node.query(f"CREATE DICTIONARY {dict_name}(x Int32, y Int32) PRIMARY KEY x LAYOUT(FLAT()) SOURCE(CLICKHOUSE()) LIFETIME(0)")
 
         with Scenario("SHOW DICTIONARIES without privilege"):
-            with When("I check the user doesn't see the dictionary"):
+
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I check the user doesn't see the dictionary"):
                 output = node.query("SHOW DICTIONARIES", settings = [("user", f"{user_name}")]).output
                 assert output == '', error()
 
@@ -131,7 +139,14 @@ def exists(self, privilege, on, grant_target_name, user_name, dict_name, node=No
             node.query(f"CREATE DICTIONARY {dict_name}(x Int32, y Int32) PRIMARY KEY x LAYOUT(FLAT()) SOURCE(CLICKHOUSE()) LIFETIME(0)")
 
         with Scenario("EXISTS without privilege"):
-            with When(f"I check if {dict_name} EXISTS"):
+
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then(f"I check if {dict_name} EXISTS"):
                 node.query(f"EXISTS {dict_name}", settings=[("user",user_name)],
                     exitcode=exitcode, message=message)
 
@@ -175,7 +190,14 @@ def show_create(self, privilege, on, grant_target_name, user_name, dict_name, no
             node.query(f"CREATE DICTIONARY {dict_name}(x Int32, y Int32) PRIMARY KEY x LAYOUT(FLAT()) SOURCE(CLICKHOUSE()) LIFETIME(0)")
 
         with Scenario("SHOW CREATE without privilege"):
-            with When(f"I attempt to SHOW CREATE {dict_name}"):
+
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then(f"I attempt to SHOW CREATE {dict_name}"):
                 node.query(f"SHOW CREATE DICTIONARY {dict_name}", settings=[("user",user_name)],
                     exitcode=exitcode, message=message)
 
@@ -205,6 +227,8 @@ def show_create(self, privilege, on, grant_target_name, user_name, dict_name, no
 @Name("show dictionaries")
 @Requirements(
     RQ_SRS_006_RBAC_ShowDictionaries_Privilege("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 def feature(self, node="clickhouse1"):
     """Check the RBAC functionality of SHOW DICTIONARIES.
diff --git a/tests/testflows/rbac/tests/privileges/show/show_quotas.py b/tests/testflows/rbac/tests/privileges/show/show_quotas.py
index d84b5192677..20476ae759b 100644
--- a/tests/testflows/rbac/tests/privileges/show/show_quotas.py
+++ b/tests/testflows/rbac/tests/privileges/show/show_quotas.py
@@ -29,7 +29,7 @@ def privileges_granted_directly(self, node=None):
 
     with user(node, f"{user_name}"):
 
-        Suite(run=check_privilege, flags=TE,
+        Suite(run=check_privilege,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[user_name,user_name]) for row in check_privilege.examples
             ], args=Args(name="privilege={privilege}", format_name=True)))
@@ -50,13 +50,14 @@ def privileges_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(run=check_privilege, flags=TE,
+        Suite(run=check_privilege,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[role_name,user_name]) for row in check_privilege.examples
             ], args=Args(name="privilege={privilege}", format_name=True)))
 
 @TestOutline(Suite)
 @Examples("privilege",[
+    ("ALL",),
     ("ACCESS MANAGEMENT",),
     ("SHOW ACCESS",),
     ("SHOW QUOTAS",),
@@ -69,8 +70,8 @@ def check_privilege(self, privilege, grant_target_name, user_name, node=None):
     if node is None:
         node = self.context.node
 
-    Suite(test=show_quotas, setup=instrument_clickhouse_server_log)(privilege=privilege, grant_target_name=grant_target_name, user_name=user_name)
-    Suite(test=show_create, setup=instrument_clickhouse_server_log)(privilege=privilege, grant_target_name=grant_target_name, user_name=user_name)
+    Suite(test=show_quotas)(privilege=privilege, grant_target_name=grant_target_name, user_name=user_name)
+    Suite(test=show_create)(privilege=privilege, grant_target_name=grant_target_name, user_name=user_name)
 
 @TestSuite
 @Requirements(
@@ -86,7 +87,13 @@ def show_quotas(self, privilege, grant_target_name, user_name, node=None):
 
     with Scenario("SHOW QUOTAS without privilege"):
 
-        with When("I check the user can't use SHOW QUOTAS"):
+        with When("I grant the user NONE privilege"):
+            node.query(f"GRANT NONE TO {grant_target_name}")
+
+        with And("I grant the user USAGE privilege"):
+            node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+        with Then("I check the user can't use SHOW QUOTAS"):
             node.query(f"SHOW QUOTAS", settings=[("user",user_name)],
                 exitcode=exitcode, message=message)
 
@@ -127,7 +134,13 @@ def show_create(self, privilege, grant_target_name, user_name, node=None):
 
         with quota(node, target_quota_name):
 
-            with When("I check the user can't use SHOW CREATE QUOTA"):
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I check the user can't use SHOW CREATE QUOTA"):
                 node.query(f"SHOW CREATE QUOTA {target_quota_name}", settings=[("user",user_name)],
                     exitcode=exitcode, message=message)
 
@@ -161,6 +174,8 @@ def show_create(self, privilege, grant_target_name, user_name, node=None):
 @Name("show quotas")
 @Requirements(
     RQ_SRS_006_RBAC_ShowQuotas_Privilege("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 def feature(self, node="clickhouse1"):
     """Check the RBAC functionality of SHOW QUOTAS.
diff --git a/tests/testflows/rbac/tests/privileges/show/show_roles.py b/tests/testflows/rbac/tests/privileges/show/show_roles.py
index 3106e1c5df3..14d038102dd 100644
--- a/tests/testflows/rbac/tests/privileges/show/show_roles.py
+++ b/tests/testflows/rbac/tests/privileges/show/show_roles.py
@@ -17,7 +17,7 @@ def privileges_granted_directly(self, node=None):
 
     with user(node, f"{user_name}"):
 
-        Suite(run=check_privilege, flags=TE,
+        Suite(run=check_privilege,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[user_name,user_name]) for row in check_privilege.examples
             ], args=Args(name="privilege={privilege}", format_name=True)))
@@ -38,13 +38,14 @@ def privileges_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(run=check_privilege, flags=TE,
+        Suite(run=check_privilege,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[role_name,user_name]) for row in check_privilege.examples
             ], args=Args(name="privilege={privilege}", format_name=True)))
 
 @TestOutline(Suite)
 @Examples("privilege",[
+    ("ALL",),
     ("ACCESS MANAGEMENT",),
     ("SHOW ACCESS",),
     ("SHOW ROLES",),
@@ -57,8 +58,8 @@ def check_privilege(self, privilege, grant_target_name, user_name, node=None):
     if node is None:
         node = self.context.node
 
-    Suite(test=show_roles, setup=instrument_clickhouse_server_log)(privilege=privilege, grant_target_name=grant_target_name, user_name=user_name)
-    Suite(test=show_create, setup=instrument_clickhouse_server_log)(privilege=privilege, grant_target_name=grant_target_name, user_name=user_name)
+    Suite(test=show_roles)(privilege=privilege, grant_target_name=grant_target_name, user_name=user_name)
+    Suite(test=show_create)(privilege=privilege, grant_target_name=grant_target_name, user_name=user_name)
 
 @TestSuite
 @Requirements(
@@ -74,7 +75,13 @@ def show_roles(self, privilege, grant_target_name, user_name, node=None):
 
     with Scenario("SHOW ROLES without privilege"):
 
-        with When("I check the user can't use SHOW ROLES"):
+        with When("I grant the user NONE privilege"):
+            node.query(f"GRANT NONE TO {grant_target_name}")
+
+        with And("I grant the user USAGE privilege"):
+            node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+        with Then("I check the user can't use SHOW ROLES"):
             node.query(f"SHOW ROLES", settings=[("user",user_name)],
                 exitcode=exitcode, message=message)
 
@@ -115,7 +122,13 @@ def show_create(self, privilege, grant_target_name, user_name, node=None):
 
         with role(node, target_role_name):
 
-            with When("I check the user can't use SHOW CREATE ROLE"):
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I check the user can't use SHOW CREATE ROLE"):
                 node.query(f"SHOW CREATE ROLE {target_role_name}", settings=[("user",user_name)],
                     exitcode=exitcode, message=message)
 
@@ -149,6 +162,8 @@ def show_create(self, privilege, grant_target_name, user_name, node=None):
 @Name("show roles")
 @Requirements(
     RQ_SRS_006_RBAC_ShowRoles_Privilege("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 def feature(self, node="clickhouse1"):
     """Check the RBAC functionality of SHOW ROLES.
diff --git a/tests/testflows/rbac/tests/privileges/show/show_row_policies.py b/tests/testflows/rbac/tests/privileges/show/show_row_policies.py
index cfa25284cee..789c4c95223 100644
--- a/tests/testflows/rbac/tests/privileges/show/show_row_policies.py
+++ b/tests/testflows/rbac/tests/privileges/show/show_row_policies.py
@@ -29,7 +29,7 @@ def privileges_granted_directly(self, node=None):
 
     with user(node, f"{user_name}"):
 
-        Suite(run=check_privilege, flags=TE,
+        Suite(run=check_privilege,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[user_name,user_name]) for row in check_privilege.examples
             ], args=Args(name="privilege={privilege}", format_name=True)))
@@ -50,13 +50,14 @@ def privileges_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(run=check_privilege, flags=TE,
+        Suite(run=check_privilege,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[role_name,user_name]) for row in check_privilege.examples
             ], args=Args(name="privilege={privilege}", format_name=True)))
 
 @TestOutline(Suite)
 @Examples("privilege",[
+    ("ALL",),
     ("ACCESS MANAGEMENT",),
     ("SHOW ACCESS",),
     ("SHOW ROW POLICIES",),
@@ -71,8 +72,8 @@ def check_privilege(self, privilege, grant_target_name, user_name, node=None):
     if node is None:
         node = self.context.node
 
-    Suite(test=show_row_policies, setup=instrument_clickhouse_server_log)(privilege=privilege, grant_target_name=grant_target_name, user_name=user_name)
-    Suite(test=show_create, setup=instrument_clickhouse_server_log)(privilege=privilege, grant_target_name=grant_target_name, user_name=user_name)
+    Suite(test=show_row_policies)(privilege=privilege, grant_target_name=grant_target_name, user_name=user_name)
+    Suite(test=show_create)(privilege=privilege, grant_target_name=grant_target_name, user_name=user_name)
 
 @TestSuite
 @Requirements(
@@ -88,7 +89,13 @@ def show_row_policies(self, privilege, grant_target_name, user_name, node=None):
 
     with Scenario("SHOW ROW POLICIES without privilege"):
 
-        with When("I check the user can't use SHOW ROW POLICIES"):
+        with When("I grant the user NONE privilege"):
+            node.query(f"GRANT NONE TO {grant_target_name}")
+
+        with And("I grant the user USAGE privilege"):
+            node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+        with Then("I check the user can't use SHOW ROW POLICIES"):
             node.query(f"SHOW ROW POLICIES", settings=[("user",user_name)],
                 exitcode=exitcode, message=message)
 
@@ -130,7 +137,13 @@ def show_create(self, privilege, grant_target_name, user_name, node=None):
 
         with row_policy(node, target_row_policy_name, table_name):
 
-            with When("I check the user can't use SHOW CREATE ROW POLICY"):
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I check the user can't use SHOW CREATE ROW POLICY"):
                 node.query(f"SHOW CREATE ROW POLICY {target_row_policy_name}", settings=[("user",user_name)],
                     exitcode=exitcode, message=message)
 
@@ -166,6 +179,8 @@ def show_create(self, privilege, grant_target_name, user_name, node=None):
 @Name("show row policies")
 @Requirements(
     RQ_SRS_006_RBAC_ShowRowPolicies_Privilege("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 def feature(self, node="clickhouse1"):
     """Check the RBAC functionality of SHOW ROW POLICYS.
diff --git a/tests/testflows/rbac/tests/privileges/show/show_settings_profiles.py b/tests/testflows/rbac/tests/privileges/show/show_settings_profiles.py
index 8c29a7f462e..18ca0ee7f6e 100644
--- a/tests/testflows/rbac/tests/privileges/show/show_settings_profiles.py
+++ b/tests/testflows/rbac/tests/privileges/show/show_settings_profiles.py
@@ -29,7 +29,7 @@ def privileges_granted_directly(self, node=None):
 
     with user(node, f"{user_name}"):
 
-        Suite(run=check_privilege, flags=TE,
+        Suite(run=check_privilege,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[user_name,user_name]) for row in check_privilege.examples
             ], args=Args(name="privilege={privilege}", format_name=True)))
@@ -50,13 +50,14 @@ def privileges_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(run=check_privilege, flags=TE,
+        Suite(run=check_privilege,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[role_name,user_name]) for row in check_privilege.examples
             ], args=Args(name="privilege={privilege}", format_name=True)))
 
 @TestOutline(Suite)
 @Examples("privilege",[
+    ("ALL",),
     ("ACCESS MANAGEMENT",),
     ("SHOW ACCESS",),
     ("SHOW SETTINGS PROFILES",),
@@ -71,8 +72,8 @@ def check_privilege(self, privilege, grant_target_name, user_name, node=None):
     if node is None:
         node = self.context.node
 
-    Suite(test=show_settings_profiles, setup=instrument_clickhouse_server_log)(privilege=privilege, grant_target_name=grant_target_name, user_name=user_name)
-    Suite(test=show_create, setup=instrument_clickhouse_server_log)(privilege=privilege, grant_target_name=grant_target_name, user_name=user_name)
+    Suite(test=show_settings_profiles)(privilege=privilege, grant_target_name=grant_target_name, user_name=user_name)
+    Suite(test=show_create)(privilege=privilege, grant_target_name=grant_target_name, user_name=user_name)
 
 @TestSuite
 @Requirements(
@@ -88,7 +89,13 @@ def show_settings_profiles(self, privilege, grant_target_name, user_name, node=N
 
     with Scenario("SHOW SETTINGS PROFILES without privilege"):
 
-        with When("I check the user can't use SHOW SETTINGS PROFILES"):
+        with When("I grant the user NONE privilege"):
+            node.query(f"GRANT NONE TO {grant_target_name}")
+
+        with And("I grant the user USAGE privilege"):
+            node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+        with Then("I check the user can't use SHOW SETTINGS PROFILES"):
             node.query(f"SHOW SETTINGS PROFILES", settings=[("user",user_name)],
                 exitcode=exitcode, message=message)
 
@@ -129,7 +136,13 @@ def show_create(self, privilege, grant_target_name, user_name, node=None):
 
         with settings_profile(node, target_settings_profile_name):
 
-            with When("I check the user can't use SHOW CREATE SETTINGS PROFILE"):
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I check the user can't use SHOW CREATE SETTINGS PROFILE"):
                 node.query(f"SHOW CREATE SETTINGS PROFILE {target_settings_profile_name}", settings=[("user",user_name)],
                     exitcode=exitcode, message=message)
 
@@ -163,6 +176,8 @@ def show_create(self, privilege, grant_target_name, user_name, node=None):
 @Name("show settings profiles")
 @Requirements(
     RQ_SRS_006_RBAC_ShowSettingsProfiles_Privilege("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 def feature(self, node="clickhouse1"):
     """Check the RBAC functionality of SHOW SETTINGS PROFILES.
diff --git a/tests/testflows/rbac/tests/privileges/show/show_tables.py b/tests/testflows/rbac/tests/privileges/show/show_tables.py
index 913b64cef69..d445550c032 100755
--- a/tests/testflows/rbac/tests/privileges/show/show_tables.py
+++ b/tests/testflows/rbac/tests/privileges/show/show_tables.py
@@ -20,7 +20,7 @@ def table_privileges_granted_directly(self, node=None):
     with user(node, f"{user_name}"):
         table_name = f"table_name_{getuid()}"
 
-        Suite(run=check_privilege, flags=TE,
+        Suite(run=check_privilege,
             examples=Examples("privilege on grant_target_name user_name table_name", [
                 tuple(list(row)+[user_name,user_name,table_name]) for row in check_privilege.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
@@ -44,13 +44,14 @@ def table_privileges_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(run=check_privilege, flags=TE,
+        Suite(run=check_privilege,
             examples=Examples("privilege on grant_target_name user_name table_name", [
                 tuple(list(row)+[role_name,user_name,table_name]) for row in check_privilege.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
 
 @TestOutline(Suite)
 @Examples("privilege on",[
+    ("ALL", "*.*"),
     ("SHOW", "*.*"),
     ("SHOW TABLES", "table"),
     ("SELECT", "table"),
@@ -67,9 +68,9 @@ def check_privilege(self, privilege, on, grant_target_name, user_name, table_nam
     if node is None:
         node = self.context.node
 
-    Suite(test=show_tables, setup=instrument_clickhouse_server_log)(privilege=privilege, on=on, grant_target_name=grant_target_name, user_name=user_name, table_name=table_name)
-    Suite(test=exists, setup=instrument_clickhouse_server_log)(privilege=privilege, on=on, grant_target_name=grant_target_name, user_name=user_name, table_name=table_name)
-    Suite(test=check, setup=instrument_clickhouse_server_log)(privilege=privilege, on=on, grant_target_name=grant_target_name, user_name=user_name, table_name=table_name)
+    Suite(test=show_tables)(privilege=privilege, on=on, grant_target_name=grant_target_name, user_name=user_name, table_name=table_name)
+    Suite(test=exists)(privilege=privilege, on=on, grant_target_name=grant_target_name, user_name=user_name, table_name=table_name)
+    Suite(test=check)(privilege=privilege, on=on, grant_target_name=grant_target_name, user_name=user_name, table_name=table_name)
 
 @TestSuite
 @Requirements(
@@ -88,11 +89,19 @@ def show_tables(self, privilege, on, grant_target_name, user_name, table_name, n
     with table(node, table_name):
 
         with Scenario("SHOW TABLES without privilege"):
-            with When("I check the user doesn't see the table"):
+
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I check the user doesn't see the table"):
                 output = node.query("SHOW TABLES", settings = [("user", f"{user_name}")]).output
                 assert output == '', error()
 
         with Scenario("SHOW TABLES with privilege"):
+
             with When(f"I grant {privilege} on the table"):
                 node.query(f"GRANT {privilege} ON {on} TO {grant_target_name}")
 
@@ -100,6 +109,7 @@ def show_tables(self, privilege, on, grant_target_name, user_name, table_name, n
                 node.query("SHOW TABLES", settings = [("user", f"{user_name}")], message=f"{table_name}")
 
         with Scenario("SHOW TABLES with revoked privilege"):
+
             with When(f"I grant {privilege} on the table"):
                 node.query(f"GRANT {privilege} ON {on} TO {grant_target_name}")
 
@@ -127,12 +137,21 @@ def exists(self, privilege, on, grant_target_name, user_name, table_name, node=N
         on = f"{table_name}"
 
     with table(node, table_name):
+
         with Scenario("EXISTS without privilege"):
-            with When(f"I check if {table_name} EXISTS"):
+
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then(f"I check if {table_name} EXISTS"):
                 node.query(f"EXISTS {table_name}", settings=[("user",user_name)],
                     exitcode=exitcode, message=message)
 
         with Scenario("EXISTS with privilege"):
+
             with When(f"I grant {privilege} on the table"):
                 node.query(f"GRANT {privilege} ON {on} TO {grant_target_name}")
 
@@ -140,6 +159,7 @@ def exists(self, privilege, on, grant_target_name, user_name, table_name, node=N
                 node.query(f"EXISTS {table_name}", settings=[("user",user_name)])
 
         with Scenario("EXISTS with revoked privilege"):
+
             with When(f"I grant {privilege} on the table"):
                 node.query(f"GRANT {privilege} ON {on} TO {grant_target_name}")
 
@@ -167,12 +187,21 @@ def check(self, privilege, on, grant_target_name, user_name, table_name, node=No
         on = f"{table_name}"
 
     with table(node, table_name):
+
         with Scenario("CHECK without privilege"):
-            with When(f"I CHECK {table_name}"):
+
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then(f"I CHECK {table_name}"):
                 node.query(f"CHECK TABLE {table_name}", settings=[("user",user_name)],
                     exitcode=exitcode, message=message)
 
         with Scenario("CHECK with privilege"):
+
             with When(f"I grant {privilege} on the table"):
                 node.query(f"GRANT {privilege} ON {on} TO {grant_target_name}")
 
@@ -180,6 +209,7 @@ def check(self, privilege, on, grant_target_name, user_name, table_name, node=No
                 node.query(f"CHECK TABLE {table_name}", settings=[("user",user_name)])
 
         with Scenario("CHECK with revoked privilege"):
+
             with When(f"I grant {privilege} on the table"):
                 node.query(f"GRANT {privilege} ON {on} TO {grant_target_name}")
 
@@ -194,6 +224,8 @@ def check(self, privilege, on, grant_target_name, user_name, table_name, node=No
 @Name("show tables")
 @Requirements(
     RQ_SRS_006_RBAC_ShowTables_Privilege("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 def feature(self, node="clickhouse1"):
     """Check the RBAC functionality of SHOW TABLES.
diff --git a/tests/testflows/rbac/tests/privileges/show/show_users.py b/tests/testflows/rbac/tests/privileges/show/show_users.py
index 48e6ba51f48..aa5c97297b5 100644
--- a/tests/testflows/rbac/tests/privileges/show/show_users.py
+++ b/tests/testflows/rbac/tests/privileges/show/show_users.py
@@ -17,7 +17,7 @@ def privileges_granted_directly(self, node=None):
 
     with user(node, f"{user_name}"):
 
-        Suite(run=check_privilege, flags=TE,
+        Suite(run=check_privilege,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[user_name,user_name]) for row in check_privilege.examples
             ], args=Args(name="privilege={privilege}", format_name=True)))
@@ -38,13 +38,14 @@ def privileges_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(run=check_privilege, flags=TE,
+        Suite(run=check_privilege,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[role_name,user_name]) for row in check_privilege.examples
             ], args=Args(name="privilege={privilege}", format_name=True)))
 
 @TestOutline(Suite)
 @Examples("privilege",[
+    ("ALL",),
     ("ACCESS MANAGEMENT",),
     ("SHOW ACCESS",),
     ("SHOW USERS",),
@@ -57,8 +58,8 @@ def check_privilege(self, privilege, grant_target_name, user_name, node=None):
     if node is None:
         node = self.context.node
 
-    Suite(test=show_users, setup=instrument_clickhouse_server_log)(privilege=privilege, grant_target_name=grant_target_name, user_name=user_name)
-    Suite(test=show_create, setup=instrument_clickhouse_server_log)(privilege=privilege, grant_target_name=grant_target_name, user_name=user_name)
+    Suite(test=show_users)(privilege=privilege, grant_target_name=grant_target_name, user_name=user_name)
+    Suite(test=show_create)(privilege=privilege, grant_target_name=grant_target_name, user_name=user_name)
 
 @TestSuite
 @Requirements(
@@ -74,7 +75,13 @@ def show_users(self, privilege, grant_target_name, user_name, node=None):
 
     with Scenario("SHOW USERS without privilege"):
 
-        with When("I check the user can't use SHOW USERS"):
+        with When("I grant the user NONE privilege"):
+            node.query(f"GRANT NONE TO {grant_target_name}")
+
+        with And("I grant the user USAGE privilege"):
+            node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+        with Then("I check the user can't use SHOW USERS"):
             node.query(f"SHOW USERS", settings=[("user",user_name)],
                 exitcode=exitcode, message=message)
 
@@ -115,7 +122,13 @@ def show_create(self, privilege, grant_target_name, user_name, node=None):
 
         with user(node, target_user_name):
 
-            with When("I check the user can't use SHOW CREATE USER"):
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I check the user can't use SHOW CREATE USER"):
                 node.query(f"SHOW CREATE USER {target_user_name}", settings=[("user",user_name)],
                     exitcode=exitcode, message=message)
 
@@ -149,6 +162,8 @@ def show_create(self, privilege, grant_target_name, user_name, node=None):
 @Name("show users")
 @Requirements(
     RQ_SRS_006_RBAC_ShowUsers_Privilege("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 def feature(self, node="clickhouse1"):
     """Check the RBAC functionality of SHOW USERS.
diff --git a/tests/testflows/rbac/tests/privileges/sources.py b/tests/testflows/rbac/tests/privileges/sources.py
index 8c1b61ee401..19d32cf500a 100644
--- a/tests/testflows/rbac/tests/privileges/sources.py
+++ b/tests/testflows/rbac/tests/privileges/sources.py
@@ -17,7 +17,7 @@ def file_privileges_granted_directly(self, node=None):
 
     with user(node, f"{user_name}"):
 
-        Suite(run=file, flags=TE,
+        Suite(run=file,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[user_name,user_name]) for row in file.examples
             ], args=Args(name="privilege={privilege}", format_name=True)))
@@ -38,13 +38,14 @@ def file_privileges_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(run=file, flags=TE,
+        Suite(run=file,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[role_name,user_name]) for row in file.examples
             ], args=Args(name="privilege={privilege}", format_name=True)))
 
 @TestOutline(Suite)
 @Examples("privilege",[
+    ("ALL",),
     ("SOURCES",),
     ("FILE",),
 ])
@@ -65,7 +66,13 @@ def file(self, privilege, grant_target_name, user_name, node=None):
         with Given("The user has table privilege"):
             node.query(f"GRANT CREATE TABLE ON {table_name} TO {grant_target_name}")
 
-        with When("I check the user can't use the File source"):
+        with When("I grant the user NONE privilege"):
+            node.query(f"GRANT NONE TO {grant_target_name}")
+
+        with And("I grant the user USAGE privilege"):
+            node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+        with Then("I check the user can't use the File source"):
             node.query(f"CREATE TABLE {table_name} (x String) ENGINE=File()", settings=[("user",user_name)],
                 exitcode=exitcode, message=message)
 
@@ -102,7 +109,7 @@ def url_privileges_granted_directly(self, node=None):
 
     with user(node, f"{user_name}"):
 
-        Suite(run=url, flags=TE,
+        Suite(run=url,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[user_name,user_name]) for row in url.examples
             ], args=Args(name="privilege={privilege}", format_name=True)))
@@ -123,13 +130,14 @@ def url_privileges_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(run=url, flags=TE,
+        Suite(run=url,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[role_name,user_name]) for row in url.examples
             ], args=Args(name="privilege={privilege}", format_name=True)))
 
 @TestOutline(Suite)
 @Examples("privilege",[
+    ("ALL",),
     ("SOURCES",),
     ("URL",),
 ])
@@ -150,7 +158,13 @@ def url(self, privilege, grant_target_name, user_name, node=None):
         with Given("The user has table privilege"):
             node.query(f"GRANT CREATE TABLE ON {table_name} TO {grant_target_name}")
 
-        with When("I check the user can't use the URL source"):
+        with When("I grant the user NONE privilege"):
+            node.query(f"GRANT NONE TO {grant_target_name}")
+
+        with And("I grant the user USAGE privilege"):
+            node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+        with Then("I check the user can't use the URL source"):
             node.query(f"CREATE TABLE {table_name} (x String) ENGINE=URL()", settings=[("user",user_name)],
                 exitcode=exitcode, message=message)
 
@@ -187,7 +201,7 @@ def remote_privileges_granted_directly(self, node=None):
 
     with user(node, f"{user_name}"):
 
-        Suite(run=remote, flags=TE,
+        Suite(run=remote,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[user_name,user_name]) for row in remote.examples
             ], args=Args(name="privilege={privilege}", format_name=True)))
@@ -208,13 +222,14 @@ def remote_privileges_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(run=remote, flags=TE,
+        Suite(run=remote,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[role_name,user_name]) for row in remote.examples
             ], args=Args(name="privilege={privilege}", format_name=True)))
 
 @TestOutline(Suite)
 @Examples("privilege",[
+    ("ALL",),
     ("SOURCES",),
     ("REMOTE",),
 ])
@@ -235,7 +250,13 @@ def remote(self, privilege, grant_target_name, user_name, node=None):
         with Given("The user has table privilege"):
             node.query(f"GRANT CREATE TABLE ON {table_name} TO {grant_target_name}")
 
-        with When("I check the user can't use the Remote source"):
+        with When("I grant the user NONE privilege"):
+            node.query(f"GRANT NONE TO {grant_target_name}")
+
+        with And("I grant the user USAGE privilege"):
+            node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+        with Then("I check the user can't use the Remote source"):
             node.query(f"CREATE TABLE {table_name} (x String) ENGINE = Distributed()", settings=[("user",user_name)],
                 exitcode=exitcode, message=message)
 
@@ -272,7 +293,7 @@ def MySQL_privileges_granted_directly(self, node=None):
 
     with user(node, f"{user_name}"):
 
-        Suite(run=MySQL, flags=TE,
+        Suite(run=MySQL,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[user_name,user_name]) for row in MySQL.examples
             ], args=Args(name="privilege={privilege}", format_name=True)))
@@ -293,13 +314,14 @@ def MySQL_privileges_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(run=MySQL, flags=TE,
+        Suite(run=MySQL,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[role_name,user_name]) for row in MySQL.examples
             ], args=Args(name="privilege={privilege}", format_name=True)))
 
 @TestOutline(Suite)
 @Examples("privilege",[
+    ("ALL",),
     ("SOURCES",),
     ("MYSQL",),
 ])
@@ -320,7 +342,13 @@ def MySQL(self, privilege, grant_target_name, user_name, node=None):
         with Given("The user has table privilege"):
             node.query(f"GRANT CREATE TABLE ON {table_name} TO {grant_target_name}")
 
-        with When("I check the user can't use the MySQL source"):
+        with When("I grant the user NONE privilege"):
+            node.query(f"GRANT NONE TO {grant_target_name}")
+
+        with And("I grant the user USAGE privilege"):
+            node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+        with Then("I check the user can't use the MySQL source"):
             node.query(f"CREATE TABLE {table_name} (x String) ENGINE=MySQL()", settings=[("user",user_name)],
                 exitcode=exitcode, message=message)
 
@@ -357,7 +385,7 @@ def ODBC_privileges_granted_directly(self, node=None):
 
     with user(node, f"{user_name}"):
 
-        Suite(run=ODBC, flags=TE,
+        Suite(run=ODBC,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[user_name,user_name]) for row in ODBC.examples
             ], args=Args(name="privilege={privilege}", format_name=True)))
@@ -378,13 +406,14 @@ def ODBC_privileges_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(run=ODBC, flags=TE,
+        Suite(run=ODBC,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[role_name,user_name]) for row in ODBC.examples
             ], args=Args(name="privilege={privilege}", format_name=True)))
 
 @TestOutline(Suite)
 @Examples("privilege",[
+    ("ALL",),
     ("SOURCES",),
     ("ODBC",),
 ])
@@ -405,7 +434,13 @@ def ODBC(self, privilege, grant_target_name, user_name, node=None):
         with Given("The user has table privilege"):
             node.query(f"GRANT CREATE TABLE ON {table_name} TO {grant_target_name}")
 
-        with When("I check the user can't use the ODBC source"):
+        with When("I grant the user NONE privilege"):
+            node.query(f"GRANT NONE TO {grant_target_name}")
+
+        with And("I grant the user USAGE privilege"):
+            node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+        with Then("I check the user can't use the ODBC source"):
             node.query(f"CREATE TABLE {table_name} (x String) ENGINE=ODBC()", settings=[("user",user_name)],
                 exitcode=exitcode, message=message)
 
@@ -442,7 +477,7 @@ def JDBC_privileges_granted_directly(self, node=None):
 
     with user(node, f"{user_name}"):
 
-        Suite(run=JDBC, flags=TE,
+        Suite(run=JDBC,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[user_name,user_name]) for row in JDBC.examples
             ], args=Args(name="privilege={privilege}", format_name=True)))
@@ -463,13 +498,14 @@ def JDBC_privileges_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(run=JDBC, flags=TE,
+        Suite(run=JDBC,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[role_name,user_name]) for row in JDBC.examples
             ], args=Args(name="privilege={privilege}", format_name=True)))
 
 @TestOutline(Suite)
 @Examples("privilege",[
+    ("ALL",),
     ("SOURCES",),
     ("JDBC",),
 ])
@@ -490,7 +526,13 @@ def JDBC(self, privilege, grant_target_name, user_name, node=None):
         with Given("The user has table privilege"):
             node.query(f"GRANT CREATE TABLE ON {table_name} TO {grant_target_name}")
 
-        with When("I check the user can't use the JDBC source"):
+        with When("I grant the user NONE privilege"):
+            node.query(f"GRANT NONE TO {grant_target_name}")
+
+        with And("I grant the user USAGE privilege"):
+            node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+        with Then("I check the user can't use the JDBC source"):
             node.query(f"CREATE TABLE {table_name} (x String) ENGINE=JDBC()", settings=[("user",user_name)],
                 exitcode=exitcode, message=message)
 
@@ -527,7 +569,7 @@ def HDFS_privileges_granted_directly(self, node=None):
 
     with user(node, f"{user_name}"):
 
-        Suite(run=HDFS, flags=TE,
+        Suite(run=HDFS,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[user_name,user_name]) for row in HDFS.examples
             ], args=Args(name="privilege={privilege}", format_name=True)))
@@ -548,13 +590,14 @@ def HDFS_privileges_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(run=HDFS, flags=TE,
+        Suite(run=HDFS,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[role_name,user_name]) for row in HDFS.examples
             ], args=Args(name="privilege={privilege}", format_name=True)))
 
 @TestOutline(Suite)
 @Examples("privilege",[
+    ("ALL",),
     ("SOURCES",),
     ("HDFS",),
 ])
@@ -575,7 +618,13 @@ def HDFS(self, privilege, grant_target_name, user_name, node=None):
         with Given("The user has table privilege"):
             node.query(f"GRANT CREATE TABLE ON {table_name} TO {grant_target_name}")
 
-        with When("I check the user can't use the HDFS source"):
+        with When("I grant the user NONE privilege"):
+            node.query(f"GRANT NONE TO {grant_target_name}")
+
+        with And("I grant the user USAGE privilege"):
+            node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+        with Then("I check the user can't use the HDFS source"):
             node.query(f"CREATE TABLE {table_name} (x String) ENGINE=HDFS()", settings=[("user",user_name)],
                 exitcode=exitcode, message=message)
 
@@ -612,7 +661,7 @@ def S3_privileges_granted_directly(self, node=None):
 
     with user(node, f"{user_name}"):
 
-        Suite(run=S3, flags=TE,
+        Suite(run=S3,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[user_name,user_name]) for row in S3.examples
             ], args=Args(name="privilege={privilege}", format_name=True)))
@@ -633,13 +682,14 @@ def S3_privileges_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(run=S3, flags=TE,
+        Suite(run=S3,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[role_name,user_name]) for row in S3.examples
             ], args=Args(name="privilege={privilege}", format_name=True)))
 
 @TestOutline(Suite)
 @Examples("privilege",[
+    ("ALL",),
     ("SOURCES",),
     ("S3",),
 ])
@@ -660,7 +710,13 @@ def S3(self, privilege, grant_target_name, user_name, node=None):
         with Given("The user has table privilege"):
             node.query(f"GRANT CREATE TABLE ON {table_name} TO {grant_target_name}")
 
-        with When("I check the user can't use the S3 source"):
+        with When("I grant the user NONE privilege"):
+            node.query(f"GRANT NONE TO {grant_target_name}")
+
+        with And("I grant the user USAGE privilege"):
+            node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+        with Then("I check the user can't use the S3 source"):
             node.query(f"CREATE TABLE {table_name} (x String) ENGINE=S3()", settings=[("user",user_name)],
                 exitcode=exitcode, message=message)
 
@@ -689,6 +745,8 @@ def S3(self, privilege, grant_target_name, user_name, node=None):
 @Name("sources")
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_Sources("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 def feature(self, node="clickhouse1"):
     """Check the RBAC functionality of SOURCES.
diff --git a/tests/testflows/rbac/tests/privileges/system/drop_cache.py b/tests/testflows/rbac/tests/privileges/system/drop_cache.py
index 6439beb248d..8f1a6caeaac 100644
--- a/tests/testflows/rbac/tests/privileges/system/drop_cache.py
+++ b/tests/testflows/rbac/tests/privileges/system/drop_cache.py
@@ -17,7 +17,7 @@ def dns_cache_privileges_granted_directly(self, node=None):
 
     with user(node, f"{user_name}"):
 
-        Suite(run=dns_cache, flags=TE,
+        Suite(run=dns_cache,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[user_name,user_name]) for row in dns_cache.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
@@ -38,7 +38,7 @@ def dns_cache_privileges_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(run=dns_cache, flags=TE,
+        Suite(run=dns_cache,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[role_name,user_name]) for row in dns_cache.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
@@ -48,6 +48,7 @@ def dns_cache_privileges_granted_via_role(self, node=None):
     RQ_SRS_006_RBAC_Privileges_System_DropCache_DNS("1.0"),
 )
 @Examples("privilege",[
+    ("ALL",),
     ("SYSTEM",),
     ("SYSTEM DROP CACHE",),
     ("SYSTEM DROP DNS CACHE",),
@@ -65,11 +66,19 @@ def dns_cache(self, privilege, grant_target_name, user_name, node=None):
         node = self.context.node
 
     with Scenario("SYSTEM DROP DNS CACHE without privilege"):
-        with When("I check the user is unable to execute SYSTEM DROP DNS CACHE"):
+
+        with When("I grant the user NONE privilege"):
+            node.query(f"GRANT NONE TO {grant_target_name}")
+
+        with And("I grant the user USAGE privilege"):
+            node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+        with Then("I check the user is unable to execute SYSTEM DROP DNS CACHE"):
             node.query("SYSTEM DROP DNS CACHE", settings = [("user", f"{user_name}")],
                 exitcode=exitcode, message=message)
 
     with Scenario("SYSTEM DROP DNS CACHE with privilege"):
+
         with When(f"I grant {privilege} on the table"):
             node.query(f"GRANT {privilege} ON *.* TO {grant_target_name}")
 
@@ -77,6 +86,7 @@ def dns_cache(self, privilege, grant_target_name, user_name, node=None):
             node.query("SYSTEM DROP DNS CACHE", settings = [("user", f"{user_name}")])
 
     with Scenario("SYSTEM DROP DNS CACHE with revoked privilege"):
+
         with When(f"I grant {privilege} on the table"):
             node.query(f"GRANT {privilege} ON *.* TO {grant_target_name}")
 
@@ -99,7 +109,7 @@ def mark_cache_privileges_granted_directly(self, node=None):
 
     with user(node, f"{user_name}"):
 
-        Suite(run=mark_cache, flags=TE,
+        Suite(run=mark_cache,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[user_name,user_name]) for row in mark_cache.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
@@ -120,7 +130,7 @@ def mark_cache_privileges_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(run=mark_cache, flags=TE,
+        Suite(run=mark_cache,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[role_name,user_name]) for row in mark_cache.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
@@ -130,6 +140,7 @@ def mark_cache_privileges_granted_via_role(self, node=None):
     RQ_SRS_006_RBAC_Privileges_System_DropCache_Mark("1.0"),
 )
 @Examples("privilege",[
+    ("ALL",),
     ("SYSTEM",),
     ("SYSTEM DROP CACHE",),
     ("SYSTEM DROP MARK CACHE",),
@@ -147,11 +158,19 @@ def mark_cache(self, privilege, grant_target_name, user_name, node=None):
         node = self.context.node
 
     with Scenario("SYSTEM DROP MARK CACHE without privilege"):
-        with When("I check the user is unable to execute SYSTEM DROP MARK CACHE"):
+
+        with When("I grant the user NONE privilege"):
+            node.query(f"GRANT NONE TO {grant_target_name}")
+
+        with And("I grant the user USAGE privilege"):
+            node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+        with Then("I check the user is unable to execute SYSTEM DROP MARK CACHE"):
             node.query("SYSTEM DROP MARK CACHE", settings = [("user", f"{user_name}")],
                 exitcode=exitcode, message=message)
 
     with Scenario("SYSTEM DROP MARK CACHE with privilege"):
+
         with When(f"I grant {privilege} on the table"):
             node.query(f"GRANT {privilege} ON *.* TO {grant_target_name}")
 
@@ -159,6 +178,7 @@ def mark_cache(self, privilege, grant_target_name, user_name, node=None):
             node.query("SYSTEM DROP MARK CACHE", settings = [("user", f"{user_name}")])
 
     with Scenario("SYSTEM DROP MARK CACHE with revoked privilege"):
+
         with When(f"I grant {privilege} on the table"):
             node.query(f"GRANT {privilege} ON *.* TO {grant_target_name}")
 
@@ -181,7 +201,7 @@ def uncompressed_cache_privileges_granted_directly(self, node=None):
 
     with user(node, f"{user_name}"):
 
-        Suite(run=uncompressed_cache, flags=TE,
+        Suite(run=uncompressed_cache,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[user_name,user_name]) for row in uncompressed_cache.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
@@ -202,7 +222,7 @@ def uncompressed_cache_privileges_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(run=uncompressed_cache, flags=TE,
+        Suite(run=uncompressed_cache,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[role_name,user_name]) for row in uncompressed_cache.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
@@ -212,6 +232,7 @@ def uncompressed_cache_privileges_granted_via_role(self, node=None):
     RQ_SRS_006_RBAC_Privileges_System_DropCache_Uncompressed("1.0"),
 )
 @Examples("privilege",[
+    ("ALL",),
     ("SYSTEM",),
     ("SYSTEM DROP CACHE",),
     ("SYSTEM DROP UNCOMPRESSED CACHE",),
@@ -229,11 +250,19 @@ def uncompressed_cache(self, privilege, grant_target_name, user_name, node=None)
         node = self.context.node
 
     with Scenario("SYSTEM DROP UNCOMPRESSED CACHE without privilege"):
-        with When("I check the user is unable to execute SYSTEM DROP UNCOMPRESSED CACHE"):
+
+        with When("I grant the user NONE privilege"):
+            node.query(f"GRANT NONE TO {grant_target_name}")
+
+        with And("I grant the user USAGE privilege"):
+            node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+        with Then("I check the user is unable to execute SYSTEM DROP UNCOMPRESSED CACHE"):
             node.query("SYSTEM DROP UNCOMPRESSED CACHE", settings = [("user", f"{user_name}")],
                 exitcode=exitcode, message=message)
 
     with Scenario("SYSTEM DROP UNCOMPRESSED CACHE with privilege"):
+
         with When(f"I grant {privilege} on the table"):
             node.query(f"GRANT {privilege} ON *.* TO {grant_target_name}")
 
@@ -241,6 +270,7 @@ def uncompressed_cache(self, privilege, grant_target_name, user_name, node=None)
             node.query("SYSTEM DROP UNCOMPRESSED CACHE", settings = [("user", f"{user_name}")])
 
     with Scenario("SYSTEM DROP UNCOMPRESSED CACHE with revoked privilege"):
+
         with When(f"I grant {privilege} on the table"):
             node.query(f"GRANT {privilege} ON *.* TO {grant_target_name}")
 
@@ -255,6 +285,8 @@ def uncompressed_cache(self, privilege, grant_target_name, user_name, node=None)
 @Name("system drop cache")
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_System_DropCache("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 def feature(self, node="clickhouse1"):
     """Check the RBAC functionality of SYSTEM DROP CACHE.
diff --git a/tests/testflows/rbac/tests/privileges/system/fetches.py b/tests/testflows/rbac/tests/privileges/system/fetches.py
index 14c046f4fbe..3aba1b71566 100644
--- a/tests/testflows/rbac/tests/privileges/system/fetches.py
+++ b/tests/testflows/rbac/tests/privileges/system/fetches.py
@@ -17,7 +17,7 @@ def replicated_privileges_granted_directly(self, node=None):
 
     with user(node, f"{user_name}"):
 
-        Suite(run=check_replicated_privilege, flags=TE,
+        Suite(run=check_replicated_privilege,
             examples=Examples("privilege on grant_target_name user_name", [
                 tuple(list(row)+[user_name,user_name]) for row in check_replicated_privilege.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
@@ -38,13 +38,14 @@ def replicated_privileges_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(run=check_replicated_privilege, flags=TE,
+        Suite(run=check_replicated_privilege,
             examples=Examples("privilege on grant_target_name user_name", [
                 tuple(list(row)+[role_name,user_name]) for row in check_replicated_privilege.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
 
 @TestOutline(Suite)
 @Examples("privilege on",[
+    ("ALL", "*.*"),
     ("SYSTEM", "*.*"),
     ("SYSTEM FETCHES", "table"),
     ("SYSTEM STOP FETCHES", "table"),
@@ -59,8 +60,8 @@ def check_replicated_privilege(self, privilege, on, grant_target_name, user_name
     if node is None:
         node = self.context.node
 
-    Suite(test=start_replication_queues, setup=instrument_clickhouse_server_log)(privilege=privilege, on=on, grant_target_name=grant_target_name, user_name=user_name)
-    Suite(test=stop_replication_queues, setup=instrument_clickhouse_server_log)(privilege=privilege, on=on, grant_target_name=grant_target_name, user_name=user_name)
+    Suite(test=start_replication_queues)(privilege=privilege, on=on, grant_target_name=grant_target_name, user_name=user_name)
+    Suite(test=stop_replication_queues)(privilege=privilege, on=on, grant_target_name=grant_target_name, user_name=user_name)
 
 @TestSuite
 def start_replication_queues(self, privilege, on, grant_target_name, user_name, node=None):
@@ -77,11 +78,19 @@ def start_replication_queues(self, privilege, on, grant_target_name, user_name,
     with table(node, table_name, "ReplicatedMergeTree-sharded_cluster"):
 
         with Scenario("SYSTEM START FETCHES without privilege"):
-            with When("I check the user can't start fetches"):
+
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I check the user can't start fetches"):
                 node.query(f"SYSTEM START FETCHES {table_name}", settings = [("user", f"{user_name}")],
                     exitcode=exitcode, message=message)
 
         with Scenario("SYSTEM START FETCHES with privilege"):
+
             with When(f"I grant {privilege} on the table"):
                 node.query(f"GRANT {privilege} ON {on} TO {grant_target_name}")
 
@@ -89,6 +98,7 @@ def start_replication_queues(self, privilege, on, grant_target_name, user_name,
                 node.query(f"SYSTEM START FETCHES {table_name}", settings = [("user", f"{user_name}")])
 
         with Scenario("SYSTEM START FETCHES with revoked privilege"):
+
             with When(f"I grant {privilege} on the table"):
                 node.query(f"GRANT {privilege} ON {on} TO {grant_target_name}")
 
@@ -114,11 +124,19 @@ def stop_replication_queues(self, privilege, on, grant_target_name, user_name, n
     with table(node, table_name, "ReplicatedMergeTree-sharded_cluster"):
 
         with Scenario("SYSTEM STOP FETCHES without privilege"):
-            with When("I check the user can't stop fetches"):
+
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I check the user can't stop fetches"):
                 node.query(f"SYSTEM STOP FETCHES {table_name}", settings = [("user", f"{user_name}")],
                     exitcode=exitcode, message=message)
 
         with Scenario("SYSTEM STOP FETCHES with privilege"):
+
             with When(f"I grant {privilege} on the table"):
                 node.query(f"GRANT {privilege} ON {on} TO {grant_target_name}")
 
@@ -126,6 +144,7 @@ def stop_replication_queues(self, privilege, on, grant_target_name, user_name, n
                 node.query(f"SYSTEM STOP FETCHES {table_name}", settings = [("user", f"{user_name}")])
 
         with Scenario("SYSTEM STOP FETCHES with revoked privilege"):
+
             with When(f"I grant {privilege} on the table"):
                 node.query(f"GRANT {privilege} ON {on} TO {grant_target_name}")
 
@@ -140,6 +159,8 @@ def stop_replication_queues(self, privilege, on, grant_target_name, user_name, n
 @Name("system fetches")
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_System_Fetches("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 def feature(self, node="clickhouse1"):
     """Check the RBAC functionality of SYSTEM FETCHES.
diff --git a/tests/testflows/rbac/tests/privileges/system/flush.py b/tests/testflows/rbac/tests/privileges/system/flush.py
index 8835b51db9e..8c540fa1286 100644
--- a/tests/testflows/rbac/tests/privileges/system/flush.py
+++ b/tests/testflows/rbac/tests/privileges/system/flush.py
@@ -17,7 +17,7 @@ def privileges_granted_directly(self, node=None):
 
     with user(node, f"{user_name}"):
 
-        Suite(run=flush_logs, flags=TE,
+        Suite(run=flush_logs,
             examples=Examples("privilege on grant_target_name user_name", [
                 tuple(list(row)+[user_name,user_name]) for row in flush_logs.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
@@ -38,13 +38,14 @@ def privileges_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(run=flush_logs, flags=TE,
+        Suite(run=flush_logs,
             examples=Examples("privilege on grant_target_name user_name", [
                 tuple(list(row)+[role_name,user_name]) for row in flush_logs.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
 
 @TestOutline(Suite)
 @Examples("privilege on",[
+    ("ALL", "*.*"),
     ("SYSTEM", "*.*"),
     ("SYSTEM FLUSH", "*.*"),
     ("SYSTEM FLUSH LOGS", "*.*"),
@@ -62,11 +63,19 @@ def flush_logs(self, privilege, on, grant_target_name, user_name, node=None):
         node = self.context.node
 
     with Scenario("SYSTEM FLUSH LOGS without privilege"):
-        with When("I check the user can't flush logs"):
+
+        with When("I grant the user NONE privilege"):
+            node.query(f"GRANT NONE TO {grant_target_name}")
+
+        with And("I grant the user USAGE privilege"):
+            node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+        with Then("I check the user can't flush logs"):
             node.query(f"SYSTEM FLUSH LOGS", settings = [("user", f"{user_name}")],
                 exitcode=exitcode, message=message)
 
     with Scenario("SYSTEM FLUSH LOGS with privilege"):
+
         with When(f"I grant {privilege} on the table"):
             node.query(f"GRANT {privilege} ON {on} TO {grant_target_name}")
 
@@ -74,6 +83,7 @@ def flush_logs(self, privilege, on, grant_target_name, user_name, node=None):
             node.query(f"SYSTEM FLUSH LOGS", settings = [("user", f"{user_name}")])
 
     with Scenario("SYSTEM FLUSH LOGS with revoked privilege"):
+
         with When(f"I grant {privilege} on the table"):
             node.query(f"GRANT {privilege} ON {on} TO {grant_target_name}")
 
@@ -97,7 +107,7 @@ def distributed_privileges_granted_directly(self, node=None):
     with user(node, f"{user_name}"):
         table_name = f"table_name_{getuid()}"
 
-        Suite(run=flush_distributed, flags=TE,
+        Suite(run=flush_distributed,
             examples=Examples("privilege on grant_target_name user_name table_name", [
                 tuple(list(row)+[user_name,user_name,table_name]) for row in flush_distributed.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
@@ -119,13 +129,14 @@ def distributed_privileges_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(run=flush_distributed, flags=TE,
+        Suite(run=flush_distributed,
             examples=Examples("privilege on grant_target_name user_name table_name", [
                 tuple(list(row)+[role_name,user_name,table_name]) for row in flush_distributed.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
 
 @TestOutline(Suite)
 @Examples("privilege on",[
+    ("ALL", "*.*"),
     ("SYSTEM", "*.*"),
     ("SYSTEM FLUSH", "*.*"),
     ("SYSTEM FLUSH DISTRIBUTED", "table"),
@@ -151,11 +162,19 @@ def flush_distributed(self, privilege, on, grant_target_name, user_name, table_n
                 node.query(f"CREATE TABLE {table_name} (a UInt64) ENGINE = Distributed(sharded_cluster, default, {table0_name}, rand())")
 
             with Scenario("SYSTEM FLUSH DISTRIBUTED without privilege"):
-                with When("I check the user can't flush distributed"):
+
+                with When("I grant the user NONE privilege"):
+                    node.query(f"GRANT NONE TO {grant_target_name}")
+
+                with And("I grant the user USAGE privilege"):
+                    node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+                with Then("I check the user can't flush distributed"):
                     node.query(f"SYSTEM FLUSH DISTRIBUTED {table_name}", settings = [("user", f"{user_name}")],
                         exitcode=exitcode, message=message)
 
             with Scenario("SYSTEM FLUSH DISTRIBUTED with privilege"):
+
                 with When(f"I grant {privilege} on the table"):
                     node.query(f"GRANT {privilege} ON {on} TO {grant_target_name}")
 
@@ -163,6 +182,7 @@ def flush_distributed(self, privilege, on, grant_target_name, user_name, table_n
                     node.query(f"SYSTEM FLUSH DISTRIBUTED {table_name}", settings = [("user", f"{user_name}")])
 
             with Scenario("SYSTEM FLUSH DISTRIBUTED with revoked privilege"):
+
                 with When(f"I grant {privilege} on the table"):
                     node.query(f"GRANT {privilege} ON {on} TO {grant_target_name}")
 
@@ -182,6 +202,8 @@ def flush_distributed(self, privilege, on, grant_target_name, user_name, table_n
 @Name("system flush")
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_System_Flush("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 def feature(self, node="clickhouse1"):
     """Check the RBAC functionality of SYSTEM FLUSH.
diff --git a/tests/testflows/rbac/tests/privileges/system/merges.py b/tests/testflows/rbac/tests/privileges/system/merges.py
index 0f347299c44..324b9c0b4ec 100644
--- a/tests/testflows/rbac/tests/privileges/system/merges.py
+++ b/tests/testflows/rbac/tests/privileges/system/merges.py
@@ -18,7 +18,7 @@ def privileges_granted_directly(self, node=None):
     with user(node, f"{user_name}"):
         table_name = f"table_name_{getuid()}"
 
-        Suite(run=check_privilege, flags=TE,
+        Suite(run=check_privilege,
             examples=Examples("privilege on grant_target_name user_name table_name", [
                 tuple(list(row)+[user_name,user_name,table_name]) for row in check_privilege.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
@@ -40,13 +40,14 @@ def privileges_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(run=check_privilege, flags=TE,
+        Suite(run=check_privilege,
             examples=Examples("privilege on grant_target_name user_name table_name", [
                 tuple(list(row)+[role_name,user_name,table_name]) for row in check_privilege.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
 
 @TestOutline(Suite)
 @Examples("privilege on",[
+    ("ALL", "*.*"),
     ("SYSTEM", "*.*"),
     ("SYSTEM MERGES", "table"),
     ("SYSTEM STOP MERGES", "table"),
@@ -61,8 +62,8 @@ def check_privilege(self, privilege, on, grant_target_name, user_name, table_nam
     if node is None:
         node = self.context.node
 
-    Suite(test=start_merges, setup=instrument_clickhouse_server_log)(privilege=privilege, on=on, grant_target_name=grant_target_name, user_name=user_name, table_name=table_name)
-    Suite(test=stop_merges, setup=instrument_clickhouse_server_log)(privilege=privilege, on=on, grant_target_name=grant_target_name, user_name=user_name, table_name=table_name)
+    Suite(test=start_merges)(privilege=privilege, on=on, grant_target_name=grant_target_name, user_name=user_name, table_name=table_name)
+    Suite(test=stop_merges)(privilege=privilege, on=on, grant_target_name=grant_target_name, user_name=user_name, table_name=table_name)
 
 @TestSuite
 def start_merges(self, privilege, on, grant_target_name, user_name, table_name, node=None):
@@ -78,11 +79,19 @@ def start_merges(self, privilege, on, grant_target_name, user_name, table_name,
     with table(node, table_name):
 
         with Scenario("SYSTEM START MERGES without privilege"):
-            with When("I check the user can't start merges"):
+
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I check the user can't start merges"):
                 node.query(f"SYSTEM START MERGES {table_name}", settings = [("user", f"{user_name}")],
                     exitcode=exitcode, message=message)
 
         with Scenario("SYSTEM START MERGES with privilege"):
+
             with When(f"I grant {privilege} on the table"):
                 node.query(f"GRANT {privilege} ON {on} TO {grant_target_name}")
 
@@ -90,6 +99,7 @@ def start_merges(self, privilege, on, grant_target_name, user_name, table_name,
                 node.query(f"SYSTEM START MERGES {table_name}", settings = [("user", f"{user_name}")])
 
         with Scenario("SYSTEM START MERGES with revoked privilege"):
+
             with When(f"I grant {privilege} on the table"):
                 node.query(f"GRANT {privilege} ON {on} TO {grant_target_name}")
 
@@ -114,11 +124,19 @@ def stop_merges(self, privilege, on, grant_target_name, user_name, table_name, n
     with table(node, table_name):
 
         with Scenario("SYSTEM STOP MERGES without privilege"):
-            with When("I check the user can't stop merges"):
+
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I check the user can't stop merges"):
                 node.query(f"SYSTEM STOP MERGES {table_name}", settings = [("user", f"{user_name}")],
                     exitcode=exitcode, message=message)
 
         with Scenario("SYSTEM STOP MERGES with privilege"):
+
             with When(f"I grant {privilege} on the table"):
                 node.query(f"GRANT {privilege} ON {on} TO {grant_target_name}")
 
@@ -126,6 +144,7 @@ def stop_merges(self, privilege, on, grant_target_name, user_name, table_name, n
                 node.query(f"SYSTEM STOP MERGES {table_name}", settings = [("user", f"{user_name}")])
 
         with Scenario("SYSTEM STOP MERGES with revoked privilege"):
+
             with When(f"I grant {privilege} on the table"):
                 node.query(f"GRANT {privilege} ON {on} TO {grant_target_name}")
 
@@ -140,6 +159,8 @@ def stop_merges(self, privilege, on, grant_target_name, user_name, table_name, n
 @Name("system merges")
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_System_Merges("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 def feature(self, node="clickhouse1"):
     """Check the RBAC functionality of SYSTEM MERGES.
diff --git a/tests/testflows/rbac/tests/privileges/system/moves.py b/tests/testflows/rbac/tests/privileges/system/moves.py
index 2081e6dfe22..2a75ff39aaf 100644
--- a/tests/testflows/rbac/tests/privileges/system/moves.py
+++ b/tests/testflows/rbac/tests/privileges/system/moves.py
@@ -18,7 +18,7 @@ def privileges_granted_directly(self, node=None):
     with user(node, f"{user_name}"):
         table_name = f"table_name_{getuid()}"
 
-        Suite(run=check_privilege, flags=TE,
+        Suite(run=check_privilege,
             examples=Examples("privilege on grant_target_name user_name table_name", [
                 tuple(list(row)+[user_name,user_name,table_name]) for row in check_privilege.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
@@ -40,13 +40,14 @@ def privileges_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(run=check_privilege, flags=TE,
+        Suite(run=check_privilege,
             examples=Examples("privilege on grant_target_name user_name table_name", [
                 tuple(list(row)+[role_name,user_name,table_name]) for row in check_privilege.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
 
 @TestOutline(Suite)
 @Examples("privilege on",[
+    ("ALL", "*.*"),
     ("SYSTEM", "*.*"),
     ("SYSTEM MOVES", "table"),
     ("SYSTEM STOP MOVES", "table"),
@@ -61,8 +62,8 @@ def check_privilege(self, privilege, on, grant_target_name, user_name, table_nam
     if node is None:
         node = self.context.node
 
-    Suite(test=start_moves, setup=instrument_clickhouse_server_log)(privilege=privilege, on=on, grant_target_name=grant_target_name, user_name=user_name, table_name=table_name)
-    Suite(test=stop_moves, setup=instrument_clickhouse_server_log)(privilege=privilege, on=on, grant_target_name=grant_target_name, user_name=user_name, table_name=table_name)
+    Suite(test=start_moves)(privilege=privilege, on=on, grant_target_name=grant_target_name, user_name=user_name, table_name=table_name)
+    Suite(test=stop_moves)(privilege=privilege, on=on, grant_target_name=grant_target_name, user_name=user_name, table_name=table_name)
 
 @TestSuite
 def start_moves(self, privilege, on, grant_target_name, user_name, table_name, node=None):
@@ -78,11 +79,19 @@ def start_moves(self, privilege, on, grant_target_name, user_name, table_name, n
     with table(node, table_name):
 
         with Scenario("SYSTEM START MOVES without privilege"):
-            with When("I check the user can't start moves"):
+
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I check the user can't start moves"):
                 node.query(f"SYSTEM START MOVES {table_name}", settings = [("user", f"{user_name}")],
                     exitcode=exitcode, message=message)
 
         with Scenario("SYSTEM START MOVES with privilege"):
+
             with When(f"I grant {privilege} on the table"):
                 node.query(f"GRANT {privilege} ON {on} TO {grant_target_name}")
 
@@ -90,6 +99,7 @@ def start_moves(self, privilege, on, grant_target_name, user_name, table_name, n
                 node.query(f"SYSTEM START MOVES {table_name}", settings = [("user", f"{user_name}")])
 
         with Scenario("SYSTEM START MOVES with revoked privilege"):
+
             with When(f"I grant {privilege} on the table"):
                 node.query(f"GRANT {privilege} ON {on} TO {grant_target_name}")
 
@@ -114,11 +124,19 @@ def stop_moves(self, privilege, on, grant_target_name, user_name, table_name, no
     with table(node, table_name):
 
         with Scenario("SYSTEM STOP MOVES without privilege"):
-            with When("I check the user can't stop moves"):
+
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I check the user can't stop moves"):
                 node.query(f"SYSTEM STOP MOVES {table_name}", settings = [("user", f"{user_name}")],
                     exitcode=exitcode, message=message)
 
         with Scenario("SYSTEM STOP MOVES with privilege"):
+
             with When(f"I grant {privilege} on the table"):
                 node.query(f"GRANT {privilege} ON {on} TO {grant_target_name}")
 
@@ -126,6 +144,7 @@ def stop_moves(self, privilege, on, grant_target_name, user_name, table_name, no
                 node.query(f"SYSTEM STOP MOVES {table_name}", settings = [("user", f"{user_name}")])
 
         with Scenario("SYSTEM STOP MOVES with revoked privilege"):
+
             with When(f"I grant {privilege} on the table"):
                 node.query(f"GRANT {privilege} ON {on} TO {grant_target_name}")
 
@@ -140,6 +159,8 @@ def stop_moves(self, privilege, on, grant_target_name, user_name, table_name, no
 @Name("system moves")
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_System_Moves("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 def feature(self, node="clickhouse1"):
     """Check the RBAC functionality of SYSTEM MOVES.
diff --git a/tests/testflows/rbac/tests/privileges/system/reload.py b/tests/testflows/rbac/tests/privileges/system/reload.py
index cfc752fb253..bb8f91a0dd4 100644
--- a/tests/testflows/rbac/tests/privileges/system/reload.py
+++ b/tests/testflows/rbac/tests/privileges/system/reload.py
@@ -38,7 +38,7 @@ def config_privileges_granted_directly(self, node=None):
 
     with user(node, f"{user_name}"):
 
-        Suite(run=config, flags=TE,
+        Suite(run=config,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[user_name,user_name]) for row in config.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
@@ -59,7 +59,7 @@ def config_privileges_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(run=config, flags=TE,
+        Suite(run=config,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[role_name,user_name]) for row in config.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
@@ -69,6 +69,7 @@ def config_privileges_granted_via_role(self, node=None):
     RQ_SRS_006_RBAC_Privileges_System_Reload_Config("1.0"),
 )
 @Examples("privilege",[
+    ("ALL",),
     ("SYSTEM",),
     ("SYSTEM RELOAD",),
     ("SYSTEM RELOAD CONFIG",),
@@ -83,11 +84,19 @@ def config(self, privilege, grant_target_name, user_name, node=None):
         node = self.context.node
 
     with Scenario("SYSTEM RELOAD CONFIG without privilege"):
-        with When("I check the user is unable to execute SYSTEM RELOAD CONFIG"):
+
+        with When("I grant the user NONE privilege"):
+            node.query(f"GRANT NONE TO {grant_target_name}")
+
+        with And("I grant the user USAGE privilege"):
+            node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+        with Then("I check the user is unable to execute SYSTEM RELOAD CONFIG"):
             node.query("SYSTEM RELOAD CONFIG", settings = [("user", f"{user_name}")],
                 exitcode=exitcode, message=message)
 
     with Scenario("SYSTEM RELOAD CONFIG with privilege"):
+
         with When(f"I grant {privilege} on the table"):
             node.query(f"GRANT {privilege} ON *.* TO {grant_target_name}")
 
@@ -95,6 +104,7 @@ def config(self, privilege, grant_target_name, user_name, node=None):
             node.query("SYSTEM RELOAD CONFIG", settings = [("user", f"{user_name}")])
 
     with Scenario("SYSTEM RELOAD CONFIG with revoked privilege"):
+
         with When(f"I grant {privilege} on the table"):
             node.query(f"GRANT {privilege} ON *.* TO {grant_target_name}")
 
@@ -117,7 +127,7 @@ def dictionary_privileges_granted_directly(self, node=None):
 
     with user(node, f"{user_name}"):
 
-        Suite(run=dictionary, flags=TE,
+        Suite(run=dictionary,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[user_name,user_name]) for row in dictionary.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
@@ -138,7 +148,7 @@ def dictionary_privileges_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(run=dictionary, flags=TE,
+        Suite(run=dictionary,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[role_name,user_name]) for row in dictionary.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
@@ -148,6 +158,7 @@ def dictionary_privileges_granted_via_role(self, node=None):
     RQ_SRS_006_RBAC_Privileges_System_Reload_Dictionary("1.0"),
 )
 @Examples("privilege",[
+    ("ALL",),
     ("SYSTEM",),
     ("SYSTEM RELOAD",),
     ("SYSTEM RELOAD DICTIONARIES",),
@@ -163,16 +174,24 @@ def dictionary(self, privilege, grant_target_name, user_name, node=None):
         node = self.context.node
 
     with Scenario("SYSTEM RELOAD DICTIONARY without privilege"):
+
         dict_name = f"dict_{getuid()}"
         table_name = f"table_{getuid()}"
 
         with dict_setup(node, table_name, dict_name):
 
-            with When("I check the user is unable to execute SYSTEM RELOAD DICTIONARY"):
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I check the user is unable to execute SYSTEM RELOAD DICTIONARY"):
                 node.query(f"SYSTEM RELOAD DICTIONARY default.{dict_name}", settings = [("user", f"{user_name}")],
                     exitcode=exitcode, message=message)
 
     with Scenario("SYSTEM RELOAD DICTIONARY with privilege"):
+
         dict_name = f"dict_{getuid()}"
         table_name = f"table_{getuid()}"
 
@@ -185,6 +204,7 @@ def dictionary(self, privilege, grant_target_name, user_name, node=None):
                 node.query(f"SYSTEM RELOAD DICTIONARY default.{dict_name}", settings = [("user", f"{user_name}")])
 
     with Scenario("SYSTEM RELOAD DICTIONARY with revoked privilege"):
+
         dict_name = f"dict_{getuid()}"
         table_name = f"table_{getuid()}"
 
@@ -212,7 +232,7 @@ def dictionaries_privileges_granted_directly(self, node=None):
 
     with user(node, f"{user_name}"):
 
-        Suite(run=dictionaries, flags=TE,
+        Suite(run=dictionaries,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[user_name,user_name]) for row in dictionaries.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
@@ -233,7 +253,7 @@ def dictionaries_privileges_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(run=dictionaries, flags=TE,
+        Suite(run=dictionaries,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[role_name,user_name]) for row in dictionaries.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
@@ -243,6 +263,7 @@ def dictionaries_privileges_granted_via_role(self, node=None):
     RQ_SRS_006_RBAC_Privileges_System_Reload_Dictionaries("1.0"),
 )
 @Examples("privilege",[
+    ("ALL",),
     ("SYSTEM",),
     ("SYSTEM RELOAD",),
     ("SYSTEM RELOAD DICTIONARIES",),
@@ -258,11 +279,19 @@ def dictionaries(self, privilege, grant_target_name, user_name, node=None):
         node = self.context.node
 
     with Scenario("SYSTEM RELOAD DICTIONARIES without privilege"):
-        with When("I check the user is unable to execute SYSTEM RELOAD DICTIONARIES"):
+
+        with When("I grant the user NONE privilege"):
+            node.query(f"GRANT NONE TO {grant_target_name}")
+
+        with And("I grant the user USAGE privilege"):
+            node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+        with Then("I check the user is unable to execute SYSTEM RELOAD DICTIONARIES"):
             node.query("SYSTEM RELOAD DICTIONARIES", settings = [("user", f"{user_name}")],
                 exitcode=exitcode, message=message)
 
     with Scenario("SYSTEM RELOAD DICTIONARIES with privilege"):
+
         with When(f"I grant {privilege} on the table"):
             node.query(f"GRANT {privilege} ON *.* TO {grant_target_name}")
 
@@ -270,6 +299,7 @@ def dictionaries(self, privilege, grant_target_name, user_name, node=None):
             node.query("SYSTEM RELOAD DICTIONARIES", settings = [("user", f"{user_name}")])
 
     with Scenario("SYSTEM RELOAD DICTIONARIES with revoked privilege"):
+
         with When(f"I grant {privilege} on the table"):
             node.query(f"GRANT {privilege} ON *.* TO {grant_target_name}")
 
@@ -292,7 +322,7 @@ def embedded_dictionaries_privileges_granted_directly(self, node=None):
 
     with user(node, f"{user_name}"):
 
-        Suite(run=embedded_dictionaries, flags=TE,
+        Suite(run=embedded_dictionaries,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[user_name,user_name]) for row in embedded_dictionaries.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
@@ -313,7 +343,7 @@ def embedded_dictionaries_privileges_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(run=embedded_dictionaries, flags=TE,
+        Suite(run=embedded_dictionaries,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[role_name,user_name]) for row in embedded_dictionaries.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
@@ -323,6 +353,7 @@ def embedded_dictionaries_privileges_granted_via_role(self, node=None):
     RQ_SRS_006_RBAC_Privileges_System_Reload_EmbeddedDictionaries("1.0"),
 )
 @Examples("privilege",[
+    ("ALL",),
     ("SYSTEM",),
     ("SYSTEM RELOAD",),
     ("SYSTEM RELOAD EMBEDDED DICTIONARIES",),
@@ -337,11 +368,19 @@ def embedded_dictionaries(self, privilege, grant_target_name, user_name, node=No
         node = self.context.node
 
     with Scenario("SYSTEM RELOAD EMBEDDED DICTIONARIES without privilege"):
-        with When("I check the user is unable to execute SYSTEM RELOAD EMBEDDED DICTIONARIES"):
+
+        with When("I grant the user NONE privilege"):
+            node.query(f"GRANT NONE TO {grant_target_name}")
+
+        with And("I grant the user USAGE privilege"):
+            node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+        with Then("I check the user is unable to execute SYSTEM RELOAD EMBEDDED DICTIONARIES"):
             node.query("SYSTEM RELOAD EMBEDDED DICTIONARIES", settings = [("user", f"{user_name}")],
                 exitcode=exitcode, message=message)
 
     with Scenario("SYSTEM RELOAD EMBEDDED DICTIONARIES with privilege"):
+
         with When(f"I grant {privilege} on the table"):
             node.query(f"GRANT {privilege} ON *.* TO {grant_target_name}")
 
@@ -349,6 +388,7 @@ def embedded_dictionaries(self, privilege, grant_target_name, user_name, node=No
             node.query("SYSTEM RELOAD EMBEDDED DICTIONARIES", settings = [("user", f"{user_name}")])
 
     with Scenario("SYSTEM RELOAD EMBEDDED DICTIONARIES with revoked privilege"):
+
         with When(f"I grant {privilege} on the table"):
             node.query(f"GRANT {privilege} ON *.* TO {grant_target_name}")
 
@@ -363,6 +403,8 @@ def embedded_dictionaries(self, privilege, grant_target_name, user_name, node=No
 @Name("system reload")
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_System_Reload("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 def feature(self, node="clickhouse1"):
     """Check the RBAC functionality of SYSTEM RELOAD.
diff --git a/tests/testflows/rbac/tests/privileges/system/replication_queues.py b/tests/testflows/rbac/tests/privileges/system/replication_queues.py
index 3ac2e09418a..47f12b7c866 100644
--- a/tests/testflows/rbac/tests/privileges/system/replication_queues.py
+++ b/tests/testflows/rbac/tests/privileges/system/replication_queues.py
@@ -17,7 +17,7 @@ def replicated_privileges_granted_directly(self, node=None):
 
     with user(node, f"{user_name}"):
 
-        Suite(run=check_replicated_privilege, flags=TE,
+        Suite(run=check_replicated_privilege,
             examples=Examples("privilege on grant_target_name user_name", [
                 tuple(list(row)+[user_name,user_name]) for row in check_replicated_privilege.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
@@ -38,13 +38,14 @@ def replicated_privileges_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(run=check_replicated_privilege, flags=TE,
+        Suite(run=check_replicated_privilege,
             examples=Examples("privilege on grant_target_name user_name", [
                 tuple(list(row)+[role_name,user_name]) for row in check_replicated_privilege.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
 
 @TestOutline(Suite)
 @Examples("privilege on",[
+    ("ALL", "*.*"),
     ("SYSTEM", "*.*"),
     ("SYSTEM REPLICATION QUEUES", "table"),
     ("SYSTEM STOP REPLICATION QUEUES", "table"),
@@ -59,8 +60,8 @@ def check_replicated_privilege(self, privilege, on, grant_target_name, user_name
     if node is None:
         node = self.context.node
 
-    Suite(test=start_replication_queues, setup=instrument_clickhouse_server_log)(privilege=privilege, on=on, grant_target_name=grant_target_name, user_name=user_name)
-    Suite(test=stop_replication_queues, setup=instrument_clickhouse_server_log)(privilege=privilege, on=on, grant_target_name=grant_target_name, user_name=user_name)
+    Suite(test=start_replication_queues)(privilege=privilege, on=on, grant_target_name=grant_target_name, user_name=user_name)
+    Suite(test=stop_replication_queues)(privilege=privilege, on=on, grant_target_name=grant_target_name, user_name=user_name)
 
 @TestSuite
 def start_replication_queues(self, privilege, on, grant_target_name, user_name, node=None):
@@ -77,11 +78,19 @@ def start_replication_queues(self, privilege, on, grant_target_name, user_name,
     with table(node, table_name, "ReplicatedMergeTree-sharded_cluster"):
 
         with Scenario("SYSTEM START REPLICATION QUEUES without privilege"):
-            with When("I check the user can't start sends"):
+
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I check the user can't start sends"):
                 node.query(f"SYSTEM START REPLICATION QUEUES {table_name}", settings = [("user", f"{user_name}")],
                     exitcode=exitcode, message=message)
 
         with Scenario("SYSTEM START REPLICATION QUEUES with privilege"):
+
             with When(f"I grant {privilege} on the table"):
                 node.query(f"GRANT {privilege} ON {on} TO {grant_target_name}")
 
@@ -89,6 +98,7 @@ def start_replication_queues(self, privilege, on, grant_target_name, user_name,
                 node.query(f"SYSTEM START REPLICATION QUEUES {table_name}", settings = [("user", f"{user_name}")])
 
         with Scenario("SYSTEM START REPLICATION QUEUES with revoked privilege"):
+
             with When(f"I grant {privilege} on the table"):
                 node.query(f"GRANT {privilege} ON {on} TO {grant_target_name}")
 
@@ -114,11 +124,19 @@ def stop_replication_queues(self, privilege, on, grant_target_name, user_name, n
     with table(node, table_name, "ReplicatedMergeTree-sharded_cluster"):
 
         with Scenario("SYSTEM STOP REPLICATION QUEUES without privilege"):
-            with When("I check the user can't stop sends"):
+
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I check the user can't stop sends"):
                 node.query(f"SYSTEM STOP REPLICATION QUEUES {table_name}", settings = [("user", f"{user_name}")],
                     exitcode=exitcode, message=message)
 
         with Scenario("SYSTEM STOP REPLICATION QUEUES with privilege"):
+
             with When(f"I grant {privilege} on the table"):
                 node.query(f"GRANT {privilege} ON {on} TO {grant_target_name}")
 
@@ -126,6 +144,7 @@ def stop_replication_queues(self, privilege, on, grant_target_name, user_name, n
                 node.query(f"SYSTEM STOP REPLICATION QUEUES {table_name}", settings = [("user", f"{user_name}")])
 
         with Scenario("SYSTEM STOP REPLICATION QUEUES with revoked privilege"):
+
             with When(f"I grant {privilege} on the table"):
                 node.query(f"GRANT {privilege} ON {on} TO {grant_target_name}")
 
@@ -140,6 +159,8 @@ def stop_replication_queues(self, privilege, on, grant_target_name, user_name, n
 @Name("system replication queues")
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_System_ReplicationQueues("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 def feature(self, node="clickhouse1"):
     """Check the RBAC functionality of SYSTEM REPLICATION QUEUES.
diff --git a/tests/testflows/rbac/tests/privileges/system/restart_replica.py b/tests/testflows/rbac/tests/privileges/system/restart_replica.py
index 0e3e61d04bb..4e3d5f7b060 100644
--- a/tests/testflows/rbac/tests/privileges/system/restart_replica.py
+++ b/tests/testflows/rbac/tests/privileges/system/restart_replica.py
@@ -17,7 +17,7 @@ def privileges_granted_directly(self, node=None):
 
     with user(node, f"{user_name}"):
 
-        Suite(run=restart_replica, flags=TE,
+        Suite(run=restart_replica,
             examples=Examples("privilege on grant_target_name user_name", [
                 tuple(list(row)+[user_name,user_name]) for row in restart_replica.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
@@ -38,13 +38,14 @@ def privileges_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(run=restart_replica, flags=TE,
+        Suite(run=restart_replica,
             examples=Examples("privilege on grant_target_name user_name", [
                 tuple(list(row)+[role_name,user_name]) for row in restart_replica.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
 
 @TestOutline(Suite)
 @Examples("privilege on",[
+    ("ALL", "*.*"),
     ("SYSTEM", "*.*"),
     ("SYSTEM RESTART REPLICA", "table"),
     ("RESTART REPLICA", "table"),
@@ -63,11 +64,19 @@ def restart_replica(self, privilege, on, grant_target_name, user_name, node=None
     with table(node, table_name, "ReplicatedMergeTree-sharded_cluster"):
 
         with Scenario("SYSTEM RESTART REPLICA without privilege"):
-            with When("I check the user can't restart replica"):
+
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I check the user can't restart replica"):
                 node.query(f"SYSTEM RESTART REPLICA {table_name}", settings = [("user", f"{user_name}")],
                     exitcode=exitcode, message=message)
 
         with Scenario("SYSTEM RESTART REPLICA with privilege"):
+
             with When(f"I grant {privilege} on the table"):
                 node.query(f"GRANT {privilege} ON {on} TO {grant_target_name}")
 
@@ -75,6 +84,7 @@ def restart_replica(self, privilege, on, grant_target_name, user_name, node=None
                 node.query(f"SYSTEM RESTART REPLICA {table_name}", settings = [("user", f"{user_name}")])
 
         with Scenario("SYSTEM RESTART REPLICA with revoked privilege"):
+
             with When(f"I grant {privilege} on the table"):
                 node.query(f"GRANT {privilege} ON {on} TO {grant_target_name}")
 
@@ -89,6 +99,8 @@ def restart_replica(self, privilege, on, grant_target_name, user_name, node=None
 @Name("system restart replica")
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_System_RestartReplica("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 def feature(self, node="clickhouse1"):
     """Check the RBAC functionality of SYSTEM RESTART REPLICA.
diff --git a/tests/testflows/rbac/tests/privileges/system/sends.py b/tests/testflows/rbac/tests/privileges/system/sends.py
index 24865088703..4acd173d922 100644
--- a/tests/testflows/rbac/tests/privileges/system/sends.py
+++ b/tests/testflows/rbac/tests/privileges/system/sends.py
@@ -17,7 +17,7 @@ def replicated_privileges_granted_directly(self, node=None):
 
     with user(node, f"{user_name}"):
 
-        Suite(run=check_replicated_privilege, flags=TE,
+        Suite(run=check_replicated_privilege,
             examples=Examples("privilege on grant_target_name user_name", [
                 tuple(list(row)+[user_name,user_name]) for row in check_replicated_privilege.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
@@ -38,13 +38,14 @@ def replicated_privileges_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(run=check_replicated_privilege, flags=TE,
+        Suite(run=check_replicated_privilege,
             examples=Examples("privilege on grant_target_name user_name", [
                 tuple(list(row)+[role_name,user_name]) for row in check_replicated_privilege.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
 
 @TestOutline(Suite)
 @Examples("privilege on",[
+    ("ALL", "*.*"),
     ("SYSTEM", "*.*"),
     ("SYSTEM SENDS", "*.*"),
     ("SYSTEM START SENDS", "*.*"),
@@ -67,8 +68,8 @@ def check_replicated_privilege(self, privilege, on, grant_target_name, user_name
     if node is None:
         node = self.context.node
 
-    Suite(test=start_replicated_sends, setup=instrument_clickhouse_server_log)(privilege=privilege, on=on, grant_target_name=grant_target_name, user_name=user_name)
-    Suite(test=stop_replicated_sends, setup=instrument_clickhouse_server_log)(privilege=privilege, on=on, grant_target_name=grant_target_name, user_name=user_name)
+    Suite(test=start_replicated_sends)(privilege=privilege, on=on, grant_target_name=grant_target_name, user_name=user_name)
+    Suite(test=stop_replicated_sends)(privilege=privilege, on=on, grant_target_name=grant_target_name, user_name=user_name)
 
 @TestSuite
 def start_replicated_sends(self, privilege, on, grant_target_name, user_name, node=None):
@@ -85,11 +86,19 @@ def start_replicated_sends(self, privilege, on, grant_target_name, user_name, no
     with table(node, table_name, "ReplicatedMergeTree-sharded_cluster"):
 
         with Scenario("SYSTEM START REPLICATED SENDS without privilege"):
-            with When("I check the user can't start sends"):
+
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I check the user can't start sends"):
                 node.query(f"SYSTEM START REPLICATED SENDS {table_name}", settings = [("user", f"{user_name}")],
                     exitcode=exitcode, message=message)
 
         with Scenario("SYSTEM START REPLICATED SENDS with privilege"):
+
             with When(f"I grant {privilege} on the table"):
                 node.query(f"GRANT {privilege} ON {on} TO {grant_target_name}")
 
@@ -97,6 +106,7 @@ def start_replicated_sends(self, privilege, on, grant_target_name, user_name, no
                 node.query(f"SYSTEM START REPLICATED SENDS {table_name}", settings = [("user", f"{user_name}")])
 
         with Scenario("SYSTEM START REPLICATED SENDS with revoked privilege"):
+
             with When(f"I grant {privilege} on the table"):
                 node.query(f"GRANT {privilege} ON {on} TO {grant_target_name}")
 
@@ -122,11 +132,19 @@ def stop_replicated_sends(self, privilege, on, grant_target_name, user_name, nod
     with table(node, table_name, "ReplicatedMergeTree-sharded_cluster"):
 
         with Scenario("SYSTEM STOP REPLICATED SENDS without privilege"):
-            with When("I check the user can't stop sends"):
+
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I check the user can't stop sends"):
                 node.query(f"SYSTEM STOP REPLICATED SENDS {table_name}", settings = [("user", f"{user_name}")],
                     exitcode=exitcode, message=message)
 
         with Scenario("SYSTEM STOP REPLICATED SENDS with privilege"):
+
             with When(f"I grant {privilege} on the table"):
                 node.query(f"GRANT {privilege} ON {on} TO {grant_target_name}")
 
@@ -134,6 +152,7 @@ def stop_replicated_sends(self, privilege, on, grant_target_name, user_name, nod
                 node.query(f"SYSTEM STOP REPLICATED SENDS {table_name}", settings = [("user", f"{user_name}")])
 
         with Scenario("SYSTEM STOP REPLICATED SENDS with revoked privilege"):
+
             with When(f"I grant {privilege} on the table"):
                 node.query(f"GRANT {privilege} ON {on} TO {grant_target_name}")
 
@@ -157,7 +176,7 @@ def distributed_privileges_granted_directly(self, node=None):
     with user(node, f"{user_name}"):
         table_name = f"table_name_{getuid()}"
 
-        Suite(run=check_distributed_privilege, flags=TE,
+        Suite(run=check_distributed_privilege,
             examples=Examples("privilege on grant_target_name user_name table_name", [
                 tuple(list(row)+[user_name,user_name,table_name]) for row in check_distributed_privilege.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
@@ -179,13 +198,14 @@ def distributed_privileges_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(run=check_distributed_privilege, flags=TE,
+        Suite(run=check_distributed_privilege,
             examples=Examples("privilege on grant_target_name user_name table_name", [
                 tuple(list(row)+[role_name,user_name,table_name]) for row in check_distributed_privilege.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
 
 @TestOutline(Suite)
 @Examples("privilege on",[
+    ("ALL", "*.*"),
     ("SYSTEM", "*.*"),
     ("SYSTEM SENDS", "*.*"),
     ("SYSTEM START SENDS", "*.*"),
@@ -208,8 +228,8 @@ def check_distributed_privilege(self, privilege, on, grant_target_name, user_nam
     if node is None:
         node = self.context.node
 
-    Suite(test=start_distributed_moves, setup=instrument_clickhouse_server_log)(privilege=privilege, on=on, grant_target_name=grant_target_name, user_name=user_name, table_name=table_name)
-    Suite(test=stop_distributed_moves, setup=instrument_clickhouse_server_log)(privilege=privilege, on=on, grant_target_name=grant_target_name, user_name=user_name, table_name=table_name)
+    Suite(test=start_distributed_moves)(privilege=privilege, on=on, grant_target_name=grant_target_name, user_name=user_name, table_name=table_name)
+    Suite(test=stop_distributed_moves)(privilege=privilege, on=on, grant_target_name=grant_target_name, user_name=user_name, table_name=table_name)
 
 @TestSuite
 def start_distributed_moves(self, privilege, on, grant_target_name, user_name, table_name, node=None):
@@ -229,11 +249,19 @@ def start_distributed_moves(self, privilege, on, grant_target_name, user_name, t
                 node.query(f"CREATE TABLE {table_name} (a UInt64) ENGINE = Distributed(sharded_cluster, default, {table0_name}, rand())")
 
             with Scenario("SYSTEM START DISTRIBUTED SENDS without privilege"):
-                with When("I check the user can't start merges"):
+
+                with When("I grant the user NONE privilege"):
+                    node.query(f"GRANT NONE TO {grant_target_name}")
+
+                with And("I grant the user USAGE privilege"):
+                    node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+                with Then("I check the user can't start merges"):
                     node.query(f"SYSTEM START DISTRIBUTED SENDS {table_name}", settings = [("user", f"{user_name}")],
                         exitcode=exitcode, message=message)
 
             with Scenario("SYSTEM START DISTRIBUTED SENDS with privilege"):
+
                 with When(f"I grant {privilege} on the table"):
                     node.query(f"GRANT {privilege} ON {on} TO {grant_target_name}")
 
@@ -241,6 +269,7 @@ def start_distributed_moves(self, privilege, on, grant_target_name, user_name, t
                     node.query(f"SYSTEM START DISTRIBUTED SENDS {table_name}", settings = [("user", f"{user_name}")])
 
             with Scenario("SYSTEM START DISTRIBUTED SENDS with revoked privilege"):
+
                 with When(f"I grant {privilege} on the table"):
                     node.query(f"GRANT {privilege} ON {on} TO {grant_target_name}")
 
@@ -273,11 +302,19 @@ def stop_distributed_moves(self, privilege, on, grant_target_name, user_name, ta
                 node.query(f"CREATE TABLE {table_name} (a UInt64) ENGINE = Distributed(sharded_cluster, default, {table0_name}, rand())")
 
             with Scenario("SYSTEM STOP DISTRIBUTED SENDS without privilege"):
-                with When("I check the user can't stop merges"):
+
+                with When("I grant the user NONE privilege"):
+                    node.query(f"GRANT NONE TO {grant_target_name}")
+
+                with And("I grant the user USAGE privilege"):
+                    node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+                with Then("I check the user can't stop merges"):
                     node.query(f"SYSTEM STOP DISTRIBUTED SENDS {table_name}", settings = [("user", f"{user_name}")],
                         exitcode=exitcode, message=message)
 
             with Scenario("SYSTEM STOP DISTRIBUTED SENDS with privilege"):
+
                 with When(f"I grant {privilege} on the table"):
                     node.query(f"GRANT {privilege} ON {on} TO {grant_target_name}")
 
@@ -285,6 +322,7 @@ def stop_distributed_moves(self, privilege, on, grant_target_name, user_name, ta
                     node.query(f"SYSTEM STOP DISTRIBUTED SENDS {table_name}", settings = [("user", f"{user_name}")])
 
             with Scenario("SYSTEM STOP DISTRIBUTED SENDS with revoked privilege"):
+
                 with When(f"I grant {privilege} on the table"):
                     node.query(f"GRANT {privilege} ON {on} TO {grant_target_name}")
 
@@ -302,6 +340,8 @@ def stop_distributed_moves(self, privilege, on, grant_target_name, user_name, ta
 @Name("system sends")
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_System_Sends("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 def feature(self, node="clickhouse1"):
     """Check the RBAC functionality of SYSTEM SENDS.
diff --git a/tests/testflows/rbac/tests/privileges/system/shutdown.py b/tests/testflows/rbac/tests/privileges/system/shutdown.py
index 290f6d8e5d1..26752ef4d01 100644
--- a/tests/testflows/rbac/tests/privileges/system/shutdown.py
+++ b/tests/testflows/rbac/tests/privileges/system/shutdown.py
@@ -19,7 +19,7 @@ def privileges_granted_directly(self, node=None):
 
     with user(node, f"{user_name}"):
 
-        Suite(run=check_privilege, flags=TE,
+        Suite(run=check_privilege,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[user_name,user_name]) for row in check_privilege.examples
             ], args=Args(name="privilege={privilege}", format_name=True)))
@@ -40,13 +40,14 @@ def privileges_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(run=check_privilege, flags=TE,
+        Suite(run=check_privilege,
             examples=Examples("privilege grant_target_name user_name", [
                 tuple(list(row)+[role_name,user_name]) for row in check_privilege.examples
             ], args=Args(name="privilege={privilege}", format_name=True)))
 
 @TestOutline(Suite)
 @Examples("privilege",[
+    ("ALL",),
     ("SYSTEM",),
     ("SYSTEM SHUTDOWN",),
     ("SHUTDOWN",),
@@ -59,8 +60,8 @@ def check_privilege(self, privilege, grant_target_name, user_name, node=None):
     if node is None:
         node = self.context.node
 
-    Suite(test=shutdown, setup=instrument_clickhouse_server_log)(privilege=privilege, grant_target_name=grant_target_name, user_name=user_name)
-    Suite(test=kill, setup=instrument_clickhouse_server_log)(privilege=privilege, grant_target_name=grant_target_name, user_name=user_name)
+    Suite(test=shutdown)(privilege=privilege, grant_target_name=grant_target_name, user_name=user_name)
+    Suite(test=kill)(privilege=privilege, grant_target_name=grant_target_name, user_name=user_name)
 
 @TestSuite
 def shutdown(self, privilege, grant_target_name, user_name, node=None):
@@ -75,7 +76,13 @@ def shutdown(self, privilege, grant_target_name, user_name, node=None):
 
     with Scenario("SYSTEM SHUTDOWN without privilege"):
 
-        with When("I check the user can't use SYSTEM SHUTDOWN"):
+        with When("I grant the user NONE privilege"):
+            node.query(f"GRANT NONE TO {grant_target_name}")
+
+        with And("I grant the user USAGE privilege"):
+            node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+        with Then("I check the user can't use SYSTEM SHUTDOWN"):
             node.query(f"SYSTEM SHUTDOWN", settings=[("user",user_name)],
                 exitcode=exitcode, message=message)
 
@@ -136,7 +143,13 @@ def kill(self, privilege, grant_target_name, user_name, node=None):
 
     with Scenario("SYSTEM KILL without privilege"):
 
-        with When("I check the user can't use SYSTEM KILL"):
+        with When("I grant the user NONE privilege"):
+            node.query(f"GRANT NONE TO {grant_target_name}")
+
+        with And("I grant the user USAGE privilege"):
+            node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+        with Then("I check the user can't use SYSTEM KILL"):
             node.query(f"SYSTEM KILL", settings=[("user",user_name)],
                 exitcode=exitcode, message=message)
 
@@ -190,6 +203,8 @@ def kill(self, privilege, grant_target_name, user_name, node=None):
 @Name("system shutdown")
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_System_Shutdown("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 def feature(self, node="clickhouse1"):
     """Check the RBAC functionality of SYSTEM SHUTDOWN.
diff --git a/tests/testflows/rbac/tests/privileges/system/sync_replica.py b/tests/testflows/rbac/tests/privileges/system/sync_replica.py
index 7df697fd6e5..14681ad31ae 100644
--- a/tests/testflows/rbac/tests/privileges/system/sync_replica.py
+++ b/tests/testflows/rbac/tests/privileges/system/sync_replica.py
@@ -17,7 +17,7 @@ def privileges_granted_directly(self, node=None):
 
     with user(node, f"{user_name}"):
 
-        Suite(run=sync_replica, flags=TE,
+        Suite(run=sync_replica,
             examples=Examples("privilege on grant_target_name user_name", [
                 tuple(list(row)+[user_name,user_name]) for row in sync_replica.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
@@ -38,13 +38,14 @@ def privileges_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(run=sync_replica, flags=TE,
+        Suite(run=sync_replica,
             examples=Examples("privilege on grant_target_name user_name", [
                 tuple(list(row)+[role_name,user_name]) for row in sync_replica.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
 
 @TestOutline(Suite)
 @Examples("privilege on",[
+    ("ALL", "*.*"),
     ("SYSTEM", "*.*"),
     ("SYSTEM SYNC REPLICA", "table"),
     ("SYNC REPLICA", "table"),
@@ -63,11 +64,19 @@ def sync_replica(self, privilege, on, grant_target_name, user_name, node=None):
     with table(node, table_name, "ReplicatedMergeTree-sharded_cluster"):
 
         with Scenario("SYSTEM SYNC REPLICA without privilege"):
-            with When("I check the user can't sync replica"):
+
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I check the user can't sync replica"):
                 node.query(f"SYSTEM SYNC REPLICA {table_name}", settings = [("user", f"{user_name}")],
                     exitcode=exitcode, message=message)
 
         with Scenario("SYSTEM SYNC REPLICA with privilege"):
+
             with When(f"I grant {privilege} on the table"):
                 node.query(f"GRANT {privilege} ON {on} TO {grant_target_name}")
 
@@ -75,6 +84,7 @@ def sync_replica(self, privilege, on, grant_target_name, user_name, node=None):
                 node.query(f"SYSTEM SYNC REPLICA {table_name}", settings = [("user", f"{user_name}")])
 
         with Scenario("SYSTEM SYNC REPLICA with revoked privilege"):
+
             with When(f"I grant {privilege} on the table"):
                 node.query(f"GRANT {privilege} ON {on} TO {grant_target_name}")
 
@@ -89,6 +99,8 @@ def sync_replica(self, privilege, on, grant_target_name, user_name, node=None):
 @Name("system sync replica")
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_System_SyncReplica("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 def feature(self, node="clickhouse1"):
     """Check the RBAC functionality of SYSTEM SYNC REPLICA.
diff --git a/tests/testflows/rbac/tests/privileges/system/ttl_merges.py b/tests/testflows/rbac/tests/privileges/system/ttl_merges.py
index 74f99026fe4..a59cc530a6d 100644
--- a/tests/testflows/rbac/tests/privileges/system/ttl_merges.py
+++ b/tests/testflows/rbac/tests/privileges/system/ttl_merges.py
@@ -18,7 +18,7 @@ def privileges_granted_directly(self, node=None):
     with user(node, f"{user_name}"):
         table_name = f"table_name_{getuid()}"
 
-        Suite(run=check_privilege, flags=TE,
+        Suite(run=check_privilege,
             examples=Examples("privilege on grant_target_name user_name table_name", [
                 tuple(list(row)+[user_name,user_name,table_name]) for row in check_privilege.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
@@ -40,13 +40,14 @@ def privileges_granted_via_role(self, node=None):
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
 
-        Suite(run=check_privilege, flags=TE,
+        Suite(run=check_privilege,
             examples=Examples("privilege on grant_target_name user_name table_name", [
                 tuple(list(row)+[role_name,user_name,table_name]) for row in check_privilege.examples
             ], args=Args(name="check privilege={privilege}", format_name=True)))
 
 @TestOutline(Suite)
 @Examples("privilege on",[
+    ("ALL", "*.*"),
     ("SYSTEM", "*.*"),
     ("SYSTEM TTL MERGES", "table"),
     ("SYSTEM STOP TTL MERGES", "table"),
@@ -61,8 +62,8 @@ def check_privilege(self, privilege, on, grant_target_name, user_name, table_nam
     if node is None:
         node = self.context.node
 
-    Suite(test=start_ttl_merges, setup=instrument_clickhouse_server_log)(privilege=privilege, on=on, grant_target_name=grant_target_name, user_name=user_name, table_name=table_name)
-    Suite(test=stop_ttl_merges, setup=instrument_clickhouse_server_log)(privilege=privilege, on=on, grant_target_name=grant_target_name, user_name=user_name, table_name=table_name)
+    Suite(test=start_ttl_merges)(privilege=privilege, on=on, grant_target_name=grant_target_name, user_name=user_name, table_name=table_name)
+    Suite(test=stop_ttl_merges)(privilege=privilege, on=on, grant_target_name=grant_target_name, user_name=user_name, table_name=table_name)
 
 @TestSuite
 def start_ttl_merges(self, privilege, on, grant_target_name, user_name, table_name, node=None):
@@ -78,11 +79,19 @@ def start_ttl_merges(self, privilege, on, grant_target_name, user_name, table_na
     with table(node, table_name):
 
         with Scenario("SYSTEM START TTL MERGES without privilege"):
-            with When("I check the user can't start merges"):
+
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I check the user can't start merges"):
                 node.query(f"SYSTEM START TTL MERGES {table_name}", settings = [("user", f"{user_name}")],
                     exitcode=exitcode, message=message)
 
         with Scenario("SYSTEM START TTL MERGES with privilege"):
+
             with When(f"I grant {privilege} on the table"):
                 node.query(f"GRANT {privilege} ON {on} TO {grant_target_name}")
 
@@ -90,6 +99,7 @@ def start_ttl_merges(self, privilege, on, grant_target_name, user_name, table_na
                 node.query(f"SYSTEM START TTL MERGES {table_name}", settings = [("user", f"{user_name}")])
 
         with Scenario("SYSTEM START TTL MERGES with revoked privilege"):
+
             with When(f"I grant {privilege} on the table"):
                 node.query(f"GRANT {privilege} ON {on} TO {grant_target_name}")
 
@@ -114,11 +124,19 @@ def stop_ttl_merges(self, privilege, on, grant_target_name, user_name, table_nam
     with table(node, table_name):
 
         with Scenario("SYSTEM STOP TTL MERGES without privilege"):
-            with When("I check the user can't stop merges"):
+
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I check the user can't stop merges"):
                 node.query(f"SYSTEM STOP TTL MERGES {table_name}", settings = [("user", f"{user_name}")],
                     exitcode=exitcode, message=message)
 
         with Scenario("SYSTEM STOP TTL MERGES with privilege"):
+
             with When(f"I grant {privilege} on the table"):
                 node.query(f"GRANT {privilege} ON {on} TO {grant_target_name}")
 
@@ -126,6 +144,7 @@ def stop_ttl_merges(self, privilege, on, grant_target_name, user_name, table_nam
                 node.query(f"SYSTEM STOP TTL MERGES {table_name}", settings = [("user", f"{user_name}")])
 
         with Scenario("SYSTEM STOP TTL MERGES with revoked privilege"):
+
             with When(f"I grant {privilege} on the table"):
                 node.query(f"GRANT {privilege} ON {on} TO {grant_target_name}")
 
@@ -140,6 +159,8 @@ def stop_ttl_merges(self, privilege, on, grant_target_name, user_name, table_nam
 @Name("system ttl merges")
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_System_TTLMerges("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 def feature(self, node="clickhouse1"):
     """Check the RBAC functionality of SYSTEM TTL MERGES.
diff --git a/tests/testflows/rbac/tests/privileges/truncate.py b/tests/testflows/rbac/tests/privileges/truncate.py
index b7dfcbfd718..df81913f0a8 100644
--- a/tests/testflows/rbac/tests/privileges/truncate.py
+++ b/tests/testflows/rbac/tests/privileges/truncate.py
@@ -12,13 +12,13 @@ def privilege_granted_directly_or_via_role(self, table_type, node=None):
     if node is None:
         node = self.context.node
 
-    with Suite("user with direct privilege", setup=instrument_clickhouse_server_log):
+    with Suite("user with direct privilege"):
         with user(node, user_name):
 
             with When(f"I run checks that {user_name} is only able to execute TRUNCATE with required privileges"):
                 privilege_check(grant_target_name=user_name, user_name=user_name, table_type=table_type, node=node)
 
-    with Suite("user with privilege via role", setup=instrument_clickhouse_server_log):
+    with Suite("user with privilege via role"):
         with user(node, user_name), role(node, role_name):
 
             with When("I grant the role to the user"):
@@ -32,16 +32,22 @@ def privilege_check(grant_target_name, user_name, table_type, node=None):
     """
     exitcode, message = errors.not_enough_privileges(name=f"{user_name}")
 
-    with Scenario("user without privilege", setup=instrument_clickhouse_server_log):
+    with Scenario("user without privilege"):
         table_name = f"merge_tree_{getuid()}"
 
         with table(node, table_name, table_type):
 
-            with When("I attempt to truncate a table without privilege"):
+            with When("I grant the user NONE privilege"):
+                node.query(f"GRANT NONE TO {grant_target_name}")
+
+            with And("I grant the user USAGE privilege"):
+                node.query(f"GRANT USAGE ON *.* TO {grant_target_name}")
+
+            with Then("I attempt to truncate a table without privilege"):
                 node.query(f"TRUNCATE TABLE {table_name}", settings = [("user", user_name)],
                     exitcode=exitcode, message=message)
 
-    with Scenario("user with privilege", setup=instrument_clickhouse_server_log):
+    with Scenario("user with privilege"):
         table_name = f"merge_tree_{getuid()}"
 
         with table(node, table_name, table_type):
@@ -52,7 +58,7 @@ def privilege_check(grant_target_name, user_name, table_type, node=None):
             with Then("I attempt to truncate a table"):
                 node.query(f"TRUNCATE TABLE {table_name}", settings = [("user", user_name)])
 
-    with Scenario("user with revoked privilege", setup=instrument_clickhouse_server_log):
+    with Scenario("user with revoked privilege"):
         table_name = f"merge_tree_{getuid()}"
 
         with table(node, table_name, table_type):
@@ -67,7 +73,22 @@ def privilege_check(grant_target_name, user_name, table_type, node=None):
                 node.query(f"TRUNCATE TABLE {table_name}", settings = [("user", user_name)],
                     exitcode=exitcode, message=message)
 
-    with Scenario("execute on cluster", setup=instrument_clickhouse_server_log):
+    with Scenario("user with revoked ALL privilege"):
+        table_name = f"merge_tree_{getuid()}"
+
+        with table(node, table_name, table_type):
+
+            with When("I grant the truncate privilege"):
+                node.query(f"GRANT TRUNCATE ON {table_name} TO {grant_target_name}")
+
+            with And("I revoke ALL privilege"):
+                node.query(f"REVOKE ALL ON *.* FROM {grant_target_name}")
+
+            with Then("I attempt to truncate a table"):
+                node.query(f"TRUNCATE TABLE {table_name}", settings = [("user", user_name)],
+                    exitcode=exitcode, message=message)
+
+    with Scenario("execute on cluster"):
         table_name = f"merge_tree_{getuid()}"
 
         with table(node, table_name, table_type):
@@ -78,9 +99,25 @@ def privilege_check(grant_target_name, user_name, table_type, node=None):
             with Then("I attempt to truncate a table"):
                 node.query(f"TRUNCATE TABLE IF EXISTS {table_name} ON CLUSTER sharded_cluster", settings = [("user", user_name)])
 
+    with Scenario("user with ALL privilege"):
+        table_name = f"merge_tree_{getuid()}"
+
+        with table(node, table_name, table_type):
+
+            with When("I revoke ALL privilege"):
+                node.query(f"REVOKE ALL ON *.* FROM {grant_target_name}")
+
+            with And("I grant ALL privilege"):
+                node.query(f"GRANT ALL ON *.* TO {grant_target_name}")
+
+            with Then("I attempt to truncate a table"):
+                node.query(f"TRUNCATE TABLE {table_name}", settings = [("user", user_name)])
+
 @TestFeature
 @Requirements(
     RQ_SRS_006_RBAC_Privileges_Truncate("1.0"),
+    RQ_SRS_006_RBAC_Privileges_All("1.0"),
+    RQ_SRS_006_RBAC_Privileges_None("1.0")
 )
 @Examples("table_type", [
     (key,) for key in table_types.keys()
@@ -103,5 +140,5 @@ def feature(self, node="clickhouse1", stress=None, parallel=None):
             continue
 
         with Example(str(example)):
-            with Suite(test=privilege_granted_directly_or_via_role):
+            with Suite(test=privilege_granted_directly_or_via_role, setup=instrument_clickhouse_server_log):
                 privilege_granted_directly_or_via_role(table_type=table_type)
diff --git a/tests/testflows/rbac/tests/syntax/alter_quota.py b/tests/testflows/rbac/tests/syntax/alter_quota.py
index 74a9c05bd27..6ccafc4dbcd 100755
--- a/tests/testflows/rbac/tests/syntax/alter_quota.py
+++ b/tests/testflows/rbac/tests/syntax/alter_quota.py
@@ -33,12 +33,12 @@ def feature(self, node="clickhouse1"):
             node.query(f"CREATE USER user0")
             node.query(f"CREATE ROLE role0")
 
-        with Scenario("I alter quota with no options", flags=TE, requirements=[
+        with Scenario("I alter quota with no options", requirements=[
                 RQ_SRS_006_RBAC_Quota_Alter("1.0")]):
             with When("I alter quota"):
                 node.query("ALTER QUOTA quota0")
 
-        with Scenario("I alter quota that does not exist, throws an exception", flags=TE, requirements=[
+        with Scenario("I alter quota that does not exist, throws an exception", requirements=[
                 RQ_SRS_006_RBAC_Quota_Alter("1.0")]):
             quota = "quota1"
             cleanup_quota(quota)
@@ -47,11 +47,11 @@ def feature(self, node="clickhouse1"):
                 node.query(f"ALTER QUOTA {quota}", exitcode=exitcode, message=message)
             del quota
 
-        with Scenario("I alter quota with if exists, quota does exist", flags=TE, requirements=[
+        with Scenario("I alter quota with if exists, quota does exist", requirements=[
                 RQ_SRS_006_RBAC_Quota_Alter_IfExists("1.0")]):
             node.query("ALTER QUOTA IF EXISTS quota0")
 
-        with Scenario("I alter quota with if exists, quota does not exist", flags=TE, requirements=[
+        with Scenario("I alter quota with if exists, quota does not exist", requirements=[
                 RQ_SRS_006_RBAC_Quota_Alter_IfExists("1.0")]):
             quota = "quota1"
             cleanup_quota(quota)
@@ -59,11 +59,11 @@ def feature(self, node="clickhouse1"):
                 node.query(f"ALTER QUOTA IF EXISTS {quota}")
             del quota
 
-        with Scenario("I alter quota using rename, target available", flags=TE, requirements=[
+        with Scenario("I alter quota using rename, target available", requirements=[
                 RQ_SRS_006_RBAC_Quota_Alter_Rename("1.0")]):
             node.query("ALTER QUOTA quota0 RENAME TO quota0")
 
-        with Scenario("I alter quota using rename, target unavailable", flags=TE, requirements=[
+        with Scenario("I alter quota using rename, target unavailable", requirements=[
                 RQ_SRS_006_RBAC_Quota_Alter_Rename("1.0")]):
             new_quota = "quota1"
 
@@ -82,20 +82,20 @@ def feature(self, node="clickhouse1"):
 
         keys = ['none', 'user name', 'ip address', 'client key', 'client key or user name', 'client key or ip address']
         for key in keys:
-            with Scenario(f"I alter quota keyed by {key}", flags=TE, requirements=[
+            with Scenario(f"I alter quota keyed by {key}", requirements=[
                     RQ_SRS_006_RBAC_Quota_Alter_KeyedBy("1.0"),
                     RQ_SRS_006_RBAC_Quota_Alter_KeyedByOptions("1.0")]):
                 with When("I alter quota with a key"):
                     node.query(f"ALTER QUOTA quota0 KEYED BY '{key}'")
 
-        with Scenario("I alter quota for randomized interval", flags=TE, requirements=[
+        with Scenario("I alter quota for randomized interval", requirements=[
                 RQ_SRS_006_RBAC_Quota_Alter_Interval_Randomized("1.0")]):
             with When("I alter quota on a randomized interval"):
                 node.query("ALTER QUOTA quota0 FOR RANDOMIZED INTERVAL 1 DAY NO LIMITS")
 
         intervals = ['SECOND', 'MINUTE', 'HOUR', 'DAY', 'MONTH']
         for i, interval in enumerate(intervals):
-            with Scenario(f"I alter quota for interval {interval}", flags=TE, requirements=[
+            with Scenario(f"I alter quota for interval {interval}", requirements=[
                     RQ_SRS_006_RBAC_Quota_Alter_Interval("1.0")]):
                 with When(f"I alter quota for {interval}"):
                     node.query(f"ALTER QUOTA quota0 FOR INTERVAL 1 {interval} NO LIMITS")
@@ -104,7 +104,7 @@ def feature(self, node="clickhouse1"):
             'MAX RESULT BYTES', 'MAX READ ROWS', 'MAX READ BYTES', 'MAX EXECUTION TIME',
             'NO LIMITS', 'TRACKING ONLY']
         for i, constraint in enumerate(constraints):
-            with Scenario(f"I alter quota for {constraint.lower()}", flags=TE, requirements=[
+            with Scenario(f"I alter quota for {constraint.lower()}", requirements=[
                     RQ_SRS_006_RBAC_Quota_Alter_Queries("1.0"),
                     RQ_SRS_006_RBAC_Quota_Alter_Errors("1.0"),
                     RQ_SRS_006_RBAC_Quota_Alter_ResultRows("1.0"),
@@ -117,7 +117,7 @@ def feature(self, node="clickhouse1"):
                 with When("I alter quota for a constraint"):
                     node.query(f"ALTER QUOTA quota0 FOR INTERVAL 1 DAY {constraint}{' 1024' if constraint.startswith('MAX') else ''}")
 
-        with Scenario("I create quota for multiple constraints", flags=TE, requirements=[
+        with Scenario("I create quota for multiple constraints", requirements=[
                 RQ_SRS_006_RBAC_Quota_Alter_Interval("1.0"),
                 RQ_SRS_006_RBAC_Quota_Alter_Queries("1.0")]):
             node.query("ALTER QUOTA quota0 \
@@ -125,12 +125,12 @@ def feature(self, node="clickhouse1"):
                  FOR INTERVAL 2 DAY MAX QUERIES 124, \
                  FOR INTERVAL 1 MONTH TRACKING ONLY")
 
-        with Scenario("I alter quota to assign to one role", flags=TE, requirements=[
+        with Scenario("I alter quota to assign to one role", requirements=[
                 RQ_SRS_006_RBAC_Quota_Alter_Assignment("1.0")]):
             with When("I alter quota to a role"):
                 node.query("ALTER QUOTA quota0 TO role0")
 
-        with Scenario("I alter quota to assign to role that does not exist, throws exception", flags=TE, requirements=[
+        with Scenario("I alter quota to assign to role that does not exist, throws exception", requirements=[
                 RQ_SRS_006_RBAC_Quota_Alter_Assignment("1.0")]):
             role = "role1"
             with Given(f"I drop {role} if it exists"):
@@ -140,7 +140,7 @@ def feature(self, node="clickhouse1"):
                 node.query(f"ALTER QUOTA quota0 TO {role}", exitcode=exitcode, message=message)
             del role
 
-        with Scenario("I alter quota to assign to all except role that does not exist, throws exception", flags=TE, requirements=[
+        with Scenario("I alter quota to assign to all except role that does not exist, throws exception", requirements=[
                 RQ_SRS_006_RBAC_Quota_Alter_Assignment("1.0")]):
             role = "role1"
             with Given(f"I drop {role} if it exists"):
@@ -150,32 +150,32 @@ def feature(self, node="clickhouse1"):
                 node.query(f"ALTER QUOTA quota0 TO ALL EXCEPT {role}", exitcode=exitcode, message=message)
             del role
 
-        with Scenario("I alter quota to assign to one role and one user", flags=TE, requirements=[
+        with Scenario("I alter quota to assign to one role and one user", requirements=[
                 RQ_SRS_006_RBAC_Quota_Alter_Assignment("1.0")]):
             with When("I alter quota to a role and a user"):
                 node.query("ALTER QUOTA quota0 TO role0, user0")
 
-        with Scenario("I alter quota assigned to none", flags=TE, requirements=[
+        with Scenario("I alter quota assigned to none", requirements=[
                 RQ_SRS_006_RBAC_Quota_Alter_Assignment_None("1.0")]):
             with When("I alter quota to none"):
                 node.query("ALTER QUOTA quota0 TO NONE")
 
-        with Scenario("I alter quota to assign to all", flags=TE, requirements=[
+        with Scenario("I alter quota to assign to all", requirements=[
                 RQ_SRS_006_RBAC_Quota_Alter_Assignment_All("1.0")]):
             with When("I alter quota to all"):
                 node.query("ALTER QUOTA quota0 TO ALL")
 
-        with Scenario("I alter quota to assign to all except one role", flags=TE, requirements=[
+        with Scenario("I alter quota to assign to all except one role", requirements=[
                 RQ_SRS_006_RBAC_Quota_Alter_Assignment_Except("1.0")]):
             with When("I alter quota to all except one role"):
                 node.query("ALTER QUOTA quota0 TO ALL EXCEPT role0")
 
-        with Scenario("I alter quota to assign to all except multiple roles", flags=TE, requirements=[
+        with Scenario("I alter quota to assign to all except multiple roles", requirements=[
                 RQ_SRS_006_RBAC_Quota_Alter_Assignment_Except("1.0")]):
             with When("I alter quota to all except one multiple roles"):
                 node.query("ALTER QUOTA quota0 TO ALL EXCEPT role0, user0")
 
-        with Scenario("I alter quota on cluster", flags=TE, requirements=[
+        with Scenario("I alter quota on cluster", requirements=[
                 RQ_SRS_006_RBAC_Quota_Alter_Cluster("1.0")]):
             try:
                 with Given("I have a quota on a cluster"):
@@ -193,7 +193,7 @@ def feature(self, node="clickhouse1"):
                 with Finally("I drop the quota"):
                     node.query("DROP QUOTA IF EXISTS quota1 ON CLUSTER sharded_cluster")
 
-        with Scenario("I alter quota on nonexistent cluster, throws exception", flags=TE, requirements=[
+        with Scenario("I alter quota on nonexistent cluster, throws exception", requirements=[
                 RQ_SRS_006_RBAC_Quota_Alter_Cluster("1.0")]):
             with When("I run alter quota on a cluster"):
                 exitcode, message = errors.cluster_not_found("fake_cluster")
diff --git a/tests/testflows/rbac/tests/syntax/alter_role.py b/tests/testflows/rbac/tests/syntax/alter_role.py
index b1e66fb5893..5068302fc84 100755
--- a/tests/testflows/rbac/tests/syntax/alter_role.py
+++ b/tests/testflows/rbac/tests/syntax/alter_role.py
@@ -38,13 +38,13 @@ def feature(self, node="clickhouse1"):
         with Given(f"I ensure that role {role} does not exist"):
             node.query(f"DROP ROLE IF EXISTS {role}")
 
-    with Scenario("I alter role with no options", flags=TE, requirements=[
+    with Scenario("I alter role with no options", requirements=[
             RQ_SRS_006_RBAC_Role_Alter("1.0")]):
         with setup("role0"):
             with When("I alter role"):
                 node.query("ALTER ROLE role0")
 
-    with Scenario("I alter role that does not exist, throws exception", flags=TE, requirements=[
+    with Scenario("I alter role that does not exist, throws exception", requirements=[
             RQ_SRS_006_RBAC_Role_Alter("1.0")]):
         role = "role0"
         cleanup_role(role)
@@ -53,13 +53,13 @@ def feature(self, node="clickhouse1"):
             node.query(f"ALTER ROLE {role}", exitcode=exitcode, message=message)
         del role
 
-    with Scenario("I alter role if exists, role does exist", flags=TE, requirements=[
+    with Scenario("I alter role if exists, role does exist", requirements=[
             RQ_SRS_006_RBAC_Role_Alter_IfExists("1.0")]):
         with setup("role1"):
             with When("I alter role with if exists"):
                 node.query("ALTER ROLE IF EXISTS role1")
 
-    with Scenario("I alter role if exists, role does not exist", flags=TE, requirements=[
+    with Scenario("I alter role if exists, role does not exist", requirements=[
             RQ_SRS_006_RBAC_Role_Alter_IfExists("1.0")]):
         role = "role0"
         cleanup_role(role)
@@ -67,7 +67,7 @@ def feature(self, node="clickhouse1"):
             node.query(f"ALTER ROLE IF EXISTS {role}")
         del role
 
-    with Scenario("I alter role on cluster", flags=TE, requirements=[
+    with Scenario("I alter role on cluster", requirements=[
             RQ_SRS_006_RBAC_Role_Alter_Cluster("1.0")]):
         try:
             with Given("I have a role on a cluster"):
@@ -82,13 +82,13 @@ def feature(self, node="clickhouse1"):
             with Finally("I drop the role"):
                 node.query("DROP ROLE IF EXISTS role1,role2 ON CLUSTER sharded_cluster")
 
-    with Scenario("I alter role on nonexistent cluster, throws exception", flags=TE, requirements=[
+    with Scenario("I alter role on nonexistent cluster, throws exception", requirements=[
             RQ_SRS_006_RBAC_Role_Alter_Cluster("1.0")]):
         with When("I run alter role on a cluster"):
             exitcode, message = errors.cluster_not_found("fake_cluster")
             node.query("ALTER ROLE role1 ON CLUSTER fake_cluster", exitcode=exitcode, message=message)
 
-    with Scenario("I alter role to rename, new name is available", flags=TE, requirements=[
+    with Scenario("I alter role to rename, new name is available", requirements=[
             RQ_SRS_006_RBAC_Role_Alter_Rename("1.0")]):
         with setup("role2"):
             new_role = "role3"
@@ -102,7 +102,7 @@ def feature(self, node="clickhouse1"):
                     node.query(f"DROP ROLE IF EXISTS {new_role}")
             del new_role
 
-    with Scenario("I alter role to rename, new name is not available, throws exception", flags=TE, requirements=[
+    with Scenario("I alter role to rename, new name is not available, throws exception", requirements=[
             RQ_SRS_006_RBAC_Role_Alter_Rename("1.0")]):
         with setup("role2a"):
             new_role = "role3a"
@@ -117,13 +117,13 @@ def feature(self, node="clickhouse1"):
                     node.query(f"DROP ROLE IF EXISTS {new_role}")
             del new_role
 
-    with Scenario("I alter role settings profile", flags=TE, requirements=[
+    with Scenario("I alter role settings profile", requirements=[
             RQ_SRS_006_RBAC_Role_Alter_Settings("1.0")]):
         with setup("role4"):
             with When("I alter role with settings profile"):
                 node.query("ALTER ROLE role4 SETTINGS PROFILE default, max_memory_usage=10000000 READONLY")
 
-    with Scenario("I alter role settings profile, profile does not exist, throws exception", flags=TE, requirements=[
+    with Scenario("I alter role settings profile, profile does not exist, throws exception", requirements=[
             RQ_SRS_006_RBAC_Role_Alter_Settings("1.0")]):
         with setup("role4a"):
             with Given("I ensure profile profile0 does not exist"):
@@ -132,20 +132,20 @@ def feature(self, node="clickhouse1"):
                 exitcode, message = errors.settings_profile_not_found_in_disk("profile0")
                 node.query("ALTER ROLE role4a SETTINGS PROFILE profile0", exitcode=exitcode, message=message)
 
-    with Scenario("I alter role settings profile multiple", flags=TE, requirements=[
+    with Scenario("I alter role settings profile multiple", requirements=[
             RQ_SRS_006_RBAC_Role_Alter_Settings("1.0")]):
         with setup("role4b", profile="profile0"):
             with When("I alter role with multiple profiles"):
                 node.query("ALTER ROLE role4b SETTINGS PROFILE default, PROFILE profile0, \
                     max_memory_usage=10000000 READONLY")
 
-    with Scenario("I alter role settings without profile", flags=TE, requirements=[
+    with Scenario("I alter role settings without profile", requirements=[
             RQ_SRS_006_RBAC_Role_Alter_Settings("1.0")]):
         with setup("role5"):
             with When("I alter role with settings and no profile"):
                 node.query("ALTER ROLE role5 SETTINGS max_memory_usage=10000000 READONLY")
 
-    with Scenario("I alter role settings, variable does not exist, throws exception", flags=TE, requirements=[
+    with Scenario("I alter role settings, variable does not exist, throws exception", requirements=[
                 RQ_SRS_006_RBAC_Role_Alter_Settings("1.0")]):
         with setup("role5a"):
             with When("I alter role using settings and nonexistent value"):
@@ -153,33 +153,33 @@ def feature(self, node="clickhouse1"):
                 node.query("ALTER ROLE role5a SETTINGS fake_setting = 100000001", exitcode=exitcode, message=message)
 
 
-    with Scenario("I alter role settings without profile multiple", flags=TE, requirements=[
+    with Scenario("I alter role settings without profile multiple", requirements=[
             RQ_SRS_006_RBAC_Role_Alter_Settings("1.0")]):
         with setup("role6"):
             with When("I alter role with multiple settings and no profile"):
                 node.query("ALTER ROLE role6 SETTINGS max_memory_usage=10000000 READONLY, \
                     max_rows_to_read MIN 20 MAX 25")
 
-    with Scenario("I alter role settings with multiple profiles multiple variables", flags=TE, requirements=[
+    with Scenario("I alter role settings with multiple profiles multiple variables", requirements=[
             RQ_SRS_006_RBAC_Role_Alter_Settings("1.0")]):
         with setup("role7", profile="profile1"):
             with When("I alter role with multiple settings and profiles"):
                 node.query("ALTER ROLE role7 SETTINGS PROFILE default, PROFILE profile1, \
                     max_memory_usage=10000000 READONLY, max_rows_to_read MIN 20 MAX 25")
 
-    with Scenario("I alter role settings readonly", flags=TE, requirements=[
+    with Scenario("I alter role settings readonly", requirements=[
             RQ_SRS_006_RBAC_Role_Alter_Settings("1.0")]):
         with setup("role8"):
             with When("I alter role with readonly"):
                 node.query("ALTER ROLE role8 SETTINGS max_memory_usage READONLY")
 
-    with Scenario("I alter role settings writable", flags=TE, requirements=[
+    with Scenario("I alter role settings writable", requirements=[
             RQ_SRS_006_RBAC_Role_Alter_Settings("1.0")]):
         with setup("role9"):
             with When("I alter role with writable"):
                 node.query("ALTER ROLE role9 SETTINGS max_memory_usage WRITABLE")
 
-    with Scenario("I alter role settings min, with and without = sign", flags=TE, requirements=[
+    with Scenario("I alter role settings min, with and without = sign", requirements=[
             RQ_SRS_006_RBAC_Role_Alter_Settings("1.0")]):
         with setup("role10"):
             with When("I set min, no equals"):
@@ -187,7 +187,7 @@ def feature(self, node="clickhouse1"):
             with When("I set min, yes equals"):
                 node.query("ALTER ROLE role10 SETTINGS max_memory_usage MIN = 200")
 
-    with Scenario("I alter role settings max, with and without = sign", flags=TE, requirements=[
+    with Scenario("I alter role settings max, with and without = sign", requirements=[
             RQ_SRS_006_RBAC_Role_Alter_Settings("1.0")]):
         with setup("role11"):
             with When("I set max, no equals"):
diff --git a/tests/testflows/rbac/tests/syntax/alter_row_policy.py b/tests/testflows/rbac/tests/syntax/alter_row_policy.py
index 7fbed4a63c4..6422a81fec2 100755
--- a/tests/testflows/rbac/tests/syntax/alter_row_policy.py
+++ b/tests/testflows/rbac/tests/syntax/alter_row_policy.py
@@ -42,21 +42,21 @@ def feature(self, node="clickhouse1"):
             node.query(f"CREATE ROLE role0")
             node.query(f"CREATE ROLE role1")
 
-        with Scenario("I alter row policy with no options", flags=TE, requirements=[
+        with Scenario("I alter row policy with no options", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_Alter("1.0"),
                 RQ_SRS_006_RBAC_RowPolicy_Alter_On("1.0")]):
             with cleanup("policy0"):
                 with When("I alter row policy"):
                     node.query("ALTER ROW POLICY policy0 ON default.foo")
 
-        with Scenario("I alter row policy using short syntax with no options", flags=TE, requirements=[
+        with Scenario("I alter row policy using short syntax with no options", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_Alter("1.0"),
                 RQ_SRS_006_RBAC_RowPolicy_Alter_On("1.0")]):
             with cleanup("policy1"):
                 with When("I alter row policy short form"):
                     node.query("ALTER POLICY policy1 ON default.foo")
 
-        with Scenario("I alter row policy, does not exist, throws exception", flags=TE, requirements=[
+        with Scenario("I alter row policy, does not exist, throws exception", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_Alter("1.0"),
                 RQ_SRS_006_RBAC_RowPolicy_Alter_On("1.0")]):
             policy = "policy2"
@@ -66,14 +66,14 @@ def feature(self, node="clickhouse1"):
                 node.query(f"ALTER ROW POLICY {policy} ON default.foo", exitcode=exitcode, message=message)
             del policy
 
-        with Scenario("I alter row policy if exists", flags=TE, requirements=[
+        with Scenario("I alter row policy if exists", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_Alter_IfExists("1.0"),
                 RQ_SRS_006_RBAC_RowPolicy_Alter_On("1.0")]):
             with cleanup("policy2"):
                 with When("I alter row policy using if exists"):
                     node.query("ALTER ROW POLICY IF EXISTS policy2 ON default.foo")
 
-        with Scenario("I alter row policy if exists, policy does not exist", flags=TE, requirements=[
+        with Scenario("I alter row policy if exists, policy does not exist", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_Alter_IfExists("1.0"),
                 RQ_SRS_006_RBAC_RowPolicy_Alter_On("1.0")]):
             policy = "policy2"
@@ -82,14 +82,14 @@ def feature(self, node="clickhouse1"):
                 node.query(f"ALTER ROW POLICY IF EXISTS {policy} ON default.foo")
             del policy
 
-        with Scenario("I alter row policy to rename, target available", flags=TE, requirements=[
+        with Scenario("I alter row policy to rename, target available", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_Alter_Rename("1.0"),
                 RQ_SRS_006_RBAC_RowPolicy_Alter_On("1.0")]):
             with cleanup("policy3"):
                 with When("I alter row policy with rename"):
                     node.query("ALTER ROW POLICY policy3 ON default.foo RENAME TO policy3")
 
-        with Scenario("I alter row policy to rename, target unavailable", flags=TE, requirements=[
+        with Scenario("I alter row policy to rename, target unavailable", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_Alter_Rename("1.0"),
                 RQ_SRS_006_RBAC_RowPolicy_Alter_On("1.0")]):
             with cleanup("policy3"):
@@ -106,49 +106,49 @@ def feature(self, node="clickhouse1"):
                         node.query(f"DROP ROW POLICY IF EXISTS {new_policy} ON default.foo")
             del new_policy
 
-        with Scenario("I alter row policy to permissive", flags=TE, requirements=[
+        with Scenario("I alter row policy to permissive", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_Alter_Access_Permissive("1.0"),
                 RQ_SRS_006_RBAC_RowPolicy_Alter_On("1.0")]):
             with cleanup("policy4"):
                 with When("I alter row policy as permissive"):
                     node.query("ALTER ROW POLICY policy4 ON default.foo AS PERMISSIVE")
 
-        with Scenario("I alter row policy to restrictive", flags=TE, requirements=[
+        with Scenario("I alter row policy to restrictive", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_Alter_Access_Restrictive("1.0"),
                 RQ_SRS_006_RBAC_RowPolicy_Alter_On("1.0")]):
             with cleanup("policy5"):
                 with When("I alter row policy as restrictive"):
                     node.query("ALTER ROW POLICY policy5 ON default.foo AS RESTRICTIVE")
 
-        with Scenario("I alter row policy for select", flags=TE, requirements=[
+        with Scenario("I alter row policy for select", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_Alter_ForSelect("1.0"),
                 RQ_SRS_006_RBAC_RowPolicy_Alter_On("1.0")]):
             with cleanup("policy6"):
                 with When("I alter row policy using for select"):
                     node.query("ALTER ROW POLICY policy6 ON default.foo FOR SELECT USING x > 10")
 
-        with Scenario("I alter row policy using condition", flags=TE, requirements=[
+        with Scenario("I alter row policy using condition", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_Alter_Condition("1.0"),
                 RQ_SRS_006_RBAC_RowPolicy_Alter_On("1.0")]):
             with cleanup("policy6"):
                 with When("I alter row policy wtih condition"):
                     node.query("ALTER ROW POLICY policy6 ON default.foo USING x > 10")
 
-        with Scenario("I alter row policy using condition none", flags=TE, requirements=[
+        with Scenario("I alter row policy using condition none", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_Alter_Condition_None("1.0"),
                 RQ_SRS_006_RBAC_RowPolicy_Alter_On("1.0")]):
             with cleanup("policy7"):
                 with When("I alter row policy using no condition"):
                     node.query("ALTER ROW POLICY policy7 ON default.foo USING NONE")
 
-        with Scenario("I alter row policy to one role", flags=TE, requirements=[
+        with Scenario("I alter row policy to one role", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_Alter_Assignment("1.0"),
                 RQ_SRS_006_RBAC_RowPolicy_Alter_On("1.0")]):
             with cleanup("policy8"):
                 with When("I alter row policy to a role"):
                     node.query("ALTER ROW POLICY policy8 ON default.foo TO role0")
 
-        with Scenario("I alter row policy to assign to role that does not exist, throws exception", flags=TE, requirements=[
+        with Scenario("I alter row policy to assign to role that does not exist, throws exception", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_Alter_Assignment("1.0")]):
             role = "role2"
             with cleanup("policy8a"):
@@ -159,7 +159,7 @@ def feature(self, node="clickhouse1"):
                     node.query(f"ALTER ROW POLICY policy8a ON default.foo TO {role}", exitcode=exitcode, message=message)
             del role
 
-        with Scenario("I alter row policy to assign to all excpet role that does not exist, throws exception", flags=TE, requirements=[
+        with Scenario("I alter row policy to assign to all excpet role that does not exist, throws exception", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_Alter_Assignment("1.0")]):
             role = "role2"
             with cleanup("policy8a"):
@@ -170,35 +170,35 @@ def feature(self, node="clickhouse1"):
                     node.query(f"ALTER ROW POLICY policy8a ON default.foo TO ALL EXCEPT {role}", exitcode=exitcode, message=message)
             del role
 
-        with Scenario("I alter row policy assigned to multiple roles", flags=TE, requirements=[
+        with Scenario("I alter row policy assigned to multiple roles", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_Alter_Assignment("1.0"),
                 RQ_SRS_006_RBAC_RowPolicy_Alter_On("1.0")]):
             with cleanup("policy9"):
                 with When("I alter row policy to multiple roles"):
                     node.query("ALTER ROW POLICY policy9 ON default.foo TO role0, role1")
 
-        with Scenario("I alter row policy assigned to all", flags=TE, requirements=[
+        with Scenario("I alter row policy assigned to all", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_Alter_Assignment_All("1.0"),
                 RQ_SRS_006_RBAC_RowPolicy_Alter_On("1.0")]):
             with cleanup("policy10"):
                 with When("I alter row policy to all"):
                     node.query("ALTER ROW POLICY policy10 ON default.foo TO ALL")
 
-        with Scenario("I alter row policy assigned to all except one role", flags=TE, requirements=[
+        with Scenario("I alter row policy assigned to all except one role", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_Alter_Assignment_AllExcept("1.0"),
                 RQ_SRS_006_RBAC_RowPolicy_Alter_On("1.0")]):
             with cleanup("policy11"):
                 with When("I alter row policy to all except"):
                     node.query("ALTER ROW POLICY policy11 ON default.foo TO ALL EXCEPT role0")
 
-        with Scenario("I alter row policy assigned to all except multiple roles", flags=TE, requirements=[
+        with Scenario("I alter row policy assigned to all except multiple roles", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_Alter_Assignment_AllExcept("1.0"),
                 RQ_SRS_006_RBAC_RowPolicy_Alter_On("1.0")]):
             with cleanup("policy12"):
                 with When("I alter row policy to all except multiple roles"):
                     node.query("ALTER ROW POLICY policy12 ON default.foo TO ALL EXCEPT role0, role1")
 
-        with Scenario("I alter row policy assigned to none", flags=TE, requirements=[
+        with Scenario("I alter row policy assigned to none", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_Alter_Assignment_None("1.0"),
                 RQ_SRS_006_RBAC_RowPolicy_Alter_On("1.0")]):
             with cleanup("policy12"):
@@ -208,7 +208,7 @@ def feature(self, node="clickhouse1"):
         # Official syntax: ON CLUSTER cluster_name ON database.table
         # Working syntax: both orderings of ON CLUSTER and TABLE clauses work
 
-        with Scenario("I alter row policy on cluster", flags=TE, requirements=[
+        with Scenario("I alter row policy on cluster", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_Alter_OnCluster("1.0"),
                 RQ_SRS_006_RBAC_RowPolicy_Alter_On("1.0")]):
             try:
@@ -220,14 +220,14 @@ def feature(self, node="clickhouse1"):
                 with Finally("I drop the row policy"):
                     node.query("DROP ROW POLICY IF EXISTS policy13 ON CLUSTER sharded_cluster ON default.foo")
 
-        with Scenario("I alter row policy on fake cluster, throws exception", flags=TE, requirements=[
+        with Scenario("I alter row policy on fake cluster, throws exception", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_Alter_OnCluster("1.0"),
                 RQ_SRS_006_RBAC_RowPolicy_Alter_On("1.0")]):
             with When("I run alter row policy command"):
                 exitcode, message = errors.cluster_not_found("fake_cluster")
                 node.query("ALTER ROW POLICY policy13 ON CLUSTER fake_cluster ON default.foo", exitcode=exitcode, message=message)
 
-        with Scenario("I alter row policy on cluster after table", flags=TE, requirements=[
+        with Scenario("I alter row policy on cluster after table", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_Alter_OnCluster("1.0"),
                 RQ_SRS_006_RBAC_RowPolicy_Alter_On("1.0")]):
             try:
diff --git a/tests/testflows/rbac/tests/syntax/alter_settings_profile.py b/tests/testflows/rbac/tests/syntax/alter_settings_profile.py
index 4222b27954d..4533f6aea65 100755
--- a/tests/testflows/rbac/tests/syntax/alter_settings_profile.py
+++ b/tests/testflows/rbac/tests/syntax/alter_settings_profile.py
@@ -31,15 +31,15 @@ def feature(self, node="clickhouse1"):
             node.query(f"CREATE USER user0")
             node.query(f"CREATE ROLE role0")
 
-        with Scenario("I alter settings profile with no options", flags=TE, requirements=[RQ_SRS_006_RBAC_SettingsProfile_Alter("1.0")]):
+        with Scenario("I alter settings profile with no options", requirements=[RQ_SRS_006_RBAC_SettingsProfile_Alter("1.0")]):
             with When("I alter settings profile"):
                 node.query("ALTER SETTINGS PROFILE profile0")
 
-        with Scenario("I alter settings profile short form", flags=TE, requirements=[RQ_SRS_006_RBAC_SettingsProfile_Alter("1.0")]):
+        with Scenario("I alter settings profile short form", requirements=[RQ_SRS_006_RBAC_SettingsProfile_Alter("1.0")]):
             with When("I short form alter settings profile"):
                 node.query("ALTER PROFILE profile0")
 
-        with Scenario("I alter settings profile that does not exist, throws exception", flags=TE, requirements=[RQ_SRS_006_RBAC_SettingsProfile_Alter("1.0")]):
+        with Scenario("I alter settings profile that does not exist, throws exception", requirements=[RQ_SRS_006_RBAC_SettingsProfile_Alter("1.0")]):
             profile = "profile1"
 
             cleanup_profile(profile)
@@ -48,11 +48,11 @@ def feature(self, node="clickhouse1"):
                 node.query(f"ALTER SETTINGS PROFILE {profile}", exitcode=exitcode, message=message)
             del profile
 
-        with Scenario("I alter settings profile if exists", flags=TE, requirements=[RQ_SRS_006_RBAC_SettingsProfile_Alter_IfExists("1.0")]):
+        with Scenario("I alter settings profile if exists", requirements=[RQ_SRS_006_RBAC_SettingsProfile_Alter_IfExists("1.0")]):
             with When("I alter settings profile using if exists"):
                 node.query("ALTER SETTINGS PROFILE IF EXISTS profile0")
 
-        with Scenario("I alter settings profile if exists, profile does not exist", flags=TE, requirements=[RQ_SRS_006_RBAC_SettingsProfile_Alter_IfExists("1.0")]):
+        with Scenario("I alter settings profile if exists, profile does not exist", requirements=[RQ_SRS_006_RBAC_SettingsProfile_Alter_IfExists("1.0")]):
             profile = "profile1"
 
             cleanup_profile(profile)
@@ -61,11 +61,11 @@ def feature(self, node="clickhouse1"):
 
             del profile
 
-        with Scenario("I alter settings profile to rename, target available", flags=TE, requirements=[RQ_SRS_006_RBAC_SettingsProfile_Alter_Rename("1.0")]):
+        with Scenario("I alter settings profile to rename, target available", requirements=[RQ_SRS_006_RBAC_SettingsProfile_Alter_Rename("1.0")]):
             with When("I alter settings profile by renaming it"):
                 node.query("ALTER SETTINGS PROFILE profile0 RENAME TO profile0")
 
-        with Scenario("I alter settings profile to rename, target unavailable", flags=TE, requirements=[RQ_SRS_006_RBAC_SettingsProfile_Alter_Rename("1.0")]):
+        with Scenario("I alter settings profile to rename, target unavailable", requirements=[RQ_SRS_006_RBAC_SettingsProfile_Alter_Rename("1.0")]):
             new_profile = "profile1"
 
             try:
@@ -81,52 +81,52 @@ def feature(self, node="clickhouse1"):
 
             del new_profile
 
-        with Scenario("I alter settings profile with a setting value", flags=TE, requirements=[
+        with Scenario("I alter settings profile with a setting value", requirements=[
                 RQ_SRS_006_RBAC_SettingsProfile_Alter_Variables("1.0"),
                 RQ_SRS_006_RBAC_SettingsProfile_Alter_Variables_Value("1.0")]):
             with When("I alter settings profile using settings"):
                 node.query("ALTER SETTINGS PROFILE profile0 SETTINGS max_memory_usage = 100000001")
 
-        with Scenario("I alter settings profile with a setting value, does not exist, throws exception", flags=TE, requirements=[
+        with Scenario("I alter settings profile with a setting value, does not exist, throws exception", requirements=[
                 RQ_SRS_006_RBAC_SettingsProfile_Alter_Variables("1.0"),
                 RQ_SRS_006_RBAC_SettingsProfile_Alter_Variables_Value("1.0")]):
             with When("I alter settings profile using settings and nonexistent value"):
                 exitcode, message = errors.unknown_setting("fake_setting")
                 node.query("ALTER SETTINGS PROFILE profile0 SETTINGS fake_setting = 100000001", exitcode=exitcode, message=message)
 
-        with Scenario("I alter settings profile with a min setting value", flags=TE, requirements=[
+        with Scenario("I alter settings profile with a min setting value", requirements=[
                 RQ_SRS_006_RBAC_SettingsProfile_Alter_Variables_Constraints("1.0")]):
             with When("I alter settings profile using 2 minimum formats"):
                 node.query("ALTER SETTINGS PROFILE profile0 SETTINGS max_memory_usage MIN 100000001")
                 node.query("ALTER SETTINGS PROFILE profile0 SETTINGS max_memory_usage MIN = 100000001")
 
-        with Scenario("I alter settings profile with a max setting value", flags=TE, requirements=[
+        with Scenario("I alter settings profile with a max setting value", requirements=[
                 RQ_SRS_006_RBAC_SettingsProfile_Alter_Variables_Constraints("1.0")]):
             with When("I alter settings profile using 2 maximum formats"):
                 node.query("ALTER SETTINGS PROFILE profile0 SETTINGS max_memory_usage MAX 100000001")
                 node.query("ALTER SETTINGS PROFILE profile0 SETTINGS max_memory_usage MAX = 100000001")
 
-        with Scenario("I alter settings profile with min and max setting values", flags=TE, requirements=[
+        with Scenario("I alter settings profile with min and max setting values", requirements=[
                 RQ_SRS_006_RBAC_SettingsProfile_Alter_Variables_Constraints("1.0")]):
             with When("I alter settings profile with both min and max"):
                 node.query("ALTER SETTINGS PROFILE profile0 SETTINGS max_memory_usage MIN 100000001 MAX 200000001")
 
-        with Scenario("I alter settings profile with a readonly setting", flags=TE, requirements=[
+        with Scenario("I alter settings profile with a readonly setting", requirements=[
                 RQ_SRS_006_RBAC_SettingsProfile_Alter_Variables_Constraints("1.0")]):
             with When("I alter settings profile with with readonly"):
                 node.query("ALTER SETTINGS PROFILE profile0 SETTINGS max_memory_usage READONLY")
 
-        with Scenario("I alter settings profile with a writable setting", flags=TE, requirements=[
+        with Scenario("I alter settings profile with a writable setting", requirements=[
                 RQ_SRS_006_RBAC_SettingsProfile_Alter_Variables_Constraints("1.0")]):
             with When("I alter settings profile with writable"):
                 node.query("ALTER SETTINGS PROFILE profile0 SETTINGS max_memory_usage WRITABLE")
 
-        with Scenario("I alter settings profile with inherited settings", flags=TE, requirements=[
+        with Scenario("I alter settings profile with inherited settings", requirements=[
                 RQ_SRS_006_RBAC_SettingsProfile_Alter_Assignment_Inherit("1.0")]):
             with When("I alter settings profile with inherit"):
                 node.query("ALTER SETTINGS PROFILE profile0 SETTINGS INHERIT 'default'")
 
-        with Scenario("I alter settings profile with inherit, parent profile does not exist, throws exception", flags=TE, requirements=[
+        with Scenario("I alter settings profile with inherit, parent profile does not exist, throws exception", requirements=[
                 RQ_SRS_006_RBAC_SettingsProfile_Alter_Assignment_Inherit("1.0")]):
             profile = "profile3"
             with Given(f"I ensure that profile {profile} does not exist"):
@@ -136,7 +136,7 @@ def feature(self, node="clickhouse1"):
                 node.query(f"ALTER PROFILE profile0 SETTINGS INHERIT {profile}", exitcode=exitcode, message=message)
             del profile
 
-        with Scenario("I alter settings profile with multiple settings", flags=TE, requirements=[
+        with Scenario("I alter settings profile with multiple settings", requirements=[
                 RQ_SRS_006_RBAC_SettingsProfile_Alter_Variables("1.0"),
                 RQ_SRS_006_RBAC_SettingsProfile_Alter_Variables_Value("1.0")]):
             with When("I alter settings profile with multiple settings"):
@@ -144,7 +144,7 @@ def feature(self, node="clickhouse1"):
                 " SETTINGS max_memory_usage = 100000001"
                 " SETTINGS max_memory_usage_for_user = 100000001")
 
-        with Scenario("I alter settings profile with multiple settings short form", flags=TE, requirements=[
+        with Scenario("I alter settings profile with multiple settings short form", requirements=[
                 RQ_SRS_006_RBAC_SettingsProfile_Alter_Variables("1.0"),
                 RQ_SRS_006_RBAC_SettingsProfile_Alter_Variables_Value("1.0")]):
             with When("I alter settings profile with short form multiple settings"):
@@ -152,12 +152,12 @@ def feature(self, node="clickhouse1"):
                 " SETTINGS max_memory_usage = 100000001,"
                 " max_memory_usage_for_user = 100000001")
 
-        with Scenario("I alter settings profile assigned to one role", flags=TE, requirements=[
+        with Scenario("I alter settings profile assigned to one role", requirements=[
                 RQ_SRS_006_RBAC_SettingsProfile_Alter_Assignment("1.0")]):
             with When("I alter settings profile with assignment to role"):
                 node.query("ALTER SETTINGS PROFILE profile0 TO role0")
 
-        with Scenario("I alter settings profile to assign to role that does not exist, throws exception", flags=TE, requirements=[
+        with Scenario("I alter settings profile to assign to role that does not exist, throws exception", requirements=[
                 RQ_SRS_006_RBAC_SettingsProfile_Alter_Assignment("1.0")]):
             role = "role1"
             with Given(f"I drop {role} if it exists"):
@@ -167,7 +167,7 @@ def feature(self, node="clickhouse1"):
                 node.query(f"ALTER SETTINGS PROFILE profile0 TO {role}", exitcode=exitcode, message=message)
             del role
 
-        with Scenario("I alter settings profile to assign to all except role that does not exist, throws exception", flags=TE, requirements=[
+        with Scenario("I alter settings profile to assign to all except role that does not exist, throws exception", requirements=[
                 RQ_SRS_006_RBAC_SettingsProfile_Alter_Assignment("1.0")]):
             role = "role1"
             with Given(f"I drop {role} if it exists"):
@@ -177,32 +177,32 @@ def feature(self, node="clickhouse1"):
                 node.query(f"ALTER SETTINGS PROFILE profile0 TO ALL EXCEPT {role}", exitcode=exitcode, message=message)
             del role
 
-        with Scenario("I alter settings profile assigned to multiple roles", flags=TE, requirements=[
+        with Scenario("I alter settings profile assigned to multiple roles", requirements=[
                 RQ_SRS_006_RBAC_SettingsProfile_Alter_Assignment("1.0")]):
             with When("I alter settings profile with assignment to multiple roles"):
                 node.query("ALTER SETTINGS PROFILE profile0 TO role0, user0")
 
-        with Scenario("I alter settings profile assigned to all", flags=TE, requirements=[
+        with Scenario("I alter settings profile assigned to all", requirements=[
                 RQ_SRS_006_RBAC_SettingsProfile_Alter_Assignment_All("1.0")]):
             with When("I alter settings profile with assignment to all"):
                 node.query("ALTER SETTINGS PROFILE profile0 TO ALL")
 
-        with Scenario("I alter settings profile assigned to all except one role", flags=TE, requirements=[
+        with Scenario("I alter settings profile assigned to all except one role", requirements=[
                 RQ_SRS_006_RBAC_SettingsProfile_Alter_Assignment_AllExcept("1.0")]):
             with When("I alter settings profile with assignment to all except a role"):
                 node.query("ALTER SETTINGS PROFILE profile0 TO ALL EXCEPT role0")
 
-        with Scenario("I alter settings profile assigned to all except multiple roles", flags=TE, requirements=[
+        with Scenario("I alter settings profile assigned to all except multiple roles", requirements=[
                 RQ_SRS_006_RBAC_SettingsProfile_Alter_Assignment_AllExcept("1.0")]):
             with When("I alter settings profile with assignmentto all except multiple roles"):
                 node.query("ALTER SETTINGS PROFILE profile0 TO ALL EXCEPT role0, user0")
 
-        with Scenario("I alter settings profile assigned to none", flags=TE, requirements=[
+        with Scenario("I alter settings profile assigned to none", requirements=[
                 RQ_SRS_006_RBAC_SettingsProfile_Alter_Assignment_None("1.0")]):
             with When("I alter settings profile with assignment to none"):
                 node.query("ALTER SETTINGS PROFILE profile0 TO NONE")
 
-        with Scenario("I alter settings profile on cluster", flags=TE, requirements=[
+        with Scenario("I alter settings profile on cluster", requirements=[
                 RQ_SRS_006_RBAC_SettingsProfile_Alter_Assignment_OnCluster("1.0")]):
             try:
                 with Given("I have a settings profile on cluster"):
@@ -219,7 +219,7 @@ def feature(self, node="clickhouse1"):
                 with Finally("I drop the settings profile"):
                     node.query("DROP SETTINGS PROFILE IF EXISTS profile1 ON CLUSTER sharded_cluster")
 
-        with Scenario("I alter settings profile on fake cluster, throws exception", flags=TE, requirements=[
+        with Scenario("I alter settings profile on fake cluster, throws exception", requirements=[
                 RQ_SRS_006_RBAC_SettingsProfile_Alter_Assignment_OnCluster("1.0")]):
             with When("I run alter settings profile command"):
                 exitcode, message = errors.cluster_not_found("fake_cluster")
diff --git a/tests/testflows/rbac/tests/syntax/alter_user.py b/tests/testflows/rbac/tests/syntax/alter_user.py
index 8a7ce8724eb..cf8a13008c9 100755
--- a/tests/testflows/rbac/tests/syntax/alter_user.py
+++ b/tests/testflows/rbac/tests/syntax/alter_user.py
@@ -30,28 +30,28 @@ def feature(self, node="clickhouse1"):
                 node.query(f"CREATE USER OR REPLACE {user}")
             yield
         finally:
-            with Finally("I drop the user", flags=TE):
+            with Finally("I drop the user"):
                 node.query(f"DROP USER IF EXISTS {user}")
 
-    with Scenario("I alter user, base command", flags=TE, requirements=[
+    with Scenario("I alter user, base command", requirements=[
             RQ_SRS_006_RBAC_User_Alter("1.0")]):
         with setup("user0"):
             with When("I alter user"):
                 node.query("ALTER USER user0")
 
-    with Scenario("I alter user that does not exist without if exists, throws exception", flags=TE, requirements=[
+    with Scenario("I alter user that does not exist without if exists, throws exception", requirements=[
             RQ_SRS_006_RBAC_User_Alter("1.0")]):
         with When("I run alter user command, expecting error 192"):
             exitcode, message = errors.user_not_found_in_disk(name="user0")
             node.query(f"ALTER USER user0",exitcode=exitcode, message=message)
 
-    with Scenario("I alter user with if exists", flags=TE, requirements=[
+    with Scenario("I alter user with if exists", requirements=[
             RQ_SRS_006_RBAC_User_Alter_IfExists("1.0")]):
         with setup("user0"):
             with When(f"I alter user with if exists"):
                 node.query(f"ALTER USER IF EXISTS user0")
 
-    with Scenario("I alter user that does not exist with if exists", flags=TE, requirements=[
+    with Scenario("I alter user that does not exist with if exists", requirements=[
             RQ_SRS_006_RBAC_User_Alter_IfExists("1.0")]):
         user = "user0"
         with Given("I don't have a user"):
@@ -60,7 +60,7 @@ def feature(self, node="clickhouse1"):
             node.query(f"ALTER USER IF EXISTS {user}")
         del user
 
-    with Scenario("I alter user on a cluster", flags=TE, requirements=[
+    with Scenario("I alter user on a cluster", requirements=[
             RQ_SRS_006_RBAC_User_Alter_Cluster("1.0")]):
         with Given("I have a user on a cluster"):
             node.query("CREATE USER OR REPLACE user0 ON CLUSTER sharded_cluster")
@@ -69,19 +69,19 @@ def feature(self, node="clickhouse1"):
         with Finally("I drop user from cluster"):
             node.query("DROP USER IF EXISTS user0 ON CLUSTER sharded_cluster")
 
-    with Scenario("I alter user on a fake cluster, throws exception", flags=TE, requirements=[
+    with Scenario("I alter user on a fake cluster, throws exception", requirements=[
             RQ_SRS_006_RBAC_User_Alter_Cluster("1.0")]):
         with When("I alter user on a fake cluster"):
             exitcode, message = errors.cluster_not_found("fake_cluster")
             node.query("ALTER USER user0 ON CLUSTER fake_cluster", exitcode=exitcode, message=message)
 
-    with Scenario("I alter user to rename, target available", flags=TE, requirements=[
+    with Scenario("I alter user to rename, target available", requirements=[
             RQ_SRS_006_RBAC_User_Alter_Rename("1.0")]):
         with setup("user15"):
             with When("I alter user name"):
                 node.query("ALTER USER user15 RENAME TO user15")
 
-    with Scenario("I alter user to rename, target unavailable", flags=TE, requirements=[
+    with Scenario("I alter user to rename, target unavailable", requirements=[
             RQ_SRS_006_RBAC_User_Alter_Rename("1.0")]):
         with setup("user15"):
             new_user = "user16"
@@ -96,20 +96,20 @@ def feature(self, node="clickhouse1"):
                     node.query(f"DROP USER IF EXISTS {new_user}")
             del new_user
 
-    with Scenario("I alter user password plaintext password", flags=TE, requirements=[
+    with Scenario("I alter user password plaintext password", requirements=[
             RQ_SRS_006_RBAC_User_Alter_Password_PlainText("1.0")]):
         with setup("user1"):
             with When("I alter user with plaintext password"):
                 node.query("ALTER USER user1 IDENTIFIED WITH PLAINTEXT_PASSWORD BY 'mypassword'", step=When)
 
-    with Scenario("I alter user password to sha256", flags=TE, requirements=[
+    with Scenario("I alter user password to sha256", requirements=[
             RQ_SRS_006_RBAC_User_Alter_Password_Sha256Password("1.0")]):
         with setup("user2"):
             with When("I alter user with sha256_password"):
                 password = hashlib.sha256("mypassword".encode("utf-8")).hexdigest()
                 node.query(f"ALTER USER user2 IDENTIFIED WITH SHA256_PASSWORD BY '{password}'",step=When)
 
-    with Scenario("I alter user password to double_sha1_password", flags=TE, requirements=[
+    with Scenario("I alter user password to double_sha1_password", requirements=[
             RQ_SRS_006_RBAC_User_Alter_Password_DoubleSha1Password("1.0")]):
         with setup("user3"):
             with When("I alter user with double_sha1_password"):
@@ -118,56 +118,56 @@ def feature(self, node="clickhouse1"):
                 password = hash(hash("mypassword"))
                 node.query(f"ALTER USER user3 IDENTIFIED WITH DOUBLE_SHA1_PASSWORD BY '{password}'", step=When)
 
-    with Scenario("I alter user host local", flags=TE, requirements=[
+    with Scenario("I alter user host local", requirements=[
             RQ_SRS_006_RBAC_User_Alter_Host_Local("1.0")]):
         with setup("user4"):
             with When("I alter user with host local"):
                 node.query("ALTER USER user4 HOST LOCAL")
 
-    with Scenario("I alter user host name", flags=TE, requirements=[
+    with Scenario("I alter user host name", requirements=[
             RQ_SRS_006_RBAC_User_Alter_Host_Name("1.0")]):
         with setup("user5"):
             with When("I alter user with host name"):
                 node.query("ALTER USER user5 HOST NAME 'localhost', NAME 'clickhouse.com'")
 
-    with Scenario("I alter user host regexp", flags=TE, requirements=[
+    with Scenario("I alter user host regexp", requirements=[
             RQ_SRS_006_RBAC_User_Alter_Host_Regexp("1.0")]):
         with setup("user6"):
             with When("I alter user with host regexp"):
                 node.query("ALTER USER user6 HOST REGEXP 'lo..*host', 'lo*host'")
 
-    with Scenario("I alter user host ip", flags=TE, requirements=[
+    with Scenario("I alter user host ip", requirements=[
             RQ_SRS_006_RBAC_User_Alter_Host_IP("1.0")]):
         with setup("user7"):
             with When("I alter user with host ip"):
                 node.query("ALTER USER user7 HOST IP '127.0.0.1', IP '127.0.0.2'")
 
-    with Scenario("I alter user host like", flags=TE, requirements=[
+    with Scenario("I alter user host like", requirements=[
             RQ_SRS_006_RBAC_User_Alter_Host_Like("1.0")]):
         with setup("user8"):
             with When("I alter user with host like"):
                 node.query("ALTER USER user8 HOST LIKE '%.clickhouse.com'")
 
-    with Scenario("I alter user host any", flags=TE, requirements=[
+    with Scenario("I alter user host any", requirements=[
             RQ_SRS_006_RBAC_User_Alter_Host_Any("1.0")]):
         with setup("user9"):
             with When("I alter user with host any"):
                 node.query("ALTER USER user9 HOST ANY")
 
-    with Scenario("I alter user host many hosts", flags=TE, requirements=[
+    with Scenario("I alter user host many hosts", requirements=[
             RQ_SRS_006_RBAC_User_Alter_Host_Like("1.0")]):
         with setup("user11"):
             with When("I alter user with multiple hosts"):
                 node.query("ALTER USER user11 HOST LIKE '%.clickhouse.com', \
                     IP '127.0.0.2', NAME 'localhost', REGEXP 'lo*host'")
 
-    with Scenario("I alter user default role set to none", flags=TE, requirements=[
+    with Scenario("I alter user default role set to none", requirements=[
             RQ_SRS_006_RBAC_User_Alter_Host_None("1.0")]):
         with setup("user12"):
             with When("I alter user with default role none"):
                 node.query("ALTER USER user12 DEFAULT ROLE NONE")
 
-    with Scenario("I alter user default role set to all", flags=TE, requirements=[
+    with Scenario("I alter user default role set to all", requirements=[
             RQ_SRS_006_RBAC_User_Alter_DefaultRole_All("1.0")]):
         with setup("user13"):
             with When("I alter user with all roles set to default"):
@@ -183,7 +183,7 @@ def feature(self, node="clickhouse1"):
             with Finally(f"I drop the role {role}", flags=TE):
                 node.query(f"DROP ROLE IF EXISTS {role}")
 
-    with Scenario("I alter user default role", flags=TE, requirements=[
+    with Scenario("I alter user default role", requirements=[
             RQ_SRS_006_RBAC_User_Alter_DefaultRole("1.0")]):
         with setup("user14"), setup_role("role2"):
             with Given("I have a user with a role"):
@@ -191,7 +191,7 @@ def feature(self, node="clickhouse1"):
             with When("I alter user default role"):
                 node.query("ALTER USER user14 DEFAULT ROLE role2")
 
-    with Scenario("I alter user default role, setting default role", flags=TE, requirements=[
+    with Scenario("I alter user default role, setting default role", requirements=[
             RQ_SRS_006_RBAC_User_Alter_DefaultRole("1.0")]):
         with setup("user14a"), setup_role("default"):
             with Given("I grant default role to the user"):
@@ -199,7 +199,7 @@ def feature(self, node="clickhouse1"):
             with When("I alter user default role"):
                 node.query("ALTER USER user14a DEFAULT ROLE default")
 
-    with Scenario("I alter user default role, role doesn't exist, throws exception", flags=TE, requirements=[
+    with Scenario("I alter user default role, role doesn't exist, throws exception", requirements=[
             RQ_SRS_006_RBAC_User_Alter_DefaultRole("1.0")]):
         with setup("user12"):
             role = "role0"
@@ -210,7 +210,7 @@ def feature(self, node="clickhouse1"):
                 node.query(f"ALTER USER user12 DEFAULT ROLE {role}",exitcode=exitcode, message=message)
             del role
 
-    with Scenario("I alter user default role, all except role doesn't exist, throws exception", flags=TE, requirements=[
+    with Scenario("I alter user default role, all except role doesn't exist, throws exception", requirements=[
             RQ_SRS_006_RBAC_User_Alter_DefaultRole("1.0")]):
         with setup("user12"):
             role = "role0"
@@ -221,7 +221,7 @@ def feature(self, node="clickhouse1"):
                 node.query(f"ALTER USER user12 DEFAULT ROLE ALL EXCEPT {role}",exitcode=exitcode, message=message)
             del role
 
-    with Scenario("I alter user default role multiple", flags=TE, requirements=[
+    with Scenario("I alter user default role multiple", requirements=[
             RQ_SRS_006_RBAC_User_Alter_DefaultRole("1.0")]):
         with setup("user15"), setup_role("second"), setup_role("third"):
             with Given("I have a user with multiple roles"):
@@ -229,7 +229,7 @@ def feature(self, node="clickhouse1"):
             with When("I alter user default role to second, third"):
                 node.query("ALTER USER user15 DEFAULT ROLE second, third")
 
-    with Scenario("I alter user default role set to all except", flags=TE, requirements=[
+    with Scenario("I alter user default role set to all except", requirements=[
             RQ_SRS_006_RBAC_User_Alter_DefaultRole_AllExcept("1.0")]):
         with setup("user16"), setup_role("second"):
             with Given("I have a user with a role"):
@@ -237,7 +237,7 @@ def feature(self, node="clickhouse1"):
             with When("I alter user default role"):
                 node.query("ALTER USER user16 DEFAULT ROLE ALL EXCEPT second")
 
-    with Scenario("I alter user default role multiple all except", flags=TE, requirements=[
+    with Scenario("I alter user default role multiple all except", requirements=[
             RQ_SRS_006_RBAC_User_Alter_DefaultRole_AllExcept("1.0")]):
         with setup("user17"), setup_role("second"), setup_role("third"):
             with Given("I have a user with multiple roles"):
@@ -245,7 +245,7 @@ def feature(self, node="clickhouse1"):
             with When("I alter user default role to all except second"):
                 node.query("ALTER USER user17 DEFAULT ROLE ALL EXCEPT second")
 
-    with Scenario("I alter user settings profile", flags=TE, requirements=[
+    with Scenario("I alter user settings profile", requirements=[
             RQ_SRS_006_RBAC_User_Alter_Settings("1.0"),  \
             RQ_SRS_006_RBAC_User_Alter_Settings_Profile("1.0")]):
         with setup("user18"):
@@ -258,7 +258,7 @@ def feature(self, node="clickhouse1"):
                 with Finally("I drop the profile"):
                     node.query(f"DROP SETTINGS PROFILE profile10")
 
-    with Scenario("I alter user settings profile, fake profile, throws exception", flags=TE, requirements=[
+    with Scenario("I alter user settings profile, fake profile, throws exception", requirements=[
             RQ_SRS_006_RBAC_User_Alter_Settings("1.0"),
             RQ_SRS_006_RBAC_User_Alter_Settings_Profile("1.0")]):
         with setup("user18a"):
@@ -270,14 +270,14 @@ def feature(self, node="clickhouse1"):
                 node.query("ALTER USER user18a SETTINGS PROFILE profile0", exitcode=exitcode, message=message)
             del profile
 
-    with Scenario("I alter user settings with a fake setting, throws exception", flags=TE, requirements=[
+    with Scenario("I alter user settings with a fake setting, throws exception", requirements=[
                 RQ_SRS_006_RBAC_User_Alter_Settings("1.0")]):
             with setup("user18b"):
                 with When("I alter settings profile using settings and nonexistent value"):
                     exitcode, message = errors.unknown_setting("fake_setting")
                     node.query("ALTER USER user18b SETTINGS fake_setting = 100000001", exitcode=exitcode, message=message)
 
-    with Scenario("I alter user settings without profile (no equals)", flags=TE, requirements=[
+    with Scenario("I alter user settings without profile (no equals)", requirements=[
             RQ_SRS_006_RBAC_User_Alter_Settings("1.0"),
             RQ_SRS_006_RBAC_User_Alter_Settings_Min("1.0"),
             RQ_SRS_006_RBAC_User_Alter_Settings_Max("1.0")]):
@@ -286,7 +286,7 @@ def feature(self, node="clickhouse1"):
                 node.query("ALTER USER user19 SETTINGS max_memory_usage=10000000 MIN 100000 MAX 1000000000 READONLY")
 
     #equals sign (=) syntax verify
-    with Scenario("I alter user settings without profile (yes equals)", flags=TE, requirements=[
+    with Scenario("I alter user settings without profile (yes equals)", requirements=[
             RQ_SRS_006_RBAC_User_Alter_Settings("1.0"),
             RQ_SRS_006_RBAC_User_Alter_Settings_Min("1.0"),
             RQ_SRS_006_RBAC_User_Alter_Settings_Max("1.0")]):
@@ -295,7 +295,7 @@ def feature(self, node="clickhouse1"):
                 node.query("ALTER USER user20 SETTINGS max_memory_usage=10000000 MIN=100000 MAX=1000000000 READONLY")
 
     #Add requirement to host: add/drop
-    with Scenario("I alter user to add host", flags=TE, requirements=[
+    with Scenario("I alter user to add host", requirements=[
             RQ_SRS_006_RBAC_User_Alter_Host_AddDrop("1.0")]):
         with setup("user21"):
             with When("I alter user by adding local host"):
@@ -309,7 +309,7 @@ def feature(self, node="clickhouse1"):
             with And("I alter user by adding host name"):
                 node.query("ALTER USER user21 ADD HOST NAME 'localhost'")
 
-    with Scenario("I alter user to remove host", flags=TE, requirements=[
+    with Scenario("I alter user to remove host", requirements=[
             RQ_SRS_006_RBAC_User_Alter_Host_AddDrop("1.0")]):
         with setup("user22"):
             with When("I alter user by removing local host"):
diff --git a/tests/testflows/rbac/tests/syntax/create_quota.py b/tests/testflows/rbac/tests/syntax/create_quota.py
index 4945583a542..33dbbf9c153 100755
--- a/tests/testflows/rbac/tests/syntax/create_quota.py
+++ b/tests/testflows/rbac/tests/syntax/create_quota.py
@@ -41,13 +41,13 @@ def feature(self, node="clickhouse1"):
             node.query(f"CREATE USER user0")
             node.query(f"CREATE ROLE role0")
 
-        with Scenario("I create quota with no options", flags=TE, requirements=[
+        with Scenario("I create quota with no options", requirements=[
                 RQ_SRS_006_RBAC_Quota_Create("1.0")]):
             with cleanup("quota0"):
                 with When("I create a quota with no options"):
                     node.query("CREATE QUOTA quota0")
 
-        with Scenario("I create quota that already exists, throws exception", flags=TE, requirements=[
+        with Scenario("I create quota that already exists, throws exception", requirements=[
                 RQ_SRS_006_RBAC_Quota_Create("1.0")]):
             quota = "quota0"
             with cleanup(quota):
@@ -57,7 +57,7 @@ def feature(self, node="clickhouse1"):
                     node.query(f"CREATE QUOTA {quota}", exitcode=exitcode, message=message)
             del quota
 
-        with Scenario("I create quota if not exists, quota does not exist", flags=TE, requirements=[
+        with Scenario("I create quota if not exists, quota does not exist", requirements=[
                 RQ_SRS_006_RBAC_Quota_Create_IfNotExists("1.0")]):
             quota = "quota1"
             with cleanup(quota):
@@ -65,7 +65,7 @@ def feature(self, node="clickhouse1"):
                     node.query(f"CREATE QUOTA IF NOT EXISTS {quota}")
             del quota
 
-        with Scenario("I create quota if not exists, quota does exist", flags=TE, requirements=[
+        with Scenario("I create quota if not exists, quota does exist", requirements=[
                 RQ_SRS_006_RBAC_Quota_Create_IfNotExists("1.0")]):
             quota = "quota1"
             with cleanup(quota):
@@ -74,7 +74,7 @@ def feature(self, node="clickhouse1"):
                     node.query(f"CREATE QUOTA IF NOT EXISTS {quota}")
             del quota
 
-        with Scenario("I create quota or replace, quota does not exist", flags=TE, requirements=[
+        with Scenario("I create quota or replace, quota does not exist", requirements=[
                 RQ_SRS_006_RBAC_Quota_Create_Replace("1.0")]):
             quota = "quota2"
             with cleanup(quota):
@@ -82,7 +82,7 @@ def feature(self, node="clickhouse1"):
                     node.query(f"CREATE QUOTA OR REPLACE {quota}")
             del quota
 
-        with Scenario("I create quota or replace, quota does exist", flags=TE, requirements=[
+        with Scenario("I create quota or replace, quota does exist", requirements=[
                 RQ_SRS_006_RBAC_Quota_Create_Replace("1.0")]):
             quota = "quota2"
             with cleanup(quota):
@@ -93,7 +93,7 @@ def feature(self, node="clickhouse1"):
 
         keys = ['none', 'user name', 'ip address', 'client key', 'client key or user name', 'client key or ip address']
         for i, key in enumerate(keys):
-            with Scenario(f"I create quota keyed by {key}", flags=TE, requirements=[
+            with Scenario(f"I create quota keyed by {key}", requirements=[
                     RQ_SRS_006_RBAC_Quota_Create_KeyedBy("1.0"),
                     RQ_SRS_006_RBAC_Quota_Create_KeyedByOptions("1.0")]):
                 name = f'quota{3 + i}'
@@ -101,7 +101,7 @@ def feature(self, node="clickhouse1"):
                     with When(f"I create a quota with {key}"):
                         node.query(f"CREATE QUOTA {name} KEYED BY '{key}'")
 
-        with Scenario("I create quota for randomized interval", flags=TE, requirements=[
+        with Scenario("I create quota for randomized interval", requirements=[
                 RQ_SRS_006_RBAC_Quota_Create_Interval_Randomized("1.0")]):
             with cleanup("quota9"):
                 with When("I create a quota for randomized interval"):
@@ -109,7 +109,7 @@ def feature(self, node="clickhouse1"):
 
         intervals = ['SECOND', 'MINUTE', 'HOUR', 'DAY', 'MONTH']
         for i, interval in enumerate(intervals):
-            with Scenario(f"I create quota for interval {interval}", flags=TE, requirements=[
+            with Scenario(f"I create quota for interval {interval}", requirements=[
                     RQ_SRS_006_RBAC_Quota_Create_Interval("1.0")]):
                 name = f'quota{10 + i}'
                 with cleanup(name):
@@ -120,7 +120,7 @@ def feature(self, node="clickhouse1"):
             'MAX RESULT BYTES', 'MAX READ ROWS', 'MAX READ BYTES', 'MAX EXECUTION TIME',
             'NO LIMITS', 'TRACKING ONLY']
         for i, constraint in enumerate(constraints):
-            with Scenario(f"I create quota for {constraint.lower()}", flags=TE, requirements=[
+            with Scenario(f"I create quota for {constraint.lower()}", requirements=[
                     RQ_SRS_006_RBAC_Quota_Create_Queries("1.0"),
                     RQ_SRS_006_RBAC_Quota_Create_Errors("1.0"),
                     RQ_SRS_006_RBAC_Quota_Create_ResultRows("1.0"),
@@ -135,7 +135,7 @@ def feature(self, node="clickhouse1"):
                     with When(f"I create quota for {constraint.lower()}"):
                         node.query(f"CREATE QUOTA {name} FOR INTERVAL 1 DAY {constraint}{' 1024' if constraint.startswith('MAX') else ''}")
 
-        with Scenario("I create quota for multiple constraints", flags=TE, requirements=[
+        with Scenario("I create quota for multiple constraints", requirements=[
                 RQ_SRS_006_RBAC_Quota_Create_Interval("1.0"),
                 RQ_SRS_006_RBAC_Quota_Create_Queries("1.0")]):
             with cleanup("quota23"):
@@ -145,13 +145,13 @@ def feature(self, node="clickhouse1"):
                         FOR INTERVAL 2 DAY MAX QUERIES 124, \
                         FOR INTERVAL 1 HOUR TRACKING ONLY')
 
-        with Scenario("I create quota assigned to one role", flags=TE, requirements=[
+        with Scenario("I create quota assigned to one role", requirements=[
                 RQ_SRS_006_RBAC_Quota_Create_Assignment("1.0")]):
             with cleanup("quota24"):
                 with When("I create quota for role"):
                     node.query("CREATE QUOTA quota24 TO role0")
 
-        with Scenario("I create quota to assign to role that does not exist, throws exception", flags=TE, requirements=[
+        with Scenario("I create quota to assign to role that does not exist, throws exception", requirements=[
                 RQ_SRS_006_RBAC_Quota_Create_Assignment("1.0")]):
             role = "role1"
             with Given(f"I drop {role} if it exists"):
@@ -161,7 +161,7 @@ def feature(self, node="clickhouse1"):
                 node.query(f"CREATE QUOTA quota0 TO {role}", exitcode=exitcode, message=message)
             del role
 
-        with Scenario("I create quota to assign to all except role that does not exist, throws exception", flags=TE, requirements=[
+        with Scenario("I create quota to assign to all except role that does not exist, throws exception", requirements=[
                 RQ_SRS_006_RBAC_Quota_Create_Assignment("1.0")]):
             role = "role1"
             with Given(f"I drop {role} if it exists"):
@@ -171,36 +171,36 @@ def feature(self, node="clickhouse1"):
                 node.query(f"CREATE QUOTA quota0 TO ALL EXCEPT {role}", exitcode=exitcode, message=message)
             del role
 
-        with Scenario("I create quota assigned to no role", flags=TE, requirements=[
+        with Scenario("I create quota assigned to no role", requirements=[
                 RQ_SRS_006_RBAC_Quota_Create_Assignment_None("1.0")]):
             with When("I create quota for no role"):
                 node.query("CREATE QUOTA quota24 TO NONE")
 
-        with Scenario("I create quota assigned to multiple roles", flags=TE, requirements=[
+        with Scenario("I create quota assigned to multiple roles", requirements=[
                 RQ_SRS_006_RBAC_Quota_Create_Assignment("1.0")]):
             with cleanup("quota25"):
                 with When("I create quota for multiple roles"):
                     node.query("CREATE QUOTA quota25 TO role0, user0")
 
-        with Scenario("I create quota assigned to all", flags=TE,requirements=[
+        with Scenario("I create quota assigned to all", requirements=[
                 RQ_SRS_006_RBAC_Quota_Create_Assignment_All("1.0")]):
             with cleanup("quota26"):
                 with When("I create quota for all"):
                     node.query("CREATE QUOTA quota26 TO ALL")
 
-        with Scenario("I create quota assigned to all except one role", flags=TE, requirements=[
+        with Scenario("I create quota assigned to all except one role", requirements=[
                 RQ_SRS_006_RBAC_Quota_Create_Assignment_Except("1.0")]):
             with cleanup("quota27"):
                 with When("I create quota for all except one role"):
                     node.query("CREATE QUOTA quota27 TO ALL EXCEPT role0")
 
-        with Scenario("I create quota assigned to all except multiple roles", flags=TE, requirements=[
+        with Scenario("I create quota assigned to all except multiple roles", requirements=[
                 RQ_SRS_006_RBAC_Quota_Create_Assignment_Except("1.0")]):
             with cleanup("quota28"):
                 with When("I create quota for all except multiple roles"):
                     node.query("CREATE QUOTA quota28 TO ALL EXCEPT role0, user0")
 
-        with Scenario("I create quota on cluster", flags=TE, requirements=[
+        with Scenario("I create quota on cluster", requirements=[
                 RQ_SRS_006_RBAC_Quota_Create_Cluster("1.0")]):
             try:
                 with When("I run create quota command on cluster"):
@@ -215,7 +215,7 @@ def feature(self, node="clickhouse1"):
                 with Finally("I drop the quota from cluster"):
                     node.query("DROP QUOTA IF EXISTS quota29 ON CLUSTER sharded_cluster")
 
-        with Scenario("I create quota on nonexistent cluster, throws exception", flags=TE, requirements=[
+        with Scenario("I create quota on nonexistent cluster, throws exception", requirements=[
                 RQ_SRS_006_RBAC_Quota_Create_Cluster("1.0")]):
             with When("I run create quota on a cluster"):
                 exitcode, message = errors.cluster_not_found("fake_cluster")
diff --git a/tests/testflows/rbac/tests/syntax/create_role.py b/tests/testflows/rbac/tests/syntax/create_role.py
index 86db48691bd..1cb10077570 100755
--- a/tests/testflows/rbac/tests/syntax/create_role.py
+++ b/tests/testflows/rbac/tests/syntax/create_role.py
@@ -32,13 +32,13 @@ def feature(self, node="clickhouse1"):
         with Given(f"I ensure I do have role {role}"):
                 node.query(f"CREATE ROLE OR REPLACE {role}")
 
-    with Scenario("I create role with no options", flags=TE, requirements=[
+    with Scenario("I create role with no options", requirements=[
             RQ_SRS_006_RBAC_Role_Create("1.0")]):
         with cleanup("role0"):
             with When("I create role"):
                 node.query("CREATE ROLE role0")
 
-    with Scenario("I create role that already exists, throws exception", flags=TE, requirements=[
+    with Scenario("I create role that already exists, throws exception", requirements=[
             RQ_SRS_006_RBAC_Role_Create("1.0")]):
         role = "role0"
         with cleanup(role):
@@ -49,7 +49,7 @@ def feature(self, node="clickhouse1"):
                 node.query(f"CREATE ROLE {role}", exitcode=exitcode, message=message)
         del role
 
-    with Scenario("I create role if not exists, role does not exist", flags=TE, requirements=[
+    with Scenario("I create role if not exists, role does not exist", requirements=[
             RQ_SRS_006_RBAC_Role_Create_IfNotExists("1.0")]):
         role = "role1"
         with cleanup(role):
@@ -57,7 +57,7 @@ def feature(self, node="clickhouse1"):
                 node.query(f"CREATE ROLE IF NOT EXISTS {role}")
         del role
 
-    with Scenario("I create role if not exists, role does exist", flags=TE, requirements=[
+    with Scenario("I create role if not exists, role does exist", requirements=[
             RQ_SRS_006_RBAC_Role_Create_IfNotExists("1.0")]):
         role = "role1"
         with cleanup(role):
@@ -66,7 +66,7 @@ def feature(self, node="clickhouse1"):
                 node.query(f"CREATE ROLE IF NOT EXISTS {role}")
         del role
 
-    with Scenario("I create role or replace, role does not exist", flags=TE, requirements=[
+    with Scenario("I create role or replace, role does not exist", requirements=[
             RQ_SRS_006_RBAC_Role_Create_Replace("1.0")]):
         role = "role2"
         with cleanup(role):
@@ -74,7 +74,7 @@ def feature(self, node="clickhouse1"):
                 node.query(f"CREATE ROLE OR REPLACE {role}")
         del role
 
-    with Scenario("I create role or replace, role does exist", flags=TE, requirements=[
+    with Scenario("I create role or replace, role does exist", requirements=[
             RQ_SRS_006_RBAC_Role_Create_Replace("1.0")]):
         role = "role2"
         with cleanup(role):
@@ -83,7 +83,7 @@ def feature(self, node="clickhouse1"):
                 node.query(f"CREATE ROLE OR REPLACE {role}")
         del role
 
-    with Scenario("I create role on cluster", flags=TE, requirements=[
+    with Scenario("I create role on cluster", requirements=[
             RQ_SRS_006_RBAC_Role_Create("1.0")]):
         try:
             with When("I have a role on a cluster"):
@@ -96,19 +96,19 @@ def feature(self, node="clickhouse1"):
             with Finally("I drop the role"):
                 node.query("DROP ROLE IF EXISTS role1,role2 ON CLUSTER sharded_cluster")
 
-    with Scenario("I create role on nonexistent cluster, throws exception", flags=TE, requirements=[
+    with Scenario("I create role on nonexistent cluster, throws exception", requirements=[
             RQ_SRS_006_RBAC_Role_Create("1.0")]):
         with When("I run create role on a cluster"):
             exitcode, message = errors.cluster_not_found("fake_cluster")
             node.query("CREATE ROLE role1 ON CLUSTER fake_cluster", exitcode=exitcode, message=message)
 
-    with Scenario("I create role with settings profile", flags=TE, requirements=[
+    with Scenario("I create role with settings profile", requirements=[
             RQ_SRS_006_RBAC_Role_Create_Settings("1.0")]):
         with cleanup("role3"):
             with When("I create role with settings profile"):
                 node.query("CREATE ROLE role3 SETTINGS PROFILE default, max_memory_usage=10000000 WRITABLE")
 
-    with Scenario("I create role settings profile, fake profile, throws exception", flags=TE, requirements=[
+    with Scenario("I create role settings profile, fake profile, throws exception", requirements=[
             RQ_SRS_006_RBAC_Role_Create_Settings("1.0")]):
         with cleanup("role4a"):
             with Given("I ensure profile profile0 does not exist"):
@@ -117,7 +117,7 @@ def feature(self, node="clickhouse1"):
                 exitcode, message = errors.settings_profile_not_found_in_disk("profile0")
                 node.query("CREATE ROLE role4a SETTINGS PROFILE profile0", exitcode=exitcode, message=message)
 
-    with Scenario("I create role with settings without profile", flags=TE, requirements=[
+    with Scenario("I create role with settings without profile", requirements=[
             RQ_SRS_006_RBAC_Role_Create_Settings("1.0")]):
         with cleanup("role4"):
             with When("I create role with settings without profile"):
diff --git a/tests/testflows/rbac/tests/syntax/create_row_policy.py b/tests/testflows/rbac/tests/syntax/create_row_policy.py
index 4f35f47ff4b..8bf83579dd5 100755
--- a/tests/testflows/rbac/tests/syntax/create_row_policy.py
+++ b/tests/testflows/rbac/tests/syntax/create_row_policy.py
@@ -41,21 +41,21 @@ def feature(self, node="clickhouse1"):
             node.query(f"CREATE ROLE role0")
             node.query(f"CREATE ROLE role1")
 
-        with Scenario("I create row policy with no options", flags=TE, requirements=[
+        with Scenario("I create row policy with no options", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_Create("1.0"),
                 RQ_SRS_006_RBAC_RowPolicy_Create_On("1.0")]):
             with cleanup("policy0"):
                 with When("I create row policy"):
                     node.query("CREATE ROW POLICY policy0 ON default.foo")
 
-        with Scenario("I create row policy using short syntax with no options", flags=TE, requirements=[
+        with Scenario("I create row policy using short syntax with no options", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_Create("1.0"),
                 RQ_SRS_006_RBAC_RowPolicy_Create_On("1.0")]):
             with cleanup("policy1"):
                 with When("I create row policy short form"):
                     node.query("CREATE POLICY policy1 ON default.foo")
 
-        with Scenario("I create row policy that already exists, throws exception", flags=TE, requirements=[
+        with Scenario("I create row policy that already exists, throws exception", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_Create("1.0"),
                 RQ_SRS_006_RBAC_RowPolicy_Create_On("1.0")]):
             policy = "policy0"
@@ -66,14 +66,14 @@ def feature(self, node="clickhouse1"):
                     node.query(f"CREATE ROW POLICY {policy} ON default.foo", exitcode=exitcode, message=message)
             del policy
 
-        with Scenario("I create row policy if not exists, policy does not exist", flags=TE, requirements=[
+        with Scenario("I create row policy if not exists, policy does not exist", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_Create_IfNotExists("1.0"),
                 RQ_SRS_006_RBAC_RowPolicy_Create_On("1.0")]):
             with cleanup("policy2"):
                 with When("I create row policy with if not exists"):
                     node.query("CREATE ROW POLICY IF NOT EXISTS policy2 ON default.foo")
 
-        with Scenario("I create row policy if not exists, policy does exist", flags=TE, requirements=[
+        with Scenario("I create row policy if not exists, policy does exist", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_Create_IfNotExists("1.0"),
                 RQ_SRS_006_RBAC_RowPolicy_Create_On("1.0")]):
             policy = "policy2"
@@ -83,14 +83,14 @@ def feature(self, node="clickhouse1"):
                     node.query(f"CREATE ROW POLICY IF NOT EXISTS {policy} ON default.foo")
             del policy
 
-        with Scenario("I create row policy or replace, policy does not exist", flags=TE, requirements=[
+        with Scenario("I create row policy or replace, policy does not exist", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_Create_Replace("1.0"),
                 RQ_SRS_006_RBAC_RowPolicy_Create_On("1.0")]):
             with cleanup("policy3"):
                 with When("I create row policy with or replace"):
                     node.query("CREATE ROW POLICY OR REPLACE policy3 ON default.foo")
 
-        with Scenario("I create row policy or replace, policy does exist", flags=TE, requirements=[
+        with Scenario("I create row policy or replace, policy does exist", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_Create_Replace("1.0"),
                 RQ_SRS_006_RBAC_RowPolicy_Create_On("1.0")]):
             policy = "policy3"
@@ -100,21 +100,21 @@ def feature(self, node="clickhouse1"):
                     node.query(f"CREATE ROW POLICY OR REPLACE {policy} ON default.foo")
             del policy
 
-        with Scenario("I create row policy as permissive", flags=TE, requirements=[
+        with Scenario("I create row policy as permissive", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_Create_Access_Permissive("1.0"),
                 RQ_SRS_006_RBAC_RowPolicy_Create_On("1.0")]):
             with cleanup("policy4"):
                 with When("I create row policy as permissive"):
                     node.query("CREATE ROW POLICY policy4 ON default.foo AS PERMISSIVE")
 
-        with Scenario("I create row policy as restrictive", flags=TE, requirements=[
+        with Scenario("I create row policy as restrictive", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_Create_Access_Restrictive("1.0"),
                 RQ_SRS_006_RBAC_RowPolicy_Create_On("1.0")]):
             with cleanup("policy5"):
                 with When("I create row policy as restrictive"):
                     node.query("CREATE ROW POLICY policy5 ON default.foo AS RESTRICTIVE")
 
-        with Scenario("I create row policy for select", flags=TE, requirements=[
+        with Scenario("I create row policy for select", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_Create_ForSelect("1.0"),
                 RQ_SRS_006_RBAC_RowPolicy_Create_On("1.0"),
                 RQ_SRS_006_RBAC_RowPolicy_Create_Condition("1.0")]):
@@ -122,21 +122,21 @@ def feature(self, node="clickhouse1"):
                 with When("I create row policy with for select"):
                     node.query("CREATE ROW POLICY policy6 ON default.foo FOR SELECT USING x > 10")
 
-        with Scenario("I create row policy using condition", flags=TE, requirements=[
+        with Scenario("I create row policy using condition", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_Create_Condition("1.0"),
                 RQ_SRS_006_RBAC_RowPolicy_Create_On("1.0")]):
             with cleanup("policy6"):
                 with When("I create row policy with condition"):
                     node.query("CREATE ROW POLICY policy6 ON default.foo USING x > 10")
 
-        with Scenario("I create row policy assigned to one role", flags=TE, requirements=[
+        with Scenario("I create row policy assigned to one role", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_Create_Assignment("1.0"),
                 RQ_SRS_006_RBAC_RowPolicy_Create_On("1.0")]):
             with cleanup("policy7"):
                 with When("I create row policy for one role"):
                     node.query("CREATE ROW POLICY policy7 ON default.foo TO role0")
 
-        with Scenario("I create row policy to assign to role that does not exist, throws exception", flags=TE, requirements=[
+        with Scenario("I create row policy to assign to role that does not exist, throws exception", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_Create_Assignment("1.0")]):
             role = "role2"
             with cleanup("policy8a"):
@@ -147,7 +147,7 @@ def feature(self, node="clickhouse1"):
                     node.query(f"CREATE ROW POLICY policy8a ON default.foo TO {role}", exitcode=exitcode, message=message)
             del role
 
-        with Scenario("I create row policy to assign to all excpet role that does not exist, throws exception", flags=TE, requirements=[
+        with Scenario("I create row policy to assign to all excpet role that does not exist, throws exception", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_Create_Assignment("1.0")]):
             role = "role2"
             with cleanup("policy8a"):
@@ -158,42 +158,42 @@ def feature(self, node="clickhouse1"):
                     node.query(f"CREATE ROW POLICY policy8a ON default.foo TO ALL EXCEPT {role}", exitcode=exitcode, message=message)
             del role
 
-        with Scenario("I create row policy assigned to multiple roles", flags=TE, requirements=[
+        with Scenario("I create row policy assigned to multiple roles", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_Create_Assignment("1.0"),
                 RQ_SRS_006_RBAC_RowPolicy_Create_On("1.0")]):
             with cleanup("policy8b"):
                 with When("I create row policy for multiple roles"):
                     node.query("CREATE ROW POLICY policy8b ON default.foo TO role0, role1")
 
-        with Scenario("I create row policy assigned to all", flags=TE, requirements=[
+        with Scenario("I create row policy assigned to all", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_Create_Assignment_All("1.0"),
                 RQ_SRS_006_RBAC_RowPolicy_Create_On("1.0")]):
             with cleanup("policy9"):
                 with When("I create row policy for all"):
                     node.query("CREATE ROW POLICY policy9 ON default.foo TO ALL")
 
-        with Scenario("I create row policy assigned to all except one role", flags=TE, requirements=[
+        with Scenario("I create row policy assigned to all except one role", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_Create_Assignment_AllExcept("1.0"),
                 RQ_SRS_006_RBAC_RowPolicy_Create_On("1.0")]):
             with cleanup("policy10"):
                 with When("I create row policy for all except one"):
                     node.query("CREATE ROW POLICY policy10 ON default.foo TO ALL EXCEPT role0")
 
-        with Scenario("I create row policy assigned to all except multiple roles", flags=TE, requirements=[
+        with Scenario("I create row policy assigned to all except multiple roles", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_Create_Assignment_AllExcept("1.0"),
                 RQ_SRS_006_RBAC_RowPolicy_Create_On("1.0")]):
             with cleanup("policy11"):
                 with When("I create row policy for all except multiple roles"):
                     node.query("CREATE ROW POLICY policy11 ON default.foo TO ALL EXCEPT role0, role1")
 
-        with Scenario("I create row policy assigned to none", flags=TE, requirements=[
+        with Scenario("I create row policy assigned to none", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_Create_Assignment_None("1.0"),
                 RQ_SRS_006_RBAC_RowPolicy_Create_On("1.0")]):
             with cleanup("policy11"):
                 with When("I create row policy for none"):
                     node.query("CREATE ROW POLICY policy11 ON default.foo TO NONE")
 
-        with Scenario("I create row policy on cluster", flags=TE, requirements=[
+        with Scenario("I create row policy on cluster", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_Create_OnCluster("1.0"),
                 RQ_SRS_006_RBAC_RowPolicy_Create_On("1.0")]):
             try:
@@ -203,14 +203,14 @@ def feature(self, node="clickhouse1"):
                 with Finally("I drop the row policy from cluster"):
                     node.query("DROP ROW POLICY IF EXISTS policy12 ON default.foo ON CLUSTER sharded_cluster")
 
-        with Scenario("I create row policy on fake cluster, throws exception", flags=TE, requirements=[
+        with Scenario("I create row policy on fake cluster, throws exception", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_Create_OnCluster("1.0"),
                 RQ_SRS_006_RBAC_RowPolicy_Create_On("1.0")]):
             with When("I run create row policy command"):
                 exitcode, message = errors.cluster_not_found("fake_cluster")
                 node.query("CREATE ROW POLICY policy13 ON CLUSTER fake_cluster ON default.foo", exitcode=exitcode, message=message)
 
-        with Scenario("I create row policy on cluster after table", flags=TE, requirements=[
+        with Scenario("I create row policy on cluster after table", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_Create_OnCluster("1.0"),
                 RQ_SRS_006_RBAC_RowPolicy_Create_On("1.0")]):
             try:
diff --git a/tests/testflows/rbac/tests/syntax/create_settings_profile.py b/tests/testflows/rbac/tests/syntax/create_settings_profile.py
index 6d720af21bc..8976ce6843a 100755
--- a/tests/testflows/rbac/tests/syntax/create_settings_profile.py
+++ b/tests/testflows/rbac/tests/syntax/create_settings_profile.py
@@ -39,13 +39,13 @@ def feature(self, node="clickhouse1"):
             node.query(f"CREATE USER user0")
             node.query(f"CREATE ROLE role0")
 
-        with Scenario("I create settings profile with no options", flags=TE, requirements=[
+        with Scenario("I create settings profile with no options", requirements=[
                 RQ_SRS_006_RBAC_SettingsProfile_Create("1.0")]):
             with cleanup("profile0"):
                 with When("I create settings profile"):
                     node.query("CREATE SETTINGS PROFILE profile0")
 
-        with Scenario("I create settings profile that already exists, throws exception", flags=TE, requirements=[
+        with Scenario("I create settings profile that already exists, throws exception", requirements=[
                 RQ_SRS_006_RBAC_SettingsProfile_Create("1.0")]):
             profile = "profile0"
             with cleanup(profile):
@@ -55,13 +55,13 @@ def feature(self, node="clickhouse1"):
                     node.query(f"CREATE SETTINGS PROFILE {profile}", exitcode=exitcode, message=message)
             del profile
 
-        with Scenario("I create settings profile if not exists, profile does not exist", flags=TE, requirements=[
+        with Scenario("I create settings profile if not exists, profile does not exist", requirements=[
                 RQ_SRS_006_RBAC_SettingsProfile_Create_IfNotExists("1.0")]):
             with cleanup("profile1"):
                 with When("I create settings profile with if not exists"):
                     node.query("CREATE SETTINGS PROFILE IF NOT EXISTS profile1")
 
-        with Scenario("I create settings profile if not exists, profile does exist", flags=TE, requirements=[
+        with Scenario("I create settings profile if not exists, profile does exist", requirements=[
                 RQ_SRS_006_RBAC_SettingsProfile_Create_IfNotExists("1.0")]):
             profile = "profile1"
             with cleanup(profile):
@@ -70,78 +70,78 @@ def feature(self, node="clickhouse1"):
                     node.query(f"CREATE SETTINGS PROFILE IF NOT EXISTS {profile}")
             del profile
 
-        with Scenario("I create settings profile or replace, profile does not exist", flags=TE, requirements=[
+        with Scenario("I create settings profile or replace, profile does not exist", requirements=[
                 RQ_SRS_006_RBAC_SettingsProfile_Create_Replace("1.0")]):
             with cleanup("profile2"):
                 with When("I create settings policy with or replace"):
                     node.query("CREATE SETTINGS PROFILE OR REPLACE profile2")
 
-        with Scenario("I create settings profile or replace, profile does exist", flags=TE, requirements=[
+        with Scenario("I create settings profile or replace, profile does exist", requirements=[
                 RQ_SRS_006_RBAC_SettingsProfile_Create_Replace("1.0")]):
             with cleanup("profile2"):
                 create_profile("profile2")
                 with When("I create settings policy with or replace"):
                     node.query("CREATE SETTINGS PROFILE OR REPLACE profile2")
 
-        with Scenario("I create settings profile short form", flags=TE, requirements=[
+        with Scenario("I create settings profile short form", requirements=[
                 RQ_SRS_006_RBAC_SettingsProfile_Create("1.0")]):
             with cleanup("profile3"):
                 with When("I create settings profile short form"):
                     node.query("CREATE PROFILE profile3")
 
-        with Scenario("I create settings profile with a setting value", flags=TE, requirements=[
+        with Scenario("I create settings profile with a setting value", requirements=[
                 RQ_SRS_006_RBAC_SettingsProfile_Create_Variables("1.0"),
                 RQ_SRS_006_RBAC_SettingsProfile_Create_Variables_Value("1.0")]):
             with cleanup("profile4"):
                 with When("I create settings profile with settings"):
                     node.query("CREATE SETTINGS PROFILE profile4 SETTINGS max_memory_usage = 100000001")
 
-        with Scenario("I create settings profile with a setting value, does not exist, throws exception", flags=TE, requirements=[
+        with Scenario("I create settings profile with a setting value, does not exist, throws exception", requirements=[
                 RQ_SRS_006_RBAC_SettingsProfile_Create_Variables("1.0"),
                 RQ_SRS_006_RBAC_SettingsProfile_Create_Variables_Value("1.0")]):
             with When("I create settings profile using settings and nonexistent value"):
                 exitcode, message = errors.unknown_setting("fake_setting")
                 node.query("CREATE SETTINGS PROFILE profile0 SETTINGS fake_setting = 100000001", exitcode=exitcode, message=message)
 
-        with Scenario("I create settings profile with a min setting value", flags=TE, requirements=[
+        with Scenario("I create settings profile with a min setting value", requirements=[
                 RQ_SRS_006_RBAC_SettingsProfile_Create_Variables_Constraints("1.0")]):
             with cleanup("profile5"), cleanup("profile6"):
                 with When("I create settings profile with min setting with and without equals"):
                     node.query("CREATE SETTINGS PROFILE profile5 SETTINGS max_memory_usage MIN 100000001")
                     node.query("CREATE SETTINGS PROFILE profile6 SETTINGS max_memory_usage MIN = 100000001")
 
-        with Scenario("I create settings profile with a max setting value", flags=TE, requirements=[
+        with Scenario("I create settings profile with a max setting value", requirements=[
                 RQ_SRS_006_RBAC_SettingsProfile_Create_Variables_Constraints("1.0")]):
             with cleanup("profile7"), cleanup("profile8"):
                 with When("I create settings profile with max setting with and without equals"):
                     node.query("CREATE SETTINGS PROFILE profile7 SETTINGS max_memory_usage MAX 100000001")
                     node.query("CREATE SETTINGS PROFILE profile8 SETTINGS max_memory_usage MAX = 100000001")
 
-        with Scenario("I create settings profile with min and max setting values", flags=TE, requirements=[
+        with Scenario("I create settings profile with min and max setting values", requirements=[
                 RQ_SRS_006_RBAC_SettingsProfile_Create_Variables_Constraints("1.0")]):
             with cleanup("profile9"):
                 with When("I create settings profile with min and max setting"):
                     node.query("CREATE SETTINGS PROFILE profile9 SETTINGS max_memory_usage MIN 100000001 MAX 200000001")
 
-        with Scenario("I create settings profile with a readonly setting", flags=TE, requirements=[
+        with Scenario("I create settings profile with a readonly setting", requirements=[
                 RQ_SRS_006_RBAC_SettingsProfile_Create_Variables_Constraints("1.0")]):
             with cleanup("profile10"):
                 with When("I create settings profile with readonly"):
                     node.query("CREATE SETTINGS PROFILE profile10 SETTINGS max_memory_usage READONLY")
 
-        with Scenario("I create settings profile with a writable setting", flags=TE, requirements=[
+        with Scenario("I create settings profile with a writable setting", requirements=[
                 RQ_SRS_006_RBAC_SettingsProfile_Create_Variables_Constraints("1.0")]):
             with cleanup("profile21"):
                 with When("I create settings profile with writable"):
                     node.query("CREATE SETTINGS PROFILE profile21 SETTINGS max_memory_usage WRITABLE")
 
-        with Scenario("I create settings profile with inherited settings", flags=TE, requirements=[
+        with Scenario("I create settings profile with inherited settings", requirements=[
                 RQ_SRS_006_RBAC_SettingsProfile_Create_Inherit("1.0")]):
             with cleanup("profile11"):
                 with When("I create settings profile with inherit"):
                     node.query("CREATE SETTINGS PROFILE profile11 SETTINGS INHERIT 'default'")
 
-        with Scenario("I create settings profile with inherit/from profile, fake profile, throws exception", flags=TE, requirements=[
+        with Scenario("I create settings profile with inherit/from profile, fake profile, throws exception", requirements=[
                 RQ_SRS_006_RBAC_SettingsProfile_Create_Inherit("1.0")]):
             profile = "profile3"
             with Given(f"I ensure that profile {profile} does not exist"):
@@ -153,13 +153,13 @@ def feature(self, node="clickhouse1"):
                     node.query(f"CREATE PROFILE profile0 SETTINGS {source} {profile}", exitcode=exitcode, message=message)
             del profile
 
-        with Scenario("I create settings profile with inherited settings other form", flags=TE, requirements=[
+        with Scenario("I create settings profile with inherited settings other form", requirements=[
                 RQ_SRS_006_RBAC_SettingsProfile_Create_Inherit("1.0")]):
             with cleanup("profile12"):
                 with When("I create settings profile with inherit short form"):
                     node.query("CREATE PROFILE profile12 SETTINGS PROFILE 'default'")
 
-        with Scenario("I create settings profile with multiple settings", flags=TE, requirements=[
+        with Scenario("I create settings profile with multiple settings", requirements=[
                 RQ_SRS_006_RBAC_SettingsProfile_Create_Variables_Constraints("1.0")]):
             with cleanup("profile13"):
                 with When("I create settings profile with multiple settings"):
@@ -167,7 +167,7 @@ def feature(self, node="clickhouse1"):
                         " SETTINGS max_memory_usage = 100000001"
                         " SETTINGS max_memory_usage_for_user = 100000001")
 
-        with Scenario("I create settings profile with multiple settings short form", flags=TE, requirements=[
+        with Scenario("I create settings profile with multiple settings short form", requirements=[
                 RQ_SRS_006_RBAC_SettingsProfile_Create_Variables_Constraints("1.0")]):
             with cleanup("profile14"):
                 with When("I create settings profile with multiple settings short form"):
@@ -175,13 +175,13 @@ def feature(self, node="clickhouse1"):
                         " SETTINGS max_memory_usage = 100000001,"
                         " max_memory_usage_for_user = 100000001")
 
-        with Scenario("I create settings profile assigned to one role", flags=TE, requirements=[
+        with Scenario("I create settings profile assigned to one role", requirements=[
                 RQ_SRS_006_RBAC_SettingsProfile_Create_Assignment("1.0")]):
             with cleanup("profile15"):
                 with When("I create settings profile for a role"):
                     node.query("CREATE SETTINGS PROFILE profile15 TO role0")
 
-        with Scenario("I create settings profile to assign to role that does not exist, throws exception", flags=TE, requirements=[
+        with Scenario("I create settings profile to assign to role that does not exist, throws exception", requirements=[
                 RQ_SRS_006_RBAC_SettingsProfile_Create_Assignment("1.0")]):
             role = "role1"
             with Given(f"I drop {role} if it exists"):
@@ -191,7 +191,7 @@ def feature(self, node="clickhouse1"):
                 node.query(f"CREATE SETTINGS PROFILE profile0 TO {role}", exitcode=exitcode, message=message)
             del role
 
-        with Scenario("I create settings profile to assign to all except role that does not exist, throws exception", flags=TE, requirements=[
+        with Scenario("I create settings profile to assign to all except role that does not exist, throws exception", requirements=[
                 RQ_SRS_006_RBAC_SettingsProfile_Create_Assignment("1.0")]):
             role = "role1"
             with Given(f"I drop {role} if it exists"):
@@ -201,37 +201,37 @@ def feature(self, node="clickhouse1"):
                 node.query(f"CREATE SETTINGS PROFILE profile0 TO ALL EXCEPT {role}", exitcode=exitcode, message=message)
             del role
 
-        with Scenario("I create settings profile assigned to multiple roles", flags=TE, requirements=[
+        with Scenario("I create settings profile assigned to multiple roles", requirements=[
                 RQ_SRS_006_RBAC_SettingsProfile_Create_Assignment("1.0")]):
             with cleanup("profile16"):
                 with When("I create settings profile for multiple roles"):
                     node.query("CREATE SETTINGS PROFILE profile16 TO role0, user0")
 
-        with Scenario("I create settings profile assigned to all", flags=TE, requirements=[
+        with Scenario("I create settings profile assigned to all", requirements=[
                 RQ_SRS_006_RBAC_SettingsProfile_Create_Assignment_All("1.0")]):
             with cleanup("profile17"):
                 with When("I create settings profile for all"):
                     node.query("CREATE SETTINGS PROFILE profile17 TO ALL")
 
-        with Scenario("I create settings profile assigned to all except one role", flags=TE,requirements=[
+        with Scenario("I create settings profile assigned to all except one role",requirements=[
                 RQ_SRS_006_RBAC_SettingsProfile_Create_Assignment_AllExcept("1.0")]):
             with cleanup("profile18"):
                 with When("I create settings profile for all except one role"):
                     node.query("CREATE SETTINGS PROFILE profile18 TO ALL EXCEPT role0")
 
-        with Scenario("I create settings profile assigned to all except multiple roles", flags=TE, requirements=[
+        with Scenario("I create settings profile assigned to all except multiple roles", requirements=[
                 RQ_SRS_006_RBAC_SettingsProfile_Create_Assignment_AllExcept("1.0")]):
             with cleanup("profile19"):
                 with When("I create settings profile for all except multiple roles"):
                     node.query("CREATE SETTINGS PROFILE profile19 TO ALL EXCEPT role0, user0")
 
-        with Scenario("I create settings profile assigned to none", flags=TE, requirements=[
+        with Scenario("I create settings profile assigned to none", requirements=[
                 RQ_SRS_006_RBAC_SettingsProfile_Create_Assignment_None("1.0")]):
             with cleanup("profile22"):
                 with When("I create settings profile for none"):
                     node.query("CREATE SETTINGS PROFILE profile22 TO NONE")
 
-        with Scenario("I create settings profile on cluster", flags=TE, requirements=[
+        with Scenario("I create settings profile on cluster", requirements=[
                 RQ_SRS_006_RBAC_SettingsProfile_Create_OnCluster("1.0")]):
             try:
                 with When("I run create settings profile command"):
@@ -243,7 +243,7 @@ def feature(self, node="clickhouse1"):
                 with Finally("I drop the settings profile"):
                     node.query("DROP SETTINGS PROFILE IF EXISTS profile20 ON CLUSTER sharded_cluster")
 
-        with Scenario("I create settings profile on fake cluster, throws exception", flags=TE, requirements=[
+        with Scenario("I create settings profile on fake cluster, throws exception", requirements=[
                 RQ_SRS_006_RBAC_SettingsProfile_Create_OnCluster("1.0")]):
             with When("I run create settings profile command"):
                 exitcode, message = errors.cluster_not_found("fake_cluster")
diff --git a/tests/testflows/rbac/tests/syntax/create_user.py b/tests/testflows/rbac/tests/syntax/create_user.py
index d410dd1ab6e..326446e4620 100755
--- a/tests/testflows/rbac/tests/syntax/create_user.py
+++ b/tests/testflows/rbac/tests/syntax/create_user.py
@@ -25,7 +25,7 @@ def feature(self, node="clickhouse1"):
     @contextmanager
     def cleanup(user):
         try:
-            with Given("I ensure the user does not already exist", flags=TE):
+            with Given("I ensure the user does not already exist"):
                 node.query(f"DROP USER IF EXISTS {user}")
             yield
         finally:
@@ -36,14 +36,14 @@ def feature(self, node="clickhouse1"):
         with Given(f"I ensure I do have user {user}"):
                 node.query(f"CREATE USER OR REPLACE {user}")
 
-    with Scenario("I create user with no options", flags=TE, requirements=[
+    with Scenario("I create user with no options", requirements=[
             RQ_SRS_006_RBAC_User_Create("1.0"),
     		RQ_SRS_006_RBAC_User_Create_Host_Default("1.0")]):
         with cleanup("user0"):
             with When("I create a user with no options"):
                 node.query("CREATE USER user0")
 
-    with Scenario("I create user that already exists, throws exception", flags=TE, requirements=[
+    with Scenario("I create user that already exists, throws exception", requirements=[
             RQ_SRS_006_RBAC_User_Create("1.0"),
     		RQ_SRS_006_RBAC_User_Create_Host_Default("1.0")]):
         user = "user0"
@@ -54,7 +54,7 @@ def feature(self, node="clickhouse1"):
                 node.query(f"CREATE USER {user}", exitcode=exitcode, message=message)
         del user
 
-    with Scenario("I create user with if not exists, user does not exist", flags=TE, requirements=[
+    with Scenario("I create user with if not exists, user does not exist", requirements=[
             RQ_SRS_006_RBAC_User_Create_IfNotExists("1.0")]):
         user = "user0"
         with cleanup(user):
@@ -63,7 +63,7 @@ def feature(self, node="clickhouse1"):
         del user
 
     #Bug exists, mark as xfail
-    with Scenario("I create user with if not exists, user does exist", flags=TE, requirements=[
+    with Scenario("I create user with if not exists, user does exist", requirements=[
             RQ_SRS_006_RBAC_User_Create_IfNotExists("1.0")]):
         user = "user0"
         with cleanup(user):
@@ -72,7 +72,7 @@ def feature(self, node="clickhouse1"):
                 node.query(f"CREATE USER IF NOT EXISTS {user}")
         del user
 
-    with Scenario("I create user or replace, user does not exist", flags=TE, requirements=[
+    with Scenario("I create user or replace, user does not exist", requirements=[
             RQ_SRS_006_RBAC_User_Create_Replace("1.0")]):
         user = "user0"
         with cleanup(user):
@@ -80,7 +80,7 @@ def feature(self, node="clickhouse1"):
                 node.query(f"CREATE USER OR REPLACE {user}")
         del user
 
-    with Scenario("I create user or replace, user does exist", flags=TE, requirements=[
+    with Scenario("I create user or replace, user does exist", requirements=[
             RQ_SRS_006_RBAC_User_Create_Replace("1.0")]):
         user = "user0"
         with cleanup(user):
@@ -89,33 +89,33 @@ def feature(self, node="clickhouse1"):
                 node.query(f"CREATE USER OR REPLACE {user}")
         del user
 
-    with Scenario("I create user with no password", flags=TE, requirements=[
+    with Scenario("I create user with no password", requirements=[
             RQ_SRS_006_RBAC_User_Create_Password_NoPassword("1.0")]):
         with cleanup("user1"):
             with When("I create a user with no password"):
                 node.query("CREATE USER user1 IDENTIFIED WITH NO_PASSWORD")
 
-    with Scenario("I create user with plaintext password", flags=TE, requirements=[
+    with Scenario("I create user with plaintext password", requirements=[
             RQ_SRS_006_RBAC_User_Create_Password_PlainText("1.0")]):
         with cleanup("user1"):
             with When("I create a user with plaintext password"):
                 node.query("CREATE USER user1 IDENTIFIED WITH PLAINTEXT_PASSWORD BY 'mypassword'")
 
-    with Scenario("I create user with sha256 password", flags=TE, requirements=[
+    with Scenario("I create user with sha256 password", requirements=[
             RQ_SRS_006_RBAC_User_Create_Password_Sha256Password("1.0")]):
         with cleanup("user2"):
             with When("I create a user with sha256 password"):
                 password = hashlib.sha256("mypassword".encode("utf-8")).hexdigest()
                 node.query(f"CREATE USER user2 IDENTIFIED WITH SHA256_PASSWORD BY '{password}'")
 
-    with Scenario("I create user with sha256 password using IDENTIFIED BY", flags=TE, requirements=[
+    with Scenario("I create user with sha256 password using IDENTIFIED BY", requirements=[
             RQ_SRS_006_RBAC_User_Create_Password_Sha256Password("1.0")]):
         with cleanup("user2"):
             with When("I create a user with sha256 password using short form"):
                 password = hashlib.sha256("mypassword".encode("utf-8")).hexdigest()
                 node.query(f"CREATE USER user2 IDENTIFIED BY '{password}'")
 
-    with Scenario("I create user with sha256_hash password", flags=TE, requirements=[
+    with Scenario("I create user with sha256_hash password", requirements=[
             RQ_SRS_006_RBAC_User_Create_Password_Sha256Hash("1.0")]):
         with cleanup("user3"):
             with When("I create a user with sha256_hash"):
@@ -124,13 +124,13 @@ def feature(self, node="clickhouse1"):
                 password = hash(hash("mypassword"))
                 node.query(f"CREATE USER user3 IDENTIFIED WITH SHA256_HASH BY '{password}'")
 
-    with Scenario("I create user with double sha1 password", flags=TE, requirements=[
+    with Scenario("I create user with double sha1 password", requirements=[
             RQ_SRS_006_RBAC_User_Create_Password_DoubleSha1Password("1.0")]):
         with cleanup("user3"):
             with When("I create a user with double_sha1_password"):
                 node.query(f"CREATE USER user3 IDENTIFIED WITH DOUBLE_SHA1_PASSWORD BY 'mypassword'")
 
-    with Scenario("I create user with double sha1 hash", flags=TE, requirements=[
+    with Scenario("I create user with double sha1 hash", requirements=[
             RQ_SRS_006_RBAC_User_Create_Password_DoubleSha1Hash("1.0")]):
         with cleanup("user3"):
             with When("I create a user with double_sha1_hash"):
@@ -139,55 +139,55 @@ def feature(self, node="clickhouse1"):
                 password = hash(hash("mypassword"))
                 node.query(f"CREATE USER user3 IDENTIFIED WITH DOUBLE_SHA1_HASH BY '{password}'")
 
-    with Scenario("I create user with host name", flags=TE, requirements=[
+    with Scenario("I create user with host name", requirements=[
             RQ_SRS_006_RBAC_User_Create_Host_Name("1.0")]):
         with cleanup("user4"):
             with When("I create a user with host name"):
                 node.query("CREATE USER user4 HOST NAME 'localhost', NAME 'clickhouse.com'")
 
-    with Scenario("I create user with host regexp", flags=TE, requirements=[
+    with Scenario("I create user with host regexp", requirements=[
             RQ_SRS_006_RBAC_User_Create_Host_Regexp("1.0")]):
         with cleanup("user5"):
             with When("I create a user with host regexp"):
                 node.query("CREATE USER user5 HOST REGEXP 'lo.?*host', REGEXP 'lo*host'")
 
-    with Scenario("I create user with host ip", flags=TE, requirements=[
+    with Scenario("I create user with host ip", requirements=[
             RQ_SRS_006_RBAC_User_Create_Host_IP("1.0")]):
         with cleanup("user6"):
             with When("I create a user with host ip"):
                 node.query("CREATE USER user6 HOST IP '127.0.0.1', IP '127.0.0.2'")
 
-    with Scenario("I create user with host like", flags=TE, requirements=[
+    with Scenario("I create user with host like", requirements=[
             RQ_SRS_006_RBAC_User_Create_Host_Like("1.0")]):
         with cleanup("user7"):
             with When("I create a user with host like"):
                 node.query("CREATE USER user7 HOST LIKE 'local%'")
 
-    with Scenario("I create user with host none", flags=TE, requirements=[
+    with Scenario("I create user with host none", requirements=[
             RQ_SRS_006_RBAC_User_Create_Host_None("1.0")]):
         with cleanup("user7"):
             with When("I create a user with host none"):
                 node.query("CREATE USER user7 HOST NONE")
 
-    with Scenario("I create user with host local", flags=TE, requirements=[
+    with Scenario("I create user with host local", requirements=[
             RQ_SRS_006_RBAC_User_Create_Host_Local("1.0")]):
         with cleanup("user7"):
             with When("I create a user with host local"):
                 node.query("CREATE USER user7 HOST LOCAL")
 
-    with Scenario("I create user with host any", flags=TE, requirements=[
+    with Scenario("I create user with host any", requirements=[
             RQ_SRS_006_RBAC_User_Create_Host_Any("1.0")]):
         with cleanup("user7"):
             with When("I create a user with host any"):
                 node.query("CREATE USER user7 HOST ANY")
 
-    with Scenario("I create user with default role set to none", flags=TE, requirements=[
+    with Scenario("I create user with default role set to none", requirements=[
             RQ_SRS_006_RBAC_User_Create_DefaultRole_None("1.0")]):
         with cleanup("user8"):
             with When("I create a user with no default role"):
                 node.query("CREATE USER user8 DEFAULT ROLE NONE")
 
-    with Scenario("I create user with default role", flags=TE, requirements=[
+    with Scenario("I create user with default role", requirements=[
             RQ_SRS_006_RBAC_User_Create_DefaultRole("1.0")]):
         with Given("I have a role"):
             node.query("CREATE ROLE default")
@@ -197,7 +197,7 @@ def feature(self, node="clickhouse1"):
         with Finally("I drop the role"):
             node.query("DROP ROLE default")
 
-    with Scenario("I create user default role, role doesn't exist, throws exception", flags=TE, requirements=[
+    with Scenario("I create user default role, role doesn't exist, throws exception", requirements=[
             RQ_SRS_006_RBAC_User_Create_DefaultRole("1.0")]):
         with cleanup("user12"):
             role = "role0"
@@ -208,7 +208,7 @@ def feature(self, node="clickhouse1"):
                 node.query(f"CREATE USER user12 DEFAULT ROLE {role}",exitcode=exitcode, message=message)
             del role
 
-    with Scenario("I create user default role, all except role doesn't exist, throws exception", flags=TE, requirements=[
+    with Scenario("I create user default role, all except role doesn't exist, throws exception", requirements=[
             RQ_SRS_006_RBAC_User_Create_DefaultRole("1.0")]):
         with cleanup("user12"):
             role = "role0"
@@ -219,19 +219,19 @@ def feature(self, node="clickhouse1"):
                 node.query(f"CREATE USER user12 DEFAULT ROLE ALL EXCEPT {role}",exitcode=exitcode, message=message)
             del role
 
-    with Scenario("I create user with all roles set to default", flags=TE, requirements=[
+    with Scenario("I create user with all roles set to default", requirements=[
             RQ_SRS_006_RBAC_User_Create_DefaultRole_All("1.0")]):
         with cleanup("user10"):
             with When("I create a user with all roles as default"):
                 node.query("CREATE USER user10 DEFAULT ROLE ALL")
 
-    with Scenario("I create user with settings profile", flags=TE, requirements=[
+    with Scenario("I create user with settings profile", requirements=[
             RQ_SRS_006_RBAC_User_Create_Settings("1.0")]):
         with cleanup("user11"):
             with When("I create a user with a settings profile"):
                 node.query("CREATE USER user11 SETTINGS PROFILE default, max_memory_usage=10000000 READONLY")
 
-    with Scenario("I create user settings profile, fake profile, throws exception", flags=TE, requirements=[
+    with Scenario("I create user settings profile, fake profile, throws exception", requirements=[
             RQ_SRS_006_RBAC_User_Create_Settings("1.0")]):
         with cleanup("user18a"):
             profile = "profile0"
@@ -242,20 +242,20 @@ def feature(self, node="clickhouse1"):
                 node.query("CREATE USER user18a SETTINGS PROFILE profile0", exitcode=exitcode, message=message)
             del profile
 
-    with Scenario("I create user settings with a fake setting, throws exception", flags=TE, requirements=[
+    with Scenario("I create user settings with a fake setting, throws exception", requirements=[
                 RQ_SRS_006_RBAC_User_Create_Settings("1.0")]):
         with cleanup("user18b"):
             with When("I create settings profile using settings and nonexistent value"):
                 exitcode, message = errors.unknown_setting("fake_setting")
                 node.query("CREATE USER user18b SETTINGS fake_setting = 100000001", exitcode=exitcode, message=message)
 
-    with Scenario("I create user with settings without profile", flags=TE, requirements=[
+    with Scenario("I create user with settings without profile", requirements=[
             RQ_SRS_006_RBAC_User_Create_Settings("1.0")]):
         with cleanup("user12"):
             with When("I create a user with settings and no profile"):
                 node.query("CREATE USER user12 SETTINGS max_memory_usage=10000000 READONLY")
 
-    with Scenario("I create user on cluster", flags=TE, requirements=[
+    with Scenario("I create user on cluster", requirements=[
             RQ_SRS_006_RBAC_User_Create_OnCluster("1.0")]):
         try:
             with When("I create user on cluster"):
@@ -264,7 +264,7 @@ def feature(self, node="clickhouse1"):
             with Finally("I drop the user"):
                 node.query("DROP USER user13 ON CLUSTER sharded_cluster")
 
-    with Scenario("I create user on fake cluster, throws exception", flags=TE, requirements=[
+    with Scenario("I create user on fake cluster, throws exception", requirements=[
             RQ_SRS_006_RBAC_User_Create_OnCluster("1.0")]):
             with When("I create user on fake cluster"):
                 exitcode, message = errors.cluster_not_found("fake_cluster")
diff --git a/tests/testflows/rbac/tests/syntax/drop_quota.py b/tests/testflows/rbac/tests/syntax/drop_quota.py
index 099951e3f19..879964e46fb 100755
--- a/tests/testflows/rbac/tests/syntax/drop_quota.py
+++ b/tests/testflows/rbac/tests/syntax/drop_quota.py
@@ -23,20 +23,20 @@ def feature(self, node="clickhouse1"):
                 node.query(f"CREATE QUOTA {quota}")
             yield
         finally:
-            with Finally("I drop the quota"):
+            with Finally("I drop the quota", flags=TE):
                 node.query(f"DROP QUOTA IF EXISTS {quota}")
 
     def cleanup_quota(quota):
         with Given(f"I ensure that quota {quota} does not exist"):
             node.query(f"DROP QUOTA IF EXISTS {quota}")
 
-    with Scenario("I drop quota with no options", flags=TE, requirements=[
+    with Scenario("I drop quota with no options", requirements=[
             RQ_SRS_006_RBAC_Quota_Drop("1.0")]):
         with cleanup("quota0"):
             with When("I run drop quota command"):
                 node.query("DROP QUOTA quota0")
 
-    with Scenario("I drop quota, does not exist, throws exception", flags=TE, requirements=[
+    with Scenario("I drop quota, does not exist, throws exception", requirements=[
             RQ_SRS_006_RBAC_Quota_Drop("1.0")]):
         quota = "quota0"
         cleanup_quota(quota)
@@ -45,31 +45,31 @@ def feature(self, node="clickhouse1"):
             node.query(f"DROP QUOTA {quota}", exitcode=exitcode, message=message)
         del quota
 
-    with Scenario("I drop quota if exists, quota exists", flags=TE, requirements=[
+    with Scenario("I drop quota if exists, quota exists", requirements=[
             RQ_SRS_006_RBAC_Quota_Drop_IfExists("1.0")]):
         with cleanup("quota1"):
             with When("I run drop quota command"):
                 node.query("DROP QUOTA IF EXISTS quota1")
 
-    with Scenario("I drop quota if exists, quota does not exist", flags=TE, requirements=[
+    with Scenario("I drop quota if exists, quota does not exist", requirements=[
             RQ_SRS_006_RBAC_Quota_Drop_IfExists("1.0")]):
         cleanup_quota("quota2")
         with When("I run drop quota command, quota does not exist"):
             node.query("DROP QUOTA IF EXISTS quota2")
 
-    with Scenario("I drop default quota, throws error", flags=TE, requirements=[
+    with Scenario("I drop default quota, throws error", requirements=[
             RQ_SRS_006_RBAC_Quota_Drop("1.0")]):
         with When("I drop default quota"):
             exitcode, message = errors.cannot_remove_quota_default()
             node.query("DROP QUOTA default", exitcode=exitcode, message=message)
 
-    with Scenario("I drop multiple quotas", flags=TE, requirements=[
+    with Scenario("I drop multiple quotas", requirements=[
             RQ_SRS_006_RBAC_Quota_Drop("1.0")]):
         with cleanup("quota2"), cleanup("quota3"):
             with When("I run drop quota command"):
                 node.query("DROP QUOTA quota2, quota3")
 
-    with Scenario("I drop quota on cluster", flags=TE, requirements=[
+    with Scenario("I drop quota on cluster", requirements=[
             RQ_SRS_006_RBAC_Quota_Drop_Cluster("1.0")]):
         try:
             with Given("I have a quota"):
@@ -80,7 +80,7 @@ def feature(self, node="clickhouse1"):
             with Finally("I drop the quota in case it still exists"):
                 node.query("DROP QUOTA IF EXISTS quota4 ON CLUSTER sharded_cluster")
 
-    with Scenario("I drop quota on fake cluster", flags=TE, requirements=[
+    with Scenario("I drop quota on fake cluster", requirements=[
             RQ_SRS_006_RBAC_Quota_Drop_Cluster("1.0")]):
         with When("I run drop quota command"):
             exitcode, message = errors.cluster_not_found("fake_cluster")
diff --git a/tests/testflows/rbac/tests/syntax/drop_role.py b/tests/testflows/rbac/tests/syntax/drop_role.py
index 0e6d0134649..87810dc0184 100755
--- a/tests/testflows/rbac/tests/syntax/drop_role.py
+++ b/tests/testflows/rbac/tests/syntax/drop_role.py
@@ -31,13 +31,13 @@ def feature(self, node="clickhouse1"):
                 node.query(f"DROP ROLE IF EXISTS {role}")
 
 
-    with Scenario("I drop role with no options", flags=TE, requirements=[
+    with Scenario("I drop role with no options", requirements=[
             RQ_SRS_006_RBAC_Role_Drop("1.0")]):
         with setup("role0"):
             with When("I drop role"):
                 node.query("DROP ROLE role0")
 
-    with Scenario("I drop role that doesn't exist, throws exception", flags=TE, requirements=[
+    with Scenario("I drop role that doesn't exist, throws exception", requirements=[
             RQ_SRS_006_RBAC_Role_Drop("1.0")]):
         role = "role0"
         cleanup_role(role)
@@ -46,38 +46,38 @@ def feature(self, node="clickhouse1"):
             node.query(f"DROP ROLE {role}", exitcode=exitcode, message=message)
         del role
 
-    with Scenario("I drop multiple roles", flags=TE, requirements=[
+    with Scenario("I drop multiple roles", requirements=[
             RQ_SRS_006_RBAC_Role_Drop("1.0")]):
         with setup("role1"), setup("role2"):
             with When("I drop multiple roles"):
                 node.query("DROP ROLE role1, role2")
 
-    with Scenario("I drop role that does not exist, using if exists", flags=TE, requirements=[
+    with Scenario("I drop role that does not exist, using if exists", requirements=[
             RQ_SRS_006_RBAC_Role_Drop_IfExists("1.0")]):
         with When("I drop role if exists"):
             node.query("DROP ROLE IF EXISTS role3")
 
-    with Scenario("I drop multiple roles where one does not exist", flags=TE, requirements=[
+    with Scenario("I drop multiple roles where one does not exist", requirements=[
             RQ_SRS_006_RBAC_Role_Drop_IfExists("1.0")]):
         with setup("role5"):
             with When("I drop multiple roles where one doesnt exist"):
                 node.query("DROP ROLE IF EXISTS role3, role5")
 
-    with Scenario("I drop multiple roles where both do not exist", flags = TE, requirements=[
+    with Scenario("I drop multiple roles where both do not exist", requirements=[
             RQ_SRS_006_RBAC_Role_Drop_IfExists("1.0")]):
         with Given("I ensure role does not exist"):
             node.query("DROP ROLE IF EXISTS role6")
         with When("I drop the nonexistant roles"):
             node.query("DROP USER IF EXISTS role5, role6")
 
-    with Scenario("I drop role on cluster", flags=TE, requirements=[
+    with Scenario("I drop role on cluster", requirements=[
             RQ_SRS_006_RBAC_Role_Drop_Cluster("1.0")]):
         with Given("I have a role on cluster"):
             node.query("CREATE ROLE OR REPLACE role0 ON CLUSTER sharded_cluster")
         with When("I drop the role from the cluster"):
             node.query("DROP ROLE IF EXISTS role0 ON CLUSTER sharded_cluster")
 
-    with Scenario("I drop role on fake cluster", flags=TE, requirements=[
+    with Scenario("I drop role on fake cluster", requirements=[
                 RQ_SRS_006_RBAC_Role_Drop_Cluster("1.0")]):
         with When("I run drop role command"):
             exitcode, message = errors.cluster_not_found("fake_cluster")
diff --git a/tests/testflows/rbac/tests/syntax/drop_row_policy.py b/tests/testflows/rbac/tests/syntax/drop_row_policy.py
index 2f04450a16a..357f5084bb3 100755
--- a/tests/testflows/rbac/tests/syntax/drop_row_policy.py
+++ b/tests/testflows/rbac/tests/syntax/drop_row_policy.py
@@ -39,21 +39,21 @@ def feature(self, node="clickhouse1"):
             node.query(f"CREATE TABLE default.foo (x UInt64, y String) Engine=Memory")
             node.query(f"CREATE TABLE default.foo2 (x UInt64, y String) Engine=Memory")
 
-        with Scenario("I drop row policy with no options", flags=TE, requirements=[
+        with Scenario("I drop row policy with no options", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_Drop("1.0"),
                 RQ_SRS_006_RBAC_RowPolicy_Drop_On("1.0")]):
             with cleanup(["policy1"]):
                 with When("I drop row policy"):
                     node.query("DROP ROW POLICY policy1 ON default.foo")
 
-        with Scenario("I drop row policy using short syntax with no options", flags=TE, requirements=[
+        with Scenario("I drop row policy using short syntax with no options", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_Drop("1.0"),
                 RQ_SRS_006_RBAC_RowPolicy_Drop_On("1.0")]):
             with cleanup(["policy2"]):
                 with When("I drop row policy short form"):
                     node.query("DROP POLICY policy2 ON default.foo")
 
-        with Scenario("I drop row policy, does not exist, throws exception", flags=TE, requirements=[
+        with Scenario("I drop row policy, does not exist, throws exception", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_Drop("1.0"),
                 RQ_SRS_006_RBAC_RowPolicy_Drop_On("1.0")]):
             policy = "policy1"
@@ -63,42 +63,42 @@ def feature(self, node="clickhouse1"):
                 node.query(f"DROP ROW POLICY {policy} ON default.foo", exitcode=exitcode, message=message)
             del policy
 
-        with Scenario("I drop row policy if exists, policy does exist", flags=TE, requirements=[
+        with Scenario("I drop row policy if exists, policy does exist", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_Drop_IfExists("1.0"),
                 RQ_SRS_006_RBAC_RowPolicy_Drop_On("1.0")]):
             with cleanup(["policy3"]):
                 with When("I drop row policy if exists"):
                     node.query("DROP ROW POLICY IF EXISTS policy3 ON default.foo")
 
-        with Scenario("I drop row policy if exists, policy doesn't exist", flags=TE, requirements=[
+        with Scenario("I drop row policy if exists, policy doesn't exist", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_Drop_IfExists("1.0"),
                 RQ_SRS_006_RBAC_RowPolicy_Drop_On("1.0")]):
             cleanup_policy("policy3")
             with When("I drop row policy if exists"):
                 node.query("DROP ROW POLICY IF EXISTS policy3 ON default.foo")
 
-        with Scenario("I drop multiple row policies", flags=TE, requirements=[
+        with Scenario("I drop multiple row policies", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_Drop("1.0"),
                 RQ_SRS_006_RBAC_RowPolicy_Drop_On("1.0")]):
             with cleanup(["policy3", "policy4"]):
                 with When("I drop multiple row policies"):
                     node.query("DROP ROW POLICY policy3, policy4 ON default.foo")
 
-        with Scenario("I drop row policy on multiple tables", flags=TE, requirements=[
+        with Scenario("I drop row policy on multiple tables", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_Drop("1.0"),
                 RQ_SRS_006_RBAC_RowPolicy_Drop_On("1.0")]):
             with cleanup(["policy3"], ["default.foo","default.foo2"]):
                 with When("I drop row policy on multiple tables"):
                     node.query("DROP ROW POLICY policy3 ON default.foo, default.foo2")
 
-        with Scenario("I drop multiple row policies on multiple tables", flags=TE, requirements=[
+        with Scenario("I drop multiple row policies on multiple tables", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_Drop("1.0"),
                 RQ_SRS_006_RBAC_RowPolicy_Drop_On("1.0")]):
             with cleanup(["policy3", "policy4"], ["default.foo","default.foo2"]):
                 with When("I drop the row policies from the tables"):
                     node.query("DROP ROW POLICY policy3 ON default.foo, policy4 ON default.foo2")
 
-        with Scenario("I drop row policy on cluster", flags=TE, requirements=[
+        with Scenario("I drop row policy on cluster", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_Drop_OnCluster("1.0"),
                 RQ_SRS_006_RBAC_RowPolicy_Drop_On("1.0")]):
             try:
@@ -110,7 +110,7 @@ def feature(self, node="clickhouse1"):
                 with Finally("I drop the row policy in case it still exists"):
                     node.query("DROP ROW POLICY IF EXISTS policy13 ON default.foo ON CLUSTER sharded_cluster")
 
-        with Scenario("I drop row policy on cluster after table", flags=TE, requirements=[
+        with Scenario("I drop row policy on cluster after table", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_Drop_OnCluster("1.0"),
                 RQ_SRS_006_RBAC_RowPolicy_Drop_On("1.0")]):
             try:
@@ -122,7 +122,7 @@ def feature(self, node="clickhouse1"):
                 with Finally("I drop the row policy in case it still exists"):
                     node.query("DROP ROW POLICY IF EXISTS policy12 ON default.foo ON CLUSTER sharded_cluster")
 
-        with Scenario("I drop row policy on fake cluster throws exception", flags=TE, requirements=[
+        with Scenario("I drop row policy on fake cluster throws exception", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_Drop_OnCluster("1.0"),
                 RQ_SRS_006_RBAC_RowPolicy_Drop_On("1.0")]):
             with When("I run drop row policy command"):
diff --git a/tests/testflows/rbac/tests/syntax/drop_settings_profile.py b/tests/testflows/rbac/tests/syntax/drop_settings_profile.py
index cb17815127f..514c3042679 100755
--- a/tests/testflows/rbac/tests/syntax/drop_settings_profile.py
+++ b/tests/testflows/rbac/tests/syntax/drop_settings_profile.py
@@ -30,13 +30,13 @@ def feature(self, node="clickhouse1"):
         with Given(f"I ensure that profile {profile} does not exist"):
             node.query(f"DROP SETTINGS PROFILE IF EXISTS {profile}")
 
-    with Scenario("I drop settings profile with no options", flags=TE, requirements=[
+    with Scenario("I drop settings profile with no options", requirements=[
             RQ_SRS_006_RBAC_SettingsProfile_Drop("1.0")]):
         with cleanup("profile0"):
             with When("I drop settings profile"):
                 node.query("DROP SETTINGS PROFILE profile0")
 
-    with Scenario("I drop settings profile, does not exist, throws exception", flags=TE, requirements=[
+    with Scenario("I drop settings profile, does not exist, throws exception", requirements=[
             RQ_SRS_006_RBAC_SettingsProfile_Drop("1.0")]):
         profile = "profile0"
         cleanup_profile(profile)
@@ -45,19 +45,19 @@ def feature(self, node="clickhouse1"):
             node.query("DROP SETTINGS PROFILE profile0", exitcode=exitcode, message=message)
         del profile
 
-    with Scenario("I drop settings profile short form", flags=TE, requirements=[
+    with Scenario("I drop settings profile short form", requirements=[
             RQ_SRS_006_RBAC_SettingsProfile_Drop("1.0")]):
         with cleanup("profile1"):
             with When("I drop settings profile short form"):
                 node.query("DROP PROFILE profile1")
 
-    with Scenario("I drop settings profile if exists, profile does exist", flags=TE, requirements=[
+    with Scenario("I drop settings profile if exists, profile does exist", requirements=[
             RQ_SRS_006_RBAC_SettingsProfile_Drop_IfExists("1.0")]):
         with cleanup("profile2"):
             with When("I drop settings profile if exists"):
                 node.query("DROP SETTINGS PROFILE IF EXISTS profile2")
 
-    with Scenario("I drop settings profile if exists, profile does not exist", flags=TE, requirements=[
+    with Scenario("I drop settings profile if exists, profile does not exist", requirements=[
             RQ_SRS_006_RBAC_SettingsProfile_Drop_IfExists("1.0")]):
         cleanup_profile("profile2")
         with When("I drop settings profile if exists"):
@@ -69,13 +69,13 @@ def feature(self, node="clickhouse1"):
             exitcode, message = errors.cannot_remove_settings_profile_default()
             node.query("DROP SETTINGS PROFILE default", exitcode=exitcode, message=message)
 
-    with Scenario("I drop multiple settings profiles", flags=TE, requirements=[
+    with Scenario("I drop multiple settings profiles", requirements=[
             RQ_SRS_006_RBAC_SettingsProfile_Drop("1.0")]):
         with cleanup("profile3"), cleanup("profile4"):
             with When("I drop multiple settings profiles"):
                 node.query("DROP SETTINGS PROFILE profile3, profile4")
 
-    with Scenario("I drop settings profile on cluster", flags=TE, requirements=[
+    with Scenario("I drop settings profile on cluster", requirements=[
             RQ_SRS_006_RBAC_SettingsProfile_Drop_OnCluster("1.0")]):
         try:
             with Given("I have a settings profile"):
@@ -86,7 +86,7 @@ def feature(self, node="clickhouse1"):
             with Finally("I drop the profile in case it still exists"):
                 node.query("DROP SETTINGS PROFILE IF EXISTS profile5 ON CLUSTER sharded_cluster")
 
-    with Scenario("I drop settings profile on fake cluster, throws exception", flags=TE, requirements=[
+    with Scenario("I drop settings profile on fake cluster, throws exception", requirements=[
             RQ_SRS_006_RBAC_SettingsProfile_Drop_OnCluster("1.0")]):
         with When("I run drop settings profile command"):
             exitcode, message = errors.cluster_not_found("fake_cluster")
diff --git a/tests/testflows/rbac/tests/syntax/drop_user.py b/tests/testflows/rbac/tests/syntax/drop_user.py
index 13f0093080a..9bd2433d487 100755
--- a/tests/testflows/rbac/tests/syntax/drop_user.py
+++ b/tests/testflows/rbac/tests/syntax/drop_user.py
@@ -30,13 +30,13 @@ def feature(self, node="clickhouse1"):
         with Given(f"I ensure that user {user} does not exist"):
             node.query(f"DROP USER IF EXISTS {user}")
 
-    with Scenario("I drop user with no options", flags=TE, requirements=[
+    with Scenario("I drop user with no options", requirements=[
             RQ_SRS_006_RBAC_User_Drop("1.0")]):
         with setup("user0"):
             with When("I drop user"):
                 node.query("DROP USER user0")
 
-    with Scenario("I drop user, does not exist, throws exception", flags=TE, requirements=[
+    with Scenario("I drop user, does not exist, throws exception", requirements=[
             RQ_SRS_006_RBAC_User_Drop("1.0")]):
             user = "user0"
             cleanup_user(user)
@@ -45,31 +45,31 @@ def feature(self, node="clickhouse1"):
                 node.query(f"DROP USER {user}", exitcode=exitcode, message=message)
             del user
 
-    with Scenario("I drop multiple users", flags=TE, requirements=[
+    with Scenario("I drop multiple users", requirements=[
             RQ_SRS_006_RBAC_User_Drop("1.0")]):
         with setup("user1"), setup("user2"):
             with When("I drop multiple users"):
                 node.query("DROP USER user1, user2")
 
-    with Scenario("I drop user if exists, user does exist", flags=TE, requirements=[
+    with Scenario("I drop user if exists, user does exist", requirements=[
             RQ_SRS_006_RBAC_User_Drop_IfExists("1.0")]):
         with setup("user3"):
             with When("I drop user that exists"):
                 node.query("DROP USER IF EXISTS user3")
 
-    with Scenario("I drop user if exists, user does not exist", flags=TE, requirements=[
+    with Scenario("I drop user if exists, user does not exist", requirements=[
             RQ_SRS_006_RBAC_User_Drop_IfExists("1.0")]):
         cleanup_user("user3")
         with When("I drop nonexistant user"):
             node.query("DROP USER IF EXISTS user3")
 
-    with Scenario("I drop default user, throws error", flags=TE, requirements=[
+    with Scenario("I drop default user, throws error", requirements=[
             RQ_SRS_006_RBAC_User_Drop("1.0")]):
         with When("I drop user"):
             exitcode, message = errors.cannot_remove_user_default()
             node.query("DROP USER default", exitcode=exitcode, message=message)
 
-    with Scenario("I drop multiple users where one does not exist", flags=TE, requirements=[
+    with Scenario("I drop multiple users where one does not exist", requirements=[
             RQ_SRS_006_RBAC_User_Drop_IfExists("1.0")]):
         with setup("user3"):
             with When("I drop multiple users where one does not exist"):
@@ -80,7 +80,7 @@ def feature(self, node="clickhouse1"):
         with When("I drop the nonexistant users"):
             node.query("DROP USER IF EXISTS user5, user6")
 
-    with Scenario("I drop user from specific cluster", flags=TE, requirements=[
+    with Scenario("I drop user from specific cluster", requirements=[
             RQ_SRS_006_RBAC_User_Drop_OnCluster("1.0")]):
        try:
             with Given("I have a user on cluster"):
@@ -91,7 +91,7 @@ def feature(self, node="clickhouse1"):
            with Finally("I make sure the user is dropped"):
    	        node.query("DROP USER IF EXISTS user4 ON CLUSTER sharded_cluster")
 
-    with Scenario("I drop user from fake cluster", flags=TE, requirements=[
+    with Scenario("I drop user from fake cluster", requirements=[
             RQ_SRS_006_RBAC_User_Drop_OnCluster("1.0")]):
         with When("I drop a user from the fake cluster"):
             exitcode, message = errors.cluster_not_found("fake_cluster")
diff --git a/tests/testflows/rbac/tests/syntax/feature.py b/tests/testflows/rbac/tests/syntax/feature.py
index aac786ff85c..b7c23f8d7ee 100755
--- a/tests/testflows/rbac/tests/syntax/feature.py
+++ b/tests/testflows/rbac/tests/syntax/feature.py
@@ -3,32 +3,32 @@ from testflows.core import *
 @TestFeature
 @Name("syntax")
 def feature(self):
-    Feature(run=load("rbac.tests.syntax.create_user", "feature"), flags=TE)
-    Feature(run=load("rbac.tests.syntax.alter_user", "feature"), flags=TE)
-    Feature(run=load("rbac.tests.syntax.drop_user", "feature"), flags=TE)
-    Feature(run=load("rbac.tests.syntax.show_create_user", "feature"), flags=TE)
-    Feature(run=load("rbac.tests.syntax.create_role", "feature"), flags=TE)
-    Feature(run=load("rbac.tests.syntax.alter_role", "feature"), flags=TE)
-    Feature(run=load("rbac.tests.syntax.drop_role", "feature"), flags=TE)
-    Feature(run=load("rbac.tests.syntax.show_create_role", "feature"), flags=TE)
-    Feature(run=load("rbac.tests.syntax.grant_role", "feature"), flags=TE)
-    Feature(run=load("rbac.tests.syntax.grant_privilege","feature"), flags=TE)
-    Feature(run=load("rbac.tests.syntax.show_grants", "feature"), flags=TE)
-    Feature(run=load("rbac.tests.syntax.revoke_role", "feature"), flags=TE)
-    Feature(run=load("rbac.tests.syntax.revoke_privilege","feature"), flags=TE)
-    Feature(run=load("rbac.tests.syntax.create_row_policy", "feature"), flags=TE)
-    Feature(run=load("rbac.tests.syntax.alter_row_policy", "feature"), flags=TE)
-    Feature(run=load("rbac.tests.syntax.drop_row_policy", "feature"), flags=TE)
-    Feature(run=load("rbac.tests.syntax.show_create_row_policy", "feature"), flags=TE)
-    Feature(run=load("rbac.tests.syntax.show_row_policies", "feature"), flags=TE)
-    Feature(run=load("rbac.tests.syntax.create_quota", "feature"), flags=TE)
-    Feature(run=load("rbac.tests.syntax.alter_quota", "feature"), flags=TE)
-    Feature(run=load("rbac.tests.syntax.drop_quota", "feature"), flags=TE)
-    Feature(run=load("rbac.tests.syntax.show_create_quota", "feature"), flags=TE)
-    Feature(run=load("rbac.tests.syntax.show_quotas", "feature"), flags=TE)
-    Feature(run=load("rbac.tests.syntax.create_settings_profile", "feature"), flags=TE)
-    Feature(run=load("rbac.tests.syntax.alter_settings_profile", "feature"), flags=TE)
-    Feature(run=load("rbac.tests.syntax.drop_settings_profile", "feature"), flags=TE)
-    Feature(run=load("rbac.tests.syntax.show_create_settings_profile", "feature"), flags=TE)
-    Feature(run=load("rbac.tests.syntax.set_default_role", "feature"), flags=TE)
-    Feature(run=load("rbac.tests.syntax.set_role","feature"), flags=TE)
\ No newline at end of file
+    Feature(run=load("rbac.tests.syntax.create_user", "feature"))
+    Feature(run=load("rbac.tests.syntax.alter_user", "feature"))
+    Feature(run=load("rbac.tests.syntax.drop_user", "feature"))
+    Feature(run=load("rbac.tests.syntax.show_create_user", "feature"))
+    Feature(run=load("rbac.tests.syntax.create_role", "feature"))
+    Feature(run=load("rbac.tests.syntax.alter_role", "feature"))
+    Feature(run=load("rbac.tests.syntax.drop_role", "feature"))
+    Feature(run=load("rbac.tests.syntax.show_create_role", "feature"))
+    Feature(run=load("rbac.tests.syntax.grant_role", "feature"))
+    Feature(run=load("rbac.tests.syntax.grant_privilege","feature"))
+    Feature(run=load("rbac.tests.syntax.show_grants", "feature"))
+    Feature(run=load("rbac.tests.syntax.revoke_role", "feature"))
+    Feature(run=load("rbac.tests.syntax.revoke_privilege","feature"))
+    Feature(run=load("rbac.tests.syntax.create_row_policy", "feature"))
+    Feature(run=load("rbac.tests.syntax.alter_row_policy", "feature"))
+    Feature(run=load("rbac.tests.syntax.drop_row_policy", "feature"))
+    Feature(run=load("rbac.tests.syntax.show_create_row_policy", "feature"))
+    Feature(run=load("rbac.tests.syntax.show_row_policies", "feature"))
+    Feature(run=load("rbac.tests.syntax.create_quota", "feature"))
+    Feature(run=load("rbac.tests.syntax.alter_quota", "feature"))
+    Feature(run=load("rbac.tests.syntax.drop_quota", "feature"))
+    Feature(run=load("rbac.tests.syntax.show_create_quota", "feature"))
+    Feature(run=load("rbac.tests.syntax.show_quotas", "feature"))
+    Feature(run=load("rbac.tests.syntax.create_settings_profile", "feature"))
+    Feature(run=load("rbac.tests.syntax.alter_settings_profile", "feature"))
+    Feature(run=load("rbac.tests.syntax.drop_settings_profile", "feature"))
+    Feature(run=load("rbac.tests.syntax.show_create_settings_profile", "feature"))
+    Feature(run=load("rbac.tests.syntax.set_default_role", "feature"))
+    Feature(run=load("rbac.tests.syntax.set_role","feature"))
\ No newline at end of file
diff --git a/tests/testflows/rbac/tests/syntax/grant_privilege.py b/tests/testflows/rbac/tests/syntax/grant_privilege.py
index 2108b101c44..817a70498f4 100755
--- a/tests/testflows/rbac/tests/syntax/grant_privilege.py
+++ b/tests/testflows/rbac/tests/syntax/grant_privilege.py
@@ -82,7 +82,7 @@ def feature(self, node="clickhouse1"):
     Scenario(run=grant_privileges)
 
     # with nonexistant object name, GRANT assumes type role
-    with Scenario("I grant privilege to role that does not exist", flags=TE, requirements=[
+    with Scenario("I grant privilege to role that does not exist", requirements=[
             RQ_SRS_006_RBAC_Grant_Privilege_None("1.0")]):
         with Given("I ensure that role does not exist"):
             node.query("DROP ROLE IF EXISTS role0")
@@ -90,35 +90,35 @@ def feature(self, node="clickhouse1"):
             exitcode, message = errors.role_not_found_in_disk(name="role0")
             node.query("GRANT NONE TO role0", exitcode=exitcode, message=message)
 
-    with Scenario("I grant privilege ON CLUSTER", flags=TE, requirements=[
+    with Scenario("I grant privilege ON CLUSTER", requirements=[
             RQ_SRS_006_RBAC_Grant_Privilege_OnCluster("1.0"),
             RQ_SRS_006_RBAC_Grant_Privilege_None("1.0")]):
         with setup(node):
             with When("I grant privilege ON CLUSTER"):
                 node.query("GRANT ON CLUSTER sharded_cluster NONE TO user0")
 
-    with Scenario("I grant privilege on fake cluster, throws exception", flags=TE, requirements=[
+    with Scenario("I grant privilege on fake cluster, throws exception", requirements=[
             RQ_SRS_006_RBAC_Grant_Privilege_OnCluster("1.0")]):
         with setup(node):
             with When("I grant privilege ON CLUSTER"):
                 exitcode, message = errors.cluster_not_found("fake_cluster")
                 node.query("GRANT ON CLUSTER fake_cluster NONE TO user0", exitcode=exitcode, message=message)
 
-    with Scenario("I grant privilege to multiple users and roles", flags=TE, requirements=[
+    with Scenario("I grant privilege to multiple users and roles", requirements=[
             RQ_SRS_006_RBAC_Grant_Privilege_To("1.0"),
             RQ_SRS_006_RBAC_Grant_Privilege_None("1.0")]):
         with setup(node):
             with When("I grant privilege to several users"):
                 node.query("GRANT NONE TO user0, user1, role1")
 
-    with Scenario("I grant privilege to current user", flags=TE, requirements=[
+    with Scenario("I grant privilege to current user", requirements=[
             RQ_SRS_006_RBAC_Grant_Privilege_ToCurrentUser("1.0"),
             RQ_SRS_006_RBAC_Grant_Privilege_None("1.0")]):
         with setup(node):
             with When("I grant privilege to current user"):
                 node.query("GRANT NONE TO CURRENT_USER", settings = [("user","user0")])
 
-    with Scenario("I grant privilege NONE to default user, throws exception", flags=TE, requirements=[
+    with Scenario("I grant privilege NONE to default user, throws exception", requirements=[
             RQ_SRS_006_RBAC_Grant_Privilege_ToCurrentUser("1.0"),
             RQ_SRS_006_RBAC_Grant_Privilege_None("1.0")]):
         with setup(node):
@@ -126,7 +126,7 @@ def feature(self, node="clickhouse1"):
                 exitcode, message = errors.cannot_update_default()
                 node.query("GRANT NONE TO CURRENT_USER", exitcode=exitcode, message=message)
 
-    with Scenario("I grant privilege with grant option", flags=TE, requirements=[
+    with Scenario("I grant privilege with grant option", requirements=[
             RQ_SRS_006_RBAC_Grant_Privilege_GrantOption("1.0"),
             RQ_SRS_006_RBAC_Grant_Privilege_None("1.0")]):
         with setup(node):
diff --git a/tests/testflows/rbac/tests/syntax/grant_role.py b/tests/testflows/rbac/tests/syntax/grant_role.py
index 26c9fb619e9..af69e5f3751 100755
--- a/tests/testflows/rbac/tests/syntax/grant_role.py
+++ b/tests/testflows/rbac/tests/syntax/grant_role.py
@@ -33,7 +33,7 @@ def feature(self, node="clickhouse1"):
                 for j in range(roles):
                     node.query(f"DROP ROLE IF EXISTS role{j}")
 
-    with Scenario("I grant a role to a user",flags=TE, requirements=[
+    with Scenario("I grant a role to a user", requirements=[
             RQ_SRS_006_RBAC_Grant_Role("1.0")]):
         with setup(1,1):
             with When("I grant a role"):
@@ -61,19 +61,19 @@ def feature(self, node="clickhouse1"):
                 exitcode, message = errors.role_not_found_in_disk(name="role0")
                 node.query("GRANT role0 TO user0", exitcode=exitcode, message=message)
 
-    with Scenario("I grant a role to multiple users", flags=TE, requirements=[
+    with Scenario("I grant a role to multiple users", requirements=[
             RQ_SRS_006_RBAC_Grant_Role("1.0")]):
         with setup(2,1):
             with When("I grant role to a multiple users"):
                 node.query("GRANT role0 TO user0, user1")
 
-    with Scenario("I grant multiple roles to multiple users", flags=TE, requirements=[
+    with Scenario("I grant multiple roles to multiple users", requirements=[
             RQ_SRS_006_RBAC_Grant_Role("1.0")]):
         with setup(2,2):
             with When("I grant multiple roles to multiple users"):
                 node.query("GRANT role0, role1 TO user0, user1")
 
-    with Scenario("I grant role to current user", flags=TE, requirements=[
+    with Scenario("I grant role to current user", requirements=[
             RQ_SRS_006_RBAC_Grant_Role_CurrentUser("1.0")]):
         with setup(1,1):
             with Given("I have a user with access management privilege"):
@@ -81,20 +81,20 @@ def feature(self, node="clickhouse1"):
             with When("I grant role to current user"):
                 node.query("GRANT role0 TO CURRENT_USER", settings = [("user","user0")])
 
-    with Scenario("I grant role to default user, throws exception", flags=TE, requirements=[
+    with Scenario("I grant role to default user, throws exception", requirements=[
             RQ_SRS_006_RBAC_Grant_Role_CurrentUser("1.0")]):
         with setup(1,1):
             with When("I grant role to default user"):
                 exitcode, message = errors.cannot_update_default()
                 node.query("GRANT role0 TO CURRENT_USER", exitcode=exitcode, message=message)
 
-    with Scenario("I grant role to user with admin option", flags=TE, requirements=[
+    with Scenario("I grant role to user with admin option", requirements=[
             RQ_SRS_006_RBAC_Grant_Role_AdminOption("1.0")]):
         with setup(1,1):
             with When("I grant role to a user with admin option"):
                 node.query("GRANT role0 TO user0 WITH ADMIN OPTION")
 
-    with Scenario("I grant role to user on cluster", flags=TE, requirements=[
+    with Scenario("I grant role to user on cluster", requirements=[
             RQ_SRS_006_RBAC_Grant_Role_OnCluster("1.0")]):
         try:
             with Given("I have a user and a role on a cluster"):
@@ -107,7 +107,7 @@ def feature(self, node="clickhouse1"):
                 node.query("DROP USER IF EXISTS user0 ON CLUSTER sharded_cluster")
                 node.query("DROP ROLE IF EXISTS role0 ON CLUSTER sharded_cluster")
 
-    with Scenario("I grant role to user on fake cluster, throws exception", flags=TE, requirements=[
+    with Scenario("I grant role to user on fake cluster, throws exception", requirements=[
             RQ_SRS_006_RBAC_Grant_Role_OnCluster("1.0")]):
         with setup(1,1):
             with When("I grant the role to the user"):
diff --git a/tests/testflows/rbac/tests/syntax/revoke_privilege.py b/tests/testflows/rbac/tests/syntax/revoke_privilege.py
index a0fb714c823..3e23f2ddfc9 100755
--- a/tests/testflows/rbac/tests/syntax/revoke_privilege.py
+++ b/tests/testflows/rbac/tests/syntax/revoke_privilege.py
@@ -43,7 +43,9 @@ def revoke_privileges(self, privilege, on, allow_column, allow_introspection, no
     revoke_privilege(privilege=privilege, on=on, allow_column=allow_column, allow_introspection=allow_introspection, node=node)
 
 @TestOutline(Scenario)
-@Requirements([RQ_SRS_006_RBAC_Revoke_Privilege_Any("1.0") , RQ_SRS_006_RBAC_Revoke_Privilege_PrivelegeColumns("1.0")])
+@Requirements(
+    RQ_SRS_006_RBAC_Revoke_Privilege_PrivilegeColumns("1.0"),
+)
 def revoke_privilege(self, privilege, on, allow_column, allow_introspection, node="clickhouse1"):
     node = self.context.cluster.node(node)
     for on_ in on:
@@ -78,14 +80,14 @@ def feature(self, node="clickhouse1"):
 
     Scenario(run=revoke_privileges)
 
-    with Scenario("I revoke privilege ON CLUSTER", flags=TE, requirements=[
+    with Scenario("I revoke privilege ON CLUSTER", requirements=[
             RQ_SRS_006_RBAC_Revoke_Privilege_Cluster("1.0"),
             RQ_SRS_006_RBAC_Revoke_Privilege_None("1.0")]):
         with setup(node):
             with When("I revoke privilege ON CLUSTER"):
                 node.query("REVOKE ON CLUSTER sharded_cluster NONE FROM user0")
 
-    with Scenario("I revoke privilege ON fake CLUSTER, throws exception", flags=TE, requirements=[
+    with Scenario("I revoke privilege ON fake CLUSTER, throws exception", requirements=[
             RQ_SRS_006_RBAC_Revoke_Privilege_Cluster("1.0"),
             RQ_SRS_006_RBAC_Revoke_Privilege_None("1.0")]):
         with setup(node):
@@ -94,21 +96,21 @@ def feature(self, node="clickhouse1"):
                 node.query("REVOKE ON CLUSTER fake_cluster NONE FROM user0",
                             exitcode=exitcode, message=message)
 
-    with Scenario("I revoke privilege from multiple users and roles", flags=TE, requirements=[
+    with Scenario("I revoke privilege from multiple users and roles", requirements=[
             RQ_SRS_006_RBAC_Revoke_Privilege_From("1.0"),
             RQ_SRS_006_RBAC_Revoke_Privilege_None("1.0")]):
         with setup(node):
             with When("I revoke privilege from multiple users"):
                 node.query("REVOKE NONE FROM user0, user1, role1")
 
-    with Scenario("I revoke privilege from current user", flags=TE, requirements=[
+    with Scenario("I revoke privilege from current user", requirements=[
             RQ_SRS_006_RBAC_Revoke_Privilege_From("1.0"),
             RQ_SRS_006_RBAC_Revoke_Privilege_None("1.0")]):
         with setup(node):
             with When("I revoke privilege from current user"):
                 node.query("REVOKE NONE FROM CURRENT_USER", settings = [("user","user0")])
 
-    with Scenario("I revoke privilege from all users", flags=TE, requirements=[
+    with Scenario("I revoke privilege from all users", requirements=[
             RQ_SRS_006_RBAC_Revoke_Privilege_From("1.0"),
             RQ_SRS_006_RBAC_Revoke_Privilege_None("1.0")]):
         with setup(node):
@@ -116,7 +118,7 @@ def feature(self, node="clickhouse1"):
                 exitcode, message = errors.cannot_update_default()
                 node.query("REVOKE NONE FROM ALL", exitcode=exitcode,message=message)
 
-    with Scenario("I revoke privilege from default user", flags=TE, requirements=[
+    with Scenario("I revoke privilege from default user", requirements=[
             RQ_SRS_006_RBAC_Revoke_Privilege_From("1.0"),
             RQ_SRS_006_RBAC_Revoke_Privilege_None("1.0")]):
         with setup(node):
@@ -125,7 +127,7 @@ def feature(self, node="clickhouse1"):
                 node.query("REVOKE NONE FROM default", exitcode=exitcode,message=message)
 
     #By default, ClickHouse treats unnamed object as role
-    with Scenario("I revoke privilege from nonexistent role, throws exception", flags=TE, requirements=[
+    with Scenario("I revoke privilege from nonexistent role, throws exception", requirements=[
             RQ_SRS_006_RBAC_Revoke_Privilege_From("1.0"),
             RQ_SRS_006_RBAC_Revoke_Privilege_None("1.0")]):
         role = "role5"
@@ -135,7 +137,7 @@ def feature(self, node="clickhouse1"):
             exitcode, message = errors.role_not_found_in_disk(role)
             node.query(f"REVOKE NONE FROM {role}", exitcode=exitcode,message=message)
 
-    with Scenario("I revoke privilege from ALL EXCEPT nonexistent role, throws exception", flags=TE, requirements=[
+    with Scenario("I revoke privilege from ALL EXCEPT nonexistent role, throws exception", requirements=[
             RQ_SRS_006_RBAC_Revoke_Privilege_From("1.0"),
             RQ_SRS_006_RBAC_Revoke_Privilege_None("1.0")]):
         role = "role5"
@@ -145,14 +147,14 @@ def feature(self, node="clickhouse1"):
             exitcode, message = errors.role_not_found_in_disk(role)
             node.query(f"REVOKE NONE FROM ALL EXCEPT {role}", exitcode=exitcode,message=message)
 
-    with Scenario("I revoke privilege from all except some users and roles", flags=TE, requirements=[
+    with Scenario("I revoke privilege from all except some users and roles", requirements=[
             RQ_SRS_006_RBAC_Revoke_Privilege_From("1.0"),
             RQ_SRS_006_RBAC_Revoke_Privilege_None("1.0")]):
         with setup(node):
             with When("I revoke privilege all except some users"):
                 node.query("REVOKE NONE FROM ALL EXCEPT default, user0, role1")
 
-    with Scenario("I revoke privilege from all except current user", flags=TE, requirements=[
+    with Scenario("I revoke privilege from all except current user", requirements=[
             RQ_SRS_006_RBAC_Revoke_Privilege_From("1.0"),
             RQ_SRS_006_RBAC_Revoke_Privilege_None("1.0")]):
         with setup(node):
diff --git a/tests/testflows/rbac/tests/syntax/revoke_role.py b/tests/testflows/rbac/tests/syntax/revoke_role.py
index 9d87257b054..ea8b874ff51 100755
--- a/tests/testflows/rbac/tests/syntax/revoke_role.py
+++ b/tests/testflows/rbac/tests/syntax/revoke_role.py
@@ -37,7 +37,7 @@ def feature(self, node="clickhouse1"):
                 for i in range(roles):
                     node.query(f"DROP ROLE IF EXISTS role{i}")
 
-    with Scenario("I revoke a role from a user",flags=TE, requirements=[
+    with Scenario("I revoke a role from a user", requirements=[
             RQ_SRS_006_RBAC_Revoke_Role("1.0")]):
         with setup():
             with When("I revoke a role"):
@@ -73,19 +73,19 @@ def feature(self, node="clickhouse1"):
                 exitcode, message = errors.role_not_found_in_disk(name="role0")
                 node.query("REVOKE role0 FROM user0", exitcode=exitcode, message=message)
 
-    with Scenario("I revoke a role from multiple users", flags=TE, requirements=[
+    with Scenario("I revoke a role from multiple users", requirements=[
             RQ_SRS_006_RBAC_Revoke_Role("1.0")]):
         with setup():
             with When("I revoke a role from multiple users"):
                 node.query("REVOKE role0 FROM user0, user1")
 
-    with Scenario("I revoke multiple roles from multiple users", flags=TE, requirements=[
+    with Scenario("I revoke multiple roles from multiple users", requirements=[
             RQ_SRS_006_RBAC_Revoke_Role("1.0")]):
         with setup():
             node.query("REVOKE role0, role1 FROM user0, user1")
 
     #user is default, expect exception
-    with Scenario("I revoke a role from default user", flags=TE, requirements=[
+    with Scenario("I revoke a role from default user", requirements=[
             RQ_SRS_006_RBAC_Revoke_Role("1.0"),
             RQ_SRS_006_RBAC_Revoke_Role_Keywords("1.0")]):
         with setup():
@@ -94,7 +94,7 @@ def feature(self, node="clickhouse1"):
                 node.query("REVOKE role0 FROM CURRENT_USER", exitcode=exitcode, message=message)
 
     #user is user0
-    with Scenario("I revoke a role from current user", flags=TE, requirements=[
+    with Scenario("I revoke a role from current user", requirements=[
             RQ_SRS_006_RBAC_Revoke_Role("1.0"),
             RQ_SRS_006_RBAC_Revoke_Role_Keywords("1.0")]):
         with setup():
@@ -102,7 +102,7 @@ def feature(self, node="clickhouse1"):
                 node.query("REVOKE role0 FROM CURRENT_USER", settings = [("user","user0")])
 
     #user is default, expect exception
-    with Scenario("I revoke a role from all", flags=TE, requirements=[
+    with Scenario("I revoke a role from all", requirements=[
             RQ_SRS_006_RBAC_Revoke_Role("1.0"),
             RQ_SRS_006_RBAC_Revoke_Role_Keywords("1.0")]):
         with setup():
@@ -111,7 +111,7 @@ def feature(self, node="clickhouse1"):
                 node.query("REVOKE role0 FROM ALL", exitcode=exitcode, message=message)
 
     #user is default, expect exception
-    with Scenario("I revoke multiple roles from all", flags=TE, requirements=[
+    with Scenario("I revoke multiple roles from all", requirements=[
             RQ_SRS_006_RBAC_Revoke_Role("1.0"),
             RQ_SRS_006_RBAC_Revoke_Role_Keywords("1.0")]):
         with setup():
@@ -119,14 +119,14 @@ def feature(self, node="clickhouse1"):
                 exitcode, message = errors.cannot_update_default()
                 node.query("REVOKE role0, role1 FROM ALL", exitcode=exitcode, message=message)
 
-    with Scenario("I revoke a role from all but current user", flags=TE, requirements=[
+    with Scenario("I revoke a role from all but current user", requirements=[
             RQ_SRS_006_RBAC_Revoke_Role("1.0"),
             RQ_SRS_006_RBAC_Revoke_Role_Keywords("1.0")]):
         with setup():
             with When("I revoke a role from all except current"):
                 node.query("REVOKE role0 FROM ALL EXCEPT CURRENT_USER")
 
-    with Scenario("I revoke a role from all but default user", flags=TE, requirements=[
+    with Scenario("I revoke a role from all but default user", requirements=[
             RQ_SRS_006_RBAC_Revoke_Role("1.0"),
             RQ_SRS_006_RBAC_Revoke_Role_Keywords("1.0")]):
         with setup():
@@ -134,26 +134,26 @@ def feature(self, node="clickhouse1"):
                 node.query("REVOKE role0 FROM ALL EXCEPT default",
                             settings = [("user","user0")])
 
-    with Scenario("I revoke multiple roles from all but default user", flags=TE, requirements=[
+    with Scenario("I revoke multiple roles from all but default user", requirements=[
             RQ_SRS_006_RBAC_Revoke_Role("1.0"),
             RQ_SRS_006_RBAC_Revoke_Role_Keywords("1.0")]):
         with setup():
             with When("I revoke multiple roles from all except default"):
                 node.query("REVOKE role0, role1 FROM ALL EXCEPT default", settings = [("user","user0")])
 
-    with Scenario("I revoke a role from a role", flags=TE, requirements=[
+    with Scenario("I revoke a role from a role", requirements=[
             RQ_SRS_006_RBAC_Revoke_Role("1.0")]):
         with setup():
             with When("I revoke a role from a role"):
                 node.query("REVOKE role0 FROM role1")
 
-    with Scenario("I revoke a role from a role and a user", flags=TE, requirements=[
+    with Scenario("I revoke a role from a role and a user", requirements=[
             RQ_SRS_006_RBAC_Revoke_Role("1.0")]):
         with setup():
             with When("I revoke a role from multiple roles"):
                 node.query("REVOKE role0 FROM role1, user0")
 
-    with Scenario("I revoke a role from a user on cluster", flags=TE, requirements=[
+    with Scenario("I revoke a role from a user on cluster", requirements=[
             RQ_SRS_006_RBAC_Revoke_Role_Cluster("1.0")]):
         with Given("I have a role and a user on a cluster"):
             node.query("CREATE USER OR REPLACE user0 ON CLUSTER sharded_cluster")
@@ -164,13 +164,14 @@ def feature(self, node="clickhouse1"):
             node.query("DROP USER IF EXISTS user0 ON CLUSTER sharded_cluster")
             node.query("DROP ROLE IF EXISTS role0 ON CLUSTER sharded_cluster")
 
-    with Scenario("I revoke a role on fake cluster, throws exception", flags=TE, requirements=[
+    with Scenario("I revoke a role on fake cluster, throws exception", requirements=[
             RQ_SRS_006_RBAC_Revoke_Role_Cluster("1.0")]):
-        with When("I revoke a role from user on a cluster"):
-            exitcode, message = errors.cluster_not_found("fake_cluster")
-            node.query("REVOKE ON CLUSTER fake_cluster role0 FROM user0", exitcode=exitcode, message=message)
+        with setup():
+            with When("I revoke a role from user on a cluster"):
+                exitcode, message = errors.cluster_not_found("fake_cluster")
+                node.query("REVOKE ON CLUSTER fake_cluster role0 FROM user0", exitcode=exitcode, message=message)
 
-    with Scenario("I revoke multiple roles from multiple users on cluster", flags=TE, requirements=[
+    with Scenario("I revoke multiple roles from multiple users on cluster", requirements=[
             RQ_SRS_006_RBAC_Revoke_Role("1.0"),
             RQ_SRS_006_RBAC_Revoke_Role_Cluster("1.0")]):
         with Given("I have multiple roles and multiple users on a cluster"):
@@ -184,13 +185,13 @@ def feature(self, node="clickhouse1"):
                 node.query(f"DROP USER IF EXISTS user{i} ON CLUSTER sharded_cluster")
                 node.query(f"DROP ROLE IF EXISTS role{i} ON CLUSTER sharded_cluster")
 
-    with Scenario("I revoke admin option for role from a user", flags=TE, requirements=[
+    with Scenario("I revoke admin option for role from a user", requirements=[
             RQ_SRS_006_RBAC_Revoke_AdminOption("1.0")]):
         with setup():
             with When("I revoke admin option for role from a user"):
                 node.query("REVOKE ADMIN OPTION FOR role0 FROM user0")
 
-    with Scenario("I revoke admin option for multiple roles from multiple users", flags=TE, requirements=[
+    with Scenario("I revoke admin option for multiple roles from multiple users", requirements=[
             RQ_SRS_006_RBAC_Revoke_Role("1.0"),
             RQ_SRS_006_RBAC_Revoke_AdminOption("1.0")]):
         with setup():
diff --git a/tests/testflows/rbac/tests/syntax/set_default_role.py b/tests/testflows/rbac/tests/syntax/set_default_role.py
index a7801e04b23..ed50810eba7 100755
--- a/tests/testflows/rbac/tests/syntax/set_default_role.py
+++ b/tests/testflows/rbac/tests/syntax/set_default_role.py
@@ -71,43 +71,43 @@ def feature(self, node="clickhouse1"):
                 node.query(f"CREATE USER user{i}")
             node.query(f"GRANT role0, role1 TO user0, user1")
 
-        with Scenario("I set default role for a user to none", flags = TE, requirements=[
+        with Scenario("I set default role for a user to none", requirements=[
                 RQ_SRS_006_RBAC_SetDefaultRole_None("1.0")]):
             with When("I set no roles default for user"):
                 node.query("SET DEFAULT ROLE NONE TO user0")
 
-        with Scenario("I set one default role for a user", flags = TE, requirements=[
+        with Scenario("I set one default role for a user", requirements=[
                 RQ_SRS_006_RBAC_SetDefaultRole("1.0")]):
             with When("I set a default role for user "):
                 node.query("SET DEFAULT ROLE role0 TO user0")
 
-        with Scenario("I set one default role for user default, throws exception", flags = TE, requirements=[
+        with Scenario("I set one default role for user default, throws exception", requirements=[
                 RQ_SRS_006_RBAC_SetDefaultRole("1.0")]):
             with When("I set a default role for default"):
                 exitcode, message = errors.cannot_update_default()
                 node.query("SET DEFAULT ROLE role0 TO default", exitcode=exitcode, message=message)
 
-        with Scenario("I set multiple default roles for a user", flags = TE, requirements=[
+        with Scenario("I set multiple default roles for a user", requirements=[
                 RQ_SRS_006_RBAC_SetDefaultRole("1.0")]):
             with When("I set multiple default roles to user"):
                 node.query("SET DEFAULT ROLE role0, role1 TO user0")
 
-        with Scenario("I set multiple default roles for multiple users", flags = TE, requirements=[
+        with Scenario("I set multiple default roles for multiple users", requirements=[
                 RQ_SRS_006_RBAC_SetDefaultRole("1.0")]):
             with When("I set multiple default roles to multiple users"):
                 node.query("SET DEFAULT ROLE role0, role1 TO user0, user1")
 
-        with Scenario("I set all roles as default for a user", flags = TE, requirements=[
+        with Scenario("I set all roles as default for a user", requirements=[
                 RQ_SRS_006_RBAC_SetDefaultRole_All("1.0")]):
             with When("I set all roles default to user"):
                 node.query("SET DEFAULT ROLE ALL TO user0")
 
-        with Scenario("I set all roles except one for a user", flags = TE, requirements=[
+        with Scenario("I set all roles except one for a user", requirements=[
                 RQ_SRS_006_RBAC_SetDefaultRole_AllExcept("1.0")]):
             with When("I set all except one role default to user"):
                 node.query("SET DEFAULT ROLE ALL EXCEPT role0 TO user0")
 
-        with Scenario("I set default role for current user", flags = TE, requirements=[
+        with Scenario("I set default role for current user", requirements=[
                 RQ_SRS_006_RBAC_SetDefaultRole_CurrentUser("1.0")]):
             with When("I set default role to current user"):
                 node.query("GRANT ACCESS MANAGEMENT ON *.* TO user0")
diff --git a/tests/testflows/rbac/tests/syntax/set_role.py b/tests/testflows/rbac/tests/syntax/set_role.py
index 97a121797ac..3d3d4d00fac 100755
--- a/tests/testflows/rbac/tests/syntax/set_role.py
+++ b/tests/testflows/rbac/tests/syntax/set_role.py
@@ -29,17 +29,17 @@ def feature(self, node="clickhouse1"):
                 for i in range(roles):
                     node.query(f"DROP ROLE IF EXISTS role{i}")
 
-    with Scenario("I set default role for current user", flags = TE, requirements=[
+    with Scenario("I set default role for current user", requirements=[
             RQ_SRS_006_RBAC_SetRole_Default("1.0")]):
         with When("I set default role for current user"):
             node.query("SET ROLE DEFAULT")
 
-    with Scenario("I set no role for current user", flags = TE, requirements=[
+    with Scenario("I set no role for current user", requirements=[
             RQ_SRS_006_RBAC_SetRole_None("1.0")]):
             with When("I set no role for current user"):
                 node.query("SET ROLE NONE")
 
-    with Scenario("I set nonexistent role, throws exception", flags = TE, requirements=[
+    with Scenario("I set nonexistent role, throws exception", requirements=[
             RQ_SRS_006_RBAC_SetRole_None("1.0")]):
             with Given("I ensure that role role5 does not exist"):
                 node.query("DROP ROLE IF EXISTS role5")
@@ -47,7 +47,7 @@ def feature(self, node="clickhouse1"):
                 exitcode, message = errors.role_not_found_in_disk("role5")
                 node.query("SET ROLE role5", exitcode=exitcode, message=message)
 
-    with Scenario("I set nonexistent role, throws exception", flags = TE, requirements=[
+    with Scenario("I set nonexistent role, throws exception", requirements=[
             RQ_SRS_006_RBAC_SetRole_None("1.0")]):
             with Given("I ensure that role role5 does not exist"):
                 node.query("DROP ROLE IF EXISTS role5")
@@ -55,7 +55,7 @@ def feature(self, node="clickhouse1"):
                 exitcode, message = errors.role_not_found_in_disk("role5")
                 node.query("SET ROLE ALL EXCEPT role5", exitcode=exitcode, message=message)
 
-    with Scenario("I set one role for current user", flags = TE, requirements=[
+    with Scenario("I set one role for current user", requirements=[
             RQ_SRS_006_RBAC_SetRole("1.0")]):
         with setup(1):
             with Given("I have a user"):
@@ -67,7 +67,7 @@ def feature(self, node="clickhouse1"):
             with Finally("I drop the user"):
                 node.query("DROP USER user0")
 
-    with Scenario("I set multiple roles for current user", flags = TE, requirements=[
+    with Scenario("I set multiple roles for current user", requirements=[
             RQ_SRS_006_RBAC_SetRole("1.0")]):
         with setup(2):
             with Given("I have a user"):
@@ -79,12 +79,12 @@ def feature(self, node="clickhouse1"):
             with Finally("I drop the user"):
                 node.query("DROP USER user0")
 
-    with Scenario("I set all roles for current user", flags = TE, requirements=[
+    with Scenario("I set all roles for current user", requirements=[
             RQ_SRS_006_RBAC_SetRole_All("1.0")]):
         with When("I set all roles for current user"):
             node.query("SET ROLE ALL")
 
-    with Scenario("I set all roles except one for current user", flags = TE, requirements=[
+    with Scenario("I set all roles except one for current user", requirements=[
             RQ_SRS_006_RBAC_SetRole_AllExcept("1.0")]):
         with setup(1):
             with When("I run set role command"):
diff --git a/tests/testflows/rbac/tests/syntax/show_create_quota.py b/tests/testflows/rbac/tests/syntax/show_create_quota.py
index 0954a24d2db..f29b3f5bcc6 100755
--- a/tests/testflows/rbac/tests/syntax/show_create_quota.py
+++ b/tests/testflows/rbac/tests/syntax/show_create_quota.py
@@ -25,19 +25,19 @@ def feature(self, node="clickhouse1"):
             with Finally("I drop the quota"):
                 node.query(f"DROP QUOTA IF EXISTS {quota}")
 
-    with Scenario("I show create quota", flags=TE, requirements=[
+    with Scenario("I show create quota", requirements=[
             RQ_SRS_006_RBAC_Quota_ShowCreateQuota_Name("1.0")]):
         with cleanup("quota0"):
             with When("I run show create quota command"):
                 node.query("SHOW CREATE QUOTA quota0")
 
-    with Scenario("I show create quota current", flags=TE, requirements=[
+    with Scenario("I show create quota current", requirements=[
             RQ_SRS_006_RBAC_Quota_ShowCreateQuota_Current("1.0")]):
         with cleanup("quota1"):
             with When("I run show create quota command"):
                 node.query("SHOW CREATE QUOTA CURRENT")
 
-    with Scenario("I show create quota current short form", flags=TE, requirements=[
+    with Scenario("I show create quota current short form", requirements=[
             RQ_SRS_006_RBAC_Quota_ShowCreateQuota_Current("1.0")]):
         with cleanup("quota2"):
             with When("I run show create quota command"):
diff --git a/tests/testflows/rbac/tests/syntax/show_create_role.py b/tests/testflows/rbac/tests/syntax/show_create_role.py
index 11ce7371ba2..0b2adba96e2 100755
--- a/tests/testflows/rbac/tests/syntax/show_create_role.py
+++ b/tests/testflows/rbac/tests/syntax/show_create_role.py
@@ -26,13 +26,13 @@ def feature(self, node="clickhouse1"):
             with Finally("I drop the role"):
                 node.query(f"DROP ROLE IF EXISTS {role}")
 
-    with Scenario("I show create role", flags=TE, requirements=[
+    with Scenario("I show create role", requirements=[
             RQ_SRS_006_RBAC_Role_ShowCreate("1.0")]):
         with setup("role0"):
             with When("I run show create role command"):
                 node.query("SHOW CREATE ROLE role0")
 
-    with Scenario("I show create role, role doesn't exist, exception", flags=TE, requirements=[
+    with Scenario("I show create role, role doesn't exist, exception", requirements=[
             RQ_SRS_006_RBAC_Role_ShowCreate("1.0")]):
         with When("I run show create role to catch an exception"):
             exitcode, message = errors.role_not_found_in_disk(name="role0")
diff --git a/tests/testflows/rbac/tests/syntax/show_create_row_policy.py b/tests/testflows/rbac/tests/syntax/show_create_row_policy.py
index 5d8b104540c..cf43c0f2b41 100755
--- a/tests/testflows/rbac/tests/syntax/show_create_row_policy.py
+++ b/tests/testflows/rbac/tests/syntax/show_create_row_policy.py
@@ -29,19 +29,19 @@ def feature(self, node="clickhouse1"):
         with Given("I have a table"):
             node.query(f"CREATE TABLE default.foo (x UInt64, y String) Engine=Memory")
 
-        with Scenario("I show create row policy", flags=TE, requirements=[
+        with Scenario("I show create row policy", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_ShowCreateRowPolicy("1.0")]):
             with cleanup("policy0"):
                 with When("I run show create row policy command"):
                     node.query("SHOW CREATE ROW POLICY policy0 ON default.foo")
 
-        with Scenario("I show create row policy on a table", flags=TE, requirements=[
+        with Scenario("I show create row policy on a table", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_ShowCreateRowPolicy_On("1.0")]):
             with cleanup("policy0"):
                 with When("I run show create row policy command"):
                     node.query("SHOW CREATE ROW POLICY policy0 ON default.foo")
 
-        with Scenario("I show create row policy using short syntax on a table", flags=TE, requirements=[
+        with Scenario("I show create row policy using short syntax on a table", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_ShowCreateRowPolicy_On("1.0")]):
             with cleanup("policy1",on="foo"):
                 with When("I run show create row policy command"):
diff --git a/tests/testflows/rbac/tests/syntax/show_create_settings_profile.py b/tests/testflows/rbac/tests/syntax/show_create_settings_profile.py
index 6f715463539..4af4e37951a 100755
--- a/tests/testflows/rbac/tests/syntax/show_create_settings_profile.py
+++ b/tests/testflows/rbac/tests/syntax/show_create_settings_profile.py
@@ -25,13 +25,13 @@ def feature(self, node="clickhouse1"):
             with Finally("I drop the settings profile"):
                 node.query(f"DROP SETTINGS PROFILE IF EXISTS {profile}")
 
-    with Scenario("I show create settings profile", flags=TE, requirements=[
+    with Scenario("I show create settings profile", requirements=[
             RQ_SRS_006_RBAC_SettingsProfile_ShowCreateSettingsProfile("1.0")]):
         with cleanup("profile0"):
             with When("I run show create settings profile command"):
                 node.query("SHOW CREATE SETTINGS PROFILE profile0")
 
-    with Scenario("I show create settings profile short form", flags=TE, requirements=[
+    with Scenario("I show create settings profile short form", requirements=[
             RQ_SRS_006_RBAC_SettingsProfile_ShowCreateSettingsProfile("1.0")]):
         with cleanup("profile1"):
             with When("I run show create settings profile command"):
diff --git a/tests/testflows/rbac/tests/syntax/show_create_user.py b/tests/testflows/rbac/tests/syntax/show_create_user.py
index 804b7e06959..963e0d5d193 100755
--- a/tests/testflows/rbac/tests/syntax/show_create_user.py
+++ b/tests/testflows/rbac/tests/syntax/show_create_user.py
@@ -25,13 +25,13 @@ def feature(self, node="clickhouse1"):
             with Finally("I drop the user"):
                 node.query(f"DROP USER IF EXISTS {user}")
 
-    with Scenario("I run show create on user with no options", flags=TE, requirements=[
+    with Scenario("I run show create on user with no options", requirements=[
             RQ_SRS_006_RBAC_User_ShowCreateUser_For("1.0")]):
         with setup("user0"):
             with When("I run show create user command"):
                 node.query("SHOW CREATE USER user0")
 
-    with Scenario("I run show create on current user", flags=TE, requirements=[
+    with Scenario("I run show create on current user", requirements=[
             RQ_SRS_006_RBAC_User_ShowCreateUser("1.0")]):
         with When("I show create the current user"):
             node.query("SHOW CREATE USER CURRENT_USER")
\ No newline at end of file
diff --git a/tests/testflows/rbac/tests/syntax/show_grants.py b/tests/testflows/rbac/tests/syntax/show_grants.py
index f6c797a6d76..18165ba98a5 100755
--- a/tests/testflows/rbac/tests/syntax/show_grants.py
+++ b/tests/testflows/rbac/tests/syntax/show_grants.py
@@ -25,13 +25,13 @@ def feature(self, node="clickhouse1"):
             with Finally("I drop the user"):
                 node.query(f"DROP USER IF EXISTS {user}")
 
-    with Scenario("I show grants for user", flags=TE, requirements=[
+    with Scenario("I show grants for user", requirements=[
             RQ_SRS_006_RBAC_Show_Grants_For("1.0")]):
         with setup("user0"):
             with When("I run show grants command"):
                 node.query("SHOW GRANTS FOR user0")
 
-    with Scenario("I show grants for current user", flags=TE, requirements=[
+    with Scenario("I show grants for current user", requirements=[
             RQ_SRS_006_RBAC_Show_Grants("1.0")]):
         with When("I show grants"):
             node.query("SHOW GRANTS")
\ No newline at end of file
diff --git a/tests/testflows/rbac/tests/syntax/show_quotas.py b/tests/testflows/rbac/tests/syntax/show_quotas.py
index 4003207354d..5fbae718a29 100755
--- a/tests/testflows/rbac/tests/syntax/show_quotas.py
+++ b/tests/testflows/rbac/tests/syntax/show_quotas.py
@@ -25,25 +25,25 @@ def feature(self, node="clickhouse1"):
             with Finally("I drop the quota"):
                 node.query(f"DROP QUOTA IF EXISTS {quota}")
 
-    with Scenario("I show quotas", flags=TE, requirements=[
+    with Scenario("I show quotas", requirements=[
             RQ_SRS_006_RBAC_Quota_ShowQuotas("1.0")]):
         with cleanup("quota0"), cleanup("quota1"):
             with When("I run show quota command"):
                 node.query("SHOW QUOTAS")
 
-    with Scenario("I show quotas into outfile", flags=TE, requirements=[
+    with Scenario("I show quotas into outfile", requirements=[
             RQ_SRS_006_RBAC_Quota_ShowQuotas_IntoOutfile("1.0")]):
         with cleanup("quota0"), cleanup("quota1"):
             with When("I run show quota command"):
                 node.query("SHOW QUOTAS INTO OUTFILE 'quotas.txt'")
 
-    with Scenario("I show quotas with format", flags=TE, requirements=[
+    with Scenario("I show quotas with format", requirements=[
             RQ_SRS_006_RBAC_Quota_ShowQuotas_Format("1.0")]):
         with cleanup("quota0"), cleanup("quota1"):
             with When("I run show quota command"):
                 node.query("SHOW QUOTAS FORMAT TabSeparated")
 
-    with Scenario("I show quotas with settings", flags=TE, requirements=[
+    with Scenario("I show quotas with settings", requirements=[
             RQ_SRS_006_RBAC_Quota_ShowQuotas("1.0")]):
         with cleanup("quota0"), cleanup("quota1"):
             with When("I run show quota command"):
diff --git a/tests/testflows/rbac/tests/syntax/show_row_policies.py b/tests/testflows/rbac/tests/syntax/show_row_policies.py
index 2bc1471fbe1..0dc7f7f1d1a 100755
--- a/tests/testflows/rbac/tests/syntax/show_row_policies.py
+++ b/tests/testflows/rbac/tests/syntax/show_row_policies.py
@@ -29,25 +29,25 @@ def feature(self, node="clickhouse1"):
         with Given("I have a table"):
             node.query(f"CREATE TABLE default.foo (x UInt64, y String) Engine=Memory")
 
-        with Scenario("I show row policies", flags=TE, requirements=[
+        with Scenario("I show row policies", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_ShowRowPolicies("1.0")]):
             with cleanup("policy0"):
                 with When("I run drop row policy command"):
                     node.query("SHOW ROW POLICIES")
 
-        with Scenario("I show row policies using short syntax", flags=TE, requirements=[
+        with Scenario("I show row policies using short syntax", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_ShowRowPolicies("1.0")]):
             with cleanup("policy1"):
                 with When("I run drop row policy command"):
                     node.query("SHOW POLICIES")
 
-        with Scenario("I show row policies on a database table", flags=TE, requirements=[
+        with Scenario("I show row policies on a database table", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_ShowRowPolicies_On("1.0")]):
             with cleanup("policy0"):
                 with When("I run drop row policy command"):
                     node.query("SHOW ROW POLICIES ON default.foo")
 
-        with Scenario("I show row policies on a table", flags=TE, requirements=[
+        with Scenario("I show row policies on a table", requirements=[
                 RQ_SRS_006_RBAC_RowPolicy_ShowRowPolicies_On("1.0")]):
             with cleanup("policy0"):
                 with When("I run drop row policy command"):
diff --git a/tests/testflows/rbac/tests/views/live_view.py b/tests/testflows/rbac/tests/views/live_view.py
index a510877a95b..f0bc381bd84 100755
--- a/tests/testflows/rbac/tests/views/live_view.py
+++ b/tests/testflows/rbac/tests/views/live_view.py
@@ -1133,9 +1133,13 @@ def feature(self, stress=None, parallel=None, node="clickhouse1"):
     tasks = []
     pool = Pool(3)
 
+
     with allow_experimental_live_view(self.context.node):
         try:
-            for suite in loads(current_module(), Suite):
-                run_scenario(pool, tasks, suite)
+            try:
+                for suite in loads(current_module(), Suite):
+                    run_scenario(pool, tasks, suite)
+            finally:
+                join(tasks)
         finally:
-            join(tasks)
+            pool.close()
diff --git a/tests/testflows/rbac/tests/views/materialized_view.py b/tests/testflows/rbac/tests/views/materialized_view.py
index fc3b393c114..b2b1d19e256 100755
--- a/tests/testflows/rbac/tests/views/materialized_view.py
+++ b/tests/testflows/rbac/tests/views/materialized_view.py
@@ -612,13 +612,17 @@ def create_with_populate_privilege_granted_directly_or_via_role(self, node=None)
 
     if node is None:
         node = self.context.node
+
     with user(node, f"{user_name}"):
+
         Scenario(test=create_with_populate,
             name="create with populate privilege granted directly")(grant_target_name=user_name, user_name=user_name)
 
     with user(node, f"{user_name}"), role(node, f"{role_name}"):
+
         with When("I grant the role to the user"):
             node.query(f"GRANT {role_name} TO {user_name}")
+
         Scenario(test=create_with_populate,
             name="create with populate privilege granted through a role")(grant_target_name=role_name, user_name=user_name)
 
@@ -632,17 +636,22 @@ def create_with_populate(self, user_name, grant_target_name, node=None):
 
     if node is None:
         node = self.context.node
+
     try:
+
         with When("I grant CREATE VIEW privilege"):
             node.query(f"GRANT CREATE VIEW ON {view_name} TO {grant_target_name}")
+
         with Then("I attempt to create a view as the user"):
             node.query(f"CREATE MATERIALIZED VIEW {view_name} ENGINE = Memory POPULATE AS SELECT 1",
                 settings = [("user", f"{user_name}")], exitcode=exitcode, message=message)
 
         with When("I grant INSERT privilege on the view"):
             node.query(f"GRANT INSERT ON {view_name} TO {grant_target_name}")
+
         with Given("I don't have a view"):
             node.query(f"DROP VIEW IF EXISTS {view_name}")
+
         with Then("I attempt to create a view as the user"):
             node.query(f"CREATE MATERIALIZED VIEW {view_name} ENGINE = Memory POPULATE AS SELECT 1",
                 settings = [("user", f"{user_name}")])
@@ -2262,7 +2271,10 @@ def feature(self, stress=None, parallel=None, node="clickhouse1"):
     pool = Pool(3)
 
     try:
-        for suite in loads(current_module(), Suite):
-            run_scenario(pool, tasks, suite)
+        try:
+            for suite in loads(current_module(), Suite):
+                run_scenario(pool, tasks, suite)
+        finally:
+            join(tasks)
     finally:
-        join(tasks)
+        pool.close()
diff --git a/tests/testflows/regression.py b/tests/testflows/regression.py
index b111fa241d0..31cd056bbd8 100755
--- a/tests/testflows/regression.py
+++ b/tests/testflows/regression.py
@@ -15,10 +15,11 @@ def regression(self, local, clickhouse_binary_path, stress=None, parallel=None):
     args = {"local": local, "clickhouse_binary_path": clickhouse_binary_path, "stress": stress, "parallel": parallel}
 
     Feature(test=load("example.regression", "regression"))(**args)
-    Feature(test=load("ldap.regression", "regression"))(**args)
-    Feature(test=load("rbac.regression", "regression"))(**args)
+    # Feature(test=load("ldap.regression", "regression"))(**args)
+    # Feature(test=load("rbac.regression", "regression"))(**args)
     Feature(test=load("aes_encryption.regression", "regression"))(**args)
     Feature(test=load("map_type.regression", "regression"))(**args)
+    # Feature(test=load("kerberos.regression", "regression"))(**args)
 
 if main():
     regression()
diff --git a/tests/testflows/runner b/tests/testflows/runner
index 0acc3a25945..213ff6e50d8 100755
--- a/tests/testflows/runner
+++ b/tests/testflows/runner
@@ -120,3 +120,11 @@ if __name__ == "__main__":
     print(("Running testflows container as: '" + cmd + "'."))
     # testflows return non zero error code on failed tests
     subprocess.call(cmd, shell=True)
+
+    result_path = os.environ.get("CLICKHOUSE_TESTS_RESULT_PATH", None)
+    if result_path is not None:
+        move_from = os.path.join(args.clickhouse_root, 'tests/testflows')
+        status = os.path.join(move_from, 'check_status.tsv')
+        results = os.path.join(move_from, 'test_results.tsv')
+        subprocess.call("mv {} {}".format(status, result_path), shell=True)
+        subprocess.call("mv {} {}".format(results, result_path), shell=True)
diff --git a/tests/ubsan_suppressions.txt b/tests/ubsan_suppressions.txt
index 6a55155e330..8d10b4f73dd 100644
--- a/tests/ubsan_suppressions.txt
+++ b/tests/ubsan_suppressions.txt
@@ -1 +1,5 @@
-# We have no suppressions!
+# https://github.com/llvm-mirror/compiler-rt/blob/master/lib/ubsan/ubsan_checks.inc
+
+# Some value is outside the range of representable values of type 'long' on user-provided data inside boost::geometry - ignore.
+src:*/Functions/pointInPolygon.cpp
+src:*/contrib/boost/boost/geometry/*
diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
index a27a7e9dadc..5b98e28c0c8 100644
--- a/utils/CMakeLists.txt
+++ b/utils/CMakeLists.txt
@@ -27,12 +27,21 @@ if (NOT DEFINED ENABLE_UTILS OR ENABLE_UTILS)
     add_subdirectory (zookeeper-adjust-block-numbers-to-parts)
     add_subdirectory (wikistat-loader)
     add_subdirectory (check-marks)
-    add_subdirectory (test-data-generator)
     add_subdirectory (convert-month-partitioned-parts)
     add_subdirectory (checksum-for-compressed-block)
     add_subdirectory (db-generator)
     add_subdirectory (wal-dump)
     add_subdirectory (check-mysql-binlog)
+    add_subdirectory (keeper-bench)
+
+    if (USE_NURAFT)
+        add_subdirectory (keeper-data-dumper)
+    endif ()
+
+    # memcpy_jart.S contains position dependent code
+    if (NOT CMAKE_POSITION_INDEPENDENT_CODE AND NOT OS_DARWIN)
+        add_subdirectory (memcpy-bench)
+    endif ()
 endif ()
 
 if (ENABLE_CODE_QUALITY)
diff --git a/utils/check-marks/main.cpp b/utils/check-marks/main.cpp
index 2b244dcf0b6..e9e0bbf1134 100644
--- a/utils/check-marks/main.cpp
+++ b/utils/check-marks/main.cpp
@@ -19,7 +19,7 @@
 static void checkByCompressedReadBuffer(const std::string & mrk_path, const std::string & bin_path)
 {
     DB::ReadBufferFromFile mrk_in(mrk_path);
-    DB::CompressedReadBufferFromFile bin_in(bin_path, 0, 0, 0);
+    DB::CompressedReadBufferFromFile bin_in(bin_path, 0, 0, 0, nullptr);
 
     DB::WriteBufferFromFileDescriptor out(STDOUT_FILENO);
     bool mrk2_format = boost::algorithm::ends_with(mrk_path, ".mrk2");
diff --git a/utils/check-style/check-style b/utils/check-style/check-style
index f8926a9af2f..db6b33a569b 100755
--- a/utils/check-style/check-style
+++ b/utils/check-style/check-style
@@ -97,6 +97,36 @@ for test_case in "${tests_with_query_log[@]}"; do
     grep -qE current_database.*currentDatabase "$test_case" || echo "Queries to system.query_log/system.query_thread_log does not have current_database = currentDatabase() condition in $test_case"
 done
 
+# Queries with ReplicatedMergeTree
+# NOTE: it is not that accuate, but at least something.
+tests_with_replicated_merge_tree=( $(
+    find $ROOT_PATH/tests/queries -iname '*.sql' -or -iname '*.sh' -or -iname '*.py' |
+        grep -vP $EXCLUDE_DIRS |
+        xargs grep --with-filename -e ReplicatedMergeTree | cut -d: -f1 | sort -u
+) )
+for test_case in "${tests_with_replicated_merge_tree[@]}"; do
+    case "$test_case" in
+        *.sh)
+            test_case_zk_prefix="\$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX"
+            grep -q -e "ReplicatedMergeTree.*$test_case_zk_prefix" "$test_case" || echo "ReplicatedMergeTree should contain '$test_case_zk_prefix' in zookeeper path to avoid overlaps ($test_case)"
+            ;;
+        *.sql)
+            # NOTE: *.sql is not supported because it is not possible right now, because:
+            # - ReplicatedMergeTree supports only ASTLiteral for zookeeper path
+            #   (and adding support of other nodes, with evaluating them are not that easy, due to zk_prefix is "optional")
+            # - Hence concat(currentDatabase(), 'foo')
+            # - Also params cannot be used, because the are wrapped with CAST()
+            #
+            # But hopefully they will not be a problem
+            # (since they do not do any "stressing" and overlap probability should be lower).
+            ;;
+        *.py)
+            # Right now there is not such tests anyway
+            echo "No ReplicatedMergeTree style check for *.py ($test_case)"
+            ;;
+    esac
+done
+
 # All the submodules should be from https://github.com/
 find $ROOT_PATH -name '.gitmodules' | while read i; do grep -F 'url = ' $i | grep -v -F 'https://github.com/' && echo 'All the submodules should be from https://github.com/'; done
 
diff --git a/utils/convert-month-partitioned-parts/main.cpp b/utils/convert-month-partitioned-parts/main.cpp
index 0a697937eb6..a6829d79726 100644
--- a/utils/convert-month-partitioned-parts/main.cpp
+++ b/utils/convert-month-partitioned-parts/main.cpp
@@ -47,8 +47,9 @@ void run(String part_path, String date_column, String dest_path)
     DayNum max_date;
     MergeTreePartInfo::parseMinMaxDatesFromPartName(old_part_name, min_date, max_date);
 
-    UInt32 yyyymm = DateLUT::instance().toNumYYYYMM(min_date);
-    if (yyyymm != DateLUT::instance().toNumYYYYMM(max_date))
+    const auto & time_zone = DateLUT::instance();
+    UInt32 yyyymm = time_zone.toNumYYYYMM(min_date);
+    if (yyyymm != time_zone.toNumYYYYMM(max_date))
         throw Exception("Part " + old_part_name + " spans different months",
             ErrorCodes::BAD_DATA_PART_NAME);
 
diff --git a/utils/github/backport.py b/utils/github/backport.py
index 7fddbbee241..589124324b1 100644
--- a/utils/github/backport.py
+++ b/utils/github/backport.py
@@ -25,24 +25,23 @@ class Backport:
     def getPullRequests(self, from_commit):
         return self._gh.get_pull_requests(from_commit)
 
-    def getBranchesWithLTS(self):
-        branches = []
-        for pull_request in self._gh.find_pull_requests("release-lts"):
+    def getBranchesWithRelease(self):
+        branches = set()
+        for pull_request in self._gh.find_pull_requests("release"):
             if not pull_request['merged'] and not pull_request['closed']:
-                branches.append(pull_request['headRefName'])
+                branches.add(pull_request['headRefName'])
         return branches
 
-    def execute(self, repo, upstream, until_commit, number, run_cherrypick, find_lts=False):
+    def execute(self, repo, upstream, until_commit, run_cherrypick):
         repo = LocalRepo(repo, upstream, self.default_branch_name)
         all_branches = repo.get_release_branches()  # [(branch_name, base_commit)]
 
-        last_branches = set([branch[0] for branch in all_branches[-number:]])
-        lts_branches = set(self.getBranchesWithLTS() if find_lts else [])
+        release_branches = self.getBranchesWithRelease()
 
         branches = []
         # iterate over all branches to preserve their precedence.
         for branch in all_branches:
-            if branch[0] in last_branches or branch[0] in lts_branches:
+            if branch[0] in release_branches:
                 branches.append(branch)
 
         if not branches:
@@ -76,7 +75,7 @@ class Backport:
 
             # First pass. Find all must-backports
             for label in pr['labels']['nodes']:
-                if label['name'] == 'pr-bugfix':
+                if label['name'] == 'pr-bugfix' or label['name'] == 'pr-must-backport':
                     backport_map[pr['number']] = branch_set.copy()
                     continue
                 matched = RE_MUST_BACKPORT.match(label['name'])
@@ -115,8 +114,6 @@ if __name__ == "__main__":
     parser.add_argument('--token',     type=str, required=True, help='token for Github access')
     parser.add_argument('--repo',      type=str, required=True, help='path to full repository', metavar='PATH')
     parser.add_argument('--til',       type=str,                help='check PRs from HEAD til this commit', metavar='COMMIT')
-    parser.add_argument('-n',          type=int, dest='number', help='number of last release branches to consider')
-    parser.add_argument('--lts',       action='store_true',     help='consider branches with LTS')
     parser.add_argument('--dry-run',   action='store_true',     help='do not create or merge any PRs', default=False)
     parser.add_argument('--verbose', '-v', action='store_true', help='more verbose output', default=False)
     parser.add_argument('--upstream', '-u', type=str,           help='remote name of upstream in repository', default='origin')
@@ -129,4 +126,4 @@ if __name__ == "__main__":
 
     cherrypick_run = lambda token, pr, branch: CherryPick(token, 'ClickHouse', 'ClickHouse', 'core', pr, branch).execute(args.repo, args.dry_run)
     bp = Backport(args.token, 'ClickHouse', 'ClickHouse', 'core')
-    bp.execute(args.repo, args.upstream, args.til, args.number, cherrypick_run, args.lts)
+    bp.execute(args.repo, args.upstream, args.til, cherrypick_run)
diff --git a/utils/keeper-bench/CMakeLists.txt b/utils/keeper-bench/CMakeLists.txt
new file mode 100644
index 00000000000..2f12194d1b7
--- /dev/null
+++ b/utils/keeper-bench/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_executable(keeper-bench Generator.cpp Runner.cpp Stats.cpp main.cpp)
+target_link_libraries(keeper-bench PRIVATE clickhouse_common_zookeeper)
diff --git a/utils/keeper-bench/Generator.cpp b/utils/keeper-bench/Generator.cpp
new file mode 100644
index 00000000000..852de07f2e1
--- /dev/null
+++ b/utils/keeper-bench/Generator.cpp
@@ -0,0 +1,238 @@
+#include "Generator.h"
+#include <random>
+#include <filesystem>
+
+using namespace Coordination;
+using namespace zkutil;
+
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+}
+
+namespace
+{
+std::string generateRandomString(size_t length)
+{
+    if (length == 0)
+        return "";
+
+    static const auto & chars = "0123456789"
+        "abcdefghijklmnopqrstuvwxyz"
+        "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+
+    static pcg64 rng(randomSeed());
+    static std::uniform_int_distribution<size_t> pick(0, sizeof(chars) - 2);
+
+    std::string s;
+
+    s.reserve(length);
+
+    while (length--)
+        s += chars[pick(rng)];
+
+    return s;
+}
+}
+
+std::string generateRandomPath(const std::string & prefix, size_t length)
+{
+    return std::filesystem::path(prefix) / generateRandomString(length);
+}
+
+std::string generateRandomData(size_t size)
+{
+    return generateRandomString(size);
+}
+
+void CreateRequestGenerator::startup(Coordination::ZooKeeper & zookeeper)
+{
+    auto promise = std::make_shared<std::promise<void>>();
+    auto future = promise->get_future();
+    auto create_callback = [promise] (const CreateResponse & response)
+    {
+        if (response.error != Coordination::Error::ZOK)
+            promise->set_exception(std::make_exception_ptr(zkutil::KeeperException(response.error)));
+        else
+            promise->set_value();
+    };
+    zookeeper.create(path_prefix, "", false, false, default_acls, create_callback);
+    future.get();
+}
+
+ZooKeeperRequestPtr CreateRequestGenerator::generate()
+{
+    auto request = std::make_shared<ZooKeeperCreateRequest>();
+    request->acls = default_acls;
+    size_t plength = 5;
+    if (path_length)
+        plength = *path_length;
+    auto path_candidate = generateRandomPath(path_prefix, plength);
+
+    while (paths_created.count(path_candidate))
+        path_candidate = generateRandomPath(path_prefix, plength);
+
+    paths_created.insert(path_candidate);
+
+    request->path = path_candidate;
+    if (data_size)
+        request->data = generateRandomData(*data_size);
+
+    return request;
+}
+
+
+void GetRequestGenerator::startup(Coordination::ZooKeeper & zookeeper)
+{
+    auto promise = std::make_shared<std::promise<void>>();
+    auto future = promise->get_future();
+    auto create_callback = [promise] (const CreateResponse & response)
+    {
+        if (response.error != Coordination::Error::ZOK)
+            promise->set_exception(std::make_exception_ptr(zkutil::KeeperException(response.error)));
+        else
+            promise->set_value();
+    };
+    zookeeper.create(path_prefix, "", false, false, default_acls, create_callback);
+    future.get();
+    size_t total_nodes = 1;
+    if (num_nodes)
+        total_nodes = *num_nodes;
+
+    for (size_t i = 0; i < total_nodes; ++i)
+    {
+        auto path = generateRandomPath(path_prefix, 5);
+        while (std::find(paths_to_get.begin(), paths_to_get.end(), path) != paths_to_get.end())
+            path = generateRandomPath(path_prefix, 5);
+
+        auto create_promise = std::make_shared<std::promise<void>>();
+        auto create_future = create_promise->get_future();
+        auto callback = [create_promise] (const CreateResponse & response)
+        {
+            if (response.error != Coordination::Error::ZOK)
+                create_promise->set_exception(std::make_exception_ptr(zkutil::KeeperException(response.error)));
+            else
+                create_promise->set_value();
+        };
+        std::string data;
+        if (nodes_data_size)
+            data = generateRandomString(*nodes_data_size);
+
+        zookeeper.create(path, data, false, false, default_acls, callback);
+        create_future.get();
+        paths_to_get.push_back(path);
+    }
+}
+
+Coordination::ZooKeeperRequestPtr GetRequestGenerator::generate()
+{
+    auto request = std::make_shared<ZooKeeperGetRequest>();
+
+    size_t path_index = distribution(rng);
+    request->path = paths_to_get[path_index];
+    return request;
+}
+
+void ListRequestGenerator::startup(Coordination::ZooKeeper & zookeeper)
+{
+    auto promise = std::make_shared<std::promise<void>>();
+    auto future = promise->get_future();
+    auto create_callback = [promise] (const CreateResponse & response)
+    {
+        if (response.error != Coordination::Error::ZOK)
+            promise->set_exception(std::make_exception_ptr(zkutil::KeeperException(response.error)));
+        else
+            promise->set_value();
+    };
+    zookeeper.create(path_prefix, "", false, false, default_acls, create_callback);
+    future.get();
+
+    size_t total_nodes = 1;
+    if (num_nodes)
+        total_nodes = *num_nodes;
+
+    size_t path_length = 5;
+    if (paths_length)
+        path_length = *paths_length;
+
+    for (size_t i = 0; i < total_nodes; ++i)
+    {
+        auto path = generateRandomPath(path_prefix, path_length);
+
+        auto create_promise = std::make_shared<std::promise<void>>();
+        auto create_future = create_promise->get_future();
+        auto callback = [create_promise] (const CreateResponse & response)
+        {
+            if (response.error != Coordination::Error::ZOK)
+                create_promise->set_exception(std::make_exception_ptr(zkutil::KeeperException(response.error)));
+            else
+                create_promise->set_value();
+        };
+        zookeeper.create(path, "", false, false, default_acls, callback);
+        create_future.get();
+    }
+}
+
+Coordination::ZooKeeperRequestPtr ListRequestGenerator::generate()
+{
+    auto request = std::make_shared<ZooKeeperListRequest>();
+    request->path = path_prefix;
+    return request;
+}
+
+std::unique_ptr<IGenerator> getGenerator(const std::string & name)
+{
+    if (name == "create_no_data")
+    {
+        return std::make_unique<CreateRequestGenerator>();
+    }
+    else if (name == "create_small_data")
+    {
+        return std::make_unique<CreateRequestGenerator>("/create_generator", 5, 32);
+    }
+    else if (name == "create_medium_data")
+    {
+        return std::make_unique<CreateRequestGenerator>("/create_generator", 5, 1024);
+    }
+    else if (name == "create_big_data")
+    {
+        return std::make_unique<CreateRequestGenerator>("/create_generator", 5, 512 * 1024);
+    }
+    else if (name == "get_no_data")
+    {
+        return std::make_unique<GetRequestGenerator>("/get_generator", 10, 0);
+    }
+    else if (name == "get_small_data")
+    {
+        return std::make_unique<GetRequestGenerator>("/get_generator", 10, 32);
+    }
+    else if (name == "get_medium_data")
+    {
+        return std::make_unique<GetRequestGenerator>("/get_generator", 10, 1024);
+    }
+    else if (name == "get_big_data")
+    {
+        return std::make_unique<GetRequestGenerator>("/get_generator", 10, 512 * 1024);
+    }
+    else if (name == "list_no_nodes")
+    {
+        return std::make_unique<ListRequestGenerator>("/list_generator", 0, 1);
+    }
+    else if (name == "list_few_nodes")
+    {
+        return std::make_unique<ListRequestGenerator>("/list_generator", 10, 5);
+    }
+    else if (name == "list_medium_nodes")
+    {
+        return std::make_unique<ListRequestGenerator>("/list_generator", 1000, 5);
+    }
+    else if (name == "list_a_lot_nodes")
+    {
+        return std::make_unique<ListRequestGenerator>("/list_generator", 100000, 5);
+    }
+
+    throw DB::Exception(DB::ErrorCodes::LOGICAL_ERROR, "Unknown generator {}", name);
+}
diff --git a/utils/keeper-bench/Generator.h b/utils/keeper-bench/Generator.h
new file mode 100644
index 00000000000..d6cc0eec335
--- /dev/null
+++ b/utils/keeper-bench/Generator.h
@@ -0,0 +1,107 @@
+#pragma once
+#include <Common/ZooKeeper/KeeperException.h>
+#include <Common/ZooKeeper/ZooKeeper.h>
+#include <Common/ZooKeeper/ZooKeeperImpl.h>
+#include <Common/ZooKeeper/ZooKeeperCommon.h>
+#include <functional>
+#include <optional>
+#include <pcg-random/pcg_random.hpp>
+#include <Common/randomSeed.h>
+
+
+std::string generateRandomPath(const std::string & prefix, size_t length = 5);
+
+std::string generateRandomData(size_t size);
+
+class IGenerator
+{
+public:
+    IGenerator()
+    {
+        Coordination::ACL acl;
+        acl.permissions = Coordination::ACL::All;
+        acl.scheme = "world";
+        acl.id = "anyone";
+        default_acls.emplace_back(std::move(acl));
+    }
+    virtual void startup(Coordination::ZooKeeper & /*zookeeper*/) {}
+    virtual Coordination::ZooKeeperRequestPtr generate() = 0;
+
+    virtual ~IGenerator() = default;
+
+    Coordination::ACLs default_acls;
+
+};
+
+class CreateRequestGenerator final : public IGenerator
+{
+public:
+    explicit CreateRequestGenerator(
+        std::string path_prefix_ = "/create_generator",
+        std::optional<uint64_t> path_length_ = std::nullopt,
+        std::optional<uint64_t> data_size_ = std::nullopt)
+        : path_prefix(path_prefix_)
+        , path_length(path_length_)
+        , data_size(data_size_)
+    {}
+
+    void startup(Coordination::ZooKeeper & zookeeper) override;
+    Coordination::ZooKeeperRequestPtr generate() override;
+
+private:
+    std::string path_prefix;
+    std::optional<uint64_t> path_length;
+    std::optional<uint64_t> data_size;
+    std::unordered_set<std::string> paths_created;
+};
+
+
+class GetRequestGenerator final : public IGenerator
+{
+public:
+    explicit GetRequestGenerator(
+        std::string path_prefix_ = "/get_generator",
+        std::optional<uint64_t> num_nodes_ = std::nullopt,
+        std::optional<uint64_t> nodes_data_size_ = std::nullopt)
+        : path_prefix(path_prefix_)
+        , num_nodes(num_nodes_)
+        , nodes_data_size(nodes_data_size_)
+        , rng(randomSeed())
+        , distribution(0, num_nodes ? *num_nodes - 1 : 0)
+    {}
+
+    void startup(Coordination::ZooKeeper & zookeeper) override;
+    Coordination::ZooKeeperRequestPtr generate() override;
+
+private:
+    std::string path_prefix;
+    std::optional<uint64_t> num_nodes;
+    std::optional<uint64_t> nodes_data_size;
+    std::vector<std::string> paths_to_get;
+
+    pcg64 rng;
+    std::uniform_int_distribution<size_t> distribution;
+};
+
+class ListRequestGenerator final : public IGenerator
+{
+public:
+    explicit ListRequestGenerator(
+        std::string path_prefix_ = "/list_generator",
+        std::optional<uint64_t> num_nodes_ = std::nullopt,
+        std::optional<uint64_t> paths_length_ = std::nullopt)
+        : path_prefix(path_prefix_)
+        , num_nodes(num_nodes_)
+        , paths_length(paths_length_)
+    {}
+
+    void startup(Coordination::ZooKeeper & zookeeper) override;
+    Coordination::ZooKeeperRequestPtr generate() override;
+
+private:
+    std::string path_prefix;
+    std::optional<uint64_t> num_nodes;
+    std::optional<uint64_t> paths_length;
+};
+
+std::unique_ptr<IGenerator> getGenerator(const std::string & name);
diff --git a/utils/keeper-bench/Runner.cpp b/utils/keeper-bench/Runner.cpp
new file mode 100644
index 00000000000..d3f51fb2356
--- /dev/null
+++ b/utils/keeper-bench/Runner.cpp
@@ -0,0 +1,188 @@
+#include "Runner.h"
+
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int CANNOT_BLOCK_SIGNAL;
+}
+}
+
+void Runner::thread(std::vector<std::shared_ptr<Coordination::ZooKeeper>> & zookeepers)
+{
+    Coordination::ZooKeeperRequestPtr request;
+    /// Randomly choosing connection index
+    pcg64 rng(randomSeed());
+    std::uniform_int_distribution<size_t> distribution(0, zookeepers.size() - 1);
+
+    /// In these threads we do not accept INT signal.
+    sigset_t sig_set;
+    if (sigemptyset(&sig_set)
+        || sigaddset(&sig_set, SIGINT)
+        || pthread_sigmask(SIG_BLOCK, &sig_set, nullptr))
+    {
+        DB::throwFromErrno("Cannot block signal.", DB::ErrorCodes::CANNOT_BLOCK_SIGNAL);
+    }
+
+    while (true)
+    {
+        bool extracted = false;
+
+        while (!extracted)
+        {
+            extracted = queue.tryPop(request, 100);
+
+            if (shutdown
+                || (max_iterations && requests_executed >= max_iterations))
+            {
+                return;
+            }
+        }
+
+        const auto connection_index = distribution(rng);
+        auto & zk = zookeepers[connection_index];
+
+        auto promise = std::make_shared<std::promise<size_t>>();
+        auto future = promise->get_future();
+        Coordination::ResponseCallback callback = [promise](const Coordination::Response & response)
+        {
+            if (response.error != Coordination::Error::ZOK)
+                promise->set_exception(std::make_exception_ptr(zkutil::KeeperException(response.error)));
+            else
+                promise->set_value(response.bytesSize());
+        };
+
+        Stopwatch watch;
+
+        zk->executeGenericRequest(request, callback);
+
+        try
+        {
+            auto response_size = future.get();
+            double seconds = watch.elapsedSeconds();
+
+            std::lock_guard lock(mutex);
+
+            if (request->isReadRequest())
+                info->addRead(seconds, 1, request->bytesSize() + response_size);
+            else
+                info->addWrite(seconds, 1, request->bytesSize() + response_size);
+        }
+        catch (...)
+        {
+            if (!continue_on_error)
+            {
+                shutdown = true;
+                throw;
+            }
+            std::cerr << DB::getCurrentExceptionMessage(true, true /*check embedded stack trace*/) << std::endl;
+        }
+
+        ++requests_executed;
+    }
+}
+
+bool Runner::tryPushRequestInteractively(const Coordination::ZooKeeperRequestPtr & request, DB::InterruptListener & interrupt_listener)
+{
+    bool inserted = false;
+
+    while (!inserted)
+    {
+        inserted = queue.tryPush(request, 100);
+
+        if (shutdown)
+        {
+            /// An exception occurred in a worker
+            return false;
+        }
+
+        if (max_time > 0 && total_watch.elapsedSeconds() >= max_time)
+        {
+            std::cout << "Stopping launch of queries. Requested time limit is exhausted.\n";
+            return false;
+        }
+
+        if (interrupt_listener.check())
+        {
+            std::cout << "Stopping launch of queries. SIGINT received." << std::endl;
+            return false;
+        }
+
+        if (delay > 0 && delay_watch.elapsedSeconds() > delay)
+        {
+            printNumberOfRequestsExecuted(requests_executed);
+
+            std::lock_guard lock(mutex);
+            report(info, concurrency);
+            delay_watch.restart();
+        }
+    }
+
+    return true;
+}
+
+
+void Runner::runBenchmark()
+{
+    auto aux_connections = getConnections();
+
+    std::cerr << "Preparing to run\n";
+    generator->startup(*aux_connections[0]);
+    std::cerr << "Prepared\n";
+    try
+    {
+        for (size_t i = 0; i < concurrency; ++i)
+        {
+            auto connections = getConnections();
+            pool.scheduleOrThrowOnError([this, connections]() mutable { thread(connections); });
+        }
+    }
+    catch (...)
+    {
+        pool.wait();
+        throw;
+    }
+
+    DB::InterruptListener interrupt_listener;
+    delay_watch.restart();
+
+    /// Push queries into queue
+    for (size_t i = 0; !max_iterations || i < max_iterations; ++i)
+    {
+        if (!tryPushRequestInteractively(generator->generate(), interrupt_listener))
+        {
+            shutdown = true;
+            break;
+        }
+    }
+
+    pool.wait();
+    total_watch.stop();
+
+    printNumberOfRequestsExecuted(requests_executed);
+
+    std::lock_guard lock(mutex);
+    report(info, concurrency);
+}
+
+
+std::vector<std::shared_ptr<Coordination::ZooKeeper>> Runner::getConnections()
+{
+    std::vector<std::shared_ptr<Coordination::ZooKeeper>> zookeepers;
+    for (const auto & host_string : hosts_strings)
+    {
+        Coordination::ZooKeeper::Node node{Poco::Net::SocketAddress{host_string}, false};
+        std::vector<Coordination::ZooKeeper::Node> nodes;
+        nodes.push_back(node);
+        zookeepers.emplace_back(std::make_shared<Coordination::ZooKeeper>(
+            nodes,
+            "", /*chroot*/
+            "", /*identity type*/
+            "", /*identity*/
+            Poco::Timespan(0, 30000 * 1000),
+            Poco::Timespan(0, 1000 * 1000),
+            Poco::Timespan(0, 10000 * 1000)));
+    }
+
+    return zookeepers;
+}
diff --git a/utils/keeper-bench/Runner.h b/utils/keeper-bench/Runner.h
new file mode 100644
index 00000000000..bb83e790214
--- /dev/null
+++ b/utils/keeper-bench/Runner.h
@@ -0,0 +1,79 @@
+#pragma once
+#include <Common/ZooKeeper/ZooKeeperImpl.h>
+#include "Generator.h"
+#include <Common/ZooKeeper/IKeeper.h>
+#include <Common/ZooKeeper/ZooKeeperCommon.h>
+#include <Common/Stopwatch.h>
+#include <Common/ThreadPool.h>
+#include <pcg-random/pcg_random.hpp>
+#include <Common/randomSeed.h>
+#include <Common/InterruptListener.h>
+
+#include <Core/Types.h>
+#include "Stats.h"
+
+using Ports = std::vector<UInt16>;
+using Strings = std::vector<std::string>;
+
+class Runner
+{
+public:
+    Runner(
+        size_t concurrency_,
+        const std::string & generator_name,
+        const Strings & hosts_strings_,
+        double max_time_,
+        double delay_,
+        bool continue_on_error_,
+        size_t max_iterations_)
+        : concurrency(concurrency_)
+        , pool(concurrency)
+        , hosts_strings(hosts_strings_)
+        , generator(getGenerator(generator_name))
+        , max_time(max_time_)
+        , delay(delay_)
+        , continue_on_error(continue_on_error_)
+        , max_iterations(max_iterations_)
+        , info(std::make_shared<Stats>())
+        , queue(concurrency)
+    {
+    }
+
+    void thread(std::vector<std::shared_ptr<Coordination::ZooKeeper>> & zookeepers);
+
+    void printNumberOfRequestsExecuted(size_t num)
+    {
+        std::cerr << "Requests executed: " << num << ".\n";
+    }
+
+    bool tryPushRequestInteractively(const Coordination::ZooKeeperRequestPtr & request, DB::InterruptListener & interrupt_listener);
+
+    void runBenchmark();
+
+
+private:
+
+    size_t concurrency = 1;
+
+    ThreadPool pool;
+    Strings hosts_strings;
+    std::unique_ptr<IGenerator> generator;
+    double max_time = 0;
+    double delay = 1;
+    bool continue_on_error = false;
+    std::atomic<size_t> max_iterations = 0;
+    std::atomic<size_t> requests_executed = 0;
+    std::atomic<bool> shutdown = false;
+
+    std::shared_ptr<Stats> info;
+
+    Stopwatch total_watch;
+    Stopwatch delay_watch;
+
+    std::mutex mutex;
+
+    using Queue = ConcurrentBoundedQueue<Coordination::ZooKeeperRequestPtr>;
+    Queue queue;
+
+    std::vector<std::shared_ptr<Coordination::ZooKeeper>> getConnections();
+};
diff --git a/utils/keeper-bench/Stats.cpp b/utils/keeper-bench/Stats.cpp
new file mode 100644
index 00000000000..1f8b02ed09d
--- /dev/null
+++ b/utils/keeper-bench/Stats.cpp
@@ -0,0 +1,67 @@
+#include "Stats.h"
+#include <iostream>
+
+void report(std::shared_ptr<Stats> & info, size_t concurrency)
+{
+    std::cerr << "\n";
+
+    /// Avoid zeros, nans or exceptions
+    if (0 == info->read_requests && 0 == info->write_requests)
+        return;
+
+    double read_seconds = info->read_work_time / concurrency;
+    double write_seconds = info->write_work_time / concurrency;
+
+    std::cerr << "read requests " << info->read_requests << ", write requests " << info->write_requests << ", ";
+    if (info->errors)
+    {
+        std::cerr << "errors " << info->errors << ", ";
+    }
+    if (0 != info->read_requests)
+    {
+        std::cerr
+            << "Read RPS: " << (info->read_requests / read_seconds) << ", "
+            << "Read MiB/s: " << (info->requests_read_bytes / read_seconds / 1048576);
+        if (0 != info->write_requests)
+            std::cerr << ", ";
+    }
+    if (0 != info->write_requests)
+    {
+        std::cerr
+            << "Write RPS: " << (info->write_requests / write_seconds) << ", "
+            << "Write MiB/s: " << (info->requests_write_bytes / write_seconds / 1048576) << ". "
+            << "\n";
+    }
+    std::cerr << "\n";
+
+    auto print_percentile = [&](double percent, Stats::Sampler & sampler)
+    {
+        std::cerr << percent << "%\t\t";
+        std::cerr << sampler.quantileNearest(percent / 100.0) << " sec.\t";
+        std::cerr << "\n";
+    };
+
+    if (0 != info->read_requests)
+    {
+        std::cerr << "Read sampler:\n";
+        for (int percent = 0; percent <= 90; percent += 10)
+            print_percentile(percent, info->read_sampler);
+
+        print_percentile(95, info->read_sampler);
+        print_percentile(99, info->read_sampler);
+        print_percentile(99.9, info->read_sampler);
+        print_percentile(99.99, info->read_sampler);
+    }
+
+    if (0 != info->write_requests)
+    {
+        std::cerr << "Write sampler:\n";
+        for (int percent = 0; percent <= 90; percent += 10)
+            print_percentile(percent, info->write_sampler);
+
+        print_percentile(95, info->write_sampler);
+        print_percentile(99, info->write_sampler);
+        print_percentile(99.9, info->write_sampler);
+        print_percentile(99.99, info->write_sampler);
+    }
+}
diff --git a/utils/keeper-bench/Stats.h b/utils/keeper-bench/Stats.h
new file mode 100644
index 00000000000..1b9a31bb734
--- /dev/null
+++ b/utils/keeper-bench/Stats.h
@@ -0,0 +1,52 @@
+#pragma once
+
+#include <vector>
+#include <atomic>
+
+#include <AggregateFunctions/ReservoirSampler.h>
+
+struct Stats
+{
+    std::atomic<size_t> read_requests{0};
+    std::atomic<size_t> write_requests{0};
+    size_t errors = 0;
+    size_t requests_write_bytes = 0;
+    size_t requests_read_bytes = 0;
+    double read_work_time = 0;
+    double write_work_time = 0;
+
+    using Sampler = ReservoirSampler<double>;
+    Sampler read_sampler {1 << 16};
+    Sampler write_sampler {1 << 16};
+
+    void addRead(double seconds, size_t requests_inc, size_t bytes_inc)
+    {
+        read_work_time += seconds;
+        read_requests += requests_inc;
+        requests_read_bytes += bytes_inc;
+        read_sampler.insert(seconds);
+    }
+
+    void addWrite(double seconds, size_t requests_inc, size_t bytes_inc)
+    {
+        write_work_time += seconds;
+        write_requests += requests_inc;
+        requests_write_bytes += bytes_inc;
+        write_sampler.insert(seconds);
+    }
+
+    void clear()
+    {
+        read_requests = 0;
+        write_requests = 0;
+        read_work_time = 0;
+        write_work_time = 0;
+        requests_read_bytes = 0;
+        requests_write_bytes = 0;
+        read_sampler.clear();
+        write_sampler.clear();
+    }
+};
+
+
+void report(std::shared_ptr<Stats> & info, size_t concurrency);
diff --git a/utils/keeper-bench/main.cpp b/utils/keeper-bench/main.cpp
new file mode 100644
index 00000000000..378d7c2f6e4
--- /dev/null
+++ b/utils/keeper-bench/main.cpp
@@ -0,0 +1,61 @@
+#include <iostream>
+#include <boost/program_options.hpp>
+#include "Runner.h"
+#include "Stats.h"
+#include "Generator.h"
+#include <Common/TerminalSize.h>
+#include <Core/Types.h>
+
+using namespace std;
+
+int main(int argc, char *argv[])
+{
+
+    bool print_stacktrace = true;
+
+    try
+    {
+        using boost::program_options::value;
+
+        boost::program_options::options_description desc = createOptionsDescription("Allowed options", getTerminalWidth());
+        desc.add_options()
+            ("help",                                                            "produce help message")
+            ("generator",     value<std::string>()->default_value("create_small_data"),             "query to execute")
+            ("concurrency,c", value<unsigned>()->default_value(1),              "number of parallel queries")
+            ("delay,d",       value<double>()->default_value(1),                "delay between intermediate reports in seconds (set 0 to disable reports)")
+            ("iterations,i",  value<size_t>()->default_value(0),                "amount of queries to be executed")
+            ("timelimit,t",   value<double>()->default_value(0.),               "stop launch of queries after specified time limit")
+            ("hosts,h",        value<Strings>()->multitoken(),                   "")
+            ("continue_on_errors", "continue testing even if a query fails")
+            ("reconnect", "establish new connection for every query")
+        ;
+
+        boost::program_options::variables_map options;
+        boost::program_options::store(boost::program_options::parse_command_line(argc, argv, desc), options);
+        boost::program_options::notify(options);
+
+        if (options.count("help"))
+        {
+            std::cout << "Usage: " << argv[0] << " [options] < queries.txt\n";
+            std::cout << desc << "\n";
+            return 1;
+        }
+
+        Runner runner(options["concurrency"].as<unsigned>(),
+            options["generator"].as<std::string>(),
+            options["hosts"].as<Strings>(),
+            options["timelimit"].as<double>(),
+            options["delay"].as<double>(),
+            options.count("continue_on_errors"),
+            options["iterations"].as<size_t>());
+
+        runner.runBenchmark();
+
+        return 0;
+    }
+    catch (...)
+    {
+        std::cerr << DB::getCurrentExceptionMessage(print_stacktrace, true) << std::endl;
+        return DB::getCurrentExceptionCode();
+    }
+}
diff --git a/utils/keeper-data-dumper/CMakeLists.txt b/utils/keeper-data-dumper/CMakeLists.txt
new file mode 100644
index 00000000000..af16924547f
--- /dev/null
+++ b/utils/keeper-data-dumper/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_executable(keeper-data-dumper main.cpp)
+target_link_libraries(keeper-data-dumper PRIVATE dbms)
diff --git a/utils/keeper-data-dumper/main.cpp b/utils/keeper-data-dumper/main.cpp
new file mode 100644
index 00000000000..11db6fc61bc
--- /dev/null
+++ b/utils/keeper-data-dumper/main.cpp
@@ -0,0 +1,87 @@
+#include <Poco/ConsoleChannel.h>
+#include <Poco/Logger.h>
+#include <Coordination/KeeperStateMachine.h>
+#include <Common/ZooKeeper/ZooKeeperCommon.h>
+#include <Common/ZooKeeper/ZooKeeperIO.h>
+#include <Common/Exception.h>
+#include <libnuraft/nuraft.hxx> // Y_IGNORE
+#include <Coordination/KeeperLogStore.h>
+#include <Coordination/Changelog.h>
+#include <common/logger_useful.h>
+
+using namespace Coordination;
+using namespace DB;
+
+void dumpMachine(std::shared_ptr<KeeperStateMachine> machine)
+{
+    auto & storage = machine->getStorage();
+    std::queue<std::string> keys;
+    keys.push("/");
+
+    while (!keys.empty())
+    {
+        auto key = keys.front();
+        keys.pop();
+        std::cout << key << "\n";
+        auto value = storage.container.getValue(key);
+        std::cout << "\tStat: {version: " << value.stat.version <<
+            ", mtime: " << value.stat.mtime <<
+            ", emphemeralOwner: " << value.stat.ephemeralOwner <<
+            ", czxid: " << value.stat.czxid <<
+            ", mzxid: " << value.stat.mzxid <<
+            ", numChildren: " << value.stat.numChildren <<
+            ", dataLength: " << value.stat.dataLength <<
+            "}" << std::endl;
+        std::cout << "\tData: " << storage.container.getValue(key).data << std::endl;
+
+        for (const auto & child : value.children)
+        {
+            if (key == "/")
+                keys.push(key + child);
+            else
+                keys.push(key + "/" + child);
+        }
+    }
+    std::cout << std::flush;
+}
+
+int main(int argc, char *argv[])
+{
+    if (argc != 3)
+    {
+        std::cerr << "usage: " << argv[0] << " snapshotpath logpath" << std::endl;
+        return 3;
+    }
+    else
+    {
+        Poco::AutoPtr<Poco::ConsoleChannel> channel(new Poco::ConsoleChannel(std::cerr));
+        Poco::Logger::root().setChannel(channel);
+        Poco::Logger::root().setLevel("trace");
+    }
+    auto * logger = &Poco::Logger::get("keeper-dumper");
+    ResponsesQueue queue;
+    SnapshotsQueue snapshots_queue{1};
+    CoordinationSettingsPtr settings = std::make_shared<CoordinationSettings>();
+    auto state_machine = std::make_shared<KeeperStateMachine>(queue, snapshots_queue, argv[1], settings);
+    state_machine->init();
+    size_t last_commited_index = state_machine->last_commit_index();
+
+    LOG_INFO(logger, "Last committed index: {}", last_commited_index);
+
+    DB::KeeperLogStore changelog(argv[2], 10000000, true);
+    changelog.init(last_commited_index, 10000000000UL); /// collect all logs
+    if (changelog.size() == 0)
+        LOG_INFO(logger, "Changelog empty");
+    else
+        LOG_INFO(logger, "Last changelog entry {}", changelog.next_slot() - 1);
+
+    for (size_t i = last_commited_index + 1; i < changelog.next_slot(); ++i)
+    {
+        if (changelog.entry_at(i)->get_val_type() == nuraft::log_val_type::app_log)
+            state_machine->commit(i, changelog.entry_at(i)->get_buf());
+    }
+
+    dumpMachine(state_machine);
+
+    return 0;
+}
diff --git a/utils/list-versions/version_date.tsv b/utils/list-versions/version_date.tsv
index 4ba92864020..a69f96970bb 100644
--- a/utils/list-versions/version_date.tsv
+++ b/utils/list-versions/version_date.tsv
@@ -1,10 +1,29 @@
+v21.4.4.30-stable	2021-04-16
+v21.4.3.21-stable	2021-04-12
+v21.3.7.62-stable	2021-04-16
+v21.3.6.55-lts	2021-04-12
+v21.3.5.42-lts	2021-04-07
+v21.3.4.25-lts	2021-03-28
+v21.3.3.14-lts	2021-03-19
+v21.3.2.5-lts	2021-03-12
+v21.2.10.48-stable	2021-04-16
+v21.2.9.41-stable	2021-04-12
+v21.2.8.31-stable	2021-04-07
+v21.2.7.11-stable	2021-03-28
+v21.2.6.1-stable	2021-03-15
+v21.2.5.5-stable	2021-03-02
 v21.2.4.6-stable	2021-02-20
 v21.2.3.15-stable	2021-02-14
 v21.2.2.8-stable	2021-02-07
+v21.1.9.41-stable	2021-04-13
+v21.1.8.30-stable	2021-04-07
+v21.1.7.1-stable	2021-03-15
+v21.1.6.13-stable	2021-03-02
 v21.1.5.4-stable	2021-02-20
 v21.1.4.46-stable	2021-02-14
 v21.1.3.32-stable	2021-02-03
 v21.1.2.15-stable	2021-01-18
+v20.12.8.5-stable	2021-03-02
 v20.12.7.3-stable	2021-02-20
 v20.12.6.29-stable	2021-02-14
 v20.12.5.18-stable	2021-02-03
@@ -30,6 +49,11 @@ v20.9.5.5-stable	2020-11-13
 v20.9.4.76-stable	2020-10-29
 v20.9.3.45-stable	2020-10-09
 v20.9.2.20-stable	2020-09-22
+v20.8.18.32-lts	2021-04-16
+v20.8.17.25-lts	2021-04-08
+v20.8.16.20-lts	2021-04-06
+v20.8.15.11-lts	2021-04-01
+v20.8.14.4-lts	2021-03-03
 v20.8.13.15-lts	2021-02-20
 v20.8.12.2-lts	2021-01-16
 v20.8.11.17-lts	2020-12-25
diff --git a/utils/memcpy-bench/CMakeLists.txt b/utils/memcpy-bench/CMakeLists.txt
new file mode 100644
index 00000000000..5fcde231688
--- /dev/null
+++ b/utils/memcpy-bench/CMakeLists.txt
@@ -0,0 +1,22 @@
+enable_language(ASM)
+
+add_executable (memcpy-bench
+    memcpy-bench.cpp
+    FastMemcpy.cpp
+    FastMemcpy_Avx.cpp
+    memcpy_jart.S
+    glibc/memcpy-ssse3.S
+    glibc/memcpy-ssse3-back.S
+    glibc/memmove-sse2-unaligned-erms.S
+    glibc/memmove-avx-unaligned-erms.S
+    glibc/memmove-avx512-unaligned-erms.S
+    glibc/memmove-avx512-no-vzeroupper.S
+    )
+
+add_compile_options(memcpy-bench PRIVATE -fno-tree-loop-distribute-patterns)
+
+set_source_files_properties(FastMemcpy.cpp PROPERTIES COMPILE_FLAGS "-Wno-old-style-cast")
+set_source_files_properties(FastMemcpy_Avx.cpp PROPERTIES COMPILE_FLAGS "-mavx -Wno-old-style-cast -Wno-cast-qual -Wno-cast-align")
+
+target_link_libraries(memcpy-bench PRIVATE dbms boost::program_options)
+
diff --git a/utils/memcpy-bench/FastMemcpy.cpp b/utils/memcpy-bench/FastMemcpy.cpp
new file mode 100644
index 00000000000..9a50caba2b1
--- /dev/null
+++ b/utils/memcpy-bench/FastMemcpy.cpp
@@ -0,0 +1 @@
+#include "FastMemcpy.h"
diff --git a/utils/memcpy-bench/FastMemcpy.h b/utils/memcpy-bench/FastMemcpy.h
new file mode 100644
index 00000000000..85d09c5f53e
--- /dev/null
+++ b/utils/memcpy-bench/FastMemcpy.h
@@ -0,0 +1,770 @@
+#pragma once
+
+//=====================================================================
+//
+// FastMemcpy.c - skywind3000@163.com, 2015
+//
+// feature:
+// 50% speed up in avg. vs standard memcpy (tested in vc2012/gcc5.1)
+//
+//=====================================================================
+
+#include <stddef.h>
+#include <stdint.h>
+#include <emmintrin.h>
+
+
+//---------------------------------------------------------------------
+// force inline for compilers
+//---------------------------------------------------------------------
+#ifndef INLINE
+#ifdef __GNUC__
+#if (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1))
+    #define INLINE         __inline__ __attribute__((always_inline))
+#else
+    #define INLINE         __inline__
+#endif
+#elif defined(_MSC_VER)
+    #define INLINE __forceinline
+#elif (defined(__BORLANDC__) || defined(__WATCOMC__))
+    #define INLINE __inline
+#else
+    #define INLINE
+#endif
+#endif
+
+typedef __attribute__((__aligned__(1))) uint16_t uint16_unaligned_t;
+typedef __attribute__((__aligned__(1))) uint32_t uint32_unaligned_t;
+typedef __attribute__((__aligned__(1))) uint64_t uint64_unaligned_t;
+
+//---------------------------------------------------------------------
+// fast copy for different sizes
+//---------------------------------------------------------------------
+static INLINE void memcpy_sse2_16(void * __restrict dst, const void * __restrict src)
+{
+    __m128i m0 = _mm_loadu_si128((reinterpret_cast<const __m128i*>(src)) + 0);
+    _mm_storeu_si128((reinterpret_cast<__m128i*>(dst)) + 0, m0);
+}
+
+static INLINE void memcpy_sse2_32(void * __restrict dst, const void * __restrict src)
+{
+    __m128i m0 = _mm_loadu_si128((reinterpret_cast<const __m128i*>(src)) + 0);
+    __m128i m1 = _mm_loadu_si128((reinterpret_cast<const __m128i*>(src)) + 1);
+    _mm_storeu_si128((reinterpret_cast<__m128i*>(dst)) + 0, m0);
+    _mm_storeu_si128((reinterpret_cast<__m128i*>(dst)) + 1, m1);
+}
+
+static INLINE void memcpy_sse2_64(void * __restrict dst, const void * __restrict src)
+{
+    __m128i m0 = _mm_loadu_si128((reinterpret_cast<const __m128i*>(src)) + 0);
+    __m128i m1 = _mm_loadu_si128((reinterpret_cast<const __m128i*>(src)) + 1);
+    __m128i m2 = _mm_loadu_si128((reinterpret_cast<const __m128i*>(src)) + 2);
+    __m128i m3 = _mm_loadu_si128((reinterpret_cast<const __m128i*>(src)) + 3);
+    _mm_storeu_si128((reinterpret_cast<__m128i*>(dst)) + 0, m0);
+    _mm_storeu_si128((reinterpret_cast<__m128i*>(dst)) + 1, m1);
+    _mm_storeu_si128((reinterpret_cast<__m128i*>(dst)) + 2, m2);
+    _mm_storeu_si128((reinterpret_cast<__m128i*>(dst)) + 3, m3);
+}
+
+static INLINE void memcpy_sse2_128(void * __restrict dst, const void * __restrict src)
+{
+    __m128i m0 = _mm_loadu_si128((reinterpret_cast<const __m128i*>(src)) + 0);
+    __m128i m1 = _mm_loadu_si128((reinterpret_cast<const __m128i*>(src)) + 1);
+    __m128i m2 = _mm_loadu_si128((reinterpret_cast<const __m128i*>(src)) + 2);
+    __m128i m3 = _mm_loadu_si128((reinterpret_cast<const __m128i*>(src)) + 3);
+    __m128i m4 = _mm_loadu_si128((reinterpret_cast<const __m128i*>(src)) + 4);
+    __m128i m5 = _mm_loadu_si128((reinterpret_cast<const __m128i*>(src)) + 5);
+    __m128i m6 = _mm_loadu_si128((reinterpret_cast<const __m128i*>(src)) + 6);
+    __m128i m7 = _mm_loadu_si128((reinterpret_cast<const __m128i*>(src)) + 7);
+    _mm_storeu_si128((reinterpret_cast<__m128i*>(dst)) + 0, m0);
+    _mm_storeu_si128((reinterpret_cast<__m128i*>(dst)) + 1, m1);
+    _mm_storeu_si128((reinterpret_cast<__m128i*>(dst)) + 2, m2);
+    _mm_storeu_si128((reinterpret_cast<__m128i*>(dst)) + 3, m3);
+    _mm_storeu_si128((reinterpret_cast<__m128i*>(dst)) + 4, m4);
+    _mm_storeu_si128((reinterpret_cast<__m128i*>(dst)) + 5, m5);
+    _mm_storeu_si128((reinterpret_cast<__m128i*>(dst)) + 6, m6);
+    _mm_storeu_si128((reinterpret_cast<__m128i*>(dst)) + 7, m7);
+}
+
+
+//---------------------------------------------------------------------
+// tiny memory copy with jump table optimized
+//---------------------------------------------------------------------
+/// Attribute is used to avoid an error with undefined behaviour sanitizer
+/// ../contrib/FastMemcpy/FastMemcpy.h:91:56: runtime error: applying zero offset to null pointer
+/// Found by 01307_orc_output_format.sh, cause - ORCBlockInputFormat and external ORC library.
+__attribute__((__no_sanitize__("undefined"))) inline void *memcpy_tiny(void * __restrict dst, const void * __restrict src, size_t size)
+{
+    unsigned char *dd = ((unsigned char*)dst) + size;
+    const unsigned char *ss = ((const unsigned char*)src) + size;
+
+    switch (size)
+    {
+    case 64:
+        memcpy_sse2_64(dd - 64, ss - 64);
+        [[fallthrough]];
+    case 0:
+        break;
+
+    case 65:
+        memcpy_sse2_64(dd - 65, ss - 65);
+        [[fallthrough]];
+    case 1:
+        dd[-1] = ss[-1];
+        break;
+
+    case 66:
+        memcpy_sse2_64(dd - 66, ss - 66);
+        [[fallthrough]];
+    case 2:
+        *((uint16_unaligned_t*)(dd - 2)) = *((const uint16_unaligned_t*)(ss - 2));
+        break;
+
+    case 67:
+        memcpy_sse2_64(dd - 67, ss - 67);
+        [[fallthrough]];
+    case 3:
+        *((uint16_unaligned_t*)(dd - 3)) = *((const uint16_unaligned_t*)(ss - 3));
+        dd[-1] = ss[-1];
+        break;
+
+    case 68:
+        memcpy_sse2_64(dd - 68, ss - 68);
+        [[fallthrough]];
+    case 4:
+        *((uint32_unaligned_t*)(dd - 4)) = *((const uint32_unaligned_t*)(ss - 4));
+        break;
+
+    case 69:
+        memcpy_sse2_64(dd - 69, ss - 69);
+        [[fallthrough]];
+    case 5:
+        *((uint32_unaligned_t*)(dd - 5)) = *((const uint32_unaligned_t*)(ss - 5));
+        dd[-1] = ss[-1];
+        break;
+
+    case 70:
+        memcpy_sse2_64(dd - 70, ss - 70);
+        [[fallthrough]];
+    case 6:
+        *((uint32_unaligned_t*)(dd - 6)) = *((const uint32_unaligned_t*)(ss - 6));
+        *((uint16_unaligned_t*)(dd - 2)) = *((const uint16_unaligned_t*)(ss - 2));
+        break;
+
+    case 71:
+        memcpy_sse2_64(dd - 71, ss - 71);
+        [[fallthrough]];
+    case 7:
+        *((uint32_unaligned_t*)(dd - 7)) = *((const uint32_unaligned_t*)(ss - 7));
+        *((uint32_unaligned_t*)(dd - 4)) = *((const uint32_unaligned_t*)(ss - 4));
+        break;
+
+    case 72:
+        memcpy_sse2_64(dd - 72, ss - 72);
+        [[fallthrough]];
+    case 8:
+        *((uint64_unaligned_t*)(dd - 8)) = *((const uint64_unaligned_t*)(ss - 8));
+        break;
+
+    case 73:
+        memcpy_sse2_64(dd - 73, ss - 73);
+        [[fallthrough]];
+    case 9:
+        *((uint64_unaligned_t*)(dd - 9)) = *((const uint64_unaligned_t*)(ss - 9));
+        dd[-1] = ss[-1];
+        break;
+
+    case 74:
+        memcpy_sse2_64(dd - 74, ss - 74);
+        [[fallthrough]];
+    case 10:
+        *((uint64_unaligned_t*)(dd - 10)) = *((const uint64_unaligned_t*)(ss - 10));
+        *((uint16_unaligned_t*)(dd - 2)) = *((const uint16_unaligned_t*)(ss - 2));
+        break;
+
+    case 75:
+        memcpy_sse2_64(dd - 75, ss - 75);
+        [[fallthrough]];
+    case 11:
+        *((uint64_unaligned_t*)(dd - 11)) = *((const uint64_unaligned_t*)(ss - 11));
+        *((uint32_unaligned_t*)(dd - 4)) = *((const uint32_unaligned_t*)(ss - 4));
+        break;
+
+    case 76:
+        memcpy_sse2_64(dd - 76, ss - 76);
+        [[fallthrough]];
+    case 12:
+        *((uint64_unaligned_t*)(dd - 12)) = *((const uint64_unaligned_t*)(ss - 12));
+        *((uint32_unaligned_t*)(dd - 4)) = *((const uint32_unaligned_t*)(ss - 4));
+        break;
+
+    case 77:
+        memcpy_sse2_64(dd - 77, ss - 77);
+        [[fallthrough]];
+    case 13:
+        *((uint64_unaligned_t*)(dd - 13)) = *((const uint64_unaligned_t*)(ss - 13));
+        *((uint32_unaligned_t*)(dd - 5)) = *((const uint32_unaligned_t*)(ss - 5));
+        dd[-1] = ss[-1];
+        break;
+
+    case 78:
+        memcpy_sse2_64(dd - 78, ss - 78);
+        [[fallthrough]];
+    case 14:
+        *((uint64_unaligned_t*)(dd - 14)) = *((const uint64_unaligned_t*)(ss - 14));
+        *((uint64_unaligned_t*)(dd - 8)) = *((const uint64_unaligned_t*)(ss - 8));
+        break;
+
+    case 79:
+        memcpy_sse2_64(dd - 79, ss - 79);
+        [[fallthrough]];
+    case 15:
+        *((uint64_unaligned_t*)(dd - 15)) = *((const uint64_unaligned_t*)(ss - 15));
+        *((uint64_unaligned_t*)(dd - 8)) = *((const uint64_unaligned_t*)(ss - 8));
+        break;
+
+    case 80:
+        memcpy_sse2_64(dd - 80, ss - 80);
+        [[fallthrough]];
+    case 16:
+        memcpy_sse2_16(dd - 16, ss - 16);
+        break;
+
+    case 81:
+        memcpy_sse2_64(dd - 81, ss - 81);
+        [[fallthrough]];
+    case 17:
+        memcpy_sse2_16(dd - 17, ss - 17);
+        dd[-1] = ss[-1];
+        break;
+
+    case 82:
+        memcpy_sse2_64(dd - 82, ss - 82);
+        [[fallthrough]];
+    case 18:
+        memcpy_sse2_16(dd - 18, ss - 18);
+        *((uint16_unaligned_t*)(dd - 2)) = *((const uint16_unaligned_t*)(ss - 2));
+        break;
+
+    case 83:
+        memcpy_sse2_64(dd - 83, ss - 83);
+        [[fallthrough]];
+    case 19:
+        memcpy_sse2_16(dd - 19, ss - 19);
+        *((uint16_unaligned_t*)(dd - 3)) = *((const uint16_unaligned_t*)(ss - 3));
+        dd[-1] = ss[-1];
+        break;
+
+    case 84:
+        memcpy_sse2_64(dd - 84, ss - 84);
+        [[fallthrough]];
+    case 20:
+        memcpy_sse2_16(dd - 20, ss - 20);
+        *((uint32_unaligned_t*)(dd - 4)) = *((const uint32_unaligned_t*)(ss - 4));
+        break;
+
+    case 85:
+        memcpy_sse2_64(dd - 85, ss - 85);
+        [[fallthrough]];
+    case 21:
+        memcpy_sse2_16(dd - 21, ss - 21);
+        *((uint32_unaligned_t*)(dd - 5)) = *((const uint32_unaligned_t*)(ss - 5));
+        dd[-1] = ss[-1];
+        break;
+
+    case 86:
+        memcpy_sse2_64(dd - 86, ss - 86);
+        [[fallthrough]];
+    case 22:
+        memcpy_sse2_16(dd - 22, ss - 22);
+        *((uint32_unaligned_t*)(dd - 6)) = *((const uint32_unaligned_t*)(ss - 6));
+        *((uint16_unaligned_t*)(dd - 2)) = *((const uint16_unaligned_t*)(ss - 2));
+        break;
+
+    case 87:
+        memcpy_sse2_64(dd - 87, ss - 87);
+        [[fallthrough]];
+    case 23:
+        memcpy_sse2_16(dd - 23, ss - 23);
+        *((uint32_unaligned_t*)(dd - 7)) = *((const uint32_unaligned_t*)(ss - 7));
+        *((uint32_unaligned_t*)(dd - 4)) = *((const uint32_unaligned_t*)(ss - 4));
+        break;
+
+    case 88:
+        memcpy_sse2_64(dd - 88, ss - 88);
+        [[fallthrough]];
+    case 24:
+        memcpy_sse2_16(dd - 24, ss - 24);
+        memcpy_sse2_16(dd - 16, ss - 16);
+        break;
+
+    case 89:
+        memcpy_sse2_64(dd - 89, ss - 89);
+        [[fallthrough]];
+    case 25:
+        memcpy_sse2_16(dd - 25, ss - 25);
+        memcpy_sse2_16(dd - 16, ss - 16);
+        break;
+
+    case 90:
+        memcpy_sse2_64(dd - 90, ss - 90);
+        [[fallthrough]];
+    case 26:
+        memcpy_sse2_16(dd - 26, ss - 26);
+        memcpy_sse2_16(dd - 16, ss - 16);
+        break;
+
+    case 91:
+        memcpy_sse2_64(dd - 91, ss - 91);
+        [[fallthrough]];
+    case 27:
+        memcpy_sse2_16(dd - 27, ss - 27);
+        memcpy_sse2_16(dd - 16, ss - 16);
+        break;
+
+    case 92:
+        memcpy_sse2_64(dd - 92, ss - 92);
+        [[fallthrough]];
+    case 28:
+        memcpy_sse2_16(dd - 28, ss - 28);
+        memcpy_sse2_16(dd - 16, ss - 16);
+        break;
+
+    case 93:
+        memcpy_sse2_64(dd - 93, ss - 93);
+        [[fallthrough]];
+    case 29:
+        memcpy_sse2_16(dd - 29, ss - 29);
+        memcpy_sse2_16(dd - 16, ss - 16);
+        break;
+
+    case 94:
+        memcpy_sse2_64(dd - 94, ss - 94);
+        [[fallthrough]];
+    case 30:
+        memcpy_sse2_16(dd - 30, ss - 30);
+        memcpy_sse2_16(dd - 16, ss - 16);
+        break;
+
+    case 95:
+        memcpy_sse2_64(dd - 95, ss - 95);
+        [[fallthrough]];
+    case 31:
+        memcpy_sse2_16(dd - 31, ss - 31);
+        memcpy_sse2_16(dd - 16, ss - 16);
+        break;
+
+    case 96:
+        memcpy_sse2_64(dd - 96, ss - 96);
+        [[fallthrough]];
+    case 32:
+        memcpy_sse2_32(dd - 32, ss - 32);
+        break;
+
+    case 97:
+        memcpy_sse2_64(dd - 97, ss - 97);
+        [[fallthrough]];
+    case 33:
+        memcpy_sse2_32(dd - 33, ss - 33);
+        dd[-1] = ss[-1];
+        break;
+
+    case 98:
+        memcpy_sse2_64(dd - 98, ss - 98);
+        [[fallthrough]];
+    case 34:
+        memcpy_sse2_32(dd - 34, ss - 34);
+        *((uint16_unaligned_t*)(dd - 2)) = *((const uint16_unaligned_t*)(ss - 2));
+        break;
+
+    case 99:
+        memcpy_sse2_64(dd - 99, ss - 99);
+        [[fallthrough]];
+    case 35:
+        memcpy_sse2_32(dd - 35, ss - 35);
+        *((uint16_unaligned_t*)(dd - 3)) = *((const uint16_unaligned_t*)(ss - 3));
+        dd[-1] = ss[-1];
+        break;
+
+    case 100:
+        memcpy_sse2_64(dd - 100, ss - 100);
+        [[fallthrough]];
+    case 36:
+        memcpy_sse2_32(dd - 36, ss - 36);
+        *((uint32_unaligned_t*)(dd - 4)) = *((const uint32_unaligned_t*)(ss - 4));
+        break;
+
+    case 101:
+        memcpy_sse2_64(dd - 101, ss - 101);
+        [[fallthrough]];
+    case 37:
+        memcpy_sse2_32(dd - 37, ss - 37);
+        *((uint32_unaligned_t*)(dd - 5)) = *((const uint32_unaligned_t*)(ss - 5));
+        dd[-1] = ss[-1];
+        break;
+
+    case 102:
+        memcpy_sse2_64(dd - 102, ss - 102);
+        [[fallthrough]];
+    case 38:
+        memcpy_sse2_32(dd - 38, ss - 38);
+        *((uint32_unaligned_t*)(dd - 6)) = *((const uint32_unaligned_t*)(ss - 6));
+        *((uint16_unaligned_t*)(dd - 2)) = *((const uint16_unaligned_t*)(ss - 2));
+        break;
+
+    case 103:
+        memcpy_sse2_64(dd - 103, ss - 103);
+        [[fallthrough]];
+    case 39:
+        memcpy_sse2_32(dd - 39, ss - 39);
+        *((uint32_unaligned_t*)(dd - 7)) = *((const uint32_unaligned_t*)(ss - 7));
+        *((uint32_unaligned_t*)(dd - 4)) = *((const uint32_unaligned_t*)(ss - 4));
+        break;
+
+    case 104:
+        memcpy_sse2_64(dd - 104, ss - 104);
+        [[fallthrough]];
+    case 40:
+        memcpy_sse2_32(dd - 40, ss - 40);
+        *((uint64_unaligned_t*)(dd - 8)) = *((const uint64_unaligned_t*)(ss - 8));
+        break;
+
+    case 105:
+        memcpy_sse2_64(dd - 105, ss - 105);
+        [[fallthrough]];
+    case 41:
+        memcpy_sse2_32(dd - 41, ss - 41);
+        *((uint64_unaligned_t*)(dd - 9)) = *((const uint64_unaligned_t*)(ss - 9));
+        dd[-1] = ss[-1];
+        break;
+
+    case 106:
+        memcpy_sse2_64(dd - 106, ss - 106);
+        [[fallthrough]];
+    case 42:
+        memcpy_sse2_32(dd - 42, ss - 42);
+        *((uint64_unaligned_t*)(dd - 10)) = *((const uint64_unaligned_t*)(ss - 10));
+        *((uint16_unaligned_t*)(dd - 2)) = *((const uint16_unaligned_t*)(ss - 2));
+        break;
+
+    case 107:
+        memcpy_sse2_64(dd - 107, ss - 107);
+        [[fallthrough]];
+    case 43:
+        memcpy_sse2_32(dd - 43, ss - 43);
+        *((uint64_unaligned_t*)(dd - 11)) = *((const uint64_unaligned_t*)(ss - 11));
+        *((uint32_unaligned_t*)(dd - 4)) = *((const uint32_unaligned_t*)(ss - 4));
+        break;
+
+    case 108:
+        memcpy_sse2_64(dd - 108, ss - 108);
+        [[fallthrough]];
+    case 44:
+        memcpy_sse2_32(dd - 44, ss - 44);
+        *((uint64_unaligned_t*)(dd - 12)) = *((const uint64_unaligned_t*)(ss - 12));
+        *((uint32_unaligned_t*)(dd - 4)) = *((const uint32_unaligned_t*)(ss - 4));
+        break;
+
+    case 109:
+        memcpy_sse2_64(dd - 109, ss - 109);
+        [[fallthrough]];
+    case 45:
+        memcpy_sse2_32(dd - 45, ss - 45);
+        *((uint64_unaligned_t*)(dd - 13)) = *((const uint64_unaligned_t*)(ss - 13));
+        *((uint32_unaligned_t*)(dd - 5)) = *((const uint32_unaligned_t*)(ss - 5));
+        dd[-1] = ss[-1];
+        break;
+
+    case 110:
+        memcpy_sse2_64(dd - 110, ss - 110);
+        [[fallthrough]];
+    case 46:
+        memcpy_sse2_32(dd - 46, ss - 46);
+        *((uint64_unaligned_t*)(dd - 14)) = *((const uint64_unaligned_t*)(ss - 14));
+        *((uint64_unaligned_t*)(dd - 8)) = *((const uint64_unaligned_t*)(ss - 8));
+        break;
+
+    case 111:
+        memcpy_sse2_64(dd - 111, ss - 111);
+        [[fallthrough]];
+    case 47:
+        memcpy_sse2_32(dd - 47, ss - 47);
+        *((uint64_unaligned_t*)(dd - 15)) = *((const uint64_unaligned_t*)(ss - 15));
+        *((uint64_unaligned_t*)(dd - 8)) = *((const uint64_unaligned_t*)(ss - 8));
+        break;
+
+    case 112:
+        memcpy_sse2_64(dd - 112, ss - 112);
+        [[fallthrough]];
+    case 48:
+        memcpy_sse2_32(dd - 48, ss - 48);
+        memcpy_sse2_16(dd - 16, ss - 16);
+        break;
+
+    case 113:
+        memcpy_sse2_64(dd - 113, ss - 113);
+        [[fallthrough]];
+    case 49:
+        memcpy_sse2_32(dd - 49, ss - 49);
+        memcpy_sse2_16(dd - 17, ss - 17);
+        dd[-1] = ss[-1];
+        break;
+
+    case 114:
+        memcpy_sse2_64(dd - 114, ss - 114);
+        [[fallthrough]];
+    case 50:
+        memcpy_sse2_32(dd - 50, ss - 50);
+        memcpy_sse2_16(dd - 18, ss - 18);
+        *((uint16_unaligned_t*)(dd - 2)) = *((const uint16_unaligned_t*)(ss - 2));
+        break;
+
+    case 115:
+        memcpy_sse2_64(dd - 115, ss - 115);
+        [[fallthrough]];
+    case 51:
+        memcpy_sse2_32(dd - 51, ss - 51);
+        memcpy_sse2_16(dd - 19, ss - 19);
+        *((uint16_unaligned_t*)(dd - 3)) = *((const uint16_unaligned_t*)(ss - 3));
+        dd[-1] = ss[-1];
+        break;
+
+    case 116:
+        memcpy_sse2_64(dd - 116, ss - 116);
+        [[fallthrough]];
+    case 52:
+        memcpy_sse2_32(dd - 52, ss - 52);
+        memcpy_sse2_16(dd - 20, ss - 20);
+        *((uint32_unaligned_t*)(dd - 4)) = *((const uint32_unaligned_t*)(ss - 4));
+        break;
+
+    case 117:
+        memcpy_sse2_64(dd - 117, ss - 117);
+        [[fallthrough]];
+    case 53:
+        memcpy_sse2_32(dd - 53, ss - 53);
+        memcpy_sse2_16(dd - 21, ss - 21);
+        *((uint32_unaligned_t*)(dd - 5)) = *((const uint32_unaligned_t*)(ss - 5));
+        dd[-1] = ss[-1];
+        break;
+
+    case 118:
+        memcpy_sse2_64(dd - 118, ss - 118);
+        [[fallthrough]];
+    case 54:
+        memcpy_sse2_32(dd - 54, ss - 54);
+        memcpy_sse2_16(dd - 22, ss - 22);
+        *((uint32_unaligned_t*)(dd - 6)) = *((const uint32_unaligned_t*)(ss - 6));
+        *((uint16_unaligned_t*)(dd - 2)) = *((const uint16_unaligned_t*)(ss - 2));
+        break;
+
+    case 119:
+        memcpy_sse2_64(dd - 119, ss - 119);
+        [[fallthrough]];
+    case 55:
+        memcpy_sse2_32(dd - 55, ss - 55);
+        memcpy_sse2_16(dd - 23, ss - 23);
+        *((uint32_unaligned_t*)(dd - 7)) = *((const uint32_unaligned_t*)(ss - 7));
+        *((uint32_unaligned_t*)(dd - 4)) = *((const uint32_unaligned_t*)(ss - 4));
+        break;
+
+    case 120:
+        memcpy_sse2_64(dd - 120, ss - 120);
+        [[fallthrough]];
+    case 56:
+        memcpy_sse2_32(dd - 56, ss - 56);
+        memcpy_sse2_16(dd - 24, ss - 24);
+        memcpy_sse2_16(dd - 16, ss - 16);
+        break;
+
+    case 121:
+        memcpy_sse2_64(dd - 121, ss - 121);
+        [[fallthrough]];
+    case 57:
+        memcpy_sse2_32(dd - 57, ss - 57);
+        memcpy_sse2_16(dd - 25, ss - 25);
+        memcpy_sse2_16(dd - 16, ss - 16);
+        break;
+
+    case 122:
+        memcpy_sse2_64(dd - 122, ss - 122);
+        [[fallthrough]];
+    case 58:
+        memcpy_sse2_32(dd - 58, ss - 58);
+        memcpy_sse2_16(dd - 26, ss - 26);
+        memcpy_sse2_16(dd - 16, ss - 16);
+        break;
+
+    case 123:
+        memcpy_sse2_64(dd - 123, ss - 123);
+        [[fallthrough]];
+    case 59:
+        memcpy_sse2_32(dd - 59, ss - 59);
+        memcpy_sse2_16(dd - 27, ss - 27);
+        memcpy_sse2_16(dd - 16, ss - 16);
+        break;
+
+    case 124:
+        memcpy_sse2_64(dd - 124, ss - 124);
+        [[fallthrough]];
+    case 60:
+        memcpy_sse2_32(dd - 60, ss - 60);
+        memcpy_sse2_16(dd - 28, ss - 28);
+        memcpy_sse2_16(dd - 16, ss - 16);
+        break;
+
+    case 125:
+        memcpy_sse2_64(dd - 125, ss - 125);
+        [[fallthrough]];
+    case 61:
+        memcpy_sse2_32(dd - 61, ss - 61);
+        memcpy_sse2_16(dd - 29, ss - 29);
+        memcpy_sse2_16(dd - 16, ss - 16);
+        break;
+
+    case 126:
+        memcpy_sse2_64(dd - 126, ss - 126);
+        [[fallthrough]];
+    case 62:
+        memcpy_sse2_32(dd - 62, ss - 62);
+        memcpy_sse2_16(dd - 30, ss - 30);
+        memcpy_sse2_16(dd - 16, ss - 16);
+        break;
+
+    case 127:
+        memcpy_sse2_64(dd - 127, ss - 127);
+        [[fallthrough]];
+    case 63:
+        memcpy_sse2_32(dd - 63, ss - 63);
+        memcpy_sse2_16(dd - 31, ss - 31);
+        memcpy_sse2_16(dd - 16, ss - 16);
+        break;
+
+    case 128:
+        memcpy_sse2_128(dd - 128, ss - 128);
+        break;
+    }
+
+    return dst;
+}
+
+
+//---------------------------------------------------------------------
+// main routine
+//---------------------------------------------------------------------
+void* memcpy_fast_sse(void * __restrict destination, const void * __restrict source, size_t size)
+{
+    unsigned char *dst = (unsigned char*)destination;
+    const unsigned char *src = (const unsigned char*)source;
+    static size_t cachesize = 0x200000; // L2-cache size
+    size_t padding;
+
+    // small memory copy
+    if (size <= 128)
+{
+        return memcpy_tiny(dst, src, size);
+    }
+
+    // align destination to 16 bytes boundary
+    padding = (16 - (((size_t)dst) & 15)) & 15;
+
+    if (padding > 0)
+    {
+        __m128i head = _mm_loadu_si128(reinterpret_cast<const __m128i*>(src));
+        _mm_storeu_si128(reinterpret_cast<__m128i*>(dst), head);
+        dst += padding;
+        src += padding;
+        size -= padding;
+    }
+
+    // medium size copy
+    if (size <= cachesize)
+    {
+        __m128i c0, c1, c2, c3, c4, c5, c6, c7;
+
+        for (; size >= 128; size -= 128)
+        {
+            c0 = _mm_loadu_si128((reinterpret_cast<const __m128i*>(src)) + 0);
+            c1 = _mm_loadu_si128((reinterpret_cast<const __m128i*>(src)) + 1);
+            c2 = _mm_loadu_si128((reinterpret_cast<const __m128i*>(src)) + 2);
+            c3 = _mm_loadu_si128((reinterpret_cast<const __m128i*>(src)) + 3);
+            c4 = _mm_loadu_si128((reinterpret_cast<const __m128i*>(src)) + 4);
+            c5 = _mm_loadu_si128((reinterpret_cast<const __m128i*>(src)) + 5);
+            c6 = _mm_loadu_si128((reinterpret_cast<const __m128i*>(src)) + 6);
+            c7 = _mm_loadu_si128((reinterpret_cast<const __m128i*>(src)) + 7);
+            _mm_prefetch((const char*)(src + 256), _MM_HINT_NTA);
+            src += 128;
+            _mm_store_si128(((reinterpret_cast<__m128i*>(dst)) + 0), c0);
+            _mm_store_si128(((reinterpret_cast<__m128i*>(dst)) + 1), c1);
+            _mm_store_si128(((reinterpret_cast<__m128i*>(dst)) + 2), c2);
+            _mm_store_si128(((reinterpret_cast<__m128i*>(dst)) + 3), c3);
+            _mm_store_si128(((reinterpret_cast<__m128i*>(dst)) + 4), c4);
+            _mm_store_si128(((reinterpret_cast<__m128i*>(dst)) + 5), c5);
+            _mm_store_si128(((reinterpret_cast<__m128i*>(dst)) + 6), c6);
+            _mm_store_si128(((reinterpret_cast<__m128i*>(dst)) + 7), c7);
+            dst += 128;
+        }
+    }
+    else
+    {        // big memory copy
+        __m128i c0, c1, c2, c3, c4, c5, c6, c7;
+
+        _mm_prefetch((const char*)(src), _MM_HINT_NTA);
+
+        if ((((size_t)src) & 15) == 0)
+        {    // source aligned
+            for (; size >= 128; size -= 128)
+            {
+                c0 = _mm_load_si128((reinterpret_cast<const __m128i*>(src)) + 0);
+                c1 = _mm_load_si128((reinterpret_cast<const __m128i*>(src)) + 1);
+                c2 = _mm_load_si128((reinterpret_cast<const __m128i*>(src)) + 2);
+                c3 = _mm_load_si128((reinterpret_cast<const __m128i*>(src)) + 3);
+                c4 = _mm_load_si128((reinterpret_cast<const __m128i*>(src)) + 4);
+                c5 = _mm_load_si128((reinterpret_cast<const __m128i*>(src)) + 5);
+                c6 = _mm_load_si128((reinterpret_cast<const __m128i*>(src)) + 6);
+                c7 = _mm_load_si128((reinterpret_cast<const __m128i*>(src)) + 7);
+                _mm_prefetch((const char*)(src + 256), _MM_HINT_NTA);
+                src += 128;
+                _mm_stream_si128(((reinterpret_cast<__m128i*>(dst)) + 0), c0);
+                _mm_stream_si128(((reinterpret_cast<__m128i*>(dst)) + 1), c1);
+                _mm_stream_si128(((reinterpret_cast<__m128i*>(dst)) + 2), c2);
+                _mm_stream_si128(((reinterpret_cast<__m128i*>(dst)) + 3), c3);
+                _mm_stream_si128(((reinterpret_cast<__m128i*>(dst)) + 4), c4);
+                _mm_stream_si128(((reinterpret_cast<__m128i*>(dst)) + 5), c5);
+                _mm_stream_si128(((reinterpret_cast<__m128i*>(dst)) + 6), c6);
+                _mm_stream_si128(((reinterpret_cast<__m128i*>(dst)) + 7), c7);
+                dst += 128;
+            }
+        }
+        else
+        {                            // source unaligned
+            for (; size >= 128; size -= 128)
+            {
+                c0 = _mm_loadu_si128((reinterpret_cast<const __m128i*>(src)) + 0);
+                c1 = _mm_loadu_si128((reinterpret_cast<const __m128i*>(src)) + 1);
+                c2 = _mm_loadu_si128((reinterpret_cast<const __m128i*>(src)) + 2);
+                c3 = _mm_loadu_si128((reinterpret_cast<const __m128i*>(src)) + 3);
+                c4 = _mm_loadu_si128((reinterpret_cast<const __m128i*>(src)) + 4);
+                c5 = _mm_loadu_si128((reinterpret_cast<const __m128i*>(src)) + 5);
+                c6 = _mm_loadu_si128((reinterpret_cast<const __m128i*>(src)) + 6);
+                c7 = _mm_loadu_si128((reinterpret_cast<const __m128i*>(src)) + 7);
+                _mm_prefetch((const char*)(src + 256), _MM_HINT_NTA);
+                src += 128;
+                _mm_stream_si128(((reinterpret_cast<__m128i*>(dst)) + 0), c0);
+                _mm_stream_si128(((reinterpret_cast<__m128i*>(dst)) + 1), c1);
+                _mm_stream_si128(((reinterpret_cast<__m128i*>(dst)) + 2), c2);
+                _mm_stream_si128(((reinterpret_cast<__m128i*>(dst)) + 3), c3);
+                _mm_stream_si128(((reinterpret_cast<__m128i*>(dst)) + 4), c4);
+                _mm_stream_si128(((reinterpret_cast<__m128i*>(dst)) + 5), c5);
+                _mm_stream_si128(((reinterpret_cast<__m128i*>(dst)) + 6), c6);
+                _mm_stream_si128(((reinterpret_cast<__m128i*>(dst)) + 7), c7);
+                dst += 128;
+            }
+        }
+        _mm_sfence();
+    }
+
+    memcpy_tiny(dst, src, size);
+
+    return destination;
+}
diff --git a/utils/memcpy-bench/FastMemcpy_Avx.cpp b/utils/memcpy-bench/FastMemcpy_Avx.cpp
new file mode 100644
index 00000000000..8cef0f89507
--- /dev/null
+++ b/utils/memcpy-bench/FastMemcpy_Avx.cpp
@@ -0,0 +1 @@
+#include "FastMemcpy_Avx.h"
diff --git a/utils/memcpy-bench/FastMemcpy_Avx.h b/utils/memcpy-bench/FastMemcpy_Avx.h
new file mode 100644
index 00000000000..ee7d4e19536
--- /dev/null
+++ b/utils/memcpy-bench/FastMemcpy_Avx.h
@@ -0,0 +1,496 @@
+#pragma once
+
+//=====================================================================
+//
+// FastMemcpy.c - skywind3000@163.com, 2015
+//
+// feature:
+// 50% speed up in avg. vs standard memcpy (tested in vc2012/gcc5.1)
+//
+//=====================================================================
+
+#include <stddef.h>
+#include <stdint.h>
+#include <immintrin.h>
+
+
+//---------------------------------------------------------------------
+// force inline for compilers
+//---------------------------------------------------------------------
+#ifndef INLINE
+#ifdef __GNUC__
+#if (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1))
+    #define INLINE         __inline__ __attribute__((always_inline))
+#else
+    #define INLINE         __inline__
+#endif
+#elif defined(_MSC_VER)
+    #define INLINE __forceinline
+#elif (defined(__BORLANDC__) || defined(__WATCOMC__))
+    #define INLINE __inline
+#else
+    #define INLINE
+#endif
+#endif
+
+
+//---------------------------------------------------------------------
+// fast copy for different sizes
+//---------------------------------------------------------------------
+static INLINE void memcpy_avx_16(void * __restrict dst, const void * __restrict src)
+{
+#if 1
+    __m128i m0 = _mm_loadu_si128(((const __m128i*)src) + 0);
+    _mm_storeu_si128(((__m128i*)dst) + 0, m0);
+#else
+    *((uint64_t*)((char*)dst + 0)) = *((uint64_t*)((const char*)src + 0));
+    *((uint64_t*)((char*)dst + 8)) = *((uint64_t*)((const char*)src + 8));
+#endif
+}
+
+static INLINE void memcpy_avx_32(void *dst, const void *src)
+{
+    __m256i m0 = _mm256_loadu_si256((reinterpret_cast<const __m256i*>(src)) + 0);
+    _mm256_storeu_si256((reinterpret_cast<__m256i*>(dst)) + 0, m0);
+}
+
+static INLINE void memcpy_avx_64(void *dst, const void *src)
+{
+    __m256i m0 = _mm256_loadu_si256((reinterpret_cast<const __m256i*>(src)) + 0);
+    __m256i m1 = _mm256_loadu_si256((reinterpret_cast<const __m256i*>(src)) + 1);
+    _mm256_storeu_si256((reinterpret_cast<__m256i*>(dst)) + 0, m0);
+    _mm256_storeu_si256((reinterpret_cast<__m256i*>(dst)) + 1, m1);
+}
+
+static INLINE void memcpy_avx_128(void *dst, const void *src)
+{
+    __m256i m0 = _mm256_loadu_si256((reinterpret_cast<const __m256i*>(src)) + 0);
+    __m256i m1 = _mm256_loadu_si256((reinterpret_cast<const __m256i*>(src)) + 1);
+    __m256i m2 = _mm256_loadu_si256((reinterpret_cast<const __m256i*>(src)) + 2);
+    __m256i m3 = _mm256_loadu_si256((reinterpret_cast<const __m256i*>(src)) + 3);
+    _mm256_storeu_si256((reinterpret_cast<__m256i*>(dst)) + 0, m0);
+    _mm256_storeu_si256((reinterpret_cast<__m256i*>(dst)) + 1, m1);
+    _mm256_storeu_si256((reinterpret_cast<__m256i*>(dst)) + 2, m2);
+    _mm256_storeu_si256((reinterpret_cast<__m256i*>(dst)) + 3, m3);
+}
+
+static INLINE void memcpy_avx_256(void *dst, const void *src)
+{
+    __m256i m0 = _mm256_loadu_si256((reinterpret_cast<const __m256i*>(src)) + 0);
+    __m256i m1 = _mm256_loadu_si256((reinterpret_cast<const __m256i*>(src)) + 1);
+    __m256i m2 = _mm256_loadu_si256((reinterpret_cast<const __m256i*>(src)) + 2);
+    __m256i m3 = _mm256_loadu_si256((reinterpret_cast<const __m256i*>(src)) + 3);
+    __m256i m4 = _mm256_loadu_si256((reinterpret_cast<const __m256i*>(src)) + 4);
+    __m256i m5 = _mm256_loadu_si256((reinterpret_cast<const __m256i*>(src)) + 5);
+    __m256i m6 = _mm256_loadu_si256((reinterpret_cast<const __m256i*>(src)) + 6);
+    __m256i m7 = _mm256_loadu_si256((reinterpret_cast<const __m256i*>(src)) + 7);
+    _mm256_storeu_si256((reinterpret_cast<__m256i*>(dst)) + 0, m0);
+    _mm256_storeu_si256((reinterpret_cast<__m256i*>(dst)) + 1, m1);
+    _mm256_storeu_si256((reinterpret_cast<__m256i*>(dst)) + 2, m2);
+    _mm256_storeu_si256((reinterpret_cast<__m256i*>(dst)) + 3, m3);
+    _mm256_storeu_si256((reinterpret_cast<__m256i*>(dst)) + 4, m4);
+    _mm256_storeu_si256((reinterpret_cast<__m256i*>(dst)) + 5, m5);
+    _mm256_storeu_si256((reinterpret_cast<__m256i*>(dst)) + 6, m6);
+    _mm256_storeu_si256((reinterpret_cast<__m256i*>(dst)) + 7, m7);
+}
+
+
+//---------------------------------------------------------------------
+// tiny memory copy with jump table optimized
+//---------------------------------------------------------------------
+static INLINE void *memcpy_tiny_avx(void * __restrict dst, const void * __restrict src, size_t size)
+{
+    unsigned char *dd = reinterpret_cast<unsigned char *>(dst) + size;
+    const unsigned char *ss = reinterpret_cast<const unsigned char*>(src) + size;
+
+    switch (size)
+    {
+    case 128: memcpy_avx_128(dd - 128, ss - 128); [[fallthrough]];
+    case 0:  break;
+    case 129: memcpy_avx_128(dd - 129, ss - 129); [[fallthrough]];
+    case 1: dd[-1] = ss[-1]; break;
+    case 130: memcpy_avx_128(dd - 130, ss - 130); [[fallthrough]];
+    case 2: *((uint16_t*)(dd - 2)) = *((uint16_t*)(ss - 2)); break;
+    case 131: memcpy_avx_128(dd - 131, ss - 131); [[fallthrough]];
+    case 3: *((uint16_t*)(dd - 3)) = *((uint16_t*)(ss - 3)); dd[-1] = ss[-1]; break;
+    case 132: memcpy_avx_128(dd - 132, ss - 132); [[fallthrough]];
+    case 4: *((uint32_t*)(dd - 4)) = *((uint32_t*)(ss - 4)); break;
+    case 133: memcpy_avx_128(dd - 133, ss - 133); [[fallthrough]];
+    case 5: *((uint32_t*)(dd - 5)) = *((uint32_t*)(ss - 5)); dd[-1] = ss[-1]; break;
+    case 134: memcpy_avx_128(dd - 134, ss - 134); [[fallthrough]];
+    case 6: *((uint32_t*)(dd - 6)) = *((uint32_t*)(ss - 6)); *((uint16_t*)(dd - 2)) = *((uint16_t*)(ss - 2)); break;
+    case 135: memcpy_avx_128(dd - 135, ss - 135); [[fallthrough]];
+    case 7: *((uint32_t*)(dd - 7)) = *((uint32_t*)(ss - 7)); *((uint32_t*)(dd - 4)) = *((uint32_t*)(ss - 4)); break;
+    case 136: memcpy_avx_128(dd - 136, ss - 136); [[fallthrough]];
+    case 8: *((uint64_t*)(dd - 8)) = *((uint64_t*)(ss - 8)); break;
+    case 137: memcpy_avx_128(dd - 137, ss - 137); [[fallthrough]];
+    case 9: *((uint64_t*)(dd - 9)) = *((uint64_t*)(ss - 9)); dd[-1] = ss[-1]; break;
+    case 138: memcpy_avx_128(dd - 138, ss - 138); [[fallthrough]];
+    case 10: *((uint64_t*)(dd - 10)) = *((uint64_t*)(ss - 10)); *((uint16_t*)(dd - 2)) = *((uint16_t*)(ss - 2)); break;
+    case 139: memcpy_avx_128(dd - 139, ss - 139); [[fallthrough]];
+    case 11: *((uint64_t*)(dd - 11)) = *((uint64_t*)(ss - 11)); *((uint32_t*)(dd - 4)) = *((uint32_t*)(ss - 4)); break;
+    case 140: memcpy_avx_128(dd - 140, ss - 140); [[fallthrough]];
+    case 12: *((uint64_t*)(dd - 12)) = *((uint64_t*)(ss - 12)); *((uint32_t*)(dd - 4)) = *((uint32_t*)(ss - 4)); break;
+    case 141: memcpy_avx_128(dd - 141, ss - 141); [[fallthrough]];
+    case 13: *((uint64_t*)(dd - 13)) = *((uint64_t*)(ss - 13)); *((uint64_t*)(dd - 8)) = *((uint64_t*)(ss - 8)); break;
+    case 142: memcpy_avx_128(dd - 142, ss - 142); [[fallthrough]];
+    case 14: *((uint64_t*)(dd - 14)) = *((uint64_t*)(ss - 14)); *((uint64_t*)(dd - 8)) = *((uint64_t*)(ss - 8)); break;
+    case 143: memcpy_avx_128(dd - 143, ss - 143); [[fallthrough]];
+    case 15: *((uint64_t*)(dd - 15)) = *((uint64_t*)(ss - 15)); *((uint64_t*)(dd - 8)) = *((uint64_t*)(ss - 8)); break;
+    case 144: memcpy_avx_128(dd - 144, ss - 144); [[fallthrough]];
+    case 16: memcpy_avx_16(dd - 16, ss - 16); break;
+    case 145: memcpy_avx_128(dd - 145, ss - 145); [[fallthrough]];
+    case 17: memcpy_avx_16(dd - 17, ss - 17); dd[-1] = ss[-1]; break;
+    case 146: memcpy_avx_128(dd - 146, ss - 146); [[fallthrough]];
+    case 18: memcpy_avx_16(dd - 18, ss - 18); *((uint16_t*)(dd - 2)) = *((uint16_t*)(ss - 2)); break;
+    case 147: memcpy_avx_128(dd - 147, ss - 147); [[fallthrough]];
+    case 19: memcpy_avx_16(dd - 19, ss - 19); *((uint32_t*)(dd - 4)) = *((uint32_t*)(ss - 4)); break;
+    case 148: memcpy_avx_128(dd - 148, ss - 148); [[fallthrough]];
+    case 20: memcpy_avx_16(dd - 20, ss - 20); *((uint32_t*)(dd - 4)) = *((uint32_t*)(ss - 4)); break;
+    case 149: memcpy_avx_128(dd - 149, ss - 149); [[fallthrough]];
+    case 21: memcpy_avx_16(dd - 21, ss - 21); *((uint64_t*)(dd - 8)) = *((uint64_t*)(ss - 8)); break;
+    case 150: memcpy_avx_128(dd - 150, ss - 150); [[fallthrough]];
+    case 22: memcpy_avx_16(dd - 22, ss - 22); *((uint64_t*)(dd - 8)) = *((uint64_t*)(ss - 8)); break;
+    case 151: memcpy_avx_128(dd - 151, ss - 151); [[fallthrough]];
+    case 23: memcpy_avx_16(dd - 23, ss - 23); *((uint64_t*)(dd - 8)) = *((uint64_t*)(ss - 8)); break;
+    case 152: memcpy_avx_128(dd - 152, ss - 152); [[fallthrough]];
+    case 24: memcpy_avx_16(dd - 24, ss - 24); *((uint64_t*)(dd - 8)) = *((uint64_t*)(ss - 8)); break;
+    case 153: memcpy_avx_128(dd - 153, ss - 153); [[fallthrough]];
+    case 25: memcpy_avx_16(dd - 25, ss - 25); memcpy_avx_16(dd - 16, ss - 16); break;
+    case 154: memcpy_avx_128(dd - 154, ss - 154); [[fallthrough]];
+    case 26: memcpy_avx_16(dd - 26, ss - 26); memcpy_avx_16(dd - 16, ss - 16); break;
+    case 155: memcpy_avx_128(dd - 155, ss - 155); [[fallthrough]];
+    case 27: memcpy_avx_16(dd - 27, ss - 27); memcpy_avx_16(dd - 16, ss - 16); break;
+    case 156: memcpy_avx_128(dd - 156, ss - 156); [[fallthrough]];
+    case 28: memcpy_avx_16(dd - 28, ss - 28); memcpy_avx_16(dd - 16, ss - 16); break;
+    case 157: memcpy_avx_128(dd - 157, ss - 157); [[fallthrough]];
+    case 29: memcpy_avx_16(dd - 29, ss - 29); memcpy_avx_16(dd - 16, ss - 16); break;
+    case 158: memcpy_avx_128(dd - 158, ss - 158); [[fallthrough]];
+    case 30: memcpy_avx_16(dd - 30, ss - 30); memcpy_avx_16(dd - 16, ss - 16); break;
+    case 159: memcpy_avx_128(dd - 159, ss - 159); [[fallthrough]];
+    case 31: memcpy_avx_16(dd - 31, ss - 31); memcpy_avx_16(dd - 16, ss - 16); break;
+    case 160: memcpy_avx_128(dd - 160, ss - 160); [[fallthrough]];
+    case 32: memcpy_avx_32(dd - 32, ss - 32); break;
+    case 161: memcpy_avx_128(dd - 161, ss - 161); [[fallthrough]];
+    case 33: memcpy_avx_32(dd - 33, ss - 33); dd[-1] = ss[-1]; break;
+    case 162: memcpy_avx_128(dd - 162, ss - 162); [[fallthrough]];
+    case 34: memcpy_avx_32(dd - 34, ss - 34); *((uint16_t*)(dd - 2)) = *((uint16_t*)(ss - 2)); break;
+    case 163: memcpy_avx_128(dd - 163, ss - 163); [[fallthrough]];
+    case 35: memcpy_avx_32(dd - 35, ss - 35); *((uint32_t*)(dd - 4)) = *((uint32_t*)(ss - 4)); break;
+    case 164: memcpy_avx_128(dd - 164, ss - 164); [[fallthrough]];
+    case 36: memcpy_avx_32(dd - 36, ss - 36); *((uint32_t*)(dd - 4)) = *((uint32_t*)(ss - 4)); break;
+    case 165: memcpy_avx_128(dd - 165, ss - 165); [[fallthrough]];
+    case 37: memcpy_avx_32(dd - 37, ss - 37); *((uint64_t*)(dd - 8)) = *((uint64_t*)(ss - 8)); break;
+    case 166: memcpy_avx_128(dd - 166, ss - 166); [[fallthrough]];
+    case 38: memcpy_avx_32(dd - 38, ss - 38); *((uint64_t*)(dd - 8)) = *((uint64_t*)(ss - 8)); break;
+    case 167: memcpy_avx_128(dd - 167, ss - 167); [[fallthrough]];
+    case 39: memcpy_avx_32(dd - 39, ss - 39); *((uint64_t*)(dd - 8)) = *((uint64_t*)(ss - 8)); break;
+    case 168: memcpy_avx_128(dd - 168, ss - 168); [[fallthrough]];
+    case 40: memcpy_avx_32(dd - 40, ss - 40); *((uint64_t*)(dd - 8)) = *((uint64_t*)(ss - 8)); break;
+    case 169: memcpy_avx_128(dd - 169, ss - 169); [[fallthrough]];
+    case 41: memcpy_avx_32(dd - 41, ss - 41); memcpy_avx_16(dd - 16, ss - 16); break;
+    case 170: memcpy_avx_128(dd - 170, ss - 170); [[fallthrough]];
+    case 42: memcpy_avx_32(dd - 42, ss - 42); memcpy_avx_16(dd - 16, ss - 16); break;
+    case 171: memcpy_avx_128(dd - 171, ss - 171); [[fallthrough]];
+    case 43: memcpy_avx_32(dd - 43, ss - 43); memcpy_avx_16(dd - 16, ss - 16); break;
+    case 172: memcpy_avx_128(dd - 172, ss - 172); [[fallthrough]];
+    case 44: memcpy_avx_32(dd - 44, ss - 44); memcpy_avx_16(dd - 16, ss - 16); break;
+    case 173: memcpy_avx_128(dd - 173, ss - 173); [[fallthrough]];
+    case 45: memcpy_avx_32(dd - 45, ss - 45); memcpy_avx_16(dd - 16, ss - 16); break;
+    case 174: memcpy_avx_128(dd - 174, ss - 174); [[fallthrough]];
+    case 46: memcpy_avx_32(dd - 46, ss - 46); memcpy_avx_16(dd - 16, ss - 16); break;
+    case 175: memcpy_avx_128(dd - 175, ss - 175); [[fallthrough]];
+    case 47: memcpy_avx_32(dd - 47, ss - 47); memcpy_avx_16(dd - 16, ss - 16); break;
+    case 176: memcpy_avx_128(dd - 176, ss - 176); [[fallthrough]];
+    case 48: memcpy_avx_32(dd - 48, ss - 48); memcpy_avx_16(dd - 16, ss - 16); break;
+    case 177: memcpy_avx_128(dd - 177, ss - 177); [[fallthrough]];
+    case 49: memcpy_avx_32(dd - 49, ss - 49); memcpy_avx_32(dd - 32, ss - 32); break;
+    case 178: memcpy_avx_128(dd - 178, ss - 178); [[fallthrough]];
+    case 50: memcpy_avx_32(dd - 50, ss - 50); memcpy_avx_32(dd - 32, ss - 32); break;
+    case 179: memcpy_avx_128(dd - 179, ss - 179); [[fallthrough]];
+    case 51: memcpy_avx_32(dd - 51, ss - 51); memcpy_avx_32(dd - 32, ss - 32); break;
+    case 180: memcpy_avx_128(dd - 180, ss - 180); [[fallthrough]];
+    case 52: memcpy_avx_32(dd - 52, ss - 52); memcpy_avx_32(dd - 32, ss - 32); break;
+    case 181: memcpy_avx_128(dd - 181, ss - 181); [[fallthrough]];
+    case 53: memcpy_avx_32(dd - 53, ss - 53); memcpy_avx_32(dd - 32, ss - 32); break;
+    case 182: memcpy_avx_128(dd - 182, ss - 182); [[fallthrough]];
+    case 54: memcpy_avx_32(dd - 54, ss - 54); memcpy_avx_32(dd - 32, ss - 32); break;
+    case 183: memcpy_avx_128(dd - 183, ss - 183); [[fallthrough]];
+    case 55: memcpy_avx_32(dd - 55, ss - 55); memcpy_avx_32(dd - 32, ss - 32); break;
+    case 184: memcpy_avx_128(dd - 184, ss - 184); [[fallthrough]];
+    case 56: memcpy_avx_32(dd - 56, ss - 56); memcpy_avx_32(dd - 32, ss - 32); break;
+    case 185: memcpy_avx_128(dd - 185, ss - 185); [[fallthrough]];
+    case 57: memcpy_avx_32(dd - 57, ss - 57); memcpy_avx_32(dd - 32, ss - 32); break;
+    case 186: memcpy_avx_128(dd - 186, ss - 186); [[fallthrough]];
+    case 58: memcpy_avx_32(dd - 58, ss - 58); memcpy_avx_32(dd - 32, ss - 32); break;
+    case 187: memcpy_avx_128(dd - 187, ss - 187); [[fallthrough]];
+    case 59: memcpy_avx_32(dd - 59, ss - 59); memcpy_avx_32(dd - 32, ss - 32); break;
+    case 188: memcpy_avx_128(dd - 188, ss - 188); [[fallthrough]];
+    case 60: memcpy_avx_32(dd - 60, ss - 60); memcpy_avx_32(dd - 32, ss - 32); break;
+    case 189: memcpy_avx_128(dd - 189, ss - 189); [[fallthrough]];
+    case 61: memcpy_avx_32(dd - 61, ss - 61); memcpy_avx_32(dd - 32, ss - 32); break;
+    case 190: memcpy_avx_128(dd - 190, ss - 190); [[fallthrough]];
+    case 62: memcpy_avx_32(dd - 62, ss - 62); memcpy_avx_32(dd - 32, ss - 32); break;
+    case 191: memcpy_avx_128(dd - 191, ss - 191); [[fallthrough]];
+    case 63: memcpy_avx_32(dd - 63, ss - 63); memcpy_avx_32(dd - 32, ss - 32); break;
+    case 192: memcpy_avx_128(dd - 192, ss - 192); [[fallthrough]];
+    case 64: memcpy_avx_64(dd - 64, ss - 64); break;
+    case 193: memcpy_avx_128(dd - 193, ss - 193); [[fallthrough]];
+    case 65: memcpy_avx_64(dd - 65, ss - 65); dd[-1] = ss[-1]; break;
+    case 194: memcpy_avx_128(dd - 194, ss - 194); [[fallthrough]];
+    case 66: memcpy_avx_64(dd - 66, ss - 66); *((uint16_t*)(dd - 2)) = *((uint16_t*)(ss - 2)); break;
+    case 195: memcpy_avx_128(dd - 195, ss - 195); [[fallthrough]];
+    case 67: memcpy_avx_64(dd - 67, ss - 67); *((uint32_t*)(dd - 4)) = *((uint32_t*)(ss - 4)); break;
+    case 196: memcpy_avx_128(dd - 196, ss - 196); [[fallthrough]];
+    case 68: memcpy_avx_64(dd - 68, ss - 68); *((uint32_t*)(dd - 4)) = *((uint32_t*)(ss - 4)); break;
+    case 197: memcpy_avx_128(dd - 197, ss - 197); [[fallthrough]];
+    case 69: memcpy_avx_64(dd - 69, ss - 69); *((uint64_t*)(dd - 8)) = *((uint64_t*)(ss - 8)); break;
+    case 198: memcpy_avx_128(dd - 198, ss - 198); [[fallthrough]];
+    case 70: memcpy_avx_64(dd - 70, ss - 70); *((uint64_t*)(dd - 8)) = *((uint64_t*)(ss - 8)); break;
+    case 199: memcpy_avx_128(dd - 199, ss - 199); [[fallthrough]];
+    case 71: memcpy_avx_64(dd - 71, ss - 71); *((uint64_t*)(dd - 8)) = *((uint64_t*)(ss - 8)); break;
+    case 200: memcpy_avx_128(dd - 200, ss - 200); [[fallthrough]];
+    case 72: memcpy_avx_64(dd - 72, ss - 72); *((uint64_t*)(dd - 8)) = *((uint64_t*)(ss - 8)); break;
+    case 201: memcpy_avx_128(dd - 201, ss - 201); [[fallthrough]];
+    case 73: memcpy_avx_64(dd - 73, ss - 73); memcpy_avx_16(dd - 16, ss - 16); break;
+    case 202: memcpy_avx_128(dd - 202, ss - 202); [[fallthrough]];
+    case 74: memcpy_avx_64(dd - 74, ss - 74); memcpy_avx_16(dd - 16, ss - 16); break;
+    case 203: memcpy_avx_128(dd - 203, ss - 203); [[fallthrough]];
+    case 75: memcpy_avx_64(dd - 75, ss - 75); memcpy_avx_16(dd - 16, ss - 16); break;
+    case 204: memcpy_avx_128(dd - 204, ss - 204); [[fallthrough]];
+    case 76: memcpy_avx_64(dd - 76, ss - 76); memcpy_avx_16(dd - 16, ss - 16); break;
+    case 205: memcpy_avx_128(dd - 205, ss - 205); [[fallthrough]];
+    case 77: memcpy_avx_64(dd - 77, ss - 77); memcpy_avx_16(dd - 16, ss - 16); break;
+    case 206: memcpy_avx_128(dd - 206, ss - 206); [[fallthrough]];
+    case 78: memcpy_avx_64(dd - 78, ss - 78); memcpy_avx_16(dd - 16, ss - 16); break;
+    case 207: memcpy_avx_128(dd - 207, ss - 207); [[fallthrough]];
+    case 79: memcpy_avx_64(dd - 79, ss - 79); memcpy_avx_16(dd - 16, ss - 16); break;
+    case 208: memcpy_avx_128(dd - 208, ss - 208); [[fallthrough]];
+    case 80: memcpy_avx_64(dd - 80, ss - 80); memcpy_avx_16(dd - 16, ss - 16); break;
+    case 209: memcpy_avx_128(dd - 209, ss - 209); [[fallthrough]];
+    case 81: memcpy_avx_64(dd - 81, ss - 81); memcpy_avx_32(dd - 32, ss - 32); break;
+    case 210: memcpy_avx_128(dd - 210, ss - 210); [[fallthrough]];
+    case 82: memcpy_avx_64(dd - 82, ss - 82); memcpy_avx_32(dd - 32, ss - 32); break;
+    case 211: memcpy_avx_128(dd - 211, ss - 211); [[fallthrough]];
+    case 83: memcpy_avx_64(dd - 83, ss - 83); memcpy_avx_32(dd - 32, ss - 32); break;
+    case 212: memcpy_avx_128(dd - 212, ss - 212); [[fallthrough]];
+    case 84: memcpy_avx_64(dd - 84, ss - 84); memcpy_avx_32(dd - 32, ss - 32); break;
+    case 213: memcpy_avx_128(dd - 213, ss - 213); [[fallthrough]];
+    case 85: memcpy_avx_64(dd - 85, ss - 85); memcpy_avx_32(dd - 32, ss - 32); break;
+    case 214: memcpy_avx_128(dd - 214, ss - 214); [[fallthrough]];
+    case 86: memcpy_avx_64(dd - 86, ss - 86); memcpy_avx_32(dd - 32, ss - 32); break;
+    case 215: memcpy_avx_128(dd - 215, ss - 215); [[fallthrough]];
+    case 87: memcpy_avx_64(dd - 87, ss - 87); memcpy_avx_32(dd - 32, ss - 32); break;
+    case 216: memcpy_avx_128(dd - 216, ss - 216); [[fallthrough]];
+    case 88: memcpy_avx_64(dd - 88, ss - 88); memcpy_avx_32(dd - 32, ss - 32); break;
+    case 217: memcpy_avx_128(dd - 217, ss - 217); [[fallthrough]];
+    case 89: memcpy_avx_64(dd - 89, ss - 89); memcpy_avx_32(dd - 32, ss - 32); break;
+    case 218: memcpy_avx_128(dd - 218, ss - 218); [[fallthrough]];
+    case 90: memcpy_avx_64(dd - 90, ss - 90); memcpy_avx_32(dd - 32, ss - 32); break;
+    case 219: memcpy_avx_128(dd - 219, ss - 219); [[fallthrough]];
+    case 91: memcpy_avx_64(dd - 91, ss - 91); memcpy_avx_32(dd - 32, ss - 32); break;
+    case 220: memcpy_avx_128(dd - 220, ss - 220); [[fallthrough]];
+    case 92: memcpy_avx_64(dd - 92, ss - 92); memcpy_avx_32(dd - 32, ss - 32); break;
+    case 221: memcpy_avx_128(dd - 221, ss - 221); [[fallthrough]];
+    case 93: memcpy_avx_64(dd - 93, ss - 93); memcpy_avx_32(dd - 32, ss - 32); break;
+    case 222: memcpy_avx_128(dd - 222, ss - 222); [[fallthrough]];
+    case 94: memcpy_avx_64(dd - 94, ss - 94); memcpy_avx_32(dd - 32, ss - 32); break;
+    case 223: memcpy_avx_128(dd - 223, ss - 223); [[fallthrough]];
+    case 95: memcpy_avx_64(dd - 95, ss - 95); memcpy_avx_32(dd - 32, ss - 32); break;
+    case 224: memcpy_avx_128(dd - 224, ss - 224); [[fallthrough]];
+    case 96: memcpy_avx_64(dd - 96, ss - 96); memcpy_avx_32(dd - 32, ss - 32); break;
+    case 225: memcpy_avx_128(dd - 225, ss - 225); [[fallthrough]];
+    case 97: memcpy_avx_64(dd - 97, ss - 97); memcpy_avx_64(dd - 64, ss - 64); break;
+    case 226: memcpy_avx_128(dd - 226, ss - 226); [[fallthrough]];
+    case 98: memcpy_avx_64(dd - 98, ss - 98); memcpy_avx_64(dd - 64, ss - 64); break;
+    case 227: memcpy_avx_128(dd - 227, ss - 227); [[fallthrough]];
+    case 99: memcpy_avx_64(dd - 99, ss - 99); memcpy_avx_64(dd - 64, ss - 64); break;
+    case 228: memcpy_avx_128(dd - 228, ss - 228); [[fallthrough]];
+    case 100: memcpy_avx_64(dd - 100, ss - 100); memcpy_avx_64(dd - 64, ss - 64); break;
+    case 229: memcpy_avx_128(dd - 229, ss - 229); [[fallthrough]];
+    case 101: memcpy_avx_64(dd - 101, ss - 101); memcpy_avx_64(dd - 64, ss - 64); break;
+    case 230: memcpy_avx_128(dd - 230, ss - 230); [[fallthrough]];
+    case 102: memcpy_avx_64(dd - 102, ss - 102); memcpy_avx_64(dd - 64, ss - 64); break;
+    case 231: memcpy_avx_128(dd - 231, ss - 231); [[fallthrough]];
+    case 103: memcpy_avx_64(dd - 103, ss - 103); memcpy_avx_64(dd - 64, ss - 64); break;
+    case 232: memcpy_avx_128(dd - 232, ss - 232); [[fallthrough]];
+    case 104: memcpy_avx_64(dd - 104, ss - 104); memcpy_avx_64(dd - 64, ss - 64); break;
+    case 233: memcpy_avx_128(dd - 233, ss - 233); [[fallthrough]];
+    case 105: memcpy_avx_64(dd - 105, ss - 105); memcpy_avx_64(dd - 64, ss - 64); break;
+    case 234: memcpy_avx_128(dd - 234, ss - 234); [[fallthrough]];
+    case 106: memcpy_avx_64(dd - 106, ss - 106); memcpy_avx_64(dd - 64, ss - 64); break;
+    case 235: memcpy_avx_128(dd - 235, ss - 235); [[fallthrough]];
+    case 107: memcpy_avx_64(dd - 107, ss - 107); memcpy_avx_64(dd - 64, ss - 64); break;
+    case 236: memcpy_avx_128(dd - 236, ss - 236); [[fallthrough]];
+    case 108: memcpy_avx_64(dd - 108, ss - 108); memcpy_avx_64(dd - 64, ss - 64); break;
+    case 237: memcpy_avx_128(dd - 237, ss - 237); [[fallthrough]];
+    case 109: memcpy_avx_64(dd - 109, ss - 109); memcpy_avx_64(dd - 64, ss - 64); break;
+    case 238: memcpy_avx_128(dd - 238, ss - 238); [[fallthrough]];
+    case 110: memcpy_avx_64(dd - 110, ss - 110); memcpy_avx_64(dd - 64, ss - 64); break;
+    case 239: memcpy_avx_128(dd - 239, ss - 239); [[fallthrough]];
+    case 111: memcpy_avx_64(dd - 111, ss - 111); memcpy_avx_64(dd - 64, ss - 64); break;
+    case 240: memcpy_avx_128(dd - 240, ss - 240); [[fallthrough]];
+    case 112: memcpy_avx_64(dd - 112, ss - 112); memcpy_avx_64(dd - 64, ss - 64); break;
+    case 241: memcpy_avx_128(dd - 241, ss - 241); [[fallthrough]];
+    case 113: memcpy_avx_64(dd - 113, ss - 113); memcpy_avx_64(dd - 64, ss - 64); break;
+    case 242: memcpy_avx_128(dd - 242, ss - 242); [[fallthrough]];
+    case 114: memcpy_avx_64(dd - 114, ss - 114); memcpy_avx_64(dd - 64, ss - 64); break;
+    case 243: memcpy_avx_128(dd - 243, ss - 243); [[fallthrough]];
+    case 115: memcpy_avx_64(dd - 115, ss - 115); memcpy_avx_64(dd - 64, ss - 64); break;
+    case 244: memcpy_avx_128(dd - 244, ss - 244); [[fallthrough]];
+    case 116: memcpy_avx_64(dd - 116, ss - 116); memcpy_avx_64(dd - 64, ss - 64); break;
+    case 245: memcpy_avx_128(dd - 245, ss - 245); [[fallthrough]];
+    case 117: memcpy_avx_64(dd - 117, ss - 117); memcpy_avx_64(dd - 64, ss - 64); break;
+    case 246: memcpy_avx_128(dd - 246, ss - 246); [[fallthrough]];
+    case 118: memcpy_avx_64(dd - 118, ss - 118); memcpy_avx_64(dd - 64, ss - 64); break;
+    case 247: memcpy_avx_128(dd - 247, ss - 247); [[fallthrough]];
+    case 119: memcpy_avx_64(dd - 119, ss - 119); memcpy_avx_64(dd - 64, ss - 64); break;
+    case 248: memcpy_avx_128(dd - 248, ss - 248); [[fallthrough]];
+    case 120: memcpy_avx_64(dd - 120, ss - 120); memcpy_avx_64(dd - 64, ss - 64); break;
+    case 249: memcpy_avx_128(dd - 249, ss - 249); [[fallthrough]];
+    case 121: memcpy_avx_64(dd - 121, ss - 121); memcpy_avx_64(dd - 64, ss - 64); break;
+    case 250: memcpy_avx_128(dd - 250, ss - 250); [[fallthrough]];
+    case 122: memcpy_avx_64(dd - 122, ss - 122); memcpy_avx_64(dd - 64, ss - 64); break;
+    case 251: memcpy_avx_128(dd - 251, ss - 251); [[fallthrough]];
+    case 123: memcpy_avx_64(dd - 123, ss - 123); memcpy_avx_64(dd - 64, ss - 64); break;
+    case 252: memcpy_avx_128(dd - 252, ss - 252); [[fallthrough]];
+    case 124: memcpy_avx_64(dd - 124, ss - 124); memcpy_avx_64(dd - 64, ss - 64); break;
+    case 253: memcpy_avx_128(dd - 253, ss - 253); [[fallthrough]];
+    case 125: memcpy_avx_64(dd - 125, ss - 125); memcpy_avx_64(dd - 64, ss - 64); break;
+    case 254: memcpy_avx_128(dd - 254, ss - 254); [[fallthrough]];
+    case 126: memcpy_avx_64(dd - 126, ss - 126); memcpy_avx_64(dd - 64, ss - 64); break;
+    case 255: memcpy_avx_128(dd - 255, ss - 255); [[fallthrough]];
+    case 127: memcpy_avx_64(dd - 127, ss - 127); memcpy_avx_64(dd - 64, ss - 64); break;
+    case 256: memcpy_avx_256(dd - 256, ss - 256); break;
+    }
+
+    return dst;
+}
+
+
+//---------------------------------------------------------------------
+// main routine
+//---------------------------------------------------------------------
+void* memcpy_fast_avx(void * __restrict destination, const void * __restrict source, size_t size)
+{
+    unsigned char *dst = reinterpret_cast<unsigned char*>(destination);
+    const unsigned char *src = reinterpret_cast<const unsigned char*>(source);
+    static size_t cachesize = 0x200000; // L3-cache size
+    size_t padding;
+
+    // small memory copy
+    if (size <= 256)
+    {
+        memcpy_tiny_avx(dst, src, size);
+        _mm256_zeroupper();
+        return destination;
+    }
+
+    // align destination to 16 bytes boundary
+    padding = (32 - (((size_t)dst) & 31)) & 31;
+
+#if 0
+    if (padding > 0)
+    {
+        __m256i head = _mm256_loadu_si256(reinterpret_cast<const __m256i*>(src));
+        _mm256_storeu_si256((__m256i*)dst, head);
+        dst += padding;
+        src += padding;
+        size -= padding;
+    }
+#else
+    __m256i head = _mm256_loadu_si256(reinterpret_cast<const __m256i*>(src));
+    _mm256_storeu_si256((__m256i*)dst, head);
+    dst += padding;
+    src += padding;
+    size -= padding;
+#endif
+
+    // medium size copy
+    if (size <= cachesize)
+    {
+        __m256i c0, c1, c2, c3, c4, c5, c6, c7;
+
+        for (; size >= 256; size -= 256)
+        {
+            c0 = _mm256_loadu_si256((reinterpret_cast<const __m256i*>(src)) + 0);
+            c1 = _mm256_loadu_si256((reinterpret_cast<const __m256i*>(src)) + 1);
+            c2 = _mm256_loadu_si256((reinterpret_cast<const __m256i*>(src)) + 2);
+            c3 = _mm256_loadu_si256((reinterpret_cast<const __m256i*>(src)) + 3);
+            c4 = _mm256_loadu_si256((reinterpret_cast<const __m256i*>(src)) + 4);
+            c5 = _mm256_loadu_si256((reinterpret_cast<const __m256i*>(src)) + 5);
+            c6 = _mm256_loadu_si256((reinterpret_cast<const __m256i*>(src)) + 6);
+            c7 = _mm256_loadu_si256((reinterpret_cast<const __m256i*>(src)) + 7);
+            src += 256;
+            _mm256_storeu_si256(((reinterpret_cast<__m256i*>(dst)) + 0), c0);
+            _mm256_storeu_si256(((reinterpret_cast<__m256i*>(dst)) + 1), c1);
+            _mm256_storeu_si256(((reinterpret_cast<__m256i*>(dst)) + 2), c2);
+            _mm256_storeu_si256(((reinterpret_cast<__m256i*>(dst)) + 3), c3);
+            _mm256_storeu_si256(((reinterpret_cast<__m256i*>(dst)) + 4), c4);
+            _mm256_storeu_si256(((reinterpret_cast<__m256i*>(dst)) + 5), c5);
+            _mm256_storeu_si256(((reinterpret_cast<__m256i*>(dst)) + 6), c6);
+            _mm256_storeu_si256(((reinterpret_cast<__m256i*>(dst)) + 7), c7);
+            dst += 256;
+        }
+    }
+    else
+    {        // big memory copy
+        __m256i c0, c1, c2, c3, c4, c5, c6, c7;
+        /* __m256i c0, c1, c2, c3, c4, c5, c6, c7; */
+
+        if ((((size_t)src) & 31) == 0)
+        {    // source aligned
+            for (; size >= 256; size -= 256)
+            {
+                c0 = _mm256_load_si256((reinterpret_cast<const __m256i*>(src)) + 0);
+                c1 = _mm256_load_si256((reinterpret_cast<const __m256i*>(src)) + 1);
+                c2 = _mm256_load_si256((reinterpret_cast<const __m256i*>(src)) + 2);
+                c3 = _mm256_load_si256((reinterpret_cast<const __m256i*>(src)) + 3);
+                c4 = _mm256_load_si256((reinterpret_cast<const __m256i*>(src)) + 4);
+                c5 = _mm256_load_si256((reinterpret_cast<const __m256i*>(src)) + 5);
+                c6 = _mm256_load_si256((reinterpret_cast<const __m256i*>(src)) + 6);
+                c7 = _mm256_load_si256((reinterpret_cast<const __m256i*>(src)) + 7);
+                src += 256;
+                _mm256_stream_si256(((reinterpret_cast<__m256i*>(dst)) + 0), c0);
+                _mm256_stream_si256(((reinterpret_cast<__m256i*>(dst)) + 1), c1);
+                _mm256_stream_si256(((reinterpret_cast<__m256i*>(dst)) + 2), c2);
+                _mm256_stream_si256(((reinterpret_cast<__m256i*>(dst)) + 3), c3);
+                _mm256_stream_si256(((reinterpret_cast<__m256i*>(dst)) + 4), c4);
+                _mm256_stream_si256(((reinterpret_cast<__m256i*>(dst)) + 5), c5);
+                _mm256_stream_si256(((reinterpret_cast<__m256i*>(dst)) + 6), c6);
+                _mm256_stream_si256(((reinterpret_cast<__m256i*>(dst)) + 7), c7);
+                dst += 256;
+            }
+        }
+        else
+        {                            // source unaligned
+            for (; size >= 256; size -= 256)
+            {
+                c0 = _mm256_loadu_si256((reinterpret_cast<const __m256i*>(src)) + 0);
+                c1 = _mm256_loadu_si256((reinterpret_cast<const __m256i*>(src)) + 1);
+                c2 = _mm256_loadu_si256((reinterpret_cast<const __m256i*>(src)) + 2);
+                c3 = _mm256_loadu_si256((reinterpret_cast<const __m256i*>(src)) + 3);
+                c4 = _mm256_loadu_si256((reinterpret_cast<const __m256i*>(src)) + 4);
+                c5 = _mm256_loadu_si256((reinterpret_cast<const __m256i*>(src)) + 5);
+                c6 = _mm256_loadu_si256((reinterpret_cast<const __m256i*>(src)) + 6);
+                c7 = _mm256_loadu_si256((reinterpret_cast<const __m256i*>(src)) + 7);
+                src += 256;
+                _mm256_stream_si256(((reinterpret_cast<__m256i*>(dst)) + 0), c0);
+                _mm256_stream_si256(((reinterpret_cast<__m256i*>(dst)) + 1), c1);
+                _mm256_stream_si256(((reinterpret_cast<__m256i*>(dst)) + 2), c2);
+                _mm256_stream_si256(((reinterpret_cast<__m256i*>(dst)) + 3), c3);
+                _mm256_stream_si256(((reinterpret_cast<__m256i*>(dst)) + 4), c4);
+                _mm256_stream_si256(((reinterpret_cast<__m256i*>(dst)) + 5), c5);
+                _mm256_stream_si256(((reinterpret_cast<__m256i*>(dst)) + 6), c6);
+                _mm256_stream_si256(((reinterpret_cast<__m256i*>(dst)) + 7), c7);
+                dst += 256;
+            }
+        }
+        _mm_sfence();
+    }
+
+    memcpy_tiny_avx(dst, src, size);
+    _mm256_zeroupper();
+
+    return destination;
+}
diff --git a/utils/memcpy-bench/glibc/asm-syntax.h b/utils/memcpy-bench/glibc/asm-syntax.h
new file mode 100644
index 00000000000..0879f2606c7
--- /dev/null
+++ b/utils/memcpy-bench/glibc/asm-syntax.h
@@ -0,0 +1,26 @@
+#pragma once
+
+/* Definitions for x86 syntax variations.
+    Copyright (C) 1992-2020 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.  Its master source is NOT part of
+    the C library, however.  The master source lives in the GNU MP Library.
+
+    The GNU C Library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    The GNU C Library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with the GNU C Library; if not, see
+    <https://www.gnu.org/licenses/>.  */
+
+#undef ALIGN
+#define ALIGN(log) .align 1<<log
+
+#undef L
+#define L(body) .L##body
diff --git a/utils/memcpy-bench/glibc/dwarf2.h b/utils/memcpy-bench/glibc/dwarf2.h
new file mode 100644
index 00000000000..d410ce2da38
--- /dev/null
+++ b/utils/memcpy-bench/glibc/dwarf2.h
@@ -0,0 +1,592 @@
+#pragma once
+
+/* Declarations and definitions of codes relating to the DWARF2 symbolic
+    debugging information format.
+    Copyright (C) 1992-2020 Free Software Foundation, Inc.
+    Contributed by Gary Funck (gary@intrepid.com).  Derived from the
+    DWARF 1 implementation written by Ron Guilmette (rfg@monkeys.com).
+
+    This file is part of the GNU C Library.
+
+    The GNU C Library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    The GNU C Library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with the GNU C Library; if not, see
+    <https://www.gnu.org/licenses/>.  */
+
+#ifndef _DWARF2_H
+#define _DWARF2_H    1
+
+/* This file is derived from the DWARF specification (a public document)
+    Revision 2.0.0 (July 27, 1993) developed by the UNIX International
+    Programming Languages Special Interest Group (UI/PLSIG) and distributed
+    by UNIX International.  Copies of this specification are available from
+    UNIX International, 20 Waterview Boulevard, Parsippany, NJ, 07054.  */
+
+/* This file is shared between GCC and GDB, and should not contain
+    prototypes.  */
+
+#ifndef __ASSEMBLER__
+/* Tag names and codes.  */
+
+enum dwarf_tag
+    {
+    DW_TAG_padding = 0x00,
+    DW_TAG_array_type = 0x01,
+    DW_TAG_class_type = 0x02,
+    DW_TAG_entry_point = 0x03,
+    DW_TAG_enumeration_type = 0x04,
+    DW_TAG_formal_parameter = 0x05,
+    DW_TAG_imported_declaration = 0x08,
+    DW_TAG_label = 0x0a,
+    DW_TAG_lexical_block = 0x0b,
+    DW_TAG_member = 0x0d,
+    DW_TAG_pointer_type = 0x0f,
+    DW_TAG_reference_type = 0x10,
+    DW_TAG_compile_unit = 0x11,
+    DW_TAG_string_type = 0x12,
+    DW_TAG_structure_type = 0x13,
+    DW_TAG_subroutine_type = 0x15,
+    DW_TAG_typedef = 0x16,
+    DW_TAG_union_type = 0x17,
+    DW_TAG_unspecified_parameters = 0x18,
+    DW_TAG_variant = 0x19,
+    DW_TAG_common_block = 0x1a,
+    DW_TAG_common_inclusion = 0x1b,
+    DW_TAG_inheritance = 0x1c,
+    DW_TAG_inlined_subroutine = 0x1d,
+    DW_TAG_module = 0x1e,
+    DW_TAG_ptr_to_member_type = 0x1f,
+    DW_TAG_set_type = 0x20,
+    DW_TAG_subrange_type = 0x21,
+    DW_TAG_with_stmt = 0x22,
+    DW_TAG_access_declaration = 0x23,
+    DW_TAG_base_type = 0x24,
+    DW_TAG_catch_block = 0x25,
+    DW_TAG_const_type = 0x26,
+    DW_TAG_constant = 0x27,
+    DW_TAG_enumerator = 0x28,
+    DW_TAG_file_type = 0x29,
+    DW_TAG_friend = 0x2a,
+    DW_TAG_namelist = 0x2b,
+    DW_TAG_namelist_item = 0x2c,
+    DW_TAG_packed_type = 0x2d,
+    DW_TAG_subprogram = 0x2e,
+    DW_TAG_template_type_param = 0x2f,
+    DW_TAG_template_value_param = 0x30,
+    DW_TAG_thrown_type = 0x31,
+    DW_TAG_try_block = 0x32,
+    DW_TAG_variant_part = 0x33,
+    DW_TAG_variable = 0x34,
+    DW_TAG_volatile_type = 0x35,
+    /* SGI/MIPS Extensions */
+    DW_TAG_MIPS_loop = 0x4081,
+    /* GNU extensions */
+    DW_TAG_format_label = 0x4101,    /* for FORTRAN 77 and Fortran 90 */
+    DW_TAG_function_template = 0x4102,    /* for C++ */
+    DW_TAG_class_template = 0x4103,    /* for C++ */
+    DW_TAG_GNU_BINCL = 0x4104,
+    DW_TAG_GNU_EINCL = 0x4105
+    };
+
+#define DW_TAG_lo_user    0x4080
+#define DW_TAG_hi_user    0xffff
+
+/* flag that tells whether entry has a child or not */
+#define DW_children_no   0
+#define    DW_children_yes  1
+
+/* Form names and codes.  */
+enum dwarf_form
+    {
+    DW_FORM_addr = 0x01,
+    DW_FORM_block2 = 0x03,
+    DW_FORM_block4 = 0x04,
+    DW_FORM_data2 = 0x05,
+    DW_FORM_data4 = 0x06,
+    DW_FORM_data8 = 0x07,
+    DW_FORM_string = 0x08,
+    DW_FORM_block = 0x09,
+    DW_FORM_block1 = 0x0a,
+    DW_FORM_data1 = 0x0b,
+    DW_FORM_flag = 0x0c,
+    DW_FORM_sdata = 0x0d,
+    DW_FORM_strp = 0x0e,
+    DW_FORM_udata = 0x0f,
+    DW_FORM_ref_addr = 0x10,
+    DW_FORM_ref1 = 0x11,
+    DW_FORM_ref2 = 0x12,
+    DW_FORM_ref4 = 0x13,
+    DW_FORM_ref8 = 0x14,
+    DW_FORM_ref_udata = 0x15,
+    DW_FORM_indirect = 0x16
+    };
+
+/* Attribute names and codes.  */
+
+enum dwarf_attribute
+    {
+    DW_AT_sibling = 0x01,
+    DW_AT_location = 0x02,
+    DW_AT_name = 0x03,
+    DW_AT_ordering = 0x09,
+    DW_AT_subscr_data = 0x0a,
+    DW_AT_byte_size = 0x0b,
+    DW_AT_bit_offset = 0x0c,
+    DW_AT_bit_size = 0x0d,
+    DW_AT_element_list = 0x0f,
+    DW_AT_stmt_list = 0x10,
+    DW_AT_low_pc = 0x11,
+    DW_AT_high_pc = 0x12,
+    DW_AT_language = 0x13,
+    DW_AT_member = 0x14,
+    DW_AT_discr = 0x15,
+    DW_AT_discr_value = 0x16,
+    DW_AT_visibility = 0x17,
+    DW_AT_import = 0x18,
+    DW_AT_string_length = 0x19,
+    DW_AT_common_reference = 0x1a,
+    DW_AT_comp_dir = 0x1b,
+    DW_AT_const_value = 0x1c,
+    DW_AT_containing_type = 0x1d,
+    DW_AT_default_value = 0x1e,
+    DW_AT_inline = 0x20,
+    DW_AT_is_optional = 0x21,
+    DW_AT_lower_bound = 0x22,
+    DW_AT_producer = 0x25,
+    DW_AT_prototyped = 0x27,
+    DW_AT_return_addr = 0x2a,
+    DW_AT_start_scope = 0x2c,
+    DW_AT_stride_size = 0x2e,
+    DW_AT_upper_bound = 0x2f,
+    DW_AT_abstract_origin = 0x31,
+    DW_AT_accessibility = 0x32,
+    DW_AT_address_class = 0x33,
+    DW_AT_artificial = 0x34,
+    DW_AT_base_types = 0x35,
+    DW_AT_calling_convention = 0x36,
+    DW_AT_count = 0x37,
+    DW_AT_data_member_location = 0x38,
+    DW_AT_decl_column = 0x39,
+    DW_AT_decl_file = 0x3a,
+    DW_AT_decl_line = 0x3b,
+    DW_AT_declaration = 0x3c,
+    DW_AT_discr_list = 0x3d,
+    DW_AT_encoding = 0x3e,
+    DW_AT_external = 0x3f,
+    DW_AT_frame_base = 0x40,
+    DW_AT_friend = 0x41,
+    DW_AT_identifier_case = 0x42,
+    DW_AT_macro_info = 0x43,
+    DW_AT_namelist_items = 0x44,
+    DW_AT_priority = 0x45,
+    DW_AT_segment = 0x46,
+    DW_AT_specification = 0x47,
+    DW_AT_static_link = 0x48,
+    DW_AT_type = 0x49,
+    DW_AT_use_location = 0x4a,
+    DW_AT_variable_parameter = 0x4b,
+    DW_AT_virtuality = 0x4c,
+    DW_AT_vtable_elem_location = 0x4d,
+    /* SGI/MIPS Extensions */
+    DW_AT_MIPS_fde = 0x2001,
+    DW_AT_MIPS_loop_begin = 0x2002,
+    DW_AT_MIPS_tail_loop_begin = 0x2003,
+    DW_AT_MIPS_epilog_begin = 0x2004,
+    DW_AT_MIPS_loop_unroll_factor = 0x2005,
+    DW_AT_MIPS_software_pipeline_depth = 0x2006,
+    DW_AT_MIPS_linkage_name = 0x2007,
+    DW_AT_MIPS_stride = 0x2008,
+    DW_AT_MIPS_abstract_name = 0x2009,
+    DW_AT_MIPS_clone_origin = 0x200a,
+    DW_AT_MIPS_has_inlines = 0x200b,
+    /* GNU extensions.  */
+    DW_AT_sf_names = 0x2101,
+    DW_AT_src_info = 0x2102,
+    DW_AT_mac_info = 0x2103,
+    DW_AT_src_coords = 0x2104,
+    DW_AT_body_begin = 0x2105,
+    DW_AT_body_end = 0x2106
+    };
+
+#define DW_AT_lo_user    0x2000    /* implementation-defined range start */
+#define DW_AT_hi_user    0x3ff0    /* implementation-defined range end */
+
+/* Location atom names and codes.  */
+
+enum dwarf_location_atom
+    {
+    DW_OP_addr = 0x03,
+    DW_OP_deref = 0x06,
+    DW_OP_const1u = 0x08,
+    DW_OP_const1s = 0x09,
+    DW_OP_const2u = 0x0a,
+    DW_OP_const2s = 0x0b,
+    DW_OP_const4u = 0x0c,
+    DW_OP_const4s = 0x0d,
+    DW_OP_const8u = 0x0e,
+    DW_OP_const8s = 0x0f,
+    DW_OP_constu = 0x10,
+    DW_OP_consts = 0x11,
+    DW_OP_dup = 0x12,
+    DW_OP_drop = 0x13,
+    DW_OP_over = 0x14,
+    DW_OP_pick = 0x15,
+    DW_OP_swap = 0x16,
+    DW_OP_rot = 0x17,
+    DW_OP_xderef = 0x18,
+    DW_OP_abs = 0x19,
+    DW_OP_and = 0x1a,
+    DW_OP_div = 0x1b,
+    DW_OP_minus = 0x1c,
+    DW_OP_mod = 0x1d,
+    DW_OP_mul = 0x1e,
+    DW_OP_neg = 0x1f,
+    DW_OP_not = 0x20,
+    DW_OP_or = 0x21,
+    DW_OP_plus = 0x22,
+    DW_OP_plus_uconst = 0x23,
+    DW_OP_shl = 0x24,
+    DW_OP_shr = 0x25,
+    DW_OP_shra = 0x26,
+    DW_OP_xor = 0x27,
+    DW_OP_bra = 0x28,
+    DW_OP_eq = 0x29,
+    DW_OP_ge = 0x2a,
+    DW_OP_gt = 0x2b,
+    DW_OP_le = 0x2c,
+    DW_OP_lt = 0x2d,
+    DW_OP_ne = 0x2e,
+    DW_OP_skip = 0x2f,
+    DW_OP_lit0 = 0x30,
+    DW_OP_lit1 = 0x31,
+    DW_OP_lit2 = 0x32,
+    DW_OP_lit3 = 0x33,
+    DW_OP_lit4 = 0x34,
+    DW_OP_lit5 = 0x35,
+    DW_OP_lit6 = 0x36,
+    DW_OP_lit7 = 0x37,
+    DW_OP_lit8 = 0x38,
+    DW_OP_lit9 = 0x39,
+    DW_OP_lit10 = 0x3a,
+    DW_OP_lit11 = 0x3b,
+    DW_OP_lit12 = 0x3c,
+    DW_OP_lit13 = 0x3d,
+    DW_OP_lit14 = 0x3e,
+    DW_OP_lit15 = 0x3f,
+    DW_OP_lit16 = 0x40,
+    DW_OP_lit17 = 0x41,
+    DW_OP_lit18 = 0x42,
+    DW_OP_lit19 = 0x43,
+    DW_OP_lit20 = 0x44,
+    DW_OP_lit21 = 0x45,
+    DW_OP_lit22 = 0x46,
+    DW_OP_lit23 = 0x47,
+    DW_OP_lit24 = 0x48,
+    DW_OP_lit25 = 0x49,
+    DW_OP_lit26 = 0x4a,
+    DW_OP_lit27 = 0x4b,
+    DW_OP_lit28 = 0x4c,
+    DW_OP_lit29 = 0x4d,
+    DW_OP_lit30 = 0x4e,
+    DW_OP_lit31 = 0x4f,
+    DW_OP_reg0 = 0x50,
+    DW_OP_reg1 = 0x51,
+    DW_OP_reg2 = 0x52,
+    DW_OP_reg3 = 0x53,
+    DW_OP_reg4 = 0x54,
+    DW_OP_reg5 = 0x55,
+    DW_OP_reg6 = 0x56,
+    DW_OP_reg7 = 0x57,
+    DW_OP_reg8 = 0x58,
+    DW_OP_reg9 = 0x59,
+    DW_OP_reg10 = 0x5a,
+    DW_OP_reg11 = 0x5b,
+    DW_OP_reg12 = 0x5c,
+    DW_OP_reg13 = 0x5d,
+    DW_OP_reg14 = 0x5e,
+    DW_OP_reg15 = 0x5f,
+    DW_OP_reg16 = 0x60,
+    DW_OP_reg17 = 0x61,
+    DW_OP_reg18 = 0x62,
+    DW_OP_reg19 = 0x63,
+    DW_OP_reg20 = 0x64,
+    DW_OP_reg21 = 0x65,
+    DW_OP_reg22 = 0x66,
+    DW_OP_reg23 = 0x67,
+    DW_OP_reg24 = 0x68,
+    DW_OP_reg25 = 0x69,
+    DW_OP_reg26 = 0x6a,
+    DW_OP_reg27 = 0x6b,
+    DW_OP_reg28 = 0x6c,
+    DW_OP_reg29 = 0x6d,
+    DW_OP_reg30 = 0x6e,
+    DW_OP_reg31 = 0x6f,
+    DW_OP_breg0 = 0x70,
+    DW_OP_breg1 = 0x71,
+    DW_OP_breg2 = 0x72,
+    DW_OP_breg3 = 0x73,
+    DW_OP_breg4 = 0x74,
+    DW_OP_breg5 = 0x75,
+    DW_OP_breg6 = 0x76,
+    DW_OP_breg7 = 0x77,
+    DW_OP_breg8 = 0x78,
+    DW_OP_breg9 = 0x79,
+    DW_OP_breg10 = 0x7a,
+    DW_OP_breg11 = 0x7b,
+    DW_OP_breg12 = 0x7c,
+    DW_OP_breg13 = 0x7d,
+    DW_OP_breg14 = 0x7e,
+    DW_OP_breg15 = 0x7f,
+    DW_OP_breg16 = 0x80,
+    DW_OP_breg17 = 0x81,
+    DW_OP_breg18 = 0x82,
+    DW_OP_breg19 = 0x83,
+    DW_OP_breg20 = 0x84,
+    DW_OP_breg21 = 0x85,
+    DW_OP_breg22 = 0x86,
+    DW_OP_breg23 = 0x87,
+    DW_OP_breg24 = 0x88,
+    DW_OP_breg25 = 0x89,
+    DW_OP_breg26 = 0x8a,
+    DW_OP_breg27 = 0x8b,
+    DW_OP_breg28 = 0x8c,
+    DW_OP_breg29 = 0x8d,
+    DW_OP_breg30 = 0x8e,
+    DW_OP_breg31 = 0x8f,
+    DW_OP_regx = 0x90,
+    DW_OP_fbreg = 0x91,
+    DW_OP_bregx = 0x92,
+    DW_OP_piece = 0x93,
+    DW_OP_deref_size = 0x94,
+    DW_OP_xderef_size = 0x95,
+    DW_OP_nop = 0x96
+    };
+
+#define DW_OP_lo_user    0x80    /* implementation-defined range start */
+#define DW_OP_hi_user    0xff    /* implementation-defined range end */
+
+/* Type encodings.  */
+
+enum dwarf_type
+    {
+    DW_ATE_void = 0x0,
+    DW_ATE_address = 0x1,
+    DW_ATE_boolean = 0x2,
+    DW_ATE_complex_float = 0x3,
+    DW_ATE_float = 0x4,
+    DW_ATE_signed = 0x5,
+    DW_ATE_signed_char = 0x6,
+    DW_ATE_unsigned = 0x7,
+    DW_ATE_unsigned_char = 0x8
+    };
+
+#define    DW_ATE_lo_user 0x80
+#define    DW_ATE_hi_user 0xff
+
+/* Array ordering names and codes.  */
+enum dwarf_array_dim_ordering
+    {
+    DW_ORD_row_major = 0,
+    DW_ORD_col_major = 1
+    };
+
+/* access attribute */
+enum dwarf_access_attribute
+    {
+    DW_ACCESS_public = 1,
+    DW_ACCESS_protected = 2,
+    DW_ACCESS_private = 3
+    };
+
+/* visibility */
+enum dwarf_visibility_attribute
+    {
+    DW_VIS_local = 1,
+    DW_VIS_exported = 2,
+    DW_VIS_qualified = 3
+    };
+
+/* virtuality */
+enum dwarf_virtuality_attribute
+    {
+    DW_VIRTUALITY_none = 0,
+    DW_VIRTUALITY_virtual = 1,
+    DW_VIRTUALITY_pure_virtual = 2
+    };
+
+/* case sensitivity */
+enum dwarf_id_case
+    {
+    DW_ID_case_sensitive = 0,
+    DW_ID_up_case = 1,
+    DW_ID_down_case = 2,
+    DW_ID_case_insensitive = 3
+    };
+
+/* calling convention */
+enum dwarf_calling_convention
+    {
+    DW_CC_normal = 0x1,
+    DW_CC_program = 0x2,
+    DW_CC_nocall = 0x3
+    };
+
+#define DW_CC_lo_user 0x40
+#define DW_CC_hi_user 0xff
+
+/* inline attribute */
+enum dwarf_inline_attribute
+    {
+    DW_INL_not_inlined = 0,
+    DW_INL_inlined = 1,
+    DW_INL_declared_not_inlined = 2,
+    DW_INL_declared_inlined = 3
+    };
+
+/* discriminant lists */
+enum dwarf_discrim_list
+    {
+    DW_DSC_label = 0,
+    DW_DSC_range = 1
+    };
+
+/* line number opcodes */
+enum dwarf_line_number_ops
+    {
+    DW_LNS_extended_op = 0,
+    DW_LNS_copy = 1,
+    DW_LNS_advance_pc = 2,
+    DW_LNS_advance_line = 3,
+    DW_LNS_set_file = 4,
+    DW_LNS_set_column = 5,
+    DW_LNS_negate_stmt = 6,
+    DW_LNS_set_basic_block = 7,
+    DW_LNS_const_add_pc = 8,
+    DW_LNS_fixed_advance_pc = 9
+    };
+
+/* line number extended opcodes */
+enum dwarf_line_number_x_ops
+    {
+    DW_LNE_end_sequence = 1,
+    DW_LNE_set_address = 2,
+    DW_LNE_define_file = 3
+    };
+
+/* call frame information */
+enum dwarf_call_frame_info
+    {
+    DW_CFA_advance_loc = 0x40,
+    DW_CFA_offset = 0x80,
+    DW_CFA_restore = 0xc0,
+    DW_CFA_nop = 0x00,
+    DW_CFA_set_loc = 0x01,
+    DW_CFA_advance_loc1 = 0x02,
+    DW_CFA_advance_loc2 = 0x03,
+    DW_CFA_advance_loc4 = 0x04,
+    DW_CFA_offset_extended = 0x05,
+    DW_CFA_restore_extended = 0x06,
+    DW_CFA_undefined = 0x07,
+    DW_CFA_same_value = 0x08,
+    DW_CFA_register = 0x09,
+    DW_CFA_remember_state = 0x0a,
+    DW_CFA_restore_state = 0x0b,
+    DW_CFA_def_cfa = 0x0c,
+    DW_CFA_def_cfa_register = 0x0d,
+    DW_CFA_def_cfa_offset = 0x0e,
+    DW_CFA_def_cfa_expression = 0x0f,
+    DW_CFA_expression = 0x10,
+    /* Dwarf 2.1 */
+    DW_CFA_offset_extended_sf = 0x11,
+    DW_CFA_def_cfa_sf = 0x12,
+    DW_CFA_def_cfa_offset_sf = 0x13,
+
+    /* SGI/MIPS specific */
+    DW_CFA_MIPS_advance_loc8 = 0x1d,
+
+    /* GNU extensions */
+    DW_CFA_GNU_window_save = 0x2d,
+    DW_CFA_GNU_args_size = 0x2e,
+    DW_CFA_GNU_negative_offset_extended = 0x2f
+    };
+
+#define DW_CIE_ID      0xffffffff
+#define DW_CIE_VERSION      1
+
+#define DW_CFA_extended   0
+#define DW_CFA_low_user   0x1c
+#define DW_CFA_high_user  0x3f
+
+#define DW_CHILDREN_no             0x00
+#define DW_CHILDREN_yes             0x01
+
+#define DW_ADDR_none        0
+
+/* Source language names and codes.  */
+
+enum dwarf_source_language
+    {
+    DW_LANG_C89 = 0x0001,
+    DW_LANG_C = 0x0002,
+    DW_LANG_Ada83 = 0x0003,
+    DW_LANG_C_plus_plus = 0x0004,
+    DW_LANG_Cobol74 = 0x0005,
+    DW_LANG_Cobol85 = 0x0006,
+    DW_LANG_Fortran77 = 0x0007,
+    DW_LANG_Fortran90 = 0x0008,
+    DW_LANG_Pascal83 = 0x0009,
+    DW_LANG_Modula2 = 0x000a,
+    DW_LANG_Java = 0x000b,
+    DW_LANG_Mips_Assembler = 0x8001
+    };
+
+
+#define DW_LANG_lo_user 0x8000    /* implementation-defined range start */
+#define DW_LANG_hi_user 0xffff    /* implementation-defined range start */
+
+/* Names and codes for macro information.  */
+
+enum dwarf_macinfo_record_type
+    {
+    DW_MACINFO_define = 1,
+    DW_MACINFO_undef = 2,
+    DW_MACINFO_start_file = 3,
+    DW_MACINFO_end_file = 4,
+    DW_MACINFO_vendor_ext = 255
+    };
+
+#endif /* !ASSEMBLER */
+
+/* @@@ For use with GNU frame unwind information.  */
+
+#define DW_EH_PE_absptr        0x00
+#define DW_EH_PE_omit        0xff
+
+#define DW_EH_PE_uleb128    0x01
+#define DW_EH_PE_udata2        0x02
+#define DW_EH_PE_udata4        0x03
+#define DW_EH_PE_udata8        0x04
+#define DW_EH_PE_sleb128    0x09
+#define DW_EH_PE_sdata2        0x0A
+#define DW_EH_PE_sdata4        0x0B
+#define DW_EH_PE_sdata8        0x0C
+#define DW_EH_PE_signed        0x08
+
+#define DW_EH_PE_pcrel        0x10
+#define DW_EH_PE_textrel    0x20
+#define DW_EH_PE_datarel    0x30
+#define DW_EH_PE_funcrel    0x40
+#define DW_EH_PE_aligned    0x50
+
+#define DW_EH_PE_indirect    0x80
+
+#endif /* dwarf2.h */
diff --git a/utils/memcpy-bench/glibc/memcpy-ssse3-back.S b/utils/memcpy-bench/glibc/memcpy-ssse3-back.S
new file mode 100644
index 00000000000..c5257592efa
--- /dev/null
+++ b/utils/memcpy-bench/glibc/memcpy-ssse3-back.S
@@ -0,0 +1,3182 @@
+/* memcpy with SSSE3 and REP string
+   Copyright (C) 2010-2020 Free Software Foundation, Inc.
+   Contributed by Intel Corporation.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <https://www.gnu.org/licenses/>.  */
+
+#include "sysdep.h"
+
+#if 1
+
+#include "asm-syntax.h"
+
+#ifndef MEMCPY
+# define MEMCPY        __memcpy_ssse3_back
+# define MEMCPY_CHK    __memcpy_chk_ssse3_back
+# define MEMPCPY    __mempcpy_ssse3_back
+# define MEMPCPY_CHK    __mempcpy_chk_ssse3_back
+#endif
+
+#define JMPTBL(I, B)    I - B
+
+/* Branch to an entry in a jump table.  TABLE is a jump table with
+   relative offsets.  INDEX is a register contains the index into the
+   jump table.  SCALE is the scale of INDEX.  */
+#define BRANCH_TO_JMPTBL_ENTRY(TABLE, INDEX, SCALE)        \
+  lea        TABLE(%rip), %r11;                \
+  movslq    (%r11, INDEX, SCALE), INDEX;            \
+  lea        (%r11, INDEX), INDEX;                \
+  _CET_NOTRACK jmp *INDEX;                    \
+  ud2
+
+    .section .text.ssse3,"ax",@progbits
+#if !defined USE_AS_MEMPCPY && !defined USE_AS_MEMMOVE
+ENTRY (MEMPCPY_CHK)
+    cmp    %RDX_LP, %RCX_LP
+    jb    HIDDEN_JUMPTARGET (__chk_fail)
+END (MEMPCPY_CHK)
+
+ENTRY (MEMPCPY)
+    mov    %RDI_LP, %RAX_LP
+    add    %RDX_LP, %RAX_LP
+    jmp    L(start)
+END (MEMPCPY)
+#endif
+
+#if !defined USE_AS_BCOPY
+ENTRY (MEMCPY_CHK)
+    cmp    %RDX_LP, %RCX_LP
+    jb    HIDDEN_JUMPTARGET (__chk_fail)
+END (MEMCPY_CHK)
+#endif
+
+ENTRY (MEMCPY)
+    mov    %RDI_LP, %RAX_LP
+#ifdef USE_AS_MEMPCPY
+    add    %RDX_LP, %RAX_LP
+#endif
+
+#ifdef __ILP32__
+    /* Clear the upper 32 bits.  */
+    mov    %edx, %edx
+#endif
+
+#ifdef USE_AS_MEMMOVE
+    cmp    %rsi, %rdi
+    jb    L(copy_forward)
+    je    L(bwd_write_0bytes)
+    cmp    $144, %rdx
+    jae    L(copy_backward)
+    BRANCH_TO_JMPTBL_ENTRY (L(table_144_bytes_bwd), %rdx, 4)
+L(copy_forward):
+#endif
+L(start):
+    cmp    $144, %rdx
+    jae    L(144bytesormore)
+
+L(fwd_write_less32bytes):
+#ifndef USE_AS_MEMMOVE
+    cmp    %dil, %sil
+    jbe    L(bk_write)
+#endif
+    add    %rdx, %rsi
+    add    %rdx, %rdi
+    BRANCH_TO_JMPTBL_ENTRY (L(table_144_bytes_fwd), %rdx, 4)
+#ifndef USE_AS_MEMMOVE
+L(bk_write):
+
+    BRANCH_TO_JMPTBL_ENTRY (L(table_144_bytes_bwd), %rdx, 4)
+#endif
+
+    .p2align 4
+L(144bytesormore):
+
+#ifndef USE_AS_MEMMOVE
+    cmp    %dil, %sil
+    jle    L(copy_backward)
+#endif
+    movdqu    (%rsi), %xmm0
+    mov    %rdi, %r8
+    and    $-16, %rdi
+    add    $16, %rdi
+    mov    %rdi, %r9
+    sub    %r8, %r9
+    sub    %r9, %rdx
+    add    %r9, %rsi
+    mov    %rsi, %r9
+    and    $0xf, %r9
+    jz    L(shl_0)
+#ifdef DATA_CACHE_SIZE
+    mov    $DATA_CACHE_SIZE, %RCX_LP
+#else
+    mov    __x86_data_cache_size(%rip), %RCX_LP
+#endif
+    cmp    %rcx, %rdx
+    jae    L(gobble_mem_fwd)
+    lea        L(shl_table_fwd)(%rip), %r11
+    sub    $0x80, %rdx
+    movslq    (%r11, %r9, 4), %r9
+    add    %r11, %r9
+    _CET_NOTRACK jmp *%r9
+    ud2
+
+    .p2align 4
+L(copy_backward):
+#ifdef DATA_CACHE_SIZE
+    mov    $DATA_CACHE_SIZE, %RCX_LP
+#else
+    mov    __x86_data_cache_size(%rip), %RCX_LP
+#endif
+    shl    $1, %rcx
+    cmp    %rcx, %rdx
+    ja    L(gobble_mem_bwd)
+
+    add    %rdx, %rdi
+    add    %rdx, %rsi
+    movdqu    -16(%rsi), %xmm0
+    lea    -16(%rdi), %r8
+    mov    %rdi, %r9
+    and    $0xf, %r9
+    xor    %r9, %rdi
+    sub    %r9, %rsi
+    sub    %r9, %rdx
+    mov    %rsi, %r9
+    and    $0xf, %r9
+    jz    L(shl_0_bwd)
+    lea        L(shl_table_bwd)(%rip), %r11
+    sub    $0x80, %rdx
+    movslq    (%r11, %r9, 4), %r9
+    add    %r11, %r9
+    _CET_NOTRACK jmp *%r9
+    ud2
+
+    .p2align 4
+L(shl_0):
+
+    mov    %rdx, %r9
+    shr    $8, %r9
+    add    %rdx, %r9
+#ifdef DATA_CACHE_SIZE
+    cmp    $DATA_CACHE_SIZE_HALF, %R9_LP
+#else
+    cmp    __x86_data_cache_size_half(%rip), %R9_LP
+#endif
+    jae    L(gobble_mem_fwd)
+    sub    $0x80, %rdx
+    .p2align 4
+L(shl_0_loop):
+    movdqa    (%rsi), %xmm1
+    movdqa    %xmm1, (%rdi)
+    movaps    0x10(%rsi), %xmm2
+    movaps    %xmm2, 0x10(%rdi)
+    movaps    0x20(%rsi), %xmm3
+    movaps    %xmm3, 0x20(%rdi)
+    movaps    0x30(%rsi), %xmm4
+    movaps    %xmm4, 0x30(%rdi)
+    movaps    0x40(%rsi), %xmm1
+    movaps    %xmm1, 0x40(%rdi)
+    movaps    0x50(%rsi), %xmm2
+    movaps    %xmm2, 0x50(%rdi)
+    movaps    0x60(%rsi), %xmm3
+    movaps    %xmm3, 0x60(%rdi)
+    movaps    0x70(%rsi), %xmm4
+    movaps    %xmm4, 0x70(%rdi)
+    sub    $0x80, %rdx
+    lea    0x80(%rsi), %rsi
+    lea    0x80(%rdi), %rdi
+    jae    L(shl_0_loop)
+    movdqu    %xmm0, (%r8)
+    add    $0x80, %rdx
+    add    %rdx, %rsi
+    add    %rdx, %rdi
+    BRANCH_TO_JMPTBL_ENTRY (L(table_144_bytes_fwd), %rdx, 4)
+
+    .p2align 4
+L(shl_0_bwd):
+    sub    $0x80, %rdx
+L(copy_backward_loop):
+    movaps    -0x10(%rsi), %xmm1
+    movaps    %xmm1, -0x10(%rdi)
+    movaps    -0x20(%rsi), %xmm2
+    movaps    %xmm2, -0x20(%rdi)
+    movaps    -0x30(%rsi), %xmm3
+    movaps    %xmm3, -0x30(%rdi)
+    movaps    -0x40(%rsi), %xmm4
+    movaps    %xmm4, -0x40(%rdi)
+    movaps    -0x50(%rsi), %xmm5
+    movaps    %xmm5, -0x50(%rdi)
+    movaps    -0x60(%rsi), %xmm5
+    movaps    %xmm5, -0x60(%rdi)
+    movaps    -0x70(%rsi), %xmm5
+    movaps    %xmm5, -0x70(%rdi)
+    movaps    -0x80(%rsi), %xmm5
+    movaps    %xmm5, -0x80(%rdi)
+    sub    $0x80, %rdx
+    lea    -0x80(%rdi), %rdi
+    lea    -0x80(%rsi), %rsi
+    jae    L(copy_backward_loop)
+
+    movdqu    %xmm0, (%r8)
+    add    $0x80, %rdx
+    sub    %rdx, %rdi
+    sub    %rdx, %rsi
+    BRANCH_TO_JMPTBL_ENTRY (L(table_144_bytes_bwd), %rdx, 4)
+
+    .p2align 4
+L(shl_1):
+    sub    $0x80, %rdx
+    movaps    -0x01(%rsi), %xmm1
+    movaps    0x0f(%rsi), %xmm2
+    movaps    0x1f(%rsi), %xmm3
+    movaps    0x2f(%rsi), %xmm4
+    movaps    0x3f(%rsi), %xmm5
+    movaps    0x4f(%rsi), %xmm6
+    movaps    0x5f(%rsi), %xmm7
+    movaps    0x6f(%rsi), %xmm8
+    movaps    0x7f(%rsi), %xmm9
+    lea    0x80(%rsi), %rsi
+    palignr    $1, %xmm8, %xmm9
+    movaps    %xmm9, 0x70(%rdi)
+    palignr    $1, %xmm7, %xmm8
+    movaps    %xmm8, 0x60(%rdi)
+    palignr    $1, %xmm6, %xmm7
+    movaps    %xmm7, 0x50(%rdi)
+    palignr    $1, %xmm5, %xmm6
+    movaps    %xmm6, 0x40(%rdi)
+    palignr    $1, %xmm4, %xmm5
+    movaps    %xmm5, 0x30(%rdi)
+    palignr    $1, %xmm3, %xmm4
+    movaps    %xmm4, 0x20(%rdi)
+    palignr    $1, %xmm2, %xmm3
+    movaps    %xmm3, 0x10(%rdi)
+    palignr    $1, %xmm1, %xmm2
+    movaps    %xmm2, (%rdi)
+    lea    0x80(%rdi), %rdi
+    jae    L(shl_1)
+    movdqu    %xmm0, (%r8)
+    add    $0x80, %rdx
+    add    %rdx, %rdi
+    add    %rdx, %rsi
+    BRANCH_TO_JMPTBL_ENTRY (L(table_144_bytes_fwd), %rdx, 4)
+
+    .p2align 4
+L(shl_1_bwd):
+    movaps    -0x01(%rsi), %xmm1
+
+    movaps    -0x11(%rsi), %xmm2
+    palignr    $1, %xmm2, %xmm1
+    movaps    %xmm1, -0x10(%rdi)
+
+    movaps    -0x21(%rsi), %xmm3
+    palignr    $1, %xmm3, %xmm2
+    movaps    %xmm2, -0x20(%rdi)
+
+    movaps    -0x31(%rsi), %xmm4
+    palignr    $1, %xmm4, %xmm3
+    movaps    %xmm3, -0x30(%rdi)
+
+    movaps    -0x41(%rsi), %xmm5
+    palignr    $1, %xmm5, %xmm4
+    movaps    %xmm4, -0x40(%rdi)
+
+    movaps    -0x51(%rsi), %xmm6
+    palignr    $1, %xmm6, %xmm5
+    movaps    %xmm5, -0x50(%rdi)
+
+    movaps    -0x61(%rsi), %xmm7
+    palignr    $1, %xmm7, %xmm6
+    movaps    %xmm6, -0x60(%rdi)
+
+    movaps    -0x71(%rsi), %xmm8
+    palignr    $1, %xmm8, %xmm7
+    movaps    %xmm7, -0x70(%rdi)
+
+    movaps    -0x81(%rsi), %xmm9
+    palignr    $1, %xmm9, %xmm8
+    movaps    %xmm8, -0x80(%rdi)
+
+    sub    $0x80, %rdx
+    lea    -0x80(%rdi), %rdi
+    lea    -0x80(%rsi), %rsi
+    jae    L(shl_1_bwd)
+    movdqu    %xmm0, (%r8)
+    add    $0x80, %rdx
+    sub    %rdx, %rdi
+    sub    %rdx, %rsi
+    BRANCH_TO_JMPTBL_ENTRY (L(table_144_bytes_bwd), %rdx, 4)
+
+    .p2align 4
+L(shl_2):
+    sub    $0x80, %rdx
+    movaps    -0x02(%rsi), %xmm1
+    movaps    0x0e(%rsi), %xmm2
+    movaps    0x1e(%rsi), %xmm3
+    movaps    0x2e(%rsi), %xmm4
+    movaps    0x3e(%rsi), %xmm5
+    movaps    0x4e(%rsi), %xmm6
+    movaps    0x5e(%rsi), %xmm7
+    movaps    0x6e(%rsi), %xmm8
+    movaps    0x7e(%rsi), %xmm9
+    lea    0x80(%rsi), %rsi
+    palignr    $2, %xmm8, %xmm9
+    movaps    %xmm9, 0x70(%rdi)
+    palignr    $2, %xmm7, %xmm8
+    movaps    %xmm8, 0x60(%rdi)
+    palignr    $2, %xmm6, %xmm7
+    movaps    %xmm7, 0x50(%rdi)
+    palignr    $2, %xmm5, %xmm6
+    movaps    %xmm6, 0x40(%rdi)
+    palignr    $2, %xmm4, %xmm5
+    movaps    %xmm5, 0x30(%rdi)
+    palignr    $2, %xmm3, %xmm4
+    movaps    %xmm4, 0x20(%rdi)
+    palignr    $2, %xmm2, %xmm3
+    movaps    %xmm3, 0x10(%rdi)
+    palignr    $2, %xmm1, %xmm2
+    movaps    %xmm2, (%rdi)
+    lea    0x80(%rdi), %rdi
+    jae    L(shl_2)
+    movdqu    %xmm0, (%r8)
+    add    $0x80, %rdx
+    add    %rdx, %rdi
+    add    %rdx, %rsi
+    BRANCH_TO_JMPTBL_ENTRY (L(table_144_bytes_fwd), %rdx, 4)
+
+    .p2align 4
+L(shl_2_bwd):
+    movaps    -0x02(%rsi), %xmm1
+
+    movaps    -0x12(%rsi), %xmm2
+    palignr    $2, %xmm2, %xmm1
+    movaps    %xmm1, -0x10(%rdi)
+
+    movaps    -0x22(%rsi), %xmm3
+    palignr    $2, %xmm3, %xmm2
+    movaps    %xmm2, -0x20(%rdi)
+
+    movaps    -0x32(%rsi), %xmm4
+    palignr    $2, %xmm4, %xmm3
+    movaps    %xmm3, -0x30(%rdi)
+
+    movaps    -0x42(%rsi), %xmm5
+    palignr    $2, %xmm5, %xmm4
+    movaps    %xmm4, -0x40(%rdi)
+
+    movaps    -0x52(%rsi), %xmm6
+    palignr    $2, %xmm6, %xmm5
+    movaps    %xmm5, -0x50(%rdi)
+
+    movaps    -0x62(%rsi), %xmm7
+    palignr    $2, %xmm7, %xmm6
+    movaps    %xmm6, -0x60(%rdi)
+
+    movaps    -0x72(%rsi), %xmm8
+    palignr    $2, %xmm8, %xmm7
+    movaps    %xmm7, -0x70(%rdi)
+
+    movaps    -0x82(%rsi), %xmm9
+    palignr    $2, %xmm9, %xmm8
+    movaps    %xmm8, -0x80(%rdi)
+
+    sub    $0x80, %rdx
+    lea    -0x80(%rdi), %rdi
+    lea    -0x80(%rsi), %rsi
+    jae    L(shl_2_bwd)
+    movdqu    %xmm0, (%r8)
+    add    $0x80, %rdx
+    sub    %rdx, %rdi
+    sub    %rdx, %rsi
+    BRANCH_TO_JMPTBL_ENTRY (L(table_144_bytes_bwd), %rdx, 4)
+
+    .p2align 4
+L(shl_3):
+    sub    $0x80, %rdx
+    movaps -0x03(%rsi), %xmm1
+    movaps    0x0d(%rsi), %xmm2
+    movaps    0x1d(%rsi), %xmm3
+    movaps    0x2d(%rsi), %xmm4
+    movaps    0x3d(%rsi), %xmm5
+    movaps    0x4d(%rsi), %xmm6
+    movaps    0x5d(%rsi), %xmm7
+    movaps    0x6d(%rsi), %xmm8
+    movaps    0x7d(%rsi), %xmm9
+    lea    0x80(%rsi), %rsi
+    palignr    $3, %xmm8, %xmm9
+    movaps    %xmm9, 0x70(%rdi)
+    palignr    $3, %xmm7, %xmm8
+    movaps    %xmm8, 0x60(%rdi)
+    palignr    $3, %xmm6, %xmm7
+    movaps    %xmm7, 0x50(%rdi)
+    palignr    $3, %xmm5, %xmm6
+    movaps    %xmm6, 0x40(%rdi)
+    palignr    $3, %xmm4, %xmm5
+    movaps    %xmm5, 0x30(%rdi)
+    palignr    $3, %xmm3, %xmm4
+    movaps    %xmm4, 0x20(%rdi)
+    palignr    $3, %xmm2, %xmm3
+    movaps    %xmm3, 0x10(%rdi)
+    palignr    $3, %xmm1, %xmm2
+    movaps    %xmm2, (%rdi)
+    lea    0x80(%rdi), %rdi
+    jae    L(shl_3)
+    movdqu    %xmm0, (%r8)
+    add    $0x80, %rdx
+    add    %rdx, %rdi
+    add    %rdx, %rsi
+    BRANCH_TO_JMPTBL_ENTRY (L(table_144_bytes_fwd), %rdx, 4)
+
+    .p2align 4
+L(shl_3_bwd):
+    movaps    -0x03(%rsi), %xmm1
+
+    movaps    -0x13(%rsi), %xmm2
+    palignr    $3, %xmm2, %xmm1
+    movaps    %xmm1, -0x10(%rdi)
+
+    movaps    -0x23(%rsi), %xmm3
+    palignr    $3, %xmm3, %xmm2
+    movaps    %xmm2, -0x20(%rdi)
+
+    movaps    -0x33(%rsi), %xmm4
+    palignr    $3, %xmm4, %xmm3
+    movaps    %xmm3, -0x30(%rdi)
+
+    movaps    -0x43(%rsi), %xmm5
+    palignr    $3, %xmm5, %xmm4
+    movaps    %xmm4, -0x40(%rdi)
+
+    movaps    -0x53(%rsi), %xmm6
+    palignr    $3, %xmm6, %xmm5
+    movaps    %xmm5, -0x50(%rdi)
+
+    movaps    -0x63(%rsi), %xmm7
+    palignr    $3, %xmm7, %xmm6
+    movaps    %xmm6, -0x60(%rdi)
+
+    movaps    -0x73(%rsi), %xmm8
+    palignr    $3, %xmm8, %xmm7
+    movaps    %xmm7, -0x70(%rdi)
+
+    movaps    -0x83(%rsi), %xmm9
+    palignr    $3, %xmm9, %xmm8
+    movaps    %xmm8, -0x80(%rdi)
+
+    sub    $0x80, %rdx
+    lea    -0x80(%rdi), %rdi
+    lea    -0x80(%rsi), %rsi
+    jae    L(shl_3_bwd)
+    movdqu    %xmm0, (%r8)
+    add    $0x80, %rdx
+    sub    %rdx, %rdi
+    sub    %rdx, %rsi
+    BRANCH_TO_JMPTBL_ENTRY (L(table_144_bytes_bwd), %rdx, 4)
+
+    .p2align 4
+L(shl_4):
+    sub    $0x80, %rdx
+    movaps    -0x04(%rsi), %xmm1
+    movaps    0x0c(%rsi), %xmm2
+    movaps    0x1c(%rsi), %xmm3
+    movaps    0x2c(%rsi), %xmm4
+    movaps    0x3c(%rsi), %xmm5
+    movaps    0x4c(%rsi), %xmm6
+    movaps    0x5c(%rsi), %xmm7
+    movaps    0x6c(%rsi), %xmm8
+    movaps    0x7c(%rsi), %xmm9
+    lea    0x80(%rsi), %rsi
+    palignr    $4, %xmm8, %xmm9
+    movaps    %xmm9, 0x70(%rdi)
+    palignr    $4, %xmm7, %xmm8
+    movaps    %xmm8, 0x60(%rdi)
+    palignr    $4, %xmm6, %xmm7
+    movaps    %xmm7, 0x50(%rdi)
+    palignr    $4, %xmm5, %xmm6
+    movaps    %xmm6, 0x40(%rdi)
+    palignr    $4, %xmm4, %xmm5
+    movaps    %xmm5, 0x30(%rdi)
+    palignr    $4, %xmm3, %xmm4
+    movaps    %xmm4, 0x20(%rdi)
+    palignr    $4, %xmm2, %xmm3
+    movaps    %xmm3, 0x10(%rdi)
+    palignr    $4, %xmm1, %xmm2
+    movaps    %xmm2, (%rdi)
+    lea    0x80(%rdi), %rdi
+    jae    L(shl_4)
+    movdqu    %xmm0, (%r8)
+    add    $0x80, %rdx
+    add    %rdx, %rdi
+    add    %rdx, %rsi
+    BRANCH_TO_JMPTBL_ENTRY (L(table_144_bytes_fwd), %rdx, 4)
+
+    .p2align 4
+L(shl_4_bwd):
+    movaps    -0x04(%rsi), %xmm1
+
+    movaps    -0x14(%rsi), %xmm2
+    palignr    $4, %xmm2, %xmm1
+    movaps    %xmm1, -0x10(%rdi)
+
+    movaps    -0x24(%rsi), %xmm3
+    palignr    $4, %xmm3, %xmm2
+    movaps    %xmm2, -0x20(%rdi)
+
+    movaps    -0x34(%rsi), %xmm4
+    palignr    $4, %xmm4, %xmm3
+    movaps    %xmm3, -0x30(%rdi)
+
+    movaps    -0x44(%rsi), %xmm5
+    palignr    $4, %xmm5, %xmm4
+    movaps    %xmm4, -0x40(%rdi)
+
+    movaps    -0x54(%rsi), %xmm6
+    palignr    $4, %xmm6, %xmm5
+    movaps    %xmm5, -0x50(%rdi)
+
+    movaps    -0x64(%rsi), %xmm7
+    palignr    $4, %xmm7, %xmm6
+    movaps    %xmm6, -0x60(%rdi)
+
+    movaps    -0x74(%rsi), %xmm8
+    palignr    $4, %xmm8, %xmm7
+    movaps    %xmm7, -0x70(%rdi)
+
+    movaps    -0x84(%rsi), %xmm9
+    palignr    $4, %xmm9, %xmm8
+    movaps    %xmm8, -0x80(%rdi)
+
+    sub    $0x80, %rdx
+    lea    -0x80(%rdi), %rdi
+    lea    -0x80(%rsi), %rsi
+    jae    L(shl_4_bwd)
+    movdqu    %xmm0, (%r8)
+    add    $0x80, %rdx
+    sub    %rdx, %rdi
+    sub    %rdx, %rsi
+    BRANCH_TO_JMPTBL_ENTRY (L(table_144_bytes_bwd), %rdx, 4)
+
+    .p2align 4
+L(shl_5):
+    sub    $0x80, %rdx
+    movaps    -0x05(%rsi), %xmm1
+    movaps    0x0b(%rsi), %xmm2
+    movaps    0x1b(%rsi), %xmm3
+    movaps    0x2b(%rsi), %xmm4
+    movaps    0x3b(%rsi), %xmm5
+    movaps    0x4b(%rsi), %xmm6
+    movaps    0x5b(%rsi), %xmm7
+    movaps    0x6b(%rsi), %xmm8
+    movaps    0x7b(%rsi), %xmm9
+    lea    0x80(%rsi), %rsi
+    palignr    $5, %xmm8, %xmm9
+    movaps    %xmm9, 0x70(%rdi)
+    palignr    $5, %xmm7, %xmm8
+    movaps    %xmm8, 0x60(%rdi)
+    palignr    $5, %xmm6, %xmm7
+    movaps    %xmm7, 0x50(%rdi)
+    palignr    $5, %xmm5, %xmm6
+    movaps    %xmm6, 0x40(%rdi)
+    palignr    $5, %xmm4, %xmm5
+    movaps    %xmm5, 0x30(%rdi)
+    palignr    $5, %xmm3, %xmm4
+    movaps    %xmm4, 0x20(%rdi)
+    palignr    $5, %xmm2, %xmm3
+    movaps    %xmm3, 0x10(%rdi)
+    palignr    $5, %xmm1, %xmm2
+    movaps    %xmm2, (%rdi)
+    lea    0x80(%rdi), %rdi
+    jae    L(shl_5)
+    movdqu    %xmm0, (%r8)
+    add    $0x80, %rdx
+    add    %rdx, %rdi
+    add    %rdx, %rsi
+    BRANCH_TO_JMPTBL_ENTRY (L(table_144_bytes_fwd), %rdx, 4)
+
+    .p2align 4
+L(shl_5_bwd):
+    movaps    -0x05(%rsi), %xmm1
+
+    movaps    -0x15(%rsi), %xmm2
+    palignr    $5, %xmm2, %xmm1
+    movaps    %xmm1, -0x10(%rdi)
+
+    movaps    -0x25(%rsi), %xmm3
+    palignr    $5, %xmm3, %xmm2
+    movaps    %xmm2, -0x20(%rdi)
+
+    movaps    -0x35(%rsi), %xmm4
+    palignr    $5, %xmm4, %xmm3
+    movaps    %xmm3, -0x30(%rdi)
+
+    movaps    -0x45(%rsi), %xmm5
+    palignr    $5, %xmm5, %xmm4
+    movaps    %xmm4, -0x40(%rdi)
+
+    movaps    -0x55(%rsi), %xmm6
+    palignr    $5, %xmm6, %xmm5
+    movaps    %xmm5, -0x50(%rdi)
+
+    movaps    -0x65(%rsi), %xmm7
+    palignr    $5, %xmm7, %xmm6
+    movaps    %xmm6, -0x60(%rdi)
+
+    movaps    -0x75(%rsi), %xmm8
+    palignr    $5, %xmm8, %xmm7
+    movaps    %xmm7, -0x70(%rdi)
+
+    movaps    -0x85(%rsi), %xmm9
+    palignr    $5, %xmm9, %xmm8
+    movaps    %xmm8, -0x80(%rdi)
+
+    sub    $0x80, %rdx
+    lea    -0x80(%rdi), %rdi
+    lea    -0x80(%rsi), %rsi
+    jae    L(shl_5_bwd)
+    movdqu    %xmm0, (%r8)
+    add    $0x80, %rdx
+    sub    %rdx, %rdi
+    sub    %rdx, %rsi
+    BRANCH_TO_JMPTBL_ENTRY (L(table_144_bytes_bwd), %rdx, 4)
+
+    .p2align 4
+L(shl_6):
+    sub    $0x80, %rdx
+    movaps    -0x06(%rsi), %xmm1
+    movaps    0x0a(%rsi), %xmm2
+    movaps    0x1a(%rsi), %xmm3
+    movaps    0x2a(%rsi), %xmm4
+    movaps    0x3a(%rsi), %xmm5
+    movaps    0x4a(%rsi), %xmm6
+    movaps    0x5a(%rsi), %xmm7
+    movaps    0x6a(%rsi), %xmm8
+    movaps    0x7a(%rsi), %xmm9
+    lea    0x80(%rsi), %rsi
+    palignr    $6, %xmm8, %xmm9
+    movaps    %xmm9, 0x70(%rdi)
+    palignr    $6, %xmm7, %xmm8
+    movaps    %xmm8, 0x60(%rdi)
+    palignr    $6, %xmm6, %xmm7
+    movaps    %xmm7, 0x50(%rdi)
+    palignr    $6, %xmm5, %xmm6
+    movaps    %xmm6, 0x40(%rdi)
+    palignr    $6, %xmm4, %xmm5
+    movaps    %xmm5, 0x30(%rdi)
+    palignr    $6, %xmm3, %xmm4
+    movaps    %xmm4, 0x20(%rdi)
+    palignr    $6, %xmm2, %xmm3
+    movaps    %xmm3, 0x10(%rdi)
+    palignr    $6, %xmm1, %xmm2
+    movaps    %xmm2, (%rdi)
+    lea    0x80(%rdi), %rdi
+    jae    L(shl_6)
+    movdqu    %xmm0, (%r8)
+    add    $0x80, %rdx
+    add    %rdx, %rdi
+    add    %rdx, %rsi
+    BRANCH_TO_JMPTBL_ENTRY (L(table_144_bytes_fwd), %rdx, 4)
+
+    .p2align 4
+L(shl_6_bwd):
+    movaps    -0x06(%rsi), %xmm1
+
+    movaps    -0x16(%rsi), %xmm2
+    palignr    $6, %xmm2, %xmm1
+    movaps    %xmm1, -0x10(%rdi)
+
+    movaps    -0x26(%rsi), %xmm3
+    palignr    $6, %xmm3, %xmm2
+    movaps    %xmm2, -0x20(%rdi)
+
+    movaps    -0x36(%rsi), %xmm4
+    palignr    $6, %xmm4, %xmm3
+    movaps    %xmm3, -0x30(%rdi)
+
+    movaps    -0x46(%rsi), %xmm5
+    palignr    $6, %xmm5, %xmm4
+    movaps    %xmm4, -0x40(%rdi)
+
+    movaps    -0x56(%rsi), %xmm6
+    palignr    $6, %xmm6, %xmm5
+    movaps    %xmm5, -0x50(%rdi)
+
+    movaps    -0x66(%rsi), %xmm7
+    palignr    $6, %xmm7, %xmm6
+    movaps    %xmm6, -0x60(%rdi)
+
+    movaps    -0x76(%rsi), %xmm8
+    palignr    $6, %xmm8, %xmm7
+    movaps    %xmm7, -0x70(%rdi)
+
+    movaps    -0x86(%rsi), %xmm9
+    palignr    $6, %xmm9, %xmm8
+    movaps    %xmm8, -0x80(%rdi)
+
+    sub    $0x80, %rdx
+    lea    -0x80(%rdi), %rdi
+    lea    -0x80(%rsi), %rsi
+    jae    L(shl_6_bwd)
+    movdqu    %xmm0, (%r8)
+    add    $0x80, %rdx
+    sub    %rdx, %rdi
+    sub    %rdx, %rsi
+    BRANCH_TO_JMPTBL_ENTRY (L(table_144_bytes_bwd), %rdx, 4)
+
+    .p2align 4
+L(shl_7):
+    sub    $0x80, %rdx
+    movaps    -0x07(%rsi), %xmm1
+    movaps    0x09(%rsi), %xmm2
+    movaps    0x19(%rsi), %xmm3
+    movaps    0x29(%rsi), %xmm4
+    movaps    0x39(%rsi), %xmm5
+    movaps    0x49(%rsi), %xmm6
+    movaps    0x59(%rsi), %xmm7
+    movaps    0x69(%rsi), %xmm8
+    movaps    0x79(%rsi), %xmm9
+    lea    0x80(%rsi), %rsi
+    palignr    $7, %xmm8, %xmm9
+    movaps    %xmm9, 0x70(%rdi)
+    palignr    $7, %xmm7, %xmm8
+    movaps    %xmm8, 0x60(%rdi)
+    palignr    $7, %xmm6, %xmm7
+    movaps    %xmm7, 0x50(%rdi)
+    palignr    $7, %xmm5, %xmm6
+    movaps    %xmm6, 0x40(%rdi)
+    palignr    $7, %xmm4, %xmm5
+    movaps    %xmm5, 0x30(%rdi)
+    palignr    $7, %xmm3, %xmm4
+    movaps    %xmm4, 0x20(%rdi)
+    palignr    $7, %xmm2, %xmm3
+    movaps    %xmm3, 0x10(%rdi)
+    palignr    $7, %xmm1, %xmm2
+    movaps    %xmm2, (%rdi)
+    lea    0x80(%rdi), %rdi
+    jae    L(shl_7)
+    movdqu    %xmm0, (%r8)
+    add    $0x80, %rdx
+    add    %rdx, %rdi
+    add    %rdx, %rsi
+    BRANCH_TO_JMPTBL_ENTRY (L(table_144_bytes_fwd), %rdx, 4)
+
+    .p2align 4
+L(shl_7_bwd):
+    movaps    -0x07(%rsi), %xmm1
+
+    movaps    -0x17(%rsi), %xmm2
+    palignr    $7, %xmm2, %xmm1
+    movaps    %xmm1, -0x10(%rdi)
+
+    movaps    -0x27(%rsi), %xmm3
+    palignr    $7, %xmm3, %xmm2
+    movaps    %xmm2, -0x20(%rdi)
+
+    movaps    -0x37(%rsi), %xmm4
+    palignr    $7, %xmm4, %xmm3
+    movaps    %xmm3, -0x30(%rdi)
+
+    movaps    -0x47(%rsi), %xmm5
+    palignr    $7, %xmm5, %xmm4
+    movaps    %xmm4, -0x40(%rdi)
+
+    movaps    -0x57(%rsi), %xmm6
+    palignr    $7, %xmm6, %xmm5
+    movaps    %xmm5, -0x50(%rdi)
+
+    movaps    -0x67(%rsi), %xmm7
+    palignr    $7, %xmm7, %xmm6
+    movaps    %xmm6, -0x60(%rdi)
+
+    movaps    -0x77(%rsi), %xmm8
+    palignr    $7, %xmm8, %xmm7
+    movaps    %xmm7, -0x70(%rdi)
+
+    movaps    -0x87(%rsi), %xmm9
+    palignr    $7, %xmm9, %xmm8
+    movaps    %xmm8, -0x80(%rdi)
+
+    sub    $0x80, %rdx
+    lea    -0x80(%rdi), %rdi
+    lea    -0x80(%rsi), %rsi
+    jae    L(shl_7_bwd)
+    movdqu    %xmm0, (%r8)
+    add    $0x80, %rdx
+    sub    %rdx, %rdi
+    sub    %rdx, %rsi
+    BRANCH_TO_JMPTBL_ENTRY (L(table_144_bytes_bwd), %rdx, 4)
+
+    .p2align 4
+L(shl_8):
+    sub    $0x80, %rdx
+    movaps    -0x08(%rsi), %xmm1
+    movaps    0x08(%rsi), %xmm2
+    movaps    0x18(%rsi), %xmm3
+    movaps    0x28(%rsi), %xmm4
+    movaps    0x38(%rsi), %xmm5
+    movaps    0x48(%rsi), %xmm6
+    movaps    0x58(%rsi), %xmm7
+    movaps    0x68(%rsi), %xmm8
+    movaps    0x78(%rsi), %xmm9
+    lea    0x80(%rsi), %rsi
+    palignr    $8, %xmm8, %xmm9
+    movaps    %xmm9, 0x70(%rdi)
+    palignr    $8, %xmm7, %xmm8
+    movaps    %xmm8, 0x60(%rdi)
+    palignr    $8, %xmm6, %xmm7
+    movaps    %xmm7, 0x50(%rdi)
+    palignr    $8, %xmm5, %xmm6
+    movaps    %xmm6, 0x40(%rdi)
+    palignr    $8, %xmm4, %xmm5
+    movaps    %xmm5, 0x30(%rdi)
+    palignr    $8, %xmm3, %xmm4
+    movaps    %xmm4, 0x20(%rdi)
+    palignr    $8, %xmm2, %xmm3
+    movaps    %xmm3, 0x10(%rdi)
+    palignr    $8, %xmm1, %xmm2
+    movaps    %xmm2, (%rdi)
+    lea    0x80(%rdi), %rdi
+    jae    L(shl_8)
+    movdqu    %xmm0, (%r8)
+    add    $0x80, %rdx
+    add    %rdx, %rdi
+    add    %rdx, %rsi
+    BRANCH_TO_JMPTBL_ENTRY (L(table_144_bytes_fwd), %rdx, 4)
+
+    .p2align 4
+L(shl_8_bwd):
+    movaps    -0x08(%rsi), %xmm1
+
+    movaps    -0x18(%rsi), %xmm2
+    palignr    $8, %xmm2, %xmm1
+    movaps    %xmm1, -0x10(%rdi)
+
+    movaps    -0x28(%rsi), %xmm3
+    palignr    $8, %xmm3, %xmm2
+    movaps    %xmm2, -0x20(%rdi)
+
+    movaps    -0x38(%rsi), %xmm4
+    palignr    $8, %xmm4, %xmm3
+    movaps    %xmm3, -0x30(%rdi)
+
+    movaps    -0x48(%rsi), %xmm5
+    palignr    $8, %xmm5, %xmm4
+    movaps    %xmm4, -0x40(%rdi)
+
+    movaps    -0x58(%rsi), %xmm6
+    palignr    $8, %xmm6, %xmm5
+    movaps    %xmm5, -0x50(%rdi)
+
+    movaps    -0x68(%rsi), %xmm7
+    palignr    $8, %xmm7, %xmm6
+    movaps    %xmm6, -0x60(%rdi)
+
+    movaps    -0x78(%rsi), %xmm8
+    palignr    $8, %xmm8, %xmm7
+    movaps    %xmm7, -0x70(%rdi)
+
+    movaps    -0x88(%rsi), %xmm9
+    palignr    $8, %xmm9, %xmm8
+    movaps    %xmm8, -0x80(%rdi)
+
+    sub    $0x80, %rdx
+    lea    -0x80(%rdi), %rdi
+    lea    -0x80(%rsi), %rsi
+    jae    L(shl_8_bwd)
+L(shl_8_end_bwd):
+    movdqu    %xmm0, (%r8)
+    add    $0x80, %rdx
+    sub    %rdx, %rdi
+    sub    %rdx, %rsi
+    BRANCH_TO_JMPTBL_ENTRY (L(table_144_bytes_bwd), %rdx, 4)
+
+    .p2align 4
+L(shl_9):
+    sub    $0x80, %rdx
+    movaps    -0x09(%rsi), %xmm1
+    movaps    0x07(%rsi), %xmm2
+    movaps    0x17(%rsi), %xmm3
+    movaps    0x27(%rsi), %xmm4
+    movaps    0x37(%rsi), %xmm5
+    movaps    0x47(%rsi), %xmm6
+    movaps    0x57(%rsi), %xmm7
+    movaps    0x67(%rsi), %xmm8
+    movaps    0x77(%rsi), %xmm9
+    lea    0x80(%rsi), %rsi
+    palignr    $9, %xmm8, %xmm9
+    movaps    %xmm9, 0x70(%rdi)
+    palignr    $9, %xmm7, %xmm8
+    movaps    %xmm8, 0x60(%rdi)
+    palignr    $9, %xmm6, %xmm7
+    movaps    %xmm7, 0x50(%rdi)
+    palignr    $9, %xmm5, %xmm6
+    movaps    %xmm6, 0x40(%rdi)
+    palignr    $9, %xmm4, %xmm5
+    movaps    %xmm5, 0x30(%rdi)
+    palignr    $9, %xmm3, %xmm4
+    movaps    %xmm4, 0x20(%rdi)
+    palignr    $9, %xmm2, %xmm3
+    movaps    %xmm3, 0x10(%rdi)
+    palignr    $9, %xmm1, %xmm2
+    movaps    %xmm2, (%rdi)
+    lea    0x80(%rdi), %rdi
+    jae    L(shl_9)
+    movdqu    %xmm0, (%r8)
+    add    $0x80, %rdx
+    add    %rdx, %rdi
+    add    %rdx, %rsi
+    BRANCH_TO_JMPTBL_ENTRY (L(table_144_bytes_fwd), %rdx, 4)
+
+    .p2align 4
+L(shl_9_bwd):
+    movaps    -0x09(%rsi), %xmm1
+
+    movaps    -0x19(%rsi), %xmm2
+    palignr    $9, %xmm2, %xmm1
+    movaps    %xmm1, -0x10(%rdi)
+
+    movaps    -0x29(%rsi), %xmm3
+    palignr    $9, %xmm3, %xmm2
+    movaps    %xmm2, -0x20(%rdi)
+
+    movaps    -0x39(%rsi), %xmm4
+    palignr    $9, %xmm4, %xmm3
+    movaps    %xmm3, -0x30(%rdi)
+
+    movaps    -0x49(%rsi), %xmm5
+    palignr    $9, %xmm5, %xmm4
+    movaps    %xmm4, -0x40(%rdi)
+
+    movaps    -0x59(%rsi), %xmm6
+    palignr    $9, %xmm6, %xmm5
+    movaps    %xmm5, -0x50(%rdi)
+
+    movaps    -0x69(%rsi), %xmm7
+    palignr    $9, %xmm7, %xmm6
+    movaps    %xmm6, -0x60(%rdi)
+
+    movaps    -0x79(%rsi), %xmm8
+    palignr    $9, %xmm8, %xmm7
+    movaps    %xmm7, -0x70(%rdi)
+
+    movaps    -0x89(%rsi), %xmm9
+    palignr    $9, %xmm9, %xmm8
+    movaps    %xmm8, -0x80(%rdi)
+
+    sub    $0x80, %rdx
+    lea    -0x80(%rdi), %rdi
+    lea    -0x80(%rsi), %rsi
+    jae    L(shl_9_bwd)
+    movdqu    %xmm0, (%r8)
+    add    $0x80, %rdx
+    sub    %rdx, %rdi
+    sub    %rdx, %rsi
+    BRANCH_TO_JMPTBL_ENTRY (L(table_144_bytes_bwd), %rdx, 4)
+
+    .p2align 4
+L(shl_10):
+    sub    $0x80, %rdx
+    movaps    -0x0a(%rsi), %xmm1
+    movaps    0x06(%rsi), %xmm2
+    movaps    0x16(%rsi), %xmm3
+    movaps    0x26(%rsi), %xmm4
+    movaps    0x36(%rsi), %xmm5
+    movaps    0x46(%rsi), %xmm6
+    movaps    0x56(%rsi), %xmm7
+    movaps    0x66(%rsi), %xmm8
+    movaps    0x76(%rsi), %xmm9
+    lea    0x80(%rsi), %rsi
+    palignr    $10, %xmm8, %xmm9
+    movaps    %xmm9, 0x70(%rdi)
+    palignr    $10, %xmm7, %xmm8
+    movaps    %xmm8, 0x60(%rdi)
+    palignr    $10, %xmm6, %xmm7
+    movaps    %xmm7, 0x50(%rdi)
+    palignr    $10, %xmm5, %xmm6
+    movaps    %xmm6, 0x40(%rdi)
+    palignr    $10, %xmm4, %xmm5
+    movaps    %xmm5, 0x30(%rdi)
+    palignr    $10, %xmm3, %xmm4
+    movaps    %xmm4, 0x20(%rdi)
+    palignr    $10, %xmm2, %xmm3
+    movaps    %xmm3, 0x10(%rdi)
+    palignr    $10, %xmm1, %xmm2
+    movaps    %xmm2, (%rdi)
+    lea    0x80(%rdi), %rdi
+    jae    L(shl_10)
+    movdqu    %xmm0, (%r8)
+    add    $0x80, %rdx
+    add    %rdx, %rdi
+    add    %rdx, %rsi
+    BRANCH_TO_JMPTBL_ENTRY (L(table_144_bytes_fwd), %rdx, 4)
+
+    .p2align 4
+L(shl_10_bwd):
+    movaps    -0x0a(%rsi), %xmm1
+
+    movaps    -0x1a(%rsi), %xmm2
+    palignr    $10, %xmm2, %xmm1
+    movaps    %xmm1, -0x10(%rdi)
+
+    movaps    -0x2a(%rsi), %xmm3
+    palignr    $10, %xmm3, %xmm2
+    movaps    %xmm2, -0x20(%rdi)
+
+    movaps    -0x3a(%rsi), %xmm4
+    palignr    $10, %xmm4, %xmm3
+    movaps    %xmm3, -0x30(%rdi)
+
+    movaps    -0x4a(%rsi), %xmm5
+    palignr    $10, %xmm5, %xmm4
+    movaps    %xmm4, -0x40(%rdi)
+
+    movaps    -0x5a(%rsi), %xmm6
+    palignr    $10, %xmm6, %xmm5
+    movaps    %xmm5, -0x50(%rdi)
+
+    movaps    -0x6a(%rsi), %xmm7
+    palignr    $10, %xmm7, %xmm6
+    movaps    %xmm6, -0x60(%rdi)
+
+    movaps    -0x7a(%rsi), %xmm8
+    palignr    $10, %xmm8, %xmm7
+    movaps    %xmm7, -0x70(%rdi)
+
+    movaps    -0x8a(%rsi), %xmm9
+    palignr    $10, %xmm9, %xmm8
+    movaps    %xmm8, -0x80(%rdi)
+
+    sub    $0x80, %rdx
+    lea    -0x80(%rdi), %rdi
+    lea    -0x80(%rsi), %rsi
+    jae    L(shl_10_bwd)
+    movdqu    %xmm0, (%r8)
+    add    $0x80, %rdx
+    sub    %rdx, %rdi
+    sub    %rdx, %rsi
+    BRANCH_TO_JMPTBL_ENTRY (L(table_144_bytes_bwd), %rdx, 4)
+
+    .p2align 4
+L(shl_11):
+    sub    $0x80, %rdx
+    movaps    -0x0b(%rsi), %xmm1
+    movaps    0x05(%rsi), %xmm2
+    movaps    0x15(%rsi), %xmm3
+    movaps    0x25(%rsi), %xmm4
+    movaps    0x35(%rsi), %xmm5
+    movaps    0x45(%rsi), %xmm6
+    movaps    0x55(%rsi), %xmm7
+    movaps    0x65(%rsi), %xmm8
+    movaps    0x75(%rsi), %xmm9
+    lea    0x80(%rsi), %rsi
+    palignr    $11, %xmm8, %xmm9
+    movaps    %xmm9, 0x70(%rdi)
+    palignr    $11, %xmm7, %xmm8
+    movaps    %xmm8, 0x60(%rdi)
+    palignr    $11, %xmm6, %xmm7
+    movaps    %xmm7, 0x50(%rdi)
+    palignr    $11, %xmm5, %xmm6
+    movaps    %xmm6, 0x40(%rdi)
+    palignr    $11, %xmm4, %xmm5
+    movaps    %xmm5, 0x30(%rdi)
+    palignr    $11, %xmm3, %xmm4
+    movaps    %xmm4, 0x20(%rdi)
+    palignr    $11, %xmm2, %xmm3
+    movaps    %xmm3, 0x10(%rdi)
+    palignr    $11, %xmm1, %xmm2
+    movaps    %xmm2, (%rdi)
+    lea    0x80(%rdi), %rdi
+    jae    L(shl_11)
+    movdqu    %xmm0, (%r8)
+    add    $0x80, %rdx
+    add    %rdx, %rdi
+    add    %rdx, %rsi
+    BRANCH_TO_JMPTBL_ENTRY (L(table_144_bytes_fwd), %rdx, 4)
+
+    .p2align 4
+L(shl_11_bwd):
+    movaps    -0x0b(%rsi), %xmm1
+
+    movaps    -0x1b(%rsi), %xmm2
+    palignr    $11, %xmm2, %xmm1
+    movaps    %xmm1, -0x10(%rdi)
+
+    movaps    -0x2b(%rsi), %xmm3
+    palignr    $11, %xmm3, %xmm2
+    movaps    %xmm2, -0x20(%rdi)
+
+    movaps    -0x3b(%rsi), %xmm4
+    palignr    $11, %xmm4, %xmm3
+    movaps    %xmm3, -0x30(%rdi)
+
+    movaps    -0x4b(%rsi), %xmm5
+    palignr    $11, %xmm5, %xmm4
+    movaps    %xmm4, -0x40(%rdi)
+
+    movaps    -0x5b(%rsi), %xmm6
+    palignr    $11, %xmm6, %xmm5
+    movaps    %xmm5, -0x50(%rdi)
+
+    movaps    -0x6b(%rsi), %xmm7
+    palignr    $11, %xmm7, %xmm6
+    movaps    %xmm6, -0x60(%rdi)
+
+    movaps    -0x7b(%rsi), %xmm8
+    palignr    $11, %xmm8, %xmm7
+    movaps    %xmm7, -0x70(%rdi)
+
+    movaps    -0x8b(%rsi), %xmm9
+    palignr    $11, %xmm9, %xmm8
+    movaps    %xmm8, -0x80(%rdi)
+
+    sub    $0x80, %rdx
+    lea    -0x80(%rdi), %rdi
+    lea    -0x80(%rsi), %rsi
+    jae    L(shl_11_bwd)
+    movdqu    %xmm0, (%r8)
+    add    $0x80, %rdx
+    sub    %rdx, %rdi
+    sub    %rdx, %rsi
+    BRANCH_TO_JMPTBL_ENTRY (L(table_144_bytes_bwd), %rdx, 4)
+
+    .p2align 4
+L(shl_12):
+    sub    $0x80, %rdx
+    movdqa    -0x0c(%rsi), %xmm1
+    movaps    0x04(%rsi), %xmm2
+    movaps    0x14(%rsi), %xmm3
+    movaps    0x24(%rsi), %xmm4
+    movaps    0x34(%rsi), %xmm5
+    movaps    0x44(%rsi), %xmm6
+    movaps    0x54(%rsi), %xmm7
+    movaps    0x64(%rsi), %xmm8
+    movaps    0x74(%rsi), %xmm9
+    lea    0x80(%rsi), %rsi
+    palignr    $12, %xmm8, %xmm9
+    movaps    %xmm9, 0x70(%rdi)
+    palignr    $12, %xmm7, %xmm8
+    movaps    %xmm8, 0x60(%rdi)
+    palignr    $12, %xmm6, %xmm7
+    movaps    %xmm7, 0x50(%rdi)
+    palignr    $12, %xmm5, %xmm6
+    movaps    %xmm6, 0x40(%rdi)
+    palignr    $12, %xmm4, %xmm5
+    movaps    %xmm5, 0x30(%rdi)
+    palignr    $12, %xmm3, %xmm4
+    movaps    %xmm4, 0x20(%rdi)
+    palignr    $12, %xmm2, %xmm3
+    movaps    %xmm3, 0x10(%rdi)
+    palignr    $12, %xmm1, %xmm2
+    movaps    %xmm2, (%rdi)
+
+    lea    0x80(%rdi), %rdi
+    jae    L(shl_12)
+    movdqu    %xmm0, (%r8)
+    add    $0x80, %rdx
+    add    %rdx, %rdi
+    add    %rdx, %rsi
+    BRANCH_TO_JMPTBL_ENTRY (L(table_144_bytes_fwd), %rdx, 4)
+
+    .p2align 4
+L(shl_12_bwd):
+    movaps    -0x0c(%rsi), %xmm1
+
+    movaps    -0x1c(%rsi), %xmm2
+    palignr    $12, %xmm2, %xmm1
+    movaps    %xmm1, -0x10(%rdi)
+
+    movaps    -0x2c(%rsi), %xmm3
+    palignr    $12, %xmm3, %xmm2
+    movaps    %xmm2, -0x20(%rdi)
+
+    movaps    -0x3c(%rsi), %xmm4
+    palignr    $12, %xmm4, %xmm3
+    movaps    %xmm3, -0x30(%rdi)
+
+    movaps    -0x4c(%rsi), %xmm5
+    palignr    $12, %xmm5, %xmm4
+    movaps    %xmm4, -0x40(%rdi)
+
+    movaps    -0x5c(%rsi), %xmm6
+    palignr    $12, %xmm6, %xmm5
+    movaps    %xmm5, -0x50(%rdi)
+
+    movaps    -0x6c(%rsi), %xmm7
+    palignr    $12, %xmm7, %xmm6
+    movaps    %xmm6, -0x60(%rdi)
+
+    movaps    -0x7c(%rsi), %xmm8
+    palignr    $12, %xmm8, %xmm7
+    movaps    %xmm7, -0x70(%rdi)
+
+    movaps    -0x8c(%rsi), %xmm9
+    palignr    $12, %xmm9, %xmm8
+    movaps    %xmm8, -0x80(%rdi)
+
+    sub    $0x80, %rdx
+    lea    -0x80(%rdi), %rdi
+    lea    -0x80(%rsi), %rsi
+    jae    L(shl_12_bwd)
+    movdqu    %xmm0, (%r8)
+    add    $0x80, %rdx
+    sub    %rdx, %rdi
+    sub    %rdx, %rsi
+    BRANCH_TO_JMPTBL_ENTRY (L(table_144_bytes_bwd), %rdx, 4)
+
+    .p2align 4
+L(shl_13):
+    sub    $0x80, %rdx
+    movaps    -0x0d(%rsi), %xmm1
+    movaps    0x03(%rsi), %xmm2
+    movaps    0x13(%rsi), %xmm3
+    movaps    0x23(%rsi), %xmm4
+    movaps    0x33(%rsi), %xmm5
+    movaps    0x43(%rsi), %xmm6
+    movaps    0x53(%rsi), %xmm7
+    movaps    0x63(%rsi), %xmm8
+    movaps    0x73(%rsi), %xmm9
+    lea    0x80(%rsi), %rsi
+    palignr    $13, %xmm8, %xmm9
+    movaps    %xmm9, 0x70(%rdi)
+    palignr    $13, %xmm7, %xmm8
+    movaps    %xmm8, 0x60(%rdi)
+    palignr    $13, %xmm6, %xmm7
+    movaps    %xmm7, 0x50(%rdi)
+    palignr    $13, %xmm5, %xmm6
+    movaps    %xmm6, 0x40(%rdi)
+    palignr    $13, %xmm4, %xmm5
+    movaps    %xmm5, 0x30(%rdi)
+    palignr    $13, %xmm3, %xmm4
+    movaps    %xmm4, 0x20(%rdi)
+    palignr    $13, %xmm2, %xmm3
+    movaps    %xmm3, 0x10(%rdi)
+    palignr    $13, %xmm1, %xmm2
+    movaps    %xmm2, (%rdi)
+    lea    0x80(%rdi), %rdi
+    jae    L(shl_13)
+    movdqu    %xmm0, (%r8)
+    add    $0x80, %rdx
+    add    %rdx, %rdi
+    add    %rdx, %rsi
+    BRANCH_TO_JMPTBL_ENTRY (L(table_144_bytes_fwd), %rdx, 4)
+
+    .p2align 4
+L(shl_13_bwd):
+    movaps    -0x0d(%rsi), %xmm1
+
+    movaps    -0x1d(%rsi), %xmm2
+    palignr    $13, %xmm2, %xmm1
+    movaps    %xmm1, -0x10(%rdi)
+
+    movaps    -0x2d(%rsi), %xmm3
+    palignr    $13, %xmm3, %xmm2
+    movaps    %xmm2, -0x20(%rdi)
+
+    movaps    -0x3d(%rsi), %xmm4
+    palignr    $13, %xmm4, %xmm3
+    movaps    %xmm3, -0x30(%rdi)
+
+    movaps    -0x4d(%rsi), %xmm5
+    palignr    $13, %xmm5, %xmm4
+    movaps    %xmm4, -0x40(%rdi)
+
+    movaps    -0x5d(%rsi), %xmm6
+    palignr    $13, %xmm6, %xmm5
+    movaps    %xmm5, -0x50(%rdi)
+
+    movaps    -0x6d(%rsi), %xmm7
+    palignr    $13, %xmm7, %xmm6
+    movaps    %xmm6, -0x60(%rdi)
+
+    movaps    -0x7d(%rsi), %xmm8
+    palignr    $13, %xmm8, %xmm7
+    movaps    %xmm7, -0x70(%rdi)
+
+    movaps    -0x8d(%rsi), %xmm9
+    palignr    $13, %xmm9, %xmm8
+    movaps    %xmm8, -0x80(%rdi)
+
+    sub    $0x80, %rdx
+    lea    -0x80(%rdi), %rdi
+    lea    -0x80(%rsi), %rsi
+    jae    L(shl_13_bwd)
+    movdqu    %xmm0, (%r8)
+    add    $0x80, %rdx
+    sub    %rdx, %rdi
+    sub    %rdx, %rsi
+    BRANCH_TO_JMPTBL_ENTRY (L(table_144_bytes_bwd), %rdx, 4)
+
+    .p2align 4
+L(shl_14):
+    sub    $0x80, %rdx
+    movaps    -0x0e(%rsi), %xmm1
+    movaps    0x02(%rsi), %xmm2
+    movaps    0x12(%rsi), %xmm3
+    movaps    0x22(%rsi), %xmm4
+    movaps    0x32(%rsi), %xmm5
+    movaps    0x42(%rsi), %xmm6
+    movaps    0x52(%rsi), %xmm7
+    movaps    0x62(%rsi), %xmm8
+    movaps    0x72(%rsi), %xmm9
+    lea    0x80(%rsi), %rsi
+    palignr    $14, %xmm8, %xmm9
+    movaps    %xmm9, 0x70(%rdi)
+    palignr    $14, %xmm7, %xmm8
+    movaps    %xmm8, 0x60(%rdi)
+    palignr    $14, %xmm6, %xmm7
+    movaps    %xmm7, 0x50(%rdi)
+    palignr    $14, %xmm5, %xmm6
+    movaps    %xmm6, 0x40(%rdi)
+    palignr    $14, %xmm4, %xmm5
+    movaps    %xmm5, 0x30(%rdi)
+    palignr    $14, %xmm3, %xmm4
+    movaps    %xmm4, 0x20(%rdi)
+    palignr    $14, %xmm2, %xmm3
+    movaps    %xmm3, 0x10(%rdi)
+    palignr    $14, %xmm1, %xmm2
+    movaps    %xmm2, (%rdi)
+    lea    0x80(%rdi), %rdi
+    jae    L(shl_14)
+    movdqu    %xmm0, (%r8)
+    add    $0x80, %rdx
+    add    %rdx, %rdi
+    add    %rdx, %rsi
+    BRANCH_TO_JMPTBL_ENTRY (L(table_144_bytes_fwd), %rdx, 4)
+
+    .p2align 4
+L(shl_14_bwd):
+    movaps    -0x0e(%rsi), %xmm1
+
+    movaps    -0x1e(%rsi), %xmm2
+    palignr    $14, %xmm2, %xmm1
+    movaps    %xmm1, -0x10(%rdi)
+
+    movaps    -0x2e(%rsi), %xmm3
+    palignr    $14, %xmm3, %xmm2
+    movaps    %xmm2, -0x20(%rdi)
+
+    movaps    -0x3e(%rsi), %xmm4
+    palignr    $14, %xmm4, %xmm3
+    movaps    %xmm3, -0x30(%rdi)
+
+    movaps    -0x4e(%rsi), %xmm5
+    palignr    $14, %xmm5, %xmm4
+    movaps    %xmm4, -0x40(%rdi)
+
+    movaps    -0x5e(%rsi), %xmm6
+    palignr    $14, %xmm6, %xmm5
+    movaps    %xmm5, -0x50(%rdi)
+
+    movaps    -0x6e(%rsi), %xmm7
+    palignr    $14, %xmm7, %xmm6
+    movaps    %xmm6, -0x60(%rdi)
+
+    movaps    -0x7e(%rsi), %xmm8
+    palignr    $14, %xmm8, %xmm7
+    movaps    %xmm7, -0x70(%rdi)
+
+    movaps    -0x8e(%rsi), %xmm9
+    palignr    $14, %xmm9, %xmm8
+    movaps    %xmm8, -0x80(%rdi)
+
+    sub    $0x80, %rdx
+    lea    -0x80(%rdi), %rdi
+    lea    -0x80(%rsi), %rsi
+    jae    L(shl_14_bwd)
+    movdqu    %xmm0, (%r8)
+    add    $0x80, %rdx
+    sub    %rdx, %rdi
+    sub    %rdx, %rsi
+    BRANCH_TO_JMPTBL_ENTRY (L(table_144_bytes_bwd), %rdx, 4)
+
+    .p2align 4
+L(shl_15):
+    sub    $0x80, %rdx
+    movaps    -0x0f(%rsi), %xmm1
+    movaps    0x01(%rsi), %xmm2
+    movaps    0x11(%rsi), %xmm3
+    movaps    0x21(%rsi), %xmm4
+    movaps    0x31(%rsi), %xmm5
+    movaps    0x41(%rsi), %xmm6
+    movaps    0x51(%rsi), %xmm7
+    movaps    0x61(%rsi), %xmm8
+    movaps    0x71(%rsi), %xmm9
+    lea    0x80(%rsi), %rsi
+    palignr    $15, %xmm8, %xmm9
+    movaps    %xmm9, 0x70(%rdi)
+    palignr    $15, %xmm7, %xmm8
+    movaps    %xmm8, 0x60(%rdi)
+    palignr    $15, %xmm6, %xmm7
+    movaps    %xmm7, 0x50(%rdi)
+    palignr    $15, %xmm5, %xmm6
+    movaps    %xmm6, 0x40(%rdi)
+    palignr    $15, %xmm4, %xmm5
+    movaps    %xmm5, 0x30(%rdi)
+    palignr    $15, %xmm3, %xmm4
+    movaps    %xmm4, 0x20(%rdi)
+    palignr    $15, %xmm2, %xmm3
+    movaps    %xmm3, 0x10(%rdi)
+    palignr    $15, %xmm1, %xmm2
+    movaps    %xmm2, (%rdi)
+    lea    0x80(%rdi), %rdi
+    jae    L(shl_15)
+    movdqu    %xmm0, (%r8)
+    add    $0x80, %rdx
+    add    %rdx, %rdi
+    add    %rdx, %rsi
+    BRANCH_TO_JMPTBL_ENTRY (L(table_144_bytes_fwd), %rdx, 4)
+
+    .p2align 4
+L(shl_15_bwd):
+    movaps    -0x0f(%rsi), %xmm1
+
+    movaps    -0x1f(%rsi), %xmm2
+    palignr    $15, %xmm2, %xmm1
+    movaps    %xmm1, -0x10(%rdi)
+
+    movaps    -0x2f(%rsi), %xmm3
+    palignr    $15, %xmm3, %xmm2
+    movaps    %xmm2, -0x20(%rdi)
+
+    movaps    -0x3f(%rsi), %xmm4
+    palignr    $15, %xmm4, %xmm3
+    movaps    %xmm3, -0x30(%rdi)
+
+    movaps    -0x4f(%rsi), %xmm5
+    palignr    $15, %xmm5, %xmm4
+    movaps    %xmm4, -0x40(%rdi)
+
+    movaps    -0x5f(%rsi), %xmm6
+    palignr    $15, %xmm6, %xmm5
+    movaps    %xmm5, -0x50(%rdi)
+
+    movaps    -0x6f(%rsi), %xmm7
+    palignr    $15, %xmm7, %xmm6
+    movaps    %xmm6, -0x60(%rdi)
+
+    movaps    -0x7f(%rsi), %xmm8
+    palignr    $15, %xmm8, %xmm7
+    movaps    %xmm7, -0x70(%rdi)
+
+    movaps    -0x8f(%rsi), %xmm9
+    palignr    $15, %xmm9, %xmm8
+    movaps    %xmm8, -0x80(%rdi)
+
+    sub    $0x80, %rdx
+    lea    -0x80(%rdi), %rdi
+    lea    -0x80(%rsi), %rsi
+    jae    L(shl_15_bwd)
+    movdqu    %xmm0, (%r8)
+    add    $0x80, %rdx
+    sub    %rdx, %rdi
+    sub    %rdx, %rsi
+    BRANCH_TO_JMPTBL_ENTRY (L(table_144_bytes_bwd), %rdx, 4)
+
+    .p2align 4
+L(gobble_mem_fwd):
+    movdqu    (%rsi), %xmm1
+    movdqu    %xmm0, (%r8)
+    movdqa    %xmm1, (%rdi)
+    sub    $16, %rdx
+    add    $16, %rsi
+    add    $16, %rdi
+
+#ifdef SHARED_CACHE_SIZE_HALF
+    mov    $SHARED_CACHE_SIZE_HALF, %RCX_LP
+#else
+    mov    __x86_shared_cache_size_half(%rip), %RCX_LP
+#endif
+#ifdef USE_AS_MEMMOVE
+    mov    %rsi, %r9
+    sub    %rdi, %r9
+    cmp    %rdx, %r9
+    jae    L(memmove_is_memcpy_fwd)
+    cmp    %rcx, %r9
+    jbe    L(ll_cache_copy_fwd_start)
+L(memmove_is_memcpy_fwd):
+#endif
+    cmp    %rcx, %rdx
+    ja    L(bigger_in_fwd)
+    mov    %rdx, %rcx
+L(bigger_in_fwd):
+    sub    %rcx, %rdx
+    cmp    $0x1000, %rdx
+    jbe    L(ll_cache_copy_fwd)
+
+    mov    %rcx, %r9
+    shl    $3, %r9
+    cmp    %r9, %rdx
+    jbe    L(2steps_copy_fwd)
+    add    %rcx, %rdx
+    xor    %rcx, %rcx
+L(2steps_copy_fwd):
+    sub    $0x80, %rdx
+L(gobble_mem_fwd_loop):
+    sub    $0x80, %rdx
+    prefetcht0 0x200(%rsi)
+    prefetcht0 0x300(%rsi)
+    movdqu    (%rsi), %xmm0
+    movdqu    0x10(%rsi), %xmm1
+    movdqu    0x20(%rsi), %xmm2
+    movdqu    0x30(%rsi), %xmm3
+    movdqu    0x40(%rsi), %xmm4
+    movdqu    0x50(%rsi), %xmm5
+    movdqu    0x60(%rsi), %xmm6
+    movdqu    0x70(%rsi), %xmm7
+    lfence
+    movntdq    %xmm0, (%rdi)
+    movntdq    %xmm1, 0x10(%rdi)
+    movntdq    %xmm2, 0x20(%rdi)
+    movntdq    %xmm3, 0x30(%rdi)
+    movntdq    %xmm4, 0x40(%rdi)
+    movntdq    %xmm5, 0x50(%rdi)
+    movntdq    %xmm6, 0x60(%rdi)
+    movntdq    %xmm7, 0x70(%rdi)
+    lea    0x80(%rsi), %rsi
+    lea    0x80(%rdi), %rdi
+    jae    L(gobble_mem_fwd_loop)
+    sfence
+    cmp    $0x80, %rcx
+    jb    L(gobble_mem_fwd_end)
+    add    $0x80, %rdx
+L(ll_cache_copy_fwd):
+    add    %rcx, %rdx
+L(ll_cache_copy_fwd_start):
+    sub    $0x80, %rdx
+L(gobble_ll_loop_fwd):
+    prefetchnta 0x1c0(%rsi)
+    prefetchnta 0x280(%rsi)
+    prefetchnta 0x1c0(%rdi)
+    prefetchnta 0x280(%rdi)
+    sub    $0x80, %rdx
+    movdqu    (%rsi), %xmm0
+    movdqu    0x10(%rsi), %xmm1
+    movdqu    0x20(%rsi), %xmm2
+    movdqu    0x30(%rsi), %xmm3
+    movdqu    0x40(%rsi), %xmm4
+    movdqu    0x50(%rsi), %xmm5
+    movdqu    0x60(%rsi), %xmm6
+    movdqu    0x70(%rsi), %xmm7
+    movdqa    %xmm0, (%rdi)
+    movdqa    %xmm1, 0x10(%rdi)
+    movdqa    %xmm2, 0x20(%rdi)
+    movdqa    %xmm3, 0x30(%rdi)
+    movdqa    %xmm4, 0x40(%rdi)
+    movdqa    %xmm5, 0x50(%rdi)
+    movdqa    %xmm6, 0x60(%rdi)
+    movdqa    %xmm7, 0x70(%rdi)
+    lea    0x80(%rsi), %rsi
+    lea    0x80(%rdi), %rdi
+    jae    L(gobble_ll_loop_fwd)
+L(gobble_mem_fwd_end):
+    add    $0x80, %rdx
+    add    %rdx, %rsi
+    add    %rdx, %rdi
+    BRANCH_TO_JMPTBL_ENTRY (L(table_144_bytes_fwd), %rdx, 4)
+
+    .p2align 4
+L(gobble_mem_bwd):
+    add    %rdx, %rsi
+    add    %rdx, %rdi
+
+    movdqu    -16(%rsi), %xmm0
+    lea    -16(%rdi), %r8
+    mov    %rdi, %r9
+    and    $-16, %rdi
+    sub    %rdi, %r9
+    sub    %r9, %rsi
+    sub    %r9, %rdx
+
+
+#ifdef SHARED_CACHE_SIZE_HALF
+    mov    $SHARED_CACHE_SIZE_HALF, %RCX_LP
+#else
+    mov    __x86_shared_cache_size_half(%rip), %RCX_LP
+#endif
+#ifdef USE_AS_MEMMOVE
+    mov    %rdi, %r9
+    sub    %rsi, %r9
+    cmp    %rdx, %r9
+    jae    L(memmove_is_memcpy_bwd)
+    cmp    %rcx, %r9
+    jbe    L(ll_cache_copy_bwd_start)
+L(memmove_is_memcpy_bwd):
+#endif
+    cmp    %rcx, %rdx
+    ja    L(bigger)
+    mov    %rdx, %rcx
+L(bigger):
+    sub    %rcx, %rdx
+    cmp    $0x1000, %rdx
+    jbe    L(ll_cache_copy)
+
+    mov    %rcx, %r9
+    shl    $3, %r9
+    cmp    %r9, %rdx
+    jbe    L(2steps_copy)
+    add    %rcx, %rdx
+    xor    %rcx, %rcx
+L(2steps_copy):
+    sub    $0x80, %rdx
+L(gobble_mem_bwd_loop):
+    sub    $0x80, %rdx
+    prefetcht0 -0x200(%rsi)
+    prefetcht0 -0x300(%rsi)
+    movdqu    -0x10(%rsi), %xmm1
+    movdqu    -0x20(%rsi), %xmm2
+    movdqu    -0x30(%rsi), %xmm3
+    movdqu    -0x40(%rsi), %xmm4
+    movdqu    -0x50(%rsi), %xmm5
+    movdqu    -0x60(%rsi), %xmm6
+    movdqu    -0x70(%rsi), %xmm7
+    movdqu    -0x80(%rsi), %xmm8
+    lfence
+    movntdq    %xmm1, -0x10(%rdi)
+    movntdq    %xmm2, -0x20(%rdi)
+    movntdq    %xmm3, -0x30(%rdi)
+    movntdq    %xmm4, -0x40(%rdi)
+    movntdq    %xmm5, -0x50(%rdi)
+    movntdq    %xmm6, -0x60(%rdi)
+    movntdq    %xmm7, -0x70(%rdi)
+    movntdq    %xmm8, -0x80(%rdi)
+    lea    -0x80(%rsi), %rsi
+    lea    -0x80(%rdi), %rdi
+    jae    L(gobble_mem_bwd_loop)
+    sfence
+    cmp    $0x80, %rcx
+    jb    L(gobble_mem_bwd_end)
+    add    $0x80, %rdx
+L(ll_cache_copy):
+    add    %rcx, %rdx
+L(ll_cache_copy_bwd_start):
+    sub    $0x80, %rdx
+L(gobble_ll_loop):
+    prefetchnta -0x1c0(%rsi)
+    prefetchnta -0x280(%rsi)
+    prefetchnta -0x1c0(%rdi)
+    prefetchnta -0x280(%rdi)
+    sub    $0x80, %rdx
+    movdqu    -0x10(%rsi), %xmm1
+    movdqu    -0x20(%rsi), %xmm2
+    movdqu    -0x30(%rsi), %xmm3
+    movdqu    -0x40(%rsi), %xmm4
+    movdqu    -0x50(%rsi), %xmm5
+    movdqu    -0x60(%rsi), %xmm6
+    movdqu    -0x70(%rsi), %xmm7
+    movdqu    -0x80(%rsi), %xmm8
+    movdqa    %xmm1, -0x10(%rdi)
+    movdqa    %xmm2, -0x20(%rdi)
+    movdqa    %xmm3, -0x30(%rdi)
+    movdqa    %xmm4, -0x40(%rdi)
+    movdqa    %xmm5, -0x50(%rdi)
+    movdqa    %xmm6, -0x60(%rdi)
+    movdqa    %xmm7, -0x70(%rdi)
+    movdqa    %xmm8, -0x80(%rdi)
+    lea    -0x80(%rsi), %rsi
+    lea    -0x80(%rdi), %rdi
+    jae    L(gobble_ll_loop)
+L(gobble_mem_bwd_end):
+    movdqu    %xmm0, (%r8)
+    add    $0x80, %rdx
+    sub    %rdx, %rsi
+    sub    %rdx, %rdi
+    BRANCH_TO_JMPTBL_ENTRY (L(table_144_bytes_bwd), %rdx, 4)
+
+    .p2align 4
+L(fwd_write_128bytes):
+    lddqu    -128(%rsi), %xmm0
+    movdqu    %xmm0, -128(%rdi)
+L(fwd_write_112bytes):
+    lddqu    -112(%rsi), %xmm0
+    movdqu    %xmm0, -112(%rdi)
+L(fwd_write_96bytes):
+    lddqu    -96(%rsi), %xmm0
+    movdqu    %xmm0, -96(%rdi)
+L(fwd_write_80bytes):
+    lddqu    -80(%rsi), %xmm0
+    movdqu    %xmm0, -80(%rdi)
+L(fwd_write_64bytes):
+    lddqu    -64(%rsi), %xmm0
+    movdqu    %xmm0, -64(%rdi)
+L(fwd_write_48bytes):
+    lddqu    -48(%rsi), %xmm0
+    movdqu    %xmm0, -48(%rdi)
+L(fwd_write_32bytes):
+    lddqu    -32(%rsi), %xmm0
+    movdqu    %xmm0, -32(%rdi)
+L(fwd_write_16bytes):
+    lddqu    -16(%rsi), %xmm0
+    movdqu    %xmm0, -16(%rdi)
+L(fwd_write_0bytes):
+    ret
+
+
+    .p2align 4
+L(fwd_write_143bytes):
+    lddqu    -143(%rsi), %xmm0
+    movdqu    %xmm0, -143(%rdi)
+L(fwd_write_127bytes):
+    lddqu    -127(%rsi), %xmm0
+    movdqu    %xmm0, -127(%rdi)
+L(fwd_write_111bytes):
+    lddqu    -111(%rsi), %xmm0
+    movdqu    %xmm0, -111(%rdi)
+L(fwd_write_95bytes):
+    lddqu    -95(%rsi), %xmm0
+    movdqu    %xmm0, -95(%rdi)
+L(fwd_write_79bytes):
+    lddqu    -79(%rsi), %xmm0
+    movdqu    %xmm0, -79(%rdi)
+L(fwd_write_63bytes):
+    lddqu    -63(%rsi), %xmm0
+    movdqu    %xmm0, -63(%rdi)
+L(fwd_write_47bytes):
+    lddqu    -47(%rsi), %xmm0
+    movdqu    %xmm0, -47(%rdi)
+L(fwd_write_31bytes):
+    lddqu    -31(%rsi), %xmm0
+    lddqu    -16(%rsi), %xmm1
+    movdqu    %xmm0, -31(%rdi)
+    movdqu    %xmm1, -16(%rdi)
+    ret
+
+    .p2align 4
+L(fwd_write_15bytes):
+    mov    -15(%rsi), %rdx
+    mov    -8(%rsi), %rcx
+    mov    %rdx, -15(%rdi)
+    mov    %rcx, -8(%rdi)
+    ret
+
+    .p2align 4
+L(fwd_write_142bytes):
+    lddqu    -142(%rsi), %xmm0
+    movdqu    %xmm0, -142(%rdi)
+L(fwd_write_126bytes):
+    lddqu    -126(%rsi), %xmm0
+    movdqu    %xmm0, -126(%rdi)
+L(fwd_write_110bytes):
+    lddqu    -110(%rsi), %xmm0
+    movdqu    %xmm0, -110(%rdi)
+L(fwd_write_94bytes):
+    lddqu    -94(%rsi), %xmm0
+    movdqu    %xmm0, -94(%rdi)
+L(fwd_write_78bytes):
+    lddqu    -78(%rsi), %xmm0
+    movdqu    %xmm0, -78(%rdi)
+L(fwd_write_62bytes):
+    lddqu    -62(%rsi), %xmm0
+    movdqu    %xmm0, -62(%rdi)
+L(fwd_write_46bytes):
+    lddqu    -46(%rsi), %xmm0
+    movdqu    %xmm0, -46(%rdi)
+L(fwd_write_30bytes):
+    lddqu    -30(%rsi), %xmm0
+    lddqu    -16(%rsi), %xmm1
+    movdqu    %xmm0, -30(%rdi)
+    movdqu    %xmm1, -16(%rdi)
+    ret
+
+    .p2align 4
+L(fwd_write_14bytes):
+    mov    -14(%rsi), %rdx
+    mov    -8(%rsi), %rcx
+    mov    %rdx, -14(%rdi)
+    mov    %rcx, -8(%rdi)
+    ret
+
+    .p2align 4
+L(fwd_write_141bytes):
+    lddqu    -141(%rsi), %xmm0
+    movdqu    %xmm0, -141(%rdi)
+L(fwd_write_125bytes):
+    lddqu    -125(%rsi), %xmm0
+    movdqu    %xmm0, -125(%rdi)
+L(fwd_write_109bytes):
+    lddqu    -109(%rsi), %xmm0
+    movdqu    %xmm0, -109(%rdi)
+L(fwd_write_93bytes):
+    lddqu    -93(%rsi), %xmm0
+    movdqu    %xmm0, -93(%rdi)
+L(fwd_write_77bytes):
+    lddqu    -77(%rsi), %xmm0
+    movdqu    %xmm0, -77(%rdi)
+L(fwd_write_61bytes):
+    lddqu    -61(%rsi), %xmm0
+    movdqu    %xmm0, -61(%rdi)
+L(fwd_write_45bytes):
+    lddqu    -45(%rsi), %xmm0
+    movdqu    %xmm0, -45(%rdi)
+L(fwd_write_29bytes):
+    lddqu    -29(%rsi), %xmm0
+    lddqu    -16(%rsi), %xmm1
+    movdqu    %xmm0, -29(%rdi)
+    movdqu    %xmm1, -16(%rdi)
+    ret
+
+    .p2align 4
+L(fwd_write_13bytes):
+    mov    -13(%rsi), %rdx
+    mov    -8(%rsi), %rcx
+    mov    %rdx, -13(%rdi)
+    mov    %rcx, -8(%rdi)
+    ret
+
+    .p2align 4
+L(fwd_write_140bytes):
+    lddqu    -140(%rsi), %xmm0
+    movdqu    %xmm0, -140(%rdi)
+L(fwd_write_124bytes):
+    lddqu    -124(%rsi), %xmm0
+    movdqu    %xmm0, -124(%rdi)
+L(fwd_write_108bytes):
+    lddqu    -108(%rsi), %xmm0
+    movdqu    %xmm0, -108(%rdi)
+L(fwd_write_92bytes):
+    lddqu    -92(%rsi), %xmm0
+    movdqu    %xmm0, -92(%rdi)
+L(fwd_write_76bytes):
+    lddqu    -76(%rsi), %xmm0
+    movdqu    %xmm0, -76(%rdi)
+L(fwd_write_60bytes):
+    lddqu    -60(%rsi), %xmm0
+    movdqu    %xmm0, -60(%rdi)
+L(fwd_write_44bytes):
+    lddqu    -44(%rsi), %xmm0
+    movdqu    %xmm0, -44(%rdi)
+L(fwd_write_28bytes):
+    lddqu    -28(%rsi), %xmm0
+    lddqu    -16(%rsi), %xmm1
+    movdqu    %xmm0, -28(%rdi)
+    movdqu    %xmm1, -16(%rdi)
+    ret
+
+    .p2align 4
+L(fwd_write_12bytes):
+    mov    -12(%rsi), %rdx
+    mov    -4(%rsi), %ecx
+    mov    %rdx, -12(%rdi)
+    mov    %ecx, -4(%rdi)
+    ret
+
+    .p2align 4
+L(fwd_write_139bytes):
+    lddqu    -139(%rsi), %xmm0
+    movdqu    %xmm0, -139(%rdi)
+L(fwd_write_123bytes):
+    lddqu    -123(%rsi), %xmm0
+    movdqu    %xmm0, -123(%rdi)
+L(fwd_write_107bytes):
+    lddqu    -107(%rsi), %xmm0
+    movdqu    %xmm0, -107(%rdi)
+L(fwd_write_91bytes):
+    lddqu    -91(%rsi), %xmm0
+    movdqu    %xmm0, -91(%rdi)
+L(fwd_write_75bytes):
+    lddqu    -75(%rsi), %xmm0
+    movdqu    %xmm0, -75(%rdi)
+L(fwd_write_59bytes):
+    lddqu    -59(%rsi), %xmm0
+    movdqu    %xmm0, -59(%rdi)
+L(fwd_write_43bytes):
+    lddqu    -43(%rsi), %xmm0
+    movdqu    %xmm0, -43(%rdi)
+L(fwd_write_27bytes):
+    lddqu    -27(%rsi), %xmm0
+    lddqu    -16(%rsi), %xmm1
+    movdqu    %xmm0, -27(%rdi)
+    movdqu    %xmm1, -16(%rdi)
+    ret
+
+    .p2align 4
+L(fwd_write_11bytes):
+    mov    -11(%rsi), %rdx
+    mov    -4(%rsi), %ecx
+    mov    %rdx, -11(%rdi)
+    mov    %ecx, -4(%rdi)
+    ret
+
+    .p2align 4
+L(fwd_write_138bytes):
+    lddqu    -138(%rsi), %xmm0
+    movdqu    %xmm0, -138(%rdi)
+L(fwd_write_122bytes):
+    lddqu    -122(%rsi), %xmm0
+    movdqu    %xmm0, -122(%rdi)
+L(fwd_write_106bytes):
+    lddqu    -106(%rsi), %xmm0
+    movdqu    %xmm0, -106(%rdi)
+L(fwd_write_90bytes):
+    lddqu    -90(%rsi), %xmm0
+    movdqu    %xmm0, -90(%rdi)
+L(fwd_write_74bytes):
+    lddqu    -74(%rsi), %xmm0
+    movdqu    %xmm0, -74(%rdi)
+L(fwd_write_58bytes):
+    lddqu    -58(%rsi), %xmm0
+    movdqu    %xmm0, -58(%rdi)
+L(fwd_write_42bytes):
+    lddqu    -42(%rsi), %xmm0
+    movdqu    %xmm0, -42(%rdi)
+L(fwd_write_26bytes):
+    lddqu    -26(%rsi), %xmm0
+    lddqu    -16(%rsi), %xmm1
+    movdqu    %xmm0, -26(%rdi)
+    movdqu    %xmm1, -16(%rdi)
+    ret
+
+    .p2align 4
+L(fwd_write_10bytes):
+    mov    -10(%rsi), %rdx
+    mov    -4(%rsi), %ecx
+    mov    %rdx, -10(%rdi)
+    mov    %ecx, -4(%rdi)
+    ret
+
+    .p2align 4
+L(fwd_write_137bytes):
+    lddqu    -137(%rsi), %xmm0
+    movdqu    %xmm0, -137(%rdi)
+L(fwd_write_121bytes):
+    lddqu    -121(%rsi), %xmm0
+    movdqu    %xmm0, -121(%rdi)
+L(fwd_write_105bytes):
+    lddqu    -105(%rsi), %xmm0
+    movdqu    %xmm0, -105(%rdi)
+L(fwd_write_89bytes):
+    lddqu    -89(%rsi), %xmm0
+    movdqu    %xmm0, -89(%rdi)
+L(fwd_write_73bytes):
+    lddqu    -73(%rsi), %xmm0
+    movdqu    %xmm0, -73(%rdi)
+L(fwd_write_57bytes):
+    lddqu    -57(%rsi), %xmm0
+    movdqu    %xmm0, -57(%rdi)
+L(fwd_write_41bytes):
+    lddqu    -41(%rsi), %xmm0
+    movdqu    %xmm0, -41(%rdi)
+L(fwd_write_25bytes):
+    lddqu    -25(%rsi), %xmm0
+    lddqu    -16(%rsi), %xmm1
+    movdqu    %xmm0, -25(%rdi)
+    movdqu    %xmm1, -16(%rdi)
+    ret
+
+    .p2align 4
+L(fwd_write_9bytes):
+    mov    -9(%rsi), %rdx
+    mov    -4(%rsi), %ecx
+    mov    %rdx, -9(%rdi)
+    mov    %ecx, -4(%rdi)
+    ret
+
+    .p2align 4
+L(fwd_write_136bytes):
+    lddqu    -136(%rsi), %xmm0
+    movdqu    %xmm0, -136(%rdi)
+L(fwd_write_120bytes):
+    lddqu    -120(%rsi), %xmm0
+    movdqu    %xmm0, -120(%rdi)
+L(fwd_write_104bytes):
+    lddqu    -104(%rsi), %xmm0
+    movdqu    %xmm0, -104(%rdi)
+L(fwd_write_88bytes):
+    lddqu    -88(%rsi), %xmm0
+    movdqu    %xmm0, -88(%rdi)
+L(fwd_write_72bytes):
+    lddqu    -72(%rsi), %xmm0
+    movdqu    %xmm0, -72(%rdi)
+L(fwd_write_56bytes):
+    lddqu    -56(%rsi), %xmm0
+    movdqu    %xmm0, -56(%rdi)
+L(fwd_write_40bytes):
+    lddqu    -40(%rsi), %xmm0
+    movdqu    %xmm0, -40(%rdi)
+L(fwd_write_24bytes):
+    lddqu    -24(%rsi), %xmm0
+    lddqu    -16(%rsi), %xmm1
+    movdqu    %xmm0, -24(%rdi)
+    movdqu    %xmm1, -16(%rdi)
+    ret
+
+    .p2align 4
+L(fwd_write_8bytes):
+    mov    -8(%rsi), %rdx
+    mov    %rdx, -8(%rdi)
+    ret
+
+    .p2align 4
+L(fwd_write_135bytes):
+    lddqu    -135(%rsi), %xmm0
+    movdqu    %xmm0, -135(%rdi)
+L(fwd_write_119bytes):
+    lddqu    -119(%rsi), %xmm0
+    movdqu    %xmm0, -119(%rdi)
+L(fwd_write_103bytes):
+    lddqu    -103(%rsi), %xmm0
+    movdqu    %xmm0, -103(%rdi)
+L(fwd_write_87bytes):
+    lddqu    -87(%rsi), %xmm0
+    movdqu    %xmm0, -87(%rdi)
+L(fwd_write_71bytes):
+    lddqu    -71(%rsi), %xmm0
+    movdqu    %xmm0, -71(%rdi)
+L(fwd_write_55bytes):
+    lddqu    -55(%rsi), %xmm0
+    movdqu    %xmm0, -55(%rdi)
+L(fwd_write_39bytes):
+    lddqu    -39(%rsi), %xmm0
+    movdqu    %xmm0, -39(%rdi)
+L(fwd_write_23bytes):
+    lddqu    -23(%rsi), %xmm0
+    lddqu    -16(%rsi), %xmm1
+    movdqu    %xmm0, -23(%rdi)
+    movdqu    %xmm1, -16(%rdi)
+    ret
+
+    .p2align 4
+L(fwd_write_7bytes):
+    mov    -7(%rsi), %edx
+    mov    -4(%rsi), %ecx
+    mov    %edx, -7(%rdi)
+    mov    %ecx, -4(%rdi)
+    ret
+
+    .p2align 4
+L(fwd_write_134bytes):
+    lddqu    -134(%rsi), %xmm0
+    movdqu    %xmm0, -134(%rdi)
+L(fwd_write_118bytes):
+    lddqu    -118(%rsi), %xmm0
+    movdqu    %xmm0, -118(%rdi)
+L(fwd_write_102bytes):
+    lddqu    -102(%rsi), %xmm0
+    movdqu    %xmm0, -102(%rdi)
+L(fwd_write_86bytes):
+    lddqu    -86(%rsi), %xmm0
+    movdqu    %xmm0, -86(%rdi)
+L(fwd_write_70bytes):
+    lddqu    -70(%rsi), %xmm0
+    movdqu    %xmm0, -70(%rdi)
+L(fwd_write_54bytes):
+    lddqu    -54(%rsi), %xmm0
+    movdqu    %xmm0, -54(%rdi)
+L(fwd_write_38bytes):
+    lddqu    -38(%rsi), %xmm0
+    movdqu    %xmm0, -38(%rdi)
+L(fwd_write_22bytes):
+    lddqu    -22(%rsi), %xmm0
+    lddqu    -16(%rsi), %xmm1
+    movdqu    %xmm0, -22(%rdi)
+    movdqu    %xmm1, -16(%rdi)
+    ret
+
+    .p2align 4
+L(fwd_write_6bytes):
+    mov    -6(%rsi), %edx
+    mov    -4(%rsi), %ecx
+    mov    %edx, -6(%rdi)
+    mov    %ecx, -4(%rdi)
+    ret
+
+    .p2align 4
+L(fwd_write_133bytes):
+    lddqu    -133(%rsi), %xmm0
+    movdqu    %xmm0, -133(%rdi)
+L(fwd_write_117bytes):
+    lddqu    -117(%rsi), %xmm0
+    movdqu    %xmm0, -117(%rdi)
+L(fwd_write_101bytes):
+    lddqu    -101(%rsi), %xmm0
+    movdqu    %xmm0, -101(%rdi)
+L(fwd_write_85bytes):
+    lddqu    -85(%rsi), %xmm0
+    movdqu    %xmm0, -85(%rdi)
+L(fwd_write_69bytes):
+    lddqu    -69(%rsi), %xmm0
+    movdqu    %xmm0, -69(%rdi)
+L(fwd_write_53bytes):
+    lddqu    -53(%rsi), %xmm0
+    movdqu    %xmm0, -53(%rdi)
+L(fwd_write_37bytes):
+    lddqu    -37(%rsi), %xmm0
+    movdqu    %xmm0, -37(%rdi)
+L(fwd_write_21bytes):
+    lddqu    -21(%rsi), %xmm0
+    lddqu    -16(%rsi), %xmm1
+    movdqu    %xmm0, -21(%rdi)
+    movdqu    %xmm1, -16(%rdi)
+    ret
+
+    .p2align 4
+L(fwd_write_5bytes):
+    mov    -5(%rsi), %edx
+    mov    -4(%rsi), %ecx
+    mov    %edx, -5(%rdi)
+    mov    %ecx, -4(%rdi)
+    ret
+
+    .p2align 4
+L(fwd_write_132bytes):
+    lddqu    -132(%rsi), %xmm0
+    movdqu    %xmm0, -132(%rdi)
+L(fwd_write_116bytes):
+    lddqu    -116(%rsi), %xmm0
+    movdqu    %xmm0, -116(%rdi)
+L(fwd_write_100bytes):
+    lddqu    -100(%rsi), %xmm0
+    movdqu    %xmm0, -100(%rdi)
+L(fwd_write_84bytes):
+    lddqu    -84(%rsi), %xmm0
+    movdqu    %xmm0, -84(%rdi)
+L(fwd_write_68bytes):
+    lddqu    -68(%rsi), %xmm0
+    movdqu    %xmm0, -68(%rdi)
+L(fwd_write_52bytes):
+    lddqu    -52(%rsi), %xmm0
+    movdqu    %xmm0, -52(%rdi)
+L(fwd_write_36bytes):
+    lddqu    -36(%rsi), %xmm0
+    movdqu    %xmm0, -36(%rdi)
+L(fwd_write_20bytes):
+    lddqu    -20(%rsi), %xmm0
+    lddqu    -16(%rsi), %xmm1
+    movdqu    %xmm0, -20(%rdi)
+    movdqu    %xmm1, -16(%rdi)
+    ret
+
+    .p2align 4
+L(fwd_write_4bytes):
+    mov    -4(%rsi), %edx
+    mov    %edx, -4(%rdi)
+    ret
+
+    .p2align 4
+L(fwd_write_131bytes):
+    lddqu    -131(%rsi), %xmm0
+    movdqu    %xmm0, -131(%rdi)
+L(fwd_write_115bytes):
+    lddqu    -115(%rsi), %xmm0
+    movdqu    %xmm0, -115(%rdi)
+L(fwd_write_99bytes):
+    lddqu    -99(%rsi), %xmm0
+    movdqu    %xmm0, -99(%rdi)
+L(fwd_write_83bytes):
+    lddqu    -83(%rsi), %xmm0
+    movdqu    %xmm0, -83(%rdi)
+L(fwd_write_67bytes):
+    lddqu    -67(%rsi), %xmm0
+    movdqu    %xmm0, -67(%rdi)
+L(fwd_write_51bytes):
+    lddqu    -51(%rsi), %xmm0
+    movdqu    %xmm0, -51(%rdi)
+L(fwd_write_35bytes):
+    lddqu    -35(%rsi), %xmm0
+    movdqu    %xmm0, -35(%rdi)
+L(fwd_write_19bytes):
+    lddqu    -19(%rsi), %xmm0
+    lddqu    -16(%rsi), %xmm1
+    movdqu    %xmm0, -19(%rdi)
+    movdqu    %xmm1, -16(%rdi)
+    ret
+
+    .p2align 4
+L(fwd_write_3bytes):
+    mov    -3(%rsi), %dx
+    mov    -2(%rsi), %cx
+    mov    %dx, -3(%rdi)
+    mov    %cx, -2(%rdi)
+    ret
+
+    .p2align 4
+L(fwd_write_130bytes):
+    lddqu    -130(%rsi), %xmm0
+    movdqu    %xmm0, -130(%rdi)
+L(fwd_write_114bytes):
+    lddqu    -114(%rsi), %xmm0
+    movdqu    %xmm0, -114(%rdi)
+L(fwd_write_98bytes):
+    lddqu    -98(%rsi), %xmm0
+    movdqu    %xmm0, -98(%rdi)
+L(fwd_write_82bytes):
+    lddqu    -82(%rsi), %xmm0
+    movdqu    %xmm0, -82(%rdi)
+L(fwd_write_66bytes):
+    lddqu    -66(%rsi), %xmm0
+    movdqu    %xmm0, -66(%rdi)
+L(fwd_write_50bytes):
+    lddqu    -50(%rsi), %xmm0
+    movdqu    %xmm0, -50(%rdi)
+L(fwd_write_34bytes):
+    lddqu    -34(%rsi), %xmm0
+    movdqu    %xmm0, -34(%rdi)
+L(fwd_write_18bytes):
+    lddqu    -18(%rsi), %xmm0
+    lddqu    -16(%rsi), %xmm1
+    movdqu    %xmm0, -18(%rdi)
+    movdqu    %xmm1, -16(%rdi)
+    ret
+
+    .p2align 4
+L(fwd_write_2bytes):
+    movzwl    -2(%rsi), %edx
+    mov    %dx, -2(%rdi)
+    ret
+
+    .p2align 4
+L(fwd_write_129bytes):
+    lddqu    -129(%rsi), %xmm0
+    movdqu    %xmm0, -129(%rdi)
+L(fwd_write_113bytes):
+    lddqu    -113(%rsi), %xmm0
+    movdqu    %xmm0, -113(%rdi)
+L(fwd_write_97bytes):
+    lddqu    -97(%rsi), %xmm0
+    movdqu    %xmm0, -97(%rdi)
+L(fwd_write_81bytes):
+    lddqu    -81(%rsi), %xmm0
+    movdqu    %xmm0, -81(%rdi)
+L(fwd_write_65bytes):
+    lddqu    -65(%rsi), %xmm0
+    movdqu    %xmm0, -65(%rdi)
+L(fwd_write_49bytes):
+    lddqu    -49(%rsi), %xmm0
+    movdqu    %xmm0, -49(%rdi)
+L(fwd_write_33bytes):
+    lddqu    -33(%rsi), %xmm0
+    movdqu    %xmm0, -33(%rdi)
+L(fwd_write_17bytes):
+    lddqu    -17(%rsi), %xmm0
+    lddqu    -16(%rsi), %xmm1
+    movdqu    %xmm0, -17(%rdi)
+    movdqu    %xmm1, -16(%rdi)
+    ret
+
+    .p2align 4
+L(fwd_write_1bytes):
+    movzbl    -1(%rsi), %edx
+    mov    %dl, -1(%rdi)
+    ret
+
+    .p2align 4
+L(bwd_write_128bytes):
+    lddqu    112(%rsi), %xmm0
+    movdqu    %xmm0, 112(%rdi)
+L(bwd_write_112bytes):
+    lddqu    96(%rsi), %xmm0
+    movdqu    %xmm0, 96(%rdi)
+L(bwd_write_96bytes):
+    lddqu    80(%rsi), %xmm0
+    movdqu    %xmm0, 80(%rdi)
+L(bwd_write_80bytes):
+    lddqu    64(%rsi), %xmm0
+    movdqu    %xmm0, 64(%rdi)
+L(bwd_write_64bytes):
+    lddqu    48(%rsi), %xmm0
+    movdqu    %xmm0, 48(%rdi)
+L(bwd_write_48bytes):
+    lddqu    32(%rsi), %xmm0
+    movdqu    %xmm0, 32(%rdi)
+L(bwd_write_32bytes):
+    lddqu    16(%rsi), %xmm0
+    movdqu    %xmm0, 16(%rdi)
+L(bwd_write_16bytes):
+    lddqu    (%rsi), %xmm0
+    movdqu    %xmm0, (%rdi)
+L(bwd_write_0bytes):
+    ret
+
+    .p2align 4
+L(bwd_write_143bytes):
+    lddqu    127(%rsi), %xmm0
+    movdqu    %xmm0, 127(%rdi)
+L(bwd_write_127bytes):
+    lddqu    111(%rsi), %xmm0
+    movdqu    %xmm0, 111(%rdi)
+L(bwd_write_111bytes):
+    lddqu    95(%rsi), %xmm0
+    movdqu    %xmm0, 95(%rdi)
+L(bwd_write_95bytes):
+    lddqu    79(%rsi), %xmm0
+    movdqu    %xmm0, 79(%rdi)
+L(bwd_write_79bytes):
+    lddqu    63(%rsi), %xmm0
+    movdqu    %xmm0, 63(%rdi)
+L(bwd_write_63bytes):
+    lddqu    47(%rsi), %xmm0
+    movdqu    %xmm0, 47(%rdi)
+L(bwd_write_47bytes):
+    lddqu    31(%rsi), %xmm0
+    movdqu    %xmm0, 31(%rdi)
+L(bwd_write_31bytes):
+    lddqu    15(%rsi), %xmm0
+    lddqu    (%rsi), %xmm1
+    movdqu    %xmm0, 15(%rdi)
+    movdqu    %xmm1, (%rdi)
+    ret
+
+
+    .p2align 4
+L(bwd_write_15bytes):
+    mov    7(%rsi), %rdx
+    mov    (%rsi), %rcx
+    mov    %rdx, 7(%rdi)
+    mov    %rcx, (%rdi)
+    ret
+
+    .p2align 4
+L(bwd_write_142bytes):
+    lddqu    126(%rsi), %xmm0
+    movdqu    %xmm0, 126(%rdi)
+L(bwd_write_126bytes):
+    lddqu    110(%rsi), %xmm0
+    movdqu    %xmm0, 110(%rdi)
+L(bwd_write_110bytes):
+    lddqu    94(%rsi), %xmm0
+    movdqu    %xmm0, 94(%rdi)
+L(bwd_write_94bytes):
+    lddqu    78(%rsi), %xmm0
+    movdqu    %xmm0, 78(%rdi)
+L(bwd_write_78bytes):
+    lddqu    62(%rsi), %xmm0
+    movdqu    %xmm0, 62(%rdi)
+L(bwd_write_62bytes):
+    lddqu    46(%rsi), %xmm0
+    movdqu    %xmm0, 46(%rdi)
+L(bwd_write_46bytes):
+    lddqu    30(%rsi), %xmm0
+    movdqu    %xmm0, 30(%rdi)
+L(bwd_write_30bytes):
+    lddqu    14(%rsi), %xmm0
+    lddqu    (%rsi), %xmm1
+    movdqu    %xmm0, 14(%rdi)
+    movdqu    %xmm1, (%rdi)
+    ret
+
+    .p2align 4
+L(bwd_write_14bytes):
+    mov    6(%rsi), %rdx
+    mov    (%rsi), %rcx
+    mov    %rdx, 6(%rdi)
+    mov    %rcx, (%rdi)
+    ret
+
+    .p2align 4
+L(bwd_write_141bytes):
+    lddqu    125(%rsi), %xmm0
+    movdqu    %xmm0, 125(%rdi)
+L(bwd_write_125bytes):
+    lddqu    109(%rsi), %xmm0
+    movdqu    %xmm0, 109(%rdi)
+L(bwd_write_109bytes):
+    lddqu    93(%rsi), %xmm0
+    movdqu    %xmm0, 93(%rdi)
+L(bwd_write_93bytes):
+    lddqu    77(%rsi), %xmm0
+    movdqu    %xmm0, 77(%rdi)
+L(bwd_write_77bytes):
+    lddqu    61(%rsi), %xmm0
+    movdqu    %xmm0, 61(%rdi)
+L(bwd_write_61bytes):
+    lddqu    45(%rsi), %xmm0
+    movdqu    %xmm0, 45(%rdi)
+L(bwd_write_45bytes):
+    lddqu    29(%rsi), %xmm0
+    movdqu    %xmm0, 29(%rdi)
+L(bwd_write_29bytes):
+    lddqu    13(%rsi), %xmm0
+    lddqu    (%rsi), %xmm1
+    movdqu    %xmm0, 13(%rdi)
+    movdqu    %xmm1, (%rdi)
+    ret
+
+    .p2align 4
+L(bwd_write_13bytes):
+    mov    5(%rsi), %rdx
+    mov    (%rsi), %rcx
+    mov    %rdx, 5(%rdi)
+    mov    %rcx, (%rdi)
+    ret
+
+    .p2align 4
+L(bwd_write_140bytes):
+    lddqu    124(%rsi), %xmm0
+    movdqu    %xmm0, 124(%rdi)
+L(bwd_write_124bytes):
+    lddqu    108(%rsi), %xmm0
+    movdqu    %xmm0, 108(%rdi)
+L(bwd_write_108bytes):
+    lddqu    92(%rsi), %xmm0
+    movdqu    %xmm0, 92(%rdi)
+L(bwd_write_92bytes):
+    lddqu    76(%rsi), %xmm0
+    movdqu    %xmm0, 76(%rdi)
+L(bwd_write_76bytes):
+    lddqu    60(%rsi), %xmm0
+    movdqu    %xmm0, 60(%rdi)
+L(bwd_write_60bytes):
+    lddqu    44(%rsi), %xmm0
+    movdqu    %xmm0, 44(%rdi)
+L(bwd_write_44bytes):
+    lddqu    28(%rsi), %xmm0
+    movdqu    %xmm0, 28(%rdi)
+L(bwd_write_28bytes):
+    lddqu    12(%rsi), %xmm0
+    lddqu    (%rsi), %xmm1
+    movdqu    %xmm0, 12(%rdi)
+    movdqu    %xmm1, (%rdi)
+    ret
+
+    .p2align 4
+L(bwd_write_12bytes):
+    mov    4(%rsi), %rdx
+    mov    (%rsi), %rcx
+    mov    %rdx, 4(%rdi)
+    mov    %rcx, (%rdi)
+    ret
+
+    .p2align 4
+L(bwd_write_139bytes):
+    lddqu    123(%rsi), %xmm0
+    movdqu    %xmm0, 123(%rdi)
+L(bwd_write_123bytes):
+    lddqu    107(%rsi), %xmm0
+    movdqu    %xmm0, 107(%rdi)
+L(bwd_write_107bytes):
+    lddqu    91(%rsi), %xmm0
+    movdqu    %xmm0, 91(%rdi)
+L(bwd_write_91bytes):
+    lddqu    75(%rsi), %xmm0
+    movdqu    %xmm0, 75(%rdi)
+L(bwd_write_75bytes):
+    lddqu    59(%rsi), %xmm0
+    movdqu    %xmm0, 59(%rdi)
+L(bwd_write_59bytes):
+    lddqu    43(%rsi), %xmm0
+    movdqu    %xmm0, 43(%rdi)
+L(bwd_write_43bytes):
+    lddqu    27(%rsi), %xmm0
+    movdqu    %xmm0, 27(%rdi)
+L(bwd_write_27bytes):
+    lddqu    11(%rsi), %xmm0
+    lddqu    (%rsi), %xmm1
+    movdqu    %xmm0, 11(%rdi)
+    movdqu    %xmm1, (%rdi)
+    ret
+
+    .p2align 4
+L(bwd_write_11bytes):
+    mov    3(%rsi), %rdx
+    mov    (%rsi), %rcx
+    mov    %rdx, 3(%rdi)
+    mov    %rcx, (%rdi)
+    ret
+
+    .p2align 4
+L(bwd_write_138bytes):
+    lddqu    122(%rsi), %xmm0
+    movdqu    %xmm0, 122(%rdi)
+L(bwd_write_122bytes):
+    lddqu    106(%rsi), %xmm0
+    movdqu    %xmm0, 106(%rdi)
+L(bwd_write_106bytes):
+    lddqu    90(%rsi), %xmm0
+    movdqu    %xmm0, 90(%rdi)
+L(bwd_write_90bytes):
+    lddqu    74(%rsi), %xmm0
+    movdqu    %xmm0, 74(%rdi)
+L(bwd_write_74bytes):
+    lddqu    58(%rsi), %xmm0
+    movdqu    %xmm0, 58(%rdi)
+L(bwd_write_58bytes):
+    lddqu    42(%rsi), %xmm0
+    movdqu    %xmm0, 42(%rdi)
+L(bwd_write_42bytes):
+    lddqu    26(%rsi), %xmm0
+    movdqu    %xmm0, 26(%rdi)
+L(bwd_write_26bytes):
+    lddqu    10(%rsi), %xmm0
+    lddqu    (%rsi), %xmm1
+    movdqu    %xmm0, 10(%rdi)
+    movdqu    %xmm1, (%rdi)
+    ret
+
+    .p2align 4
+L(bwd_write_10bytes):
+    mov    2(%rsi), %rdx
+    mov    (%rsi), %rcx
+    mov    %rdx, 2(%rdi)
+    mov    %rcx, (%rdi)
+    ret
+
+    .p2align 4
+L(bwd_write_137bytes):
+    lddqu    121(%rsi), %xmm0
+    movdqu    %xmm0, 121(%rdi)
+L(bwd_write_121bytes):
+    lddqu    105(%rsi), %xmm0
+    movdqu    %xmm0, 105(%rdi)
+L(bwd_write_105bytes):
+    lddqu    89(%rsi), %xmm0
+    movdqu    %xmm0, 89(%rdi)
+L(bwd_write_89bytes):
+    lddqu    73(%rsi), %xmm0
+    movdqu    %xmm0, 73(%rdi)
+L(bwd_write_73bytes):
+    lddqu    57(%rsi), %xmm0
+    movdqu    %xmm0, 57(%rdi)
+L(bwd_write_57bytes):
+    lddqu    41(%rsi), %xmm0
+    movdqu    %xmm0, 41(%rdi)
+L(bwd_write_41bytes):
+    lddqu    25(%rsi), %xmm0
+    movdqu    %xmm0, 25(%rdi)
+L(bwd_write_25bytes):
+    lddqu    9(%rsi), %xmm0
+    lddqu    (%rsi), %xmm1
+    movdqu    %xmm0, 9(%rdi)
+    movdqu    %xmm1, (%rdi)
+    ret
+
+    .p2align 4
+L(bwd_write_9bytes):
+    mov    1(%rsi), %rdx
+    mov    (%rsi), %rcx
+    mov    %rdx, 1(%rdi)
+    mov    %rcx, (%rdi)
+    ret
+
+    .p2align 4
+L(bwd_write_136bytes):
+    lddqu    120(%rsi), %xmm0
+    movdqu    %xmm0, 120(%rdi)
+L(bwd_write_120bytes):
+    lddqu    104(%rsi), %xmm0
+    movdqu    %xmm0, 104(%rdi)
+L(bwd_write_104bytes):
+    lddqu    88(%rsi), %xmm0
+    movdqu    %xmm0, 88(%rdi)
+L(bwd_write_88bytes):
+    lddqu    72(%rsi), %xmm0
+    movdqu    %xmm0, 72(%rdi)
+L(bwd_write_72bytes):
+    lddqu    56(%rsi), %xmm0
+    movdqu    %xmm0, 56(%rdi)
+L(bwd_write_56bytes):
+    lddqu    40(%rsi), %xmm0
+    movdqu    %xmm0, 40(%rdi)
+L(bwd_write_40bytes):
+    lddqu    24(%rsi), %xmm0
+    movdqu    %xmm0, 24(%rdi)
+L(bwd_write_24bytes):
+    lddqu    8(%rsi), %xmm0
+    lddqu    (%rsi), %xmm1
+    movdqu    %xmm0, 8(%rdi)
+    movdqu    %xmm1, (%rdi)
+    ret
+
+    .p2align 4
+L(bwd_write_8bytes):
+    mov    (%rsi), %rdx
+    mov    %rdx, (%rdi)
+    ret
+
+    .p2align 4
+L(bwd_write_135bytes):
+    lddqu    119(%rsi), %xmm0
+    movdqu    %xmm0, 119(%rdi)
+L(bwd_write_119bytes):
+    lddqu    103(%rsi), %xmm0
+    movdqu    %xmm0, 103(%rdi)
+L(bwd_write_103bytes):
+    lddqu    87(%rsi), %xmm0
+    movdqu    %xmm0, 87(%rdi)
+L(bwd_write_87bytes):
+    lddqu    71(%rsi), %xmm0
+    movdqu    %xmm0, 71(%rdi)
+L(bwd_write_71bytes):
+    lddqu    55(%rsi), %xmm0
+    movdqu    %xmm0, 55(%rdi)
+L(bwd_write_55bytes):
+    lddqu    39(%rsi), %xmm0
+    movdqu    %xmm0, 39(%rdi)
+L(bwd_write_39bytes):
+    lddqu    23(%rsi), %xmm0
+    movdqu    %xmm0, 23(%rdi)
+L(bwd_write_23bytes):
+    lddqu    7(%rsi), %xmm0
+    lddqu    (%rsi), %xmm1
+    movdqu    %xmm0, 7(%rdi)
+    movdqu    %xmm1, (%rdi)
+    ret
+
+    .p2align 4
+L(bwd_write_7bytes):
+    mov    3(%rsi), %edx
+    mov    (%rsi), %ecx
+    mov    %edx, 3(%rdi)
+    mov    %ecx, (%rdi)
+    ret
+
+    .p2align 4
+L(bwd_write_134bytes):
+    lddqu    118(%rsi), %xmm0
+    movdqu    %xmm0, 118(%rdi)
+L(bwd_write_118bytes):
+    lddqu    102(%rsi), %xmm0
+    movdqu    %xmm0, 102(%rdi)
+L(bwd_write_102bytes):
+    lddqu    86(%rsi), %xmm0
+    movdqu    %xmm0, 86(%rdi)
+L(bwd_write_86bytes):
+    lddqu    70(%rsi), %xmm0
+    movdqu    %xmm0, 70(%rdi)
+L(bwd_write_70bytes):
+    lddqu    54(%rsi), %xmm0
+    movdqu    %xmm0, 54(%rdi)
+L(bwd_write_54bytes):
+    lddqu    38(%rsi), %xmm0
+    movdqu    %xmm0, 38(%rdi)
+L(bwd_write_38bytes):
+    lddqu    22(%rsi), %xmm0
+    movdqu    %xmm0, 22(%rdi)
+L(bwd_write_22bytes):
+    lddqu    6(%rsi), %xmm0
+    lddqu    (%rsi), %xmm1
+    movdqu    %xmm0, 6(%rdi)
+    movdqu    %xmm1, (%rdi)
+    ret
+
+    .p2align 4
+L(bwd_write_6bytes):
+    mov    2(%rsi), %edx
+    mov    (%rsi), %ecx
+    mov    %edx, 2(%rdi)
+    mov    %ecx, (%rdi)
+    ret
+
+    .p2align 4
+L(bwd_write_133bytes):
+    lddqu    117(%rsi), %xmm0
+    movdqu    %xmm0, 117(%rdi)
+L(bwd_write_117bytes):
+    lddqu    101(%rsi), %xmm0
+    movdqu    %xmm0, 101(%rdi)
+L(bwd_write_101bytes):
+    lddqu    85(%rsi), %xmm0
+    movdqu    %xmm0, 85(%rdi)
+L(bwd_write_85bytes):
+    lddqu    69(%rsi), %xmm0
+    movdqu    %xmm0, 69(%rdi)
+L(bwd_write_69bytes):
+    lddqu    53(%rsi), %xmm0
+    movdqu    %xmm0, 53(%rdi)
+L(bwd_write_53bytes):
+    lddqu    37(%rsi), %xmm0
+    movdqu    %xmm0, 37(%rdi)
+L(bwd_write_37bytes):
+    lddqu    21(%rsi), %xmm0
+    movdqu    %xmm0, 21(%rdi)
+L(bwd_write_21bytes):
+    lddqu    5(%rsi), %xmm0
+    lddqu    (%rsi), %xmm1
+    movdqu    %xmm0, 5(%rdi)
+    movdqu    %xmm1, (%rdi)
+    ret
+
+    .p2align 4
+L(bwd_write_5bytes):
+    mov    1(%rsi), %edx
+    mov    (%rsi), %ecx
+    mov    %edx, 1(%rdi)
+    mov    %ecx, (%rdi)
+    ret
+
+    .p2align 4
+L(bwd_write_132bytes):
+    lddqu    116(%rsi), %xmm0
+    movdqu    %xmm0, 116(%rdi)
+L(bwd_write_116bytes):
+    lddqu    100(%rsi), %xmm0
+    movdqu    %xmm0, 100(%rdi)
+L(bwd_write_100bytes):
+    lddqu    84(%rsi), %xmm0
+    movdqu    %xmm0, 84(%rdi)
+L(bwd_write_84bytes):
+    lddqu    68(%rsi), %xmm0
+    movdqu    %xmm0, 68(%rdi)
+L(bwd_write_68bytes):
+    lddqu    52(%rsi), %xmm0
+    movdqu    %xmm0, 52(%rdi)
+L(bwd_write_52bytes):
+    lddqu    36(%rsi), %xmm0
+    movdqu    %xmm0, 36(%rdi)
+L(bwd_write_36bytes):
+    lddqu    20(%rsi), %xmm0
+    movdqu    %xmm0, 20(%rdi)
+L(bwd_write_20bytes):
+    lddqu    4(%rsi), %xmm0
+    lddqu    (%rsi), %xmm1
+    movdqu    %xmm0, 4(%rdi)
+    movdqu    %xmm1, (%rdi)
+    ret
+
+    .p2align 4
+L(bwd_write_4bytes):
+    mov    (%rsi), %edx
+    mov    %edx, (%rdi)
+    ret
+
+    .p2align 4
+L(bwd_write_131bytes):
+    lddqu    115(%rsi), %xmm0
+    movdqu    %xmm0, 115(%rdi)
+L(bwd_write_115bytes):
+    lddqu    99(%rsi), %xmm0
+    movdqu    %xmm0, 99(%rdi)
+L(bwd_write_99bytes):
+    lddqu    83(%rsi), %xmm0
+    movdqu    %xmm0, 83(%rdi)
+L(bwd_write_83bytes):
+    lddqu    67(%rsi), %xmm0
+    movdqu    %xmm0, 67(%rdi)
+L(bwd_write_67bytes):
+    lddqu    51(%rsi), %xmm0
+    movdqu    %xmm0, 51(%rdi)
+L(bwd_write_51bytes):
+    lddqu    35(%rsi), %xmm0
+    movdqu    %xmm0, 35(%rdi)
+L(bwd_write_35bytes):
+    lddqu    19(%rsi), %xmm0
+    movdqu    %xmm0, 19(%rdi)
+L(bwd_write_19bytes):
+    lddqu    3(%rsi), %xmm0
+    lddqu    (%rsi), %xmm1
+    movdqu    %xmm0, 3(%rdi)
+    movdqu    %xmm1, (%rdi)
+    ret
+
+    .p2align 4
+L(bwd_write_3bytes):
+    mov    1(%rsi), %dx
+    mov    (%rsi), %cx
+    mov    %dx, 1(%rdi)
+    mov    %cx, (%rdi)
+    ret
+
+    .p2align 4
+L(bwd_write_130bytes):
+    lddqu    114(%rsi), %xmm0
+    movdqu    %xmm0, 114(%rdi)
+L(bwd_write_114bytes):
+    lddqu    98(%rsi), %xmm0
+    movdqu    %xmm0, 98(%rdi)
+L(bwd_write_98bytes):
+    lddqu    82(%rsi), %xmm0
+    movdqu    %xmm0, 82(%rdi)
+L(bwd_write_82bytes):
+    lddqu    66(%rsi), %xmm0
+    movdqu    %xmm0, 66(%rdi)
+L(bwd_write_66bytes):
+    lddqu    50(%rsi), %xmm0
+    movdqu    %xmm0, 50(%rdi)
+L(bwd_write_50bytes):
+    lddqu    34(%rsi), %xmm0
+    movdqu    %xmm0, 34(%rdi)
+L(bwd_write_34bytes):
+    lddqu    18(%rsi), %xmm0
+    movdqu    %xmm0, 18(%rdi)
+L(bwd_write_18bytes):
+    lddqu    2(%rsi), %xmm0
+    lddqu    (%rsi), %xmm1
+    movdqu    %xmm0, 2(%rdi)
+    movdqu    %xmm1, (%rdi)
+    ret
+
+    .p2align 4
+L(bwd_write_2bytes):
+    movzwl    (%rsi), %edx
+    mov    %dx, (%rdi)
+    ret
+
+    .p2align 4
+L(bwd_write_129bytes):
+    lddqu    113(%rsi), %xmm0
+    movdqu    %xmm0, 113(%rdi)
+L(bwd_write_113bytes):
+    lddqu    97(%rsi), %xmm0
+    movdqu    %xmm0, 97(%rdi)
+L(bwd_write_97bytes):
+    lddqu    81(%rsi), %xmm0
+    movdqu    %xmm0, 81(%rdi)
+L(bwd_write_81bytes):
+    lddqu    65(%rsi), %xmm0
+    movdqu    %xmm0, 65(%rdi)
+L(bwd_write_65bytes):
+    lddqu    49(%rsi), %xmm0
+    movdqu    %xmm0, 49(%rdi)
+L(bwd_write_49bytes):
+    lddqu    33(%rsi), %xmm0
+    movdqu    %xmm0, 33(%rdi)
+L(bwd_write_33bytes):
+    lddqu    17(%rsi), %xmm0
+    movdqu    %xmm0, 17(%rdi)
+L(bwd_write_17bytes):
+    lddqu    1(%rsi), %xmm0
+    lddqu    (%rsi), %xmm1
+    movdqu    %xmm0, 1(%rdi)
+    movdqu    %xmm1, (%rdi)
+    ret
+
+    .p2align 4
+L(bwd_write_1bytes):
+    movzbl    (%rsi), %edx
+    mov    %dl, (%rdi)
+    ret
+
+END (MEMCPY)
+
+    .section .rodata.ssse3,"a",@progbits
+    .p2align 3
+L(table_144_bytes_bwd):
+    .int    JMPTBL (L(bwd_write_0bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_1bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_2bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_3bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_4bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_5bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_6bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_7bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_8bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_9bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_10bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_11bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_12bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_13bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_14bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_15bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_16bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_17bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_18bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_19bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_20bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_21bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_22bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_23bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_24bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_25bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_26bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_27bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_28bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_29bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_30bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_31bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_32bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_33bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_34bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_35bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_36bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_37bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_38bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_39bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_40bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_41bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_42bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_43bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_44bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_45bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_46bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_47bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_48bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_49bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_50bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_51bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_52bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_53bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_54bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_55bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_56bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_57bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_58bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_59bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_60bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_61bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_62bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_63bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_64bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_65bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_66bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_67bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_68bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_69bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_70bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_71bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_72bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_73bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_74bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_75bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_76bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_77bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_78bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_79bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_80bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_81bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_82bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_83bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_84bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_85bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_86bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_87bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_88bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_89bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_90bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_91bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_92bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_93bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_94bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_95bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_96bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_97bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_98bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_99bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_100bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_101bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_102bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_103bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_104bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_105bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_106bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_107bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_108bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_109bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_110bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_111bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_112bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_113bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_114bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_115bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_116bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_117bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_118bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_119bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_120bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_121bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_122bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_123bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_124bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_125bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_126bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_127bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_128bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_129bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_130bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_131bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_132bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_133bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_134bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_135bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_136bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_137bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_138bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_139bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_140bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_141bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_142bytes), L(table_144_bytes_bwd))
+    .int    JMPTBL (L(bwd_write_143bytes), L(table_144_bytes_bwd))
+
+    .p2align 3
+L(table_144_bytes_fwd):
+    .int    JMPTBL (L(fwd_write_0bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_1bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_2bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_3bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_4bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_5bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_6bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_7bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_8bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_9bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_10bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_11bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_12bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_13bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_14bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_15bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_16bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_17bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_18bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_19bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_20bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_21bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_22bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_23bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_24bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_25bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_26bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_27bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_28bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_29bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_30bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_31bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_32bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_33bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_34bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_35bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_36bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_37bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_38bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_39bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_40bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_41bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_42bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_43bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_44bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_45bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_46bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_47bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_48bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_49bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_50bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_51bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_52bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_53bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_54bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_55bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_56bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_57bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_58bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_59bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_60bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_61bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_62bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_63bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_64bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_65bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_66bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_67bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_68bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_69bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_70bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_71bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_72bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_73bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_74bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_75bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_76bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_77bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_78bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_79bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_80bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_81bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_82bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_83bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_84bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_85bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_86bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_87bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_88bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_89bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_90bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_91bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_92bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_93bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_94bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_95bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_96bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_97bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_98bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_99bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_100bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_101bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_102bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_103bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_104bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_105bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_106bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_107bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_108bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_109bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_110bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_111bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_112bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_113bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_114bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_115bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_116bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_117bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_118bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_119bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_120bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_121bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_122bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_123bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_124bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_125bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_126bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_127bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_128bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_129bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_130bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_131bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_132bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_133bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_134bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_135bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_136bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_137bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_138bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_139bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_140bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_141bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_142bytes), L(table_144_bytes_fwd))
+    .int    JMPTBL (L(fwd_write_143bytes), L(table_144_bytes_fwd))
+
+    .p2align 3
+L(shl_table_fwd):
+    .int    JMPTBL (L(shl_0), L(shl_table_fwd))
+    .int    JMPTBL (L(shl_1), L(shl_table_fwd))
+    .int    JMPTBL (L(shl_2), L(shl_table_fwd))
+    .int    JMPTBL (L(shl_3), L(shl_table_fwd))
+    .int    JMPTBL (L(shl_4), L(shl_table_fwd))
+    .int    JMPTBL (L(shl_5), L(shl_table_fwd))
+    .int    JMPTBL (L(shl_6), L(shl_table_fwd))
+    .int    JMPTBL (L(shl_7), L(shl_table_fwd))
+    .int    JMPTBL (L(shl_8), L(shl_table_fwd))
+    .int    JMPTBL (L(shl_9), L(shl_table_fwd))
+    .int    JMPTBL (L(shl_10), L(shl_table_fwd))
+    .int    JMPTBL (L(shl_11), L(shl_table_fwd))
+    .int    JMPTBL (L(shl_12), L(shl_table_fwd))
+    .int    JMPTBL (L(shl_13), L(shl_table_fwd))
+    .int    JMPTBL (L(shl_14), L(shl_table_fwd))
+    .int    JMPTBL (L(shl_15), L(shl_table_fwd))
+
+    .p2align 3
+L(shl_table_bwd):
+    .int    JMPTBL (L(shl_0_bwd), L(shl_table_bwd))
+    .int    JMPTBL (L(shl_1_bwd), L(shl_table_bwd))
+    .int    JMPTBL (L(shl_2_bwd), L(shl_table_bwd))
+    .int    JMPTBL (L(shl_3_bwd), L(shl_table_bwd))
+    .int    JMPTBL (L(shl_4_bwd), L(shl_table_bwd))
+    .int    JMPTBL (L(shl_5_bwd), L(shl_table_bwd))
+    .int    JMPTBL (L(shl_6_bwd), L(shl_table_bwd))
+    .int    JMPTBL (L(shl_7_bwd), L(shl_table_bwd))
+    .int    JMPTBL (L(shl_8_bwd), L(shl_table_bwd))
+    .int    JMPTBL (L(shl_9_bwd), L(shl_table_bwd))
+    .int    JMPTBL (L(shl_10_bwd), L(shl_table_bwd))
+    .int    JMPTBL (L(shl_11_bwd), L(shl_table_bwd))
+    .int    JMPTBL (L(shl_12_bwd), L(shl_table_bwd))
+    .int    JMPTBL (L(shl_13_bwd), L(shl_table_bwd))
+    .int    JMPTBL (L(shl_14_bwd), L(shl_table_bwd))
+    .int    JMPTBL (L(shl_15_bwd), L(shl_table_bwd))
+
+#endif
diff --git a/utils/memcpy-bench/glibc/memcpy-ssse3.S b/utils/memcpy-bench/glibc/memcpy-ssse3.S
new file mode 100644
index 00000000000..11cb6559a8b
--- /dev/null
+++ b/utils/memcpy-bench/glibc/memcpy-ssse3.S
@@ -0,0 +1,3152 @@
+/* memcpy with SSSE3
+   Copyright (C) 2010-2020 Free Software Foundation, Inc.
+   Contributed by Intel Corporation.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <https://www.gnu.org/licenses/>.  */
+
+#include "sysdep.h"
+
+#if 1
+
+#include "asm-syntax.h"
+
+#ifndef MEMCPY
+# define MEMCPY        __memcpy_ssse3
+# define MEMCPY_CHK    __memcpy_chk_ssse3
+# define MEMPCPY    __mempcpy_ssse3
+# define MEMPCPY_CHK    __mempcpy_chk_ssse3
+#endif
+
+#define JMPTBL(I, B)    I - B
+
+/* Branch to an entry in a jump table.  TABLE is a jump table with
+   relative offsets.  INDEX is a register contains the index into the
+   jump table.  SCALE is the scale of INDEX.  */
+#define BRANCH_TO_JMPTBL_ENTRY(TABLE, INDEX, SCALE)        \
+  lea        TABLE(%rip), %r11;                \
+  movslq    (%r11, INDEX, SCALE), INDEX;            \
+  lea        (%r11, INDEX), INDEX;                \
+  _CET_NOTRACK jmp *INDEX;                    \
+  ud2
+
+    .section .text.ssse3,"ax",@progbits
+#if !defined USE_AS_MEMPCPY && !defined USE_AS_MEMMOVE
+ENTRY (MEMPCPY_CHK)
+    cmp    %RDX_LP, %RCX_LP
+    jb    HIDDEN_JUMPTARGET (__chk_fail)
+END (MEMPCPY_CHK)
+
+ENTRY (MEMPCPY)
+    mov    %RDI_LP, %RAX_LP
+    add    %RDX_LP, %RAX_LP
+    jmp    L(start)
+END (MEMPCPY)
+#endif
+
+#if !defined USE_AS_BCOPY
+ENTRY (MEMCPY_CHK)
+    cmp    %RDX_LP, %RCX_LP
+    jb    HIDDEN_JUMPTARGET (__chk_fail)
+END (MEMCPY_CHK)
+#endif
+
+ENTRY (MEMCPY)
+    mov    %RDI_LP, %RAX_LP
+#ifdef USE_AS_MEMPCPY
+    add    %RDX_LP, %RAX_LP
+#endif
+
+#ifdef __ILP32__
+    /* Clear the upper 32 bits.  */
+    mov    %edx, %edx
+#endif
+
+#ifdef USE_AS_MEMMOVE
+    cmp    %rsi, %rdi
+    jb    L(copy_forward)
+    je    L(write_0bytes)
+    cmp    $79, %rdx
+    jbe    L(copy_forward)
+    jmp    L(copy_backward)
+L(copy_forward):
+#endif
+L(start):
+    cmp    $79, %rdx
+    lea     L(table_less_80bytes)(%rip), %r11
+    ja    L(80bytesormore)
+    movslq    (%r11, %rdx, 4), %r9
+    add    %rdx, %rsi
+    add    %rdx, %rdi
+    add    %r11, %r9
+    _CET_NOTRACK jmp *%r9
+    ud2
+
+    .p2align 4
+L(80bytesormore):
+#ifndef USE_AS_MEMMOVE
+    cmp    %dil, %sil
+    jle    L(copy_backward)
+#endif
+
+    movdqu    (%rsi), %xmm0
+    mov    %rdi, %rcx
+    and    $-16, %rdi
+    add    $16, %rdi
+    mov    %rcx, %r8
+    sub    %rdi, %rcx
+    add    %rcx, %rdx
+    sub    %rcx, %rsi
+
+#ifdef SHARED_CACHE_SIZE_HALF
+    mov    $SHARED_CACHE_SIZE_HALF, %RCX_LP
+#else
+    mov    __x86_shared_cache_size_half(%rip), %RCX_LP
+#endif
+    cmp    %rcx, %rdx
+    mov    %rsi, %r9
+    ja    L(large_page_fwd)
+    and    $0xf, %r9
+    jz    L(shl_0)
+#ifdef DATA_CACHE_SIZE_HALF
+    mov    $DATA_CACHE_SIZE_HALF, %RCX_LP
+#else
+    mov    __x86_data_cache_size_half(%rip), %RCX_LP
+#endif
+    BRANCH_TO_JMPTBL_ENTRY (L(shl_table), %r9, 4)
+
+    .p2align 4
+L(copy_backward):
+    movdqu    -16(%rsi, %rdx), %xmm0
+    add    %rdx, %rsi
+    lea    -16(%rdi, %rdx), %r8
+    add    %rdx, %rdi
+
+    mov    %rdi, %rcx
+    and    $0xf, %rcx
+    xor    %rcx, %rdi
+    sub    %rcx, %rdx
+    sub    %rcx, %rsi
+
+#ifdef SHARED_CACHE_SIZE_HALF
+    mov    $SHARED_CACHE_SIZE_HALF, %RCX_LP
+#else
+    mov    __x86_shared_cache_size_half(%rip), %RCX_LP
+#endif
+
+    cmp    %rcx, %rdx
+    mov    %rsi, %r9
+    ja    L(large_page_bwd)
+    and    $0xf, %r9
+    jz    L(shl_0_bwd)
+#ifdef DATA_CACHE_SIZE_HALF
+    mov    $DATA_CACHE_SIZE_HALF, %RCX_LP
+#else
+    mov    __x86_data_cache_size_half(%rip), %RCX_LP
+#endif
+    BRANCH_TO_JMPTBL_ENTRY (L(shl_table_bwd), %r9, 4)
+
+    .p2align 4
+L(shl_0):
+    sub    $16, %rdx
+    movdqa    (%rsi), %xmm1
+    add    $16, %rsi
+    movdqa    %xmm1, (%rdi)
+    add    $16, %rdi
+    cmp    $128, %rdx
+    movdqu    %xmm0, (%r8)
+    ja    L(shl_0_gobble)
+    cmp    $64, %rdx
+    jb    L(shl_0_less_64bytes)
+    movaps    (%rsi), %xmm4
+    movaps    16(%rsi), %xmm1
+    movaps    32(%rsi), %xmm2
+    movaps    48(%rsi), %xmm3
+    movaps    %xmm4, (%rdi)
+    movaps    %xmm1, 16(%rdi)
+    movaps    %xmm2, 32(%rdi)
+    movaps    %xmm3, 48(%rdi)
+    sub    $64, %rdx
+    add    $64, %rsi
+    add    $64, %rdi
+L(shl_0_less_64bytes):
+    add    %rdx, %rsi
+    add    %rdx, %rdi
+    BRANCH_TO_JMPTBL_ENTRY (L(table_less_80bytes), %rdx, 4)
+
+    .p2align 4
+L(shl_0_gobble):
+#ifdef DATA_CACHE_SIZE_HALF
+    cmp    $DATA_CACHE_SIZE_HALF, %RDX_LP
+#else
+    cmp    __x86_data_cache_size_half(%rip), %RDX_LP
+#endif
+    lea    -128(%rdx), %rdx
+    jae    L(shl_0_gobble_mem_loop)
+L(shl_0_gobble_cache_loop):
+    movdqa    (%rsi), %xmm4
+    movaps    0x10(%rsi), %xmm1
+    movaps    0x20(%rsi), %xmm2
+    movaps    0x30(%rsi), %xmm3
+
+    movdqa    %xmm4, (%rdi)
+    movaps    %xmm1, 0x10(%rdi)
+    movaps    %xmm2, 0x20(%rdi)
+    movaps    %xmm3, 0x30(%rdi)
+
+    sub    $128, %rdx
+    movaps    0x40(%rsi), %xmm4
+    movaps    0x50(%rsi), %xmm5
+    movaps    0x60(%rsi), %xmm6
+    movaps    0x70(%rsi), %xmm7
+    lea    0x80(%rsi), %rsi
+    movaps    %xmm4, 0x40(%rdi)
+    movaps    %xmm5, 0x50(%rdi)
+    movaps    %xmm6, 0x60(%rdi)
+    movaps    %xmm7, 0x70(%rdi)
+    lea    0x80(%rdi), %rdi
+
+    jae    L(shl_0_gobble_cache_loop)
+    cmp    $-0x40, %rdx
+    lea    0x80(%rdx), %rdx
+    jl    L(shl_0_cache_less_64bytes)
+
+    movdqa    (%rsi), %xmm4
+    sub    $0x40, %rdx
+    movdqa    0x10(%rsi), %xmm1
+
+    movdqa    %xmm4, (%rdi)
+    movdqa    %xmm1, 0x10(%rdi)
+
+    movdqa    0x20(%rsi), %xmm4
+    movdqa    0x30(%rsi), %xmm1
+    add    $0x40, %rsi
+
+    movdqa    %xmm4, 0x20(%rdi)
+    movdqa    %xmm1, 0x30(%rdi)
+    add    $0x40, %rdi
+L(shl_0_cache_less_64bytes):
+    add    %rdx, %rsi
+    add    %rdx, %rdi
+    BRANCH_TO_JMPTBL_ENTRY (L(table_less_80bytes), %rdx, 4)
+
+    .p2align 4
+L(shl_0_gobble_mem_loop):
+    prefetcht0 0x1c0(%rsi)
+    prefetcht0 0x280(%rsi)
+
+    movdqa    (%rsi), %xmm0
+    movdqa    0x10(%rsi), %xmm1
+    movdqa    0x20(%rsi), %xmm2
+    movdqa    0x30(%rsi), %xmm3
+    movdqa    0x40(%rsi), %xmm4
+    movdqa    0x50(%rsi), %xmm5
+    movdqa    0x60(%rsi), %xmm6
+    movdqa    0x70(%rsi), %xmm7
+    lea    0x80(%rsi), %rsi
+    sub    $0x80, %rdx
+    movdqa    %xmm0, (%rdi)
+    movdqa    %xmm1, 0x10(%rdi)
+    movdqa    %xmm2, 0x20(%rdi)
+    movdqa    %xmm3, 0x30(%rdi)
+    movdqa    %xmm4, 0x40(%rdi)
+    movdqa    %xmm5, 0x50(%rdi)
+    movdqa    %xmm6, 0x60(%rdi)
+    movdqa    %xmm7, 0x70(%rdi)
+    lea    0x80(%rdi), %rdi
+
+    jae    L(shl_0_gobble_mem_loop)
+    cmp    $-0x40, %rdx
+    lea    0x80(%rdx), %rdx
+    jl    L(shl_0_mem_less_64bytes)
+
+    movdqa    (%rsi), %xmm0
+    sub    $0x40, %rdx
+    movdqa    0x10(%rsi), %xmm1
+
+    movdqa    %xmm0, (%rdi)
+    movdqa    %xmm1, 0x10(%rdi)
+
+    movdqa    0x20(%rsi), %xmm0
+    movdqa    0x30(%rsi), %xmm1
+    add    $0x40, %rsi
+
+    movdqa    %xmm0, 0x20(%rdi)
+    movdqa    %xmm1, 0x30(%rdi)
+    add    $0x40, %rdi
+L(shl_0_mem_less_64bytes):
+    cmp    $0x20, %rdx
+    jb    L(shl_0_mem_less_32bytes)
+    movdqa    (%rsi), %xmm0
+    sub    $0x20, %rdx
+    movdqa    0x10(%rsi), %xmm1
+    add    $0x20, %rsi
+    movdqa    %xmm0, (%rdi)
+    movdqa    %xmm1, 0x10(%rdi)
+    add    $0x20, %rdi
+L(shl_0_mem_less_32bytes):
+    add    %rdx, %rdi
+    add    %rdx, %rsi
+    BRANCH_TO_JMPTBL_ENTRY (L(table_less_80bytes), %rdx, 4)
+
+    .p2align 4
+L(shl_0_bwd):
+    sub    $16, %rdx
+    movdqa    -0x10(%rsi), %xmm1
+    sub    $16, %rsi
+    movdqa    %xmm1, -0x10(%rdi)
+    sub    $16, %rdi
+    cmp    $0x80, %rdx
+    movdqu    %xmm0, (%r8)
+    ja    L(shl_0_gobble_bwd)
+    cmp    $64, %rdx
+    jb    L(shl_0_less_64bytes_bwd)
+    movaps    -0x10(%rsi), %xmm0
+    movaps    -0x20(%rsi), %xmm1
+    movaps    -0x30(%rsi), %xmm2
+    movaps    -0x40(%rsi), %xmm3
+    movaps    %xmm0, -0x10(%rdi)
+    movaps    %xmm1, -0x20(%rdi)
+    movaps    %xmm2, -0x30(%rdi)
+    movaps    %xmm3, -0x40(%rdi)
+    sub    $64, %rdx
+    sub    $0x40, %rsi
+    sub    $0x40, %rdi
+L(shl_0_less_64bytes_bwd):
+    BRANCH_TO_JMPTBL_ENTRY (L(table_less_80bytes), %rdx, 4)
+
+    .p2align 4
+L(shl_0_gobble_bwd):
+#ifdef DATA_CACHE_SIZE_HALF
+    cmp    $DATA_CACHE_SIZE_HALF, %RDX_LP
+#else
+    cmp    __x86_data_cache_size_half(%rip), %RDX_LP
+#endif
+    lea    -128(%rdx), %rdx
+    jae    L(shl_0_gobble_mem_bwd_loop)
+L(shl_0_gobble_bwd_loop):
+    movdqa    -0x10(%rsi), %xmm0
+    movaps    -0x20(%rsi), %xmm1
+    movaps    -0x30(%rsi), %xmm2
+    movaps    -0x40(%rsi), %xmm3
+
+    movdqa    %xmm0, -0x10(%rdi)
+    movaps    %xmm1, -0x20(%rdi)
+    movaps    %xmm2, -0x30(%rdi)
+    movaps    %xmm3, -0x40(%rdi)
+
+    sub    $0x80, %rdx
+    movaps    -0x50(%rsi), %xmm4
+    movaps    -0x60(%rsi), %xmm5
+    movaps    -0x70(%rsi), %xmm6
+    movaps    -0x80(%rsi), %xmm7
+    lea    -0x80(%rsi), %rsi
+    movaps    %xmm4, -0x50(%rdi)
+    movaps    %xmm5, -0x60(%rdi)
+    movaps    %xmm6, -0x70(%rdi)
+    movaps    %xmm7, -0x80(%rdi)
+    lea    -0x80(%rdi), %rdi
+
+    jae    L(shl_0_gobble_bwd_loop)
+    cmp    $-0x40, %rdx
+    lea    0x80(%rdx), %rdx
+    jl    L(shl_0_gobble_bwd_less_64bytes)
+
+    movdqa    -0x10(%rsi), %xmm0
+    sub    $0x40, %rdx
+    movdqa    -0x20(%rsi), %xmm1
+
+    movdqa    %xmm0, -0x10(%rdi)
+    movdqa    %xmm1, -0x20(%rdi)
+
+    movdqa    -0x30(%rsi), %xmm0
+    movdqa    -0x40(%rsi), %xmm1
+    sub    $0x40, %rsi
+
+    movdqa    %xmm0, -0x30(%rdi)
+    movdqa    %xmm1, -0x40(%rdi)
+    sub    $0x40, %rdi
+L(shl_0_gobble_bwd_less_64bytes):
+    BRANCH_TO_JMPTBL_ENTRY (L(table_less_80bytes), %rdx, 4)
+
+    .p2align 4
+L(shl_0_gobble_mem_bwd_loop):
+    prefetcht0 -0x1c0(%rsi)
+    prefetcht0 -0x280(%rsi)
+    movdqa    -0x10(%rsi), %xmm0
+    movdqa    -0x20(%rsi), %xmm1
+    movdqa    -0x30(%rsi), %xmm2
+    movdqa    -0x40(%rsi), %xmm3
+    movdqa    -0x50(%rsi), %xmm4
+    movdqa    -0x60(%rsi), %xmm5
+    movdqa    -0x70(%rsi), %xmm6
+    movdqa    -0x80(%rsi), %xmm7
+    lea    -0x80(%rsi), %rsi
+    sub    $0x80, %rdx
+    movdqa    %xmm0, -0x10(%rdi)
+    movdqa    %xmm1, -0x20(%rdi)
+    movdqa    %xmm2, -0x30(%rdi)
+    movdqa    %xmm3, -0x40(%rdi)
+    movdqa    %xmm4, -0x50(%rdi)
+    movdqa    %xmm5, -0x60(%rdi)
+    movdqa    %xmm6, -0x70(%rdi)
+    movdqa    %xmm7, -0x80(%rdi)
+    lea    -0x80(%rdi), %rdi
+
+    jae    L(shl_0_gobble_mem_bwd_loop)
+    cmp    $-0x40, %rdx
+    lea    0x80(%rdx), %rdx
+    jl    L(shl_0_mem_bwd_less_64bytes)
+
+    movdqa    -0x10(%rsi), %xmm0
+    sub    $0x40, %rdx
+    movdqa    -0x20(%rsi), %xmm1
+
+    movdqa    %xmm0, -0x10(%rdi)
+    movdqa    %xmm1, -0x20(%rdi)
+
+    movdqa    -0x30(%rsi), %xmm0
+    movdqa    -0x40(%rsi), %xmm1
+    sub    $0x40, %rsi
+
+    movdqa    %xmm0, -0x30(%rdi)
+    movdqa    %xmm1, -0x40(%rdi)
+    sub    $0x40, %rdi
+L(shl_0_mem_bwd_less_64bytes):
+    cmp    $0x20, %rdx
+    jb    L(shl_0_mem_bwd_less_32bytes)
+    movdqa    -0x10(%rsi), %xmm0
+    sub    $0x20, %rdx
+    movdqa    -0x20(%rsi), %xmm1
+    sub    $0x20, %rsi
+    movdqa    %xmm0, -0x10(%rdi)
+    movdqa    %xmm1, -0x20(%rdi)
+    sub    $0x20, %rdi
+L(shl_0_mem_bwd_less_32bytes):
+    BRANCH_TO_JMPTBL_ENTRY (L(table_less_80bytes), %rdx, 4)
+
+    .p2align 4
+L(shl_1):
+    lea    (L(shl_1_loop_L1)-L(shl_1))(%r9), %r9
+    cmp    %rcx, %rdx
+    movaps    -0x01(%rsi), %xmm1
+    jb    L(L1_fwd)
+    lea    (L(shl_1_loop_L2)-L(shl_1_loop_L1))(%r9), %r9
+L(L1_fwd):
+    lea    -64(%rdx), %rdx
+    _CET_NOTRACK jmp *%r9
+    ud2
+L(shl_1_loop_L2):
+    prefetchnta 0x1c0(%rsi)
+L(shl_1_loop_L1):
+    sub    $64, %rdx
+    movaps    0x0f(%rsi), %xmm2
+    movaps    0x1f(%rsi), %xmm3
+    movaps    0x2f(%rsi), %xmm4
+    movaps    0x3f(%rsi), %xmm5
+    movdqa    %xmm5, %xmm6
+    palignr    $1, %xmm4, %xmm5
+    lea    64(%rsi), %rsi
+    palignr    $1, %xmm3, %xmm4
+    palignr    $1, %xmm2, %xmm3
+    lea    64(%rdi), %rdi
+    palignr    $1, %xmm1, %xmm2
+    movdqa    %xmm6, %xmm1
+    movdqa    %xmm2, -0x40(%rdi)
+    movaps    %xmm3, -0x30(%rdi)
+    jb    L(shl_1_end)
+    movaps    %xmm4, -0x20(%rdi)
+    movaps    %xmm5, -0x10(%rdi)
+    _CET_NOTRACK jmp *%r9
+    ud2
+L(shl_1_end):
+    movaps    %xmm4, -0x20(%rdi)
+    lea    64(%rdx), %rdx
+    movaps    %xmm5, -0x10(%rdi)
+    add    %rdx, %rdi
+    movdqu    %xmm0, (%r8)
+    add    %rdx, %rsi
+    BRANCH_TO_JMPTBL_ENTRY(L(table_less_80bytes), %rdx, 4)
+
+    .p2align 4
+L(shl_1_bwd):
+    lea    (L(shl_1_bwd_loop_L1)-L(shl_1_bwd))(%r9), %r9
+    cmp    %rcx, %rdx
+    movaps    -0x01(%rsi), %xmm1
+    jb    L(L1_bwd)
+    lea    (L(shl_1_bwd_loop_L2)-L(shl_1_bwd_loop_L1))(%r9), %r9
+L(L1_bwd):
+    lea    -64(%rdx), %rdx
+    _CET_NOTRACK jmp *%r9
+    ud2
+L(shl_1_bwd_loop_L2):
+    prefetchnta -0x1c0(%rsi)
+L(shl_1_bwd_loop_L1):
+    movaps    -0x11(%rsi), %xmm2
+    sub    $0x40, %rdx
+    movaps    -0x21(%rsi), %xmm3
+    movaps    -0x31(%rsi), %xmm4
+    movaps    -0x41(%rsi), %xmm5
+    lea    -0x40(%rsi), %rsi
+    palignr    $1, %xmm2, %xmm1
+    palignr    $1, %xmm3, %xmm2
+    palignr    $1, %xmm4, %xmm3
+    palignr    $1, %xmm5, %xmm4
+
+    movaps    %xmm1, -0x10(%rdi)
+    movaps    %xmm5, %xmm1
+
+    movaps    %xmm2, -0x20(%rdi)
+    lea    -0x40(%rdi), %rdi
+
+    movaps    %xmm3, 0x10(%rdi)
+    jb    L(shl_1_bwd_end)
+    movaps    %xmm4, (%rdi)
+    _CET_NOTRACK jmp *%r9
+    ud2
+L(shl_1_bwd_end):
+    movaps    %xmm4, (%rdi)
+    lea    64(%rdx), %rdx
+    movdqu    %xmm0, (%r8)
+    BRANCH_TO_JMPTBL_ENTRY(L(table_less_80bytes), %rdx, 4)
+
+    .p2align 4
+L(shl_2):
+    lea    (L(shl_2_loop_L1)-L(shl_2))(%r9), %r9
+    cmp    %rcx, %rdx
+    movaps    -0x02(%rsi), %xmm1
+    jb    L(L2_fwd)
+    lea    (L(shl_2_loop_L2)-L(shl_2_loop_L1))(%r9), %r9
+L(L2_fwd):
+    lea    -64(%rdx), %rdx
+    _CET_NOTRACK jmp *%r9
+    ud2
+L(shl_2_loop_L2):
+    prefetchnta 0x1c0(%rsi)
+L(shl_2_loop_L1):
+    sub    $64, %rdx
+    movaps    0x0e(%rsi), %xmm2
+    movaps    0x1e(%rsi), %xmm3
+    movaps    0x2e(%rsi), %xmm4
+    movaps    0x3e(%rsi), %xmm5
+    movdqa    %xmm5, %xmm6
+    palignr    $2, %xmm4, %xmm5
+    lea    64(%rsi), %rsi
+    palignr    $2, %xmm3, %xmm4
+    palignr    $2, %xmm2, %xmm3
+    lea    64(%rdi), %rdi
+    palignr    $2, %xmm1, %xmm2
+    movdqa    %xmm6, %xmm1
+    movdqa    %xmm2, -0x40(%rdi)
+    movaps    %xmm3, -0x30(%rdi)
+    jb    L(shl_2_end)
+    movaps    %xmm4, -0x20(%rdi)
+    movaps    %xmm5, -0x10(%rdi)
+    _CET_NOTRACK jmp *%r9
+    ud2
+L(shl_2_end):
+    movaps    %xmm4, -0x20(%rdi)
+    lea    64(%rdx), %rdx
+    movaps    %xmm5, -0x10(%rdi)
+    add    %rdx, %rdi
+    movdqu    %xmm0, (%r8)
+    add    %rdx, %rsi
+    BRANCH_TO_JMPTBL_ENTRY(L(table_less_80bytes), %rdx, 4)
+
+    .p2align 4
+L(shl_2_bwd):
+    lea    (L(shl_2_bwd_loop_L1)-L(shl_2_bwd))(%r9), %r9
+    cmp    %rcx, %rdx
+    movaps    -0x02(%rsi), %xmm1
+    jb    L(L2_bwd)
+    lea    (L(shl_2_bwd_loop_L2)-L(shl_2_bwd_loop_L1))(%r9), %r9
+L(L2_bwd):
+    lea    -64(%rdx), %rdx
+    _CET_NOTRACK jmp *%r9
+    ud2
+L(shl_2_bwd_loop_L2):
+    prefetchnta -0x1c0(%rsi)
+L(shl_2_bwd_loop_L1):
+    movaps    -0x12(%rsi), %xmm2
+    sub    $0x40, %rdx
+    movaps    -0x22(%rsi), %xmm3
+    movaps    -0x32(%rsi), %xmm4
+    movaps    -0x42(%rsi), %xmm5
+    lea    -0x40(%rsi), %rsi
+    palignr    $2, %xmm2, %xmm1
+    palignr    $2, %xmm3, %xmm2
+    palignr    $2, %xmm4, %xmm3
+    palignr    $2, %xmm5, %xmm4
+
+    movaps    %xmm1, -0x10(%rdi)
+    movaps    %xmm5, %xmm1
+
+    movaps    %xmm2, -0x20(%rdi)
+    lea    -0x40(%rdi), %rdi
+
+    movaps    %xmm3, 0x10(%rdi)
+    jb    L(shl_2_bwd_end)
+    movaps    %xmm4, (%rdi)
+    _CET_NOTRACK jmp *%r9
+    ud2
+L(shl_2_bwd_end):
+    movaps    %xmm4, (%rdi)
+    lea    64(%rdx), %rdx
+    movdqu    %xmm0, (%r8)
+    BRANCH_TO_JMPTBL_ENTRY(L(table_less_80bytes), %rdx, 4)
+
+    .p2align 4
+L(shl_3):
+    lea    (L(shl_3_loop_L1)-L(shl_3))(%r9), %r9
+    cmp    %rcx, %rdx
+    movaps    -0x03(%rsi), %xmm1
+    jb    L(L3_fwd)
+    lea    (L(shl_3_loop_L2)-L(shl_3_loop_L1))(%r9), %r9
+L(L3_fwd):
+    lea    -64(%rdx), %rdx
+    _CET_NOTRACK jmp *%r9
+    ud2
+L(shl_3_loop_L2):
+    prefetchnta 0x1c0(%rsi)
+L(shl_3_loop_L1):
+    sub    $64, %rdx
+    movaps    0x0d(%rsi), %xmm2
+    movaps    0x1d(%rsi), %xmm3
+    movaps    0x2d(%rsi), %xmm4
+    movaps    0x3d(%rsi), %xmm5
+    movdqa    %xmm5, %xmm6
+    palignr    $3, %xmm4, %xmm5
+    lea    64(%rsi), %rsi
+    palignr    $3, %xmm3, %xmm4
+    palignr    $3, %xmm2, %xmm3
+    lea    64(%rdi), %rdi
+    palignr    $3, %xmm1, %xmm2
+    movdqa    %xmm6, %xmm1
+    movdqa    %xmm2, -0x40(%rdi)
+    movaps    %xmm3, -0x30(%rdi)
+    jb    L(shl_3_end)
+    movaps    %xmm4, -0x20(%rdi)
+    movaps    %xmm5, -0x10(%rdi)
+    _CET_NOTRACK jmp *%r9
+    ud2
+L(shl_3_end):
+    movaps    %xmm4, -0x20(%rdi)
+    lea    64(%rdx), %rdx
+    movaps    %xmm5, -0x10(%rdi)
+    add    %rdx, %rdi
+    movdqu    %xmm0, (%r8)
+    add    %rdx, %rsi
+    BRANCH_TO_JMPTBL_ENTRY(L(table_less_80bytes), %rdx, 4)
+
+    .p2align 4
+L(shl_3_bwd):
+    lea    (L(shl_3_bwd_loop_L1)-L(shl_3_bwd))(%r9), %r9
+    cmp    %rcx, %rdx
+    movaps    -0x03(%rsi), %xmm1
+    jb    L(L3_bwd)
+    lea    (L(shl_3_bwd_loop_L2)-L(shl_3_bwd_loop_L1))(%r9), %r9
+L(L3_bwd):
+    lea    -64(%rdx), %rdx
+    _CET_NOTRACK jmp *%r9
+    ud2
+L(shl_3_bwd_loop_L2):
+    prefetchnta -0x1c0(%rsi)
+L(shl_3_bwd_loop_L1):
+    movaps    -0x13(%rsi), %xmm2
+    sub    $0x40, %rdx
+    movaps    -0x23(%rsi), %xmm3
+    movaps    -0x33(%rsi), %xmm4
+    movaps    -0x43(%rsi), %xmm5
+    lea    -0x40(%rsi), %rsi
+    palignr    $3, %xmm2, %xmm1
+    palignr    $3, %xmm3, %xmm2
+    palignr    $3, %xmm4, %xmm3
+    palignr    $3, %xmm5, %xmm4
+
+    movaps    %xmm1, -0x10(%rdi)
+    movaps    %xmm5, %xmm1
+
+    movaps    %xmm2, -0x20(%rdi)
+    lea    -0x40(%rdi), %rdi
+
+    movaps    %xmm3, 0x10(%rdi)
+    jb    L(shl_3_bwd_end)
+    movaps    %xmm4, (%rdi)
+    _CET_NOTRACK jmp *%r9
+    ud2
+L(shl_3_bwd_end):
+    movaps    %xmm4, (%rdi)
+    lea    64(%rdx), %rdx
+    movdqu    %xmm0, (%r8)
+    BRANCH_TO_JMPTBL_ENTRY(L(table_less_80bytes), %rdx, 4)
+
+    .p2align 4
+L(shl_4):
+    lea    (L(shl_4_loop_L1)-L(shl_4))(%r9), %r9
+    cmp    %rcx, %rdx
+    movaps    -0x04(%rsi), %xmm1
+    jb    L(L4_fwd)
+    lea    (L(shl_4_loop_L2)-L(shl_4_loop_L1))(%r9), %r9
+L(L4_fwd):
+    lea    -64(%rdx), %rdx
+    _CET_NOTRACK jmp *%r9
+    ud2
+L(shl_4_loop_L2):
+    prefetchnta 0x1c0(%rsi)
+L(shl_4_loop_L1):
+    sub    $64, %rdx
+    movaps    0x0c(%rsi), %xmm2
+    movaps    0x1c(%rsi), %xmm3
+    movaps    0x2c(%rsi), %xmm4
+    movaps    0x3c(%rsi), %xmm5
+    movdqa    %xmm5, %xmm6
+    palignr    $4, %xmm4, %xmm5
+    lea    64(%rsi), %rsi
+    palignr    $4, %xmm3, %xmm4
+    palignr    $4, %xmm2, %xmm3
+    lea    64(%rdi), %rdi
+    palignr    $4, %xmm1, %xmm2
+    movdqa    %xmm6, %xmm1
+    movdqa    %xmm2, -0x40(%rdi)
+    movaps    %xmm3, -0x30(%rdi)
+    jb    L(shl_4_end)
+    movaps    %xmm4, -0x20(%rdi)
+    movaps    %xmm5, -0x10(%rdi)
+    _CET_NOTRACK jmp *%r9
+    ud2
+L(shl_4_end):
+    movaps    %xmm4, -0x20(%rdi)
+    lea    64(%rdx), %rdx
+    movaps    %xmm5, -0x10(%rdi)
+    add    %rdx, %rdi
+    movdqu    %xmm0, (%r8)
+    add    %rdx, %rsi
+    BRANCH_TO_JMPTBL_ENTRY(L(table_less_80bytes), %rdx, 4)
+
+    .p2align 4
+L(shl_4_bwd):
+    lea    (L(shl_4_bwd_loop_L1)-L(shl_4_bwd))(%r9), %r9
+    cmp    %rcx, %rdx
+    movaps    -0x04(%rsi), %xmm1
+    jb    L(L4_bwd)
+    lea    (L(shl_4_bwd_loop_L2)-L(shl_4_bwd_loop_L1))(%r9), %r9
+L(L4_bwd):
+    lea    -64(%rdx), %rdx
+    _CET_NOTRACK jmp *%r9
+    ud2
+L(shl_4_bwd_loop_L2):
+    prefetchnta -0x1c0(%rsi)
+L(shl_4_bwd_loop_L1):
+    movaps    -0x14(%rsi), %xmm2
+    sub    $0x40, %rdx
+    movaps    -0x24(%rsi), %xmm3
+    movaps    -0x34(%rsi), %xmm4
+    movaps    -0x44(%rsi), %xmm5
+    lea    -0x40(%rsi), %rsi
+    palignr    $4, %xmm2, %xmm1
+    palignr    $4, %xmm3, %xmm2
+    palignr    $4, %xmm4, %xmm3
+    palignr    $4, %xmm5, %xmm4
+
+    movaps    %xmm1, -0x10(%rdi)
+    movaps    %xmm5, %xmm1
+
+    movaps    %xmm2, -0x20(%rdi)
+    lea    -0x40(%rdi), %rdi
+
+    movaps    %xmm3, 0x10(%rdi)
+    jb    L(shl_4_bwd_end)
+    movaps    %xmm4, (%rdi)
+    _CET_NOTRACK jmp *%r9
+    ud2
+L(shl_4_bwd_end):
+    movaps    %xmm4, (%rdi)
+    lea    64(%rdx), %rdx
+    movdqu    %xmm0, (%r8)
+    BRANCH_TO_JMPTBL_ENTRY(L(table_less_80bytes), %rdx, 4)
+
+    .p2align 4
+L(shl_5):
+    lea    (L(shl_5_loop_L1)-L(shl_5))(%r9), %r9
+    cmp    %rcx, %rdx
+    movaps    -0x05(%rsi), %xmm1
+    jb    L(L5_fwd)
+    lea    (L(shl_5_loop_L2)-L(shl_5_loop_L1))(%r9), %r9
+L(L5_fwd):
+    lea    -64(%rdx), %rdx
+    _CET_NOTRACK jmp *%r9
+    ud2
+L(shl_5_loop_L2):
+    prefetchnta 0x1c0(%rsi)
+L(shl_5_loop_L1):
+    sub    $64, %rdx
+    movaps    0x0b(%rsi), %xmm2
+    movaps    0x1b(%rsi), %xmm3
+    movaps    0x2b(%rsi), %xmm4
+    movaps    0x3b(%rsi), %xmm5
+    movdqa    %xmm5, %xmm6
+    palignr    $5, %xmm4, %xmm5
+    lea    64(%rsi), %rsi
+    palignr    $5, %xmm3, %xmm4
+    palignr    $5, %xmm2, %xmm3
+    lea    64(%rdi), %rdi
+    palignr    $5, %xmm1, %xmm2
+    movdqa    %xmm6, %xmm1
+    movdqa    %xmm2, -0x40(%rdi)
+    movaps    %xmm3, -0x30(%rdi)
+    jb    L(shl_5_end)
+    movaps    %xmm4, -0x20(%rdi)
+    movaps    %xmm5, -0x10(%rdi)
+    _CET_NOTRACK jmp *%r9
+    ud2
+L(shl_5_end):
+    movaps    %xmm4, -0x20(%rdi)
+    lea    64(%rdx), %rdx
+    movaps    %xmm5, -0x10(%rdi)
+    add    %rdx, %rdi
+    movdqu    %xmm0, (%r8)
+    add    %rdx, %rsi
+    BRANCH_TO_JMPTBL_ENTRY(L(table_less_80bytes), %rdx, 4)
+
+    .p2align 4
+L(shl_5_bwd):
+    lea    (L(shl_5_bwd_loop_L1)-L(shl_5_bwd))(%r9), %r9
+    cmp    %rcx, %rdx
+    movaps    -0x05(%rsi), %xmm1
+    jb    L(L5_bwd)
+    lea    (L(shl_5_bwd_loop_L2)-L(shl_5_bwd_loop_L1))(%r9), %r9
+L(L5_bwd):
+    lea    -64(%rdx), %rdx
+    _CET_NOTRACK jmp *%r9
+    ud2
+L(shl_5_bwd_loop_L2):
+    prefetchnta -0x1c0(%rsi)
+L(shl_5_bwd_loop_L1):
+    movaps    -0x15(%rsi), %xmm2
+    sub    $0x40, %rdx
+    movaps    -0x25(%rsi), %xmm3
+    movaps    -0x35(%rsi), %xmm4
+    movaps    -0x45(%rsi), %xmm5
+    lea    -0x40(%rsi), %rsi
+    palignr    $5, %xmm2, %xmm1
+    palignr    $5, %xmm3, %xmm2
+    palignr    $5, %xmm4, %xmm3
+    palignr    $5, %xmm5, %xmm4
+
+    movaps    %xmm1, -0x10(%rdi)
+    movaps    %xmm5, %xmm1
+
+    movaps    %xmm2, -0x20(%rdi)
+    lea    -0x40(%rdi), %rdi
+
+    movaps    %xmm3, 0x10(%rdi)
+    jb    L(shl_5_bwd_end)
+    movaps    %xmm4, (%rdi)
+    _CET_NOTRACK jmp *%r9
+    ud2
+L(shl_5_bwd_end):
+    movaps    %xmm4, (%rdi)
+    lea    64(%rdx), %rdx
+    movdqu    %xmm0, (%r8)
+    BRANCH_TO_JMPTBL_ENTRY(L(table_less_80bytes), %rdx, 4)
+
+    .p2align 4
+L(shl_6):
+    lea    (L(shl_6_loop_L1)-L(shl_6))(%r9), %r9
+    cmp    %rcx, %rdx
+    movaps    -0x06(%rsi), %xmm1
+    jb    L(L6_fwd)
+    lea    (L(shl_6_loop_L2)-L(shl_6_loop_L1))(%r9), %r9
+L(L6_fwd):
+    lea    -64(%rdx), %rdx
+    _CET_NOTRACK jmp *%r9
+    ud2
+L(shl_6_loop_L2):
+    prefetchnta 0x1c0(%rsi)
+L(shl_6_loop_L1):
+    sub    $64, %rdx
+    movaps    0x0a(%rsi), %xmm2
+    movaps    0x1a(%rsi), %xmm3
+    movaps    0x2a(%rsi), %xmm4
+    movaps    0x3a(%rsi), %xmm5
+    movdqa    %xmm5, %xmm6
+    palignr    $6, %xmm4, %xmm5
+    lea    64(%rsi), %rsi
+    palignr    $6, %xmm3, %xmm4
+    palignr    $6, %xmm2, %xmm3
+    lea    64(%rdi), %rdi
+    palignr    $6, %xmm1, %xmm2
+    movdqa    %xmm6, %xmm1
+    movdqa    %xmm2, -0x40(%rdi)
+    movaps    %xmm3, -0x30(%rdi)
+    jb    L(shl_6_end)
+    movaps    %xmm4, -0x20(%rdi)
+    movaps    %xmm5, -0x10(%rdi)
+    _CET_NOTRACK jmp *%r9
+    ud2
+L(shl_6_end):
+    movaps    %xmm4, -0x20(%rdi)
+    lea    64(%rdx), %rdx
+    movaps    %xmm5, -0x10(%rdi)
+    add    %rdx, %rdi
+    movdqu    %xmm0, (%r8)
+    add    %rdx, %rsi
+    BRANCH_TO_JMPTBL_ENTRY(L(table_less_80bytes), %rdx, 4)
+
+    .p2align 4
+L(shl_6_bwd):
+    lea    (L(shl_6_bwd_loop_L1)-L(shl_6_bwd))(%r9), %r9
+    cmp    %rcx, %rdx
+    movaps    -0x06(%rsi), %xmm1
+    jb    L(L6_bwd)
+    lea    (L(shl_6_bwd_loop_L2)-L(shl_6_bwd_loop_L1))(%r9), %r9
+L(L6_bwd):
+    lea    -64(%rdx), %rdx
+    _CET_NOTRACK jmp *%r9
+    ud2
+L(shl_6_bwd_loop_L2):
+    prefetchnta -0x1c0(%rsi)
+L(shl_6_bwd_loop_L1):
+    movaps    -0x16(%rsi), %xmm2
+    sub    $0x40, %rdx
+    movaps    -0x26(%rsi), %xmm3
+    movaps    -0x36(%rsi), %xmm4
+    movaps    -0x46(%rsi), %xmm5
+    lea    -0x40(%rsi), %rsi
+    palignr    $6, %xmm2, %xmm1
+    palignr    $6, %xmm3, %xmm2
+    palignr    $6, %xmm4, %xmm3
+    palignr    $6, %xmm5, %xmm4
+
+    movaps    %xmm1, -0x10(%rdi)
+    movaps    %xmm5, %xmm1
+
+    movaps    %xmm2, -0x20(%rdi)
+    lea    -0x40(%rdi), %rdi
+
+    movaps    %xmm3, 0x10(%rdi)
+    jb    L(shl_6_bwd_end)
+    movaps    %xmm4, (%rdi)
+    _CET_NOTRACK jmp *%r9
+    ud2
+L(shl_6_bwd_end):
+    movaps    %xmm4, (%rdi)
+    lea    64(%rdx), %rdx
+    movdqu    %xmm0, (%r8)
+    BRANCH_TO_JMPTBL_ENTRY(L(table_less_80bytes), %rdx, 4)
+
+    .p2align 4
+L(shl_7):
+    lea    (L(shl_7_loop_L1)-L(shl_7))(%r9), %r9
+    cmp    %rcx, %rdx
+    movaps    -0x07(%rsi), %xmm1
+    jb    L(L7_fwd)
+    lea    (L(shl_7_loop_L2)-L(shl_7_loop_L1))(%r9), %r9
+L(L7_fwd):
+    lea    -64(%rdx), %rdx
+    _CET_NOTRACK jmp *%r9
+    ud2
+L(shl_7_loop_L2):
+    prefetchnta 0x1c0(%rsi)
+L(shl_7_loop_L1):
+    sub    $64, %rdx
+    movaps    0x09(%rsi), %xmm2
+    movaps    0x19(%rsi), %xmm3
+    movaps    0x29(%rsi), %xmm4
+    movaps    0x39(%rsi), %xmm5
+    movdqa    %xmm5, %xmm6
+    palignr    $7, %xmm4, %xmm5
+    lea    64(%rsi), %rsi
+    palignr    $7, %xmm3, %xmm4
+    palignr    $7, %xmm2, %xmm3
+    lea    64(%rdi), %rdi
+    palignr    $7, %xmm1, %xmm2
+    movdqa    %xmm6, %xmm1
+    movdqa    %xmm2, -0x40(%rdi)
+    movaps    %xmm3, -0x30(%rdi)
+    jb    L(shl_7_end)
+    movaps    %xmm4, -0x20(%rdi)
+    movaps    %xmm5, -0x10(%rdi)
+    _CET_NOTRACK jmp *%r9
+    ud2
+L(shl_7_end):
+    movaps    %xmm4, -0x20(%rdi)
+    lea    64(%rdx), %rdx
+    movaps    %xmm5, -0x10(%rdi)
+    add    %rdx, %rdi
+    movdqu    %xmm0, (%r8)
+    add    %rdx, %rsi
+    BRANCH_TO_JMPTBL_ENTRY(L(table_less_80bytes), %rdx, 4)
+
+    .p2align 4
+L(shl_7_bwd):
+    lea    (L(shl_7_bwd_loop_L1)-L(shl_7_bwd))(%r9), %r9
+    cmp    %rcx, %rdx
+    movaps    -0x07(%rsi), %xmm1
+    jb    L(L7_bwd)
+    lea    (L(shl_7_bwd_loop_L2)-L(shl_7_bwd_loop_L1))(%r9), %r9
+L(L7_bwd):
+    lea    -64(%rdx), %rdx
+    _CET_NOTRACK jmp *%r9
+    ud2
+L(shl_7_bwd_loop_L2):
+    prefetchnta -0x1c0(%rsi)
+L(shl_7_bwd_loop_L1):
+    movaps    -0x17(%rsi), %xmm2
+    sub    $0x40, %rdx
+    movaps    -0x27(%rsi), %xmm3
+    movaps    -0x37(%rsi), %xmm4
+    movaps    -0x47(%rsi), %xmm5
+    lea    -0x40(%rsi), %rsi
+    palignr    $7, %xmm2, %xmm1
+    palignr    $7, %xmm3, %xmm2
+    palignr    $7, %xmm4, %xmm3
+    palignr    $7, %xmm5, %xmm4
+
+    movaps    %xmm1, -0x10(%rdi)
+    movaps    %xmm5, %xmm1
+
+    movaps    %xmm2, -0x20(%rdi)
+    lea    -0x40(%rdi), %rdi
+
+    movaps    %xmm3, 0x10(%rdi)
+    jb    L(shl_7_bwd_end)
+    movaps    %xmm4, (%rdi)
+    _CET_NOTRACK jmp *%r9
+    ud2
+L(shl_7_bwd_end):
+    movaps    %xmm4, (%rdi)
+    lea    64(%rdx), %rdx
+    movdqu    %xmm0, (%r8)
+    BRANCH_TO_JMPTBL_ENTRY(L(table_less_80bytes), %rdx, 4)
+
+    .p2align 4
+L(shl_8):
+    lea    (L(shl_8_loop_L1)-L(shl_8))(%r9), %r9
+    cmp    %rcx, %rdx
+    movaps    -0x08(%rsi), %xmm1
+    jb    L(L8_fwd)
+    lea    (L(shl_8_loop_L2)-L(shl_8_loop_L1))(%r9), %r9
+L(L8_fwd):
+    lea    -64(%rdx), %rdx
+    _CET_NOTRACK jmp *%r9
+L(shl_8_loop_L2):
+    prefetchnta 0x1c0(%rsi)
+L(shl_8_loop_L1):
+    sub    $64, %rdx
+    movaps    0x08(%rsi), %xmm2
+    movaps    0x18(%rsi), %xmm3
+    movaps    0x28(%rsi), %xmm4
+    movaps    0x38(%rsi), %xmm5
+    movdqa    %xmm5, %xmm6
+    palignr    $8, %xmm4, %xmm5
+    lea    64(%rsi), %rsi
+    palignr    $8, %xmm3, %xmm4
+    palignr    $8, %xmm2, %xmm3
+    lea    64(%rdi), %rdi
+    palignr    $8, %xmm1, %xmm2
+    movdqa    %xmm6, %xmm1
+    movdqa    %xmm2, -0x40(%rdi)
+    movaps    %xmm3, -0x30(%rdi)
+    jb    L(shl_8_end)
+    movaps    %xmm4, -0x20(%rdi)
+    movaps    %xmm5, -0x10(%rdi)
+    _CET_NOTRACK jmp *%r9
+    ud2
+    .p2align 4
+L(shl_8_end):
+    lea    64(%rdx), %rdx
+    movaps    %xmm4, -0x20(%rdi)
+    add    %rdx, %rsi
+    movaps    %xmm5, -0x10(%rdi)
+    add    %rdx, %rdi
+    movdqu    %xmm0, (%r8)
+    BRANCH_TO_JMPTBL_ENTRY(L(table_less_80bytes), %rdx, 4)
+
+    .p2align 4
+L(shl_8_bwd):
+    lea    (L(shl_8_bwd_loop_L1)-L(shl_8_bwd))(%r9), %r9
+    cmp    %rcx, %rdx
+    movaps    -0x08(%rsi), %xmm1
+    jb    L(L8_bwd)
+    lea    (L(shl_8_bwd_loop_L2)-L(shl_8_bwd_loop_L1))(%r9), %r9
+L(L8_bwd):
+    lea    -64(%rdx), %rdx
+    _CET_NOTRACK jmp *%r9
+    ud2
+L(shl_8_bwd_loop_L2):
+    prefetchnta -0x1c0(%rsi)
+L(shl_8_bwd_loop_L1):
+    movaps    -0x18(%rsi), %xmm2
+    sub    $0x40, %rdx
+    movaps    -0x28(%rsi), %xmm3
+    movaps    -0x38(%rsi), %xmm4
+    movaps    -0x48(%rsi), %xmm5
+    lea    -0x40(%rsi), %rsi
+    palignr    $8, %xmm2, %xmm1
+    palignr    $8, %xmm3, %xmm2
+    palignr    $8, %xmm4, %xmm3
+    palignr    $8, %xmm5, %xmm4
+
+    movaps    %xmm1, -0x10(%rdi)
+    movaps    %xmm5, %xmm1
+
+    movaps    %xmm2, -0x20(%rdi)
+    lea    -0x40(%rdi), %rdi
+
+    movaps    %xmm3, 0x10(%rdi)
+    jb    L(shl_8_bwd_end)
+    movaps    %xmm4, (%rdi)
+    _CET_NOTRACK jmp *%r9
+    ud2
+L(shl_8_bwd_end):
+    movaps    %xmm4, (%rdi)
+    lea    64(%rdx), %rdx
+    movdqu    %xmm0, (%r8)
+    BRANCH_TO_JMPTBL_ENTRY(L(table_less_80bytes), %rdx, 4)
+
+    .p2align 4
+L(shl_9):
+    lea    (L(shl_9_loop_L1)-L(shl_9))(%r9), %r9
+    cmp    %rcx, %rdx
+    movaps    -0x09(%rsi), %xmm1
+    jb    L(L9_fwd)
+    lea    (L(shl_9_loop_L2)-L(shl_9_loop_L1))(%r9), %r9
+L(L9_fwd):
+    lea    -64(%rdx), %rdx
+    _CET_NOTRACK jmp *%r9
+    ud2
+L(shl_9_loop_L2):
+    prefetchnta 0x1c0(%rsi)
+L(shl_9_loop_L1):
+    sub    $64, %rdx
+    movaps    0x07(%rsi), %xmm2
+    movaps    0x17(%rsi), %xmm3
+    movaps    0x27(%rsi), %xmm4
+    movaps    0x37(%rsi), %xmm5
+    movdqa    %xmm5, %xmm6
+    palignr    $9, %xmm4, %xmm5
+    lea    64(%rsi), %rsi
+    palignr    $9, %xmm3, %xmm4
+    palignr    $9, %xmm2, %xmm3
+    lea    64(%rdi), %rdi
+    palignr    $9, %xmm1, %xmm2
+    movdqa    %xmm6, %xmm1
+    movdqa    %xmm2, -0x40(%rdi)
+    movaps    %xmm3, -0x30(%rdi)
+    jb    L(shl_9_end)
+    movaps    %xmm4, -0x20(%rdi)
+    movaps    %xmm5, -0x10(%rdi)
+    _CET_NOTRACK jmp *%r9
+    ud2
+L(shl_9_end):
+    movaps    %xmm4, -0x20(%rdi)
+    lea    64(%rdx), %rdx
+    movaps    %xmm5, -0x10(%rdi)
+    add    %rdx, %rdi
+    movdqu    %xmm0, (%r8)
+    add    %rdx, %rsi
+    BRANCH_TO_JMPTBL_ENTRY(L(table_less_80bytes), %rdx, 4)
+
+    .p2align 4
+L(shl_9_bwd):
+    lea    (L(shl_9_bwd_loop_L1)-L(shl_9_bwd))(%r9), %r9
+    cmp    %rcx, %rdx
+    movaps    -0x09(%rsi), %xmm1
+    jb    L(L9_bwd)
+    lea    (L(shl_9_bwd_loop_L2)-L(shl_9_bwd_loop_L1))(%r9), %r9
+L(L9_bwd):
+    lea    -64(%rdx), %rdx
+    _CET_NOTRACK jmp *%r9
+    ud2
+L(shl_9_bwd_loop_L2):
+    prefetchnta -0x1c0(%rsi)
+L(shl_9_bwd_loop_L1):
+    movaps    -0x19(%rsi), %xmm2
+    sub    $0x40, %rdx
+    movaps    -0x29(%rsi), %xmm3
+    movaps    -0x39(%rsi), %xmm4
+    movaps    -0x49(%rsi), %xmm5
+    lea    -0x40(%rsi), %rsi
+    palignr    $9, %xmm2, %xmm1
+    palignr    $9, %xmm3, %xmm2
+    palignr    $9, %xmm4, %xmm3
+    palignr    $9, %xmm5, %xmm4
+
+    movaps    %xmm1, -0x10(%rdi)
+    movaps    %xmm5, %xmm1
+
+    movaps    %xmm2, -0x20(%rdi)
+    lea    -0x40(%rdi), %rdi
+
+    movaps    %xmm3, 0x10(%rdi)
+    jb    L(shl_9_bwd_end)
+    movaps    %xmm4, (%rdi)
+    _CET_NOTRACK jmp *%r9
+    ud2
+L(shl_9_bwd_end):
+    movaps    %xmm4, (%rdi)
+    lea    64(%rdx), %rdx
+    movdqu    %xmm0, (%r8)
+    BRANCH_TO_JMPTBL_ENTRY(L(table_less_80bytes), %rdx, 4)
+
+    .p2align 4
+L(shl_10):
+    lea    (L(shl_10_loop_L1)-L(shl_10))(%r9), %r9
+    cmp    %rcx, %rdx
+    movaps    -0x0a(%rsi), %xmm1
+    jb    L(L10_fwd)
+    lea    (L(shl_10_loop_L2)-L(shl_10_loop_L1))(%r9), %r9
+L(L10_fwd):
+    lea    -64(%rdx), %rdx
+    _CET_NOTRACK jmp *%r9
+    ud2
+L(shl_10_loop_L2):
+    prefetchnta 0x1c0(%rsi)
+L(shl_10_loop_L1):
+    sub    $64, %rdx
+    movaps    0x06(%rsi), %xmm2
+    movaps    0x16(%rsi), %xmm3
+    movaps    0x26(%rsi), %xmm4
+    movaps    0x36(%rsi), %xmm5
+    movdqa    %xmm5, %xmm6
+    palignr    $10, %xmm4, %xmm5
+    lea    64(%rsi), %rsi
+    palignr    $10, %xmm3, %xmm4
+    palignr    $10, %xmm2, %xmm3
+    lea    64(%rdi), %rdi
+    palignr    $10, %xmm1, %xmm2
+    movdqa    %xmm6, %xmm1
+    movdqa    %xmm2, -0x40(%rdi)
+    movaps    %xmm3, -0x30(%rdi)
+    jb    L(shl_10_end)
+    movaps    %xmm4, -0x20(%rdi)
+    movaps    %xmm5, -0x10(%rdi)
+    _CET_NOTRACK jmp *%r9
+    ud2
+L(shl_10_end):
+    movaps    %xmm4, -0x20(%rdi)
+    lea    64(%rdx), %rdx
+    movaps    %xmm5, -0x10(%rdi)
+    add    %rdx, %rdi
+    movdqu    %xmm0, (%r8)
+    add    %rdx, %rsi
+    BRANCH_TO_JMPTBL_ENTRY(L(table_less_80bytes), %rdx, 4)
+
+    .p2align 4
+L(shl_10_bwd):
+    lea    (L(shl_10_bwd_loop_L1)-L(shl_10_bwd))(%r9), %r9
+    cmp    %rcx, %rdx
+    movaps    -0x0a(%rsi), %xmm1
+    jb    L(L10_bwd)
+    lea    (L(shl_10_bwd_loop_L2)-L(shl_10_bwd_loop_L1))(%r9), %r9
+L(L10_bwd):
+    lea    -64(%rdx), %rdx
+    _CET_NOTRACK jmp *%r9
+    ud2
+L(shl_10_bwd_loop_L2):
+    prefetchnta -0x1c0(%rsi)
+L(shl_10_bwd_loop_L1):
+    movaps    -0x1a(%rsi), %xmm2
+    sub    $0x40, %rdx
+    movaps    -0x2a(%rsi), %xmm3
+    movaps    -0x3a(%rsi), %xmm4
+    movaps    -0x4a(%rsi), %xmm5
+    lea    -0x40(%rsi), %rsi
+    palignr    $10, %xmm2, %xmm1
+    palignr    $10, %xmm3, %xmm2
+    palignr    $10, %xmm4, %xmm3
+    palignr    $10, %xmm5, %xmm4
+
+    movaps    %xmm1, -0x10(%rdi)
+    movaps    %xmm5, %xmm1
+
+    movaps    %xmm2, -0x20(%rdi)
+    lea    -0x40(%rdi), %rdi
+
+    movaps    %xmm3, 0x10(%rdi)
+    jb    L(shl_10_bwd_end)
+    movaps    %xmm4, (%rdi)
+    _CET_NOTRACK jmp *%r9
+    ud2
+L(shl_10_bwd_end):
+    movaps    %xmm4, (%rdi)
+    lea    64(%rdx), %rdx
+    movdqu    %xmm0, (%r8)
+    BRANCH_TO_JMPTBL_ENTRY(L(table_less_80bytes), %rdx, 4)
+
+    .p2align 4
+L(shl_11):
+    lea    (L(shl_11_loop_L1)-L(shl_11))(%r9), %r9
+    cmp    %rcx, %rdx
+    movaps    -0x0b(%rsi), %xmm1
+    jb    L(L11_fwd)
+    lea    (L(shl_11_loop_L2)-L(shl_11_loop_L1))(%r9), %r9
+L(L11_fwd):
+    lea    -64(%rdx), %rdx
+    _CET_NOTRACK jmp *%r9
+    ud2
+L(shl_11_loop_L2):
+    prefetchnta 0x1c0(%rsi)
+L(shl_11_loop_L1):
+    sub    $64, %rdx
+    movaps    0x05(%rsi), %xmm2
+    movaps    0x15(%rsi), %xmm3
+    movaps    0x25(%rsi), %xmm4
+    movaps    0x35(%rsi), %xmm5
+    movdqa    %xmm5, %xmm6
+    palignr    $11, %xmm4, %xmm5
+    lea    64(%rsi), %rsi
+    palignr    $11, %xmm3, %xmm4
+    palignr    $11, %xmm2, %xmm3
+    lea    64(%rdi), %rdi
+    palignr    $11, %xmm1, %xmm2
+    movdqa    %xmm6, %xmm1
+    movdqa    %xmm2, -0x40(%rdi)
+    movaps    %xmm3, -0x30(%rdi)
+    jb    L(shl_11_end)
+    movaps    %xmm4, -0x20(%rdi)
+    movaps    %xmm5, -0x10(%rdi)
+    _CET_NOTRACK jmp *%r9
+    ud2
+L(shl_11_end):
+    movaps    %xmm4, -0x20(%rdi)
+    lea    64(%rdx), %rdx
+    movaps    %xmm5, -0x10(%rdi)
+    add    %rdx, %rdi
+    movdqu    %xmm0, (%r8)
+    add    %rdx, %rsi
+    BRANCH_TO_JMPTBL_ENTRY(L(table_less_80bytes), %rdx, 4)
+
+    .p2align 4
+L(shl_11_bwd):
+    lea    (L(shl_11_bwd_loop_L1)-L(shl_11_bwd))(%r9), %r9
+    cmp    %rcx, %rdx
+    movaps    -0x0b(%rsi), %xmm1
+    jb    L(L11_bwd)
+    lea    (L(shl_11_bwd_loop_L2)-L(shl_11_bwd_loop_L1))(%r9), %r9
+L(L11_bwd):
+    lea    -64(%rdx), %rdx
+    _CET_NOTRACK jmp *%r9
+    ud2
+L(shl_11_bwd_loop_L2):
+    prefetchnta -0x1c0(%rsi)
+L(shl_11_bwd_loop_L1):
+    movaps    -0x1b(%rsi), %xmm2
+    sub    $0x40, %rdx
+    movaps    -0x2b(%rsi), %xmm3
+    movaps    -0x3b(%rsi), %xmm4
+    movaps    -0x4b(%rsi), %xmm5
+    lea    -0x40(%rsi), %rsi
+    palignr    $11, %xmm2, %xmm1
+    palignr    $11, %xmm3, %xmm2
+    palignr    $11, %xmm4, %xmm3
+    palignr    $11, %xmm5, %xmm4
+
+    movaps    %xmm1, -0x10(%rdi)
+    movaps    %xmm5, %xmm1
+
+    movaps    %xmm2, -0x20(%rdi)
+    lea    -0x40(%rdi), %rdi
+
+    movaps    %xmm3, 0x10(%rdi)
+    jb    L(shl_11_bwd_end)
+    movaps    %xmm4, (%rdi)
+    _CET_NOTRACK jmp *%r9
+    ud2
+L(shl_11_bwd_end):
+    movaps    %xmm4, (%rdi)
+    lea    64(%rdx), %rdx
+    movdqu    %xmm0, (%r8)
+    BRANCH_TO_JMPTBL_ENTRY(L(table_less_80bytes), %rdx, 4)
+
+    .p2align 4
+L(shl_12):
+    lea    (L(shl_12_loop_L1)-L(shl_12))(%r9), %r9
+    cmp    %rcx, %rdx
+    movaps    -0x0c(%rsi), %xmm1
+    jb    L(L12_fwd)
+    lea    (L(shl_12_loop_L2)-L(shl_12_loop_L1))(%r9), %r9
+L(L12_fwd):
+    lea    -64(%rdx), %rdx
+    _CET_NOTRACK jmp *%r9
+    ud2
+L(shl_12_loop_L2):
+    prefetchnta 0x1c0(%rsi)
+L(shl_12_loop_L1):
+    sub    $64, %rdx
+    movaps    0x04(%rsi), %xmm2
+    movaps    0x14(%rsi), %xmm3
+    movaps    0x24(%rsi), %xmm4
+    movaps    0x34(%rsi), %xmm5
+    movdqa    %xmm5, %xmm6
+    palignr    $12, %xmm4, %xmm5
+    lea    64(%rsi), %rsi
+    palignr    $12, %xmm3, %xmm4
+    palignr    $12, %xmm2, %xmm3
+    lea    64(%rdi), %rdi
+    palignr    $12, %xmm1, %xmm2
+    movdqa    %xmm6, %xmm1
+    movdqa    %xmm2, -0x40(%rdi)
+    movaps    %xmm3, -0x30(%rdi)
+    jb    L(shl_12_end)
+    movaps    %xmm4, -0x20(%rdi)
+    movaps    %xmm5, -0x10(%rdi)
+    _CET_NOTRACK jmp *%r9
+    ud2
+L(shl_12_end):
+    movaps    %xmm4, -0x20(%rdi)
+    lea    64(%rdx), %rdx
+    movaps    %xmm5, -0x10(%rdi)
+    add    %rdx, %rdi
+    movdqu    %xmm0, (%r8)
+    add    %rdx, %rsi
+    BRANCH_TO_JMPTBL_ENTRY(L(table_less_80bytes), %rdx, 4)
+
+    .p2align 4
+L(shl_12_bwd):
+    lea    (L(shl_12_bwd_loop_L1)-L(shl_12_bwd))(%r9), %r9
+    cmp    %rcx, %rdx
+    movaps    -0x0c(%rsi), %xmm1
+    jb    L(L12_bwd)
+    lea    (L(shl_12_bwd_loop_L2)-L(shl_12_bwd_loop_L1))(%r9), %r9
+L(L12_bwd):
+    lea    -64(%rdx), %rdx
+    _CET_NOTRACK jmp *%r9
+    ud2
+L(shl_12_bwd_loop_L2):
+    prefetchnta -0x1c0(%rsi)
+L(shl_12_bwd_loop_L1):
+    movaps    -0x1c(%rsi), %xmm2
+    sub    $0x40, %rdx
+    movaps    -0x2c(%rsi), %xmm3
+    movaps    -0x3c(%rsi), %xmm4
+    movaps    -0x4c(%rsi), %xmm5
+    lea    -0x40(%rsi), %rsi
+    palignr    $12, %xmm2, %xmm1
+    palignr    $12, %xmm3, %xmm2
+    palignr    $12, %xmm4, %xmm3
+    palignr    $12, %xmm5, %xmm4
+
+    movaps    %xmm1, -0x10(%rdi)
+    movaps    %xmm5, %xmm1
+
+    movaps    %xmm2, -0x20(%rdi)
+    lea    -0x40(%rdi), %rdi
+
+    movaps    %xmm3, 0x10(%rdi)
+    jb    L(shl_12_bwd_end)
+    movaps    %xmm4, (%rdi)
+    _CET_NOTRACK jmp *%r9
+    ud2
+L(shl_12_bwd_end):
+    movaps    %xmm4, (%rdi)
+    lea    64(%rdx), %rdx
+    movdqu    %xmm0, (%r8)
+    BRANCH_TO_JMPTBL_ENTRY(L(table_less_80bytes), %rdx, 4)
+
+    .p2align 4
+L(shl_13):
+    lea    (L(shl_13_loop_L1)-L(shl_13))(%r9), %r9
+    cmp    %rcx, %rdx
+    movaps    -0x0d(%rsi), %xmm1
+    jb    L(L13_fwd)
+    lea    (L(shl_13_loop_L2)-L(shl_13_loop_L1))(%r9), %r9
+L(L13_fwd):
+    lea    -64(%rdx), %rdx
+    _CET_NOTRACK jmp *%r9
+    ud2
+L(shl_13_loop_L2):
+    prefetchnta 0x1c0(%rsi)
+L(shl_13_loop_L1):
+    sub    $64, %rdx
+    movaps    0x03(%rsi), %xmm2
+    movaps    0x13(%rsi), %xmm3
+    movaps    0x23(%rsi), %xmm4
+    movaps    0x33(%rsi), %xmm5
+    movdqa    %xmm5, %xmm6
+    palignr    $13, %xmm4, %xmm5
+    lea    64(%rsi), %rsi
+    palignr    $13, %xmm3, %xmm4
+    palignr    $13, %xmm2, %xmm3
+    lea    64(%rdi), %rdi
+    palignr    $13, %xmm1, %xmm2
+    movdqa    %xmm6, %xmm1
+    movdqa    %xmm2, -0x40(%rdi)
+    movaps    %xmm3, -0x30(%rdi)
+    jb    L(shl_13_end)
+    movaps    %xmm4, -0x20(%rdi)
+    movaps    %xmm5, -0x10(%rdi)
+    _CET_NOTRACK jmp *%r9
+    ud2
+L(shl_13_end):
+    movaps    %xmm4, -0x20(%rdi)
+    lea    64(%rdx), %rdx
+    movaps    %xmm5, -0x10(%rdi)
+    add    %rdx, %rdi
+    movdqu    %xmm0, (%r8)
+    add    %rdx, %rsi
+    BRANCH_TO_JMPTBL_ENTRY(L(table_less_80bytes), %rdx, 4)
+
+    .p2align 4
+L(shl_13_bwd):
+    lea    (L(shl_13_bwd_loop_L1)-L(shl_13_bwd))(%r9), %r9
+    cmp    %rcx, %rdx
+    movaps    -0x0d(%rsi), %xmm1
+    jb    L(L13_bwd)
+    lea    (L(shl_13_bwd_loop_L2)-L(shl_13_bwd_loop_L1))(%r9), %r9
+L(L13_bwd):
+    lea    -64(%rdx), %rdx
+    _CET_NOTRACK jmp *%r9
+    ud2
+L(shl_13_bwd_loop_L2):
+    prefetchnta -0x1c0(%rsi)
+L(shl_13_bwd_loop_L1):
+    movaps    -0x1d(%rsi), %xmm2
+    sub    $0x40, %rdx
+    movaps    -0x2d(%rsi), %xmm3
+    movaps    -0x3d(%rsi), %xmm4
+    movaps    -0x4d(%rsi), %xmm5
+    lea    -0x40(%rsi), %rsi
+    palignr    $13, %xmm2, %xmm1
+    palignr    $13, %xmm3, %xmm2
+    palignr    $13, %xmm4, %xmm3
+    palignr    $13, %xmm5, %xmm4
+
+    movaps    %xmm1, -0x10(%rdi)
+    movaps    %xmm5, %xmm1
+
+    movaps    %xmm2, -0x20(%rdi)
+    lea    -0x40(%rdi), %rdi
+
+    movaps    %xmm3, 0x10(%rdi)
+    jb    L(shl_13_bwd_end)
+    movaps    %xmm4, (%rdi)
+    _CET_NOTRACK jmp *%r9
+    ud2
+L(shl_13_bwd_end):
+    movaps    %xmm4, (%rdi)
+    lea    64(%rdx), %rdx
+    movdqu    %xmm0, (%r8)
+    BRANCH_TO_JMPTBL_ENTRY(L(table_less_80bytes), %rdx, 4)
+
+    .p2align 4
+L(shl_14):
+    lea    (L(shl_14_loop_L1)-L(shl_14))(%r9), %r9
+    cmp    %rcx, %rdx
+    movaps    -0x0e(%rsi), %xmm1
+    jb    L(L14_fwd)
+    lea    (L(shl_14_loop_L2)-L(shl_14_loop_L1))(%r9), %r9
+L(L14_fwd):
+    lea    -64(%rdx), %rdx
+    _CET_NOTRACK jmp *%r9
+    ud2
+L(shl_14_loop_L2):
+    prefetchnta 0x1c0(%rsi)
+L(shl_14_loop_L1):
+    sub    $64, %rdx
+    movaps    0x02(%rsi), %xmm2
+    movaps    0x12(%rsi), %xmm3
+    movaps    0x22(%rsi), %xmm4
+    movaps    0x32(%rsi), %xmm5
+    movdqa    %xmm5, %xmm6
+    palignr    $14, %xmm4, %xmm5
+    lea    64(%rsi), %rsi
+    palignr    $14, %xmm3, %xmm4
+    palignr    $14, %xmm2, %xmm3
+    lea    64(%rdi), %rdi
+    palignr    $14, %xmm1, %xmm2
+    movdqa    %xmm6, %xmm1
+    movdqa    %xmm2, -0x40(%rdi)
+    movaps    %xmm3, -0x30(%rdi)
+    jb    L(shl_14_end)
+    movaps    %xmm4, -0x20(%rdi)
+    movaps    %xmm5, -0x10(%rdi)
+    _CET_NOTRACK jmp *%r9
+    ud2
+L(shl_14_end):
+    movaps    %xmm4, -0x20(%rdi)
+    lea    64(%rdx), %rdx
+    movaps    %xmm5, -0x10(%rdi)
+    add    %rdx, %rdi
+    movdqu    %xmm0, (%r8)
+    add    %rdx, %rsi
+    BRANCH_TO_JMPTBL_ENTRY(L(table_less_80bytes), %rdx, 4)
+
+    .p2align 4
+L(shl_14_bwd):
+    lea    (L(shl_14_bwd_loop_L1)-L(shl_14_bwd))(%r9), %r9
+    cmp    %rcx, %rdx
+    movaps    -0x0e(%rsi), %xmm1
+    jb    L(L14_bwd)
+    lea    (L(shl_14_bwd_loop_L2)-L(shl_14_bwd_loop_L1))(%r9), %r9
+L(L14_bwd):
+    lea    -64(%rdx), %rdx
+    _CET_NOTRACK jmp *%r9
+    ud2
+L(shl_14_bwd_loop_L2):
+    prefetchnta -0x1c0(%rsi)
+L(shl_14_bwd_loop_L1):
+    movaps    -0x1e(%rsi), %xmm2
+    sub    $0x40, %rdx
+    movaps    -0x2e(%rsi), %xmm3
+    movaps    -0x3e(%rsi), %xmm4
+    movaps    -0x4e(%rsi), %xmm5
+    lea    -0x40(%rsi), %rsi
+    palignr    $14, %xmm2, %xmm1
+    palignr    $14, %xmm3, %xmm2
+    palignr    $14, %xmm4, %xmm3
+    palignr    $14, %xmm5, %xmm4
+
+    movaps    %xmm1, -0x10(%rdi)
+    movaps    %xmm5, %xmm1
+
+    movaps    %xmm2, -0x20(%rdi)
+    lea    -0x40(%rdi), %rdi
+
+    movaps    %xmm3, 0x10(%rdi)
+    jb    L(shl_14_bwd_end)
+    movaps    %xmm4, (%rdi)
+    _CET_NOTRACK jmp *%r9
+    ud2
+L(shl_14_bwd_end):
+    movaps    %xmm4, (%rdi)
+    lea    64(%rdx), %rdx
+    movdqu    %xmm0, (%r8)
+    BRANCH_TO_JMPTBL_ENTRY(L(table_less_80bytes), %rdx, 4)
+
+    .p2align 4
+L(shl_15):
+    lea    (L(shl_15_loop_L1)-L(shl_15))(%r9), %r9
+    cmp    %rcx, %rdx
+    movaps    -0x0f(%rsi), %xmm1
+    jb    L(L15_fwd)
+    lea    (L(shl_15_loop_L2)-L(shl_15_loop_L1))(%r9), %r9
+L(L15_fwd):
+    lea    -64(%rdx), %rdx
+    _CET_NOTRACK jmp *%r9
+    ud2
+L(shl_15_loop_L2):
+    prefetchnta 0x1c0(%rsi)
+L(shl_15_loop_L1):
+    sub    $64, %rdx
+    movaps    0x01(%rsi), %xmm2
+    movaps    0x11(%rsi), %xmm3
+    movaps    0x21(%rsi), %xmm4
+    movaps    0x31(%rsi), %xmm5
+    movdqa    %xmm5, %xmm6
+    palignr    $15, %xmm4, %xmm5
+    lea    64(%rsi), %rsi
+    palignr    $15, %xmm3, %xmm4
+    palignr    $15, %xmm2, %xmm3
+    lea    64(%rdi), %rdi
+    palignr    $15, %xmm1, %xmm2
+    movdqa    %xmm6, %xmm1
+    movdqa    %xmm2, -0x40(%rdi)
+    movaps    %xmm3, -0x30(%rdi)
+    jb    L(shl_15_end)
+    movaps    %xmm4, -0x20(%rdi)
+    movaps    %xmm5, -0x10(%rdi)
+    _CET_NOTRACK jmp *%r9
+    ud2
+L(shl_15_end):
+    movaps    %xmm4, -0x20(%rdi)
+    lea    64(%rdx), %rdx
+    movaps    %xmm5, -0x10(%rdi)
+    add    %rdx, %rdi
+    movdqu    %xmm0, (%r8)
+    add    %rdx, %rsi
+    BRANCH_TO_JMPTBL_ENTRY(L(table_less_80bytes), %rdx, 4)
+
+    .p2align 4
+L(shl_15_bwd):
+    lea    (L(shl_15_bwd_loop_L1)-L(shl_15_bwd))(%r9), %r9
+    cmp    %rcx, %rdx
+    movaps    -0x0f(%rsi), %xmm1
+    jb    L(L15_bwd)
+    lea    (L(shl_15_bwd_loop_L2)-L(shl_15_bwd_loop_L1))(%r9), %r9
+L(L15_bwd):
+    lea    -64(%rdx), %rdx
+    _CET_NOTRACK jmp *%r9
+    ud2
+L(shl_15_bwd_loop_L2):
+    prefetchnta -0x1c0(%rsi)
+L(shl_15_bwd_loop_L1):
+    movaps    -0x1f(%rsi), %xmm2
+    sub    $0x40, %rdx
+    movaps    -0x2f(%rsi), %xmm3
+    movaps    -0x3f(%rsi), %xmm4
+    movaps    -0x4f(%rsi), %xmm5
+    lea    -0x40(%rsi), %rsi
+    palignr    $15, %xmm2, %xmm1
+    palignr    $15, %xmm3, %xmm2
+    palignr    $15, %xmm4, %xmm3
+    palignr    $15, %xmm5, %xmm4
+
+    movaps    %xmm1, -0x10(%rdi)
+    movaps    %xmm5, %xmm1
+
+    movaps    %xmm2, -0x20(%rdi)
+    lea    -0x40(%rdi), %rdi
+
+    movaps    %xmm3, 0x10(%rdi)
+    jb    L(shl_15_bwd_end)
+    movaps    %xmm4, (%rdi)
+    _CET_NOTRACK jmp *%r9
+    ud2
+L(shl_15_bwd_end):
+    movaps    %xmm4, (%rdi)
+    lea    64(%rdx), %rdx
+    movdqu    %xmm0, (%r8)
+    BRANCH_TO_JMPTBL_ENTRY(L(table_less_80bytes), %rdx, 4)
+
+    .p2align 4
+L(write_72bytes):
+    movdqu    -72(%rsi), %xmm0
+    movdqu    -56(%rsi), %xmm1
+    mov    -40(%rsi), %r8
+    mov    -32(%rsi), %r9
+    mov    -24(%rsi), %r10
+    mov    -16(%rsi), %r11
+    mov    -8(%rsi), %rcx
+    movdqu     %xmm0, -72(%rdi)
+    movdqu     %xmm1, -56(%rdi)
+    mov     %r8, -40(%rdi)
+    mov     %r9, -32(%rdi)
+    mov     %r10, -24(%rdi)
+    mov     %r11, -16(%rdi)
+    mov     %rcx, -8(%rdi)
+    ret
+
+    .p2align 4
+L(write_64bytes):
+    movdqu    -64(%rsi), %xmm0
+    mov    -48(%rsi), %rcx
+    mov    -40(%rsi), %r8
+    mov    -32(%rsi), %r9
+    mov    -24(%rsi), %r10
+    mov    -16(%rsi), %r11
+    mov    -8(%rsi), %rdx
+    movdqu     %xmm0, -64(%rdi)
+    mov     %rcx, -48(%rdi)
+    mov     %r8, -40(%rdi)
+    mov     %r9, -32(%rdi)
+    mov     %r10, -24(%rdi)
+    mov     %r11, -16(%rdi)
+    mov     %rdx, -8(%rdi)
+    ret
+
+    .p2align 4
+L(write_56bytes):
+    movdqu    -56(%rsi), %xmm0
+    mov    -40(%rsi), %r8
+    mov    -32(%rsi), %r9
+    mov    -24(%rsi), %r10
+    mov    -16(%rsi), %r11
+    mov    -8(%rsi), %rcx
+    movdqu     %xmm0, -56(%rdi)
+    mov     %r8, -40(%rdi)
+    mov     %r9, -32(%rdi)
+    mov     %r10, -24(%rdi)
+    mov     %r11, -16(%rdi)
+    mov     %rcx, -8(%rdi)
+    ret
+
+    .p2align 4
+L(write_48bytes):
+    mov    -48(%rsi), %rcx
+    mov    -40(%rsi), %r8
+    mov    -32(%rsi), %r9
+    mov    -24(%rsi), %r10
+    mov    -16(%rsi), %r11
+    mov    -8(%rsi), %rdx
+    mov     %rcx, -48(%rdi)
+    mov     %r8, -40(%rdi)
+    mov     %r9, -32(%rdi)
+    mov     %r10, -24(%rdi)
+    mov     %r11, -16(%rdi)
+    mov     %rdx, -8(%rdi)
+    ret
+
+    .p2align 4
+L(write_40bytes):
+    mov    -40(%rsi), %r8
+    mov    -32(%rsi), %r9
+    mov    -24(%rsi), %r10
+    mov    -16(%rsi), %r11
+    mov    -8(%rsi), %rdx
+    mov     %r8, -40(%rdi)
+    mov     %r9, -32(%rdi)
+    mov     %r10, -24(%rdi)
+    mov     %r11, -16(%rdi)
+    mov     %rdx, -8(%rdi)
+    ret
+
+    .p2align 4
+L(write_32bytes):
+    mov    -32(%rsi), %r9
+    mov    -24(%rsi), %r10
+    mov    -16(%rsi), %r11
+    mov    -8(%rsi), %rdx
+    mov     %r9, -32(%rdi)
+    mov     %r10, -24(%rdi)
+    mov     %r11, -16(%rdi)
+    mov     %rdx, -8(%rdi)
+    ret
+
+    .p2align 4
+L(write_24bytes):
+    mov    -24(%rsi), %r10
+    mov    -16(%rsi), %r11
+    mov    -8(%rsi), %rdx
+    mov     %r10, -24(%rdi)
+    mov     %r11, -16(%rdi)
+    mov     %rdx, -8(%rdi)
+    ret
+
+    .p2align 4
+L(write_16bytes):
+    mov    -16(%rsi), %r11
+    mov    -8(%rsi), %rdx
+    mov     %r11, -16(%rdi)
+    mov     %rdx, -8(%rdi)
+    ret
+
+    .p2align 4
+L(write_8bytes):
+    mov    -8(%rsi), %rdx
+    mov     %rdx, -8(%rdi)
+L(write_0bytes):
+    ret
+
+    .p2align 4
+L(write_73bytes):
+    movdqu    -73(%rsi), %xmm0
+    movdqu    -57(%rsi), %xmm1
+    mov    -41(%rsi), %rcx
+    mov    -33(%rsi), %r9
+    mov    -25(%rsi), %r10
+    mov    -17(%rsi), %r11
+    mov    -9(%rsi), %r8
+    mov    -4(%rsi), %edx
+    movdqu     %xmm0, -73(%rdi)
+    movdqu     %xmm1, -57(%rdi)
+    mov     %rcx, -41(%rdi)
+    mov     %r9, -33(%rdi)
+    mov     %r10, -25(%rdi)
+    mov     %r11, -17(%rdi)
+    mov     %r8, -9(%rdi)
+    mov     %edx, -4(%rdi)
+    ret
+
+    .p2align 4
+L(write_65bytes):
+    movdqu    -65(%rsi), %xmm0
+    movdqu    -49(%rsi), %xmm1
+    mov    -33(%rsi), %r9
+    mov    -25(%rsi), %r10
+    mov    -17(%rsi), %r11
+    mov    -9(%rsi), %rcx
+    mov    -4(%rsi), %edx
+    movdqu     %xmm0, -65(%rdi)
+    movdqu     %xmm1, -49(%rdi)
+    mov     %r9, -33(%rdi)
+    mov     %r10, -25(%rdi)
+    mov     %r11, -17(%rdi)
+    mov     %rcx, -9(%rdi)
+    mov     %edx, -4(%rdi)
+    ret
+
+    .p2align 4
+L(write_57bytes):
+    movdqu    -57(%rsi), %xmm0
+    mov    -41(%rsi), %r8
+    mov    -33(%rsi), %r9
+    mov    -25(%rsi), %r10
+    mov    -17(%rsi), %r11
+    mov    -9(%rsi), %rcx
+    mov    -4(%rsi), %edx
+    movdqu     %xmm0, -57(%rdi)
+    mov     %r8, -41(%rdi)
+    mov     %r9, -33(%rdi)
+    mov     %r10, -25(%rdi)
+    mov     %r11, -17(%rdi)
+    mov     %rcx, -9(%rdi)
+    mov     %edx, -4(%rdi)
+    ret
+
+    .p2align 4
+L(write_49bytes):
+    movdqu    -49(%rsi), %xmm0
+    mov    -33(%rsi), %r9
+    mov    -25(%rsi), %r10
+    mov    -17(%rsi), %r11
+    mov    -9(%rsi), %rcx
+    mov    -4(%rsi), %edx
+    movdqu     %xmm0, -49(%rdi)
+    mov     %r9, -33(%rdi)
+    mov     %r10, -25(%rdi)
+    mov     %r11, -17(%rdi)
+    mov     %rcx, -9(%rdi)
+    mov     %edx, -4(%rdi)
+    ret
+
+    .p2align 4
+L(write_41bytes):
+    mov    -41(%rsi), %r8
+    mov    -33(%rsi), %r9
+    mov    -25(%rsi), %r10
+    mov    -17(%rsi), %r11
+    mov    -9(%rsi), %rcx
+    mov    -1(%rsi), %dl
+    mov     %r8, -41(%rdi)
+    mov     %r9, -33(%rdi)
+    mov     %r10, -25(%rdi)
+    mov     %r11, -17(%rdi)
+    mov     %rcx, -9(%rdi)
+    mov     %dl, -1(%rdi)
+    ret
+
+    .p2align 4
+L(write_33bytes):
+    mov    -33(%rsi), %r9
+    mov    -25(%rsi), %r10
+    mov    -17(%rsi), %r11
+    mov    -9(%rsi), %rcx
+    mov    -1(%rsi), %dl
+    mov     %r9, -33(%rdi)
+    mov     %r10, -25(%rdi)
+    mov     %r11, -17(%rdi)
+    mov     %rcx, -9(%rdi)
+    mov     %dl, -1(%rdi)
+    ret
+
+    .p2align 4
+L(write_25bytes):
+    mov    -25(%rsi), %r10
+    mov    -17(%rsi), %r11
+    mov    -9(%rsi), %rcx
+    mov    -1(%rsi), %dl
+    mov     %r10, -25(%rdi)
+    mov     %r11, -17(%rdi)
+    mov     %rcx, -9(%rdi)
+    mov     %dl, -1(%rdi)
+    ret
+
+    .p2align 4
+L(write_17bytes):
+    mov    -17(%rsi), %r11
+    mov    -9(%rsi), %rcx
+    mov    -4(%rsi), %edx
+    mov     %r11, -17(%rdi)
+    mov     %rcx, -9(%rdi)
+    mov     %edx, -4(%rdi)
+    ret
+
+    .p2align 4
+L(write_9bytes):
+    mov    -9(%rsi), %rcx
+    mov    -4(%rsi), %edx
+    mov     %rcx, -9(%rdi)
+    mov     %edx, -4(%rdi)
+    ret
+
+    .p2align 4
+L(write_1bytes):
+    mov    -1(%rsi), %dl
+    mov     %dl, -1(%rdi)
+    ret
+
+    .p2align 4
+L(write_74bytes):
+    movdqu    -74(%rsi), %xmm0
+    movdqu    -58(%rsi), %xmm1
+    mov    -42(%rsi), %r8
+    mov    -34(%rsi), %r9
+    mov    -26(%rsi), %r10
+    mov    -18(%rsi), %r11
+    mov    -10(%rsi), %rcx
+    mov    -4(%rsi), %edx
+    movdqu     %xmm0, -74(%rdi)
+    movdqu     %xmm1, -58(%rdi)
+    mov     %r8, -42(%rdi)
+    mov     %r9, -34(%rdi)
+    mov     %r10, -26(%rdi)
+    mov     %r11, -18(%rdi)
+    mov     %rcx, -10(%rdi)
+    mov     %edx, -4(%rdi)
+    ret
+
+    .p2align 4
+L(write_66bytes):
+    movdqu    -66(%rsi), %xmm0
+    movdqu    -50(%rsi), %xmm1
+    mov    -42(%rsi), %r8
+    mov    -34(%rsi), %r9
+    mov    -26(%rsi), %r10
+    mov    -18(%rsi), %r11
+    mov    -10(%rsi), %rcx
+    mov    -4(%rsi), %edx
+    movdqu     %xmm0, -66(%rdi)
+    movdqu     %xmm1, -50(%rdi)
+    mov     %r8, -42(%rdi)
+    mov     %r9, -34(%rdi)
+    mov     %r10, -26(%rdi)
+    mov     %r11, -18(%rdi)
+    mov     %rcx, -10(%rdi)
+    mov     %edx, -4(%rdi)
+    ret
+
+    .p2align 4
+L(write_58bytes):
+    movdqu    -58(%rsi), %xmm1
+    mov    -42(%rsi), %r8
+    mov    -34(%rsi), %r9
+    mov    -26(%rsi), %r10
+    mov    -18(%rsi), %r11
+    mov    -10(%rsi), %rcx
+    mov    -4(%rsi), %edx
+    movdqu     %xmm1, -58(%rdi)
+    mov     %r8, -42(%rdi)
+    mov     %r9, -34(%rdi)
+    mov     %r10, -26(%rdi)
+    mov     %r11, -18(%rdi)
+    mov     %rcx, -10(%rdi)
+    mov     %edx, -4(%rdi)
+    ret
+
+    .p2align 4
+L(write_50bytes):
+    movdqu    -50(%rsi), %xmm0
+    mov    -34(%rsi), %r9
+    mov    -26(%rsi), %r10
+    mov    -18(%rsi), %r11
+    mov    -10(%rsi), %rcx
+    mov    -4(%rsi), %edx
+    movdqu     %xmm0, -50(%rdi)
+    mov     %r9, -34(%rdi)
+    mov     %r10, -26(%rdi)
+    mov     %r11, -18(%rdi)
+    mov     %rcx, -10(%rdi)
+    mov     %edx, -4(%rdi)
+    ret
+
+    .p2align 4
+L(write_42bytes):
+    mov    -42(%rsi), %r8
+    mov    -34(%rsi), %r9
+    mov    -26(%rsi), %r10
+    mov    -18(%rsi), %r11
+    mov    -10(%rsi), %rcx
+    mov    -4(%rsi), %edx
+    mov     %r8, -42(%rdi)
+    mov     %r9, -34(%rdi)
+    mov     %r10, -26(%rdi)
+    mov     %r11, -18(%rdi)
+    mov     %rcx, -10(%rdi)
+    mov     %edx, -4(%rdi)
+    ret
+
+    .p2align 4
+L(write_34bytes):
+    mov    -34(%rsi), %r9
+    mov    -26(%rsi), %r10
+    mov    -18(%rsi), %r11
+    mov    -10(%rsi), %rcx
+    mov    -4(%rsi), %edx
+    mov     %r9, -34(%rdi)
+    mov     %r10, -26(%rdi)
+    mov     %r11, -18(%rdi)
+    mov     %rcx, -10(%rdi)
+    mov     %edx, -4(%rdi)
+    ret
+
+    .p2align 4
+L(write_26bytes):
+    mov    -26(%rsi), %r10
+    mov    -18(%rsi), %r11
+    mov    -10(%rsi), %rcx
+    mov    -4(%rsi), %edx
+    mov     %r10, -26(%rdi)
+    mov     %r11, -18(%rdi)
+    mov     %rcx, -10(%rdi)
+    mov     %edx, -4(%rdi)
+    ret
+
+    .p2align 4
+L(write_18bytes):
+    mov    -18(%rsi), %r11
+    mov    -10(%rsi), %rcx
+    mov    -4(%rsi), %edx
+    mov     %r11, -18(%rdi)
+    mov     %rcx, -10(%rdi)
+    mov     %edx, -4(%rdi)
+    ret
+
+    .p2align 4
+L(write_10bytes):
+    mov    -10(%rsi), %rcx
+    mov    -4(%rsi), %edx
+    mov     %rcx, -10(%rdi)
+    mov     %edx, -4(%rdi)
+    ret
+
+    .p2align 4
+L(write_2bytes):
+    mov    -2(%rsi), %dx
+    mov     %dx, -2(%rdi)
+    ret
+
+    .p2align 4
+L(write_75bytes):
+    movdqu    -75(%rsi), %xmm0
+    movdqu    -59(%rsi), %xmm1
+    mov    -43(%rsi), %r8
+    mov    -35(%rsi), %r9
+    mov    -27(%rsi), %r10
+    mov    -19(%rsi), %r11
+    mov    -11(%rsi), %rcx
+    mov    -4(%rsi), %edx
+    movdqu     %xmm0, -75(%rdi)
+    movdqu     %xmm1, -59(%rdi)
+    mov     %r8, -43(%rdi)
+    mov     %r9, -35(%rdi)
+    mov     %r10, -27(%rdi)
+    mov     %r11, -19(%rdi)
+    mov     %rcx, -11(%rdi)
+    mov     %edx, -4(%rdi)
+    ret
+
+    .p2align 4
+L(write_67bytes):
+    movdqu    -67(%rsi), %xmm0
+    movdqu    -59(%rsi), %xmm1
+    mov    -43(%rsi), %r8
+    mov    -35(%rsi), %r9
+    mov    -27(%rsi), %r10
+    mov    -19(%rsi), %r11
+    mov    -11(%rsi), %rcx
+    mov    -4(%rsi), %edx
+    movdqu     %xmm0, -67(%rdi)
+    movdqu     %xmm1, -59(%rdi)
+    mov     %r8, -43(%rdi)
+    mov     %r9, -35(%rdi)
+    mov     %r10, -27(%rdi)
+    mov     %r11, -19(%rdi)
+    mov     %rcx, -11(%rdi)
+    mov     %edx, -4(%rdi)
+    ret
+
+    .p2align 4
+L(write_59bytes):
+    movdqu    -59(%rsi), %xmm0
+    mov    -43(%rsi), %r8
+    mov    -35(%rsi), %r9
+    mov    -27(%rsi), %r10
+    mov    -19(%rsi), %r11
+    mov    -11(%rsi), %rcx
+    mov    -4(%rsi), %edx
+    movdqu     %xmm0, -59(%rdi)
+    mov     %r8, -43(%rdi)
+    mov     %r9, -35(%rdi)
+    mov     %r10, -27(%rdi)
+    mov     %r11, -19(%rdi)
+    mov     %rcx, -11(%rdi)
+    mov     %edx, -4(%rdi)
+    ret
+
+    .p2align 4
+L(write_51bytes):
+    movdqu    -51(%rsi), %xmm0
+    mov    -35(%rsi), %r9
+    mov    -27(%rsi), %r10
+    mov    -19(%rsi), %r11
+    mov    -11(%rsi), %rcx
+    mov    -4(%rsi), %edx
+    movdqu     %xmm0, -51(%rdi)
+    mov     %r9, -35(%rdi)
+    mov     %r10, -27(%rdi)
+    mov     %r11, -19(%rdi)
+    mov     %rcx, -11(%rdi)
+    mov     %edx, -4(%rdi)
+    ret
+
+    .p2align 4
+L(write_43bytes):
+    mov    -43(%rsi), %r8
+    mov    -35(%rsi), %r9
+    mov    -27(%rsi), %r10
+    mov    -19(%rsi), %r11
+    mov    -11(%rsi), %rcx
+    mov    -4(%rsi), %edx
+    mov     %r8, -43(%rdi)
+    mov     %r9, -35(%rdi)
+    mov     %r10, -27(%rdi)
+    mov     %r11, -19(%rdi)
+    mov     %rcx, -11(%rdi)
+    mov     %edx, -4(%rdi)
+    ret
+
+    .p2align 4
+L(write_35bytes):
+    mov    -35(%rsi), %r9
+    mov    -27(%rsi), %r10
+    mov    -19(%rsi), %r11
+    mov    -11(%rsi), %rcx
+    mov    -4(%rsi), %edx
+    mov     %r9, -35(%rdi)
+    mov     %r10, -27(%rdi)
+    mov     %r11, -19(%rdi)
+    mov     %rcx, -11(%rdi)
+    mov     %edx, -4(%rdi)
+    ret
+
+    .p2align 4
+L(write_27bytes):
+    mov    -27(%rsi), %r10
+    mov    -19(%rsi), %r11
+    mov    -11(%rsi), %rcx
+    mov    -4(%rsi), %edx
+    mov     %r10, -27(%rdi)
+    mov     %r11, -19(%rdi)
+    mov     %rcx, -11(%rdi)
+    mov     %edx, -4(%rdi)
+    ret
+
+    .p2align 4
+L(write_19bytes):
+    mov    -19(%rsi), %r11
+    mov    -11(%rsi), %rcx
+    mov    -4(%rsi), %edx
+    mov     %r11, -19(%rdi)
+    mov     %rcx, -11(%rdi)
+    mov     %edx, -4(%rdi)
+    ret
+
+    .p2align 4
+L(write_11bytes):
+    mov    -11(%rsi), %rcx
+    mov    -4(%rsi), %edx
+    mov     %rcx, -11(%rdi)
+    mov     %edx, -4(%rdi)
+    ret
+
+    .p2align 4
+L(write_3bytes):
+    mov    -3(%rsi), %dx
+    mov    -2(%rsi), %cx
+    mov     %dx, -3(%rdi)
+    mov     %cx, -2(%rdi)
+    ret
+
+    .p2align 4
+L(write_76bytes):
+    movdqu    -76(%rsi), %xmm0
+    movdqu    -60(%rsi), %xmm1
+    mov    -44(%rsi), %r8
+    mov    -36(%rsi), %r9
+    mov    -28(%rsi), %r10
+    mov    -20(%rsi), %r11
+    mov    -12(%rsi), %rcx
+    mov    -4(%rsi), %edx
+    movdqu     %xmm0, -76(%rdi)
+    movdqu     %xmm1, -60(%rdi)
+    mov     %r8, -44(%rdi)
+    mov     %r9, -36(%rdi)
+    mov     %r10, -28(%rdi)
+    mov     %r11, -20(%rdi)
+    mov     %rcx, -12(%rdi)
+    mov     %edx, -4(%rdi)
+    ret
+
+    .p2align 4
+L(write_68bytes):
+    movdqu    -68(%rsi), %xmm0
+    movdqu    -52(%rsi), %xmm1
+    mov    -36(%rsi), %r9
+    mov    -28(%rsi), %r10
+    mov    -20(%rsi), %r11
+    mov    -12(%rsi), %rcx
+    mov    -4(%rsi), %edx
+    movdqu     %xmm0, -68(%rdi)
+    movdqu     %xmm1, -52(%rdi)
+    mov     %r9, -36(%rdi)
+    mov     %r10, -28(%rdi)
+    mov     %r11, -20(%rdi)
+    mov     %rcx, -12(%rdi)
+    mov     %edx, -4(%rdi)
+    ret
+
+    .p2align 4
+L(write_60bytes):
+    movdqu    -60(%rsi), %xmm0
+    mov    -44(%rsi), %r8
+    mov    -36(%rsi), %r9
+    mov    -28(%rsi), %r10
+    mov    -20(%rsi), %r11
+    mov    -12(%rsi), %rcx
+    mov    -4(%rsi), %edx
+    movdqu     %xmm0, -60(%rdi)
+    mov     %r8, -44(%rdi)
+    mov     %r9, -36(%rdi)
+    mov     %r10, -28(%rdi)
+    mov     %r11, -20(%rdi)
+    mov     %rcx, -12(%rdi)
+    mov     %edx, -4(%rdi)
+    ret
+
+    .p2align 4
+L(write_52bytes):
+    movdqu    -52(%rsi), %xmm0
+    mov    -36(%rsi), %r9
+    mov    -28(%rsi), %r10
+    mov    -20(%rsi), %r11
+    mov    -12(%rsi), %rcx
+    mov    -4(%rsi), %edx
+    movdqu     %xmm0, -52(%rdi)
+    mov     %r9, -36(%rdi)
+    mov     %r10, -28(%rdi)
+    mov     %r11, -20(%rdi)
+    mov     %rcx, -12(%rdi)
+    mov     %edx, -4(%rdi)
+    ret
+
+    .p2align 4
+L(write_44bytes):
+    mov    -44(%rsi), %r8
+    mov    -36(%rsi), %r9
+    mov    -28(%rsi), %r10
+    mov    -20(%rsi), %r11
+    mov    -12(%rsi), %rcx
+    mov    -4(%rsi), %edx
+    mov     %r8, -44(%rdi)
+    mov     %r9, -36(%rdi)
+    mov     %r10, -28(%rdi)
+    mov     %r11, -20(%rdi)
+    mov     %rcx, -12(%rdi)
+    mov     %edx, -4(%rdi)
+    ret
+
+    .p2align 4
+L(write_36bytes):
+    mov    -36(%rsi), %r9
+    mov    -28(%rsi), %r10
+    mov    -20(%rsi), %r11
+    mov    -12(%rsi), %rcx
+    mov    -4(%rsi), %edx
+    mov     %r9, -36(%rdi)
+    mov     %r10, -28(%rdi)
+    mov     %r11, -20(%rdi)
+    mov     %rcx, -12(%rdi)
+    mov     %edx, -4(%rdi)
+    ret
+
+    .p2align 4
+L(write_28bytes):
+    mov    -28(%rsi), %r10
+    mov    -20(%rsi), %r11
+    mov    -12(%rsi), %rcx
+    mov    -4(%rsi), %edx
+    mov     %r10, -28(%rdi)
+    mov     %r11, -20(%rdi)
+    mov     %rcx, -12(%rdi)
+    mov     %edx, -4(%rdi)
+    ret
+
+    .p2align 4
+L(write_20bytes):
+    mov    -20(%rsi), %r11
+    mov    -12(%rsi), %rcx
+    mov    -4(%rsi), %edx
+    mov     %r11, -20(%rdi)
+    mov     %rcx, -12(%rdi)
+    mov     %edx, -4(%rdi)
+    ret
+
+    .p2align 4
+L(write_12bytes):
+    mov    -12(%rsi), %rcx
+    mov    -4(%rsi), %edx
+    mov     %rcx, -12(%rdi)
+    mov     %edx, -4(%rdi)
+    ret
+
+    .p2align 4
+L(write_4bytes):
+    mov    -4(%rsi), %edx
+    mov     %edx, -4(%rdi)
+    ret
+
+    .p2align 4
+L(write_77bytes):
+    movdqu    -77(%rsi), %xmm0
+    movdqu    -61(%rsi), %xmm1
+    mov    -45(%rsi), %r8
+    mov    -37(%rsi), %r9
+    mov    -29(%rsi), %r10
+    mov    -21(%rsi), %r11
+    mov    -13(%rsi), %rcx
+    mov    -8(%rsi), %rdx
+    movdqu     %xmm0, -77(%rdi)
+    movdqu     %xmm1, -61(%rdi)
+    mov     %r8, -45(%rdi)
+    mov     %r9, -37(%rdi)
+    mov     %r10, -29(%rdi)
+    mov     %r11, -21(%rdi)
+    mov     %rcx, -13(%rdi)
+    mov     %rdx, -8(%rdi)
+    ret
+
+    .p2align 4
+L(write_69bytes):
+    movdqu    -69(%rsi), %xmm0
+    movdqu    -53(%rsi), %xmm1
+    mov    -37(%rsi), %r9
+    mov    -29(%rsi), %r10
+    mov    -21(%rsi), %r11
+    mov    -13(%rsi), %rcx
+    mov    -8(%rsi), %rdx
+    movdqu     %xmm0, -69(%rdi)
+    movdqu     %xmm1, -53(%rdi)
+    mov     %r9, -37(%rdi)
+    mov     %r10, -29(%rdi)
+    mov     %r11, -21(%rdi)
+    mov     %rcx, -13(%rdi)
+    mov     %rdx, -8(%rdi)
+    ret
+
+    .p2align 4
+L(write_61bytes):
+    movdqu    -61(%rsi), %xmm0
+    mov    -45(%rsi), %r8
+    mov    -37(%rsi), %r9
+    mov    -29(%rsi), %r10
+    mov    -21(%rsi), %r11
+    mov    -13(%rsi), %rcx
+    mov    -8(%rsi), %rdx
+    movdqu     %xmm0, -61(%rdi)
+    mov     %r8, -45(%rdi)
+    mov     %r9, -37(%rdi)
+    mov     %r10, -29(%rdi)
+    mov     %r11, -21(%rdi)
+    mov     %rcx, -13(%rdi)
+    mov     %rdx, -8(%rdi)
+    ret
+
+    .p2align 4
+L(write_53bytes):
+    movdqu    -53(%rsi), %xmm0
+    mov    -45(%rsi), %r8
+    mov    -37(%rsi), %r9
+    mov    -29(%rsi), %r10
+    mov    -21(%rsi), %r11
+    mov    -13(%rsi), %rcx
+    mov    -8(%rsi), %rdx
+    movdqu     %xmm0, -53(%rdi)
+    mov     %r9, -37(%rdi)
+    mov     %r10, -29(%rdi)
+    mov     %r11, -21(%rdi)
+    mov     %rcx, -13(%rdi)
+    mov     %rdx, -8(%rdi)
+    ret
+
+    .p2align 4
+L(write_45bytes):
+    mov    -45(%rsi), %r8
+    mov    -37(%rsi), %r9
+    mov    -29(%rsi), %r10
+    mov    -21(%rsi), %r11
+    mov    -13(%rsi), %rcx
+    mov    -8(%rsi), %rdx
+    mov     %r8, -45(%rdi)
+    mov     %r9, -37(%rdi)
+    mov     %r10, -29(%rdi)
+    mov     %r11, -21(%rdi)
+    mov     %rcx, -13(%rdi)
+    mov     %rdx, -8(%rdi)
+    ret
+
+    .p2align 4
+L(write_37bytes):
+    mov    -37(%rsi), %r9
+    mov    -29(%rsi), %r10
+    mov    -21(%rsi), %r11
+    mov    -13(%rsi), %rcx
+    mov    -8(%rsi), %rdx
+    mov     %r9, -37(%rdi)
+    mov     %r10, -29(%rdi)
+    mov     %r11, -21(%rdi)
+    mov     %rcx, -13(%rdi)
+    mov     %rdx, -8(%rdi)
+    ret
+
+    .p2align 4
+L(write_29bytes):
+    mov    -29(%rsi), %r10
+    mov    -21(%rsi), %r11
+    mov    -13(%rsi), %rcx
+    mov    -8(%rsi), %rdx
+    mov     %r10, -29(%rdi)
+    mov     %r11, -21(%rdi)
+    mov     %rcx, -13(%rdi)
+    mov     %rdx, -8(%rdi)
+    ret
+
+    .p2align 4
+L(write_21bytes):
+    mov    -21(%rsi), %r11
+    mov    -13(%rsi), %rcx
+    mov    -8(%rsi), %rdx
+    mov     %r11, -21(%rdi)
+    mov     %rcx, -13(%rdi)
+    mov     %rdx, -8(%rdi)
+    ret
+
+    .p2align 4
+L(write_13bytes):
+    mov    -13(%rsi), %rcx
+    mov    -8(%rsi), %rdx
+    mov     %rcx, -13(%rdi)
+    mov     %rdx, -8(%rdi)
+    ret
+
+    .p2align 4
+L(write_5bytes):
+    mov    -5(%rsi), %edx
+    mov    -4(%rsi), %ecx
+    mov     %edx, -5(%rdi)
+    mov     %ecx, -4(%rdi)
+    ret
+
+    .p2align 4
+L(write_78bytes):
+    movdqu    -78(%rsi), %xmm0
+    movdqu    -62(%rsi), %xmm1
+    mov    -46(%rsi), %r8
+    mov    -38(%rsi), %r9
+    mov    -30(%rsi), %r10
+    mov    -22(%rsi), %r11
+    mov    -14(%rsi), %rcx
+    mov    -8(%rsi), %rdx
+    movdqu     %xmm0, -78(%rdi)
+    movdqu     %xmm1, -62(%rdi)
+    mov     %r8, -46(%rdi)
+    mov     %r9, -38(%rdi)
+    mov     %r10, -30(%rdi)
+    mov     %r11, -22(%rdi)
+    mov     %rcx, -14(%rdi)
+    mov     %rdx, -8(%rdi)
+    ret
+
+    .p2align 4
+L(write_70bytes):
+    movdqu    -70(%rsi), %xmm0
+    movdqu    -54(%rsi), %xmm1
+    mov    -38(%rsi), %r9
+    mov    -30(%rsi), %r10
+    mov    -22(%rsi), %r11
+    mov    -14(%rsi), %rcx
+    mov    -8(%rsi), %rdx
+    movdqu     %xmm0, -70(%rdi)
+    movdqu     %xmm1, -54(%rdi)
+    mov     %r9, -38(%rdi)
+    mov     %r10, -30(%rdi)
+    mov     %r11, -22(%rdi)
+    mov     %rcx, -14(%rdi)
+    mov     %rdx, -8(%rdi)
+    ret
+
+    .p2align 4
+L(write_62bytes):
+    movdqu    -62(%rsi), %xmm0
+    mov    -46(%rsi), %r8
+    mov    -38(%rsi), %r9
+    mov    -30(%rsi), %r10
+    mov    -22(%rsi), %r11
+    mov    -14(%rsi), %rcx
+    mov    -8(%rsi), %rdx
+    movdqu     %xmm0, -62(%rdi)
+    mov     %r8, -46(%rdi)
+    mov     %r9, -38(%rdi)
+    mov     %r10, -30(%rdi)
+    mov     %r11, -22(%rdi)
+    mov     %rcx, -14(%rdi)
+    mov     %rdx, -8(%rdi)
+    ret
+
+    .p2align 4
+L(write_54bytes):
+    movdqu    -54(%rsi), %xmm0
+    mov    -38(%rsi), %r9
+    mov    -30(%rsi), %r10
+    mov    -22(%rsi), %r11
+    mov    -14(%rsi), %rcx
+    mov    -8(%rsi), %rdx
+    movdqu     %xmm0, -54(%rdi)
+    mov     %r9, -38(%rdi)
+    mov     %r10, -30(%rdi)
+    mov     %r11, -22(%rdi)
+    mov     %rcx, -14(%rdi)
+    mov     %rdx, -8(%rdi)
+    ret
+
+    .p2align 4
+L(write_46bytes):
+    mov    -46(%rsi), %r8
+    mov    -38(%rsi), %r9
+    mov    -30(%rsi), %r10
+    mov    -22(%rsi), %r11
+    mov    -14(%rsi), %rcx
+    mov    -8(%rsi), %rdx
+    mov     %r8, -46(%rdi)
+    mov     %r9, -38(%rdi)
+    mov     %r10, -30(%rdi)
+    mov     %r11, -22(%rdi)
+    mov     %rcx, -14(%rdi)
+    mov     %rdx, -8(%rdi)
+    ret
+
+    .p2align 4
+L(write_38bytes):
+    mov    -38(%rsi), %r9
+    mov    -30(%rsi), %r10
+    mov    -22(%rsi), %r11
+    mov    -14(%rsi), %rcx
+    mov    -8(%rsi), %rdx
+    mov     %r9, -38(%rdi)
+    mov     %r10, -30(%rdi)
+    mov     %r11, -22(%rdi)
+    mov     %rcx, -14(%rdi)
+    mov     %rdx, -8(%rdi)
+    ret
+
+    .p2align 4
+L(write_30bytes):
+    mov    -30(%rsi), %r10
+    mov    -22(%rsi), %r11
+    mov    -14(%rsi), %rcx
+    mov    -8(%rsi), %rdx
+    mov     %r10, -30(%rdi)
+    mov     %r11, -22(%rdi)
+    mov     %rcx, -14(%rdi)
+    mov     %rdx, -8(%rdi)
+    ret
+
+    .p2align 4
+L(write_22bytes):
+    mov    -22(%rsi), %r11
+    mov    -14(%rsi), %rcx
+    mov    -8(%rsi), %rdx
+    mov     %r11, -22(%rdi)
+    mov     %rcx, -14(%rdi)
+    mov     %rdx, -8(%rdi)
+    ret
+
+    .p2align 4
+L(write_14bytes):
+    mov    -14(%rsi), %rcx
+    mov    -8(%rsi), %rdx
+    mov     %rcx, -14(%rdi)
+    mov     %rdx, -8(%rdi)
+    ret
+
+    .p2align 4
+L(write_6bytes):
+    mov    -6(%rsi), %edx
+    mov    -4(%rsi), %ecx
+    mov     %edx, -6(%rdi)
+    mov     %ecx, -4(%rdi)
+    ret
+
+    .p2align 4
+L(write_79bytes):
+    movdqu    -79(%rsi), %xmm0
+    movdqu    -63(%rsi), %xmm1
+    mov    -47(%rsi), %r8
+    mov    -39(%rsi), %r9
+    mov    -31(%rsi), %r10
+    mov    -23(%rsi), %r11
+    mov    -15(%rsi), %rcx
+    mov    -8(%rsi), %rdx
+    movdqu     %xmm0, -79(%rdi)
+    movdqu     %xmm1, -63(%rdi)
+    mov     %r8, -47(%rdi)
+    mov     %r9, -39(%rdi)
+    mov     %r10, -31(%rdi)
+    mov     %r11, -23(%rdi)
+    mov     %rcx, -15(%rdi)
+    mov     %rdx, -8(%rdi)
+    ret
+
+    .p2align 4
+L(write_71bytes):
+    movdqu    -71(%rsi), %xmm0
+    movdqu    -55(%rsi), %xmm1
+    mov    -39(%rsi), %r9
+    mov    -31(%rsi), %r10
+    mov    -23(%rsi), %r11
+    mov    -15(%rsi), %rcx
+    mov    -8(%rsi), %rdx
+    movdqu     %xmm0, -71(%rdi)
+    movdqu     %xmm1, -55(%rdi)
+    mov     %r9, -39(%rdi)
+    mov     %r10, -31(%rdi)
+    mov     %r11, -23(%rdi)
+    mov     %rcx, -15(%rdi)
+    mov     %rdx, -8(%rdi)
+    ret
+
+    .p2align 4
+L(write_63bytes):
+    movdqu    -63(%rsi), %xmm0
+    mov    -47(%rsi), %r8
+    mov    -39(%rsi), %r9
+    mov    -31(%rsi), %r10
+    mov    -23(%rsi), %r11
+    mov    -15(%rsi), %rcx
+    mov    -8(%rsi), %rdx
+    movdqu     %xmm0, -63(%rdi)
+    mov     %r8, -47(%rdi)
+    mov     %r9, -39(%rdi)
+    mov     %r10, -31(%rdi)
+    mov     %r11, -23(%rdi)
+    mov     %rcx, -15(%rdi)
+    mov     %rdx, -8(%rdi)
+    ret
+
+    .p2align 4
+L(write_55bytes):
+    movdqu    -55(%rsi), %xmm0
+    mov    -39(%rsi), %r9
+    mov    -31(%rsi), %r10
+    mov    -23(%rsi), %r11
+    mov    -15(%rsi), %rcx
+    mov    -8(%rsi), %rdx
+    movdqu     %xmm0, -55(%rdi)
+    mov     %r9, -39(%rdi)
+    mov     %r10, -31(%rdi)
+    mov     %r11, -23(%rdi)
+    mov     %rcx, -15(%rdi)
+    mov     %rdx, -8(%rdi)
+    ret
+
+    .p2align 4
+L(write_47bytes):
+    mov    -47(%rsi), %r8
+    mov    -39(%rsi), %r9
+    mov    -31(%rsi), %r10
+    mov    -23(%rsi), %r11
+    mov    -15(%rsi), %rcx
+    mov    -8(%rsi), %rdx
+    mov     %r8, -47(%rdi)
+    mov     %r9, -39(%rdi)
+    mov     %r10, -31(%rdi)
+    mov     %r11, -23(%rdi)
+    mov     %rcx, -15(%rdi)
+    mov     %rdx, -8(%rdi)
+    ret
+
+    .p2align 4
+L(write_39bytes):
+    mov    -39(%rsi), %r9
+    mov    -31(%rsi), %r10
+    mov    -23(%rsi), %r11
+    mov    -15(%rsi), %rcx
+    mov    -8(%rsi), %rdx
+    mov     %r9, -39(%rdi)
+    mov     %r10, -31(%rdi)
+    mov     %r11, -23(%rdi)
+    mov     %rcx, -15(%rdi)
+    mov     %rdx, -8(%rdi)
+    ret
+
+    .p2align 4
+L(write_31bytes):
+    mov    -31(%rsi), %r10
+    mov    -23(%rsi), %r11
+    mov    -15(%rsi), %rcx
+    mov    -8(%rsi), %rdx
+    mov     %r10, -31(%rdi)
+    mov     %r11, -23(%rdi)
+    mov     %rcx, -15(%rdi)
+    mov     %rdx, -8(%rdi)
+    ret
+
+    .p2align 4
+L(write_23bytes):
+    mov    -23(%rsi), %r11
+    mov    -15(%rsi), %rcx
+    mov    -8(%rsi), %rdx
+    mov     %r11, -23(%rdi)
+    mov     %rcx, -15(%rdi)
+    mov     %rdx, -8(%rdi)
+    ret
+
+    .p2align 4
+L(write_15bytes):
+    mov    -15(%rsi), %rcx
+    mov    -8(%rsi), %rdx
+    mov     %rcx, -15(%rdi)
+    mov     %rdx, -8(%rdi)
+    ret
+
+    .p2align 4
+L(write_7bytes):
+    mov    -7(%rsi), %edx
+    mov    -4(%rsi), %ecx
+    mov     %edx, -7(%rdi)
+    mov     %ecx, -4(%rdi)
+    ret
+
+    .p2align 4
+L(large_page_fwd):
+    movdqu    (%rsi), %xmm1
+    lea    16(%rsi), %rsi
+    movdqu    %xmm0, (%r8)
+    movntdq    %xmm1, (%rdi)
+    lea    16(%rdi), %rdi
+    lea    -0x90(%rdx), %rdx
+#ifdef USE_AS_MEMMOVE
+    mov    %rsi, %r9
+    sub    %rdi, %r9
+    cmp    %rdx, %r9
+    jae    L(memmove_is_memcpy_fwd)
+    shl    $2, %rcx
+    cmp    %rcx, %rdx
+    jb    L(ll_cache_copy_fwd_start)
+L(memmove_is_memcpy_fwd):
+#endif
+L(large_page_loop):
+    movdqu    (%rsi), %xmm0
+    movdqu    0x10(%rsi), %xmm1
+    movdqu    0x20(%rsi), %xmm2
+    movdqu    0x30(%rsi), %xmm3
+    movdqu    0x40(%rsi), %xmm4
+    movdqu    0x50(%rsi), %xmm5
+    movdqu    0x60(%rsi), %xmm6
+    movdqu    0x70(%rsi), %xmm7
+    lea    0x80(%rsi), %rsi
+
+    sub    $0x80, %rdx
+    movntdq    %xmm0, (%rdi)
+    movntdq    %xmm1, 0x10(%rdi)
+    movntdq    %xmm2, 0x20(%rdi)
+    movntdq    %xmm3, 0x30(%rdi)
+    movntdq    %xmm4, 0x40(%rdi)
+    movntdq    %xmm5, 0x50(%rdi)
+    movntdq    %xmm6, 0x60(%rdi)
+    movntdq    %xmm7, 0x70(%rdi)
+    lea    0x80(%rdi), %rdi
+    jae    L(large_page_loop)
+    cmp    $-0x40, %rdx
+    lea    0x80(%rdx), %rdx
+    jl    L(large_page_less_64bytes)
+
+    movdqu    (%rsi), %xmm0
+    movdqu    0x10(%rsi), %xmm1
+    movdqu    0x20(%rsi), %xmm2
+    movdqu    0x30(%rsi), %xmm3
+    lea    0x40(%rsi), %rsi
+
+    movntdq    %xmm0, (%rdi)
+    movntdq    %xmm1, 0x10(%rdi)
+    movntdq    %xmm2, 0x20(%rdi)
+    movntdq    %xmm3, 0x30(%rdi)
+    lea    0x40(%rdi), %rdi
+    sub    $0x40, %rdx
+L(large_page_less_64bytes):
+    add    %rdx, %rsi
+    add    %rdx, %rdi
+    sfence
+    BRANCH_TO_JMPTBL_ENTRY (L(table_less_80bytes), %rdx, 4)
+
+#ifdef USE_AS_MEMMOVE
+    .p2align 4
+L(ll_cache_copy_fwd_start):
+    prefetcht0 0x1c0(%rsi)
+    prefetcht0 0x200(%rsi)
+    movdqu    (%rsi), %xmm0
+    movdqu    0x10(%rsi), %xmm1
+    movdqu    0x20(%rsi), %xmm2
+    movdqu    0x30(%rsi), %xmm3
+    movdqu    0x40(%rsi), %xmm4
+    movdqu    0x50(%rsi), %xmm5
+    movdqu    0x60(%rsi), %xmm6
+    movdqu    0x70(%rsi), %xmm7
+    lea    0x80(%rsi), %rsi
+
+    sub    $0x80, %rdx
+    movaps    %xmm0, (%rdi)
+    movaps    %xmm1, 0x10(%rdi)
+    movaps    %xmm2, 0x20(%rdi)
+    movaps    %xmm3, 0x30(%rdi)
+    movaps    %xmm4, 0x40(%rdi)
+    movaps    %xmm5, 0x50(%rdi)
+    movaps    %xmm6, 0x60(%rdi)
+    movaps    %xmm7, 0x70(%rdi)
+    lea    0x80(%rdi), %rdi
+    jae    L(ll_cache_copy_fwd_start)
+    cmp    $-0x40, %rdx
+    lea    0x80(%rdx), %rdx
+    jl    L(large_page_ll_less_fwd_64bytes)
+
+    movdqu    (%rsi), %xmm0
+    movdqu    0x10(%rsi), %xmm1
+    movdqu    0x20(%rsi), %xmm2
+    movdqu    0x30(%rsi), %xmm3
+    lea    0x40(%rsi), %rsi
+
+    movaps    %xmm0, (%rdi)
+    movaps    %xmm1, 0x10(%rdi)
+    movaps    %xmm2, 0x20(%rdi)
+    movaps    %xmm3, 0x30(%rdi)
+    lea    0x40(%rdi), %rdi
+    sub    $0x40, %rdx
+L(large_page_ll_less_fwd_64bytes):
+    add    %rdx, %rsi
+    add    %rdx, %rdi
+    BRANCH_TO_JMPTBL_ENTRY (L(table_less_80bytes), %rdx, 4)
+
+#endif
+    .p2align 4
+L(large_page_bwd):
+    movdqu    -0x10(%rsi), %xmm1
+    lea    -16(%rsi), %rsi
+    movdqu    %xmm0, (%r8)
+    movdqa    %xmm1, -0x10(%rdi)
+    lea    -16(%rdi), %rdi
+    lea    -0x90(%rdx), %rdx
+#ifdef USE_AS_MEMMOVE
+    mov    %rdi, %r9
+    sub    %rsi, %r9
+    cmp    %rdx, %r9
+    jae    L(memmove_is_memcpy_bwd)
+    cmp    %rcx, %r9
+    jb    L(ll_cache_copy_bwd_start)
+L(memmove_is_memcpy_bwd):
+#endif
+L(large_page_bwd_loop):
+    movdqu    -0x10(%rsi), %xmm0
+    movdqu    -0x20(%rsi), %xmm1
+    movdqu    -0x30(%rsi), %xmm2
+    movdqu    -0x40(%rsi), %xmm3
+    movdqu    -0x50(%rsi), %xmm4
+    movdqu    -0x60(%rsi), %xmm5
+    movdqu    -0x70(%rsi), %xmm6
+    movdqu    -0x80(%rsi), %xmm7
+    lea    -0x80(%rsi), %rsi
+
+    sub    $0x80, %rdx
+    movntdq    %xmm0, -0x10(%rdi)
+    movntdq    %xmm1, -0x20(%rdi)
+    movntdq    %xmm2, -0x30(%rdi)
+    movntdq    %xmm3, -0x40(%rdi)
+    movntdq    %xmm4, -0x50(%rdi)
+    movntdq    %xmm5, -0x60(%rdi)
+    movntdq    %xmm6, -0x70(%rdi)
+    movntdq    %xmm7, -0x80(%rdi)
+    lea    -0x80(%rdi), %rdi
+    jae    L(large_page_bwd_loop)
+    cmp    $-0x40, %rdx
+    lea    0x80(%rdx), %rdx
+    jl    L(large_page_less_bwd_64bytes)
+
+    movdqu    -0x10(%rsi), %xmm0
+    movdqu    -0x20(%rsi), %xmm1
+    movdqu    -0x30(%rsi), %xmm2
+    movdqu    -0x40(%rsi), %xmm3
+    lea    -0x40(%rsi), %rsi
+
+    movntdq    %xmm0, -0x10(%rdi)
+    movntdq    %xmm1, -0x20(%rdi)
+    movntdq    %xmm2, -0x30(%rdi)
+    movntdq    %xmm3, -0x40(%rdi)
+    lea    -0x40(%rdi), %rdi
+    sub    $0x40, %rdx
+L(large_page_less_bwd_64bytes):
+    sfence
+    BRANCH_TO_JMPTBL_ENTRY (L(table_less_80bytes), %rdx, 4)
+
+#ifdef USE_AS_MEMMOVE
+    .p2align 4
+L(ll_cache_copy_bwd_start):
+    prefetcht0 -0x1c0(%rsi)
+    prefetcht0 -0x200(%rsi)
+    movdqu    -0x10(%rsi), %xmm0
+    movdqu    -0x20(%rsi), %xmm1
+    movdqu    -0x30(%rsi), %xmm2
+    movdqu    -0x40(%rsi), %xmm3
+    movdqu    -0x50(%rsi), %xmm4
+    movdqu    -0x60(%rsi), %xmm5
+    movdqu    -0x70(%rsi), %xmm6
+    movdqu    -0x80(%rsi), %xmm7
+    lea    -0x80(%rsi), %rsi
+
+    sub    $0x80, %rdx
+    movaps    %xmm0, -0x10(%rdi)
+    movaps    %xmm1, -0x20(%rdi)
+    movaps    %xmm2, -0x30(%rdi)
+    movaps    %xmm3, -0x40(%rdi)
+    movaps    %xmm4, -0x50(%rdi)
+    movaps    %xmm5, -0x60(%rdi)
+    movaps    %xmm6, -0x70(%rdi)
+    movaps    %xmm7, -0x80(%rdi)
+    lea    -0x80(%rdi), %rdi
+    jae    L(ll_cache_copy_bwd_start)
+    cmp    $-0x40, %rdx
+    lea    0x80(%rdx), %rdx
+    jl    L(large_page_ll_less_bwd_64bytes)
+
+    movdqu    -0x10(%rsi), %xmm0
+    movdqu    -0x20(%rsi), %xmm1
+    movdqu    -0x30(%rsi), %xmm2
+    movdqu    -0x40(%rsi), %xmm3
+    lea    -0x40(%rsi), %rsi
+
+    movaps    %xmm0, -0x10(%rdi)
+    movaps    %xmm1, -0x20(%rdi)
+    movaps    %xmm2, -0x30(%rdi)
+    movaps    %xmm3, -0x40(%rdi)
+    lea    -0x40(%rdi), %rdi
+    sub    $0x40, %rdx
+L(large_page_ll_less_bwd_64bytes):
+    BRANCH_TO_JMPTBL_ENTRY (L(table_less_80bytes), %rdx, 4)
+#endif
+
+END (MEMCPY)
+
+    .section .rodata.ssse3,"a",@progbits
+    .p2align 3
+L(table_less_80bytes):
+    .int    JMPTBL (L(write_0bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_1bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_2bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_3bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_4bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_5bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_6bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_7bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_8bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_9bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_10bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_11bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_12bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_13bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_14bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_15bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_16bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_17bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_18bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_19bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_20bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_21bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_22bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_23bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_24bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_25bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_26bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_27bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_28bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_29bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_30bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_31bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_32bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_33bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_34bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_35bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_36bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_37bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_38bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_39bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_40bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_41bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_42bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_43bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_44bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_45bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_46bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_47bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_48bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_49bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_50bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_51bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_52bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_53bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_54bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_55bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_56bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_57bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_58bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_59bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_60bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_61bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_62bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_63bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_64bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_65bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_66bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_67bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_68bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_69bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_70bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_71bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_72bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_73bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_74bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_75bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_76bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_77bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_78bytes), L(table_less_80bytes))
+    .int    JMPTBL (L(write_79bytes), L(table_less_80bytes))
+
+    .p2align 3
+L(shl_table):
+    .int    JMPTBL (L(shl_0), L(shl_table))
+    .int    JMPTBL (L(shl_1), L(shl_table))
+    .int    JMPTBL (L(shl_2), L(shl_table))
+    .int    JMPTBL (L(shl_3), L(shl_table))
+    .int    JMPTBL (L(shl_4), L(shl_table))
+    .int    JMPTBL (L(shl_5), L(shl_table))
+    .int    JMPTBL (L(shl_6), L(shl_table))
+    .int    JMPTBL (L(shl_7), L(shl_table))
+    .int    JMPTBL (L(shl_8), L(shl_table))
+    .int    JMPTBL (L(shl_9), L(shl_table))
+    .int    JMPTBL (L(shl_10), L(shl_table))
+    .int    JMPTBL (L(shl_11), L(shl_table))
+    .int    JMPTBL (L(shl_12), L(shl_table))
+    .int    JMPTBL (L(shl_13), L(shl_table))
+    .int    JMPTBL (L(shl_14), L(shl_table))
+    .int    JMPTBL (L(shl_15), L(shl_table))
+
+    .p2align 3
+L(shl_table_bwd):
+    .int    JMPTBL (L(shl_0_bwd), L(shl_table_bwd))
+    .int    JMPTBL (L(shl_1_bwd), L(shl_table_bwd))
+    .int    JMPTBL (L(shl_2_bwd), L(shl_table_bwd))
+    .int    JMPTBL (L(shl_3_bwd), L(shl_table_bwd))
+    .int    JMPTBL (L(shl_4_bwd), L(shl_table_bwd))
+    .int    JMPTBL (L(shl_5_bwd), L(shl_table_bwd))
+    .int    JMPTBL (L(shl_6_bwd), L(shl_table_bwd))
+    .int    JMPTBL (L(shl_7_bwd), L(shl_table_bwd))
+    .int    JMPTBL (L(shl_8_bwd), L(shl_table_bwd))
+    .int    JMPTBL (L(shl_9_bwd), L(shl_table_bwd))
+    .int    JMPTBL (L(shl_10_bwd), L(shl_table_bwd))
+    .int    JMPTBL (L(shl_11_bwd), L(shl_table_bwd))
+    .int    JMPTBL (L(shl_12_bwd), L(shl_table_bwd))
+    .int    JMPTBL (L(shl_13_bwd), L(shl_table_bwd))
+    .int    JMPTBL (L(shl_14_bwd), L(shl_table_bwd))
+    .int    JMPTBL (L(shl_15_bwd), L(shl_table_bwd))
+
+#endif
diff --git a/utils/memcpy-bench/glibc/memmove-avx-unaligned-erms.S b/utils/memcpy-bench/glibc/memmove-avx-unaligned-erms.S
new file mode 100644
index 00000000000..2de73b29a85
--- /dev/null
+++ b/utils/memcpy-bench/glibc/memmove-avx-unaligned-erms.S
@@ -0,0 +1,12 @@
+#if 1
+# define VEC_SIZE    32
+# define VEC(i)        ymm##i
+# define VMOVNT        vmovntdq
+# define VMOVU        vmovdqu
+# define VMOVA        vmovdqa
+
+# define SECTION(p)        p##.avx
+# define MEMMOVE_SYMBOL(p,s)    p##_avx_##s
+
+# include "memmove-vec-unaligned-erms.S"
+#endif
diff --git a/utils/memcpy-bench/glibc/memmove-avx512-no-vzeroupper.S b/utils/memcpy-bench/glibc/memmove-avx512-no-vzeroupper.S
new file mode 100644
index 00000000000..3effa845274
--- /dev/null
+++ b/utils/memcpy-bench/glibc/memmove-avx512-no-vzeroupper.S
@@ -0,0 +1,419 @@
+/* memmove/memcpy/mempcpy optimized with AVX512 for KNL hardware.
+   Copyright (C) 2016-2020 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <https://www.gnu.org/licenses/>.  */
+
+#include "sysdep.h"
+
+#if 1
+
+# include "asm-syntax.h"
+
+    .section .text.avx512,"ax",@progbits
+ENTRY (__mempcpy_chk_avx512_no_vzeroupper)
+    cmp    %RDX_LP, %RCX_LP
+    jb    HIDDEN_JUMPTARGET (__chk_fail)
+END (__mempcpy_chk_avx512_no_vzeroupper)
+
+ENTRY (__mempcpy_avx512_no_vzeroupper)
+    mov    %RDI_LP, %RAX_LP
+    add    %RDX_LP, %RAX_LP
+    jmp    L(start)
+END (__mempcpy_avx512_no_vzeroupper)
+
+ENTRY (__memmove_chk_avx512_no_vzeroupper)
+    cmp    %RDX_LP, %RCX_LP
+    jb    HIDDEN_JUMPTARGET (__chk_fail)
+END (__memmove_chk_avx512_no_vzeroupper)
+
+ENTRY (__memmove_avx512_no_vzeroupper)
+    mov    %RDI_LP, %RAX_LP
+# ifdef USE_AS_MEMPCPY
+    add    %RDX_LP, %RAX_LP
+# endif
+L(start):
+# ifdef __ILP32__
+    /* Clear the upper 32 bits.  */
+    mov    %edx, %edx
+# endif
+    lea    (%rsi, %rdx), %rcx
+    lea    (%rdi, %rdx), %r9
+    cmp    $512, %rdx
+    ja    L(512bytesormore)
+
+L(check):
+    cmp    $16, %rdx
+    jbe    L(less_16bytes)
+    cmp    $256, %rdx
+    jb    L(less_256bytes)
+    vmovups    (%rsi), %zmm0
+    vmovups 0x40(%rsi), %zmm1
+    vmovups 0x80(%rsi), %zmm2
+    vmovups 0xC0(%rsi), %zmm3
+    vmovups    -0x100(%rcx), %zmm4
+    vmovups -0xC0(%rcx), %zmm5
+    vmovups -0x80(%rcx), %zmm6
+    vmovups -0x40(%rcx), %zmm7
+    vmovups %zmm0, (%rdi)
+    vmovups %zmm1, 0x40(%rdi)
+    vmovups %zmm2, 0x80(%rdi)
+    vmovups %zmm3, 0xC0(%rdi)
+    vmovups    %zmm4, -0x100(%r9)
+    vmovups %zmm5, -0xC0(%r9)
+    vmovups %zmm6, -0x80(%r9)
+    vmovups %zmm7, -0x40(%r9)
+    ret
+
+L(less_256bytes):
+    cmp    $128, %dl
+    jb    L(less_128bytes)
+    vmovups    (%rsi), %zmm0
+    vmovups 0x40(%rsi), %zmm1
+    vmovups -0x80(%rcx), %zmm2
+    vmovups -0x40(%rcx), %zmm3
+    vmovups    %zmm0, (%rdi)
+    vmovups %zmm1, 0x40(%rdi)
+    vmovups %zmm2, -0x80(%r9)
+    vmovups %zmm3, -0x40(%r9)
+    ret
+
+L(less_128bytes):
+    cmp    $64, %dl
+    jb    L(less_64bytes)
+    vmovdqu (%rsi), %ymm0
+    vmovdqu 0x20(%rsi), %ymm1
+    vmovdqu -0x40(%rcx), %ymm2
+    vmovdqu -0x20(%rcx), %ymm3
+    vmovdqu %ymm0, (%rdi)
+    vmovdqu %ymm1, 0x20(%rdi)
+    vmovdqu %ymm2, -0x40(%r9)
+    vmovdqu %ymm3, -0x20(%r9)
+    ret
+
+L(less_64bytes):
+    cmp    $32, %dl
+    jb    L(less_32bytes)
+    vmovdqu    (%rsi), %ymm0
+    vmovdqu -0x20(%rcx), %ymm1
+    vmovdqu    %ymm0, (%rdi)
+    vmovdqu    %ymm1, -0x20(%r9)
+    ret
+
+L(less_32bytes):
+    vmovdqu (%rsi), %xmm0
+    vmovdqu -0x10(%rcx), %xmm1
+    vmovdqu %xmm0, (%rdi)
+    vmovdqu %xmm1, -0x10(%r9)
+    ret
+
+L(less_16bytes):
+    cmp    $8, %dl
+    jb    L(less_8bytes)
+    movq    (%rsi), %rsi
+    movq    -0x8(%rcx), %rcx
+    movq    %rsi, (%rdi)
+    movq    %rcx, -0x8(%r9)
+    ret
+
+L(less_8bytes):
+    cmp    $4, %dl
+    jb    L(less_4bytes)
+    mov    (%rsi), %esi
+    mov    -0x4(%rcx), %ecx
+    mov    %esi, (%rdi)
+    mov    %ecx, -0x4(%r9)
+    ret
+
+L(less_4bytes):
+    cmp    $2, %dl
+    jb    L(less_2bytes)
+    mov    (%rsi), %si
+    mov    -0x2(%rcx), %cx
+    mov    %si, (%rdi)
+    mov    %cx, -0x2(%r9)
+    ret
+
+L(less_2bytes):
+    cmp    $1, %dl
+    jb    L(less_1bytes)
+    mov    (%rsi), %cl
+    mov    %cl, (%rdi)
+L(less_1bytes):
+    ret
+
+L(512bytesormore):
+# ifdef SHARED_CACHE_SIZE_HALF
+    mov    $SHARED_CACHE_SIZE_HALF, %r8
+# else
+    mov    __x86_shared_cache_size_half(%rip), %r8
+# endif
+    cmp    %r8, %rdx
+    jae    L(preloop_large)
+    cmp    $1024, %rdx
+    ja    L(1024bytesormore)
+    prefetcht1 (%rsi)
+    prefetcht1 0x40(%rsi)
+    prefetcht1 0x80(%rsi)
+    prefetcht1 0xC0(%rsi)
+    prefetcht1 0x100(%rsi)
+    prefetcht1 0x140(%rsi)
+    prefetcht1 0x180(%rsi)
+    prefetcht1 0x1C0(%rsi)
+    prefetcht1 -0x200(%rcx)
+    prefetcht1 -0x1C0(%rcx)
+    prefetcht1 -0x180(%rcx)
+    prefetcht1 -0x140(%rcx)
+    prefetcht1 -0x100(%rcx)
+    prefetcht1 -0xC0(%rcx)
+    prefetcht1 -0x80(%rcx)
+    prefetcht1 -0x40(%rcx)
+    vmovups    (%rsi), %zmm0
+    vmovups 0x40(%rsi), %zmm1
+    vmovups 0x80(%rsi), %zmm2
+    vmovups 0xC0(%rsi), %zmm3
+    vmovups    0x100(%rsi), %zmm4
+    vmovups 0x140(%rsi), %zmm5
+    vmovups 0x180(%rsi), %zmm6
+    vmovups 0x1C0(%rsi), %zmm7
+    vmovups    -0x200(%rcx), %zmm8
+    vmovups -0x1C0(%rcx), %zmm9
+    vmovups -0x180(%rcx), %zmm10
+    vmovups -0x140(%rcx), %zmm11
+    vmovups    -0x100(%rcx), %zmm12
+    vmovups -0xC0(%rcx), %zmm13
+    vmovups -0x80(%rcx), %zmm14
+    vmovups -0x40(%rcx), %zmm15
+    vmovups %zmm0, (%rdi)
+    vmovups %zmm1, 0x40(%rdi)
+    vmovups %zmm2, 0x80(%rdi)
+    vmovups %zmm3, 0xC0(%rdi)
+    vmovups %zmm4, 0x100(%rdi)
+    vmovups %zmm5, 0x140(%rdi)
+    vmovups %zmm6, 0x180(%rdi)
+    vmovups %zmm7, 0x1C0(%rdi)
+    vmovups    %zmm8, -0x200(%r9)
+    vmovups %zmm9, -0x1C0(%r9)
+    vmovups %zmm10, -0x180(%r9)
+    vmovups %zmm11, -0x140(%r9)
+    vmovups    %zmm12, -0x100(%r9)
+    vmovups %zmm13, -0xC0(%r9)
+    vmovups %zmm14, -0x80(%r9)
+    vmovups %zmm15, -0x40(%r9)
+    ret
+
+L(1024bytesormore):
+    cmp    %rsi, %rdi
+    ja    L(1024bytesormore_bkw)
+    sub    $512, %r9
+    vmovups -0x200(%rcx), %zmm8
+    vmovups -0x1C0(%rcx), %zmm9
+    vmovups -0x180(%rcx), %zmm10
+    vmovups -0x140(%rcx), %zmm11
+    vmovups    -0x100(%rcx), %zmm12
+    vmovups -0xC0(%rcx), %zmm13
+    vmovups -0x80(%rcx), %zmm14
+    vmovups -0x40(%rcx), %zmm15
+    prefetcht1 (%rsi)
+    prefetcht1 0x40(%rsi)
+    prefetcht1 0x80(%rsi)
+    prefetcht1 0xC0(%rsi)
+    prefetcht1 0x100(%rsi)
+    prefetcht1 0x140(%rsi)
+    prefetcht1 0x180(%rsi)
+    prefetcht1 0x1C0(%rsi)
+
+/* Loop with unaligned memory access.  */
+L(gobble_512bytes_loop):
+    vmovups    (%rsi), %zmm0
+    vmovups 0x40(%rsi), %zmm1
+    vmovups 0x80(%rsi), %zmm2
+    vmovups 0xC0(%rsi), %zmm3
+    vmovups    0x100(%rsi), %zmm4
+    vmovups 0x140(%rsi), %zmm5
+    vmovups 0x180(%rsi), %zmm6
+    vmovups 0x1C0(%rsi), %zmm7
+    add    $512, %rsi
+    prefetcht1 (%rsi)
+    prefetcht1 0x40(%rsi)
+    prefetcht1 0x80(%rsi)
+    prefetcht1 0xC0(%rsi)
+    prefetcht1 0x100(%rsi)
+    prefetcht1 0x140(%rsi)
+    prefetcht1 0x180(%rsi)
+    prefetcht1 0x1C0(%rsi)
+    vmovups    %zmm0, (%rdi)
+    vmovups %zmm1, 0x40(%rdi)
+    vmovups %zmm2, 0x80(%rdi)
+    vmovups %zmm3, 0xC0(%rdi)
+    vmovups    %zmm4, 0x100(%rdi)
+    vmovups %zmm5, 0x140(%rdi)
+    vmovups %zmm6, 0x180(%rdi)
+    vmovups %zmm7, 0x1C0(%rdi)
+    add    $512, %rdi
+    cmp    %r9, %rdi
+    jb    L(gobble_512bytes_loop)
+    vmovups %zmm8, (%r9)
+    vmovups %zmm9, 0x40(%r9)
+    vmovups %zmm10, 0x80(%r9)
+    vmovups %zmm11, 0xC0(%r9)
+    vmovups %zmm12, 0x100(%r9)
+    vmovups %zmm13, 0x140(%r9)
+    vmovups %zmm14, 0x180(%r9)
+    vmovups %zmm15, 0x1C0(%r9)
+    ret
+
+L(1024bytesormore_bkw):
+    add    $512, %rdi
+    vmovups    0x1C0(%rsi), %zmm8
+    vmovups 0x180(%rsi), %zmm9
+    vmovups 0x140(%rsi), %zmm10
+    vmovups 0x100(%rsi), %zmm11
+    vmovups    0xC0(%rsi), %zmm12
+    vmovups 0x80(%rsi), %zmm13
+    vmovups 0x40(%rsi), %zmm14
+    vmovups (%rsi), %zmm15
+    prefetcht1 -0x40(%rcx)
+    prefetcht1 -0x80(%rcx)
+    prefetcht1 -0xC0(%rcx)
+    prefetcht1 -0x100(%rcx)
+    prefetcht1 -0x140(%rcx)
+    prefetcht1 -0x180(%rcx)
+    prefetcht1 -0x1C0(%rcx)
+    prefetcht1 -0x200(%rcx)
+
+/* Backward loop with unaligned memory access.  */
+L(gobble_512bytes_loop_bkw):
+    vmovups -0x40(%rcx), %zmm0
+    vmovups -0x80(%rcx), %zmm1
+    vmovups -0xC0(%rcx), %zmm2
+    vmovups    -0x100(%rcx), %zmm3
+    vmovups -0x140(%rcx), %zmm4
+    vmovups -0x180(%rcx), %zmm5
+    vmovups -0x1C0(%rcx), %zmm6
+    vmovups    -0x200(%rcx), %zmm7
+    sub    $512, %rcx
+    prefetcht1 -0x40(%rcx)
+    prefetcht1 -0x80(%rcx)
+    prefetcht1 -0xC0(%rcx)
+    prefetcht1 -0x100(%rcx)
+    prefetcht1 -0x140(%rcx)
+    prefetcht1 -0x180(%rcx)
+    prefetcht1 -0x1C0(%rcx)
+    prefetcht1 -0x200(%rcx)
+    vmovups %zmm0, -0x40(%r9)
+    vmovups %zmm1, -0x80(%r9)
+    vmovups %zmm2, -0xC0(%r9)
+    vmovups    %zmm3, -0x100(%r9)
+    vmovups %zmm4, -0x140(%r9)
+    vmovups %zmm5, -0x180(%r9)
+    vmovups %zmm6, -0x1C0(%r9)
+    vmovups    %zmm7, -0x200(%r9)
+    sub    $512, %r9
+    cmp    %rdi, %r9
+    ja    L(gobble_512bytes_loop_bkw)
+    vmovups %zmm8, -0x40(%rdi)
+    vmovups %zmm9, -0x80(%rdi)
+    vmovups %zmm10, -0xC0(%rdi)
+    vmovups %zmm11, -0x100(%rdi)
+    vmovups %zmm12, -0x140(%rdi)
+    vmovups %zmm13, -0x180(%rdi)
+    vmovups %zmm14, -0x1C0(%rdi)
+    vmovups %zmm15, -0x200(%rdi)
+    ret
+
+L(preloop_large):
+    cmp    %rsi, %rdi
+    ja    L(preloop_large_bkw)
+    vmovups    (%rsi), %zmm4
+    vmovups    0x40(%rsi), %zmm5
+
+    mov    %rdi, %r11
+/* Align destination for access with non-temporal stores in the loop.  */
+    mov    %rdi, %r8
+    and    $-0x80, %rdi
+    add    $0x80, %rdi
+    sub    %rdi, %r8
+    sub    %r8, %rsi
+    add    %r8, %rdx
+L(gobble_256bytes_nt_loop):
+    prefetcht1 0x200(%rsi)
+    prefetcht1 0x240(%rsi)
+    prefetcht1 0x280(%rsi)
+    prefetcht1 0x2C0(%rsi)
+    prefetcht1 0x300(%rsi)
+    prefetcht1 0x340(%rsi)
+    prefetcht1 0x380(%rsi)
+    prefetcht1 0x3C0(%rsi)
+    vmovdqu64 (%rsi), %zmm0
+    vmovdqu64 0x40(%rsi), %zmm1
+    vmovdqu64 0x80(%rsi), %zmm2
+    vmovdqu64 0xC0(%rsi), %zmm3
+    vmovntdq %zmm0, (%rdi)
+    vmovntdq %zmm1, 0x40(%rdi)
+    vmovntdq %zmm2, 0x80(%rdi)
+    vmovntdq %zmm3, 0xC0(%rdi)
+    sub    $256, %rdx
+    add    $256, %rsi
+    add    $256, %rdi
+    cmp    $256, %rdx
+    ja    L(gobble_256bytes_nt_loop)
+    sfence
+    vmovups    %zmm4, (%r11)
+    vmovups    %zmm5, 0x40(%r11)
+    jmp    L(check)
+
+L(preloop_large_bkw):
+    vmovups -0x80(%rcx), %zmm4
+    vmovups -0x40(%rcx), %zmm5
+
+/* Align end of destination for access with non-temporal stores.  */
+    mov    %r9, %r8
+    and    $-0x80, %r9
+    sub    %r9, %r8
+    sub    %r8, %rcx
+    sub    %r8, %rdx
+    add    %r9, %r8
+L(gobble_256bytes_nt_loop_bkw):
+    prefetcht1 -0x400(%rcx)
+    prefetcht1 -0x3C0(%rcx)
+    prefetcht1 -0x380(%rcx)
+    prefetcht1 -0x340(%rcx)
+    prefetcht1 -0x300(%rcx)
+    prefetcht1 -0x2C0(%rcx)
+    prefetcht1 -0x280(%rcx)
+    prefetcht1 -0x240(%rcx)
+    vmovdqu64 -0x100(%rcx), %zmm0
+    vmovdqu64 -0xC0(%rcx), %zmm1
+    vmovdqu64 -0x80(%rcx), %zmm2
+    vmovdqu64 -0x40(%rcx), %zmm3
+    vmovntdq %zmm0,    -0x100(%r9)
+    vmovntdq %zmm1,    -0xC0(%r9)
+    vmovntdq %zmm2,    -0x80(%r9)
+    vmovntdq %zmm3,    -0x40(%r9)
+    sub    $256, %rdx
+    sub    $256, %rcx
+    sub    $256, %r9
+    cmp    $256, %rdx
+    ja    L(gobble_256bytes_nt_loop_bkw)
+    sfence
+    vmovups    %zmm4, -0x80(%r8)
+    vmovups    %zmm5, -0x40(%r8)
+    jmp    L(check)
+END (__memmove_avx512_no_vzeroupper)
+
+strong_alias (__memmove_avx512_no_vzeroupper, __memcpy_avx512_no_vzeroupper)
+strong_alias (__memmove_chk_avx512_no_vzeroupper, __memcpy_chk_avx512_no_vzeroupper)
+#endif
diff --git a/utils/memcpy-bench/glibc/memmove-avx512-unaligned-erms.S b/utils/memcpy-bench/glibc/memmove-avx512-unaligned-erms.S
new file mode 100644
index 00000000000..9666b05f1c5
--- /dev/null
+++ b/utils/memcpy-bench/glibc/memmove-avx512-unaligned-erms.S
@@ -0,0 +1,12 @@
+#if 1
+# define VEC_SIZE    64
+# define VEC(i)        zmm##i
+# define VMOVNT        vmovntdq
+# define VMOVU        vmovdqu64
+# define VMOVA        vmovdqa64
+
+# define SECTION(p)        p##.avx512
+# define MEMMOVE_SYMBOL(p,s)    p##_avx512_##s
+
+# include "memmove-vec-unaligned-erms.S"
+#endif
diff --git a/utils/memcpy-bench/glibc/memmove-sse2-unaligned-erms.S b/utils/memcpy-bench/glibc/memmove-sse2-unaligned-erms.S
new file mode 100644
index 00000000000..ad405be479e
--- /dev/null
+++ b/utils/memcpy-bench/glibc/memmove-sse2-unaligned-erms.S
@@ -0,0 +1,33 @@
+/* memmove with SSE2.
+   Copyright (C) 2017-2020 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <https://www.gnu.org/licenses/>.  */
+
+#if 1
+# define MEMMOVE_SYMBOL(p,s)    p##_sse2_##s
+#else
+weak_alias (__mempcpy, mempcpy)
+#endif
+
+#include "memmove.S"
+
+#if defined SHARED
+# include <shlib-compat.h>
+# if SHLIB_COMPAT (libc, GLIBC_2_2_5, GLIBC_2_14)
+/* Use __memmove_sse2_unaligned to support overlapping addresses.  */
+compat_symbol (libc, __memmove_sse2_unaligned, memcpy, GLIBC_2_2_5);
+# endif
+#endif
diff --git a/utils/memcpy-bench/glibc/memmove-vec-unaligned-erms.S b/utils/memcpy-bench/glibc/memmove-vec-unaligned-erms.S
new file mode 100644
index 00000000000..097ff6ca617
--- /dev/null
+++ b/utils/memcpy-bench/glibc/memmove-vec-unaligned-erms.S
@@ -0,0 +1,559 @@
+/* memmove/memcpy/mempcpy with unaligned load/store and rep movsb
+   Copyright (C) 2016-2020 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <https://www.gnu.org/licenses/>.  */
+
+/* memmove/memcpy/mempcpy is implemented as:
+   1. Use overlapping load and store to avoid branch.
+   2. Load all sources into registers and store them together to avoid
+      possible address overlap between source and destination.
+   3. If size is 8 * VEC_SIZE or less, load all sources into registers
+      and store them together.
+   4. If address of destination > address of source, backward copy
+      4 * VEC_SIZE at a time with unaligned load and aligned store.
+      Load the first 4 * VEC and last VEC before the loop and store
+      them after the loop to support overlapping addresses.
+   5. Otherwise, forward copy 4 * VEC_SIZE at a time with unaligned
+      load and aligned store.  Load the last 4 * VEC and first VEC
+      before the loop and store them after the loop to support
+      overlapping addresses.
+   6. If size >= __x86_shared_non_temporal_threshold and there is no
+      overlap between destination and source, use non-temporal store
+      instead of aligned store.  */
+
+#include "sysdep.h"
+
+#ifndef MEMCPY_SYMBOL
+# define MEMCPY_SYMBOL(p,s)        MEMMOVE_SYMBOL(p, s)
+#endif
+
+#ifndef MEMPCPY_SYMBOL
+# define MEMPCPY_SYMBOL(p,s)        MEMMOVE_SYMBOL(p, s)
+#endif
+
+#ifndef MEMMOVE_CHK_SYMBOL
+# define MEMMOVE_CHK_SYMBOL(p,s)    MEMMOVE_SYMBOL(p, s)
+#endif
+
+#ifndef VZEROUPPER
+# if VEC_SIZE > 16
+#  define VZEROUPPER vzeroupper
+# else
+#  define VZEROUPPER
+# endif
+#endif
+
+#ifndef PREFETCH
+# define PREFETCH(addr) prefetcht0 addr
+#endif
+
+/* Assume 64-byte prefetch size.  */
+#ifndef PREFETCH_SIZE
+# define PREFETCH_SIZE 64
+#endif
+
+#define PREFETCHED_LOAD_SIZE (VEC_SIZE * 4)
+
+#if PREFETCH_SIZE == 64
+# if PREFETCHED_LOAD_SIZE == PREFETCH_SIZE
+#  define PREFETCH_ONE_SET(dir, base, offset) \
+    PREFETCH ((offset)base)
+# elif PREFETCHED_LOAD_SIZE == 2 * PREFETCH_SIZE
+#  define PREFETCH_ONE_SET(dir, base, offset) \
+    PREFETCH ((offset)base); \
+    PREFETCH ((offset + dir * PREFETCH_SIZE)base)
+# elif PREFETCHED_LOAD_SIZE == 4 * PREFETCH_SIZE
+#  define PREFETCH_ONE_SET(dir, base, offset) \
+    PREFETCH ((offset)base); \
+    PREFETCH ((offset + dir * PREFETCH_SIZE)base); \
+    PREFETCH ((offset + dir * PREFETCH_SIZE * 2)base); \
+    PREFETCH ((offset + dir * PREFETCH_SIZE * 3)base)
+# else
+#   error Unsupported PREFETCHED_LOAD_SIZE!
+# endif
+#else
+# error Unsupported PREFETCH_SIZE!
+#endif
+
+#ifndef SECTION
+# error SECTION is not defined!
+#endif
+
+    .section SECTION(.text),"ax",@progbits
+#if defined SHARED
+ENTRY (MEMMOVE_CHK_SYMBOL (__mempcpy_chk, unaligned))
+    cmp    %RDX_LP, %RCX_LP
+    jb    HIDDEN_JUMPTARGET (__chk_fail)
+END (MEMMOVE_CHK_SYMBOL (__mempcpy_chk, unaligned))
+#endif
+
+ENTRY (MEMPCPY_SYMBOL (__mempcpy, unaligned))
+    mov    %RDI_LP, %RAX_LP
+    add    %RDX_LP, %RAX_LP
+    jmp    L(start)
+END (MEMPCPY_SYMBOL (__mempcpy, unaligned))
+
+#if defined SHARED
+ENTRY (MEMMOVE_CHK_SYMBOL (__memmove_chk, unaligned))
+    cmp    %RDX_LP, %RCX_LP
+    jb    HIDDEN_JUMPTARGET (__chk_fail)
+END (MEMMOVE_CHK_SYMBOL (__memmove_chk, unaligned))
+#endif
+
+ENTRY (MEMMOVE_SYMBOL (__memmove, unaligned))
+    movq    %rdi, %rax
+L(start):
+# ifdef __ILP32__
+    /* Clear the upper 32 bits.  */
+    movl    %edx, %edx
+# endif
+    cmp    $VEC_SIZE, %RDX_LP
+    jb    L(less_vec)
+    cmp    $(VEC_SIZE * 2), %RDX_LP
+    ja    L(more_2x_vec)
+#if !defined USE_MULTIARCH
+L(last_2x_vec):
+#endif
+    /* From VEC and to 2 * VEC.  No branch when size == VEC_SIZE.  */
+    VMOVU    (%rsi), %VEC(0)
+    VMOVU    -VEC_SIZE(%rsi,%rdx), %VEC(1)
+    VMOVU    %VEC(0), (%rdi)
+    VMOVU    %VEC(1), -VEC_SIZE(%rdi,%rdx)
+    VZEROUPPER
+#if !defined USE_MULTIARCH
+L(nop):
+#endif
+    ret
+#if defined USE_MULTIARCH
+END (MEMMOVE_SYMBOL (__memmove, unaligned))
+
+# if VEC_SIZE == 16
+ENTRY (__mempcpy_chk_erms)
+    cmp    %RDX_LP, %RCX_LP
+    jb    HIDDEN_JUMPTARGET (__chk_fail)
+END (__mempcpy_chk_erms)
+
+/* Only used to measure performance of REP MOVSB.  */
+ENTRY (__mempcpy_erms)
+    mov    %RDI_LP, %RAX_LP
+    /* Skip zero length.  */
+    test    %RDX_LP, %RDX_LP
+    jz    2f
+    add    %RDX_LP, %RAX_LP
+    jmp    L(start_movsb)
+END (__mempcpy_erms)
+
+ENTRY (__memmove_chk_erms)
+    cmp    %RDX_LP, %RCX_LP
+    jb    HIDDEN_JUMPTARGET (__chk_fail)
+END (__memmove_chk_erms)
+
+ENTRY (__memmove_erms)
+    movq    %rdi, %rax
+    /* Skip zero length.  */
+    test    %RDX_LP, %RDX_LP
+    jz    2f
+L(start_movsb):
+    mov    %RDX_LP, %RCX_LP
+    cmp    %RSI_LP, %RDI_LP
+    jb    1f
+    /* Source == destination is less common.  */
+    je    2f
+    lea    (%rsi,%rcx), %RDX_LP
+    cmp    %RDX_LP, %RDI_LP
+    jb    L(movsb_backward)
+1:
+    rep movsb
+2:
+    ret
+L(movsb_backward):
+    leaq    -1(%rdi,%rcx), %rdi
+    leaq    -1(%rsi,%rcx), %rsi
+    std
+    rep movsb
+    cld
+    ret
+END (__memmove_erms)
+strong_alias (__memmove_erms, __memcpy_erms)
+strong_alias (__memmove_chk_erms, __memcpy_chk_erms)
+# endif
+
+# ifdef SHARED
+ENTRY (MEMMOVE_CHK_SYMBOL (__mempcpy_chk, unaligned_erms))
+    cmp    %RDX_LP, %RCX_LP
+    jb    HIDDEN_JUMPTARGET (__chk_fail)
+END (MEMMOVE_CHK_SYMBOL (__mempcpy_chk, unaligned_erms))
+# endif
+
+ENTRY (MEMMOVE_SYMBOL (__mempcpy, unaligned_erms))
+    mov    %RDI_LP, %RAX_LP
+    add    %RDX_LP, %RAX_LP
+    jmp    L(start_erms)
+END (MEMMOVE_SYMBOL (__mempcpy, unaligned_erms))
+
+# ifdef SHARED
+ENTRY (MEMMOVE_CHK_SYMBOL (__memmove_chk, unaligned_erms))
+    cmp    %RDX_LP, %RCX_LP
+    jb    HIDDEN_JUMPTARGET (__chk_fail)
+END (MEMMOVE_CHK_SYMBOL (__memmove_chk, unaligned_erms))
+# endif
+
+ENTRY (MEMMOVE_SYMBOL (__memmove, unaligned_erms))
+    movq    %rdi, %rax
+L(start_erms):
+# ifdef __ILP32__
+    /* Clear the upper 32 bits.  */
+    movl    %edx, %edx
+# endif
+    cmp    $VEC_SIZE, %RDX_LP
+    jb    L(less_vec)
+    cmp    $(VEC_SIZE * 2), %RDX_LP
+    ja    L(movsb_more_2x_vec)
+L(last_2x_vec):
+    /* From VEC and to 2 * VEC.  No branch when size == VEC_SIZE. */
+    VMOVU    (%rsi), %VEC(0)
+    VMOVU    -VEC_SIZE(%rsi,%rdx), %VEC(1)
+    VMOVU    %VEC(0), (%rdi)
+    VMOVU    %VEC(1), -VEC_SIZE(%rdi,%rdx)
+L(return):
+    VZEROUPPER
+    ret
+
+L(movsb):
+    cmp    $SHARED_NON_TEMPORAL_THRESHOLD, %RDX_LP
+    jae    L(more_8x_vec)
+    cmpq    %rsi, %rdi
+    jb    1f
+    /* Source == destination is less common.  */
+    je    L(nop)
+    leaq    (%rsi,%rdx), %r9
+    cmpq    %r9, %rdi
+    /* Avoid slow backward REP MOVSB.  */
+    jb    L(more_8x_vec_backward)
+1:
+    mov    %RDX_LP, %RCX_LP
+    rep movsb
+L(nop):
+    ret
+#endif
+
+L(less_vec):
+    /* Less than 1 VEC.  */
+#if VEC_SIZE != 16 && VEC_SIZE != 32 && VEC_SIZE != 64
+# error Unsupported VEC_SIZE!
+#endif
+#if VEC_SIZE > 32
+    cmpb    $32, %dl
+    jae    L(between_32_63)
+#endif
+#if VEC_SIZE > 16
+    cmpb    $16, %dl
+    jae    L(between_16_31)
+#endif
+    cmpb    $8, %dl
+    jae    L(between_8_15)
+    cmpb    $4, %dl
+    jae    L(between_4_7)
+    cmpb    $1, %dl
+    ja    L(between_2_3)
+    jb    1f
+    movzbl    (%rsi), %ecx
+    movb    %cl, (%rdi)
+1:
+    ret
+#if VEC_SIZE > 32
+L(between_32_63):
+    /* From 32 to 63.  No branch when size == 32.  */
+    vmovdqu    (%rsi), %ymm0
+    vmovdqu    -32(%rsi,%rdx), %ymm1
+    vmovdqu    %ymm0, (%rdi)
+    vmovdqu    %ymm1, -32(%rdi,%rdx)
+    VZEROUPPER
+    ret
+#endif
+#if VEC_SIZE > 16
+    /* From 16 to 31.  No branch when size == 16.  */
+L(between_16_31):
+    vmovdqu    (%rsi), %xmm0
+    vmovdqu    -16(%rsi,%rdx), %xmm1
+    vmovdqu    %xmm0, (%rdi)
+    vmovdqu    %xmm1, -16(%rdi,%rdx)
+    ret
+#endif
+L(between_8_15):
+    /* From 8 to 15.  No branch when size == 8.  */
+    movq    -8(%rsi,%rdx), %rcx
+    movq    (%rsi), %rsi
+    movq    %rcx, -8(%rdi,%rdx)
+    movq    %rsi, (%rdi)
+    ret
+L(between_4_7):
+    /* From 4 to 7.  No branch when size == 4.  */
+    movl    -4(%rsi,%rdx), %ecx
+    movl    (%rsi), %esi
+    movl    %ecx, -4(%rdi,%rdx)
+    movl    %esi, (%rdi)
+    ret
+L(between_2_3):
+    /* From 2 to 3.  No branch when size == 2.  */
+    movzwl    -2(%rsi,%rdx), %ecx
+    movzwl    (%rsi), %esi
+    movw    %cx, -2(%rdi,%rdx)
+    movw    %si, (%rdi)
+    ret
+
+#if defined USE_MULTIARCH
+L(movsb_more_2x_vec):
+    cmp    $REP_MOSB_THRESHOLD, %RDX_LP
+    ja    L(movsb)
+#endif
+L(more_2x_vec):
+    /* More than 2 * VEC and there may be overlap between destination
+       and source.  */
+    cmpq    $(VEC_SIZE * 8), %rdx
+    ja    L(more_8x_vec)
+    cmpq    $(VEC_SIZE * 4), %rdx
+    jb    L(last_4x_vec)
+    /* Copy from 4 * VEC to 8 * VEC, inclusively. */
+    VMOVU    (%rsi), %VEC(0)
+    VMOVU    VEC_SIZE(%rsi), %VEC(1)
+    VMOVU    (VEC_SIZE * 2)(%rsi), %VEC(2)
+    VMOVU    (VEC_SIZE * 3)(%rsi), %VEC(3)
+    VMOVU    -VEC_SIZE(%rsi,%rdx), %VEC(4)
+    VMOVU    -(VEC_SIZE * 2)(%rsi,%rdx), %VEC(5)
+    VMOVU    -(VEC_SIZE * 3)(%rsi,%rdx), %VEC(6)
+    VMOVU    -(VEC_SIZE * 4)(%rsi,%rdx), %VEC(7)
+    VMOVU    %VEC(0), (%rdi)
+    VMOVU    %VEC(1), VEC_SIZE(%rdi)
+    VMOVU    %VEC(2), (VEC_SIZE * 2)(%rdi)
+    VMOVU    %VEC(3), (VEC_SIZE * 3)(%rdi)
+    VMOVU    %VEC(4), -VEC_SIZE(%rdi,%rdx)
+    VMOVU    %VEC(5), -(VEC_SIZE * 2)(%rdi,%rdx)
+    VMOVU    %VEC(6), -(VEC_SIZE * 3)(%rdi,%rdx)
+    VMOVU    %VEC(7), -(VEC_SIZE * 4)(%rdi,%rdx)
+    VZEROUPPER
+    ret
+L(last_4x_vec):
+    /* Copy from 2 * VEC to 4 * VEC. */
+    VMOVU    (%rsi), %VEC(0)
+    VMOVU    VEC_SIZE(%rsi), %VEC(1)
+    VMOVU    -VEC_SIZE(%rsi,%rdx), %VEC(2)
+    VMOVU    -(VEC_SIZE * 2)(%rsi,%rdx), %VEC(3)
+    VMOVU    %VEC(0), (%rdi)
+    VMOVU    %VEC(1), VEC_SIZE(%rdi)
+    VMOVU    %VEC(2), -VEC_SIZE(%rdi,%rdx)
+    VMOVU    %VEC(3), -(VEC_SIZE * 2)(%rdi,%rdx)
+    VZEROUPPER
+    ret
+
+L(more_8x_vec):
+    cmpq    %rsi, %rdi
+    ja    L(more_8x_vec_backward)
+    /* Source == destination is less common.  */
+    je    L(nop)
+    /* Load the first VEC and last 4 * VEC to support overlapping
+       addresses.  */
+    VMOVU    (%rsi), %VEC(4)
+    VMOVU    -VEC_SIZE(%rsi, %rdx), %VEC(5)
+    VMOVU    -(VEC_SIZE * 2)(%rsi, %rdx), %VEC(6)
+    VMOVU    -(VEC_SIZE * 3)(%rsi, %rdx), %VEC(7)
+    VMOVU    -(VEC_SIZE * 4)(%rsi, %rdx), %VEC(8)
+    /* Save start and stop of the destination buffer.  */
+    movq    %rdi, %r11
+    leaq    -VEC_SIZE(%rdi, %rdx), %rcx
+    /* Align destination for aligned stores in the loop.  Compute
+       how much destination is misaligned.  */
+    movq    %rdi, %r8
+    andq    $(VEC_SIZE - 1), %r8
+    /* Get the negative of offset for alignment.  */
+    subq    $VEC_SIZE, %r8
+    /* Adjust source.  */
+    subq    %r8, %rsi
+    /* Adjust destination which should be aligned now.  */
+    subq    %r8, %rdi
+    /* Adjust length.  */
+    addq    %r8, %rdx
+#if (defined USE_MULTIARCH || VEC_SIZE == 16)
+    /* Check non-temporal store threshold.  */
+    cmp    $SHARED_NON_TEMPORAL_THRESHOLD, %RDX_LP
+    ja    L(large_forward)
+#endif
+L(loop_4x_vec_forward):
+    /* Copy 4 * VEC a time forward.  */
+    VMOVU    (%rsi), %VEC(0)
+    VMOVU    VEC_SIZE(%rsi), %VEC(1)
+    VMOVU    (VEC_SIZE * 2)(%rsi), %VEC(2)
+    VMOVU    (VEC_SIZE * 3)(%rsi), %VEC(3)
+    addq    $(VEC_SIZE * 4), %rsi
+    subq    $(VEC_SIZE * 4), %rdx
+    VMOVA    %VEC(0), (%rdi)
+    VMOVA    %VEC(1), VEC_SIZE(%rdi)
+    VMOVA    %VEC(2), (VEC_SIZE * 2)(%rdi)
+    VMOVA    %VEC(3), (VEC_SIZE * 3)(%rdi)
+    addq    $(VEC_SIZE * 4), %rdi
+    cmpq    $(VEC_SIZE * 4), %rdx
+    ja    L(loop_4x_vec_forward)
+    /* Store the last 4 * VEC.  */
+    VMOVU    %VEC(5), (%rcx)
+    VMOVU    %VEC(6), -VEC_SIZE(%rcx)
+    VMOVU    %VEC(7), -(VEC_SIZE * 2)(%rcx)
+    VMOVU    %VEC(8), -(VEC_SIZE * 3)(%rcx)
+    /* Store the first VEC.  */
+    VMOVU    %VEC(4), (%r11)
+    VZEROUPPER
+    ret
+
+L(more_8x_vec_backward):
+    /* Load the first 4 * VEC and last VEC to support overlapping
+       addresses.  */
+    VMOVU    (%rsi), %VEC(4)
+    VMOVU    VEC_SIZE(%rsi), %VEC(5)
+    VMOVU    (VEC_SIZE * 2)(%rsi), %VEC(6)
+    VMOVU    (VEC_SIZE * 3)(%rsi), %VEC(7)
+    VMOVU    -VEC_SIZE(%rsi,%rdx), %VEC(8)
+    /* Save stop of the destination buffer.  */
+    leaq    -VEC_SIZE(%rdi, %rdx), %r11
+    /* Align destination end for aligned stores in the loop.  Compute
+       how much destination end is misaligned.  */
+    leaq    -VEC_SIZE(%rsi, %rdx), %rcx
+    movq    %r11, %r9
+    movq    %r11, %r8
+    andq    $(VEC_SIZE - 1), %r8
+    /* Adjust source.  */
+    subq    %r8, %rcx
+    /* Adjust the end of destination which should be aligned now.  */
+    subq    %r8, %r9
+    /* Adjust length.  */
+    subq    %r8, %rdx
+#if (defined USE_MULTIARCH || VEC_SIZE == 16)
+    /* Check non-temporal store threshold.  */
+    cmp    $SHARED_NON_TEMPORAL_THRESHOLD, %RDX_LP
+    ja    L(large_backward)
+#endif
+L(loop_4x_vec_backward):
+    /* Copy 4 * VEC a time backward.  */
+    VMOVU    (%rcx), %VEC(0)
+    VMOVU    -VEC_SIZE(%rcx), %VEC(1)
+    VMOVU    -(VEC_SIZE * 2)(%rcx), %VEC(2)
+    VMOVU    -(VEC_SIZE * 3)(%rcx), %VEC(3)
+    subq    $(VEC_SIZE * 4), %rcx
+    subq    $(VEC_SIZE * 4), %rdx
+    VMOVA    %VEC(0), (%r9)
+    VMOVA    %VEC(1), -VEC_SIZE(%r9)
+    VMOVA    %VEC(2), -(VEC_SIZE * 2)(%r9)
+    VMOVA    %VEC(3), -(VEC_SIZE * 3)(%r9)
+    subq    $(VEC_SIZE * 4), %r9
+    cmpq    $(VEC_SIZE * 4), %rdx
+    ja    L(loop_4x_vec_backward)
+    /* Store the first 4 * VEC.  */
+    VMOVU    %VEC(4), (%rdi)
+    VMOVU    %VEC(5), VEC_SIZE(%rdi)
+    VMOVU    %VEC(6), (VEC_SIZE * 2)(%rdi)
+    VMOVU    %VEC(7), (VEC_SIZE * 3)(%rdi)
+    /* Store the last VEC.  */
+    VMOVU    %VEC(8), (%r11)
+    VZEROUPPER
+    ret
+
+#if (defined USE_MULTIARCH || VEC_SIZE == 16)
+L(large_forward):
+    /* Don't use non-temporal store if there is overlap between
+       destination and source since destination may be in cache
+       when source is loaded.  */
+    leaq    (%rdi, %rdx), %r10
+    cmpq    %r10, %rsi
+    jb    L(loop_4x_vec_forward)
+L(loop_large_forward):
+    /* Copy 4 * VEC a time forward with non-temporal stores.  */
+    PREFETCH_ONE_SET (1, (%rsi), PREFETCHED_LOAD_SIZE * 2)
+    PREFETCH_ONE_SET (1, (%rsi), PREFETCHED_LOAD_SIZE * 3)
+    VMOVU    (%rsi), %VEC(0)
+    VMOVU    VEC_SIZE(%rsi), %VEC(1)
+    VMOVU    (VEC_SIZE * 2)(%rsi), %VEC(2)
+    VMOVU    (VEC_SIZE * 3)(%rsi), %VEC(3)
+    addq    $PREFETCHED_LOAD_SIZE, %rsi
+    subq    $PREFETCHED_LOAD_SIZE, %rdx
+    VMOVNT    %VEC(0), (%rdi)
+    VMOVNT    %VEC(1), VEC_SIZE(%rdi)
+    VMOVNT    %VEC(2), (VEC_SIZE * 2)(%rdi)
+    VMOVNT    %VEC(3), (VEC_SIZE * 3)(%rdi)
+    addq    $PREFETCHED_LOAD_SIZE, %rdi
+    cmpq    $PREFETCHED_LOAD_SIZE, %rdx
+    ja    L(loop_large_forward)
+    sfence
+    /* Store the last 4 * VEC.  */
+    VMOVU    %VEC(5), (%rcx)
+    VMOVU    %VEC(6), -VEC_SIZE(%rcx)
+    VMOVU    %VEC(7), -(VEC_SIZE * 2)(%rcx)
+    VMOVU    %VEC(8), -(VEC_SIZE * 3)(%rcx)
+    /* Store the first VEC.  */
+    VMOVU    %VEC(4), (%r11)
+    VZEROUPPER
+    ret
+
+L(large_backward):
+    /* Don't use non-temporal store if there is overlap between
+       destination and source since destination may be in cache
+       when source is loaded.  */
+    leaq    (%rcx, %rdx), %r10
+    cmpq    %r10, %r9
+    jb    L(loop_4x_vec_backward)
+L(loop_large_backward):
+    /* Copy 4 * VEC a time backward with non-temporal stores.  */
+    PREFETCH_ONE_SET (-1, (%rcx), -PREFETCHED_LOAD_SIZE * 2)
+    PREFETCH_ONE_SET (-1, (%rcx), -PREFETCHED_LOAD_SIZE * 3)
+    VMOVU    (%rcx), %VEC(0)
+    VMOVU    -VEC_SIZE(%rcx), %VEC(1)
+    VMOVU    -(VEC_SIZE * 2)(%rcx), %VEC(2)
+    VMOVU    -(VEC_SIZE * 3)(%rcx), %VEC(3)
+    subq    $PREFETCHED_LOAD_SIZE, %rcx
+    subq    $PREFETCHED_LOAD_SIZE, %rdx
+    VMOVNT    %VEC(0), (%r9)
+    VMOVNT    %VEC(1), -VEC_SIZE(%r9)
+    VMOVNT    %VEC(2), -(VEC_SIZE * 2)(%r9)
+    VMOVNT    %VEC(3), -(VEC_SIZE * 3)(%r9)
+    subq    $PREFETCHED_LOAD_SIZE, %r9
+    cmpq    $PREFETCHED_LOAD_SIZE, %rdx
+    ja    L(loop_large_backward)
+    sfence
+    /* Store the first 4 * VEC.  */
+    VMOVU    %VEC(4), (%rdi)
+    VMOVU    %VEC(5), VEC_SIZE(%rdi)
+    VMOVU    %VEC(6), (VEC_SIZE * 2)(%rdi)
+    VMOVU    %VEC(7), (VEC_SIZE * 3)(%rdi)
+    /* Store the last VEC.  */
+    VMOVU    %VEC(8), (%r11)
+    VZEROUPPER
+    ret
+#endif
+END (MEMMOVE_SYMBOL (__memmove, unaligned_erms))
+
+#if 1
+# ifdef USE_MULTIARCH
+strong_alias (MEMMOVE_SYMBOL (__memmove, unaligned_erms),
+          MEMMOVE_SYMBOL (__memcpy, unaligned_erms))
+#  ifdef SHARED
+strong_alias (MEMMOVE_SYMBOL (__memmove_chk, unaligned_erms),
+          MEMMOVE_SYMBOL (__memcpy_chk, unaligned_erms))
+#  endif
+# endif
+# ifdef SHARED
+strong_alias (MEMMOVE_CHK_SYMBOL (__memmove_chk, unaligned),
+          MEMMOVE_CHK_SYMBOL (__memcpy_chk, unaligned))
+# endif
+#endif
+strong_alias (MEMMOVE_SYMBOL (__memmove, unaligned),
+          MEMCPY_SYMBOL (__memcpy, unaligned))
diff --git a/utils/memcpy-bench/glibc/memmove.S b/utils/memcpy-bench/glibc/memmove.S
new file mode 100644
index 00000000000..7bd47b9a03f
--- /dev/null
+++ b/utils/memcpy-bench/glibc/memmove.S
@@ -0,0 +1,71 @@
+/* Optimized memmove for x86-64.
+   Copyright (C) 2016-2020 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <https://www.gnu.org/licenses/>.  */
+
+#include "sysdep.h"
+
+#define VEC_SIZE    16
+#define VEC(i)        xmm##i
+#define PREFETCHNT    prefetchnta
+#define VMOVNT        movntdq
+/* Use movups and movaps for smaller code sizes.  */
+#define VMOVU        movups
+#define VMOVA        movaps
+
+#define SECTION(p)        p
+
+#ifdef USE_MULTIARCH
+# if 0
+#  define MEMCPY_SYMBOL(p,s)        memcpy
+# endif
+#else
+# if defined SHARED
+#  define MEMCPY_SYMBOL(p,s)        __memcpy
+# else
+#  define MEMCPY_SYMBOL(p,s)        memcpy
+# endif
+#endif
+#if !defined USE_MULTIARCH
+# define MEMPCPY_SYMBOL(p,s)        __mempcpy
+#endif
+#ifndef MEMMOVE_SYMBOL
+# define MEMMOVE_CHK_SYMBOL(p,s)    p
+# define MEMMOVE_SYMBOL(p,s)        memmove
+#endif
+
+#include "memmove-vec-unaligned-erms.S"
+
+#ifndef USE_MULTIARCH
+libc_hidden_builtin_def (memmove)
+# if defined SHARED && IS_IN (libc)
+strong_alias (memmove, __memcpy)
+libc_hidden_ver (memmove, memcpy)
+# endif
+libc_hidden_def (__mempcpy)
+weak_alias (__mempcpy, mempcpy)
+libc_hidden_builtin_def (mempcpy)
+
+# if defined SHARED && IS_IN (libc)
+#  undef memcpy
+#  include <shlib-compat.h>
+versioned_symbol (libc, __memcpy, memcpy, GLIBC_2_14);
+
+#  if SHLIB_COMPAT (libc, GLIBC_2_2_5, GLIBC_2_14)
+compat_symbol (libc, memmove, memcpy, GLIBC_2_2_5);
+#  endif
+# endif
+#endif
diff --git a/utils/memcpy-bench/glibc/sysdep.h b/utils/memcpy-bench/glibc/sysdep.h
new file mode 100644
index 00000000000..82b1e747fbe
--- /dev/null
+++ b/utils/memcpy-bench/glibc/sysdep.h
@@ -0,0 +1,131 @@
+#pragma once
+
+/* Assembler macros for x86-64.
+    Copyright (C) 2001-2020 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+
+    The GNU C Library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    The GNU C Library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with the GNU C Library; if not, see
+    <https://www.gnu.org/licenses/>.  */
+
+#ifndef _X86_64_SYSDEP_H
+#define _X86_64_SYSDEP_H 1
+
+#include "sysdep_x86.h"
+
+#ifdef    __ASSEMBLER__
+
+/* Syntactic details of assembler.  */
+
+/* This macro is for setting proper CFI with DW_CFA_expression describing
+    the register as saved relative to %rsp instead of relative to the CFA.
+    Expression is DW_OP_drop, DW_OP_breg7 (%rsp is register 7), sleb128 offset
+    from %rsp.  */
+#define cfi_offset_rel_rsp(regn, off)    .cfi_escape 0x10, regn, 0x4, 0x13, \
+                    0x77, off & 0x7F | 0x80, off >> 7
+
+/* If compiled for profiling, call `mcount' at the start of each function.  */
+#ifdef    PROF
+/* The mcount code relies on a normal frame pointer being on the stack
+    to locate our caller, so push one just for its benefit.  */
+#define CALL_MCOUNT                                                          \
+    pushq %rbp;                                                                \
+    cfi_adjust_cfa_offset(8);                                                  \
+    movq %rsp, %rbp;                                                           \
+    cfi_def_cfa_register(%rbp);                                                \
+    call JUMPTARGET(mcount);                                                   \
+    popq %rbp;                                                                 \
+    cfi_def_cfa(rsp,8);
+#else
+#define CALL_MCOUNT        /* Do nothing.  */
+#endif
+
+#define    PSEUDO(name, syscall_name, args)                      \
+lose:                                          \
+    jmp JUMPTARGET(syscall_error)                              \
+    .globl syscall_error;                                  \
+    ENTRY (name)                                      \
+    DO_CALL (syscall_name, args);                              \
+    jb lose
+
+#undef JUMPTARGET
+#ifdef SHARED
+# ifdef BIND_NOW
+#  define JUMPTARGET(name)    *name##@GOTPCREL(%rip)
+# else
+#  define JUMPTARGET(name)    name##@PLT
+# endif
+#else
+/* For static archives, branch to target directly.  */
+# define JUMPTARGET(name)    name
+#endif
+
+/* Long and pointer size in bytes.  */
+#define LP_SIZE    8
+
+/* Instruction to operate on long and pointer.  */
+#define LP_OP(insn) insn##q
+
+/* Assembler address directive. */
+#define ASM_ADDR .quad
+
+/* Registers to hold long and pointer.  */
+#define RAX_LP    rax
+#define RBP_LP    rbp
+#define RBX_LP    rbx
+#define RCX_LP    rcx
+#define RDI_LP    rdi
+#define RDX_LP    rdx
+#define RSI_LP    rsi
+#define RSP_LP    rsp
+#define R8_LP    r8
+#define R9_LP    r9
+#define R10_LP    r10
+#define R11_LP    r11
+#define R12_LP    r12
+#define R13_LP    r13
+#define R14_LP    r14
+#define R15_LP    r15
+
+#else    /* __ASSEMBLER__ */
+
+/* Long and pointer size in bytes.  */
+#define LP_SIZE "8"
+
+/* Instruction to operate on long and pointer.  */
+#define LP_OP(insn) #insn "q"
+
+/* Assembler address directive. */
+#define ASM_ADDR ".quad"
+
+/* Registers to hold long and pointer.  */
+#define RAX_LP    "rax"
+#define RBP_LP    "rbp"
+#define RBX_LP    "rbx"
+#define RCX_LP    "rcx"
+#define RDI_LP    "rdi"
+#define RDX_LP    "rdx"
+#define RSI_LP    "rsi"
+#define RSP_LP    "rsp"
+#define R8_LP    "r8"
+#define R9_LP    "r9"
+#define R10_LP    "r10"
+#define R11_LP    "r11"
+#define R12_LP    "r12"
+#define R13_LP    "r13"
+#define R14_LP    "r14"
+#define R15_LP    "r15"
+
+#endif    /* __ASSEMBLER__ */
+
+#endif    /* _X86_64_SYSDEP_H */
diff --git a/utils/memcpy-bench/glibc/sysdep_generic.h b/utils/memcpy-bench/glibc/sysdep_generic.h
new file mode 100644
index 00000000000..e6183d72792
--- /dev/null
+++ b/utils/memcpy-bench/glibc/sysdep_generic.h
@@ -0,0 +1,115 @@
+#pragma once
+
+/* Generic asm macros used on many machines.
+    Copyright (C) 1991-2020 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+
+    The GNU C Library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    The GNU C Library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with the GNU C Library; if not, see
+    <https://www.gnu.org/licenses/>.  */
+
+#define C_SYMBOL_NAME(name) name
+#define HIDDEN_JUMPTARGET(name) 0x0
+#define SHARED_CACHE_SIZE_HALF (1024*1024)
+#define DATA_CACHE_SIZE_HALF (1024*32/2)
+#define DATA_CACHE_SIZE (1024*32)
+#define SHARED_NON_TEMPORAL_THRESHOLD (1024*1024*4)
+#define REP_MOSB_THRESHOLD 1024
+
+#define USE_MULTIARCH
+
+#define ASM_LINE_SEP ;
+
+#define strong_alias(original, alias)                \
+    .globl C_SYMBOL_NAME (alias) ASM_LINE_SEP        \
+    C_SYMBOL_NAME (alias) = C_SYMBOL_NAME (original)
+
+#ifndef C_LABEL
+
+/* Define a macro we can use to construct the asm name for a C symbol.  */
+# define C_LABEL(name)    name##:
+
+#endif
+
+#ifdef __ASSEMBLER__
+/* Mark the end of function named SYM.  This is used on some platforms
+    to generate correct debugging information.  */
+# ifndef END
+#  define END(sym)
+# endif
+
+# ifndef JUMPTARGET
+#  define JUMPTARGET(sym)    sym
+# endif
+#endif
+
+/* Macros to generate eh_frame unwind information.  */
+#ifdef __ASSEMBLER__
+# define cfi_startproc            .cfi_startproc
+# define cfi_endproc            .cfi_endproc
+# define cfi_def_cfa(reg, off)        .cfi_def_cfa reg, off
+# define cfi_def_cfa_register(reg)    .cfi_def_cfa_register reg
+# define cfi_def_cfa_offset(off)    .cfi_def_cfa_offset off
+# define cfi_adjust_cfa_offset(off)    .cfi_adjust_cfa_offset off
+# define cfi_offset(reg, off)        .cfi_offset reg, off
+# define cfi_rel_offset(reg, off)    .cfi_rel_offset reg, off
+# define cfi_register(r1, r2)        .cfi_register r1, r2
+# define cfi_return_column(reg)    .cfi_return_column reg
+# define cfi_restore(reg)        .cfi_restore reg
+# define cfi_same_value(reg)        .cfi_same_value reg
+# define cfi_undefined(reg)        .cfi_undefined reg
+# define cfi_remember_state        .cfi_remember_state
+# define cfi_restore_state        .cfi_restore_state
+# define cfi_window_save        .cfi_window_save
+# define cfi_personality(enc, exp)    .cfi_personality enc, exp
+# define cfi_lsda(enc, exp)        .cfi_lsda enc, exp
+
+#else /* ! ASSEMBLER */
+
+# define CFI_STRINGIFY(Name) CFI_STRINGIFY2 (Name)
+# define CFI_STRINGIFY2(Name) #Name
+# define CFI_STARTPROC    ".cfi_startproc"
+# define CFI_ENDPROC    ".cfi_endproc"
+# define CFI_DEF_CFA(reg, off)    \
+    ".cfi_def_cfa " CFI_STRINGIFY(reg) "," CFI_STRINGIFY(off)
+# define CFI_DEF_CFA_REGISTER(reg) \
+    ".cfi_def_cfa_register " CFI_STRINGIFY(reg)
+# define CFI_DEF_CFA_OFFSET(off) \
+    ".cfi_def_cfa_offset " CFI_STRINGIFY(off)
+# define CFI_ADJUST_CFA_OFFSET(off) \
+    ".cfi_adjust_cfa_offset " CFI_STRINGIFY(off)
+# define CFI_OFFSET(reg, off) \
+    ".cfi_offset " CFI_STRINGIFY(reg) "," CFI_STRINGIFY(off)
+# define CFI_REL_OFFSET(reg, off) \
+    ".cfi_rel_offset " CFI_STRINGIFY(reg) "," CFI_STRINGIFY(off)
+# define CFI_REGISTER(r1, r2) \
+    ".cfi_register " CFI_STRINGIFY(r1) "," CFI_STRINGIFY(r2)
+# define CFI_RETURN_COLUMN(reg) \
+    ".cfi_return_column " CFI_STRINGIFY(reg)
+# define CFI_RESTORE(reg) \
+    ".cfi_restore " CFI_STRINGIFY(reg)
+# define CFI_UNDEFINED(reg) \
+    ".cfi_undefined " CFI_STRINGIFY(reg)
+# define CFI_REMEMBER_STATE \
+    ".cfi_remember_state"
+# define CFI_RESTORE_STATE \
+    ".cfi_restore_state"
+# define CFI_WINDOW_SAVE \
+    ".cfi_window_save"
+# define CFI_PERSONALITY(enc, exp) \
+    ".cfi_personality " CFI_STRINGIFY(enc) "," CFI_STRINGIFY(exp)
+# define CFI_LSDA(enc, exp) \
+    ".cfi_lsda " CFI_STRINGIFY(enc) "," CFI_STRINGIFY(exp)
+#endif
+
+#include "dwarf2.h"
diff --git a/utils/memcpy-bench/glibc/sysdep_x86.h b/utils/memcpy-bench/glibc/sysdep_x86.h
new file mode 100644
index 00000000000..1c482cfabb7
--- /dev/null
+++ b/utils/memcpy-bench/glibc/sysdep_x86.h
@@ -0,0 +1,115 @@
+#pragma once
+
+/* Assembler macros for x86.
+    Copyright (C) 2017-2020 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+
+    The GNU C Library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    The GNU C Library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with the GNU C Library; if not, see
+    <https://www.gnu.org/licenses/>.  */
+
+#ifndef _X86_SYSDEP_H
+#define _X86_SYSDEP_H 1
+
+#include "sysdep_generic.h"
+
+/* __CET__ is defined by GCC with Control-Flow Protection values:
+
+enum cf_protection_level
+{
+    CF_NONE = 0,
+    CF_BRANCH = 1 << 0,
+    CF_RETURN = 1 << 1,
+    CF_FULL = CF_BRANCH | CF_RETURN,
+    CF_SET = 1 << 2
+};
+*/
+
+/* Set if CF_BRANCH (IBT) is enabled.  */
+#define X86_FEATURE_1_IBT    (1U << 0)
+/* Set if CF_RETURN (SHSTK) is enabled.  */
+#define X86_FEATURE_1_SHSTK    (1U << 1)
+
+#ifdef __CET__
+# define CET_ENABLED    1
+# define IBT_ENABLED    (__CET__ & X86_FEATURE_1_IBT)
+# define SHSTK_ENABLED    (__CET__ & X86_FEATURE_1_SHSTK)
+#else
+# define CET_ENABLED    0
+# define IBT_ENABLED    0
+# define SHSTK_ENABLED    0
+#endif
+
+/* Offset for fxsave/xsave area used by _dl_runtime_resolve.  Also need
+    space to preserve RCX, RDX, RSI, RDI, R8, R9 and RAX.  It must be
+    aligned to 16 bytes for fxsave and 64 bytes for xsave.  */
+#define STATE_SAVE_OFFSET (8 * 7 + 8)
+
+/* Save SSE, AVX, AVX512, mask and bound registers.  */
+#define STATE_SAVE_MASK \
+    ((1 << 1) | (1 << 2) | (1 << 3) | (1 << 5) | (1 << 6) | (1 << 7))
+
+#ifdef    __ASSEMBLER__
+
+/* Syntactic details of assembler.  */
+
+#ifdef _CET_ENDBR
+# define _CET_NOTRACK notrack
+#else
+# define _CET_ENDBR
+# define _CET_NOTRACK
+#endif
+
+/* ELF uses byte-counts for .align, most others use log2 of count of bytes.  */
+#define ALIGNARG(log2) 1<<log2
+#define ASM_SIZE_DIRECTIVE(name) .size name,.-name;
+
+/* Define an entry point visible from C.  */
+#define    ENTRY(name)                                  \
+    .globl C_SYMBOL_NAME(name);                              \
+    .type C_SYMBOL_NAME(name),@function;                          \
+    .align ALIGNARG(4);                                  \
+    C_LABEL(name)                                      \
+    cfi_startproc;                                  \
+    _CET_ENDBR;                                      \
+    CALL_MCOUNT
+
+#undef    END
+#define END(name)                                  \
+    cfi_endproc;                                      \
+    ASM_SIZE_DIRECTIVE(name)
+
+#define ENTRY_CHK(name) ENTRY (name)
+#define END_CHK(name) END (name)
+
+/* Since C identifiers are not normally prefixed with an underscore
+    on this system, the asm identifier `syscall_error' intrudes on the
+    C name space.  Make sure we use an innocuous name.  */
+#define    syscall_error    __syscall_error
+#define mcount        _mcount
+
+#undef    PSEUDO_END
+#define    PSEUDO_END(name)                              \
+    END (name)
+
+/* Local label name for asm code. */
+#ifndef L
+/* ELF-like local names start with `.L'.  */
+# define L(name)    .L##name
+#endif
+
+#define atom_text_section .section ".text.atom", "ax"
+
+#endif    /* __ASSEMBLER__ */
+
+#endif    /* _X86_SYSDEP_H */
diff --git a/utils/memcpy-bench/memcpy-bench.cpp b/utils/memcpy-bench/memcpy-bench.cpp
new file mode 100644
index 00000000000..025c9100f75
--- /dev/null
+++ b/utils/memcpy-bench/memcpy-bench.cpp
@@ -0,0 +1,962 @@
+#include <memory>
+#include <cstddef>
+#include <stdexcept>
+#include <string>
+#include <random>
+#include <iostream>
+#include <iomanip>
+#include <thread>
+
+#include <dlfcn.h>
+
+#include <pcg_random.hpp>
+
+#include <common/defines.h>
+
+#include <Common/Stopwatch.h>
+
+#include <emmintrin.h>
+#include <immintrin.h>
+
+#include <boost/program_options.hpp>
+
+
+template <typename F, typename MemcpyImpl>
+void NO_INLINE loop(uint8_t * dst, uint8_t * src, size_t size, F && chunk_size_distribution, MemcpyImpl && impl)
+{
+    while (size)
+    {
+        size_t bytes_to_copy = std::min<size_t>(size, chunk_size_distribution());
+
+        impl(dst, src, bytes_to_copy);
+
+        dst += bytes_to_copy;
+        src += bytes_to_copy;
+        size -= bytes_to_copy;
+
+        /// Execute at least one SSE instruction as a penalty after running AVX code.
+        __asm__ __volatile__ ("pxor %%xmm15, %%xmm15" ::: "xmm15");
+    }
+}
+
+
+using RNG = pcg32_fast;
+
+template <size_t N>
+size_t generatorUniform(RNG & rng) { return rng() % N; };
+
+
+template <typename F, typename MemcpyImpl>
+uint64_t test(uint8_t * dst, uint8_t * src, size_t size, size_t iterations, size_t num_threads, F && generator, MemcpyImpl && impl, const char * name)
+{
+    Stopwatch watch;
+
+    std::vector<std::thread> threads;
+    threads.reserve(num_threads);
+
+    for (size_t thread_num = 0; thread_num < num_threads; ++thread_num)
+    {
+        size_t begin = size * thread_num / num_threads;
+        size_t end = size * (thread_num + 1) / num_threads;
+
+        threads.emplace_back([begin, end, iterations, &src, &dst, &generator, &impl]
+        {
+            for (size_t iteration = 0; iteration < iterations; ++iteration)
+            {
+                loop(
+                    iteration % 2 ? &src[begin] : &dst[begin],
+                    iteration % 2 ? &dst[begin] : &src[begin],
+                    end - begin,
+                    [rng = RNG(), &generator]() mutable { return generator(rng); },
+                    std::forward<MemcpyImpl>(impl));
+            }
+        });
+    }
+
+    for (auto & thread : threads)
+        thread.join();
+
+    uint64_t elapsed_ns = watch.elapsed();
+
+    /// Validation
+    for (size_t i = 0; i < size; ++i)
+        if (dst[i] != uint8_t(i))
+            throw std::logic_error("Incorrect result");
+
+    std::cout << name;
+    return elapsed_ns;
+}
+
+
+using memcpy_type = void * (*)(const void * __restrict, void * __restrict, size_t);
+
+
+static void * memcpy_erms(void * dst, const void * src, size_t size)
+{
+    asm volatile (
+        "rep movsb"
+        : "=D"(dst), "=S"(src), "=c"(size)
+        : "0"(dst), "1"(src), "2"(size)
+        : "memory");
+    return dst;
+}
+
+static void * memcpy_trivial(void * __restrict dst_, const void * __restrict src_, size_t size)
+{
+    char * __restrict dst = reinterpret_cast<char * __restrict>(dst_);
+    const char * __restrict src = reinterpret_cast<const char * __restrict>(src_);
+    void * ret = dst;
+
+    while (size > 0)
+    {
+        *dst = *src;
+        ++dst;
+        ++src;
+        --size;
+    }
+
+    return ret;
+}
+
+extern "C" void * memcpy_jart(void * dst, const void * src, size_t size);
+extern "C" void MemCpy(void * dst, const void * src, size_t size);
+
+void * memcpy_fast_sse(void * dst, const void * src, size_t size);
+void * memcpy_fast_avx(void * dst, const void * src, size_t size);
+void * memcpy_tiny(void * dst, const void * src, size_t size);
+
+
+static void * memcpySSE2(void * __restrict destination, const void * __restrict source, size_t size)
+{
+    unsigned char *dst = reinterpret_cast<unsigned char *>(destination);
+    const unsigned char *src = reinterpret_cast<const unsigned char *>(source);
+    size_t padding;
+
+    // small memory copy
+    if (size <= 16)
+        return memcpy_tiny(dst, src, size);
+
+    // align destination to 16 bytes boundary
+    padding = (16 - (reinterpret_cast<size_t>(dst) & 15)) & 15;
+
+    if (padding > 0)
+    {
+        __m128i head = _mm_loadu_si128(reinterpret_cast<const __m128i*>(src));
+        _mm_storeu_si128(reinterpret_cast<__m128i*>(dst), head);
+        dst += padding;
+        src += padding;
+        size -= padding;
+    }
+
+    // medium size copy
+    __m128i c0;
+
+    for (; size >= 16; size -= 16)
+    {
+        c0 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(src));
+        src += 16;
+        _mm_store_si128((reinterpret_cast<__m128i*>(dst)), c0);
+        dst += 16;
+    }
+
+    memcpy_tiny(dst, src, size);
+    return destination;
+}
+
+static void * memcpySSE2Unrolled2(void * __restrict destination, const void * __restrict source, size_t size)
+{
+    unsigned char *dst = reinterpret_cast<unsigned char *>(destination);
+    const unsigned char *src = reinterpret_cast<const unsigned char *>(source);
+    size_t padding;
+
+    // small memory copy
+    if (size <= 32)
+        return memcpy_tiny(dst, src, size);
+
+    // align destination to 16 bytes boundary
+    padding = (16 - (reinterpret_cast<size_t>(dst) & 15)) & 15;
+
+    if (padding > 0)
+    {
+        __m128i head = _mm_loadu_si128(reinterpret_cast<const __m128i*>(src));
+        _mm_storeu_si128(reinterpret_cast<__m128i*>(dst), head);
+        dst += padding;
+        src += padding;
+        size -= padding;
+    }
+
+    // medium size copy
+    __m128i c0, c1;
+
+    for (; size >= 32; size -= 32)
+    {
+        c0 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(src) + 0);
+        c1 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(src) + 1);
+        src += 32;
+        _mm_store_si128((reinterpret_cast<__m128i*>(dst) + 0), c0);
+        _mm_store_si128((reinterpret_cast<__m128i*>(dst) + 1), c1);
+        dst += 32;
+    }
+
+    memcpy_tiny(dst, src, size);
+    return destination;
+}
+
+static void * memcpySSE2Unrolled4(void * __restrict destination, const void * __restrict source, size_t size)
+{
+    unsigned char *dst = reinterpret_cast<unsigned char *>(destination);
+    const unsigned char *src = reinterpret_cast<const unsigned char *>(source);
+    size_t padding;
+
+    // small memory copy
+    if (size <= 64)
+        return memcpy_tiny(dst, src, size);
+
+    // align destination to 16 bytes boundary
+    padding = (16 - (reinterpret_cast<size_t>(dst) & 15)) & 15;
+
+    if (padding > 0)
+    {
+        __m128i head = _mm_loadu_si128(reinterpret_cast<const __m128i*>(src));
+        _mm_storeu_si128(reinterpret_cast<__m128i*>(dst), head);
+        dst += padding;
+        src += padding;
+        size -= padding;
+    }
+
+    // medium size copy
+    __m128i c0, c1, c2, c3;
+
+    for (; size >= 64; size -= 64)
+    {
+        c0 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(src) + 0);
+        c1 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(src) + 1);
+        c2 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(src) + 2);
+        c3 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(src) + 3);
+        src += 64;
+        _mm_store_si128((reinterpret_cast<__m128i*>(dst) + 0), c0);
+        _mm_store_si128((reinterpret_cast<__m128i*>(dst) + 1), c1);
+        _mm_store_si128((reinterpret_cast<__m128i*>(dst) + 2), c2);
+        _mm_store_si128((reinterpret_cast<__m128i*>(dst) + 3), c3);
+        dst += 64;
+    }
+
+    memcpy_tiny(dst, src, size);
+    return destination;
+}
+
+
+static void * memcpySSE2Unrolled8(void * __restrict destination, const void * __restrict source, size_t size)
+{
+    unsigned char *dst = reinterpret_cast<unsigned char *>(destination);
+    const unsigned char *src = reinterpret_cast<const unsigned char *>(source);
+    size_t padding;
+
+    // small memory copy
+    if (size <= 128)
+        return memcpy_tiny(dst, src, size);
+
+    // align destination to 16 bytes boundary
+    padding = (16 - (reinterpret_cast<size_t>(dst) & 15)) & 15;
+
+    if (padding > 0)
+    {
+        __m128i head = _mm_loadu_si128(reinterpret_cast<const __m128i*>(src));
+        _mm_storeu_si128(reinterpret_cast<__m128i*>(dst), head);
+        dst += padding;
+        src += padding;
+        size -= padding;
+    }
+
+    // medium size copy
+    __m128i c0, c1, c2, c3, c4, c5, c6, c7;
+
+    for (; size >= 128; size -= 128)
+    {
+        c0 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(src) + 0);
+        c1 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(src) + 1);
+        c2 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(src) + 2);
+        c3 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(src) + 3);
+        c4 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(src) + 4);
+        c5 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(src) + 5);
+        c6 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(src) + 6);
+        c7 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(src) + 7);
+        src += 128;
+        _mm_store_si128((reinterpret_cast<__m128i*>(dst) + 0), c0);
+        _mm_store_si128((reinterpret_cast<__m128i*>(dst) + 1), c1);
+        _mm_store_si128((reinterpret_cast<__m128i*>(dst) + 2), c2);
+        _mm_store_si128((reinterpret_cast<__m128i*>(dst) + 3), c3);
+        _mm_store_si128((reinterpret_cast<__m128i*>(dst) + 4), c4);
+        _mm_store_si128((reinterpret_cast<__m128i*>(dst) + 5), c5);
+        _mm_store_si128((reinterpret_cast<__m128i*>(dst) + 6), c6);
+        _mm_store_si128((reinterpret_cast<__m128i*>(dst) + 7), c7);
+        dst += 128;
+    }
+
+    memcpy_tiny(dst, src, size);
+    return destination;
+}
+
+
+//static __attribute__((__always_inline__, __target__("sse2")))
+__attribute__((__always_inline__)) inline void
+memcpy_my_medium_sse(uint8_t * __restrict & dst, const uint8_t * __restrict & src, size_t & size)
+{
+    /// Align destination to 16 bytes boundary.
+    size_t padding = (16 - (reinterpret_cast<size_t>(dst) & 15)) & 15;
+
+    if (padding > 0)
+    {
+        __m128i head = _mm_loadu_si128(reinterpret_cast<const __m128i*>(src));
+        _mm_storeu_si128(reinterpret_cast<__m128i*>(dst), head);
+        dst += padding;
+        src += padding;
+        size -= padding;
+    }
+
+    /// Aligned unrolled copy.
+    __m128i c0, c1, c2, c3, c4, c5, c6, c7;
+
+    while (size >= 128)
+    {
+        c0 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(src) + 0);
+        c1 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(src) + 1);
+        c2 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(src) + 2);
+        c3 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(src) + 3);
+        c4 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(src) + 4);
+        c5 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(src) + 5);
+        c6 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(src) + 6);
+        c7 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(src) + 7);
+        src += 128;
+        _mm_store_si128((reinterpret_cast<__m128i*>(dst) + 0), c0);
+        _mm_store_si128((reinterpret_cast<__m128i*>(dst) + 1), c1);
+        _mm_store_si128((reinterpret_cast<__m128i*>(dst) + 2), c2);
+        _mm_store_si128((reinterpret_cast<__m128i*>(dst) + 3), c3);
+        _mm_store_si128((reinterpret_cast<__m128i*>(dst) + 4), c4);
+        _mm_store_si128((reinterpret_cast<__m128i*>(dst) + 5), c5);
+        _mm_store_si128((reinterpret_cast<__m128i*>(dst) + 6), c6);
+        _mm_store_si128((reinterpret_cast<__m128i*>(dst) + 7), c7);
+        dst += 128;
+
+        size -= 128;
+    }
+}
+
+__attribute__((__target__("avx")))
+void memcpy_my_medium_avx(uint8_t * __restrict & __restrict dst, const uint8_t * __restrict & __restrict src, size_t & __restrict size)
+{
+    size_t padding = (32 - (reinterpret_cast<size_t>(dst) & 31)) & 31;
+
+    if (padding > 0)
+    {
+        __m256i head = _mm256_loadu_si256(reinterpret_cast<const __m256i*>(src));
+        _mm256_storeu_si256(reinterpret_cast<__m256i*>(dst), head);
+        dst += padding;
+        src += padding;
+        size -= padding;
+    }
+
+    __m256i c0, c1, c2, c3, c4, c5, c6, c7;
+
+    while (size >= 256)
+    {
+        c0 = _mm256_loadu_si256((reinterpret_cast<const __m256i*>(src)) + 0);
+        c1 = _mm256_loadu_si256((reinterpret_cast<const __m256i*>(src)) + 1);
+        c2 = _mm256_loadu_si256((reinterpret_cast<const __m256i*>(src)) + 2);
+        c3 = _mm256_loadu_si256((reinterpret_cast<const __m256i*>(src)) + 3);
+        c4 = _mm256_loadu_si256((reinterpret_cast<const __m256i*>(src)) + 4);
+        c5 = _mm256_loadu_si256((reinterpret_cast<const __m256i*>(src)) + 5);
+        c6 = _mm256_loadu_si256((reinterpret_cast<const __m256i*>(src)) + 6);
+        c7 = _mm256_loadu_si256((reinterpret_cast<const __m256i*>(src)) + 7);
+        src += 256;
+        _mm256_store_si256(((reinterpret_cast<__m256i*>(dst)) + 0), c0);
+        _mm256_store_si256(((reinterpret_cast<__m256i*>(dst)) + 1), c1);
+        _mm256_store_si256(((reinterpret_cast<__m256i*>(dst)) + 2), c2);
+        _mm256_store_si256(((reinterpret_cast<__m256i*>(dst)) + 3), c3);
+        _mm256_store_si256(((reinterpret_cast<__m256i*>(dst)) + 4), c4);
+        _mm256_store_si256(((reinterpret_cast<__m256i*>(dst)) + 5), c5);
+        _mm256_store_si256(((reinterpret_cast<__m256i*>(dst)) + 6), c6);
+        _mm256_store_si256(((reinterpret_cast<__m256i*>(dst)) + 7), c7);
+        dst += 256;
+
+        size -= 256;
+    }
+}
+
+bool have_avx = true;
+
+
+static uint8_t * memcpy_my(uint8_t * __restrict dst, const uint8_t * __restrict src, size_t size)
+{
+    uint8_t * ret = dst;
+
+tail:
+    if (size <= 16)
+    {
+        if (size >= 8)
+        {
+            __builtin_memcpy(dst + size - 8, src + size - 8, 8);
+            __builtin_memcpy(dst, src, 8);
+        }
+        else if (size >= 4)
+        {
+            __builtin_memcpy(dst + size - 4, src + size - 4, 4);
+            __builtin_memcpy(dst, src, 4);
+        }
+        else if (size >= 2)
+        {
+            __builtin_memcpy(dst + size - 2, src + size - 2, 2);
+            __builtin_memcpy(dst, src, 2);
+        }
+        else if (size >= 1)
+        {
+            *dst = *src;
+        }
+    }
+    else if (have_avx)
+    {
+        if (size <= 32)
+        {
+            __builtin_memcpy(dst, src, 8);
+            __builtin_memcpy(dst + 8, src + 8, 8);
+
+            dst += 16;
+            src += 16;
+            size -= 16;
+
+            goto tail;
+        }
+
+        if (size <= 256)
+        {
+            __asm__(
+                "vmovups    -0x20(%[s],%[size],1), %%ymm0\n"
+                "vmovups    %%ymm0, -0x20(%[d],%[size],1)\n"
+                : [d]"+r"(dst), [s]"+r"(src)
+                : [size]"r"(size)
+                : "ymm0", "memory");
+
+            while (size > 32)
+            {
+                __asm__(
+                    "vmovups    (%[s]), %%ymm0\n"
+                    "vmovups    %%ymm0, (%[d])\n"
+                    : [d]"+r"(dst), [s]"+r"(src)
+                    :
+                    : "ymm0", "memory");
+
+                dst += 32;
+                src += 32;
+                size -= 32;
+            }
+        }
+        else
+        {
+            size_t padding = (32 - (reinterpret_cast<size_t>(dst) & 31)) & 31;
+
+            if (padding > 0)
+            {
+                __asm__(
+                    "vmovups    (%[s]), %%ymm0\n"
+                    "vmovups    %%ymm0, (%[d])\n"
+                    : [d]"+r"(dst), [s]"+r"(src)
+                    :
+                    : "ymm0", "memory");
+
+                dst += padding;
+                src += padding;
+                size -= padding;
+            }
+
+            while (size >= 256)
+            {
+                __asm__(
+                    "vmovups    (%[s]), %%ymm0\n"
+                    "vmovups    0x20(%[s]), %%ymm1\n"
+                    "vmovups    0x40(%[s]), %%ymm2\n"
+                    "vmovups    0x60(%[s]), %%ymm3\n"
+                    "vmovups    0x80(%[s]), %%ymm4\n"
+                    "vmovups    0xa0(%[s]), %%ymm5\n"
+                    "vmovups    0xc0(%[s]), %%ymm6\n"
+                    "vmovups    0xe0(%[s]), %%ymm7\n"
+                    "add        $0x100,%[s]\n"
+                    "vmovaps    %%ymm0, (%[d])\n"
+                    "vmovaps    %%ymm1, 0x20(%[d])\n"
+                    "vmovaps    %%ymm2, 0x40(%[d])\n"
+                    "vmovaps    %%ymm3, 0x60(%[d])\n"
+                    "vmovaps    %%ymm4, 0x80(%[d])\n"
+                    "vmovaps    %%ymm5, 0xa0(%[d])\n"
+                    "vmovaps    %%ymm6, 0xc0(%[d])\n"
+                    "vmovaps    %%ymm7, 0xe0(%[d])\n"
+                    "add        $0x100, %[d]\n"
+                    : [d]"+r"(dst), [s]"+r"(src)
+                    :
+                    : "ymm0", "ymm1", "ymm2", "ymm3", "ymm4", "ymm5", "ymm6", "ymm7", "memory");
+
+                size -= 256;
+            }
+
+            goto tail;
+        }
+    }
+    else
+    {
+        if (size <= 128)
+        {
+            _mm_storeu_si128(reinterpret_cast<__m128i *>(dst + size - 16), _mm_loadu_si128(reinterpret_cast<const __m128i *>(src + size - 16)));
+
+            while (size > 16)
+            {
+                _mm_storeu_si128(reinterpret_cast<__m128i *>(dst), _mm_loadu_si128(reinterpret_cast<const __m128i *>(src)));
+                dst += 16;
+                src += 16;
+                size -= 16;
+            }
+        }
+        else
+        {
+            /// Align destination to 16 bytes boundary.
+            size_t padding = (16 - (reinterpret_cast<size_t>(dst) & 15)) & 15;
+
+            if (padding > 0)
+            {
+                __m128i head = _mm_loadu_si128(reinterpret_cast<const __m128i*>(src));
+                _mm_storeu_si128(reinterpret_cast<__m128i*>(dst), head);
+                dst += padding;
+                src += padding;
+                size -= padding;
+            }
+
+            /// Aligned unrolled copy.
+            __m128i c0, c1, c2, c3, c4, c5, c6, c7;
+
+            while (size >= 128)
+            {
+                c0 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(src) + 0);
+                c1 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(src) + 1);
+                c2 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(src) + 2);
+                c3 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(src) + 3);
+                c4 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(src) + 4);
+                c5 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(src) + 5);
+                c6 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(src) + 6);
+                c7 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(src) + 7);
+                src += 128;
+                _mm_store_si128((reinterpret_cast<__m128i*>(dst) + 0), c0);
+                _mm_store_si128((reinterpret_cast<__m128i*>(dst) + 1), c1);
+                _mm_store_si128((reinterpret_cast<__m128i*>(dst) + 2), c2);
+                _mm_store_si128((reinterpret_cast<__m128i*>(dst) + 3), c3);
+                _mm_store_si128((reinterpret_cast<__m128i*>(dst) + 4), c4);
+                _mm_store_si128((reinterpret_cast<__m128i*>(dst) + 5), c5);
+                _mm_store_si128((reinterpret_cast<__m128i*>(dst) + 6), c6);
+                _mm_store_si128((reinterpret_cast<__m128i*>(dst) + 7), c7);
+                dst += 128;
+
+                size -= 128;
+            }
+
+            goto tail;
+        }
+    }
+
+    return ret;
+}
+
+
+static uint8_t * memcpy_my2(uint8_t * __restrict dst, const uint8_t * __restrict src, size_t size)
+{
+    uint8_t * ret = dst;
+
+    if (size <= 16)
+    {
+        if (size >= 8)
+        {
+            __builtin_memcpy(dst + size - 8, src + size - 8, 8);
+            __builtin_memcpy(dst, src, 8);
+        }
+        else if (size >= 4)
+        {
+            __builtin_memcpy(dst + size - 4, src + size - 4, 4);
+            __builtin_memcpy(dst, src, 4);
+        }
+        else if (size >= 2)
+        {
+            __builtin_memcpy(dst + size - 2, src + size - 2, 2);
+            __builtin_memcpy(dst, src, 2);
+        }
+        else if (size >= 1)
+        {
+            *dst = *src;
+        }
+    }
+    else if (size <= 128)
+    {
+        _mm_storeu_si128(reinterpret_cast<__m128i *>(dst + size - 16), _mm_loadu_si128(reinterpret_cast<const __m128i *>(src + size - 16)));
+
+        while (size > 16)
+        {
+            _mm_storeu_si128(reinterpret_cast<__m128i *>(dst), _mm_loadu_si128(reinterpret_cast<const __m128i *>(src)));
+            dst += 16;
+            src += 16;
+            size -= 16;
+        }
+    }
+    else if (size < 30000 || !have_avx)
+    {
+        /// Align destination to 16 bytes boundary.
+        size_t padding = (16 - (reinterpret_cast<size_t>(dst) & 15)) & 15;
+
+        if (padding > 0)
+        {
+            __m128i head = _mm_loadu_si128(reinterpret_cast<const __m128i*>(src));
+            _mm_storeu_si128(reinterpret_cast<__m128i*>(dst), head);
+            dst += padding;
+            src += padding;
+            size -= padding;
+        }
+
+        /// Aligned unrolled copy.
+        __m128i c0, c1, c2, c3, c4, c5, c6, c7;
+
+        while (size >= 128)
+        {
+            c0 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(src) + 0);
+            c1 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(src) + 1);
+            c2 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(src) + 2);
+            c3 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(src) + 3);
+            c4 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(src) + 4);
+            c5 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(src) + 5);
+            c6 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(src) + 6);
+            c7 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(src) + 7);
+            src += 128;
+            _mm_store_si128((reinterpret_cast<__m128i*>(dst) + 0), c0);
+            _mm_store_si128((reinterpret_cast<__m128i*>(dst) + 1), c1);
+            _mm_store_si128((reinterpret_cast<__m128i*>(dst) + 2), c2);
+            _mm_store_si128((reinterpret_cast<__m128i*>(dst) + 3), c3);
+            _mm_store_si128((reinterpret_cast<__m128i*>(dst) + 4), c4);
+            _mm_store_si128((reinterpret_cast<__m128i*>(dst) + 5), c5);
+            _mm_store_si128((reinterpret_cast<__m128i*>(dst) + 6), c6);
+            _mm_store_si128((reinterpret_cast<__m128i*>(dst) + 7), c7);
+            dst += 128;
+
+            size -= 128;
+        }
+
+        _mm_storeu_si128(reinterpret_cast<__m128i *>(dst + size - 16), _mm_loadu_si128(reinterpret_cast<const __m128i *>(src + size - 16)));
+
+        while (size > 16)
+        {
+            _mm_storeu_si128(reinterpret_cast<__m128i *>(dst), _mm_loadu_si128(reinterpret_cast<const __m128i *>(src)));
+            dst += 16;
+            src += 16;
+            size -= 16;
+        }
+    }
+    else
+    {
+        size_t padding = (32 - (reinterpret_cast<size_t>(dst) & 31)) & 31;
+
+        if (padding > 0)
+        {
+            __asm__(
+                "vmovups    (%[s]), %%ymm0\n"
+                "vmovups    %%ymm0, (%[d])\n"
+                : [d]"+r"(dst), [s]"+r"(src)
+                :
+                : "ymm0", "memory");
+
+            dst += padding;
+            src += padding;
+            size -= padding;
+        }
+
+        while (size >= 512)
+        {
+            __asm__(
+                "vmovups    (%[s]), %%ymm0\n"
+                "vmovups    0x20(%[s]), %%ymm1\n"
+                "vmovups    0x40(%[s]), %%ymm2\n"
+                "vmovups    0x60(%[s]), %%ymm3\n"
+                "vmovups    0x80(%[s]), %%ymm4\n"
+                "vmovups    0xa0(%[s]), %%ymm5\n"
+                "vmovups    0xc0(%[s]), %%ymm6\n"
+                "vmovups    0xe0(%[s]), %%ymm7\n"
+                "vmovups    0x100(%[s]), %%ymm8\n"
+                "vmovups    0x120(%[s]), %%ymm9\n"
+                "vmovups    0x140(%[s]), %%ymm10\n"
+                "vmovups    0x160(%[s]), %%ymm11\n"
+                "vmovups    0x180(%[s]), %%ymm12\n"
+                "vmovups    0x1a0(%[s]), %%ymm13\n"
+                "vmovups    0x1c0(%[s]), %%ymm14\n"
+                "vmovups    0x1e0(%[s]), %%ymm15\n"
+                "add        $0x200, %[s]\n"
+                "sub        $0x200, %[size]\n"
+                "vmovaps    %%ymm0, (%[d])\n"
+                "vmovaps    %%ymm1, 0x20(%[d])\n"
+                "vmovaps    %%ymm2, 0x40(%[d])\n"
+                "vmovaps    %%ymm3, 0x60(%[d])\n"
+                "vmovaps    %%ymm4, 0x80(%[d])\n"
+                "vmovaps    %%ymm5, 0xa0(%[d])\n"
+                "vmovaps    %%ymm6, 0xc0(%[d])\n"
+                "vmovaps    %%ymm7, 0xe0(%[d])\n"
+                "vmovaps    %%ymm8, 0x100(%[d])\n"
+                "vmovaps    %%ymm9, 0x120(%[d])\n"
+                "vmovaps    %%ymm10, 0x140(%[d])\n"
+                "vmovaps    %%ymm11, 0x160(%[d])\n"
+                "vmovaps    %%ymm12, 0x180(%[d])\n"
+                "vmovaps    %%ymm13, 0x1a0(%[d])\n"
+                "vmovaps    %%ymm14, 0x1c0(%[d])\n"
+                "vmovaps    %%ymm15, 0x1e0(%[d])\n"
+                "add        $0x200, %[d]\n"
+                : [d]"+r"(dst), [s]"+r"(src), [size]"+r"(size)
+                :
+                : "ymm0", "ymm1", "ymm2", "ymm3", "ymm4", "ymm5", "ymm6", "ymm7",
+                  "ymm8", "ymm9", "ymm10", "ymm11", "ymm12", "ymm13", "ymm14", "ymm15",
+                  "memory");
+        }
+
+        /*while (size >= 256)
+        {
+            __asm__(
+                "vmovups    (%[s]), %%ymm0\n"
+                "vmovups    0x20(%[s]), %%ymm1\n"
+                "vmovups    0x40(%[s]), %%ymm2\n"
+                "vmovups    0x60(%[s]), %%ymm3\n"
+                "vmovups    0x80(%[s]), %%ymm4\n"
+                "vmovups    0xa0(%[s]), %%ymm5\n"
+                "vmovups    0xc0(%[s]), %%ymm6\n"
+                "vmovups    0xe0(%[s]), %%ymm7\n"
+                "add        $0x100,%[s]\n"
+                "vmovaps    %%ymm0, (%[d])\n"
+                "vmovaps    %%ymm1, 0x20(%[d])\n"
+                "vmovaps    %%ymm2, 0x40(%[d])\n"
+                "vmovaps    %%ymm3, 0x60(%[d])\n"
+                "vmovaps    %%ymm4, 0x80(%[d])\n"
+                "vmovaps    %%ymm5, 0xa0(%[d])\n"
+                "vmovaps    %%ymm6, 0xc0(%[d])\n"
+                "vmovaps    %%ymm7, 0xe0(%[d])\n"
+                "add        $0x100, %[d]\n"
+                : [d]"+r"(dst), [s]"+r"(src)
+                :
+                : "ymm0", "ymm1", "ymm2", "ymm3", "ymm4", "ymm5", "ymm6", "ymm7", "memory");
+
+            size -= 256;
+        }*/
+
+        /*while (size > 128)
+        {
+            __asm__(
+                "vmovups    (%[s]), %%ymm0\n"
+                "vmovups    0x20(%[s]), %%ymm1\n"
+                "vmovups    0x40(%[s]), %%ymm2\n"
+                "vmovups    0x60(%[s]), %%ymm3\n"
+                "add        $0x80, %[s]\n"
+                "sub        $0x80, %[size]\n"
+                "vmovaps    %%ymm0, (%[d])\n"
+                "vmovaps    %%ymm1, 0x20(%[d])\n"
+                "vmovaps    %%ymm2, 0x40(%[d])\n"
+                "vmovaps    %%ymm3, 0x60(%[d])\n"
+                "add        $0x80, %[d]\n"
+                : [d]"+r"(dst), [s]"+r"(src), [size]"+r"(size)
+                :
+                : "ymm0", "ymm1", "ymm2", "ymm3", "memory");
+        }*/
+
+        __asm__(
+            "vmovups    -0x20(%[s],%[size],1), %%ymm0\n"
+            "vmovups    %%ymm0, -0x20(%[d],%[size],1)\n"
+            : [d]"+r"(dst), [s]"+r"(src)
+            : [size]"r"(size)
+            : "ymm0", "memory");
+
+        while (size > 32)
+        {
+            __asm__(
+                "vmovups    (%[s]), %%ymm0\n"
+                "vmovups    %%ymm0, (%[d])\n"
+                : [d]"+r"(dst), [s]"+r"(src)
+                :
+                : "ymm0", "memory");
+
+            dst += 32;
+            src += 32;
+            size -= 32;
+        }
+
+        __asm__ __volatile__ ("vzeroupper"
+            ::: "ymm0", "ymm1", "ymm2", "ymm3", "ymm4", "ymm5", "ymm6", "ymm7",
+                "ymm8", "ymm9", "ymm10", "ymm11", "ymm12", "ymm13", "ymm14", "ymm15");
+    }
+
+    return ret;
+}
+
+extern "C" void * __memcpy_erms(void * __restrict destination, const void * __restrict source, size_t size);
+extern "C" void * __memcpy_sse2_unaligned(void * __restrict destination, const void * __restrict source, size_t size);
+extern "C" void * __memcpy_ssse3(void * __restrict destination, const void * __restrict source, size_t size);
+extern "C" void * __memcpy_ssse3_back(void * __restrict destination, const void * __restrict source, size_t size);
+extern "C" void * __memcpy_avx_unaligned(void * __restrict destination, const void * __restrict source, size_t size);
+extern "C" void * __memcpy_avx_unaligned_erms(void * __restrict destination, const void * __restrict source, size_t size);
+extern "C" void * __memcpy_avx512_unaligned(void * __restrict destination, const void * __restrict source, size_t size);
+extern "C" void * __memcpy_avx512_unaligned_erms(void * __restrict destination, const void * __restrict source, size_t size);
+extern "C" void * __memcpy_avx512_no_vzeroupper(void * __restrict destination, const void * __restrict source, size_t size);
+
+
+#define VARIANT(N, NAME) \
+    if (memcpy_variant == N) \
+        return test(dst, src, size, iterations, num_threads, std::forward<F>(generator), NAME, #NAME);
+
+template <typename F>
+uint64_t dispatchMemcpyVariants(size_t memcpy_variant, uint8_t * dst, uint8_t * src, size_t size, size_t iterations, size_t num_threads, F && generator)
+{
+    memcpy_type memcpy_libc_old = reinterpret_cast<memcpy_type>(dlsym(RTLD_NEXT, "memcpy"));
+
+    VARIANT(1, memcpy)
+    VARIANT(2, memcpy_trivial)
+    VARIANT(3, memcpy_libc_old)
+    VARIANT(4, memcpy_erms)
+    VARIANT(5, MemCpy)
+    VARIANT(6, memcpySSE2)
+    VARIANT(7, memcpySSE2Unrolled2)
+    VARIANT(8, memcpySSE2Unrolled4)
+    VARIANT(9, memcpySSE2Unrolled8)
+    VARIANT(10, memcpy_fast_sse)
+    VARIANT(11, memcpy_fast_avx)
+    VARIANT(12, memcpy_my)
+    VARIANT(13, memcpy_my2)
+
+    VARIANT(21, __memcpy_erms)
+    VARIANT(22, __memcpy_sse2_unaligned)
+    VARIANT(23, __memcpy_ssse3)
+    VARIANT(24, __memcpy_ssse3_back)
+    VARIANT(25, __memcpy_avx_unaligned)
+    VARIANT(26, __memcpy_avx_unaligned_erms)
+    VARIANT(27, __memcpy_avx512_unaligned)
+    VARIANT(28, __memcpy_avx512_unaligned_erms)
+    VARIANT(29, __memcpy_avx512_no_vzeroupper)
+
+    return 0;
+}
+
+uint64_t dispatchVariants(
+    size_t memcpy_variant, size_t generator_variant, uint8_t * dst, uint8_t * src, size_t size, size_t iterations, size_t num_threads)
+{
+    if (generator_variant == 1)
+        return dispatchMemcpyVariants(memcpy_variant, dst, src, size, iterations, num_threads, generatorUniform<16>);
+    if (generator_variant == 2)
+        return dispatchMemcpyVariants(memcpy_variant, dst, src, size, iterations, num_threads, generatorUniform<256>);
+    if (generator_variant == 3)
+        return dispatchMemcpyVariants(memcpy_variant, dst, src, size, iterations, num_threads, generatorUniform<4096>);
+    if (generator_variant == 4)
+        return dispatchMemcpyVariants(memcpy_variant, dst, src, size, iterations, num_threads, generatorUniform<65536>);
+    if (generator_variant == 5)
+        return dispatchMemcpyVariants(memcpy_variant, dst, src, size, iterations, num_threads, generatorUniform<1048576>);
+
+    return 0;
+}
+
+
+int main(int argc, char ** argv)
+{
+    boost::program_options::options_description desc("Allowed options");
+    desc.add_options()("help,h", "produce help message")
+        ("size", boost::program_options::value<size_t>()->default_value(1000000), "Bytes to copy on every iteration")
+        ("iterations", boost::program_options::value<size_t>(), "Number of iterations")
+        ("threads", boost::program_options::value<size_t>()->default_value(1), "Number of copying threads")
+        ("distribution", boost::program_options::value<size_t>()->default_value(4), "Distribution of chunk sizes to perform copy")
+        ("variant", boost::program_options::value<size_t>(), "Variant of memcpy implementation")
+        ("tsv", "Print result in tab-separated format")
+        ;
+
+    boost::program_options::variables_map options;
+    boost::program_options::store(boost::program_options::parse_command_line(argc, argv, desc), options);
+
+    if (options.count("help") || !options.count("variant"))
+    {
+        std::cout << R"(Usage:
+
+for size in 4096 16384 50000 65536 100000 1000000 10000000 100000000; do
+    for threads in 1 2 4 $(($(nproc) / 2)) $(nproc); do
+        for distribution in 1 2 3 4 5; do
+            for variant in {1..13} {21..29}; do
+                for i in {1..10}; do
+                    ./memcpy-bench --tsv --size $size --variant $variant --threads $threads --distribution $distribution;
+                done;
+            done;
+        done;
+    done;
+done | tee result.tsv
+
+clickhouse-local --structure '
+    name String,
+    size UInt64,
+    iterations UInt64,
+    threads UInt16,
+    generator UInt8,
+    memcpy UInt8,
+    elapsed UInt64
+' --query "
+    SELECT
+        size, name,
+        avg(1000 * elapsed / size / iterations) AS s,
+        count() AS c
+    FROM table
+    GROUP BY size, name
+    ORDER BY size ASC, s DESC
+" --output-format PrettyCompact < result.tsv
+
+)" << std::endl;
+        std::cout << desc << std::endl;
+        return 1;
+    }
+
+    size_t size = options["size"].as<size_t>();
+    size_t num_threads = options["threads"].as<size_t>();
+    size_t memcpy_variant = options["variant"].as<size_t>();
+    size_t generator_variant = options["distribution"].as<size_t>();
+
+    size_t iterations;
+    if (options.count("iterations"))
+    {
+        iterations = options["iterations"].as<size_t>();
+    }
+    else
+    {
+        iterations = 10000000000ULL / size;
+
+        if (generator_variant == 1)
+            iterations /= 10;
+    }
+
+    std::unique_ptr<uint8_t[]> src(new uint8_t[size]);
+    std::unique_ptr<uint8_t[]> dst(new uint8_t[size]);
+
+    /// Fill src with some pattern for validation.
+    for (size_t i = 0; i < size; ++i)
+        src[i] = i;
+
+    /// Fill dst to avoid page faults.
+    memset(dst.get(), 0, size);
+
+    uint64_t elapsed_ns = dispatchVariants(memcpy_variant, generator_variant, dst.get(), src.get(), size, iterations, num_threads);
+
+    std::cout << std::fixed << std::setprecision(3);
+
+    if (options.count("tsv"))
+    {
+        std::cout
+            << '\t' << size
+            << '\t' << iterations
+            << '\t' << num_threads
+            << '\t' << generator_variant
+            << '\t' << memcpy_variant
+            << '\t' << elapsed_ns
+            << '\n';
+    }
+    else
+    {
+        std::cout << ": " << num_threads << " threads, " << "size: " << size << ", distribution " << generator_variant
+            << ", processed in " << (elapsed_ns / 1e9) << " sec, " << (size * iterations * 1.0 / elapsed_ns) << " GB/sec\n";
+    }
+
+    return 0;
+}
diff --git a/utils/memcpy-bench/memcpy_jart.S b/utils/memcpy-bench/memcpy_jart.S
new file mode 100644
index 00000000000..50430d0abe0
--- /dev/null
+++ b/utils/memcpy-bench/memcpy_jart.S
@@ -0,0 +1,138 @@
+/*-*- mode:unix-assembly; indent-tabs-mode:t; tab-width:8; coding:utf-8     -*-│
+│vi: set et ft=asm ts=8 tw=8 fenc=utf-8                                     :vi│
+╞══════════════════════════════════════════════════════════════════════════════╡
+│ Copyright 2020 Justine Alexandra Roberts Tunney                              │
+│                                                                              │
+│ Permission to use, copy, modify, and/or distribute this software for         │
+│ any purpose with or without fee is hereby granted, provided that the         │
+│ above copyright notice and this permission notice appear in all copies.      │
+│                                                                              │
+│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL                │
+│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED                │
+│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE             │
+│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL         │
+│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR        │
+│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER               │
+│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
+│ PERFORMANCE OF THIS SOFTWARE.                                                │
+╚─────────────────────────────────────────────────────────────────────────────*/
+
+//	Copies memory.
+//
+//	DEST and SRC must not overlap, unless DEST≤SRC.
+//
+//	@param	rdi is dest
+//	@param	rsi is src
+//	@param	rdx is number of bytes
+//	@return	original rdi copied to rax
+//	@mode	long
+//	@asyncsignalsafe
+memcpy_jart:	mov	%rdi,%rax
+//	𝑠𝑙𝑖𝑑𝑒
+	.align	16
+	.type	memcpy_jart,@function
+	.size	memcpy_jart,.-memcpy_jart
+	.globl	memcpy_jart
+
+//	Copies memory w/ minimal impact ABI.
+//
+//	@param	rdi is dest
+//	@param	rsi is src
+//	@param	rdx is number of bytes
+//	@clob	flags,rcx,xmm3,xmm4
+//	@mode	long
+MemCpy:	mov	$.Lmemcpytab.size,%ecx
+	cmp	%rcx,%rdx
+	cmovb	%rdx,%rcx
+	jmp	*memcpytab(,%rcx,8)
+.Lanchorpoint:
+.L16r:	cmp	$1024,%rdx
+	jae	.Lerms
+.L16:	movdqu	-16(%rsi,%rdx),%xmm4
+	mov	$16,%rcx
+0:	add	$16,%rcx
+	movdqu	-32(%rsi,%rcx),%xmm3
+	movdqu	%xmm3,-32(%rdi,%rcx)
+	cmp	%rcx,%rdx
+	ja	0b
+	movdqu	%xmm4,-16(%rdi,%rdx)
+	pxor	%xmm4,%xmm4
+	pxor	%xmm3,%xmm3
+	jmp	.L0
+.L8:	push	%rbx
+	mov	(%rsi),%rcx
+	mov	-8(%rsi,%rdx),%rbx
+	mov	%rcx,(%rdi)
+	mov	%rbx,-8(%rdi,%rdx)
+1:	pop	%rbx
+.L0:	ret
+.L4:	push	%rbx
+	mov	(%rsi),%ecx
+	mov	-4(%rsi,%rdx),%ebx
+	mov	%ecx,(%rdi)
+	mov	%ebx,-4(%rdi,%rdx)
+	jmp	1b
+.L3:	push	%rbx
+	mov	(%rsi),%cx
+	mov	-2(%rsi,%rdx),%bx
+	mov	%cx,(%rdi)
+	mov	%bx,-2(%rdi,%rdx)
+	jmp	1b
+.L2:	mov	(%rsi),%cx
+	mov	%cx,(%rdi)
+	jmp	.L0
+.L1:	mov	(%rsi),%cl
+	mov	%cl,(%rdi)
+	jmp	.L0
+.Lerms:	cmp	$1024*1024,%rdx
+	ja	.Lnts
+	push	%rdi
+	push	%rsi
+	mov	%rdx,%rcx
+	rep movsb
+	pop	%rsi
+	pop	%rdi
+	jmp	.L0
+.Lnts:	movdqu	(%rsi),%xmm3
+	movdqu	%xmm3,(%rdi)
+	lea	16(%rdi),%rcx
+	and	$-16,%rcx
+	sub	%rdi,%rcx
+	add	%rcx,%rdi
+	add	%rcx,%rsi
+	sub	%rcx,%rdx
+	mov	$16,%rcx
+0:	add	$16,%rcx
+	movdqu	-32(%rsi,%rcx),%xmm3
+	movntdq	%xmm3,-32(%rdi,%rcx)
+	cmp	%rcx,%rdx
+	ja	0b
+	sfence
+	movdqu	-16(%rsi,%rdx),%xmm3
+	movdqu	%xmm3,-16(%rdi,%rdx)
+	pxor	%xmm3,%xmm3
+	jmp	.L0
+	.type	MemCpy,@function
+	.size	MemCpy,.-MemCpy
+	.globl	MemCpy
+
+	.section .rodata
+	.align	8
+memcpytab:
+	.quad	.L0
+	.quad	.L1
+	.quad	.L2
+	.quad	.L3
+	.rept	4
+	.quad	.L4
+	.endr
+	.rept	8
+	.quad	.L8
+	.endr
+	.rept	16
+	.quad	.L16
+	.endr
+	.equ	.Lmemcpytab.size,(.-memcpytab)/8
+	.quad	.L16r # SSE + ERMS + NTS
+	.type	memcpytab,@object
+	.previous
diff --git a/utils/simple-backport/changelog.sh b/utils/simple-backport/changelog.sh
index d3d9714cb04..ca2dcfffff0 100755
--- a/utils/simple-backport/changelog.sh
+++ b/utils/simple-backport/changelog.sh
@@ -39,7 +39,7 @@ function github_download()
     local file=${2}
     if ! [ -f "$file" ]
     then
-        if ! curl -H "Authorization: token $GITHUB_TOKEN" \
+        if ! curl -u "$GITHUB_USER:$GITHUB_TOKEN" \
                 -sSf "$url" \
                 > "$file"
         then
diff --git a/utils/test-data-generator/CMakeLists.txt b/utils/test-data-generator/CMakeLists.txt
deleted file mode 100644
index 80d7d4301e7..00000000000
--- a/utils/test-data-generator/CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-# Disable clang-tidy for protobuf generated files
-set (CMAKE_CXX_CLANG_TIDY "")
-
-if (USE_PROTOBUF)
-    protobuf_generate_cpp(ProtobufDelimitedMessagesSerializer_Srcs ProtobufDelimitedMessagesSerializer_Hdrs ${CMAKE_CURRENT_SOURCE_DIR}/../../tests/queries/0_stateless/00825_protobuf_format.proto)
-    protobuf_generate_cpp(ProtobufDelimitedMessagesSerializer_Srcs2 ProtobufDelimitedMessagesSerializer_Hdrs2 ${CMAKE_CURRENT_SOURCE_DIR}/../../tests/queries/0_stateless/00825_protobuf_format_syntax2.proto)
-    add_executable (ProtobufDelimitedMessagesSerializer ProtobufDelimitedMessagesSerializer.cpp ${ProtobufDelimitedMessagesSerializer_Srcs} ${ProtobufDelimitedMessagesSerializer_Hdrs} ${ProtobufDelimitedMessagesSerializer_Srcs2} ${ProtobufDelimitedMessagesSerializer_Hdrs2})
-    target_include_directories (ProtobufDelimitedMessagesSerializer SYSTEM BEFORE PRIVATE ${Protobuf_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
-    target_link_libraries (ProtobufDelimitedMessagesSerializer PRIVATE ${Protobuf_LIBRARY} boost::program_options)
-    get_filename_component(ProtobufDelimitedMessagesSerializer_OutputDir "${CMAKE_CURRENT_LIST_DIR}/../../tests/queries/0_stateless" REALPATH)
-    target_compile_definitions(ProtobufDelimitedMessagesSerializer PRIVATE OUTPUT_DIR="${ProtobufDelimitedMessagesSerializer_OutputDir}")
-
-    # Protoc generates substandard code.
-    check_cxx_compiler_flag("-Wsuggest-destructor-override" HAS_SUGGEST_DESTRUCTOR_OVERRIDE)
-    if (HAS_SUGGEST_OVERRIDE)
-        target_compile_options(ProtobufDelimitedMessagesSerializer PRIVATE -Wno-suggest-destructor-override)
-    endif()
-endif ()
diff --git a/utils/test-data-generator/ProtobufDelimitedMessagesSerializer.cpp b/utils/test-data-generator/ProtobufDelimitedMessagesSerializer.cpp
deleted file mode 100644
index ad465913313..00000000000
--- a/utils/test-data-generator/ProtobufDelimitedMessagesSerializer.cpp
+++ /dev/null
@@ -1,728 +0,0 @@
-// Generator of protobuf delimited messages used in the protobuf IO tests
-// tests/queries/0_stateless/00825_protobuf_format*
-
-#include <boost/program_options.hpp>
-#include <fstream>
-#include <iostream>
-#include <google/protobuf/util/delimited_message_util.h>
-#include "00825_protobuf_format.pb.h"
-#include "00825_protobuf_format_syntax2.pb.h"
-
-
-void writeInsertDataQueryForInputTest(std::stringstream & delimited_messages, const std::string & table_name, const std::string & format_schema, std::ostream & out)    // STYLE_CHECK_ALLOW_STD_STRING_STREAM
-{
-    out << "echo -ne '";
-    std::string bytes = delimited_messages.str();
-    delimited_messages.str("");
-    for (const char c : bytes)
-    {
-        char buf[5];
-        sprintf(buf, "\\x%02x", static_cast<unsigned char>(c));
-        out << buf;
-    }
-    out << "' | $CLICKHOUSE_CLIENT --query=\"INSERT INTO " << table_name << " FORMAT Protobuf"
-           " SETTINGS format_schema = '$CURDIR/"
-        << format_schema << "'\"" << std::endl;
-}
-
-void writeInsertDataQueriesForInputTest(std::ostream & out)
-{
-    std::stringstream ss;       // STYLE_CHECK_ALLOW_STD_STRING_STREAM
-    {
-        Person person;
-        person.set_uuid("a7522158-3d41-4b77-ad69-6c598ee55c49");
-        person.set_name("Ivan");
-        person.set_surname("Petrov");
-        person.set_gender(Gender::male);
-        person.set_birthdate(4015); // 1980-12-29
-        person.set_photo("png");
-        person.set_phonenumber("+74951234567");
-        person.set_isonline(true);
-        person.set_visittime(1546703100); // 2019-01-05 18:45:00
-        person.set_age(38);
-        person.set_zodiacsign(ZodiacSign::capricorn);
-        person.add_songs("Yesterday");
-        person.add_songs("Flowers");
-        person.add_color(255);
-        person.add_color(0);
-        person.add_color(0);
-        person.set_hometown("Moscow");
-        person.add_location(55.753215);
-        person.add_location(37.622504);
-        person.set_pi(3.14);
-        person.set_lotterywin(214.10);
-        person.set_someratio(0.1);
-        person.set_temperature(5.8);
-        person.set_randombignumber(17060000000);
-        auto* mu = person.add_measureunits();
-        mu->set_unit("meter");
-        mu->set_coef(1);
-        mu = person.add_measureunits();
-        mu->set_unit("centimeter");
-        mu->set_coef(0.01);
-        mu = person.add_measureunits();
-        mu->set_unit("kilometer");
-        mu->set_coef(1000);
-        person.mutable_nestiness()->mutable_a()->mutable_b()->mutable_c()->set_d(500);
-        person.mutable_nestiness()->mutable_a()->mutable_b()->mutable_c()->add_e(501);
-        person.mutable_nestiness()->mutable_a()->mutable_b()->mutable_c()->add_e(502);
-        google::protobuf::util::SerializeDelimitedToOstream(person, &ss);
-    }
-
-    {
-        Person person;
-        person.set_uuid("c694ad8a-f714-4ea3-907d-fd54fb25d9b5");
-        person.set_name("Natalia");
-        person.set_surname("Sokolova");
-        person.set_gender(Gender::female);
-        person.set_birthdate(8102); // 1992-03-08
-        person.set_photo("jpg");
-        person.set_isonline(false);
-        person.set_age(26);
-        person.set_zodiacsign(ZodiacSign::pisces);
-        person.add_color(100);
-        person.add_color(200);
-        person.add_color(50);
-        person.set_hometown("Plymouth");
-        person.add_location(50.403724);
-        person.add_location(-4.142123);
-        person.set_pi(3.14159);
-        person.set_someratio(0.007);
-        person.set_temperature(5.4);
-        person.set_randombignumber(-20000000000000);
-        google::protobuf::util::SerializeDelimitedToOstream(person, &ss);
-    }
-
-    {
-        Person person;
-        person.set_uuid("a7da1aa6-f425-4789-8947-b034786ed374");
-        person.set_name("Vasily");
-        person.set_surname("Sidorov");
-        person.set_gender(Gender::male);
-        person.set_birthdate(9339); // 1995-07-28
-        person.set_photo("bmp");
-        person.set_phonenumber("+442012345678");
-        person.set_isonline(true);
-        person.set_visittime(1546117200); // 2018-12-30 00:00:00
-        person.set_age(23);
-        person.set_zodiacsign(ZodiacSign::leo);
-        person.add_songs("Sunny");
-        person.add_color(250);
-        person.add_color(244);
-        person.add_color(10);
-        person.set_hometown("Murmansk");
-        person.add_location(68.970682);
-        person.add_location(33.074981);
-        person.set_pi(3.14159265358979);
-        person.set_lotterywin(100000000000);
-        person.set_someratio(800);
-        person.set_temperature(-3.2);
-        person.set_randombignumber(154400000);
-        auto* mu = person.add_measureunits();
-        mu->set_unit("pound");
-        mu->set_coef(16);
-        person.mutable_nestiness()->mutable_a()->mutable_b()->mutable_c()->set_d(503);
-        google::protobuf::util::SerializeDelimitedToOstream(person, &ss);
-    }
-
-    writeInsertDataQueryForInputTest(ss, "in_persons_00825", "00825_protobuf_format:Person", out);
-
-    {
-        AltPerson person;
-        person.add_location(42);
-        person.add_location(-88);
-        person.set_pi(3.141);
-        person.set_uuid("20fcd95a-332d-41db-a9ec-161f644d059c");
-        person.set_name("Frida");
-        person.set_gender(AltPerson::female);
-        person.set_zodiacsign(1122); // sagittarius
-        person.set_birthdate(3267); // 1978-12-12
-        person.set_age("40");
-        person.set_isonline(OnlineStatus::offline);
-        person.set_someratio(0.5);
-        person.set_visittime(1363005000); // 2013-03-11 16:30:00
-        person.set_randombignumber(8010000009);
-        person.add_color(110);
-        person.add_color(210);
-        person.add_color(74);
-        person.set_lotterywin(311);
-        person.set_surname("Ermakova");
-        person.set_phonenumber(3124555929);
-        person.set_temperature(10);
-        person.add_measureunits_unit("KB");
-        person.add_measureunits_coef(1024);
-        person.add_measureunits_unit("MB");
-        person.add_measureunits_coef(1048576);
-        person.set_nestiness_a_b_c_d(700);
-        person.add_nestiness_a_b_c_e(701);
-        google::protobuf::util::SerializeDelimitedToOstream(person, &ss);
-    }
-
-    {
-        AltPerson person;
-        person.add_location(26);
-        person.add_location(-80);
-        person.set_pi(3.1416);
-        person.set_uuid("7cfa6856-a54a-4786-b8e5-745159d52278");
-        person.set_name("Isolde");
-        person.set_gender(AltPerson::female);
-        person.set_zodiacsign(120); // aquarius
-        person.set_birthdate(6248); // 1987-02-09
-        person.set_age("32");
-        person.set_isonline(OnlineStatus::online);
-        person.set_someratio(4.5);
-        person.set_randombignumber(-11111111111111);
-        person.add_color(255);
-        person.add_color(0);
-        person.add_color(255);
-        person.set_surname("Lavrova");
-        person.set_temperature(25);
-        person.set_newfieldstr("abc");
-        person.set_newfieldbool(true);
-        person.add_newfieldint(44);
-        person.add_measureunits_unit("Byte");
-        person.add_measureunits_coef(8);
-        person.add_measureunits_unit("Bit");
-        person.add_measureunits_coef(1);
-        person.mutable_newmessage()->set_z(91);
-        person.set_nestiness_a_b_c_d(702);
-        google::protobuf::util::SerializeDelimitedToOstream(person, &ss);
-    }
-
-    writeInsertDataQueryForInputTest(ss, "in_persons_00825", "00825_protobuf_format:AltPerson", out);
-
-    {
-        StrPerson person;
-        person.set_uuid("aa0e5a06-cab2-4034-a6a2-48e82b91664e");
-        person.set_name("Leonid");
-        person.set_surname("Kirillov");
-        person.set_gender("male");
-        person.set_birthdate("1983-06-24");
-        person.set_phonenumber("+74950275864");
-        person.set_isonline("1");
-        person.set_visittime("2019-02-04 09:45:00");
-        person.set_age("35");
-        person.set_zodiacsign("cancer");
-        person.add_songs("7 rings");
-        person.add_songs("Eastside");
-        person.add_songs("Last Hurrah");
-        person.add_color("0");
-        person.add_color("0");
-        person.add_color("255");
-        person.set_hometown("San Diego");
-        person.add_location("32.823943");
-        person.add_location("-117.081327");
-        person.set_pi("3.1415927");
-        person.set_lotterywin("15000000");
-        person.set_someratio("186.75");
-        person.set_temperature("-2.1");
-        person.set_randombignumber("20659829331");
-        person.mutable_measureunits()->add_unit("minute");
-        person.mutable_measureunits()->add_coef("60");
-        person.mutable_measureunits()->add_unit("hour");
-        person.mutable_measureunits()->add_coef("3600");
-        person.mutable_nestiness_a()->mutable_b_c()->add_e("1800");
-        google::protobuf::util::SerializeDelimitedToOstream(person, &ss);
-    }
-
-    writeInsertDataQueryForInputTest(ss, "in_persons_00825", "00825_protobuf_format:StrPerson", out);
-
-    {
-        Syntax2Person person;
-        person.set_uuid("3faee064-c4f7-4d34-b6f3-8d81c2b6a15d");
-        person.set_name("Nick");
-        person.set_surname("Kolesnikov");
-        person.set_gender(Syntax2Person::male);
-        person.set_birthdate(10586); // 1998-12-26
-        person.set_photo("bmp");
-        person.set_phonenumber("412-687-5007");
-        person.set_isonline(true);
-        person.set_visittime(1542596399); // 2018-11-19 05:59:59
-        person.set_age(20);
-        person.set_zodiacsign(Syntax2Person::capricorn);
-        person.add_songs("Havana");
-        person.add_color(128);
-        person.add_color(0);
-        person.add_color(128);
-        person.set_hometown("Pittsburgh");
-        person.add_location(40.517193);
-        person.add_location(-79.949452);
-        person.set_pi(3.1415926535898);
-        person.set_lotterywin(50000000000);
-        person.set_someratio(780);
-        person.set_temperature(18.3);
-        person.set_randombignumber(195500007);
-        person.mutable_measureunits()->add_unit("ounce");
-        person.mutable_measureunits()->add_coef(28.35);
-        person.mutable_measureunits()->add_unit("carat");
-        person.mutable_measureunits()->add_coef(0.2);
-        person.mutable_measureunits()->add_unit("gram");
-        person.mutable_measureunits()->add_coef(1);
-        person.mutable_nestiness()->mutable_a()->mutable_b()->mutable_c()->set_d(9494);
-        google::protobuf::util::SerializeDelimitedToOstream(person, &ss);
-    }
-
-    writeInsertDataQueryForInputTest(ss, "in_persons_00825", "00825_protobuf_format_syntax2:Syntax2Person", out);
-
-    {
-        NumberAndSquare ns;
-        ns.set_number(2);
-        ns.set_square(4);
-        google::protobuf::util::SerializeDelimitedToOstream(ns, &ss);
-    }
-
-    {
-        NumberAndSquare ns;
-        ns.set_number(0);
-        ns.set_square(0);
-        google::protobuf::util::SerializeDelimitedToOstream(ns, &ss);
-    }
-
-    {
-        NumberAndSquare ns;
-        ns.set_number(3);
-        ns.set_square(9);
-        google::protobuf::util::SerializeDelimitedToOstream(ns, &ss);
-    }
-
-    writeInsertDataQueryForInputTest(ss, "in_squares_00825", "00825_protobuf_format:NumberAndSquare", out);
-}
-
-
-void writeReferenceForOutputTest(std::ostream & out)
-{
-    {
-        Person person;
-        person.set_uuid("a7522158-3d41-4b77-ad69-6c598ee55c49");
-        person.set_name("Ivan");
-        person.set_surname("Petrov");
-        person.set_gender(Gender::male);
-        person.set_birthdate(4015); // 1980-12-29
-        person.set_photo("png");
-        person.set_phonenumber(std::string("+74951234567\0", 13)); // Converted from FixedString(13)
-        person.set_isonline(true);
-        person.set_visittime(1546703100); // 2019-01-05 18:45:00
-        person.set_age(38);
-        person.set_zodiacsign(ZodiacSign::capricorn);
-        person.add_songs("Yesterday");
-        person.add_songs("Flowers");
-        person.add_color(255);
-        person.add_color(0);
-        person.add_color(0);
-        person.set_hometown("Moscow");
-        person.add_location(55.753215);
-        person.add_location(37.622504);
-        person.set_pi(3.14);
-        person.set_lotterywin(214.10);
-        person.set_someratio(0.1);
-        person.set_temperature(5.8);
-        person.set_randombignumber(17060000000);
-        auto* mu = person.add_measureunits();
-        mu->set_unit("meter");
-        mu->set_coef(1);
-        mu = person.add_measureunits();
-        mu->set_unit("centimeter");
-        mu->set_coef(0.01);
-        mu = person.add_measureunits();
-        mu->set_unit("kilometer");
-        mu->set_coef(1000);
-        person.mutable_nestiness()->mutable_a()->mutable_b()->mutable_c()->set_d(500);
-        person.mutable_nestiness()->mutable_a()->mutable_b()->mutable_c()->add_e(501);
-        person.mutable_nestiness()->mutable_a()->mutable_b()->mutable_c()->add_e(502);
-        google::protobuf::util::SerializeDelimitedToOstream(person, &out);
-    }
-
-    {
-        Person person;
-        person.set_uuid("c694ad8a-f714-4ea3-907d-fd54fb25d9b5");
-        person.set_name("Natalia");
-        person.set_surname("Sokolova");
-        person.set_gender(Gender::female);
-        person.set_birthdate(8102); // 1992-03-08
-        person.set_photo("jpg");
-        person.set_isonline(false);
-        person.set_age(26);
-        person.set_zodiacsign(ZodiacSign::pisces);
-        person.add_color(100);
-        person.add_color(200);
-        person.add_color(50);
-        person.set_hometown("Plymouth");
-        person.add_location(50.403724);
-        person.add_location(-4.142123);
-        person.set_pi(3.14159);
-        person.set_someratio(0.007);
-        person.set_temperature(5.4);
-        person.set_randombignumber(-20000000000000);
-        google::protobuf::util::SerializeDelimitedToOstream(person, &out);
-    }
-
-    {
-        Person person;
-        person.set_uuid("a7da1aa6-f425-4789-8947-b034786ed374");
-        person.set_name("Vasily");
-        person.set_surname("Sidorov");
-        person.set_gender(Gender::male);
-        person.set_birthdate(9339); // 1995-07-28
-        person.set_photo("bmp");
-        person.set_phonenumber("+442012345678");
-        person.set_isonline(true);
-        person.set_visittime(1546117200); // 2018-12-30 00:00:00
-        person.set_age(23);
-        person.set_zodiacsign(ZodiacSign::leo);
-        person.add_songs("Sunny");
-        person.add_color(250);
-        person.add_color(244);
-        person.add_color(10);
-        person.set_hometown("Murmansk");
-        person.add_location(68.970682);
-        person.add_location(33.074981);
-        person.set_pi(3.14159265358979);
-        person.set_lotterywin(100000000000);
-        person.set_someratio(800);
-        person.set_temperature(-3.2);
-        person.set_randombignumber(154400000);
-        auto* mu = person.add_measureunits();
-        mu->set_unit("pound");
-        mu->set_coef(16);
-        person.mutable_nestiness()->mutable_a()->mutable_b()->mutable_c()->set_d(503);
-        google::protobuf::util::SerializeDelimitedToOstream(person, &out);
-    }
-
-    out << "ALTERNATIVE->" << std::endl;
-
-    {
-        AltPerson person;
-        person.add_location(55);
-        person.add_location(37);
-        person.set_pi(3.14);
-        person.set_uuid("a7522158-3d41-4b77-ad69-6c598ee55c49");
-        person.set_name("Ivan");
-        person.set_gender(AltPerson::male);
-        person.set_zodiacsign(1222); // capricorn
-        person.set_birthdate(4015); // 1980-12-29
-        person.set_age("38");
-        person.set_isonline(OnlineStatus::online);
-        person.set_someratio(0.100000001490116119384765625); // 0.1 converted from float to double
-        person.set_visittime(1546703100); // 2019-01-05 18:45:00
-        person.set_randombignumber(17060000000);
-        person.add_color(255);
-        person.add_color(0);
-        person.add_color(0);
-        person.set_lotterywin(214);
-        person.set_surname("Petrov");
-        person.set_phonenumber(+74951234567);
-        person.set_temperature(5);
-        person.add_measureunits_unit("meter");
-        person.add_measureunits_coef(1);
-        person.add_measureunits_unit("centimeter");
-        person.add_measureunits_coef(0.01);
-        person.add_measureunits_unit("kilometer");
-        person.add_measureunits_coef(1000);
-        person.set_nestiness_a_b_c_d(500);
-        person.add_nestiness_a_b_c_e(501);
-        person.add_nestiness_a_b_c_e(502);
-        google::protobuf::util::SerializeDelimitedToOstream(person, &out);
-    }
-
-    {
-        AltPerson person;
-        person.add_location(50);
-        person.add_location(-4);
-        person.set_pi(3.14159);
-        person.set_uuid("c694ad8a-f714-4ea3-907d-fd54fb25d9b5");
-        person.set_name("Natalia");
-        person.set_gender(AltPerson::female);
-        person.set_zodiacsign(219); // pisces
-        person.set_birthdate(8102); // 1992-03-08
-        person.set_age("26");
-        person.set_isonline(OnlineStatus::offline);
-        person.set_someratio(0.007000000216066837310791015625); // 0.007 converted from float to double
-        person.set_randombignumber(-20000000000000);
-        person.add_color(100);
-        person.add_color(200);
-        person.add_color(50);
-        person.set_surname("Sokolova");
-        person.set_temperature(5);
-        google::protobuf::util::SerializeDelimitedToOstream(person, &out);
-    }
-
-    {
-        AltPerson person;
-        person.add_location(68);
-        person.add_location(33);
-        person.set_pi(3.1415926535897);
-        person.set_uuid("a7da1aa6-f425-4789-8947-b034786ed374");
-        person.set_name("Vasily");
-        person.set_gender(AltPerson::male);
-        person.set_zodiacsign(723); // leo
-        person.set_birthdate(9339); // 1995-07-28
-        person.set_age("23");
-        person.set_isonline(OnlineStatus::online);
-        person.set_someratio(800);
-        person.set_visittime(1546117200); // 2018-12-30 00:00:00
-        person.set_randombignumber(154400000);
-        person.add_color(250);
-        person.add_color(244);
-        person.add_color(10);
-        person.set_lotterywin(100000000000);
-        person.set_surname("Sidorov");
-        person.set_phonenumber(+442012345678);
-        person.set_temperature(-3);
-        person.add_measureunits_unit("pound");
-        person.add_measureunits_coef(16);
-        person.set_nestiness_a_b_c_d(503);
-        google::protobuf::util::SerializeDelimitedToOstream(person, &out);
-    }
-
-    out << "STRINGS->" << std::endl;
-
-    {
-        StrPerson person;
-        person.set_uuid("a7522158-3d41-4b77-ad69-6c598ee55c49");
-        person.set_name("Ivan");
-        person.set_surname("Petrov");
-        person.set_gender("male");
-        person.set_birthdate("1980-12-29");
-        person.set_phonenumber(std::string("+74951234567\0", 13)); // Converted from FixedString(13)
-        person.set_isonline("1");
-        person.set_visittime("2019-01-05 18:45:00");
-        person.set_age("38");
-        person.set_zodiacsign("capricorn");
-        person.add_songs("Yesterday");
-        person.add_songs("Flowers");
-        person.add_color("255");
-        person.add_color("0");
-        person.add_color("0");
-        person.set_hometown("Moscow");
-        person.add_location("55.753215");
-        person.add_location("37.622504");
-        person.set_pi("3.14");
-        person.set_lotterywin("214.10");
-        person.set_someratio("0.1");
-        person.set_temperature("5.8");
-        person.set_randombignumber("17060000000");
-        person.mutable_measureunits()->add_unit("meter");
-        person.mutable_measureunits()->add_coef("1");
-        person.mutable_measureunits()->add_unit("centimeter");
-        person.mutable_measureunits()->add_coef("0.01");
-        person.mutable_measureunits()->add_unit("kilometer");
-        person.mutable_measureunits()->add_coef("1000");
-        person.mutable_nestiness_a()->mutable_b_c()->set_d("500");
-        person.mutable_nestiness_a()->mutable_b_c()->add_e("501");
-        person.mutable_nestiness_a()->mutable_b_c()->add_e("502");
-        google::protobuf::util::SerializeDelimitedToOstream(person, &out);
-    }
-
-    {
-        StrPerson person;
-        person.set_uuid("c694ad8a-f714-4ea3-907d-fd54fb25d9b5");
-        person.set_name("Natalia");
-        person.set_surname("Sokolova");
-        person.set_gender("female");
-        person.set_birthdate("1992-03-08");
-        person.set_isonline("0");
-        person.set_age("26");
-        person.set_zodiacsign("pisces");
-        person.add_color("100");
-        person.add_color("200");
-        person.add_color("50");
-        person.set_hometown("Plymouth");
-        person.add_location("50.403724");
-        person.add_location("-4.142123");
-        person.set_pi("3.14159");
-        person.set_someratio("0.007");
-        person.set_temperature("5.4");
-        person.set_randombignumber("-20000000000000");
-        google::protobuf::util::SerializeDelimitedToOstream(person, &out);
-    }
-
-    {
-        StrPerson person;
-        person.set_uuid("a7da1aa6-f425-4789-8947-b034786ed374");
-        person.set_name("Vasily");
-        person.set_surname("Sidorov");
-        person.set_gender("male");
-        person.set_birthdate("1995-07-28");
-        person.set_phonenumber("+442012345678");
-        person.set_isonline("1");
-        person.set_visittime("2018-12-30 00:00:00");
-        person.set_age("23");
-        person.set_zodiacsign("leo");
-        person.add_songs("Sunny");
-        person.add_color("250");
-        person.add_color("244");
-        person.add_color("10");
-        person.set_hometown("Murmansk");
-        person.add_location("68.970682");
-        person.add_location("33.074981");
-        person.set_pi("3.14159265358979");
-        person.set_lotterywin("100000000000.00");
-        person.set_someratio("800");
-        person.set_temperature("-3.2");
-        person.set_randombignumber("154400000");
-        person.mutable_measureunits()->add_unit("pound");
-        person.mutable_measureunits()->add_coef("16");
-        person.mutable_nestiness_a()->mutable_b_c()->set_d("503");
-        google::protobuf::util::SerializeDelimitedToOstream(person, &out);
-    }
-
-    out << "SYNTAX2->" << std::endl;
-
-    {
-        Syntax2Person person;
-        person.set_uuid("a7522158-3d41-4b77-ad69-6c598ee55c49");
-        person.set_name("Ivan");
-        person.set_surname("Petrov");
-        person.set_gender(Syntax2Person::male);
-        person.set_birthdate(4015); // 1980-12-29
-        person.set_photo("png");
-        person.set_phonenumber(std::string("+74951234567\0", 13)); // Converted from FixedString(13)
-        person.set_isonline(true);
-        person.set_visittime(1546703100); // 2019-01-05 18:45:00
-        person.set_age(38);
-        person.set_zodiacsign(Syntax2Person::capricorn);
-        person.add_songs("Yesterday");
-        person.add_songs("Flowers");
-        person.add_color(255);
-        person.add_color(0);
-        person.add_color(0);
-        person.set_hometown("Moscow");
-        person.add_location(55.753215);
-        person.add_location(37.622504);
-        person.set_pi(3.14);
-        person.set_lotterywin(214.10);
-        person.set_someratio(0.1);
-        person.set_temperature(5.8);
-        person.set_randombignumber(17060000000);
-        person.mutable_measureunits()->add_unit("meter");
-        person.mutable_measureunits()->add_coef(1);
-        person.mutable_measureunits()->add_unit("centimeter");
-        person.mutable_measureunits()->add_coef(0.01);
-        person.mutable_measureunits()->add_unit("kilometer");
-        person.mutable_measureunits()->add_coef(1000);
-        person.mutable_nestiness()->mutable_a()->mutable_b()->mutable_c()->set_d(500);
-        person.mutable_nestiness()->mutable_a()->mutable_b()->mutable_c()->add_e(501);
-        person.mutable_nestiness()->mutable_a()->mutable_b()->mutable_c()->add_e(502);
-        google::protobuf::util::SerializeDelimitedToOstream(person, &out);
-    }
-
-    {
-        Syntax2Person person;
-        person.set_uuid("c694ad8a-f714-4ea3-907d-fd54fb25d9b5");
-        person.set_name("Natalia");
-        person.set_surname("Sokolova");
-        person.set_gender(Syntax2Person::female);
-        person.set_birthdate(8102); // 1992-03-08
-        person.set_photo("jpg");
-        person.set_isonline(false);
-        person.set_age(26);
-        person.set_zodiacsign(Syntax2Person::pisces);
-        person.add_color(100);
-        person.add_color(200);
-        person.add_color(50);
-        person.set_hometown("Plymouth");
-        person.add_location(50.403724);
-        person.add_location(-4.142123);
-        person.set_pi(3.14159);
-        person.set_someratio(0.007);
-        person.set_temperature(5.4);
-        person.set_randombignumber(-20000000000000);
-        google::protobuf::util::SerializeDelimitedToOstream(person, &out);
-    }
-
-    {
-        Syntax2Person person;
-        person.set_uuid("a7da1aa6-f425-4789-8947-b034786ed374");
-        person.set_name("Vasily");
-        person.set_surname("Sidorov");
-        person.set_gender(Syntax2Person::male);
-        person.set_birthdate(9339); // 1995-07-28
-        person.set_photo("bmp");
-        person.set_phonenumber("+442012345678");
-        person.set_isonline(true);
-        person.set_visittime(1546117200); // 2018-12-30 00:00:00
-        person.set_age(23);
-        person.set_zodiacsign(Syntax2Person::leo);
-        person.add_songs("Sunny");
-        person.add_color(250);
-        person.add_color(244);
-        person.add_color(10);
-        person.set_hometown("Murmansk");
-        person.add_location(68.970682);
-        person.add_location(33.074981);
-        person.set_pi(3.14159265358979);
-        person.set_lotterywin(100000000000);
-        person.set_someratio(800);
-        person.set_temperature(-3.2);
-        person.set_randombignumber(154400000);
-        person.mutable_measureunits()->add_unit("pound");
-        person.mutable_measureunits()->add_coef(16);
-        person.mutable_nestiness()->mutable_a()->mutable_b()->mutable_c()->set_d(503);
-        google::protobuf::util::SerializeDelimitedToOstream(person, &out);
-    }
-
-    out << "SQUARES->" << std::endl;
-
-    {
-        NumberAndSquare ns;
-        ns.set_number(0);
-        ns.set_square(0);
-        google::protobuf::util::SerializeDelimitedToOstream(ns, &out);
-    }
-
-    {
-        NumberAndSquare ns;
-        ns.set_number(2);
-        ns.set_square(4);
-        google::protobuf::util::SerializeDelimitedToOstream(ns, &out);
-    }
-
-    {
-        NumberAndSquare ns;
-        ns.set_number(3);
-        ns.set_square(9);
-        google::protobuf::util::SerializeDelimitedToOstream(ns, &out);
-    }
-}
-
-
-void parseCommandLine(int argc, char ** argv, std::string & output_dir)
-{
-    namespace po = boost::program_options;
-    po::options_description desc;
-    output_dir = OUTPUT_DIR;
-    desc.add_options()
-        ("help,h", "Show help")
-        ("directory,d", po::value<std::string>(&output_dir),
-         "Set the output directory. By default it's " OUTPUT_DIR);
-    po::parsed_options parsed = po::command_line_parser(argc, argv).options(desc).run();
-    po::variables_map vm;
-    po::store(parsed, vm);
-    po::notify(vm);
-    if (!output_dir.empty())
-        return;
-
-    // Show help.
-    std::cout << "This utility generates delimited messages for tests checking protobuf IO support." << std::endl;
-    std::cout << desc;
-    std::cout << "Example:" << std::endl;
-    std::cout << argv[0] << " -g OUTPUT_REFERENCE" << std::endl;
-    std::exit(0);
-}
-
-void writeFile(const std::string & filepath, void (*fn)(std::ostream &))
-{
-    std::cout << "Writing '" << filepath << "' ... ";
-    std::fstream out(filepath, std::fstream::out | std::fstream::trunc);
-    fn(out);
-    std::cout << "done." << std::endl;
-}
-
-int main(int argc, char ** argv)
-{
-    std::string output_dir;
-    parseCommandLine(argc, argv, output_dir);
-    writeFile(output_dir + "/00825_protobuf_format_input.insh", writeInsertDataQueriesForInputTest);
-    writeFile(output_dir + "/00825_protobuf_format_output.reference", writeReferenceForOutputTest);
-    return 0;
-}
diff --git a/utils/wikistat-loader/main.cpp b/utils/wikistat-loader/main.cpp
index f2adcc43a3a..31ade014c74 100644
--- a/utils/wikistat-loader/main.cpp
+++ b/utils/wikistat-loader/main.cpp
@@ -151,7 +151,7 @@ try
 
     std::string time_str = options.at("time").as<std::string>();
     LocalDateTime time(time_str);
-    LocalDate date(time);
+    LocalDate date(time_str);
 
     DB::ReadBufferFromFileDescriptor in(STDIN_FILENO);
     DB::WriteBufferFromFileDescriptor out(STDOUT_FILENO);
diff --git a/utils/zookeeper-dump-tree/main.cpp b/utils/zookeeper-dump-tree/main.cpp
index 5ab7bc2d536..893056564bb 100644
--- a/utils/zookeeper-dump-tree/main.cpp
+++ b/utils/zookeeper-dump-tree/main.cpp
@@ -17,6 +17,7 @@ int main(int argc, char ** argv)
                 "addresses of ZooKeeper instances, comma separated. Example: example01e.yandex.ru:2181")
             ("path,p", boost::program_options::value<std::string>()->default_value("/"),
                 "where to start")
+            ("ctime,c", "print node ctime")
         ;
 
         boost::program_options::variables_map options;
@@ -30,6 +31,8 @@ int main(int argc, char ** argv)
             return 1;
         }
 
+        bool dump_ctime = options.count("ctime");
+
         zkutil::ZooKeeperPtr zookeeper = std::make_shared<zkutil::ZooKeeper>(options.at("address").as<std::string>());
 
         std::string initial_path = options.at("path").as<std::string>();
@@ -79,7 +82,10 @@ int main(int argc, char ** argv)
                     throw;
             }
 
-            std::cout << it->first << '\t' << response.stat.numChildren << '\t' << response.stat.dataLength << '\n';
+            std::cout << it->first << '\t' << response.stat.numChildren << '\t' << response.stat.dataLength;
+            if (dump_ctime)
+                std::cout << '\t' << response.stat.ctime;
+            std::cout << '\n';
 
             for (const auto & name : response.names)
             {
diff --git a/utils/zookeeper-test/main.cpp b/utils/zookeeper-test/main.cpp
index bfd7df26726..102c30e59a1 100644
--- a/utils/zookeeper-test/main.cpp
+++ b/utils/zookeeper-test/main.cpp
@@ -10,6 +10,7 @@
 #include <iterator>
 #include <algorithm>
 #include <chrono>
+#include <Common/Stopwatch.h>
 
 #include <iostream>
 #include <sstream>
@@ -62,6 +63,8 @@ void testCreateList(zkutil::ZooKeeper & zk)
         throw std::runtime_error("Children of /data/lst doesn't equal to three");
     for (size_t i = 0; i < children.size(); ++i)
     {
+        std::cerr << "children:" << children[i] << std::endl;
+        std::cerr << "children size:" << children[i].size() << std::endl;
         if (children[i] != "d" + std::to_string(i + 1))
             throw std::runtime_error(fmt::format("Incorrect children #{} got {}, expected {}", i, children[i], "d" + std::to_string(i + 1)));
     }
@@ -212,6 +215,82 @@ void createPathAndSetWatch(zkutil::ZooKeeper & zk, const String & path_prefix, s
 
 }
 
+std::string random_string(size_t length)
+{
+    auto randchar = []() -> char
+    {
+        const char charset[] =
+        "0123456789"
+        "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+        "abcdefghijklmnopqrstuvwxyz";
+        const size_t max_index = (sizeof(charset) - 1);
+        return charset[rand() % max_index];
+    };
+    std::string str(length, 0);
+    std::generate_n(str.begin(), length, randchar);
+    return str;
+}
+
+std::string currentDateTime()
+{
+    time_t now = time(nullptr);
+    tm tstruct;
+    char buf[80];
+    tstruct = *localtime(&now);
+    // Visit http://en.cppreference.com/w/cpp/chrono/c/strftime
+    // for more information about date/time format
+    strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", &tstruct);
+
+    return buf;
+}
+
+
+void createOnPrefix(const std::string & zkhost, const String & path_prefix, size_t datasize, size_t total)
+{
+    zkutil::ZooKeeper zk(zkhost);
+    std::vector<std::future<Coordination::CreateResponse>> holder_futures;
+    using namespace std::chrono;
+    try
+    {
+        for (size_t i = 0; i < total; ++i)
+        {
+            std::cerr << currentDateTime() << "] Request:" << i << std::endl;
+            std::string path = path_prefix + "/element" + std::to_string(i);
+            holder_futures.push_back(zk.asyncCreate(path, random_string(datasize), zkutil::CreateMode::Persistent));
+        }
+
+        for (size_t i = 0; i < holder_futures.size(); ++i)
+            holder_futures[i].get();
+        }
+    catch (...)
+    {
+        ::exit(-1);
+    }
+}
+
+
+void createConcurrent(zkutil::ZooKeeper & testzk, const std::string & zkhost, size_t threads, size_t requests, size_t blobsize)
+{
+    std::vector<std::future<void>> asyncs;
+    for (size_t i = 0; i < threads; ++i)
+    {
+        std::string path_prefix = "/data/create_test" + std::to_string(i);
+        testzk.createIfNotExists(path_prefix, "");
+        auto callback = [&zkhost, path_prefix, requests, blobsize] ()
+        {
+            createOnPrefix(zkhost, path_prefix, blobsize, requests);
+        };
+        asyncs.push_back(std::async(std::launch::async, callback));
+    }
+
+    size_t i = 0;
+    for (auto & async : asyncs)
+    {
+        async.wait();
+        i++;
+    }
+}
+
 void tryConcurrentWatches(zkutil::ZooKeeper & zk)
 {
     std::string path_prefix = "/concurrent_watches";
@@ -244,6 +323,7 @@ void tryConcurrentWatches(zkutil::ZooKeeper & zk)
     std::cerr << "WatchesTriggered:" << watches_triggered << std::endl;
 }
 
+
 int main(int argc, char *argv[])
 {
     if (argc != 2)
@@ -259,15 +339,24 @@ int main(int argc, char *argv[])
 
     try
     {
+        std::cerr << "Removing\n";
         zk.tryRemoveRecursive("/data");
-        testCreateGetExistsNode(zk);
-        testCreateSetNode(zk);
-        testCreateList(zk);
-        testCreateSetVersionRequest(zk);
-        testMultiRequest(zk);
-        testCreateSetWatchEvent(zk);
-        testCreateListWatchEvent(zk);
-        tryConcurrentWatches(zk);
+        std::cerr << "Creating\n";
+        zk.createIfNotExists("/data", "");
+        std::cerr << "Created\n";
+
+        Stopwatch watch;
+        createConcurrent(zk, argv[1], 1, 1005000, 10);
+        std::cerr << "Finished in: " << watch.elapsedMilliseconds() << "ms" << std::endl;
+
+        //testCreateGetExistsNode(zk);
+        //testCreateSetNode(zk);
+        //testCreateList(zk);
+        //testCreateSetVersionRequest(zk);
+        //testMultiRequest(zk);
+        //testCreateSetWatchEvent(zk);
+        //testCreateListWatchEvent(zk);
+        //tryConcurrentWatches(zk);
     }
     catch (...)
     {
diff --git a/website/README.md b/website/README.md
index c2702c82157..a09a00379d1 100644
--- a/website/README.md
+++ b/website/README.md
@@ -16,3 +16,15 @@ virtualenv build
 
 # Open the web browser and go to http://localhost:8080/
 ```
+
+# How to quickly test the blog
+
+```
+./build.py --skip-multi-page --skip-single-page --skip-amp --skip-pdf --skip-git-log --skip-docs --skip-test-templates --livereload 8080
+```
+
+# How to quickly test the ugly annoying broken links in docs
+
+```
+./build.py --skip-multi-page --skip-amp --skip-pdf --skip-blog --skip-git-log --skip-test-templates --lang en --livereload 8080
+```
diff --git a/website/benchmark/dbms/queries.js b/website/benchmark/dbms/queries.js
index c92353ab0f2..f3cf25f2c8d 100644
--- a/website/benchmark/dbms/queries.js
+++ b/website/benchmark/dbms/queries.js
@@ -1,4 +1,4 @@
-var current_data_size = 1000000000;
+var current_data_size = 100000000;
 
 var current_systems = ["ClickHouse", "Vertica", "Greenplum"];
 
diff --git a/website/benchmark/hardware/index.html b/website/benchmark/hardware/index.html
index 6e6664af55a..71d3333432e 100644
--- a/website/benchmark/hardware/index.html
+++ b/website/benchmark/hardware/index.html
@@ -73,7 +73,10 @@ Results for Digital Ocean are from <b>Zimin Aleksey</b>.<br/>
 Results for 2x EPYC 7642 w/ 512 GB RAM (192 Cores) + 12X 1TB SSD (RAID6) are from <b>Yiğit Konur</b> and <b>Metehan Çetinkaya</b> of seo.do.<br/>
 Results for Raspberry Pi and Digital Ocean CPU-optimized are from <b>Fritz Wijaya</b>.<br/>
 Results for Digitalocean (Storage-intesinve VMs) + (CPU/GP) are from <b>Yiğit Konur</b> and <b>Metehan Çetinkaya</b> of seo.do.<br/>
-Results for 2x AMD EPYC 7F72 3.2 Ghz (Total 96 Cores, IBM Cloud's Bare Metal Service) from <b>Yiğit Konur</b> and <b>Metehan Çetinkaya</b> of seo.do.
+Results for 2x AMD EPYC 7F72 3.2 Ghz (Total 96 Cores, IBM Cloud's Bare Metal Service) from <b>Yiğit Konur</b> and <b>Metehan Çetinkaya</b> of seo.do.<br/>
+Results for 2x AMD EPYC 7742 (128 physical cores, 1 TB DDR4-3200 RAM) from <b>Yedige Davletgaliyev</b> and <b>Nikita Zhavoronkov</b> of blockchair.com.<br/>
+Results for ASUS A15 (Ryzen laptop) are from <b>Kimmo Linna</b>.<br/>
+Results for MacBook Air M1 are from <b>Denis Glazachev</b>.<br/>
 </p>
     </div>
 </div>
diff --git a/website/benchmark/hardware/results/amd_epyc_7742.json b/website/benchmark/hardware/results/amd_epyc_7742.json
new file mode 100644
index 00000000000..61b76d9e37b
--- /dev/null
+++ b/website/benchmark/hardware/results/amd_epyc_7742.json
@@ -0,0 +1,54 @@
+[
+    {
+        "system":       "AMD EPYC 7742",
+        "system_full":  "AMD EPYC 7742, 256 cores, 1 TiB Samsung 16x64GB DDR4-3200 ECC, 2 * Samsung PM1725b 12.8TB (RAID 0)",
+        "time":         "2021-02-23 00:00:00",
+        "kind":         "server",
+        "result":
+        [
+[0.001, 0.001, 0.001],
+[0.075, 0.080, 0.015],
+[0.030, 0.029, 0.025],
+[0.052, 0.027, 0.028],
+[0.141, 0.104, 0.105],
+[0.180, 0.127, 0.129],
+[0.023, 0.018, 0.017],
+[0.018, 0.016, 0.016],
+[0.135, 0.097, 0.096],
+[0.146, 0.109, 0.108],
+[0.106, 0.070, 0.069],
+[0.105, 0.068, 0.070],
+[0.180, 0.137, 0.136],
+[0.216, 0.171, 0.175],
+[0.193, 0.160, 0.156],
+[0.148, 0.123, 0.132],
+[0.364, 0.317, 0.317],
+[0.276, 0.245, 0.240],
+[0.636, 0.562, 0.615],
+[0.070, 0.018, 0.015],
+[0.576, 0.131, 0.125],
+[0.595, 0.124, 0.121],
+[0.861, 0.596, 0.610],
+[1.172, 0.262, 0.276],
+[0.152, 0.054, 0.050],
+[0.114, 0.046, 0.046],
+[0.149, 0.052, 0.051],
+[0.536, 0.288, 0.306],
+[0.587, 0.207, 0.217],
+[0.436, 0.419, 0.406],
+[0.178, 0.110, 0.113],
+[0.337, 0.165, 0.162],
+[1.072, 0.855, 0.882],
+[0.908, 0.600, 0.612],
+[0.904, 0.604, 0.629],
+[0.223, 0.207, 0.216],
+[0.151, 0.143, 0.172],
+[0.063, 0.061, 0.060],
+[0.059, 0.053, 0.054],
+[0.321, 0.318, 0.321],
+[0.026, 0.021, 0.020],
+[0.018, 0.015, 0.016],
+[0.005, 0.005, 0.004]
+        ]
+    }
+]
diff --git a/website/benchmark/hardware/results/amd_ryzen_9_3950x.json b/website/benchmark/hardware/results/amd_ryzen_9_3950x.json
index 0a3fc4ba288..caa5a443e54 100644
--- a/website/benchmark/hardware/results/amd_ryzen_9_3950x.json
+++ b/website/benchmark/hardware/results/amd_ryzen_9_3950x.json
@@ -1,6 +1,6 @@
 [
     {
-        "system":       "AMD Ryzen 9",
+        "system":       "AMD Ryzen 9 (2020)",
         "system_full":       "AMD Ryzen 9 3950X 16-Core Processor, 64 GiB RAM, Intel Optane 900P 280 GB",
         "time":         "2020-03-14 00:00:00",
         "kind":         "desktop",
@@ -50,5 +50,57 @@
             [0.024, 0.015, 0.021],
             [0.007, 0.013, 0.006]
         ]
+    },
+    {
+        "system":       "AMD Ryzen 9 (2021)",
+        "system_full":       "AMD Ryzen 9 3950X 16-Core Processor, 64 GiB RAM, Samsung evo 970 plus 1TB",
+        "time":         "2021-03-08 00:00:00",
+        "kind":         "desktop",
+        "result":
+        [
+[0.002, 0.002, 0.002],
+[0.013, 0.011, 0.010],
+[0.030, 0.023, 0.023],
+[0.071, 0.033, 0.031],
+[0.090, 0.068, 0.066],
+[0.165, 0.137, 0.137],
+[0.015, 0.014, 0.015],
+[0.013, 0.012, 0.012],
+[0.317, 0.268, 0.261],
+[0.337, 0.303, 0.301],
+[0.108, 0.089, 0.091],
+[0.127, 0.110, 0.114],
+[0.714, 0.690, 0.643],
+[0.888, 0.835, 0.809],
+[0.748, 0.727, 0.704],
+[0.666, 0.653, 0.652],
+[1.868, 1.821, 1.826],
+[1.007, 0.958, 0.957],
+[4.466, 4.371, 4.377],
+[0.074, 0.027, 0.027],
+[0.748, 0.326, 0.307],
+[0.844, 0.427, 0.408],
+[2.040, 1.545, 1.552],
+[1.392, 0.609, 0.560],
+[0.237, 0.155, 0.142],
+[0.140, 0.112, 0.114],
+[0.233, 0.151, 0.146],
+[0.790, 0.567, 0.545],
+[0.981, 0.751, 0.752],
+[3.532, 3.522, 3.516],
+[0.505, 0.478, 0.456],
+[1.078, 0.959, 0.959],
+[5.653, 5.600, 5.570],
+[3.572, 3.399, 3.405],
+[3.619, 3.445, 3.429],
+[1.176, 1.174, 1.165],
+[0.140, 0.127, 0.124],
+[0.054, 0.052, 0.052],
+[0.052, 0.049, 0.048],
+[0.275, 0.265, 0.265],
+[0.025, 0.024, 0.025],
+[0.020, 0.021, 0.019],
+[0.006, 0.005, 0.005]
+        ]
     }
 ]
diff --git a/website/benchmark/hardware/results/asus_a15.json b/website/benchmark/hardware/results/asus_a15.json
new file mode 100644
index 00000000000..983dbde8681
--- /dev/null
+++ b/website/benchmark/hardware/results/asus_a15.json
@@ -0,0 +1,54 @@
+[
+    {
+        "system":       "Asus A15",
+        "system_full":  "Asus A15 (16 × AMD Ryzen 7 4800H, 16 GiB RAM)",
+        "time":         "2021-03-23 00:00:00",
+        "kind":         "laptop",
+        "result":
+        [
+[0.004, 0.003, 0.003],
+[0.019, 0.013, 0.012],
+[0.053, 0.041, 0.037],
+[0.106, 0.057, 0.056],
+[0.158, 0.115, 0.110],
+[0.324, 0.266, 0.262],
+[0.027, 0.024, 0.026],
+[0.017, 0.016, 0.017],
+[0.644, 0.589, 0.582],
+[0.733, 0.679, 0.679],
+[0.233, 0.201, 0.197],
+[0.276, 0.235, 0.236],
+[1.025, 0.962, 0.962],
+[1.342, 1.270, 1.264],
+[1.170, 1.129, 1.124],
+[1.375, 1.346, 1.351],
+[3.271, 3.210, 3.242],
+[1.960, 1.898, 1.907],
+[5.997, 5.965, 5.983],
+[0.106, 0.065, 0.055],
+[1.264, 0.990, 0.989],
+[1.555, 1.241, 1.239],
+[3.798, 3.307, 3.280],
+[1.949, 1.022, 0.995],
+[0.393, 0.292, 0.292],
+[0.307, 0.254, 0.255],
+[0.378, 0.297, 0.290],
+[1.632, 1.399, 1.386],
+[2.111, 1.909, 1.900],
+[3.349, 3.352, 3.357],
+[0.892, 0.824, 0.816],
+[1.505, 1.392, 1.378],
+[9.105, 8.951, 8.914],
+[5.195, 4.975, 4.919],
+[5.150, 5.021, 4.955],
+[1.756, 1.743, 1.749],
+[0.161, 0.154, 0.158],
+[0.108, 0.058, 0.055],
+[0.101, 0.102, 0.052],
+[0.365, 0.309, 0.334],
+[0.050, 0.023, 0.023],
+[0.037, 0.019, 0.015],
+[0.023, 0.013, 0.018]
+        ]
+    }
+]
diff --git a/website/benchmark/hardware/results/macbook_air_m1.json b/website/benchmark/hardware/results/macbook_air_m1.json
new file mode 100644
index 00000000000..33f15d02480
--- /dev/null
+++ b/website/benchmark/hardware/results/macbook_air_m1.json
@@ -0,0 +1,54 @@
+[
+    {
+        "system":       "MacBook Air M1",
+        "system_full":  "MacBook Air M1 13\" 2020, 8‑core CPU, 16 GiB RAM, 512 GB SSD",
+        "time":         "2021-04-11 00:00:00",
+        "kind":         "laptop",
+        "result":
+        [
+[0.003, 0.001, 0.001],
+[0.019, 0.014, 0.014],
+[0.042, 0.034, 0.033],
+[0.101, 0.043, 0.041],
+[0.100, 0.102, 0.101],
+[0.394, 0.283, 0.289],
+[0.029, 0.027, 0.027],
+[0.018, 0.018, 0.018],
+[0.511, 0.489, 0.494],
+[0.620, 0.615, 0.618],
+[0.217, 0.200, 0.197],
+[0.237, 0.235, 0.242],
+[0.774, 0.762, 0.761],
+[0.969, 0.982, 0.969],
+[0.896, 0.887, 0.861],
+[0.999, 0.943, 0.945],
+[3.343, 2.426, 2.366],
+[1.463, 1.414, 1.382],
+[4.958, 4.268, 4.257],
+[0.056, 0.050, 0.049],
+[1.696, 0.851, 0.846],
+[1.036, 1.104, 1.174],
+[4.326, 2.224, 2.255],
+[1.397, 1.038, 1.055],
+[0.317, 0.310, 0.305],
+[0.274, 0.284, 0.269],
+[0.317, 0.316, 0.313],
+[0.943, 0.952, 0.951],
+[2.794, 1.427, 1.433],
+[1.606, 1.600, 1.605],
+[0.751, 0.691, 0.679],
+[1.532, 1.000, 0.952],
+[9.679, 8.895, 7.967],
+[7.001, 4.472, 4.050],
+[4.790, 3.971, 3.987],
+[1.215, 1.204, 1.256],
+[0.129, 0.125, 0.119],
+[0.057, 0.061, 0.056],
+[0.045, 0.043, 0.043],
+[0.256, 0.247, 0.249],
+[0.020, 0.014, 0.013],
+[0.013, 0.011, 0.012],
+[0.009, 0.009, 0.009]
+        ]
+    }
+]
diff --git a/website/benchmark/hardware/results/qemu_aarch64_cascade_lake_80_vcpu.json b/website/benchmark/hardware/results/qemu_aarch64_cascade_lake_80_vcpu.json
new file mode 100644
index 00000000000..ed25794c77b
--- /dev/null
+++ b/website/benchmark/hardware/results/qemu_aarch64_cascade_lake_80_vcpu.json
@@ -0,0 +1,55 @@
+[
+    {
+        "system":       "Intel 80vCPU, QEMU, AArch64",
+        "system_full":  "Intel Cascade Lake 80vCPU running AArch64 ClickHouse under qemu-aarch64 version 4.2.1 (userspace emulation)",
+        "cpu_vendor":   "Intel",
+        "time":         "2021-04-05 00:00:00",
+        "kind":         "cloud",
+        "result":
+        [
+[0.045, 0.006, 0.006],
+[0.366, 0.201, 0.576],
+[0.314, 0.144, 0.152],
+[0.701, 0.111, 0.110],
+[0.308, 0.259, 0.261],
+[1.009, 0.642, 0.658],
+[0.160, 0.087, 0.086],
+[0.123, 0.079, 0.080],
+[0.570, 0.458, 0.454],
+[0.708, 0.540, 0.547],
+[0.541, 0.460, 0.464],
+[0.578, 0.524, 0.531],
+[0.927, 0.908, 0.906],
+[1.075, 0.992, 1.051],
+[1.055, 0.965, 0.991],
+[0.904, 0.790, 0.781],
+[2.076, 2.134, 2.121],
+[1.668, 1.648, 1.615],
+[4.134, 3.879, 4.002],
+[0.142, 0.103, 0.105],
+[7.018, 1.479, 1.515],
+[1.618, 1.643, 1.680],
+[6.516, 3.172, 3.182],
+[6.028, 2.070, 2.076],
+[0.608, 0.559, 0.577],
+[0.548, 0.515, 0.516],
+[0.598, 0.564, 0.563],
+[1.562, 1.529, 1.537],
+[5.968, 2.311, 2.375],
+[3.263, 3.239, 3.279],
+[1.134, 0.903, 0.928],
+[2.987, 1.270, 1.284],
+[6.256, 5.665, 5.320],
+[3.020, 3.148, 3.109],
+[3.092, 3.131, 3.146],
+[1.183, 1.140, 1.185],
+[0.762, 0.704, 0.715],
+[0.412, 0.380, 0.385],
+[0.376, 0.330, 0.327],
+[1.505, 1.532, 1.503],
+[0.201, 0.133, 0.130],
+[0.173, 0.123, 0.150],
+[0.070, 0.028, 0.028]
+        ]
+    }
+]
diff --git a/website/blog/en/2021/code-review.md b/website/blog/en/2021/code-review.md
new file mode 100644
index 00000000000..dcde371629b
--- /dev/null
+++ b/website/blog/en/2021/code-review.md
@@ -0,0 +1,83 @@
+---
+title: 'The Tests Are Passing, Why Would I Read The Diff Again?'
+image: 'https://blog-images.clickhouse.tech/en/2021/code-review/two-ducks.jpg'
+date: '2021-04-14'
+author: '[Alexander Kuzmenkov](https://github.com/akuzm)'
+tags: ['code review', 'development']
+---
+
+
+Code review is one of the few software development techniques that are consistently found to reduce the incidence of defects. Why is it effective? This article offers some wild conjecture on this topic, complete with practical advice on getting the most out of your code review.
+
+
+## Understanding Why Your Program Works
+
+As software developers, we routinely have to reason about the behaviour of software. For example, to fix a bug, we start with a test case that exhibits the behavior in question, and then read the source code to see how this behavior arises. Often we find ourselves unable to understand anything, having to resort to forensic techniques such as using a debugger or interrogating the author of the code. This situation is far from ideal. After all, if we have trouble understanding our software, how can we be sure it works at all? No surprise that it doesn't.
+
+The correct understanding is also important when modifying and extending software. A programmer must always have a precise mental model on what is going on in the program, how exactly it maps to the domain, and so on. If there are flaws in this model, the code they write won't match the domain and won't solve the problem correctly. Wrong understanding directly causes bugs.
+
+How can we make our software easier to understand? It is often said that to see if you really understand something, you have to try explaining it to somebody. For example, as a science student taking an exam, you might be expected to give an explanation to some well-known observed effect, deriving it from the basic laws of this domain. In a similar way, if we are modeling some problem in software, we can start from domain knowledge and general programming knowledge, and build an argument as to why our model is applicable to the problem, why it is correct, has optimal performance and so on. This explanation takes the form of code comments, or, at a higher level, design documents.
+
+If you have a habit of thoroughly commenting your code, you might have noticed that writing the comments is often much harder than writing the code itself. It also has an unpleasant side effect &mdash; at times, while writing a comment, it becomes increasingly clear to you that the code is incomprehensible and takes forever to explain, or maybe is downright wrong, and you have to rewrite it. This is exactly the major positive effect of writing the comments. It helps you find bugs and make the code more understandable, and you wouldn't have noticed these problems unless you tried to explain the code.
+
+Understanding why your program works is inseparable from understanding why it fails, so it's no surprise that there is a similar process for the latter, called "rubber duck debugging". To debug a particularly nasty bug, you start explaining the program logic step by step to an imaginary partner or even to an inanimate object such as a yellow rubber duck. This process is often very effective, much in excess of what one would expect given the limited conversational abilities of rubber ducks. The underlying mechanism is probably the same as with comments &mdash; you start to understand your program better by just trying to explain it, and this lets you find bugs.
+
+When working in a team, you even have a luxury of explaining your code to another developer who works on the same project. It's probably more entertaining than talking to a duck. More importantly, they are going to maintain the code you wrote, so better make sure that _they_ can understand it as well. A good formal occasion for explaining how your code works is the code review process. Let's see how you can get the most out of it, in terms of making your code understandable.
+
+## Reviewing Others Code
+
+Code review is often framed as a gatekeeping process, where each contribution is vetted by maintainers to ensure that it is in line with project direction, has acceptable quality, meets the coding guidelines and so on. This perspective might seem natural when dealing with external contributions, but makes less sense if you apply it to internal ones. After all, our fellow maintainers have perfect understanding of project goals and guidelines, probably they are more talented and experienced than us, and can be trusted to produce the best solution possible. How can an additional review be helpful?
+
+A less-obvious, but very important, part of reviewing the code is just seeing whether it can be understood by another person. It is helpful regardless of the administrative roles and programming proficiency of the parties. What should you do as a reviewer if ease of understanding is your main priority?
+
+You probably don't need to be concerned with trivia such as code style. There are automated tools for that. You might find some bugs, but this is probably a side effect. Your main task is making sense of the code.
+
+Start with checking the high-level description of the problem that the pull request is trying to solve. Read the description of the bug it fixes, or the docs for the feature it adds. For bigger features, there is normally a design document that describes the overall implementation without getting too deep into the code details. After you understand the problem, start reading the code. Does it make sense to you? You shouldn't try too hard to understand it. Imagine that you are tired and under time pressure. If you feel you have to make a lot of effort to understand the code, ask the author for clarifications. As you talk, you might discover that the code is not correct, or it may be rewritten in a more straightforward way, or it needs more comments.
+
+<img src="https://blog-images.clickhouse.tech/en/2021/code-review/hidden-items.png"/>
+
+After you get the answers, don't forget to update the code and the comments to reflect them. Don't just stop after getting it explained to you personally. If you had a question as a reviewer, chances are that other people will also have this question later, but there might be nobody around to ask. They will have to resort to `git blame` and re-reading the entire pull request or several of them. Code archaeology is sometimes fun, but it's the last thing you want to do when you are investigating an urgent bug. All the answers should be on the surface.
+
+Working with the author, you should ensure that the code is mostly obvious to anyone with basic domain and programming knowledge, and all non-obvious parts are clearly explained.
+
+### Preparing Your Code For Review
+
+As an author, you can also do some things to make your code easier to understand for the reviewer.
+
+First of all, if you are implementing a major feature, it probably needs a round of design review before you even start writing code. Skipping a design review and jumping right into the code review can be a major source of frustration, because it might turn out that even the problem you are solving was formulated incorrectly, and all your work has to be thrown away. Of course, this is not prevented completely by design review, either. Programming is an iterative, exploratory activity, and in complex cases you only begin to grasp the problem after implementing a first solution, which you then realize is incorrect and has to be thrown away.
+
+When preparing your code for review, your major objective is to make your problem and its solution clear to the reviewer. A good tool for this is code comments. Any sizable piece of logic should have an introductory comment describing its general purpose and outlining the implementation. This description can reference similar features, explain the difference to them, explain how it interfaces with other subsystems. A good place to put this general description is a function that serves as a main entry point for the feature, or other form of its public interface, or the most significant class, or the file containing the implementation, and so on.
+
+Drilling down to each block of code, you should be able to explain what it does, why it does that, why this way and not another. If there are several ways of doing the thing, why did you choose this one? Of course, for some code these things follow from the more general comments and don't have to be restated. The mechanics of data manipulation should be apparent from the code itself. If you find yourself explaining a particular feature of the language, it's probably best not to use it.
+
+Pay special attention to making the data structures apparent in the code, and their meaning and invariants well commented. The choice of data structures ultimately determines which algorithms you can apply, and sets the limits of performance, which is another reason why we should care about it as ClickHouse developers. 
+
+When explaining the code, it is important to give your reader enough context, so that they can understand you without a deep investigation of the surrounding systems and obscure test cases. Give pointers to all the things that might be relevant to the task. If you know some corner cases which your code has to handle, describe them in enough detail so that they can be reproduced. If there is a relevant standard or a design document, reference it, or even quote it inline. If you're relying on some invariant in other system, mention it. It is good practice to add programmatic checks that mirror your comments, when it is easy to do so. Your comment about an invariant should be accompanied by an assertion, and an important scenario should be reproduced by a test case.
+
+Don't worry about being too verbose. There is often not enough comments, but almost never too much of them.
+
+## Common Concerns about Code Comments
+
+It is common to hear objections to the idea of commenting the code, so let's discuss a couple of usual ones.
+
+### Self-documenting Code
+
+You can often see a perplexing idea that the source code can somehow be "self-documenting", or that the comments are a "code smell", and their presence indicates that the code is badly written. I have trouble imagining how this belief can be compatible with any experience in maintaining sufficiently complex and large software, over the years, in collaboration with others. The code and the comments describe different parts of the solution. The code describes the data structures and their transformations, but it cannot convey meaning. The names in the code serve as pointers that map the data and its transformations to the domain concepts, but they are schematic and lack nuance. It is not so difficult to write code that makes it easy to understand what's going on in terms of data manipulation. What it takes is mostly moderation, that is, stopping yourself from being too clever. For most code, it is easy to see what it does, but why? Why this way and not that way? Why is it correct? Why this fast path here helps? Why did you choose this data layout? How is this invariant guaranteed? And so on. This might be not so evident for a developer who is working alone on a short-lived project, because they have all the necessary context in their head. But when they have to work with other people (or even with themselves from past and future), or in an unfamiliar area, the importance of non-code, higher-level context becomes painfully clear. The idea that we should, or even can, somehow encode comments such as [this one](https://github.com/ClickHouse/ClickHouse/blob/26d5db32ae5c9f54b8825e2eca1f077a3b17c84a/src/Storages/MergeTree/KeyCondition.cpp#L1312-L1347) into names or control flow is just absurd.
+
+### Obsolete Comments
+
+The comments can't be checked by the compiler or the tests, so there is no automated way to make sure that they are up to date with the rest of the comments and the code. The possibility of comments gradually getting incorrect is sometimes used as an argument against having any comments at all.
+
+This problem is not exclusive to the comments &mdash; the code also can and does become obsolete. Simple cases such as dead code can be detected by static analysis or studying the test coverage of code. More complex cases can only be found by proofreading, such as maintaining an invariant that is not important anymore, or preparing some data that is not needed.
+
+While an obsolete comment can lead to a mistake, the same applies, perhaps more strongly, to the lack of comments. When you need some higher-level knowledge about the code, but it is not written down, you are forced to perform an entire investigation from first principles to understand what's going on, and this is error-prone. Even an obsolete comment likely gives a better starting point than nothing. Moreover, in a code base that makes an active use of the comments, they tend to be mostly correct. This is because the developers rely on comments, read and write them, pay attention to them during code review. The comments are routinely changed along with changing the code, and the outdated comments are soon noticed and fixed. This does require some habit. A lone comment in a vast desert of impenetrable self-documenting code is not going to fare well.
+
+
+## Conclusion
+
+Code review makes your software better, and a significant part of this probably comes from trying to understand what your software actually does. By paying attention specifically to this aspect of code review, you can make it even more efficient. You'll have less bugs, and your code will be easier to maintain &mdash; and what else could we ask for as software developers?
+
+
+_2021-04-13 [Alexander Kuzmenkov](https://github.com/akuzm). Title photo by [Nikita Mikhaylov](https://github.com/nikitamikhaylov)_
+
+_P.S. This text contains the personal opinions of the author, and is not an authoritative manual for ClickHouse maintainers._
diff --git a/website/blog/en/2021/fuzzing-clickhouse.md b/website/blog/en/2021/fuzzing-clickhouse.md
new file mode 100644
index 00000000000..b6852dcce15
--- /dev/null
+++ b/website/blog/en/2021/fuzzing-clickhouse.md
@@ -0,0 +1,61 @@
+---
+title: 'Fuzzing ClickHouse'
+image: 'https://blog-images.clickhouse.tech/en/2021/fuzzing-clickhouse/some-checks-were-not-successful.png'
+date: '2021-03-11'
+author: '[Alexander Kuzmenkov](https://github.com/akuzm)'
+tags: ['fuzzing', 'testing']
+---
+
+Testing is a major problem in software development: there is never enough of it. It becomes especially true for a database management system, whose task is to interpret a query language that works on the persistent state managed by the system in a distributed fashion. Each of these three functions is hard enough to test even in isolation, and it gets much worse when you combine them. As ClickHouse developers, we know this from experience. Despite a large amount of automated testing of all kinds we routinely perform as part of our continuous integration system, new bugs and regressions are creeping in. We are always looking for the ways to improve our test coverage, and this article will describe our recent development in this area &mdash; the AST-based query fuzzer.
+
+## How to Test a SQL DBMS
+
+A natural form of testing for a SQL DBMS is to create a SQL script describing the test case, and record its reference result. To test, we run the script and check that the result matches the reference. This is used in many SQL DBMS, and it is the default kind of a test you are expected to write for any ClickHouse feature or fix. Currently we have [73k lines of SQL tests alone](https://github.com/ClickHouse/ClickHouse/tree/master/tests/queries/0_stateless), that reach the [code coverage of 76%](https://clickhouse-test-reports.s3.yandex.net/0/47d684a5c35410201d4dd4f63f3287bf25cdabb7/coverage_report/test_output/index.html).
+
+This form of testing, where a developer writes a few simplified examples of how the feature can and cannot be used, is sometimes called "example-based testing". Sadly, the bugs often appear in various corner cases and intersections of features, and it is not practical to enumerate all of these cases by hand. There is a technique for automating this process, called "property-based testing". It lets you write more general tests of the form "for all values matching these specs, the result of some operation on them should match this other spec". For example, such a test can check that if you add two positive numbers, the result is greater than both of them. But you don't specify which numbers exactly, only these properties. Then, the property testing system randomly generates some examples with particular numbers that match the specification, and checks that the result also matches its specification.
+
+Property-based testing is said to be very efficient, but requires some developer effort and expertise to write the tests in a special way. There is another well-known testing technique that is in some sense a corner case of property-based testing, and that doesn't require much developer time. It is called fuzzing. When you are fuzzing your program, you feed it random inputs generated according to some grammar, and the property you are checking is that your program terminates correctly (no segfaults or assertions or other kinds of program errors). Most often, the grammar of input for fuzzing is simple &mdash; say, bit flips and additions, or maybe some dictionary. The space of possible inputs is huge, so to find interesting paths in it, fuzzing software records the code paths taken by the program under test for a particular input, and focuses on the inputs that lead to new code paths that were not seen before. It also employs some techniques for finding interesting constant values, and so on. In general, fuzzing allows you to find many interesting corner cases in your program automatically, without much developer involvement.
+
+Generating valid SQL queries with bit flips would take a long time, so there are systems that generate queries based on the SQL grammar, such as [SQLSmith](https://github.com/anse1/sqlsmith).  They are succesfully used for finding bugs in databases. It would be interesting to use such a system for ClickHouse, but it requires some up-front effort to support the ClickHouse SQL grammar and functions, which may be different from the standard. Also, such systems don't use any feedback, so while they are much better than systems with primitive grammar, they still might have a hard time finding interesting examples. But we already have a big corpus of human-written interesting SQL queries &mdash; it's in our regression tests. Maybe we can use them as a base for fuzzing? We tried to do this, and it turned out to be surprisingly simple and efficient.
+
+## AST-based Query Fuzzer
+
+Consider some SQL query from a regression test. After parsing, it is easy to mutate the resulting AST (abstract syntax tree, an internal representation of the parsed query) before execution to introduce random changes into the query.  For strings and arrays, we make random modifications such as inserting a random character or doubling the string. For numbers, there are well-known Bad Numbers such as 0, 1, powers of two and nearby, integer limits, `NaN`. `NaN`s proved to be especially efficient in finding bugs, because you can often have some alternative branches in your numeric code, but for a `NaN`, both branches hold (or not) simultaneously, so this leads to nasty effects. 
+
+Another interesting thing we can do is change the arguments of functions, or the list of expressions in `SELECT`, `ORDER BY` and so on. Naturally, all the interesting arguments can be taken from other test queries. Same goes for changing the tables used in the queries. When the fuzzer runs in CI, it runs queries from all the SQL tests in random order, mixing into them some parts of queries it has seen previously. This process can eventually cover all the possible permutations of our features.
+
+The core implementation of the fuzzer is relatively small, consisting of about 700 lines of C++ code. A prototype was made in a couple of days, but naturally it took significantly longer to polish it and to start routinely using it in CI. It is very productive and let us find more than 200 bugs already (see the label [fuzz](https://github.com/ClickHouse/ClickHouse/labels/fuzz) on GitHub), some of which are serious logic errors or even memory errors. When we only started, we could segfault the server or make it enter a never-ending loop with simplest read-only queries such as `SELECT arrayReverseFill(x -> (x < 10), [])` or `SELECT geoDistance(0., 0., -inf, 1.)`. Of course I couldn't resist bringing down our [public playground](https://gh-api.clickhouse.tech/play?user=play#LS0gWW91IGNhbiBxdWVyeSB0aGUgR2l0SHViIGhpc3RvcnkgZGF0YSBoZXJlLiBTZWUgaHR0cHM6Ly9naC5jbGlja2hvdXNlLnRlY2gvZXhwbG9yZXIvIGZvciB0aGUgZGVzY3JpcHRpb24gYW5kIGV4YW1wbGUgcXVlcmllcy4Kc2VsZWN0ICdoZWxsbyB3b3JsZCc=) with some of these queries, and was content to see that the server soon restarts correctly.  These queries are actually minified by hand, normally the fuzzer would generate something barely intelligible such as:
+```
+SELECT
+    (val + 257,
+      (((tuple(NULL), 10.000100135803223), tuple(-inf)), '-1', (NULL, '0.10', NULL), NULL),
+      (val + 9223372036854775807) = (rval * 100),
+      tuple(65535), tuple(NULL), NULL, NULL),
+    *
+FROM 
+(
+    SELECT dummy AS val
+    FROM system.one
+) AS s1
+ANY LEFT JOIN 
+(
+    SELECT toLowCardinality(toNullable(dummy)) AS rval
+    FROM system.one
+) AS s2 ON (val + 100) = (rval * 7)
+```
+In principle, we could add automated test case minification by modifying AST in the same vein with fuzzing. This is somewhat complicated by the fact that the server dies after every, excuse my pun, successfully failed query, so we didn't implement it yet.
+
+Not all errors the fuzzer finds are significant, some of them are pretty boring and harmless, such as a wrong error code for an out-of-bounds argument. We still try to fix all of them, because this lets us ensure that under normal operation, the fuzzer doesn't find any errors.  This is similar to the approach usually taken with compiler warnings and other optional diagnostics &mdash; it's better to fix or disable every single case, so that you can be sure you have no diagnostics if everything is OK, and it's easy to notice new problems.
+
+After fixing the majority of pre-existing error, this fuzzer became efficient for finding errors in new features. Pull requests introducing new features normally add an SQL test, and we pay extra attention to the new tests when fuzzing, generating more permutations for them. Even if the coverage of the test is not sufficient, there is a good chance that the fuzzer will find the missing corner cases. So when we see that all the fuzzer runs in different configurations have failed for a particular pull request, this almost always means that it introduces a new bug. When developing a feature that requires new grammar, it is also helpful to add fuzzing support for it. I did this for window functions early in the development, and it helped me find several bugs.
+
+A major factor that makes fuzzing really efficient for us is that we have a lot of assertions and other checks of program logic in our code. For debug-only checks, we use the plain `assert` macro from `<cassert>`. For checks that are needed even in release mode, we use an exception with a special code `LOGICAL_ERROR` that signifies an internal program error. We did some work to ensure that these errors are distinct from errors caused by the wrong user actions. A user error reported for a randomly generated query is normal (e.g.  it references some non-existent columns), but when we see an internal program error, we know that it's definitely a bug, same as an assertion. Of course, even without assertions, you get some checks for memory errors provided by the OS (segfaults). Another way to add runtime checks to your program is to use some kind of sanitizer. We already run most of our tests under clang's Address, Memory, UndefinedBehavior and Thread sanitizers. Using them in conjunction with this fuzzer also proved to be very efficient.
+
+To see for yourself how the fuzzer works, you only need the normal ClickHouse client.  Start `clickhouse-client --query-fuzzer-runs=100`, enter any query, and enjoy the client going crazy and running a hundred of random queries instead. All queries from the current session become a source for expressions for fuzzing, so try entering several different queries to get more interesting results. Be careful not to do this in production! When you do this experiment, you'll soon notice that the fuzzer tends to generate queries that take very long to run. This is why for the CI fuzzer runs we have to configure the server to limit query execution time, memory usage and so on using the corresponding [server settings](https://clickhouse.tech/docs/en/operations/settings/query-complexity/#:~:text=In%20the%20default%20configuration%20file,query%20within%20a%20single%20server.). We had a hilarious situation after that: the fuzzer figured out how to remove the limits by generating a `SET max_execution_time = 0` query, and then generated a never-ending query and failed. Thankfully we were able to defeat its cleverness by using [settings constraints](https://clickhouse.tech/docs/en/operations/settings/constraints-on-settings/).
+
+## Other Fuzzers
+
+The AST-based fuzzer we discussed is only one of the many kinds of fuzzers we have in ClickHouse. There is a [talk](https://www.youtube.com/watch?v=GbmK84ZwSeI&t=4481s) (in Russian, [slides are here](https://presentations.clickhouse.tech/cpp_siberia_2021/)) by Alexey Milovidov that explores all the fuzzers we have. Another interesting recent development is application of pivoted query synthesis technique, implemented in [SQLancer](https://github.com/sqlancer/sqlancer), to ClickHouse.  The authors are going to give [a talk about this](https://heisenbug-piter.ru/2021/spb/talks/nr1cwknssdodjkqgzsbvh/) soon, so stay tuned.
+
+_2021-03-11 [Alexander Kuzmenkov](https://github.com/akuzm)_
+
diff --git a/website/blog/en/2021/reading-from-external-memory.md b/website/blog/en/2021/reading-from-external-memory.md
new file mode 100644
index 00000000000..f431bde0625
--- /dev/null
+++ b/website/blog/en/2021/reading-from-external-memory.md
@@ -0,0 +1,69 @@
+---
+title: 'A journey to io_uring, AIO and modern storage devices'
+image: 'https://blog-images.clickhouse.tech/en/2021/reading-from-external-memory/all-single-read.png'
+date: '2021-03-09'
+author: '[Ruslan Savchenko](https://github.com/savrus)'
+tags: ['Linux', 'benchmark', 'experiment']
+---
+
+*While main memory is considered to be rather cheap by some systems designers it is not always possible to store everything in the main memory. When data is stored in external memory one has to think carefully how to access the data. There are several kind of storage devices and more than one system call to read from them. We performed experiments to find out how different Linux system calls perform for available devices. In total HDD, SATA SSD, NVMe SSD, and Intel Optane were accessed via single-threaded and multi-threaded pread, Linux aio, and new io_uring interfaces. Full report is available in PDF format:* [link](https://arxiv.org/pdf/2102.11198). *We give one section from the report as an example.*
+
+# Single Random Read
+
+External memory devices are block devices which means data transfer between a device and a host is done in blocks rather than single bytes. Typically 512 bytes or 4 kilobytes blocks are used. These block sizes have been chosen by manufactures long time ago and may be not the best choice for modern devices. By requesing larger amount of contigious data we can emulate larger block size. Let's find out how modern devices perform with larger blocks.
+
+Our goal is to pick the best block size for a random read. An application (or filesystem) can pick any block size and access data with respect to this block size. We vary block size from 4 kilobytes up to 32 megabytes. For each block size we make some random reads. Among these reads we calculate average, minimum and maximum latency as well as 99,0 and 99,9 percentiles. We use system call pread(2) in this experiment. We believe that lseek(2) followed by read(2) should have the same performance since the observed storage access time is far longer than a system call.
+
+## Hard Disk Drive
+
+This figure shows results for HDD.
+
+![HDD single read latency](https://blog-images.clickhouse.tech/en/2021/reading-from-external-memory/hdd-single-read.png)
+
+The latency is almost the same for all block sizes smaller than 256 kilobytes. This happens because seek time is much larger than the data transfer time. The seek time includes arm positioning to find the right track and awaiting for platter rotation to bring data under the head. A simple consequence is that for a HDD random read one should use blocks of size at least 256 kilobytes. Even if an application use smaller blocks the drive access time would be the same. However one could still decide to use smaller blocks for better cache utilization: if the amount of data per request is small and is expected to fit in cache then storing a large block along with the requested data would actually make cache capacity smaller in terms of useful data.
+
+The 256 kilobyte block read takes 12 milliseconds on the average. We experienced variations from 4 milliseconds up to 25 milliseconds.  This is really a huge amount of time for a computer. For example the typical process scheduling quantum is just a few milliseconds. An operating system can (and in fact does) execute other processes while our process waits for the data to arrive from the hard drive.
+
+## SATA SSD
+
+The figure below shows SATA SSD read latencies.
+
+![SATA SSD single read latency](https://blog-images.clickhouse.tech/en/2021/reading-from-external-memory/ssd-single-read.png)
+
+Note that the time at the lower part of the figure is in microseconds (we use standard shortenings ms for milliseconds and us for microseconds). Reading block of size 4 kilobytes takes 140 microseconds on the average and the time growth is linear when the block size increase. Compared to HDD reading a 4 kilobyte block from SSD is 80 times faster. For a 256 kilobyte block SSD is ten times faster than HDD. When block size is large enough (starting from 4 megabytes) SSD is only two times faster than HDD.
+
+## NVMe SSD
+
+The next figure shows results for NVMe SSD.
+
+![NVMe SSD single read latency](https://blog-images.clickhouse.tech/en/2021/reading-from-external-memory/nvme-single-read.png)
+
+The latency is better than those for SATA SSD. For a 4 kilobytes block size the average time improved only a little, but the 99 percentile is two times lower. It takes less than millisecond to read a megabyte block from NVMe SSD. For SATA SSD it took 3 milliseconds. As we see, upgrade from SATA SSD to NVMe SSD is not as dramatic as upgrade from HDD to SATA SSD. This is not surprising since both SATA and NVMe SSD are based on the same thechnology. Only interfaces differ.
+
+## Intel Optane
+
+This figure shows results for Intel Optane SSD.
+
+![Intel Optane single read latency](https://blog-images.clickhouse.tech/en/2021/reading-from-external-memory/optane-single-read.png)
+
+Minimal latency is 12 microseconds whih is 10 times lower than those of NVMe SSD. Average latency is 1000 lower than those of HDD. There is quite large variation for small block read latency: even though the average time is quite low and close to minimal latency the maximum latency and even 99 percentile are significantly worse. If somebody looks at these results and wishes to create an Intel Optane-based service with 12 microsecond latency for reads they would have to install larger number of Intel Optane drives or consider providing more realistic timings.
+
+When latency is so small overheads of context switching and interrupt handling become noticeable. One can use polling mode to gain some improvement. In this mode the Linux kernel monitors the completion queue instead of switching to some other job and relying on hardware interrupt with interrupt handler to notify about completion. Clearly, it is considerable to use the polling mode only when hardware response is expected to arrive fast enough.
+![Intel Optane single read latency in polling mode](https://blog-images.clickhouse.tech/en/2021/reading-from-external-memory/optane-single-hipri-read.png)
+
+The figure above shows results for reading from Intel Optane in polling mode. The polling mode is used when an application calls preadv2(2) system call with RWF\_HIGHPRI flag. Compared to usual pread(2) the polling mode lowers the maximum latency by a factor of two for block sizes up to 256 kilobytes.
+
+## Summary
+
+To summarize our results the next figure shows single read latencies for all four storage types on a single chart.
+
+![Single read latency for Optane, SSD and HDD](https://blog-images.clickhouse.tech/en/2021/reading-from-external-memory/all-single-read.png)
+
+Starting from 4 megabytes the latency is easily predicted by linear extrapolation so we don't show larger blocks here. To show everything on a single figure we are forced to use quite an overloaded legend. We use vertical level to show the latency and we iterate the block size horizontally. For each block size we show four bars, from left to right: for Intel Optane, NVMe SSD, SATA SSD, and HDD. Storage type is represented by hatch and the latency by color.
+
+We see that solid state device latencies are far better than HDD. For a single read the leader is Intel Optane, however as we shall see later it has it's own drawback compared to NVMe SSD. NVMe SSD and SATA SSD look quite close to each other when the block size is small. Our observations show that the best block size for random read is 256 kilobytes for HDD, 4 kilobytes for NVMe and SATA SSD and 8 kilobytes for Intel Optane.
+
+So, how about testing modern IO interfaces in Linux? Continue reading the [full article](https://arxiv.org/pdf/2102.11198).
+
+2021-03-09 [Ruslan Savchenko](https://github.com/savrus)
+
diff --git a/website/css/highlight.css b/website/css/highlight.css
index 55a0054b07f..7cc8a4865dd 100644
--- a/website/css/highlight.css
+++ b/website/css/highlight.css
@@ -11,7 +11,7 @@
 .syntax .hll { background-color: #b9b6b0 }
 .syntax  { background: #f8f9fa; color: #2f1e2e }
 .syntax .c { color: #8d8687 } /* Comment */
-.syntax .err { color: #ef6155 } /* Error */
+.syntax .err {} /* Error */
 .syntax .k { color: #000000; font-weight: bold } /* Keyword */
 .syntax .l { color: #0088ff } /* Literal */
 .syntax .n { color: #2f1e2e } /* Name */
diff --git a/website/js/base.js b/website/js/base.js
index 6cec8313bd4..aca6f407d24 100644
--- a/website/js/base.js
+++ b/website/js/base.js
@@ -16,23 +16,6 @@
         if (target_id && target_id.startsWith('logo-')) {
             selector = '#';
         }
-        if (selector && selector.startsWith('#') && !is_tab && !is_collapse && !is_rating) {
-            event.preventDefault();
-            var dst = window.location.href.replace(window.location.hash, '');
-            var offset = 0;
-
-            if (selector !== '#') {
-                var destination = $(selector);
-                if (destination.length) {
-                    offset = destination.offset().top - $('#top-nav').height() * 1.5;
-                    dst += selector;
-                }
-            }
-            $('html, body').animate({
-                scrollTop: offset
-            }, 500);
-            window.history.replaceState('', document.title, dst);
-        }
     });
 
     var top_nav = $('#top-nav.sticky-top');
diff --git a/website/locale/es/LC_MESSAGES/messages.mo b/website/locale/es/LC_MESSAGES/messages.mo
deleted file mode 100644
index 888d7a76c4e..00000000000
Binary files a/website/locale/es/LC_MESSAGES/messages.mo and /dev/null differ
diff --git a/website/locale/es/LC_MESSAGES/messages.po b/website/locale/es/LC_MESSAGES/messages.po
deleted file mode 100644
index 531a0001c52..00000000000
--- a/website/locale/es/LC_MESSAGES/messages.po
+++ /dev/null
@@ -1,326 +0,0 @@
-# Translations template for PROJECT.
-# Copyright (C) 2020 ORGANIZATION
-# This file is distributed under the same license as the PROJECT project.
-# Automatically generated, 2020.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PROJECT VERSION\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-06-17 12:20+0300\n"
-"PO-Revision-Date: 2020-06-17 12:20+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
-"Language: es\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: templates/common_meta.html:1
-msgid ""
-"ClickHouse is a fast open-source column-oriented database management system "
-"that allows generating analytical data reports in real-time using SQL queries"
-msgstr ""
-
-#: templates/common_meta.html:6
-msgid "ClickHouse - fast open-source OLAP DBMS"
-msgstr ""
-
-#: templates/common_meta.html:10
-msgid "ClickHouse DBMS"
-msgstr ""
-
-#: templates/common_meta.html:32
-msgid "open-source"
-msgstr ""
-
-#: templates/common_meta.html:32
-msgid "relational"
-msgstr ""
-
-#: templates/common_meta.html:32
-msgid "analytics"
-msgstr ""
-
-#: templates/common_meta.html:32
-msgid "analytical"
-msgstr ""
-
-#: templates/common_meta.html:32
-msgid "Big Data"
-msgstr ""
-
-#: templates/common_meta.html:32
-msgid "web-analytics"
-msgstr ""
-
-#: templates/footer.html:8
-msgid "ClickHouse source code is published under the Apache 2.0 License."
-msgstr ""
-
-#: templates/footer.html:8
-msgid ""
-"Software is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR "
-"CONDITIONS OF ANY KIND, either express or implied."
-msgstr ""
-
-#: templates/footer.html:11
-msgid "Yandex LLC"
-msgstr ""
-
-#: templates/blog/content.html:20 templates/blog/content.html:25
-#: templates/blog/content.html:30
-msgid "Share on"
-msgstr ""
-
-#: templates/blog/content.html:37
-msgid "Published date"
-msgstr ""
-
-#: templates/blog/nav.html:20
-msgid "New&nbsp;post"
-msgstr ""
-
-#: templates/blog/nav.html:25
-msgid "Documentation"
-msgstr ""
-
-#: templates/docs/footer.html:3
-msgid "Rating"
-msgstr ""
-
-#: templates/docs/footer.html:3
-msgid "votes"
-msgstr ""
-
-#: templates/docs/footer.html:4
-msgid "Article Rating"
-msgstr ""
-
-#: templates/docs/footer.html:4
-msgid "Was this content helpful?"
-msgstr ""
-
-#: templates/docs/footer.html:7
-msgid "Unusable"
-msgstr ""
-
-#: templates/docs/footer.html:7
-msgid "Poor"
-msgstr ""
-
-#: templates/docs/footer.html:7
-msgid "Good"
-msgstr ""
-
-#: templates/docs/footer.html:7
-msgid "Excellent"
-msgstr ""
-
-#: templates/docs/footer.html:8
-msgid "documentation"
-msgstr ""
-
-#: templates/docs/footer.html:15
-msgid "Built from"
-msgstr ""
-
-#: templates/docs/footer.html:15
-msgid "published on"
-msgstr ""
-
-#: templates/docs/footer.html:15
-msgid "modified on"
-msgstr ""
-
-#: templates/docs/machine-translated.html:3
-msgid "Help wanted!"
-msgstr ""
-
-#: templates/docs/machine-translated.html:4
-msgid ""
-"The following content of this documentation page has been machine-"
-"translated. But unlike other websites, it is not done on the fly. This "
-"translated text lives on GitHub repository alongside main ClickHouse "
-"codebase and waits for fellow native speakers to make it more human-readable."
-msgstr ""
-
-#: templates/docs/machine-translated.html:4
-msgid "You can also use the original English version as a reference."
-msgstr ""
-
-#: templates/docs/machine-translated.html:7
-msgid "Help ClickHouse documentation by editing this page"
-msgstr ""
-
-#: templates/docs/sidebar.html:3
-msgid "Multi-page or single-page"
-msgstr ""
-
-#: templates/docs/sidebar.html:5
-msgid "Multi-page version"
-msgstr ""
-
-#: templates/docs/sidebar.html:8
-msgid "Single-page version"
-msgstr ""
-
-#: templates/docs/sidebar.html:13
-msgid "Version"
-msgstr ""
-
-#: templates/docs/sidebar.html:13 templates/docs/sidebar.html:19
-msgid "latest"
-msgstr ""
-
-#: templates/docs/sidebar.html:36
-msgid "PDF version"
-msgstr ""
-
-#: templates/docs/toc.html:8
-msgid "Table of Contents"
-msgstr ""
-
-#: templates/index/community.html:4
-msgid "ClickHouse community"
-msgstr ""
-
-#: templates/index/community.html:13 templates/index/community.html:14
-msgid "ClickHouse YouTube Channel"
-msgstr ""
-
-#: templates/index/community.html:25 templates/index/community.html:26
-msgid "ClickHouse Official Twitter Account"
-msgstr ""
-
-#: templates/index/community.html:36 templates/index/community.html:37
-msgid "ClickHouse at Telegram"
-msgstr ""
-
-#: templates/index/community.html:41
-msgid "Chat with real users in "
-msgstr ""
-
-#: templates/index/community.html:44 templates/index/community.html:116
-msgid "English"
-msgstr ""
-
-#: templates/index/community.html:45
-msgid "or in"
-msgstr ""
-
-#: templates/index/community.html:47 templates/index/community.html:117
-msgid "Russian"
-msgstr ""
-
-#: templates/index/community.html:65
-msgid "Open GitHub issue to ask for help or to file a feature request"
-msgstr ""
-
-#: templates/index/community.html:76 templates/index/community.html:77
-msgid "ClickHouse Slack Workspace"
-msgstr ""
-
-#: templates/index/community.html:82
-msgid "Multipurpose public hangout"
-msgstr ""
-
-#: templates/index/community.html:101
-msgid "Ask any questions"
-msgstr ""
-
-#: templates/index/community.html:115
-msgid "ClickHouse Blog"
-msgstr ""
-
-#: templates/index/community.html:116
-msgid "in"
-msgstr ""
-
-#: templates/index/community.html:128 templates/index/community.html:129
-msgid "ClickHouse at Google Groups"
-msgstr ""
-
-#: templates/index/community.html:133
-msgid "Email discussions"
-msgstr ""
-
-#: templates/index/community.html:142
-msgid "Like ClickHouse?"
-msgstr ""
-
-#: templates/index/community.html:143
-msgid "Help to spread the word about it via"
-msgstr ""
-
-#: templates/index/community.html:144
-msgid "and"
-msgstr ""
-
-#: templates/index/community.html:153
-msgid "Hosting ClickHouse Meetups"
-msgstr ""
-
-#: templates/index/community.html:157
-msgid ""
-"ClickHouse meetups are essential for strengthening community worldwide, but "
-"they couldn't be possible without the help of local organizers. Please, fill "
-"this form if you want to become one or want to meet ClickHouse core team for "
-"any other reason."
-msgstr ""
-
-#: templates/index/community.html:159
-msgid "ClickHouse Meetup"
-msgstr ""
-
-#: templates/index/community.html:165
-msgid "Name"
-msgstr ""
-
-#: templates/index/community.html:168
-msgid "Email"
-msgstr ""
-
-#: templates/index/community.html:171
-msgid "Company"
-msgstr ""
-
-#: templates/index/community.html:174
-msgid "City"
-msgstr ""
-
-#: templates/index/community.html:179
-msgid "We'd like to host a public ClickHouse Meetup"
-msgstr ""
-
-#: templates/index/community.html:185
-msgid "We'd like to invite Yandex ClickHouse team to our office"
-msgstr ""
-
-#: templates/index/community.html:191
-msgid "We'd like to invite Yandex ClickHouse team to another event we organize"
-msgstr ""
-
-#: templates/index/community.html:197
-msgid "We're interested in commercial consulting, support or managed service"
-msgstr ""
-
-#: templates/index/community.html:201
-msgid "Additional comments"
-msgstr ""
-
-#: templates/index/community.html:203
-msgid "Send"
-msgstr ""
-
-#: templates/index/community.html:212
-msgid ""
-"If you have any more thoughts or questions, feel free to contact Yandex "
-"ClickHouse team directly at"
-msgstr ""
-
-#: templates/index/community.html:213
-msgid "turn on JavaScript to see email address"
-msgstr ""
diff --git a/website/locale/fa/LC_MESSAGES/messages.mo b/website/locale/fa/LC_MESSAGES/messages.mo
deleted file mode 100644
index 89c73f3fea4..00000000000
Binary files a/website/locale/fa/LC_MESSAGES/messages.mo and /dev/null differ
diff --git a/website/locale/fa/LC_MESSAGES/messages.po b/website/locale/fa/LC_MESSAGES/messages.po
deleted file mode 100644
index 565684ac0de..00000000000
--- a/website/locale/fa/LC_MESSAGES/messages.po
+++ /dev/null
@@ -1,325 +0,0 @@
-# Translations template for PROJECT.
-# Copyright (C) 2020 ORGANIZATION
-# This file is distributed under the same license as the PROJECT project.
-# Automatically generated, 2020.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PROJECT VERSION\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-06-17 12:20+0300\n"
-"PO-Revision-Date: 2020-06-17 12:20+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
-"Language: fa\n"
-
-#: templates/common_meta.html:1
-msgid ""
-"ClickHouse is a fast open-source column-oriented database management system "
-"that allows generating analytical data reports in real-time using SQL queries"
-msgstr ""
-
-#: templates/common_meta.html:6
-msgid "ClickHouse - fast open-source OLAP DBMS"
-msgstr ""
-
-#: templates/common_meta.html:10
-msgid "ClickHouse DBMS"
-msgstr ""
-
-#: templates/common_meta.html:32
-msgid "open-source"
-msgstr ""
-
-#: templates/common_meta.html:32
-msgid "relational"
-msgstr ""
-
-#: templates/common_meta.html:32
-msgid "analytics"
-msgstr ""
-
-#: templates/common_meta.html:32
-msgid "analytical"
-msgstr ""
-
-#: templates/common_meta.html:32
-msgid "Big Data"
-msgstr ""
-
-#: templates/common_meta.html:32
-msgid "web-analytics"
-msgstr ""
-
-#: templates/footer.html:8
-msgid "ClickHouse source code is published under the Apache 2.0 License."
-msgstr ""
-
-#: templates/footer.html:8
-msgid ""
-"Software is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR "
-"CONDITIONS OF ANY KIND, either express or implied."
-msgstr ""
-
-#: templates/footer.html:11
-msgid "Yandex LLC"
-msgstr ""
-
-#: templates/blog/content.html:20 templates/blog/content.html:25
-#: templates/blog/content.html:30
-msgid "Share on"
-msgstr ""
-
-#: templates/blog/content.html:37
-msgid "Published date"
-msgstr ""
-
-#: templates/blog/nav.html:20
-msgid "New&nbsp;post"
-msgstr ""
-
-#: templates/blog/nav.html:25
-msgid "Documentation"
-msgstr ""
-
-#: templates/docs/footer.html:3
-msgid "Rating"
-msgstr ""
-
-#: templates/docs/footer.html:3
-msgid "votes"
-msgstr ""
-
-#: templates/docs/footer.html:4
-msgid "Article Rating"
-msgstr ""
-
-#: templates/docs/footer.html:4
-msgid "Was this content helpful?"
-msgstr ""
-
-#: templates/docs/footer.html:7
-msgid "Unusable"
-msgstr ""
-
-#: templates/docs/footer.html:7
-msgid "Poor"
-msgstr ""
-
-#: templates/docs/footer.html:7
-msgid "Good"
-msgstr ""
-
-#: templates/docs/footer.html:7
-msgid "Excellent"
-msgstr ""
-
-#: templates/docs/footer.html:8
-msgid "documentation"
-msgstr ""
-
-#: templates/docs/footer.html:15
-msgid "Built from"
-msgstr ""
-
-#: templates/docs/footer.html:15
-msgid "published on"
-msgstr ""
-
-#: templates/docs/footer.html:15
-msgid "modified on"
-msgstr ""
-
-#: templates/docs/machine-translated.html:3
-msgid "Help wanted!"
-msgstr ""
-
-#: templates/docs/machine-translated.html:4
-msgid ""
-"The following content of this documentation page has been machine-"
-"translated. But unlike other websites, it is not done on the fly. This "
-"translated text lives on GitHub repository alongside main ClickHouse "
-"codebase and waits for fellow native speakers to make it more human-readable."
-msgstr ""
-
-#: templates/docs/machine-translated.html:4
-msgid "You can also use the original English version as a reference."
-msgstr ""
-
-#: templates/docs/machine-translated.html:7
-msgid "Help ClickHouse documentation by editing this page"
-msgstr ""
-
-#: templates/docs/sidebar.html:3
-msgid "Multi-page or single-page"
-msgstr ""
-
-#: templates/docs/sidebar.html:5
-msgid "Multi-page version"
-msgstr ""
-
-#: templates/docs/sidebar.html:8
-msgid "Single-page version"
-msgstr ""
-
-#: templates/docs/sidebar.html:13
-msgid "Version"
-msgstr ""
-
-#: templates/docs/sidebar.html:13 templates/docs/sidebar.html:19
-msgid "latest"
-msgstr ""
-
-#: templates/docs/sidebar.html:36
-msgid "PDF version"
-msgstr ""
-
-#: templates/docs/toc.html:8
-msgid "Table of Contents"
-msgstr ""
-
-#: templates/index/community.html:4
-msgid "ClickHouse community"
-msgstr ""
-
-#: templates/index/community.html:13 templates/index/community.html:14
-msgid "ClickHouse YouTube Channel"
-msgstr ""
-
-#: templates/index/community.html:25 templates/index/community.html:26
-msgid "ClickHouse Official Twitter Account"
-msgstr ""
-
-#: templates/index/community.html:36 templates/index/community.html:37
-msgid "ClickHouse at Telegram"
-msgstr ""
-
-#: templates/index/community.html:41
-msgid "Chat with real users in "
-msgstr ""
-
-#: templates/index/community.html:44 templates/index/community.html:116
-msgid "English"
-msgstr ""
-
-#: templates/index/community.html:45
-msgid "or in"
-msgstr ""
-
-#: templates/index/community.html:47 templates/index/community.html:117
-msgid "Russian"
-msgstr ""
-
-#: templates/index/community.html:65
-msgid "Open GitHub issue to ask for help or to file a feature request"
-msgstr ""
-
-#: templates/index/community.html:76 templates/index/community.html:77
-msgid "ClickHouse Slack Workspace"
-msgstr ""
-
-#: templates/index/community.html:82
-msgid "Multipurpose public hangout"
-msgstr ""
-
-#: templates/index/community.html:101
-msgid "Ask any questions"
-msgstr ""
-
-#: templates/index/community.html:115
-msgid "ClickHouse Blog"
-msgstr ""
-
-#: templates/index/community.html:116
-msgid "in"
-msgstr ""
-
-#: templates/index/community.html:128 templates/index/community.html:129
-msgid "ClickHouse at Google Groups"
-msgstr ""
-
-#: templates/index/community.html:133
-msgid "Email discussions"
-msgstr ""
-
-#: templates/index/community.html:142
-msgid "Like ClickHouse?"
-msgstr ""
-
-#: templates/index/community.html:143
-msgid "Help to spread the word about it via"
-msgstr ""
-
-#: templates/index/community.html:144
-msgid "and"
-msgstr ""
-
-#: templates/index/community.html:153
-msgid "Hosting ClickHouse Meetups"
-msgstr ""
-
-#: templates/index/community.html:157
-msgid ""
-"ClickHouse meetups are essential for strengthening community worldwide, but "
-"they couldn't be possible without the help of local organizers. Please, fill "
-"this form if you want to become one or want to meet ClickHouse core team for "
-"any other reason."
-msgstr ""
-
-#: templates/index/community.html:159
-msgid "ClickHouse Meetup"
-msgstr ""
-
-#: templates/index/community.html:165
-msgid "Name"
-msgstr ""
-
-#: templates/index/community.html:168
-msgid "Email"
-msgstr ""
-
-#: templates/index/community.html:171
-msgid "Company"
-msgstr ""
-
-#: templates/index/community.html:174
-msgid "City"
-msgstr ""
-
-#: templates/index/community.html:179
-msgid "We'd like to host a public ClickHouse Meetup"
-msgstr ""
-
-#: templates/index/community.html:185
-msgid "We'd like to invite Yandex ClickHouse team to our office"
-msgstr ""
-
-#: templates/index/community.html:191
-msgid "We'd like to invite Yandex ClickHouse team to another event we organize"
-msgstr ""
-
-#: templates/index/community.html:197
-msgid "We're interested in commercial consulting, support or managed service"
-msgstr ""
-
-#: templates/index/community.html:201
-msgid "Additional comments"
-msgstr ""
-
-#: templates/index/community.html:203
-msgid "Send"
-msgstr ""
-
-#: templates/index/community.html:212
-msgid ""
-"If you have any more thoughts or questions, feel free to contact Yandex "
-"ClickHouse team directly at"
-msgstr ""
-
-#: templates/index/community.html:213
-msgid "turn on JavaScript to see email address"
-msgstr ""
diff --git a/website/locale/fr/LC_MESSAGES/messages.mo b/website/locale/fr/LC_MESSAGES/messages.mo
deleted file mode 100644
index 43fcad3bd73..00000000000
Binary files a/website/locale/fr/LC_MESSAGES/messages.mo and /dev/null differ
diff --git a/website/locale/fr/LC_MESSAGES/messages.po b/website/locale/fr/LC_MESSAGES/messages.po
deleted file mode 100644
index 5ccc7c3c87d..00000000000
--- a/website/locale/fr/LC_MESSAGES/messages.po
+++ /dev/null
@@ -1,326 +0,0 @@
-# Translations template for PROJECT.
-# Copyright (C) 2020 ORGANIZATION
-# This file is distributed under the same license as the PROJECT project.
-# Automatically generated, 2020.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PROJECT VERSION\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-06-17 12:20+0300\n"
-"PO-Revision-Date: 2020-06-17 12:20+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
-"Language: fr\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: templates/common_meta.html:1
-msgid ""
-"ClickHouse is a fast open-source column-oriented database management system "
-"that allows generating analytical data reports in real-time using SQL queries"
-msgstr ""
-
-#: templates/common_meta.html:6
-msgid "ClickHouse - fast open-source OLAP DBMS"
-msgstr ""
-
-#: templates/common_meta.html:10
-msgid "ClickHouse DBMS"
-msgstr ""
-
-#: templates/common_meta.html:32
-msgid "open-source"
-msgstr ""
-
-#: templates/common_meta.html:32
-msgid "relational"
-msgstr ""
-
-#: templates/common_meta.html:32
-msgid "analytics"
-msgstr ""
-
-#: templates/common_meta.html:32
-msgid "analytical"
-msgstr ""
-
-#: templates/common_meta.html:32
-msgid "Big Data"
-msgstr ""
-
-#: templates/common_meta.html:32
-msgid "web-analytics"
-msgstr ""
-
-#: templates/footer.html:8
-msgid "ClickHouse source code is published under the Apache 2.0 License."
-msgstr ""
-
-#: templates/footer.html:8
-msgid ""
-"Software is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR "
-"CONDITIONS OF ANY KIND, either express or implied."
-msgstr ""
-
-#: templates/footer.html:11
-msgid "Yandex LLC"
-msgstr ""
-
-#: templates/blog/content.html:20 templates/blog/content.html:25
-#: templates/blog/content.html:30
-msgid "Share on"
-msgstr ""
-
-#: templates/blog/content.html:37
-msgid "Published date"
-msgstr ""
-
-#: templates/blog/nav.html:20
-msgid "New&nbsp;post"
-msgstr ""
-
-#: templates/blog/nav.html:25
-msgid "Documentation"
-msgstr ""
-
-#: templates/docs/footer.html:3
-msgid "Rating"
-msgstr ""
-
-#: templates/docs/footer.html:3
-msgid "votes"
-msgstr ""
-
-#: templates/docs/footer.html:4
-msgid "Article Rating"
-msgstr ""
-
-#: templates/docs/footer.html:4
-msgid "Was this content helpful?"
-msgstr ""
-
-#: templates/docs/footer.html:7
-msgid "Unusable"
-msgstr ""
-
-#: templates/docs/footer.html:7
-msgid "Poor"
-msgstr ""
-
-#: templates/docs/footer.html:7
-msgid "Good"
-msgstr ""
-
-#: templates/docs/footer.html:7
-msgid "Excellent"
-msgstr ""
-
-#: templates/docs/footer.html:8
-msgid "documentation"
-msgstr ""
-
-#: templates/docs/footer.html:15
-msgid "Built from"
-msgstr ""
-
-#: templates/docs/footer.html:15
-msgid "published on"
-msgstr ""
-
-#: templates/docs/footer.html:15
-msgid "modified on"
-msgstr ""
-
-#: templates/docs/machine-translated.html:3
-msgid "Help wanted!"
-msgstr ""
-
-#: templates/docs/machine-translated.html:4
-msgid ""
-"The following content of this documentation page has been machine-"
-"translated. But unlike other websites, it is not done on the fly. This "
-"translated text lives on GitHub repository alongside main ClickHouse "
-"codebase and waits for fellow native speakers to make it more human-readable."
-msgstr ""
-
-#: templates/docs/machine-translated.html:4
-msgid "You can also use the original English version as a reference."
-msgstr ""
-
-#: templates/docs/machine-translated.html:7
-msgid "Help ClickHouse documentation by editing this page"
-msgstr ""
-
-#: templates/docs/sidebar.html:3
-msgid "Multi-page or single-page"
-msgstr ""
-
-#: templates/docs/sidebar.html:5
-msgid "Multi-page version"
-msgstr ""
-
-#: templates/docs/sidebar.html:8
-msgid "Single-page version"
-msgstr ""
-
-#: templates/docs/sidebar.html:13
-msgid "Version"
-msgstr ""
-
-#: templates/docs/sidebar.html:13 templates/docs/sidebar.html:19
-msgid "latest"
-msgstr ""
-
-#: templates/docs/sidebar.html:36
-msgid "PDF version"
-msgstr ""
-
-#: templates/docs/toc.html:8
-msgid "Table of Contents"
-msgstr ""
-
-#: templates/index/community.html:4
-msgid "ClickHouse community"
-msgstr ""
-
-#: templates/index/community.html:13 templates/index/community.html:14
-msgid "ClickHouse YouTube Channel"
-msgstr ""
-
-#: templates/index/community.html:25 templates/index/community.html:26
-msgid "ClickHouse Official Twitter Account"
-msgstr ""
-
-#: templates/index/community.html:36 templates/index/community.html:37
-msgid "ClickHouse at Telegram"
-msgstr ""
-
-#: templates/index/community.html:41
-msgid "Chat with real users in "
-msgstr ""
-
-#: templates/index/community.html:44 templates/index/community.html:116
-msgid "English"
-msgstr ""
-
-#: templates/index/community.html:45
-msgid "or in"
-msgstr ""
-
-#: templates/index/community.html:47 templates/index/community.html:117
-msgid "Russian"
-msgstr ""
-
-#: templates/index/community.html:65
-msgid "Open GitHub issue to ask for help or to file a feature request"
-msgstr ""
-
-#: templates/index/community.html:76 templates/index/community.html:77
-msgid "ClickHouse Slack Workspace"
-msgstr ""
-
-#: templates/index/community.html:82
-msgid "Multipurpose public hangout"
-msgstr ""
-
-#: templates/index/community.html:101
-msgid "Ask any questions"
-msgstr ""
-
-#: templates/index/community.html:115
-msgid "ClickHouse Blog"
-msgstr ""
-
-#: templates/index/community.html:116
-msgid "in"
-msgstr ""
-
-#: templates/index/community.html:128 templates/index/community.html:129
-msgid "ClickHouse at Google Groups"
-msgstr ""
-
-#: templates/index/community.html:133
-msgid "Email discussions"
-msgstr ""
-
-#: templates/index/community.html:142
-msgid "Like ClickHouse?"
-msgstr ""
-
-#: templates/index/community.html:143
-msgid "Help to spread the word about it via"
-msgstr ""
-
-#: templates/index/community.html:144
-msgid "and"
-msgstr ""
-
-#: templates/index/community.html:153
-msgid "Hosting ClickHouse Meetups"
-msgstr ""
-
-#: templates/index/community.html:157
-msgid ""
-"ClickHouse meetups are essential for strengthening community worldwide, but "
-"they couldn't be possible without the help of local organizers. Please, fill "
-"this form if you want to become one or want to meet ClickHouse core team for "
-"any other reason."
-msgstr ""
-
-#: templates/index/community.html:159
-msgid "ClickHouse Meetup"
-msgstr ""
-
-#: templates/index/community.html:165
-msgid "Name"
-msgstr ""
-
-#: templates/index/community.html:168
-msgid "Email"
-msgstr ""
-
-#: templates/index/community.html:171
-msgid "Company"
-msgstr ""
-
-#: templates/index/community.html:174
-msgid "City"
-msgstr ""
-
-#: templates/index/community.html:179
-msgid "We'd like to host a public ClickHouse Meetup"
-msgstr ""
-
-#: templates/index/community.html:185
-msgid "We'd like to invite Yandex ClickHouse team to our office"
-msgstr ""
-
-#: templates/index/community.html:191
-msgid "We'd like to invite Yandex ClickHouse team to another event we organize"
-msgstr ""
-
-#: templates/index/community.html:197
-msgid "We're interested in commercial consulting, support or managed service"
-msgstr ""
-
-#: templates/index/community.html:201
-msgid "Additional comments"
-msgstr ""
-
-#: templates/index/community.html:203
-msgid "Send"
-msgstr ""
-
-#: templates/index/community.html:212
-msgid ""
-"If you have any more thoughts or questions, feel free to contact Yandex "
-"ClickHouse team directly at"
-msgstr ""
-
-#: templates/index/community.html:213
-msgid "turn on JavaScript to see email address"
-msgstr ""
diff --git a/website/locale/tr/LC_MESSAGES/messages.mo b/website/locale/tr/LC_MESSAGES/messages.mo
deleted file mode 100644
index 0386bd03351..00000000000
Binary files a/website/locale/tr/LC_MESSAGES/messages.mo and /dev/null differ
diff --git a/website/locale/tr/LC_MESSAGES/messages.po b/website/locale/tr/LC_MESSAGES/messages.po
deleted file mode 100644
index 710ebbdf120..00000000000
--- a/website/locale/tr/LC_MESSAGES/messages.po
+++ /dev/null
@@ -1,326 +0,0 @@
-# Translations template for PROJECT.
-# Copyright (C) 2020 ORGANIZATION
-# This file is distributed under the same license as the PROJECT project.
-# Automatically generated, 2020.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PROJECT VERSION\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-06-17 12:20+0300\n"
-"PO-Revision-Date: 2020-06-17 12:20+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
-"Language: tr\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: templates/common_meta.html:1
-msgid ""
-"ClickHouse is a fast open-source column-oriented database management system "
-"that allows generating analytical data reports in real-time using SQL queries"
-msgstr ""
-
-#: templates/common_meta.html:6
-msgid "ClickHouse - fast open-source OLAP DBMS"
-msgstr ""
-
-#: templates/common_meta.html:10
-msgid "ClickHouse DBMS"
-msgstr ""
-
-#: templates/common_meta.html:32
-msgid "open-source"
-msgstr ""
-
-#: templates/common_meta.html:32
-msgid "relational"
-msgstr ""
-
-#: templates/common_meta.html:32
-msgid "analytics"
-msgstr ""
-
-#: templates/common_meta.html:32
-msgid "analytical"
-msgstr ""
-
-#: templates/common_meta.html:32
-msgid "Big Data"
-msgstr ""
-
-#: templates/common_meta.html:32
-msgid "web-analytics"
-msgstr ""
-
-#: templates/footer.html:8
-msgid "ClickHouse source code is published under the Apache 2.0 License."
-msgstr ""
-
-#: templates/footer.html:8
-msgid ""
-"Software is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR "
-"CONDITIONS OF ANY KIND, either express or implied."
-msgstr ""
-
-#: templates/footer.html:11
-msgid "Yandex LLC"
-msgstr ""
-
-#: templates/blog/content.html:20 templates/blog/content.html:25
-#: templates/blog/content.html:30
-msgid "Share on"
-msgstr ""
-
-#: templates/blog/content.html:37
-msgid "Published date"
-msgstr ""
-
-#: templates/blog/nav.html:20
-msgid "New&nbsp;post"
-msgstr ""
-
-#: templates/blog/nav.html:25
-msgid "Documentation"
-msgstr ""
-
-#: templates/docs/footer.html:3
-msgid "Rating"
-msgstr ""
-
-#: templates/docs/footer.html:3
-msgid "votes"
-msgstr ""
-
-#: templates/docs/footer.html:4
-msgid "Article Rating"
-msgstr ""
-
-#: templates/docs/footer.html:4
-msgid "Was this content helpful?"
-msgstr ""
-
-#: templates/docs/footer.html:7
-msgid "Unusable"
-msgstr ""
-
-#: templates/docs/footer.html:7
-msgid "Poor"
-msgstr ""
-
-#: templates/docs/footer.html:7
-msgid "Good"
-msgstr ""
-
-#: templates/docs/footer.html:7
-msgid "Excellent"
-msgstr ""
-
-#: templates/docs/footer.html:8
-msgid "documentation"
-msgstr ""
-
-#: templates/docs/footer.html:15
-msgid "Built from"
-msgstr ""
-
-#: templates/docs/footer.html:15
-msgid "published on"
-msgstr ""
-
-#: templates/docs/footer.html:15
-msgid "modified on"
-msgstr ""
-
-#: templates/docs/machine-translated.html:3
-msgid "Help wanted!"
-msgstr ""
-
-#: templates/docs/machine-translated.html:4
-msgid ""
-"The following content of this documentation page has been machine-"
-"translated. But unlike other websites, it is not done on the fly. This "
-"translated text lives on GitHub repository alongside main ClickHouse "
-"codebase and waits for fellow native speakers to make it more human-readable."
-msgstr ""
-
-#: templates/docs/machine-translated.html:4
-msgid "You can also use the original English version as a reference."
-msgstr ""
-
-#: templates/docs/machine-translated.html:7
-msgid "Help ClickHouse documentation by editing this page"
-msgstr ""
-
-#: templates/docs/sidebar.html:3
-msgid "Multi-page or single-page"
-msgstr ""
-
-#: templates/docs/sidebar.html:5
-msgid "Multi-page version"
-msgstr ""
-
-#: templates/docs/sidebar.html:8
-msgid "Single-page version"
-msgstr ""
-
-#: templates/docs/sidebar.html:13
-msgid "Version"
-msgstr ""
-
-#: templates/docs/sidebar.html:13 templates/docs/sidebar.html:19
-msgid "latest"
-msgstr ""
-
-#: templates/docs/sidebar.html:36
-msgid "PDF version"
-msgstr ""
-
-#: templates/docs/toc.html:8
-msgid "Table of Contents"
-msgstr ""
-
-#: templates/index/community.html:4
-msgid "ClickHouse community"
-msgstr ""
-
-#: templates/index/community.html:13 templates/index/community.html:14
-msgid "ClickHouse YouTube Channel"
-msgstr ""
-
-#: templates/index/community.html:25 templates/index/community.html:26
-msgid "ClickHouse Official Twitter Account"
-msgstr ""
-
-#: templates/index/community.html:36 templates/index/community.html:37
-msgid "ClickHouse at Telegram"
-msgstr ""
-
-#: templates/index/community.html:41
-msgid "Chat with real users in "
-msgstr ""
-
-#: templates/index/community.html:44 templates/index/community.html:116
-msgid "English"
-msgstr ""
-
-#: templates/index/community.html:45
-msgid "or in"
-msgstr ""
-
-#: templates/index/community.html:47 templates/index/community.html:117
-msgid "Russian"
-msgstr ""
-
-#: templates/index/community.html:65
-msgid "Open GitHub issue to ask for help or to file a feature request"
-msgstr ""
-
-#: templates/index/community.html:76 templates/index/community.html:77
-msgid "ClickHouse Slack Workspace"
-msgstr ""
-
-#: templates/index/community.html:82
-msgid "Multipurpose public hangout"
-msgstr ""
-
-#: templates/index/community.html:101
-msgid "Ask any questions"
-msgstr ""
-
-#: templates/index/community.html:115
-msgid "ClickHouse Blog"
-msgstr ""
-
-#: templates/index/community.html:116
-msgid "in"
-msgstr ""
-
-#: templates/index/community.html:128 templates/index/community.html:129
-msgid "ClickHouse at Google Groups"
-msgstr ""
-
-#: templates/index/community.html:133
-msgid "Email discussions"
-msgstr ""
-
-#: templates/index/community.html:142
-msgid "Like ClickHouse?"
-msgstr ""
-
-#: templates/index/community.html:143
-msgid "Help to spread the word about it via"
-msgstr ""
-
-#: templates/index/community.html:144
-msgid "and"
-msgstr ""
-
-#: templates/index/community.html:153
-msgid "Hosting ClickHouse Meetups"
-msgstr ""
-
-#: templates/index/community.html:157
-msgid ""
-"ClickHouse meetups are essential for strengthening community worldwide, but "
-"they couldn't be possible without the help of local organizers. Please, fill "
-"this form if you want to become one or want to meet ClickHouse core team for "
-"any other reason."
-msgstr ""
-
-#: templates/index/community.html:159
-msgid "ClickHouse Meetup"
-msgstr ""
-
-#: templates/index/community.html:165
-msgid "Name"
-msgstr ""
-
-#: templates/index/community.html:168
-msgid "Email"
-msgstr ""
-
-#: templates/index/community.html:171
-msgid "Company"
-msgstr ""
-
-#: templates/index/community.html:174
-msgid "City"
-msgstr ""
-
-#: templates/index/community.html:179
-msgid "We'd like to host a public ClickHouse Meetup"
-msgstr ""
-
-#: templates/index/community.html:185
-msgid "We'd like to invite Yandex ClickHouse team to our office"
-msgstr ""
-
-#: templates/index/community.html:191
-msgid "We'd like to invite Yandex ClickHouse team to another event we organize"
-msgstr ""
-
-#: templates/index/community.html:197
-msgid "We're interested in commercial consulting, support or managed service"
-msgstr ""
-
-#: templates/index/community.html:201
-msgid "Additional comments"
-msgstr ""
-
-#: templates/index/community.html:203
-msgid "Send"
-msgstr ""
-
-#: templates/index/community.html:212
-msgid ""
-"If you have any more thoughts or questions, feel free to contact Yandex "
-"ClickHouse team directly at"
-msgstr ""
-
-#: templates/index/community.html:213
-msgid "turn on JavaScript to see email address"
-msgstr ""
diff --git a/website/sitemap-index.xml b/website/sitemap-index.xml
index 75fdc75973c..3fbdd99d372 100644
--- a/website/sitemap-index.xml
+++ b/website/sitemap-index.xml
@@ -6,21 +6,12 @@
    <sitemap>
       <loc>https://clickhouse.tech/docs/zh/sitemap.xml</loc>
    </sitemap>
-   <sitemap>
-      <loc>https://clickhouse.tech/docs/es/sitemap.xml</loc>
-   </sitemap>
-   <sitemap>
-      <loc>https://clickhouse.tech/docs/fr/sitemap.xml</loc>
-   </sitemap>
    <sitemap>
       <loc>https://clickhouse.tech/docs/ru/sitemap.xml</loc>
    </sitemap>
    <sitemap>
       <loc>https://clickhouse.tech/docs/ja/sitemap.xml</loc>
    </sitemap>
-   <sitemap>
-      <loc>https://clickhouse.tech/docs/fa/sitemap.xml</loc>
-   </sitemap>
    <sitemap>
       <loc>https://clickhouse.tech/blog/en/sitemap.xml</loc>
    </sitemap>
diff --git a/website/templates/index/community.html b/website/templates/index/community.html
index 20b09e7318b..86f2259b486 100644
--- a/website/templates/index/community.html
+++ b/website/templates/index/community.html
@@ -66,7 +66,7 @@
                 </div>
                 <div class="row mb-3">
                     <div class="col w-100">
-                        <a href="https://join.slack.com/t/clickhousedb/shared_invite/zt-ly9m4w1x-6j7x5Ts_pQZqrctAbRZ3cg"
+                        <a href="https://join.slack.com/t/clickhousedb/shared_invite/zt-nwwakmk4-xOJ6cdy0sJC3It8j348~IA"
                             rel="external nofollow noreferrer" target="_blank" class="text-decoration-none">
                             <div class="bg-dark p-4">
                                 <img data-src="/images/index/slack.svg"
diff --git a/website/templates/index/hero.html b/website/templates/index/hero.html
index 55d0111ac61..efa4643e841 100644
--- a/website/templates/index/hero.html
+++ b/website/templates/index/hero.html
@@ -22,12 +22,8 @@
             <div class="row lead">
 
                 <div class="col-lg pb-2">
-                    <a href="https://play.clickhouse.tech/?file=welcome" class="btn btn-lg btn-yellow w-100 mb-2" role="button" target="_blank" rel="external nofollow">
-                        <div class="py-2">
-                            <h2>Try online demo</h2>
-                            <div class="lead">Powered by Yandex.Cloud</div>
-                        </div>
-                    </a>
+                    <a href="https://play.clickhouse.tech/?file=welcome" class="btn btn-lg btn-yellow w-100 mb-3" role="button" target="_blank" rel="external nofollow">Try online demo</a>
+                    <a href="docs/en/commercial/support/" class="btn btn-lg btn-yellow w-100" role="button">Request support</a>
                 </div>
                 <div class="col-lg pb-2">
                     <a href="#quick-start" class="btn btn-lg btn-outline-orange w-100 mb-3" role="button">Quick start</a>
diff --git a/website/templates/index/quickstart.html b/website/templates/index/quickstart.html
index 454fc68151d..0d967e7b96c 100644
--- a/website/templates/index/quickstart.html
+++ b/website/templates/index/quickstart.html
@@ -36,7 +36,7 @@
            target="_blank">
             official Docker images of ClickHouse</a>, this is not the only <a href="https://clickhouse.tech/docs/en/getting-started/">option</a> though.
         Alternatively, you can easily get a running ClickHouse instance or cluster at
-        <a href="https://cloud.yandex.com/services/managed-clickhouse?utm_source=referrals&utm_medium=clickhouseofficialsite&utm_campaign=link1" rel="external nofollow noreferrer" target="_blank">
+        <a href="https://cloud.yandex.com/services/managed-clickhouse?utm_source=referrals&amp;utm_medium=clickhouseofficialsite&amp;utm_campaign=link1" rel="external nofollow noreferrer" target="_blank">
             Yandex Managed Service for ClickHouse</a>.
     </p>